From 1dfb0cac4ed8ca11c93d52e2fe7d869e08f47c54 Mon Sep 17 00:00:00 2001
From: a-schild <andre@schild.ws>
Date: Tue, 7 Jul 2015 18:08:10 +0200
Subject: [PATCH 0001/1163] Allow filtering on date fields for supplier
 factures

---
 htdocs/fourn/facture/impayees.php | 44 +++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 83d4b830c5f..826393970b8 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2012		Vinicius Nogueira       <viniciusvgn@gmail.com>
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2015		Andre Schild			<a.schild@aarboard.ch>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,6 +57,16 @@ $search_company = GETPOST('search_company','alpha');
 $search_amount_no_tax = GETPOST('search_amount_no_tax','alpha');
 $search_amount_all_tax = GETPOST('search_amount_all_tax','alpha');
 
+$op1month=GETPOST('op1month');
+$op1day=GETPOST('op1day');
+$op1year=GETPOST('op1year');
+$filter_op1=GETPOST('filter_op1');
+
+$op2month=GETPOST('op2month');
+$op2day=GETPOST('op2day');
+$op2year=GETPOST('op2year');
+$filter_op2=GETPOST('filter_op2');
+
 $page = GETPOST("page",'int');
 if ($page == -1) { $page = 0; }
 $offset = $conf->liste_limit * $page;
@@ -71,6 +82,14 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$search_company="";
 	$search_amount_no_tax="";
 	$search_amount_all_tax="";
+	$op1month="";
+	$op1day="";
+	$op1year="";
+	$filter_op1="";
+	$op2month="";
+	$op2day="";
+	$op2year="";
+	$filter_op2="";
 }
 
 /*
@@ -78,6 +97,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
  */
 
 $now=dol_now();
+$form=new Form($db);
 
 llxHeader('',$langs->trans("BillsSuppliersUnpaid"));
 
@@ -101,6 +121,10 @@ if ($user->rights->fournisseur->facture->lire)
 	$sql.= " WHERE f.entity = ".$conf->entity;
 	$sql.= " AND f.fk_soc = s.rowid";
 	$sql.= " AND f.paye = 0 AND f.fk_statut = 1";
+        $filter_date1=dol_mktime(0,0,0,$op1month,$op1day,$op1year);
+        if (! empty($filter_op1) && $filter_op1 != -1 && $filter_date1 != '') $sql.= " AND f.datef ".$filter_op1." '".$db->idate($filter_date1)."'";
+        $filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year);
+        if (! empty($filter_op2) && $filter_op2 != -1 && $filter_date2 != '') $sql.= " AND f.date_lim_reglement ".$filter_op2." '".$db->idate($filter_date2)."'";
 	if ($option == 'late') $sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql .= " AND s.rowid = ".$socid;
@@ -168,6 +192,10 @@ if ($user->rights->fournisseur->facture->lire)
 		if ($search_company)     	$param.='&amp;search_company='.urlencode($search_company);
 		if ($search_amount_no_tax)	$param.='&amp;search_amount_no_tax='.urlencode($search_amount_no_tax);
 		if ($search_amount_all_tax) $param.='&amp;search_amount_all_tax='.urlencode($search_amount_all_tax);
+                if (! empty($filter_op1) && $filter_op1 != -1) $param.='&amp;filter_op1='.urlencode($filter_op1);
+                if ($filter_date1 != '') $param.='&amp;op1day='.$op1day.'&amp;op1month='.$op1month.'&amp;op1year='.$op1year;
+                if (! empty($filter_op2) && $filter_op2 != -1) $param.='&amp;filter_op2='.urlencode($filter_op2);
+                if ($filter_date2 != '') $param.='&amp;op2day='.$op2day.'&amp;op2month='.$op2month.'&amp;op2year='.$op2year;
 
 		$param.=($option?"&option=".$option:"");
 		if (! empty($late)) $param.='&late='.urlencode($late);
@@ -206,8 +234,20 @@ if ($user->rights->fournisseur->facture->lire)
 		print '<input class="flat" size="8" type="text" name="search_ref" value="'.$search_ref.'"></td>';
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="8" type="text" name="search_ref_supplier" value="'.$search_ref_supplier.'"></td>';
-		print '<td class="liste_titre">&nbsp;</td>';
-		print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">';
+                $arrayofoperators=array('<'=>'<','>'=>'>');
+                print $form->selectarray('filter_op1',$arrayofoperators,$filter_op1,1);
+                print ' ';
+                $filter_date1=dol_mktime(0,0,0,$op1month,$op1day,$op1year);
+                print $form->select_date($filter_date1,'op1',0,0,1);
+                print '</td>';
+		print '<td class="liste_titre">';
+                $arrayofoperators=array('<'=>'<','>'=>'>');
+                print $form->selectarray('filter_op2',$arrayofoperators,$filter_op2,1);
+                print ' ';
+                $filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year);
+                print $form->select_date($filter_date2,'op2',0,0,1);
+                print '</td>';
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="6" name="search_company" value="'.$search_company.'">';
 		print '</td><td class="liste_titre" align="right">';

From 134f13c63f1f1f325c63f7ec3c1a6fb654b432b2 Mon Sep 17 00:00:00 2001
From: a-schild <andre@schild.ws>
Date: Tue, 7 Jul 2015 18:17:22 +0200
Subject: [PATCH 0002/1163] Removed conflict code from merge/checkout

---
 htdocs/fourn/facture/paiement.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 20cf8f250bd..ba3f82c78e0 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -424,8 +424,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	        // Bouton Enregistrer
 	        if ($action != 'add_paiement')
 	        {
-				print '<br><div class="center"><input type="checkbox" checked name="closepaidinvoices"> '.$langs->trans("ClosePaidInvoicesAutomatically");
-				print '<br><input type="submit" class="button" value="'.$langs->trans('Save').'"></div>';
+				print '<center><br><input type="checkbox" checked="checked" name="closepaidinvoices"> '.$langs->trans("ClosePaidInvoicesAutomatically");
+				print '<br><input type="submit" class="button" value="'.$langs->trans('Save').'"></center>';
 	        }
 
             // Form to confirm payment
@@ -545,7 +545,7 @@ if (empty($action))
         print_liste_field_titre($langs->trans('Account'),$_SERVER["PHP_SELF"],'ba.label','',$paramlist,'',$sortfield,$sortorder);
         print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'p.amount','',$paramlist,'align="right"',$sortfield,$sortorder);
         //print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'ref_supplier','',$paramlist,'',$sortfield,$sortorder);
-		print_liste_field_titre('');
+        print '<td class="liste_titre">&nbsp;</td>';
 		print "</tr>\n";
 
         // Lines for filters fields

From 0fe39d4e4b16467db2d276e0e7901854c439bda3 Mon Sep 17 00:00:00 2001
From: a-schild <andre@schild.ws>
Date: Tue, 7 Jul 2015 18:33:09 +0200
Subject: [PATCH 0003/1163] Show due date when creating payments, so user can
 select the bills to pay

---
 htdocs/fourn/facture/paiement.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index ba3f82c78e0..f82dd93904b 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -5,11 +5,9 @@
  * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
  * Copyright (C) 2005		Marc Barilley / Ocebo	<marc@ocebo.com>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
-<<<<<<< HEAD
  * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
-=======
- * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
->>>>>>> refs/remotes/origin/3.6
+ * Copyright (C) 2015           Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2015           Andre Schild           <a.schild@aarboard.ch>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -322,7 +320,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				/*
 	             * Autres factures impayees
 	             */
-	            $sql = 'SELECT f.rowid as facid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef as df';
+	            $sql = 'SELECT f.rowid as facid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef as df, date_lim_reglement as duedate';
 	            $sql.= ', SUM(pf.amount) as am';
 	            $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
 	            $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
@@ -330,7 +328,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	            $sql.= ' AND f.fk_soc = '.$object->socid;
 	            $sql.= ' AND f.paye = 0';
 	            $sql.= ' AND f.fk_statut = 1';  // Statut=0 => non validee, Statut=2 => annulee
-	            $sql.= ' GROUP BY f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef';
+	            $sql.= ' GROUP BY f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef, f.date_lim_reglement';
 	            $resql = $db->query($sql);
 	            if ($resql)
 	            {
@@ -356,6 +354,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                    print '<td>'.$langs->trans('Ref').'</td>';
 	                    print '<td>'.$langs->trans('RefSupplier').'</td>';
 	                    print '<td align="center">'.$langs->trans('Date').'</td>';
+	                    print '<td align="center">'.$langs->trans('DateMaxPayment').'</td>';
 	                    print '<td align="right">'.$langs->trans('AmountTTC').'</td>';
 	                    print '<td align="right">'.$langs->trans('AlreadyPaid').'</td>';
 	                    print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
@@ -386,6 +385,15 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                        {
 	                            print '<td align="center"><b>!!!</b></td>';
 	                        }
+	                        if ($objp->duedate > 0 )
+	                        {
+	                            print '<td align="center">';
+	                            print dol_print_date($db->jdate($objp->duedate), 'day').'</td>';
+	                        }
+	                        else
+	                        {
+	                            print '<td align="center"><b>!!!</b></td>';
+	                        }
 	                        print '<td align="right">'.price($objp->total_ttc).'</td>';
 	                        print '<td align="right">'.price($objp->am).'</td>';
 	                        print '<td align="right">'.price($objp->total_ttc - $objp->am).'</td>';
@@ -404,7 +412,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                    {
 	                        // Print total
 	                        print '<tr class="liste_total">';
-	                        print '<td colspan="3" align="left">'.$langs->trans('TotalTTC').':</td>';
+	                        print '<td colspan="4" align="left">'.$langs->trans('TotalTTC').':</td>';
 	                        print '<td align="right"><b>'.price($total_ttc).'</b></td>';
 	                        print '<td align="right"><b>'.price($totalrecu).'</b></td>';
 	                        print '<td align="right"><b>'.price($total_ttc - $totalrecu).'</b></td>';

From 2999d0b37a5ee28c51a8bee93c0175ba37d74a45 Mon Sep 17 00:00:00 2001
From: a-schild <andre@schild.ws>
Date: Wed, 8 Jul 2015 08:58:30 +0200
Subject: [PATCH 0004/1163] Show due days in not payed supplier bills

---
 htdocs/fourn/facture/impayees.php | 32 +++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 826393970b8..b9fb072f437 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -56,6 +56,7 @@ $search_ref_supplier = GETPOST('search_ref_supplier','alpha');
 $search_company = GETPOST('search_company','alpha');
 $search_amount_no_tax = GETPOST('search_amount_no_tax','alpha');
 $search_amount_all_tax = GETPOST('search_amount_all_tax','alpha');
+$search_duedays = GETPOST('search_duedays','alpha');
 
 $op1month=GETPOST('op1month');
 $op1day=GETPOST('op1day');
@@ -90,6 +91,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$op2day="";
 	$op2year="";
 	$filter_op2="";
+        $duedays="";
 }
 
 /*
@@ -111,6 +113,7 @@ if ($user->rights->fournisseur->facture->lire)
 	$sql = "SELECT s.rowid as socid, s.nom as name,";
 	$sql.= " f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc,";
 	$sql.= " f.datef as df, f.date_lim_reglement as datelimite, ";
+        $sql.= " DATEDIFF(f.date_lim_reglement, NOW()) as duedays, ";
 	$sql.= " f.paye as paye, f.rowid as facid, f.fk_statut";
 	$sql.= " ,sum(pf.amount) as am";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user ";
@@ -153,11 +156,16 @@ if ($user->rights->fournisseur->facture->lire)
 		$sql .= " AND s.nom LIKE '%".$search_company."%'";
 	}
 
+	if ($search_duedays)
+	{
+		$sql .= " AND DATEDIFF(f.date_lim_reglement, NOW()) = '".$search_duedays."'";
+	}
+
 	if ($search_amount_no_tax)
 	{
 		$sql .= " AND f.total_ht = '".$search_amount_no_tax."'";
 	}
-
+        
 	if ($search_amount_all_tax)
 	{
 		$sql .= " AND f.total_ttc = '".$search_amount_all_tax."'";
@@ -196,6 +204,7 @@ if ($user->rights->fournisseur->facture->lire)
                 if ($filter_date1 != '') $param.='&amp;op1day='.$op1day.'&amp;op1month='.$op1month.'&amp;op1year='.$op1year;
                 if (! empty($filter_op2) && $filter_op2 != -1) $param.='&amp;filter_op2='.urlencode($filter_op2);
                 if ($filter_date2 != '') $param.='&amp;op2day='.$op2day.'&amp;op2month='.$op2month.'&amp;op2year='.$op2year;
+		if ($search_duedays)	$param.='&amp;search_duedays='.urlencode($search_duedays);
 
 		$param.=($option?"&option=".$option:"");
 		if (! empty($late)) $param.='&late='.urlencode($late);
@@ -221,6 +230,7 @@ if ($user->rights->fournisseur->facture->lire)
 		print_liste_field_titre($langs->trans("RefSupplier"),$_SERVER["PHP_SELF"],"f.ref_supplier","",$param,"",$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","",$param,'align="center"',$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"f.date_lim_reglement","",$param,'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("DueDays"),$_SERVER["PHP_SELF"],"duedays","",$param,'align="center"',$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total_ht","",$param,'align="right"',$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
@@ -248,6 +258,9 @@ if ($user->rights->fournisseur->facture->lire)
                 $filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year);
                 print $form->select_date($filter_date2,'op2',0,0,1);
                 print '</td>';
+                print '<td class="liste_titre" align="right">';
+		print '<input class="flat" type="text" size="6" name="search_duedays" value="'.$search_duedays.'">';
+                print '</td>';
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="6" name="search_company" value="'.$search_company.'">';
 		print '</td><td class="liste_titre" align="right">';
@@ -274,6 +287,16 @@ if ($user->rights->fournisseur->facture->lire)
 
 				print "<tr ".$bc[$var].">";
 				$classname = "impayee";
+                                if ($objp->duedays <0)
+                                {
+                                    $overdueclassstart="<strong>";
+                                    $overdueclassend="</strong>";
+                                }
+                                else
+                                {
+                                    $overdueclassstart="";
+                                    $overdueclassend="";
+                                }
 
 				print '<td class="nowrap">';
 				$facturestatic->id=$objp->facid;
@@ -284,9 +307,10 @@ if ($user->rights->fournisseur->facture->lire)
 				print '<td class="nowrap">'.dol_trunc($objp->ref_supplier,12).'</td>';
 
 				print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->df),'day')."</td>\n";
-				print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->datelimite),'day');
+				print '<td class="nowrap" align="center">'.$overdueclassstart.dol_print_date($db->jdate($objp->datelimite),'day');
 				if ($objp->datelimite && $db->jdate($objp->datelimite) < ($now - $conf->facture->fournisseur->warning_delay) && ! $objp->paye && $objp->fk_statut == 1) print img_warning($langs->trans("Late"));
-				print "</td>\n";
+				print $overdueclassend."</td>\n";
+                                print "<td align=\"right\">".$overdueclassstart.$objp->duedays.$overdueclassend."</td>";
 
 				print '<td>';
 				$companystatic->id=$objp->socid;
@@ -312,7 +336,7 @@ if ($user->rights->fournisseur->facture->lire)
 			}
 
 			print '<tr class="liste_total">';
-			print "<td colspan=\"5\" align=\"left\">".$langs->trans("Total").": </td>";
+			print "<td colspan=\"6\" align=\"left\">".$langs->trans("Total").": </td>";
 			print "<td align=\"right\"><b>".price($total_ht)."</b></td>";
 			print "<td align=\"right\"><b>".price($total_ttc)."</b></td>";
 			print "<td align=\"right\"><b>".price($total_paid)."</b></td>";

From 8353e1d462b309455ac6d3ad201c3d9f3ee27dde Mon Sep 17 00:00:00 2001
From: a-schild <andre@schild.ws>
Date: Wed, 8 Jul 2015 09:18:04 +0200
Subject: [PATCH 0005/1163] Show due days in make payments

---
 htdocs/fourn/facture/paiement.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index f82dd93904b..35d1f9311e4 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -321,6 +321,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	             * Autres factures impayees
 	             */
 	            $sql = 'SELECT f.rowid as facid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef as df, date_lim_reglement as duedate';
+                    $sql.= ', DATEDIFF(f.date_lim_reglement, NOW()) as duedays';
 	            $sql.= ', SUM(pf.amount) as am';
 	            $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
 	            $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
@@ -355,6 +356,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                    print '<td>'.$langs->trans('RefSupplier').'</td>';
 	                    print '<td align="center">'.$langs->trans('Date').'</td>';
 	                    print '<td align="center">'.$langs->trans('DateMaxPayment').'</td>';
+	                    print '<td align="right">'.$langs->trans('DueDays').'</td>';
 	                    print '<td align="right">'.$langs->trans('AmountTTC').'</td>';
 	                    print '<td align="right">'.$langs->trans('AlreadyPaid').'</td>';
 	                    print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
@@ -394,6 +396,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                        {
 	                            print '<td align="center"><b>!!!</b></td>';
 	                        }
+	                        print '<td align="right">'.$objp->duedays.'</td>';
 	                        print '<td align="right">'.price($objp->total_ttc).'</td>';
 	                        print '<td align="right">'.price($objp->am).'</td>';
 	                        print '<td align="right">'.price($objp->total_ttc - $objp->am).'</td>';
@@ -412,7 +415,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                    {
 	                        // Print total
 	                        print '<tr class="liste_total">';
-	                        print '<td colspan="4" align="left">'.$langs->trans('TotalTTC').':</td>';
+	                        print '<td colspan="5" align="left">'.$langs->trans('TotalTTC').':</td>';
 	                        print '<td align="right"><b>'.price($total_ttc).'</b></td>';
 	                        print '<td align="right"><b>'.price($totalrecu).'</b></td>';
 	                        print '<td align="right"><b>'.price($total_ttc - $totalrecu).'</b></td>';

From 43897d913e248fd271dd277def9a570ae44b15ce Mon Sep 17 00:00:00 2001
From: a-schild <andre@schild.ws>
Date: Wed, 8 Jul 2015 09:44:59 +0200
Subject: [PATCH 0006/1163] Corrected center to html5 css class instead of
 center tag

---
 htdocs/fourn/facture/paiement.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 35d1f9311e4..09ea8fa23b6 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -435,8 +435,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	        // Bouton Enregistrer
 	        if ($action != 'add_paiement')
 	        {
-				print '<center><br><input type="checkbox" checked="checked" name="closepaidinvoices"> '.$langs->trans("ClosePaidInvoicesAutomatically");
-				print '<br><input type="submit" class="button" value="'.$langs->trans('Save').'"></center>';
+				print '<br><div class="center"><input type="checkbox" checked name="closepaidinvoices"> '.$langs->trans("ClosePaidInvoicesAutomatically");
+				print '<br><input type="submit" class="button" value="'.$langs->trans('Save').'"></div>';
 	        }
 
             // Form to confirm payment

From 64d4a08dc6dc46187b6372e1768be36881ada505 Mon Sep 17 00:00:00 2001
From: a-schild <andre@schild.ws>
Date: Wed, 8 Jul 2015 09:58:51 +0200
Subject: [PATCH 0007/1163] Added translations, corrected title printing in the
 new way

---
 htdocs/fourn/facture/paiement.php | 2 +-
 htdocs/langs/de_DE/bills.lang     | 1 +
 htdocs/langs/en_US/bills.lang     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 09ea8fa23b6..9a7f02eceda 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -556,7 +556,7 @@ if (empty($action))
         print_liste_field_titre($langs->trans('Account'),$_SERVER["PHP_SELF"],'ba.label','',$paramlist,'',$sortfield,$sortorder);
         print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'p.amount','',$paramlist,'align="right"',$sortfield,$sortorder);
         //print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'ref_supplier','',$paramlist,'',$sortfield,$sortorder);
-        print '<td class="liste_titre">&nbsp;</td>';
+        print_liste_field_titre('');
 		print "</tr>\n";
 
         // Lines for filters fields
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 9b743010407..70223f85e4e 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -213,6 +213,7 @@ RelatedCommercialProposals=Verknüpfte Angebote
 MenuToValid=Zur Freigabe
 DateMaxPayment=Zahlungsziel
 DateEcheance=Zahlungsfrist (Limit)
+DueDays=Tage bis fällig
 DateInvoice=Rechnungsdatum
 NoInvoice=Keine Rechnung
 ClassifyBill=Rechnung einordnen
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 4f1512a431d..be3bc24b652 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -213,6 +213,7 @@ RelatedCommercialProposals=Related commercial proposals
 MenuToValid=To valid
 DateMaxPayment=Payment due before
 DateEcheance=Due date limit
+DueDays=Due days
 DateInvoice=Invoice date
 NoInvoice=No invoice
 ClassifyBill=Classify invoice

From d9a1be48cf8626fe48667bb66dc6de65521d3b28 Mon Sep 17 00:00:00 2001
From: "geoffrey.girard" <geoffre.girard@atm-consulting.fr>
Date: Wed, 1 Jun 2016 09:44:43 +0200
Subject: [PATCH 0008/1163] ADD : new link on weather board for proposals late
 this link sort on datep asc

---
 htdocs/comm/propal/class/propal.class.php | 1 +
 htdocs/index.php                          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 56c3839dcb6..2d4fb0a1da0 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2571,6 +2571,7 @@ class Propal extends CommonObject
 	        $response->warning_delay = $delay_warning/60/60/24;
 	        $response->label = $label;
 	        $response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut;
+	        $response->url_late = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&sortfield=p.datep&sortorder=asc';
 	        $response->img = img_object($langs->trans("Propals"),"propal");
 
             // This assignment in condition is not a bug. It allows walking the results.
diff --git a/htdocs/index.php b/htdocs/index.php
index b28038e63c9..03de65e25e5 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -543,7 +543,7 @@ foreach($valid_dashboardlines as $board)
     //if ($board->nbtodolate > 0)
     //{
         $textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days");
-        $boxwork.= '<a title="'.dol_escape_htmltag($textlate).'" class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.$board->url.'"><span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
+        $boxwork.= '<a title="'.dol_escape_htmltag($textlate).'" class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'"><span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
         $boxwork.= $board->nbtodolate;
         $boxwork.= '</span></a>';
     //}

From c082505021aa6b007b25f8da55e93b9b690ba134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sat, 23 Jul 2016 16:37:21 +0200
Subject: [PATCH 0009/1163] NEW Added product attributes feature

---
 htdocs/attributes/admin/admin.php             |  65 ++
 htdocs/attributes/admin/index.html            |   0
 htdocs/attributes/ajax/getCombinations.php    |  50 ++
 .../attributes/ajax/get_attribute_values.php  |  61 ++
 htdocs/attributes/ajax/index.html             |   0
 htdocs/attributes/ajax/orderAttribute.php     |  53 ++
 htdocs/attributes/card.php                    | 245 +++++++
 .../class/ProductAttribute.class.php          | 317 +++++++++
 .../class/ProductAttributeValue.class.php     | 221 ++++++
 .../class/ProductCombination.class.php        | 641 ++++++++++++++++++
 .../ProductCombination2ValuePair.class.php    | 151 +++++
 htdocs/attributes/class/index.html            |   0
 htdocs/attributes/combinations.php            | 641 ++++++++++++++++++
 htdocs/attributes/create.php                  |  73 ++
 htdocs/attributes/create_val.php              | 102 +++
 htdocs/attributes/generator.php               | 393 +++++++++++
 htdocs/attributes/index.html                  |   0
 htdocs/attributes/lib/index.html              |   0
 .../attributes/lib/product_attributes.lib.php |  31 +
 htdocs/attributes/list.php                    | 140 ++++
 htdocs/comm/propal/card.php                   |  28 +-
 htdocs/commande/card.php                      |  29 +-
 htdocs/compta/facture.php                     |  31 +-
 htdocs/contrat/card.php                       |   4 +-
 htdocs/core/class/html.form.class.php         | 125 +++-
 htdocs/core/lib/functions2.lib.php            |  29 +-
 htdocs/core/lib/product.lib.php               |  19 +-
 htdocs/core/tpl/objectline_create.tpl.php     |  47 +-
 htdocs/fourn/commande/card.php                |  34 +-
 htdocs/fourn/facture/card.php                 |  33 +-
 .../install/mysql/migration/3.9.0-4.0.0.sql   |   1 -
 .../install/mysql/migration/4.0.0-5.0.0.sql   |  36 +
 ....key.sql => llx_product_attribute.key.sql} |   8 +-
 ...y_events.sql => llx_product_attribute.sql} |  20 +-
 .../llx_product_attribute_combination.sql     |  28 +
 .../llx_product_attribute_combination2val.sql |  25 +
 .../llx_product_attribute_value.key.sql       |  19 +
 .../tables/llx_product_attribute_value.sql    |  26 +
 htdocs/langs/en_US/main.lang                  |   2 +
 htdocs/langs/en_US/products.lang              |  38 +-
 htdocs/product/card.php                       |  18 +-
 htdocs/product/class/product.class.php        |  30 +
 htdocs/product/list.php                       |  46 +-
 43 files changed, 3763 insertions(+), 97 deletions(-)
 create mode 100644 htdocs/attributes/admin/admin.php
 create mode 100644 htdocs/attributes/admin/index.html
 create mode 100644 htdocs/attributes/ajax/getCombinations.php
 create mode 100644 htdocs/attributes/ajax/get_attribute_values.php
 create mode 100644 htdocs/attributes/ajax/index.html
 create mode 100644 htdocs/attributes/ajax/orderAttribute.php
 create mode 100644 htdocs/attributes/card.php
 create mode 100644 htdocs/attributes/class/ProductAttribute.class.php
 create mode 100644 htdocs/attributes/class/ProductAttributeValue.class.php
 create mode 100644 htdocs/attributes/class/ProductCombination.class.php
 create mode 100644 htdocs/attributes/class/ProductCombination2ValuePair.class.php
 create mode 100644 htdocs/attributes/class/index.html
 create mode 100644 htdocs/attributes/combinations.php
 create mode 100644 htdocs/attributes/create.php
 create mode 100644 htdocs/attributes/create_val.php
 create mode 100644 htdocs/attributes/generator.php
 create mode 100644 htdocs/attributes/index.html
 create mode 100644 htdocs/attributes/lib/index.html
 create mode 100644 htdocs/attributes/lib/product_attributes.lib.php
 create mode 100644 htdocs/attributes/list.php
 rename htdocs/install/mysql/tables/{llx_holiday_events.key.sql => llx_product_attribute.key.sql} (81%)
 rename htdocs/install/mysql/tables/{llx_holiday_events.sql => llx_product_attribute.sql} (70%)
 create mode 100644 htdocs/install/mysql/tables/llx_product_attribute_combination.sql
 create mode 100644 htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
 create mode 100644 htdocs/install/mysql/tables/llx_product_attribute_value.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_product_attribute_value.sql

diff --git a/htdocs/attributes/admin/admin.php b/htdocs/attributes/admin/admin.php
new file mode 100644
index 00000000000..eedacb086b3
--- /dev/null
+++ b/htdocs/attributes/admin/admin.php
@@ -0,0 +1,65 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+
+$langs->load("admin");
+$langs->load("products");
+
+// Security check
+if (! $user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled)))
+	accessforbidden();
+
+if ($_POST) {
+
+	$value = GETPOST('PRODUIT_ATTRIBUTES_HIDECHILD');
+
+	if (dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_HIDECHILD', $value, 'chaine', 0, '', $conf->entity)) {
+		setEventMessage($langs->trans('RecordSaved'));
+	} else {
+		setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
+	}
+
+}
+
+$title = $langs->trans('ModuleSetup').' '.$langs->trans('ProductAttributes');
+llxHeader('', $title);
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($title,$linkback,'title_setup');
+
+dol_fiche_head(array(), 'general', $tab, 0, 'product');
+
+print '<form method="post">';
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameters").'</td>'."\n";
+print '<td align="right" width="60">'.$langs->trans("Value").'</td>'."\n";
+print '<td width="80">&nbsp;</td></tr>'."\n";
+print '<tr><td>'.$langs->trans('HideProductCombinations').'</td><td>';
+print $form->selectyesno("PRODUIT_ATTRIBUTES_HIDECHILD",$conf->global->PRODUIT_ATTRIBUTES_HIDECHILD,1).'</td></tr>';
+print '</table>';
+print '<br><div style="text-align: center"><input type="submit" value="'.$langs->trans('Save').'" class="button"></div>';
+print '</form>';
+
+llxFooter();
+
+$db->close();
+
diff --git a/htdocs/attributes/admin/index.html b/htdocs/attributes/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/attributes/ajax/getCombinations.php b/htdocs/attributes/ajax/getCombinations.php
new file mode 100644
index 00000000000..5ed3e959ea3
--- /dev/null
+++ b/htdocs/attributes/ajax/getCombinations.php
@@ -0,0 +1,50 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('NOTOKENRENEWAL','1');
+define('NOREQUIREMENU','1');
+define('NOREQUIREHTML','1');
+define('NOREQUIREAJAX','1');
+define('NOREQUIRESOC','1');
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+
+header('Content-Type: application/json');
+
+$id = GETPOST('id');
+
+if (!$id) {
+	print json_encode(array(
+		'error' => 'ID not set'
+	));
+	die;
+}
+
+$product = new Product($db);
+
+if ($product->fetch($id) < 0) {
+	print json_encode(array(
+		'error' => 'Product not found'
+	));
+}
+
+$prodcomb = new ProductCombination($db);
+
+echo json_encode($prodcomb->getUniqueAttributesAndValuesByFkProductParent($product->id));
diff --git a/htdocs/attributes/ajax/get_attribute_values.php b/htdocs/attributes/ajax/get_attribute_values.php
new file mode 100644
index 00000000000..a08126d997a
--- /dev/null
+++ b/htdocs/attributes/ajax/get_attribute_values.php
@@ -0,0 +1,61 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('NOTOKENRENEWAL','1');
+define('NOREQUIREMENU','1');
+define('NOREQUIREHTML','1');
+define('NOREQUIREAJAX','1');
+define('NOREQUIRESOC','1');
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttribute.class.php';
+require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttributeValue.class.php';
+
+header('Content-Type: application/json');
+
+$id = GETPOST('id');
+
+if (!$id) {
+	print json_encode(array(
+		'error' => 'ID not set'
+	));
+	die;
+}
+
+$prodattr = new ProductAttribute($db);
+
+if ($prodattr->fetch($id) < 0) {
+	print json_encode(array(
+		'error' => 'Attribute not found'
+	));
+	die;
+}
+
+$prodattrval = new ProductAttributeValue($db);
+
+$res = $prodattrval->fetchAllByProductAttribute($id);
+
+if ($res == -1) {
+	print json_encode(array(
+		'error' => 'Internal error'
+	));
+	die;
+}
+
+print json_encode($res);
\ No newline at end of file
diff --git a/htdocs/attributes/ajax/index.html b/htdocs/attributes/ajax/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/attributes/ajax/orderAttribute.php b/htdocs/attributes/ajax/orderAttribute.php
new file mode 100644
index 00000000000..6c7eecc9453
--- /dev/null
+++ b/htdocs/attributes/ajax/orderAttribute.php
@@ -0,0 +1,53 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disable token renewal
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (! defined('NOREQUIREHOOK'))  define('NOREQUIREHOOK','1');  // Disable "main.inc.php" hooks
+
+require '../../main.inc.php';
+
+/*
+ * View
+ */
+
+top_httphead();
+
+// Registering the location of boxes
+if (isset($_POST['roworder'])) {
+	$roworder=GETPOST('roworder','alpha',2);
+
+	dol_syslog("AjaxOrderAttribute roworder=".$roworder, LOG_DEBUG);
+
+	$rowordertab = explode(',', $roworder);
+
+	foreach ($rowordertab as $value) {
+		if (!empty($value)) {
+			$newrowordertab[] = $value;
+		}
+	}
+
+	require DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttribute.class.php';
+
+	ProductAttribute::bulkUpdateOrder($db, $newrowordertab);
+}
+
diff --git a/htdocs/attributes/card.php b/htdocs/attributes/card.php
new file mode 100644
index 00000000000..3339a169c89
--- /dev/null
+++ b/htdocs/attributes/card.php
@@ -0,0 +1,245 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+require '../main.inc.php';
+require 'class/ProductAttribute.class.php';
+require 'class/ProductAttributeValue.class.php';
+
+$id = GETPOST('id');
+$valueid = GETPOST('valueid');
+$action = GETPOST('action');
+$label = GETPOST('label');
+$ref = GETPOST('ref');
+$confirm = GETPOST('confirm');
+
+$prodattr = new ProductAttribute($db);
+$prodattrval = new ProductAttributeValue($db);
+
+if ($prodattr->fetch($id) < 1) {
+	dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
+	die;
+}
+
+if ($_POST) {
+
+	if ($action == 'edit') {
+
+		$prodattr->label = $label;
+		$prodattr->ref = $ref;
+
+		if ($prodattr->update() < 1) {
+			setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
+		} else {
+			setEventMessage($langs->trans('RecordSaved'));
+			header('Location: '.dol_buildpath('/attributes/card.php?id='.$id, 2));
+			die;
+		}
+	} elseif ($action == 'edit_value') {
+
+		if ($prodattrval->fetch($valueid) > 0) {
+
+			$prodattrval->ref = $ref;
+			$prodattrval->value = GETPOST('value');
+
+			if ($prodattrval->update() > 0) {
+				setEventMessage($langs->trans('RecordSaved'));
+			} else {
+				setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
+			}
+		}
+
+		header('Location: '.dol_buildpath('/attributes/card.php?id='.$prodattr->id, 2));
+		die;
+	}
+
+}
+
+if ($confirm == 'yes') {
+	if ($action == 'confirm_delete') {
+
+		$db->begin();
+
+		$res = $prodattrval->deleteByFkAttribute($prodattr->id);
+
+		if ($res < 1 || ($prodattr->delete() < 1)) {
+			$db->rollback();
+			setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
+			header('Location: '.dol_buildpath('/attributes/card.php?id='.$prodattr->id, 2));
+		} else {
+			$db->commit();
+			setEventMessage($langs->trans('RecordSaved'));
+			header('Location: '.dol_buildpath('/attributes/list.php', 2));
+		}
+
+		die;
+	} elseif ($action == 'confirm_deletevalue') {
+
+		if ($prodattrval->fetch($valueid) > 0) {
+
+			if ($prodattrval->delete() < 1) {
+				setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
+			} else {
+				setEventMessage($langs->trans('RecordSaved'));
+			}
+
+			header('Location: '.dol_buildpath('/attributes/card.php?id='.$prodattr->id, 2));
+			die;
+		}
+	}
+}
+
+$langs->load('products');
+
+$title = $langs->trans('ProductAttributeName', dol_htmlentities($prodattr->label));
+$var = false;
+
+llxHeader('', $title);
+
+print_fiche_titre($title);
+
+dol_fiche_head();
+
+if ($action == 'edit') {
+	print '<form method="post">';
+}
+
+?>
+	<table class="border" style="width: 100%">
+		<tr>
+			<td style="width: 15%" class="fieldrequired"><?php echo $langs->trans('Ref') ?></td>
+			<td>
+				<?php if ($action == 'edit') {
+					print '<input type="text" name="ref" value="'.$prodattr->ref.'">';
+				} else {
+					print dol_htmlentities($prodattr->ref);
+				} ?>
+			</td>
+		</tr>
+		<tr>
+			<td style="width: 15%" class="fieldrequired"><?php echo $langs->trans('Label') ?></td>
+			<td>
+				<?php if ($action == 'edit') {
+					print '<input type="text" name="label" value="'.$prodattr->label.'">';
+				} else {
+					print dol_htmlentities($prodattr->label);
+				} ?>
+			</td>
+		</tr>
+
+	</table>
+
+<?php
+dol_fiche_end();
+
+if ($action == 'edit') { ?>
+	<div style="text-align: center;">
+		<div class="inline-block divButAction">
+			<input type="submit" class="button" value="<?php echo $langs->trans('Save') ?>">
+			<a href="card.php?id=<?php echo $prodattr->id ?>" class="butAction"><?php echo $langs->trans('Cancel') ?></a>
+		</div>
+	</div></form>
+<?php } else {
+
+	if ($action == 'delete') {
+		$form = new Form($db);
+
+		print $form->formconfirm(
+			"card.php?id=".$prodattr->id,
+			$langs->trans('Delete'),
+			$langs->trans('ProductAttributeDeleteDialog'),
+			"confirm_delete",
+			'',
+			0,
+			1
+		);
+	} elseif ($action == 'delete_value') {
+
+		if ($prodattrval->fetch($valueid) > 0) {
+
+			$form = new Form($db);
+
+			print $form->formconfirm(
+				"card.php?id=".$prodattr->id."&valueid=".$prodattrval->id,
+				$langs->trans('Delete'),
+				$langs->trans('ProductAttributeValueDeleteDialog', dol_htmlentities($prodattrval->value), dol_htmlentities($prodattrval->ref)),
+				"confirm_deletevalue",
+				'',
+				0,
+				1
+			);
+		}
+	}
+
+	?>
+
+	<div class="tabsAction">
+		<div class="inline-block divButAction">
+			<a href="card.php?id=<?php echo $prodattr->id ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
+			<a href="card.php?id=<?php echo $prodattr->id ?>&action=delete" class="butAction"><?php echo $langs->trans('Delete') ?></a>
+		</div>
+	</div>
+
+	<?php if ($action == 'edit_value'): ?>
+	<form method="post">
+	<?php endif ?>
+
+	<table class="liste">
+		<tr class="liste_titre">
+			<th class="liste_titre"><?php echo $langs->trans('Ref') ?></th>
+			<th class="liste_titre"><?php echo $langs->trans('Value') ?></th>
+			<th class="liste_titre"></th>
+		</tr>
+
+		<?php foreach ($prodattrval->fetchAllByProductAttribute($prodattr->id) as $attrval): ?>
+		<tr <?php echo $bc[!$var] ?>>
+			<?php if ($action == 'edit_value' && ($valueid == $attrval->id)): ?>
+				<td><input type="text" name="ref" value="<?php echo $attrval->ref ?>"></td>
+				<td><input type="text" name="value" value="<?php echo $attrval->value ?>"></td>
+				<td style="text-align: right">
+					<input type="submit" value="<?php echo $langs->trans('Save') ?>" class="button">
+					<a href="card.php?id=<?php echo $prodattr->id ?>" class="butAction"><?php echo $langs->trans('Cancel') ?></a>
+				</td>
+			<?php else: ?>
+				<td><?php echo dol_htmlentities($attrval->ref) ?></td>
+				<td><?php echo dol_htmlentities($attrval->value) ?></td>
+				<td style="text-align: right">
+					<a href="card.php?id=<?php echo $prodattr->id ?>&action=edit_value&valueid=<?php echo $attrval->id ?>"><?php echo img_edit() ?></a>
+					<a href="card.php?id=<?php echo $prodattr->id ?>&action=delete_value&valueid=<?php echo $attrval->id ?>"><?php echo img_delete() ?></a>
+				</td>
+			<?php endif; ?>
+		</tr>
+		<?php
+			$var = !$var;
+			endforeach
+		?>
+	</table>
+
+	<?php if ($action == 'edit_value'): ?>
+	</form>
+	<?php endif ?>
+
+	<div class="tabsAction">
+		<div class="inline-block divButAction">
+			<a href="create_val.php?id=<?php echo $prodattr->id ?>" class="butAction"><?php echo $langs->trans('Create') ?></a>
+		</div>
+	</div>
+
+	<?php
+}
+
+llxFooter();
\ No newline at end of file
diff --git a/htdocs/attributes/class/ProductAttribute.class.php b/htdocs/attributes/class/ProductAttribute.class.php
new file mode 100644
index 00000000000..1e0837fcb97
--- /dev/null
+++ b/htdocs/attributes/class/ProductAttribute.class.php
@@ -0,0 +1,317 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class ProductAttribute
+{
+	/**
+	 * Database handler
+	 * @var DoliDB
+	 */
+	private $db;
+
+	/**
+	 * Id of the product attribute
+	 * @var int
+	 */
+	public $id;
+
+	/**
+	 * Ref of the product attribute
+	 * @var
+	 */
+	public $ref;
+
+	/**
+	 * Label of the product attribute
+	 * @var string
+	 */
+	public $label;
+
+	/**
+	 * Order of attribute.
+	 * Lower ones will be shown first and higher ones last
+	 * @var int
+	 */
+	public $rang;
+
+	public function __construct(DoliDB $db)
+	{
+		global $conf;
+
+		$this->db = $db;
+		$this->entity = $conf->entity;
+	}
+
+	/**
+	 * Fetches the properties of a product attribute
+	 *
+	 * @param int $id Attribute id
+	 * @return int <1 KO, >1 OK
+	 */
+	public function fetch($id)
+	{
+		if (!$id) {
+			return -1;
+		}
+
+		require_once __DIR__.'/../lib/product_attributes.lib.php';
+
+		$sql = "SELECT rowid, ref, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $id." AND entity IN (".getProductEntities($this->db).")";
+
+		$query = $this->db->query($sql);
+
+		if (!$this->db->num_rows($query)) {
+			return -1;
+		}
+
+		$result = $this->db->fetch_object($query);
+
+		$this->id = $result->rowid;
+		$this->ref = $result->ref;
+		$this->label = $result->label;
+		$this->rang = $result->rang;
+
+		return 1;
+	}
+
+	/**
+	 * Returns an array of all product attributes
+	 *
+	 * @return ProductAttribute[]
+	 */
+	public function fetchAll()
+	{
+		require_once __DIR__.'/../lib/product_attributes.lib.php';
+
+		$return = array();
+
+		$sql = 'SELECT rowid, ref, label, rang FROM '.MAIN_DB_PREFIX."product_attribute WHERE entity IN (".getProductEntities($this->db).')';
+		$sql .= $this->db->order('rang', 'asc');
+		$query = $this->db->query($sql);
+
+		while ($result = $this->db->fetch_object($query)) {
+
+			$tmp = new ProductAttribute($this->db);
+			$tmp->id = $result->rowid;
+			$tmp->ref = $result->ref;
+			$tmp->label = $result->label;
+			$tmp->rang = $result->rang;
+
+			$return[] = $tmp;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Creates a product attribute
+	 *
+	 * @return int <0 KO, >0 OK
+	 */
+	public function create()
+	{
+		//Ref must be uppercase
+		$this->ref = strtoupper($this->ref);
+
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute (ref, label, entity, rang) 
+		VALUES ('".$this->db->escape($this->ref)."', '".$this->db->escape($this->label)."', ".(int) $this->entity.", ".(int) $this->rang.")";
+		$query = $this->db->query($sql);
+
+		if ($query) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute');
+
+			return 1;
+		}
+
+		return -1;
+	}
+
+	/**
+	 * Updates a product attribute
+	 *
+	 * @return int <0 KO, >0 OK
+	 */
+	public function update()
+	{
+		//Ref must be uppercase
+		$this->ref = strtoupper($this->ref);
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."product_attribute SET ref = '".$this->db->escape($this->ref)."', label = '".$this->db->escape($this->label)."', rang = ".(int) $this->rang." WHERE rowid = ".(int) $this->id;
+
+		if ($this->db->query($sql)) {
+			return 1;
+		}
+
+		return -1;
+	}
+
+	/**
+	 * Deletes a product attribute
+	 *
+	 * @return int <0 KO, >0 OK
+	 */
+	public function delete()
+	{
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $this->id;
+
+		if ($this->db->query($sql)) {
+			return 1;
+		}
+
+		return -1;
+	}
+
+	/**
+	 * Returns the number of products that are using this attribute
+	 *
+	 * @return int
+	 */
+	public function countChildProducts()
+	{
+		require_once __DIR__.'/../lib/product_attributes.lib.php';
+
+		$sql = "SELECT COUNT(*) count FROM ".MAIN_DB_PREFIX."product_attribute_combination2val pac2v
+		LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac2v.fk_prod_combination = pac.rowid WHERE pac2v.fk_prod_attr = ".(int) $this->id." AND pac.entity IN (".getProductEntities($this->db).")";
+
+		$query = $this->db->query($sql);
+
+		$result = $this->db->fetch_object($query);
+
+		return $result->count;
+	}
+
+	/**
+	 * Reorders the order of the attributes.
+	 * This is an internal function used by moveLine function
+	 *
+	 * @return int <0 KO >0 OK
+	 */
+	protected function reorderLines()
+	{
+		$tmp_order = array();
+
+		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'product_attribute WHERE rang = 0';
+		$sql .= $this->db->order('rang, rowid', 'asc');
+
+		$query = $this->db->query($sql);
+
+		if (!$query) {
+			return -1;
+		}
+
+		while ($result = $this->db->fetch_object($query)) {
+			$tmp_order[] = $result->rowid;
+		}
+
+		foreach ($tmp_order as $order => $rowid) {
+			$tmp = new ProductAttribute($this->db);
+			$tmp->fetch($rowid);
+			$tmp->rang = $order+1;
+
+			if ($tmp->update() < 0) {
+				return -1;
+			}
+		}
+
+		return 1;
+	}
+
+	/**
+	 * Internal function to handle moveUp and moveDown functions
+	 *
+	 * @param string $type up/down
+	 * @return int <0 KO >0 OK
+	 */
+	private function moveLine($type)
+	{
+		if ($this->reorderLines() < 0) {
+			return -1;
+		}
+
+		$this->db->begin();
+
+		if ($type == 'up') {
+			$newrang = $this->rang - 1;
+		} else {
+			$newrang = $this->rang + 1;
+		}
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'product_attribute SET rang = '.$this->rang.' WHERE rang = '.$newrang;
+
+		if (!$this->db->query($sql)) {
+			$this->db->rollback();
+			return -1;
+		}
+
+		$this->rang = $newrang;
+
+		if ($this->update() < 0) {
+			$this->db->rollback();
+			return -1;
+		}
+
+		$this->db->commit();
+		return 1;
+	}
+
+	/**
+	 * Shows this attribute before others
+	 *
+	 * @return int <0 KO >0 OK
+	 */
+	public function moveUp()
+	{
+		return $this->moveLine('up');
+	}
+
+	/**
+	 * Shows this attribute after others
+	 * 
+	 * @return int <0 KO >0 OK
+	 */
+	public function moveDown()
+	{
+		return $this->moveLine('down');
+	}
+
+	/**
+	 * Updates the order of all attributes. Used by AJAX page for drag&drop
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param array $order Array with row id ordered in ascendent mode
+	 * @return int <0 KO >0 OK
+	 */
+	public static function bulkUpdateOrder(DoliDB $db, array $order)
+	{
+		$tmp = new ProductAttribute($db);
+
+		foreach ($order as $key => $attrid) {
+			if ($tmp->fetch($attrid) < 0) {
+				return -1;
+			}
+
+			$tmp->rang = $key;
+
+			if ($tmp->update() < 0) {
+				return -1;
+			}
+		}
+
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/htdocs/attributes/class/ProductAttributeValue.class.php b/htdocs/attributes/class/ProductAttributeValue.class.php
new file mode 100644
index 00000000000..f500fb251c6
--- /dev/null
+++ b/htdocs/attributes/class/ProductAttributeValue.class.php
@@ -0,0 +1,221 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class ProductAttributeValue
+{
+	/**
+	 * Database handler
+	 * @var DoliDB
+	 */
+	private $db;
+
+	/**
+	 * Attribute value id
+	 * @var int
+	 */
+	public $id;
+
+	/**
+	 * Product attribute id
+	 * @var int
+	 */
+	public $fk_product_attribute;
+
+	/**
+	 * Attribute value ref
+	 * @var string
+	 */
+	public $ref;
+
+	/**
+	 * Attribute value value
+	 * @var string
+	 */
+	public $value;
+
+	public function __construct(DoliDB $db)
+	{
+		global $conf;
+
+		$this->db = $db;
+		$this->entity = $conf->entity;
+	}
+
+	/**
+	 * Gets a product attribute value
+	 *
+	 * @param int $valueid Product attribute value id
+	 * @return int <0 KO, >0 OK
+	 */
+	public function fetch($valueid)
+	{
+		require_once __DIR__.'/../lib/product_attributes.lib.php';
+
+		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $valueid." AND entity IN (".getProductEntities($this->db).")";
+
+		$query = $this->db->query($sql);
+
+		if (!$query) {
+			return -1;
+		}
+
+		if (!$this->db->num_rows($query)) {
+			return -1;
+		}
+
+		$result = $this->db->fetch_object($query);
+
+		$this->id = $result->rowid;
+		$this->fk_product_attribute = $result->fk_product_attribute;
+		$this->ref = $result->ref;
+		$this->value = $result->value;
+
+		return 1;
+	}
+
+	/**
+	 * Returns all product attribute values of a product attribute
+	 *
+	 * @param int $prodattr_id Product attribute id
+	 * @param bool $only_used Fetch only used attribute values
+	 * @return ProductAttributeValue[]
+	 */
+	public function fetchAllByProductAttribute($prodattr_id, $only_used = false)
+	{
+		require_once __DIR__.'/../lib/product_attributes.lib.php';
+
+		$return = array();
+
+		$sql = 'SELECT ';
+		
+		if ($only_used) {
+			$sql .= 'DISTINCT ';
+		}
+		
+		$sql .= 'v.fk_product_attribute, v.rowid, v.ref, v.value FROM '.MAIN_DB_PREFIX.'product_attribute_value v ';
+
+		if ($only_used) {
+			$sql .= 'LEFT JOIN '.MAIN_DB_PREFIX.'product_attribute_combination2val c2v ON c2v.fk_prod_attr_val = v.rowid ';
+			$sql .= 'LEFT JOIN '.MAIN_DB_PREFIX.'product_attribute_combination c ON c.rowid = c2v.fk_prod_combination ';
+			$sql .= 'LEFT JOIN '.MAIN_DB_PREFIX.'product p ON p.rowid = c.fk_product_child ';
+		}
+		
+		$sql .= 'WHERE v.fk_product_attribute = '.(int) $prodattr_id;
+		
+		if ($only_used) {
+			$sql .= ' AND c2v.rowid IS NOT NULL AND p.tosell = 1';
+		}
+
+		$query = $this->db->query($sql);
+
+		while ($result = $this->db->fetch_object($query)) {
+
+			$tmp = new ProductAttributeValue($this->db);
+			$tmp->fk_product_attribute = $result->fk_product_attribute;
+			$tmp->id = $result->rowid;
+			$tmp->ref = $result->ref;
+			$tmp->value = $result->value;
+
+			$return[] = $tmp;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Creates a value for a product attribute
+	 *
+	 * @return int <0 KO >0 OK
+	 */
+	public function create()
+	{
+		if (!$this->fk_product_attribute) {
+			return -1;
+		}
+
+		//Ref must be uppercase
+		$this->ref = strtoupper($this->ref);
+
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_value (fk_product_attribute, ref, value, entity)
+		VALUES ('".(int) $this->fk_product_attribute."', '".$this->db->escape($this->ref)."',
+		'".$this->db->escape($this->value)."', ".(int) $this->entity.")";
+
+		$query = $this->db->query($sql);
+
+		if ($query) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_value');
+			return 1;
+		}
+
+		return -1;
+	}
+
+	/**
+	 * Updates a product attribute value
+	 *
+	 * @return int
+	 */
+	public function update()
+	{
+		//Ref must be uppercase
+		$this->ref = strtoupper($this->ref);
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."product_attribute_value
+		SET fk_product_attribute = '".(int) $this->fk_product_attribute."', ref = '".$this->db->escape($this->ref)."',
+		value = '".$this->db->escape($this->value)."' WHERE rowid = ".(int) $this->id;
+
+		if ($this->db->query($sql)) {
+			return 1;
+		}
+
+		return -1;
+	}
+
+	/**
+	 * Deletes a product attribute value
+	 *
+	 * @return int <0 KO, >0 OK
+	 */
+	public function delete()
+	{
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $this->id;
+
+		if ($this->db->query($sql)) {
+			return 1;
+		}
+
+		return -1;
+	}
+
+	/**
+	 * Deletes all product attribute values by a product attribute id
+	 *
+	 * @param int $fk_attribute Product attribute id
+	 * @return int <0 KO, >0 OK
+	 */
+	public function deleteByFkAttribute($fk_attribute)
+	{
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE fk_product_attribute = ".(int) $fk_attribute;
+
+		if ($this->db->query($sql)) {
+			return 1;
+		}
+
+		return -1;
+	}
+}
\ No newline at end of file
diff --git a/htdocs/attributes/class/ProductCombination.class.php b/htdocs/attributes/class/ProductCombination.class.php
new file mode 100644
index 00000000000..6722f7f03fc
--- /dev/null
+++ b/htdocs/attributes/class/ProductCombination.class.php
@@ -0,0 +1,641 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class ProductCombination
+{
+	/**
+	 * Database handler
+	 * @var DoliDB
+	 */
+	private $db;
+
+	/**
+	 * Rowid of combination
+	 * @var int
+	 */
+	public $id;
+
+	/**
+	 * Rowid of parent product
+	 * @var int
+	 */
+	public $fk_product_parent;
+
+	/**
+	 * Rowid of child product
+	 * @var int
+	 */
+	public $fk_product_child;
+
+	/**
+	 * Price variation
+	 * @var float
+	 */
+	public $variation_price;
+
+	/**
+	 * Is the price variation a relative variation?
+	 * @var bool
+	 */
+	public $variation_price_percentage = false;
+
+	/**
+	 * Weight variation
+	 * @var float
+	 */
+	public $variation_weight;
+
+	/**
+	 * Combination entity
+	 * @var int
+	 */
+	public $entity;
+
+	public function __construct(DoliDB $db)
+	{
+		global $conf;
+
+		$this->db = $db;
+		$this->entity = $conf->entity;
+	}
+
+	/**
+	 * Retrieves a combination by its rowid
+	 *
+	 * @param int $rowid Row id
+	 * @return int <0 KO, >0 OK
+	 */
+	public function fetch($rowid)
+	{
+		require_once __DIR__.'/../lib/product_attributes.lib.php';
+
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE rowid = ".(int) $rowid." AND entity IN (".getProductEntities($this->db).")";
+
+		$query = $this->db->query($sql);
+
+		if (!$query) {
+			return -1;
+		}
+
+		if (!$this->db->num_rows($query)) {
+			return -1;
+		}
+
+		$result = $this->db->fetch_object($query);
+
+		$this->id = $result->rowid;
+		$this->fk_product_parent = $result->fk_product_parent;
+		$this->fk_product_child = $result->fk_product_child;
+		$this->variation_price = $result->variation_price;
+		$this->variation_price_percentage = $result->variation_price_percentage;
+		$this->variation_weight = $result->variation_weight;
+
+		return 1;
+	}
+
+	/**
+	 * Retrieves a product combination by a child product row id
+	 *
+	 * @param int $fk_child Product row id
+	 * @return int <0 KO, >0 OK
+	 */
+	public function fetchByFkProductChild($fk_child)
+	{
+		require_once __DIR__.'/../lib/product_attributes.lib.php';
+
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".(int) $fk_child." AND entity IN (".getProductEntities($this->db).")";
+
+		$query = $this->db->query($sql);
+
+		if (!$query) {
+			return -1;
+		}
+
+		if (!$this->db->num_rows($query)) {
+			return -1;
+		}
+
+		$result = $this->db->fetch_object($query);
+
+		$this->id = $result->rowid;
+		$this->fk_product_parent = $result->fk_product_parent;
+		$this->fk_product_child = $result->fk_product_child;
+		$this->variation_price = $result->variation_price;
+		$this->variation_price_percentage = $result->variation_price_percentage;
+		$this->variation_weight = $result->variation_weight;
+
+		return 1;
+	}
+
+	/**
+	 * Retrieves all product combinations by the product parent row id
+	 *
+	 * @param int $fk_product_parent Rowid of parent product
+	 * @return int|ProductCombination[] <0 KO
+	 */
+	public function fetchAllByFkProductParent($fk_product_parent)
+	{
+		require_once __DIR__.'/../lib/product_attributes.lib.php';
+
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getProductEntities($this->db).")";
+
+		$query = $this->db->query($sql);
+
+		if (!$query) {
+			return -1;
+		}
+
+		$return = array();
+
+		while ($result = $this->db->fetch_object($query)) {
+
+			$tmp = new ProductCombination($this->db);
+			$tmp->id = $result->rowid;
+			$tmp->fk_product_parent = $result->fk_product_parent;
+			$tmp->fk_product_child = $result->fk_product_child;
+			$tmp->variation_price = $result->variation_price;
+			$tmp->variation_price_percentage = $result->variation_price_percentage;
+			$tmp->variation_weight = $result->variation_weight;
+
+			$return[] = $tmp;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Creates a product attribute combination
+	 *
+	 * @return int
+	 */
+	public function create()
+	{
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_combination
+		(fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight, entity)
+		VALUES (".(int) $this->fk_product_parent.", ".(int) $this->fk_product_child.",
+		".(float) $this->variation_price.", ".(int) $this->variation_price_percentage.",
+		".(float) $this->variation_weight.", ".(int) $this->entity.")";
+
+		$query = $this->db->query($sql);
+
+		if (!$query) {
+			return -1;
+		}
+
+		$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_combination');
+
+		return 1;
+	}
+
+	/**
+	 * Updates a product combination
+	 *
+	 * @return int <0 KO, >0 OK
+	 */
+	public function update()
+	{
+		$sql = "UPDATE ".MAIN_DB_PREFIX."product_attribute_combination
+		SET fk_product_parent = ".(int) $this->fk_product_parent.", fk_product_child = ".(int) $this->fk_product_child.",
+		variation_price = ".(float) $this->variation_price.", variation_price_percentage = ".(int) $this->variation_price_percentage.",
+		variation_weight = ".(float) $this->variation_weight." WHERE rowid = ".(int) $this->id;
+
+		$query = $this->db->query($sql);
+
+		if (!$query) {
+			return -1;
+		}
+
+		$parent = new Product($this->db);
+		$parent->fetch($this->fk_product_parent);
+
+		$this->updateProperties($parent);
+
+		return 1;
+	}
+
+	/**
+	 * Deletes a product combination
+	 *
+	 * @return int <0 KO >0 OK
+	 */
+	public function delete()
+	{
+		$this->db->begin();
+
+		$comb2val = new ProductCombination2ValuePair($this->db);
+		$comb2val->deleteByFkCombination($this->id);
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE rowid = ".(int) $this->id;
+
+		if ($this->db->query($sql)) {
+			$this->db->commit();
+			return 1;
+		}
+
+		$this->db->rollback();
+		return -1;
+	}
+
+	/**
+	 * Deletes all product combinations of a parent product
+	 *
+	 * @param int $fk_product_parent Rowid of parent product
+	 * @return int <0 KO >0 OK
+	 */
+	public function deleteByFkProductParent($fk_product_parent)
+	{
+		$this->db->begin();
+
+		foreach ($this->fetchAllByFkProductParent($fk_product_parent) as $prodcomb) {
+
+			$prodstatic = new Product($this->db);
+
+			$res = $prodstatic->fetch($prodcomb->fk_product_child);
+
+			if ($res > 0) {
+				$res = $prodcomb->delete();
+			}
+
+			if ($res > 0 && !$prodstatic->isObjectUsed($prodstatic->id)) {
+				$res = $prodstatic->delete();
+			}
+
+			if ($res < 0) {
+				$this->db->rollback();
+				return -1;
+			}
+		}
+
+		$this->db->commit();
+		return 1;
+	}
+
+	/**
+	 * Updates the weight of the child product. The price must be updated using Product::updatePrices
+	 *
+	 * @param Product $parent Parent product
+	 * @return int >0 OK <0 KO
+	 */
+	public function updateProperties(Product $parent)
+	{
+		global $user, $conf;
+
+		$this->db->begin();
+
+		$child = new Product($this->db);
+		$child->fetch($this->fk_product_child);
+		$child->price_autogen = $parent->price_autogen;
+		$child->weight = $parent->weight + $this->variation_weight;
+		$child->weight_units = $parent->weight_units;
+
+		if ($child->update($child->id, $user) > 0) {
+
+			$new_vat = $parent->tva_tx;
+			$new_npr = $parent->tva_npr;
+
+			// MultiPrix
+			if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
+				$new_type = $parent->multiprices_base_type[1];
+				$new_min_price = $parent->multiprices_min[1];
+				$new_psq = $parent->multiprices_recuperableonly[1];
+
+				if ($new_type == 'TTC') {
+					$new_price = $parent->multiprices_ttc[1];
+				} else {
+					$new_price = $parent->multiprices[1];
+				}
+			} else {
+				$new_type = $parent->price_base_type;
+				$new_min_price = $parent->price_min;
+				$new_psq = $parent->price_by_qty;
+
+				if ($new_type == 'TTC') {
+					$new_price = $parent->price_ttc;
+				} else {
+					$new_price = $parent->price;
+				}
+			}
+
+			if ($this->variation_price_percentage) {
+				$new_price *= 1 + ($this->variation_price/100);
+			} else {
+				$new_price += $this->variation_price;
+			}
+
+			$child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, 1, $new_npr, $new_psq);
+
+			$this->db->commit();
+
+			return 1;
+		}
+
+		$this->db->rollback();
+		return -1;
+	}
+
+	/**
+	 * Retrieves the combination that matches the given features.
+	 *
+	 * @param int $prodid Id of parent product
+	 * @param array $features Format: [$attr] => $attr_val
+	 * @return false|ProductCombination false if not found
+	 */
+	public function fetchByProductCombination2ValuePairs($prodid, array $features)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination2ValuePair.class.php';
+
+		$actual_comp = array();
+
+		$prodcomb2val = new ProductCombination2ValuePair($this->db);
+		$prodcomb = new ProductCombination($this->db);
+
+		foreach ($features as $attr => $attr_val) {
+			$actual_comp[$attr] = $attr_val;
+		}
+
+		foreach ($prodcomb->fetchAllByFkProductParent($prodid) as $prc) {
+
+			$values = array();
+
+			foreach ($prodcomb2val->fetchByFkCombination($prc->id) as $value) {
+				$values[$value->fk_prod_attr] = $value->fk_prod_attr_val;
+			}
+
+			$check1 = count(array_diff_assoc($values, $actual_comp));
+			$check2 = count(array_diff_assoc($actual_comp, $values));
+
+			if (!$check1 && !$check2) {
+				return $prc;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Retrieves all unique attributres for a parent product
+	 *
+	 * @param int $productid Product rowid
+	 * @return ProductAttribute[]
+	 */
+	public function getUniqueAttributesAndValuesByFkProductParent($productid)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttribute.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttributeValue.class.php';
+
+		$attributes = array();
+
+		//Attributes
+		$sql = "SELECT DISTINCT fk_prod_attr, a.rang
+FROM ".MAIN_DB_PREFIX."product_attribute_combination2val c2v LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination c
+    ON c2v.fk_prod_combination = c.rowid
+  LEFT JOIN ".MAIN_DB_PREFIX."product p ON p.rowid = c.fk_product_child
+  LEFT JOIN ".MAIN_DB_PREFIX."product_attribute a ON a.rowid = fk_prod_attr
+WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
+
+		$sql .= $this->db->order('a.rang', 'asc');
+
+		$query = $this->db->query($sql);
+
+		//Values
+		while ($result = $this->db->fetch_object($query)) {
+			$attr = new ProductAttribute($this->db);
+			$attr->fetch($result->fk_prod_attr);
+
+			$tmp = new stdClass();
+			$tmp->id = $attr->id;
+			$tmp->ref = $attr->ref;
+			$tmp->label = $attr->label;
+			$tmp->values = array();
+
+			$attrval = new ProductAttributeValue($this->db);
+			foreach ($res = $attrval->fetchAllByProductAttribute($attr->id, true) as $val) {
+				$tmp->values[] = $val;
+			}
+
+			$attributes[] = $tmp;
+		}
+
+		return $attributes;
+	}
+
+	/**
+	 * Creates a product combination. Check usages to find more about its use
+	 *
+	 * Format of $combinations array:
+	 * array(
+	 * 	0 => array(
+	 * 		attr => value,
+	 * 		attr2 => value
+	 * 		[...]
+	 * 		),
+	 * [...]
+	 * )
+	 *
+	 * @param Product $product Parent product
+	 * @param array $combinations Attribute and value combinations.
+	 * @param array $variations Price and weight variations
+	 * @param bool $price_var_percent Is the price variation a relative variation?
+	 * @param bool|float $forced_pricevar If the price variation is forced
+	 * @param bool|float $forced_weightvar If the weight variation is forced
+	 * @return int <0 KO, >0 OK
+	 */
+	public static function createProductCombination(Product $product, array $combinations, array $variations, $price_var_percent = false, $forced_pricevar = false, $forced_weightvar = false)
+	{
+		global $db, $user;
+
+		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttribute.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttributeValue.class.php';
+
+		$db->begin();
+
+		$newproduct = clone $product;
+
+		//Final weight impact
+		$weight_impact = $forced_weightvar;
+
+		if ($forced_weightvar === false) {
+			$weight_impact = 0;
+		}
+
+		//Final price impact
+		$price_impact = $forced_pricevar;
+
+		if ($forced_pricevar === false) {
+			$price_impact = 0;
+		}
+
+		$newcomb = new ProductCombination($db);
+		$existingCombination = $newcomb->fetchByProductCombination2ValuePairs($product->id, $combinations);
+
+		if ($existingCombination) {
+			$newcomb = $existingCombination;
+		} else {
+			$newcomb->fk_product_parent = $product->id;
+
+			if ($newcomb->create() < 0) {
+				$db->rollback();
+				return -1;
+			}
+		}
+
+		$prodattr = new ProductAttribute($db);
+		$prodattrval = new ProductAttributeValue($db);
+
+		foreach ($combinations as $currcombattr => $currcombval) {
+
+			//This was checked earlier, so no need to double check
+			$prodattr->fetch($currcombattr);
+			$prodattrval->fetch($currcombval);
+
+			//If there is an existing combination, there is no need to duplicate the valuepair
+			if (!$existingCombination) {
+				$tmp = new ProductCombination2ValuePair($db);
+				$tmp->fk_prod_attr = $currcombattr;
+				$tmp->fk_prod_attr_val = $currcombval;
+				$tmp->fk_prod_combination = $newcomb->id;
+
+				if ($tmp->create() < 0) {
+					$db->rollback();
+					return -1;
+				}
+			}
+
+			if ($forced_weightvar === false) {
+				$weight_impact += (float) price2num($variations[$currcombattr][$currcombval]['weight']);
+			}
+			if ($forced_pricevar === false) {
+				$price_impact += (float) price2num($variations[$currcombattr][$currcombval]['price']);
+			}
+
+			$newproduct->ref .= '_'.$prodattrval->ref;
+
+			//The first one should not contain a linebreak
+			if ($newproduct->description) {
+				$newproduct->description .= '<br>';
+			}
+			$newproduct->description .= '<strong>'.$prodattr->label.':</strong> '.$prodattrval->value;
+		}
+
+		$newcomb->variation_price_percentage = $price_var_percent;
+		$newcomb->variation_price = $price_impact;
+		$newcomb->variation_weight = $weight_impact;
+
+		$newproduct->weight += $weight_impact;
+
+		//To avoid wrong information in price history log
+		$newproduct->price = 0;
+		$newproduct->price_ttc = 0;
+		$newproduct->price_min = 0;
+		$newproduct->price_min_ttc = 0;
+
+		if ($newproduct->create($user) < 0) {
+
+			//In case the error is not related with an already existing product
+			if ($newproduct->error != 'ErrorProductAlreadyExists') {
+				$db->rollback();
+				return -1;
+			}
+
+			/**
+			 * If there is an existing combination, then we update the prices and weight
+			 * Otherwise, we try adding a random number to the ref
+			 */
+
+			if ($newcomb->fk_product_child) {
+				$res = $newproduct->fetch($existingCombination->fk_product_child);
+			} else {
+				$orig_prod_ref = $newproduct->ref;
+				$i = 1;
+
+				do {
+					$newproduct->ref = $orig_prod_ref.$i;
+					$res = $newproduct->create($user);
+
+					if ($newproduct->error != 'ErrorProductAlreadyExists') {
+						break;
+					}
+
+					$i++;
+				} while ($res < 0);
+			}
+
+			if ($res < 0) {
+				$db->rollback();
+				return -1;
+			}
+
+			$newproduct->weight += $weight_impact;
+		}
+
+		$newcomb->fk_product_child = $newproduct->id;
+
+		if ($newcomb->update() < 0) {
+			$db->rollback();
+			return -1;
+		}
+
+		$db->commit();
+		return 1;
+	}
+
+	/**
+	 * Copies all product combinations from the origin product to the destination product
+	 *
+	 * @param int $origProductId Origin product id
+	 * @param Product $destProduct Destination product
+	 * @return int >0 OK <0 KO
+	 */
+	public function copyAll($origProductId, Product $destProduct)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination2ValuePair.class.php';
+
+		//To prevent a loop
+		if ($origProductId == $destProduct->id) {
+			return -1;
+		}
+
+		$prodcomb = new ProductCombination($this->db);
+		$prodcomb2val = new ProductCombination2ValuePair($this->db);
+
+		//Retrieve all product combinations
+		$combinations = $prodcomb->fetchAllByFkProductParent($origProductId);
+
+		foreach ($combinations as $combination) {
+
+			$variations = array();
+
+			foreach ($prodcomb2val->fetchByFkCombination($combination->id) as $tmp_pc2v) {
+				$variations[$tmp_pc2v->fk_prod_attr] = $tmp_pc2v->fk_prod_attr_val;
+			}
+
+			if (self::createProductCombination(
+				$destProduct,
+				$variations,
+				array(),
+				$combination->variation_price_percentage,
+				$combination->variation_price,
+				$combination->variation_weight
+			) < 0) {
+				return -1;
+			}
+		}
+
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/htdocs/attributes/class/ProductCombination2ValuePair.class.php b/htdocs/attributes/class/ProductCombination2ValuePair.class.php
new file mode 100644
index 00000000000..93521b86bbf
--- /dev/null
+++ b/htdocs/attributes/class/ProductCombination2ValuePair.class.php
@@ -0,0 +1,151 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class ProductCombination2ValuePair
+{
+	/**
+	 * Database handler
+	 * @var DoliDB
+	 */
+	private $db;
+
+	/**
+	 * Combination 2 value pair id
+	 * @var int
+	 */
+	public $id;
+
+	/**
+	 * Product combination id
+	 * @var int
+	 */
+	public $fk_prod_combination;
+
+	/**
+	 * Product attribute id
+	 * @var int
+	 */
+	public $fk_prod_attr;
+
+	/**
+	 * Product attribute value id
+	 * @var int
+	 */
+	public $fk_prod_attr_val;
+
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Translates this class to a human-readable string
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttributeValue.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttribute.class.php';
+
+		$prodattr = new ProductAttribute($this->db);
+		$prodattrval = new ProductAttributeValue($this->db);
+
+		$prodattr->fetch($this->fk_prod_attr);
+		$prodattrval->fetch($this->fk_prod_attr_val);
+
+		return $prodattr->label.': '.$prodattrval->value;
+	}
+
+	/**
+	 * Creates a product combination 2 value pair
+	 * @return int <0 KO, >0 OK
+	 */
+	public function create()
+	{
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_combination2val
+		(fk_prod_combination, fk_prod_attr, fk_prod_attr_val)
+		VALUES(".(int) $this->fk_prod_combination.", ".(int) $this->fk_prod_attr.", ".(int) $this->fk_prod_attr_val.")";
+
+		$query = $this->db->query($sql);
+
+		if ($query) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_combination2val');
+
+			return 1;
+		}
+
+		return -1;
+	}
+
+	/**
+	 * Retrieves a product combination 2 value pair from its rowid
+	 *
+	 * @param int $fk_combination Fk combination to search
+	 * @return int|ProductCombination2ValuePair[] -1 if KO
+	 */
+	public function fetchByFkCombination($fk_combination)
+	{
+		$sql = "SELECT
+  c.rowid,
+  c2v.fk_prod_attr_val,
+  c2v.fk_prod_attr,
+  c2v.fk_prod_combination
+FROM ".MAIN_DB_PREFIX."product_attribute c LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr
+WHERE c2v.fk_prod_combination = ".(int) $fk_combination;
+
+		$sql .= $this->db->order('c.rang', 'asc');
+
+		$query = $this->db->query($sql);
+
+		if (!$query) {
+			return -1;
+		}
+
+		$return = array();
+
+		while ($result = $this->db->fetch_object($query)) {
+			$tmp = new ProductCombination2ValuePair($this->db);
+			$tmp->fk_prod_attr_val = $result->fk_prod_attr_val;
+			$tmp->fk_prod_attr = $result->fk_prod_attr;
+			$tmp->fk_prod_combination = $result->fk_prod_combination;
+			$tmp->id = $result->rowid;
+
+			$return[] = $tmp;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Deletes a product combination 2 value pair
+	 *
+	 * @param int $fk_combination Rowid of the combination
+	 * @return int >0 OK <0 KO
+	 */
+	public function deleteByFkCombination($fk_combination)
+	{
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination2val WHERE fk_prod_combination = ".(int) $fk_combination;
+
+		if ($this->db->query($sql)) {
+			return 1;
+		}
+
+		return -1;
+	}
+}
\ No newline at end of file
diff --git a/htdocs/attributes/class/index.html b/htdocs/attributes/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/attributes/combinations.php b/htdocs/attributes/combinations.php
new file mode 100644
index 00000000000..b8a758c2341
--- /dev/null
+++ b/htdocs/attributes/combinations.php
@@ -0,0 +1,641 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttribute.class.php';
+require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttributeValue.class.php';
+require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination2ValuePair.class.php';
+
+$langs->load("products");
+$langs->load("other");
+
+$var = false;
+$id = GETPOST('id', 'int');
+$valueid = GETPOST('valueid', 'int');
+$ref = GETPOST('ref');
+$weight_impact = (float) GETPOST('weight_impact');
+$price_impact = (float) GETPOST('price_impact');
+$price_impact_percent = (bool) GETPOST('price_impact_percent');
+$form = new Form($db);
+$action = GETPOST('action');
+
+// Security check
+$fieldvalue = (! empty($id) ? $id : $ref);
+$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
+$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
+
+$prodstatic = new Product($db);
+$prodattr = new ProductAttribute($db);
+$prodattr_val = new ProductAttributeValue($db);
+
+$product = new Product($db);
+
+$product->fetch($id);
+
+if (!$product->isProduct()) {
+	header('Location: '.dol_buildpath('/product/card.php?id='.$product->id, 2));
+	die;
+}
+
+$prodcomb = new ProductCombination($db);
+$prodcomb2val = new ProductCombination2ValuePair($db);
+
+$productCombination2ValuePairs1 = array();
+
+if ($_POST) {
+
+	if ($action == 'add') {
+
+		$features = GETPOST('features', 'array');
+
+		if (!$features) {
+			setEventMessage($langs->trans('ErrorFieldsRequired'), 'errors');
+		} else {
+			$weight_impact = price2num($weight_impact);
+			$price_impact = price2num($price_impact);
+			$sanit_features = array();
+
+			//First, sanitize
+			foreach ($features as $feature) {
+
+				$explode = explode(':', $feature);
+
+				if ($prodattr->fetch($explode[0]) < 0) {
+					continue;
+				}
+
+				if ($prodattr_val->fetch($explode[1]) < 0) {
+					continue;
+				}
+
+				//Valuepair
+				$sanit_features[$explode[0]] = $explode[1];
+
+				$tmp = new ProductCombination2ValuePair($db);
+				$tmp->fk_prod_attr = $explode[0];
+				$tmp->fk_prod_attr_val = $explode[1];
+
+				$productCombination2ValuePairs1[] = $tmp;
+			}
+
+			$db->begin();
+
+			if (!$prodcomb->fetchByProductCombination2ValuePairs($id, $sanit_features)) {
+				if (ProductCombination::createProductCombination($product, $sanit_features, array(), $price_impact_percent, $price_impact, $weight_impact)) {
+					$db->commit();
+					setEventMessage($langs->trans('RecordSaved'));
+					header('Location: '.dol_buildpath('/attributes/combinations.php?id='.$id, 2));
+					die;
+				} else {
+					setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
+				}
+			} else {
+				setEventMessage($langs->trans('ErrorRecordAlreadyExists'), 'errors');
+			}
+
+			$db->rollback();
+		}
+	} elseif ($action == 'bulk_actions') {
+
+		$prodarray = array_keys(GETPOST('select', 'array'));
+		$bulkaction = GETPOST('bulk_action');
+		$error = 0;
+
+		$prodstatic = new Product($db);
+
+		$db->begin();
+
+		foreach ($prodarray as $prodid) {
+
+			if ($prodstatic->fetch($prodid) < 0) {
+				continue;
+			}
+
+			if ($bulkaction == 'on_sell') {
+				$prodstatic->status = 1;
+				$res = $prodstatic->update($prodstatic->id, $user);
+			} elseif ($bulkaction == 'on_buy') {
+				$prodstatic->status_buy = 1;
+				$res = $prodstatic->update($prodstatic->id, $user);
+			} elseif ($bulkaction == 'not_sell') {
+				$prodstatic->status = 0;
+				$res = $prodstatic->update($prodstatic->id, $user);
+			} elseif ($bulkaction == 'not_buy') {
+				$prodstatic->status_buy = 0;
+				$res = $prodstatic->update($prodstatic->id, $user);
+			} elseif ($bulkaction == 'delete') {
+				$res = $prodstatic->delete($prodstatic->id);
+			} else {
+				break;
+			}
+
+			if ($res <= 0) {
+				$error++;
+				break;
+			}
+		}
+
+		if ($error) {
+			$db->rollback();
+
+			if ($prodstatic->error) {
+				setEventMessage($langs->trans($prodstatic->error), 'errors');
+			} else {
+				setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
+			}
+
+		} else {
+			$db->commit();
+			setEventMessage($langs->trans('RecordSaved'));
+		}
+
+	} else {
+
+		if ($prodcomb->fetch($valueid) < 0) {
+			dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
+			die;
+		}
+
+		$prodcomb->variation_price_percentage = $price_impact_percent;
+		$prodcomb->variation_price = $price_impact;
+		$prodcomb->variation_weight = $weight_impact;
+
+		if ($prodcomb->update() > 0) {
+			setEventMessage($langs->trans('RecordSaved'));
+			header('Location: '.dol_buildpath('/attributes/combinations.php?id='.$id, 2));
+			die;
+		} else {
+			setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
+		}
+	}
+}
+
+$productCombinations = $prodcomb->fetchAllByFkProductParent($id);
+
+if ($action === 'confirm_deletecombination') {
+
+	if ($prodcomb->fetch($valueid) > 0) {
+
+		$db->begin();
+
+		if ($prodcomb->delete() > 0 && $prodstatic->fetch($prodcomb->fk_product_child) > 0 && $prodstatic->delete() > 0) {
+			$db->commit();
+			setEventMessage($langs->trans('RecordSaved'));
+			header('Location: '.dol_buildpath('/attributes/combinations.php?id='.$product->id, 2));
+			die;
+		}
+
+		$db->rollback();
+		setEventMessage($langs->trans('ProductCombinationAlreadyUsed'), 'errors');
+		$action = '';
+	}
+} elseif ($action === 'edit') {
+
+	if ($prodcomb->fetch($valueid) < 0) {
+		dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
+		die;
+	}
+
+	$weight_impact = $prodcomb->variation_weight;
+	$price_impact = $prodcomb->variation_price;
+	$price_impact_percent = $prodcomb->variation_price_percentage;
+
+	$productCombination2ValuePairs1 = $prodcomb2val->fetchByFkCombination($valueid);
+} elseif ($action === 'confirm_copycombination') {
+
+	//Check destination product
+	$dest_product = GETPOST('dest_product');
+
+	if ($prodstatic->fetch('', $dest_product) > 0) {
+
+		//To prevent from copying to the same product
+		if ($prodstatic->ref != $product->ref) {
+			if ($prodcomb->copyAll($product->id, $prodstatic) > 0) {
+				header('Location: '.dol_buildpath('/attributes/combinations.php?id='.$prodstatic->id, 2));
+				die;
+			} else {
+				setEventMessage($langs->trans('ErrorCopyProductCombinations'), 'errors');
+			}
+		}
+
+	} else {
+		setEventMessage($langs->trans('ErrorDestinationProductNotFound'), 'errors');
+	}
+
+}
+
+/*
+ *	View
+ */
+
+if (! empty($id) || ! empty($ref)) {
+	$object = new Product($db);
+	$result = $object->fetch($id, $ref);
+
+	llxHeader("", "", $langs->trans("CardProduct".$object->type));
+
+	if ($result) {
+		$head = product_prepare_head($object);
+		$titre = $langs->trans("CardProduct".$object->type);
+		$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
+
+		dol_fiche_head($head, 'combinations', $titre, 0, $picto);
+
+		print '<table class="border" width="100%">';
+
+		// Reference
+		print '<tr>';
+		print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
+		print $form->showrefnav($object, 'id', '', 0);
+		print '</td>';
+		print '</tr>';
+
+		// Label
+		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
+
+		// Status (to sell)
+		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
+		print $object->getLibStatut(2, 0);
+		print '</td></tr>';
+
+		// Status (to buy)
+		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td>';
+		print $object->getLibStatut(2, 1);
+		print '</td></tr>';
+
+		print '</table>';
+
+		dol_fiche_end();
+	}
+
+	if ($action == 'add' || ($action == 'edit')) {
+
+		if ($action == 'add') {
+			$title = $langs->trans('NewProductCombination');
+		} else {
+			$title = $langs->trans('EditProductCombination');
+		}
+
+		print_fiche_titre($title);
+
+		if ($action == 'add') {
+			$prodattr_all = $prodattr->fetchAll();
+
+			if (!$selected) {
+				$selected = $prodattr_all[key($prodattr_all)]->id;
+			}
+
+			$prodattr_alljson = array();
+
+			foreach ($prodattr_all as $each) {
+				$prodattr_alljson[$each->id] = $each;
+			}
+
+		?>
+
+		<script>
+
+			attributes_available = <?php echo json_encode($prodattr_alljson) ?>;
+			attributes_selected = {
+				index: [],
+				info: []
+			};
+
+			<?php foreach ($productCombination2ValuePairs1 as $pc2v):
+			$prodattr_val->fetch($pc2v->fk_prod_attr_val);
+			?>
+			attributes_selected.index.push(<?php echo $pc2v->fk_prod_attr ?>);
+			attributes_selected.info[<?php echo $pc2v->fk_prod_attr ?>] = {
+				attribute: attributes_available[<?php echo $pc2v->fk_prod_attr ?>],
+				value: {
+					id: <?php echo $pc2v->fk_prod_attr_val ?>,
+					label: '<?php echo $prodattr_val->value ?>'
+				}
+			};
+			<?php endforeach ?>
+
+			restoreAttributes = function() {
+				jQuery("select[name=attribute]").empty().append('<option value=""></option>');
+
+				jQuery.each(attributes_available, function (key, val) {
+					if (jQuery.inArray(val.id, attributes_selected.index) == -1) {
+						jQuery("select[name=attribute]").append('<option value="' + val.id + '">' + val.label + '</option>');
+					}
+				});
+			};
+
+			paintAttributes = function() {
+				var select = jQuery("select#features");
+
+				select.empty();
+				jQuery("form#combinationform input[type=hidden]").detach();
+
+				jQuery.each(attributes_selected.index, function (key, val) {
+					var attr_info = attributes_selected.info[val];
+
+					var opt_key = val + ':' + attr_info.value.id;
+					var opt_label = attr_info.attribute.label + ': ' + attr_info.value.label;
+
+					//Add combination to the list
+					select.append('<option value="' + opt_key + '">' + opt_label + '</option>');
+					//Add hidden input to catch the new combination
+					jQuery("form#combinationform").append('<input type="hidden" name="features[]" value="' + opt_key + '">');
+				});
+			};
+
+			jQuery(document).ready(function() {
+
+				jQuery("select#attribute").change(function () {
+
+					var select = jQuery("select#value");
+
+					if (!jQuery(this).val().length) {
+						select.empty();
+						return;
+					}
+
+					select.empty().append('<option value="">Loading...</option>');
+
+					jQuery.getJSON("<?php echo dol_buildpath('/attributes/ajax/get_attribute_values.php', 2) ?>", {
+						id: jQuery(this).val()
+					}, function(data) {
+						if (data.error) {
+							jQuery("select#value").empty();
+							return alert(data.error);
+						}
+
+						select.empty();
+
+						jQuery(data).each(function (key, val) {
+							jQuery("select#value").append('<option value="' + val.id + '">' + val.value + '</option>');
+						});
+					});
+				});
+
+				jQuery("#addfeature").click(function () {
+					var selectedattr = jQuery("select[name=attribute] option:selected");
+					var selectedvalu = jQuery("select[name=value] option:selected");
+
+					if (!selectedattr.val().length || !selectedvalu.val().length) {
+						return;
+					}
+
+					var selectedattr_val = parseInt(selectedattr.val());
+
+					if (jQuery.inArray(selectedattr_val, attributes_selected.index) != -1) {
+						return;
+					}
+
+					attributes_selected.index.push(selectedattr_val);
+					attributes_selected.info[selectedattr_val] = {
+						attribute: attributes_available[selectedattr_val],
+						value: {
+							id: selectedvalu.val(),
+							label: selectedvalu.html()
+						}
+					};
+
+					paintAttributes();
+
+					selectedattr.detach();
+					jQuery("select[name=value] option").detach();
+				});
+
+				jQuery("#delfeature").click(function() {
+					jQuery("#features option:selected").each(function (key, val) {
+						var explode = jQuery(val).val().split(':');
+						var indexOf = attributes_selected.index.indexOf(parseInt(explode[0]));
+
+						if (indexOf != -1) {
+							attributes_selected.index.splice(indexOf, 1);
+							jQuery(attributes_selected.info[parseInt(explode[0])]).detach();
+						}
+
+						jQuery(val).detach();
+					});
+
+					restoreAttributes();
+					paintAttributes();
+				});
+			});
+		</script>
+		<?php } ?>
+
+		<form method="post" id="combinationform">
+		<table class="border" style="width: 100%">
+			<?php if ($action == 'add'): ?>
+			<tr>
+				<td style="width: 25%"><label for="attribute"><?php echo $langs->trans('ProductAttribute') ?></label></td>
+				<td colspan="2"><select id="attribute" name="attribute">
+					<option value=""></option>
+					<?php foreach ($prodattr_all as $attr): ?>
+					<option value="<?php echo $attr->id ?>"><?php echo $attr->label ?></option>
+					<?php endforeach ?>
+				</select></td>
+			</tr>
+			<tr>
+				<td style="width: 25%"><label for="value"><?php echo $langs->trans('Value') ?></label></td>
+				<td colspan="2">
+					<select id="value" name="value">
+						<option value=""></option>
+					</select>
+				</td>
+			</tr>
+			<?php endif; ?>
+			<tr>
+				<td style="width: 25%" class="fieldrequired"><label for="features"><?php echo $langs->trans('Features') ?></label></td>
+				<td><select multiple style="width: 100%" id="features">
+						<?php
+						foreach ($productCombination2ValuePairs1 as $pc2v): ?>
+							<option value="<?php echo $pc2v->fk_prod_attr ?>:<?php echo $pc2v->fk_prod_attr_val ?>"><?php echo dol_htmlentities($pc2v) ?></option>
+						<?php endforeach ?>
+					</select></td>
+				<td>
+					<?php if ($action == 'add'): ?>
+					<a href="#" class="button" id="addfeature"><?php echo img_edit_add() ?></a><br><br>
+					<a href="#" class="button" id="delfeature"><?php echo img_edit_remove() ?></a>
+					<?php endif; ?>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 25%"><label for="price_impact"><?php echo $langs->trans('PriceImpact') ?></label></td>
+				<td colspan="2"><input type="text" id="price_impact" name="price_impact" value="<?php echo price($price_impact) ?>">
+				<input type="checkbox" id="price_impact_percent" name="price_impact_percent" <?php echo $price_impact_percent ? ' checked' : '' ?>> <label for="price_impact_percent"><?php echo $langs->trans('PercentageVariation') ?></label></td>
+			</tr>
+			<tr>
+				<td style="width: 25%"><label for="weight_impact"><?php echo $langs->trans('WeightImpact') ?></label></td>
+				<td colspan="2"><input type="text" id="weight_impact" name="weight_impact" value="<?php echo price($weight_impact) ?>"></td>
+			</tr>
+		</table>
+
+		<br>
+		<div style="text-align: center"><input type="submit" value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans('Save') ?>" class="button"></div>
+			<?php foreach ($productCombination2ValuePairs1 as $pc2v): ?>
+				<input type="hidden" name="features[]" value="<?php echo $pc2v->fk_prod_attr.':'.$pc2v->fk_prod_attr_val ?>">
+			<?php endforeach; ?>
+		</form>
+<?php
+
+	} else {
+
+		if ($action === 'delete') {
+
+			if ($prodcomb->fetch($valueid) > 0) {
+				$form = new Form($db);
+				$prodstatic->fetch($prodcomb->fk_product_child);
+
+				print $form->formconfirm(
+					"combinations.php?id=".$id."&valueid=".$valueid,
+					$langs->trans('Delete'),
+					$langs->trans('ProductCombinationDeleteDialog', $prodstatic->getNomUrl(1)),
+					"confirm_deletecombination",
+					'',
+					0,
+					1
+				);
+			}
+		} elseif ($action === 'copy') {
+
+			$form = new Form($db);
+
+			print $form->formconfirm(
+				'combinations.php?id='.$id,
+				$langs->trans('CloneCombinationsProduct'),
+				$langs->trans('ConfirmCloneProductCombinations'),
+				'confirm_copycombination',
+				array(
+					array(
+						'type' => 'text',
+						'label' => $langs->trans('CloneDestinationReference'),
+						'name' => 'dest_product'
+					)
+				),
+				0,
+				1
+			);
+		}
+
+		$comb2val = new ProductCombination2ValuePair($db);
+
+		if ($productCombinations): ?>
+
+			<script type="text/javascript">
+				jQuery(document).ready(function() {
+
+					jQuery('input[name="select_all"]').click(function() {
+
+						if (jQuery(this).prop('checked')) {
+							var checked = true;
+						} else {
+							var checked = false;
+						}
+
+						jQuery('table.liste input[type="checkbox"]').prop('checked', checked);
+					});
+
+					jQuery('input[name^="select["]').click(function() {
+						jQuery('input[name="select_all"]').prop('checked', false);
+					});
+
+				});
+			</script>
+
+		<form method="post">
+		<label for="bulk_action"><?php echo $langs->trans('BulkActions') ?></label>
+		<select id="bulk_action" name="bulk_action" class="flat">
+			<option value="not_buy"><?php echo $langs->trans('ProductStatusNotOnBuy') ?></option>
+			<option value="not_sell"><?php echo $langs->trans('ProductStatusNotOnSell') ?></option>
+			<option value="on_buy"><?php echo $langs->trans('ProductStatusOnBuy') ?></option>
+			<option value="on_sell"><?php echo $langs->trans('ProductStatusOnSell') ?></option>
+			<option value="delete"><?php echo $langs->trans('Delete') ?></option>
+		</select>
+		<input type="hidden" name="action" value="bulk_actions">
+		<input type="submit" value="Aplicar" class="button">
+		<br>
+		<br>
+		<?php endif; ?>
+
+		<table class="liste">
+			<tr class="liste_titre">
+				<th class="liste_titre">
+					<?php if ($productCombinations): ?>
+					<input type="checkbox" name="select_all">
+					<?php endif ?>
+				</th>
+				<th class="liste_titre"><?php echo $langs->trans('Product') ?></th>
+				<th class="liste_titre"><?php echo $langs->trans('Combination') ?></th>
+				<th class="liste_titre" style="text-align: center"><?php echo $langs->trans('PriceImpact') ?></th>
+				<th class="liste_titre" style="text-align: center"><?php echo $langs->trans('WeightImpact') ?></th>
+				<th class="liste_titre" style="text-align: center;"><?php echo $langs->trans('OnSell') ?></th>
+				<th class="liste_titre" style="text-align: center;"><?php echo $langs->trans('OnBuy') ?></th>
+				<th class="liste_titre"></th>
+			</tr>
+			<?php foreach ($productCombinations as $currcomb):
+				$prodstatic->fetch($currcomb->fk_product_child); ?>
+			<tr <?php echo $bc[!$var] ?>>
+				<td><input type="checkbox" name="select[<?php echo $prodstatic->id ?>]"></td>
+				<td><?php echo $prodstatic->getNomUrl(1) ?></td>
+				<td>
+					<?php
+
+					$productCombination2ValuePairs = $comb2val->fetchByFkCombination($currcomb->id);
+					$iMax = count($productCombination2ValuePairs);
+
+					for ($i = 0; $i < $iMax; $i++) {
+						echo dol_htmlentities($productCombination2ValuePairs[$i]);
+
+						if ($i !== ($iMax - 1)) {
+							echo ', ';
+						}
+					} ?>
+				</td>
+				<td style="text-align: right"><?php echo ($currcomb->variation_price >= 0 ? '+' : '').price($currcomb->variation_price).($currcomb->variation_price_percentage ? ' %' : '') ?></td>
+				<td style="text-align: right"><?php echo ($currcomb->variation_weight >= 0 ? '+' : '').price($currcomb->variation_weight).' '.measuring_units_string($prodstatic->weight_units, 'weight') ?></td>
+				<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 0) ?></td>
+				<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 1) ?></td>
+				<td style="text-align: right">
+					<a href="<?php echo dol_buildpath('/attributes/combinations.php?id='.$id.'&action=edit&valueid='.$currcomb->id, 2) ?>"><?php echo img_edit() ?></a>
+					<a href="<?php echo dol_buildpath('/attributes/combinations.php?id='.$id.'&action=delete&valueid='.$currcomb->id, 2) ?>"><?php echo img_delete() ?></a>
+				</td>
+			</tr>
+			<?php $var = !$var; endforeach ?>
+		</table>
+
+		<?php if ($productCombinations): ?>
+		</form>
+		<?php endif ?>
+
+		<?php
+
+		print '<div class="tabsAction">';
+		print '	<div class="inline-block divButAction">';
+		if ($productCombinations) {
+			print '		<a href="combinations.php?id='.$id.'&action=copy" class="butAction">'.$langs->trans('Copy').'</a>';
+		}
+		print '		<a href="generator.php?id='.$id.'" class="butAction">'.$langs->trans('ProductCombinationGenerator').'</a>
+		<a href="combinations.php?id='.$id.'&action=add" class="butAction">'.$langs->trans('NewProductCombination').'</a>';
+		print '	</div>';
+		print '</div>';
+
+	}
+}
+
+llxFooter();
diff --git a/htdocs/attributes/create.php b/htdocs/attributes/create.php
new file mode 100644
index 00000000000..5b68ed28907
--- /dev/null
+++ b/htdocs/attributes/create.php
@@ -0,0 +1,73 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+require '../main.inc.php';
+require 'class/ProductAttribute.class.php';
+
+$ref = GETPOST('ref');
+$label = GETPOST('label');
+
+if ($_POST) {
+
+	if (empty($ref) || empty($label)) {
+		setEventMessage($langs->trans('ErrorFieldsRequired'), 'errors');
+	} else {
+
+		$prodattr = new ProductAttribute($db);
+		$prodattr->label = $label;
+		$prodattr->ref = $ref;
+
+		if ($prodattr->create()) {
+			setEventMessage($langs->trans('RecordSaved'));
+			header('Location: '.dol_buildpath('/attributes/list.php', 2));
+		} else {
+			setEventMessage($langs->trans('ErrorRecordAlreadyExists'), 'errors');
+		}
+	}
+}
+
+$langs->load('products');
+
+$title = $langs->trans('NewProductAttribute');
+
+llxHeader('', $title);
+
+print_fiche_titre($title);
+
+dol_fiche_head();
+
+?>
+<form method="post">
+	<table class="border" style="width: 100%">
+		<tr>
+			<td class="fieldrequired"><label for="ref"><?php echo $langs->trans('Ref') ?></label></td>
+			<td><input type="text" id="ref" name="ref" value="<?php echo $ref ?>"></td>
+		</tr>
+		<tr>
+			<td class="fieldrequired"><label for="label"><?php echo $langs->trans('Label') ?></label></td>
+			<td><input type="text" id="label" name="label" value="<?php echo $label ?>"></td>
+		</tr>
+
+	</table>
+
+<?php
+dol_fiche_end();
+
+print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></div></form>';
+
+llxFooter();
\ No newline at end of file
diff --git a/htdocs/attributes/create_val.php b/htdocs/attributes/create_val.php
new file mode 100644
index 00000000000..b25e24fa64a
--- /dev/null
+++ b/htdocs/attributes/create_val.php
@@ -0,0 +1,102 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+require '../main.inc.php';
+require 'class/ProductAttribute.class.php';
+require 'class/ProductAttributeValue.class.php';
+
+$id = GETPOST('id');
+$ref = GETPOST('ref');
+$value = GETPOST('value');
+
+$prodattr = new ProductAttribute($db);
+$prodattrval = new ProductAttributeValue($db);
+
+if ($prodattr->fetch($id) < 1) {
+	dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
+	die;
+}
+
+if ($_POST) {
+
+	if (empty($ref) || empty($value)) {
+		setEventMessage($langs->trans('ErrorFieldsRequired'), 'errors');
+	} else {
+
+		$prodattrval->fk_product_attribute = $prodattr->id;
+		$prodattrval->ref = $ref;
+		$prodattrval->value = $value;
+
+		if ($prodattrval->create() > 0) {
+			setEventMessage($langs->trans('RecordSaved'));
+			header('Location: '.dol_buildpath('/attributes/card.php?id='.$prodattr->id, 2));
+			die;
+		} else {
+			setEventMessage($langs->trans('ErrorCreatingProductAttributeValue'), 'errors');
+		}
+	}
+
+}
+
+$langs->load('products');
+
+$title = $langs->trans('ProductAttributeName', dol_htmlentities($prodattr->label));
+
+llxHeader('', $title);
+
+print_fiche_titre($title);
+
+dol_fiche_head();
+
+?>
+<table class="border" style="width: 100%">
+	<tr>
+		<td style="width: 15%" class="fieldrequired"><?php echo $langs->trans('Ref') ?></td>
+		<td><?php echo dol_htmlentities($prodattr->ref) ?>
+	</tr>
+	<tr>
+		<td style="width: 15%" class="fieldrequired"><?php echo $langs->trans('Label') ?></td>
+		<td><?php echo dol_htmlentities($prodattr->label) ?></td>
+	</tr>
+</table>
+
+<?php
+
+dol_fiche_end();
+
+print_fiche_titre($langs->trans('NewProductAttributeValue'));
+
+dol_fiche_head();
+?>
+<form method="post">
+	<table class="border" style="width: 100%">
+		<tr>
+			<td style="width: 15%" class="fieldrequired"><label for="ref"><?php echo $langs->trans('Ref') ?></label></td>
+			<td><input id="ref" type="text" name="ref" value="<?php echo $ref ?>"></td>
+		</tr>
+		<tr>
+			<td style="width: 15%" class="fieldrequired"><label for="value"><?php echo $langs->trans('Value') ?></label></td>
+			<td><input id="value" type="text" name="value" value="<?php echo $value ?>"></td>
+		</tr>
+	</table>
+<?php
+dol_fiche_end();
+
+print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></div></form>';
+
+llxFooter();
\ No newline at end of file
diff --git a/htdocs/attributes/generator.php b/htdocs/attributes/generator.php
new file mode 100644
index 00000000000..37f2175cc49
--- /dev/null
+++ b/htdocs/attributes/generator.php
@@ -0,0 +1,393 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttribute.class.php';
+require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttributeValue.class.php';
+require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination2ValuePair.class.php';
+
+$langs->load("products");
+$langs->load('other');
+
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref');
+$form = new Form($db);
+
+// Security check
+$fieldvalue = (! empty($id) ? $id : $ref);
+$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
+$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
+
+$prodattr = new ProductAttribute($db);
+$prodattrval = new ProductAttributeValue($db);
+$product = new Product($db);
+
+$product->fetch($id);
+
+if (!$product->isProduct()) {
+	header('Location: '.dol_buildpath('/product/card.php?id='.$product->id, 2));
+	die;
+}
+
+/**
+ * Posible combinations. Format.
+ * attrval => array(
+ * 		valueid => array(
+ * 			price => ''
+ * 			weight => ''
+ * 		)
+ * )
+ */
+$combinations = GETPOST('combinations', 'array');
+$price_var_percent = (bool) GETPOST('price_var_percent');
+$donotremove = true;
+
+if ($_POST) {
+
+	$donotremove = (bool) GETPOST('donotremove');
+
+	//We must check if all those given combinations actually exist
+	$sanitized_values = array();
+
+	foreach ($combinations as $attr => $val) {
+		if ($prodattr->fetch($attr) > 0) {
+			foreach ($val as $valueid => $content) {
+				if ($prodattrval->fetch($valueid) > 0) {
+					$sanitized_values[$attr][$valueid] = $content;
+				}
+			}
+		}
+	}
+
+	if ($sanitized_values) {
+
+		require DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+		$adapted_values = array();
+
+		//Adapt the array to the cartesian function
+		foreach ($sanitized_values as $attr => $val) {
+			$adapted_values[$attr] = array_keys($val);
+		}
+
+		$db->begin();
+
+		$combination = new ProductCombination($db);
+
+		$delete_prev_comb_res = 1;
+
+		if (!$donotremove) {
+			$delete_prev_comb_res = $combination->deleteByFkProductParent($id);
+		}
+
+		//Current combinations will be deleted
+		if ($delete_prev_comb_res > 0) {
+
+			$res = 1;
+
+			foreach (cartesianArray($adapted_values) as $currcomb) {
+
+				$res = ProductCombination::createProductCombination($product, $currcomb, $sanitized_values, $price_var_percent);
+
+				if ($res < 0) {
+					break;
+				}
+			}
+
+			if ($res > 0) {
+				$db->commit();
+				setEventMessage($langs->trans('RecordSaved'));
+				header('Location: '.dol_buildpath('/attributes/combinations.php?id='.$id, 2));
+				die;
+			} else {
+				setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
+			}
+		} else {
+			setEventMessage($langs->trans('ErrorDeletingGeneratedProducts'), 'errors');
+		}
+
+		$db->rollback();
+
+	} else {
+		setEventMessage($langs->trans('ErrorFieldsRequired'), 'errors');
+	}
+}
+
+/*
+ *	View
+ */
+
+if (! empty($id) || ! empty($ref)) {
+	$object = new Product($db);
+	$result = $object->fetch($id, $ref);
+
+	llxHeader("", "", $langs->trans("CardProduct".$object->type));
+
+	if ($result) {
+		$head = product_prepare_head($object);
+		$titre = $langs->trans("CardProduct".$object->type);
+		$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
+
+		dol_fiche_head($head, 'combinations', $titre, 0, $picto);
+
+		print '<table class="border" width="100%">';
+
+		// Reference
+		print '<tr>';
+		print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
+		print $form->showrefnav($object, 'id', '', 0);
+		print '</td>';
+		print '</tr>';
+
+		// Label
+		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
+
+		// Status (to sell)
+		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
+		print $object->getLibStatut(2, 0);
+		print '</td></tr>';
+
+		// Status (to buy)
+		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td>';
+		print $object->getLibStatut(2, 1);
+		print '</td></tr>';
+
+		print '</table>';
+
+		dol_fiche_end();
+	}
+
+	print_fiche_titre($langs->trans('ProductCombinationGenerator'));
+
+	$dictionnary_attr = array();
+
+	foreach ($prodattr->fetchAll() as $attr) {
+		$dictionnary_attr[$attr->id] = $attr;
+		foreach ($prodattrval->fetchAllByProductAttribute($attr->id) as $attrval) {
+			$dictionnary_attr[$attr->id]->values[$attrval->id] = $attrval;
+		}
+	}
+	?>
+
+	<script>
+
+		dictionnary_attr = <?php echo json_encode($dictionnary_attr) ?>;
+		weight_units = '<?php echo measuring_units_string($object->weight_units, 'weight') ?>';
+		attr_selected = {};
+		percentage_variation = jQuery('input#price_var_percent').prop('checked');
+
+		function parseSelectedFeatures(attr, val, inputs) {
+
+			var price = '';
+			var weight = '';
+
+			if (typeof(inputs) == 'object') {
+				price = inputs.price;
+				weight = inputs.weight;
+			}
+
+			if (!attr_selected.hasOwnProperty(attr)) {
+
+				var label = dictionnary_attr[attr].label;
+
+				var table = jQuery(document.createElement('table'))
+					.attr('id', 'combinations_'+attr)
+					.css('width', '100%')
+					.addClass('liste')
+					.append(
+						jQuery(document.createElement('thead'))
+							.append(jQuery(document.createElement('tr'))
+								.addClass('liste_titre')
+								.append(
+									jQuery(document.createElement('th'))
+										.addClass('liste_titre')
+										.css('width', '40%')
+										.text(label),
+									jQuery(document.createElement('th')).addClass('liste_titre').css('text-align', 'center').html('<?php echo $langs->trans('PriceImpact') ?>'),
+									jQuery(document.createElement('th')).addClass('liste_titre').css('text-align', 'center').html('<?php echo $langs->trans('WeightImpact') ?>')
+								)
+							)
+					)
+				;
+
+
+				jQuery('form#combinationsform').prepend(table);
+
+				attr_selected[attr] = [];
+			} else {
+				if (jQuery.inArray(val, attr_selected[attr]) != -1) {
+					return;
+				}
+			}
+
+			var combinations_table = jQuery('table#combinations_' + attr);
+			var html = jQuery(document.createElement('tr'));
+
+			if (combinations_table.children('tbody').children('tr').length % 2 === 0) {
+				html.addClass('pair');
+			} else {
+				html.addClass('impair');
+			}
+
+			var percent_symbol_html = jQuery(document.createElement('span')).attr('id', 'percentsymbol').html(' %');
+
+			if (!percentage_variation) {
+				percent_symbol_html.hide();
+			}
+
+			html.append(
+				jQuery(document.createElement('td')).text(dictionnary_attr[attr].values[val].value),
+				jQuery(document.createElement('td')).css('text-align', 'center').append(
+					jQuery(document.createElement('input')).attr('type', 'text').css('width', '50px').attr('name', 'combinations[' + attr + '][' + val + '][price]').val(price),
+					percent_symbol_html
+				),
+				jQuery(document.createElement('td')).css('text-align', 'center').append(
+					jQuery(document.createElement('input')).attr('type', 'text').css('width', '50px').attr('name', 'combinations[' + attr + '][' + val + '][weight]').val(weight),
+					' ' + weight_units
+				)
+			);
+
+			combinations_table.append(html);
+
+			attr_selected[attr].push(val);
+		}
+
+		function showHidePercentageSymbol(checked) {
+
+			percentage_variation = checked;
+
+			if (checked) {
+				jQuery('span#percentsymbol').show();
+			} else {
+				jQuery('span#percentsymbol').hide();
+			}
+		}
+
+		jQuery(document).ready(function() {
+
+			var input_price_var_percent = jQuery('input#price_var_percent');
+
+			jQuery.each(<?php echo json_encode($combinations) ?>, function(key, val) {
+				jQuery.each(val, function(valkey, valcontent) {
+					parseSelectedFeatures(key, valkey, valcontent);
+				});
+			});
+
+			jQuery('#addfeature').click(function() {
+				jQuery('#features option:selected').each(function(selector) {
+					var explode = jQuery(this).val().split(':');
+					parseSelectedFeatures(explode[0], explode[1]);
+				});
+			});
+
+			jQuery('#delfeature').click(function() {
+				jQuery('#features option:selected').each(function(selector) {
+					var explode = jQuery(this).val().split(':');
+
+					if (attr_selected.hasOwnProperty(explode[0])) {
+						var tr = jQuery('input[name="combinations[' + explode[0] + '][' + explode[1] + '][price]"').parent().parent();
+
+						var index_value = jQuery.inArray(explode[1], attr_selected[explode[0]]);
+
+						attr_selected[explode[0]].splice(index_value, 1);
+
+						if (tr.parent().children('tr').length === 1) {
+							tr.parent().parent().detach();
+							delete attr_selected[explode[0]]
+						} else {
+							tr.detach();
+						}
+					}
+				});
+			});
+
+			input_price_var_percent.click(function() {
+				showHidePercentageSymbol(jQuery(this).prop('checked'));
+			});
+
+			jQuery('input#donotremove').click(function() {
+				if (jQuery(this).prop('checked')) {
+					jQuery('div#info_donotremove').hide();
+				} else {
+					jQuery('div#info_donotremove').show();
+				}
+			});
+		});
+
+	</script>
+
+	<div style="width: 100%;display:block; height: 300px">
+
+		<div style="float:right; width: 79%; margin-left: 1%">
+
+			<form method="post" id="combinationsform">
+
+					<p><?php echo $langs->trans('TooMuchCombinationsWarning', $langs->trans('DoNotRemovePreviousCombinations')) ?></p>
+					<input type="checkbox" name="price_var_percent"
+					       id="price_var_percent"<?php echo $price_var_percent ? ' checked' : '' ?>> <label
+						for="price_var_percent"><?php echo $langs->trans('UsePercentageVariations') ?></label>
+					<br>
+					<input type="checkbox" name="donotremove"
+					       id="donotremove"<?php echo $donotremove ? ' checked' : '' ?>> <label for="donotremove"><?php echo $langs->trans('DoNotRemovePreviousCombinations') ?></label>
+
+					<br>
+					<div id="info_donotremove" class="info" style="<?php echo $donotremove ? 'display: none' : '' ?>">
+						<?php echo img_warning() ?>
+						<?php echo $langs->trans('ProductCombinationGeneratorWarning') ?>
+					</div>
+					<br>
+
+				<div style="text-align: center">
+					<input type="submit" value="<?php echo $langs->trans('Generate') ?>" class="button" name="submit">
+				</div>
+
+			</form>
+
+		</div>
+		<div style="float:left; width: 20%">
+
+			<select id="features" multiple style="width: 100%; height: 300px; overflow: auto">
+				<?php foreach ($dictionnary_attr as $attr): ?>
+				<optgroup label="<?php echo $attr->label ?>">
+					<?php foreach ($attr->values as $attrval): ?>
+						<option value="<?php echo $attr->id.':'.$attrval->id ?>"<?php
+						if (isset($combinations[$attr->id][$attrval->id])) {
+							echo ' selected';
+						}
+						?>><?php echo dol_htmlentities($attrval->value) ?></option>
+					<?php endforeach ?>
+				</optgroup>
+				<?php endforeach ?>
+			</select>
+
+			<br><br>
+			<a class="button" id="delfeature" style="float: right"><?php echo img_edit_remove() ?></a>
+			<a class="button" id="addfeature"><?php echo img_edit_add() ?></a>
+
+		</div>
+
+	</div>
+
+
+	<?php
+
+	llxFooter();
+}
\ No newline at end of file
diff --git a/htdocs/attributes/index.html b/htdocs/attributes/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/attributes/lib/index.html b/htdocs/attributes/lib/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/attributes/lib/product_attributes.lib.php b/htdocs/attributes/lib/product_attributes.lib.php
new file mode 100644
index 00000000000..9ced646cb01
--- /dev/null
+++ b/htdocs/attributes/lib/product_attributes.lib.php
@@ -0,0 +1,31 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Returns the entity of the products.
+ * @param DoliDB $db Database handler
+ * @return mixed
+ */
+function getProductEntities(DoliDB $db)
+{
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+	$product = new Product($db);
+
+	return getEntity($product->element, 1);
+}
\ No newline at end of file
diff --git a/htdocs/attributes/list.php b/htdocs/attributes/list.php
new file mode 100644
index 00000000000..3c4cf945524
--- /dev/null
+++ b/htdocs/attributes/list.php
@@ -0,0 +1,140 @@
+<?php
+
+/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+require '../main.inc.php';
+require 'class/ProductAttribute.class.php';
+
+$rowid = GETPOST('rowid');
+$action = GETPOST('action');
+$object = new ProductAttribute($db);
+
+if ($action == 'up') {
+	$object->fetch($rowid);
+	$object->moveUp();
+
+	header('Location: '.$_SERVER['PHP_SELF']);
+	die;
+} elseif ($action == 'down') {
+	$object->fetch($rowid);
+	$object->moveDown();
+
+	header('Location: '.$_SERVER['PHP_SELF']);
+	die;
+}
+
+$langs->load('products');
+
+$var = false;
+$title = $langs->trans($langs->trans('ProductAttributes'));
+
+$attributes = $object->fetchAll();
+
+llxHeader('', $title);
+
+print_fiche_titre($title);
+
+$forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
+?>
+	<script type="text/javascript">
+		$(document).ready(function(){
+			$(".imgupforline, .imgdownforline").hide();
+			$(".lineupdown").removeAttr('href');
+			$(".tdlineupdown")
+				.css("background-image", 'url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/grip.png'; ?>)')
+				.css("background-repeat", "no-repeat")
+				.css("background-position", "center center")
+				.hover(
+					function () {
+						$(this).addClass('showDragHandle');
+					}, function () {
+						$(this).removeClass('showDragHandle');
+					}
+				);
+
+			$("#tablelines").tableDnD({
+				onDrop: function(table, row) {
+					console.log('drop');
+					var reloadpage = "<?php echo $forcereloadpage; ?>";
+					var roworder = cleanSerialize($("#tablelines").tableDnDSerialize());
+					$.post("<?php echo DOL_URL_ROOT; ?>/attributes/ajax/orderAttribute.php",
+						{
+							roworder: roworder
+						},
+						function() {
+							if (reloadpage == 1) {
+								location.href = '<?php echo $_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING']; ?>';
+							} else {
+								$("#tablelines .drag").each(
+									function( intIndex ) {
+										$(this).removeClass("pair impair");
+										if (intIndex % 2 == 0) $(this).addClass('impair');
+										if (intIndex % 2 == 1) $(this).addClass('pair');
+									});
+							}
+						});
+				},
+				onDragClass: "dragClass",
+				dragHandle: "tdlineupdown"
+			});
+		});
+	</script>
+
+	<table class="liste" id="tablelines">
+		<tr class="liste_titre nodrag nodrop">
+			<th class="liste_titre"><?php print $langs->trans('Ref') ?></th>
+			<th class="liste_titre"><?php print $langs->trans('Label') ?></th>
+			<th class="liste_titre"><?php print $langs->trans('NbProducts') ?></th>
+			<th class="liste_titre" colspan="2"></th>
+		</tr>
+		<?php foreach ($attributes as $key => $attribute): ?>
+		<tr id="row-<?php echo $attribute->id ?>" <?php echo $bcdd[$var] ?>>
+			<td><a href="card.php?id=<?php echo $attribute->id ?>"><?php echo dol_htmlentities($attribute->ref) ?></a></td>
+			<td><a href="card.php?id=<?php echo $attribute->id ?>"><?php echo dol_htmlentities($attribute->label) ?></a></td>
+			<td><?php echo $attribute->countChildProducts() ?></td>
+			<td style="text-align: right">
+				<a href="card.php?id=<?php echo $attribute->id ?>&action=edit"><?php echo img_edit() ?></a>
+				<a href="card.php?id=<?php echo $attribute->id ?>&action=delete"><?php echo img_delete() ?></a>
+			</td>
+			<td align="center" class="linecolmove tdlineupdown">
+				<?php if ($key > 0): ?>
+				<a class="lineupdown"
+				   href="<?php echo $_SERVER['PHP_SELF'] ?>?action=up&amp;rowid=<?php echo $attribute->id ?>"><?php echo img_up('default', 0, 'imgupforline'); ?></a>
+				<?php endif ?>
+				<?php if ($key < count($attributes)-1): ?>
+				<a class="lineupdown"
+				   href="<?php echo $_SERVER['PHP_SELF'] ?>?action=down&amp;rowid=<?php echo $attribute->id ?>"><?php echo img_down('default', 0, 'imgdownforline'); ?></a>
+				<?php endif ?>
+			</td>
+		</tr>
+		<?php
+			$var = !$var;
+			endforeach
+		?>
+
+	</table>
+
+	<br>
+
+	<div class="tabsAction">
+		<div class="inline-block divButAction">
+		<a href="create.php" class="butAction"><?php echo $langs->trans('Create') ?></a>
+		</div>
+	</div>
+<?php
+
+llxFooter();
\ No newline at end of file
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index cd1734ff0a5..add9b5d8502 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2012      Cedric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013-2014 Florian Henry		 <florian.henry@open-concept.pro>
  * Copyright (C) 2014	   Ferran Marcet		 <fmarcet@2byte.es>
+ * Copyright (C) 2016      Marcos García         <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,6 +49,10 @@ if (! empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 }
 
+if (!empty($conf->attributes->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+}
+
 $langs->load('companies');
 $langs->load('propal');
 $langs->load('compta');
@@ -655,7 +660,8 @@ if (empty($reshook))
 		$predef='';
 		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
 		$price_ht = GETPOST('price_ht');
-		if (GETPOST('prod_entry_mode') == 'free')
+		$prod_entry_mode = GETPOST('prod_entry_mode');
+		if ($prod_entry_mode == 'free')
 		{
 			$idprod=0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
@@ -681,21 +687,35 @@ if (empty($reshook))
 			}
 		}
 
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && GETPOST('type') < 0) {
+		if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('type') < 0) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 			$error ++;
 		}
 
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && $price_ht == '') 	// Unit price can be 0 but not ''. Also price can be negative for proposal.
+		if ($prod_entry_mode == 'free' && empty($idprod) && $price_ht == '') 	// Unit price can be 0 but not ''. Also price can be negative for proposal.
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 			$error ++;
 		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc)) {
+		if ($prod_entry_mode == 'free' && empty($idprod) && empty($product_desc)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")), null, 'errors');
 			$error ++;
 		}
 
+		if (!$error && !empty($conf->attributes->enabled) && $prod_entry_mode != 'free') {
+			if ($combinations = GETPOST('combinations', 'array')) {
+				//Check if there is a product with the given combination
+				$prodcomb = new ProductCombination($db);
+
+				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
+					$idprod = $res->fk_product_child;
+				} else {
+					setEventMessage($langs->trans('ErrorProductCombinationNotFound'), 'errors');
+					$error ++;
+				}
+			}
+		}
+
 		if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod))) {
 			$pu_ht = 0;
 			$pu_ttc = 0;
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index d91ee35fe3e..20def0175ba 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2010-2013	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2011-2016	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2013	Christophe Battarel		<christophe.battarel@altairis.fr>
- * Copyright (C) 2012		Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2012-2016	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012       Cedric Salvador      	<csalvador@gpcsolutions.fr>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014       Ferran Marcet			<fmarcet@2byte.es>
@@ -51,6 +51,10 @@ if (! empty($conf->projet->enabled)) {
 }
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 
+if (!empty($conf->attributes->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+}
+
 $langs->load('orders');
 $langs->load('sendings');
 $langs->load('companies');
@@ -621,7 +625,8 @@ if (empty($reshook))
 		$predef='';
 		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
 		$price_ht = GETPOST('price_ht');
-		if (GETPOST('prod_entry_mode') == 'free')
+		$prod_entry_mode = GETPOST('prod_entry_mode');
+		if ($prod_entry_mode == 'free')
 		{
 			$idprod=0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
@@ -651,11 +656,11 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && GETPOST('type') < 0) {
+		if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('type') < 0) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 			$error++;
 		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) 	// Unit price can be 0 but not ''
+		if ($prod_entry_mode == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) 	// Unit price can be 0 but not ''
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 			$error++;
@@ -664,11 +669,25 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc)) {
+		if ($prod_entry_mode == 'free' && empty($idprod) && empty($product_desc)) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
 			$error++;
 		}
 
+		if (!$error && !empty($conf->attributes->enabled) && $prod_entry_mode != 'free') {
+			if ($combinations = GETPOST('combinations', 'array')) {
+				//Check if there is a product with the given combination
+				$prodcomb = new ProductCombination($db);
+
+				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
+					$idprod = $res->fk_product_child;
+				} else {
+					setEventMessage($langs->trans('ErrorProductCombinationNotFound'), 'errors');
+					$error ++;
+				}
+			}
+		}
+
 		if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod))) {
 			// Clean parameters
 			$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index b2b39e375d7..be38e4b48f1 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2013-2014 Florian Henry         <florian.henry@open-concept.pro>
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2014	   Ferran Marcet	 	 <fmarcet@2byte.es>
- * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
+ * Copyright (C) 2015-2016 Marcos García         <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,6 +56,10 @@ if (! empty($conf->projet->enabled)) {
 }
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 
+if (!empty($conf->attributes->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+}
+
 $langs->load('bills');
 $langs->load('companies');
 $langs->load('compta');
@@ -1322,7 +1326,8 @@ if (empty($reshook))
 		$predef='';
 		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
 		$price_ht = GETPOST('price_ht');
-		if (GETPOST('prod_entry_mode') == 'free')
+		$prod_entry_mode = GETPOST('prod_entry_mode');
+		if ($prod_entry_mode == 'free')
 		{
 			$idprod=0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
@@ -1352,11 +1357,11 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error ++;
 		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && GETPOST('type') < 0) {
+		if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('type') < 0) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 			$error ++;
 		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) 	// Unit price can be 0 but not ''
+		if ($prod_entry_mode == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) 	// Unit price can be 0 but not ''
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 			$error ++;
@@ -1365,7 +1370,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error ++;
 		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc)) {
+		if ($prod_entry_mode == 'free' && empty($idprod) && empty($product_desc)) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
 			$error ++;
 		}
@@ -1374,7 +1379,23 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
 			$error ++;
 		}
+
+		if (!$error && !empty($conf->attributes->enabled) && $prod_entry_mode != 'free') {
+			if ($combinations = GETPOST('combinations', 'array')) {
+				//Check if there is a product with the given combination
+				$prodcomb = new ProductCombination($db);
+
+				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
+					$idprod = $res->fk_product_child;
+				} else {
+					setEventMessage($langs->trans('ErrorProductCombinationNotFound'), 'errors');
+					$error ++;
+				}
+			}
+		}
+
 		if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod))) {
+
 			$ret = $object->fetch($id);
 			if ($ret < 0) {
 				dol_print_error($db, $object->error);
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 5a87d3b3d51..4a20f1b8f9e 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2013       Christophe Battarel     <christophe.battarel@altairis.fr>
  * Copyright (C) 2013-2014  Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2016	Ferran Marcet		  	<fmarcet@2byte.es>
- * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2014-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -471,7 +471,7 @@ if (empty($reshook))
 	    		unset($_POST["options_" . $key]);
 	    	}
 	    }
-	
+
 	    if (! $error)
 	    {
 			// Clean parameters
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 61953629166..ba60aa5f2c5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2010       Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2010-2014  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2011       Herve Prot              <herve.prot@symeos.com>
- * Copyright (C) 2012-2014  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2012-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014       Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
@@ -1605,9 +1605,10 @@ class Form
      *  @param		int			$hidelabel				Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
      *  @param		array		$ajaxoptions			Options for ajax_autocompleter
      *  @param      int			$socid					Thirdparty Id (to get also price dedicated to this customer)
+     * @param array $selected_combinations Selected combinations. Format: array([attrid] => attrval, [...])
      *  @return		void
      */
-    function select_produits($selected='', $htmlname='productid', $filtertype='', $limit=20, $price_level=0, $status=1, $finished=2, $selected_input_value='', $hidelabel=0, $ajaxoptions=array(), $socid=0)
+    function select_produits($selected='', $htmlname='productid', $filtertype='', $limit=20, $price_level=0, $status=1, $finished=2, $selected_input_value='', $hidelabel=0, $ajaxoptions=array(), $socid=0, $selected_combinations = array())
     {
         global $langs,$conf;
 
@@ -1632,6 +1633,80 @@ class Form
             	$urloption.='&socid='.$socid;
             }
             print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+
+			if (!empty($conf->attributes->enabled)) {
+				?>
+				<script>
+
+					selected = <?php echo json_encode($selected_combinations) ?>;
+					combvalues = {};
+
+					jQuery(document).ready(function () {
+
+						jQuery("input[name='prod_entry_mode']").change(function () {
+							if (jQuery(this).val() == 'free') {
+								jQuery('div#attributes_box').empty();
+							}
+						});
+
+						jQuery("input#<?php echo $htmlname ?>").change(function () {
+
+							if (!jQuery(this).val()) {
+								jQuery('div#attributes_box').empty();
+								return;
+							}
+
+							jQuery.getJSON("<?php echo dol_buildpath('/attributes/ajax/getCombinations.php', 2) ?>", {
+								id: jQuery(this).val()
+							}, function (data) {
+								jQuery('div#attributes_box').empty();
+
+								jQuery.each(data, function (key, val) {
+
+									combvalues[val.id] = val.values;
+
+									var span = jQuery(document.createElement('div')).css({
+										'display': 'table-row'
+									});
+
+									span.append(
+										jQuery(document.createElement('div')).text(val.label).css({
+											'font-weight': 'bold',
+											'display': 'table-cell',
+											'text-align': 'right'
+										})
+									);
+
+									var html = jQuery(document.createElement('select')).attr('name', 'combinations[' + val.id + ']').css({
+										'margin-left': '15px',
+										'white-space': 'pre'
+									}).append(
+										jQuery(document.createElement('option')).val('')
+									);
+
+									jQuery.each(combvalues[val.id], function (key, val) {
+										var tag = jQuery(document.createElement('option')).val(val.id).html(val.value);
+
+										if (selected[val.fk_product_attribute] == val.id) {
+											tag.attr('selected', 'selected');
+										}
+
+										html.append(tag);
+									});
+
+									span.append(html);
+									jQuery('div#attributes_box').append(span);
+								});
+							})
+						});
+
+						<?php if ($selected): ?>
+						jQuery("input#<?php echo $htmlname ?>").change();
+						<?php endif ?>
+					});
+				</script>
+                <?php
+            }
             if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
             else if ($hidelabel > 1) {
             	if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("RefOrLabel").'"';
@@ -1709,7 +1784,17 @@ class Form
         {
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='". $langs->getDefaultLang() ."'";
         }
+
+        if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
+            $sql .= " LEFT JOIN llx_product_attribute_combination pac ON pac.fk_product_child = p.rowid";
+        }
+
         $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+
+        if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
+            $sql .= " AND pac.rowid IS NULL";
+        }
+
         if ($finished == 0)
         {
             $sql.= " AND p.finished = ".$finished;
@@ -1881,7 +1966,7 @@ class Form
         $outlabel=$objp->label;
         $outdesc=$objp->description;
         $outbarcode=$objp->barcode;
-        
+
         $outtype=$objp->fk_product_type;
         $outdurationvalue=$outtype == Product::TYPE_SERVICE?substr($objp->duration,0,dol_strlen($objp->duration)-1):'';
         $outdurationunit=$outtype == Product::TYPE_SERVICE?substr($objp->duration,-1):'';
@@ -1898,13 +1983,13 @@ class Form
         $opt.= $objp->ref;
         if ($outbarcode) $opt.=' ('.$outbarcode.')';
         $opt.=' - '.dol_trunc($label,$maxlengtharticle).' - ';
-        
+
         $objRef = $objp->ref;
         if (! empty($filterkey) && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$objRef,1);
         $outval.=$objRef;
         if ($outbarcode) $outval.=' ('.$outbarcode.')';
         $outval.=' - '.dol_trunc($label,$maxlengtharticle).' - ';
-        
+
         $found=0;
 
         // Multiprice
@@ -2066,7 +2151,7 @@ class Form
     {
         global $langs,$conf;
         global $price_level, $status, $finished;
-        
+
         $selected_input_value='';
         if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
         {
@@ -3174,7 +3259,7 @@ class Form
 		{
 		    dol_syslog(__METHOD__ . ': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
 		}
-		
+
         $cat = new Categorie($this->db);
         $cate_arbo = $cat->get_full_arbo($type,$excludeafterid);
 
@@ -3837,7 +3922,7 @@ class Form
     function form_multicurrency_rate($page, $rate='', $htmlname='multicurrency_tx', $currency='')
     {
         global $langs, $mysoc, $conf;
-        
+
         if ($htmlname != "none")
         {
             print '<form method="POST" action="'.$page.'">';
@@ -4107,7 +4192,7 @@ class Form
 		        	$out.= '</option>';	
 				}
 	        }
-	        
+
 		}
         
         $out.= '</select>';
@@ -4204,7 +4289,7 @@ class Form
             $defaulttx=preg_replace('/\s*\(.*\)/','',$defaulttx);
         }
         //var_dump($selectedrate.'-'.$defaulttx.'-'.$defaultnpr.'-'.$defaultcode);
-        
+
         // Check parameters
         if (is_object($societe_vendeuse) && ! $societe_vendeuse->country_code)
         {
@@ -4263,7 +4348,7 @@ class Form
 
         // Now we get list
         $num = $this->load_cache_vatrates($code_country);   // If no vat defined, return -1 with message into this->error
- 
+
         if ($num > 0)
         {
         	// Definition du taux a pre-selectionner (si defaulttx non force et donc vaut -1 ou '')
@@ -4304,7 +4389,7 @@ class Form
         		$return.= '"';
         		if ($defaultcode) // If defaultcode is defined, we used it in priority to select combo option instead of using rate+npr flag
         		{
-                    if ($defaultcode == $rate['code']) $return.= ' selected';    	
+                    if ($defaultcode == $rate['code']) $return.= ' selected';
         		}
         		elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
            		{
@@ -5036,7 +5121,7 @@ class Form
            /* var_dump($val);
             var_dump(array_key_exists('enabled', $val));
             var_dump(!$val['enabled']);*/
-           if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled']) 
+           if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled'])
            {
                unset($array[$key]);     // We don't want this field
                continue; 
@@ -5221,17 +5306,17 @@ class Form
         		else if ($objecttype == 'subscription')   {
         		    $tplpath = 'adherents';
         		}
-        		
+
                 global $linkedObjectBlock;
         		$linkedObjectBlock = $objects;
 
         		if (empty($numoutput))
         		{
         		    $numoutput++;
-        		    
+
         		    print '<br>';
         		    print load_fiche_titre($langs->trans('RelatedObjects'), '', '');
-        		    
+
         		    print '<table class="noborder allwidth">';
 
         		    print '<tr class="liste_titre">';
@@ -5244,7 +5329,7 @@ class Form
         			print '<td></td>';
         		    print '</tr>';
         		}
-        		        		
+
         		// Output template part (modules that overwrite templates must declare this into descriptor)
         		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/'.$tplpath.'/tpl'));
         		foreach($dirtpls as $reldir)
@@ -5254,11 +5339,11 @@ class Form
         		}
         	}
 
-        	if ($numoutput) 
+        	if ($numoutput)
         	{
         	    print '</table>';
         	}
-        	    
+
         	return $num;
         }
     }
@@ -5627,7 +5712,7 @@ class Form
 		$ret.='</div>';
 
 		if ($morehtmlright) $ret.='<div class="inline-block floatleft">'.$morehtmlright.'</div>';
-		
+
         if ($previous_ref || $next_ref || $morehtml)
         {
         	$ret.='<div class="pagination"><ul>';
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index c45c045e11d..ae0197fbda0 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2008-2011  Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2008-2012  Regis Houssin               <regis.houssin@capnetworks.com>
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2014       Marcos García               <marcosgdf@gmail.com>
+ * Copyright (C) 2014-2016  Marcos García               <marcosgdf@gmail.com>
  * Copyright (C) 2015       Ferran Marcet               <fmarcet@2byte.es>
  * Copyright (C) 2015-2016  Raphaël Doursenaud          <rdoursenaud@gpcsolutions.fr>
  *
@@ -2058,4 +2058,31 @@ function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
 	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
 }
 
+/**
+ * Applies the Cartesian product algorithm to an array
+ * Source: http://stackoverflow.com/a/15973172
+ *
+ * @param array $input Array of products
+ * @return array Array of combinations
+ */
+function cartesianArray(array $input) {
+    // filter out empty values
+    $input = array_filter($input);
 
+    $result = array(array());
+
+    foreach ($input as $key => $values) {
+        $append = array();
+
+        foreach($result as $product) {
+            foreach($values as $item) {
+                $product[$key] = $item;
+                $append[] = $product;
+            }
+        }
+
+        $result = $append;
+    }
+
+    return $result;
+}
\ No newline at end of file
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index be46f28c498..004a9b7afd6 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2007       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2009-2010  Regis Houssin           <regis.houssin@capnetworks.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2015-2016	Marcos García			<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -106,6 +106,23 @@ function product_prepare_head($object)
 	$head[$h][2] = 'referers';
 	$h++;
 
+	if (!empty($conf->attributes->enabled) && $object->isProduct()) {
+
+		global $db;
+
+		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+
+		$prodcomb = new ProductCombination($db);
+
+		if ($prodcomb->fetchByFkProductChild($object->id) == -1) {
+			$head[$h][0] = DOL_URL_ROOT."/attributes/combinations.php?id=".$object->id;
+			$head[$h][1] = $langs->trans('ProductCombinations');
+			$head[$h][2] = 'combinations';
+		}
+
+		$h++;
+	}
+
     if ($object->isProduct() || ($object->isService() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
     {
         if (! empty($conf->stock->enabled) && $user->rights->stock->lire)
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index c8bae6140c1..9da9c4eb6a9 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2012       Cédric Salvador     <csalvador@gpcsolutions.fr>
  * Copyright (C) 2014		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2015		Marcos García		<marcosgdf@gmail.com>
+ * Copyright (C) 2015-2016	Marcos García		<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@ if (in_array($object->element,array('propal', 'supplier_proposal','facture','fac
 
 <!-- BEGIN PHP TEMPLATE objectline_create.tpl.php -->
 
-<tr class="liste_titre liste_titre_add nodrag nodrop">
+<tr id="addline" class="liste_titre liste_titre_add nodrag nodrop">
 	<td class="linecoldescription" <?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
 	<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span><?php // echo $langs->trans("FreeZone"); ?>
 	</td>
@@ -178,7 +178,7 @@ else {
 
 		if (empty($senderissupplier))
 		{
-			$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id);
+			$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id, GETPOST('combinations', 'array'));
 		}
 		else
 		{
@@ -210,7 +210,14 @@ else {
 	}
 
 
-	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) echo '<br>';
+	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) {
+
+		if (!empty($conf->attributes->enabled)) {
+			echo '<div id="attributes_box"></div>';
+		}
+
+		echo '<br>';
+	}
 
 	// Editor wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -532,9 +539,9 @@ jQuery(document).ready(function() {
 	$("#idprod, #idprodfournprice").change(function()
 	{
 		console.log("#idprod, #idprodfournprice change triggered");
-		
+
 		setforpredef();		// TODO Keep vat combo visible and set it to first entry into list that match result of get_default_tva
-		
+
 		jQuery('#trlinefordates').show();
 
 		<?php
@@ -555,13 +562,13 @@ jQuery(document).ready(function() {
         	  		var defaultkey = '';
         	  		var defaultprice = '';
     	      		var bestpricefound = 0;
-    	      		
+
     	      		var bestpriceid = 0; var bestpricevalue = 0;
     	      		var pmppriceid = 0; var pmppricevalue = 0;
     	      		var costpriceid = 0; var costpricevalue = 0;
-    
+
     				/* setup of margin calculation */
-    	      		var defaultbuyprice = '<?php 
+    	      		var defaultbuyprice = '<?php
     	      		if (isset($conf->global->MARGIN_TYPE))
     	      		{
     	      		    if ($conf->global->MARGIN_TYPE == '1')   print 'bestsupplierprice';
@@ -569,7 +576,7 @@ jQuery(document).ready(function() {
     	      		    if ($conf->global->MARGIN_TYPE == 'costprice') print 'costprice';
     	      		} ?>';
     	      		console.log("we will set the field for margin. defaultbuyprice="+defaultbuyprice);
-    	      		
+
     	      		var i = 0;
     	      		$(data).each(function() {
     	      			if (this.id != 'pmpprice' && this.id != 'costprice')
@@ -586,7 +593,7 @@ jQuery(document).ready(function() {
     			      		//console.log("id="+this.id+"-price="+this.price);
     			      		if ('pmp' == defaultbuyprice || 'costprice' == defaultbuyprice)
     			      		{
-    			      			if (this.price > 0) { 
+    			      			if (this.price > 0) {
     				      			defaultkey = this.id; defaultprice = this.price; pmppriceid = this.id; pmppricevalue = this.price;
     			      				//console.log("pmppricevalue="+pmppricevalue);
     			      			}
@@ -605,22 +612,22 @@ jQuery(document).ready(function() {
     	        		options += '<option value="'+this.id+'" price="'+this.price+'">'+this.label+'</option>';
     	      		});
     	      		options += '<option value="inputprice" price="'+defaultprice+'"><?php echo $langs->trans("InputPrice"); ?></option>';
-    
+
     	      		console.log("finally selected defaultkey="+defaultkey+" defaultprice="+defaultprice);
-    
+
     	      		$("#fournprice_predef").html(options).show();
     	      		if (defaultkey != '')
     				{
     		      		$("#fournprice_predef").val(defaultkey);
     		      	}
-    
+
     	      		/* At loading, no product are yet selected, so we hide field of buying_price */
     	      		$("#buying_price").hide();
-    
+
     	      		/* Define default price at loading */
     	      		var defaultprice = $("#fournprice_predef").find('option:selected').attr("price");
     			    $("#buying_price").val(defaultprice);
-    
+
     	      		$("#fournprice_predef").change(function() {
     		      		console.log("change on fournprice_predef");
     	      			/* Hide field buying_price according to choice into list (if 'inputprice' or not) */
@@ -672,8 +679,8 @@ function setforfree() {
 	jQuery("#idprod").val('');
 	jQuery("#idprodfournprice").val('0');	// Set cursor on not selected product
 	jQuery("#search_idprodfournprice").val('');
-	jQuery("#prod_entry_mode_free").prop('checked',true);
-	jQuery("#prod_entry_mode_predef").prop('checked',false);
+	jQuery("#prod_entry_mode_free").prop('checked',true).change();
+	jQuery("#prod_entry_mode_predef").prop('checked',false).change();
 	jQuery("#price_ht").show();
 	jQuery("#price_ttc").show();	// May no exists
 	jQuery("#tva_tx").show();
@@ -691,8 +698,8 @@ function setforfree() {
 function setforpredef() {
 	console.log("Call setforpredef. We hide some fields");
 	jQuery("#select_type").val(-1);
-	jQuery("#prod_entry_mode_free").prop('checked',false);
-	jQuery("#prod_entry_mode_predef").prop('checked',true);
+	jQuery("#prod_entry_mode_free").prop('checked',false).change();
+	jQuery("#prod_entry_mode_predef").prop('checked',true).change();
 	jQuery("#price_ht").hide();
 	jQuery("#price_ttc").hide();	// May no exists
 	jQuery("#tva_tx").hide();
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index fa93be5020d..0b04c6eb1f0 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2015 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2011-2015 Philippe Grand       <philippe.grand@atoo-net.com>
- * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2016 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2014      Ion Agorria          <ion@agorria.com>
  *
@@ -50,6 +50,10 @@ if (!empty($conf->projet->enabled)) {
 }
 require_once NUSOAP_PATH.'/nusoap.php';     // Include SOAP
 
+if (!empty($conf->attributes->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+}
+
 $langs->load('admin');
 $langs->load('orders');
 $langs->load('sendings');
@@ -285,7 +289,7 @@ if (empty($reshook))
 		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
 		$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-		if (GETPOST('prod_entry_mode') == 'free')
+		if ($prod_entry_mode == 'free')
 		{
 			$idprod=0;
 			$price_ht = GETPOST('price_ht');
@@ -313,22 +317,22 @@ if (empty($reshook))
 	    	}
 	    }
 
-	    if (GETPOST('prod_entry_mode')=='free' && GETPOST('price_ht') < 0 && $qty < 0)
+	    if ($prod_entry_mode =='free' && GETPOST('price_ht') < 0 && $qty < 0)
 	    {
 	        setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPrice'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 	        $error++;
 	    }
-	    if (GETPOST('prod_entry_mode')=='free'  && ! GETPOST('idprodfournprice') && GETPOST('type') < 0)
+	    if ($prod_entry_mode =='free'  && ! GETPOST('idprodfournprice') && GETPOST('type') < 0)
 	    {
 	        setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 	        $error++;
 	    }
-	    if (GETPOST('prod_entry_mode')=='free' && GETPOST('price_ht')==='' && GETPOST('price_ttc')==='') // Unit price can be 0 but not ''
+	    if ($prod_entry_mode =='free' && GETPOST('price_ht')==='' && GETPOST('price_ttc')==='') // Unit price can be 0 but not ''
 	    {
 	        setEventMessages($langs->trans($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice'))), null, 'errors');
 	        $error++;
 	    }
-	    if (GETPOST('prod_entry_mode')=='free' && ! GETPOST('dp_desc'))
+	    if ($prod_entry_mode =='free' && ! GETPOST('dp_desc'))
 	    {
 	        setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
 	        $error++;
@@ -339,10 +343,24 @@ if (empty($reshook))
 	        $error++;
 	    }
 
-	    // Ecrase $pu par celui	du produit
+		if (!$error && !empty($conf->attributes->enabled) && $prod_entry_mode != 'free') {
+			if ($combinations = GETPOST('combinations', 'array')) {
+				//Check if there is a product with the given combination
+				$prodcomb = new ProductCombination($db);
+
+				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
+					$idprod = $res->fk_product_child;
+				} else {
+					setEventMessage($langs->trans('ErrorProductCombinationNotFound'), 'errors');
+					$error ++;
+				}
+			}
+		}
+
+		// Ecrase $pu par celui	du produit
 	    // Ecrase $desc	par	celui du produit
 	    // Ecrase $txtva  par celui du produit
-	    if ((GETPOST('prod_entry_mode') != 'free') && empty($error))	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
+	    if (($prod_entry_mode != 'free') && empty($error))	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
 	    {
 	    	$productsupplier = new ProductFournisseur($db);
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index a8239bcb7fb..7bd5bc66a05 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013-2015	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
- * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2014-2016  Marcos García           <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,6 +45,10 @@ if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
+if (!empty($conf->attributes->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+}
+
 
 $langs->load('bills');
 $langs->load('compta');
@@ -668,7 +672,8 @@ if (empty($reshook))
 		// Set if we used free entry or predefined product
 		$predef='';
 		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
-		if (GETPOST('prod_entry_mode') == 'free')
+		$prod_entry_mode = GETPOST('prod_entry_mode');
+		if ($prod_entry_mode == 'free')
 		{
 			$idprod=0;
 			$price_ht = GETPOST('price_ht');
@@ -699,22 +704,22 @@ if (empty($reshook))
 	    	}
 	    }
 
-	    if (GETPOST('prod_entry_mode')=='free' && GETPOST('price_ht') < 0 && $qty < 0)
+	    if ($prod_entry_mode =='free' && GETPOST('price_ht') < 0 && $qty < 0)
 	    {
 	        setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPrice'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 	        $error++;
 	    }
-	    if (GETPOST('prod_entry_mode')=='free'  && ! GETPOST('idprodfournprice') && GETPOST('type') < 0)
+	    if ($prod_entry_mode =='free'  && ! GETPOST('idprodfournprice') && GETPOST('type') < 0)
 	    {
 	        setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 	        $error++;
 	    }
-	    if (GETPOST('prod_entry_mode')=='free' && GETPOST('price_ht')==='' && GETPOST('price_ttc')==='') // Unit price can be 0 but not ''
+	    if ($prod_entry_mode =='free' && GETPOST('price_ht')==='' && GETPOST('price_ttc')==='') // Unit price can be 0 but not ''
 	    {
 	        setEventMessages($langs->trans($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice'))), null, 'errors');
 	        $error++;
 	    }
-	    if (GETPOST('prod_entry_mode')=='free' && ! GETPOST('dp_desc'))
+	    if ($prod_entry_mode =='free' && ! GETPOST('dp_desc'))
 	    {
 	        setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
 	        $error++;
@@ -725,7 +730,21 @@ if (empty($reshook))
 	        $error++;
 	    }
 
-	    if (GETPOST('prod_entry_mode') != 'free')	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
+		if (!$error && !empty($conf->attributes->enabled) && $prod_entry_mode != 'free') {
+			if ($combinations = GETPOST('combinations', 'array')) {
+				//Check if there is a product with the given combination
+				$prodcomb = new ProductCombination($db);
+
+				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
+					$idprod = $res->fk_product_child;
+				} else {
+					setEventMessage($langs->trans('ErrorProductCombinationNotFound'), 'errors');
+					$error ++;
+				}
+			}
+		}
+
+		if ($prod_entry_mode != 'free')	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
 	    {
 	    	$idprod=0;
 	    	$productsupplier=new ProductFournisseur($db);
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index f58dda0a74f..bb31581ab39 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -515,4 +515,3 @@ CREATE TABLE llx_oauth_state (
 
 ALTER TABLE llx_product_batch ADD UNIQUE INDEX uk_product_batch (fk_product_stock, batch);
 
-
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index dcecfc3d398..122d5efefca 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -39,3 +39,39 @@ DROP TABLE llx_ecm_documents;
 
 ALTER TABLE llx_notify ADD COLUMN type_target varchar(16) NULL;
 
+-- Product attributes
+CREATE TABLE llx_product_attribute
+(
+  rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  ref VARCHAR(255) NOT NULL,
+  label VARCHAR(255) NOT NULL,
+  rang INT DEFAULT 0 NOT NULL,
+  entity INT DEFAULT 1 NOT NULL
+);
+ALTER TABLE llx_product_attribute ADD CONSTRAINT unique_ref UNIQUE (ref);
+CREATE TABLE llx_product_attribute_combination
+(
+  rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  fk_product_parent INT NOT NULL,
+  fk_product_child INT NOT NULL,
+  variation_price FLOAT NOT NULL,
+  variation_price_percentage INT NULL,
+  variation_weight FLOAT NOT NULL,
+  entity INT DEFAULT 1 NOT NULL
+);
+CREATE TABLE llx_product_attribute_combination2val
+(
+  rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  fk_prod_combination INT NOT NULL,
+  fk_prod_attr INT NOT NULL,
+  fk_prod_attr_val INT NOT NULL
+);
+CREATE TABLE llx_product_attribute_value
+(
+  rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  fk_product_attribute INT NOT NULL,
+  ref VARCHAR(255) DEFAULT NULL,
+  value VARCHAR(255) DEFAULT NULL,
+  entity INT DEFAULT 1 NOT NULL
+);
+ALTER TABLE llx_product_attribute_value ADD CONSTRAINT unique_ref UNIQUE (fk_product_attribute,ref);
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_holiday_events.key.sql b/htdocs/install/mysql/tables/llx_product_attribute.key.sql
similarity index 81%
rename from htdocs/install/mysql/tables/llx_holiday_events.key.sql
rename to htdocs/install/mysql/tables/llx_product_attribute.key.sql
index 250e1fa9114..28d687dbdda 100644
--- a/htdocs/install/mysql/tables/llx_holiday_events.key.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute.key.sql
@@ -1,5 +1,5 @@
--- ===================================================================
--- Copyright (C) 2012      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- ============================================================================
+-- Copyright (C) 2016      Marcos García         <marcosgdf@gmail.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -14,6 +14,6 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--- ===================================================================
+-- ============================================================================
 
-ALTER TABLE llx_holiday_events ADD UNIQUE INDEX uk_holiday_name (name, entity);
+ALTER TABLE llx_product_attribute ADD CONSTRAINT unique_ref UNIQUE (ref);
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_holiday_events.sql b/htdocs/install/mysql/tables/llx_product_attribute.sql
similarity index 70%
rename from htdocs/install/mysql/tables/llx_holiday_events.sql
rename to htdocs/install/mysql/tables/llx_product_attribute.sql
index 904671af0e1..77c045327b8 100644
--- a/htdocs/install/mysql/tables/llx_holiday_events.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute.sql
@@ -1,5 +1,5 @@
--- ===================================================================
--- Copyright (C) 2012      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- ============================================================================
+-- Copyright (C) 2016      Marcos García         <marcosgdf@gmail.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -14,13 +14,13 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
--- ===================================================================
+-- ============================================================================
 
-CREATE TABLE llx_holiday_events 
+CREATE TABLE llx_product_attribute
 (
-  rowid    integer NOT NULL PRIMARY KEY AUTO_INCREMENT,
-  entity   integer DEFAULT 1 NOT NULL,     -- multi company id
-  name     VARCHAR( 255 ) NOT NULL,
-  value    TEXT NOT NULL
-) 
-ENGINE=innodb;
\ No newline at end of file
+  rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  ref VARCHAR(255) NOT NULL,
+  label VARCHAR(255) NOT NULL,
+  rang INT DEFAULT 0 NOT NULL,
+  entity INT DEFAULT 1 NOT NULL
+);
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_combination.sql b/htdocs/install/mysql/tables/llx_product_attribute_combination.sql
new file mode 100644
index 00000000000..fae38f8403d
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_product_attribute_combination.sql
@@ -0,0 +1,28 @@
+-- ============================================================================
+-- Copyright (C) 2016      Marcos García         <marcosgdf@gmail.com>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+CREATE TABLE llx_product_attribute_combination
+(
+  rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  fk_product_parent INT NOT NULL,
+  fk_product_child INT NOT NULL,
+  variation_price FLOAT NOT NULL,
+  variation_price_percentage INT NULL,
+  variation_weight FLOAT NOT NULL,
+  entity INT DEFAULT 1 NOT NULL
+);
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql b/htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
new file mode 100644
index 00000000000..a64230923e6
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
@@ -0,0 +1,25 @@
+-- ============================================================================
+-- Copyright (C) 2016      Marcos García         <marcosgdf@gmail.com>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+CREATE TABLE llx_product_attribute_combination2val
+(
+  rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  fk_prod_combination INT NOT NULL,
+  fk_prod_attr INT NOT NULL,
+  fk_prod_attr_val INT NOT NULL
+);
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_value.key.sql b/htdocs/install/mysql/tables/llx_product_attribute_value.key.sql
new file mode 100644
index 00000000000..889bba4615e
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_product_attribute_value.key.sql
@@ -0,0 +1,19 @@
+-- ============================================================================
+-- Copyright (C) 2016      Marcos García         <marcosgdf@gmail.com>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+ALTER TABLE llx_product_attribute_value ADD CONSTRAINT unique_ref UNIQUE (fk_product_attribute,ref);
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_value.sql b/htdocs/install/mysql/tables/llx_product_attribute_value.sql
new file mode 100644
index 00000000000..ebd2cf8bb49
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_product_attribute_value.sql
@@ -0,0 +1,26 @@
+-- ============================================================================
+-- Copyright (C) 2016      Marcos García         <marcosgdf@gmail.com>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+CREATE TABLE llx_product_attribute_value
+(
+  rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  fk_product_attribute INT NOT NULL,
+  ref VARCHAR(255) DEFAULT NULL,
+  value VARCHAR(255) DEFAULT NULL,
+  entity INT DEFAULT 1 NOT NULL
+);
\ No newline at end of file
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 2b1bd61f94c..13403a42dd9 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -759,3 +759,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
\ No newline at end of file
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index e9142d463ff..7ab11833cd5 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -137,6 +137,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product combinations
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -226,7 +227,7 @@ ComposedProduct=Sub-product
 MinSupplierPrice=Minimum supplier price
 MinCustomerPrice=Minimum customer price
 DynamicPriceConfiguration=Dynamic price configuration
-DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value. 
+DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
 AddVariable=Add Variable
 AddUpdater=Add Updater
 GlobalVariables=Global variables
@@ -254,3 +255,38 @@ SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
 
+
+#Attributes
+ProductAttributes=Product attributes
+ProductAttributeName=Attribute %s
+ProductAttribute=Attribute
+ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
+ProductCombinationDeleteDialog=Are you sure want to delete the combination of the product "%s"?
+ProductCombinationAlreadyUsed=There was an error while deleting the combination. Please check it is not being used in any object
+ProductCombinations=Combinations
+HideProductCombinations=Hide derived products from combinations in the product selector
+ProductCombination=Combination
+NewProductCombination=New combination
+EditProductCombination=Editing combination
+ProductCombinationGenerator=Combinations generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+NewProductAttributeValue=New attribute value
+ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
+ProductCombinationGeneratorWarning=If you continue, before generating new combinations, all previous ones will be DELETED. Already existing ones will be updated with the new values
+TooMuchCombinationsWarning=Generating lots of combinations may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
+DoNotRemovePreviousCombinations=Do not remove previous combinations
+UsePercentageVariations=Use percentage variations
+PercentageVariation=Percentage variation
+ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product combinations
+NbProducts=No. of products
+ParentProduct=Parent product
+HideChildProducts=Hide child products
+ConfirmCloneProductCombinations=Would you like to copy all the product combinations to the product with the given reference?
+CloneDestinationReference=Destination product reference
+ErrorCopyProductCombinations=There was an error while copying the product combinations
+ErrorDestinationProductNotFound=Destination product not found
+ErrorProductCombinationNotFound=Product combination not found
\ No newline at end of file
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 7f338c6dc06..d8bc89f1518 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2006		Auguria SARL			<info@auguria.org>
  * Copyright (C) 2010-2015	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2013-2014	Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2013-2016	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012-2013	Cédric Salvador			<csalvador@gpcsolutions.fr>
  * Copyright (C) 2011-2016	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014		Cédric Gross			<c.gross@kreiz-it.fr>
@@ -1574,6 +1574,22 @@ else
 			print dol_print_url($object->url);
             print '</td></tr>';
 
+            //Parent product.
+            if (!empty($conf->attributes->enabled) && $object->isProduct()) {
+
+                $combination = new ProductCombination($db);
+
+                if ($combination->fetchByFkProductChild($object->id) > 0) {
+                    $prodstatic = new Product($db);
+                    $prodstatic->fetch($combination->fk_product_parent);
+
+                    // Parent product
+                    print '<tr><td>'.$langs->trans("ParentProduct").'</td><td colspan="2">';
+                    print $prodstatic->getNomUrl(1);
+                    print '</td></tr>';
+                }
+            }
+
             print '</table>';
             print '</div>';
             print '<div class="fichehalfright"><div class="ficheaddleft">';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index f3f03c65ac6..e87b00ee949 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -839,6 +839,17 @@ class Product extends CommonObject
 
 				if (! $error)
 				{
+					if ($conf->attributes->enabled) {
+
+						require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+
+						$comb = new ProductCombination($this->db);
+
+						foreach ($comb->fetchAllByFkProductParent($this->id) as $currcomb) {
+							$currcomb->updateProperties($this);
+						}
+					}
+
 					$this->db->commit();
 					return 1;
 				}
@@ -944,6 +955,25 @@ class Product extends CommonObject
     			}
 			}
 
+			if (!$error) {
+
+				require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+
+				//If it is a parent product, then we remove the association with child products
+				$prodcomb = new ProductCombination($this->db);
+
+				if ($prodcomb->deleteByFkProductParent($id) < 0) {
+					$error++;
+					$this->errors[] = 'Error deleting combinations';
+				}
+
+				//We also check if it is a child product
+				if (!$error && ($prodcomb->fetchByFkProductChild($id) > 0) && ($prodcomb->delete() < 0)) {
+					$error++;
+					$this->errors[] = 'Error deleting child combination';
+				}
+			}
+
 			// Delete product
 			if (! $error)
 			{
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index c95156b4393..29e2216c154 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2006  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
- * Copyright (C) 2012-2013  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2013-2016	Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2013-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2013       Jean Heimburger         <jean@tiaris.info>
@@ -50,7 +50,7 @@ $sref=GETPOST("sref");
 $sbarcode=GETPOST("sbarcode");
 $snom=GETPOST("snom");
 $sall=GETPOST("sall");
-$type=GETPOST("type","int");
+$type= (int) GETPOST("type","int");
 $search_sale = GETPOST("search_sale");
 $search_categ = GETPOST("search_categ",'int');
 $tosell = GETPOST("tosell", 'int');
@@ -62,6 +62,13 @@ $search_accountancy_code_sell = GETPOST("search_accountancy_code_sell",'alpha');
 $search_accountancy_code_buy = GETPOST("search_accountancy_code_buy",'alpha');
 $optioncss = GETPOST('optioncss','alpha');
 
+//Show/hide child products. Hidden by default
+if (!$_POST) {
+	$search_hidechildproducts = 'on';
+} else {
+	$search_hidechildproducts = GETPOST('search_hidechildproducts');
+}
+
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -170,7 +177,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 }
 
 
-		    
+
 /*
  * Actions
  */
@@ -230,6 +237,9 @@ else
     $sql.= ' p.datec as date_creation, p.tms as date_update,';
     //$sql.= ' pfp.ref_fourn as ref_supplier, ';
     $sql.= ' MIN(pfp.unitprice) as minsellprice';
+	if (!empty($conf->attributes->enabled) && $search_hidechildproducts && ($type === 0)) {
+		$sql .= ', pac.rowid prod_comb_id';
+	}
 	// Add fields from extrafields
     foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 	// Add fields from hooks
@@ -242,6 +252,10 @@ else
    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
 	// multilang
 	if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang = '".$langs->getDefaultLang() ."'";
+	if (!empty($conf->attributes->enabled) && $search_hidechildproducts && ($type === 0)) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
+	}
+
 	$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
 	if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
     // if the type is not 1, we show all products (type = 0,2,3)
@@ -265,6 +279,12 @@ else
     if ($search_accountancy_code_sell)   $sql.= natural_search('p.accountancy_code_sell', $search_accountancy_code_sell);
     if ($search_accountancy_code_sell)   $sql.= natural_search('p.accountancy_code_buy', $search_accountancy_code_buy);
     // Add where from extra fields
+
+	if (!empty($conf->attributes->enabled) && $search_hidechildproducts && ($type === 0)) {
+		$sql .= " AND pac.rowid IS NULL";
+	}
+
+	// Add where from extra fields
 	foreach ($search_array_options as $key => $val)
 	{
 	    $crit=$val;
@@ -284,6 +304,9 @@ else
     $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
     $sql.= " p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
     $sql.= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy';
+	if (!empty($conf->attributes->enabled) && $search_hidechildproducts && ($type === 0)) {
+		$sql .= ', pac.rowid';
+	}
 	// Add fields from extrafields
     foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
 	// Add fields from hooks
@@ -415,6 +438,15 @@ else
     			$moreforfilter.=$htmlother->select_categories(Categorie::TYPE_PRODUCT,$search_categ,'search_categ',1);
     		 	$moreforfilter.='</div>';
     		}
+
+			//Show/hide child products. Hidden by default
+			if (!empty($conf->attributes->enabled) && $type === 0) {
+				$moreforfilter.='<div class="divsearchfield">';
+				$moreforfilter.= '<input type="checkbox" id="search_hidechildproducts" name="search_hidechildproducts" value="on"'.($search_hidechildproducts ? 'checked="checked"' : '').'>';
+				$moreforfilter.= ' <label for="search_hidechildproducts">'.$langs->trans('HideChildProducts').'</label>';
+				$moreforfilter.='</div>';
+			}
+
     	 	if ($moreforfilter)
     		{
         		print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -614,7 +646,7 @@ else
     			$product_static->status_buy = $objp->tobuy;
                 $product_static->status     = $objp->tosell;
 				$product_static->entity = $objp->entity;
-				
+
 				if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1)	// To optimize call of load_stock
 				{
 				    if ($objp->fk_product_type != 1)    // Not a service
@@ -622,8 +654,8 @@ else
 				        $product_static->load_stock('nobatch');             // Load stock_reel + stock_warehouse. This also call load_virtual_stock()
 				    }
 				}
-				 
-				
+
+
     			$var=!$var;
     			print '<tr '.$bc[$var].'>';
 
@@ -752,7 +784,7 @@ else
                     print '<td align="center">';
     				print yn($objp->tobatch);
     				print '</td>';
-        		}        		
+        		}
     			// Accountancy code sell
 		        if (! empty($arrayfields['p.accountancy_code_sell']['checked'])) print '<td>'.$objp->accountancy_code_sell.'</td>';
     			// Accountancy code sell

From 8ceb494569c5d30eecc8f8b13265ab08fa4029c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 25 Jul 2016 10:37:39 +0200
Subject: [PATCH 0010/1163] Added comments on classes to fix travis errors

---
 htdocs/attributes/class/ProductAttribute.class.php            | 4 ++++
 htdocs/attributes/class/ProductAttributeValue.class.php       | 4 ++++
 htdocs/attributes/class/ProductCombination.class.php          | 4 ++++
 .../attributes/class/ProductCombination2ValuePair.class.php   | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/htdocs/attributes/class/ProductAttribute.class.php b/htdocs/attributes/class/ProductAttribute.class.php
index 1e0837fcb97..f563b03cd7e 100644
--- a/htdocs/attributes/class/ProductAttribute.class.php
+++ b/htdocs/attributes/class/ProductAttribute.class.php
@@ -16,6 +16,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * Class ProductAttribute
+ * Used to represent a product attribute
+ */
 class ProductAttribute
 {
 	/**
diff --git a/htdocs/attributes/class/ProductAttributeValue.class.php b/htdocs/attributes/class/ProductAttributeValue.class.php
index f500fb251c6..41d1818ee63 100644
--- a/htdocs/attributes/class/ProductAttributeValue.class.php
+++ b/htdocs/attributes/class/ProductAttributeValue.class.php
@@ -16,6 +16,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * Class ProductAttributeValue
+ * Used to represent a product attribute value
+ */
 class ProductAttributeValue
 {
 	/**
diff --git a/htdocs/attributes/class/ProductCombination.class.php b/htdocs/attributes/class/ProductCombination.class.php
index 6722f7f03fc..d5d7b6e81af 100644
--- a/htdocs/attributes/class/ProductCombination.class.php
+++ b/htdocs/attributes/class/ProductCombination.class.php
@@ -16,6 +16,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * Class ProductCombination
+ * Used to represent a product combination
+ */
 class ProductCombination
 {
 	/**
diff --git a/htdocs/attributes/class/ProductCombination2ValuePair.class.php b/htdocs/attributes/class/ProductCombination2ValuePair.class.php
index 93521b86bbf..01bd0952d2d 100644
--- a/htdocs/attributes/class/ProductCombination2ValuePair.class.php
+++ b/htdocs/attributes/class/ProductCombination2ValuePair.class.php
@@ -16,6 +16,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * Class ProductCombination2ValuePair
+ * Used to represent the relation between a product combination, a product attribute and a product attribute value
+ */
 class ProductCombination2ValuePair
 {
 	/**

From 1c15cfa7229ee79e47405c670cbab111bb770c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 6 Nov 2016 15:17:41 +0100
Subject: [PATCH 0011/1163] Adapted code to new changes

---
 htdocs/core/tpl/objectline_create.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 4f0c1e4f479..5a82d1e8c26 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -185,7 +185,7 @@ else {
 
 		if (empty($senderissupplier))
 		{
-			$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id, GETPOST('combinations', 'array'));
+			$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, 1, 0, '', 0, GETPOST('combinations', 'array'));
 		}
 		else
 		{

From 081be37787e745c96f5806237a511766522d0bc7 Mon Sep 17 00:00:00 2001
From: moreauf <moreauf@WGTPO57.theobald-groupe.local>
Date: Mon, 14 Nov 2016 19:25:50 +0100
Subject: [PATCH 0012/1163] NEW: Add project and Hook to Loan BUG: Correct
 discard_closed parametters management in project

---
 htdocs/core/class/html.formprojet.class.php   |   2 +-
 .../install/mysql/migration/4.0.0-5.0.0.sql   |   2 +-
 htdocs/install/mysql/tables/llx_loan.sql      |   3 +-
 htdocs/loan/card.php                          | 320 ++++++++++--------
 htdocs/loan/class/loan.class.php              |   9 +-
 htdocs/projet/ajax/projects.php               |   3 +-
 6 files changed, 198 insertions(+), 141 deletions(-)

diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 1112d34d13f..ddc26d0bb91 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -79,7 +79,7 @@ class FormProjets
 				$project->fetch($selected);
 				$selected_input_value=$project->ref;
 			}
-			$urloption='socid='.$socid.'&htmlname='.$htmlname;
+			$urloption='socid='.$socid.'&htmlname='.$htmlname.'&discardclosed='.$discard_closed;
 			$out.=ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/projet/ajax/projects.php', $urloption, $conf->global->PROJECT_USE_SEARCH_TO_SELECT, 0, array(
 //				'update' => array(
 //					'projectid' => 'id'
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index fb862457b45..76aa7d85928 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -221,4 +221,4 @@ drop table tmp_links_double;
 
 ALTER TABLE llx_links ADD UNIQUE INDEX uk_links (objectid,label);
 
-
+ALTER TABLE llx_loan ADD COLUMN fk_project integer DEFAULT NULL;
diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql
index 6fd3c0d2099..64d1de5dc29 100644
--- a/htdocs/install/mysql/tables/llx_loan.sql
+++ b/htdocs/install/mysql/tables/llx_loan.sql
@@ -47,5 +47,6 @@ create table llx_loan
   
   fk_user_author				integer DEFAULT NULL,
   fk_user_modif					integer DEFAULT NULL,
-  active						tinyint DEFAULT 1  NOT NULL
+  active						tinyint DEFAULT 1  NOT NULL,
+  fk_project					integer DEFAULT NULL
 )ENGINE=innodb;
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 0894447d485..b24f9c75253 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -28,6 +28,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->projet->enabled))
+{
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
 
 $langs->load("compta");
 $langs->load("bills");
@@ -45,134 +50,143 @@ $result = restrictedArea($user, 'loan', $id, '','');
 
 $object = new Loan($db);
 
+$hookmanager->initHooks(array('loancard','globalcard'));
+
 /*
  * Actions
  */
 
-// Classify paid
-if ($action == 'confirm_paid' && $confirm == 'yes')
-{
-	$object->fetch($id);
-	$result = $object->set_paid($user);
-    if ($result > 0)
-    {
-        setEventMessages($langs->trans('LoanPaid'), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($loan->error, null, 'errors');
-    }
-}
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-// Delete loan
-if ($action == 'confirm_delete' && $confirm == 'yes')
+if (empty($reshook))
 {
-	$object->fetch($id);
-	$result=$object->delete($user);
-	if ($result > 0)
+	// Classify paid
+	if ($action == 'confirm_paid' && $confirm == 'yes')
 	{
-		setEventMessages($langs->trans('LoanDeleted'), null, 'mesgs');
-		header("Location: index.php");
-		exit;
+		$object->fetch($id);
+		$result = $object->set_paid($user);
+	    if ($result > 0)
+	    {
+	        setEventMessages($langs->trans('LoanPaid'), null, 'mesgs');
+	    }
+	    else
+	    {
+	        setEventMessages($loan->error, null, 'errors');
+	    }
 	}
-	else
-	{
-		setEventMessages($loan->error, null, 'errors');
-	}
-}
 
-// Add loan
-if ($action == 'add' && $user->rights->loan->write)
-{
-	if (! $cancel)
+	// Delete loan
+	if ($action == 'confirm_delete' && $confirm == 'yes')
 	{
-		$datestart=@dol_mktime(12,0,0, $_POST["startmonth"], $_POST["startday"], $_POST["startyear"]);
-		$dateend=@dol_mktime(12,0,0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
-
-		if (! $datestart)
+		$object->fetch($id);
+		$result=$object->delete($user);
+		if ($result > 0)
 		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateStart")), null, 'errors');
-			$action = 'create';
-		}
-		elseif (! $dateend)
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateEnd")), null, 'errors');
-			$action = 'create';
-		}
-		elseif (! $_POST["capital"])
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
-			$action = 'create';
+			setEventMessages($langs->trans('LoanDeleted'), null, 'mesgs');
+			header("Location: index.php");
+			exit;
 		}
 		else
 		{
-			$object->label					= $_POST["label"];
-			$object->fk_bank				= $_POST["accountid"];
-			$object->capital				= $_POST["capital"];
-			$object->datestart				= $datestart;
-			$object->dateend				= $dateend;
-			$object->nbterm					= $_POST["nbterm"];
-			$object->rate					= $_POST["rate"];
-			$object->note_private 			= GETPOST('note_private');
-			$object->note_public 			= GETPOST('note_public');
+			setEventMessages($loan->error, null, 'errors');
+		}
+	}
 
-			$accountancy_account_capital	= GETPOST('accountancy_account_capital');
-			$accountancy_account_insurance	= GETPOST('accountancy_account_insurance');
-			$accountancy_account_interest	= GETPOST('accountancy_account_interest');
+	// Add loan
+	if ($action == 'add' && $user->rights->loan->write)
+	{
+		if (! $cancel)
+		{
+			$datestart=@dol_mktime(12,0,0, $_POST["startmonth"], $_POST["startday"], $_POST["startyear"]);
+			$dateend=@dol_mktime(12,0,0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
 
-			if ($accountancy_account_capital <= 0) { $object->account_capital = ''; } else { $object->account_capital = $accountancy_account_capital; }
-			if ($accountancy_account_insurance <= 0) { $object->account_insurance = ''; } else { $object->account_insurance = $accountancy_account_insurance; }
-			if ($accountancy_account_interest <= 0) { $object->account_interest = ''; } else { $object->account_interest = $accountancy_account_interest; }
-
-			$id=$object->create($user);
-			if ($id <= 0)
+			if (! $datestart)
 			{
-				setEventMessages($object->error, $object->errors, 'errors');
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateStart")), null, 'errors');
+				$action = 'create';
+			}
+			elseif (! $dateend)
+			{
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateEnd")), null, 'errors');
+				$action = 'create';
+			}
+			elseif (! $_POST["capital"])
+			{
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
+				$action = 'create';
+			}
+			else
+			{
+				$object->label					= $_POST["label"];
+				$object->fk_bank				= $_POST["accountid"];
+				$object->capital				= $_POST["capital"];
+				$object->datestart				= $datestart;
+				$object->dateend				= $dateend;
+				$object->nbterm					= $_POST["nbterm"];
+				$object->rate					= $_POST["rate"];
+				$object->note_private 			= GETPOST('note_private');
+				$object->note_public 			= GETPOST('note_public');
+					$object->fk_project 			= GETPOST('fk_project');
+
+				$accountancy_account_capital	= GETPOST('accountancy_account_capital');
+				$accountancy_account_insurance	= GETPOST('accountancy_account_insurance');
+				$accountancy_account_interest	= GETPOST('accountancy_account_interest');
+
+				if ($accountancy_account_capital <= 0) { $object->account_capital = ''; } else { $object->account_capital = $accountancy_account_capital; }
+				if ($accountancy_account_insurance <= 0) { $object->account_insurance = ''; } else { $object->account_insurance = $accountancy_account_insurance; }
+				if ($accountancy_account_interest <= 0) { $object->account_interest = ''; } else { $object->account_interest = $accountancy_account_interest; }
+
+				$id=$object->create($user);
+				if ($id <= 0)
+				{
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
 			}
 		}
-	}
-	else
-	{
-		header("Location: index.php");
-		exit();
-	}
-}
-
-// Update record
-else if ($action == 'update' && $user->rights->loan->write)
-{
-	if (! $cancel)
-	{
-		$result = $object->fetch($id);
-
-		if ($object->fetch($id))
+		else
 		{
-			$object->label		= GETPOST("label");
-			$object->datestart	= dol_mktime(12, 0, 0, GETPOST('startmonth','int'), GETPOST('startday','int'), GETPOST('startyear','int'));
-			$object->dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int'));
-			$object->nbterm		= GETPOST("nbterm");
-			$object->rate		= GETPOST("rate");
+			header("Location: index.php");
+			exit();
 		}
+	}
 
-        $result = $object->update($user);
+	// Update record
+	else if ($action == 'update' && $user->rights->loan->write)
+	{
+		if (! $cancel)
+		{
+			$result = $object->fetch($id);
 
-        if ($result > 0)
-        {
-            header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-            exit;
-        }
-        else
-        {
-	        setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
-    else
-    {
-        header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-        exit;
-    }
+			if ($object->fetch($id))
+			{
+				$object->label		= GETPOST("label");
+				$object->datestart	= dol_mktime(12, 0, 0, GETPOST('startmonth','int'), GETPOST('startday','int'), GETPOST('startyear','int'));
+				$object->dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int'));
+				$object->nbterm		= GETPOST("nbterm");
+				$object->rate		= GETPOST("rate");
+					$object->fk_project		= GETPOST("fk_project");
+			}
+
+	        $result = $object->update($user);
+
+	        if ($result > 0)
+	        {
+	            header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+	            exit;
+	        }
+	        else
+	        {
+		        setEventMessages($object->error, $object->errors, 'errors');
+	        }
+	    }
+	    else
+	    {
+	        header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+	        exit;
+	    }
+	}
 }
-
 /*
  * View
  */
@@ -240,6 +254,20 @@ if ($action == 'create')
 	// Rate
     print '<tr><td class="fieldrequired">'.$langs->trans("Rate").'</td><td><input name="rate" size="5" value="' . GETPOST("rate") . '"> %</td></tr>';
 
+    // Project
+	if (! empty($conf->projet->enabled))
+	{
+		$formproject=new FormProjets($db);
+
+		// Projet associe
+		$langs->load("projects");
+
+		print '<tr><td>'.$langs->trans("Project").'</td><td>';
+
+		$numproject=$formproject->select_projects(-1,GETPOST("fk_project"),'fk_project',16,0,1,1);
+
+		print '</td></tr>';
+	}
     // Note Private
     print '<tr>';
     print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
@@ -283,8 +311,8 @@ if ($action == 'create')
         print '<td>';
 		print $formaccountancy->select_account($object->accountancy_account_interest, 'accountancy_account_interest', 1, '', 0, 1);
         print '</td></tr>';
-	}			
-	else // For external software 
+	}
+	else // For external software
 	{
         // Accountancy_account_capital
         print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
@@ -300,11 +328,11 @@ if ($action == 'create')
         print '<tr><td class="fieldrequired">'.$langs->trans("LoanAccountancyInterestCode").'</td>';
         print '<td><input name="accountancy_account_interest" size="16" value="'.$object->accountancy_account_interest.'">';
         print '</td></tr>';
-        
+
         print '</table>';
 	}
 	print '</table>';
-	
+
 	dol_fiche_end();
 
     print '<div align="center"><input class="button" type="submit" value="'.$langs->trans("Save").'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
@@ -438,6 +466,23 @@ if ($id > 0)
 		}
 		print '</td></tr>';
 
+		// projet
+		if (! empty($conf->projet->enabled)){
+			print '<tr><td class="nowrap">';
+			print $langs->trans("Project");
+			print '</td><td>';
+			if ($action == 'edit') {
+				$formproject=new FormProjets($db);
+				$numproject=$formproject->select_projects(-1,$object->fk_project,'fk_project',16,0,1,1);
+
+			} else {
+				$project=new Project($db);
+				$project->fetch($object->fk_project);
+				print $project->getNomUrl(1,'',1);;
+			}
+			print '</td></tr>';
+		}
+
 		// Status
 		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4, $totalpaye).'</td></tr>';
 
@@ -445,7 +490,7 @@ if ($id > 0)
 
 		dol_fiche_end();
 
-	
+
 		if ($action == 'edit')
 		{
 			print '<div align="center">';
@@ -455,7 +500,7 @@ if ($id > 0)
 			print '</div>';
 			print '</form><br><br>';
 		}
-		
+
 		print '<table class="border" width="100%">';
 		print '<tr><td>';
 
@@ -537,33 +582,38 @@ if ($id > 0)
 		 */
 		if ($action != 'edit')
 		{
-			print '<div class="tabsAction">';
+			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+			// modified by hook
+			if (empty($reshook))
+				{
+				print '<div class="tabsAction">';
 
-			// Edit
-			if ($user->rights->loan->write)
-			{
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
+				// Edit
+				if ($user->rights->loan->write)
+				{
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
+				}
+
+				// Emit payment
+				if ($object->paid == 0 && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->rights->loan->write)
+				{
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans("DoPayment").'</a>';
+				}
+
+				// Classify 'paid'
+				if ($object->paid == 0 && round($staytopay) <=0 && $user->rights->loan->write)
+				{
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=paid">'.$langs->trans("ClassifyPaid").'</a>';
+				}
+
+				// Delete
+				if ($user->rights->loan->delete)
+				{
+					print '<a class="butActionDelete" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+				}
+
+				print "</div>";
 			}
-
-			// Emit payment
-			if ($object->paid == 0 && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->rights->loan->write)
-			{
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans("DoPayment").'</a>';
-			}
-
-			// Classify 'paid'
-			if ($object->paid == 0 && round($staytopay) <=0 && $user->rights->loan->write)
-			{
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=paid">'.$langs->trans("ClassifyPaid").'</a>';
-			}
-
-			// Delete
-			if ($user->rights->loan->delete)
-			{
-				print '<a class="butActionDelete" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
-			}
-
-			print "</div>";
 		}
 	}
 	else
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 5c57764bf97..8ed6e682ce6 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -50,6 +50,7 @@ class Loan extends CommonObject
 	var $fk_bank;
 	var $fk_user_creat;
 	var $fk_user_modif;
+	var $fk_project;
 
 
     /**
@@ -72,7 +73,7 @@ class Loan extends CommonObject
     function fetch($id)
     {
         $sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.nbterm, l.rate, l.note_private, l.note_public,";
-		$sql.= " l.paid, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest";
+		$sql.= " l.paid, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest,l.fk_project";
         $sql.= " FROM ".MAIN_DB_PREFIX."loan as l";
         $sql.= " WHERE l.rowid = ".$id;
 
@@ -99,6 +100,7 @@ class Loan extends CommonObject
 				$this->account_capital		= $obj->accountancy_account_capital;
 				$this->account_insurance	= $obj->accountancy_account_insurance;
 				$this->account_interest		= $obj->accountancy_account_interest;
+				$this->fk_project			= $obj->fk_project;
 
                 $this->db->free($resql);
 				return 1;
@@ -141,6 +143,7 @@ class Loan extends CommonObject
 		if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
 		if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat);
 		if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif);
+		if (isset($this->fk_project)) $this->fk_project=trim($this->fk_project);
 
         // Check parameters
         if (! $newcapital > 0 || empty($this->datestart) || empty($this->dateend))
@@ -158,7 +161,7 @@ class Loan extends CommonObject
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."loan (label, fk_bank, capital, datestart, dateend, nbterm, rate, note_private, note_public";
 		$sql.= " ,accountancy_account_capital, accountancy_account_insurance, accountancy_account_interest, entity";
-		$sql.= " ,datec, fk_user_author)";
+		$sql.= " ,datec,fk_project,fk_user_author)";
 		$sql.= " VALUES ('".$this->db->escape($this->label)."',";
 		$sql.= " '".$this->db->escape($this->fk_bank)."',";
         $sql.= " '".price2num($newcapital)."',";
@@ -173,6 +176,7 @@ class Loan extends CommonObject
 		$sql.= " '".$this->db->escape($this->account_interest)."',";
         $sql.= " ".$conf->entity.",";
 		$sql.= " '".$this->db->idate($now)."',";
+		$sql.= " '".$this->fk_project."',";
 		$sql.= " ".$user->id;
         $sql.= ")";
 
@@ -280,6 +284,7 @@ class Loan extends CommonObject
         $sql.= " SET label='".$this->db->escape($this->label)."',";
         $sql.= " datestart='".$this->db->idate($this->datestart)."',";
         $sql.= " dateend='".$this->db->idate($this->dateend)."',";
+        $sql.= " fk_project='".$this->db->escape($this->fk_project)."',";
 		$sql.= " fk_user_modif = ".$user->id;
         $sql.= " WHERE rowid=".$this->id;
 
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index 55a4597dc08..3140352bf60 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -37,6 +37,7 @@ $htmlname=GETPOST('htmlname','alpha');
 $socid=GETPOST('socid','int');
 $action=GETPOST('action', 'alpha');
 $id=GETPOST('id', 'int');
+$discard_closed =GETPOST('discardclosed','int');
 
 
 /*
@@ -63,7 +64,7 @@ if (! GETPOST($htmlname) && ! GETPOST($idprod)) return;
 $searchkey=(GETPOST($idprod)?GETPOST($idprod):(GETPOST($htmlname)?GETPOST($htmlname):''));
 
 $form = new FormProjets($db);
-$arrayresult=$form->select_projects_list($socid, '', $htmlname, 0, 0, 1, 0, 0, 0, 1, $searchkey);
+$arrayresult=$form->select_projects_list($socid, '', $htmlname, 0, 0, 1, $discard_closed, 0, 0, 1, $searchkey);
 
 $db->close();
 

From a251f0df51eec143a42e23de6133a4c66e60b0d3 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Wed, 16 Nov 2016 09:38:13 +0100
Subject: [PATCH 0013/1163] Various fix on Loan and project link

---
 .../install/mysql/migration/4.0.0-5.0.0.sql   |  2 +-
 htdocs/install/mysql/tables/llx_loan.sql      |  2 +-
 htdocs/loan/card.php                          | 10 +++---
 htdocs/loan/class/loan.class.php              | 18 +++++------
 htdocs/projet/element.php                     | 31 ++++++++++++++-----
 5 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index 42f7e8fd76c..5f5581a6d48 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -223,4 +223,4 @@ ALTER TABLE llx_links ADD UNIQUE INDEX uk_links (objectid,label);
 
 ALTER TABLE llx_c_actioncomm MODIFY COLUMN type varchar(50) DEFAULT 'system' NOT NULL;
 
-ALTER TABLE llx_loan ADD COLUMN fk_project integer DEFAULT NULL;
+ALTER TABLE llx_loan ADD COLUMN fk_projet integer DEFAULT NULL;
diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql
index 64d1de5dc29..c6d8147fe47 100644
--- a/htdocs/install/mysql/tables/llx_loan.sql
+++ b/htdocs/install/mysql/tables/llx_loan.sql
@@ -48,5 +48,5 @@ create table llx_loan
   fk_user_author				integer DEFAULT NULL,
   fk_user_modif					integer DEFAULT NULL,
   active						tinyint DEFAULT 1  NOT NULL,
-  fk_project					integer DEFAULT NULL
+  fk_projet					integer DEFAULT NULL
 )ENGINE=innodb;
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index b24f9c75253..8d8c938f641 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -127,7 +127,7 @@ if (empty($reshook))
 				$object->rate					= $_POST["rate"];
 				$object->note_private 			= GETPOST('note_private');
 				$object->note_public 			= GETPOST('note_public');
-					$object->fk_project 			= GETPOST('fk_project');
+					$object->fk_projet 			= GETPOST('fk_projet');
 
 				$accountancy_account_capital	= GETPOST('accountancy_account_capital');
 				$accountancy_account_insurance	= GETPOST('accountancy_account_insurance');
@@ -165,7 +165,7 @@ if (empty($reshook))
 				$object->dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int'));
 				$object->nbterm		= GETPOST("nbterm");
 				$object->rate		= GETPOST("rate");
-					$object->fk_project		= GETPOST("fk_project");
+					$object->fk_projet		= GETPOST("fk_projet");
 			}
 
 	        $result = $object->update($user);
@@ -264,7 +264,7 @@ if ($action == 'create')
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
 
-		$numproject=$formproject->select_projects(-1,GETPOST("fk_project"),'fk_project',16,0,1,1);
+		$numproject=$formproject->select_projects(-1,GETPOST("fk_projet"),'fk_projet',16,0,1,1);
 
 		print '</td></tr>';
 	}
@@ -473,11 +473,11 @@ if ($id > 0)
 			print '</td><td>';
 			if ($action == 'edit') {
 				$formproject=new FormProjets($db);
-				$numproject=$formproject->select_projects(-1,$object->fk_project,'fk_project',16,0,1,1);
+				$numproject=$formproject->select_projects(-1,$object->fk_projet,'fk_projet',16,0,1,1);
 
 			} else {
 				$project=new Project($db);
-				$project->fetch($object->fk_project);
+				$project->fetch($object->fk_projet);
 				print $project->getNomUrl(1,'',1);;
 			}
 			print '</td></tr>';
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 8ed6e682ce6..ac0062d3ed9 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -50,7 +50,7 @@ class Loan extends CommonObject
 	var $fk_bank;
 	var $fk_user_creat;
 	var $fk_user_modif;
-	var $fk_project;
+	var $fk_projet;
 
 
     /**
@@ -73,7 +73,7 @@ class Loan extends CommonObject
     function fetch($id)
     {
         $sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.nbterm, l.rate, l.note_private, l.note_public,";
-		$sql.= " l.paid, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest,l.fk_project";
+		$sql.= " l.paid, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest,l.fk_projet";
         $sql.= " FROM ".MAIN_DB_PREFIX."loan as l";
         $sql.= " WHERE l.rowid = ".$id;
 
@@ -100,7 +100,7 @@ class Loan extends CommonObject
 				$this->account_capital		= $obj->accountancy_account_capital;
 				$this->account_insurance	= $obj->accountancy_account_insurance;
 				$this->account_interest		= $obj->accountancy_account_interest;
-				$this->fk_project			= $obj->fk_project;
+				$this->fk_projet			= $obj->fk_projet;
 
                 $this->db->free($resql);
 				return 1;
@@ -128,7 +128,7 @@ class Loan extends CommonObject
     function create($user)
     {
     	global $conf;
-		
+
 		$error=0;
 
         $now=dol_now();
@@ -143,7 +143,7 @@ class Loan extends CommonObject
 		if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
 		if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat);
 		if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif);
-		if (isset($this->fk_project)) $this->fk_project=trim($this->fk_project);
+		if (isset($this->fk_projet)) $this->fk_projet=trim($this->fk_projet);
 
         // Check parameters
         if (! $newcapital > 0 || empty($this->datestart) || empty($this->dateend))
@@ -161,7 +161,7 @@ class Loan extends CommonObject
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."loan (label, fk_bank, capital, datestart, dateend, nbterm, rate, note_private, note_public";
 		$sql.= " ,accountancy_account_capital, accountancy_account_insurance, accountancy_account_interest, entity";
-		$sql.= " ,datec,fk_project,fk_user_author)";
+		$sql.= " ,datec,fk_projet,fk_user_author)";
 		$sql.= " VALUES ('".$this->db->escape($this->label)."',";
 		$sql.= " '".$this->db->escape($this->fk_bank)."',";
         $sql.= " '".price2num($newcapital)."',";
@@ -176,7 +176,7 @@ class Loan extends CommonObject
 		$sql.= " '".$this->db->escape($this->account_interest)."',";
         $sql.= " ".$conf->entity.",";
 		$sql.= " '".$this->db->idate($now)."',";
-		$sql.= " '".$this->fk_project."',";
+		$sql.= " ".(empty($this->fk_projet)?'NULL':$this->fk_projet).",";
 		$sql.= " ".$user->id;
         $sql.= ")";
 
@@ -284,7 +284,7 @@ class Loan extends CommonObject
         $sql.= " SET label='".$this->db->escape($this->label)."',";
         $sql.= " datestart='".$this->db->idate($this->datestart)."',";
         $sql.= " dateend='".$this->db->idate($this->dateend)."',";
-        $sql.= " fk_project='".$this->db->escape($this->fk_project)."',";
+        $sql.= " fk_projet=".(empty($this->fk_projet)?'NULL':$this->fk_projet).",";
 		$sql.= " fk_user_modif = ".$user->id;
         $sql.= " WHERE rowid=".$this->id;
 
@@ -348,7 +348,7 @@ class Loan extends CommonObject
         global $langs;
         $langs->load('customers');
         $langs->load('bills');
-        
+
         if ($mode == 0)
         {
             if ($statut ==  0) return $langs->trans("Unpaid");
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 958f0b242a2..9abcc1d0771 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -47,6 +47,7 @@ if (! empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compt
 if (! empty($conf->expensereport->enabled)) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 if (! empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 if (! empty($conf->don->enabled))         require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
+if (! empty($conf->loan->enabled))         require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 
 $langs->load("projects");
 $langs->load("companies");
@@ -58,6 +59,7 @@ if (! empty($conf->ficheinter->enabled))	$langs->load("interventions");
 if (! empty($conf->deplacement->enabled))	$langs->load("trips");
 if (! empty($conf->expensereport->enabled)) $langs->load("trips");
 if (! empty($conf->don->enabled))			$langs->load("donations");
+if (! empty($conf->loan->enabled))			$langs->load("loan");
 
 $id=GETPOST('id','int');
 $ref=GETPOST('ref','alpha');
@@ -370,6 +372,19 @@ $listofreferent=array(
     'buttonnew'=>'AddDonation',
     'testnew'=>$user->rights->don->creer,
     'test'=>$conf->don->enabled && $user->rights->don->lire),
+'loan'=>array(
+	'name'=>"Loan",
+	'title'=>"ListLoanAssociatedProject",
+	'class'=>'Loan',
+	'margin'=>'add',
+	'table'=>'Loan',
+	'datefieldname'=>'datestart',
+	'disableamount'=>0,
+    'urlnew'=>DOL_URL_ROOT.'/loan/card.php?action=create&projectid='.$id.'&socid='.$socid,
+    'lang'=>'loan',
+    'buttonnew'=>'AddLoan',
+    'testnew'=>$user->rights->loan->creer,
+    'test'=>$conf->loan->enabled && $user->rights->loan->lire),
 'agenda'=>array(
 	'name'=>"Agenda",
 	'title'=>"ListActionsAssociatedProject",
@@ -397,9 +412,9 @@ $parameters=array('listofreferent'=>$listofreferent);
 $resHook = $hookmanager->executeHooks('completeListOfReferent',$parameters,$object,$action);
 
 if(!empty($hookmanager->resArray)) {
-	
+
 	$listofreferent = array_merge($listofreferent, $hookmanager->resArray);
-	
+
 }
 
 if ($action=="addelement")
@@ -490,7 +505,7 @@ foreach ($listofreferent as $key => $value)
 		$element = new $classname($db);
 
 		$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee);
-		
+
 		if (count($elementarray)>0 && is_array($elementarray))
 		{
 			$total_ht = 0;
@@ -506,7 +521,7 @@ foreach ($listofreferent as $key => $value)
 				$element->fetch($idofelement);
 				if ($idofelementuser) $elementuser->fetch($idofelementuser);
 
-                // Special cases				
+                // Special cases
 				if ($tablename != 'expensereport_det' && method_exists($element, 'fetch_thirdparty')) $element->fetch_thirdparty();
 				if ($tablename == 'don') $total_ht_by_line=$element->amount;
 				elseif ($tablename == 'projet_task')
@@ -529,7 +544,7 @@ foreach ($listofreferent as $key => $value)
 				{
 					if (! empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal=false;	// Replacement invoice, do not include into total
 				}
-				
+
 				if ($qualifiedfortotal) $total_ht = $total_ht + $total_ht_by_line;
 
 				if ($tablename == 'don') $total_ttc_by_line=$element->amount;
@@ -795,7 +810,7 @@ foreach ($listofreferent as $key => $value)
 						print ' - '.dol_trunc($element->label, 48);
 					}
 					else print $element->getNomUrl(1);
-						
+
 					$element_doc = $element->element;
 					$filename=dol_sanitizeFileName($element->ref);
 					$filedir=$conf->{$element_doc}->dir_output . '/' . dol_sanitizeFileName($element->ref);
@@ -811,7 +826,7 @@ foreach ($listofreferent as $key => $value)
 					}
 
 					print '<div class="inline-block valignmiddle">'.$formfile->getDocumentsLink($element_doc, $filename, $filedir).'</div>';
-					
+
 					// Show supplier ref
 					if (! empty($element->ref_supplier)) print ' - '.$element->ref_supplier;
 					// Show customer ref
@@ -826,7 +841,7 @@ foreach ($listofreferent as $key => $value)
 				elseif (! empty($element->status) || ! empty($element->statut) || ! empty($element->fk_status))
 				{
 				    if ($tablename=='don') $date = $element->datedon;
-				    if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order') 
+				    if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
     				{
     				    $date=($element->date_commande?$element->date_commande:$element->date_valid);
     				}

From ff734bb5d9379f5ca42b105783df5e0589a11a09 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Wed, 16 Nov 2016 09:40:29 +0100
Subject: [PATCH 0014/1163] Fix travis

---
 htdocs/core/lib/functions.lib.php | 144 +++++++++++++++---------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 677b619bd02..e535dd9f928 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -191,7 +191,7 @@ function getBrowserInfo($user_agent)
 	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg))    { $name='opera';     $version=$reg[2]; }
 	elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];\srv:([0-9]+\.[0-9]+))/i', $user_agent, $reg))  { $name='ie'; $version=end($reg); }    // MS products at end
 	elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name='lynxlinks'; $version=$reg[4]; }
-	
+
 	if ($tablet) {
 		$layout = 'tablet';
 	} elseif ($phone) {
@@ -256,14 +256,14 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 	        {
     	        $tmp=dol_getdate(dol_now(), true);
     	        $out = $tmp['mon'];
-	        }	         
+	        }
 	        elseif ($reg[1] == 'YEAR')
 	        {
 	           $tmp=dol_getdate(dol_now(), true);
 	           $out = $tmp['year'];
 	        }
 	    }
-	     
+
 	    switch ($check)
 	    {
 	        case 'int':
@@ -387,15 +387,15 @@ function dol_buildpath($path, $type=0)
 		if ($type == 1) $res = DOL_URL_ROOT.'/'.$path;			// Standard value
 		if ($type == 2) $res = DOL_MAIN_URL_ROOT.'/'.$path;		// Standard value
 		if ($type == 3) $res = DOL_URL_ROOT.'/'.$path;
-		
+
 		foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
 		{
-			if ($key == 'main') 
+			if ($key == 'main')
 			{
 			    if ($type == 3)
 			    {
 			        global $dolibarr_main_url_root;
-			        	
+
 			        // Define $urlwithroot
 			        $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 			        $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
@@ -422,12 +422,12 @@ function dol_buildpath($path, $type=0)
 					if ($type == 3)
 					{
 					    global $dolibarr_main_url_root;
-					    
+
 					    // Define $urlwithroot
 					    $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 					    $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 					    //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-					    					
+
 					    $res=(preg_match('/^http/i',$conf->file->dol_url_root[$key])?'':$urlwithroot).$conf->file->dol_url_root[$key].'/'.$path;     // Test on start with http is for old conf syntax
 					}
 					break;
@@ -693,13 +693,13 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='
     		throw new Exception('Incorrect log level');
     	}
     	if ($level > $conf->global->SYSLOG_LEVEL) return;
-    
+
     	// If adding log inside HTML page is required
     	if (! empty($_REQUEST['logtohtml']) && (! empty($conf->global->MAIN_ENABLE_LOG_TO_HTML) || ! empty($conf->global->MAIN_LOGTOHTML)))   // MAIN_LOGTOHTML kept for backward compatibility
     	{
     		$conf->logbuffer[] = dol_print_date(time(),"%Y-%m-%d %H:%M:%S")." ".$message;
     	}
-    
+
     	//TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output
     	// If enable html log tag enabled and url parameter log defined, we show output log on HTML comments
     	if (! empty($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && ! empty($_GET["log"]))
@@ -708,7 +708,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='
     		print $message."\n";
     		print "Log end -->\n";
     	}
-    
+
     	$data = array(
     		'message' => $message,
     		'script' => (isset($_SERVER['PHP_SELF'])? basename($_SERVER['PHP_SELF'],'.php') : false),
@@ -716,7 +716,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='
     		'user' => ((is_object($user) && $user->id) ? $user->login : false),
     		'ip' => false
     	);
-    
+
     	if (! empty($_SERVER["REMOTE_ADDR"])) $data['ip'] = $_SERVER['REMOTE_ADDR'];
     	// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
     	else if (! empty($_SERVER['SERVER_ADDR'])) $data['ip'] = $_SERVER['SERVER_ADDR'];
@@ -903,7 +903,7 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
 	{
 		$out = $hookmanager->resPrint;
 	}
-	
+
 	return $out;
 }
 
@@ -944,8 +944,8 @@ function dol_get_fiche_end($notab=0)
  *	@param	int		$nodbprefix		Do not include DB prefix to forge table name
  *	@param	string	$morehtmlleft	More html code to show before ref
  *	@param	string	$morehtmlstatus	More html code to show under navigation arrows
- *	@param	string	$morehtmlright	More html code to show before navigation arrows
  *  @param  int     $onlybanner     Put this to 1, if the card will contains only a banner
+ *	@param	string	$morehtmlright	More html code to show before navigation arrows
  *  @return	void
  */
 function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='rowid', $fieldref='ref', $morehtmlref='', $moreparam='', $nodbprefix=0, $morehtmlleft='', $morehtmlstatus='', $onlybanner=0, $morehtmlright='')
@@ -962,7 +962,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	if ($object->element == 'member')  $modulepart='memberphoto';
 	if ($object->element == 'user')    $modulepart='userphoto';
 	if ($object->element == 'product') $modulepart='product';
-	
+
 	if ($object->element == 'product')
 	{
 	    $width=80; $cssclass='photoref';
@@ -970,7 +970,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	    $maxvisiblephotos=(isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO)?$conf->global->PRODUCT_MAX_VISIBLE_PHOTO:5);
 		if ($conf->browser->phone) $maxvisiblephotos=1;
 		if ($showimage) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos($conf->product->multidir_output[$object->entity],'small',$maxvisiblephotos,0,0,0,$width,0).'</div>';
-        else 
+        else
         {
 			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
 				$nophoto='';
@@ -980,14 +980,14 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 				$nophoto='/public/theme/common/nophoto.png';
 				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
 			}
-            
+
         }
 	}
-	else 
+	else
 	{
-        if ($showimage) 
+        if ($showimage)
         {
-            if ($modulepart != 'unknown') 
+            if ($modulepart != 'unknown')
             {
                 $phototoshow = $form->showphoto($modulepart,$object,0,0,0,'photoref','small',1,0,$maxvisiblephotos);
                 if ($phototoshow)
@@ -1000,7 +1000,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
             elseif ($conf->browser->layout != 'phone')      // Show no photo link
             {
                 $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">';
-                if ($object->element == 'action') 
+                if ($object->element == 'action')
                 {
                     $cssclass='photorefcenter';
                     $nophoto=img_picto('', 'title_agenda', '', false, 1);
@@ -1019,7 +1019,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	if ($showbarcode) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
 	if ($object->element == 'societe' && ! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
 		$morehtmlstatus.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
-	} 
+	}
 	elseif ($object->element == 'product')
 	{
 	    //$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Sell").') ';
@@ -1039,21 +1039,21 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	elseif ($object->element == 'facture' || $object->element == 'invoice' || $object->element == 'invoice_supplier')
 	{
 	    $tmptxt=$object->getLibStatut(6, $object->totalpaye);
-	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye); 
+	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye);
 		$morehtmlstatus.=$tmptxt;
 	}
-	elseif ($object->element == 'facturerec') 
+	elseif ($object->element == 'facturerec')
 	{
 	    $morehtmlstatus.='<!-- No status for recurring invoice -->';
 	}
 	else { // Generic case
 	    $tmptxt=$object->getLibStatut(6);
-	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5); 
+	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5);
 		$morehtmlstatus.=$tmptxt;
 	}
 	if (! empty($object->name_alias)) $morehtmlref.='<div class="refidno">'.$object->name_alias.'</div>';      // For thirdparty
 	if (! empty($object->label))      $morehtmlref.='<div class="refidno">'.$object->label.'</div>';           // For product
-	if ($object->element != 'product') 
+	if ($object->element != 'product')
 	{
     	$morehtmlref.='<div class="refidno">';
     	$morehtmlref.=$object->getBannerAddress('refaddress',$object);
@@ -1065,7 +1065,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 		$morehtmlref.=$langs->trans("TechnicalID").': '.$object->id;
 		$morehtmlref.='</div>';
 	}
-	
+
 	print '<div class="'.($onlybanner?'':'arearef ').'heightref valignmiddle" width="100%">';
 	print $form->showrefnav($object, $paramid, $morehtml, $shownav, $fieldid, $fieldref, $morehtmlref, $moreparam, $nodbprefix, $morehtmlleft, $morehtmlstatus, $morehtmlright);
 	print '</div>';
@@ -1240,9 +1240,9 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
 	$reduceformat=(! empty($conf->dol_optimize_smallscreen) && in_array($format,array('day','dayhour')))?1:0;
 	$formatwithoutreduce = preg_replace('/reduceformat/','',$format);
 	if ($formatwithoutreduce != $format) { $format = $formatwithoutreduce; $reduceformat=1; }  // so format 'dayreduceformat' is processed like day
-    
+
 	// Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.
-	// TODO Add format daysmallyear and dayhoursmallyear 
+	// TODO Add format daysmallyear and dayhoursmallyear
 	if ($format == 'day')				$format=($outputlangs->trans("FormatDateShort")!="FormatDateShort"?$outputlangs->trans("FormatDateShort"):$conf->format_date_short);
 	else if ($format == 'hour')			$format=($outputlangs->trans("FormatHourShort")!="FormatHourShort"?$outputlangs->trans("FormatHourShort"):$conf->format_hour_short);
 	else if ($format == 'hourduration')	$format=($outputlangs->trans("FormatHourShortDuration")!="FormatHourShortDuration"?$outputlangs->trans("FormatHourShortDuration"):$conf->format_hour_short_duration);
@@ -1744,7 +1744,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
 	        $newphone=($separ!=''?'(':'').substr($newphone,0,3).($separ!=''?')':'').$separ.substr($newphone,3,3).($separ!=''?'-':'').substr($newphone,6,4);
 	    }
 	}
-	
+
 	if (! empty($addlink))	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
 	{
 		if (! empty($conf->browser->phone) || (! empty($conf->clicktodial->enabled) && ! empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS)))	// If phone or option for, we use link of phone
@@ -1874,7 +1874,7 @@ function dol_user_country()
  *  @param  int		$mode       thirdparty|contact|member|other
  *  @param  int		$id         Id of object
  *  @param	int		$noprint	No output. Result is the function return
- *  @param  string  $charfornl  Char to use instead of nl2br. '' means we use a standad nl2br.  
+ *  @param  string  $charfornl  Char to use instead of nl2br. '' means we use a standad nl2br.
  *  @return string|void			Nothing if noprint is 0, formatted address if noprint is 1
  *  @see dol_format_address
  */
@@ -1895,7 +1895,7 @@ function dol_print_address($address, $htmlid, $mode, $id, $noprint=0, $charfornl
         {
             if (empty($charfornl)) $out.=nl2br($address);
             else $out.=preg_replace('/[\r\n]+/', $charfornl, $address);
-            
+
             $showgmap=$showomap=0;
 
             // TODO Add a hook here
@@ -2023,7 +2023,7 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
 	    print '<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
 	    return;
 	}
-	
+
 	if (empty($conf->use_javascript_ajax)) return;
 	$jsgraphlib='flot';
 	$datacolor=array();
@@ -2192,7 +2192,7 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
 	global $conf;
 
 	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
-	
+
 	if (empty($stringencoding)) $stringencoding='UTF-8';
 	// reduce for small screen
 	if ($conf->dol_optimize_smallscreen==1 && $display==1) $size = round($size/3);
@@ -3144,7 +3144,7 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
  *	@param	string	    $options         	More parameters for links ('' by default, does not include sortfield neither sortorder)
  *	@param	string    	$sortfield       	Field to sort on ('' by default)
  *	@param	string	    $sortorder       	Order to sort ('' by default)
- *	@param	string	    $center          	Strin gin the middle ('' by default). We often find here string $massaction comming from $form->selectMassAction() 
+ *	@param	string	    $center          	Strin gin the middle ('' by default). We often find here string $massaction comming from $form->selectMassAction()
  *	@param	int		    $num				Number of records found by select with limit+1
  *	@param	int		    $totalnboflines		Total number of records/lines for all pages (if known). Use a negative value to not show number.
  *	@param	string	    $picto				Icon to use before title (should be a 32x32 transparent png file)
@@ -3158,11 +3158,11 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
 function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=-1, $hideselectlimit=0)
 {
 	global $conf,$langs;
-	
+
 	$savlimit = $limit;
     $savtotalnboflines = $totalnboflines;
     $totalnboflines=abs($totalnboflines);
-    
+
 	if ($picto == 'setup') $picto='title_setup.png';
 	if (($conf->browser->name == 'ie') && $picto=='title_generic.png') $picto='title.gif';
 	if ($limit < 0) $limit = $conf->liste_limit;
@@ -3175,7 +3175,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 		$nextpage = 0;
 	}
 	//print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;
-	
+
 	print "\n";
 	print "<!-- Begin title '".$titre."' -->\n";
 	print '<table width="100%" border="0" class="notopnoleftnoright'.($morecss?' '.$morecss:'').'" style="margin-bottom: 6px;"><tr>';
@@ -3276,7 +3276,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
 	    //$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported
 	    //$pagesizechoices.=',2:2';
 	    if (! empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices=$conf->global->MAIN_PAGESIZE_CHOICES;
-	     
+
         print '<li class="pagination">';
         print '<select class="flat selectlimit" name="limit">';
         $tmpchoice=explode(',',$pagesizechoices);
@@ -3316,7 +3316,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
             		</script>
                 ';
         }
-        print '</li>';	    
+        print '</li>';
 	}
 	if ($page > 0)
 	{
@@ -3355,7 +3355,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
 function vatrate($rate, $addpercent=false, $info_bits=0, $usestarfornpr=0)
 {
     $morelabel='';
-    
+
     if (preg_match('/%/',$rate))
 	{
 		$rate=str_replace('%','',$rate);
@@ -3558,7 +3558,7 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
 
 /**
  * Output a dimension with best unit
- *  
+ *
  * @param   float       $dimension      Dimension
  * @param   int         $unit           Unit of dimension (0, -3, ...)
  * @param   string      $type           'weight', 'volume', ...
@@ -3570,16 +3570,16 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
 function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round=-1, $forceunitoutput='no')
 {
     require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
-    
-    if (($forceunitoutput == 'no' && $dimension < 1/10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6)) 
+
+    if (($forceunitoutput == 'no' && $dimension < 1/10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6))
     {
         $dimension = $dimension * 1000000;
-        $unit = $unit - 6; 
+        $unit = $unit - 6;
     }
     elseif (($forceunitoutput == 'no' && $dimension < 1/10) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
     {
         $dimension = $dimension * 1000;
-        $unit = $unit - 3; 
+        $unit = $unit - 3;
     }
     elseif (($forceunitoutput == 'no' && $dimension > 100000000) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))
     {
@@ -3591,9 +3591,9 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round=
         $dimension = $dimension / 1000;
         $unit = $unit + 3;
     }
-    
+
     $ret=price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string($unit, $type);
-    
+
     return $ret;
 }
 
@@ -3624,12 +3624,12 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
         $vatratecleaned = trim($reg[1]);
 	    $vatratecode = $reg[2];
 	}
-	
+
 	/*if ($thirdparty_buyer->country_code != $thirdparty_seller->country_code)
 	{
 		return 0;
 	}*/
-	
+
 	// Some test to guess with no need to make database access
 	if ($mysoc->country_code == 'ES') // For spain localtaxes 1 and 2, tax is qualified if buyer use local taxe
 	{
@@ -3730,7 +3730,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
    		if ($local==1) return $obj->localtax1;
    		elseif ($local==2) return $obj->localtax2;
 	}
-	
+
 	return 0;
 }
 
@@ -3790,7 +3790,7 @@ function get_localtax_by_third($local)
 
 /**
  *  Get vat rate and npr from id.
- *  You can call getLocalTaxesFromRate after to get other fields 
+ *  You can call getLocalTaxesFromRate after to get other fields
  *
  *  @param	int      $vatrowid			Line ID into vat rate table.
  *  @return	array    	  				array(localtax_type1(1-6 / 0 if not found), rate of localtax1, ...)
@@ -3844,7 +3844,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 	    $vatratecleaned = $reg[1];
 	    $vatratecode = $reg[2];
 	}
-	
+
 	// Search local taxes
 	$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
@@ -3857,7 +3857,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
     	$sql.= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
     	if ($vatratecode) $sql.= " AND t.code ='".$vatratecode."'";
 	}
-	
+
 	$resql=$db->query($sql);
 	if ($resql)
 	{
@@ -4264,7 +4264,7 @@ function yn($yesno, $case=1, $color=0)
 /**
  *	Return a path to have a directory according to object.
  *  New usage:       $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'modulepart')
- *  Old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/" 
+ *  Old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/"
  *
  *	@param	string	$num            Id of object (deprecated, $object will be used in future)
  *	@param  int		$level		    Level of subdirs to return (1, 2 or 3 levels). (deprecated, global option will be used in future)
@@ -4281,7 +4281,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
 	$path = '';
 
 	$arrayforoldpath=array('cheque','user','category','holiday','shipment','supplier_invoice','invoice_supplier','mailing');
-	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';	
+	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';
 	if (! empty($level) && in_array($modulepart, $arrayforoldpath))
 	{
 		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided
@@ -4433,7 +4433,7 @@ function dolGetFirstLineOfText($text)
 	{
 		$firstline=preg_replace('/<br[^>]*>.*$/s','',$text);		// The s pattern modifier means the . can match newline characters
 		$firstline=preg_replace('/<div[^>]*>.*$/s','',$firstline);	// The s pattern modifier means the . can match newline characters
-		
+
 	}
 	else
 	{
@@ -5339,7 +5339,7 @@ function picto_from_langcode($codelang)
 }
 
 /**
- *  Complete or removed entries into a head array (used to build tabs). 
+ *  Complete or removed entries into a head array (used to build tabs).
  *  For example, with value added by external modules. Such values are declared into $conf->modules_parts['tab'].
  *  Or by change using hook completeTabsHead
  *
@@ -5369,7 +5369,7 @@ function picto_from_langcode($codelang)
 function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode='add')
 {
 	global $hookmanager;
-	
+
 	if (isset($conf->modules_parts['tabs'][$type]) && is_array($conf->modules_parts['tabs'][$type]))
 	{
 		foreach ($conf->modules_parts['tabs'][$type] as $value)
@@ -5435,7 +5435,7 @@ function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode=
 			}
 		}
 	}
-	
+
 	// No need to make a return $head. Var is modified as a reference
 	if (! empty($hookmanager))
 	{
@@ -5473,11 +5473,11 @@ function printCommonFooter($zone='private')
 	{
 		print '<!-- Reposition management (does not work if a redirect is done after action of submission) -->'."\n";
     	print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() {'."\n";
-    	
+
     	print '<!-- If page_y set, we set scollbar with it -->'."\n";
     	print "page_y=getParameterByName('page_y', 0);";
     	print "if (page_y > 0) $('html, body').scrollTop(page_y);\n";
-    	
+
     	print '<!-- Set handler to add page_y param on some a href links -->'."\n";
     	print 'jQuery(".reposition").click(function() {
     	           var page_y = $(document).scrollTop();
@@ -5485,16 +5485,16 @@ function printCommonFooter($zone='private')
     	           this.href=this.href+\'&page_y=\'+page_y;
     	           });'."\n";
     	print '});'."\n";
-    	
+
     	print '<!-- Set handler to switch left menu page -->'."\n";
     	print 'jQuery(".menuhider").click(function() {';
     	print "  $('.side-nav').toggle();";
     	if ($conf->theme == 'md') print "  $('.login_block').toggle();";
     	print '});'."\n";
-    	
+
     	print '</script>'."\n";
 	}
-	
+
 	// Google Analytics (need Google module)
 	if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AN_ID))
 	{
@@ -5707,15 +5707,15 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
 	            	$tmpcrit=trim($tmpcrit);
 	            	$tmpcrit2=$tmpcrit;
 	            	$tmpbefore='%'; $tmpafter='%';
-	            	if (preg_match('/^[\^\$]/', $tmpcrit)) 
-	            	{ 
+	            	if (preg_match('/^[\^\$]/', $tmpcrit))
+	            	{
 	            	    $tmpbefore='';
-	            	    $tmpcrit2 = preg_replace('/^[\^\$]/', '', $tmpcrit2); 
+	            	    $tmpcrit2 = preg_replace('/^[\^\$]/', '', $tmpcrit2);
 	            	}
-					if (preg_match('/[\^\$]$/', $tmpcrit)) 
-	            	{ 
+					if (preg_match('/[\^\$]$/', $tmpcrit))
+	            	{
 	            	    $tmpafter='';
-	            	    $tmpcrit2 = preg_replace('/[\^\$]$/', '', $tmpcrit2); 
+	            	    $tmpcrit2 = preg_replace('/[\^\$]$/', '', $tmpcrit2);
 	            	}
 	            	$newres .= $tmpbefore;
 	            	$newres .= $db->escape($tmpcrit2);
@@ -5780,7 +5780,7 @@ function getImageFileNameForSize($file, $extName, $extImgTarget='')
 function getAdvancedPreviewUrl($modulepart, $relativepath)
 {
     global $conf;
-    
+
     if (empty($conf->use_javascript_ajax)) return '';
 
     $mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css');

From 44aa6018481953e9b7b146d0efbb08108f634e4c Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Wed, 16 Nov 2016 11:11:50 +0100
Subject: [PATCH 0015/1163] again revert to fk_project instead of fk_projet

---
 htdocs/install/mysql/migration/4.0.0-5.0.0.sql |  2 +-
 htdocs/install/mysql/tables/llx_loan.sql       |  7 ++++---
 htdocs/loan/card.php                           | 10 +++++-----
 htdocs/loan/class/loan.class.php               | 14 +++++++-------
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index 5f5581a6d48..42f7e8fd76c 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -223,4 +223,4 @@ ALTER TABLE llx_links ADD UNIQUE INDEX uk_links (objectid,label);
 
 ALTER TABLE llx_c_actioncomm MODIFY COLUMN type varchar(50) DEFAULT 'system' NOT NULL;
 
-ALTER TABLE llx_loan ADD COLUMN fk_projet integer DEFAULT NULL;
+ALTER TABLE llx_loan ADD COLUMN fk_project integer DEFAULT NULL;
diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql
index c6d8147fe47..0fe0c677ecb 100644
--- a/htdocs/install/mysql/tables/llx_loan.sql
+++ b/htdocs/install/mysql/tables/llx_loan.sql
@@ -45,8 +45,9 @@ create table llx_loan
   accountancy_account_insurance	varchar(32),
   accountancy_account_interest	varchar(32),
   
+  fk_projet						integer DEFAULT NULL,
+  
   fk_user_author				integer DEFAULT NULL,
-  fk_user_modif					integer DEFAULT NULL,
-  active						tinyint DEFAULT 1  NOT NULL,
-  fk_projet					integer DEFAULT NULL
+  fk_user_modif					integer DEFAULT NULL
+  active						tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 8d8c938f641..b24f9c75253 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -127,7 +127,7 @@ if (empty($reshook))
 				$object->rate					= $_POST["rate"];
 				$object->note_private 			= GETPOST('note_private');
 				$object->note_public 			= GETPOST('note_public');
-					$object->fk_projet 			= GETPOST('fk_projet');
+					$object->fk_project 			= GETPOST('fk_project');
 
 				$accountancy_account_capital	= GETPOST('accountancy_account_capital');
 				$accountancy_account_insurance	= GETPOST('accountancy_account_insurance');
@@ -165,7 +165,7 @@ if (empty($reshook))
 				$object->dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int'));
 				$object->nbterm		= GETPOST("nbterm");
 				$object->rate		= GETPOST("rate");
-					$object->fk_projet		= GETPOST("fk_projet");
+					$object->fk_project		= GETPOST("fk_project");
 			}
 
 	        $result = $object->update($user);
@@ -264,7 +264,7 @@ if ($action == 'create')
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
 
-		$numproject=$formproject->select_projects(-1,GETPOST("fk_projet"),'fk_projet',16,0,1,1);
+		$numproject=$formproject->select_projects(-1,GETPOST("fk_project"),'fk_project',16,0,1,1);
 
 		print '</td></tr>';
 	}
@@ -473,11 +473,11 @@ if ($id > 0)
 			print '</td><td>';
 			if ($action == 'edit') {
 				$formproject=new FormProjets($db);
-				$numproject=$formproject->select_projects(-1,$object->fk_projet,'fk_projet',16,0,1,1);
+				$numproject=$formproject->select_projects(-1,$object->fk_project,'fk_project',16,0,1,1);
 
 			} else {
 				$project=new Project($db);
-				$project->fetch($object->fk_projet);
+				$project->fetch($object->fk_project);
 				print $project->getNomUrl(1,'',1);;
 			}
 			print '</td></tr>';
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index ac0062d3ed9..bf6d67930ae 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -50,7 +50,7 @@ class Loan extends CommonObject
 	var $fk_bank;
 	var $fk_user_creat;
 	var $fk_user_modif;
-	var $fk_projet;
+	var $fk_project;
 
 
     /**
@@ -73,7 +73,7 @@ class Loan extends CommonObject
     function fetch($id)
     {
         $sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.nbterm, l.rate, l.note_private, l.note_public,";
-		$sql.= " l.paid, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest,l.fk_projet";
+		$sql.= " l.paid, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest,l.fk_project";
         $sql.= " FROM ".MAIN_DB_PREFIX."loan as l";
         $sql.= " WHERE l.rowid = ".$id;
 
@@ -100,7 +100,7 @@ class Loan extends CommonObject
 				$this->account_capital		= $obj->accountancy_account_capital;
 				$this->account_insurance	= $obj->accountancy_account_insurance;
 				$this->account_interest		= $obj->accountancy_account_interest;
-				$this->fk_projet			= $obj->fk_projet;
+				$this->fk_project			= $obj->fk_project;
 
                 $this->db->free($resql);
 				return 1;
@@ -143,7 +143,7 @@ class Loan extends CommonObject
 		if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
 		if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat);
 		if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif);
-		if (isset($this->fk_projet)) $this->fk_projet=trim($this->fk_projet);
+		if (isset($this->fk_project)) $this->fk_project=trim($this->fk_project);
 
         // Check parameters
         if (! $newcapital > 0 || empty($this->datestart) || empty($this->dateend))
@@ -161,7 +161,7 @@ class Loan extends CommonObject
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."loan (label, fk_bank, capital, datestart, dateend, nbterm, rate, note_private, note_public";
 		$sql.= " ,accountancy_account_capital, accountancy_account_insurance, accountancy_account_interest, entity";
-		$sql.= " ,datec,fk_projet,fk_user_author)";
+		$sql.= " ,datec,fk_project,fk_user_author)";
 		$sql.= " VALUES ('".$this->db->escape($this->label)."',";
 		$sql.= " '".$this->db->escape($this->fk_bank)."',";
         $sql.= " '".price2num($newcapital)."',";
@@ -176,7 +176,7 @@ class Loan extends CommonObject
 		$sql.= " '".$this->db->escape($this->account_interest)."',";
         $sql.= " ".$conf->entity.",";
 		$sql.= " '".$this->db->idate($now)."',";
-		$sql.= " ".(empty($this->fk_projet)?'NULL':$this->fk_projet).",";
+		$sql.= " ".(empty($this->fk_project)?'NULL':$this->fk_project).",";
 		$sql.= " ".$user->id;
         $sql.= ")";
 
@@ -284,7 +284,7 @@ class Loan extends CommonObject
         $sql.= " SET label='".$this->db->escape($this->label)."',";
         $sql.= " datestart='".$this->db->idate($this->datestart)."',";
         $sql.= " dateend='".$this->db->idate($this->dateend)."',";
-        $sql.= " fk_projet=".(empty($this->fk_projet)?'NULL':$this->fk_projet).",";
+        $sql.= " fk_project=".(empty($this->fk_project)?'NULL':$this->fk_project).",";
 		$sql.= " fk_user_modif = ".$user->id;
         $sql.= " WHERE rowid=".$this->id;
 

From 71cff4032ccf99092b78b72ec599e43a96a3c3db Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 18 Nov 2016 16:26:12 +0100
Subject: [PATCH 0016/1163] NEW : option to copy into attachement files of
 events, files send by mail (with auto event creation)

---
 htdocs/core/actions_sendmails.inc.php             |  1 +
 .../interface_50_modAgenda_ActionsAuto.class.php  | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 9ec3bfcb3b7..e9d65222d28 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -345,6 +345,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					$object->trackid        = $trackid;
 					$object->fk_element		= $object->id;
 					$object->elementtype	= $object->element;
+					$object->attachedfiles	= $attachedfiles;
 
 					// Call of triggers
 					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index bce6cd02eee..437dcea9e1c 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -856,6 +856,21 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 		$ret=$actioncomm->create($user);       // User creating action
 		
+		if ($ret > 0 && $conf->global->MAIN_COPY_FILE_IN_EVENT_AUTO)
+		{
+			if (is_array($object->attachedfiles) && array_key_exists('paths',$object->attachedfiles) && count($object->attachedfiles['paths'])>0) {
+				foreach($object->attachedfiles['paths'] as $key=>$filespath) {
+					$srcfile = $filespath;
+					$destdir = $conf->agenda->dir_output . '/' . $ret;
+					$destfile = $destdir . '/' . $object->attachedfiles['names'][$key];
+					if (dol_mkdir($destdir) >= 0) {
+						require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+						dol_copy($srcfile, $destfile);
+					}
+				}
+			}
+		}
+		
 		unset($object->actionmsg); unset($object->actionmsg2); unset($object->actiontypecode);	// When several action are called on same object, we must be sure to not reuse value of first action.
 		
 		if ($ret > 0)

From 056b76a831930b5a1931f993879adbbdd96acf92 Mon Sep 17 00:00:00 2001
From: IJ <jawaid_imran@hotmail.com>
Date: Sat, 19 Nov 2016 10:34:22 +0000
Subject: [PATCH 0017/1163] Better Separator for Products/Services in Top Menu

Easier to read when both modules are enabled
---
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 7b5e5d98d9d..67bc5674443 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -112,7 +112,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 			$chaine.=$langs->trans("Products");
 		}
 		if (! empty($conf->product->enabled) && ! empty($conf->service->enabled)) {
-			$chaine.="/";
+			$chaine.=" | ";
 		}
 		if (! empty($conf->service->enabled)) {
 			$chaine.=$langs->trans("Services");

From 86d195fa811daeb2c8082689598ed91e2e27dcaf Mon Sep 17 00:00:00 2001
From: IJ <jawaid_imran@hotmail.com>
Date: Sat, 19 Nov 2016 10:37:15 +0000
Subject: [PATCH 0018/1163] Add Unique Top Menu Translation

Add unique top menu translation for products/services so it can be better translated separately from other words/links using the same text.
---
 htdocs/core/menus/standard/eldy.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 67bc5674443..441bbd2da31 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -109,13 +109,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 
 		$chaine="";
 		if (! empty($conf->product->enabled)) {
-			$chaine.=$langs->trans("Products");
+			$chaine.=$langs->trans("TMenuProducts");
 		}
 		if (! empty($conf->product->enabled) && ! empty($conf->service->enabled)) {
 			$chaine.=" | ";
 		}
 		if (! empty($conf->service->enabled)) {
-			$chaine.=$langs->trans("Services");
+			$chaine.=$langs->trans("TMenuServices");
 		}
 
 		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);

From f96fd895e3c8bb1a4f8b768f871ee46c6fcebecd Mon Sep 17 00:00:00 2001
From: IJ <jawaid_imran@hotmail.com>
Date: Sat, 19 Nov 2016 10:40:45 +0000
Subject: [PATCH 0019/1163] Add Products/Services Menu Translation String

Add the translation string into language file
---
 htdocs/langs/en_US/products.lang | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 27b64a4399d..7ce98277a73 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
+TMenuProducts=PRODUCTS
+TMenuServices=SERVICES
 Products=Products
 Services=Services
 Product=Product

From 636fbb476c4eee92424bb3f9e55057bef30b13a0 Mon Sep 17 00:00:00 2001
From: IJ <jawaid_imran@hotmail.com>
Date: Sat, 19 Nov 2016 10:49:12 +0000
Subject: [PATCH 0020/1163] Add Unique Top Menu Translation

Add unique top menu translation for Tools so it can be better translated separately from other words/links using the same text.
---
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 441bbd2da31..fe3b36860a9 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -259,7 +259,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 		$idsel='tools';
 
 		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-		if (empty($noout)) print_text_menu_entry($langs->trans("Tools"), $showmode, DOL_URL_ROOT.'/core/tools.php?mainmenu=tools&amp;leftmenu=', $id, $idsel, $classname, $atarget);
+		if (empty($noout)) print_text_menu_entry($langs->trans("TMenuTools"), $showmode, DOL_URL_ROOT.'/core/tools.php?mainmenu=tools&amp;leftmenu=', $id, $idsel, $classname, $atarget);
 		if (empty($noout)) print_end_menu_entry($showmode);
 		$menu->add('/core/tools.php?mainmenu=tools&amp;leftmenu=', $langs->trans("Tools"), 0, $showmode, $atarget, "tools", '');
 	}

From 5c46095fa37b6ee559ebc6123f2e83449273a62f Mon Sep 17 00:00:00 2001
From: IJ <jawaid_imran@hotmail.com>
Date: Sat, 19 Nov 2016 10:52:30 +0000
Subject: [PATCH 0021/1163] Add Translation String for Tools

Add translation string so it can be used independently for the top menu
---
 htdocs/langs/en_US/other.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 1ea1f9da1db..69e0a808e62 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Security code
 NumberingShort=N°
 Tools=Tools
+TMenuTools=TOOLS
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Birthday
 BirthdayDate=Birthday date

From 9f2879515947574e8bb33517c41711a54c5793bc Mon Sep 17 00:00:00 2001
From: IJ <jawaid_imran@hotmail.com>
Date: Sat, 19 Nov 2016 11:29:35 +0000
Subject: [PATCH 0022/1163] Add Unique Top Menu Translation

Add unique top menu translation for products/services so it can be better translated separately from other words/links using the same text.
** Requires re-enabling module
---
 htdocs/core/modules/modAgenda.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 47e6fb43d5c..80cc63ac610 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -189,7 +189,7 @@ class modAgenda extends DolibarrModules
 		// $r++;
 		$this->menu[$r]=array('fk_menu'=>0,
 													'type'=>'top',
-													'titre'=>'Agenda',
+													'titre'=>'TMenuAgenda',
 													'mainmenu'=>'agenda',
 													'url'=>'/comm/action/index.php',
 													'langs'=>'agenda',

From 6ebafe1a871405420882a8459b705d9cc41c25a7 Mon Sep 17 00:00:00 2001
From: IJ <jawaid_imran@hotmail.com>
Date: Sat, 19 Nov 2016 11:32:28 +0000
Subject: [PATCH 0023/1163] Add Translation String for Agenda

Add translation string so it can be used independently for the top menu
---
 htdocs/langs/en_US/agenda.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index b626d991615..48b1862d706 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -2,6 +2,7 @@
 IdAgenda=ID event
 Actions=Events
 Agenda=Agenda
+TMenuAgenda=AGENDA
 Agendas=Agendas
 LocalAgenda=Internal calendar
 ActionsOwnedBy=Event owned by 

From d5fe7b8b9c3d25ffab2c2815d17f4cb6df78fa16 Mon Sep 17 00:00:00 2001
From: IJ <jawaid_imran@hotmail.com>
Date: Sat, 19 Nov 2016 12:21:47 +0000
Subject: [PATCH 0024/1163] Add Search Tip for User

Add a simple tip on the search strings which could be used by the end user when they are searching from the main search box.
Tested strings are '*' and *|*
This would be very useful to the end user and new users
---
 htdocs/langs/en_US/main.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index a3851b89339..4da744b2a75 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -775,7 +775,7 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
+Select2MoreCharacter=or more characters<br /><br /><strong>SEARCH PARAMETERS:</strong><br /><i>[without spaces]</i><br /><br /><kbd><strong> |</strong></kbd>      <kbd> OR</kbd><br /><kbd><strong>*</strong></kbd>   <kbd>SEARCH ALL</kbd><br />
 Select2MoreCharacters=or more characters
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...

From 5a8b844c49468c7cb2ece00ac0fcc654e6992c4a Mon Sep 17 00:00:00 2001
From: IJ <jawaid_imran@hotmail.com>
Date: Sat, 19 Nov 2016 22:41:08 +0000
Subject: [PATCH 0025/1163] Update other.lang

---
 htdocs/langs/en_US/other.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 69e0a808e62..253560454ec 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -2,7 +2,7 @@
 SecurityCode=Security code
 NumberingShort=N°
 Tools=Tools
-TMenuTools=TOOLS
+TMenuTools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Birthday
 BirthdayDate=Birthday date

From 9bb60e8d2c2cb3c31356138973fa6a3ebf8afdee Mon Sep 17 00:00:00 2001
From: IJ <jawaid_imran@hotmail.com>
Date: Sat, 19 Nov 2016 22:41:35 +0000
Subject: [PATCH 0026/1163] Update agenda.lang

---
 htdocs/langs/en_US/agenda.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 48b1862d706..f378ec7afbc 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -2,7 +2,7 @@
 IdAgenda=ID event
 Actions=Events
 Agenda=Agenda
-TMenuAgenda=AGENDA
+TMenuAgenda=Agenda
 Agendas=Agendas
 LocalAgenda=Internal calendar
 ActionsOwnedBy=Event owned by 

From 66693c52682e7ec8e93deaa48a0a7b17fca4c334 Mon Sep 17 00:00:00 2001
From: IJ <jawaid_imran@hotmail.com>
Date: Sat, 19 Nov 2016 22:42:03 +0000
Subject: [PATCH 0027/1163] Update products.lang

---
 htdocs/langs/en_US/products.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 7ce98277a73..a228a9ef4df 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -5,8 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
-TMenuProducts=PRODUCTS
-TMenuServices=SERVICES
+TMenuProducts=Products
+TMenuServices=Services
 Products=Products
 Services=Services
 Product=Product

From b631db1d6062032470403447daed0afb65d301f0 Mon Sep 17 00:00:00 2001
From: IJ <jawaid_imran@hotmail.com>
Date: Tue, 22 Nov 2016 02:29:25 +0000
Subject: [PATCH 0028/1163] New: Add Hidden Options Quick Reference Link

Add the dolibarr wiki link for quick reference from the page Setup>Other Setup
---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index ca53bc971a9..c4dee6a5da1 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -982,7 +982,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here

From 480b08bd0bd46519d4ca2cfaaf8cf0df4580d252 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Thu, 24 Nov 2016 15:48:04 +0100
Subject: [PATCH 0029/1163] NEW : convert exceiss received to reduc

---
 htdocs/comm/remx.php          |  9 +++++
 htdocs/compta/facture.php     | 66 ++++++++++++++++++++++++++++-------
 htdocs/langs/en_US/bills.lang |  4 +--
 3 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index e358b842d2d..372ee529b8b 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -369,6 +369,15 @@ if ($socid > 0)
 				print preg_replace('/\(DEPOSIT\)/',$langs->trans("InvoiceDeposit"),$obj->description).' '.$facturestatic->getNomURl(1);
 				print '</td>';
 			}
+			elseif (preg_match('/\(EXCESS RECEIVED\)/',$obj->description))
+			{
+				print '<td class="nowrap">';
+				$facturestatic->id=$obj->fk_facture_source;
+				$facturestatic->ref=$obj->ref;
+				$facturestatic->type=$obj->type;
+				print preg_replace('/\(EXCESS RECEIVED\)/',$langs->trans("Invoice"),$obj->description).' '.$facturestatic->getNomURl(1);
+				print '</td>';
+			}
 			else
 			{
 				print '<td>';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 34ed1383e14..8cafa015d92 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -579,7 +579,7 @@ if (empty($reshook))
 
 		$canconvert=0;
 		if ($object->type == Facture::TYPE_DEPOSIT && $object->paye == 1 && empty($discountcheck->id)) $canconvert=1;	// we can convert deposit into discount if deposit is payed completely and not already converted (see real condition into condition used to show button converttoreduc)
-		if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->paye == 0 && empty($discountcheck->id)) $canconvert=1;	// we can convert credit note into discount if credit note is not payed back and not already converted and amount of payment is 0 (see real condition into condition used to show button converttoreduc)
+		if (($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_STANDARD) && $object->paye == 0 && empty($discountcheck->id)) $canconvert=1;	// we can convert credit note into discount if credit note is not payed back and not already converted and amount of payment is 0 (see real condition into condition used to show button converttoreduc)
 		if ($canconvert)
 		{
 			$db->begin();
@@ -596,13 +596,15 @@ if (empty($reshook))
 					$i ++;
 				}
 			}
-
+//var_dump($amount_ht, $amount_tva, $amount_ttc);exit;
 			// Insert one discount by VAT rate category
 			$discount = new DiscountAbsolute($db);
 			if ($object->type == Facture::TYPE_CREDIT_NOTE)
 				$discount->description = '(CREDIT_NOTE)';
 			elseif ($object->type == Facture::TYPE_DEPOSIT)
 				$discount->description = '(DEPOSIT)';
+			elseif ($object->type == Facture::TYPE_STANDARD)
+				$discount->description = '(EXCESS RECEIVED)';
 			else {
 				setEventMessages($langs->trans('CantConvertToReducAnInvoiceOfThisType'), null, 'errors');
 			}
@@ -611,13 +613,22 @@ if (empty($reshook))
 			$discount->fk_facture_source = $object->id;
 
 			$error = 0;
-
-			foreach ($amount_ht as $tva_tx => $xxx)
-			{
-				$discount->amount_ht = abs($amount_ht[$tva_tx]);
-				$discount->amount_tva = abs($amount_tva[$tva_tx]);
-				$discount->amount_ttc = abs($amount_ttc[$tva_tx]);
-				$discount->tva_tx = abs($tva_tx);
+			
+			if ($object->type == Facture::TYPE_STANDARD) {
+				
+				// If we're on a standard invoice, we have to get excess received to create it in TTC wuthout VAT
+				
+				$sql = 'SELECT SUM(pf.amount) as total_paiements
+						FROM llx_c_paiement as c, llx_paiement_facture as pf, llx_paiement as p
+						WHERE pf.fk_facture = 10 AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid ORDER BY p.datep, p.tms';
+				
+				$resql = $db->query($sql);
+				$res = $db->fetch_object($resql);
+				$total_paiements = $res->total_paiements;
+				
+				$discount->amount_ht = $discount->amount_ttc = $total_paiements - $object->total_ttc;
+				$discount->amount_tva = 0;
+				$discount->tva_tx = 0;
 
 				$result = $discount->create($user);
 				if ($result < 0)
@@ -625,8 +636,25 @@ if (empty($reshook))
 					$error++;
 					break;
 				}
+				
+			} else {
+			
+				foreach ($amount_ht as $tva_tx => $xxx)
+				{
+					$discount->amount_ht = abs($amount_ht[$tva_tx]);
+					$discount->amount_tva = abs($amount_tva[$tva_tx]);
+					$discount->amount_ttc = abs($amount_ttc[$tva_tx]);
+					$discount->tva_tx = abs($tva_tx);
+	
+					$result = $discount->create($user);
+					if ($result < 0)
+					{
+						$error++;
+						break;
+					}
+				}
+			
 			}
-
 			if (empty($error))
 			{
 				// Classe facture
@@ -2587,7 +2615,10 @@ else if ($id > 0 || ! empty($ref))
 
 	// Confirmation de la conversion de l'avoir en reduc
 	if ($action == 'converttoreduc') {
-		$text = $langs->trans('ConfirmConvertToReduc');
+		if($object->type == 0) $type_fac = 'ExcessReceived';
+		elseif($object->type == 2) $type_fac = 'CreditNote';
+		elseif($object->type == 3) $type_fac = 'Deposit';
+		$text = $langs->trans('ConfirmConvertToReduc', strtolower($langs->transnoentities($type_fac)));
 		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $langs->trans('ConvertToReduc'), $text, 'confirm_converttoreduc', '', "yes", 2);
 	}
 
@@ -2829,7 +2860,10 @@ else if ($id > 0 || ! empty($ref))
 	$discount = new DiscountAbsolute($db);
 	$result = $discount->fetch(0, $object->id);
 	if ($result > 0) {
-		$morehtmlref = ' (' . $langs->trans("CreditNoteConvertedIntoDiscount", $discount->getNomUrl(1, 'discount')) . ')';
+		if($object->type == 0) $type_fac = 'ExcessReceived';
+		elseif($object->type == 2) $type_fac = 'CreditNote';
+		elseif($object->type == 3) $type_fac = 'Deposit';
+		$morehtmlref = ' (' . $langs->trans("CreditNoteConvertedIntoDiscount", strtolower($langs->transnoentities($type_fac)), $discount->getNomUrl(1, 'discount')) . ')';
 	}
 	if ($result < 0) {
 		dol_print_error('', $discount->error);
@@ -3205,6 +3239,7 @@ else if ($id > 0 || ! empty($ref))
 			print $langs->trans('RemainderToPay');
 		else
 			print $langs->trans('ExcessReceived');
+		
 		print ' :</td>';
 		print '<td align="right" style="border: 1px solid;" bgcolor="#f0f0f0"><b>' . price($resteapayeraffiche) . '</b></td>';
 		print '<td class="nowrap">&nbsp;</td></tr>';
@@ -3688,7 +3723,7 @@ else if ($id > 0 || ! empty($ref))
 			}
 
 			// Reverse back money or convert to reduction
-			if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
+			if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_STANDARD) {
 				// For credit note only
 				if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $user->rights->facture->paiement)
 				{
@@ -3702,6 +3737,11 @@ else if ($id > 0 || ! empty($ref))
 					}
 				}
 
+				// For standard invoice with excess received
+				if ($object->type == Facture::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) < 0 && $user->rights->facture->creer && empty($discount->id))
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertToReduc').'</a></div>';
+				}
 				// For credit note
 				if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $user->rights->facture->creer && $object->getSommePaiement() == 0) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '&amp;action=converttoreduc">' . $langs->trans('ConvertToReduc') . '</a></div>';
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index bfbe32b803e..fb27b364dcf 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -61,7 +61,7 @@ PaymentsBack=Payments back
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -386,7 +386,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only

From c433829d27420b7a51733c50109de522c29b6704 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Fri, 25 Nov 2016 11:04:42 +0100
Subject: [PATCH 0030/1163] NEW : interface

---
 htdocs/compta/facture.php                | 6 +++---
 htdocs/core/class/commonobject.class.php | 6 ++++++
 htdocs/core/class/html.form.class.php    | 3 ++-
 htdocs/core/lib/doc.lib.php              | 6 ++++++
 htdocs/core/lib/pdf.lib.php              | 6 ++++++
 htdocs/core/tpl/objectline_view.tpl.php  | 7 +++++++
 htdocs/langs/en_US/bills.lang            | 2 ++
 htdocs/societe/consumption.php           | 7 +++++++
 8 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 8cafa015d92..8ef7f39e0b8 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2591,8 +2591,8 @@ else if ($id > 0 || ! empty($ref))
 		$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 	} else {
-		$filterabsolutediscount = "fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND description LIKE '(DEPOSIT)%')";
-		$filtercreditnote = "fk_facture_source IS NOT NULL AND description NOT LIKE '(DEPOSIT)%'";
+		$filterabsolutediscount = "fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND (description LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%'))";
+		$filtercreditnote = "fk_facture_source IS NOT NULL AND description NOT LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%'";
 	}
 
 	$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount);
@@ -3740,7 +3740,7 @@ else if ($id > 0 || ! empty($ref))
 				// For standard invoice with excess received
 				if ($object->type == Facture::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) < 0 && $user->rights->facture->creer && empty($discount->id))
 				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertToReduc').'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertExcessReceivedToReduc').'</a></div>';
 				}
 				// For credit note
 				if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $user->rights->facture->creer && $object->getSommePaiement() == 0) {
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3279d372a0e..eaf8166e141 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3411,6 +3411,12 @@ abstract class CommonObject
                 $discount->fetch($line->fk_remise_except);
                 $this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
             }
+            elseif ($line->desc == '(EXCESS RECEIVED)')
+            {
+                $discount=new DiscountAbsolute($this->db);
+                $discount->fetch($line->fk_remise_except);
+                $this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
+            }
             else
             {
                 $this->tpl['description'] = dol_trunc($line->desc,60);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c4273a779a9..fcd60169470 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1130,6 +1130,7 @@ class Form
                     $desc=dol_trunc($obj->description,40);
                     if (preg_match('/\(CREDIT_NOTE\)/', $desc)) $desc=preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);
                     if (preg_match('/\(DEPOSIT\)/', $desc)) $desc=preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);
+                    if (preg_match('/\(EXCESS RECEIVED\)/', $desc)) $desc=preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);
 
                     $selectstring='';
                     if ($selected > 0 && $selected == $obj->rowid) $selectstring=' selected';
@@ -3762,7 +3763,7 @@ class Form
             }
             else
             {
-                if (! $filter || $filter=="fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND description LIKE '(DEPOSIT)%')") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency)).': ';
+                if (! $filter || $filter=="fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND (description LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%'))") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency)).': ';
                 else print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency)).': ';
             }
             $newfilter='fk_facture IS NULL AND fk_facture_line IS NULL';	// Remises disponibles
diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index 76337ec2763..99e576ad057 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -83,6 +83,12 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli
 		    // Add date of deposit
 		    if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice.=' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
 		}
+		elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
+		{
+			$discount=new DiscountAbsolute($db);
+			$discount->fetch($line->fk_remise_except);
+			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
+		}
 		else
 		{
 			if ($idprod)
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 8b21fcdefe9..80f0727bdf4 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1149,6 +1149,12 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
 			// Add date of deposit
 			if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
 		}
+		if ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
+		{
+			$discount=new DiscountAbsolute($db);
+			$discount->fetch($object->lines[$i]->fk_remise_except);
+			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
+		}
 		else
 		{
 			if ($idprod)
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 7162ac66cb9..30bf2eeb05c 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -61,6 +61,7 @@ if (empty($usemargins)) $usemargins=0;
 		$txt='';
 		print img_object($langs->trans("ShowReduc"),'reduc').' ';
 		if ($line->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
+		elseif ($line->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
 		//else $txt=$langs->trans("Discount");
 		print $txt;
 		?>
@@ -82,6 +83,12 @@ if (empty($usemargins)) $usemargins=0;
 				// Add date of deposit
 				if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
 			}
+			elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
+			{
+				$discount=new DiscountAbsolute($this->db);
+				$discount->fetch($line->fk_remise_except);
+				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
+			}
 			else
 			{
 				echo ($txt?' - ':'').dol_htmlentitiesbr($line->description);
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index fb27b364dcf..5a3ab004308 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -99,6 +99,7 @@ SendRemindByMail=Send reminder by EMail
 DoPayment=Do payment
 DoPaymentBack=Do payment back
 ConvertToReduc=Convert into future discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -255,6 +256,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this king of credits
 NewGlobalDiscount=New absolute discount
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index ea2cb899893..4bfbe99528a 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -461,6 +461,7 @@ if ($sql_select)
 			$txt='';
 			print img_object($langs->trans("ShowReduc"),'reduc').' ';
 			if ($objp->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
+			elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
 			//else $txt=$langs->trans("Discount");
 			print $txt;
 			?>
@@ -474,6 +475,12 @@ if ($sql_select)
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
 				}
+				if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
+				{
+					$discount=new DiscountAbsolute($db);
+					$discount->fetch($objp->fk_remise_except);
+					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
+				}
 				elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
 				{
 					$discount=new DiscountAbsolute($db);

From 792e12e6c50ae08db3421bce440ac94ac7146704 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Fri, 25 Nov 2016 11:09:15 +0100
Subject: [PATCH 0031/1163] FIX : interface

---
 htdocs/comm/remx.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 372ee529b8b..716018dbcca 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -537,6 +537,15 @@ if ($socid > 0)
 				print preg_replace('/\(DEPOSIT\)/',$langs->trans("InvoiceDeposit"),$obj->description).' '.$facturestatic->getNomURl(1);
 				print '</td>';
 			}
+			elseif (preg_match('/\(EXCESS RECEIVED\)/',$obj->description))
+			{
+				print '<td class="nowrap">';
+				$facturestatic->id=$obj->fk_facture_source;
+				$facturestatic->ref=$obj->ref;
+				$facturestatic->type=$obj->type;
+				print preg_replace('/\(EXCESS RECEIVED\)/',$langs->trans("Invoice"),$obj->description).' '.$facturestatic->getNomURl(1);
+				print '</td>';
+			}
 			else
 			{
 				print '<td>';

From 91be05932e4ef150e2d525c598fb503698c019fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 27 Nov 2016 21:50:27 +0100
Subject: [PATCH 0032/1163] Added missing modAttributes file

---
 htdocs/core/modules/modAttributes.class.php | 137 ++++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 htdocs/core/modules/modAttributes.class.php

diff --git a/htdocs/core/modules/modAttributes.class.php b/htdocs/core/modules/modAttributes.class.php
new file mode 100644
index 00000000000..a21ae756bf2
--- /dev/null
+++ b/htdocs/core/modules/modAttributes.class.php
@@ -0,0 +1,137 @@
+<?php
+
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	\defgroup   produit     Module product attributes
+ *  \brief      Module to manage product combinations based on product attributes
+ *  \file       htdocs/core/modules/modAttributes.class.php
+ *  \ingroup    produit
+ *  \brief      File to describe module to manage catalog of predefined products
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ *  Description and activation class for module Product attributes
+ */
+class modAttributes extends DolibarrModules
+{
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs,$conf;
+
+		$this->db = $db;
+
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 610;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'attributes';
+
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "products";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i','',get_class($this));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = 'Allows creating product combinations based on product attributes';
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
+		$this->special = 0;
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto='product';
+
+		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+		$this->module_parts = array();
+
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/mymodule/temp");
+		$this->dirs = array();
+
+		// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
+		$this->config_page_url = array(
+			'admin.php@attributes'
+		);
+
+		// Dependencies
+		$this->hidden = false;			// A condition to hide module
+		$this->depends = array(
+			'modProduct'
+		);		// List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array();	// List of modules id to disable if this one is disabled
+		$this->conflictwith = array();	// List of modules id this module is in conflict with
+		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+		$this->langfiles = array("products");
+
+		// Constants
+		$this->const = array();
+
+		// Array to add new pages in new tabs
+		$this->tabs = array(
+//			'product:+combinations:Combinaciones:products:1:/attributes/combinations.php?id=__ID__'
+		);
+
+		// Dictionaries
+		if (! isset($conf->mymodule->enabled))
+		{
+			$conf->mymodule=new stdClass();
+			$conf->mymodule->enabled=0;
+		}
+		$this->dictionaries=array();
+
+		// Boxes
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+		$this->boxes = array();			// List of boxes
+
+		// Permissions
+		$this->rights = array();		// Permission array used by this module
+
+		// Main menu entries
+		$this->menu = array(
+			array(
+				'fk_menu' => 'fk_mainmenu=products,fk_leftmenu=product',
+				'type' => 'left',
+				'titre' => $langs->trans('Attributes'),
+				'mainmenu' => 'products',
+				'leftmenu' => 'product',
+				'url' => '/attributes/list.php',
+				'langs' => 'products',
+				'position' => 100,
+				'enabled' => '$conf->product->enabled',
+				'perms' => 1,
+				'target' => '',
+				'user' => 0
+			)
+		);			// List of menus to add
+	}
+}
+

From 3f6f1ac86fb91b18995becbd58850c9759afac81 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Mon, 28 Nov 2016 17:12:17 +0100
Subject: [PATCH 0033/1163] fix : where fk_facture = object id

---
 htdocs/compta/facture.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 8ef7f39e0b8..bc36f16e9e4 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -620,7 +620,7 @@ if (empty($reshook))
 				
 				$sql = 'SELECT SUM(pf.amount) as total_paiements
 						FROM llx_c_paiement as c, llx_paiement_facture as pf, llx_paiement as p
-						WHERE pf.fk_facture = 10 AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid ORDER BY p.datep, p.tms';
+						WHERE pf.fk_facture = '.$object->id.' AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid ORDER BY p.datep, p.tms';
 				
 				$resql = $db->query($sql);
 				$res = $db->fetch_object($resql);

From d8aa572ad79fab306964a1a7e5e615368225cd84 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Mon, 28 Nov 2016 17:38:20 +0100
Subject: [PATCH 0034/1163] FIX : fetch discount desappeared in develop...

---
 htdocs/compta/facture.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 7e1baf5395f..a846fb15e00 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3870,7 +3870,10 @@ else if ($id > 0 || ! empty($ref))
 					}
 				}
 			}
-
+			
+			$discount = new DiscountAbsolute($db);
+			$result = $discount->fetch(0, $object->id);
+			
 			// Reopen a standard paid invoice
 			if ((($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT)
 				|| ($object->type == Facture::TYPE_CREDIT_NOTE && empty($discount->id))

From c1652169f2f0554e6d4a9234af9f15e193a357ae Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Wed, 30 Nov 2016 16:09:59 +0100
Subject: [PATCH 0035/1163] NEW : Add in export thirdparty for user limit on
 view thirpdarty to sales team also to subsidiaries

---
 htdocs/core/modules/modSociete.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 1943e3f7b20..6e55077b19d 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -281,7 +281,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as payterm ON s.cond_reglement = payterm.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as paymode ON s.mode_reglement = paymode.id';
 		$this->export_sql_end[$r] .=' WHERE s.entity IN ('.getEntity('societe', 1).')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' OR sc.fk_user IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'user where fk_user= '.$user->id.'))';
 
 		// Export list of contacts and attributes
 		$r++;
@@ -311,7 +311,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON c.fk_pays = co.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = c.rowid';
 		$this->export_sql_end[$r] .=' WHERE c.entity IN ('.getEntity("societe", 1).')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' OR sc.fk_user IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'user where fk_user= '.$user->id.'))';
 
 
 		// Imports

From 7ab7149e64910ea7644c615b2d82e3420d8b5112 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Mon, 5 Dec 2016 11:03:12 +0100
Subject: [PATCH 0036/1163] just little indenting

---
 htdocs/core/lib/pdf.lib.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 9d6201998db..23c2f5e9bf4 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1234,11 +1234,14 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
 			{
 				if ($issupplierline) 
 				{
-				    //$ref_prodserv = $prodser->ref.($ref_supplier ? ' ('.$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.')' : '');   // Show local ref and supplier ref
-				    if (! empty($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES)) $ref_prodserv =$ref_supplier;
-    			    else $ref_prodserv = $prodser->ref.($ref_supplier ? ' ('.$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.')' : '');   // Show local ref and supplier ref
+					//$ref_prodserv = $prodser->ref.($ref_supplier ? ' ('.$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.')' : '');   // Show local ref and supplier ref
+					if (! empty($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES)) 
+						$ref_prodserv =$ref_supplier;
+					else 
+						$ref_prodserv = $prodser->ref.($ref_supplier ? ' ('.$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.')' : '');   // Show local ref and supplier ref
 				}
-				else $ref_prodserv = $prodser->ref; // Show local ref only
+				else 
+					$ref_prodserv = $prodser->ref; // Show local ref only
 
 				if (! empty($libelleproduitservice)) $ref_prodserv .= " - ";
 			}

From d86503cb66ab7920ee54d732ae36e3bd970a56d5 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Mon, 5 Dec 2016 11:09:47 +0100
Subject: [PATCH 0037/1163] additionnal feature on supplier ref display

we have like this 3 mode of display supplier ref
---
 htdocs/core/lib/pdf.lib.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 23c2f5e9bf4..ac08f4c25a4 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1234,11 +1234,12 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
 			{
 				if ($issupplierline) 
 				{
-					//$ref_prodserv = $prodser->ref.($ref_supplier ? ' ('.$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.')' : '');   // Show local ref and supplier ref
-					if (! empty($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES)) 
-						$ref_prodserv =$ref_supplier;
+					if ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1)
+						$ref_prodserv = $ref_supplier;
+					elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)
+						$ref_prodserv = $ref_supplier. ' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';  
 					else 
-						$ref_prodserv = $prodser->ref.($ref_supplier ? ' ('.$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.')' : '');   // Show local ref and supplier ref
+						$ref_prodserv = $prodser->ref.' ('.$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.')';
 				}
 				else 
 					$ref_prodserv = $prodser->ref; // Show local ref only

From 3396dfc7f60f31dc3660d7238638be043509354f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Dec 2016 21:58:52 +0100
Subject: [PATCH 0038/1163] NEW Index upload files into database.

---
 dev/skeletons/build_class_from_table.php      |   4 +-
 dev/skeletons/skeleton_class.class.php        |   8 +-
 htdocs/core/lib/files.lib.php                 |  55 +-
 htdocs/ecm/class/ecmdirectory.class.php       |   3 +-
 htdocs/ecm/class/ecmfiles.class.php           | 764 ++++++++++++++++++
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  29 +
 htdocs/install/mysql/tables/llx_ecm_files.sql |   3 +-
 7 files changed, 854 insertions(+), 12 deletions(-)
 create mode 100644 htdocs/ecm/class/ecmfiles.class.php
 create mode 100644 htdocs/install/mysql/migration/5.0.0-6.0.0.sql

diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php
index 62ad1188759..d9e30b23501 100755
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -303,7 +303,7 @@ foreach($property as $key => $prop)
 			$varprop.="\$this->db->escape(\$this->".$prop['field'].")";
 			$varprop.=".\"'\")";
 		}
-		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_author')
+		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_m' ||  $prop['field']=='fk_user_author')
 		{
 			$varprop.="'.\$user->id";
 		}
@@ -367,7 +367,7 @@ foreach($property as $key => $prop)
 			$varprop.=')."\'" : \'null\')';
 		}
 		
-		elseif ($prop['field']=='fk_user_mod') {
+		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_m') {
 			$varprop.="'.\$user->id";
 		}
 		else
diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php
index 4f725fa2dbe..1c9b8cb52bf 100644
--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -188,11 +188,13 @@ class Skeleton_Class extends CommonObject
 			
 			// Retrieve all extrafields for invoice
 			// fetch optionals attributes and labels
+			/*
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields=new ExtraFields($this->db);
 			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
 			$this->fetch_optionals($this->id,$extralabels);
-
+            */
+			
 			// $this->fetch_lines();
 			
 			$this->db->free($resql);
@@ -254,7 +256,7 @@ class Skeleton_Class extends CommonObject
 		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
 		}
 
-		$this->lines = array();
+		//$this->lines = array();
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -267,7 +269,7 @@ class Skeleton_Class extends CommonObject
 				$line->prop1 = $obj->field1;
 				$line->prop2 = $obj->field2;
 
-				$this->lines[$line->id] = $line;
+				//$this->lines[$line->id] = $line;
 				//...
 			}
 			$this->db->free($resql);
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index f67f1a0daf4..68e3866f92e 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -743,7 +743,30 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 				{
 					if ($nophperrors) $ok=@unlink($filename);
 					else $ok=unlink($filename);
-					if ($ok) dol_syslog("Removed file ".$filename, LOG_DEBUG);
+					if ($ok) 
+					{
+					    dol_syslog("Removed file ".$filename, LOG_DEBUG);
+					    
+	                    // Delete entry into ecm database
+    				    $rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
+    				    if (! preg_match('/\/temp\//', $rel_filetodelete))     // If not a tmp file
+    				    {
+    				        $rel_filetodelete = preg_replace('/^\//', '', $rel_filetodelete);
+    				        
+    				        dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
+        				    include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+        				    $ecmfile=new EcmFiles($db);
+        				    $result = $ecmfile->fetch(0, '', $rel_filetodelete);
+        				    if ($result >= 0)
+        				    {
+        				        $result = $ecmfile->delete($user);
+        				    }
+        				    if ($result < 0)
+        				    {
+        				        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+        				    }
+    				    }
+					}
 					else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 					// TODO Failure to remove can be because file was already removed or because of permission
 					// If error because of not exists, we must can return true but we should return false if this is a permission problem
@@ -1000,7 +1023,7 @@ function dol_init_file_process($pathtoscan='', $trackid='')
  * @param	int		$donotupdatesession		1=Do no edit _SESSION variable
  * @param	string	$varfiles				_FILES var name
  * @param	string	$savingdocmask			Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
- * @param	string	$link					Link to add
+ * @param	string	$link					Link to add (to add a link instead of a file)
  * @param   string  $trackid                Track id (used to prefix name of session vars to avoid conflict)
  * @return	void
  */
@@ -1043,7 +1066,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 				$destpath = $info['dirname'].'/'.$info['filename'].'.'.strtolower($info['extension']);
 				$info = pathinfo($destfile);
 				$destfile = $info['filename'].'.'.strtolower($info['extension']);
-				    
+
 				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destpath, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
 				if (is_numeric($resupload) && $resupload > 0)
 				{
@@ -1057,6 +1080,30 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 						$formmail->trackid = $trackid;
 						$formmail->add_attached_files($destpath, $destfile, $TFile['type'][$i]);
 					}
+					else   // Update table of files 
+					{
+					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
+					    if (! preg_match('/\/temp\//', $rel_dir))     // If not a tmp file
+					    {
+					        $rel_dir = preg_replace('/\/$/', '', $rel_dir);
+					        $rel_dir = preg_replace('/^\//', '', $rel_dir);
+    					    
+    					    include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+    					    $ecmfile=new EcmFiles($db);
+    					    $ecmfile->label = md5_file($destpath);
+    					    $ecmfile->filename = $destfile;
+    					    $ecmfile->filepath = $rel_dir;
+    					    $ecmfile->fullpath_orig = $TFile['name'][$i];
+    					    $ecmfile->gen_or_uploaded = 'uploaded';
+    					    $ecmfile->description = '';    // indexed content
+    					    $ecmfile->keyword = '';        // keyword content
+    					    $result = $ecmfile->create($user);
+                            if ($result < 0)
+                            {
+                                setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+                            }
+					    }
+					}
 					if (image_format_supported($destpath) == 1)
 					{
 						// Create thumbs
@@ -1145,7 +1192,7 @@ function dol_remove_file_process($filenb,$donotupdatesession=0,$donotdeletefile=
 	{
 		$pathtodelete=$listofpaths[$keytodelete];
 		$filetodelete=$listofnames[$keytodelete];
-		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete,1);
+		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete,1);  // The delete of ecm database is inside the function dol_delete_file
 		else $result=0;
 		if ($result >= 0)
 		{
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index c16cfe62e7c..1644b58075e 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -23,8 +23,7 @@
  */
 
 /**
- *  \class      EcmDirectory
- *  \brief      Class to manage ECM directories
+ *  Class to manage ECM directories
  */
 class EcmDirectory // extends CommonObject
 {
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
new file mode 100644
index 00000000000..0133bff2580
--- /dev/null
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -0,0 +1,764 @@
+<?php
+/* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    ecm/ecmfiles.class.php
+ * \ingroup ecm
+ * \brief   Class to manage ECM Files (Create/Read/Update/Delete)
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class to manage ECM files
+ */
+class EcmFiles //extends CommonObject
+{
+	/**
+	 * @var string Id to identify managed objects
+	 */
+	public $element = 'ecmfiles';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'ecm_files';
+
+	/**
+	 */
+	public $label;
+	public $entity;
+	public $filename;
+	public $filepath;
+	public $fullpath_orig;
+	public $description;
+	public $keywords;
+	public $cover;
+	public $position;
+	public $gen_or_uploaded;
+	public $extraparams;
+	public $date_c = '';
+	public $date_m = '';
+	public $fk_user_c;
+	public $fk_user_m;
+	public $acl;
+
+	/**
+	 */
+	
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+	    global $conf;
+	    
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+
+		// Clean parameters
+		
+		if (isset($this->label)) {
+			 $this->label = trim($this->label);
+		}
+		if (isset($this->entity)) {
+			 $this->entity = trim($this->entity);
+		}
+		if (isset($this->filename)) {
+			 $this->filename = trim($this->filename);
+		}
+		if (isset($this->filepath)) {
+			 $this->filepath = trim($this->filepath);
+		}
+		if (isset($this->fullpath_orig)) {
+			 $this->fullpath_orig = trim($this->fullpath_orig);
+		}
+		if (isset($this->description)) {
+			 $this->description = trim($this->description);
+		}
+		if (isset($this->keywords)) {
+			 $this->keywords = trim($this->keywords);
+		}
+		if (isset($this->cover)) {
+			 $this->cover = trim($this->cover);
+		}
+		if (isset($this->gen_or_uploaded)) {
+			 $this->gen_or_uploaded = trim($this->gen_or_uploaded);
+		}
+		if (isset($this->extraparams)) {
+			 $this->extraparams = trim($this->extraparams);
+		}
+		if (isset($this->fk_user_c)) {
+			 $this->fk_user_c = trim($this->fk_user_c);
+		}
+		if (isset($this->fk_user_m)) {
+			 $this->fk_user_m = trim($this->fk_user_m);
+		}
+		if (isset($this->acl)) {
+			 $this->acl = trim($this->acl);
+		}
+        if (empty($this->date_c)) $this->date_c = dol_now();
+		
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Insert request
+		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		$sql.= 'label,';
+		$sql.= 'entity,';
+		$sql.= 'filename,';
+		$sql.= 'filepath,';
+		$sql.= 'fullpath_orig,';
+		$sql.= 'description,';
+		$sql.= 'keywords,';
+		$sql.= 'cover,';
+		$sql.= 'position,';
+		$sql.= 'gen_or_uploaded,';
+		$sql.= 'extraparams,';
+		$sql.= 'date_c,';
+		$sql.= 'date_m,';
+		$sql.= 'fk_user_c,';
+		$sql.= 'fk_user_m,';
+		$sql.= 'acl';
+		$sql .= ') VALUES (';
+		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
+		$sql .= ' '.(! isset($this->entity)?$conf->entity:$this->entity).',';
+		$sql .= ' '.(! isset($this->filename)?'NULL':"'".$this->db->escape($this->filename)."'").',';
+		$sql .= ' '.(! isset($this->filepath)?'NULL':"'".$this->db->escape($this->filepath)."'").',';
+		$sql .= ' '.(! isset($this->fullpath_orig)?'NULL':"'".$this->db->escape($this->fullpath_orig)."'").',';
+		$sql .= ' '.(! isset($this->description)?'NULL':"'".$this->db->escape($this->description)."'").',';
+		$sql .= ' '.(! isset($this->keywords)?'NULL':"'".$this->db->escape($this->keywords)."'").',';
+		$sql .= ' '.(! isset($this->cover)?'NULL':"'".$this->db->escape($this->cover)."'").',';
+		$sql .= ' '.(! isset($this->position)?'0':$this->db->escape($this->position)).',';
+		$sql .= ' '.(! isset($this->gen_or_uploaded)?'NULL':"'".$this->db->escape($this->gen_or_uploaded)."'").',';
+		$sql .= ' '.(! isset($this->extraparams)?'NULL':"'".$this->db->escape($this->extraparams)."'").',';
+		$sql .= ' '."'".$this->db->idate($this->date_c)."'".',';
+		$sql .= ' '.(! isset($this->date_m) || dol_strlen($this->date_m)==0?'NULL':"'".$this->db->idate($this->date_m)."'").',';
+		$sql .= ' '.(! isset($this->fk_user_c)?$user->id:$this->fk_user_c).',';
+		$sql .= ' '.(! isset($this->fk_user_m)?'NULL':$this->fk_user_m).',';
+		$sql .= ' '.(! isset($this->acl)?'NULL':"'".$this->db->escape($this->acl)."'");
+		$sql .= ')';
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+
+			if (!$notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action to call a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) $error++;
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param  int    $id          Id object
+	 * @param  string $ref         Ref = md5 = label
+	 * @param  string $fullpath    Full path of file (relative path to document directory)
+	 * @return int                 <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null, $fullpath = '')
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		$sql .= " t.label,";
+		$sql .= " t.entity,";
+		$sql .= " t.filename,";
+		$sql .= " t.filepath,";
+		$sql .= " t.fullpath_orig,";
+		$sql .= " t.description,";
+		$sql .= " t.keywords,";
+		$sql .= " t.cover,";
+		$sql .= " t.position,";
+		$sql .= " t.gen_or_uploaded,";
+		$sql .= " t.extraparams,";
+		$sql .= " t.date_c,";
+		$sql .= " t.date_m,";
+		$sql .= " t.fk_user_c,";
+		$sql .= " t.fk_user_m,";
+		$sql .= " t.acl";
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		$sql.= ' WHERE 1 = 1';
+		if (! empty($conf->multicompany->enabled)) {
+		    $sql .= " AND entity IN (" . getEntity("ecmfiles", 1) . ")";
+		}
+		if ($fullpath) {
+			$sql .= " AND t.filepath = '" . $this->db->escape(dirname($fullpath)) . "' AND t.filename = '".$this->db->escape(basename($fullpath))."'";
+		}
+		elseif (null !== $ref) {
+			$sql .= " AND t.label = '".$this->db->escape($ref)."'";
+		} else {
+			$sql .= ' AND t.rowid = ' . $id;
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$numrows = $this->db->num_rows($resql);
+			if ($numrows) {
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				
+				$this->label = $obj->label;
+				$this->entity = $obj->entity;
+				$this->filename = $obj->filename;
+				$this->filepath = $obj->filepath;
+				$this->fullpath_orig = $obj->fullpath_orig;
+				$this->description = $obj->description;
+				$this->keywords = $obj->keywords;
+				$this->cover = $obj->cover;
+				$this->position = $obj->position;
+				$this->gen_or_uploaded = $obj->gen_or_uploaded;
+				$this->extraparams = $obj->extraparams;
+				$this->date_c = $this->db->jdate($obj->date_c);
+				$this->date_m = $this->db->jdate($obj->date_m);
+				$this->fk_user_c = $obj->fk_user_c;
+				$this->fk_user_m = $obj->fk_user_m;
+				$this->acl = $obj->acl;
+			}
+			
+			// Retrieve all extrafields for invoice
+			// fetch optionals attributes and labels
+			/*
+			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+			$extrafields=new ExtraFields($this->db);
+			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+			$this->fetch_optionals($this->id,$extralabels);
+            */
+			// $this->fetch_lines();
+			
+			$this->db->free($resql);
+
+			if ($numrows) {
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param string $sortorder Sort Order
+	 * @param string $sortfield Sort field
+	 * @param int    $limit     offset limit
+	 * @param int    $offset    offset limit
+	 * @param array  $filter    filter array
+	 * @param string $filtermode filter mode (AND or OR)
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		$sql .= " t.label,";
+		$sql .= " t.entity,";
+		$sql .= " t.filename,";
+		$sql .= " t.filepath,";
+		$sql .= " t.fullpath_orig,";
+		$sql .= " t.description,";
+		$sql .= " t.keywords,";
+		$sql .= " t.cover,";
+		$sql .= " t.position,";
+		$sql .= " t.gen_or_uploaded,";
+		$sql .= " t.extraparams,";
+		$sql .= " t.date_c,";
+		$sql .= " t.date_m,";
+		$sql .= " t.fk_user_c,";
+		$sql .= " t.fk_user_m,";
+		$sql .= " t.acl";
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+			}
+		}
+		$sql.= ' WHERE 1 = 1';
+		if (! empty($conf->multicompany->enabled)) {
+		    $sql .= " AND entity IN (" . getEntity("ecmfiles", 1) . ")";
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
+		}
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield,$sortorder);
+		}
+		if (!empty($limit)) {
+		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
+		}
+
+		$this->lines = array();
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+
+			while ($obj = $this->db->fetch_object($resql)) {
+				$line = new EcmfilesLine();
+
+				$line->id = $obj->rowid;
+				
+				$line->label = $obj->label;
+				$line->entity = $obj->entity;
+				$line->filename = $obj->filename;
+				$line->filepath = $obj->filepath;
+				$line->fullpath_orig = $obj->fullpath_orig;
+				$line->description = $obj->description;
+				$line->keywords = $obj->keywords;
+				$line->cover = $obj->cover;
+				$line->position = $obj->position;
+				$line->gen_or_uploaded = $obj->gen_or_uploaded;
+				$line->extraparams = $obj->extraparams;
+				$line->date_c = $this->db->jdate($obj->date_c);
+				$line->date_m = $this->db->jdate($obj->date_m);
+				$line->fk_user_c = $obj->fk_user_c;
+				$line->fk_user_m = $obj->fk_user_m;
+				$line->acl = $obj->acl;
+			}
+			$this->db->free($resql);
+
+			return $num;
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		// Clean parameters
+		
+		if (isset($this->label)) {
+			 $this->label = trim($this->label);
+		}
+		if (isset($this->entity)) {
+			 $this->entity = trim($this->entity);
+		}
+		if (isset($this->filename)) {
+			 $this->filename = trim($this->filename);
+		}
+		if (isset($this->filepath)) {
+			 $this->filepath = trim($this->filepath);
+		}
+		if (isset($this->fullpath_orig)) {
+			 $this->fullpath_orig = trim($this->fullpath_orig);
+		}
+		if (isset($this->description)) {
+			 $this->description = trim($this->description);
+		}
+		if (isset($this->keywords)) {
+			 $this->keywords = trim($this->keywords);
+		}
+		if (isset($this->cover)) {
+			 $this->cover = trim($this->cover);
+		}
+		if (isset($this->gen_or_uploaded)) {
+			 $this->gen_or_uploaded = trim($this->gen_or_uploaded);
+		}
+		if (isset($this->extraparams)) {
+			 $this->extraparams = trim($this->extraparams);
+		}
+		if (isset($this->fk_user_c)) {
+			 $this->fk_user_c = trim($this->fk_user_c);
+		}
+		if (isset($this->fk_user_m)) {
+			 $this->fk_user_m = trim($this->fk_user_m);
+		}
+		if (isset($this->acl)) {
+			 $this->acl = trim($this->acl);
+		}
+
+		
+
+		// Check parameters
+		// Put here code to add a control on parameters values
+
+		// Update request
+		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		$sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
+		$sql .= ' entity = '.(isset($this->entity)?$this->entity:$conf->entity).',';
+		$sql .= ' filename = '.(isset($this->filename)?"'".$this->db->escape($this->filename)."'":"null").',';
+		$sql .= ' filepath = '.(isset($this->filepath)?"'".$this->db->escape($this->filepath)."'":"null").',';
+		$sql .= ' fullpath_orig = '.(isset($this->fullpath_orig)?"'".$this->db->escape($this->fullpath_orig)."'":"null").',';
+		$sql .= ' description = '.(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").',';
+		$sql .= ' keywords = '.(isset($this->keywords)?"'".$this->db->escape($this->keywords)."'":"null").',';
+		$sql .= ' cover = '.(isset($this->cover)?"'".$this->db->escape($this->cover)."'":"null").',';
+		$sql .= ' position = '.(isset($this->position)?$this->db->escape($this->position):"0").',';
+		$sql .= ' gen_or_uploaded = '.(isset($this->gen_or_uploaded)?"'".$this->db->escape($this->gen_or_uploaded)."'":"null").',';
+		$sql .= ' extraparams = '.(isset($this->extraparams)?"'".$this->db->escape($this->extraparams)."'":"null").',';
+		$sql .= ' date_c = '.(! isset($this->date_c) || dol_strlen($this->date_c) != 0 ? "'".$this->db->idate($this->date_c)."'" : 'null').',';
+		$sql .= ' date_m = '.(! isset($this->date_m) || dol_strlen($this->date_m) != 0 ? "'".$this->db->idate($this->date_m)."'" : 'null').',';
+		$sql .= ' fk_user_c = '.(isset($this->fk_user_c)?$this->fk_user_c:"null").',';
+		$sql .= ' fk_user_m = '.(isset($this->fk_user_m)?$this->fk_user_m:"null").',';
+		$sql .= ' acl = '.(isset($this->acl)?"'".$this->db->escape($this->acl)."'":"null");
+		$sql .= ' WHERE rowid=' . $this->id;
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error && !$notrigger) {
+			// Uncomment this and change MYOBJECT to your own tag if you
+			// want this action calls a trigger.
+
+			//// Call triggers
+			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+			//// End call triggers
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user      User that deletes
+	 * @param bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+
+		$this->db->begin();
+
+		if (!$error) {
+			if (!$notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
+
+		// If you need to delete child tables to, you can insert them here
+		
+		if (!$error) {
+			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+			$sql .= ' WHERE rowid=' . $this->id;
+
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Load an object from its id and create a new one in database
+	 *
+	 * @param int $fromid Id of object to clone
+	 *
+	 * @return int New id of clone
+	 */
+	public function createFromClone($fromid)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		global $user;
+		$error = 0;
+		$object = new Ecmfiles($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$object->fetch($fromid);
+		// Reset object
+		$object->id = 0;
+
+		// Clear fields
+		// ...
+
+		// Create clone
+		$result = $object->create($user);
+
+		// Other options
+		if ($result < 0) {
+			$error ++;
+			$this->errors = $object->errors;
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+
+			return $object->id;
+		} else {
+			$this->db->rollback();
+
+			return - 1;
+		}
+	}
+
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *	@param	string	$option				On what the link point to
+     *  @param	int  	$notooltip			1=Disable tooltip
+     *  @param	int		$maxlen				Max length of visible user name
+     *  @param  string  $morecss            Add more css on link
+	 *	@return	string						String with URL
+	 */
+	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
+	{
+		global $db, $conf, $langs;
+        global $dolibarr_main_authentication, $dolibarr_main_demo;
+        global $menumanager;
+
+        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        
+        $result = '';
+        $companylink = '';
+
+        $label = '<u>' . $langs->trans("MyModule") . '</u>';
+        $label.= '<br>';
+        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+
+        $url = DOL_URL_ROOT.'/ecm/'.$this->table_name.'_card.php?id='.$this->id;
+        
+        $linkclose='';
+        if (empty($notooltip))
+        {
+            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            {
+                $label=$langs->trans("ShowProject");
+                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+            }
+            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+        }
+        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+        
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
+		$linkend='</a>';
+
+        if ($withpicto)
+        {
+            $result.=($linkstart.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
+            if ($withpicto != 2) $result.=' ';
+		}
+		$result.= $linkstart . $this->ref . $linkend;
+		return $result;
+	}
+
+	/**
+	 *  Retourne le libelle du status d'un user (actif, inactif)
+	 *
+	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return	string 			       Label of status
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->status,$mode);
+	}
+
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        	Id status
+	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
+	 *  @return string 			       	Label of status
+	 */
+	static function LibStatut($status,$mode=0)
+	{
+		global $langs;
+
+		if ($mode == 0)
+		{
+			$prefix='';
+			if ($status == 1) return $langs->trans('Enabled');
+			if ($status == 0) return $langs->trans('Disabled');
+		}
+		if ($mode == 1)
+		{
+			if ($status == 1) return $langs->trans('Enabled');
+			if ($status == 0) return $langs->trans('Disabled');
+		}
+		if ($mode == 2)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+		}
+		if ($mode == 3)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+		}
+		if ($mode == 4)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+		}
+		if ($mode == 5)
+		{
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+		}
+		if ($mode == 6)
+		{
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+		}
+	}
+
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+	    global $conf,$user;
+	    
+		$this->id = 0;
+		
+		$this->label = '0a1b2c3e4f59999999';
+		$this->entity = '1';
+		$this->filename = 'myspecimenfilefile.pdf';
+		$this->filepath = '/aaa/bbb';
+		$this->fullpath_orig = 'c:/file on my disk.pdf';
+		$this->description = 'This is a long description of file';
+		$this->keywords = 'key1,key2';
+		$this->cover = '1';
+		$this->position = '5';
+		$this->gen_or_uploaded = 'uploaded';
+		$this->extraparams = '';
+		$this->date_c = (dol_now() - 3600 * 24 * 10);
+		$this->date_m = '';
+		$this->fk_user_c = $user->id;
+		$this->fk_user_m = '';
+		$this->acl = '';
+	}
+
+}
+
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
new file mode 100644
index 00000000000..9c6aefdec6d
--- /dev/null
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -0,0 +1,29 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 5.0.0 or higher.
+--
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To drop an index:        -- VMYSQL4.0 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.0 DROP INDEX nomindex
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres): -- VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
+-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
+
+
+ALTER TABLE llx_ecm_files CHANGE COLUMN fullpath filepath varchar(750);
+ALTER TABLE llx_ecm_files ADD COLUMN position integer;
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql
index 8310c160384..7a30066c2b2 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files.sql
@@ -21,12 +21,13 @@ CREATE TABLE llx_ecm_files
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   label				varchar(64) NOT NULL,
   entity			integer DEFAULT 1 NOT NULL,		-- multi company id
+  filepath    		varchar(750) NOT NULL,   	    -- relative to dolibarr document dir. example module/def
   filename          varchar(255) NOT NULL,			-- file name only without any directory
-  fullpath    		varchar(750) NOT NULL,   	    -- relative to dolibarr document dir. example abc/def/myfile
   fullpath_orig		varchar(750),	                -- full path of original filename, when file is uploaded from a local computer
   description		text,
   keywords          text,                           -- list of keywords, separated with comma
   cover             text,                           -- is this file a file to use for a cover
+  position          integer,                        -- position of file among others
   gen_or_uploaded   varchar(12),                    -- 'generated' or 'uploaded' 
   extraparams		varchar(255),					-- for stocking other parameters with json format
   date_c			datetime,

From 1e39805945334723dcf00a910b47e77ca20df42d Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 9 Dec 2016 16:14:43 +0100
Subject: [PATCH 0039/1163] integrate Eldy remarks

---
 htdocs/core/modules/modSociete.class.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 6e55077b19d..2de744801f0 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -281,7 +281,11 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as payterm ON s.cond_reglement = payterm.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as paymode ON s.mode_reglement = paymode.id';
 		$this->export_sql_end[$r] .=' WHERE s.entity IN ('.getEntity('societe', 1).')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' OR sc.fk_user IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'user where fk_user= '.$user->id.'))';
+		if(!$user->rights->societe->client->voir) {
+			$subordinatesids = $user->getAllChildIds();
+			var_dump($subordinatesids);
+			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' '.count($subronidatesids)>0 ? ' OR (sc.fk_user IN ('.implode(',',$subronidatesids).'))' : '';
+		}
 
 		// Export list of contacts and attributes
 		$r++;
@@ -311,7 +315,10 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON c.fk_pays = co.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = c.rowid';
 		$this->export_sql_end[$r] .=' WHERE c.entity IN ('.getEntity("societe", 1).')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' OR sc.fk_user IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'user where fk_user= '.$user->id.'))';
+		if(!$user->rights->societe->client->voir) {
+			$subordinatesids = $user->getAllChildIds();
+			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' '.count($subronidatesids)>0 ? ' OR (sc.fk_user IN ('.implode(',',$subronidatesids).'))' : '';
+		}
 
 
 		// Imports

From a797c45e3bf954e9f5ce528c089e1e1504be2b0c Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 9 Dec 2016 16:28:06 +0100
Subject: [PATCH 0040/1163] sdf

---
 htdocs/core/modules/modSociete.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 2de744801f0..f0ea5370c6c 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -283,7 +283,6 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' WHERE s.entity IN ('.getEntity('societe', 1).')';
 		if(!$user->rights->societe->client->voir) {
 			$subordinatesids = $user->getAllChildIds();
-			var_dump($subordinatesids);
 			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' '.count($subronidatesids)>0 ? ' OR (sc.fk_user IN ('.implode(',',$subronidatesids).'))' : '';
 		}
 

From ef721bebc60933940c2ef0f00fa3dd398518e55f Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Fri, 9 Dec 2016 17:48:03 +0100
Subject: [PATCH 0041/1163] FIX : break with no iteration

---
 htdocs/compta/facture.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index a846fb15e00..b5008801645 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -657,7 +657,6 @@ if (empty($reshook))
 				if ($result < 0)
 				{
 					$error++;
-					break;
 				}
 				
 			} else {

From cbfb7df05ea22762ad1c4c9407f579c5a807a671 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 10 Dec 2016 12:23:02 +0100
Subject: [PATCH 0042/1163] Add send contract by mail

---
 htdocs/contrat/card.php | 189 ++++++++++++++++++++++++++++++++++------
 1 file changed, 164 insertions(+), 25 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 7ef9924ac00..51a61d911b3 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -919,7 +919,19 @@ if (empty($reshook))
 			else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
 		}
 	}
-	
+
+	/*
+	 * Send mail
+	 */
+
+	// Actions to send emails
+	$actiontypecode='AC_CONT';
+	$trigger_name='CONTRACT_SENTBYMAIL';
+	$paramname='id';
+	$mode='emailfromcontract';
+	$trackid='cont'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->contrat->creer)
 	{
 		if ($action == 'addcontact')
@@ -2026,37 +2038,164 @@ else
 
             print "</div>";
         }
+	// Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
 
-        print '<div class="fichecenter"><div class="fichehalfleft">';
+	if ($action != 'presend')
+	{
+		print '<div class="fichecenter"><div class="fichehalfleft">';
 
-        /*
-         * Documents generes
-        */
-        $filename = dol_sanitizeFileName($object->ref);
-        $filedir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
-        $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-        $genallowed = $user->rights->contrat->creer;
-        $delallowed = $user->rights->contrat->supprimer;
+		/*
+		 * Documents generes
+		*/
+		$filename = dol_sanitizeFileName($object->ref);
+		$filedir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
+		$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+		$genallowed = $user->rights->contrat->creer;
+		$delallowed = $user->rights->contrat->supprimer;
 
-        $var = true;
+		$var = true;
 
-        print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
-
-        
-		// Show links to link elements
-		$linktoelem = $form->showLinkToObjectBlock($object, null, array('contrat'));
-		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+		print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 
 
-        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			// Show links to link elements
+			$linktoelem = $form->showLinkToObjectBlock($object, null, array('contrat'));
+			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+			// List of actions on element
+			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+			$formactions = new FormActions($db);
+			$somethingshown = $formactions->showactions($object, 'contract', $socid);
+
+
+		print '</div></div></div>';
+	}
+
+		/*
+		 * Action presend
+		 */
+		if ($action == 'presend')
+		{
+			$object->fetch_projet();
+
+			$ref = dol_sanitizeFileName($object->ref);
+			include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+			$file = $fileparams['fullname'];
+
+			// Define output language
+			$outputlangs = $langs;
+			$newlang = '';
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+				$newlang = $_REQUEST['lang_id'];
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+				$newlang = $object->thirdparty->default_lang;
+
+			if (!empty($newlang))
+			{
+				$outputlangs = new Translate('', $conf);
+				$outputlangs->setDefaultLang($newlang);
+				$outputlangs->load('commercial');
+			}
+
+			// Build document if it not exists
+			if (! $file || ! is_readable($file)) {
+				$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if ($result <= 0) {
+					dol_print_error($db, $object->error, $object->errors);
+					exit();
+				}
+				$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+				$file = $fileparams['fullname'];
+			}
+
+			print '<div class="clearboth"></div>';
+			print '<br>';
+			print load_fiche_titre($langs->trans('SendOrderByMail'));
+
+			dol_fiche_head('');
+
+			// Cree l'objet formulaire mail
+			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+			$formmail = new FormMail($db);
+			$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+            $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+            if($formmail->fromtype === 'user'){
+                $formmail->fromid = $user->id;
+
+            }
+			$formmail->trackid='ord'.$object->id;
+			if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+			{
+				include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+				$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
+			}
+			$formmail->withfrom = 1;
+			$liste = array();
+			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
+				$liste [$key] = $value;
+			$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
+			$formmail->withtocc = $liste;
+			$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+			if (empty($object->ref_client)) {
+				$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
+			} else if (! empty($object->ref_client)) {
+				$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
+			}
+			$formmail->withfile = 2;
+			$formmail->withbody = 1;
+			$formmail->withdeliveryreceipt = 1;
+			$formmail->withcancel = 1;
+			// Tableau des substitutions
+			$formmail->setSubstitFromObject($object);
+			$formmail->substit ['__ORDERREF__'] = $object->ref;
+
+			$custcontact = '';
+			$contactarr = array();
+			$contactarr = $object->liste_contact(- 1, 'external');
+
+			if (is_array($contactarr) && count($contactarr) > 0)
+			{
+				foreach ($contactarr as $contact)
+				{
+					if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
+						$contactstatic = new Contact($db);
+						$contactstatic->fetch($contact ['id']);
+						$custcontact = $contactstatic->getFullName($langs, 1);
+					}
+				}
+
+				if (! empty($custcontact)) {
+					$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
+				}
+			}
+
+			// Tableau des parametres complementaires
+			$formmail->param['action'] = 'send';
+			$formmail->param['models'] = 'order_send';
+			$formmail->param['models_id']=GETPOST('modelmailselected','int');
+			$formmail->param['orderid'] = $object->id;
+			$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+
+			// Init list of files
+			if (GETPOST("mode") == 'init') {
+				$formmail->clear_attached_files();
+				$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
+			}
+
+			// Show form
+			print $formmail->get_form();
+
+			dol_fiche_end();
+		}
 
-		// List of actions on element
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'contract', $socid);
-        
-        
-        print '</div></div></div>';
     }
 }
 

From ba8deb29c9b97bd79e7ab56c90305075ed51e9e4 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 10 Dec 2016 12:28:52 +0100
Subject: [PATCH 0043/1163] Update card.php

---
 htdocs/contrat/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 51a61d911b3..e59f8c95ed2 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2086,7 +2086,7 @@ else
 
 			$ref = dol_sanitizeFileName($object->ref);
 			include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+			$fileparams = dol_most_recent_file($conf->contrat->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
 			$file = $fileparams['fullname'];
 
 			// Define output language

From 7c7626e445e1845577e2f3925415bbac786ff34e Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 10 Dec 2016 13:19:33 +0100
Subject: [PATCH 0044/1163] allow to change height and width

---
 htdocs/product/class/product.class.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 3df1393628a..56b9fc527a6 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -636,6 +636,10 @@ class Product extends CommonObject
 		$this->weight_units = trim($this->weight_units);
 		$this->length = price2num($this->length);
 		$this->length_units = trim($this->length_units);
+		$this->width = price2num($this->width);
+		$this->width_units = trim($this->width_units);
+		$this->height = price2num($this->height);
+		$this->height_units = trim($this->height_units);
 		$this->surface = price2num($this->surface);
 		$this->surface_units = trim($this->surface_units);
 		$this->volume = price2num($this->volume);
@@ -750,6 +754,10 @@ class Product extends CommonObject
 			$sql.= ", weight_units = " . ($this->weight_units!='' ? "'".$this->weight_units."'": 'null');
 			$sql.= ", length = " . ($this->length!='' ? "'".$this->length."'" : 'null');
 			$sql.= ", length_units = " . ($this->length_units!='' ? "'".$this->length_units."'" : 'null');
+			$sql.= ", width= " . ($this->width!='' ? "'".$this->width."'" : 'null');
+			$sql.= ", width_units = " . ($this->width_units!='' ? "'".$this->width_units."'" : 'null');
+			$sql.= ", height = " . ($this->height!='' ? "'".$this->height."'" : 'null');
+			$sql.= ", height_units = " . ($this->height_units!='' ? "'".$this->height_units."'" : 'null');
 			$sql.= ", surface = " . ($this->surface!='' ? "'".$this->surface."'" : 'null');
 			$sql.= ", surface_units = " . ($this->surface_units!='' ? "'".$this->surface_units."'" : 'null');
 			$sql.= ", volume = " . ($this->volume!='' ? "'".$this->volume."'" : 'null');
@@ -1671,8 +1679,9 @@ class Product extends CommonObject
 
 		$sql = "SELECT rowid, ref, ref_ext, label, description, url, note as note_private, customcode, fk_country, price, price_ttc,";
 		$sql.= " price_min, price_min_ttc, price_base_type, cost_price, default_vat_code, tva_tx, recuperableonly as tva_npr, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, tosell,";
-		$sql.= " tobuy, fk_product_type, duration, seuil_stock_alerte, canvas,";
-		$sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,";
+		$sql.= " tobuy, fk_product_type, duration, seuil_stock_alerte, canvas, weight, weight_units,";
+		$sql.= " length, length_units, width, width_units, height, height_units,";
+		$sql.= " surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,";
 		$sql.= " accountancy_code_buy, accountancy_code_sell, stock, pmp,";
 		$sql.= " datec, tms, import_key, entity, desiredstock, tobatch, fk_unit,";
 		$sql.= " fk_price_expression, price_autogen";
@@ -1734,6 +1743,11 @@ class Product extends CommonObject
 				$this->weight_units				= $obj->weight_units;
 				$this->length					= $obj->length;
 				$this->length_units				= $obj->length_units;
+				$this->width					= $obj->width;
+				$this->width_units				= $obj->width_units;
+				$this->height					= $obj->height;
+				$this->height_units				= $obj->height_units;
+
 				$this->surface					= $obj->surface;
 				$this->surface_units			= $obj->surface_units;
 				$this->volume					= $obj->volume;

From 300c91fd7fc8495a6d6b8b419373938078930b99 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 10 Dec 2016 13:25:33 +0100
Subject: [PATCH 0045/1163] Update card.php

---
 htdocs/product/card.php | 64 +++++++++++++++++++++++++++++++++++------
 1 file changed, 55 insertions(+), 9 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 122e80b2e69..eca254eb93e 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -283,7 +283,11 @@ if (empty($reshook))
             $object->weight_units       	 = GETPOST('weight_units');
             $object->length             	 = GETPOST('size');
             $object->length_units       	 = GETPOST('size_units');
-            $object->surface            	 = GETPOST('surface');
+            $object->width               	 = GETPOST('sizewidth');
+            $object->width_units         	 = GETPOST('sizewidth_units');
+            $object->height             	 = GETPOST('sizeheight');
+            $object->height_units       	 = GETPOST('sizeheight_units');
+	    $object->surface            	 = GETPOST('surface');
             $object->surface_units      	 = GETPOST('surface_units');
             $object->volume             	 = GETPOST('volume');
             $object->volume_units       	 = GETPOST('volume_units');
@@ -380,6 +384,11 @@ if (empty($reshook))
                 $object->weight_units           = GETPOST('weight_units');
                 $object->length                 = GETPOST('size');
                 $object->length_units           = GETPOST('size_units');
+                $object->width               	 = GETPOST('sizewidth');
+                $object->width_units         	 = GETPOST('sizewidth_units');
+                $object->height             	 = GETPOST('sizeheight');
+                $object->height_units       	 = GETPOST('sizeheight_units');
+
                 $object->surface                = GETPOST('surface');
                 $object->surface_units          = GETPOST('surface_units');
                 $object->volume                 = GETPOST('volume');
@@ -1010,12 +1019,23 @@ else
             print $formproduct->select_measuring_units("weight_units","weight");
             print '</td></tr>';
             // Length
-            if (empty($conf->global->PRODUCT_DISABLE_LENGTH))
+            if (empty($conf->global->PRODUCT_DISABLE_SIZE))
             {
                 print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
                 print '<input name="size" size="4" value="'.GETPOST('size').'">';
                 print $formproduct->select_measuring_units("size_units","size");
                 print '</td></tr>';
+		    
+                print '<tr><td>'.$langs->trans("Width").'</td><td colspan="3">';
+                print '<input name="sizewidth" size="4" value="'.GETPOST('sizewidth').'">';
+                print $formproduct->select_measuring_units("sizewidth_units","size");
+                print '</td></tr>';
+
+                print '<tr><td>'.$langs->trans("Height").'</td><td colspan="3">';
+                print '<input name="sizeheight" size="4" value="'.GETPOST('sizeheight').'">';
+                print $formproduct->select_measuring_units("sizeheight_units","size");
+                print '</td></tr>';
+
             }
             if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
             {
@@ -1324,13 +1344,23 @@ else
                 print '<input name="weight" size="5" value="'.$object->weight.'"> ';
                 print $formproduct->select_measuring_units("weight_units", "weight", $object->weight_units);
                 print '</td></tr>';
-                if (empty($conf->global->PRODUCT_DISABLE_LENGTH))
+                if (empty($conf->global->PRODUCT_DISABLE_SIZE))
                 {
-                    // Length
-                    print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
-                    print '<input name="size" size="5" value="'.$object->length.'"> ';
-                    print $formproduct->select_measuring_units("size_units", "size", $object->length_units);
-                    print '</td></tr>';
+			// Length
+			print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
+			print '<input name="size" size="5" value="'.$object->length.'"> ';
+			print $formproduct->select_measuring_units("size_units", "size", $object->length_units);
+			print '</td></tr>';
+
+			print '<tr><td>'.$langs->trans("Width").'</td><td colspan="3">';
+			print '<input name="sizewidth" size="5" value="'.$object->width.'"> ';
+			print $formproduct->select_measuring_units("sizewidth_units","size", $object->width_units);
+			print '</td></tr>';
+
+			print '<tr><td>'.$langs->trans("Height").'</td><td colspan="3">';
+			print '<input name="sizeheight" size="5" value="'.$object->height.'"> ';
+			print $formproduct->select_measuring_units("sizeheight_units","size", $object->height_units);
+			print '</td></tr>';
                 }
                 if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
                 {
@@ -1634,7 +1664,7 @@ else
                     print '&nbsp;';
                 }
                 print "</td></tr>\n";
-                if (empty($conf->global->PRODUCT_DISABLE_LENGTH))
+                if (empty($conf->global->PRODUCT_DISABLE_SIZE))
                 {
                     // Length
                     print '<tr><td>'.$langs->trans("Length").'</td><td colspan="2">';
@@ -1647,6 +1677,22 @@ else
                         print '&nbsp;';
                     }
                     print "</td></tr>\n";
+			
+                    print '<tr><td>'.$langs->trans("Width").'</td><td colspan="2">';
+                    if ($object->width != '') {
+                        print $object->width." ".measuring_units_string($object->width_units,"size");
+                    }
+                    else
+                        print '&nbsp;';
+		    print "</td></tr>\n";
+                    
+		    print '<tr><td>'.$langs->trans("Height").'</td><td colspan="2">';
+                    if ($object->height != '') {
+                        print $object->height." ".measuring_units_string($object->height_units,"size");
+                    }
+                    else
+                        print '&nbsp;';
+		    print "</td></tr>\n";
                 }
                 if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
                 {

From b7af0461471fff0f9fe782f73bfd6b0e4e077c01 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sun, 11 Dec 2016 01:53:33 +0100
Subject: [PATCH 0046/1163] Add automated compute

---
 htdocs/product/class/product.class.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 56b9fc527a6..695ab573805 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -640,6 +640,20 @@ class Product extends CommonObject
 		$this->width_units = trim($this->width_units);
 		$this->height = price2num($this->height);
 		$this->height_units = trim($this->height_units);
+		// Automated compute surface and volume if not filled
+		if (empty($this->surface) && !empty($this->length) && !empty($this->width) 
+		    && $this->length_units == $this->with_units  
+		) {
+			$this->surface = $this->length * $this->width;
+			$this->surface_units =  $this->width_units;
+			if (empty($this->volume) && !empty($this->height)
+			    && $this->length_units == $this->height_units  
+		   	) {
+				$this->volume =  $this->surface * $this->height;
+				$this->volume_units = $this->height_units;
+			}
+		}
+		
 		$this->surface = price2num($this->surface);
 		$this->surface_units = trim($this->surface_units);
 		$this->volume = price2num($this->volume);

From f5bffeb535b97bd5a62dda75037a4fcc58377b15 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Sun, 11 Dec 2016 16:30:01 +0100
Subject: [PATCH 0047/1163] New get multicurrency rate from document date
 (propal, order)

---
 htdocs/admin/multicurrency.php                |  9 +++---
 htdocs/comm/propal/class/propal.class.php     |  2 +-
 htdocs/commande/class/commande.class.php      | 10 +++---
 .../class/multicurrency.class.php             | 31 ++++++++++++++-----
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index de3c2f3965a..f280b7c1735 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -183,20 +183,19 @@ print '<td>'.$langs->trans("Parameters").'</td>'."\n";
 print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
 
-/* TODO uncomment when the functionality will integrated
 $var=!$var;
 print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->transnoentitiesnoconv("multicurrency_useRateOnInvoiceDate").'</td>';
+print '<td>'.$langs->transnoentitiesnoconv("multicurrency_useRateOnDocumentDate").'</td>';
 print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="right" width="400">';
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_MULTICURRENCY_USE_RATE_ON_INVOICE_DATE">';
-print $form->selectyesno("MULTICURRENCY_USE_RATE_ON_INVOICE_DATE",$conf->global->MULTICURRENCY_USE_RATE_ON_INVOICE_DATE,1);
+print '<input type="hidden" name="action" value="set_MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE">';
+print $form->selectyesno("MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE",$conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE,1);
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print '</form>';
 print '</td></tr>';
-*/
+
 
 $var=!$var;
 print '<tr '.$bc[$var].'>';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index f10d82fdbfa..017a540e453 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -824,7 +824,7 @@ class Propal extends CommonObject
         if (empty($this->demand_reason_id)) $this->demand_reason_id=0;
 
 		// Multicurrency
-		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = $conf->currency;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 1f75e6caf74..f8bf39721ab 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -704,9 +704,12 @@ class Commande extends CommonOrder
 
         // Clean parameters
         $this->brouillon = 1;		// set command as draft
-
+		
+		// $date_commande is deprecated
+        $date = ($this->date_commande ? $this->date_commande : $this->date);
+		
 		// Multicurrency (test on $this->multicurrency_tx because we sould take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
 		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
 		if (empty($this->fk_multicurrency))
 		{
@@ -745,9 +748,6 @@ class Commande extends CommonOrder
             return -1;
         }
 
-        // $date_commande is deprecated
-        $date = ($this->date_commande ? $this->date_commande : $this->date);
-
         $now=dol_now();
 
         $this->db->begin();
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 97d29e3885b..c42b4fc3796 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -508,22 +508,37 @@ class MultiCurrency extends CommonObject
 	 * 
 	 * @param DoliDB	$db		object db
 	 * @param string	$code	code value search
+	 * @param date		$date_document	date from document (propal, order, invoice, ...)
 	 * 
 	 * @return 	array	[0] => id currency
 	 *					[1] => rate
 	 */
-	 public static function getIdAndTxFromCode(&$db, $code)
+	 public static function getIdAndTxFromCode(&$db, $code, $date_document)
 	 {
-	 	$sql = 'SELECT m.rowid, mc.rate FROM '.MAIN_DB_PREFIX.'multicurrency m';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'multicurrency_rate mc ON (m.rowid = mc.fk_multicurrency)';
-		$sql.= ' WHERE m.code = \''.$db->escape($code).'\'';
-		$sql.= " AND m.entity IN (".getEntity('multicurrency', 1).")";
-		$sql.= ' ORDER BY mc.date_sync DESC LIMIT 1';
+		global $conf;
+		
+	 	$sql1 = 'SELECT m.rowid, mc.rate FROM '.MAIN_DB_PREFIX.'multicurrency m';
+		$sql1.= ' LEFT JOIN '.MAIN_DB_PREFIX.'multicurrency_rate mc ON (m.rowid = mc.fk_multicurrency)';
+		$sql1.= ' WHERE m.code = \''.$db->escape($code).'\'';
+		$sql1.= " AND m.entity IN (".getEntity('multicurrency', 1).")";
+		$sql2= '';
+		if (!empty($conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE) && !empty($date_document)) $sql2.= ' AND DATE_FORMAT(mc.date_sync, "%Y-%m-%d") = "'.date('Y-m-d', $date_document).'"';
+		$sql3.= ' ORDER BY mc.date_sync DESC LIMIT 1';
 		
 		dol_syslog(__METHOD__,LOG_DEBUG);
-		$resql = $db->query($sql);
+		$resql = $db->query($sql1.$sql2.$sql3);
+		
 		if ($resql && $obj = $db->fetch_object($resql)) return array($obj->rowid, $obj->rate);
-		else return array(0, 1);
+		else
+		{
+			if (!empty($conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE))
+			{
+				$resql = $db->query($sql1.$sql3);
+				if ($resql && $obj = $db->fetch_object($resql)) return array($obj->rowid, $obj->rate);
+			}
+			
+			return array(0, 1);
+		}
 	 }  
 	 
 	 /**

From 1db907e2afebb6403502ff3c0eb7eedb13f15b77 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Sun, 11 Dec 2016 21:15:24 +0100
Subject: [PATCH 0048/1163] Fix missing default value for new parameter

---
 htdocs/multicurrency/class/multicurrency.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index c42b4fc3796..b8ce1995b5a 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -513,7 +513,7 @@ class MultiCurrency extends CommonObject
 	 * @return 	array	[0] => id currency
 	 *					[1] => rate
 	 */
-	 public static function getIdAndTxFromCode(&$db, $code, $date_document)
+	 public static function getIdAndTxFromCode(&$db, $code, $date_document='')
 	 {
 		global $conf;
 		

From a7813c37a1dee3b5ba8d2e4da451e0f16e96f519 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Mon, 12 Dec 2016 12:36:00 +0100
Subject: [PATCH 0049/1163] init inventory integration

---
 htdocs/core/class/coreobject.class.php     | 214 ++++++++++
 htdocs/inventory/ajax/ajax.inventory.php   |  50 +++
 htdocs/inventory/class/inventory.class.php | 466 +++++++++++++++++++++
 3 files changed, 730 insertions(+)
 create mode 100644 htdocs/core/class/coreobject.class.php
 create mode 100644 htdocs/inventory/ajax/ajax.inventory.php
 create mode 100644 htdocs/inventory/class/inventory.class.php

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
new file mode 100644
index 00000000000..1cc68f38cb7
--- /dev/null
+++ b/htdocs/core/class/coreobject.class.php
@@ -0,0 +1,214 @@
+<?php
+/* Copyright (C) 2016		ATM Consulting			<support@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/core/class/coreobject.inventory.php
+ *	\ingroup    core
+ *	\brief      File of class to manage all object. Might be replace or merge into commonobject
+ */
+ 
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+
+class CoreObject extends CommonObject {
+	
+	 
+	 /**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB		$db      Database handler
+	 */
+	function __construct(DoliDB &$db) {
+		
+		$this->db = &$db;
+		
+		$this->date_0 = '1001-01-01 00:00:00'; //TODO there is a solution for this ?
+	}
+	
+	private function init() {
+		
+		$this->id = 0;
+		$this->datec = time();
+		$this->tms = time();
+		
+		if(!empty($this->__fields)) {
+			foreach ($this->__fields as $field=>$info) {
+		
+		        if($this->is_date($info)){
+					$this->{$field} = time();
+		        }
+		        elseif($this->is_array($info)){
+					$this->{$field} = array();
+		        }
+		        elseif($this->is_int($info)){
+					$this->{$field} = (int)0;
+		        }
+		        elseif($this->is_float($info)) {
+					$this->{$field} = (double)0;
+				}
+		        else{
+					$this->{$field} = '';
+		        }
+		    }
+			
+		    $this->to_delete=false;
+			
+			return true;
+		}
+		else{
+			return false;
+		}
+			
+	}
+	
+	
+	private function is_date(Array &$info){
+	
+		if(is_array($info)) {
+			if(isset($info['type']) && $info['type']=='date') return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	private function is_array($info) {
+		
+	  	if(is_array($info)) {
+			if(isset($info['type']) && $info['type']=='array') return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	
+	private function is_null($info){
+		if(is_array($info)) {
+			if(isset($info['type']) && $info['type']=='null') return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	private function is_int($info){
+	
+		if(is_array($info)) {
+			if(isset($info['type']) && ($info['type']=='int' || $info['type']=='integer' )) return true;
+			else return false;
+		}
+		else return false;
+	}
+	private function _is_float($info){
+		if(is_array($info)) {
+			if(isset($info['type']) && $info['type']=='float') return true;
+			else return false;
+		} else return false;
+	}
+	
+	private function _is_text($info){
+	  	if(is_array($info)) {
+			if(isset($info['type']) && $info['type']=='text') return true;
+			else return false;
+		} else return false;
+	}
+	private function _is_index($info){
+	  	if(is_array($info)) {
+			if(isset($info['index']) && $info['index']==true) return true;
+			else return false;
+		} else return false;
+	}
+		
+	private function set_save_query(){
+		
+		$query=array(
+			'rowid'=>$this->id
+			,'datec'=>($this->id>0 ? $this->db->jdate($this->datec) : time())
+			,'tms'=>time()
+		);
+		
+		foreach ($this->__fields as $field=>$info) {
+	
+			if($this->_is_date($info)){
+				if(empty($this->{$field})){
+					$query[$field] = $this->date_0;
+				}
+				else{
+					$query[$field] = $this->db->jdate($this->{$field});
+				}
+		  	}
+		  	else if($this->is_array($info)){
+		  		    $query[$field] = serialize($this->{$field});
+		  	}
+		
+		  	else if($this->is_int($info)){
+		    	$query[$field] = (int)price2num($this->{$field});
+		  	}
+		
+		  	else if($this->_is_float($info)){
+		    	$query[$field] = (double)price2num($this->{$field});
+		  	}
+		
+		  	elseif($this->_is_null($info)) {
+		  		$query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0')?null:$this->{$field});
+		    }
+		    else{
+		       $query[$field] = $this->{$field};
+		    }
+		
+	    }
+	
+		return $query;
+	}
+		
+	
+	public function fetch($id, $loadChild = true) {
+		
+		if(empty($id)) return false;
+
+		$res = $db->query( 'SELECT '.$this->get_field_list().'datec,tms
+						FROM '.$this->table_element.'
+						WHERE rowid='.$id );
+		if($obj = $db->fetch_object($res)) {
+				$this->rowid=$id;
+			
+				$this->set_vars_by_db($db);
+
+				$this->datec=$this->db->idate($obj->datec);
+				$this->tms=$this->db->idate($obj->tms);
+				
+				if($loadChild) $this->loadChild($db);
+
+				$this->run_trigger($db, 'load');
+
+				return $this->id;
+		}
+		else {
+				return false;
+		}
+		
+	}
+	public function update() {
+		
+		
+		
+	}
+	public function create() {
+		
+		
+		
+	}
+	
+	
+}
diff --git a/htdocs/inventory/ajax/ajax.inventory.php b/htdocs/inventory/ajax/ajax.inventory.php
new file mode 100644
index 00000000000..34efecfab8f
--- /dev/null
+++ b/htdocs/inventory/ajax/ajax.inventory.php
@@ -0,0 +1,50 @@
+<?php
+
+    require('../config.php');
+    require('../class/inventory.class.php');
+
+    
+    $get = GETPOST('get');
+    $put = GETPOST('put');
+    
+    $PDOdb=new TPDOdb;
+    
+    switch ($put) {
+        case 'qty':
+            if (!$user->rights->inventory->write) { echo -1; exit; }
+            
+            $fk_det_inventory = GETPOST('fk_det_inventory');
+            
+            $det = new Inventorydet;
+            if( $det->load($PDOdb, $fk_det_inventory)) {
+                $det->qty_view+=GETPOST('qty');
+                $det->save($PDOdb);
+                
+                echo $det->qty_view;
+            }
+            else {
+                echo -2;
+            }            
+            
+            break;
+			
+        case 'pmp':
+            if (!$user->rights->inventory->write || !$user->rights->inventory->changePMP) { echo -1; exit; }
+            
+            $fk_det_inventory = GETPOST('fk_det_inventory');
+            
+            $det = new Inventorydet;
+            if( $det->load($PDOdb, $fk_det_inventory)) {
+                $det->new_pmp=price2num(GETPOST('pmp'));
+                $det->save($PDOdb);
+                
+                echo $det->new_pmp;
+            }
+            else {
+                echo -2;
+            }            
+            
+            break;
+        
+    }
+ 
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
new file mode 100644
index 00000000000..808dd7933be
--- /dev/null
+++ b/htdocs/inventory/class/inventory.class.php
@@ -0,0 +1,466 @@
+<?php
+/* Copyright (C) 2016		ATM Consulting			<support@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/inventory/class/product.inventory.php
+ *	\ingroup    product
+ *	\brief      File of class to manage predefined products stock
+ */
+ 
+require_once DOL_DOCUMENT_ROOT.'/core/class/coreobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+class Inventory extends CoreObject
+{
+	
+	public $element='inventory';
+	public $table_element='inventory';
+	public $fk_element='fk_inventory';
+	protected $childtables=array('inventorydet');    // To test if we can delete object
+	protected $isnolinkedbythird = 1;     // No field fk_soc
+	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	
+	/**
+	 * Warehouse Id
+	 * @var int
+	 */
+	public $fk_warehouse;
+	/**
+	 * Entity Id
+	 * @var int
+	 */
+	public $entity;
+	
+	/**
+	 * Status
+	 * @var int
+	 */
+	public $status;
+	/**
+	 * Inventory Date
+	 * @var date
+	 */
+	public $date_inventory;
+	/**
+	 * Inventory Title
+	 * @var string
+	 */
+	public $title;
+	
+	private $__fields=array(
+		'fk_warehouse'=>array('type'=>'integer','index'=>true)
+		,'entity'=>array('type'=>'integer','index'=>true)
+		,'status'=>array('type'=>'integer','index'=>true)
+		,'date_inventory'=>array('type'=>'date')
+		,'title'=>array('type'=>'string')
+	);
+	
+	function __construct() 
+	{
+		
+		parent::init();
+		
+        $this->_init_vars();
+        
+	    $this->start();
+		
+		$this->setChild('Inventorydet','fk_inventory');
+		
+		$this->status = 0;
+		$this->entity = $conf->entity;
+		$this->errors = array();
+		$this->amount = 0;
+		
+	}
+	
+	function sort_det() 
+	{
+		usort($this->Inventorydet, array('Inventory', 'customSort'));
+	}
+	
+	function load(&$PDOdb, $id,$annexe = true) 
+	{
+	    
+        if(!$annexe) $this->withChild = false;
+        
+		$res = parent::load($PDOdb, $id);
+		$this->sort_det();
+		
+		$this->amount = 0;
+		foreach($this->Inventorydet as &$det){
+			$this->amount+=$det->qty_view * $det->pmp;
+		}
+		
+		return $res;
+	}
+	
+	
+	function customSort(&$objA, &$objB)
+	{
+		global $db;
+		
+		$r = strcmp(strtoupper(trim($objA->product->ref)), strtoupper(trim($objB->product->ref)));
+		
+		if ($r < 0) $r = -1;
+		elseif ($r > 0) $r = 1;
+		else $r = 0;
+		
+		return $r;
+	}
+	
+	function changePMP(&$PDOdb) {
+		
+		foreach ($this->Inventorydet as $k => &$Inventorydet)
+		{
+			
+			if($Inventorydet->new_pmp>0) {
+				$Inventorydet->pmp = $Inventorydet->new_pmp; 
+				$Inventorydet->new_pmp = 0;
+			
+				$PDOdb->Execute("UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$Inventorydet->pmp."
+				WHERE rowid = ".$Inventorydet->fk_product );
+				
+				if((float)DOL_VERSION<4.0) {
+					
+					$PDOdb->Execute("UPDATE ".MAIN_DB_PREFIX."product_stock SET pmp=".$Inventorydet->pmp."
+					 WHERE fk_entrepot = ".$this->fk_warehouse." AND fk_product = ".$Inventorydet->fk_product) ;
+					
+				}
+				
+			}
+		}
+		
+		parent::save($PDOdb);
+		
+	}
+	
+	function save(&$PDOdb)
+	{
+		//si on valide l'inventaire on sauvegarde le stock à cette instant
+		if ($this->status)
+		{
+			 $this->regulate($PDOdb);
+		}
+		
+		parent::save($PDOdb);
+	}
+	
+	function set_values($Tab)
+	{
+		global $db,$langs;
+		
+		if (isset($Tab['qty_to_add']))
+		{
+			foreach ($Tab['qty_to_add'] as $k => $qty)
+			{
+				$qty = (float) price2num($qty);
+				
+				if ($qty < 0) 
+				{
+					$this->errors[] = $langs->trans('inventoryErrorQtyAdd');
+					return 0;
+				} 
+				
+				$product = new Product($db);
+				$product->fetch($this->Inventorydet[$k]->fk_product);
+				
+				$this->Inventorydet[$k]->pmp = $product->pmp;
+				$this->Inventorydet[$k]->qty_view += $qty;
+			}	
+		}
+		
+		return parent::set_values($Tab);
+	}
+	
+    function deleteAllLine(&$PDOdb) {
+        
+        foreach($this->Inventorydet as &$det) {
+            $det->to_delete = true;
+        }
+        
+        $this->save($PDOdb);
+      
+        $this->Inventorydet=array();
+        
+    }
+    
+    function add_product(&$PDOdb, $fk_product, $fk_entrepot='') {
+        
+        $k = $this->addChild($PDOdb, 'Inventorydet');
+        $det =  &$this->Inventorydet[$k];
+        
+        $det->fk_inventory = $this->getId();
+        $det->fk_product = $fk_product;
+		$det->fk_warehouse = empty($fk_entrepot) ? $this->fk_warehouse : $fk_entrepot;
+        
+        $det->load_product();
+                
+        $date = $this->get_date('date_inventory', 'Y-m-d');
+        if(empty($date))$date = $this->get_date('date_cre', 'Y-m-d'); 
+        $det->setStockDate($PDOdb, $date , $fk_entrepot);
+        
+    }
+    
+    function correct_stock($fk_product, $id_entrepot, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
+	{
+		global $conf, $db, $langs, $user;
+		
+		/* duplication method product to add datem */
+		if ($id_entrepot)
+		{
+			$db->begin();
+
+			require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
+
+			$op[0] = "+".trim($nbpiece);
+			$op[1] = "-".trim($nbpiece);
+
+			$datem = empty($conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT) ? dol_now() : $this->date_inventory;
+
+			$movementstock=new MouvementStock($db);
+			$result=$movementstock->_create($user,$fk_product,$id_entrepot,$op[$movement],$movement,$price,$label,$inventorycode, $datem);
+			
+			if ($result >= 0)
+			{
+				$db->commit();
+				return 1;
+			}
+			else
+			{
+			    $this->error=$movementstock->error;
+			    $this->errors=$movementstock->errors;
+
+				$db->rollback();
+				return -1;
+			}
+		}
+	}
+	
+	function regulate(&$PDOdb)
+	{
+		global $db,$user,$langs,$conf;
+		
+		if($conf->global->INVENTORY_DISABLE_VIRTUAL){
+			$pdt_virtuel = false;
+			// Test si pdt virtuel est activé
+			if($conf->global->PRODUIT_SOUSPRODUITS)
+			{
+				$pdt_virtuel = true;
+				$conf->global->PRODUIT_SOUSPRODUITS = 0;
+			}
+		}
+		
+		foreach ($this->Inventorydet as $k => $Inventorydet)
+		{
+			$product = new Product($db);
+			$product->fetch($Inventorydet->fk_product);
+			
+			/*
+			 * Ancien code qui était pourri et qui modifié la valeur du stock théorique si le parent était déstocké le même jour que l'enfant
+			 * 
+			 * $product->load_stock();
+			$Inventorydet->qty_stock = $product->stock_warehouse[$this->fk_warehouse]->real;
+			
+			if(date('Y-m-d', $this->date_inventory) < date('Y-m-d')) {
+				$TRes = $Inventorydet->getPmpStockFromDate($PDOdb, date('Y-m-d', $this->date_inventory), $this->fk_warehouse);
+				$Inventorydet->qty_stock = $TRes[1];
+			}
+			*/
+			if ($Inventorydet->qty_view != $Inventorydet->qty_stock)
+			{
+				$Inventorydet->qty_regulated = $Inventorydet->qty_view - $Inventorydet->qty_stock;
+				$nbpiece = abs($Inventorydet->qty_regulated);
+				$movement = (int) ($Inventorydet->qty_view < $Inventorydet->qty_stock); // 0 = add ; 1 = remove
+						
+				$href = dol_buildpath('/inventory/inventory.php?id='.$this->getId().'&action=view', 1);
+				
+				if(empty($this->title))
+					$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock', $href, $this->getId()));
+				else
+					$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStockWithNomInventaire', $href, $this->title));
+			}
+		}
+
+		if($conf->global->INVENTORY_DISABLE_VIRTUAL){
+			// Test si pdt virtuel était activé avant la régule
+			if($pdt_virtuel) $conf->global->PRODUIT_SOUSPRODUITS = 1;
+		}
+		
+		return 1;
+	}
+    
+    static function getLink($id) {
+        global $langs;
+        
+        $PDOdb=new TPDOdb;
+        
+        $i = new Inventory;
+        $i->load($PDOdb, $id, false);
+        
+        $title = !empty($i->title) ? $i->title : $langs->trans('inventoryTitle').' '.$i->getId();
+        
+        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$i->getId().'&action=view', 1).'">'.img_picto('','object_list.png','',0).' '.$title.'</a>';
+        
+    }
+}
+
+class Inventorydet extends TObjetStd
+{
+	function __construct()
+	{
+		global $conf;
+		
+		$this->set_table(MAIN_DB_PREFIX.'inventorydet');
+    	$this->TChamps = array(); 	  
+		$this->add_champs('fk_inventory,fk_warehouse,fk_product,entity', 'type=entier;');
+		$this->add_champs('qty_view,qty_stock,qty_regulated,pmp,pa,new_pmp', 'type=float;');
+
+		$this->_init_vars();
+	    $this->start();
+		
+		$this->entity = $conf->entity;
+		$this->errors = array();
+		
+		$this->product = null;
+		
+		$this->current_pa = 0;
+		
+	}
+	
+	function load(&$PDOdb, $id) 
+	{
+		global $conf;
+		
+		$res = parent::load($PDOdb, $id);
+		$this->load_product();
+        $this->fetch_current_pa();
+			
+		return $res;
+	}
+	
+	function fetch_current_pa() {
+		global $db,$conf;
+		
+		if(empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) return false;
+		
+		if($this->pa>0){ 
+			$this->current_pa = $this->pa;
+		}
+		else {
+			
+			dol_include_once('/fourn/class/fournisseur.product.class.php');
+			$p= new ProductFournisseur($db);
+			$p->find_min_price_product_fournisseur($this->fk_product);
+			
+			if($p->fourn_qty>0)	$this->current_pa = $p->fourn_price / $p->fourn_qty;
+		}
+		return true;
+	}
+	
+    function setStockDate(&$PDOdb, $date, $fk_warehouse) {
+        
+		list($pmp,$stock) = $this->getPmpStockFromDate($PDOdb, $date, $fk_warehouse);
+		
+        $this->qty_stock = $stock;
+        $this->pmp = $pmp;
+        
+        $last_pa = 0;
+        $sql = "SELECT price FROM ".MAIN_DB_PREFIX."stock_mouvement 
+                WHERE fk_entrepot=".$fk_warehouse." 
+                AND fk_product=".$this->fk_product." 
+                AND (origintype='order_supplier' || origintype='invoice_supplier')
+                AND price>0 
+                AND datem<='".$date." 23:59:59'
+                ORDER BY datem DESC LIMIT 1";
+               
+        $PDOdb->Execute($sql);
+       
+        if($obj = $PDOdb->Get_line()) {
+            $last_pa = $obj->price;
+        }
+        
+        $this->pa = $last_pa;
+      /*  var_dump($fk_warehouse,$this->product->stock_warehouse,$this->pmp, $this->pa, $this->qty_stock);
+        exit;*/
+    }
+
+	function getPmpStockFromDate(&$PDOdb, $date, $fk_warehouse){
+		
+		$res = $this->product->load_stock();
+		
+		if($res>0) {
+			$stock = isset($this->product->stock_warehouse[$fk_warehouse]->real) ? $this->product->stock_warehouse[$fk_warehouse]->real : 0;
+			
+			if((float)DOL_VERSION<4.0) {
+				$pmp = isset($this->product->stock_warehouse[$fk_warehouse]->pmp) ? $this->product->stock_warehouse[$fk_warehouse]->pmp : 0; 
+			}
+			else{
+				$pmp = $this->product->pmp;
+			}
+			
+		}
+		
+		//On récupère tous les mouvements de stocks du produit entre aujourd'hui et la date de l'inventaire
+		$sql = "SELECT value, price
+				FROM ".MAIN_DB_PREFIX."stock_mouvement
+				WHERE fk_product = ".$this->product->id."
+					AND fk_entrepot = ".$fk_warehouse."
+					AND datem > '".date('Y-m-d 23:59:59',strtotime($date))."'
+				ORDER BY datem DESC";
+
+		//echo $sql.'<br>';
+		$PDOdb->Execute($sql);
+		$TMouvementStock = $PDOdb->Get_All();
+		$laststock = $stock;
+		$lastpmp = $pmp;
+		//Pour chacun des mouvements on recalcule le PMP et le stock physique
+		foreach($TMouvementStock as $mouvement){
+			
+			//150
+			//if($this->product->id==394) echo 'laststock = '.$stock.'<br>';
+			
+			//9.33
+			//if($this->product->id==394) echo 'lastpmp = '.$pmp.'<br>';
+			$price = ($mouvement->price>0 && $mouvement->value>0) ? $mouvement->price : $lastpmp;  
+				
+			$stock_value = $laststock * $lastpmp;
+			
+			$laststock -= $mouvement->value;
+			
+			$last_stock_value = $stock_value - ($mouvement->value * $price);	
+			
+			$lastpmp = ($laststock != 0) ? $last_stock_value / $laststock : $lastpmp;
+			 
+			
+
+		}
+		
+		return array($lastpmp,$laststock);
+	}
+    
+	function load_product() 
+	{
+		global $db;
+		
+		if($this->fk_product>0) {
+			$this->product = new Product($db);
+			$this->product->fetch($this->fk_product);
+		}
+		
+	}
+	
+}

From b8284447fd0149d574ded0dd073b4426376e248c Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Mon, 12 Dec 2016 15:19:47 +0100
Subject: [PATCH 0050/1163] API can receive documents

---
 htdocs/api/class/api.class.php           |  41 ++---
 htdocs/api/class/api_documents.class.php | 143 ++++++++++++++++++
 htdocs/api/index.php                     |  12 +-
 test/phpunit/RestAPIDocumentTest.php     | 183 +++++++++++++++++++++++
 4 files changed, 354 insertions(+), 25 deletions(-)
 create mode 100644 htdocs/api/class/api_documents.class.php
 create mode 100644 test/phpunit/RestAPIDocumentTest.php

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 5ffae225df1..ed97968e502 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -19,6 +19,7 @@
 use Luracast\Restler\Restler;
 use Luracast\Restler\RestException;
 use Luracast\Restler\Defaults;
+use Luracast\Restler\Format\UploadFormat;
 
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
@@ -47,14 +48,14 @@ class DolibarrApi
     function __construct($db, $cachedir='')
     {
         global $conf;
-        
+
         if (empty($cachedir)) $cachedir = $conf->api->dir_temp;
         Defaults::$cacheDirectory = $cachedir;
-        
+
         $this->db = $db;
         $production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
         $this->r = new Restler($production_mode);
-        
+
         $this->r->setAPIVersion(1);
     }
 
@@ -86,20 +87,20 @@ class DolibarrApi
 
         // Remove $db object property for object
         unset($object->db);
-        
+
         // Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses
         unset($object->linkedObjects);
-        
+
         unset($object->lignes); // should be ->lines
         unset($object->oldline);
-        
+
         unset($object->error);
         unset($object->errors);
-        
+
         unset($object->ref_previous);
         unset($object->ref_next);
         unset($object->ref_int);
-        
+
         unset($object->projet);     // Should be fk_project
         unset($object->project);    // Should be fk_project
         unset($object->author);     // Should be fk_user_author
@@ -111,18 +112,18 @@ class DolibarrApi
         unset($object->timespent_withhour);
         unset($object->timespent_fk_user);
         unset($object->timespent_note);
-        
+
         unset($object->statuts);
         unset($object->statuts_short);
         unset($object->statuts_logo);
         unset($object->statuts_long);
-        
+
         unset($object->element);
         unset($object->fk_element);
         unset($object->table_element);
         unset($object->table_element_line);
         unset($object->picto);
-        
+
         // Remove the $oldcopy property because it is not supported by the JSON
         // encoder. The following error is generated when trying to serialize
         // it: "Error encoding/decoding JSON: Type is not supported"
@@ -152,7 +153,7 @@ class DolibarrApi
                 }
             }
         }*/
-        
+
 		return $object;
     }
 
@@ -187,12 +188,12 @@ class DolibarrApi
 
 		return checkUserAccessToObject(DolibarrApiAccess::$user, $featuresarray,$resource_id,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
 	}
-	
+
 	/**
 	 * Return if a $sqlfilters parameter is valid
-	 * 
+	 *
 	 * @param  string   $sqlfilters     sqlfilter string
-	 * @return boolean                  True if valid, False if not valid 
+	 * @return boolean                  True if valid, False if not valid
 	 */
 	function _checkFilters($sqlfilters)
 	{
@@ -216,22 +217,22 @@ class DolibarrApi
 	    }
 	    return true;
 	}
-	
+
 	/**
 	 * Function to forge a SQL criteria
-	 * 
+	 *
 	 * @param  array    $matches       Array of found string by regex search
 	 * @return string                  Forged criteria. Example: "t.field like 'abc%'"
 	 */
 	static function _forge_criteria_callback($matches)
 	{
 	    global $db;
-	    
+
 	    //dol_syslog("Convert matches ".$matches[1]);
 	    if (empty($matches[1])) return '';
 	    $tmp=explode(':',$matches[1]);
         if (count($tmp) < 3) return '';
-        
+
 	    $tmpescaped=$tmp[2];
 	    if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
 	    {
@@ -242,5 +243,5 @@ class DolibarrApi
 	        $tmpescaped = $db->escape($tmpescaped);
 	    }
 	    return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
-	}	
+	}
 }
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
new file mode 100644
index 00000000000..ca10b2befce
--- /dev/null
+++ b/htdocs/api/class/api_documents.class.php
@@ -0,0 +1,143 @@
+<?php
+/* Copyright (C) 2016   Xebax Christy           <xebax@wanadoo.fr>
+ * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2016   Jean-François Ferry     <jfefe@aternatik.fr>
+ *
+ * This program is free software you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+use Luracast\Restler\RestException;
+use Luracast\Restler\Format\UploadFormat;
+
+
+require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
+
+/**
+ * API class for receive files
+ *
+ * @access protected
+ * @class Documents {@requires user,external}
+ */
+class Documents extends DolibarrApi
+{
+
+    /**
+     * @var array   $DOCUMENT_FIELDS     Mandatory fields, checked when create and update object
+     */
+    static $DOCUMENT_FIELDS = array(
+        'name',
+        'modulepart',
+        'file'
+    );
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        global $db;
+        $this->db = $db;
+    }
+
+    /**
+     * Return a document
+     *
+     * @param   string  $module_part    Module part for file
+     * @param   string  $filename       File name
+     *
+     * @return array
+     * @throws RestException
+     *
+     */
+     public function get($module_part, $filename) {
+
+     }
+
+
+    /**
+     * Receive file
+     *
+     * @param   array   $request_data   Request datas
+     *
+     * @return  bool     State of copy
+     * @throws RestException
+     */
+    public function post($request_data) {
+        global $conf;
+        
+        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+
+        if (!DolibarrApiAccess::$user->rights->ecm->upload) {
+            throw new RestException(401);
+        }
+
+        // Suppression de la chaine de caractere ../ dans $original_file
+		$original_file = str_replace("../","/", $request_data['name']);
+        $refname = str_replace("../","/", $request_data['refname']);
+
+		// find the subdirectory name as the reference
+		if (empty($request_data['refname'])) $refname=basename(dirname($original_file)."/");
+
+        // Security:
+		// On interdit les remontees de repertoire ainsi que les pipe dans
+		// les noms de fichiers.
+		if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
+		{
+            throw new RestException(401,'Refused to deliver file '.$original_file);
+		}
+        if (preg_match('/\.\./',$refname) || preg_match('/[<>|]/',$refname))
+		{
+            throw new RestException(401,'Refused to deliver file '.$refname);
+		}
+
+        $modulepart = $request_data['modulepart'];
+
+        // Check mandatory fields
+        $result = $this->_validate_file($request_data);
+
+        $upload_dir = DOL_DATA_ROOT . '/' .$modulepart.'/'.dol_sanitizeFileName($refname);
+        $destfile = $upload_dir . $original_file;
+
+        if (!is_dir($upload_dir)) {
+            throw new RestException(401,'Directory not exists : '.$upload_dir);
+        }
+
+        $file = $_FILES['file'];
+        $srcfile = $file['tmp_name'];
+        $res = dol_move($srcfile, $destfile, 0, 1);
+
+        if (!$res) {
+            throw new RestException(500);
+        }
+
+        return $res;
+    }
+
+    /**
+     * Validate fields before create or update object
+     *
+     * @param   array           $data   Array with data to verify
+     * @return  array
+     * @throws  RestException
+     */
+    function _validate_file($data) {
+        $result = array();
+        foreach (Documents::$DOCUMENT_FIELDS as $field) {
+            if (!isset($data[$field]))
+                throw new RestException(400, "$field field missing");
+            $result[$field] = $data[$field];
+        }
+        return $result;
+    }
+}
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 8ad60c4b340..5db8d7a78c9 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -56,16 +56,18 @@ if (empty($conf->global->MAIN_MODULE_API))
     exit;
 }
 
-
 $api = new DolibarrApi($db);
 
 // Enable the Restler API Explorer.
 // See https://github.com/Luracast/Restler-API-Explorer for more info.
 $api->r->addAPIClass('Luracast\\Restler\\Explorer');
 
-$api->r->setSupportedFormats('JsonFormat', 'XmlFormat');
+$api->r->setSupportedFormats('JsonFormat', 'XmlFormat', 'UploadFormat');
 $api->r->addAuthenticationClass('DolibarrApiAccess','');
 
+// Define accepted mime types
+UploadFormat::$allowedMimeTypes = array('image/jpeg', 'image/png', 'text/plain', 'application/octet-stream');
+
 $listofapis = array();
 
 $modulesdir = dolGetModulesDirs();
@@ -86,7 +88,7 @@ foreach ($modulesdir as $dir)
                 $module = strtolower($reg[1]);
                 $moduledirforclass = $module;
                 $moduleforperm = $module;
-                
+
                 if ($module == 'propale') {
                     $moduledirforclass = 'comm/propal';
                     $moduleforperm='propal';
@@ -119,7 +121,7 @@ foreach ($modulesdir as $dir)
                     $moduledirforclass = 'fourn';
                 }
                 //dol_syslog("Found module file ".$file." - module=".$module." - moduledirforclass=".$moduledirforclass);
-                
+
                 // Defined if module is enabled
                 $enabled=true;
                 if (empty($conf->$moduleforperm->enabled)) $enabled=false;
@@ -142,7 +144,7 @@ foreach ($modulesdir as $dir)
                         while (($file_searched = readdir($handle_part))!==false)
                         {
                             if ($file_searched == 'api_access.class.php') continue;
-                            
+
                             // Support of the deprecated API.
                             if (is_readable($dir_part.$file_searched) && preg_match("/^api_deprecated_(.*)\.class\.php$/i",$file_searched,$reg))
                             {
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
new file mode 100644
index 00000000000..ea0c218027f
--- /dev/null
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -0,0 +1,183 @@
+<?php
+/* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/RestAPIDocumentTest.php
+ *      \ingroup    test
+ *      \brief      PHPUnit test
+ *      \remarks    To run this script as CLI:  phpunit filename.php.
+ */
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/geturl.lib.php';
+
+if (empty($user->id)) {
+    echo "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+$conf->global->MAIN_UMASK = '0666';
+
+/**
+ * Class for PHPUnit tests.
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
+{
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+    protected $api_url;
+    protected $api_key;
+
+    /**
+     * Constructor
+     * We save global variables into local variables.
+     *
+     * @return DateLibTest
+     */
+    public function __construct()
+    {
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf = $conf;
+        $this->savuser = $user;
+        $this->savlangs = $langs;
+        $this->savdb = $db;
+
+        echo __METHOD__.' db->type='.$db->type.' user->id='.$user->id;
+        //print " - db ".$db->db;
+        echo "\n";
+    }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        echo __METHOD__."\n";
+    }
+
+    // tear down after class
+    public static function tearDownAfterClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->rollback();
+
+        echo __METHOD__."\n";
+    }
+
+    /**
+     * Init phpunit tests.
+     */
+    protected function setUp()
+    {
+        global $conf,$user,$langs,$db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $this->api_url = DOL_MAIN_URL_ROOT.'/api/index.php';
+
+        $login = 'admin';
+        $password = 'admin';
+        $url = $this->api_url.'/login?login='.$login.'&password='.$password;
+        // Call the API login method to save api_key for this test class
+        $result = getURLContent($url, 'GET', '', 1, array());
+        echo __METHOD__.' result = '.var_export($result, true)."\n";
+        echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
+        $this->assertEquals($result['curl_error_no'], '');
+        $object = json_decode($result['content'], true);
+        $this->assertNotNull($object, 'Parsing of json result must no be null');
+        $this->assertEquals('200', $object['success']['code']);
+
+        $this->api_key = $object['success']['token'];
+        echo __METHOD__." api_key: $this->api_key \n";
+
+        echo __METHOD__."\n";
+    }
+
+    /**
+     * End phpunit tests.
+     */
+    protected function tearDown()
+    {
+        echo __METHOD__."\n";
+    }
+
+    /**
+     * testRestReceiveDocument.
+     *
+     * @return int
+     */
+    public function testRestReceiveDocument()
+    {
+        global $conf,$user,$langs,$db;
+
+        $url = $this->api_url.'/documents/?api_key='.$this->api_key;
+
+        $fileName = 'img250x20.png';
+        $filePath = dirname(__FILE__).'/'.$fileName;
+        $mimetype = mime_content_type($filePath);
+      // Init Curl file object
+      // See https://wiki.php.net/rfc/curl-file-upload
+      $cfile = curl_file_create($filePath, $mimetype);
+
+        echo __METHOD__.' Request POST url='.$url."\n";
+
+      // Send to existant directory
+      $data = array(
+          'modulepart' => 'facture',
+          'file' => $cfile,
+          'refname' => 'AV1303-0003',
+          'name' => $fileName, // Name for destination
+          'type' => $mimetype, );
+
+        $result = getURLContent($url, 'POST', $data, 1);
+
+        echo __METHOD__.' Result for sending document: '.var_export($result, true)."\n";
+        echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
+        $this->assertEquals($result['curl_error_no'], '');
+        $this->assertEquals($result['content'], 'true');
+
+      // Send to unexistant directory
+      $data = array(
+          'modulepart' => 'facture',
+          'file' => $cfile,
+          'name' => 'AV1303-0003STSEIUDEISRESIJLEU/'.$fileName, // Name for destination
+          'type' => $mimetype, );
+
+        $result2 = getURLContent($url, 'POST', $data, 1);
+        echo __METHOD__.' Result for sending document: '.var_export($result2, true)."\n";
+        echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
+
+        $object = json_decode($result2['content'], true);
+        $this->assertNotNull($object, 'Parsing of json result must no be null');
+        $this->assertEquals('401', $object['error']['code']);
+    }
+}

From bfb628dab603020eeddd975062497998a462a7c3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Dec 2016 15:37:39 +0100
Subject: [PATCH 0051/1163] Code comment

---
 htdocs/user/class/user.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index d917b53078a..976379ff5e5 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2601,8 +2601,9 @@ class User extends CommonObject
 
 	/**
 	 * 	Return list of all child users id in herarchy (all sublevels).
+	 *  Note: Calling this function also reste full list of users into $this->users.
 	 *
-	 *	@return		array		      		  	Array of user id lower than user. This overwrite this->users.
+	 *	@return		array		      		  	Array of user id lower than user (all levels under user).
 	 *  @see get_children
 	 */
 	function getAllChildIds()

From 51eb3726dcf2745b2c9c5e7c81cacbdbc7a20212 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Dec 2016 15:41:31 +0100
Subject: [PATCH 0052/1163] Code comment

---
 htdocs/document.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/document.php b/htdocs/document.php
index 52b1584e7af..02eb7193675 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -109,7 +109,7 @@ if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
 $check_access = dol_check_secure_access_document($modulepart,$original_file,$entity,$refname);
 $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
-$original_file              = $check_access['original_file'];
+$original_file              = $check_access['original_file'];               // original_file is now a full path name
 
 // Basic protection (against external users only)
 if ($user->societe_id > 0)

From cdfbed5d084215994320f82bd98315373e018034 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Mon, 12 Dec 2016 17:36:22 +0100
Subject: [PATCH 0053/1163] new listview

---
 htdocs/core/class/class.listview.php       | 1216 ++++++++++++++++++++
 htdocs/inventory/class/inventory.class.php |   64 +-
 2 files changed, 1270 insertions(+), 10 deletions(-)
 create mode 100644 htdocs/core/class/class.listview.php

diff --git a/htdocs/core/class/class.listview.php b/htdocs/core/class/class.listview.php
new file mode 100644
index 00000000000..f37fc9a1628
--- /dev/null
+++ b/htdocs/core/class/class.listview.php
@@ -0,0 +1,1216 @@
+<?php
+/*
+ 
+ Copyright (C) 2013-2015 ATM Consulting <support@atm-consulting.fr>
+
+ This program and all files within this directory and sub directory
+ is free software: you can redistribute it and/or modify it under 
+ the terms of the GNU General Public License as published by the 
+ Free Software Foundation, either version 3 of the License, or any 
+ later version.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class Listview {
+	
+	function __construct( $id ) {
+			
+		$this->id = $id;
+		
+		$this->TTotalTmp=array();
+		
+		$this->sql = '';
+
+	}
+	private function init(&$TParam) {
+		
+		global $conf, $langs;
+		
+		if(!isset($TParam['hide']))$TParam['hide']=array();
+		if(!isset($TParam['link']))$TParam['link']=array();
+		if(!isset($TParam['type']))$TParam['type']=array();
+		if(!isset($TParam['orderby']['noOrder']))$TParam['orderby']['noOrder']=array();
+		if(!isset($TParam['no-select'])) $TParam['no-select'] = 1;
+		
+		if(!isset($TParam['liste']))$TParam['liste']=array();
+		$TParam['liste'] = array_merge(array(
+			'messageNothing'=>"Il n'y a aucun élément à afficher."
+			,'picto_precedent'=>'&lt;'
+			,'picto_suivant'=>'&gt;'
+			,'order_down'=>img_down()
+			,'order_up'=>img_up()
+			,'noheader'=>0
+			,'useBottomPagination'=>0
+			,'image'=>''
+			,'titre'=>'Liste'
+			,'orderDown'=>''
+			,'orderUp'=>''
+			,'id'=>$this->id
+			,'picto_search'=>img_picto('Search', 'search.png')
+			,'head_search'=>''
+			,'export'=>array()
+			,'view_type'=>''
+		),$TParam['liste']);
+		
+		if(empty($TParam['limit']))$TParam['limit']=array();
+		if(!empty($_REQUEST['TListTBS'][$this->id]['page'])) $TParam['limit']['page'] = $_REQUEST['TListTBS'][$this->id]['page'];
+		
+		$TParam['limit']=array_merge(array('page'=>1, 'nbLine'=>$conf->liste_limit, 'global'=>0), $TParam['limit']);
+		
+		if(!empty($_REQUEST['TListTBS'][$this->id]['orderBy'])) {
+			$TParam['orderBy'] = $_REQUEST['TListTBS'][$this->id]['orderBy']; 
+		}
+		
+	//	print_r($TParam);
+	}
+	private function getSearchNull($key, &$TParam) {
+		return !empty($TParam['search'][$key]['allow_is_null']);
+	} 
+	private function getSearchKey($key, &$TParam) {
+		
+		$TPrefixe=array();
+		if(!empty($TParam['search'][$key]['table'])) {
+			if (!is_array($TParam['search'][$key]['table'])) $TParam['search'][$key]['table'] = array($TParam['search'][$key]['table']);
+			
+			foreach ($TParam['search'][$key]['table'] as $prefix_table) {
+				$TPrefixe[] = '`'.$prefix_table.'`.'; 
+			}
+		}
+		
+		$TKey=array();
+		if(!empty($TParam['search'][$key]['field'])) {
+			if (!is_array($TParam['search'][$key]['field'])) $TParam['search'][$key]['field'] = array($TParam['search'][$key]['field']);
+			
+			foreach ($TParam['search'][$key]['field'] as $i => $field) {
+				$prefixe = !empty($TPrefixe[$i]) ? $TPrefixe[$i] : $TPrefixe[0];
+				$TKey[] = $prefixe.'`'. $field .'`';
+			}
+		} else {
+			$TKey[] =$TPrefixe[0].'`'. strtr($key,';','*').'`';
+		}
+		
+		return $TKey;
+	} 
+	private function getSearchValue($value) {
+		$value = strtr(trim($value),';','*');	
+			
+		return $value;
+	}
+	
+	private function dateToSQLDate($date) {
+		
+		list($dd,$mm,$aaaa) = explode('/', substr($date,0,10));
+		
+		$value = date('Y-m-d', mktime(0,0,0,$mm,$dd,$aaaa));
+		
+		return $value;
+	}
+	
+	private function addSqlFromTypeDate(&$TSQLMore, &$value, $sKey, $sBindKey)
+	{
+		if(is_array($value))
+		{
+			
+			unset($this->TBind[$sBindKey]);
+			// Si le type de "recherche" est "calendars" on a 2 champs de transmis, [début et fin] ou [que début] ou [que fin] => un BETWEEN Sql serait utile que dans le 1er cas 
+			// donc l'utilisation des opérateur >= et <= permettent un fonctionnement générique
+			$TSQLDate=array();
+			if(!empty($value['deb']))
+			{
+				$valueDeb = $this->dateToSQLDate($value['deb']);
+				
+				if(isset($this->TBind[$sBindKey.'_start'])) // TODO can't use this in query case
+				{
+					$this->TBind[$sBindKey.'_start'] = $valueDeb;
+				}
+				
+				$TSQLDate[]=$sKey." >= '".$valueDeb." 00:00:00'" ;
+				
+			}
+			
+			if(!empty($value['fin']))
+			{
+				$valueFin = $this->dateToSQLDate($value['fin']);
+				if(isset($this->TBind[$sBindKey.'_end'])) { // TODO can't use this in query case
+					$this->TBind[$sBindKey.'_end'] = $valueFin;
+				}
+				
+				$TSQLDate[]=$sKey." <= '".$valueFin." 23:59:59'" ;	
+				
+			}
+			
+			if(!empty($TSQLDate)) $TSQLMore[] = implode(' AND ', $TSQLDate);
+		}
+		else
+		{
+			// Sinon je communique une date directement au format d/m/Y et la méthode du dessous reformat en Y-m-d
+			$value = $this->dateToSQLDate($value);
+			if(isset($this->TBind[$sBindKey]))
+			{
+				$this->TBind[$sBindKey] = $value;
+			}
+			else
+			{
+				// Le % en fin de chaine permet de trouver un resultat si le contenu est au format Y-m-d H:i:s et non en Y-m-d
+				$TSQLMore[]=$sKey." LIKE '".$value."%'" ;
+			}
+		}
+	}
+	
+	private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $sBindKey, $key)
+	{
+	
+		$value = $this->getSearchValue($value);
+		
+		if(isset($TParam['operator'][$key]))
+		{
+			if($TParam['operator'][$key] == '<' || $TParam['operator'][$key] == '>' || $TParam['operator'][$key]=='=')
+			{
+				$TSQLMore[] = $sKey . ' ' . $TParam['operator'][$key] . ' "' . $value . '"';
+			}
+			elseif ($TParam['operator'][$key]=='IN')
+			{
+				$TSQLMore[] = $sKey . ' ' . $TParam['operator'][$key] . ' (' . $value . ')';
+			}
+			else
+			{
+				if(strpos($value,'%')===false) $value = '%'.$value.'%';
+				$TSQLMore[]=$sKey." LIKE '".addslashes($value)."'" ;
+			}
+		}
+		else
+		{
+			if(strpos($value,'%')===false) $value = '%'.$value.'%';
+			$TSQLMore[]=$sKey." LIKE '".addslashes($value)."'" ;
+		}
+		
+	
+	}
+
+	private function search($sql,&$TParam) {
+	
+		if(!empty($_REQUEST['TListTBS'][$this->id]['search'])) {
+			$sqlGROUPBY='';
+			if(strpos($sql,'GROUP BY')!==false) { //TODO regex
+				list($sql, $sqlGROUPBY) = explode('GROUP BY', $sql);
+			}
+			
+			if(strpos($sql,'WHERE ')===false)$sql.=' WHERE 1 '; //TODO regex
+			
+			foreach($_REQUEST['TListTBS'][$this->id]['search'] as $key=>$value)
+			{
+				$TsKey = $this->getSearchKey($key, $TParam);
+				$TsBindKey = $this->getTsBindKey($TsKey);
+				
+				//if (!empty($value)) var_dump($TsKey, $TsBindKey, '==================================');
+				$TSQLMore = array();
+				
+				$allow_is_null = $this->getSearchNull($key,$TParam);
+				$search_on_null = false; //TODO useless
+				
+				foreach ($TsKey as $i => &$sKey)
+				{
+					//if (!empty($value)) var_dump($sKey);
+					$sBindKey = $TsBindKey[$i];
+					
+					if($allow_is_null && !empty($_REQUEST['TListTBS'][$this->id]['search_on_null'][$key]))
+					{
+						$this->TBind[$sBindKey.'_null'] = $sKey.' IS NULL ';
+						$TSQLMore[] = $sKey.' IS NULL ';
+						$search_on_null = true;
+						
+						if(isset($this->TBind[$sBindKey])) $this->TBind[$sBindKey]= '';
+						$value = '';
+					}
+					elseif($allow_is_null)
+					{
+						$this->TBind[$sBindKey.'_null'] =0; // $sKey.' IS NOT NULL ';
+						//$TSQLMore[] =  $sKey.' IS NOT NULL ';
+					}
+					
+					if($value!='') { // pas empty car biensûr le statut = 0 existe dans de nombreux cas
+						
+						if(isset($TParam['type'][$key]) && ($TParam['type'][$key]==='date' || $TParam['type'][$key]==='datetime'))
+						{
+							$this->addSqlFromTypeDate($TSQLMore, $value, $sKey, $sBindKey);
+						}
+						else
+						{
+							$this->addSqlFromOther($TSQLMore, $value, $TParam, $sKey, $sBindKey, $key);
+						}
+					}
+				}
+
+				if(!isset($this->TBind[$sBindKey]) && !empty($TSQLMore))
+				{
+					$sql.=' AND ( '.implode(' OR ',$TSQLMore).' ) ';
+				}
+				
+			}
+			
+			if($sqlGROUPBY!='')	$sql.=' GROUP BY '.$sqlGROUPBY;
+			
+		}
+
+		
+		return $sql;
+	}
+
+	private function getViewType(&$TParam) {
+		if(!empty($TParam['view_type'])) return $TParam['view_type']; 
+		else if (is_string($TParam['type']))return $TParam['type'] ;
+		else return 'list';
+	}
+
+	public function render(&$db,$sql,$TParam=array(),$TBind=array()) {
+		$this->typeRender = 'sql';
+	//		print_r($TParam);
+		$TEntete=array();
+		$TChamps=array();	
+		
+		$this->init($TParam);
+		
+		if(!empty($TBind)) $this->TBind = $TBind;
+		
+		$sql = $this->search($sql,$TParam);
+		$sql = $this->order_by($sql, $TParam);		
+		
+		$this->parse_sql($db, $TEntete, $TChamps, $TParam, $sql);	
+		
+		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
+		
+		$view_type = $this->getViewType($TParam);
+				
+		if($view_type == 'raw') {
+			return $this->renderRAW($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);
+		}
+		else if($view_type == 'chart') {
+			return $this->renderChart($TEntete, $TChamps,$TTotal, $TParam);	
+		}
+		else {
+			return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);	
+		}
+		
+		
+	}
+	public function renderDataTableAjax(&$db,$sql,$TParam=array()) {
+		$this->renderDataTableSQL($db, $sql, $TParam);
+	}
+	public function renderDataTableSQL(&$db,$sql,$TParam=array()) {
+		$this->typeRender = 'dataTableAjax';
+	//		print_r($TParam);
+		$TEntete=array();
+		$TChamps=array();	
+		
+		$this->init($TParam);
+		
+		$sql = $this->search($sql,$TParam);
+		$sql = $this->order_by($sql, $TParam);		
+		
+		$this->parse_sql($db, $TEntete, $TChamps, $TParam, $sql);	
+		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
+		
+		return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);
+		
+	}
+	public function renderXML(&$db,$xmlString, $TParam=array()) {
+		$this->typeRender = 'xml';
+		
+		$TEntete=array();
+		$TChamps=array();	
+		
+		$this->init($TParam);
+		
+		$this->parse_xml($db, $TEntete, $TChamps, $TParam,$xmlString);
+		
+		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
+		
+		return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);
+		
+	}
+	private function setSearch(&$TEntete, &$TParam) {
+		global $langs;
+		
+		if(empty($TParam['search'])) return array();
+		
+		$TSearch=array();
+		$form=new TFormCore;
+		$form->strict_string_compare = true;
+		
+		$nb_search_in_bar = 0;
+		
+		if(!empty($TParam['search'])) {
+			foreach($TEntete as $key=>$libelle) { // init
+				if(empty($TSearch[$key]))$TSearch[$key]='';
+			}
+		}		
+		foreach($TParam['search'] as $key=>$param_search) {
+			
+		
+			$value = isset($_REQUEST['TListTBS'][$this->id]['search'][$key]) ? $_REQUEST['TListTBS'][$this->id]['search'][$key] : '';
+			
+			$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search;  
+			
+			if(is_array($typeRecherche)) {
+				$typeRecherche = array(''=>' ') + $typeRecherche;
+				$fsearch=$form->combo('','TListTBS['.$this->id.'][search]['.$key.']', $typeRecherche,$value,0,'',' listviewtbs="combo" init-value="'.$value.'" ');
+			}
+			else if($typeRecherche==='calendar') {
+				$fsearch=$form->calendrier('','TListTBS['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
+			}
+			else if($typeRecherche==='calendars') {
+				$fsearch=$form->calendrier('','TListTBS['.$this->id.'][search]['.$key.'][deb]',isset($value['deb'])?$value['deb']:'',10,10,' listviewtbs="calendars" ')
+					.' '.$form->calendrier('','TListTBS['.$this->id.'][search]['.$key.'][fin]',isset($value['fin'])?$value['fin']:'',10,10,' listviewtbs="calendars" ');	
+			}
+			else if(is_string($typeRecherche)) {
+				$fsearch=$TParam['search'][$key];	
+			}
+			else {
+				$fsearch=$form->texte('','TListTBS['.$this->id.'][search]['.$key.']',$value,15,255,' listviewtbs="input" ');	
+			}
+
+			if(!empty($param_search['allow_is_null'])) {
+				$valueNull = isset($_REQUEST['TListTBS'][$this->id]['search_on_null'][$key]) ? 1 : 0;
+				$fsearch.=' '.$form->checkbox1('', 'TListTBS['.$this->id.'][search_on_null]['.$key.']',1, $valueNull,' onclick=" if($(this).is(\':checked\')){ $(this).prev().val(\'\'); }" ').img_help(1, $langs->trans('SearchOnNUllValue'));
+			}
+			
+
+			if(!empty($TEntete[$key]) || $this->getViewType($TParam) == 'chart') {
+				$TSearch[$key] = $fsearch;
+				$nb_search_in_bar++;
+			}
+			else {
+				
+				$libelle = !empty($TParam['title'][$key]) ? $TParam['title'][$key] : $key ;
+				$TParam['liste']['head_search'].='<div>'.$libelle.' '.$fsearch.'</div>';	
+			}
+				
+		}
+		
+		$search_button = ' <a href="#" onclick="TListTBS_submitSearch(this);" class="list-search-link">'.$TParam['liste']['picto_search'].'</a>';
+
+		if(!empty($TParam['liste']['head_search'])) {
+			$TParam['liste']['head_search'].='<div align="right">'.$langs->trans('Search').' '.$search_button.'</div>';
+		}
+		
+		if($nb_search_in_bar>0) {
+			end($TSearch);
+			list($key,$v) = each($TSearch);
+			$TSearch[$key].=$search_button;
+		}
+		else{
+			$TSearch=array();
+		}
+		
+		return $TSearch;
+	}
+
+	/*
+	 * Function analysant et totalisant une colonne
+	 * Supporté : sum, average
+	 */
+	private function get_total(&$TChamps, &$TParam) {
+		$TTotal=$TTotalGroup=array();	
+		
+		if(!empty($TParam['math']) && !empty($TChamps[0])) {
+			
+			foreach($TChamps[0] as $field=>$value) {
+				$TTotal[$field]='';	
+				$TTotalGroup[$field] = '';
+			}
+		
+			foreach($TParam['math'] as $field=>$typeMath){
+
+				if(is_array($typeMath)) {
+					$targetField = $typeMath[1];
+					$typeMath = $typeMath[0];
+				}
+				else {
+					$targetField = $field;
+				}
+
+				if($typeMath == 'groupsum') {
+					$TTotalGroup[$field] = array('target'=>$targetField, 'values'=> $this->TTotalTmp['@groupsum'][$targetField]);
+					
+				}
+				else if($typeMath=='average') {
+					$TTotal[$field]=array_sum($this->TTotalTmp[$targetField]) / count($this->TTotalTmp[$targetField]);
+				}
+				elseif($typeMath=='count') {
+					$TTotal[$field]=count($this->TTotalTmp[$targetField]);
+				}
+				else {
+					$TTotal[$field]=array_sum($this->TTotalTmp[$targetField]);	
+				}
+								
+			}
+			
+		
+		}
+		
+		return array($TTotal,$TTotalGroup);
+	}
+
+	private function getJS(&$TParam) {
+		$javaScript = '<script language="javascript">
+		if(typeof(TListTBS_include)=="undefined") {
+			document.write("<script type=\"text/javascript\" src=\"'.COREHTTP.'includes/js/list.tbs.js\"></scr");
+	  		document.write("ipt>");
+		}
+		</script>';
+
+
+		if($this->typeRender=='dataTable') {
+			
+			$javaScript.='<!-- datatable  -->
+			<script language="javascript">
+					
+					if(typeof(TListTBS_dataTable_include)=="undefined") {
+						var TListTBS_dataTable_include=true;	
+						document.write("<script type=\"text/javascript\" src=\"'.COREHTTP.'includes/js/dataTable/js/jquery.dataTables.min.js\"></scr");
+			  			document.write("ipt>");
+						document.write("<link rel=\"stylesheet\" href=\"'.COREHTTP.'includes/js/dataTable/css/jquery.dataTables.css\" />");
+					}
+			
+					$(document).ready(function () {
+						$("#'.$this->id.'").wrap("<div id=\"'.$this->id.'_datatable_container\">");	
+						$("#'.$this->id.'").dataTable({
+					        "sPaginationType": "full_numbers"
+					        ,"aLengthMenu": [['.$TParam['limit']['nbLine'].',-1], ['.$TParam['limit']['nbLine'].', "All"]]
+					        ,"iDisplayLength" : '.$TParam['limit']['nbLine'].'
+					    });
+					}); 
+			</script>';
+			
+			$TPagination=array();
+		}
+		elseif($this->typeRender=='dataTableAjax') {
+			$javaScript.='<!-- datatable  -->
+			<script language="javascript">
+			
+					if(typeof(TListTBS_dataTable_include)=="undefined") {
+						var TListTBS_dataTable_include=true;
+						document.write("<script type=\"text/javascript\" src=\"'.COREHTTP.'includes/js/dataTable/js/jquery.dataTables.min.js\"></scr");
+			  			document.write("ipt>");
+						document.write("<link rel=\"stylesheet\" href=\"'.COREHTTP.'includes/js/dataTable/css/jquery.dataTables.css\" />");
+					}
+			
+					$(document).ready(function () {
+						$("#'.$this->id.'").wrap("<div id=\"'.$this->id.'_datatable_container\">");	
+						var oTable = $("#'.$this->id.'").dataTable({
+					        "sPaginationType": "full_numbers"
+					        ,"iDisplayLength" : '.$TParam['limit']['nbLine'].'
+					        ,"sPaginationType": "full_numbers"
+					        ,"oLanguage": {
+								"sSearch": "Recherche globale :"
+								/*,"sUrl": "media/language/de_DE.txt" pour depuis un fichier */
+							}
+					    });
+						
+						
+						/* Ajoute du filtre via la recherche sur colonne */
+					    $("#'.$this->id.' thead tr.barre-recherche td").each( function ( i ) {
+					        $("select", this).change( function () {
+					            oTable.fnFilter( $(this).val(), i );
+					        } );
+					        $("input", this).keyup( function () {
+					            oTable.fnFilter( $(this).val(), i );
+					        } );
+							
+					    } );
+						
+					}); 
+			</script>';
+		}
+		
+		return $javaScript;
+	}
+
+	private function setExport(&$TParam,$TChamps,$TEntete) {
+		global $langs;
+		
+		$Tab=array();
+		if(!empty($TParam['export'])) {
+			$token = GETPOST('token');
+			if(empty($token)) $token = md5($this->id.time().rand(1,9999));
+
+			$_SESSION['token_list_'.$token] = gzdeflate( serialize( array(
+				'title'=>$this->title
+				,'sql'=>$this->sql
+				,'TBind'=>$this->TBind
+				,'TChamps'=>$TChamps
+				,'TEntete'=>$TEntete
+			) ) );
+
+			foreach($TParam['export'] as $mode_export) {
+				
+				$Tab[] = array(
+						'label'=>$langs->trans('Export'.$mode_export)
+						,'url'=>dol_buildpath('/abricot/downlist.php',1)
+						,'mode'=>$mode_export
+						,'token'=>$token
+						,'session_name'=>session_name()
+				);
+				
+			}
+			
+		}
+		
+		
+		return $Tab;
+	}
+
+	private function renderChart(&$TEntete, &$TChamps,&$TTotal, &$TParam) {
+		
+		$TData = array();
+		$header = '';
+		$first = true;
+		
+		$TSearch = $this->setSearch($TEntete, $TParam);
+		$TExport= $this->setExport($TParam, $TChamps, $TEntete);
+		
+		if(empty($TParam['xaxis']) && !empty($TEntete)) {
+			$fieldXaxis = key($TEntete);
+		}
+		else {
+			$fieldXaxis = $TParam['xaxis'];
+		}
+		
+		$TValue=array(); $key = null;
+		foreach($TEntete as $field=>&$entete) {
+			if($field!=$fieldXaxis)$TValue[] = addslashes($entete['libelle']);
+		}
+
+		$header='["'.addslashes( $TEntete[$fieldXaxis]['libelle'] ).'","'.implode('","', $TValue).'"]';
+		//var_dump($fieldXaxis, $TChamps);
+		foreach($TChamps as &$row) {
+			$TValue=array();
+			$key = null;
+			
+			foreach($row as $k=>$v) {
+				
+				if($k == $fieldXaxis) {
+					$key = $v;
+				}
+				else {
+					$TValue[] = (float)$v;
+				}
+				
+			}
+
+			if(!is_null($key)) {
+				if(!isset($TData[$key])) $TData[$key] = $TValue;
+				else {
+					foreach($TData[$key] as $k=>$v) {
+						$TData[$key][$k]+=(float)$TValue[$k];
+					}
+					
+				}
+			}
+			
+			
+		}
+		
+		$data = $header;
+		foreach($TData as $key=>$TValue) {
+			
+			$data .= ',[ "'.$key.'", ';
+			foreach($TValue as $v) {
+				$data.=(float)$v.',';
+			}
+			
+			$data.=' ]';
+		}
+		
+		$height = empty($TParam['height']) ? 500 : $TParam['height'];
+		$curveType= empty($TParam['curveType']) ? 'none': $TParam['curveType']; // none or function
+		$pieHole =  empty($TParam['pieHole']) ? 0: $TParam['pieHole']; // none or function
+		$hAxis = empty($TParam['hAxis']) ? array() : $TParam['hAxis']; // Array of params
+		$vAxis = empty($TParam['vAxis']) ? array() : $TParam['vAxis']; // Array of params
+		
+		// This feature is experimental and may change in future releases
+		$explorer = empty($TParam['explorer']) ? array() : $TParam['explorer']; // Note: The explorer only works with continuous axes (such as numbers or dates)
+		
+		$type = empty($TParam['chartType']) ? 'LineChart' : $TParam['chartType'];
+		
+		$html = '';
+		
+		if(!empty($TSearch)) {
+			
+			$html.='<table class="border searchbox">';
+			foreach($TSearch as $field=>$input) {
+				if(!empty($input)) {
+					$label = !empty($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
+					$html.='<tr><td>'.$label.'</td><td>'.$input.'</td></tr>';	
+				}
+			}
+			
+			$html.='</table>';
+			
+		}
+		$javaScript = $this->getJS($TParam);
+		
+		$html.='<script type="text/javascript" src="https://www.google.com/jsapi"></script>
+		<script type="text/javascript">
+		  
+		  	  google.load("visualization", "1", {"packages":["corechart"]});
+		      google.setOnLoadCallback(drawChart'.$this->id.');
+			
+			  function drawChart'.$this->id.'() {
+		        var data = google.visualization.arrayToDataTable([
+		          '.$data.'
+		        ]);
+	
+		        var options = {
+		          title: "'.addslashes($TParam['liste']['titre']).'"
+		          '.(!empty($curveType) ? ',curveType: "'.$curveType.'"' : '' ).'
+		          ,legend: { position: "bottom" }
+				  ,animation: { "startup": true }
+				  '.(!empty($explorer) ? ',explorer: '.json_encode($explorer) : '').'
+				  ,height : '.$height.'
+				  ,hAxis: '.json_encode($hAxis).'
+				  ,vAxis: '.json_encode($vAxis).'
+				  '.( $type == 'PieChart' && !empty($pieHole) ? ',pieHole: '.$pieHole : '').'
+				  '.( $type == 'AreaChart' ? ',isStacked: \'percent\'' : '').'
+		        };
+
+		        var chart = new google.visualization.'.$type.'(document.getElementById("div_query_chart'.$this->id.'"));
+		
+		        chart.draw(data, options);
+		      }
+		  
+	    </script>
+		<div id="div_query_chart'.$this->id.'"></div>
+		'.$javaScript; 
+		
+		return $html;
+	}
+
+	private function addTotalGroup($TChamps,$TTotalGroup) {
+		global $langs;
+		
+		$Tab=array();
+		
+		$proto_total_line = array();
+		
+		$tagbase = $old_tagbase = null;
+		
+		$addGroupLine = false;
+		
+		foreach($TChamps as $k=>&$line) {
+				
+			if(empty($proto_total_line)) {
+				foreach($line as $field=>$value) {
+					$proto_total_line[$field] = '';
+				}
+				$group_line = $proto_total_line;	
+			}
+			
+			$addGroupLine = false;
+			
+			$tagbase = '';
+			foreach($line as $field=>$value) {
+				
+				if(!empty($TTotalGroup[$field])) {
+					$tagbase.=$value.'|';
+					$group_line[$field] = '<div style="text-align:right; font-weight:bold; color:#552266;">'.(empty($value) ? $langs->trans('Empty') : $value ).' : </div>';
+					$group_line[$TTotalGroup[$field]['target']] = '<div style="text-align:right; font-weight:bold; color:#552266;">'.price($TTotalGroup[$field]['values'][$value]).'</div>';
+					$addGroupLine = true;
+				}
+				
+			}
+			
+			if(!is_null($old_tagbase) && $old_tagbase!=$tagbase && $addGroupLine) {
+			//	var_dump(array($k,$tagbase,$old_tagbase,$empty_line));
+				$Tab[] = $previous_group_line;
+			}
+			
+			$old_tagbase = $tagbase;
+			$previous_group_line = $group_line;
+			$group_line = $proto_total_line;
+			
+			$Tab[] = $line;
+			
+			
+			
+		}
+		if($addGroupLine) {
+			$Tab[] = $previous_group_line;
+		}
+		
+		
+		return $Tab;
+	}
+
+	private function renderRAW(&$TEntete, &$TChamps, &$TTotal,&$TTotalGroup, &$TParam) {
+		$TSearch = $this->setSearch($TEntete, $TParam);
+		$TExport=$this->setExport($TParam, $TChamps, $TEntete);
+		$TChamps = $this->addTotalGroup($TChamps,$TTotalGroup);
+		
+		return array(
+				'entete'=>$TEntete
+				,'champs'=>$TChamps
+				,'recherche'=>$TSearch
+				,'total'=>$TTotal
+				,'export'=>$TExport
+				,'haveExport'=>count($TExport)
+				, 'id'=>$this->id
+				, 'nb_columns'=>count($TEntete) 
+				,'totalNB'=>count($TChamps)
+				, 'nbSearch'=>count($TSearch)
+				, 'haveTotal'=>(int)!empty($TTotal)
+				, 'havePage'=>(int)!empty($TPagination) 
+		);
+	}
+	
+	private function renderList(&$TEntete, &$TChamps, &$TTotal,&$TTotalGroup, &$TParam) {
+		$TBS = new TTemplateTBS;
+		
+		$javaScript = $this->getJS($TParam);
+		
+		if($this->typeRender!='dataTableAjax') {
+			$TPagination=array(
+				'pagination'=>array('pageSize'=>$TParam['limit']['nbLine'], 'pageNum'=>$TParam['limit']['page'], 'blockName'=>'champs', 'totalNB'=>count($TChamps))
+			);
+		}
+		else {
+			$TPagination=array();
+		}
+		
+		$TSearch = $this->setSearch($TEntete, $TParam);
+		$TExport=$this->setExport($TParam, $TChamps, $TEntete);
+		$TChamps = $this->addTotalGroup($TChamps,$TTotalGroup);
+		
+		return $TBS->render($this->template
+			, array(
+				'entete'=>$TEntete
+				,'champs'=>$TChamps
+				,'recherche'=>$TSearch
+				,'total'=>$TTotal
+				,'export'=>$TExport
+			)
+			, array(
+				'liste'=>array_merge(array('haveExport'=>count($TExport), 'id'=>$this->id, 'nb_columns'=>count($TEntete) ,'totalNB'=>count($TChamps), 'nbSearch'=>count($TSearch), 'haveTotal'=>(int)!empty($TTotal), 'havePage'=>(int)!empty($TPagination) ), $TParam['liste'])
+			)
+			, $TPagination
+			, array()
+		)
+		.$javaScript;
+	}
+	public function renderDatatable(&$db, $TField, $TParam) {
+		$this->typeRender = 'dataTable';
+		// on conserve db pour le traitement ultérieur des subQuery
+		$TEntete=array();
+		$TChamps=array();	
+		
+		//$TParam['limit']['nbLine'] = 99999;
+		
+		$this->init($TParam);
+		
+		$this->parse_array($TEntete, $TChamps, $TParam,$TField);
+		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
+		return $this->renderList($TEntete, $TChamps, $TTotal,$TTotalGroup,$TParam);
+		
+	}
+	public function renderArray(&$db,$TField, $TParam=array()) {
+		$this->typeRender = 'array';
+		// on conserve db pour le traitement ultérieur des subQuery
+		$TEntete=array();
+		$TChamps=array();	
+		
+		$this->init($TParam);
+		
+		$this->parse_array($TEntete, $TChamps, $TParam,$TField);
+		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
+		
+		$view_type = $this->getViewType($TParam);
+		
+		if($view_type == 'raw') {
+			return $this->renderRAW($TEntete, $TChamps,$TTotal, $TParam);
+		}
+		if($view_type == 'chart') {
+			return $this->renderChart($TEntete, $TChamps,$TTotal, $TParam);	
+		}
+		else {
+			return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);	
+		}
+	}
+
+	private function order_by($sql, &$TParam) {
+		$first = true;	
+		//	print_r($TParam['orderBy']);
+		if(!empty($TParam['orderBy'])) {
+			
+			if(strpos($sql,'LIMIT ')!==false) {
+				list($sql, $sqlLIMIT) = explode('LIMIT ', $sql);
+			}
+			
+			$sql.=' ORDER BY '; 
+			foreach($TParam['orderBy'] as $field=>$order) {
+				if(!$first) $sql.=',';
+				
+				if($order=='DESC')$TParam['liste']['orderDown'] = $field;
+				else $TParam['liste']['orderUp'] = $field;
+				
+				if(strpos($field,'.')===false)	$sql.='`'.$field.'` '.$order;
+				else $sql.=$field.' '.$order;
+				
+				$first=false;
+			}
+			
+			if(!empty($sqlLIMIT))$sql.=' LIMIT '.$sqlLIMIT;
+			
+		}
+		
+		return $sql;
+	}
+	private function parse_xml(&$db, &$TEntete, &$TChamps, &$TParam, $xmlString) {
+		$xml = simplexml_load_string($xmlString); 
+		 $this->THideFlip = array_flip($TParam['hide']);
+
+		$first=true;
+		foreach($xml->{$TParam['node']['main']}->{$TParam['node']['object']} as $node) {
+			if($first) {
+				$this->init_entete($TEntete, $TParam, $node);
+				$first=false;
+			}	
+			
+			$this->set_line($TChamps, $TParam, $node);
+		}		
+
+	}
+	private function parse_array(&$TEntete, &$TChamps, &$TParam, $TField) {
+		$first=true;
+		
+		 $this->THideFlip = array_flip($TParam['hide']);
+		$this->TTotalTmp=array();
+		
+		if(empty($TField)) return false;
+		
+		foreach($TField as $row) {
+			if($first) {
+				$this->init_entete($TEntete, $TParam, $row);
+				$first=false;
+			}	
+			
+			$this->set_line($TChamps, $TParam, $row);
+		}		
+
+	}
+	
+	private function init_entete(&$TEntete, &$TParam, $currentLine) {
+		
+		$TField=$TFieldVisibility=array();
+		
+		foreach ($currentLine as $field => $value) {
+			$TField[$field]=true;
+		}
+		
+		global $user;
+		
+		$contextpage=md5($_SERVER['PHP_SELF']);
+		if((float)DOL_VERSION>=4.0 && empty($TParam['no-select'])) {
+			
+			dol_include_once('/core/class/html.form.class.php');
+			
+			global $db,$conf,$user;
+			$form=new Form($db);
+				
+			$selectedfields = GETPOST('TListTBS_'.$this->id.'_selectedfields');
+			
+			if(!empty($selectedfields)) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+				$tabparam['MAIN_SELECTEDFIELDS_'.$contextpage]=$selectedfields;
+	    		$result=dol_set_user_param($db, $conf, $user, $tabparam);
+			}
+			
+			$tmpvar='MAIN_SELECTEDFIELDS_'.$contextpage;
+			if (! empty($user->conf->$tmpvar)) {
+				$tmparray=explode(',', $user->conf->$tmpvar);
+				$TParam['hide']=array();
+		        foreach($TField as $field=>$dummy)
+		        {
+		          	$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
+
+					if(!in_array($field,$tmparray)) {
+				  		$TParam['hide'][] = $field;
+						$visible = 0;
+				  	}
+					else{
+						$visible = 1;
+					}
+		            
+					$TFieldVisibility[$field]=array(
+						'label'=>$libelle
+						,'checked'=>$visible
+					);
+					
+					
+		        }
+			}
+			else{
+				foreach($TField as $field=>$dummy)
+		        {
+		        	$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
+					$visible = (!in_array($field,$TParam['hide'])) ? 1 : 0;	
+					$TFieldVisibility[$field]=array(
+						'label'=>$libelle
+						,'checked'=>$visible
+					);
+				}
+			}	
+
+			$selectedfields=$form->multiSelectArrayWithCheckbox('TListTBS_'.$this->id.'_selectedfields', $TFieldVisibility, $contextpage);	// This also change content of $arrayfields_0
+			
+		}
+		
+		foreach ($currentLine as $field => $value) {
+			$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
+			$visible = (!in_array($field,$TParam['hide'])) ? 1 : 0;	
+			
+			if($visible) {
+				$lastfield = $field;
+				$TEntete[$field] = array(
+					'libelle'=>$libelle
+					,'order'=>((in_array($field, $TParam['orderby']['noOrder']) || $this->typeRender != 'sql') ? 0 : 1)
+					,'width'=>(!empty($TParam['size']['width'][$field]) ? $TParam['size']['width'][$field] : 'auto')
+					,'text-align'=>(!empty($TParam['position']['text-align'][$field]) ? $TParam['position']['text-align'][$field] : 'auto')
+					,'more'=>''
+				);
+				  
+			}
+		}
+		
+		if(!empty($selectedfields) && !empty($lastfield)) {
+			$TEntete[$lastfield]['more']='<div style="float:right">'.$selectedfields.'</div>';
+		}
+		
+		
+		/*if(!empty($TParam['search']) && !empty($TEntete)) {
+			$TEntete['actions']=array('libelle'=>'<!-- actions -->', 'order'=>0);
+		}*/
+		
+	}
+	
+	private function in_view(&$TParam, $line_number) {
+		global $conf;
+//		var_dump($_REQUEST['get-all-for-export']);
+		if(!empty($_REQUEST['get-all-for-export'])) return true; // doit être dans la vue
+
+		$page_number = !empty($TParam['limit']['page']) ? $TParam['limit']['page'] : 1;
+		$line_per_page = !empty($TParam['limit']['nbLine']) ? $TParam['limit']['nbLine'] : $conf->liste_limit;
+		
+		$start = ($page_number-1) * $line_per_page;
+		$end = ($page_number* $line_per_page) -1;
+		
+		if($line_number>=$start && $line_number<=$end) return true;
+		else return false;
+	}
+	
+	private function set_line(&$TChamps, &$TParam, $currentLine) {
+		
+			global $conf;
+		
+			$line_number = count($TChamps);
+			
+			if($this->in_view($TParam,$line_number)) {
+				
+				$row=array(); $trans = array();
+				foreach($currentLine as $field=>$value) {
+					
+					if(is_object($value)) {
+						if(get_class($value)=='stdClass') {$value=print_r($value, true);}
+						else $value=(string)$value;
+					} 
+					
+					if(isset($TParam['subQuery'][$field])) {
+						$dbSub = new TPDOdb; //TODO finish it
+						$dbSub->Execute( strtr($TParam['subQuery'][$field], array_merge( $trans, array('@val@'=>$value)  )) );
+						$subResult = '';
+						while($dbSub->Get_line()) {
+							$subResult.= implode(', ',$dbSub->currentLine).'<br />';
+						}
+						$value=$subResult;
+						$dbSub->close();
+					}
+					
+					$trans['@'.$field.'@'] = $value;
+					
+					if(!empty($TParam['math'][$field])) {
+						$float_value = (double)strip_tags($value);
+						$this->TTotalTmp[$field][] = $float_value;
+					}
+					
+					if(!in_array($field,$TParam['hide'])) {
+						$row[$field]=$value;
+						
+						if(isset($TParam['eval'][$field]) && in_array($field,array_keys($row))) {
+							$strToEval = 'return '.strtr( $TParam['eval'][$field] ,  array_merge( $trans, array('@val@'=>$row[$field])  )).';';
+							$row[$field] = eval($strToEval);
+						}
+						
+						if(isset($TParam['type'][$field]) && !isset($TParam['eval'][$field])) {
+							if($TParam['type'][$field]=='date' 
+								|| $TParam['type'][$field]=='datetime' ) {
+
+								if($row[$field] != '0000-00-00 00:00:00' && $row[$field] != '1000-01-01 00:00:00' && $row[$field] != '0000-00-00' && !empty($row[$field])) {
+									if($TParam['type'][$field]=='datetime')$row[$field] = dol_print_date(strtotime($row[$field]),'dayhoursec');
+									else $row[$field] = dol_print_date(strtotime($row[$field]),'day');
+								} else {
+									$row[$field] = '';
+								}
+							}
+							if($TParam['type'][$field]=='hour') { $row[$field] = date('H:i', strtotime($row[$field])); }
+							if($TParam['type'][$field]=='money') { $row[$field] = '<div align="right">'.price($row[$field],0,'',1,-1,2).'</div>'; }
+							if($TParam['type'][$field]=='number') { $row[$field] = '<div align="right">'.price($row[$field]).'</div>'; }
+							if($TParam['type'][$field]=='integer') { $row[$field] = '<div align="right">'.(int)$row[$field].'</div>'; }
+						}
+	
+	                                        if(isset($TParam['link'][$field])) {
+	                                                if(empty($row[$field]) && $row[$field]!==0 && $row[$field]!=='0')$row[$field]='(vide)';
+	                                                $row[$field]= strtr( $TParam['link'][$field],  array_merge( $trans, array('@val@'=>$row[$field])  )) ;
+	                                        }
+	                                        
+	                                        if(isset($TParam['translate'][$field])) {
+							if(isset($TParam['translate'][$field][''])) unset($TParam['translate'][$field]['']);
+	                                                $row[$field] = strtr( $row[$field] , $TParam['translate'][$field]);
+	                                        }
+	
+	
+					} 
+					
+					
+				} 
+			}
+			else{
+				$row=array(); 
+
+				foreach($currentLine as $field=>&$value) {
+					if(!isset($this->THideFlip[$field])) {
+						if(isset($TParam['math'][$field]) && !empty($TParam['math'][$field])) {
+							$float_value = (double)strip_tags($value);
+							$this->TTotalTmp[$field][] = $float_value;
+						}
+						
+						$row[$field] = $value;
+					}
+				}
+			}
+
+			if(!empty($TParam['math'][$field])) {
+			foreach($row as $field=>$value) {
+				if(!empty($TParam['math'][$field]) && is_array($TParam['math'][$field])) {
+						$toField = $TParam['math'][$field][1];
+						$float_value = (double)strip_tags($row[$toField]);
+						$this->TTotalTmp['@groupsum'][$toField][ $row[$field]  ] +=$float_value;
+						
+				}
+			}
+			}
+			$TChamps[] = $row;	
+	}
+	
+	private function getBind(&$TParam) {
+		
+		$TBind = array();
+		foreach($this->TBind as $k=>$v) {
+			if(!empty($TParam['operator'][$k]) && $TParam['operator'][$k] == 'IN') {
+				
+				if($v==='')$TBind[$k] =array("'0'");
+				else $TBind[$k] =explode(',', $v);
+				
+			}
+			else{
+				$TBind[$k] = $v;
+			}
+			
+		}
+		
+		return $TBind;
+	}
+	
+	private function getSQL(&$PDOdb,$sql,&$TParam) {
+		global $user,$conf;
+
+		$sql=strtr($sql,array(
+			'@current_user@'=>$user->id
+		));
+
+		//AA oui c'est moche mais le bindParam ne prends pas en compte les tableaux pour le IN ce qui est super pénalisant. En attendant de refaire mieux ou d'un coup de main
+		$TBind = $this->getBind($TParam);
+		
+		$sql = preg_replace_callback('/(:[a-z])\w+/i',function($matches) use($TBind,$PDOdb) {
+			$field = substr($matches[0],1);
+			 if(isset($TBind[$field]) || is_null($TBind[$field]) ) {
+			 	
+				if(is_array($TBind[$field])) {
+					$r = '';
+					foreach($TBind[$field] as $v ){
+						if(!empty($r))$r.=',';
+						$r.=$PDOdb->quote($v);
+					}
+					
+					return $r;
+					
+				}
+				else if(strpos($TBind[$field],' IS NULL') === false) {
+			 		return $PDOdb->quote($TBind[$field]);	
+			 	}
+				else {
+					return $TBind[$field];
+				}
+			 } 
+			 else {
+			 	 return 'errorBindingField '.$field;
+			 }
+			  
+		}, $sql);
+		
+		
+		return $sql;
+	}
+	
+	private function limitSQL($sql,&$TParam) {
+		
+		if(!empty($TParam['limit']['global']) && strpos($sql,'LIMIT ')===false ) {
+			
+			$sql.=' LIMIT '.(int)$TParam['limit']['global'];
+			
+		}
+		
+		return $sql;
+	}
+	
+	private function parse_sql(&$PDOdb, &$TEntete, &$TChamps,&$TParam, $sql, $TBind=array()) {
+		
+		//$sql.=' LIMIT '.($TParam['limit']['page']*$TParam['limit']['nbLine']).','.$TParam['limit']['nbLine'];
+		$sql = $this->limitSQL($sql, $TParam);
+		
+		$this->TTotalTmp=array();
+		
+		$this->sql = $this->getSQL($PDOdb,$sql,$TParam);
+		$this->THideFlip = array_flip($TParam['hide']);
+
+		$res = $PDOdb->Execute($this->sql);
+		$first=true;
+		while($currentLine = $PDOdb->Get_line()) {
+			if($first) {
+				$this->init_entete($TEntete, $TParam, $currentLine);
+				$first = false;
+			}
+			
+			$this->set_line($TChamps, $TParam, $currentLine);
+			
+		}
+
+//pre($TChamps);exit;
+
+	}	
+}
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 808dd7933be..60a8dde8652 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -69,9 +69,11 @@ class Inventory extends CoreObject
 		,'title'=>array('type'=>'string')
 	);
 	
-	function __construct() 
+	function __construct(&$db) 
 	{
 		
+		$this->db = &$db;
+		
 		parent::init();
 		
         $this->_init_vars();
@@ -316,22 +318,64 @@ class Inventory extends CoreObject
         return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$i->getId().'&action=view', 1).'">'.img_picto('','object_list.png','',0).' '.$title.'</a>';
         
     }
+	
+	static function getSQL($type) {
+		global $conf;
+		
+		if($type=='All') {
+			
+			$sql="SELECT i.rowid, e.label, i.date_inventory, i.fk_warehouse, i.date_cre, i.date_maj, i.status
+				  FROM ".MAIN_DB_PREFIX."inventory i
+				  LEFT JOIN ".MAIN_DB_PREFIX."entrepot e ON (e.rowid = i.fk_warehouse)
+				  WHERE i.entity=".(int) $conf->entity;
+			
+		}
+	
+		return $sql;	
+	}
+	
 }
 
-class Inventorydet extends TObjetStd
+class Inventorydet extends CoreObject
 {
-	function __construct()
+	public $element='inventorydet';
+	public $table_element='inventorydet';
+	protected $isnolinkedbythird = 1;     // No field fk_soc
+	protected $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	
+	public $fk_inventory;
+	public $fk_warehouse;
+	public $fk_product;
+	public $entity;
+	public $qty_view;
+	public $qty_stock;
+	public $qty_regulated;
+	public $pmp;
+	public $pa;
+	public $new_pmp;
+	
+	private $__fields=array(
+		'fk_inventory'=>array('type'=>'int')
+		,'fk_warehouse'=>array('type'=>'int')
+		,'fk_product'=>array('type'=>'int')
+		,'entity'=>array('type'=>'int')
+		,'qty_view'=>array('type'=>'float')
+		,'qty_stock'=>array('type'=>'float')
+		,'qty_regulated'=>array('type'=>'float')
+		,'pmp'=>array('type'=>'float')
+		,'pa'=>array('type'=>'float')
+		,'new_pmp'=>array('type'=>'float')
+	);
+	
+	
+	function __construct(&$db)
 	{
 		global $conf;
 		
-		$this->set_table(MAIN_DB_PREFIX.'inventorydet');
-    	$this->TChamps = array(); 	  
-		$this->add_champs('fk_inventory,fk_warehouse,fk_product,entity', 'type=entier;');
-		$this->add_champs('qty_view,qty_stock,qty_regulated,pmp,pa,new_pmp', 'type=float;');
-
-		$this->_init_vars();
-	    $this->start();
+		$this->db = &$db;
 		
+		parent::init();
+				
 		$this->entity = $conf->entity;
 		$this->errors = array();
 		

From dfb9ae234cfe3b156cedba54e72c36d8e88e19ea Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Mon, 12 Dec 2016 19:03:02 +0100
Subject: [PATCH 0054/1163] debug

---
 htdocs/core/class/coreobject.class.php        |  23 +-
 ...{class.listview.php => listview.class.php} | 520 +++---------------
 htdocs/core/js/listview.js                    | 143 +++++
 htdocs/inventory/class/inventory.class.php    |  81 ++-
 4 files changed, 266 insertions(+), 501 deletions(-)
 rename htdocs/core/class/{class.listview.php => listview.class.php} (61%)
 create mode 100644 htdocs/core/js/listview.js

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 1cc68f38cb7..7d784073412 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -25,7 +25,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 class CoreObject extends CommonObject {
 	
-	 
+	protected $__fields=array(); 
 	 /**
 	 *  Constructor
 	 *
@@ -38,7 +38,7 @@ class CoreObject extends CommonObject {
 		$this->date_0 = '1001-01-01 00:00:00'; //TODO there is a solution for this ?
 	}
 	
-	private function init() {
+	protected function init() {
 		
 		$this->id = 0;
 		$this->datec = time();
@@ -110,20 +110,20 @@ class CoreObject extends CommonObject {
 		}
 		else return false;
 	}
-	private function _is_float($info){
+	private function is_float($info){
 		if(is_array($info)) {
 			if(isset($info['type']) && $info['type']=='float') return true;
 			else return false;
 		} else return false;
 	}
 	
-	private function _is_text($info){
+	private function is_text($info){
 	  	if(is_array($info)) {
 			if(isset($info['type']) && $info['type']=='text') return true;
 			else return false;
 		} else return false;
 	}
-	private function _is_index($info){
+	private function is_index($info){
 	  	if(is_array($info)) {
 			if(isset($info['index']) && $info['index']==true) return true;
 			else return false;
@@ -172,14 +172,23 @@ class CoreObject extends CommonObject {
 		return $query;
 	}
 		
+	private function get_field_list(){
+			
+		$keys = array_keys($this->__fields);
+		
+	    return implode(',', $keys);
+	}
 	
 	public function fetch($id, $loadChild = true) {
 		
 		if(empty($id)) return false;
 
-		$res = $db->query( 'SELECT '.$this->get_field_list().'datec,tms
+		$sql = 'SELECT '.$this->get_field_list().',datec,tms
 						FROM '.$this->table_element.'
-						WHERE rowid='.$id );
+						WHERE rowid='.$id;
+						
+		$res = $this->db->query( $sql );
+			var_dump($sql);		
 		if($obj = $db->fetch_object($res)) {
 				$this->rowid=$id;
 			
diff --git a/htdocs/core/class/class.listview.php b/htdocs/core/class/listview.class.php
similarity index 61%
rename from htdocs/core/class/class.listview.php
rename to htdocs/core/class/listview.class.php
index f37fc9a1628..0cedad18855 100644
--- a/htdocs/core/class/class.listview.php
+++ b/htdocs/core/class/listview.class.php
@@ -20,7 +20,9 @@
 
 class Listview {
 	
-	function __construct( $id ) {
+	function __construct(&$db, $id ) {
+			
+		$this->db = &$db;
 			
 		$this->id = $id;
 		
@@ -263,79 +265,25 @@ class Listview {
 		return $sql;
 	}
 
-	private function getViewType(&$TParam) {
-		if(!empty($TParam['view_type'])) return $TParam['view_type']; 
-		else if (is_string($TParam['type']))return $TParam['type'] ;
-		else return 'list';
+	public function render($sql,$TParam=array()) {
+
+		$THeader=array();
+		$TField=array();	
+		
+		$this->init($TParam);
+		
+		$sql = $this->search($sql,$TParam);
+		$sql = $this->order_by($sql, $TParam);		
+		
+		$this->parse_sql($THeader, $TField, $TParam, $sql);	
+		
+		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
+		
+		return $this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);	
+		
 	}
 
-	public function render(&$db,$sql,$TParam=array(),$TBind=array()) {
-		$this->typeRender = 'sql';
-	//		print_r($TParam);
-		$TEntete=array();
-		$TChamps=array();	
-		
-		$this->init($TParam);
-		
-		if(!empty($TBind)) $this->TBind = $TBind;
-		
-		$sql = $this->search($sql,$TParam);
-		$sql = $this->order_by($sql, $TParam);		
-		
-		$this->parse_sql($db, $TEntete, $TChamps, $TParam, $sql);	
-		
-		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
-		
-		$view_type = $this->getViewType($TParam);
-				
-		if($view_type == 'raw') {
-			return $this->renderRAW($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);
-		}
-		else if($view_type == 'chart') {
-			return $this->renderChart($TEntete, $TChamps,$TTotal, $TParam);	
-		}
-		else {
-			return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);	
-		}
-		
-		
-	}
-	public function renderDataTableAjax(&$db,$sql,$TParam=array()) {
-		$this->renderDataTableSQL($db, $sql, $TParam);
-	}
-	public function renderDataTableSQL(&$db,$sql,$TParam=array()) {
-		$this->typeRender = 'dataTableAjax';
-	//		print_r($TParam);
-		$TEntete=array();
-		$TChamps=array();	
-		
-		$this->init($TParam);
-		
-		$sql = $this->search($sql,$TParam);
-		$sql = $this->order_by($sql, $TParam);		
-		
-		$this->parse_sql($db, $TEntete, $TChamps, $TParam, $sql);	
-		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
-		
-		return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);
-		
-	}
-	public function renderXML(&$db,$xmlString, $TParam=array()) {
-		$this->typeRender = 'xml';
-		
-		$TEntete=array();
-		$TChamps=array();	
-		
-		$this->init($TParam);
-		
-		$this->parse_xml($db, $TEntete, $TChamps, $TParam,$xmlString);
-		
-		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
-		
-		return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);
-		
-	}
-	private function setSearch(&$TEntete, &$TParam) {
+	private function setSearch(&$THeader, &$TParam) {
 		global $langs;
 		
 		if(empty($TParam['search'])) return array();
@@ -347,7 +295,7 @@ class Listview {
 		$nb_search_in_bar = 0;
 		
 		if(!empty($TParam['search'])) {
-			foreach($TEntete as $key=>$libelle) { // init
+			foreach($THeader as $key=>$libelle) { // init
 				if(empty($TSearch[$key]))$TSearch[$key]='';
 			}
 		}		
@@ -382,7 +330,7 @@ class Listview {
 			}
 			
 
-			if(!empty($TEntete[$key]) || $this->getViewType($TParam) == 'chart') {
+			if(!empty($THeader[$key]) || $this->getViewType($TParam) == 'chart') {
 				$TSearch[$key] = $fsearch;
 				$nb_search_in_bar++;
 			}
@@ -416,12 +364,12 @@ class Listview {
 	 * Function analysant et totalisant une colonne
 	 * Supporté : sum, average
 	 */
-	private function get_total(&$TChamps, &$TParam) {
+	private function get_total(&$TField, &$TParam) {
 		$TTotal=$TTotalGroup=array();	
 		
-		if(!empty($TParam['math']) && !empty($TChamps[0])) {
+		if(!empty($TParam['math']) && !empty($TField[0])) {
 			
-			foreach($TChamps[0] as $field=>$value) {
+			foreach($TField[0] as $field=>$value) {
 				$TTotal[$field]='';	
 				$TTotalGroup[$field] = '';
 			}
@@ -460,80 +408,16 @@ class Listview {
 
 	private function getJS(&$TParam) {
 		$javaScript = '<script language="javascript">
-		if(typeof(TListTBS_include)=="undefined") {
-			document.write("<script type=\"text/javascript\" src=\"'.COREHTTP.'includes/js/list.tbs.js\"></scr");
+		if(typeof(TListview_include)=="undefined") {
+			document.write("<script type=\"text/javascript\" src=\"'.DOL_URL_ROOT.'/core/js/list.view.js\"></scr");
 	  		document.write("ipt>");
 		}
 		</script>';
 
-
-		if($this->typeRender=='dataTable') {
-			
-			$javaScript.='<!-- datatable  -->
-			<script language="javascript">
-					
-					if(typeof(TListTBS_dataTable_include)=="undefined") {
-						var TListTBS_dataTable_include=true;	
-						document.write("<script type=\"text/javascript\" src=\"'.COREHTTP.'includes/js/dataTable/js/jquery.dataTables.min.js\"></scr");
-			  			document.write("ipt>");
-						document.write("<link rel=\"stylesheet\" href=\"'.COREHTTP.'includes/js/dataTable/css/jquery.dataTables.css\" />");
-					}
-			
-					$(document).ready(function () {
-						$("#'.$this->id.'").wrap("<div id=\"'.$this->id.'_datatable_container\">");	
-						$("#'.$this->id.'").dataTable({
-					        "sPaginationType": "full_numbers"
-					        ,"aLengthMenu": [['.$TParam['limit']['nbLine'].',-1], ['.$TParam['limit']['nbLine'].', "All"]]
-					        ,"iDisplayLength" : '.$TParam['limit']['nbLine'].'
-					    });
-					}); 
-			</script>';
-			
-			$TPagination=array();
-		}
-		elseif($this->typeRender=='dataTableAjax') {
-			$javaScript.='<!-- datatable  -->
-			<script language="javascript">
-			
-					if(typeof(TListTBS_dataTable_include)=="undefined") {
-						var TListTBS_dataTable_include=true;
-						document.write("<script type=\"text/javascript\" src=\"'.COREHTTP.'includes/js/dataTable/js/jquery.dataTables.min.js\"></scr");
-			  			document.write("ipt>");
-						document.write("<link rel=\"stylesheet\" href=\"'.COREHTTP.'includes/js/dataTable/css/jquery.dataTables.css\" />");
-					}
-			
-					$(document).ready(function () {
-						$("#'.$this->id.'").wrap("<div id=\"'.$this->id.'_datatable_container\">");	
-						var oTable = $("#'.$this->id.'").dataTable({
-					        "sPaginationType": "full_numbers"
-					        ,"iDisplayLength" : '.$TParam['limit']['nbLine'].'
-					        ,"sPaginationType": "full_numbers"
-					        ,"oLanguage": {
-								"sSearch": "Recherche globale :"
-								/*,"sUrl": "media/language/de_DE.txt" pour depuis un fichier */
-							}
-					    });
-						
-						
-						/* Ajoute du filtre via la recherche sur colonne */
-					    $("#'.$this->id.' thead tr.barre-recherche td").each( function ( i ) {
-					        $("select", this).change( function () {
-					            oTable.fnFilter( $(this).val(), i );
-					        } );
-					        $("input", this).keyup( function () {
-					            oTable.fnFilter( $(this).val(), i );
-					        } );
-							
-					    } );
-						
-					}); 
-			</script>';
-		}
-		
 		return $javaScript;
 	}
 
-	private function setExport(&$TParam,$TChamps,$TEntete) {
+	private function setExport(&$TParam,$TField,$THeader) {
 		global $langs;
 		
 		$Tab=array();
@@ -545,8 +429,8 @@ class Listview {
 				'title'=>$this->title
 				,'sql'=>$this->sql
 				,'TBind'=>$this->TBind
-				,'TChamps'=>$TChamps
-				,'TEntete'=>$TEntete
+				,'TChamps'=>$TField
+				,'TEntete'=>$THeader
 			) ) );
 
 			foreach($TParam['export'] as $mode_export) {
@@ -567,133 +451,7 @@ class Listview {
 		return $Tab;
 	}
 
-	private function renderChart(&$TEntete, &$TChamps,&$TTotal, &$TParam) {
-		
-		$TData = array();
-		$header = '';
-		$first = true;
-		
-		$TSearch = $this->setSearch($TEntete, $TParam);
-		$TExport= $this->setExport($TParam, $TChamps, $TEntete);
-		
-		if(empty($TParam['xaxis']) && !empty($TEntete)) {
-			$fieldXaxis = key($TEntete);
-		}
-		else {
-			$fieldXaxis = $TParam['xaxis'];
-		}
-		
-		$TValue=array(); $key = null;
-		foreach($TEntete as $field=>&$entete) {
-			if($field!=$fieldXaxis)$TValue[] = addslashes($entete['libelle']);
-		}
-
-		$header='["'.addslashes( $TEntete[$fieldXaxis]['libelle'] ).'","'.implode('","', $TValue).'"]';
-		//var_dump($fieldXaxis, $TChamps);
-		foreach($TChamps as &$row) {
-			$TValue=array();
-			$key = null;
-			
-			foreach($row as $k=>$v) {
-				
-				if($k == $fieldXaxis) {
-					$key = $v;
-				}
-				else {
-					$TValue[] = (float)$v;
-				}
-				
-			}
-
-			if(!is_null($key)) {
-				if(!isset($TData[$key])) $TData[$key] = $TValue;
-				else {
-					foreach($TData[$key] as $k=>$v) {
-						$TData[$key][$k]+=(float)$TValue[$k];
-					}
-					
-				}
-			}
-			
-			
-		}
-		
-		$data = $header;
-		foreach($TData as $key=>$TValue) {
-			
-			$data .= ',[ "'.$key.'", ';
-			foreach($TValue as $v) {
-				$data.=(float)$v.',';
-			}
-			
-			$data.=' ]';
-		}
-		
-		$height = empty($TParam['height']) ? 500 : $TParam['height'];
-		$curveType= empty($TParam['curveType']) ? 'none': $TParam['curveType']; // none or function
-		$pieHole =  empty($TParam['pieHole']) ? 0: $TParam['pieHole']; // none or function
-		$hAxis = empty($TParam['hAxis']) ? array() : $TParam['hAxis']; // Array of params
-		$vAxis = empty($TParam['vAxis']) ? array() : $TParam['vAxis']; // Array of params
-		
-		// This feature is experimental and may change in future releases
-		$explorer = empty($TParam['explorer']) ? array() : $TParam['explorer']; // Note: The explorer only works with continuous axes (such as numbers or dates)
-		
-		$type = empty($TParam['chartType']) ? 'LineChart' : $TParam['chartType'];
-		
-		$html = '';
-		
-		if(!empty($TSearch)) {
-			
-			$html.='<table class="border searchbox">';
-			foreach($TSearch as $field=>$input) {
-				if(!empty($input)) {
-					$label = !empty($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
-					$html.='<tr><td>'.$label.'</td><td>'.$input.'</td></tr>';	
-				}
-			}
-			
-			$html.='</table>';
-			
-		}
-		$javaScript = $this->getJS($TParam);
-		
-		$html.='<script type="text/javascript" src="https://www.google.com/jsapi"></script>
-		<script type="text/javascript">
-		  
-		  	  google.load("visualization", "1", {"packages":["corechart"]});
-		      google.setOnLoadCallback(drawChart'.$this->id.');
-			
-			  function drawChart'.$this->id.'() {
-		        var data = google.visualization.arrayToDataTable([
-		          '.$data.'
-		        ]);
-	
-		        var options = {
-		          title: "'.addslashes($TParam['liste']['titre']).'"
-		          '.(!empty($curveType) ? ',curveType: "'.$curveType.'"' : '' ).'
-		          ,legend: { position: "bottom" }
-				  ,animation: { "startup": true }
-				  '.(!empty($explorer) ? ',explorer: '.json_encode($explorer) : '').'
-				  ,height : '.$height.'
-				  ,hAxis: '.json_encode($hAxis).'
-				  ,vAxis: '.json_encode($vAxis).'
-				  '.( $type == 'PieChart' && !empty($pieHole) ? ',pieHole: '.$pieHole : '').'
-				  '.( $type == 'AreaChart' ? ',isStacked: \'percent\'' : '').'
-		        };
-
-		        var chart = new google.visualization.'.$type.'(document.getElementById("div_query_chart'.$this->id.'"));
-		
-		        chart.draw(data, options);
-		      }
-		  
-	    </script>
-		<div id="div_query_chart'.$this->id.'"></div>
-		'.$javaScript; 
-		
-		return $html;
-	}
-
-	private function addTotalGroup($TChamps,$TTotalGroup) {
+	private function addTotalGroup($TField,$TTotalGroup) {
 		global $langs;
 		
 		$Tab=array();
@@ -704,7 +462,7 @@ class Listview {
 		
 		$addGroupLine = false;
 		
-		foreach($TChamps as $k=>&$line) {
+		foreach($TField as $k=>&$line) {
 				
 			if(empty($proto_total_line)) {
 				foreach($line as $field=>$value) {
@@ -748,99 +506,50 @@ class Listview {
 		
 		return $Tab;
 	}
-
-	private function renderRAW(&$TEntete, &$TChamps, &$TTotal,&$TTotalGroup, &$TParam) {
-		$TSearch = $this->setSearch($TEntete, $TParam);
-		$TExport=$this->setExport($TParam, $TChamps, $TEntete);
-		$TChamps = $this->addTotalGroup($TChamps,$TTotalGroup);
-		
-		return array(
-				'entete'=>$TEntete
-				,'champs'=>$TChamps
-				,'recherche'=>$TSearch
-				,'total'=>$TTotal
-				,'export'=>$TExport
-				,'haveExport'=>count($TExport)
-				, 'id'=>$this->id
-				, 'nb_columns'=>count($TEntete) 
-				,'totalNB'=>count($TChamps)
-				, 'nbSearch'=>count($TSearch)
-				, 'haveTotal'=>(int)!empty($TTotal)
-				, 'havePage'=>(int)!empty($TPagination) 
-		);
-	}
 	
-	private function renderList(&$TEntete, &$TChamps, &$TTotal,&$TTotalGroup, &$TParam) {
-		$TBS = new TTemplateTBS;
-		
+	private function renderList(&$THeader, &$TField, &$TTotal,&$TTotalGroup, &$TParam) {
+			
 		$javaScript = $this->getJS($TParam);
 		
-		if($this->typeRender!='dataTableAjax') {
-			$TPagination=array(
-				'pagination'=>array('pageSize'=>$TParam['limit']['nbLine'], 'pageNum'=>$TParam['limit']['page'], 'blockName'=>'champs', 'totalNB'=>count($TChamps))
-			);
-		}
-		else {
-			$TPagination=array();
-		}
+		$TPagination=array(
+			'pagination'=>array('pageSize'=>$TParam['limit']['nbLine'], 'pageNum'=>$TParam['limit']['page'], 'blockName'=>'champs', 'totalNB'=>count($TField))
+		);
 		
-		$TSearch = $this->setSearch($TEntete, $TParam);
-		$TExport=$this->setExport($TParam, $TChamps, $TEntete);
-		$TChamps = $this->addTotalGroup($TChamps,$TTotalGroup);
+		$TSearch = $this->setSearch($THeader, $TParam);
+		$TExport=$this->setExport($TParam, $TField, $THeader);
+		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
-		return $TBS->render($this->template
-			, array(
-				'entete'=>$TEntete
-				,'champs'=>$TChamps
+		var_dump(
+			array(
+				'entete'=>$THeader
+				,'champs'=>$TField
 				,'recherche'=>$TSearch
 				,'total'=>$TTotal
 				,'export'=>$TExport
 			)
 			, array(
-				'liste'=>array_merge(array('haveExport'=>count($TExport), 'id'=>$this->id, 'nb_columns'=>count($TEntete) ,'totalNB'=>count($TChamps), 'nbSearch'=>count($TSearch), 'haveTotal'=>(int)!empty($TTotal), 'havePage'=>(int)!empty($TPagination) ), $TParam['liste'])
+				'liste'=>array_merge(array('haveExport'=>count($TExport), 'id'=>$this->id, 'nb_columns'=>count($THeader) ,'totalNB'=>count($TField), 'nbSearch'=>count($TSearch), 'haveTotal'=>(int)!empty($TTotal), 'havePage'=>(int)!empty($TPagination) ), $TParam['liste'])
 			)
 			, $TPagination
-			, array()
-		)
-		.$javaScript;
-	}
-	public function renderDatatable(&$db, $TField, $TParam) {
-		$this->typeRender = 'dataTable';
-		// on conserve db pour le traitement ultérieur des subQuery
-		$TEntete=array();
-		$TChamps=array();	
-		
-		//$TParam['limit']['nbLine'] = 99999;
-		
-		$this->init($TParam);
-		
-		$this->parse_array($TEntete, $TChamps, $TParam,$TField);
-		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
-		return $this->renderList($TEntete, $TChamps, $TTotal,$TTotalGroup,$TParam);
-		
+			
+		);
+		
+		$javaScript;
 	}
+	
 	public function renderArray(&$db,$TField, $TParam=array()) {
 		$this->typeRender = 'array';
 		// on conserve db pour le traitement ultérieur des subQuery
-		$TEntete=array();
-		$TChamps=array();	
+		$THeader=array();
+		$TField=array();	
 		
 		$this->init($TParam);
 		
-		$this->parse_array($TEntete, $TChamps, $TParam,$TField);
-		list($TTotal, $TTotalGroup)=$this->get_total($TChamps, $TParam);
+		$this->parse_array($THeader, $TField, $TParam,$TField);
+		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
-		$view_type = $this->getViewType($TParam);
+		$this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);	
 		
-		if($view_type == 'raw') {
-			return $this->renderRAW($TEntete, $TChamps,$TTotal, $TParam);
-		}
-		if($view_type == 'chart') {
-			return $this->renderChart($TEntete, $TChamps,$TTotal, $TParam);	
-		}
-		else {
-			return $this->renderList($TEntete, $TChamps,$TTotal,$TTotalGroup, $TParam);	
-		}
 	}
 
 	private function order_by($sql, &$TParam) {
@@ -848,7 +557,7 @@ class Listview {
 		//	print_r($TParam['orderBy']);
 		if(!empty($TParam['orderBy'])) {
 			
-			if(strpos($sql,'LIMIT ')!==false) {
+			if(strpos($sql,'LIMIT ')!==false) { //TODO regex
 				list($sql, $sqlLIMIT) = explode('LIMIT ', $sql);
 			}
 			
@@ -871,22 +580,8 @@ class Listview {
 		
 		return $sql;
 	}
-	private function parse_xml(&$db, &$TEntete, &$TChamps, &$TParam, $xmlString) {
-		$xml = simplexml_load_string($xmlString); 
-		 $this->THideFlip = array_flip($TParam['hide']);
-
-		$first=true;
-		foreach($xml->{$TParam['node']['main']}->{$TParam['node']['object']} as $node) {
-			if($first) {
-				$this->init_entete($TEntete, $TParam, $node);
-				$first=false;
-			}	
-			
-			$this->set_line($TChamps, $TParam, $node);
-		}		
-
-	}
-	private function parse_array(&$TEntete, &$TChamps, &$TParam, $TField) {
+	
+	private function parse_array(&$THeader, &$TField, &$TParam, $TField) {
 		$first=true;
 		
 		 $this->THideFlip = array_flip($TParam['hide']);
@@ -896,16 +591,16 @@ class Listview {
 		
 		foreach($TField as $row) {
 			if($first) {
-				$this->init_entete($TEntete, $TParam, $row);
+				$this->init_entete($THeader, $TParam, $row);
 				$first=false;
 			}	
 			
-			$this->set_line($TChamps, $TParam, $row);
+			$this->set_line($TField, $TParam, $row);
 		}		
 
 	}
 	
-	private function init_entete(&$TEntete, &$TParam, $currentLine) {
+	private function init_entete(&$THeader, &$TParam, $currentLine) {
 		
 		$TField=$TFieldVisibility=array();
 		
@@ -977,7 +672,7 @@ class Listview {
 			
 			if($visible) {
 				$lastfield = $field;
-				$TEntete[$field] = array(
+				$THeader[$field] = array(
 					'libelle'=>$libelle
 					,'order'=>((in_array($field, $TParam['orderby']['noOrder']) || $this->typeRender != 'sql') ? 0 : 1)
 					,'width'=>(!empty($TParam['size']['width'][$field]) ? $TParam['size']['width'][$field] : 'auto')
@@ -989,19 +684,15 @@ class Listview {
 		}
 		
 		if(!empty($selectedfields) && !empty($lastfield)) {
-			$TEntete[$lastfield]['more']='<div style="float:right">'.$selectedfields.'</div>';
+			$THeader[$lastfield]['more']='<div style="float:right">'.$selectedfields.'</div>';
 		}
 		
 		
-		/*if(!empty($TParam['search']) && !empty($TEntete)) {
-			$TEntete['actions']=array('libelle'=>'<!-- actions -->', 'order'=>0);
-		}*/
-		
 	}
 	
 	private function in_view(&$TParam, $line_number) {
 		global $conf;
-//		var_dump($_REQUEST['get-all-for-export']);
+
 		if(!empty($_REQUEST['get-all-for-export'])) return true; // doit être dans la vue
 
 		$page_number = !empty($TParam['limit']['page']) ? $TParam['limit']['page'] : 1;
@@ -1014,11 +705,11 @@ class Listview {
 		else return false;
 	}
 	
-	private function set_line(&$TChamps, &$TParam, $currentLine) {
+	private function set_line(&$TField, &$TParam, $currentLine) {
 		
 			global $conf;
 		
-			$line_number = count($TChamps);
+			$line_number = count($TField);
 			
 			if($this->in_view($TParam,$line_number)) {
 				
@@ -1114,67 +805,7 @@ class Listview {
 				}
 			}
 			}
-			$TChamps[] = $row;	
-	}
-	
-	private function getBind(&$TParam) {
-		
-		$TBind = array();
-		foreach($this->TBind as $k=>$v) {
-			if(!empty($TParam['operator'][$k]) && $TParam['operator'][$k] == 'IN') {
-				
-				if($v==='')$TBind[$k] =array("'0'");
-				else $TBind[$k] =explode(',', $v);
-				
-			}
-			else{
-				$TBind[$k] = $v;
-			}
-			
-		}
-		
-		return $TBind;
-	}
-	
-	private function getSQL(&$PDOdb,$sql,&$TParam) {
-		global $user,$conf;
-
-		$sql=strtr($sql,array(
-			'@current_user@'=>$user->id
-		));
-
-		//AA oui c'est moche mais le bindParam ne prends pas en compte les tableaux pour le IN ce qui est super pénalisant. En attendant de refaire mieux ou d'un coup de main
-		$TBind = $this->getBind($TParam);
-		
-		$sql = preg_replace_callback('/(:[a-z])\w+/i',function($matches) use($TBind,$PDOdb) {
-			$field = substr($matches[0],1);
-			 if(isset($TBind[$field]) || is_null($TBind[$field]) ) {
-			 	
-				if(is_array($TBind[$field])) {
-					$r = '';
-					foreach($TBind[$field] as $v ){
-						if(!empty($r))$r.=',';
-						$r.=$PDOdb->quote($v);
-					}
-					
-					return $r;
-					
-				}
-				else if(strpos($TBind[$field],' IS NULL') === false) {
-			 		return $PDOdb->quote($TBind[$field]);	
-			 	}
-				else {
-					return $TBind[$field];
-				}
-			 } 
-			 else {
-			 	 return 'errorBindingField '.$field;
-			 }
-			  
-		}, $sql);
-		
-		
-		return $sql;
+			$TField[] = $row;	
 	}
 	
 	private function limitSQL($sql,&$TParam) {
@@ -1188,29 +819,26 @@ class Listview {
 		return $sql;
 	}
 	
-	private function parse_sql(&$PDOdb, &$TEntete, &$TChamps,&$TParam, $sql, $TBind=array()) {
+	private function parse_sql( &$THeader, &$TField,&$TParam, $sql) {
+		global $db;	
 		
-		//$sql.=' LIMIT '.($TParam['limit']['page']*$TParam['limit']['nbLine']).','.$TParam['limit']['nbLine'];
-		$sql = $this->limitSQL($sql, $TParam);
+		$this->sql = $this->limitSQL($sql, $TParam);
 		
 		$this->TTotalTmp=array();
 		
-		$this->sql = $this->getSQL($PDOdb,$sql,$TParam);
 		$this->THideFlip = array_flip($TParam['hide']);
 
-		$res = $PDOdb->Execute($this->sql);
+		$res = $db->query($this->sql);
 		$first=true;
-		while($currentLine = $PDOdb->Get_line()) {
+		while($currentLine = $db->fetch_object($res)) {
 			if($first) {
-				$this->init_entete($TEntete, $TParam, $currentLine);
+				$this->init_entete($THeader, $TParam, $currentLine);
 				$first = false;
 			}
 			
-			$this->set_line($TChamps, $TParam, $currentLine);
+			$this->set_line($TField, $TParam, $currentLine);
 			
 		}
 
-//pre($TChamps);exit;
-
 	}	
 }
diff --git a/htdocs/core/js/listview.js b/htdocs/core/js/listview.js
new file mode 100644
index 00000000000..1157c2ef4b8
--- /dev/null
+++ b/htdocs/core/js/listview.js
@@ -0,0 +1,143 @@
+var TListTBS_include = true;
+
+function TListTBS_OrderDown(idListe, column) {
+	var base_url = document.location.href;
+	
+	base_url = TListTBS_recup_form_param(idListe,base_url);
+	base_url = TListTBS_removeParam(base_url,'TListTBS['+encodeURIComponent(idListe)+'][orderBy]');
+	
+	base_url = TListTBS_removeParam(base_url,'get-all-for-export');
+	
+	document.location.href=TListTBS_modifyUrl(base_url,"TListTBS["+encodeURIComponent(idListe)+"][orderBy]["+encodeURIComponent(column)+"]","DESC");
+}
+function TListTBS_OrderUp(idListe, column) {
+	
+	var base_url = document.location.href;
+	
+	base_url = TListTBS_recup_form_param(idListe,base_url);
+	base_url = TListTBS_removeParam(base_url,'TListTBS['+encodeURIComponent(idListe)+'][orderBy]');
+	
+	base_url = TListTBS_removeParam(base_url,'get-all-for-export');
+	
+	document.location.href=TListTBS_modifyUrl(base_url,"TListTBS["+encodeURIComponent(idListe)+"][orderBy]["+encodeURIComponent(column)+"]","ASC");
+}
+function TListTBS_modifyUrl(strURL,paramName,paramNewValue){
+	    if (strURL.indexOf(paramName+'=')!=-1){
+        	
+                var strFirstPart=strURL.substring(0,strURL.indexOf(paramName+'=',0))+paramName+'=';
+                var strLastPart="";
+                if (strURL.indexOf('&',strFirstPart.length-1)>0)
+                      strLastPart=strURL.substring(strURL.indexOf('&',strFirstPart.length-1),strURL.length);
+              		  strURL=strFirstPart+paramNewValue+strLastPart;
+                }
+        else{
+                if (strURL.search('=')!=-1) // permet de verifier s'il y a dej� des param�tres dans l'URL
+                        strURL+='&'+paramName+'='+paramNewValue;
+                else
+                        strURL+='?'+paramName+'='+paramNewValue;
+        }
+        
+        return strURL;
+}
+function TListTBS_removeParam(strURL, paramMask) {
+	var cpt=0;
+	var url = '';
+	
+	 while(strURL.indexOf(paramMask)!=-1 && cpt++ <50){
+	 	var strFirstPart= strURL.substring(0,strURL.indexOf(paramMask)-1);
+	 	
+	 	var strLastPart='';
+	 	if (strURL.indexOf('&',strFirstPart.length+1)>0) {
+	 		strLastPart = strURL.substring(strURL.indexOf('&',strFirstPart.length+1),strURL.length);	
+	 	}
+	 		
+		url = strFirstPart+strLastPart;
+	 	
+	 }
+	 
+	 if(url=='')url = strURL;
+	 
+	 return url;
+}
+
+function TListTBS_recup_form_param(idListe,base_url) {
+	
+	$('#'+idListe+' tr.barre-recherche [listviewtbs],#'+idListe+' tr.barre-recherche-head input,#'+idListe+' tr.barre-recherche-head select,#'+idListe+' div.tabsAction input[listviewtbs]').each(function(i,item) {
+		if($(item).attr("name")) {
+			base_url = TListTBS_modifyUrl(base_url, $(item).attr("name") , $(item).val());
+		}
+		
+	});
+	
+	return base_url;
+}
+
+function TListTBS_GoToPage(idListe,pageNumber){
+	
+	var base_url = document.location.href;
+	
+	base_url = TListTBS_recup_form_param(idListe,base_url);
+	base_url =TListTBS_modifyUrl(base_url,"TListTBS["+encodeURIComponent(idListe)+"][page]",pageNumber);
+	
+	base_url = TListTBS_removeParam(base_url,'get-all-for-export');
+	
+	document.location.href=base_url;
+}
+function TListTBS_submitSearch(obj) {
+	
+	$(obj).closest('form').submit();
+	//console.log($(obj).closest('form'));
+}
+function TListTBS_launch_downloadAs(mode,url,token,session_name) {
+	 $('#listTBSdAS_export_form').remove();
+	
+	$form = $('<form action="'+url+'" method="post" name="listTBSdAS_export_form" id="listTBSdAS_export_form"></form>');
+	$form.append('<input type="hidden" name="mode" value="'+mode+'" />');
+	$form.append('<input type="hidden" name="token" value="'+token+'" />');
+	$form.append('<input type="hidden" name="session_name" value="'+session_name+'" />');
+	
+	$('body').append($form);
+	
+    $('#listTBSdAS_export_form').submit();
+	
+}
+
+function TListTBS_downloadAs(obj, mode,url,token,session_name) {
+	
+	$form = $(obj).closest('form');
+	$div = $form.find('div.tabsAction');
+	$div.append('<input type="hidden" listviewtbs="hidden" name="token" value="'+token+'" />');
+	$div.append('<input type="hidden" listviewtbs="hidden" name="mode" value="'+mode+'" />');
+	$div.append('<input type="hidden" listviewtbs="hidden" name="url" value="'+url+'" />');
+	$div.append('<input type="hidden" listviewtbs="hidden" name="session_name" value="'+session_name+'" />');
+	$div.append('<input type="hidden" listviewtbs="hidden" name="get-all-for-export" value="1" />');
+	
+	TListTBS_submitSearch(obj);
+}
+
+$(document).ready(function() {
+	$('tr.barre-recherche input').keypress(function(e) {
+	    if(e.which == 13) {
+	       
+	       var id_list = $(this).closest('table').attr('id');
+	       
+	       $('#'+id_list+' .list-search-link').click();
+	       
+	    }
+	});
+	
+	var $_GET = {};
+	
+	document.location.search.replace(/\??(?:([^=]+)=([^&]*)&?)/g, function () {
+	    function decode(s) {
+	        return decodeURIComponent(s.split("+").join(" "));
+	    }
+	
+	    $_GET[decode(arguments[1])] = decode(arguments[2]);
+	});
+	
+	if(typeof $_GET["get-all-for-export"] != "undefined") {
+		TListTBS_launch_downloadAs($_GET["mode"],$_GET["url"],$_GET["token"],$_GET["session_name"]);
+	}
+	
+});
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 60a8dde8652..f158ab260cf 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -61,7 +61,7 @@ class Inventory extends CoreObject
 	 */
 	public $title;
 	
-	private $__fields=array(
+	protected $__fields=array(
 		'fk_warehouse'=>array('type'=>'integer','index'=>true)
 		,'entity'=>array('type'=>'integer','index'=>true)
 		,'status'=>array('type'=>'integer','index'=>true)
@@ -69,20 +69,14 @@ class Inventory extends CoreObject
 		,'title'=>array('type'=>'string')
 	);
 	
-	function __construct(&$db) 
+	function __construct(DoliDB &$db) 
 	{
 		
 		$this->db = &$db;
 		
 		parent::init();
 		
-        $this->_init_vars();
-        
-	    $this->start();
-		
-		$this->setChild('Inventorydet','fk_inventory');
-		
-		$this->status = 0;
+       	$this->status = 0;
 		$this->entity = $conf->entity;
 		$this->errors = array();
 		$this->amount = 0;
@@ -94,12 +88,12 @@ class Inventory extends CoreObject
 		usort($this->Inventorydet, array('Inventory', 'customSort'));
 	}
 	
-	function load(&$PDOdb, $id,$annexe = true) 
+	function fetch($id,$annexe = true) 
 	{
 	    
         if(!$annexe) $this->withChild = false;
         
-		$res = parent::load($PDOdb, $id);
+		$res = parent::fetch($id);
 		$this->sort_det();
 		
 		$this->amount = 0;
@@ -124,7 +118,7 @@ class Inventory extends CoreObject
 		return $r;
 	}
 	
-	function changePMP(&$PDOdb) {
+	function changePMP() {
 		
 		foreach ($this->Inventorydet as $k => &$Inventorydet)
 		{
@@ -133,16 +127,9 @@ class Inventory extends CoreObject
 				$Inventorydet->pmp = $Inventorydet->new_pmp; 
 				$Inventorydet->new_pmp = 0;
 			
-				$PDOdb->Execute("UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$Inventorydet->pmp."
+				$db->query("UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$Inventorydet->pmp."
 				WHERE rowid = ".$Inventorydet->fk_product );
 				
-				if((float)DOL_VERSION<4.0) {
-					
-					$PDOdb->Execute("UPDATE ".MAIN_DB_PREFIX."product_stock SET pmp=".$Inventorydet->pmp."
-					 WHERE fk_entrepot = ".$this->fk_warehouse." AND fk_product = ".$Inventorydet->fk_product) ;
-					
-				}
-				
 			}
 		}
 		
@@ -150,15 +137,15 @@ class Inventory extends CoreObject
 		
 	}
 	
-	function save(&$PDOdb)
+	function update()
 	{
 		//si on valide l'inventaire on sauvegarde le stock à cette instant
 		if ($this->status)
 		{
-			 $this->regulate($PDOdb);
+			 $this->regulate();
 		}
 		
-		parent::save($PDOdb);
+		parent::update();
 	}
 	
 	function set_values($Tab)
@@ -188,24 +175,24 @@ class Inventory extends CoreObject
 		return parent::set_values($Tab);
 	}
 	
-    function deleteAllLine(&$PDOdb) {
+    function deleteAllLine() {
         
         foreach($this->Inventorydet as &$det) {
             $det->to_delete = true;
         }
         
-        $this->save($PDOdb);
+        $this->update();
       
         $this->Inventorydet=array();
         
     }
     
-    function add_product(&$PDOdb, $fk_product, $fk_entrepot='') {
+    function add_product($fk_product, $fk_entrepot='') {
         
-        $k = $this->addChild($PDOdb, 'Inventorydet');
+        $k = $this->addChild('Inventorydet');
         $det =  &$this->Inventorydet[$k];
         
-        $det->fk_inventory = $this->getId();
+        $det->fk_inventory = $this->id;
         $det->fk_product = $fk_product;
 		$det->fk_warehouse = empty($fk_entrepot) ? $this->fk_warehouse : $fk_entrepot;
         
@@ -213,16 +200,16 @@ class Inventory extends CoreObject
                 
         $date = $this->get_date('date_inventory', 'Y-m-d');
         if(empty($date))$date = $this->get_date('date_cre', 'Y-m-d'); 
-        $det->setStockDate($PDOdb, $date , $fk_entrepot);
+        $det->setStockDate( $date , $fk_entrepot);
         
     }
     
-    function correct_stock($fk_product, $id_entrepot, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
+    function correct_stock($fk_product, $fk_warehouse, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
 	{
 		global $conf, $db, $langs, $user;
 		
 		/* duplication method product to add datem */
-		if ($id_entrepot)
+		if ($fk_warehouse)
 		{
 			$db->begin();
 
@@ -234,7 +221,7 @@ class Inventory extends CoreObject
 			$datem = empty($conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT) ? dol_now() : $this->date_inventory;
 
 			$movementstock=new MouvementStock($db);
-			$result=$movementstock->_create($user,$fk_product,$id_entrepot,$op[$movement],$movement,$price,$label,$inventorycode, $datem);
+			$result=$movementstock->_create($user,$fk_product,$fk_warehouse,$op[$movement],$movement,$price,$label,$inventorycode, $datem);
 			
 			if ($result >= 0)
 			{
@@ -252,7 +239,7 @@ class Inventory extends CoreObject
 		}
 	}
 	
-	function regulate(&$PDOdb)
+	function regulate()
 	{
 		global $db,$user,$langs,$conf;
 		
@@ -288,10 +275,10 @@ class Inventory extends CoreObject
 				$nbpiece = abs($Inventorydet->qty_regulated);
 				$movement = (int) ($Inventorydet->qty_view < $Inventorydet->qty_stock); // 0 = add ; 1 = remove
 						
-				$href = dol_buildpath('/inventory/inventory.php?id='.$this->getId().'&action=view', 1);
+				$href = dol_buildpath('/inventory/inventory.php?id='.$this->id.'&action=view', 1);
 				
 				if(empty($this->title))
-					$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock', $href, $this->getId()));
+					$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock', $href, $this->id));
 				else
 					$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStockWithNomInventaire', $href, $this->title));
 			}
@@ -306,16 +293,14 @@ class Inventory extends CoreObject
 	}
     
     static function getLink($id) {
-        global $langs;
+        global $langs,$db;
         
-        $PDOdb=new TPDOdb;
+        $i = new Inventory($db);
+        $i->fetch($id, false);
         
-        $i = new Inventory;
-        $i->load($PDOdb, $id, false);
+        $title = !empty($i->title) ? $i->title : $langs->trans('inventoryTitle').' '.$i->id;
         
-        $title = !empty($i->title) ? $i->title : $langs->trans('inventoryTitle').' '.$i->getId();
-        
-        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$i->getId().'&action=view', 1).'">'.img_picto('','object_list.png','',0).' '.$title.'</a>';
+        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$i->id.'&action=view', 1).'">'.img_picto('','object_list.png','',0).' '.$title.'</a>';
         
     }
 	
@@ -354,7 +339,7 @@ class Inventorydet extends CoreObject
 	public $pa;
 	public $new_pmp;
 	
-	private $__fields=array(
+	protected $__fields=array(
 		'fk_inventory'=>array('type'=>'int')
 		,'fk_warehouse'=>array('type'=>'int')
 		,'fk_product'=>array('type'=>'int')
@@ -385,11 +370,11 @@ class Inventorydet extends CoreObject
 		
 	}
 	
-	function load(&$PDOdb, $id) 
+	function fetch($id) 
 	{
 		global $conf;
 		
-		$res = parent::load($PDOdb, $id);
+		$res = parent::fetch($id);
 		$this->load_product();
         $this->fetch_current_pa();
 			
@@ -431,9 +416,9 @@ class Inventorydet extends CoreObject
                 AND datem<='".$date." 23:59:59'
                 ORDER BY datem DESC LIMIT 1";
                
-        $PDOdb->Execute($sql);
+        $res = $db->query($sql);
        
-        if($obj = $PDOdb->Get_line()) {
+        if($obj = $db->fetch_object($res)) {
             $last_pa = $obj->price;
         }
         
@@ -467,7 +452,7 @@ class Inventorydet extends CoreObject
 				ORDER BY datem DESC";
 
 		//echo $sql.'<br>';
-		$PDOdb->Execute($sql);
+		$db->query($sql);
 		$TMouvementStock = $PDOdb->Get_All();
 		$laststock = $stock;
 		$lastpmp = $pmp;

From e1a5a90f0a72bcdd5562d76978460043d16a6b00 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Dec 2016 00:15:21 +0100
Subject: [PATCH 0055/1163] NEW Uploaded files are indexed into database

---
 htdocs/core/class/html.formfile.class.php     | 79 +++++++++++----
 htdocs/core/lib/files.lib.php                 | 98 +++++++++++++++++--
 .../tpl/document_actions_post_headers.tpl.php |  5 +-
 htdocs/ecm/class/ecmfiles.class.php           | 17 +++-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  1 +
 .../mysql/tables/llx_ecm_files.key.sql        |  4 +-
 htdocs/install/mysql/tables/llx_ecm_files.sql |  6 +-
 7 files changed, 173 insertions(+), 37 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 60ed409fc7f..b33ea772aa8 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -863,7 +863,7 @@ class FormFile
      * 	@param	 string	$modulepart			Value for modulepart used by download or viewimage wrapper
      * 	@param	 string	$param				Parameters on sort links (param must start with &, example &aaa=bbb&ccc=ddd)
      * 	@param	 int	$forcedownload		Force to open dialog box "Save As" when clicking on file
-     * 	@param	 string	$relativepath		Relative path of docs (autodefined if not provided)
+     * 	@param	 string	$relativepath		Relative path of docs (autodefined if not provided), relative to module.
      * 	@param	 int	$permonobject		Permission on object (so permission to delete or crop document)
      * 	@param	 int	$useinecm			Change output for use in ecm module
      * 	@param	 string	$textifempty		Text to show if filearray is empty ('NoFileFound' if not defined)
@@ -871,23 +871,40 @@ class FormFile
      *  @param	 string	$title				Title before list
      *  @param	 string $url				Full url to use for click links ('' = autodetect)
 	 *  @param	 int	$showrelpart		0=Show only filename (default), 1=Show first level 1 dir
-	 *  @param   int    $permtoeditline     Permission to edit document line (-1 is deprecated)
+	 *  @param   int    $permtoeditline     Permission to edit document line (You msut provide a value, -1 is deprecated and must not be used any more)
      * 	@return	 int						<0 if KO, nb of files shown if OK
+     *  @return  string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT.
      */
-	function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1)
+	function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='')
 	{
 		global $user, $conf, $langs, $hookmanager;
 		global $bc;
 		global $sortfield, $sortorder, $maxheightmini;
 
+		// Define relative path used to store the file
+		if (empty($relativepath))
+		{
+		    $relativepath=(! empty($object->ref)?dol_sanitizeFileName($object->ref):'').'/';
+		    if ($object->element == 'invoice_supplier') $relativepath=get_exdir($object->id,2,0,0,$object,'invoice_supplier').$relativepath;	// TODO Call using a defined value for $relativepath
+		    if ($object->element == 'project_task') $relativepath='Call_not_supported_._Call_function_using_a_defined_relative_path_.';
+		}
+		// For backward compatiblity, we detect file is stored into an old path
+		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $file['level1name'] == 'photos')
+		{
+		    $relativepath=preg_replace('/^.*\/produit\//','',$file['path']).'/';
+		}
+		// Defined relative dir to DOL_DATA_ROOT
+		$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
+		$rel_dir = preg_replace('/^[\\/]/','',$rel_dir); 
+		
 		$hookmanager->initHooks(array('formfile'));
-
 		$parameters=array(
 				'filearray' => $filearray,
 				'modulepart'=> $modulepart,
 				'param' => $param,
 				'forcedownload' => $forcedownload,
-				'relativepath' => $relativepath,
+				'relativepath' => $relativepath,    // relative filename to module dir
+				'reldir' => $rel_dir,               // relative dirname to DOL_DATA_ROOT
 				'permtodelete' => $permonobject,
 				'useinecm' => $useinecm,
 				'textifempty' => $textifempty,
@@ -942,10 +959,42 @@ class FormFile
 			print_liste_field_titre('');
 			print "</tr>\n";
 
+			// Get list of files stored into database for same directory
+            $filearrayindatabase = dol_dir_list_in_database($rel_dir, '', null, 'name', SORT_ASC);
+
+            //var_dump($filearray);
+            //var_dump($filearrayindatabase);
+            
+            // Complete filearray with properties found into $filearrayindatabase
+			foreach($filearray as $key => $val)
+			{
+			    $found=0;
+			    // Search if it exists into $filearrayindatabase
+			    foreach($filearrayindatabase as $key2 => $val2)
+			    {
+			        if ($filearrayindatabase[$key2]['name'] == $filearray[$key]['name'])
+			        {
+			            $filearray[$key]['position']=$filearrayindatabase[$key2]['position'];
+			            $filearray[$key]['cover']=$filearrayindatabase[$key2]['cover'];
+			            $filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
+			            $found=1;
+			            break;
+			        }
+			    }
+			    if (! $found)
+			    {
+			        $filearray[$key]['position']=999999;     // File not indexed are at end. So if we add a file, it will not replace existing in position
+			        $filearray[$key]['cover']=0;
+			        $filearray[$key]['acl']='';
+			    }
+			}
+
+			$filearray=dol_sort_array($filearray, 'position');
+			//var_dump($filearray);
+			
 			$nboffiles=count($filearray);
-
 			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-
+				
 			$var=true;
 			foreach($filearray as $key => $file)      // filearray must be only files here
 			{
@@ -953,23 +1002,13 @@ class FormFile
 						&& $file['name'] != '..'
 						&& ! preg_match('/\.meta$/i',$file['name']))
 				{
-					// Define relative path used to store the file
-					if (empty($relativepath))
-					{
-						$relativepath=(! empty($object->ref)?dol_sanitizeFileName($object->ref):'').'/';
-						if ($object->element == 'invoice_supplier') $relativepath=get_exdir($object->id,2,0,0,$object,'invoice_supplier').$relativepath;	// TODO Call using a defined value for $relativepath
-						if ($object->element == 'project_task') $relativepath='Call_not_supported_._Call_function_using_a_defined_relative_path_.';
-					}
-					// For backward compatiblity, we detect file is stored into an old path
-					if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $file['level1name'] == 'photos')
-	                {
-	                    $relativepath=preg_replace('/^.*\/produit\//','',$file['path']).'/';
-	                }
 					$var=!$var;
 					
 					$editline=0;
 					
-			        print '<!-- Line list_of_documents '.$key.' -->'."\n";
+			        print '<!-- Line list_of_documents '.$key.' relativepath = '.$relativepath.' -->'."\n";
+			        // Do we have entry into database ?
+			        print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";
 					print '<tr '.$bc[$var].'>';
 					print '<td class="tdoverflow">';
 					
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index cc22f44ec48..059448b35dc 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -41,7 +41,7 @@ function dol_basename($pathfile)
  *  Scan a directory and return a list of files/directories.
  *  Content for string is UTF8 and dir separator is "/".
  *
- *  @param	string		$path        	Starting path from which to search
+ *  @param	string		$path        	Starting path from which to search. This is a full path.
  *  @param	string		$types        	Can be "directories", "files", or "all"
  *  @param	int			$recursive		Determines whether subdirectories are searched
  *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function
@@ -50,7 +50,8 @@ function dol_basename($pathfile)
  *  @param	string		$sortorder		Sort order (SORT_ASC, SORT_DESC)
  *	@param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only
  *  @param	int			$nohook			Disable all hooks
- *  @return	array						Array of array('name'=>'xxx','fullname'=>'/abc/xxx','date'=>'yyy','size'=>99,'type'=>'dir|file')
+ *  @return	array						Array of array('name'=>'xxx','fullname'=>'/abc/xxx','date'=>'yyy','size'=>99,'type'=>'dir|file',...)
+ *  @see dol_dir_list_indatabase
  */
 function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefilter="", $sortcriteria="name", $sortorder=SORT_ASC, $mode=0, $nohook=false)
 {
@@ -205,6 +206,82 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 }
 
 
+/**
+ *  Scan a directory and return a list of files/directories.
+ *  Content for string is UTF8 and dir separator is "/".
+ *
+ *  @param	string		$path        	Starting path from which to search
+ *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function
+ *  @param	array|null	$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.'))
+ *  @param	string		$sortcriteria	Sort criteria ("","fullname","name","date","size")
+ *  @param	string		$sortorder		Sort order (SORT_ASC, SORT_DESC)
+ *	@param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like description
+ *  @return	array						Array of array('name'=>'xxx','fullname'=>'/abc/xxx','type'=>'dir|file',...)
+ *  @see dol_dir_list
+ */
+function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0)
+{
+    global $conf, $db;
+    
+    $sql=" SELECT label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m, acl, position";
+    if ($mode) $sql.=", description";
+    $sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
+    $sql.=" WHERE filepath = '".$db->escape($path)."'";
+    $sql.=" AND entity = ".$conf->entity;
+
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        $file_list=array();
+        $num = $db->num_rows($resql);
+        $i = 0;
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);            
+            if ($obj)
+            {
+                preg_match('/([^\/]+)\/[^\/]+$/',DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,$reg);
+                $level1name=(isset($reg[1])?$reg[1]:'');
+                $file_list[] = array(
+    				"name" => $obj->filename,
+    				"path" => DOL_DATA_ROOT.'/'.$obj->filepath,
+                    "level1name" => $level1name,
+    				"fullname" => DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,
+    				"fullpath_orig" => $obj->fullpath_orig,
+                    "date_c" => $db->jdate($obj->date_c),
+                    "date_m" => $db->jdate($obj->date_m),
+    				"type" => 'file',
+                    "keywords" => $obj->keywords,
+                    "cover" => $obj->cover,
+                    "position" => (int) $obj->position,
+                    "acl" => $obj->acl
+                );
+            }
+            $i++;
+        }
+        
+        // Obtain a list of columns
+        if (! empty($sortcriteria))
+        {
+            $myarray=array();
+            foreach ($file_list as $key => $row)
+            {
+                $myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
+            }
+            // Sort the data
+            if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+        }
+        
+        return $file_list;
+    }
+    else
+    {
+        dol_print_error($db);
+        return array();
+    }
+}
+    
+
 /**
  * Fast compare of 2 files identified by their properties ->name, ->date and ->size
  *
@@ -751,7 +828,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
     				    $rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
     				    if (! preg_match('/\/temp\//', $rel_filetodelete))     // If not a tmp file
     				    {
-    				        $rel_filetodelete = preg_replace('/^\//', '', $rel_filetodelete);
+    				        $rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
     				        
     				        dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
         				    include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
@@ -1083,10 +1160,10 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 					else   // Update table of files 
 					{
 					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
-					    if (! preg_match('/\/temp\//', $rel_dir))     // If not a tmp file
+					    if (! preg_match('/[\\/]temp[\\/]/', $rel_dir))     // If not a tmp file
 					    {
-					        $rel_dir = preg_replace('/\/$/', '', $rel_dir);
-					        $rel_dir = preg_replace('/^\//', '', $rel_dir);
+					        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+					        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
     					    
     					    include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
     					    $ecmfile=new EcmFiles($db);
@@ -1384,11 +1461,11 @@ function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta
  * Security check when accessing to a document (used by document.php, viewimage.php and webservices)
  *
  * @param	string	$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp')
- * @param	string	$original_file		Relative path with filename
+ * @param	string	$original_file		Relative path with filename, relative to modulepart.
  * @param	string	$entity				Restrict onto entity
  * @param  	User	$fuser				User object (forced)
  * @param	string	$refname			Ref of object to check permission for external users (autodetect if not provided)
- * @return	mixed						Array with access information : accessallowed & sqlprotectagainstexternals & original_file (as full path name)
+ * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
  */
 function dol_check_secure_access_document($modulepart,$original_file,$entity,$fuser='',$refname='')
 {
@@ -1682,7 +1759,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 			$accessallowed=1;
 		}
 		$original_file=$conf->projet->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project', 1).")";
 	}
 	else if ($modulepart == 'project_task')
 	{
@@ -1691,7 +1768,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 			$accessallowed=1;
 		}
 		$original_file=$conf->projet->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project', 1).")";
 	}
 	// Wrapping for interventions
 	else if ($modulepart == 'fichinter')
@@ -1806,6 +1883,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 			$accessallowed=1;
 		}
 		$original_file=$conf->contrat->dir_output.'/'.$original_file;
+		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract', 1).")";
 	}
 
 	// Wrapping pour les dons
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 83d38793072..546cec91142 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -79,7 +79,7 @@ $formfile->list_of_documents(
     $modulepart,
     $param,
     0,
-    $relativepathwithnofile,		// relative path with no file. For example "moduledir/0/1"
+    $relativepathwithnofile,		// relative path with no file. For example "0/1"
     $permission,
     0,
     '',
@@ -87,7 +87,8 @@ $formfile->list_of_documents(
     '',
     '',
     0,
-    $permtoedit
+    $permtoedit,
+    $upload_dir
 );
 
 print "<br>";
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 0133bff2580..0e1885fa62f 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -136,6 +136,21 @@ class EcmFiles //extends CommonObject
 		}
         if (empty($this->date_c)) $this->date_c = dol_now();
 		
+        $maxposition=0;
+		if (empty($this->position))   // Get max used
+		{
+		    $sql = "SELECT MAX(position) as maxposition FROM " . MAIN_DB_PREFIX . $this->table_element;
+		    $sql.= " WHERE filepath ='".$this->filepath."'";
+		    
+		    $resql = $this->db->query($sql);
+		    if ($resql)
+		    {
+		        $obj = $this->db->fetch_object($resql);
+		        $maxposition = (int) $obj->maxposition;
+		    }
+		    else dol_print_error($this->db);
+		}
+		$maxposition=$maxposition+1;
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -167,7 +182,7 @@ class EcmFiles //extends CommonObject
 		$sql .= ' '.(! isset($this->description)?'NULL':"'".$this->db->escape($this->description)."'").',';
 		$sql .= ' '.(! isset($this->keywords)?'NULL':"'".$this->db->escape($this->keywords)."'").',';
 		$sql .= ' '.(! isset($this->cover)?'NULL':"'".$this->db->escape($this->cover)."'").',';
-		$sql .= ' '.(! isset($this->position)?'0':$this->db->escape($this->position)).',';
+		$sql .= ' '.$maxposition.',';
 		$sql .= ' '.(! isset($this->gen_or_uploaded)?'NULL':"'".$this->db->escape($this->gen_or_uploaded)."'").',';
 		$sql .= ' '.(! isset($this->extraparams)?'NULL':"'".$this->db->escape($this->extraparams)."'").',';
 		$sql .= ' '."'".$this->db->idate($this->date_c)."'".',';
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 9c6aefdec6d..73d209b0cdc 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -27,3 +27,4 @@
 
 ALTER TABLE llx_ecm_files CHANGE COLUMN fullpath filepath varchar(750);
 ALTER TABLE llx_ecm_files ADD COLUMN position integer;
+ALTER TABLE llx_ecm_files CHANGE COLUMN keyword keyword varchar(750);
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.key.sql b/htdocs/install/mysql/tables/llx_ecm_files.key.sql
index 9b1f4fcf164..2b8b1348ba3 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files.key.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files.key.sql
@@ -17,5 +17,7 @@
 -- ============================================================================
 
 
-ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (label, entity);
+ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (label, entity);		-- label is a md5
 --ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files_fullpath(fullpath); Disabled, mysql limits size of index
+
+
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql
index 7a30066c2b2..45157cdf959 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files.sql
@@ -19,13 +19,13 @@
 CREATE TABLE llx_ecm_files
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
-  label				varchar(64) NOT NULL,
+  label				varchar(64) NOT NULL,			-- label contains a md5
   entity			integer DEFAULT 1 NOT NULL,		-- multi company id
-  filepath    		varchar(750) NOT NULL,   	    -- relative to dolibarr document dir. example module/def
+  filepath    		varchar(750) NOT NULL,   	    -- relative to dolibarr document dir. Example module/def
   filename          varchar(255) NOT NULL,			-- file name only without any directory
   fullpath_orig		varchar(750),	                -- full path of original filename, when file is uploaded from a local computer
   description		text,
-  keywords          text,                           -- list of keywords, separated with comma
+  keywords          varchar(750),                   -- list of keywords, separated with comma. Must be limited to most important keywords.
   cover             text,                           -- is this file a file to use for a cover
   position          integer,                        -- position of file among others
   gen_or_uploaded   varchar(12),                    -- 'generated' or 'uploaded' 

From 902169cb665a2a925a92294407908a034a27eb84 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Dec 2016 00:40:12 +0100
Subject: [PATCH 0056/1163] Can sort on position on list of documents

---
 htdocs/core/class/html.formfile.class.php     | 98 +++++++++++--------
 .../tpl/document_actions_post_headers.tpl.php |  4 +-
 2 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index b33ea772aa8..46eeb7eaf51 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -856,26 +856,28 @@ class FormFile
 
 
     /**
-     *  Show list of documents in a directory
+     *  Show list of documents in $filearray (may be they are all in same directory but may not)
      *
-     *  @param	 array	$filearray          Array of files loaded by dol_dir_list('files') function before calling this
-     * 	@param	 Object	$object				Object on which document is linked to
-     * 	@param	 string	$modulepart			Value for modulepart used by download or viewimage wrapper
+     *  @param	 array	$filearray          Array of files loaded by dol_dir_list('files') function before calling this.
+     * 	@param	 Object	$object				Object on which document is linked to.
+     * 	@param	 string	$modulepart			Value for modulepart used by download or viewimage wrapper.
      * 	@param	 string	$param				Parameters on sort links (param must start with &, example &aaa=bbb&ccc=ddd)
-     * 	@param	 int	$forcedownload		Force to open dialog box "Save As" when clicking on file
-     * 	@param	 string	$relativepath		Relative path of docs (autodefined if not provided), relative to module.
+     * 	@param	 int	$forcedownload		Force to open dialog box "Save As" when clicking on file.
+     * 	@param	 string	$relativepath		Relative path of docs (autodefined if not provided), relative to module dir, not to MAIN_DATA_ROOT.
      * 	@param	 int	$permonobject		Permission on object (so permission to delete or crop document)
      * 	@param	 int	$useinecm			Change output for use in ecm module
      * 	@param	 string	$textifempty		Text to show if filearray is empty ('NoFileFound' if not defined)
-     *  @param   int	$maxlength          Maximum length of file name shown
+     *  @param   int	$maxlength          Maximum length of file name shown.
      *  @param	 string	$title				Title before list
      *  @param	 string $url				Full url to use for click links ('' = autodetect)
 	 *  @param	 int	$showrelpart		0=Show only filename (default), 1=Show first level 1 dir
-	 *  @param   int    $permtoeditline     Permission to edit document line (You msut provide a value, -1 is deprecated and must not be used any more)
+	 *  @param   int    $permtoeditline     Permission to edit document line (You must provide a value, -1 is deprecated and must not be used any more)
+     *  @param   string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this if you want to complete file data with database indexes.
+     *  @param   string $sortfield          Sort field ('name', 'size', 'position', ...)
+     *  @param   string $sortorder          Sort order ('ASC' or 'DESC')
      * 	@return	 int						<0 if KO, nb of files shown if OK
-     *  @return  string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT.
      */
-	function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='')
+	function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='',$sortfield='',$sortorder='ASC')
 	{
 		global $user, $conf, $langs, $hookmanager;
 		global $bc;
@@ -894,9 +896,13 @@ class FormFile
 		    $relativepath=preg_replace('/^.*\/produit\//','',$file['path']).'/';
 		}
 		// Defined relative dir to DOL_DATA_ROOT
-		$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
-		$rel_dir = preg_replace('/^[\\/]/','',$rel_dir); 
-		
+		$relativedir = '';
+		if ($upload_dir)
+		{
+    		$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
+    		$relativedir = preg_replace('/^[\\/]/','',$relativedir); 
+		}
+
 		$hookmanager->initHooks(array('formfile'));
 		$parameters=array(
 				'filearray' => $filearray,
@@ -904,7 +910,7 @@ class FormFile
 				'param' => $param,
 				'forcedownload' => $forcedownload,
 				'relativepath' => $relativepath,    // relative filename to module dir
-				'reldir' => $rel_dir,               // relative dirname to DOL_DATA_ROOT
+				'relativedir' => $relativedir,      // relative dirname to DOL_DATA_ROOT
 				'permtodelete' => $permonobject,
 				'useinecm' => $useinecm,
 				'textifempty' => $textifempty,
@@ -960,37 +966,43 @@ class FormFile
 			print "</tr>\n";
 
 			// Get list of files stored into database for same directory
-            $filearrayindatabase = dol_dir_list_in_database($rel_dir, '', null, 'name', SORT_ASC);
-
-            //var_dump($filearray);
-            //var_dump($filearrayindatabase);
-            
-            // Complete filearray with properties found into $filearrayindatabase
-			foreach($filearray as $key => $val)
+			if ($relativedir)
 			{
-			    $found=0;
-			    // Search if it exists into $filearrayindatabase
-			    foreach($filearrayindatabase as $key2 => $val2)
-			    {
-			        if ($filearrayindatabase[$key2]['name'] == $filearray[$key]['name'])
-			        {
-			            $filearray[$key]['position']=$filearrayindatabase[$key2]['position'];
-			            $filearray[$key]['cover']=$filearrayindatabase[$key2]['cover'];
-			            $filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
-			            $found=1;
-			            break;
-			        }
-			    }
-			    if (! $found)
-			    {
-			        $filearray[$key]['position']=999999;     // File not indexed are at end. So if we add a file, it will not replace existing in position
-			        $filearray[$key]['cover']=0;
-			        $filearray[$key]['acl']='';
-			    }
+                $filearrayindatabase = dol_dir_list_in_database($relativedir, '', null, 'name', SORT_ASC);
+    
+                //var_dump($filearray);
+                //var_dump($filearrayindatabase);
+                
+                // Complete filearray with properties found into $filearrayindatabase
+    			foreach($filearray as $key => $val)
+    			{
+    			    $found=0;
+    			    // Search if it exists into $filearrayindatabase
+    			    foreach($filearrayindatabase as $key2 => $val2)
+    			    {
+    			        if ($filearrayindatabase[$key2]['name'] == $filearray[$key]['name'])
+    			        {
+    			            $filearray[$key]['position']=$filearrayindatabase[$key2]['position'];
+    			            $filearray[$key]['cover']=$filearrayindatabase[$key2]['cover'];
+    			            $filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
+    			            $found=1;
+    			            break;
+    			        }
+    			    }
+    			    if (! $found)
+    			    {
+    			        $filearray[$key]['position']=999999;     // File not indexed are at end. So if we add a file, it will not replace existing in position
+    			        $filearray[$key]['cover']=0;
+    			        $filearray[$key]['acl']='';
+    			    }
+    			}
+    
+    			if ($sortfield && $sortorder)
+    			{
+        			$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
+    			}
+    			//var_dump($filearray);
 			}
-
-			$filearray=dol_sort_array($filearray, 'position');
-			//var_dump($filearray);
 			
 			$nboffiles=count($filearray);
 			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 546cec91142..a28f46f58f2 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -88,7 +88,9 @@ $formfile->list_of_documents(
     '',
     0,
     $permtoedit,
-    $upload_dir
+    $upload_dir,
+    $sortfield,
+    $sortorder
 );
 
 print "<br>";

From baf1acb4fdb861bf8923f9dfc65adae22befd088 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 13 Dec 2016 09:17:43 +0100
Subject: [PATCH 0057/1163] debug

---
 htdocs/core/class/coreobject.class.php     | 80 +++++++++++++++++++---
 htdocs/core/class/listview.class.php       | 28 +++++---
 htdocs/inventory/class/inventory.class.php | 17 +++--
 3 files changed, 101 insertions(+), 24 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 7d784073412..dc52fdd9bf5 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -25,6 +25,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 class CoreObject extends CommonObject {
 	
+	public $db;
+	
 	protected $__fields=array(); 
 	 /**
 	 *  Constructor
@@ -33,8 +35,6 @@ class CoreObject extends CommonObject {
 	 */
 	function __construct(DoliDB &$db) {
 		
-		$this->db = &$db;
-		
 		$this->date_0 = '1001-01-01 00:00:00'; //TODO there is a solution for this ?
 	}
 	
@@ -179,27 +179,55 @@ class CoreObject extends CommonObject {
 	    return implode(',', $keys);
 	}
 	
+	private function set_vars_by_db(&$obj){
+
+		foreach ($this->__fields as $field=>$info) {
+			if($this->is_date($info)){
+				if($obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00')$this->{$field} = 0;
+				else $this->{$field} = strtotime($obj->{$field});
+			}
+			elseif($this->is_array($info)){
+				$this->{$field} = @unserialize($obj->{$field});
+				//HACK POUR LES DONNES NON UTF8
+				if($this->{$field}===FALSE)@unserialize(utf8_decode($obj->{$field}));
+			}
+			elseif($this->is_int($info)){
+				$this->{$field} = (int)$obj->{$field};
+			}
+			elseif($this->is_float($info)){
+				$this->{$field} = (double)$obj->{$field};
+			}
+			elseif($this->is_null($info)){
+				$val = $obj->{$field};
+				// zero is not null 
+				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0')?null:$val);
+			}
+			else{
+				$this->{$field} = $obj->{$field};
+			}
+
+		}
+	}
+	
 	public function fetch($id, $loadChild = true) {
 		
 		if(empty($id)) return false;
 
 		$sql = 'SELECT '.$this->get_field_list().',datec,tms
-						FROM '.$this->table_element.'
+						FROM '.MAIN_DB_PREFIX.$this->table_element.'
 						WHERE rowid='.$id;
-						
+				var_dump($sql);		
 		$res = $this->db->query( $sql );
-			var_dump($sql);		
-		if($obj = $db->fetch_object($res)) {
+				
+		if($obj = $this->db->fetch_object($res)) {
 				$this->rowid=$id;
 			
-				$this->set_vars_by_db($db);
+				$this->set_vars_by_db($obj);
 
 				$this->datec=$this->db->idate($obj->datec);
 				$this->tms=$this->db->idate($obj->tms);
 				
-				if($loadChild) $this->loadChild($db);
-
-				$this->run_trigger($db, 'load');
+				if($loadChild) $this->fetchChild();
 
 				return $this->id;
 		}
@@ -208,6 +236,38 @@ class CoreObject extends CommonObject {
 		}
 		
 	}
+	
+	public function fetchChild() {
+		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
+
+			foreach($this->childtables as &$childTable) {
+					
+					$className = ucfirst($childTable);
+					
+					$this->{$className}=array();
+					
+					$sql = " SELECT rowid FROM ".MAIN_DB_PREFIX.$childTable." WHERE ".$this->fk_element."=".$this->rowid;
+					$res = $this->db->query($sql);
+					if($res) {
+						
+						while($obj = $db->fetch_object($res)) {
+							
+							$o=new $className($this->db);	
+							$o->fetch($obj->rowid);
+							
+							$this->{$className}[] = $o;
+							
+						}
+						
+					}
+
+			}
+
+		}
+
+	}
+	
+	
 	public function update() {
 		
 		
diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 0cedad18855..8df337b699c 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -820,7 +820,6 @@ class Listview {
 	}
 	
 	private function parse_sql( &$THeader, &$TField,&$TParam, $sql) {
-		global $db;	
 		
 		$this->sql = $this->limitSQL($sql, $TParam);
 		
@@ -828,17 +827,26 @@ class Listview {
 		
 		$this->THideFlip = array_flip($TParam['hide']);
 
-		$res = $db->query($this->sql);
-		$first=true;
-		while($currentLine = $db->fetch_object($res)) {
-			if($first) {
-				$this->init_entete($THeader, $TParam, $currentLine);
-				$first = false;
+		$res = $this->db->query($this->sql);
+		if($res!==false) {
+			
+			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_DEBUG);
+			
+			$first=true;
+			while($currentLine = $this->db->fetch_object($res)) {
+				if($first) {
+					$this->init_entete($THeader, $TParam, $currentLine);
+					$first = false;
+				}
+				
+				$this->set_line($TField, $TParam, $currentLine);
+				
 			}
 			
-			$this->set_line($TField, $TParam, $currentLine);
-			
 		}
-
+		else {
+			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_ERR);
+		}
+		
 	}	
 }
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index f158ab260cf..d092a876ad2 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -69,6 +69,8 @@ class Inventory extends CoreObject
 		,'title'=>array('type'=>'string')
 	);
 	
+	public $db;
+	
 	function __construct(DoliDB &$db) 
 	{
 		
@@ -292,15 +294,22 @@ class Inventory extends CoreObject
 		return 1;
 	}
     
+	public function getNomUrl($picto = 1) {
+		global $langs;
+		
+		$title = !empty($this->title) ? $this->title : $langs->trans('inventoryTitle').' '.$this->id;
+        
+        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$this->id, 1).'">'.($picto ? img_picto('','object_list.png','',0).' ' : '').$title.'</a>';
+        
+	} 
+	
     static function getLink($id) {
         global $langs,$db;
         
         $i = new Inventory($db);
         $i->fetch($id, false);
         
-        $title = !empty($i->title) ? $i->title : $langs->trans('inventoryTitle').' '.$i->id;
-        
-        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$i->id.'&action=view', 1).'">'.img_picto('','object_list.png','',0).' '.$title.'</a>';
+        return $i->getNomUrl();
         
     }
 	
@@ -309,7 +318,7 @@ class Inventory extends CoreObject
 		
 		if($type=='All') {
 			
-			$sql="SELECT i.rowid, e.label, i.date_inventory, i.fk_warehouse, i.date_cre, i.date_maj, i.status
+			$sql="SELECT i.rowid, e.label, i.date_inventory, i.fk_warehouse, i.datec, i.tms, i.status
 				  FROM ".MAIN_DB_PREFIX."inventory i
 				  LEFT JOIN ".MAIN_DB_PREFIX."entrepot e ON (e.rowid = i.fk_warehouse)
 				  WHERE i.entity=".(int) $conf->entity;

From efc22a4cd8b8dc4b6ea9c6be07c37eba0466def6 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 13 Dec 2016 09:49:59 +0100
Subject: [PATCH 0058/1163] include default list conception

---
 htdocs/core/class/coreobject.class.php     |   7 +-
 htdocs/core/class/listview.class.php       | 159 +++++++++++++--------
 htdocs/inventory/class/inventory.class.php |  11 +-
 3 files changed, 113 insertions(+), 64 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index dc52fdd9bf5..96cbbb89a88 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -27,6 +27,8 @@ class CoreObject extends CommonObject {
 	
 	public $db;
 	
+	public $withChild = true;
+	
 	protected $__fields=array(); 
 	 /**
 	 *  Constructor
@@ -216,7 +218,7 @@ class CoreObject extends CommonObject {
 		$sql = 'SELECT '.$this->get_field_list().',datec,tms
 						FROM '.MAIN_DB_PREFIX.$this->table_element.'
 						WHERE rowid='.$id;
-				var_dump($sql);		
+		
 		$res = $this->db->query( $sql );
 				
 		if($obj = $this->db->fetch_object($res)) {
@@ -238,8 +240,8 @@ class CoreObject extends CommonObject {
 	}
 	
 	public function fetchChild() {
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
 
+		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
 			foreach($this->childtables as &$childTable) {
 					
 					$className = ucfirst($childTable);
@@ -248,6 +250,7 @@ class CoreObject extends CommonObject {
 					
 					$sql = " SELECT rowid FROM ".MAIN_DB_PREFIX.$childTable." WHERE ".$this->fk_element."=".$this->rowid;
 					$res = $this->db->query($sql);
+					
 					if($res) {
 						
 						while($obj = $db->fetch_object($res)) {
diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 8df337b699c..db66f9f15a3 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -41,33 +41,30 @@ class Listview {
 		if(!isset($TParam['orderby']['noOrder']))$TParam['orderby']['noOrder']=array();
 		if(!isset($TParam['no-select'])) $TParam['no-select'] = 1;
 		
-		if(!isset($TParam['liste']))$TParam['liste']=array();
-		$TParam['liste'] = array_merge(array(
-			'messageNothing'=>"Il n'y a aucun élément à afficher."
-			,'picto_precedent'=>'&lt;'
-			,'picto_suivant'=>'&gt;'
-			,'order_down'=>img_down()
-			,'order_up'=>img_up()
+		if(!isset($TParam['list']))$TParam['list']=array();
+		$TParam['list'] = array_merge(array(
+			'messageNothing'=>$langs->trans('ListMessageNothingToShow')
 			,'noheader'=>0
 			,'useBottomPagination'=>0
 			,'image'=>''
-			,'titre'=>'Liste'
+			,'title'=>$langs->trans('List')
 			,'orderDown'=>''
 			,'orderUp'=>''
 			,'id'=>$this->id
-			,'picto_search'=>img_picto('Search', 'search.png')
 			,'head_search'=>''
 			,'export'=>array()
-			,'view_type'=>''
-		),$TParam['liste']);
+			,'view_type'=>'' //TODO to include graph or kanban instead of list
+		),$TParam['list']);
+		
+		$POSTList = GETPOST('Listview');
 		
 		if(empty($TParam['limit']))$TParam['limit']=array();
-		if(!empty($_REQUEST['TListTBS'][$this->id]['page'])) $TParam['limit']['page'] = $_REQUEST['TListTBS'][$this->id]['page'];
+		if(!empty($POSTList[$this->id]['page'])) $TParam['limit']['page'] = $POSTList[$this->id]['page'];
 		
 		$TParam['limit']=array_merge(array('page'=>1, 'nbLine'=>$conf->liste_limit, 'global'=>0), $TParam['limit']);
 		
-		if(!empty($_REQUEST['TListTBS'][$this->id]['orderBy'])) {
-			$TParam['orderBy'] = $_REQUEST['TListTBS'][$this->id]['orderBy']; 
+		if(!empty($POSTList[$this->id]['orderBy'])) {
+			$TParam['orderBy'] = $POSTList[$this->id]['orderBy']; 
 		}
 		
 	//	print_r($TParam);
@@ -124,9 +121,9 @@ class Listview {
 			// Si le type de "recherche" est "calendars" on a 2 champs de transmis, [début et fin] ou [que début] ou [que fin] => un BETWEEN Sql serait utile que dans le 1er cas 
 			// donc l'utilisation des opérateur >= et <= permettent un fonctionnement générique
 			$TSQLDate=array();
-			if(!empty($value['deb']))
+			if(!empty($value['start']))
 			{
-				$valueDeb = $this->dateToSQLDate($value['deb']);
+				$valueDeb = $this->dateToSQLDate($value['start']);
 				
 				if(isset($this->TBind[$sBindKey.'_start'])) // TODO can't use this in query case
 				{
@@ -137,9 +134,9 @@ class Listview {
 				
 			}
 			
-			if(!empty($value['fin']))
+			if(!empty($value['end']))
 			{
-				$valueFin = $this->dateToSQLDate($value['fin']);
+				$valueFin = $this->dateToSQLDate($value['end']);
 				if(isset($this->TBind[$sBindKey.'_end'])) { // TODO can't use this in query case
 					$this->TBind[$sBindKey.'_end'] = $valueFin;
 				}
@@ -198,7 +195,7 @@ class Listview {
 
 	private function search($sql,&$TParam) {
 	
-		if(!empty($_REQUEST['TListTBS'][$this->id]['search'])) {
+		if(!empty($_REQUEST['Listview'][$this->id]['search'])) {
 			$sqlGROUPBY='';
 			if(strpos($sql,'GROUP BY')!==false) { //TODO regex
 				list($sql, $sqlGROUPBY) = explode('GROUP BY', $sql);
@@ -206,7 +203,7 @@ class Listview {
 			
 			if(strpos($sql,'WHERE ')===false)$sql.=' WHERE 1 '; //TODO regex
 			
-			foreach($_REQUEST['TListTBS'][$this->id]['search'] as $key=>$value)
+			foreach($_REQUEST['Listview'][$this->id]['search'] as $key=>$value)
 			{
 				$TsKey = $this->getSearchKey($key, $TParam);
 				$TsBindKey = $this->getTsBindKey($TsKey);
@@ -222,7 +219,7 @@ class Listview {
 					//if (!empty($value)) var_dump($sKey);
 					$sBindKey = $TsBindKey[$i];
 					
-					if($allow_is_null && !empty($_REQUEST['TListTBS'][$this->id]['search_on_null'][$key]))
+					if($allow_is_null && !empty($_REQUEST['Listview'][$this->id]['search_on_null'][$key]))
 					{
 						$this->TBind[$sBindKey.'_null'] = $sKey.' IS NULL ';
 						$TSQLMore[] = $sKey.' IS NULL ';
@@ -302,31 +299,31 @@ class Listview {
 		foreach($TParam['search'] as $key=>$param_search) {
 			
 		
-			$value = isset($_REQUEST['TListTBS'][$this->id]['search'][$key]) ? $_REQUEST['TListTBS'][$this->id]['search'][$key] : '';
+			$value = isset($_REQUEST['Listview'][$this->id]['search'][$key]) ? $_REQUEST['Listview'][$this->id]['search'][$key] : '';
 			
 			$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search;  
 			
 			if(is_array($typeRecherche)) {
 				$typeRecherche = array(''=>' ') + $typeRecherche;
-				$fsearch=$form->combo('','TListTBS['.$this->id.'][search]['.$key.']', $typeRecherche,$value,0,'',' listviewtbs="combo" init-value="'.$value.'" ');
+				$fsearch=$form->combo('','Listview['.$this->id.'][search]['.$key.']', $typeRecherche,$value,0,'',' listviewtbs="combo" init-value="'.$value.'" ');
 			}
 			else if($typeRecherche==='calendar') {
-				$fsearch=$form->calendrier('','TListTBS['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
+				$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
 			}
 			else if($typeRecherche==='calendars') {
-				$fsearch=$form->calendrier('','TListTBS['.$this->id.'][search]['.$key.'][deb]',isset($value['deb'])?$value['deb']:'',10,10,' listviewtbs="calendars" ')
-					.' '.$form->calendrier('','TListTBS['.$this->id.'][search]['.$key.'][fin]',isset($value['fin'])?$value['fin']:'',10,10,' listviewtbs="calendars" ');	
+				$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.'][start]',isset($value['start'])?$value['start']:'',10,10,' listviewtbs="calendars" ')
+					.' '.$form->calendrier('','Listview['.$this->id.'][search]['.$key.'][end]',isset($value['end'])?$value['end']:'',10,10,' listviewtbs="calendars" ');	
 			}
 			else if(is_string($typeRecherche)) {
 				$fsearch=$TParam['search'][$key];	
 			}
 			else {
-				$fsearch=$form->texte('','TListTBS['.$this->id.'][search]['.$key.']',$value,15,255,' listviewtbs="input" ');	
+				$fsearch=$form->texte('','Listview['.$this->id.'][search]['.$key.']',$value,15,255,' listviewtbs="input" ');	
 			}
 
 			if(!empty($param_search['allow_is_null'])) {
-				$valueNull = isset($_REQUEST['TListTBS'][$this->id]['search_on_null'][$key]) ? 1 : 0;
-				$fsearch.=' '.$form->checkbox1('', 'TListTBS['.$this->id.'][search_on_null]['.$key.']',1, $valueNull,' onclick=" if($(this).is(\':checked\')){ $(this).prev().val(\'\'); }" ').img_help(1, $langs->trans('SearchOnNUllValue'));
+				$valueNull = isset($_REQUEST['Listview'][$this->id]['search_on_null'][$key]) ? 1 : 0;
+				$fsearch.=' '.$form->checkbox1('', 'Listview['.$this->id.'][search_on_null]['.$key.']',1, $valueNull,' onclick=" if($(this).is(\':checked\')){ $(this).prev().val(\'\'); }" ').img_help(1, $langs->trans('SearchOnNUllValue'));
 			}
 			
 
@@ -342,7 +339,7 @@ class Listview {
 				
 		}
 		
-		$search_button = ' <a href="#" onclick="TListTBS_submitSearch(this);" class="list-search-link">'.$TParam['liste']['picto_search'].'</a>';
+		$search_button = ' <a href="#" onclick="ListviewsubmitSearch(this);" class="list-search-link">'.$TParam['liste']['picto_search'].'</a>';
 
 		if(!empty($TParam['liste']['head_search'])) {
 			$TParam['liste']['head_search'].='<div align="right">'.$langs->trans('Search').' '.$search_button.'</div>';
@@ -519,22 +516,77 @@ class Listview {
 		$TExport=$this->setExport($TParam, $TField, $THeader);
 		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
-		var_dump(
-			array(
-				'entete'=>$THeader
-				,'champs'=>$TField
-				,'recherche'=>$TSearch
-				,'total'=>$TTotal
-				,'export'=>$TExport
-			)
-			, array(
-				'liste'=>array_merge(array('haveExport'=>count($TExport), 'id'=>$this->id, 'nb_columns'=>count($THeader) ,'totalNB'=>count($TField), 'nbSearch'=>count($TSearch), 'haveTotal'=>(int)!empty($TTotal), 'havePage'=>(int)!empty($TPagination) ), $TParam['liste'])
-			)
-			, $TPagination
-			
-		);
+		$out = $javaScript;
 		
-		$javaScript;
+		$out.=load_fiche_titre($TParam['list']['title']);
+		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, count($TField), 'title_products.png', 0, '', '', $limit);
+		/*
+		$out.='<table width="100%" border="0" class="notopnoleftnoright" style="margin-bottom: 2px;">
+				<tr>
+					[onshow;block=begin; when [liste.noheader]==0]
+					<td class="nobordernopadding" width="40" align="left" valign="middle">
+						[liste.image;magnet=img; strconv=no]
+					</td>
+					<td class="nobordernopadding"><div class="titre">[liste.titre; strconv=no]</div></td>
+					[onshow;block=end]
+					<td class="nobordernopadding" align="right" valign="middle">
+						<div class="pagination"> 
+							[onshow;block=div; when [liste.havePage]+-0 ]
+							<!-- [onshow;block=div;when [pagination.last]+-1 ] -->
+							<ul style="display: inline-block; list-style: outside none none;">
+								<li class="pagination" style="display: inline-block;"><a class="paginationprevious" href="javascript:TListTBS_GoToPage('[liste.id]',[pagination.prev])"><!-- [pagination.prev;endpoint;magnet=li] --> [liste.picto_precedent;strconv=no] </a></li>
+								<li class="pagination" style="display: inline-block;"><a class="page" href="javascript:TListTBS_GoToPage('[liste.id]',[pagination.page;navsize=15;navpos=centred])"> [pagination.page;block=li] </a></li>
+								<li class="pagination" style="display: inline-block;"><span class="active"> [pagination.page;block=li;currpage] </span></li>
+								<li class="pagination" style="display: inline-block;"><a class="paginationnext" href="javascript:TListTBS_GoToPage('[liste.id]',[pagination.next])"><!-- [pagination.last;endpoint;magnet=li] --> [liste.picto_suivant;strconv=no] </a></li>
+							</ul>
+						</div>
+					</td>
+				</tr>
+		</table>	
+		
+		<table id="[liste.id]" class="liste" width="100%">
+			<thead>
+				<tr class="liste_titre barre-recherche-head">
+					<td colspan="[liste.nb_columns]">[liste.head_search;strconv=no;magnet=tr]</td>
+				</tr>
+				<tr class="liste_titre">
+					<th style="width:[entete.width;];text-align:[entete.text-align]" class="liste_titre">[entete.libelle;block=th;strconv=no] 
+						<span class="nowrap">[onshow;block=span; when [entete.order]==1]<a href="javascript:TListTBS_OrderDown('[liste.id]','[entete.$;strconv=js]')">[liste.order_down;strconv=no]</a><a href="javascript:TListTBS_OrderUp('[liste.id]', '[entete.$;strconv=js]')">[liste.order_up;strconv=no]</a></span>
+						[entete.more;strconv=no;]
+					</th>
+				</tr>
+				
+				<tr class="liste_titre barre-recherche">[onshow;block=tr;when [liste.nbSearch]+-0]
+					<td class="liste_titre">[recherche.val;block=td;strconv=no]</td>
+				</tr>
+			
+			</thead>
+			<tbody>
+				<tr class="impair">
+					<!-- [champs.$;block=tr;sub1] -->
+					<td field="[champs_sub1.$]">[champs_sub1.val;block=td; strconv=no]</td>
+				</tr>
+				<tr class="pair">
+					<!-- [champs.$;block=tr;sub1] -->
+					<td field="[champs_sub1.$]">[champs_sub1.val;block=td; strconv=no]</td>
+				</tr>
+			</tbody>
+			<tfoot>
+				<tr class="liste_total">
+					[onshow;block=tr; when [liste.haveTotal]+-0 ]
+					<td align="right" field="[total.$]">[total.val;block=td;strconv=no;frm=0 000,00]</td>
+				</tr>
+			</tfoot>
+			
+		</table>
+		
+		<div class="tabsAction">
+			[onshow;block=div; when [liste.haveExport]+-0 ]
+			<a href="javascript:;" onclick="TListTBS_downloadAs(this, '[export.mode]','[export.url]','[export.token]','[export.session_name]');" class="butAction">[export.label;block=a;]</a>
+		</div>
+		<p align="center">
+			[liste.messageNothing;strconv=no] [onshow; block=p;  when [liste.totalNB]==0]
+		</p>';*/
 	}
 	
 	public function renderArray(&$db,$TField, $TParam=array()) {
@@ -611,14 +663,14 @@ class Listview {
 		global $user;
 		
 		$contextpage=md5($_SERVER['PHP_SELF']);
-		if((float)DOL_VERSION>=4.0 && empty($TParam['no-select'])) {
+		if(empty($TParam['no-select'])) {
 			
 			dol_include_once('/core/class/html.form.class.php');
 			
 			global $db,$conf,$user;
 			$form=new Form($db);
 				
-			$selectedfields = GETPOST('TListTBS_'.$this->id.'_selectedfields');
+			$selectedfields = GETPOST('Listview'.$this->id.'_selectedfields');
 			
 			if(!empty($selectedfields)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -662,7 +714,7 @@ class Listview {
 				}
 			}	
 
-			$selectedfields=$form->multiSelectArrayWithCheckbox('TListTBS_'.$this->id.'_selectedfields', $TFieldVisibility, $contextpage);	// This also change content of $arrayfields_0
+			$selectedfields=$form->multiSelectArrayWithCheckbox('Listview'.$this->id.'_selectedfields', $TFieldVisibility, $contextpage);	// This also change content of $arrayfields_0
 			
 		}
 		
@@ -721,17 +773,6 @@ class Listview {
 						else $value=(string)$value;
 					} 
 					
-					if(isset($TParam['subQuery'][$field])) {
-						$dbSub = new TPDOdb; //TODO finish it
-						$dbSub->Execute( strtr($TParam['subQuery'][$field], array_merge( $trans, array('@val@'=>$value)  )) );
-						$subResult = '';
-						while($dbSub->Get_line()) {
-							$subResult.= implode(', ',$dbSub->currentLine).'<br />';
-						}
-						$value=$subResult;
-						$dbSub->close();
-					}
-					
 					$trans['@'.$field.'@'] = $value;
 					
 					if(!empty($TParam['math'][$field])) {
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index d092a876ad2..59ad70cec4e 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -87,7 +87,8 @@ class Inventory extends CoreObject
 	
 	function sort_det() 
 	{
-		usort($this->Inventorydet, array('Inventory', 'customSort'));
+
+		if(!empty($this->Inventorydet))	usort($this->Inventorydet, array('Inventory', 'customSort'));
 	}
 	
 	function fetch($id,$annexe = true) 
@@ -99,8 +100,12 @@ class Inventory extends CoreObject
 		$this->sort_det();
 		
 		$this->amount = 0;
-		foreach($this->Inventorydet as &$det){
-			$this->amount+=$det->qty_view * $det->pmp;
+		
+		if(!empty($this->Inventorydet ))  {
+			foreach($this->Inventorydet as &$det){
+				$this->amount+=$det->qty_view * $det->pmp;
+			}
+			
 		}
 		
 		return $res;

From a99ac7fb6b0098b1ff2193d28e0aca3ba40b6cc9 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Tue, 13 Dec 2016 16:52:49 +0100
Subject: [PATCH 0059/1163] taking account @eldy remarks

---
 htdocs/core/modules/modSociete.class.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 7984ed7f6a1..af4da616ce9 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -282,8 +282,12 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as paymode ON s.mode_reglement = paymode.id';
 		$this->export_sql_end[$r] .=' WHERE s.entity IN ('.getEntity('societe', 1).')';
 		if(!$user->rights->societe->client->voir) {
-			$subordinatesids = $user->getAllChildIds();
-			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' '.count($subronidatesids)>0 ? ' OR (sc.fk_user IN ('.implode(',',$subronidatesids).'))' : '';
+			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' ';
+			if ($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS) {
+				$subordinatesids = $user->getAllChildIds();
+				$this->export_sql_end[$r] .=count($subronidatesids)>0 ? ' OR (sc.fk_user IN ('.implode(',',$subronidatesids).')' : '';
+			}
+			$this->export_sql_end[$r] .=')';
 		}
 
 		// Export list of contacts and attributes
@@ -315,8 +319,12 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = c.rowid';
 		$this->export_sql_end[$r] .=' WHERE c.entity IN ('.getEntity("societe", 1).')';
 		if(!$user->rights->societe->client->voir) {
-			$subordinatesids = $user->getAllChildIds();
-			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' '.count($subronidatesids)>0 ? ' OR (sc.fk_user IN ('.implode(',',$subronidatesids).'))' : '';
+			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' ';
+			if ($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS) {
+				$subordinatesids = $user->getAllChildIds();
+				$this->export_sql_end[$r] .=count($subronidatesids)>0 ? ' OR (sc.fk_user IN ('.implode(',',$subronidatesids).')' : '';
+			}
+			$this->export_sql_end[$r] .=')';
 		}
 
 

From a636d27ccbfc1e5ea59862af1d7e909b382ffff7 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Wed, 14 Dec 2016 14:34:12 +0100
Subject: [PATCH 0060/1163] Div

---
 htdocs/core/class/coreobject.class.php     |  22 +-
 htdocs/core/class/listview.class.php       | 144 ++--
 htdocs/core/lib/functions.lib.php          | 114 ++-
 htdocs/inventory/class/inventory.class.php |  24 +-
 htdocs/inventory/img/inventory.png         | Bin 0 -> 1802 bytes
 htdocs/inventory/inventory.php             | 797 +++++++++++++++++++++
 htdocs/inventory/lib/inventory.lib.php     | 245 +++++++
 htdocs/inventory/tpl/inventory.tpl.php     | 211 ++++++
 8 files changed, 1433 insertions(+), 124 deletions(-)
 create mode 100644 htdocs/inventory/img/inventory.png
 create mode 100644 htdocs/inventory/inventory.php
 create mode 100644 htdocs/inventory/lib/inventory.lib.php
 create mode 100644 htdocs/inventory/tpl/inventory.tpl.php

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 96cbbb89a88..b7e4b2770e3 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -1,5 +1,7 @@
 <?php
-/* Copyright (C) 2016		ATM Consulting			<support@atm-consulting.fr>
+/* EXPERIMENTAL
+ * 
+ * Copyright (C) 2016		ATM Consulting			<support@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -220,9 +222,8 @@ class CoreObject extends CommonObject {
 						WHERE rowid='.$id;
 		
 		$res = $this->db->query( $sql );
-				
 		if($obj = $this->db->fetch_object($res)) {
-				$this->rowid=$id;
+				$this->id=$id;
 			
 				$this->set_vars_by_db($obj);
 
@@ -248,12 +249,12 @@ class CoreObject extends CommonObject {
 					
 					$this->{$className}=array();
 					
-					$sql = " SELECT rowid FROM ".MAIN_DB_PREFIX.$childTable." WHERE ".$this->fk_element."=".$this->rowid;
+					$sql = " SELECT rowid FROM ".MAIN_DB_PREFIX.$childTable." WHERE ".$this->fk_element."=".$this->id;
 					$res = $this->db->query($sql);
 					
 					if($res) {
-						
-						while($obj = $db->fetch_object($res)) {
+						$Tab=array();
+						while($obj = $this->db->fetch_object($res)) {
 							
 							$o=new $className($this->db);	
 							$o->fetch($obj->rowid);
@@ -282,5 +283,14 @@ class CoreObject extends CommonObject {
 		
 	}
 	
+	public function get_date($field,$format='') {
+		if(empty($this->{$field})) return '';
+		elseif($this->{$field}<=strtotime('1000-01-01 00:00:00')) return '';
+		else {
+			return dol_print_date($this->{$field}, $format);
+		}
+	
+	}
+	
 	
 }
diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index db66f9f15a3..e94a648ec27 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -1,7 +1,8 @@
 <?php
 /*
+ EXPERIMENTAL
  
- Copyright (C) 2013-2015 ATM Consulting <support@atm-consulting.fr>
+ Copyright (C) 2016 ATM Consulting <support@atm-consulting.fr>
 
  This program and all files within this directory and sub directory
  is free software: you can redistribute it and/or modify it under 
@@ -505,88 +506,91 @@ class Listview {
 	}
 	
 	private function renderList(&$THeader, &$TField, &$TTotal,&$TTotalGroup, &$TParam) {
-			
+		
 		$javaScript = $this->getJS($TParam);
 		
-		$TPagination=array(
+		/*$TPagination=array(
 			'pagination'=>array('pageSize'=>$TParam['limit']['nbLine'], 'pageNum'=>$TParam['limit']['page'], 'blockName'=>'champs', 'totalNB'=>count($TField))
-		);
+		);*/
 		
 		$TSearch = $this->setSearch($THeader, $TParam);
 		$TExport=$this->setExport($TParam, $TField, $THeader);
 		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
 		$out = $javaScript;
+		$out.=load_fiche_titre($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $TParam['limit']['page'], count($TField), 'title_products.png', 0, '', '', $limit);
+		$out.='<table id="'.$this->id.'" class="liste" width="100%">
+			<thead>';
 		
-		$out.=load_fiche_titre($TParam['list']['title']);
-		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, count($TField), 'title_products.png', 0, '', '', $limit);
-		/*
-		$out.='<table width="100%" border="0" class="notopnoleftnoright" style="margin-bottom: 2px;">
-				<tr>
-					[onshow;block=begin; when [liste.noheader]==0]
-					<td class="nobordernopadding" width="40" align="left" valign="middle">
-						[liste.image;magnet=img; strconv=no]
-					</td>
-					<td class="nobordernopadding"><div class="titre">[liste.titre; strconv=no]</div></td>
-					[onshow;block=end]
-					<td class="nobordernopadding" align="right" valign="middle">
-						<div class="pagination"> 
-							[onshow;block=div; when [liste.havePage]+-0 ]
-							<!-- [onshow;block=div;when [pagination.last]+-1 ] -->
-							<ul style="display: inline-block; list-style: outside none none;">
-								<li class="pagination" style="display: inline-block;"><a class="paginationprevious" href="javascript:TListTBS_GoToPage('[liste.id]',[pagination.prev])"><!-- [pagination.prev;endpoint;magnet=li] --> [liste.picto_precedent;strconv=no] </a></li>
-								<li class="pagination" style="display: inline-block;"><a class="page" href="javascript:TListTBS_GoToPage('[liste.id]',[pagination.page;navsize=15;navpos=centred])"> [pagination.page;block=li] </a></li>
-								<li class="pagination" style="display: inline-block;"><span class="active"> [pagination.page;block=li;currpage] </span></li>
-								<li class="pagination" style="display: inline-block;"><a class="paginationnext" href="javascript:TListTBS_GoToPage('[liste.id]',[pagination.next])"><!-- [pagination.last;endpoint;magnet=li] --> [liste.picto_suivant;strconv=no] </a></li>
-							</ul>
-						</div>
-					</td>
-				</tr>
-		</table>	
+		if(!empty($TParam['liste']['head_search'])) {
+			$out.='<tr class="liste_titre barre-recherche-head">
+					<td colspan="'.$TParam['liste']['nb_columns'].'">'.$TParam['liste']['head_search'].'</td>
+				</tr>';
+		}
+			
+		$out.='<tr class="liste_titre">';
 		
-		<table id="[liste.id]" class="liste" width="100%">
-			<thead>
-				<tr class="liste_titre barre-recherche-head">
-					<td colspan="[liste.nb_columns]">[liste.head_search;strconv=no;magnet=tr]</td>
-				</tr>
-				<tr class="liste_titre">
-					<th style="width:[entete.width;];text-align:[entete.text-align]" class="liste_titre">[entete.libelle;block=th;strconv=no] 
-						<span class="nowrap">[onshow;block=span; when [entete.order]==1]<a href="javascript:TListTBS_OrderDown('[liste.id]','[entete.$;strconv=js]')">[liste.order_down;strconv=no]</a><a href="javascript:TListTBS_OrderUp('[liste.id]', '[entete.$;strconv=js]')">[liste.order_up;strconv=no]</a></span>
-						[entete.more;strconv=no;]
-					</th>
-				</tr>
+		foreach($THeader as $head) {
+			$out.='<th style="width:'.$head['width'].';text-align:'.$head['text-align'].'" class="liste_titre">'.$head['libelle'];
+						
+			if($head['order']) $out.='<span class="nowrap">[onshow;block=span; when [entete.order]==1]<a href="javascript:Listview_OrderDown(\'[liste.id]\',\'[entete.$;strconv=js]\')">'.img_down().'</a>
+								<a href="javascript:Listview_OrderUp(\'[liste.id]\', \'[entete.$;strconv=js]\')">'.img_up().'</a></span>';
+			
+			$out.=$head['more'];
+			$out.='</th>';
+		}
+		
+		$out.='</tr>';
+			
+		if(!empty($TParam['liste']['nbSearch'])) {
+		$out.='<tr class="liste_titre barre-recherche">
+					<td class="liste_titre">'.img_search().'</td>
+				</tr>';
+		}
 				
-				<tr class="liste_titre barre-recherche">[onshow;block=tr;when [liste.nbSearch]+-0]
-					<td class="liste_titre">[recherche.val;block=td;strconv=no]</td>
-				</tr>
-			
-			</thead>
-			<tbody>
-				<tr class="impair">
-					<!-- [champs.$;block=tr;sub1] -->
-					<td field="[champs_sub1.$]">[champs_sub1.val;block=td; strconv=no]</td>
-				</tr>
-				<tr class="pair">
-					<!-- [champs.$;block=tr;sub1] -->
-					<td field="[champs_sub1.$]">[champs_sub1.val;block=td; strconv=no]</td>
-				</tr>
-			</tbody>
-			<tfoot>
-				<tr class="liste_total">
-					[onshow;block=tr; when [liste.haveTotal]+-0 ]
-					<td align="right" field="[total.$]">[total.val;block=td;strconv=no;frm=0 000,00]</td>
-				</tr>
-			</tfoot>
-			
-		</table>
+		$out.='</thead><tbody>';
 		
-		<div class="tabsAction">
-			[onshow;block=div; when [liste.haveExport]+-0 ]
-			<a href="javascript:;" onclick="TListTBS_downloadAs(this, '[export.mode]','[export.url]','[export.token]','[export.session_name]');" class="butAction">[export.label;block=a;]</a>
-		</div>
-		<p align="center">
-			[liste.messageNothing;strconv=no] [onshow; block=p;  when [liste.totalNB]==0]
-		</p>';*/
+		$class='pair';
+		
+		if(empty($TField)) {
+			$out.='<tr class="'.$class.'">
+					<td colspan="'.$TParam['liste']['nb_columns'].'">'.$TParam['liste']['messageNothing'].'</td></tr>';
+			
+		}
+		else{
+			
+			foreach($TField as $fields) { //TODO pagination limit
+					
+				$class = ($class=='pair') ? 'impair' : 'pair';
+				$out.='<tr class="'.$class.'"> <!-- '.$field.' -->';
+			
+				foreach($fields as $field=>$value) {
+					$out.='<td field="'.$field.'">'.$value.'</td>';
+				}
+					
+				$out.='</tr>';
+					
+			}
+			
+			$out.='</tbody>';
+			
+			if(!empty($TParam['liste']['haveTotal'])) {
+				$out.='<tfoot>
+				<tr class="liste_total">';
+			
+				foreach($TTotal as $field=>$total) {
+					$out.='<td align="right" field="'.$field.'">'.price($total).'</td>';
+				}
+					
+				$out.='</tr></tfoot>';
+			}
+				
+		}
+		
+			
+		$out.='</table>';
+		
+		return $out;
 	}
 	
 	public function renderArray(&$db,$TField, $TParam=array()) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 082177b5cbc..c4b21e4ee82 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3157,7 +3157,7 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
 }
 
 /**
- *	Print a title with navigation controls for pagination
+ *	return a title with navigation controls for pagination
  *
  *	@param	string	    $titre				Title to show (required)
  *	@param	int   	    $page				Numero of page to show in navigation links (required)
@@ -3176,7 +3176,7 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
  *  @param  int         $hideselectlimit    Force to hide select limit
  *	@return	void
  */
-function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=-1, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=-1, $hideselectlimit=0)
+function load_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=-1, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=-1, $hideselectlimit=0)
 {
 	global $conf,$langs;
 	
@@ -3196,27 +3196,26 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 		$nextpage = 0;
 	}
 	//print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;
-	
-	print "\n";
-	print "<!-- Begin title '".$titre."' -->\n";
-	print '<table width="100%" border="0" class="notopnoleftnoright'.($morecss?' '.$morecss:'').'" style="margin-bottom: 6px;"><tr>';
+	$out = "\n";
+	$out.= "<!-- Begin title '".$titre."' -->\n";
+	$out.='<table width="100%" border="0" class="notopnoleftnoright'.($morecss?' '.$morecss:'').'" style="margin-bottom: 6px;"><tr>';
 
 	// Left
-	//if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
-	print '<td class="nobordernopadding valignmiddle">';
-	if ($picto && $titre) print img_picto('', $picto, 'class="hideonsmartphone valignmiddle" id="pictotitle"', $pictoisfullpath);
-	print '<div class="titre inline-block">'.$titre;
-	if (!empty($titre) && $savtotalnboflines >= 0) print ' ('.$totalnboflines.')';
-	print '</div></td>';
+	//if ($picto && $titre) $out.='<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
+	$out.='<td class="nobordernopadding valignmiddle">';
+	if ($picto && $titre) $out.=img_picto('', $picto, 'class="hideonsmartphone valignmiddle" id="pictotitle"', $pictoisfullpath);
+	$out.='<div class="titre inline-block">'.$titre;
+	if (!empty($titre) && $savtotalnboflines >= 0) $out.=' ('.$totalnboflines.')';
+	$out.='</div></td>';
 
 	// Center
 	if ($center)
 	{
-		print '<td class="nobordernopadding center valignmiddle">'.$center.'</td>';
+		$out.='<td class="nobordernopadding center valignmiddle">'.$center.'</td>';
 	}
 
 	// Right
-	print '<td class="nobordernopadding valignmiddle" align="right">';
+	$out.='<td class="nobordernopadding valignmiddle" align="right">';
 	if ($sortfield) $options .= "&amp;sortfield=".$sortfield;
 	if ($sortorder) $options .= "&amp;sortorder=".$sortorder;
 	// Show navigation bar
@@ -3265,15 +3264,39 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 			$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="active"':'data-role="button"').'>'.($page+1)."</li>";
 		}
 	}
-	print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtml, $savlimit, $totalnboflines, $hideselectlimit);		// output the div and ul for previous/last completed with page numbers into $pagelist
-	print '</td>';
+	$out.=load_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtml, $savlimit, $totalnboflines, $hideselectlimit);		// output the div and ul for previous/last completed with page numbers into $pagelist
+	$out.='</td>';
 
-	print '</tr></table>'."\n";
-	print "<!-- End title -->\n\n";
+	$out.='</tr></table>'."\n";
+	$out.="<!-- End title -->\n\n";
+}
+/**
+ *	Print a title with navigation controls for pagination
+ *
+ *	@param	string	    $titre				Title to show (required)
+ *	@param	int   	    $page				Numero of page to show in navigation links (required)
+ *	@param	string	    $file				Url of page (required)
+ *	@param	string	    $options         	More parameters for links ('' by default, does not include sortfield neither sortorder)
+ *	@param	string    	$sortfield       	Field to sort on ('' by default)
+ *	@param	string	    $sortorder       	Order to sort ('' by default)
+ *	@param	string	    $center          	String in the middle ('' by default). We often find here string $massaction comming from $form->selectMassAction() 
+ *	@param	int		    $num				Number of records found by select with limit+1
+ *	@param	int		    $totalnboflines		Total number of records/lines for all pages (if known). Use a negative value to not show number.
+ *	@param	string	    $picto				Icon to use before title (should be a 32x32 transparent png file)
+ *	@param	int		    $pictoisfullpath	1=Icon name is a full absolute url of image
+ *  @param	string	    $morehtml			More html to show
+ *  @param  string      $morecss            More css to the table
+ *  @param  int         $limit              Max number of lines (-1 = use default, 0 = no limit, > 0 = limit).
+ *  @param  int         $hideselectlimit    Force to hide select limit
+ *	@return	void
+ */
+function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=-1, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=-1, $hideselectlimit=0)
+{
+	echo load_barre_liste($titre, $page, $file, $options, $sortfield, $sortorder, $center, $num, $totalnboflines, $picto, $pictoisfullpath, $morehtml, $morecss, $limit, $hideselectlimit);
 }
 
 /**
- *	Function to show navigation arrows into lists
+ *	Function to return navigation arrows into lists
  *
  *	@param	int				$page				Number of page
  *	@param	string			$file				Page URL (in most cases provided with $_SERVER["PHP_SELF"])
@@ -3286,11 +3309,11 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
  *  @param  int             $hideselectlimit    Force to hide select limit
  *	@return	void
  */
-function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betweenarrows='', $afterarrows='', $limit=-1, $totalnboflines=0, $hideselectlimit=0)
+function load_fleche_navigation($page, $file, $options='', $nextpage=0, $betweenarrows='', $afterarrows='', $limit=-1, $totalnboflines=0, $hideselectlimit=0)
 {
 	global $conf, $langs;
 
-	print '<div class="pagination"><ul>';
+	$out='<div class="pagination"><ul>';
 	if ((int) $limit >= 0 && empty($hideselectlimit))
 	{
 	    $pagesizechoices='10:10,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';
@@ -3298,8 +3321,8 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
 	    //$pagesizechoices.=',2:2';
 	    if (! empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices=$conf->global->MAIN_PAGESIZE_CHOICES;
 	     
-        print '<li class="pagination">';
-        print '<select class="flat selectlimit" name="limit">';
+        $out.='<li class="pagination">';
+        $out.='<select class="flat selectlimit" name="limit">';
         $tmpchoice=explode(',',$pagesizechoices);
         $tmpkey=$limit.':'.$limit;
         if (! in_array($tmpkey, $tmpchoice)) $tmpchoice[]=$tmpkey;
@@ -3320,13 +3343,13 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
                     $selected = ' selected="selected"';
                     $found = true;
                 }
-                print '<option name="'.$key.'"'.$selected.'>'.dol_escape_htmltag($val).'</option>'."\n";
+                $out.='<option name="'.$key.'"'.$selected.'>'.dol_escape_htmltag($val).'</option>'."\n";
             }
         }
-        print '</select>';
+        $out.='</select>';
         if ($conf->use_javascript_ajax)
         {
-            print '<!-- JS CODE TO ENABLE select limit to launch submit of page -->
+            $out.='<!-- JS CODE TO ENABLE select limit to launch submit of page -->
             		<script type="text/javascript">
                 	jQuery(document).ready(function () {
             	  		jQuery(".selectlimit").change(function() {
@@ -3337,31 +3360,48 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
             		</script>
                 ';
         }
-        print '</li>';	    
+        $out.='</li>';	    
 	}
 	if ($page > 0)
 	{
-		if (($conf->dol_use_jmobile != 4)) print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page-1).$options.'"><</a></li>';
-		else print '<li><a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$file.'?page='.($page-1).$options.'">'.$langs->trans("Previous").'</a></li>';
+		if (($conf->dol_use_jmobile != 4)) $out.='<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page-1).$options.'"><</a></li>';
+		else $out.='<li><a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$file.'?page='.($page-1).$options.'">'.$langs->trans("Previous").'</a></li>';
 	}
 	if ($betweenarrows)
 	{
-		print $betweenarrows;
+		$out.=$betweenarrows;
 	}
 	if ($nextpage > 0)
 	{
-		if (($conf->dol_use_jmobile != 4)) print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page+1).$options.'">></a></li>';
-		else print '<li><a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$file.'?page='.($page+1).$options.'">'.$langs->trans("Next").'</a></li>';
+		if (($conf->dol_use_jmobile != 4)) $out.='<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page+1).$options.'">></a></li>';
+		else $out.='<li><a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$file.'?page='.($page+1).$options.'">'.$langs->trans("Next").'</a></li>';
 	}
 	if ($afterarrows)
 	{
-		print '<li class="paginationafterarrows">';
-		print $afterarrows;
-		print '</li>';
+		$out.='<li class="paginationafterarrows">';
+		$out.=$afterarrows;
+		$out.='</li>';
 	}
-	print '</ul></div>'."\n";
+	$out.='</ul></div>'."\n";
+}
+/**
+ *	Function to show navigation arrows into lists
+ *
+ *	@param	int				$page				Number of page
+ *	@param	string			$file				Page URL (in most cases provided with $_SERVER["PHP_SELF"])
+ *	@param	string			$options         	Other url paramaters to propagate ("" by default, may include sortfield and sortorder)
+ *	@param	integer			$nextpage	    	Do we show a next page button
+ *	@param	string			$betweenarrows		HTML content to show between arrows. MUST contains '<li> </li>' tags or '<li><span> </span></li>'.
+ *  @param	string			$afterarrows		HTML content to show after arrows. Must NOT contains '<li> </li>' tags.
+ *  @param  int             $limit              Max nb of record to show  (-1 = no combo with limit, 0 = no limit, > 0 = limit)
+ *	@param	int		        $totalnboflines		Total number of records/lines for all pages (if known)
+ *  @param  int             $hideselectlimit    Force to hide select limit
+ *	@return	void
+ */
+function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betweenarrows='', $afterarrows='', $limit=-1, $totalnboflines=0, $hideselectlimit=0)
+{
+	echo load_fleche_navigation($page, $file, $options, $nextpage, $betweenarrows, $afterarrows, $limit, $totalnboflines, $hideselectlimit);
 }
-
 
 /**
  *	Return a string with VAT rate label formated for view output
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 59ad70cec4e..2a485d24a0a 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -97,17 +97,20 @@ class Inventory extends CoreObject
         if(!$annexe) $this->withChild = false;
         
 		$res = parent::fetch($id);
-		$this->sort_det();
 		
-		$this->amount = 0;
-		
-		if(!empty($this->Inventorydet ))  {
-			foreach($this->Inventorydet as &$det){
-				$this->amount+=$det->qty_view * $det->pmp;
-			}
+		if($res>0) {
+			$this->sort_det();
 			
+			$this->amount = 0;
+			
+			if(!empty($this->Inventorydet ))  {
+				foreach($this->Inventorydet as &$det){
+					$this->amount+=$det->qty_view * $det->pmp;
+				}
+				
+			}
 		}
-		
+				
 		return $res;
 	}
 	
@@ -312,9 +315,8 @@ class Inventory extends CoreObject
         global $langs,$db;
         
         $i = new Inventory($db);
-        $i->fetch($id, false);
-        
-        return $i->getNomUrl();
+        if($i->fetch($id, false)>0) return $i->getNomUrl();
+        else return $langs->trans('InventoryUnableToFetchObject');
         
     }
 	
diff --git a/htdocs/inventory/img/inventory.png b/htdocs/inventory/img/inventory.png
new file mode 100644
index 0000000000000000000000000000000000000000..e54ad0eef7d76b373e8769153f9039a75681ab3b
GIT binary patch
literal 1802
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

literal 0
HcmV?d00001

diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
new file mode 100644
index 00000000000..d46f05059b4
--- /dev/null
+++ b/htdocs/inventory/inventory.php
@@ -0,0 +1,797 @@
+<?php
+/* Copyright (C) 2016		ATM Consulting			<support@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/inventory/inventory.php
+ *	\ingroup    product
+ *	\brief      File of class to manage inventory
+ */
+ 
+require_once '../main.inc.php';
+
+ini_set('memory_limit', '512M');
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php';
+require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/inventory/lib/inventory.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+
+set_time_limit(0);
+
+if(!$user->rights->inventory->read) accessforbidden();
+
+$langs->load("inventory");
+
+_action();
+
+function _action() 
+{
+	global $user, $db, $conf, $langs;	
+	
+	/*******************************************************************
+	* ACTIONS
+	*
+	* Put here all code to do according to value of "action" parameter
+	********************************************************************/
+
+	$action=GETPOST('action');
+	
+	switch($action) {
+		case 'list':
+			_list();
+
+			break;
+		
+		case 'create':
+			if (!$user->rights->inventory->create) accessforbidden();
+			
+			$inventory = new Inventory($db);
+			
+			_fiche_warehouse($user, $db, $conf, $langs, $inventory);
+
+			break;
+		
+		case 'confirmCreate':
+			if (!$user->rights->inventory->create) accessforbidden();
+			
+			
+			$inventory = new Inventory($db);
+			$inventory->set_values($_REQUEST);
+			
+            $fk_inventory = $inventory->save();
+            $fk_category = (int)GETPOST('fk_category');
+            $fk_supplier = (int)GETPOST('fk_supplier');
+            $fk_warehouse = (int)GETPOST('fk_warehouse');
+			$only_prods_in_stock = (int)GETPOST('OnlyProdsInStock');
+            
+			$e = new Entrepot($db);
+			$e->fetch($fk_warehouse);
+			$TChildWarehouses = array($fk_warehouse);
+			if(method_exists($e, 'get_children_warehouses')) $e->get_children_warehouses($fk_warehouse, $TChildWarehouses);
+			
+			$sql = 'SELECT ps.fk_product, ps.fk_entrepot 
+			     FROM '.MAIN_DB_PREFIX.'product_stock ps 
+			     INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = ps.fk_product) 
+                 LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product cp ON (cp.fk_product = p.rowid)
+				 LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price pfp ON (pfp.fk_product = p.rowid)
+			     WHERE ps.fk_entrepot IN ('.implode(', ', $TChildWarehouses).')';
+			
+            if($fk_category>0) $sql.= " AND cp.fk_categorie=".$fk_category;
+			if($fk_supplier>0) $sql.= " AND pfp.fk_soc=".$fk_supplier;
+			if($only_prods_in_stock>0) $sql.= ' AND ps.reel > 0';
+			
+			$sql.=' GROUP BY ps.fk_product, ps.fk_entrepot
+					ORDER BY p.ref ASC,p.label ASC';
+                 
+                 
+			$Tab = $PDOdb->ExecuteAsArray($sql);
+			
+			foreach($Tab as &$row) {
+			
+                $inventory->add_product($PDOdb, $row->fk_product, $row->fk_entrepot);
+			}
+			
+			$inventory->save($PDOdb);
+			
+			header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=edit', 1));
+		
+		case 'edit':
+			if (!$user->rights->inventory->write) accessforbidden();
+			
+			
+			$id = __get('id', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, __get('action', 'edit', 'string'));
+			
+			break;
+			
+		case 'save':
+			if (!$user->rights->inventory->write) accessforbidden();
+			
+			
+			$id = __get('id', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			$inventory->set_values($_REQUEST);
+			
+			if ($inventory->errors)
+			{
+				setEventMessage($inventory->errors, 'errors');
+				_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+			}
+			else 
+			{
+				$inventory->save($PDOdb);
+				header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=view', 1));
+			}
+			
+			break;
+			
+		case 'regulate':
+			
+			$id = __get('id', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+            
+            if($inventory->status == 0) {
+                $inventory->status = 1;
+                $inventory->save($PDOdb);
+                
+                _fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'view');
+                
+            
+            }
+            else {
+               _fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'view');
+            }
+            
+			break;
+			
+		case 'changePMP':
+			
+			$id = __get('id', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			$inventory->changePMP($PDOdb);
+			
+			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'view');
+			
+			break;
+			
+		case 'add_line':
+			if (!$user->rights->inventory->write) accessforbidden();
+			
+			
+			$id = __get('id', 0, 'int');
+			$fk_warehouse = __get('fk_warehouse', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			$type = (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) ? 'string' : 'int'); //AA heu ?
+			
+			$fk_product = __get('fk_product', 0, $type);
+			
+			if ($fk_product)
+			{
+				$product = new Product($db);
+				$product->fetch($fk_product);	// ! ref TODO vérifier quand même			
+				if($product->type != 0) {
+					setEventMessage($langs->trans('ThisIsNotAProduct'),'errors');
+				}
+				else{
+					
+					//Check product not already exists
+					$alreadyExists = false;
+					foreach ($inventory->Inventorydet as $invdet)
+					{
+						if ($invdet->fk_product == $product->id
+							&& $invdet->fk_warehouse == $fk_warehouse)
+						{
+							$alreadyExists = true;
+							break;
+						}
+					}
+					
+					if (!$alreadyExists)
+					{
+					    $inventory->add_product($PDOdb, $product->id, $fk_warehouse);
+                        
+					}
+					else
+					{
+						setEventMessage($langs->trans('inventoryWarningProductAlreadyExists'), 'warnings');
+					}
+					
+				}
+				
+				$inventory->save($PDOdb);
+				$inventory->sort_det();
+			}
+			
+			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+			
+			break;
+			
+		case 'delete_line':
+			if (!$user->rights->inventory->write) accessforbidden();
+			
+			
+			//Cette action devrais se faire uniquement si le status de l'inventaire est à 0 mais aucune vérif
+			$rowid = __get('rowid', 0, 'int');
+			$Inventorydet = new Inventory($db);
+			$Inventorydet->load($PDOdb, $rowid);
+			$Inventorydet->delete($PDOdb);
+			
+			$id = __get('id', 0, 'int');
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+			
+			break;
+        case 'flush':
+            if (!$user->rights->inventory->create) accessforbidden();
+            
+            
+            $id = __get('id', 0, 'int');
+            
+            $inventory = new Inventory($db);
+            $inventory->load($PDOdb, $id);
+            
+            $inventory->deleteAllLine($PDOdb);
+            
+            setEventMessage('Inventaire vidé');
+            
+            _fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+           
+            
+            break;
+		case 'delete':
+			if (!$user->rights->inventory->create) accessforbidden();
+            
+			
+			$id = __get('id', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			$inventory->delete($PDOdb);
+			
+			header('Location: '.dol_buildpath('/inventory/inventory.php', 1));
+			exit;
+			//_list();
+			
+		case 'printDoc':
+			
+			$id = __get('id', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			generateODT($PDOdb, $db, $conf, $langs, $inventory);
+			break;
+			
+		case 'exportCSV':
+			
+			$id = __get('id', 0, 'int');
+			
+			$inventory = new Inventory($db);
+			$inventory->load($PDOdb, $id);
+			
+			exportCSV($inventory);
+			
+			exit;
+			break;
+			
+		default:
+			if (!$user->rights->inventory->write) accessforbidden();
+				
+			$id = GETPOST('id');
+				
+			$inventory = new Inventory($db);
+			$inventory->fetch($id);
+				
+			_card($inventory, $action );
+				
+			
+			break;
+	}
+	
+}
+
+function _list() 
+{
+	
+	global $db, $conf, $langs, $user;
+		
+	llxHeader('',$langs->trans('inventoryListTitle'),'','');
+	
+	$inventory = new Inventory($db);
+	$l = new ListView($db,'listInventory');
+
+	$THide = array('label');
+
+	echo $l->render(Inventory::getSQL('All'), array(
+		'limit'=>array(
+			'nbLine'=>'30'
+		)
+		,'subQuery'=>array()
+		,'link'=>array(
+			'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
+		)
+		,'translate'=>array()
+		,'hide'=>$THide
+		,'type'=>array(
+			'date_cre'=>'date'
+			,'date_maj'=>'datetime'
+			,'date_inventory'=>'date'
+		)
+		,'liste'=>array(
+			'titre'=>$langs->trans('inventoryListTitle')
+			,'image'=>img_picto('','title.png', '', 0)
+			,'picto_precedent'=>img_picto('','back.png', '', 0)
+			,'picto_suivant'=>img_picto('','next.png', '', 0)
+			,'noheader'=> (int)isset($_REQUEST['fk_soc']) | (int)isset($_REQUEST['fk_product'])
+			,'messageNothing'=>$langs->trans('inventoryListEmpty')
+			,'picto_search'=>img_picto('','search.png', '', 0)
+		)
+		,'title'=>array(
+			'rowid'=>$langs->trans('Title')
+			,'fk_warehouse'=>$langs->trans('Warehouse')
+			,'date_inventory'=>$langs->trans('InventoryDate')
+			,'datec'=>$langs->trans('DateCreation')
+			,'tms'=>$langs->trans('DateUpdate')
+			,'status'=>$langs->trans('Status')
+		)
+		,'eval'=>array(
+			'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))'
+			,'rowid'=>'Inventory::getLink(@val@)'
+            
+		)
+	));
+
+
+	if ($user->rights->inventory->create)
+	{
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="inventory.php?action=create">'.$langs->trans('inventoryCreate').'</a>';
+		print '</div>';
+	}
+
+	llxFooter('');
+}
+
+function _fiche_warehouse(&$PDOdb, &$user, &$db, &$conf, $langs, $inventory)
+{
+	dol_include_once('/categories/class/categorie.class.php');    
+        
+	llxHeader('',$langs->trans('inventorySelectWarehouse'),'','');
+	print dol_get_fiche_head(inventoryPrepareHead($inventory));
+	
+	$form=new TFormCore('inventory.php', 'confirmCreate');
+	print $form->hidden('action', 'confirmCreate');
+	$form->Set_typeaff('edit');
+	
+    $formproduct = new FormProduct($db);
+    $formDoli = new Form($db);
+    
+    ?>
+    <table class="border" width="100%" >
+        <tr>
+            <td><?php echo $langs->trans('Title') ?></td>
+            <td><?php echo $form->texte('', 'title', '',50,255) ?></td> 
+        </tr>
+        <tr>
+            <td><?php echo $langs->trans('Date') ?></td>
+            <td><?php echo $form->calendrier('', 'date_inventory',time()) ?></td> 
+        </tr>
+        
+        <tr>
+            <td><?php echo $langs->trans('inventorySelectWarehouse') ?></td>
+            <td><?php echo $formproduct->selectWarehouses('', 'fk_warehouse') ?></td> 
+        </tr>
+        
+        <tr>
+            <td><?php echo $langs->trans('SelectCategory') ?></td>
+            <td><?php echo $formDoli->select_all_categories(0,'', 'fk_category') ?></td> 
+        </tr>
+        <tr>
+            <td><?php echo $langs->trans('SelectFournisseur') ?></td>
+            <td><?php echo $formDoli->select_thirdparty('','fk_supplier','s.fournisseur = 1') ?></td> 
+        </tr>
+        <tr>
+            <td><?php echo $langs->trans('OnlyProdsInStock') ?></td>
+            <td><input type="checkbox" name="OnlyProdsInStock" value="1"></td> 
+        </tr>
+        
+    </table>
+    <?php
+    
+	print '<div class="tabsAction">';
+	print '<input type="submit" class="butAction" value="'.$langs->trans('inventoryConfirmCreate').'" />';
+	print '</div>';
+	
+	print $form->end_form();	
+	llxFooter('');
+}
+
+function _card(&$inventory, $mode='edit')
+{
+	global $langs, $conf, $db, $user;
+	
+	llxHeader('',$langs->trans('inventoryEdit'),'','');
+	
+	$warehouse = new Entrepot($db);
+	$warehouse->fetch($inventory->fk_warehouse);
+	
+	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), '&action='.$mode));
+	
+	$lines = array();
+	_card_line($inventory, $lines, $form);
+	
+	print '<b>'.$langs->trans('inventoryOnDate')." ".$inventory->get_date('date_inventory').'</b><br><br>';
+	
+	$inventoryTPL = array(
+		'id'=> $inventory->id
+		,'date_cre' => $inventory->get_date('date_cre', 'd/m/Y')
+		,'date_maj' => $inventory->get_date('date_maj', 'd/m/Y H:i')
+		,'fk_warehouse' => $inventory->fk_warehouse
+		,'status' => $inventory->status
+		,'entity' => $inventory->entity
+		,'amount' => price( round($inventory->amount,2) )
+		,'amount_actual'=>price (round($inventory->amount_actual,2))
+		
+	);
+	
+	$can_validate = !empty($user->rights->inventory->validate);
+	$view_url = dol_buildpath('/inventory/inventory.php', 1);
+	
+	$view = array(
+		'mode' => $mode
+		,'url' => dol_buildpath('/inventory/inventory.php', 1)
+		,'can_validate' => (int) $user->rights->inventory->validate
+		,'is_already_validate' => (int) $inventory->status
+		,'token'=>$_SESSION['newtoken']
+	);
+	
+	include './tpl/inventory.tpl.php';
+	
+	llxFooter('');
+}
+
+
+function _card_line(&$inventory, &$lines, &$form)
+{
+	global $db;
+	$inventory->amount_actual = 0;
+	
+	$TCacheEntrepot = array();
+
+	foreach ($inventory->Inventorydet as $k => $Inventorydet)
+	{
+	    
+        $product = & $Inventorydet->product;
+		$stock = $Inventorydet->qty_stock;
+	
+        $pmp = $Inventorydet->pmp;
+		$pmp_actual = $pmp * $stock;
+		$inventory->amount_actual+=$pmp_actual;
+
+        $last_pa = $Inventorydet->pa;
+		$current_pa = $Inventorydet->current_pa;
+        
+		$e = new Entrepot($db);
+		if(!empty($TCacheEntrepot[$Inventorydet->fk_warehouse])) $e = $TCacheEntrepot[$Inventorydet->fk_warehouse];
+		elseif($e->fetch($Inventorydet->fk_warehouse) > 0) $TCacheEntrepot[$e->id] = $e;
+		
+		$lines[]=array(
+			'produit' => $product->getNomUrl(1).'&nbsp;-&nbsp;'.$product->label
+			,'entrepot'=>$e->getNomUrl(1)
+			,'barcode' => $product->barcode
+			/*,'qty' => $form->texte('', 'qty_to_add['.$k.']', (isset($_REQUEST['qty_to_add'][$k]) ? $_REQUEST['qty_to_add'][$k] : 0), 8, 0, "style='text-align:center;'")
+                        .($form->type_aff!='view' ? '<a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto('Ajouter', 'plus16@inventory').'</a>' : '')
+			,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
+			,'qty_stock' => $stock
+			,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
+			,'action' => $user->rights->inventory->write ? '<a onclick="if (!confirm(\'Confirmez-vous la suppression de la ligne ?\')) return false;" href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=delete_line&rowid='.$Inventorydet->getId(), 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : ''
+			,'pmp_stock'=>round($pmp_actual,2)
+            ,'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2)
+			,'pmp_new'=>(!empty($user->rights->inventory->changePMP) ?  $form->texte('', 'new_pmp['.$k.']',$Inventorydet->new_pmp, 8, 0, "style='text-align:right;'")
+                        .($form->type_aff!='view' ? '<a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' : '') : '' )
+            */,'pa_stock'=>round($last_pa * $stock,2)
+            ,'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2)
+			,'current_pa_stock'=>round($current_pa * $stock,2)
+			,'current_pa_actual'=>round($current_pa * $Inventorydet->qty_view,2)
+          
+            ,'k'=>$k
+            ,'id'=>$Inventorydet->id
+				
+		);
+	}
+
+}
+
+function exportCSV(&$inventory) {
+	global $conf;
+	
+	header('Content-Type: application/octet-stream');
+    header('Content-disposition: attachment; filename=inventory-'. $inventory->getId().'-'.date('Ymd-His').'.csv');
+    header('Pragma: no-cache');
+    header('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
+    header('Expires: 0');
+	
+	echo 'Ref;Label;barcode;qty theorique;PMP;dernier PA;';
+	if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) echo 'PA courant;';
+	echo 'qty réelle;PMP;dernier PA;';
+	if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) echo 'PA courant;';
+	echo 'qty regulée;'."\r\n";
+	
+	foreach ($inventory->Inventorydet as $k => $Inventorydet)
+	{
+		$product = & $Inventorydet->product;
+		$stock = $Inventorydet->qty_stock;
+	
+        $pmp = $Inventorydet->pmp;
+		$pmp_actual = $pmp * $stock;
+		$inventory->amount_actual+=$pmp_actual;
+
+        $last_pa = $Inventorydet->pa;
+        $current_pa = $Inventorydet->current_pa;
+		
+		if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) {
+			$row=array(
+				'produit' => $product->ref
+				,'label'=>$product->label
+				,'barcode' => $product->barcode
+				,'qty_stock' => $stock
+				,'pmp_stock'=>round($pmp_actual,2)
+	            ,'pa_stock'=>round($last_pa * $stock,2)
+				,'current_pa_stock'=>round($current_pa * $stock,2)
+			    ,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
+				,'pmp_actual'=>round($pmp * $Inventorydet->qty_view,2)
+	            ,'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2)
+	        	,'current_pa_actual'=>round($current_pa * $Inventorydet->qty_view,2)    
+				,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
+				
+			);
+			
+		}
+		else{
+			$row=array(
+				'produit' => $product->ref
+				,'label'=>$product->label
+				,'barcode' => $product->barcode
+				,'qty_stock' => $stock
+				,'pmp_stock'=>round($pmp_actual,2)
+	            ,'pa_stock'=>round($last_pa * $stock,2)
+	            ,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
+				,'pmp_actual'=>round($pmp * $Inventorydet->qty_view,2)
+	            ,'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2)
+	            
+				,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
+				
+		);
+			
+		}
+		
+		
+		echo '"'.implode('";"', $row).'"'."\r\n";
+		
+	}
+	
+	exit;
+}
+
+function generateODT(&$PDOdb, &$db, &$conf, &$langs, &$inventory) 
+{
+	$TBS=new TTemplateTBS();
+
+	$InventoryPrint = array(); // Tableau envoyé à la fonction render contenant les informations concernant l'inventaire
+	
+	foreach($inventory->Inventorydet as $k => $v) 
+	{
+		$prod = new Product($db);
+		$prod->fetch($v->fk_product);
+		//$prod->fetch_optionals($prod->id);
+		
+		$InventoryPrint[] = array(
+			'product' => $prod->ref.' - '.$prod->label
+			, 'qty_view' => $v->qty_view
+		);
+	}
+
+	$warehouse = new Entrepot($db);
+	$warehouse->fetch($inventory->fk_warehouse);
+	
+	$dirName = 'INVENTORY'.$inventory->getId().'('.date("d_m_Y").')';
+	$dir = DOL_DATA_ROOT.'/inventory/'.$dirName.'/';
+	
+	@mkdir($dir, 0777, true);
+	
+	$template = "templateINVENTORY.odt";
+	//$template = "templateOF.doc";
+
+	$file_gen = $TBS->render(dol_buildpath('inventory/exempleTemplate/'.$template)
+		,array(
+			'InventoryPrint'=>$InventoryPrint
+		)
+		,array(
+			'date_cre'=>$inventory->get_date('date_cre', 'd/m/Y')
+			,'date_maj'=>$inventory->get_date('date_maj', 'd/m/Y H:i')
+			,'date_inv'=>$inventory->get_date('date_inventory', 'd/m/Y')
+			,'numero'=>empty($inventory->title) ? 'Inventaire n°'.$inventory->getId() : $inventory->title
+			,'warehouse'=>$warehouse->libelle
+			,'status'=>($inventory->status ? $langs->transnoentitiesnoconv('inventoryValidate') : $langs->transnoentitiesnoconv('inventoryDraft'))
+			,'logo'=>DOL_DATA_ROOT."/mycompany/logos/".MAIN_INFO_SOCIETE_LOGO
+		)
+		,array()
+		,array(
+			'outFile'=>$dir.$inventory->getId().".odt"
+			,"convertToPDF"=>(!empty($conf->global->INVENTORY_GEN_PDF) ? true : false)
+			,'charset'=>OPENTBS_ALREADY_UTF8
+			
+		)
+		
+	);
+
+	header("Location: ".DOL_URL_ROOT."/document.php?modulepart=inventory&entity=".$conf->entity."&file=".$dirName."/".$inventory->getId(). (!empty($conf->global->INVENTORY_GEN_PDF) ? '.pdf' : '.odt') );
+	
+   /*
+    $size = filesize("./" . basename($file_gen));
+    header("Content-Type: application/force-download; name=\"" . basename($file_gen) . "\"");
+    header("Content-Transfer-Encoding: binary");
+    header("Content-Length: $size");
+    header("Content-Disposition: attachment; filename=\"" . basename($file_gen) . "\"");
+    header("Expires: 0");
+    header("Cache-Control: no-cache, must-revalidate");
+    header("Pragma: no-cache"); 
+    
+	readfile($file_gen);
+   */
+    
+	//header("Location: ".DOL_URL_ROOT."/document.php?modulepart=asset&entity=1&file=".$dirName."/".$assetOf->numero.".doc");
+
+}
+function _footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actual, $total_current_pa,$total_current_pa_actual) {
+	global $conf,$user,$langs;
+	
+	
+	    if ($view['can_validate'] == 1) { ?>
+        <tr style="background-color:#dedede;">
+            <th colspan="3">&nbsp;</th>
+            <?php if (! empty($conf->barcode->enabled)) { ?>
+					<th align="center">&nbsp;</td>
+			<?php } ?>
+            <th align="right"><?php echo price($total_pmp) ?></th>
+            <th align="right"><?php echo price($total_pa) ?></th>
+            <?php
+	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
+	              		echo '<th align="right">'.price($total_current_pa).'</th>';   	
+					 }
+			?>
+            <th>&nbsp;</th>
+            <th align="right"><?php echo price($total_pmp_actual) ?></th>
+            <?php
+            if(!empty($user->rights->inventory->changePMP)) {
+               	echo '<th>&nbsp;</th>';	
+			}
+			?>
+            <th align="right"><?php echo price($total_pa_actual) ?></th>
+            <?php
+	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
+	              		echo '<th align="right">'.price($total_current_pa_actual).'</th>';   	
+					 }
+			?>
+
+            <th>&nbsp;</th>
+            <?php if ($view['is_already_validate'] != 1) { ?>
+            <th>&nbsp;</th>
+            <?php } ?>
+        </tr>
+        <?php } 
+}
+function _headerList($view) {
+	global $conf,$user,$langs;
+	
+	?>
+			<tr style="background-color:#dedede;">
+				<th align="left" width="20%">&nbsp;&nbsp;Produit</th>
+				<th align="center">Entrepôt</td>
+				<?php if (! empty($conf->barcode->enabled)) { ?>
+					<th align="center">Code-barre</td>
+				<?php } ?>
+				<?php if ($view['can_validate'] == 1) { ?>
+					<th align="center" width="20%">Quantité théorique</th>
+					<?php
+	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
+	              		echo '<th align="center" width="20%" colspan="3">Valeur théorique</th>';   	
+					 }
+					 else {
+					 	echo '<th align="center" width="20%" colspan="2">Valeur théorique</th>';
+					 }
+					 
+					?>
+					
+				<?php } ?>
+				    <th align="center" width="20%">Quantité réelle</th>
+				<?php if ($view['can_validate'] == 1) { ?>
+				    
+				    <?php
+				    
+				     $colspan = 2;
+					 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) $colspan++;
+				     if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) $colspan++;
+					
+	                 echo '<th align="center" width="20%" colspan="'.$colspan.'">Valeur réelle</th>';
+					 
+					?>
+						
+					<th align="center" width="15%">Quantité régulée</th>
+				<?php } ?>
+				<?php if ($view['is_already_validate'] != 1) { ?>
+					<th align="center" width="5%">#</th>
+				<?php } ?>
+				<th align="center" width="5%"></th>
+			</tr>
+			<?php if ($view['can_validate'] == 1) { ?>
+	    	<tr style="background-color:#dedede;">
+	    	    <th colspan="<?php echo empty($conf->barcode->enabled) ? 3 : 4;  ?>">&nbsp;</th>
+	    	    <th>PMP</th>
+	    	    <th>Dernier PA</th>
+	    	    <?php
+	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
+	              		echo '<th>PA courant</th>';   	
+					 }
+					 
+				?>
+	    	    <th>&nbsp;</th>
+	    	    <th>PMP</th>
+	    	    <?php
+	    	    if(!empty($user->rights->inventory->changePMP)) {
+	    	    	echo '<th rel="newPMP">'.$langs->trans('ColumnNewPMP').'</th>';
+	    	    }
+	    	    ?>
+	            <th>Dernier PA</th>
+	            <?php
+	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
+	              		echo '<th>PA courant</th>';   	
+					 }
+					 
+				?>
+	            <th>&nbsp;</th>
+	            <?php if ($view['is_already_validate'] != 1) { ?>
+	            <th>&nbsp;</th>
+	            <?php } ?>
+	    	</tr>
+	    	<?php 
+	} 
+	
+}
diff --git a/htdocs/inventory/lib/inventory.lib.php b/htdocs/inventory/lib/inventory.lib.php
new file mode 100644
index 00000000000..fd60d631a58
--- /dev/null
+++ b/htdocs/inventory/lib/inventory.lib.php
@@ -0,0 +1,245 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) 2015 ATM Consulting <support@atm-consulting.fr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file		lib/inventory.lib.php
+ *	\ingroup	inventory
+ *	\brief		This file is an example module library
+ *				Put some comments here
+ */
+
+function inventoryAdminPrepareHead()
+{
+    global $langs, $conf;
+
+    $langs->load("inventory@inventory");
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = dol_buildpath("/inventory/admin/inventory_setup.php", 1);
+    $head[$h][1] = $langs->trans("Parameters");
+    $head[$h][2] = 'settings';
+    $h++;
+    $head[$h][0] = dol_buildpath("/inventory/admin/inventory_about.php", 1);
+    $head[$h][1] = $langs->trans("About");
+    $head[$h][2] = 'about';
+    $h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    //$this->tabs = array(
+    //	'entity:+tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
+    //); // to add new tab
+    //$this->tabs = array(
+    //	'entity:-tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
+    //); // to remove a tab
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'inventory');
+
+    return $head;
+}
+
+function inventoryPrepareHead(&$inventory, $title='Inventaire', $get='')
+{
+	return array(
+		array(dol_buildpath('/inventory/inventory.php?id='.$inventory->id.$get, 1), $title,'inventaire')
+	);
+}
+
+
+
+function inventorySelectProducts(&$inventory)
+{
+	global $conf,$db;
+	
+	$except_product_id = array();
+	
+	foreach ($inventory->Inventorydet as $Inventorydet)
+	{
+		$except_product_id[] = $Inventorydet->fk_product;
+	}
+	
+	ob_start();
+	$form = new Form($db);
+	$form->select_produits(-1, 'fk_product');
+	
+	// Il nous faut impérativement une liste custom car il ne faut que les entrepôts de la famille de celui qu'on inventorie
+	$TChildWarehouses = array($inventory->fk_warehouse);
+	$e = new Entrepot($db);
+	$e->fetch($inventory->fk_warehouse);
+	if(method_exists($e, 'get_children_warehouses')) $e->get_children_warehouses($e->id, $TChildWarehouses);
+	
+	$Tab = array();
+	$sql = 'SELECT rowid, label
+			FROM '.MAIN_DB_PREFIX.'entrepot WHERE rowid IN('.implode(', ', $TChildWarehouses).')';
+	if(method_exists($e, 'get_children_warehouses')) $sql.= ' ORDER BY fk_parent';
+	$resql = $db->query($sql);
+	while($res = $db->fetch_object($resql)) {
+		$Tab[$res->rowid] = $res->label;
+	}
+	print '&nbsp;&nbsp;&nbsp;';
+	print 'Entrepôt : '.$form::selectarray('fk_warehouse', $Tab);
+	
+	$select_html = ob_get_clean();
+	
+	return $select_html;
+}
+
+function ajaxAutocompleter($selected, $htmlname, $url, $urloption='', $minLength=2, $autoselect=0, $ajaxoptions=array())
+{
+    if (empty($minLength)) $minLength=1;
+
+	$script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />';
+
+	$script.= '<script type="text/javascript">';
+	$script.= '$(document).ready(function() {
+					var autoselect = '.$autoselect.';
+					var options = '.json_encode($ajaxoptions).';
+
+					// Remove product id before select another product
+					// use keyup instead change to avoid loosing the product id
+					$("input#search_'.$htmlname.'").keydown(function() {
+						//console.log(\'purge_id_after_keydown\');
+						$("#'.$htmlname.'").val("");
+					});
+					$("input#search_'.$htmlname.'").change(function() {
+						//console.log(\'change\');
+						$("#'.$htmlname.'").trigger("change");
+					});
+					// Check when keyup
+					$("input#search_'.$htmlname.'").keyup(function() {
+							//console.log(\'keyup\');
+						    if ($(this).val().length == 0)
+						    {
+	                            $("#search_'.$htmlname.'").val("");
+	                            $("#'.$htmlname.'").val("").trigger("change");
+	                            if (options.option_disabled) {
+	    							$("#" + options.option_disabled).removeAttr("disabled");
+	    						}
+	    						if (options.disabled) {
+	    							$.each(options.disabled, function(key, value) {
+	    								$("#" + value).removeAttr("disabled");
+									});
+	    						}
+	    						if (options.update) {
+	    							$.each(options.update, function(key, value) {
+	    								$("#" + key).val("").trigger("change");
+									});
+								}
+								if (options.show) {
+	    							$.each(options.show, function(key, value) {
+	    								$("#" + value).hide().trigger("hide");
+									});
+								}
+								if (options.update_textarea) {
+	    							$.each(options.update_textarea, function(key, value) {
+	    								if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances[key] != "undefined") {
+	    									CKEDITOR.instances[key].setData("");
+	    								} else {
+	    									$("#" + key).html("");
+										}
+	    							});
+	    						}
+						    }
+                    });
+    				$("input#search_'.$htmlname.'").autocomplete({
+    					source: function( request, response ) {
+    						$.get("'.$url.($urloption?'?'.$urloption:'').'", { '.$htmlname.': request.term }, function(data){
+								response($.map( data, function( item ) {
+									if (autoselect == 1 && data.length == 1) {
+										$("#search_'.$htmlname.'").val(item.value);
+										$("#'.$htmlname.'").val(item.key).trigger("change");
+									}
+									var label = item.label.toString();
+									var update = {};
+									if (options.update) {
+										$.each(options.update, function(key, value) {
+											update[key] = item[value];
+										});
+									}
+									var textarea = {};
+									if (options.update_textarea) {
+										$.each(options.update_textarea, function(key, value) {
+											textarea[key] = item[value];
+										});
+									}
+									return { label: label, value: item.value, id: item.key, update: update, textarea: textarea, disabled: item.disabled }
+								}));
+							}, "json");
+						},
+						dataType: "json",
+    					minLength: '.$minLength.',
+    					select: function( event, ui ) {		// Function ran when new value is selected into javascript combo
+							//console.log(\'set value of id with \'+ui.item.id);
+    						$("#'.$htmlname.'").val(ui.item.id).trigger("change");	// Select new value
+    						// Disable an element
+    						if (options.option_disabled) {
+    							if (ui.item.disabled) {
+    								$("#" + options.option_disabled).attr("disabled", "disabled");
+    								if (options.error) {
+    									$.jnotify(options.error, "error", true);		// Output with jnotify the error message
+    								}
+    								if (options.warning) {
+    									$.jnotify(options.warning, "warning", false);		// Output with jnotify the warning message
+    								}
+							} else {
+    								$("#" + options.option_disabled).removeAttr("disabled");
+    							}
+    						}
+    						if (options.disabled) {
+    							$.each(options.disabled, function(key, value) {
+    								$("#" + value).attr("disabled", "disabled");
+    							});
+    						}
+    						if (options.show) {
+    							$.each(options.show, function(key, value) {
+    								$("#" + value).show().trigger("show");
+    							});
+    						}
+    						// Update an input
+    						if (ui.item.update) {
+    							// loop on each "update" fields
+    							$.each(ui.item.update, function(key, value) {
+    								$("#" + key).val(value).trigger("change");
+    							});
+    						}
+    						if (ui.item.textarea) {
+    							$.each(ui.item.textarea, function(key, value) {
+    								if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances[key] != "undefined") {
+    									CKEDITOR.instances[key].setData(value);
+    									CKEDITOR.instances[key].focus();
+    								} else {
+    									$("#" + key).html(value);
+    									$("#" + key).focus();
+									}
+    							});
+    						}
+    						$("#search_'.$htmlname.'").trigger("change");	// To tell that input text field was modified
+    					}
+					}).data( "autocomplete" )._renderItem = function( ul, item ) {
+						return $( "<li></li>" )
+						.data( "item.autocomplete", item )
+						.append( \'<a><span class="tag">\' + item.label + "</span></a>" )
+						.appendTo(ul);
+					};
+
+  				});';
+	$script.= '</script>';
+
+	return $script;
+}
diff --git a/htdocs/inventory/tpl/inventory.tpl.php b/htdocs/inventory/tpl/inventory.tpl.php
new file mode 100644
index 00000000000..d7022245f5b
--- /dev/null
+++ b/htdocs/inventory/tpl/inventory.tpl.php
@@ -0,0 +1,211 @@
+<script type="text/javascript">
+    function save_qty(k) {
+        
+        var $input = $('input[name="qty_to_add['+k+']"]');
+        var fk_det_inventory = $('input[name=det_id_'+k+']').val();
+        var qty = $input.val();
+        
+        $('#a_save_qty_'+k).hide();
+        
+        $.ajax({
+            url:"script/interface.php"
+            ,data:{
+                'fk_det_inventory' : fk_det_inventory
+                ,'qty': qty
+                ,'put':'qty'
+            }
+            
+        }).done(function(data) {
+            $('#qty_view_'+k).html(data);
+            $input.val(0);
+            $.jnotify("Quantité ajoutée : "+qty, "mesgs" );
+            
+            $('#a_save_qty_'+k).show();
+            
+            hide_save_button();
+        });
+        
+        
+    }
+    
+    function save_pmp(k) {
+    	
+        var $input = $('input[name="new_pmp['+k+']"]');
+        var fk_det_inventory = $('input[name=det_id_'+k+']').val();
+        var pmp = $input.val();
+        
+        $('#a_save_new_pmp_'+k).hide();
+        
+        $.ajax({
+            url:"script/interface.php"
+            ,data:{
+                'fk_det_inventory' : fk_det_inventory
+                ,'pmp': pmp
+                ,'put':'pmp'
+            }
+            
+        }).done(function(data) {
+           	$input.css({"background-color":"#66ff66"});
+            $.jnotify("PMP sauvegardé : "+pmp, "mesgs" );
+            $('#a_save_new_pmp_'+k).show();
+             
+        });
+        
+    }
+    
+    function hide_save_button() {
+       var nb = 0;
+       $('input[name^="qty_to_add"]').each(function() {
+           nb += $(this).val();
+       });
+       
+       if(nb>0) {
+           $('input[name=modify]').show();
+           
+       }
+       else{
+           $('input[name=modify]').hide();
+           
+       }
+        
+    }
+</script>
+
+<?php if ($inventory->status != 1) { ?>
+	<strong><?php echo $langs->trans('AddInventoryProduct'); ?> : </strong>
+	<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
+		<input type="hidden" name="action" value="add_line" />
+		<input type="hidden" name="id" value="<?php echo $inventory->id; ?>" />
+	
+		<?php echo inventorySelectProducts($inventory); ?>
+		
+			<input class="butAction" type="submit" value="<?php echo $langs->trans('AddProduct'); ?>" />
+	</form>
+<?php } ?>
+
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
+	
+	<?php if ($view['is_already_validate'] == 1) { ?>
+		<div class="warning">Cet inventaire est validé</div>
+	<?php } ?>
+	
+	<input type="hidden" name="action" value="save" />
+	<input type="hidden" name="id" value="<?php echo $inventory->id; ?>" />
+	
+	<table width="100%" class="border workstation">
+		<?php
+		
+		_headerList($view); 
+        
+        $total_pmp = $total_pa = $total_pmp_actual = $total_pa_actual =$total_current_pa=$total_current_pa_actual = 0;
+        $i=1;
+        
+        foreach ($lines as $k=>$row) { 
+            
+            $total_pmp+=$row['pmp_stock'];
+            $total_pa+=$row['pa_stock'];
+            $total_pmp_actual+=$row['pmp_actual'];
+            $total_pa_actual+=$row['pa_actual'];
+            
+			if($i%20 === 0)
+			{
+            	_headerList($view);
+			} // Fin IF principal
+	    	?>
+			<tr style="background-color:<?php echo ($k%2 == 0) ? '#fff':'#eee'; ?>;">
+				<td align="left">&nbsp;&nbsp;<?php echo $row['produit']; ?></td>
+				<td align="center"><?php echo $row['entrepot']; ?></td>
+				<?php if (! empty($conf->barcode->enabled)) { ?>
+					<td align="center"><?php echo $row['barcode']; ?></td>
+				<?php } ?>
+				<?php if ($can_validate == 1) { ?>
+					<td align="center" style="background-color: #e8e8ff;"><?php echo $row['qty_stock']; ?></td>
+					<td align="right" style="background-color: #e8e8ff;"><?php echo price( $row['pmp_stock']); ?></td>
+					<td align="right" style="background-color: #e8e8ff;"><?php echo price( $row['pa_stock']); ?></td>
+	               <?php
+	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
+	                 	echo '<td align="right" style="background-color: #e8e8ff;">'.price($row['current_pa_stock']).'</td>';
+						 $total_current_pa+=$row['current_pa_stock'];
+	                 }   
+	                    
+	               ?>
+				<?php } ?>
+				<td align="center"><?php echo $row['qty']; ?>&nbsp;&nbsp;<span id="qty_view_<?php echo $row['k']; ?>"><?php echo $row['qty_view']; ?></span>
+                    <input type="hidden" name="det_id_<?php echo $row['k']; ?>" value="<?php echo $row['id']; ?>" /> 
+                </td>
+                <?php if ($can_validate == 1) { ?>
+                    <td align="right"><?php echo price($row['pmp_actual']); ?></td>
+                    <?php
+                    if(!empty($user->rights->inventory->changePMP)) {
+                    	echo '<td>'.$row['pmp_new'].'</td>';	
+					}
+                    ?>
+                    <td align="right"><?php echo price($row['pa_actual']); ?></td>
+		               <?php
+		                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
+		                 	echo '<td align="right">'.price($row['current_pa_actual']).'</td>';
+							 $total_current_pa_actual+=$row['current_pa_actual'];
+		                 }   
+		                    
+		               ?>
+                    <td align="center"><?php echo $row['qty_regulated']; ?></td>
+				<?php } ?>
+				<?php if ($view['is_already_validate'] != 1) { ?>
+					<td align="center" width="20%"><?php echo $row['action']; ?></td>
+				<?php } ?>
+			</tr>
+			<?php $i++; ?>
+		
+		<?php } 
+		
+		_footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actual, $total_current_pa,$total_current_pa_actual);
+		?>
+	
+	  
+		
+	</table>
+	
+	<?php if ($view['is_already_validate'] != 1) { ?>
+		<div class="tabsAction" style="height:30px;">
+			<?php if ($view['mode'] == 'view') { ?>
+				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=printDoc" class="butAction"><?php echo $langs->trans('Print') ?></a>
+				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
+				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
+				<?php 
+				 if(!empty($user->rights->inventory->changePMP)) {
+				 	echo '<a href="javascript:;" onclick="javascript:if (!confirm(\'Confirmez-vous l\\\'application du nouveau PMP ?\')) return false; else document.location.href=\''.$view_url
+				 			.'?id='.$inventory->id
+				 			.'&action=changePMP&token='.$view['token'].'\'; " class="butAction">'.$langs->trans('ApplyPMP').'</a>';
+				 }
+				
+				if ($can_validate == 1) { ?>
+					<a href="javascript:;" onclick="javascript:if (!confirm('Confirmez-vous la régulation ?')) return false; else document.location.href='<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=regulate&token=<?php echo $view['token']; ?>'; " class="butAction">Réguler le stock</a>
+				<?php } ?>
+			<?php } ?>
+			<?php if ($view['mode'] == 'edit') { ?>
+				<input name="back" type="button" class="butAction" value="Quitter la saisie" onclick="document.location='?id=<?php echo $inventory->id; ?>&action=view';" />
+			<?php } ?>
+			<?php if ($can_validate == 1) { ?>
+                <a onclick="if (!confirm('Confirmez-vous la vidange ?')) return false;" href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=flush" class="butActionDelete">Vider</a>
+                &nbsp;&nbsp;&nbsp;
+                <a onclick="if (!confirm('Confirmez-vous la suppression ?')) return false;" href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=delete" class="butActionDelete">Supprimer</a>
+        	<?php } ?>
+		</div>
+	<?php } ?>
+	<?php if ($view['is_already_validate'] == 1) { ?>
+		<div class="tabsAction">
+			<?php if ($can_validate == 1) { ?>
+
+				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=printDoc" class="butAction"><?php echo $langs->trans('Print') ?></a>
+				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
+				<a href="#" title="Cet inventaire est validé" class="butActionRefused"><?php echo $langs->trans('Delete') ?></a>
+				
+			<?php } ?>
+		</div>
+	<?php } ?>
+</form>
+<p>Date de création : <?php echo $inventory->get_date('datec') ?>
+<br />Dernière mise à jour : <?php echo $inventory->get_date('tms') ?></p>
+	
+
+	

From 565bcf233276535280c86a16f287df1eae7963a5 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Wed, 14 Dec 2016 16:11:37 +0100
Subject: [PATCH 0061/1163] debug fetch method

---
 htdocs/core/class/coreobject.class.php     |  76 +++++++++--
 htdocs/inventory/class/inventory.class.php |  58 ++++-----
 htdocs/inventory/inventory.php             | 145 ++++++---------------
 htdocs/inventory/tpl/inventory.tpl.php     |  12 +-
 4 files changed, 137 insertions(+), 154 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index b7e4b2770e3..f5e5b0e79a1 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -78,14 +78,20 @@ class CoreObject extends CommonObject {
 			
 	}
 	
+	private function checkFieldType($field, $type) {
+		
+		if( isset($this->__fields[$field]) && method_exists($this, 'is_'.$type)) {
+			return $this->{'is_'.$type}($this->__fields[$field]);
+		}
+		else return false;
+		
+	}
 	
 	private function is_date(Array &$info){
 	
-		if(is_array($info)) {
-			if(isset($info['type']) && $info['type']=='date') return true;
-			else return false;
-		}
+		if(isset($info['type']) && $info['type']=='date') return true;
 		else return false;
+		
 	}
 	
 	private function is_array($info) {
@@ -239,7 +245,25 @@ class CoreObject extends CommonObject {
 		}
 		
 	}
+	public function addChild($tabName, $id='', $key='id', $try_to_load = false) {
+		if(!empty($id)) {
+			foreach($this->{$tabName} as $k=>&$object) {
+				if($object->{$key} === $id) return $k;
 	
+			}
+		}
+	
+		$k = count($this->{$tabName});
+	
+		$className = ucfirst($tabName);
+		$this->{$tabName}[$k] = new $className($this->db);
+		if($id>0 && $key==='id' && $try_to_load) { 
+			$this->{$tabName}[$k]->fetch($id); 
+		}
+	
+	
+		return $k;
+	}
 	public function fetchChild() {
 
 		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
@@ -272,13 +296,13 @@ class CoreObject extends CommonObject {
 	}
 	
 	
-	public function update() {
-		
+	public function update(User &$user) {
+		if(empty($this->id )) return $this->create($user);
 		
 		
 	}
-	public function create() {
-		
+	public function create(User &$user) {
+		if($this->id>0) return $this->update($user);
 		
 		
 	}
@@ -287,10 +311,46 @@ class CoreObject extends CommonObject {
 		if(empty($this->{$field})) return '';
 		elseif($this->{$field}<=strtotime('1000-01-01 00:00:00')) return '';
 		else {
+			
 			return dol_print_date($this->{$field}, $format);
 		}
 	
 	}
 	
+	public function set_date($field,$date){
+
+	  	if(empty($date)) {
+	  		$this->{$field} = 0;
+	  	}
+		else {
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+				
+			$this->{$field} = dol_stringtotime($date);
+		}
+
+		return $this->{$field};
+	}
+	
+	public function set_values(&$Tab) {
+		foreach ($Tab as $key=>$value) {
+	
+			if($this->checkFieldType($key,'date')) {
+				$this->set_date($key, $value);
+			}
+			else if( $this->checkFieldType($key,'array')){
+				$this->{$key} = $value;
+			}
+			else if( $this->checkFieldType($key,'float') ) {
+				$this->{$key} = (double)price2num($value);
+			}
+			else if( $this->checkFieldType($key,'int') ) {
+				$this->{$key} = (int)price2num($value);
+			}
+			else {
+				$this->{$key} = @stripslashes($value);
+			}
+			
+		}
+	}
 	
 }
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 2a485d24a0a..f2ff6484c64 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -147,15 +147,16 @@ class Inventory extends CoreObject
 		
 	}
 	
-	function update()
+	function update(User &$user)
 	{
+		
 		//si on valide l'inventaire on sauvegarde le stock à cette instant
 		if ($this->status)
 		{
 			 $this->regulate();
 		}
 		
-		parent::update();
+		parent::update($user);
 	}
 	
 	function set_values($Tab)
@@ -209,7 +210,7 @@ class Inventory extends CoreObject
         $det->load_product();
                 
         $date = $this->get_date('date_inventory', 'Y-m-d');
-        if(empty($date))$date = $this->get_date('date_cre', 'Y-m-d'); 
+        if(empty($date))$date = $this->get_date('datec', 'Y-m-d'); 
         $det->setStockDate( $date , $fk_entrepot);
         
     }
@@ -416,9 +417,9 @@ class Inventorydet extends CoreObject
 		return true;
 	}
 	
-    function setStockDate(&$PDOdb, $date, $fk_warehouse) {
+    function setStockDate($date, $fk_warehouse) {
         
-		list($pmp,$stock) = $this->getPmpStockFromDate($PDOdb, $date, $fk_warehouse);
+		list($pmp,$stock) = $this->getPmpStockFromDate($date, $fk_warehouse);
 		
         $this->qty_stock = $stock;
         $this->pmp = $pmp;
@@ -432,18 +433,17 @@ class Inventorydet extends CoreObject
                 AND datem<='".$date." 23:59:59'
                 ORDER BY datem DESC LIMIT 1";
                
-        $res = $db->query($sql);
+        $res = $this->db->query($sql);
        
-        if($obj = $db->fetch_object($res)) {
+        if($res && $obj = $this->db->fetch_object($res)) {
             $last_pa = $obj->price;
         }
         
         $this->pa = $last_pa;
-      /*  var_dump($fk_warehouse,$this->product->stock_warehouse,$this->pmp, $this->pa, $this->qty_stock);
-        exit;*/
+      
     }
 
-	function getPmpStockFromDate(&$PDOdb, $date, $fk_warehouse){
+	function getPmpStockFromDate( $date, $fk_warehouse){
 		
 		$res = $this->product->load_stock();
 		
@@ -459,7 +459,7 @@ class Inventorydet extends CoreObject
 			
 		}
 		
-		//On récupère tous les mouvements de stocks du produit entre aujourd'hui et la date de l'inventaire
+		//All Stock mouvement between now and inventory date
 		$sql = "SELECT value, price
 				FROM ".MAIN_DB_PREFIX."stock_mouvement
 				WHERE fk_product = ".$this->product->id."
@@ -467,31 +467,25 @@ class Inventorydet extends CoreObject
 					AND datem > '".date('Y-m-d 23:59:59',strtotime($date))."'
 				ORDER BY datem DESC";
 
-		//echo $sql.'<br>';
-		$db->query($sql);
-		$TMouvementStock = $PDOdb->Get_All();
+		
+		$res = $this->db->query($sql);
+		
 		$laststock = $stock;
 		$lastpmp = $pmp;
-		//Pour chacun des mouvements on recalcule le PMP et le stock physique
-		foreach($TMouvementStock as $mouvement){
-			
-			//150
-			//if($this->product->id==394) echo 'laststock = '.$stock.'<br>';
-			
-			//9.33
-			//if($this->product->id==394) echo 'lastpmp = '.$pmp.'<br>';
-			$price = ($mouvement->price>0 && $mouvement->value>0) ? $mouvement->price : $lastpmp;  
+		
+		if($res) {
+			while($mouvement = $this->db->fetch_object($res)) {
+				$price = ($mouvement->price>0 && $mouvement->value>0) ? $mouvement->price : $lastpmp;
 				
-			$stock_value = $laststock * $lastpmp;
+				$stock_value = $laststock * $lastpmp;
+					
+				$laststock -= $mouvement->value;
+					
+				$last_stock_value = $stock_value - ($mouvement->value * $price);
+					
+				$lastpmp = ($laststock != 0) ? $last_stock_value / $laststock : $lastpmp;
+			}
 			
-			$laststock -= $mouvement->value;
-			
-			$last_stock_value = $stock_value - ($mouvement->value * $price);	
-			
-			$lastpmp = ($laststock != 0) ? $last_stock_value / $laststock : $lastpmp;
-			 
-			
-
 		}
 		
 		return array($lastpmp,$laststock);
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index d46f05059b4..4e70ee1b4cc 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -66,18 +66,17 @@ function _action()
 			
 			$inventory = new Inventory($db);
 			
-			_fiche_warehouse($user, $db, $conf, $langs, $inventory);
+			_card_warehouse( $inventory);
 
 			break;
 		
 		case 'confirmCreate':
 			if (!$user->rights->inventory->create) accessforbidden();
-			
-			
+		
 			$inventory = new Inventory($db);
-			$inventory->set_values($_REQUEST);
+			$inventory->set_values($_POST);
 			
-            $fk_inventory = $inventory->save();
+            $fk_inventory = $inventory->create($user);
             $fk_category = (int)GETPOST('fk_category');
             $fk_supplier = (int)GETPOST('fk_supplier');
             $fk_warehouse = (int)GETPOST('fk_warehouse');
@@ -86,7 +85,7 @@ function _action()
 			$e = new Entrepot($db);
 			$e->fetch($fk_warehouse);
 			$TChildWarehouses = array($fk_warehouse);
-			if(method_exists($e, 'get_children_warehouses')) $e->get_children_warehouses($fk_warehouse, $TChildWarehouses);
+			$e->get_children_warehouses($fk_warehouse, $TChildWarehouses);
 			
 			$sql = 'SELECT ps.fk_product, ps.fk_entrepot 
 			     FROM '.MAIN_DB_PREFIX.'product_stock ps 
@@ -103,27 +102,27 @@ function _action()
 					ORDER BY p.ref ASC,p.label ASC';
                  
                  
-			$Tab = $PDOdb->ExecuteAsArray($sql);
-			
-			foreach($Tab as &$row) {
-			
-                $inventory->add_product($PDOdb, $row->fk_product, $row->fk_entrepot);
+			$res = $db->query($sql);
+			if($res) {
+				while($obj = $db->fetch_object($res)){
+				
+	                $inventory->add_product($obj->fk_product, $obj->fk_entrepot);
+				}
 			}
 			
-			$inventory->save($PDOdb);
+			$inventory->update($user);
+			
+			header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=edit', 1));
+			break;
 			
-			header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=edit', 1));
-		
 		case 'edit':
 			if (!$user->rights->inventory->write) accessforbidden();
 			
 			
-			$id = __get('id', 0, 'int');
-			
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch(GETPOST('id'));
 			
-			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, __get('action', 'edit', 'string'));
+			_card($inventory, GETPOST('action'));
 			
 			break;
 			
@@ -389,29 +388,29 @@ function _list()
 	llxFooter('');
 }
 
-function _fiche_warehouse(&$PDOdb, &$user, &$db, &$conf, $langs, $inventory)
+function _card_warehouse(&$inventory)
 {
+	global $langs,$conf,$db, $user, $form;
+	
 	dol_include_once('/categories/class/categorie.class.php');    
         
 	llxHeader('',$langs->trans('inventorySelectWarehouse'),'','');
 	print dol_get_fiche_head(inventoryPrepareHead($inventory));
 	
-	$form=new TFormCore('inventory.php', 'confirmCreate');
-	print $form->hidden('action', 'confirmCreate');
-	$form->Set_typeaff('edit');
+	echo '<form name="confirmCreate" action="'.$_SERVER['PHP_SELF'].'" method="post" />';
+	echo '<input type="hidden" name="action" value="confirmCreate" />';
 	
     $formproduct = new FormProduct($db);
-    $formDoli = new Form($db);
     
     ?>
     <table class="border" width="100%" >
         <tr>
             <td><?php echo $langs->trans('Title') ?></td>
-            <td><?php echo $form->texte('', 'title', '',50,255) ?></td> 
+            <td><input type="text" name="title" value="" size="50" /></td> 
         </tr>
         <tr>
             <td><?php echo $langs->trans('Date') ?></td>
-            <td><?php echo $form->calendrier('', 'date_inventory',time()) ?></td> 
+            <td><?php echo $form->select_date(time(),'date_inventory'); ?></td> 
         </tr>
         
         <tr>
@@ -421,11 +420,11 @@ function _fiche_warehouse(&$PDOdb, &$user, &$db, &$conf, $langs, $inventory)
         
         <tr>
             <td><?php echo $langs->trans('SelectCategory') ?></td>
-            <td><?php echo $formDoli->select_all_categories(0,'', 'fk_category') ?></td> 
+            <td><?php echo $form->select_all_categories(0,'', 'fk_category') ?></td> 
         </tr>
         <tr>
             <td><?php echo $langs->trans('SelectFournisseur') ?></td>
-            <td><?php echo $formDoli->select_thirdparty('','fk_supplier','s.fournisseur = 1') ?></td> 
+            <td><?php echo $form->select_thirdparty('','fk_supplier','s.fournisseur = 1') ?></td> 
         </tr>
         <tr>
             <td><?php echo $langs->trans('OnlyProdsInStock') ?></td>
@@ -439,7 +438,8 @@ function _fiche_warehouse(&$PDOdb, &$user, &$db, &$conf, $langs, $inventory)
 	print '<input type="submit" class="butAction" value="'.$langs->trans('inventoryConfirmCreate').'" />';
 	print '</div>';
 	
-	print $form->end_form();	
+	echo '</form>';
+	
 	llxFooter('');
 }
 
@@ -455,7 +455,7 @@ function _card(&$inventory, $mode='edit')
 	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), '&action='.$mode));
 	
 	$lines = array();
-	_card_line($inventory, $lines, $form);
+	_card_line($inventory, $lines, $mode);
 	
 	print '<b>'.$langs->trans('inventoryOnDate')." ".$inventory->get_date('date_inventory').'</b><br><br>';
 	
@@ -488,7 +488,7 @@ function _card(&$inventory, $mode='edit')
 }
 
 
-function _card_line(&$inventory, &$lines, &$form)
+function _card_line(&$inventory, &$lines, $mode)
 {
 	global $db;
 	$inventory->amount_actual = 0;
@@ -512,21 +512,23 @@ function _card_line(&$inventory, &$lines, &$form)
 		if(!empty($TCacheEntrepot[$Inventorydet->fk_warehouse])) $e = $TCacheEntrepot[$Inventorydet->fk_warehouse];
 		elseif($e->fetch($Inventorydet->fk_warehouse) > 0) $TCacheEntrepot[$e->id] = $e;
 		
+		$qty = (float)GETPOST('qty_to_add')[$k];
+		
 		$lines[]=array(
 			'produit' => $product->getNomUrl(1).'&nbsp;-&nbsp;'.$product->label
 			,'entrepot'=>$e->getNomUrl(1)
 			,'barcode' => $product->barcode
-			/*,'qty' => $form->texte('', 'qty_to_add['.$k.']', (isset($_REQUEST['qty_to_add'][$k]) ? $_REQUEST['qty_to_add'][$k] : 0), 8, 0, "style='text-align:center;'")
-                        .($form->type_aff!='view' ? '<a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto('Ajouter', 'plus16@inventory').'</a>' : '')
+			,'qty' =>($mode == 'edit' ? '<input type="text" name="qty_to_add['.$k.']" value="'.$qty.'" size="8" style="text-align:center;" />' : $qty )
+                        .($mode =='edit' ? '<a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto($langs->trans('Add'), 'plus16@inventory').'</a>' : '')
 			,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
 			,'qty_stock' => $stock
 			,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
-			,'action' => $user->rights->inventory->write ? '<a onclick="if (!confirm(\'Confirmez-vous la suppression de la ligne ?\')) return false;" href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=delete_line&rowid='.$Inventorydet->getId(), 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : ''
+			,'action' => ($user->rights->inventory->write ? '<a onclick="if (!confirm(\'Confirmez-vous la suppression de la ligne ?\')) return false;" href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=delete_line&rowid='.$Inventorydet->getId(), 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : '')
 			,'pmp_stock'=>round($pmp_actual,2)
             ,'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2)
-			,'pmp_new'=>(!empty($user->rights->inventory->changePMP) ?  $form->texte('', 'new_pmp['.$k.']',$Inventorydet->new_pmp, 8, 0, "style='text-align:right;'")
-                        .($form->type_aff!='view' ? '<a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' : '') : '' )
-            */,'pa_stock'=>round($last_pa * $stock,2)
+			,'pmp_new'=>(!empty($user->rights->inventory->changePMP) ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" />'
+					.($mode =='edit' ? '<a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' : '') : '')
+            ,'pa_stock'=>round($last_pa * $stock,2)
             ,'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2)
 			,'current_pa_stock'=>round($current_pa * $stock,2)
 			,'current_pa_actual'=>round($current_pa * $Inventorydet->qty_view,2)
@@ -610,80 +612,9 @@ function exportCSV(&$inventory) {
 	exit;
 }
 
-function generateODT(&$PDOdb, &$db, &$conf, &$langs, &$inventory) 
-{
-	$TBS=new TTemplateTBS();
-
-	$InventoryPrint = array(); // Tableau envoyé à la fonction render contenant les informations concernant l'inventaire
-	
-	foreach($inventory->Inventorydet as $k => $v) 
-	{
-		$prod = new Product($db);
-		$prod->fetch($v->fk_product);
-		//$prod->fetch_optionals($prod->id);
-		
-		$InventoryPrint[] = array(
-			'product' => $prod->ref.' - '.$prod->label
-			, 'qty_view' => $v->qty_view
-		);
-	}
-
-	$warehouse = new Entrepot($db);
-	$warehouse->fetch($inventory->fk_warehouse);
-	
-	$dirName = 'INVENTORY'.$inventory->getId().'('.date("d_m_Y").')';
-	$dir = DOL_DATA_ROOT.'/inventory/'.$dirName.'/';
-	
-	@mkdir($dir, 0777, true);
-	
-	$template = "templateINVENTORY.odt";
-	//$template = "templateOF.doc";
-
-	$file_gen = $TBS->render(dol_buildpath('inventory/exempleTemplate/'.$template)
-		,array(
-			'InventoryPrint'=>$InventoryPrint
-		)
-		,array(
-			'date_cre'=>$inventory->get_date('date_cre', 'd/m/Y')
-			,'date_maj'=>$inventory->get_date('date_maj', 'd/m/Y H:i')
-			,'date_inv'=>$inventory->get_date('date_inventory', 'd/m/Y')
-			,'numero'=>empty($inventory->title) ? 'Inventaire n°'.$inventory->getId() : $inventory->title
-			,'warehouse'=>$warehouse->libelle
-			,'status'=>($inventory->status ? $langs->transnoentitiesnoconv('inventoryValidate') : $langs->transnoentitiesnoconv('inventoryDraft'))
-			,'logo'=>DOL_DATA_ROOT."/mycompany/logos/".MAIN_INFO_SOCIETE_LOGO
-		)
-		,array()
-		,array(
-			'outFile'=>$dir.$inventory->getId().".odt"
-			,"convertToPDF"=>(!empty($conf->global->INVENTORY_GEN_PDF) ? true : false)
-			,'charset'=>OPENTBS_ALREADY_UTF8
-			
-		)
-		
-	);
-
-	header("Location: ".DOL_URL_ROOT."/document.php?modulepart=inventory&entity=".$conf->entity."&file=".$dirName."/".$inventory->getId(). (!empty($conf->global->INVENTORY_GEN_PDF) ? '.pdf' : '.odt') );
-	
-   /*
-    $size = filesize("./" . basename($file_gen));
-    header("Content-Type: application/force-download; name=\"" . basename($file_gen) . "\"");
-    header("Content-Transfer-Encoding: binary");
-    header("Content-Length: $size");
-    header("Content-Disposition: attachment; filename=\"" . basename($file_gen) . "\"");
-    header("Expires: 0");
-    header("Cache-Control: no-cache, must-revalidate");
-    header("Pragma: no-cache"); 
-    
-	readfile($file_gen);
-   */
-    
-	//header("Location: ".DOL_URL_ROOT."/document.php?modulepart=asset&entity=1&file=".$dirName."/".$assetOf->numero.".doc");
-
-}
 function _footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actual, $total_current_pa,$total_current_pa_actual) {
 	global $conf,$user,$langs;
 	
-	
 	    if ($view['can_validate'] == 1) { ?>
         <tr style="background-color:#dedede;">
             <th colspan="3">&nbsp;</th>
diff --git a/htdocs/inventory/tpl/inventory.tpl.php b/htdocs/inventory/tpl/inventory.tpl.php
index d7022245f5b..8a3bfd0f2a6 100644
--- a/htdocs/inventory/tpl/inventory.tpl.php
+++ b/htdocs/inventory/tpl/inventory.tpl.php
@@ -154,9 +154,9 @@
 					<td align="center" width="20%"><?php echo $row['action']; ?></td>
 				<?php } ?>
 			</tr>
-			<?php $i++; ?>
-		
-		<?php } 
+			<?php $i++; 
+        
+        } 
 		
 		_footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actual, $total_current_pa,$total_current_pa_actual);
 		?>
@@ -168,18 +168,17 @@
 	<?php if ($view['is_already_validate'] != 1) { ?>
 		<div class="tabsAction" style="height:30px;">
 			<?php if ($view['mode'] == 'view') { ?>
-				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=printDoc" class="butAction"><?php echo $langs->trans('Print') ?></a>
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
 				<?php 
 				 if(!empty($user->rights->inventory->changePMP)) {
-				 	echo '<a href="javascript:;" onclick="javascript:if (!confirm(\'Confirmez-vous l\\\'application du nouveau PMP ?\')) return false; else document.location.href=\''.$view_url
+				 	echo '<a href="javascript:;" onclick="if (!confirm(\'Confirmez-vous l\\\'application du nouveau PMP ?\')) return false; else document.location.href=\''.$view_url
 				 			.'?id='.$inventory->id
 				 			.'&action=changePMP&token='.$view['token'].'\'; " class="butAction">'.$langs->trans('ApplyPMP').'</a>';
 				 }
 				
 				if ($can_validate == 1) { ?>
-					<a href="javascript:;" onclick="javascript:if (!confirm('Confirmez-vous la régulation ?')) return false; else document.location.href='<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=regulate&token=<?php echo $view['token']; ?>'; " class="butAction">Réguler le stock</a>
+					<a href="javascript:;" onclick="if (!confirm('Confirmez-vous la régulation ?')) return false; else document.location.href='<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=regulate&token=<?php echo $view['token']; ?>'; " class="butAction">Réguler le stock</a>
 				<?php } ?>
 			<?php } ?>
 			<?php if ($view['mode'] == 'edit') { ?>
@@ -196,7 +195,6 @@
 		<div class="tabsAction">
 			<?php if ($can_validate == 1) { ?>
 
-				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=printDoc" class="butAction"><?php echo $langs->trans('Print') ?></a>
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
 				<a href="#" title="Cet inventaire est validé" class="butActionRefused"><?php echo $langs->trans('Delete') ?></a>
 				

From a463759ba3b88cdcc97a263c2cd6e42d5944aaf7 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Wed, 14 Dec 2016 16:54:05 +0100
Subject: [PATCH 0062/1163] init query builder into db

---
 htdocs/core/class/coreobject.class.php |  98 +++++++++++++++++++++-
 htdocs/core/db/DoliDB.class.php        | 108 +++++++++++++++++++++++++
 2 files changed, 203 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index f5e5b0e79a1..8f55a5bf458 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -150,7 +150,7 @@ class CoreObject extends CommonObject {
 		
 		foreach ($this->__fields as $field=>$info) {
 	
-			if($this->_is_date($info)){
+			if($this->is_date($info)){
 				if(empty($this->{$field})){
 					$query[$field] = $this->date_0;
 				}
@@ -166,11 +166,11 @@ class CoreObject extends CommonObject {
 		    	$query[$field] = (int)price2num($this->{$field});
 		  	}
 		
-		  	else if($this->_is_float($info)){
+		  	else if($this->is_float($info)){
 		    	$query[$field] = (double)price2num($this->{$field});
 		  	}
 		
-		  	elseif($this->_is_null($info)) {
+		  	elseif($this->is_null($info)) {
 		  		$query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0')?null:$this->{$field});
 		    }
 		    else{
@@ -264,6 +264,20 @@ class CoreObject extends CommonObject {
 	
 		return $k;
 	}
+	
+	public function removeChild($tabName, $id, $key='id') {
+		foreach($this->{$tabName} as &$object) {
+	
+			if($object->{$key} == $id) {
+				$object->to_delete = true;
+				return true;
+			}
+	
+	
+		}
+		return false;
+	}
+	
 	public function fetchChild() {
 
 		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
@@ -295,18 +309,96 @@ class CoreObject extends CommonObject {
 
 	}
 	
+	public function saveChild(User &$user) {
 	
+		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
+			foreach($this->childtables as &$childTable) {
+	
+				$className = ucfirst($childTable);
+	
+				foreach($this->{$className} as $i => &$object) {
+	
+					$object->{$this->fk_element} = $this->id;
+					
+					$object->update($user);
+					if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
+				}
+	
+			}
+		}
+	}
 	public function update(User &$user) {
 		if(empty($this->id )) return $this->create($user);
 		
+		if(isset($this->to_delete) && $this->to_delete==true) {
+			$this->delete();
+		}
+		else {
+		
+			$query = array();
+			
+			$query['id']=$this->id;
+			if(!isset($this->no_dt_maj))$query['tms'] = date('Y-m-d H:i:s');
+			$this->set_save_query($query);
+		
+			$this->db->update($this->table_element,$query,array('id'));
+			
+			$this->id = $this->db->last_insert_id($this->table_element);
+				
+			$result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
+				
+			$this->saveChild($user);
+		
+		}
+		return $this->id;
+		
 		
 	}
 	public function create(User &$user) {
 		if($this->id>0) return $this->update($user);
 		
+		$query = array();
+		$query['datec'] = date("Y-m-d H:i:s",$this->datec);
+		if(!isset($this->no_dt_maj))$query['tms'] = date('Y-m-d H:i:s');
+		$this->set_save_query($query);
+	
+		$this->db->insert($this->table_element,$query);
+	
+		$this->id = $this->db->last_insert_id($this->table_element);
+		
+		$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
+		
+		$this->saveChild($user);
+	
+	
+		return $this->id;
 		
 	}
+	public function delete(){
+		if($this->id>0){
+			$this->call_trigger(strtoupper($this->element). '_DELETE', $user);
+			$this->db->delete($this->table_element,array('id'=>$this->id),array(0=>'id'));
+			
+			if($this->withChild) {
+				foreach($this->childtables as &$childTable) {
+						
+					$className = ucfirst($childTable);
+					foreach($this->{$className} as &$object) {
+			
+						$object->delete();
+			
+					}
+			
+				}
+			}
+			
+		
+			
+		}
 	
+		
+	
+	}
 	public function get_date($field,$format='') {
 		if(empty($this->{$field})) return '';
 		elseif($this->{$field}<=strtotime('1000-01-01 00:00:00')) return '';
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index c63227e1601..395f6009169 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -288,5 +288,113 @@ abstract class DoliDB implements Database
 	{
 		return $this->lastqueryerror;
 	}
+	
+	/**
+	 *	Generate and execute Update SQL commande
+	 *
+	 * 	@param	string				$table		table to update
+	 *	@param	array				$values		array of values to update
+	 *	@param  int|string|array	$key		key of value to select row to update
+	 *	@return	bool|result						false or boolean
+	 */
+	function update($table,$values,$key){
+	
+		foreach ($value as $k => $v) {
+			if(is_string($v)) $v=stripslashes($v);
+				
+			if (is_array($key)){
+				$i=array_search($k , $key );
+				if ( $i !== false) {
+					$where[] = $key[$i]."=" . $this->escape( $v ) ;
+					continue;
+				}
+			} else {
+				if ( $k == $key) {
+					$where[] = "$k=" .$this->escape( $v ) ;
+					continue;
+				}
+			}
+	
+			if(is_null($v)) $val = 'NULL';
+			else if(is_int($v) || is_double($v)) $val=$v;
+			else $val = $this->escape( $v );
+	
+			$tmp[] = "$k=$val";
+		}
+		$sql = sprintf( "UPDATE $table SET %s WHERE %s" , implode( ",", $tmp ) , implode(" AND ",$where) );
+	
+		$res = $this->query( $sql );
+	
+		if($res===false) {
+			//error
+			return false;
+		}
+	
+		return true;
+	}
+	
+	/**
+	 *	Generate and execute Insert SQL commande
+	 *
+	 * 	@param	string				$table		table to update
+	 *	@param	array				$values		array of values to update
+	 *	@return	bool|result						false or boolean
+	 */
+	function insert($table,$values){
+		 
+		foreach ($values as $k => $v) {
+	
+			$fields[] = $k;
+			if(is_null($v)){
+				$values[] = 'NULL';
+			}else{
+				$v=stripslashes($v);
+				$values[] =$this->escape( $v );
+			}
+		}
+		$sql = sprintf( 'INSERT INTO '.$table.' ( %s ) values( %s ) ', implode( ",", $fields ) ,  implode( ",", $values ) );
+	
+		$res = $this->query($sql);
+		
+		if($res===false) {
+	
+			return false;
+		}
+		
+		return true;
+	}
+	
+	/**
+	 *	Generate and execute Delete SQL commande
+	 *
+	 * 	@param	string				$table		table for the delete
+	 *	@param	array				$values		array of values to delete
+	 *	@param  int|string|array	$key		key of value to select row to update
+	 *	@return	bool|result						false or boolean
+	 */
+	function delete($table,$values,$key){
+		foreach ($values as $k => $v) {
+			if(is_string($v)) $v=stripslashes($v);
+		
+			if (is_array($key)){
+				$i=array_search($k , $key );
+				if ( $i !== false) {
+					$where[] = $key[$i]."=" . $this->escape( $v ) ;
+					continue;
+				}
+			} else {
+				if ( $k == $key) {
+					$where[] = "$k=" .$this->escape( $v ) ;
+					continue;
+				}
+			}
+			
+		}
+	
+		$sql = sprintf( 'DELETE FROM '.$table.' WHERE '.implode(" AND ",$where));
+	
+		return $this->query( $sql );
+	}
+	
 }
 

From 703b8708e3702b21cf4027e2ad0d5c071298dfab Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 15 Dec 2016 10:39:59 +0100
Subject: [PATCH 0063/1163] fix create

---
 htdocs/core/class/coreobject.class.php     |  66 +++--
 htdocs/core/db/DoliDB.class.php            |  55 ++--
 htdocs/core/modules/modinventory.class.php | 329 +++++++++++++++++++++
 htdocs/inventory/class/inventory.class.php |   4 +-
 htdocs/inventory/img/bt-save.png           | Bin 0 -> 493 bytes
 htdocs/inventory/inventory.php             |   5 +-
 6 files changed, 401 insertions(+), 58 deletions(-)
 create mode 100644 htdocs/core/modules/modinventory.class.php
 create mode 100644 htdocs/inventory/img/bt-save.png

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 8f55a5bf458..7613a556092 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -31,7 +31,14 @@ class CoreObject extends CommonObject {
 	
 	public $withChild = true;
 	
-	protected $__fields=array(); 
+	public $no_update_tms = false;
+	
+	public $date_0 = '1001-01-01 00:00:00'; //TODO there is a solution for this ?
+	
+	/*
+	 *  @var Array $_fields Fields to synchronize with Database
+	 */
+	protected $__fields=array();
 	 /**
 	 *  Constructor
 	 *
@@ -39,7 +46,7 @@ class CoreObject extends CommonObject {
 	 */
 	function __construct(DoliDB &$db) {
 		
-		$this->date_0 = '1001-01-01 00:00:00'; //TODO there is a solution for this ?
+
 	}
 	
 	protected function init() {
@@ -142,11 +149,7 @@ class CoreObject extends CommonObject {
 		
 	private function set_save_query(){
 		
-		$query=array(
-			'rowid'=>$this->id
-			,'datec'=>($this->id>0 ? $this->db->jdate($this->datec) : time())
-			,'tms'=>time()
-		);
+		$query=array();
 		
 		foreach ($this->__fields as $field=>$info) {
 	
@@ -315,20 +318,21 @@ class CoreObject extends CommonObject {
 			foreach($this->childtables as &$childTable) {
 	
 				$className = ucfirst($childTable);
-	
-				foreach($this->{$className} as $i => &$object) {
-	
-					$object->{$this->fk_element} = $this->id;
-					
-					$object->update($user);
-					if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
+				if(!empty($this->{$className})) {
+					foreach($this->{$className} as $i => &$object) {
+		
+						$object->{$this->fk_element} = $this->id;
+						
+						$object->update($user);
+						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
+					}
 				}
 	
 			}
 		}
 	}
 	public function update(User &$user) {
-		if(empty($this->id )) return $this->create($user);
+		if(empty($this->id )) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
 		
 		if(isset($this->to_delete) && $this->to_delete==true) {
 			$this->delete();
@@ -337,10 +341,10 @@ class CoreObject extends CommonObject {
 		
 			$query = array();
 			
+			$query = $this->set_save_query();
 			$query['id']=$this->id;
-			if(!isset($this->no_dt_maj))$query['tms'] = date('Y-m-d H:i:s');
-			$this->set_save_query($query);
-		
+			if(empty($this->no_update_tms))$query['tms'] = date('Y-m-d H:i:s');
+				
 			$this->db->update($this->table_element,$query,array('id'));
 			
 			$this->id = $this->db->last_insert_id($this->table_element);
@@ -358,21 +362,25 @@ class CoreObject extends CommonObject {
 		if($this->id>0) return $this->update($user);
 		
 		$query = array();
+		$query = $this->set_save_query();
 		$query['datec'] = date("Y-m-d H:i:s",$this->datec);
-		if(!isset($this->no_dt_maj))$query['tms'] = date('Y-m-d H:i:s');
-		$this->set_save_query($query);
-	
-		$this->db->insert($this->table_element,$query);
-	
-		$this->id = $this->db->last_insert_id($this->table_element);
+		if(empty($this->no_update_tms))$query['tms'] = date('Y-m-d H:i:s');
 		
-		$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
-		
-		$this->saveChild($user);
+		$res = $this->db->insert($this->table_element,$query);
 	
+		if($res) {
+			$this->id = $this->db->last_insert_id($this->table_element);
+			
+			$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
+			
+			$this->saveChild($user);
+			
+			return $this->id;
+		}
+		else{
+			return false;
+		}
 	
-		return $this->id;
-		
 	}
 	public function delete(){
 		if($this->id>0){
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 395f6009169..85766c31949 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -288,6 +288,19 @@ abstract class DoliDB implements Database
 	{
 		return $this->lastqueryerror;
 	}
+	/*
+	 * Add quote to field value if necessary
+	 * 
+	 * @param string|int	$value	value to protect
+	 * @return string|int 
+	*/
+	function quote($value) {
+		
+		if(is_null($value)) return 'NULL';
+		else if(is_numeric($value)) return $value;
+		else return "'".$this->escape( $value )."'";
+		
+	}
 	
 	/**
 	 *	Generate and execute Update SQL commande
@@ -297,31 +310,27 @@ abstract class DoliDB implements Database
 	 *	@param  int|string|array	$key		key of value to select row to update
 	 *	@return	bool|result						false or boolean
 	 */
-	function update($table,$values,$key){
+	function update($table,$fields,$key){
 	
-		foreach ($value as $k => $v) {
+		foreach ($fields as $k => $v) {
 			if(is_string($v)) $v=stripslashes($v);
 				
 			if (is_array($key)){
 				$i=array_search($k , $key );
 				if ( $i !== false) {
-					$where[] = $key[$i]."=" . $this->escape( $v ) ;
+					$where[] = $key[$i].'=' . $this->quote( $v ) ;
 					continue;
 				}
 			} else {
 				if ( $k == $key) {
-					$where[] = "$k=" .$this->escape( $v ) ;
+					$where[] = $k.'=' .$this->quote( $v ) ;
 					continue;
 				}
 			}
 	
-			if(is_null($v)) $val = 'NULL';
-			else if(is_int($v) || is_double($v)) $val=$v;
-			else $val = $this->escape( $v );
-	
-			$tmp[] = "$k=$val";
+			$tmp[] = $k.'='.$this->quote($val);
 		}
-		$sql = sprintf( "UPDATE $table SET %s WHERE %s" , implode( ",", $tmp ) , implode(" AND ",$where) );
+		$sql = sprintf( 'UPDATE '.MAIN_DB_PREFIX.$table.' SET %s WHERE %s' , implode( ',', $tmp ) , implode(' AND ',$where) );
 	
 		$res = $this->query( $sql );
 	
@@ -340,22 +349,18 @@ abstract class DoliDB implements Database
 	 *	@param	array				$values		array of values to update
 	 *	@return	bool|result						false or boolean
 	 */
-	function insert($table,$values){
+	function insert($table,$fields){
 		 
-		foreach ($values as $k => $v) {
+		foreach ($fields as $k => $v) {
 	
-			$fields[] = $k;
-			if(is_null($v)){
-				$values[] = 'NULL';
-			}else{
-				$v=stripslashes($v);
-				$values[] =$this->escape( $v );
-			}
+			$keys[] = $k;
+			$values[] = $this->quote($v);
+			
 		}
-		$sql = sprintf( 'INSERT INTO '.$table.' ( %s ) values( %s ) ', implode( ",", $fields ) ,  implode( ",", $values ) );
-	
-		$res = $this->query($sql);
 		
+		$sql = sprintf( 'INSERT INTO '.MAIN_DB_PREFIX.$table.' ( %s ) values( %s ) ', implode( ",", $keys ) ,  implode( ",", $values ) );
+
+		$res = $this->query($sql);
 		if($res===false) {
 	
 			return false;
@@ -372,8 +377,8 @@ abstract class DoliDB implements Database
 	 *	@param  int|string|array	$key		key of value to select row to update
 	 *	@return	bool|result						false or boolean
 	 */
-	function delete($table,$values,$key){
-		foreach ($values as $k => $v) {
+	function delete($table,$fields,$key){
+		foreach ($fields as $k => $v) {
 			if(is_string($v)) $v=stripslashes($v);
 		
 			if (is_array($key)){
@@ -391,7 +396,7 @@ abstract class DoliDB implements Database
 			
 		}
 	
-		$sql = sprintf( 'DELETE FROM '.$table.' WHERE '.implode(" AND ",$where));
+		$sql = sprintf( 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.implode(' AND ',$where));
 	
 		return $this->query( $sql );
 	}
diff --git a/htdocs/core/modules/modinventory.class.php b/htdocs/core/modules/modinventory.class.php
new file mode 100644
index 00000000000..10fb1cc477e
--- /dev/null
+++ b/htdocs/core/modules/modinventory.class.php
@@ -0,0 +1,329 @@
+<?php
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	\defgroup   inventory     Module inventory
+ *  \brief      Example of a module descriptor.
+ *				Such a file must be copied into htdocs/inventory/core/modules directory.
+ *  \file       htdocs/inventory/core/modules/modinventory.class.php
+ *  \ingroup    inventory
+ *  \brief      Description and activation file for module inventory
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ *  Description and activation class for module inventory
+ */
+class modinventory extends DolibarrModules
+{
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+        global $langs,$conf;
+
+        $this->db = $db;
+
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 104420; // 104000 to 104999 for ATM CONSULTING
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'inventory';
+
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "products";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i','',get_class($this));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Description of module inventory";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
+		$this->special = 0;
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto='inventory@inventory';
+
+		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+		// for default path (eg: /inventory/core/xxxxx) (0=disable, 1=enable)
+		// for specific path of parts (eg: /inventory/core/modules/barcode)
+		// for specific css file (eg: /inventory/css/inventory.css.php)
+		//$this->module_parts = array(
+		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
+		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
+		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
+		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
+		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
+		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
+		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
+		//							'css' => array('/inventory/css/inventory.css.php'),	// Set this to relative path of css file if module has its own css file
+	 	//							'js' => array('/inventory/js/inventory.js'),          // Set this to relative path of js file if module must load a js on all pages
+		//							'hooks' => array('hookcontext1','hookcontext2')  	// Set here all hooks context managed by module
+		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
+		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@inventory')) // Set here all workflow context managed by module
+		//                        );
+		$this->module_parts = array();
+
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/inventory/temp");
+		$this->dirs = array();
+
+		// Config pages. Put here list of php page, stored into inventory/admin directory, to use to setup module.
+		$this->config_page_url = array("inventory_setup.php@inventory");
+
+		// Dependencies
+		$this->hidden = false;			// A condition to hide module
+		$this->depends = array('modStock');		// List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array();	// List of modules id to disable if this one is disabled
+		$this->conflictwith = array();	// List of modules id this module is in conflict with
+		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+		$this->langfiles = array("inventory@inventory");
+
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+		// );
+		$this->const = array();
+
+		// Array to add new pages in new tabs
+		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@inventory:$user->rights->inventory->read:/inventory/mynewtab1.php?id=__ID__',  	// To add a new tab identified by code tabname1
+        //                              'objecttype:+tabname2:Title2:mylangfile@inventory:$user->rights->othermodule->read:/inventory/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2
+        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     						// To remove an existing tab identified by code tabname
+		// where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
+        $this->tabs = array();
+
+        // Dictionaries
+	    if (! isset($conf->inventory->enabled))
+        {
+        	$conf->inventory=new stdClass();
+        	$conf->inventory->enabled=0;
+        }
+		$this->dictionaries=array();
+        /* Example:
+        if (! isset($conf->inventory->enabled)) $conf->inventory->enabled=0;	// This is to avoid warnings
+        $this->dictionaries=array(
+            'langs'=>'mylangfile@inventory',
+            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
+            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
+            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
+            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
+            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
+            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
+            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
+            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
+            'tabcond'=>array($conf->inventory->enabled,$conf->inventory->enabled,$conf->inventory->enabled)												// Condition to show each dictionary
+        );
+        */
+
+        // Boxes
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+        $this->boxes = array();			// List of boxes
+		// Example:
+		//$this->boxes=array(array(0=>array('file'=>'myboxa.php','note'=>'','enabledbydefaulton'=>'Home'),1=>array('file'=>'myboxb.php','note'=>''),2=>array('file'=>'myboxc.php','note'=>'')););
+
+		$langs->load('inventory@inventory');
+		
+		// Permissions
+		$this->rights = array();		// Permission array used by this module
+		$r=0;
+
+		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
+		// Example:
+		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		// $this->rights[$r][1] = 'Permision label';	// Permission label
+		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $r++;
+		
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryReadPermission';	// Permission label
+		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+		
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryCreatePermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+	
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryWritePermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+		
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryValidatePermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryChangePMPPermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+
+		// Main menu entries
+		$this->menu = array();			// List of menus to add
+		$r=0;
+
+		// Add here entries to declare new menus
+		//
+		// Example to declare a new Top Menu entry and its Left menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>0,			                // Put 0 if this is a top menu
+		//							'type'=>'top',			                // This is a Top menu entry
+		//							'titre'=>'inventory top menu',
+		//							'mainmenu'=>'inventory',
+		//							'leftmenu'=>'inventory',
+		//							'url'=>'/inventory/pagetop.php',
+		//							'langs'=>'mylangfile@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
+		//
+		// Example to declare a Left Menu entry into an existing Top menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		//							'type'=>'left',			                // This is a Left menu entry
+		//							'titre'=>'inventory left menu',
+		//							'mainmenu'=>'xxx',
+		//							'leftmenu'=>'inventory',
+		//							'url'=>'/inventory/pagelevel2.php',
+		//							'langs'=>'mylangfile@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'enabled'=>'$conf->inventory->enabled',  // Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
+		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=stock',			                // Put 0 if this is a top menu
+								'type'=>'left',			                // This is a Top menu entry
+								'titre'=>'Liste des inventaires',
+								'mainmenu'=>'inventory',
+								'leftmenu'=>'inventory',
+								'url'=>'/inventory/inventory.php?action=list',
+								'langs'=>'inventory@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'position'=>100,
+								'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+								'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+								'target'=>'',
+								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
+		
+		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=stock',			                // Put 0 if this is a top menu
+								'type'=>'left',			                // This is a Top menu entry
+								'titre'=>'Nouvel inventaire',
+								'mainmenu'=>'inventory',
+								'leftmenu'=>'inventory',
+								'url'=>'/inventory/inventory.php?action=create',
+								'langs'=>'inventory@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'position'=>100,
+								'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+								'perms'=>'$user->rights->inventory->create',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+								'target'=>'',
+								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
+
+		// Exports
+		$r=1;
+
+		// Example:
+		// $this->export_code[$r]=$this->rights_class.'_'.$r;
+		// $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
+		// $this->export_permission[$r]=array(array("facture","facture","export"));
+		// $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef');
+		// $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product');
+		// $this->export_sql_start[$r]='SELECT DISTINCT ';
+		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
+		// $r++;
+	}
+
+	/**
+	 *		Function called when module is enabled.
+	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *		It also creates data directories
+	 *
+     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	function init($options='')
+	{
+		$sql = array();
+		define('INC_FROM_DOLIBARR', true);
+		dol_include_once('/inventory/config.php');
+		dol_include_once("/inventory/script/create-maj-base.php");
+		
+		return $this->_init($sql, $options);
+	}
+
+	/**
+	 *		Function called when module is disabled.
+	 *      Remove from database constants, boxes and permissions from Dolibarr database.
+	 *		Data directories are not deleted
+	 *
+     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	function remove($options='')
+	{
+		$sql = array();
+
+		return $this->_remove($sql, $options);
+	}
+
+}
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index f2ff6484c64..76ed46c4aa8 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -159,7 +159,7 @@ class Inventory extends CoreObject
 		parent::update($user);
 	}
 	
-	function set_values($Tab)
+	function set_values(&$Tab)
 	{
 		global $db,$langs;
 		
@@ -183,7 +183,7 @@ class Inventory extends CoreObject
 			}	
 		}
 		
-		return parent::set_values($Tab);
+		parent::set_values($Tab);
 	}
 	
     function deleteAllLine() {
diff --git a/htdocs/inventory/img/bt-save.png b/htdocs/inventory/img/bt-save.png
new file mode 100644
index 0000000000000000000000000000000000000000..f20d292ca91805ab875cbb48391cba2e94e3f194
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000pH000pP1^@s6J8eh$0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzk4Z#9RCwB?RIy3}K@gogf>;DB6!8NR
z1gjKw5($c?FkoS2VIkVsX<-$VG!`O)SSTs9h<{)au@C}cZ*M*ziUuSX&F#!aXZG$i
zF&9m6;4!yzJ8$32ENkWSdHAnIZeIpIwANtTHV_dIA}9tb1<Jtny#kat!?G-pobAkH
zoH;5HVam+SK=Gyo7uhvX)Px4(U1@kj&7OR(O?)exgN5`wTo$h+HO;s-B)ZxBl6F)o
z8%3zlJKYrp%B&Zs6J`$*2HRtdJCB5u0^3Z*epMnyNbNl_L9VYaC5W9Q{VHiG=bHq5
zl9j!)Kd0j<2`h(55)<R*r<~%Al046AYWbEpQ9Fqpkn}@<6rv;`*j=6l*Y8K2d*QeQ
zwFVkrXY8Mz!^luHTuGonZ2h1B8;6CiSKQp{P!hj{UQ7ry=}wZz=W567yO|JZ{i7$z
zVHGbu>4(>v14}z6zFdUW+_4$A*W93~2-T2sq_LIMs7|t<;^mkZ8tnBIC^H<%a2WSO
j#)$U$lt^ynQ-A>gD&Upv=pk<>00000NkvXXu0mjflc~?j

literal 0
HcmV?d00001

diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index 4e70ee1b4cc..1d9ec174257 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -77,6 +77,7 @@ function _action()
 			$inventory->set_values($_POST);
 			
             $fk_inventory = $inventory->create($user);
+			
             $fk_category = (int)GETPOST('fk_category');
             $fk_supplier = (int)GETPOST('fk_supplier');
             $fk_warehouse = (int)GETPOST('fk_warehouse');
@@ -490,7 +491,7 @@ function _card(&$inventory, $mode='edit')
 
 function _card_line(&$inventory, &$lines, $mode)
 {
-	global $db;
+	global $db,$langs,$user,$conf;
 	$inventory->amount_actual = 0;
 	
 	$TCacheEntrepot = array();
@@ -523,7 +524,7 @@ function _card_line(&$inventory, &$lines, $mode)
 			,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
 			,'qty_stock' => $stock
 			,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
-			,'action' => ($user->rights->inventory->write ? '<a onclick="if (!confirm(\'Confirmez-vous la suppression de la ligne ?\')) return false;" href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=delete_line&rowid='.$Inventorydet->getId(), 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : '')
+			,'action' => ($user->rights->inventory->write ? '<a onclick="if (!confirm(\'Confirmez-vous la suppression de la ligne ?\')) return false;" href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : '')
 			,'pmp_stock'=>round($pmp_actual,2)
             ,'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2)
 			,'pmp_new'=>(!empty($user->rights->inventory->changePMP) ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" />'

From 81b01cd05529218ac7dda3a7ad7c55b1fca6d268 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 15 Dec 2016 11:23:13 +0100
Subject: [PATCH 0064/1163] fix

---
 htdocs/core/class/coreobject.class.php     |  21 +--
 htdocs/core/db/DoliDB.class.php            |  26 ++--
 htdocs/inventory/admin/inventory_setup.php | 168 +++++++++++++++++++++
 htdocs/inventory/ajax/ajax.inventory.php   |  19 +--
 htdocs/inventory/img/plus.png              | Bin 0 -> 1299 bytes
 htdocs/inventory/img/plus16.png            | Bin 0 -> 665 bytes
 htdocs/inventory/inventory.php             |  68 ++++-----
 htdocs/inventory/tpl/inventory.tpl.php     |   6 +-
 8 files changed, 239 insertions(+), 69 deletions(-)
 create mode 100644 htdocs/inventory/admin/inventory_setup.php
 create mode 100644 htdocs/inventory/img/plus.png
 create mode 100644 htdocs/inventory/img/plus16.png

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 7613a556092..75706403069 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -342,10 +342,10 @@ class CoreObject extends CommonObject {
 			$query = array();
 			
 			$query = $this->set_save_query();
-			$query['id']=$this->id;
+			$query['rowid']=$this->id;
 			if(empty($this->no_update_tms))$query['tms'] = date('Y-m-d H:i:s');
 				
-			$this->db->update($this->table_element,$query,array('id'));
+			$this->db->update($this->table_element,$query,array('rowid'));
 			
 			$this->id = $this->db->last_insert_id($this->table_element);
 				
@@ -382,19 +382,22 @@ class CoreObject extends CommonObject {
 		}
 	
 	}
-	public function delete(){
+	public function delete(User &$user){
 		if($this->id>0){
 			$this->call_trigger(strtoupper($this->element). '_DELETE', $user);
-			$this->db->delete($this->table_element,array('id'=>$this->id),array(0=>'id'));
 			
-			if($this->withChild) {
+			$this->db->delete($this->table_element,array('rowid'=>$this->id),array('rowid'));
+			
+			if($this->withChild && !empty($this->childtables)) {
 				foreach($this->childtables as &$childTable) {
 						
 					$className = ucfirst($childTable);
-					foreach($this->{$className} as &$object) {
-			
-						$object->delete();
-			
+					if(!empty($this->{$className})) {
+						foreach($this->{$className} as &$object) {
+				
+							$object->delete($user);
+				
+						}
 					}
 			
 				}
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 85766c31949..da0717e665b 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -313,7 +313,6 @@ abstract class DoliDB implements Database
 	function update($table,$fields,$key){
 	
 		foreach ($fields as $k => $v) {
-			if(is_string($v)) $v=stripslashes($v);
 				
 			if (is_array($key)){
 				$i=array_search($k , $key );
@@ -328,10 +327,9 @@ abstract class DoliDB implements Database
 				}
 			}
 	
-			$tmp[] = $k.'='.$this->quote($val);
+			$tmp[] = $k.'='.$this->quote($v);
 		}
-		$sql = sprintf( 'UPDATE '.MAIN_DB_PREFIX.$table.' SET %s WHERE %s' , implode( ',', $tmp ) , implode(' AND ',$where) );
-	
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET '.implode( ',', $tmp ).' WHERE ' . implode(' AND ',$where) ;
 		$res = $this->query( $sql );
 	
 		if($res===false) {
@@ -358,7 +356,9 @@ abstract class DoliDB implements Database
 			
 		}
 		
-		$sql = sprintf( 'INSERT INTO '.MAIN_DB_PREFIX.$table.' ( %s ) values( %s ) ', implode( ",", $keys ) ,  implode( ",", $values ) );
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$table.' 
+					( '.implode( ",", $keys ).' ) 
+					VALUES ( '.implode( ",", $values ).' ) ';
 
 		$res = $this->query($sql);
 		if($res===false) {
@@ -379,26 +379,30 @@ abstract class DoliDB implements Database
 	 */
 	function delete($table,$fields,$key){
 		foreach ($fields as $k => $v) {
-			if(is_string($v)) $v=stripslashes($v);
-		
 			if (is_array($key)){
 				$i=array_search($k , $key );
 				if ( $i !== false) {
-					$where[] = $key[$i]."=" . $this->escape( $v ) ;
+					$where[] = $key[$i].'=' . $this->quote( $v ) ;
 					continue;
 				}
 			} else {
 				if ( $k == $key) {
-					$where[] = "$k=" .$this->escape( $v ) ;
+					$where[] = $k.'='.$this->quote( $v ) ;
 					continue;
 				}
 			}
 			
 		}
 	
-		$sql = sprintf( 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.implode(' AND ',$where));
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.implode(' AND ',$where);
 	
-		return $this->query( $sql );
+		$res = $this->query( $sql );
+		if($res===false) {
+			return false;
+		}
+		
+		return true;
+		
 	}
 	
 }
diff --git a/htdocs/inventory/admin/inventory_setup.php b/htdocs/inventory/admin/inventory_setup.php
new file mode 100644
index 00000000000..f55bc092517
--- /dev/null
+++ b/htdocs/inventory/admin/inventory_setup.php
@@ -0,0 +1,168 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) 2015 ATM Consulting <support@atm-consulting.fr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	\file		admin/inventory.php
+ * 	\ingroup	inventory
+ * 	\brief		This file is an example module setup page
+ * 				Put some comments here
+ */
+// Dolibarr environment
+$res = @include("../../main.inc.php"); // From htdocs directory
+if (! $res) {
+    $res = @include("../../../main.inc.php"); // From "custom" directory
+}
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
+require_once '../lib/inventory.lib.php';
+
+// Translations
+$langs->load("inventory@inventory");
+
+// Access control
+if (! $user->admin) {
+    accessforbidden();
+}
+
+// Parameters
+$action = GETPOST('action', 'alpha');
+
+/*
+ * Actions
+ */
+if (preg_match('/set_(.*)/',$action,$reg))
+{
+	$code=$reg[1];
+	if (dolibarr_set_const($db, $code, GETPOST($code), 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+	
+if (preg_match('/del_(.*)/',$action,$reg))
+{
+	$code=$reg[1];
+	if (dolibarr_del_const($db, $code, 0) > 0)
+	{
+		Header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+/*
+ * View
+ */
+$page_name = "inventorySetup";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
+    . $langs->trans("BackToModuleList") . '</a>';
+print_fiche_titre($langs->trans($page_name), $linkback);
+
+// Configuration header
+$head = inventoryAdminPrepareHead();
+dol_fiche_head(
+    $head,
+    'settings',
+    $langs->trans("Module104420Name"),
+    0,
+    "inventory@inventory"
+);
+
+// Setup page goes here
+$form=new Form($db);
+$var=false;
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameters").'</td>'."\n";
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
+
+
+// Example with a yes / no select
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("INVENTORY_GEN_PDF").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="300">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_INVENTORY_GEN_PDF">';
+print $form->selectyesno("INVENTORY_GEN_PDF",$conf->global->INVENTORY_GEN_PDF,1);
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+// Example with a yes / no select
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("INVENTORY_DISABLE_VIRTUAL").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="300">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_INVENTORY_DISABLE_VIRTUAL">';
+print $form->selectyesno("INVENTORY_DISABLE_VIRTUAL",$conf->global->INVENTORY_DISABLE_VIRTUAL,1);
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+// Example with a yes / no select
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="300">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_INVENTORY_USE_MIN_PA_IF_NO_LAST_PA">';
+print $form->selectyesno("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA",$conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA,1);
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+// Example with a yes / no select
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="300">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT">';
+print $form->selectyesno("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT",$conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT,1);
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+print '</table>';
+
+llxFooter();
+
+$db->close();
\ No newline at end of file
diff --git a/htdocs/inventory/ajax/ajax.inventory.php b/htdocs/inventory/ajax/ajax.inventory.php
index 34efecfab8f..f2f5ef54903 100644
--- a/htdocs/inventory/ajax/ajax.inventory.php
+++ b/htdocs/inventory/ajax/ajax.inventory.php
@@ -1,24 +1,21 @@
 <?php
 
-    require('../config.php');
-    require('../class/inventory.class.php');
-
+    require '../../main.inc.php';
+    require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php';
     
     $get = GETPOST('get');
     $put = GETPOST('put');
     
-    $PDOdb=new TPDOdb;
-    
     switch ($put) {
         case 'qty':
             if (!$user->rights->inventory->write) { echo -1; exit; }
             
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
-            $det = new Inventorydet;
-            if( $det->load($PDOdb, $fk_det_inventory)) {
+            $det = new Inventorydet($db);
+            if( $det->fetch( $fk_det_inventory)) {
                 $det->qty_view+=GETPOST('qty');
-                $det->save($PDOdb);
+                $det->update($user);
                 
                 echo $det->qty_view;
             }
@@ -33,10 +30,10 @@
             
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
-            $det = new Inventorydet;
-            if( $det->load($PDOdb, $fk_det_inventory)) {
+            $det = new Inventorydet($db);
+            if( $det->fetch( $fk_det_inventory)) {
                 $det->new_pmp=price2num(GETPOST('pmp'));
-                $det->save($PDOdb);
+                $det->update($user);
                 
                 echo $det->new_pmp;
             }
diff --git a/htdocs/inventory/img/plus.png b/htdocs/inventory/img/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7072a96960e30374c5d4f6a5e9bfc374e7a532a
GIT binary patch
literal 1299
zcmV+u1?>8XP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-v<T?BRjgnoCN>?02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00etUL_t(o!?l;qYaC@9$3Hun
z-R>r7NwP^cY02AGDU_xVmNpiZDhL+DlP!XX2QLa1CD6aXqaGA`Q1IZ{Lr;QO>Ol{R
zp2WMMHcbebDalT=vzd8bJ!ED(nQqc;n|$G6W}auB-}m?a%oI2Pqobn$Jb3URohsGq
z^^t0|Is^<^Yb(YWwAO7YWe^0x*4o<ICLjS$pFYj<^726x6zC1d8;!<iQ&Uq{%H{H`
zwRYSXTQtU?ltfC25JE^Py;iGr*Z2LOR#sMS0^yScAE>~|lP4?HYW4b=GiSc2)oMt&
zOQw`UDb=}`Qlhm+2+>&!g24E`zZ3+)w{aYcxw$!3R#wnjAFM#FR%2shgHxwYU0PgR
zyg5ET-Y66b8FGzMa*qP}d!-b{7=#eCTCG3V*VjLeqUfI|dSHBf9MAJOckbMk3l}cj
zs#GfddkHjJ?>-A5&|2>y*IIYHk&fiu*!TUnTdmd|$8j*mbU6F63WQ<E{QUe|=g*)2
zad2?(SZZ}DG`&yByM-hr&3XcGi^bwQ#+X0iIR39zs}Y9b;~toqnR)s0<;!=<<#Oeb
zkVjUhBaL^SEM3bEYi;%_JkPr*rR;>GFf=qov)N=~VxqFRxcK|%=;%V$eR($vA@F_w
zmJp(4j3FsQ3k>#G`mbuUyEk1k#&nd>S`$Ul-_2(8)wDv~YPFgwaASCQcp+;^-a08I
zJ3BiBL9lf1-o5)-@0CiWsp;wItLd|~mMDq{!;mP7I!ak<7l03dZvfn+QH;#a&VFu;
z=^DqpLXP9O`D}Jw*G*l$y}eDd*?g?zGWZ(!4p1&YqtRFz7#Q4B$Jr3%vpk!{DU?!p
zp2yD4PS^DuO288Er2~}5#>U=AJ6bl=(~+G^70E*gK^TU;kf(Sbz&(5RY_+eiZ?2p5
zLI|QLVz=e)mQ)<aNGWX>ftIJk1TgKEN~K|?)EMwsBiY*8`oZ(OPm9H3(OQeO79oU<
zqR8taa21%!DPn-HfOor{FTjLrtsODOIN9V&6%ay%zVCZITBH&s@@Vh#{xM+Kl~SI_
zHjJzS#+U-nkNspgK*deFS{j0UH#=&$g+d`vN_9#pOKyy@hrqF)3<I=XrPO8|$J%k6
zzI-3oS|10d0XHY`eiHLN#sD)pLYpL8H$=deD}>mTQhJW#Od4%Sd%2Vn&-1PU*Sc)3
z19x+CQ^3DZ;hAk<-C12--IPM!)mo!6r{3Dy8dA!m4F5W?>KJ3<upR!KZ9<!yo1Mfw
zLVUlcDa_2w*m}KgCnqOu61#)OTo-|JJ?u+ID=kka`Sjjyx7#<Qlx%El^xAZKncEN7
z(_}5Uu8UHNfq{WzTI*k<D0-;}0k@M5SIA_0Kk#M`d;bDn2X?wGE+pA$k7$Izi%-(<
zwZyu^Cf@=s_8OyCfQN@{`K6~VlX>8`Lm>YJc;Q)VwFG<!#Lqyy4ZN3Y<Ijvf;1l2u
zu)I&AK1^EiZQ!H)PtWuI9cRz*5#U5}$doe&%Qg@s$=36S;r~2|UOP4t;aLCx002ov
JPDHLkV1j!aXlwug

literal 0
HcmV?d00001

diff --git a/htdocs/inventory/img/plus16.png b/htdocs/inventory/img/plus16.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad17ac89391585adf3fe47f650c3e38ebd5779c7
GIT binary patch
literal 665
zcmV;K0%rY*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-v<T?BqEXMq5=Q_02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00IF?L_t(I%YBf)Yg17i#Xm23
zFPK1Dy0mf1E9sDe1d2mr5Hg8_7!f0Mh@0T9ga1V9(A9sSgE-YX3I4#X2pz;BSuD}m
z)YeCH-@WhNyq7wd7oH*QfdgOoo^$wqk3|9-8yoEG>`<%K8ihik7KYKH)&WYXqh7D~
zx!rE>uB@!k>2xL@D;co9zFsYrN_%s2a|^!jqm-IZYmMi5zmJcPZ}<ECFR>>b5A}Ne
zQKeFO17v;QM@os5^1qNMigLDXKd~(9n^Nj4K)Tgxk<Dgrtgf!^{u2f$B^e9`p67Xo
zzVDxCt<%PsE5;Z`qY>$J`r&9adTWgNVF5IoO)rzl%xkR)f*?Nk#s2>OGXU3hw=Bzg
zdU|?_5P~R*0FHoyU9DE{JB~B&`#xH0;*cN+ocO(Nx9fyq$P|`<hMmvnYeI<l&p$$l
zm&4&OBc=QpE5k5+4@AHacnmDW)!D|FLKH=4tr0@>4-O8V$HrVPhm;cF^_T#SL_on-
zN}Z=tsmbX{jLnzAR!aR!rBaxoK?t!3YylbI1Mq6BYXbH03rh+APu!w=uUsylyRLf<
zB)OdsZcpuE-T|OkES@-yGrinQ1Z>VQcL7*lUdFcV>oWvr!1poFX6)Cd`*?7{nX`EJ
zqEgp@-X+FE;9AmPT@Z8&xCvaHv<;ttchkbZ0%0!T4SB2a00000NkvXXu0mjfN$Dr+

literal 0
HcmV?d00001

diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index 1d9ec174257..ccda1b37c0e 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -131,7 +131,7 @@ function _action()
 			if (!$user->rights->inventory->write) accessforbidden();
 			
 			
-			$id = __get('id', 0, 'int');
+			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
 			$inventory->load($PDOdb, $id);
@@ -153,7 +153,7 @@ function _action()
 			
 		case 'regulate':
 			
-			$id = __get('id', 0, 'int');
+			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
 			$inventory->load($PDOdb, $id);
@@ -174,10 +174,10 @@ function _action()
 			
 		case 'changePMP':
 			
-			$id = __get('id', 0, 'int');
+			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch( $id );
 			
 			$inventory->changePMP($PDOdb);
 			
@@ -188,12 +188,11 @@ function _action()
 		case 'add_line':
 			if (!$user->rights->inventory->write) accessforbidden();
 			
-			
-			$id = __get('id', 0, 'int');
-			$fk_warehouse = __get('fk_warehouse', 0, 'int');
+			$id = GETPOST('id');
+			$fk_warehouse = GETPOST('fk_warehouse');
 			
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch( $id );
 			
 			$type = (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) ? 'string' : 'int'); //AA heu ?
 			
@@ -245,16 +244,17 @@ function _action()
 			
 			
 			//Cette action devrais se faire uniquement si le status de l'inventaire est à 0 mais aucune vérif
-			$rowid = __get('rowid', 0, 'int');
-			$Inventorydet = new Inventory($db);
-			$Inventorydet->load($PDOdb, $rowid);
-			$Inventorydet->delete($PDOdb);
-			
-			$id = __get('id', 0, 'int');
+			$rowid = GETPOST('rowid');
+			$Inventorydet = new Inventorydet($db);
+			if($Inventorydet->fetch($rowid)>0) {
+				$Inventorydet->delete($user);
+				setEventMessage("ProductDeletedFromInventory");
+			}
+			$id = GETPOST('id');
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch( $id);
 			
-			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+			_card($inventory, 'edit');
 			
 			break;
         case 'flush':
@@ -519,16 +519,14 @@ function _card_line(&$inventory, &$lines, $mode)
 			'produit' => $product->getNomUrl(1).'&nbsp;-&nbsp;'.$product->label
 			,'entrepot'=>$e->getNomUrl(1)
 			,'barcode' => $product->barcode
-			,'qty' =>($mode == 'edit' ? '<input type="text" name="qty_to_add['.$k.']" value="'.$qty.'" size="8" style="text-align:center;" />' : $qty )
-                        .($mode =='edit' ? '<a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto($langs->trans('Add'), 'plus16@inventory').'</a>' : '')
+			,'qty' =>($mode == 'edit' ? '<input type="text" name="qty_to_add['.$k.']" value="'.$qty.'" size="8" style="text-align:center;" /> <a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto($langs->trans('Add'), 'plus16@inventory').'</a>' : '' )
 			,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
 			,'qty_stock' => $stock
 			,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
 			,'action' => ($user->rights->inventory->write ? '<a onclick="if (!confirm(\'Confirmez-vous la suppression de la ligne ?\')) return false;" href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : '')
 			,'pmp_stock'=>round($pmp_actual,2)
             ,'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2)
-			,'pmp_new'=>(!empty($user->rights->inventory->changePMP) ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" />'
-					.($mode =='edit' ? '<a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' : '') : '')
+			,'pmp_new'=>(!empty($user->rights->inventory->changePMP && $mode =='edit') ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" /> <a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' :  price($Inventorydet->new_pmp))
             ,'pa_stock'=>round($last_pa * $stock,2)
             ,'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2)
 			,'current_pa_stock'=>round($current_pa * $stock,2)
@@ -656,24 +654,24 @@ function _headerList($view) {
 	?>
 			<tr style="background-color:#dedede;">
 				<th align="left" width="20%">&nbsp;&nbsp;Produit</th>
-				<th align="center">Entrepôt</td>
+				<th align="center"><?php echo $langs->trans('Warehouse'); ?></th>
 				<?php if (! empty($conf->barcode->enabled)) { ?>
-					<th align="center">Code-barre</td>
+					<th align="center"><?php echo $langs->trans('Barcode'); ?></th>
 				<?php } ?>
 				<?php if ($view['can_validate'] == 1) { ?>
-					<th align="center" width="20%">Quantité théorique</th>
+					<th align="center" width="20%"><?php echo $langs->trans('TheoricalQty'); ?></th>
 					<?php
 	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
-	              		echo '<th align="center" width="20%" colspan="3">Valeur théorique</th>';   	
+	              		echo '<th align="center" width="20%" colspan="3">'.$langs->trans('TheoricalValue').'</th>';   	
 					 }
 					 else {
-					 	echo '<th align="center" width="20%" colspan="2">Valeur théorique</th>';
+					 	echo '<th align="center" width="20%" colspan="2">'.$langs->trans('TheoricalValue').'</th>';
 					 }
 					 
 					?>
 					
 				<?php } ?>
-				    <th align="center" width="20%">Quantité réelle</th>
+				    <th align="center" width="20%"><?php echo $langs->trans('RealQty'); ?></th>
 				<?php if ($view['can_validate'] == 1) { ?>
 				    
 				    <?php
@@ -682,39 +680,39 @@ function _headerList($view) {
 					 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) $colspan++;
 				     if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) $colspan++;
 					
-	                 echo '<th align="center" width="20%" colspan="'.$colspan.'">Valeur réelle</th>';
+	                 echo '<th align="center" width="20%" colspan="'.$colspan.'">'.$langs->trans('RealValue').'</th>';
 					 
 					?>
 						
-					<th align="center" width="15%">Quantité régulée</th>
+					<th align="center" width="15%"><?php echo $langs->trans('RegulatedQty'); ?></th>
 				<?php } ?>
 				<?php if ($view['is_already_validate'] != 1) { ?>
 					<th align="center" width="5%">#</th>
 				<?php } ?>
-				<th align="center" width="5%"></th>
+				
 			</tr>
 			<?php if ($view['can_validate'] == 1) { ?>
 	    	<tr style="background-color:#dedede;">
 	    	    <th colspan="<?php echo empty($conf->barcode->enabled) ? 3 : 4;  ?>">&nbsp;</th>
-	    	    <th>PMP</th>
-	    	    <th>Dernier PA</th>
+	    	    <th><?php echo $langs->trans('PMP'); ?></th>
+	    	    <th><?php echo $langs->trans('LastPA'); ?></th>
 	    	    <?php
 	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
-	              		echo '<th>PA courant</th>';   	
+	              		echo '<th>'.$langs->trans('CurrentPA').'</th>';   	
 					 }
 					 
 				?>
 	    	    <th>&nbsp;</th>
-	    	    <th>PMP</th>
+	    	    <th><?php echo $langs->trans('PMP'); ?></th>
 	    	    <?php
 	    	    if(!empty($user->rights->inventory->changePMP)) {
 	    	    	echo '<th rel="newPMP">'.$langs->trans('ColumnNewPMP').'</th>';
 	    	    }
 	    	    ?>
-	            <th>Dernier PA</th>
+	            <th><?php echo $langs->trans('LastPA'); ?></th>
 	            <?php
 	                 if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){
-	              		echo '<th>PA courant</th>';   	
+	              		echo '<th>'.$langs->trans('CurrentPA').'</th>';   	
 					 }
 					 
 				?>
diff --git a/htdocs/inventory/tpl/inventory.tpl.php b/htdocs/inventory/tpl/inventory.tpl.php
index 8a3bfd0f2a6..c3c1347446b 100644
--- a/htdocs/inventory/tpl/inventory.tpl.php
+++ b/htdocs/inventory/tpl/inventory.tpl.php
@@ -8,7 +8,7 @@
         $('#a_save_qty_'+k).hide();
         
         $.ajax({
-            url:"script/interface.php"
+            url:"ajax/ajax.inventory.php"
             ,data:{
                 'fk_det_inventory' : fk_det_inventory
                 ,'qty': qty
@@ -37,7 +37,7 @@
         $('#a_save_new_pmp_'+k).hide();
         
         $.ajax({
-            url:"script/interface.php"
+            url:"ajax/ajax.inventory.php"
             ,data:{
                 'fk_det_inventory' : fk_det_inventory
                 ,'pmp': pmp
@@ -137,7 +137,7 @@
                     <td align="right"><?php echo price($row['pmp_actual']); ?></td>
                     <?php
                     if(!empty($user->rights->inventory->changePMP)) {
-                    	echo '<td>'.$row['pmp_new'].'</td>';	
+                    	echo '<td align="right">'.$row['pmp_new'].'</td>';	
 					}
                     ?>
                     <td align="right"><?php echo price($row['pa_actual']); ?></td>

From 9f6f87465503e57e757b46b4de0c783a510f17b8 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 15 Dec 2016 12:33:26 +0100
Subject: [PATCH 0065/1163] fix

---
 htdocs/core/class/coreobject.class.php     |  4 +-
 htdocs/core/db/DoliDB.class.php            |  2 +-
 htdocs/inventory/class/inventory.class.php | 55 ++++++++++++----
 htdocs/inventory/inventory.php             | 73 ++++++----------------
 4 files changed, 64 insertions(+), 70 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 75706403069..50b59761b1d 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -158,7 +158,7 @@ class CoreObject extends CommonObject {
 					$query[$field] = $this->date_0;
 				}
 				else{
-					$query[$field] = $this->db->jdate($this->{$field});
+					$query[$field] = $this->db->idate($this->{$field});
 				}
 		  	}
 		  	else if($this->is_array($info)){
@@ -427,7 +427,6 @@ class CoreObject extends CommonObject {
 	  	}
 		else {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-				
 			$this->{$field} = dol_stringtotime($date);
 		}
 
@@ -435,6 +434,7 @@ class CoreObject extends CommonObject {
 	}
 	
 	public function set_values(&$Tab) {
+		
 		foreach ($Tab as $key=>$value) {
 	
 			if($this->checkFieldType($key,'date')) {
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index da0717e665b..230572050b5 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -355,7 +355,7 @@ abstract class DoliDB implements Database
 			$values[] = $this->quote($v);
 			
 		}
-		
+
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$table.' 
 					( '.implode( ",", $keys ).' ) 
 					VALUES ( '.implode( ",", $values ).' ) ';
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 76ed46c4aa8..b02d601854d 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -71,8 +71,9 @@ class Inventory extends CoreObject
 	
 	public $db;
 	
-	function __construct(DoliDB &$db) 
+	public function __construct(DoliDB &$db) 
 	{
+		global $conf;
 		
 		$this->db = &$db;
 		
@@ -85,13 +86,13 @@ class Inventory extends CoreObject
 		
 	}
 	
-	function sort_det() 
+	private function sort_det() 
 	{
 
 		if(!empty($this->Inventorydet))	usort($this->Inventorydet, array('Inventory', 'customSort'));
 	}
 	
-	function fetch($id,$annexe = true) 
+	public function fetch($id,$annexe = true) 
 	{
 	    
         if(!$annexe) $this->withChild = false;
@@ -115,7 +116,7 @@ class Inventory extends CoreObject
 	}
 	
 	
-	function customSort(&$objA, &$objB)
+	private function customSort(&$objA, &$objB)
 	{
 		global $db;
 		
@@ -128,7 +129,7 @@ class Inventory extends CoreObject
 		return $r;
 	}
 	
-	function changePMP() {
+	public function changePMP() {
 		
 		foreach ($this->Inventorydet as $k => &$Inventorydet)
 		{
@@ -147,7 +148,7 @@ class Inventory extends CoreObject
 		
 	}
 	
-	function update(User &$user)
+	public function update(User &$user)
 	{
 		
 		//si on valide l'inventaire on sauvegarde le stock à cette instant
@@ -159,7 +160,7 @@ class Inventory extends CoreObject
 		parent::update($user);
 	}
 	
-	function set_values(&$Tab)
+	public function set_values(&$Tab)
 	{
 		global $db,$langs;
 		
@@ -186,19 +187,19 @@ class Inventory extends CoreObject
 		parent::set_values($Tab);
 	}
 	
-    function deleteAllLine() {
+    public function deleteAllLine(User &$user) {
         
         foreach($this->Inventorydet as &$det) {
             $det->to_delete = true;
         }
         
-        $this->update();
+        $this->update($user);
       
         $this->Inventorydet=array();
         
     }
     
-    function add_product($fk_product, $fk_entrepot='') {
+    public function add_product($fk_product, $fk_entrepot='') {
         
         $k = $this->addChild('Inventorydet');
         $det =  &$this->Inventorydet[$k];
@@ -215,7 +216,7 @@ class Inventory extends CoreObject
         
     }
     
-    function correct_stock($fk_product, $fk_warehouse, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
+    public function correct_stock($fk_product, $fk_warehouse, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
 	{
 		global $conf, $db, $langs, $user;
 		
@@ -250,7 +251,7 @@ class Inventory extends CoreObject
 		}
 	}
 	
-	function regulate()
+	public function regulate()
 	{
 		global $db,$user,$langs,$conf;
 		
@@ -312,6 +313,36 @@ class Inventory extends CoreObject
         
 	} 
 	
+	public function add_products_for($fk_warehouse,$fk_category=0,$fk_supplier=0,$only_prods_in_stock=0) {
+		$e = new Entrepot($this->db);
+		$e->fetch($fk_warehouse);
+		$TChildWarehouses = array($fk_warehouse);
+		$e->get_children_warehouses($fk_warehouse, $TChildWarehouses);
+			
+		$sql = 'SELECT ps.fk_product, ps.fk_entrepot
+			     FROM '.MAIN_DB_PREFIX.'product_stock ps
+			     INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = ps.fk_product)
+                 LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product cp ON (cp.fk_product = p.rowid)
+				 LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price pfp ON (pfp.fk_product = p.rowid)
+			     WHERE ps.fk_entrepot IN ('.implode(', ', $TChildWarehouses).')';
+			
+		if($fk_category>0) $sql.= " AND cp.fk_categorie=".$fk_category;
+		if($fk_supplier>0) $sql.= " AND pfp.fk_soc=".$fk_supplier;
+		if(!empty($only_prods_in_stock)) $sql.= ' AND ps.reel > 0';
+			
+		$sql.=' GROUP BY ps.fk_product, ps.fk_entrepot
+					ORDER BY p.ref ASC,p.label ASC';
+		 
+		$res = $this->db->query($sql);
+		if($res) {
+			while($obj = $this->db->fetch_object($res)){
+				$this->add_product($obj->fk_product, $obj->fk_entrepot);
+			}
+		}
+			
+		
+	}
+	
     static function getLink($id) {
         global $langs,$db;
         
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index ccda1b37c0e..b03627d326a 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -83,34 +83,7 @@ function _action()
             $fk_warehouse = (int)GETPOST('fk_warehouse');
 			$only_prods_in_stock = (int)GETPOST('OnlyProdsInStock');
             
-			$e = new Entrepot($db);
-			$e->fetch($fk_warehouse);
-			$TChildWarehouses = array($fk_warehouse);
-			$e->get_children_warehouses($fk_warehouse, $TChildWarehouses);
-			
-			$sql = 'SELECT ps.fk_product, ps.fk_entrepot 
-			     FROM '.MAIN_DB_PREFIX.'product_stock ps 
-			     INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = ps.fk_product) 
-                 LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product cp ON (cp.fk_product = p.rowid)
-				 LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price pfp ON (pfp.fk_product = p.rowid)
-			     WHERE ps.fk_entrepot IN ('.implode(', ', $TChildWarehouses).')';
-			
-            if($fk_category>0) $sql.= " AND cp.fk_categorie=".$fk_category;
-			if($fk_supplier>0) $sql.= " AND pfp.fk_soc=".$fk_supplier;
-			if($only_prods_in_stock>0) $sql.= ' AND ps.reel > 0';
-			
-			$sql.=' GROUP BY ps.fk_product, ps.fk_entrepot
-					ORDER BY p.ref ASC,p.label ASC';
-                 
-                 
-			$res = $db->query($sql);
-			if($res) {
-				while($obj = $db->fetch_object($res)){
-				
-	                $inventory->add_product($obj->fk_product, $obj->fk_entrepot);
-				}
-			}
-			
+			$inventory->add_products_for($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
 			$inventory->update($user);
 			
 			header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=edit', 1));
@@ -134,14 +107,14 @@ function _action()
 			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch($id);
 			
 			$inventory->set_values($_REQUEST);
 			
 			if ($inventory->errors)
 			{
 				setEventMessage($inventory->errors, 'errors');
-				_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+				_card( $inventory, 'edit');
 			}
 			else 
 			{
@@ -156,18 +129,18 @@ function _action()
 			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch($id);
             
             if($inventory->status == 0) {
                 $inventory->status = 1;
-                $inventory->save($PDOdb);
+                $inventory->update($user);
                 
-                _fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'view');
+                _card( $inventory, 'view');
                 
             
             }
             else {
-               _fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'view');
+               _card( $inventory, 'view');
             }
             
 			break;
@@ -181,7 +154,7 @@ function _action()
 			
 			$inventory->changePMP($PDOdb);
 			
-			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'view');
+			_card( $inventory, 'view');
 			
 			break;
 			
@@ -235,7 +208,7 @@ function _action()
 				$inventory->sort_det();
 			}
 			
-			_fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+			_card( $inventory, 'edit');
 			
 			break;
 			
@@ -261,16 +234,16 @@ function _action()
             if (!$user->rights->inventory->create) accessforbidden();
             
             
-            $id = __get('id', 0, 'int');
+            $id = GETPOST('id');
             
             $inventory = new Inventory($db);
-            $inventory->load($PDOdb, $id);
+            $inventory->fetch($id);
             
             $inventory->deleteAllLine($PDOdb);
             
             setEventMessage('Inventaire vidé');
             
-            _fiche($PDOdb, $user, $db, $conf, $langs, $inventory, 'edit');
+            _card( $inventory, 'edit');
            
             
             break;
@@ -278,33 +251,23 @@ function _action()
 			if (!$user->rights->inventory->create) accessforbidden();
             
 			
-			$id = __get('id', 0, 'int');
+			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch($id);
 			
-			$inventory->delete($PDOdb);
+			$inventory->delete($user);
 			
 			header('Location: '.dol_buildpath('/inventory/inventory.php', 1));
 			exit;
 			//_list();
 			
-		case 'printDoc':
-			
-			$id = __get('id', 0, 'int');
-			
-			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
-			
-			generateODT($PDOdb, $db, $conf, $langs, $inventory);
-			break;
-			
 		case 'exportCSV':
 			
-			$id = __get('id', 0, 'int');
+			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
-			$inventory->load($PDOdb, $id);
+			$inventory->fetch($id);
 			
 			exportCSV($inventory);
 			
@@ -453,7 +416,7 @@ function _card(&$inventory, $mode='edit')
 	$warehouse = new Entrepot($db);
 	$warehouse->fetch($inventory->fk_warehouse);
 	
-	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), '&action='.$mode));
+	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), empty($mode) ? '': '&action='.$mode));
 	
 	$lines = array();
 	_card_line($inventory, $lines, $mode);

From 7a6fcc744ac8134c5844050956bbe31cd868abac Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Thu, 15 Dec 2016 11:36:42 -0300
Subject: [PATCH 0066/1163] Improve composer installing instructions

Add a new section describing how to install composer to manage dependecies, and make a clean install directly from console.
---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index dddf387cab9..2d5bf7a3cc0 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,16 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](https://git
 
 Releases can be downloaded from [official website](https://www.dolibarr.org/).
 
+### Install from composer
+If you do not already have Composer installed, you may do so by following the instructions at getcomposer.org. On Linux and Mac OS X, you'll run the following commands:
+
+curl -sS https://getcomposer.org/installer | php
+mv composer.phar /usr/local/bin/composer
+
+On Windows, you'll download and run https://getcomposer.org/Composer-Setup.exe
+
+composer create-project dolibarr/dolibarr erp
+
 ### Simple setup
 
 If you have low technical skills and you're looking to install Dolibarr ERP/CRM in few clicks, you can use one of the packaged versions:

From 1596760d21211d562717467d5043e96d9eda3245 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 15 Dec 2016 17:02:20 +0100
Subject: [PATCH 0067/1163] fix regulate / apply new PMP / add or remove line

---
 htdocs/core/class/coreobject.class.php     |  24 +++-
 htdocs/inventory/class/inventory.class.php |  47 ++++----
 htdocs/inventory/inventory.php             | 129 ++++++++++++++-------
 htdocs/inventory/tpl/inventory.tpl.php     |  26 ++---
 4 files changed, 142 insertions(+), 84 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 50b59761b1d..2022844d6fe 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -35,6 +35,7 @@ class CoreObject extends CommonObject {
 	
 	public $date_0 = '1001-01-01 00:00:00'; //TODO there is a solution for this ?
 	
+	public $error = '';
 	/*
 	 *  @var Array $_fields Fields to synchronize with Database
 	 */
@@ -244,6 +245,8 @@ class CoreObject extends CommonObject {
 				return $this->id;
 		}
 		else {
+				$this->error = $this->db->lasterror();
+				
 				return false;
 		}
 		
@@ -335,7 +338,7 @@ class CoreObject extends CommonObject {
 		if(empty($this->id )) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
 		
 		if(isset($this->to_delete) && $this->to_delete==true) {
-			$this->delete();
+			$this->delete($user);
 		}
 		else {
 		
@@ -345,13 +348,21 @@ class CoreObject extends CommonObject {
 			$query['rowid']=$this->id;
 			if(empty($this->no_update_tms))$query['tms'] = date('Y-m-d H:i:s');
 				
-			$this->db->update($this->table_element,$query,array('rowid'));
+			$res = $this->db->update($this->table_element,$query,array('rowid'));
 			
-			$this->id = $this->db->last_insert_id($this->table_element);
+			if($res) {
+			
+				$result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
 				
-			$result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
+				$this->saveChild($user);
+			
+				return true;
+			}
+			else{
+				$this->error = $this->db->lasterror();
 				
-			$this->saveChild($user);
+				return false;
+			}
 		
 		}
 		return $this->id;
@@ -378,6 +389,9 @@ class CoreObject extends CommonObject {
 			return $this->id;
 		}
 		else{
+			
+			$this->error = $this->db->lasterror();
+			
 			return false;
 		}
 	
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index b02d601854d..b39445807e9 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -86,7 +86,7 @@ class Inventory extends CoreObject
 		
 	}
 	
-	private function sort_det() 
+	public function sort_det() 
 	{
 
 		if(!empty($this->Inventorydet))	usort($this->Inventorydet, array('Inventory', 'customSort'));
@@ -129,22 +129,23 @@ class Inventory extends CoreObject
 		return $r;
 	}
 	
-	public function changePMP() {
-		
-		foreach ($this->Inventorydet as $k => &$Inventorydet)
-		{
-			
-			if($Inventorydet->new_pmp>0) {
-				$Inventorydet->pmp = $Inventorydet->new_pmp; 
-				$Inventorydet->new_pmp = 0;
-			
-				$db->query("UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$Inventorydet->pmp."
-				WHERE rowid = ".$Inventorydet->fk_product );
+	public function changePMP(User &$user) {
+		if(!empty($this->Inventorydet)) {
+			foreach ($this->Inventorydet as $k => &$Inventorydet)
+			{
 				
+				if($Inventorydet->new_pmp>0) {
+					$Inventorydet->pmp = $Inventorydet->new_pmp; 
+					$Inventorydet->new_pmp = 0;
+				
+					$this->db->query("UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$Inventorydet->pmp."
+					WHERE rowid = ".$Inventorydet->fk_product );
+					
+				}
 			}
 		}
 		
-		parent::save($PDOdb);
+		return parent::update($user);
 		
 	}
 	
@@ -214,6 +215,7 @@ class Inventory extends CoreObject
         if(empty($date))$date = $this->get_date('datec', 'Y-m-d'); 
         $det->setStockDate( $date , $fk_entrepot);
         
+        return true;
     }
     
     public function correct_stock($fk_product, $fk_warehouse, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
@@ -233,6 +235,9 @@ class Inventory extends CoreObject
 			$datem = empty($conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT) ? dol_now() : $this->date_inventory;
 
 			$movementstock=new MouvementStock($db);
+			$movementstock->origin = new stdClass();
+			$movementstock->origin->element = 'inventory';
+			$movementstock->origin->id = $this->id;
 			$result=$movementstock->_create($user,$fk_product,$fk_warehouse,$op[$movement],$movement,$price,$label,$inventorycode, $datem);
 			
 			if ($result >= 0)
@@ -289,10 +294,7 @@ class Inventory extends CoreObject
 						
 				$href = dol_buildpath('/inventory/inventory.php?id='.$this->id.'&action=view', 1);
 				
-				if(empty($this->title))
-					$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock', $href, $this->id));
-				else
-					$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStockWithNomInventaire', $href, $this->title));
+				$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock'));
 			}
 		}
 
@@ -304,12 +306,15 @@ class Inventory extends CoreObject
 		return 1;
 	}
     
-	public function getNomUrl($picto = 1) {
+	public function getTitle() {
 		global $langs;
 		
-		$title = !empty($this->title) ? $this->title : $langs->trans('inventoryTitle').' '.$this->id;
-        
-        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$this->id, 1).'">'.($picto ? img_picto('','object_list.png','',0).' ' : '').$title.'</a>';
+		return !empty($this->title) ? $this->title : $langs->trans('inventoryTitle').' '.$this->id;
+	}
+	
+	public function getNomUrl($picto = 1) {
+		
+        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$this->id, 1).'">'.($picto ? img_picto('','object_list.png','',0).' ' : '').$this->getTitle().'</a>';
         
 	} 
 	
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index b03627d326a..5a87eb94ceb 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -77,16 +77,25 @@ function _action()
 			$inventory->set_values($_POST);
 			
             $fk_inventory = $inventory->create($user);
-			
-            $fk_category = (int)GETPOST('fk_category');
-            $fk_supplier = (int)GETPOST('fk_supplier');
-            $fk_warehouse = (int)GETPOST('fk_warehouse');
-			$only_prods_in_stock = (int)GETPOST('OnlyProdsInStock');
+			if($fk_inventory>0) {
+            	
+            	$fk_category = (int)GETPOST('fk_category');
+            	$fk_supplier = (int)GETPOST('fk_supplier');
+            	$fk_warehouse = (int)GETPOST('fk_warehouse');
+            	$only_prods_in_stock = (int)GETPOST('OnlyProdsInStock');
+            	
+            	$inventory->add_products_for($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
+            	$inventory->update($user);
+            	
+            	header('Location: '.dol_buildpath('/inventory/inventory.php?id='.$inventory->id.'&action=edit', 1));
+            	
+            }
+            else{
+            	
+            	setEventMessage($inventory->error,'errors');
+            	header('Location: '.dol_buildpath('/inventory/inventory.php?action=create', 1));
+            }
             
-			$inventory->add_products_for($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
-			$inventory->update($user);
-			
-			header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=edit', 1));
 			break;
 			
 		case 'edit':
@@ -118,14 +127,14 @@ function _action()
 			}
 			else 
 			{
-				$inventory->save($PDOdb);
+				$inventory->udpate($user);
 				header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=view', 1));
 			}
 			
 			break;
 			
-		case 'regulate':
-			
+		case 'confirm_regulate':
+			if (!$user->rights->inventory->write) accessforbidden();
 			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
@@ -145,14 +154,14 @@ function _action()
             
 			break;
 			
-		case 'changePMP':
+		case 'confirm_changePMP':
 			
 			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
 			$inventory->fetch( $id );
 			
-			$inventory->changePMP($PDOdb);
+			$inventory->changePMP($user);
 			
 			_card( $inventory, 'view');
 			
@@ -167,35 +176,33 @@ function _action()
 			$inventory = new Inventory($db);
 			$inventory->fetch( $id );
 			
-			$type = (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) ? 'string' : 'int'); //AA heu ?
-			
-			$fk_product = __get('fk_product', 0, $type);
-			
-			if ($fk_product)
+			$fk_product = GETPOST('fk_product');
+			if ($fk_product>0)
 			{
 				$product = new Product($db);
-				$product->fetch($fk_product);	// ! ref TODO vérifier quand même			
-				if($product->type != 0) {
+				if($product->fetch($fk_product)<=0 || $product->type != 0) {
 					setEventMessage($langs->trans('ThisIsNotAProduct'),'errors');
 				}
 				else{
 					
 					//Check product not already exists
 					$alreadyExists = false;
-					foreach ($inventory->Inventorydet as $invdet)
-					{
-						if ($invdet->fk_product == $product->id
-							&& $invdet->fk_warehouse == $fk_warehouse)
+					if(!empty($inventory->Inventorydet)) {
+						foreach ($inventory->Inventorydet as $invdet)
 						{
-							$alreadyExists = true;
-							break;
+							if ($invdet->fk_product == $product->id
+								&& $invdet->fk_warehouse == $fk_warehouse)
+							{
+								$alreadyExists = true;
+								break;
+							}
 						}
 					}
-					
 					if (!$alreadyExists)
 					{
-					    $inventory->add_product($PDOdb, $product->id, $fk_warehouse);
-                        
+					    if($inventory->add_product($product->id, $fk_warehouse)) {
+					    	setEventMessage($langs->trans('ProductAdded'));
+					    }
 					}
 					else
 					{
@@ -204,7 +211,7 @@ function _action()
 					
 				}
 				
-				$inventory->save($PDOdb);
+				$inventory->update($user);
 				$inventory->sort_det();
 			}
 			
@@ -212,7 +219,7 @@ function _action()
 			
 			break;
 			
-		case 'delete_line':
+		case 'confirm_delete_line':
 			if (!$user->rights->inventory->write) accessforbidden();
 			
 			
@@ -230,7 +237,7 @@ function _action()
 			_card($inventory, 'edit');
 			
 			break;
-        case 'flush':
+        case 'confirm_flush':
             if (!$user->rights->inventory->create) accessforbidden();
             
             
@@ -239,15 +246,15 @@ function _action()
             $inventory = new Inventory($db);
             $inventory->fetch($id);
             
-            $inventory->deleteAllLine($PDOdb);
+            $inventory->deleteAllLine($user);
             
-            setEventMessage('Inventaire vidé');
+            setEventMessage($langs->trans('InventoryFlushed'));
             
             _card( $inventory, 'edit');
            
             
             break;
-		case 'delete':
+		case 'confirm_delete':
 			if (!$user->rights->inventory->create) accessforbidden();
             
 			
@@ -258,7 +265,9 @@ function _action()
 			
 			$inventory->delete($user);
 			
-			header('Location: '.dol_buildpath('/inventory/inventory.php', 1));
+			setEventMessage($langs->trans('InventoryDeleted'));
+			
+			header('Location: '.dol_buildpath('/inventory/inventory.php?action=list', 1));
 			exit;
 			//_list();
 			
@@ -407,19 +416,53 @@ function _card_warehouse(&$inventory)
 	llxFooter('');
 }
 
-function _card(&$inventory, $mode='edit')
+function _card(&$inventory, $action='edit')
 {
-	global $langs, $conf, $db, $user;
+	global $langs, $conf, $db, $user,$form;
 	
 	llxHeader('',$langs->trans('inventoryEdit'),'','');
 	
+	if($action == 'changePMP') {
+	
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('ApplyNewPMP')
+				,$langs->trans('ConfirmApplyNewPMP',$inventory->getTitle()),'confirm_changePMP'
+				,array(),'no',1);
+	
+	}
+	else if($action == 'flush') {
+	
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('FlushInventory')
+				,$langs->trans('ConfirmFlushInventory',$inventory->getTitle()),'confirm_flush'
+				,array(),'no',1);
+	
+	}
+	else if($action == 'delete') {
+	
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('Delete')
+				,$langs->trans('ConfirmDelete',$inventory->getTitle()),'confirm_delete'
+				,array(),'no',1);
+	
+	}
+	else if($action == 'delete_line') {
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id.'&rowid='.GETPOST('rowid'),$langs->trans('DeleteLine')
+				,$langs->trans('ConfirmDeleteLine',$inventory->getTitle()),'confirm_delete_line'
+				,array(),'no',1);
+	
+	}
+	else if($action == 'regulate') {
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('RegulateStock')
+				,$langs->trans('ConfirmRegulateStock',$inventory->getTitle()),'confirm_regulate'
+				,array(),'no',1);
+	
+	}
+	
 	$warehouse = new Entrepot($db);
 	$warehouse->fetch($inventory->fk_warehouse);
 	
-	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), empty($mode) ? '': '&action='.$mode));
+	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), empty($action) ? '': '&action='.$action));
 	
 	$lines = array();
-	_card_line($inventory, $lines, $mode);
+	_card_line($inventory, $lines, $action);
 	
 	print '<b>'.$langs->trans('inventoryOnDate')." ".$inventory->get_date('date_inventory').'</b><br><br>';
 	
@@ -439,7 +482,7 @@ function _card(&$inventory, $mode='edit')
 	$view_url = dol_buildpath('/inventory/inventory.php', 1);
 	
 	$view = array(
-		'mode' => $mode
+		'mode' => $action
 		,'url' => dol_buildpath('/inventory/inventory.php', 1)
 		,'can_validate' => (int) $user->rights->inventory->validate
 		,'is_already_validate' => (int) $inventory->status
@@ -486,7 +529,7 @@ function _card_line(&$inventory, &$lines, $mode)
 			,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
 			,'qty_stock' => $stock
 			,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
-			,'action' => ($user->rights->inventory->write ? '<a onclick="if (!confirm(\'Confirmez-vous la suppression de la ligne ?\')) return false;" href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : '')
+			,'action' => ($user->rights->inventory->write && $mode=='edit' ? '<a href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : '')
 			,'pmp_stock'=>round($pmp_actual,2)
             ,'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2)
 			,'pmp_new'=>(!empty($user->rights->inventory->changePMP && $mode =='edit') ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" /> <a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' :  price($Inventorydet->new_pmp))
diff --git a/htdocs/inventory/tpl/inventory.tpl.php b/htdocs/inventory/tpl/inventory.tpl.php
index c3c1347446b..d707ec581b1 100644
--- a/htdocs/inventory/tpl/inventory.tpl.php
+++ b/htdocs/inventory/tpl/inventory.tpl.php
@@ -159,44 +159,40 @@
         } 
 		
 		_footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actual, $total_current_pa,$total_current_pa_actual);
-		?>
 	
-	  
-		
+		?>
 	</table>
 	
-	<?php if ($view['is_already_validate'] != 1) { ?>
+	<?php if ($inventory->status != 1) { ?>
 		<div class="tabsAction" style="height:30px;">
-			<?php if ($view['mode'] == 'view') { ?>
+			<?php if ($action!= 'edit') { ?>
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
 				<?php 
 				 if(!empty($user->rights->inventory->changePMP)) {
-				 	echo '<a href="javascript:;" onclick="if (!confirm(\'Confirmez-vous l\\\'application du nouveau PMP ?\')) return false; else document.location.href=\''.$view_url
-				 			.'?id='.$inventory->id
-				 			.'&action=changePMP&token='.$view['token'].'\'; " class="butAction">'.$langs->trans('ApplyPMP').'</a>';
+				 	echo '<a href="'.$view_url.'?id='.$inventory->id.'&action=changePMP" class="butAction">'.$langs->trans('ApplyPMP').'</a>';
 				 }
 				
 				if ($can_validate == 1) { ?>
-					<a href="javascript:;" onclick="if (!confirm('Confirmez-vous la régulation ?')) return false; else document.location.href='<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=regulate&token=<?php echo $view['token']; ?>'; " class="butAction">Réguler le stock</a>
+					<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=regulate&token=" class="butAction"><?php echo $langs->trans('RegulateStock') ?></a>
 				<?php } ?>
 			<?php } ?>
-			<?php if ($view['mode'] == 'edit') { ?>
-				<input name="back" type="button" class="butAction" value="Quitter la saisie" onclick="document.location='?id=<?php echo $inventory->id; ?>&action=view';" />
+			<?php if ($action == 'edit') { ?>
+				<input name="back" type="button" class="butAction" value="<?php echo $langs->trans('ExitEditMode'); ?>" onclick="document.location='?id=<?php echo $inventory->id; ?>&action=view';" />
 			<?php } ?>
 			<?php if ($can_validate == 1) { ?>
-                <a onclick="if (!confirm('Confirmez-vous la vidange ?')) return false;" href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=flush" class="butActionDelete">Vider</a>
+                <a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=flush" class="butActionDelete"><?php  echo $langs->trans('Flush'); ?></a>
                 &nbsp;&nbsp;&nbsp;
-                <a onclick="if (!confirm('Confirmez-vous la suppression ?')) return false;" href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=delete" class="butActionDelete">Supprimer</a>
+                <a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=delete" class="butActionDelete"><?php echo $langs->trans('Delete') ?></a>
         	<?php } ?>
 		</div>
 	<?php } ?>
-	<?php if ($view['is_already_validate'] == 1) { ?>
+	<?php if ($inventory->status == 1) { ?>
 		<div class="tabsAction">
 			<?php if ($can_validate == 1) { ?>
 
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
-				<a href="#" title="Cet inventaire est validé" class="butActionRefused"><?php echo $langs->trans('Delete') ?></a>
+				<a href="#" title="<?php echo $langs->trans('InventoryAlreadyValidated'); ?>" class="butActionRefused"><?php echo $langs->trans('Delete') ?></a>
 				
 			<?php } ?>
 		</div>

From b7a6a71dff921c7bca72fcca7c964fd7b2c0b7a5 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 15 Dec 2016 17:20:46 +0100
Subject: [PATCH 0068/1163] move file to core

---
 .../inventory.php}                            |  26 +--
 ...ntory.class.php => modInventory.class.php} |   4 +-
 htdocs/inventory/lib/inventory.lib.php        | 161 +-----------------
 3 files changed, 15 insertions(+), 176 deletions(-)
 rename htdocs/{inventory/admin/inventory_setup.php => admin/inventory.php} (84%)
 rename htdocs/core/modules/{modinventory.class.php => modInventory.class.php} (99%)

diff --git a/htdocs/inventory/admin/inventory_setup.php b/htdocs/admin/inventory.php
similarity index 84%
rename from htdocs/inventory/admin/inventory_setup.php
rename to htdocs/admin/inventory.php
index f55bc092517..2548494fc79 100644
--- a/htdocs/inventory/admin/inventory_setup.php
+++ b/htdocs/admin/inventory.php
@@ -23,17 +23,16 @@
  * 				Put some comments here
  */
 // Dolibarr environment
-$res = @include("../../main.inc.php"); // From htdocs directory
-if (! $res) {
-    $res = @include("../../../main.inc.php"); // From "custom" directory
-}
+require '../main.inc.php';
+
 
 // Libraries
 require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once '../lib/inventory.lib.php';
+require_once DOL_DOCUMENT_ROOT .'/inventory/lib/inventory.lib.php';
 
 // Translations
-$langs->load("inventory@inventory");
+$langs->load("stock");
+$langs->load("inventory");
 
 // Access control
 if (! $user->admin) {
@@ -104,21 +103,6 @@ print '<td>'.$langs->trans("Parameters").'</td>'."\n";
 print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
 
-
-// Example with a yes / no select
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("INVENTORY_GEN_PDF").'</td>';
-print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="right" width="300">';
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_INVENTORY_GEN_PDF">';
-print $form->selectyesno("INVENTORY_GEN_PDF",$conf->global->INVENTORY_GEN_PDF,1);
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print '</form>';
-print '</td></tr>';
-
 // Example with a yes / no select
 $var=!$var;
 print '<tr '.$bc[$var].'>';
diff --git a/htdocs/core/modules/modinventory.class.php b/htdocs/core/modules/modInventory.class.php
similarity index 99%
rename from htdocs/core/modules/modinventory.class.php
rename to htdocs/core/modules/modInventory.class.php
index 10fb1cc477e..31170375752 100644
--- a/htdocs/core/modules/modinventory.class.php
+++ b/htdocs/core/modules/modInventory.class.php
@@ -94,7 +94,7 @@ class modinventory extends DolibarrModules
 		$this->dirs = array();
 
 		// Config pages. Put here list of php page, stored into inventory/admin directory, to use to setup module.
-		$this->config_page_url = array("inventory_setup.php@inventory");
+		$this->config_page_url = array("inventory.php");
 
 		// Dependencies
 		$this->hidden = false;			// A condition to hide module
@@ -103,7 +103,7 @@ class modinventory extends DolibarrModules
 		$this->conflictwith = array();	// List of modules id this module is in conflict with
 		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("inventory@inventory");
+		$this->langfiles = array("inventory");
 
 		// Constants
 		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
diff --git a/htdocs/inventory/lib/inventory.lib.php b/htdocs/inventory/lib/inventory.lib.php
index fd60d631a58..3cbf03a67c7 100644
--- a/htdocs/inventory/lib/inventory.lib.php
+++ b/htdocs/inventory/lib/inventory.lib.php
@@ -32,14 +32,11 @@ function inventoryAdminPrepareHead()
     $h = 0;
     $head = array();
 
-    $head[$h][0] = dol_buildpath("/inventory/admin/inventory_setup.php", 1);
+    $head[$h][0] = dol_buildpath("/admin/inventory.php", 1);
     $head[$h][1] = $langs->trans("Parameters");
     $head[$h][2] = 'settings';
     $h++;
-    $head[$h][0] = dol_buildpath("/inventory/admin/inventory_about.php", 1);
-    $head[$h][1] = $langs->trans("About");
-    $head[$h][2] = 'about';
-    $h++;
+    
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -54,10 +51,12 @@ function inventoryAdminPrepareHead()
     return $head;
 }
 
-function inventoryPrepareHead(&$inventory, $title='Inventaire', $get='')
+function inventoryPrepareHead(&$inventory, $title='Inventory', $get='')
 {
+	global $langs;
+	
 	return array(
-		array(dol_buildpath('/inventory/inventory.php?id='.$inventory->id.$get, 1), $title,'inventaire')
+		array(dol_buildpath('/inventory/inventory.php?id='.$inventory->id.$get, 1), $langs->trans($title),'inventory')
 	);
 }
 
@@ -65,7 +64,7 @@ function inventoryPrepareHead(&$inventory, $title='Inventaire', $get='')
 
 function inventorySelectProducts(&$inventory)
 {
-	global $conf,$db;
+	global $conf,$db,$langs;
 	
 	$except_product_id = array();
 	
@@ -78,7 +77,6 @@ function inventorySelectProducts(&$inventory)
 	$form = new Form($db);
 	$form->select_produits(-1, 'fk_product');
 	
-	// Il nous faut impérativement une liste custom car il ne faut que les entrepôts de la famille de celui qu'on inventorie
 	$TChildWarehouses = array($inventory->fk_warehouse);
 	$e = new Entrepot($db);
 	$e->fetch($inventory->fk_warehouse);
@@ -93,153 +91,10 @@ function inventorySelectProducts(&$inventory)
 		$Tab[$res->rowid] = $res->label;
 	}
 	print '&nbsp;&nbsp;&nbsp;';
-	print 'Entrepôt : '.$form::selectarray('fk_warehouse', $Tab);
+	print $langs->trans('Warehouse').' : '.$form::selectarray('fk_warehouse', $Tab);
 	
 	$select_html = ob_get_clean();
 	
 	return $select_html;
 }
 
-function ajaxAutocompleter($selected, $htmlname, $url, $urloption='', $minLength=2, $autoselect=0, $ajaxoptions=array())
-{
-    if (empty($minLength)) $minLength=1;
-
-	$script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />';
-
-	$script.= '<script type="text/javascript">';
-	$script.= '$(document).ready(function() {
-					var autoselect = '.$autoselect.';
-					var options = '.json_encode($ajaxoptions).';
-
-					// Remove product id before select another product
-					// use keyup instead change to avoid loosing the product id
-					$("input#search_'.$htmlname.'").keydown(function() {
-						//console.log(\'purge_id_after_keydown\');
-						$("#'.$htmlname.'").val("");
-					});
-					$("input#search_'.$htmlname.'").change(function() {
-						//console.log(\'change\');
-						$("#'.$htmlname.'").trigger("change");
-					});
-					// Check when keyup
-					$("input#search_'.$htmlname.'").keyup(function() {
-							//console.log(\'keyup\');
-						    if ($(this).val().length == 0)
-						    {
-	                            $("#search_'.$htmlname.'").val("");
-	                            $("#'.$htmlname.'").val("").trigger("change");
-	                            if (options.option_disabled) {
-	    							$("#" + options.option_disabled).removeAttr("disabled");
-	    						}
-	    						if (options.disabled) {
-	    							$.each(options.disabled, function(key, value) {
-	    								$("#" + value).removeAttr("disabled");
-									});
-	    						}
-	    						if (options.update) {
-	    							$.each(options.update, function(key, value) {
-	    								$("#" + key).val("").trigger("change");
-									});
-								}
-								if (options.show) {
-	    							$.each(options.show, function(key, value) {
-	    								$("#" + value).hide().trigger("hide");
-									});
-								}
-								if (options.update_textarea) {
-	    							$.each(options.update_textarea, function(key, value) {
-	    								if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances[key] != "undefined") {
-	    									CKEDITOR.instances[key].setData("");
-	    								} else {
-	    									$("#" + key).html("");
-										}
-	    							});
-	    						}
-						    }
-                    });
-    				$("input#search_'.$htmlname.'").autocomplete({
-    					source: function( request, response ) {
-    						$.get("'.$url.($urloption?'?'.$urloption:'').'", { '.$htmlname.': request.term }, function(data){
-								response($.map( data, function( item ) {
-									if (autoselect == 1 && data.length == 1) {
-										$("#search_'.$htmlname.'").val(item.value);
-										$("#'.$htmlname.'").val(item.key).trigger("change");
-									}
-									var label = item.label.toString();
-									var update = {};
-									if (options.update) {
-										$.each(options.update, function(key, value) {
-											update[key] = item[value];
-										});
-									}
-									var textarea = {};
-									if (options.update_textarea) {
-										$.each(options.update_textarea, function(key, value) {
-											textarea[key] = item[value];
-										});
-									}
-									return { label: label, value: item.value, id: item.key, update: update, textarea: textarea, disabled: item.disabled }
-								}));
-							}, "json");
-						},
-						dataType: "json",
-    					minLength: '.$minLength.',
-    					select: function( event, ui ) {		// Function ran when new value is selected into javascript combo
-							//console.log(\'set value of id with \'+ui.item.id);
-    						$("#'.$htmlname.'").val(ui.item.id).trigger("change");	// Select new value
-    						// Disable an element
-    						if (options.option_disabled) {
-    							if (ui.item.disabled) {
-    								$("#" + options.option_disabled).attr("disabled", "disabled");
-    								if (options.error) {
-    									$.jnotify(options.error, "error", true);		// Output with jnotify the error message
-    								}
-    								if (options.warning) {
-    									$.jnotify(options.warning, "warning", false);		// Output with jnotify the warning message
-    								}
-							} else {
-    								$("#" + options.option_disabled).removeAttr("disabled");
-    							}
-    						}
-    						if (options.disabled) {
-    							$.each(options.disabled, function(key, value) {
-    								$("#" + value).attr("disabled", "disabled");
-    							});
-    						}
-    						if (options.show) {
-    							$.each(options.show, function(key, value) {
-    								$("#" + value).show().trigger("show");
-    							});
-    						}
-    						// Update an input
-    						if (ui.item.update) {
-    							// loop on each "update" fields
-    							$.each(ui.item.update, function(key, value) {
-    								$("#" + key).val(value).trigger("change");
-    							});
-    						}
-    						if (ui.item.textarea) {
-    							$.each(ui.item.textarea, function(key, value) {
-    								if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances[key] != "undefined") {
-    									CKEDITOR.instances[key].setData(value);
-    									CKEDITOR.instances[key].focus();
-    								} else {
-    									$("#" + key).html(value);
-    									$("#" + key).focus();
-									}
-    							});
-    						}
-    						$("#search_'.$htmlname.'").trigger("change");	// To tell that input text field was modified
-    					}
-					}).data( "autocomplete" )._renderItem = function( ul, item ) {
-						return $( "<li></li>" )
-						.data( "item.autocomplete", item )
-						.append( \'<a><span class="tag">\' + item.label + "</span></a>" )
-						.appendTo(ul);
-					};
-
-  				});';
-	$script.= '</script>';
-
-	return $script;
-}

From e65ae08e5cbf926a16ee75c655dc50fe4e955ac0 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 15 Dec 2016 17:42:14 +0100
Subject: [PATCH 0069/1163] langs

---
 htdocs/inventory/inventory.php    |  7 ++---
 htdocs/langs/en_US/inventory.lang | 52 +++++++++++++++++++++++++++++++
 htdocs/langs/fr_FR/inventory.lang | 50 +++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/langs/en_US/inventory.lang
 create mode 100644 htdocs/langs/fr_FR/inventory.lang

diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index 5a87eb94ceb..d0ca303c239 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -23,8 +23,6 @@
  
 require_once '../main.inc.php';
 
-ini_set('memory_limit', '512M');
-
 require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php';
 require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php';
 require_once DOL_DOCUMENT_ROOT.'/inventory/lib/inventory.lib.php';
@@ -35,12 +33,11 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
-set_time_limit(0);
+$langs->load("stock");
+$langs->load("inventory");
 
 if(!$user->rights->inventory->read) accessforbidden();
 
-$langs->load("inventory");
-
 _action();
 
 function _action() 
diff --git a/htdocs/langs/en_US/inventory.lang b/htdocs/langs/en_US/inventory.lang
new file mode 100644
index 00000000000..ba947f09d77
--- /dev/null
+++ b/htdocs/langs/en_US/inventory.lang
@@ -0,0 +1,52 @@
+# Dolibarr language file - Source file is en_US - inventory
+
+Module104420Name = Inventory
+Module104420Desc = Create and manage your inventory
+
+inventorySetup = Inventory Setup
+
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+
+inventoryTitle=Inventory
+inventoryListTitle=List
+inventoryListEmpty=No inventory in progress
+
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edit
+inventoryValidate=Validated
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse : %s
+inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Supplier filter
+inventoryOnDate=Inventory 
+INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock mouvment have date of inventory
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Add
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action ?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Delete line
+RegulateStock=Regulate Stock
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/inventory.lang b/htdocs/langs/fr_FR/inventory.lang
new file mode 100644
index 00000000000..85fdf3112dc
--- /dev/null
+++ b/htdocs/langs/fr_FR/inventory.lang
@@ -0,0 +1,50 @@
+Module104420Name = Inventory
+Module104420Desc = Create and manage your inventory
+
+inventorySetup = Inventory Setup
+
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+
+inventoryTitle=Inventory
+inventoryListTitle=List
+inventoryListEmpty=No inventory in progress
+
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edit
+inventoryValidate=Validated
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse : %s
+inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Supplier filter
+inventoryOnDate=Inventory 
+INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock mouvment have date of inventory
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Add
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action ?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Delete line
+RegulateStock=Regulate Stock
\ No newline at end of file

From e91c2c6e77fd1f5a33eba12124ffbd1599e930cd Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@gmail.com>
Date: Fri, 16 Dec 2016 03:56:48 -0300
Subject: [PATCH 0070/1163] Code refactoring. Improve folder structure. For
 better project implementation. Most hosting server have a default folder
 public or public_html insted of htdocs, htdocs is a exclusive folder for
 apache web server, for example is no the same folder in NGINX.

---
 {htdocs => public}/.gitignore                       |   0
 {htdocs => public}/accountancy/admin/account.php    |   0
 .../accountancy/admin/accountmodel.php              |   0
 {htdocs => public}/accountancy/admin/card.php       |   0
 {htdocs => public}/accountancy/admin/categories.php |   0
 .../accountancy/admin/defaultaccounts.php           |   0
 {htdocs => public}/accountancy/admin/export.php     |   0
 {htdocs => public}/accountancy/admin/fiscalyear.php |   0
 .../accountancy/admin/fiscalyear_card.php           |   0
 .../accountancy/admin/fiscalyear_info.php           |   0
 .../accountancy/admin/importaccounts.php            |   0
 {htdocs => public}/accountancy/admin/index.html     |   0
 {htdocs => public}/accountancy/admin/index.php      |   0
 {htdocs => public}/accountancy/admin/journal.php    |   0
 .../accountancy/admin/productaccount.php            |   0
 .../accountancy/bookkeeping/balance.php             |   0
 .../accountancy/bookkeeping/balancebymonth.php      |   0
 {htdocs => public}/accountancy/bookkeeping/card.php |   0
 .../accountancy/bookkeeping/index.html              |   0
 {htdocs => public}/accountancy/bookkeeping/list.php |   0
 .../accountancy/bookkeeping/listbyaccount.php       |   0
 .../accountancy/bookkeeping/listbyyear.php          |   0
 .../accountancy/class/accountancycategory.class.php |   0
 .../accountancy/class/accountancyexport.class.php   |   0
 .../accountancy/class/accountancysystem.class.php   |   0
 .../accountancy/class/accountingaccount.class.php   |   0
 .../accountancy/class/bookkeeping.class.php         |   0
 .../class/html.formventilation.class.php            |   0
 {htdocs => public}/accountancy/class/index.html     |   0
 {htdocs => public}/accountancy/customer/card.php    |   0
 {htdocs => public}/accountancy/customer/index.html  |   0
 {htdocs => public}/accountancy/customer/index.php   |   0
 {htdocs => public}/accountancy/customer/lines.php   |   0
 {htdocs => public}/accountancy/customer/list.php    |   0
 .../accountancy/expensereport/card.php              |   0
 .../accountancy/expensereport/index.html            |   0
 .../accountancy/expensereport/index.php             |   0
 .../accountancy/expensereport/lines.php             |   0
 .../accountancy/expensereport/list.php              |   0
 {htdocs => public}/accountancy/index.html           |   0
 {htdocs => public}/accountancy/index.php            |   0
 .../accountancy/journal/bankjournal.php             |   0
 .../accountancy/journal/expensereportsjournal.php   |   0
 {htdocs => public}/accountancy/journal/index.html   |   0
 .../accountancy/journal/purchasesjournal.php        |   0
 .../accountancy/journal/sellsjournal.php            |   0
 {htdocs => public}/accountancy/report/index.html    |   0
 {htdocs => public}/accountancy/report/result.php    |   0
 {htdocs => public}/accountancy/supplier/card.php    |   0
 {htdocs => public}/accountancy/supplier/index.html  |   0
 {htdocs => public}/accountancy/supplier/index.php   |   0
 {htdocs => public}/accountancy/supplier/lines.php   |   0
 {htdocs => public}/accountancy/supplier/list.php    |   0
 .../accountancy/tpl/export_journal.tpl.php          |   0
 {htdocs => public}/accountancy/tpl/index.html       |   0
 {htdocs => public}/adherents/admin/adherent.php     |   0
 .../adherents/admin/adherent_extrafields.php        |   0
 .../adherents/admin/adherent_type_extrafields.php   |   0
 {htdocs => public}/adherents/admin/index.html       |   0
 {htdocs => public}/adherents/admin/public.php       |   0
 {htdocs => public}/adherents/agenda.php             |   0
 .../canvas/actions_adherentcard_common.class.php    |   0
 .../default/actions_adherentcard_default.class.php  |   0
 .../adherents/canvas/default/index.html             |   0
 .../canvas/default/tpl/adherentcard_create.tpl.php  |   0
 .../canvas/default/tpl/adherentcard_edit.tpl.php    |   0
 .../canvas/default/tpl/adherentcard_view.tpl.php    |   0
 .../adherents/canvas/default/tpl/index.html         |   0
 {htdocs => public}/adherents/canvas/index.html      |   0
 {htdocs => public}/adherents/card.php               |   0
 {htdocs => public}/adherents/cartes/carte.php       |   0
 {htdocs => public}/adherents/cartes/index.html      |   0
 .../adherents/class/adherent.class.php              |   0
 .../adherents/class/adherent_type.class.php         |   0
 .../adherents/class/adherentstats.class.php         |   0
 .../adherents/class/api_members.class.php           |   0
 .../adherents/class/api_subscriptions.class.php     |   0
 {htdocs => public}/adherents/class/index.html       |   0
 .../adherents/class/subscription.class.php          |   0
 {htdocs => public}/adherents/document.php           |   0
 {htdocs => public}/adherents/htpasswd.php           |   0
 {htdocs => public}/adherents/index.php              |   0
 {htdocs => public}/adherents/ldap.php               |   0
 {htdocs => public}/adherents/list.php               |   0
 {htdocs => public}/adherents/note.php               |   0
 {htdocs => public}/adherents/stats/byproperties.php |   0
 {htdocs => public}/adherents/stats/geo.php          |   0
 {htdocs => public}/adherents/stats/index.html       |   0
 {htdocs => public}/adherents/stats/index.php        |   0
 {htdocs => public}/adherents/subscription.php       |   0
 {htdocs => public}/adherents/subscription/card.php  |   0
 .../adherents/subscription/index.html               |   0
 {htdocs => public}/adherents/subscription/info.php  |   0
 {htdocs => public}/adherents/subscription/list.php  |   0
 {htdocs => public}/adherents/tpl/index.html         |   0
 .../adherents/tpl/linkedobjectblock.tpl.php         |   0
 {htdocs => public}/adherents/type.php               |   0
 {htdocs => public}/admin/agenda.php                 |   0
 {htdocs => public}/admin/agenda_extrafields.php     |   0
 {htdocs => public}/admin/agenda_extsites.php        |   0
 {htdocs => public}/admin/agenda_other.php           |   0
 {htdocs => public}/admin/agenda_xcal.php            |   0
 {htdocs => public}/admin/bank.php                   |   0
 {htdocs => public}/admin/bank_extrafields.php       |   0
 {htdocs => public}/admin/barcode.php                |   0
 {htdocs => public}/admin/boxes.php                  |   0
 {htdocs => public}/admin/chequereceipts.php         |   0
 {htdocs => public}/admin/clicktodial.php            |   0
 {htdocs => public}/admin/commande.php               |   0
 {htdocs => public}/admin/company.php                |   0
 {htdocs => public}/admin/compta.php                 |   0
 {htdocs => public}/admin/confexped.php              |   0
 {htdocs => public}/admin/const.php                  |   0
 {htdocs => public}/admin/contract.php               |   0
 {htdocs => public}/admin/delais.php                 |   0
 {htdocs => public}/admin/dict.php                   |   0
 {htdocs => public}/admin/ecm.php                    |   0
 {htdocs => public}/admin/events.php                 |   0
 {htdocs => public}/admin/expedition.php             |   0
 {htdocs => public}/admin/expedition_extrafields.php |   0
 .../admin/expeditiondet_extrafields.php             |   0
 {htdocs => public}/admin/expensereport.php          |   0
 .../admin/expensereport_extrafields.php             |   0
 {htdocs => public}/admin/external_rss.php           |   0
 {htdocs => public}/admin/facture.php                |   0
 {htdocs => public}/admin/fckeditor.php              |   0
 {htdocs => public}/admin/fichinter.php              |   0
 {htdocs => public}/admin/geoipmaxmind.php           |   0
 {htdocs => public}/admin/ihm.php                    |   0
 {htdocs => public}/admin/index.php                  |   0
 {htdocs => public}/admin/ldap.php                   |   0
 {htdocs => public}/admin/ldap_contacts.php          |   0
 {htdocs => public}/admin/ldap_groups.php            |   0
 {htdocs => public}/admin/ldap_members.php           |   0
 {htdocs => public}/admin/ldap_users.php             |   0
 {htdocs => public}/admin/limits.php                 |   0
 {htdocs => public}/admin/livraison.php              |   0
 {htdocs => public}/admin/livraison_extrafields.php  |   0
 .../admin/livraisondet_extrafields.php              |   0
 {htdocs => public}/admin/loan.php                   |   0
 {htdocs => public}/admin/mailing.php                |   0
 {htdocs => public}/admin/mailman.php                |   0
 {htdocs => public}/admin/mails.php                  |   0
 {htdocs => public}/admin/menus.php                  |   0
 {htdocs => public}/admin/menus/edit.php             |   0
 {htdocs => public}/admin/menus/index.php            |   0
 {htdocs => public}/admin/menus/other.php            |   0
 {htdocs => public}/admin/modules.php                |   0
 {htdocs => public}/admin/multicurrency.php          |   0
 {htdocs => public}/admin/notification.php           |   0
 {htdocs => public}/admin/oauth.php                  |   0
 {htdocs => public}/admin/oauthlogintokens.php       |   0
 {htdocs => public}/admin/order_extrafields.php      |   0
 {htdocs => public}/admin/orderdet_extrafields.php   |   0
 {htdocs => public}/admin/payment.php                |   0
 {htdocs => public}/admin/pdf.php                    |   0
 {htdocs => public}/admin/perms.php                  |   0
 {htdocs => public}/admin/prelevement.php            |   0
 {htdocs => public}/admin/propal.php                 |   0
 {htdocs => public}/admin/proxy.php                  |   0
 {htdocs => public}/admin/receiptprinter.php         |   0
 {htdocs => public}/admin/resource.php               |   0
 {htdocs => public}/admin/resource_extrafields.php   |   0
 {htdocs => public}/admin/salaries.php               |   0
 {htdocs => public}/admin/security.php               |   0
 {htdocs => public}/admin/security_file.php          |   0
 {htdocs => public}/admin/security_other.php         |   0
 {htdocs => public}/admin/sms.php                    |   0
 {htdocs => public}/admin/spip.php                   |   0
 {htdocs => public}/admin/stock.php                  |   0
 {htdocs => public}/admin/supplier_invoice.php       |   0
 {htdocs => public}/admin/supplier_order.php         |   0
 {htdocs => public}/admin/supplier_payment.php       |   0
 {htdocs => public}/admin/supplier_proposal.php      |   0
 .../admin/supplierinvoice_extrafields.php           |   0
 .../admin/supplierinvoicedet_extrafields.php        |   0
 .../admin/supplierorder_extrafields.php             |   0
 .../admin/supplierorderdet_extrafields.php          |   0
 {htdocs => public}/admin/syslog.php                 |   0
 {htdocs => public}/admin/system/about.php           |   0
 {htdocs => public}/admin/system/browser.php         |   0
 {htdocs => public}/admin/system/constall.php        |   0
 {htdocs => public}/admin/system/database-tables.php |   0
 {htdocs => public}/admin/system/database.php        |   0
 {htdocs => public}/admin/system/dbtable.php         |   0
 {htdocs => public}/admin/system/dolibarr.php        |   0
 {htdocs => public}/admin/system/filecheck.php       |   0
 {htdocs => public}/admin/system/index.php           |   0
 {htdocs => public}/admin/system/modules.php         |   0
 {htdocs => public}/admin/system/os.php              |   0
 {htdocs => public}/admin/system/perf.php            |   0
 {htdocs => public}/admin/system/phpinfo.php         |   0
 {htdocs => public}/admin/system/web.php             |   0
 {htdocs => public}/admin/system/xcache.php          |   0
 {htdocs => public}/admin/system/xdebug.php          |   0
 {htdocs => public}/admin/taxes.php                  |   0
 {htdocs => public}/admin/tools/dolibarr_export.php  |   0
 {htdocs => public}/admin/tools/dolibarr_import.php  |   0
 {htdocs => public}/admin/tools/eaccelerator.php     |   0
 {htdocs => public}/admin/tools/export.php           |   0
 {htdocs => public}/admin/tools/index.php            |   0
 {htdocs => public}/admin/tools/listevents.php       |   0
 {htdocs => public}/admin/tools/listsessions.php     |   0
 {htdocs => public}/admin/tools/purge.php            |   0
 {htdocs => public}/admin/tools/update.php           |   0
 {htdocs => public}/admin/translation.php            |   0
 {htdocs => public}/admin/triggers.php               |   0
 {htdocs => public}/admin/user.php                   |   0
 {htdocs => public}/admin/websites.php               |   0
 {htdocs => public}/admin/workflow.php               |   0
 {htdocs => public}/api/README.md                    |   0
 {htdocs => public}/api/admin/explorer.php           |   0
 {htdocs => public}/api/admin/index.php              |   0
 {htdocs => public}/api/class/api.class.php          |   0
 {htdocs => public}/api/class/api_access.class.php   |   0
 .../api/class/api_dictionnarycountries.class.php    |   0
 .../api/class/api_dictionnarytowns.class.php        |   0
 {htdocs => public}/api/class/api_login.class.php    |   0
 {htdocs => public}/api/class/api_status.class.php   |   0
 {htdocs => public}/api/class/index.html             |   0
 {htdocs => public}/api/index.php                    |   0
 {htdocs => public}/asterisk/cidlookup.php           |   0
 {htdocs => public}/asterisk/index.html              |   0
 {htdocs => public}/asterisk/wrapper.php             |   0
 {htdocs => public}/barcode/codeinit.php             |   0
 {htdocs => public}/barcode/index.html               |   0
 {htdocs => public}/barcode/printsheet.php           |   0
 {htdocs => public}/bookmarks/admin/bookmark.php     |   0
 {htdocs => public}/bookmarks/admin/index.html       |   0
 {htdocs => public}/bookmarks/bookmarks.lib.php      |   0
 {htdocs => public}/bookmarks/card.php               |   0
 .../bookmarks/class/bookmark.class.php              |   0
 {htdocs => public}/bookmarks/class/index.html       |   0
 {htdocs => public}/bookmarks/index.html             |   0
 {htdocs => public}/bookmarks/list.php               |   0
 {htdocs => public}/cache.manifest                   |   0
 {htdocs => public}/cashdesk/admin/cashdesk.php      |   0
 {htdocs => public}/cashdesk/admin/index.html        |   0
 {htdocs => public}/cashdesk/affContenu.php          |   0
 {htdocs => public}/cashdesk/affIndex.php            |   0
 {htdocs => public}/cashdesk/affPied.php             |   0
 {htdocs => public}/cashdesk/class/Auth.class.php    |   0
 .../cashdesk/class/Facturation.class.php            |   0
 {htdocs => public}/cashdesk/class/index.html        |   0
 {htdocs => public}/cashdesk/css/index.html          |   0
 {htdocs => public}/cashdesk/css/style.css           |   0
 {htdocs => public}/cashdesk/deconnexion.php         |   0
 {htdocs => public}/cashdesk/facturation.php         |   0
 {htdocs => public}/cashdesk/facturation_dhtml.php   |   0
 {htdocs => public}/cashdesk/facturation_verif.php   |   0
 {htdocs => public}/cashdesk/img/basket_delete.png   | Bin
 .../cashdesk/img/bg_conteneur_droite.png            | Bin
 .../cashdesk/img/bg_conteneur_gauche.png            | Bin
 {htdocs => public}/cashdesk/img/bg_entete.png       | Bin
 {htdocs => public}/cashdesk/img/bg_pied.png         | Bin
 {htdocs => public}/cashdesk/img/calendrier.png      | Bin
 {htdocs => public}/cashdesk/img/decrypted.png       | Bin
 {htdocs => public}/cashdesk/img/gescom.png          | Bin
 {htdocs => public}/cashdesk/img/index.html          |   0
 {htdocs => public}/cashdesk/img/lock.png            | Bin
 {htdocs => public}/cashdesk/img/login.png           | Bin
 {htdocs => public}/cashdesk/img/new.png             | Bin
 .../cashdesk/include/environnement.php              |   0
 {htdocs => public}/cashdesk/include/index.html      |   0
 {htdocs => public}/cashdesk/include/keypad.php      |   0
 {htdocs => public}/cashdesk/index.php               |   0
 {htdocs => public}/cashdesk/index_verif.php         |   0
 {htdocs => public}/cashdesk/javascript/dhtml.js     |   0
 .../cashdesk/javascript/facturation1.js             |   0
 {htdocs => public}/cashdesk/javascript/index.html   |   0
 {htdocs => public}/cashdesk/javascript/keypad.js    |   0
 .../cashdesk/tpl/facturation1.tpl.php               |   0
 {htdocs => public}/cashdesk/tpl/index.html          |   0
 .../cashdesk/tpl/liste_articles.tpl.php             |   0
 {htdocs => public}/cashdesk/tpl/menu.tpl.php        |   0
 {htdocs => public}/cashdesk/tpl/ticket.tpl.php      |   0
 {htdocs => public}/cashdesk/tpl/validation1.tpl.php |   0
 {htdocs => public}/cashdesk/tpl/validation2.tpl.php |   0
 {htdocs => public}/cashdesk/validation.php          |   0
 {htdocs => public}/cashdesk/validation_ok.php       |   0
 {htdocs => public}/cashdesk/validation_ticket.php   |   0
 {htdocs => public}/cashdesk/validation_verif.php    |   0
 {htdocs => public}/categories/admin/categorie.php   |   0
 .../categories/admin/categorie_extrafields.php      |   0
 {htdocs => public}/categories/admin/index.html      |   0
 {htdocs => public}/categories/card.php              |   0
 .../categories/class/api_categories.class.php       |   0
 .../class/api_deprecated_category.class.php         |   0
 .../categories/class/categorie.class.php            |   0
 {htdocs => public}/categories/class/index.html      |   0
 {htdocs => public}/categories/edit.php              |   0
 {htdocs => public}/categories/index.php             |   0
 {htdocs => public}/categories/photos.php            |   0
 {htdocs => public}/categories/traduction.php        |   0
 {htdocs => public}/categories/viewcat.php           |   0
 {htdocs => public}/comm/action/card.php             |   0
 .../comm/action/class/actioncomm.class.php          |   0
 .../comm/action/class/api_agendaevents.class.php    |   0
 .../comm/action/class/cactioncomm.class.php         |   0
 {htdocs => public}/comm/action/class/ical.class.php |   0
 {htdocs => public}/comm/action/class/index.html     |   0
 {htdocs => public}/comm/action/document.php         |   0
 {htdocs => public}/comm/action/index.php            |   0
 {htdocs => public}/comm/action/info.php             |   0
 {htdocs => public}/comm/action/listactions.php      |   0
 {htdocs => public}/comm/action/pertype.php          |   0
 {htdocs => public}/comm/action/peruser.php          |   0
 {htdocs => public}/comm/action/rapport/index.php    |   0
 {htdocs => public}/comm/address.php                 |   0
 {htdocs => public}/comm/admin/index.html            |   0
 .../comm/admin/propal_extrafields.php               |   0
 .../comm/admin/propaldet_extrafields.php            |   0
 {htdocs => public}/comm/card.php                    |   0
 {htdocs => public}/comm/contact.php                 |   0
 {htdocs => public}/comm/index.php                   |   0
 .../comm/mailing/advtargetemailing.php              |   0
 {htdocs => public}/comm/mailing/card.php            |   0
 {htdocs => public}/comm/mailing/cibles.php          |   0
 .../comm/mailing/class/advtargetemailing.class.php  |   0
 .../class/html.formadvtargetemailing.class.php      |   0
 {htdocs => public}/comm/mailing/class/index.html    |   0
 .../comm/mailing/class/mailing.class.php            |   0
 {htdocs => public}/comm/mailing/index.php           |   0
 {htdocs => public}/comm/mailing/info.php            |   0
 {htdocs => public}/comm/mailing/list.php            |   0
 {htdocs => public}/comm/multiprix.php               |   0
 {htdocs => public}/comm/propal/apercu.php           |   0
 {htdocs => public}/comm/propal/card.php             |   0
 .../comm/propal/class/api_proposals.class.php       |   0
 {htdocs => public}/comm/propal/class/index.html     |   0
 .../comm/propal/class/propal.class.php              |   0
 .../comm/propal/class/propalestats.class.php        |   0
 {htdocs => public}/comm/propal/contact.php          |   0
 {htdocs => public}/comm/propal/document.php         |   0
 {htdocs => public}/comm/propal/index.php            |   0
 {htdocs => public}/comm/propal/info.php             |   0
 {htdocs => public}/comm/propal/list.php             |   0
 {htdocs => public}/comm/propal/note.php             |   0
 {htdocs => public}/comm/propal/stats/index.php      |   0
 {htdocs => public}/comm/propal/tpl/index.html       |   0
 .../comm/propal/tpl/linkedobjectblock.tpl.php       |   0
 {htdocs => public}/comm/prospect/index.php          |   0
 {htdocs => public}/comm/prospect/recap-prospect.php |   0
 {htdocs => public}/comm/recap-client.php            |   0
 {htdocs => public}/comm/remise.php                  |   0
 {htdocs => public}/comm/remx.php                    |   0
 {htdocs => public}/commande/apercu.php              |   0
 {htdocs => public}/commande/card.php                |   0
 .../class/api_deprecated_commande.class.php         |   0
 .../commande/class/api_orders.class.php             |   0
 .../commande/class/commande.class.php               |   0
 .../commande/class/commandestats.class.php          |   0
 {htdocs => public}/commande/class/index.html        |   0
 {htdocs => public}/commande/contact.php             |   0
 {htdocs => public}/commande/customer.php            |   0
 {htdocs => public}/commande/document.php            |   0
 {htdocs => public}/commande/index.php               |   0
 {htdocs => public}/commande/info.php                |   0
 {htdocs => public}/commande/list.php                |   0
 {htdocs => public}/commande/note.php                |   0
 {htdocs => public}/commande/orderstoinvoice.php     |   0
 {htdocs => public}/commande/stats/index.php         |   0
 {htdocs => public}/commande/tpl/index.html          |   0
 .../commande/tpl/linkedobjectblock.tpl.php          |   0
 {htdocs => public}/compta/ajaxpayment.php           |   0
 {htdocs => public}/compta/bank/annuel.php           |   0
 {htdocs => public}/compta/bank/bankentries.php      |   0
 {htdocs => public}/compta/bank/bilan.php            |   0
 {htdocs => public}/compta/bank/budget.php           |   0
 {htdocs => public}/compta/bank/card.php             |   0
 {htdocs => public}/compta/bank/categ.php            |   0
 .../compta/bank/class/account.class.php             |   0
 .../compta/bank/class/api_bankaccounts.class.php    |   0
 .../compta/bank/class/bankcateg.class.php           |   0
 {htdocs => public}/compta/bank/class/index.html     |   0
 {htdocs => public}/compta/bank/document.php         |   0
 {htdocs => public}/compta/bank/graph.php            |   0
 {htdocs => public}/compta/bank/index.php            |   0
 {htdocs => public}/compta/bank/info.php             |   0
 {htdocs => public}/compta/bank/ligne.php            |   0
 {htdocs => public}/compta/bank/releve.php           |   0
 {htdocs => public}/compta/bank/transfer.php         |   0
 {htdocs => public}/compta/bank/treso.php            |   0
 {htdocs => public}/compta/charges/index.php         |   0
 {htdocs => public}/compta/clients.php               |   0
 {htdocs => public}/compta/deplacement/card.php      |   0
 .../compta/deplacement/class/deplacement.class.php  |   0
 .../deplacement/class/deplacementstats.class.php    |   0
 .../compta/deplacement/class/index.html             |   0
 {htdocs => public}/compta/deplacement/document.php  |   0
 {htdocs => public}/compta/deplacement/index.php     |   0
 {htdocs => public}/compta/deplacement/info.php      |   0
 {htdocs => public}/compta/deplacement/list.php      |   0
 .../compta/deplacement/stats/index.php              |   0
 {htdocs => public}/compta/facture.php               |   0
 .../facture/admin/facture_cust_extrafields.php      |   0
 .../facture/admin/facturedet_cust_extrafields.php   |   0
 {htdocs => public}/compta/facture/admin/index.html  |   0
 {htdocs => public}/compta/facture/apercu.php        |   0
 .../facture/class/api_deprecated_invoice.class.php  |   0
 .../compta/facture/class/api_invoices.class.php     |   0
 .../compta/facture/class/facture-rec.class.php      |   0
 .../compta/facture/class/facture.class.php          |   0
 .../compta/facture/class/facturestats.class.php     |   0
 {htdocs => public}/compta/facture/class/index.html  |   0
 .../compta/facture/class/paymentterm.class.php      |   0
 {htdocs => public}/compta/facture/contact.php       |   0
 {htdocs => public}/compta/facture/document.php      |   0
 {htdocs => public}/compta/facture/fiche-rec.php     |   0
 {htdocs => public}/compta/facture/index.html        |   0
 {htdocs => public}/compta/facture/info.php          |   0
 {htdocs => public}/compta/facture/list.php          |   0
 {htdocs => public}/compta/facture/note.php          |   0
 {htdocs => public}/compta/facture/prelevement.php   |   0
 {htdocs => public}/compta/facture/stats/index.php   |   0
 {htdocs => public}/compta/facture/tpl/index.html    |   0
 .../compta/facture/tpl/linkedobjectblock.tpl.php    |   0
 .../facture/tpl/linkedobjectblockForRec.tpl.php     |   0
 {htdocs => public}/compta/index.php                 |   0
 {htdocs => public}/compta/journal/index.html        |   0
 .../compta/journal/purchasesjournal.php             |   0
 {htdocs => public}/compta/journal/sellsjournal.php  |   0
 {htdocs => public}/compta/localtax/card.php         |   0
 {htdocs => public}/compta/localtax/class/index.html |   0
 .../compta/localtax/class/localtax.class.php        |   0
 {htdocs => public}/compta/localtax/clients.php      |   0
 {htdocs => public}/compta/localtax/index.php        |   0
 .../compta/localtax/quadri_detail.php               |   0
 {htdocs => public}/compta/localtax/reglement.php    |   0
 {htdocs => public}/compta/paiement.php              |   0
 {htdocs => public}/compta/paiement/avalider.php     |   0
 {htdocs => public}/compta/paiement/card.php         |   0
 {htdocs => public}/compta/paiement/cheque/card.php  |   0
 .../compta/paiement/cheque/class/index.html         |   0
 .../paiement/cheque/class/remisecheque.class.php    |   0
 {htdocs => public}/compta/paiement/cheque/index.php |   0
 {htdocs => public}/compta/paiement/cheque/list.php  |   0
 .../compta/paiement/class/cpaiement.class.php       |   0
 {htdocs => public}/compta/paiement/class/index.html |   0
 .../compta/paiement/class/paiement.class.php        |   0
 {htdocs => public}/compta/paiement/index.php        |   0
 {htdocs => public}/compta/paiement/info.php         |   0
 {htdocs => public}/compta/paiement/list.php         |   0
 {htdocs => public}/compta/paiement/rapport.php      |   0
 {htdocs => public}/compta/paiement_charge.php       |   0
 {htdocs => public}/compta/payment_sc/card.php       |   0
 {htdocs => public}/compta/payment_sc/index.html     |   0
 {htdocs => public}/compta/prelevement/bons.php      |   0
 {htdocs => public}/compta/prelevement/card.php      |   0
 .../prelevement/class/bonprelevement.class.php      |   0
 .../compta/prelevement/class/index.html             |   0
 .../prelevement/class/ligneprelevement.class.php    |   0
 .../prelevement/class/rejetprelevement.class.php    |   0
 {htdocs => public}/compta/prelevement/create.php    |   0
 {htdocs => public}/compta/prelevement/demandes.php  |   0
 {htdocs => public}/compta/prelevement/factures.php  |   0
 .../compta/prelevement/fiche-rejet.php              |   0
 .../compta/prelevement/fiche-stat.php               |   0
 {htdocs => public}/compta/prelevement/index.php     |   0
 {htdocs => public}/compta/prelevement/ligne.php     |   0
 {htdocs => public}/compta/prelevement/list.php      |   0
 {htdocs => public}/compta/prelevement/rejets.php    |   0
 {htdocs => public}/compta/prelevement/stats.php     |   0
 {htdocs => public}/compta/recap-compta.php          |   0
 {htdocs => public}/compta/resultat/clientfourn.php  |   0
 {htdocs => public}/compta/resultat/index.php        |   0
 {htdocs => public}/compta/salaries/card.php         |   0
 {htdocs => public}/compta/salaries/class/index.html |   0
 .../compta/salaries/class/paymentsalary.class.php   |   0
 {htdocs => public}/compta/salaries/document.php     |   0
 {htdocs => public}/compta/salaries/index.php        |   0
 {htdocs => public}/compta/salaries/info.php         |   0
 {htdocs => public}/compta/sociales/card.php         |   0
 .../compta/sociales/class/cchargesociales.class.php |   0
 .../compta/sociales/class/chargesociales.class.php  |   0
 {htdocs => public}/compta/sociales/class/index.html |   0
 .../class/paymentsocialcontribution.class.php       |   0
 {htdocs => public}/compta/sociales/document.php     |   0
 {htdocs => public}/compta/sociales/index.php        |   0
 {htdocs => public}/compta/sociales/info.php         |   0
 {htdocs => public}/compta/sociales/payments.php     |   0
 {htdocs => public}/compta/stats/cabyprodserv.php    |   0
 {htdocs => public}/compta/stats/cabyuser.php        |   0
 {htdocs => public}/compta/stats/casoc.php           |   0
 {htdocs => public}/compta/stats/index.php           |   0
 {htdocs => public}/compta/tva/card.php              |   0
 {htdocs => public}/compta/tva/class/index.html      |   0
 {htdocs => public}/compta/tva/class/tva.class.php   |   0
 {htdocs => public}/compta/tva/clients.php           |   0
 {htdocs => public}/compta/tva/index.php             |   0
 {htdocs => public}/compta/tva/info.php              |   0
 {htdocs => public}/compta/tva/quadri.php            |   0
 {htdocs => public}/compta/tva/quadri_detail.php     |   0
 {htdocs => public}/compta/tva/quarter_report.php    |   0
 {htdocs => public}/compta/tva/reglement.php         |   0
 {htdocs => public}/conf/.gitignore                  |   0
 {htdocs => public}/conf/.htaccess                   |   0
 {htdocs => public}/conf/conf.php.example            |   0
 {htdocs => public}/conf/index.html                  |   0
 .../canvas/actions_contactcard_common.class.php     |   0
 .../default/actions_contactcard_default.class.php   |   0
 .../contact/canvas/default/index.html               |   0
 .../canvas/default/tpl/contactcard_create.tpl.php   |   0
 .../canvas/default/tpl/contactcard_edit.tpl.php     |   0
 .../canvas/default/tpl/contactcard_view.tpl.php     |   0
 .../contact/canvas/default/tpl/index.html           |   0
 {htdocs => public}/contact/canvas/index.html        |   0
 {htdocs => public}/contact/card.php                 |   0
 {htdocs => public}/contact/class/contact.class.php  |   0
 {htdocs => public}/contact/class/index.html         |   0
 {htdocs => public}/contact/document.php             |   0
 {htdocs => public}/contact/index.html               |   0
 {htdocs => public}/contact/info.php                 |   0
 {htdocs => public}/contact/ldap.php                 |   0
 {htdocs => public}/contact/list.php                 |   0
 {htdocs => public}/contact/note.php                 |   0
 {htdocs => public}/contact/perso.php                |   0
 {htdocs => public}/contact/vcard.php                |   0
 .../contrat/admin/contract_extrafields.php          |   0
 .../contrat/admin/contractdet_extrafields.php       |   0
 {htdocs => public}/contrat/admin/index.html         |   0
 {htdocs => public}/contrat/card.php                 |   0
 {htdocs => public}/contrat/class/contrat.class.php  |   0
 {htdocs => public}/contrat/class/index.html         |   0
 {htdocs => public}/contrat/contact.php              |   0
 {htdocs => public}/contrat/document.php             |   0
 {htdocs => public}/contrat/index.php                |   0
 {htdocs => public}/contrat/info.php                 |   0
 {htdocs => public}/contrat/list.php                 |   0
 {htdocs => public}/contrat/note.php                 |   0
 {htdocs => public}/contrat/services.php             |   0
 {htdocs => public}/contrat/tpl/index.html           |   0
 .../contrat/tpl/linkedobjectblock.tpl.php           |   0
 {htdocs => public}/core/actions_builddoc.inc.php    |   0
 .../core/actions_changeselectedfields.inc.php       |   0
 {htdocs => public}/core/actions_dellink.inc.php     |   0
 {htdocs => public}/core/actions_extrafields.inc.php |   0
 {htdocs => public}/core/actions_fetchobject.inc.php |   0
 {htdocs => public}/core/actions_lineupdown.inc.php  |   0
 {htdocs => public}/core/actions_linkedfiles.inc.php |   0
 {htdocs => public}/core/actions_massactions.inc.php |   0
 {htdocs => public}/core/actions_printing.inc.php    |   0
 {htdocs => public}/core/actions_sendmails.inc.php   |   0
 {htdocs => public}/core/actions_setnotes.inc.php    |   0
 {htdocs => public}/core/ajax/ajaxdirpreview.php     |   0
 {htdocs => public}/core/ajax/ajaxdirtree.php        |   0
 {htdocs => public}/core/ajax/bankconciliate.php     |   0
 {htdocs => public}/core/ajax/box.php                |   0
 {htdocs => public}/core/ajax/constantonoff.php      |   0
 {htdocs => public}/core/ajax/contacts.php           |   0
 {htdocs => public}/core/ajax/extraparams.php        |   0
 {htdocs => public}/core/ajax/fileupload.php         |   0
 {htdocs => public}/core/ajax/index.html             |   0
 {htdocs => public}/core/ajax/loadinplace.php        |   0
 {htdocs => public}/core/ajax/objectonoff.php        |   0
 {htdocs => public}/core/ajax/price.php              |   0
 {htdocs => public}/core/ajax/row.php                |   0
 {htdocs => public}/core/ajax/saveinplace.php        |   0
 {htdocs => public}/core/ajax/security.php           |   0
 {htdocs => public}/core/ajax/selectsearchbox.php    |   0
 {htdocs => public}/core/ajax/vatrates.php           |   0
 {htdocs => public}/core/ajax/ziptown.php            |   0
 {htdocs => public}/core/antispamimage.php           |   0
 {htdocs => public}/core/boxes/box_actions.php       |   0
 {htdocs => public}/core/boxes/box_activity.php      |   0
 {htdocs => public}/core/boxes/box_bookmarks.php     |   0
 {htdocs => public}/core/boxes/box_clients.php       |   0
 {htdocs => public}/core/boxes/box_commandes.php     |   0
 {htdocs => public}/core/boxes/box_comptes.php       |   0
 {htdocs => public}/core/boxes/box_contacts.php      |   0
 {htdocs => public}/core/boxes/box_contracts.php     |   0
 {htdocs => public}/core/boxes/box_external_rss.php  |   0
 {htdocs => public}/core/boxes/box_factures.php      |   0
 .../core/boxes/box_factures_fourn.php               |   0
 .../core/boxes/box_factures_fourn_imp.php           |   0
 {htdocs => public}/core/boxes/box_factures_imp.php  |   0
 {htdocs => public}/core/boxes/box_ficheinter.php    |   0
 {htdocs => public}/core/boxes/box_fournisseurs.php  |   0
 {htdocs => public}/core/boxes/box_goodcustomers.php |   0
 .../core/boxes/box_graph_invoices_permonth.php      |   0
 .../boxes/box_graph_invoices_supplier_permonth.php  |   0
 .../core/boxes/box_graph_orders_permonth.php        |   0
 .../boxes/box_graph_orders_supplier_permonth.php    |   0
 .../core/boxes/box_graph_product_distribution.php   |   0
 .../core/boxes/box_graph_propales_permonth.php      |   0
 {htdocs => public}/core/boxes/box_members.php       |   0
 {htdocs => public}/core/boxes/box_produits.php      |   0
 .../core/boxes/box_produits_alerte_stock.php        |   0
 {htdocs => public}/core/boxes/box_project.php       |   0
 {htdocs => public}/core/boxes/box_propales.php      |   0
 {htdocs => public}/core/boxes/box_prospect.php      |   0
 .../core/boxes/box_services_contracts.php           |   0
 .../core/boxes/box_services_expired.php             |   0
 .../core/boxes/box_supplier_orders.php              |   0
 {htdocs => public}/core/boxes/box_task.php          |   0
 {htdocs => public}/core/boxes/index.html            |   0
 {htdocs => public}/core/boxes/modules_boxes.php     |   0
 {htdocs => public}/core/class/CMailFile.class.php   |   0
 {htdocs => public}/core/class/CSMSFile.class.php    |   0
 {htdocs => public}/core/class/antivir.class.php     |   0
 {htdocs => public}/core/class/canvas.class.php      |   0
 {htdocs => public}/core/class/ccountry.class.php    |   0
 .../core/class/commondocgenerator.class.php         |   0
 .../core/class/commoninvoice.class.php              |   0
 .../core/class/commonobject.class.php               |   0
 .../core/class/commonobjectline.class.php           |   0
 {htdocs => public}/core/class/commonorder.class.php |   0
 .../core/class/commonstickergenerator.class.php     |   0
 {htdocs => public}/core/class/conf.class.php        |   0
 {htdocs => public}/core/class/cookie.class.php      |   0
 {htdocs => public}/core/class/cstate.class.php      |   0
 {htdocs => public}/core/class/ctypent.class.php     |   0
 {htdocs => public}/core/class/discount.class.php    |   0
 {htdocs => public}/core/class/doleditor.class.php   |   0
 .../core/class/dolexception.class.php               |   0
 {htdocs => public}/core/class/dolgeoip.class.php    |   0
 {htdocs => public}/core/class/dolgraph.class.php    |   0
 {htdocs => public}/core/class/dolprintipp.class.php |   0
 .../core/class/dolreceiptprinter.class.php          |   0
 {htdocs => public}/core/class/events.class.php      |   0
 {htdocs => public}/core/class/extrafields.class.php |   0
 {htdocs => public}/core/class/fileupload.class.php  |   0
 {htdocs => public}/core/class/fiscalyear.class.php  |   0
 .../core/class/genericobject.class.php              |   0
 {htdocs => public}/core/class/google.class.php      |   0
 {htdocs => public}/core/class/hookmanager.class.php |   0
 {htdocs => public}/core/class/html.form.class.php   |   0
 .../core/class/html.formaccounting.class.php        |   0
 .../core/class/html.formactions.class.php           |   0
 .../core/class/html.formadmin.class.php             |   0
 .../core/class/html.formbank.class.php              |   0
 .../core/class/html.formbarcode.class.php           |   0
 .../core/class/html.formcompany.class.php           |   0
 .../core/class/html.formcontract.class.php          |   0
 .../core/class/html.formcron.class.php              |   0
 .../core/class/html.formfile.class.php              |   0
 .../core/class/html.formintervention.class.php      |   0
 .../core/class/html.formmail.class.php              |   0
 .../core/class/html.formmailing.class.php           |   0
 .../core/class/html.formmargin.class.php            |   0
 .../core/class/html.formorder.class.php             |   0
 .../core/class/html.formother.class.php             |   0
 .../core/class/html.formprojet.class.php            |   0
 .../core/class/html.formpropal.class.php            |   0
 .../core/class/html.formsms.class.php               |   0
 .../core/class/html.formsocialcontrib.class.php     |   0
 {htdocs => public}/core/class/index.html            |   0
 {htdocs => public}/core/class/infobox.class.php     |   0
 {htdocs => public}/core/class/interfaces.class.php  |   0
 {htdocs => public}/core/class/ldap.class.php        |   0
 {htdocs => public}/core/class/link.class.php        |   0
 {htdocs => public}/core/class/menu.class.php        |   0
 {htdocs => public}/core/class/menubase.class.php    |   0
 {htdocs => public}/core/class/notify.class.php      |   0
 {htdocs => public}/core/class/openid.class.php      |   0
 {htdocs => public}/core/class/rssparser.class.php   |   0
 {htdocs => public}/core/class/smtps.class.php       |   0
 {htdocs => public}/core/class/stats.class.php       |   0
 {htdocs => public}/core/class/translate.class.php   |   0
 {htdocs => public}/core/class/utils.class.php       |   0
 {htdocs => public}/core/class/vcard.class.php       |   0
 .../core/class/workboardresponse.class.php          |   0
 {htdocs => public}/core/datepicker.php              |   0
 {htdocs => public}/core/db/Database.interface.php   |   0
 {htdocs => public}/core/db/DoliDB.class.php         |   0
 {htdocs => public}/core/db/index.html               |   0
 {htdocs => public}/core/db/mssql.class.php          |   0
 {htdocs => public}/core/db/mysqli.class.php         |   0
 {htdocs => public}/core/db/pgsql.class.php          |   0
 {htdocs => public}/core/db/sqlite3.class.php        |   0
 {htdocs => public}/core/doxygen.php                 |   0
 {htdocs => public}/core/extrafieldsinexport.inc.php |   0
 .../core/filemanagerdol/browser/default/browser.css |   0
 .../core/filemanagerdol/browser/default/browser.php |   0
 .../browser/default/frmactualfolder.php             |   0
 .../browser/default/frmcreatefolder.php             |   0
 .../filemanagerdol/browser/default/frmfolders.php   |   0
 .../browser/default/frmresourceslist.php            |   0
 .../filemanagerdol/browser/default/frmupload.php    |   0
 .../browser/default/images/Folder.gif               | Bin
 .../browser/default/images/FolderUp.gif             | Bin
 .../browser/default/images/icons/32/ai.gif          | Bin
 .../browser/default/images/icons/32/avi.gif         | Bin
 .../browser/default/images/icons/32/bmp.gif         | Bin
 .../browser/default/images/icons/32/cs.gif          | Bin
 .../default/images/icons/32/default.icon.gif        | Bin
 .../browser/default/images/icons/32/dll.gif         | Bin
 .../browser/default/images/icons/32/doc.gif         | Bin
 .../browser/default/images/icons/32/exe.gif         | Bin
 .../browser/default/images/icons/32/fla.gif         | Bin
 .../browser/default/images/icons/32/gif.gif         | Bin
 .../browser/default/images/icons/32/htm.gif         | Bin
 .../browser/default/images/icons/32/html.gif        | Bin
 .../browser/default/images/icons/32/index.html      |   0
 .../browser/default/images/icons/32/jpg.gif         | Bin
 .../browser/default/images/icons/32/js.gif          | Bin
 .../browser/default/images/icons/32/mdb.gif         | Bin
 .../browser/default/images/icons/32/mp3.gif         | Bin
 .../browser/default/images/icons/32/pdf.gif         | Bin
 .../browser/default/images/icons/32/png.gif         | Bin
 .../browser/default/images/icons/32/ppt.gif         | Bin
 .../browser/default/images/icons/32/rdp.gif         | Bin
 .../browser/default/images/icons/32/swf.gif         | Bin
 .../browser/default/images/icons/32/swt.gif         | Bin
 .../browser/default/images/icons/32/txt.gif         | Bin
 .../browser/default/images/icons/32/vsd.gif         | Bin
 .../browser/default/images/icons/32/xls.gif         | Bin
 .../browser/default/images/icons/32/xml.gif         | Bin
 .../browser/default/images/icons/32/zip.gif         | Bin
 .../browser/default/images/icons/ai.gif             | Bin
 .../browser/default/images/icons/avi.gif            | Bin
 .../browser/default/images/icons/bmp.gif            | Bin
 .../browser/default/images/icons/cs.gif             | Bin
 .../browser/default/images/icons/default.icon.gif   | Bin
 .../browser/default/images/icons/dll.gif            | Bin
 .../browser/default/images/icons/doc.gif            | Bin
 .../browser/default/images/icons/exe.gif            | Bin
 .../browser/default/images/icons/fla.gif            | Bin
 .../browser/default/images/icons/gif.gif            | Bin
 .../browser/default/images/icons/htm.gif            | Bin
 .../browser/default/images/icons/html.gif           | Bin
 .../browser/default/images/icons/index.html         |   0
 .../browser/default/images/icons/jpg.gif            | Bin
 .../browser/default/images/icons/js.gif             | Bin
 .../browser/default/images/icons/mdb.gif            | Bin
 .../browser/default/images/icons/mp3.gif            | Bin
 .../browser/default/images/icons/pdf.gif            | Bin
 .../browser/default/images/icons/png.gif            | Bin
 .../browser/default/images/icons/ppt.gif            | Bin
 .../browser/default/images/icons/rdp.gif            | Bin
 .../browser/default/images/icons/swf.gif            | Bin
 .../browser/default/images/icons/swt.gif            | Bin
 .../browser/default/images/icons/txt.gif            | Bin
 .../browser/default/images/icons/vsd.gif            | Bin
 .../browser/default/images/icons/xls.gif            | Bin
 .../browser/default/images/icons/xml.gif            | Bin
 .../browser/default/images/icons/zip.gif            | Bin
 .../browser/default/images/index.html               |   0
 .../core/filemanagerdol/browser/default/index.html  |   0
 .../filemanagerdol/browser/default/js/common.js     |   0
 .../filemanagerdol/browser/default/js/fckxml.js     |   0
 .../filemanagerdol/browser/default/js/index.html    |   0
 .../core/filemanagerdol/browser/default/spacer.gif  | Bin
 .../core/filemanagerdol/browser/index.html          |   0
 .../core/filemanagerdol/connectors/index.html       |   0
 .../core/filemanagerdol/connectors/php/basexml.php  |   0
 .../core/filemanagerdol/connectors/php/commands.php |   0
 .../core/filemanagerdol/connectors/php/config.php   |   0
 .../filemanagerdol/connectors/php/connector.php     |   0
 .../core/filemanagerdol/connectors/php/index.html   |   0
 .../core/filemanagerdol/connectors/php/io.php       |   0
 .../core/filemanagerdol/connectors/php/upload.php   |   0
 .../core/filemanagerdol/connectors/php/util.php     |   0
 {htdocs => public}/core/filemanagerdol/index.html   |   0
 {htdocs => public}/core/get_menudiv.php             |   0
 {htdocs => public}/core/index.html                  |   0
 {htdocs => public}/core/js/blockUI.js               |   0
 {htdocs => public}/core/js/datepicker.js.php        |   0
 {htdocs => public}/core/js/dst.js                   |   0
 {htdocs => public}/core/js/editinplace.js           |   0
 {htdocs => public}/core/js/index.html               |   0
 {htdocs => public}/core/js/jnotify.js               |   0
 {htdocs => public}/core/js/lib_batch.js             |   0
 {htdocs => public}/core/js/lib_head.js.php          |   0
 {htdocs => public}/core/js/lib_photosresize.js      |   0
 {htdocs => public}/core/js/lib_rare.js              |   0
 {htdocs => public}/core/js/select2_locale.js.php    |   0
 {htdocs => public}/core/js/timepicker.js.php        |   0
 {htdocs => public}/core/js/timesheet.js             |   0
 {htdocs => public}/core/lib/accounting.lib.php      |   0
 {htdocs => public}/core/lib/admin.lib.php           |   0
 {htdocs => public}/core/lib/agenda.lib.php          |   0
 {htdocs => public}/core/lib/ajax.lib.php            |   0
 {htdocs => public}/core/lib/bank.lib.php            |   0
 {htdocs => public}/core/lib/barcode.lib.php         |   0
 {htdocs => public}/core/lib/categories.lib.php      |   0
 {htdocs => public}/core/lib/company.lib.php         |   0
 {htdocs => public}/core/lib/contact.lib.php         |   0
 {htdocs => public}/core/lib/contract.lib.php        |   0
 {htdocs => public}/core/lib/cron.lib.php            |   0
 {htdocs => public}/core/lib/date.lib.php            |   0
 {htdocs => public}/core/lib/doc.lib.php             |   0
 {htdocs => public}/core/lib/doleditor.lib.php       |   0
 {htdocs => public}/core/lib/donation.lib.php        |   0
 {htdocs => public}/core/lib/ecm.lib.php             |   0
 {htdocs => public}/core/lib/emailing.lib.php        |   0
 {htdocs => public}/core/lib/expedition.lib.php      |   0
 {htdocs => public}/core/lib/expensereport.lib.php   |   0
 {htdocs => public}/core/lib/fichinter.lib.php       |   0
 {htdocs => public}/core/lib/files.lib.php           |   0
 {htdocs => public}/core/lib/fiscalyear.lib.php      |   0
 {htdocs => public}/core/lib/format_cards.lib.php    |   0
 {htdocs => public}/core/lib/fourn.lib.php           |   0
 {htdocs => public}/core/lib/functions.lib.php       |   0
 {htdocs => public}/core/lib/functions2.lib.php      |   0
 {htdocs => public}/core/lib/functions_ch.lib.php    |   0
 .../core/lib/functionsnumtoword.lib.php             |   0
 {htdocs => public}/core/lib/geturl.lib.php          |   0
 {htdocs => public}/core/lib/holiday.lib.php         |   0
 {htdocs => public}/core/lib/hrm.lib.php             |   0
 {htdocs => public}/core/lib/images.lib.php          |   0
 {htdocs => public}/core/lib/import.lib.php          |   0
 {htdocs => public}/core/lib/index.html              |   0
 {htdocs => public}/core/lib/invoice.lib.php         |   0
 {htdocs => public}/core/lib/invoice2.lib.php        |   0
 {htdocs => public}/core/lib/json.lib.php            |   0
 {htdocs => public}/core/lib/ldap.lib.php            |   0
 {htdocs => public}/core/lib/loan.lib.php            |   0
 {htdocs => public}/core/lib/mailmanspip.lib.php     |   0
 {htdocs => public}/core/lib/member.lib.php          |   0
 {htdocs => public}/core/lib/memory.lib.php          |   0
 {htdocs => public}/core/lib/multicurrency.lib.php   |   0
 {htdocs => public}/core/lib/oauth.lib.php           |   0
 {htdocs => public}/core/lib/order.lib.php           |   0
 {htdocs => public}/core/lib/payments.lib.php        |   0
 {htdocs => public}/core/lib/pdf.lib.php             |   0
 {htdocs => public}/core/lib/prelevement.lib.php     |   0
 {htdocs => public}/core/lib/price.lib.php           |   0
 {htdocs => public}/core/lib/product.lib.php         |   0
 {htdocs => public}/core/lib/project.lib.php         |   0
 {htdocs => public}/core/lib/propal.lib.php          |   0
 {htdocs => public}/core/lib/receiptprinter.lib.php  |   0
 {htdocs => public}/core/lib/report.lib.php          |   0
 {htdocs => public}/core/lib/resource.lib.php        |   0
 {htdocs => public}/core/lib/salaries.lib.php        |   0
 {htdocs => public}/core/lib/security.lib.php        |   0
 {htdocs => public}/core/lib/security2.lib.php       |   0
 {htdocs => public}/core/lib/sendings.lib.php        |   0
 {htdocs => public}/core/lib/stock.lib.php           |   0
 .../core/lib/supplier_proposal.lib.php              |   0
 {htdocs => public}/core/lib/tax.lib.php             |   0
 {htdocs => public}/core/lib/treeview.lib.php        |   0
 {htdocs => public}/core/lib/trip.lib.php            |   0
 {htdocs => public}/core/lib/usergroups.lib.php      |   0
 {htdocs => public}/core/lib/vat.lib.php             |   0
 {htdocs => public}/core/lib/ws.lib.php              |   0
 {htdocs => public}/core/lib/xcal.lib.php            |   0
 {htdocs => public}/core/login/README.txt            |   0
 .../core/login/functions_dolibarr.php               |   0
 {htdocs => public}/core/login/functions_empty.php   |   0
 .../core/login/functions_forceuser.php              |   0
 {htdocs => public}/core/login/functions_http.php    |   0
 {htdocs => public}/core/login/functions_ldap.php    |   0
 {htdocs => public}/core/login/functions_openid.php  |   0
 {htdocs => public}/core/login/index.html            |   0
 {htdocs => public}/core/menus/index.html            |   0
 {htdocs => public}/core/menus/init_menu_auguria.sql |   0
 .../core/menus/standard/auguria.lib.php             |   0
 .../core/menus/standard/auguria_menu.php            |   0
 {htdocs => public}/core/menus/standard/eldy.lib.php |   0
 .../core/menus/standard/eldy_menu.php               |   0
 {htdocs => public}/core/menus/standard/empty.php    |   0
 {htdocs => public}/core/menus/standard/index.html   |   0
 .../core/modules/DolibarrModules.class.php          |   0
 {htdocs => public}/core/modules/action/index.html   |   0
 .../core/modules/action/modules_action.php          |   0
 .../core/modules/action/rapport.pdf.php             |   0
 .../core/modules/bank/doc/pdf_ban.modules.php       |   0
 .../modules/bank/doc/pdf_sepamandate.modules.php    |   0
 .../core/modules/bank/modules_bank.php              |   0
 .../core/modules/barcode/doc/index.html             |   0
 .../core/modules/barcode/doc/phpbarcode.modules.php |   0
 .../modules/barcode/doc/tcpdfbarcode.modules.php    |   0
 {htdocs => public}/core/modules/barcode/index.html  |   0
 .../barcode/mod_barcode_product_standard.php        |   0
 .../core/modules/barcode/modules_barcode.class.php  |   0
 .../core/modules/cheque/doc/index.html              |   0
 .../core/modules/cheque/doc/pdf_blochet.class.php   |   0
 {htdocs => public}/core/modules/cheque/index.html   |   0
 .../core/modules/cheque/mod_chequereceipt_mint.php  |   0
 .../core/modules/cheque/mod_chequereceipt_thyme.php |   0
 .../core/modules/cheque/modules_chequereceipts.php  |   0
 .../commande/doc/doc_generic_order_odt.modules.php  |   0
 .../core/modules/commande/doc/index.html            |   0
 .../modules/commande/doc/pdf_einstein.modules.php   |   0
 .../modules/commande/doc/pdf_proforma.modules.php   |   0
 {htdocs => public}/core/modules/commande/index.html |   0
 .../core/modules/commande/mod_commande_marbre.php   |   0
 .../core/modules/commande/mod_commande_saphir.php   |   0
 .../core/modules/commande/modules_commande.php      |   0
 .../core/modules/contract/doc/index.html            |   0
 .../modules/contract/doc/pdf_strato.modules.php     |   0
 {htdocs => public}/core/modules/contract/index.html |   0
 .../core/modules/contract/mod_contract_magre.php    |   0
 .../core/modules/contract/mod_contract_olive.php    |   0
 .../core/modules/contract/mod_contract_serpis.php   |   0
 .../core/modules/contract/modules_contract.php      |   0
 .../core/modules/dons/html_cerfafr.html             |   0
 .../core/modules/dons/html_cerfafr.modules.php      |   0
 {htdocs => public}/core/modules/dons/index.html     |   0
 .../core/modules/dons/modules_don.php               |   0
 .../doc/doc_generic_shipment_odt.modules.php        |   0
 .../core/modules/expedition/doc/index.html          |   0
 .../modules/expedition/doc/pdf_merou.modules.php    |   0
 .../modules/expedition/doc/pdf_rouget.modules.php   |   0
 .../core/modules/expedition/index.html              |   0
 .../modules/expedition/mod_expedition_ribera.php    |   0
 .../modules/expedition/mod_expedition_safor.php     |   0
 .../core/modules/expedition/modules_expedition.php  |   0
 .../expensereport/doc/pdf_standard.modules.php      |   0
 .../modules/expensereport/modules_expensereport.php |   0
 .../core/modules/export/export_csv.modules.php      |   0
 .../core/modules/export/export_excel.modules.php    |   0
 .../modules/export/export_excel2007.modules.php     |   0
 .../core/modules/export/export_tsv.modules.php      |   0
 {htdocs => public}/core/modules/export/index.html   |   0
 .../core/modules/export/modules_export.php          |   0
 .../facture/doc/doc_generic_invoice_odt.modules.php |   0
 .../core/modules/facture/doc/index.html             |   0
 .../core/modules/facture/doc/pdf_crabe.modules.php  |   0
 {htdocs => public}/core/modules/facture/index.html  |   0
 .../core/modules/facture/mod_facture_mars.php       |   0
 .../core/modules/facture/mod_facture_mercure.php    |   0
 .../core/modules/facture/mod_facture_terre.php      |   0
 .../core/modules/facture/modules_facture.php        |   0
 .../core/modules/fichinter/doc/index.html           |   0
 .../modules/fichinter/doc/pdf_soleil.modules.php    |   0
 .../core/modules/fichinter/index.html               |   0
 .../core/modules/fichinter/mod_arctic.php           |   0
 .../core/modules/fichinter/mod_pacific.php          |   0
 .../core/modules/fichinter/modules_fichinter.php    |   0
 .../core/modules/import/import_csv.modules.php      |   0
 .../core/modules/import/import_xlsx.modules.php     |   0
 {htdocs => public}/core/modules/import/index.html   |   0
 .../core/modules/import/modules_import.php          |   0
 {htdocs => public}/core/modules/index.html          |   0
 .../core/modules/livraison/doc/index.html           |   0
 .../modules/livraison/doc/pdf_typhon.modules.php    |   0
 .../core/modules/livraison/index.html               |   0
 .../core/modules/livraison/mod_livraison_jade.php   |   0
 .../core/modules/livraison/mod_livraison_saphir.php |   0
 .../core/modules/livraison/modules_livraison.php    |   0
 {htdocs => public}/core/modules/mailings/README     |   0
 .../modules/mailings/advthirdparties.modules.php    |   0
 .../core/modules/mailings/contacts1.modules.php     |   0
 .../core/modules/mailings/contacts2.modules.php     |   0
 .../core/modules/mailings/contacts3.modules.php     |   0
 .../core/modules/mailings/contacts4.modules.php     |   0
 .../core/modules/mailings/example.modules.php       |   0
 .../core/modules/mailings/fraise.modules.php        |   0
 .../core/modules/mailings/framboise.modules.php     |   0
 {htdocs => public}/core/modules/mailings/index.html |   0
 .../core/modules/mailings/modules_mailings.php      |   0
 .../core/modules/mailings/pomme.modules.php         |   0
 .../core/modules/mailings/thirdparties.modules.php  |   0
 .../thirdparties_services_expired.modules.php       |   0
 .../core/modules/mailings/xinputfile.modules.php    |   0
 .../core/modules/mailings/xinputuser.modules.php    |   0
 .../core/modules/member/doc/index.html              |   0
 .../core/modules/member/doc/pdf_standard.class.php  |   0
 {htdocs => public}/core/modules/member/index.html   |   0
 .../core/modules/member/modules_cards.php           |   0
 .../core/modules/modAccounting.class.php            |   0
 .../core/modules/modAdherent.class.php              |   0
 {htdocs => public}/core/modules/modAgenda.class.php |   0
 {htdocs => public}/core/modules/modApi.class.php    |   0
 {htdocs => public}/core/modules/modBanque.class.php |   0
 .../core/modules/modBarcode.class.php               |   0
 .../core/modules/modBookmark.class.php              |   0
 .../core/modules/modCashDesk.class.php              |   0
 .../core/modules/modCategorie.class.php             |   0
 .../core/modules/modClickToDial.class.php           |   0
 .../core/modules/modCommande.class.php              |   0
 .../core/modules/modComptabilite.class.php          |   0
 .../core/modules/modContrat.class.php               |   0
 {htdocs => public}/core/modules/modCron.class.php   |   0
 .../core/modules/modDeplacement.class.php           |   0
 .../core/modules/modDocumentGeneration.class.php    |   0
 {htdocs => public}/core/modules/modDon.class.php    |   0
 .../core/modules/modDynamicPrices.class.php         |   0
 {htdocs => public}/core/modules/modECM.class.php    |   0
 .../core/modules/modExpedition.class.php            |   0
 .../core/modules/modExpenseReport.class.php         |   0
 {htdocs => public}/core/modules/modExport.class.php |   0
 .../core/modules/modExternalRss.class.php           |   0
 .../core/modules/modExternalSite.class.php          |   0
 {htdocs => public}/core/modules/modFTP.class.php    |   0
 .../core/modules/modFacture.class.php               |   0
 .../core/modules/modFckeditor.class.php             |   0
 .../core/modules/modFicheinter.class.php            |   0
 .../core/modules/modFournisseur.class.php           |   0
 .../core/modules/modGeoIPMaxmind.class.php          |   0
 .../core/modules/modGravatar.class.php              |   0
 {htdocs => public}/core/modules/modHRM.class.php    |   0
 .../core/modules/modHoliday.class.php               |   0
 {htdocs => public}/core/modules/modImport.class.php |   0
 .../core/modules/modIncoterm.class.php              |   0
 {htdocs => public}/core/modules/modLabel.class.php  |   0
 {htdocs => public}/core/modules/modLdap.class.php   |   0
 {htdocs => public}/core/modules/modLoan.class.php   |   0
 .../core/modules/modMailing.class.php               |   0
 .../core/modules/modMailmanSpip.class.php           |   0
 {htdocs => public}/core/modules/modMargin.class.php |   0
 .../core/modules/modMultiCurrency.class.php         |   0
 .../core/modules/modNotification.class.php          |   0
 {htdocs => public}/core/modules/modOauth.class.php  |   0
 .../core/modules/modOpenSurvey.class.php            |   0
 {htdocs => public}/core/modules/modPaybox.class.php |   0
 {htdocs => public}/core/modules/modPaypal.class.php |   0
 .../core/modules/modPrelevement.class.php           |   0
 .../core/modules/modPrinting.class.php              |   0
 .../core/modules/modProduct.class.php               |   0
 .../core/modules/modProductBatch.class.php          |   0
 {htdocs => public}/core/modules/modProjet.class.php |   0
 .../core/modules/modPropale.class.php               |   0
 .../core/modules/modReceiptPrinter.class.php        |   0
 .../core/modules/modResource.class.php              |   0
 .../core/modules/modSalaries.class.php              |   0
 .../core/modules/modService.class.php               |   0
 {htdocs => public}/core/modules/modSkype.class.php  |   0
 .../core/modules/modSociete.class.php               |   0
 {htdocs => public}/core/modules/modStock.class.php  |   0
 .../core/modules/modSupplierProposal.class.php      |   0
 {htdocs => public}/core/modules/modSyslog.class.php |   0
 {htdocs => public}/core/modules/modTax.class.php    |   0
 {htdocs => public}/core/modules/modUser.class.php   |   0
 .../core/modules/modWebServices.class.php           |   0
 .../core/modules/modWebServicesClient.class.php     |   0
 .../core/modules/modWebsites.class.php              |   0
 .../core/modules/modWorkflow.class.php              |   0
 .../core/modules/oauth/google_oauthcallback.php     |   0
 {htdocs => public}/core/modules/oauth/index.html    |   0
 .../core/modules/payment/mod_payment_ant.php        |   0
 .../core/modules/payment/mod_payment_cicada.php     |   0
 .../core/modules/payment/modules_payment.php        |   0
 {htdocs => public}/core/modules/printing/index.html |   0
 .../core/modules/printing/modules_printing.php      |   0
 .../core/modules/printing/printgcp.modules.php      |   0
 .../core/modules/printing/printipp.modules.php      |   0
 .../core/modules/printsheet/doc/index.html          |   0
 .../printsheet/doc/pdf_standardlabel.class.php      |   0
 .../modules/printsheet/doc/pdf_tcpdflabel.class.php |   0
 .../core/modules/printsheet/index.html              |   0
 .../core/modules/printsheet/modules_labels.php      |   0
 {htdocs => public}/core/modules/product/index.html  |   0
 .../modules/product/mod_codeproduct_elephant.php    |   0
 .../modules/product/mod_codeproduct_leopard.php     |   0
 .../core/modules/product/modules_product.class.php  |   0
 .../core/modules/product/modules_product.php        |   0
 .../project/doc/doc_generic_project_odt.modules.php |   0
 .../core/modules/project/doc/index.html             |   0
 .../modules/project/doc/pdf_baleine.modules.php     |   0
 .../core/modules/project/doc/pdf_beluga.modules.php |   0
 {htdocs => public}/core/modules/project/index.html  |   0
 .../core/modules/project/mod_project_simple.php     |   0
 .../core/modules/project/mod_project_universal.php  |   0
 .../core/modules/project/modules_project.php        |   0
 .../task/doc/doc_generic_task_odt.modules.php       |   0
 .../core/modules/project/task/doc/index.html        |   0
 .../core/modules/project/task/index.html            |   0
 .../core/modules/project/task/mod_task_simple.php   |   0
 .../modules/project/task/mod_task_universal.php     |   0
 .../core/modules/project/task/modules_task.php      |   0
 .../doc/doc_generic_proposal_odt.modules.php        |   0
 .../core/modules/propale/doc/index.html             |   0
 .../core/modules/propale/doc/pdf_azur.modules.php   |   0
 {htdocs => public}/core/modules/propale/index.html  |   0
 .../core/modules/propale/mod_propale_marbre.php     |   0
 .../core/modules/propale/mod_propale_saphir.php     |   0
 .../core/modules/propale/modules_propale.php        |   0
 {htdocs => public}/core/modules/rapport/index.html  |   0
 .../core/modules/rapport/pdf_paiement.class.php     |   0
 .../core/modules/security/generate/README           |   0
 .../core/modules/security/generate/index.html       |   0
 .../security/generate/modGeneratePassNone.class.php |   0
 .../generate/modGeneratePassPerso.class.php         |   0
 .../generate/modGeneratePassStandard.class.php      |   0
 .../security/generate/modules_genpassword.php       |   0
 {htdocs => public}/core/modules/security/index.html |   0
 .../modules/societe/doc/doc_generic_odt.modules.php |   0
 .../core/modules/societe/doc/index.html             |   0
 {htdocs => public}/core/modules/societe/index.html  |   0
 .../modules/societe/mod_codeclient_elephant.php     |   0
 .../core/modules/societe/mod_codeclient_leopard.php |   0
 .../core/modules/societe/mod_codeclient_monkey.php  |   0
 .../modules/societe/mod_codecompta_aquarium.php     |   0
 .../core/modules/societe/mod_codecompta_panicum.php |   0
 .../core/modules/societe/modules_societe.class.php  |   0
 .../core/modules/supplier_invoice/index.html        |   0
 .../mod_facture_fournisseur_cactus.php              |   0
 .../mod_facture_fournisseur_tulip.php               |   0
 .../supplier_invoice/modules_facturefournisseur.php |   0
 .../core/modules/supplier_invoice/pdf/index.html    |   0
 .../supplier_invoice/pdf/pdf_canelle.modules.php    |   0
 .../core/modules/supplier_order/index.html          |   0
 .../mod_commande_fournisseur_muguet.php             |   0
 .../mod_commande_fournisseur_orchidee.php           |   0
 .../supplier_order/modules_commandefournisseur.php  |   0
 .../core/modules/supplier_order/pdf/index.html      |   0
 .../supplier_order/pdf/pdf_muscadet.modules.php     |   0
 .../mod_supplier_payment_brodator.php               |   0
 .../mod_supplier_payment_bronan.php                 |   0
 .../supplier_payment/modules_supplier_payment.php   |   0
 .../doc_generic_supplier_proposal_odt.modules.php   |   0
 .../core/modules/supplier_proposal/doc/index.html   |   0
 .../supplier_proposal/doc/pdf_aurore.modules.php    |   0
 .../core/modules/supplier_proposal/index.html       |   0
 .../mod_supplier_proposal_marbre.php                |   0
 .../mod_supplier_proposal_saphir.php                |   0
 .../supplier_proposal/modules_supplier_proposal.php |   0
 {htdocs => public}/core/modules/syslog/index.html   |   0
 .../core/modules/syslog/logHandler.php              |   0
 .../core/modules/syslog/logHandlerInterface.php     |   0
 .../core/modules/syslog/mod_syslog_chromephp.php    |   0
 .../core/modules/syslog/mod_syslog_file.php         |   0
 .../core/modules/syslog/mod_syslog_firephp.php      |   0
 .../core/modules/syslog/mod_syslog_syslog.php       |   0
 {htdocs => public}/core/photos_resize.php           |   0
 {htdocs => public}/core/search.php                  |   0
 {htdocs => public}/core/search_page.php             |   0
 {htdocs => public}/core/tools.php                   |   0
 {htdocs => public}/core/tpl/README                  |   0
 .../core/tpl/admin_extrafields_add.tpl.php          |   0
 .../core/tpl/admin_extrafields_edit.tpl.php         |   0
 .../core/tpl/admin_extrafields_view.tpl.php         |   0
 .../core/tpl/ajax/fileupload_main.tpl.php           |   0
 .../core/tpl/ajax/fileupload_view.tpl.php           |   0
 {htdocs => public}/core/tpl/ajax/index.html         |   0
 {htdocs => public}/core/tpl/ajaxrow.tpl.php         |   0
 {htdocs => public}/core/tpl/bloc_showhide.tpl.php   |   0
 {htdocs => public}/core/tpl/contacts.tpl.php        |   0
 .../core/tpl/document_actions_post_headers.tpl.php  |   0
 {htdocs => public}/core/tpl/error.tpl.php           |   0
 .../core/tpl/extrafields_view.tpl.php               |   0
 {htdocs => public}/core/tpl/footer.tpl.php          |   0
 {htdocs => public}/core/tpl/header.tpl.php          |   0
 {htdocs => public}/core/tpl/index.html              |   0
 {htdocs => public}/core/tpl/login.tpl.php           |   0
 {htdocs => public}/core/tpl/notes.tpl.php           |   0
 .../core/tpl/objectline_create.tpl.php              |   0
 {htdocs => public}/core/tpl/objectline_edit.tpl.php |   0
 {htdocs => public}/core/tpl/objectline_view.tpl.php |   0
 .../core/tpl/originproductline.tpl.php              |   0
 .../core/tpl/passwordforgotten.tpl.php              |   0
 {htdocs => public}/core/tpl/resource_add.tpl.php    |   0
 {htdocs => public}/core/tpl/resource_view.tpl.php   |   0
 {htdocs => public}/core/triggers/README             |   0
 {htdocs => public}/core/triggers/README-FR          |   0
 .../core/triggers/dolibarrtriggers.class.php        |   0
 {htdocs => public}/core/triggers/index.html         |   0
 .../triggers/interface_20_all_Logevents.class.php   |   0
 .../interface_20_modPaypal_PaypalWorkflow.class.php |   0
 ...terface_20_modWorkflow_WorkflowManager.class.php |   0
 .../interface_50_modAgenda_ActionsAuto.class.php    |   0
 .../interface_50_modLdap_Ldapsynchro.class.php      |   0
 ...e_50_modMailmanspip_Mailmanspipsynchro.class.php |   0
 ...erface_50_modNotification_Notification.class.php |   0
 .../triggers/interface_90_all_Demo.class.php-NORUN  |   0
 {htdocs => public}/cron/admin/cron.php              |   0
 {htdocs => public}/cron/admin/index.html            |   0
 {htdocs => public}/cron/card.php                    |   0
 {htdocs => public}/cron/class/cronjob.class.php     |   0
 {htdocs => public}/cron/class/index.html            |   0
 {htdocs => public}/cron/index.html                  |   0
 {htdocs => public}/cron/info.php                    |   0
 {htdocs => public}/cron/list.php                    |   0
 {htdocs => public}/custom/.gitignore                |   0
 {htdocs => public}/custom/README.md                 |   0
 {htdocs => public}/custom/index.html                |   0
 {htdocs => public}/document.php                     |   0
 {htdocs => public}/don/admin/donation.php           |   0
 .../don/admin/donation_extrafields.php              |   0
 {htdocs => public}/don/admin/index.html             |   0
 {htdocs => public}/don/card.php                     |   0
 {htdocs => public}/don/class/don.class.php          |   0
 {htdocs => public}/don/class/donstats.class.php     |   0
 {htdocs => public}/don/class/index.html             |   0
 .../don/class/paymentdonation.class.php             |   0
 {htdocs => public}/don/document.php                 |   0
 {htdocs => public}/don/index.html                   |   0
 {htdocs => public}/don/index.php                    |   0
 {htdocs => public}/don/info.php                     |   0
 {htdocs => public}/don/list.php                     |   0
 {htdocs => public}/don/note.php                     |   0
 {htdocs => public}/don/payment/card.php             |   0
 {htdocs => public}/don/payment/index.html           |   0
 {htdocs => public}/don/payment/payment.php          |   0
 {htdocs => public}/don/stats/index.php              |   0
 {htdocs => public}/ecm/ajax/ecmdatabase.php         |   0
 {htdocs => public}/ecm/ajax/index.html              |   0
 {htdocs => public}/ecm/class/ecmdirectory.class.php |   0
 {htdocs => public}/ecm/class/htmlecm.form.class.php |   0
 {htdocs => public}/ecm/class/index.html             |   0
 {htdocs => public}/ecm/docdir.php                   |   0
 {htdocs => public}/ecm/docfile.php                  |   0
 {htdocs => public}/ecm/docmine.php                  |   0
 {htdocs => public}/ecm/docother.php                 |   0
 {htdocs => public}/ecm/index.php                    |   0
 {htdocs => public}/ecm/index_auto.php               |   0
 {htdocs => public}/ecm/search.php                   |   0
 .../ecm/tpl/enablefiletreeajax.tpl.php              |   0
 {htdocs => public}/ecm/tpl/index.html               |   0
 {htdocs => public}/expedition/card.php              |   0
 .../expedition/class/expedition.class.php           |   0
 .../expedition/class/expeditionbatch.class.php      |   0
 .../expedition/class/expeditionstats.class.php      |   0
 {htdocs => public}/expedition/class/index.html      |   0
 {htdocs => public}/expedition/contact.php           |   0
 {htdocs => public}/expedition/index.php             |   0
 {htdocs => public}/expedition/list.php              |   0
 {htdocs => public}/expedition/note.php              |   0
 {htdocs => public}/expedition/shipment.php          |   0
 {htdocs => public}/expedition/stats/index.php       |   0
 {htdocs => public}/expedition/stats/month.php       |   0
 {htdocs => public}/expedition/tpl/index.html        |   0
 .../expedition/tpl/linkedobjectblock.tpl.php        |   0
 .../expensereport/ajax/ajaxprojet.php               |   0
 {htdocs => public}/expensereport/ajax/index.html    |   0
 {htdocs => public}/expensereport/card.php           |   0
 .../class/api_expensereports.class.php              |   0
 .../expensereport/class/expensereport.class.php     |   0
 .../class/expensereportstats.class.php              |   0
 {htdocs => public}/expensereport/class/index.html   |   0
 .../class/paymentexpensereport.class.php            |   0
 {htdocs => public}/expensereport/document.php       |   0
 {htdocs => public}/expensereport/export_csv.php     |   0
 {htdocs => public}/expensereport/index.html         |   0
 {htdocs => public}/expensereport/index.php          |   0
 {htdocs => public}/expensereport/info.php           |   0
 {htdocs => public}/expensereport/list.php           |   0
 {htdocs => public}/expensereport/note.php           |   0
 {htdocs => public}/expensereport/payment/card.php   |   0
 {htdocs => public}/expensereport/payment/index.html |   0
 .../expensereport/payment/payment.php               |   0
 {htdocs => public}/expensereport/stats/index.html   |   0
 {htdocs => public}/expensereport/stats/index.php    |   0
 {htdocs => public}/expensereport/synchro_compta.php |   0
 {htdocs => public}/expensereport/tpl/index.html     |   0
 .../expensereport/tpl/linkedobjectblock.tpl.php     |   0
 {htdocs => public}/exports/class/export.class.php   |   0
 {htdocs => public}/exports/class/index.html         |   0
 {htdocs => public}/exports/export.php               |   0
 {htdocs => public}/exports/index.php                |   0
 .../externalsite/admin/externalsite.php             |   0
 {htdocs => public}/externalsite/admin/index.html    |   0
 {htdocs => public}/externalsite/frames.php          |   0
 {htdocs => public}/externalsite/frametop.php        |   0
 {htdocs => public}/externalsite/index.html          |   0
 {htdocs => public}/favicon.ico                      | Bin
 .../fichinter/admin/fichinter_extrafields.php       |   0
 .../fichinter/admin/fichinterdet_extrafields.php    |   0
 {htdocs => public}/fichinter/admin/index.html       |   0
 {htdocs => public}/fichinter/apercu.php             |   0
 {htdocs => public}/fichinter/card.php               |   0
 .../fichinter/class/fichinter.class.php             |   0
 .../fichinter/class/fichinterstats.class.php        |   0
 {htdocs => public}/fichinter/class/index.html       |   0
 {htdocs => public}/fichinter/contact.php            |   0
 {htdocs => public}/fichinter/document.php           |   0
 {htdocs => public}/fichinter/index.html             |   0
 {htdocs => public}/fichinter/index.php              |   0
 {htdocs => public}/fichinter/info.php               |   0
 {htdocs => public}/fichinter/list.php               |   0
 {htdocs => public}/fichinter/note.php               |   0
 {htdocs => public}/fichinter/stats/index.php        |   0
 {htdocs => public}/fichinter/tpl/index.html         |   0
 .../fichinter/tpl/linkedobjectblock.tpl.php         |   0
 {htdocs => public}/filefunc.inc.php                 |   0
 {htdocs => public}/fourn/ajax/getSupplierPrices.php |   0
 {htdocs => public}/fourn/ajax/index.html            |   0
 {htdocs => public}/fourn/card.php                   |   0
 .../fourn/class/api_supplier_invoices.class.php     |   0
 .../fourn/class/fournisseur.class.php               |   0
 .../fourn/class/fournisseur.commande.class.php      |   0
 .../class/fournisseur.commande.dispatch.class.php   |   0
 .../fourn/class/fournisseur.facture.class.php       |   0
 .../fourn/class/fournisseur.product.class.php       |   0
 {htdocs => public}/fourn/class/index.html           |   0
 .../fourn/class/paiementfourn.class.php             |   0
 {htdocs => public}/fourn/commande/card.php          |   0
 {htdocs => public}/fourn/commande/contact.php       |   0
 {htdocs => public}/fourn/commande/dispatch.php      |   0
 {htdocs => public}/fourn/commande/document.php      |   0
 {htdocs => public}/fourn/commande/index.php         |   0
 {htdocs => public}/fourn/commande/info.php          |   0
 {htdocs => public}/fourn/commande/list.php          |   0
 {htdocs => public}/fourn/commande/note.php          |   0
 .../fourn/commande/orderstoinvoice.php              |   0
 {htdocs => public}/fourn/commande/tpl/index.html    |   0
 .../fourn/commande/tpl/linkedobjectblock.tpl.php    |   0
 {htdocs => public}/fourn/contact.php                |   0
 {htdocs => public}/fourn/facture/card.php           |   0
 {htdocs => public}/fourn/facture/contact.php        |   0
 {htdocs => public}/fourn/facture/document.php       |   0
 {htdocs => public}/fourn/facture/impayees.php       |   0
 {htdocs => public}/fourn/facture/index.html         |   0
 {htdocs => public}/fourn/facture/info.php           |   0
 {htdocs => public}/fourn/facture/list.php           |   0
 {htdocs => public}/fourn/facture/note.php           |   0
 {htdocs => public}/fourn/facture/paiement.php       |   0
 {htdocs => public}/fourn/facture/tpl/index.html     |   0
 .../fourn/facture/tpl/linkedobjectblock.tpl.php     |   0
 {htdocs => public}/fourn/index.php                  |   0
 {htdocs => public}/fourn/js/lib_dispatch.js         |   0
 {htdocs => public}/fourn/paiement/card.php          |   0
 {htdocs => public}/fourn/paiement/index.html        |   0
 {htdocs => public}/fourn/paiement/info.php          |   0
 {htdocs => public}/fourn/product/list.php           |   0
 {htdocs => public}/fourn/recap-fourn.php            |   0
 {htdocs => public}/ftp/admin/ftpclient.php          |   0
 {htdocs => public}/ftp/admin/index.html             |   0
 {htdocs => public}/ftp/index.php                    |   0
 {htdocs => public}/holiday/card.php                 |   0
 {htdocs => public}/holiday/class/holiday.class.php  |   0
 {htdocs => public}/holiday/class/index.html         |   0
 {htdocs => public}/holiday/common.inc.php           |   0
 {htdocs => public}/holiday/define_holiday.php       |   0
 {htdocs => public}/holiday/document.php             |   0
 {htdocs => public}/holiday/img/add.png              | Bin
 {htdocs => public}/holiday/img/conges.png           | Bin
 {htdocs => public}/holiday/img/delete.png           | Bin
 {htdocs => public}/holiday/img/edit.png             | Bin
 {htdocs => public}/holiday/img/index.html           |   0
 {htdocs => public}/holiday/index.html               |   0
 {htdocs => public}/holiday/list.php                 |   0
 {htdocs => public}/holiday/view_log.php             |   0
 .../hrm/admin/admin_establishment.php               |   0
 {htdocs => public}/hrm/admin/admin_hrm.php          |   0
 {htdocs => public}/hrm/admin/index.html             |   0
 .../hrm/class/establishment.class.php               |   0
 {htdocs => public}/hrm/class/index.html             |   0
 {htdocs => public}/hrm/establishment/card.php       |   0
 {htdocs => public}/hrm/establishment/index.html     |   0
 {htdocs => public}/hrm/establishment/info.php       |   0
 {htdocs => public}/hrm/index.html                   |   0
 {htdocs => public}/hrm/index.php                    |   0
 {htdocs => public}/imports/class/import.class.php   |   0
 {htdocs => public}/imports/class/index.html         |   0
 {htdocs => public}/imports/emptyexample.php         |   0
 {htdocs => public}/imports/import.php               |   0
 {htdocs => public}/imports/index.php                |   0
 .../includes/OAuth/Common/AutoLoader.php            |   0
 .../includes/OAuth/Common/Consumer/Credentials.php  |   0
 .../OAuth/Common/Consumer/CredentialsInterface.php  |   0
 .../includes/OAuth/Common/Exception/Exception.php   |   0
 .../OAuth/Common/Http/Client/AbstractClient.php     |   0
 .../OAuth/Common/Http/Client/ClientInterface.php    |   0
 .../OAuth/Common/Http/Client/CurlClient.php         |   0
 .../OAuth/Common/Http/Client/StreamClient.php       |   0
 .../Http/Exception/TokenResponseException.php       |   0
 .../includes/OAuth/Common/Http/Uri/Uri.php          |   0
 .../includes/OAuth/Common/Http/Uri/UriFactory.php   |   0
 .../OAuth/Common/Http/Uri/UriFactoryInterface.php   |   0
 .../includes/OAuth/Common/Http/Uri/UriInterface.php |   0
 .../OAuth/Common/Service/AbstractService.php        |   0
 .../OAuth/Common/Service/ServiceInterface.php       |   0
 .../includes/OAuth/Common/Storage/DoliStorage.php   |   0
 .../AuthorizationStateNotFoundException.php         |   0
 .../Common/Storage/Exception/StorageException.php   |   0
 .../Storage/Exception/TokenNotFoundException.php    |   0
 .../includes/OAuth/Common/Storage/Memory.php        |   0
 .../includes/OAuth/Common/Storage/Redis.php         |   0
 .../includes/OAuth/Common/Storage/Session.php       |   0
 .../OAuth/Common/Storage/SymfonySession.php         |   0
 .../OAuth/Common/Storage/TokenStorageInterface.php  |   0
 .../includes/OAuth/Common/Token/AbstractToken.php   |   0
 .../Token/Exception/ExpiredTokenException.php       |   0
 .../includes/OAuth/Common/Token/TokenInterface.php  |   0
 .../OAuth/OAuth1/Service/AbstractService.php        |   0
 .../includes/OAuth/OAuth1/Service/BitBucket.php     |   0
 .../includes/OAuth/OAuth1/Service/Etsy.php          |   0
 .../includes/OAuth/OAuth1/Service/FitBit.php        |   0
 .../includes/OAuth/OAuth1/Service/FiveHundredPx.php |   0
 .../includes/OAuth/OAuth1/Service/Flickr.php        |   0
 .../includes/OAuth/OAuth1/Service/QuickBooks.php    |   0
 .../includes/OAuth/OAuth1/Service/Redmine.php       |   0
 .../includes/OAuth/OAuth1/Service/ScoopIt.php       |   0
 .../OAuth/OAuth1/Service/ServiceInterface.php       |   0
 .../includes/OAuth/OAuth1/Service/Tumblr.php        |   0
 .../includes/OAuth/OAuth1/Service/Twitter.php       |   0
 .../includes/OAuth/OAuth1/Service/Xing.php          |   0
 .../includes/OAuth/OAuth1/Service/Yahoo.php         |   0
 .../Exception/UnsupportedHashAlgorithmException.php |   0
 .../includes/OAuth/OAuth1/Signature/Signature.php   |   0
 .../OAuth/OAuth1/Signature/SignatureInterface.php   |   0
 .../includes/OAuth/OAuth1/Token/StdOAuth1Token.php  |   0
 .../includes/OAuth/OAuth1/Token/TokenInterface.php  |   0
 .../OAuth/OAuth2/Service/AbstractService.php        |   0
 .../includes/OAuth/OAuth2/Service/Amazon.php        |   0
 .../includes/OAuth/OAuth2/Service/Bitly.php         |   0
 .../includes/OAuth/OAuth2/Service/Bitrix24.php      |   0
 .../includes/OAuth/OAuth2/Service/Box.php           |   0
 .../includes/OAuth/OAuth2/Service/Buffer.php        |   0
 .../includes/OAuth/OAuth2/Service/Dailymotion.php   |   0
 .../includes/OAuth/OAuth2/Service/Delicious.php     |   0
 .../includes/OAuth/OAuth2/Service/DeviantArt.php    |   0
 .../includes/OAuth/OAuth2/Service/Dropbox.php       |   0
 .../includes/OAuth/OAuth2/Service/EveOnline.php     |   0
 .../Exception/InvalidAccessTypeException.php        |   0
 .../InvalidAuthorizationStateException.php          |   0
 .../Service/Exception/InvalidScopeException.php     |   0
 .../Exception/MissingRefreshTokenException.php      |   0
 .../includes/OAuth/OAuth2/Service/Facebook.php      |   0
 .../includes/OAuth/OAuth2/Service/Foursquare.php    |   0
 .../includes/OAuth/OAuth2/Service/GitHub.php        |   0
 .../includes/OAuth/OAuth2/Service/Google.php        |   0
 .../includes/OAuth/OAuth2/Service/Harvest.php       |   0
 .../includes/OAuth/OAuth2/Service/Heroku.php        |   0
 .../includes/OAuth/OAuth2/Service/Hubic.php         |   0
 .../includes/OAuth/OAuth2/Service/Instagram.php     |   0
 .../includes/OAuth/OAuth2/Service/JawboneUP.php     |   0
 .../includes/OAuth/OAuth2/Service/Linkedin.php      |   0
 .../includes/OAuth/OAuth2/Service/Mailchimp.php     |   0
 .../includes/OAuth/OAuth2/Service/Microsoft.php     |   0
 .../includes/OAuth/OAuth2/Service/Nest.php          |   0
 .../includes/OAuth/OAuth2/Service/Netatmo.php       |   0
 .../OAuth/OAuth2/Service/ParrotFlowerPower.php      |   0
 .../includes/OAuth/OAuth2/Service/Paypal.php        |   0
 .../includes/OAuth/OAuth2/Service/Pocket.php        |   0
 .../includes/OAuth/OAuth2/Service/Reddit.php        |   0
 .../includes/OAuth/OAuth2/Service/RunKeeper.php     |   0
 .../includes/OAuth/OAuth2/Service/Salesforce.php    |   0
 .../OAuth/OAuth2/Service/ServiceInterface.php       |   0
 .../includes/OAuth/OAuth2/Service/SoundCloud.php    |   0
 .../includes/OAuth/OAuth2/Service/Spotify.php       |   0
 .../includes/OAuth/OAuth2/Service/Strava.php        |   0
 .../includes/OAuth/OAuth2/Service/Ustream.php       |   0
 .../includes/OAuth/OAuth2/Service/Vimeo.php         |   0
 .../includes/OAuth/OAuth2/Service/Vkontakte.php     |   0
 .../includes/OAuth/OAuth2/Service/Yahoo.php         |   0
 .../includes/OAuth/OAuth2/Service/Yammer.php        |   0
 .../includes/OAuth/OAuth2/Token/StdOAuth2Token.php  |   0
 .../includes/OAuth/OAuth2/Token/TokenInterface.php  |   0
 .../includes/OAuth/ServiceFactory.php               |   0
 {htdocs => public}/includes/OAuth/bootstrap.php     |   0
 .../includes/adodbtime/adodb-time.inc.php           |   0
 {htdocs => public}/includes/adodbtime/index.html    |   0
 .../includes/ccampbell/chromephp/ChromePhp.php      |   0
 .../includes/ccampbell/chromephp/README.md          |   0
 .../includes/ccampbell/chromephp/composer.json      |   0
 .../includes/ckeditor/ckeditor/CHANGES.md           |   0
 .../includes/ckeditor/ckeditor/LICENSE.md           |   0
 .../includes/ckeditor/ckeditor/README.md            |   0
 .../includes/ckeditor/ckeditor/adapters/jquery.js   |   0
 .../includes/ckeditor/ckeditor/bower.json           |   0
 .../includes/ckeditor/ckeditor/build-config.js      |   0
 .../includes/ckeditor/ckeditor/ckeditor.js          |   0
 .../includes/ckeditor/ckeditor/composer.json        |   0
 .../includes/ckeditor/ckeditor/config.js            |   0
 .../includes/ckeditor/ckeditor/contents.css         |   0
 .../includes/ckeditor/ckeditor/lang/af.js           |   0
 .../includes/ckeditor/ckeditor/lang/ar.js           |   0
 .../includes/ckeditor/ckeditor/lang/bg.js           |   0
 .../includes/ckeditor/ckeditor/lang/bn.js           |   0
 .../includes/ckeditor/ckeditor/lang/bs.js           |   0
 .../includes/ckeditor/ckeditor/lang/ca.js           |   0
 .../includes/ckeditor/ckeditor/lang/cs.js           |   0
 .../includes/ckeditor/ckeditor/lang/cy.js           |   0
 .../includes/ckeditor/ckeditor/lang/da.js           |   0
 .../includes/ckeditor/ckeditor/lang/de-ch.js        |   0
 .../includes/ckeditor/ckeditor/lang/de.js           |   0
 .../includes/ckeditor/ckeditor/lang/el.js           |   0
 .../includes/ckeditor/ckeditor/lang/en-au.js        |   0
 .../includes/ckeditor/ckeditor/lang/en-ca.js        |   0
 .../includes/ckeditor/ckeditor/lang/en-gb.js        |   0
 .../includes/ckeditor/ckeditor/lang/en.js           |   0
 .../includes/ckeditor/ckeditor/lang/eo.js           |   0
 .../includes/ckeditor/ckeditor/lang/es.js           |   0
 .../includes/ckeditor/ckeditor/lang/et.js           |   0
 .../includes/ckeditor/ckeditor/lang/eu.js           |   0
 .../includes/ckeditor/ckeditor/lang/fa.js           |   0
 .../includes/ckeditor/ckeditor/lang/fi.js           |   0
 .../includes/ckeditor/ckeditor/lang/fo.js           |   0
 .../includes/ckeditor/ckeditor/lang/fr-ca.js        |   0
 .../includes/ckeditor/ckeditor/lang/fr.js           |   0
 .../includes/ckeditor/ckeditor/lang/gl.js           |   0
 .../includes/ckeditor/ckeditor/lang/gu.js           |   0
 .../includes/ckeditor/ckeditor/lang/he.js           |   0
 .../includes/ckeditor/ckeditor/lang/hi.js           |   0
 .../includes/ckeditor/ckeditor/lang/hr.js           |   0
 .../includes/ckeditor/ckeditor/lang/hu.js           |   0
 .../includes/ckeditor/ckeditor/lang/id.js           |   0
 .../includes/ckeditor/ckeditor/lang/is.js           |   0
 .../includes/ckeditor/ckeditor/lang/it.js           |   0
 .../includes/ckeditor/ckeditor/lang/ja.js           |   0
 .../includes/ckeditor/ckeditor/lang/ka.js           |   0
 .../includes/ckeditor/ckeditor/lang/km.js           |   0
 .../includes/ckeditor/ckeditor/lang/ko.js           |   0
 .../includes/ckeditor/ckeditor/lang/ku.js           |   0
 .../includes/ckeditor/ckeditor/lang/lt.js           |   0
 .../includes/ckeditor/ckeditor/lang/lv.js           |   0
 .../includes/ckeditor/ckeditor/lang/mk.js           |   0
 .../includes/ckeditor/ckeditor/lang/mn.js           |   0
 .../includes/ckeditor/ckeditor/lang/ms.js           |   0
 .../includes/ckeditor/ckeditor/lang/nb.js           |   0
 .../includes/ckeditor/ckeditor/lang/nl.js           |   0
 .../includes/ckeditor/ckeditor/lang/no.js           |   0
 .../includes/ckeditor/ckeditor/lang/pl.js           |   0
 .../includes/ckeditor/ckeditor/lang/pt-br.js        |   0
 .../includes/ckeditor/ckeditor/lang/pt.js           |   0
 .../includes/ckeditor/ckeditor/lang/ro.js           |   0
 .../includes/ckeditor/ckeditor/lang/ru.js           |   0
 .../includes/ckeditor/ckeditor/lang/si.js           |   0
 .../includes/ckeditor/ckeditor/lang/sk.js           |   0
 .../includes/ckeditor/ckeditor/lang/sl.js           |   0
 .../includes/ckeditor/ckeditor/lang/sq.js           |   0
 .../includes/ckeditor/ckeditor/lang/sr-latn.js      |   0
 .../includes/ckeditor/ckeditor/lang/sr.js           |   0
 .../includes/ckeditor/ckeditor/lang/sv.js           |   0
 .../includes/ckeditor/ckeditor/lang/th.js           |   0
 .../includes/ckeditor/ckeditor/lang/tr.js           |   0
 .../includes/ckeditor/ckeditor/lang/tt.js           |   0
 .../includes/ckeditor/ckeditor/lang/ug.js           |   0
 .../includes/ckeditor/ckeditor/lang/uk.js           |   0
 .../includes/ckeditor/ckeditor/lang/vi.js           |   0
 .../includes/ckeditor/ckeditor/lang/zh-cn.js        |   0
 .../includes/ckeditor/ckeditor/lang/zh.js           |   0
 .../includes/ckeditor/ckeditor/package.json         |   0
 .../ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js   |   0
 .../a11yhelp/dialogs/lang/_translationstatus.txt    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/af.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ar.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/bg.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ca.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/cs.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/cy.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/da.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/de.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/el.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/en.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/eo.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/es.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/et.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/eu.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/fa.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/fi.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/fo.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/fr.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/gl.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/gu.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/he.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/hi.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/hr.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/hu.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/id.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/it.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ja.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/km.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ko.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ku.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/lt.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/lv.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/mk.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/mn.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/nb.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/nl.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/no.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/pl.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/pt.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ro.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ru.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/si.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/sk.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/sl.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/sq.js    |   0
 .../plugins/a11yhelp/dialogs/lang/sr-latn.js        |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/sr.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/sv.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/th.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/tr.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/tt.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ug.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/uk.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/vi.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/zh.js    |   0
 .../ckeditor/plugins/about/dialogs/about.js         |   0
 .../plugins/about/dialogs/hidpi/logo_ckeditor.png   | Bin
 .../plugins/about/dialogs/logo_ckeditor.png         | Bin
 .../ckeditor/plugins/clipboard/dialogs/paste.js     |   0
 .../plugins/colordialog/dialogs/colordialog.css     |   0
 .../plugins/colordialog/dialogs/colordialog.js      |   0
 .../ckeditor/plugins/dialog/dialogDefinition.js     |   0
 .../ckeditor/ckeditor/plugins/div/dialogs/div.js    |   0
 .../ckeditor/ckeditor/plugins/find/dialogs/find.js  |   0
 .../ckeditor/plugins/flash/dialogs/flash.js         |   0
 .../ckeditor/plugins/flash/images/placeholder.png   | Bin
 .../ckeditor/plugins/forms/dialogs/button.js        |   0
 .../ckeditor/plugins/forms/dialogs/checkbox.js      |   0
 .../ckeditor/ckeditor/plugins/forms/dialogs/form.js |   0
 .../ckeditor/plugins/forms/dialogs/hiddenfield.js   |   0
 .../ckeditor/plugins/forms/dialogs/radio.js         |   0
 .../ckeditor/plugins/forms/dialogs/select.js        |   0
 .../ckeditor/plugins/forms/dialogs/textarea.js      |   0
 .../ckeditor/plugins/forms/dialogs/textfield.js     |   0
 .../ckeditor/plugins/forms/images/hiddenfield.gif   | Bin
 .../includes/ckeditor/ckeditor/plugins/icons.png    | Bin
 .../ckeditor/ckeditor/plugins/icons_hidpi.png       | Bin
 .../ckeditor/plugins/iframe/dialogs/iframe.js       |   0
 .../ckeditor/plugins/iframe/images/placeholder.png  | Bin
 .../ckeditor/plugins/image/dialogs/image.js         |   0
 .../ckeditor/plugins/image/images/noimage.png       | Bin
 .../ckeditor/plugins/link/dialogs/anchor.js         |   0
 .../ckeditor/ckeditor/plugins/link/dialogs/link.js  |   0
 .../ckeditor/plugins/link/images/anchor.png         | Bin
 .../ckeditor/plugins/link/images/hidpi/anchor.png   | Bin
 .../ckeditor/plugins/liststyle/dialogs/liststyle.js |   0
 .../plugins/magicline/images/hidpi/icon-rtl.png     | Bin
 .../plugins/magicline/images/hidpi/icon.png         | Bin
 .../ckeditor/plugins/magicline/images/icon-rtl.png  | Bin
 .../ckeditor/plugins/magicline/images/icon.png      | Bin
 .../ckeditor/plugins/pagebreak/images/pagebreak.gif | Bin
 .../plugins/pastefromword/filter/default.js         |   0
 .../ckeditor/ckeditor/plugins/preview/preview.html  |   0
 .../ckeditor/ckeditor/plugins/scayt/CHANGELOG.md    |   0
 .../ckeditor/ckeditor/plugins/scayt/LICENSE.md      |   0
 .../ckeditor/ckeditor/plugins/scayt/README.md       |   0
 .../ckeditor/plugins/scayt/dialogs/options.js       |   0
 .../ckeditor/plugins/scayt/dialogs/toolbar.css      |   0
 .../plugins/showblocks/images/block_address.png     | Bin
 .../plugins/showblocks/images/block_blockquote.png  | Bin
 .../plugins/showblocks/images/block_div.png         | Bin
 .../ckeditor/plugins/showblocks/images/block_h1.png | Bin
 .../ckeditor/plugins/showblocks/images/block_h2.png | Bin
 .../ckeditor/plugins/showblocks/images/block_h3.png | Bin
 .../ckeditor/plugins/showblocks/images/block_h4.png | Bin
 .../ckeditor/plugins/showblocks/images/block_h5.png | Bin
 .../ckeditor/plugins/showblocks/images/block_h6.png | Bin
 .../ckeditor/plugins/showblocks/images/block_p.png  | Bin
 .../plugins/showblocks/images/block_pre.png         | Bin
 .../ckeditor/plugins/smiley/dialogs/smiley.js       |   0
 .../ckeditor/plugins/smiley/images/angel_smile.gif  | Bin
 .../ckeditor/plugins/smiley/images/angel_smile.png  | Bin
 .../ckeditor/plugins/smiley/images/angry_smile.gif  | Bin
 .../ckeditor/plugins/smiley/images/angry_smile.png  | Bin
 .../ckeditor/plugins/smiley/images/broken_heart.gif | Bin
 .../ckeditor/plugins/smiley/images/broken_heart.png | Bin
 .../plugins/smiley/images/confused_smile.gif        | Bin
 .../plugins/smiley/images/confused_smile.png        | Bin
 .../ckeditor/plugins/smiley/images/cry_smile.gif    | Bin
 .../ckeditor/plugins/smiley/images/cry_smile.png    | Bin
 .../ckeditor/plugins/smiley/images/devil_smile.gif  | Bin
 .../ckeditor/plugins/smiley/images/devil_smile.png  | Bin
 .../plugins/smiley/images/embaressed_smile.gif      | Bin
 .../plugins/smiley/images/embarrassed_smile.gif     | Bin
 .../plugins/smiley/images/embarrassed_smile.png     | Bin
 .../ckeditor/plugins/smiley/images/envelope.gif     | Bin
 .../ckeditor/plugins/smiley/images/envelope.png     | Bin
 .../ckeditor/plugins/smiley/images/heart.gif        | Bin
 .../ckeditor/plugins/smiley/images/heart.png        | Bin
 .../ckeditor/plugins/smiley/images/kiss.gif         | Bin
 .../ckeditor/plugins/smiley/images/kiss.png         | Bin
 .../ckeditor/plugins/smiley/images/lightbulb.gif    | Bin
 .../ckeditor/plugins/smiley/images/lightbulb.png    | Bin
 .../ckeditor/plugins/smiley/images/omg_smile.gif    | Bin
 .../ckeditor/plugins/smiley/images/omg_smile.png    | Bin
 .../plugins/smiley/images/regular_smile.gif         | Bin
 .../plugins/smiley/images/regular_smile.png         | Bin
 .../ckeditor/plugins/smiley/images/sad_smile.gif    | Bin
 .../ckeditor/plugins/smiley/images/sad_smile.png    | Bin
 .../ckeditor/plugins/smiley/images/shades_smile.gif | Bin
 .../ckeditor/plugins/smiley/images/shades_smile.png | Bin
 .../ckeditor/plugins/smiley/images/teeth_smile.gif  | Bin
 .../ckeditor/plugins/smiley/images/teeth_smile.png  | Bin
 .../ckeditor/plugins/smiley/images/thumbs_down.gif  | Bin
 .../ckeditor/plugins/smiley/images/thumbs_down.png  | Bin
 .../ckeditor/plugins/smiley/images/thumbs_up.gif    | Bin
 .../ckeditor/plugins/smiley/images/thumbs_up.png    | Bin
 .../ckeditor/plugins/smiley/images/tongue_smile.gif | Bin
 .../ckeditor/plugins/smiley/images/tongue_smile.png | Bin
 .../ckeditor/plugins/smiley/images/tounge_smile.gif | Bin
 .../smiley/images/whatchutalkingabout_smile.gif     | Bin
 .../smiley/images/whatchutalkingabout_smile.png     | Bin
 .../ckeditor/plugins/smiley/images/wink_smile.gif   | Bin
 .../ckeditor/plugins/smiley/images/wink_smile.png   | Bin
 .../specialchar/dialogs/lang/_translationstatus.txt |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/af.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/ar.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/bg.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/ca.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/cs.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/cy.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/da.js |   0
 .../plugins/specialchar/dialogs/lang/de-ch.js       |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/de.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/el.js |   0
 .../plugins/specialchar/dialogs/lang/en-gb.js       |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/en.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/eo.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/es.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/et.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/eu.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/fa.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/fi.js |   0
 .../plugins/specialchar/dialogs/lang/fr-ca.js       |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/fr.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/gl.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/he.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/hr.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/hu.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/id.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/it.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/ja.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/km.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/ko.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/ku.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/lt.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/lv.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/nb.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/nl.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/no.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/pl.js |   0
 .../plugins/specialchar/dialogs/lang/pt-br.js       |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/pt.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/ru.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/si.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/sk.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/sl.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/sq.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/sv.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/th.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/tr.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/tt.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/ug.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/uk.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/vi.js |   0
 .../plugins/specialchar/dialogs/lang/zh-cn.js       |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/zh.js |   0
 .../plugins/specialchar/dialogs/specialchar.js      |   0
 .../ckeditor/plugins/table/dialogs/table.js         |   0
 .../plugins/tabletools/dialogs/tableCell.js         |   0
 .../plugins/templates/dialogs/templates.css         |   0
 .../ckeditor/plugins/templates/dialogs/templates.js |   0
 .../ckeditor/plugins/templates/templates/default.js |   0
 .../templates/templates/images/template1.gif        | Bin
 .../templates/templates/images/template2.gif        | Bin
 .../templates/templates/images/template3.gif        | Bin
 .../ckeditor/ckeditor/plugins/wsc/LICENSE.md        |   0
 .../ckeditor/ckeditor/plugins/wsc/README.md         |   0
 .../ckeditor/plugins/wsc/dialogs/ciframe.html       |   0
 .../ckeditor/plugins/wsc/dialogs/tmpFrameset.html   |   0
 .../ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css   |   0
 .../ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js    |   0
 .../ckeditor/ckeditor/plugins/wsc/dialogs/wsc_ie.js |   0
 .../ckeditor/ckeditor/samples/css/samples.css       |   0
 .../ckeditor/ckeditor/samples/img/github-top.png    | Bin
 .../ckeditor/ckeditor/samples/img/header-bg.png     | Bin
 .../ckeditor/samples/img/header-separator.png       | Bin
 .../includes/ckeditor/ckeditor/samples/img/logo.png | Bin
 .../ckeditor/samples/img/navigation-tip.png         | Bin
 .../includes/ckeditor/ckeditor/samples/index.html   |   0
 .../includes/ckeditor/ckeditor/samples/js/sample.js |   0
 .../includes/ckeditor/ckeditor/samples/js/sf.js     |   0
 .../ckeditor/ckeditor/samples/old/ajax.html         |   0
 .../includes/ckeditor/ckeditor/samples/old/api.html |   0
 .../ckeditor/ckeditor/samples/old/appendto.html     |   0
 .../ckeditor/samples/old/assets/inlineall/logo.png  | Bin
 .../samples/old/assets/outputxhtml/outputxhtml.css  |   0
 .../ckeditor/samples/old/assets/posteddata.php      |   0
 .../ckeditor/ckeditor/samples/old/assets/sample.jpg | Bin
 .../samples/old/assets/uilanguages/languages.js     |   0
 .../ckeditor/samples/old/datafiltering.html         |   0
 .../ckeditor/samples/old/dialog/assets/my_dialog.js |   0
 .../ckeditor/samples/old/dialog/dialog.html         |   0
 .../ckeditor/ckeditor/samples/old/divreplace.html   |   0
 .../ckeditor/samples/old/enterkey/enterkey.html     |   0
 .../assets/outputforflash/outputforflash.fla        | Bin
 .../assets/outputforflash/outputforflash.swf        | Bin
 .../htmlwriter/assets/outputforflash/swfobject.js   |   0
 .../samples/old/htmlwriter/outputforflash.html      |   0
 .../ckeditor/samples/old/htmlwriter/outputhtml.html |   0
 .../ckeditor/ckeditor/samples/old/index.html        |   0
 .../ckeditor/ckeditor/samples/old/inlineall.html    |   0
 .../ckeditor/ckeditor/samples/old/inlinebycode.html |   0
 .../ckeditor/samples/old/inlinetextarea.html        |   0
 .../ckeditor/ckeditor/samples/old/jquery.html       |   0
 .../ckeditor/samples/old/magicline/magicline.html   |   0
 .../ckeditor/ckeditor/samples/old/readonly.html     |   0
 .../ckeditor/samples/old/replacebyclass.html        |   0
 .../ckeditor/samples/old/replacebycode.html         |   0
 .../ckeditor/ckeditor/samples/old/sample.css        |   0
 .../ckeditor/ckeditor/samples/old/sample.js         |   0
 .../ckeditor/samples/old/sample_posteddata.php      |   0
 .../ckeditor/ckeditor/samples/old/tabindex.html     |   0
 .../ckeditor/samples/old/toolbar/toolbar.html       |   0
 .../ckeditor/ckeditor/samples/old/uicolor.html      |   0
 .../ckeditor/ckeditor/samples/old/uilanguages.html  |   0
 .../ckeditor/samples/old/wysiwygarea/fullpage.html  |   0
 .../ckeditor/ckeditor/samples/old/xhtmlstyle.html   |   0
 .../samples/toolbarconfigurator/css/fontello.css    |   0
 .../samples/toolbarconfigurator/font/LICENSE.txt    |   0
 .../samples/toolbarconfigurator/font/config.json    |   0
 .../samples/toolbarconfigurator/font/fontello.eot   | Bin
 .../samples/toolbarconfigurator/font/fontello.svg   |   0
 .../samples/toolbarconfigurator/font/fontello.ttf   | Bin
 .../samples/toolbarconfigurator/font/fontello.woff  | Bin
 .../ckeditor/samples/toolbarconfigurator/index.html |   0
 .../js/abstracttoolbarmodifier.js                   |   0
 .../toolbarconfigurator/js/fulltoolbareditor.js     |   0
 .../toolbarconfigurator/js/toolbarmodifier.js       |   0
 .../toolbarconfigurator/js/toolbartextmodifier.js   |   0
 .../toolbarconfigurator/lib/codemirror/LICENSE      |   0
 .../lib/codemirror/codemirror.css                   |   0
 .../lib/codemirror/codemirror.js                    |   0
 .../lib/codemirror/javascript.js                    |   0
 .../toolbarconfigurator/lib/codemirror/neo.css      |   0
 .../lib/codemirror/show-hint.css                    |   0
 .../toolbarconfigurator/lib/codemirror/show-hint.js |   0
 .../ckeditor/ckeditor/skins/moono/dialog.css        |   0
 .../ckeditor/ckeditor/skins/moono/dialog_ie.css     |   0
 .../ckeditor/ckeditor/skins/moono/dialog_ie7.css    |   0
 .../ckeditor/ckeditor/skins/moono/dialog_ie8.css    |   0
 .../ckeditor/skins/moono/dialog_iequirks.css        |   0
 .../ckeditor/ckeditor/skins/moono/editor.css        |   0
 .../ckeditor/ckeditor/skins/moono/editor_gecko.css  |   0
 .../ckeditor/ckeditor/skins/moono/editor_ie.css     |   0
 .../ckeditor/ckeditor/skins/moono/editor_ie7.css    |   0
 .../ckeditor/ckeditor/skins/moono/editor_ie8.css    |   0
 .../ckeditor/skins/moono/editor_iequirks.css        |   0
 .../ckeditor/ckeditor/skins/moono/icons.png         | Bin
 .../ckeditor/ckeditor/skins/moono/icons_hidpi.png   | Bin
 .../ckeditor/ckeditor/skins/moono/images/arrow.png  | Bin
 .../ckeditor/ckeditor/skins/moono/images/close.png  | Bin
 .../ckeditor/skins/moono/images/hidpi/close.png     | Bin
 .../ckeditor/skins/moono/images/hidpi/lock-open.png | Bin
 .../ckeditor/skins/moono/images/hidpi/lock.png      | Bin
 .../ckeditor/skins/moono/images/hidpi/refresh.png   | Bin
 .../ckeditor/skins/moono/images/lock-open.png       | Bin
 .../ckeditor/ckeditor/skins/moono/images/lock.png   | Bin
 .../ckeditor/skins/moono/images/refresh.png         | Bin
 .../ckeditor/skins/moono/images/spinner.gif         | Bin
 .../ckeditor/ckeditor/skins/moono/readme.md         |   0
 .../includes/ckeditor/ckeditor/styles.js            |   0
 {htdocs => public}/includes/evalmath/README.md      |   0
 .../includes/evalmath/evalmath.class.php            |   0
 {htdocs => public}/includes/fonts/Aerial.ttf        | Bin
 {htdocs => public}/includes/fonts/AerialBd.ttf      | Bin
 {htdocs => public}/includes/fonts/AerialBdIt.ttf    | Bin
 {htdocs => public}/includes/fonts/AerialIt.ttf      | Bin
 {htdocs => public}/includes/fonts/CHANGELOG.TXT     |   0
 {htdocs => public}/includes/fonts/COPYRIGHT.TXT     |   0
 {htdocs => public}/includes/fpdfi/README.txt        |   0
 .../includes/fpdfi/filters/FilterASCII85.php        |   0
 .../includes/fpdfi/filters/FilterASCII85_FPDI.php   |   0
 .../includes/fpdfi/filters/FilterASCIIHexDecode.php |   0
 .../includes/fpdfi/filters/FilterLZW.php            |   0
 .../includes/fpdfi/filters/FilterLZW_FPDI.php       |   0
 {htdocs => public}/includes/fpdfi/fpdf_tpl.php      |   0
 {htdocs => public}/includes/fpdfi/fpdi.php          |   0
 {htdocs => public}/includes/fpdfi/fpdi_bridge.php   |   0
 .../includes/fpdfi/fpdi_pdf_parser.php              |   0
 {htdocs => public}/includes/fpdfi/pdf_context.php   |   0
 {htdocs => public}/includes/fpdfi/pdf_parser.php    |   0
 {htdocs => public}/includes/geoip/README.txt        |   0
 {htdocs => public}/includes/geoip/geoip.inc         |   0
 {htdocs => public}/includes/geoip/geoipcity.inc     |   0
 .../includes/geoip/geoipregionvars.php              |   0
 {htdocs => public}/includes/geoip/sample.php        |   0
 {htdocs => public}/includes/geoip/sample_city.php   |   0
 .../includes/geoip/sample_distributed.php           |   0
 .../includes/geoip/sample_netspeed.php              |   0
 {htdocs => public}/includes/geoip/sample_org.php    |   0
 {htdocs => public}/includes/geoip/sample_region.php |   0
 {htdocs => public}/includes/index.html              |   0
 .../redmond/images/ui-bg_flat_0_aaaaaa_40x100.png   | Bin
 .../redmond/images/ui-bg_flat_55_fbec88_40x100.png  | Bin
 .../redmond/images/ui-bg_glass_75_d0e5f5_1x400.png  | Bin
 .../redmond/images/ui-bg_glass_85_dfeffc_1x400.png  | Bin
 .../redmond/images/ui-bg_glass_95_fef1ec_1x400.png  | Bin
 .../images/ui-bg_gloss-wave_55_5c9ccc_500x100.png   | Bin
 .../images/ui-bg_inset-hard_100_f5f8f9_1x100.png    | Bin
 .../images/ui-bg_inset-hard_100_fcfdfd_1x100.png    | Bin
 .../css/redmond/images/ui-icons_217bc0_256x240.png  | Bin
 .../css/redmond/images/ui-icons_2e83ff_256x240.png  | Bin
 .../css/redmond/images/ui-icons_469bdd_256x240.png  | Bin
 .../css/redmond/images/ui-icons_6da8d5_256x240.png  | Bin
 .../css/redmond/images/ui-icons_cd0a0a_256x240.png  | Bin
 .../css/redmond/images/ui-icons_d8e7f3_256x240.png  | Bin
 .../css/redmond/images/ui-icons_f9bd01_256x240.png  | Bin
 .../includes/jquery/css/redmond/jquery-ui.css       |   0
 .../includes/jquery/css/redmond/jquery-ui.min.css   |   0
 .../includes/jquery/css/redmond/theme.css           |   0
 .../images/ui-bg_flat_0_aaaaaa_40x100.png           | Bin
 .../images/ui-bg_flat_75_ffffff_40x100.png          | Bin
 .../images/ui-bg_glass_55_fbf9ee_1x400.png          | Bin
 .../images/ui-bg_glass_65_ffffff_1x400.png          | Bin
 .../images/ui-bg_glass_75_dadada_1x400.png          | Bin
 .../images/ui-bg_glass_75_e6e6e6_1x400.png          | Bin
 .../images/ui-bg_glass_95_fef1ec_1x400.png          | Bin
 .../images/ui-bg_highlight-soft_75_cccccc_1x100.png | Bin
 .../smoothness/images/ui-icons_222222_256x240.png   | Bin
 .../smoothness/images/ui-icons_2e83ff_256x240.png   | Bin
 .../smoothness/images/ui-icons_454545_256x240.png   | Bin
 .../smoothness/images/ui-icons_888888_256x240.png   | Bin
 .../smoothness/images/ui-icons_cd0a0a_256x240.png   | Bin
 .../includes/jquery/css/smoothness/jquery-ui.css    |   0
 .../jquery/css/smoothness/jquery-ui.min.css         |   0
 .../includes/jquery/css/smoothness/theme.css        |   0
 .../ui-bg_diagonals-thick_18_b81900_40x40.png       | Bin
 .../ui-bg_diagonals-thick_20_666666_40x40.png       | Bin
 .../images/ui-bg_flat_10_000000_40x100.png          | Bin
 .../images/ui-bg_glass_100_f6f6f6_1x400.png         | Bin
 .../images/ui-bg_glass_100_fdf5ce_1x400.png         | Bin
 .../images/ui-bg_glass_65_ffffff_1x400.png          | Bin
 .../images/ui-bg_gloss-wave_35_f6a828_500x100.png   | Bin
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png       | Bin
 .../images/ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin
 .../ui-lightness/images/ui-icons_222222_256x240.png | Bin
 .../ui-lightness/images/ui-icons_228ef1_256x240.png | Bin
 .../ui-lightness/images/ui-icons_ef8c08_256x240.png | Bin
 .../ui-lightness/images/ui-icons_ffd27a_256x240.png | Bin
 .../ui-lightness/images/ui-icons_ffffff_256x240.png | Bin
 .../includes/jquery/css/ui-lightness/jquery-ui.css  |   0
 .../jquery/css/ui-lightness/jquery-ui.min.css       |   0
 .../includes/jquery/css/ui-lightness/theme.css      |   0
 {htdocs => public}/includes/jquery/js/jquery-ui.js  |   0
 .../includes/jquery/js/jquery-ui.min.js             |   0
 {htdocs => public}/includes/jquery/js/jquery.js     |   0
 {htdocs => public}/includes/jquery/js/jquery.min.js |   0
 .../jquery/plugins/blockUI/jquery.blockUI.js        |   0
 .../plugins/colorpicker/jquery.colorpicker.css      |   0
 .../plugins/colorpicker/jquery.colorpicker.js       |   0
 .../includes/jquery/plugins/fileupload/README.md    |   0
 .../plugins/fileupload/css/jquery.fileupload-ui.css |   0
 .../jquery/plugins/fileupload/img/loading.gif       | Bin
 .../jquery/plugins/fileupload/img/progressbar.gif   | Bin
 .../js/cors/jquery.postmessage-transport.js         |   0
 .../fileupload/js/cors/jquery.xdr-transport.js      |   0
 .../plugins/fileupload/js/jquery.fileupload-fp.js   |   0
 .../plugins/fileupload/js/jquery.fileupload-jui.js  |   0
 .../plugins/fileupload/js/jquery.fileupload-ui.js   |   0
 .../plugins/fileupload/js/jquery.fileupload.js      |   0
 .../fileupload/js/jquery.iframe-transport.js        |   0
 .../includes/jquery/plugins/fileupload/js/locale.js |   0
 .../includes/jquery/plugins/fileupload/js/main.js   |   0
 .../fileupload/js/vendor/jquery.ui.widget.js        |   0
 .../includes/jquery/plugins/flot/API.md             |   0
 .../includes/jquery/plugins/flot/CONTRIBUTING.md    |   0
 .../includes/jquery/plugins/flot/FAQ.md             |   0
 .../includes/jquery/plugins/flot/LICENSE.txt        |   0
 .../includes/jquery/plugins/flot/Makefile           |   0
 .../includes/jquery/plugins/flot/NEWS.md            |   0
 .../includes/jquery/plugins/flot/PLUGINS.md         |   0
 .../includes/jquery/plugins/flot/README.md          |   0
 .../includes/jquery/plugins/flot/excanvas.js        |   0
 .../includes/jquery/plugins/flot/excanvas.min.js    |   0
 .../jquery/plugins/flot/jquery.colorhelpers.js      |   0
 .../jquery/plugins/flot/jquery.colorhelpers.min.js  |   0
 .../jquery/plugins/flot/jquery.flot.canvas.js       |   0
 .../jquery/plugins/flot/jquery.flot.canvas.min.js   |   0
 .../jquery/plugins/flot/jquery.flot.categories.js   |   0
 .../plugins/flot/jquery.flot.categories.min.js      |   0
 .../jquery/plugins/flot/jquery.flot.crosshair.js    |   0
 .../plugins/flot/jquery.flot.crosshair.min.js       |   0
 .../jquery/plugins/flot/jquery.flot.errorbars.js    |   0
 .../plugins/flot/jquery.flot.errorbars.min.js       |   0
 .../jquery/plugins/flot/jquery.flot.fillbetween.js  |   0
 .../plugins/flot/jquery.flot.fillbetween.min.js     |   0
 .../jquery/plugins/flot/jquery.flot.image.js        |   0
 .../jquery/plugins/flot/jquery.flot.image.min.js    |   0
 .../includes/jquery/plugins/flot/jquery.flot.js     |   0
 .../includes/jquery/plugins/flot/jquery.flot.min.js |   0
 .../jquery/plugins/flot/jquery.flot.navigate.js     |   0
 .../jquery/plugins/flot/jquery.flot.navigate.min.js |   0
 .../includes/jquery/plugins/flot/jquery.flot.pie.js |   0
 .../jquery/plugins/flot/jquery.flot.pie.min.js      |   0
 .../jquery/plugins/flot/jquery.flot.resize.js       |   0
 .../jquery/plugins/flot/jquery.flot.resize.min.js   |   0
 .../jquery/plugins/flot/jquery.flot.selection.js    |   0
 .../plugins/flot/jquery.flot.selection.min.js       |   0
 .../jquery/plugins/flot/jquery.flot.stack.js        |   0
 .../jquery/plugins/flot/jquery.flot.stack.min.js    |   0
 .../jquery/plugins/flot/jquery.flot.symbol.js       |   0
 .../jquery/plugins/flot/jquery.flot.symbol.min.js   |   0
 .../jquery/plugins/flot/jquery.flot.threshold.js    |   0
 .../plugins/flot/jquery.flot.threshold.min.js       |   0
 .../jquery/plugins/flot/jquery.flot.time.js         |   0
 .../jquery/plugins/flot/jquery.flot.time.min.js     |   0
 .../includes/jquery/plugins/jcrop/css/Jcrop.gif     | Bin
 .../jquery/plugins/jcrop/css/jquery.Jcrop.css       |   0
 .../includes/jquery/plugins/jcrop/index.html        |   0
 .../jquery/plugins/jcrop/js/jquery.Jcrop.js         |   0
 .../jquery/plugins/jcrop/js/jquery.Jcrop.min.js     |   0
 .../plugins/jeditable/jquery.jeditable.ckeditor.js  |   0
 .../jquery/plugins/jeditable/jquery.jeditable.js    |   0
 .../plugins/jeditable/jquery.jeditable.min.js       |   0
 .../jeditable/jquery.jeditable.ui-autocomplete.js   |   0
 .../jeditable/jquery.jeditable.ui-datepicker.js     |   0
 .../plugins/jnotify/jquery.jnotify-alt.min.css      |   0
 .../jquery/plugins/jnotify/jquery.jnotify.css       |   0
 .../jquery/plugins/jnotify/jquery.jnotify.js        |   0
 .../jquery/plugins/jnotify/jquery.jnotify.min.css   |   0
 .../jquery/plugins/jnotify/jquery.jnotify.min.js    |   0
 .../includes/jquery/plugins/jpicker/ChangeLog.txt   |   0
 .../includes/jquery/plugins/jpicker/Example.html    |   0
 .../includes/jquery/plugins/jpicker/ReadMe.txt      |   0
 .../jquery/plugins/jpicker/css/jPicker-1.1.6.css    |   0
 .../plugins/jpicker/css/jPicker-1.1.6.min.css       |   0
 .../jquery/plugins/jpicker/images/AlphaBar.png      | Bin
 .../includes/jquery/plugins/jpicker/images/Bars.png | Bin
 .../includes/jquery/plugins/jpicker/images/Maps.png | Bin
 .../jquery/plugins/jpicker/images/NoColor.png       | Bin
 .../jquery/plugins/jpicker/images/bar-opacity.png   | Bin
 .../jquery/plugins/jpicker/images/map-opacity.png   | Bin
 .../jquery/plugins/jpicker/images/mappoint.gif      | Bin
 .../jquery/plugins/jpicker/images/picker.gif        | Bin
 .../plugins/jpicker/images/preview-opacity.png      | Bin
 .../jquery/plugins/jpicker/images/rangearrows.gif   | Bin
 .../includes/jquery/plugins/jpicker/jPicker.css     |   0
 .../jquery/plugins/jpicker/jpicker-1.1.6.js         |   0
 .../jquery/plugins/jpicker/jpicker-1.1.6.min.js     |   0
 .../plugins/jqueryFileTree/images/application.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/code.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/css.png    | Bin
 .../jquery/plugins/jqueryFileTree/images/db.png     | Bin
 .../plugins/jqueryFileTree/images/directory.png     | Bin
 .../jquery/plugins/jqueryFileTree/images/doc.png    | Bin
 .../jquery/plugins/jqueryFileTree/images/file.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/film.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/flash.png  | Bin
 .../plugins/jqueryFileTree/images/folder_open.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/html.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/java.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/linux.png  | Bin
 .../jquery/plugins/jqueryFileTree/images/music.png  | Bin
 .../jquery/plugins/jqueryFileTree/images/pdf.png    | Bin
 .../jquery/plugins/jqueryFileTree/images/php.png    | Bin
 .../plugins/jqueryFileTree/images/picture.png       | Bin
 .../jquery/plugins/jqueryFileTree/images/ppt.png    | Bin
 .../jquery/plugins/jqueryFileTree/images/psd.png    | Bin
 .../jquery/plugins/jqueryFileTree/images/ruby.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/script.png | Bin
 .../plugins/jqueryFileTree/images/spinner.gif       | Bin
 .../jquery/plugins/jqueryFileTree/images/txt.png    | Bin
 .../jquery/plugins/jqueryFileTree/images/xls.png    | Bin
 .../jquery/plugins/jqueryFileTree/images/zip.png    | Bin
 .../plugins/jqueryFileTree/jqueryFileTree.css       |   0
 .../jquery/plugins/jqueryFileTree/jqueryFileTree.js |   0
 .../jquery/plugins/jquerytreeview/changelog.md      |   0
 .../plugins/jquerytreeview/images/ajax-loader.gif   | Bin
 .../jquery/plugins/jquerytreeview/images/file.gif   | Bin
 .../plugins/jquerytreeview/images/folder-closed.gif | Bin
 .../jquery/plugins/jquerytreeview/images/folder.gif | Bin
 .../jquery/plugins/jquerytreeview/images/minus.gif  | Bin
 .../jquery/plugins/jquerytreeview/images/plus.gif   | Bin
 .../jquerytreeview/images/treeview-black-line.gif   | Bin
 .../jquerytreeview/images/treeview-black.gif        | Bin
 .../jquerytreeview/images/treeview-default-line.gif | Bin
 .../jquerytreeview/images/treeview-default.gif      | Bin
 .../images/treeview-famfamfam-line.gif              | Bin
 .../jquerytreeview/images/treeview-famfamfam.gif    | Bin
 .../jquerytreeview/images/treeview-gray-line.gif    | Bin
 .../plugins/jquerytreeview/images/treeview-gray.gif | Bin
 .../jquerytreeview/images/treeview-red-line.gif     | Bin
 .../plugins/jquerytreeview/images/treeview-red.gif  | Bin
 .../plugins/jquerytreeview/jquery.treeview.async.js |   0
 .../plugins/jquerytreeview/jquery.treeview.css      |   0
 .../plugins/jquerytreeview/jquery.treeview.edit.js  |   0
 .../plugins/jquerytreeview/jquery.treeview.js       |   0
 .../jquerytreeview/jquery.treeview.sortable.js      |   0
 .../plugins/jquerytreeview/lib/jquery.cookie.js     |   0
 .../jquery/plugins/jquerytreeview/readme.md         |   0
 .../jquery/plugins/jquerytreeview/screenshot.png    | Bin
 .../includes/jquery/plugins/layout/jquery.layout.js |   0
 .../jquery/plugins/layout/jquery.layout.min.js      |   0
 .../jquery/plugins/mobile/images/ajax-loader.gif    | Bin
 .../jquery/plugins/mobile/images/icons-18-black.png | Bin
 .../jquery/plugins/mobile/images/icons-18-white.png | Bin
 .../jquery/plugins/mobile/images/icons-36-black.png | Bin
 .../jquery/plugins/mobile/images/icons-36-white.png | Bin
 .../jquery/plugins/mobile/jquery.mobile-latest.css  |   0
 .../jquery/plugins/mobile/jquery.mobile-latest.js   |   0
 .../plugins/mobile/jquery.mobile-latest.min.css     |   0
 .../plugins/mobile/jquery.mobile-latest.min.js      |   0
 .../jquery/plugins/multiselect/MIT-LICENSE.txt      |   0
 .../plugins/multiselect/css/ui.multiselect.css      |   0
 .../jquery/plugins/multiselect/js/ui.multiselect.js |   0
 .../includes/jquery/plugins/select2/.gitignore      |   0
 .../includes/jquery/plugins/select2/CONTRIBUTING.md |   0
 .../includes/jquery/plugins/select2/LICENSE         |   0
 .../includes/jquery/plugins/select2/README.md       |   0
 .../includes/jquery/plugins/select2/bower.json      |   0
 .../includes/jquery/plugins/select2/component.json  |   0
 .../includes/jquery/plugins/select2/composer.json   |   0
 .../includes/jquery/plugins/select2/package.json    |   0
 .../includes/jquery/plugins/select2/release.sh      |   0
 .../jquery/plugins/select2/select2-bootstrap.css    |   0
 .../jquery/plugins/select2/select2-spinner.gif      | Bin
 .../includes/jquery/plugins/select2/select2.css     |   0
 .../jquery/plugins/select2/select2.jquery.json      |   0
 .../includes/jquery/plugins/select2/select2.js      |   0
 .../includes/jquery/plugins/select2/select2.min.js  |   0
 .../includes/jquery/plugins/select2/select2.png     | Bin
 .../jquery/plugins/select2/select2_locale_ar.js     |   0
 .../jquery/plugins/select2/select2_locale_az.js     |   0
 .../jquery/plugins/select2/select2_locale_bg.js     |   0
 .../jquery/plugins/select2/select2_locale_ca.js     |   0
 .../jquery/plugins/select2/select2_locale_cs.js     |   0
 .../jquery/plugins/select2/select2_locale_da.js     |   0
 .../jquery/plugins/select2/select2_locale_de.js     |   0
 .../jquery/plugins/select2/select2_locale_el.js     |   0
 .../plugins/select2/select2_locale_en.js.template   |   0
 .../jquery/plugins/select2/select2_locale_es.js     |   0
 .../jquery/plugins/select2/select2_locale_et.js     |   0
 .../jquery/plugins/select2/select2_locale_eu.js     |   0
 .../jquery/plugins/select2/select2_locale_fa.js     |   0
 .../jquery/plugins/select2/select2_locale_fi.js     |   0
 .../jquery/plugins/select2/select2_locale_fr.js     |   0
 .../jquery/plugins/select2/select2_locale_gl.js     |   0
 .../jquery/plugins/select2/select2_locale_he.js     |   0
 .../jquery/plugins/select2/select2_locale_hr.js     |   0
 .../jquery/plugins/select2/select2_locale_hu.js     |   0
 .../jquery/plugins/select2/select2_locale_id.js     |   0
 .../jquery/plugins/select2/select2_locale_is.js     |   0
 .../jquery/plugins/select2/select2_locale_it.js     |   0
 .../jquery/plugins/select2/select2_locale_ja.js     |   0
 .../jquery/plugins/select2/select2_locale_ka.js     |   0
 .../jquery/plugins/select2/select2_locale_ko.js     |   0
 .../jquery/plugins/select2/select2_locale_lt.js     |   0
 .../jquery/plugins/select2/select2_locale_lv.js     |   0
 .../jquery/plugins/select2/select2_locale_mk.js     |   0
 .../jquery/plugins/select2/select2_locale_ms.js     |   0
 .../jquery/plugins/select2/select2_locale_nb.js     |   0
 .../jquery/plugins/select2/select2_locale_nl.js     |   0
 .../jquery/plugins/select2/select2_locale_pl.js     |   0
 .../jquery/plugins/select2/select2_locale_pt-BR.js  |   0
 .../jquery/plugins/select2/select2_locale_pt-PT.js  |   0
 .../jquery/plugins/select2/select2_locale_ro.js     |   0
 .../jquery/plugins/select2/select2_locale_rs.js     |   0
 .../jquery/plugins/select2/select2_locale_ru.js     |   0
 .../jquery/plugins/select2/select2_locale_sk.js     |   0
 .../jquery/plugins/select2/select2_locale_sv.js     |   0
 .../jquery/plugins/select2/select2_locale_th.js     |   0
 .../jquery/plugins/select2/select2_locale_tr.js     |   0
 .../jquery/plugins/select2/select2_locale_ug-CN.js  |   0
 .../jquery/plugins/select2/select2_locale_uk.js     |   0
 .../jquery/plugins/select2/select2_locale_vi.js     |   0
 .../jquery/plugins/select2/select2_locale_zh-CN.js  |   0
 .../jquery/plugins/select2/select2_locale_zh-TW.js  |   0
 .../includes/jquery/plugins/select2/select2x2.png   | Bin
 .../includes/jquery/plugins/tablednd/README.txt     |   0
 .../jquery/plugins/tablednd/jquery.tablednd.0.6.js  |   0
 .../plugins/tablednd/jquery.tablednd.0.6.min.js     |   0
 .../timepicker/jquery-ui-timepicker-addon.css       |   0
 .../timepicker/jquery-ui-timepicker-addon.js        |   0
 .../includes/jquery/plugins/tiptip/jquery.tipTip.js |   0
 .../jquery/plugins/tiptip/jquery.tipTip.min.js      |   0
 .../includes/jquery/plugins/tiptip/tipTip.css       |   0
 {htdocs => public}/includes/jsgantt/index.htm       |   0
 {htdocs => public}/includes/jsgantt/jsgantt.css     |   0
 {htdocs => public}/includes/jsgantt/jsgantt.js      |   0
 {htdocs => public}/includes/jsgantt/jsgantt.min.js  |   0
 .../includes/jsgantt/jsgantt_Minutes.html           |   0
 .../includes/jsgantt/jsgantt_exExternalXML.html     |   0
 {htdocs => public}/includes/jsgantt/project.xml     |   0
 {htdocs => public}/includes/jstz/jstz.js            |   0
 {htdocs => public}/includes/jstz/jstz.min.js        |   0
 .../includes/mike42/escpos-php/.gitignore           |   0
 .../includes/mike42/escpos-php/Escpos.php           |   0
 .../includes/mike42/escpos-php/LICENSE.md           |   0
 .../includes/mike42/escpos-php/README.md            |   0
 .../includes/mike42/escpos-php/composer.json        |   0
 .../includes/mike42/escpos-php/composer.lock        |   0
 .../includes/mike42/escpos-php/doc/Makefile         |   0
 .../includes/mike42/escpos-php/doc/escpos.conf      |   0
 .../includes/mike42/escpos-php/example/README.md    |   0
 .../includes/mike42/escpos-php/example/barcode.php  |   0
 .../mike42/escpos-php/example/bit-image.php         |   0
 .../example/character-encodings-with-images.php     |   0
 .../escpos-php/example/character-encodings.php      |   0
 .../mike42/escpos-php/example/character-tables.php  |   0
 .../includes/mike42/escpos-php/example/demo.php     |   0
 .../includes/mike42/escpos-php/example/graphics.php |   0
 .../mike42/escpos-php/example/interface/README.md   |   0
 .../escpos-php/example/interface/ethernet.php       |   0
 .../escpos-php/example/interface/linux-usb.php      |   0
 .../mike42/escpos-php/example/interface/smb.php     |   0
 .../escpos-php/example/interface/windows-lpt.php    |   0
 .../escpos-php/example/interface/windows-usb.php    |   0
 .../mike42/escpos-php/example/print-from-html.php   |   0
 .../mike42/escpos-php/example/print-from-pdf.php    |   0
 .../includes/mike42/escpos-php/example/qr-code.php  |   0
 .../mike42/escpos-php/example/receipt-with-logo.php |   0
 .../resources/character-encoding-test-strings.inc   |   0
 .../escpos-php/example/resources/document.odt       | Bin
 .../escpos-php/example/resources/document.pdf       | Bin
 .../mike42/escpos-php/example/resources/document.z  | Bin
 .../example/resources/escpos-php-small.png          | Bin
 .../escpos-php/example/resources/escpos-php.png     | Bin
 .../mike42/escpos-php/example/resources/tux.png     | Bin
 .../example/specific/29-latvian-star-tup592.php     |   0
 .../specific/32-german-tm-t20-ii-custom-command.php |   0
 .../example/specific/33-spanish-seypos-prp-300.php  |   0
 .../example/specific/39-currency-symbols.php        |   0
 .../specific/44-pound-symbol-star-tsp650.php        |   0
 .../escpos-php/example/specific/50-P-822D-greek.php |   0
 .../example/specific/54-gfx-sidebyside.php          |   0
 .../example/specific/6-arabic-epos-tep-220m.php     |   0
 .../mike42/escpos-php/example/specific/README.md    |   0
 .../mike42/escpos-php/example/text-size.php         |   0
 .../escpos-php/src/AbstractCapabilityProfile.php    |   0
 .../includes/mike42/escpos-php/src/CodePage.php     |   0
 .../escpos-php/src/DefaultCapabilityProfile.php     |   0
 .../mike42/escpos-php/src/DummyPrintConnector.php   |   0
 .../escpos-php/src/EposTepCapabilityProfile.php     |   0
 .../includes/mike42/escpos-php/src/EscposImage.php  |   0
 .../mike42/escpos-php/src/EscposPrintBuffer.php     |   0
 .../mike42/escpos-php/src/FilePrintConnector.php    |   0
 .../mike42/escpos-php/src/ImagePrintBuffer.php      |   0
 .../mike42/escpos-php/src/NetworkPrintConnector.php |   0
 .../escpos-php/src/P822DCapabilityProfile.php       |   0
 .../includes/mike42/escpos-php/src/PrintBuffer.php  |   0
 .../mike42/escpos-php/src/PrintConnector.php        |   0
 .../escpos-php/src/SimpleCapabilityProfile.php      |   0
 .../mike42/escpos-php/src/StarCapabilityProfile.php |   0
 .../mike42/escpos-php/src/WindowsPrintConnector.php |   0
 .../Characters-DefaultCapabilityProfile.ser.gz      | Bin
 .../cache/Characters-SimpleCapabilityProfile.ser.gz | Bin
 .../cache/Characters-StarCapabilityProfile.ser.gz   | Bin
 .../includes/mike42/escpos-php/test/bootstrap.php   |   0
 .../escpos-php/test/integration/ExampleTest.php     |   0
 .../test/integration/resources/output/barcode.bin   | Bin
 .../test/integration/resources/output/bit-image.bin | Bin
 .../resources/output/character-encodings.bin        | Bin
 .../resources/output/character-tables.bin           | Bin
 .../test/integration/resources/output/demo.bin      | Bin
 .../test/integration/resources/output/graphics.bin  | Bin
 .../test/integration/resources/output/interface.bin |   0
 .../resources/output/print-from-pdf.bin.z           | Bin
 .../test/integration/resources/output/qr-code.bin   | Bin
 .../resources/output/receipt-with-logo.bin          | Bin
 .../test/integration/resources/output/text-size.bin | Bin
 .../includes/mike42/escpos-php/test/phpunit.xml     |   0
 .../test/unit/AbstractCapabilityProfileTest.php     |   0
 .../mike42/escpos-php/test/unit/EscposImageTest.php |   0
 .../escpos-php/test/unit/EscposPrintBufferTest.php  |   0
 .../mike42/escpos-php/test/unit/EscposTest.php      |   0
 .../test/unit/WindowsPrintConnectorTest.php         |   0
 .../test/unit/resources/black_transparent.gif       | Bin
 .../test/unit/resources/black_transparent.png       | Bin
 .../escpos-php/test/unit/resources/black_white.bmp  | Bin
 .../escpos-php/test/unit/resources/black_white.gif  | Bin
 .../escpos-php/test/unit/resources/black_white.jpg  | Bin
 .../escpos-php/test/unit/resources/black_white.png  | Bin
 .../escpos-php/test/unit/resources/canvas_black.bmp | Bin
 .../escpos-php/test/unit/resources/canvas_black.gif | Bin
 .../escpos-php/test/unit/resources/canvas_black.jpg | Bin
 .../escpos-php/test/unit/resources/canvas_black.png | Bin
 .../escpos-php/test/unit/resources/canvas_white.bmp | Bin
 .../escpos-php/test/unit/resources/canvas_white.gif | Bin
 .../escpos-php/test/unit/resources/canvas_white.jpg | Bin
 .../escpos-php/test/unit/resources/canvas_white.png | Bin
 .../mike42/escpos-php/test/unit/resources/demo.php  |   0
 .../mike42/escpos-php/test/unit/resources/doc.pdf   | Bin
 .../mobiledetect/mobiledetectlib/.gitignore         |   0
 .../includes/mobiledetect/mobiledetectlib/.php_cs   |   0
 .../mobiledetect/mobiledetectlib/.travis.yml        |   0
 .../mobiledetect/mobiledetectlib/LICENSE.txt        |   0
 .../mobiledetect/mobiledetectlib/Mobile_Detect.json |   0
 .../mobiledetect/mobiledetectlib/Mobile_Detect.php  |   0
 .../includes/mobiledetect/mobiledetectlib/README.md |   0
 .../mobiledetect/mobiledetectlib/composer.json      |   0
 .../mobiledetect/mobiledetectlib/examples/demo.php  |   0
 .../mobiledetectlib/examples/session_example.php    |   0
 .../mobiledetect/mobiledetectlib/examples/test.php  |   0
 .../mobiledetectlib/export/exportToJSON.php         |   0
 .../namespaced/Detection/MobileDetect.php           |   0
 .../mobiledetectlib/tests/BasicsTest.php            |   0
 .../mobiledetectlib/tests/UA_List.inc.php           |   0
 .../mobiledetectlib/tests/UA_List.pending.txt       |   0
 .../mobiledetectlib/tests/UserAgentTest.php         |   0
 .../mobiledetectlib/tests/VendorsTest_tmp.php       |   0
 .../mobiledetectlib/tests/bootstrap.php             |   0
 .../mobiledetect/mobiledetectlib/tests/phpunit.xml  |   0
 .../tests/providers/vendors/Acer.php                |   0
 .../tests/providers/vendors/Alcatel.php             |   0
 .../tests/providers/vendors/Allview.php             |   0
 .../tests/providers/vendors/Amazon.php              |   0
 .../tests/providers/vendors/Apple.php               |   0
 .../tests/providers/vendors/Archos.php              |   0
 .../tests/providers/vendors/Asus.php                |   0
 .../tests/providers/vendors/Blackberry.php          |   0
 .../tests/providers/vendors/Dell.php                |   0
 .../tests/providers/vendors/Google.php              |   0
 .../mobiledetectlib/tests/providers/vendors/HP.php  |   0
 .../mobiledetectlib/tests/providers/vendors/HTC.php |   0
 .../tests/providers/vendors/Huawei.php              |   0
 .../mobiledetectlib/tests/providers/vendors/LG.php  |   0
 .../tests/providers/vendors/Lava.php                |   0
 .../tests/providers/vendors/Leader.php              |   0
 .../tests/providers/vendors/Lenovo.php              |   0
 .../mobiledetectlib/tests/providers/vendors/Mi.php  |   0
 .../tests/providers/vendors/Microsoft.php           |   0
 .../tests/providers/vendors/Motorola.php            |   0
 .../tests/providers/vendors/Nokia.php               |   0
 .../tests/providers/vendors/Onda.php                |   0
 .../tests/providers/vendors/Others.php              |   0
 .../tests/providers/vendors/Prestigio.php           |   0
 .../tests/providers/vendors/Samsung.php             |   0
 .../tests/providers/vendors/Sony.php                |   0
 .../tests/providers/vendors/SpecialCases.php        |   0
 .../tests/providers/vendors/Vodafone.php            |   0
 .../mobiledetectlib/tests/providers/vendors/ZTE.php |   0
 .../mobiledetect/mobiledetectlib/tests/ualist.json  |   0
 .../includes/nusoap/lib/Mail/mime.php               |   0
 .../includes/nusoap/lib/Mail/mimePart.php           |   0
 {htdocs => public}/includes/nusoap/lib/changelog    |   0
 .../includes/nusoap/lib/class.nusoap_base.php       |   0
 .../includes/nusoap/lib/class.soap_fault.php        |   0
 .../includes/nusoap/lib/class.soap_parser.php       |   0
 .../includes/nusoap/lib/class.soap_server.php       |   0
 .../nusoap/lib/class.soap_transport_http.php        |   0
 .../includes/nusoap/lib/class.soap_val.php          |   0
 .../includes/nusoap/lib/class.soapclient.php        |   0
 .../includes/nusoap/lib/class.wsdl.php              |   0
 .../includes/nusoap/lib/class.wsdlcache.php         |   0
 .../includes/nusoap/lib/class.xmlschema.php         |   0
 {htdocs => public}/includes/nusoap/lib/nusoap.php   |   0
 .../includes/nusoap/lib/nusoapmime.php              |   0
 {htdocs => public}/includes/odtphp/Segment.php      |   0
 .../includes/odtphp/SegmentIterator.php             |   0
 {htdocs => public}/includes/odtphp/odf.php          |   0
 .../includes/odtphp/zip/PclZipProxy.php             |   0
 .../includes/odtphp/zip/PhpZipProxy.php             |   0
 .../includes/odtphp/zip/ZipInterface.php            |   0
 .../includes/odtphp/zip/pclzip/gnu-lgpl.txt         |   0
 .../includes/odtphp/zip/pclzip/pclzip.lib.php       |   0
 .../includes/odtphp/zip/pclzip/readme.txt           |   0
 {htdocs => public}/includes/php-iban/.gitignore     |   0
 {htdocs => public}/includes/php-iban/LICENSE        |   0
 .../includes/php-iban/mistranscriptions.txt         |   0
 {htdocs => public}/includes/php-iban/oophp-iban.php |   0
 {htdocs => public}/includes/php-iban/php-iban.php   |   0
 {htdocs => public}/includes/php-iban/registry.txt   |   0
 .../includes/phpoffice/phpexcel/.gitattributes      |   0
 .../includes/phpoffice/phpexcel/.gitignore          |   0
 .../includes/phpoffice/phpexcel/.travis.yml         |   0
 .../phpoffice/phpexcel/Classes/PHPExcel.php         |   0
 .../phpexcel/Classes/PHPExcel/Autoloader.php        |   0
 .../Classes/PHPExcel/CachedObjectStorage/APC.php    |   0
 .../PHPExcel/CachedObjectStorage/CacheBase.php      |   0
 .../PHPExcel/CachedObjectStorage/DiscISAM.php       |   0
 .../Classes/PHPExcel/CachedObjectStorage/ICache.php |   0
 .../PHPExcel/CachedObjectStorage/Igbinary.php       |   0
 .../PHPExcel/CachedObjectStorage/Memcache.php       |   0
 .../Classes/PHPExcel/CachedObjectStorage/Memory.php |   0
 .../PHPExcel/CachedObjectStorage/MemoryGZip.php     |   0
 .../CachedObjectStorage/MemorySerialized.php        |   0
 .../PHPExcel/CachedObjectStorage/PHPTemp.php        |   0
 .../Classes/PHPExcel/CachedObjectStorage/SQLite.php |   0
 .../PHPExcel/CachedObjectStorage/SQLite3.php        |   0
 .../PHPExcel/CachedObjectStorage/Wincache.php       |   0
 .../Classes/PHPExcel/CachedObjectStorageFactory.php |   0
 .../PHPExcel/CalcEngine/CyclicReferenceStack.php    |   0
 .../phpexcel/Classes/PHPExcel/CalcEngine/Logger.php |   0
 .../phpexcel/Classes/PHPExcel/Calculation.php       |   0
 .../Classes/PHPExcel/Calculation/Database.php       |   0
 .../Classes/PHPExcel/Calculation/DateTime.php       |   0
 .../Classes/PHPExcel/Calculation/Engineering.php    |   0
 .../Classes/PHPExcel/Calculation/Exception.php      |   0
 .../PHPExcel/Calculation/ExceptionHandler.php       |   0
 .../Classes/PHPExcel/Calculation/Financial.php      |   0
 .../Classes/PHPExcel/Calculation/FormulaParser.php  |   0
 .../Classes/PHPExcel/Calculation/FormulaToken.php   |   0
 .../Classes/PHPExcel/Calculation/Function.php       |   0
 .../Classes/PHPExcel/Calculation/Functions.php      |   0
 .../Classes/PHPExcel/Calculation/Logical.php        |   0
 .../Classes/PHPExcel/Calculation/LookupRef.php      |   0
 .../Classes/PHPExcel/Calculation/MathTrig.php       |   0
 .../Classes/PHPExcel/Calculation/Statistical.php    |   0
 .../Classes/PHPExcel/Calculation/TextData.php       |   0
 .../Classes/PHPExcel/Calculation/Token/Stack.php    |   0
 .../Classes/PHPExcel/Calculation/functionlist.txt   |   0
 .../phpoffice/phpexcel/Classes/PHPExcel/Cell.php    |   0
 .../Classes/PHPExcel/Cell/AdvancedValueBinder.php   |   0
 .../phpexcel/Classes/PHPExcel/Cell/DataType.php     |   0
 .../Classes/PHPExcel/Cell/DataValidation.php        |   0
 .../Classes/PHPExcel/Cell/DefaultValueBinder.php    |   0
 .../phpexcel/Classes/PHPExcel/Cell/Hyperlink.php    |   0
 .../phpexcel/Classes/PHPExcel/Cell/IValueBinder.php |   0
 .../phpoffice/phpexcel/Classes/PHPExcel/Chart.php   |   0
 .../phpexcel/Classes/PHPExcel/Chart/Axis.php        |   0
 .../phpexcel/Classes/PHPExcel/Chart/DataSeries.php  |   0
 .../Classes/PHPExcel/Chart/DataSeriesValues.php     |   0
 .../phpexcel/Classes/PHPExcel/Chart/Exception.php   |   0
 .../phpexcel/Classes/PHPExcel/Chart/GridLines.php   |   0
 .../phpexcel/Classes/PHPExcel/Chart/Layout.php      |   0
 .../phpexcel/Classes/PHPExcel/Chart/Legend.php      |   0
 .../phpexcel/Classes/PHPExcel/Chart/PlotArea.php    |   0
 .../phpexcel/Classes/PHPExcel/Chart/Properties.php  |   0
 .../Chart/Renderer/PHP Charting Libraries.txt       |   0
 .../Classes/PHPExcel/Chart/Renderer/jpgraph.php     |   0
 .../phpexcel/Classes/PHPExcel/Chart/Title.php       |   0
 .../phpoffice/phpexcel/Classes/PHPExcel/Comment.php |   0
 .../Classes/PHPExcel/DocumentProperties.php         |   0
 .../phpexcel/Classes/PHPExcel/DocumentSecurity.php  |   0
 .../phpexcel/Classes/PHPExcel/Exception.php         |   0
 .../phpexcel/Classes/PHPExcel/HashTable.php         |   0
 .../phpexcel/Classes/PHPExcel/Helper/HTML.php       |   0
 .../phpexcel/Classes/PHPExcel/IComparable.php       |   0
 .../phpexcel/Classes/PHPExcel/IOFactory.php         |   0
 .../phpexcel/Classes/PHPExcel/NamedRange.php        |   0
 .../phpexcel/Classes/PHPExcel/Reader/Abstract.php   |   0
 .../phpexcel/Classes/PHPExcel/Reader/CSV.php        |   0
 .../Classes/PHPExcel/Reader/DefaultReadFilter.php   |   0
 .../Classes/PHPExcel/Reader/Excel2003XML.php        |   0
 .../phpexcel/Classes/PHPExcel/Reader/Excel2007.php  |   0
 .../Classes/PHPExcel/Reader/Excel2007/Chart.php     |   0
 .../Classes/PHPExcel/Reader/Excel2007/Theme.php     |   0
 .../phpexcel/Classes/PHPExcel/Reader/Excel5.php     |   0
 .../Classes/PHPExcel/Reader/Excel5/Escher.php       |   0
 .../phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php |   0
 .../phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php |   0
 .../phpexcel/Classes/PHPExcel/Reader/Exception.php  |   0
 .../phpexcel/Classes/PHPExcel/Reader/Gnumeric.php   |   0
 .../phpexcel/Classes/PHPExcel/Reader/HTML.php       |   0
 .../Classes/PHPExcel/Reader/IReadFilter.php         |   0
 .../phpexcel/Classes/PHPExcel/Reader/IReader.php    |   0
 .../phpexcel/Classes/PHPExcel/Reader/OOCalc.php     |   0
 .../phpexcel/Classes/PHPExcel/Reader/SYLK.php       |   0
 .../phpexcel/Classes/PHPExcel/ReferenceHelper.php   |   0
 .../phpexcel/Classes/PHPExcel/RichText.php          |   0
 .../Classes/PHPExcel/RichText/ITextElement.php      |   0
 .../phpexcel/Classes/PHPExcel/RichText/Run.php      |   0
 .../Classes/PHPExcel/RichText/TextElement.php       |   0
 .../phpexcel/Classes/PHPExcel/Settings.php          |   0
 .../phpexcel/Classes/PHPExcel/Shared/CodePage.php   |   0
 .../phpexcel/Classes/PHPExcel/Shared/Date.php       |   0
 .../phpexcel/Classes/PHPExcel/Shared/Drawing.php    |   0
 .../phpexcel/Classes/PHPExcel/Shared/Escher.php     |   0
 .../Classes/PHPExcel/Shared/Escher/DgContainer.php  |   0
 .../Shared/Escher/DgContainer/SpgrContainer.php     |   0
 .../DgContainer/SpgrContainer/SpContainer.php       |   0
 .../Classes/PHPExcel/Shared/Escher/DggContainer.php |   0
 .../Shared/Escher/DggContainer/BstoreContainer.php  |   0
 .../Escher/DggContainer/BstoreContainer/BSE.php     |   0
 .../DggContainer/BstoreContainer/BSE/Blip.php       |   0
 .../phpexcel/Classes/PHPExcel/Shared/Excel5.php     |   0
 .../phpexcel/Classes/PHPExcel/Shared/File.php       |   0
 .../phpexcel/Classes/PHPExcel/Shared/Font.php       |   0
 .../Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT      |   0
 .../PHPExcel/Shared/JAMA/CholeskyDecomposition.php  |   0
 .../Shared/JAMA/EigenvalueDecomposition.php         |   0
 .../PHPExcel/Shared/JAMA/LUDecomposition.php        |   0
 .../Classes/PHPExcel/Shared/JAMA/Matrix.php         |   0
 .../PHPExcel/Shared/JAMA/QRDecomposition.php        |   0
 .../Shared/JAMA/SingularValueDecomposition.php      |   0
 .../Classes/PHPExcel/Shared/JAMA/utils/Error.php    |   0
 .../Classes/PHPExcel/Shared/JAMA/utils/Maths.php    |   0
 .../phpexcel/Classes/PHPExcel/Shared/OLE.php        |   0
 .../PHPExcel/Shared/OLE/ChainedBlockStream.php      |   0
 .../phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php    |   0
 .../Classes/PHPExcel/Shared/OLE/PPS/File.php        |   0
 .../Classes/PHPExcel/Shared/OLE/PPS/Root.php        |   0
 .../phpexcel/Classes/PHPExcel/Shared/OLERead.php    |   0
 .../Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt     |   0
 .../Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php   |   0
 .../Classes/PHPExcel/Shared/PCLZip/readme.txt       |   0
 .../Classes/PHPExcel/Shared/PasswordHasher.php      |   0
 .../phpexcel/Classes/PHPExcel/Shared/String.php     |   0
 .../phpexcel/Classes/PHPExcel/Shared/TimeZone.php   |   0
 .../phpexcel/Classes/PHPExcel/Shared/XMLWriter.php  |   0
 .../phpexcel/Classes/PHPExcel/Shared/ZipArchive.php |   0
 .../Classes/PHPExcel/Shared/ZipStreamWrapper.php    |   0
 .../Classes/PHPExcel/Shared/trend/bestFitClass.php  |   0
 .../Shared/trend/exponentialBestFitClass.php        |   0
 .../PHPExcel/Shared/trend/linearBestFitClass.php    |   0
 .../Shared/trend/logarithmicBestFitClass.php        |   0
 .../Shared/trend/polynomialBestFitClass.php         |   0
 .../PHPExcel/Shared/trend/powerBestFitClass.php     |   0
 .../Classes/PHPExcel/Shared/trend/trendClass.php    |   0
 .../phpoffice/phpexcel/Classes/PHPExcel/Style.php   |   0
 .../phpexcel/Classes/PHPExcel/Style/Alignment.php   |   0
 .../phpexcel/Classes/PHPExcel/Style/Border.php      |   0
 .../phpexcel/Classes/PHPExcel/Style/Borders.php     |   0
 .../phpexcel/Classes/PHPExcel/Style/Color.php       |   0
 .../phpexcel/Classes/PHPExcel/Style/Conditional.php |   0
 .../phpexcel/Classes/PHPExcel/Style/Fill.php        |   0
 .../phpexcel/Classes/PHPExcel/Style/Font.php        |   0
 .../Classes/PHPExcel/Style/NumberFormat.php         |   0
 .../phpexcel/Classes/PHPExcel/Style/Protection.php  |   0
 .../phpexcel/Classes/PHPExcel/Style/Supervisor.php  |   0
 .../phpexcel/Classes/PHPExcel/Worksheet.php         |   0
 .../Classes/PHPExcel/Worksheet/AutoFilter.php       |   0
 .../PHPExcel/Worksheet/AutoFilter/Column.php        |   0
 .../PHPExcel/Worksheet/AutoFilter/Column/Rule.php   |   0
 .../Classes/PHPExcel/Worksheet/BaseDrawing.php      |   0
 .../Classes/PHPExcel/Worksheet/CellIterator.php     |   0
 .../phpexcel/Classes/PHPExcel/Worksheet/Column.php  |   0
 .../PHPExcel/Worksheet/ColumnCellIterator.php       |   0
 .../Classes/PHPExcel/Worksheet/ColumnDimension.php  |   0
 .../Classes/PHPExcel/Worksheet/ColumnIterator.php   |   0
 .../phpexcel/Classes/PHPExcel/Worksheet/Drawing.php |   0
 .../Classes/PHPExcel/Worksheet/Drawing/Shadow.php   |   0
 .../Classes/PHPExcel/Worksheet/HeaderFooter.php     |   0
 .../PHPExcel/Worksheet/HeaderFooterDrawing.php      |   0
 .../Classes/PHPExcel/Worksheet/MemoryDrawing.php    |   0
 .../Classes/PHPExcel/Worksheet/PageMargins.php      |   0
 .../Classes/PHPExcel/Worksheet/PageSetup.php        |   0
 .../Classes/PHPExcel/Worksheet/Protection.php       |   0
 .../phpexcel/Classes/PHPExcel/Worksheet/Row.php     |   0
 .../Classes/PHPExcel/Worksheet/RowCellIterator.php  |   0
 .../Classes/PHPExcel/Worksheet/RowDimension.php     |   0
 .../Classes/PHPExcel/Worksheet/RowIterator.php      |   0
 .../Classes/PHPExcel/Worksheet/SheetView.php        |   0
 .../phpexcel/Classes/PHPExcel/WorksheetIterator.php |   0
 .../phpexcel/Classes/PHPExcel/Writer/Abstract.php   |   0
 .../phpexcel/Classes/PHPExcel/Writer/CSV.php        |   0
 .../phpexcel/Classes/PHPExcel/Writer/Excel2007.php  |   0
 .../Classes/PHPExcel/Writer/Excel2007/Chart.php     |   0
 .../Classes/PHPExcel/Writer/Excel2007/Comments.php  |   0
 .../PHPExcel/Writer/Excel2007/ContentTypes.php      |   0
 .../Classes/PHPExcel/Writer/Excel2007/DocProps.php  |   0
 .../Classes/PHPExcel/Writer/Excel2007/Drawing.php   |   0
 .../Classes/PHPExcel/Writer/Excel2007/Rels.php      |   0
 .../PHPExcel/Writer/Excel2007/RelsRibbon.php        |   0
 .../Classes/PHPExcel/Writer/Excel2007/RelsVBA.php   |   0
 .../PHPExcel/Writer/Excel2007/StringTable.php       |   0
 .../Classes/PHPExcel/Writer/Excel2007/Style.php     |   0
 .../Classes/PHPExcel/Writer/Excel2007/Theme.php     |   0
 .../Classes/PHPExcel/Writer/Excel2007/Workbook.php  |   0
 .../Classes/PHPExcel/Writer/Excel2007/Worksheet.php |   0
 .../PHPExcel/Writer/Excel2007/WriterPart.php        |   0
 .../phpexcel/Classes/PHPExcel/Writer/Excel5.php     |   0
 .../Classes/PHPExcel/Writer/Excel5/BIFFwriter.php   |   0
 .../Classes/PHPExcel/Writer/Excel5/Escher.php       |   0
 .../Classes/PHPExcel/Writer/Excel5/Font.php         |   0
 .../Classes/PHPExcel/Writer/Excel5/Parser.php       |   0
 .../Classes/PHPExcel/Writer/Excel5/Workbook.php     |   0
 .../Classes/PHPExcel/Writer/Excel5/Worksheet.php    |   0
 .../phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php  |   0
 .../phpexcel/Classes/PHPExcel/Writer/Exception.php  |   0
 .../phpexcel/Classes/PHPExcel/Writer/HTML.php       |   0
 .../phpexcel/Classes/PHPExcel/Writer/IWriter.php    |   0
 .../Classes/PHPExcel/Writer/OpenDocument.php        |   0
 .../PHPExcel/Writer/OpenDocument/Cell/Comment.php   |   0
 .../PHPExcel/Writer/OpenDocument/Content.php        |   0
 .../Classes/PHPExcel/Writer/OpenDocument/Meta.php   |   0
 .../PHPExcel/Writer/OpenDocument/MetaInf.php        |   0
 .../PHPExcel/Writer/OpenDocument/Mimetype.php       |   0
 .../PHPExcel/Writer/OpenDocument/Settings.php       |   0
 .../Classes/PHPExcel/Writer/OpenDocument/Styles.php |   0
 .../PHPExcel/Writer/OpenDocument/Thumbnails.php     |   0
 .../PHPExcel/Writer/OpenDocument/WriterPart.php     |   0
 .../phpexcel/Classes/PHPExcel/Writer/PDF.php        |   0
 .../phpexcel/Classes/PHPExcel/Writer/PDF/Core.php   |   0
 .../phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php |   0
 .../phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php   |   0
 .../phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php  |   0
 .../phpexcel/Classes/PHPExcel/locale/bg/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/cs/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/cs/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/da/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/da/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/de/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/de/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/en/uk/config   |   0
 .../phpexcel/Classes/PHPExcel/locale/es/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/es/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/fi/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/fi/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/fr/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/fr/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/hu/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/hu/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/it/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/it/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/nl/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/nl/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/no/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/no/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/pl/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/pl/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/pt/br/config   |   0
 .../Classes/PHPExcel/locale/pt/br/functions         |   0
 .../phpexcel/Classes/PHPExcel/locale/pt/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/pt/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/ru/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/ru/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/sv/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/sv/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/tr/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/tr/functions   |   0
 .../includes/phpoffice/phpexcel/changelog.txt       |   0
 .../includes/phpoffice/phpexcel/composer.json       |   0
 .../includes/phpoffice/phpexcel/install.txt         |   0
 .../includes/phpoffice/phpexcel/license.md          |   0
 {htdocs => public}/includes/printipp/BasicIPP.php   |   0
 .../includes/printipp/CupsPrintIPP.php              |   0
 .../includes/printipp/ExtendedPrintIPP.php          |   0
 {htdocs => public}/includes/printipp/PrintIPP.php   |   0
 {htdocs => public}/includes/printipp/http_class.php |   0
 .../restler/framework/Luracast/Restler/ApcCache.php |   0
 .../framework/Luracast/Restler/AutoLoader.php       |   0
 .../framework/Luracast/Restler/CommentParser.php    |   0
 .../restler/framework/Luracast/Restler/Compose.php  |   0
 .../Luracast/Restler/Data/ApiMethodInfo.php         |   0
 .../restler/framework/Luracast/Restler/Data/Arr.php |   0
 .../framework/Luracast/Restler/Data/Invalid.php     |   0
 .../framework/Luracast/Restler/Data/Object.php      |   0
 .../framework/Luracast/Restler/Data/Text.php        |   0
 .../Luracast/Restler/Data/ValidationInfo.php        |   0
 .../framework/Luracast/Restler/Data/Validator.php   |   0
 .../framework/Luracast/Restler/Data/ValueObject.php |   0
 .../framework/Luracast/Restler/Data/iValidate.php   |   0
 .../Luracast/Restler/Data/iValueObject.php          |   0
 .../restler/framework/Luracast/Restler/Defaults.php |   0
 .../framework/Luracast/Restler/EventDispatcher.php  |   0
 .../restler/framework/Luracast/Restler/Explorer.php |   0
 .../framework/Luracast/Restler/ExplorerInfo.php     |   0
 .../framework/Luracast/Restler/Filter/RateLimit.php |   0
 .../restler/framework/Luracast/Restler/Flash.php    |   0
 .../framework/Luracast/Restler/Format/AmfFormat.php |   0
 .../framework/Luracast/Restler/Format/CsvFormat.php |   0
 .../Luracast/Restler/Format/DependentFormat.php     |   0
 .../Restler/Format/DependentMultiFormat.php         |   0
 .../framework/Luracast/Restler/Format/Format.php    |   0
 .../Luracast/Restler/Format/HtmlFormat.php          |   0
 .../framework/Luracast/Restler/Format/JsFormat.php  |   0
 .../Luracast/Restler/Format/JsonFormat.php          |   0
 .../Luracast/Restler/Format/MultiFormat.php         |   0
 .../Luracast/Restler/Format/PlistFormat.php         |   0
 .../framework/Luracast/Restler/Format/TsvFormat.php |   0
 .../Luracast/Restler/Format/UploadFormat.php        |   0
 .../Luracast/Restler/Format/UrlEncodedFormat.php    |   0
 .../framework/Luracast/Restler/Format/XmlFormat.php |   0
 .../Luracast/Restler/Format/YamlFormat.php          |   0
 .../Luracast/Restler/Format/iDecodeStream.php       |   0
 .../framework/Luracast/Restler/Format/iFormat.php   |   0
 .../Luracast/Restler/HumanReadableCache.php         |   0
 .../Luracast/Restler/InvalidAuthCredentials.php     |   0
 .../framework/Luracast/Restler/MemcacheCache.php    |   0
 .../framework/Luracast/Restler/PassThrough.php      |   0
 .../restler/framework/Luracast/Restler/README.md    |   0
 .../restler/framework/Luracast/Restler/Redirect.php |   0
 .../framework/Luracast/Restler/Resources.php        |   0
 .../framework/Luracast/Restler/RestException.php    |   0
 .../restler/framework/Luracast/Restler/Restler.php  |   0
 .../restler/framework/Luracast/Restler/Routes.php   |   0
 .../restler/framework/Luracast/Restler/Scope.php    |   0
 .../restler/framework/Luracast/Restler/UI/Emmet.php |   0
 .../framework/Luracast/Restler/UI/FormStyles.php    |   0
 .../restler/framework/Luracast/Restler/UI/Forms.php |   0
 .../restler/framework/Luracast/Restler/UI/Nav.php   |   0
 .../restler/framework/Luracast/Restler/UI/Tags.php  |   0
 .../restler/framework/Luracast/Restler/User.php     |   0
 .../restler/framework/Luracast/Restler/Util.php     |   0
 .../Restler/compatibility/iAuthenticate.php         |   0
 .../Luracast/Restler/compatibility/restler1.php     |   0
 .../Luracast/Restler/compatibility/restler2.php     |   0
 .../framework/Luracast/Restler/composer.json        |   0
 .../Luracast/Restler/explorer/css/reset.css         |   0
 .../Luracast/Restler/explorer/css/screen.css        |   0
 .../Restler/explorer/images/explorer_icons.png      | Bin
 .../Luracast/Restler/explorer/images/logo_small.png | Bin
 .../Luracast/Restler/explorer/images/throbber.gif   | Bin
 .../framework/Luracast/Restler/explorer/index.html  |   0
 .../Luracast/Restler/explorer/lib/backbone-min.js   |   0
 .../Restler/explorer/lib/handlebars-1.0.0.js        |   0
 .../Restler/explorer/lib/highlight.7.3.pack.js      |   0
 .../Restler/explorer/lib/jquery-1.8.0.min.js        |   0
 .../Restler/explorer/lib/jquery.ba-bbq.min.js       |   0
 .../Restler/explorer/lib/jquery.slideto.min.js      |   0
 .../Restler/explorer/lib/jquery.wiggle.min.js       |   0
 .../Luracast/Restler/explorer/lib/shred.bundle.js   |   0
 .../Luracast/Restler/explorer/lib/shred/content.js  |   0
 .../Luracast/Restler/explorer/lib/swagger-oauth.js  |   0
 .../Luracast/Restler/explorer/lib/swagger.js        |   0
 .../Luracast/Restler/explorer/lib/underscore-min.js |   0
 .../framework/Luracast/Restler/explorer/o2c.html    |   0
 .../Luracast/Restler/explorer/swagger-ui.js         |   0
 .../Luracast/Restler/explorer/swagger-ui.min.js     |   0
 .../framework/Luracast/Restler/iAuthenticate.php    |   0
 .../restler/framework/Luracast/Restler/iCache.php   |   0
 .../restler/framework/Luracast/Restler/iCompose.php |   0
 .../restler/framework/Luracast/Restler/iFilter.php  |   0
 .../framework/Luracast/Restler/iIdentifyUser.php    |   0
 .../Luracast/Restler/iProvideMultiVersionApi.php    |   0
 .../Luracast/Restler/iUseAuthentication.php         |   0
 .../framework/Luracast/Restler/views/debug.css      |   0
 .../framework/Luracast/Restler/views/debug.php      |   0
 .../includes/swiftmailer/lib/classes/Swift.php      |   0
 .../swiftmailer/lib/classes/Swift/Attachment.php    |   0
 .../ByteStream/AbstractFilterableInputStream.php    |   0
 .../classes/Swift/ByteStream/ArrayByteStream.php    |   0
 .../lib/classes/Swift/ByteStream/FileByteStream.php |   0
 .../Swift/ByteStream/TemporaryFileByteStream.php    |   0
 .../lib/classes/Swift/CharacterReader.php           |   0
 .../CharacterReader/GenericFixedWidthReader.php     |   0
 .../classes/Swift/CharacterReader/UsAsciiReader.php |   0
 .../classes/Swift/CharacterReader/Utf8Reader.php    |   0
 .../lib/classes/Swift/CharacterReaderFactory.php    |   0
 .../SimpleCharacterReaderFactory.php                |   0
 .../lib/classes/Swift/CharacterStream.php           |   0
 .../Swift/CharacterStream/ArrayCharacterStream.php  |   0
 .../Swift/CharacterStream/NgCharacterStream.php     |   0
 .../lib/classes/Swift/ConfigurableSpool.php         |   0
 .../lib/classes/Swift/DependencyContainer.php       |   0
 .../lib/classes/Swift/DependencyException.php       |   0
 .../swiftmailer/lib/classes/Swift/EmbeddedFile.php  |   0
 .../swiftmailer/lib/classes/Swift/Encoder.php       |   0
 .../lib/classes/Swift/Encoder/Base64Encoder.php     |   0
 .../lib/classes/Swift/Encoder/QpEncoder.php         |   0
 .../lib/classes/Swift/Encoder/Rfc2231Encoder.php    |   0
 .../swiftmailer/lib/classes/Swift/Encoding.php      |   0
 .../lib/classes/Swift/Events/CommandEvent.php       |   0
 .../lib/classes/Swift/Events/CommandListener.php    |   0
 .../swiftmailer/lib/classes/Swift/Events/Event.php  |   0
 .../lib/classes/Swift/Events/EventDispatcher.php    |   0
 .../lib/classes/Swift/Events/EventListener.php      |   0
 .../lib/classes/Swift/Events/EventObject.php        |   0
 .../lib/classes/Swift/Events/ResponseEvent.php      |   0
 .../lib/classes/Swift/Events/ResponseListener.php   |   0
 .../lib/classes/Swift/Events/SendEvent.php          |   0
 .../lib/classes/Swift/Events/SendListener.php       |   0
 .../classes/Swift/Events/SimpleEventDispatcher.php  |   0
 .../classes/Swift/Events/TransportChangeEvent.php   |   0
 .../Swift/Events/TransportChangeListener.php        |   0
 .../Swift/Events/TransportExceptionEvent.php        |   0
 .../Swift/Events/TransportExceptionListener.php     |   0
 .../lib/classes/Swift/FailoverTransport.php         |   0
 .../swiftmailer/lib/classes/Swift/FileSpool.php     |   0
 .../swiftmailer/lib/classes/Swift/FileStream.php    |   0
 .../swiftmailer/lib/classes/Swift/Filterable.php    |   0
 .../swiftmailer/lib/classes/Swift/Image.php         |   0
 .../lib/classes/Swift/InputByteStream.php           |   0
 .../swiftmailer/lib/classes/Swift/IoException.php   |   0
 .../swiftmailer/lib/classes/Swift/KeyCache.php      |   0
 .../lib/classes/Swift/KeyCache/ArrayKeyCache.php    |   0
 .../lib/classes/Swift/KeyCache/DiskKeyCache.php     |   0
 .../classes/Swift/KeyCache/KeyCacheInputStream.php  |   0
 .../lib/classes/Swift/KeyCache/NullKeyCache.php     |   0
 .../Swift/KeyCache/SimpleKeyCacheInputStream.php    |   0
 .../lib/classes/Swift/LoadBalancedTransport.php     |   0
 .../swiftmailer/lib/classes/Swift/MailTransport.php |   0
 .../swiftmailer/lib/classes/Swift/Mailer.php        |   0
 .../classes/Swift/Mailer/ArrayRecipientIterator.php |   0
 .../lib/classes/Swift/Mailer/RecipientIterator.php  |   0
 .../swiftmailer/lib/classes/Swift/MemorySpool.php   |   0
 .../swiftmailer/lib/classes/Swift/Message.php       |   0
 .../lib/classes/Swift/Mime/Attachment.php           |   0
 .../lib/classes/Swift/Mime/CharsetObserver.php      |   0
 .../lib/classes/Swift/Mime/ContentEncoder.php       |   0
 .../Mime/ContentEncoder/Base64ContentEncoder.php    |   0
 .../Mime/ContentEncoder/NativeQpContentEncoder.php  |   0
 .../Mime/ContentEncoder/PlainContentEncoder.php     |   0
 .../Swift/Mime/ContentEncoder/QpContentEncoder.php  |   0
 .../Mime/ContentEncoder/QpContentEncoderProxy.php   |   0
 .../Swift/Mime/ContentEncoder/RawContentEncoder.php |   0
 .../lib/classes/Swift/Mime/EmbeddedFile.php         |   0
 .../lib/classes/Swift/Mime/EncodingObserver.php     |   0
 .../swiftmailer/lib/classes/Swift/Mime/Grammar.php  |   0
 .../swiftmailer/lib/classes/Swift/Mime/Header.php   |   0
 .../lib/classes/Swift/Mime/HeaderEncoder.php        |   0
 .../Mime/HeaderEncoder/Base64HeaderEncoder.php      |   0
 .../Swift/Mime/HeaderEncoder/QpHeaderEncoder.php    |   0
 .../lib/classes/Swift/Mime/HeaderFactory.php        |   0
 .../lib/classes/Swift/Mime/HeaderSet.php            |   0
 .../classes/Swift/Mime/Headers/AbstractHeader.php   |   0
 .../lib/classes/Swift/Mime/Headers/DateHeader.php   |   0
 .../Swift/Mime/Headers/IdentificationHeader.php     |   0
 .../classes/Swift/Mime/Headers/MailboxHeader.php    |   0
 .../classes/Swift/Mime/Headers/OpenDKIMHeader.php   |   0
 .../Swift/Mime/Headers/ParameterizedHeader.php      |   0
 .../lib/classes/Swift/Mime/Headers/PathHeader.php   |   0
 .../Swift/Mime/Headers/UnstructuredHeader.php       |   0
 .../swiftmailer/lib/classes/Swift/Mime/Message.php  |   0
 .../lib/classes/Swift/Mime/MimeEntity.php           |   0
 .../swiftmailer/lib/classes/Swift/Mime/MimePart.php |   0
 .../lib/classes/Swift/Mime/ParameterizedHeader.php  |   0
 .../lib/classes/Swift/Mime/SimpleHeaderFactory.php  |   0
 .../lib/classes/Swift/Mime/SimpleHeaderSet.php      |   0
 .../lib/classes/Swift/Mime/SimpleMessage.php        |   0
 .../lib/classes/Swift/Mime/SimpleMimeEntity.php     |   0
 .../swiftmailer/lib/classes/Swift/MimePart.php      |   0
 .../swiftmailer/lib/classes/Swift/NullTransport.php |   0
 .../lib/classes/Swift/OutputByteStream.php          |   0
 .../lib/classes/Swift/Plugins/AntiFloodPlugin.php   |   0
 .../Swift/Plugins/BandwidthMonitorPlugin.php        |   0
 .../Swift/Plugins/Decorator/Replacements.php        |   0
 .../lib/classes/Swift/Plugins/DecoratorPlugin.php   |   0
 .../lib/classes/Swift/Plugins/ImpersonatePlugin.php |   0
 .../lib/classes/Swift/Plugins/Logger.php            |   0
 .../lib/classes/Swift/Plugins/LoggerPlugin.php      |   0
 .../classes/Swift/Plugins/Loggers/ArrayLogger.php   |   0
 .../classes/Swift/Plugins/Loggers/EchoLogger.php    |   0
 .../lib/classes/Swift/Plugins/MessageLogger.php     |   0
 .../classes/Swift/Plugins/Pop/Pop3Connection.php    |   0
 .../lib/classes/Swift/Plugins/Pop/Pop3Exception.php |   0
 .../classes/Swift/Plugins/PopBeforeSmtpPlugin.php   |   0
 .../lib/classes/Swift/Plugins/RedirectingPlugin.php |   0
 .../lib/classes/Swift/Plugins/Reporter.php          |   0
 .../lib/classes/Swift/Plugins/ReporterPlugin.php    |   0
 .../classes/Swift/Plugins/Reporters/HitReporter.php |   0
 .../Swift/Plugins/Reporters/HtmlReporter.php        |   0
 .../lib/classes/Swift/Plugins/Sleeper.php           |   0
 .../lib/classes/Swift/Plugins/ThrottlerPlugin.php   |   0
 .../swiftmailer/lib/classes/Swift/Plugins/Timer.php |   0
 .../swiftmailer/lib/classes/Swift/Preferences.php   |   0
 .../lib/classes/Swift/ReplacementFilterFactory.php  |   0
 .../lib/classes/Swift/RfcComplianceException.php    |   0
 .../lib/classes/Swift/SendmailTransport.php         |   0
 .../swiftmailer/lib/classes/Swift/SignedMessage.php |   0
 .../swiftmailer/lib/classes/Swift/Signer.php        |   0
 .../lib/classes/Swift/Signers/BodySigner.php        |   0
 .../lib/classes/Swift/Signers/DKIMSigner.php        |   0
 .../lib/classes/Swift/Signers/DomainKeySigner.php   |   0
 .../lib/classes/Swift/Signers/HeaderSigner.php      |   0
 .../lib/classes/Swift/Signers/OpenDKIMSigner.php    |   0
 .../lib/classes/Swift/Signers/SMimeSigner.php       |   0
 .../swiftmailer/lib/classes/Swift/SmtpTransport.php |   0
 .../swiftmailer/lib/classes/Swift/Spool.php         |   0
 .../lib/classes/Swift/SpoolTransport.php            |   0
 .../swiftmailer/lib/classes/Swift/StreamFilter.php  |   0
 .../StreamFilters/ByteArrayReplacementFilter.php    |   0
 .../Swift/StreamFilters/StringReplacementFilter.php |   0
 .../StringReplacementFilterFactory.php              |   0
 .../lib/classes/Swift/SwiftException.php            |   0
 .../swiftmailer/lib/classes/Swift/Transport.php     |   0
 .../Swift/Transport/AbstractSmtpTransport.php       |   0
 .../Transport/Esmtp/Auth/CramMd5Authenticator.php   |   0
 .../Transport/Esmtp/Auth/LoginAuthenticator.php     |   0
 .../Transport/Esmtp/Auth/NTLMAuthenticator.php      |   0
 .../Transport/Esmtp/Auth/PlainAuthenticator.php     |   0
 .../Transport/Esmtp/Auth/XOAuth2Authenticator.php   |   0
 .../classes/Swift/Transport/Esmtp/AuthHandler.php   |   0
 .../classes/Swift/Transport/Esmtp/Authenticator.php |   0
 .../lib/classes/Swift/Transport/EsmtpHandler.php    |   0
 .../lib/classes/Swift/Transport/EsmtpTransport.php  |   0
 .../classes/Swift/Transport/FailoverTransport.php   |   0
 .../lib/classes/Swift/Transport/IoBuffer.php        |   0
 .../Swift/Transport/LoadBalancedTransport.php       |   0
 .../lib/classes/Swift/Transport/MailInvoker.php     |   0
 .../lib/classes/Swift/Transport/MailTransport.php   |   0
 .../lib/classes/Swift/Transport/NullTransport.php   |   0
 .../classes/Swift/Transport/SendmailTransport.php   |   0
 .../classes/Swift/Transport/SimpleMailInvoker.php   |   0
 .../lib/classes/Swift/Transport/SmtpAgent.php       |   0
 .../lib/classes/Swift/Transport/SpoolTransport.php  |   0
 .../lib/classes/Swift/Transport/StreamBuffer.php    |   0
 .../lib/classes/Swift/TransportException.php        |   0
 .../swiftmailer/lib/classes/Swift/Validate.php      |   0
 .../swiftmailer/lib/dependency_maps/cache_deps.php  |   0
 .../lib/dependency_maps/message_deps.php            |   0
 .../swiftmailer/lib/dependency_maps/mime_deps.php   |   0
 .../lib/dependency_maps/transport_deps.php          |   0
 .../includes/swiftmailer/lib/mime_types.php         |   0
 .../includes/swiftmailer/lib/preferences.php        |   0
 .../includes/swiftmailer/lib/swift_init.php         |   0
 .../includes/swiftmailer/lib/swift_required.php     |   0
 .../swiftmailer/lib/swift_required_pear.php         |   0
 .../lib/swiftmailer_generate_mimes_config.php       |   0
 {htdocs => public}/includes/tcpdi/fpdf_tpl.php      |   0
 {htdocs => public}/includes/tcpdi/tcpdi.php         |   0
 {htdocs => public}/includes/tcpdi/tcpdi_parser.php  |   0
 .../includes/tecnickcom/tcpdf/CHANGELOG.TXT         |   0
 .../includes/tecnickcom/tcpdf/LICENSE.TXT           |   0
 .../includes/tecnickcom/tcpdf/README.TXT            |   0
 .../includes/tecnickcom/tcpdf/composer.json         |   0
 .../tecnickcom/tcpdf/config/tcpdf_config.php        |   0
 .../tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING     |   0
 .../tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog   |   0
 .../tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK     |   0
 .../tecnickcom/tcpdf/fonts/ae_fonts_2.0/README      |   0
 .../tecnickcom/tcpdf/fonts/aealarabiya.ctg.z        | Bin
 .../includes/tecnickcom/tcpdf/fonts/aealarabiya.php |   0
 .../includes/tecnickcom/tcpdf/fonts/aealarabiya.z   | Bin
 .../includes/tecnickcom/tcpdf/fonts/aefurat.ctg.z   | Bin
 .../includes/tecnickcom/tcpdf/fonts/aefurat.php     |   0
 .../includes/tecnickcom/tcpdf/fonts/aefurat.z       | Bin
 .../includes/tecnickcom/tcpdf/fonts/cid0cs.php      |   0
 .../includes/tecnickcom/tcpdf/fonts/cid0ct.php      |   0
 .../includes/tecnickcom/tcpdf/fonts/cid0jp.php      |   0
 .../includes/tecnickcom/tcpdf/fonts/cid0kr.php      |   0
 .../includes/tecnickcom/tcpdf/fonts/courier.php     |   0
 .../includes/tecnickcom/tcpdf/fonts/courierb.php    |   0
 .../includes/tecnickcom/tcpdf/fonts/courierbi.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/courieri.php    |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS       |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS          |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE       |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS          |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/README        |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt    |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt  |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS       |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS          |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE       |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS          |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/README        |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt    |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt  |   0
 .../tecnickcom/tcpdf/fonts/dejavusans.ctg.z         | Bin
 .../includes/tecnickcom/tcpdf/fonts/dejavusans.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavusans.z    | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansb.ctg.z        | Bin
 .../includes/tecnickcom/tcpdf/fonts/dejavusansb.php |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavusansb.z   | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansbi.ctg.z       | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansbi.php         |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavusansbi.z  | Bin
 .../tcpdf/fonts/dejavusanscondensed.ctg.z           | Bin
 .../tecnickcom/tcpdf/fonts/dejavusanscondensed.php  |   0
 .../tecnickcom/tcpdf/fonts/dejavusanscondensed.z    | Bin
 .../tcpdf/fonts/dejavusanscondensedb.ctg.z          | Bin
 .../tecnickcom/tcpdf/fonts/dejavusanscondensedb.php |   0
 .../tecnickcom/tcpdf/fonts/dejavusanscondensedb.z   | Bin
 .../tcpdf/fonts/dejavusanscondensedbi.ctg.z         | Bin
 .../tcpdf/fonts/dejavusanscondensedbi.php           |   0
 .../tecnickcom/tcpdf/fonts/dejavusanscondensedbi.z  | Bin
 .../tcpdf/fonts/dejavusanscondensedi.ctg.z          | Bin
 .../tecnickcom/tcpdf/fonts/dejavusanscondensedi.php |   0
 .../tecnickcom/tcpdf/fonts/dejavusanscondensedi.z   | Bin
 .../tcpdf/fonts/dejavusansextralight.ctg.z          | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansextralight.php |   0
 .../tecnickcom/tcpdf/fonts/dejavusansextralight.z   | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansi.ctg.z        | Bin
 .../includes/tecnickcom/tcpdf/fonts/dejavusansi.php |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavusansi.z   | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmono.ctg.z     | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmono.php       |   0
 .../tecnickcom/tcpdf/fonts/dejavusansmono.z         | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmonob.ctg.z    | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmonob.php      |   0
 .../tecnickcom/tcpdf/fonts/dejavusansmonob.z        | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmonobi.ctg.z   | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmonobi.php     |   0
 .../tecnickcom/tcpdf/fonts/dejavusansmonobi.z       | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmonoi.ctg.z    | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmonoi.php      |   0
 .../tecnickcom/tcpdf/fonts/dejavusansmonoi.z        | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserif.ctg.z        | Bin
 .../includes/tecnickcom/tcpdf/fonts/dejavuserif.php |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavuserif.z   | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserifb.ctg.z       | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserifb.php         |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavuserifb.z  | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserifbi.ctg.z      | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserifbi.php        |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavuserifbi.z | Bin
 .../tcpdf/fonts/dejavuserifcondensed.ctg.z          | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserifcondensed.php |   0
 .../tecnickcom/tcpdf/fonts/dejavuserifcondensed.z   | Bin
 .../tcpdf/fonts/dejavuserifcondensedb.ctg.z         | Bin
 .../tcpdf/fonts/dejavuserifcondensedb.php           |   0
 .../tecnickcom/tcpdf/fonts/dejavuserifcondensedb.z  | Bin
 .../tcpdf/fonts/dejavuserifcondensedbi.ctg.z        | Bin
 .../tcpdf/fonts/dejavuserifcondensedbi.php          |   0
 .../tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.z | Bin
 .../tcpdf/fonts/dejavuserifcondensedi.ctg.z         | Bin
 .../tcpdf/fonts/dejavuserifcondensedi.php           |   0
 .../tecnickcom/tcpdf/fonts/dejavuserifcondensedi.z  | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserifi.ctg.z       | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserifi.php         |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavuserifi.z  | Bin
 .../tcpdf/fonts/freefont-20100919/AUTHORS           |   0
 .../tcpdf/fonts/freefont-20100919/COPYING           |   0
 .../tcpdf/fonts/freefont-20100919/CREDITS           |   0
 .../tcpdf/fonts/freefont-20100919/ChangeLog         |   0
 .../tcpdf/fonts/freefont-20100919/INSTALL           |   0
 .../tecnickcom/tcpdf/fonts/freefont-20100919/README |   0
 .../tcpdf/fonts/freefont-20120503/AUTHORS           |   0
 .../tcpdf/fonts/freefont-20120503/COPYING           |   0
 .../tcpdf/fonts/freefont-20120503/CREDITS           |   0
 .../tcpdf/fonts/freefont-20120503/ChangeLog         |   0
 .../fonts/freefont-20120503/ChangeLog.10070.BAK     |   0
 .../tcpdf/fonts/freefont-20120503/INSTALL           |   0
 .../tecnickcom/tcpdf/fonts/freefont-20120503/README |   0
 .../tcpdf/fonts/freefont-20120503/TROUBLESHOOTING   |   0
 .../tecnickcom/tcpdf/fonts/freefont-20120503/USAGE  |   0
 .../includes/tecnickcom/tcpdf/fonts/freemono.ctg.z  | Bin
 .../includes/tecnickcom/tcpdf/fonts/freemono.php    |   0
 .../includes/tecnickcom/tcpdf/fonts/freemono.z      | Bin
 .../includes/tecnickcom/tcpdf/fonts/freemonob.ctg.z | Bin
 .../includes/tecnickcom/tcpdf/fonts/freemonob.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/freemonob.z     | Bin
 .../tecnickcom/tcpdf/fonts/freemonobi.ctg.z         | Bin
 .../includes/tecnickcom/tcpdf/fonts/freemonobi.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/freemonobi.z    | Bin
 .../includes/tecnickcom/tcpdf/fonts/freemonoi.ctg.z | Bin
 .../includes/tecnickcom/tcpdf/fonts/freemonoi.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/freemonoi.z     | Bin
 .../includes/tecnickcom/tcpdf/fonts/freesans.ctg.z  | Bin
 .../includes/tecnickcom/tcpdf/fonts/freesans.php    |   0
 .../includes/tecnickcom/tcpdf/fonts/freesans.z      | Bin
 .../includes/tecnickcom/tcpdf/fonts/freesansb.ctg.z | Bin
 .../includes/tecnickcom/tcpdf/fonts/freesansb.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/freesansb.z     | Bin
 .../tecnickcom/tcpdf/fonts/freesansbi.ctg.z         | Bin
 .../includes/tecnickcom/tcpdf/fonts/freesansbi.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/freesansbi.z    | Bin
 .../includes/tecnickcom/tcpdf/fonts/freesansi.ctg.z | Bin
 .../includes/tecnickcom/tcpdf/fonts/freesansi.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/freesansi.z     | Bin
 .../includes/tecnickcom/tcpdf/fonts/freeserif.ctg.z | Bin
 .../includes/tecnickcom/tcpdf/fonts/freeserif.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/freeserif.z     | Bin
 .../tecnickcom/tcpdf/fonts/freeserifb.ctg.z         | Bin
 .../includes/tecnickcom/tcpdf/fonts/freeserifb.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/freeserifb.z    | Bin
 .../tecnickcom/tcpdf/fonts/freeserifbi.ctg.z        | Bin
 .../includes/tecnickcom/tcpdf/fonts/freeserifbi.php |   0
 .../includes/tecnickcom/tcpdf/fonts/freeserifbi.z   | Bin
 .../tecnickcom/tcpdf/fonts/freeserifi.ctg.z         | Bin
 .../includes/tecnickcom/tcpdf/fonts/freeserifi.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/freeserifi.z    | Bin
 .../includes/tecnickcom/tcpdf/fonts/helvetica.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/helveticab.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/helveticabi.php |   0
 .../includes/tecnickcom/tcpdf/fonts/helveticai.php  |   0
 .../tecnickcom/tcpdf/fonts/hysmyeongjostdmedium.php |   0
 .../tecnickcom/tcpdf/fonts/kozgopromedium.php       |   0
 .../tecnickcom/tcpdf/fonts/kozminproregular.php     |   0
 .../tecnickcom/tcpdf/fonts/msungstdlight.php        |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfacourier.php |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfacourier.z   | Bin
 .../tecnickcom/tcpdf/fonts/pdfacourierb.php         |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfacourierb.z  | Bin
 .../tecnickcom/tcpdf/fonts/pdfacourierbi.php        |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfacourierbi.z | Bin
 .../tecnickcom/tcpdf/fonts/pdfacourieri.php         |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfacourieri.z  | Bin
 .../tecnickcom/tcpdf/fonts/pdfahelvetica.php        |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfahelvetica.z | Bin
 .../tecnickcom/tcpdf/fonts/pdfahelveticab.php       |   0
 .../tecnickcom/tcpdf/fonts/pdfahelveticab.z         | Bin
 .../tecnickcom/tcpdf/fonts/pdfahelveticabi.php      |   0
 .../tecnickcom/tcpdf/fonts/pdfahelveticabi.z        | Bin
 .../tecnickcom/tcpdf/fonts/pdfahelveticai.php       |   0
 .../tecnickcom/tcpdf/fonts/pdfahelveticai.z         | Bin
 .../includes/tecnickcom/tcpdf/fonts/pdfasymbol.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfasymbol.z    | Bin
 .../includes/tecnickcom/tcpdf/fonts/pdfatimes.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfatimes.z     | Bin
 .../includes/tecnickcom/tcpdf/fonts/pdfatimesb.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfatimesb.z    | Bin
 .../includes/tecnickcom/tcpdf/fonts/pdfatimesbi.php |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfatimesbi.z   | Bin
 .../includes/tecnickcom/tcpdf/fonts/pdfatimesi.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfatimesi.z    | Bin
 .../tecnickcom/tcpdf/fonts/pdfazapfdingbats.php     |   0
 .../tecnickcom/tcpdf/fonts/pdfazapfdingbats.z       | Bin
 .../tecnickcom/tcpdf/fonts/stsongstdlight.php       |   0
 .../includes/tecnickcom/tcpdf/fonts/symbol.php      |   0
 .../includes/tecnickcom/tcpdf/fonts/times.php       |   0
 .../includes/tecnickcom/tcpdf/fonts/timesb.php      |   0
 .../includes/tecnickcom/tcpdf/fonts/timesbi.php     |   0
 .../includes/tecnickcom/tcpdf/fonts/timesi.php      |   0
 .../tecnickcom/tcpdf/fonts/uni2cid_ac15.php         |   0
 .../tecnickcom/tcpdf/fonts/uni2cid_ag15.php         |   0
 .../tecnickcom/tcpdf/fonts/uni2cid_aj16.php         |   0
 .../tecnickcom/tcpdf/fonts/uni2cid_ak12.php         |   0
 .../tecnickcom/tcpdf/fonts/zapfdingbats.php         |   0
 .../tcpdf/include/barcodes/datamatrix.php           |   0
 .../tecnickcom/tcpdf/include/barcodes/pdf417.php    |   0
 .../tecnickcom/tcpdf/include/barcodes/qrcode.php    |   0
 .../includes/tecnickcom/tcpdf/include/sRGB.icc      | Bin
 .../tecnickcom/tcpdf/include/tcpdf_colors.php       |   0
 .../tecnickcom/tcpdf/include/tcpdf_filters.php      |   0
 .../tecnickcom/tcpdf/include/tcpdf_font_data.php    |   0
 .../tecnickcom/tcpdf/include/tcpdf_fonts.php        |   0
 .../tecnickcom/tcpdf/include/tcpdf_images.php       |   0
 .../tecnickcom/tcpdf/include/tcpdf_static.php       |   0
 .../includes/tecnickcom/tcpdf/tcpdf.php             |   0
 .../includes/tecnickcom/tcpdf/tcpdf_autoconfig.php  |   0
 .../includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php |   0
 .../includes/tecnickcom/tcpdf/tcpdf_barcodes_2d.php |   0
 .../includes/tecnickcom/tcpdf/tcpdf_import.php      |   0
 .../includes/tecnickcom/tcpdf/tcpdf_parser.php      |   0
 {htdocs => public}/index.php                        |   0
 {htdocs => public}/install/.gitignore               |   0
 {htdocs => public}/install/check.php                |   0
 {htdocs => public}/install/default.css              |   0
 {htdocs => public}/install/doctemplates/README      |   0
 {htdocs => public}/install/doctemplates/index.html  |   0
 .../install/doctemplates/invoices/index.html        |   0
 .../doctemplates/invoices/template_invoice.odt      | Bin
 .../install/doctemplates/orders/index.html          |   0
 .../install/doctemplates/orders/template_order.odt  | Bin
 .../install/doctemplates/projects/index.html        |   0
 .../doctemplates/projects/template_project.odt      | Bin
 .../install/doctemplates/proposals/index.html       |   0
 .../doctemplates/proposals/template_proposal.odt    | Bin
 .../install/doctemplates/shipment/index.html        |   0
 .../doctemplates/shipment/template_shipment.odt     | Bin
 .../doctemplates/supplier_proposal/index.html       |   0
 .../template_supplier_proposal.odt                  | Bin
 .../install/doctemplates/tasks/index.html           |   0
 .../doctemplates/tasks/template_task_summary.odt    | Bin
 .../install/doctemplates/thirdparties/index.html    |   0
 .../thirdparties/template_thirdparty.ods            | Bin
 .../thirdparties/template_thirdparty.odt            | Bin
 {htdocs => public}/install/fileconf.php             |   0
 {htdocs => public}/install/inc.php                  |   0
 {htdocs => public}/install/index.php                |   0
 .../install/install.forced.sample.php               |   0
 {htdocs => public}/install/lib/index.html           |   0
 {htdocs => public}/install/lib/repair.lib.php       |   0
 {htdocs => public}/install/mssql/README             |   0
 .../install/mssql/functions/index.html              |   0
 {htdocs => public}/install/mssql/index.html         |   0
 {htdocs => public}/install/mysql/README             |   0
 {htdocs => public}/install/mysql/data/index.html    |   0
 .../install/mysql/data/llx_00_c_country.sql         |   0
 .../install/mysql/data/llx_10_c_regions.sql         |   0
 .../install/mysql/data/llx_20_c_departements.sql    |   0
 .../install/mysql/data/llx_accounting.sql           |   0
 .../install/mysql/data/llx_accounting_category.sql  |   0
 .../install/mysql/data/llx_c_action_trigger.sql     |   0
 .../install/mysql/data/llx_c_actioncomm.sql         |   0
 .../install/mysql/data/llx_c_availability.sql       |   0
 .../install/mysql/data/llx_c_chargesociales.sql     |   0
 .../install/mysql/data/llx_c_civilite.sql           |   0
 .../install/mysql/data/llx_c_currencies.sql         |   0
 .../install/mysql/data/llx_c_ecotaxe.sql            |   0
 .../install/mysql/data/llx_c_effectif.sql           |   0
 .../install/mysql/data/llx_c_format_cards.sql       |   0
 .../install/mysql/data/llx_c_forme_juridique.sql    |   0
 .../install/mysql/data/llx_c_holiday_type.sql       |   0
 .../install/mysql/data/llx_c_hrm_department.sql     |   0
 .../install/mysql/data/llx_c_hrm_function.sql       |   0
 .../install/mysql/data/llx_c_incoterms.sql          |   0
 .../install/mysql/data/llx_c_input_method.sql       |   0
 .../install/mysql/data/llx_c_input_reason.sql       |   0
 .../install/mysql/data/llx_c_lead_status.sql        |   0
 .../install/mysql/data/llx_c_paiement.sql           |   0
 .../install/mysql/data/llx_c_paper_format.sql       |   0
 .../install/mysql/data/llx_c_payment_term.sql       |   0
 .../install/mysql/data/llx_c_propalst.sql           |   0
 .../install/mysql/data/llx_c_prospectlevel.sql      |   0
 .../install/mysql/data/llx_c_revenuestamp.sql       |   0
 .../install/mysql/data/llx_c_shipment_mode.sql      |   0
 .../install/mysql/data/llx_c_stcomm.sql             |   0
 {htdocs => public}/install/mysql/data/llx_c_tva.sql |   0
 .../install/mysql/data/llx_c_type_contact.sql       |   0
 .../install/mysql/data/llx_c_type_fees.sql          |   0
 .../install/mysql/data/llx_c_type_resource.sql      |   0
 .../install/mysql/data/llx_c_typent.sql             |   0
 .../install/mysql/data/llx_c_units.sql              |   0
 {htdocs => public}/install/mysql/data/llx_const.sql |   0
 .../install/mysql/data/llx_holiday_config.sql       |   0
 .../install/mysql/functions/functions.sql           |   0
 .../install/mysql/functions/index.html              |   0
 {htdocs => public}/install/mysql/index.html         |   0
 .../install/mysql/migration/3.0.0-3.1.0.sql         |   0
 .../install/mysql/migration/3.1.0-3.2.0.sql         |   0
 .../install/mysql/migration/3.2.0-3.3.0.sql         |   0
 .../install/mysql/migration/3.3.0-3.4.0.sql         |   0
 .../install/mysql/migration/3.4.0-3.5.0.sql         |   0
 .../install/mysql/migration/3.5.0-3.6.0.sql         |   0
 .../install/mysql/migration/3.6.0-3.7.0.sql         |   0
 .../install/mysql/migration/3.7.0-3.8.0.sql         |   0
 .../install/mysql/migration/3.8.0-3.9.0.sql         |   0
 .../install/mysql/migration/3.9.0-4.0.0.sql         |   0
 .../install/mysql/migration/4.0.0-5.0.0.sql         |   0
 .../install/mysql/migration/index.html              |   0
 .../install/mysql/migration/repair.sql              |   0
 {htdocs => public}/install/mysql/tables/index.html  |   0
 .../mysql/tables/llx_accounting_account.key.sql     |   0
 .../install/mysql/tables/llx_accounting_account.sql |   0
 .../mysql/tables/llx_accounting_bookkeeping.key.sql |   0
 .../mysql/tables/llx_accounting_bookkeeping.sql     |   0
 .../mysql/tables/llx_accounting_fiscalyear.sql      |   0
 .../mysql/tables/llx_accounting_journal.key.sql     |   0
 .../install/mysql/tables/llx_accounting_journal.sql |   0
 .../mysql/tables/llx_accounting_system.key.sql      |   0
 .../install/mysql/tables/llx_accounting_system.sql  |   0
 .../install/mysql/tables/llx_actioncomm.key.sql     |   0
 .../install/mysql/tables/llx_actioncomm.sql         |   0
 .../mysql/tables/llx_actioncomm_extrafields.key.sql |   0
 .../mysql/tables/llx_actioncomm_extrafields.sql     |   0
 .../mysql/tables/llx_actioncomm_resources.key.sql   |   0
 .../mysql/tables/llx_actioncomm_resources.sql       |   0
 .../install/mysql/tables/llx_adherent.key.sql       |   0
 .../install/mysql/tables/llx_adherent.sql           |   0
 .../mysql/tables/llx_adherent_extrafields.key.sql   |   0
 .../mysql/tables/llx_adherent_extrafields.sql       |   0
 .../install/mysql/tables/llx_adherent_type.key.sql  |   0
 .../install/mysql/tables/llx_adherent_type.sql      |   0
 .../tables/llx_adherent_type_extrafields.key.sql    |   0
 .../mysql/tables/llx_adherent_type_extrafields.sql  |   0
 .../mysql/tables/llx_advtargetemailing.key.sql      |   0
 .../install/mysql/tables/llx_advtargetemailing.sql  |   0
 .../install/mysql/tables/llx_bank.key.sql           |   0
 .../install/mysql/tables/llx_bank.sql               |   0
 .../install/mysql/tables/llx_bank_account.key.sql   |   0
 .../install/mysql/tables/llx_bank_account.sql       |   0
 .../tables/llx_bank_account_extrafields.key.sql     |   0
 .../mysql/tables/llx_bank_account_extrafields.sql   |   0
 .../install/mysql/tables/llx_bank_categ.sql         |   0
 .../install/mysql/tables/llx_bank_class.key.sql     |   0
 .../install/mysql/tables/llx_bank_class.sql         |   0
 .../install/mysql/tables/llx_bank_url.key.sql       |   0
 .../install/mysql/tables/llx_bank_url.sql           |   0
 .../install/mysql/tables/llx_bookmark.key.sql       |   0
 .../install/mysql/tables/llx_bookmark.sql           |   0
 .../mysql/tables/llx_bordereau_cheque.key.sql       |   0
 .../install/mysql/tables/llx_bordereau_cheque.sql   |   0
 .../install/mysql/tables/llx_boxes.key.sql          |   0
 .../install/mysql/tables/llx_boxes.sql              |   0
 .../install/mysql/tables/llx_boxes_def.key.sql      |   0
 .../install/mysql/tables/llx_boxes_def.sql          |   0
 .../install/mysql/tables/llx_budget.sql             |   0
 .../install/mysql/tables/llx_budget_lines.key.sql   |   0
 .../install/mysql/tables/llx_budget_lines.sql       |   0
 .../mysql/tables/llx_c_accounting_category.key.sql  |   0
 .../mysql/tables/llx_c_accounting_category.sql      |   0
 .../mysql/tables/llx_c_action_trigger.key.sql       |   0
 .../install/mysql/tables/llx_c_action_trigger.sql   |   0
 .../install/mysql/tables/llx_c_actioncomm.key.sql   |   0
 .../install/mysql/tables/llx_c_actioncomm.sql       |   0
 .../install/mysql/tables/llx_c_availability.key.sql |   0
 .../install/mysql/tables/llx_c_availability.sql     |   0
 .../install/mysql/tables/llx_c_barcode_type.key.sql |   0
 .../install/mysql/tables/llx_c_barcode_type.sql     |   0
 .../install/mysql/tables/llx_c_chargesociales.sql   |   0
 .../install/mysql/tables/llx_c_civility.key.sql     |   0
 .../install/mysql/tables/llx_c_civility.sql         |   0
 .../install/mysql/tables/llx_c_country.key.sql      |   0
 .../install/mysql/tables/llx_c_country.sql          |   0
 .../install/mysql/tables/llx_c_currencies.key.sql   |   0
 .../install/mysql/tables/llx_c_currencies.sql       |   0
 .../install/mysql/tables/llx_c_departements.key.sql |   0
 .../install/mysql/tables/llx_c_departements.sql     |   0
 .../install/mysql/tables/llx_c_ecotaxe.key.sql      |   0
 .../install/mysql/tables/llx_c_ecotaxe.sql          |   0
 .../install/mysql/tables/llx_c_effectif.key.sql     |   0
 .../install/mysql/tables/llx_c_effectif.sql         |   0
 .../mysql/tables/llx_c_email_templates.key.sql      |   0
 .../install/mysql/tables/llx_c_email_templates.sql  |   0
 .../install/mysql/tables/llx_c_field_list.sql       |   0
 .../install/mysql/tables/llx_c_format_cards.sql     |   0
 .../mysql/tables/llx_c_forme_juridique.key.sql      |   0
 .../install/mysql/tables/llx_c_forme_juridique.sql  |   0
 .../mysql/tables/llx_c_holiday_types.key.sql        |   0
 .../install/mysql/tables/llx_c_holiday_types.sql    |   0
 .../install/mysql/tables/llx_c_hrm_department.sql   |   0
 .../install/mysql/tables/llx_c_hrm_function.sql     |   0
 .../install/mysql/tables/llx_c_incoterms.key.sql    |   0
 .../install/mysql/tables/llx_c_incoterms.sql        |   0
 .../install/mysql/tables/llx_c_input_method.key.sql |   0
 .../install/mysql/tables/llx_c_input_method.sql     |   0
 .../install/mysql/tables/llx_c_input_reason.key.sql |   0
 .../install/mysql/tables/llx_c_input_reason.sql     |   0
 .../install/mysql/tables/llx_c_lead_status.key.sql  |   0
 .../install/mysql/tables/llx_c_lead_status.sql      |   0
 .../install/mysql/tables/llx_c_paiement.key.sql     |   0
 .../install/mysql/tables/llx_c_paiement.sql         |   0
 .../install/mysql/tables/llx_c_paper_format.sql     |   0
 .../install/mysql/tables/llx_c_payment_term.sql     |   0
 .../install/mysql/tables/llx_c_price_expression.sql |   0
 .../mysql/tables/llx_c_price_global_variable.sql    |   0
 .../tables/llx_c_price_global_variable_updater.sql  |   0
 .../install/mysql/tables/llx_c_propalst.key.sql     |   0
 .../install/mysql/tables/llx_c_propalst.sql         |   0
 .../install/mysql/tables/llx_c_prospectlevel.sql    |   0
 .../install/mysql/tables/llx_c_regions.key.sql      |   0
 .../install/mysql/tables/llx_c_regions.sql          |   0
 .../install/mysql/tables/llx_c_revenuestamp.sql     |   0
 .../mysql/tables/llx_c_shipment_mode.key.sql        |   0
 .../install/mysql/tables/llx_c_shipment_mode.sql    |   0
 .../install/mysql/tables/llx_c_stcomm.key.sql       |   0
 .../install/mysql/tables/llx_c_stcomm.sql           |   0
 .../install/mysql/tables/llx_c_tva.key.sql          |   0
 .../install/mysql/tables/llx_c_tva.sql              |   0
 .../install/mysql/tables/llx_c_type_contact.key.sql |   0
 .../install/mysql/tables/llx_c_type_contact.sql     |   0
 .../install/mysql/tables/llx_c_type_fees.key.sql    |   0
 .../install/mysql/tables/llx_c_type_fees.sql        |   0
 .../mysql/tables/llx_c_type_resource.key.sql        |   0
 .../install/mysql/tables/llx_c_type_resource.sql    |   0
 .../install/mysql/tables/llx_c_typent.key.sql       |   0
 .../install/mysql/tables/llx_c_typent.sql           |   0
 .../install/mysql/tables/llx_c_units.key.sql        |   0
 .../install/mysql/tables/llx_c_units.sql            |   0
 .../install/mysql/tables/llx_c_ziptown.key.sql      |   0
 .../install/mysql/tables/llx_c_ziptown.sql          |   0
 .../install/mysql/tables/llx_categorie.key.sql      |   0
 .../install/mysql/tables/llx_categorie.sql          |   0
 .../mysql/tables/llx_categorie_account.key.sql      |   0
 .../install/mysql/tables/llx_categorie_account.sql  |   0
 .../mysql/tables/llx_categorie_contact.key.sql      |   0
 .../install/mysql/tables/llx_categorie_contact.sql  |   0
 .../mysql/tables/llx_categorie_fournisseur.key.sql  |   0
 .../mysql/tables/llx_categorie_fournisseur.sql      |   0
 .../install/mysql/tables/llx_categorie_lang.key.sql |   0
 .../install/mysql/tables/llx_categorie_lang.sql     |   0
 .../mysql/tables/llx_categorie_member.key.sql       |   0
 .../install/mysql/tables/llx_categorie_member.sql   |   0
 .../mysql/tables/llx_categorie_product.key.sql      |   0
 .../install/mysql/tables/llx_categorie_product.sql  |   0
 .../mysql/tables/llx_categorie_project.key.sql      |   0
 .../install/mysql/tables/llx_categorie_project.sql  |   0
 .../mysql/tables/llx_categorie_societe.key.sql      |   0
 .../install/mysql/tables/llx_categorie_societe.sql  |   0
 .../install/mysql/tables/llx_categorie_user.key.sql |   0
 .../install/mysql/tables/llx_categorie_user.sql     |   0
 .../mysql/tables/llx_categories_extrafields.key.sql |   0
 .../mysql/tables/llx_categories_extrafields.sql     |   0
 .../install/mysql/tables/llx_chargesociales.sql     |   0
 .../install/mysql/tables/llx_commande.key.sql       |   0
 .../install/mysql/tables/llx_commande.sql           |   0
 .../mysql/tables/llx_commande_extrafields.key.sql   |   0
 .../mysql/tables/llx_commande_extrafields.sql       |   0
 .../mysql/tables/llx_commande_fournisseur.key.sql   |   0
 .../mysql/tables/llx_commande_fournisseur.sql       |   0
 .../llx_commande_fournisseur_dispatch.key.sql       |   0
 .../tables/llx_commande_fournisseur_dispatch.sql    |   0
 .../llx_commande_fournisseur_extrafields.key.sql    |   0
 .../tables/llx_commande_fournisseur_extrafields.sql |   0
 .../mysql/tables/llx_commande_fournisseur_log.sql   |   0
 .../tables/llx_commande_fournisseurdet.key.sql      |   0
 .../mysql/tables/llx_commande_fournisseurdet.sql    |   0
 .../llx_commande_fournisseurdet_extrafields.key.sql |   0
 .../llx_commande_fournisseurdet_extrafields.sql     |   0
 .../install/mysql/tables/llx_commandedet.key.sql    |   0
 .../install/mysql/tables/llx_commandedet.sql        |   0
 .../tables/llx_commandedet_extrafields.key.sql      |   0
 .../mysql/tables/llx_commandedet_extrafields.sql    |   0
 .../install/mysql/tables/llx_const.key.sql          |   0
 .../install/mysql/tables/llx_const.sql              |   0
 .../install/mysql/tables/llx_contrat.key.sql        |   0
 .../install/mysql/tables/llx_contrat.sql            |   0
 .../mysql/tables/llx_contrat_extrafields.key.sql    |   0
 .../mysql/tables/llx_contrat_extrafields.sql        |   0
 .../install/mysql/tables/llx_contratdet.key.sql     |   0
 .../install/mysql/tables/llx_contratdet.sql         |   0
 .../mysql/tables/llx_contratdet_extrafields.key.sql |   0
 .../mysql/tables/llx_contratdet_extrafields.sql     |   0
 .../install/mysql/tables/llx_contratdet_log.key.sql |   0
 .../install/mysql/tables/llx_contratdet_log.sql     |   0
 .../install/mysql/tables/llx_cronjob.key.sql        |   0
 .../install/mysql/tables/llx_cronjob.sql            |   0
 .../install/mysql/tables/llx_deplacement.sql        |   0
 .../install/mysql/tables/llx_document_model.key.sql |   0
 .../install/mysql/tables/llx_document_model.sql     |   0
 {htdocs => public}/install/mysql/tables/llx_don.sql |   0
 .../mysql/tables/llx_don_extrafields.key.sql        |   0
 .../install/mysql/tables/llx_don_extrafields.sql    |   0
 .../mysql/tables/llx_ecm_directories.key.sql        |   0
 .../install/mysql/tables/llx_ecm_directories.sql    |   0
 .../install/mysql/tables/llx_ecm_files.key.sql      |   0
 .../install/mysql/tables/llx_ecm_files.sql          |   0
 .../mysql/tables/llx_element_contact.key.sql        |   0
 .../install/mysql/tables/llx_element_contact.sql    |   0
 .../mysql/tables/llx_element_element.key.sql        |   0
 .../install/mysql/tables/llx_element_element.sql    |   0
 .../mysql/tables/llx_element_resources.key.sql      |   0
 .../install/mysql/tables/llx_element_resources.sql  |   0
 .../install/mysql/tables/llx_element_tag.key.sql    |   0
 .../install/mysql/tables/llx_element_tag.sql        |   0
 .../install/mysql/tables/llx_entrepot.key.sql       |   0
 .../install/mysql/tables/llx_entrepot.sql           |   0
 .../install/mysql/tables/llx_establishment.sql      |   0
 .../install/mysql/tables/llx_event_element.sql      |   0
 .../install/mysql/tables/llx_events.key.sql         |   0
 .../install/mysql/tables/llx_events.sql             |   0
 .../install/mysql/tables/llx_expedition.key.sql     |   0
 .../install/mysql/tables/llx_expedition.sql         |   0
 .../mysql/tables/llx_expedition_extrafields.key.sql |   0
 .../mysql/tables/llx_expedition_extrafields.sql     |   0
 .../install/mysql/tables/llx_expeditiondet.key.sql  |   0
 .../install/mysql/tables/llx_expeditiondet.sql      |   0
 .../mysql/tables/llx_expeditiondet_batch.key.sql    |   0
 .../mysql/tables/llx_expeditiondet_batch.sql        |   0
 .../tables/llx_expeditiondet_extrafields.key.sql    |   0
 .../mysql/tables/llx_expeditiondet_extrafields.sql  |   0
 .../install/mysql/tables/llx_expensereport.key.sql  |   0
 .../install/mysql/tables/llx_expensereport.sql      |   0
 .../install/mysql/tables/llx_expensereport_det.sql  |   0
 .../tables/llx_expensereport_extrafields.key.sql    |   0
 .../mysql/tables/llx_expensereport_extrafields.sql  |   0
 .../install/mysql/tables/llx_export_compta.sql      |   0
 .../install/mysql/tables/llx_export_model.key.sql   |   0
 .../install/mysql/tables/llx_export_model.sql       |   0
 .../install/mysql/tables/llx_extrafields.key.sql    |   0
 .../install/mysql/tables/llx_extrafields.sql        |   0
 .../install/mysql/tables/llx_facture.key.sql        |   0
 .../install/mysql/tables/llx_facture.sql            |   0
 .../mysql/tables/llx_facture_extrafields.key.sql    |   0
 .../mysql/tables/llx_facture_extrafields.sql        |   0
 .../install/mysql/tables/llx_facture_fourn.key.sql  |   0
 .../install/mysql/tables/llx_facture_fourn.sql      |   0
 .../mysql/tables/llx_facture_fourn_det.key.sql      |   0
 .../install/mysql/tables/llx_facture_fourn_det.sql  |   0
 .../llx_facture_fourn_det_extrafields.key.sql       |   0
 .../tables/llx_facture_fourn_det_extrafields.sql    |   0
 .../tables/llx_facture_fourn_extrafields.key.sql    |   0
 .../mysql/tables/llx_facture_fourn_extrafields.sql  |   0
 .../install/mysql/tables/llx_facture_rec.key.sql    |   0
 .../install/mysql/tables/llx_facture_rec.sql        |   0
 .../install/mysql/tables/llx_facturedet.key.sql     |   0
 .../install/mysql/tables/llx_facturedet.sql         |   0
 .../mysql/tables/llx_facturedet_extrafields.key.sql |   0
 .../mysql/tables/llx_facturedet_extrafields.sql     |   0
 .../install/mysql/tables/llx_facturedet_rec.key.sql |   0
 .../install/mysql/tables/llx_facturedet_rec.sql     |   0
 .../install/mysql/tables/llx_fichinter.key.sql      |   0
 .../install/mysql/tables/llx_fichinter.sql          |   0
 .../mysql/tables/llx_fichinter_extrafields.key.sql  |   0
 .../mysql/tables/llx_fichinter_extrafields.sql      |   0
 .../install/mysql/tables/llx_fichinterdet.key.sql   |   0
 .../install/mysql/tables/llx_fichinterdet.sql       |   0
 .../tables/llx_fichinterdet_extrafields.key.sql     |   0
 .../mysql/tables/llx_fichinterdet_extrafields.sql   |   0
 .../install/mysql/tables/llx_holiday.key.sql        |   0
 .../install/mysql/tables/llx_holiday.sql            |   0
 .../install/mysql/tables/llx_holiday_config.sql     |   0
 .../install/mysql/tables/llx_holiday_logs.sql       |   0
 .../install/mysql/tables/llx_holiday_users.sql      |   0
 .../install/mysql/tables/llx_import_model.key.sql   |   0
 .../install/mysql/tables/llx_import_model.sql       |   0
 .../install/mysql/tables/llx_links.key.sql          |   0
 .../install/mysql/tables/llx_links.sql              |   0
 .../install/mysql/tables/llx_livraison.key.sql      |   0
 .../install/mysql/tables/llx_livraison.sql          |   0
 .../mysql/tables/llx_livraison_extrafields.key.sql  |   0
 .../mysql/tables/llx_livraison_extrafields.sql      |   0
 .../install/mysql/tables/llx_livraisondet.key.sql   |   0
 .../install/mysql/tables/llx_livraisondet.sql       |   0
 .../tables/llx_livraisondet_extrafields.key.sql     |   0
 .../mysql/tables/llx_livraisondet_extrafields.sql   |   0
 .../install/mysql/tables/llx_loan.sql               |   0
 .../install/mysql/tables/llx_localtax.sql           |   0
 .../install/mysql/tables/llx_mailing.sql            |   0
 .../install/mysql/tables/llx_mailing_cibles.key.sql |   0
 .../install/mysql/tables/llx_mailing_cibles.sql     |   0
 .../install/mysql/tables/llx_menu.key.sql           |   0
 .../install/mysql/tables/llx_menu.sql               |   0
 .../install/mysql/tables/llx_multicurrency.sql      |   0
 .../install/mysql/tables/llx_multicurrency_rate.sql |   0
 .../install/mysql/tables/llx_notify.sql             |   0
 .../install/mysql/tables/llx_notify_def.sql         |   0
 .../install/mysql/tables/llx_oauth_state.sql        |   0
 .../install/mysql/tables/llx_oauth_token.sql        |   0
 .../mysql/tables/llx_opensurvey_comments.key.sql    |   0
 .../mysql/tables/llx_opensurvey_comments.sql        |   0
 .../mysql/tables/llx_opensurvey_formquestions.sql   |   0
 .../mysql/tables/llx_opensurvey_sondage.key.sql     |   0
 .../install/mysql/tables/llx_opensurvey_sondage.sql |   0
 .../tables/llx_opensurvey_user_formanswers.sql      |   0
 .../mysql/tables/llx_opensurvey_user_studs.key.sql  |   0
 .../mysql/tables/llx_opensurvey_user_studs.sql      |   0
 .../mysql/tables/llx_overwrite_trans.key.sql        |   0
 .../install/mysql/tables/llx_overwrite_trans.sql    |   0
 .../install/mysql/tables/llx_paiement.sql           |   0
 .../mysql/tables/llx_paiement_facture.key.sql       |   0
 .../install/mysql/tables/llx_paiement_facture.sql   |   0
 .../install/mysql/tables/llx_paiementcharge.sql     |   0
 .../install/mysql/tables/llx_paiementfourn.sql      |   0
 .../tables/llx_paiementfourn_facturefourn.key.sql   |   0
 .../mysql/tables/llx_paiementfourn_facturefourn.sql |   0
 .../install/mysql/tables/llx_payment_donation.sql   |   0
 .../mysql/tables/llx_payment_expensereport.sql      |   0
 .../install/mysql/tables/llx_payment_loan.sql       |   0
 .../install/mysql/tables/llx_payment_salary.key.sql |   0
 .../install/mysql/tables/llx_payment_salary.sql     |   0
 .../mysql/tables/llx_prelevement_bons.key.sql       |   0
 .../install/mysql/tables/llx_prelevement_bons.sql   |   0
 .../mysql/tables/llx_prelevement_facture.key.sql    |   0
 .../mysql/tables/llx_prelevement_facture.sql        |   0
 .../tables/llx_prelevement_facture_demande.sql      |   0
 .../mysql/tables/llx_prelevement_lignes.key.sql     |   0
 .../install/mysql/tables/llx_prelevement_lignes.sql |   0
 .../install/mysql/tables/llx_prelevement_rejet.sql  |   0
 .../install/mysql/tables/llx_printing.sql           |   0
 .../install/mysql/tables/llx_product.key.sql        |   0
 .../install/mysql/tables/llx_product.sql            |   0
 .../mysql/tables/llx_product_association.key.sql    |   0
 .../mysql/tables/llx_product_association.sql        |   0
 .../install/mysql/tables/llx_product_batch.key.sql  |   0
 .../install/mysql/tables/llx_product_batch.sql      |   0
 .../mysql/tables/llx_product_customer_price.key.sql |   0
 .../mysql/tables/llx_product_customer_price.sql     |   0
 .../mysql/tables/llx_product_customer_price_log.sql |   0
 .../mysql/tables/llx_product_extrafields.key.sql    |   0
 .../mysql/tables/llx_product_extrafields.sql        |   0
 .../tables/llx_product_fournisseur_price.key.sql    |   0
 .../mysql/tables/llx_product_fournisseur_price.sql  |   0
 .../tables/llx_product_fournisseur_price_log.sql    |   0
 .../install/mysql/tables/llx_product_lang.key.sql   |   0
 .../install/mysql/tables/llx_product_lang.sql       |   0
 .../install/mysql/tables/llx_product_lot.key.sql    |   0
 .../install/mysql/tables/llx_product_lot.sql        |   0
 .../tables/llx_product_lot_extrafields.key.sql      |   0
 .../mysql/tables/llx_product_lot_extrafields.sql    |   0
 .../install/mysql/tables/llx_product_price.key.sql  |   0
 .../install/mysql/tables/llx_product_price.sql      |   0
 .../mysql/tables/llx_product_price_by_qty.key.sql   |   0
 .../mysql/tables/llx_product_price_by_qty.sql       |   0
 .../mysql/tables/llx_product_pricerules.key.sql     |   0
 .../install/mysql/tables/llx_product_pricerules.sql |   0
 .../install/mysql/tables/llx_product_stock.key.sql  |   0
 .../install/mysql/tables/llx_product_stock.sql      |   0
 .../mysql/tables/llx_product_stock_entrepot.sql     |   0
 .../install/mysql/tables/llx_projet.key.sql         |   0
 .../install/mysql/tables/llx_projet.sql             |   0
 .../mysql/tables/llx_projet_extrafields.key.sql     |   0
 .../install/mysql/tables/llx_projet_extrafields.sql |   0
 .../install/mysql/tables/llx_projet_task.key.sql    |   0
 .../install/mysql/tables/llx_projet_task.sql        |   0
 .../tables/llx_projet_task_extrafields.key.sql      |   0
 .../mysql/tables/llx_projet_task_extrafields.sql    |   0
 .../mysql/tables/llx_projet_task_time.key.sql       |   0
 .../install/mysql/tables/llx_projet_task_time.sql   |   0
 .../install/mysql/tables/llx_propal.key.sql         |   0
 .../install/mysql/tables/llx_propal.sql             |   0
 .../mysql/tables/llx_propal_extrafields.key.sql     |   0
 .../install/mysql/tables/llx_propal_extrafields.sql |   0
 .../mysql/tables/llx_propal_merge_pdf_product.sql   |   0
 .../install/mysql/tables/llx_propaldet.key.sql      |   0
 .../install/mysql/tables/llx_propaldet.sql          |   0
 .../mysql/tables/llx_propaldet_extrafields.key.sql  |   0
 .../mysql/tables/llx_propaldet_extrafields.sql      |   0
 .../install/mysql/tables/llx_resource.key.sql       |   0
 .../install/mysql/tables/llx_resource.sql           |   0
 .../mysql/tables/llx_resource_extrafields.key.sql   |   0
 .../mysql/tables/llx_resource_extrafields.sql       |   0
 .../install/mysql/tables/llx_rights_def.key.sql     |   0
 .../install/mysql/tables/llx_rights_def.sql         |   0
 .../install/mysql/tables/llx_societe.key.sql        |   0
 .../install/mysql/tables/llx_societe.sql            |   0
 .../install/mysql/tables/llx_societe_address.sql    |   0
 .../mysql/tables/llx_societe_commerciaux.key.sql    |   0
 .../mysql/tables/llx_societe_commerciaux.sql        |   0
 .../mysql/tables/llx_societe_extrafields.key.sql    |   0
 .../mysql/tables/llx_societe_extrafields.sql        |   0
 .../install/mysql/tables/llx_societe_log.sql        |   0
 .../install/mysql/tables/llx_societe_prices.sql     |   0
 .../install/mysql/tables/llx_societe_remise.sql     |   0
 .../mysql/tables/llx_societe_remise_except.key.sql  |   0
 .../mysql/tables/llx_societe_remise_except.sql      |   0
 .../install/mysql/tables/llx_societe_rib.key.sql    |   0
 .../install/mysql/tables/llx_societe_rib.sql        |   0
 .../install/mysql/tables/llx_socpeople.key.sql      |   0
 .../install/mysql/tables/llx_socpeople.sql          |   0
 .../mysql/tables/llx_socpeople_extrafields.key.sql  |   0
 .../mysql/tables/llx_socpeople_extrafields.sql      |   0
 .../mysql/tables/llx_stock_mouvement.key.sql        |   0
 .../install/mysql/tables/llx_stock_mouvement.sql    |   0
 .../install/mysql/tables/llx_subscription.key.sql   |   0
 .../install/mysql/tables/llx_subscription.sql       |   0
 .../install/mysql/tables/llx_supplier_proposal.sql  |   0
 .../tables/llx_supplier_proposal_extrafields.sql    |   0
 .../mysql/tables/llx_supplier_proposaldet.sql       |   0
 .../tables/llx_supplier_proposaldet_extrafields.sql |   0
 {htdocs => public}/install/mysql/tables/llx_tva.sql |   0
 .../install/mysql/tables/llx_user.key.sql           |   0
 .../install/mysql/tables/llx_user.sql               |   0
 .../install/mysql/tables/llx_user_alert.sql         |   0
 .../install/mysql/tables/llx_user_clicktodial.sql   |   0
 .../mysql/tables/llx_user_employment.key.sql        |   0
 .../install/mysql/tables/llx_user_employment.sql    |   0
 .../mysql/tables/llx_user_extrafields.key.sql       |   0
 .../install/mysql/tables/llx_user_extrafields.sql   |   0
 .../install/mysql/tables/llx_user_param.key.sql     |   0
 .../install/mysql/tables/llx_user_param.sql         |   0
 .../install/mysql/tables/llx_user_rib.sql           |   0
 .../install/mysql/tables/llx_user_rights.key.sql    |   0
 .../install/mysql/tables/llx_user_rights.sql        |   0
 .../install/mysql/tables/llx_usergroup.key.sql      |   0
 .../install/mysql/tables/llx_usergroup.sql          |   0
 .../mysql/tables/llx_usergroup_extrafields.key.sql  |   0
 .../mysql/tables/llx_usergroup_extrafields.sql      |   0
 .../mysql/tables/llx_usergroup_rights.key.sql       |   0
 .../install/mysql/tables/llx_usergroup_rights.sql   |   0
 .../install/mysql/tables/llx_usergroup_user.key.sql |   0
 .../install/mysql/tables/llx_usergroup_user.sql     |   0
 .../install/mysql/tables/llx_website.key.sql        |   0
 .../install/mysql/tables/llx_website.sql            |   0
 .../install/mysql/tables/llx_website_pages.key.sql  |   0
 .../install/mysql/tables/llx_website_pages.sql      |   0
 {htdocs => public}/install/pgsql/README             |   0
 .../install/pgsql/functions/functions.sql           |   0
 .../install/pgsql/functions/index.html              |   0
 {htdocs => public}/install/pgsql/index.html         |   0
 {htdocs => public}/install/phpinfo.php              |   0
 {htdocs => public}/install/repair.php               |   0
 {htdocs => public}/install/robots.txt               |   0
 .../install/sqlite3/functions/functions.sql         |   0
 {htdocs => public}/install/sqlite3/index.html       |   0
 {htdocs => public}/install/step1.php                |   0
 {htdocs => public}/install/step2.php                |   0
 {htdocs => public}/install/step4.php                |   0
 {htdocs => public}/install/step5.php                |   0
 {htdocs => public}/install/upgrade.php              |   0
 {htdocs => public}/install/upgrade2.php             |   0
 {htdocs => public}/langs/HOWTO-Translation.txt      |   0
 {htdocs => public}/langs/ar_SA/accountancy.lang     |   0
 {htdocs => public}/langs/ar_SA/admin.lang           |   0
 {htdocs => public}/langs/ar_SA/agenda.lang          |   0
 {htdocs => public}/langs/ar_SA/banks.lang           |   0
 {htdocs => public}/langs/ar_SA/bills.lang           |   0
 {htdocs => public}/langs/ar_SA/bookmarks.lang       |   0
 {htdocs => public}/langs/ar_SA/boxes.lang           |   0
 {htdocs => public}/langs/ar_SA/cashdesk.lang        |   0
 {htdocs => public}/langs/ar_SA/categories.lang      |   0
 {htdocs => public}/langs/ar_SA/commercial.lang      |   0
 {htdocs => public}/langs/ar_SA/companies.lang       |   0
 {htdocs => public}/langs/ar_SA/compta.lang          |   0
 {htdocs => public}/langs/ar_SA/contracts.lang       |   0
 {htdocs => public}/langs/ar_SA/cron.lang            |   0
 {htdocs => public}/langs/ar_SA/deliveries.lang      |   0
 {htdocs => public}/langs/ar_SA/dict.lang            |   0
 {htdocs => public}/langs/ar_SA/donations.lang       |   0
 {htdocs => public}/langs/ar_SA/ecm.lang             |   0
 {htdocs => public}/langs/ar_SA/errors.lang          |   0
 {htdocs => public}/langs/ar_SA/exports.lang         |   0
 {htdocs => public}/langs/ar_SA/externalsite.lang    |   0
 {htdocs => public}/langs/ar_SA/ftp.lang             |   0
 {htdocs => public}/langs/ar_SA/help.lang            |   0
 {htdocs => public}/langs/ar_SA/holiday.lang         |   0
 {htdocs => public}/langs/ar_SA/hrm.lang             |   0
 {htdocs => public}/langs/ar_SA/incoterm.lang        |   0
 {htdocs => public}/langs/ar_SA/install.lang         |   0
 {htdocs => public}/langs/ar_SA/interventions.lang   |   0
 {htdocs => public}/langs/ar_SA/languages.lang       |   0
 {htdocs => public}/langs/ar_SA/ldap.lang            |   0
 {htdocs => public}/langs/ar_SA/link.lang            |   0
 {htdocs => public}/langs/ar_SA/loan.lang            |   0
 {htdocs => public}/langs/ar_SA/mailmanspip.lang     |   0
 {htdocs => public}/langs/ar_SA/mails.lang           |   0
 {htdocs => public}/langs/ar_SA/main.lang            |   0
 {htdocs => public}/langs/ar_SA/margins.lang         |   0
 {htdocs => public}/langs/ar_SA/members.lang         |   0
 {htdocs => public}/langs/ar_SA/oauth.lang           |   0
 {htdocs => public}/langs/ar_SA/opensurvey.lang      |   0
 {htdocs => public}/langs/ar_SA/orders.lang          |   0
 {htdocs => public}/langs/ar_SA/other.lang           |   0
 {htdocs => public}/langs/ar_SA/paybox.lang          |   0
 {htdocs => public}/langs/ar_SA/paypal.lang          |   0
 {htdocs => public}/langs/ar_SA/printing.lang        |   0
 {htdocs => public}/langs/ar_SA/productbatch.lang    |   0
 {htdocs => public}/langs/ar_SA/products.lang        |   0
 {htdocs => public}/langs/ar_SA/projects.lang        |   0
 {htdocs => public}/langs/ar_SA/propal.lang          |   0
 {htdocs => public}/langs/ar_SA/receiptprinter.lang  |   0
 {htdocs => public}/langs/ar_SA/resource.lang        |   0
 {htdocs => public}/langs/ar_SA/salaries.lang        |   0
 {htdocs => public}/langs/ar_SA/sendings.lang        |   0
 {htdocs => public}/langs/ar_SA/sms.lang             |   0
 {htdocs => public}/langs/ar_SA/stocks.lang          |   0
 .../langs/ar_SA/supplier_proposal.lang              |   0
 {htdocs => public}/langs/ar_SA/suppliers.lang       |   0
 {htdocs => public}/langs/ar_SA/trips.lang           |   0
 {htdocs => public}/langs/ar_SA/users.lang           |   0
 {htdocs => public}/langs/ar_SA/website.lang         |   0
 {htdocs => public}/langs/ar_SA/withdrawals.lang     |   0
 {htdocs => public}/langs/ar_SA/workflow.lang        |   0
 {htdocs => public}/langs/bg_BG/accountancy.lang     |   0
 {htdocs => public}/langs/bg_BG/admin.lang           |   0
 {htdocs => public}/langs/bg_BG/agenda.lang          |   0
 {htdocs => public}/langs/bg_BG/banks.lang           |   0
 {htdocs => public}/langs/bg_BG/bills.lang           |   0
 {htdocs => public}/langs/bg_BG/bookmarks.lang       |   0
 {htdocs => public}/langs/bg_BG/boxes.lang           |   0
 {htdocs => public}/langs/bg_BG/cashdesk.lang        |   0
 {htdocs => public}/langs/bg_BG/categories.lang      |   0
 {htdocs => public}/langs/bg_BG/commercial.lang      |   0
 {htdocs => public}/langs/bg_BG/companies.lang       |   0
 {htdocs => public}/langs/bg_BG/compta.lang          |   0
 {htdocs => public}/langs/bg_BG/contracts.lang       |   0
 {htdocs => public}/langs/bg_BG/cron.lang            |   0
 {htdocs => public}/langs/bg_BG/deliveries.lang      |   0
 {htdocs => public}/langs/bg_BG/dict.lang            |   0
 {htdocs => public}/langs/bg_BG/donations.lang       |   0
 {htdocs => public}/langs/bg_BG/ecm.lang             |   0
 {htdocs => public}/langs/bg_BG/errors.lang          |   0
 {htdocs => public}/langs/bg_BG/exports.lang         |   0
 {htdocs => public}/langs/bg_BG/externalsite.lang    |   0
 {htdocs => public}/langs/bg_BG/ftp.lang             |   0
 {htdocs => public}/langs/bg_BG/help.lang            |   0
 {htdocs => public}/langs/bg_BG/holiday.lang         |   0
 {htdocs => public}/langs/bg_BG/hrm.lang             |   0
 {htdocs => public}/langs/bg_BG/incoterm.lang        |   0
 {htdocs => public}/langs/bg_BG/install.lang         |   0
 {htdocs => public}/langs/bg_BG/interventions.lang   |   0
 {htdocs => public}/langs/bg_BG/languages.lang       |   0
 {htdocs => public}/langs/bg_BG/ldap.lang            |   0
 {htdocs => public}/langs/bg_BG/link.lang            |   0
 {htdocs => public}/langs/bg_BG/loan.lang            |   0
 {htdocs => public}/langs/bg_BG/mailmanspip.lang     |   0
 {htdocs => public}/langs/bg_BG/mails.lang           |   0
 {htdocs => public}/langs/bg_BG/main.lang            |   0
 {htdocs => public}/langs/bg_BG/margins.lang         |   0
 {htdocs => public}/langs/bg_BG/members.lang         |   0
 {htdocs => public}/langs/bg_BG/oauth.lang           |   0
 {htdocs => public}/langs/bg_BG/opensurvey.lang      |   0
 {htdocs => public}/langs/bg_BG/orders.lang          |   0
 {htdocs => public}/langs/bg_BG/other.lang           |   0
 {htdocs => public}/langs/bg_BG/paybox.lang          |   0
 {htdocs => public}/langs/bg_BG/paypal.lang          |   0
 {htdocs => public}/langs/bg_BG/printing.lang        |   0
 {htdocs => public}/langs/bg_BG/productbatch.lang    |   0
 {htdocs => public}/langs/bg_BG/products.lang        |   0
 {htdocs => public}/langs/bg_BG/projects.lang        |   0
 {htdocs => public}/langs/bg_BG/propal.lang          |   0
 {htdocs => public}/langs/bg_BG/receiptprinter.lang  |   0
 {htdocs => public}/langs/bg_BG/resource.lang        |   0
 {htdocs => public}/langs/bg_BG/salaries.lang        |   0
 {htdocs => public}/langs/bg_BG/sendings.lang        |   0
 {htdocs => public}/langs/bg_BG/sms.lang             |   0
 {htdocs => public}/langs/bg_BG/stocks.lang          |   0
 .../langs/bg_BG/supplier_proposal.lang              |   0
 {htdocs => public}/langs/bg_BG/suppliers.lang       |   0
 {htdocs => public}/langs/bg_BG/trips.lang           |   0
 {htdocs => public}/langs/bg_BG/users.lang           |   0
 {htdocs => public}/langs/bg_BG/website.lang         |   0
 {htdocs => public}/langs/bg_BG/withdrawals.lang     |   0
 {htdocs => public}/langs/bg_BG/workflow.lang        |   0
 {htdocs => public}/langs/bn_BD/accountancy.lang     |   0
 {htdocs => public}/langs/bn_BD/admin.lang           |   0
 {htdocs => public}/langs/bn_BD/agenda.lang          |   0
 {htdocs => public}/langs/bn_BD/banks.lang           |   0
 {htdocs => public}/langs/bn_BD/bills.lang           |   0
 {htdocs => public}/langs/bn_BD/bookmarks.lang       |   0
 {htdocs => public}/langs/bn_BD/boxes.lang           |   0
 {htdocs => public}/langs/bn_BD/cashdesk.lang        |   0
 {htdocs => public}/langs/bn_BD/categories.lang      |   0
 {htdocs => public}/langs/bn_BD/commercial.lang      |   0
 {htdocs => public}/langs/bn_BD/companies.lang       |   0
 {htdocs => public}/langs/bn_BD/compta.lang          |   0
 {htdocs => public}/langs/bn_BD/contracts.lang       |   0
 {htdocs => public}/langs/bn_BD/cron.lang            |   0
 {htdocs => public}/langs/bn_BD/deliveries.lang      |   0
 {htdocs => public}/langs/bn_BD/dict.lang            |   0
 {htdocs => public}/langs/bn_BD/donations.lang       |   0
 {htdocs => public}/langs/bn_BD/ecm.lang             |   0
 {htdocs => public}/langs/bn_BD/errors.lang          |   0
 {htdocs => public}/langs/bn_BD/exports.lang         |   0
 {htdocs => public}/langs/bn_BD/externalsite.lang    |   0
 {htdocs => public}/langs/bn_BD/ftp.lang             |   0
 {htdocs => public}/langs/bn_BD/help.lang            |   0
 {htdocs => public}/langs/bn_BD/holiday.lang         |   0
 {htdocs => public}/langs/bn_BD/hrm.lang             |   0
 {htdocs => public}/langs/bn_BD/incoterm.lang        |   0
 {htdocs => public}/langs/bn_BD/install.lang         |   0
 {htdocs => public}/langs/bn_BD/interventions.lang   |   0
 {htdocs => public}/langs/bn_BD/languages.lang       |   0
 {htdocs => public}/langs/bn_BD/ldap.lang            |   0
 {htdocs => public}/langs/bn_BD/link.lang            |   0
 {htdocs => public}/langs/bn_BD/loan.lang            |   0
 {htdocs => public}/langs/bn_BD/mailmanspip.lang     |   0
 {htdocs => public}/langs/bn_BD/mails.lang           |   0
 {htdocs => public}/langs/bn_BD/main.lang            |   0
 {htdocs => public}/langs/bn_BD/margins.lang         |   0
 {htdocs => public}/langs/bn_BD/members.lang         |   0
 {htdocs => public}/langs/bn_BD/oauth.lang           |   0
 {htdocs => public}/langs/bn_BD/opensurvey.lang      |   0
 {htdocs => public}/langs/bn_BD/orders.lang          |   0
 {htdocs => public}/langs/bn_BD/other.lang           |   0
 {htdocs => public}/langs/bn_BD/paybox.lang          |   0
 {htdocs => public}/langs/bn_BD/paypal.lang          |   0
 {htdocs => public}/langs/bn_BD/printing.lang        |   0
 {htdocs => public}/langs/bn_BD/productbatch.lang    |   0
 {htdocs => public}/langs/bn_BD/products.lang        |   0
 {htdocs => public}/langs/bn_BD/projects.lang        |   0
 {htdocs => public}/langs/bn_BD/propal.lang          |   0
 {htdocs => public}/langs/bn_BD/receiptprinter.lang  |   0
 {htdocs => public}/langs/bn_BD/resource.lang        |   0
 {htdocs => public}/langs/bn_BD/salaries.lang        |   0
 {htdocs => public}/langs/bn_BD/sendings.lang        |   0
 {htdocs => public}/langs/bn_BD/sms.lang             |   0
 {htdocs => public}/langs/bn_BD/stocks.lang          |   0
 .../langs/bn_BD/supplier_proposal.lang              |   0
 {htdocs => public}/langs/bn_BD/suppliers.lang       |   0
 {htdocs => public}/langs/bn_BD/trips.lang           |   0
 {htdocs => public}/langs/bn_BD/users.lang           |   0
 {htdocs => public}/langs/bn_BD/website.lang         |   0
 {htdocs => public}/langs/bn_BD/withdrawals.lang     |   0
 {htdocs => public}/langs/bn_BD/workflow.lang        |   0
 {htdocs => public}/langs/bs_BA/accountancy.lang     |   0
 {htdocs => public}/langs/bs_BA/admin.lang           |   0
 {htdocs => public}/langs/bs_BA/agenda.lang          |   0
 {htdocs => public}/langs/bs_BA/banks.lang           |   0
 {htdocs => public}/langs/bs_BA/bills.lang           |   0
 {htdocs => public}/langs/bs_BA/bookmarks.lang       |   0
 {htdocs => public}/langs/bs_BA/boxes.lang           |   0
 {htdocs => public}/langs/bs_BA/cashdesk.lang        |   0
 {htdocs => public}/langs/bs_BA/categories.lang      |   0
 {htdocs => public}/langs/bs_BA/commercial.lang      |   0
 {htdocs => public}/langs/bs_BA/companies.lang       |   0
 {htdocs => public}/langs/bs_BA/compta.lang          |   0
 {htdocs => public}/langs/bs_BA/contracts.lang       |   0
 {htdocs => public}/langs/bs_BA/cron.lang            |   0
 {htdocs => public}/langs/bs_BA/deliveries.lang      |   0
 {htdocs => public}/langs/bs_BA/dict.lang            |   0
 {htdocs => public}/langs/bs_BA/donations.lang       |   0
 {htdocs => public}/langs/bs_BA/ecm.lang             |   0
 {htdocs => public}/langs/bs_BA/errors.lang          |   0
 {htdocs => public}/langs/bs_BA/exports.lang         |   0
 {htdocs => public}/langs/bs_BA/externalsite.lang    |   0
 {htdocs => public}/langs/bs_BA/ftp.lang             |   0
 {htdocs => public}/langs/bs_BA/help.lang            |   0
 {htdocs => public}/langs/bs_BA/holiday.lang         |   0
 {htdocs => public}/langs/bs_BA/hrm.lang             |   0
 {htdocs => public}/langs/bs_BA/incoterm.lang        |   0
 {htdocs => public}/langs/bs_BA/install.lang         |   0
 {htdocs => public}/langs/bs_BA/interventions.lang   |   0
 {htdocs => public}/langs/bs_BA/languages.lang       |   0
 {htdocs => public}/langs/bs_BA/ldap.lang            |   0
 {htdocs => public}/langs/bs_BA/link.lang            |   0
 {htdocs => public}/langs/bs_BA/loan.lang            |   0
 {htdocs => public}/langs/bs_BA/mailmanspip.lang     |   0
 {htdocs => public}/langs/bs_BA/mails.lang           |   0
 {htdocs => public}/langs/bs_BA/main.lang            |   0
 {htdocs => public}/langs/bs_BA/margins.lang         |   0
 {htdocs => public}/langs/bs_BA/members.lang         |   0
 {htdocs => public}/langs/bs_BA/oauth.lang           |   0
 {htdocs => public}/langs/bs_BA/opensurvey.lang      |   0
 {htdocs => public}/langs/bs_BA/orders.lang          |   0
 {htdocs => public}/langs/bs_BA/other.lang           |   0
 {htdocs => public}/langs/bs_BA/paybox.lang          |   0
 {htdocs => public}/langs/bs_BA/paypal.lang          |   0
 {htdocs => public}/langs/bs_BA/printing.lang        |   0
 {htdocs => public}/langs/bs_BA/productbatch.lang    |   0
 {htdocs => public}/langs/bs_BA/products.lang        |   0
 {htdocs => public}/langs/bs_BA/projects.lang        |   0
 {htdocs => public}/langs/bs_BA/propal.lang          |   0
 {htdocs => public}/langs/bs_BA/receiptprinter.lang  |   0
 {htdocs => public}/langs/bs_BA/resource.lang        |   0
 {htdocs => public}/langs/bs_BA/salaries.lang        |   0
 {htdocs => public}/langs/bs_BA/sendings.lang        |   0
 {htdocs => public}/langs/bs_BA/sms.lang             |   0
 {htdocs => public}/langs/bs_BA/stocks.lang          |   0
 .../langs/bs_BA/supplier_proposal.lang              |   0
 {htdocs => public}/langs/bs_BA/suppliers.lang       |   0
 {htdocs => public}/langs/bs_BA/trips.lang           |   0
 {htdocs => public}/langs/bs_BA/users.lang           |   0
 {htdocs => public}/langs/bs_BA/website.lang         |   0
 {htdocs => public}/langs/bs_BA/withdrawals.lang     |   0
 {htdocs => public}/langs/bs_BA/workflow.lang        |   0
 {htdocs => public}/langs/ca_ES/accountancy.lang     |   0
 {htdocs => public}/langs/ca_ES/admin.lang           |   0
 {htdocs => public}/langs/ca_ES/agenda.lang          |   0
 {htdocs => public}/langs/ca_ES/banks.lang           |   0
 {htdocs => public}/langs/ca_ES/bills.lang           |   0
 {htdocs => public}/langs/ca_ES/bookmarks.lang       |   0
 {htdocs => public}/langs/ca_ES/boxes.lang           |   0
 {htdocs => public}/langs/ca_ES/cashdesk.lang        |   0
 {htdocs => public}/langs/ca_ES/categories.lang      |   0
 {htdocs => public}/langs/ca_ES/commercial.lang      |   0
 {htdocs => public}/langs/ca_ES/companies.lang       |   0
 {htdocs => public}/langs/ca_ES/compta.lang          |   0
 {htdocs => public}/langs/ca_ES/contracts.lang       |   0
 {htdocs => public}/langs/ca_ES/cron.lang            |   0
 {htdocs => public}/langs/ca_ES/deliveries.lang      |   0
 {htdocs => public}/langs/ca_ES/dict.lang            |   0
 {htdocs => public}/langs/ca_ES/donations.lang       |   0
 {htdocs => public}/langs/ca_ES/ecm.lang             |   0
 {htdocs => public}/langs/ca_ES/errors.lang          |   0
 {htdocs => public}/langs/ca_ES/exports.lang         |   0
 {htdocs => public}/langs/ca_ES/externalsite.lang    |   0
 {htdocs => public}/langs/ca_ES/ftp.lang             |   0
 {htdocs => public}/langs/ca_ES/help.lang            |   0
 {htdocs => public}/langs/ca_ES/holiday.lang         |   0
 {htdocs => public}/langs/ca_ES/hrm.lang             |   0
 {htdocs => public}/langs/ca_ES/incoterm.lang        |   0
 {htdocs => public}/langs/ca_ES/install.lang         |   0
 {htdocs => public}/langs/ca_ES/interventions.lang   |   0
 {htdocs => public}/langs/ca_ES/languages.lang       |   0
 {htdocs => public}/langs/ca_ES/ldap.lang            |   0
 {htdocs => public}/langs/ca_ES/link.lang            |   0
 {htdocs => public}/langs/ca_ES/loan.lang            |   0
 {htdocs => public}/langs/ca_ES/mailmanspip.lang     |   0
 {htdocs => public}/langs/ca_ES/mails.lang           |   0
 {htdocs => public}/langs/ca_ES/main.lang            |   0
 {htdocs => public}/langs/ca_ES/margins.lang         |   0
 {htdocs => public}/langs/ca_ES/members.lang         |   0
 {htdocs => public}/langs/ca_ES/oauth.lang           |   0
 {htdocs => public}/langs/ca_ES/opensurvey.lang      |   0
 {htdocs => public}/langs/ca_ES/orders.lang          |   0
 {htdocs => public}/langs/ca_ES/other.lang           |   0
 {htdocs => public}/langs/ca_ES/paybox.lang          |   0
 {htdocs => public}/langs/ca_ES/paypal.lang          |   0
 {htdocs => public}/langs/ca_ES/printing.lang        |   0
 {htdocs => public}/langs/ca_ES/productbatch.lang    |   0
 {htdocs => public}/langs/ca_ES/products.lang        |   0
 {htdocs => public}/langs/ca_ES/projects.lang        |   0
 {htdocs => public}/langs/ca_ES/propal.lang          |   0
 {htdocs => public}/langs/ca_ES/receiptprinter.lang  |   0
 {htdocs => public}/langs/ca_ES/resource.lang        |   0
 {htdocs => public}/langs/ca_ES/salaries.lang        |   0
 {htdocs => public}/langs/ca_ES/sendings.lang        |   0
 {htdocs => public}/langs/ca_ES/sms.lang             |   0
 {htdocs => public}/langs/ca_ES/stocks.lang          |   0
 .../langs/ca_ES/supplier_proposal.lang              |   0
 {htdocs => public}/langs/ca_ES/suppliers.lang       |   0
 {htdocs => public}/langs/ca_ES/trips.lang           |   0
 {htdocs => public}/langs/ca_ES/users.lang           |   0
 {htdocs => public}/langs/ca_ES/website.lang         |   0
 {htdocs => public}/langs/ca_ES/withdrawals.lang     |   0
 {htdocs => public}/langs/ca_ES/workflow.lang        |   0
 {htdocs => public}/langs/cs_CZ/accountancy.lang     |   0
 {htdocs => public}/langs/cs_CZ/admin.lang           |   0
 {htdocs => public}/langs/cs_CZ/agenda.lang          |   0
 {htdocs => public}/langs/cs_CZ/banks.lang           |   0
 {htdocs => public}/langs/cs_CZ/bills.lang           |   0
 {htdocs => public}/langs/cs_CZ/bookmarks.lang       |   0
 {htdocs => public}/langs/cs_CZ/boxes.lang           |   0
 {htdocs => public}/langs/cs_CZ/cashdesk.lang        |   0
 {htdocs => public}/langs/cs_CZ/categories.lang      |   0
 {htdocs => public}/langs/cs_CZ/commercial.lang      |   0
 {htdocs => public}/langs/cs_CZ/companies.lang       |   0
 {htdocs => public}/langs/cs_CZ/compta.lang          |   0
 {htdocs => public}/langs/cs_CZ/contracts.lang       |   0
 {htdocs => public}/langs/cs_CZ/cron.lang            |   0
 {htdocs => public}/langs/cs_CZ/deliveries.lang      |   0
 {htdocs => public}/langs/cs_CZ/dict.lang            |   0
 {htdocs => public}/langs/cs_CZ/donations.lang       |   0
 {htdocs => public}/langs/cs_CZ/ecm.lang             |   0
 {htdocs => public}/langs/cs_CZ/errors.lang          |   0
 {htdocs => public}/langs/cs_CZ/exports.lang         |   0
 {htdocs => public}/langs/cs_CZ/externalsite.lang    |   0
 {htdocs => public}/langs/cs_CZ/ftp.lang             |   0
 {htdocs => public}/langs/cs_CZ/help.lang            |   0
 {htdocs => public}/langs/cs_CZ/holiday.lang         |   0
 {htdocs => public}/langs/cs_CZ/hrm.lang             |   0
 {htdocs => public}/langs/cs_CZ/incoterm.lang        |   0
 {htdocs => public}/langs/cs_CZ/install.lang         |   0
 {htdocs => public}/langs/cs_CZ/interventions.lang   |   0
 {htdocs => public}/langs/cs_CZ/languages.lang       |   0
 {htdocs => public}/langs/cs_CZ/ldap.lang            |   0
 {htdocs => public}/langs/cs_CZ/link.lang            |   0
 {htdocs => public}/langs/cs_CZ/loan.lang            |   0
 {htdocs => public}/langs/cs_CZ/mailmanspip.lang     |   0
 {htdocs => public}/langs/cs_CZ/mails.lang           |   0
 {htdocs => public}/langs/cs_CZ/main.lang            |   0
 {htdocs => public}/langs/cs_CZ/margins.lang         |   0
 {htdocs => public}/langs/cs_CZ/members.lang         |   0
 {htdocs => public}/langs/cs_CZ/oauth.lang           |   0
 {htdocs => public}/langs/cs_CZ/opensurvey.lang      |   0
 {htdocs => public}/langs/cs_CZ/orders.lang          |   0
 {htdocs => public}/langs/cs_CZ/other.lang           |   0
 {htdocs => public}/langs/cs_CZ/paybox.lang          |   0
 {htdocs => public}/langs/cs_CZ/paypal.lang          |   0
 {htdocs => public}/langs/cs_CZ/printing.lang        |   0
 {htdocs => public}/langs/cs_CZ/productbatch.lang    |   0
 {htdocs => public}/langs/cs_CZ/products.lang        |   0
 {htdocs => public}/langs/cs_CZ/projects.lang        |   0
 {htdocs => public}/langs/cs_CZ/propal.lang          |   0
 {htdocs => public}/langs/cs_CZ/receiptprinter.lang  |   0
 {htdocs => public}/langs/cs_CZ/resource.lang        |   0
 {htdocs => public}/langs/cs_CZ/salaries.lang        |   0
 {htdocs => public}/langs/cs_CZ/sendings.lang        |   0
 {htdocs => public}/langs/cs_CZ/sms.lang             |   0
 {htdocs => public}/langs/cs_CZ/stocks.lang          |   0
 .../langs/cs_CZ/supplier_proposal.lang              |   0
 {htdocs => public}/langs/cs_CZ/suppliers.lang       |   0
 {htdocs => public}/langs/cs_CZ/trips.lang           |   0
 {htdocs => public}/langs/cs_CZ/users.lang           |   0
 {htdocs => public}/langs/cs_CZ/website.lang         |   0
 {htdocs => public}/langs/cs_CZ/withdrawals.lang     |   0
 {htdocs => public}/langs/cs_CZ/workflow.lang        |   0
 {htdocs => public}/langs/da_DK/accountancy.lang     |   0
 {htdocs => public}/langs/da_DK/admin.lang           |   0
 {htdocs => public}/langs/da_DK/agenda.lang          |   0
 {htdocs => public}/langs/da_DK/banks.lang           |   0
 {htdocs => public}/langs/da_DK/bills.lang           |   0
 {htdocs => public}/langs/da_DK/bookmarks.lang       |   0
 {htdocs => public}/langs/da_DK/boxes.lang           |   0
 {htdocs => public}/langs/da_DK/cashdesk.lang        |   0
 {htdocs => public}/langs/da_DK/categories.lang      |   0
 {htdocs => public}/langs/da_DK/commercial.lang      |   0
 {htdocs => public}/langs/da_DK/companies.lang       |   0
 {htdocs => public}/langs/da_DK/compta.lang          |   0
 {htdocs => public}/langs/da_DK/contracts.lang       |   0
 {htdocs => public}/langs/da_DK/cron.lang            |   0
 {htdocs => public}/langs/da_DK/deliveries.lang      |   0
 {htdocs => public}/langs/da_DK/dict.lang            |   0
 {htdocs => public}/langs/da_DK/donations.lang       |   0
 {htdocs => public}/langs/da_DK/ecm.lang             |   0
 {htdocs => public}/langs/da_DK/errors.lang          |   0
 {htdocs => public}/langs/da_DK/exports.lang         |   0
 {htdocs => public}/langs/da_DK/externalsite.lang    |   0
 {htdocs => public}/langs/da_DK/ftp.lang             |   0
 {htdocs => public}/langs/da_DK/help.lang            |   0
 {htdocs => public}/langs/da_DK/holiday.lang         |   0
 {htdocs => public}/langs/da_DK/hrm.lang             |   0
 {htdocs => public}/langs/da_DK/incoterm.lang        |   0
 {htdocs => public}/langs/da_DK/install.lang         |   0
 {htdocs => public}/langs/da_DK/interventions.lang   |   0
 {htdocs => public}/langs/da_DK/languages.lang       |   0
 {htdocs => public}/langs/da_DK/ldap.lang            |   0
 {htdocs => public}/langs/da_DK/link.lang            |   0
 {htdocs => public}/langs/da_DK/loan.lang            |   0
 {htdocs => public}/langs/da_DK/mailmanspip.lang     |   0
 {htdocs => public}/langs/da_DK/mails.lang           |   0
 {htdocs => public}/langs/da_DK/main.lang            |   0
 {htdocs => public}/langs/da_DK/margins.lang         |   0
 {htdocs => public}/langs/da_DK/members.lang         |   0
 {htdocs => public}/langs/da_DK/oauth.lang           |   0
 {htdocs => public}/langs/da_DK/opensurvey.lang      |   0
 {htdocs => public}/langs/da_DK/orders.lang          |   0
 {htdocs => public}/langs/da_DK/other.lang           |   0
 {htdocs => public}/langs/da_DK/paybox.lang          |   0
 {htdocs => public}/langs/da_DK/paypal.lang          |   0
 {htdocs => public}/langs/da_DK/printing.lang        |   0
 {htdocs => public}/langs/da_DK/productbatch.lang    |   0
 {htdocs => public}/langs/da_DK/products.lang        |   0
 {htdocs => public}/langs/da_DK/projects.lang        |   0
 {htdocs => public}/langs/da_DK/propal.lang          |   0
 {htdocs => public}/langs/da_DK/receiptprinter.lang  |   0
 {htdocs => public}/langs/da_DK/resource.lang        |   0
 {htdocs => public}/langs/da_DK/salaries.lang        |   0
 {htdocs => public}/langs/da_DK/sendings.lang        |   0
 {htdocs => public}/langs/da_DK/sms.lang             |   0
 {htdocs => public}/langs/da_DK/stocks.lang          |   0
 .../langs/da_DK/supplier_proposal.lang              |   0
 {htdocs => public}/langs/da_DK/suppliers.lang       |   0
 {htdocs => public}/langs/da_DK/trips.lang           |   0
 {htdocs => public}/langs/da_DK/users.lang           |   0
 {htdocs => public}/langs/da_DK/website.lang         |   0
 {htdocs => public}/langs/da_DK/withdrawals.lang     |   0
 {htdocs => public}/langs/da_DK/workflow.lang        |   0
 {htdocs => public}/langs/de_AT/accountancy.lang     |   0
 {htdocs => public}/langs/de_AT/admin.lang           |   0
 {htdocs => public}/langs/de_AT/agenda.lang          |   0
 {htdocs => public}/langs/de_AT/banks.lang           |   0
 {htdocs => public}/langs/de_AT/bills.lang           |   0
 {htdocs => public}/langs/de_AT/bookmarks.lang       |   0
 {htdocs => public}/langs/de_AT/boxes.lang           |   0
 {htdocs => public}/langs/de_AT/cashdesk.lang        |   0
 {htdocs => public}/langs/de_AT/categories.lang      |   0
 {htdocs => public}/langs/de_AT/commercial.lang      |   0
 {htdocs => public}/langs/de_AT/companies.lang       |   0
 {htdocs => public}/langs/de_AT/compta.lang          |   0
 {htdocs => public}/langs/de_AT/contracts.lang       |   0
 {htdocs => public}/langs/de_AT/cron.lang            |   0
 {htdocs => public}/langs/de_AT/deliveries.lang      |   0
 {htdocs => public}/langs/de_AT/dict.lang            |   0
 {htdocs => public}/langs/de_AT/donations.lang       |   0
 {htdocs => public}/langs/de_AT/ecm.lang             |   0
 {htdocs => public}/langs/de_AT/errors.lang          |   0
 {htdocs => public}/langs/de_AT/exports.lang         |   0
 {htdocs => public}/langs/de_AT/externalsite.lang    |   0
 {htdocs => public}/langs/de_AT/ftp.lang             |   0
 {htdocs => public}/langs/de_AT/help.lang            |   0
 {htdocs => public}/langs/de_AT/holiday.lang         |   0
 {htdocs => public}/langs/de_AT/hrm.lang             |   0
 {htdocs => public}/langs/de_AT/incoterm.lang        |   0
 {htdocs => public}/langs/de_AT/install.lang         |   0
 {htdocs => public}/langs/de_AT/interventions.lang   |   0
 {htdocs => public}/langs/de_AT/languages.lang       |   0
 {htdocs => public}/langs/de_AT/ldap.lang            |   0
 {htdocs => public}/langs/de_AT/link.lang            |   0
 {htdocs => public}/langs/de_AT/loan.lang            |   0
 {htdocs => public}/langs/de_AT/mailmanspip.lang     |   0
 {htdocs => public}/langs/de_AT/mails.lang           |   0
 {htdocs => public}/langs/de_AT/main.lang            |   0
 {htdocs => public}/langs/de_AT/margins.lang         |   0
 {htdocs => public}/langs/de_AT/members.lang         |   0
 {htdocs => public}/langs/de_AT/oauth.lang           |   0
 {htdocs => public}/langs/de_AT/opensurvey.lang      |   0
 {htdocs => public}/langs/de_AT/orders.lang          |   0
 {htdocs => public}/langs/de_AT/other.lang           |   0
 {htdocs => public}/langs/de_AT/paybox.lang          |   0
 {htdocs => public}/langs/de_AT/paypal.lang          |   0
 {htdocs => public}/langs/de_AT/printing.lang        |   0
 {htdocs => public}/langs/de_AT/productbatch.lang    |   0
 {htdocs => public}/langs/de_AT/products.lang        |   0
 {htdocs => public}/langs/de_AT/projects.lang        |   0
 {htdocs => public}/langs/de_AT/propal.lang          |   0
 {htdocs => public}/langs/de_AT/receiptprinter.lang  |   0
 {htdocs => public}/langs/de_AT/resource.lang        |   0
 {htdocs => public}/langs/de_AT/salaries.lang        |   0
 {htdocs => public}/langs/de_AT/sendings.lang        |   0
 {htdocs => public}/langs/de_AT/sms.lang             |   0
 {htdocs => public}/langs/de_AT/stocks.lang          |   0
 .../langs/de_AT/supplier_proposal.lang              |   0
 {htdocs => public}/langs/de_AT/suppliers.lang       |   0
 {htdocs => public}/langs/de_AT/trips.lang           |   0
 {htdocs => public}/langs/de_AT/users.lang           |   0
 {htdocs => public}/langs/de_AT/website.lang         |   0
 {htdocs => public}/langs/de_AT/withdrawals.lang     |   0
 {htdocs => public}/langs/de_AT/workflow.lang        |   0
 {htdocs => public}/langs/de_CH/accountancy.lang     |   0
 {htdocs => public}/langs/de_CH/admin.lang           |   0
 {htdocs => public}/langs/de_CH/agenda.lang          |   0
 {htdocs => public}/langs/de_CH/banks.lang           |   0
 {htdocs => public}/langs/de_CH/bills.lang           |   0
 {htdocs => public}/langs/de_CH/bookmarks.lang       |   0
 {htdocs => public}/langs/de_CH/boxes.lang           |   0
 {htdocs => public}/langs/de_CH/cashdesk.lang        |   0
 {htdocs => public}/langs/de_CH/categories.lang      |   0
 {htdocs => public}/langs/de_CH/commercial.lang      |   0
 {htdocs => public}/langs/de_CH/companies.lang       |   0
 {htdocs => public}/langs/de_CH/compta.lang          |   0
 {htdocs => public}/langs/de_CH/contracts.lang       |   0
 {htdocs => public}/langs/de_CH/cron.lang            |   0
 {htdocs => public}/langs/de_CH/deliveries.lang      |   0
 {htdocs => public}/langs/de_CH/dict.lang            |   0
 {htdocs => public}/langs/de_CH/donations.lang       |   0
 {htdocs => public}/langs/de_CH/ecm.lang             |   0
 {htdocs => public}/langs/de_CH/errors.lang          |   0
 {htdocs => public}/langs/de_CH/exports.lang         |   0
 {htdocs => public}/langs/de_CH/externalsite.lang    |   0
 {htdocs => public}/langs/de_CH/ftp.lang             |   0
 {htdocs => public}/langs/de_CH/help.lang            |   0
 {htdocs => public}/langs/de_CH/holiday.lang         |   0
 {htdocs => public}/langs/de_CH/hrm.lang             |   0
 {htdocs => public}/langs/de_CH/incoterm.lang        |   0
 {htdocs => public}/langs/de_CH/install.lang         |   0
 {htdocs => public}/langs/de_CH/interventions.lang   |   0
 {htdocs => public}/langs/de_CH/languages.lang       |   0
 {htdocs => public}/langs/de_CH/ldap.lang            |   0
 {htdocs => public}/langs/de_CH/link.lang            |   0
 {htdocs => public}/langs/de_CH/loan.lang            |   0
 {htdocs => public}/langs/de_CH/mailmanspip.lang     |   0
 {htdocs => public}/langs/de_CH/mails.lang           |   0
 {htdocs => public}/langs/de_CH/main.lang            |   0
 {htdocs => public}/langs/de_CH/margins.lang         |   0
 {htdocs => public}/langs/de_CH/members.lang         |   0
 {htdocs => public}/langs/de_CH/oauth.lang           |   0
 {htdocs => public}/langs/de_CH/opensurvey.lang      |   0
 {htdocs => public}/langs/de_CH/orders.lang          |   0
 {htdocs => public}/langs/de_CH/other.lang           |   0
 {htdocs => public}/langs/de_CH/paybox.lang          |   0
 {htdocs => public}/langs/de_CH/paypal.lang          |   0
 {htdocs => public}/langs/de_CH/printing.lang        |   0
 {htdocs => public}/langs/de_CH/productbatch.lang    |   0
 {htdocs => public}/langs/de_CH/products.lang        |   0
 {htdocs => public}/langs/de_CH/projects.lang        |   0
 {htdocs => public}/langs/de_CH/propal.lang          |   0
 {htdocs => public}/langs/de_CH/receiptprinter.lang  |   0
 {htdocs => public}/langs/de_CH/resource.lang        |   0
 {htdocs => public}/langs/de_CH/salaries.lang        |   0
 {htdocs => public}/langs/de_CH/sendings.lang        |   0
 {htdocs => public}/langs/de_CH/sms.lang             |   0
 {htdocs => public}/langs/de_CH/stocks.lang          |   0
 .../langs/de_CH/supplier_proposal.lang              |   0
 {htdocs => public}/langs/de_CH/suppliers.lang       |   0
 {htdocs => public}/langs/de_CH/trips.lang           |   0
 {htdocs => public}/langs/de_CH/users.lang           |   0
 {htdocs => public}/langs/de_CH/website.lang         |   0
 {htdocs => public}/langs/de_CH/withdrawals.lang     |   0
 {htdocs => public}/langs/de_CH/workflow.lang        |   0
 {htdocs => public}/langs/de_DE/accountancy.lang     |   0
 {htdocs => public}/langs/de_DE/admin.lang           |   0
 {htdocs => public}/langs/de_DE/agenda.lang          |   0
 {htdocs => public}/langs/de_DE/banks.lang           |   0
 {htdocs => public}/langs/de_DE/bills.lang           |   0
 {htdocs => public}/langs/de_DE/bookmarks.lang       |   0
 {htdocs => public}/langs/de_DE/boxes.lang           |   0
 {htdocs => public}/langs/de_DE/cashdesk.lang        |   0
 {htdocs => public}/langs/de_DE/categories.lang      |   0
 {htdocs => public}/langs/de_DE/commercial.lang      |   0
 {htdocs => public}/langs/de_DE/companies.lang       |   0
 {htdocs => public}/langs/de_DE/compta.lang          |   0
 {htdocs => public}/langs/de_DE/contracts.lang       |   0
 {htdocs => public}/langs/de_DE/cron.lang            |   0
 {htdocs => public}/langs/de_DE/deliveries.lang      |   0
 {htdocs => public}/langs/de_DE/dict.lang            |   0
 {htdocs => public}/langs/de_DE/donations.lang       |   0
 {htdocs => public}/langs/de_DE/ecm.lang             |   0
 {htdocs => public}/langs/de_DE/errors.lang          |   0
 {htdocs => public}/langs/de_DE/exports.lang         |   0
 {htdocs => public}/langs/de_DE/externalsite.lang    |   0
 {htdocs => public}/langs/de_DE/ftp.lang             |   0
 {htdocs => public}/langs/de_DE/help.lang            |   0
 {htdocs => public}/langs/de_DE/holiday.lang         |   0
 {htdocs => public}/langs/de_DE/hrm.lang             |   0
 {htdocs => public}/langs/de_DE/incoterm.lang        |   0
 {htdocs => public}/langs/de_DE/install.lang         |   0
 {htdocs => public}/langs/de_DE/interventions.lang   |   0
 {htdocs => public}/langs/de_DE/languages.lang       |   0
 {htdocs => public}/langs/de_DE/ldap.lang            |   0
 {htdocs => public}/langs/de_DE/link.lang            |   0
 {htdocs => public}/langs/de_DE/loan.lang            |   0
 {htdocs => public}/langs/de_DE/mailmanspip.lang     |   0
 {htdocs => public}/langs/de_DE/mails.lang           |   0
 {htdocs => public}/langs/de_DE/main.lang            |   0
 {htdocs => public}/langs/de_DE/margins.lang         |   0
 {htdocs => public}/langs/de_DE/members.lang         |   0
 {htdocs => public}/langs/de_DE/oauth.lang           |   0
 {htdocs => public}/langs/de_DE/opensurvey.lang      |   0
 {htdocs => public}/langs/de_DE/orders.lang          |   0
 {htdocs => public}/langs/de_DE/other.lang           |   0
 {htdocs => public}/langs/de_DE/paybox.lang          |   0
 {htdocs => public}/langs/de_DE/paypal.lang          |   0
 {htdocs => public}/langs/de_DE/printing.lang        |   0
 {htdocs => public}/langs/de_DE/productbatch.lang    |   0
 {htdocs => public}/langs/de_DE/products.lang        |   0
 {htdocs => public}/langs/de_DE/projects.lang        |   0
 {htdocs => public}/langs/de_DE/propal.lang          |   0
 {htdocs => public}/langs/de_DE/receiptprinter.lang  |   0
 {htdocs => public}/langs/de_DE/resource.lang        |   0
 {htdocs => public}/langs/de_DE/salaries.lang        |   0
 {htdocs => public}/langs/de_DE/sendings.lang        |   0
 {htdocs => public}/langs/de_DE/sms.lang             |   0
 {htdocs => public}/langs/de_DE/stocks.lang          |   0
 .../langs/de_DE/supplier_proposal.lang              |   0
 {htdocs => public}/langs/de_DE/suppliers.lang       |   0
 {htdocs => public}/langs/de_DE/trips.lang           |   0
 {htdocs => public}/langs/de_DE/users.lang           |   0
 {htdocs => public}/langs/de_DE/website.lang         |   0
 {htdocs => public}/langs/de_DE/withdrawals.lang     |   0
 {htdocs => public}/langs/de_DE/workflow.lang        |   0
 {htdocs => public}/langs/el_GR/accountancy.lang     |   0
 {htdocs => public}/langs/el_GR/admin.lang           |   0
 {htdocs => public}/langs/el_GR/agenda.lang          |   0
 {htdocs => public}/langs/el_GR/banks.lang           |   0
 {htdocs => public}/langs/el_GR/bills.lang           |   0
 {htdocs => public}/langs/el_GR/bookmarks.lang       |   0
 {htdocs => public}/langs/el_GR/boxes.lang           |   0
 {htdocs => public}/langs/el_GR/cashdesk.lang        |   0
 {htdocs => public}/langs/el_GR/categories.lang      |   0
 {htdocs => public}/langs/el_GR/commercial.lang      |   0
 {htdocs => public}/langs/el_GR/commissions.lang     |   0
 {htdocs => public}/langs/el_GR/companies.lang       |   0
 {htdocs => public}/langs/el_GR/compta.lang          |   0
 {htdocs => public}/langs/el_GR/contracts.lang       |   0
 {htdocs => public}/langs/el_GR/cron.lang            |   0
 {htdocs => public}/langs/el_GR/deliveries.lang      |   0
 {htdocs => public}/langs/el_GR/dict.lang            |   0
 {htdocs => public}/langs/el_GR/donations.lang       |   0
 {htdocs => public}/langs/el_GR/ecm.lang             |   0
 {htdocs => public}/langs/el_GR/errors.lang          |   0
 {htdocs => public}/langs/el_GR/exports.lang         |   0
 {htdocs => public}/langs/el_GR/externalsite.lang    |   0
 {htdocs => public}/langs/el_GR/ftp.lang             |   0
 {htdocs => public}/langs/el_GR/help.lang            |   0
 {htdocs => public}/langs/el_GR/holiday.lang         |   0
 {htdocs => public}/langs/el_GR/hrm.lang             |   0
 {htdocs => public}/langs/el_GR/incoterm.lang        |   0
 {htdocs => public}/langs/el_GR/install.lang         |   0
 {htdocs => public}/langs/el_GR/interventions.lang   |   0
 {htdocs => public}/langs/el_GR/languages.lang       |   0
 {htdocs => public}/langs/el_GR/ldap.lang            |   0
 {htdocs => public}/langs/el_GR/link.lang            |   0
 {htdocs => public}/langs/el_GR/loan.lang            |   0
 {htdocs => public}/langs/el_GR/mailmanspip.lang     |   0
 {htdocs => public}/langs/el_GR/mails.lang           |   0
 {htdocs => public}/langs/el_GR/main.lang            |   0
 {htdocs => public}/langs/el_GR/margins.lang         |   0
 {htdocs => public}/langs/el_GR/members.lang         |   0
 {htdocs => public}/langs/el_GR/oauth.lang           |   0
 {htdocs => public}/langs/el_GR/opensurvey.lang      |   0
 {htdocs => public}/langs/el_GR/orders.lang          |   0
 {htdocs => public}/langs/el_GR/other.lang           |   0
 {htdocs => public}/langs/el_GR/paybox.lang          |   0
 {htdocs => public}/langs/el_GR/paypal.lang          |   0
 {htdocs => public}/langs/el_GR/printing.lang        |   0
 {htdocs => public}/langs/el_GR/productbatch.lang    |   0
 {htdocs => public}/langs/el_GR/products.lang        |   0
 {htdocs => public}/langs/el_GR/projects.lang        |   0
 {htdocs => public}/langs/el_GR/propal.lang          |   0
 {htdocs => public}/langs/el_GR/receiptprinter.lang  |   0
 {htdocs => public}/langs/el_GR/resource.lang        |   0
 {htdocs => public}/langs/el_GR/salaries.lang        |   0
 {htdocs => public}/langs/el_GR/sendings.lang        |   0
 {htdocs => public}/langs/el_GR/sms.lang             |   0
 {htdocs => public}/langs/el_GR/stocks.lang          |   0
 .../langs/el_GR/supplier_proposal.lang              |   0
 {htdocs => public}/langs/el_GR/suppliers.lang       |   0
 {htdocs => public}/langs/el_GR/trips.lang           |   0
 {htdocs => public}/langs/el_GR/users.lang           |   0
 {htdocs => public}/langs/el_GR/website.lang         |   0
 {htdocs => public}/langs/el_GR/withdrawals.lang     |   0
 {htdocs => public}/langs/el_GR/workflow.lang        |   0
 {htdocs => public}/langs/en_AU/accountancy.lang     |   0
 {htdocs => public}/langs/en_AU/admin.lang           |   0
 {htdocs => public}/langs/en_AU/agenda.lang          |   0
 {htdocs => public}/langs/en_AU/banks.lang           |   0
 {htdocs => public}/langs/en_AU/bills.lang           |   0
 {htdocs => public}/langs/en_AU/bookmarks.lang       |   0
 {htdocs => public}/langs/en_AU/boxes.lang           |   0
 {htdocs => public}/langs/en_AU/cashdesk.lang        |   0
 {htdocs => public}/langs/en_AU/categories.lang      |   0
 {htdocs => public}/langs/en_AU/commercial.lang      |   0
 {htdocs => public}/langs/en_AU/companies.lang       |   0
 {htdocs => public}/langs/en_AU/compta.lang          |   0
 {htdocs => public}/langs/en_AU/contracts.lang       |   0
 {htdocs => public}/langs/en_AU/cron.lang            |   0
 {htdocs => public}/langs/en_AU/deliveries.lang      |   0
 {htdocs => public}/langs/en_AU/dict.lang            |   0
 {htdocs => public}/langs/en_AU/donations.lang       |   0
 {htdocs => public}/langs/en_AU/ecm.lang             |   0
 {htdocs => public}/langs/en_AU/errors.lang          |   0
 {htdocs => public}/langs/en_AU/exports.lang         |   0
 {htdocs => public}/langs/en_AU/externalsite.lang    |   0
 {htdocs => public}/langs/en_AU/ftp.lang             |   0
 {htdocs => public}/langs/en_AU/help.lang            |   0
 {htdocs => public}/langs/en_AU/holiday.lang         |   0
 {htdocs => public}/langs/en_AU/hrm.lang             |   0
 {htdocs => public}/langs/en_AU/incoterm.lang        |   0
 {htdocs => public}/langs/en_AU/install.lang         |   0
 {htdocs => public}/langs/en_AU/interventions.lang   |   0
 {htdocs => public}/langs/en_AU/languages.lang       |   0
 {htdocs => public}/langs/en_AU/ldap.lang            |   0
 {htdocs => public}/langs/en_AU/link.lang            |   0
 {htdocs => public}/langs/en_AU/loan.lang            |   0
 {htdocs => public}/langs/en_AU/mailmanspip.lang     |   0
 {htdocs => public}/langs/en_AU/mails.lang           |   0
 {htdocs => public}/langs/en_AU/main.lang            |   0
 {htdocs => public}/langs/en_AU/margins.lang         |   0
 {htdocs => public}/langs/en_AU/members.lang         |   0
 {htdocs => public}/langs/en_AU/oauth.lang           |   0
 {htdocs => public}/langs/en_AU/opensurvey.lang      |   0
 {htdocs => public}/langs/en_AU/orders.lang          |   0
 {htdocs => public}/langs/en_AU/other.lang           |   0
 {htdocs => public}/langs/en_AU/paybox.lang          |   0
 {htdocs => public}/langs/en_AU/paypal.lang          |   0
 {htdocs => public}/langs/en_AU/printing.lang        |   0
 {htdocs => public}/langs/en_AU/productbatch.lang    |   0
 {htdocs => public}/langs/en_AU/products.lang        |   0
 {htdocs => public}/langs/en_AU/projects.lang        |   0
 {htdocs => public}/langs/en_AU/propal.lang          |   0
 {htdocs => public}/langs/en_AU/receiptprinter.lang  |   0
 {htdocs => public}/langs/en_AU/resource.lang        |   0
 {htdocs => public}/langs/en_AU/salaries.lang        |   0
 {htdocs => public}/langs/en_AU/sendings.lang        |   0
 {htdocs => public}/langs/en_AU/sms.lang             |   0
 {htdocs => public}/langs/en_AU/stocks.lang          |   0
 .../langs/en_AU/supplier_proposal.lang              |   0
 {htdocs => public}/langs/en_AU/suppliers.lang       |   0
 {htdocs => public}/langs/en_AU/trips.lang           |   0
 {htdocs => public}/langs/en_AU/users.lang           |   0
 {htdocs => public}/langs/en_AU/website.lang         |   0
 {htdocs => public}/langs/en_AU/withdrawals.lang     |   0
 {htdocs => public}/langs/en_AU/workflow.lang        |   0
 {htdocs => public}/langs/en_CA/accountancy.lang     |   0
 {htdocs => public}/langs/en_CA/admin.lang           |   0
 {htdocs => public}/langs/en_CA/agenda.lang          |   0
 {htdocs => public}/langs/en_CA/banks.lang           |   0
 {htdocs => public}/langs/en_CA/bills.lang           |   0
 {htdocs => public}/langs/en_CA/bookmarks.lang       |   0
 {htdocs => public}/langs/en_CA/boxes.lang           |   0
 {htdocs => public}/langs/en_CA/cashdesk.lang        |   0
 {htdocs => public}/langs/en_CA/categories.lang      |   0
 {htdocs => public}/langs/en_CA/commercial.lang      |   0
 {htdocs => public}/langs/en_CA/companies.lang       |   0
 {htdocs => public}/langs/en_CA/compta.lang          |   0
 {htdocs => public}/langs/en_CA/contracts.lang       |   0
 {htdocs => public}/langs/en_CA/cron.lang            |   0
 {htdocs => public}/langs/en_CA/deliveries.lang      |   0
 {htdocs => public}/langs/en_CA/dict.lang            |   0
 {htdocs => public}/langs/en_CA/donations.lang       |   0
 {htdocs => public}/langs/en_CA/ecm.lang             |   0
 {htdocs => public}/langs/en_CA/errors.lang          |   0
 {htdocs => public}/langs/en_CA/exports.lang         |   0
 {htdocs => public}/langs/en_CA/externalsite.lang    |   0
 {htdocs => public}/langs/en_CA/ftp.lang             |   0
 {htdocs => public}/langs/en_CA/help.lang            |   0
 {htdocs => public}/langs/en_CA/holiday.lang         |   0
 {htdocs => public}/langs/en_CA/hrm.lang             |   0
 {htdocs => public}/langs/en_CA/incoterm.lang        |   0
 {htdocs => public}/langs/en_CA/install.lang         |   0
 {htdocs => public}/langs/en_CA/interventions.lang   |   0
 {htdocs => public}/langs/en_CA/languages.lang       |   0
 {htdocs => public}/langs/en_CA/ldap.lang            |   0
 {htdocs => public}/langs/en_CA/link.lang            |   0
 {htdocs => public}/langs/en_CA/loan.lang            |   0
 {htdocs => public}/langs/en_CA/mailmanspip.lang     |   0
 {htdocs => public}/langs/en_CA/mails.lang           |   0
 {htdocs => public}/langs/en_CA/main.lang            |   0
 {htdocs => public}/langs/en_CA/margins.lang         |   0
 {htdocs => public}/langs/en_CA/members.lang         |   0
 {htdocs => public}/langs/en_CA/oauth.lang           |   0
 {htdocs => public}/langs/en_CA/opensurvey.lang      |   0
 {htdocs => public}/langs/en_CA/orders.lang          |   0
 {htdocs => public}/langs/en_CA/other.lang           |   0
 {htdocs => public}/langs/en_CA/paybox.lang          |   0
 {htdocs => public}/langs/en_CA/paypal.lang          |   0
 {htdocs => public}/langs/en_CA/printing.lang        |   0
 {htdocs => public}/langs/en_CA/productbatch.lang    |   0
 {htdocs => public}/langs/en_CA/products.lang        |   0
 {htdocs => public}/langs/en_CA/projects.lang        |   0
 {htdocs => public}/langs/en_CA/propal.lang          |   0
 {htdocs => public}/langs/en_CA/receiptprinter.lang  |   0
 {htdocs => public}/langs/en_CA/resource.lang        |   0
 {htdocs => public}/langs/en_CA/salaries.lang        |   0
 {htdocs => public}/langs/en_CA/sendings.lang        |   0
 {htdocs => public}/langs/en_CA/sms.lang             |   0
 {htdocs => public}/langs/en_CA/stocks.lang          |   0
 .../langs/en_CA/supplier_proposal.lang              |   0
 {htdocs => public}/langs/en_CA/suppliers.lang       |   0
 {htdocs => public}/langs/en_CA/trips.lang           |   0
 {htdocs => public}/langs/en_CA/users.lang           |   0
 {htdocs => public}/langs/en_CA/website.lang         |   0
 {htdocs => public}/langs/en_CA/withdrawals.lang     |   0
 {htdocs => public}/langs/en_CA/workflow.lang        |   0
 {htdocs => public}/langs/en_GB/accountancy.lang     |   0
 {htdocs => public}/langs/en_GB/admin.lang           |   0
 {htdocs => public}/langs/en_GB/agenda.lang          |   0
 {htdocs => public}/langs/en_GB/banks.lang           |   0
 {htdocs => public}/langs/en_GB/bills.lang           |   0
 {htdocs => public}/langs/en_GB/bookmarks.lang       |   0
 {htdocs => public}/langs/en_GB/boxes.lang           |   0
 {htdocs => public}/langs/en_GB/cashdesk.lang        |   0
 {htdocs => public}/langs/en_GB/categories.lang      |   0
 {htdocs => public}/langs/en_GB/commercial.lang      |   0
 {htdocs => public}/langs/en_GB/companies.lang       |   0
 {htdocs => public}/langs/en_GB/compta.lang          |   0
 {htdocs => public}/langs/en_GB/contracts.lang       |   0
 {htdocs => public}/langs/en_GB/cron.lang            |   0
 {htdocs => public}/langs/en_GB/deliveries.lang      |   0
 {htdocs => public}/langs/en_GB/dict.lang            |   0
 {htdocs => public}/langs/en_GB/donations.lang       |   0
 {htdocs => public}/langs/en_GB/ecm.lang             |   0
 {htdocs => public}/langs/en_GB/errors.lang          |   0
 {htdocs => public}/langs/en_GB/exports.lang         |   0
 {htdocs => public}/langs/en_GB/externalsite.lang    |   0
 {htdocs => public}/langs/en_GB/ftp.lang             |   0
 {htdocs => public}/langs/en_GB/help.lang            |   0
 {htdocs => public}/langs/en_GB/holiday.lang         |   0
 {htdocs => public}/langs/en_GB/hrm.lang             |   0
 {htdocs => public}/langs/en_GB/incoterm.lang        |   0
 {htdocs => public}/langs/en_GB/install.lang         |   0
 {htdocs => public}/langs/en_GB/interventions.lang   |   0
 {htdocs => public}/langs/en_GB/languages.lang       |   0
 {htdocs => public}/langs/en_GB/ldap.lang            |   0
 {htdocs => public}/langs/en_GB/link.lang            |   0
 {htdocs => public}/langs/en_GB/loan.lang            |   0
 {htdocs => public}/langs/en_GB/mailmanspip.lang     |   0
 {htdocs => public}/langs/en_GB/mails.lang           |   0
 {htdocs => public}/langs/en_GB/main.lang            |   0
 {htdocs => public}/langs/en_GB/margins.lang         |   0
 {htdocs => public}/langs/en_GB/members.lang         |   0
 {htdocs => public}/langs/en_GB/oauth.lang           |   0
 {htdocs => public}/langs/en_GB/opensurvey.lang      |   0
 {htdocs => public}/langs/en_GB/orders.lang          |   0
 {htdocs => public}/langs/en_GB/other.lang           |   0
 {htdocs => public}/langs/en_GB/paybox.lang          |   0
 {htdocs => public}/langs/en_GB/paypal.lang          |   0
 {htdocs => public}/langs/en_GB/printing.lang        |   0
 {htdocs => public}/langs/en_GB/productbatch.lang    |   0
 {htdocs => public}/langs/en_GB/products.lang        |   0
 {htdocs => public}/langs/en_GB/projects.lang        |   0
 {htdocs => public}/langs/en_GB/propal.lang          |   0
 {htdocs => public}/langs/en_GB/receiptprinter.lang  |   0
 {htdocs => public}/langs/en_GB/resource.lang        |   0
 {htdocs => public}/langs/en_GB/salaries.lang        |   0
 {htdocs => public}/langs/en_GB/sendings.lang        |   0
 {htdocs => public}/langs/en_GB/sms.lang             |   0
 {htdocs => public}/langs/en_GB/stocks.lang          |   0
 .../langs/en_GB/supplier_proposal.lang              |   0
 {htdocs => public}/langs/en_GB/suppliers.lang       |   0
 {htdocs => public}/langs/en_GB/trips.lang           |   0
 {htdocs => public}/langs/en_GB/users.lang           |   0
 {htdocs => public}/langs/en_GB/website.lang         |   0
 {htdocs => public}/langs/en_GB/withdrawals.lang     |   0
 {htdocs => public}/langs/en_GB/workflow.lang        |   0
 {htdocs => public}/langs/en_IN/accountancy.lang     |   0
 {htdocs => public}/langs/en_IN/admin.lang           |   0
 {htdocs => public}/langs/en_IN/agenda.lang          |   0
 {htdocs => public}/langs/en_IN/banks.lang           |   0
 {htdocs => public}/langs/en_IN/bills.lang           |   0
 {htdocs => public}/langs/en_IN/bookmarks.lang       |   0
 {htdocs => public}/langs/en_IN/boxes.lang           |   0
 {htdocs => public}/langs/en_IN/cashdesk.lang        |   0
 {htdocs => public}/langs/en_IN/categories.lang      |   0
 {htdocs => public}/langs/en_IN/commercial.lang      |   0
 {htdocs => public}/langs/en_IN/companies.lang       |   0
 {htdocs => public}/langs/en_IN/compta.lang          |   0
 {htdocs => public}/langs/en_IN/contracts.lang       |   0
 {htdocs => public}/langs/en_IN/cron.lang            |   0
 {htdocs => public}/langs/en_IN/deliveries.lang      |   0
 {htdocs => public}/langs/en_IN/dict.lang            |   0
 {htdocs => public}/langs/en_IN/donations.lang       |   0
 {htdocs => public}/langs/en_IN/ecm.lang             |   0
 {htdocs => public}/langs/en_IN/errors.lang          |   0
 {htdocs => public}/langs/en_IN/exports.lang         |   0
 {htdocs => public}/langs/en_IN/externalsite.lang    |   0
 {htdocs => public}/langs/en_IN/ftp.lang             |   0
 {htdocs => public}/langs/en_IN/help.lang            |   0
 {htdocs => public}/langs/en_IN/holiday.lang         |   0
 {htdocs => public}/langs/en_IN/hrm.lang             |   0
 {htdocs => public}/langs/en_IN/incoterm.lang        |   0
 {htdocs => public}/langs/en_IN/install.lang         |   0
 {htdocs => public}/langs/en_IN/interventions.lang   |   0
 {htdocs => public}/langs/en_IN/languages.lang       |   0
 {htdocs => public}/langs/en_IN/ldap.lang            |   0
 {htdocs => public}/langs/en_IN/link.lang            |   0
 {htdocs => public}/langs/en_IN/loan.lang            |   0
 {htdocs => public}/langs/en_IN/mailmanspip.lang     |   0
 {htdocs => public}/langs/en_IN/mails.lang           |   0
 {htdocs => public}/langs/en_IN/main.lang            |   0
 {htdocs => public}/langs/en_IN/margins.lang         |   0
 {htdocs => public}/langs/en_IN/members.lang         |   0
 {htdocs => public}/langs/en_IN/oauth.lang           |   0
 {htdocs => public}/langs/en_IN/opensurvey.lang      |   0
 {htdocs => public}/langs/en_IN/orders.lang          |   0
 {htdocs => public}/langs/en_IN/other.lang           |   0
 {htdocs => public}/langs/en_IN/paybox.lang          |   0
 {htdocs => public}/langs/en_IN/paypal.lang          |   0
 {htdocs => public}/langs/en_IN/printing.lang        |   0
 {htdocs => public}/langs/en_IN/productbatch.lang    |   0
 {htdocs => public}/langs/en_IN/products.lang        |   0
 {htdocs => public}/langs/en_IN/projects.lang        |   0
 {htdocs => public}/langs/en_IN/propal.lang          |   0
 {htdocs => public}/langs/en_IN/receiptprinter.lang  |   0
 {htdocs => public}/langs/en_IN/resource.lang        |   0
 {htdocs => public}/langs/en_IN/salaries.lang        |   0
 {htdocs => public}/langs/en_IN/sendings.lang        |   0
 {htdocs => public}/langs/en_IN/sms.lang             |   0
 {htdocs => public}/langs/en_IN/stocks.lang          |   0
 .../langs/en_IN/supplier_proposal.lang              |   0
 {htdocs => public}/langs/en_IN/suppliers.lang       |   0
 {htdocs => public}/langs/en_IN/trips.lang           |   0
 {htdocs => public}/langs/en_IN/users.lang           |   0
 {htdocs => public}/langs/en_IN/website.lang         |   0
 {htdocs => public}/langs/en_IN/withdrawals.lang     |   0
 {htdocs => public}/langs/en_IN/workflow.lang        |   0
 {htdocs => public}/langs/en_NZ/companies.lang       |   0
 {htdocs => public}/langs/en_NZ/compta.lang          |   0
 {htdocs => public}/langs/en_NZ/main.lang            |   0
 {htdocs => public}/langs/en_SA/main.lang            |   0
 {htdocs => public}/langs/en_SA/propal.lang          |   0
 {htdocs => public}/langs/en_US/accountancy.lang     |   0
 {htdocs => public}/langs/en_US/admin.lang           |   0
 {htdocs => public}/langs/en_US/agenda.lang          |   0
 {htdocs => public}/langs/en_US/banks.lang           |   0
 {htdocs => public}/langs/en_US/bills.lang           |   0
 {htdocs => public}/langs/en_US/bookmarks.lang       |   0
 {htdocs => public}/langs/en_US/boxes.lang           |   0
 {htdocs => public}/langs/en_US/cashdesk.lang        |   0
 {htdocs => public}/langs/en_US/categories.lang      |   0
 {htdocs => public}/langs/en_US/commercial.lang      |   0
 {htdocs => public}/langs/en_US/companies.lang       |   0
 {htdocs => public}/langs/en_US/compta.lang          |   0
 {htdocs => public}/langs/en_US/contracts.lang       |   0
 {htdocs => public}/langs/en_US/cron.lang            |   0
 {htdocs => public}/langs/en_US/deliveries.lang      |   0
 {htdocs => public}/langs/en_US/dict.lang            |   0
 {htdocs => public}/langs/en_US/donations.lang       |   0
 {htdocs => public}/langs/en_US/ecm.lang             |   0
 {htdocs => public}/langs/en_US/errors.lang          |   0
 {htdocs => public}/langs/en_US/exports.lang         |   0
 {htdocs => public}/langs/en_US/externalsite.lang    |   0
 {htdocs => public}/langs/en_US/ftp.lang             |   0
 {htdocs => public}/langs/en_US/help.lang            |   0
 {htdocs => public}/langs/en_US/holiday.lang         |   0
 {htdocs => public}/langs/en_US/hrm.lang             |   0
 {htdocs => public}/langs/en_US/incoterm.lang        |   0
 {htdocs => public}/langs/en_US/install.lang         |   0
 {htdocs => public}/langs/en_US/interventions.lang   |   0
 {htdocs => public}/langs/en_US/languages.lang       |   0
 {htdocs => public}/langs/en_US/ldap.lang            |   0
 {htdocs => public}/langs/en_US/link.lang            |   0
 {htdocs => public}/langs/en_US/loan.lang            |   0
 {htdocs => public}/langs/en_US/mailmanspip.lang     |   0
 {htdocs => public}/langs/en_US/mails.lang           |   0
 {htdocs => public}/langs/en_US/main.lang            |   0
 {htdocs => public}/langs/en_US/margins.lang         |   0
 {htdocs => public}/langs/en_US/members.lang         |   0
 {htdocs => public}/langs/en_US/multicurrency.lang   |   0
 {htdocs => public}/langs/en_US/oauth.lang           |   0
 {htdocs => public}/langs/en_US/opensurvey.lang      |   0
 {htdocs => public}/langs/en_US/orders.lang          |   0
 {htdocs => public}/langs/en_US/other.lang           |   0
 {htdocs => public}/langs/en_US/paybox.lang          |   0
 {htdocs => public}/langs/en_US/paypal.lang          |   0
 {htdocs => public}/langs/en_US/printing.lang        |   0
 {htdocs => public}/langs/en_US/productbatch.lang    |   0
 {htdocs => public}/langs/en_US/products.lang        |   0
 {htdocs => public}/langs/en_US/projects.lang        |   0
 {htdocs => public}/langs/en_US/propal.lang          |   0
 {htdocs => public}/langs/en_US/receiptprinter.lang  |   0
 {htdocs => public}/langs/en_US/resource.lang        |   0
 {htdocs => public}/langs/en_US/salaries.lang        |   0
 {htdocs => public}/langs/en_US/sendings.lang        |   0
 {htdocs => public}/langs/en_US/sms.lang             |   0
 {htdocs => public}/langs/en_US/stocks.lang          |   0
 .../langs/en_US/supplier_proposal.lang              |   0
 {htdocs => public}/langs/en_US/suppliers.lang       |   0
 {htdocs => public}/langs/en_US/trips.lang           |   0
 {htdocs => public}/langs/en_US/users.lang           |   0
 {htdocs => public}/langs/en_US/website.lang         |   0
 {htdocs => public}/langs/en_US/withdrawals.lang     |   0
 {htdocs => public}/langs/en_US/workflow.lang        |   0
 {htdocs => public}/langs/en_ZA/main.lang            |   0
 {htdocs => public}/langs/es_AR/accountancy.lang     |   0
 {htdocs => public}/langs/es_AR/admin.lang           |   0
 {htdocs => public}/langs/es_AR/agenda.lang          |   0
 {htdocs => public}/langs/es_AR/banks.lang           |   0
 {htdocs => public}/langs/es_AR/bills.lang           |   0
 {htdocs => public}/langs/es_AR/bookmarks.lang       |   0
 {htdocs => public}/langs/es_AR/boxes.lang           |   0
 {htdocs => public}/langs/es_AR/cashdesk.lang        |   0
 {htdocs => public}/langs/es_AR/categories.lang      |   0
 {htdocs => public}/langs/es_AR/commercial.lang      |   0
 {htdocs => public}/langs/es_AR/companies.lang       |   0
 {htdocs => public}/langs/es_AR/compta.lang          |   0
 {htdocs => public}/langs/es_AR/contracts.lang       |   0
 {htdocs => public}/langs/es_AR/cron.lang            |   0
 {htdocs => public}/langs/es_AR/deliveries.lang      |   0
 {htdocs => public}/langs/es_AR/dict.lang            |   0
 {htdocs => public}/langs/es_AR/donations.lang       |   0
 {htdocs => public}/langs/es_AR/ecm.lang             |   0
 {htdocs => public}/langs/es_AR/errors.lang          |   0
 {htdocs => public}/langs/es_AR/exports.lang         |   0
 {htdocs => public}/langs/es_AR/externalsite.lang    |   0
 {htdocs => public}/langs/es_AR/ftp.lang             |   0
 {htdocs => public}/langs/es_AR/help.lang            |   0
 {htdocs => public}/langs/es_AR/holiday.lang         |   0
 {htdocs => public}/langs/es_AR/hrm.lang             |   0
 {htdocs => public}/langs/es_AR/incoterm.lang        |   0
 {htdocs => public}/langs/es_AR/install.lang         |   0
 {htdocs => public}/langs/es_AR/interventions.lang   |   0
 {htdocs => public}/langs/es_AR/languages.lang       |   0
 {htdocs => public}/langs/es_AR/ldap.lang            |   0
 {htdocs => public}/langs/es_AR/link.lang            |   0
 {htdocs => public}/langs/es_AR/loan.lang            |   0
 {htdocs => public}/langs/es_AR/mailmanspip.lang     |   0
 {htdocs => public}/langs/es_AR/mails.lang           |   0
 {htdocs => public}/langs/es_AR/main.lang            |   0
 {htdocs => public}/langs/es_AR/margins.lang         |   0
 {htdocs => public}/langs/es_AR/members.lang         |   0
 {htdocs => public}/langs/es_AR/oauth.lang           |   0
 {htdocs => public}/langs/es_AR/opensurvey.lang      |   0
 {htdocs => public}/langs/es_AR/orders.lang          |   0
 {htdocs => public}/langs/es_AR/other.lang           |   0
 {htdocs => public}/langs/es_AR/paybox.lang          |   0
 {htdocs => public}/langs/es_AR/paypal.lang          |   0
 {htdocs => public}/langs/es_AR/printing.lang        |   0
 {htdocs => public}/langs/es_AR/productbatch.lang    |   0
 {htdocs => public}/langs/es_AR/products.lang        |   0
 {htdocs => public}/langs/es_AR/projects.lang        |   0
 {htdocs => public}/langs/es_AR/propal.lang          |   0
 {htdocs => public}/langs/es_AR/receiptprinter.lang  |   0
 {htdocs => public}/langs/es_AR/resource.lang        |   0
 {htdocs => public}/langs/es_AR/salaries.lang        |   0
 {htdocs => public}/langs/es_AR/sendings.lang        |   0
 {htdocs => public}/langs/es_AR/sms.lang             |   0
 {htdocs => public}/langs/es_AR/stocks.lang          |   0
 .../langs/es_AR/supplier_proposal.lang              |   0
 {htdocs => public}/langs/es_AR/suppliers.lang       |   0
 {htdocs => public}/langs/es_AR/trips.lang           |   0
 {htdocs => public}/langs/es_AR/users.lang           |   0
 {htdocs => public}/langs/es_AR/website.lang         |   0
 {htdocs => public}/langs/es_AR/withdrawals.lang     |   0
 {htdocs => public}/langs/es_AR/workflow.lang        |   0
 {htdocs => public}/langs/es_BO/accountancy.lang     |   0
 {htdocs => public}/langs/es_BO/admin.lang           |   0
 {htdocs => public}/langs/es_BO/agenda.lang          |   0
 {htdocs => public}/langs/es_BO/banks.lang           |   0
 {htdocs => public}/langs/es_BO/bills.lang           |   0
 {htdocs => public}/langs/es_BO/bookmarks.lang       |   0
 {htdocs => public}/langs/es_BO/boxes.lang           |   0
 {htdocs => public}/langs/es_BO/cashdesk.lang        |   0
 {htdocs => public}/langs/es_BO/categories.lang      |   0
 {htdocs => public}/langs/es_BO/commercial.lang      |   0
 {htdocs => public}/langs/es_BO/companies.lang       |   0
 {htdocs => public}/langs/es_BO/compta.lang          |   0
 {htdocs => public}/langs/es_BO/contracts.lang       |   0
 {htdocs => public}/langs/es_BO/cron.lang            |   0
 {htdocs => public}/langs/es_BO/deliveries.lang      |   0
 {htdocs => public}/langs/es_BO/dict.lang            |   0
 {htdocs => public}/langs/es_BO/donations.lang       |   0
 {htdocs => public}/langs/es_BO/ecm.lang             |   0
 {htdocs => public}/langs/es_BO/errors.lang          |   0
 {htdocs => public}/langs/es_BO/exports.lang         |   0
 {htdocs => public}/langs/es_BO/externalsite.lang    |   0
 {htdocs => public}/langs/es_BO/ftp.lang             |   0
 {htdocs => public}/langs/es_BO/help.lang            |   0
 {htdocs => public}/langs/es_BO/holiday.lang         |   0
 {htdocs => public}/langs/es_BO/hrm.lang             |   0
 {htdocs => public}/langs/es_BO/incoterm.lang        |   0
 {htdocs => public}/langs/es_BO/install.lang         |   0
 {htdocs => public}/langs/es_BO/interventions.lang   |   0
 {htdocs => public}/langs/es_BO/languages.lang       |   0
 {htdocs => public}/langs/es_BO/ldap.lang            |   0
 {htdocs => public}/langs/es_BO/link.lang            |   0
 {htdocs => public}/langs/es_BO/loan.lang            |   0
 {htdocs => public}/langs/es_BO/mailmanspip.lang     |   0
 {htdocs => public}/langs/es_BO/mails.lang           |   0
 {htdocs => public}/langs/es_BO/main.lang            |   0
 {htdocs => public}/langs/es_BO/margins.lang         |   0
 {htdocs => public}/langs/es_BO/members.lang         |   0
 {htdocs => public}/langs/es_BO/oauth.lang           |   0
 {htdocs => public}/langs/es_BO/opensurvey.lang      |   0
 {htdocs => public}/langs/es_BO/orders.lang          |   0
 {htdocs => public}/langs/es_BO/other.lang           |   0
 {htdocs => public}/langs/es_BO/paybox.lang          |   0
 {htdocs => public}/langs/es_BO/paypal.lang          |   0
 {htdocs => public}/langs/es_BO/printing.lang        |   0
 {htdocs => public}/langs/es_BO/productbatch.lang    |   0
 {htdocs => public}/langs/es_BO/products.lang        |   0
 {htdocs => public}/langs/es_BO/projects.lang        |   0
 {htdocs => public}/langs/es_BO/propal.lang          |   0
 {htdocs => public}/langs/es_BO/receiptprinter.lang  |   0
 {htdocs => public}/langs/es_BO/resource.lang        |   0
 {htdocs => public}/langs/es_BO/salaries.lang        |   0
 {htdocs => public}/langs/es_BO/sendings.lang        |   0
 {htdocs => public}/langs/es_BO/sms.lang             |   0
 {htdocs => public}/langs/es_BO/stocks.lang          |   0
 .../langs/es_BO/supplier_proposal.lang              |   0
 {htdocs => public}/langs/es_BO/suppliers.lang       |   0
 {htdocs => public}/langs/es_BO/trips.lang           |   0
 {htdocs => public}/langs/es_BO/users.lang           |   0
 {htdocs => public}/langs/es_BO/website.lang         |   0
 {htdocs => public}/langs/es_BO/withdrawals.lang     |   0
 {htdocs => public}/langs/es_BO/workflow.lang        |   0
 {htdocs => public}/langs/es_CL/accountancy.lang     |   0
 {htdocs => public}/langs/es_CL/admin.lang           |   0
 {htdocs => public}/langs/es_CL/agenda.lang          |   0
 {htdocs => public}/langs/es_CL/banks.lang           |   0
 {htdocs => public}/langs/es_CL/bills.lang           |   0
 {htdocs => public}/langs/es_CL/bookmarks.lang       |   0
 {htdocs => public}/langs/es_CL/boxes.lang           |   0
 {htdocs => public}/langs/es_CL/cashdesk.lang        |   0
 {htdocs => public}/langs/es_CL/categories.lang      |   0
 {htdocs => public}/langs/es_CL/commercial.lang      |   0
 {htdocs => public}/langs/es_CL/companies.lang       |   0
 {htdocs => public}/langs/es_CL/compta.lang          |   0
 {htdocs => public}/langs/es_CL/contracts.lang       |   0
 {htdocs => public}/langs/es_CL/cron.lang            |   0
 {htdocs => public}/langs/es_CL/deliveries.lang      |   0
 {htdocs => public}/langs/es_CL/dict.lang            |   0
 {htdocs => public}/langs/es_CL/donations.lang       |   0
 {htdocs => public}/langs/es_CL/ecm.lang             |   0
 {htdocs => public}/langs/es_CL/errors.lang          |   0
 {htdocs => public}/langs/es_CL/exports.lang         |   0
 {htdocs => public}/langs/es_CL/externalsite.lang    |   0
 {htdocs => public}/langs/es_CL/ftp.lang             |   0
 {htdocs => public}/langs/es_CL/help.lang            |   0
 {htdocs => public}/langs/es_CL/holiday.lang         |   0
 {htdocs => public}/langs/es_CL/hrm.lang             |   0
 {htdocs => public}/langs/es_CL/incoterm.lang        |   0
 {htdocs => public}/langs/es_CL/install.lang         |   0
 {htdocs => public}/langs/es_CL/interventions.lang   |   0
 {htdocs => public}/langs/es_CL/languages.lang       |   0
 {htdocs => public}/langs/es_CL/ldap.lang            |   0
 {htdocs => public}/langs/es_CL/link.lang            |   0
 {htdocs => public}/langs/es_CL/loan.lang            |   0
 {htdocs => public}/langs/es_CL/mailmanspip.lang     |   0
 {htdocs => public}/langs/es_CL/mails.lang           |   0
 {htdocs => public}/langs/es_CL/main.lang            |   0
 {htdocs => public}/langs/es_CL/margins.lang         |   0
 {htdocs => public}/langs/es_CL/members.lang         |   0
 {htdocs => public}/langs/es_CL/oauth.lang           |   0
 {htdocs => public}/langs/es_CL/opensurvey.lang      |   0
 {htdocs => public}/langs/es_CL/orders.lang          |   0
 {htdocs => public}/langs/es_CL/other.lang           |   0
 {htdocs => public}/langs/es_CL/paybox.lang          |   0
 {htdocs => public}/langs/es_CL/paypal.lang          |   0
 {htdocs => public}/langs/es_CL/printing.lang        |   0
 {htdocs => public}/langs/es_CL/productbatch.lang    |   0
 {htdocs => public}/langs/es_CL/products.lang        |   0
 {htdocs => public}/langs/es_CL/projects.lang        |   0
 {htdocs => public}/langs/es_CL/propal.lang          |   0
 {htdocs => public}/langs/es_CL/receiptprinter.lang  |   0
 {htdocs => public}/langs/es_CL/resource.lang        |   0
 {htdocs => public}/langs/es_CL/salaries.lang        |   0
 {htdocs => public}/langs/es_CL/sendings.lang        |   0
 {htdocs => public}/langs/es_CL/sms.lang             |   0
 {htdocs => public}/langs/es_CL/stocks.lang          |   0
 .../langs/es_CL/supplier_proposal.lang              |   0
 {htdocs => public}/langs/es_CL/suppliers.lang       |   0
 {htdocs => public}/langs/es_CL/trips.lang           |   0
 {htdocs => public}/langs/es_CL/users.lang           |   0
 {htdocs => public}/langs/es_CL/website.lang         |   0
 {htdocs => public}/langs/es_CL/withdrawals.lang     |   0
 {htdocs => public}/langs/es_CL/workflow.lang        |   0
 {htdocs => public}/langs/es_CO/accountancy.lang     |   0
 {htdocs => public}/langs/es_CO/admin.lang           |   0
 {htdocs => public}/langs/es_CO/agenda.lang          |   0
 {htdocs => public}/langs/es_CO/banks.lang           |   0
 {htdocs => public}/langs/es_CO/bills.lang           |   0
 {htdocs => public}/langs/es_CO/bookmarks.lang       |   0
 {htdocs => public}/langs/es_CO/boxes.lang           |   0
 {htdocs => public}/langs/es_CO/cashdesk.lang        |   0
 {htdocs => public}/langs/es_CO/categories.lang      |   0
 {htdocs => public}/langs/es_CO/commercial.lang      |   0
 {htdocs => public}/langs/es_CO/companies.lang       |   0
 {htdocs => public}/langs/es_CO/compta.lang          |   0
 {htdocs => public}/langs/es_CO/contracts.lang       |   0
 {htdocs => public}/langs/es_CO/cron.lang            |   0
 {htdocs => public}/langs/es_CO/deliveries.lang      |   0
 {htdocs => public}/langs/es_CO/dict.lang            |   0
 {htdocs => public}/langs/es_CO/donations.lang       |   0
 {htdocs => public}/langs/es_CO/ecm.lang             |   0
 {htdocs => public}/langs/es_CO/errors.lang          |   0
 {htdocs => public}/langs/es_CO/exports.lang         |   0
 {htdocs => public}/langs/es_CO/externalsite.lang    |   0
 {htdocs => public}/langs/es_CO/ftp.lang             |   0
 {htdocs => public}/langs/es_CO/help.lang            |   0
 {htdocs => public}/langs/es_CO/holiday.lang         |   0
 {htdocs => public}/langs/es_CO/hrm.lang             |   0
 {htdocs => public}/langs/es_CO/incoterm.lang        |   0
 {htdocs => public}/langs/es_CO/install.lang         |   0
 {htdocs => public}/langs/es_CO/interventions.lang   |   0
 {htdocs => public}/langs/es_CO/languages.lang       |   0
 {htdocs => public}/langs/es_CO/ldap.lang            |   0
 {htdocs => public}/langs/es_CO/link.lang            |   0
 {htdocs => public}/langs/es_CO/loan.lang            |   0
 {htdocs => public}/langs/es_CO/mailmanspip.lang     |   0
 {htdocs => public}/langs/es_CO/mails.lang           |   0
 {htdocs => public}/langs/es_CO/main.lang            |   0
 {htdocs => public}/langs/es_CO/margins.lang         |   0
 {htdocs => public}/langs/es_CO/members.lang         |   0
 {htdocs => public}/langs/es_CO/oauth.lang           |   0
 {htdocs => public}/langs/es_CO/opensurvey.lang      |   0
 {htdocs => public}/langs/es_CO/orders.lang          |   0
 {htdocs => public}/langs/es_CO/other.lang           |   0
 {htdocs => public}/langs/es_CO/paybox.lang          |   0
 {htdocs => public}/langs/es_CO/paypal.lang          |   0
 {htdocs => public}/langs/es_CO/printing.lang        |   0
 {htdocs => public}/langs/es_CO/productbatch.lang    |   0
 {htdocs => public}/langs/es_CO/products.lang        |   0
 {htdocs => public}/langs/es_CO/projects.lang        |   0
 {htdocs => public}/langs/es_CO/propal.lang          |   0
 {htdocs => public}/langs/es_CO/receiptprinter.lang  |   0
 {htdocs => public}/langs/es_CO/resource.lang        |   0
 {htdocs => public}/langs/es_CO/salaries.lang        |   0
 {htdocs => public}/langs/es_CO/sendings.lang        |   0
 {htdocs => public}/langs/es_CO/sms.lang             |   0
 {htdocs => public}/langs/es_CO/stocks.lang          |   0
 .../langs/es_CO/supplier_proposal.lang              |   0
 {htdocs => public}/langs/es_CO/suppliers.lang       |   0
 {htdocs => public}/langs/es_CO/trips.lang           |   0
 {htdocs => public}/langs/es_CO/users.lang           |   0
 {htdocs => public}/langs/es_CO/website.lang         |   0
 {htdocs => public}/langs/es_CO/withdrawals.lang     |   0
 {htdocs => public}/langs/es_CO/workflow.lang        |   0
 {htdocs => public}/langs/es_DO/accountancy.lang     |   0
 {htdocs => public}/langs/es_DO/admin.lang           |   0
 {htdocs => public}/langs/es_DO/agenda.lang          |   0
 {htdocs => public}/langs/es_DO/banks.lang           |   0
 {htdocs => public}/langs/es_DO/bills.lang           |   0
 {htdocs => public}/langs/es_DO/bookmarks.lang       |   0
 {htdocs => public}/langs/es_DO/boxes.lang           |   0
 {htdocs => public}/langs/es_DO/cashdesk.lang        |   0
 {htdocs => public}/langs/es_DO/categories.lang      |   0
 {htdocs => public}/langs/es_DO/commercial.lang      |   0
 {htdocs => public}/langs/es_DO/companies.lang       |   0
 {htdocs => public}/langs/es_DO/compta.lang          |   0
 {htdocs => public}/langs/es_DO/contracts.lang       |   0
 {htdocs => public}/langs/es_DO/cron.lang            |   0
 {htdocs => public}/langs/es_DO/deliveries.lang      |   0
 {htdocs => public}/langs/es_DO/dict.lang            |   0
 {htdocs => public}/langs/es_DO/donations.lang       |   0
 {htdocs => public}/langs/es_DO/ecm.lang             |   0
 {htdocs => public}/langs/es_DO/errors.lang          |   0
 {htdocs => public}/langs/es_DO/exports.lang         |   0
 {htdocs => public}/langs/es_DO/externalsite.lang    |   0
 {htdocs => public}/langs/es_DO/ftp.lang             |   0
 {htdocs => public}/langs/es_DO/help.lang            |   0
 {htdocs => public}/langs/es_DO/holiday.lang         |   0
 {htdocs => public}/langs/es_DO/hrm.lang             |   0
 {htdocs => public}/langs/es_DO/incoterm.lang        |   0
 {htdocs => public}/langs/es_DO/install.lang         |   0
 {htdocs => public}/langs/es_DO/interventions.lang   |   0
 {htdocs => public}/langs/es_DO/languages.lang       |   0
 {htdocs => public}/langs/es_DO/ldap.lang            |   0
 {htdocs => public}/langs/es_DO/link.lang            |   0
 {htdocs => public}/langs/es_DO/loan.lang            |   0
 {htdocs => public}/langs/es_DO/mailmanspip.lang     |   0
 {htdocs => public}/langs/es_DO/mails.lang           |   0
 {htdocs => public}/langs/es_DO/main.lang            |   0
 {htdocs => public}/langs/es_DO/margins.lang         |   0
 {htdocs => public}/langs/es_DO/members.lang         |   0
 {htdocs => public}/langs/es_DO/oauth.lang           |   0
 {htdocs => public}/langs/es_DO/opensurvey.lang      |   0
 {htdocs => public}/langs/es_DO/orders.lang          |   0
 {htdocs => public}/langs/es_DO/other.lang           |   0
 {htdocs => public}/langs/es_DO/paybox.lang          |   0
 {htdocs => public}/langs/es_DO/paypal.lang          |   0
 {htdocs => public}/langs/es_DO/printing.lang        |   0
 {htdocs => public}/langs/es_DO/productbatch.lang    |   0
 {htdocs => public}/langs/es_DO/products.lang        |   0
 {htdocs => public}/langs/es_DO/projects.lang        |   0
 {htdocs => public}/langs/es_DO/propal.lang          |   0
 {htdocs => public}/langs/es_DO/receiptprinter.lang  |   0
 {htdocs => public}/langs/es_DO/resource.lang        |   0
 {htdocs => public}/langs/es_DO/salaries.lang        |   0
 {htdocs => public}/langs/es_DO/sendings.lang        |   0
 {htdocs => public}/langs/es_DO/sms.lang             |   0
 {htdocs => public}/langs/es_DO/stocks.lang          |   0
 .../langs/es_DO/supplier_proposal.lang              |   0
 {htdocs => public}/langs/es_DO/suppliers.lang       |   0
 {htdocs => public}/langs/es_DO/trips.lang           |   0
 {htdocs => public}/langs/es_DO/users.lang           |   0
 {htdocs => public}/langs/es_DO/website.lang         |   0
 {htdocs => public}/langs/es_DO/withdrawals.lang     |   0
 {htdocs => public}/langs/es_DO/workflow.lang        |   0
 {htdocs => public}/langs/es_EC/accountancy.lang     |   0
 {htdocs => public}/langs/es_EC/admin.lang           |   0
 {htdocs => public}/langs/es_EC/agenda.lang          |   0
 {htdocs => public}/langs/es_EC/banks.lang           |   0
 {htdocs => public}/langs/es_EC/bills.lang           |   0
 {htdocs => public}/langs/es_EC/bookmarks.lang       |   0
 {htdocs => public}/langs/es_EC/boxes.lang           |   0
 {htdocs => public}/langs/es_EC/cashdesk.lang        |   0
 {htdocs => public}/langs/es_EC/categories.lang      |   0
 {htdocs => public}/langs/es_EC/commercial.lang      |   0
 {htdocs => public}/langs/es_EC/companies.lang       |   0
 {htdocs => public}/langs/es_EC/compta.lang          |   0
 {htdocs => public}/langs/es_EC/contracts.lang       |   0
 {htdocs => public}/langs/es_EC/cron.lang            |   0
 {htdocs => public}/langs/es_EC/deliveries.lang      |   0
 {htdocs => public}/langs/es_EC/dict.lang            |   0
 {htdocs => public}/langs/es_EC/donations.lang       |   0
 {htdocs => public}/langs/es_EC/ecm.lang             |   0
 {htdocs => public}/langs/es_EC/errors.lang          |   0
 {htdocs => public}/langs/es_EC/exports.lang         |   0
 {htdocs => public}/langs/es_EC/externalsite.lang    |   0
 {htdocs => public}/langs/es_EC/ftp.lang             |   0
 {htdocs => public}/langs/es_EC/help.lang            |   0
 {htdocs => public}/langs/es_EC/holiday.lang         |   0
 {htdocs => public}/langs/es_EC/hrm.lang             |   0
 {htdocs => public}/langs/es_EC/incoterm.lang        |   0
 {htdocs => public}/langs/es_EC/install.lang         |   0
 {htdocs => public}/langs/es_EC/interventions.lang   |   0
 {htdocs => public}/langs/es_EC/languages.lang       |   0
 {htdocs => public}/langs/es_EC/ldap.lang            |   0
 {htdocs => public}/langs/es_EC/link.lang            |   0
 {htdocs => public}/langs/es_EC/loan.lang            |   0
 {htdocs => public}/langs/es_EC/mailmanspip.lang     |   0
 {htdocs => public}/langs/es_EC/mails.lang           |   0
 {htdocs => public}/langs/es_EC/main.lang            |   0
 {htdocs => public}/langs/es_EC/margins.lang         |   0
 {htdocs => public}/langs/es_EC/members.lang         |   0
 {htdocs => public}/langs/es_EC/oauth.lang           |   0
 {htdocs => public}/langs/es_EC/opensurvey.lang      |   0
 {htdocs => public}/langs/es_EC/orders.lang          |   0
 {htdocs => public}/langs/es_EC/other.lang           |   0
 {htdocs => public}/langs/es_EC/paybox.lang          |   0
 {htdocs => public}/langs/es_EC/paypal.lang          |   0
 {htdocs => public}/langs/es_EC/printing.lang        |   0
 {htdocs => public}/langs/es_EC/productbatch.lang    |   0
 {htdocs => public}/langs/es_EC/products.lang        |   0
 {htdocs => public}/langs/es_EC/projects.lang        |   0
 {htdocs => public}/langs/es_EC/propal.lang          |   0
 {htdocs => public}/langs/es_EC/receiptprinter.lang  |   0
 {htdocs => public}/langs/es_EC/resource.lang        |   0
 {htdocs => public}/langs/es_EC/salaries.lang        |   0
 {htdocs => public}/langs/es_EC/sendings.lang        |   0
 {htdocs => public}/langs/es_EC/sms.lang             |   0
 {htdocs => public}/langs/es_EC/stocks.lang          |   0
 .../langs/es_EC/supplier_proposal.lang              |   0
 {htdocs => public}/langs/es_EC/suppliers.lang       |   0
 {htdocs => public}/langs/es_EC/trips.lang           |   0
 {htdocs => public}/langs/es_EC/users.lang           |   0
 {htdocs => public}/langs/es_EC/website.lang         |   0
 {htdocs => public}/langs/es_EC/withdrawals.lang     |   0
 {htdocs => public}/langs/es_EC/workflow.lang        |   0
 {htdocs => public}/langs/es_ES/accountancy.lang     |   0
 {htdocs => public}/langs/es_ES/admin.lang           |   0
 {htdocs => public}/langs/es_ES/agenda.lang          |   0
 {htdocs => public}/langs/es_ES/banks.lang           |   0
 {htdocs => public}/langs/es_ES/bills.lang           |   0
 {htdocs => public}/langs/es_ES/bookmarks.lang       |   0
 {htdocs => public}/langs/es_ES/boxes.lang           |   0
 {htdocs => public}/langs/es_ES/cashdesk.lang        |   0
 {htdocs => public}/langs/es_ES/categories.lang      |   0
 {htdocs => public}/langs/es_ES/commercial.lang      |   0
 {htdocs => public}/langs/es_ES/companies.lang       |   0
 {htdocs => public}/langs/es_ES/compta.lang          |   0
 {htdocs => public}/langs/es_ES/contracts.lang       |   0
 {htdocs => public}/langs/es_ES/cron.lang            |   0
 {htdocs => public}/langs/es_ES/deliveries.lang      |   0
 {htdocs => public}/langs/es_ES/dict.lang            |   0
 {htdocs => public}/langs/es_ES/donations.lang       |   0
 {htdocs => public}/langs/es_ES/ecm.lang             |   0
 {htdocs => public}/langs/es_ES/errors.lang          |   0
 {htdocs => public}/langs/es_ES/exports.lang         |   0
 {htdocs => public}/langs/es_ES/externalsite.lang    |   0
 {htdocs => public}/langs/es_ES/ftp.lang             |   0
 {htdocs => public}/langs/es_ES/help.lang            |   0
 {htdocs => public}/langs/es_ES/holiday.lang         |   0
 {htdocs => public}/langs/es_ES/hrm.lang             |   0
 {htdocs => public}/langs/es_ES/incoterm.lang        |   0
 {htdocs => public}/langs/es_ES/install.lang         |   0
 {htdocs => public}/langs/es_ES/interventions.lang   |   0
 {htdocs => public}/langs/es_ES/languages.lang       |   0
 {htdocs => public}/langs/es_ES/ldap.lang            |   0
 {htdocs => public}/langs/es_ES/link.lang            |   0
 {htdocs => public}/langs/es_ES/loan.lang            |   0
 {htdocs => public}/langs/es_ES/mailmanspip.lang     |   0
 {htdocs => public}/langs/es_ES/mails.lang           |   0
 {htdocs => public}/langs/es_ES/main.lang            |   0
 {htdocs => public}/langs/es_ES/margins.lang         |   0
 {htdocs => public}/langs/es_ES/members.lang         |   0
 {htdocs => public}/langs/es_ES/oauth.lang           |   0
 {htdocs => public}/langs/es_ES/opensurvey.lang      |   0
 {htdocs => public}/langs/es_ES/orders.lang          |   0
 {htdocs => public}/langs/es_ES/other.lang           |   0
 {htdocs => public}/langs/es_ES/paybox.lang          |   0
 {htdocs => public}/langs/es_ES/paypal.lang          |   0
 {htdocs => public}/langs/es_ES/printing.lang        |   0
 {htdocs => public}/langs/es_ES/productbatch.lang    |   0
 {htdocs => public}/langs/es_ES/products.lang        |   0
 {htdocs => public}/langs/es_ES/projects.lang        |   0
 {htdocs => public}/langs/es_ES/propal.lang          |   0
 {htdocs => public}/langs/es_ES/receiptprinter.lang  |   0
 {htdocs => public}/langs/es_ES/resource.lang        |   0
 {htdocs => public}/langs/es_ES/salaries.lang        |   0
 {htdocs => public}/langs/es_ES/sendings.lang        |   0
 {htdocs => public}/langs/es_ES/sms.lang             |   0
 {htdocs => public}/langs/es_ES/stocks.lang          |   0
 .../langs/es_ES/supplier_proposal.lang              |   0
 {htdocs => public}/langs/es_ES/suppliers.lang       |   0
 {htdocs => public}/langs/es_ES/trips.lang           |   0
 {htdocs => public}/langs/es_ES/users.lang           |   0
 {htdocs => public}/langs/es_ES/website.lang         |   0
 {htdocs => public}/langs/es_ES/withdrawals.lang     |   0
 {htdocs => public}/langs/es_ES/workflow.lang        |   0
 {htdocs => public}/langs/es_HN/admin.lang           |   0
 {htdocs => public}/langs/es_HN/bills.lang           |   0
 {htdocs => public}/langs/es_HN/companies.lang       |   0
 {htdocs => public}/langs/es_HN/compta.lang          |   0
 {htdocs => public}/langs/es_HN/main.lang            |   0
 {htdocs => public}/langs/es_HN/propal.lang          |   0
 {htdocs => public}/langs/es_MX/accountancy.lang     |   0
 {htdocs => public}/langs/es_MX/admin.lang           |   0
 {htdocs => public}/langs/es_MX/agenda.lang          |   0
 {htdocs => public}/langs/es_MX/banks.lang           |   0
 {htdocs => public}/langs/es_MX/bills.lang           |   0
 {htdocs => public}/langs/es_MX/bookmarks.lang       |   0
 {htdocs => public}/langs/es_MX/boxes.lang           |   0
 {htdocs => public}/langs/es_MX/cashdesk.lang        |   0
 {htdocs => public}/langs/es_MX/categories.lang      |   0
 {htdocs => public}/langs/es_MX/commercial.lang      |   0
 {htdocs => public}/langs/es_MX/companies.lang       |   0
 {htdocs => public}/langs/es_MX/compta.lang          |   0
 {htdocs => public}/langs/es_MX/contracts.lang       |   0
 {htdocs => public}/langs/es_MX/cron.lang            |   0
 {htdocs => public}/langs/es_MX/deliveries.lang      |   0
 {htdocs => public}/langs/es_MX/dict.lang            |   0
 {htdocs => public}/langs/es_MX/donations.lang       |   0
 {htdocs => public}/langs/es_MX/ecm.lang             |   0
 {htdocs => public}/langs/es_MX/errors.lang          |   0
 {htdocs => public}/langs/es_MX/exports.lang         |   0
 {htdocs => public}/langs/es_MX/externalsite.lang    |   0
 {htdocs => public}/langs/es_MX/ftp.lang             |   0
 {htdocs => public}/langs/es_MX/help.lang            |   0
 {htdocs => public}/langs/es_MX/holiday.lang         |   0
 {htdocs => public}/langs/es_MX/hrm.lang             |   0
 {htdocs => public}/langs/es_MX/incoterm.lang        |   0
 {htdocs => public}/langs/es_MX/install.lang         |   0
 {htdocs => public}/langs/es_MX/interventions.lang   |   0
 {htdocs => public}/langs/es_MX/languages.lang       |   0
 {htdocs => public}/langs/es_MX/ldap.lang            |   0
 {htdocs => public}/langs/es_MX/link.lang            |   0
 {htdocs => public}/langs/es_MX/loan.lang            |   0
 {htdocs => public}/langs/es_MX/mailmanspip.lang     |   0
 {htdocs => public}/langs/es_MX/mails.lang           |   0
 {htdocs => public}/langs/es_MX/main.lang            |   0
 {htdocs => public}/langs/es_MX/margins.lang         |   0
 {htdocs => public}/langs/es_MX/members.lang         |   0
 {htdocs => public}/langs/es_MX/oauth.lang           |   0
 {htdocs => public}/langs/es_MX/opensurvey.lang      |   0
 {htdocs => public}/langs/es_MX/orders.lang          |   0
 {htdocs => public}/langs/es_MX/other.lang           |   0
 {htdocs => public}/langs/es_MX/paybox.lang          |   0
 {htdocs => public}/langs/es_MX/paypal.lang          |   0
 {htdocs => public}/langs/es_MX/printing.lang        |   0
 {htdocs => public}/langs/es_MX/productbatch.lang    |   0
 {htdocs => public}/langs/es_MX/products.lang        |   0
 {htdocs => public}/langs/es_MX/projects.lang        |   0
 {htdocs => public}/langs/es_MX/propal.lang          |   0
 {htdocs => public}/langs/es_MX/receiptprinter.lang  |   0
 {htdocs => public}/langs/es_MX/resource.lang        |   0
 {htdocs => public}/langs/es_MX/salaries.lang        |   0
 {htdocs => public}/langs/es_MX/sendings.lang        |   0
 {htdocs => public}/langs/es_MX/sms.lang             |   0
 {htdocs => public}/langs/es_MX/stocks.lang          |   0
 .../langs/es_MX/supplier_proposal.lang              |   0
 {htdocs => public}/langs/es_MX/suppliers.lang       |   0
 {htdocs => public}/langs/es_MX/trips.lang           |   0
 {htdocs => public}/langs/es_MX/users.lang           |   0
 {htdocs => public}/langs/es_MX/website.lang         |   0
 {htdocs => public}/langs/es_MX/withdrawals.lang     |   0
 {htdocs => public}/langs/es_MX/workflow.lang        |   0
 {htdocs => public}/langs/es_PA/accountancy.lang     |   0
 {htdocs => public}/langs/es_PA/admin.lang           |   0
 {htdocs => public}/langs/es_PA/agenda.lang          |   0
 {htdocs => public}/langs/es_PA/banks.lang           |   0
 {htdocs => public}/langs/es_PA/bills.lang           |   0
 {htdocs => public}/langs/es_PA/bookmarks.lang       |   0
 {htdocs => public}/langs/es_PA/boxes.lang           |   0
 {htdocs => public}/langs/es_PA/cashdesk.lang        |   0
 {htdocs => public}/langs/es_PA/categories.lang      |   0
 {htdocs => public}/langs/es_PA/commercial.lang      |   0
 {htdocs => public}/langs/es_PA/companies.lang       |   0
 {htdocs => public}/langs/es_PA/compta.lang          |   0
 {htdocs => public}/langs/es_PA/contracts.lang       |   0
 {htdocs => public}/langs/es_PA/cron.lang            |   0
 {htdocs => public}/langs/es_PA/deliveries.lang      |   0
 {htdocs => public}/langs/es_PA/dict.lang            |   0
 {htdocs => public}/langs/es_PA/donations.lang       |   0
 {htdocs => public}/langs/es_PA/ecm.lang             |   0
 {htdocs => public}/langs/es_PA/errors.lang          |   0
 {htdocs => public}/langs/es_PA/exports.lang         |   0
 {htdocs => public}/langs/es_PA/externalsite.lang    |   0
 {htdocs => public}/langs/es_PA/ftp.lang             |   0
 {htdocs => public}/langs/es_PA/help.lang            |   0
 {htdocs => public}/langs/es_PA/holiday.lang         |   0
 {htdocs => public}/langs/es_PA/hrm.lang             |   0
 {htdocs => public}/langs/es_PA/incoterm.lang        |   0
 {htdocs => public}/langs/es_PA/install.lang         |   0
 {htdocs => public}/langs/es_PA/interventions.lang   |   0
 {htdocs => public}/langs/es_PA/languages.lang       |   0
 {htdocs => public}/langs/es_PA/ldap.lang            |   0
 {htdocs => public}/langs/es_PA/link.lang            |   0
 {htdocs => public}/langs/es_PA/loan.lang            |   0
 {htdocs => public}/langs/es_PA/mailmanspip.lang     |   0
 {htdocs => public}/langs/es_PA/mails.lang           |   0
 {htdocs => public}/langs/es_PA/main.lang            |   0
 {htdocs => public}/langs/es_PA/margins.lang         |   0
 {htdocs => public}/langs/es_PA/members.lang         |   0
 {htdocs => public}/langs/es_PA/oauth.lang           |   0
 {htdocs => public}/langs/es_PA/opensurvey.lang      |   0
 {htdocs => public}/langs/es_PA/orders.lang          |   0
 {htdocs => public}/langs/es_PA/other.lang           |   0
 {htdocs => public}/langs/es_PA/paybox.lang          |   0
 {htdocs => public}/langs/es_PA/paypal.lang          |   0
 {htdocs => public}/langs/es_PA/printing.lang        |   0
 {htdocs => public}/langs/es_PA/productbatch.lang    |   0
 {htdocs => public}/langs/es_PA/products.lang        |   0
 {htdocs => public}/langs/es_PA/projects.lang        |   0
 {htdocs => public}/langs/es_PA/propal.lang          |   0
 {htdocs => public}/langs/es_PA/receiptprinter.lang  |   0
 {htdocs => public}/langs/es_PA/resource.lang        |   0
 {htdocs => public}/langs/es_PA/salaries.lang        |   0
 {htdocs => public}/langs/es_PA/sendings.lang        |   0
 {htdocs => public}/langs/es_PA/sms.lang             |   0
 {htdocs => public}/langs/es_PA/stocks.lang          |   0
 .../langs/es_PA/supplier_proposal.lang              |   0
 {htdocs => public}/langs/es_PA/suppliers.lang       |   0
 {htdocs => public}/langs/es_PA/trips.lang           |   0
 {htdocs => public}/langs/es_PA/users.lang           |   0
 {htdocs => public}/langs/es_PA/website.lang         |   0
 {htdocs => public}/langs/es_PA/withdrawals.lang     |   0
 {htdocs => public}/langs/es_PA/workflow.lang        |   0
 {htdocs => public}/langs/es_PE/accountancy.lang     |   0
 {htdocs => public}/langs/es_PE/admin.lang           |   0
 {htdocs => public}/langs/es_PE/agenda.lang          |   0
 {htdocs => public}/langs/es_PE/banks.lang           |   0
 {htdocs => public}/langs/es_PE/bills.lang           |   0
 {htdocs => public}/langs/es_PE/bookmarks.lang       |   0
 {htdocs => public}/langs/es_PE/boxes.lang           |   0
 {htdocs => public}/langs/es_PE/cashdesk.lang        |   0
 {htdocs => public}/langs/es_PE/categories.lang      |   0
 {htdocs => public}/langs/es_PE/commercial.lang      |   0
 {htdocs => public}/langs/es_PE/companies.lang       |   0
 {htdocs => public}/langs/es_PE/compta.lang          |   0
 {htdocs => public}/langs/es_PE/contracts.lang       |   0
 {htdocs => public}/langs/es_PE/cron.lang            |   0
 {htdocs => public}/langs/es_PE/deliveries.lang      |   0
 {htdocs => public}/langs/es_PE/dict.lang            |   0
 {htdocs => public}/langs/es_PE/donations.lang       |   0
 {htdocs => public}/langs/es_PE/ecm.lang             |   0
 {htdocs => public}/langs/es_PE/errors.lang          |   0
 {htdocs => public}/langs/es_PE/exports.lang         |   0
 {htdocs => public}/langs/es_PE/externalsite.lang    |   0
 {htdocs => public}/langs/es_PE/ftp.lang             |   0
 {htdocs => public}/langs/es_PE/help.lang            |   0
 {htdocs => public}/langs/es_PE/holiday.lang         |   0
 {htdocs => public}/langs/es_PE/hrm.lang             |   0
 {htdocs => public}/langs/es_PE/incoterm.lang        |   0
 {htdocs => public}/langs/es_PE/install.lang         |   0
 {htdocs => public}/langs/es_PE/interventions.lang   |   0
 {htdocs => public}/langs/es_PE/languages.lang       |   0
 {htdocs => public}/langs/es_PE/ldap.lang            |   0
 {htdocs => public}/langs/es_PE/link.lang            |   0
 {htdocs => public}/langs/es_PE/loan.lang            |   0
 {htdocs => public}/langs/es_PE/mailmanspip.lang     |   0
 {htdocs => public}/langs/es_PE/mails.lang           |   0
 {htdocs => public}/langs/es_PE/main.lang            |   0
 {htdocs => public}/langs/es_PE/margins.lang         |   0
 {htdocs => public}/langs/es_PE/members.lang         |   0
 {htdocs => public}/langs/es_PE/oauth.lang           |   0
 {htdocs => public}/langs/es_PE/opensurvey.lang      |   0
 {htdocs => public}/langs/es_PE/orders.lang          |   0
 {htdocs => public}/langs/es_PE/other.lang           |   0
 {htdocs => public}/langs/es_PE/paybox.lang          |   0
 {htdocs => public}/langs/es_PE/paypal.lang          |   0
 {htdocs => public}/langs/es_PE/printing.lang        |   0
 {htdocs => public}/langs/es_PE/productbatch.lang    |   0
 {htdocs => public}/langs/es_PE/products.lang        |   0
 {htdocs => public}/langs/es_PE/projects.lang        |   0
 {htdocs => public}/langs/es_PE/propal.lang          |   0
 {htdocs => public}/langs/es_PE/receiptprinter.lang  |   0
 {htdocs => public}/langs/es_PE/resource.lang        |   0
 {htdocs => public}/langs/es_PE/salaries.lang        |   0
 {htdocs => public}/langs/es_PE/sendings.lang        |   0
 {htdocs => public}/langs/es_PE/sms.lang             |   0
 {htdocs => public}/langs/es_PE/stocks.lang          |   0
 .../langs/es_PE/supplier_proposal.lang              |   0
 {htdocs => public}/langs/es_PE/suppliers.lang       |   0
 {htdocs => public}/langs/es_PE/trips.lang           |   0
 {htdocs => public}/langs/es_PE/users.lang           |   0
 {htdocs => public}/langs/es_PE/website.lang         |   0
 {htdocs => public}/langs/es_PE/withdrawals.lang     |   0
 {htdocs => public}/langs/es_PE/workflow.lang        |   0
 {htdocs => public}/langs/es_PR/admin.lang           |   0
 {htdocs => public}/langs/es_PR/bills.lang           |   0
 {htdocs => public}/langs/es_PR/companies.lang       |   0
 {htdocs => public}/langs/es_PR/compta.lang          |   0
 {htdocs => public}/langs/es_PR/main.lang            |   0
 {htdocs => public}/langs/es_PR/propal.lang          |   0
 {htdocs => public}/langs/es_PY/accountancy.lang     |   0
 {htdocs => public}/langs/es_PY/admin.lang           |   0
 {htdocs => public}/langs/es_PY/agenda.lang          |   0
 {htdocs => public}/langs/es_PY/banks.lang           |   0
 {htdocs => public}/langs/es_PY/bills.lang           |   0
 {htdocs => public}/langs/es_PY/bookmarks.lang       |   0
 {htdocs => public}/langs/es_PY/boxes.lang           |   0
 {htdocs => public}/langs/es_PY/cashdesk.lang        |   0
 {htdocs => public}/langs/es_PY/categories.lang      |   0
 {htdocs => public}/langs/es_PY/commercial.lang      |   0
 {htdocs => public}/langs/es_PY/companies.lang       |   0
 {htdocs => public}/langs/es_PY/compta.lang          |   0
 {htdocs => public}/langs/es_PY/contracts.lang       |   0
 {htdocs => public}/langs/es_PY/cron.lang            |   0
 {htdocs => public}/langs/es_PY/deliveries.lang      |   0
 {htdocs => public}/langs/es_PY/dict.lang            |   0
 {htdocs => public}/langs/es_PY/donations.lang       |   0
 {htdocs => public}/langs/es_PY/ecm.lang             |   0
 {htdocs => public}/langs/es_PY/errors.lang          |   0
 {htdocs => public}/langs/es_PY/exports.lang         |   0
 {htdocs => public}/langs/es_PY/externalsite.lang    |   0
 {htdocs => public}/langs/es_PY/ftp.lang             |   0
 {htdocs => public}/langs/es_PY/help.lang            |   0
 {htdocs => public}/langs/es_PY/holiday.lang         |   0
 {htdocs => public}/langs/es_PY/hrm.lang             |   0
 {htdocs => public}/langs/es_PY/incoterm.lang        |   0
 {htdocs => public}/langs/es_PY/install.lang         |   0
 {htdocs => public}/langs/es_PY/interventions.lang   |   0
 {htdocs => public}/langs/es_PY/languages.lang       |   0
 {htdocs => public}/langs/es_PY/ldap.lang            |   0
 {htdocs => public}/langs/es_PY/link.lang            |   0
 {htdocs => public}/langs/es_PY/loan.lang            |   0
 {htdocs => public}/langs/es_PY/mailmanspip.lang     |   0
 {htdocs => public}/langs/es_PY/mails.lang           |   0
 {htdocs => public}/langs/es_PY/main.lang            |   0
 {htdocs => public}/langs/es_PY/margins.lang         |   0
 {htdocs => public}/langs/es_PY/members.lang         |   0
 {htdocs => public}/langs/es_PY/oauth.lang           |   0
 {htdocs => public}/langs/es_PY/opensurvey.lang      |   0
 {htdocs => public}/langs/es_PY/orders.lang          |   0
 {htdocs => public}/langs/es_PY/other.lang           |   0
 {htdocs => public}/langs/es_PY/paybox.lang          |   0
 {htdocs => public}/langs/es_PY/paypal.lang          |   0
 {htdocs => public}/langs/es_PY/printing.lang        |   0
 {htdocs => public}/langs/es_PY/productbatch.lang    |   0
 {htdocs => public}/langs/es_PY/products.lang        |   0
 {htdocs => public}/langs/es_PY/projects.lang        |   0
 {htdocs => public}/langs/es_PY/propal.lang          |   0
 {htdocs => public}/langs/es_PY/receiptprinter.lang  |   0
 {htdocs => public}/langs/es_PY/resource.lang        |   0
 {htdocs => public}/langs/es_PY/salaries.lang        |   0
 {htdocs => public}/langs/es_PY/sendings.lang        |   0
 {htdocs => public}/langs/es_PY/sms.lang             |   0
 {htdocs => public}/langs/es_PY/stocks.lang          |   0
 .../langs/es_PY/supplier_proposal.lang              |   0
 {htdocs => public}/langs/es_PY/suppliers.lang       |   0
 {htdocs => public}/langs/es_PY/trips.lang           |   0
 {htdocs => public}/langs/es_PY/users.lang           |   0
 {htdocs => public}/langs/es_PY/website.lang         |   0
 {htdocs => public}/langs/es_PY/withdrawals.lang     |   0
 {htdocs => public}/langs/es_PY/workflow.lang        |   0
 {htdocs => public}/langs/es_VE/accountancy.lang     |   0
 {htdocs => public}/langs/es_VE/admin.lang           |   0
 {htdocs => public}/langs/es_VE/agenda.lang          |   0
 {htdocs => public}/langs/es_VE/banks.lang           |   0
 {htdocs => public}/langs/es_VE/bills.lang           |   0
 {htdocs => public}/langs/es_VE/bookmarks.lang       |   0
 {htdocs => public}/langs/es_VE/boxes.lang           |   0
 {htdocs => public}/langs/es_VE/cashdesk.lang        |   0
 {htdocs => public}/langs/es_VE/categories.lang      |   0
 {htdocs => public}/langs/es_VE/commercial.lang      |   0
 {htdocs => public}/langs/es_VE/companies.lang       |   0
 {htdocs => public}/langs/es_VE/compta.lang          |   0
 {htdocs => public}/langs/es_VE/contracts.lang       |   0
 {htdocs => public}/langs/es_VE/cron.lang            |   0
 {htdocs => public}/langs/es_VE/deliveries.lang      |   0
 {htdocs => public}/langs/es_VE/dict.lang            |   0
 {htdocs => public}/langs/es_VE/donations.lang       |   0
 {htdocs => public}/langs/es_VE/ecm.lang             |   0
 {htdocs => public}/langs/es_VE/errors.lang          |   0
 {htdocs => public}/langs/es_VE/exports.lang         |   0
 {htdocs => public}/langs/es_VE/externalsite.lang    |   0
 {htdocs => public}/langs/es_VE/ftp.lang             |   0
 {htdocs => public}/langs/es_VE/help.lang            |   0
 {htdocs => public}/langs/es_VE/holiday.lang         |   0
 {htdocs => public}/langs/es_VE/hrm.lang             |   0
 {htdocs => public}/langs/es_VE/incoterm.lang        |   0
 {htdocs => public}/langs/es_VE/install.lang         |   0
 {htdocs => public}/langs/es_VE/interventions.lang   |   0
 {htdocs => public}/langs/es_VE/languages.lang       |   0
 {htdocs => public}/langs/es_VE/ldap.lang            |   0
 {htdocs => public}/langs/es_VE/link.lang            |   0
 {htdocs => public}/langs/es_VE/loan.lang            |   0
 {htdocs => public}/langs/es_VE/mailmanspip.lang     |   0
 {htdocs => public}/langs/es_VE/mails.lang           |   0
 {htdocs => public}/langs/es_VE/main.lang            |   0
 {htdocs => public}/langs/es_VE/margins.lang         |   0
 {htdocs => public}/langs/es_VE/members.lang         |   0
 {htdocs => public}/langs/es_VE/oauth.lang           |   0
 {htdocs => public}/langs/es_VE/opensurvey.lang      |   0
 {htdocs => public}/langs/es_VE/orders.lang          |   0
 {htdocs => public}/langs/es_VE/other.lang           |   0
 {htdocs => public}/langs/es_VE/paybox.lang          |   0
 {htdocs => public}/langs/es_VE/paypal.lang          |   0
 {htdocs => public}/langs/es_VE/printing.lang        |   0
 {htdocs => public}/langs/es_VE/productbatch.lang    |   0
 {htdocs => public}/langs/es_VE/products.lang        |   0
 {htdocs => public}/langs/es_VE/projects.lang        |   0
 {htdocs => public}/langs/es_VE/propal.lang          |   0
 {htdocs => public}/langs/es_VE/receiptprinter.lang  |   0
 {htdocs => public}/langs/es_VE/resource.lang        |   0
 {htdocs => public}/langs/es_VE/salaries.lang        |   0
 {htdocs => public}/langs/es_VE/sendings.lang        |   0
 {htdocs => public}/langs/es_VE/sms.lang             |   0
 {htdocs => public}/langs/es_VE/stocks.lang          |   0
 .../langs/es_VE/supplier_proposal.lang              |   0
 {htdocs => public}/langs/es_VE/suppliers.lang       |   0
 {htdocs => public}/langs/es_VE/trips.lang           |   0
 {htdocs => public}/langs/es_VE/users.lang           |   0
 {htdocs => public}/langs/es_VE/website.lang         |   0
 {htdocs => public}/langs/es_VE/withdrawals.lang     |   0
 {htdocs => public}/langs/es_VE/workflow.lang        |   0
 {htdocs => public}/langs/et_EE/accountancy.lang     |   0
 {htdocs => public}/langs/et_EE/admin.lang           |   0
 {htdocs => public}/langs/et_EE/agenda.lang          |   0
 {htdocs => public}/langs/et_EE/banks.lang           |   0
 {htdocs => public}/langs/et_EE/bills.lang           |   0
 {htdocs => public}/langs/et_EE/bookmarks.lang       |   0
 {htdocs => public}/langs/et_EE/boxes.lang           |   0
 {htdocs => public}/langs/et_EE/cashdesk.lang        |   0
 {htdocs => public}/langs/et_EE/categories.lang      |   0
 {htdocs => public}/langs/et_EE/commercial.lang      |   0
 {htdocs => public}/langs/et_EE/companies.lang       |   0
 {htdocs => public}/langs/et_EE/compta.lang          |   0
 {htdocs => public}/langs/et_EE/contracts.lang       |   0
 {htdocs => public}/langs/et_EE/cron.lang            |   0
 {htdocs => public}/langs/et_EE/deliveries.lang      |   0
 {htdocs => public}/langs/et_EE/dict.lang            |   0
 {htdocs => public}/langs/et_EE/donations.lang       |   0
 {htdocs => public}/langs/et_EE/ecm.lang             |   0
 {htdocs => public}/langs/et_EE/errors.lang          |   0
 {htdocs => public}/langs/et_EE/exports.lang         |   0
 {htdocs => public}/langs/et_EE/externalsite.lang    |   0
 {htdocs => public}/langs/et_EE/ftp.lang             |   0
 {htdocs => public}/langs/et_EE/help.lang            |   0
 {htdocs => public}/langs/et_EE/holiday.lang         |   0
 {htdocs => public}/langs/et_EE/hrm.lang             |   0
 {htdocs => public}/langs/et_EE/incoterm.lang        |   0
 {htdocs => public}/langs/et_EE/install.lang         |   0
 {htdocs => public}/langs/et_EE/interventions.lang   |   0
 {htdocs => public}/langs/et_EE/languages.lang       |   0
 {htdocs => public}/langs/et_EE/ldap.lang            |   0
 {htdocs => public}/langs/et_EE/link.lang            |   0
 {htdocs => public}/langs/et_EE/loan.lang            |   0
 {htdocs => public}/langs/et_EE/mailmanspip.lang     |   0
 {htdocs => public}/langs/et_EE/mails.lang           |   0
 {htdocs => public}/langs/et_EE/main.lang            |   0
 {htdocs => public}/langs/et_EE/margins.lang         |   0
 {htdocs => public}/langs/et_EE/members.lang         |   0
 {htdocs => public}/langs/et_EE/oauth.lang           |   0
 {htdocs => public}/langs/et_EE/opensurvey.lang      |   0
 {htdocs => public}/langs/et_EE/orders.lang          |   0
 {htdocs => public}/langs/et_EE/other.lang           |   0
 {htdocs => public}/langs/et_EE/paybox.lang          |   0
 {htdocs => public}/langs/et_EE/paypal.lang          |   0
 {htdocs => public}/langs/et_EE/printing.lang        |   0
 {htdocs => public}/langs/et_EE/productbatch.lang    |   0
 {htdocs => public}/langs/et_EE/products.lang        |   0
 {htdocs => public}/langs/et_EE/projects.lang        |   0
 {htdocs => public}/langs/et_EE/propal.lang          |   0
 {htdocs => public}/langs/et_EE/receiptprinter.lang  |   0
 {htdocs => public}/langs/et_EE/resource.lang        |   0
 {htdocs => public}/langs/et_EE/salaries.lang        |   0
 {htdocs => public}/langs/et_EE/sendings.lang        |   0
 {htdocs => public}/langs/et_EE/sms.lang             |   0
 {htdocs => public}/langs/et_EE/stocks.lang          |   0
 .../langs/et_EE/supplier_proposal.lang              |   0
 {htdocs => public}/langs/et_EE/suppliers.lang       |   0
 {htdocs => public}/langs/et_EE/trips.lang           |   0
 {htdocs => public}/langs/et_EE/users.lang           |   0
 {htdocs => public}/langs/et_EE/website.lang         |   0
 {htdocs => public}/langs/et_EE/withdrawals.lang     |   0
 {htdocs => public}/langs/et_EE/workflow.lang        |   0
 {htdocs => public}/langs/eu_ES/accountancy.lang     |   0
 {htdocs => public}/langs/eu_ES/admin.lang           |   0
 {htdocs => public}/langs/eu_ES/agenda.lang          |   0
 {htdocs => public}/langs/eu_ES/banks.lang           |   0
 {htdocs => public}/langs/eu_ES/bills.lang           |   0
 {htdocs => public}/langs/eu_ES/bookmarks.lang       |   0
 {htdocs => public}/langs/eu_ES/boxes.lang           |   0
 {htdocs => public}/langs/eu_ES/cashdesk.lang        |   0
 {htdocs => public}/langs/eu_ES/categories.lang      |   0
 {htdocs => public}/langs/eu_ES/commercial.lang      |   0
 {htdocs => public}/langs/eu_ES/companies.lang       |   0
 {htdocs => public}/langs/eu_ES/compta.lang          |   0
 {htdocs => public}/langs/eu_ES/contracts.lang       |   0
 {htdocs => public}/langs/eu_ES/cron.lang            |   0
 {htdocs => public}/langs/eu_ES/deliveries.lang      |   0
 {htdocs => public}/langs/eu_ES/dict.lang            |   0
 {htdocs => public}/langs/eu_ES/donations.lang       |   0
 {htdocs => public}/langs/eu_ES/ecm.lang             |   0
 {htdocs => public}/langs/eu_ES/errors.lang          |   0
 {htdocs => public}/langs/eu_ES/expensereports.lang  |   0
 {htdocs => public}/langs/eu_ES/exports.lang         |   0
 {htdocs => public}/langs/eu_ES/externalsite.lang    |   0
 {htdocs => public}/langs/eu_ES/ftp.lang             |   0
 {htdocs => public}/langs/eu_ES/help.lang            |   0
 {htdocs => public}/langs/eu_ES/holiday.lang         |   0
 {htdocs => public}/langs/eu_ES/hrm.lang             |   0
 {htdocs => public}/langs/eu_ES/incoterm.lang        |   0
 {htdocs => public}/langs/eu_ES/install.lang         |   0
 {htdocs => public}/langs/eu_ES/interventions.lang   |   0
 {htdocs => public}/langs/eu_ES/languages.lang       |   0
 {htdocs => public}/langs/eu_ES/ldap.lang            |   0
 {htdocs => public}/langs/eu_ES/link.lang            |   0
 {htdocs => public}/langs/eu_ES/loan.lang            |   0
 {htdocs => public}/langs/eu_ES/mailmanspip.lang     |   0
 {htdocs => public}/langs/eu_ES/mails.lang           |   0
 {htdocs => public}/langs/eu_ES/main.lang            |   0
 {htdocs => public}/langs/eu_ES/margins.lang         |   0
 {htdocs => public}/langs/eu_ES/members.lang         |   0
 {htdocs => public}/langs/eu_ES/oauth.lang           |   0
 {htdocs => public}/langs/eu_ES/opensurvey.lang      |   0
 {htdocs => public}/langs/eu_ES/orders.lang          |   0
 {htdocs => public}/langs/eu_ES/other.lang           |   0
 {htdocs => public}/langs/eu_ES/paybox.lang          |   0
 {htdocs => public}/langs/eu_ES/paypal.lang          |   0
 {htdocs => public}/langs/eu_ES/printing.lang        |   0
 {htdocs => public}/langs/eu_ES/productbatch.lang    |   0
 {htdocs => public}/langs/eu_ES/products.lang        |   0
 {htdocs => public}/langs/eu_ES/projects.lang        |   0
 {htdocs => public}/langs/eu_ES/propal.lang          |   0
 {htdocs => public}/langs/eu_ES/receiptprinter.lang  |   0
 {htdocs => public}/langs/eu_ES/resource.lang        |   0
 {htdocs => public}/langs/eu_ES/salaries.lang        |   0
 {htdocs => public}/langs/eu_ES/sendings.lang        |   0
 {htdocs => public}/langs/eu_ES/sms.lang             |   0
 {htdocs => public}/langs/eu_ES/stocks.lang          |   0
 .../langs/eu_ES/supplier_proposal.lang              |   0
 {htdocs => public}/langs/eu_ES/suppliers.lang       |   0
 {htdocs => public}/langs/eu_ES/trips.lang           |   0
 {htdocs => public}/langs/eu_ES/users.lang           |   0
 {htdocs => public}/langs/eu_ES/website.lang         |   0
 {htdocs => public}/langs/eu_ES/withdrawals.lang     |   0
 {htdocs => public}/langs/eu_ES/workflow.lang        |   0
 {htdocs => public}/langs/fa_IR/accountancy.lang     |   0
 {htdocs => public}/langs/fa_IR/admin.lang           |   0
 {htdocs => public}/langs/fa_IR/agenda.lang          |   0
 {htdocs => public}/langs/fa_IR/banks.lang           |   0
 {htdocs => public}/langs/fa_IR/bills.lang           |   0
 {htdocs => public}/langs/fa_IR/bookmarks.lang       |   0
 {htdocs => public}/langs/fa_IR/boxes.lang           |   0
 {htdocs => public}/langs/fa_IR/cashdesk.lang        |   0
 {htdocs => public}/langs/fa_IR/categories.lang      |   0
 {htdocs => public}/langs/fa_IR/commercial.lang      |   0
 {htdocs => public}/langs/fa_IR/companies.lang       |   0
 {htdocs => public}/langs/fa_IR/compta.lang          |   0
 {htdocs => public}/langs/fa_IR/contracts.lang       |   0
 {htdocs => public}/langs/fa_IR/cron.lang            |   0
 {htdocs => public}/langs/fa_IR/deliveries.lang      |   0
 {htdocs => public}/langs/fa_IR/dict.lang            |   0
 {htdocs => public}/langs/fa_IR/domains.lang         |   0
 {htdocs => public}/langs/fa_IR/donations.lang       |   0
 {htdocs => public}/langs/fa_IR/ecm.lang             |   0
 {htdocs => public}/langs/fa_IR/errors.lang          |   0
 {htdocs => public}/langs/fa_IR/exports.lang         |   0
 {htdocs => public}/langs/fa_IR/externalsite.lang    |   0
 {htdocs => public}/langs/fa_IR/ftp.lang             |   0
 {htdocs => public}/langs/fa_IR/help.lang            |   0
 {htdocs => public}/langs/fa_IR/holiday.lang         |   0
 {htdocs => public}/langs/fa_IR/hrm.lang             |   0
 {htdocs => public}/langs/fa_IR/incoterm.lang        |   0
 {htdocs => public}/langs/fa_IR/install.lang         |   0
 {htdocs => public}/langs/fa_IR/interventions.lang   |   0
 {htdocs => public}/langs/fa_IR/languages.lang       |   0
 {htdocs => public}/langs/fa_IR/ldap.lang            |   0
 {htdocs => public}/langs/fa_IR/link.lang            |   0
 {htdocs => public}/langs/fa_IR/loan.lang            |   0
 {htdocs => public}/langs/fa_IR/mailmanspip.lang     |   0
 {htdocs => public}/langs/fa_IR/mails.lang           |   0
 {htdocs => public}/langs/fa_IR/main.lang            |   0
 {htdocs => public}/langs/fa_IR/margins.lang         |   0
 {htdocs => public}/langs/fa_IR/members.lang         |   0
 {htdocs => public}/langs/fa_IR/oauth.lang           |   0
 {htdocs => public}/langs/fa_IR/opensurvey.lang      |   0
 {htdocs => public}/langs/fa_IR/orders.lang          |   0
 {htdocs => public}/langs/fa_IR/other.lang           |   0
 {htdocs => public}/langs/fa_IR/paybox.lang          |   0
 {htdocs => public}/langs/fa_IR/paypal.lang          |   0
 {htdocs => public}/langs/fa_IR/printing.lang        |   0
 {htdocs => public}/langs/fa_IR/productbatch.lang    |   0
 {htdocs => public}/langs/fa_IR/products.lang        |   0
 {htdocs => public}/langs/fa_IR/projects.lang        |   0
 {htdocs => public}/langs/fa_IR/propal.lang          |   0
 {htdocs => public}/langs/fa_IR/receiptprinter.lang  |   0
 {htdocs => public}/langs/fa_IR/resource.lang        |   0
 {htdocs => public}/langs/fa_IR/salaries.lang        |   0
 {htdocs => public}/langs/fa_IR/sendings.lang        |   0
 {htdocs => public}/langs/fa_IR/sms.lang             |   0
 {htdocs => public}/langs/fa_IR/stocks.lang          |   0
 .../langs/fa_IR/supplier_proposal.lang              |   0
 {htdocs => public}/langs/fa_IR/suppliers.lang       |   0
 {htdocs => public}/langs/fa_IR/trips.lang           |   0
 {htdocs => public}/langs/fa_IR/users.lang           |   0
 {htdocs => public}/langs/fa_IR/website.lang         |   0
 {htdocs => public}/langs/fa_IR/withdrawals.lang     |   0
 {htdocs => public}/langs/fa_IR/workflow.lang        |   0
 {htdocs => public}/langs/fi_FI/accountancy.lang     |   0
 {htdocs => public}/langs/fi_FI/admin.lang           |   0
 {htdocs => public}/langs/fi_FI/agenda.lang          |   0
 {htdocs => public}/langs/fi_FI/banks.lang           |   0
 {htdocs => public}/langs/fi_FI/bills.lang           |   0
 {htdocs => public}/langs/fi_FI/bookmarks.lang       |   0
 {htdocs => public}/langs/fi_FI/boxes.lang           |   0
 {htdocs => public}/langs/fi_FI/cashdesk.lang        |   0
 {htdocs => public}/langs/fi_FI/categories.lang      |   0
 {htdocs => public}/langs/fi_FI/commercial.lang      |   0
 {htdocs => public}/langs/fi_FI/companies.lang       |   0
 {htdocs => public}/langs/fi_FI/compta.lang          |   0
 {htdocs => public}/langs/fi_FI/contracts.lang       |   0
 {htdocs => public}/langs/fi_FI/cron.lang            |   0
 {htdocs => public}/langs/fi_FI/deliveries.lang      |   0
 {htdocs => public}/langs/fi_FI/dict.lang            |   0
 {htdocs => public}/langs/fi_FI/donations.lang       |   0
 {htdocs => public}/langs/fi_FI/ecm.lang             |   0
 {htdocs => public}/langs/fi_FI/errors.lang          |   0
 {htdocs => public}/langs/fi_FI/exports.lang         |   0
 {htdocs => public}/langs/fi_FI/externalsite.lang    |   0
 {htdocs => public}/langs/fi_FI/ftp.lang             |   0
 {htdocs => public}/langs/fi_FI/help.lang            |   0
 {htdocs => public}/langs/fi_FI/holiday.lang         |   0
 {htdocs => public}/langs/fi_FI/hrm.lang             |   0
 {htdocs => public}/langs/fi_FI/incoterm.lang        |   0
 {htdocs => public}/langs/fi_FI/install.lang         |   0
 {htdocs => public}/langs/fi_FI/interventions.lang   |   0
 {htdocs => public}/langs/fi_FI/languages.lang       |   0
 {htdocs => public}/langs/fi_FI/ldap.lang            |   0
 {htdocs => public}/langs/fi_FI/link.lang            |   0
 {htdocs => public}/langs/fi_FI/loan.lang            |   0
 {htdocs => public}/langs/fi_FI/mailmanspip.lang     |   0
 {htdocs => public}/langs/fi_FI/mails.lang           |   0
 {htdocs => public}/langs/fi_FI/main.lang            |   0
 {htdocs => public}/langs/fi_FI/margins.lang         |   0
 {htdocs => public}/langs/fi_FI/members.lang         |   0
 {htdocs => public}/langs/fi_FI/oauth.lang           |   0
 {htdocs => public}/langs/fi_FI/opensurvey.lang      |   0
 {htdocs => public}/langs/fi_FI/orders.lang          |   0
 {htdocs => public}/langs/fi_FI/other.lang           |   0
 {htdocs => public}/langs/fi_FI/paybox.lang          |   0
 {htdocs => public}/langs/fi_FI/paypal.lang          |   0
 {htdocs => public}/langs/fi_FI/printing.lang        |   0
 {htdocs => public}/langs/fi_FI/productbatch.lang    |   0
 {htdocs => public}/langs/fi_FI/products.lang        |   0
 {htdocs => public}/langs/fi_FI/projects.lang        |   0
 {htdocs => public}/langs/fi_FI/propal.lang          |   0
 {htdocs => public}/langs/fi_FI/receiptprinter.lang  |   0
 {htdocs => public}/langs/fi_FI/resource.lang        |   0
 {htdocs => public}/langs/fi_FI/salaries.lang        |   0
 {htdocs => public}/langs/fi_FI/sendings.lang        |   0
 {htdocs => public}/langs/fi_FI/sms.lang             |   0
 {htdocs => public}/langs/fi_FI/stocks.lang          |   0
 .../langs/fi_FI/supplier_proposal.lang              |   0
 {htdocs => public}/langs/fi_FI/suppliers.lang       |   0
 {htdocs => public}/langs/fi_FI/trips.lang           |   0
 {htdocs => public}/langs/fi_FI/users.lang           |   0
 {htdocs => public}/langs/fi_FI/website.lang         |   0
 {htdocs => public}/langs/fi_FI/withdrawals.lang     |   0
 {htdocs => public}/langs/fi_FI/workflow.lang        |   0
 {htdocs => public}/langs/fr_BE/accountancy.lang     |   0
 {htdocs => public}/langs/fr_BE/admin.lang           |   0
 {htdocs => public}/langs/fr_BE/agenda.lang          |   0
 {htdocs => public}/langs/fr_BE/banks.lang           |   0
 {htdocs => public}/langs/fr_BE/bills.lang           |   0
 {htdocs => public}/langs/fr_BE/bookmarks.lang       |   0
 {htdocs => public}/langs/fr_BE/boxes.lang           |   0
 {htdocs => public}/langs/fr_BE/cashdesk.lang        |   0
 {htdocs => public}/langs/fr_BE/categories.lang      |   0
 {htdocs => public}/langs/fr_BE/commercial.lang      |   0
 {htdocs => public}/langs/fr_BE/companies.lang       |   0
 {htdocs => public}/langs/fr_BE/compta.lang          |   0
 {htdocs => public}/langs/fr_BE/contracts.lang       |   0
 {htdocs => public}/langs/fr_BE/cron.lang            |   0
 {htdocs => public}/langs/fr_BE/deliveries.lang      |   0
 {htdocs => public}/langs/fr_BE/dict.lang            |   0
 {htdocs => public}/langs/fr_BE/donations.lang       |   0
 {htdocs => public}/langs/fr_BE/ecm.lang             |   0
 {htdocs => public}/langs/fr_BE/errors.lang          |   0
 {htdocs => public}/langs/fr_BE/exports.lang         |   0
 {htdocs => public}/langs/fr_BE/externalsite.lang    |   0
 {htdocs => public}/langs/fr_BE/ftp.lang             |   0
 {htdocs => public}/langs/fr_BE/help.lang            |   0
 {htdocs => public}/langs/fr_BE/holiday.lang         |   0
 {htdocs => public}/langs/fr_BE/hrm.lang             |   0
 {htdocs => public}/langs/fr_BE/incoterm.lang        |   0
 {htdocs => public}/langs/fr_BE/install.lang         |   0
 {htdocs => public}/langs/fr_BE/interventions.lang   |   0
 {htdocs => public}/langs/fr_BE/languages.lang       |   0
 {htdocs => public}/langs/fr_BE/ldap.lang            |   0
 {htdocs => public}/langs/fr_BE/link.lang            |   0
 {htdocs => public}/langs/fr_BE/loan.lang            |   0
 {htdocs => public}/langs/fr_BE/mailmanspip.lang     |   0
 {htdocs => public}/langs/fr_BE/mails.lang           |   0
 {htdocs => public}/langs/fr_BE/main.lang            |   0
 {htdocs => public}/langs/fr_BE/margins.lang         |   0
 {htdocs => public}/langs/fr_BE/members.lang         |   0
 {htdocs => public}/langs/fr_BE/oauth.lang           |   0
 {htdocs => public}/langs/fr_BE/opensurvey.lang      |   0
 {htdocs => public}/langs/fr_BE/orders.lang          |   0
 {htdocs => public}/langs/fr_BE/other.lang           |   0
 {htdocs => public}/langs/fr_BE/paybox.lang          |   0
 {htdocs => public}/langs/fr_BE/paypal.lang          |   0
 {htdocs => public}/langs/fr_BE/printing.lang        |   0
 {htdocs => public}/langs/fr_BE/productbatch.lang    |   0
 {htdocs => public}/langs/fr_BE/products.lang        |   0
 {htdocs => public}/langs/fr_BE/projects.lang        |   0
 {htdocs => public}/langs/fr_BE/propal.lang          |   0
 {htdocs => public}/langs/fr_BE/receiptprinter.lang  |   0
 {htdocs => public}/langs/fr_BE/resource.lang        |   0
 {htdocs => public}/langs/fr_BE/salaries.lang        |   0
 {htdocs => public}/langs/fr_BE/sendings.lang        |   0
 {htdocs => public}/langs/fr_BE/sms.lang             |   0
 {htdocs => public}/langs/fr_BE/stocks.lang          |   0
 .../langs/fr_BE/supplier_proposal.lang              |   0
 {htdocs => public}/langs/fr_BE/suppliers.lang       |   0
 {htdocs => public}/langs/fr_BE/trips.lang           |   0
 {htdocs => public}/langs/fr_BE/users.lang           |   0
 {htdocs => public}/langs/fr_BE/website.lang         |   0
 {htdocs => public}/langs/fr_BE/withdrawals.lang     |   0
 {htdocs => public}/langs/fr_BE/workflow.lang        |   0
 {htdocs => public}/langs/fr_CA/accountancy.lang     |   0
 {htdocs => public}/langs/fr_CA/admin.lang           |   0
 {htdocs => public}/langs/fr_CA/agenda.lang          |   0
 {htdocs => public}/langs/fr_CA/banks.lang           |   0
 {htdocs => public}/langs/fr_CA/bills.lang           |   0
 {htdocs => public}/langs/fr_CA/bookmarks.lang       |   0
 {htdocs => public}/langs/fr_CA/boxes.lang           |   0
 {htdocs => public}/langs/fr_CA/cashdesk.lang        |   0
 {htdocs => public}/langs/fr_CA/categories.lang      |   0
 {htdocs => public}/langs/fr_CA/commercial.lang      |   0
 {htdocs => public}/langs/fr_CA/companies.lang       |   0
 {htdocs => public}/langs/fr_CA/compta.lang          |   0
 {htdocs => public}/langs/fr_CA/contracts.lang       |   0
 {htdocs => public}/langs/fr_CA/cron.lang            |   0
 {htdocs => public}/langs/fr_CA/deliveries.lang      |   0
 {htdocs => public}/langs/fr_CA/dict.lang            |   0
 {htdocs => public}/langs/fr_CA/donations.lang       |   0
 {htdocs => public}/langs/fr_CA/ecm.lang             |   0
 {htdocs => public}/langs/fr_CA/errors.lang          |   0
 {htdocs => public}/langs/fr_CA/exports.lang         |   0
 {htdocs => public}/langs/fr_CA/externalsite.lang    |   0
 {htdocs => public}/langs/fr_CA/ftp.lang             |   0
 {htdocs => public}/langs/fr_CA/help.lang            |   0
 {htdocs => public}/langs/fr_CA/holiday.lang         |   0
 {htdocs => public}/langs/fr_CA/hrm.lang             |   0
 {htdocs => public}/langs/fr_CA/incoterm.lang        |   0
 {htdocs => public}/langs/fr_CA/install.lang         |   0
 {htdocs => public}/langs/fr_CA/interventions.lang   |   0
 {htdocs => public}/langs/fr_CA/languages.lang       |   0
 {htdocs => public}/langs/fr_CA/ldap.lang            |   0
 {htdocs => public}/langs/fr_CA/link.lang            |   0
 {htdocs => public}/langs/fr_CA/loan.lang            |   0
 {htdocs => public}/langs/fr_CA/mailmanspip.lang     |   0
 {htdocs => public}/langs/fr_CA/mails.lang           |   0
 {htdocs => public}/langs/fr_CA/main.lang            |   0
 {htdocs => public}/langs/fr_CA/margins.lang         |   0
 {htdocs => public}/langs/fr_CA/members.lang         |   0
 {htdocs => public}/langs/fr_CA/oauth.lang           |   0
 {htdocs => public}/langs/fr_CA/opensurvey.lang      |   0
 {htdocs => public}/langs/fr_CA/orders.lang          |   0
 {htdocs => public}/langs/fr_CA/other.lang           |   0
 {htdocs => public}/langs/fr_CA/paybox.lang          |   0
 {htdocs => public}/langs/fr_CA/paypal.lang          |   0
 {htdocs => public}/langs/fr_CA/printing.lang        |   0
 {htdocs => public}/langs/fr_CA/productbatch.lang    |   0
 {htdocs => public}/langs/fr_CA/products.lang        |   0
 {htdocs => public}/langs/fr_CA/projects.lang        |   0
 {htdocs => public}/langs/fr_CA/propal.lang          |   0
 {htdocs => public}/langs/fr_CA/receiptprinter.lang  |   0
 {htdocs => public}/langs/fr_CA/resource.lang        |   0
 {htdocs => public}/langs/fr_CA/salaries.lang        |   0
 {htdocs => public}/langs/fr_CA/sendings.lang        |   0
 {htdocs => public}/langs/fr_CA/sms.lang             |   0
 {htdocs => public}/langs/fr_CA/stocks.lang          |   0
 .../langs/fr_CA/supplier_proposal.lang              |   0
 {htdocs => public}/langs/fr_CA/suppliers.lang       |   0
 {htdocs => public}/langs/fr_CA/trips.lang           |   0
 {htdocs => public}/langs/fr_CA/users.lang           |   0
 {htdocs => public}/langs/fr_CA/website.lang         |   0
 {htdocs => public}/langs/fr_CA/withdrawals.lang     |   0
 {htdocs => public}/langs/fr_CA/workflow.lang        |   0
 {htdocs => public}/langs/fr_CH/accountancy.lang     |   0
 {htdocs => public}/langs/fr_CH/admin.lang           |   0
 {htdocs => public}/langs/fr_CH/agenda.lang          |   0
 {htdocs => public}/langs/fr_CH/banks.lang           |   0
 {htdocs => public}/langs/fr_CH/bills.lang           |   0
 {htdocs => public}/langs/fr_CH/bookmarks.lang       |   0
 {htdocs => public}/langs/fr_CH/boxes.lang           |   0
 {htdocs => public}/langs/fr_CH/cashdesk.lang        |   0
 {htdocs => public}/langs/fr_CH/categories.lang      |   0
 {htdocs => public}/langs/fr_CH/commercial.lang      |   0
 {htdocs => public}/langs/fr_CH/companies.lang       |   0
 {htdocs => public}/langs/fr_CH/compta.lang          |   0
 {htdocs => public}/langs/fr_CH/contracts.lang       |   0
 {htdocs => public}/langs/fr_CH/cron.lang            |   0
 {htdocs => public}/langs/fr_CH/deliveries.lang      |   0
 {htdocs => public}/langs/fr_CH/dict.lang            |   0
 {htdocs => public}/langs/fr_CH/donations.lang       |   0
 {htdocs => public}/langs/fr_CH/ecm.lang             |   0
 {htdocs => public}/langs/fr_CH/errors.lang          |   0
 {htdocs => public}/langs/fr_CH/exports.lang         |   0
 {htdocs => public}/langs/fr_CH/externalsite.lang    |   0
 {htdocs => public}/langs/fr_CH/ftp.lang             |   0
 {htdocs => public}/langs/fr_CH/help.lang            |   0
 {htdocs => public}/langs/fr_CH/holiday.lang         |   0
 {htdocs => public}/langs/fr_CH/hrm.lang             |   0
 {htdocs => public}/langs/fr_CH/incoterm.lang        |   0
 {htdocs => public}/langs/fr_CH/install.lang         |   0
 {htdocs => public}/langs/fr_CH/interventions.lang   |   0
 {htdocs => public}/langs/fr_CH/languages.lang       |   0
 {htdocs => public}/langs/fr_CH/ldap.lang            |   0
 {htdocs => public}/langs/fr_CH/link.lang            |   0
 {htdocs => public}/langs/fr_CH/loan.lang            |   0
 {htdocs => public}/langs/fr_CH/mailmanspip.lang     |   0
 {htdocs => public}/langs/fr_CH/mails.lang           |   0
 {htdocs => public}/langs/fr_CH/main.lang            |   0
 {htdocs => public}/langs/fr_CH/margins.lang         |   0
 {htdocs => public}/langs/fr_CH/members.lang         |   0
 {htdocs => public}/langs/fr_CH/oauth.lang           |   0
 {htdocs => public}/langs/fr_CH/opensurvey.lang      |   0
 {htdocs => public}/langs/fr_CH/orders.lang          |   0
 {htdocs => public}/langs/fr_CH/other.lang           |   0
 {htdocs => public}/langs/fr_CH/paybox.lang          |   0
 {htdocs => public}/langs/fr_CH/paypal.lang          |   0
 {htdocs => public}/langs/fr_CH/printing.lang        |   0
 {htdocs => public}/langs/fr_CH/productbatch.lang    |   0
 {htdocs => public}/langs/fr_CH/products.lang        |   0
 {htdocs => public}/langs/fr_CH/projects.lang        |   0
 {htdocs => public}/langs/fr_CH/propal.lang          |   0
 {htdocs => public}/langs/fr_CH/receiptprinter.lang  |   0
 {htdocs => public}/langs/fr_CH/resource.lang        |   0
 {htdocs => public}/langs/fr_CH/salaries.lang        |   0
 {htdocs => public}/langs/fr_CH/sendings.lang        |   0
 {htdocs => public}/langs/fr_CH/sms.lang             |   0
 {htdocs => public}/langs/fr_CH/stocks.lang          |   0
 .../langs/fr_CH/supplier_proposal.lang              |   0
 {htdocs => public}/langs/fr_CH/suppliers.lang       |   0
 {htdocs => public}/langs/fr_CH/trips.lang           |   0
 {htdocs => public}/langs/fr_CH/users.lang           |   0
 {htdocs => public}/langs/fr_CH/website.lang         |   0
 {htdocs => public}/langs/fr_CH/withdrawals.lang     |   0
 {htdocs => public}/langs/fr_CH/workflow.lang        |   0
 {htdocs => public}/langs/fr_FR/accountancy.lang     |   0
 {htdocs => public}/langs/fr_FR/admin.lang           |   0
 {htdocs => public}/langs/fr_FR/agenda.lang          |   0
 {htdocs => public}/langs/fr_FR/banks.lang           |   0
 {htdocs => public}/langs/fr_FR/bills.lang           |   0
 {htdocs => public}/langs/fr_FR/bookmarks.lang       |   0
 {htdocs => public}/langs/fr_FR/boxes.lang           |   0
 {htdocs => public}/langs/fr_FR/cashdesk.lang        |   0
 {htdocs => public}/langs/fr_FR/categories.lang      |   0
 {htdocs => public}/langs/fr_FR/commercial.lang      |   0
 {htdocs => public}/langs/fr_FR/companies.lang       |   0
 {htdocs => public}/langs/fr_FR/compta.lang          |   0
 {htdocs => public}/langs/fr_FR/contracts.lang       |   0
 {htdocs => public}/langs/fr_FR/cron.lang            |   0
 {htdocs => public}/langs/fr_FR/deliveries.lang      |   0
 {htdocs => public}/langs/fr_FR/dict.lang            |   0
 {htdocs => public}/langs/fr_FR/donations.lang       |   0
 {htdocs => public}/langs/fr_FR/ecm.lang             |   0
 {htdocs => public}/langs/fr_FR/errors.lang          |   0
 {htdocs => public}/langs/fr_FR/expensereports.lang  |   0
 {htdocs => public}/langs/fr_FR/exports.lang         |   0
 {htdocs => public}/langs/fr_FR/externalsite.lang    |   0
 {htdocs => public}/langs/fr_FR/ftp.lang             |   0
 {htdocs => public}/langs/fr_FR/help.lang            |   0
 {htdocs => public}/langs/fr_FR/holiday.lang         |   0
 {htdocs => public}/langs/fr_FR/hrm.lang             |   0
 {htdocs => public}/langs/fr_FR/incoterm.lang        |   0
 {htdocs => public}/langs/fr_FR/install.lang         |   0
 {htdocs => public}/langs/fr_FR/interventions.lang   |   0
 {htdocs => public}/langs/fr_FR/languages.lang       |   0
 {htdocs => public}/langs/fr_FR/ldap.lang            |   0
 {htdocs => public}/langs/fr_FR/link.lang            |   0
 {htdocs => public}/langs/fr_FR/loan.lang            |   0
 {htdocs => public}/langs/fr_FR/mailmanspip.lang     |   0
 {htdocs => public}/langs/fr_FR/mails.lang           |   0
 {htdocs => public}/langs/fr_FR/main.lang            |   0
 {htdocs => public}/langs/fr_FR/margins.lang         |   0
 {htdocs => public}/langs/fr_FR/members.lang         |   0
 {htdocs => public}/langs/fr_FR/oauth.lang           |   0
 {htdocs => public}/langs/fr_FR/opensurvey.lang      |   0
 {htdocs => public}/langs/fr_FR/orders.lang          |   0
 {htdocs => public}/langs/fr_FR/other.lang           |   0
 {htdocs => public}/langs/fr_FR/paybox.lang          |   0
 {htdocs => public}/langs/fr_FR/paypal.lang          |   0
 {htdocs => public}/langs/fr_FR/printing.lang        |   0
 {htdocs => public}/langs/fr_FR/productbatch.lang    |   0
 {htdocs => public}/langs/fr_FR/products.lang        |   0
 {htdocs => public}/langs/fr_FR/projects.lang        |   0
 {htdocs => public}/langs/fr_FR/propal.lang          |   0
 {htdocs => public}/langs/fr_FR/receiptprinter.lang  |   0
 {htdocs => public}/langs/fr_FR/resource.lang        |   0
 {htdocs => public}/langs/fr_FR/salaries.lang        |   0
 {htdocs => public}/langs/fr_FR/sendings.lang        |   0
 {htdocs => public}/langs/fr_FR/sms.lang             |   0
 {htdocs => public}/langs/fr_FR/stocks.lang          |   0
 .../langs/fr_FR/supplier_proposal.lang              |   0
 {htdocs => public}/langs/fr_FR/suppliers.lang       |   0
 {htdocs => public}/langs/fr_FR/trips.lang           |   0
 {htdocs => public}/langs/fr_FR/users.lang           |   0
 {htdocs => public}/langs/fr_FR/website.lang         |   0
 {htdocs => public}/langs/fr_FR/withdrawals.lang     |   0
 {htdocs => public}/langs/fr_FR/workflow.lang        |   0
 {htdocs => public}/langs/fr_NC/admin.lang           |   0
 {htdocs => public}/langs/fr_NC/companies.lang       |   0
 {htdocs => public}/langs/fr_NC/compta.lang          |   0
 {htdocs => public}/langs/fr_NC/main.lang            |   0
 {htdocs => public}/langs/he_IL/accountancy.lang     |   0
 {htdocs => public}/langs/he_IL/admin.lang           |   0
 {htdocs => public}/langs/he_IL/agenda.lang          |   0
 {htdocs => public}/langs/he_IL/banks.lang           |   0
 {htdocs => public}/langs/he_IL/bills.lang           |   0
 {htdocs => public}/langs/he_IL/bookmarks.lang       |   0
 {htdocs => public}/langs/he_IL/boxes.lang           |   0
 {htdocs => public}/langs/he_IL/cashdesk.lang        |   0
 {htdocs => public}/langs/he_IL/categories.lang      |   0
 {htdocs => public}/langs/he_IL/commercial.lang      |   0
 {htdocs => public}/langs/he_IL/companies.lang       |   0
 {htdocs => public}/langs/he_IL/compta.lang          |   0
 {htdocs => public}/langs/he_IL/contracts.lang       |   0
 {htdocs => public}/langs/he_IL/cron.lang            |   0
 {htdocs => public}/langs/he_IL/deliveries.lang      |   0
 {htdocs => public}/langs/he_IL/dict.lang            |   0
 {htdocs => public}/langs/he_IL/donations.lang       |   0
 {htdocs => public}/langs/he_IL/ecm.lang             |   0
 {htdocs => public}/langs/he_IL/errors.lang          |   0
 {htdocs => public}/langs/he_IL/exports.lang         |   0
 {htdocs => public}/langs/he_IL/externalsite.lang    |   0
 {htdocs => public}/langs/he_IL/ftp.lang             |   0
 {htdocs => public}/langs/he_IL/help.lang            |   0
 {htdocs => public}/langs/he_IL/holiday.lang         |   0
 {htdocs => public}/langs/he_IL/hrm.lang             |   0
 {htdocs => public}/langs/he_IL/incoterm.lang        |   0
 {htdocs => public}/langs/he_IL/install.lang         |   0
 {htdocs => public}/langs/he_IL/interventions.lang   |   0
 {htdocs => public}/langs/he_IL/languages.lang       |   0
 {htdocs => public}/langs/he_IL/ldap.lang            |   0
 {htdocs => public}/langs/he_IL/link.lang            |   0
 {htdocs => public}/langs/he_IL/loan.lang            |   0
 {htdocs => public}/langs/he_IL/mailmanspip.lang     |   0
 {htdocs => public}/langs/he_IL/mails.lang           |   0
 {htdocs => public}/langs/he_IL/main.lang            |   0
 {htdocs => public}/langs/he_IL/margins.lang         |   0
 {htdocs => public}/langs/he_IL/members.lang         |   0
 {htdocs => public}/langs/he_IL/oauth.lang           |   0
 {htdocs => public}/langs/he_IL/opensurvey.lang      |   0
 {htdocs => public}/langs/he_IL/orders.lang          |   0
 {htdocs => public}/langs/he_IL/other.lang           |   0
 {htdocs => public}/langs/he_IL/paybox.lang          |   0
 {htdocs => public}/langs/he_IL/paypal.lang          |   0
 {htdocs => public}/langs/he_IL/printing.lang        |   0
 {htdocs => public}/langs/he_IL/productbatch.lang    |   0
 {htdocs => public}/langs/he_IL/products.lang        |   0
 {htdocs => public}/langs/he_IL/projects.lang        |   0
 {htdocs => public}/langs/he_IL/propal.lang          |   0
 {htdocs => public}/langs/he_IL/receiptprinter.lang  |   0
 {htdocs => public}/langs/he_IL/resource.lang        |   0
 {htdocs => public}/langs/he_IL/salaries.lang        |   0
 {htdocs => public}/langs/he_IL/sendings.lang        |   0
 {htdocs => public}/langs/he_IL/sms.lang             |   0
 {htdocs => public}/langs/he_IL/stocks.lang          |   0
 .../langs/he_IL/supplier_proposal.lang              |   0
 {htdocs => public}/langs/he_IL/suppliers.lang       |   0
 {htdocs => public}/langs/he_IL/trips.lang           |   0
 {htdocs => public}/langs/he_IL/users.lang           |   0
 {htdocs => public}/langs/he_IL/website.lang         |   0
 {htdocs => public}/langs/he_IL/withdrawals.lang     |   0
 {htdocs => public}/langs/he_IL/workflow.lang        |   0
 {htdocs => public}/langs/hr_HR/accountancy.lang     |   0
 {htdocs => public}/langs/hr_HR/admin.lang           |   0
 {htdocs => public}/langs/hr_HR/agenda.lang          |   0
 {htdocs => public}/langs/hr_HR/banks.lang           |   0
 {htdocs => public}/langs/hr_HR/bills.lang           |   0
 {htdocs => public}/langs/hr_HR/bookmarks.lang       |   0
 {htdocs => public}/langs/hr_HR/boxes.lang           |   0
 {htdocs => public}/langs/hr_HR/cashdesk.lang        |   0
 {htdocs => public}/langs/hr_HR/categories.lang      |   0
 {htdocs => public}/langs/hr_HR/commercial.lang      |   0
 {htdocs => public}/langs/hr_HR/companies.lang       |   0
 {htdocs => public}/langs/hr_HR/compta.lang          |   0
 {htdocs => public}/langs/hr_HR/contracts.lang       |   0
 {htdocs => public}/langs/hr_HR/cron.lang            |   0
 {htdocs => public}/langs/hr_HR/deliveries.lang      |   0
 {htdocs => public}/langs/hr_HR/dict.lang            |   0
 {htdocs => public}/langs/hr_HR/donations.lang       |   0
 {htdocs => public}/langs/hr_HR/ecm.lang             |   0
 {htdocs => public}/langs/hr_HR/errors.lang          |   0
 {htdocs => public}/langs/hr_HR/exports.lang         |   0
 {htdocs => public}/langs/hr_HR/externalsite.lang    |   0
 {htdocs => public}/langs/hr_HR/ftp.lang             |   0
 {htdocs => public}/langs/hr_HR/help.lang            |   0
 {htdocs => public}/langs/hr_HR/holiday.lang         |   0
 {htdocs => public}/langs/hr_HR/hrm.lang             |   0
 {htdocs => public}/langs/hr_HR/incoterm.lang        |   0
 {htdocs => public}/langs/hr_HR/install.lang         |   0
 {htdocs => public}/langs/hr_HR/interventions.lang   |   0
 {htdocs => public}/langs/hr_HR/languages.lang       |   0
 {htdocs => public}/langs/hr_HR/ldap.lang            |   0
 {htdocs => public}/langs/hr_HR/link.lang            |   0
 {htdocs => public}/langs/hr_HR/loan.lang            |   0
 {htdocs => public}/langs/hr_HR/mailmanspip.lang     |   0
 {htdocs => public}/langs/hr_HR/mails.lang           |   0
 {htdocs => public}/langs/hr_HR/main.lang            |   0
 {htdocs => public}/langs/hr_HR/margins.lang         |   0
 {htdocs => public}/langs/hr_HR/members.lang         |   0
 {htdocs => public}/langs/hr_HR/oauth.lang           |   0
 {htdocs => public}/langs/hr_HR/opensurvey.lang      |   0
 {htdocs => public}/langs/hr_HR/orders.lang          |   0
 {htdocs => public}/langs/hr_HR/other.lang           |   0
 {htdocs => public}/langs/hr_HR/paybox.lang          |   0
 {htdocs => public}/langs/hr_HR/paypal.lang          |   0
 {htdocs => public}/langs/hr_HR/printing.lang        |   0
 {htdocs => public}/langs/hr_HR/productbatch.lang    |   0
 {htdocs => public}/langs/hr_HR/products.lang        |   0
 {htdocs => public}/langs/hr_HR/projects.lang        |   0
 {htdocs => public}/langs/hr_HR/propal.lang          |   0
 {htdocs => public}/langs/hr_HR/receiptprinter.lang  |   0
 {htdocs => public}/langs/hr_HR/resource.lang        |   0
 {htdocs => public}/langs/hr_HR/salaries.lang        |   0
 {htdocs => public}/langs/hr_HR/sendings.lang        |   0
 {htdocs => public}/langs/hr_HR/sms.lang             |   0
 {htdocs => public}/langs/hr_HR/stocks.lang          |   0
 .../langs/hr_HR/supplier_proposal.lang              |   0
 {htdocs => public}/langs/hr_HR/suppliers.lang       |   0
 {htdocs => public}/langs/hr_HR/trips.lang           |   0
 {htdocs => public}/langs/hr_HR/users.lang           |   0
 {htdocs => public}/langs/hr_HR/website.lang         |   0
 {htdocs => public}/langs/hr_HR/withdrawals.lang     |   0
 {htdocs => public}/langs/hr_HR/workflow.lang        |   0
 {htdocs => public}/langs/hu_HU/accountancy.lang     |   0
 {htdocs => public}/langs/hu_HU/admin.lang           |   0
 {htdocs => public}/langs/hu_HU/agenda.lang          |   0
 {htdocs => public}/langs/hu_HU/banks.lang           |   0
 {htdocs => public}/langs/hu_HU/bills.lang           |   0
 {htdocs => public}/langs/hu_HU/bookmarks.lang       |   0
 {htdocs => public}/langs/hu_HU/boxes.lang           |   0
 {htdocs => public}/langs/hu_HU/cashdesk.lang        |   0
 {htdocs => public}/langs/hu_HU/categories.lang      |   0
 {htdocs => public}/langs/hu_HU/commercial.lang      |   0
 {htdocs => public}/langs/hu_HU/companies.lang       |   0
 {htdocs => public}/langs/hu_HU/compta.lang          |   0
 {htdocs => public}/langs/hu_HU/contracts.lang       |   0
 {htdocs => public}/langs/hu_HU/cron.lang            |   0
 {htdocs => public}/langs/hu_HU/deliveries.lang      |   0
 {htdocs => public}/langs/hu_HU/dict.lang            |   0
 {htdocs => public}/langs/hu_HU/donations.lang       |   0
 {htdocs => public}/langs/hu_HU/ecm.lang             |   0
 {htdocs => public}/langs/hu_HU/errors.lang          |   0
 {htdocs => public}/langs/hu_HU/exports.lang         |   0
 {htdocs => public}/langs/hu_HU/externalsite.lang    |   0
 {htdocs => public}/langs/hu_HU/ftp.lang             |   0
 {htdocs => public}/langs/hu_HU/help.lang            |   0
 {htdocs => public}/langs/hu_HU/holiday.lang         |   0
 {htdocs => public}/langs/hu_HU/hrm.lang             |   0
 {htdocs => public}/langs/hu_HU/incoterm.lang        |   0
 {htdocs => public}/langs/hu_HU/install.lang         |   0
 {htdocs => public}/langs/hu_HU/interventions.lang   |   0
 {htdocs => public}/langs/hu_HU/languages.lang       |   0
 {htdocs => public}/langs/hu_HU/ldap.lang            |   0
 {htdocs => public}/langs/hu_HU/link.lang            |   0
 {htdocs => public}/langs/hu_HU/loan.lang            |   0
 {htdocs => public}/langs/hu_HU/mailmanspip.lang     |   0
 {htdocs => public}/langs/hu_HU/mails.lang           |   0
 {htdocs => public}/langs/hu_HU/main.lang            |   0
 {htdocs => public}/langs/hu_HU/margins.lang         |   0
 {htdocs => public}/langs/hu_HU/members.lang         |   0
 {htdocs => public}/langs/hu_HU/oauth.lang           |   0
 {htdocs => public}/langs/hu_HU/opensurvey.lang      |   0
 {htdocs => public}/langs/hu_HU/orders.lang          |   0
 {htdocs => public}/langs/hu_HU/other.lang           |   0
 {htdocs => public}/langs/hu_HU/paybox.lang          |   0
 {htdocs => public}/langs/hu_HU/paypal.lang          |   0
 {htdocs => public}/langs/hu_HU/printing.lang        |   0
 {htdocs => public}/langs/hu_HU/productbatch.lang    |   0
 {htdocs => public}/langs/hu_HU/products.lang        |   0
 {htdocs => public}/langs/hu_HU/projects.lang        |   0
 {htdocs => public}/langs/hu_HU/propal.lang          |   0
 {htdocs => public}/langs/hu_HU/receiptprinter.lang  |   0
 {htdocs => public}/langs/hu_HU/resource.lang        |   0
 {htdocs => public}/langs/hu_HU/salaries.lang        |   0
 {htdocs => public}/langs/hu_HU/sendings.lang        |   0
 {htdocs => public}/langs/hu_HU/sms.lang             |   0
 {htdocs => public}/langs/hu_HU/stocks.lang          |   0
 .../langs/hu_HU/supplier_proposal.lang              |   0
 {htdocs => public}/langs/hu_HU/suppliers.lang       |   0
 {htdocs => public}/langs/hu_HU/trips.lang           |   0
 {htdocs => public}/langs/hu_HU/users.lang           |   0
 {htdocs => public}/langs/hu_HU/website.lang         |   0
 {htdocs => public}/langs/hu_HU/withdrawals.lang     |   0
 {htdocs => public}/langs/hu_HU/workflow.lang        |   0
 {htdocs => public}/langs/id_ID/accountancy.lang     |   0
 {htdocs => public}/langs/id_ID/admin.lang           |   0
 {htdocs => public}/langs/id_ID/agenda.lang          |   0
 {htdocs => public}/langs/id_ID/banks.lang           |   0
 {htdocs => public}/langs/id_ID/bills.lang           |   0
 {htdocs => public}/langs/id_ID/bookmarks.lang       |   0
 {htdocs => public}/langs/id_ID/boxes.lang           |   0
 {htdocs => public}/langs/id_ID/cashdesk.lang        |   0
 {htdocs => public}/langs/id_ID/categories.lang      |   0
 {htdocs => public}/langs/id_ID/commercial.lang      |   0
 {htdocs => public}/langs/id_ID/companies.lang       |   0
 {htdocs => public}/langs/id_ID/compta.lang          |   0
 {htdocs => public}/langs/id_ID/contracts.lang       |   0
 {htdocs => public}/langs/id_ID/cron.lang            |   0
 {htdocs => public}/langs/id_ID/deliveries.lang      |   0
 {htdocs => public}/langs/id_ID/dict.lang            |   0
 {htdocs => public}/langs/id_ID/donations.lang       |   0
 {htdocs => public}/langs/id_ID/ecm.lang             |   0
 {htdocs => public}/langs/id_ID/errors.lang          |   0
 {htdocs => public}/langs/id_ID/exports.lang         |   0
 {htdocs => public}/langs/id_ID/externalsite.lang    |   0
 {htdocs => public}/langs/id_ID/ftp.lang             |   0
 {htdocs => public}/langs/id_ID/help.lang            |   0
 {htdocs => public}/langs/id_ID/holiday.lang         |   0
 {htdocs => public}/langs/id_ID/hrm.lang             |   0
 {htdocs => public}/langs/id_ID/incoterm.lang        |   0
 {htdocs => public}/langs/id_ID/install.lang         |   0
 {htdocs => public}/langs/id_ID/interventions.lang   |   0
 {htdocs => public}/langs/id_ID/languages.lang       |   0
 {htdocs => public}/langs/id_ID/ldap.lang            |   0
 {htdocs => public}/langs/id_ID/link.lang            |   0
 {htdocs => public}/langs/id_ID/loan.lang            |   0
 {htdocs => public}/langs/id_ID/mailmanspip.lang     |   0
 {htdocs => public}/langs/id_ID/mails.lang           |   0
 {htdocs => public}/langs/id_ID/main.lang            |   0
 {htdocs => public}/langs/id_ID/margins.lang         |   0
 {htdocs => public}/langs/id_ID/members.lang         |   0
 {htdocs => public}/langs/id_ID/oauth.lang           |   0
 {htdocs => public}/langs/id_ID/opensurvey.lang      |   0
 {htdocs => public}/langs/id_ID/orders.lang          |   0
 {htdocs => public}/langs/id_ID/other.lang           |   0
 {htdocs => public}/langs/id_ID/paybox.lang          |   0
 {htdocs => public}/langs/id_ID/paypal.lang          |   0
 {htdocs => public}/langs/id_ID/printing.lang        |   0
 {htdocs => public}/langs/id_ID/productbatch.lang    |   0
 {htdocs => public}/langs/id_ID/products.lang        |   0
 {htdocs => public}/langs/id_ID/projects.lang        |   0
 {htdocs => public}/langs/id_ID/propal.lang          |   0
 {htdocs => public}/langs/id_ID/receiptprinter.lang  |   0
 {htdocs => public}/langs/id_ID/resource.lang        |   0
 {htdocs => public}/langs/id_ID/salaries.lang        |   0
 {htdocs => public}/langs/id_ID/sendings.lang        |   0
 {htdocs => public}/langs/id_ID/sms.lang             |   0
 {htdocs => public}/langs/id_ID/stocks.lang          |   0
 .../langs/id_ID/supplier_proposal.lang              |   0
 {htdocs => public}/langs/id_ID/suppliers.lang       |   0
 {htdocs => public}/langs/id_ID/trips.lang           |   0
 {htdocs => public}/langs/id_ID/users.lang           |   0
 {htdocs => public}/langs/id_ID/website.lang         |   0
 {htdocs => public}/langs/id_ID/withdrawals.lang     |   0
 {htdocs => public}/langs/id_ID/workflow.lang        |   0
 {htdocs => public}/langs/is_IS/accountancy.lang     |   0
 {htdocs => public}/langs/is_IS/admin.lang           |   0
 {htdocs => public}/langs/is_IS/agenda.lang          |   0
 {htdocs => public}/langs/is_IS/banks.lang           |   0
 {htdocs => public}/langs/is_IS/bills.lang           |   0
 {htdocs => public}/langs/is_IS/bookmarks.lang       |   0
 {htdocs => public}/langs/is_IS/boxes.lang           |   0
 {htdocs => public}/langs/is_IS/cashdesk.lang        |   0
 {htdocs => public}/langs/is_IS/categories.lang      |   0
 {htdocs => public}/langs/is_IS/commercial.lang      |   0
 {htdocs => public}/langs/is_IS/companies.lang       |   0
 {htdocs => public}/langs/is_IS/compta.lang          |   0
 {htdocs => public}/langs/is_IS/contracts.lang       |   0
 {htdocs => public}/langs/is_IS/cron.lang            |   0
 {htdocs => public}/langs/is_IS/deliveries.lang      |   0
 {htdocs => public}/langs/is_IS/dict.lang            |   0
 {htdocs => public}/langs/is_IS/donations.lang       |   0
 {htdocs => public}/langs/is_IS/ecm.lang             |   0
 {htdocs => public}/langs/is_IS/errors.lang          |   0
 {htdocs => public}/langs/is_IS/exports.lang         |   0
 {htdocs => public}/langs/is_IS/externalsite.lang    |   0
 {htdocs => public}/langs/is_IS/ftp.lang             |   0
 {htdocs => public}/langs/is_IS/help.lang            |   0
 {htdocs => public}/langs/is_IS/holiday.lang         |   0
 {htdocs => public}/langs/is_IS/hrm.lang             |   0
 {htdocs => public}/langs/is_IS/incoterm.lang        |   0
 {htdocs => public}/langs/is_IS/install.lang         |   0
 {htdocs => public}/langs/is_IS/interventions.lang   |   0
 {htdocs => public}/langs/is_IS/languages.lang       |   0
 {htdocs => public}/langs/is_IS/ldap.lang            |   0
 {htdocs => public}/langs/is_IS/link.lang            |   0
 {htdocs => public}/langs/is_IS/loan.lang            |   0
 {htdocs => public}/langs/is_IS/mailmanspip.lang     |   0
 {htdocs => public}/langs/is_IS/mails.lang           |   0
 {htdocs => public}/langs/is_IS/main.lang            |   0
 {htdocs => public}/langs/is_IS/margins.lang         |   0
 {htdocs => public}/langs/is_IS/members.lang         |   0
 {htdocs => public}/langs/is_IS/oauth.lang           |   0
 {htdocs => public}/langs/is_IS/opensurvey.lang      |   0
 {htdocs => public}/langs/is_IS/orders.lang          |   0
 {htdocs => public}/langs/is_IS/other.lang           |   0
 {htdocs => public}/langs/is_IS/paybox.lang          |   0
 {htdocs => public}/langs/is_IS/paypal.lang          |   0
 {htdocs => public}/langs/is_IS/printing.lang        |   0
 {htdocs => public}/langs/is_IS/productbatch.lang    |   0
 {htdocs => public}/langs/is_IS/products.lang        |   0
 {htdocs => public}/langs/is_IS/projects.lang        |   0
 {htdocs => public}/langs/is_IS/propal.lang          |   0
 {htdocs => public}/langs/is_IS/receiptprinter.lang  |   0
 {htdocs => public}/langs/is_IS/resource.lang        |   0
 {htdocs => public}/langs/is_IS/salaries.lang        |   0
 {htdocs => public}/langs/is_IS/sendings.lang        |   0
 {htdocs => public}/langs/is_IS/sms.lang             |   0
 {htdocs => public}/langs/is_IS/stocks.lang          |   0
 .../langs/is_IS/supplier_proposal.lang              |   0
 {htdocs => public}/langs/is_IS/suppliers.lang       |   0
 {htdocs => public}/langs/is_IS/trips.lang           |   0
 {htdocs => public}/langs/is_IS/users.lang           |   0
 {htdocs => public}/langs/is_IS/website.lang         |   0
 {htdocs => public}/langs/is_IS/withdrawals.lang     |   0
 {htdocs => public}/langs/is_IS/workflow.lang        |   0
 {htdocs => public}/langs/it_IT/accountancy.lang     |   0
 {htdocs => public}/langs/it_IT/admin.lang           |   0
 {htdocs => public}/langs/it_IT/agenda.lang          |   0
 {htdocs => public}/langs/it_IT/banks.lang           |   0
 {htdocs => public}/langs/it_IT/bills.lang           |   0
 {htdocs => public}/langs/it_IT/bookmarks.lang       |   0
 {htdocs => public}/langs/it_IT/boxes.lang           |   0
 {htdocs => public}/langs/it_IT/cashdesk.lang        |   0
 {htdocs => public}/langs/it_IT/categories.lang      |   0
 {htdocs => public}/langs/it_IT/commercial.lang      |   0
 {htdocs => public}/langs/it_IT/companies.lang       |   0
 {htdocs => public}/langs/it_IT/compta.lang          |   0
 {htdocs => public}/langs/it_IT/contracts.lang       |   0
 {htdocs => public}/langs/it_IT/cron.lang            |   0
 {htdocs => public}/langs/it_IT/deliveries.lang      |   0
 {htdocs => public}/langs/it_IT/dict.lang            |   0
 {htdocs => public}/langs/it_IT/donations.lang       |   0
 {htdocs => public}/langs/it_IT/ecm.lang             |   0
 {htdocs => public}/langs/it_IT/errors.lang          |   0
 {htdocs => public}/langs/it_IT/exports.lang         |   0
 {htdocs => public}/langs/it_IT/externalsite.lang    |   0
 {htdocs => public}/langs/it_IT/ftp.lang             |   0
 {htdocs => public}/langs/it_IT/google.lang          |   0
 {htdocs => public}/langs/it_IT/help.lang            |   0
 {htdocs => public}/langs/it_IT/holiday.lang         |   0
 {htdocs => public}/langs/it_IT/hrm.lang             |   0
 {htdocs => public}/langs/it_IT/incoterm.lang        |   0
 {htdocs => public}/langs/it_IT/install.lang         |   0
 {htdocs => public}/langs/it_IT/interventions.lang   |   0
 {htdocs => public}/langs/it_IT/languages.lang       |   0
 {htdocs => public}/langs/it_IT/ldap.lang            |   0
 {htdocs => public}/langs/it_IT/link.lang            |   0
 {htdocs => public}/langs/it_IT/loan.lang            |   0
 {htdocs => public}/langs/it_IT/mailmanspip.lang     |   0
 {htdocs => public}/langs/it_IT/mails.lang           |   0
 {htdocs => public}/langs/it_IT/main.lang            |   0
 {htdocs => public}/langs/it_IT/margins.lang         |   0
 {htdocs => public}/langs/it_IT/members.lang         |   0
 {htdocs => public}/langs/it_IT/oauth.lang           |   0
 {htdocs => public}/langs/it_IT/opensurvey.lang      |   0
 {htdocs => public}/langs/it_IT/orders.lang          |   0
 {htdocs => public}/langs/it_IT/other.lang           |   0
 {htdocs => public}/langs/it_IT/paybox.lang          |   0
 {htdocs => public}/langs/it_IT/paypal.lang          |   0
 {htdocs => public}/langs/it_IT/printing.lang        |   0
 {htdocs => public}/langs/it_IT/productbatch.lang    |   0
 {htdocs => public}/langs/it_IT/products.lang        |   0
 {htdocs => public}/langs/it_IT/projects.lang        |   0
 {htdocs => public}/langs/it_IT/propal.lang          |   0
 {htdocs => public}/langs/it_IT/receiptprinter.lang  |   0
 {htdocs => public}/langs/it_IT/resource.lang        |   0
 {htdocs => public}/langs/it_IT/salaries.lang        |   0
 {htdocs => public}/langs/it_IT/sendings.lang        |   0
 {htdocs => public}/langs/it_IT/sms.lang             |   0
 {htdocs => public}/langs/it_IT/stocks.lang          |   0
 .../langs/it_IT/supplier_proposal.lang              |   0
 {htdocs => public}/langs/it_IT/suppliers.lang       |   0
 {htdocs => public}/langs/it_IT/trips.lang           |   0
 {htdocs => public}/langs/it_IT/users.lang           |   0
 {htdocs => public}/langs/it_IT/website.lang         |   0
 {htdocs => public}/langs/it_IT/withdrawals.lang     |   0
 {htdocs => public}/langs/it_IT/workflow.lang        |   0
 {htdocs => public}/langs/ja_JP/accountancy.lang     |   0
 {htdocs => public}/langs/ja_JP/admin.lang           |   0
 {htdocs => public}/langs/ja_JP/agenda.lang          |   0
 {htdocs => public}/langs/ja_JP/banks.lang           |   0
 {htdocs => public}/langs/ja_JP/bills.lang           |   0
 {htdocs => public}/langs/ja_JP/bookmarks.lang       |   0
 {htdocs => public}/langs/ja_JP/boxes.lang           |   0
 {htdocs => public}/langs/ja_JP/cashdesk.lang        |   0
 {htdocs => public}/langs/ja_JP/categories.lang      |   0
 {htdocs => public}/langs/ja_JP/commercial.lang      |   0
 {htdocs => public}/langs/ja_JP/companies.lang       |   0
 {htdocs => public}/langs/ja_JP/compta.lang          |   0
 {htdocs => public}/langs/ja_JP/contracts.lang       |   0
 {htdocs => public}/langs/ja_JP/cron.lang            |   0
 {htdocs => public}/langs/ja_JP/deliveries.lang      |   0
 {htdocs => public}/langs/ja_JP/dict.lang            |   0
 {htdocs => public}/langs/ja_JP/donations.lang       |   0
 {htdocs => public}/langs/ja_JP/ecm.lang             |   0
 {htdocs => public}/langs/ja_JP/errors.lang          |   0
 {htdocs => public}/langs/ja_JP/exports.lang         |   0
 {htdocs => public}/langs/ja_JP/externalsite.lang    |   0
 {htdocs => public}/langs/ja_JP/ftp.lang             |   0
 {htdocs => public}/langs/ja_JP/help.lang            |   0
 {htdocs => public}/langs/ja_JP/holiday.lang         |   0
 {htdocs => public}/langs/ja_JP/hrm.lang             |   0
 {htdocs => public}/langs/ja_JP/incoterm.lang        |   0
 {htdocs => public}/langs/ja_JP/install.lang         |   0
 {htdocs => public}/langs/ja_JP/interventions.lang   |   0
 {htdocs => public}/langs/ja_JP/languages.lang       |   0
 {htdocs => public}/langs/ja_JP/ldap.lang            |   0
 {htdocs => public}/langs/ja_JP/link.lang            |   0
 {htdocs => public}/langs/ja_JP/loan.lang            |   0
 {htdocs => public}/langs/ja_JP/mailmanspip.lang     |   0
 {htdocs => public}/langs/ja_JP/mails.lang           |   0
 {htdocs => public}/langs/ja_JP/main.lang            |   0
 {htdocs => public}/langs/ja_JP/margins.lang         |   0
 {htdocs => public}/langs/ja_JP/members.lang         |   0
 {htdocs => public}/langs/ja_JP/oauth.lang           |   0
 {htdocs => public}/langs/ja_JP/opensurvey.lang      |   0
 {htdocs => public}/langs/ja_JP/orders.lang          |   0
 {htdocs => public}/langs/ja_JP/other.lang           |   0
 {htdocs => public}/langs/ja_JP/paybox.lang          |   0
 {htdocs => public}/langs/ja_JP/paypal.lang          |   0
 {htdocs => public}/langs/ja_JP/printing.lang        |   0
 {htdocs => public}/langs/ja_JP/productbatch.lang    |   0
 {htdocs => public}/langs/ja_JP/products.lang        |   0
 {htdocs => public}/langs/ja_JP/projects.lang        |   0
 {htdocs => public}/langs/ja_JP/propal.lang          |   0
 {htdocs => public}/langs/ja_JP/receiptprinter.lang  |   0
 {htdocs => public}/langs/ja_JP/resource.lang        |   0
 {htdocs => public}/langs/ja_JP/salaries.lang        |   0
 {htdocs => public}/langs/ja_JP/sendings.lang        |   0
 {htdocs => public}/langs/ja_JP/sms.lang             |   0
 {htdocs => public}/langs/ja_JP/stocks.lang          |   0
 .../langs/ja_JP/supplier_proposal.lang              |   0
 {htdocs => public}/langs/ja_JP/suppliers.lang       |   0
 {htdocs => public}/langs/ja_JP/trips.lang           |   0
 {htdocs => public}/langs/ja_JP/users.lang           |   0
 {htdocs => public}/langs/ja_JP/website.lang         |   0
 {htdocs => public}/langs/ja_JP/withdrawals.lang     |   0
 {htdocs => public}/langs/ja_JP/workflow.lang        |   0
 {htdocs => public}/langs/ka_GE/accountancy.lang     |   0
 {htdocs => public}/langs/ka_GE/admin.lang           |   0
 {htdocs => public}/langs/ka_GE/agenda.lang          |   0
 {htdocs => public}/langs/ka_GE/banks.lang           |   0
 {htdocs => public}/langs/ka_GE/bills.lang           |   0
 {htdocs => public}/langs/ka_GE/bookmarks.lang       |   0
 {htdocs => public}/langs/ka_GE/boxes.lang           |   0
 {htdocs => public}/langs/ka_GE/cashdesk.lang        |   0
 {htdocs => public}/langs/ka_GE/categories.lang      |   0
 {htdocs => public}/langs/ka_GE/commercial.lang      |   0
 {htdocs => public}/langs/ka_GE/companies.lang       |   0
 {htdocs => public}/langs/ka_GE/compta.lang          |   0
 {htdocs => public}/langs/ka_GE/contracts.lang       |   0
 {htdocs => public}/langs/ka_GE/cron.lang            |   0
 {htdocs => public}/langs/ka_GE/deliveries.lang      |   0
 {htdocs => public}/langs/ka_GE/dict.lang            |   0
 {htdocs => public}/langs/ka_GE/donations.lang       |   0
 {htdocs => public}/langs/ka_GE/ecm.lang             |   0
 {htdocs => public}/langs/ka_GE/errors.lang          |   0
 {htdocs => public}/langs/ka_GE/exports.lang         |   0
 {htdocs => public}/langs/ka_GE/externalsite.lang    |   0
 {htdocs => public}/langs/ka_GE/ftp.lang             |   0
 {htdocs => public}/langs/ka_GE/help.lang            |   0
 {htdocs => public}/langs/ka_GE/holiday.lang         |   0
 {htdocs => public}/langs/ka_GE/hrm.lang             |   0
 {htdocs => public}/langs/ka_GE/incoterm.lang        |   0
 {htdocs => public}/langs/ka_GE/install.lang         |   0
 {htdocs => public}/langs/ka_GE/interventions.lang   |   0
 {htdocs => public}/langs/ka_GE/languages.lang       |   0
 {htdocs => public}/langs/ka_GE/ldap.lang            |   0
 {htdocs => public}/langs/ka_GE/link.lang            |   0
 {htdocs => public}/langs/ka_GE/loan.lang            |   0
 {htdocs => public}/langs/ka_GE/mailmanspip.lang     |   0
 {htdocs => public}/langs/ka_GE/mails.lang           |   0
 {htdocs => public}/langs/ka_GE/main.lang            |   0
 {htdocs => public}/langs/ka_GE/margins.lang         |   0
 {htdocs => public}/langs/ka_GE/members.lang         |   0
 {htdocs => public}/langs/ka_GE/oauth.lang           |   0
 {htdocs => public}/langs/ka_GE/opensurvey.lang      |   0
 {htdocs => public}/langs/ka_GE/orders.lang          |   0
 {htdocs => public}/langs/ka_GE/other.lang           |   0
 {htdocs => public}/langs/ka_GE/paybox.lang          |   0
 {htdocs => public}/langs/ka_GE/paypal.lang          |   0
 {htdocs => public}/langs/ka_GE/printing.lang        |   0
 {htdocs => public}/langs/ka_GE/productbatch.lang    |   0
 {htdocs => public}/langs/ka_GE/products.lang        |   0
 {htdocs => public}/langs/ka_GE/projects.lang        |   0
 {htdocs => public}/langs/ka_GE/propal.lang          |   0
 {htdocs => public}/langs/ka_GE/receiptprinter.lang  |   0
 {htdocs => public}/langs/ka_GE/resource.lang        |   0
 {htdocs => public}/langs/ka_GE/salaries.lang        |   0
 {htdocs => public}/langs/ka_GE/sendings.lang        |   0
 {htdocs => public}/langs/ka_GE/sms.lang             |   0
 {htdocs => public}/langs/ka_GE/stocks.lang          |   0
 .../langs/ka_GE/supplier_proposal.lang              |   0
 {htdocs => public}/langs/ka_GE/suppliers.lang       |   0
 {htdocs => public}/langs/ka_GE/trips.lang           |   0
 {htdocs => public}/langs/ka_GE/users.lang           |   0
 {htdocs => public}/langs/ka_GE/website.lang         |   0
 {htdocs => public}/langs/ka_GE/withdrawals.lang     |   0
 {htdocs => public}/langs/ka_GE/workflow.lang        |   0
 {htdocs => public}/langs/km_KH/accountancy.lang     |   0
 {htdocs => public}/langs/km_KH/admin.lang           |   0
 {htdocs => public}/langs/km_KH/agenda.lang          |   0
 {htdocs => public}/langs/km_KH/banks.lang           |   0
 {htdocs => public}/langs/km_KH/bills.lang           |   0
 {htdocs => public}/langs/km_KH/bookmarks.lang       |   0
 {htdocs => public}/langs/km_KH/boxes.lang           |   0
 {htdocs => public}/langs/km_KH/cashdesk.lang        |   0
 {htdocs => public}/langs/km_KH/categories.lang      |   0
 {htdocs => public}/langs/km_KH/commercial.lang      |   0
 {htdocs => public}/langs/km_KH/companies.lang       |   0
 {htdocs => public}/langs/km_KH/compta.lang          |   0
 {htdocs => public}/langs/km_KH/contracts.lang       |   0
 {htdocs => public}/langs/km_KH/cron.lang            |   0
 {htdocs => public}/langs/km_KH/deliveries.lang      |   0
 {htdocs => public}/langs/km_KH/dict.lang            |   0
 {htdocs => public}/langs/km_KH/donations.lang       |   0
 {htdocs => public}/langs/km_KH/ecm.lang             |   0
 {htdocs => public}/langs/km_KH/errors.lang          |   0
 {htdocs => public}/langs/km_KH/exports.lang         |   0
 {htdocs => public}/langs/km_KH/externalsite.lang    |   0
 {htdocs => public}/langs/km_KH/ftp.lang             |   0
 {htdocs => public}/langs/km_KH/help.lang            |   0
 {htdocs => public}/langs/km_KH/holiday.lang         |   0
 {htdocs => public}/langs/km_KH/hrm.lang             |   0
 {htdocs => public}/langs/km_KH/incoterm.lang        |   0
 {htdocs => public}/langs/km_KH/install.lang         |   0
 {htdocs => public}/langs/km_KH/interventions.lang   |   0
 {htdocs => public}/langs/km_KH/languages.lang       |   0
 {htdocs => public}/langs/km_KH/ldap.lang            |   0
 {htdocs => public}/langs/km_KH/link.lang            |   0
 {htdocs => public}/langs/km_KH/loan.lang            |   0
 {htdocs => public}/langs/km_KH/mailmanspip.lang     |   0
 {htdocs => public}/langs/km_KH/mails.lang           |   0
 {htdocs => public}/langs/km_KH/main.lang            |   0
 {htdocs => public}/langs/km_KH/margins.lang         |   0
 {htdocs => public}/langs/km_KH/members.lang         |   0
 {htdocs => public}/langs/km_KH/oauth.lang           |   0
 {htdocs => public}/langs/km_KH/opensurvey.lang      |   0
 {htdocs => public}/langs/km_KH/orders.lang          |   0
 {htdocs => public}/langs/km_KH/other.lang           |   0
 {htdocs => public}/langs/km_KH/paybox.lang          |   0
 {htdocs => public}/langs/km_KH/paypal.lang          |   0
 {htdocs => public}/langs/km_KH/printing.lang        |   0
 {htdocs => public}/langs/km_KH/productbatch.lang    |   0
 {htdocs => public}/langs/km_KH/products.lang        |   0
 {htdocs => public}/langs/km_KH/projects.lang        |   0
 {htdocs => public}/langs/km_KH/propal.lang          |   0
 {htdocs => public}/langs/km_KH/receiptprinter.lang  |   0
 {htdocs => public}/langs/km_KH/resource.lang        |   0
 {htdocs => public}/langs/km_KH/salaries.lang        |   0
 {htdocs => public}/langs/km_KH/sendings.lang        |   0
 {htdocs => public}/langs/km_KH/sms.lang             |   0
 {htdocs => public}/langs/km_KH/stocks.lang          |   0
 .../langs/km_KH/supplier_proposal.lang              |   0
 {htdocs => public}/langs/km_KH/suppliers.lang       |   0
 {htdocs => public}/langs/km_KH/trips.lang           |   0
 {htdocs => public}/langs/km_KH/users.lang           |   0
 {htdocs => public}/langs/km_KH/website.lang         |   0
 {htdocs => public}/langs/km_KH/withdrawals.lang     |   0
 {htdocs => public}/langs/km_KH/workflow.lang        |   0
 {htdocs => public}/langs/kn_IN/accountancy.lang     |   0
 {htdocs => public}/langs/kn_IN/admin.lang           |   0
 {htdocs => public}/langs/kn_IN/agenda.lang          |   0
 {htdocs => public}/langs/kn_IN/banks.lang           |   0
 {htdocs => public}/langs/kn_IN/bills.lang           |   0
 {htdocs => public}/langs/kn_IN/bookmarks.lang       |   0
 {htdocs => public}/langs/kn_IN/boxes.lang           |   0
 {htdocs => public}/langs/kn_IN/cashdesk.lang        |   0
 {htdocs => public}/langs/kn_IN/categories.lang      |   0
 {htdocs => public}/langs/kn_IN/commercial.lang      |   0
 {htdocs => public}/langs/kn_IN/companies.lang       |   0
 {htdocs => public}/langs/kn_IN/compta.lang          |   0
 {htdocs => public}/langs/kn_IN/contracts.lang       |   0
 {htdocs => public}/langs/kn_IN/cron.lang            |   0
 {htdocs => public}/langs/kn_IN/deliveries.lang      |   0
 {htdocs => public}/langs/kn_IN/dict.lang            |   0
 {htdocs => public}/langs/kn_IN/donations.lang       |   0
 {htdocs => public}/langs/kn_IN/ecm.lang             |   0
 {htdocs => public}/langs/kn_IN/errors.lang          |   0
 {htdocs => public}/langs/kn_IN/exports.lang         |   0
 {htdocs => public}/langs/kn_IN/externalsite.lang    |   0
 {htdocs => public}/langs/kn_IN/ftp.lang             |   0
 {htdocs => public}/langs/kn_IN/help.lang            |   0
 {htdocs => public}/langs/kn_IN/holiday.lang         |   0
 {htdocs => public}/langs/kn_IN/hrm.lang             |   0
 {htdocs => public}/langs/kn_IN/incoterm.lang        |   0
 {htdocs => public}/langs/kn_IN/install.lang         |   0
 {htdocs => public}/langs/kn_IN/interventions.lang   |   0
 {htdocs => public}/langs/kn_IN/languages.lang       |   0
 {htdocs => public}/langs/kn_IN/ldap.lang            |   0
 {htdocs => public}/langs/kn_IN/link.lang            |   0
 {htdocs => public}/langs/kn_IN/loan.lang            |   0
 {htdocs => public}/langs/kn_IN/mailmanspip.lang     |   0
 {htdocs => public}/langs/kn_IN/mails.lang           |   0
 {htdocs => public}/langs/kn_IN/main.lang            |   0
 {htdocs => public}/langs/kn_IN/margins.lang         |   0
 {htdocs => public}/langs/kn_IN/members.lang         |   0
 {htdocs => public}/langs/kn_IN/oauth.lang           |   0
 {htdocs => public}/langs/kn_IN/opensurvey.lang      |   0
 {htdocs => public}/langs/kn_IN/orders.lang          |   0
 {htdocs => public}/langs/kn_IN/other.lang           |   0
 {htdocs => public}/langs/kn_IN/paybox.lang          |   0
 {htdocs => public}/langs/kn_IN/paypal.lang          |   0
 {htdocs => public}/langs/kn_IN/printing.lang        |   0
 {htdocs => public}/langs/kn_IN/productbatch.lang    |   0
 {htdocs => public}/langs/kn_IN/products.lang        |   0
 {htdocs => public}/langs/kn_IN/projects.lang        |   0
 {htdocs => public}/langs/kn_IN/propal.lang          |   0
 {htdocs => public}/langs/kn_IN/receiptprinter.lang  |   0
 {htdocs => public}/langs/kn_IN/resource.lang        |   0
 {htdocs => public}/langs/kn_IN/salaries.lang        |   0
 {htdocs => public}/langs/kn_IN/sendings.lang        |   0
 {htdocs => public}/langs/kn_IN/sms.lang             |   0
 {htdocs => public}/langs/kn_IN/stocks.lang          |   0
 .../langs/kn_IN/supplier_proposal.lang              |   0
 {htdocs => public}/langs/kn_IN/suppliers.lang       |   0
 {htdocs => public}/langs/kn_IN/trips.lang           |   0
 {htdocs => public}/langs/kn_IN/users.lang           |   0
 {htdocs => public}/langs/kn_IN/website.lang         |   0
 {htdocs => public}/langs/kn_IN/withdrawals.lang     |   0
 {htdocs => public}/langs/kn_IN/workflow.lang        |   0
 {htdocs => public}/langs/ko_KR/accountancy.lang     |   0
 {htdocs => public}/langs/ko_KR/admin.lang           |   0
 {htdocs => public}/langs/ko_KR/agenda.lang          |   0
 {htdocs => public}/langs/ko_KR/banks.lang           |   0
 {htdocs => public}/langs/ko_KR/bills.lang           |   0
 {htdocs => public}/langs/ko_KR/bookmarks.lang       |   0
 {htdocs => public}/langs/ko_KR/boxes.lang           |   0
 {htdocs => public}/langs/ko_KR/cashdesk.lang        |   0
 {htdocs => public}/langs/ko_KR/categories.lang      |   0
 {htdocs => public}/langs/ko_KR/commercial.lang      |   0
 {htdocs => public}/langs/ko_KR/companies.lang       |   0
 {htdocs => public}/langs/ko_KR/compta.lang          |   0
 {htdocs => public}/langs/ko_KR/contracts.lang       |   0
 {htdocs => public}/langs/ko_KR/cron.lang            |   0
 {htdocs => public}/langs/ko_KR/deliveries.lang      |   0
 {htdocs => public}/langs/ko_KR/dict.lang            |   0
 {htdocs => public}/langs/ko_KR/donations.lang       |   0
 {htdocs => public}/langs/ko_KR/ecm.lang             |   0
 {htdocs => public}/langs/ko_KR/errors.lang          |   0
 {htdocs => public}/langs/ko_KR/exports.lang         |   0
 {htdocs => public}/langs/ko_KR/externalsite.lang    |   0
 {htdocs => public}/langs/ko_KR/ftp.lang             |   0
 {htdocs => public}/langs/ko_KR/help.lang            |   0
 {htdocs => public}/langs/ko_KR/holiday.lang         |   0
 {htdocs => public}/langs/ko_KR/hrm.lang             |   0
 {htdocs => public}/langs/ko_KR/incoterm.lang        |   0
 {htdocs => public}/langs/ko_KR/install.lang         |   0
 {htdocs => public}/langs/ko_KR/interventions.lang   |   0
 {htdocs => public}/langs/ko_KR/languages.lang       |   0
 {htdocs => public}/langs/ko_KR/ldap.lang            |   0
 {htdocs => public}/langs/ko_KR/link.lang            |   0
 {htdocs => public}/langs/ko_KR/loan.lang            |   0
 {htdocs => public}/langs/ko_KR/mailmanspip.lang     |   0
 {htdocs => public}/langs/ko_KR/mails.lang           |   0
 {htdocs => public}/langs/ko_KR/main.lang            |   0
 {htdocs => public}/langs/ko_KR/margins.lang         |   0
 {htdocs => public}/langs/ko_KR/members.lang         |   0
 {htdocs => public}/langs/ko_KR/oauth.lang           |   0
 {htdocs => public}/langs/ko_KR/opensurvey.lang      |   0
 {htdocs => public}/langs/ko_KR/orders.lang          |   0
 {htdocs => public}/langs/ko_KR/other.lang           |   0
 {htdocs => public}/langs/ko_KR/paybox.lang          |   0
 {htdocs => public}/langs/ko_KR/paypal.lang          |   0
 {htdocs => public}/langs/ko_KR/printing.lang        |   0
 {htdocs => public}/langs/ko_KR/productbatch.lang    |   0
 {htdocs => public}/langs/ko_KR/products.lang        |   0
 {htdocs => public}/langs/ko_KR/projects.lang        |   0
 {htdocs => public}/langs/ko_KR/propal.lang          |   0
 {htdocs => public}/langs/ko_KR/receiptprinter.lang  |   0
 {htdocs => public}/langs/ko_KR/resource.lang        |   0
 {htdocs => public}/langs/ko_KR/salaries.lang        |   0
 {htdocs => public}/langs/ko_KR/sendings.lang        |   0
 {htdocs => public}/langs/ko_KR/sms.lang             |   0
 {htdocs => public}/langs/ko_KR/stocks.lang          |   0
 .../langs/ko_KR/supplier_proposal.lang              |   0
 {htdocs => public}/langs/ko_KR/suppliers.lang       |   0
 {htdocs => public}/langs/ko_KR/trips.lang           |   0
 {htdocs => public}/langs/ko_KR/users.lang           |   0
 {htdocs => public}/langs/ko_KR/website.lang         |   0
 {htdocs => public}/langs/ko_KR/withdrawals.lang     |   0
 {htdocs => public}/langs/ko_KR/workflow.lang        |   0
 {htdocs => public}/langs/lo_LA/accountancy.lang     |   0
 {htdocs => public}/langs/lo_LA/admin.lang           |   0
 {htdocs => public}/langs/lo_LA/agenda.lang          |   0
 {htdocs => public}/langs/lo_LA/banks.lang           |   0
 {htdocs => public}/langs/lo_LA/bills.lang           |   0
 {htdocs => public}/langs/lo_LA/bookmarks.lang       |   0
 {htdocs => public}/langs/lo_LA/boxes.lang           |   0
 {htdocs => public}/langs/lo_LA/cashdesk.lang        |   0
 {htdocs => public}/langs/lo_LA/categories.lang      |   0
 {htdocs => public}/langs/lo_LA/commercial.lang      |   0
 {htdocs => public}/langs/lo_LA/companies.lang       |   0
 {htdocs => public}/langs/lo_LA/compta.lang          |   0
 {htdocs => public}/langs/lo_LA/contracts.lang       |   0
 {htdocs => public}/langs/lo_LA/cron.lang            |   0
 {htdocs => public}/langs/lo_LA/deliveries.lang      |   0
 {htdocs => public}/langs/lo_LA/dict.lang            |   0
 {htdocs => public}/langs/lo_LA/donations.lang       |   0
 {htdocs => public}/langs/lo_LA/ecm.lang             |   0
 {htdocs => public}/langs/lo_LA/errors.lang          |   0
 {htdocs => public}/langs/lo_LA/exports.lang         |   0
 {htdocs => public}/langs/lo_LA/externalsite.lang    |   0
 {htdocs => public}/langs/lo_LA/ftp.lang             |   0
 {htdocs => public}/langs/lo_LA/help.lang            |   0
 {htdocs => public}/langs/lo_LA/holiday.lang         |   0
 {htdocs => public}/langs/lo_LA/hrm.lang             |   0
 {htdocs => public}/langs/lo_LA/incoterm.lang        |   0
 {htdocs => public}/langs/lo_LA/install.lang         |   0
 {htdocs => public}/langs/lo_LA/interventions.lang   |   0
 {htdocs => public}/langs/lo_LA/languages.lang       |   0
 {htdocs => public}/langs/lo_LA/ldap.lang            |   0
 {htdocs => public}/langs/lo_LA/link.lang            |   0
 {htdocs => public}/langs/lo_LA/loan.lang            |   0
 {htdocs => public}/langs/lo_LA/mailmanspip.lang     |   0
 {htdocs => public}/langs/lo_LA/mails.lang           |   0
 {htdocs => public}/langs/lo_LA/main.lang            |   0
 {htdocs => public}/langs/lo_LA/margins.lang         |   0
 {htdocs => public}/langs/lo_LA/members.lang         |   0
 {htdocs => public}/langs/lo_LA/oauth.lang           |   0
 {htdocs => public}/langs/lo_LA/opensurvey.lang      |   0
 {htdocs => public}/langs/lo_LA/orders.lang          |   0
 {htdocs => public}/langs/lo_LA/other.lang           |   0
 {htdocs => public}/langs/lo_LA/paybox.lang          |   0
 {htdocs => public}/langs/lo_LA/paypal.lang          |   0
 {htdocs => public}/langs/lo_LA/printing.lang        |   0
 {htdocs => public}/langs/lo_LA/productbatch.lang    |   0
 {htdocs => public}/langs/lo_LA/products.lang        |   0
 {htdocs => public}/langs/lo_LA/projects.lang        |   0
 {htdocs => public}/langs/lo_LA/propal.lang          |   0
 {htdocs => public}/langs/lo_LA/receiptprinter.lang  |   0
 {htdocs => public}/langs/lo_LA/resource.lang        |   0
 {htdocs => public}/langs/lo_LA/salaries.lang        |   0
 {htdocs => public}/langs/lo_LA/sendings.lang        |   0
 {htdocs => public}/langs/lo_LA/sms.lang             |   0
 {htdocs => public}/langs/lo_LA/stocks.lang          |   0
 .../langs/lo_LA/supplier_proposal.lang              |   0
 {htdocs => public}/langs/lo_LA/suppliers.lang       |   0
 {htdocs => public}/langs/lo_LA/trips.lang           |   0
 {htdocs => public}/langs/lo_LA/users.lang           |   0
 {htdocs => public}/langs/lo_LA/website.lang         |   0
 {htdocs => public}/langs/lo_LA/withdrawals.lang     |   0
 {htdocs => public}/langs/lo_LA/workflow.lang        |   0
 {htdocs => public}/langs/lt_LT/accountancy.lang     |   0
 {htdocs => public}/langs/lt_LT/admin.lang           |   0
 {htdocs => public}/langs/lt_LT/agenda.lang          |   0
 {htdocs => public}/langs/lt_LT/banks.lang           |   0
 {htdocs => public}/langs/lt_LT/bills.lang           |   0
 {htdocs => public}/langs/lt_LT/bookmarks.lang       |   0
 {htdocs => public}/langs/lt_LT/boxes.lang           |   0
 {htdocs => public}/langs/lt_LT/cashdesk.lang        |   0
 {htdocs => public}/langs/lt_LT/categories.lang      |   0
 {htdocs => public}/langs/lt_LT/commercial.lang      |   0
 {htdocs => public}/langs/lt_LT/companies.lang       |   0
 {htdocs => public}/langs/lt_LT/compta.lang          |   0
 {htdocs => public}/langs/lt_LT/contracts.lang       |   0
 {htdocs => public}/langs/lt_LT/cron.lang            |   0
 {htdocs => public}/langs/lt_LT/deliveries.lang      |   0
 {htdocs => public}/langs/lt_LT/dict.lang            |   0
 {htdocs => public}/langs/lt_LT/donations.lang       |   0
 {htdocs => public}/langs/lt_LT/ecm.lang             |   0
 {htdocs => public}/langs/lt_LT/errors.lang          |   0
 {htdocs => public}/langs/lt_LT/exports.lang         |   0
 {htdocs => public}/langs/lt_LT/externalsite.lang    |   0
 {htdocs => public}/langs/lt_LT/ftp.lang             |   0
 {htdocs => public}/langs/lt_LT/help.lang            |   0
 {htdocs => public}/langs/lt_LT/holiday.lang         |   0
 {htdocs => public}/langs/lt_LT/hrm.lang             |   0
 {htdocs => public}/langs/lt_LT/incoterm.lang        |   0
 {htdocs => public}/langs/lt_LT/install.lang         |   0
 {htdocs => public}/langs/lt_LT/interventions.lang   |   0
 {htdocs => public}/langs/lt_LT/languages.lang       |   0
 {htdocs => public}/langs/lt_LT/ldap.lang            |   0
 {htdocs => public}/langs/lt_LT/link.lang            |   0
 {htdocs => public}/langs/lt_LT/loan.lang            |   0
 {htdocs => public}/langs/lt_LT/mailmanspip.lang     |   0
 {htdocs => public}/langs/lt_LT/mails.lang           |   0
 {htdocs => public}/langs/lt_LT/main.lang            |   0
 {htdocs => public}/langs/lt_LT/margins.lang         |   0
 {htdocs => public}/langs/lt_LT/members.lang         |   0
 {htdocs => public}/langs/lt_LT/oauth.lang           |   0
 {htdocs => public}/langs/lt_LT/opensurvey.lang      |   0
 {htdocs => public}/langs/lt_LT/orders.lang          |   0
 {htdocs => public}/langs/lt_LT/other.lang           |   0
 {htdocs => public}/langs/lt_LT/paybox.lang          |   0
 {htdocs => public}/langs/lt_LT/paypal.lang          |   0
 {htdocs => public}/langs/lt_LT/printing.lang        |   0
 {htdocs => public}/langs/lt_LT/productbatch.lang    |   0
 {htdocs => public}/langs/lt_LT/products.lang        |   0
 {htdocs => public}/langs/lt_LT/projects.lang        |   0
 {htdocs => public}/langs/lt_LT/propal.lang          |   0
 {htdocs => public}/langs/lt_LT/receiptprinter.lang  |   0
 {htdocs => public}/langs/lt_LT/resource.lang        |   0
 {htdocs => public}/langs/lt_LT/salaries.lang        |   0
 {htdocs => public}/langs/lt_LT/sendings.lang        |   0
 {htdocs => public}/langs/lt_LT/sms.lang             |   0
 {htdocs => public}/langs/lt_LT/stocks.lang          |   0
 .../langs/lt_LT/supplier_proposal.lang              |   0
 {htdocs => public}/langs/lt_LT/suppliers.lang       |   0
 {htdocs => public}/langs/lt_LT/trips.lang           |   0
 {htdocs => public}/langs/lt_LT/users.lang           |   0
 {htdocs => public}/langs/lt_LT/website.lang         |   0
 {htdocs => public}/langs/lt_LT/withdrawals.lang     |   0
 {htdocs => public}/langs/lt_LT/workflow.lang        |   0
 {htdocs => public}/langs/lv_LV/accountancy.lang     |   0
 {htdocs => public}/langs/lv_LV/admin.lang           |   0
 {htdocs => public}/langs/lv_LV/agenda.lang          |   0
 {htdocs => public}/langs/lv_LV/banks.lang           |   0
 {htdocs => public}/langs/lv_LV/bills.lang           |   0
 {htdocs => public}/langs/lv_LV/bookmarks.lang       |   0
 {htdocs => public}/langs/lv_LV/boxes.lang           |   0
 {htdocs => public}/langs/lv_LV/cashdesk.lang        |   0
 {htdocs => public}/langs/lv_LV/categories.lang      |   0
 {htdocs => public}/langs/lv_LV/commercial.lang      |   0
 {htdocs => public}/langs/lv_LV/companies.lang       |   0
 {htdocs => public}/langs/lv_LV/compta.lang          |   0
 {htdocs => public}/langs/lv_LV/contracts.lang       |   0
 {htdocs => public}/langs/lv_LV/cron.lang            |   0
 {htdocs => public}/langs/lv_LV/deliveries.lang      |   0
 {htdocs => public}/langs/lv_LV/dict.lang            |   0
 {htdocs => public}/langs/lv_LV/donations.lang       |   0
 {htdocs => public}/langs/lv_LV/ecm.lang             |   0
 {htdocs => public}/langs/lv_LV/errors.lang          |   0
 {htdocs => public}/langs/lv_LV/exports.lang         |   0
 {htdocs => public}/langs/lv_LV/externalsite.lang    |   0
 {htdocs => public}/langs/lv_LV/ftp.lang             |   0
 {htdocs => public}/langs/lv_LV/help.lang            |   0
 {htdocs => public}/langs/lv_LV/holiday.lang         |   0
 {htdocs => public}/langs/lv_LV/hrm.lang             |   0
 {htdocs => public}/langs/lv_LV/incoterm.lang        |   0
 {htdocs => public}/langs/lv_LV/install.lang         |   0
 {htdocs => public}/langs/lv_LV/interventions.lang   |   0
 {htdocs => public}/langs/lv_LV/languages.lang       |   0
 {htdocs => public}/langs/lv_LV/ldap.lang            |   0
 {htdocs => public}/langs/lv_LV/link.lang            |   0
 {htdocs => public}/langs/lv_LV/loan.lang            |   0
 {htdocs => public}/langs/lv_LV/mailmanspip.lang     |   0
 {htdocs => public}/langs/lv_LV/mails.lang           |   0
 {htdocs => public}/langs/lv_LV/main.lang            |   0
 {htdocs => public}/langs/lv_LV/margins.lang         |   0
 {htdocs => public}/langs/lv_LV/members.lang         |   0
 {htdocs => public}/langs/lv_LV/oauth.lang           |   0
 {htdocs => public}/langs/lv_LV/opensurvey.lang      |   0
 {htdocs => public}/langs/lv_LV/orders.lang          |   0
 {htdocs => public}/langs/lv_LV/other.lang           |   0
 {htdocs => public}/langs/lv_LV/paybox.lang          |   0
 {htdocs => public}/langs/lv_LV/paypal.lang          |   0
 {htdocs => public}/langs/lv_LV/printing.lang        |   0
 {htdocs => public}/langs/lv_LV/productbatch.lang    |   0
 {htdocs => public}/langs/lv_LV/products.lang        |   0
 {htdocs => public}/langs/lv_LV/projects.lang        |   0
 {htdocs => public}/langs/lv_LV/propal.lang          |   0
 {htdocs => public}/langs/lv_LV/receiptprinter.lang  |   0
 {htdocs => public}/langs/lv_LV/resource.lang        |   0
 {htdocs => public}/langs/lv_LV/salaries.lang        |   0
 {htdocs => public}/langs/lv_LV/sendings.lang        |   0
 {htdocs => public}/langs/lv_LV/sms.lang             |   0
 {htdocs => public}/langs/lv_LV/stocks.lang          |   0
 .../langs/lv_LV/supplier_proposal.lang              |   0
 {htdocs => public}/langs/lv_LV/suppliers.lang       |   0
 {htdocs => public}/langs/lv_LV/trips.lang           |   0
 {htdocs => public}/langs/lv_LV/users.lang           |   0
 {htdocs => public}/langs/lv_LV/website.lang         |   0
 {htdocs => public}/langs/lv_LV/withdrawals.lang     |   0
 {htdocs => public}/langs/lv_LV/workflow.lang        |   0
 {htdocs => public}/langs/mk_MK/accountancy.lang     |   0
 {htdocs => public}/langs/mk_MK/admin.lang           |   0
 {htdocs => public}/langs/mk_MK/agenda.lang          |   0
 {htdocs => public}/langs/mk_MK/banks.lang           |   0
 {htdocs => public}/langs/mk_MK/bills.lang           |   0
 {htdocs => public}/langs/mk_MK/bookmarks.lang       |   0
 {htdocs => public}/langs/mk_MK/boxes.lang           |   0
 {htdocs => public}/langs/mk_MK/cashdesk.lang        |   0
 {htdocs => public}/langs/mk_MK/categories.lang      |   0
 {htdocs => public}/langs/mk_MK/commercial.lang      |   0
 {htdocs => public}/langs/mk_MK/companies.lang       |   0
 {htdocs => public}/langs/mk_MK/compta.lang          |   0
 {htdocs => public}/langs/mk_MK/contracts.lang       |   0
 {htdocs => public}/langs/mk_MK/cron.lang            |   0
 {htdocs => public}/langs/mk_MK/deliveries.lang      |   0
 {htdocs => public}/langs/mk_MK/dict.lang            |   0
 {htdocs => public}/langs/mk_MK/donations.lang       |   0
 {htdocs => public}/langs/mk_MK/ecm.lang             |   0
 {htdocs => public}/langs/mk_MK/errors.lang          |   0
 {htdocs => public}/langs/mk_MK/exports.lang         |   0
 {htdocs => public}/langs/mk_MK/externalsite.lang    |   0
 {htdocs => public}/langs/mk_MK/ftp.lang             |   0
 {htdocs => public}/langs/mk_MK/help.lang            |   0
 {htdocs => public}/langs/mk_MK/holiday.lang         |   0
 {htdocs => public}/langs/mk_MK/hrm.lang             |   0
 {htdocs => public}/langs/mk_MK/incoterm.lang        |   0
 {htdocs => public}/langs/mk_MK/install.lang         |   0
 {htdocs => public}/langs/mk_MK/interventions.lang   |   0
 {htdocs => public}/langs/mk_MK/languages.lang       |   0
 {htdocs => public}/langs/mk_MK/ldap.lang            |   0
 {htdocs => public}/langs/mk_MK/link.lang            |   0
 {htdocs => public}/langs/mk_MK/loan.lang            |   0
 {htdocs => public}/langs/mk_MK/mailmanspip.lang     |   0
 {htdocs => public}/langs/mk_MK/mails.lang           |   0
 {htdocs => public}/langs/mk_MK/main.lang            |   0
 {htdocs => public}/langs/mk_MK/margins.lang         |   0
 {htdocs => public}/langs/mk_MK/members.lang         |   0
 {htdocs => public}/langs/mk_MK/oauth.lang           |   0
 {htdocs => public}/langs/mk_MK/opensurvey.lang      |   0
 {htdocs => public}/langs/mk_MK/orders.lang          |   0
 {htdocs => public}/langs/mk_MK/other.lang           |   0
 {htdocs => public}/langs/mk_MK/paybox.lang          |   0
 {htdocs => public}/langs/mk_MK/paypal.lang          |   0
 {htdocs => public}/langs/mk_MK/printing.lang        |   0
 {htdocs => public}/langs/mk_MK/productbatch.lang    |   0
 {htdocs => public}/langs/mk_MK/products.lang        |   0
 {htdocs => public}/langs/mk_MK/projects.lang        |   0
 {htdocs => public}/langs/mk_MK/propal.lang          |   0
 {htdocs => public}/langs/mk_MK/receiptprinter.lang  |   0
 {htdocs => public}/langs/mk_MK/resource.lang        |   0
 {htdocs => public}/langs/mk_MK/salaries.lang        |   0
 {htdocs => public}/langs/mk_MK/sendings.lang        |   0
 {htdocs => public}/langs/mk_MK/sms.lang             |   0
 {htdocs => public}/langs/mk_MK/stocks.lang          |   0
 .../langs/mk_MK/supplier_proposal.lang              |   0
 {htdocs => public}/langs/mk_MK/suppliers.lang       |   0
 {htdocs => public}/langs/mk_MK/trips.lang           |   0
 {htdocs => public}/langs/mk_MK/users.lang           |   0
 {htdocs => public}/langs/mk_MK/website.lang         |   0
 {htdocs => public}/langs/mk_MK/withdrawals.lang     |   0
 {htdocs => public}/langs/mk_MK/workflow.lang        |   0
 {htdocs => public}/langs/mn_MN/accountancy.lang     |   0
 {htdocs => public}/langs/mn_MN/admin.lang           |   0
 {htdocs => public}/langs/mn_MN/agenda.lang          |   0
 {htdocs => public}/langs/mn_MN/banks.lang           |   0
 {htdocs => public}/langs/mn_MN/bills.lang           |   0
 {htdocs => public}/langs/mn_MN/bookmarks.lang       |   0
 {htdocs => public}/langs/mn_MN/boxes.lang           |   0
 {htdocs => public}/langs/mn_MN/cashdesk.lang        |   0
 {htdocs => public}/langs/mn_MN/categories.lang      |   0
 {htdocs => public}/langs/mn_MN/commercial.lang      |   0
 {htdocs => public}/langs/mn_MN/companies.lang       |   0
 {htdocs => public}/langs/mn_MN/compta.lang          |   0
 {htdocs => public}/langs/mn_MN/contracts.lang       |   0
 {htdocs => public}/langs/mn_MN/cron.lang            |   0
 {htdocs => public}/langs/mn_MN/deliveries.lang      |   0
 {htdocs => public}/langs/mn_MN/dict.lang            |   0
 {htdocs => public}/langs/mn_MN/donations.lang       |   0
 {htdocs => public}/langs/mn_MN/ecm.lang             |   0
 {htdocs => public}/langs/mn_MN/errors.lang          |   0
 {htdocs => public}/langs/mn_MN/exports.lang         |   0
 {htdocs => public}/langs/mn_MN/externalsite.lang    |   0
 {htdocs => public}/langs/mn_MN/ftp.lang             |   0
 {htdocs => public}/langs/mn_MN/help.lang            |   0
 {htdocs => public}/langs/mn_MN/holiday.lang         |   0
 {htdocs => public}/langs/mn_MN/hrm.lang             |   0
 {htdocs => public}/langs/mn_MN/incoterm.lang        |   0
 {htdocs => public}/langs/mn_MN/install.lang         |   0
 {htdocs => public}/langs/mn_MN/interventions.lang   |   0
 {htdocs => public}/langs/mn_MN/languages.lang       |   0
 {htdocs => public}/langs/mn_MN/ldap.lang            |   0
 {htdocs => public}/langs/mn_MN/link.lang            |   0
 {htdocs => public}/langs/mn_MN/loan.lang            |   0
 {htdocs => public}/langs/mn_MN/mailmanspip.lang     |   0
 {htdocs => public}/langs/mn_MN/mails.lang           |   0
 {htdocs => public}/langs/mn_MN/main.lang            |   0
 {htdocs => public}/langs/mn_MN/margins.lang         |   0
 {htdocs => public}/langs/mn_MN/members.lang         |   0
 {htdocs => public}/langs/mn_MN/oauth.lang           |   0
 {htdocs => public}/langs/mn_MN/opensurvey.lang      |   0
 {htdocs => public}/langs/mn_MN/orders.lang          |   0
 {htdocs => public}/langs/mn_MN/other.lang           |   0
 {htdocs => public}/langs/mn_MN/paybox.lang          |   0
 {htdocs => public}/langs/mn_MN/paypal.lang          |   0
 {htdocs => public}/langs/mn_MN/printing.lang        |   0
 {htdocs => public}/langs/mn_MN/productbatch.lang    |   0
 {htdocs => public}/langs/mn_MN/products.lang        |   0
 {htdocs => public}/langs/mn_MN/projects.lang        |   0
 {htdocs => public}/langs/mn_MN/propal.lang          |   0
 {htdocs => public}/langs/mn_MN/receiptprinter.lang  |   0
 {htdocs => public}/langs/mn_MN/resource.lang        |   0
 {htdocs => public}/langs/mn_MN/salaries.lang        |   0
 {htdocs => public}/langs/mn_MN/sendings.lang        |   0
 {htdocs => public}/langs/mn_MN/sms.lang             |   0
 {htdocs => public}/langs/mn_MN/stocks.lang          |   0
 .../langs/mn_MN/supplier_proposal.lang              |   0
 {htdocs => public}/langs/mn_MN/suppliers.lang       |   0
 {htdocs => public}/langs/mn_MN/trips.lang           |   0
 {htdocs => public}/langs/mn_MN/users.lang           |   0
 {htdocs => public}/langs/mn_MN/website.lang         |   0
 {htdocs => public}/langs/mn_MN/withdrawals.lang     |   0
 {htdocs => public}/langs/mn_MN/workflow.lang        |   0
 {htdocs => public}/langs/nb_NO/accountancy.lang     |   0
 {htdocs => public}/langs/nb_NO/admin.lang           |   0
 {htdocs => public}/langs/nb_NO/agenda.lang          |   0
 {htdocs => public}/langs/nb_NO/banks.lang           |   0
 {htdocs => public}/langs/nb_NO/bills.lang           |   0
 {htdocs => public}/langs/nb_NO/bookmarks.lang       |   0
 {htdocs => public}/langs/nb_NO/boxes.lang           |   0
 {htdocs => public}/langs/nb_NO/cashdesk.lang        |   0
 {htdocs => public}/langs/nb_NO/categories.lang      |   0
 {htdocs => public}/langs/nb_NO/commercial.lang      |   0
 {htdocs => public}/langs/nb_NO/companies.lang       |   0
 {htdocs => public}/langs/nb_NO/compta.lang          |   0
 {htdocs => public}/langs/nb_NO/contracts.lang       |   0
 {htdocs => public}/langs/nb_NO/cron.lang            |   0
 {htdocs => public}/langs/nb_NO/deliveries.lang      |   0
 {htdocs => public}/langs/nb_NO/dict.lang            |   0
 {htdocs => public}/langs/nb_NO/donations.lang       |   0
 {htdocs => public}/langs/nb_NO/ecm.lang             |   0
 {htdocs => public}/langs/nb_NO/errors.lang          |   0
 {htdocs => public}/langs/nb_NO/exports.lang         |   0
 {htdocs => public}/langs/nb_NO/externalsite.lang    |   0
 {htdocs => public}/langs/nb_NO/ftp.lang             |   0
 {htdocs => public}/langs/nb_NO/help.lang            |   0
 {htdocs => public}/langs/nb_NO/holiday.lang         |   0
 {htdocs => public}/langs/nb_NO/hrm.lang             |   0
 {htdocs => public}/langs/nb_NO/incoterm.lang        |   0
 {htdocs => public}/langs/nb_NO/install.lang         |   0
 {htdocs => public}/langs/nb_NO/interventions.lang   |   0
 {htdocs => public}/langs/nb_NO/languages.lang       |   0
 {htdocs => public}/langs/nb_NO/ldap.lang            |   0
 {htdocs => public}/langs/nb_NO/link.lang            |   0
 {htdocs => public}/langs/nb_NO/loan.lang            |   0
 {htdocs => public}/langs/nb_NO/mailmanspip.lang     |   0
 {htdocs => public}/langs/nb_NO/mails.lang           |   0
 {htdocs => public}/langs/nb_NO/main.lang            |   0
 {htdocs => public}/langs/nb_NO/margins.lang         |   0
 {htdocs => public}/langs/nb_NO/members.lang         |   0
 {htdocs => public}/langs/nb_NO/oauth.lang           |   0
 {htdocs => public}/langs/nb_NO/opensurvey.lang      |   0
 {htdocs => public}/langs/nb_NO/orders.lang          |   0
 {htdocs => public}/langs/nb_NO/other.lang           |   0
 {htdocs => public}/langs/nb_NO/paybox.lang          |   0
 {htdocs => public}/langs/nb_NO/paypal.lang          |   0
 {htdocs => public}/langs/nb_NO/printing.lang        |   0
 {htdocs => public}/langs/nb_NO/productbatch.lang    |   0
 {htdocs => public}/langs/nb_NO/products.lang        |   0
 {htdocs => public}/langs/nb_NO/projects.lang        |   0
 {htdocs => public}/langs/nb_NO/propal.lang          |   0
 {htdocs => public}/langs/nb_NO/receiptprinter.lang  |   0
 {htdocs => public}/langs/nb_NO/resource.lang        |   0
 {htdocs => public}/langs/nb_NO/salaries.lang        |   0
 {htdocs => public}/langs/nb_NO/sendings.lang        |   0
 {htdocs => public}/langs/nb_NO/sms.lang             |   0
 {htdocs => public}/langs/nb_NO/stocks.lang          |   0
 .../langs/nb_NO/supplier_proposal.lang              |   0
 {htdocs => public}/langs/nb_NO/suppliers.lang       |   0
 {htdocs => public}/langs/nb_NO/trips.lang           |   0
 {htdocs => public}/langs/nb_NO/users.lang           |   0
 {htdocs => public}/langs/nb_NO/website.lang         |   0
 {htdocs => public}/langs/nb_NO/withdrawals.lang     |   0
 {htdocs => public}/langs/nb_NO/workflow.lang        |   0
 {htdocs => public}/langs/nl_BE/accountancy.lang     |   0
 {htdocs => public}/langs/nl_BE/admin.lang           |   0
 {htdocs => public}/langs/nl_BE/agenda.lang          |   0
 {htdocs => public}/langs/nl_BE/banks.lang           |   0
 {htdocs => public}/langs/nl_BE/bills.lang           |   0
 {htdocs => public}/langs/nl_BE/bookmarks.lang       |   0
 {htdocs => public}/langs/nl_BE/boxes.lang           |   0
 {htdocs => public}/langs/nl_BE/cashdesk.lang        |   0
 {htdocs => public}/langs/nl_BE/categories.lang      |   0
 {htdocs => public}/langs/nl_BE/commercial.lang      |   0
 {htdocs => public}/langs/nl_BE/companies.lang       |   0
 {htdocs => public}/langs/nl_BE/compta.lang          |   0
 {htdocs => public}/langs/nl_BE/contracts.lang       |   0
 {htdocs => public}/langs/nl_BE/cron.lang            |   0
 {htdocs => public}/langs/nl_BE/deliveries.lang      |   0
 {htdocs => public}/langs/nl_BE/dict.lang            |   0
 {htdocs => public}/langs/nl_BE/donations.lang       |   0
 {htdocs => public}/langs/nl_BE/ecm.lang             |   0
 {htdocs => public}/langs/nl_BE/errors.lang          |   0
 {htdocs => public}/langs/nl_BE/exports.lang         |   0
 {htdocs => public}/langs/nl_BE/externalsite.lang    |   0
 {htdocs => public}/langs/nl_BE/ftp.lang             |   0
 {htdocs => public}/langs/nl_BE/help.lang            |   0
 {htdocs => public}/langs/nl_BE/holiday.lang         |   0
 {htdocs => public}/langs/nl_BE/hrm.lang             |   0
 {htdocs => public}/langs/nl_BE/incoterm.lang        |   0
 {htdocs => public}/langs/nl_BE/install.lang         |   0
 {htdocs => public}/langs/nl_BE/interventions.lang   |   0
 {htdocs => public}/langs/nl_BE/languages.lang       |   0
 {htdocs => public}/langs/nl_BE/ldap.lang            |   0
 {htdocs => public}/langs/nl_BE/link.lang            |   0
 {htdocs => public}/langs/nl_BE/loan.lang            |   0
 {htdocs => public}/langs/nl_BE/mailmanspip.lang     |   0
 {htdocs => public}/langs/nl_BE/mails.lang           |   0
 {htdocs => public}/langs/nl_BE/main.lang            |   0
 {htdocs => public}/langs/nl_BE/margins.lang         |   0
 {htdocs => public}/langs/nl_BE/members.lang         |   0
 {htdocs => public}/langs/nl_BE/oauth.lang           |   0
 {htdocs => public}/langs/nl_BE/opensurvey.lang      |   0
 {htdocs => public}/langs/nl_BE/orders.lang          |   0
 {htdocs => public}/langs/nl_BE/other.lang           |   0
 {htdocs => public}/langs/nl_BE/paybox.lang          |   0
 {htdocs => public}/langs/nl_BE/paypal.lang          |   0
 {htdocs => public}/langs/nl_BE/printing.lang        |   0
 {htdocs => public}/langs/nl_BE/productbatch.lang    |   0
 {htdocs => public}/langs/nl_BE/products.lang        |   0
 {htdocs => public}/langs/nl_BE/projects.lang        |   0
 {htdocs => public}/langs/nl_BE/propal.lang          |   0
 {htdocs => public}/langs/nl_BE/receiptprinter.lang  |   0
 {htdocs => public}/langs/nl_BE/resource.lang        |   0
 {htdocs => public}/langs/nl_BE/salaries.lang        |   0
 {htdocs => public}/langs/nl_BE/sendings.lang        |   0
 {htdocs => public}/langs/nl_BE/sms.lang             |   0
 {htdocs => public}/langs/nl_BE/stocks.lang          |   0
 .../langs/nl_BE/supplier_proposal.lang              |   0
 {htdocs => public}/langs/nl_BE/suppliers.lang       |   0
 {htdocs => public}/langs/nl_BE/trips.lang           |   0
 {htdocs => public}/langs/nl_BE/users.lang           |   0
 {htdocs => public}/langs/nl_BE/website.lang         |   0
 {htdocs => public}/langs/nl_BE/withdrawals.lang     |   0
 {htdocs => public}/langs/nl_BE/workflow.lang        |   0
 {htdocs => public}/langs/nl_NL/accountancy.lang     |   0
 {htdocs => public}/langs/nl_NL/admin.lang           |   0
 {htdocs => public}/langs/nl_NL/agenda.lang          |   0
 {htdocs => public}/langs/nl_NL/banks.lang           |   0
 {htdocs => public}/langs/nl_NL/bills.lang           |   0
 {htdocs => public}/langs/nl_NL/bookmarks.lang       |   0
 {htdocs => public}/langs/nl_NL/boxes.lang           |   0
 {htdocs => public}/langs/nl_NL/cashdesk.lang        |   0
 {htdocs => public}/langs/nl_NL/categories.lang      |   0
 {htdocs => public}/langs/nl_NL/commercial.lang      |   0
 {htdocs => public}/langs/nl_NL/companies.lang       |   0
 {htdocs => public}/langs/nl_NL/compta.lang          |   0
 {htdocs => public}/langs/nl_NL/contracts.lang       |   0
 {htdocs => public}/langs/nl_NL/cron.lang            |   0
 {htdocs => public}/langs/nl_NL/deliveries.lang      |   0
 {htdocs => public}/langs/nl_NL/dict.lang            |   0
 {htdocs => public}/langs/nl_NL/donations.lang       |   0
 {htdocs => public}/langs/nl_NL/ecm.lang             |   0
 {htdocs => public}/langs/nl_NL/errors.lang          |   0
 {htdocs => public}/langs/nl_NL/exports.lang         |   0
 {htdocs => public}/langs/nl_NL/externalsite.lang    |   0
 {htdocs => public}/langs/nl_NL/ftp.lang             |   0
 {htdocs => public}/langs/nl_NL/help.lang            |   0
 {htdocs => public}/langs/nl_NL/holiday.lang         |   0
 {htdocs => public}/langs/nl_NL/hrm.lang             |   0
 {htdocs => public}/langs/nl_NL/incoterm.lang        |   0
 {htdocs => public}/langs/nl_NL/install.lang         |   0
 {htdocs => public}/langs/nl_NL/interventions.lang   |   0
 {htdocs => public}/langs/nl_NL/languages.lang       |   0
 {htdocs => public}/langs/nl_NL/ldap.lang            |   0
 {htdocs => public}/langs/nl_NL/link.lang            |   0
 {htdocs => public}/langs/nl_NL/loan.lang            |   0
 {htdocs => public}/langs/nl_NL/mailmanspip.lang     |   0
 {htdocs => public}/langs/nl_NL/mails.lang           |   0
 {htdocs => public}/langs/nl_NL/main.lang            |   0
 {htdocs => public}/langs/nl_NL/margins.lang         |   0
 {htdocs => public}/langs/nl_NL/members.lang         |   0
 {htdocs => public}/langs/nl_NL/oauth.lang           |   0
 {htdocs => public}/langs/nl_NL/opensurvey.lang      |   0
 {htdocs => public}/langs/nl_NL/orders.lang          |   0
 {htdocs => public}/langs/nl_NL/other.lang           |   0
 {htdocs => public}/langs/nl_NL/paybox.lang          |   0
 {htdocs => public}/langs/nl_NL/paypal.lang          |   0
 {htdocs => public}/langs/nl_NL/printing.lang        |   0
 {htdocs => public}/langs/nl_NL/productbatch.lang    |   0
 {htdocs => public}/langs/nl_NL/products.lang        |   0
 {htdocs => public}/langs/nl_NL/projects.lang        |   0
 {htdocs => public}/langs/nl_NL/propal.lang          |   0
 {htdocs => public}/langs/nl_NL/receiptprinter.lang  |   0
 {htdocs => public}/langs/nl_NL/resource.lang        |   0
 {htdocs => public}/langs/nl_NL/salaries.lang        |   0
 {htdocs => public}/langs/nl_NL/sendings.lang        |   0
 {htdocs => public}/langs/nl_NL/sms.lang             |   0
 {htdocs => public}/langs/nl_NL/stocks.lang          |   0
 .../langs/nl_NL/supplier_proposal.lang              |   0
 {htdocs => public}/langs/nl_NL/suppliers.lang       |   0
 {htdocs => public}/langs/nl_NL/trips.lang           |   0
 {htdocs => public}/langs/nl_NL/users.lang           |   0
 {htdocs => public}/langs/nl_NL/website.lang         |   0
 {htdocs => public}/langs/nl_NL/withdrawals.lang     |   0
 {htdocs => public}/langs/nl_NL/workflow.lang        |   0
 {htdocs => public}/langs/pl_PL/accountancy.lang     |   0
 {htdocs => public}/langs/pl_PL/admin.lang           |   0
 {htdocs => public}/langs/pl_PL/agenda.lang          |   0
 {htdocs => public}/langs/pl_PL/banks.lang           |   0
 {htdocs => public}/langs/pl_PL/bills.lang           |   0
 {htdocs => public}/langs/pl_PL/bookmarks.lang       |   0
 {htdocs => public}/langs/pl_PL/boxes.lang           |   0
 {htdocs => public}/langs/pl_PL/cashdesk.lang        |   0
 {htdocs => public}/langs/pl_PL/categories.lang      |   0
 {htdocs => public}/langs/pl_PL/commercial.lang      |   0
 {htdocs => public}/langs/pl_PL/companies.lang       |   0
 {htdocs => public}/langs/pl_PL/compta.lang          |   0
 {htdocs => public}/langs/pl_PL/contracts.lang       |   0
 {htdocs => public}/langs/pl_PL/cron.lang            |   0
 {htdocs => public}/langs/pl_PL/deliveries.lang      |   0
 {htdocs => public}/langs/pl_PL/dict.lang            |   0
 {htdocs => public}/langs/pl_PL/donations.lang       |   0
 {htdocs => public}/langs/pl_PL/ecm.lang             |   0
 {htdocs => public}/langs/pl_PL/errors.lang          |   0
 {htdocs => public}/langs/pl_PL/exports.lang         |   0
 {htdocs => public}/langs/pl_PL/externalsite.lang    |   0
 {htdocs => public}/langs/pl_PL/ftp.lang             |   0
 {htdocs => public}/langs/pl_PL/help.lang            |   0
 {htdocs => public}/langs/pl_PL/holiday.lang         |   0
 {htdocs => public}/langs/pl_PL/hrm.lang             |   0
 {htdocs => public}/langs/pl_PL/incoterm.lang        |   0
 {htdocs => public}/langs/pl_PL/install.lang         |   0
 {htdocs => public}/langs/pl_PL/interventions.lang   |   0
 {htdocs => public}/langs/pl_PL/languages.lang       |   0
 {htdocs => public}/langs/pl_PL/ldap.lang            |   0
 {htdocs => public}/langs/pl_PL/link.lang            |   0
 {htdocs => public}/langs/pl_PL/loan.lang            |   0
 {htdocs => public}/langs/pl_PL/mailmanspip.lang     |   0
 {htdocs => public}/langs/pl_PL/mails.lang           |   0
 {htdocs => public}/langs/pl_PL/main.lang            |   0
 {htdocs => public}/langs/pl_PL/margins.lang         |   0
 {htdocs => public}/langs/pl_PL/members.lang         |   0
 {htdocs => public}/langs/pl_PL/oauth.lang           |   0
 {htdocs => public}/langs/pl_PL/opensurvey.lang      |   0
 {htdocs => public}/langs/pl_PL/orders.lang          |   0
 {htdocs => public}/langs/pl_PL/other.lang           |   0
 {htdocs => public}/langs/pl_PL/paybox.lang          |   0
 {htdocs => public}/langs/pl_PL/paypal.lang          |   0
 {htdocs => public}/langs/pl_PL/printing.lang        |   0
 {htdocs => public}/langs/pl_PL/productbatch.lang    |   0
 {htdocs => public}/langs/pl_PL/products.lang        |   0
 {htdocs => public}/langs/pl_PL/projects.lang        |   0
 {htdocs => public}/langs/pl_PL/propal.lang          |   0
 {htdocs => public}/langs/pl_PL/receiptprinter.lang  |   0
 {htdocs => public}/langs/pl_PL/resource.lang        |   0
 {htdocs => public}/langs/pl_PL/salaries.lang        |   0
 {htdocs => public}/langs/pl_PL/sendings.lang        |   0
 {htdocs => public}/langs/pl_PL/sms.lang             |   0
 {htdocs => public}/langs/pl_PL/stocks.lang          |   0
 .../langs/pl_PL/supplier_proposal.lang              |   0
 {htdocs => public}/langs/pl_PL/suppliers.lang       |   0
 {htdocs => public}/langs/pl_PL/trips.lang           |   0
 {htdocs => public}/langs/pl_PL/users.lang           |   0
 {htdocs => public}/langs/pl_PL/website.lang         |   0
 {htdocs => public}/langs/pl_PL/withdrawals.lang     |   0
 {htdocs => public}/langs/pl_PL/workflow.lang        |   0
 {htdocs => public}/langs/pt_BR/accountancy.lang     |   0
 {htdocs => public}/langs/pt_BR/admin.lang           |   0
 {htdocs => public}/langs/pt_BR/agenda.lang          |   0
 {htdocs => public}/langs/pt_BR/banks.lang           |   0
 {htdocs => public}/langs/pt_BR/bills.lang           |   0
 {htdocs => public}/langs/pt_BR/bookmarks.lang       |   0
 {htdocs => public}/langs/pt_BR/boxes.lang           |   0
 {htdocs => public}/langs/pt_BR/cashdesk.lang        |   0
 {htdocs => public}/langs/pt_BR/categories.lang      |   0
 {htdocs => public}/langs/pt_BR/commercial.lang      |   0
 {htdocs => public}/langs/pt_BR/companies.lang       |   0
 {htdocs => public}/langs/pt_BR/compta.lang          |   0
 {htdocs => public}/langs/pt_BR/contracts.lang       |   0
 {htdocs => public}/langs/pt_BR/cron.lang            |   0
 {htdocs => public}/langs/pt_BR/deliveries.lang      |   0
 {htdocs => public}/langs/pt_BR/dict.lang            |   0
 {htdocs => public}/langs/pt_BR/donations.lang       |   0
 {htdocs => public}/langs/pt_BR/ecm.lang             |   0
 {htdocs => public}/langs/pt_BR/errors.lang          |   0
 {htdocs => public}/langs/pt_BR/exports.lang         |   0
 {htdocs => public}/langs/pt_BR/externalsite.lang    |   0
 {htdocs => public}/langs/pt_BR/ftp.lang             |   0
 {htdocs => public}/langs/pt_BR/help.lang            |   0
 {htdocs => public}/langs/pt_BR/holiday.lang         |   0
 {htdocs => public}/langs/pt_BR/hrm.lang             |   0
 {htdocs => public}/langs/pt_BR/incoterm.lang        |   0
 {htdocs => public}/langs/pt_BR/install.lang         |   0
 {htdocs => public}/langs/pt_BR/interventions.lang   |   0
 {htdocs => public}/langs/pt_BR/languages.lang       |   0
 {htdocs => public}/langs/pt_BR/ldap.lang            |   0
 {htdocs => public}/langs/pt_BR/link.lang            |   0
 {htdocs => public}/langs/pt_BR/loan.lang            |   0
 {htdocs => public}/langs/pt_BR/mailmanspip.lang     |   0
 {htdocs => public}/langs/pt_BR/mails.lang           |   0
 {htdocs => public}/langs/pt_BR/main.lang            |   0
 {htdocs => public}/langs/pt_BR/margins.lang         |   0
 {htdocs => public}/langs/pt_BR/members.lang         |   0
 {htdocs => public}/langs/pt_BR/oauth.lang           |   0
 {htdocs => public}/langs/pt_BR/opensurvey.lang      |   0
 {htdocs => public}/langs/pt_BR/orders.lang          |   0
 {htdocs => public}/langs/pt_BR/other.lang           |   0
 {htdocs => public}/langs/pt_BR/paybox.lang          |   0
 {htdocs => public}/langs/pt_BR/paypal.lang          |   0
 {htdocs => public}/langs/pt_BR/printing.lang        |   0
 {htdocs => public}/langs/pt_BR/productbatch.lang    |   0
 {htdocs => public}/langs/pt_BR/products.lang        |   0
 {htdocs => public}/langs/pt_BR/projects.lang        |   0
 {htdocs => public}/langs/pt_BR/propal.lang          |   0
 {htdocs => public}/langs/pt_BR/receiptprinter.lang  |   0
 {htdocs => public}/langs/pt_BR/resource.lang        |   0
 {htdocs => public}/langs/pt_BR/salaries.lang        |   0
 {htdocs => public}/langs/pt_BR/sendings.lang        |   0
 {htdocs => public}/langs/pt_BR/sms.lang             |   0
 {htdocs => public}/langs/pt_BR/stocks.lang          |   0
 .../langs/pt_BR/supplier_proposal.lang              |   0
 {htdocs => public}/langs/pt_BR/suppliers.lang       |   0
 {htdocs => public}/langs/pt_BR/trips.lang           |   0
 {htdocs => public}/langs/pt_BR/users.lang           |   0
 {htdocs => public}/langs/pt_BR/website.lang         |   0
 {htdocs => public}/langs/pt_BR/withdrawals.lang     |   0
 {htdocs => public}/langs/pt_BR/workflow.lang        |   0
 {htdocs => public}/langs/pt_PT/accountancy.lang     |   0
 {htdocs => public}/langs/pt_PT/admin.lang           |   0
 {htdocs => public}/langs/pt_PT/agenda.lang          |   0
 {htdocs => public}/langs/pt_PT/banks.lang           |   0
 {htdocs => public}/langs/pt_PT/bills.lang           |   0
 {htdocs => public}/langs/pt_PT/bookmarks.lang       |   0
 {htdocs => public}/langs/pt_PT/boxes.lang           |   0
 {htdocs => public}/langs/pt_PT/cashdesk.lang        |   0
 {htdocs => public}/langs/pt_PT/categories.lang      |   0
 {htdocs => public}/langs/pt_PT/commercial.lang      |   0
 {htdocs => public}/langs/pt_PT/companies.lang       |   0
 {htdocs => public}/langs/pt_PT/compta.lang          |   0
 {htdocs => public}/langs/pt_PT/contracts.lang       |   0
 {htdocs => public}/langs/pt_PT/cron.lang            |   0
 {htdocs => public}/langs/pt_PT/deliveries.lang      |   0
 {htdocs => public}/langs/pt_PT/dict.lang            |   0
 {htdocs => public}/langs/pt_PT/donations.lang       |   0
 {htdocs => public}/langs/pt_PT/ecm.lang             |   0
 {htdocs => public}/langs/pt_PT/errors.lang          |   0
 {htdocs => public}/langs/pt_PT/exports.lang         |   0
 {htdocs => public}/langs/pt_PT/externalsite.lang    |   0
 {htdocs => public}/langs/pt_PT/ftp.lang             |   0
 {htdocs => public}/langs/pt_PT/help.lang            |   0
 {htdocs => public}/langs/pt_PT/holiday.lang         |   0
 {htdocs => public}/langs/pt_PT/hrm.lang             |   0
 {htdocs => public}/langs/pt_PT/incoterm.lang        |   0
 {htdocs => public}/langs/pt_PT/install.lang         |   0
 {htdocs => public}/langs/pt_PT/interventions.lang   |   0
 {htdocs => public}/langs/pt_PT/languages.lang       |   0
 {htdocs => public}/langs/pt_PT/ldap.lang            |   0
 {htdocs => public}/langs/pt_PT/link.lang            |   0
 {htdocs => public}/langs/pt_PT/loan.lang            |   0
 {htdocs => public}/langs/pt_PT/mailmanspip.lang     |   0
 {htdocs => public}/langs/pt_PT/mails.lang           |   0
 {htdocs => public}/langs/pt_PT/main.lang            |   0
 {htdocs => public}/langs/pt_PT/margins.lang         |   0
 {htdocs => public}/langs/pt_PT/members.lang         |   0
 {htdocs => public}/langs/pt_PT/oauth.lang           |   0
 {htdocs => public}/langs/pt_PT/opensurvey.lang      |   0
 {htdocs => public}/langs/pt_PT/orders.lang          |   0
 {htdocs => public}/langs/pt_PT/other.lang           |   0
 {htdocs => public}/langs/pt_PT/paybox.lang          |   0
 {htdocs => public}/langs/pt_PT/paypal.lang          |   0
 {htdocs => public}/langs/pt_PT/printing.lang        |   0
 {htdocs => public}/langs/pt_PT/productbatch.lang    |   0
 {htdocs => public}/langs/pt_PT/products.lang        |   0
 {htdocs => public}/langs/pt_PT/projects.lang        |   0
 {htdocs => public}/langs/pt_PT/propal.lang          |   0
 {htdocs => public}/langs/pt_PT/receiptprinter.lang  |   0
 {htdocs => public}/langs/pt_PT/resource.lang        |   0
 {htdocs => public}/langs/pt_PT/salaries.lang        |   0
 {htdocs => public}/langs/pt_PT/sendings.lang        |   0
 {htdocs => public}/langs/pt_PT/sms.lang             |   0
 {htdocs => public}/langs/pt_PT/stocks.lang          |   0
 .../langs/pt_PT/supplier_proposal.lang              |   0
 {htdocs => public}/langs/pt_PT/suppliers.lang       |   0
 {htdocs => public}/langs/pt_PT/trips.lang           |   0
 {htdocs => public}/langs/pt_PT/users.lang           |   0
 {htdocs => public}/langs/pt_PT/website.lang         |   0
 {htdocs => public}/langs/pt_PT/withdrawals.lang     |   0
 {htdocs => public}/langs/pt_PT/workflow.lang        |   0
 {htdocs => public}/langs/ro_RO/accountancy.lang     |   0
 {htdocs => public}/langs/ro_RO/admin.lang           |   0
 {htdocs => public}/langs/ro_RO/agenda.lang          |   0
 {htdocs => public}/langs/ro_RO/banks.lang           |   0
 {htdocs => public}/langs/ro_RO/bills.lang           |   0
 {htdocs => public}/langs/ro_RO/bookmarks.lang       |   0
 {htdocs => public}/langs/ro_RO/boxes.lang           |   0
 {htdocs => public}/langs/ro_RO/cashdesk.lang        |   0
 {htdocs => public}/langs/ro_RO/categories.lang      |   0
 {htdocs => public}/langs/ro_RO/commercial.lang      |   0
 {htdocs => public}/langs/ro_RO/companies.lang       |   0
 {htdocs => public}/langs/ro_RO/compta.lang          |   0
 {htdocs => public}/langs/ro_RO/contracts.lang       |   0
 {htdocs => public}/langs/ro_RO/cron.lang            |   0
 {htdocs => public}/langs/ro_RO/deliveries.lang      |   0
 {htdocs => public}/langs/ro_RO/dict.lang            |   0
 {htdocs => public}/langs/ro_RO/donations.lang       |   0
 {htdocs => public}/langs/ro_RO/ecm.lang             |   0
 {htdocs => public}/langs/ro_RO/errors.lang          |   0
 {htdocs => public}/langs/ro_RO/exports.lang         |   0
 {htdocs => public}/langs/ro_RO/externalsite.lang    |   0
 {htdocs => public}/langs/ro_RO/ftp.lang             |   0
 {htdocs => public}/langs/ro_RO/help.lang            |   0
 {htdocs => public}/langs/ro_RO/holiday.lang         |   0
 {htdocs => public}/langs/ro_RO/hrm.lang             |   0
 {htdocs => public}/langs/ro_RO/incoterm.lang        |   0
 {htdocs => public}/langs/ro_RO/install.lang         |   0
 {htdocs => public}/langs/ro_RO/interventions.lang   |   0
 {htdocs => public}/langs/ro_RO/languages.lang       |   0
 {htdocs => public}/langs/ro_RO/ldap.lang            |   0
 {htdocs => public}/langs/ro_RO/link.lang            |   0
 {htdocs => public}/langs/ro_RO/loan.lang            |   0
 {htdocs => public}/langs/ro_RO/mailmanspip.lang     |   0
 {htdocs => public}/langs/ro_RO/mails.lang           |   0
 {htdocs => public}/langs/ro_RO/main.lang            |   0
 {htdocs => public}/langs/ro_RO/margins.lang         |   0
 {htdocs => public}/langs/ro_RO/members.lang         |   0
 {htdocs => public}/langs/ro_RO/oauth.lang           |   0
 {htdocs => public}/langs/ro_RO/opensurvey.lang      |   0
 {htdocs => public}/langs/ro_RO/orders.lang          |   0
 {htdocs => public}/langs/ro_RO/other.lang           |   0
 {htdocs => public}/langs/ro_RO/paybox.lang          |   0
 {htdocs => public}/langs/ro_RO/paypal.lang          |   0
 {htdocs => public}/langs/ro_RO/printing.lang        |   0
 {htdocs => public}/langs/ro_RO/productbatch.lang    |   0
 {htdocs => public}/langs/ro_RO/products.lang        |   0
 {htdocs => public}/langs/ro_RO/projects.lang        |   0
 {htdocs => public}/langs/ro_RO/propal.lang          |   0
 {htdocs => public}/langs/ro_RO/receiptprinter.lang  |   0
 {htdocs => public}/langs/ro_RO/resource.lang        |   0
 {htdocs => public}/langs/ro_RO/salaries.lang        |   0
 {htdocs => public}/langs/ro_RO/sendings.lang        |   0
 {htdocs => public}/langs/ro_RO/sms.lang             |   0
 {htdocs => public}/langs/ro_RO/stocks.lang          |   0
 .../langs/ro_RO/supplier_proposal.lang              |   0
 {htdocs => public}/langs/ro_RO/suppliers.lang       |   0
 {htdocs => public}/langs/ro_RO/trips.lang           |   0
 {htdocs => public}/langs/ro_RO/users.lang           |   0
 {htdocs => public}/langs/ro_RO/website.lang         |   0
 {htdocs => public}/langs/ro_RO/withdrawals.lang     |   0
 {htdocs => public}/langs/ro_RO/workflow.lang        |   0
 {htdocs => public}/langs/ru_RU/accountancy.lang     |   0
 {htdocs => public}/langs/ru_RU/admin.lang           |   0
 {htdocs => public}/langs/ru_RU/agenda.lang          |   0
 {htdocs => public}/langs/ru_RU/banks.lang           |   0
 {htdocs => public}/langs/ru_RU/bills.lang           |   0
 {htdocs => public}/langs/ru_RU/bookmarks.lang       |   0
 {htdocs => public}/langs/ru_RU/boxes.lang           |   0
 {htdocs => public}/langs/ru_RU/cashdesk.lang        |   0
 {htdocs => public}/langs/ru_RU/categories.lang      |   0
 {htdocs => public}/langs/ru_RU/commercial.lang      |   0
 {htdocs => public}/langs/ru_RU/companies.lang       |   0
 {htdocs => public}/langs/ru_RU/compta.lang          |   0
 {htdocs => public}/langs/ru_RU/contracts.lang       |   0
 {htdocs => public}/langs/ru_RU/cron.lang            |   0
 {htdocs => public}/langs/ru_RU/deliveries.lang      |   0
 {htdocs => public}/langs/ru_RU/dict.lang            |   0
 {htdocs => public}/langs/ru_RU/donations.lang       |   0
 {htdocs => public}/langs/ru_RU/ecm.lang             |   0
 {htdocs => public}/langs/ru_RU/errors.lang          |   0
 {htdocs => public}/langs/ru_RU/exports.lang         |   0
 {htdocs => public}/langs/ru_RU/externalsite.lang    |   0
 {htdocs => public}/langs/ru_RU/ftp.lang             |   0
 {htdocs => public}/langs/ru_RU/help.lang            |   0
 {htdocs => public}/langs/ru_RU/holiday.lang         |   0
 {htdocs => public}/langs/ru_RU/hrm.lang             |   0
 {htdocs => public}/langs/ru_RU/incoterm.lang        |   0
 {htdocs => public}/langs/ru_RU/install.lang         |   0
 {htdocs => public}/langs/ru_RU/interventions.lang   |   0
 {htdocs => public}/langs/ru_RU/languages.lang       |   0
 {htdocs => public}/langs/ru_RU/ldap.lang            |   0
 {htdocs => public}/langs/ru_RU/link.lang            |   0
 {htdocs => public}/langs/ru_RU/loan.lang            |   0
 {htdocs => public}/langs/ru_RU/mailmanspip.lang     |   0
 {htdocs => public}/langs/ru_RU/mails.lang           |   0
 {htdocs => public}/langs/ru_RU/main.lang            |   0
 {htdocs => public}/langs/ru_RU/margins.lang         |   0
 {htdocs => public}/langs/ru_RU/members.lang         |   0
 {htdocs => public}/langs/ru_RU/oauth.lang           |   0
 {htdocs => public}/langs/ru_RU/opensurvey.lang      |   0
 {htdocs => public}/langs/ru_RU/orders.lang          |   0
 {htdocs => public}/langs/ru_RU/other.lang           |   0
 {htdocs => public}/langs/ru_RU/paybox.lang          |   0
 {htdocs => public}/langs/ru_RU/paypal.lang          |   0
 {htdocs => public}/langs/ru_RU/printing.lang        |   0
 {htdocs => public}/langs/ru_RU/productbatch.lang    |   0
 {htdocs => public}/langs/ru_RU/products.lang        |   0
 {htdocs => public}/langs/ru_RU/projects.lang        |   0
 {htdocs => public}/langs/ru_RU/propal.lang          |   0
 {htdocs => public}/langs/ru_RU/receiptprinter.lang  |   0
 {htdocs => public}/langs/ru_RU/resource.lang        |   0
 {htdocs => public}/langs/ru_RU/salaries.lang        |   0
 {htdocs => public}/langs/ru_RU/sendings.lang        |   0
 {htdocs => public}/langs/ru_RU/sms.lang             |   0
 {htdocs => public}/langs/ru_RU/stocks.lang          |   0
 .../langs/ru_RU/supplier_proposal.lang              |   0
 {htdocs => public}/langs/ru_RU/suppliers.lang       |   0
 {htdocs => public}/langs/ru_RU/trips.lang           |   0
 {htdocs => public}/langs/ru_RU/users.lang           |   0
 {htdocs => public}/langs/ru_RU/website.lang         |   0
 {htdocs => public}/langs/ru_RU/withdrawals.lang     |   0
 {htdocs => public}/langs/ru_RU/workflow.lang        |   0
 {htdocs => public}/langs/ru_UA/banks.lang           |   0
 {htdocs => public}/langs/ru_UA/bookmarks.lang       |   0
 {htdocs => public}/langs/ru_UA/compta.lang          |   0
 {htdocs => public}/langs/ru_UA/contracts.lang       |   0
 {htdocs => public}/langs/ru_UA/dict.lang            |   0
 {htdocs => public}/langs/ru_UA/ecm.lang             |   0
 {htdocs => public}/langs/ru_UA/errors.lang          |   0
 {htdocs => public}/langs/ru_UA/ftp.lang             |   0
 {htdocs => public}/langs/ru_UA/install.lang         |   0
 {htdocs => public}/langs/ru_UA/interventions.lang   |   0
 {htdocs => public}/langs/ru_UA/mails.lang           |   0
 {htdocs => public}/langs/ru_UA/main.lang            |   0
 {htdocs => public}/langs/ru_UA/other.lang           |   0
 {htdocs => public}/langs/ru_UA/paybox.lang          |   0
 {htdocs => public}/langs/ru_UA/paypal.lang          |   0
 {htdocs => public}/langs/sk_SK/accountancy.lang     |   0
 {htdocs => public}/langs/sk_SK/admin.lang           |   0
 {htdocs => public}/langs/sk_SK/agenda.lang          |   0
 {htdocs => public}/langs/sk_SK/banks.lang           |   0
 {htdocs => public}/langs/sk_SK/bills.lang           |   0
 {htdocs => public}/langs/sk_SK/bookmarks.lang       |   0
 {htdocs => public}/langs/sk_SK/boxes.lang           |   0
 {htdocs => public}/langs/sk_SK/cashdesk.lang        |   0
 {htdocs => public}/langs/sk_SK/categories.lang      |   0
 {htdocs => public}/langs/sk_SK/commercial.lang      |   0
 {htdocs => public}/langs/sk_SK/companies.lang       |   0
 {htdocs => public}/langs/sk_SK/compta.lang          |   0
 {htdocs => public}/langs/sk_SK/contracts.lang       |   0
 {htdocs => public}/langs/sk_SK/cron.lang            |   0
 {htdocs => public}/langs/sk_SK/deliveries.lang      |   0
 {htdocs => public}/langs/sk_SK/dict.lang            |   0
 {htdocs => public}/langs/sk_SK/donations.lang       |   0
 {htdocs => public}/langs/sk_SK/ecm.lang             |   0
 {htdocs => public}/langs/sk_SK/errors.lang          |   0
 {htdocs => public}/langs/sk_SK/exports.lang         |   0
 {htdocs => public}/langs/sk_SK/externalsite.lang    |   0
 {htdocs => public}/langs/sk_SK/ftp.lang             |   0
 {htdocs => public}/langs/sk_SK/help.lang            |   0
 {htdocs => public}/langs/sk_SK/holiday.lang         |   0
 {htdocs => public}/langs/sk_SK/hrm.lang             |   0
 {htdocs => public}/langs/sk_SK/incoterm.lang        |   0
 {htdocs => public}/langs/sk_SK/install.lang         |   0
 {htdocs => public}/langs/sk_SK/interventions.lang   |   0
 {htdocs => public}/langs/sk_SK/languages.lang       |   0
 {htdocs => public}/langs/sk_SK/ldap.lang            |   0
 {htdocs => public}/langs/sk_SK/link.lang            |   0
 {htdocs => public}/langs/sk_SK/loan.lang            |   0
 {htdocs => public}/langs/sk_SK/mailmanspip.lang     |   0
 {htdocs => public}/langs/sk_SK/mails.lang           |   0
 {htdocs => public}/langs/sk_SK/main.lang            |   0
 {htdocs => public}/langs/sk_SK/margins.lang         |   0
 {htdocs => public}/langs/sk_SK/members.lang         |   0
 {htdocs => public}/langs/sk_SK/oauth.lang           |   0
 {htdocs => public}/langs/sk_SK/opensurvey.lang      |   0
 {htdocs => public}/langs/sk_SK/orders.lang          |   0
 {htdocs => public}/langs/sk_SK/other.lang           |   0
 {htdocs => public}/langs/sk_SK/paybox.lang          |   0
 {htdocs => public}/langs/sk_SK/paypal.lang          |   0
 {htdocs => public}/langs/sk_SK/printing.lang        |   0
 {htdocs => public}/langs/sk_SK/productbatch.lang    |   0
 {htdocs => public}/langs/sk_SK/products.lang        |   0
 {htdocs => public}/langs/sk_SK/projects.lang        |   0
 {htdocs => public}/langs/sk_SK/propal.lang          |   0
 {htdocs => public}/langs/sk_SK/receiptprinter.lang  |   0
 {htdocs => public}/langs/sk_SK/resource.lang        |   0
 {htdocs => public}/langs/sk_SK/salaries.lang        |   0
 {htdocs => public}/langs/sk_SK/sendings.lang        |   0
 {htdocs => public}/langs/sk_SK/sms.lang             |   0
 {htdocs => public}/langs/sk_SK/stocks.lang          |   0
 .../langs/sk_SK/supplier_proposal.lang              |   0
 {htdocs => public}/langs/sk_SK/suppliers.lang       |   0
 {htdocs => public}/langs/sk_SK/trips.lang           |   0
 {htdocs => public}/langs/sk_SK/users.lang           |   0
 {htdocs => public}/langs/sk_SK/website.lang         |   0
 {htdocs => public}/langs/sk_SK/withdrawals.lang     |   0
 {htdocs => public}/langs/sk_SK/workflow.lang        |   0
 {htdocs => public}/langs/sl_SI/accountancy.lang     |   0
 {htdocs => public}/langs/sl_SI/admin.lang           |   0
 {htdocs => public}/langs/sl_SI/agenda.lang          |   0
 {htdocs => public}/langs/sl_SI/banks.lang           |   0
 {htdocs => public}/langs/sl_SI/bills.lang           |   0
 {htdocs => public}/langs/sl_SI/bookmarks.lang       |   0
 {htdocs => public}/langs/sl_SI/boxes.lang           |   0
 {htdocs => public}/langs/sl_SI/cashdesk.lang        |   0
 {htdocs => public}/langs/sl_SI/categories.lang      |   0
 {htdocs => public}/langs/sl_SI/commercial.lang      |   0
 {htdocs => public}/langs/sl_SI/companies.lang       |   0
 {htdocs => public}/langs/sl_SI/compta.lang          |   0
 {htdocs => public}/langs/sl_SI/contracts.lang       |   0
 {htdocs => public}/langs/sl_SI/cron.lang            |   0
 {htdocs => public}/langs/sl_SI/deliveries.lang      |   0
 {htdocs => public}/langs/sl_SI/dict.lang            |   0
 {htdocs => public}/langs/sl_SI/donations.lang       |   0
 {htdocs => public}/langs/sl_SI/ecm.lang             |   0
 {htdocs => public}/langs/sl_SI/errors.lang          |   0
 {htdocs => public}/langs/sl_SI/exports.lang         |   0
 {htdocs => public}/langs/sl_SI/externalsite.lang    |   0
 {htdocs => public}/langs/sl_SI/ftp.lang             |   0
 {htdocs => public}/langs/sl_SI/help.lang            |   0
 {htdocs => public}/langs/sl_SI/holiday.lang         |   0
 {htdocs => public}/langs/sl_SI/hrm.lang             |   0
 {htdocs => public}/langs/sl_SI/incoterm.lang        |   0
 {htdocs => public}/langs/sl_SI/install.lang         |   0
 {htdocs => public}/langs/sl_SI/interventions.lang   |   0
 {htdocs => public}/langs/sl_SI/languages.lang       |   0
 {htdocs => public}/langs/sl_SI/ldap.lang            |   0
 {htdocs => public}/langs/sl_SI/link.lang            |   0
 {htdocs => public}/langs/sl_SI/loan.lang            |   0
 {htdocs => public}/langs/sl_SI/mailmanspip.lang     |   0
 {htdocs => public}/langs/sl_SI/mails.lang           |   0
 {htdocs => public}/langs/sl_SI/main.lang            |   0
 {htdocs => public}/langs/sl_SI/margins.lang         |   0
 {htdocs => public}/langs/sl_SI/members.lang         |   0
 {htdocs => public}/langs/sl_SI/oauth.lang           |   0
 {htdocs => public}/langs/sl_SI/opensurvey.lang      |   0
 {htdocs => public}/langs/sl_SI/orders.lang          |   0
 {htdocs => public}/langs/sl_SI/other.lang           |   0
 {htdocs => public}/langs/sl_SI/paybox.lang          |   0
 {htdocs => public}/langs/sl_SI/paypal.lang          |   0
 {htdocs => public}/langs/sl_SI/printing.lang        |   0
 {htdocs => public}/langs/sl_SI/productbatch.lang    |   0
 {htdocs => public}/langs/sl_SI/products.lang        |   0
 {htdocs => public}/langs/sl_SI/projects.lang        |   0
 {htdocs => public}/langs/sl_SI/propal.lang          |   0
 {htdocs => public}/langs/sl_SI/receiptprinter.lang  |   0
 {htdocs => public}/langs/sl_SI/resource.lang        |   0
 {htdocs => public}/langs/sl_SI/salaries.lang        |   0
 {htdocs => public}/langs/sl_SI/sendings.lang        |   0
 {htdocs => public}/langs/sl_SI/sms.lang             |   0
 {htdocs => public}/langs/sl_SI/stocks.lang          |   0
 .../langs/sl_SI/supplier_proposal.lang              |   0
 {htdocs => public}/langs/sl_SI/suppliers.lang       |   0
 {htdocs => public}/langs/sl_SI/trips.lang           |   0
 {htdocs => public}/langs/sl_SI/users.lang           |   0
 {htdocs => public}/langs/sl_SI/website.lang         |   0
 {htdocs => public}/langs/sl_SI/withdrawals.lang     |   0
 {htdocs => public}/langs/sl_SI/workflow.lang        |   0
 {htdocs => public}/langs/sq_AL/accountancy.lang     |   0
 {htdocs => public}/langs/sq_AL/admin.lang           |   0
 {htdocs => public}/langs/sq_AL/agenda.lang          |   0
 {htdocs => public}/langs/sq_AL/banks.lang           |   0
 {htdocs => public}/langs/sq_AL/bills.lang           |   0
 {htdocs => public}/langs/sq_AL/bookmarks.lang       |   0
 {htdocs => public}/langs/sq_AL/boxes.lang           |   0
 {htdocs => public}/langs/sq_AL/cashdesk.lang        |   0
 {htdocs => public}/langs/sq_AL/categories.lang      |   0
 {htdocs => public}/langs/sq_AL/commercial.lang      |   0
 {htdocs => public}/langs/sq_AL/companies.lang       |   0
 {htdocs => public}/langs/sq_AL/compta.lang          |   0
 {htdocs => public}/langs/sq_AL/contracts.lang       |   0
 {htdocs => public}/langs/sq_AL/cron.lang            |   0
 {htdocs => public}/langs/sq_AL/deliveries.lang      |   0
 {htdocs => public}/langs/sq_AL/dict.lang            |   0
 {htdocs => public}/langs/sq_AL/donations.lang       |   0
 {htdocs => public}/langs/sq_AL/ecm.lang             |   0
 {htdocs => public}/langs/sq_AL/errors.lang          |   0
 {htdocs => public}/langs/sq_AL/exports.lang         |   0
 {htdocs => public}/langs/sq_AL/externalsite.lang    |   0
 {htdocs => public}/langs/sq_AL/ftp.lang             |   0
 {htdocs => public}/langs/sq_AL/help.lang            |   0
 {htdocs => public}/langs/sq_AL/holiday.lang         |   0
 {htdocs => public}/langs/sq_AL/hrm.lang             |   0
 {htdocs => public}/langs/sq_AL/incoterm.lang        |   0
 {htdocs => public}/langs/sq_AL/install.lang         |   0
 {htdocs => public}/langs/sq_AL/interventions.lang   |   0
 {htdocs => public}/langs/sq_AL/languages.lang       |   0
 {htdocs => public}/langs/sq_AL/ldap.lang            |   0
 {htdocs => public}/langs/sq_AL/link.lang            |   0
 {htdocs => public}/langs/sq_AL/loan.lang            |   0
 {htdocs => public}/langs/sq_AL/mailmanspip.lang     |   0
 {htdocs => public}/langs/sq_AL/mails.lang           |   0
 {htdocs => public}/langs/sq_AL/main.lang            |   0
 {htdocs => public}/langs/sq_AL/margins.lang         |   0
 {htdocs => public}/langs/sq_AL/members.lang         |   0
 {htdocs => public}/langs/sq_AL/oauth.lang           |   0
 {htdocs => public}/langs/sq_AL/opensurvey.lang      |   0
 {htdocs => public}/langs/sq_AL/orders.lang          |   0
 {htdocs => public}/langs/sq_AL/other.lang           |   0
 {htdocs => public}/langs/sq_AL/paybox.lang          |   0
 {htdocs => public}/langs/sq_AL/paypal.lang          |   0
 {htdocs => public}/langs/sq_AL/printing.lang        |   0
 {htdocs => public}/langs/sq_AL/productbatch.lang    |   0
 {htdocs => public}/langs/sq_AL/products.lang        |   0
 {htdocs => public}/langs/sq_AL/projects.lang        |   0
 {htdocs => public}/langs/sq_AL/propal.lang          |   0
 {htdocs => public}/langs/sq_AL/receiptprinter.lang  |   0
 {htdocs => public}/langs/sq_AL/resource.lang        |   0
 {htdocs => public}/langs/sq_AL/salaries.lang        |   0
 {htdocs => public}/langs/sq_AL/sendings.lang        |   0
 {htdocs => public}/langs/sq_AL/sms.lang             |   0
 {htdocs => public}/langs/sq_AL/stocks.lang          |   0
 .../langs/sq_AL/supplier_proposal.lang              |   0
 {htdocs => public}/langs/sq_AL/suppliers.lang       |   0
 {htdocs => public}/langs/sq_AL/trips.lang           |   0
 {htdocs => public}/langs/sq_AL/users.lang           |   0
 {htdocs => public}/langs/sq_AL/website.lang         |   0
 {htdocs => public}/langs/sq_AL/withdrawals.lang     |   0
 {htdocs => public}/langs/sq_AL/workflow.lang        |   0
 {htdocs => public}/langs/sr_RS/accountancy.lang     |   0
 {htdocs => public}/langs/sr_RS/admin.lang           |   0
 {htdocs => public}/langs/sr_RS/agenda.lang          |   0
 {htdocs => public}/langs/sr_RS/banks.lang           |   0
 {htdocs => public}/langs/sr_RS/bills.lang           |   0
 {htdocs => public}/langs/sr_RS/bookmarks.lang       |   0
 {htdocs => public}/langs/sr_RS/boxes.lang           |   0
 {htdocs => public}/langs/sr_RS/cashdesk.lang        |   0
 {htdocs => public}/langs/sr_RS/categories.lang      |   0
 {htdocs => public}/langs/sr_RS/commercial.lang      |   0
 {htdocs => public}/langs/sr_RS/companies.lang       |   0
 {htdocs => public}/langs/sr_RS/compta.lang          |   0
 {htdocs => public}/langs/sr_RS/contracts.lang       |   0
 {htdocs => public}/langs/sr_RS/cron.lang            |   0
 {htdocs => public}/langs/sr_RS/deliveries.lang      |   0
 {htdocs => public}/langs/sr_RS/dict.lang            |   0
 {htdocs => public}/langs/sr_RS/donations.lang       |   0
 {htdocs => public}/langs/sr_RS/ecm.lang             |   0
 {htdocs => public}/langs/sr_RS/errors.lang          |   0
 {htdocs => public}/langs/sr_RS/exports.lang         |   0
 {htdocs => public}/langs/sr_RS/externalsite.lang    |   0
 {htdocs => public}/langs/sr_RS/ftp.lang             |   0
 {htdocs => public}/langs/sr_RS/help.lang            |   0
 {htdocs => public}/langs/sr_RS/holiday.lang         |   0
 {htdocs => public}/langs/sr_RS/incoterm.lang        |   0
 {htdocs => public}/langs/sr_RS/install.lang         |   0
 {htdocs => public}/langs/sr_RS/interventions.lang   |   0
 {htdocs => public}/langs/sr_RS/languages.lang       |   0
 {htdocs => public}/langs/sr_RS/ldap.lang            |   0
 {htdocs => public}/langs/sr_RS/link.lang            |   0
 {htdocs => public}/langs/sr_RS/loan.lang            |   0
 {htdocs => public}/langs/sr_RS/mailmanspip.lang     |   0
 {htdocs => public}/langs/sr_RS/mails.lang           |   0
 {htdocs => public}/langs/sr_RS/main.lang            |   0
 {htdocs => public}/langs/sr_RS/margins.lang         |   0
 {htdocs => public}/langs/sr_RS/members.lang         |   0
 {htdocs => public}/langs/sr_RS/opensurvey.lang      |   0
 {htdocs => public}/langs/sr_RS/orders.lang          |   0
 {htdocs => public}/langs/sr_RS/other.lang           |   0
 {htdocs => public}/langs/sr_RS/paybox.lang          |   0
 {htdocs => public}/langs/sr_RS/paypal.lang          |   0
 {htdocs => public}/langs/sr_RS/printing.lang        |   0
 {htdocs => public}/langs/sr_RS/productbatch.lang    |   0
 {htdocs => public}/langs/sr_RS/products.lang        |   0
 {htdocs => public}/langs/sr_RS/projects.lang        |   0
 {htdocs => public}/langs/sr_RS/propal.lang          |   0
 {htdocs => public}/langs/sr_RS/resource.lang        |   0
 {htdocs => public}/langs/sr_RS/salaries.lang        |   0
 {htdocs => public}/langs/sr_RS/sendings.lang        |   0
 {htdocs => public}/langs/sr_RS/sms.lang             |   0
 {htdocs => public}/langs/sr_RS/stocks.lang          |   0
 {htdocs => public}/langs/sr_RS/suppliers.lang       |   0
 {htdocs => public}/langs/sr_RS/trips.lang           |   0
 {htdocs => public}/langs/sr_RS/users.lang           |   0
 {htdocs => public}/langs/sr_RS/withdrawals.lang     |   0
 {htdocs => public}/langs/sr_RS/workflow.lang        |   0
 {htdocs => public}/langs/sv_SE/accountancy.lang     |   0
 {htdocs => public}/langs/sv_SE/admin.lang           |   0
 {htdocs => public}/langs/sv_SE/agenda.lang          |   0
 {htdocs => public}/langs/sv_SE/banks.lang           |   0
 {htdocs => public}/langs/sv_SE/bills.lang           |   0
 {htdocs => public}/langs/sv_SE/bookmarks.lang       |   0
 {htdocs => public}/langs/sv_SE/boxes.lang           |   0
 {htdocs => public}/langs/sv_SE/cashdesk.lang        |   0
 {htdocs => public}/langs/sv_SE/categories.lang      |   0
 {htdocs => public}/langs/sv_SE/commercial.lang      |   0
 {htdocs => public}/langs/sv_SE/companies.lang       |   0
 {htdocs => public}/langs/sv_SE/compta.lang          |   0
 {htdocs => public}/langs/sv_SE/contracts.lang       |   0
 {htdocs => public}/langs/sv_SE/cron.lang            |   0
 {htdocs => public}/langs/sv_SE/deliveries.lang      |   0
 {htdocs => public}/langs/sv_SE/dict.lang            |   0
 {htdocs => public}/langs/sv_SE/donations.lang       |   0
 {htdocs => public}/langs/sv_SE/ecm.lang             |   0
 {htdocs => public}/langs/sv_SE/errors.lang          |   0
 {htdocs => public}/langs/sv_SE/exports.lang         |   0
 {htdocs => public}/langs/sv_SE/externalsite.lang    |   0
 {htdocs => public}/langs/sv_SE/ftp.lang             |   0
 {htdocs => public}/langs/sv_SE/help.lang            |   0
 {htdocs => public}/langs/sv_SE/holiday.lang         |   0
 {htdocs => public}/langs/sv_SE/hrm.lang             |   0
 {htdocs => public}/langs/sv_SE/incoterm.lang        |   0
 {htdocs => public}/langs/sv_SE/install.lang         |   0
 {htdocs => public}/langs/sv_SE/interventions.lang   |   0
 {htdocs => public}/langs/sv_SE/languages.lang       |   0
 {htdocs => public}/langs/sv_SE/ldap.lang            |   0
 {htdocs => public}/langs/sv_SE/link.lang            |   0
 {htdocs => public}/langs/sv_SE/loan.lang            |   0
 {htdocs => public}/langs/sv_SE/mailmanspip.lang     |   0
 {htdocs => public}/langs/sv_SE/mails.lang           |   0
 {htdocs => public}/langs/sv_SE/main.lang            |   0
 {htdocs => public}/langs/sv_SE/margins.lang         |   0
 {htdocs => public}/langs/sv_SE/members.lang         |   0
 {htdocs => public}/langs/sv_SE/oauth.lang           |   0
 {htdocs => public}/langs/sv_SE/opensurvey.lang      |   0
 {htdocs => public}/langs/sv_SE/orders.lang          |   0
 {htdocs => public}/langs/sv_SE/other.lang           |   0
 {htdocs => public}/langs/sv_SE/paybox.lang          |   0
 {htdocs => public}/langs/sv_SE/paypal.lang          |   0
 {htdocs => public}/langs/sv_SE/printing.lang        |   0
 {htdocs => public}/langs/sv_SE/productbatch.lang    |   0
 {htdocs => public}/langs/sv_SE/products.lang        |   0
 {htdocs => public}/langs/sv_SE/projects.lang        |   0
 {htdocs => public}/langs/sv_SE/propal.lang          |   0
 {htdocs => public}/langs/sv_SE/receiptprinter.lang  |   0
 {htdocs => public}/langs/sv_SE/resource.lang        |   0
 {htdocs => public}/langs/sv_SE/salaries.lang        |   0
 {htdocs => public}/langs/sv_SE/sendings.lang        |   0
 {htdocs => public}/langs/sv_SE/sms.lang             |   0
 {htdocs => public}/langs/sv_SE/stocks.lang          |   0
 .../langs/sv_SE/supplier_proposal.lang              |   0
 {htdocs => public}/langs/sv_SE/suppliers.lang       |   0
 {htdocs => public}/langs/sv_SE/trips.lang           |   0
 {htdocs => public}/langs/sv_SE/users.lang           |   0
 {htdocs => public}/langs/sv_SE/website.lang         |   0
 {htdocs => public}/langs/sv_SE/withdrawals.lang     |   0
 {htdocs => public}/langs/sv_SE/workflow.lang        |   0
 {htdocs => public}/langs/sw_SW/accountancy.lang     |   0
 {htdocs => public}/langs/sw_SW/admin.lang           |   0
 {htdocs => public}/langs/sw_SW/agenda.lang          |   0
 {htdocs => public}/langs/sw_SW/banks.lang           |   0
 {htdocs => public}/langs/sw_SW/bills.lang           |   0
 {htdocs => public}/langs/sw_SW/bookmarks.lang       |   0
 {htdocs => public}/langs/sw_SW/boxes.lang           |   0
 {htdocs => public}/langs/sw_SW/cashdesk.lang        |   0
 {htdocs => public}/langs/sw_SW/categories.lang      |   0
 {htdocs => public}/langs/sw_SW/commercial.lang      |   0
 {htdocs => public}/langs/sw_SW/companies.lang       |   0
 {htdocs => public}/langs/sw_SW/compta.lang          |   0
 {htdocs => public}/langs/sw_SW/contracts.lang       |   0
 {htdocs => public}/langs/sw_SW/cron.lang            |   0
 {htdocs => public}/langs/sw_SW/deliveries.lang      |   0
 {htdocs => public}/langs/sw_SW/dict.lang            |   0
 {htdocs => public}/langs/sw_SW/donations.lang       |   0
 {htdocs => public}/langs/sw_SW/ecm.lang             |   0
 {htdocs => public}/langs/sw_SW/errors.lang          |   0
 {htdocs => public}/langs/sw_SW/exports.lang         |   0
 {htdocs => public}/langs/sw_SW/externalsite.lang    |   0
 {htdocs => public}/langs/sw_SW/ftp.lang             |   0
 {htdocs => public}/langs/sw_SW/help.lang            |   0
 {htdocs => public}/langs/sw_SW/holiday.lang         |   0
 {htdocs => public}/langs/sw_SW/incoterm.lang        |   0
 {htdocs => public}/langs/sw_SW/install.lang         |   0
 {htdocs => public}/langs/sw_SW/interventions.lang   |   0
 {htdocs => public}/langs/sw_SW/languages.lang       |   0
 {htdocs => public}/langs/sw_SW/ldap.lang            |   0
 {htdocs => public}/langs/sw_SW/link.lang            |   0
 {htdocs => public}/langs/sw_SW/loan.lang            |   0
 {htdocs => public}/langs/sw_SW/mailmanspip.lang     |   0
 {htdocs => public}/langs/sw_SW/mails.lang           |   0
 {htdocs => public}/langs/sw_SW/main.lang            |   0
 {htdocs => public}/langs/sw_SW/margins.lang         |   0
 {htdocs => public}/langs/sw_SW/members.lang         |   0
 {htdocs => public}/langs/sw_SW/opensurvey.lang      |   0
 {htdocs => public}/langs/sw_SW/orders.lang          |   0
 {htdocs => public}/langs/sw_SW/other.lang           |   0
 {htdocs => public}/langs/sw_SW/paybox.lang          |   0
 {htdocs => public}/langs/sw_SW/paypal.lang          |   0
 {htdocs => public}/langs/sw_SW/printing.lang        |   0
 {htdocs => public}/langs/sw_SW/productbatch.lang    |   0
 {htdocs => public}/langs/sw_SW/products.lang        |   0
 {htdocs => public}/langs/sw_SW/projects.lang        |   0
 {htdocs => public}/langs/sw_SW/propal.lang          |   0
 {htdocs => public}/langs/sw_SW/resource.lang        |   0
 {htdocs => public}/langs/sw_SW/salaries.lang        |   0
 {htdocs => public}/langs/sw_SW/sendings.lang        |   0
 {htdocs => public}/langs/sw_SW/sms.lang             |   0
 {htdocs => public}/langs/sw_SW/stocks.lang          |   0
 {htdocs => public}/langs/sw_SW/suppliers.lang       |   0
 {htdocs => public}/langs/sw_SW/trips.lang           |   0
 {htdocs => public}/langs/sw_SW/users.lang           |   0
 {htdocs => public}/langs/sw_SW/withdrawals.lang     |   0
 {htdocs => public}/langs/sw_SW/workflow.lang        |   0
 {htdocs => public}/langs/th_TH/accountancy.lang     |   0
 {htdocs => public}/langs/th_TH/admin.lang           |   0
 {htdocs => public}/langs/th_TH/agenda.lang          |   0
 {htdocs => public}/langs/th_TH/banks.lang           |   0
 {htdocs => public}/langs/th_TH/bills.lang           |   0
 {htdocs => public}/langs/th_TH/bookmarks.lang       |   0
 {htdocs => public}/langs/th_TH/boxes.lang           |   0
 {htdocs => public}/langs/th_TH/cashdesk.lang        |   0
 {htdocs => public}/langs/th_TH/categories.lang      |   0
 {htdocs => public}/langs/th_TH/commercial.lang      |   0
 {htdocs => public}/langs/th_TH/companies.lang       |   0
 {htdocs => public}/langs/th_TH/compta.lang          |   0
 {htdocs => public}/langs/th_TH/contracts.lang       |   0
 {htdocs => public}/langs/th_TH/cron.lang            |   0
 {htdocs => public}/langs/th_TH/deliveries.lang      |   0
 {htdocs => public}/langs/th_TH/dict.lang            |   0
 {htdocs => public}/langs/th_TH/donations.lang       |   0
 {htdocs => public}/langs/th_TH/ecm.lang             |   0
 {htdocs => public}/langs/th_TH/errors.lang          |   0
 {htdocs => public}/langs/th_TH/exports.lang         |   0
 {htdocs => public}/langs/th_TH/externalsite.lang    |   0
 {htdocs => public}/langs/th_TH/ftp.lang             |   0
 {htdocs => public}/langs/th_TH/help.lang            |   0
 {htdocs => public}/langs/th_TH/holiday.lang         |   0
 {htdocs => public}/langs/th_TH/hrm.lang             |   0
 {htdocs => public}/langs/th_TH/incoterm.lang        |   0
 {htdocs => public}/langs/th_TH/install.lang         |   0
 {htdocs => public}/langs/th_TH/interventions.lang   |   0
 {htdocs => public}/langs/th_TH/languages.lang       |   0
 {htdocs => public}/langs/th_TH/ldap.lang            |   0
 {htdocs => public}/langs/th_TH/link.lang            |   0
 {htdocs => public}/langs/th_TH/loan.lang            |   0
 {htdocs => public}/langs/th_TH/mailmanspip.lang     |   0
 {htdocs => public}/langs/th_TH/mails.lang           |   0
 {htdocs => public}/langs/th_TH/main.lang            |   0
 {htdocs => public}/langs/th_TH/margins.lang         |   0
 {htdocs => public}/langs/th_TH/members.lang         |   0
 {htdocs => public}/langs/th_TH/oauth.lang           |   0
 {htdocs => public}/langs/th_TH/opensurvey.lang      |   0
 {htdocs => public}/langs/th_TH/orders.lang          |   0
 {htdocs => public}/langs/th_TH/other.lang           |   0
 {htdocs => public}/langs/th_TH/paybox.lang          |   0
 {htdocs => public}/langs/th_TH/paypal.lang          |   0
 {htdocs => public}/langs/th_TH/printing.lang        |   0
 {htdocs => public}/langs/th_TH/productbatch.lang    |   0
 {htdocs => public}/langs/th_TH/products.lang        |   0
 {htdocs => public}/langs/th_TH/projects.lang        |   0
 {htdocs => public}/langs/th_TH/propal.lang          |   0
 {htdocs => public}/langs/th_TH/receiptprinter.lang  |   0
 {htdocs => public}/langs/th_TH/resource.lang        |   0
 {htdocs => public}/langs/th_TH/salaries.lang        |   0
 {htdocs => public}/langs/th_TH/sendings.lang        |   0
 {htdocs => public}/langs/th_TH/sms.lang             |   0
 {htdocs => public}/langs/th_TH/stocks.lang          |   0
 .../langs/th_TH/supplier_proposal.lang              |   0
 {htdocs => public}/langs/th_TH/suppliers.lang       |   0
 {htdocs => public}/langs/th_TH/trips.lang           |   0
 {htdocs => public}/langs/th_TH/users.lang           |   0
 {htdocs => public}/langs/th_TH/website.lang         |   0
 {htdocs => public}/langs/th_TH/withdrawals.lang     |   0
 {htdocs => public}/langs/th_TH/workflow.lang        |   0
 {htdocs => public}/langs/tr_TR/accountancy.lang     |   0
 {htdocs => public}/langs/tr_TR/admin.lang           |   0
 {htdocs => public}/langs/tr_TR/agenda.lang          |   0
 {htdocs => public}/langs/tr_TR/banks.lang           |   0
 {htdocs => public}/langs/tr_TR/bills.lang           |   0
 {htdocs => public}/langs/tr_TR/bookmarks.lang       |   0
 {htdocs => public}/langs/tr_TR/boxes.lang           |   0
 {htdocs => public}/langs/tr_TR/cashdesk.lang        |   0
 {htdocs => public}/langs/tr_TR/categories.lang      |   0
 {htdocs => public}/langs/tr_TR/commercial.lang      |   0
 {htdocs => public}/langs/tr_TR/commissions.lang     |   0
 {htdocs => public}/langs/tr_TR/companies.lang       |   0
 {htdocs => public}/langs/tr_TR/compta.lang          |   0
 {htdocs => public}/langs/tr_TR/contracts.lang       |   0
 {htdocs => public}/langs/tr_TR/cron.lang            |   0
 {htdocs => public}/langs/tr_TR/deliveries.lang      |   0
 {htdocs => public}/langs/tr_TR/dict.lang            |   0
 {htdocs => public}/langs/tr_TR/donations.lang       |   0
 {htdocs => public}/langs/tr_TR/ecm.lang             |   0
 {htdocs => public}/langs/tr_TR/errors.lang          |   0
 {htdocs => public}/langs/tr_TR/exports.lang         |   0
 {htdocs => public}/langs/tr_TR/externalsite.lang    |   0
 {htdocs => public}/langs/tr_TR/ftp.lang             |   0
 {htdocs => public}/langs/tr_TR/help.lang            |   0
 {htdocs => public}/langs/tr_TR/holiday.lang         |   0
 {htdocs => public}/langs/tr_TR/hrm.lang             |   0
 {htdocs => public}/langs/tr_TR/incoterm.lang        |   0
 {htdocs => public}/langs/tr_TR/install.lang         |   0
 {htdocs => public}/langs/tr_TR/interventions.lang   |   0
 {htdocs => public}/langs/tr_TR/languages.lang       |   0
 {htdocs => public}/langs/tr_TR/ldap.lang            |   0
 {htdocs => public}/langs/tr_TR/link.lang            |   0
 {htdocs => public}/langs/tr_TR/loan.lang            |   0
 {htdocs => public}/langs/tr_TR/mailmanspip.lang     |   0
 {htdocs => public}/langs/tr_TR/mails.lang           |   0
 {htdocs => public}/langs/tr_TR/main.lang            |   0
 {htdocs => public}/langs/tr_TR/margins.lang         |   0
 {htdocs => public}/langs/tr_TR/members.lang         |   0
 {htdocs => public}/langs/tr_TR/oauth.lang           |   0
 {htdocs => public}/langs/tr_TR/opensurvey.lang      |   0
 {htdocs => public}/langs/tr_TR/orders.lang          |   0
 {htdocs => public}/langs/tr_TR/other.lang           |   0
 {htdocs => public}/langs/tr_TR/paybox.lang          |   0
 {htdocs => public}/langs/tr_TR/paypal.lang          |   0
 {htdocs => public}/langs/tr_TR/printing.lang        |   0
 {htdocs => public}/langs/tr_TR/productbatch.lang    |   0
 {htdocs => public}/langs/tr_TR/products.lang        |   0
 {htdocs => public}/langs/tr_TR/projects.lang        |   0
 {htdocs => public}/langs/tr_TR/propal.lang          |   0
 {htdocs => public}/langs/tr_TR/receiptprinter.lang  |   0
 {htdocs => public}/langs/tr_TR/resource.lang        |   0
 {htdocs => public}/langs/tr_TR/salaries.lang        |   0
 {htdocs => public}/langs/tr_TR/sendings.lang        |   0
 {htdocs => public}/langs/tr_TR/sms.lang             |   0
 {htdocs => public}/langs/tr_TR/stocks.lang          |   0
 .../langs/tr_TR/supplier_proposal.lang              |   0
 {htdocs => public}/langs/tr_TR/suppliers.lang       |   0
 {htdocs => public}/langs/tr_TR/trips.lang           |   0
 {htdocs => public}/langs/tr_TR/users.lang           |   0
 {htdocs => public}/langs/tr_TR/website.lang         |   0
 {htdocs => public}/langs/tr_TR/withdrawals.lang     |   0
 {htdocs => public}/langs/tr_TR/workflow.lang        |   0
 {htdocs => public}/langs/uk_UA/accountancy.lang     |   0
 {htdocs => public}/langs/uk_UA/admin.lang           |   0
 {htdocs => public}/langs/uk_UA/agenda.lang          |   0
 {htdocs => public}/langs/uk_UA/banks.lang           |   0
 {htdocs => public}/langs/uk_UA/bills.lang           |   0
 {htdocs => public}/langs/uk_UA/bookmarks.lang       |   0
 {htdocs => public}/langs/uk_UA/boxes.lang           |   0
 {htdocs => public}/langs/uk_UA/cashdesk.lang        |   0
 {htdocs => public}/langs/uk_UA/categories.lang      |   0
 {htdocs => public}/langs/uk_UA/commercial.lang      |   0
 {htdocs => public}/langs/uk_UA/companies.lang       |   0
 {htdocs => public}/langs/uk_UA/compta.lang          |   0
 {htdocs => public}/langs/uk_UA/contracts.lang       |   0
 {htdocs => public}/langs/uk_UA/cron.lang            |   0
 {htdocs => public}/langs/uk_UA/deliveries.lang      |   0
 {htdocs => public}/langs/uk_UA/dict.lang            |   0
 {htdocs => public}/langs/uk_UA/donations.lang       |   0
 {htdocs => public}/langs/uk_UA/ecm.lang             |   0
 {htdocs => public}/langs/uk_UA/errors.lang          |   0
 {htdocs => public}/langs/uk_UA/exports.lang         |   0
 {htdocs => public}/langs/uk_UA/externalsite.lang    |   0
 {htdocs => public}/langs/uk_UA/ftp.lang             |   0
 {htdocs => public}/langs/uk_UA/help.lang            |   0
 {htdocs => public}/langs/uk_UA/holiday.lang         |   0
 {htdocs => public}/langs/uk_UA/hrm.lang             |   0
 {htdocs => public}/langs/uk_UA/incoterm.lang        |   0
 {htdocs => public}/langs/uk_UA/install.lang         |   0
 {htdocs => public}/langs/uk_UA/interventions.lang   |   0
 {htdocs => public}/langs/uk_UA/languages.lang       |   0
 {htdocs => public}/langs/uk_UA/ldap.lang            |   0
 {htdocs => public}/langs/uk_UA/link.lang            |   0
 {htdocs => public}/langs/uk_UA/loan.lang            |   0
 {htdocs => public}/langs/uk_UA/mailmanspip.lang     |   0
 {htdocs => public}/langs/uk_UA/mails.lang           |   0
 {htdocs => public}/langs/uk_UA/main.lang            |   0
 {htdocs => public}/langs/uk_UA/margins.lang         |   0
 {htdocs => public}/langs/uk_UA/members.lang         |   0
 {htdocs => public}/langs/uk_UA/oauth.lang           |   0
 {htdocs => public}/langs/uk_UA/opensurvey.lang      |   0
 {htdocs => public}/langs/uk_UA/orders.lang          |   0
 {htdocs => public}/langs/uk_UA/other.lang           |   0
 {htdocs => public}/langs/uk_UA/paybox.lang          |   0
 {htdocs => public}/langs/uk_UA/paypal.lang          |   0
 {htdocs => public}/langs/uk_UA/printing.lang        |   0
 {htdocs => public}/langs/uk_UA/productbatch.lang    |   0
 {htdocs => public}/langs/uk_UA/products.lang        |   0
 {htdocs => public}/langs/uk_UA/projects.lang        |   0
 {htdocs => public}/langs/uk_UA/propal.lang          |   0
 {htdocs => public}/langs/uk_UA/receiptprinter.lang  |   0
 {htdocs => public}/langs/uk_UA/resource.lang        |   0
 {htdocs => public}/langs/uk_UA/salaries.lang        |   0
 {htdocs => public}/langs/uk_UA/sendings.lang        |   0
 {htdocs => public}/langs/uk_UA/sms.lang             |   0
 {htdocs => public}/langs/uk_UA/stocks.lang          |   0
 .../langs/uk_UA/supplier_proposal.lang              |   0
 {htdocs => public}/langs/uk_UA/suppliers.lang       |   0
 {htdocs => public}/langs/uk_UA/trips.lang           |   0
 {htdocs => public}/langs/uk_UA/users.lang           |   0
 {htdocs => public}/langs/uk_UA/website.lang         |   0
 {htdocs => public}/langs/uk_UA/withdrawals.lang     |   0
 {htdocs => public}/langs/uk_UA/workflow.lang        |   0
 {htdocs => public}/langs/uz_UZ/accountancy.lang     |   0
 {htdocs => public}/langs/uz_UZ/admin.lang           |   0
 {htdocs => public}/langs/uz_UZ/agenda.lang          |   0
 {htdocs => public}/langs/uz_UZ/banks.lang           |   0
 {htdocs => public}/langs/uz_UZ/bills.lang           |   0
 {htdocs => public}/langs/uz_UZ/bookmarks.lang       |   0
 {htdocs => public}/langs/uz_UZ/boxes.lang           |   0
 {htdocs => public}/langs/uz_UZ/cashdesk.lang        |   0
 {htdocs => public}/langs/uz_UZ/categories.lang      |   0
 {htdocs => public}/langs/uz_UZ/commercial.lang      |   0
 {htdocs => public}/langs/uz_UZ/companies.lang       |   0
 {htdocs => public}/langs/uz_UZ/compta.lang          |   0
 {htdocs => public}/langs/uz_UZ/contracts.lang       |   0
 {htdocs => public}/langs/uz_UZ/cron.lang            |   0
 {htdocs => public}/langs/uz_UZ/deliveries.lang      |   0
 {htdocs => public}/langs/uz_UZ/dict.lang            |   0
 {htdocs => public}/langs/uz_UZ/donations.lang       |   0
 {htdocs => public}/langs/uz_UZ/ecm.lang             |   0
 {htdocs => public}/langs/uz_UZ/errors.lang          |   0
 {htdocs => public}/langs/uz_UZ/exports.lang         |   0
 {htdocs => public}/langs/uz_UZ/externalsite.lang    |   0
 {htdocs => public}/langs/uz_UZ/ftp.lang             |   0
 {htdocs => public}/langs/uz_UZ/help.lang            |   0
 {htdocs => public}/langs/uz_UZ/holiday.lang         |   0
 {htdocs => public}/langs/uz_UZ/incoterm.lang        |   0
 {htdocs => public}/langs/uz_UZ/install.lang         |   0
 {htdocs => public}/langs/uz_UZ/interventions.lang   |   0
 {htdocs => public}/langs/uz_UZ/languages.lang       |   0
 {htdocs => public}/langs/uz_UZ/ldap.lang            |   0
 {htdocs => public}/langs/uz_UZ/link.lang            |   0
 {htdocs => public}/langs/uz_UZ/loan.lang            |   0
 {htdocs => public}/langs/uz_UZ/mailmanspip.lang     |   0
 {htdocs => public}/langs/uz_UZ/mails.lang           |   0
 {htdocs => public}/langs/uz_UZ/main.lang            |   0
 {htdocs => public}/langs/uz_UZ/margins.lang         |   0
 {htdocs => public}/langs/uz_UZ/members.lang         |   0
 {htdocs => public}/langs/uz_UZ/opensurvey.lang      |   0
 {htdocs => public}/langs/uz_UZ/orders.lang          |   0
 {htdocs => public}/langs/uz_UZ/other.lang           |   0
 {htdocs => public}/langs/uz_UZ/paybox.lang          |   0
 {htdocs => public}/langs/uz_UZ/paypal.lang          |   0
 {htdocs => public}/langs/uz_UZ/printing.lang        |   0
 {htdocs => public}/langs/uz_UZ/productbatch.lang    |   0
 {htdocs => public}/langs/uz_UZ/products.lang        |   0
 {htdocs => public}/langs/uz_UZ/projects.lang        |   0
 {htdocs => public}/langs/uz_UZ/propal.lang          |   0
 {htdocs => public}/langs/uz_UZ/resource.lang        |   0
 {htdocs => public}/langs/uz_UZ/salaries.lang        |   0
 {htdocs => public}/langs/uz_UZ/sendings.lang        |   0
 {htdocs => public}/langs/uz_UZ/sms.lang             |   0
 {htdocs => public}/langs/uz_UZ/stocks.lang          |   0
 {htdocs => public}/langs/uz_UZ/suppliers.lang       |   0
 {htdocs => public}/langs/uz_UZ/trips.lang           |   0
 {htdocs => public}/langs/uz_UZ/users.lang           |   0
 {htdocs => public}/langs/uz_UZ/withdrawals.lang     |   0
 {htdocs => public}/langs/uz_UZ/workflow.lang        |   0
 {htdocs => public}/langs/vi_VN/accountancy.lang     |   0
 {htdocs => public}/langs/vi_VN/admin.lang           |   0
 {htdocs => public}/langs/vi_VN/agenda.lang          |   0
 {htdocs => public}/langs/vi_VN/banks.lang           |   0
 {htdocs => public}/langs/vi_VN/bills.lang           |   0
 {htdocs => public}/langs/vi_VN/bookmarks.lang       |   0
 {htdocs => public}/langs/vi_VN/boxes.lang           |   0
 {htdocs => public}/langs/vi_VN/cashdesk.lang        |   0
 {htdocs => public}/langs/vi_VN/categories.lang      |   0
 {htdocs => public}/langs/vi_VN/commercial.lang      |   0
 {htdocs => public}/langs/vi_VN/companies.lang       |   0
 {htdocs => public}/langs/vi_VN/compta.lang          |   0
 {htdocs => public}/langs/vi_VN/contracts.lang       |   0
 {htdocs => public}/langs/vi_VN/cron.lang            |   0
 {htdocs => public}/langs/vi_VN/deliveries.lang      |   0
 {htdocs => public}/langs/vi_VN/dict.lang            |   0
 {htdocs => public}/langs/vi_VN/donations.lang       |   0
 {htdocs => public}/langs/vi_VN/ecm.lang             |   0
 {htdocs => public}/langs/vi_VN/errors.lang          |   0
 {htdocs => public}/langs/vi_VN/exports.lang         |   0
 {htdocs => public}/langs/vi_VN/externalsite.lang    |   0
 {htdocs => public}/langs/vi_VN/ftp.lang             |   0
 {htdocs => public}/langs/vi_VN/help.lang            |   0
 {htdocs => public}/langs/vi_VN/holiday.lang         |   0
 {htdocs => public}/langs/vi_VN/hrm.lang             |   0
 {htdocs => public}/langs/vi_VN/incoterm.lang        |   0
 {htdocs => public}/langs/vi_VN/install.lang         |   0
 {htdocs => public}/langs/vi_VN/interventions.lang   |   0
 {htdocs => public}/langs/vi_VN/languages.lang       |   0
 {htdocs => public}/langs/vi_VN/ldap.lang            |   0
 {htdocs => public}/langs/vi_VN/link.lang            |   0
 {htdocs => public}/langs/vi_VN/loan.lang            |   0
 {htdocs => public}/langs/vi_VN/mailmanspip.lang     |   0
 {htdocs => public}/langs/vi_VN/mails.lang           |   0
 {htdocs => public}/langs/vi_VN/main.lang            |   0
 {htdocs => public}/langs/vi_VN/margins.lang         |   0
 {htdocs => public}/langs/vi_VN/members.lang         |   0
 {htdocs => public}/langs/vi_VN/oauth.lang           |   0
 {htdocs => public}/langs/vi_VN/opensurvey.lang      |   0
 {htdocs => public}/langs/vi_VN/orders.lang          |   0
 {htdocs => public}/langs/vi_VN/other.lang           |   0
 {htdocs => public}/langs/vi_VN/paybox.lang          |   0
 {htdocs => public}/langs/vi_VN/paypal.lang          |   0
 {htdocs => public}/langs/vi_VN/printing.lang        |   0
 {htdocs => public}/langs/vi_VN/productbatch.lang    |   0
 {htdocs => public}/langs/vi_VN/products.lang        |   0
 {htdocs => public}/langs/vi_VN/projects.lang        |   0
 {htdocs => public}/langs/vi_VN/propal.lang          |   0
 {htdocs => public}/langs/vi_VN/receiptprinter.lang  |   0
 {htdocs => public}/langs/vi_VN/resource.lang        |   0
 {htdocs => public}/langs/vi_VN/salaries.lang        |   0
 {htdocs => public}/langs/vi_VN/sendings.lang        |   0
 {htdocs => public}/langs/vi_VN/sms.lang             |   0
 {htdocs => public}/langs/vi_VN/stocks.lang          |   0
 .../langs/vi_VN/supplier_proposal.lang              |   0
 {htdocs => public}/langs/vi_VN/suppliers.lang       |   0
 {htdocs => public}/langs/vi_VN/trips.lang           |   0
 {htdocs => public}/langs/vi_VN/users.lang           |   0
 {htdocs => public}/langs/vi_VN/website.lang         |   0
 {htdocs => public}/langs/vi_VN/withdrawals.lang     |   0
 {htdocs => public}/langs/vi_VN/workflow.lang        |   0
 {htdocs => public}/langs/zh_CN/accountancy.lang     |   0
 {htdocs => public}/langs/zh_CN/admin.lang           |   0
 {htdocs => public}/langs/zh_CN/agenda.lang          |   0
 {htdocs => public}/langs/zh_CN/banks.lang           |   0
 {htdocs => public}/langs/zh_CN/bills.lang           |   0
 {htdocs => public}/langs/zh_CN/bookmarks.lang       |   0
 {htdocs => public}/langs/zh_CN/boxes.lang           |   0
 {htdocs => public}/langs/zh_CN/cashdesk.lang        |   0
 {htdocs => public}/langs/zh_CN/categories.lang      |   0
 {htdocs => public}/langs/zh_CN/commercial.lang      |   0
 {htdocs => public}/langs/zh_CN/companies.lang       |   0
 {htdocs => public}/langs/zh_CN/compta.lang          |   0
 {htdocs => public}/langs/zh_CN/contracts.lang       |   0
 {htdocs => public}/langs/zh_CN/cron.lang            |   0
 {htdocs => public}/langs/zh_CN/deliveries.lang      |   0
 {htdocs => public}/langs/zh_CN/dict.lang            |   0
 {htdocs => public}/langs/zh_CN/donations.lang       |   0
 {htdocs => public}/langs/zh_CN/ecm.lang             |   0
 {htdocs => public}/langs/zh_CN/errors.lang          |   0
 {htdocs => public}/langs/zh_CN/exports.lang         |   0
 {htdocs => public}/langs/zh_CN/externalsite.lang    |   0
 {htdocs => public}/langs/zh_CN/ftp.lang             |   0
 {htdocs => public}/langs/zh_CN/help.lang            |   0
 {htdocs => public}/langs/zh_CN/holiday.lang         |   0
 {htdocs => public}/langs/zh_CN/hrm.lang             |   0
 {htdocs => public}/langs/zh_CN/incoterm.lang        |   0
 {htdocs => public}/langs/zh_CN/install.lang         |   0
 {htdocs => public}/langs/zh_CN/interventions.lang   |   0
 {htdocs => public}/langs/zh_CN/languages.lang       |   0
 {htdocs => public}/langs/zh_CN/ldap.lang            |   0
 {htdocs => public}/langs/zh_CN/link.lang            |   0
 {htdocs => public}/langs/zh_CN/loan.lang            |   0
 {htdocs => public}/langs/zh_CN/mailmanspip.lang     |   0
 {htdocs => public}/langs/zh_CN/mails.lang           |   0
 {htdocs => public}/langs/zh_CN/main.lang            |   0
 {htdocs => public}/langs/zh_CN/margins.lang         |   0
 {htdocs => public}/langs/zh_CN/members.lang         |   0
 {htdocs => public}/langs/zh_CN/oauth.lang           |   0
 {htdocs => public}/langs/zh_CN/opensurvey.lang      |   0
 {htdocs => public}/langs/zh_CN/orders.lang          |   0
 {htdocs => public}/langs/zh_CN/other.lang           |   0
 {htdocs => public}/langs/zh_CN/paybox.lang          |   0
 {htdocs => public}/langs/zh_CN/paypal.lang          |   0
 {htdocs => public}/langs/zh_CN/printing.lang        |   0
 {htdocs => public}/langs/zh_CN/productbatch.lang    |   0
 {htdocs => public}/langs/zh_CN/products.lang        |   0
 {htdocs => public}/langs/zh_CN/projects.lang        |   0
 {htdocs => public}/langs/zh_CN/propal.lang          |   0
 {htdocs => public}/langs/zh_CN/receiptprinter.lang  |   0
 {htdocs => public}/langs/zh_CN/resource.lang        |   0
 {htdocs => public}/langs/zh_CN/salaries.lang        |   0
 {htdocs => public}/langs/zh_CN/sendings.lang        |   0
 {htdocs => public}/langs/zh_CN/sms.lang             |   0
 {htdocs => public}/langs/zh_CN/stocks.lang          |   0
 .../langs/zh_CN/supplier_proposal.lang              |   0
 {htdocs => public}/langs/zh_CN/suppliers.lang       |   0
 {htdocs => public}/langs/zh_CN/trips.lang           |   0
 {htdocs => public}/langs/zh_CN/users.lang           |   0
 {htdocs => public}/langs/zh_CN/website.lang         |   0
 {htdocs => public}/langs/zh_CN/withdrawals.lang     |   0
 {htdocs => public}/langs/zh_CN/workflow.lang        |   0
 {htdocs => public}/langs/zh_TW/accountancy.lang     |   0
 {htdocs => public}/langs/zh_TW/admin.lang           |   0
 {htdocs => public}/langs/zh_TW/agenda.lang          |   0
 {htdocs => public}/langs/zh_TW/banks.lang           |   0
 {htdocs => public}/langs/zh_TW/bills.lang           |   0
 {htdocs => public}/langs/zh_TW/bookmarks.lang       |   0
 {htdocs => public}/langs/zh_TW/boxes.lang           |   0
 {htdocs => public}/langs/zh_TW/cashdesk.lang        |   0
 {htdocs => public}/langs/zh_TW/categories.lang      |   0
 {htdocs => public}/langs/zh_TW/commercial.lang      |   0
 {htdocs => public}/langs/zh_TW/companies.lang       |   0
 {htdocs => public}/langs/zh_TW/compta.lang          |   0
 {htdocs => public}/langs/zh_TW/contracts.lang       |   0
 {htdocs => public}/langs/zh_TW/cron.lang            |   0
 {htdocs => public}/langs/zh_TW/deliveries.lang      |   0
 {htdocs => public}/langs/zh_TW/dict.lang            |   0
 {htdocs => public}/langs/zh_TW/donations.lang       |   0
 {htdocs => public}/langs/zh_TW/ecm.lang             |   0
 {htdocs => public}/langs/zh_TW/errors.lang          |   0
 {htdocs => public}/langs/zh_TW/exports.lang         |   0
 {htdocs => public}/langs/zh_TW/externalsite.lang    |   0
 {htdocs => public}/langs/zh_TW/ftp.lang             |   0
 {htdocs => public}/langs/zh_TW/help.lang            |   0
 {htdocs => public}/langs/zh_TW/holiday.lang         |   0
 {htdocs => public}/langs/zh_TW/hrm.lang             |   0
 {htdocs => public}/langs/zh_TW/incoterm.lang        |   0
 {htdocs => public}/langs/zh_TW/install.lang         |   0
 {htdocs => public}/langs/zh_TW/interventions.lang   |   0
 {htdocs => public}/langs/zh_TW/languages.lang       |   0
 {htdocs => public}/langs/zh_TW/ldap.lang            |   0
 {htdocs => public}/langs/zh_TW/link.lang            |   0
 {htdocs => public}/langs/zh_TW/loan.lang            |   0
 {htdocs => public}/langs/zh_TW/mailmanspip.lang     |   0
 {htdocs => public}/langs/zh_TW/mails.lang           |   0
 {htdocs => public}/langs/zh_TW/main.lang            |   0
 {htdocs => public}/langs/zh_TW/margins.lang         |   0
 {htdocs => public}/langs/zh_TW/members.lang         |   0
 {htdocs => public}/langs/zh_TW/oauth.lang           |   0
 {htdocs => public}/langs/zh_TW/opensurvey.lang      |   0
 {htdocs => public}/langs/zh_TW/orders.lang          |   0
 {htdocs => public}/langs/zh_TW/other.lang           |   0
 {htdocs => public}/langs/zh_TW/paybox.lang          |   0
 {htdocs => public}/langs/zh_TW/paypal.lang          |   0
 {htdocs => public}/langs/zh_TW/printing.lang        |   0
 {htdocs => public}/langs/zh_TW/productbatch.lang    |   0
 {htdocs => public}/langs/zh_TW/products.lang        |   0
 {htdocs => public}/langs/zh_TW/projects.lang        |   0
 {htdocs => public}/langs/zh_TW/propal.lang          |   0
 {htdocs => public}/langs/zh_TW/receiptprinter.lang  |   0
 {htdocs => public}/langs/zh_TW/resource.lang        |   0
 {htdocs => public}/langs/zh_TW/salaries.lang        |   0
 {htdocs => public}/langs/zh_TW/sendings.lang        |   0
 {htdocs => public}/langs/zh_TW/sms.lang             |   0
 {htdocs => public}/langs/zh_TW/stocks.lang          |   0
 .../langs/zh_TW/supplier_proposal.lang              |   0
 {htdocs => public}/langs/zh_TW/suppliers.lang       |   0
 {htdocs => public}/langs/zh_TW/trips.lang           |   0
 {htdocs => public}/langs/zh_TW/users.lang           |   0
 {htdocs => public}/langs/zh_TW/website.lang         |   0
 {htdocs => public}/langs/zh_TW/withdrawals.lang     |   0
 {htdocs => public}/langs/zh_TW/workflow.lang        |   0
 {htdocs => public}/livraison/card.php               |   0
 {htdocs => public}/livraison/class/index.html       |   0
 .../livraison/class/livraison.class.php             |   0
 {htdocs => public}/livraison/index.html             |   0
 {htdocs => public}/loan/calc.php                    |   0
 {htdocs => public}/loan/card.php                    |   0
 {htdocs => public}/loan/class/index.html            |   0
 {htdocs => public}/loan/class/loan.class.php        |   0
 {htdocs => public}/loan/class/paymentloan.class.php |   0
 {htdocs => public}/loan/document.php                |   0
 {htdocs => public}/loan/index.html                  |   0
 {htdocs => public}/loan/index.php                   |   0
 {htdocs => public}/loan/info.php                    |   0
 {htdocs => public}/loan/note.php                    |   0
 {htdocs => public}/loan/payment/card.php            |   0
 {htdocs => public}/loan/payment/index.html          |   0
 {htdocs => public}/loan/payment/payment.php         |   0
 {htdocs => public}/mailmanspip/class/index.html     |   0
 .../mailmanspip/class/mailmanspip.class.php         |   0
 {htdocs => public}/mailmanspip/index.html           |   0
 {htdocs => public}/main.inc.php                     |   0
 {htdocs => public}/margin/admin/index.html          |   0
 {htdocs => public}/margin/admin/margin.php          |   0
 {htdocs => public}/margin/agentMargins.php          |   0
 {htdocs => public}/margin/checkMargins.php          |   0
 {htdocs => public}/margin/customerMargins.php       |   0
 {htdocs => public}/margin/index.php                 |   0
 {htdocs => public}/margin/lib/index.html            |   0
 {htdocs => public}/margin/lib/margins.lib.php       |   0
 {htdocs => public}/margin/productMargins.php        |   0
 {htdocs => public}/margin/tabs/index.html           |   0
 {htdocs => public}/margin/tabs/productMargins.php   |   0
 .../margin/tabs/thirdpartyMargins.php               |   0
 {htdocs => public}/master.inc.php                   |   0
 .../multicurrency/class/multicurrency.class.php     |   0
 {htdocs => public}/opensurvey/card.php              |   0
 {htdocs => public}/opensurvey/class/index.html      |   0
 .../opensurvey/class/opensurveysondage.class.php    |   0
 {htdocs => public}/opensurvey/css/index.html        |   0
 {htdocs => public}/opensurvey/css/style.css         |   0
 {htdocs => public}/opensurvey/exportcsv.php         |   0
 {htdocs => public}/opensurvey/fonctions.php         |   0
 {htdocs => public}/opensurvey/img/accept-24.png     | Bin
 {htdocs => public}/opensurvey/img/accept.png        | Bin
 {htdocs => public}/opensurvey/img/add-16.png        | Bin
 {htdocs => public}/opensurvey/img/add-24.png        | Bin
 {htdocs => public}/opensurvey/img/calendar-32.png   | Bin
 {htdocs => public}/opensurvey/img/chart-32.png      | Bin
 {htdocs => public}/opensurvey/img/date.png          | Bin
 {htdocs => public}/opensurvey/img/fforward.png      | Bin
 {htdocs => public}/opensurvey/img/index.html        |   0
 {htdocs => public}/opensurvey/img/medaille.png      | Bin
 {htdocs => public}/opensurvey/img/next.png          | Bin
 .../opensurvey/img/object_opensurvey.png            | Bin
 {htdocs => public}/opensurvey/img/opensurvey.png    | Bin
 {htdocs => public}/opensurvey/img/previous.png      | Bin
 {htdocs => public}/opensurvey/img/rewind.png        | Bin
 {htdocs => public}/opensurvey/img/sondage2.png      | Bin
 {htdocs => public}/opensurvey/index.php             |   0
 {htdocs => public}/opensurvey/list.php              |   0
 {htdocs => public}/opensurvey/results.php           |   0
 .../opensurvey/wizard/choix_autre.php               |   0
 {htdocs => public}/opensurvey/wizard/choix_date.php |   0
 .../opensurvey/wizard/create_survey.php             |   0
 {htdocs => public}/opensurvey/wizard/index.php      |   0
 {htdocs => public}/paybox/admin/index.html          |   0
 {htdocs => public}/paybox/admin/paybox.php          |   0
 {htdocs => public}/paybox/img/index.html            |   0
 {htdocs => public}/paybox/img/object_paybox.png     | Bin
 {htdocs => public}/paybox/index.html                |   0
 {htdocs => public}/paybox/lib/index.html            |   0
 {htdocs => public}/paybox/lib/paybox.lib.php        |   0
 {htdocs => public}/paypal/admin/index.html          |   0
 {htdocs => public}/paypal/admin/paypal.php          |   0
 {htdocs => public}/paypal/img/index.html            |   0
 {htdocs => public}/paypal/img/object_paypal.png     | Bin
 {htdocs => public}/paypal/index.html                |   0
 {htdocs => public}/paypal/lib/index.html            |   0
 {htdocs => public}/paypal/lib/paypal.lib.php        |   0
 .../paypal/lib/paypalfunctions.lib.php              |   0
 {htdocs => public}/printing/admin/index.html        |   0
 {htdocs => public}/printing/admin/printing.php      |   0
 {htdocs => public}/printing/index.php               |   0
 {htdocs => public}/printing/lib/index.html          |   0
 {htdocs => public}/printing/lib/printing.lib.php    |   0
 {htdocs => public}/product/admin/dynamic_prices.php |   0
 {htdocs => public}/product/admin/index.html         |   0
 {htdocs => public}/product/admin/price_rules.php    |   0
 {htdocs => public}/product/admin/product.php        |   0
 .../product/admin/product_extrafields.php           |   0
 .../product/admin/product_lot_extrafields.php       |   0
 {htdocs => public}/product/admin/product_tools.php  |   0
 {htdocs => public}/product/ajax/index.html          |   0
 {htdocs => public}/product/ajax/products.php        |   0
 {htdocs => public}/product/canvas/index.html        |   0
 .../canvas/product/actions_card_product.class.php   |   0
 .../product/canvas/product/index.html               |   0
 .../product/canvas/product/tpl/card_create.tpl.php  |   0
 .../product/canvas/product/tpl/card_edit.tpl.php    |   0
 .../product/canvas/product/tpl/card_view.tpl.php    |   0
 .../product/canvas/product/tpl/index.html           |   0
 .../product/canvas/product/tpl/list.tpl.php         |   0
 .../canvas/service/actions_card_service.class.php   |   0
 .../product/canvas/service/index.html               |   0
 .../product/canvas/service/tpl/card_create.tpl.php  |   0
 .../product/canvas/service/tpl/card_edit.tpl.php    |   0
 .../product/canvas/service/tpl/card_view.tpl.php    |   0
 .../product/canvas/service/tpl/index.html           |   0
 .../product/canvas/service/tpl/list.tpl.php         |   0
 {htdocs => public}/product/card.php                 |   0
 .../product/class/api_deprecated_product.class.php  |   0
 .../product/class/api_products.class.php            |   0
 .../product/class/html.formproduct.class.php        |   0
 {htdocs => public}/product/class/index.html         |   0
 {htdocs => public}/product/class/product.class.php  |   0
 .../product/class/productbatch.class.php            |   0
 .../product/class/productcustomerprice.class.php    |   0
 .../product/class/propalmergepdfproduct.class.php   |   0
 {htdocs => public}/product/class/service.class.php  |   0
 {htdocs => public}/product/composition/card.php     |   0
 {htdocs => public}/product/composition/index.html   |   0
 {htdocs => public}/product/document.php             |   0
 .../dynamic_price/class/price_expression.class.php  |   0
 .../class/price_global_variable.class.php           |   0
 .../class/price_global_variable_updater.class.php   |   0
 .../dynamic_price/class/price_parser.class.php      |   0
 {htdocs => public}/product/dynamic_price/editor.php |   0
 {htdocs => public}/product/fournisseurs.php         |   0
 {htdocs => public}/product/index.php                |   0
 {htdocs => public}/product/info.php                 |   0
 {htdocs => public}/product/list.php                 |   0
 {htdocs => public}/product/note.php                 |   0
 {htdocs => public}/product/popuprop.php             |   0
 {htdocs => public}/product/price.php                |   0
 {htdocs => public}/product/reassort.php             |   0
 {htdocs => public}/product/reassortlot.php          |   0
 {htdocs => public}/product/stats/card.php           |   0
 {htdocs => public}/product/stats/commande.php       |   0
 .../product/stats/commande_fournisseur.php          |   0
 {htdocs => public}/product/stats/contrat.php        |   0
 {htdocs => public}/product/stats/facture.php        |   0
 .../product/stats/facture_fournisseur.php           |   0
 {htdocs => public}/product/stats/index.html         |   0
 {htdocs => public}/product/stats/propal.php         |   0
 {htdocs => public}/product/stock/card.php           |   0
 .../stock/class/api_stockmovements.class.php        |   0
 .../product/stock/class/api_warehouses.class.php    |   0
 .../product/stock/class/entrepot.class.php          |   0
 {htdocs => public}/product/stock/class/index.html   |   0
 .../product/stock/class/mouvementstock.class.php    |   0
 .../product/stock/class/productlot.class.php        |   0
 .../stock/class/productstockentrepot.class.php      |   0
 {htdocs => public}/product/stock/fiche-valo.php     |   0
 {htdocs => public}/product/stock/img/index.html     |   0
 {htdocs => public}/product/stock/img/no.png         | Bin
 {htdocs => public}/product/stock/img/yes.png        | Bin
 {htdocs => public}/product/stock/index.php          |   0
 {htdocs => public}/product/stock/info.php           |   0
 {htdocs => public}/product/stock/lib/index.html     |   0
 .../product/stock/lib/replenishment.lib.php         |   0
 {htdocs => public}/product/stock/list.php           |   0
 {htdocs => public}/product/stock/massstockmove.php  |   0
 {htdocs => public}/product/stock/mouvement.php      |   0
 {htdocs => public}/product/stock/product.php        |   0
 .../product/stock/productlot_card.php               |   0
 .../product/stock/productlot_list.php               |   0
 {htdocs => public}/product/stock/replenish.php      |   0
 .../product/stock/replenishorders.php               |   0
 .../product/stock/tpl/stockcorrection.tpl.php       |   0
 .../product/stock/tpl/stocktransfer.tpl.php         |   0
 {htdocs => public}/product/stock/valo.php           |   0
 {htdocs => public}/product/traduction.php           |   0
 {htdocs => public}/projet/activity/index.php        |   0
 {htdocs => public}/projet/activity/perday.php       |   0
 {htdocs => public}/projet/activity/perweek.php      |   0
 {htdocs => public}/projet/admin/index.html          |   0
 {htdocs => public}/projet/admin/project.php         |   0
 .../projet/admin/project_extrafields.php            |   0
 .../projet/admin/project_task_extrafields.php       |   0
 {htdocs => public}/projet/ajax/projects.php         |   0
 {htdocs => public}/projet/card.php                  |   0
 .../projet/class/api_projects.class.php             |   0
 {htdocs => public}/projet/class/api_tasks.class.php |   0
 {htdocs => public}/projet/class/index.html          |   0
 {htdocs => public}/projet/class/project.class.php   |   0
 .../projet/class/projectstats.class.php             |   0
 {htdocs => public}/projet/class/task.class.php      |   0
 {htdocs => public}/projet/contact.php               |   0
 {htdocs => public}/projet/document.php              |   0
 {htdocs => public}/projet/element.php               |   0
 {htdocs => public}/projet/ganttchart.inc.php        |   0
 {htdocs => public}/projet/ganttview.php             |   0
 .../projet/graph_opportunities.inc.php              |   0
 {htdocs => public}/projet/index.php                 |   0
 {htdocs => public}/projet/info.php                  |   0
 {htdocs => public}/projet/jsgantt_language.js.php   |   0
 {htdocs => public}/projet/list.php                  |   0
 {htdocs => public}/projet/note.php                  |   0
 {htdocs => public}/projet/stats/index.php           |   0
 {htdocs => public}/projet/tasks.php                 |   0
 {htdocs => public}/projet/tasks/contact.php         |   0
 {htdocs => public}/projet/tasks/document.php        |   0
 {htdocs => public}/projet/tasks/list.php            |   0
 {htdocs => public}/projet/tasks/note.php            |   0
 {htdocs => public}/projet/tasks/task.php            |   0
 {htdocs => public}/projet/tasks/time.php            |   0
 {htdocs => public}/public/agenda/agendaexport.php   |   0
 {htdocs => public}/public/agenda/index.php          |   0
 {htdocs => public}/public/cron/cron_run_jobs.php    |   0
 {htdocs => public}/public/cron/index.html           |   0
 .../public/demo/dolibarr_screenshot2.png            | Bin
 .../public/demo/dolibarr_screenshot6.png            | Bin
 .../public/demo/dolibarr_screenshot8.png            | Bin
 .../public/demo/dolibarr_screenshot9.png            | Bin
 {htdocs => public}/public/demo/index.php            |   0
 .../public/donations/donateurs_code.php             |   0
 {htdocs => public}/public/donations/index.php       |   0
 {htdocs => public}/public/emailing/index.html       |   0
 {htdocs => public}/public/emailing/mailing-read.php |   0
 .../public/emailing/mailing-unsubscribe.php         |   0
 {htdocs => public}/public/error-401.php             |   0
 {htdocs => public}/public/error-404.php             |   0
 {htdocs => public}/public/index.php                 |   0
 {htdocs => public}/public/members/index.php         |   0
 {htdocs => public}/public/members/new.php           |   0
 {htdocs => public}/public/members/public_card.php   |   0
 {htdocs => public}/public/members/public_list.php   |   0
 {htdocs => public}/public/notice.php                |   0
 {htdocs => public}/public/opensurvey/index.html     |   0
 {htdocs => public}/public/opensurvey/studs.php      |   0
 {htdocs => public}/public/paybox/index.php          |   0
 {htdocs => public}/public/paybox/newpayment.php     |   0
 {htdocs => public}/public/paybox/paymentko.php      |   0
 {htdocs => public}/public/paybox/paymentok.php      |   0
 {htdocs => public}/public/paypal/index.php          |   0
 {htdocs => public}/public/paypal/newpayment.php     |   0
 {htdocs => public}/public/paypal/paymentko.php      |   0
 {htdocs => public}/public/paypal/paymentok.php      |   0
 {htdocs => public}/public/test/test_arrays.php      |   0
 {htdocs => public}/public/test/test_forms.php       |   0
 {htdocs => public}/public/theme/common/index.php    |   0
 {htdocs => public}/public/theme/common/nophoto.png  | Bin
 .../public/theme/common/user_anonymous.png          | Bin
 {htdocs => public}/public/theme/common/user_man.png | Bin
 .../public/theme/common/user_woman.png              | Bin
 {htdocs => public}/public/theme/index.php           |   0
 {htdocs => public}/public/websites/index.php        |   0
 {htdocs => public}/public/websites/styles.css.php   |   0
 {htdocs => public}/resource/add.php                 |   0
 {htdocs => public}/resource/card.php                |   0
 .../resource/class/dolresource.class.php            |   0
 .../resource/class/html.formresource.class.php      |   0
 {htdocs => public}/resource/class/index.html        |   0
 {htdocs => public}/resource/contact.php             |   0
 {htdocs => public}/resource/document.php            |   0
 {htdocs => public}/resource/element_resource.php    |   0
 {htdocs => public}/resource/index.html              |   0
 {htdocs => public}/resource/list.php                |   0
 {htdocs => public}/resource/note.php                |   0
 {htdocs => public}/robots.txt                       |   0
 .../societe/admin/contact_extrafields.php           |   0
 {htdocs => public}/societe/admin/societe.php        |   0
 .../societe/admin/societe_extrafields.php           |   0
 {htdocs => public}/societe/agenda.php               |   0
 {htdocs => public}/societe/ajax/company.php         |   0
 {htdocs => public}/societe/ajax/index.html          |   0
 {htdocs => public}/societe/ajaxcompanies.php        |   0
 {htdocs => public}/societe/ajaxcountries.php        |   0
 {htdocs => public}/societe/canvas/README            |   0
 .../societe/canvas/actions_card_common.class.php    |   0
 .../canvas/company/actions_card_company.class.php   |   0
 .../societe/canvas/company/index.html               |   0
 .../societe/canvas/company/tpl/card_create.tpl.php  |   0
 .../societe/canvas/company/tpl/card_edit.tpl.php    |   0
 .../societe/canvas/company/tpl/card_view.tpl.php    |   0
 .../societe/canvas/company/tpl/index.html           |   0
 {htdocs => public}/societe/canvas/index.html        |   0
 .../individual/actions_card_individual.class.php    |   0
 .../societe/canvas/individual/index.html            |   0
 .../canvas/individual/tpl/card_create.tpl.php       |   0
 .../societe/canvas/individual/tpl/card_edit.tpl.php |   0
 .../societe/canvas/individual/tpl/card_view.tpl.php |   0
 .../societe/canvas/individual/tpl/index.html        |   0
 .../societe/checkvat/checkVatPopup.php              |   0
 .../societe/checkvat/checkVatService.xml            |   0
 {htdocs => public}/societe/checkvat/index.html      |   0
 {htdocs => public}/societe/class/address.class.php  |   0
 .../societe/class/api_contacts.class.php            |   0
 .../societe/class/api_deprecated_contact.class.php  |   0
 .../class/api_deprecated_thirdparty.class.php       |   0
 .../societe/class/api_thirdparties.class.php        |   0
 {htdocs => public}/societe/class/client.class.php   |   0
 .../societe/class/companybankaccount.class.php      |   0
 {htdocs => public}/societe/class/index.html         |   0
 {htdocs => public}/societe/class/societe.class.php  |   0
 {htdocs => public}/societe/commerciaux.php          |   0
 {htdocs => public}/societe/consumption.php          |   0
 {htdocs => public}/societe/document.php             |   0
 {htdocs => public}/societe/index.php                |   0
 {htdocs => public}/societe/list.php                 |   0
 {htdocs => public}/societe/note.php                 |   0
 {htdocs => public}/societe/notify/card.php          |   0
 {htdocs => public}/societe/notify/index.php         |   0
 {htdocs => public}/societe/price.php                |   0
 {htdocs => public}/societe/project.php              |   0
 {htdocs => public}/societe/rib.php                  |   0
 {htdocs => public}/societe/soc.php                  |   0
 {htdocs => public}/societe/societecontact.php       |   0
 {htdocs => public}/societe/tpl/index.html           |   0
 .../societe/tpl/linesalesrepresentative.tpl.php     |   0
 .../admin/supplier_proposal_extrafields.php         |   0
 .../admin/supplier_proposaldet_extrafields.php      |   0
 {htdocs => public}/supplier_proposal/card.php       |   0
 .../supplier_proposal/class/index.html              |   0
 .../class/supplier_proposal.class.php               |   0
 {htdocs => public}/supplier_proposal/document.php   |   0
 {htdocs => public}/supplier_proposal/index.php      |   0
 {htdocs => public}/supplier_proposal/info.php       |   0
 {htdocs => public}/supplier_proposal/list.php       |   0
 {htdocs => public}/supplier_proposal/note.php       |   0
 {htdocs => public}/supplier_proposal/tpl/index.html |   0
 .../supplier_proposal/tpl/linkedobjectblock.tpl.php |   0
 {htdocs => public}/support/background.png           | Bin
 {htdocs => public}/support/default.css              |   0
 {htdocs => public}/support/helpcenter.png           | Bin
 {htdocs => public}/support/inc.php                  |   0
 {htdocs => public}/support/index.php                |   0
 {htdocs => public}/support/internet.png             | Bin
 {htdocs => public}/support/mail.png                 | Bin
 {htdocs => public}/support/online.php               |   0
 {htdocs => public}/support/pagemaster.png           | Bin
 {htdocs => public}/support/redstar.png              | Bin
 {htdocs => public}/support/star.png                 | Bin
 {htdocs => public}/support/who.png                  | Bin
 {htdocs => public}/theme/.gitignore                 |   0
 {htdocs => public}/theme/common/colorpicker.png     | Bin
 .../theme/common/devices/audio-card.png             | Bin
 .../theme/common/devices/audio-headset.png          | Bin
 .../theme/common/devices/audio-input-line.png       | Bin
 .../theme/common/devices/audio-input-microphone.png | Bin
 {htdocs => public}/theme/common/devices/battery.png | Bin
 .../theme/common/devices/camera-photo.png           | Bin
 .../theme/common/devices/camera-web.png             | Bin
 .../theme/common/devices/computer-laptop.png        | Bin
 .../theme/common/devices/computer.png               | Bin
 {htdocs => public}/theme/common/devices/cpu.png     | Bin
 .../theme/common/devices/drive-harddisk.png         | Bin
 .../theme/common/devices/drive-optical.png          | Bin
 .../devices/drive-removable-media-usb-pendrive.png  | Bin
 .../common/devices/drive-removable-media-usb.png    | Bin
 .../theme/common/devices/drive-removable-media.png  | Bin
 {htdocs => public}/theme/common/devices/index.html  |   0
 .../theme/common/devices/input-gaming.png           | Bin
 .../theme/common/devices/input-keyboard.png         | Bin
 .../theme/common/devices/input-mouse.png            | Bin
 .../theme/common/devices/input-tablet.png           | Bin
 .../common/devices/media-flash-memory-stick.png     | Bin
 .../theme/common/devices/media-flash-sd-mmc.png     | Bin
 .../common/devices/media-flash-smart-media.png      | Bin
 .../theme/common/devices/media-flash.png            | Bin
 .../theme/common/devices/media-floppy.png           | Bin
 .../theme/common/devices/media-optical-audio.png    | Bin
 .../theme/common/devices/media-optical-blu-ray.png  | Bin
 .../theme/common/devices/media-optical-data.png     | Bin
 .../common/devices/media-optical-dvd-video.png      | Bin
 .../theme/common/devices/media-optical-dvd.png      | Bin
 .../theme/common/devices/media-optical-mixed-cd.png | Bin
 .../common/devices/media-optical-recordable.png     | Bin
 .../theme/common/devices/media-optical-video.png    | Bin
 .../theme/common/devices/media-optical.png          | Bin
 .../theme/common/devices/media-tape.png             | Bin
 {htdocs => public}/theme/common/devices/modem.png   | Bin
 .../common/devices/multimedia-player-apple-ipod.png | Bin
 .../theme/common/devices/multimedia-player.png      | Bin
 .../theme/common/devices/network-wired.png          | Bin
 .../devices/network-wireless-connected-00.png       | Bin
 .../devices/network-wireless-connected-100.png      | Bin
 .../devices/network-wireless-connected-25.png       | Bin
 .../devices/network-wireless-connected-50.png       | Bin
 .../devices/network-wireless-connected-75.png       | Bin
 .../devices/network-wireless-disconnected.png       | Bin
 .../theme/common/devices/network-wireless.png       | Bin
 {htdocs => public}/theme/common/devices/pda.png     | Bin
 .../common/devices/phone-openmoko-freerunner.png    | Bin
 {htdocs => public}/theme/common/devices/phone.png   | Bin
 .../theme/common/devices/printer-laser.png          | Bin
 {htdocs => public}/theme/common/devices/printer.png | Bin
 {htdocs => public}/theme/common/devices/scanner.png | Bin
 .../theme/common/devices/video-display.png          | Bin
 .../theme/common/devices/video-projector.png        | Bin
 .../theme/common/devices/video-television.png       | Bin
 {htdocs => public}/theme/common/dolibarr_box.png    | Bin
 .../theme/common/dolibarr_logo_bw.png               | Bin
 {htdocs => public}/theme/common/dolistore.jpg       | Bin
 .../theme/common/emotes/face-angel.png              | Bin
 .../theme/common/emotes/face-embarrassed.png        | Bin
 .../theme/common/emotes/face-kiss.png               | Bin
 .../theme/common/emotes/face-laugh.png              | Bin
 .../theme/common/emotes/face-plain.png              | Bin
 .../theme/common/emotes/face-raspberry.png          | Bin
 {htdocs => public}/theme/common/emotes/face-sad.png | Bin
 .../theme/common/emotes/face-smile-big.png          | Bin
 .../theme/common/emotes/face-smile.png              | Bin
 .../theme/common/emotes/face-surprise.png           | Bin
 .../theme/common/emotes/face-uncertain.png          | Bin
 .../theme/common/emotes/face-wink.png               | Bin
 {htdocs => public}/theme/common/emotes/index.html   |   0
 {htdocs => public}/theme/common/flags/ad.png        | Bin
 {htdocs => public}/theme/common/flags/ae.png        | Bin
 {htdocs => public}/theme/common/flags/af.png        | Bin
 {htdocs => public}/theme/common/flags/ag.png        | Bin
 {htdocs => public}/theme/common/flags/ai.png        | Bin
 {htdocs => public}/theme/common/flags/al.png        | Bin
 {htdocs => public}/theme/common/flags/am.png        | Bin
 {htdocs => public}/theme/common/flags/an.png        | Bin
 {htdocs => public}/theme/common/flags/ao.png        | Bin
 {htdocs => public}/theme/common/flags/ar.png        | Bin
 {htdocs => public}/theme/common/flags/as.png        | Bin
 {htdocs => public}/theme/common/flags/at.png        | Bin
 {htdocs => public}/theme/common/flags/au.png        | Bin
 {htdocs => public}/theme/common/flags/aw.png        | Bin
 {htdocs => public}/theme/common/flags/ax.png        | Bin
 {htdocs => public}/theme/common/flags/az.png        | Bin
 {htdocs => public}/theme/common/flags/ba.png        | Bin
 {htdocs => public}/theme/common/flags/bb.png        | Bin
 {htdocs => public}/theme/common/flags/bd.png        | Bin
 {htdocs => public}/theme/common/flags/be.png        | Bin
 {htdocs => public}/theme/common/flags/bf.png        | Bin
 {htdocs => public}/theme/common/flags/bg.png        | Bin
 {htdocs => public}/theme/common/flags/bh.png        | Bin
 {htdocs => public}/theme/common/flags/bi.png        | Bin
 {htdocs => public}/theme/common/flags/bj.png        | Bin
 {htdocs => public}/theme/common/flags/bm.png        | Bin
 {htdocs => public}/theme/common/flags/bn.png        | Bin
 {htdocs => public}/theme/common/flags/bo.png        | Bin
 {htdocs => public}/theme/common/flags/br.png        | Bin
 {htdocs => public}/theme/common/flags/bs.png        | Bin
 {htdocs => public}/theme/common/flags/bt.png        | Bin
 {htdocs => public}/theme/common/flags/bv.png        | Bin
 {htdocs => public}/theme/common/flags/bw.png        | Bin
 {htdocs => public}/theme/common/flags/by.png        | Bin
 {htdocs => public}/theme/common/flags/bz.png        | Bin
 {htdocs => public}/theme/common/flags/ca.png        | Bin
 {htdocs => public}/theme/common/flags/catalonia.png | Bin
 {htdocs => public}/theme/common/flags/cc.png        | Bin
 {htdocs => public}/theme/common/flags/cd.png        | Bin
 {htdocs => public}/theme/common/flags/cf.png        | Bin
 {htdocs => public}/theme/common/flags/cg.png        | Bin
 {htdocs => public}/theme/common/flags/ch.png        | Bin
 {htdocs => public}/theme/common/flags/ci.png        | Bin
 {htdocs => public}/theme/common/flags/ck.png        | Bin
 {htdocs => public}/theme/common/flags/cl.png        | Bin
 {htdocs => public}/theme/common/flags/cm.png        | Bin
 {htdocs => public}/theme/common/flags/cn.png        | Bin
 {htdocs => public}/theme/common/flags/co.png        | Bin
 {htdocs => public}/theme/common/flags/cr.png        | Bin
 {htdocs => public}/theme/common/flags/cs.png        | Bin
 {htdocs => public}/theme/common/flags/cu.png        | Bin
 {htdocs => public}/theme/common/flags/cv.png        | Bin
 {htdocs => public}/theme/common/flags/cx.png        | Bin
 {htdocs => public}/theme/common/flags/cy.png        | Bin
 {htdocs => public}/theme/common/flags/cz.png        | Bin
 {htdocs => public}/theme/common/flags/de.png        | Bin
 {htdocs => public}/theme/common/flags/dj.png        | Bin
 {htdocs => public}/theme/common/flags/dk.png        | Bin
 {htdocs => public}/theme/common/flags/dm.png        | Bin
 {htdocs => public}/theme/common/flags/do.png        | Bin
 {htdocs => public}/theme/common/flags/dz.png        | Bin
 {htdocs => public}/theme/common/flags/ec.png        | Bin
 {htdocs => public}/theme/common/flags/ee.png        | Bin
 {htdocs => public}/theme/common/flags/eg.png        | Bin
 {htdocs => public}/theme/common/flags/eh.png        | Bin
 {htdocs => public}/theme/common/flags/en.png        | Bin
 {htdocs => public}/theme/common/flags/england.png   | Bin
 {htdocs => public}/theme/common/flags/er.png        | Bin
 {htdocs => public}/theme/common/flags/es.png        | Bin
 {htdocs => public}/theme/common/flags/et.png        | Bin
 {htdocs => public}/theme/common/flags/eu.png        | Bin
 {htdocs => public}/theme/common/flags/fam.png       | Bin
 {htdocs => public}/theme/common/flags/fi.png        | Bin
 {htdocs => public}/theme/common/flags/fj.png        | Bin
 {htdocs => public}/theme/common/flags/fk.png        | Bin
 {htdocs => public}/theme/common/flags/fm.png        | Bin
 {htdocs => public}/theme/common/flags/fo.png        | Bin
 {htdocs => public}/theme/common/flags/fr.png        | Bin
 {htdocs => public}/theme/common/flags/ga.png        | Bin
 {htdocs => public}/theme/common/flags/gb.png        | Bin
 {htdocs => public}/theme/common/flags/gd.png        | Bin
 {htdocs => public}/theme/common/flags/ge.png        | Bin
 {htdocs => public}/theme/common/flags/gf.png        | Bin
 {htdocs => public}/theme/common/flags/gg.png        | Bin
 {htdocs => public}/theme/common/flags/gh.png        | Bin
 {htdocs => public}/theme/common/flags/gi.png        | Bin
 {htdocs => public}/theme/common/flags/gl.png        | Bin
 {htdocs => public}/theme/common/flags/gm.png        | Bin
 {htdocs => public}/theme/common/flags/gn.png        | Bin
 {htdocs => public}/theme/common/flags/gp.png        | Bin
 {htdocs => public}/theme/common/flags/gq.png        | Bin
 {htdocs => public}/theme/common/flags/gr.png        | Bin
 {htdocs => public}/theme/common/flags/gs.png        | Bin
 {htdocs => public}/theme/common/flags/gt.png        | Bin
 {htdocs => public}/theme/common/flags/gu.png        | Bin
 {htdocs => public}/theme/common/flags/gw.png        | Bin
 {htdocs => public}/theme/common/flags/gy.png        | Bin
 {htdocs => public}/theme/common/flags/hk.png        | Bin
 {htdocs => public}/theme/common/flags/hm.png        | Bin
 {htdocs => public}/theme/common/flags/hn.png        | Bin
 {htdocs => public}/theme/common/flags/hr.png        | Bin
 {htdocs => public}/theme/common/flags/ht.png        | Bin
 {htdocs => public}/theme/common/flags/hu.png        | Bin
 {htdocs => public}/theme/common/flags/id.png        | Bin
 {htdocs => public}/theme/common/flags/ie.png        | Bin
 {htdocs => public}/theme/common/flags/il.png        | Bin
 {htdocs => public}/theme/common/flags/in.png        | Bin
 {htdocs => public}/theme/common/flags/index.html    |   0
 {htdocs => public}/theme/common/flags/int.png       | Bin
 {htdocs => public}/theme/common/flags/io.png        | Bin
 {htdocs => public}/theme/common/flags/iq.png        | Bin
 {htdocs => public}/theme/common/flags/ir.png        | Bin
 {htdocs => public}/theme/common/flags/is.png        | Bin
 {htdocs => public}/theme/common/flags/it.png        | Bin
 {htdocs => public}/theme/common/flags/jm.png        | Bin
 {htdocs => public}/theme/common/flags/jo.png        | Bin
 {htdocs => public}/theme/common/flags/jp.png        | Bin
 {htdocs => public}/theme/common/flags/ke.png        | Bin
 {htdocs => public}/theme/common/flags/kg.png        | Bin
 {htdocs => public}/theme/common/flags/kh.png        | Bin
 {htdocs => public}/theme/common/flags/ki.png        | Bin
 {htdocs => public}/theme/common/flags/km.png        | Bin
 {htdocs => public}/theme/common/flags/kn.png        | Bin
 {htdocs => public}/theme/common/flags/kp.png        | Bin
 {htdocs => public}/theme/common/flags/kr.png        | Bin
 {htdocs => public}/theme/common/flags/kw.png        | Bin
 {htdocs => public}/theme/common/flags/ky.png        | Bin
 {htdocs => public}/theme/common/flags/kz.png        | Bin
 {htdocs => public}/theme/common/flags/la.png        | Bin
 {htdocs => public}/theme/common/flags/lb.png        | Bin
 {htdocs => public}/theme/common/flags/lc.png        | Bin
 {htdocs => public}/theme/common/flags/li.png        | Bin
 {htdocs => public}/theme/common/flags/lk.png        | Bin
 {htdocs => public}/theme/common/flags/lr.png        | Bin
 {htdocs => public}/theme/common/flags/ls.png        | Bin
 {htdocs => public}/theme/common/flags/lt.png        | Bin
 {htdocs => public}/theme/common/flags/lu.png        | Bin
 {htdocs => public}/theme/common/flags/lv.png        | Bin
 {htdocs => public}/theme/common/flags/ly.png        | Bin
 {htdocs => public}/theme/common/flags/ma.png        | Bin
 {htdocs => public}/theme/common/flags/mc.png        | Bin
 {htdocs => public}/theme/common/flags/md.png        | Bin
 {htdocs => public}/theme/common/flags/me.png        | Bin
 {htdocs => public}/theme/common/flags/mg.png        | Bin
 {htdocs => public}/theme/common/flags/mh.png        | Bin
 {htdocs => public}/theme/common/flags/mk.png        | Bin
 {htdocs => public}/theme/common/flags/ml.png        | Bin
 {htdocs => public}/theme/common/flags/mm.png        | Bin
 {htdocs => public}/theme/common/flags/mn.png        | Bin
 {htdocs => public}/theme/common/flags/mo.png        | Bin
 {htdocs => public}/theme/common/flags/mp.png        | Bin
 {htdocs => public}/theme/common/flags/mq.png        | Bin
 {htdocs => public}/theme/common/flags/mr.png        | Bin
 {htdocs => public}/theme/common/flags/ms.png        | Bin
 {htdocs => public}/theme/common/flags/mt.png        | Bin
 {htdocs => public}/theme/common/flags/mu.png        | Bin
 {htdocs => public}/theme/common/flags/mv.png        | Bin
 {htdocs => public}/theme/common/flags/mw.png        | Bin
 {htdocs => public}/theme/common/flags/mx.png        | Bin
 {htdocs => public}/theme/common/flags/my.png        | Bin
 {htdocs => public}/theme/common/flags/mz.png        | Bin
 {htdocs => public}/theme/common/flags/na.png        | Bin
 {htdocs => public}/theme/common/flags/nc.png        | Bin
 {htdocs => public}/theme/common/flags/ne.png        | Bin
 {htdocs => public}/theme/common/flags/nf.png        | Bin
 {htdocs => public}/theme/common/flags/ng.png        | Bin
 {htdocs => public}/theme/common/flags/ni.png        | Bin
 {htdocs => public}/theme/common/flags/nl.png        | Bin
 {htdocs => public}/theme/common/flags/no.png        | Bin
 {htdocs => public}/theme/common/flags/np.png        | Bin
 {htdocs => public}/theme/common/flags/nr.png        | Bin
 {htdocs => public}/theme/common/flags/nu.png        | Bin
 {htdocs => public}/theme/common/flags/nz.png        | Bin
 {htdocs => public}/theme/common/flags/om.png        | Bin
 {htdocs => public}/theme/common/flags/pa.png        | Bin
 {htdocs => public}/theme/common/flags/pe.png        | Bin
 {htdocs => public}/theme/common/flags/pf.png        | Bin
 {htdocs => public}/theme/common/flags/pg.png        | Bin
 {htdocs => public}/theme/common/flags/ph.png        | Bin
 {htdocs => public}/theme/common/flags/pk.png        | Bin
 {htdocs => public}/theme/common/flags/pl.png        | Bin
 {htdocs => public}/theme/common/flags/pm.png        | Bin
 {htdocs => public}/theme/common/flags/pn.png        | Bin
 {htdocs => public}/theme/common/flags/pr.png        | Bin
 {htdocs => public}/theme/common/flags/ps.png        | Bin
 {htdocs => public}/theme/common/flags/pt.png        | Bin
 {htdocs => public}/theme/common/flags/pw.png        | Bin
 {htdocs => public}/theme/common/flags/py.png        | Bin
 {htdocs => public}/theme/common/flags/qa.png        | Bin
 {htdocs => public}/theme/common/flags/re.png        | Bin
 {htdocs => public}/theme/common/flags/ro.png        | Bin
 {htdocs => public}/theme/common/flags/rs.png        | Bin
 {htdocs => public}/theme/common/flags/ru.png        | Bin
 {htdocs => public}/theme/common/flags/rw.png        | Bin
 {htdocs => public}/theme/common/flags/sa.png        | Bin
 {htdocs => public}/theme/common/flags/sb.png        | Bin
 {htdocs => public}/theme/common/flags/sc.png        | Bin
 {htdocs => public}/theme/common/flags/scotland.png  | Bin
 {htdocs => public}/theme/common/flags/sd.png        | Bin
 {htdocs => public}/theme/common/flags/se.png        | Bin
 {htdocs => public}/theme/common/flags/sg.png        | Bin
 {htdocs => public}/theme/common/flags/sh.png        | Bin
 {htdocs => public}/theme/common/flags/si.png        | Bin
 {htdocs => public}/theme/common/flags/sj.png        | Bin
 {htdocs => public}/theme/common/flags/sk.png        | Bin
 {htdocs => public}/theme/common/flags/sl.png        | Bin
 {htdocs => public}/theme/common/flags/sm.png        | Bin
 {htdocs => public}/theme/common/flags/sn.png        | Bin
 {htdocs => public}/theme/common/flags/so.png        | Bin
 {htdocs => public}/theme/common/flags/sr.png        | Bin
 {htdocs => public}/theme/common/flags/st.png        | Bin
 {htdocs => public}/theme/common/flags/sv.png        | Bin
 {htdocs => public}/theme/common/flags/sy.png        | Bin
 {htdocs => public}/theme/common/flags/sz.png        | Bin
 {htdocs => public}/theme/common/flags/tc.png        | Bin
 {htdocs => public}/theme/common/flags/td.png        | Bin
 {htdocs => public}/theme/common/flags/tf.png        | Bin
 {htdocs => public}/theme/common/flags/tg.png        | Bin
 {htdocs => public}/theme/common/flags/th.png        | Bin
 {htdocs => public}/theme/common/flags/tj.png        | Bin
 {htdocs => public}/theme/common/flags/tk.png        | Bin
 {htdocs => public}/theme/common/flags/tl.png        | Bin
 {htdocs => public}/theme/common/flags/tm.png        | Bin
 {htdocs => public}/theme/common/flags/tn.png        | Bin
 {htdocs => public}/theme/common/flags/to.png        | Bin
 {htdocs => public}/theme/common/flags/tr.png        | Bin
 {htdocs => public}/theme/common/flags/trans.png     | Bin
 {htdocs => public}/theme/common/flags/tt.png        | Bin
 {htdocs => public}/theme/common/flags/tv.png        | Bin
 {htdocs => public}/theme/common/flags/tw.png        | Bin
 {htdocs => public}/theme/common/flags/tz.png        | Bin
 {htdocs => public}/theme/common/flags/ua.png        | Bin
 {htdocs => public}/theme/common/flags/ug.png        | Bin
 {htdocs => public}/theme/common/flags/uk.png        | Bin
 {htdocs => public}/theme/common/flags/um.png        | Bin
 {htdocs => public}/theme/common/flags/us.png        | Bin
 {htdocs => public}/theme/common/flags/uy.png        | Bin
 {htdocs => public}/theme/common/flags/uz.png        | Bin
 {htdocs => public}/theme/common/flags/va.png        | Bin
 {htdocs => public}/theme/common/flags/vc.png        | Bin
 {htdocs => public}/theme/common/flags/ve.png        | Bin
 {htdocs => public}/theme/common/flags/vg.png        | Bin
 {htdocs => public}/theme/common/flags/vi.png        | Bin
 {htdocs => public}/theme/common/flags/vn.png        | Bin
 {htdocs => public}/theme/common/flags/vu.png        | Bin
 {htdocs => public}/theme/common/flags/wales.png     | Bin
 {htdocs => public}/theme/common/flags/wf.png        | Bin
 {htdocs => public}/theme/common/flags/ws.png        | Bin
 {htdocs => public}/theme/common/flags/ye.png        | Bin
 {htdocs => public}/theme/common/flags/yt.png        | Bin
 {htdocs => public}/theme/common/flags/za.png        | Bin
 {htdocs => public}/theme/common/flags/zm.png        | Bin
 {htdocs => public}/theme/common/flags/zw.png        | Bin
 {htdocs => public}/theme/common/folder-new.png      | Bin
 {htdocs => public}/theme/common/gmap.png            | Bin
 {htdocs => public}/theme/common/help.png            | Bin
 {htdocs => public}/theme/common/ical.gif            | Bin
 {htdocs => public}/theme/common/index.html          |   0
 {htdocs => public}/theme/common/information.png     | Bin
 {htdocs => public}/theme/common/logo_cerfa.png      | Bin
 {htdocs => public}/theme/common/mime/archive.png    | Bin
 {htdocs => public}/theme/common/mime/audio.png      | Bin
 {htdocs => public}/theme/common/mime/css.png        | Bin
 {htdocs => public}/theme/common/mime/doc.png        | Bin
 {htdocs => public}/theme/common/mime/dotnet.png     | Bin
 {htdocs => public}/theme/common/mime/encrypt.png    | Bin
 {htdocs => public}/theme/common/mime/error.png      | Bin
 {htdocs => public}/theme/common/mime/flash.png      | Bin
 {htdocs => public}/theme/common/mime/glasses.png    | Bin
 {htdocs => public}/theme/common/mime/html.png       | Bin
 {htdocs => public}/theme/common/mime/image.png      | Bin
 {htdocs => public}/theme/common/mime/index.html     |   0
 {htdocs => public}/theme/common/mime/jnlp.png       | Bin
 {htdocs => public}/theme/common/mime/jscript.png    | Bin
 {htdocs => public}/theme/common/mime/library.png    | Bin
 {htdocs => public}/theme/common/mime/lit.png        | Bin
 {htdocs => public}/theme/common/mime/mdb.png        | Bin
 .../theme/common/mime/notavailable.png              | Bin
 {htdocs => public}/theme/common/mime/ooffice.png    | Bin
 {htdocs => public}/theme/common/mime/other.png      | Bin
 {htdocs => public}/theme/common/mime/page.png       | Bin
 {htdocs => public}/theme/common/mime/pdf.png        | Bin
 {htdocs => public}/theme/common/mime/php.png        | Bin
 {htdocs => public}/theme/common/mime/pl.png         | Bin
 {htdocs => public}/theme/common/mime/ppt.png        | Bin
 {htdocs => public}/theme/common/mime/readme.txt     |   0
 {htdocs => public}/theme/common/mime/rss.png        | Bin
 {htdocs => public}/theme/common/mime/script.png     | Bin
 {htdocs => public}/theme/common/mime/svg.png        | Bin
 {htdocs => public}/theme/common/mime/text.png       | Bin
 {htdocs => public}/theme/common/mime/ttf.png        | Bin
 {htdocs => public}/theme/common/mime/unknown.png    | Bin
 {htdocs => public}/theme/common/mime/video.png      | Bin
 {htdocs => public}/theme/common/mime/xls.png        | Bin
 {htdocs => public}/theme/common/paypal.png          | Bin
 {htdocs => public}/theme/common/redstar.png         | Bin
 {htdocs => public}/theme/common/rss.gif             | Bin
 .../theme/common/skype_callbutton.png               | Bin
 .../theme/common/skype_chatbutton.png               | Bin
 {htdocs => public}/theme/common/star.png            | Bin
 .../theme/common/transform-crop-and-resize.png      | Bin
 {htdocs => public}/theme/common/transparent.png     | Bin
 {htdocs => public}/theme/common/treemenu/base.gif   | Bin
 {htdocs => public}/theme/common/treemenu/branch.gif | Bin
 .../theme/common/treemenu/branchbottom.gif          | Bin
 .../theme/common/treemenu/branchtop.gif             | Bin
 .../theme/common/treemenu/folder-expanded.gif       | Bin
 {htdocs => public}/theme/common/treemenu/folder.gif | Bin
 .../theme/common/treemenu/folder2-expanded.png      | Bin
 .../theme/common/treemenu/folder2.png               | Bin
 .../theme/common/treemenu/imgfolder.gif             | Bin
 {htdocs => public}/theme/common/treemenu/index.html |   0
 {htdocs => public}/theme/common/treemenu/line.gif   | Bin
 .../theme/common/treemenu/linebottom.gif            | Bin
 {htdocs => public}/theme/common/treemenu/minus.gif  | Bin
 .../theme/common/treemenu/minusbottom.gif           | Bin
 .../theme/common/treemenu/minustop.gif              | Bin
 .../theme/common/treemenu/minustop2.gif             | Bin
 .../theme/common/treemenu/minustop3.gif             | Bin
 {htdocs => public}/theme/common/treemenu/page.gif   | Bin
 {htdocs => public}/theme/common/treemenu/plus.gif   | Bin
 .../theme/common/treemenu/plusbottom.gif            | Bin
 .../theme/common/treemenu/plustop.gif               | Bin
 .../theme/common/treemenu/plustop2.gif              | Bin
 .../theme/common/treemenu/plustop3.gif              | Bin
 {htdocs => public}/theme/common/treemenu/trash.gif  | Bin
 {htdocs => public}/theme/common/vcal.gif            | Bin
 {htdocs => public}/theme/common/view-refresh.png    | Bin
 {htdocs => public}/theme/dolibarr.png               | Bin
 {htdocs => public}/theme/dolibarr_logo.png          | Bin
 .../theme/dolibarr_preferred_partner_int.png        | Bin
 {htdocs => public}/theme/doliforge_logo.png         | Bin
 {htdocs => public}/theme/dolistore_logo.png         | Bin
 {htdocs => public}/theme/eldy/.gitignore            |   0
 {htdocs => public}/theme/eldy/AUTHOR                |   0
 {htdocs => public}/theme/eldy/ckeditor/config.js    |   0
 {htdocs => public}/theme/eldy/ckeditor/index.html   |   0
 {htdocs => public}/theme/eldy/graph-color.php       |   0
 {htdocs => public}/theme/eldy/img/1downarrow.png    | Bin
 .../theme/eldy/img/1downarrow_selected.png          | Bin
 {htdocs => public}/theme/eldy/img/1leftarrow.png    | Bin
 .../theme/eldy/img/1leftarrow_selected.png          | Bin
 {htdocs => public}/theme/eldy/img/1rightarrow.png   | Bin
 .../theme/eldy/img/1rightarrow_selected.png         | Bin
 {htdocs => public}/theme/eldy/img/1uparrow.png      | Bin
 .../theme/eldy/img/1uparrow_selected.png            | Bin
 {htdocs => public}/theme/eldy/img/addfile.png       | Bin
 {htdocs => public}/theme/eldy/img/background.png    | Bin
 .../theme/eldy/img/bg-bas-rubrique.png              | Bin
 {htdocs => public}/theme/eldy/img/bg-rubrique.png   | Bin
 .../theme/eldy/img/bg-titre-rubrique.png            | Bin
 {htdocs => public}/theme/eldy/img/button_bg.png     | Bin
 {htdocs => public}/theme/eldy/img/button_edit.png   | Bin
 {htdocs => public}/theme/eldy/img/calc.png          | Bin
 {htdocs => public}/theme/eldy/img/calendar.png      | Bin
 {htdocs => public}/theme/eldy/img/call.png          | Bin
 {htdocs => public}/theme/eldy/img/call_out.png      | Bin
 {htdocs => public}/theme/eldy/img/close.png         | Bin
 {htdocs => public}/theme/eldy/img/close_title.png   | Bin
 {htdocs => public}/theme/eldy/img/credit_card.png   | Bin
 {htdocs => public}/theme/eldy/img/delete.png        | Bin
 {htdocs => public}/theme/eldy/img/detail.png        | Bin
 {htdocs => public}/theme/eldy/img/disable.png       | Bin
 {htdocs => public}/theme/eldy/img/edit.png          | Bin
 {htdocs => public}/theme/eldy/img/edit_add.png      | Bin
 {htdocs => public}/theme/eldy/img/edit_remove.png   | Bin
 {htdocs => public}/theme/eldy/img/editdelete.png    | Bin
 {htdocs => public}/theme/eldy/img/error.png         | Bin
 {htdocs => public}/theme/eldy/img/external.png      | Bin
 {htdocs => public}/theme/eldy/img/favicon.ico       | Bin
 {htdocs => public}/theme/eldy/img/file.png          | Bin
 {htdocs => public}/theme/eldy/img/filenew.png       | Bin
 {htdocs => public}/theme/eldy/img/filter.png        | Bin
 {htdocs => public}/theme/eldy/img/folder-open.png   | Bin
 {htdocs => public}/theme/eldy/img/folder.png        | Bin
 {htdocs => public}/theme/eldy/img/gradient.gif      | Bin
 {htdocs => public}/theme/eldy/img/grip.png          | Bin
 {htdocs => public}/theme/eldy/img/grip_title.png    | Bin
 {htdocs => public}/theme/eldy/img/headbg.jpg        | Bin
 {htdocs => public}/theme/eldy/img/headbg2.jpg       | Bin
 {htdocs => public}/theme/eldy/img/help.png          | Bin
 {htdocs => public}/theme/eldy/img/helpdoc.png       | Bin
 {htdocs => public}/theme/eldy/img/helpdoc_top.png   | Bin
 {htdocs => public}/theme/eldy/img/high.png          | Bin
 {htdocs => public}/theme/eldy/img/history.png       | Bin
 {htdocs => public}/theme/eldy/img/index.html        |   0
 {htdocs => public}/theme/eldy/img/info.png          | Bin
 {htdocs => public}/theme/eldy/img/info_black.png    | Bin
 {htdocs => public}/theme/eldy/img/list.png          | Bin
 {htdocs => public}/theme/eldy/img/liste_titre.png   | Bin
 {htdocs => public}/theme/eldy/img/liste_titre2.png  | Bin
 {htdocs => public}/theme/eldy/img/listlight.png     | Bin
 {htdocs => public}/theme/eldy/img/lock.png          | Bin
 .../theme/eldy/img/login_background.png             | Bin
 {htdocs => public}/theme/eldy/img/logo_setup.svg    |   0
 {htdocs => public}/theme/eldy/img/logout.png        | Bin
 {htdocs => public}/theme/eldy/img/logout_top.png    | Bin
 {htdocs => public}/theme/eldy/img/menus/README.md   |   0
 {htdocs => public}/theme/eldy/img/menus/agenda.png  | Bin
 .../theme/eldy/img/menus/agenda_over.png            | Bin
 {htdocs => public}/theme/eldy/img/menus/bank.png    | Bin
 .../theme/eldy/img/menus/bank_over.png              | Bin
 {htdocs => public}/theme/eldy/img/menus/chart.png   | Bin
 .../theme/eldy/img/menus/commercial.png             | Bin
 .../theme/eldy/img/menus/commercial_over.png        | Bin
 {htdocs => public}/theme/eldy/img/menus/company.png | Bin
 .../theme/eldy/img/menus/company_over.png           | Bin
 {htdocs => public}/theme/eldy/img/menus/ecm.png     | Bin
 .../theme/eldy/img/menus/ecm_over.png               | Bin
 .../theme/eldy/img/menus/externalsite.png           | Bin
 .../theme/eldy/img/menus/externalsite_over.png      | Bin
 {htdocs => public}/theme/eldy/img/menus/ftp.png     | Bin
 .../theme/eldy/img/menus/ftp_over.png               | Bin
 .../theme/eldy/img/menus/generic1.png               | Bin
 .../theme/eldy/img/menus/generic1_over.png          | Bin
 .../theme/eldy/img/menus/generic2.png               | Bin
 .../theme/eldy/img/menus/generic2_over.png          | Bin
 .../theme/eldy/img/menus/generic3.png               | Bin
 .../theme/eldy/img/menus/generic3_over.png          | Bin
 .../theme/eldy/img/menus/generic4.png               | Bin
 .../theme/eldy/img/menus/generic4_over.png          | Bin
 {htdocs => public}/theme/eldy/img/menus/globe.png   | Bin
 .../theme/eldy/img/menus/globe_over.png             | Bin
 {htdocs => public}/theme/eldy/img/menus/holiday.png | Bin
 {htdocs => public}/theme/eldy/img/menus/home.png    | Bin
 .../theme/eldy/img/menus/home_over.png              | Bin
 {htdocs => public}/theme/eldy/img/menus/index.html  |   0
 {htdocs => public}/theme/eldy/img/menus/mail.png    | Bin
 .../theme/eldy/img/menus/mail_over.png              | Bin
 {htdocs => public}/theme/eldy/img/menus/members.png | Bin
 .../theme/eldy/img/menus/members_over.png           | Bin
 {htdocs => public}/theme/eldy/img/menus/menu.png    | Bin
 {htdocs => public}/theme/eldy/img/menus/money.png   | Bin
 .../theme/eldy/img/menus/money_over.png             | Bin
 .../theme/eldy/img/menus/pointofsale.png            | Bin
 .../theme/eldy/img/menus/pointofsale_over.png       | Bin
 .../theme/eldy/img/menus/products.png               | Bin
 .../theme/eldy/img/menus/products_over.png          | Bin
 {htdocs => public}/theme/eldy/img/menus/project.png | Bin
 .../theme/eldy/img/menus/project_over.png           | Bin
 {htdocs => public}/theme/eldy/img/menus/shop.png    | Bin
 .../theme/eldy/img/menus/shop_over.png              | Bin
 {htdocs => public}/theme/eldy/img/menus/tools.png   | Bin
 .../theme/eldy/img/menus/tools_over.png             | Bin
 .../theme/eldy/img/menus_black/agenda.png           | Bin
 .../theme/eldy/img/menus_black/agenda_over.png      | Bin
 .../theme/eldy/img/menus_black/bank.png             | Bin
 .../theme/eldy/img/menus_black/bank_over.png        | Bin
 .../theme/eldy/img/menus_black/commercial.png       | Bin
 .../theme/eldy/img/menus_black/commercial_over.png  | Bin
 .../theme/eldy/img/menus_black/company.png          | Bin
 .../theme/eldy/img/menus_black/company_over.png     | Bin
 .../theme/eldy/img/menus_black/ecm.png              | Bin
 .../theme/eldy/img/menus_black/ecm_over.png         | Bin
 .../theme/eldy/img/menus_black/externalsite.png     | Bin
 .../eldy/img/menus_black/externalsite_over.png      | Bin
 .../theme/eldy/img/menus_black/ftp.png              | Bin
 .../theme/eldy/img/menus_black/ftp_over.png         | Bin
 .../theme/eldy/img/menus_black/generic1.png         | Bin
 .../theme/eldy/img/menus_black/generic1_over.png    | Bin
 .../theme/eldy/img/menus_black/generic2.png         | Bin
 .../theme/eldy/img/menus_black/generic2_over.png    | Bin
 .../theme/eldy/img/menus_black/generic3.png         | Bin
 .../theme/eldy/img/menus_black/generic3_over.png    | Bin
 .../theme/eldy/img/menus_black/generic4.png         | Bin
 .../theme/eldy/img/menus_black/generic4_over.png    | Bin
 .../theme/eldy/img/menus_black/globe.png            | Bin
 .../theme/eldy/img/menus_black/globe_over.png       | Bin
 .../theme/eldy/img/menus_black/holiday.png          | Bin
 .../theme/eldy/img/menus_black/home.png             | Bin
 .../theme/eldy/img/menus_black/home_over.png        | Bin
 .../theme/eldy/img/menus_black/mail.png             | Bin
 .../theme/eldy/img/menus_black/mail_over.png        | Bin
 .../theme/eldy/img/menus_black/members.png          | Bin
 .../theme/eldy/img/menus_black/members_over.png     | Bin
 .../theme/eldy/img/menus_black/menu.png             | Bin
 .../theme/eldy/img/menus_black/money.png            | Bin
 .../theme/eldy/img/menus_black/money_over.png       | Bin
 .../theme/eldy/img/menus_black/pointofsale.png      | Bin
 .../theme/eldy/img/menus_black/pointofsale_over.png | Bin
 .../theme/eldy/img/menus_black/products.png         | Bin
 .../theme/eldy/img/menus_black/products_over.png    | Bin
 .../theme/eldy/img/menus_black/project.png          | Bin
 .../theme/eldy/img/menus_black/project_over.png     | Bin
 .../theme/eldy/img/menus_black/shop.png             | Bin
 .../theme/eldy/img/menus_black/shop_over.png        | Bin
 .../theme/eldy/img/menus_black/tools.png            | Bin
 .../theme/eldy/img/menus_black/tools_over.png       | Bin
 {htdocs => public}/theme/eldy/img/menutab-r.png     | Bin
 {htdocs => public}/theme/eldy/img/nav-overlay.png   | Bin
 {htdocs => public}/theme/eldy/img/nav-overlay3.png  | Bin
 {htdocs => public}/theme/eldy/img/next.png          | Bin
 {htdocs => public}/theme/eldy/img/nographyet.svg    |   0
 .../theme/eldy/img/object_account.png               | Bin
 .../theme/eldy/img/object_accounting.png            | Bin
 {htdocs => public}/theme/eldy/img/object_action.png | Bin
 .../theme/eldy/img/object_address.png               | Bin
 .../theme/eldy/img/object_barcode.png               | Bin
 {htdocs => public}/theme/eldy/img/object_bill.png   | Bin
 {htdocs => public}/theme/eldy/img/object_billa.png  | Bin
 {htdocs => public}/theme/eldy/img/object_billd.png  | Bin
 {htdocs => public}/theme/eldy/img/object_billr.png  | Bin
 {htdocs => public}/theme/eldy/img/object_book.png   | Bin
 .../theme/eldy/img/object_bookmark.png              | Bin
 .../theme/eldy/img/object_building.png              | Bin
 .../theme/eldy/img/object_calendar.png              | Bin
 .../theme/eldy/img/object_calendarday.png           | Bin
 .../theme/eldy/img/object_calendargantt.png         | Bin
 .../theme/eldy/img/object_calendarpertype.png       | Bin
 .../theme/eldy/img/object_calendarperuser.png       | Bin
 .../theme/eldy/img/object_calendarweek.png          | Bin
 .../theme/eldy/img/object_category-expanded.png     | Bin
 .../theme/eldy/img/object_category.png              | Bin
 .../theme/eldy/img/object_commercial.png            | Bin
 .../theme/eldy/img/object_company.png               | Bin
 .../theme/eldy/img/object_contact.png               | Bin
 .../theme/eldy/img/object_contract.png              | Bin
 {htdocs => public}/theme/eldy/img/object_cron.png   | Bin
 {htdocs => public}/theme/eldy/img/object_dir.png    | Bin
 {htdocs => public}/theme/eldy/img/object_email.png  | Bin
 {htdocs => public}/theme/eldy/img/object_energy.png | Bin
 .../theme/eldy/img/object_generic.png               | Bin
 {htdocs => public}/theme/eldy/img/object_globe.png  | Bin
 .../theme/eldy/img/object_gravatar.png              | Bin
 {htdocs => public}/theme/eldy/img/object_group.png  | Bin
 .../theme/eldy/img/object_holiday.png               | Bin
 .../theme/eldy/img/object_intervention.png          | Bin
 .../theme/eldy/img/object_invoice.png               | Bin
 {htdocs => public}/theme/eldy/img/object_label.png  | Bin
 {htdocs => public}/theme/eldy/img/object_list.png   | Bin
 {htdocs => public}/theme/eldy/img/object_margin.png | Bin
 .../theme/eldy/img/object_multicurrency.png         | Bin
 .../theme/eldy/img/object_opensurvey.png            | Bin
 {htdocs => public}/theme/eldy/img/object_order.png  | Bin
 .../theme/eldy/img/object_payment.png               | Bin
 .../theme/eldy/img/object_phoning.png               | Bin
 .../theme/eldy/img/object_phoning_fax.png           | Bin
 .../theme/eldy/img/object_printer.png               | Bin
 .../theme/eldy/img/object_product.png               | Bin
 .../theme/eldy/img/object_project.png               | Bin
 .../theme/eldy/img/object_projectpub.png            | Bin
 .../theme/eldy/img/object_projecttask.png           | Bin
 {htdocs => public}/theme/eldy/img/object_propal.png | Bin
 {htdocs => public}/theme/eldy/img/object_reduc.png  | Bin
 .../theme/eldy/img/object_resource.png              | Bin
 {htdocs => public}/theme/eldy/img/object_rss.png    | Bin
 .../theme/eldy/img/object_sending.png               | Bin
 .../theme/eldy/img/object_service.png               | Bin
 {htdocs => public}/theme/eldy/img/object_skype.png  | Bin
 {htdocs => public}/theme/eldy/img/object_stock.png  | Bin
 .../theme/eldy/img/object_supplier_proposal.png     | Bin
 {htdocs => public}/theme/eldy/img/object_task.png   | Bin
 .../theme/eldy/img/object_task_time.png             | Bin
 {htdocs => public}/theme/eldy/img/object_tax.png    | Bin
 .../theme/eldy/img/object_technic.png               | Bin
 {htdocs => public}/theme/eldy/img/object_trip.png   | Bin
 {htdocs => public}/theme/eldy/img/object_user.png   | Bin
 {htdocs => public}/theme/eldy/img/off.png           | Bin
 {htdocs => public}/theme/eldy/img/on.png            | Bin
 {htdocs => public}/theme/eldy/img/pdf2.png          | Bin
 {htdocs => public}/theme/eldy/img/pdf3.png          | Bin
 {htdocs => public}/theme/eldy/img/play.png          | Bin
 {htdocs => public}/theme/eldy/img/playdisabled.png  | Bin
 {htdocs => public}/theme/eldy/img/preview.png       | Bin
 {htdocs => public}/theme/eldy/img/preview_ext.png   | Bin
 {htdocs => public}/theme/eldy/img/previous.png      | Bin
 {htdocs => public}/theme/eldy/img/printer.png       | Bin
 {htdocs => public}/theme/eldy/img/printer_top.png   | Bin
 {htdocs => public}/theme/eldy/img/puce.png          | Bin
 {htdocs => public}/theme/eldy/img/recent.png        | Bin
 {htdocs => public}/theme/eldy/img/redstar.png       | Bin
 {htdocs => public}/theme/eldy/img/refresh.png       | Bin
 {htdocs => public}/theme/eldy/img/reload.png        | Bin
 {htdocs => public}/theme/eldy/img/rightarrow.png    | Bin
 {htdocs => public}/theme/eldy/img/search.png        | Bin
 {htdocs => public}/theme/eldy/img/searchclear.png   | Bin
 {htdocs => public}/theme/eldy/img/setup.png         | Bin
 {htdocs => public}/theme/eldy/img/sort_asc.png      | Bin
 .../theme/eldy/img/sort_asc_disabled.png            | Bin
 {htdocs => public}/theme/eldy/img/sort_desc.png     | Bin
 .../theme/eldy/img/sort_desc_disabled.png           | Bin
 {htdocs => public}/theme/eldy/img/split.png         | Bin
 {htdocs => public}/theme/eldy/img/star.png          | Bin
 {htdocs => public}/theme/eldy/img/stats.png         | Bin
 {htdocs => public}/theme/eldy/img/statut0.png       | Bin
 {htdocs => public}/theme/eldy/img/statut0_40x40.png | Bin
 {htdocs => public}/theme/eldy/img/statut1.png       | Bin
 {htdocs => public}/theme/eldy/img/statut1_40x40.png | Bin
 {htdocs => public}/theme/eldy/img/statut3.png       | Bin
 {htdocs => public}/theme/eldy/img/statut3_40x40.png | Bin
 {htdocs => public}/theme/eldy/img/statut4.png       | Bin
 {htdocs => public}/theme/eldy/img/statut4_40x40.png | Bin
 {htdocs => public}/theme/eldy/img/statut5.png       | Bin
 {htdocs => public}/theme/eldy/img/statut5_40x40.png | Bin
 {htdocs => public}/theme/eldy/img/statut6.png       | Bin
 {htdocs => public}/theme/eldy/img/statut6_40x40.png | Bin
 {htdocs => public}/theme/eldy/img/statut7.png       | Bin
 {htdocs => public}/theme/eldy/img/statut7_40x40.png | Bin
 {htdocs => public}/theme/eldy/img/statut8.png       | Bin
 {htdocs => public}/theme/eldy/img/statut8_40x40.png | Bin
 {htdocs => public}/theme/eldy/img/statut9.png       | Bin
 {htdocs => public}/theme/eldy/img/statut9_40x40.png | Bin
 {htdocs => public}/theme/eldy/img/stcomm-1.png      | Bin
 {htdocs => public}/theme/eldy/img/stcomm0.png       | Bin
 {htdocs => public}/theme/eldy/img/stcomm1.png       | Bin
 {htdocs => public}/theme/eldy/img/stcomm2.png       | Bin
 {htdocs => public}/theme/eldy/img/stcomm3.png       | Bin
 {htdocs => public}/theme/eldy/img/stcomm4.png       | Bin
 {htdocs => public}/theme/eldy/img/switch_off.png    | Bin
 {htdocs => public}/theme/eldy/img/switch_on.png     | Bin
 .../theme/eldy/img/tab_background.png               | Bin
 {htdocs => public}/theme/eldy/img/tick.png          | Bin
 {htdocs => public}/theme/eldy/img/title.gif         | Bin
 {htdocs => public}/theme/eldy/img/title.png         | Bin
 .../theme/eldy/img/title_accountancy.png            | Bin
 {htdocs => public}/theme/eldy/img/title_agenda.png  | Bin
 {htdocs => public}/theme/eldy/img/title_bank.png    | Bin
 .../theme/eldy/img/title_commercial.png             | Bin
 .../theme/eldy/img/title_companies.png              | Bin
 {htdocs => public}/theme/eldy/img/title_generic.png | Bin
 {htdocs => public}/theme/eldy/img/title_home.png    | Bin
 {htdocs => public}/theme/eldy/img/title_hrm.png     | Bin
 .../theme/eldy/img/title_products.png               | Bin
 {htdocs => public}/theme/eldy/img/title_project.png | Bin
 {htdocs => public}/theme/eldy/img/title_setup.png   | Bin
 {htdocs => public}/theme/eldy/img/tmenu.jpg         | Bin
 {htdocs => public}/theme/eldy/img/tmenu2.jpg        | Bin
 {htdocs => public}/theme/eldy/img/tmenu3.jpg        | Bin
 {htdocs => public}/theme/eldy/img/tmenu_inverse.jpg | Bin
 {htdocs => public}/theme/eldy/img/unlock.png        | Bin
 {htdocs => public}/theme/eldy/img/uparrow.png       | Bin
 {htdocs => public}/theme/eldy/img/upload.png        | Bin
 {htdocs => public}/theme/eldy/img/vcard.png         | Bin
 {htdocs => public}/theme/eldy/img/view.png          | Bin
 {htdocs => public}/theme/eldy/img/warning.png       | Bin
 .../theme/eldy/img/weather/index.html               |   0
 .../theme/eldy/img/weather/weather-clear-night.png  | Bin
 .../theme/eldy/img/weather/weather-clear.png        | Bin
 .../theme/eldy/img/weather/weather-clouds-night.png | Bin
 .../theme/eldy/img/weather/weather-clouds.png       | Bin
 .../eldy/img/weather/weather-few-clouds-night.png   | Bin
 .../theme/eldy/img/weather/weather-few-clouds.png   | Bin
 .../eldy/img/weather/weather-freezing-rain.png      | Bin
 .../theme/eldy/img/weather/weather-hail.png         | Bin
 .../theme/eldy/img/weather/weather-many-clouds.png  | Bin
 .../theme/eldy/img/weather/weather-mist.png         | Bin
 .../theme/eldy/img/weather/weather-showers-day.png  | Bin
 .../eldy/img/weather/weather-showers-night.png      | Bin
 .../img/weather/weather-showers-scattered-day.png   | Bin
 .../img/weather/weather-showers-scattered-night.png | Bin
 .../eldy/img/weather/weather-showers-scattered.png  | Bin
 .../theme/eldy/img/weather/weather-showers.png      | Bin
 .../theme/eldy/img/weather/weather-snow-rain.png    | Bin
 .../eldy/img/weather/weather-snow-scattered-day.png | Bin
 .../img/weather/weather-snow-scattered-night.png    | Bin
 .../eldy/img/weather/weather-snow-scattered.png     | Bin
 .../theme/eldy/img/weather/weather-snow.png         | Bin
 .../theme/eldy/img/weather/weather-storm-day.png    | Bin
 .../theme/eldy/img/weather/weather-storm-night.png  | Bin
 .../theme/eldy/img/weather/weather-storm.png        | Bin
 {htdocs => public}/theme/eldy/img/working.gif       | Bin
 {htdocs => public}/theme/eldy/img/working2.gif      | Bin
 {htdocs => public}/theme/eldy/index.html            |   0
 {htdocs => public}/theme/eldy/style.css.php         |   0
 {htdocs => public}/theme/eldy/thumb.png             | Bin
 {htdocs => public}/theme/eldy/tpl/README            |   0
 {htdocs => public}/theme/eldy/tpl/index.html        |   0
 {htdocs => public}/theme/index.html                 |   0
 {htdocs => public}/theme/login_background.png       | Bin
 {htdocs => public}/theme/login_logo.png             | Bin
 {htdocs => public}/theme/md/.gitignore              |   0
 {htdocs => public}/theme/md/AUTHOR                  |   0
 {htdocs => public}/theme/md/ckeditor/config.js      |   0
 {htdocs => public}/theme/md/ckeditor/index.html     |   0
 {htdocs => public}/theme/md/graph-color.php         |   0
 {htdocs => public}/theme/md/img/1downarrow.png      | Bin
 .../theme/md/img/1downarrow_selected.png            | Bin
 {htdocs => public}/theme/md/img/1leftarrow.png      | Bin
 .../theme/md/img/1leftarrow_selected.png            | Bin
 {htdocs => public}/theme/md/img/1rightarrow.png     | Bin
 .../theme/md/img/1rightarrow_selected.png           | Bin
 {htdocs => public}/theme/md/img/1uparrow.png        | Bin
 .../theme/md/img/1uparrow_selected.png              | Bin
 {htdocs => public}/theme/md/img/addfile.png         | Bin
 {htdocs => public}/theme/md/img/background.png      | Bin
 {htdocs => public}/theme/md/img/bg-bas-rubrique.png | Bin
 {htdocs => public}/theme/md/img/bg-rubrique.png     | Bin
 .../theme/md/img/bg-titre-rubrique.png              | Bin
 {htdocs => public}/theme/md/img/button_bg.png       | Bin
 {htdocs => public}/theme/md/img/button_edit.png     | Bin
 {htdocs => public}/theme/md/img/calc.png            | Bin
 {htdocs => public}/theme/md/img/calendar.png        | Bin
 {htdocs => public}/theme/md/img/call.png            | Bin
 {htdocs => public}/theme/md/img/call_out.png        | Bin
 {htdocs => public}/theme/md/img/close.png           | Bin
 {htdocs => public}/theme/md/img/close_title.png     | Bin
 {htdocs => public}/theme/md/img/credit_card.png     | Bin
 {htdocs => public}/theme/md/img/delete.png          | Bin
 {htdocs => public}/theme/md/img/detail.png          | Bin
 {htdocs => public}/theme/md/img/disable.png         | Bin
 {htdocs => public}/theme/md/img/edit.png            | Bin
 {htdocs => public}/theme/md/img/edit_add.png        | Bin
 {htdocs => public}/theme/md/img/edit_remove.png     | Bin
 {htdocs => public}/theme/md/img/editdelete.png      | Bin
 {htdocs => public}/theme/md/img/error.png           | Bin
 {htdocs => public}/theme/md/img/external.png        | Bin
 {htdocs => public}/theme/md/img/favicon.ico         | Bin
 {htdocs => public}/theme/md/img/file.png            | Bin
 {htdocs => public}/theme/md/img/filenew.png         | Bin
 {htdocs => public}/theme/md/img/filter.png          | Bin
 {htdocs => public}/theme/md/img/folder-open.png     | Bin
 {htdocs => public}/theme/md/img/folder.png          | Bin
 {htdocs => public}/theme/md/img/gradient.gif        | Bin
 {htdocs => public}/theme/md/img/grip.png            | Bin
 {htdocs => public}/theme/md/img/grip_title.png      | Bin
 {htdocs => public}/theme/md/img/headbg.jpg          | Bin
 {htdocs => public}/theme/md/img/headbg2.jpg         | Bin
 {htdocs => public}/theme/md/img/help.png            | Bin
 {htdocs => public}/theme/md/img/helpdoc.png         | Bin
 {htdocs => public}/theme/md/img/helpdoc_top.png     | Bin
 {htdocs => public}/theme/md/img/high.png            | Bin
 {htdocs => public}/theme/md/img/history.png         | Bin
 {htdocs => public}/theme/md/img/index.html          |   0
 {htdocs => public}/theme/md/img/info.png            | Bin
 {htdocs => public}/theme/md/img/info_black.png      | Bin
 {htdocs => public}/theme/md/img/list.png            | Bin
 {htdocs => public}/theme/md/img/liste_titre.png     | Bin
 {htdocs => public}/theme/md/img/liste_titre2.png    | Bin
 {htdocs => public}/theme/md/img/listlight.png       | Bin
 {htdocs => public}/theme/md/img/lock.png            | Bin
 .../theme/md/img/login_background.png               | Bin
 {htdocs => public}/theme/md/img/logo_setup.svg      |   0
 {htdocs => public}/theme/md/img/logout.png          | Bin
 {htdocs => public}/theme/md/img/logout_top.png      | Bin
 {htdocs => public}/theme/md/img/menu.png            | Bin
 {htdocs => public}/theme/md/img/menus/agenda.png    | Bin
 {htdocs => public}/theme/md/img/menus/bank.png      | Bin
 {htdocs => public}/theme/md/img/menus/cart.png      | Bin
 {htdocs => public}/theme/md/img/menus/chart.png     | Bin
 .../theme/md/img/menus/commercial.png               | Bin
 {htdocs => public}/theme/md/img/menus/company.png   | Bin
 {htdocs => public}/theme/md/img/menus/ecm.png       | Bin
 .../theme/md/img/menus/externalsite.png             | Bin
 {htdocs => public}/theme/md/img/menus/ftp.png       | Bin
 {htdocs => public}/theme/md/img/menus/generic1.png  | Bin
 {htdocs => public}/theme/md/img/menus/generic2.png  | Bin
 {htdocs => public}/theme/md/img/menus/generic3.png  | Bin
 {htdocs => public}/theme/md/img/menus/generic4.png  | Bin
 {htdocs => public}/theme/md/img/menus/globe.png     | Bin
 {htdocs => public}/theme/md/img/menus/graph.png     | Bin
 {htdocs => public}/theme/md/img/menus/holiday.png   | Bin
 {htdocs => public}/theme/md/img/menus/home.png      | Bin
 {htdocs => public}/theme/md/img/menus/index.html    |   0
 {htdocs => public}/theme/md/img/menus/mail.png      | Bin
 {htdocs => public}/theme/md/img/menus/members.png   | Bin
 {htdocs => public}/theme/md/img/menus/menu.png      | Bin
 {htdocs => public}/theme/md/img/menus/money.png     | Bin
 .../theme/md/img/menus/pointofsale.png              | Bin
 {htdocs => public}/theme/md/img/menus/products.png  | Bin
 {htdocs => public}/theme/md/img/menus/project.png   | Bin
 {htdocs => public}/theme/md/img/menus/shop.png      | Bin
 {htdocs => public}/theme/md/img/menus/tools.png     | Bin
 {htdocs => public}/theme/md/img/menutab-r.png       | Bin
 {htdocs => public}/theme/md/img/nav-overlay.png     | Bin
 {htdocs => public}/theme/md/img/nav-overlay3.png    | Bin
 {htdocs => public}/theme/md/img/next.png            | Bin
 {htdocs => public}/theme/md/img/nographyet.svg      |   0
 {htdocs => public}/theme/md/img/object_account.png  | Bin
 .../theme/md/img/object_accounting.png              | Bin
 {htdocs => public}/theme/md/img/object_action.png   | Bin
 {htdocs => public}/theme/md/img/object_address.png  | Bin
 {htdocs => public}/theme/md/img/object_barcode.png  | Bin
 {htdocs => public}/theme/md/img/object_bill.png     | Bin
 {htdocs => public}/theme/md/img/object_billa.png    | Bin
 {htdocs => public}/theme/md/img/object_billd.png    | Bin
 {htdocs => public}/theme/md/img/object_billr.png    | Bin
 {htdocs => public}/theme/md/img/object_book.png     | Bin
 {htdocs => public}/theme/md/img/object_bookmark.png | Bin
 {htdocs => public}/theme/md/img/object_building.png | Bin
 {htdocs => public}/theme/md/img/object_calendar.png | Bin
 .../theme/md/img/object_calendarday.png             | Bin
 .../theme/md/img/object_calendargantt.png           | Bin
 .../theme/md/img/object_calendarpertype.png         | Bin
 .../theme/md/img/object_calendarperuser.png         | Bin
 .../theme/md/img/object_calendarweek.png            | Bin
 .../theme/md/img/object_category-expanded.png       | Bin
 {htdocs => public}/theme/md/img/object_category.png | Bin
 .../theme/md/img/object_commercial.png              | Bin
 {htdocs => public}/theme/md/img/object_company.png  | Bin
 {htdocs => public}/theme/md/img/object_contact.png  | Bin
 {htdocs => public}/theme/md/img/object_contract.png | Bin
 {htdocs => public}/theme/md/img/object_cron.png     | Bin
 {htdocs => public}/theme/md/img/object_dir.png      | Bin
 {htdocs => public}/theme/md/img/object_email.png    | Bin
 {htdocs => public}/theme/md/img/object_energy.png   | Bin
 {htdocs => public}/theme/md/img/object_generic.png  | Bin
 {htdocs => public}/theme/md/img/object_globe.png    | Bin
 {htdocs => public}/theme/md/img/object_gravatar.png | Bin
 {htdocs => public}/theme/md/img/object_group.png    | Bin
 {htdocs => public}/theme/md/img/object_holiday.png  | Bin
 .../theme/md/img/object_intervention.png            | Bin
 {htdocs => public}/theme/md/img/object_invoice.png  | Bin
 {htdocs => public}/theme/md/img/object_label.png    | Bin
 {htdocs => public}/theme/md/img/object_list.png     | Bin
 {htdocs => public}/theme/md/img/object_margin.png   | Bin
 .../theme/md/img/object_opensurvey.png              | Bin
 {htdocs => public}/theme/md/img/object_order.png    | Bin
 {htdocs => public}/theme/md/img/object_payment.png  | Bin
 {htdocs => public}/theme/md/img/object_phoning.png  | Bin
 .../theme/md/img/object_phoning_fax.png             | Bin
 {htdocs => public}/theme/md/img/object_printer.png  | Bin
 {htdocs => public}/theme/md/img/object_product.png  | Bin
 {htdocs => public}/theme/md/img/object_project.png  | Bin
 .../theme/md/img/object_projectpub.png              | Bin
 .../theme/md/img/object_projecttask.png             | Bin
 {htdocs => public}/theme/md/img/object_propal.png   | Bin
 {htdocs => public}/theme/md/img/object_reduc.png    | Bin
 {htdocs => public}/theme/md/img/object_resource.png | Bin
 {htdocs => public}/theme/md/img/object_rss.png      | Bin
 {htdocs => public}/theme/md/img/object_sending.png  | Bin
 {htdocs => public}/theme/md/img/object_service.png  | Bin
 {htdocs => public}/theme/md/img/object_skype.png    | Bin
 {htdocs => public}/theme/md/img/object_stock.png    | Bin
 .../theme/md/img/object_supplier_proposal.png       | Bin
 {htdocs => public}/theme/md/img/object_task.png     | Bin
 .../theme/md/img/object_task_time.png               | Bin
 {htdocs => public}/theme/md/img/object_tax.png      | Bin
 {htdocs => public}/theme/md/img/object_technic.png  | Bin
 {htdocs => public}/theme/md/img/object_trip.png     | Bin
 {htdocs => public}/theme/md/img/object_user.png     | Bin
 {htdocs => public}/theme/md/img/off.png             | Bin
 {htdocs => public}/theme/md/img/on.png              | Bin
 {htdocs => public}/theme/md/img/pdf2.png            | Bin
 {htdocs => public}/theme/md/img/pdf3.png            | Bin
 {htdocs => public}/theme/md/img/play.png            | Bin
 {htdocs => public}/theme/md/img/playdisabled.png    | Bin
 {htdocs => public}/theme/md/img/preview.png         | Bin
 {htdocs => public}/theme/md/img/preview_ext.png     | Bin
 {htdocs => public}/theme/md/img/previous.png        | Bin
 {htdocs => public}/theme/md/img/printer.png         | Bin
 {htdocs => public}/theme/md/img/printer_top.png     | Bin
 {htdocs => public}/theme/md/img/puce.png            | Bin
 {htdocs => public}/theme/md/img/recent.png          | Bin
 {htdocs => public}/theme/md/img/redstar.png         | Bin
 {htdocs => public}/theme/md/img/refresh.png         | Bin
 {htdocs => public}/theme/md/img/reload.png          | Bin
 {htdocs => public}/theme/md/img/rightarrow.png      | Bin
 {htdocs => public}/theme/md/img/search.png          | Bin
 {htdocs => public}/theme/md/img/searchclear.png     | Bin
 {htdocs => public}/theme/md/img/setup.png           | Bin
 {htdocs => public}/theme/md/img/sort_asc.png        | Bin
 .../theme/md/img/sort_asc_disabled.png              | Bin
 {htdocs => public}/theme/md/img/sort_desc.png       | Bin
 .../theme/md/img/sort_desc_disabled.png             | Bin
 {htdocs => public}/theme/md/img/split.png           | Bin
 {htdocs => public}/theme/md/img/star.png            | Bin
 {htdocs => public}/theme/md/img/stats.png           | Bin
 {htdocs => public}/theme/md/img/statut0.png         | Bin
 {htdocs => public}/theme/md/img/statut0_40x40.png   | Bin
 {htdocs => public}/theme/md/img/statut1.png         | Bin
 {htdocs => public}/theme/md/img/statut1_40x40.png   | Bin
 {htdocs => public}/theme/md/img/statut3.png         | Bin
 {htdocs => public}/theme/md/img/statut3_40x40.png   | Bin
 {htdocs => public}/theme/md/img/statut4.png         | Bin
 {htdocs => public}/theme/md/img/statut4_40x40.png   | Bin
 {htdocs => public}/theme/md/img/statut5.png         | Bin
 {htdocs => public}/theme/md/img/statut5_40x40.png   | Bin
 {htdocs => public}/theme/md/img/statut6.png         | Bin
 {htdocs => public}/theme/md/img/statut6_40x40.png   | Bin
 {htdocs => public}/theme/md/img/statut7.png         | Bin
 {htdocs => public}/theme/md/img/statut7_40x40.png   | Bin
 {htdocs => public}/theme/md/img/statut8.png         | Bin
 {htdocs => public}/theme/md/img/statut8_40x40.png   | Bin
 {htdocs => public}/theme/md/img/statut9.png         | Bin
 {htdocs => public}/theme/md/img/statut9_40x40.png   | Bin
 {htdocs => public}/theme/md/img/stcomm-1.png        | Bin
 {htdocs => public}/theme/md/img/stcomm0.png         | Bin
 {htdocs => public}/theme/md/img/stcomm1.png         | Bin
 {htdocs => public}/theme/md/img/stcomm2.png         | Bin
 {htdocs => public}/theme/md/img/stcomm3.png         | Bin
 {htdocs => public}/theme/md/img/stcomm4.png         | Bin
 {htdocs => public}/theme/md/img/switch_off.png      | Bin
 {htdocs => public}/theme/md/img/switch_off_old.png  | Bin
 {htdocs => public}/theme/md/img/switch_on.png       | Bin
 {htdocs => public}/theme/md/img/switch_on_old.png   | Bin
 {htdocs => public}/theme/md/img/tab_background.png  | Bin
 {htdocs => public}/theme/md/img/tick.png            | Bin
 {htdocs => public}/theme/md/img/title.gif           | Bin
 {htdocs => public}/theme/md/img/title.png           | Bin
 .../theme/md/img/title_accountancy.png              | Bin
 {htdocs => public}/theme/md/img/title_agenda.png    | Bin
 {htdocs => public}/theme/md/img/title_bank.png      | Bin
 .../theme/md/img/title_commercial.png               | Bin
 {htdocs => public}/theme/md/img/title_companies.png | Bin
 {htdocs => public}/theme/md/img/title_generic.png   | Bin
 {htdocs => public}/theme/md/img/title_home.png      | Bin
 {htdocs => public}/theme/md/img/title_hrm.png       | Bin
 {htdocs => public}/theme/md/img/title_products.png  | Bin
 {htdocs => public}/theme/md/img/title_project.png   | Bin
 {htdocs => public}/theme/md/img/title_setup.png     | Bin
 {htdocs => public}/theme/md/img/tmenu.jpg           | Bin
 {htdocs => public}/theme/md/img/tmenu2.jpg          | Bin
 {htdocs => public}/theme/md/img/tmenu3.jpg          | Bin
 {htdocs => public}/theme/md/img/tmenu_inverse.jpg   | Bin
 {htdocs => public}/theme/md/img/unlock.png          | Bin
 {htdocs => public}/theme/md/img/uparrow.png         | Bin
 {htdocs => public}/theme/md/img/upload.png          | Bin
 {htdocs => public}/theme/md/img/vcard.png           | Bin
 {htdocs => public}/theme/md/img/view.png            | Bin
 {htdocs => public}/theme/md/img/warning.png         | Bin
 {htdocs => public}/theme/md/img/weather/index.html  |   0
 .../theme/md/img/weather/weather-clear-night.png    | Bin
 .../theme/md/img/weather/weather-clear.png          | Bin
 .../theme/md/img/weather/weather-clouds-night.png   | Bin
 .../theme/md/img/weather/weather-clouds.png         | Bin
 .../md/img/weather/weather-few-clouds-night.png     | Bin
 .../theme/md/img/weather/weather-few-clouds.png     | Bin
 .../theme/md/img/weather/weather-freezing-rain.png  | Bin
 .../theme/md/img/weather/weather-hail.png           | Bin
 .../theme/md/img/weather/weather-many-clouds.png    | Bin
 .../theme/md/img/weather/weather-mist.png           | Bin
 .../theme/md/img/weather/weather-showers-day.png    | Bin
 .../theme/md/img/weather/weather-showers-night.png  | Bin
 .../img/weather/weather-showers-scattered-day.png   | Bin
 .../img/weather/weather-showers-scattered-night.png | Bin
 .../md/img/weather/weather-showers-scattered.png    | Bin
 .../theme/md/img/weather/weather-showers.png        | Bin
 .../theme/md/img/weather/weather-snow-rain.png      | Bin
 .../md/img/weather/weather-snow-scattered-day.png   | Bin
 .../md/img/weather/weather-snow-scattered-night.png | Bin
 .../theme/md/img/weather/weather-snow-scattered.png | Bin
 .../theme/md/img/weather/weather-snow.png           | Bin
 .../theme/md/img/weather/weather-storm-day.png      | Bin
 .../theme/md/img/weather/weather-storm-night.png    | Bin
 .../theme/md/img/weather/weather-storm.png          | Bin
 {htdocs => public}/theme/md/img/working.gif         | Bin
 {htdocs => public}/theme/md/img/working2.gif        | Bin
 {htdocs => public}/theme/md/index.html              |   0
 {htdocs => public}/theme/md/style.css.php           |   0
 {htdocs => public}/theme/md/thumb.png               | Bin
 {htdocs => public}/theme/md/tpl/README              |   0
 {htdocs => public}/theme/md/tpl/index.html          |   0
 {htdocs => public}/user/admin/group_extrafields.php |   0
 {htdocs => public}/user/admin/index.html            |   0
 {htdocs => public}/user/admin/user_extrafields.php  |   0
 {htdocs => public}/user/agenda_extsites.php         |   0
 {htdocs => public}/user/bank.php                    |   0
 {htdocs => public}/user/card.php                    |   0
 .../user/class/api_deprecated_user.class.php        |   0
 {htdocs => public}/user/class/api_users.class.php   |   0
 {htdocs => public}/user/class/index.html            |   0
 {htdocs => public}/user/class/user.class.php        |   0
 .../user/class/userbankaccount.class.php            |   0
 {htdocs => public}/user/class/usergroup.class.php   |   0
 {htdocs => public}/user/clicktodial.php             |   0
 {htdocs => public}/user/document.php                |   0
 {htdocs => public}/user/group/card.php              |   0
 {htdocs => public}/user/group/index.php             |   0
 {htdocs => public}/user/group/ldap.php              |   0
 {htdocs => public}/user/group/perms.php             |   0
 {htdocs => public}/user/hierarchy.php               |   0
 {htdocs => public}/user/home.php                    |   0
 {htdocs => public}/user/index.php                   |   0
 {htdocs => public}/user/info.php                    |   0
 {htdocs => public}/user/ldap.php                    |   0
 {htdocs => public}/user/logout.php                  |   0
 {htdocs => public}/user/note.php                    |   0
 {htdocs => public}/user/notify/card.php             |   0
 {htdocs => public}/user/param_ihm.php               |   0
 {htdocs => public}/user/passwordforgotten.php       |   0
 {htdocs => public}/user/perms.php                   |   0
 {htdocs => public}/viewimage.php                    |   0
 {htdocs => public}/webservices/README.md            |   0
 {htdocs => public}/webservices/admin/index.php      |   0
 .../webservices/demo_wsclient_actioncomm.php-NORUN  |   0
 .../webservices/demo_wsclient_category.php-NORUN    |   0
 .../webservices/demo_wsclient_invoice.php-NORUN     |   0
 .../webservices/demo_wsclient_order.php-NORUN       |   0
 .../webservices/demo_wsclient_other.php-NORUN       |   0
 .../demo_wsclient_productorservice.php-NORUN        |   0
 .../webservices/demo_wsclient_project.php-NORUN     |   0
 .../webservices/demo_wsclient_thirdparty.php-NORUN  |   0
 {htdocs => public}/webservices/index.php            |   0
 .../webservices/server_actioncomm.php               |   0
 {htdocs => public}/webservices/server_category.php  |   0
 {htdocs => public}/webservices/server_contact.php   |   0
 {htdocs => public}/webservices/server_invoice.php   |   0
 {htdocs => public}/webservices/server_order.php     |   0
 {htdocs => public}/webservices/server_other.php     |   0
 .../webservices/server_productorservice.php         |   0
 {htdocs => public}/webservices/server_project.php   |   0
 .../webservices/server_supplier_invoice.php         |   0
 .../webservices/server_thirdparty.php               |   0
 {htdocs => public}/webservices/server_user.php      |   0
 {htdocs => public}/websites/class/website.class.php |   0
 .../websites/class/websitepage.class.php            |   0
 {htdocs => public}/websites/frametop.php            |   0
 {htdocs => public}/websites/index.html              |   0
 {htdocs => public}/websites/index.php               |   0
 9472 files changed, 0 insertions(+), 0 deletions(-)
 rename {htdocs => public}/.gitignore (100%)
 rename {htdocs => public}/accountancy/admin/account.php (100%)
 rename {htdocs => public}/accountancy/admin/accountmodel.php (100%)
 rename {htdocs => public}/accountancy/admin/card.php (100%)
 rename {htdocs => public}/accountancy/admin/categories.php (100%)
 rename {htdocs => public}/accountancy/admin/defaultaccounts.php (100%)
 rename {htdocs => public}/accountancy/admin/export.php (100%)
 rename {htdocs => public}/accountancy/admin/fiscalyear.php (100%)
 rename {htdocs => public}/accountancy/admin/fiscalyear_card.php (100%)
 rename {htdocs => public}/accountancy/admin/fiscalyear_info.php (100%)
 rename {htdocs => public}/accountancy/admin/importaccounts.php (100%)
 rename {htdocs => public}/accountancy/admin/index.html (100%)
 rename {htdocs => public}/accountancy/admin/index.php (100%)
 rename {htdocs => public}/accountancy/admin/journal.php (100%)
 rename {htdocs => public}/accountancy/admin/productaccount.php (100%)
 rename {htdocs => public}/accountancy/bookkeeping/balance.php (100%)
 rename {htdocs => public}/accountancy/bookkeeping/balancebymonth.php (100%)
 rename {htdocs => public}/accountancy/bookkeeping/card.php (100%)
 rename {htdocs => public}/accountancy/bookkeeping/index.html (100%)
 rename {htdocs => public}/accountancy/bookkeeping/list.php (100%)
 rename {htdocs => public}/accountancy/bookkeeping/listbyaccount.php (100%)
 rename {htdocs => public}/accountancy/bookkeeping/listbyyear.php (100%)
 rename {htdocs => public}/accountancy/class/accountancycategory.class.php (100%)
 rename {htdocs => public}/accountancy/class/accountancyexport.class.php (100%)
 rename {htdocs => public}/accountancy/class/accountancysystem.class.php (100%)
 rename {htdocs => public}/accountancy/class/accountingaccount.class.php (100%)
 rename {htdocs => public}/accountancy/class/bookkeeping.class.php (100%)
 rename {htdocs => public}/accountancy/class/html.formventilation.class.php (100%)
 rename {htdocs => public}/accountancy/class/index.html (100%)
 rename {htdocs => public}/accountancy/customer/card.php (100%)
 rename {htdocs => public}/accountancy/customer/index.html (100%)
 rename {htdocs => public}/accountancy/customer/index.php (100%)
 rename {htdocs => public}/accountancy/customer/lines.php (100%)
 rename {htdocs => public}/accountancy/customer/list.php (100%)
 rename {htdocs => public}/accountancy/expensereport/card.php (100%)
 rename {htdocs => public}/accountancy/expensereport/index.html (100%)
 rename {htdocs => public}/accountancy/expensereport/index.php (100%)
 rename {htdocs => public}/accountancy/expensereport/lines.php (100%)
 rename {htdocs => public}/accountancy/expensereport/list.php (100%)
 rename {htdocs => public}/accountancy/index.html (100%)
 rename {htdocs => public}/accountancy/index.php (100%)
 rename {htdocs => public}/accountancy/journal/bankjournal.php (100%)
 rename {htdocs => public}/accountancy/journal/expensereportsjournal.php (100%)
 rename {htdocs => public}/accountancy/journal/index.html (100%)
 rename {htdocs => public}/accountancy/journal/purchasesjournal.php (100%)
 rename {htdocs => public}/accountancy/journal/sellsjournal.php (100%)
 rename {htdocs => public}/accountancy/report/index.html (100%)
 rename {htdocs => public}/accountancy/report/result.php (100%)
 rename {htdocs => public}/accountancy/supplier/card.php (100%)
 rename {htdocs => public}/accountancy/supplier/index.html (100%)
 rename {htdocs => public}/accountancy/supplier/index.php (100%)
 rename {htdocs => public}/accountancy/supplier/lines.php (100%)
 rename {htdocs => public}/accountancy/supplier/list.php (100%)
 rename {htdocs => public}/accountancy/tpl/export_journal.tpl.php (100%)
 rename {htdocs => public}/accountancy/tpl/index.html (100%)
 rename {htdocs => public}/adherents/admin/adherent.php (100%)
 rename {htdocs => public}/adherents/admin/adherent_extrafields.php (100%)
 rename {htdocs => public}/adherents/admin/adherent_type_extrafields.php (100%)
 rename {htdocs => public}/adherents/admin/index.html (100%)
 rename {htdocs => public}/adherents/admin/public.php (100%)
 rename {htdocs => public}/adherents/agenda.php (100%)
 rename {htdocs => public}/adherents/canvas/actions_adherentcard_common.class.php (100%)
 rename {htdocs => public}/adherents/canvas/default/actions_adherentcard_default.class.php (100%)
 rename {htdocs => public}/adherents/canvas/default/index.html (100%)
 rename {htdocs => public}/adherents/canvas/default/tpl/adherentcard_create.tpl.php (100%)
 rename {htdocs => public}/adherents/canvas/default/tpl/adherentcard_edit.tpl.php (100%)
 rename {htdocs => public}/adherents/canvas/default/tpl/adherentcard_view.tpl.php (100%)
 rename {htdocs => public}/adherents/canvas/default/tpl/index.html (100%)
 rename {htdocs => public}/adherents/canvas/index.html (100%)
 rename {htdocs => public}/adherents/card.php (100%)
 rename {htdocs => public}/adherents/cartes/carte.php (100%)
 rename {htdocs => public}/adherents/cartes/index.html (100%)
 rename {htdocs => public}/adherents/class/adherent.class.php (100%)
 rename {htdocs => public}/adherents/class/adherent_type.class.php (100%)
 rename {htdocs => public}/adherents/class/adherentstats.class.php (100%)
 rename {htdocs => public}/adherents/class/api_members.class.php (100%)
 rename {htdocs => public}/adherents/class/api_subscriptions.class.php (100%)
 rename {htdocs => public}/adherents/class/index.html (100%)
 rename {htdocs => public}/adherents/class/subscription.class.php (100%)
 rename {htdocs => public}/adherents/document.php (100%)
 rename {htdocs => public}/adherents/htpasswd.php (100%)
 rename {htdocs => public}/adherents/index.php (100%)
 rename {htdocs => public}/adherents/ldap.php (100%)
 rename {htdocs => public}/adherents/list.php (100%)
 rename {htdocs => public}/adherents/note.php (100%)
 rename {htdocs => public}/adherents/stats/byproperties.php (100%)
 rename {htdocs => public}/adherents/stats/geo.php (100%)
 rename {htdocs => public}/adherents/stats/index.html (100%)
 rename {htdocs => public}/adherents/stats/index.php (100%)
 rename {htdocs => public}/adherents/subscription.php (100%)
 rename {htdocs => public}/adherents/subscription/card.php (100%)
 rename {htdocs => public}/adherents/subscription/index.html (100%)
 rename {htdocs => public}/adherents/subscription/info.php (100%)
 rename {htdocs => public}/adherents/subscription/list.php (100%)
 rename {htdocs => public}/adherents/tpl/index.html (100%)
 rename {htdocs => public}/adherents/tpl/linkedobjectblock.tpl.php (100%)
 rename {htdocs => public}/adherents/type.php (100%)
 rename {htdocs => public}/admin/agenda.php (100%)
 rename {htdocs => public}/admin/agenda_extrafields.php (100%)
 rename {htdocs => public}/admin/agenda_extsites.php (100%)
 rename {htdocs => public}/admin/agenda_other.php (100%)
 rename {htdocs => public}/admin/agenda_xcal.php (100%)
 rename {htdocs => public}/admin/bank.php (100%)
 rename {htdocs => public}/admin/bank_extrafields.php (100%)
 rename {htdocs => public}/admin/barcode.php (100%)
 rename {htdocs => public}/admin/boxes.php (100%)
 rename {htdocs => public}/admin/chequereceipts.php (100%)
 rename {htdocs => public}/admin/clicktodial.php (100%)
 rename {htdocs => public}/admin/commande.php (100%)
 rename {htdocs => public}/admin/company.php (100%)
 rename {htdocs => public}/admin/compta.php (100%)
 rename {htdocs => public}/admin/confexped.php (100%)
 rename {htdocs => public}/admin/const.php (100%)
 rename {htdocs => public}/admin/contract.php (100%)
 rename {htdocs => public}/admin/delais.php (100%)
 rename {htdocs => public}/admin/dict.php (100%)
 rename {htdocs => public}/admin/ecm.php (100%)
 rename {htdocs => public}/admin/events.php (100%)
 rename {htdocs => public}/admin/expedition.php (100%)
 rename {htdocs => public}/admin/expedition_extrafields.php (100%)
 rename {htdocs => public}/admin/expeditiondet_extrafields.php (100%)
 rename {htdocs => public}/admin/expensereport.php (100%)
 rename {htdocs => public}/admin/expensereport_extrafields.php (100%)
 rename {htdocs => public}/admin/external_rss.php (100%)
 rename {htdocs => public}/admin/facture.php (100%)
 rename {htdocs => public}/admin/fckeditor.php (100%)
 rename {htdocs => public}/admin/fichinter.php (100%)
 rename {htdocs => public}/admin/geoipmaxmind.php (100%)
 rename {htdocs => public}/admin/ihm.php (100%)
 rename {htdocs => public}/admin/index.php (100%)
 rename {htdocs => public}/admin/ldap.php (100%)
 rename {htdocs => public}/admin/ldap_contacts.php (100%)
 rename {htdocs => public}/admin/ldap_groups.php (100%)
 rename {htdocs => public}/admin/ldap_members.php (100%)
 rename {htdocs => public}/admin/ldap_users.php (100%)
 rename {htdocs => public}/admin/limits.php (100%)
 rename {htdocs => public}/admin/livraison.php (100%)
 rename {htdocs => public}/admin/livraison_extrafields.php (100%)
 rename {htdocs => public}/admin/livraisondet_extrafields.php (100%)
 rename {htdocs => public}/admin/loan.php (100%)
 rename {htdocs => public}/admin/mailing.php (100%)
 rename {htdocs => public}/admin/mailman.php (100%)
 rename {htdocs => public}/admin/mails.php (100%)
 rename {htdocs => public}/admin/menus.php (100%)
 rename {htdocs => public}/admin/menus/edit.php (100%)
 rename {htdocs => public}/admin/menus/index.php (100%)
 rename {htdocs => public}/admin/menus/other.php (100%)
 rename {htdocs => public}/admin/modules.php (100%)
 rename {htdocs => public}/admin/multicurrency.php (100%)
 rename {htdocs => public}/admin/notification.php (100%)
 rename {htdocs => public}/admin/oauth.php (100%)
 rename {htdocs => public}/admin/oauthlogintokens.php (100%)
 rename {htdocs => public}/admin/order_extrafields.php (100%)
 rename {htdocs => public}/admin/orderdet_extrafields.php (100%)
 rename {htdocs => public}/admin/payment.php (100%)
 rename {htdocs => public}/admin/pdf.php (100%)
 rename {htdocs => public}/admin/perms.php (100%)
 rename {htdocs => public}/admin/prelevement.php (100%)
 rename {htdocs => public}/admin/propal.php (100%)
 rename {htdocs => public}/admin/proxy.php (100%)
 rename {htdocs => public}/admin/receiptprinter.php (100%)
 rename {htdocs => public}/admin/resource.php (100%)
 rename {htdocs => public}/admin/resource_extrafields.php (100%)
 rename {htdocs => public}/admin/salaries.php (100%)
 rename {htdocs => public}/admin/security.php (100%)
 rename {htdocs => public}/admin/security_file.php (100%)
 rename {htdocs => public}/admin/security_other.php (100%)
 rename {htdocs => public}/admin/sms.php (100%)
 rename {htdocs => public}/admin/spip.php (100%)
 rename {htdocs => public}/admin/stock.php (100%)
 rename {htdocs => public}/admin/supplier_invoice.php (100%)
 rename {htdocs => public}/admin/supplier_order.php (100%)
 rename {htdocs => public}/admin/supplier_payment.php (100%)
 rename {htdocs => public}/admin/supplier_proposal.php (100%)
 rename {htdocs => public}/admin/supplierinvoice_extrafields.php (100%)
 rename {htdocs => public}/admin/supplierinvoicedet_extrafields.php (100%)
 rename {htdocs => public}/admin/supplierorder_extrafields.php (100%)
 rename {htdocs => public}/admin/supplierorderdet_extrafields.php (100%)
 rename {htdocs => public}/admin/syslog.php (100%)
 rename {htdocs => public}/admin/system/about.php (100%)
 rename {htdocs => public}/admin/system/browser.php (100%)
 rename {htdocs => public}/admin/system/constall.php (100%)
 rename {htdocs => public}/admin/system/database-tables.php (100%)
 rename {htdocs => public}/admin/system/database.php (100%)
 rename {htdocs => public}/admin/system/dbtable.php (100%)
 rename {htdocs => public}/admin/system/dolibarr.php (100%)
 rename {htdocs => public}/admin/system/filecheck.php (100%)
 rename {htdocs => public}/admin/system/index.php (100%)
 rename {htdocs => public}/admin/system/modules.php (100%)
 rename {htdocs => public}/admin/system/os.php (100%)
 rename {htdocs => public}/admin/system/perf.php (100%)
 rename {htdocs => public}/admin/system/phpinfo.php (100%)
 rename {htdocs => public}/admin/system/web.php (100%)
 rename {htdocs => public}/admin/system/xcache.php (100%)
 rename {htdocs => public}/admin/system/xdebug.php (100%)
 rename {htdocs => public}/admin/taxes.php (100%)
 rename {htdocs => public}/admin/tools/dolibarr_export.php (100%)
 rename {htdocs => public}/admin/tools/dolibarr_import.php (100%)
 rename {htdocs => public}/admin/tools/eaccelerator.php (100%)
 rename {htdocs => public}/admin/tools/export.php (100%)
 rename {htdocs => public}/admin/tools/index.php (100%)
 rename {htdocs => public}/admin/tools/listevents.php (100%)
 rename {htdocs => public}/admin/tools/listsessions.php (100%)
 rename {htdocs => public}/admin/tools/purge.php (100%)
 rename {htdocs => public}/admin/tools/update.php (100%)
 rename {htdocs => public}/admin/translation.php (100%)
 rename {htdocs => public}/admin/triggers.php (100%)
 rename {htdocs => public}/admin/user.php (100%)
 rename {htdocs => public}/admin/websites.php (100%)
 rename {htdocs => public}/admin/workflow.php (100%)
 rename {htdocs => public}/api/README.md (100%)
 rename {htdocs => public}/api/admin/explorer.php (100%)
 rename {htdocs => public}/api/admin/index.php (100%)
 rename {htdocs => public}/api/class/api.class.php (100%)
 rename {htdocs => public}/api/class/api_access.class.php (100%)
 rename {htdocs => public}/api/class/api_dictionnarycountries.class.php (100%)
 rename {htdocs => public}/api/class/api_dictionnarytowns.class.php (100%)
 rename {htdocs => public}/api/class/api_login.class.php (100%)
 rename {htdocs => public}/api/class/api_status.class.php (100%)
 rename {htdocs => public}/api/class/index.html (100%)
 rename {htdocs => public}/api/index.php (100%)
 rename {htdocs => public}/asterisk/cidlookup.php (100%)
 rename {htdocs => public}/asterisk/index.html (100%)
 rename {htdocs => public}/asterisk/wrapper.php (100%)
 rename {htdocs => public}/barcode/codeinit.php (100%)
 rename {htdocs => public}/barcode/index.html (100%)
 rename {htdocs => public}/barcode/printsheet.php (100%)
 rename {htdocs => public}/bookmarks/admin/bookmark.php (100%)
 rename {htdocs => public}/bookmarks/admin/index.html (100%)
 rename {htdocs => public}/bookmarks/bookmarks.lib.php (100%)
 rename {htdocs => public}/bookmarks/card.php (100%)
 rename {htdocs => public}/bookmarks/class/bookmark.class.php (100%)
 rename {htdocs => public}/bookmarks/class/index.html (100%)
 rename {htdocs => public}/bookmarks/index.html (100%)
 rename {htdocs => public}/bookmarks/list.php (100%)
 rename {htdocs => public}/cache.manifest (100%)
 rename {htdocs => public}/cashdesk/admin/cashdesk.php (100%)
 rename {htdocs => public}/cashdesk/admin/index.html (100%)
 rename {htdocs => public}/cashdesk/affContenu.php (100%)
 rename {htdocs => public}/cashdesk/affIndex.php (100%)
 rename {htdocs => public}/cashdesk/affPied.php (100%)
 rename {htdocs => public}/cashdesk/class/Auth.class.php (100%)
 rename {htdocs => public}/cashdesk/class/Facturation.class.php (100%)
 rename {htdocs => public}/cashdesk/class/index.html (100%)
 rename {htdocs => public}/cashdesk/css/index.html (100%)
 rename {htdocs => public}/cashdesk/css/style.css (100%)
 rename {htdocs => public}/cashdesk/deconnexion.php (100%)
 rename {htdocs => public}/cashdesk/facturation.php (100%)
 rename {htdocs => public}/cashdesk/facturation_dhtml.php (100%)
 rename {htdocs => public}/cashdesk/facturation_verif.php (100%)
 rename {htdocs => public}/cashdesk/img/basket_delete.png (100%)
 rename {htdocs => public}/cashdesk/img/bg_conteneur_droite.png (100%)
 rename {htdocs => public}/cashdesk/img/bg_conteneur_gauche.png (100%)
 rename {htdocs => public}/cashdesk/img/bg_entete.png (100%)
 rename {htdocs => public}/cashdesk/img/bg_pied.png (100%)
 rename {htdocs => public}/cashdesk/img/calendrier.png (100%)
 rename {htdocs => public}/cashdesk/img/decrypted.png (100%)
 rename {htdocs => public}/cashdesk/img/gescom.png (100%)
 rename {htdocs => public}/cashdesk/img/index.html (100%)
 rename {htdocs => public}/cashdesk/img/lock.png (100%)
 rename {htdocs => public}/cashdesk/img/login.png (100%)
 rename {htdocs => public}/cashdesk/img/new.png (100%)
 rename {htdocs => public}/cashdesk/include/environnement.php (100%)
 rename {htdocs => public}/cashdesk/include/index.html (100%)
 rename {htdocs => public}/cashdesk/include/keypad.php (100%)
 rename {htdocs => public}/cashdesk/index.php (100%)
 rename {htdocs => public}/cashdesk/index_verif.php (100%)
 rename {htdocs => public}/cashdesk/javascript/dhtml.js (100%)
 rename {htdocs => public}/cashdesk/javascript/facturation1.js (100%)
 rename {htdocs => public}/cashdesk/javascript/index.html (100%)
 rename {htdocs => public}/cashdesk/javascript/keypad.js (100%)
 rename {htdocs => public}/cashdesk/tpl/facturation1.tpl.php (100%)
 rename {htdocs => public}/cashdesk/tpl/index.html (100%)
 rename {htdocs => public}/cashdesk/tpl/liste_articles.tpl.php (100%)
 rename {htdocs => public}/cashdesk/tpl/menu.tpl.php (100%)
 rename {htdocs => public}/cashdesk/tpl/ticket.tpl.php (100%)
 rename {htdocs => public}/cashdesk/tpl/validation1.tpl.php (100%)
 rename {htdocs => public}/cashdesk/tpl/validation2.tpl.php (100%)
 rename {htdocs => public}/cashdesk/validation.php (100%)
 rename {htdocs => public}/cashdesk/validation_ok.php (100%)
 rename {htdocs => public}/cashdesk/validation_ticket.php (100%)
 rename {htdocs => public}/cashdesk/validation_verif.php (100%)
 rename {htdocs => public}/categories/admin/categorie.php (100%)
 rename {htdocs => public}/categories/admin/categorie_extrafields.php (100%)
 rename {htdocs => public}/categories/admin/index.html (100%)
 rename {htdocs => public}/categories/card.php (100%)
 rename {htdocs => public}/categories/class/api_categories.class.php (100%)
 rename {htdocs => public}/categories/class/api_deprecated_category.class.php (100%)
 rename {htdocs => public}/categories/class/categorie.class.php (100%)
 rename {htdocs => public}/categories/class/index.html (100%)
 rename {htdocs => public}/categories/edit.php (100%)
 rename {htdocs => public}/categories/index.php (100%)
 rename {htdocs => public}/categories/photos.php (100%)
 rename {htdocs => public}/categories/traduction.php (100%)
 rename {htdocs => public}/categories/viewcat.php (100%)
 rename {htdocs => public}/comm/action/card.php (100%)
 rename {htdocs => public}/comm/action/class/actioncomm.class.php (100%)
 rename {htdocs => public}/comm/action/class/api_agendaevents.class.php (100%)
 rename {htdocs => public}/comm/action/class/cactioncomm.class.php (100%)
 rename {htdocs => public}/comm/action/class/ical.class.php (100%)
 rename {htdocs => public}/comm/action/class/index.html (100%)
 rename {htdocs => public}/comm/action/document.php (100%)
 rename {htdocs => public}/comm/action/index.php (100%)
 rename {htdocs => public}/comm/action/info.php (100%)
 rename {htdocs => public}/comm/action/listactions.php (100%)
 rename {htdocs => public}/comm/action/pertype.php (100%)
 rename {htdocs => public}/comm/action/peruser.php (100%)
 rename {htdocs => public}/comm/action/rapport/index.php (100%)
 rename {htdocs => public}/comm/address.php (100%)
 rename {htdocs => public}/comm/admin/index.html (100%)
 rename {htdocs => public}/comm/admin/propal_extrafields.php (100%)
 rename {htdocs => public}/comm/admin/propaldet_extrafields.php (100%)
 rename {htdocs => public}/comm/card.php (100%)
 rename {htdocs => public}/comm/contact.php (100%)
 rename {htdocs => public}/comm/index.php (100%)
 rename {htdocs => public}/comm/mailing/advtargetemailing.php (100%)
 rename {htdocs => public}/comm/mailing/card.php (100%)
 rename {htdocs => public}/comm/mailing/cibles.php (100%)
 rename {htdocs => public}/comm/mailing/class/advtargetemailing.class.php (100%)
 rename {htdocs => public}/comm/mailing/class/html.formadvtargetemailing.class.php (100%)
 rename {htdocs => public}/comm/mailing/class/index.html (100%)
 rename {htdocs => public}/comm/mailing/class/mailing.class.php (100%)
 rename {htdocs => public}/comm/mailing/index.php (100%)
 rename {htdocs => public}/comm/mailing/info.php (100%)
 rename {htdocs => public}/comm/mailing/list.php (100%)
 rename {htdocs => public}/comm/multiprix.php (100%)
 rename {htdocs => public}/comm/propal/apercu.php (100%)
 rename {htdocs => public}/comm/propal/card.php (100%)
 rename {htdocs => public}/comm/propal/class/api_proposals.class.php (100%)
 rename {htdocs => public}/comm/propal/class/index.html (100%)
 rename {htdocs => public}/comm/propal/class/propal.class.php (100%)
 rename {htdocs => public}/comm/propal/class/propalestats.class.php (100%)
 rename {htdocs => public}/comm/propal/contact.php (100%)
 rename {htdocs => public}/comm/propal/document.php (100%)
 rename {htdocs => public}/comm/propal/index.php (100%)
 rename {htdocs => public}/comm/propal/info.php (100%)
 rename {htdocs => public}/comm/propal/list.php (100%)
 rename {htdocs => public}/comm/propal/note.php (100%)
 rename {htdocs => public}/comm/propal/stats/index.php (100%)
 rename {htdocs => public}/comm/propal/tpl/index.html (100%)
 rename {htdocs => public}/comm/propal/tpl/linkedobjectblock.tpl.php (100%)
 rename {htdocs => public}/comm/prospect/index.php (100%)
 rename {htdocs => public}/comm/prospect/recap-prospect.php (100%)
 rename {htdocs => public}/comm/recap-client.php (100%)
 rename {htdocs => public}/comm/remise.php (100%)
 rename {htdocs => public}/comm/remx.php (100%)
 rename {htdocs => public}/commande/apercu.php (100%)
 rename {htdocs => public}/commande/card.php (100%)
 rename {htdocs => public}/commande/class/api_deprecated_commande.class.php (100%)
 rename {htdocs => public}/commande/class/api_orders.class.php (100%)
 rename {htdocs => public}/commande/class/commande.class.php (100%)
 rename {htdocs => public}/commande/class/commandestats.class.php (100%)
 rename {htdocs => public}/commande/class/index.html (100%)
 rename {htdocs => public}/commande/contact.php (100%)
 rename {htdocs => public}/commande/customer.php (100%)
 rename {htdocs => public}/commande/document.php (100%)
 rename {htdocs => public}/commande/index.php (100%)
 rename {htdocs => public}/commande/info.php (100%)
 rename {htdocs => public}/commande/list.php (100%)
 rename {htdocs => public}/commande/note.php (100%)
 rename {htdocs => public}/commande/orderstoinvoice.php (100%)
 rename {htdocs => public}/commande/stats/index.php (100%)
 rename {htdocs => public}/commande/tpl/index.html (100%)
 rename {htdocs => public}/commande/tpl/linkedobjectblock.tpl.php (100%)
 rename {htdocs => public}/compta/ajaxpayment.php (100%)
 rename {htdocs => public}/compta/bank/annuel.php (100%)
 rename {htdocs => public}/compta/bank/bankentries.php (100%)
 rename {htdocs => public}/compta/bank/bilan.php (100%)
 rename {htdocs => public}/compta/bank/budget.php (100%)
 rename {htdocs => public}/compta/bank/card.php (100%)
 rename {htdocs => public}/compta/bank/categ.php (100%)
 rename {htdocs => public}/compta/bank/class/account.class.php (100%)
 rename {htdocs => public}/compta/bank/class/api_bankaccounts.class.php (100%)
 rename {htdocs => public}/compta/bank/class/bankcateg.class.php (100%)
 rename {htdocs => public}/compta/bank/class/index.html (100%)
 rename {htdocs => public}/compta/bank/document.php (100%)
 rename {htdocs => public}/compta/bank/graph.php (100%)
 rename {htdocs => public}/compta/bank/index.php (100%)
 rename {htdocs => public}/compta/bank/info.php (100%)
 rename {htdocs => public}/compta/bank/ligne.php (100%)
 rename {htdocs => public}/compta/bank/releve.php (100%)
 rename {htdocs => public}/compta/bank/transfer.php (100%)
 rename {htdocs => public}/compta/bank/treso.php (100%)
 rename {htdocs => public}/compta/charges/index.php (100%)
 rename {htdocs => public}/compta/clients.php (100%)
 rename {htdocs => public}/compta/deplacement/card.php (100%)
 rename {htdocs => public}/compta/deplacement/class/deplacement.class.php (100%)
 rename {htdocs => public}/compta/deplacement/class/deplacementstats.class.php (100%)
 rename {htdocs => public}/compta/deplacement/class/index.html (100%)
 rename {htdocs => public}/compta/deplacement/document.php (100%)
 rename {htdocs => public}/compta/deplacement/index.php (100%)
 rename {htdocs => public}/compta/deplacement/info.php (100%)
 rename {htdocs => public}/compta/deplacement/list.php (100%)
 rename {htdocs => public}/compta/deplacement/stats/index.php (100%)
 rename {htdocs => public}/compta/facture.php (100%)
 rename {htdocs => public}/compta/facture/admin/facture_cust_extrafields.php (100%)
 rename {htdocs => public}/compta/facture/admin/facturedet_cust_extrafields.php (100%)
 rename {htdocs => public}/compta/facture/admin/index.html (100%)
 rename {htdocs => public}/compta/facture/apercu.php (100%)
 rename {htdocs => public}/compta/facture/class/api_deprecated_invoice.class.php (100%)
 rename {htdocs => public}/compta/facture/class/api_invoices.class.php (100%)
 rename {htdocs => public}/compta/facture/class/facture-rec.class.php (100%)
 rename {htdocs => public}/compta/facture/class/facture.class.php (100%)
 rename {htdocs => public}/compta/facture/class/facturestats.class.php (100%)
 rename {htdocs => public}/compta/facture/class/index.html (100%)
 rename {htdocs => public}/compta/facture/class/paymentterm.class.php (100%)
 rename {htdocs => public}/compta/facture/contact.php (100%)
 rename {htdocs => public}/compta/facture/document.php (100%)
 rename {htdocs => public}/compta/facture/fiche-rec.php (100%)
 rename {htdocs => public}/compta/facture/index.html (100%)
 rename {htdocs => public}/compta/facture/info.php (100%)
 rename {htdocs => public}/compta/facture/list.php (100%)
 rename {htdocs => public}/compta/facture/note.php (100%)
 rename {htdocs => public}/compta/facture/prelevement.php (100%)
 rename {htdocs => public}/compta/facture/stats/index.php (100%)
 rename {htdocs => public}/compta/facture/tpl/index.html (100%)
 rename {htdocs => public}/compta/facture/tpl/linkedobjectblock.tpl.php (100%)
 rename {htdocs => public}/compta/facture/tpl/linkedobjectblockForRec.tpl.php (100%)
 rename {htdocs => public}/compta/index.php (100%)
 rename {htdocs => public}/compta/journal/index.html (100%)
 rename {htdocs => public}/compta/journal/purchasesjournal.php (100%)
 rename {htdocs => public}/compta/journal/sellsjournal.php (100%)
 rename {htdocs => public}/compta/localtax/card.php (100%)
 rename {htdocs => public}/compta/localtax/class/index.html (100%)
 rename {htdocs => public}/compta/localtax/class/localtax.class.php (100%)
 rename {htdocs => public}/compta/localtax/clients.php (100%)
 rename {htdocs => public}/compta/localtax/index.php (100%)
 rename {htdocs => public}/compta/localtax/quadri_detail.php (100%)
 rename {htdocs => public}/compta/localtax/reglement.php (100%)
 rename {htdocs => public}/compta/paiement.php (100%)
 rename {htdocs => public}/compta/paiement/avalider.php (100%)
 rename {htdocs => public}/compta/paiement/card.php (100%)
 rename {htdocs => public}/compta/paiement/cheque/card.php (100%)
 rename {htdocs => public}/compta/paiement/cheque/class/index.html (100%)
 rename {htdocs => public}/compta/paiement/cheque/class/remisecheque.class.php (100%)
 rename {htdocs => public}/compta/paiement/cheque/index.php (100%)
 rename {htdocs => public}/compta/paiement/cheque/list.php (100%)
 rename {htdocs => public}/compta/paiement/class/cpaiement.class.php (100%)
 rename {htdocs => public}/compta/paiement/class/index.html (100%)
 rename {htdocs => public}/compta/paiement/class/paiement.class.php (100%)
 rename {htdocs => public}/compta/paiement/index.php (100%)
 rename {htdocs => public}/compta/paiement/info.php (100%)
 rename {htdocs => public}/compta/paiement/list.php (100%)
 rename {htdocs => public}/compta/paiement/rapport.php (100%)
 rename {htdocs => public}/compta/paiement_charge.php (100%)
 rename {htdocs => public}/compta/payment_sc/card.php (100%)
 rename {htdocs => public}/compta/payment_sc/index.html (100%)
 rename {htdocs => public}/compta/prelevement/bons.php (100%)
 rename {htdocs => public}/compta/prelevement/card.php (100%)
 rename {htdocs => public}/compta/prelevement/class/bonprelevement.class.php (100%)
 rename {htdocs => public}/compta/prelevement/class/index.html (100%)
 rename {htdocs => public}/compta/prelevement/class/ligneprelevement.class.php (100%)
 rename {htdocs => public}/compta/prelevement/class/rejetprelevement.class.php (100%)
 rename {htdocs => public}/compta/prelevement/create.php (100%)
 rename {htdocs => public}/compta/prelevement/demandes.php (100%)
 rename {htdocs => public}/compta/prelevement/factures.php (100%)
 rename {htdocs => public}/compta/prelevement/fiche-rejet.php (100%)
 rename {htdocs => public}/compta/prelevement/fiche-stat.php (100%)
 rename {htdocs => public}/compta/prelevement/index.php (100%)
 rename {htdocs => public}/compta/prelevement/ligne.php (100%)
 rename {htdocs => public}/compta/prelevement/list.php (100%)
 rename {htdocs => public}/compta/prelevement/rejets.php (100%)
 rename {htdocs => public}/compta/prelevement/stats.php (100%)
 rename {htdocs => public}/compta/recap-compta.php (100%)
 rename {htdocs => public}/compta/resultat/clientfourn.php (100%)
 rename {htdocs => public}/compta/resultat/index.php (100%)
 rename {htdocs => public}/compta/salaries/card.php (100%)
 rename {htdocs => public}/compta/salaries/class/index.html (100%)
 rename {htdocs => public}/compta/salaries/class/paymentsalary.class.php (100%)
 rename {htdocs => public}/compta/salaries/document.php (100%)
 rename {htdocs => public}/compta/salaries/index.php (100%)
 rename {htdocs => public}/compta/salaries/info.php (100%)
 rename {htdocs => public}/compta/sociales/card.php (100%)
 rename {htdocs => public}/compta/sociales/class/cchargesociales.class.php (100%)
 rename {htdocs => public}/compta/sociales/class/chargesociales.class.php (100%)
 rename {htdocs => public}/compta/sociales/class/index.html (100%)
 rename {htdocs => public}/compta/sociales/class/paymentsocialcontribution.class.php (100%)
 rename {htdocs => public}/compta/sociales/document.php (100%)
 rename {htdocs => public}/compta/sociales/index.php (100%)
 rename {htdocs => public}/compta/sociales/info.php (100%)
 rename {htdocs => public}/compta/sociales/payments.php (100%)
 rename {htdocs => public}/compta/stats/cabyprodserv.php (100%)
 rename {htdocs => public}/compta/stats/cabyuser.php (100%)
 rename {htdocs => public}/compta/stats/casoc.php (100%)
 rename {htdocs => public}/compta/stats/index.php (100%)
 rename {htdocs => public}/compta/tva/card.php (100%)
 rename {htdocs => public}/compta/tva/class/index.html (100%)
 rename {htdocs => public}/compta/tva/class/tva.class.php (100%)
 rename {htdocs => public}/compta/tva/clients.php (100%)
 rename {htdocs => public}/compta/tva/index.php (100%)
 rename {htdocs => public}/compta/tva/info.php (100%)
 rename {htdocs => public}/compta/tva/quadri.php (100%)
 rename {htdocs => public}/compta/tva/quadri_detail.php (100%)
 rename {htdocs => public}/compta/tva/quarter_report.php (100%)
 rename {htdocs => public}/compta/tva/reglement.php (100%)
 rename {htdocs => public}/conf/.gitignore (100%)
 rename {htdocs => public}/conf/.htaccess (100%)
 rename {htdocs => public}/conf/conf.php.example (100%)
 rename {htdocs => public}/conf/index.html (100%)
 rename {htdocs => public}/contact/canvas/actions_contactcard_common.class.php (100%)
 rename {htdocs => public}/contact/canvas/default/actions_contactcard_default.class.php (100%)
 rename {htdocs => public}/contact/canvas/default/index.html (100%)
 rename {htdocs => public}/contact/canvas/default/tpl/contactcard_create.tpl.php (100%)
 rename {htdocs => public}/contact/canvas/default/tpl/contactcard_edit.tpl.php (100%)
 rename {htdocs => public}/contact/canvas/default/tpl/contactcard_view.tpl.php (100%)
 rename {htdocs => public}/contact/canvas/default/tpl/index.html (100%)
 rename {htdocs => public}/contact/canvas/index.html (100%)
 rename {htdocs => public}/contact/card.php (100%)
 rename {htdocs => public}/contact/class/contact.class.php (100%)
 rename {htdocs => public}/contact/class/index.html (100%)
 rename {htdocs => public}/contact/document.php (100%)
 rename {htdocs => public}/contact/index.html (100%)
 rename {htdocs => public}/contact/info.php (100%)
 rename {htdocs => public}/contact/ldap.php (100%)
 rename {htdocs => public}/contact/list.php (100%)
 rename {htdocs => public}/contact/note.php (100%)
 rename {htdocs => public}/contact/perso.php (100%)
 rename {htdocs => public}/contact/vcard.php (100%)
 rename {htdocs => public}/contrat/admin/contract_extrafields.php (100%)
 rename {htdocs => public}/contrat/admin/contractdet_extrafields.php (100%)
 rename {htdocs => public}/contrat/admin/index.html (100%)
 rename {htdocs => public}/contrat/card.php (100%)
 rename {htdocs => public}/contrat/class/contrat.class.php (100%)
 rename {htdocs => public}/contrat/class/index.html (100%)
 rename {htdocs => public}/contrat/contact.php (100%)
 rename {htdocs => public}/contrat/document.php (100%)
 rename {htdocs => public}/contrat/index.php (100%)
 rename {htdocs => public}/contrat/info.php (100%)
 rename {htdocs => public}/contrat/list.php (100%)
 rename {htdocs => public}/contrat/note.php (100%)
 rename {htdocs => public}/contrat/services.php (100%)
 rename {htdocs => public}/contrat/tpl/index.html (100%)
 rename {htdocs => public}/contrat/tpl/linkedobjectblock.tpl.php (100%)
 rename {htdocs => public}/core/actions_builddoc.inc.php (100%)
 rename {htdocs => public}/core/actions_changeselectedfields.inc.php (100%)
 rename {htdocs => public}/core/actions_dellink.inc.php (100%)
 rename {htdocs => public}/core/actions_extrafields.inc.php (100%)
 rename {htdocs => public}/core/actions_fetchobject.inc.php (100%)
 rename {htdocs => public}/core/actions_lineupdown.inc.php (100%)
 rename {htdocs => public}/core/actions_linkedfiles.inc.php (100%)
 rename {htdocs => public}/core/actions_massactions.inc.php (100%)
 rename {htdocs => public}/core/actions_printing.inc.php (100%)
 rename {htdocs => public}/core/actions_sendmails.inc.php (100%)
 rename {htdocs => public}/core/actions_setnotes.inc.php (100%)
 rename {htdocs => public}/core/ajax/ajaxdirpreview.php (100%)
 rename {htdocs => public}/core/ajax/ajaxdirtree.php (100%)
 rename {htdocs => public}/core/ajax/bankconciliate.php (100%)
 rename {htdocs => public}/core/ajax/box.php (100%)
 rename {htdocs => public}/core/ajax/constantonoff.php (100%)
 rename {htdocs => public}/core/ajax/contacts.php (100%)
 rename {htdocs => public}/core/ajax/extraparams.php (100%)
 rename {htdocs => public}/core/ajax/fileupload.php (100%)
 rename {htdocs => public}/core/ajax/index.html (100%)
 rename {htdocs => public}/core/ajax/loadinplace.php (100%)
 rename {htdocs => public}/core/ajax/objectonoff.php (100%)
 rename {htdocs => public}/core/ajax/price.php (100%)
 rename {htdocs => public}/core/ajax/row.php (100%)
 rename {htdocs => public}/core/ajax/saveinplace.php (100%)
 rename {htdocs => public}/core/ajax/security.php (100%)
 rename {htdocs => public}/core/ajax/selectsearchbox.php (100%)
 rename {htdocs => public}/core/ajax/vatrates.php (100%)
 rename {htdocs => public}/core/ajax/ziptown.php (100%)
 rename {htdocs => public}/core/antispamimage.php (100%)
 rename {htdocs => public}/core/boxes/box_actions.php (100%)
 rename {htdocs => public}/core/boxes/box_activity.php (100%)
 rename {htdocs => public}/core/boxes/box_bookmarks.php (100%)
 rename {htdocs => public}/core/boxes/box_clients.php (100%)
 rename {htdocs => public}/core/boxes/box_commandes.php (100%)
 rename {htdocs => public}/core/boxes/box_comptes.php (100%)
 rename {htdocs => public}/core/boxes/box_contacts.php (100%)
 rename {htdocs => public}/core/boxes/box_contracts.php (100%)
 rename {htdocs => public}/core/boxes/box_external_rss.php (100%)
 rename {htdocs => public}/core/boxes/box_factures.php (100%)
 rename {htdocs => public}/core/boxes/box_factures_fourn.php (100%)
 rename {htdocs => public}/core/boxes/box_factures_fourn_imp.php (100%)
 rename {htdocs => public}/core/boxes/box_factures_imp.php (100%)
 rename {htdocs => public}/core/boxes/box_ficheinter.php (100%)
 rename {htdocs => public}/core/boxes/box_fournisseurs.php (100%)
 rename {htdocs => public}/core/boxes/box_goodcustomers.php (100%)
 rename {htdocs => public}/core/boxes/box_graph_invoices_permonth.php (100%)
 rename {htdocs => public}/core/boxes/box_graph_invoices_supplier_permonth.php (100%)
 rename {htdocs => public}/core/boxes/box_graph_orders_permonth.php (100%)
 rename {htdocs => public}/core/boxes/box_graph_orders_supplier_permonth.php (100%)
 rename {htdocs => public}/core/boxes/box_graph_product_distribution.php (100%)
 rename {htdocs => public}/core/boxes/box_graph_propales_permonth.php (100%)
 rename {htdocs => public}/core/boxes/box_members.php (100%)
 rename {htdocs => public}/core/boxes/box_produits.php (100%)
 rename {htdocs => public}/core/boxes/box_produits_alerte_stock.php (100%)
 rename {htdocs => public}/core/boxes/box_project.php (100%)
 rename {htdocs => public}/core/boxes/box_propales.php (100%)
 rename {htdocs => public}/core/boxes/box_prospect.php (100%)
 rename {htdocs => public}/core/boxes/box_services_contracts.php (100%)
 rename {htdocs => public}/core/boxes/box_services_expired.php (100%)
 rename {htdocs => public}/core/boxes/box_supplier_orders.php (100%)
 rename {htdocs => public}/core/boxes/box_task.php (100%)
 rename {htdocs => public}/core/boxes/index.html (100%)
 rename {htdocs => public}/core/boxes/modules_boxes.php (100%)
 rename {htdocs => public}/core/class/CMailFile.class.php (100%)
 rename {htdocs => public}/core/class/CSMSFile.class.php (100%)
 rename {htdocs => public}/core/class/antivir.class.php (100%)
 rename {htdocs => public}/core/class/canvas.class.php (100%)
 rename {htdocs => public}/core/class/ccountry.class.php (100%)
 rename {htdocs => public}/core/class/commondocgenerator.class.php (100%)
 rename {htdocs => public}/core/class/commoninvoice.class.php (100%)
 rename {htdocs => public}/core/class/commonobject.class.php (100%)
 rename {htdocs => public}/core/class/commonobjectline.class.php (100%)
 rename {htdocs => public}/core/class/commonorder.class.php (100%)
 rename {htdocs => public}/core/class/commonstickergenerator.class.php (100%)
 rename {htdocs => public}/core/class/conf.class.php (100%)
 rename {htdocs => public}/core/class/cookie.class.php (100%)
 rename {htdocs => public}/core/class/cstate.class.php (100%)
 rename {htdocs => public}/core/class/ctypent.class.php (100%)
 rename {htdocs => public}/core/class/discount.class.php (100%)
 rename {htdocs => public}/core/class/doleditor.class.php (100%)
 rename {htdocs => public}/core/class/dolexception.class.php (100%)
 rename {htdocs => public}/core/class/dolgeoip.class.php (100%)
 rename {htdocs => public}/core/class/dolgraph.class.php (100%)
 rename {htdocs => public}/core/class/dolprintipp.class.php (100%)
 rename {htdocs => public}/core/class/dolreceiptprinter.class.php (100%)
 rename {htdocs => public}/core/class/events.class.php (100%)
 rename {htdocs => public}/core/class/extrafields.class.php (100%)
 rename {htdocs => public}/core/class/fileupload.class.php (100%)
 rename {htdocs => public}/core/class/fiscalyear.class.php (100%)
 rename {htdocs => public}/core/class/genericobject.class.php (100%)
 rename {htdocs => public}/core/class/google.class.php (100%)
 rename {htdocs => public}/core/class/hookmanager.class.php (100%)
 rename {htdocs => public}/core/class/html.form.class.php (100%)
 rename {htdocs => public}/core/class/html.formaccounting.class.php (100%)
 rename {htdocs => public}/core/class/html.formactions.class.php (100%)
 rename {htdocs => public}/core/class/html.formadmin.class.php (100%)
 rename {htdocs => public}/core/class/html.formbank.class.php (100%)
 rename {htdocs => public}/core/class/html.formbarcode.class.php (100%)
 rename {htdocs => public}/core/class/html.formcompany.class.php (100%)
 rename {htdocs => public}/core/class/html.formcontract.class.php (100%)
 rename {htdocs => public}/core/class/html.formcron.class.php (100%)
 rename {htdocs => public}/core/class/html.formfile.class.php (100%)
 rename {htdocs => public}/core/class/html.formintervention.class.php (100%)
 rename {htdocs => public}/core/class/html.formmail.class.php (100%)
 rename {htdocs => public}/core/class/html.formmailing.class.php (100%)
 rename {htdocs => public}/core/class/html.formmargin.class.php (100%)
 rename {htdocs => public}/core/class/html.formorder.class.php (100%)
 rename {htdocs => public}/core/class/html.formother.class.php (100%)
 rename {htdocs => public}/core/class/html.formprojet.class.php (100%)
 rename {htdocs => public}/core/class/html.formpropal.class.php (100%)
 rename {htdocs => public}/core/class/html.formsms.class.php (100%)
 rename {htdocs => public}/core/class/html.formsocialcontrib.class.php (100%)
 rename {htdocs => public}/core/class/index.html (100%)
 rename {htdocs => public}/core/class/infobox.class.php (100%)
 rename {htdocs => public}/core/class/interfaces.class.php (100%)
 rename {htdocs => public}/core/class/ldap.class.php (100%)
 rename {htdocs => public}/core/class/link.class.php (100%)
 rename {htdocs => public}/core/class/menu.class.php (100%)
 rename {htdocs => public}/core/class/menubase.class.php (100%)
 rename {htdocs => public}/core/class/notify.class.php (100%)
 rename {htdocs => public}/core/class/openid.class.php (100%)
 rename {htdocs => public}/core/class/rssparser.class.php (100%)
 rename {htdocs => public}/core/class/smtps.class.php (100%)
 rename {htdocs => public}/core/class/stats.class.php (100%)
 rename {htdocs => public}/core/class/translate.class.php (100%)
 rename {htdocs => public}/core/class/utils.class.php (100%)
 rename {htdocs => public}/core/class/vcard.class.php (100%)
 rename {htdocs => public}/core/class/workboardresponse.class.php (100%)
 rename {htdocs => public}/core/datepicker.php (100%)
 rename {htdocs => public}/core/db/Database.interface.php (100%)
 rename {htdocs => public}/core/db/DoliDB.class.php (100%)
 rename {htdocs => public}/core/db/index.html (100%)
 rename {htdocs => public}/core/db/mssql.class.php (100%)
 rename {htdocs => public}/core/db/mysqli.class.php (100%)
 rename {htdocs => public}/core/db/pgsql.class.php (100%)
 rename {htdocs => public}/core/db/sqlite3.class.php (100%)
 rename {htdocs => public}/core/doxygen.php (100%)
 rename {htdocs => public}/core/extrafieldsinexport.inc.php (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/browser.css (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/browser.php (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/frmactualfolder.php (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/frmcreatefolder.php (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/frmfolders.php (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/frmresourceslist.php (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/frmupload.php (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/Folder.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/FolderUp.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/ai.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/avi.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/bmp.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/cs.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/dll.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/doc.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/exe.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/fla.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/gif.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/htm.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/html.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/index.html (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/jpg.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/js.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/mdb.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/mp3.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/pdf.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/png.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/ppt.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/rdp.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/swf.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/swt.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/txt.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/vsd.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/xls.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/xml.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/32/zip.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/ai.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/avi.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/bmp.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/cs.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/default.icon.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/dll.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/doc.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/exe.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/fla.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/gif.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/htm.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/html.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/index.html (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/jpg.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/js.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/mdb.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/mp3.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/pdf.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/png.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/ppt.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/rdp.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/swf.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/swt.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/txt.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/vsd.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/xls.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/xml.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/icons/zip.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/images/index.html (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/index.html (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/js/common.js (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/js/fckxml.js (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/js/index.html (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/default/spacer.gif (100%)
 rename {htdocs => public}/core/filemanagerdol/browser/index.html (100%)
 rename {htdocs => public}/core/filemanagerdol/connectors/index.html (100%)
 rename {htdocs => public}/core/filemanagerdol/connectors/php/basexml.php (100%)
 rename {htdocs => public}/core/filemanagerdol/connectors/php/commands.php (100%)
 rename {htdocs => public}/core/filemanagerdol/connectors/php/config.php (100%)
 rename {htdocs => public}/core/filemanagerdol/connectors/php/connector.php (100%)
 rename {htdocs => public}/core/filemanagerdol/connectors/php/index.html (100%)
 rename {htdocs => public}/core/filemanagerdol/connectors/php/io.php (100%)
 rename {htdocs => public}/core/filemanagerdol/connectors/php/upload.php (100%)
 rename {htdocs => public}/core/filemanagerdol/connectors/php/util.php (100%)
 rename {htdocs => public}/core/filemanagerdol/index.html (100%)
 rename {htdocs => public}/core/get_menudiv.php (100%)
 rename {htdocs => public}/core/index.html (100%)
 rename {htdocs => public}/core/js/blockUI.js (100%)
 rename {htdocs => public}/core/js/datepicker.js.php (100%)
 rename {htdocs => public}/core/js/dst.js (100%)
 rename {htdocs => public}/core/js/editinplace.js (100%)
 rename {htdocs => public}/core/js/index.html (100%)
 rename {htdocs => public}/core/js/jnotify.js (100%)
 rename {htdocs => public}/core/js/lib_batch.js (100%)
 rename {htdocs => public}/core/js/lib_head.js.php (100%)
 rename {htdocs => public}/core/js/lib_photosresize.js (100%)
 rename {htdocs => public}/core/js/lib_rare.js (100%)
 rename {htdocs => public}/core/js/select2_locale.js.php (100%)
 rename {htdocs => public}/core/js/timepicker.js.php (100%)
 rename {htdocs => public}/core/js/timesheet.js (100%)
 rename {htdocs => public}/core/lib/accounting.lib.php (100%)
 rename {htdocs => public}/core/lib/admin.lib.php (100%)
 rename {htdocs => public}/core/lib/agenda.lib.php (100%)
 rename {htdocs => public}/core/lib/ajax.lib.php (100%)
 rename {htdocs => public}/core/lib/bank.lib.php (100%)
 rename {htdocs => public}/core/lib/barcode.lib.php (100%)
 rename {htdocs => public}/core/lib/categories.lib.php (100%)
 rename {htdocs => public}/core/lib/company.lib.php (100%)
 rename {htdocs => public}/core/lib/contact.lib.php (100%)
 rename {htdocs => public}/core/lib/contract.lib.php (100%)
 rename {htdocs => public}/core/lib/cron.lib.php (100%)
 rename {htdocs => public}/core/lib/date.lib.php (100%)
 rename {htdocs => public}/core/lib/doc.lib.php (100%)
 rename {htdocs => public}/core/lib/doleditor.lib.php (100%)
 rename {htdocs => public}/core/lib/donation.lib.php (100%)
 rename {htdocs => public}/core/lib/ecm.lib.php (100%)
 rename {htdocs => public}/core/lib/emailing.lib.php (100%)
 rename {htdocs => public}/core/lib/expedition.lib.php (100%)
 rename {htdocs => public}/core/lib/expensereport.lib.php (100%)
 rename {htdocs => public}/core/lib/fichinter.lib.php (100%)
 rename {htdocs => public}/core/lib/files.lib.php (100%)
 rename {htdocs => public}/core/lib/fiscalyear.lib.php (100%)
 rename {htdocs => public}/core/lib/format_cards.lib.php (100%)
 rename {htdocs => public}/core/lib/fourn.lib.php (100%)
 rename {htdocs => public}/core/lib/functions.lib.php (100%)
 rename {htdocs => public}/core/lib/functions2.lib.php (100%)
 rename {htdocs => public}/core/lib/functions_ch.lib.php (100%)
 rename {htdocs => public}/core/lib/functionsnumtoword.lib.php (100%)
 rename {htdocs => public}/core/lib/geturl.lib.php (100%)
 rename {htdocs => public}/core/lib/holiday.lib.php (100%)
 rename {htdocs => public}/core/lib/hrm.lib.php (100%)
 rename {htdocs => public}/core/lib/images.lib.php (100%)
 rename {htdocs => public}/core/lib/import.lib.php (100%)
 rename {htdocs => public}/core/lib/index.html (100%)
 rename {htdocs => public}/core/lib/invoice.lib.php (100%)
 rename {htdocs => public}/core/lib/invoice2.lib.php (100%)
 rename {htdocs => public}/core/lib/json.lib.php (100%)
 rename {htdocs => public}/core/lib/ldap.lib.php (100%)
 rename {htdocs => public}/core/lib/loan.lib.php (100%)
 rename {htdocs => public}/core/lib/mailmanspip.lib.php (100%)
 rename {htdocs => public}/core/lib/member.lib.php (100%)
 rename {htdocs => public}/core/lib/memory.lib.php (100%)
 rename {htdocs => public}/core/lib/multicurrency.lib.php (100%)
 rename {htdocs => public}/core/lib/oauth.lib.php (100%)
 rename {htdocs => public}/core/lib/order.lib.php (100%)
 rename {htdocs => public}/core/lib/payments.lib.php (100%)
 rename {htdocs => public}/core/lib/pdf.lib.php (100%)
 rename {htdocs => public}/core/lib/prelevement.lib.php (100%)
 rename {htdocs => public}/core/lib/price.lib.php (100%)
 rename {htdocs => public}/core/lib/product.lib.php (100%)
 rename {htdocs => public}/core/lib/project.lib.php (100%)
 rename {htdocs => public}/core/lib/propal.lib.php (100%)
 rename {htdocs => public}/core/lib/receiptprinter.lib.php (100%)
 rename {htdocs => public}/core/lib/report.lib.php (100%)
 rename {htdocs => public}/core/lib/resource.lib.php (100%)
 rename {htdocs => public}/core/lib/salaries.lib.php (100%)
 rename {htdocs => public}/core/lib/security.lib.php (100%)
 rename {htdocs => public}/core/lib/security2.lib.php (100%)
 rename {htdocs => public}/core/lib/sendings.lib.php (100%)
 rename {htdocs => public}/core/lib/stock.lib.php (100%)
 rename {htdocs => public}/core/lib/supplier_proposal.lib.php (100%)
 rename {htdocs => public}/core/lib/tax.lib.php (100%)
 rename {htdocs => public}/core/lib/treeview.lib.php (100%)
 rename {htdocs => public}/core/lib/trip.lib.php (100%)
 rename {htdocs => public}/core/lib/usergroups.lib.php (100%)
 rename {htdocs => public}/core/lib/vat.lib.php (100%)
 rename {htdocs => public}/core/lib/ws.lib.php (100%)
 rename {htdocs => public}/core/lib/xcal.lib.php (100%)
 rename {htdocs => public}/core/login/README.txt (100%)
 rename {htdocs => public}/core/login/functions_dolibarr.php (100%)
 rename {htdocs => public}/core/login/functions_empty.php (100%)
 rename {htdocs => public}/core/login/functions_forceuser.php (100%)
 rename {htdocs => public}/core/login/functions_http.php (100%)
 rename {htdocs => public}/core/login/functions_ldap.php (100%)
 rename {htdocs => public}/core/login/functions_openid.php (100%)
 rename {htdocs => public}/core/login/index.html (100%)
 rename {htdocs => public}/core/menus/index.html (100%)
 rename {htdocs => public}/core/menus/init_menu_auguria.sql (100%)
 rename {htdocs => public}/core/menus/standard/auguria.lib.php (100%)
 rename {htdocs => public}/core/menus/standard/auguria_menu.php (100%)
 rename {htdocs => public}/core/menus/standard/eldy.lib.php (100%)
 rename {htdocs => public}/core/menus/standard/eldy_menu.php (100%)
 rename {htdocs => public}/core/menus/standard/empty.php (100%)
 rename {htdocs => public}/core/menus/standard/index.html (100%)
 rename {htdocs => public}/core/modules/DolibarrModules.class.php (100%)
 rename {htdocs => public}/core/modules/action/index.html (100%)
 rename {htdocs => public}/core/modules/action/modules_action.php (100%)
 rename {htdocs => public}/core/modules/action/rapport.pdf.php (100%)
 rename {htdocs => public}/core/modules/bank/doc/pdf_ban.modules.php (100%)
 rename {htdocs => public}/core/modules/bank/doc/pdf_sepamandate.modules.php (100%)
 rename {htdocs => public}/core/modules/bank/modules_bank.php (100%)
 rename {htdocs => public}/core/modules/barcode/doc/index.html (100%)
 rename {htdocs => public}/core/modules/barcode/doc/phpbarcode.modules.php (100%)
 rename {htdocs => public}/core/modules/barcode/doc/tcpdfbarcode.modules.php (100%)
 rename {htdocs => public}/core/modules/barcode/index.html (100%)
 rename {htdocs => public}/core/modules/barcode/mod_barcode_product_standard.php (100%)
 rename {htdocs => public}/core/modules/barcode/modules_barcode.class.php (100%)
 rename {htdocs => public}/core/modules/cheque/doc/index.html (100%)
 rename {htdocs => public}/core/modules/cheque/doc/pdf_blochet.class.php (100%)
 rename {htdocs => public}/core/modules/cheque/index.html (100%)
 rename {htdocs => public}/core/modules/cheque/mod_chequereceipt_mint.php (100%)
 rename {htdocs => public}/core/modules/cheque/mod_chequereceipt_thyme.php (100%)
 rename {htdocs => public}/core/modules/cheque/modules_chequereceipts.php (100%)
 rename {htdocs => public}/core/modules/commande/doc/doc_generic_order_odt.modules.php (100%)
 rename {htdocs => public}/core/modules/commande/doc/index.html (100%)
 rename {htdocs => public}/core/modules/commande/doc/pdf_einstein.modules.php (100%)
 rename {htdocs => public}/core/modules/commande/doc/pdf_proforma.modules.php (100%)
 rename {htdocs => public}/core/modules/commande/index.html (100%)
 rename {htdocs => public}/core/modules/commande/mod_commande_marbre.php (100%)
 rename {htdocs => public}/core/modules/commande/mod_commande_saphir.php (100%)
 rename {htdocs => public}/core/modules/commande/modules_commande.php (100%)
 rename {htdocs => public}/core/modules/contract/doc/index.html (100%)
 rename {htdocs => public}/core/modules/contract/doc/pdf_strato.modules.php (100%)
 rename {htdocs => public}/core/modules/contract/index.html (100%)
 rename {htdocs => public}/core/modules/contract/mod_contract_magre.php (100%)
 rename {htdocs => public}/core/modules/contract/mod_contract_olive.php (100%)
 rename {htdocs => public}/core/modules/contract/mod_contract_serpis.php (100%)
 rename {htdocs => public}/core/modules/contract/modules_contract.php (100%)
 rename {htdocs => public}/core/modules/dons/html_cerfafr.html (100%)
 rename {htdocs => public}/core/modules/dons/html_cerfafr.modules.php (100%)
 rename {htdocs => public}/core/modules/dons/index.html (100%)
 rename {htdocs => public}/core/modules/dons/modules_don.php (100%)
 rename {htdocs => public}/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php (100%)
 rename {htdocs => public}/core/modules/expedition/doc/index.html (100%)
 rename {htdocs => public}/core/modules/expedition/doc/pdf_merou.modules.php (100%)
 rename {htdocs => public}/core/modules/expedition/doc/pdf_rouget.modules.php (100%)
 rename {htdocs => public}/core/modules/expedition/index.html (100%)
 rename {htdocs => public}/core/modules/expedition/mod_expedition_ribera.php (100%)
 rename {htdocs => public}/core/modules/expedition/mod_expedition_safor.php (100%)
 rename {htdocs => public}/core/modules/expedition/modules_expedition.php (100%)
 rename {htdocs => public}/core/modules/expensereport/doc/pdf_standard.modules.php (100%)
 rename {htdocs => public}/core/modules/expensereport/modules_expensereport.php (100%)
 rename {htdocs => public}/core/modules/export/export_csv.modules.php (100%)
 rename {htdocs => public}/core/modules/export/export_excel.modules.php (100%)
 rename {htdocs => public}/core/modules/export/export_excel2007.modules.php (100%)
 rename {htdocs => public}/core/modules/export/export_tsv.modules.php (100%)
 rename {htdocs => public}/core/modules/export/index.html (100%)
 rename {htdocs => public}/core/modules/export/modules_export.php (100%)
 rename {htdocs => public}/core/modules/facture/doc/doc_generic_invoice_odt.modules.php (100%)
 rename {htdocs => public}/core/modules/facture/doc/index.html (100%)
 rename {htdocs => public}/core/modules/facture/doc/pdf_crabe.modules.php (100%)
 rename {htdocs => public}/core/modules/facture/index.html (100%)
 rename {htdocs => public}/core/modules/facture/mod_facture_mars.php (100%)
 rename {htdocs => public}/core/modules/facture/mod_facture_mercure.php (100%)
 rename {htdocs => public}/core/modules/facture/mod_facture_terre.php (100%)
 rename {htdocs => public}/core/modules/facture/modules_facture.php (100%)
 rename {htdocs => public}/core/modules/fichinter/doc/index.html (100%)
 rename {htdocs => public}/core/modules/fichinter/doc/pdf_soleil.modules.php (100%)
 rename {htdocs => public}/core/modules/fichinter/index.html (100%)
 rename {htdocs => public}/core/modules/fichinter/mod_arctic.php (100%)
 rename {htdocs => public}/core/modules/fichinter/mod_pacific.php (100%)
 rename {htdocs => public}/core/modules/fichinter/modules_fichinter.php (100%)
 rename {htdocs => public}/core/modules/import/import_csv.modules.php (100%)
 rename {htdocs => public}/core/modules/import/import_xlsx.modules.php (100%)
 rename {htdocs => public}/core/modules/import/index.html (100%)
 rename {htdocs => public}/core/modules/import/modules_import.php (100%)
 rename {htdocs => public}/core/modules/index.html (100%)
 rename {htdocs => public}/core/modules/livraison/doc/index.html (100%)
 rename {htdocs => public}/core/modules/livraison/doc/pdf_typhon.modules.php (100%)
 rename {htdocs => public}/core/modules/livraison/index.html (100%)
 rename {htdocs => public}/core/modules/livraison/mod_livraison_jade.php (100%)
 rename {htdocs => public}/core/modules/livraison/mod_livraison_saphir.php (100%)
 rename {htdocs => public}/core/modules/livraison/modules_livraison.php (100%)
 rename {htdocs => public}/core/modules/mailings/README (100%)
 rename {htdocs => public}/core/modules/mailings/advthirdparties.modules.php (100%)
 rename {htdocs => public}/core/modules/mailings/contacts1.modules.php (100%)
 rename {htdocs => public}/core/modules/mailings/contacts2.modules.php (100%)
 rename {htdocs => public}/core/modules/mailings/contacts3.modules.php (100%)
 rename {htdocs => public}/core/modules/mailings/contacts4.modules.php (100%)
 rename {htdocs => public}/core/modules/mailings/example.modules.php (100%)
 rename {htdocs => public}/core/modules/mailings/fraise.modules.php (100%)
 rename {htdocs => public}/core/modules/mailings/framboise.modules.php (100%)
 rename {htdocs => public}/core/modules/mailings/index.html (100%)
 rename {htdocs => public}/core/modules/mailings/modules_mailings.php (100%)
 rename {htdocs => public}/core/modules/mailings/pomme.modules.php (100%)
 rename {htdocs => public}/core/modules/mailings/thirdparties.modules.php (100%)
 rename {htdocs => public}/core/modules/mailings/thirdparties_services_expired.modules.php (100%)
 rename {htdocs => public}/core/modules/mailings/xinputfile.modules.php (100%)
 rename {htdocs => public}/core/modules/mailings/xinputuser.modules.php (100%)
 rename {htdocs => public}/core/modules/member/doc/index.html (100%)
 rename {htdocs => public}/core/modules/member/doc/pdf_standard.class.php (100%)
 rename {htdocs => public}/core/modules/member/index.html (100%)
 rename {htdocs => public}/core/modules/member/modules_cards.php (100%)
 rename {htdocs => public}/core/modules/modAccounting.class.php (100%)
 rename {htdocs => public}/core/modules/modAdherent.class.php (100%)
 rename {htdocs => public}/core/modules/modAgenda.class.php (100%)
 rename {htdocs => public}/core/modules/modApi.class.php (100%)
 rename {htdocs => public}/core/modules/modBanque.class.php (100%)
 rename {htdocs => public}/core/modules/modBarcode.class.php (100%)
 rename {htdocs => public}/core/modules/modBookmark.class.php (100%)
 rename {htdocs => public}/core/modules/modCashDesk.class.php (100%)
 rename {htdocs => public}/core/modules/modCategorie.class.php (100%)
 rename {htdocs => public}/core/modules/modClickToDial.class.php (100%)
 rename {htdocs => public}/core/modules/modCommande.class.php (100%)
 rename {htdocs => public}/core/modules/modComptabilite.class.php (100%)
 rename {htdocs => public}/core/modules/modContrat.class.php (100%)
 rename {htdocs => public}/core/modules/modCron.class.php (100%)
 rename {htdocs => public}/core/modules/modDeplacement.class.php (100%)
 rename {htdocs => public}/core/modules/modDocumentGeneration.class.php (100%)
 rename {htdocs => public}/core/modules/modDon.class.php (100%)
 rename {htdocs => public}/core/modules/modDynamicPrices.class.php (100%)
 rename {htdocs => public}/core/modules/modECM.class.php (100%)
 rename {htdocs => public}/core/modules/modExpedition.class.php (100%)
 rename {htdocs => public}/core/modules/modExpenseReport.class.php (100%)
 rename {htdocs => public}/core/modules/modExport.class.php (100%)
 rename {htdocs => public}/core/modules/modExternalRss.class.php (100%)
 rename {htdocs => public}/core/modules/modExternalSite.class.php (100%)
 rename {htdocs => public}/core/modules/modFTP.class.php (100%)
 rename {htdocs => public}/core/modules/modFacture.class.php (100%)
 rename {htdocs => public}/core/modules/modFckeditor.class.php (100%)
 rename {htdocs => public}/core/modules/modFicheinter.class.php (100%)
 rename {htdocs => public}/core/modules/modFournisseur.class.php (100%)
 rename {htdocs => public}/core/modules/modGeoIPMaxmind.class.php (100%)
 rename {htdocs => public}/core/modules/modGravatar.class.php (100%)
 rename {htdocs => public}/core/modules/modHRM.class.php (100%)
 rename {htdocs => public}/core/modules/modHoliday.class.php (100%)
 rename {htdocs => public}/core/modules/modImport.class.php (100%)
 rename {htdocs => public}/core/modules/modIncoterm.class.php (100%)
 rename {htdocs => public}/core/modules/modLabel.class.php (100%)
 rename {htdocs => public}/core/modules/modLdap.class.php (100%)
 rename {htdocs => public}/core/modules/modLoan.class.php (100%)
 rename {htdocs => public}/core/modules/modMailing.class.php (100%)
 rename {htdocs => public}/core/modules/modMailmanSpip.class.php (100%)
 rename {htdocs => public}/core/modules/modMargin.class.php (100%)
 rename {htdocs => public}/core/modules/modMultiCurrency.class.php (100%)
 rename {htdocs => public}/core/modules/modNotification.class.php (100%)
 rename {htdocs => public}/core/modules/modOauth.class.php (100%)
 rename {htdocs => public}/core/modules/modOpenSurvey.class.php (100%)
 rename {htdocs => public}/core/modules/modPaybox.class.php (100%)
 rename {htdocs => public}/core/modules/modPaypal.class.php (100%)
 rename {htdocs => public}/core/modules/modPrelevement.class.php (100%)
 rename {htdocs => public}/core/modules/modPrinting.class.php (100%)
 rename {htdocs => public}/core/modules/modProduct.class.php (100%)
 rename {htdocs => public}/core/modules/modProductBatch.class.php (100%)
 rename {htdocs => public}/core/modules/modProjet.class.php (100%)
 rename {htdocs => public}/core/modules/modPropale.class.php (100%)
 rename {htdocs => public}/core/modules/modReceiptPrinter.class.php (100%)
 rename {htdocs => public}/core/modules/modResource.class.php (100%)
 rename {htdocs => public}/core/modules/modSalaries.class.php (100%)
 rename {htdocs => public}/core/modules/modService.class.php (100%)
 rename {htdocs => public}/core/modules/modSkype.class.php (100%)
 rename {htdocs => public}/core/modules/modSociete.class.php (100%)
 rename {htdocs => public}/core/modules/modStock.class.php (100%)
 rename {htdocs => public}/core/modules/modSupplierProposal.class.php (100%)
 rename {htdocs => public}/core/modules/modSyslog.class.php (100%)
 rename {htdocs => public}/core/modules/modTax.class.php (100%)
 rename {htdocs => public}/core/modules/modUser.class.php (100%)
 rename {htdocs => public}/core/modules/modWebServices.class.php (100%)
 rename {htdocs => public}/core/modules/modWebServicesClient.class.php (100%)
 rename {htdocs => public}/core/modules/modWebsites.class.php (100%)
 rename {htdocs => public}/core/modules/modWorkflow.class.php (100%)
 rename {htdocs => public}/core/modules/oauth/google_oauthcallback.php (100%)
 rename {htdocs => public}/core/modules/oauth/index.html (100%)
 rename {htdocs => public}/core/modules/payment/mod_payment_ant.php (100%)
 rename {htdocs => public}/core/modules/payment/mod_payment_cicada.php (100%)
 rename {htdocs => public}/core/modules/payment/modules_payment.php (100%)
 rename {htdocs => public}/core/modules/printing/index.html (100%)
 rename {htdocs => public}/core/modules/printing/modules_printing.php (100%)
 rename {htdocs => public}/core/modules/printing/printgcp.modules.php (100%)
 rename {htdocs => public}/core/modules/printing/printipp.modules.php (100%)
 rename {htdocs => public}/core/modules/printsheet/doc/index.html (100%)
 rename {htdocs => public}/core/modules/printsheet/doc/pdf_standardlabel.class.php (100%)
 rename {htdocs => public}/core/modules/printsheet/doc/pdf_tcpdflabel.class.php (100%)
 rename {htdocs => public}/core/modules/printsheet/index.html (100%)
 rename {htdocs => public}/core/modules/printsheet/modules_labels.php (100%)
 rename {htdocs => public}/core/modules/product/index.html (100%)
 rename {htdocs => public}/core/modules/product/mod_codeproduct_elephant.php (100%)
 rename {htdocs => public}/core/modules/product/mod_codeproduct_leopard.php (100%)
 rename {htdocs => public}/core/modules/product/modules_product.class.php (100%)
 rename {htdocs => public}/core/modules/product/modules_product.php (100%)
 rename {htdocs => public}/core/modules/project/doc/doc_generic_project_odt.modules.php (100%)
 rename {htdocs => public}/core/modules/project/doc/index.html (100%)
 rename {htdocs => public}/core/modules/project/doc/pdf_baleine.modules.php (100%)
 rename {htdocs => public}/core/modules/project/doc/pdf_beluga.modules.php (100%)
 rename {htdocs => public}/core/modules/project/index.html (100%)
 rename {htdocs => public}/core/modules/project/mod_project_simple.php (100%)
 rename {htdocs => public}/core/modules/project/mod_project_universal.php (100%)
 rename {htdocs => public}/core/modules/project/modules_project.php (100%)
 rename {htdocs => public}/core/modules/project/task/doc/doc_generic_task_odt.modules.php (100%)
 rename {htdocs => public}/core/modules/project/task/doc/index.html (100%)
 rename {htdocs => public}/core/modules/project/task/index.html (100%)
 rename {htdocs => public}/core/modules/project/task/mod_task_simple.php (100%)
 rename {htdocs => public}/core/modules/project/task/mod_task_universal.php (100%)
 rename {htdocs => public}/core/modules/project/task/modules_task.php (100%)
 rename {htdocs => public}/core/modules/propale/doc/doc_generic_proposal_odt.modules.php (100%)
 rename {htdocs => public}/core/modules/propale/doc/index.html (100%)
 rename {htdocs => public}/core/modules/propale/doc/pdf_azur.modules.php (100%)
 rename {htdocs => public}/core/modules/propale/index.html (100%)
 rename {htdocs => public}/core/modules/propale/mod_propale_marbre.php (100%)
 rename {htdocs => public}/core/modules/propale/mod_propale_saphir.php (100%)
 rename {htdocs => public}/core/modules/propale/modules_propale.php (100%)
 rename {htdocs => public}/core/modules/rapport/index.html (100%)
 rename {htdocs => public}/core/modules/rapport/pdf_paiement.class.php (100%)
 rename {htdocs => public}/core/modules/security/generate/README (100%)
 rename {htdocs => public}/core/modules/security/generate/index.html (100%)
 rename {htdocs => public}/core/modules/security/generate/modGeneratePassNone.class.php (100%)
 rename {htdocs => public}/core/modules/security/generate/modGeneratePassPerso.class.php (100%)
 rename {htdocs => public}/core/modules/security/generate/modGeneratePassStandard.class.php (100%)
 rename {htdocs => public}/core/modules/security/generate/modules_genpassword.php (100%)
 rename {htdocs => public}/core/modules/security/index.html (100%)
 rename {htdocs => public}/core/modules/societe/doc/doc_generic_odt.modules.php (100%)
 rename {htdocs => public}/core/modules/societe/doc/index.html (100%)
 rename {htdocs => public}/core/modules/societe/index.html (100%)
 rename {htdocs => public}/core/modules/societe/mod_codeclient_elephant.php (100%)
 rename {htdocs => public}/core/modules/societe/mod_codeclient_leopard.php (100%)
 rename {htdocs => public}/core/modules/societe/mod_codeclient_monkey.php (100%)
 rename {htdocs => public}/core/modules/societe/mod_codecompta_aquarium.php (100%)
 rename {htdocs => public}/core/modules/societe/mod_codecompta_panicum.php (100%)
 rename {htdocs => public}/core/modules/societe/modules_societe.class.php (100%)
 rename {htdocs => public}/core/modules/supplier_invoice/index.html (100%)
 rename {htdocs => public}/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php (100%)
 rename {htdocs => public}/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php (100%)
 rename {htdocs => public}/core/modules/supplier_invoice/modules_facturefournisseur.php (100%)
 rename {htdocs => public}/core/modules/supplier_invoice/pdf/index.html (100%)
 rename {htdocs => public}/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php (100%)
 rename {htdocs => public}/core/modules/supplier_order/index.html (100%)
 rename {htdocs => public}/core/modules/supplier_order/mod_commande_fournisseur_muguet.php (100%)
 rename {htdocs => public}/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php (100%)
 rename {htdocs => public}/core/modules/supplier_order/modules_commandefournisseur.php (100%)
 rename {htdocs => public}/core/modules/supplier_order/pdf/index.html (100%)
 rename {htdocs => public}/core/modules/supplier_order/pdf/pdf_muscadet.modules.php (100%)
 rename {htdocs => public}/core/modules/supplier_payment/mod_supplier_payment_brodator.php (100%)
 rename {htdocs => public}/core/modules/supplier_payment/mod_supplier_payment_bronan.php (100%)
 rename {htdocs => public}/core/modules/supplier_payment/modules_supplier_payment.php (100%)
 rename {htdocs => public}/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php (100%)
 rename {htdocs => public}/core/modules/supplier_proposal/doc/index.html (100%)
 rename {htdocs => public}/core/modules/supplier_proposal/doc/pdf_aurore.modules.php (100%)
 rename {htdocs => public}/core/modules/supplier_proposal/index.html (100%)
 rename {htdocs => public}/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php (100%)
 rename {htdocs => public}/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php (100%)
 rename {htdocs => public}/core/modules/supplier_proposal/modules_supplier_proposal.php (100%)
 rename {htdocs => public}/core/modules/syslog/index.html (100%)
 rename {htdocs => public}/core/modules/syslog/logHandler.php (100%)
 rename {htdocs => public}/core/modules/syslog/logHandlerInterface.php (100%)
 rename {htdocs => public}/core/modules/syslog/mod_syslog_chromephp.php (100%)
 rename {htdocs => public}/core/modules/syslog/mod_syslog_file.php (100%)
 rename {htdocs => public}/core/modules/syslog/mod_syslog_firephp.php (100%)
 rename {htdocs => public}/core/modules/syslog/mod_syslog_syslog.php (100%)
 rename {htdocs => public}/core/photos_resize.php (100%)
 rename {htdocs => public}/core/search.php (100%)
 rename {htdocs => public}/core/search_page.php (100%)
 rename {htdocs => public}/core/tools.php (100%)
 rename {htdocs => public}/core/tpl/README (100%)
 rename {htdocs => public}/core/tpl/admin_extrafields_add.tpl.php (100%)
 rename {htdocs => public}/core/tpl/admin_extrafields_edit.tpl.php (100%)
 rename {htdocs => public}/core/tpl/admin_extrafields_view.tpl.php (100%)
 rename {htdocs => public}/core/tpl/ajax/fileupload_main.tpl.php (100%)
 rename {htdocs => public}/core/tpl/ajax/fileupload_view.tpl.php (100%)
 rename {htdocs => public}/core/tpl/ajax/index.html (100%)
 rename {htdocs => public}/core/tpl/ajaxrow.tpl.php (100%)
 rename {htdocs => public}/core/tpl/bloc_showhide.tpl.php (100%)
 rename {htdocs => public}/core/tpl/contacts.tpl.php (100%)
 rename {htdocs => public}/core/tpl/document_actions_post_headers.tpl.php (100%)
 rename {htdocs => public}/core/tpl/error.tpl.php (100%)
 rename {htdocs => public}/core/tpl/extrafields_view.tpl.php (100%)
 rename {htdocs => public}/core/tpl/footer.tpl.php (100%)
 rename {htdocs => public}/core/tpl/header.tpl.php (100%)
 rename {htdocs => public}/core/tpl/index.html (100%)
 rename {htdocs => public}/core/tpl/login.tpl.php (100%)
 rename {htdocs => public}/core/tpl/notes.tpl.php (100%)
 rename {htdocs => public}/core/tpl/objectline_create.tpl.php (100%)
 rename {htdocs => public}/core/tpl/objectline_edit.tpl.php (100%)
 rename {htdocs => public}/core/tpl/objectline_view.tpl.php (100%)
 rename {htdocs => public}/core/tpl/originproductline.tpl.php (100%)
 rename {htdocs => public}/core/tpl/passwordforgotten.tpl.php (100%)
 rename {htdocs => public}/core/tpl/resource_add.tpl.php (100%)
 rename {htdocs => public}/core/tpl/resource_view.tpl.php (100%)
 rename {htdocs => public}/core/triggers/README (100%)
 rename {htdocs => public}/core/triggers/README-FR (100%)
 rename {htdocs => public}/core/triggers/dolibarrtriggers.class.php (100%)
 rename {htdocs => public}/core/triggers/index.html (100%)
 rename {htdocs => public}/core/triggers/interface_20_all_Logevents.class.php (100%)
 rename {htdocs => public}/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php (100%)
 rename {htdocs => public}/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php (100%)
 rename {htdocs => public}/core/triggers/interface_50_modAgenda_ActionsAuto.class.php (100%)
 rename {htdocs => public}/core/triggers/interface_50_modLdap_Ldapsynchro.class.php (100%)
 rename {htdocs => public}/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php (100%)
 rename {htdocs => public}/core/triggers/interface_50_modNotification_Notification.class.php (100%)
 rename {htdocs => public}/core/triggers/interface_90_all_Demo.class.php-NORUN (100%)
 rename {htdocs => public}/cron/admin/cron.php (100%)
 rename {htdocs => public}/cron/admin/index.html (100%)
 rename {htdocs => public}/cron/card.php (100%)
 rename {htdocs => public}/cron/class/cronjob.class.php (100%)
 rename {htdocs => public}/cron/class/index.html (100%)
 rename {htdocs => public}/cron/index.html (100%)
 rename {htdocs => public}/cron/info.php (100%)
 rename {htdocs => public}/cron/list.php (100%)
 rename {htdocs => public}/custom/.gitignore (100%)
 rename {htdocs => public}/custom/README.md (100%)
 rename {htdocs => public}/custom/index.html (100%)
 rename {htdocs => public}/document.php (100%)
 rename {htdocs => public}/don/admin/donation.php (100%)
 rename {htdocs => public}/don/admin/donation_extrafields.php (100%)
 rename {htdocs => public}/don/admin/index.html (100%)
 rename {htdocs => public}/don/card.php (100%)
 rename {htdocs => public}/don/class/don.class.php (100%)
 rename {htdocs => public}/don/class/donstats.class.php (100%)
 rename {htdocs => public}/don/class/index.html (100%)
 rename {htdocs => public}/don/class/paymentdonation.class.php (100%)
 rename {htdocs => public}/don/document.php (100%)
 rename {htdocs => public}/don/index.html (100%)
 rename {htdocs => public}/don/index.php (100%)
 rename {htdocs => public}/don/info.php (100%)
 rename {htdocs => public}/don/list.php (100%)
 rename {htdocs => public}/don/note.php (100%)
 rename {htdocs => public}/don/payment/card.php (100%)
 rename {htdocs => public}/don/payment/index.html (100%)
 rename {htdocs => public}/don/payment/payment.php (100%)
 rename {htdocs => public}/don/stats/index.php (100%)
 rename {htdocs => public}/ecm/ajax/ecmdatabase.php (100%)
 rename {htdocs => public}/ecm/ajax/index.html (100%)
 rename {htdocs => public}/ecm/class/ecmdirectory.class.php (100%)
 rename {htdocs => public}/ecm/class/htmlecm.form.class.php (100%)
 rename {htdocs => public}/ecm/class/index.html (100%)
 rename {htdocs => public}/ecm/docdir.php (100%)
 rename {htdocs => public}/ecm/docfile.php (100%)
 rename {htdocs => public}/ecm/docmine.php (100%)
 rename {htdocs => public}/ecm/docother.php (100%)
 rename {htdocs => public}/ecm/index.php (100%)
 rename {htdocs => public}/ecm/index_auto.php (100%)
 rename {htdocs => public}/ecm/search.php (100%)
 rename {htdocs => public}/ecm/tpl/enablefiletreeajax.tpl.php (100%)
 rename {htdocs => public}/ecm/tpl/index.html (100%)
 rename {htdocs => public}/expedition/card.php (100%)
 rename {htdocs => public}/expedition/class/expedition.class.php (100%)
 rename {htdocs => public}/expedition/class/expeditionbatch.class.php (100%)
 rename {htdocs => public}/expedition/class/expeditionstats.class.php (100%)
 rename {htdocs => public}/expedition/class/index.html (100%)
 rename {htdocs => public}/expedition/contact.php (100%)
 rename {htdocs => public}/expedition/index.php (100%)
 rename {htdocs => public}/expedition/list.php (100%)
 rename {htdocs => public}/expedition/note.php (100%)
 rename {htdocs => public}/expedition/shipment.php (100%)
 rename {htdocs => public}/expedition/stats/index.php (100%)
 rename {htdocs => public}/expedition/stats/month.php (100%)
 rename {htdocs => public}/expedition/tpl/index.html (100%)
 rename {htdocs => public}/expedition/tpl/linkedobjectblock.tpl.php (100%)
 rename {htdocs => public}/expensereport/ajax/ajaxprojet.php (100%)
 rename {htdocs => public}/expensereport/ajax/index.html (100%)
 rename {htdocs => public}/expensereport/card.php (100%)
 rename {htdocs => public}/expensereport/class/api_expensereports.class.php (100%)
 rename {htdocs => public}/expensereport/class/expensereport.class.php (100%)
 rename {htdocs => public}/expensereport/class/expensereportstats.class.php (100%)
 rename {htdocs => public}/expensereport/class/index.html (100%)
 rename {htdocs => public}/expensereport/class/paymentexpensereport.class.php (100%)
 rename {htdocs => public}/expensereport/document.php (100%)
 rename {htdocs => public}/expensereport/export_csv.php (100%)
 rename {htdocs => public}/expensereport/index.html (100%)
 rename {htdocs => public}/expensereport/index.php (100%)
 rename {htdocs => public}/expensereport/info.php (100%)
 rename {htdocs => public}/expensereport/list.php (100%)
 rename {htdocs => public}/expensereport/note.php (100%)
 rename {htdocs => public}/expensereport/payment/card.php (100%)
 rename {htdocs => public}/expensereport/payment/index.html (100%)
 rename {htdocs => public}/expensereport/payment/payment.php (100%)
 rename {htdocs => public}/expensereport/stats/index.html (100%)
 rename {htdocs => public}/expensereport/stats/index.php (100%)
 rename {htdocs => public}/expensereport/synchro_compta.php (100%)
 rename {htdocs => public}/expensereport/tpl/index.html (100%)
 rename {htdocs => public}/expensereport/tpl/linkedobjectblock.tpl.php (100%)
 rename {htdocs => public}/exports/class/export.class.php (100%)
 rename {htdocs => public}/exports/class/index.html (100%)
 rename {htdocs => public}/exports/export.php (100%)
 rename {htdocs => public}/exports/index.php (100%)
 rename {htdocs => public}/externalsite/admin/externalsite.php (100%)
 rename {htdocs => public}/externalsite/admin/index.html (100%)
 rename {htdocs => public}/externalsite/frames.php (100%)
 rename {htdocs => public}/externalsite/frametop.php (100%)
 rename {htdocs => public}/externalsite/index.html (100%)
 rename {htdocs => public}/favicon.ico (100%)
 rename {htdocs => public}/fichinter/admin/fichinter_extrafields.php (100%)
 rename {htdocs => public}/fichinter/admin/fichinterdet_extrafields.php (100%)
 rename {htdocs => public}/fichinter/admin/index.html (100%)
 rename {htdocs => public}/fichinter/apercu.php (100%)
 rename {htdocs => public}/fichinter/card.php (100%)
 rename {htdocs => public}/fichinter/class/fichinter.class.php (100%)
 rename {htdocs => public}/fichinter/class/fichinterstats.class.php (100%)
 rename {htdocs => public}/fichinter/class/index.html (100%)
 rename {htdocs => public}/fichinter/contact.php (100%)
 rename {htdocs => public}/fichinter/document.php (100%)
 rename {htdocs => public}/fichinter/index.html (100%)
 rename {htdocs => public}/fichinter/index.php (100%)
 rename {htdocs => public}/fichinter/info.php (100%)
 rename {htdocs => public}/fichinter/list.php (100%)
 rename {htdocs => public}/fichinter/note.php (100%)
 rename {htdocs => public}/fichinter/stats/index.php (100%)
 rename {htdocs => public}/fichinter/tpl/index.html (100%)
 rename {htdocs => public}/fichinter/tpl/linkedobjectblock.tpl.php (100%)
 rename {htdocs => public}/filefunc.inc.php (100%)
 rename {htdocs => public}/fourn/ajax/getSupplierPrices.php (100%)
 rename {htdocs => public}/fourn/ajax/index.html (100%)
 rename {htdocs => public}/fourn/card.php (100%)
 rename {htdocs => public}/fourn/class/api_supplier_invoices.class.php (100%)
 rename {htdocs => public}/fourn/class/fournisseur.class.php (100%)
 rename {htdocs => public}/fourn/class/fournisseur.commande.class.php (100%)
 rename {htdocs => public}/fourn/class/fournisseur.commande.dispatch.class.php (100%)
 rename {htdocs => public}/fourn/class/fournisseur.facture.class.php (100%)
 rename {htdocs => public}/fourn/class/fournisseur.product.class.php (100%)
 rename {htdocs => public}/fourn/class/index.html (100%)
 rename {htdocs => public}/fourn/class/paiementfourn.class.php (100%)
 rename {htdocs => public}/fourn/commande/card.php (100%)
 rename {htdocs => public}/fourn/commande/contact.php (100%)
 rename {htdocs => public}/fourn/commande/dispatch.php (100%)
 rename {htdocs => public}/fourn/commande/document.php (100%)
 rename {htdocs => public}/fourn/commande/index.php (100%)
 rename {htdocs => public}/fourn/commande/info.php (100%)
 rename {htdocs => public}/fourn/commande/list.php (100%)
 rename {htdocs => public}/fourn/commande/note.php (100%)
 rename {htdocs => public}/fourn/commande/orderstoinvoice.php (100%)
 rename {htdocs => public}/fourn/commande/tpl/index.html (100%)
 rename {htdocs => public}/fourn/commande/tpl/linkedobjectblock.tpl.php (100%)
 rename {htdocs => public}/fourn/contact.php (100%)
 rename {htdocs => public}/fourn/facture/card.php (100%)
 rename {htdocs => public}/fourn/facture/contact.php (100%)
 rename {htdocs => public}/fourn/facture/document.php (100%)
 rename {htdocs => public}/fourn/facture/impayees.php (100%)
 rename {htdocs => public}/fourn/facture/index.html (100%)
 rename {htdocs => public}/fourn/facture/info.php (100%)
 rename {htdocs => public}/fourn/facture/list.php (100%)
 rename {htdocs => public}/fourn/facture/note.php (100%)
 rename {htdocs => public}/fourn/facture/paiement.php (100%)
 rename {htdocs => public}/fourn/facture/tpl/index.html (100%)
 rename {htdocs => public}/fourn/facture/tpl/linkedobjectblock.tpl.php (100%)
 rename {htdocs => public}/fourn/index.php (100%)
 rename {htdocs => public}/fourn/js/lib_dispatch.js (100%)
 rename {htdocs => public}/fourn/paiement/card.php (100%)
 rename {htdocs => public}/fourn/paiement/index.html (100%)
 rename {htdocs => public}/fourn/paiement/info.php (100%)
 rename {htdocs => public}/fourn/product/list.php (100%)
 rename {htdocs => public}/fourn/recap-fourn.php (100%)
 rename {htdocs => public}/ftp/admin/ftpclient.php (100%)
 rename {htdocs => public}/ftp/admin/index.html (100%)
 rename {htdocs => public}/ftp/index.php (100%)
 rename {htdocs => public}/holiday/card.php (100%)
 rename {htdocs => public}/holiday/class/holiday.class.php (100%)
 rename {htdocs => public}/holiday/class/index.html (100%)
 rename {htdocs => public}/holiday/common.inc.php (100%)
 rename {htdocs => public}/holiday/define_holiday.php (100%)
 rename {htdocs => public}/holiday/document.php (100%)
 rename {htdocs => public}/holiday/img/add.png (100%)
 rename {htdocs => public}/holiday/img/conges.png (100%)
 rename {htdocs => public}/holiday/img/delete.png (100%)
 rename {htdocs => public}/holiday/img/edit.png (100%)
 rename {htdocs => public}/holiday/img/index.html (100%)
 rename {htdocs => public}/holiday/index.html (100%)
 rename {htdocs => public}/holiday/list.php (100%)
 rename {htdocs => public}/holiday/view_log.php (100%)
 rename {htdocs => public}/hrm/admin/admin_establishment.php (100%)
 rename {htdocs => public}/hrm/admin/admin_hrm.php (100%)
 rename {htdocs => public}/hrm/admin/index.html (100%)
 rename {htdocs => public}/hrm/class/establishment.class.php (100%)
 rename {htdocs => public}/hrm/class/index.html (100%)
 rename {htdocs => public}/hrm/establishment/card.php (100%)
 rename {htdocs => public}/hrm/establishment/index.html (100%)
 rename {htdocs => public}/hrm/establishment/info.php (100%)
 rename {htdocs => public}/hrm/index.html (100%)
 rename {htdocs => public}/hrm/index.php (100%)
 rename {htdocs => public}/imports/class/import.class.php (100%)
 rename {htdocs => public}/imports/class/index.html (100%)
 rename {htdocs => public}/imports/emptyexample.php (100%)
 rename {htdocs => public}/imports/import.php (100%)
 rename {htdocs => public}/imports/index.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/AutoLoader.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Consumer/Credentials.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Consumer/CredentialsInterface.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Exception/Exception.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Http/Client/AbstractClient.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Http/Client/ClientInterface.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Http/Client/CurlClient.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Http/Client/StreamClient.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Http/Exception/TokenResponseException.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Http/Uri/Uri.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Http/Uri/UriFactory.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Http/Uri/UriFactoryInterface.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Http/Uri/UriInterface.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Service/AbstractService.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Service/ServiceInterface.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Storage/DoliStorage.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Storage/Exception/AuthorizationStateNotFoundException.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Storage/Exception/StorageException.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Storage/Exception/TokenNotFoundException.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Storage/Memory.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Storage/Redis.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Storage/Session.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Storage/SymfonySession.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Storage/TokenStorageInterface.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Token/AbstractToken.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Token/Exception/ExpiredTokenException.php (100%)
 rename {htdocs => public}/includes/OAuth/Common/Token/TokenInterface.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Service/AbstractService.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Service/BitBucket.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Service/Etsy.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Service/FitBit.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Service/FiveHundredPx.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Service/Flickr.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Service/QuickBooks.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Service/Redmine.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Service/ScoopIt.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Service/ServiceInterface.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Service/Tumblr.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Service/Twitter.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Service/Xing.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Service/Yahoo.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Signature/Exception/UnsupportedHashAlgorithmException.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Signature/Signature.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Signature/SignatureInterface.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Token/StdOAuth1Token.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth1/Token/TokenInterface.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/AbstractService.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Amazon.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Bitly.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Bitrix24.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Box.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Buffer.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Dailymotion.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Delicious.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/DeviantArt.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Dropbox.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/EveOnline.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Exception/InvalidAccessTypeException.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Exception/InvalidAuthorizationStateException.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Exception/InvalidScopeException.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Exception/MissingRefreshTokenException.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Facebook.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Foursquare.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/GitHub.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Google.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Harvest.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Heroku.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Hubic.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Instagram.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/JawboneUP.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Linkedin.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Mailchimp.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Microsoft.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Nest.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Netatmo.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/ParrotFlowerPower.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Paypal.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Pocket.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Reddit.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/RunKeeper.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Salesforce.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/ServiceInterface.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/SoundCloud.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Spotify.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Strava.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Ustream.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Vimeo.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Vkontakte.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Yahoo.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Service/Yammer.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Token/StdOAuth2Token.php (100%)
 rename {htdocs => public}/includes/OAuth/OAuth2/Token/TokenInterface.php (100%)
 rename {htdocs => public}/includes/OAuth/ServiceFactory.php (100%)
 rename {htdocs => public}/includes/OAuth/bootstrap.php (100%)
 rename {htdocs => public}/includes/adodbtime/adodb-time.inc.php (100%)
 rename {htdocs => public}/includes/adodbtime/index.html (100%)
 rename {htdocs => public}/includes/ccampbell/chromephp/ChromePhp.php (100%)
 rename {htdocs => public}/includes/ccampbell/chromephp/README.md (100%)
 rename {htdocs => public}/includes/ccampbell/chromephp/composer.json (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/CHANGES.md (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/LICENSE.md (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/README.md (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/adapters/jquery.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/bower.json (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/build-config.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/ckeditor.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/composer.json (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/config.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/contents.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/af.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/ar.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/bg.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/bn.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/bs.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/ca.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/cs.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/cy.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/da.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/de-ch.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/de.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/el.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/en-au.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/en-ca.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/en-gb.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/en.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/eo.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/es.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/et.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/eu.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/fa.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/fi.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/fo.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/fr-ca.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/fr.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/gl.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/gu.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/he.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/hi.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/hr.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/hu.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/id.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/is.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/it.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/ja.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/ka.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/km.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/ko.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/ku.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/lt.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/lv.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/mk.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/mn.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/ms.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/nb.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/nl.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/no.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/pl.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/pt-br.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/pt.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/ro.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/ru.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/si.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/sk.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/sl.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/sq.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/sr-latn.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/sr.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/sv.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/th.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/tr.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/tt.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/ug.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/uk.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/vi.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/zh-cn.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/lang/zh.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/package.json (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/about/dialogs/logo_ckeditor.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/div/dialogs/div.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/flash/dialogs/flash.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/flash/images/placeholder.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/forms/images/hiddenfield.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/icons.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/icons_hidpi.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/iframe/images/placeholder.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/image/images/noimage.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/link/images/anchor.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/link/images/hidpi/anchor.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/magicline/images/icon-rtl.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/magicline/images/icon.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/pagebreak/images/pagebreak.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/preview/preview.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/scayt/README.md (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/scayt/dialogs/toolbar.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_address.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_blockquote.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_div.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h1.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h2.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h3.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h4.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h5.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h6.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_p.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_pre.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/embaressed_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/heart.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/heart.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/tounge_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/templates/templates/default.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/templates/templates/images/template1.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/templates/templates/images/template2.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/templates/templates/images/template3.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/wsc/README.md (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmpFrameset.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc_ie.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/css/samples.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/img/github-top.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/img/header-bg.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/img/header-separator.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/img/logo.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/img/navigation-tip.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/index.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/js/sample.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/js/sf.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/ajax.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/api.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/appendto.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/assets/inlineall/logo.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/assets/posteddata.php (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/assets/sample.jpg (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/assets/uilanguages/languages.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/datafiltering.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/dialog/assets/my_dialog.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/dialog/dialog.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/divreplace.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/enterkey/enterkey.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputforflash.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputhtml.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/index.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/inlineall.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/inlinebycode.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/inlinetextarea.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/jquery.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/magicline/magicline.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/readonly.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/replacebyclass.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/replacebycode.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/sample.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/sample.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/sample_posteddata.php (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/tabindex.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/toolbar/toolbar.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/uicolor.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/uilanguages.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/old/xhtmlstyle.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/css/fontello.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/config.json (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.eot (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.svg (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.ttf (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.woff (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/dialog.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/editor.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/editor_ie.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/icons.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/icons_hidpi.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/images/arrow.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/images/close.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/images/hidpi/close.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/images/lock-open.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/images/lock.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/images/refresh.png (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/images/spinner.gif (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/skins/moono/readme.md (100%)
 rename {htdocs => public}/includes/ckeditor/ckeditor/styles.js (100%)
 rename {htdocs => public}/includes/evalmath/README.md (100%)
 rename {htdocs => public}/includes/evalmath/evalmath.class.php (100%)
 rename {htdocs => public}/includes/fonts/Aerial.ttf (100%)
 rename {htdocs => public}/includes/fonts/AerialBd.ttf (100%)
 rename {htdocs => public}/includes/fonts/AerialBdIt.ttf (100%)
 rename {htdocs => public}/includes/fonts/AerialIt.ttf (100%)
 rename {htdocs => public}/includes/fonts/CHANGELOG.TXT (100%)
 rename {htdocs => public}/includes/fonts/COPYRIGHT.TXT (100%)
 rename {htdocs => public}/includes/fpdfi/README.txt (100%)
 rename {htdocs => public}/includes/fpdfi/filters/FilterASCII85.php (100%)
 rename {htdocs => public}/includes/fpdfi/filters/FilterASCII85_FPDI.php (100%)
 rename {htdocs => public}/includes/fpdfi/filters/FilterASCIIHexDecode.php (100%)
 rename {htdocs => public}/includes/fpdfi/filters/FilterLZW.php (100%)
 rename {htdocs => public}/includes/fpdfi/filters/FilterLZW_FPDI.php (100%)
 rename {htdocs => public}/includes/fpdfi/fpdf_tpl.php (100%)
 rename {htdocs => public}/includes/fpdfi/fpdi.php (100%)
 rename {htdocs => public}/includes/fpdfi/fpdi_bridge.php (100%)
 rename {htdocs => public}/includes/fpdfi/fpdi_pdf_parser.php (100%)
 rename {htdocs => public}/includes/fpdfi/pdf_context.php (100%)
 rename {htdocs => public}/includes/fpdfi/pdf_parser.php (100%)
 rename {htdocs => public}/includes/geoip/README.txt (100%)
 rename {htdocs => public}/includes/geoip/geoip.inc (100%)
 rename {htdocs => public}/includes/geoip/geoipcity.inc (100%)
 rename {htdocs => public}/includes/geoip/geoipregionvars.php (100%)
 rename {htdocs => public}/includes/geoip/sample.php (100%)
 rename {htdocs => public}/includes/geoip/sample_city.php (100%)
 rename {htdocs => public}/includes/geoip/sample_distributed.php (100%)
 rename {htdocs => public}/includes/geoip/sample_netspeed.php (100%)
 rename {htdocs => public}/includes/geoip/sample_org.php (100%)
 rename {htdocs => public}/includes/geoip/sample_region.php (100%)
 rename {htdocs => public}/includes/index.html (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-icons_2e83ff_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-icons_469bdd_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-icons_cd0a0a_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-icons_d8e7f3_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/images/ui-icons_f9bd01_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/jquery-ui.css (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/jquery-ui.min.css (100%)
 rename {htdocs => public}/includes/jquery/css/redmond/theme.css (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/images/ui-icons_222222_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/images/ui-icons_454545_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/images/ui-icons_888888_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/jquery-ui.css (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/jquery-ui.min.css (100%)
 rename {htdocs => public}/includes/jquery/css/smoothness/theme.css (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/jquery-ui.css (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/jquery-ui.min.css (100%)
 rename {htdocs => public}/includes/jquery/css/ui-lightness/theme.css (100%)
 rename {htdocs => public}/includes/jquery/js/jquery-ui.js (100%)
 rename {htdocs => public}/includes/jquery/js/jquery-ui.min.js (100%)
 rename {htdocs => public}/includes/jquery/js/jquery.js (100%)
 rename {htdocs => public}/includes/jquery/js/jquery.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/blockUI/jquery.blockUI.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/colorpicker/jquery.colorpicker.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/colorpicker/jquery.colorpicker.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/fileupload/README.md (100%)
 rename {htdocs => public}/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/fileupload/img/loading.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/fileupload/img/progressbar.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/fileupload/js/cors/jquery.postmessage-transport.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/fileupload/js/jquery.fileupload.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/fileupload/js/locale.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/fileupload/js/main.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/fileupload/js/vendor/jquery.ui.widget.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/API.md (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/CONTRIBUTING.md (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/FAQ.md (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/LICENSE.txt (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/Makefile (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/NEWS.md (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/PLUGINS.md (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/README.md (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/excanvas.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/excanvas.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.colorhelpers.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.colorhelpers.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.canvas.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.canvas.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.categories.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.categories.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.crosshair.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.crosshair.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.errorbars.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.errorbars.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.fillbetween.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.fillbetween.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.image.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.image.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.navigate.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.navigate.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.pie.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.pie.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.resize.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.resize.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.selection.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.selection.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.stack.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.stack.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.symbol.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.symbol.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.threshold.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.threshold.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.time.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/flot/jquery.flot.time.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jcrop/css/Jcrop.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/jcrop/index.html (100%)
 rename {htdocs => public}/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jeditable/jquery.jeditable.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jeditable/jquery.jeditable.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/jnotify/jquery.jnotify.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/jnotify/jquery.jnotify.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jnotify/jquery.jnotify.min.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/jnotify/jquery.jnotify.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/ChangeLog.txt (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/Example.html (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/ReadMe.txt (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/images/AlphaBar.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/images/Bars.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/images/Maps.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/images/NoColor.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/images/bar-opacity.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/images/map-opacity.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/images/mappoint.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/images/picker.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/images/preview-opacity.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/images/rangearrows.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/jPicker.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/jpicker-1.1.6.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/application.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/code.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/css.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/db.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/directory.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/doc.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/file.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/film.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/flash.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/folder_open.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/html.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/java.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/linux.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/music.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/pdf.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/php.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/picture.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/ppt.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/psd.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/ruby.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/script.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/spinner.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/txt.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/xls.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/images/zip.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/changelog.md (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/ajax-loader.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/file.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/folder-closed.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/folder.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/minus.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/plus.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/treeview-black-line.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/treeview-black.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/treeview-default-line.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/treeview-default.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam-line.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/treeview-gray-line.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/treeview-gray.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/treeview-red-line.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/images/treeview-red.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/jquery.treeview.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/jquery.treeview.edit.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/jquery.treeview.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/readme.md (100%)
 rename {htdocs => public}/includes/jquery/plugins/jquerytreeview/screenshot.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/layout/jquery.layout.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/layout/jquery.layout.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/mobile/images/ajax-loader.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/mobile/images/icons-18-black.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/mobile/images/icons-18-white.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/mobile/images/icons-36-black.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/mobile/images/icons-36-white.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/mobile/jquery.mobile-latest.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/mobile/jquery.mobile-latest.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/multiselect/MIT-LICENSE.txt (100%)
 rename {htdocs => public}/includes/jquery/plugins/multiselect/css/ui.multiselect.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/multiselect/js/ui.multiselect.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/.gitignore (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/CONTRIBUTING.md (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/LICENSE (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/README.md (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/bower.json (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/component.json (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/composer.json (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/package.json (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/release.sh (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2-bootstrap.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2-spinner.gif (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2.jquery.json (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_ar.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_az.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_bg.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_ca.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_cs.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_da.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_de.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_el.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_en.js.template (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_es.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_et.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_eu.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_fa.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_fi.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_fr.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_gl.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_he.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_hr.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_hu.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_id.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_is.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_it.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_ja.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_ka.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_ko.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_lt.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_lv.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_mk.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_ms.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_nb.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_nl.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_pl.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_pt-BR.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_pt-PT.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_ro.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_rs.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_ru.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_sk.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_sv.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_th.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_tr.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_ug-CN.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_uk.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_vi.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_zh-CN.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2_locale_zh-TW.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/select2/select2x2.png (100%)
 rename {htdocs => public}/includes/jquery/plugins/tablednd/README.txt (100%)
 rename {htdocs => public}/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css (100%)
 rename {htdocs => public}/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/tiptip/jquery.tipTip.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/tiptip/jquery.tipTip.min.js (100%)
 rename {htdocs => public}/includes/jquery/plugins/tiptip/tipTip.css (100%)
 rename {htdocs => public}/includes/jsgantt/index.htm (100%)
 rename {htdocs => public}/includes/jsgantt/jsgantt.css (100%)
 rename {htdocs => public}/includes/jsgantt/jsgantt.js (100%)
 rename {htdocs => public}/includes/jsgantt/jsgantt.min.js (100%)
 rename {htdocs => public}/includes/jsgantt/jsgantt_Minutes.html (100%)
 rename {htdocs => public}/includes/jsgantt/jsgantt_exExternalXML.html (100%)
 rename {htdocs => public}/includes/jsgantt/project.xml (100%)
 rename {htdocs => public}/includes/jstz/jstz.js (100%)
 rename {htdocs => public}/includes/jstz/jstz.min.js (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/.gitignore (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/Escpos.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/LICENSE.md (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/README.md (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/composer.json (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/composer.lock (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/doc/Makefile (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/doc/escpos.conf (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/README.md (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/barcode.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/bit-image.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/character-encodings-with-images.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/character-encodings.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/character-tables.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/demo.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/graphics.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/interface/README.md (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/interface/ethernet.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/interface/linux-usb.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/interface/smb.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/interface/windows-lpt.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/interface/windows-usb.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/print-from-html.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/print-from-pdf.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/qr-code.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/receipt-with-logo.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/resources/character-encoding-test-strings.inc (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/resources/document.odt (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/resources/document.pdf (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/resources/document.z (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/resources/escpos-php-small.png (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/resources/escpos-php.png (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/resources/tux.png (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/specific/29-latvian-star-tup592.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/specific/32-german-tm-t20-ii-custom-command.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/specific/33-spanish-seypos-prp-300.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/specific/39-currency-symbols.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/specific/44-pound-symbol-star-tsp650.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/specific/50-P-822D-greek.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/specific/54-gfx-sidebyside.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/specific/6-arabic-epos-tep-220m.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/specific/README.md (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/example/text-size.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/AbstractCapabilityProfile.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/CodePage.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/DefaultCapabilityProfile.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/DummyPrintConnector.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/EposTepCapabilityProfile.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/EscposImage.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/EscposPrintBuffer.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/FilePrintConnector.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/ImagePrintBuffer.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/NetworkPrintConnector.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/P822DCapabilityProfile.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/PrintBuffer.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/PrintConnector.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/SimpleCapabilityProfile.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/StarCapabilityProfile.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/WindowsPrintConnector.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/cache/Characters-DefaultCapabilityProfile.ser.gz (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/cache/Characters-SimpleCapabilityProfile.ser.gz (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/src/cache/Characters-StarCapabilityProfile.ser.gz (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/bootstrap.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/integration/ExampleTest.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/integration/resources/output/barcode.bin (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/integration/resources/output/bit-image.bin (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/integration/resources/output/character-encodings.bin (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/integration/resources/output/character-tables.bin (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/integration/resources/output/demo.bin (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/integration/resources/output/graphics.bin (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/integration/resources/output/interface.bin (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/integration/resources/output/print-from-pdf.bin.z (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/integration/resources/output/qr-code.bin (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/integration/resources/output/receipt-with-logo.bin (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/integration/resources/output/text-size.bin (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/phpunit.xml (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/AbstractCapabilityProfileTest.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/EscposImageTest.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/EscposPrintBufferTest.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/EscposTest.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/WindowsPrintConnectorTest.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/black_transparent.gif (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/black_transparent.png (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/black_white.bmp (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/black_white.gif (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/black_white.jpg (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/black_white.png (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/canvas_black.bmp (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/canvas_black.gif (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/canvas_black.jpg (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/canvas_black.png (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/canvas_white.bmp (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/canvas_white.gif (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/canvas_white.jpg (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/canvas_white.png (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/demo.php (100%)
 rename {htdocs => public}/includes/mike42/escpos-php/test/unit/resources/doc.pdf (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/.gitignore (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/.php_cs (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/.travis.yml (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/LICENSE.txt (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/README.md (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/composer.json (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/examples/demo.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/examples/session_example.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/examples/test.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/export/exportToJSON.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/BasicsTest.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/UA_List.inc.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/UA_List.pending.txt (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/UserAgentTest.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/VendorsTest_tmp.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/bootstrap.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/phpunit.xml (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Acer.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Alcatel.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Allview.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Amazon.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Apple.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Archos.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Asus.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Blackberry.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Dell.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Google.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HP.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HTC.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Huawei.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/LG.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lava.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Leader.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lenovo.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Mi.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Microsoft.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Motorola.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Nokia.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Onda.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Others.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Prestigio.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Samsung.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Sony.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/SpecialCases.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Vodafone.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/ZTE.php (100%)
 rename {htdocs => public}/includes/mobiledetect/mobiledetectlib/tests/ualist.json (100%)
 rename {htdocs => public}/includes/nusoap/lib/Mail/mime.php (100%)
 rename {htdocs => public}/includes/nusoap/lib/Mail/mimePart.php (100%)
 rename {htdocs => public}/includes/nusoap/lib/changelog (100%)
 rename {htdocs => public}/includes/nusoap/lib/class.nusoap_base.php (100%)
 rename {htdocs => public}/includes/nusoap/lib/class.soap_fault.php (100%)
 rename {htdocs => public}/includes/nusoap/lib/class.soap_parser.php (100%)
 rename {htdocs => public}/includes/nusoap/lib/class.soap_server.php (100%)
 rename {htdocs => public}/includes/nusoap/lib/class.soap_transport_http.php (100%)
 rename {htdocs => public}/includes/nusoap/lib/class.soap_val.php (100%)
 rename {htdocs => public}/includes/nusoap/lib/class.soapclient.php (100%)
 rename {htdocs => public}/includes/nusoap/lib/class.wsdl.php (100%)
 rename {htdocs => public}/includes/nusoap/lib/class.wsdlcache.php (100%)
 rename {htdocs => public}/includes/nusoap/lib/class.xmlschema.php (100%)
 rename {htdocs => public}/includes/nusoap/lib/nusoap.php (100%)
 rename {htdocs => public}/includes/nusoap/lib/nusoapmime.php (100%)
 rename {htdocs => public}/includes/odtphp/Segment.php (100%)
 rename {htdocs => public}/includes/odtphp/SegmentIterator.php (100%)
 rename {htdocs => public}/includes/odtphp/odf.php (100%)
 rename {htdocs => public}/includes/odtphp/zip/PclZipProxy.php (100%)
 rename {htdocs => public}/includes/odtphp/zip/PhpZipProxy.php (100%)
 rename {htdocs => public}/includes/odtphp/zip/ZipInterface.php (100%)
 rename {htdocs => public}/includes/odtphp/zip/pclzip/gnu-lgpl.txt (100%)
 rename {htdocs => public}/includes/odtphp/zip/pclzip/pclzip.lib.php (100%)
 rename {htdocs => public}/includes/odtphp/zip/pclzip/readme.txt (100%)
 rename {htdocs => public}/includes/php-iban/.gitignore (100%)
 rename {htdocs => public}/includes/php-iban/LICENSE (100%)
 rename {htdocs => public}/includes/php-iban/mistranscriptions.txt (100%)
 rename {htdocs => public}/includes/php-iban/oophp-iban.php (100%)
 rename {htdocs => public}/includes/php-iban/php-iban.php (100%)
 rename {htdocs => public}/includes/php-iban/registry.txt (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/.gitattributes (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/.gitignore (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/.travis.yml (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Autoloader.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/APC.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/ICache.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memory.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorageFactory.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/Logger.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Database.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/DateTime.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Engineering.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Exception.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/ExceptionHandler.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Financial.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaParser.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaToken.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Function.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Functions.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Logical.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/LookupRef.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/MathTrig.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Statistical.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/TextData.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Token/Stack.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/functionlist.txt (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/AdvancedValueBinder.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataType.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DefaultValueBinder.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/Hyperlink.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/IValueBinder.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Axis.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeries.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeriesValues.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Exception.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/GridLines.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Layout.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Legend.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/PlotArea.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Properties.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Title.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Comment.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentProperties.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentSecurity.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Exception.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/HashTable.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Helper/HTML.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/IComparable.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/NamedRange.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Abstract.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/CSV.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/DefaultReadFilter.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2003XML.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Chart.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Theme.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/Escher.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Exception.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Gnumeric.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/HTML.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReadFilter.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReader.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/OOCalc.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/SYLK.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/ReferenceHelper.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/ITextElement.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/Run.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/TextElement.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Settings.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/CodePage.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Date.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Drawing.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Excel5.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/File.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Font.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/Matrix.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Maths.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/ChainedBlockStream.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/File.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/readme.txt (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PasswordHasher.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/String.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/TimeZone.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/XMLWriter.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipArchive.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipStreamWrapper.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/bestFitClass.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/exponentialBestFitClass.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/linearBestFitClass.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/logarithmicBestFitClass.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/polynomialBestFitClass.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/powerBestFitClass.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/trendClass.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Alignment.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Borders.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Color.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Conditional.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Fill.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Font.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/NumberFormat.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Protection.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Supervisor.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/BaseDrawing.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/CellIterator.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Column.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnCellIterator.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnDimension.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnIterator.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing/Shadow.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooter.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/MemoryDrawing.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageMargins.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageSetup.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Protection.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Row.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowCellIterator.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowDimension.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowIterator.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/SheetView.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/WorksheetIterator.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Abstract.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/CSV.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Comments.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/DocProps.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Drawing.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Rels.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsRibbon.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsVBA.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/StringTable.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Style.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Theme.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Workbook.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Worksheet.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/WriterPart.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Font.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Parser.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Workbook.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Worksheet.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Exception.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/HTML.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/IWriter.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/Core.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/bg/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/changelog.txt (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/composer.json (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/install.txt (100%)
 rename {htdocs => public}/includes/phpoffice/phpexcel/license.md (100%)
 rename {htdocs => public}/includes/printipp/BasicIPP.php (100%)
 rename {htdocs => public}/includes/printipp/CupsPrintIPP.php (100%)
 rename {htdocs => public}/includes/printipp/ExtendedPrintIPP.php (100%)
 rename {htdocs => public}/includes/printipp/PrintIPP.php (100%)
 rename {htdocs => public}/includes/printipp/http_class.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/ApcCache.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/AutoLoader.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/CommentParser.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Compose.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Data/Arr.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Data/Invalid.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Data/Object.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Data/Text.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Data/Validator.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Data/ValueObject.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Data/iValidate.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Data/iValueObject.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Defaults.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/EventDispatcher.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Explorer.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/ExplorerInfo.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Flash.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/DependentFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/DependentMultiFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/Format.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/JsFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Format/iFormat.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/HumanReadableCache.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/MemcacheCache.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/PassThrough.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/README.md (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Redirect.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Resources.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/RestException.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Restler.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Routes.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Scope.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/UI/Emmet.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/UI/FormStyles.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/UI/Forms.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/UI/Nav.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/UI/Tags.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/User.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/Util.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/compatibility/iAuthenticate.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/compatibility/restler1.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/compatibility/restler2.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/composer.json (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/css/reset.css (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/css/screen.css (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/images/explorer_icons.png (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/images/throbber.gif (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/index.html (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/o2c.html (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/iAuthenticate.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/iCache.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/iCompose.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/iFilter.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/iIdentifyUser.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/iUseAuthentication.php (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/views/debug.css (100%)
 rename {htdocs => public}/includes/restler/framework/Luracast/Restler/views/debug.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Attachment.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/CharacterReader.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/CharacterStream.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/ConfigurableSpool.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/DependencyException.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Encoder.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Encoding.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/Event.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/EventListener.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/FileSpool.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/FileStream.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Filterable.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Image.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/InputByteStream.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/IoException.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/KeyCache.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/MailTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mailer.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/MemorySpool.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Message.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/Grammar.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/Header.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/Message.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/MimePart.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/NullTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/OutputByteStream.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/Logger.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Plugins/Timer.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Preferences.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/RfcComplianceException.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/SignedMessage.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Signer.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Spool.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/StreamFilter.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/SwiftException.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/MailTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/TransportException.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/classes/Swift/Validate.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/dependency_maps/cache_deps.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/dependency_maps/message_deps.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/dependency_maps/mime_deps.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/dependency_maps/transport_deps.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/mime_types.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/preferences.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/swift_init.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/swift_required.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/swift_required_pear.php (100%)
 rename {htdocs => public}/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php (100%)
 rename {htdocs => public}/includes/tcpdi/fpdf_tpl.php (100%)
 rename {htdocs => public}/includes/tcpdi/tcpdi.php (100%)
 rename {htdocs => public}/includes/tcpdi/tcpdi_parser.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/CHANGELOG.TXT (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/LICENSE.TXT (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/README.TXT (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/composer.json (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/config/tcpdf_config.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/README (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/aealarabiya.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/aealarabiya.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/aealarabiya.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/aefurat.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/aefurat.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/aefurat.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/cid0cs.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/cid0ct.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/cid0jp.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/cid0kr.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/courier.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/courierb.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/courierbi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/courieri.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/README (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusans.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusans.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusans.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansb.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansb.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansbi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansbi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansbi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansmono.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansmono.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansmono.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserif.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserif.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserif.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifb.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifb.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifb.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/dejavuserifi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20100919/AUTHORS (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20100919/COPYING (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20100919/CREDITS (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20100919/ChangeLog (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20100919/INSTALL (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20100919/README (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/AUTHORS (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/CREDITS (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/INSTALL (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/README (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/USAGE (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freemono.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freemono.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freemono.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freemonob.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freemonob.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freemonob.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freemonobi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freemonobi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freemonobi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freemonoi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freemonoi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freemonoi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freesans.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freesans.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freesans.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freesansb.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freesansb.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freesansb.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freesansbi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freesansbi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freesansbi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freesansi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freesansi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freesansi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freeserif.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freeserif.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freeserif.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freeserifb.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freeserifb.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freeserifb.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freeserifbi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freeserifbi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freeserifbi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freeserifi.ctg.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freeserifi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/freeserifi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/helvetica.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/helveticab.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/helveticabi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/helveticai.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/hysmyeongjostdmedium.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/kozgopromedium.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/kozminproregular.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/msungstdlight.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfacourier.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfacourier.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfacourierb.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfacourierb.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfacourieri.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfacourieri.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfasymbol.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfasymbol.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfatimes.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfatimes.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfatimesb.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfatimesb.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfatimesi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfatimesi.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.z (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/stsongstdlight.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/symbol.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/times.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/timesb.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/timesbi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/timesi.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/uni2cid_ac15.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/uni2cid_ag15.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/uni2cid_aj16.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/uni2cid_ak12.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/fonts/zapfdingbats.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/include/sRGB.icc (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/include/tcpdf_colors.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/include/tcpdf_filters.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/include/tcpdf_font_data.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/include/tcpdf_images.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/include/tcpdf_static.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/tcpdf.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/tcpdf_autoconfig.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/tcpdf_barcodes_2d.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/tcpdf_import.php (100%)
 rename {htdocs => public}/includes/tecnickcom/tcpdf/tcpdf_parser.php (100%)
 rename {htdocs => public}/index.php (100%)
 rename {htdocs => public}/install/.gitignore (100%)
 rename {htdocs => public}/install/check.php (100%)
 rename {htdocs => public}/install/default.css (100%)
 rename {htdocs => public}/install/doctemplates/README (100%)
 rename {htdocs => public}/install/doctemplates/index.html (100%)
 rename {htdocs => public}/install/doctemplates/invoices/index.html (100%)
 rename {htdocs => public}/install/doctemplates/invoices/template_invoice.odt (100%)
 rename {htdocs => public}/install/doctemplates/orders/index.html (100%)
 rename {htdocs => public}/install/doctemplates/orders/template_order.odt (100%)
 rename {htdocs => public}/install/doctemplates/projects/index.html (100%)
 rename {htdocs => public}/install/doctemplates/projects/template_project.odt (100%)
 rename {htdocs => public}/install/doctemplates/proposals/index.html (100%)
 rename {htdocs => public}/install/doctemplates/proposals/template_proposal.odt (100%)
 rename {htdocs => public}/install/doctemplates/shipment/index.html (100%)
 rename {htdocs => public}/install/doctemplates/shipment/template_shipment.odt (100%)
 rename {htdocs => public}/install/doctemplates/supplier_proposal/index.html (100%)
 rename {htdocs => public}/install/doctemplates/supplier_proposal/template_supplier_proposal.odt (100%)
 rename {htdocs => public}/install/doctemplates/tasks/index.html (100%)
 rename {htdocs => public}/install/doctemplates/tasks/template_task_summary.odt (100%)
 rename {htdocs => public}/install/doctemplates/thirdparties/index.html (100%)
 rename {htdocs => public}/install/doctemplates/thirdparties/template_thirdparty.ods (100%)
 rename {htdocs => public}/install/doctemplates/thirdparties/template_thirdparty.odt (100%)
 rename {htdocs => public}/install/fileconf.php (100%)
 rename {htdocs => public}/install/inc.php (100%)
 rename {htdocs => public}/install/index.php (100%)
 rename {htdocs => public}/install/install.forced.sample.php (100%)
 rename {htdocs => public}/install/lib/index.html (100%)
 rename {htdocs => public}/install/lib/repair.lib.php (100%)
 rename {htdocs => public}/install/mssql/README (100%)
 rename {htdocs => public}/install/mssql/functions/index.html (100%)
 rename {htdocs => public}/install/mssql/index.html (100%)
 rename {htdocs => public}/install/mysql/README (100%)
 rename {htdocs => public}/install/mysql/data/index.html (100%)
 rename {htdocs => public}/install/mysql/data/llx_00_c_country.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_10_c_regions.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_20_c_departements.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_accounting.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_accounting_category.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_action_trigger.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_actioncomm.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_availability.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_chargesociales.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_civilite.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_currencies.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_ecotaxe.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_effectif.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_format_cards.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_forme_juridique.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_holiday_type.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_hrm_department.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_hrm_function.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_incoterms.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_input_method.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_input_reason.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_lead_status.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_paiement.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_paper_format.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_payment_term.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_propalst.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_prospectlevel.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_revenuestamp.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_shipment_mode.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_stcomm.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_tva.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_type_contact.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_type_fees.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_type_resource.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_typent.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_c_units.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_const.sql (100%)
 rename {htdocs => public}/install/mysql/data/llx_holiday_config.sql (100%)
 rename {htdocs => public}/install/mysql/functions/functions.sql (100%)
 rename {htdocs => public}/install/mysql/functions/index.html (100%)
 rename {htdocs => public}/install/mysql/index.html (100%)
 rename {htdocs => public}/install/mysql/migration/3.0.0-3.1.0.sql (100%)
 rename {htdocs => public}/install/mysql/migration/3.1.0-3.2.0.sql (100%)
 rename {htdocs => public}/install/mysql/migration/3.2.0-3.3.0.sql (100%)
 rename {htdocs => public}/install/mysql/migration/3.3.0-3.4.0.sql (100%)
 rename {htdocs => public}/install/mysql/migration/3.4.0-3.5.0.sql (100%)
 rename {htdocs => public}/install/mysql/migration/3.5.0-3.6.0.sql (100%)
 rename {htdocs => public}/install/mysql/migration/3.6.0-3.7.0.sql (100%)
 rename {htdocs => public}/install/mysql/migration/3.7.0-3.8.0.sql (100%)
 rename {htdocs => public}/install/mysql/migration/3.8.0-3.9.0.sql (100%)
 rename {htdocs => public}/install/mysql/migration/3.9.0-4.0.0.sql (100%)
 rename {htdocs => public}/install/mysql/migration/4.0.0-5.0.0.sql (100%)
 rename {htdocs => public}/install/mysql/migration/index.html (100%)
 rename {htdocs => public}/install/mysql/migration/repair.sql (100%)
 rename {htdocs => public}/install/mysql/tables/index.html (100%)
 rename {htdocs => public}/install/mysql/tables/llx_accounting_account.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_accounting_account.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_accounting_bookkeeping.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_accounting_bookkeeping.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_accounting_fiscalyear.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_accounting_journal.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_accounting_journal.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_accounting_system.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_accounting_system.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_actioncomm.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_actioncomm.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_actioncomm_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_actioncomm_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_actioncomm_resources.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_actioncomm_resources.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_adherent.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_adherent.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_adherent_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_adherent_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_adherent_type.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_adherent_type.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_adherent_type_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_adherent_type_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_advtargetemailing.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_advtargetemailing.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bank.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bank.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bank_account.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bank_account.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bank_account_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bank_account_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bank_categ.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bank_class.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bank_class.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bank_url.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bank_url.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bookmark.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bookmark.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bordereau_cheque.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_bordereau_cheque.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_boxes.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_boxes.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_boxes_def.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_boxes_def.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_budget.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_budget_lines.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_budget_lines.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_accounting_category.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_accounting_category.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_action_trigger.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_action_trigger.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_actioncomm.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_actioncomm.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_availability.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_availability.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_barcode_type.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_barcode_type.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_chargesociales.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_civility.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_civility.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_country.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_country.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_currencies.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_currencies.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_departements.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_departements.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_ecotaxe.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_ecotaxe.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_effectif.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_effectif.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_email_templates.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_email_templates.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_field_list.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_format_cards.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_forme_juridique.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_forme_juridique.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_holiday_types.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_holiday_types.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_hrm_department.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_hrm_function.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_incoterms.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_incoterms.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_input_method.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_input_method.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_input_reason.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_input_reason.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_lead_status.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_lead_status.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_paiement.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_paiement.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_paper_format.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_payment_term.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_price_expression.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_price_global_variable.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_price_global_variable_updater.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_propalst.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_propalst.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_prospectlevel.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_regions.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_regions.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_revenuestamp.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_shipment_mode.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_shipment_mode.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_stcomm.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_stcomm.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_tva.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_tva.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_type_contact.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_type_contact.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_type_fees.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_type_fees.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_type_resource.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_type_resource.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_typent.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_typent.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_units.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_units.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_ziptown.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_c_ziptown.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_account.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_account.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_contact.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_contact.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_fournisseur.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_fournisseur.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_lang.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_lang.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_member.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_member.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_product.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_product.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_project.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_project.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_societe.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_societe.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_user.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categorie_user.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categories_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_categories_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_chargesociales.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande_fournisseur.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande_fournisseur.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande_fournisseur_dispatch.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande_fournisseur_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande_fournisseur_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande_fournisseur_log.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande_fournisseurdet.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande_fournisseurdet.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande_fournisseurdet_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commandedet.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commandedet.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commandedet_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_commandedet_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_const.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_const.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_contrat.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_contrat.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_contrat_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_contrat_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_contratdet.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_contratdet.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_contratdet_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_contratdet_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_contratdet_log.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_contratdet_log.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_cronjob.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_cronjob.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_deplacement.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_document_model.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_document_model.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_don.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_don_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_don_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_ecm_directories.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_ecm_directories.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_ecm_files.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_ecm_files.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_element_contact.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_element_contact.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_element_element.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_element_element.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_element_resources.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_element_resources.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_element_tag.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_element_tag.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_entrepot.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_entrepot.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_establishment.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_event_element.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_events.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_events.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expedition.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expedition.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expedition_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expedition_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expeditiondet.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expeditiondet.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expeditiondet_batch.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expeditiondet_batch.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expeditiondet_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expeditiondet_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expensereport.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expensereport.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expensereport_det.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expensereport_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_expensereport_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_export_compta.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_export_model.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_export_model.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facture.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facture.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facture_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facture_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facture_fourn.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facture_fourn.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facture_fourn_det.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facture_fourn_det.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facture_fourn_det_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facture_fourn_det_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facture_fourn_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facture_fourn_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facture_rec.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facture_rec.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facturedet.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facturedet.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facturedet_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facturedet_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facturedet_rec.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_facturedet_rec.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_fichinter.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_fichinter.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_fichinter_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_fichinter_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_fichinterdet.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_fichinterdet.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_fichinterdet_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_fichinterdet_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_holiday.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_holiday.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_holiday_config.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_holiday_logs.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_holiday_users.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_import_model.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_import_model.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_links.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_links.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_livraison.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_livraison.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_livraison_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_livraison_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_livraisondet.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_livraisondet.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_livraisondet_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_livraisondet_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_loan.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_localtax.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_mailing.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_mailing_cibles.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_mailing_cibles.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_menu.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_menu.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_multicurrency.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_multicurrency_rate.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_notify.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_notify_def.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_oauth_state.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_oauth_token.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_opensurvey_comments.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_opensurvey_comments.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_opensurvey_formquestions.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_opensurvey_sondage.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_opensurvey_sondage.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_opensurvey_user_formanswers.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_opensurvey_user_studs.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_opensurvey_user_studs.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_overwrite_trans.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_overwrite_trans.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_paiement.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_paiement_facture.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_paiement_facture.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_paiementcharge.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_paiementfourn.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_paiementfourn_facturefourn.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_payment_donation.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_payment_expensereport.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_payment_loan.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_payment_salary.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_payment_salary.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_prelevement_bons.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_prelevement_bons.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_prelevement_facture.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_prelevement_facture.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_prelevement_facture_demande.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_prelevement_lignes.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_prelevement_lignes.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_prelevement_rejet.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_printing.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_association.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_association.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_batch.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_batch.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_customer_price.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_customer_price.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_customer_price_log.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_fournisseur_price.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_fournisseur_price.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_fournisseur_price_log.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_lang.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_lang.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_lot.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_lot.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_lot_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_lot_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_price.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_price.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_price_by_qty.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_price_by_qty.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_pricerules.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_pricerules.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_stock.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_stock.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_product_stock_entrepot.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_projet.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_projet.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_projet_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_projet_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_projet_task.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_projet_task.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_projet_task_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_projet_task_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_projet_task_time.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_projet_task_time.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_propal.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_propal.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_propal_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_propal_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_propal_merge_pdf_product.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_propaldet.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_propaldet.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_propaldet_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_propaldet_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_resource.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_resource.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_resource_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_resource_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_rights_def.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_rights_def.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_societe.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_societe.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_societe_address.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_societe_commerciaux.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_societe_commerciaux.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_societe_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_societe_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_societe_log.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_societe_prices.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_societe_remise.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_societe_remise_except.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_societe_remise_except.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_societe_rib.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_societe_rib.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_socpeople.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_socpeople.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_socpeople_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_socpeople_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_stock_mouvement.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_stock_mouvement.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_subscription.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_subscription.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_supplier_proposal.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_supplier_proposal_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_supplier_proposaldet.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_tva.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_user.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_user.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_user_alert.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_user_clicktodial.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_user_employment.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_user_employment.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_user_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_user_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_user_param.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_user_param.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_user_rib.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_user_rights.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_user_rights.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_usergroup.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_usergroup.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_usergroup_extrafields.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_usergroup_extrafields.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_usergroup_rights.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_usergroup_rights.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_usergroup_user.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_usergroup_user.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_website.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_website.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_website_pages.key.sql (100%)
 rename {htdocs => public}/install/mysql/tables/llx_website_pages.sql (100%)
 rename {htdocs => public}/install/pgsql/README (100%)
 rename {htdocs => public}/install/pgsql/functions/functions.sql (100%)
 rename {htdocs => public}/install/pgsql/functions/index.html (100%)
 rename {htdocs => public}/install/pgsql/index.html (100%)
 rename {htdocs => public}/install/phpinfo.php (100%)
 rename {htdocs => public}/install/repair.php (100%)
 rename {htdocs => public}/install/robots.txt (100%)
 rename {htdocs => public}/install/sqlite3/functions/functions.sql (100%)
 rename {htdocs => public}/install/sqlite3/index.html (100%)
 rename {htdocs => public}/install/step1.php (100%)
 rename {htdocs => public}/install/step2.php (100%)
 rename {htdocs => public}/install/step4.php (100%)
 rename {htdocs => public}/install/step5.php (100%)
 rename {htdocs => public}/install/upgrade.php (100%)
 rename {htdocs => public}/install/upgrade2.php (100%)
 rename {htdocs => public}/langs/HOWTO-Translation.txt (100%)
 rename {htdocs => public}/langs/ar_SA/accountancy.lang (100%)
 rename {htdocs => public}/langs/ar_SA/admin.lang (100%)
 rename {htdocs => public}/langs/ar_SA/agenda.lang (100%)
 rename {htdocs => public}/langs/ar_SA/banks.lang (100%)
 rename {htdocs => public}/langs/ar_SA/bills.lang (100%)
 rename {htdocs => public}/langs/ar_SA/bookmarks.lang (100%)
 rename {htdocs => public}/langs/ar_SA/boxes.lang (100%)
 rename {htdocs => public}/langs/ar_SA/cashdesk.lang (100%)
 rename {htdocs => public}/langs/ar_SA/categories.lang (100%)
 rename {htdocs => public}/langs/ar_SA/commercial.lang (100%)
 rename {htdocs => public}/langs/ar_SA/companies.lang (100%)
 rename {htdocs => public}/langs/ar_SA/compta.lang (100%)
 rename {htdocs => public}/langs/ar_SA/contracts.lang (100%)
 rename {htdocs => public}/langs/ar_SA/cron.lang (100%)
 rename {htdocs => public}/langs/ar_SA/deliveries.lang (100%)
 rename {htdocs => public}/langs/ar_SA/dict.lang (100%)
 rename {htdocs => public}/langs/ar_SA/donations.lang (100%)
 rename {htdocs => public}/langs/ar_SA/ecm.lang (100%)
 rename {htdocs => public}/langs/ar_SA/errors.lang (100%)
 rename {htdocs => public}/langs/ar_SA/exports.lang (100%)
 rename {htdocs => public}/langs/ar_SA/externalsite.lang (100%)
 rename {htdocs => public}/langs/ar_SA/ftp.lang (100%)
 rename {htdocs => public}/langs/ar_SA/help.lang (100%)
 rename {htdocs => public}/langs/ar_SA/holiday.lang (100%)
 rename {htdocs => public}/langs/ar_SA/hrm.lang (100%)
 rename {htdocs => public}/langs/ar_SA/incoterm.lang (100%)
 rename {htdocs => public}/langs/ar_SA/install.lang (100%)
 rename {htdocs => public}/langs/ar_SA/interventions.lang (100%)
 rename {htdocs => public}/langs/ar_SA/languages.lang (100%)
 rename {htdocs => public}/langs/ar_SA/ldap.lang (100%)
 rename {htdocs => public}/langs/ar_SA/link.lang (100%)
 rename {htdocs => public}/langs/ar_SA/loan.lang (100%)
 rename {htdocs => public}/langs/ar_SA/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/ar_SA/mails.lang (100%)
 rename {htdocs => public}/langs/ar_SA/main.lang (100%)
 rename {htdocs => public}/langs/ar_SA/margins.lang (100%)
 rename {htdocs => public}/langs/ar_SA/members.lang (100%)
 rename {htdocs => public}/langs/ar_SA/oauth.lang (100%)
 rename {htdocs => public}/langs/ar_SA/opensurvey.lang (100%)
 rename {htdocs => public}/langs/ar_SA/orders.lang (100%)
 rename {htdocs => public}/langs/ar_SA/other.lang (100%)
 rename {htdocs => public}/langs/ar_SA/paybox.lang (100%)
 rename {htdocs => public}/langs/ar_SA/paypal.lang (100%)
 rename {htdocs => public}/langs/ar_SA/printing.lang (100%)
 rename {htdocs => public}/langs/ar_SA/productbatch.lang (100%)
 rename {htdocs => public}/langs/ar_SA/products.lang (100%)
 rename {htdocs => public}/langs/ar_SA/projects.lang (100%)
 rename {htdocs => public}/langs/ar_SA/propal.lang (100%)
 rename {htdocs => public}/langs/ar_SA/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/ar_SA/resource.lang (100%)
 rename {htdocs => public}/langs/ar_SA/salaries.lang (100%)
 rename {htdocs => public}/langs/ar_SA/sendings.lang (100%)
 rename {htdocs => public}/langs/ar_SA/sms.lang (100%)
 rename {htdocs => public}/langs/ar_SA/stocks.lang (100%)
 rename {htdocs => public}/langs/ar_SA/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/ar_SA/suppliers.lang (100%)
 rename {htdocs => public}/langs/ar_SA/trips.lang (100%)
 rename {htdocs => public}/langs/ar_SA/users.lang (100%)
 rename {htdocs => public}/langs/ar_SA/website.lang (100%)
 rename {htdocs => public}/langs/ar_SA/withdrawals.lang (100%)
 rename {htdocs => public}/langs/ar_SA/workflow.lang (100%)
 rename {htdocs => public}/langs/bg_BG/accountancy.lang (100%)
 rename {htdocs => public}/langs/bg_BG/admin.lang (100%)
 rename {htdocs => public}/langs/bg_BG/agenda.lang (100%)
 rename {htdocs => public}/langs/bg_BG/banks.lang (100%)
 rename {htdocs => public}/langs/bg_BG/bills.lang (100%)
 rename {htdocs => public}/langs/bg_BG/bookmarks.lang (100%)
 rename {htdocs => public}/langs/bg_BG/boxes.lang (100%)
 rename {htdocs => public}/langs/bg_BG/cashdesk.lang (100%)
 rename {htdocs => public}/langs/bg_BG/categories.lang (100%)
 rename {htdocs => public}/langs/bg_BG/commercial.lang (100%)
 rename {htdocs => public}/langs/bg_BG/companies.lang (100%)
 rename {htdocs => public}/langs/bg_BG/compta.lang (100%)
 rename {htdocs => public}/langs/bg_BG/contracts.lang (100%)
 rename {htdocs => public}/langs/bg_BG/cron.lang (100%)
 rename {htdocs => public}/langs/bg_BG/deliveries.lang (100%)
 rename {htdocs => public}/langs/bg_BG/dict.lang (100%)
 rename {htdocs => public}/langs/bg_BG/donations.lang (100%)
 rename {htdocs => public}/langs/bg_BG/ecm.lang (100%)
 rename {htdocs => public}/langs/bg_BG/errors.lang (100%)
 rename {htdocs => public}/langs/bg_BG/exports.lang (100%)
 rename {htdocs => public}/langs/bg_BG/externalsite.lang (100%)
 rename {htdocs => public}/langs/bg_BG/ftp.lang (100%)
 rename {htdocs => public}/langs/bg_BG/help.lang (100%)
 rename {htdocs => public}/langs/bg_BG/holiday.lang (100%)
 rename {htdocs => public}/langs/bg_BG/hrm.lang (100%)
 rename {htdocs => public}/langs/bg_BG/incoterm.lang (100%)
 rename {htdocs => public}/langs/bg_BG/install.lang (100%)
 rename {htdocs => public}/langs/bg_BG/interventions.lang (100%)
 rename {htdocs => public}/langs/bg_BG/languages.lang (100%)
 rename {htdocs => public}/langs/bg_BG/ldap.lang (100%)
 rename {htdocs => public}/langs/bg_BG/link.lang (100%)
 rename {htdocs => public}/langs/bg_BG/loan.lang (100%)
 rename {htdocs => public}/langs/bg_BG/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/bg_BG/mails.lang (100%)
 rename {htdocs => public}/langs/bg_BG/main.lang (100%)
 rename {htdocs => public}/langs/bg_BG/margins.lang (100%)
 rename {htdocs => public}/langs/bg_BG/members.lang (100%)
 rename {htdocs => public}/langs/bg_BG/oauth.lang (100%)
 rename {htdocs => public}/langs/bg_BG/opensurvey.lang (100%)
 rename {htdocs => public}/langs/bg_BG/orders.lang (100%)
 rename {htdocs => public}/langs/bg_BG/other.lang (100%)
 rename {htdocs => public}/langs/bg_BG/paybox.lang (100%)
 rename {htdocs => public}/langs/bg_BG/paypal.lang (100%)
 rename {htdocs => public}/langs/bg_BG/printing.lang (100%)
 rename {htdocs => public}/langs/bg_BG/productbatch.lang (100%)
 rename {htdocs => public}/langs/bg_BG/products.lang (100%)
 rename {htdocs => public}/langs/bg_BG/projects.lang (100%)
 rename {htdocs => public}/langs/bg_BG/propal.lang (100%)
 rename {htdocs => public}/langs/bg_BG/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/bg_BG/resource.lang (100%)
 rename {htdocs => public}/langs/bg_BG/salaries.lang (100%)
 rename {htdocs => public}/langs/bg_BG/sendings.lang (100%)
 rename {htdocs => public}/langs/bg_BG/sms.lang (100%)
 rename {htdocs => public}/langs/bg_BG/stocks.lang (100%)
 rename {htdocs => public}/langs/bg_BG/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/bg_BG/suppliers.lang (100%)
 rename {htdocs => public}/langs/bg_BG/trips.lang (100%)
 rename {htdocs => public}/langs/bg_BG/users.lang (100%)
 rename {htdocs => public}/langs/bg_BG/website.lang (100%)
 rename {htdocs => public}/langs/bg_BG/withdrawals.lang (100%)
 rename {htdocs => public}/langs/bg_BG/workflow.lang (100%)
 rename {htdocs => public}/langs/bn_BD/accountancy.lang (100%)
 rename {htdocs => public}/langs/bn_BD/admin.lang (100%)
 rename {htdocs => public}/langs/bn_BD/agenda.lang (100%)
 rename {htdocs => public}/langs/bn_BD/banks.lang (100%)
 rename {htdocs => public}/langs/bn_BD/bills.lang (100%)
 rename {htdocs => public}/langs/bn_BD/bookmarks.lang (100%)
 rename {htdocs => public}/langs/bn_BD/boxes.lang (100%)
 rename {htdocs => public}/langs/bn_BD/cashdesk.lang (100%)
 rename {htdocs => public}/langs/bn_BD/categories.lang (100%)
 rename {htdocs => public}/langs/bn_BD/commercial.lang (100%)
 rename {htdocs => public}/langs/bn_BD/companies.lang (100%)
 rename {htdocs => public}/langs/bn_BD/compta.lang (100%)
 rename {htdocs => public}/langs/bn_BD/contracts.lang (100%)
 rename {htdocs => public}/langs/bn_BD/cron.lang (100%)
 rename {htdocs => public}/langs/bn_BD/deliveries.lang (100%)
 rename {htdocs => public}/langs/bn_BD/dict.lang (100%)
 rename {htdocs => public}/langs/bn_BD/donations.lang (100%)
 rename {htdocs => public}/langs/bn_BD/ecm.lang (100%)
 rename {htdocs => public}/langs/bn_BD/errors.lang (100%)
 rename {htdocs => public}/langs/bn_BD/exports.lang (100%)
 rename {htdocs => public}/langs/bn_BD/externalsite.lang (100%)
 rename {htdocs => public}/langs/bn_BD/ftp.lang (100%)
 rename {htdocs => public}/langs/bn_BD/help.lang (100%)
 rename {htdocs => public}/langs/bn_BD/holiday.lang (100%)
 rename {htdocs => public}/langs/bn_BD/hrm.lang (100%)
 rename {htdocs => public}/langs/bn_BD/incoterm.lang (100%)
 rename {htdocs => public}/langs/bn_BD/install.lang (100%)
 rename {htdocs => public}/langs/bn_BD/interventions.lang (100%)
 rename {htdocs => public}/langs/bn_BD/languages.lang (100%)
 rename {htdocs => public}/langs/bn_BD/ldap.lang (100%)
 rename {htdocs => public}/langs/bn_BD/link.lang (100%)
 rename {htdocs => public}/langs/bn_BD/loan.lang (100%)
 rename {htdocs => public}/langs/bn_BD/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/bn_BD/mails.lang (100%)
 rename {htdocs => public}/langs/bn_BD/main.lang (100%)
 rename {htdocs => public}/langs/bn_BD/margins.lang (100%)
 rename {htdocs => public}/langs/bn_BD/members.lang (100%)
 rename {htdocs => public}/langs/bn_BD/oauth.lang (100%)
 rename {htdocs => public}/langs/bn_BD/opensurvey.lang (100%)
 rename {htdocs => public}/langs/bn_BD/orders.lang (100%)
 rename {htdocs => public}/langs/bn_BD/other.lang (100%)
 rename {htdocs => public}/langs/bn_BD/paybox.lang (100%)
 rename {htdocs => public}/langs/bn_BD/paypal.lang (100%)
 rename {htdocs => public}/langs/bn_BD/printing.lang (100%)
 rename {htdocs => public}/langs/bn_BD/productbatch.lang (100%)
 rename {htdocs => public}/langs/bn_BD/products.lang (100%)
 rename {htdocs => public}/langs/bn_BD/projects.lang (100%)
 rename {htdocs => public}/langs/bn_BD/propal.lang (100%)
 rename {htdocs => public}/langs/bn_BD/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/bn_BD/resource.lang (100%)
 rename {htdocs => public}/langs/bn_BD/salaries.lang (100%)
 rename {htdocs => public}/langs/bn_BD/sendings.lang (100%)
 rename {htdocs => public}/langs/bn_BD/sms.lang (100%)
 rename {htdocs => public}/langs/bn_BD/stocks.lang (100%)
 rename {htdocs => public}/langs/bn_BD/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/bn_BD/suppliers.lang (100%)
 rename {htdocs => public}/langs/bn_BD/trips.lang (100%)
 rename {htdocs => public}/langs/bn_BD/users.lang (100%)
 rename {htdocs => public}/langs/bn_BD/website.lang (100%)
 rename {htdocs => public}/langs/bn_BD/withdrawals.lang (100%)
 rename {htdocs => public}/langs/bn_BD/workflow.lang (100%)
 rename {htdocs => public}/langs/bs_BA/accountancy.lang (100%)
 rename {htdocs => public}/langs/bs_BA/admin.lang (100%)
 rename {htdocs => public}/langs/bs_BA/agenda.lang (100%)
 rename {htdocs => public}/langs/bs_BA/banks.lang (100%)
 rename {htdocs => public}/langs/bs_BA/bills.lang (100%)
 rename {htdocs => public}/langs/bs_BA/bookmarks.lang (100%)
 rename {htdocs => public}/langs/bs_BA/boxes.lang (100%)
 rename {htdocs => public}/langs/bs_BA/cashdesk.lang (100%)
 rename {htdocs => public}/langs/bs_BA/categories.lang (100%)
 rename {htdocs => public}/langs/bs_BA/commercial.lang (100%)
 rename {htdocs => public}/langs/bs_BA/companies.lang (100%)
 rename {htdocs => public}/langs/bs_BA/compta.lang (100%)
 rename {htdocs => public}/langs/bs_BA/contracts.lang (100%)
 rename {htdocs => public}/langs/bs_BA/cron.lang (100%)
 rename {htdocs => public}/langs/bs_BA/deliveries.lang (100%)
 rename {htdocs => public}/langs/bs_BA/dict.lang (100%)
 rename {htdocs => public}/langs/bs_BA/donations.lang (100%)
 rename {htdocs => public}/langs/bs_BA/ecm.lang (100%)
 rename {htdocs => public}/langs/bs_BA/errors.lang (100%)
 rename {htdocs => public}/langs/bs_BA/exports.lang (100%)
 rename {htdocs => public}/langs/bs_BA/externalsite.lang (100%)
 rename {htdocs => public}/langs/bs_BA/ftp.lang (100%)
 rename {htdocs => public}/langs/bs_BA/help.lang (100%)
 rename {htdocs => public}/langs/bs_BA/holiday.lang (100%)
 rename {htdocs => public}/langs/bs_BA/hrm.lang (100%)
 rename {htdocs => public}/langs/bs_BA/incoterm.lang (100%)
 rename {htdocs => public}/langs/bs_BA/install.lang (100%)
 rename {htdocs => public}/langs/bs_BA/interventions.lang (100%)
 rename {htdocs => public}/langs/bs_BA/languages.lang (100%)
 rename {htdocs => public}/langs/bs_BA/ldap.lang (100%)
 rename {htdocs => public}/langs/bs_BA/link.lang (100%)
 rename {htdocs => public}/langs/bs_BA/loan.lang (100%)
 rename {htdocs => public}/langs/bs_BA/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/bs_BA/mails.lang (100%)
 rename {htdocs => public}/langs/bs_BA/main.lang (100%)
 rename {htdocs => public}/langs/bs_BA/margins.lang (100%)
 rename {htdocs => public}/langs/bs_BA/members.lang (100%)
 rename {htdocs => public}/langs/bs_BA/oauth.lang (100%)
 rename {htdocs => public}/langs/bs_BA/opensurvey.lang (100%)
 rename {htdocs => public}/langs/bs_BA/orders.lang (100%)
 rename {htdocs => public}/langs/bs_BA/other.lang (100%)
 rename {htdocs => public}/langs/bs_BA/paybox.lang (100%)
 rename {htdocs => public}/langs/bs_BA/paypal.lang (100%)
 rename {htdocs => public}/langs/bs_BA/printing.lang (100%)
 rename {htdocs => public}/langs/bs_BA/productbatch.lang (100%)
 rename {htdocs => public}/langs/bs_BA/products.lang (100%)
 rename {htdocs => public}/langs/bs_BA/projects.lang (100%)
 rename {htdocs => public}/langs/bs_BA/propal.lang (100%)
 rename {htdocs => public}/langs/bs_BA/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/bs_BA/resource.lang (100%)
 rename {htdocs => public}/langs/bs_BA/salaries.lang (100%)
 rename {htdocs => public}/langs/bs_BA/sendings.lang (100%)
 rename {htdocs => public}/langs/bs_BA/sms.lang (100%)
 rename {htdocs => public}/langs/bs_BA/stocks.lang (100%)
 rename {htdocs => public}/langs/bs_BA/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/bs_BA/suppliers.lang (100%)
 rename {htdocs => public}/langs/bs_BA/trips.lang (100%)
 rename {htdocs => public}/langs/bs_BA/users.lang (100%)
 rename {htdocs => public}/langs/bs_BA/website.lang (100%)
 rename {htdocs => public}/langs/bs_BA/withdrawals.lang (100%)
 rename {htdocs => public}/langs/bs_BA/workflow.lang (100%)
 rename {htdocs => public}/langs/ca_ES/accountancy.lang (100%)
 rename {htdocs => public}/langs/ca_ES/admin.lang (100%)
 rename {htdocs => public}/langs/ca_ES/agenda.lang (100%)
 rename {htdocs => public}/langs/ca_ES/banks.lang (100%)
 rename {htdocs => public}/langs/ca_ES/bills.lang (100%)
 rename {htdocs => public}/langs/ca_ES/bookmarks.lang (100%)
 rename {htdocs => public}/langs/ca_ES/boxes.lang (100%)
 rename {htdocs => public}/langs/ca_ES/cashdesk.lang (100%)
 rename {htdocs => public}/langs/ca_ES/categories.lang (100%)
 rename {htdocs => public}/langs/ca_ES/commercial.lang (100%)
 rename {htdocs => public}/langs/ca_ES/companies.lang (100%)
 rename {htdocs => public}/langs/ca_ES/compta.lang (100%)
 rename {htdocs => public}/langs/ca_ES/contracts.lang (100%)
 rename {htdocs => public}/langs/ca_ES/cron.lang (100%)
 rename {htdocs => public}/langs/ca_ES/deliveries.lang (100%)
 rename {htdocs => public}/langs/ca_ES/dict.lang (100%)
 rename {htdocs => public}/langs/ca_ES/donations.lang (100%)
 rename {htdocs => public}/langs/ca_ES/ecm.lang (100%)
 rename {htdocs => public}/langs/ca_ES/errors.lang (100%)
 rename {htdocs => public}/langs/ca_ES/exports.lang (100%)
 rename {htdocs => public}/langs/ca_ES/externalsite.lang (100%)
 rename {htdocs => public}/langs/ca_ES/ftp.lang (100%)
 rename {htdocs => public}/langs/ca_ES/help.lang (100%)
 rename {htdocs => public}/langs/ca_ES/holiday.lang (100%)
 rename {htdocs => public}/langs/ca_ES/hrm.lang (100%)
 rename {htdocs => public}/langs/ca_ES/incoterm.lang (100%)
 rename {htdocs => public}/langs/ca_ES/install.lang (100%)
 rename {htdocs => public}/langs/ca_ES/interventions.lang (100%)
 rename {htdocs => public}/langs/ca_ES/languages.lang (100%)
 rename {htdocs => public}/langs/ca_ES/ldap.lang (100%)
 rename {htdocs => public}/langs/ca_ES/link.lang (100%)
 rename {htdocs => public}/langs/ca_ES/loan.lang (100%)
 rename {htdocs => public}/langs/ca_ES/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/ca_ES/mails.lang (100%)
 rename {htdocs => public}/langs/ca_ES/main.lang (100%)
 rename {htdocs => public}/langs/ca_ES/margins.lang (100%)
 rename {htdocs => public}/langs/ca_ES/members.lang (100%)
 rename {htdocs => public}/langs/ca_ES/oauth.lang (100%)
 rename {htdocs => public}/langs/ca_ES/opensurvey.lang (100%)
 rename {htdocs => public}/langs/ca_ES/orders.lang (100%)
 rename {htdocs => public}/langs/ca_ES/other.lang (100%)
 rename {htdocs => public}/langs/ca_ES/paybox.lang (100%)
 rename {htdocs => public}/langs/ca_ES/paypal.lang (100%)
 rename {htdocs => public}/langs/ca_ES/printing.lang (100%)
 rename {htdocs => public}/langs/ca_ES/productbatch.lang (100%)
 rename {htdocs => public}/langs/ca_ES/products.lang (100%)
 rename {htdocs => public}/langs/ca_ES/projects.lang (100%)
 rename {htdocs => public}/langs/ca_ES/propal.lang (100%)
 rename {htdocs => public}/langs/ca_ES/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/ca_ES/resource.lang (100%)
 rename {htdocs => public}/langs/ca_ES/salaries.lang (100%)
 rename {htdocs => public}/langs/ca_ES/sendings.lang (100%)
 rename {htdocs => public}/langs/ca_ES/sms.lang (100%)
 rename {htdocs => public}/langs/ca_ES/stocks.lang (100%)
 rename {htdocs => public}/langs/ca_ES/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/ca_ES/suppliers.lang (100%)
 rename {htdocs => public}/langs/ca_ES/trips.lang (100%)
 rename {htdocs => public}/langs/ca_ES/users.lang (100%)
 rename {htdocs => public}/langs/ca_ES/website.lang (100%)
 rename {htdocs => public}/langs/ca_ES/withdrawals.lang (100%)
 rename {htdocs => public}/langs/ca_ES/workflow.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/accountancy.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/admin.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/agenda.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/banks.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/bills.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/bookmarks.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/boxes.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/cashdesk.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/categories.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/commercial.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/companies.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/compta.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/contracts.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/cron.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/deliveries.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/dict.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/donations.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/ecm.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/errors.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/exports.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/externalsite.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/ftp.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/help.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/holiday.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/hrm.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/incoterm.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/install.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/interventions.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/languages.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/ldap.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/link.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/loan.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/mails.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/main.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/margins.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/members.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/oauth.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/opensurvey.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/orders.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/other.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/paybox.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/paypal.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/printing.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/productbatch.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/products.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/projects.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/propal.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/resource.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/salaries.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/sendings.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/sms.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/stocks.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/suppliers.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/trips.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/users.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/website.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/withdrawals.lang (100%)
 rename {htdocs => public}/langs/cs_CZ/workflow.lang (100%)
 rename {htdocs => public}/langs/da_DK/accountancy.lang (100%)
 rename {htdocs => public}/langs/da_DK/admin.lang (100%)
 rename {htdocs => public}/langs/da_DK/agenda.lang (100%)
 rename {htdocs => public}/langs/da_DK/banks.lang (100%)
 rename {htdocs => public}/langs/da_DK/bills.lang (100%)
 rename {htdocs => public}/langs/da_DK/bookmarks.lang (100%)
 rename {htdocs => public}/langs/da_DK/boxes.lang (100%)
 rename {htdocs => public}/langs/da_DK/cashdesk.lang (100%)
 rename {htdocs => public}/langs/da_DK/categories.lang (100%)
 rename {htdocs => public}/langs/da_DK/commercial.lang (100%)
 rename {htdocs => public}/langs/da_DK/companies.lang (100%)
 rename {htdocs => public}/langs/da_DK/compta.lang (100%)
 rename {htdocs => public}/langs/da_DK/contracts.lang (100%)
 rename {htdocs => public}/langs/da_DK/cron.lang (100%)
 rename {htdocs => public}/langs/da_DK/deliveries.lang (100%)
 rename {htdocs => public}/langs/da_DK/dict.lang (100%)
 rename {htdocs => public}/langs/da_DK/donations.lang (100%)
 rename {htdocs => public}/langs/da_DK/ecm.lang (100%)
 rename {htdocs => public}/langs/da_DK/errors.lang (100%)
 rename {htdocs => public}/langs/da_DK/exports.lang (100%)
 rename {htdocs => public}/langs/da_DK/externalsite.lang (100%)
 rename {htdocs => public}/langs/da_DK/ftp.lang (100%)
 rename {htdocs => public}/langs/da_DK/help.lang (100%)
 rename {htdocs => public}/langs/da_DK/holiday.lang (100%)
 rename {htdocs => public}/langs/da_DK/hrm.lang (100%)
 rename {htdocs => public}/langs/da_DK/incoterm.lang (100%)
 rename {htdocs => public}/langs/da_DK/install.lang (100%)
 rename {htdocs => public}/langs/da_DK/interventions.lang (100%)
 rename {htdocs => public}/langs/da_DK/languages.lang (100%)
 rename {htdocs => public}/langs/da_DK/ldap.lang (100%)
 rename {htdocs => public}/langs/da_DK/link.lang (100%)
 rename {htdocs => public}/langs/da_DK/loan.lang (100%)
 rename {htdocs => public}/langs/da_DK/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/da_DK/mails.lang (100%)
 rename {htdocs => public}/langs/da_DK/main.lang (100%)
 rename {htdocs => public}/langs/da_DK/margins.lang (100%)
 rename {htdocs => public}/langs/da_DK/members.lang (100%)
 rename {htdocs => public}/langs/da_DK/oauth.lang (100%)
 rename {htdocs => public}/langs/da_DK/opensurvey.lang (100%)
 rename {htdocs => public}/langs/da_DK/orders.lang (100%)
 rename {htdocs => public}/langs/da_DK/other.lang (100%)
 rename {htdocs => public}/langs/da_DK/paybox.lang (100%)
 rename {htdocs => public}/langs/da_DK/paypal.lang (100%)
 rename {htdocs => public}/langs/da_DK/printing.lang (100%)
 rename {htdocs => public}/langs/da_DK/productbatch.lang (100%)
 rename {htdocs => public}/langs/da_DK/products.lang (100%)
 rename {htdocs => public}/langs/da_DK/projects.lang (100%)
 rename {htdocs => public}/langs/da_DK/propal.lang (100%)
 rename {htdocs => public}/langs/da_DK/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/da_DK/resource.lang (100%)
 rename {htdocs => public}/langs/da_DK/salaries.lang (100%)
 rename {htdocs => public}/langs/da_DK/sendings.lang (100%)
 rename {htdocs => public}/langs/da_DK/sms.lang (100%)
 rename {htdocs => public}/langs/da_DK/stocks.lang (100%)
 rename {htdocs => public}/langs/da_DK/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/da_DK/suppliers.lang (100%)
 rename {htdocs => public}/langs/da_DK/trips.lang (100%)
 rename {htdocs => public}/langs/da_DK/users.lang (100%)
 rename {htdocs => public}/langs/da_DK/website.lang (100%)
 rename {htdocs => public}/langs/da_DK/withdrawals.lang (100%)
 rename {htdocs => public}/langs/da_DK/workflow.lang (100%)
 rename {htdocs => public}/langs/de_AT/accountancy.lang (100%)
 rename {htdocs => public}/langs/de_AT/admin.lang (100%)
 rename {htdocs => public}/langs/de_AT/agenda.lang (100%)
 rename {htdocs => public}/langs/de_AT/banks.lang (100%)
 rename {htdocs => public}/langs/de_AT/bills.lang (100%)
 rename {htdocs => public}/langs/de_AT/bookmarks.lang (100%)
 rename {htdocs => public}/langs/de_AT/boxes.lang (100%)
 rename {htdocs => public}/langs/de_AT/cashdesk.lang (100%)
 rename {htdocs => public}/langs/de_AT/categories.lang (100%)
 rename {htdocs => public}/langs/de_AT/commercial.lang (100%)
 rename {htdocs => public}/langs/de_AT/companies.lang (100%)
 rename {htdocs => public}/langs/de_AT/compta.lang (100%)
 rename {htdocs => public}/langs/de_AT/contracts.lang (100%)
 rename {htdocs => public}/langs/de_AT/cron.lang (100%)
 rename {htdocs => public}/langs/de_AT/deliveries.lang (100%)
 rename {htdocs => public}/langs/de_AT/dict.lang (100%)
 rename {htdocs => public}/langs/de_AT/donations.lang (100%)
 rename {htdocs => public}/langs/de_AT/ecm.lang (100%)
 rename {htdocs => public}/langs/de_AT/errors.lang (100%)
 rename {htdocs => public}/langs/de_AT/exports.lang (100%)
 rename {htdocs => public}/langs/de_AT/externalsite.lang (100%)
 rename {htdocs => public}/langs/de_AT/ftp.lang (100%)
 rename {htdocs => public}/langs/de_AT/help.lang (100%)
 rename {htdocs => public}/langs/de_AT/holiday.lang (100%)
 rename {htdocs => public}/langs/de_AT/hrm.lang (100%)
 rename {htdocs => public}/langs/de_AT/incoterm.lang (100%)
 rename {htdocs => public}/langs/de_AT/install.lang (100%)
 rename {htdocs => public}/langs/de_AT/interventions.lang (100%)
 rename {htdocs => public}/langs/de_AT/languages.lang (100%)
 rename {htdocs => public}/langs/de_AT/ldap.lang (100%)
 rename {htdocs => public}/langs/de_AT/link.lang (100%)
 rename {htdocs => public}/langs/de_AT/loan.lang (100%)
 rename {htdocs => public}/langs/de_AT/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/de_AT/mails.lang (100%)
 rename {htdocs => public}/langs/de_AT/main.lang (100%)
 rename {htdocs => public}/langs/de_AT/margins.lang (100%)
 rename {htdocs => public}/langs/de_AT/members.lang (100%)
 rename {htdocs => public}/langs/de_AT/oauth.lang (100%)
 rename {htdocs => public}/langs/de_AT/opensurvey.lang (100%)
 rename {htdocs => public}/langs/de_AT/orders.lang (100%)
 rename {htdocs => public}/langs/de_AT/other.lang (100%)
 rename {htdocs => public}/langs/de_AT/paybox.lang (100%)
 rename {htdocs => public}/langs/de_AT/paypal.lang (100%)
 rename {htdocs => public}/langs/de_AT/printing.lang (100%)
 rename {htdocs => public}/langs/de_AT/productbatch.lang (100%)
 rename {htdocs => public}/langs/de_AT/products.lang (100%)
 rename {htdocs => public}/langs/de_AT/projects.lang (100%)
 rename {htdocs => public}/langs/de_AT/propal.lang (100%)
 rename {htdocs => public}/langs/de_AT/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/de_AT/resource.lang (100%)
 rename {htdocs => public}/langs/de_AT/salaries.lang (100%)
 rename {htdocs => public}/langs/de_AT/sendings.lang (100%)
 rename {htdocs => public}/langs/de_AT/sms.lang (100%)
 rename {htdocs => public}/langs/de_AT/stocks.lang (100%)
 rename {htdocs => public}/langs/de_AT/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/de_AT/suppliers.lang (100%)
 rename {htdocs => public}/langs/de_AT/trips.lang (100%)
 rename {htdocs => public}/langs/de_AT/users.lang (100%)
 rename {htdocs => public}/langs/de_AT/website.lang (100%)
 rename {htdocs => public}/langs/de_AT/withdrawals.lang (100%)
 rename {htdocs => public}/langs/de_AT/workflow.lang (100%)
 rename {htdocs => public}/langs/de_CH/accountancy.lang (100%)
 rename {htdocs => public}/langs/de_CH/admin.lang (100%)
 rename {htdocs => public}/langs/de_CH/agenda.lang (100%)
 rename {htdocs => public}/langs/de_CH/banks.lang (100%)
 rename {htdocs => public}/langs/de_CH/bills.lang (100%)
 rename {htdocs => public}/langs/de_CH/bookmarks.lang (100%)
 rename {htdocs => public}/langs/de_CH/boxes.lang (100%)
 rename {htdocs => public}/langs/de_CH/cashdesk.lang (100%)
 rename {htdocs => public}/langs/de_CH/categories.lang (100%)
 rename {htdocs => public}/langs/de_CH/commercial.lang (100%)
 rename {htdocs => public}/langs/de_CH/companies.lang (100%)
 rename {htdocs => public}/langs/de_CH/compta.lang (100%)
 rename {htdocs => public}/langs/de_CH/contracts.lang (100%)
 rename {htdocs => public}/langs/de_CH/cron.lang (100%)
 rename {htdocs => public}/langs/de_CH/deliveries.lang (100%)
 rename {htdocs => public}/langs/de_CH/dict.lang (100%)
 rename {htdocs => public}/langs/de_CH/donations.lang (100%)
 rename {htdocs => public}/langs/de_CH/ecm.lang (100%)
 rename {htdocs => public}/langs/de_CH/errors.lang (100%)
 rename {htdocs => public}/langs/de_CH/exports.lang (100%)
 rename {htdocs => public}/langs/de_CH/externalsite.lang (100%)
 rename {htdocs => public}/langs/de_CH/ftp.lang (100%)
 rename {htdocs => public}/langs/de_CH/help.lang (100%)
 rename {htdocs => public}/langs/de_CH/holiday.lang (100%)
 rename {htdocs => public}/langs/de_CH/hrm.lang (100%)
 rename {htdocs => public}/langs/de_CH/incoterm.lang (100%)
 rename {htdocs => public}/langs/de_CH/install.lang (100%)
 rename {htdocs => public}/langs/de_CH/interventions.lang (100%)
 rename {htdocs => public}/langs/de_CH/languages.lang (100%)
 rename {htdocs => public}/langs/de_CH/ldap.lang (100%)
 rename {htdocs => public}/langs/de_CH/link.lang (100%)
 rename {htdocs => public}/langs/de_CH/loan.lang (100%)
 rename {htdocs => public}/langs/de_CH/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/de_CH/mails.lang (100%)
 rename {htdocs => public}/langs/de_CH/main.lang (100%)
 rename {htdocs => public}/langs/de_CH/margins.lang (100%)
 rename {htdocs => public}/langs/de_CH/members.lang (100%)
 rename {htdocs => public}/langs/de_CH/oauth.lang (100%)
 rename {htdocs => public}/langs/de_CH/opensurvey.lang (100%)
 rename {htdocs => public}/langs/de_CH/orders.lang (100%)
 rename {htdocs => public}/langs/de_CH/other.lang (100%)
 rename {htdocs => public}/langs/de_CH/paybox.lang (100%)
 rename {htdocs => public}/langs/de_CH/paypal.lang (100%)
 rename {htdocs => public}/langs/de_CH/printing.lang (100%)
 rename {htdocs => public}/langs/de_CH/productbatch.lang (100%)
 rename {htdocs => public}/langs/de_CH/products.lang (100%)
 rename {htdocs => public}/langs/de_CH/projects.lang (100%)
 rename {htdocs => public}/langs/de_CH/propal.lang (100%)
 rename {htdocs => public}/langs/de_CH/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/de_CH/resource.lang (100%)
 rename {htdocs => public}/langs/de_CH/salaries.lang (100%)
 rename {htdocs => public}/langs/de_CH/sendings.lang (100%)
 rename {htdocs => public}/langs/de_CH/sms.lang (100%)
 rename {htdocs => public}/langs/de_CH/stocks.lang (100%)
 rename {htdocs => public}/langs/de_CH/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/de_CH/suppliers.lang (100%)
 rename {htdocs => public}/langs/de_CH/trips.lang (100%)
 rename {htdocs => public}/langs/de_CH/users.lang (100%)
 rename {htdocs => public}/langs/de_CH/website.lang (100%)
 rename {htdocs => public}/langs/de_CH/withdrawals.lang (100%)
 rename {htdocs => public}/langs/de_CH/workflow.lang (100%)
 rename {htdocs => public}/langs/de_DE/accountancy.lang (100%)
 rename {htdocs => public}/langs/de_DE/admin.lang (100%)
 rename {htdocs => public}/langs/de_DE/agenda.lang (100%)
 rename {htdocs => public}/langs/de_DE/banks.lang (100%)
 rename {htdocs => public}/langs/de_DE/bills.lang (100%)
 rename {htdocs => public}/langs/de_DE/bookmarks.lang (100%)
 rename {htdocs => public}/langs/de_DE/boxes.lang (100%)
 rename {htdocs => public}/langs/de_DE/cashdesk.lang (100%)
 rename {htdocs => public}/langs/de_DE/categories.lang (100%)
 rename {htdocs => public}/langs/de_DE/commercial.lang (100%)
 rename {htdocs => public}/langs/de_DE/companies.lang (100%)
 rename {htdocs => public}/langs/de_DE/compta.lang (100%)
 rename {htdocs => public}/langs/de_DE/contracts.lang (100%)
 rename {htdocs => public}/langs/de_DE/cron.lang (100%)
 rename {htdocs => public}/langs/de_DE/deliveries.lang (100%)
 rename {htdocs => public}/langs/de_DE/dict.lang (100%)
 rename {htdocs => public}/langs/de_DE/donations.lang (100%)
 rename {htdocs => public}/langs/de_DE/ecm.lang (100%)
 rename {htdocs => public}/langs/de_DE/errors.lang (100%)
 rename {htdocs => public}/langs/de_DE/exports.lang (100%)
 rename {htdocs => public}/langs/de_DE/externalsite.lang (100%)
 rename {htdocs => public}/langs/de_DE/ftp.lang (100%)
 rename {htdocs => public}/langs/de_DE/help.lang (100%)
 rename {htdocs => public}/langs/de_DE/holiday.lang (100%)
 rename {htdocs => public}/langs/de_DE/hrm.lang (100%)
 rename {htdocs => public}/langs/de_DE/incoterm.lang (100%)
 rename {htdocs => public}/langs/de_DE/install.lang (100%)
 rename {htdocs => public}/langs/de_DE/interventions.lang (100%)
 rename {htdocs => public}/langs/de_DE/languages.lang (100%)
 rename {htdocs => public}/langs/de_DE/ldap.lang (100%)
 rename {htdocs => public}/langs/de_DE/link.lang (100%)
 rename {htdocs => public}/langs/de_DE/loan.lang (100%)
 rename {htdocs => public}/langs/de_DE/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/de_DE/mails.lang (100%)
 rename {htdocs => public}/langs/de_DE/main.lang (100%)
 rename {htdocs => public}/langs/de_DE/margins.lang (100%)
 rename {htdocs => public}/langs/de_DE/members.lang (100%)
 rename {htdocs => public}/langs/de_DE/oauth.lang (100%)
 rename {htdocs => public}/langs/de_DE/opensurvey.lang (100%)
 rename {htdocs => public}/langs/de_DE/orders.lang (100%)
 rename {htdocs => public}/langs/de_DE/other.lang (100%)
 rename {htdocs => public}/langs/de_DE/paybox.lang (100%)
 rename {htdocs => public}/langs/de_DE/paypal.lang (100%)
 rename {htdocs => public}/langs/de_DE/printing.lang (100%)
 rename {htdocs => public}/langs/de_DE/productbatch.lang (100%)
 rename {htdocs => public}/langs/de_DE/products.lang (100%)
 rename {htdocs => public}/langs/de_DE/projects.lang (100%)
 rename {htdocs => public}/langs/de_DE/propal.lang (100%)
 rename {htdocs => public}/langs/de_DE/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/de_DE/resource.lang (100%)
 rename {htdocs => public}/langs/de_DE/salaries.lang (100%)
 rename {htdocs => public}/langs/de_DE/sendings.lang (100%)
 rename {htdocs => public}/langs/de_DE/sms.lang (100%)
 rename {htdocs => public}/langs/de_DE/stocks.lang (100%)
 rename {htdocs => public}/langs/de_DE/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/de_DE/suppliers.lang (100%)
 rename {htdocs => public}/langs/de_DE/trips.lang (100%)
 rename {htdocs => public}/langs/de_DE/users.lang (100%)
 rename {htdocs => public}/langs/de_DE/website.lang (100%)
 rename {htdocs => public}/langs/de_DE/withdrawals.lang (100%)
 rename {htdocs => public}/langs/de_DE/workflow.lang (100%)
 rename {htdocs => public}/langs/el_GR/accountancy.lang (100%)
 rename {htdocs => public}/langs/el_GR/admin.lang (100%)
 rename {htdocs => public}/langs/el_GR/agenda.lang (100%)
 rename {htdocs => public}/langs/el_GR/banks.lang (100%)
 rename {htdocs => public}/langs/el_GR/bills.lang (100%)
 rename {htdocs => public}/langs/el_GR/bookmarks.lang (100%)
 rename {htdocs => public}/langs/el_GR/boxes.lang (100%)
 rename {htdocs => public}/langs/el_GR/cashdesk.lang (100%)
 rename {htdocs => public}/langs/el_GR/categories.lang (100%)
 rename {htdocs => public}/langs/el_GR/commercial.lang (100%)
 rename {htdocs => public}/langs/el_GR/commissions.lang (100%)
 rename {htdocs => public}/langs/el_GR/companies.lang (100%)
 rename {htdocs => public}/langs/el_GR/compta.lang (100%)
 rename {htdocs => public}/langs/el_GR/contracts.lang (100%)
 rename {htdocs => public}/langs/el_GR/cron.lang (100%)
 rename {htdocs => public}/langs/el_GR/deliveries.lang (100%)
 rename {htdocs => public}/langs/el_GR/dict.lang (100%)
 rename {htdocs => public}/langs/el_GR/donations.lang (100%)
 rename {htdocs => public}/langs/el_GR/ecm.lang (100%)
 rename {htdocs => public}/langs/el_GR/errors.lang (100%)
 rename {htdocs => public}/langs/el_GR/exports.lang (100%)
 rename {htdocs => public}/langs/el_GR/externalsite.lang (100%)
 rename {htdocs => public}/langs/el_GR/ftp.lang (100%)
 rename {htdocs => public}/langs/el_GR/help.lang (100%)
 rename {htdocs => public}/langs/el_GR/holiday.lang (100%)
 rename {htdocs => public}/langs/el_GR/hrm.lang (100%)
 rename {htdocs => public}/langs/el_GR/incoterm.lang (100%)
 rename {htdocs => public}/langs/el_GR/install.lang (100%)
 rename {htdocs => public}/langs/el_GR/interventions.lang (100%)
 rename {htdocs => public}/langs/el_GR/languages.lang (100%)
 rename {htdocs => public}/langs/el_GR/ldap.lang (100%)
 rename {htdocs => public}/langs/el_GR/link.lang (100%)
 rename {htdocs => public}/langs/el_GR/loan.lang (100%)
 rename {htdocs => public}/langs/el_GR/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/el_GR/mails.lang (100%)
 rename {htdocs => public}/langs/el_GR/main.lang (100%)
 rename {htdocs => public}/langs/el_GR/margins.lang (100%)
 rename {htdocs => public}/langs/el_GR/members.lang (100%)
 rename {htdocs => public}/langs/el_GR/oauth.lang (100%)
 rename {htdocs => public}/langs/el_GR/opensurvey.lang (100%)
 rename {htdocs => public}/langs/el_GR/orders.lang (100%)
 rename {htdocs => public}/langs/el_GR/other.lang (100%)
 rename {htdocs => public}/langs/el_GR/paybox.lang (100%)
 rename {htdocs => public}/langs/el_GR/paypal.lang (100%)
 rename {htdocs => public}/langs/el_GR/printing.lang (100%)
 rename {htdocs => public}/langs/el_GR/productbatch.lang (100%)
 rename {htdocs => public}/langs/el_GR/products.lang (100%)
 rename {htdocs => public}/langs/el_GR/projects.lang (100%)
 rename {htdocs => public}/langs/el_GR/propal.lang (100%)
 rename {htdocs => public}/langs/el_GR/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/el_GR/resource.lang (100%)
 rename {htdocs => public}/langs/el_GR/salaries.lang (100%)
 rename {htdocs => public}/langs/el_GR/sendings.lang (100%)
 rename {htdocs => public}/langs/el_GR/sms.lang (100%)
 rename {htdocs => public}/langs/el_GR/stocks.lang (100%)
 rename {htdocs => public}/langs/el_GR/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/el_GR/suppliers.lang (100%)
 rename {htdocs => public}/langs/el_GR/trips.lang (100%)
 rename {htdocs => public}/langs/el_GR/users.lang (100%)
 rename {htdocs => public}/langs/el_GR/website.lang (100%)
 rename {htdocs => public}/langs/el_GR/withdrawals.lang (100%)
 rename {htdocs => public}/langs/el_GR/workflow.lang (100%)
 rename {htdocs => public}/langs/en_AU/accountancy.lang (100%)
 rename {htdocs => public}/langs/en_AU/admin.lang (100%)
 rename {htdocs => public}/langs/en_AU/agenda.lang (100%)
 rename {htdocs => public}/langs/en_AU/banks.lang (100%)
 rename {htdocs => public}/langs/en_AU/bills.lang (100%)
 rename {htdocs => public}/langs/en_AU/bookmarks.lang (100%)
 rename {htdocs => public}/langs/en_AU/boxes.lang (100%)
 rename {htdocs => public}/langs/en_AU/cashdesk.lang (100%)
 rename {htdocs => public}/langs/en_AU/categories.lang (100%)
 rename {htdocs => public}/langs/en_AU/commercial.lang (100%)
 rename {htdocs => public}/langs/en_AU/companies.lang (100%)
 rename {htdocs => public}/langs/en_AU/compta.lang (100%)
 rename {htdocs => public}/langs/en_AU/contracts.lang (100%)
 rename {htdocs => public}/langs/en_AU/cron.lang (100%)
 rename {htdocs => public}/langs/en_AU/deliveries.lang (100%)
 rename {htdocs => public}/langs/en_AU/dict.lang (100%)
 rename {htdocs => public}/langs/en_AU/donations.lang (100%)
 rename {htdocs => public}/langs/en_AU/ecm.lang (100%)
 rename {htdocs => public}/langs/en_AU/errors.lang (100%)
 rename {htdocs => public}/langs/en_AU/exports.lang (100%)
 rename {htdocs => public}/langs/en_AU/externalsite.lang (100%)
 rename {htdocs => public}/langs/en_AU/ftp.lang (100%)
 rename {htdocs => public}/langs/en_AU/help.lang (100%)
 rename {htdocs => public}/langs/en_AU/holiday.lang (100%)
 rename {htdocs => public}/langs/en_AU/hrm.lang (100%)
 rename {htdocs => public}/langs/en_AU/incoterm.lang (100%)
 rename {htdocs => public}/langs/en_AU/install.lang (100%)
 rename {htdocs => public}/langs/en_AU/interventions.lang (100%)
 rename {htdocs => public}/langs/en_AU/languages.lang (100%)
 rename {htdocs => public}/langs/en_AU/ldap.lang (100%)
 rename {htdocs => public}/langs/en_AU/link.lang (100%)
 rename {htdocs => public}/langs/en_AU/loan.lang (100%)
 rename {htdocs => public}/langs/en_AU/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/en_AU/mails.lang (100%)
 rename {htdocs => public}/langs/en_AU/main.lang (100%)
 rename {htdocs => public}/langs/en_AU/margins.lang (100%)
 rename {htdocs => public}/langs/en_AU/members.lang (100%)
 rename {htdocs => public}/langs/en_AU/oauth.lang (100%)
 rename {htdocs => public}/langs/en_AU/opensurvey.lang (100%)
 rename {htdocs => public}/langs/en_AU/orders.lang (100%)
 rename {htdocs => public}/langs/en_AU/other.lang (100%)
 rename {htdocs => public}/langs/en_AU/paybox.lang (100%)
 rename {htdocs => public}/langs/en_AU/paypal.lang (100%)
 rename {htdocs => public}/langs/en_AU/printing.lang (100%)
 rename {htdocs => public}/langs/en_AU/productbatch.lang (100%)
 rename {htdocs => public}/langs/en_AU/products.lang (100%)
 rename {htdocs => public}/langs/en_AU/projects.lang (100%)
 rename {htdocs => public}/langs/en_AU/propal.lang (100%)
 rename {htdocs => public}/langs/en_AU/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/en_AU/resource.lang (100%)
 rename {htdocs => public}/langs/en_AU/salaries.lang (100%)
 rename {htdocs => public}/langs/en_AU/sendings.lang (100%)
 rename {htdocs => public}/langs/en_AU/sms.lang (100%)
 rename {htdocs => public}/langs/en_AU/stocks.lang (100%)
 rename {htdocs => public}/langs/en_AU/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/en_AU/suppliers.lang (100%)
 rename {htdocs => public}/langs/en_AU/trips.lang (100%)
 rename {htdocs => public}/langs/en_AU/users.lang (100%)
 rename {htdocs => public}/langs/en_AU/website.lang (100%)
 rename {htdocs => public}/langs/en_AU/withdrawals.lang (100%)
 rename {htdocs => public}/langs/en_AU/workflow.lang (100%)
 rename {htdocs => public}/langs/en_CA/accountancy.lang (100%)
 rename {htdocs => public}/langs/en_CA/admin.lang (100%)
 rename {htdocs => public}/langs/en_CA/agenda.lang (100%)
 rename {htdocs => public}/langs/en_CA/banks.lang (100%)
 rename {htdocs => public}/langs/en_CA/bills.lang (100%)
 rename {htdocs => public}/langs/en_CA/bookmarks.lang (100%)
 rename {htdocs => public}/langs/en_CA/boxes.lang (100%)
 rename {htdocs => public}/langs/en_CA/cashdesk.lang (100%)
 rename {htdocs => public}/langs/en_CA/categories.lang (100%)
 rename {htdocs => public}/langs/en_CA/commercial.lang (100%)
 rename {htdocs => public}/langs/en_CA/companies.lang (100%)
 rename {htdocs => public}/langs/en_CA/compta.lang (100%)
 rename {htdocs => public}/langs/en_CA/contracts.lang (100%)
 rename {htdocs => public}/langs/en_CA/cron.lang (100%)
 rename {htdocs => public}/langs/en_CA/deliveries.lang (100%)
 rename {htdocs => public}/langs/en_CA/dict.lang (100%)
 rename {htdocs => public}/langs/en_CA/donations.lang (100%)
 rename {htdocs => public}/langs/en_CA/ecm.lang (100%)
 rename {htdocs => public}/langs/en_CA/errors.lang (100%)
 rename {htdocs => public}/langs/en_CA/exports.lang (100%)
 rename {htdocs => public}/langs/en_CA/externalsite.lang (100%)
 rename {htdocs => public}/langs/en_CA/ftp.lang (100%)
 rename {htdocs => public}/langs/en_CA/help.lang (100%)
 rename {htdocs => public}/langs/en_CA/holiday.lang (100%)
 rename {htdocs => public}/langs/en_CA/hrm.lang (100%)
 rename {htdocs => public}/langs/en_CA/incoterm.lang (100%)
 rename {htdocs => public}/langs/en_CA/install.lang (100%)
 rename {htdocs => public}/langs/en_CA/interventions.lang (100%)
 rename {htdocs => public}/langs/en_CA/languages.lang (100%)
 rename {htdocs => public}/langs/en_CA/ldap.lang (100%)
 rename {htdocs => public}/langs/en_CA/link.lang (100%)
 rename {htdocs => public}/langs/en_CA/loan.lang (100%)
 rename {htdocs => public}/langs/en_CA/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/en_CA/mails.lang (100%)
 rename {htdocs => public}/langs/en_CA/main.lang (100%)
 rename {htdocs => public}/langs/en_CA/margins.lang (100%)
 rename {htdocs => public}/langs/en_CA/members.lang (100%)
 rename {htdocs => public}/langs/en_CA/oauth.lang (100%)
 rename {htdocs => public}/langs/en_CA/opensurvey.lang (100%)
 rename {htdocs => public}/langs/en_CA/orders.lang (100%)
 rename {htdocs => public}/langs/en_CA/other.lang (100%)
 rename {htdocs => public}/langs/en_CA/paybox.lang (100%)
 rename {htdocs => public}/langs/en_CA/paypal.lang (100%)
 rename {htdocs => public}/langs/en_CA/printing.lang (100%)
 rename {htdocs => public}/langs/en_CA/productbatch.lang (100%)
 rename {htdocs => public}/langs/en_CA/products.lang (100%)
 rename {htdocs => public}/langs/en_CA/projects.lang (100%)
 rename {htdocs => public}/langs/en_CA/propal.lang (100%)
 rename {htdocs => public}/langs/en_CA/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/en_CA/resource.lang (100%)
 rename {htdocs => public}/langs/en_CA/salaries.lang (100%)
 rename {htdocs => public}/langs/en_CA/sendings.lang (100%)
 rename {htdocs => public}/langs/en_CA/sms.lang (100%)
 rename {htdocs => public}/langs/en_CA/stocks.lang (100%)
 rename {htdocs => public}/langs/en_CA/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/en_CA/suppliers.lang (100%)
 rename {htdocs => public}/langs/en_CA/trips.lang (100%)
 rename {htdocs => public}/langs/en_CA/users.lang (100%)
 rename {htdocs => public}/langs/en_CA/website.lang (100%)
 rename {htdocs => public}/langs/en_CA/withdrawals.lang (100%)
 rename {htdocs => public}/langs/en_CA/workflow.lang (100%)
 rename {htdocs => public}/langs/en_GB/accountancy.lang (100%)
 rename {htdocs => public}/langs/en_GB/admin.lang (100%)
 rename {htdocs => public}/langs/en_GB/agenda.lang (100%)
 rename {htdocs => public}/langs/en_GB/banks.lang (100%)
 rename {htdocs => public}/langs/en_GB/bills.lang (100%)
 rename {htdocs => public}/langs/en_GB/bookmarks.lang (100%)
 rename {htdocs => public}/langs/en_GB/boxes.lang (100%)
 rename {htdocs => public}/langs/en_GB/cashdesk.lang (100%)
 rename {htdocs => public}/langs/en_GB/categories.lang (100%)
 rename {htdocs => public}/langs/en_GB/commercial.lang (100%)
 rename {htdocs => public}/langs/en_GB/companies.lang (100%)
 rename {htdocs => public}/langs/en_GB/compta.lang (100%)
 rename {htdocs => public}/langs/en_GB/contracts.lang (100%)
 rename {htdocs => public}/langs/en_GB/cron.lang (100%)
 rename {htdocs => public}/langs/en_GB/deliveries.lang (100%)
 rename {htdocs => public}/langs/en_GB/dict.lang (100%)
 rename {htdocs => public}/langs/en_GB/donations.lang (100%)
 rename {htdocs => public}/langs/en_GB/ecm.lang (100%)
 rename {htdocs => public}/langs/en_GB/errors.lang (100%)
 rename {htdocs => public}/langs/en_GB/exports.lang (100%)
 rename {htdocs => public}/langs/en_GB/externalsite.lang (100%)
 rename {htdocs => public}/langs/en_GB/ftp.lang (100%)
 rename {htdocs => public}/langs/en_GB/help.lang (100%)
 rename {htdocs => public}/langs/en_GB/holiday.lang (100%)
 rename {htdocs => public}/langs/en_GB/hrm.lang (100%)
 rename {htdocs => public}/langs/en_GB/incoterm.lang (100%)
 rename {htdocs => public}/langs/en_GB/install.lang (100%)
 rename {htdocs => public}/langs/en_GB/interventions.lang (100%)
 rename {htdocs => public}/langs/en_GB/languages.lang (100%)
 rename {htdocs => public}/langs/en_GB/ldap.lang (100%)
 rename {htdocs => public}/langs/en_GB/link.lang (100%)
 rename {htdocs => public}/langs/en_GB/loan.lang (100%)
 rename {htdocs => public}/langs/en_GB/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/en_GB/mails.lang (100%)
 rename {htdocs => public}/langs/en_GB/main.lang (100%)
 rename {htdocs => public}/langs/en_GB/margins.lang (100%)
 rename {htdocs => public}/langs/en_GB/members.lang (100%)
 rename {htdocs => public}/langs/en_GB/oauth.lang (100%)
 rename {htdocs => public}/langs/en_GB/opensurvey.lang (100%)
 rename {htdocs => public}/langs/en_GB/orders.lang (100%)
 rename {htdocs => public}/langs/en_GB/other.lang (100%)
 rename {htdocs => public}/langs/en_GB/paybox.lang (100%)
 rename {htdocs => public}/langs/en_GB/paypal.lang (100%)
 rename {htdocs => public}/langs/en_GB/printing.lang (100%)
 rename {htdocs => public}/langs/en_GB/productbatch.lang (100%)
 rename {htdocs => public}/langs/en_GB/products.lang (100%)
 rename {htdocs => public}/langs/en_GB/projects.lang (100%)
 rename {htdocs => public}/langs/en_GB/propal.lang (100%)
 rename {htdocs => public}/langs/en_GB/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/en_GB/resource.lang (100%)
 rename {htdocs => public}/langs/en_GB/salaries.lang (100%)
 rename {htdocs => public}/langs/en_GB/sendings.lang (100%)
 rename {htdocs => public}/langs/en_GB/sms.lang (100%)
 rename {htdocs => public}/langs/en_GB/stocks.lang (100%)
 rename {htdocs => public}/langs/en_GB/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/en_GB/suppliers.lang (100%)
 rename {htdocs => public}/langs/en_GB/trips.lang (100%)
 rename {htdocs => public}/langs/en_GB/users.lang (100%)
 rename {htdocs => public}/langs/en_GB/website.lang (100%)
 rename {htdocs => public}/langs/en_GB/withdrawals.lang (100%)
 rename {htdocs => public}/langs/en_GB/workflow.lang (100%)
 rename {htdocs => public}/langs/en_IN/accountancy.lang (100%)
 rename {htdocs => public}/langs/en_IN/admin.lang (100%)
 rename {htdocs => public}/langs/en_IN/agenda.lang (100%)
 rename {htdocs => public}/langs/en_IN/banks.lang (100%)
 rename {htdocs => public}/langs/en_IN/bills.lang (100%)
 rename {htdocs => public}/langs/en_IN/bookmarks.lang (100%)
 rename {htdocs => public}/langs/en_IN/boxes.lang (100%)
 rename {htdocs => public}/langs/en_IN/cashdesk.lang (100%)
 rename {htdocs => public}/langs/en_IN/categories.lang (100%)
 rename {htdocs => public}/langs/en_IN/commercial.lang (100%)
 rename {htdocs => public}/langs/en_IN/companies.lang (100%)
 rename {htdocs => public}/langs/en_IN/compta.lang (100%)
 rename {htdocs => public}/langs/en_IN/contracts.lang (100%)
 rename {htdocs => public}/langs/en_IN/cron.lang (100%)
 rename {htdocs => public}/langs/en_IN/deliveries.lang (100%)
 rename {htdocs => public}/langs/en_IN/dict.lang (100%)
 rename {htdocs => public}/langs/en_IN/donations.lang (100%)
 rename {htdocs => public}/langs/en_IN/ecm.lang (100%)
 rename {htdocs => public}/langs/en_IN/errors.lang (100%)
 rename {htdocs => public}/langs/en_IN/exports.lang (100%)
 rename {htdocs => public}/langs/en_IN/externalsite.lang (100%)
 rename {htdocs => public}/langs/en_IN/ftp.lang (100%)
 rename {htdocs => public}/langs/en_IN/help.lang (100%)
 rename {htdocs => public}/langs/en_IN/holiday.lang (100%)
 rename {htdocs => public}/langs/en_IN/hrm.lang (100%)
 rename {htdocs => public}/langs/en_IN/incoterm.lang (100%)
 rename {htdocs => public}/langs/en_IN/install.lang (100%)
 rename {htdocs => public}/langs/en_IN/interventions.lang (100%)
 rename {htdocs => public}/langs/en_IN/languages.lang (100%)
 rename {htdocs => public}/langs/en_IN/ldap.lang (100%)
 rename {htdocs => public}/langs/en_IN/link.lang (100%)
 rename {htdocs => public}/langs/en_IN/loan.lang (100%)
 rename {htdocs => public}/langs/en_IN/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/en_IN/mails.lang (100%)
 rename {htdocs => public}/langs/en_IN/main.lang (100%)
 rename {htdocs => public}/langs/en_IN/margins.lang (100%)
 rename {htdocs => public}/langs/en_IN/members.lang (100%)
 rename {htdocs => public}/langs/en_IN/oauth.lang (100%)
 rename {htdocs => public}/langs/en_IN/opensurvey.lang (100%)
 rename {htdocs => public}/langs/en_IN/orders.lang (100%)
 rename {htdocs => public}/langs/en_IN/other.lang (100%)
 rename {htdocs => public}/langs/en_IN/paybox.lang (100%)
 rename {htdocs => public}/langs/en_IN/paypal.lang (100%)
 rename {htdocs => public}/langs/en_IN/printing.lang (100%)
 rename {htdocs => public}/langs/en_IN/productbatch.lang (100%)
 rename {htdocs => public}/langs/en_IN/products.lang (100%)
 rename {htdocs => public}/langs/en_IN/projects.lang (100%)
 rename {htdocs => public}/langs/en_IN/propal.lang (100%)
 rename {htdocs => public}/langs/en_IN/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/en_IN/resource.lang (100%)
 rename {htdocs => public}/langs/en_IN/salaries.lang (100%)
 rename {htdocs => public}/langs/en_IN/sendings.lang (100%)
 rename {htdocs => public}/langs/en_IN/sms.lang (100%)
 rename {htdocs => public}/langs/en_IN/stocks.lang (100%)
 rename {htdocs => public}/langs/en_IN/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/en_IN/suppliers.lang (100%)
 rename {htdocs => public}/langs/en_IN/trips.lang (100%)
 rename {htdocs => public}/langs/en_IN/users.lang (100%)
 rename {htdocs => public}/langs/en_IN/website.lang (100%)
 rename {htdocs => public}/langs/en_IN/withdrawals.lang (100%)
 rename {htdocs => public}/langs/en_IN/workflow.lang (100%)
 rename {htdocs => public}/langs/en_NZ/companies.lang (100%)
 rename {htdocs => public}/langs/en_NZ/compta.lang (100%)
 rename {htdocs => public}/langs/en_NZ/main.lang (100%)
 rename {htdocs => public}/langs/en_SA/main.lang (100%)
 rename {htdocs => public}/langs/en_SA/propal.lang (100%)
 rename {htdocs => public}/langs/en_US/accountancy.lang (100%)
 rename {htdocs => public}/langs/en_US/admin.lang (100%)
 rename {htdocs => public}/langs/en_US/agenda.lang (100%)
 rename {htdocs => public}/langs/en_US/banks.lang (100%)
 rename {htdocs => public}/langs/en_US/bills.lang (100%)
 rename {htdocs => public}/langs/en_US/bookmarks.lang (100%)
 rename {htdocs => public}/langs/en_US/boxes.lang (100%)
 rename {htdocs => public}/langs/en_US/cashdesk.lang (100%)
 rename {htdocs => public}/langs/en_US/categories.lang (100%)
 rename {htdocs => public}/langs/en_US/commercial.lang (100%)
 rename {htdocs => public}/langs/en_US/companies.lang (100%)
 rename {htdocs => public}/langs/en_US/compta.lang (100%)
 rename {htdocs => public}/langs/en_US/contracts.lang (100%)
 rename {htdocs => public}/langs/en_US/cron.lang (100%)
 rename {htdocs => public}/langs/en_US/deliveries.lang (100%)
 rename {htdocs => public}/langs/en_US/dict.lang (100%)
 rename {htdocs => public}/langs/en_US/donations.lang (100%)
 rename {htdocs => public}/langs/en_US/ecm.lang (100%)
 rename {htdocs => public}/langs/en_US/errors.lang (100%)
 rename {htdocs => public}/langs/en_US/exports.lang (100%)
 rename {htdocs => public}/langs/en_US/externalsite.lang (100%)
 rename {htdocs => public}/langs/en_US/ftp.lang (100%)
 rename {htdocs => public}/langs/en_US/help.lang (100%)
 rename {htdocs => public}/langs/en_US/holiday.lang (100%)
 rename {htdocs => public}/langs/en_US/hrm.lang (100%)
 rename {htdocs => public}/langs/en_US/incoterm.lang (100%)
 rename {htdocs => public}/langs/en_US/install.lang (100%)
 rename {htdocs => public}/langs/en_US/interventions.lang (100%)
 rename {htdocs => public}/langs/en_US/languages.lang (100%)
 rename {htdocs => public}/langs/en_US/ldap.lang (100%)
 rename {htdocs => public}/langs/en_US/link.lang (100%)
 rename {htdocs => public}/langs/en_US/loan.lang (100%)
 rename {htdocs => public}/langs/en_US/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/en_US/mails.lang (100%)
 rename {htdocs => public}/langs/en_US/main.lang (100%)
 rename {htdocs => public}/langs/en_US/margins.lang (100%)
 rename {htdocs => public}/langs/en_US/members.lang (100%)
 rename {htdocs => public}/langs/en_US/multicurrency.lang (100%)
 rename {htdocs => public}/langs/en_US/oauth.lang (100%)
 rename {htdocs => public}/langs/en_US/opensurvey.lang (100%)
 rename {htdocs => public}/langs/en_US/orders.lang (100%)
 rename {htdocs => public}/langs/en_US/other.lang (100%)
 rename {htdocs => public}/langs/en_US/paybox.lang (100%)
 rename {htdocs => public}/langs/en_US/paypal.lang (100%)
 rename {htdocs => public}/langs/en_US/printing.lang (100%)
 rename {htdocs => public}/langs/en_US/productbatch.lang (100%)
 rename {htdocs => public}/langs/en_US/products.lang (100%)
 rename {htdocs => public}/langs/en_US/projects.lang (100%)
 rename {htdocs => public}/langs/en_US/propal.lang (100%)
 rename {htdocs => public}/langs/en_US/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/en_US/resource.lang (100%)
 rename {htdocs => public}/langs/en_US/salaries.lang (100%)
 rename {htdocs => public}/langs/en_US/sendings.lang (100%)
 rename {htdocs => public}/langs/en_US/sms.lang (100%)
 rename {htdocs => public}/langs/en_US/stocks.lang (100%)
 rename {htdocs => public}/langs/en_US/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/en_US/suppliers.lang (100%)
 rename {htdocs => public}/langs/en_US/trips.lang (100%)
 rename {htdocs => public}/langs/en_US/users.lang (100%)
 rename {htdocs => public}/langs/en_US/website.lang (100%)
 rename {htdocs => public}/langs/en_US/withdrawals.lang (100%)
 rename {htdocs => public}/langs/en_US/workflow.lang (100%)
 rename {htdocs => public}/langs/en_ZA/main.lang (100%)
 rename {htdocs => public}/langs/es_AR/accountancy.lang (100%)
 rename {htdocs => public}/langs/es_AR/admin.lang (100%)
 rename {htdocs => public}/langs/es_AR/agenda.lang (100%)
 rename {htdocs => public}/langs/es_AR/banks.lang (100%)
 rename {htdocs => public}/langs/es_AR/bills.lang (100%)
 rename {htdocs => public}/langs/es_AR/bookmarks.lang (100%)
 rename {htdocs => public}/langs/es_AR/boxes.lang (100%)
 rename {htdocs => public}/langs/es_AR/cashdesk.lang (100%)
 rename {htdocs => public}/langs/es_AR/categories.lang (100%)
 rename {htdocs => public}/langs/es_AR/commercial.lang (100%)
 rename {htdocs => public}/langs/es_AR/companies.lang (100%)
 rename {htdocs => public}/langs/es_AR/compta.lang (100%)
 rename {htdocs => public}/langs/es_AR/contracts.lang (100%)
 rename {htdocs => public}/langs/es_AR/cron.lang (100%)
 rename {htdocs => public}/langs/es_AR/deliveries.lang (100%)
 rename {htdocs => public}/langs/es_AR/dict.lang (100%)
 rename {htdocs => public}/langs/es_AR/donations.lang (100%)
 rename {htdocs => public}/langs/es_AR/ecm.lang (100%)
 rename {htdocs => public}/langs/es_AR/errors.lang (100%)
 rename {htdocs => public}/langs/es_AR/exports.lang (100%)
 rename {htdocs => public}/langs/es_AR/externalsite.lang (100%)
 rename {htdocs => public}/langs/es_AR/ftp.lang (100%)
 rename {htdocs => public}/langs/es_AR/help.lang (100%)
 rename {htdocs => public}/langs/es_AR/holiday.lang (100%)
 rename {htdocs => public}/langs/es_AR/hrm.lang (100%)
 rename {htdocs => public}/langs/es_AR/incoterm.lang (100%)
 rename {htdocs => public}/langs/es_AR/install.lang (100%)
 rename {htdocs => public}/langs/es_AR/interventions.lang (100%)
 rename {htdocs => public}/langs/es_AR/languages.lang (100%)
 rename {htdocs => public}/langs/es_AR/ldap.lang (100%)
 rename {htdocs => public}/langs/es_AR/link.lang (100%)
 rename {htdocs => public}/langs/es_AR/loan.lang (100%)
 rename {htdocs => public}/langs/es_AR/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/es_AR/mails.lang (100%)
 rename {htdocs => public}/langs/es_AR/main.lang (100%)
 rename {htdocs => public}/langs/es_AR/margins.lang (100%)
 rename {htdocs => public}/langs/es_AR/members.lang (100%)
 rename {htdocs => public}/langs/es_AR/oauth.lang (100%)
 rename {htdocs => public}/langs/es_AR/opensurvey.lang (100%)
 rename {htdocs => public}/langs/es_AR/orders.lang (100%)
 rename {htdocs => public}/langs/es_AR/other.lang (100%)
 rename {htdocs => public}/langs/es_AR/paybox.lang (100%)
 rename {htdocs => public}/langs/es_AR/paypal.lang (100%)
 rename {htdocs => public}/langs/es_AR/printing.lang (100%)
 rename {htdocs => public}/langs/es_AR/productbatch.lang (100%)
 rename {htdocs => public}/langs/es_AR/products.lang (100%)
 rename {htdocs => public}/langs/es_AR/projects.lang (100%)
 rename {htdocs => public}/langs/es_AR/propal.lang (100%)
 rename {htdocs => public}/langs/es_AR/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/es_AR/resource.lang (100%)
 rename {htdocs => public}/langs/es_AR/salaries.lang (100%)
 rename {htdocs => public}/langs/es_AR/sendings.lang (100%)
 rename {htdocs => public}/langs/es_AR/sms.lang (100%)
 rename {htdocs => public}/langs/es_AR/stocks.lang (100%)
 rename {htdocs => public}/langs/es_AR/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/es_AR/suppliers.lang (100%)
 rename {htdocs => public}/langs/es_AR/trips.lang (100%)
 rename {htdocs => public}/langs/es_AR/users.lang (100%)
 rename {htdocs => public}/langs/es_AR/website.lang (100%)
 rename {htdocs => public}/langs/es_AR/withdrawals.lang (100%)
 rename {htdocs => public}/langs/es_AR/workflow.lang (100%)
 rename {htdocs => public}/langs/es_BO/accountancy.lang (100%)
 rename {htdocs => public}/langs/es_BO/admin.lang (100%)
 rename {htdocs => public}/langs/es_BO/agenda.lang (100%)
 rename {htdocs => public}/langs/es_BO/banks.lang (100%)
 rename {htdocs => public}/langs/es_BO/bills.lang (100%)
 rename {htdocs => public}/langs/es_BO/bookmarks.lang (100%)
 rename {htdocs => public}/langs/es_BO/boxes.lang (100%)
 rename {htdocs => public}/langs/es_BO/cashdesk.lang (100%)
 rename {htdocs => public}/langs/es_BO/categories.lang (100%)
 rename {htdocs => public}/langs/es_BO/commercial.lang (100%)
 rename {htdocs => public}/langs/es_BO/companies.lang (100%)
 rename {htdocs => public}/langs/es_BO/compta.lang (100%)
 rename {htdocs => public}/langs/es_BO/contracts.lang (100%)
 rename {htdocs => public}/langs/es_BO/cron.lang (100%)
 rename {htdocs => public}/langs/es_BO/deliveries.lang (100%)
 rename {htdocs => public}/langs/es_BO/dict.lang (100%)
 rename {htdocs => public}/langs/es_BO/donations.lang (100%)
 rename {htdocs => public}/langs/es_BO/ecm.lang (100%)
 rename {htdocs => public}/langs/es_BO/errors.lang (100%)
 rename {htdocs => public}/langs/es_BO/exports.lang (100%)
 rename {htdocs => public}/langs/es_BO/externalsite.lang (100%)
 rename {htdocs => public}/langs/es_BO/ftp.lang (100%)
 rename {htdocs => public}/langs/es_BO/help.lang (100%)
 rename {htdocs => public}/langs/es_BO/holiday.lang (100%)
 rename {htdocs => public}/langs/es_BO/hrm.lang (100%)
 rename {htdocs => public}/langs/es_BO/incoterm.lang (100%)
 rename {htdocs => public}/langs/es_BO/install.lang (100%)
 rename {htdocs => public}/langs/es_BO/interventions.lang (100%)
 rename {htdocs => public}/langs/es_BO/languages.lang (100%)
 rename {htdocs => public}/langs/es_BO/ldap.lang (100%)
 rename {htdocs => public}/langs/es_BO/link.lang (100%)
 rename {htdocs => public}/langs/es_BO/loan.lang (100%)
 rename {htdocs => public}/langs/es_BO/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/es_BO/mails.lang (100%)
 rename {htdocs => public}/langs/es_BO/main.lang (100%)
 rename {htdocs => public}/langs/es_BO/margins.lang (100%)
 rename {htdocs => public}/langs/es_BO/members.lang (100%)
 rename {htdocs => public}/langs/es_BO/oauth.lang (100%)
 rename {htdocs => public}/langs/es_BO/opensurvey.lang (100%)
 rename {htdocs => public}/langs/es_BO/orders.lang (100%)
 rename {htdocs => public}/langs/es_BO/other.lang (100%)
 rename {htdocs => public}/langs/es_BO/paybox.lang (100%)
 rename {htdocs => public}/langs/es_BO/paypal.lang (100%)
 rename {htdocs => public}/langs/es_BO/printing.lang (100%)
 rename {htdocs => public}/langs/es_BO/productbatch.lang (100%)
 rename {htdocs => public}/langs/es_BO/products.lang (100%)
 rename {htdocs => public}/langs/es_BO/projects.lang (100%)
 rename {htdocs => public}/langs/es_BO/propal.lang (100%)
 rename {htdocs => public}/langs/es_BO/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/es_BO/resource.lang (100%)
 rename {htdocs => public}/langs/es_BO/salaries.lang (100%)
 rename {htdocs => public}/langs/es_BO/sendings.lang (100%)
 rename {htdocs => public}/langs/es_BO/sms.lang (100%)
 rename {htdocs => public}/langs/es_BO/stocks.lang (100%)
 rename {htdocs => public}/langs/es_BO/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/es_BO/suppliers.lang (100%)
 rename {htdocs => public}/langs/es_BO/trips.lang (100%)
 rename {htdocs => public}/langs/es_BO/users.lang (100%)
 rename {htdocs => public}/langs/es_BO/website.lang (100%)
 rename {htdocs => public}/langs/es_BO/withdrawals.lang (100%)
 rename {htdocs => public}/langs/es_BO/workflow.lang (100%)
 rename {htdocs => public}/langs/es_CL/accountancy.lang (100%)
 rename {htdocs => public}/langs/es_CL/admin.lang (100%)
 rename {htdocs => public}/langs/es_CL/agenda.lang (100%)
 rename {htdocs => public}/langs/es_CL/banks.lang (100%)
 rename {htdocs => public}/langs/es_CL/bills.lang (100%)
 rename {htdocs => public}/langs/es_CL/bookmarks.lang (100%)
 rename {htdocs => public}/langs/es_CL/boxes.lang (100%)
 rename {htdocs => public}/langs/es_CL/cashdesk.lang (100%)
 rename {htdocs => public}/langs/es_CL/categories.lang (100%)
 rename {htdocs => public}/langs/es_CL/commercial.lang (100%)
 rename {htdocs => public}/langs/es_CL/companies.lang (100%)
 rename {htdocs => public}/langs/es_CL/compta.lang (100%)
 rename {htdocs => public}/langs/es_CL/contracts.lang (100%)
 rename {htdocs => public}/langs/es_CL/cron.lang (100%)
 rename {htdocs => public}/langs/es_CL/deliveries.lang (100%)
 rename {htdocs => public}/langs/es_CL/dict.lang (100%)
 rename {htdocs => public}/langs/es_CL/donations.lang (100%)
 rename {htdocs => public}/langs/es_CL/ecm.lang (100%)
 rename {htdocs => public}/langs/es_CL/errors.lang (100%)
 rename {htdocs => public}/langs/es_CL/exports.lang (100%)
 rename {htdocs => public}/langs/es_CL/externalsite.lang (100%)
 rename {htdocs => public}/langs/es_CL/ftp.lang (100%)
 rename {htdocs => public}/langs/es_CL/help.lang (100%)
 rename {htdocs => public}/langs/es_CL/holiday.lang (100%)
 rename {htdocs => public}/langs/es_CL/hrm.lang (100%)
 rename {htdocs => public}/langs/es_CL/incoterm.lang (100%)
 rename {htdocs => public}/langs/es_CL/install.lang (100%)
 rename {htdocs => public}/langs/es_CL/interventions.lang (100%)
 rename {htdocs => public}/langs/es_CL/languages.lang (100%)
 rename {htdocs => public}/langs/es_CL/ldap.lang (100%)
 rename {htdocs => public}/langs/es_CL/link.lang (100%)
 rename {htdocs => public}/langs/es_CL/loan.lang (100%)
 rename {htdocs => public}/langs/es_CL/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/es_CL/mails.lang (100%)
 rename {htdocs => public}/langs/es_CL/main.lang (100%)
 rename {htdocs => public}/langs/es_CL/margins.lang (100%)
 rename {htdocs => public}/langs/es_CL/members.lang (100%)
 rename {htdocs => public}/langs/es_CL/oauth.lang (100%)
 rename {htdocs => public}/langs/es_CL/opensurvey.lang (100%)
 rename {htdocs => public}/langs/es_CL/orders.lang (100%)
 rename {htdocs => public}/langs/es_CL/other.lang (100%)
 rename {htdocs => public}/langs/es_CL/paybox.lang (100%)
 rename {htdocs => public}/langs/es_CL/paypal.lang (100%)
 rename {htdocs => public}/langs/es_CL/printing.lang (100%)
 rename {htdocs => public}/langs/es_CL/productbatch.lang (100%)
 rename {htdocs => public}/langs/es_CL/products.lang (100%)
 rename {htdocs => public}/langs/es_CL/projects.lang (100%)
 rename {htdocs => public}/langs/es_CL/propal.lang (100%)
 rename {htdocs => public}/langs/es_CL/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/es_CL/resource.lang (100%)
 rename {htdocs => public}/langs/es_CL/salaries.lang (100%)
 rename {htdocs => public}/langs/es_CL/sendings.lang (100%)
 rename {htdocs => public}/langs/es_CL/sms.lang (100%)
 rename {htdocs => public}/langs/es_CL/stocks.lang (100%)
 rename {htdocs => public}/langs/es_CL/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/es_CL/suppliers.lang (100%)
 rename {htdocs => public}/langs/es_CL/trips.lang (100%)
 rename {htdocs => public}/langs/es_CL/users.lang (100%)
 rename {htdocs => public}/langs/es_CL/website.lang (100%)
 rename {htdocs => public}/langs/es_CL/withdrawals.lang (100%)
 rename {htdocs => public}/langs/es_CL/workflow.lang (100%)
 rename {htdocs => public}/langs/es_CO/accountancy.lang (100%)
 rename {htdocs => public}/langs/es_CO/admin.lang (100%)
 rename {htdocs => public}/langs/es_CO/agenda.lang (100%)
 rename {htdocs => public}/langs/es_CO/banks.lang (100%)
 rename {htdocs => public}/langs/es_CO/bills.lang (100%)
 rename {htdocs => public}/langs/es_CO/bookmarks.lang (100%)
 rename {htdocs => public}/langs/es_CO/boxes.lang (100%)
 rename {htdocs => public}/langs/es_CO/cashdesk.lang (100%)
 rename {htdocs => public}/langs/es_CO/categories.lang (100%)
 rename {htdocs => public}/langs/es_CO/commercial.lang (100%)
 rename {htdocs => public}/langs/es_CO/companies.lang (100%)
 rename {htdocs => public}/langs/es_CO/compta.lang (100%)
 rename {htdocs => public}/langs/es_CO/contracts.lang (100%)
 rename {htdocs => public}/langs/es_CO/cron.lang (100%)
 rename {htdocs => public}/langs/es_CO/deliveries.lang (100%)
 rename {htdocs => public}/langs/es_CO/dict.lang (100%)
 rename {htdocs => public}/langs/es_CO/donations.lang (100%)
 rename {htdocs => public}/langs/es_CO/ecm.lang (100%)
 rename {htdocs => public}/langs/es_CO/errors.lang (100%)
 rename {htdocs => public}/langs/es_CO/exports.lang (100%)
 rename {htdocs => public}/langs/es_CO/externalsite.lang (100%)
 rename {htdocs => public}/langs/es_CO/ftp.lang (100%)
 rename {htdocs => public}/langs/es_CO/help.lang (100%)
 rename {htdocs => public}/langs/es_CO/holiday.lang (100%)
 rename {htdocs => public}/langs/es_CO/hrm.lang (100%)
 rename {htdocs => public}/langs/es_CO/incoterm.lang (100%)
 rename {htdocs => public}/langs/es_CO/install.lang (100%)
 rename {htdocs => public}/langs/es_CO/interventions.lang (100%)
 rename {htdocs => public}/langs/es_CO/languages.lang (100%)
 rename {htdocs => public}/langs/es_CO/ldap.lang (100%)
 rename {htdocs => public}/langs/es_CO/link.lang (100%)
 rename {htdocs => public}/langs/es_CO/loan.lang (100%)
 rename {htdocs => public}/langs/es_CO/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/es_CO/mails.lang (100%)
 rename {htdocs => public}/langs/es_CO/main.lang (100%)
 rename {htdocs => public}/langs/es_CO/margins.lang (100%)
 rename {htdocs => public}/langs/es_CO/members.lang (100%)
 rename {htdocs => public}/langs/es_CO/oauth.lang (100%)
 rename {htdocs => public}/langs/es_CO/opensurvey.lang (100%)
 rename {htdocs => public}/langs/es_CO/orders.lang (100%)
 rename {htdocs => public}/langs/es_CO/other.lang (100%)
 rename {htdocs => public}/langs/es_CO/paybox.lang (100%)
 rename {htdocs => public}/langs/es_CO/paypal.lang (100%)
 rename {htdocs => public}/langs/es_CO/printing.lang (100%)
 rename {htdocs => public}/langs/es_CO/productbatch.lang (100%)
 rename {htdocs => public}/langs/es_CO/products.lang (100%)
 rename {htdocs => public}/langs/es_CO/projects.lang (100%)
 rename {htdocs => public}/langs/es_CO/propal.lang (100%)
 rename {htdocs => public}/langs/es_CO/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/es_CO/resource.lang (100%)
 rename {htdocs => public}/langs/es_CO/salaries.lang (100%)
 rename {htdocs => public}/langs/es_CO/sendings.lang (100%)
 rename {htdocs => public}/langs/es_CO/sms.lang (100%)
 rename {htdocs => public}/langs/es_CO/stocks.lang (100%)
 rename {htdocs => public}/langs/es_CO/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/es_CO/suppliers.lang (100%)
 rename {htdocs => public}/langs/es_CO/trips.lang (100%)
 rename {htdocs => public}/langs/es_CO/users.lang (100%)
 rename {htdocs => public}/langs/es_CO/website.lang (100%)
 rename {htdocs => public}/langs/es_CO/withdrawals.lang (100%)
 rename {htdocs => public}/langs/es_CO/workflow.lang (100%)
 rename {htdocs => public}/langs/es_DO/accountancy.lang (100%)
 rename {htdocs => public}/langs/es_DO/admin.lang (100%)
 rename {htdocs => public}/langs/es_DO/agenda.lang (100%)
 rename {htdocs => public}/langs/es_DO/banks.lang (100%)
 rename {htdocs => public}/langs/es_DO/bills.lang (100%)
 rename {htdocs => public}/langs/es_DO/bookmarks.lang (100%)
 rename {htdocs => public}/langs/es_DO/boxes.lang (100%)
 rename {htdocs => public}/langs/es_DO/cashdesk.lang (100%)
 rename {htdocs => public}/langs/es_DO/categories.lang (100%)
 rename {htdocs => public}/langs/es_DO/commercial.lang (100%)
 rename {htdocs => public}/langs/es_DO/companies.lang (100%)
 rename {htdocs => public}/langs/es_DO/compta.lang (100%)
 rename {htdocs => public}/langs/es_DO/contracts.lang (100%)
 rename {htdocs => public}/langs/es_DO/cron.lang (100%)
 rename {htdocs => public}/langs/es_DO/deliveries.lang (100%)
 rename {htdocs => public}/langs/es_DO/dict.lang (100%)
 rename {htdocs => public}/langs/es_DO/donations.lang (100%)
 rename {htdocs => public}/langs/es_DO/ecm.lang (100%)
 rename {htdocs => public}/langs/es_DO/errors.lang (100%)
 rename {htdocs => public}/langs/es_DO/exports.lang (100%)
 rename {htdocs => public}/langs/es_DO/externalsite.lang (100%)
 rename {htdocs => public}/langs/es_DO/ftp.lang (100%)
 rename {htdocs => public}/langs/es_DO/help.lang (100%)
 rename {htdocs => public}/langs/es_DO/holiday.lang (100%)
 rename {htdocs => public}/langs/es_DO/hrm.lang (100%)
 rename {htdocs => public}/langs/es_DO/incoterm.lang (100%)
 rename {htdocs => public}/langs/es_DO/install.lang (100%)
 rename {htdocs => public}/langs/es_DO/interventions.lang (100%)
 rename {htdocs => public}/langs/es_DO/languages.lang (100%)
 rename {htdocs => public}/langs/es_DO/ldap.lang (100%)
 rename {htdocs => public}/langs/es_DO/link.lang (100%)
 rename {htdocs => public}/langs/es_DO/loan.lang (100%)
 rename {htdocs => public}/langs/es_DO/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/es_DO/mails.lang (100%)
 rename {htdocs => public}/langs/es_DO/main.lang (100%)
 rename {htdocs => public}/langs/es_DO/margins.lang (100%)
 rename {htdocs => public}/langs/es_DO/members.lang (100%)
 rename {htdocs => public}/langs/es_DO/oauth.lang (100%)
 rename {htdocs => public}/langs/es_DO/opensurvey.lang (100%)
 rename {htdocs => public}/langs/es_DO/orders.lang (100%)
 rename {htdocs => public}/langs/es_DO/other.lang (100%)
 rename {htdocs => public}/langs/es_DO/paybox.lang (100%)
 rename {htdocs => public}/langs/es_DO/paypal.lang (100%)
 rename {htdocs => public}/langs/es_DO/printing.lang (100%)
 rename {htdocs => public}/langs/es_DO/productbatch.lang (100%)
 rename {htdocs => public}/langs/es_DO/products.lang (100%)
 rename {htdocs => public}/langs/es_DO/projects.lang (100%)
 rename {htdocs => public}/langs/es_DO/propal.lang (100%)
 rename {htdocs => public}/langs/es_DO/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/es_DO/resource.lang (100%)
 rename {htdocs => public}/langs/es_DO/salaries.lang (100%)
 rename {htdocs => public}/langs/es_DO/sendings.lang (100%)
 rename {htdocs => public}/langs/es_DO/sms.lang (100%)
 rename {htdocs => public}/langs/es_DO/stocks.lang (100%)
 rename {htdocs => public}/langs/es_DO/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/es_DO/suppliers.lang (100%)
 rename {htdocs => public}/langs/es_DO/trips.lang (100%)
 rename {htdocs => public}/langs/es_DO/users.lang (100%)
 rename {htdocs => public}/langs/es_DO/website.lang (100%)
 rename {htdocs => public}/langs/es_DO/withdrawals.lang (100%)
 rename {htdocs => public}/langs/es_DO/workflow.lang (100%)
 rename {htdocs => public}/langs/es_EC/accountancy.lang (100%)
 rename {htdocs => public}/langs/es_EC/admin.lang (100%)
 rename {htdocs => public}/langs/es_EC/agenda.lang (100%)
 rename {htdocs => public}/langs/es_EC/banks.lang (100%)
 rename {htdocs => public}/langs/es_EC/bills.lang (100%)
 rename {htdocs => public}/langs/es_EC/bookmarks.lang (100%)
 rename {htdocs => public}/langs/es_EC/boxes.lang (100%)
 rename {htdocs => public}/langs/es_EC/cashdesk.lang (100%)
 rename {htdocs => public}/langs/es_EC/categories.lang (100%)
 rename {htdocs => public}/langs/es_EC/commercial.lang (100%)
 rename {htdocs => public}/langs/es_EC/companies.lang (100%)
 rename {htdocs => public}/langs/es_EC/compta.lang (100%)
 rename {htdocs => public}/langs/es_EC/contracts.lang (100%)
 rename {htdocs => public}/langs/es_EC/cron.lang (100%)
 rename {htdocs => public}/langs/es_EC/deliveries.lang (100%)
 rename {htdocs => public}/langs/es_EC/dict.lang (100%)
 rename {htdocs => public}/langs/es_EC/donations.lang (100%)
 rename {htdocs => public}/langs/es_EC/ecm.lang (100%)
 rename {htdocs => public}/langs/es_EC/errors.lang (100%)
 rename {htdocs => public}/langs/es_EC/exports.lang (100%)
 rename {htdocs => public}/langs/es_EC/externalsite.lang (100%)
 rename {htdocs => public}/langs/es_EC/ftp.lang (100%)
 rename {htdocs => public}/langs/es_EC/help.lang (100%)
 rename {htdocs => public}/langs/es_EC/holiday.lang (100%)
 rename {htdocs => public}/langs/es_EC/hrm.lang (100%)
 rename {htdocs => public}/langs/es_EC/incoterm.lang (100%)
 rename {htdocs => public}/langs/es_EC/install.lang (100%)
 rename {htdocs => public}/langs/es_EC/interventions.lang (100%)
 rename {htdocs => public}/langs/es_EC/languages.lang (100%)
 rename {htdocs => public}/langs/es_EC/ldap.lang (100%)
 rename {htdocs => public}/langs/es_EC/link.lang (100%)
 rename {htdocs => public}/langs/es_EC/loan.lang (100%)
 rename {htdocs => public}/langs/es_EC/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/es_EC/mails.lang (100%)
 rename {htdocs => public}/langs/es_EC/main.lang (100%)
 rename {htdocs => public}/langs/es_EC/margins.lang (100%)
 rename {htdocs => public}/langs/es_EC/members.lang (100%)
 rename {htdocs => public}/langs/es_EC/oauth.lang (100%)
 rename {htdocs => public}/langs/es_EC/opensurvey.lang (100%)
 rename {htdocs => public}/langs/es_EC/orders.lang (100%)
 rename {htdocs => public}/langs/es_EC/other.lang (100%)
 rename {htdocs => public}/langs/es_EC/paybox.lang (100%)
 rename {htdocs => public}/langs/es_EC/paypal.lang (100%)
 rename {htdocs => public}/langs/es_EC/printing.lang (100%)
 rename {htdocs => public}/langs/es_EC/productbatch.lang (100%)
 rename {htdocs => public}/langs/es_EC/products.lang (100%)
 rename {htdocs => public}/langs/es_EC/projects.lang (100%)
 rename {htdocs => public}/langs/es_EC/propal.lang (100%)
 rename {htdocs => public}/langs/es_EC/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/es_EC/resource.lang (100%)
 rename {htdocs => public}/langs/es_EC/salaries.lang (100%)
 rename {htdocs => public}/langs/es_EC/sendings.lang (100%)
 rename {htdocs => public}/langs/es_EC/sms.lang (100%)
 rename {htdocs => public}/langs/es_EC/stocks.lang (100%)
 rename {htdocs => public}/langs/es_EC/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/es_EC/suppliers.lang (100%)
 rename {htdocs => public}/langs/es_EC/trips.lang (100%)
 rename {htdocs => public}/langs/es_EC/users.lang (100%)
 rename {htdocs => public}/langs/es_EC/website.lang (100%)
 rename {htdocs => public}/langs/es_EC/withdrawals.lang (100%)
 rename {htdocs => public}/langs/es_EC/workflow.lang (100%)
 rename {htdocs => public}/langs/es_ES/accountancy.lang (100%)
 rename {htdocs => public}/langs/es_ES/admin.lang (100%)
 rename {htdocs => public}/langs/es_ES/agenda.lang (100%)
 rename {htdocs => public}/langs/es_ES/banks.lang (100%)
 rename {htdocs => public}/langs/es_ES/bills.lang (100%)
 rename {htdocs => public}/langs/es_ES/bookmarks.lang (100%)
 rename {htdocs => public}/langs/es_ES/boxes.lang (100%)
 rename {htdocs => public}/langs/es_ES/cashdesk.lang (100%)
 rename {htdocs => public}/langs/es_ES/categories.lang (100%)
 rename {htdocs => public}/langs/es_ES/commercial.lang (100%)
 rename {htdocs => public}/langs/es_ES/companies.lang (100%)
 rename {htdocs => public}/langs/es_ES/compta.lang (100%)
 rename {htdocs => public}/langs/es_ES/contracts.lang (100%)
 rename {htdocs => public}/langs/es_ES/cron.lang (100%)
 rename {htdocs => public}/langs/es_ES/deliveries.lang (100%)
 rename {htdocs => public}/langs/es_ES/dict.lang (100%)
 rename {htdocs => public}/langs/es_ES/donations.lang (100%)
 rename {htdocs => public}/langs/es_ES/ecm.lang (100%)
 rename {htdocs => public}/langs/es_ES/errors.lang (100%)
 rename {htdocs => public}/langs/es_ES/exports.lang (100%)
 rename {htdocs => public}/langs/es_ES/externalsite.lang (100%)
 rename {htdocs => public}/langs/es_ES/ftp.lang (100%)
 rename {htdocs => public}/langs/es_ES/help.lang (100%)
 rename {htdocs => public}/langs/es_ES/holiday.lang (100%)
 rename {htdocs => public}/langs/es_ES/hrm.lang (100%)
 rename {htdocs => public}/langs/es_ES/incoterm.lang (100%)
 rename {htdocs => public}/langs/es_ES/install.lang (100%)
 rename {htdocs => public}/langs/es_ES/interventions.lang (100%)
 rename {htdocs => public}/langs/es_ES/languages.lang (100%)
 rename {htdocs => public}/langs/es_ES/ldap.lang (100%)
 rename {htdocs => public}/langs/es_ES/link.lang (100%)
 rename {htdocs => public}/langs/es_ES/loan.lang (100%)
 rename {htdocs => public}/langs/es_ES/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/es_ES/mails.lang (100%)
 rename {htdocs => public}/langs/es_ES/main.lang (100%)
 rename {htdocs => public}/langs/es_ES/margins.lang (100%)
 rename {htdocs => public}/langs/es_ES/members.lang (100%)
 rename {htdocs => public}/langs/es_ES/oauth.lang (100%)
 rename {htdocs => public}/langs/es_ES/opensurvey.lang (100%)
 rename {htdocs => public}/langs/es_ES/orders.lang (100%)
 rename {htdocs => public}/langs/es_ES/other.lang (100%)
 rename {htdocs => public}/langs/es_ES/paybox.lang (100%)
 rename {htdocs => public}/langs/es_ES/paypal.lang (100%)
 rename {htdocs => public}/langs/es_ES/printing.lang (100%)
 rename {htdocs => public}/langs/es_ES/productbatch.lang (100%)
 rename {htdocs => public}/langs/es_ES/products.lang (100%)
 rename {htdocs => public}/langs/es_ES/projects.lang (100%)
 rename {htdocs => public}/langs/es_ES/propal.lang (100%)
 rename {htdocs => public}/langs/es_ES/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/es_ES/resource.lang (100%)
 rename {htdocs => public}/langs/es_ES/salaries.lang (100%)
 rename {htdocs => public}/langs/es_ES/sendings.lang (100%)
 rename {htdocs => public}/langs/es_ES/sms.lang (100%)
 rename {htdocs => public}/langs/es_ES/stocks.lang (100%)
 rename {htdocs => public}/langs/es_ES/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/es_ES/suppliers.lang (100%)
 rename {htdocs => public}/langs/es_ES/trips.lang (100%)
 rename {htdocs => public}/langs/es_ES/users.lang (100%)
 rename {htdocs => public}/langs/es_ES/website.lang (100%)
 rename {htdocs => public}/langs/es_ES/withdrawals.lang (100%)
 rename {htdocs => public}/langs/es_ES/workflow.lang (100%)
 rename {htdocs => public}/langs/es_HN/admin.lang (100%)
 rename {htdocs => public}/langs/es_HN/bills.lang (100%)
 rename {htdocs => public}/langs/es_HN/companies.lang (100%)
 rename {htdocs => public}/langs/es_HN/compta.lang (100%)
 rename {htdocs => public}/langs/es_HN/main.lang (100%)
 rename {htdocs => public}/langs/es_HN/propal.lang (100%)
 rename {htdocs => public}/langs/es_MX/accountancy.lang (100%)
 rename {htdocs => public}/langs/es_MX/admin.lang (100%)
 rename {htdocs => public}/langs/es_MX/agenda.lang (100%)
 rename {htdocs => public}/langs/es_MX/banks.lang (100%)
 rename {htdocs => public}/langs/es_MX/bills.lang (100%)
 rename {htdocs => public}/langs/es_MX/bookmarks.lang (100%)
 rename {htdocs => public}/langs/es_MX/boxes.lang (100%)
 rename {htdocs => public}/langs/es_MX/cashdesk.lang (100%)
 rename {htdocs => public}/langs/es_MX/categories.lang (100%)
 rename {htdocs => public}/langs/es_MX/commercial.lang (100%)
 rename {htdocs => public}/langs/es_MX/companies.lang (100%)
 rename {htdocs => public}/langs/es_MX/compta.lang (100%)
 rename {htdocs => public}/langs/es_MX/contracts.lang (100%)
 rename {htdocs => public}/langs/es_MX/cron.lang (100%)
 rename {htdocs => public}/langs/es_MX/deliveries.lang (100%)
 rename {htdocs => public}/langs/es_MX/dict.lang (100%)
 rename {htdocs => public}/langs/es_MX/donations.lang (100%)
 rename {htdocs => public}/langs/es_MX/ecm.lang (100%)
 rename {htdocs => public}/langs/es_MX/errors.lang (100%)
 rename {htdocs => public}/langs/es_MX/exports.lang (100%)
 rename {htdocs => public}/langs/es_MX/externalsite.lang (100%)
 rename {htdocs => public}/langs/es_MX/ftp.lang (100%)
 rename {htdocs => public}/langs/es_MX/help.lang (100%)
 rename {htdocs => public}/langs/es_MX/holiday.lang (100%)
 rename {htdocs => public}/langs/es_MX/hrm.lang (100%)
 rename {htdocs => public}/langs/es_MX/incoterm.lang (100%)
 rename {htdocs => public}/langs/es_MX/install.lang (100%)
 rename {htdocs => public}/langs/es_MX/interventions.lang (100%)
 rename {htdocs => public}/langs/es_MX/languages.lang (100%)
 rename {htdocs => public}/langs/es_MX/ldap.lang (100%)
 rename {htdocs => public}/langs/es_MX/link.lang (100%)
 rename {htdocs => public}/langs/es_MX/loan.lang (100%)
 rename {htdocs => public}/langs/es_MX/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/es_MX/mails.lang (100%)
 rename {htdocs => public}/langs/es_MX/main.lang (100%)
 rename {htdocs => public}/langs/es_MX/margins.lang (100%)
 rename {htdocs => public}/langs/es_MX/members.lang (100%)
 rename {htdocs => public}/langs/es_MX/oauth.lang (100%)
 rename {htdocs => public}/langs/es_MX/opensurvey.lang (100%)
 rename {htdocs => public}/langs/es_MX/orders.lang (100%)
 rename {htdocs => public}/langs/es_MX/other.lang (100%)
 rename {htdocs => public}/langs/es_MX/paybox.lang (100%)
 rename {htdocs => public}/langs/es_MX/paypal.lang (100%)
 rename {htdocs => public}/langs/es_MX/printing.lang (100%)
 rename {htdocs => public}/langs/es_MX/productbatch.lang (100%)
 rename {htdocs => public}/langs/es_MX/products.lang (100%)
 rename {htdocs => public}/langs/es_MX/projects.lang (100%)
 rename {htdocs => public}/langs/es_MX/propal.lang (100%)
 rename {htdocs => public}/langs/es_MX/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/es_MX/resource.lang (100%)
 rename {htdocs => public}/langs/es_MX/salaries.lang (100%)
 rename {htdocs => public}/langs/es_MX/sendings.lang (100%)
 rename {htdocs => public}/langs/es_MX/sms.lang (100%)
 rename {htdocs => public}/langs/es_MX/stocks.lang (100%)
 rename {htdocs => public}/langs/es_MX/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/es_MX/suppliers.lang (100%)
 rename {htdocs => public}/langs/es_MX/trips.lang (100%)
 rename {htdocs => public}/langs/es_MX/users.lang (100%)
 rename {htdocs => public}/langs/es_MX/website.lang (100%)
 rename {htdocs => public}/langs/es_MX/withdrawals.lang (100%)
 rename {htdocs => public}/langs/es_MX/workflow.lang (100%)
 rename {htdocs => public}/langs/es_PA/accountancy.lang (100%)
 rename {htdocs => public}/langs/es_PA/admin.lang (100%)
 rename {htdocs => public}/langs/es_PA/agenda.lang (100%)
 rename {htdocs => public}/langs/es_PA/banks.lang (100%)
 rename {htdocs => public}/langs/es_PA/bills.lang (100%)
 rename {htdocs => public}/langs/es_PA/bookmarks.lang (100%)
 rename {htdocs => public}/langs/es_PA/boxes.lang (100%)
 rename {htdocs => public}/langs/es_PA/cashdesk.lang (100%)
 rename {htdocs => public}/langs/es_PA/categories.lang (100%)
 rename {htdocs => public}/langs/es_PA/commercial.lang (100%)
 rename {htdocs => public}/langs/es_PA/companies.lang (100%)
 rename {htdocs => public}/langs/es_PA/compta.lang (100%)
 rename {htdocs => public}/langs/es_PA/contracts.lang (100%)
 rename {htdocs => public}/langs/es_PA/cron.lang (100%)
 rename {htdocs => public}/langs/es_PA/deliveries.lang (100%)
 rename {htdocs => public}/langs/es_PA/dict.lang (100%)
 rename {htdocs => public}/langs/es_PA/donations.lang (100%)
 rename {htdocs => public}/langs/es_PA/ecm.lang (100%)
 rename {htdocs => public}/langs/es_PA/errors.lang (100%)
 rename {htdocs => public}/langs/es_PA/exports.lang (100%)
 rename {htdocs => public}/langs/es_PA/externalsite.lang (100%)
 rename {htdocs => public}/langs/es_PA/ftp.lang (100%)
 rename {htdocs => public}/langs/es_PA/help.lang (100%)
 rename {htdocs => public}/langs/es_PA/holiday.lang (100%)
 rename {htdocs => public}/langs/es_PA/hrm.lang (100%)
 rename {htdocs => public}/langs/es_PA/incoterm.lang (100%)
 rename {htdocs => public}/langs/es_PA/install.lang (100%)
 rename {htdocs => public}/langs/es_PA/interventions.lang (100%)
 rename {htdocs => public}/langs/es_PA/languages.lang (100%)
 rename {htdocs => public}/langs/es_PA/ldap.lang (100%)
 rename {htdocs => public}/langs/es_PA/link.lang (100%)
 rename {htdocs => public}/langs/es_PA/loan.lang (100%)
 rename {htdocs => public}/langs/es_PA/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/es_PA/mails.lang (100%)
 rename {htdocs => public}/langs/es_PA/main.lang (100%)
 rename {htdocs => public}/langs/es_PA/margins.lang (100%)
 rename {htdocs => public}/langs/es_PA/members.lang (100%)
 rename {htdocs => public}/langs/es_PA/oauth.lang (100%)
 rename {htdocs => public}/langs/es_PA/opensurvey.lang (100%)
 rename {htdocs => public}/langs/es_PA/orders.lang (100%)
 rename {htdocs => public}/langs/es_PA/other.lang (100%)
 rename {htdocs => public}/langs/es_PA/paybox.lang (100%)
 rename {htdocs => public}/langs/es_PA/paypal.lang (100%)
 rename {htdocs => public}/langs/es_PA/printing.lang (100%)
 rename {htdocs => public}/langs/es_PA/productbatch.lang (100%)
 rename {htdocs => public}/langs/es_PA/products.lang (100%)
 rename {htdocs => public}/langs/es_PA/projects.lang (100%)
 rename {htdocs => public}/langs/es_PA/propal.lang (100%)
 rename {htdocs => public}/langs/es_PA/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/es_PA/resource.lang (100%)
 rename {htdocs => public}/langs/es_PA/salaries.lang (100%)
 rename {htdocs => public}/langs/es_PA/sendings.lang (100%)
 rename {htdocs => public}/langs/es_PA/sms.lang (100%)
 rename {htdocs => public}/langs/es_PA/stocks.lang (100%)
 rename {htdocs => public}/langs/es_PA/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/es_PA/suppliers.lang (100%)
 rename {htdocs => public}/langs/es_PA/trips.lang (100%)
 rename {htdocs => public}/langs/es_PA/users.lang (100%)
 rename {htdocs => public}/langs/es_PA/website.lang (100%)
 rename {htdocs => public}/langs/es_PA/withdrawals.lang (100%)
 rename {htdocs => public}/langs/es_PA/workflow.lang (100%)
 rename {htdocs => public}/langs/es_PE/accountancy.lang (100%)
 rename {htdocs => public}/langs/es_PE/admin.lang (100%)
 rename {htdocs => public}/langs/es_PE/agenda.lang (100%)
 rename {htdocs => public}/langs/es_PE/banks.lang (100%)
 rename {htdocs => public}/langs/es_PE/bills.lang (100%)
 rename {htdocs => public}/langs/es_PE/bookmarks.lang (100%)
 rename {htdocs => public}/langs/es_PE/boxes.lang (100%)
 rename {htdocs => public}/langs/es_PE/cashdesk.lang (100%)
 rename {htdocs => public}/langs/es_PE/categories.lang (100%)
 rename {htdocs => public}/langs/es_PE/commercial.lang (100%)
 rename {htdocs => public}/langs/es_PE/companies.lang (100%)
 rename {htdocs => public}/langs/es_PE/compta.lang (100%)
 rename {htdocs => public}/langs/es_PE/contracts.lang (100%)
 rename {htdocs => public}/langs/es_PE/cron.lang (100%)
 rename {htdocs => public}/langs/es_PE/deliveries.lang (100%)
 rename {htdocs => public}/langs/es_PE/dict.lang (100%)
 rename {htdocs => public}/langs/es_PE/donations.lang (100%)
 rename {htdocs => public}/langs/es_PE/ecm.lang (100%)
 rename {htdocs => public}/langs/es_PE/errors.lang (100%)
 rename {htdocs => public}/langs/es_PE/exports.lang (100%)
 rename {htdocs => public}/langs/es_PE/externalsite.lang (100%)
 rename {htdocs => public}/langs/es_PE/ftp.lang (100%)
 rename {htdocs => public}/langs/es_PE/help.lang (100%)
 rename {htdocs => public}/langs/es_PE/holiday.lang (100%)
 rename {htdocs => public}/langs/es_PE/hrm.lang (100%)
 rename {htdocs => public}/langs/es_PE/incoterm.lang (100%)
 rename {htdocs => public}/langs/es_PE/install.lang (100%)
 rename {htdocs => public}/langs/es_PE/interventions.lang (100%)
 rename {htdocs => public}/langs/es_PE/languages.lang (100%)
 rename {htdocs => public}/langs/es_PE/ldap.lang (100%)
 rename {htdocs => public}/langs/es_PE/link.lang (100%)
 rename {htdocs => public}/langs/es_PE/loan.lang (100%)
 rename {htdocs => public}/langs/es_PE/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/es_PE/mails.lang (100%)
 rename {htdocs => public}/langs/es_PE/main.lang (100%)
 rename {htdocs => public}/langs/es_PE/margins.lang (100%)
 rename {htdocs => public}/langs/es_PE/members.lang (100%)
 rename {htdocs => public}/langs/es_PE/oauth.lang (100%)
 rename {htdocs => public}/langs/es_PE/opensurvey.lang (100%)
 rename {htdocs => public}/langs/es_PE/orders.lang (100%)
 rename {htdocs => public}/langs/es_PE/other.lang (100%)
 rename {htdocs => public}/langs/es_PE/paybox.lang (100%)
 rename {htdocs => public}/langs/es_PE/paypal.lang (100%)
 rename {htdocs => public}/langs/es_PE/printing.lang (100%)
 rename {htdocs => public}/langs/es_PE/productbatch.lang (100%)
 rename {htdocs => public}/langs/es_PE/products.lang (100%)
 rename {htdocs => public}/langs/es_PE/projects.lang (100%)
 rename {htdocs => public}/langs/es_PE/propal.lang (100%)
 rename {htdocs => public}/langs/es_PE/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/es_PE/resource.lang (100%)
 rename {htdocs => public}/langs/es_PE/salaries.lang (100%)
 rename {htdocs => public}/langs/es_PE/sendings.lang (100%)
 rename {htdocs => public}/langs/es_PE/sms.lang (100%)
 rename {htdocs => public}/langs/es_PE/stocks.lang (100%)
 rename {htdocs => public}/langs/es_PE/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/es_PE/suppliers.lang (100%)
 rename {htdocs => public}/langs/es_PE/trips.lang (100%)
 rename {htdocs => public}/langs/es_PE/users.lang (100%)
 rename {htdocs => public}/langs/es_PE/website.lang (100%)
 rename {htdocs => public}/langs/es_PE/withdrawals.lang (100%)
 rename {htdocs => public}/langs/es_PE/workflow.lang (100%)
 rename {htdocs => public}/langs/es_PR/admin.lang (100%)
 rename {htdocs => public}/langs/es_PR/bills.lang (100%)
 rename {htdocs => public}/langs/es_PR/companies.lang (100%)
 rename {htdocs => public}/langs/es_PR/compta.lang (100%)
 rename {htdocs => public}/langs/es_PR/main.lang (100%)
 rename {htdocs => public}/langs/es_PR/propal.lang (100%)
 rename {htdocs => public}/langs/es_PY/accountancy.lang (100%)
 rename {htdocs => public}/langs/es_PY/admin.lang (100%)
 rename {htdocs => public}/langs/es_PY/agenda.lang (100%)
 rename {htdocs => public}/langs/es_PY/banks.lang (100%)
 rename {htdocs => public}/langs/es_PY/bills.lang (100%)
 rename {htdocs => public}/langs/es_PY/bookmarks.lang (100%)
 rename {htdocs => public}/langs/es_PY/boxes.lang (100%)
 rename {htdocs => public}/langs/es_PY/cashdesk.lang (100%)
 rename {htdocs => public}/langs/es_PY/categories.lang (100%)
 rename {htdocs => public}/langs/es_PY/commercial.lang (100%)
 rename {htdocs => public}/langs/es_PY/companies.lang (100%)
 rename {htdocs => public}/langs/es_PY/compta.lang (100%)
 rename {htdocs => public}/langs/es_PY/contracts.lang (100%)
 rename {htdocs => public}/langs/es_PY/cron.lang (100%)
 rename {htdocs => public}/langs/es_PY/deliveries.lang (100%)
 rename {htdocs => public}/langs/es_PY/dict.lang (100%)
 rename {htdocs => public}/langs/es_PY/donations.lang (100%)
 rename {htdocs => public}/langs/es_PY/ecm.lang (100%)
 rename {htdocs => public}/langs/es_PY/errors.lang (100%)
 rename {htdocs => public}/langs/es_PY/exports.lang (100%)
 rename {htdocs => public}/langs/es_PY/externalsite.lang (100%)
 rename {htdocs => public}/langs/es_PY/ftp.lang (100%)
 rename {htdocs => public}/langs/es_PY/help.lang (100%)
 rename {htdocs => public}/langs/es_PY/holiday.lang (100%)
 rename {htdocs => public}/langs/es_PY/hrm.lang (100%)
 rename {htdocs => public}/langs/es_PY/incoterm.lang (100%)
 rename {htdocs => public}/langs/es_PY/install.lang (100%)
 rename {htdocs => public}/langs/es_PY/interventions.lang (100%)
 rename {htdocs => public}/langs/es_PY/languages.lang (100%)
 rename {htdocs => public}/langs/es_PY/ldap.lang (100%)
 rename {htdocs => public}/langs/es_PY/link.lang (100%)
 rename {htdocs => public}/langs/es_PY/loan.lang (100%)
 rename {htdocs => public}/langs/es_PY/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/es_PY/mails.lang (100%)
 rename {htdocs => public}/langs/es_PY/main.lang (100%)
 rename {htdocs => public}/langs/es_PY/margins.lang (100%)
 rename {htdocs => public}/langs/es_PY/members.lang (100%)
 rename {htdocs => public}/langs/es_PY/oauth.lang (100%)
 rename {htdocs => public}/langs/es_PY/opensurvey.lang (100%)
 rename {htdocs => public}/langs/es_PY/orders.lang (100%)
 rename {htdocs => public}/langs/es_PY/other.lang (100%)
 rename {htdocs => public}/langs/es_PY/paybox.lang (100%)
 rename {htdocs => public}/langs/es_PY/paypal.lang (100%)
 rename {htdocs => public}/langs/es_PY/printing.lang (100%)
 rename {htdocs => public}/langs/es_PY/productbatch.lang (100%)
 rename {htdocs => public}/langs/es_PY/products.lang (100%)
 rename {htdocs => public}/langs/es_PY/projects.lang (100%)
 rename {htdocs => public}/langs/es_PY/propal.lang (100%)
 rename {htdocs => public}/langs/es_PY/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/es_PY/resource.lang (100%)
 rename {htdocs => public}/langs/es_PY/salaries.lang (100%)
 rename {htdocs => public}/langs/es_PY/sendings.lang (100%)
 rename {htdocs => public}/langs/es_PY/sms.lang (100%)
 rename {htdocs => public}/langs/es_PY/stocks.lang (100%)
 rename {htdocs => public}/langs/es_PY/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/es_PY/suppliers.lang (100%)
 rename {htdocs => public}/langs/es_PY/trips.lang (100%)
 rename {htdocs => public}/langs/es_PY/users.lang (100%)
 rename {htdocs => public}/langs/es_PY/website.lang (100%)
 rename {htdocs => public}/langs/es_PY/withdrawals.lang (100%)
 rename {htdocs => public}/langs/es_PY/workflow.lang (100%)
 rename {htdocs => public}/langs/es_VE/accountancy.lang (100%)
 rename {htdocs => public}/langs/es_VE/admin.lang (100%)
 rename {htdocs => public}/langs/es_VE/agenda.lang (100%)
 rename {htdocs => public}/langs/es_VE/banks.lang (100%)
 rename {htdocs => public}/langs/es_VE/bills.lang (100%)
 rename {htdocs => public}/langs/es_VE/bookmarks.lang (100%)
 rename {htdocs => public}/langs/es_VE/boxes.lang (100%)
 rename {htdocs => public}/langs/es_VE/cashdesk.lang (100%)
 rename {htdocs => public}/langs/es_VE/categories.lang (100%)
 rename {htdocs => public}/langs/es_VE/commercial.lang (100%)
 rename {htdocs => public}/langs/es_VE/companies.lang (100%)
 rename {htdocs => public}/langs/es_VE/compta.lang (100%)
 rename {htdocs => public}/langs/es_VE/contracts.lang (100%)
 rename {htdocs => public}/langs/es_VE/cron.lang (100%)
 rename {htdocs => public}/langs/es_VE/deliveries.lang (100%)
 rename {htdocs => public}/langs/es_VE/dict.lang (100%)
 rename {htdocs => public}/langs/es_VE/donations.lang (100%)
 rename {htdocs => public}/langs/es_VE/ecm.lang (100%)
 rename {htdocs => public}/langs/es_VE/errors.lang (100%)
 rename {htdocs => public}/langs/es_VE/exports.lang (100%)
 rename {htdocs => public}/langs/es_VE/externalsite.lang (100%)
 rename {htdocs => public}/langs/es_VE/ftp.lang (100%)
 rename {htdocs => public}/langs/es_VE/help.lang (100%)
 rename {htdocs => public}/langs/es_VE/holiday.lang (100%)
 rename {htdocs => public}/langs/es_VE/hrm.lang (100%)
 rename {htdocs => public}/langs/es_VE/incoterm.lang (100%)
 rename {htdocs => public}/langs/es_VE/install.lang (100%)
 rename {htdocs => public}/langs/es_VE/interventions.lang (100%)
 rename {htdocs => public}/langs/es_VE/languages.lang (100%)
 rename {htdocs => public}/langs/es_VE/ldap.lang (100%)
 rename {htdocs => public}/langs/es_VE/link.lang (100%)
 rename {htdocs => public}/langs/es_VE/loan.lang (100%)
 rename {htdocs => public}/langs/es_VE/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/es_VE/mails.lang (100%)
 rename {htdocs => public}/langs/es_VE/main.lang (100%)
 rename {htdocs => public}/langs/es_VE/margins.lang (100%)
 rename {htdocs => public}/langs/es_VE/members.lang (100%)
 rename {htdocs => public}/langs/es_VE/oauth.lang (100%)
 rename {htdocs => public}/langs/es_VE/opensurvey.lang (100%)
 rename {htdocs => public}/langs/es_VE/orders.lang (100%)
 rename {htdocs => public}/langs/es_VE/other.lang (100%)
 rename {htdocs => public}/langs/es_VE/paybox.lang (100%)
 rename {htdocs => public}/langs/es_VE/paypal.lang (100%)
 rename {htdocs => public}/langs/es_VE/printing.lang (100%)
 rename {htdocs => public}/langs/es_VE/productbatch.lang (100%)
 rename {htdocs => public}/langs/es_VE/products.lang (100%)
 rename {htdocs => public}/langs/es_VE/projects.lang (100%)
 rename {htdocs => public}/langs/es_VE/propal.lang (100%)
 rename {htdocs => public}/langs/es_VE/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/es_VE/resource.lang (100%)
 rename {htdocs => public}/langs/es_VE/salaries.lang (100%)
 rename {htdocs => public}/langs/es_VE/sendings.lang (100%)
 rename {htdocs => public}/langs/es_VE/sms.lang (100%)
 rename {htdocs => public}/langs/es_VE/stocks.lang (100%)
 rename {htdocs => public}/langs/es_VE/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/es_VE/suppliers.lang (100%)
 rename {htdocs => public}/langs/es_VE/trips.lang (100%)
 rename {htdocs => public}/langs/es_VE/users.lang (100%)
 rename {htdocs => public}/langs/es_VE/website.lang (100%)
 rename {htdocs => public}/langs/es_VE/withdrawals.lang (100%)
 rename {htdocs => public}/langs/es_VE/workflow.lang (100%)
 rename {htdocs => public}/langs/et_EE/accountancy.lang (100%)
 rename {htdocs => public}/langs/et_EE/admin.lang (100%)
 rename {htdocs => public}/langs/et_EE/agenda.lang (100%)
 rename {htdocs => public}/langs/et_EE/banks.lang (100%)
 rename {htdocs => public}/langs/et_EE/bills.lang (100%)
 rename {htdocs => public}/langs/et_EE/bookmarks.lang (100%)
 rename {htdocs => public}/langs/et_EE/boxes.lang (100%)
 rename {htdocs => public}/langs/et_EE/cashdesk.lang (100%)
 rename {htdocs => public}/langs/et_EE/categories.lang (100%)
 rename {htdocs => public}/langs/et_EE/commercial.lang (100%)
 rename {htdocs => public}/langs/et_EE/companies.lang (100%)
 rename {htdocs => public}/langs/et_EE/compta.lang (100%)
 rename {htdocs => public}/langs/et_EE/contracts.lang (100%)
 rename {htdocs => public}/langs/et_EE/cron.lang (100%)
 rename {htdocs => public}/langs/et_EE/deliveries.lang (100%)
 rename {htdocs => public}/langs/et_EE/dict.lang (100%)
 rename {htdocs => public}/langs/et_EE/donations.lang (100%)
 rename {htdocs => public}/langs/et_EE/ecm.lang (100%)
 rename {htdocs => public}/langs/et_EE/errors.lang (100%)
 rename {htdocs => public}/langs/et_EE/exports.lang (100%)
 rename {htdocs => public}/langs/et_EE/externalsite.lang (100%)
 rename {htdocs => public}/langs/et_EE/ftp.lang (100%)
 rename {htdocs => public}/langs/et_EE/help.lang (100%)
 rename {htdocs => public}/langs/et_EE/holiday.lang (100%)
 rename {htdocs => public}/langs/et_EE/hrm.lang (100%)
 rename {htdocs => public}/langs/et_EE/incoterm.lang (100%)
 rename {htdocs => public}/langs/et_EE/install.lang (100%)
 rename {htdocs => public}/langs/et_EE/interventions.lang (100%)
 rename {htdocs => public}/langs/et_EE/languages.lang (100%)
 rename {htdocs => public}/langs/et_EE/ldap.lang (100%)
 rename {htdocs => public}/langs/et_EE/link.lang (100%)
 rename {htdocs => public}/langs/et_EE/loan.lang (100%)
 rename {htdocs => public}/langs/et_EE/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/et_EE/mails.lang (100%)
 rename {htdocs => public}/langs/et_EE/main.lang (100%)
 rename {htdocs => public}/langs/et_EE/margins.lang (100%)
 rename {htdocs => public}/langs/et_EE/members.lang (100%)
 rename {htdocs => public}/langs/et_EE/oauth.lang (100%)
 rename {htdocs => public}/langs/et_EE/opensurvey.lang (100%)
 rename {htdocs => public}/langs/et_EE/orders.lang (100%)
 rename {htdocs => public}/langs/et_EE/other.lang (100%)
 rename {htdocs => public}/langs/et_EE/paybox.lang (100%)
 rename {htdocs => public}/langs/et_EE/paypal.lang (100%)
 rename {htdocs => public}/langs/et_EE/printing.lang (100%)
 rename {htdocs => public}/langs/et_EE/productbatch.lang (100%)
 rename {htdocs => public}/langs/et_EE/products.lang (100%)
 rename {htdocs => public}/langs/et_EE/projects.lang (100%)
 rename {htdocs => public}/langs/et_EE/propal.lang (100%)
 rename {htdocs => public}/langs/et_EE/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/et_EE/resource.lang (100%)
 rename {htdocs => public}/langs/et_EE/salaries.lang (100%)
 rename {htdocs => public}/langs/et_EE/sendings.lang (100%)
 rename {htdocs => public}/langs/et_EE/sms.lang (100%)
 rename {htdocs => public}/langs/et_EE/stocks.lang (100%)
 rename {htdocs => public}/langs/et_EE/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/et_EE/suppliers.lang (100%)
 rename {htdocs => public}/langs/et_EE/trips.lang (100%)
 rename {htdocs => public}/langs/et_EE/users.lang (100%)
 rename {htdocs => public}/langs/et_EE/website.lang (100%)
 rename {htdocs => public}/langs/et_EE/withdrawals.lang (100%)
 rename {htdocs => public}/langs/et_EE/workflow.lang (100%)
 rename {htdocs => public}/langs/eu_ES/accountancy.lang (100%)
 rename {htdocs => public}/langs/eu_ES/admin.lang (100%)
 rename {htdocs => public}/langs/eu_ES/agenda.lang (100%)
 rename {htdocs => public}/langs/eu_ES/banks.lang (100%)
 rename {htdocs => public}/langs/eu_ES/bills.lang (100%)
 rename {htdocs => public}/langs/eu_ES/bookmarks.lang (100%)
 rename {htdocs => public}/langs/eu_ES/boxes.lang (100%)
 rename {htdocs => public}/langs/eu_ES/cashdesk.lang (100%)
 rename {htdocs => public}/langs/eu_ES/categories.lang (100%)
 rename {htdocs => public}/langs/eu_ES/commercial.lang (100%)
 rename {htdocs => public}/langs/eu_ES/companies.lang (100%)
 rename {htdocs => public}/langs/eu_ES/compta.lang (100%)
 rename {htdocs => public}/langs/eu_ES/contracts.lang (100%)
 rename {htdocs => public}/langs/eu_ES/cron.lang (100%)
 rename {htdocs => public}/langs/eu_ES/deliveries.lang (100%)
 rename {htdocs => public}/langs/eu_ES/dict.lang (100%)
 rename {htdocs => public}/langs/eu_ES/donations.lang (100%)
 rename {htdocs => public}/langs/eu_ES/ecm.lang (100%)
 rename {htdocs => public}/langs/eu_ES/errors.lang (100%)
 rename {htdocs => public}/langs/eu_ES/expensereports.lang (100%)
 rename {htdocs => public}/langs/eu_ES/exports.lang (100%)
 rename {htdocs => public}/langs/eu_ES/externalsite.lang (100%)
 rename {htdocs => public}/langs/eu_ES/ftp.lang (100%)
 rename {htdocs => public}/langs/eu_ES/help.lang (100%)
 rename {htdocs => public}/langs/eu_ES/holiday.lang (100%)
 rename {htdocs => public}/langs/eu_ES/hrm.lang (100%)
 rename {htdocs => public}/langs/eu_ES/incoterm.lang (100%)
 rename {htdocs => public}/langs/eu_ES/install.lang (100%)
 rename {htdocs => public}/langs/eu_ES/interventions.lang (100%)
 rename {htdocs => public}/langs/eu_ES/languages.lang (100%)
 rename {htdocs => public}/langs/eu_ES/ldap.lang (100%)
 rename {htdocs => public}/langs/eu_ES/link.lang (100%)
 rename {htdocs => public}/langs/eu_ES/loan.lang (100%)
 rename {htdocs => public}/langs/eu_ES/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/eu_ES/mails.lang (100%)
 rename {htdocs => public}/langs/eu_ES/main.lang (100%)
 rename {htdocs => public}/langs/eu_ES/margins.lang (100%)
 rename {htdocs => public}/langs/eu_ES/members.lang (100%)
 rename {htdocs => public}/langs/eu_ES/oauth.lang (100%)
 rename {htdocs => public}/langs/eu_ES/opensurvey.lang (100%)
 rename {htdocs => public}/langs/eu_ES/orders.lang (100%)
 rename {htdocs => public}/langs/eu_ES/other.lang (100%)
 rename {htdocs => public}/langs/eu_ES/paybox.lang (100%)
 rename {htdocs => public}/langs/eu_ES/paypal.lang (100%)
 rename {htdocs => public}/langs/eu_ES/printing.lang (100%)
 rename {htdocs => public}/langs/eu_ES/productbatch.lang (100%)
 rename {htdocs => public}/langs/eu_ES/products.lang (100%)
 rename {htdocs => public}/langs/eu_ES/projects.lang (100%)
 rename {htdocs => public}/langs/eu_ES/propal.lang (100%)
 rename {htdocs => public}/langs/eu_ES/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/eu_ES/resource.lang (100%)
 rename {htdocs => public}/langs/eu_ES/salaries.lang (100%)
 rename {htdocs => public}/langs/eu_ES/sendings.lang (100%)
 rename {htdocs => public}/langs/eu_ES/sms.lang (100%)
 rename {htdocs => public}/langs/eu_ES/stocks.lang (100%)
 rename {htdocs => public}/langs/eu_ES/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/eu_ES/suppliers.lang (100%)
 rename {htdocs => public}/langs/eu_ES/trips.lang (100%)
 rename {htdocs => public}/langs/eu_ES/users.lang (100%)
 rename {htdocs => public}/langs/eu_ES/website.lang (100%)
 rename {htdocs => public}/langs/eu_ES/withdrawals.lang (100%)
 rename {htdocs => public}/langs/eu_ES/workflow.lang (100%)
 rename {htdocs => public}/langs/fa_IR/accountancy.lang (100%)
 rename {htdocs => public}/langs/fa_IR/admin.lang (100%)
 rename {htdocs => public}/langs/fa_IR/agenda.lang (100%)
 rename {htdocs => public}/langs/fa_IR/banks.lang (100%)
 rename {htdocs => public}/langs/fa_IR/bills.lang (100%)
 rename {htdocs => public}/langs/fa_IR/bookmarks.lang (100%)
 rename {htdocs => public}/langs/fa_IR/boxes.lang (100%)
 rename {htdocs => public}/langs/fa_IR/cashdesk.lang (100%)
 rename {htdocs => public}/langs/fa_IR/categories.lang (100%)
 rename {htdocs => public}/langs/fa_IR/commercial.lang (100%)
 rename {htdocs => public}/langs/fa_IR/companies.lang (100%)
 rename {htdocs => public}/langs/fa_IR/compta.lang (100%)
 rename {htdocs => public}/langs/fa_IR/contracts.lang (100%)
 rename {htdocs => public}/langs/fa_IR/cron.lang (100%)
 rename {htdocs => public}/langs/fa_IR/deliveries.lang (100%)
 rename {htdocs => public}/langs/fa_IR/dict.lang (100%)
 rename {htdocs => public}/langs/fa_IR/domains.lang (100%)
 rename {htdocs => public}/langs/fa_IR/donations.lang (100%)
 rename {htdocs => public}/langs/fa_IR/ecm.lang (100%)
 rename {htdocs => public}/langs/fa_IR/errors.lang (100%)
 rename {htdocs => public}/langs/fa_IR/exports.lang (100%)
 rename {htdocs => public}/langs/fa_IR/externalsite.lang (100%)
 rename {htdocs => public}/langs/fa_IR/ftp.lang (100%)
 rename {htdocs => public}/langs/fa_IR/help.lang (100%)
 rename {htdocs => public}/langs/fa_IR/holiday.lang (100%)
 rename {htdocs => public}/langs/fa_IR/hrm.lang (100%)
 rename {htdocs => public}/langs/fa_IR/incoterm.lang (100%)
 rename {htdocs => public}/langs/fa_IR/install.lang (100%)
 rename {htdocs => public}/langs/fa_IR/interventions.lang (100%)
 rename {htdocs => public}/langs/fa_IR/languages.lang (100%)
 rename {htdocs => public}/langs/fa_IR/ldap.lang (100%)
 rename {htdocs => public}/langs/fa_IR/link.lang (100%)
 rename {htdocs => public}/langs/fa_IR/loan.lang (100%)
 rename {htdocs => public}/langs/fa_IR/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/fa_IR/mails.lang (100%)
 rename {htdocs => public}/langs/fa_IR/main.lang (100%)
 rename {htdocs => public}/langs/fa_IR/margins.lang (100%)
 rename {htdocs => public}/langs/fa_IR/members.lang (100%)
 rename {htdocs => public}/langs/fa_IR/oauth.lang (100%)
 rename {htdocs => public}/langs/fa_IR/opensurvey.lang (100%)
 rename {htdocs => public}/langs/fa_IR/orders.lang (100%)
 rename {htdocs => public}/langs/fa_IR/other.lang (100%)
 rename {htdocs => public}/langs/fa_IR/paybox.lang (100%)
 rename {htdocs => public}/langs/fa_IR/paypal.lang (100%)
 rename {htdocs => public}/langs/fa_IR/printing.lang (100%)
 rename {htdocs => public}/langs/fa_IR/productbatch.lang (100%)
 rename {htdocs => public}/langs/fa_IR/products.lang (100%)
 rename {htdocs => public}/langs/fa_IR/projects.lang (100%)
 rename {htdocs => public}/langs/fa_IR/propal.lang (100%)
 rename {htdocs => public}/langs/fa_IR/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/fa_IR/resource.lang (100%)
 rename {htdocs => public}/langs/fa_IR/salaries.lang (100%)
 rename {htdocs => public}/langs/fa_IR/sendings.lang (100%)
 rename {htdocs => public}/langs/fa_IR/sms.lang (100%)
 rename {htdocs => public}/langs/fa_IR/stocks.lang (100%)
 rename {htdocs => public}/langs/fa_IR/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/fa_IR/suppliers.lang (100%)
 rename {htdocs => public}/langs/fa_IR/trips.lang (100%)
 rename {htdocs => public}/langs/fa_IR/users.lang (100%)
 rename {htdocs => public}/langs/fa_IR/website.lang (100%)
 rename {htdocs => public}/langs/fa_IR/withdrawals.lang (100%)
 rename {htdocs => public}/langs/fa_IR/workflow.lang (100%)
 rename {htdocs => public}/langs/fi_FI/accountancy.lang (100%)
 rename {htdocs => public}/langs/fi_FI/admin.lang (100%)
 rename {htdocs => public}/langs/fi_FI/agenda.lang (100%)
 rename {htdocs => public}/langs/fi_FI/banks.lang (100%)
 rename {htdocs => public}/langs/fi_FI/bills.lang (100%)
 rename {htdocs => public}/langs/fi_FI/bookmarks.lang (100%)
 rename {htdocs => public}/langs/fi_FI/boxes.lang (100%)
 rename {htdocs => public}/langs/fi_FI/cashdesk.lang (100%)
 rename {htdocs => public}/langs/fi_FI/categories.lang (100%)
 rename {htdocs => public}/langs/fi_FI/commercial.lang (100%)
 rename {htdocs => public}/langs/fi_FI/companies.lang (100%)
 rename {htdocs => public}/langs/fi_FI/compta.lang (100%)
 rename {htdocs => public}/langs/fi_FI/contracts.lang (100%)
 rename {htdocs => public}/langs/fi_FI/cron.lang (100%)
 rename {htdocs => public}/langs/fi_FI/deliveries.lang (100%)
 rename {htdocs => public}/langs/fi_FI/dict.lang (100%)
 rename {htdocs => public}/langs/fi_FI/donations.lang (100%)
 rename {htdocs => public}/langs/fi_FI/ecm.lang (100%)
 rename {htdocs => public}/langs/fi_FI/errors.lang (100%)
 rename {htdocs => public}/langs/fi_FI/exports.lang (100%)
 rename {htdocs => public}/langs/fi_FI/externalsite.lang (100%)
 rename {htdocs => public}/langs/fi_FI/ftp.lang (100%)
 rename {htdocs => public}/langs/fi_FI/help.lang (100%)
 rename {htdocs => public}/langs/fi_FI/holiday.lang (100%)
 rename {htdocs => public}/langs/fi_FI/hrm.lang (100%)
 rename {htdocs => public}/langs/fi_FI/incoterm.lang (100%)
 rename {htdocs => public}/langs/fi_FI/install.lang (100%)
 rename {htdocs => public}/langs/fi_FI/interventions.lang (100%)
 rename {htdocs => public}/langs/fi_FI/languages.lang (100%)
 rename {htdocs => public}/langs/fi_FI/ldap.lang (100%)
 rename {htdocs => public}/langs/fi_FI/link.lang (100%)
 rename {htdocs => public}/langs/fi_FI/loan.lang (100%)
 rename {htdocs => public}/langs/fi_FI/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/fi_FI/mails.lang (100%)
 rename {htdocs => public}/langs/fi_FI/main.lang (100%)
 rename {htdocs => public}/langs/fi_FI/margins.lang (100%)
 rename {htdocs => public}/langs/fi_FI/members.lang (100%)
 rename {htdocs => public}/langs/fi_FI/oauth.lang (100%)
 rename {htdocs => public}/langs/fi_FI/opensurvey.lang (100%)
 rename {htdocs => public}/langs/fi_FI/orders.lang (100%)
 rename {htdocs => public}/langs/fi_FI/other.lang (100%)
 rename {htdocs => public}/langs/fi_FI/paybox.lang (100%)
 rename {htdocs => public}/langs/fi_FI/paypal.lang (100%)
 rename {htdocs => public}/langs/fi_FI/printing.lang (100%)
 rename {htdocs => public}/langs/fi_FI/productbatch.lang (100%)
 rename {htdocs => public}/langs/fi_FI/products.lang (100%)
 rename {htdocs => public}/langs/fi_FI/projects.lang (100%)
 rename {htdocs => public}/langs/fi_FI/propal.lang (100%)
 rename {htdocs => public}/langs/fi_FI/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/fi_FI/resource.lang (100%)
 rename {htdocs => public}/langs/fi_FI/salaries.lang (100%)
 rename {htdocs => public}/langs/fi_FI/sendings.lang (100%)
 rename {htdocs => public}/langs/fi_FI/sms.lang (100%)
 rename {htdocs => public}/langs/fi_FI/stocks.lang (100%)
 rename {htdocs => public}/langs/fi_FI/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/fi_FI/suppliers.lang (100%)
 rename {htdocs => public}/langs/fi_FI/trips.lang (100%)
 rename {htdocs => public}/langs/fi_FI/users.lang (100%)
 rename {htdocs => public}/langs/fi_FI/website.lang (100%)
 rename {htdocs => public}/langs/fi_FI/withdrawals.lang (100%)
 rename {htdocs => public}/langs/fi_FI/workflow.lang (100%)
 rename {htdocs => public}/langs/fr_BE/accountancy.lang (100%)
 rename {htdocs => public}/langs/fr_BE/admin.lang (100%)
 rename {htdocs => public}/langs/fr_BE/agenda.lang (100%)
 rename {htdocs => public}/langs/fr_BE/banks.lang (100%)
 rename {htdocs => public}/langs/fr_BE/bills.lang (100%)
 rename {htdocs => public}/langs/fr_BE/bookmarks.lang (100%)
 rename {htdocs => public}/langs/fr_BE/boxes.lang (100%)
 rename {htdocs => public}/langs/fr_BE/cashdesk.lang (100%)
 rename {htdocs => public}/langs/fr_BE/categories.lang (100%)
 rename {htdocs => public}/langs/fr_BE/commercial.lang (100%)
 rename {htdocs => public}/langs/fr_BE/companies.lang (100%)
 rename {htdocs => public}/langs/fr_BE/compta.lang (100%)
 rename {htdocs => public}/langs/fr_BE/contracts.lang (100%)
 rename {htdocs => public}/langs/fr_BE/cron.lang (100%)
 rename {htdocs => public}/langs/fr_BE/deliveries.lang (100%)
 rename {htdocs => public}/langs/fr_BE/dict.lang (100%)
 rename {htdocs => public}/langs/fr_BE/donations.lang (100%)
 rename {htdocs => public}/langs/fr_BE/ecm.lang (100%)
 rename {htdocs => public}/langs/fr_BE/errors.lang (100%)
 rename {htdocs => public}/langs/fr_BE/exports.lang (100%)
 rename {htdocs => public}/langs/fr_BE/externalsite.lang (100%)
 rename {htdocs => public}/langs/fr_BE/ftp.lang (100%)
 rename {htdocs => public}/langs/fr_BE/help.lang (100%)
 rename {htdocs => public}/langs/fr_BE/holiday.lang (100%)
 rename {htdocs => public}/langs/fr_BE/hrm.lang (100%)
 rename {htdocs => public}/langs/fr_BE/incoterm.lang (100%)
 rename {htdocs => public}/langs/fr_BE/install.lang (100%)
 rename {htdocs => public}/langs/fr_BE/interventions.lang (100%)
 rename {htdocs => public}/langs/fr_BE/languages.lang (100%)
 rename {htdocs => public}/langs/fr_BE/ldap.lang (100%)
 rename {htdocs => public}/langs/fr_BE/link.lang (100%)
 rename {htdocs => public}/langs/fr_BE/loan.lang (100%)
 rename {htdocs => public}/langs/fr_BE/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/fr_BE/mails.lang (100%)
 rename {htdocs => public}/langs/fr_BE/main.lang (100%)
 rename {htdocs => public}/langs/fr_BE/margins.lang (100%)
 rename {htdocs => public}/langs/fr_BE/members.lang (100%)
 rename {htdocs => public}/langs/fr_BE/oauth.lang (100%)
 rename {htdocs => public}/langs/fr_BE/opensurvey.lang (100%)
 rename {htdocs => public}/langs/fr_BE/orders.lang (100%)
 rename {htdocs => public}/langs/fr_BE/other.lang (100%)
 rename {htdocs => public}/langs/fr_BE/paybox.lang (100%)
 rename {htdocs => public}/langs/fr_BE/paypal.lang (100%)
 rename {htdocs => public}/langs/fr_BE/printing.lang (100%)
 rename {htdocs => public}/langs/fr_BE/productbatch.lang (100%)
 rename {htdocs => public}/langs/fr_BE/products.lang (100%)
 rename {htdocs => public}/langs/fr_BE/projects.lang (100%)
 rename {htdocs => public}/langs/fr_BE/propal.lang (100%)
 rename {htdocs => public}/langs/fr_BE/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/fr_BE/resource.lang (100%)
 rename {htdocs => public}/langs/fr_BE/salaries.lang (100%)
 rename {htdocs => public}/langs/fr_BE/sendings.lang (100%)
 rename {htdocs => public}/langs/fr_BE/sms.lang (100%)
 rename {htdocs => public}/langs/fr_BE/stocks.lang (100%)
 rename {htdocs => public}/langs/fr_BE/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/fr_BE/suppliers.lang (100%)
 rename {htdocs => public}/langs/fr_BE/trips.lang (100%)
 rename {htdocs => public}/langs/fr_BE/users.lang (100%)
 rename {htdocs => public}/langs/fr_BE/website.lang (100%)
 rename {htdocs => public}/langs/fr_BE/withdrawals.lang (100%)
 rename {htdocs => public}/langs/fr_BE/workflow.lang (100%)
 rename {htdocs => public}/langs/fr_CA/accountancy.lang (100%)
 rename {htdocs => public}/langs/fr_CA/admin.lang (100%)
 rename {htdocs => public}/langs/fr_CA/agenda.lang (100%)
 rename {htdocs => public}/langs/fr_CA/banks.lang (100%)
 rename {htdocs => public}/langs/fr_CA/bills.lang (100%)
 rename {htdocs => public}/langs/fr_CA/bookmarks.lang (100%)
 rename {htdocs => public}/langs/fr_CA/boxes.lang (100%)
 rename {htdocs => public}/langs/fr_CA/cashdesk.lang (100%)
 rename {htdocs => public}/langs/fr_CA/categories.lang (100%)
 rename {htdocs => public}/langs/fr_CA/commercial.lang (100%)
 rename {htdocs => public}/langs/fr_CA/companies.lang (100%)
 rename {htdocs => public}/langs/fr_CA/compta.lang (100%)
 rename {htdocs => public}/langs/fr_CA/contracts.lang (100%)
 rename {htdocs => public}/langs/fr_CA/cron.lang (100%)
 rename {htdocs => public}/langs/fr_CA/deliveries.lang (100%)
 rename {htdocs => public}/langs/fr_CA/dict.lang (100%)
 rename {htdocs => public}/langs/fr_CA/donations.lang (100%)
 rename {htdocs => public}/langs/fr_CA/ecm.lang (100%)
 rename {htdocs => public}/langs/fr_CA/errors.lang (100%)
 rename {htdocs => public}/langs/fr_CA/exports.lang (100%)
 rename {htdocs => public}/langs/fr_CA/externalsite.lang (100%)
 rename {htdocs => public}/langs/fr_CA/ftp.lang (100%)
 rename {htdocs => public}/langs/fr_CA/help.lang (100%)
 rename {htdocs => public}/langs/fr_CA/holiday.lang (100%)
 rename {htdocs => public}/langs/fr_CA/hrm.lang (100%)
 rename {htdocs => public}/langs/fr_CA/incoterm.lang (100%)
 rename {htdocs => public}/langs/fr_CA/install.lang (100%)
 rename {htdocs => public}/langs/fr_CA/interventions.lang (100%)
 rename {htdocs => public}/langs/fr_CA/languages.lang (100%)
 rename {htdocs => public}/langs/fr_CA/ldap.lang (100%)
 rename {htdocs => public}/langs/fr_CA/link.lang (100%)
 rename {htdocs => public}/langs/fr_CA/loan.lang (100%)
 rename {htdocs => public}/langs/fr_CA/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/fr_CA/mails.lang (100%)
 rename {htdocs => public}/langs/fr_CA/main.lang (100%)
 rename {htdocs => public}/langs/fr_CA/margins.lang (100%)
 rename {htdocs => public}/langs/fr_CA/members.lang (100%)
 rename {htdocs => public}/langs/fr_CA/oauth.lang (100%)
 rename {htdocs => public}/langs/fr_CA/opensurvey.lang (100%)
 rename {htdocs => public}/langs/fr_CA/orders.lang (100%)
 rename {htdocs => public}/langs/fr_CA/other.lang (100%)
 rename {htdocs => public}/langs/fr_CA/paybox.lang (100%)
 rename {htdocs => public}/langs/fr_CA/paypal.lang (100%)
 rename {htdocs => public}/langs/fr_CA/printing.lang (100%)
 rename {htdocs => public}/langs/fr_CA/productbatch.lang (100%)
 rename {htdocs => public}/langs/fr_CA/products.lang (100%)
 rename {htdocs => public}/langs/fr_CA/projects.lang (100%)
 rename {htdocs => public}/langs/fr_CA/propal.lang (100%)
 rename {htdocs => public}/langs/fr_CA/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/fr_CA/resource.lang (100%)
 rename {htdocs => public}/langs/fr_CA/salaries.lang (100%)
 rename {htdocs => public}/langs/fr_CA/sendings.lang (100%)
 rename {htdocs => public}/langs/fr_CA/sms.lang (100%)
 rename {htdocs => public}/langs/fr_CA/stocks.lang (100%)
 rename {htdocs => public}/langs/fr_CA/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/fr_CA/suppliers.lang (100%)
 rename {htdocs => public}/langs/fr_CA/trips.lang (100%)
 rename {htdocs => public}/langs/fr_CA/users.lang (100%)
 rename {htdocs => public}/langs/fr_CA/website.lang (100%)
 rename {htdocs => public}/langs/fr_CA/withdrawals.lang (100%)
 rename {htdocs => public}/langs/fr_CA/workflow.lang (100%)
 rename {htdocs => public}/langs/fr_CH/accountancy.lang (100%)
 rename {htdocs => public}/langs/fr_CH/admin.lang (100%)
 rename {htdocs => public}/langs/fr_CH/agenda.lang (100%)
 rename {htdocs => public}/langs/fr_CH/banks.lang (100%)
 rename {htdocs => public}/langs/fr_CH/bills.lang (100%)
 rename {htdocs => public}/langs/fr_CH/bookmarks.lang (100%)
 rename {htdocs => public}/langs/fr_CH/boxes.lang (100%)
 rename {htdocs => public}/langs/fr_CH/cashdesk.lang (100%)
 rename {htdocs => public}/langs/fr_CH/categories.lang (100%)
 rename {htdocs => public}/langs/fr_CH/commercial.lang (100%)
 rename {htdocs => public}/langs/fr_CH/companies.lang (100%)
 rename {htdocs => public}/langs/fr_CH/compta.lang (100%)
 rename {htdocs => public}/langs/fr_CH/contracts.lang (100%)
 rename {htdocs => public}/langs/fr_CH/cron.lang (100%)
 rename {htdocs => public}/langs/fr_CH/deliveries.lang (100%)
 rename {htdocs => public}/langs/fr_CH/dict.lang (100%)
 rename {htdocs => public}/langs/fr_CH/donations.lang (100%)
 rename {htdocs => public}/langs/fr_CH/ecm.lang (100%)
 rename {htdocs => public}/langs/fr_CH/errors.lang (100%)
 rename {htdocs => public}/langs/fr_CH/exports.lang (100%)
 rename {htdocs => public}/langs/fr_CH/externalsite.lang (100%)
 rename {htdocs => public}/langs/fr_CH/ftp.lang (100%)
 rename {htdocs => public}/langs/fr_CH/help.lang (100%)
 rename {htdocs => public}/langs/fr_CH/holiday.lang (100%)
 rename {htdocs => public}/langs/fr_CH/hrm.lang (100%)
 rename {htdocs => public}/langs/fr_CH/incoterm.lang (100%)
 rename {htdocs => public}/langs/fr_CH/install.lang (100%)
 rename {htdocs => public}/langs/fr_CH/interventions.lang (100%)
 rename {htdocs => public}/langs/fr_CH/languages.lang (100%)
 rename {htdocs => public}/langs/fr_CH/ldap.lang (100%)
 rename {htdocs => public}/langs/fr_CH/link.lang (100%)
 rename {htdocs => public}/langs/fr_CH/loan.lang (100%)
 rename {htdocs => public}/langs/fr_CH/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/fr_CH/mails.lang (100%)
 rename {htdocs => public}/langs/fr_CH/main.lang (100%)
 rename {htdocs => public}/langs/fr_CH/margins.lang (100%)
 rename {htdocs => public}/langs/fr_CH/members.lang (100%)
 rename {htdocs => public}/langs/fr_CH/oauth.lang (100%)
 rename {htdocs => public}/langs/fr_CH/opensurvey.lang (100%)
 rename {htdocs => public}/langs/fr_CH/orders.lang (100%)
 rename {htdocs => public}/langs/fr_CH/other.lang (100%)
 rename {htdocs => public}/langs/fr_CH/paybox.lang (100%)
 rename {htdocs => public}/langs/fr_CH/paypal.lang (100%)
 rename {htdocs => public}/langs/fr_CH/printing.lang (100%)
 rename {htdocs => public}/langs/fr_CH/productbatch.lang (100%)
 rename {htdocs => public}/langs/fr_CH/products.lang (100%)
 rename {htdocs => public}/langs/fr_CH/projects.lang (100%)
 rename {htdocs => public}/langs/fr_CH/propal.lang (100%)
 rename {htdocs => public}/langs/fr_CH/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/fr_CH/resource.lang (100%)
 rename {htdocs => public}/langs/fr_CH/salaries.lang (100%)
 rename {htdocs => public}/langs/fr_CH/sendings.lang (100%)
 rename {htdocs => public}/langs/fr_CH/sms.lang (100%)
 rename {htdocs => public}/langs/fr_CH/stocks.lang (100%)
 rename {htdocs => public}/langs/fr_CH/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/fr_CH/suppliers.lang (100%)
 rename {htdocs => public}/langs/fr_CH/trips.lang (100%)
 rename {htdocs => public}/langs/fr_CH/users.lang (100%)
 rename {htdocs => public}/langs/fr_CH/website.lang (100%)
 rename {htdocs => public}/langs/fr_CH/withdrawals.lang (100%)
 rename {htdocs => public}/langs/fr_CH/workflow.lang (100%)
 rename {htdocs => public}/langs/fr_FR/accountancy.lang (100%)
 rename {htdocs => public}/langs/fr_FR/admin.lang (100%)
 rename {htdocs => public}/langs/fr_FR/agenda.lang (100%)
 rename {htdocs => public}/langs/fr_FR/banks.lang (100%)
 rename {htdocs => public}/langs/fr_FR/bills.lang (100%)
 rename {htdocs => public}/langs/fr_FR/bookmarks.lang (100%)
 rename {htdocs => public}/langs/fr_FR/boxes.lang (100%)
 rename {htdocs => public}/langs/fr_FR/cashdesk.lang (100%)
 rename {htdocs => public}/langs/fr_FR/categories.lang (100%)
 rename {htdocs => public}/langs/fr_FR/commercial.lang (100%)
 rename {htdocs => public}/langs/fr_FR/companies.lang (100%)
 rename {htdocs => public}/langs/fr_FR/compta.lang (100%)
 rename {htdocs => public}/langs/fr_FR/contracts.lang (100%)
 rename {htdocs => public}/langs/fr_FR/cron.lang (100%)
 rename {htdocs => public}/langs/fr_FR/deliveries.lang (100%)
 rename {htdocs => public}/langs/fr_FR/dict.lang (100%)
 rename {htdocs => public}/langs/fr_FR/donations.lang (100%)
 rename {htdocs => public}/langs/fr_FR/ecm.lang (100%)
 rename {htdocs => public}/langs/fr_FR/errors.lang (100%)
 rename {htdocs => public}/langs/fr_FR/expensereports.lang (100%)
 rename {htdocs => public}/langs/fr_FR/exports.lang (100%)
 rename {htdocs => public}/langs/fr_FR/externalsite.lang (100%)
 rename {htdocs => public}/langs/fr_FR/ftp.lang (100%)
 rename {htdocs => public}/langs/fr_FR/help.lang (100%)
 rename {htdocs => public}/langs/fr_FR/holiday.lang (100%)
 rename {htdocs => public}/langs/fr_FR/hrm.lang (100%)
 rename {htdocs => public}/langs/fr_FR/incoterm.lang (100%)
 rename {htdocs => public}/langs/fr_FR/install.lang (100%)
 rename {htdocs => public}/langs/fr_FR/interventions.lang (100%)
 rename {htdocs => public}/langs/fr_FR/languages.lang (100%)
 rename {htdocs => public}/langs/fr_FR/ldap.lang (100%)
 rename {htdocs => public}/langs/fr_FR/link.lang (100%)
 rename {htdocs => public}/langs/fr_FR/loan.lang (100%)
 rename {htdocs => public}/langs/fr_FR/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/fr_FR/mails.lang (100%)
 rename {htdocs => public}/langs/fr_FR/main.lang (100%)
 rename {htdocs => public}/langs/fr_FR/margins.lang (100%)
 rename {htdocs => public}/langs/fr_FR/members.lang (100%)
 rename {htdocs => public}/langs/fr_FR/oauth.lang (100%)
 rename {htdocs => public}/langs/fr_FR/opensurvey.lang (100%)
 rename {htdocs => public}/langs/fr_FR/orders.lang (100%)
 rename {htdocs => public}/langs/fr_FR/other.lang (100%)
 rename {htdocs => public}/langs/fr_FR/paybox.lang (100%)
 rename {htdocs => public}/langs/fr_FR/paypal.lang (100%)
 rename {htdocs => public}/langs/fr_FR/printing.lang (100%)
 rename {htdocs => public}/langs/fr_FR/productbatch.lang (100%)
 rename {htdocs => public}/langs/fr_FR/products.lang (100%)
 rename {htdocs => public}/langs/fr_FR/projects.lang (100%)
 rename {htdocs => public}/langs/fr_FR/propal.lang (100%)
 rename {htdocs => public}/langs/fr_FR/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/fr_FR/resource.lang (100%)
 rename {htdocs => public}/langs/fr_FR/salaries.lang (100%)
 rename {htdocs => public}/langs/fr_FR/sendings.lang (100%)
 rename {htdocs => public}/langs/fr_FR/sms.lang (100%)
 rename {htdocs => public}/langs/fr_FR/stocks.lang (100%)
 rename {htdocs => public}/langs/fr_FR/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/fr_FR/suppliers.lang (100%)
 rename {htdocs => public}/langs/fr_FR/trips.lang (100%)
 rename {htdocs => public}/langs/fr_FR/users.lang (100%)
 rename {htdocs => public}/langs/fr_FR/website.lang (100%)
 rename {htdocs => public}/langs/fr_FR/withdrawals.lang (100%)
 rename {htdocs => public}/langs/fr_FR/workflow.lang (100%)
 rename {htdocs => public}/langs/fr_NC/admin.lang (100%)
 rename {htdocs => public}/langs/fr_NC/companies.lang (100%)
 rename {htdocs => public}/langs/fr_NC/compta.lang (100%)
 rename {htdocs => public}/langs/fr_NC/main.lang (100%)
 rename {htdocs => public}/langs/he_IL/accountancy.lang (100%)
 rename {htdocs => public}/langs/he_IL/admin.lang (100%)
 rename {htdocs => public}/langs/he_IL/agenda.lang (100%)
 rename {htdocs => public}/langs/he_IL/banks.lang (100%)
 rename {htdocs => public}/langs/he_IL/bills.lang (100%)
 rename {htdocs => public}/langs/he_IL/bookmarks.lang (100%)
 rename {htdocs => public}/langs/he_IL/boxes.lang (100%)
 rename {htdocs => public}/langs/he_IL/cashdesk.lang (100%)
 rename {htdocs => public}/langs/he_IL/categories.lang (100%)
 rename {htdocs => public}/langs/he_IL/commercial.lang (100%)
 rename {htdocs => public}/langs/he_IL/companies.lang (100%)
 rename {htdocs => public}/langs/he_IL/compta.lang (100%)
 rename {htdocs => public}/langs/he_IL/contracts.lang (100%)
 rename {htdocs => public}/langs/he_IL/cron.lang (100%)
 rename {htdocs => public}/langs/he_IL/deliveries.lang (100%)
 rename {htdocs => public}/langs/he_IL/dict.lang (100%)
 rename {htdocs => public}/langs/he_IL/donations.lang (100%)
 rename {htdocs => public}/langs/he_IL/ecm.lang (100%)
 rename {htdocs => public}/langs/he_IL/errors.lang (100%)
 rename {htdocs => public}/langs/he_IL/exports.lang (100%)
 rename {htdocs => public}/langs/he_IL/externalsite.lang (100%)
 rename {htdocs => public}/langs/he_IL/ftp.lang (100%)
 rename {htdocs => public}/langs/he_IL/help.lang (100%)
 rename {htdocs => public}/langs/he_IL/holiday.lang (100%)
 rename {htdocs => public}/langs/he_IL/hrm.lang (100%)
 rename {htdocs => public}/langs/he_IL/incoterm.lang (100%)
 rename {htdocs => public}/langs/he_IL/install.lang (100%)
 rename {htdocs => public}/langs/he_IL/interventions.lang (100%)
 rename {htdocs => public}/langs/he_IL/languages.lang (100%)
 rename {htdocs => public}/langs/he_IL/ldap.lang (100%)
 rename {htdocs => public}/langs/he_IL/link.lang (100%)
 rename {htdocs => public}/langs/he_IL/loan.lang (100%)
 rename {htdocs => public}/langs/he_IL/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/he_IL/mails.lang (100%)
 rename {htdocs => public}/langs/he_IL/main.lang (100%)
 rename {htdocs => public}/langs/he_IL/margins.lang (100%)
 rename {htdocs => public}/langs/he_IL/members.lang (100%)
 rename {htdocs => public}/langs/he_IL/oauth.lang (100%)
 rename {htdocs => public}/langs/he_IL/opensurvey.lang (100%)
 rename {htdocs => public}/langs/he_IL/orders.lang (100%)
 rename {htdocs => public}/langs/he_IL/other.lang (100%)
 rename {htdocs => public}/langs/he_IL/paybox.lang (100%)
 rename {htdocs => public}/langs/he_IL/paypal.lang (100%)
 rename {htdocs => public}/langs/he_IL/printing.lang (100%)
 rename {htdocs => public}/langs/he_IL/productbatch.lang (100%)
 rename {htdocs => public}/langs/he_IL/products.lang (100%)
 rename {htdocs => public}/langs/he_IL/projects.lang (100%)
 rename {htdocs => public}/langs/he_IL/propal.lang (100%)
 rename {htdocs => public}/langs/he_IL/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/he_IL/resource.lang (100%)
 rename {htdocs => public}/langs/he_IL/salaries.lang (100%)
 rename {htdocs => public}/langs/he_IL/sendings.lang (100%)
 rename {htdocs => public}/langs/he_IL/sms.lang (100%)
 rename {htdocs => public}/langs/he_IL/stocks.lang (100%)
 rename {htdocs => public}/langs/he_IL/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/he_IL/suppliers.lang (100%)
 rename {htdocs => public}/langs/he_IL/trips.lang (100%)
 rename {htdocs => public}/langs/he_IL/users.lang (100%)
 rename {htdocs => public}/langs/he_IL/website.lang (100%)
 rename {htdocs => public}/langs/he_IL/withdrawals.lang (100%)
 rename {htdocs => public}/langs/he_IL/workflow.lang (100%)
 rename {htdocs => public}/langs/hr_HR/accountancy.lang (100%)
 rename {htdocs => public}/langs/hr_HR/admin.lang (100%)
 rename {htdocs => public}/langs/hr_HR/agenda.lang (100%)
 rename {htdocs => public}/langs/hr_HR/banks.lang (100%)
 rename {htdocs => public}/langs/hr_HR/bills.lang (100%)
 rename {htdocs => public}/langs/hr_HR/bookmarks.lang (100%)
 rename {htdocs => public}/langs/hr_HR/boxes.lang (100%)
 rename {htdocs => public}/langs/hr_HR/cashdesk.lang (100%)
 rename {htdocs => public}/langs/hr_HR/categories.lang (100%)
 rename {htdocs => public}/langs/hr_HR/commercial.lang (100%)
 rename {htdocs => public}/langs/hr_HR/companies.lang (100%)
 rename {htdocs => public}/langs/hr_HR/compta.lang (100%)
 rename {htdocs => public}/langs/hr_HR/contracts.lang (100%)
 rename {htdocs => public}/langs/hr_HR/cron.lang (100%)
 rename {htdocs => public}/langs/hr_HR/deliveries.lang (100%)
 rename {htdocs => public}/langs/hr_HR/dict.lang (100%)
 rename {htdocs => public}/langs/hr_HR/donations.lang (100%)
 rename {htdocs => public}/langs/hr_HR/ecm.lang (100%)
 rename {htdocs => public}/langs/hr_HR/errors.lang (100%)
 rename {htdocs => public}/langs/hr_HR/exports.lang (100%)
 rename {htdocs => public}/langs/hr_HR/externalsite.lang (100%)
 rename {htdocs => public}/langs/hr_HR/ftp.lang (100%)
 rename {htdocs => public}/langs/hr_HR/help.lang (100%)
 rename {htdocs => public}/langs/hr_HR/holiday.lang (100%)
 rename {htdocs => public}/langs/hr_HR/hrm.lang (100%)
 rename {htdocs => public}/langs/hr_HR/incoterm.lang (100%)
 rename {htdocs => public}/langs/hr_HR/install.lang (100%)
 rename {htdocs => public}/langs/hr_HR/interventions.lang (100%)
 rename {htdocs => public}/langs/hr_HR/languages.lang (100%)
 rename {htdocs => public}/langs/hr_HR/ldap.lang (100%)
 rename {htdocs => public}/langs/hr_HR/link.lang (100%)
 rename {htdocs => public}/langs/hr_HR/loan.lang (100%)
 rename {htdocs => public}/langs/hr_HR/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/hr_HR/mails.lang (100%)
 rename {htdocs => public}/langs/hr_HR/main.lang (100%)
 rename {htdocs => public}/langs/hr_HR/margins.lang (100%)
 rename {htdocs => public}/langs/hr_HR/members.lang (100%)
 rename {htdocs => public}/langs/hr_HR/oauth.lang (100%)
 rename {htdocs => public}/langs/hr_HR/opensurvey.lang (100%)
 rename {htdocs => public}/langs/hr_HR/orders.lang (100%)
 rename {htdocs => public}/langs/hr_HR/other.lang (100%)
 rename {htdocs => public}/langs/hr_HR/paybox.lang (100%)
 rename {htdocs => public}/langs/hr_HR/paypal.lang (100%)
 rename {htdocs => public}/langs/hr_HR/printing.lang (100%)
 rename {htdocs => public}/langs/hr_HR/productbatch.lang (100%)
 rename {htdocs => public}/langs/hr_HR/products.lang (100%)
 rename {htdocs => public}/langs/hr_HR/projects.lang (100%)
 rename {htdocs => public}/langs/hr_HR/propal.lang (100%)
 rename {htdocs => public}/langs/hr_HR/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/hr_HR/resource.lang (100%)
 rename {htdocs => public}/langs/hr_HR/salaries.lang (100%)
 rename {htdocs => public}/langs/hr_HR/sendings.lang (100%)
 rename {htdocs => public}/langs/hr_HR/sms.lang (100%)
 rename {htdocs => public}/langs/hr_HR/stocks.lang (100%)
 rename {htdocs => public}/langs/hr_HR/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/hr_HR/suppliers.lang (100%)
 rename {htdocs => public}/langs/hr_HR/trips.lang (100%)
 rename {htdocs => public}/langs/hr_HR/users.lang (100%)
 rename {htdocs => public}/langs/hr_HR/website.lang (100%)
 rename {htdocs => public}/langs/hr_HR/withdrawals.lang (100%)
 rename {htdocs => public}/langs/hr_HR/workflow.lang (100%)
 rename {htdocs => public}/langs/hu_HU/accountancy.lang (100%)
 rename {htdocs => public}/langs/hu_HU/admin.lang (100%)
 rename {htdocs => public}/langs/hu_HU/agenda.lang (100%)
 rename {htdocs => public}/langs/hu_HU/banks.lang (100%)
 rename {htdocs => public}/langs/hu_HU/bills.lang (100%)
 rename {htdocs => public}/langs/hu_HU/bookmarks.lang (100%)
 rename {htdocs => public}/langs/hu_HU/boxes.lang (100%)
 rename {htdocs => public}/langs/hu_HU/cashdesk.lang (100%)
 rename {htdocs => public}/langs/hu_HU/categories.lang (100%)
 rename {htdocs => public}/langs/hu_HU/commercial.lang (100%)
 rename {htdocs => public}/langs/hu_HU/companies.lang (100%)
 rename {htdocs => public}/langs/hu_HU/compta.lang (100%)
 rename {htdocs => public}/langs/hu_HU/contracts.lang (100%)
 rename {htdocs => public}/langs/hu_HU/cron.lang (100%)
 rename {htdocs => public}/langs/hu_HU/deliveries.lang (100%)
 rename {htdocs => public}/langs/hu_HU/dict.lang (100%)
 rename {htdocs => public}/langs/hu_HU/donations.lang (100%)
 rename {htdocs => public}/langs/hu_HU/ecm.lang (100%)
 rename {htdocs => public}/langs/hu_HU/errors.lang (100%)
 rename {htdocs => public}/langs/hu_HU/exports.lang (100%)
 rename {htdocs => public}/langs/hu_HU/externalsite.lang (100%)
 rename {htdocs => public}/langs/hu_HU/ftp.lang (100%)
 rename {htdocs => public}/langs/hu_HU/help.lang (100%)
 rename {htdocs => public}/langs/hu_HU/holiday.lang (100%)
 rename {htdocs => public}/langs/hu_HU/hrm.lang (100%)
 rename {htdocs => public}/langs/hu_HU/incoterm.lang (100%)
 rename {htdocs => public}/langs/hu_HU/install.lang (100%)
 rename {htdocs => public}/langs/hu_HU/interventions.lang (100%)
 rename {htdocs => public}/langs/hu_HU/languages.lang (100%)
 rename {htdocs => public}/langs/hu_HU/ldap.lang (100%)
 rename {htdocs => public}/langs/hu_HU/link.lang (100%)
 rename {htdocs => public}/langs/hu_HU/loan.lang (100%)
 rename {htdocs => public}/langs/hu_HU/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/hu_HU/mails.lang (100%)
 rename {htdocs => public}/langs/hu_HU/main.lang (100%)
 rename {htdocs => public}/langs/hu_HU/margins.lang (100%)
 rename {htdocs => public}/langs/hu_HU/members.lang (100%)
 rename {htdocs => public}/langs/hu_HU/oauth.lang (100%)
 rename {htdocs => public}/langs/hu_HU/opensurvey.lang (100%)
 rename {htdocs => public}/langs/hu_HU/orders.lang (100%)
 rename {htdocs => public}/langs/hu_HU/other.lang (100%)
 rename {htdocs => public}/langs/hu_HU/paybox.lang (100%)
 rename {htdocs => public}/langs/hu_HU/paypal.lang (100%)
 rename {htdocs => public}/langs/hu_HU/printing.lang (100%)
 rename {htdocs => public}/langs/hu_HU/productbatch.lang (100%)
 rename {htdocs => public}/langs/hu_HU/products.lang (100%)
 rename {htdocs => public}/langs/hu_HU/projects.lang (100%)
 rename {htdocs => public}/langs/hu_HU/propal.lang (100%)
 rename {htdocs => public}/langs/hu_HU/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/hu_HU/resource.lang (100%)
 rename {htdocs => public}/langs/hu_HU/salaries.lang (100%)
 rename {htdocs => public}/langs/hu_HU/sendings.lang (100%)
 rename {htdocs => public}/langs/hu_HU/sms.lang (100%)
 rename {htdocs => public}/langs/hu_HU/stocks.lang (100%)
 rename {htdocs => public}/langs/hu_HU/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/hu_HU/suppliers.lang (100%)
 rename {htdocs => public}/langs/hu_HU/trips.lang (100%)
 rename {htdocs => public}/langs/hu_HU/users.lang (100%)
 rename {htdocs => public}/langs/hu_HU/website.lang (100%)
 rename {htdocs => public}/langs/hu_HU/withdrawals.lang (100%)
 rename {htdocs => public}/langs/hu_HU/workflow.lang (100%)
 rename {htdocs => public}/langs/id_ID/accountancy.lang (100%)
 rename {htdocs => public}/langs/id_ID/admin.lang (100%)
 rename {htdocs => public}/langs/id_ID/agenda.lang (100%)
 rename {htdocs => public}/langs/id_ID/banks.lang (100%)
 rename {htdocs => public}/langs/id_ID/bills.lang (100%)
 rename {htdocs => public}/langs/id_ID/bookmarks.lang (100%)
 rename {htdocs => public}/langs/id_ID/boxes.lang (100%)
 rename {htdocs => public}/langs/id_ID/cashdesk.lang (100%)
 rename {htdocs => public}/langs/id_ID/categories.lang (100%)
 rename {htdocs => public}/langs/id_ID/commercial.lang (100%)
 rename {htdocs => public}/langs/id_ID/companies.lang (100%)
 rename {htdocs => public}/langs/id_ID/compta.lang (100%)
 rename {htdocs => public}/langs/id_ID/contracts.lang (100%)
 rename {htdocs => public}/langs/id_ID/cron.lang (100%)
 rename {htdocs => public}/langs/id_ID/deliveries.lang (100%)
 rename {htdocs => public}/langs/id_ID/dict.lang (100%)
 rename {htdocs => public}/langs/id_ID/donations.lang (100%)
 rename {htdocs => public}/langs/id_ID/ecm.lang (100%)
 rename {htdocs => public}/langs/id_ID/errors.lang (100%)
 rename {htdocs => public}/langs/id_ID/exports.lang (100%)
 rename {htdocs => public}/langs/id_ID/externalsite.lang (100%)
 rename {htdocs => public}/langs/id_ID/ftp.lang (100%)
 rename {htdocs => public}/langs/id_ID/help.lang (100%)
 rename {htdocs => public}/langs/id_ID/holiday.lang (100%)
 rename {htdocs => public}/langs/id_ID/hrm.lang (100%)
 rename {htdocs => public}/langs/id_ID/incoterm.lang (100%)
 rename {htdocs => public}/langs/id_ID/install.lang (100%)
 rename {htdocs => public}/langs/id_ID/interventions.lang (100%)
 rename {htdocs => public}/langs/id_ID/languages.lang (100%)
 rename {htdocs => public}/langs/id_ID/ldap.lang (100%)
 rename {htdocs => public}/langs/id_ID/link.lang (100%)
 rename {htdocs => public}/langs/id_ID/loan.lang (100%)
 rename {htdocs => public}/langs/id_ID/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/id_ID/mails.lang (100%)
 rename {htdocs => public}/langs/id_ID/main.lang (100%)
 rename {htdocs => public}/langs/id_ID/margins.lang (100%)
 rename {htdocs => public}/langs/id_ID/members.lang (100%)
 rename {htdocs => public}/langs/id_ID/oauth.lang (100%)
 rename {htdocs => public}/langs/id_ID/opensurvey.lang (100%)
 rename {htdocs => public}/langs/id_ID/orders.lang (100%)
 rename {htdocs => public}/langs/id_ID/other.lang (100%)
 rename {htdocs => public}/langs/id_ID/paybox.lang (100%)
 rename {htdocs => public}/langs/id_ID/paypal.lang (100%)
 rename {htdocs => public}/langs/id_ID/printing.lang (100%)
 rename {htdocs => public}/langs/id_ID/productbatch.lang (100%)
 rename {htdocs => public}/langs/id_ID/products.lang (100%)
 rename {htdocs => public}/langs/id_ID/projects.lang (100%)
 rename {htdocs => public}/langs/id_ID/propal.lang (100%)
 rename {htdocs => public}/langs/id_ID/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/id_ID/resource.lang (100%)
 rename {htdocs => public}/langs/id_ID/salaries.lang (100%)
 rename {htdocs => public}/langs/id_ID/sendings.lang (100%)
 rename {htdocs => public}/langs/id_ID/sms.lang (100%)
 rename {htdocs => public}/langs/id_ID/stocks.lang (100%)
 rename {htdocs => public}/langs/id_ID/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/id_ID/suppliers.lang (100%)
 rename {htdocs => public}/langs/id_ID/trips.lang (100%)
 rename {htdocs => public}/langs/id_ID/users.lang (100%)
 rename {htdocs => public}/langs/id_ID/website.lang (100%)
 rename {htdocs => public}/langs/id_ID/withdrawals.lang (100%)
 rename {htdocs => public}/langs/id_ID/workflow.lang (100%)
 rename {htdocs => public}/langs/is_IS/accountancy.lang (100%)
 rename {htdocs => public}/langs/is_IS/admin.lang (100%)
 rename {htdocs => public}/langs/is_IS/agenda.lang (100%)
 rename {htdocs => public}/langs/is_IS/banks.lang (100%)
 rename {htdocs => public}/langs/is_IS/bills.lang (100%)
 rename {htdocs => public}/langs/is_IS/bookmarks.lang (100%)
 rename {htdocs => public}/langs/is_IS/boxes.lang (100%)
 rename {htdocs => public}/langs/is_IS/cashdesk.lang (100%)
 rename {htdocs => public}/langs/is_IS/categories.lang (100%)
 rename {htdocs => public}/langs/is_IS/commercial.lang (100%)
 rename {htdocs => public}/langs/is_IS/companies.lang (100%)
 rename {htdocs => public}/langs/is_IS/compta.lang (100%)
 rename {htdocs => public}/langs/is_IS/contracts.lang (100%)
 rename {htdocs => public}/langs/is_IS/cron.lang (100%)
 rename {htdocs => public}/langs/is_IS/deliveries.lang (100%)
 rename {htdocs => public}/langs/is_IS/dict.lang (100%)
 rename {htdocs => public}/langs/is_IS/donations.lang (100%)
 rename {htdocs => public}/langs/is_IS/ecm.lang (100%)
 rename {htdocs => public}/langs/is_IS/errors.lang (100%)
 rename {htdocs => public}/langs/is_IS/exports.lang (100%)
 rename {htdocs => public}/langs/is_IS/externalsite.lang (100%)
 rename {htdocs => public}/langs/is_IS/ftp.lang (100%)
 rename {htdocs => public}/langs/is_IS/help.lang (100%)
 rename {htdocs => public}/langs/is_IS/holiday.lang (100%)
 rename {htdocs => public}/langs/is_IS/hrm.lang (100%)
 rename {htdocs => public}/langs/is_IS/incoterm.lang (100%)
 rename {htdocs => public}/langs/is_IS/install.lang (100%)
 rename {htdocs => public}/langs/is_IS/interventions.lang (100%)
 rename {htdocs => public}/langs/is_IS/languages.lang (100%)
 rename {htdocs => public}/langs/is_IS/ldap.lang (100%)
 rename {htdocs => public}/langs/is_IS/link.lang (100%)
 rename {htdocs => public}/langs/is_IS/loan.lang (100%)
 rename {htdocs => public}/langs/is_IS/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/is_IS/mails.lang (100%)
 rename {htdocs => public}/langs/is_IS/main.lang (100%)
 rename {htdocs => public}/langs/is_IS/margins.lang (100%)
 rename {htdocs => public}/langs/is_IS/members.lang (100%)
 rename {htdocs => public}/langs/is_IS/oauth.lang (100%)
 rename {htdocs => public}/langs/is_IS/opensurvey.lang (100%)
 rename {htdocs => public}/langs/is_IS/orders.lang (100%)
 rename {htdocs => public}/langs/is_IS/other.lang (100%)
 rename {htdocs => public}/langs/is_IS/paybox.lang (100%)
 rename {htdocs => public}/langs/is_IS/paypal.lang (100%)
 rename {htdocs => public}/langs/is_IS/printing.lang (100%)
 rename {htdocs => public}/langs/is_IS/productbatch.lang (100%)
 rename {htdocs => public}/langs/is_IS/products.lang (100%)
 rename {htdocs => public}/langs/is_IS/projects.lang (100%)
 rename {htdocs => public}/langs/is_IS/propal.lang (100%)
 rename {htdocs => public}/langs/is_IS/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/is_IS/resource.lang (100%)
 rename {htdocs => public}/langs/is_IS/salaries.lang (100%)
 rename {htdocs => public}/langs/is_IS/sendings.lang (100%)
 rename {htdocs => public}/langs/is_IS/sms.lang (100%)
 rename {htdocs => public}/langs/is_IS/stocks.lang (100%)
 rename {htdocs => public}/langs/is_IS/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/is_IS/suppliers.lang (100%)
 rename {htdocs => public}/langs/is_IS/trips.lang (100%)
 rename {htdocs => public}/langs/is_IS/users.lang (100%)
 rename {htdocs => public}/langs/is_IS/website.lang (100%)
 rename {htdocs => public}/langs/is_IS/withdrawals.lang (100%)
 rename {htdocs => public}/langs/is_IS/workflow.lang (100%)
 rename {htdocs => public}/langs/it_IT/accountancy.lang (100%)
 rename {htdocs => public}/langs/it_IT/admin.lang (100%)
 rename {htdocs => public}/langs/it_IT/agenda.lang (100%)
 rename {htdocs => public}/langs/it_IT/banks.lang (100%)
 rename {htdocs => public}/langs/it_IT/bills.lang (100%)
 rename {htdocs => public}/langs/it_IT/bookmarks.lang (100%)
 rename {htdocs => public}/langs/it_IT/boxes.lang (100%)
 rename {htdocs => public}/langs/it_IT/cashdesk.lang (100%)
 rename {htdocs => public}/langs/it_IT/categories.lang (100%)
 rename {htdocs => public}/langs/it_IT/commercial.lang (100%)
 rename {htdocs => public}/langs/it_IT/companies.lang (100%)
 rename {htdocs => public}/langs/it_IT/compta.lang (100%)
 rename {htdocs => public}/langs/it_IT/contracts.lang (100%)
 rename {htdocs => public}/langs/it_IT/cron.lang (100%)
 rename {htdocs => public}/langs/it_IT/deliveries.lang (100%)
 rename {htdocs => public}/langs/it_IT/dict.lang (100%)
 rename {htdocs => public}/langs/it_IT/donations.lang (100%)
 rename {htdocs => public}/langs/it_IT/ecm.lang (100%)
 rename {htdocs => public}/langs/it_IT/errors.lang (100%)
 rename {htdocs => public}/langs/it_IT/exports.lang (100%)
 rename {htdocs => public}/langs/it_IT/externalsite.lang (100%)
 rename {htdocs => public}/langs/it_IT/ftp.lang (100%)
 rename {htdocs => public}/langs/it_IT/google.lang (100%)
 rename {htdocs => public}/langs/it_IT/help.lang (100%)
 rename {htdocs => public}/langs/it_IT/holiday.lang (100%)
 rename {htdocs => public}/langs/it_IT/hrm.lang (100%)
 rename {htdocs => public}/langs/it_IT/incoterm.lang (100%)
 rename {htdocs => public}/langs/it_IT/install.lang (100%)
 rename {htdocs => public}/langs/it_IT/interventions.lang (100%)
 rename {htdocs => public}/langs/it_IT/languages.lang (100%)
 rename {htdocs => public}/langs/it_IT/ldap.lang (100%)
 rename {htdocs => public}/langs/it_IT/link.lang (100%)
 rename {htdocs => public}/langs/it_IT/loan.lang (100%)
 rename {htdocs => public}/langs/it_IT/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/it_IT/mails.lang (100%)
 rename {htdocs => public}/langs/it_IT/main.lang (100%)
 rename {htdocs => public}/langs/it_IT/margins.lang (100%)
 rename {htdocs => public}/langs/it_IT/members.lang (100%)
 rename {htdocs => public}/langs/it_IT/oauth.lang (100%)
 rename {htdocs => public}/langs/it_IT/opensurvey.lang (100%)
 rename {htdocs => public}/langs/it_IT/orders.lang (100%)
 rename {htdocs => public}/langs/it_IT/other.lang (100%)
 rename {htdocs => public}/langs/it_IT/paybox.lang (100%)
 rename {htdocs => public}/langs/it_IT/paypal.lang (100%)
 rename {htdocs => public}/langs/it_IT/printing.lang (100%)
 rename {htdocs => public}/langs/it_IT/productbatch.lang (100%)
 rename {htdocs => public}/langs/it_IT/products.lang (100%)
 rename {htdocs => public}/langs/it_IT/projects.lang (100%)
 rename {htdocs => public}/langs/it_IT/propal.lang (100%)
 rename {htdocs => public}/langs/it_IT/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/it_IT/resource.lang (100%)
 rename {htdocs => public}/langs/it_IT/salaries.lang (100%)
 rename {htdocs => public}/langs/it_IT/sendings.lang (100%)
 rename {htdocs => public}/langs/it_IT/sms.lang (100%)
 rename {htdocs => public}/langs/it_IT/stocks.lang (100%)
 rename {htdocs => public}/langs/it_IT/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/it_IT/suppliers.lang (100%)
 rename {htdocs => public}/langs/it_IT/trips.lang (100%)
 rename {htdocs => public}/langs/it_IT/users.lang (100%)
 rename {htdocs => public}/langs/it_IT/website.lang (100%)
 rename {htdocs => public}/langs/it_IT/withdrawals.lang (100%)
 rename {htdocs => public}/langs/it_IT/workflow.lang (100%)
 rename {htdocs => public}/langs/ja_JP/accountancy.lang (100%)
 rename {htdocs => public}/langs/ja_JP/admin.lang (100%)
 rename {htdocs => public}/langs/ja_JP/agenda.lang (100%)
 rename {htdocs => public}/langs/ja_JP/banks.lang (100%)
 rename {htdocs => public}/langs/ja_JP/bills.lang (100%)
 rename {htdocs => public}/langs/ja_JP/bookmarks.lang (100%)
 rename {htdocs => public}/langs/ja_JP/boxes.lang (100%)
 rename {htdocs => public}/langs/ja_JP/cashdesk.lang (100%)
 rename {htdocs => public}/langs/ja_JP/categories.lang (100%)
 rename {htdocs => public}/langs/ja_JP/commercial.lang (100%)
 rename {htdocs => public}/langs/ja_JP/companies.lang (100%)
 rename {htdocs => public}/langs/ja_JP/compta.lang (100%)
 rename {htdocs => public}/langs/ja_JP/contracts.lang (100%)
 rename {htdocs => public}/langs/ja_JP/cron.lang (100%)
 rename {htdocs => public}/langs/ja_JP/deliveries.lang (100%)
 rename {htdocs => public}/langs/ja_JP/dict.lang (100%)
 rename {htdocs => public}/langs/ja_JP/donations.lang (100%)
 rename {htdocs => public}/langs/ja_JP/ecm.lang (100%)
 rename {htdocs => public}/langs/ja_JP/errors.lang (100%)
 rename {htdocs => public}/langs/ja_JP/exports.lang (100%)
 rename {htdocs => public}/langs/ja_JP/externalsite.lang (100%)
 rename {htdocs => public}/langs/ja_JP/ftp.lang (100%)
 rename {htdocs => public}/langs/ja_JP/help.lang (100%)
 rename {htdocs => public}/langs/ja_JP/holiday.lang (100%)
 rename {htdocs => public}/langs/ja_JP/hrm.lang (100%)
 rename {htdocs => public}/langs/ja_JP/incoterm.lang (100%)
 rename {htdocs => public}/langs/ja_JP/install.lang (100%)
 rename {htdocs => public}/langs/ja_JP/interventions.lang (100%)
 rename {htdocs => public}/langs/ja_JP/languages.lang (100%)
 rename {htdocs => public}/langs/ja_JP/ldap.lang (100%)
 rename {htdocs => public}/langs/ja_JP/link.lang (100%)
 rename {htdocs => public}/langs/ja_JP/loan.lang (100%)
 rename {htdocs => public}/langs/ja_JP/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/ja_JP/mails.lang (100%)
 rename {htdocs => public}/langs/ja_JP/main.lang (100%)
 rename {htdocs => public}/langs/ja_JP/margins.lang (100%)
 rename {htdocs => public}/langs/ja_JP/members.lang (100%)
 rename {htdocs => public}/langs/ja_JP/oauth.lang (100%)
 rename {htdocs => public}/langs/ja_JP/opensurvey.lang (100%)
 rename {htdocs => public}/langs/ja_JP/orders.lang (100%)
 rename {htdocs => public}/langs/ja_JP/other.lang (100%)
 rename {htdocs => public}/langs/ja_JP/paybox.lang (100%)
 rename {htdocs => public}/langs/ja_JP/paypal.lang (100%)
 rename {htdocs => public}/langs/ja_JP/printing.lang (100%)
 rename {htdocs => public}/langs/ja_JP/productbatch.lang (100%)
 rename {htdocs => public}/langs/ja_JP/products.lang (100%)
 rename {htdocs => public}/langs/ja_JP/projects.lang (100%)
 rename {htdocs => public}/langs/ja_JP/propal.lang (100%)
 rename {htdocs => public}/langs/ja_JP/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/ja_JP/resource.lang (100%)
 rename {htdocs => public}/langs/ja_JP/salaries.lang (100%)
 rename {htdocs => public}/langs/ja_JP/sendings.lang (100%)
 rename {htdocs => public}/langs/ja_JP/sms.lang (100%)
 rename {htdocs => public}/langs/ja_JP/stocks.lang (100%)
 rename {htdocs => public}/langs/ja_JP/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/ja_JP/suppliers.lang (100%)
 rename {htdocs => public}/langs/ja_JP/trips.lang (100%)
 rename {htdocs => public}/langs/ja_JP/users.lang (100%)
 rename {htdocs => public}/langs/ja_JP/website.lang (100%)
 rename {htdocs => public}/langs/ja_JP/withdrawals.lang (100%)
 rename {htdocs => public}/langs/ja_JP/workflow.lang (100%)
 rename {htdocs => public}/langs/ka_GE/accountancy.lang (100%)
 rename {htdocs => public}/langs/ka_GE/admin.lang (100%)
 rename {htdocs => public}/langs/ka_GE/agenda.lang (100%)
 rename {htdocs => public}/langs/ka_GE/banks.lang (100%)
 rename {htdocs => public}/langs/ka_GE/bills.lang (100%)
 rename {htdocs => public}/langs/ka_GE/bookmarks.lang (100%)
 rename {htdocs => public}/langs/ka_GE/boxes.lang (100%)
 rename {htdocs => public}/langs/ka_GE/cashdesk.lang (100%)
 rename {htdocs => public}/langs/ka_GE/categories.lang (100%)
 rename {htdocs => public}/langs/ka_GE/commercial.lang (100%)
 rename {htdocs => public}/langs/ka_GE/companies.lang (100%)
 rename {htdocs => public}/langs/ka_GE/compta.lang (100%)
 rename {htdocs => public}/langs/ka_GE/contracts.lang (100%)
 rename {htdocs => public}/langs/ka_GE/cron.lang (100%)
 rename {htdocs => public}/langs/ka_GE/deliveries.lang (100%)
 rename {htdocs => public}/langs/ka_GE/dict.lang (100%)
 rename {htdocs => public}/langs/ka_GE/donations.lang (100%)
 rename {htdocs => public}/langs/ka_GE/ecm.lang (100%)
 rename {htdocs => public}/langs/ka_GE/errors.lang (100%)
 rename {htdocs => public}/langs/ka_GE/exports.lang (100%)
 rename {htdocs => public}/langs/ka_GE/externalsite.lang (100%)
 rename {htdocs => public}/langs/ka_GE/ftp.lang (100%)
 rename {htdocs => public}/langs/ka_GE/help.lang (100%)
 rename {htdocs => public}/langs/ka_GE/holiday.lang (100%)
 rename {htdocs => public}/langs/ka_GE/hrm.lang (100%)
 rename {htdocs => public}/langs/ka_GE/incoterm.lang (100%)
 rename {htdocs => public}/langs/ka_GE/install.lang (100%)
 rename {htdocs => public}/langs/ka_GE/interventions.lang (100%)
 rename {htdocs => public}/langs/ka_GE/languages.lang (100%)
 rename {htdocs => public}/langs/ka_GE/ldap.lang (100%)
 rename {htdocs => public}/langs/ka_GE/link.lang (100%)
 rename {htdocs => public}/langs/ka_GE/loan.lang (100%)
 rename {htdocs => public}/langs/ka_GE/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/ka_GE/mails.lang (100%)
 rename {htdocs => public}/langs/ka_GE/main.lang (100%)
 rename {htdocs => public}/langs/ka_GE/margins.lang (100%)
 rename {htdocs => public}/langs/ka_GE/members.lang (100%)
 rename {htdocs => public}/langs/ka_GE/oauth.lang (100%)
 rename {htdocs => public}/langs/ka_GE/opensurvey.lang (100%)
 rename {htdocs => public}/langs/ka_GE/orders.lang (100%)
 rename {htdocs => public}/langs/ka_GE/other.lang (100%)
 rename {htdocs => public}/langs/ka_GE/paybox.lang (100%)
 rename {htdocs => public}/langs/ka_GE/paypal.lang (100%)
 rename {htdocs => public}/langs/ka_GE/printing.lang (100%)
 rename {htdocs => public}/langs/ka_GE/productbatch.lang (100%)
 rename {htdocs => public}/langs/ka_GE/products.lang (100%)
 rename {htdocs => public}/langs/ka_GE/projects.lang (100%)
 rename {htdocs => public}/langs/ka_GE/propal.lang (100%)
 rename {htdocs => public}/langs/ka_GE/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/ka_GE/resource.lang (100%)
 rename {htdocs => public}/langs/ka_GE/salaries.lang (100%)
 rename {htdocs => public}/langs/ka_GE/sendings.lang (100%)
 rename {htdocs => public}/langs/ka_GE/sms.lang (100%)
 rename {htdocs => public}/langs/ka_GE/stocks.lang (100%)
 rename {htdocs => public}/langs/ka_GE/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/ka_GE/suppliers.lang (100%)
 rename {htdocs => public}/langs/ka_GE/trips.lang (100%)
 rename {htdocs => public}/langs/ka_GE/users.lang (100%)
 rename {htdocs => public}/langs/ka_GE/website.lang (100%)
 rename {htdocs => public}/langs/ka_GE/withdrawals.lang (100%)
 rename {htdocs => public}/langs/ka_GE/workflow.lang (100%)
 rename {htdocs => public}/langs/km_KH/accountancy.lang (100%)
 rename {htdocs => public}/langs/km_KH/admin.lang (100%)
 rename {htdocs => public}/langs/km_KH/agenda.lang (100%)
 rename {htdocs => public}/langs/km_KH/banks.lang (100%)
 rename {htdocs => public}/langs/km_KH/bills.lang (100%)
 rename {htdocs => public}/langs/km_KH/bookmarks.lang (100%)
 rename {htdocs => public}/langs/km_KH/boxes.lang (100%)
 rename {htdocs => public}/langs/km_KH/cashdesk.lang (100%)
 rename {htdocs => public}/langs/km_KH/categories.lang (100%)
 rename {htdocs => public}/langs/km_KH/commercial.lang (100%)
 rename {htdocs => public}/langs/km_KH/companies.lang (100%)
 rename {htdocs => public}/langs/km_KH/compta.lang (100%)
 rename {htdocs => public}/langs/km_KH/contracts.lang (100%)
 rename {htdocs => public}/langs/km_KH/cron.lang (100%)
 rename {htdocs => public}/langs/km_KH/deliveries.lang (100%)
 rename {htdocs => public}/langs/km_KH/dict.lang (100%)
 rename {htdocs => public}/langs/km_KH/donations.lang (100%)
 rename {htdocs => public}/langs/km_KH/ecm.lang (100%)
 rename {htdocs => public}/langs/km_KH/errors.lang (100%)
 rename {htdocs => public}/langs/km_KH/exports.lang (100%)
 rename {htdocs => public}/langs/km_KH/externalsite.lang (100%)
 rename {htdocs => public}/langs/km_KH/ftp.lang (100%)
 rename {htdocs => public}/langs/km_KH/help.lang (100%)
 rename {htdocs => public}/langs/km_KH/holiday.lang (100%)
 rename {htdocs => public}/langs/km_KH/hrm.lang (100%)
 rename {htdocs => public}/langs/km_KH/incoterm.lang (100%)
 rename {htdocs => public}/langs/km_KH/install.lang (100%)
 rename {htdocs => public}/langs/km_KH/interventions.lang (100%)
 rename {htdocs => public}/langs/km_KH/languages.lang (100%)
 rename {htdocs => public}/langs/km_KH/ldap.lang (100%)
 rename {htdocs => public}/langs/km_KH/link.lang (100%)
 rename {htdocs => public}/langs/km_KH/loan.lang (100%)
 rename {htdocs => public}/langs/km_KH/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/km_KH/mails.lang (100%)
 rename {htdocs => public}/langs/km_KH/main.lang (100%)
 rename {htdocs => public}/langs/km_KH/margins.lang (100%)
 rename {htdocs => public}/langs/km_KH/members.lang (100%)
 rename {htdocs => public}/langs/km_KH/oauth.lang (100%)
 rename {htdocs => public}/langs/km_KH/opensurvey.lang (100%)
 rename {htdocs => public}/langs/km_KH/orders.lang (100%)
 rename {htdocs => public}/langs/km_KH/other.lang (100%)
 rename {htdocs => public}/langs/km_KH/paybox.lang (100%)
 rename {htdocs => public}/langs/km_KH/paypal.lang (100%)
 rename {htdocs => public}/langs/km_KH/printing.lang (100%)
 rename {htdocs => public}/langs/km_KH/productbatch.lang (100%)
 rename {htdocs => public}/langs/km_KH/products.lang (100%)
 rename {htdocs => public}/langs/km_KH/projects.lang (100%)
 rename {htdocs => public}/langs/km_KH/propal.lang (100%)
 rename {htdocs => public}/langs/km_KH/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/km_KH/resource.lang (100%)
 rename {htdocs => public}/langs/km_KH/salaries.lang (100%)
 rename {htdocs => public}/langs/km_KH/sendings.lang (100%)
 rename {htdocs => public}/langs/km_KH/sms.lang (100%)
 rename {htdocs => public}/langs/km_KH/stocks.lang (100%)
 rename {htdocs => public}/langs/km_KH/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/km_KH/suppliers.lang (100%)
 rename {htdocs => public}/langs/km_KH/trips.lang (100%)
 rename {htdocs => public}/langs/km_KH/users.lang (100%)
 rename {htdocs => public}/langs/km_KH/website.lang (100%)
 rename {htdocs => public}/langs/km_KH/withdrawals.lang (100%)
 rename {htdocs => public}/langs/km_KH/workflow.lang (100%)
 rename {htdocs => public}/langs/kn_IN/accountancy.lang (100%)
 rename {htdocs => public}/langs/kn_IN/admin.lang (100%)
 rename {htdocs => public}/langs/kn_IN/agenda.lang (100%)
 rename {htdocs => public}/langs/kn_IN/banks.lang (100%)
 rename {htdocs => public}/langs/kn_IN/bills.lang (100%)
 rename {htdocs => public}/langs/kn_IN/bookmarks.lang (100%)
 rename {htdocs => public}/langs/kn_IN/boxes.lang (100%)
 rename {htdocs => public}/langs/kn_IN/cashdesk.lang (100%)
 rename {htdocs => public}/langs/kn_IN/categories.lang (100%)
 rename {htdocs => public}/langs/kn_IN/commercial.lang (100%)
 rename {htdocs => public}/langs/kn_IN/companies.lang (100%)
 rename {htdocs => public}/langs/kn_IN/compta.lang (100%)
 rename {htdocs => public}/langs/kn_IN/contracts.lang (100%)
 rename {htdocs => public}/langs/kn_IN/cron.lang (100%)
 rename {htdocs => public}/langs/kn_IN/deliveries.lang (100%)
 rename {htdocs => public}/langs/kn_IN/dict.lang (100%)
 rename {htdocs => public}/langs/kn_IN/donations.lang (100%)
 rename {htdocs => public}/langs/kn_IN/ecm.lang (100%)
 rename {htdocs => public}/langs/kn_IN/errors.lang (100%)
 rename {htdocs => public}/langs/kn_IN/exports.lang (100%)
 rename {htdocs => public}/langs/kn_IN/externalsite.lang (100%)
 rename {htdocs => public}/langs/kn_IN/ftp.lang (100%)
 rename {htdocs => public}/langs/kn_IN/help.lang (100%)
 rename {htdocs => public}/langs/kn_IN/holiday.lang (100%)
 rename {htdocs => public}/langs/kn_IN/hrm.lang (100%)
 rename {htdocs => public}/langs/kn_IN/incoterm.lang (100%)
 rename {htdocs => public}/langs/kn_IN/install.lang (100%)
 rename {htdocs => public}/langs/kn_IN/interventions.lang (100%)
 rename {htdocs => public}/langs/kn_IN/languages.lang (100%)
 rename {htdocs => public}/langs/kn_IN/ldap.lang (100%)
 rename {htdocs => public}/langs/kn_IN/link.lang (100%)
 rename {htdocs => public}/langs/kn_IN/loan.lang (100%)
 rename {htdocs => public}/langs/kn_IN/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/kn_IN/mails.lang (100%)
 rename {htdocs => public}/langs/kn_IN/main.lang (100%)
 rename {htdocs => public}/langs/kn_IN/margins.lang (100%)
 rename {htdocs => public}/langs/kn_IN/members.lang (100%)
 rename {htdocs => public}/langs/kn_IN/oauth.lang (100%)
 rename {htdocs => public}/langs/kn_IN/opensurvey.lang (100%)
 rename {htdocs => public}/langs/kn_IN/orders.lang (100%)
 rename {htdocs => public}/langs/kn_IN/other.lang (100%)
 rename {htdocs => public}/langs/kn_IN/paybox.lang (100%)
 rename {htdocs => public}/langs/kn_IN/paypal.lang (100%)
 rename {htdocs => public}/langs/kn_IN/printing.lang (100%)
 rename {htdocs => public}/langs/kn_IN/productbatch.lang (100%)
 rename {htdocs => public}/langs/kn_IN/products.lang (100%)
 rename {htdocs => public}/langs/kn_IN/projects.lang (100%)
 rename {htdocs => public}/langs/kn_IN/propal.lang (100%)
 rename {htdocs => public}/langs/kn_IN/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/kn_IN/resource.lang (100%)
 rename {htdocs => public}/langs/kn_IN/salaries.lang (100%)
 rename {htdocs => public}/langs/kn_IN/sendings.lang (100%)
 rename {htdocs => public}/langs/kn_IN/sms.lang (100%)
 rename {htdocs => public}/langs/kn_IN/stocks.lang (100%)
 rename {htdocs => public}/langs/kn_IN/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/kn_IN/suppliers.lang (100%)
 rename {htdocs => public}/langs/kn_IN/trips.lang (100%)
 rename {htdocs => public}/langs/kn_IN/users.lang (100%)
 rename {htdocs => public}/langs/kn_IN/website.lang (100%)
 rename {htdocs => public}/langs/kn_IN/withdrawals.lang (100%)
 rename {htdocs => public}/langs/kn_IN/workflow.lang (100%)
 rename {htdocs => public}/langs/ko_KR/accountancy.lang (100%)
 rename {htdocs => public}/langs/ko_KR/admin.lang (100%)
 rename {htdocs => public}/langs/ko_KR/agenda.lang (100%)
 rename {htdocs => public}/langs/ko_KR/banks.lang (100%)
 rename {htdocs => public}/langs/ko_KR/bills.lang (100%)
 rename {htdocs => public}/langs/ko_KR/bookmarks.lang (100%)
 rename {htdocs => public}/langs/ko_KR/boxes.lang (100%)
 rename {htdocs => public}/langs/ko_KR/cashdesk.lang (100%)
 rename {htdocs => public}/langs/ko_KR/categories.lang (100%)
 rename {htdocs => public}/langs/ko_KR/commercial.lang (100%)
 rename {htdocs => public}/langs/ko_KR/companies.lang (100%)
 rename {htdocs => public}/langs/ko_KR/compta.lang (100%)
 rename {htdocs => public}/langs/ko_KR/contracts.lang (100%)
 rename {htdocs => public}/langs/ko_KR/cron.lang (100%)
 rename {htdocs => public}/langs/ko_KR/deliveries.lang (100%)
 rename {htdocs => public}/langs/ko_KR/dict.lang (100%)
 rename {htdocs => public}/langs/ko_KR/donations.lang (100%)
 rename {htdocs => public}/langs/ko_KR/ecm.lang (100%)
 rename {htdocs => public}/langs/ko_KR/errors.lang (100%)
 rename {htdocs => public}/langs/ko_KR/exports.lang (100%)
 rename {htdocs => public}/langs/ko_KR/externalsite.lang (100%)
 rename {htdocs => public}/langs/ko_KR/ftp.lang (100%)
 rename {htdocs => public}/langs/ko_KR/help.lang (100%)
 rename {htdocs => public}/langs/ko_KR/holiday.lang (100%)
 rename {htdocs => public}/langs/ko_KR/hrm.lang (100%)
 rename {htdocs => public}/langs/ko_KR/incoterm.lang (100%)
 rename {htdocs => public}/langs/ko_KR/install.lang (100%)
 rename {htdocs => public}/langs/ko_KR/interventions.lang (100%)
 rename {htdocs => public}/langs/ko_KR/languages.lang (100%)
 rename {htdocs => public}/langs/ko_KR/ldap.lang (100%)
 rename {htdocs => public}/langs/ko_KR/link.lang (100%)
 rename {htdocs => public}/langs/ko_KR/loan.lang (100%)
 rename {htdocs => public}/langs/ko_KR/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/ko_KR/mails.lang (100%)
 rename {htdocs => public}/langs/ko_KR/main.lang (100%)
 rename {htdocs => public}/langs/ko_KR/margins.lang (100%)
 rename {htdocs => public}/langs/ko_KR/members.lang (100%)
 rename {htdocs => public}/langs/ko_KR/oauth.lang (100%)
 rename {htdocs => public}/langs/ko_KR/opensurvey.lang (100%)
 rename {htdocs => public}/langs/ko_KR/orders.lang (100%)
 rename {htdocs => public}/langs/ko_KR/other.lang (100%)
 rename {htdocs => public}/langs/ko_KR/paybox.lang (100%)
 rename {htdocs => public}/langs/ko_KR/paypal.lang (100%)
 rename {htdocs => public}/langs/ko_KR/printing.lang (100%)
 rename {htdocs => public}/langs/ko_KR/productbatch.lang (100%)
 rename {htdocs => public}/langs/ko_KR/products.lang (100%)
 rename {htdocs => public}/langs/ko_KR/projects.lang (100%)
 rename {htdocs => public}/langs/ko_KR/propal.lang (100%)
 rename {htdocs => public}/langs/ko_KR/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/ko_KR/resource.lang (100%)
 rename {htdocs => public}/langs/ko_KR/salaries.lang (100%)
 rename {htdocs => public}/langs/ko_KR/sendings.lang (100%)
 rename {htdocs => public}/langs/ko_KR/sms.lang (100%)
 rename {htdocs => public}/langs/ko_KR/stocks.lang (100%)
 rename {htdocs => public}/langs/ko_KR/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/ko_KR/suppliers.lang (100%)
 rename {htdocs => public}/langs/ko_KR/trips.lang (100%)
 rename {htdocs => public}/langs/ko_KR/users.lang (100%)
 rename {htdocs => public}/langs/ko_KR/website.lang (100%)
 rename {htdocs => public}/langs/ko_KR/withdrawals.lang (100%)
 rename {htdocs => public}/langs/ko_KR/workflow.lang (100%)
 rename {htdocs => public}/langs/lo_LA/accountancy.lang (100%)
 rename {htdocs => public}/langs/lo_LA/admin.lang (100%)
 rename {htdocs => public}/langs/lo_LA/agenda.lang (100%)
 rename {htdocs => public}/langs/lo_LA/banks.lang (100%)
 rename {htdocs => public}/langs/lo_LA/bills.lang (100%)
 rename {htdocs => public}/langs/lo_LA/bookmarks.lang (100%)
 rename {htdocs => public}/langs/lo_LA/boxes.lang (100%)
 rename {htdocs => public}/langs/lo_LA/cashdesk.lang (100%)
 rename {htdocs => public}/langs/lo_LA/categories.lang (100%)
 rename {htdocs => public}/langs/lo_LA/commercial.lang (100%)
 rename {htdocs => public}/langs/lo_LA/companies.lang (100%)
 rename {htdocs => public}/langs/lo_LA/compta.lang (100%)
 rename {htdocs => public}/langs/lo_LA/contracts.lang (100%)
 rename {htdocs => public}/langs/lo_LA/cron.lang (100%)
 rename {htdocs => public}/langs/lo_LA/deliveries.lang (100%)
 rename {htdocs => public}/langs/lo_LA/dict.lang (100%)
 rename {htdocs => public}/langs/lo_LA/donations.lang (100%)
 rename {htdocs => public}/langs/lo_LA/ecm.lang (100%)
 rename {htdocs => public}/langs/lo_LA/errors.lang (100%)
 rename {htdocs => public}/langs/lo_LA/exports.lang (100%)
 rename {htdocs => public}/langs/lo_LA/externalsite.lang (100%)
 rename {htdocs => public}/langs/lo_LA/ftp.lang (100%)
 rename {htdocs => public}/langs/lo_LA/help.lang (100%)
 rename {htdocs => public}/langs/lo_LA/holiday.lang (100%)
 rename {htdocs => public}/langs/lo_LA/hrm.lang (100%)
 rename {htdocs => public}/langs/lo_LA/incoterm.lang (100%)
 rename {htdocs => public}/langs/lo_LA/install.lang (100%)
 rename {htdocs => public}/langs/lo_LA/interventions.lang (100%)
 rename {htdocs => public}/langs/lo_LA/languages.lang (100%)
 rename {htdocs => public}/langs/lo_LA/ldap.lang (100%)
 rename {htdocs => public}/langs/lo_LA/link.lang (100%)
 rename {htdocs => public}/langs/lo_LA/loan.lang (100%)
 rename {htdocs => public}/langs/lo_LA/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/lo_LA/mails.lang (100%)
 rename {htdocs => public}/langs/lo_LA/main.lang (100%)
 rename {htdocs => public}/langs/lo_LA/margins.lang (100%)
 rename {htdocs => public}/langs/lo_LA/members.lang (100%)
 rename {htdocs => public}/langs/lo_LA/oauth.lang (100%)
 rename {htdocs => public}/langs/lo_LA/opensurvey.lang (100%)
 rename {htdocs => public}/langs/lo_LA/orders.lang (100%)
 rename {htdocs => public}/langs/lo_LA/other.lang (100%)
 rename {htdocs => public}/langs/lo_LA/paybox.lang (100%)
 rename {htdocs => public}/langs/lo_LA/paypal.lang (100%)
 rename {htdocs => public}/langs/lo_LA/printing.lang (100%)
 rename {htdocs => public}/langs/lo_LA/productbatch.lang (100%)
 rename {htdocs => public}/langs/lo_LA/products.lang (100%)
 rename {htdocs => public}/langs/lo_LA/projects.lang (100%)
 rename {htdocs => public}/langs/lo_LA/propal.lang (100%)
 rename {htdocs => public}/langs/lo_LA/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/lo_LA/resource.lang (100%)
 rename {htdocs => public}/langs/lo_LA/salaries.lang (100%)
 rename {htdocs => public}/langs/lo_LA/sendings.lang (100%)
 rename {htdocs => public}/langs/lo_LA/sms.lang (100%)
 rename {htdocs => public}/langs/lo_LA/stocks.lang (100%)
 rename {htdocs => public}/langs/lo_LA/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/lo_LA/suppliers.lang (100%)
 rename {htdocs => public}/langs/lo_LA/trips.lang (100%)
 rename {htdocs => public}/langs/lo_LA/users.lang (100%)
 rename {htdocs => public}/langs/lo_LA/website.lang (100%)
 rename {htdocs => public}/langs/lo_LA/withdrawals.lang (100%)
 rename {htdocs => public}/langs/lo_LA/workflow.lang (100%)
 rename {htdocs => public}/langs/lt_LT/accountancy.lang (100%)
 rename {htdocs => public}/langs/lt_LT/admin.lang (100%)
 rename {htdocs => public}/langs/lt_LT/agenda.lang (100%)
 rename {htdocs => public}/langs/lt_LT/banks.lang (100%)
 rename {htdocs => public}/langs/lt_LT/bills.lang (100%)
 rename {htdocs => public}/langs/lt_LT/bookmarks.lang (100%)
 rename {htdocs => public}/langs/lt_LT/boxes.lang (100%)
 rename {htdocs => public}/langs/lt_LT/cashdesk.lang (100%)
 rename {htdocs => public}/langs/lt_LT/categories.lang (100%)
 rename {htdocs => public}/langs/lt_LT/commercial.lang (100%)
 rename {htdocs => public}/langs/lt_LT/companies.lang (100%)
 rename {htdocs => public}/langs/lt_LT/compta.lang (100%)
 rename {htdocs => public}/langs/lt_LT/contracts.lang (100%)
 rename {htdocs => public}/langs/lt_LT/cron.lang (100%)
 rename {htdocs => public}/langs/lt_LT/deliveries.lang (100%)
 rename {htdocs => public}/langs/lt_LT/dict.lang (100%)
 rename {htdocs => public}/langs/lt_LT/donations.lang (100%)
 rename {htdocs => public}/langs/lt_LT/ecm.lang (100%)
 rename {htdocs => public}/langs/lt_LT/errors.lang (100%)
 rename {htdocs => public}/langs/lt_LT/exports.lang (100%)
 rename {htdocs => public}/langs/lt_LT/externalsite.lang (100%)
 rename {htdocs => public}/langs/lt_LT/ftp.lang (100%)
 rename {htdocs => public}/langs/lt_LT/help.lang (100%)
 rename {htdocs => public}/langs/lt_LT/holiday.lang (100%)
 rename {htdocs => public}/langs/lt_LT/hrm.lang (100%)
 rename {htdocs => public}/langs/lt_LT/incoterm.lang (100%)
 rename {htdocs => public}/langs/lt_LT/install.lang (100%)
 rename {htdocs => public}/langs/lt_LT/interventions.lang (100%)
 rename {htdocs => public}/langs/lt_LT/languages.lang (100%)
 rename {htdocs => public}/langs/lt_LT/ldap.lang (100%)
 rename {htdocs => public}/langs/lt_LT/link.lang (100%)
 rename {htdocs => public}/langs/lt_LT/loan.lang (100%)
 rename {htdocs => public}/langs/lt_LT/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/lt_LT/mails.lang (100%)
 rename {htdocs => public}/langs/lt_LT/main.lang (100%)
 rename {htdocs => public}/langs/lt_LT/margins.lang (100%)
 rename {htdocs => public}/langs/lt_LT/members.lang (100%)
 rename {htdocs => public}/langs/lt_LT/oauth.lang (100%)
 rename {htdocs => public}/langs/lt_LT/opensurvey.lang (100%)
 rename {htdocs => public}/langs/lt_LT/orders.lang (100%)
 rename {htdocs => public}/langs/lt_LT/other.lang (100%)
 rename {htdocs => public}/langs/lt_LT/paybox.lang (100%)
 rename {htdocs => public}/langs/lt_LT/paypal.lang (100%)
 rename {htdocs => public}/langs/lt_LT/printing.lang (100%)
 rename {htdocs => public}/langs/lt_LT/productbatch.lang (100%)
 rename {htdocs => public}/langs/lt_LT/products.lang (100%)
 rename {htdocs => public}/langs/lt_LT/projects.lang (100%)
 rename {htdocs => public}/langs/lt_LT/propal.lang (100%)
 rename {htdocs => public}/langs/lt_LT/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/lt_LT/resource.lang (100%)
 rename {htdocs => public}/langs/lt_LT/salaries.lang (100%)
 rename {htdocs => public}/langs/lt_LT/sendings.lang (100%)
 rename {htdocs => public}/langs/lt_LT/sms.lang (100%)
 rename {htdocs => public}/langs/lt_LT/stocks.lang (100%)
 rename {htdocs => public}/langs/lt_LT/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/lt_LT/suppliers.lang (100%)
 rename {htdocs => public}/langs/lt_LT/trips.lang (100%)
 rename {htdocs => public}/langs/lt_LT/users.lang (100%)
 rename {htdocs => public}/langs/lt_LT/website.lang (100%)
 rename {htdocs => public}/langs/lt_LT/withdrawals.lang (100%)
 rename {htdocs => public}/langs/lt_LT/workflow.lang (100%)
 rename {htdocs => public}/langs/lv_LV/accountancy.lang (100%)
 rename {htdocs => public}/langs/lv_LV/admin.lang (100%)
 rename {htdocs => public}/langs/lv_LV/agenda.lang (100%)
 rename {htdocs => public}/langs/lv_LV/banks.lang (100%)
 rename {htdocs => public}/langs/lv_LV/bills.lang (100%)
 rename {htdocs => public}/langs/lv_LV/bookmarks.lang (100%)
 rename {htdocs => public}/langs/lv_LV/boxes.lang (100%)
 rename {htdocs => public}/langs/lv_LV/cashdesk.lang (100%)
 rename {htdocs => public}/langs/lv_LV/categories.lang (100%)
 rename {htdocs => public}/langs/lv_LV/commercial.lang (100%)
 rename {htdocs => public}/langs/lv_LV/companies.lang (100%)
 rename {htdocs => public}/langs/lv_LV/compta.lang (100%)
 rename {htdocs => public}/langs/lv_LV/contracts.lang (100%)
 rename {htdocs => public}/langs/lv_LV/cron.lang (100%)
 rename {htdocs => public}/langs/lv_LV/deliveries.lang (100%)
 rename {htdocs => public}/langs/lv_LV/dict.lang (100%)
 rename {htdocs => public}/langs/lv_LV/donations.lang (100%)
 rename {htdocs => public}/langs/lv_LV/ecm.lang (100%)
 rename {htdocs => public}/langs/lv_LV/errors.lang (100%)
 rename {htdocs => public}/langs/lv_LV/exports.lang (100%)
 rename {htdocs => public}/langs/lv_LV/externalsite.lang (100%)
 rename {htdocs => public}/langs/lv_LV/ftp.lang (100%)
 rename {htdocs => public}/langs/lv_LV/help.lang (100%)
 rename {htdocs => public}/langs/lv_LV/holiday.lang (100%)
 rename {htdocs => public}/langs/lv_LV/hrm.lang (100%)
 rename {htdocs => public}/langs/lv_LV/incoterm.lang (100%)
 rename {htdocs => public}/langs/lv_LV/install.lang (100%)
 rename {htdocs => public}/langs/lv_LV/interventions.lang (100%)
 rename {htdocs => public}/langs/lv_LV/languages.lang (100%)
 rename {htdocs => public}/langs/lv_LV/ldap.lang (100%)
 rename {htdocs => public}/langs/lv_LV/link.lang (100%)
 rename {htdocs => public}/langs/lv_LV/loan.lang (100%)
 rename {htdocs => public}/langs/lv_LV/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/lv_LV/mails.lang (100%)
 rename {htdocs => public}/langs/lv_LV/main.lang (100%)
 rename {htdocs => public}/langs/lv_LV/margins.lang (100%)
 rename {htdocs => public}/langs/lv_LV/members.lang (100%)
 rename {htdocs => public}/langs/lv_LV/oauth.lang (100%)
 rename {htdocs => public}/langs/lv_LV/opensurvey.lang (100%)
 rename {htdocs => public}/langs/lv_LV/orders.lang (100%)
 rename {htdocs => public}/langs/lv_LV/other.lang (100%)
 rename {htdocs => public}/langs/lv_LV/paybox.lang (100%)
 rename {htdocs => public}/langs/lv_LV/paypal.lang (100%)
 rename {htdocs => public}/langs/lv_LV/printing.lang (100%)
 rename {htdocs => public}/langs/lv_LV/productbatch.lang (100%)
 rename {htdocs => public}/langs/lv_LV/products.lang (100%)
 rename {htdocs => public}/langs/lv_LV/projects.lang (100%)
 rename {htdocs => public}/langs/lv_LV/propal.lang (100%)
 rename {htdocs => public}/langs/lv_LV/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/lv_LV/resource.lang (100%)
 rename {htdocs => public}/langs/lv_LV/salaries.lang (100%)
 rename {htdocs => public}/langs/lv_LV/sendings.lang (100%)
 rename {htdocs => public}/langs/lv_LV/sms.lang (100%)
 rename {htdocs => public}/langs/lv_LV/stocks.lang (100%)
 rename {htdocs => public}/langs/lv_LV/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/lv_LV/suppliers.lang (100%)
 rename {htdocs => public}/langs/lv_LV/trips.lang (100%)
 rename {htdocs => public}/langs/lv_LV/users.lang (100%)
 rename {htdocs => public}/langs/lv_LV/website.lang (100%)
 rename {htdocs => public}/langs/lv_LV/withdrawals.lang (100%)
 rename {htdocs => public}/langs/lv_LV/workflow.lang (100%)
 rename {htdocs => public}/langs/mk_MK/accountancy.lang (100%)
 rename {htdocs => public}/langs/mk_MK/admin.lang (100%)
 rename {htdocs => public}/langs/mk_MK/agenda.lang (100%)
 rename {htdocs => public}/langs/mk_MK/banks.lang (100%)
 rename {htdocs => public}/langs/mk_MK/bills.lang (100%)
 rename {htdocs => public}/langs/mk_MK/bookmarks.lang (100%)
 rename {htdocs => public}/langs/mk_MK/boxes.lang (100%)
 rename {htdocs => public}/langs/mk_MK/cashdesk.lang (100%)
 rename {htdocs => public}/langs/mk_MK/categories.lang (100%)
 rename {htdocs => public}/langs/mk_MK/commercial.lang (100%)
 rename {htdocs => public}/langs/mk_MK/companies.lang (100%)
 rename {htdocs => public}/langs/mk_MK/compta.lang (100%)
 rename {htdocs => public}/langs/mk_MK/contracts.lang (100%)
 rename {htdocs => public}/langs/mk_MK/cron.lang (100%)
 rename {htdocs => public}/langs/mk_MK/deliveries.lang (100%)
 rename {htdocs => public}/langs/mk_MK/dict.lang (100%)
 rename {htdocs => public}/langs/mk_MK/donations.lang (100%)
 rename {htdocs => public}/langs/mk_MK/ecm.lang (100%)
 rename {htdocs => public}/langs/mk_MK/errors.lang (100%)
 rename {htdocs => public}/langs/mk_MK/exports.lang (100%)
 rename {htdocs => public}/langs/mk_MK/externalsite.lang (100%)
 rename {htdocs => public}/langs/mk_MK/ftp.lang (100%)
 rename {htdocs => public}/langs/mk_MK/help.lang (100%)
 rename {htdocs => public}/langs/mk_MK/holiday.lang (100%)
 rename {htdocs => public}/langs/mk_MK/hrm.lang (100%)
 rename {htdocs => public}/langs/mk_MK/incoterm.lang (100%)
 rename {htdocs => public}/langs/mk_MK/install.lang (100%)
 rename {htdocs => public}/langs/mk_MK/interventions.lang (100%)
 rename {htdocs => public}/langs/mk_MK/languages.lang (100%)
 rename {htdocs => public}/langs/mk_MK/ldap.lang (100%)
 rename {htdocs => public}/langs/mk_MK/link.lang (100%)
 rename {htdocs => public}/langs/mk_MK/loan.lang (100%)
 rename {htdocs => public}/langs/mk_MK/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/mk_MK/mails.lang (100%)
 rename {htdocs => public}/langs/mk_MK/main.lang (100%)
 rename {htdocs => public}/langs/mk_MK/margins.lang (100%)
 rename {htdocs => public}/langs/mk_MK/members.lang (100%)
 rename {htdocs => public}/langs/mk_MK/oauth.lang (100%)
 rename {htdocs => public}/langs/mk_MK/opensurvey.lang (100%)
 rename {htdocs => public}/langs/mk_MK/orders.lang (100%)
 rename {htdocs => public}/langs/mk_MK/other.lang (100%)
 rename {htdocs => public}/langs/mk_MK/paybox.lang (100%)
 rename {htdocs => public}/langs/mk_MK/paypal.lang (100%)
 rename {htdocs => public}/langs/mk_MK/printing.lang (100%)
 rename {htdocs => public}/langs/mk_MK/productbatch.lang (100%)
 rename {htdocs => public}/langs/mk_MK/products.lang (100%)
 rename {htdocs => public}/langs/mk_MK/projects.lang (100%)
 rename {htdocs => public}/langs/mk_MK/propal.lang (100%)
 rename {htdocs => public}/langs/mk_MK/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/mk_MK/resource.lang (100%)
 rename {htdocs => public}/langs/mk_MK/salaries.lang (100%)
 rename {htdocs => public}/langs/mk_MK/sendings.lang (100%)
 rename {htdocs => public}/langs/mk_MK/sms.lang (100%)
 rename {htdocs => public}/langs/mk_MK/stocks.lang (100%)
 rename {htdocs => public}/langs/mk_MK/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/mk_MK/suppliers.lang (100%)
 rename {htdocs => public}/langs/mk_MK/trips.lang (100%)
 rename {htdocs => public}/langs/mk_MK/users.lang (100%)
 rename {htdocs => public}/langs/mk_MK/website.lang (100%)
 rename {htdocs => public}/langs/mk_MK/withdrawals.lang (100%)
 rename {htdocs => public}/langs/mk_MK/workflow.lang (100%)
 rename {htdocs => public}/langs/mn_MN/accountancy.lang (100%)
 rename {htdocs => public}/langs/mn_MN/admin.lang (100%)
 rename {htdocs => public}/langs/mn_MN/agenda.lang (100%)
 rename {htdocs => public}/langs/mn_MN/banks.lang (100%)
 rename {htdocs => public}/langs/mn_MN/bills.lang (100%)
 rename {htdocs => public}/langs/mn_MN/bookmarks.lang (100%)
 rename {htdocs => public}/langs/mn_MN/boxes.lang (100%)
 rename {htdocs => public}/langs/mn_MN/cashdesk.lang (100%)
 rename {htdocs => public}/langs/mn_MN/categories.lang (100%)
 rename {htdocs => public}/langs/mn_MN/commercial.lang (100%)
 rename {htdocs => public}/langs/mn_MN/companies.lang (100%)
 rename {htdocs => public}/langs/mn_MN/compta.lang (100%)
 rename {htdocs => public}/langs/mn_MN/contracts.lang (100%)
 rename {htdocs => public}/langs/mn_MN/cron.lang (100%)
 rename {htdocs => public}/langs/mn_MN/deliveries.lang (100%)
 rename {htdocs => public}/langs/mn_MN/dict.lang (100%)
 rename {htdocs => public}/langs/mn_MN/donations.lang (100%)
 rename {htdocs => public}/langs/mn_MN/ecm.lang (100%)
 rename {htdocs => public}/langs/mn_MN/errors.lang (100%)
 rename {htdocs => public}/langs/mn_MN/exports.lang (100%)
 rename {htdocs => public}/langs/mn_MN/externalsite.lang (100%)
 rename {htdocs => public}/langs/mn_MN/ftp.lang (100%)
 rename {htdocs => public}/langs/mn_MN/help.lang (100%)
 rename {htdocs => public}/langs/mn_MN/holiday.lang (100%)
 rename {htdocs => public}/langs/mn_MN/hrm.lang (100%)
 rename {htdocs => public}/langs/mn_MN/incoterm.lang (100%)
 rename {htdocs => public}/langs/mn_MN/install.lang (100%)
 rename {htdocs => public}/langs/mn_MN/interventions.lang (100%)
 rename {htdocs => public}/langs/mn_MN/languages.lang (100%)
 rename {htdocs => public}/langs/mn_MN/ldap.lang (100%)
 rename {htdocs => public}/langs/mn_MN/link.lang (100%)
 rename {htdocs => public}/langs/mn_MN/loan.lang (100%)
 rename {htdocs => public}/langs/mn_MN/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/mn_MN/mails.lang (100%)
 rename {htdocs => public}/langs/mn_MN/main.lang (100%)
 rename {htdocs => public}/langs/mn_MN/margins.lang (100%)
 rename {htdocs => public}/langs/mn_MN/members.lang (100%)
 rename {htdocs => public}/langs/mn_MN/oauth.lang (100%)
 rename {htdocs => public}/langs/mn_MN/opensurvey.lang (100%)
 rename {htdocs => public}/langs/mn_MN/orders.lang (100%)
 rename {htdocs => public}/langs/mn_MN/other.lang (100%)
 rename {htdocs => public}/langs/mn_MN/paybox.lang (100%)
 rename {htdocs => public}/langs/mn_MN/paypal.lang (100%)
 rename {htdocs => public}/langs/mn_MN/printing.lang (100%)
 rename {htdocs => public}/langs/mn_MN/productbatch.lang (100%)
 rename {htdocs => public}/langs/mn_MN/products.lang (100%)
 rename {htdocs => public}/langs/mn_MN/projects.lang (100%)
 rename {htdocs => public}/langs/mn_MN/propal.lang (100%)
 rename {htdocs => public}/langs/mn_MN/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/mn_MN/resource.lang (100%)
 rename {htdocs => public}/langs/mn_MN/salaries.lang (100%)
 rename {htdocs => public}/langs/mn_MN/sendings.lang (100%)
 rename {htdocs => public}/langs/mn_MN/sms.lang (100%)
 rename {htdocs => public}/langs/mn_MN/stocks.lang (100%)
 rename {htdocs => public}/langs/mn_MN/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/mn_MN/suppliers.lang (100%)
 rename {htdocs => public}/langs/mn_MN/trips.lang (100%)
 rename {htdocs => public}/langs/mn_MN/users.lang (100%)
 rename {htdocs => public}/langs/mn_MN/website.lang (100%)
 rename {htdocs => public}/langs/mn_MN/withdrawals.lang (100%)
 rename {htdocs => public}/langs/mn_MN/workflow.lang (100%)
 rename {htdocs => public}/langs/nb_NO/accountancy.lang (100%)
 rename {htdocs => public}/langs/nb_NO/admin.lang (100%)
 rename {htdocs => public}/langs/nb_NO/agenda.lang (100%)
 rename {htdocs => public}/langs/nb_NO/banks.lang (100%)
 rename {htdocs => public}/langs/nb_NO/bills.lang (100%)
 rename {htdocs => public}/langs/nb_NO/bookmarks.lang (100%)
 rename {htdocs => public}/langs/nb_NO/boxes.lang (100%)
 rename {htdocs => public}/langs/nb_NO/cashdesk.lang (100%)
 rename {htdocs => public}/langs/nb_NO/categories.lang (100%)
 rename {htdocs => public}/langs/nb_NO/commercial.lang (100%)
 rename {htdocs => public}/langs/nb_NO/companies.lang (100%)
 rename {htdocs => public}/langs/nb_NO/compta.lang (100%)
 rename {htdocs => public}/langs/nb_NO/contracts.lang (100%)
 rename {htdocs => public}/langs/nb_NO/cron.lang (100%)
 rename {htdocs => public}/langs/nb_NO/deliveries.lang (100%)
 rename {htdocs => public}/langs/nb_NO/dict.lang (100%)
 rename {htdocs => public}/langs/nb_NO/donations.lang (100%)
 rename {htdocs => public}/langs/nb_NO/ecm.lang (100%)
 rename {htdocs => public}/langs/nb_NO/errors.lang (100%)
 rename {htdocs => public}/langs/nb_NO/exports.lang (100%)
 rename {htdocs => public}/langs/nb_NO/externalsite.lang (100%)
 rename {htdocs => public}/langs/nb_NO/ftp.lang (100%)
 rename {htdocs => public}/langs/nb_NO/help.lang (100%)
 rename {htdocs => public}/langs/nb_NO/holiday.lang (100%)
 rename {htdocs => public}/langs/nb_NO/hrm.lang (100%)
 rename {htdocs => public}/langs/nb_NO/incoterm.lang (100%)
 rename {htdocs => public}/langs/nb_NO/install.lang (100%)
 rename {htdocs => public}/langs/nb_NO/interventions.lang (100%)
 rename {htdocs => public}/langs/nb_NO/languages.lang (100%)
 rename {htdocs => public}/langs/nb_NO/ldap.lang (100%)
 rename {htdocs => public}/langs/nb_NO/link.lang (100%)
 rename {htdocs => public}/langs/nb_NO/loan.lang (100%)
 rename {htdocs => public}/langs/nb_NO/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/nb_NO/mails.lang (100%)
 rename {htdocs => public}/langs/nb_NO/main.lang (100%)
 rename {htdocs => public}/langs/nb_NO/margins.lang (100%)
 rename {htdocs => public}/langs/nb_NO/members.lang (100%)
 rename {htdocs => public}/langs/nb_NO/oauth.lang (100%)
 rename {htdocs => public}/langs/nb_NO/opensurvey.lang (100%)
 rename {htdocs => public}/langs/nb_NO/orders.lang (100%)
 rename {htdocs => public}/langs/nb_NO/other.lang (100%)
 rename {htdocs => public}/langs/nb_NO/paybox.lang (100%)
 rename {htdocs => public}/langs/nb_NO/paypal.lang (100%)
 rename {htdocs => public}/langs/nb_NO/printing.lang (100%)
 rename {htdocs => public}/langs/nb_NO/productbatch.lang (100%)
 rename {htdocs => public}/langs/nb_NO/products.lang (100%)
 rename {htdocs => public}/langs/nb_NO/projects.lang (100%)
 rename {htdocs => public}/langs/nb_NO/propal.lang (100%)
 rename {htdocs => public}/langs/nb_NO/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/nb_NO/resource.lang (100%)
 rename {htdocs => public}/langs/nb_NO/salaries.lang (100%)
 rename {htdocs => public}/langs/nb_NO/sendings.lang (100%)
 rename {htdocs => public}/langs/nb_NO/sms.lang (100%)
 rename {htdocs => public}/langs/nb_NO/stocks.lang (100%)
 rename {htdocs => public}/langs/nb_NO/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/nb_NO/suppliers.lang (100%)
 rename {htdocs => public}/langs/nb_NO/trips.lang (100%)
 rename {htdocs => public}/langs/nb_NO/users.lang (100%)
 rename {htdocs => public}/langs/nb_NO/website.lang (100%)
 rename {htdocs => public}/langs/nb_NO/withdrawals.lang (100%)
 rename {htdocs => public}/langs/nb_NO/workflow.lang (100%)
 rename {htdocs => public}/langs/nl_BE/accountancy.lang (100%)
 rename {htdocs => public}/langs/nl_BE/admin.lang (100%)
 rename {htdocs => public}/langs/nl_BE/agenda.lang (100%)
 rename {htdocs => public}/langs/nl_BE/banks.lang (100%)
 rename {htdocs => public}/langs/nl_BE/bills.lang (100%)
 rename {htdocs => public}/langs/nl_BE/bookmarks.lang (100%)
 rename {htdocs => public}/langs/nl_BE/boxes.lang (100%)
 rename {htdocs => public}/langs/nl_BE/cashdesk.lang (100%)
 rename {htdocs => public}/langs/nl_BE/categories.lang (100%)
 rename {htdocs => public}/langs/nl_BE/commercial.lang (100%)
 rename {htdocs => public}/langs/nl_BE/companies.lang (100%)
 rename {htdocs => public}/langs/nl_BE/compta.lang (100%)
 rename {htdocs => public}/langs/nl_BE/contracts.lang (100%)
 rename {htdocs => public}/langs/nl_BE/cron.lang (100%)
 rename {htdocs => public}/langs/nl_BE/deliveries.lang (100%)
 rename {htdocs => public}/langs/nl_BE/dict.lang (100%)
 rename {htdocs => public}/langs/nl_BE/donations.lang (100%)
 rename {htdocs => public}/langs/nl_BE/ecm.lang (100%)
 rename {htdocs => public}/langs/nl_BE/errors.lang (100%)
 rename {htdocs => public}/langs/nl_BE/exports.lang (100%)
 rename {htdocs => public}/langs/nl_BE/externalsite.lang (100%)
 rename {htdocs => public}/langs/nl_BE/ftp.lang (100%)
 rename {htdocs => public}/langs/nl_BE/help.lang (100%)
 rename {htdocs => public}/langs/nl_BE/holiday.lang (100%)
 rename {htdocs => public}/langs/nl_BE/hrm.lang (100%)
 rename {htdocs => public}/langs/nl_BE/incoterm.lang (100%)
 rename {htdocs => public}/langs/nl_BE/install.lang (100%)
 rename {htdocs => public}/langs/nl_BE/interventions.lang (100%)
 rename {htdocs => public}/langs/nl_BE/languages.lang (100%)
 rename {htdocs => public}/langs/nl_BE/ldap.lang (100%)
 rename {htdocs => public}/langs/nl_BE/link.lang (100%)
 rename {htdocs => public}/langs/nl_BE/loan.lang (100%)
 rename {htdocs => public}/langs/nl_BE/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/nl_BE/mails.lang (100%)
 rename {htdocs => public}/langs/nl_BE/main.lang (100%)
 rename {htdocs => public}/langs/nl_BE/margins.lang (100%)
 rename {htdocs => public}/langs/nl_BE/members.lang (100%)
 rename {htdocs => public}/langs/nl_BE/oauth.lang (100%)
 rename {htdocs => public}/langs/nl_BE/opensurvey.lang (100%)
 rename {htdocs => public}/langs/nl_BE/orders.lang (100%)
 rename {htdocs => public}/langs/nl_BE/other.lang (100%)
 rename {htdocs => public}/langs/nl_BE/paybox.lang (100%)
 rename {htdocs => public}/langs/nl_BE/paypal.lang (100%)
 rename {htdocs => public}/langs/nl_BE/printing.lang (100%)
 rename {htdocs => public}/langs/nl_BE/productbatch.lang (100%)
 rename {htdocs => public}/langs/nl_BE/products.lang (100%)
 rename {htdocs => public}/langs/nl_BE/projects.lang (100%)
 rename {htdocs => public}/langs/nl_BE/propal.lang (100%)
 rename {htdocs => public}/langs/nl_BE/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/nl_BE/resource.lang (100%)
 rename {htdocs => public}/langs/nl_BE/salaries.lang (100%)
 rename {htdocs => public}/langs/nl_BE/sendings.lang (100%)
 rename {htdocs => public}/langs/nl_BE/sms.lang (100%)
 rename {htdocs => public}/langs/nl_BE/stocks.lang (100%)
 rename {htdocs => public}/langs/nl_BE/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/nl_BE/suppliers.lang (100%)
 rename {htdocs => public}/langs/nl_BE/trips.lang (100%)
 rename {htdocs => public}/langs/nl_BE/users.lang (100%)
 rename {htdocs => public}/langs/nl_BE/website.lang (100%)
 rename {htdocs => public}/langs/nl_BE/withdrawals.lang (100%)
 rename {htdocs => public}/langs/nl_BE/workflow.lang (100%)
 rename {htdocs => public}/langs/nl_NL/accountancy.lang (100%)
 rename {htdocs => public}/langs/nl_NL/admin.lang (100%)
 rename {htdocs => public}/langs/nl_NL/agenda.lang (100%)
 rename {htdocs => public}/langs/nl_NL/banks.lang (100%)
 rename {htdocs => public}/langs/nl_NL/bills.lang (100%)
 rename {htdocs => public}/langs/nl_NL/bookmarks.lang (100%)
 rename {htdocs => public}/langs/nl_NL/boxes.lang (100%)
 rename {htdocs => public}/langs/nl_NL/cashdesk.lang (100%)
 rename {htdocs => public}/langs/nl_NL/categories.lang (100%)
 rename {htdocs => public}/langs/nl_NL/commercial.lang (100%)
 rename {htdocs => public}/langs/nl_NL/companies.lang (100%)
 rename {htdocs => public}/langs/nl_NL/compta.lang (100%)
 rename {htdocs => public}/langs/nl_NL/contracts.lang (100%)
 rename {htdocs => public}/langs/nl_NL/cron.lang (100%)
 rename {htdocs => public}/langs/nl_NL/deliveries.lang (100%)
 rename {htdocs => public}/langs/nl_NL/dict.lang (100%)
 rename {htdocs => public}/langs/nl_NL/donations.lang (100%)
 rename {htdocs => public}/langs/nl_NL/ecm.lang (100%)
 rename {htdocs => public}/langs/nl_NL/errors.lang (100%)
 rename {htdocs => public}/langs/nl_NL/exports.lang (100%)
 rename {htdocs => public}/langs/nl_NL/externalsite.lang (100%)
 rename {htdocs => public}/langs/nl_NL/ftp.lang (100%)
 rename {htdocs => public}/langs/nl_NL/help.lang (100%)
 rename {htdocs => public}/langs/nl_NL/holiday.lang (100%)
 rename {htdocs => public}/langs/nl_NL/hrm.lang (100%)
 rename {htdocs => public}/langs/nl_NL/incoterm.lang (100%)
 rename {htdocs => public}/langs/nl_NL/install.lang (100%)
 rename {htdocs => public}/langs/nl_NL/interventions.lang (100%)
 rename {htdocs => public}/langs/nl_NL/languages.lang (100%)
 rename {htdocs => public}/langs/nl_NL/ldap.lang (100%)
 rename {htdocs => public}/langs/nl_NL/link.lang (100%)
 rename {htdocs => public}/langs/nl_NL/loan.lang (100%)
 rename {htdocs => public}/langs/nl_NL/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/nl_NL/mails.lang (100%)
 rename {htdocs => public}/langs/nl_NL/main.lang (100%)
 rename {htdocs => public}/langs/nl_NL/margins.lang (100%)
 rename {htdocs => public}/langs/nl_NL/members.lang (100%)
 rename {htdocs => public}/langs/nl_NL/oauth.lang (100%)
 rename {htdocs => public}/langs/nl_NL/opensurvey.lang (100%)
 rename {htdocs => public}/langs/nl_NL/orders.lang (100%)
 rename {htdocs => public}/langs/nl_NL/other.lang (100%)
 rename {htdocs => public}/langs/nl_NL/paybox.lang (100%)
 rename {htdocs => public}/langs/nl_NL/paypal.lang (100%)
 rename {htdocs => public}/langs/nl_NL/printing.lang (100%)
 rename {htdocs => public}/langs/nl_NL/productbatch.lang (100%)
 rename {htdocs => public}/langs/nl_NL/products.lang (100%)
 rename {htdocs => public}/langs/nl_NL/projects.lang (100%)
 rename {htdocs => public}/langs/nl_NL/propal.lang (100%)
 rename {htdocs => public}/langs/nl_NL/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/nl_NL/resource.lang (100%)
 rename {htdocs => public}/langs/nl_NL/salaries.lang (100%)
 rename {htdocs => public}/langs/nl_NL/sendings.lang (100%)
 rename {htdocs => public}/langs/nl_NL/sms.lang (100%)
 rename {htdocs => public}/langs/nl_NL/stocks.lang (100%)
 rename {htdocs => public}/langs/nl_NL/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/nl_NL/suppliers.lang (100%)
 rename {htdocs => public}/langs/nl_NL/trips.lang (100%)
 rename {htdocs => public}/langs/nl_NL/users.lang (100%)
 rename {htdocs => public}/langs/nl_NL/website.lang (100%)
 rename {htdocs => public}/langs/nl_NL/withdrawals.lang (100%)
 rename {htdocs => public}/langs/nl_NL/workflow.lang (100%)
 rename {htdocs => public}/langs/pl_PL/accountancy.lang (100%)
 rename {htdocs => public}/langs/pl_PL/admin.lang (100%)
 rename {htdocs => public}/langs/pl_PL/agenda.lang (100%)
 rename {htdocs => public}/langs/pl_PL/banks.lang (100%)
 rename {htdocs => public}/langs/pl_PL/bills.lang (100%)
 rename {htdocs => public}/langs/pl_PL/bookmarks.lang (100%)
 rename {htdocs => public}/langs/pl_PL/boxes.lang (100%)
 rename {htdocs => public}/langs/pl_PL/cashdesk.lang (100%)
 rename {htdocs => public}/langs/pl_PL/categories.lang (100%)
 rename {htdocs => public}/langs/pl_PL/commercial.lang (100%)
 rename {htdocs => public}/langs/pl_PL/companies.lang (100%)
 rename {htdocs => public}/langs/pl_PL/compta.lang (100%)
 rename {htdocs => public}/langs/pl_PL/contracts.lang (100%)
 rename {htdocs => public}/langs/pl_PL/cron.lang (100%)
 rename {htdocs => public}/langs/pl_PL/deliveries.lang (100%)
 rename {htdocs => public}/langs/pl_PL/dict.lang (100%)
 rename {htdocs => public}/langs/pl_PL/donations.lang (100%)
 rename {htdocs => public}/langs/pl_PL/ecm.lang (100%)
 rename {htdocs => public}/langs/pl_PL/errors.lang (100%)
 rename {htdocs => public}/langs/pl_PL/exports.lang (100%)
 rename {htdocs => public}/langs/pl_PL/externalsite.lang (100%)
 rename {htdocs => public}/langs/pl_PL/ftp.lang (100%)
 rename {htdocs => public}/langs/pl_PL/help.lang (100%)
 rename {htdocs => public}/langs/pl_PL/holiday.lang (100%)
 rename {htdocs => public}/langs/pl_PL/hrm.lang (100%)
 rename {htdocs => public}/langs/pl_PL/incoterm.lang (100%)
 rename {htdocs => public}/langs/pl_PL/install.lang (100%)
 rename {htdocs => public}/langs/pl_PL/interventions.lang (100%)
 rename {htdocs => public}/langs/pl_PL/languages.lang (100%)
 rename {htdocs => public}/langs/pl_PL/ldap.lang (100%)
 rename {htdocs => public}/langs/pl_PL/link.lang (100%)
 rename {htdocs => public}/langs/pl_PL/loan.lang (100%)
 rename {htdocs => public}/langs/pl_PL/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/pl_PL/mails.lang (100%)
 rename {htdocs => public}/langs/pl_PL/main.lang (100%)
 rename {htdocs => public}/langs/pl_PL/margins.lang (100%)
 rename {htdocs => public}/langs/pl_PL/members.lang (100%)
 rename {htdocs => public}/langs/pl_PL/oauth.lang (100%)
 rename {htdocs => public}/langs/pl_PL/opensurvey.lang (100%)
 rename {htdocs => public}/langs/pl_PL/orders.lang (100%)
 rename {htdocs => public}/langs/pl_PL/other.lang (100%)
 rename {htdocs => public}/langs/pl_PL/paybox.lang (100%)
 rename {htdocs => public}/langs/pl_PL/paypal.lang (100%)
 rename {htdocs => public}/langs/pl_PL/printing.lang (100%)
 rename {htdocs => public}/langs/pl_PL/productbatch.lang (100%)
 rename {htdocs => public}/langs/pl_PL/products.lang (100%)
 rename {htdocs => public}/langs/pl_PL/projects.lang (100%)
 rename {htdocs => public}/langs/pl_PL/propal.lang (100%)
 rename {htdocs => public}/langs/pl_PL/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/pl_PL/resource.lang (100%)
 rename {htdocs => public}/langs/pl_PL/salaries.lang (100%)
 rename {htdocs => public}/langs/pl_PL/sendings.lang (100%)
 rename {htdocs => public}/langs/pl_PL/sms.lang (100%)
 rename {htdocs => public}/langs/pl_PL/stocks.lang (100%)
 rename {htdocs => public}/langs/pl_PL/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/pl_PL/suppliers.lang (100%)
 rename {htdocs => public}/langs/pl_PL/trips.lang (100%)
 rename {htdocs => public}/langs/pl_PL/users.lang (100%)
 rename {htdocs => public}/langs/pl_PL/website.lang (100%)
 rename {htdocs => public}/langs/pl_PL/withdrawals.lang (100%)
 rename {htdocs => public}/langs/pl_PL/workflow.lang (100%)
 rename {htdocs => public}/langs/pt_BR/accountancy.lang (100%)
 rename {htdocs => public}/langs/pt_BR/admin.lang (100%)
 rename {htdocs => public}/langs/pt_BR/agenda.lang (100%)
 rename {htdocs => public}/langs/pt_BR/banks.lang (100%)
 rename {htdocs => public}/langs/pt_BR/bills.lang (100%)
 rename {htdocs => public}/langs/pt_BR/bookmarks.lang (100%)
 rename {htdocs => public}/langs/pt_BR/boxes.lang (100%)
 rename {htdocs => public}/langs/pt_BR/cashdesk.lang (100%)
 rename {htdocs => public}/langs/pt_BR/categories.lang (100%)
 rename {htdocs => public}/langs/pt_BR/commercial.lang (100%)
 rename {htdocs => public}/langs/pt_BR/companies.lang (100%)
 rename {htdocs => public}/langs/pt_BR/compta.lang (100%)
 rename {htdocs => public}/langs/pt_BR/contracts.lang (100%)
 rename {htdocs => public}/langs/pt_BR/cron.lang (100%)
 rename {htdocs => public}/langs/pt_BR/deliveries.lang (100%)
 rename {htdocs => public}/langs/pt_BR/dict.lang (100%)
 rename {htdocs => public}/langs/pt_BR/donations.lang (100%)
 rename {htdocs => public}/langs/pt_BR/ecm.lang (100%)
 rename {htdocs => public}/langs/pt_BR/errors.lang (100%)
 rename {htdocs => public}/langs/pt_BR/exports.lang (100%)
 rename {htdocs => public}/langs/pt_BR/externalsite.lang (100%)
 rename {htdocs => public}/langs/pt_BR/ftp.lang (100%)
 rename {htdocs => public}/langs/pt_BR/help.lang (100%)
 rename {htdocs => public}/langs/pt_BR/holiday.lang (100%)
 rename {htdocs => public}/langs/pt_BR/hrm.lang (100%)
 rename {htdocs => public}/langs/pt_BR/incoterm.lang (100%)
 rename {htdocs => public}/langs/pt_BR/install.lang (100%)
 rename {htdocs => public}/langs/pt_BR/interventions.lang (100%)
 rename {htdocs => public}/langs/pt_BR/languages.lang (100%)
 rename {htdocs => public}/langs/pt_BR/ldap.lang (100%)
 rename {htdocs => public}/langs/pt_BR/link.lang (100%)
 rename {htdocs => public}/langs/pt_BR/loan.lang (100%)
 rename {htdocs => public}/langs/pt_BR/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/pt_BR/mails.lang (100%)
 rename {htdocs => public}/langs/pt_BR/main.lang (100%)
 rename {htdocs => public}/langs/pt_BR/margins.lang (100%)
 rename {htdocs => public}/langs/pt_BR/members.lang (100%)
 rename {htdocs => public}/langs/pt_BR/oauth.lang (100%)
 rename {htdocs => public}/langs/pt_BR/opensurvey.lang (100%)
 rename {htdocs => public}/langs/pt_BR/orders.lang (100%)
 rename {htdocs => public}/langs/pt_BR/other.lang (100%)
 rename {htdocs => public}/langs/pt_BR/paybox.lang (100%)
 rename {htdocs => public}/langs/pt_BR/paypal.lang (100%)
 rename {htdocs => public}/langs/pt_BR/printing.lang (100%)
 rename {htdocs => public}/langs/pt_BR/productbatch.lang (100%)
 rename {htdocs => public}/langs/pt_BR/products.lang (100%)
 rename {htdocs => public}/langs/pt_BR/projects.lang (100%)
 rename {htdocs => public}/langs/pt_BR/propal.lang (100%)
 rename {htdocs => public}/langs/pt_BR/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/pt_BR/resource.lang (100%)
 rename {htdocs => public}/langs/pt_BR/salaries.lang (100%)
 rename {htdocs => public}/langs/pt_BR/sendings.lang (100%)
 rename {htdocs => public}/langs/pt_BR/sms.lang (100%)
 rename {htdocs => public}/langs/pt_BR/stocks.lang (100%)
 rename {htdocs => public}/langs/pt_BR/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/pt_BR/suppliers.lang (100%)
 rename {htdocs => public}/langs/pt_BR/trips.lang (100%)
 rename {htdocs => public}/langs/pt_BR/users.lang (100%)
 rename {htdocs => public}/langs/pt_BR/website.lang (100%)
 rename {htdocs => public}/langs/pt_BR/withdrawals.lang (100%)
 rename {htdocs => public}/langs/pt_BR/workflow.lang (100%)
 rename {htdocs => public}/langs/pt_PT/accountancy.lang (100%)
 rename {htdocs => public}/langs/pt_PT/admin.lang (100%)
 rename {htdocs => public}/langs/pt_PT/agenda.lang (100%)
 rename {htdocs => public}/langs/pt_PT/banks.lang (100%)
 rename {htdocs => public}/langs/pt_PT/bills.lang (100%)
 rename {htdocs => public}/langs/pt_PT/bookmarks.lang (100%)
 rename {htdocs => public}/langs/pt_PT/boxes.lang (100%)
 rename {htdocs => public}/langs/pt_PT/cashdesk.lang (100%)
 rename {htdocs => public}/langs/pt_PT/categories.lang (100%)
 rename {htdocs => public}/langs/pt_PT/commercial.lang (100%)
 rename {htdocs => public}/langs/pt_PT/companies.lang (100%)
 rename {htdocs => public}/langs/pt_PT/compta.lang (100%)
 rename {htdocs => public}/langs/pt_PT/contracts.lang (100%)
 rename {htdocs => public}/langs/pt_PT/cron.lang (100%)
 rename {htdocs => public}/langs/pt_PT/deliveries.lang (100%)
 rename {htdocs => public}/langs/pt_PT/dict.lang (100%)
 rename {htdocs => public}/langs/pt_PT/donations.lang (100%)
 rename {htdocs => public}/langs/pt_PT/ecm.lang (100%)
 rename {htdocs => public}/langs/pt_PT/errors.lang (100%)
 rename {htdocs => public}/langs/pt_PT/exports.lang (100%)
 rename {htdocs => public}/langs/pt_PT/externalsite.lang (100%)
 rename {htdocs => public}/langs/pt_PT/ftp.lang (100%)
 rename {htdocs => public}/langs/pt_PT/help.lang (100%)
 rename {htdocs => public}/langs/pt_PT/holiday.lang (100%)
 rename {htdocs => public}/langs/pt_PT/hrm.lang (100%)
 rename {htdocs => public}/langs/pt_PT/incoterm.lang (100%)
 rename {htdocs => public}/langs/pt_PT/install.lang (100%)
 rename {htdocs => public}/langs/pt_PT/interventions.lang (100%)
 rename {htdocs => public}/langs/pt_PT/languages.lang (100%)
 rename {htdocs => public}/langs/pt_PT/ldap.lang (100%)
 rename {htdocs => public}/langs/pt_PT/link.lang (100%)
 rename {htdocs => public}/langs/pt_PT/loan.lang (100%)
 rename {htdocs => public}/langs/pt_PT/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/pt_PT/mails.lang (100%)
 rename {htdocs => public}/langs/pt_PT/main.lang (100%)
 rename {htdocs => public}/langs/pt_PT/margins.lang (100%)
 rename {htdocs => public}/langs/pt_PT/members.lang (100%)
 rename {htdocs => public}/langs/pt_PT/oauth.lang (100%)
 rename {htdocs => public}/langs/pt_PT/opensurvey.lang (100%)
 rename {htdocs => public}/langs/pt_PT/orders.lang (100%)
 rename {htdocs => public}/langs/pt_PT/other.lang (100%)
 rename {htdocs => public}/langs/pt_PT/paybox.lang (100%)
 rename {htdocs => public}/langs/pt_PT/paypal.lang (100%)
 rename {htdocs => public}/langs/pt_PT/printing.lang (100%)
 rename {htdocs => public}/langs/pt_PT/productbatch.lang (100%)
 rename {htdocs => public}/langs/pt_PT/products.lang (100%)
 rename {htdocs => public}/langs/pt_PT/projects.lang (100%)
 rename {htdocs => public}/langs/pt_PT/propal.lang (100%)
 rename {htdocs => public}/langs/pt_PT/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/pt_PT/resource.lang (100%)
 rename {htdocs => public}/langs/pt_PT/salaries.lang (100%)
 rename {htdocs => public}/langs/pt_PT/sendings.lang (100%)
 rename {htdocs => public}/langs/pt_PT/sms.lang (100%)
 rename {htdocs => public}/langs/pt_PT/stocks.lang (100%)
 rename {htdocs => public}/langs/pt_PT/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/pt_PT/suppliers.lang (100%)
 rename {htdocs => public}/langs/pt_PT/trips.lang (100%)
 rename {htdocs => public}/langs/pt_PT/users.lang (100%)
 rename {htdocs => public}/langs/pt_PT/website.lang (100%)
 rename {htdocs => public}/langs/pt_PT/withdrawals.lang (100%)
 rename {htdocs => public}/langs/pt_PT/workflow.lang (100%)
 rename {htdocs => public}/langs/ro_RO/accountancy.lang (100%)
 rename {htdocs => public}/langs/ro_RO/admin.lang (100%)
 rename {htdocs => public}/langs/ro_RO/agenda.lang (100%)
 rename {htdocs => public}/langs/ro_RO/banks.lang (100%)
 rename {htdocs => public}/langs/ro_RO/bills.lang (100%)
 rename {htdocs => public}/langs/ro_RO/bookmarks.lang (100%)
 rename {htdocs => public}/langs/ro_RO/boxes.lang (100%)
 rename {htdocs => public}/langs/ro_RO/cashdesk.lang (100%)
 rename {htdocs => public}/langs/ro_RO/categories.lang (100%)
 rename {htdocs => public}/langs/ro_RO/commercial.lang (100%)
 rename {htdocs => public}/langs/ro_RO/companies.lang (100%)
 rename {htdocs => public}/langs/ro_RO/compta.lang (100%)
 rename {htdocs => public}/langs/ro_RO/contracts.lang (100%)
 rename {htdocs => public}/langs/ro_RO/cron.lang (100%)
 rename {htdocs => public}/langs/ro_RO/deliveries.lang (100%)
 rename {htdocs => public}/langs/ro_RO/dict.lang (100%)
 rename {htdocs => public}/langs/ro_RO/donations.lang (100%)
 rename {htdocs => public}/langs/ro_RO/ecm.lang (100%)
 rename {htdocs => public}/langs/ro_RO/errors.lang (100%)
 rename {htdocs => public}/langs/ro_RO/exports.lang (100%)
 rename {htdocs => public}/langs/ro_RO/externalsite.lang (100%)
 rename {htdocs => public}/langs/ro_RO/ftp.lang (100%)
 rename {htdocs => public}/langs/ro_RO/help.lang (100%)
 rename {htdocs => public}/langs/ro_RO/holiday.lang (100%)
 rename {htdocs => public}/langs/ro_RO/hrm.lang (100%)
 rename {htdocs => public}/langs/ro_RO/incoterm.lang (100%)
 rename {htdocs => public}/langs/ro_RO/install.lang (100%)
 rename {htdocs => public}/langs/ro_RO/interventions.lang (100%)
 rename {htdocs => public}/langs/ro_RO/languages.lang (100%)
 rename {htdocs => public}/langs/ro_RO/ldap.lang (100%)
 rename {htdocs => public}/langs/ro_RO/link.lang (100%)
 rename {htdocs => public}/langs/ro_RO/loan.lang (100%)
 rename {htdocs => public}/langs/ro_RO/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/ro_RO/mails.lang (100%)
 rename {htdocs => public}/langs/ro_RO/main.lang (100%)
 rename {htdocs => public}/langs/ro_RO/margins.lang (100%)
 rename {htdocs => public}/langs/ro_RO/members.lang (100%)
 rename {htdocs => public}/langs/ro_RO/oauth.lang (100%)
 rename {htdocs => public}/langs/ro_RO/opensurvey.lang (100%)
 rename {htdocs => public}/langs/ro_RO/orders.lang (100%)
 rename {htdocs => public}/langs/ro_RO/other.lang (100%)
 rename {htdocs => public}/langs/ro_RO/paybox.lang (100%)
 rename {htdocs => public}/langs/ro_RO/paypal.lang (100%)
 rename {htdocs => public}/langs/ro_RO/printing.lang (100%)
 rename {htdocs => public}/langs/ro_RO/productbatch.lang (100%)
 rename {htdocs => public}/langs/ro_RO/products.lang (100%)
 rename {htdocs => public}/langs/ro_RO/projects.lang (100%)
 rename {htdocs => public}/langs/ro_RO/propal.lang (100%)
 rename {htdocs => public}/langs/ro_RO/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/ro_RO/resource.lang (100%)
 rename {htdocs => public}/langs/ro_RO/salaries.lang (100%)
 rename {htdocs => public}/langs/ro_RO/sendings.lang (100%)
 rename {htdocs => public}/langs/ro_RO/sms.lang (100%)
 rename {htdocs => public}/langs/ro_RO/stocks.lang (100%)
 rename {htdocs => public}/langs/ro_RO/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/ro_RO/suppliers.lang (100%)
 rename {htdocs => public}/langs/ro_RO/trips.lang (100%)
 rename {htdocs => public}/langs/ro_RO/users.lang (100%)
 rename {htdocs => public}/langs/ro_RO/website.lang (100%)
 rename {htdocs => public}/langs/ro_RO/withdrawals.lang (100%)
 rename {htdocs => public}/langs/ro_RO/workflow.lang (100%)
 rename {htdocs => public}/langs/ru_RU/accountancy.lang (100%)
 rename {htdocs => public}/langs/ru_RU/admin.lang (100%)
 rename {htdocs => public}/langs/ru_RU/agenda.lang (100%)
 rename {htdocs => public}/langs/ru_RU/banks.lang (100%)
 rename {htdocs => public}/langs/ru_RU/bills.lang (100%)
 rename {htdocs => public}/langs/ru_RU/bookmarks.lang (100%)
 rename {htdocs => public}/langs/ru_RU/boxes.lang (100%)
 rename {htdocs => public}/langs/ru_RU/cashdesk.lang (100%)
 rename {htdocs => public}/langs/ru_RU/categories.lang (100%)
 rename {htdocs => public}/langs/ru_RU/commercial.lang (100%)
 rename {htdocs => public}/langs/ru_RU/companies.lang (100%)
 rename {htdocs => public}/langs/ru_RU/compta.lang (100%)
 rename {htdocs => public}/langs/ru_RU/contracts.lang (100%)
 rename {htdocs => public}/langs/ru_RU/cron.lang (100%)
 rename {htdocs => public}/langs/ru_RU/deliveries.lang (100%)
 rename {htdocs => public}/langs/ru_RU/dict.lang (100%)
 rename {htdocs => public}/langs/ru_RU/donations.lang (100%)
 rename {htdocs => public}/langs/ru_RU/ecm.lang (100%)
 rename {htdocs => public}/langs/ru_RU/errors.lang (100%)
 rename {htdocs => public}/langs/ru_RU/exports.lang (100%)
 rename {htdocs => public}/langs/ru_RU/externalsite.lang (100%)
 rename {htdocs => public}/langs/ru_RU/ftp.lang (100%)
 rename {htdocs => public}/langs/ru_RU/help.lang (100%)
 rename {htdocs => public}/langs/ru_RU/holiday.lang (100%)
 rename {htdocs => public}/langs/ru_RU/hrm.lang (100%)
 rename {htdocs => public}/langs/ru_RU/incoterm.lang (100%)
 rename {htdocs => public}/langs/ru_RU/install.lang (100%)
 rename {htdocs => public}/langs/ru_RU/interventions.lang (100%)
 rename {htdocs => public}/langs/ru_RU/languages.lang (100%)
 rename {htdocs => public}/langs/ru_RU/ldap.lang (100%)
 rename {htdocs => public}/langs/ru_RU/link.lang (100%)
 rename {htdocs => public}/langs/ru_RU/loan.lang (100%)
 rename {htdocs => public}/langs/ru_RU/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/ru_RU/mails.lang (100%)
 rename {htdocs => public}/langs/ru_RU/main.lang (100%)
 rename {htdocs => public}/langs/ru_RU/margins.lang (100%)
 rename {htdocs => public}/langs/ru_RU/members.lang (100%)
 rename {htdocs => public}/langs/ru_RU/oauth.lang (100%)
 rename {htdocs => public}/langs/ru_RU/opensurvey.lang (100%)
 rename {htdocs => public}/langs/ru_RU/orders.lang (100%)
 rename {htdocs => public}/langs/ru_RU/other.lang (100%)
 rename {htdocs => public}/langs/ru_RU/paybox.lang (100%)
 rename {htdocs => public}/langs/ru_RU/paypal.lang (100%)
 rename {htdocs => public}/langs/ru_RU/printing.lang (100%)
 rename {htdocs => public}/langs/ru_RU/productbatch.lang (100%)
 rename {htdocs => public}/langs/ru_RU/products.lang (100%)
 rename {htdocs => public}/langs/ru_RU/projects.lang (100%)
 rename {htdocs => public}/langs/ru_RU/propal.lang (100%)
 rename {htdocs => public}/langs/ru_RU/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/ru_RU/resource.lang (100%)
 rename {htdocs => public}/langs/ru_RU/salaries.lang (100%)
 rename {htdocs => public}/langs/ru_RU/sendings.lang (100%)
 rename {htdocs => public}/langs/ru_RU/sms.lang (100%)
 rename {htdocs => public}/langs/ru_RU/stocks.lang (100%)
 rename {htdocs => public}/langs/ru_RU/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/ru_RU/suppliers.lang (100%)
 rename {htdocs => public}/langs/ru_RU/trips.lang (100%)
 rename {htdocs => public}/langs/ru_RU/users.lang (100%)
 rename {htdocs => public}/langs/ru_RU/website.lang (100%)
 rename {htdocs => public}/langs/ru_RU/withdrawals.lang (100%)
 rename {htdocs => public}/langs/ru_RU/workflow.lang (100%)
 rename {htdocs => public}/langs/ru_UA/banks.lang (100%)
 rename {htdocs => public}/langs/ru_UA/bookmarks.lang (100%)
 rename {htdocs => public}/langs/ru_UA/compta.lang (100%)
 rename {htdocs => public}/langs/ru_UA/contracts.lang (100%)
 rename {htdocs => public}/langs/ru_UA/dict.lang (100%)
 rename {htdocs => public}/langs/ru_UA/ecm.lang (100%)
 rename {htdocs => public}/langs/ru_UA/errors.lang (100%)
 rename {htdocs => public}/langs/ru_UA/ftp.lang (100%)
 rename {htdocs => public}/langs/ru_UA/install.lang (100%)
 rename {htdocs => public}/langs/ru_UA/interventions.lang (100%)
 rename {htdocs => public}/langs/ru_UA/mails.lang (100%)
 rename {htdocs => public}/langs/ru_UA/main.lang (100%)
 rename {htdocs => public}/langs/ru_UA/other.lang (100%)
 rename {htdocs => public}/langs/ru_UA/paybox.lang (100%)
 rename {htdocs => public}/langs/ru_UA/paypal.lang (100%)
 rename {htdocs => public}/langs/sk_SK/accountancy.lang (100%)
 rename {htdocs => public}/langs/sk_SK/admin.lang (100%)
 rename {htdocs => public}/langs/sk_SK/agenda.lang (100%)
 rename {htdocs => public}/langs/sk_SK/banks.lang (100%)
 rename {htdocs => public}/langs/sk_SK/bills.lang (100%)
 rename {htdocs => public}/langs/sk_SK/bookmarks.lang (100%)
 rename {htdocs => public}/langs/sk_SK/boxes.lang (100%)
 rename {htdocs => public}/langs/sk_SK/cashdesk.lang (100%)
 rename {htdocs => public}/langs/sk_SK/categories.lang (100%)
 rename {htdocs => public}/langs/sk_SK/commercial.lang (100%)
 rename {htdocs => public}/langs/sk_SK/companies.lang (100%)
 rename {htdocs => public}/langs/sk_SK/compta.lang (100%)
 rename {htdocs => public}/langs/sk_SK/contracts.lang (100%)
 rename {htdocs => public}/langs/sk_SK/cron.lang (100%)
 rename {htdocs => public}/langs/sk_SK/deliveries.lang (100%)
 rename {htdocs => public}/langs/sk_SK/dict.lang (100%)
 rename {htdocs => public}/langs/sk_SK/donations.lang (100%)
 rename {htdocs => public}/langs/sk_SK/ecm.lang (100%)
 rename {htdocs => public}/langs/sk_SK/errors.lang (100%)
 rename {htdocs => public}/langs/sk_SK/exports.lang (100%)
 rename {htdocs => public}/langs/sk_SK/externalsite.lang (100%)
 rename {htdocs => public}/langs/sk_SK/ftp.lang (100%)
 rename {htdocs => public}/langs/sk_SK/help.lang (100%)
 rename {htdocs => public}/langs/sk_SK/holiday.lang (100%)
 rename {htdocs => public}/langs/sk_SK/hrm.lang (100%)
 rename {htdocs => public}/langs/sk_SK/incoterm.lang (100%)
 rename {htdocs => public}/langs/sk_SK/install.lang (100%)
 rename {htdocs => public}/langs/sk_SK/interventions.lang (100%)
 rename {htdocs => public}/langs/sk_SK/languages.lang (100%)
 rename {htdocs => public}/langs/sk_SK/ldap.lang (100%)
 rename {htdocs => public}/langs/sk_SK/link.lang (100%)
 rename {htdocs => public}/langs/sk_SK/loan.lang (100%)
 rename {htdocs => public}/langs/sk_SK/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/sk_SK/mails.lang (100%)
 rename {htdocs => public}/langs/sk_SK/main.lang (100%)
 rename {htdocs => public}/langs/sk_SK/margins.lang (100%)
 rename {htdocs => public}/langs/sk_SK/members.lang (100%)
 rename {htdocs => public}/langs/sk_SK/oauth.lang (100%)
 rename {htdocs => public}/langs/sk_SK/opensurvey.lang (100%)
 rename {htdocs => public}/langs/sk_SK/orders.lang (100%)
 rename {htdocs => public}/langs/sk_SK/other.lang (100%)
 rename {htdocs => public}/langs/sk_SK/paybox.lang (100%)
 rename {htdocs => public}/langs/sk_SK/paypal.lang (100%)
 rename {htdocs => public}/langs/sk_SK/printing.lang (100%)
 rename {htdocs => public}/langs/sk_SK/productbatch.lang (100%)
 rename {htdocs => public}/langs/sk_SK/products.lang (100%)
 rename {htdocs => public}/langs/sk_SK/projects.lang (100%)
 rename {htdocs => public}/langs/sk_SK/propal.lang (100%)
 rename {htdocs => public}/langs/sk_SK/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/sk_SK/resource.lang (100%)
 rename {htdocs => public}/langs/sk_SK/salaries.lang (100%)
 rename {htdocs => public}/langs/sk_SK/sendings.lang (100%)
 rename {htdocs => public}/langs/sk_SK/sms.lang (100%)
 rename {htdocs => public}/langs/sk_SK/stocks.lang (100%)
 rename {htdocs => public}/langs/sk_SK/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/sk_SK/suppliers.lang (100%)
 rename {htdocs => public}/langs/sk_SK/trips.lang (100%)
 rename {htdocs => public}/langs/sk_SK/users.lang (100%)
 rename {htdocs => public}/langs/sk_SK/website.lang (100%)
 rename {htdocs => public}/langs/sk_SK/withdrawals.lang (100%)
 rename {htdocs => public}/langs/sk_SK/workflow.lang (100%)
 rename {htdocs => public}/langs/sl_SI/accountancy.lang (100%)
 rename {htdocs => public}/langs/sl_SI/admin.lang (100%)
 rename {htdocs => public}/langs/sl_SI/agenda.lang (100%)
 rename {htdocs => public}/langs/sl_SI/banks.lang (100%)
 rename {htdocs => public}/langs/sl_SI/bills.lang (100%)
 rename {htdocs => public}/langs/sl_SI/bookmarks.lang (100%)
 rename {htdocs => public}/langs/sl_SI/boxes.lang (100%)
 rename {htdocs => public}/langs/sl_SI/cashdesk.lang (100%)
 rename {htdocs => public}/langs/sl_SI/categories.lang (100%)
 rename {htdocs => public}/langs/sl_SI/commercial.lang (100%)
 rename {htdocs => public}/langs/sl_SI/companies.lang (100%)
 rename {htdocs => public}/langs/sl_SI/compta.lang (100%)
 rename {htdocs => public}/langs/sl_SI/contracts.lang (100%)
 rename {htdocs => public}/langs/sl_SI/cron.lang (100%)
 rename {htdocs => public}/langs/sl_SI/deliveries.lang (100%)
 rename {htdocs => public}/langs/sl_SI/dict.lang (100%)
 rename {htdocs => public}/langs/sl_SI/donations.lang (100%)
 rename {htdocs => public}/langs/sl_SI/ecm.lang (100%)
 rename {htdocs => public}/langs/sl_SI/errors.lang (100%)
 rename {htdocs => public}/langs/sl_SI/exports.lang (100%)
 rename {htdocs => public}/langs/sl_SI/externalsite.lang (100%)
 rename {htdocs => public}/langs/sl_SI/ftp.lang (100%)
 rename {htdocs => public}/langs/sl_SI/help.lang (100%)
 rename {htdocs => public}/langs/sl_SI/holiday.lang (100%)
 rename {htdocs => public}/langs/sl_SI/hrm.lang (100%)
 rename {htdocs => public}/langs/sl_SI/incoterm.lang (100%)
 rename {htdocs => public}/langs/sl_SI/install.lang (100%)
 rename {htdocs => public}/langs/sl_SI/interventions.lang (100%)
 rename {htdocs => public}/langs/sl_SI/languages.lang (100%)
 rename {htdocs => public}/langs/sl_SI/ldap.lang (100%)
 rename {htdocs => public}/langs/sl_SI/link.lang (100%)
 rename {htdocs => public}/langs/sl_SI/loan.lang (100%)
 rename {htdocs => public}/langs/sl_SI/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/sl_SI/mails.lang (100%)
 rename {htdocs => public}/langs/sl_SI/main.lang (100%)
 rename {htdocs => public}/langs/sl_SI/margins.lang (100%)
 rename {htdocs => public}/langs/sl_SI/members.lang (100%)
 rename {htdocs => public}/langs/sl_SI/oauth.lang (100%)
 rename {htdocs => public}/langs/sl_SI/opensurvey.lang (100%)
 rename {htdocs => public}/langs/sl_SI/orders.lang (100%)
 rename {htdocs => public}/langs/sl_SI/other.lang (100%)
 rename {htdocs => public}/langs/sl_SI/paybox.lang (100%)
 rename {htdocs => public}/langs/sl_SI/paypal.lang (100%)
 rename {htdocs => public}/langs/sl_SI/printing.lang (100%)
 rename {htdocs => public}/langs/sl_SI/productbatch.lang (100%)
 rename {htdocs => public}/langs/sl_SI/products.lang (100%)
 rename {htdocs => public}/langs/sl_SI/projects.lang (100%)
 rename {htdocs => public}/langs/sl_SI/propal.lang (100%)
 rename {htdocs => public}/langs/sl_SI/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/sl_SI/resource.lang (100%)
 rename {htdocs => public}/langs/sl_SI/salaries.lang (100%)
 rename {htdocs => public}/langs/sl_SI/sendings.lang (100%)
 rename {htdocs => public}/langs/sl_SI/sms.lang (100%)
 rename {htdocs => public}/langs/sl_SI/stocks.lang (100%)
 rename {htdocs => public}/langs/sl_SI/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/sl_SI/suppliers.lang (100%)
 rename {htdocs => public}/langs/sl_SI/trips.lang (100%)
 rename {htdocs => public}/langs/sl_SI/users.lang (100%)
 rename {htdocs => public}/langs/sl_SI/website.lang (100%)
 rename {htdocs => public}/langs/sl_SI/withdrawals.lang (100%)
 rename {htdocs => public}/langs/sl_SI/workflow.lang (100%)
 rename {htdocs => public}/langs/sq_AL/accountancy.lang (100%)
 rename {htdocs => public}/langs/sq_AL/admin.lang (100%)
 rename {htdocs => public}/langs/sq_AL/agenda.lang (100%)
 rename {htdocs => public}/langs/sq_AL/banks.lang (100%)
 rename {htdocs => public}/langs/sq_AL/bills.lang (100%)
 rename {htdocs => public}/langs/sq_AL/bookmarks.lang (100%)
 rename {htdocs => public}/langs/sq_AL/boxes.lang (100%)
 rename {htdocs => public}/langs/sq_AL/cashdesk.lang (100%)
 rename {htdocs => public}/langs/sq_AL/categories.lang (100%)
 rename {htdocs => public}/langs/sq_AL/commercial.lang (100%)
 rename {htdocs => public}/langs/sq_AL/companies.lang (100%)
 rename {htdocs => public}/langs/sq_AL/compta.lang (100%)
 rename {htdocs => public}/langs/sq_AL/contracts.lang (100%)
 rename {htdocs => public}/langs/sq_AL/cron.lang (100%)
 rename {htdocs => public}/langs/sq_AL/deliveries.lang (100%)
 rename {htdocs => public}/langs/sq_AL/dict.lang (100%)
 rename {htdocs => public}/langs/sq_AL/donations.lang (100%)
 rename {htdocs => public}/langs/sq_AL/ecm.lang (100%)
 rename {htdocs => public}/langs/sq_AL/errors.lang (100%)
 rename {htdocs => public}/langs/sq_AL/exports.lang (100%)
 rename {htdocs => public}/langs/sq_AL/externalsite.lang (100%)
 rename {htdocs => public}/langs/sq_AL/ftp.lang (100%)
 rename {htdocs => public}/langs/sq_AL/help.lang (100%)
 rename {htdocs => public}/langs/sq_AL/holiday.lang (100%)
 rename {htdocs => public}/langs/sq_AL/hrm.lang (100%)
 rename {htdocs => public}/langs/sq_AL/incoterm.lang (100%)
 rename {htdocs => public}/langs/sq_AL/install.lang (100%)
 rename {htdocs => public}/langs/sq_AL/interventions.lang (100%)
 rename {htdocs => public}/langs/sq_AL/languages.lang (100%)
 rename {htdocs => public}/langs/sq_AL/ldap.lang (100%)
 rename {htdocs => public}/langs/sq_AL/link.lang (100%)
 rename {htdocs => public}/langs/sq_AL/loan.lang (100%)
 rename {htdocs => public}/langs/sq_AL/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/sq_AL/mails.lang (100%)
 rename {htdocs => public}/langs/sq_AL/main.lang (100%)
 rename {htdocs => public}/langs/sq_AL/margins.lang (100%)
 rename {htdocs => public}/langs/sq_AL/members.lang (100%)
 rename {htdocs => public}/langs/sq_AL/oauth.lang (100%)
 rename {htdocs => public}/langs/sq_AL/opensurvey.lang (100%)
 rename {htdocs => public}/langs/sq_AL/orders.lang (100%)
 rename {htdocs => public}/langs/sq_AL/other.lang (100%)
 rename {htdocs => public}/langs/sq_AL/paybox.lang (100%)
 rename {htdocs => public}/langs/sq_AL/paypal.lang (100%)
 rename {htdocs => public}/langs/sq_AL/printing.lang (100%)
 rename {htdocs => public}/langs/sq_AL/productbatch.lang (100%)
 rename {htdocs => public}/langs/sq_AL/products.lang (100%)
 rename {htdocs => public}/langs/sq_AL/projects.lang (100%)
 rename {htdocs => public}/langs/sq_AL/propal.lang (100%)
 rename {htdocs => public}/langs/sq_AL/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/sq_AL/resource.lang (100%)
 rename {htdocs => public}/langs/sq_AL/salaries.lang (100%)
 rename {htdocs => public}/langs/sq_AL/sendings.lang (100%)
 rename {htdocs => public}/langs/sq_AL/sms.lang (100%)
 rename {htdocs => public}/langs/sq_AL/stocks.lang (100%)
 rename {htdocs => public}/langs/sq_AL/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/sq_AL/suppliers.lang (100%)
 rename {htdocs => public}/langs/sq_AL/trips.lang (100%)
 rename {htdocs => public}/langs/sq_AL/users.lang (100%)
 rename {htdocs => public}/langs/sq_AL/website.lang (100%)
 rename {htdocs => public}/langs/sq_AL/withdrawals.lang (100%)
 rename {htdocs => public}/langs/sq_AL/workflow.lang (100%)
 rename {htdocs => public}/langs/sr_RS/accountancy.lang (100%)
 rename {htdocs => public}/langs/sr_RS/admin.lang (100%)
 rename {htdocs => public}/langs/sr_RS/agenda.lang (100%)
 rename {htdocs => public}/langs/sr_RS/banks.lang (100%)
 rename {htdocs => public}/langs/sr_RS/bills.lang (100%)
 rename {htdocs => public}/langs/sr_RS/bookmarks.lang (100%)
 rename {htdocs => public}/langs/sr_RS/boxes.lang (100%)
 rename {htdocs => public}/langs/sr_RS/cashdesk.lang (100%)
 rename {htdocs => public}/langs/sr_RS/categories.lang (100%)
 rename {htdocs => public}/langs/sr_RS/commercial.lang (100%)
 rename {htdocs => public}/langs/sr_RS/companies.lang (100%)
 rename {htdocs => public}/langs/sr_RS/compta.lang (100%)
 rename {htdocs => public}/langs/sr_RS/contracts.lang (100%)
 rename {htdocs => public}/langs/sr_RS/cron.lang (100%)
 rename {htdocs => public}/langs/sr_RS/deliveries.lang (100%)
 rename {htdocs => public}/langs/sr_RS/dict.lang (100%)
 rename {htdocs => public}/langs/sr_RS/donations.lang (100%)
 rename {htdocs => public}/langs/sr_RS/ecm.lang (100%)
 rename {htdocs => public}/langs/sr_RS/errors.lang (100%)
 rename {htdocs => public}/langs/sr_RS/exports.lang (100%)
 rename {htdocs => public}/langs/sr_RS/externalsite.lang (100%)
 rename {htdocs => public}/langs/sr_RS/ftp.lang (100%)
 rename {htdocs => public}/langs/sr_RS/help.lang (100%)
 rename {htdocs => public}/langs/sr_RS/holiday.lang (100%)
 rename {htdocs => public}/langs/sr_RS/incoterm.lang (100%)
 rename {htdocs => public}/langs/sr_RS/install.lang (100%)
 rename {htdocs => public}/langs/sr_RS/interventions.lang (100%)
 rename {htdocs => public}/langs/sr_RS/languages.lang (100%)
 rename {htdocs => public}/langs/sr_RS/ldap.lang (100%)
 rename {htdocs => public}/langs/sr_RS/link.lang (100%)
 rename {htdocs => public}/langs/sr_RS/loan.lang (100%)
 rename {htdocs => public}/langs/sr_RS/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/sr_RS/mails.lang (100%)
 rename {htdocs => public}/langs/sr_RS/main.lang (100%)
 rename {htdocs => public}/langs/sr_RS/margins.lang (100%)
 rename {htdocs => public}/langs/sr_RS/members.lang (100%)
 rename {htdocs => public}/langs/sr_RS/opensurvey.lang (100%)
 rename {htdocs => public}/langs/sr_RS/orders.lang (100%)
 rename {htdocs => public}/langs/sr_RS/other.lang (100%)
 rename {htdocs => public}/langs/sr_RS/paybox.lang (100%)
 rename {htdocs => public}/langs/sr_RS/paypal.lang (100%)
 rename {htdocs => public}/langs/sr_RS/printing.lang (100%)
 rename {htdocs => public}/langs/sr_RS/productbatch.lang (100%)
 rename {htdocs => public}/langs/sr_RS/products.lang (100%)
 rename {htdocs => public}/langs/sr_RS/projects.lang (100%)
 rename {htdocs => public}/langs/sr_RS/propal.lang (100%)
 rename {htdocs => public}/langs/sr_RS/resource.lang (100%)
 rename {htdocs => public}/langs/sr_RS/salaries.lang (100%)
 rename {htdocs => public}/langs/sr_RS/sendings.lang (100%)
 rename {htdocs => public}/langs/sr_RS/sms.lang (100%)
 rename {htdocs => public}/langs/sr_RS/stocks.lang (100%)
 rename {htdocs => public}/langs/sr_RS/suppliers.lang (100%)
 rename {htdocs => public}/langs/sr_RS/trips.lang (100%)
 rename {htdocs => public}/langs/sr_RS/users.lang (100%)
 rename {htdocs => public}/langs/sr_RS/withdrawals.lang (100%)
 rename {htdocs => public}/langs/sr_RS/workflow.lang (100%)
 rename {htdocs => public}/langs/sv_SE/accountancy.lang (100%)
 rename {htdocs => public}/langs/sv_SE/admin.lang (100%)
 rename {htdocs => public}/langs/sv_SE/agenda.lang (100%)
 rename {htdocs => public}/langs/sv_SE/banks.lang (100%)
 rename {htdocs => public}/langs/sv_SE/bills.lang (100%)
 rename {htdocs => public}/langs/sv_SE/bookmarks.lang (100%)
 rename {htdocs => public}/langs/sv_SE/boxes.lang (100%)
 rename {htdocs => public}/langs/sv_SE/cashdesk.lang (100%)
 rename {htdocs => public}/langs/sv_SE/categories.lang (100%)
 rename {htdocs => public}/langs/sv_SE/commercial.lang (100%)
 rename {htdocs => public}/langs/sv_SE/companies.lang (100%)
 rename {htdocs => public}/langs/sv_SE/compta.lang (100%)
 rename {htdocs => public}/langs/sv_SE/contracts.lang (100%)
 rename {htdocs => public}/langs/sv_SE/cron.lang (100%)
 rename {htdocs => public}/langs/sv_SE/deliveries.lang (100%)
 rename {htdocs => public}/langs/sv_SE/dict.lang (100%)
 rename {htdocs => public}/langs/sv_SE/donations.lang (100%)
 rename {htdocs => public}/langs/sv_SE/ecm.lang (100%)
 rename {htdocs => public}/langs/sv_SE/errors.lang (100%)
 rename {htdocs => public}/langs/sv_SE/exports.lang (100%)
 rename {htdocs => public}/langs/sv_SE/externalsite.lang (100%)
 rename {htdocs => public}/langs/sv_SE/ftp.lang (100%)
 rename {htdocs => public}/langs/sv_SE/help.lang (100%)
 rename {htdocs => public}/langs/sv_SE/holiday.lang (100%)
 rename {htdocs => public}/langs/sv_SE/hrm.lang (100%)
 rename {htdocs => public}/langs/sv_SE/incoterm.lang (100%)
 rename {htdocs => public}/langs/sv_SE/install.lang (100%)
 rename {htdocs => public}/langs/sv_SE/interventions.lang (100%)
 rename {htdocs => public}/langs/sv_SE/languages.lang (100%)
 rename {htdocs => public}/langs/sv_SE/ldap.lang (100%)
 rename {htdocs => public}/langs/sv_SE/link.lang (100%)
 rename {htdocs => public}/langs/sv_SE/loan.lang (100%)
 rename {htdocs => public}/langs/sv_SE/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/sv_SE/mails.lang (100%)
 rename {htdocs => public}/langs/sv_SE/main.lang (100%)
 rename {htdocs => public}/langs/sv_SE/margins.lang (100%)
 rename {htdocs => public}/langs/sv_SE/members.lang (100%)
 rename {htdocs => public}/langs/sv_SE/oauth.lang (100%)
 rename {htdocs => public}/langs/sv_SE/opensurvey.lang (100%)
 rename {htdocs => public}/langs/sv_SE/orders.lang (100%)
 rename {htdocs => public}/langs/sv_SE/other.lang (100%)
 rename {htdocs => public}/langs/sv_SE/paybox.lang (100%)
 rename {htdocs => public}/langs/sv_SE/paypal.lang (100%)
 rename {htdocs => public}/langs/sv_SE/printing.lang (100%)
 rename {htdocs => public}/langs/sv_SE/productbatch.lang (100%)
 rename {htdocs => public}/langs/sv_SE/products.lang (100%)
 rename {htdocs => public}/langs/sv_SE/projects.lang (100%)
 rename {htdocs => public}/langs/sv_SE/propal.lang (100%)
 rename {htdocs => public}/langs/sv_SE/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/sv_SE/resource.lang (100%)
 rename {htdocs => public}/langs/sv_SE/salaries.lang (100%)
 rename {htdocs => public}/langs/sv_SE/sendings.lang (100%)
 rename {htdocs => public}/langs/sv_SE/sms.lang (100%)
 rename {htdocs => public}/langs/sv_SE/stocks.lang (100%)
 rename {htdocs => public}/langs/sv_SE/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/sv_SE/suppliers.lang (100%)
 rename {htdocs => public}/langs/sv_SE/trips.lang (100%)
 rename {htdocs => public}/langs/sv_SE/users.lang (100%)
 rename {htdocs => public}/langs/sv_SE/website.lang (100%)
 rename {htdocs => public}/langs/sv_SE/withdrawals.lang (100%)
 rename {htdocs => public}/langs/sv_SE/workflow.lang (100%)
 rename {htdocs => public}/langs/sw_SW/accountancy.lang (100%)
 rename {htdocs => public}/langs/sw_SW/admin.lang (100%)
 rename {htdocs => public}/langs/sw_SW/agenda.lang (100%)
 rename {htdocs => public}/langs/sw_SW/banks.lang (100%)
 rename {htdocs => public}/langs/sw_SW/bills.lang (100%)
 rename {htdocs => public}/langs/sw_SW/bookmarks.lang (100%)
 rename {htdocs => public}/langs/sw_SW/boxes.lang (100%)
 rename {htdocs => public}/langs/sw_SW/cashdesk.lang (100%)
 rename {htdocs => public}/langs/sw_SW/categories.lang (100%)
 rename {htdocs => public}/langs/sw_SW/commercial.lang (100%)
 rename {htdocs => public}/langs/sw_SW/companies.lang (100%)
 rename {htdocs => public}/langs/sw_SW/compta.lang (100%)
 rename {htdocs => public}/langs/sw_SW/contracts.lang (100%)
 rename {htdocs => public}/langs/sw_SW/cron.lang (100%)
 rename {htdocs => public}/langs/sw_SW/deliveries.lang (100%)
 rename {htdocs => public}/langs/sw_SW/dict.lang (100%)
 rename {htdocs => public}/langs/sw_SW/donations.lang (100%)
 rename {htdocs => public}/langs/sw_SW/ecm.lang (100%)
 rename {htdocs => public}/langs/sw_SW/errors.lang (100%)
 rename {htdocs => public}/langs/sw_SW/exports.lang (100%)
 rename {htdocs => public}/langs/sw_SW/externalsite.lang (100%)
 rename {htdocs => public}/langs/sw_SW/ftp.lang (100%)
 rename {htdocs => public}/langs/sw_SW/help.lang (100%)
 rename {htdocs => public}/langs/sw_SW/holiday.lang (100%)
 rename {htdocs => public}/langs/sw_SW/incoterm.lang (100%)
 rename {htdocs => public}/langs/sw_SW/install.lang (100%)
 rename {htdocs => public}/langs/sw_SW/interventions.lang (100%)
 rename {htdocs => public}/langs/sw_SW/languages.lang (100%)
 rename {htdocs => public}/langs/sw_SW/ldap.lang (100%)
 rename {htdocs => public}/langs/sw_SW/link.lang (100%)
 rename {htdocs => public}/langs/sw_SW/loan.lang (100%)
 rename {htdocs => public}/langs/sw_SW/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/sw_SW/mails.lang (100%)
 rename {htdocs => public}/langs/sw_SW/main.lang (100%)
 rename {htdocs => public}/langs/sw_SW/margins.lang (100%)
 rename {htdocs => public}/langs/sw_SW/members.lang (100%)
 rename {htdocs => public}/langs/sw_SW/opensurvey.lang (100%)
 rename {htdocs => public}/langs/sw_SW/orders.lang (100%)
 rename {htdocs => public}/langs/sw_SW/other.lang (100%)
 rename {htdocs => public}/langs/sw_SW/paybox.lang (100%)
 rename {htdocs => public}/langs/sw_SW/paypal.lang (100%)
 rename {htdocs => public}/langs/sw_SW/printing.lang (100%)
 rename {htdocs => public}/langs/sw_SW/productbatch.lang (100%)
 rename {htdocs => public}/langs/sw_SW/products.lang (100%)
 rename {htdocs => public}/langs/sw_SW/projects.lang (100%)
 rename {htdocs => public}/langs/sw_SW/propal.lang (100%)
 rename {htdocs => public}/langs/sw_SW/resource.lang (100%)
 rename {htdocs => public}/langs/sw_SW/salaries.lang (100%)
 rename {htdocs => public}/langs/sw_SW/sendings.lang (100%)
 rename {htdocs => public}/langs/sw_SW/sms.lang (100%)
 rename {htdocs => public}/langs/sw_SW/stocks.lang (100%)
 rename {htdocs => public}/langs/sw_SW/suppliers.lang (100%)
 rename {htdocs => public}/langs/sw_SW/trips.lang (100%)
 rename {htdocs => public}/langs/sw_SW/users.lang (100%)
 rename {htdocs => public}/langs/sw_SW/withdrawals.lang (100%)
 rename {htdocs => public}/langs/sw_SW/workflow.lang (100%)
 rename {htdocs => public}/langs/th_TH/accountancy.lang (100%)
 rename {htdocs => public}/langs/th_TH/admin.lang (100%)
 rename {htdocs => public}/langs/th_TH/agenda.lang (100%)
 rename {htdocs => public}/langs/th_TH/banks.lang (100%)
 rename {htdocs => public}/langs/th_TH/bills.lang (100%)
 rename {htdocs => public}/langs/th_TH/bookmarks.lang (100%)
 rename {htdocs => public}/langs/th_TH/boxes.lang (100%)
 rename {htdocs => public}/langs/th_TH/cashdesk.lang (100%)
 rename {htdocs => public}/langs/th_TH/categories.lang (100%)
 rename {htdocs => public}/langs/th_TH/commercial.lang (100%)
 rename {htdocs => public}/langs/th_TH/companies.lang (100%)
 rename {htdocs => public}/langs/th_TH/compta.lang (100%)
 rename {htdocs => public}/langs/th_TH/contracts.lang (100%)
 rename {htdocs => public}/langs/th_TH/cron.lang (100%)
 rename {htdocs => public}/langs/th_TH/deliveries.lang (100%)
 rename {htdocs => public}/langs/th_TH/dict.lang (100%)
 rename {htdocs => public}/langs/th_TH/donations.lang (100%)
 rename {htdocs => public}/langs/th_TH/ecm.lang (100%)
 rename {htdocs => public}/langs/th_TH/errors.lang (100%)
 rename {htdocs => public}/langs/th_TH/exports.lang (100%)
 rename {htdocs => public}/langs/th_TH/externalsite.lang (100%)
 rename {htdocs => public}/langs/th_TH/ftp.lang (100%)
 rename {htdocs => public}/langs/th_TH/help.lang (100%)
 rename {htdocs => public}/langs/th_TH/holiday.lang (100%)
 rename {htdocs => public}/langs/th_TH/hrm.lang (100%)
 rename {htdocs => public}/langs/th_TH/incoterm.lang (100%)
 rename {htdocs => public}/langs/th_TH/install.lang (100%)
 rename {htdocs => public}/langs/th_TH/interventions.lang (100%)
 rename {htdocs => public}/langs/th_TH/languages.lang (100%)
 rename {htdocs => public}/langs/th_TH/ldap.lang (100%)
 rename {htdocs => public}/langs/th_TH/link.lang (100%)
 rename {htdocs => public}/langs/th_TH/loan.lang (100%)
 rename {htdocs => public}/langs/th_TH/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/th_TH/mails.lang (100%)
 rename {htdocs => public}/langs/th_TH/main.lang (100%)
 rename {htdocs => public}/langs/th_TH/margins.lang (100%)
 rename {htdocs => public}/langs/th_TH/members.lang (100%)
 rename {htdocs => public}/langs/th_TH/oauth.lang (100%)
 rename {htdocs => public}/langs/th_TH/opensurvey.lang (100%)
 rename {htdocs => public}/langs/th_TH/orders.lang (100%)
 rename {htdocs => public}/langs/th_TH/other.lang (100%)
 rename {htdocs => public}/langs/th_TH/paybox.lang (100%)
 rename {htdocs => public}/langs/th_TH/paypal.lang (100%)
 rename {htdocs => public}/langs/th_TH/printing.lang (100%)
 rename {htdocs => public}/langs/th_TH/productbatch.lang (100%)
 rename {htdocs => public}/langs/th_TH/products.lang (100%)
 rename {htdocs => public}/langs/th_TH/projects.lang (100%)
 rename {htdocs => public}/langs/th_TH/propal.lang (100%)
 rename {htdocs => public}/langs/th_TH/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/th_TH/resource.lang (100%)
 rename {htdocs => public}/langs/th_TH/salaries.lang (100%)
 rename {htdocs => public}/langs/th_TH/sendings.lang (100%)
 rename {htdocs => public}/langs/th_TH/sms.lang (100%)
 rename {htdocs => public}/langs/th_TH/stocks.lang (100%)
 rename {htdocs => public}/langs/th_TH/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/th_TH/suppliers.lang (100%)
 rename {htdocs => public}/langs/th_TH/trips.lang (100%)
 rename {htdocs => public}/langs/th_TH/users.lang (100%)
 rename {htdocs => public}/langs/th_TH/website.lang (100%)
 rename {htdocs => public}/langs/th_TH/withdrawals.lang (100%)
 rename {htdocs => public}/langs/th_TH/workflow.lang (100%)
 rename {htdocs => public}/langs/tr_TR/accountancy.lang (100%)
 rename {htdocs => public}/langs/tr_TR/admin.lang (100%)
 rename {htdocs => public}/langs/tr_TR/agenda.lang (100%)
 rename {htdocs => public}/langs/tr_TR/banks.lang (100%)
 rename {htdocs => public}/langs/tr_TR/bills.lang (100%)
 rename {htdocs => public}/langs/tr_TR/bookmarks.lang (100%)
 rename {htdocs => public}/langs/tr_TR/boxes.lang (100%)
 rename {htdocs => public}/langs/tr_TR/cashdesk.lang (100%)
 rename {htdocs => public}/langs/tr_TR/categories.lang (100%)
 rename {htdocs => public}/langs/tr_TR/commercial.lang (100%)
 rename {htdocs => public}/langs/tr_TR/commissions.lang (100%)
 rename {htdocs => public}/langs/tr_TR/companies.lang (100%)
 rename {htdocs => public}/langs/tr_TR/compta.lang (100%)
 rename {htdocs => public}/langs/tr_TR/contracts.lang (100%)
 rename {htdocs => public}/langs/tr_TR/cron.lang (100%)
 rename {htdocs => public}/langs/tr_TR/deliveries.lang (100%)
 rename {htdocs => public}/langs/tr_TR/dict.lang (100%)
 rename {htdocs => public}/langs/tr_TR/donations.lang (100%)
 rename {htdocs => public}/langs/tr_TR/ecm.lang (100%)
 rename {htdocs => public}/langs/tr_TR/errors.lang (100%)
 rename {htdocs => public}/langs/tr_TR/exports.lang (100%)
 rename {htdocs => public}/langs/tr_TR/externalsite.lang (100%)
 rename {htdocs => public}/langs/tr_TR/ftp.lang (100%)
 rename {htdocs => public}/langs/tr_TR/help.lang (100%)
 rename {htdocs => public}/langs/tr_TR/holiday.lang (100%)
 rename {htdocs => public}/langs/tr_TR/hrm.lang (100%)
 rename {htdocs => public}/langs/tr_TR/incoterm.lang (100%)
 rename {htdocs => public}/langs/tr_TR/install.lang (100%)
 rename {htdocs => public}/langs/tr_TR/interventions.lang (100%)
 rename {htdocs => public}/langs/tr_TR/languages.lang (100%)
 rename {htdocs => public}/langs/tr_TR/ldap.lang (100%)
 rename {htdocs => public}/langs/tr_TR/link.lang (100%)
 rename {htdocs => public}/langs/tr_TR/loan.lang (100%)
 rename {htdocs => public}/langs/tr_TR/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/tr_TR/mails.lang (100%)
 rename {htdocs => public}/langs/tr_TR/main.lang (100%)
 rename {htdocs => public}/langs/tr_TR/margins.lang (100%)
 rename {htdocs => public}/langs/tr_TR/members.lang (100%)
 rename {htdocs => public}/langs/tr_TR/oauth.lang (100%)
 rename {htdocs => public}/langs/tr_TR/opensurvey.lang (100%)
 rename {htdocs => public}/langs/tr_TR/orders.lang (100%)
 rename {htdocs => public}/langs/tr_TR/other.lang (100%)
 rename {htdocs => public}/langs/tr_TR/paybox.lang (100%)
 rename {htdocs => public}/langs/tr_TR/paypal.lang (100%)
 rename {htdocs => public}/langs/tr_TR/printing.lang (100%)
 rename {htdocs => public}/langs/tr_TR/productbatch.lang (100%)
 rename {htdocs => public}/langs/tr_TR/products.lang (100%)
 rename {htdocs => public}/langs/tr_TR/projects.lang (100%)
 rename {htdocs => public}/langs/tr_TR/propal.lang (100%)
 rename {htdocs => public}/langs/tr_TR/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/tr_TR/resource.lang (100%)
 rename {htdocs => public}/langs/tr_TR/salaries.lang (100%)
 rename {htdocs => public}/langs/tr_TR/sendings.lang (100%)
 rename {htdocs => public}/langs/tr_TR/sms.lang (100%)
 rename {htdocs => public}/langs/tr_TR/stocks.lang (100%)
 rename {htdocs => public}/langs/tr_TR/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/tr_TR/suppliers.lang (100%)
 rename {htdocs => public}/langs/tr_TR/trips.lang (100%)
 rename {htdocs => public}/langs/tr_TR/users.lang (100%)
 rename {htdocs => public}/langs/tr_TR/website.lang (100%)
 rename {htdocs => public}/langs/tr_TR/withdrawals.lang (100%)
 rename {htdocs => public}/langs/tr_TR/workflow.lang (100%)
 rename {htdocs => public}/langs/uk_UA/accountancy.lang (100%)
 rename {htdocs => public}/langs/uk_UA/admin.lang (100%)
 rename {htdocs => public}/langs/uk_UA/agenda.lang (100%)
 rename {htdocs => public}/langs/uk_UA/banks.lang (100%)
 rename {htdocs => public}/langs/uk_UA/bills.lang (100%)
 rename {htdocs => public}/langs/uk_UA/bookmarks.lang (100%)
 rename {htdocs => public}/langs/uk_UA/boxes.lang (100%)
 rename {htdocs => public}/langs/uk_UA/cashdesk.lang (100%)
 rename {htdocs => public}/langs/uk_UA/categories.lang (100%)
 rename {htdocs => public}/langs/uk_UA/commercial.lang (100%)
 rename {htdocs => public}/langs/uk_UA/companies.lang (100%)
 rename {htdocs => public}/langs/uk_UA/compta.lang (100%)
 rename {htdocs => public}/langs/uk_UA/contracts.lang (100%)
 rename {htdocs => public}/langs/uk_UA/cron.lang (100%)
 rename {htdocs => public}/langs/uk_UA/deliveries.lang (100%)
 rename {htdocs => public}/langs/uk_UA/dict.lang (100%)
 rename {htdocs => public}/langs/uk_UA/donations.lang (100%)
 rename {htdocs => public}/langs/uk_UA/ecm.lang (100%)
 rename {htdocs => public}/langs/uk_UA/errors.lang (100%)
 rename {htdocs => public}/langs/uk_UA/exports.lang (100%)
 rename {htdocs => public}/langs/uk_UA/externalsite.lang (100%)
 rename {htdocs => public}/langs/uk_UA/ftp.lang (100%)
 rename {htdocs => public}/langs/uk_UA/help.lang (100%)
 rename {htdocs => public}/langs/uk_UA/holiday.lang (100%)
 rename {htdocs => public}/langs/uk_UA/hrm.lang (100%)
 rename {htdocs => public}/langs/uk_UA/incoterm.lang (100%)
 rename {htdocs => public}/langs/uk_UA/install.lang (100%)
 rename {htdocs => public}/langs/uk_UA/interventions.lang (100%)
 rename {htdocs => public}/langs/uk_UA/languages.lang (100%)
 rename {htdocs => public}/langs/uk_UA/ldap.lang (100%)
 rename {htdocs => public}/langs/uk_UA/link.lang (100%)
 rename {htdocs => public}/langs/uk_UA/loan.lang (100%)
 rename {htdocs => public}/langs/uk_UA/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/uk_UA/mails.lang (100%)
 rename {htdocs => public}/langs/uk_UA/main.lang (100%)
 rename {htdocs => public}/langs/uk_UA/margins.lang (100%)
 rename {htdocs => public}/langs/uk_UA/members.lang (100%)
 rename {htdocs => public}/langs/uk_UA/oauth.lang (100%)
 rename {htdocs => public}/langs/uk_UA/opensurvey.lang (100%)
 rename {htdocs => public}/langs/uk_UA/orders.lang (100%)
 rename {htdocs => public}/langs/uk_UA/other.lang (100%)
 rename {htdocs => public}/langs/uk_UA/paybox.lang (100%)
 rename {htdocs => public}/langs/uk_UA/paypal.lang (100%)
 rename {htdocs => public}/langs/uk_UA/printing.lang (100%)
 rename {htdocs => public}/langs/uk_UA/productbatch.lang (100%)
 rename {htdocs => public}/langs/uk_UA/products.lang (100%)
 rename {htdocs => public}/langs/uk_UA/projects.lang (100%)
 rename {htdocs => public}/langs/uk_UA/propal.lang (100%)
 rename {htdocs => public}/langs/uk_UA/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/uk_UA/resource.lang (100%)
 rename {htdocs => public}/langs/uk_UA/salaries.lang (100%)
 rename {htdocs => public}/langs/uk_UA/sendings.lang (100%)
 rename {htdocs => public}/langs/uk_UA/sms.lang (100%)
 rename {htdocs => public}/langs/uk_UA/stocks.lang (100%)
 rename {htdocs => public}/langs/uk_UA/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/uk_UA/suppliers.lang (100%)
 rename {htdocs => public}/langs/uk_UA/trips.lang (100%)
 rename {htdocs => public}/langs/uk_UA/users.lang (100%)
 rename {htdocs => public}/langs/uk_UA/website.lang (100%)
 rename {htdocs => public}/langs/uk_UA/withdrawals.lang (100%)
 rename {htdocs => public}/langs/uk_UA/workflow.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/accountancy.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/admin.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/agenda.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/banks.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/bills.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/bookmarks.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/boxes.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/cashdesk.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/categories.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/commercial.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/companies.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/compta.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/contracts.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/cron.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/deliveries.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/dict.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/donations.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/ecm.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/errors.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/exports.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/externalsite.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/ftp.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/help.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/holiday.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/incoterm.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/install.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/interventions.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/languages.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/ldap.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/link.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/loan.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/mails.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/main.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/margins.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/members.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/opensurvey.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/orders.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/other.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/paybox.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/paypal.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/printing.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/productbatch.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/products.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/projects.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/propal.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/resource.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/salaries.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/sendings.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/sms.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/stocks.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/suppliers.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/trips.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/users.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/withdrawals.lang (100%)
 rename {htdocs => public}/langs/uz_UZ/workflow.lang (100%)
 rename {htdocs => public}/langs/vi_VN/accountancy.lang (100%)
 rename {htdocs => public}/langs/vi_VN/admin.lang (100%)
 rename {htdocs => public}/langs/vi_VN/agenda.lang (100%)
 rename {htdocs => public}/langs/vi_VN/banks.lang (100%)
 rename {htdocs => public}/langs/vi_VN/bills.lang (100%)
 rename {htdocs => public}/langs/vi_VN/bookmarks.lang (100%)
 rename {htdocs => public}/langs/vi_VN/boxes.lang (100%)
 rename {htdocs => public}/langs/vi_VN/cashdesk.lang (100%)
 rename {htdocs => public}/langs/vi_VN/categories.lang (100%)
 rename {htdocs => public}/langs/vi_VN/commercial.lang (100%)
 rename {htdocs => public}/langs/vi_VN/companies.lang (100%)
 rename {htdocs => public}/langs/vi_VN/compta.lang (100%)
 rename {htdocs => public}/langs/vi_VN/contracts.lang (100%)
 rename {htdocs => public}/langs/vi_VN/cron.lang (100%)
 rename {htdocs => public}/langs/vi_VN/deliveries.lang (100%)
 rename {htdocs => public}/langs/vi_VN/dict.lang (100%)
 rename {htdocs => public}/langs/vi_VN/donations.lang (100%)
 rename {htdocs => public}/langs/vi_VN/ecm.lang (100%)
 rename {htdocs => public}/langs/vi_VN/errors.lang (100%)
 rename {htdocs => public}/langs/vi_VN/exports.lang (100%)
 rename {htdocs => public}/langs/vi_VN/externalsite.lang (100%)
 rename {htdocs => public}/langs/vi_VN/ftp.lang (100%)
 rename {htdocs => public}/langs/vi_VN/help.lang (100%)
 rename {htdocs => public}/langs/vi_VN/holiday.lang (100%)
 rename {htdocs => public}/langs/vi_VN/hrm.lang (100%)
 rename {htdocs => public}/langs/vi_VN/incoterm.lang (100%)
 rename {htdocs => public}/langs/vi_VN/install.lang (100%)
 rename {htdocs => public}/langs/vi_VN/interventions.lang (100%)
 rename {htdocs => public}/langs/vi_VN/languages.lang (100%)
 rename {htdocs => public}/langs/vi_VN/ldap.lang (100%)
 rename {htdocs => public}/langs/vi_VN/link.lang (100%)
 rename {htdocs => public}/langs/vi_VN/loan.lang (100%)
 rename {htdocs => public}/langs/vi_VN/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/vi_VN/mails.lang (100%)
 rename {htdocs => public}/langs/vi_VN/main.lang (100%)
 rename {htdocs => public}/langs/vi_VN/margins.lang (100%)
 rename {htdocs => public}/langs/vi_VN/members.lang (100%)
 rename {htdocs => public}/langs/vi_VN/oauth.lang (100%)
 rename {htdocs => public}/langs/vi_VN/opensurvey.lang (100%)
 rename {htdocs => public}/langs/vi_VN/orders.lang (100%)
 rename {htdocs => public}/langs/vi_VN/other.lang (100%)
 rename {htdocs => public}/langs/vi_VN/paybox.lang (100%)
 rename {htdocs => public}/langs/vi_VN/paypal.lang (100%)
 rename {htdocs => public}/langs/vi_VN/printing.lang (100%)
 rename {htdocs => public}/langs/vi_VN/productbatch.lang (100%)
 rename {htdocs => public}/langs/vi_VN/products.lang (100%)
 rename {htdocs => public}/langs/vi_VN/projects.lang (100%)
 rename {htdocs => public}/langs/vi_VN/propal.lang (100%)
 rename {htdocs => public}/langs/vi_VN/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/vi_VN/resource.lang (100%)
 rename {htdocs => public}/langs/vi_VN/salaries.lang (100%)
 rename {htdocs => public}/langs/vi_VN/sendings.lang (100%)
 rename {htdocs => public}/langs/vi_VN/sms.lang (100%)
 rename {htdocs => public}/langs/vi_VN/stocks.lang (100%)
 rename {htdocs => public}/langs/vi_VN/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/vi_VN/suppliers.lang (100%)
 rename {htdocs => public}/langs/vi_VN/trips.lang (100%)
 rename {htdocs => public}/langs/vi_VN/users.lang (100%)
 rename {htdocs => public}/langs/vi_VN/website.lang (100%)
 rename {htdocs => public}/langs/vi_VN/withdrawals.lang (100%)
 rename {htdocs => public}/langs/vi_VN/workflow.lang (100%)
 rename {htdocs => public}/langs/zh_CN/accountancy.lang (100%)
 rename {htdocs => public}/langs/zh_CN/admin.lang (100%)
 rename {htdocs => public}/langs/zh_CN/agenda.lang (100%)
 rename {htdocs => public}/langs/zh_CN/banks.lang (100%)
 rename {htdocs => public}/langs/zh_CN/bills.lang (100%)
 rename {htdocs => public}/langs/zh_CN/bookmarks.lang (100%)
 rename {htdocs => public}/langs/zh_CN/boxes.lang (100%)
 rename {htdocs => public}/langs/zh_CN/cashdesk.lang (100%)
 rename {htdocs => public}/langs/zh_CN/categories.lang (100%)
 rename {htdocs => public}/langs/zh_CN/commercial.lang (100%)
 rename {htdocs => public}/langs/zh_CN/companies.lang (100%)
 rename {htdocs => public}/langs/zh_CN/compta.lang (100%)
 rename {htdocs => public}/langs/zh_CN/contracts.lang (100%)
 rename {htdocs => public}/langs/zh_CN/cron.lang (100%)
 rename {htdocs => public}/langs/zh_CN/deliveries.lang (100%)
 rename {htdocs => public}/langs/zh_CN/dict.lang (100%)
 rename {htdocs => public}/langs/zh_CN/donations.lang (100%)
 rename {htdocs => public}/langs/zh_CN/ecm.lang (100%)
 rename {htdocs => public}/langs/zh_CN/errors.lang (100%)
 rename {htdocs => public}/langs/zh_CN/exports.lang (100%)
 rename {htdocs => public}/langs/zh_CN/externalsite.lang (100%)
 rename {htdocs => public}/langs/zh_CN/ftp.lang (100%)
 rename {htdocs => public}/langs/zh_CN/help.lang (100%)
 rename {htdocs => public}/langs/zh_CN/holiday.lang (100%)
 rename {htdocs => public}/langs/zh_CN/hrm.lang (100%)
 rename {htdocs => public}/langs/zh_CN/incoterm.lang (100%)
 rename {htdocs => public}/langs/zh_CN/install.lang (100%)
 rename {htdocs => public}/langs/zh_CN/interventions.lang (100%)
 rename {htdocs => public}/langs/zh_CN/languages.lang (100%)
 rename {htdocs => public}/langs/zh_CN/ldap.lang (100%)
 rename {htdocs => public}/langs/zh_CN/link.lang (100%)
 rename {htdocs => public}/langs/zh_CN/loan.lang (100%)
 rename {htdocs => public}/langs/zh_CN/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/zh_CN/mails.lang (100%)
 rename {htdocs => public}/langs/zh_CN/main.lang (100%)
 rename {htdocs => public}/langs/zh_CN/margins.lang (100%)
 rename {htdocs => public}/langs/zh_CN/members.lang (100%)
 rename {htdocs => public}/langs/zh_CN/oauth.lang (100%)
 rename {htdocs => public}/langs/zh_CN/opensurvey.lang (100%)
 rename {htdocs => public}/langs/zh_CN/orders.lang (100%)
 rename {htdocs => public}/langs/zh_CN/other.lang (100%)
 rename {htdocs => public}/langs/zh_CN/paybox.lang (100%)
 rename {htdocs => public}/langs/zh_CN/paypal.lang (100%)
 rename {htdocs => public}/langs/zh_CN/printing.lang (100%)
 rename {htdocs => public}/langs/zh_CN/productbatch.lang (100%)
 rename {htdocs => public}/langs/zh_CN/products.lang (100%)
 rename {htdocs => public}/langs/zh_CN/projects.lang (100%)
 rename {htdocs => public}/langs/zh_CN/propal.lang (100%)
 rename {htdocs => public}/langs/zh_CN/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/zh_CN/resource.lang (100%)
 rename {htdocs => public}/langs/zh_CN/salaries.lang (100%)
 rename {htdocs => public}/langs/zh_CN/sendings.lang (100%)
 rename {htdocs => public}/langs/zh_CN/sms.lang (100%)
 rename {htdocs => public}/langs/zh_CN/stocks.lang (100%)
 rename {htdocs => public}/langs/zh_CN/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/zh_CN/suppliers.lang (100%)
 rename {htdocs => public}/langs/zh_CN/trips.lang (100%)
 rename {htdocs => public}/langs/zh_CN/users.lang (100%)
 rename {htdocs => public}/langs/zh_CN/website.lang (100%)
 rename {htdocs => public}/langs/zh_CN/withdrawals.lang (100%)
 rename {htdocs => public}/langs/zh_CN/workflow.lang (100%)
 rename {htdocs => public}/langs/zh_TW/accountancy.lang (100%)
 rename {htdocs => public}/langs/zh_TW/admin.lang (100%)
 rename {htdocs => public}/langs/zh_TW/agenda.lang (100%)
 rename {htdocs => public}/langs/zh_TW/banks.lang (100%)
 rename {htdocs => public}/langs/zh_TW/bills.lang (100%)
 rename {htdocs => public}/langs/zh_TW/bookmarks.lang (100%)
 rename {htdocs => public}/langs/zh_TW/boxes.lang (100%)
 rename {htdocs => public}/langs/zh_TW/cashdesk.lang (100%)
 rename {htdocs => public}/langs/zh_TW/categories.lang (100%)
 rename {htdocs => public}/langs/zh_TW/commercial.lang (100%)
 rename {htdocs => public}/langs/zh_TW/companies.lang (100%)
 rename {htdocs => public}/langs/zh_TW/compta.lang (100%)
 rename {htdocs => public}/langs/zh_TW/contracts.lang (100%)
 rename {htdocs => public}/langs/zh_TW/cron.lang (100%)
 rename {htdocs => public}/langs/zh_TW/deliveries.lang (100%)
 rename {htdocs => public}/langs/zh_TW/dict.lang (100%)
 rename {htdocs => public}/langs/zh_TW/donations.lang (100%)
 rename {htdocs => public}/langs/zh_TW/ecm.lang (100%)
 rename {htdocs => public}/langs/zh_TW/errors.lang (100%)
 rename {htdocs => public}/langs/zh_TW/exports.lang (100%)
 rename {htdocs => public}/langs/zh_TW/externalsite.lang (100%)
 rename {htdocs => public}/langs/zh_TW/ftp.lang (100%)
 rename {htdocs => public}/langs/zh_TW/help.lang (100%)
 rename {htdocs => public}/langs/zh_TW/holiday.lang (100%)
 rename {htdocs => public}/langs/zh_TW/hrm.lang (100%)
 rename {htdocs => public}/langs/zh_TW/incoterm.lang (100%)
 rename {htdocs => public}/langs/zh_TW/install.lang (100%)
 rename {htdocs => public}/langs/zh_TW/interventions.lang (100%)
 rename {htdocs => public}/langs/zh_TW/languages.lang (100%)
 rename {htdocs => public}/langs/zh_TW/ldap.lang (100%)
 rename {htdocs => public}/langs/zh_TW/link.lang (100%)
 rename {htdocs => public}/langs/zh_TW/loan.lang (100%)
 rename {htdocs => public}/langs/zh_TW/mailmanspip.lang (100%)
 rename {htdocs => public}/langs/zh_TW/mails.lang (100%)
 rename {htdocs => public}/langs/zh_TW/main.lang (100%)
 rename {htdocs => public}/langs/zh_TW/margins.lang (100%)
 rename {htdocs => public}/langs/zh_TW/members.lang (100%)
 rename {htdocs => public}/langs/zh_TW/oauth.lang (100%)
 rename {htdocs => public}/langs/zh_TW/opensurvey.lang (100%)
 rename {htdocs => public}/langs/zh_TW/orders.lang (100%)
 rename {htdocs => public}/langs/zh_TW/other.lang (100%)
 rename {htdocs => public}/langs/zh_TW/paybox.lang (100%)
 rename {htdocs => public}/langs/zh_TW/paypal.lang (100%)
 rename {htdocs => public}/langs/zh_TW/printing.lang (100%)
 rename {htdocs => public}/langs/zh_TW/productbatch.lang (100%)
 rename {htdocs => public}/langs/zh_TW/products.lang (100%)
 rename {htdocs => public}/langs/zh_TW/projects.lang (100%)
 rename {htdocs => public}/langs/zh_TW/propal.lang (100%)
 rename {htdocs => public}/langs/zh_TW/receiptprinter.lang (100%)
 rename {htdocs => public}/langs/zh_TW/resource.lang (100%)
 rename {htdocs => public}/langs/zh_TW/salaries.lang (100%)
 rename {htdocs => public}/langs/zh_TW/sendings.lang (100%)
 rename {htdocs => public}/langs/zh_TW/sms.lang (100%)
 rename {htdocs => public}/langs/zh_TW/stocks.lang (100%)
 rename {htdocs => public}/langs/zh_TW/supplier_proposal.lang (100%)
 rename {htdocs => public}/langs/zh_TW/suppliers.lang (100%)
 rename {htdocs => public}/langs/zh_TW/trips.lang (100%)
 rename {htdocs => public}/langs/zh_TW/users.lang (100%)
 rename {htdocs => public}/langs/zh_TW/website.lang (100%)
 rename {htdocs => public}/langs/zh_TW/withdrawals.lang (100%)
 rename {htdocs => public}/langs/zh_TW/workflow.lang (100%)
 rename {htdocs => public}/livraison/card.php (100%)
 rename {htdocs => public}/livraison/class/index.html (100%)
 rename {htdocs => public}/livraison/class/livraison.class.php (100%)
 rename {htdocs => public}/livraison/index.html (100%)
 rename {htdocs => public}/loan/calc.php (100%)
 rename {htdocs => public}/loan/card.php (100%)
 rename {htdocs => public}/loan/class/index.html (100%)
 rename {htdocs => public}/loan/class/loan.class.php (100%)
 rename {htdocs => public}/loan/class/paymentloan.class.php (100%)
 rename {htdocs => public}/loan/document.php (100%)
 rename {htdocs => public}/loan/index.html (100%)
 rename {htdocs => public}/loan/index.php (100%)
 rename {htdocs => public}/loan/info.php (100%)
 rename {htdocs => public}/loan/note.php (100%)
 rename {htdocs => public}/loan/payment/card.php (100%)
 rename {htdocs => public}/loan/payment/index.html (100%)
 rename {htdocs => public}/loan/payment/payment.php (100%)
 rename {htdocs => public}/mailmanspip/class/index.html (100%)
 rename {htdocs => public}/mailmanspip/class/mailmanspip.class.php (100%)
 rename {htdocs => public}/mailmanspip/index.html (100%)
 rename {htdocs => public}/main.inc.php (100%)
 rename {htdocs => public}/margin/admin/index.html (100%)
 rename {htdocs => public}/margin/admin/margin.php (100%)
 rename {htdocs => public}/margin/agentMargins.php (100%)
 rename {htdocs => public}/margin/checkMargins.php (100%)
 rename {htdocs => public}/margin/customerMargins.php (100%)
 rename {htdocs => public}/margin/index.php (100%)
 rename {htdocs => public}/margin/lib/index.html (100%)
 rename {htdocs => public}/margin/lib/margins.lib.php (100%)
 rename {htdocs => public}/margin/productMargins.php (100%)
 rename {htdocs => public}/margin/tabs/index.html (100%)
 rename {htdocs => public}/margin/tabs/productMargins.php (100%)
 rename {htdocs => public}/margin/tabs/thirdpartyMargins.php (100%)
 rename {htdocs => public}/master.inc.php (100%)
 rename {htdocs => public}/multicurrency/class/multicurrency.class.php (100%)
 rename {htdocs => public}/opensurvey/card.php (100%)
 rename {htdocs => public}/opensurvey/class/index.html (100%)
 rename {htdocs => public}/opensurvey/class/opensurveysondage.class.php (100%)
 rename {htdocs => public}/opensurvey/css/index.html (100%)
 rename {htdocs => public}/opensurvey/css/style.css (100%)
 rename {htdocs => public}/opensurvey/exportcsv.php (100%)
 rename {htdocs => public}/opensurvey/fonctions.php (100%)
 rename {htdocs => public}/opensurvey/img/accept-24.png (100%)
 rename {htdocs => public}/opensurvey/img/accept.png (100%)
 rename {htdocs => public}/opensurvey/img/add-16.png (100%)
 rename {htdocs => public}/opensurvey/img/add-24.png (100%)
 rename {htdocs => public}/opensurvey/img/calendar-32.png (100%)
 rename {htdocs => public}/opensurvey/img/chart-32.png (100%)
 rename {htdocs => public}/opensurvey/img/date.png (100%)
 rename {htdocs => public}/opensurvey/img/fforward.png (100%)
 rename {htdocs => public}/opensurvey/img/index.html (100%)
 rename {htdocs => public}/opensurvey/img/medaille.png (100%)
 rename {htdocs => public}/opensurvey/img/next.png (100%)
 rename {htdocs => public}/opensurvey/img/object_opensurvey.png (100%)
 rename {htdocs => public}/opensurvey/img/opensurvey.png (100%)
 rename {htdocs => public}/opensurvey/img/previous.png (100%)
 rename {htdocs => public}/opensurvey/img/rewind.png (100%)
 rename {htdocs => public}/opensurvey/img/sondage2.png (100%)
 rename {htdocs => public}/opensurvey/index.php (100%)
 rename {htdocs => public}/opensurvey/list.php (100%)
 rename {htdocs => public}/opensurvey/results.php (100%)
 rename {htdocs => public}/opensurvey/wizard/choix_autre.php (100%)
 rename {htdocs => public}/opensurvey/wizard/choix_date.php (100%)
 rename {htdocs => public}/opensurvey/wizard/create_survey.php (100%)
 rename {htdocs => public}/opensurvey/wizard/index.php (100%)
 rename {htdocs => public}/paybox/admin/index.html (100%)
 rename {htdocs => public}/paybox/admin/paybox.php (100%)
 rename {htdocs => public}/paybox/img/index.html (100%)
 rename {htdocs => public}/paybox/img/object_paybox.png (100%)
 rename {htdocs => public}/paybox/index.html (100%)
 rename {htdocs => public}/paybox/lib/index.html (100%)
 rename {htdocs => public}/paybox/lib/paybox.lib.php (100%)
 rename {htdocs => public}/paypal/admin/index.html (100%)
 rename {htdocs => public}/paypal/admin/paypal.php (100%)
 rename {htdocs => public}/paypal/img/index.html (100%)
 rename {htdocs => public}/paypal/img/object_paypal.png (100%)
 rename {htdocs => public}/paypal/index.html (100%)
 rename {htdocs => public}/paypal/lib/index.html (100%)
 rename {htdocs => public}/paypal/lib/paypal.lib.php (100%)
 rename {htdocs => public}/paypal/lib/paypalfunctions.lib.php (100%)
 rename {htdocs => public}/printing/admin/index.html (100%)
 rename {htdocs => public}/printing/admin/printing.php (100%)
 rename {htdocs => public}/printing/index.php (100%)
 rename {htdocs => public}/printing/lib/index.html (100%)
 rename {htdocs => public}/printing/lib/printing.lib.php (100%)
 rename {htdocs => public}/product/admin/dynamic_prices.php (100%)
 rename {htdocs => public}/product/admin/index.html (100%)
 rename {htdocs => public}/product/admin/price_rules.php (100%)
 rename {htdocs => public}/product/admin/product.php (100%)
 rename {htdocs => public}/product/admin/product_extrafields.php (100%)
 rename {htdocs => public}/product/admin/product_lot_extrafields.php (100%)
 rename {htdocs => public}/product/admin/product_tools.php (100%)
 rename {htdocs => public}/product/ajax/index.html (100%)
 rename {htdocs => public}/product/ajax/products.php (100%)
 rename {htdocs => public}/product/canvas/index.html (100%)
 rename {htdocs => public}/product/canvas/product/actions_card_product.class.php (100%)
 rename {htdocs => public}/product/canvas/product/index.html (100%)
 rename {htdocs => public}/product/canvas/product/tpl/card_create.tpl.php (100%)
 rename {htdocs => public}/product/canvas/product/tpl/card_edit.tpl.php (100%)
 rename {htdocs => public}/product/canvas/product/tpl/card_view.tpl.php (100%)
 rename {htdocs => public}/product/canvas/product/tpl/index.html (100%)
 rename {htdocs => public}/product/canvas/product/tpl/list.tpl.php (100%)
 rename {htdocs => public}/product/canvas/service/actions_card_service.class.php (100%)
 rename {htdocs => public}/product/canvas/service/index.html (100%)
 rename {htdocs => public}/product/canvas/service/tpl/card_create.tpl.php (100%)
 rename {htdocs => public}/product/canvas/service/tpl/card_edit.tpl.php (100%)
 rename {htdocs => public}/product/canvas/service/tpl/card_view.tpl.php (100%)
 rename {htdocs => public}/product/canvas/service/tpl/index.html (100%)
 rename {htdocs => public}/product/canvas/service/tpl/list.tpl.php (100%)
 rename {htdocs => public}/product/card.php (100%)
 rename {htdocs => public}/product/class/api_deprecated_product.class.php (100%)
 rename {htdocs => public}/product/class/api_products.class.php (100%)
 rename {htdocs => public}/product/class/html.formproduct.class.php (100%)
 rename {htdocs => public}/product/class/index.html (100%)
 rename {htdocs => public}/product/class/product.class.php (100%)
 rename {htdocs => public}/product/class/productbatch.class.php (100%)
 rename {htdocs => public}/product/class/productcustomerprice.class.php (100%)
 rename {htdocs => public}/product/class/propalmergepdfproduct.class.php (100%)
 rename {htdocs => public}/product/class/service.class.php (100%)
 rename {htdocs => public}/product/composition/card.php (100%)
 rename {htdocs => public}/product/composition/index.html (100%)
 rename {htdocs => public}/product/document.php (100%)
 rename {htdocs => public}/product/dynamic_price/class/price_expression.class.php (100%)
 rename {htdocs => public}/product/dynamic_price/class/price_global_variable.class.php (100%)
 rename {htdocs => public}/product/dynamic_price/class/price_global_variable_updater.class.php (100%)
 rename {htdocs => public}/product/dynamic_price/class/price_parser.class.php (100%)
 rename {htdocs => public}/product/dynamic_price/editor.php (100%)
 rename {htdocs => public}/product/fournisseurs.php (100%)
 rename {htdocs => public}/product/index.php (100%)
 rename {htdocs => public}/product/info.php (100%)
 rename {htdocs => public}/product/list.php (100%)
 rename {htdocs => public}/product/note.php (100%)
 rename {htdocs => public}/product/popuprop.php (100%)
 rename {htdocs => public}/product/price.php (100%)
 rename {htdocs => public}/product/reassort.php (100%)
 rename {htdocs => public}/product/reassortlot.php (100%)
 rename {htdocs => public}/product/stats/card.php (100%)
 rename {htdocs => public}/product/stats/commande.php (100%)
 rename {htdocs => public}/product/stats/commande_fournisseur.php (100%)
 rename {htdocs => public}/product/stats/contrat.php (100%)
 rename {htdocs => public}/product/stats/facture.php (100%)
 rename {htdocs => public}/product/stats/facture_fournisseur.php (100%)
 rename {htdocs => public}/product/stats/index.html (100%)
 rename {htdocs => public}/product/stats/propal.php (100%)
 rename {htdocs => public}/product/stock/card.php (100%)
 rename {htdocs => public}/product/stock/class/api_stockmovements.class.php (100%)
 rename {htdocs => public}/product/stock/class/api_warehouses.class.php (100%)
 rename {htdocs => public}/product/stock/class/entrepot.class.php (100%)
 rename {htdocs => public}/product/stock/class/index.html (100%)
 rename {htdocs => public}/product/stock/class/mouvementstock.class.php (100%)
 rename {htdocs => public}/product/stock/class/productlot.class.php (100%)
 rename {htdocs => public}/product/stock/class/productstockentrepot.class.php (100%)
 rename {htdocs => public}/product/stock/fiche-valo.php (100%)
 rename {htdocs => public}/product/stock/img/index.html (100%)
 rename {htdocs => public}/product/stock/img/no.png (100%)
 rename {htdocs => public}/product/stock/img/yes.png (100%)
 rename {htdocs => public}/product/stock/index.php (100%)
 rename {htdocs => public}/product/stock/info.php (100%)
 rename {htdocs => public}/product/stock/lib/index.html (100%)
 rename {htdocs => public}/product/stock/lib/replenishment.lib.php (100%)
 rename {htdocs => public}/product/stock/list.php (100%)
 rename {htdocs => public}/product/stock/massstockmove.php (100%)
 rename {htdocs => public}/product/stock/mouvement.php (100%)
 rename {htdocs => public}/product/stock/product.php (100%)
 rename {htdocs => public}/product/stock/productlot_card.php (100%)
 rename {htdocs => public}/product/stock/productlot_list.php (100%)
 rename {htdocs => public}/product/stock/replenish.php (100%)
 rename {htdocs => public}/product/stock/replenishorders.php (100%)
 rename {htdocs => public}/product/stock/tpl/stockcorrection.tpl.php (100%)
 rename {htdocs => public}/product/stock/tpl/stocktransfer.tpl.php (100%)
 rename {htdocs => public}/product/stock/valo.php (100%)
 rename {htdocs => public}/product/traduction.php (100%)
 rename {htdocs => public}/projet/activity/index.php (100%)
 rename {htdocs => public}/projet/activity/perday.php (100%)
 rename {htdocs => public}/projet/activity/perweek.php (100%)
 rename {htdocs => public}/projet/admin/index.html (100%)
 rename {htdocs => public}/projet/admin/project.php (100%)
 rename {htdocs => public}/projet/admin/project_extrafields.php (100%)
 rename {htdocs => public}/projet/admin/project_task_extrafields.php (100%)
 rename {htdocs => public}/projet/ajax/projects.php (100%)
 rename {htdocs => public}/projet/card.php (100%)
 rename {htdocs => public}/projet/class/api_projects.class.php (100%)
 rename {htdocs => public}/projet/class/api_tasks.class.php (100%)
 rename {htdocs => public}/projet/class/index.html (100%)
 rename {htdocs => public}/projet/class/project.class.php (100%)
 rename {htdocs => public}/projet/class/projectstats.class.php (100%)
 rename {htdocs => public}/projet/class/task.class.php (100%)
 rename {htdocs => public}/projet/contact.php (100%)
 rename {htdocs => public}/projet/document.php (100%)
 rename {htdocs => public}/projet/element.php (100%)
 rename {htdocs => public}/projet/ganttchart.inc.php (100%)
 rename {htdocs => public}/projet/ganttview.php (100%)
 rename {htdocs => public}/projet/graph_opportunities.inc.php (100%)
 rename {htdocs => public}/projet/index.php (100%)
 rename {htdocs => public}/projet/info.php (100%)
 rename {htdocs => public}/projet/jsgantt_language.js.php (100%)
 rename {htdocs => public}/projet/list.php (100%)
 rename {htdocs => public}/projet/note.php (100%)
 rename {htdocs => public}/projet/stats/index.php (100%)
 rename {htdocs => public}/projet/tasks.php (100%)
 rename {htdocs => public}/projet/tasks/contact.php (100%)
 rename {htdocs => public}/projet/tasks/document.php (100%)
 rename {htdocs => public}/projet/tasks/list.php (100%)
 rename {htdocs => public}/projet/tasks/note.php (100%)
 rename {htdocs => public}/projet/tasks/task.php (100%)
 rename {htdocs => public}/projet/tasks/time.php (100%)
 rename {htdocs => public}/public/agenda/agendaexport.php (100%)
 rename {htdocs => public}/public/agenda/index.php (100%)
 rename {htdocs => public}/public/cron/cron_run_jobs.php (100%)
 rename {htdocs => public}/public/cron/index.html (100%)
 rename {htdocs => public}/public/demo/dolibarr_screenshot2.png (100%)
 rename {htdocs => public}/public/demo/dolibarr_screenshot6.png (100%)
 rename {htdocs => public}/public/demo/dolibarr_screenshot8.png (100%)
 rename {htdocs => public}/public/demo/dolibarr_screenshot9.png (100%)
 rename {htdocs => public}/public/demo/index.php (100%)
 rename {htdocs => public}/public/donations/donateurs_code.php (100%)
 rename {htdocs => public}/public/donations/index.php (100%)
 rename {htdocs => public}/public/emailing/index.html (100%)
 rename {htdocs => public}/public/emailing/mailing-read.php (100%)
 rename {htdocs => public}/public/emailing/mailing-unsubscribe.php (100%)
 rename {htdocs => public}/public/error-401.php (100%)
 rename {htdocs => public}/public/error-404.php (100%)
 rename {htdocs => public}/public/index.php (100%)
 rename {htdocs => public}/public/members/index.php (100%)
 rename {htdocs => public}/public/members/new.php (100%)
 rename {htdocs => public}/public/members/public_card.php (100%)
 rename {htdocs => public}/public/members/public_list.php (100%)
 rename {htdocs => public}/public/notice.php (100%)
 rename {htdocs => public}/public/opensurvey/index.html (100%)
 rename {htdocs => public}/public/opensurvey/studs.php (100%)
 rename {htdocs => public}/public/paybox/index.php (100%)
 rename {htdocs => public}/public/paybox/newpayment.php (100%)
 rename {htdocs => public}/public/paybox/paymentko.php (100%)
 rename {htdocs => public}/public/paybox/paymentok.php (100%)
 rename {htdocs => public}/public/paypal/index.php (100%)
 rename {htdocs => public}/public/paypal/newpayment.php (100%)
 rename {htdocs => public}/public/paypal/paymentko.php (100%)
 rename {htdocs => public}/public/paypal/paymentok.php (100%)
 rename {htdocs => public}/public/test/test_arrays.php (100%)
 rename {htdocs => public}/public/test/test_forms.php (100%)
 rename {htdocs => public}/public/theme/common/index.php (100%)
 rename {htdocs => public}/public/theme/common/nophoto.png (100%)
 rename {htdocs => public}/public/theme/common/user_anonymous.png (100%)
 rename {htdocs => public}/public/theme/common/user_man.png (100%)
 rename {htdocs => public}/public/theme/common/user_woman.png (100%)
 rename {htdocs => public}/public/theme/index.php (100%)
 rename {htdocs => public}/public/websites/index.php (100%)
 rename {htdocs => public}/public/websites/styles.css.php (100%)
 rename {htdocs => public}/resource/add.php (100%)
 rename {htdocs => public}/resource/card.php (100%)
 rename {htdocs => public}/resource/class/dolresource.class.php (100%)
 rename {htdocs => public}/resource/class/html.formresource.class.php (100%)
 rename {htdocs => public}/resource/class/index.html (100%)
 rename {htdocs => public}/resource/contact.php (100%)
 rename {htdocs => public}/resource/document.php (100%)
 rename {htdocs => public}/resource/element_resource.php (100%)
 rename {htdocs => public}/resource/index.html (100%)
 rename {htdocs => public}/resource/list.php (100%)
 rename {htdocs => public}/resource/note.php (100%)
 rename {htdocs => public}/robots.txt (100%)
 rename {htdocs => public}/societe/admin/contact_extrafields.php (100%)
 rename {htdocs => public}/societe/admin/societe.php (100%)
 rename {htdocs => public}/societe/admin/societe_extrafields.php (100%)
 rename {htdocs => public}/societe/agenda.php (100%)
 rename {htdocs => public}/societe/ajax/company.php (100%)
 rename {htdocs => public}/societe/ajax/index.html (100%)
 rename {htdocs => public}/societe/ajaxcompanies.php (100%)
 rename {htdocs => public}/societe/ajaxcountries.php (100%)
 rename {htdocs => public}/societe/canvas/README (100%)
 rename {htdocs => public}/societe/canvas/actions_card_common.class.php (100%)
 rename {htdocs => public}/societe/canvas/company/actions_card_company.class.php (100%)
 rename {htdocs => public}/societe/canvas/company/index.html (100%)
 rename {htdocs => public}/societe/canvas/company/tpl/card_create.tpl.php (100%)
 rename {htdocs => public}/societe/canvas/company/tpl/card_edit.tpl.php (100%)
 rename {htdocs => public}/societe/canvas/company/tpl/card_view.tpl.php (100%)
 rename {htdocs => public}/societe/canvas/company/tpl/index.html (100%)
 rename {htdocs => public}/societe/canvas/index.html (100%)
 rename {htdocs => public}/societe/canvas/individual/actions_card_individual.class.php (100%)
 rename {htdocs => public}/societe/canvas/individual/index.html (100%)
 rename {htdocs => public}/societe/canvas/individual/tpl/card_create.tpl.php (100%)
 rename {htdocs => public}/societe/canvas/individual/tpl/card_edit.tpl.php (100%)
 rename {htdocs => public}/societe/canvas/individual/tpl/card_view.tpl.php (100%)
 rename {htdocs => public}/societe/canvas/individual/tpl/index.html (100%)
 rename {htdocs => public}/societe/checkvat/checkVatPopup.php (100%)
 rename {htdocs => public}/societe/checkvat/checkVatService.xml (100%)
 rename {htdocs => public}/societe/checkvat/index.html (100%)
 rename {htdocs => public}/societe/class/address.class.php (100%)
 rename {htdocs => public}/societe/class/api_contacts.class.php (100%)
 rename {htdocs => public}/societe/class/api_deprecated_contact.class.php (100%)
 rename {htdocs => public}/societe/class/api_deprecated_thirdparty.class.php (100%)
 rename {htdocs => public}/societe/class/api_thirdparties.class.php (100%)
 rename {htdocs => public}/societe/class/client.class.php (100%)
 rename {htdocs => public}/societe/class/companybankaccount.class.php (100%)
 rename {htdocs => public}/societe/class/index.html (100%)
 rename {htdocs => public}/societe/class/societe.class.php (100%)
 rename {htdocs => public}/societe/commerciaux.php (100%)
 rename {htdocs => public}/societe/consumption.php (100%)
 rename {htdocs => public}/societe/document.php (100%)
 rename {htdocs => public}/societe/index.php (100%)
 rename {htdocs => public}/societe/list.php (100%)
 rename {htdocs => public}/societe/note.php (100%)
 rename {htdocs => public}/societe/notify/card.php (100%)
 rename {htdocs => public}/societe/notify/index.php (100%)
 rename {htdocs => public}/societe/price.php (100%)
 rename {htdocs => public}/societe/project.php (100%)
 rename {htdocs => public}/societe/rib.php (100%)
 rename {htdocs => public}/societe/soc.php (100%)
 rename {htdocs => public}/societe/societecontact.php (100%)
 rename {htdocs => public}/societe/tpl/index.html (100%)
 rename {htdocs => public}/societe/tpl/linesalesrepresentative.tpl.php (100%)
 rename {htdocs => public}/supplier_proposal/admin/supplier_proposal_extrafields.php (100%)
 rename {htdocs => public}/supplier_proposal/admin/supplier_proposaldet_extrafields.php (100%)
 rename {htdocs => public}/supplier_proposal/card.php (100%)
 rename {htdocs => public}/supplier_proposal/class/index.html (100%)
 rename {htdocs => public}/supplier_proposal/class/supplier_proposal.class.php (100%)
 rename {htdocs => public}/supplier_proposal/document.php (100%)
 rename {htdocs => public}/supplier_proposal/index.php (100%)
 rename {htdocs => public}/supplier_proposal/info.php (100%)
 rename {htdocs => public}/supplier_proposal/list.php (100%)
 rename {htdocs => public}/supplier_proposal/note.php (100%)
 rename {htdocs => public}/supplier_proposal/tpl/index.html (100%)
 rename {htdocs => public}/supplier_proposal/tpl/linkedobjectblock.tpl.php (100%)
 rename {htdocs => public}/support/background.png (100%)
 rename {htdocs => public}/support/default.css (100%)
 rename {htdocs => public}/support/helpcenter.png (100%)
 rename {htdocs => public}/support/inc.php (100%)
 rename {htdocs => public}/support/index.php (100%)
 rename {htdocs => public}/support/internet.png (100%)
 rename {htdocs => public}/support/mail.png (100%)
 rename {htdocs => public}/support/online.php (100%)
 rename {htdocs => public}/support/pagemaster.png (100%)
 rename {htdocs => public}/support/redstar.png (100%)
 rename {htdocs => public}/support/star.png (100%)
 rename {htdocs => public}/support/who.png (100%)
 rename {htdocs => public}/theme/.gitignore (100%)
 rename {htdocs => public}/theme/common/colorpicker.png (100%)
 rename {htdocs => public}/theme/common/devices/audio-card.png (100%)
 rename {htdocs => public}/theme/common/devices/audio-headset.png (100%)
 rename {htdocs => public}/theme/common/devices/audio-input-line.png (100%)
 rename {htdocs => public}/theme/common/devices/audio-input-microphone.png (100%)
 rename {htdocs => public}/theme/common/devices/battery.png (100%)
 rename {htdocs => public}/theme/common/devices/camera-photo.png (100%)
 rename {htdocs => public}/theme/common/devices/camera-web.png (100%)
 rename {htdocs => public}/theme/common/devices/computer-laptop.png (100%)
 rename {htdocs => public}/theme/common/devices/computer.png (100%)
 rename {htdocs => public}/theme/common/devices/cpu.png (100%)
 rename {htdocs => public}/theme/common/devices/drive-harddisk.png (100%)
 rename {htdocs => public}/theme/common/devices/drive-optical.png (100%)
 rename {htdocs => public}/theme/common/devices/drive-removable-media-usb-pendrive.png (100%)
 rename {htdocs => public}/theme/common/devices/drive-removable-media-usb.png (100%)
 rename {htdocs => public}/theme/common/devices/drive-removable-media.png (100%)
 rename {htdocs => public}/theme/common/devices/index.html (100%)
 rename {htdocs => public}/theme/common/devices/input-gaming.png (100%)
 rename {htdocs => public}/theme/common/devices/input-keyboard.png (100%)
 rename {htdocs => public}/theme/common/devices/input-mouse.png (100%)
 rename {htdocs => public}/theme/common/devices/input-tablet.png (100%)
 rename {htdocs => public}/theme/common/devices/media-flash-memory-stick.png (100%)
 rename {htdocs => public}/theme/common/devices/media-flash-sd-mmc.png (100%)
 rename {htdocs => public}/theme/common/devices/media-flash-smart-media.png (100%)
 rename {htdocs => public}/theme/common/devices/media-flash.png (100%)
 rename {htdocs => public}/theme/common/devices/media-floppy.png (100%)
 rename {htdocs => public}/theme/common/devices/media-optical-audio.png (100%)
 rename {htdocs => public}/theme/common/devices/media-optical-blu-ray.png (100%)
 rename {htdocs => public}/theme/common/devices/media-optical-data.png (100%)
 rename {htdocs => public}/theme/common/devices/media-optical-dvd-video.png (100%)
 rename {htdocs => public}/theme/common/devices/media-optical-dvd.png (100%)
 rename {htdocs => public}/theme/common/devices/media-optical-mixed-cd.png (100%)
 rename {htdocs => public}/theme/common/devices/media-optical-recordable.png (100%)
 rename {htdocs => public}/theme/common/devices/media-optical-video.png (100%)
 rename {htdocs => public}/theme/common/devices/media-optical.png (100%)
 rename {htdocs => public}/theme/common/devices/media-tape.png (100%)
 rename {htdocs => public}/theme/common/devices/modem.png (100%)
 rename {htdocs => public}/theme/common/devices/multimedia-player-apple-ipod.png (100%)
 rename {htdocs => public}/theme/common/devices/multimedia-player.png (100%)
 rename {htdocs => public}/theme/common/devices/network-wired.png (100%)
 rename {htdocs => public}/theme/common/devices/network-wireless-connected-00.png (100%)
 rename {htdocs => public}/theme/common/devices/network-wireless-connected-100.png (100%)
 rename {htdocs => public}/theme/common/devices/network-wireless-connected-25.png (100%)
 rename {htdocs => public}/theme/common/devices/network-wireless-connected-50.png (100%)
 rename {htdocs => public}/theme/common/devices/network-wireless-connected-75.png (100%)
 rename {htdocs => public}/theme/common/devices/network-wireless-disconnected.png (100%)
 rename {htdocs => public}/theme/common/devices/network-wireless.png (100%)
 rename {htdocs => public}/theme/common/devices/pda.png (100%)
 rename {htdocs => public}/theme/common/devices/phone-openmoko-freerunner.png (100%)
 rename {htdocs => public}/theme/common/devices/phone.png (100%)
 rename {htdocs => public}/theme/common/devices/printer-laser.png (100%)
 rename {htdocs => public}/theme/common/devices/printer.png (100%)
 rename {htdocs => public}/theme/common/devices/scanner.png (100%)
 rename {htdocs => public}/theme/common/devices/video-display.png (100%)
 rename {htdocs => public}/theme/common/devices/video-projector.png (100%)
 rename {htdocs => public}/theme/common/devices/video-television.png (100%)
 rename {htdocs => public}/theme/common/dolibarr_box.png (100%)
 rename {htdocs => public}/theme/common/dolibarr_logo_bw.png (100%)
 rename {htdocs => public}/theme/common/dolistore.jpg (100%)
 rename {htdocs => public}/theme/common/emotes/face-angel.png (100%)
 rename {htdocs => public}/theme/common/emotes/face-embarrassed.png (100%)
 rename {htdocs => public}/theme/common/emotes/face-kiss.png (100%)
 rename {htdocs => public}/theme/common/emotes/face-laugh.png (100%)
 rename {htdocs => public}/theme/common/emotes/face-plain.png (100%)
 rename {htdocs => public}/theme/common/emotes/face-raspberry.png (100%)
 rename {htdocs => public}/theme/common/emotes/face-sad.png (100%)
 rename {htdocs => public}/theme/common/emotes/face-smile-big.png (100%)
 rename {htdocs => public}/theme/common/emotes/face-smile.png (100%)
 rename {htdocs => public}/theme/common/emotes/face-surprise.png (100%)
 rename {htdocs => public}/theme/common/emotes/face-uncertain.png (100%)
 rename {htdocs => public}/theme/common/emotes/face-wink.png (100%)
 rename {htdocs => public}/theme/common/emotes/index.html (100%)
 rename {htdocs => public}/theme/common/flags/ad.png (100%)
 rename {htdocs => public}/theme/common/flags/ae.png (100%)
 rename {htdocs => public}/theme/common/flags/af.png (100%)
 rename {htdocs => public}/theme/common/flags/ag.png (100%)
 rename {htdocs => public}/theme/common/flags/ai.png (100%)
 rename {htdocs => public}/theme/common/flags/al.png (100%)
 rename {htdocs => public}/theme/common/flags/am.png (100%)
 rename {htdocs => public}/theme/common/flags/an.png (100%)
 rename {htdocs => public}/theme/common/flags/ao.png (100%)
 rename {htdocs => public}/theme/common/flags/ar.png (100%)
 rename {htdocs => public}/theme/common/flags/as.png (100%)
 rename {htdocs => public}/theme/common/flags/at.png (100%)
 rename {htdocs => public}/theme/common/flags/au.png (100%)
 rename {htdocs => public}/theme/common/flags/aw.png (100%)
 rename {htdocs => public}/theme/common/flags/ax.png (100%)
 rename {htdocs => public}/theme/common/flags/az.png (100%)
 rename {htdocs => public}/theme/common/flags/ba.png (100%)
 rename {htdocs => public}/theme/common/flags/bb.png (100%)
 rename {htdocs => public}/theme/common/flags/bd.png (100%)
 rename {htdocs => public}/theme/common/flags/be.png (100%)
 rename {htdocs => public}/theme/common/flags/bf.png (100%)
 rename {htdocs => public}/theme/common/flags/bg.png (100%)
 rename {htdocs => public}/theme/common/flags/bh.png (100%)
 rename {htdocs => public}/theme/common/flags/bi.png (100%)
 rename {htdocs => public}/theme/common/flags/bj.png (100%)
 rename {htdocs => public}/theme/common/flags/bm.png (100%)
 rename {htdocs => public}/theme/common/flags/bn.png (100%)
 rename {htdocs => public}/theme/common/flags/bo.png (100%)
 rename {htdocs => public}/theme/common/flags/br.png (100%)
 rename {htdocs => public}/theme/common/flags/bs.png (100%)
 rename {htdocs => public}/theme/common/flags/bt.png (100%)
 rename {htdocs => public}/theme/common/flags/bv.png (100%)
 rename {htdocs => public}/theme/common/flags/bw.png (100%)
 rename {htdocs => public}/theme/common/flags/by.png (100%)
 rename {htdocs => public}/theme/common/flags/bz.png (100%)
 rename {htdocs => public}/theme/common/flags/ca.png (100%)
 rename {htdocs => public}/theme/common/flags/catalonia.png (100%)
 rename {htdocs => public}/theme/common/flags/cc.png (100%)
 rename {htdocs => public}/theme/common/flags/cd.png (100%)
 rename {htdocs => public}/theme/common/flags/cf.png (100%)
 rename {htdocs => public}/theme/common/flags/cg.png (100%)
 rename {htdocs => public}/theme/common/flags/ch.png (100%)
 rename {htdocs => public}/theme/common/flags/ci.png (100%)
 rename {htdocs => public}/theme/common/flags/ck.png (100%)
 rename {htdocs => public}/theme/common/flags/cl.png (100%)
 rename {htdocs => public}/theme/common/flags/cm.png (100%)
 rename {htdocs => public}/theme/common/flags/cn.png (100%)
 rename {htdocs => public}/theme/common/flags/co.png (100%)
 rename {htdocs => public}/theme/common/flags/cr.png (100%)
 rename {htdocs => public}/theme/common/flags/cs.png (100%)
 rename {htdocs => public}/theme/common/flags/cu.png (100%)
 rename {htdocs => public}/theme/common/flags/cv.png (100%)
 rename {htdocs => public}/theme/common/flags/cx.png (100%)
 rename {htdocs => public}/theme/common/flags/cy.png (100%)
 rename {htdocs => public}/theme/common/flags/cz.png (100%)
 rename {htdocs => public}/theme/common/flags/de.png (100%)
 rename {htdocs => public}/theme/common/flags/dj.png (100%)
 rename {htdocs => public}/theme/common/flags/dk.png (100%)
 rename {htdocs => public}/theme/common/flags/dm.png (100%)
 rename {htdocs => public}/theme/common/flags/do.png (100%)
 rename {htdocs => public}/theme/common/flags/dz.png (100%)
 rename {htdocs => public}/theme/common/flags/ec.png (100%)
 rename {htdocs => public}/theme/common/flags/ee.png (100%)
 rename {htdocs => public}/theme/common/flags/eg.png (100%)
 rename {htdocs => public}/theme/common/flags/eh.png (100%)
 rename {htdocs => public}/theme/common/flags/en.png (100%)
 rename {htdocs => public}/theme/common/flags/england.png (100%)
 rename {htdocs => public}/theme/common/flags/er.png (100%)
 rename {htdocs => public}/theme/common/flags/es.png (100%)
 rename {htdocs => public}/theme/common/flags/et.png (100%)
 rename {htdocs => public}/theme/common/flags/eu.png (100%)
 rename {htdocs => public}/theme/common/flags/fam.png (100%)
 rename {htdocs => public}/theme/common/flags/fi.png (100%)
 rename {htdocs => public}/theme/common/flags/fj.png (100%)
 rename {htdocs => public}/theme/common/flags/fk.png (100%)
 rename {htdocs => public}/theme/common/flags/fm.png (100%)
 rename {htdocs => public}/theme/common/flags/fo.png (100%)
 rename {htdocs => public}/theme/common/flags/fr.png (100%)
 rename {htdocs => public}/theme/common/flags/ga.png (100%)
 rename {htdocs => public}/theme/common/flags/gb.png (100%)
 rename {htdocs => public}/theme/common/flags/gd.png (100%)
 rename {htdocs => public}/theme/common/flags/ge.png (100%)
 rename {htdocs => public}/theme/common/flags/gf.png (100%)
 rename {htdocs => public}/theme/common/flags/gg.png (100%)
 rename {htdocs => public}/theme/common/flags/gh.png (100%)
 rename {htdocs => public}/theme/common/flags/gi.png (100%)
 rename {htdocs => public}/theme/common/flags/gl.png (100%)
 rename {htdocs => public}/theme/common/flags/gm.png (100%)
 rename {htdocs => public}/theme/common/flags/gn.png (100%)
 rename {htdocs => public}/theme/common/flags/gp.png (100%)
 rename {htdocs => public}/theme/common/flags/gq.png (100%)
 rename {htdocs => public}/theme/common/flags/gr.png (100%)
 rename {htdocs => public}/theme/common/flags/gs.png (100%)
 rename {htdocs => public}/theme/common/flags/gt.png (100%)
 rename {htdocs => public}/theme/common/flags/gu.png (100%)
 rename {htdocs => public}/theme/common/flags/gw.png (100%)
 rename {htdocs => public}/theme/common/flags/gy.png (100%)
 rename {htdocs => public}/theme/common/flags/hk.png (100%)
 rename {htdocs => public}/theme/common/flags/hm.png (100%)
 rename {htdocs => public}/theme/common/flags/hn.png (100%)
 rename {htdocs => public}/theme/common/flags/hr.png (100%)
 rename {htdocs => public}/theme/common/flags/ht.png (100%)
 rename {htdocs => public}/theme/common/flags/hu.png (100%)
 rename {htdocs => public}/theme/common/flags/id.png (100%)
 rename {htdocs => public}/theme/common/flags/ie.png (100%)
 rename {htdocs => public}/theme/common/flags/il.png (100%)
 rename {htdocs => public}/theme/common/flags/in.png (100%)
 rename {htdocs => public}/theme/common/flags/index.html (100%)
 rename {htdocs => public}/theme/common/flags/int.png (100%)
 rename {htdocs => public}/theme/common/flags/io.png (100%)
 rename {htdocs => public}/theme/common/flags/iq.png (100%)
 rename {htdocs => public}/theme/common/flags/ir.png (100%)
 rename {htdocs => public}/theme/common/flags/is.png (100%)
 rename {htdocs => public}/theme/common/flags/it.png (100%)
 rename {htdocs => public}/theme/common/flags/jm.png (100%)
 rename {htdocs => public}/theme/common/flags/jo.png (100%)
 rename {htdocs => public}/theme/common/flags/jp.png (100%)
 rename {htdocs => public}/theme/common/flags/ke.png (100%)
 rename {htdocs => public}/theme/common/flags/kg.png (100%)
 rename {htdocs => public}/theme/common/flags/kh.png (100%)
 rename {htdocs => public}/theme/common/flags/ki.png (100%)
 rename {htdocs => public}/theme/common/flags/km.png (100%)
 rename {htdocs => public}/theme/common/flags/kn.png (100%)
 rename {htdocs => public}/theme/common/flags/kp.png (100%)
 rename {htdocs => public}/theme/common/flags/kr.png (100%)
 rename {htdocs => public}/theme/common/flags/kw.png (100%)
 rename {htdocs => public}/theme/common/flags/ky.png (100%)
 rename {htdocs => public}/theme/common/flags/kz.png (100%)
 rename {htdocs => public}/theme/common/flags/la.png (100%)
 rename {htdocs => public}/theme/common/flags/lb.png (100%)
 rename {htdocs => public}/theme/common/flags/lc.png (100%)
 rename {htdocs => public}/theme/common/flags/li.png (100%)
 rename {htdocs => public}/theme/common/flags/lk.png (100%)
 rename {htdocs => public}/theme/common/flags/lr.png (100%)
 rename {htdocs => public}/theme/common/flags/ls.png (100%)
 rename {htdocs => public}/theme/common/flags/lt.png (100%)
 rename {htdocs => public}/theme/common/flags/lu.png (100%)
 rename {htdocs => public}/theme/common/flags/lv.png (100%)
 rename {htdocs => public}/theme/common/flags/ly.png (100%)
 rename {htdocs => public}/theme/common/flags/ma.png (100%)
 rename {htdocs => public}/theme/common/flags/mc.png (100%)
 rename {htdocs => public}/theme/common/flags/md.png (100%)
 rename {htdocs => public}/theme/common/flags/me.png (100%)
 rename {htdocs => public}/theme/common/flags/mg.png (100%)
 rename {htdocs => public}/theme/common/flags/mh.png (100%)
 rename {htdocs => public}/theme/common/flags/mk.png (100%)
 rename {htdocs => public}/theme/common/flags/ml.png (100%)
 rename {htdocs => public}/theme/common/flags/mm.png (100%)
 rename {htdocs => public}/theme/common/flags/mn.png (100%)
 rename {htdocs => public}/theme/common/flags/mo.png (100%)
 rename {htdocs => public}/theme/common/flags/mp.png (100%)
 rename {htdocs => public}/theme/common/flags/mq.png (100%)
 rename {htdocs => public}/theme/common/flags/mr.png (100%)
 rename {htdocs => public}/theme/common/flags/ms.png (100%)
 rename {htdocs => public}/theme/common/flags/mt.png (100%)
 rename {htdocs => public}/theme/common/flags/mu.png (100%)
 rename {htdocs => public}/theme/common/flags/mv.png (100%)
 rename {htdocs => public}/theme/common/flags/mw.png (100%)
 rename {htdocs => public}/theme/common/flags/mx.png (100%)
 rename {htdocs => public}/theme/common/flags/my.png (100%)
 rename {htdocs => public}/theme/common/flags/mz.png (100%)
 rename {htdocs => public}/theme/common/flags/na.png (100%)
 rename {htdocs => public}/theme/common/flags/nc.png (100%)
 rename {htdocs => public}/theme/common/flags/ne.png (100%)
 rename {htdocs => public}/theme/common/flags/nf.png (100%)
 rename {htdocs => public}/theme/common/flags/ng.png (100%)
 rename {htdocs => public}/theme/common/flags/ni.png (100%)
 rename {htdocs => public}/theme/common/flags/nl.png (100%)
 rename {htdocs => public}/theme/common/flags/no.png (100%)
 rename {htdocs => public}/theme/common/flags/np.png (100%)
 rename {htdocs => public}/theme/common/flags/nr.png (100%)
 rename {htdocs => public}/theme/common/flags/nu.png (100%)
 rename {htdocs => public}/theme/common/flags/nz.png (100%)
 rename {htdocs => public}/theme/common/flags/om.png (100%)
 rename {htdocs => public}/theme/common/flags/pa.png (100%)
 rename {htdocs => public}/theme/common/flags/pe.png (100%)
 rename {htdocs => public}/theme/common/flags/pf.png (100%)
 rename {htdocs => public}/theme/common/flags/pg.png (100%)
 rename {htdocs => public}/theme/common/flags/ph.png (100%)
 rename {htdocs => public}/theme/common/flags/pk.png (100%)
 rename {htdocs => public}/theme/common/flags/pl.png (100%)
 rename {htdocs => public}/theme/common/flags/pm.png (100%)
 rename {htdocs => public}/theme/common/flags/pn.png (100%)
 rename {htdocs => public}/theme/common/flags/pr.png (100%)
 rename {htdocs => public}/theme/common/flags/ps.png (100%)
 rename {htdocs => public}/theme/common/flags/pt.png (100%)
 rename {htdocs => public}/theme/common/flags/pw.png (100%)
 rename {htdocs => public}/theme/common/flags/py.png (100%)
 rename {htdocs => public}/theme/common/flags/qa.png (100%)
 rename {htdocs => public}/theme/common/flags/re.png (100%)
 rename {htdocs => public}/theme/common/flags/ro.png (100%)
 rename {htdocs => public}/theme/common/flags/rs.png (100%)
 rename {htdocs => public}/theme/common/flags/ru.png (100%)
 rename {htdocs => public}/theme/common/flags/rw.png (100%)
 rename {htdocs => public}/theme/common/flags/sa.png (100%)
 rename {htdocs => public}/theme/common/flags/sb.png (100%)
 rename {htdocs => public}/theme/common/flags/sc.png (100%)
 rename {htdocs => public}/theme/common/flags/scotland.png (100%)
 rename {htdocs => public}/theme/common/flags/sd.png (100%)
 rename {htdocs => public}/theme/common/flags/se.png (100%)
 rename {htdocs => public}/theme/common/flags/sg.png (100%)
 rename {htdocs => public}/theme/common/flags/sh.png (100%)
 rename {htdocs => public}/theme/common/flags/si.png (100%)
 rename {htdocs => public}/theme/common/flags/sj.png (100%)
 rename {htdocs => public}/theme/common/flags/sk.png (100%)
 rename {htdocs => public}/theme/common/flags/sl.png (100%)
 rename {htdocs => public}/theme/common/flags/sm.png (100%)
 rename {htdocs => public}/theme/common/flags/sn.png (100%)
 rename {htdocs => public}/theme/common/flags/so.png (100%)
 rename {htdocs => public}/theme/common/flags/sr.png (100%)
 rename {htdocs => public}/theme/common/flags/st.png (100%)
 rename {htdocs => public}/theme/common/flags/sv.png (100%)
 rename {htdocs => public}/theme/common/flags/sy.png (100%)
 rename {htdocs => public}/theme/common/flags/sz.png (100%)
 rename {htdocs => public}/theme/common/flags/tc.png (100%)
 rename {htdocs => public}/theme/common/flags/td.png (100%)
 rename {htdocs => public}/theme/common/flags/tf.png (100%)
 rename {htdocs => public}/theme/common/flags/tg.png (100%)
 rename {htdocs => public}/theme/common/flags/th.png (100%)
 rename {htdocs => public}/theme/common/flags/tj.png (100%)
 rename {htdocs => public}/theme/common/flags/tk.png (100%)
 rename {htdocs => public}/theme/common/flags/tl.png (100%)
 rename {htdocs => public}/theme/common/flags/tm.png (100%)
 rename {htdocs => public}/theme/common/flags/tn.png (100%)
 rename {htdocs => public}/theme/common/flags/to.png (100%)
 rename {htdocs => public}/theme/common/flags/tr.png (100%)
 rename {htdocs => public}/theme/common/flags/trans.png (100%)
 rename {htdocs => public}/theme/common/flags/tt.png (100%)
 rename {htdocs => public}/theme/common/flags/tv.png (100%)
 rename {htdocs => public}/theme/common/flags/tw.png (100%)
 rename {htdocs => public}/theme/common/flags/tz.png (100%)
 rename {htdocs => public}/theme/common/flags/ua.png (100%)
 rename {htdocs => public}/theme/common/flags/ug.png (100%)
 rename {htdocs => public}/theme/common/flags/uk.png (100%)
 rename {htdocs => public}/theme/common/flags/um.png (100%)
 rename {htdocs => public}/theme/common/flags/us.png (100%)
 rename {htdocs => public}/theme/common/flags/uy.png (100%)
 rename {htdocs => public}/theme/common/flags/uz.png (100%)
 rename {htdocs => public}/theme/common/flags/va.png (100%)
 rename {htdocs => public}/theme/common/flags/vc.png (100%)
 rename {htdocs => public}/theme/common/flags/ve.png (100%)
 rename {htdocs => public}/theme/common/flags/vg.png (100%)
 rename {htdocs => public}/theme/common/flags/vi.png (100%)
 rename {htdocs => public}/theme/common/flags/vn.png (100%)
 rename {htdocs => public}/theme/common/flags/vu.png (100%)
 rename {htdocs => public}/theme/common/flags/wales.png (100%)
 rename {htdocs => public}/theme/common/flags/wf.png (100%)
 rename {htdocs => public}/theme/common/flags/ws.png (100%)
 rename {htdocs => public}/theme/common/flags/ye.png (100%)
 rename {htdocs => public}/theme/common/flags/yt.png (100%)
 rename {htdocs => public}/theme/common/flags/za.png (100%)
 rename {htdocs => public}/theme/common/flags/zm.png (100%)
 rename {htdocs => public}/theme/common/flags/zw.png (100%)
 rename {htdocs => public}/theme/common/folder-new.png (100%)
 rename {htdocs => public}/theme/common/gmap.png (100%)
 rename {htdocs => public}/theme/common/help.png (100%)
 rename {htdocs => public}/theme/common/ical.gif (100%)
 rename {htdocs => public}/theme/common/index.html (100%)
 rename {htdocs => public}/theme/common/information.png (100%)
 rename {htdocs => public}/theme/common/logo_cerfa.png (100%)
 rename {htdocs => public}/theme/common/mime/archive.png (100%)
 rename {htdocs => public}/theme/common/mime/audio.png (100%)
 rename {htdocs => public}/theme/common/mime/css.png (100%)
 rename {htdocs => public}/theme/common/mime/doc.png (100%)
 rename {htdocs => public}/theme/common/mime/dotnet.png (100%)
 rename {htdocs => public}/theme/common/mime/encrypt.png (100%)
 rename {htdocs => public}/theme/common/mime/error.png (100%)
 rename {htdocs => public}/theme/common/mime/flash.png (100%)
 rename {htdocs => public}/theme/common/mime/glasses.png (100%)
 rename {htdocs => public}/theme/common/mime/html.png (100%)
 rename {htdocs => public}/theme/common/mime/image.png (100%)
 rename {htdocs => public}/theme/common/mime/index.html (100%)
 rename {htdocs => public}/theme/common/mime/jnlp.png (100%)
 rename {htdocs => public}/theme/common/mime/jscript.png (100%)
 rename {htdocs => public}/theme/common/mime/library.png (100%)
 rename {htdocs => public}/theme/common/mime/lit.png (100%)
 rename {htdocs => public}/theme/common/mime/mdb.png (100%)
 rename {htdocs => public}/theme/common/mime/notavailable.png (100%)
 rename {htdocs => public}/theme/common/mime/ooffice.png (100%)
 rename {htdocs => public}/theme/common/mime/other.png (100%)
 rename {htdocs => public}/theme/common/mime/page.png (100%)
 rename {htdocs => public}/theme/common/mime/pdf.png (100%)
 rename {htdocs => public}/theme/common/mime/php.png (100%)
 rename {htdocs => public}/theme/common/mime/pl.png (100%)
 rename {htdocs => public}/theme/common/mime/ppt.png (100%)
 rename {htdocs => public}/theme/common/mime/readme.txt (100%)
 rename {htdocs => public}/theme/common/mime/rss.png (100%)
 rename {htdocs => public}/theme/common/mime/script.png (100%)
 rename {htdocs => public}/theme/common/mime/svg.png (100%)
 rename {htdocs => public}/theme/common/mime/text.png (100%)
 rename {htdocs => public}/theme/common/mime/ttf.png (100%)
 rename {htdocs => public}/theme/common/mime/unknown.png (100%)
 rename {htdocs => public}/theme/common/mime/video.png (100%)
 rename {htdocs => public}/theme/common/mime/xls.png (100%)
 rename {htdocs => public}/theme/common/paypal.png (100%)
 rename {htdocs => public}/theme/common/redstar.png (100%)
 rename {htdocs => public}/theme/common/rss.gif (100%)
 rename {htdocs => public}/theme/common/skype_callbutton.png (100%)
 rename {htdocs => public}/theme/common/skype_chatbutton.png (100%)
 rename {htdocs => public}/theme/common/star.png (100%)
 rename {htdocs => public}/theme/common/transform-crop-and-resize.png (100%)
 rename {htdocs => public}/theme/common/transparent.png (100%)
 rename {htdocs => public}/theme/common/treemenu/base.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/branch.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/branchbottom.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/branchtop.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/folder-expanded.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/folder.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/folder2-expanded.png (100%)
 rename {htdocs => public}/theme/common/treemenu/folder2.png (100%)
 rename {htdocs => public}/theme/common/treemenu/imgfolder.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/index.html (100%)
 rename {htdocs => public}/theme/common/treemenu/line.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/linebottom.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/minus.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/minusbottom.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/minustop.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/minustop2.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/minustop3.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/page.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/plus.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/plusbottom.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/plustop.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/plustop2.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/plustop3.gif (100%)
 rename {htdocs => public}/theme/common/treemenu/trash.gif (100%)
 rename {htdocs => public}/theme/common/vcal.gif (100%)
 rename {htdocs => public}/theme/common/view-refresh.png (100%)
 rename {htdocs => public}/theme/dolibarr.png (100%)
 rename {htdocs => public}/theme/dolibarr_logo.png (100%)
 rename {htdocs => public}/theme/dolibarr_preferred_partner_int.png (100%)
 rename {htdocs => public}/theme/doliforge_logo.png (100%)
 rename {htdocs => public}/theme/dolistore_logo.png (100%)
 rename {htdocs => public}/theme/eldy/.gitignore (100%)
 rename {htdocs => public}/theme/eldy/AUTHOR (100%)
 rename {htdocs => public}/theme/eldy/ckeditor/config.js (100%)
 rename {htdocs => public}/theme/eldy/ckeditor/index.html (100%)
 rename {htdocs => public}/theme/eldy/graph-color.php (100%)
 rename {htdocs => public}/theme/eldy/img/1downarrow.png (100%)
 rename {htdocs => public}/theme/eldy/img/1downarrow_selected.png (100%)
 rename {htdocs => public}/theme/eldy/img/1leftarrow.png (100%)
 rename {htdocs => public}/theme/eldy/img/1leftarrow_selected.png (100%)
 rename {htdocs => public}/theme/eldy/img/1rightarrow.png (100%)
 rename {htdocs => public}/theme/eldy/img/1rightarrow_selected.png (100%)
 rename {htdocs => public}/theme/eldy/img/1uparrow.png (100%)
 rename {htdocs => public}/theme/eldy/img/1uparrow_selected.png (100%)
 rename {htdocs => public}/theme/eldy/img/addfile.png (100%)
 rename {htdocs => public}/theme/eldy/img/background.png (100%)
 rename {htdocs => public}/theme/eldy/img/bg-bas-rubrique.png (100%)
 rename {htdocs => public}/theme/eldy/img/bg-rubrique.png (100%)
 rename {htdocs => public}/theme/eldy/img/bg-titre-rubrique.png (100%)
 rename {htdocs => public}/theme/eldy/img/button_bg.png (100%)
 rename {htdocs => public}/theme/eldy/img/button_edit.png (100%)
 rename {htdocs => public}/theme/eldy/img/calc.png (100%)
 rename {htdocs => public}/theme/eldy/img/calendar.png (100%)
 rename {htdocs => public}/theme/eldy/img/call.png (100%)
 rename {htdocs => public}/theme/eldy/img/call_out.png (100%)
 rename {htdocs => public}/theme/eldy/img/close.png (100%)
 rename {htdocs => public}/theme/eldy/img/close_title.png (100%)
 rename {htdocs => public}/theme/eldy/img/credit_card.png (100%)
 rename {htdocs => public}/theme/eldy/img/delete.png (100%)
 rename {htdocs => public}/theme/eldy/img/detail.png (100%)
 rename {htdocs => public}/theme/eldy/img/disable.png (100%)
 rename {htdocs => public}/theme/eldy/img/edit.png (100%)
 rename {htdocs => public}/theme/eldy/img/edit_add.png (100%)
 rename {htdocs => public}/theme/eldy/img/edit_remove.png (100%)
 rename {htdocs => public}/theme/eldy/img/editdelete.png (100%)
 rename {htdocs => public}/theme/eldy/img/error.png (100%)
 rename {htdocs => public}/theme/eldy/img/external.png (100%)
 rename {htdocs => public}/theme/eldy/img/favicon.ico (100%)
 rename {htdocs => public}/theme/eldy/img/file.png (100%)
 rename {htdocs => public}/theme/eldy/img/filenew.png (100%)
 rename {htdocs => public}/theme/eldy/img/filter.png (100%)
 rename {htdocs => public}/theme/eldy/img/folder-open.png (100%)
 rename {htdocs => public}/theme/eldy/img/folder.png (100%)
 rename {htdocs => public}/theme/eldy/img/gradient.gif (100%)
 rename {htdocs => public}/theme/eldy/img/grip.png (100%)
 rename {htdocs => public}/theme/eldy/img/grip_title.png (100%)
 rename {htdocs => public}/theme/eldy/img/headbg.jpg (100%)
 rename {htdocs => public}/theme/eldy/img/headbg2.jpg (100%)
 rename {htdocs => public}/theme/eldy/img/help.png (100%)
 rename {htdocs => public}/theme/eldy/img/helpdoc.png (100%)
 rename {htdocs => public}/theme/eldy/img/helpdoc_top.png (100%)
 rename {htdocs => public}/theme/eldy/img/high.png (100%)
 rename {htdocs => public}/theme/eldy/img/history.png (100%)
 rename {htdocs => public}/theme/eldy/img/index.html (100%)
 rename {htdocs => public}/theme/eldy/img/info.png (100%)
 rename {htdocs => public}/theme/eldy/img/info_black.png (100%)
 rename {htdocs => public}/theme/eldy/img/list.png (100%)
 rename {htdocs => public}/theme/eldy/img/liste_titre.png (100%)
 rename {htdocs => public}/theme/eldy/img/liste_titre2.png (100%)
 rename {htdocs => public}/theme/eldy/img/listlight.png (100%)
 rename {htdocs => public}/theme/eldy/img/lock.png (100%)
 rename {htdocs => public}/theme/eldy/img/login_background.png (100%)
 rename {htdocs => public}/theme/eldy/img/logo_setup.svg (100%)
 rename {htdocs => public}/theme/eldy/img/logout.png (100%)
 rename {htdocs => public}/theme/eldy/img/logout_top.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/README.md (100%)
 rename {htdocs => public}/theme/eldy/img/menus/agenda.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/agenda_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/bank.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/bank_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/chart.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/commercial.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/commercial_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/company.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/company_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/ecm.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/ecm_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/externalsite.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/externalsite_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/ftp.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/ftp_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/generic1.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/generic1_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/generic2.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/generic2_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/generic3.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/generic3_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/generic4.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/generic4_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/globe.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/globe_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/holiday.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/home.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/home_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/index.html (100%)
 rename {htdocs => public}/theme/eldy/img/menus/mail.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/mail_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/members.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/members_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/menu.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/money.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/money_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/pointofsale.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/pointofsale_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/products.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/products_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/project.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/project_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/shop.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/shop_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/tools.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus/tools_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/agenda.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/agenda_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/bank.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/bank_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/commercial.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/commercial_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/company.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/company_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/ecm.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/ecm_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/externalsite.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/externalsite_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/ftp.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/ftp_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/generic1.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/generic1_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/generic2.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/generic2_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/generic3.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/generic3_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/generic4.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/generic4_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/globe.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/globe_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/holiday.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/home.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/home_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/mail.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/mail_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/members.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/members_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/menu.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/money.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/money_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/pointofsale.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/pointofsale_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/products.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/products_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/project.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/project_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/shop.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/shop_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/tools.png (100%)
 rename {htdocs => public}/theme/eldy/img/menus_black/tools_over.png (100%)
 rename {htdocs => public}/theme/eldy/img/menutab-r.png (100%)
 rename {htdocs => public}/theme/eldy/img/nav-overlay.png (100%)
 rename {htdocs => public}/theme/eldy/img/nav-overlay3.png (100%)
 rename {htdocs => public}/theme/eldy/img/next.png (100%)
 rename {htdocs => public}/theme/eldy/img/nographyet.svg (100%)
 rename {htdocs => public}/theme/eldy/img/object_account.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_accounting.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_action.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_address.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_barcode.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_bill.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_billa.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_billd.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_billr.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_book.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_bookmark.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_building.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_calendar.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_calendarday.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_calendargantt.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_calendarpertype.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_calendarperuser.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_calendarweek.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_category-expanded.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_category.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_commercial.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_company.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_contact.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_contract.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_cron.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_dir.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_email.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_energy.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_generic.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_globe.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_gravatar.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_group.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_holiday.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_intervention.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_invoice.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_label.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_list.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_margin.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_multicurrency.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_opensurvey.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_order.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_payment.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_phoning.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_phoning_fax.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_printer.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_product.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_project.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_projectpub.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_projecttask.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_propal.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_reduc.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_resource.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_rss.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_sending.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_service.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_skype.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_stock.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_supplier_proposal.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_task.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_task_time.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_tax.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_technic.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_trip.png (100%)
 rename {htdocs => public}/theme/eldy/img/object_user.png (100%)
 rename {htdocs => public}/theme/eldy/img/off.png (100%)
 rename {htdocs => public}/theme/eldy/img/on.png (100%)
 rename {htdocs => public}/theme/eldy/img/pdf2.png (100%)
 rename {htdocs => public}/theme/eldy/img/pdf3.png (100%)
 rename {htdocs => public}/theme/eldy/img/play.png (100%)
 rename {htdocs => public}/theme/eldy/img/playdisabled.png (100%)
 rename {htdocs => public}/theme/eldy/img/preview.png (100%)
 rename {htdocs => public}/theme/eldy/img/preview_ext.png (100%)
 rename {htdocs => public}/theme/eldy/img/previous.png (100%)
 rename {htdocs => public}/theme/eldy/img/printer.png (100%)
 rename {htdocs => public}/theme/eldy/img/printer_top.png (100%)
 rename {htdocs => public}/theme/eldy/img/puce.png (100%)
 rename {htdocs => public}/theme/eldy/img/recent.png (100%)
 rename {htdocs => public}/theme/eldy/img/redstar.png (100%)
 rename {htdocs => public}/theme/eldy/img/refresh.png (100%)
 rename {htdocs => public}/theme/eldy/img/reload.png (100%)
 rename {htdocs => public}/theme/eldy/img/rightarrow.png (100%)
 rename {htdocs => public}/theme/eldy/img/search.png (100%)
 rename {htdocs => public}/theme/eldy/img/searchclear.png (100%)
 rename {htdocs => public}/theme/eldy/img/setup.png (100%)
 rename {htdocs => public}/theme/eldy/img/sort_asc.png (100%)
 rename {htdocs => public}/theme/eldy/img/sort_asc_disabled.png (100%)
 rename {htdocs => public}/theme/eldy/img/sort_desc.png (100%)
 rename {htdocs => public}/theme/eldy/img/sort_desc_disabled.png (100%)
 rename {htdocs => public}/theme/eldy/img/split.png (100%)
 rename {htdocs => public}/theme/eldy/img/star.png (100%)
 rename {htdocs => public}/theme/eldy/img/stats.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut0.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut0_40x40.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut1.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut1_40x40.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut3.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut3_40x40.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut4.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut4_40x40.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut5.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut5_40x40.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut6.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut6_40x40.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut7.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut7_40x40.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut8.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut8_40x40.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut9.png (100%)
 rename {htdocs => public}/theme/eldy/img/statut9_40x40.png (100%)
 rename {htdocs => public}/theme/eldy/img/stcomm-1.png (100%)
 rename {htdocs => public}/theme/eldy/img/stcomm0.png (100%)
 rename {htdocs => public}/theme/eldy/img/stcomm1.png (100%)
 rename {htdocs => public}/theme/eldy/img/stcomm2.png (100%)
 rename {htdocs => public}/theme/eldy/img/stcomm3.png (100%)
 rename {htdocs => public}/theme/eldy/img/stcomm4.png (100%)
 rename {htdocs => public}/theme/eldy/img/switch_off.png (100%)
 rename {htdocs => public}/theme/eldy/img/switch_on.png (100%)
 rename {htdocs => public}/theme/eldy/img/tab_background.png (100%)
 rename {htdocs => public}/theme/eldy/img/tick.png (100%)
 rename {htdocs => public}/theme/eldy/img/title.gif (100%)
 rename {htdocs => public}/theme/eldy/img/title.png (100%)
 rename {htdocs => public}/theme/eldy/img/title_accountancy.png (100%)
 rename {htdocs => public}/theme/eldy/img/title_agenda.png (100%)
 rename {htdocs => public}/theme/eldy/img/title_bank.png (100%)
 rename {htdocs => public}/theme/eldy/img/title_commercial.png (100%)
 rename {htdocs => public}/theme/eldy/img/title_companies.png (100%)
 rename {htdocs => public}/theme/eldy/img/title_generic.png (100%)
 rename {htdocs => public}/theme/eldy/img/title_home.png (100%)
 rename {htdocs => public}/theme/eldy/img/title_hrm.png (100%)
 rename {htdocs => public}/theme/eldy/img/title_products.png (100%)
 rename {htdocs => public}/theme/eldy/img/title_project.png (100%)
 rename {htdocs => public}/theme/eldy/img/title_setup.png (100%)
 rename {htdocs => public}/theme/eldy/img/tmenu.jpg (100%)
 rename {htdocs => public}/theme/eldy/img/tmenu2.jpg (100%)
 rename {htdocs => public}/theme/eldy/img/tmenu3.jpg (100%)
 rename {htdocs => public}/theme/eldy/img/tmenu_inverse.jpg (100%)
 rename {htdocs => public}/theme/eldy/img/unlock.png (100%)
 rename {htdocs => public}/theme/eldy/img/uparrow.png (100%)
 rename {htdocs => public}/theme/eldy/img/upload.png (100%)
 rename {htdocs => public}/theme/eldy/img/vcard.png (100%)
 rename {htdocs => public}/theme/eldy/img/view.png (100%)
 rename {htdocs => public}/theme/eldy/img/warning.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/index.html (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-clear-night.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-clear.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-clouds-night.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-clouds.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-few-clouds-night.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-few-clouds.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-freezing-rain.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-hail.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-many-clouds.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-mist.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-showers-day.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-showers-night.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-showers-scattered-day.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-showers-scattered-night.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-showers-scattered.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-showers.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-snow-rain.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-snow-scattered-day.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-snow-scattered-night.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-snow-scattered.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-snow.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-storm-day.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-storm-night.png (100%)
 rename {htdocs => public}/theme/eldy/img/weather/weather-storm.png (100%)
 rename {htdocs => public}/theme/eldy/img/working.gif (100%)
 rename {htdocs => public}/theme/eldy/img/working2.gif (100%)
 rename {htdocs => public}/theme/eldy/index.html (100%)
 rename {htdocs => public}/theme/eldy/style.css.php (100%)
 rename {htdocs => public}/theme/eldy/thumb.png (100%)
 rename {htdocs => public}/theme/eldy/tpl/README (100%)
 rename {htdocs => public}/theme/eldy/tpl/index.html (100%)
 rename {htdocs => public}/theme/index.html (100%)
 rename {htdocs => public}/theme/login_background.png (100%)
 rename {htdocs => public}/theme/login_logo.png (100%)
 rename {htdocs => public}/theme/md/.gitignore (100%)
 rename {htdocs => public}/theme/md/AUTHOR (100%)
 rename {htdocs => public}/theme/md/ckeditor/config.js (100%)
 rename {htdocs => public}/theme/md/ckeditor/index.html (100%)
 rename {htdocs => public}/theme/md/graph-color.php (100%)
 rename {htdocs => public}/theme/md/img/1downarrow.png (100%)
 rename {htdocs => public}/theme/md/img/1downarrow_selected.png (100%)
 rename {htdocs => public}/theme/md/img/1leftarrow.png (100%)
 rename {htdocs => public}/theme/md/img/1leftarrow_selected.png (100%)
 rename {htdocs => public}/theme/md/img/1rightarrow.png (100%)
 rename {htdocs => public}/theme/md/img/1rightarrow_selected.png (100%)
 rename {htdocs => public}/theme/md/img/1uparrow.png (100%)
 rename {htdocs => public}/theme/md/img/1uparrow_selected.png (100%)
 rename {htdocs => public}/theme/md/img/addfile.png (100%)
 rename {htdocs => public}/theme/md/img/background.png (100%)
 rename {htdocs => public}/theme/md/img/bg-bas-rubrique.png (100%)
 rename {htdocs => public}/theme/md/img/bg-rubrique.png (100%)
 rename {htdocs => public}/theme/md/img/bg-titre-rubrique.png (100%)
 rename {htdocs => public}/theme/md/img/button_bg.png (100%)
 rename {htdocs => public}/theme/md/img/button_edit.png (100%)
 rename {htdocs => public}/theme/md/img/calc.png (100%)
 rename {htdocs => public}/theme/md/img/calendar.png (100%)
 rename {htdocs => public}/theme/md/img/call.png (100%)
 rename {htdocs => public}/theme/md/img/call_out.png (100%)
 rename {htdocs => public}/theme/md/img/close.png (100%)
 rename {htdocs => public}/theme/md/img/close_title.png (100%)
 rename {htdocs => public}/theme/md/img/credit_card.png (100%)
 rename {htdocs => public}/theme/md/img/delete.png (100%)
 rename {htdocs => public}/theme/md/img/detail.png (100%)
 rename {htdocs => public}/theme/md/img/disable.png (100%)
 rename {htdocs => public}/theme/md/img/edit.png (100%)
 rename {htdocs => public}/theme/md/img/edit_add.png (100%)
 rename {htdocs => public}/theme/md/img/edit_remove.png (100%)
 rename {htdocs => public}/theme/md/img/editdelete.png (100%)
 rename {htdocs => public}/theme/md/img/error.png (100%)
 rename {htdocs => public}/theme/md/img/external.png (100%)
 rename {htdocs => public}/theme/md/img/favicon.ico (100%)
 rename {htdocs => public}/theme/md/img/file.png (100%)
 rename {htdocs => public}/theme/md/img/filenew.png (100%)
 rename {htdocs => public}/theme/md/img/filter.png (100%)
 rename {htdocs => public}/theme/md/img/folder-open.png (100%)
 rename {htdocs => public}/theme/md/img/folder.png (100%)
 rename {htdocs => public}/theme/md/img/gradient.gif (100%)
 rename {htdocs => public}/theme/md/img/grip.png (100%)
 rename {htdocs => public}/theme/md/img/grip_title.png (100%)
 rename {htdocs => public}/theme/md/img/headbg.jpg (100%)
 rename {htdocs => public}/theme/md/img/headbg2.jpg (100%)
 rename {htdocs => public}/theme/md/img/help.png (100%)
 rename {htdocs => public}/theme/md/img/helpdoc.png (100%)
 rename {htdocs => public}/theme/md/img/helpdoc_top.png (100%)
 rename {htdocs => public}/theme/md/img/high.png (100%)
 rename {htdocs => public}/theme/md/img/history.png (100%)
 rename {htdocs => public}/theme/md/img/index.html (100%)
 rename {htdocs => public}/theme/md/img/info.png (100%)
 rename {htdocs => public}/theme/md/img/info_black.png (100%)
 rename {htdocs => public}/theme/md/img/list.png (100%)
 rename {htdocs => public}/theme/md/img/liste_titre.png (100%)
 rename {htdocs => public}/theme/md/img/liste_titre2.png (100%)
 rename {htdocs => public}/theme/md/img/listlight.png (100%)
 rename {htdocs => public}/theme/md/img/lock.png (100%)
 rename {htdocs => public}/theme/md/img/login_background.png (100%)
 rename {htdocs => public}/theme/md/img/logo_setup.svg (100%)
 rename {htdocs => public}/theme/md/img/logout.png (100%)
 rename {htdocs => public}/theme/md/img/logout_top.png (100%)
 rename {htdocs => public}/theme/md/img/menu.png (100%)
 rename {htdocs => public}/theme/md/img/menus/agenda.png (100%)
 rename {htdocs => public}/theme/md/img/menus/bank.png (100%)
 rename {htdocs => public}/theme/md/img/menus/cart.png (100%)
 rename {htdocs => public}/theme/md/img/menus/chart.png (100%)
 rename {htdocs => public}/theme/md/img/menus/commercial.png (100%)
 rename {htdocs => public}/theme/md/img/menus/company.png (100%)
 rename {htdocs => public}/theme/md/img/menus/ecm.png (100%)
 rename {htdocs => public}/theme/md/img/menus/externalsite.png (100%)
 rename {htdocs => public}/theme/md/img/menus/ftp.png (100%)
 rename {htdocs => public}/theme/md/img/menus/generic1.png (100%)
 rename {htdocs => public}/theme/md/img/menus/generic2.png (100%)
 rename {htdocs => public}/theme/md/img/menus/generic3.png (100%)
 rename {htdocs => public}/theme/md/img/menus/generic4.png (100%)
 rename {htdocs => public}/theme/md/img/menus/globe.png (100%)
 rename {htdocs => public}/theme/md/img/menus/graph.png (100%)
 rename {htdocs => public}/theme/md/img/menus/holiday.png (100%)
 rename {htdocs => public}/theme/md/img/menus/home.png (100%)
 rename {htdocs => public}/theme/md/img/menus/index.html (100%)
 rename {htdocs => public}/theme/md/img/menus/mail.png (100%)
 rename {htdocs => public}/theme/md/img/menus/members.png (100%)
 rename {htdocs => public}/theme/md/img/menus/menu.png (100%)
 rename {htdocs => public}/theme/md/img/menus/money.png (100%)
 rename {htdocs => public}/theme/md/img/menus/pointofsale.png (100%)
 rename {htdocs => public}/theme/md/img/menus/products.png (100%)
 rename {htdocs => public}/theme/md/img/menus/project.png (100%)
 rename {htdocs => public}/theme/md/img/menus/shop.png (100%)
 rename {htdocs => public}/theme/md/img/menus/tools.png (100%)
 rename {htdocs => public}/theme/md/img/menutab-r.png (100%)
 rename {htdocs => public}/theme/md/img/nav-overlay.png (100%)
 rename {htdocs => public}/theme/md/img/nav-overlay3.png (100%)
 rename {htdocs => public}/theme/md/img/next.png (100%)
 rename {htdocs => public}/theme/md/img/nographyet.svg (100%)
 rename {htdocs => public}/theme/md/img/object_account.png (100%)
 rename {htdocs => public}/theme/md/img/object_accounting.png (100%)
 rename {htdocs => public}/theme/md/img/object_action.png (100%)
 rename {htdocs => public}/theme/md/img/object_address.png (100%)
 rename {htdocs => public}/theme/md/img/object_barcode.png (100%)
 rename {htdocs => public}/theme/md/img/object_bill.png (100%)
 rename {htdocs => public}/theme/md/img/object_billa.png (100%)
 rename {htdocs => public}/theme/md/img/object_billd.png (100%)
 rename {htdocs => public}/theme/md/img/object_billr.png (100%)
 rename {htdocs => public}/theme/md/img/object_book.png (100%)
 rename {htdocs => public}/theme/md/img/object_bookmark.png (100%)
 rename {htdocs => public}/theme/md/img/object_building.png (100%)
 rename {htdocs => public}/theme/md/img/object_calendar.png (100%)
 rename {htdocs => public}/theme/md/img/object_calendarday.png (100%)
 rename {htdocs => public}/theme/md/img/object_calendargantt.png (100%)
 rename {htdocs => public}/theme/md/img/object_calendarpertype.png (100%)
 rename {htdocs => public}/theme/md/img/object_calendarperuser.png (100%)
 rename {htdocs => public}/theme/md/img/object_calendarweek.png (100%)
 rename {htdocs => public}/theme/md/img/object_category-expanded.png (100%)
 rename {htdocs => public}/theme/md/img/object_category.png (100%)
 rename {htdocs => public}/theme/md/img/object_commercial.png (100%)
 rename {htdocs => public}/theme/md/img/object_company.png (100%)
 rename {htdocs => public}/theme/md/img/object_contact.png (100%)
 rename {htdocs => public}/theme/md/img/object_contract.png (100%)
 rename {htdocs => public}/theme/md/img/object_cron.png (100%)
 rename {htdocs => public}/theme/md/img/object_dir.png (100%)
 rename {htdocs => public}/theme/md/img/object_email.png (100%)
 rename {htdocs => public}/theme/md/img/object_energy.png (100%)
 rename {htdocs => public}/theme/md/img/object_generic.png (100%)
 rename {htdocs => public}/theme/md/img/object_globe.png (100%)
 rename {htdocs => public}/theme/md/img/object_gravatar.png (100%)
 rename {htdocs => public}/theme/md/img/object_group.png (100%)
 rename {htdocs => public}/theme/md/img/object_holiday.png (100%)
 rename {htdocs => public}/theme/md/img/object_intervention.png (100%)
 rename {htdocs => public}/theme/md/img/object_invoice.png (100%)
 rename {htdocs => public}/theme/md/img/object_label.png (100%)
 rename {htdocs => public}/theme/md/img/object_list.png (100%)
 rename {htdocs => public}/theme/md/img/object_margin.png (100%)
 rename {htdocs => public}/theme/md/img/object_opensurvey.png (100%)
 rename {htdocs => public}/theme/md/img/object_order.png (100%)
 rename {htdocs => public}/theme/md/img/object_payment.png (100%)
 rename {htdocs => public}/theme/md/img/object_phoning.png (100%)
 rename {htdocs => public}/theme/md/img/object_phoning_fax.png (100%)
 rename {htdocs => public}/theme/md/img/object_printer.png (100%)
 rename {htdocs => public}/theme/md/img/object_product.png (100%)
 rename {htdocs => public}/theme/md/img/object_project.png (100%)
 rename {htdocs => public}/theme/md/img/object_projectpub.png (100%)
 rename {htdocs => public}/theme/md/img/object_projecttask.png (100%)
 rename {htdocs => public}/theme/md/img/object_propal.png (100%)
 rename {htdocs => public}/theme/md/img/object_reduc.png (100%)
 rename {htdocs => public}/theme/md/img/object_resource.png (100%)
 rename {htdocs => public}/theme/md/img/object_rss.png (100%)
 rename {htdocs => public}/theme/md/img/object_sending.png (100%)
 rename {htdocs => public}/theme/md/img/object_service.png (100%)
 rename {htdocs => public}/theme/md/img/object_skype.png (100%)
 rename {htdocs => public}/theme/md/img/object_stock.png (100%)
 rename {htdocs => public}/theme/md/img/object_supplier_proposal.png (100%)
 rename {htdocs => public}/theme/md/img/object_task.png (100%)
 rename {htdocs => public}/theme/md/img/object_task_time.png (100%)
 rename {htdocs => public}/theme/md/img/object_tax.png (100%)
 rename {htdocs => public}/theme/md/img/object_technic.png (100%)
 rename {htdocs => public}/theme/md/img/object_trip.png (100%)
 rename {htdocs => public}/theme/md/img/object_user.png (100%)
 rename {htdocs => public}/theme/md/img/off.png (100%)
 rename {htdocs => public}/theme/md/img/on.png (100%)
 rename {htdocs => public}/theme/md/img/pdf2.png (100%)
 rename {htdocs => public}/theme/md/img/pdf3.png (100%)
 rename {htdocs => public}/theme/md/img/play.png (100%)
 rename {htdocs => public}/theme/md/img/playdisabled.png (100%)
 rename {htdocs => public}/theme/md/img/preview.png (100%)
 rename {htdocs => public}/theme/md/img/preview_ext.png (100%)
 rename {htdocs => public}/theme/md/img/previous.png (100%)
 rename {htdocs => public}/theme/md/img/printer.png (100%)
 rename {htdocs => public}/theme/md/img/printer_top.png (100%)
 rename {htdocs => public}/theme/md/img/puce.png (100%)
 rename {htdocs => public}/theme/md/img/recent.png (100%)
 rename {htdocs => public}/theme/md/img/redstar.png (100%)
 rename {htdocs => public}/theme/md/img/refresh.png (100%)
 rename {htdocs => public}/theme/md/img/reload.png (100%)
 rename {htdocs => public}/theme/md/img/rightarrow.png (100%)
 rename {htdocs => public}/theme/md/img/search.png (100%)
 rename {htdocs => public}/theme/md/img/searchclear.png (100%)
 rename {htdocs => public}/theme/md/img/setup.png (100%)
 rename {htdocs => public}/theme/md/img/sort_asc.png (100%)
 rename {htdocs => public}/theme/md/img/sort_asc_disabled.png (100%)
 rename {htdocs => public}/theme/md/img/sort_desc.png (100%)
 rename {htdocs => public}/theme/md/img/sort_desc_disabled.png (100%)
 rename {htdocs => public}/theme/md/img/split.png (100%)
 rename {htdocs => public}/theme/md/img/star.png (100%)
 rename {htdocs => public}/theme/md/img/stats.png (100%)
 rename {htdocs => public}/theme/md/img/statut0.png (100%)
 rename {htdocs => public}/theme/md/img/statut0_40x40.png (100%)
 rename {htdocs => public}/theme/md/img/statut1.png (100%)
 rename {htdocs => public}/theme/md/img/statut1_40x40.png (100%)
 rename {htdocs => public}/theme/md/img/statut3.png (100%)
 rename {htdocs => public}/theme/md/img/statut3_40x40.png (100%)
 rename {htdocs => public}/theme/md/img/statut4.png (100%)
 rename {htdocs => public}/theme/md/img/statut4_40x40.png (100%)
 rename {htdocs => public}/theme/md/img/statut5.png (100%)
 rename {htdocs => public}/theme/md/img/statut5_40x40.png (100%)
 rename {htdocs => public}/theme/md/img/statut6.png (100%)
 rename {htdocs => public}/theme/md/img/statut6_40x40.png (100%)
 rename {htdocs => public}/theme/md/img/statut7.png (100%)
 rename {htdocs => public}/theme/md/img/statut7_40x40.png (100%)
 rename {htdocs => public}/theme/md/img/statut8.png (100%)
 rename {htdocs => public}/theme/md/img/statut8_40x40.png (100%)
 rename {htdocs => public}/theme/md/img/statut9.png (100%)
 rename {htdocs => public}/theme/md/img/statut9_40x40.png (100%)
 rename {htdocs => public}/theme/md/img/stcomm-1.png (100%)
 rename {htdocs => public}/theme/md/img/stcomm0.png (100%)
 rename {htdocs => public}/theme/md/img/stcomm1.png (100%)
 rename {htdocs => public}/theme/md/img/stcomm2.png (100%)
 rename {htdocs => public}/theme/md/img/stcomm3.png (100%)
 rename {htdocs => public}/theme/md/img/stcomm4.png (100%)
 rename {htdocs => public}/theme/md/img/switch_off.png (100%)
 rename {htdocs => public}/theme/md/img/switch_off_old.png (100%)
 rename {htdocs => public}/theme/md/img/switch_on.png (100%)
 rename {htdocs => public}/theme/md/img/switch_on_old.png (100%)
 rename {htdocs => public}/theme/md/img/tab_background.png (100%)
 rename {htdocs => public}/theme/md/img/tick.png (100%)
 rename {htdocs => public}/theme/md/img/title.gif (100%)
 rename {htdocs => public}/theme/md/img/title.png (100%)
 rename {htdocs => public}/theme/md/img/title_accountancy.png (100%)
 rename {htdocs => public}/theme/md/img/title_agenda.png (100%)
 rename {htdocs => public}/theme/md/img/title_bank.png (100%)
 rename {htdocs => public}/theme/md/img/title_commercial.png (100%)
 rename {htdocs => public}/theme/md/img/title_companies.png (100%)
 rename {htdocs => public}/theme/md/img/title_generic.png (100%)
 rename {htdocs => public}/theme/md/img/title_home.png (100%)
 rename {htdocs => public}/theme/md/img/title_hrm.png (100%)
 rename {htdocs => public}/theme/md/img/title_products.png (100%)
 rename {htdocs => public}/theme/md/img/title_project.png (100%)
 rename {htdocs => public}/theme/md/img/title_setup.png (100%)
 rename {htdocs => public}/theme/md/img/tmenu.jpg (100%)
 rename {htdocs => public}/theme/md/img/tmenu2.jpg (100%)
 rename {htdocs => public}/theme/md/img/tmenu3.jpg (100%)
 rename {htdocs => public}/theme/md/img/tmenu_inverse.jpg (100%)
 rename {htdocs => public}/theme/md/img/unlock.png (100%)
 rename {htdocs => public}/theme/md/img/uparrow.png (100%)
 rename {htdocs => public}/theme/md/img/upload.png (100%)
 rename {htdocs => public}/theme/md/img/vcard.png (100%)
 rename {htdocs => public}/theme/md/img/view.png (100%)
 rename {htdocs => public}/theme/md/img/warning.png (100%)
 rename {htdocs => public}/theme/md/img/weather/index.html (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-clear-night.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-clear.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-clouds-night.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-clouds.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-few-clouds-night.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-few-clouds.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-freezing-rain.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-hail.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-many-clouds.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-mist.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-showers-day.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-showers-night.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-showers-scattered-day.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-showers-scattered-night.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-showers-scattered.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-showers.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-snow-rain.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-snow-scattered-day.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-snow-scattered-night.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-snow-scattered.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-snow.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-storm-day.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-storm-night.png (100%)
 rename {htdocs => public}/theme/md/img/weather/weather-storm.png (100%)
 rename {htdocs => public}/theme/md/img/working.gif (100%)
 rename {htdocs => public}/theme/md/img/working2.gif (100%)
 rename {htdocs => public}/theme/md/index.html (100%)
 rename {htdocs => public}/theme/md/style.css.php (100%)
 rename {htdocs => public}/theme/md/thumb.png (100%)
 rename {htdocs => public}/theme/md/tpl/README (100%)
 rename {htdocs => public}/theme/md/tpl/index.html (100%)
 rename {htdocs => public}/user/admin/group_extrafields.php (100%)
 rename {htdocs => public}/user/admin/index.html (100%)
 rename {htdocs => public}/user/admin/user_extrafields.php (100%)
 rename {htdocs => public}/user/agenda_extsites.php (100%)
 rename {htdocs => public}/user/bank.php (100%)
 rename {htdocs => public}/user/card.php (100%)
 rename {htdocs => public}/user/class/api_deprecated_user.class.php (100%)
 rename {htdocs => public}/user/class/api_users.class.php (100%)
 rename {htdocs => public}/user/class/index.html (100%)
 rename {htdocs => public}/user/class/user.class.php (100%)
 rename {htdocs => public}/user/class/userbankaccount.class.php (100%)
 rename {htdocs => public}/user/class/usergroup.class.php (100%)
 rename {htdocs => public}/user/clicktodial.php (100%)
 rename {htdocs => public}/user/document.php (100%)
 rename {htdocs => public}/user/group/card.php (100%)
 rename {htdocs => public}/user/group/index.php (100%)
 rename {htdocs => public}/user/group/ldap.php (100%)
 rename {htdocs => public}/user/group/perms.php (100%)
 rename {htdocs => public}/user/hierarchy.php (100%)
 rename {htdocs => public}/user/home.php (100%)
 rename {htdocs => public}/user/index.php (100%)
 rename {htdocs => public}/user/info.php (100%)
 rename {htdocs => public}/user/ldap.php (100%)
 rename {htdocs => public}/user/logout.php (100%)
 rename {htdocs => public}/user/note.php (100%)
 rename {htdocs => public}/user/notify/card.php (100%)
 rename {htdocs => public}/user/param_ihm.php (100%)
 rename {htdocs => public}/user/passwordforgotten.php (100%)
 rename {htdocs => public}/user/perms.php (100%)
 rename {htdocs => public}/viewimage.php (100%)
 rename {htdocs => public}/webservices/README.md (100%)
 rename {htdocs => public}/webservices/admin/index.php (100%)
 rename {htdocs => public}/webservices/demo_wsclient_actioncomm.php-NORUN (100%)
 rename {htdocs => public}/webservices/demo_wsclient_category.php-NORUN (100%)
 rename {htdocs => public}/webservices/demo_wsclient_invoice.php-NORUN (100%)
 rename {htdocs => public}/webservices/demo_wsclient_order.php-NORUN (100%)
 rename {htdocs => public}/webservices/demo_wsclient_other.php-NORUN (100%)
 rename {htdocs => public}/webservices/demo_wsclient_productorservice.php-NORUN (100%)
 rename {htdocs => public}/webservices/demo_wsclient_project.php-NORUN (100%)
 rename {htdocs => public}/webservices/demo_wsclient_thirdparty.php-NORUN (100%)
 rename {htdocs => public}/webservices/index.php (100%)
 rename {htdocs => public}/webservices/server_actioncomm.php (100%)
 rename {htdocs => public}/webservices/server_category.php (100%)
 rename {htdocs => public}/webservices/server_contact.php (100%)
 rename {htdocs => public}/webservices/server_invoice.php (100%)
 rename {htdocs => public}/webservices/server_order.php (100%)
 rename {htdocs => public}/webservices/server_other.php (100%)
 rename {htdocs => public}/webservices/server_productorservice.php (100%)
 rename {htdocs => public}/webservices/server_project.php (100%)
 rename {htdocs => public}/webservices/server_supplier_invoice.php (100%)
 rename {htdocs => public}/webservices/server_thirdparty.php (100%)
 rename {htdocs => public}/webservices/server_user.php (100%)
 rename {htdocs => public}/websites/class/website.class.php (100%)
 rename {htdocs => public}/websites/class/websitepage.class.php (100%)
 rename {htdocs => public}/websites/frametop.php (100%)
 rename {htdocs => public}/websites/index.html (100%)
 rename {htdocs => public}/websites/index.php (100%)

diff --git a/htdocs/.gitignore b/public/.gitignore
similarity index 100%
rename from htdocs/.gitignore
rename to public/.gitignore
diff --git a/htdocs/accountancy/admin/account.php b/public/accountancy/admin/account.php
similarity index 100%
rename from htdocs/accountancy/admin/account.php
rename to public/accountancy/admin/account.php
diff --git a/htdocs/accountancy/admin/accountmodel.php b/public/accountancy/admin/accountmodel.php
similarity index 100%
rename from htdocs/accountancy/admin/accountmodel.php
rename to public/accountancy/admin/accountmodel.php
diff --git a/htdocs/accountancy/admin/card.php b/public/accountancy/admin/card.php
similarity index 100%
rename from htdocs/accountancy/admin/card.php
rename to public/accountancy/admin/card.php
diff --git a/htdocs/accountancy/admin/categories.php b/public/accountancy/admin/categories.php
similarity index 100%
rename from htdocs/accountancy/admin/categories.php
rename to public/accountancy/admin/categories.php
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/public/accountancy/admin/defaultaccounts.php
similarity index 100%
rename from htdocs/accountancy/admin/defaultaccounts.php
rename to public/accountancy/admin/defaultaccounts.php
diff --git a/htdocs/accountancy/admin/export.php b/public/accountancy/admin/export.php
similarity index 100%
rename from htdocs/accountancy/admin/export.php
rename to public/accountancy/admin/export.php
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/public/accountancy/admin/fiscalyear.php
similarity index 100%
rename from htdocs/accountancy/admin/fiscalyear.php
rename to public/accountancy/admin/fiscalyear.php
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/public/accountancy/admin/fiscalyear_card.php
similarity index 100%
rename from htdocs/accountancy/admin/fiscalyear_card.php
rename to public/accountancy/admin/fiscalyear_card.php
diff --git a/htdocs/accountancy/admin/fiscalyear_info.php b/public/accountancy/admin/fiscalyear_info.php
similarity index 100%
rename from htdocs/accountancy/admin/fiscalyear_info.php
rename to public/accountancy/admin/fiscalyear_info.php
diff --git a/htdocs/accountancy/admin/importaccounts.php b/public/accountancy/admin/importaccounts.php
similarity index 100%
rename from htdocs/accountancy/admin/importaccounts.php
rename to public/accountancy/admin/importaccounts.php
diff --git a/htdocs/accountancy/admin/index.html b/public/accountancy/admin/index.html
similarity index 100%
rename from htdocs/accountancy/admin/index.html
rename to public/accountancy/admin/index.html
diff --git a/htdocs/accountancy/admin/index.php b/public/accountancy/admin/index.php
similarity index 100%
rename from htdocs/accountancy/admin/index.php
rename to public/accountancy/admin/index.php
diff --git a/htdocs/accountancy/admin/journal.php b/public/accountancy/admin/journal.php
similarity index 100%
rename from htdocs/accountancy/admin/journal.php
rename to public/accountancy/admin/journal.php
diff --git a/htdocs/accountancy/admin/productaccount.php b/public/accountancy/admin/productaccount.php
similarity index 100%
rename from htdocs/accountancy/admin/productaccount.php
rename to public/accountancy/admin/productaccount.php
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/public/accountancy/bookkeeping/balance.php
similarity index 100%
rename from htdocs/accountancy/bookkeeping/balance.php
rename to public/accountancy/bookkeeping/balance.php
diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/public/accountancy/bookkeeping/balancebymonth.php
similarity index 100%
rename from htdocs/accountancy/bookkeeping/balancebymonth.php
rename to public/accountancy/bookkeeping/balancebymonth.php
diff --git a/htdocs/accountancy/bookkeeping/card.php b/public/accountancy/bookkeeping/card.php
similarity index 100%
rename from htdocs/accountancy/bookkeeping/card.php
rename to public/accountancy/bookkeeping/card.php
diff --git a/htdocs/accountancy/bookkeeping/index.html b/public/accountancy/bookkeeping/index.html
similarity index 100%
rename from htdocs/accountancy/bookkeeping/index.html
rename to public/accountancy/bookkeeping/index.html
diff --git a/htdocs/accountancy/bookkeeping/list.php b/public/accountancy/bookkeeping/list.php
similarity index 100%
rename from htdocs/accountancy/bookkeeping/list.php
rename to public/accountancy/bookkeeping/list.php
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/public/accountancy/bookkeeping/listbyaccount.php
similarity index 100%
rename from htdocs/accountancy/bookkeeping/listbyaccount.php
rename to public/accountancy/bookkeeping/listbyaccount.php
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/public/accountancy/bookkeeping/listbyyear.php
similarity index 100%
rename from htdocs/accountancy/bookkeeping/listbyyear.php
rename to public/accountancy/bookkeeping/listbyyear.php
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/public/accountancy/class/accountancycategory.class.php
similarity index 100%
rename from htdocs/accountancy/class/accountancycategory.class.php
rename to public/accountancy/class/accountancycategory.class.php
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/public/accountancy/class/accountancyexport.class.php
similarity index 100%
rename from htdocs/accountancy/class/accountancyexport.class.php
rename to public/accountancy/class/accountancyexport.class.php
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/public/accountancy/class/accountancysystem.class.php
similarity index 100%
rename from htdocs/accountancy/class/accountancysystem.class.php
rename to public/accountancy/class/accountancysystem.class.php
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/public/accountancy/class/accountingaccount.class.php
similarity index 100%
rename from htdocs/accountancy/class/accountingaccount.class.php
rename to public/accountancy/class/accountingaccount.class.php
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/public/accountancy/class/bookkeeping.class.php
similarity index 100%
rename from htdocs/accountancy/class/bookkeeping.class.php
rename to public/accountancy/class/bookkeeping.class.php
diff --git a/htdocs/accountancy/class/html.formventilation.class.php b/public/accountancy/class/html.formventilation.class.php
similarity index 100%
rename from htdocs/accountancy/class/html.formventilation.class.php
rename to public/accountancy/class/html.formventilation.class.php
diff --git a/htdocs/accountancy/class/index.html b/public/accountancy/class/index.html
similarity index 100%
rename from htdocs/accountancy/class/index.html
rename to public/accountancy/class/index.html
diff --git a/htdocs/accountancy/customer/card.php b/public/accountancy/customer/card.php
similarity index 100%
rename from htdocs/accountancy/customer/card.php
rename to public/accountancy/customer/card.php
diff --git a/htdocs/accountancy/customer/index.html b/public/accountancy/customer/index.html
similarity index 100%
rename from htdocs/accountancy/customer/index.html
rename to public/accountancy/customer/index.html
diff --git a/htdocs/accountancy/customer/index.php b/public/accountancy/customer/index.php
similarity index 100%
rename from htdocs/accountancy/customer/index.php
rename to public/accountancy/customer/index.php
diff --git a/htdocs/accountancy/customer/lines.php b/public/accountancy/customer/lines.php
similarity index 100%
rename from htdocs/accountancy/customer/lines.php
rename to public/accountancy/customer/lines.php
diff --git a/htdocs/accountancy/customer/list.php b/public/accountancy/customer/list.php
similarity index 100%
rename from htdocs/accountancy/customer/list.php
rename to public/accountancy/customer/list.php
diff --git a/htdocs/accountancy/expensereport/card.php b/public/accountancy/expensereport/card.php
similarity index 100%
rename from htdocs/accountancy/expensereport/card.php
rename to public/accountancy/expensereport/card.php
diff --git a/htdocs/accountancy/expensereport/index.html b/public/accountancy/expensereport/index.html
similarity index 100%
rename from htdocs/accountancy/expensereport/index.html
rename to public/accountancy/expensereport/index.html
diff --git a/htdocs/accountancy/expensereport/index.php b/public/accountancy/expensereport/index.php
similarity index 100%
rename from htdocs/accountancy/expensereport/index.php
rename to public/accountancy/expensereport/index.php
diff --git a/htdocs/accountancy/expensereport/lines.php b/public/accountancy/expensereport/lines.php
similarity index 100%
rename from htdocs/accountancy/expensereport/lines.php
rename to public/accountancy/expensereport/lines.php
diff --git a/htdocs/accountancy/expensereport/list.php b/public/accountancy/expensereport/list.php
similarity index 100%
rename from htdocs/accountancy/expensereport/list.php
rename to public/accountancy/expensereport/list.php
diff --git a/htdocs/accountancy/index.html b/public/accountancy/index.html
similarity index 100%
rename from htdocs/accountancy/index.html
rename to public/accountancy/index.html
diff --git a/htdocs/accountancy/index.php b/public/accountancy/index.php
similarity index 100%
rename from htdocs/accountancy/index.php
rename to public/accountancy/index.php
diff --git a/htdocs/accountancy/journal/bankjournal.php b/public/accountancy/journal/bankjournal.php
similarity index 100%
rename from htdocs/accountancy/journal/bankjournal.php
rename to public/accountancy/journal/bankjournal.php
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/public/accountancy/journal/expensereportsjournal.php
similarity index 100%
rename from htdocs/accountancy/journal/expensereportsjournal.php
rename to public/accountancy/journal/expensereportsjournal.php
diff --git a/htdocs/accountancy/journal/index.html b/public/accountancy/journal/index.html
similarity index 100%
rename from htdocs/accountancy/journal/index.html
rename to public/accountancy/journal/index.html
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/public/accountancy/journal/purchasesjournal.php
similarity index 100%
rename from htdocs/accountancy/journal/purchasesjournal.php
rename to public/accountancy/journal/purchasesjournal.php
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/public/accountancy/journal/sellsjournal.php
similarity index 100%
rename from htdocs/accountancy/journal/sellsjournal.php
rename to public/accountancy/journal/sellsjournal.php
diff --git a/htdocs/accountancy/report/index.html b/public/accountancy/report/index.html
similarity index 100%
rename from htdocs/accountancy/report/index.html
rename to public/accountancy/report/index.html
diff --git a/htdocs/accountancy/report/result.php b/public/accountancy/report/result.php
similarity index 100%
rename from htdocs/accountancy/report/result.php
rename to public/accountancy/report/result.php
diff --git a/htdocs/accountancy/supplier/card.php b/public/accountancy/supplier/card.php
similarity index 100%
rename from htdocs/accountancy/supplier/card.php
rename to public/accountancy/supplier/card.php
diff --git a/htdocs/accountancy/supplier/index.html b/public/accountancy/supplier/index.html
similarity index 100%
rename from htdocs/accountancy/supplier/index.html
rename to public/accountancy/supplier/index.html
diff --git a/htdocs/accountancy/supplier/index.php b/public/accountancy/supplier/index.php
similarity index 100%
rename from htdocs/accountancy/supplier/index.php
rename to public/accountancy/supplier/index.php
diff --git a/htdocs/accountancy/supplier/lines.php b/public/accountancy/supplier/lines.php
similarity index 100%
rename from htdocs/accountancy/supplier/lines.php
rename to public/accountancy/supplier/lines.php
diff --git a/htdocs/accountancy/supplier/list.php b/public/accountancy/supplier/list.php
similarity index 100%
rename from htdocs/accountancy/supplier/list.php
rename to public/accountancy/supplier/list.php
diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/public/accountancy/tpl/export_journal.tpl.php
similarity index 100%
rename from htdocs/accountancy/tpl/export_journal.tpl.php
rename to public/accountancy/tpl/export_journal.tpl.php
diff --git a/htdocs/accountancy/tpl/index.html b/public/accountancy/tpl/index.html
similarity index 100%
rename from htdocs/accountancy/tpl/index.html
rename to public/accountancy/tpl/index.html
diff --git a/htdocs/adherents/admin/adherent.php b/public/adherents/admin/adherent.php
similarity index 100%
rename from htdocs/adherents/admin/adherent.php
rename to public/adherents/admin/adherent.php
diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/public/adherents/admin/adherent_extrafields.php
similarity index 100%
rename from htdocs/adherents/admin/adherent_extrafields.php
rename to public/adherents/admin/adherent_extrafields.php
diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/public/adherents/admin/adherent_type_extrafields.php
similarity index 100%
rename from htdocs/adherents/admin/adherent_type_extrafields.php
rename to public/adherents/admin/adherent_type_extrafields.php
diff --git a/htdocs/adherents/admin/index.html b/public/adherents/admin/index.html
similarity index 100%
rename from htdocs/adherents/admin/index.html
rename to public/adherents/admin/index.html
diff --git a/htdocs/adherents/admin/public.php b/public/adherents/admin/public.php
similarity index 100%
rename from htdocs/adherents/admin/public.php
rename to public/adherents/admin/public.php
diff --git a/htdocs/adherents/agenda.php b/public/adherents/agenda.php
similarity index 100%
rename from htdocs/adherents/agenda.php
rename to public/adherents/agenda.php
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/public/adherents/canvas/actions_adherentcard_common.class.php
similarity index 100%
rename from htdocs/adherents/canvas/actions_adherentcard_common.class.php
rename to public/adherents/canvas/actions_adherentcard_common.class.php
diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/public/adherents/canvas/default/actions_adherentcard_default.class.php
similarity index 100%
rename from htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
rename to public/adherents/canvas/default/actions_adherentcard_default.class.php
diff --git a/htdocs/adherents/canvas/default/index.html b/public/adherents/canvas/default/index.html
similarity index 100%
rename from htdocs/adherents/canvas/default/index.html
rename to public/adherents/canvas/default/index.html
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php b/public/adherents/canvas/default/tpl/adherentcard_create.tpl.php
similarity index 100%
rename from htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
rename to public/adherents/canvas/default/tpl/adherentcard_create.tpl.php
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php b/public/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
similarity index 100%
rename from htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
rename to public/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php b/public/adherents/canvas/default/tpl/adherentcard_view.tpl.php
similarity index 100%
rename from htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
rename to public/adherents/canvas/default/tpl/adherentcard_view.tpl.php
diff --git a/htdocs/adherents/canvas/default/tpl/index.html b/public/adherents/canvas/default/tpl/index.html
similarity index 100%
rename from htdocs/adherents/canvas/default/tpl/index.html
rename to public/adherents/canvas/default/tpl/index.html
diff --git a/htdocs/adherents/canvas/index.html b/public/adherents/canvas/index.html
similarity index 100%
rename from htdocs/adherents/canvas/index.html
rename to public/adherents/canvas/index.html
diff --git a/htdocs/adherents/card.php b/public/adherents/card.php
similarity index 100%
rename from htdocs/adherents/card.php
rename to public/adherents/card.php
diff --git a/htdocs/adherents/cartes/carte.php b/public/adherents/cartes/carte.php
similarity index 100%
rename from htdocs/adherents/cartes/carte.php
rename to public/adherents/cartes/carte.php
diff --git a/htdocs/adherents/cartes/index.html b/public/adherents/cartes/index.html
similarity index 100%
rename from htdocs/adherents/cartes/index.html
rename to public/adherents/cartes/index.html
diff --git a/htdocs/adherents/class/adherent.class.php b/public/adherents/class/adherent.class.php
similarity index 100%
rename from htdocs/adherents/class/adherent.class.php
rename to public/adherents/class/adherent.class.php
diff --git a/htdocs/adherents/class/adherent_type.class.php b/public/adherents/class/adherent_type.class.php
similarity index 100%
rename from htdocs/adherents/class/adherent_type.class.php
rename to public/adherents/class/adherent_type.class.php
diff --git a/htdocs/adherents/class/adherentstats.class.php b/public/adherents/class/adherentstats.class.php
similarity index 100%
rename from htdocs/adherents/class/adherentstats.class.php
rename to public/adherents/class/adherentstats.class.php
diff --git a/htdocs/adherents/class/api_members.class.php b/public/adherents/class/api_members.class.php
similarity index 100%
rename from htdocs/adherents/class/api_members.class.php
rename to public/adherents/class/api_members.class.php
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/public/adherents/class/api_subscriptions.class.php
similarity index 100%
rename from htdocs/adherents/class/api_subscriptions.class.php
rename to public/adherents/class/api_subscriptions.class.php
diff --git a/htdocs/adherents/class/index.html b/public/adherents/class/index.html
similarity index 100%
rename from htdocs/adherents/class/index.html
rename to public/adherents/class/index.html
diff --git a/htdocs/adherents/class/subscription.class.php b/public/adherents/class/subscription.class.php
similarity index 100%
rename from htdocs/adherents/class/subscription.class.php
rename to public/adherents/class/subscription.class.php
diff --git a/htdocs/adherents/document.php b/public/adherents/document.php
similarity index 100%
rename from htdocs/adherents/document.php
rename to public/adherents/document.php
diff --git a/htdocs/adherents/htpasswd.php b/public/adherents/htpasswd.php
similarity index 100%
rename from htdocs/adherents/htpasswd.php
rename to public/adherents/htpasswd.php
diff --git a/htdocs/adherents/index.php b/public/adherents/index.php
similarity index 100%
rename from htdocs/adherents/index.php
rename to public/adherents/index.php
diff --git a/htdocs/adherents/ldap.php b/public/adherents/ldap.php
similarity index 100%
rename from htdocs/adherents/ldap.php
rename to public/adherents/ldap.php
diff --git a/htdocs/adherents/list.php b/public/adherents/list.php
similarity index 100%
rename from htdocs/adherents/list.php
rename to public/adherents/list.php
diff --git a/htdocs/adherents/note.php b/public/adherents/note.php
similarity index 100%
rename from htdocs/adherents/note.php
rename to public/adherents/note.php
diff --git a/htdocs/adherents/stats/byproperties.php b/public/adherents/stats/byproperties.php
similarity index 100%
rename from htdocs/adherents/stats/byproperties.php
rename to public/adherents/stats/byproperties.php
diff --git a/htdocs/adherents/stats/geo.php b/public/adherents/stats/geo.php
similarity index 100%
rename from htdocs/adherents/stats/geo.php
rename to public/adherents/stats/geo.php
diff --git a/htdocs/adherents/stats/index.html b/public/adherents/stats/index.html
similarity index 100%
rename from htdocs/adherents/stats/index.html
rename to public/adherents/stats/index.html
diff --git a/htdocs/adherents/stats/index.php b/public/adherents/stats/index.php
similarity index 100%
rename from htdocs/adherents/stats/index.php
rename to public/adherents/stats/index.php
diff --git a/htdocs/adherents/subscription.php b/public/adherents/subscription.php
similarity index 100%
rename from htdocs/adherents/subscription.php
rename to public/adherents/subscription.php
diff --git a/htdocs/adherents/subscription/card.php b/public/adherents/subscription/card.php
similarity index 100%
rename from htdocs/adherents/subscription/card.php
rename to public/adherents/subscription/card.php
diff --git a/htdocs/adherents/subscription/index.html b/public/adherents/subscription/index.html
similarity index 100%
rename from htdocs/adherents/subscription/index.html
rename to public/adherents/subscription/index.html
diff --git a/htdocs/adherents/subscription/info.php b/public/adherents/subscription/info.php
similarity index 100%
rename from htdocs/adherents/subscription/info.php
rename to public/adherents/subscription/info.php
diff --git a/htdocs/adherents/subscription/list.php b/public/adherents/subscription/list.php
similarity index 100%
rename from htdocs/adherents/subscription/list.php
rename to public/adherents/subscription/list.php
diff --git a/htdocs/adherents/tpl/index.html b/public/adherents/tpl/index.html
similarity index 100%
rename from htdocs/adherents/tpl/index.html
rename to public/adherents/tpl/index.html
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/public/adherents/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from htdocs/adherents/tpl/linkedobjectblock.tpl.php
rename to public/adherents/tpl/linkedobjectblock.tpl.php
diff --git a/htdocs/adherents/type.php b/public/adherents/type.php
similarity index 100%
rename from htdocs/adherents/type.php
rename to public/adherents/type.php
diff --git a/htdocs/admin/agenda.php b/public/admin/agenda.php
similarity index 100%
rename from htdocs/admin/agenda.php
rename to public/admin/agenda.php
diff --git a/htdocs/admin/agenda_extrafields.php b/public/admin/agenda_extrafields.php
similarity index 100%
rename from htdocs/admin/agenda_extrafields.php
rename to public/admin/agenda_extrafields.php
diff --git a/htdocs/admin/agenda_extsites.php b/public/admin/agenda_extsites.php
similarity index 100%
rename from htdocs/admin/agenda_extsites.php
rename to public/admin/agenda_extsites.php
diff --git a/htdocs/admin/agenda_other.php b/public/admin/agenda_other.php
similarity index 100%
rename from htdocs/admin/agenda_other.php
rename to public/admin/agenda_other.php
diff --git a/htdocs/admin/agenda_xcal.php b/public/admin/agenda_xcal.php
similarity index 100%
rename from htdocs/admin/agenda_xcal.php
rename to public/admin/agenda_xcal.php
diff --git a/htdocs/admin/bank.php b/public/admin/bank.php
similarity index 100%
rename from htdocs/admin/bank.php
rename to public/admin/bank.php
diff --git a/htdocs/admin/bank_extrafields.php b/public/admin/bank_extrafields.php
similarity index 100%
rename from htdocs/admin/bank_extrafields.php
rename to public/admin/bank_extrafields.php
diff --git a/htdocs/admin/barcode.php b/public/admin/barcode.php
similarity index 100%
rename from htdocs/admin/barcode.php
rename to public/admin/barcode.php
diff --git a/htdocs/admin/boxes.php b/public/admin/boxes.php
similarity index 100%
rename from htdocs/admin/boxes.php
rename to public/admin/boxes.php
diff --git a/htdocs/admin/chequereceipts.php b/public/admin/chequereceipts.php
similarity index 100%
rename from htdocs/admin/chequereceipts.php
rename to public/admin/chequereceipts.php
diff --git a/htdocs/admin/clicktodial.php b/public/admin/clicktodial.php
similarity index 100%
rename from htdocs/admin/clicktodial.php
rename to public/admin/clicktodial.php
diff --git a/htdocs/admin/commande.php b/public/admin/commande.php
similarity index 100%
rename from htdocs/admin/commande.php
rename to public/admin/commande.php
diff --git a/htdocs/admin/company.php b/public/admin/company.php
similarity index 100%
rename from htdocs/admin/company.php
rename to public/admin/company.php
diff --git a/htdocs/admin/compta.php b/public/admin/compta.php
similarity index 100%
rename from htdocs/admin/compta.php
rename to public/admin/compta.php
diff --git a/htdocs/admin/confexped.php b/public/admin/confexped.php
similarity index 100%
rename from htdocs/admin/confexped.php
rename to public/admin/confexped.php
diff --git a/htdocs/admin/const.php b/public/admin/const.php
similarity index 100%
rename from htdocs/admin/const.php
rename to public/admin/const.php
diff --git a/htdocs/admin/contract.php b/public/admin/contract.php
similarity index 100%
rename from htdocs/admin/contract.php
rename to public/admin/contract.php
diff --git a/htdocs/admin/delais.php b/public/admin/delais.php
similarity index 100%
rename from htdocs/admin/delais.php
rename to public/admin/delais.php
diff --git a/htdocs/admin/dict.php b/public/admin/dict.php
similarity index 100%
rename from htdocs/admin/dict.php
rename to public/admin/dict.php
diff --git a/htdocs/admin/ecm.php b/public/admin/ecm.php
similarity index 100%
rename from htdocs/admin/ecm.php
rename to public/admin/ecm.php
diff --git a/htdocs/admin/events.php b/public/admin/events.php
similarity index 100%
rename from htdocs/admin/events.php
rename to public/admin/events.php
diff --git a/htdocs/admin/expedition.php b/public/admin/expedition.php
similarity index 100%
rename from htdocs/admin/expedition.php
rename to public/admin/expedition.php
diff --git a/htdocs/admin/expedition_extrafields.php b/public/admin/expedition_extrafields.php
similarity index 100%
rename from htdocs/admin/expedition_extrafields.php
rename to public/admin/expedition_extrafields.php
diff --git a/htdocs/admin/expeditiondet_extrafields.php b/public/admin/expeditiondet_extrafields.php
similarity index 100%
rename from htdocs/admin/expeditiondet_extrafields.php
rename to public/admin/expeditiondet_extrafields.php
diff --git a/htdocs/admin/expensereport.php b/public/admin/expensereport.php
similarity index 100%
rename from htdocs/admin/expensereport.php
rename to public/admin/expensereport.php
diff --git a/htdocs/admin/expensereport_extrafields.php b/public/admin/expensereport_extrafields.php
similarity index 100%
rename from htdocs/admin/expensereport_extrafields.php
rename to public/admin/expensereport_extrafields.php
diff --git a/htdocs/admin/external_rss.php b/public/admin/external_rss.php
similarity index 100%
rename from htdocs/admin/external_rss.php
rename to public/admin/external_rss.php
diff --git a/htdocs/admin/facture.php b/public/admin/facture.php
similarity index 100%
rename from htdocs/admin/facture.php
rename to public/admin/facture.php
diff --git a/htdocs/admin/fckeditor.php b/public/admin/fckeditor.php
similarity index 100%
rename from htdocs/admin/fckeditor.php
rename to public/admin/fckeditor.php
diff --git a/htdocs/admin/fichinter.php b/public/admin/fichinter.php
similarity index 100%
rename from htdocs/admin/fichinter.php
rename to public/admin/fichinter.php
diff --git a/htdocs/admin/geoipmaxmind.php b/public/admin/geoipmaxmind.php
similarity index 100%
rename from htdocs/admin/geoipmaxmind.php
rename to public/admin/geoipmaxmind.php
diff --git a/htdocs/admin/ihm.php b/public/admin/ihm.php
similarity index 100%
rename from htdocs/admin/ihm.php
rename to public/admin/ihm.php
diff --git a/htdocs/admin/index.php b/public/admin/index.php
similarity index 100%
rename from htdocs/admin/index.php
rename to public/admin/index.php
diff --git a/htdocs/admin/ldap.php b/public/admin/ldap.php
similarity index 100%
rename from htdocs/admin/ldap.php
rename to public/admin/ldap.php
diff --git a/htdocs/admin/ldap_contacts.php b/public/admin/ldap_contacts.php
similarity index 100%
rename from htdocs/admin/ldap_contacts.php
rename to public/admin/ldap_contacts.php
diff --git a/htdocs/admin/ldap_groups.php b/public/admin/ldap_groups.php
similarity index 100%
rename from htdocs/admin/ldap_groups.php
rename to public/admin/ldap_groups.php
diff --git a/htdocs/admin/ldap_members.php b/public/admin/ldap_members.php
similarity index 100%
rename from htdocs/admin/ldap_members.php
rename to public/admin/ldap_members.php
diff --git a/htdocs/admin/ldap_users.php b/public/admin/ldap_users.php
similarity index 100%
rename from htdocs/admin/ldap_users.php
rename to public/admin/ldap_users.php
diff --git a/htdocs/admin/limits.php b/public/admin/limits.php
similarity index 100%
rename from htdocs/admin/limits.php
rename to public/admin/limits.php
diff --git a/htdocs/admin/livraison.php b/public/admin/livraison.php
similarity index 100%
rename from htdocs/admin/livraison.php
rename to public/admin/livraison.php
diff --git a/htdocs/admin/livraison_extrafields.php b/public/admin/livraison_extrafields.php
similarity index 100%
rename from htdocs/admin/livraison_extrafields.php
rename to public/admin/livraison_extrafields.php
diff --git a/htdocs/admin/livraisondet_extrafields.php b/public/admin/livraisondet_extrafields.php
similarity index 100%
rename from htdocs/admin/livraisondet_extrafields.php
rename to public/admin/livraisondet_extrafields.php
diff --git a/htdocs/admin/loan.php b/public/admin/loan.php
similarity index 100%
rename from htdocs/admin/loan.php
rename to public/admin/loan.php
diff --git a/htdocs/admin/mailing.php b/public/admin/mailing.php
similarity index 100%
rename from htdocs/admin/mailing.php
rename to public/admin/mailing.php
diff --git a/htdocs/admin/mailman.php b/public/admin/mailman.php
similarity index 100%
rename from htdocs/admin/mailman.php
rename to public/admin/mailman.php
diff --git a/htdocs/admin/mails.php b/public/admin/mails.php
similarity index 100%
rename from htdocs/admin/mails.php
rename to public/admin/mails.php
diff --git a/htdocs/admin/menus.php b/public/admin/menus.php
similarity index 100%
rename from htdocs/admin/menus.php
rename to public/admin/menus.php
diff --git a/htdocs/admin/menus/edit.php b/public/admin/menus/edit.php
similarity index 100%
rename from htdocs/admin/menus/edit.php
rename to public/admin/menus/edit.php
diff --git a/htdocs/admin/menus/index.php b/public/admin/menus/index.php
similarity index 100%
rename from htdocs/admin/menus/index.php
rename to public/admin/menus/index.php
diff --git a/htdocs/admin/menus/other.php b/public/admin/menus/other.php
similarity index 100%
rename from htdocs/admin/menus/other.php
rename to public/admin/menus/other.php
diff --git a/htdocs/admin/modules.php b/public/admin/modules.php
similarity index 100%
rename from htdocs/admin/modules.php
rename to public/admin/modules.php
diff --git a/htdocs/admin/multicurrency.php b/public/admin/multicurrency.php
similarity index 100%
rename from htdocs/admin/multicurrency.php
rename to public/admin/multicurrency.php
diff --git a/htdocs/admin/notification.php b/public/admin/notification.php
similarity index 100%
rename from htdocs/admin/notification.php
rename to public/admin/notification.php
diff --git a/htdocs/admin/oauth.php b/public/admin/oauth.php
similarity index 100%
rename from htdocs/admin/oauth.php
rename to public/admin/oauth.php
diff --git a/htdocs/admin/oauthlogintokens.php b/public/admin/oauthlogintokens.php
similarity index 100%
rename from htdocs/admin/oauthlogintokens.php
rename to public/admin/oauthlogintokens.php
diff --git a/htdocs/admin/order_extrafields.php b/public/admin/order_extrafields.php
similarity index 100%
rename from htdocs/admin/order_extrafields.php
rename to public/admin/order_extrafields.php
diff --git a/htdocs/admin/orderdet_extrafields.php b/public/admin/orderdet_extrafields.php
similarity index 100%
rename from htdocs/admin/orderdet_extrafields.php
rename to public/admin/orderdet_extrafields.php
diff --git a/htdocs/admin/payment.php b/public/admin/payment.php
similarity index 100%
rename from htdocs/admin/payment.php
rename to public/admin/payment.php
diff --git a/htdocs/admin/pdf.php b/public/admin/pdf.php
similarity index 100%
rename from htdocs/admin/pdf.php
rename to public/admin/pdf.php
diff --git a/htdocs/admin/perms.php b/public/admin/perms.php
similarity index 100%
rename from htdocs/admin/perms.php
rename to public/admin/perms.php
diff --git a/htdocs/admin/prelevement.php b/public/admin/prelevement.php
similarity index 100%
rename from htdocs/admin/prelevement.php
rename to public/admin/prelevement.php
diff --git a/htdocs/admin/propal.php b/public/admin/propal.php
similarity index 100%
rename from htdocs/admin/propal.php
rename to public/admin/propal.php
diff --git a/htdocs/admin/proxy.php b/public/admin/proxy.php
similarity index 100%
rename from htdocs/admin/proxy.php
rename to public/admin/proxy.php
diff --git a/htdocs/admin/receiptprinter.php b/public/admin/receiptprinter.php
similarity index 100%
rename from htdocs/admin/receiptprinter.php
rename to public/admin/receiptprinter.php
diff --git a/htdocs/admin/resource.php b/public/admin/resource.php
similarity index 100%
rename from htdocs/admin/resource.php
rename to public/admin/resource.php
diff --git a/htdocs/admin/resource_extrafields.php b/public/admin/resource_extrafields.php
similarity index 100%
rename from htdocs/admin/resource_extrafields.php
rename to public/admin/resource_extrafields.php
diff --git a/htdocs/admin/salaries.php b/public/admin/salaries.php
similarity index 100%
rename from htdocs/admin/salaries.php
rename to public/admin/salaries.php
diff --git a/htdocs/admin/security.php b/public/admin/security.php
similarity index 100%
rename from htdocs/admin/security.php
rename to public/admin/security.php
diff --git a/htdocs/admin/security_file.php b/public/admin/security_file.php
similarity index 100%
rename from htdocs/admin/security_file.php
rename to public/admin/security_file.php
diff --git a/htdocs/admin/security_other.php b/public/admin/security_other.php
similarity index 100%
rename from htdocs/admin/security_other.php
rename to public/admin/security_other.php
diff --git a/htdocs/admin/sms.php b/public/admin/sms.php
similarity index 100%
rename from htdocs/admin/sms.php
rename to public/admin/sms.php
diff --git a/htdocs/admin/spip.php b/public/admin/spip.php
similarity index 100%
rename from htdocs/admin/spip.php
rename to public/admin/spip.php
diff --git a/htdocs/admin/stock.php b/public/admin/stock.php
similarity index 100%
rename from htdocs/admin/stock.php
rename to public/admin/stock.php
diff --git a/htdocs/admin/supplier_invoice.php b/public/admin/supplier_invoice.php
similarity index 100%
rename from htdocs/admin/supplier_invoice.php
rename to public/admin/supplier_invoice.php
diff --git a/htdocs/admin/supplier_order.php b/public/admin/supplier_order.php
similarity index 100%
rename from htdocs/admin/supplier_order.php
rename to public/admin/supplier_order.php
diff --git a/htdocs/admin/supplier_payment.php b/public/admin/supplier_payment.php
similarity index 100%
rename from htdocs/admin/supplier_payment.php
rename to public/admin/supplier_payment.php
diff --git a/htdocs/admin/supplier_proposal.php b/public/admin/supplier_proposal.php
similarity index 100%
rename from htdocs/admin/supplier_proposal.php
rename to public/admin/supplier_proposal.php
diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/public/admin/supplierinvoice_extrafields.php
similarity index 100%
rename from htdocs/admin/supplierinvoice_extrafields.php
rename to public/admin/supplierinvoice_extrafields.php
diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/public/admin/supplierinvoicedet_extrafields.php
similarity index 100%
rename from htdocs/admin/supplierinvoicedet_extrafields.php
rename to public/admin/supplierinvoicedet_extrafields.php
diff --git a/htdocs/admin/supplierorder_extrafields.php b/public/admin/supplierorder_extrafields.php
similarity index 100%
rename from htdocs/admin/supplierorder_extrafields.php
rename to public/admin/supplierorder_extrafields.php
diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/public/admin/supplierorderdet_extrafields.php
similarity index 100%
rename from htdocs/admin/supplierorderdet_extrafields.php
rename to public/admin/supplierorderdet_extrafields.php
diff --git a/htdocs/admin/syslog.php b/public/admin/syslog.php
similarity index 100%
rename from htdocs/admin/syslog.php
rename to public/admin/syslog.php
diff --git a/htdocs/admin/system/about.php b/public/admin/system/about.php
similarity index 100%
rename from htdocs/admin/system/about.php
rename to public/admin/system/about.php
diff --git a/htdocs/admin/system/browser.php b/public/admin/system/browser.php
similarity index 100%
rename from htdocs/admin/system/browser.php
rename to public/admin/system/browser.php
diff --git a/htdocs/admin/system/constall.php b/public/admin/system/constall.php
similarity index 100%
rename from htdocs/admin/system/constall.php
rename to public/admin/system/constall.php
diff --git a/htdocs/admin/system/database-tables.php b/public/admin/system/database-tables.php
similarity index 100%
rename from htdocs/admin/system/database-tables.php
rename to public/admin/system/database-tables.php
diff --git a/htdocs/admin/system/database.php b/public/admin/system/database.php
similarity index 100%
rename from htdocs/admin/system/database.php
rename to public/admin/system/database.php
diff --git a/htdocs/admin/system/dbtable.php b/public/admin/system/dbtable.php
similarity index 100%
rename from htdocs/admin/system/dbtable.php
rename to public/admin/system/dbtable.php
diff --git a/htdocs/admin/system/dolibarr.php b/public/admin/system/dolibarr.php
similarity index 100%
rename from htdocs/admin/system/dolibarr.php
rename to public/admin/system/dolibarr.php
diff --git a/htdocs/admin/system/filecheck.php b/public/admin/system/filecheck.php
similarity index 100%
rename from htdocs/admin/system/filecheck.php
rename to public/admin/system/filecheck.php
diff --git a/htdocs/admin/system/index.php b/public/admin/system/index.php
similarity index 100%
rename from htdocs/admin/system/index.php
rename to public/admin/system/index.php
diff --git a/htdocs/admin/system/modules.php b/public/admin/system/modules.php
similarity index 100%
rename from htdocs/admin/system/modules.php
rename to public/admin/system/modules.php
diff --git a/htdocs/admin/system/os.php b/public/admin/system/os.php
similarity index 100%
rename from htdocs/admin/system/os.php
rename to public/admin/system/os.php
diff --git a/htdocs/admin/system/perf.php b/public/admin/system/perf.php
similarity index 100%
rename from htdocs/admin/system/perf.php
rename to public/admin/system/perf.php
diff --git a/htdocs/admin/system/phpinfo.php b/public/admin/system/phpinfo.php
similarity index 100%
rename from htdocs/admin/system/phpinfo.php
rename to public/admin/system/phpinfo.php
diff --git a/htdocs/admin/system/web.php b/public/admin/system/web.php
similarity index 100%
rename from htdocs/admin/system/web.php
rename to public/admin/system/web.php
diff --git a/htdocs/admin/system/xcache.php b/public/admin/system/xcache.php
similarity index 100%
rename from htdocs/admin/system/xcache.php
rename to public/admin/system/xcache.php
diff --git a/htdocs/admin/system/xdebug.php b/public/admin/system/xdebug.php
similarity index 100%
rename from htdocs/admin/system/xdebug.php
rename to public/admin/system/xdebug.php
diff --git a/htdocs/admin/taxes.php b/public/admin/taxes.php
similarity index 100%
rename from htdocs/admin/taxes.php
rename to public/admin/taxes.php
diff --git a/htdocs/admin/tools/dolibarr_export.php b/public/admin/tools/dolibarr_export.php
similarity index 100%
rename from htdocs/admin/tools/dolibarr_export.php
rename to public/admin/tools/dolibarr_export.php
diff --git a/htdocs/admin/tools/dolibarr_import.php b/public/admin/tools/dolibarr_import.php
similarity index 100%
rename from htdocs/admin/tools/dolibarr_import.php
rename to public/admin/tools/dolibarr_import.php
diff --git a/htdocs/admin/tools/eaccelerator.php b/public/admin/tools/eaccelerator.php
similarity index 100%
rename from htdocs/admin/tools/eaccelerator.php
rename to public/admin/tools/eaccelerator.php
diff --git a/htdocs/admin/tools/export.php b/public/admin/tools/export.php
similarity index 100%
rename from htdocs/admin/tools/export.php
rename to public/admin/tools/export.php
diff --git a/htdocs/admin/tools/index.php b/public/admin/tools/index.php
similarity index 100%
rename from htdocs/admin/tools/index.php
rename to public/admin/tools/index.php
diff --git a/htdocs/admin/tools/listevents.php b/public/admin/tools/listevents.php
similarity index 100%
rename from htdocs/admin/tools/listevents.php
rename to public/admin/tools/listevents.php
diff --git a/htdocs/admin/tools/listsessions.php b/public/admin/tools/listsessions.php
similarity index 100%
rename from htdocs/admin/tools/listsessions.php
rename to public/admin/tools/listsessions.php
diff --git a/htdocs/admin/tools/purge.php b/public/admin/tools/purge.php
similarity index 100%
rename from htdocs/admin/tools/purge.php
rename to public/admin/tools/purge.php
diff --git a/htdocs/admin/tools/update.php b/public/admin/tools/update.php
similarity index 100%
rename from htdocs/admin/tools/update.php
rename to public/admin/tools/update.php
diff --git a/htdocs/admin/translation.php b/public/admin/translation.php
similarity index 100%
rename from htdocs/admin/translation.php
rename to public/admin/translation.php
diff --git a/htdocs/admin/triggers.php b/public/admin/triggers.php
similarity index 100%
rename from htdocs/admin/triggers.php
rename to public/admin/triggers.php
diff --git a/htdocs/admin/user.php b/public/admin/user.php
similarity index 100%
rename from htdocs/admin/user.php
rename to public/admin/user.php
diff --git a/htdocs/admin/websites.php b/public/admin/websites.php
similarity index 100%
rename from htdocs/admin/websites.php
rename to public/admin/websites.php
diff --git a/htdocs/admin/workflow.php b/public/admin/workflow.php
similarity index 100%
rename from htdocs/admin/workflow.php
rename to public/admin/workflow.php
diff --git a/htdocs/api/README.md b/public/api/README.md
similarity index 100%
rename from htdocs/api/README.md
rename to public/api/README.md
diff --git a/htdocs/api/admin/explorer.php b/public/api/admin/explorer.php
similarity index 100%
rename from htdocs/api/admin/explorer.php
rename to public/api/admin/explorer.php
diff --git a/htdocs/api/admin/index.php b/public/api/admin/index.php
similarity index 100%
rename from htdocs/api/admin/index.php
rename to public/api/admin/index.php
diff --git a/htdocs/api/class/api.class.php b/public/api/class/api.class.php
similarity index 100%
rename from htdocs/api/class/api.class.php
rename to public/api/class/api.class.php
diff --git a/htdocs/api/class/api_access.class.php b/public/api/class/api_access.class.php
similarity index 100%
rename from htdocs/api/class/api_access.class.php
rename to public/api/class/api_access.class.php
diff --git a/htdocs/api/class/api_dictionnarycountries.class.php b/public/api/class/api_dictionnarycountries.class.php
similarity index 100%
rename from htdocs/api/class/api_dictionnarycountries.class.php
rename to public/api/class/api_dictionnarycountries.class.php
diff --git a/htdocs/api/class/api_dictionnarytowns.class.php b/public/api/class/api_dictionnarytowns.class.php
similarity index 100%
rename from htdocs/api/class/api_dictionnarytowns.class.php
rename to public/api/class/api_dictionnarytowns.class.php
diff --git a/htdocs/api/class/api_login.class.php b/public/api/class/api_login.class.php
similarity index 100%
rename from htdocs/api/class/api_login.class.php
rename to public/api/class/api_login.class.php
diff --git a/htdocs/api/class/api_status.class.php b/public/api/class/api_status.class.php
similarity index 100%
rename from htdocs/api/class/api_status.class.php
rename to public/api/class/api_status.class.php
diff --git a/htdocs/api/class/index.html b/public/api/class/index.html
similarity index 100%
rename from htdocs/api/class/index.html
rename to public/api/class/index.html
diff --git a/htdocs/api/index.php b/public/api/index.php
similarity index 100%
rename from htdocs/api/index.php
rename to public/api/index.php
diff --git a/htdocs/asterisk/cidlookup.php b/public/asterisk/cidlookup.php
similarity index 100%
rename from htdocs/asterisk/cidlookup.php
rename to public/asterisk/cidlookup.php
diff --git a/htdocs/asterisk/index.html b/public/asterisk/index.html
similarity index 100%
rename from htdocs/asterisk/index.html
rename to public/asterisk/index.html
diff --git a/htdocs/asterisk/wrapper.php b/public/asterisk/wrapper.php
similarity index 100%
rename from htdocs/asterisk/wrapper.php
rename to public/asterisk/wrapper.php
diff --git a/htdocs/barcode/codeinit.php b/public/barcode/codeinit.php
similarity index 100%
rename from htdocs/barcode/codeinit.php
rename to public/barcode/codeinit.php
diff --git a/htdocs/barcode/index.html b/public/barcode/index.html
similarity index 100%
rename from htdocs/barcode/index.html
rename to public/barcode/index.html
diff --git a/htdocs/barcode/printsheet.php b/public/barcode/printsheet.php
similarity index 100%
rename from htdocs/barcode/printsheet.php
rename to public/barcode/printsheet.php
diff --git a/htdocs/bookmarks/admin/bookmark.php b/public/bookmarks/admin/bookmark.php
similarity index 100%
rename from htdocs/bookmarks/admin/bookmark.php
rename to public/bookmarks/admin/bookmark.php
diff --git a/htdocs/bookmarks/admin/index.html b/public/bookmarks/admin/index.html
similarity index 100%
rename from htdocs/bookmarks/admin/index.html
rename to public/bookmarks/admin/index.html
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/public/bookmarks/bookmarks.lib.php
similarity index 100%
rename from htdocs/bookmarks/bookmarks.lib.php
rename to public/bookmarks/bookmarks.lib.php
diff --git a/htdocs/bookmarks/card.php b/public/bookmarks/card.php
similarity index 100%
rename from htdocs/bookmarks/card.php
rename to public/bookmarks/card.php
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/public/bookmarks/class/bookmark.class.php
similarity index 100%
rename from htdocs/bookmarks/class/bookmark.class.php
rename to public/bookmarks/class/bookmark.class.php
diff --git a/htdocs/bookmarks/class/index.html b/public/bookmarks/class/index.html
similarity index 100%
rename from htdocs/bookmarks/class/index.html
rename to public/bookmarks/class/index.html
diff --git a/htdocs/bookmarks/index.html b/public/bookmarks/index.html
similarity index 100%
rename from htdocs/bookmarks/index.html
rename to public/bookmarks/index.html
diff --git a/htdocs/bookmarks/list.php b/public/bookmarks/list.php
similarity index 100%
rename from htdocs/bookmarks/list.php
rename to public/bookmarks/list.php
diff --git a/htdocs/cache.manifest b/public/cache.manifest
similarity index 100%
rename from htdocs/cache.manifest
rename to public/cache.manifest
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/public/cashdesk/admin/cashdesk.php
similarity index 100%
rename from htdocs/cashdesk/admin/cashdesk.php
rename to public/cashdesk/admin/cashdesk.php
diff --git a/htdocs/cashdesk/admin/index.html b/public/cashdesk/admin/index.html
similarity index 100%
rename from htdocs/cashdesk/admin/index.html
rename to public/cashdesk/admin/index.html
diff --git a/htdocs/cashdesk/affContenu.php b/public/cashdesk/affContenu.php
similarity index 100%
rename from htdocs/cashdesk/affContenu.php
rename to public/cashdesk/affContenu.php
diff --git a/htdocs/cashdesk/affIndex.php b/public/cashdesk/affIndex.php
similarity index 100%
rename from htdocs/cashdesk/affIndex.php
rename to public/cashdesk/affIndex.php
diff --git a/htdocs/cashdesk/affPied.php b/public/cashdesk/affPied.php
similarity index 100%
rename from htdocs/cashdesk/affPied.php
rename to public/cashdesk/affPied.php
diff --git a/htdocs/cashdesk/class/Auth.class.php b/public/cashdesk/class/Auth.class.php
similarity index 100%
rename from htdocs/cashdesk/class/Auth.class.php
rename to public/cashdesk/class/Auth.class.php
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/public/cashdesk/class/Facturation.class.php
similarity index 100%
rename from htdocs/cashdesk/class/Facturation.class.php
rename to public/cashdesk/class/Facturation.class.php
diff --git a/htdocs/cashdesk/class/index.html b/public/cashdesk/class/index.html
similarity index 100%
rename from htdocs/cashdesk/class/index.html
rename to public/cashdesk/class/index.html
diff --git a/htdocs/cashdesk/css/index.html b/public/cashdesk/css/index.html
similarity index 100%
rename from htdocs/cashdesk/css/index.html
rename to public/cashdesk/css/index.html
diff --git a/htdocs/cashdesk/css/style.css b/public/cashdesk/css/style.css
similarity index 100%
rename from htdocs/cashdesk/css/style.css
rename to public/cashdesk/css/style.css
diff --git a/htdocs/cashdesk/deconnexion.php b/public/cashdesk/deconnexion.php
similarity index 100%
rename from htdocs/cashdesk/deconnexion.php
rename to public/cashdesk/deconnexion.php
diff --git a/htdocs/cashdesk/facturation.php b/public/cashdesk/facturation.php
similarity index 100%
rename from htdocs/cashdesk/facturation.php
rename to public/cashdesk/facturation.php
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/public/cashdesk/facturation_dhtml.php
similarity index 100%
rename from htdocs/cashdesk/facturation_dhtml.php
rename to public/cashdesk/facturation_dhtml.php
diff --git a/htdocs/cashdesk/facturation_verif.php b/public/cashdesk/facturation_verif.php
similarity index 100%
rename from htdocs/cashdesk/facturation_verif.php
rename to public/cashdesk/facturation_verif.php
diff --git a/htdocs/cashdesk/img/basket_delete.png b/public/cashdesk/img/basket_delete.png
similarity index 100%
rename from htdocs/cashdesk/img/basket_delete.png
rename to public/cashdesk/img/basket_delete.png
diff --git a/htdocs/cashdesk/img/bg_conteneur_droite.png b/public/cashdesk/img/bg_conteneur_droite.png
similarity index 100%
rename from htdocs/cashdesk/img/bg_conteneur_droite.png
rename to public/cashdesk/img/bg_conteneur_droite.png
diff --git a/htdocs/cashdesk/img/bg_conteneur_gauche.png b/public/cashdesk/img/bg_conteneur_gauche.png
similarity index 100%
rename from htdocs/cashdesk/img/bg_conteneur_gauche.png
rename to public/cashdesk/img/bg_conteneur_gauche.png
diff --git a/htdocs/cashdesk/img/bg_entete.png b/public/cashdesk/img/bg_entete.png
similarity index 100%
rename from htdocs/cashdesk/img/bg_entete.png
rename to public/cashdesk/img/bg_entete.png
diff --git a/htdocs/cashdesk/img/bg_pied.png b/public/cashdesk/img/bg_pied.png
similarity index 100%
rename from htdocs/cashdesk/img/bg_pied.png
rename to public/cashdesk/img/bg_pied.png
diff --git a/htdocs/cashdesk/img/calendrier.png b/public/cashdesk/img/calendrier.png
similarity index 100%
rename from htdocs/cashdesk/img/calendrier.png
rename to public/cashdesk/img/calendrier.png
diff --git a/htdocs/cashdesk/img/decrypted.png b/public/cashdesk/img/decrypted.png
similarity index 100%
rename from htdocs/cashdesk/img/decrypted.png
rename to public/cashdesk/img/decrypted.png
diff --git a/htdocs/cashdesk/img/gescom.png b/public/cashdesk/img/gescom.png
similarity index 100%
rename from htdocs/cashdesk/img/gescom.png
rename to public/cashdesk/img/gescom.png
diff --git a/htdocs/cashdesk/img/index.html b/public/cashdesk/img/index.html
similarity index 100%
rename from htdocs/cashdesk/img/index.html
rename to public/cashdesk/img/index.html
diff --git a/htdocs/cashdesk/img/lock.png b/public/cashdesk/img/lock.png
similarity index 100%
rename from htdocs/cashdesk/img/lock.png
rename to public/cashdesk/img/lock.png
diff --git a/htdocs/cashdesk/img/login.png b/public/cashdesk/img/login.png
similarity index 100%
rename from htdocs/cashdesk/img/login.png
rename to public/cashdesk/img/login.png
diff --git a/htdocs/cashdesk/img/new.png b/public/cashdesk/img/new.png
similarity index 100%
rename from htdocs/cashdesk/img/new.png
rename to public/cashdesk/img/new.png
diff --git a/htdocs/cashdesk/include/environnement.php b/public/cashdesk/include/environnement.php
similarity index 100%
rename from htdocs/cashdesk/include/environnement.php
rename to public/cashdesk/include/environnement.php
diff --git a/htdocs/cashdesk/include/index.html b/public/cashdesk/include/index.html
similarity index 100%
rename from htdocs/cashdesk/include/index.html
rename to public/cashdesk/include/index.html
diff --git a/htdocs/cashdesk/include/keypad.php b/public/cashdesk/include/keypad.php
similarity index 100%
rename from htdocs/cashdesk/include/keypad.php
rename to public/cashdesk/include/keypad.php
diff --git a/htdocs/cashdesk/index.php b/public/cashdesk/index.php
similarity index 100%
rename from htdocs/cashdesk/index.php
rename to public/cashdesk/index.php
diff --git a/htdocs/cashdesk/index_verif.php b/public/cashdesk/index_verif.php
similarity index 100%
rename from htdocs/cashdesk/index_verif.php
rename to public/cashdesk/index_verif.php
diff --git a/htdocs/cashdesk/javascript/dhtml.js b/public/cashdesk/javascript/dhtml.js
similarity index 100%
rename from htdocs/cashdesk/javascript/dhtml.js
rename to public/cashdesk/javascript/dhtml.js
diff --git a/htdocs/cashdesk/javascript/facturation1.js b/public/cashdesk/javascript/facturation1.js
similarity index 100%
rename from htdocs/cashdesk/javascript/facturation1.js
rename to public/cashdesk/javascript/facturation1.js
diff --git a/htdocs/cashdesk/javascript/index.html b/public/cashdesk/javascript/index.html
similarity index 100%
rename from htdocs/cashdesk/javascript/index.html
rename to public/cashdesk/javascript/index.html
diff --git a/htdocs/cashdesk/javascript/keypad.js b/public/cashdesk/javascript/keypad.js
similarity index 100%
rename from htdocs/cashdesk/javascript/keypad.js
rename to public/cashdesk/javascript/keypad.js
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/public/cashdesk/tpl/facturation1.tpl.php
similarity index 100%
rename from htdocs/cashdesk/tpl/facturation1.tpl.php
rename to public/cashdesk/tpl/facturation1.tpl.php
diff --git a/htdocs/cashdesk/tpl/index.html b/public/cashdesk/tpl/index.html
similarity index 100%
rename from htdocs/cashdesk/tpl/index.html
rename to public/cashdesk/tpl/index.html
diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/public/cashdesk/tpl/liste_articles.tpl.php
similarity index 100%
rename from htdocs/cashdesk/tpl/liste_articles.tpl.php
rename to public/cashdesk/tpl/liste_articles.tpl.php
diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/public/cashdesk/tpl/menu.tpl.php
similarity index 100%
rename from htdocs/cashdesk/tpl/menu.tpl.php
rename to public/cashdesk/tpl/menu.tpl.php
diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/public/cashdesk/tpl/ticket.tpl.php
similarity index 100%
rename from htdocs/cashdesk/tpl/ticket.tpl.php
rename to public/cashdesk/tpl/ticket.tpl.php
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/public/cashdesk/tpl/validation1.tpl.php
similarity index 100%
rename from htdocs/cashdesk/tpl/validation1.tpl.php
rename to public/cashdesk/tpl/validation1.tpl.php
diff --git a/htdocs/cashdesk/tpl/validation2.tpl.php b/public/cashdesk/tpl/validation2.tpl.php
similarity index 100%
rename from htdocs/cashdesk/tpl/validation2.tpl.php
rename to public/cashdesk/tpl/validation2.tpl.php
diff --git a/htdocs/cashdesk/validation.php b/public/cashdesk/validation.php
similarity index 100%
rename from htdocs/cashdesk/validation.php
rename to public/cashdesk/validation.php
diff --git a/htdocs/cashdesk/validation_ok.php b/public/cashdesk/validation_ok.php
similarity index 100%
rename from htdocs/cashdesk/validation_ok.php
rename to public/cashdesk/validation_ok.php
diff --git a/htdocs/cashdesk/validation_ticket.php b/public/cashdesk/validation_ticket.php
similarity index 100%
rename from htdocs/cashdesk/validation_ticket.php
rename to public/cashdesk/validation_ticket.php
diff --git a/htdocs/cashdesk/validation_verif.php b/public/cashdesk/validation_verif.php
similarity index 100%
rename from htdocs/cashdesk/validation_verif.php
rename to public/cashdesk/validation_verif.php
diff --git a/htdocs/categories/admin/categorie.php b/public/categories/admin/categorie.php
similarity index 100%
rename from htdocs/categories/admin/categorie.php
rename to public/categories/admin/categorie.php
diff --git a/htdocs/categories/admin/categorie_extrafields.php b/public/categories/admin/categorie_extrafields.php
similarity index 100%
rename from htdocs/categories/admin/categorie_extrafields.php
rename to public/categories/admin/categorie_extrafields.php
diff --git a/htdocs/categories/admin/index.html b/public/categories/admin/index.html
similarity index 100%
rename from htdocs/categories/admin/index.html
rename to public/categories/admin/index.html
diff --git a/htdocs/categories/card.php b/public/categories/card.php
similarity index 100%
rename from htdocs/categories/card.php
rename to public/categories/card.php
diff --git a/htdocs/categories/class/api_categories.class.php b/public/categories/class/api_categories.class.php
similarity index 100%
rename from htdocs/categories/class/api_categories.class.php
rename to public/categories/class/api_categories.class.php
diff --git a/htdocs/categories/class/api_deprecated_category.class.php b/public/categories/class/api_deprecated_category.class.php
similarity index 100%
rename from htdocs/categories/class/api_deprecated_category.class.php
rename to public/categories/class/api_deprecated_category.class.php
diff --git a/htdocs/categories/class/categorie.class.php b/public/categories/class/categorie.class.php
similarity index 100%
rename from htdocs/categories/class/categorie.class.php
rename to public/categories/class/categorie.class.php
diff --git a/htdocs/categories/class/index.html b/public/categories/class/index.html
similarity index 100%
rename from htdocs/categories/class/index.html
rename to public/categories/class/index.html
diff --git a/htdocs/categories/edit.php b/public/categories/edit.php
similarity index 100%
rename from htdocs/categories/edit.php
rename to public/categories/edit.php
diff --git a/htdocs/categories/index.php b/public/categories/index.php
similarity index 100%
rename from htdocs/categories/index.php
rename to public/categories/index.php
diff --git a/htdocs/categories/photos.php b/public/categories/photos.php
similarity index 100%
rename from htdocs/categories/photos.php
rename to public/categories/photos.php
diff --git a/htdocs/categories/traduction.php b/public/categories/traduction.php
similarity index 100%
rename from htdocs/categories/traduction.php
rename to public/categories/traduction.php
diff --git a/htdocs/categories/viewcat.php b/public/categories/viewcat.php
similarity index 100%
rename from htdocs/categories/viewcat.php
rename to public/categories/viewcat.php
diff --git a/htdocs/comm/action/card.php b/public/comm/action/card.php
similarity index 100%
rename from htdocs/comm/action/card.php
rename to public/comm/action/card.php
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/public/comm/action/class/actioncomm.class.php
similarity index 100%
rename from htdocs/comm/action/class/actioncomm.class.php
rename to public/comm/action/class/actioncomm.class.php
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/public/comm/action/class/api_agendaevents.class.php
similarity index 100%
rename from htdocs/comm/action/class/api_agendaevents.class.php
rename to public/comm/action/class/api_agendaevents.class.php
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/public/comm/action/class/cactioncomm.class.php
similarity index 100%
rename from htdocs/comm/action/class/cactioncomm.class.php
rename to public/comm/action/class/cactioncomm.class.php
diff --git a/htdocs/comm/action/class/ical.class.php b/public/comm/action/class/ical.class.php
similarity index 100%
rename from htdocs/comm/action/class/ical.class.php
rename to public/comm/action/class/ical.class.php
diff --git a/htdocs/comm/action/class/index.html b/public/comm/action/class/index.html
similarity index 100%
rename from htdocs/comm/action/class/index.html
rename to public/comm/action/class/index.html
diff --git a/htdocs/comm/action/document.php b/public/comm/action/document.php
similarity index 100%
rename from htdocs/comm/action/document.php
rename to public/comm/action/document.php
diff --git a/htdocs/comm/action/index.php b/public/comm/action/index.php
similarity index 100%
rename from htdocs/comm/action/index.php
rename to public/comm/action/index.php
diff --git a/htdocs/comm/action/info.php b/public/comm/action/info.php
similarity index 100%
rename from htdocs/comm/action/info.php
rename to public/comm/action/info.php
diff --git a/htdocs/comm/action/listactions.php b/public/comm/action/listactions.php
similarity index 100%
rename from htdocs/comm/action/listactions.php
rename to public/comm/action/listactions.php
diff --git a/htdocs/comm/action/pertype.php b/public/comm/action/pertype.php
similarity index 100%
rename from htdocs/comm/action/pertype.php
rename to public/comm/action/pertype.php
diff --git a/htdocs/comm/action/peruser.php b/public/comm/action/peruser.php
similarity index 100%
rename from htdocs/comm/action/peruser.php
rename to public/comm/action/peruser.php
diff --git a/htdocs/comm/action/rapport/index.php b/public/comm/action/rapport/index.php
similarity index 100%
rename from htdocs/comm/action/rapport/index.php
rename to public/comm/action/rapport/index.php
diff --git a/htdocs/comm/address.php b/public/comm/address.php
similarity index 100%
rename from htdocs/comm/address.php
rename to public/comm/address.php
diff --git a/htdocs/comm/admin/index.html b/public/comm/admin/index.html
similarity index 100%
rename from htdocs/comm/admin/index.html
rename to public/comm/admin/index.html
diff --git a/htdocs/comm/admin/propal_extrafields.php b/public/comm/admin/propal_extrafields.php
similarity index 100%
rename from htdocs/comm/admin/propal_extrafields.php
rename to public/comm/admin/propal_extrafields.php
diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/public/comm/admin/propaldet_extrafields.php
similarity index 100%
rename from htdocs/comm/admin/propaldet_extrafields.php
rename to public/comm/admin/propaldet_extrafields.php
diff --git a/htdocs/comm/card.php b/public/comm/card.php
similarity index 100%
rename from htdocs/comm/card.php
rename to public/comm/card.php
diff --git a/htdocs/comm/contact.php b/public/comm/contact.php
similarity index 100%
rename from htdocs/comm/contact.php
rename to public/comm/contact.php
diff --git a/htdocs/comm/index.php b/public/comm/index.php
similarity index 100%
rename from htdocs/comm/index.php
rename to public/comm/index.php
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/public/comm/mailing/advtargetemailing.php
similarity index 100%
rename from htdocs/comm/mailing/advtargetemailing.php
rename to public/comm/mailing/advtargetemailing.php
diff --git a/htdocs/comm/mailing/card.php b/public/comm/mailing/card.php
similarity index 100%
rename from htdocs/comm/mailing/card.php
rename to public/comm/mailing/card.php
diff --git a/htdocs/comm/mailing/cibles.php b/public/comm/mailing/cibles.php
similarity index 100%
rename from htdocs/comm/mailing/cibles.php
rename to public/comm/mailing/cibles.php
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/public/comm/mailing/class/advtargetemailing.class.php
similarity index 100%
rename from htdocs/comm/mailing/class/advtargetemailing.class.php
rename to public/comm/mailing/class/advtargetemailing.class.php
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/public/comm/mailing/class/html.formadvtargetemailing.class.php
similarity index 100%
rename from htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
rename to public/comm/mailing/class/html.formadvtargetemailing.class.php
diff --git a/htdocs/comm/mailing/class/index.html b/public/comm/mailing/class/index.html
similarity index 100%
rename from htdocs/comm/mailing/class/index.html
rename to public/comm/mailing/class/index.html
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/public/comm/mailing/class/mailing.class.php
similarity index 100%
rename from htdocs/comm/mailing/class/mailing.class.php
rename to public/comm/mailing/class/mailing.class.php
diff --git a/htdocs/comm/mailing/index.php b/public/comm/mailing/index.php
similarity index 100%
rename from htdocs/comm/mailing/index.php
rename to public/comm/mailing/index.php
diff --git a/htdocs/comm/mailing/info.php b/public/comm/mailing/info.php
similarity index 100%
rename from htdocs/comm/mailing/info.php
rename to public/comm/mailing/info.php
diff --git a/htdocs/comm/mailing/list.php b/public/comm/mailing/list.php
similarity index 100%
rename from htdocs/comm/mailing/list.php
rename to public/comm/mailing/list.php
diff --git a/htdocs/comm/multiprix.php b/public/comm/multiprix.php
similarity index 100%
rename from htdocs/comm/multiprix.php
rename to public/comm/multiprix.php
diff --git a/htdocs/comm/propal/apercu.php b/public/comm/propal/apercu.php
similarity index 100%
rename from htdocs/comm/propal/apercu.php
rename to public/comm/propal/apercu.php
diff --git a/htdocs/comm/propal/card.php b/public/comm/propal/card.php
similarity index 100%
rename from htdocs/comm/propal/card.php
rename to public/comm/propal/card.php
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/public/comm/propal/class/api_proposals.class.php
similarity index 100%
rename from htdocs/comm/propal/class/api_proposals.class.php
rename to public/comm/propal/class/api_proposals.class.php
diff --git a/htdocs/comm/propal/class/index.html b/public/comm/propal/class/index.html
similarity index 100%
rename from htdocs/comm/propal/class/index.html
rename to public/comm/propal/class/index.html
diff --git a/htdocs/comm/propal/class/propal.class.php b/public/comm/propal/class/propal.class.php
similarity index 100%
rename from htdocs/comm/propal/class/propal.class.php
rename to public/comm/propal/class/propal.class.php
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/public/comm/propal/class/propalestats.class.php
similarity index 100%
rename from htdocs/comm/propal/class/propalestats.class.php
rename to public/comm/propal/class/propalestats.class.php
diff --git a/htdocs/comm/propal/contact.php b/public/comm/propal/contact.php
similarity index 100%
rename from htdocs/comm/propal/contact.php
rename to public/comm/propal/contact.php
diff --git a/htdocs/comm/propal/document.php b/public/comm/propal/document.php
similarity index 100%
rename from htdocs/comm/propal/document.php
rename to public/comm/propal/document.php
diff --git a/htdocs/comm/propal/index.php b/public/comm/propal/index.php
similarity index 100%
rename from htdocs/comm/propal/index.php
rename to public/comm/propal/index.php
diff --git a/htdocs/comm/propal/info.php b/public/comm/propal/info.php
similarity index 100%
rename from htdocs/comm/propal/info.php
rename to public/comm/propal/info.php
diff --git a/htdocs/comm/propal/list.php b/public/comm/propal/list.php
similarity index 100%
rename from htdocs/comm/propal/list.php
rename to public/comm/propal/list.php
diff --git a/htdocs/comm/propal/note.php b/public/comm/propal/note.php
similarity index 100%
rename from htdocs/comm/propal/note.php
rename to public/comm/propal/note.php
diff --git a/htdocs/comm/propal/stats/index.php b/public/comm/propal/stats/index.php
similarity index 100%
rename from htdocs/comm/propal/stats/index.php
rename to public/comm/propal/stats/index.php
diff --git a/htdocs/comm/propal/tpl/index.html b/public/comm/propal/tpl/index.html
similarity index 100%
rename from htdocs/comm/propal/tpl/index.html
rename to public/comm/propal/tpl/index.html
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/public/comm/propal/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
rename to public/comm/propal/tpl/linkedobjectblock.tpl.php
diff --git a/htdocs/comm/prospect/index.php b/public/comm/prospect/index.php
similarity index 100%
rename from htdocs/comm/prospect/index.php
rename to public/comm/prospect/index.php
diff --git a/htdocs/comm/prospect/recap-prospect.php b/public/comm/prospect/recap-prospect.php
similarity index 100%
rename from htdocs/comm/prospect/recap-prospect.php
rename to public/comm/prospect/recap-prospect.php
diff --git a/htdocs/comm/recap-client.php b/public/comm/recap-client.php
similarity index 100%
rename from htdocs/comm/recap-client.php
rename to public/comm/recap-client.php
diff --git a/htdocs/comm/remise.php b/public/comm/remise.php
similarity index 100%
rename from htdocs/comm/remise.php
rename to public/comm/remise.php
diff --git a/htdocs/comm/remx.php b/public/comm/remx.php
similarity index 100%
rename from htdocs/comm/remx.php
rename to public/comm/remx.php
diff --git a/htdocs/commande/apercu.php b/public/commande/apercu.php
similarity index 100%
rename from htdocs/commande/apercu.php
rename to public/commande/apercu.php
diff --git a/htdocs/commande/card.php b/public/commande/card.php
similarity index 100%
rename from htdocs/commande/card.php
rename to public/commande/card.php
diff --git a/htdocs/commande/class/api_deprecated_commande.class.php b/public/commande/class/api_deprecated_commande.class.php
similarity index 100%
rename from htdocs/commande/class/api_deprecated_commande.class.php
rename to public/commande/class/api_deprecated_commande.class.php
diff --git a/htdocs/commande/class/api_orders.class.php b/public/commande/class/api_orders.class.php
similarity index 100%
rename from htdocs/commande/class/api_orders.class.php
rename to public/commande/class/api_orders.class.php
diff --git a/htdocs/commande/class/commande.class.php b/public/commande/class/commande.class.php
similarity index 100%
rename from htdocs/commande/class/commande.class.php
rename to public/commande/class/commande.class.php
diff --git a/htdocs/commande/class/commandestats.class.php b/public/commande/class/commandestats.class.php
similarity index 100%
rename from htdocs/commande/class/commandestats.class.php
rename to public/commande/class/commandestats.class.php
diff --git a/htdocs/commande/class/index.html b/public/commande/class/index.html
similarity index 100%
rename from htdocs/commande/class/index.html
rename to public/commande/class/index.html
diff --git a/htdocs/commande/contact.php b/public/commande/contact.php
similarity index 100%
rename from htdocs/commande/contact.php
rename to public/commande/contact.php
diff --git a/htdocs/commande/customer.php b/public/commande/customer.php
similarity index 100%
rename from htdocs/commande/customer.php
rename to public/commande/customer.php
diff --git a/htdocs/commande/document.php b/public/commande/document.php
similarity index 100%
rename from htdocs/commande/document.php
rename to public/commande/document.php
diff --git a/htdocs/commande/index.php b/public/commande/index.php
similarity index 100%
rename from htdocs/commande/index.php
rename to public/commande/index.php
diff --git a/htdocs/commande/info.php b/public/commande/info.php
similarity index 100%
rename from htdocs/commande/info.php
rename to public/commande/info.php
diff --git a/htdocs/commande/list.php b/public/commande/list.php
similarity index 100%
rename from htdocs/commande/list.php
rename to public/commande/list.php
diff --git a/htdocs/commande/note.php b/public/commande/note.php
similarity index 100%
rename from htdocs/commande/note.php
rename to public/commande/note.php
diff --git a/htdocs/commande/orderstoinvoice.php b/public/commande/orderstoinvoice.php
similarity index 100%
rename from htdocs/commande/orderstoinvoice.php
rename to public/commande/orderstoinvoice.php
diff --git a/htdocs/commande/stats/index.php b/public/commande/stats/index.php
similarity index 100%
rename from htdocs/commande/stats/index.php
rename to public/commande/stats/index.php
diff --git a/htdocs/commande/tpl/index.html b/public/commande/tpl/index.html
similarity index 100%
rename from htdocs/commande/tpl/index.html
rename to public/commande/tpl/index.html
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/public/commande/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from htdocs/commande/tpl/linkedobjectblock.tpl.php
rename to public/commande/tpl/linkedobjectblock.tpl.php
diff --git a/htdocs/compta/ajaxpayment.php b/public/compta/ajaxpayment.php
similarity index 100%
rename from htdocs/compta/ajaxpayment.php
rename to public/compta/ajaxpayment.php
diff --git a/htdocs/compta/bank/annuel.php b/public/compta/bank/annuel.php
similarity index 100%
rename from htdocs/compta/bank/annuel.php
rename to public/compta/bank/annuel.php
diff --git a/htdocs/compta/bank/bankentries.php b/public/compta/bank/bankentries.php
similarity index 100%
rename from htdocs/compta/bank/bankentries.php
rename to public/compta/bank/bankentries.php
diff --git a/htdocs/compta/bank/bilan.php b/public/compta/bank/bilan.php
similarity index 100%
rename from htdocs/compta/bank/bilan.php
rename to public/compta/bank/bilan.php
diff --git a/htdocs/compta/bank/budget.php b/public/compta/bank/budget.php
similarity index 100%
rename from htdocs/compta/bank/budget.php
rename to public/compta/bank/budget.php
diff --git a/htdocs/compta/bank/card.php b/public/compta/bank/card.php
similarity index 100%
rename from htdocs/compta/bank/card.php
rename to public/compta/bank/card.php
diff --git a/htdocs/compta/bank/categ.php b/public/compta/bank/categ.php
similarity index 100%
rename from htdocs/compta/bank/categ.php
rename to public/compta/bank/categ.php
diff --git a/htdocs/compta/bank/class/account.class.php b/public/compta/bank/class/account.class.php
similarity index 100%
rename from htdocs/compta/bank/class/account.class.php
rename to public/compta/bank/class/account.class.php
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/public/compta/bank/class/api_bankaccounts.class.php
similarity index 100%
rename from htdocs/compta/bank/class/api_bankaccounts.class.php
rename to public/compta/bank/class/api_bankaccounts.class.php
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/public/compta/bank/class/bankcateg.class.php
similarity index 100%
rename from htdocs/compta/bank/class/bankcateg.class.php
rename to public/compta/bank/class/bankcateg.class.php
diff --git a/htdocs/compta/bank/class/index.html b/public/compta/bank/class/index.html
similarity index 100%
rename from htdocs/compta/bank/class/index.html
rename to public/compta/bank/class/index.html
diff --git a/htdocs/compta/bank/document.php b/public/compta/bank/document.php
similarity index 100%
rename from htdocs/compta/bank/document.php
rename to public/compta/bank/document.php
diff --git a/htdocs/compta/bank/graph.php b/public/compta/bank/graph.php
similarity index 100%
rename from htdocs/compta/bank/graph.php
rename to public/compta/bank/graph.php
diff --git a/htdocs/compta/bank/index.php b/public/compta/bank/index.php
similarity index 100%
rename from htdocs/compta/bank/index.php
rename to public/compta/bank/index.php
diff --git a/htdocs/compta/bank/info.php b/public/compta/bank/info.php
similarity index 100%
rename from htdocs/compta/bank/info.php
rename to public/compta/bank/info.php
diff --git a/htdocs/compta/bank/ligne.php b/public/compta/bank/ligne.php
similarity index 100%
rename from htdocs/compta/bank/ligne.php
rename to public/compta/bank/ligne.php
diff --git a/htdocs/compta/bank/releve.php b/public/compta/bank/releve.php
similarity index 100%
rename from htdocs/compta/bank/releve.php
rename to public/compta/bank/releve.php
diff --git a/htdocs/compta/bank/transfer.php b/public/compta/bank/transfer.php
similarity index 100%
rename from htdocs/compta/bank/transfer.php
rename to public/compta/bank/transfer.php
diff --git a/htdocs/compta/bank/treso.php b/public/compta/bank/treso.php
similarity index 100%
rename from htdocs/compta/bank/treso.php
rename to public/compta/bank/treso.php
diff --git a/htdocs/compta/charges/index.php b/public/compta/charges/index.php
similarity index 100%
rename from htdocs/compta/charges/index.php
rename to public/compta/charges/index.php
diff --git a/htdocs/compta/clients.php b/public/compta/clients.php
similarity index 100%
rename from htdocs/compta/clients.php
rename to public/compta/clients.php
diff --git a/htdocs/compta/deplacement/card.php b/public/compta/deplacement/card.php
similarity index 100%
rename from htdocs/compta/deplacement/card.php
rename to public/compta/deplacement/card.php
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/public/compta/deplacement/class/deplacement.class.php
similarity index 100%
rename from htdocs/compta/deplacement/class/deplacement.class.php
rename to public/compta/deplacement/class/deplacement.class.php
diff --git a/htdocs/compta/deplacement/class/deplacementstats.class.php b/public/compta/deplacement/class/deplacementstats.class.php
similarity index 100%
rename from htdocs/compta/deplacement/class/deplacementstats.class.php
rename to public/compta/deplacement/class/deplacementstats.class.php
diff --git a/htdocs/compta/deplacement/class/index.html b/public/compta/deplacement/class/index.html
similarity index 100%
rename from htdocs/compta/deplacement/class/index.html
rename to public/compta/deplacement/class/index.html
diff --git a/htdocs/compta/deplacement/document.php b/public/compta/deplacement/document.php
similarity index 100%
rename from htdocs/compta/deplacement/document.php
rename to public/compta/deplacement/document.php
diff --git a/htdocs/compta/deplacement/index.php b/public/compta/deplacement/index.php
similarity index 100%
rename from htdocs/compta/deplacement/index.php
rename to public/compta/deplacement/index.php
diff --git a/htdocs/compta/deplacement/info.php b/public/compta/deplacement/info.php
similarity index 100%
rename from htdocs/compta/deplacement/info.php
rename to public/compta/deplacement/info.php
diff --git a/htdocs/compta/deplacement/list.php b/public/compta/deplacement/list.php
similarity index 100%
rename from htdocs/compta/deplacement/list.php
rename to public/compta/deplacement/list.php
diff --git a/htdocs/compta/deplacement/stats/index.php b/public/compta/deplacement/stats/index.php
similarity index 100%
rename from htdocs/compta/deplacement/stats/index.php
rename to public/compta/deplacement/stats/index.php
diff --git a/htdocs/compta/facture.php b/public/compta/facture.php
similarity index 100%
rename from htdocs/compta/facture.php
rename to public/compta/facture.php
diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/public/compta/facture/admin/facture_cust_extrafields.php
similarity index 100%
rename from htdocs/compta/facture/admin/facture_cust_extrafields.php
rename to public/compta/facture/admin/facture_cust_extrafields.php
diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/public/compta/facture/admin/facturedet_cust_extrafields.php
similarity index 100%
rename from htdocs/compta/facture/admin/facturedet_cust_extrafields.php
rename to public/compta/facture/admin/facturedet_cust_extrafields.php
diff --git a/htdocs/compta/facture/admin/index.html b/public/compta/facture/admin/index.html
similarity index 100%
rename from htdocs/compta/facture/admin/index.html
rename to public/compta/facture/admin/index.html
diff --git a/htdocs/compta/facture/apercu.php b/public/compta/facture/apercu.php
similarity index 100%
rename from htdocs/compta/facture/apercu.php
rename to public/compta/facture/apercu.php
diff --git a/htdocs/compta/facture/class/api_deprecated_invoice.class.php b/public/compta/facture/class/api_deprecated_invoice.class.php
similarity index 100%
rename from htdocs/compta/facture/class/api_deprecated_invoice.class.php
rename to public/compta/facture/class/api_deprecated_invoice.class.php
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/public/compta/facture/class/api_invoices.class.php
similarity index 100%
rename from htdocs/compta/facture/class/api_invoices.class.php
rename to public/compta/facture/class/api_invoices.class.php
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/public/compta/facture/class/facture-rec.class.php
similarity index 100%
rename from htdocs/compta/facture/class/facture-rec.class.php
rename to public/compta/facture/class/facture-rec.class.php
diff --git a/htdocs/compta/facture/class/facture.class.php b/public/compta/facture/class/facture.class.php
similarity index 100%
rename from htdocs/compta/facture/class/facture.class.php
rename to public/compta/facture/class/facture.class.php
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/public/compta/facture/class/facturestats.class.php
similarity index 100%
rename from htdocs/compta/facture/class/facturestats.class.php
rename to public/compta/facture/class/facturestats.class.php
diff --git a/htdocs/compta/facture/class/index.html b/public/compta/facture/class/index.html
similarity index 100%
rename from htdocs/compta/facture/class/index.html
rename to public/compta/facture/class/index.html
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/public/compta/facture/class/paymentterm.class.php
similarity index 100%
rename from htdocs/compta/facture/class/paymentterm.class.php
rename to public/compta/facture/class/paymentterm.class.php
diff --git a/htdocs/compta/facture/contact.php b/public/compta/facture/contact.php
similarity index 100%
rename from htdocs/compta/facture/contact.php
rename to public/compta/facture/contact.php
diff --git a/htdocs/compta/facture/document.php b/public/compta/facture/document.php
similarity index 100%
rename from htdocs/compta/facture/document.php
rename to public/compta/facture/document.php
diff --git a/htdocs/compta/facture/fiche-rec.php b/public/compta/facture/fiche-rec.php
similarity index 100%
rename from htdocs/compta/facture/fiche-rec.php
rename to public/compta/facture/fiche-rec.php
diff --git a/htdocs/compta/facture/index.html b/public/compta/facture/index.html
similarity index 100%
rename from htdocs/compta/facture/index.html
rename to public/compta/facture/index.html
diff --git a/htdocs/compta/facture/info.php b/public/compta/facture/info.php
similarity index 100%
rename from htdocs/compta/facture/info.php
rename to public/compta/facture/info.php
diff --git a/htdocs/compta/facture/list.php b/public/compta/facture/list.php
similarity index 100%
rename from htdocs/compta/facture/list.php
rename to public/compta/facture/list.php
diff --git a/htdocs/compta/facture/note.php b/public/compta/facture/note.php
similarity index 100%
rename from htdocs/compta/facture/note.php
rename to public/compta/facture/note.php
diff --git a/htdocs/compta/facture/prelevement.php b/public/compta/facture/prelevement.php
similarity index 100%
rename from htdocs/compta/facture/prelevement.php
rename to public/compta/facture/prelevement.php
diff --git a/htdocs/compta/facture/stats/index.php b/public/compta/facture/stats/index.php
similarity index 100%
rename from htdocs/compta/facture/stats/index.php
rename to public/compta/facture/stats/index.php
diff --git a/htdocs/compta/facture/tpl/index.html b/public/compta/facture/tpl/index.html
similarity index 100%
rename from htdocs/compta/facture/tpl/index.html
rename to public/compta/facture/tpl/index.html
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/public/compta/facture/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
rename to public/compta/facture/tpl/linkedobjectblock.tpl.php
diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/public/compta/facture/tpl/linkedobjectblockForRec.tpl.php
similarity index 100%
rename from htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
rename to public/compta/facture/tpl/linkedobjectblockForRec.tpl.php
diff --git a/htdocs/compta/index.php b/public/compta/index.php
similarity index 100%
rename from htdocs/compta/index.php
rename to public/compta/index.php
diff --git a/htdocs/compta/journal/index.html b/public/compta/journal/index.html
similarity index 100%
rename from htdocs/compta/journal/index.html
rename to public/compta/journal/index.html
diff --git a/htdocs/compta/journal/purchasesjournal.php b/public/compta/journal/purchasesjournal.php
similarity index 100%
rename from htdocs/compta/journal/purchasesjournal.php
rename to public/compta/journal/purchasesjournal.php
diff --git a/htdocs/compta/journal/sellsjournal.php b/public/compta/journal/sellsjournal.php
similarity index 100%
rename from htdocs/compta/journal/sellsjournal.php
rename to public/compta/journal/sellsjournal.php
diff --git a/htdocs/compta/localtax/card.php b/public/compta/localtax/card.php
similarity index 100%
rename from htdocs/compta/localtax/card.php
rename to public/compta/localtax/card.php
diff --git a/htdocs/compta/localtax/class/index.html b/public/compta/localtax/class/index.html
similarity index 100%
rename from htdocs/compta/localtax/class/index.html
rename to public/compta/localtax/class/index.html
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/public/compta/localtax/class/localtax.class.php
similarity index 100%
rename from htdocs/compta/localtax/class/localtax.class.php
rename to public/compta/localtax/class/localtax.class.php
diff --git a/htdocs/compta/localtax/clients.php b/public/compta/localtax/clients.php
similarity index 100%
rename from htdocs/compta/localtax/clients.php
rename to public/compta/localtax/clients.php
diff --git a/htdocs/compta/localtax/index.php b/public/compta/localtax/index.php
similarity index 100%
rename from htdocs/compta/localtax/index.php
rename to public/compta/localtax/index.php
diff --git a/htdocs/compta/localtax/quadri_detail.php b/public/compta/localtax/quadri_detail.php
similarity index 100%
rename from htdocs/compta/localtax/quadri_detail.php
rename to public/compta/localtax/quadri_detail.php
diff --git a/htdocs/compta/localtax/reglement.php b/public/compta/localtax/reglement.php
similarity index 100%
rename from htdocs/compta/localtax/reglement.php
rename to public/compta/localtax/reglement.php
diff --git a/htdocs/compta/paiement.php b/public/compta/paiement.php
similarity index 100%
rename from htdocs/compta/paiement.php
rename to public/compta/paiement.php
diff --git a/htdocs/compta/paiement/avalider.php b/public/compta/paiement/avalider.php
similarity index 100%
rename from htdocs/compta/paiement/avalider.php
rename to public/compta/paiement/avalider.php
diff --git a/htdocs/compta/paiement/card.php b/public/compta/paiement/card.php
similarity index 100%
rename from htdocs/compta/paiement/card.php
rename to public/compta/paiement/card.php
diff --git a/htdocs/compta/paiement/cheque/card.php b/public/compta/paiement/cheque/card.php
similarity index 100%
rename from htdocs/compta/paiement/cheque/card.php
rename to public/compta/paiement/cheque/card.php
diff --git a/htdocs/compta/paiement/cheque/class/index.html b/public/compta/paiement/cheque/class/index.html
similarity index 100%
rename from htdocs/compta/paiement/cheque/class/index.html
rename to public/compta/paiement/cheque/class/index.html
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/public/compta/paiement/cheque/class/remisecheque.class.php
similarity index 100%
rename from htdocs/compta/paiement/cheque/class/remisecheque.class.php
rename to public/compta/paiement/cheque/class/remisecheque.class.php
diff --git a/htdocs/compta/paiement/cheque/index.php b/public/compta/paiement/cheque/index.php
similarity index 100%
rename from htdocs/compta/paiement/cheque/index.php
rename to public/compta/paiement/cheque/index.php
diff --git a/htdocs/compta/paiement/cheque/list.php b/public/compta/paiement/cheque/list.php
similarity index 100%
rename from htdocs/compta/paiement/cheque/list.php
rename to public/compta/paiement/cheque/list.php
diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/public/compta/paiement/class/cpaiement.class.php
similarity index 100%
rename from htdocs/compta/paiement/class/cpaiement.class.php
rename to public/compta/paiement/class/cpaiement.class.php
diff --git a/htdocs/compta/paiement/class/index.html b/public/compta/paiement/class/index.html
similarity index 100%
rename from htdocs/compta/paiement/class/index.html
rename to public/compta/paiement/class/index.html
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/public/compta/paiement/class/paiement.class.php
similarity index 100%
rename from htdocs/compta/paiement/class/paiement.class.php
rename to public/compta/paiement/class/paiement.class.php
diff --git a/htdocs/compta/paiement/index.php b/public/compta/paiement/index.php
similarity index 100%
rename from htdocs/compta/paiement/index.php
rename to public/compta/paiement/index.php
diff --git a/htdocs/compta/paiement/info.php b/public/compta/paiement/info.php
similarity index 100%
rename from htdocs/compta/paiement/info.php
rename to public/compta/paiement/info.php
diff --git a/htdocs/compta/paiement/list.php b/public/compta/paiement/list.php
similarity index 100%
rename from htdocs/compta/paiement/list.php
rename to public/compta/paiement/list.php
diff --git a/htdocs/compta/paiement/rapport.php b/public/compta/paiement/rapport.php
similarity index 100%
rename from htdocs/compta/paiement/rapport.php
rename to public/compta/paiement/rapport.php
diff --git a/htdocs/compta/paiement_charge.php b/public/compta/paiement_charge.php
similarity index 100%
rename from htdocs/compta/paiement_charge.php
rename to public/compta/paiement_charge.php
diff --git a/htdocs/compta/payment_sc/card.php b/public/compta/payment_sc/card.php
similarity index 100%
rename from htdocs/compta/payment_sc/card.php
rename to public/compta/payment_sc/card.php
diff --git a/htdocs/compta/payment_sc/index.html b/public/compta/payment_sc/index.html
similarity index 100%
rename from htdocs/compta/payment_sc/index.html
rename to public/compta/payment_sc/index.html
diff --git a/htdocs/compta/prelevement/bons.php b/public/compta/prelevement/bons.php
similarity index 100%
rename from htdocs/compta/prelevement/bons.php
rename to public/compta/prelevement/bons.php
diff --git a/htdocs/compta/prelevement/card.php b/public/compta/prelevement/card.php
similarity index 100%
rename from htdocs/compta/prelevement/card.php
rename to public/compta/prelevement/card.php
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/public/compta/prelevement/class/bonprelevement.class.php
similarity index 100%
rename from htdocs/compta/prelevement/class/bonprelevement.class.php
rename to public/compta/prelevement/class/bonprelevement.class.php
diff --git a/htdocs/compta/prelevement/class/index.html b/public/compta/prelevement/class/index.html
similarity index 100%
rename from htdocs/compta/prelevement/class/index.html
rename to public/compta/prelevement/class/index.html
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/public/compta/prelevement/class/ligneprelevement.class.php
similarity index 100%
rename from htdocs/compta/prelevement/class/ligneprelevement.class.php
rename to public/compta/prelevement/class/ligneprelevement.class.php
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/public/compta/prelevement/class/rejetprelevement.class.php
similarity index 100%
rename from htdocs/compta/prelevement/class/rejetprelevement.class.php
rename to public/compta/prelevement/class/rejetprelevement.class.php
diff --git a/htdocs/compta/prelevement/create.php b/public/compta/prelevement/create.php
similarity index 100%
rename from htdocs/compta/prelevement/create.php
rename to public/compta/prelevement/create.php
diff --git a/htdocs/compta/prelevement/demandes.php b/public/compta/prelevement/demandes.php
similarity index 100%
rename from htdocs/compta/prelevement/demandes.php
rename to public/compta/prelevement/demandes.php
diff --git a/htdocs/compta/prelevement/factures.php b/public/compta/prelevement/factures.php
similarity index 100%
rename from htdocs/compta/prelevement/factures.php
rename to public/compta/prelevement/factures.php
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/public/compta/prelevement/fiche-rejet.php
similarity index 100%
rename from htdocs/compta/prelevement/fiche-rejet.php
rename to public/compta/prelevement/fiche-rejet.php
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/public/compta/prelevement/fiche-stat.php
similarity index 100%
rename from htdocs/compta/prelevement/fiche-stat.php
rename to public/compta/prelevement/fiche-stat.php
diff --git a/htdocs/compta/prelevement/index.php b/public/compta/prelevement/index.php
similarity index 100%
rename from htdocs/compta/prelevement/index.php
rename to public/compta/prelevement/index.php
diff --git a/htdocs/compta/prelevement/ligne.php b/public/compta/prelevement/ligne.php
similarity index 100%
rename from htdocs/compta/prelevement/ligne.php
rename to public/compta/prelevement/ligne.php
diff --git a/htdocs/compta/prelevement/list.php b/public/compta/prelevement/list.php
similarity index 100%
rename from htdocs/compta/prelevement/list.php
rename to public/compta/prelevement/list.php
diff --git a/htdocs/compta/prelevement/rejets.php b/public/compta/prelevement/rejets.php
similarity index 100%
rename from htdocs/compta/prelevement/rejets.php
rename to public/compta/prelevement/rejets.php
diff --git a/htdocs/compta/prelevement/stats.php b/public/compta/prelevement/stats.php
similarity index 100%
rename from htdocs/compta/prelevement/stats.php
rename to public/compta/prelevement/stats.php
diff --git a/htdocs/compta/recap-compta.php b/public/compta/recap-compta.php
similarity index 100%
rename from htdocs/compta/recap-compta.php
rename to public/compta/recap-compta.php
diff --git a/htdocs/compta/resultat/clientfourn.php b/public/compta/resultat/clientfourn.php
similarity index 100%
rename from htdocs/compta/resultat/clientfourn.php
rename to public/compta/resultat/clientfourn.php
diff --git a/htdocs/compta/resultat/index.php b/public/compta/resultat/index.php
similarity index 100%
rename from htdocs/compta/resultat/index.php
rename to public/compta/resultat/index.php
diff --git a/htdocs/compta/salaries/card.php b/public/compta/salaries/card.php
similarity index 100%
rename from htdocs/compta/salaries/card.php
rename to public/compta/salaries/card.php
diff --git a/htdocs/compta/salaries/class/index.html b/public/compta/salaries/class/index.html
similarity index 100%
rename from htdocs/compta/salaries/class/index.html
rename to public/compta/salaries/class/index.html
diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/public/compta/salaries/class/paymentsalary.class.php
similarity index 100%
rename from htdocs/compta/salaries/class/paymentsalary.class.php
rename to public/compta/salaries/class/paymentsalary.class.php
diff --git a/htdocs/compta/salaries/document.php b/public/compta/salaries/document.php
similarity index 100%
rename from htdocs/compta/salaries/document.php
rename to public/compta/salaries/document.php
diff --git a/htdocs/compta/salaries/index.php b/public/compta/salaries/index.php
similarity index 100%
rename from htdocs/compta/salaries/index.php
rename to public/compta/salaries/index.php
diff --git a/htdocs/compta/salaries/info.php b/public/compta/salaries/info.php
similarity index 100%
rename from htdocs/compta/salaries/info.php
rename to public/compta/salaries/info.php
diff --git a/htdocs/compta/sociales/card.php b/public/compta/sociales/card.php
similarity index 100%
rename from htdocs/compta/sociales/card.php
rename to public/compta/sociales/card.php
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/public/compta/sociales/class/cchargesociales.class.php
similarity index 100%
rename from htdocs/compta/sociales/class/cchargesociales.class.php
rename to public/compta/sociales/class/cchargesociales.class.php
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/public/compta/sociales/class/chargesociales.class.php
similarity index 100%
rename from htdocs/compta/sociales/class/chargesociales.class.php
rename to public/compta/sociales/class/chargesociales.class.php
diff --git a/htdocs/compta/sociales/class/index.html b/public/compta/sociales/class/index.html
similarity index 100%
rename from htdocs/compta/sociales/class/index.html
rename to public/compta/sociales/class/index.html
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/public/compta/sociales/class/paymentsocialcontribution.class.php
similarity index 100%
rename from htdocs/compta/sociales/class/paymentsocialcontribution.class.php
rename to public/compta/sociales/class/paymentsocialcontribution.class.php
diff --git a/htdocs/compta/sociales/document.php b/public/compta/sociales/document.php
similarity index 100%
rename from htdocs/compta/sociales/document.php
rename to public/compta/sociales/document.php
diff --git a/htdocs/compta/sociales/index.php b/public/compta/sociales/index.php
similarity index 100%
rename from htdocs/compta/sociales/index.php
rename to public/compta/sociales/index.php
diff --git a/htdocs/compta/sociales/info.php b/public/compta/sociales/info.php
similarity index 100%
rename from htdocs/compta/sociales/info.php
rename to public/compta/sociales/info.php
diff --git a/htdocs/compta/sociales/payments.php b/public/compta/sociales/payments.php
similarity index 100%
rename from htdocs/compta/sociales/payments.php
rename to public/compta/sociales/payments.php
diff --git a/htdocs/compta/stats/cabyprodserv.php b/public/compta/stats/cabyprodserv.php
similarity index 100%
rename from htdocs/compta/stats/cabyprodserv.php
rename to public/compta/stats/cabyprodserv.php
diff --git a/htdocs/compta/stats/cabyuser.php b/public/compta/stats/cabyuser.php
similarity index 100%
rename from htdocs/compta/stats/cabyuser.php
rename to public/compta/stats/cabyuser.php
diff --git a/htdocs/compta/stats/casoc.php b/public/compta/stats/casoc.php
similarity index 100%
rename from htdocs/compta/stats/casoc.php
rename to public/compta/stats/casoc.php
diff --git a/htdocs/compta/stats/index.php b/public/compta/stats/index.php
similarity index 100%
rename from htdocs/compta/stats/index.php
rename to public/compta/stats/index.php
diff --git a/htdocs/compta/tva/card.php b/public/compta/tva/card.php
similarity index 100%
rename from htdocs/compta/tva/card.php
rename to public/compta/tva/card.php
diff --git a/htdocs/compta/tva/class/index.html b/public/compta/tva/class/index.html
similarity index 100%
rename from htdocs/compta/tva/class/index.html
rename to public/compta/tva/class/index.html
diff --git a/htdocs/compta/tva/class/tva.class.php b/public/compta/tva/class/tva.class.php
similarity index 100%
rename from htdocs/compta/tva/class/tva.class.php
rename to public/compta/tva/class/tva.class.php
diff --git a/htdocs/compta/tva/clients.php b/public/compta/tva/clients.php
similarity index 100%
rename from htdocs/compta/tva/clients.php
rename to public/compta/tva/clients.php
diff --git a/htdocs/compta/tva/index.php b/public/compta/tva/index.php
similarity index 100%
rename from htdocs/compta/tva/index.php
rename to public/compta/tva/index.php
diff --git a/htdocs/compta/tva/info.php b/public/compta/tva/info.php
similarity index 100%
rename from htdocs/compta/tva/info.php
rename to public/compta/tva/info.php
diff --git a/htdocs/compta/tva/quadri.php b/public/compta/tva/quadri.php
similarity index 100%
rename from htdocs/compta/tva/quadri.php
rename to public/compta/tva/quadri.php
diff --git a/htdocs/compta/tva/quadri_detail.php b/public/compta/tva/quadri_detail.php
similarity index 100%
rename from htdocs/compta/tva/quadri_detail.php
rename to public/compta/tva/quadri_detail.php
diff --git a/htdocs/compta/tva/quarter_report.php b/public/compta/tva/quarter_report.php
similarity index 100%
rename from htdocs/compta/tva/quarter_report.php
rename to public/compta/tva/quarter_report.php
diff --git a/htdocs/compta/tva/reglement.php b/public/compta/tva/reglement.php
similarity index 100%
rename from htdocs/compta/tva/reglement.php
rename to public/compta/tva/reglement.php
diff --git a/htdocs/conf/.gitignore b/public/conf/.gitignore
similarity index 100%
rename from htdocs/conf/.gitignore
rename to public/conf/.gitignore
diff --git a/htdocs/conf/.htaccess b/public/conf/.htaccess
similarity index 100%
rename from htdocs/conf/.htaccess
rename to public/conf/.htaccess
diff --git a/htdocs/conf/conf.php.example b/public/conf/conf.php.example
similarity index 100%
rename from htdocs/conf/conf.php.example
rename to public/conf/conf.php.example
diff --git a/htdocs/conf/index.html b/public/conf/index.html
similarity index 100%
rename from htdocs/conf/index.html
rename to public/conf/index.html
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/public/contact/canvas/actions_contactcard_common.class.php
similarity index 100%
rename from htdocs/contact/canvas/actions_contactcard_common.class.php
rename to public/contact/canvas/actions_contactcard_common.class.php
diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/public/contact/canvas/default/actions_contactcard_default.class.php
similarity index 100%
rename from htdocs/contact/canvas/default/actions_contactcard_default.class.php
rename to public/contact/canvas/default/actions_contactcard_default.class.php
diff --git a/htdocs/contact/canvas/default/index.html b/public/contact/canvas/default/index.html
similarity index 100%
rename from htdocs/contact/canvas/default/index.html
rename to public/contact/canvas/default/index.html
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/public/contact/canvas/default/tpl/contactcard_create.tpl.php
similarity index 100%
rename from htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
rename to public/contact/canvas/default/tpl/contactcard_create.tpl.php
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/public/contact/canvas/default/tpl/contactcard_edit.tpl.php
similarity index 100%
rename from htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
rename to public/contact/canvas/default/tpl/contactcard_edit.tpl.php
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/public/contact/canvas/default/tpl/contactcard_view.tpl.php
similarity index 100%
rename from htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
rename to public/contact/canvas/default/tpl/contactcard_view.tpl.php
diff --git a/htdocs/contact/canvas/default/tpl/index.html b/public/contact/canvas/default/tpl/index.html
similarity index 100%
rename from htdocs/contact/canvas/default/tpl/index.html
rename to public/contact/canvas/default/tpl/index.html
diff --git a/htdocs/contact/canvas/index.html b/public/contact/canvas/index.html
similarity index 100%
rename from htdocs/contact/canvas/index.html
rename to public/contact/canvas/index.html
diff --git a/htdocs/contact/card.php b/public/contact/card.php
similarity index 100%
rename from htdocs/contact/card.php
rename to public/contact/card.php
diff --git a/htdocs/contact/class/contact.class.php b/public/contact/class/contact.class.php
similarity index 100%
rename from htdocs/contact/class/contact.class.php
rename to public/contact/class/contact.class.php
diff --git a/htdocs/contact/class/index.html b/public/contact/class/index.html
similarity index 100%
rename from htdocs/contact/class/index.html
rename to public/contact/class/index.html
diff --git a/htdocs/contact/document.php b/public/contact/document.php
similarity index 100%
rename from htdocs/contact/document.php
rename to public/contact/document.php
diff --git a/htdocs/contact/index.html b/public/contact/index.html
similarity index 100%
rename from htdocs/contact/index.html
rename to public/contact/index.html
diff --git a/htdocs/contact/info.php b/public/contact/info.php
similarity index 100%
rename from htdocs/contact/info.php
rename to public/contact/info.php
diff --git a/htdocs/contact/ldap.php b/public/contact/ldap.php
similarity index 100%
rename from htdocs/contact/ldap.php
rename to public/contact/ldap.php
diff --git a/htdocs/contact/list.php b/public/contact/list.php
similarity index 100%
rename from htdocs/contact/list.php
rename to public/contact/list.php
diff --git a/htdocs/contact/note.php b/public/contact/note.php
similarity index 100%
rename from htdocs/contact/note.php
rename to public/contact/note.php
diff --git a/htdocs/contact/perso.php b/public/contact/perso.php
similarity index 100%
rename from htdocs/contact/perso.php
rename to public/contact/perso.php
diff --git a/htdocs/contact/vcard.php b/public/contact/vcard.php
similarity index 100%
rename from htdocs/contact/vcard.php
rename to public/contact/vcard.php
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/public/contrat/admin/contract_extrafields.php
similarity index 100%
rename from htdocs/contrat/admin/contract_extrafields.php
rename to public/contrat/admin/contract_extrafields.php
diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/public/contrat/admin/contractdet_extrafields.php
similarity index 100%
rename from htdocs/contrat/admin/contractdet_extrafields.php
rename to public/contrat/admin/contractdet_extrafields.php
diff --git a/htdocs/contrat/admin/index.html b/public/contrat/admin/index.html
similarity index 100%
rename from htdocs/contrat/admin/index.html
rename to public/contrat/admin/index.html
diff --git a/htdocs/contrat/card.php b/public/contrat/card.php
similarity index 100%
rename from htdocs/contrat/card.php
rename to public/contrat/card.php
diff --git a/htdocs/contrat/class/contrat.class.php b/public/contrat/class/contrat.class.php
similarity index 100%
rename from htdocs/contrat/class/contrat.class.php
rename to public/contrat/class/contrat.class.php
diff --git a/htdocs/contrat/class/index.html b/public/contrat/class/index.html
similarity index 100%
rename from htdocs/contrat/class/index.html
rename to public/contrat/class/index.html
diff --git a/htdocs/contrat/contact.php b/public/contrat/contact.php
similarity index 100%
rename from htdocs/contrat/contact.php
rename to public/contrat/contact.php
diff --git a/htdocs/contrat/document.php b/public/contrat/document.php
similarity index 100%
rename from htdocs/contrat/document.php
rename to public/contrat/document.php
diff --git a/htdocs/contrat/index.php b/public/contrat/index.php
similarity index 100%
rename from htdocs/contrat/index.php
rename to public/contrat/index.php
diff --git a/htdocs/contrat/info.php b/public/contrat/info.php
similarity index 100%
rename from htdocs/contrat/info.php
rename to public/contrat/info.php
diff --git a/htdocs/contrat/list.php b/public/contrat/list.php
similarity index 100%
rename from htdocs/contrat/list.php
rename to public/contrat/list.php
diff --git a/htdocs/contrat/note.php b/public/contrat/note.php
similarity index 100%
rename from htdocs/contrat/note.php
rename to public/contrat/note.php
diff --git a/htdocs/contrat/services.php b/public/contrat/services.php
similarity index 100%
rename from htdocs/contrat/services.php
rename to public/contrat/services.php
diff --git a/htdocs/contrat/tpl/index.html b/public/contrat/tpl/index.html
similarity index 100%
rename from htdocs/contrat/tpl/index.html
rename to public/contrat/tpl/index.html
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/public/contrat/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from htdocs/contrat/tpl/linkedobjectblock.tpl.php
rename to public/contrat/tpl/linkedobjectblock.tpl.php
diff --git a/htdocs/core/actions_builddoc.inc.php b/public/core/actions_builddoc.inc.php
similarity index 100%
rename from htdocs/core/actions_builddoc.inc.php
rename to public/core/actions_builddoc.inc.php
diff --git a/htdocs/core/actions_changeselectedfields.inc.php b/public/core/actions_changeselectedfields.inc.php
similarity index 100%
rename from htdocs/core/actions_changeselectedfields.inc.php
rename to public/core/actions_changeselectedfields.inc.php
diff --git a/htdocs/core/actions_dellink.inc.php b/public/core/actions_dellink.inc.php
similarity index 100%
rename from htdocs/core/actions_dellink.inc.php
rename to public/core/actions_dellink.inc.php
diff --git a/htdocs/core/actions_extrafields.inc.php b/public/core/actions_extrafields.inc.php
similarity index 100%
rename from htdocs/core/actions_extrafields.inc.php
rename to public/core/actions_extrafields.inc.php
diff --git a/htdocs/core/actions_fetchobject.inc.php b/public/core/actions_fetchobject.inc.php
similarity index 100%
rename from htdocs/core/actions_fetchobject.inc.php
rename to public/core/actions_fetchobject.inc.php
diff --git a/htdocs/core/actions_lineupdown.inc.php b/public/core/actions_lineupdown.inc.php
similarity index 100%
rename from htdocs/core/actions_lineupdown.inc.php
rename to public/core/actions_lineupdown.inc.php
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/public/core/actions_linkedfiles.inc.php
similarity index 100%
rename from htdocs/core/actions_linkedfiles.inc.php
rename to public/core/actions_linkedfiles.inc.php
diff --git a/htdocs/core/actions_massactions.inc.php b/public/core/actions_massactions.inc.php
similarity index 100%
rename from htdocs/core/actions_massactions.inc.php
rename to public/core/actions_massactions.inc.php
diff --git a/htdocs/core/actions_printing.inc.php b/public/core/actions_printing.inc.php
similarity index 100%
rename from htdocs/core/actions_printing.inc.php
rename to public/core/actions_printing.inc.php
diff --git a/htdocs/core/actions_sendmails.inc.php b/public/core/actions_sendmails.inc.php
similarity index 100%
rename from htdocs/core/actions_sendmails.inc.php
rename to public/core/actions_sendmails.inc.php
diff --git a/htdocs/core/actions_setnotes.inc.php b/public/core/actions_setnotes.inc.php
similarity index 100%
rename from htdocs/core/actions_setnotes.inc.php
rename to public/core/actions_setnotes.inc.php
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/public/core/ajax/ajaxdirpreview.php
similarity index 100%
rename from htdocs/core/ajax/ajaxdirpreview.php
rename to public/core/ajax/ajaxdirpreview.php
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/public/core/ajax/ajaxdirtree.php
similarity index 100%
rename from htdocs/core/ajax/ajaxdirtree.php
rename to public/core/ajax/ajaxdirtree.php
diff --git a/htdocs/core/ajax/bankconciliate.php b/public/core/ajax/bankconciliate.php
similarity index 100%
rename from htdocs/core/ajax/bankconciliate.php
rename to public/core/ajax/bankconciliate.php
diff --git a/htdocs/core/ajax/box.php b/public/core/ajax/box.php
similarity index 100%
rename from htdocs/core/ajax/box.php
rename to public/core/ajax/box.php
diff --git a/htdocs/core/ajax/constantonoff.php b/public/core/ajax/constantonoff.php
similarity index 100%
rename from htdocs/core/ajax/constantonoff.php
rename to public/core/ajax/constantonoff.php
diff --git a/htdocs/core/ajax/contacts.php b/public/core/ajax/contacts.php
similarity index 100%
rename from htdocs/core/ajax/contacts.php
rename to public/core/ajax/contacts.php
diff --git a/htdocs/core/ajax/extraparams.php b/public/core/ajax/extraparams.php
similarity index 100%
rename from htdocs/core/ajax/extraparams.php
rename to public/core/ajax/extraparams.php
diff --git a/htdocs/core/ajax/fileupload.php b/public/core/ajax/fileupload.php
similarity index 100%
rename from htdocs/core/ajax/fileupload.php
rename to public/core/ajax/fileupload.php
diff --git a/htdocs/core/ajax/index.html b/public/core/ajax/index.html
similarity index 100%
rename from htdocs/core/ajax/index.html
rename to public/core/ajax/index.html
diff --git a/htdocs/core/ajax/loadinplace.php b/public/core/ajax/loadinplace.php
similarity index 100%
rename from htdocs/core/ajax/loadinplace.php
rename to public/core/ajax/loadinplace.php
diff --git a/htdocs/core/ajax/objectonoff.php b/public/core/ajax/objectonoff.php
similarity index 100%
rename from htdocs/core/ajax/objectonoff.php
rename to public/core/ajax/objectonoff.php
diff --git a/htdocs/core/ajax/price.php b/public/core/ajax/price.php
similarity index 100%
rename from htdocs/core/ajax/price.php
rename to public/core/ajax/price.php
diff --git a/htdocs/core/ajax/row.php b/public/core/ajax/row.php
similarity index 100%
rename from htdocs/core/ajax/row.php
rename to public/core/ajax/row.php
diff --git a/htdocs/core/ajax/saveinplace.php b/public/core/ajax/saveinplace.php
similarity index 100%
rename from htdocs/core/ajax/saveinplace.php
rename to public/core/ajax/saveinplace.php
diff --git a/htdocs/core/ajax/security.php b/public/core/ajax/security.php
similarity index 100%
rename from htdocs/core/ajax/security.php
rename to public/core/ajax/security.php
diff --git a/htdocs/core/ajax/selectsearchbox.php b/public/core/ajax/selectsearchbox.php
similarity index 100%
rename from htdocs/core/ajax/selectsearchbox.php
rename to public/core/ajax/selectsearchbox.php
diff --git a/htdocs/core/ajax/vatrates.php b/public/core/ajax/vatrates.php
similarity index 100%
rename from htdocs/core/ajax/vatrates.php
rename to public/core/ajax/vatrates.php
diff --git a/htdocs/core/ajax/ziptown.php b/public/core/ajax/ziptown.php
similarity index 100%
rename from htdocs/core/ajax/ziptown.php
rename to public/core/ajax/ziptown.php
diff --git a/htdocs/core/antispamimage.php b/public/core/antispamimage.php
similarity index 100%
rename from htdocs/core/antispamimage.php
rename to public/core/antispamimage.php
diff --git a/htdocs/core/boxes/box_actions.php b/public/core/boxes/box_actions.php
similarity index 100%
rename from htdocs/core/boxes/box_actions.php
rename to public/core/boxes/box_actions.php
diff --git a/htdocs/core/boxes/box_activity.php b/public/core/boxes/box_activity.php
similarity index 100%
rename from htdocs/core/boxes/box_activity.php
rename to public/core/boxes/box_activity.php
diff --git a/htdocs/core/boxes/box_bookmarks.php b/public/core/boxes/box_bookmarks.php
similarity index 100%
rename from htdocs/core/boxes/box_bookmarks.php
rename to public/core/boxes/box_bookmarks.php
diff --git a/htdocs/core/boxes/box_clients.php b/public/core/boxes/box_clients.php
similarity index 100%
rename from htdocs/core/boxes/box_clients.php
rename to public/core/boxes/box_clients.php
diff --git a/htdocs/core/boxes/box_commandes.php b/public/core/boxes/box_commandes.php
similarity index 100%
rename from htdocs/core/boxes/box_commandes.php
rename to public/core/boxes/box_commandes.php
diff --git a/htdocs/core/boxes/box_comptes.php b/public/core/boxes/box_comptes.php
similarity index 100%
rename from htdocs/core/boxes/box_comptes.php
rename to public/core/boxes/box_comptes.php
diff --git a/htdocs/core/boxes/box_contacts.php b/public/core/boxes/box_contacts.php
similarity index 100%
rename from htdocs/core/boxes/box_contacts.php
rename to public/core/boxes/box_contacts.php
diff --git a/htdocs/core/boxes/box_contracts.php b/public/core/boxes/box_contracts.php
similarity index 100%
rename from htdocs/core/boxes/box_contracts.php
rename to public/core/boxes/box_contracts.php
diff --git a/htdocs/core/boxes/box_external_rss.php b/public/core/boxes/box_external_rss.php
similarity index 100%
rename from htdocs/core/boxes/box_external_rss.php
rename to public/core/boxes/box_external_rss.php
diff --git a/htdocs/core/boxes/box_factures.php b/public/core/boxes/box_factures.php
similarity index 100%
rename from htdocs/core/boxes/box_factures.php
rename to public/core/boxes/box_factures.php
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/public/core/boxes/box_factures_fourn.php
similarity index 100%
rename from htdocs/core/boxes/box_factures_fourn.php
rename to public/core/boxes/box_factures_fourn.php
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/public/core/boxes/box_factures_fourn_imp.php
similarity index 100%
rename from htdocs/core/boxes/box_factures_fourn_imp.php
rename to public/core/boxes/box_factures_fourn_imp.php
diff --git a/htdocs/core/boxes/box_factures_imp.php b/public/core/boxes/box_factures_imp.php
similarity index 100%
rename from htdocs/core/boxes/box_factures_imp.php
rename to public/core/boxes/box_factures_imp.php
diff --git a/htdocs/core/boxes/box_ficheinter.php b/public/core/boxes/box_ficheinter.php
similarity index 100%
rename from htdocs/core/boxes/box_ficheinter.php
rename to public/core/boxes/box_ficheinter.php
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/public/core/boxes/box_fournisseurs.php
similarity index 100%
rename from htdocs/core/boxes/box_fournisseurs.php
rename to public/core/boxes/box_fournisseurs.php
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/public/core/boxes/box_goodcustomers.php
similarity index 100%
rename from htdocs/core/boxes/box_goodcustomers.php
rename to public/core/boxes/box_goodcustomers.php
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/public/core/boxes/box_graph_invoices_permonth.php
similarity index 100%
rename from htdocs/core/boxes/box_graph_invoices_permonth.php
rename to public/core/boxes/box_graph_invoices_permonth.php
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/public/core/boxes/box_graph_invoices_supplier_permonth.php
similarity index 100%
rename from htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
rename to public/core/boxes/box_graph_invoices_supplier_permonth.php
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/public/core/boxes/box_graph_orders_permonth.php
similarity index 100%
rename from htdocs/core/boxes/box_graph_orders_permonth.php
rename to public/core/boxes/box_graph_orders_permonth.php
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/public/core/boxes/box_graph_orders_supplier_permonth.php
similarity index 100%
rename from htdocs/core/boxes/box_graph_orders_supplier_permonth.php
rename to public/core/boxes/box_graph_orders_supplier_permonth.php
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/public/core/boxes/box_graph_product_distribution.php
similarity index 100%
rename from htdocs/core/boxes/box_graph_product_distribution.php
rename to public/core/boxes/box_graph_product_distribution.php
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/public/core/boxes/box_graph_propales_permonth.php
similarity index 100%
rename from htdocs/core/boxes/box_graph_propales_permonth.php
rename to public/core/boxes/box_graph_propales_permonth.php
diff --git a/htdocs/core/boxes/box_members.php b/public/core/boxes/box_members.php
similarity index 100%
rename from htdocs/core/boxes/box_members.php
rename to public/core/boxes/box_members.php
diff --git a/htdocs/core/boxes/box_produits.php b/public/core/boxes/box_produits.php
similarity index 100%
rename from htdocs/core/boxes/box_produits.php
rename to public/core/boxes/box_produits.php
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/public/core/boxes/box_produits_alerte_stock.php
similarity index 100%
rename from htdocs/core/boxes/box_produits_alerte_stock.php
rename to public/core/boxes/box_produits_alerte_stock.php
diff --git a/htdocs/core/boxes/box_project.php b/public/core/boxes/box_project.php
similarity index 100%
rename from htdocs/core/boxes/box_project.php
rename to public/core/boxes/box_project.php
diff --git a/htdocs/core/boxes/box_propales.php b/public/core/boxes/box_propales.php
similarity index 100%
rename from htdocs/core/boxes/box_propales.php
rename to public/core/boxes/box_propales.php
diff --git a/htdocs/core/boxes/box_prospect.php b/public/core/boxes/box_prospect.php
similarity index 100%
rename from htdocs/core/boxes/box_prospect.php
rename to public/core/boxes/box_prospect.php
diff --git a/htdocs/core/boxes/box_services_contracts.php b/public/core/boxes/box_services_contracts.php
similarity index 100%
rename from htdocs/core/boxes/box_services_contracts.php
rename to public/core/boxes/box_services_contracts.php
diff --git a/htdocs/core/boxes/box_services_expired.php b/public/core/boxes/box_services_expired.php
similarity index 100%
rename from htdocs/core/boxes/box_services_expired.php
rename to public/core/boxes/box_services_expired.php
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/public/core/boxes/box_supplier_orders.php
similarity index 100%
rename from htdocs/core/boxes/box_supplier_orders.php
rename to public/core/boxes/box_supplier_orders.php
diff --git a/htdocs/core/boxes/box_task.php b/public/core/boxes/box_task.php
similarity index 100%
rename from htdocs/core/boxes/box_task.php
rename to public/core/boxes/box_task.php
diff --git a/htdocs/core/boxes/index.html b/public/core/boxes/index.html
similarity index 100%
rename from htdocs/core/boxes/index.html
rename to public/core/boxes/index.html
diff --git a/htdocs/core/boxes/modules_boxes.php b/public/core/boxes/modules_boxes.php
similarity index 100%
rename from htdocs/core/boxes/modules_boxes.php
rename to public/core/boxes/modules_boxes.php
diff --git a/htdocs/core/class/CMailFile.class.php b/public/core/class/CMailFile.class.php
similarity index 100%
rename from htdocs/core/class/CMailFile.class.php
rename to public/core/class/CMailFile.class.php
diff --git a/htdocs/core/class/CSMSFile.class.php b/public/core/class/CSMSFile.class.php
similarity index 100%
rename from htdocs/core/class/CSMSFile.class.php
rename to public/core/class/CSMSFile.class.php
diff --git a/htdocs/core/class/antivir.class.php b/public/core/class/antivir.class.php
similarity index 100%
rename from htdocs/core/class/antivir.class.php
rename to public/core/class/antivir.class.php
diff --git a/htdocs/core/class/canvas.class.php b/public/core/class/canvas.class.php
similarity index 100%
rename from htdocs/core/class/canvas.class.php
rename to public/core/class/canvas.class.php
diff --git a/htdocs/core/class/ccountry.class.php b/public/core/class/ccountry.class.php
similarity index 100%
rename from htdocs/core/class/ccountry.class.php
rename to public/core/class/ccountry.class.php
diff --git a/htdocs/core/class/commondocgenerator.class.php b/public/core/class/commondocgenerator.class.php
similarity index 100%
rename from htdocs/core/class/commondocgenerator.class.php
rename to public/core/class/commondocgenerator.class.php
diff --git a/htdocs/core/class/commoninvoice.class.php b/public/core/class/commoninvoice.class.php
similarity index 100%
rename from htdocs/core/class/commoninvoice.class.php
rename to public/core/class/commoninvoice.class.php
diff --git a/htdocs/core/class/commonobject.class.php b/public/core/class/commonobject.class.php
similarity index 100%
rename from htdocs/core/class/commonobject.class.php
rename to public/core/class/commonobject.class.php
diff --git a/htdocs/core/class/commonobjectline.class.php b/public/core/class/commonobjectline.class.php
similarity index 100%
rename from htdocs/core/class/commonobjectline.class.php
rename to public/core/class/commonobjectline.class.php
diff --git a/htdocs/core/class/commonorder.class.php b/public/core/class/commonorder.class.php
similarity index 100%
rename from htdocs/core/class/commonorder.class.php
rename to public/core/class/commonorder.class.php
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/public/core/class/commonstickergenerator.class.php
similarity index 100%
rename from htdocs/core/class/commonstickergenerator.class.php
rename to public/core/class/commonstickergenerator.class.php
diff --git a/htdocs/core/class/conf.class.php b/public/core/class/conf.class.php
similarity index 100%
rename from htdocs/core/class/conf.class.php
rename to public/core/class/conf.class.php
diff --git a/htdocs/core/class/cookie.class.php b/public/core/class/cookie.class.php
similarity index 100%
rename from htdocs/core/class/cookie.class.php
rename to public/core/class/cookie.class.php
diff --git a/htdocs/core/class/cstate.class.php b/public/core/class/cstate.class.php
similarity index 100%
rename from htdocs/core/class/cstate.class.php
rename to public/core/class/cstate.class.php
diff --git a/htdocs/core/class/ctypent.class.php b/public/core/class/ctypent.class.php
similarity index 100%
rename from htdocs/core/class/ctypent.class.php
rename to public/core/class/ctypent.class.php
diff --git a/htdocs/core/class/discount.class.php b/public/core/class/discount.class.php
similarity index 100%
rename from htdocs/core/class/discount.class.php
rename to public/core/class/discount.class.php
diff --git a/htdocs/core/class/doleditor.class.php b/public/core/class/doleditor.class.php
similarity index 100%
rename from htdocs/core/class/doleditor.class.php
rename to public/core/class/doleditor.class.php
diff --git a/htdocs/core/class/dolexception.class.php b/public/core/class/dolexception.class.php
similarity index 100%
rename from htdocs/core/class/dolexception.class.php
rename to public/core/class/dolexception.class.php
diff --git a/htdocs/core/class/dolgeoip.class.php b/public/core/class/dolgeoip.class.php
similarity index 100%
rename from htdocs/core/class/dolgeoip.class.php
rename to public/core/class/dolgeoip.class.php
diff --git a/htdocs/core/class/dolgraph.class.php b/public/core/class/dolgraph.class.php
similarity index 100%
rename from htdocs/core/class/dolgraph.class.php
rename to public/core/class/dolgraph.class.php
diff --git a/htdocs/core/class/dolprintipp.class.php b/public/core/class/dolprintipp.class.php
similarity index 100%
rename from htdocs/core/class/dolprintipp.class.php
rename to public/core/class/dolprintipp.class.php
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/public/core/class/dolreceiptprinter.class.php
similarity index 100%
rename from htdocs/core/class/dolreceiptprinter.class.php
rename to public/core/class/dolreceiptprinter.class.php
diff --git a/htdocs/core/class/events.class.php b/public/core/class/events.class.php
similarity index 100%
rename from htdocs/core/class/events.class.php
rename to public/core/class/events.class.php
diff --git a/htdocs/core/class/extrafields.class.php b/public/core/class/extrafields.class.php
similarity index 100%
rename from htdocs/core/class/extrafields.class.php
rename to public/core/class/extrafields.class.php
diff --git a/htdocs/core/class/fileupload.class.php b/public/core/class/fileupload.class.php
similarity index 100%
rename from htdocs/core/class/fileupload.class.php
rename to public/core/class/fileupload.class.php
diff --git a/htdocs/core/class/fiscalyear.class.php b/public/core/class/fiscalyear.class.php
similarity index 100%
rename from htdocs/core/class/fiscalyear.class.php
rename to public/core/class/fiscalyear.class.php
diff --git a/htdocs/core/class/genericobject.class.php b/public/core/class/genericobject.class.php
similarity index 100%
rename from htdocs/core/class/genericobject.class.php
rename to public/core/class/genericobject.class.php
diff --git a/htdocs/core/class/google.class.php b/public/core/class/google.class.php
similarity index 100%
rename from htdocs/core/class/google.class.php
rename to public/core/class/google.class.php
diff --git a/htdocs/core/class/hookmanager.class.php b/public/core/class/hookmanager.class.php
similarity index 100%
rename from htdocs/core/class/hookmanager.class.php
rename to public/core/class/hookmanager.class.php
diff --git a/htdocs/core/class/html.form.class.php b/public/core/class/html.form.class.php
similarity index 100%
rename from htdocs/core/class/html.form.class.php
rename to public/core/class/html.form.class.php
diff --git a/htdocs/core/class/html.formaccounting.class.php b/public/core/class/html.formaccounting.class.php
similarity index 100%
rename from htdocs/core/class/html.formaccounting.class.php
rename to public/core/class/html.formaccounting.class.php
diff --git a/htdocs/core/class/html.formactions.class.php b/public/core/class/html.formactions.class.php
similarity index 100%
rename from htdocs/core/class/html.formactions.class.php
rename to public/core/class/html.formactions.class.php
diff --git a/htdocs/core/class/html.formadmin.class.php b/public/core/class/html.formadmin.class.php
similarity index 100%
rename from htdocs/core/class/html.formadmin.class.php
rename to public/core/class/html.formadmin.class.php
diff --git a/htdocs/core/class/html.formbank.class.php b/public/core/class/html.formbank.class.php
similarity index 100%
rename from htdocs/core/class/html.formbank.class.php
rename to public/core/class/html.formbank.class.php
diff --git a/htdocs/core/class/html.formbarcode.class.php b/public/core/class/html.formbarcode.class.php
similarity index 100%
rename from htdocs/core/class/html.formbarcode.class.php
rename to public/core/class/html.formbarcode.class.php
diff --git a/htdocs/core/class/html.formcompany.class.php b/public/core/class/html.formcompany.class.php
similarity index 100%
rename from htdocs/core/class/html.formcompany.class.php
rename to public/core/class/html.formcompany.class.php
diff --git a/htdocs/core/class/html.formcontract.class.php b/public/core/class/html.formcontract.class.php
similarity index 100%
rename from htdocs/core/class/html.formcontract.class.php
rename to public/core/class/html.formcontract.class.php
diff --git a/htdocs/core/class/html.formcron.class.php b/public/core/class/html.formcron.class.php
similarity index 100%
rename from htdocs/core/class/html.formcron.class.php
rename to public/core/class/html.formcron.class.php
diff --git a/htdocs/core/class/html.formfile.class.php b/public/core/class/html.formfile.class.php
similarity index 100%
rename from htdocs/core/class/html.formfile.class.php
rename to public/core/class/html.formfile.class.php
diff --git a/htdocs/core/class/html.formintervention.class.php b/public/core/class/html.formintervention.class.php
similarity index 100%
rename from htdocs/core/class/html.formintervention.class.php
rename to public/core/class/html.formintervention.class.php
diff --git a/htdocs/core/class/html.formmail.class.php b/public/core/class/html.formmail.class.php
similarity index 100%
rename from htdocs/core/class/html.formmail.class.php
rename to public/core/class/html.formmail.class.php
diff --git a/htdocs/core/class/html.formmailing.class.php b/public/core/class/html.formmailing.class.php
similarity index 100%
rename from htdocs/core/class/html.formmailing.class.php
rename to public/core/class/html.formmailing.class.php
diff --git a/htdocs/core/class/html.formmargin.class.php b/public/core/class/html.formmargin.class.php
similarity index 100%
rename from htdocs/core/class/html.formmargin.class.php
rename to public/core/class/html.formmargin.class.php
diff --git a/htdocs/core/class/html.formorder.class.php b/public/core/class/html.formorder.class.php
similarity index 100%
rename from htdocs/core/class/html.formorder.class.php
rename to public/core/class/html.formorder.class.php
diff --git a/htdocs/core/class/html.formother.class.php b/public/core/class/html.formother.class.php
similarity index 100%
rename from htdocs/core/class/html.formother.class.php
rename to public/core/class/html.formother.class.php
diff --git a/htdocs/core/class/html.formprojet.class.php b/public/core/class/html.formprojet.class.php
similarity index 100%
rename from htdocs/core/class/html.formprojet.class.php
rename to public/core/class/html.formprojet.class.php
diff --git a/htdocs/core/class/html.formpropal.class.php b/public/core/class/html.formpropal.class.php
similarity index 100%
rename from htdocs/core/class/html.formpropal.class.php
rename to public/core/class/html.formpropal.class.php
diff --git a/htdocs/core/class/html.formsms.class.php b/public/core/class/html.formsms.class.php
similarity index 100%
rename from htdocs/core/class/html.formsms.class.php
rename to public/core/class/html.formsms.class.php
diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/public/core/class/html.formsocialcontrib.class.php
similarity index 100%
rename from htdocs/core/class/html.formsocialcontrib.class.php
rename to public/core/class/html.formsocialcontrib.class.php
diff --git a/htdocs/core/class/index.html b/public/core/class/index.html
similarity index 100%
rename from htdocs/core/class/index.html
rename to public/core/class/index.html
diff --git a/htdocs/core/class/infobox.class.php b/public/core/class/infobox.class.php
similarity index 100%
rename from htdocs/core/class/infobox.class.php
rename to public/core/class/infobox.class.php
diff --git a/htdocs/core/class/interfaces.class.php b/public/core/class/interfaces.class.php
similarity index 100%
rename from htdocs/core/class/interfaces.class.php
rename to public/core/class/interfaces.class.php
diff --git a/htdocs/core/class/ldap.class.php b/public/core/class/ldap.class.php
similarity index 100%
rename from htdocs/core/class/ldap.class.php
rename to public/core/class/ldap.class.php
diff --git a/htdocs/core/class/link.class.php b/public/core/class/link.class.php
similarity index 100%
rename from htdocs/core/class/link.class.php
rename to public/core/class/link.class.php
diff --git a/htdocs/core/class/menu.class.php b/public/core/class/menu.class.php
similarity index 100%
rename from htdocs/core/class/menu.class.php
rename to public/core/class/menu.class.php
diff --git a/htdocs/core/class/menubase.class.php b/public/core/class/menubase.class.php
similarity index 100%
rename from htdocs/core/class/menubase.class.php
rename to public/core/class/menubase.class.php
diff --git a/htdocs/core/class/notify.class.php b/public/core/class/notify.class.php
similarity index 100%
rename from htdocs/core/class/notify.class.php
rename to public/core/class/notify.class.php
diff --git a/htdocs/core/class/openid.class.php b/public/core/class/openid.class.php
similarity index 100%
rename from htdocs/core/class/openid.class.php
rename to public/core/class/openid.class.php
diff --git a/htdocs/core/class/rssparser.class.php b/public/core/class/rssparser.class.php
similarity index 100%
rename from htdocs/core/class/rssparser.class.php
rename to public/core/class/rssparser.class.php
diff --git a/htdocs/core/class/smtps.class.php b/public/core/class/smtps.class.php
similarity index 100%
rename from htdocs/core/class/smtps.class.php
rename to public/core/class/smtps.class.php
diff --git a/htdocs/core/class/stats.class.php b/public/core/class/stats.class.php
similarity index 100%
rename from htdocs/core/class/stats.class.php
rename to public/core/class/stats.class.php
diff --git a/htdocs/core/class/translate.class.php b/public/core/class/translate.class.php
similarity index 100%
rename from htdocs/core/class/translate.class.php
rename to public/core/class/translate.class.php
diff --git a/htdocs/core/class/utils.class.php b/public/core/class/utils.class.php
similarity index 100%
rename from htdocs/core/class/utils.class.php
rename to public/core/class/utils.class.php
diff --git a/htdocs/core/class/vcard.class.php b/public/core/class/vcard.class.php
similarity index 100%
rename from htdocs/core/class/vcard.class.php
rename to public/core/class/vcard.class.php
diff --git a/htdocs/core/class/workboardresponse.class.php b/public/core/class/workboardresponse.class.php
similarity index 100%
rename from htdocs/core/class/workboardresponse.class.php
rename to public/core/class/workboardresponse.class.php
diff --git a/htdocs/core/datepicker.php b/public/core/datepicker.php
similarity index 100%
rename from htdocs/core/datepicker.php
rename to public/core/datepicker.php
diff --git a/htdocs/core/db/Database.interface.php b/public/core/db/Database.interface.php
similarity index 100%
rename from htdocs/core/db/Database.interface.php
rename to public/core/db/Database.interface.php
diff --git a/htdocs/core/db/DoliDB.class.php b/public/core/db/DoliDB.class.php
similarity index 100%
rename from htdocs/core/db/DoliDB.class.php
rename to public/core/db/DoliDB.class.php
diff --git a/htdocs/core/db/index.html b/public/core/db/index.html
similarity index 100%
rename from htdocs/core/db/index.html
rename to public/core/db/index.html
diff --git a/htdocs/core/db/mssql.class.php b/public/core/db/mssql.class.php
similarity index 100%
rename from htdocs/core/db/mssql.class.php
rename to public/core/db/mssql.class.php
diff --git a/htdocs/core/db/mysqli.class.php b/public/core/db/mysqli.class.php
similarity index 100%
rename from htdocs/core/db/mysqli.class.php
rename to public/core/db/mysqli.class.php
diff --git a/htdocs/core/db/pgsql.class.php b/public/core/db/pgsql.class.php
similarity index 100%
rename from htdocs/core/db/pgsql.class.php
rename to public/core/db/pgsql.class.php
diff --git a/htdocs/core/db/sqlite3.class.php b/public/core/db/sqlite3.class.php
similarity index 100%
rename from htdocs/core/db/sqlite3.class.php
rename to public/core/db/sqlite3.class.php
diff --git a/htdocs/core/doxygen.php b/public/core/doxygen.php
similarity index 100%
rename from htdocs/core/doxygen.php
rename to public/core/doxygen.php
diff --git a/htdocs/core/extrafieldsinexport.inc.php b/public/core/extrafieldsinexport.inc.php
similarity index 100%
rename from htdocs/core/extrafieldsinexport.inc.php
rename to public/core/extrafieldsinexport.inc.php
diff --git a/htdocs/core/filemanagerdol/browser/default/browser.css b/public/core/filemanagerdol/browser/default/browser.css
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/browser.css
rename to public/core/filemanagerdol/browser/default/browser.css
diff --git a/htdocs/core/filemanagerdol/browser/default/browser.php b/public/core/filemanagerdol/browser/default/browser.php
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/browser.php
rename to public/core/filemanagerdol/browser/default/browser.php
diff --git a/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php b/public/core/filemanagerdol/browser/default/frmactualfolder.php
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
rename to public/core/filemanagerdol/browser/default/frmactualfolder.php
diff --git a/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php b/public/core/filemanagerdol/browser/default/frmcreatefolder.php
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
rename to public/core/filemanagerdol/browser/default/frmcreatefolder.php
diff --git a/htdocs/core/filemanagerdol/browser/default/frmfolders.php b/public/core/filemanagerdol/browser/default/frmfolders.php
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/frmfolders.php
rename to public/core/filemanagerdol/browser/default/frmfolders.php
diff --git a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php b/public/core/filemanagerdol/browser/default/frmresourceslist.php
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
rename to public/core/filemanagerdol/browser/default/frmresourceslist.php
diff --git a/htdocs/core/filemanagerdol/browser/default/frmupload.php b/public/core/filemanagerdol/browser/default/frmupload.php
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/frmupload.php
rename to public/core/filemanagerdol/browser/default/frmupload.php
diff --git a/htdocs/core/filemanagerdol/browser/default/images/Folder.gif b/public/core/filemanagerdol/browser/default/images/Folder.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/Folder.gif
rename to public/core/filemanagerdol/browser/default/images/Folder.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/FolderUp.gif b/public/core/filemanagerdol/browser/default/images/FolderUp.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/FolderUp.gif
rename to public/core/filemanagerdol/browser/default/images/FolderUp.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/ai.gif b/public/core/filemanagerdol/browser/default/images/icons/32/ai.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/ai.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/ai.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/avi.gif b/public/core/filemanagerdol/browser/default/images/icons/32/avi.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/avi.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/avi.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/bmp.gif b/public/core/filemanagerdol/browser/default/images/icons/32/bmp.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/bmp.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/bmp.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/cs.gif b/public/core/filemanagerdol/browser/default/images/icons/32/cs.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/cs.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/cs.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif b/public/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/dll.gif b/public/core/filemanagerdol/browser/default/images/icons/32/dll.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/dll.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/dll.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/doc.gif b/public/core/filemanagerdol/browser/default/images/icons/32/doc.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/doc.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/doc.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/exe.gif b/public/core/filemanagerdol/browser/default/images/icons/32/exe.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/exe.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/exe.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/fla.gif b/public/core/filemanagerdol/browser/default/images/icons/32/fla.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/fla.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/fla.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/gif.gif b/public/core/filemanagerdol/browser/default/images/icons/32/gif.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/gif.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/gif.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/htm.gif b/public/core/filemanagerdol/browser/default/images/icons/32/htm.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/htm.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/htm.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/html.gif b/public/core/filemanagerdol/browser/default/images/icons/32/html.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/html.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/html.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/index.html b/public/core/filemanagerdol/browser/default/images/icons/32/index.html
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/index.html
rename to public/core/filemanagerdol/browser/default/images/icons/32/index.html
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/jpg.gif b/public/core/filemanagerdol/browser/default/images/icons/32/jpg.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/jpg.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/jpg.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/js.gif b/public/core/filemanagerdol/browser/default/images/icons/32/js.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/js.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/js.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/mdb.gif b/public/core/filemanagerdol/browser/default/images/icons/32/mdb.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/mdb.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/mdb.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/mp3.gif b/public/core/filemanagerdol/browser/default/images/icons/32/mp3.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/mp3.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/mp3.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/pdf.gif b/public/core/filemanagerdol/browser/default/images/icons/32/pdf.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/pdf.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/pdf.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/png.gif b/public/core/filemanagerdol/browser/default/images/icons/32/png.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/png.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/png.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/ppt.gif b/public/core/filemanagerdol/browser/default/images/icons/32/ppt.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/ppt.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/ppt.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/rdp.gif b/public/core/filemanagerdol/browser/default/images/icons/32/rdp.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/rdp.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/rdp.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/swf.gif b/public/core/filemanagerdol/browser/default/images/icons/32/swf.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/swf.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/swf.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/swt.gif b/public/core/filemanagerdol/browser/default/images/icons/32/swt.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/swt.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/swt.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/txt.gif b/public/core/filemanagerdol/browser/default/images/icons/32/txt.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/txt.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/txt.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/vsd.gif b/public/core/filemanagerdol/browser/default/images/icons/32/vsd.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/vsd.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/vsd.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/xls.gif b/public/core/filemanagerdol/browser/default/images/icons/32/xls.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/xls.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/xls.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/xml.gif b/public/core/filemanagerdol/browser/default/images/icons/32/xml.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/xml.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/xml.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/zip.gif b/public/core/filemanagerdol/browser/default/images/icons/32/zip.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/32/zip.gif
rename to public/core/filemanagerdol/browser/default/images/icons/32/zip.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/ai.gif b/public/core/filemanagerdol/browser/default/images/icons/ai.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/ai.gif
rename to public/core/filemanagerdol/browser/default/images/icons/ai.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/avi.gif b/public/core/filemanagerdol/browser/default/images/icons/avi.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/avi.gif
rename to public/core/filemanagerdol/browser/default/images/icons/avi.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/bmp.gif b/public/core/filemanagerdol/browser/default/images/icons/bmp.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/bmp.gif
rename to public/core/filemanagerdol/browser/default/images/icons/bmp.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/cs.gif b/public/core/filemanagerdol/browser/default/images/icons/cs.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/cs.gif
rename to public/core/filemanagerdol/browser/default/images/icons/cs.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/default.icon.gif b/public/core/filemanagerdol/browser/default/images/icons/default.icon.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/default.icon.gif
rename to public/core/filemanagerdol/browser/default/images/icons/default.icon.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/dll.gif b/public/core/filemanagerdol/browser/default/images/icons/dll.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/dll.gif
rename to public/core/filemanagerdol/browser/default/images/icons/dll.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/doc.gif b/public/core/filemanagerdol/browser/default/images/icons/doc.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/doc.gif
rename to public/core/filemanagerdol/browser/default/images/icons/doc.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/exe.gif b/public/core/filemanagerdol/browser/default/images/icons/exe.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/exe.gif
rename to public/core/filemanagerdol/browser/default/images/icons/exe.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/fla.gif b/public/core/filemanagerdol/browser/default/images/icons/fla.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/fla.gif
rename to public/core/filemanagerdol/browser/default/images/icons/fla.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/gif.gif b/public/core/filemanagerdol/browser/default/images/icons/gif.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/gif.gif
rename to public/core/filemanagerdol/browser/default/images/icons/gif.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/htm.gif b/public/core/filemanagerdol/browser/default/images/icons/htm.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/htm.gif
rename to public/core/filemanagerdol/browser/default/images/icons/htm.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/html.gif b/public/core/filemanagerdol/browser/default/images/icons/html.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/html.gif
rename to public/core/filemanagerdol/browser/default/images/icons/html.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/index.html b/public/core/filemanagerdol/browser/default/images/icons/index.html
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/index.html
rename to public/core/filemanagerdol/browser/default/images/icons/index.html
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/jpg.gif b/public/core/filemanagerdol/browser/default/images/icons/jpg.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/jpg.gif
rename to public/core/filemanagerdol/browser/default/images/icons/jpg.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/js.gif b/public/core/filemanagerdol/browser/default/images/icons/js.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/js.gif
rename to public/core/filemanagerdol/browser/default/images/icons/js.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/mdb.gif b/public/core/filemanagerdol/browser/default/images/icons/mdb.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/mdb.gif
rename to public/core/filemanagerdol/browser/default/images/icons/mdb.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/mp3.gif b/public/core/filemanagerdol/browser/default/images/icons/mp3.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/mp3.gif
rename to public/core/filemanagerdol/browser/default/images/icons/mp3.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/pdf.gif b/public/core/filemanagerdol/browser/default/images/icons/pdf.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/pdf.gif
rename to public/core/filemanagerdol/browser/default/images/icons/pdf.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/png.gif b/public/core/filemanagerdol/browser/default/images/icons/png.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/png.gif
rename to public/core/filemanagerdol/browser/default/images/icons/png.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/ppt.gif b/public/core/filemanagerdol/browser/default/images/icons/ppt.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/ppt.gif
rename to public/core/filemanagerdol/browser/default/images/icons/ppt.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/rdp.gif b/public/core/filemanagerdol/browser/default/images/icons/rdp.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/rdp.gif
rename to public/core/filemanagerdol/browser/default/images/icons/rdp.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/swf.gif b/public/core/filemanagerdol/browser/default/images/icons/swf.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/swf.gif
rename to public/core/filemanagerdol/browser/default/images/icons/swf.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/swt.gif b/public/core/filemanagerdol/browser/default/images/icons/swt.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/swt.gif
rename to public/core/filemanagerdol/browser/default/images/icons/swt.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/txt.gif b/public/core/filemanagerdol/browser/default/images/icons/txt.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/txt.gif
rename to public/core/filemanagerdol/browser/default/images/icons/txt.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/vsd.gif b/public/core/filemanagerdol/browser/default/images/icons/vsd.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/vsd.gif
rename to public/core/filemanagerdol/browser/default/images/icons/vsd.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/xls.gif b/public/core/filemanagerdol/browser/default/images/icons/xls.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/xls.gif
rename to public/core/filemanagerdol/browser/default/images/icons/xls.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/xml.gif b/public/core/filemanagerdol/browser/default/images/icons/xml.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/xml.gif
rename to public/core/filemanagerdol/browser/default/images/icons/xml.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/zip.gif b/public/core/filemanagerdol/browser/default/images/icons/zip.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/icons/zip.gif
rename to public/core/filemanagerdol/browser/default/images/icons/zip.gif
diff --git a/htdocs/core/filemanagerdol/browser/default/images/index.html b/public/core/filemanagerdol/browser/default/images/index.html
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/images/index.html
rename to public/core/filemanagerdol/browser/default/images/index.html
diff --git a/htdocs/core/filemanagerdol/browser/default/index.html b/public/core/filemanagerdol/browser/default/index.html
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/index.html
rename to public/core/filemanagerdol/browser/default/index.html
diff --git a/htdocs/core/filemanagerdol/browser/default/js/common.js b/public/core/filemanagerdol/browser/default/js/common.js
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/js/common.js
rename to public/core/filemanagerdol/browser/default/js/common.js
diff --git a/htdocs/core/filemanagerdol/browser/default/js/fckxml.js b/public/core/filemanagerdol/browser/default/js/fckxml.js
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/js/fckxml.js
rename to public/core/filemanagerdol/browser/default/js/fckxml.js
diff --git a/htdocs/core/filemanagerdol/browser/default/js/index.html b/public/core/filemanagerdol/browser/default/js/index.html
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/js/index.html
rename to public/core/filemanagerdol/browser/default/js/index.html
diff --git a/htdocs/core/filemanagerdol/browser/default/spacer.gif b/public/core/filemanagerdol/browser/default/spacer.gif
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/default/spacer.gif
rename to public/core/filemanagerdol/browser/default/spacer.gif
diff --git a/htdocs/core/filemanagerdol/browser/index.html b/public/core/filemanagerdol/browser/index.html
similarity index 100%
rename from htdocs/core/filemanagerdol/browser/index.html
rename to public/core/filemanagerdol/browser/index.html
diff --git a/htdocs/core/filemanagerdol/connectors/index.html b/public/core/filemanagerdol/connectors/index.html
similarity index 100%
rename from htdocs/core/filemanagerdol/connectors/index.html
rename to public/core/filemanagerdol/connectors/index.html
diff --git a/htdocs/core/filemanagerdol/connectors/php/basexml.php b/public/core/filemanagerdol/connectors/php/basexml.php
similarity index 100%
rename from htdocs/core/filemanagerdol/connectors/php/basexml.php
rename to public/core/filemanagerdol/connectors/php/basexml.php
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/public/core/filemanagerdol/connectors/php/commands.php
similarity index 100%
rename from htdocs/core/filemanagerdol/connectors/php/commands.php
rename to public/core/filemanagerdol/connectors/php/commands.php
diff --git a/htdocs/core/filemanagerdol/connectors/php/config.php b/public/core/filemanagerdol/connectors/php/config.php
similarity index 100%
rename from htdocs/core/filemanagerdol/connectors/php/config.php
rename to public/core/filemanagerdol/connectors/php/config.php
diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.php b/public/core/filemanagerdol/connectors/php/connector.php
similarity index 100%
rename from htdocs/core/filemanagerdol/connectors/php/connector.php
rename to public/core/filemanagerdol/connectors/php/connector.php
diff --git a/htdocs/core/filemanagerdol/connectors/php/index.html b/public/core/filemanagerdol/connectors/php/index.html
similarity index 100%
rename from htdocs/core/filemanagerdol/connectors/php/index.html
rename to public/core/filemanagerdol/connectors/php/index.html
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/public/core/filemanagerdol/connectors/php/io.php
similarity index 100%
rename from htdocs/core/filemanagerdol/connectors/php/io.php
rename to public/core/filemanagerdol/connectors/php/io.php
diff --git a/htdocs/core/filemanagerdol/connectors/php/upload.php b/public/core/filemanagerdol/connectors/php/upload.php
similarity index 100%
rename from htdocs/core/filemanagerdol/connectors/php/upload.php
rename to public/core/filemanagerdol/connectors/php/upload.php
diff --git a/htdocs/core/filemanagerdol/connectors/php/util.php b/public/core/filemanagerdol/connectors/php/util.php
similarity index 100%
rename from htdocs/core/filemanagerdol/connectors/php/util.php
rename to public/core/filemanagerdol/connectors/php/util.php
diff --git a/htdocs/core/filemanagerdol/index.html b/public/core/filemanagerdol/index.html
similarity index 100%
rename from htdocs/core/filemanagerdol/index.html
rename to public/core/filemanagerdol/index.html
diff --git a/htdocs/core/get_menudiv.php b/public/core/get_menudiv.php
similarity index 100%
rename from htdocs/core/get_menudiv.php
rename to public/core/get_menudiv.php
diff --git a/htdocs/core/index.html b/public/core/index.html
similarity index 100%
rename from htdocs/core/index.html
rename to public/core/index.html
diff --git a/htdocs/core/js/blockUI.js b/public/core/js/blockUI.js
similarity index 100%
rename from htdocs/core/js/blockUI.js
rename to public/core/js/blockUI.js
diff --git a/htdocs/core/js/datepicker.js.php b/public/core/js/datepicker.js.php
similarity index 100%
rename from htdocs/core/js/datepicker.js.php
rename to public/core/js/datepicker.js.php
diff --git a/htdocs/core/js/dst.js b/public/core/js/dst.js
similarity index 100%
rename from htdocs/core/js/dst.js
rename to public/core/js/dst.js
diff --git a/htdocs/core/js/editinplace.js b/public/core/js/editinplace.js
similarity index 100%
rename from htdocs/core/js/editinplace.js
rename to public/core/js/editinplace.js
diff --git a/htdocs/core/js/index.html b/public/core/js/index.html
similarity index 100%
rename from htdocs/core/js/index.html
rename to public/core/js/index.html
diff --git a/htdocs/core/js/jnotify.js b/public/core/js/jnotify.js
similarity index 100%
rename from htdocs/core/js/jnotify.js
rename to public/core/js/jnotify.js
diff --git a/htdocs/core/js/lib_batch.js b/public/core/js/lib_batch.js
similarity index 100%
rename from htdocs/core/js/lib_batch.js
rename to public/core/js/lib_batch.js
diff --git a/htdocs/core/js/lib_head.js.php b/public/core/js/lib_head.js.php
similarity index 100%
rename from htdocs/core/js/lib_head.js.php
rename to public/core/js/lib_head.js.php
diff --git a/htdocs/core/js/lib_photosresize.js b/public/core/js/lib_photosresize.js
similarity index 100%
rename from htdocs/core/js/lib_photosresize.js
rename to public/core/js/lib_photosresize.js
diff --git a/htdocs/core/js/lib_rare.js b/public/core/js/lib_rare.js
similarity index 100%
rename from htdocs/core/js/lib_rare.js
rename to public/core/js/lib_rare.js
diff --git a/htdocs/core/js/select2_locale.js.php b/public/core/js/select2_locale.js.php
similarity index 100%
rename from htdocs/core/js/select2_locale.js.php
rename to public/core/js/select2_locale.js.php
diff --git a/htdocs/core/js/timepicker.js.php b/public/core/js/timepicker.js.php
similarity index 100%
rename from htdocs/core/js/timepicker.js.php
rename to public/core/js/timepicker.js.php
diff --git a/htdocs/core/js/timesheet.js b/public/core/js/timesheet.js
similarity index 100%
rename from htdocs/core/js/timesheet.js
rename to public/core/js/timesheet.js
diff --git a/htdocs/core/lib/accounting.lib.php b/public/core/lib/accounting.lib.php
similarity index 100%
rename from htdocs/core/lib/accounting.lib.php
rename to public/core/lib/accounting.lib.php
diff --git a/htdocs/core/lib/admin.lib.php b/public/core/lib/admin.lib.php
similarity index 100%
rename from htdocs/core/lib/admin.lib.php
rename to public/core/lib/admin.lib.php
diff --git a/htdocs/core/lib/agenda.lib.php b/public/core/lib/agenda.lib.php
similarity index 100%
rename from htdocs/core/lib/agenda.lib.php
rename to public/core/lib/agenda.lib.php
diff --git a/htdocs/core/lib/ajax.lib.php b/public/core/lib/ajax.lib.php
similarity index 100%
rename from htdocs/core/lib/ajax.lib.php
rename to public/core/lib/ajax.lib.php
diff --git a/htdocs/core/lib/bank.lib.php b/public/core/lib/bank.lib.php
similarity index 100%
rename from htdocs/core/lib/bank.lib.php
rename to public/core/lib/bank.lib.php
diff --git a/htdocs/core/lib/barcode.lib.php b/public/core/lib/barcode.lib.php
similarity index 100%
rename from htdocs/core/lib/barcode.lib.php
rename to public/core/lib/barcode.lib.php
diff --git a/htdocs/core/lib/categories.lib.php b/public/core/lib/categories.lib.php
similarity index 100%
rename from htdocs/core/lib/categories.lib.php
rename to public/core/lib/categories.lib.php
diff --git a/htdocs/core/lib/company.lib.php b/public/core/lib/company.lib.php
similarity index 100%
rename from htdocs/core/lib/company.lib.php
rename to public/core/lib/company.lib.php
diff --git a/htdocs/core/lib/contact.lib.php b/public/core/lib/contact.lib.php
similarity index 100%
rename from htdocs/core/lib/contact.lib.php
rename to public/core/lib/contact.lib.php
diff --git a/htdocs/core/lib/contract.lib.php b/public/core/lib/contract.lib.php
similarity index 100%
rename from htdocs/core/lib/contract.lib.php
rename to public/core/lib/contract.lib.php
diff --git a/htdocs/core/lib/cron.lib.php b/public/core/lib/cron.lib.php
similarity index 100%
rename from htdocs/core/lib/cron.lib.php
rename to public/core/lib/cron.lib.php
diff --git a/htdocs/core/lib/date.lib.php b/public/core/lib/date.lib.php
similarity index 100%
rename from htdocs/core/lib/date.lib.php
rename to public/core/lib/date.lib.php
diff --git a/htdocs/core/lib/doc.lib.php b/public/core/lib/doc.lib.php
similarity index 100%
rename from htdocs/core/lib/doc.lib.php
rename to public/core/lib/doc.lib.php
diff --git a/htdocs/core/lib/doleditor.lib.php b/public/core/lib/doleditor.lib.php
similarity index 100%
rename from htdocs/core/lib/doleditor.lib.php
rename to public/core/lib/doleditor.lib.php
diff --git a/htdocs/core/lib/donation.lib.php b/public/core/lib/donation.lib.php
similarity index 100%
rename from htdocs/core/lib/donation.lib.php
rename to public/core/lib/donation.lib.php
diff --git a/htdocs/core/lib/ecm.lib.php b/public/core/lib/ecm.lib.php
similarity index 100%
rename from htdocs/core/lib/ecm.lib.php
rename to public/core/lib/ecm.lib.php
diff --git a/htdocs/core/lib/emailing.lib.php b/public/core/lib/emailing.lib.php
similarity index 100%
rename from htdocs/core/lib/emailing.lib.php
rename to public/core/lib/emailing.lib.php
diff --git a/htdocs/core/lib/expedition.lib.php b/public/core/lib/expedition.lib.php
similarity index 100%
rename from htdocs/core/lib/expedition.lib.php
rename to public/core/lib/expedition.lib.php
diff --git a/htdocs/core/lib/expensereport.lib.php b/public/core/lib/expensereport.lib.php
similarity index 100%
rename from htdocs/core/lib/expensereport.lib.php
rename to public/core/lib/expensereport.lib.php
diff --git a/htdocs/core/lib/fichinter.lib.php b/public/core/lib/fichinter.lib.php
similarity index 100%
rename from htdocs/core/lib/fichinter.lib.php
rename to public/core/lib/fichinter.lib.php
diff --git a/htdocs/core/lib/files.lib.php b/public/core/lib/files.lib.php
similarity index 100%
rename from htdocs/core/lib/files.lib.php
rename to public/core/lib/files.lib.php
diff --git a/htdocs/core/lib/fiscalyear.lib.php b/public/core/lib/fiscalyear.lib.php
similarity index 100%
rename from htdocs/core/lib/fiscalyear.lib.php
rename to public/core/lib/fiscalyear.lib.php
diff --git a/htdocs/core/lib/format_cards.lib.php b/public/core/lib/format_cards.lib.php
similarity index 100%
rename from htdocs/core/lib/format_cards.lib.php
rename to public/core/lib/format_cards.lib.php
diff --git a/htdocs/core/lib/fourn.lib.php b/public/core/lib/fourn.lib.php
similarity index 100%
rename from htdocs/core/lib/fourn.lib.php
rename to public/core/lib/fourn.lib.php
diff --git a/htdocs/core/lib/functions.lib.php b/public/core/lib/functions.lib.php
similarity index 100%
rename from htdocs/core/lib/functions.lib.php
rename to public/core/lib/functions.lib.php
diff --git a/htdocs/core/lib/functions2.lib.php b/public/core/lib/functions2.lib.php
similarity index 100%
rename from htdocs/core/lib/functions2.lib.php
rename to public/core/lib/functions2.lib.php
diff --git a/htdocs/core/lib/functions_ch.lib.php b/public/core/lib/functions_ch.lib.php
similarity index 100%
rename from htdocs/core/lib/functions_ch.lib.php
rename to public/core/lib/functions_ch.lib.php
diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/public/core/lib/functionsnumtoword.lib.php
similarity index 100%
rename from htdocs/core/lib/functionsnumtoword.lib.php
rename to public/core/lib/functionsnumtoword.lib.php
diff --git a/htdocs/core/lib/geturl.lib.php b/public/core/lib/geturl.lib.php
similarity index 100%
rename from htdocs/core/lib/geturl.lib.php
rename to public/core/lib/geturl.lib.php
diff --git a/htdocs/core/lib/holiday.lib.php b/public/core/lib/holiday.lib.php
similarity index 100%
rename from htdocs/core/lib/holiday.lib.php
rename to public/core/lib/holiday.lib.php
diff --git a/htdocs/core/lib/hrm.lib.php b/public/core/lib/hrm.lib.php
similarity index 100%
rename from htdocs/core/lib/hrm.lib.php
rename to public/core/lib/hrm.lib.php
diff --git a/htdocs/core/lib/images.lib.php b/public/core/lib/images.lib.php
similarity index 100%
rename from htdocs/core/lib/images.lib.php
rename to public/core/lib/images.lib.php
diff --git a/htdocs/core/lib/import.lib.php b/public/core/lib/import.lib.php
similarity index 100%
rename from htdocs/core/lib/import.lib.php
rename to public/core/lib/import.lib.php
diff --git a/htdocs/core/lib/index.html b/public/core/lib/index.html
similarity index 100%
rename from htdocs/core/lib/index.html
rename to public/core/lib/index.html
diff --git a/htdocs/core/lib/invoice.lib.php b/public/core/lib/invoice.lib.php
similarity index 100%
rename from htdocs/core/lib/invoice.lib.php
rename to public/core/lib/invoice.lib.php
diff --git a/htdocs/core/lib/invoice2.lib.php b/public/core/lib/invoice2.lib.php
similarity index 100%
rename from htdocs/core/lib/invoice2.lib.php
rename to public/core/lib/invoice2.lib.php
diff --git a/htdocs/core/lib/json.lib.php b/public/core/lib/json.lib.php
similarity index 100%
rename from htdocs/core/lib/json.lib.php
rename to public/core/lib/json.lib.php
diff --git a/htdocs/core/lib/ldap.lib.php b/public/core/lib/ldap.lib.php
similarity index 100%
rename from htdocs/core/lib/ldap.lib.php
rename to public/core/lib/ldap.lib.php
diff --git a/htdocs/core/lib/loan.lib.php b/public/core/lib/loan.lib.php
similarity index 100%
rename from htdocs/core/lib/loan.lib.php
rename to public/core/lib/loan.lib.php
diff --git a/htdocs/core/lib/mailmanspip.lib.php b/public/core/lib/mailmanspip.lib.php
similarity index 100%
rename from htdocs/core/lib/mailmanspip.lib.php
rename to public/core/lib/mailmanspip.lib.php
diff --git a/htdocs/core/lib/member.lib.php b/public/core/lib/member.lib.php
similarity index 100%
rename from htdocs/core/lib/member.lib.php
rename to public/core/lib/member.lib.php
diff --git a/htdocs/core/lib/memory.lib.php b/public/core/lib/memory.lib.php
similarity index 100%
rename from htdocs/core/lib/memory.lib.php
rename to public/core/lib/memory.lib.php
diff --git a/htdocs/core/lib/multicurrency.lib.php b/public/core/lib/multicurrency.lib.php
similarity index 100%
rename from htdocs/core/lib/multicurrency.lib.php
rename to public/core/lib/multicurrency.lib.php
diff --git a/htdocs/core/lib/oauth.lib.php b/public/core/lib/oauth.lib.php
similarity index 100%
rename from htdocs/core/lib/oauth.lib.php
rename to public/core/lib/oauth.lib.php
diff --git a/htdocs/core/lib/order.lib.php b/public/core/lib/order.lib.php
similarity index 100%
rename from htdocs/core/lib/order.lib.php
rename to public/core/lib/order.lib.php
diff --git a/htdocs/core/lib/payments.lib.php b/public/core/lib/payments.lib.php
similarity index 100%
rename from htdocs/core/lib/payments.lib.php
rename to public/core/lib/payments.lib.php
diff --git a/htdocs/core/lib/pdf.lib.php b/public/core/lib/pdf.lib.php
similarity index 100%
rename from htdocs/core/lib/pdf.lib.php
rename to public/core/lib/pdf.lib.php
diff --git a/htdocs/core/lib/prelevement.lib.php b/public/core/lib/prelevement.lib.php
similarity index 100%
rename from htdocs/core/lib/prelevement.lib.php
rename to public/core/lib/prelevement.lib.php
diff --git a/htdocs/core/lib/price.lib.php b/public/core/lib/price.lib.php
similarity index 100%
rename from htdocs/core/lib/price.lib.php
rename to public/core/lib/price.lib.php
diff --git a/htdocs/core/lib/product.lib.php b/public/core/lib/product.lib.php
similarity index 100%
rename from htdocs/core/lib/product.lib.php
rename to public/core/lib/product.lib.php
diff --git a/htdocs/core/lib/project.lib.php b/public/core/lib/project.lib.php
similarity index 100%
rename from htdocs/core/lib/project.lib.php
rename to public/core/lib/project.lib.php
diff --git a/htdocs/core/lib/propal.lib.php b/public/core/lib/propal.lib.php
similarity index 100%
rename from htdocs/core/lib/propal.lib.php
rename to public/core/lib/propal.lib.php
diff --git a/htdocs/core/lib/receiptprinter.lib.php b/public/core/lib/receiptprinter.lib.php
similarity index 100%
rename from htdocs/core/lib/receiptprinter.lib.php
rename to public/core/lib/receiptprinter.lib.php
diff --git a/htdocs/core/lib/report.lib.php b/public/core/lib/report.lib.php
similarity index 100%
rename from htdocs/core/lib/report.lib.php
rename to public/core/lib/report.lib.php
diff --git a/htdocs/core/lib/resource.lib.php b/public/core/lib/resource.lib.php
similarity index 100%
rename from htdocs/core/lib/resource.lib.php
rename to public/core/lib/resource.lib.php
diff --git a/htdocs/core/lib/salaries.lib.php b/public/core/lib/salaries.lib.php
similarity index 100%
rename from htdocs/core/lib/salaries.lib.php
rename to public/core/lib/salaries.lib.php
diff --git a/htdocs/core/lib/security.lib.php b/public/core/lib/security.lib.php
similarity index 100%
rename from htdocs/core/lib/security.lib.php
rename to public/core/lib/security.lib.php
diff --git a/htdocs/core/lib/security2.lib.php b/public/core/lib/security2.lib.php
similarity index 100%
rename from htdocs/core/lib/security2.lib.php
rename to public/core/lib/security2.lib.php
diff --git a/htdocs/core/lib/sendings.lib.php b/public/core/lib/sendings.lib.php
similarity index 100%
rename from htdocs/core/lib/sendings.lib.php
rename to public/core/lib/sendings.lib.php
diff --git a/htdocs/core/lib/stock.lib.php b/public/core/lib/stock.lib.php
similarity index 100%
rename from htdocs/core/lib/stock.lib.php
rename to public/core/lib/stock.lib.php
diff --git a/htdocs/core/lib/supplier_proposal.lib.php b/public/core/lib/supplier_proposal.lib.php
similarity index 100%
rename from htdocs/core/lib/supplier_proposal.lib.php
rename to public/core/lib/supplier_proposal.lib.php
diff --git a/htdocs/core/lib/tax.lib.php b/public/core/lib/tax.lib.php
similarity index 100%
rename from htdocs/core/lib/tax.lib.php
rename to public/core/lib/tax.lib.php
diff --git a/htdocs/core/lib/treeview.lib.php b/public/core/lib/treeview.lib.php
similarity index 100%
rename from htdocs/core/lib/treeview.lib.php
rename to public/core/lib/treeview.lib.php
diff --git a/htdocs/core/lib/trip.lib.php b/public/core/lib/trip.lib.php
similarity index 100%
rename from htdocs/core/lib/trip.lib.php
rename to public/core/lib/trip.lib.php
diff --git a/htdocs/core/lib/usergroups.lib.php b/public/core/lib/usergroups.lib.php
similarity index 100%
rename from htdocs/core/lib/usergroups.lib.php
rename to public/core/lib/usergroups.lib.php
diff --git a/htdocs/core/lib/vat.lib.php b/public/core/lib/vat.lib.php
similarity index 100%
rename from htdocs/core/lib/vat.lib.php
rename to public/core/lib/vat.lib.php
diff --git a/htdocs/core/lib/ws.lib.php b/public/core/lib/ws.lib.php
similarity index 100%
rename from htdocs/core/lib/ws.lib.php
rename to public/core/lib/ws.lib.php
diff --git a/htdocs/core/lib/xcal.lib.php b/public/core/lib/xcal.lib.php
similarity index 100%
rename from htdocs/core/lib/xcal.lib.php
rename to public/core/lib/xcal.lib.php
diff --git a/htdocs/core/login/README.txt b/public/core/login/README.txt
similarity index 100%
rename from htdocs/core/login/README.txt
rename to public/core/login/README.txt
diff --git a/htdocs/core/login/functions_dolibarr.php b/public/core/login/functions_dolibarr.php
similarity index 100%
rename from htdocs/core/login/functions_dolibarr.php
rename to public/core/login/functions_dolibarr.php
diff --git a/htdocs/core/login/functions_empty.php b/public/core/login/functions_empty.php
similarity index 100%
rename from htdocs/core/login/functions_empty.php
rename to public/core/login/functions_empty.php
diff --git a/htdocs/core/login/functions_forceuser.php b/public/core/login/functions_forceuser.php
similarity index 100%
rename from htdocs/core/login/functions_forceuser.php
rename to public/core/login/functions_forceuser.php
diff --git a/htdocs/core/login/functions_http.php b/public/core/login/functions_http.php
similarity index 100%
rename from htdocs/core/login/functions_http.php
rename to public/core/login/functions_http.php
diff --git a/htdocs/core/login/functions_ldap.php b/public/core/login/functions_ldap.php
similarity index 100%
rename from htdocs/core/login/functions_ldap.php
rename to public/core/login/functions_ldap.php
diff --git a/htdocs/core/login/functions_openid.php b/public/core/login/functions_openid.php
similarity index 100%
rename from htdocs/core/login/functions_openid.php
rename to public/core/login/functions_openid.php
diff --git a/htdocs/core/login/index.html b/public/core/login/index.html
similarity index 100%
rename from htdocs/core/login/index.html
rename to public/core/login/index.html
diff --git a/htdocs/core/menus/index.html b/public/core/menus/index.html
similarity index 100%
rename from htdocs/core/menus/index.html
rename to public/core/menus/index.html
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/public/core/menus/init_menu_auguria.sql
similarity index 100%
rename from htdocs/core/menus/init_menu_auguria.sql
rename to public/core/menus/init_menu_auguria.sql
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/public/core/menus/standard/auguria.lib.php
similarity index 100%
rename from htdocs/core/menus/standard/auguria.lib.php
rename to public/core/menus/standard/auguria.lib.php
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/public/core/menus/standard/auguria_menu.php
similarity index 100%
rename from htdocs/core/menus/standard/auguria_menu.php
rename to public/core/menus/standard/auguria_menu.php
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/public/core/menus/standard/eldy.lib.php
similarity index 100%
rename from htdocs/core/menus/standard/eldy.lib.php
rename to public/core/menus/standard/eldy.lib.php
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/public/core/menus/standard/eldy_menu.php
similarity index 100%
rename from htdocs/core/menus/standard/eldy_menu.php
rename to public/core/menus/standard/eldy_menu.php
diff --git a/htdocs/core/menus/standard/empty.php b/public/core/menus/standard/empty.php
similarity index 100%
rename from htdocs/core/menus/standard/empty.php
rename to public/core/menus/standard/empty.php
diff --git a/htdocs/core/menus/standard/index.html b/public/core/menus/standard/index.html
similarity index 100%
rename from htdocs/core/menus/standard/index.html
rename to public/core/menus/standard/index.html
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/public/core/modules/DolibarrModules.class.php
similarity index 100%
rename from htdocs/core/modules/DolibarrModules.class.php
rename to public/core/modules/DolibarrModules.class.php
diff --git a/htdocs/core/modules/action/index.html b/public/core/modules/action/index.html
similarity index 100%
rename from htdocs/core/modules/action/index.html
rename to public/core/modules/action/index.html
diff --git a/htdocs/core/modules/action/modules_action.php b/public/core/modules/action/modules_action.php
similarity index 100%
rename from htdocs/core/modules/action/modules_action.php
rename to public/core/modules/action/modules_action.php
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/public/core/modules/action/rapport.pdf.php
similarity index 100%
rename from htdocs/core/modules/action/rapport.pdf.php
rename to public/core/modules/action/rapport.pdf.php
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/public/core/modules/bank/doc/pdf_ban.modules.php
similarity index 100%
rename from htdocs/core/modules/bank/doc/pdf_ban.modules.php
rename to public/core/modules/bank/doc/pdf_ban.modules.php
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/public/core/modules/bank/doc/pdf_sepamandate.modules.php
similarity index 100%
rename from htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
rename to public/core/modules/bank/doc/pdf_sepamandate.modules.php
diff --git a/htdocs/core/modules/bank/modules_bank.php b/public/core/modules/bank/modules_bank.php
similarity index 100%
rename from htdocs/core/modules/bank/modules_bank.php
rename to public/core/modules/bank/modules_bank.php
diff --git a/htdocs/core/modules/barcode/doc/index.html b/public/core/modules/barcode/doc/index.html
similarity index 100%
rename from htdocs/core/modules/barcode/doc/index.html
rename to public/core/modules/barcode/doc/index.html
diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/public/core/modules/barcode/doc/phpbarcode.modules.php
similarity index 100%
rename from htdocs/core/modules/barcode/doc/phpbarcode.modules.php
rename to public/core/modules/barcode/doc/phpbarcode.modules.php
diff --git a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php b/public/core/modules/barcode/doc/tcpdfbarcode.modules.php
similarity index 100%
rename from htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
rename to public/core/modules/barcode/doc/tcpdfbarcode.modules.php
diff --git a/htdocs/core/modules/barcode/index.html b/public/core/modules/barcode/index.html
similarity index 100%
rename from htdocs/core/modules/barcode/index.html
rename to public/core/modules/barcode/index.html
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/public/core/modules/barcode/mod_barcode_product_standard.php
similarity index 100%
rename from htdocs/core/modules/barcode/mod_barcode_product_standard.php
rename to public/core/modules/barcode/mod_barcode_product_standard.php
diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/public/core/modules/barcode/modules_barcode.class.php
similarity index 100%
rename from htdocs/core/modules/barcode/modules_barcode.class.php
rename to public/core/modules/barcode/modules_barcode.class.php
diff --git a/htdocs/core/modules/cheque/doc/index.html b/public/core/modules/cheque/doc/index.html
similarity index 100%
rename from htdocs/core/modules/cheque/doc/index.html
rename to public/core/modules/cheque/doc/index.html
diff --git a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php b/public/core/modules/cheque/doc/pdf_blochet.class.php
similarity index 100%
rename from htdocs/core/modules/cheque/doc/pdf_blochet.class.php
rename to public/core/modules/cheque/doc/pdf_blochet.class.php
diff --git a/htdocs/core/modules/cheque/index.html b/public/core/modules/cheque/index.html
similarity index 100%
rename from htdocs/core/modules/cheque/index.html
rename to public/core/modules/cheque/index.html
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/public/core/modules/cheque/mod_chequereceipt_mint.php
similarity index 100%
rename from htdocs/core/modules/cheque/mod_chequereceipt_mint.php
rename to public/core/modules/cheque/mod_chequereceipt_mint.php
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/public/core/modules/cheque/mod_chequereceipt_thyme.php
similarity index 100%
rename from htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
rename to public/core/modules/cheque/mod_chequereceipt_thyme.php
diff --git a/htdocs/core/modules/cheque/modules_chequereceipts.php b/public/core/modules/cheque/modules_chequereceipts.php
similarity index 100%
rename from htdocs/core/modules/cheque/modules_chequereceipts.php
rename to public/core/modules/cheque/modules_chequereceipts.php
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/public/core/modules/commande/doc/doc_generic_order_odt.modules.php
similarity index 100%
rename from htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
rename to public/core/modules/commande/doc/doc_generic_order_odt.modules.php
diff --git a/htdocs/core/modules/commande/doc/index.html b/public/core/modules/commande/doc/index.html
similarity index 100%
rename from htdocs/core/modules/commande/doc/index.html
rename to public/core/modules/commande/doc/index.html
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/public/core/modules/commande/doc/pdf_einstein.modules.php
similarity index 100%
rename from htdocs/core/modules/commande/doc/pdf_einstein.modules.php
rename to public/core/modules/commande/doc/pdf_einstein.modules.php
diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/public/core/modules/commande/doc/pdf_proforma.modules.php
similarity index 100%
rename from htdocs/core/modules/commande/doc/pdf_proforma.modules.php
rename to public/core/modules/commande/doc/pdf_proforma.modules.php
diff --git a/htdocs/core/modules/commande/index.html b/public/core/modules/commande/index.html
similarity index 100%
rename from htdocs/core/modules/commande/index.html
rename to public/core/modules/commande/index.html
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/public/core/modules/commande/mod_commande_marbre.php
similarity index 100%
rename from htdocs/core/modules/commande/mod_commande_marbre.php
rename to public/core/modules/commande/mod_commande_marbre.php
diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/public/core/modules/commande/mod_commande_saphir.php
similarity index 100%
rename from htdocs/core/modules/commande/mod_commande_saphir.php
rename to public/core/modules/commande/mod_commande_saphir.php
diff --git a/htdocs/core/modules/commande/modules_commande.php b/public/core/modules/commande/modules_commande.php
similarity index 100%
rename from htdocs/core/modules/commande/modules_commande.php
rename to public/core/modules/commande/modules_commande.php
diff --git a/htdocs/core/modules/contract/doc/index.html b/public/core/modules/contract/doc/index.html
similarity index 100%
rename from htdocs/core/modules/contract/doc/index.html
rename to public/core/modules/contract/doc/index.html
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/public/core/modules/contract/doc/pdf_strato.modules.php
similarity index 100%
rename from htdocs/core/modules/contract/doc/pdf_strato.modules.php
rename to public/core/modules/contract/doc/pdf_strato.modules.php
diff --git a/htdocs/core/modules/contract/index.html b/public/core/modules/contract/index.html
similarity index 100%
rename from htdocs/core/modules/contract/index.html
rename to public/core/modules/contract/index.html
diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/public/core/modules/contract/mod_contract_magre.php
similarity index 100%
rename from htdocs/core/modules/contract/mod_contract_magre.php
rename to public/core/modules/contract/mod_contract_magre.php
diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/public/core/modules/contract/mod_contract_olive.php
similarity index 100%
rename from htdocs/core/modules/contract/mod_contract_olive.php
rename to public/core/modules/contract/mod_contract_olive.php
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/public/core/modules/contract/mod_contract_serpis.php
similarity index 100%
rename from htdocs/core/modules/contract/mod_contract_serpis.php
rename to public/core/modules/contract/mod_contract_serpis.php
diff --git a/htdocs/core/modules/contract/modules_contract.php b/public/core/modules/contract/modules_contract.php
similarity index 100%
rename from htdocs/core/modules/contract/modules_contract.php
rename to public/core/modules/contract/modules_contract.php
diff --git a/htdocs/core/modules/dons/html_cerfafr.html b/public/core/modules/dons/html_cerfafr.html
similarity index 100%
rename from htdocs/core/modules/dons/html_cerfafr.html
rename to public/core/modules/dons/html_cerfafr.html
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/public/core/modules/dons/html_cerfafr.modules.php
similarity index 100%
rename from htdocs/core/modules/dons/html_cerfafr.modules.php
rename to public/core/modules/dons/html_cerfafr.modules.php
diff --git a/htdocs/core/modules/dons/index.html b/public/core/modules/dons/index.html
similarity index 100%
rename from htdocs/core/modules/dons/index.html
rename to public/core/modules/dons/index.html
diff --git a/htdocs/core/modules/dons/modules_don.php b/public/core/modules/dons/modules_don.php
similarity index 100%
rename from htdocs/core/modules/dons/modules_don.php
rename to public/core/modules/dons/modules_don.php
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/public/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
similarity index 100%
rename from htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
rename to public/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
diff --git a/htdocs/core/modules/expedition/doc/index.html b/public/core/modules/expedition/doc/index.html
similarity index 100%
rename from htdocs/core/modules/expedition/doc/index.html
rename to public/core/modules/expedition/doc/index.html
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/public/core/modules/expedition/doc/pdf_merou.modules.php
similarity index 100%
rename from htdocs/core/modules/expedition/doc/pdf_merou.modules.php
rename to public/core/modules/expedition/doc/pdf_merou.modules.php
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/public/core/modules/expedition/doc/pdf_rouget.modules.php
similarity index 100%
rename from htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
rename to public/core/modules/expedition/doc/pdf_rouget.modules.php
diff --git a/htdocs/core/modules/expedition/index.html b/public/core/modules/expedition/index.html
similarity index 100%
rename from htdocs/core/modules/expedition/index.html
rename to public/core/modules/expedition/index.html
diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/public/core/modules/expedition/mod_expedition_ribera.php
similarity index 100%
rename from htdocs/core/modules/expedition/mod_expedition_ribera.php
rename to public/core/modules/expedition/mod_expedition_ribera.php
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/public/core/modules/expedition/mod_expedition_safor.php
similarity index 100%
rename from htdocs/core/modules/expedition/mod_expedition_safor.php
rename to public/core/modules/expedition/mod_expedition_safor.php
diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/public/core/modules/expedition/modules_expedition.php
similarity index 100%
rename from htdocs/core/modules/expedition/modules_expedition.php
rename to public/core/modules/expedition/modules_expedition.php
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/public/core/modules/expensereport/doc/pdf_standard.modules.php
similarity index 100%
rename from htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
rename to public/core/modules/expensereport/doc/pdf_standard.modules.php
diff --git a/htdocs/core/modules/expensereport/modules_expensereport.php b/public/core/modules/expensereport/modules_expensereport.php
similarity index 100%
rename from htdocs/core/modules/expensereport/modules_expensereport.php
rename to public/core/modules/expensereport/modules_expensereport.php
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/public/core/modules/export/export_csv.modules.php
similarity index 100%
rename from htdocs/core/modules/export/export_csv.modules.php
rename to public/core/modules/export/export_csv.modules.php
diff --git a/htdocs/core/modules/export/export_excel.modules.php b/public/core/modules/export/export_excel.modules.php
similarity index 100%
rename from htdocs/core/modules/export/export_excel.modules.php
rename to public/core/modules/export/export_excel.modules.php
diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/public/core/modules/export/export_excel2007.modules.php
similarity index 100%
rename from htdocs/core/modules/export/export_excel2007.modules.php
rename to public/core/modules/export/export_excel2007.modules.php
diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/public/core/modules/export/export_tsv.modules.php
similarity index 100%
rename from htdocs/core/modules/export/export_tsv.modules.php
rename to public/core/modules/export/export_tsv.modules.php
diff --git a/htdocs/core/modules/export/index.html b/public/core/modules/export/index.html
similarity index 100%
rename from htdocs/core/modules/export/index.html
rename to public/core/modules/export/index.html
diff --git a/htdocs/core/modules/export/modules_export.php b/public/core/modules/export/modules_export.php
similarity index 100%
rename from htdocs/core/modules/export/modules_export.php
rename to public/core/modules/export/modules_export.php
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/public/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
similarity index 100%
rename from htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
rename to public/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
diff --git a/htdocs/core/modules/facture/doc/index.html b/public/core/modules/facture/doc/index.html
similarity index 100%
rename from htdocs/core/modules/facture/doc/index.html
rename to public/core/modules/facture/doc/index.html
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/public/core/modules/facture/doc/pdf_crabe.modules.php
similarity index 100%
rename from htdocs/core/modules/facture/doc/pdf_crabe.modules.php
rename to public/core/modules/facture/doc/pdf_crabe.modules.php
diff --git a/htdocs/core/modules/facture/index.html b/public/core/modules/facture/index.html
similarity index 100%
rename from htdocs/core/modules/facture/index.html
rename to public/core/modules/facture/index.html
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/public/core/modules/facture/mod_facture_mars.php
similarity index 100%
rename from htdocs/core/modules/facture/mod_facture_mars.php
rename to public/core/modules/facture/mod_facture_mars.php
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/public/core/modules/facture/mod_facture_mercure.php
similarity index 100%
rename from htdocs/core/modules/facture/mod_facture_mercure.php
rename to public/core/modules/facture/mod_facture_mercure.php
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/public/core/modules/facture/mod_facture_terre.php
similarity index 100%
rename from htdocs/core/modules/facture/mod_facture_terre.php
rename to public/core/modules/facture/mod_facture_terre.php
diff --git a/htdocs/core/modules/facture/modules_facture.php b/public/core/modules/facture/modules_facture.php
similarity index 100%
rename from htdocs/core/modules/facture/modules_facture.php
rename to public/core/modules/facture/modules_facture.php
diff --git a/htdocs/core/modules/fichinter/doc/index.html b/public/core/modules/fichinter/doc/index.html
similarity index 100%
rename from htdocs/core/modules/fichinter/doc/index.html
rename to public/core/modules/fichinter/doc/index.html
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/public/core/modules/fichinter/doc/pdf_soleil.modules.php
similarity index 100%
rename from htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
rename to public/core/modules/fichinter/doc/pdf_soleil.modules.php
diff --git a/htdocs/core/modules/fichinter/index.html b/public/core/modules/fichinter/index.html
similarity index 100%
rename from htdocs/core/modules/fichinter/index.html
rename to public/core/modules/fichinter/index.html
diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/public/core/modules/fichinter/mod_arctic.php
similarity index 100%
rename from htdocs/core/modules/fichinter/mod_arctic.php
rename to public/core/modules/fichinter/mod_arctic.php
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/public/core/modules/fichinter/mod_pacific.php
similarity index 100%
rename from htdocs/core/modules/fichinter/mod_pacific.php
rename to public/core/modules/fichinter/mod_pacific.php
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/public/core/modules/fichinter/modules_fichinter.php
similarity index 100%
rename from htdocs/core/modules/fichinter/modules_fichinter.php
rename to public/core/modules/fichinter/modules_fichinter.php
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/public/core/modules/import/import_csv.modules.php
similarity index 100%
rename from htdocs/core/modules/import/import_csv.modules.php
rename to public/core/modules/import/import_csv.modules.php
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/public/core/modules/import/import_xlsx.modules.php
similarity index 100%
rename from htdocs/core/modules/import/import_xlsx.modules.php
rename to public/core/modules/import/import_xlsx.modules.php
diff --git a/htdocs/core/modules/import/index.html b/public/core/modules/import/index.html
similarity index 100%
rename from htdocs/core/modules/import/index.html
rename to public/core/modules/import/index.html
diff --git a/htdocs/core/modules/import/modules_import.php b/public/core/modules/import/modules_import.php
similarity index 100%
rename from htdocs/core/modules/import/modules_import.php
rename to public/core/modules/import/modules_import.php
diff --git a/htdocs/core/modules/index.html b/public/core/modules/index.html
similarity index 100%
rename from htdocs/core/modules/index.html
rename to public/core/modules/index.html
diff --git a/htdocs/core/modules/livraison/doc/index.html b/public/core/modules/livraison/doc/index.html
similarity index 100%
rename from htdocs/core/modules/livraison/doc/index.html
rename to public/core/modules/livraison/doc/index.html
diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/public/core/modules/livraison/doc/pdf_typhon.modules.php
similarity index 100%
rename from htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
rename to public/core/modules/livraison/doc/pdf_typhon.modules.php
diff --git a/htdocs/core/modules/livraison/index.html b/public/core/modules/livraison/index.html
similarity index 100%
rename from htdocs/core/modules/livraison/index.html
rename to public/core/modules/livraison/index.html
diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/public/core/modules/livraison/mod_livraison_jade.php
similarity index 100%
rename from htdocs/core/modules/livraison/mod_livraison_jade.php
rename to public/core/modules/livraison/mod_livraison_jade.php
diff --git a/htdocs/core/modules/livraison/mod_livraison_saphir.php b/public/core/modules/livraison/mod_livraison_saphir.php
similarity index 100%
rename from htdocs/core/modules/livraison/mod_livraison_saphir.php
rename to public/core/modules/livraison/mod_livraison_saphir.php
diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/public/core/modules/livraison/modules_livraison.php
similarity index 100%
rename from htdocs/core/modules/livraison/modules_livraison.php
rename to public/core/modules/livraison/modules_livraison.php
diff --git a/htdocs/core/modules/mailings/README b/public/core/modules/mailings/README
similarity index 100%
rename from htdocs/core/modules/mailings/README
rename to public/core/modules/mailings/README
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/public/core/modules/mailings/advthirdparties.modules.php
similarity index 100%
rename from htdocs/core/modules/mailings/advthirdparties.modules.php
rename to public/core/modules/mailings/advthirdparties.modules.php
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/public/core/modules/mailings/contacts1.modules.php
similarity index 100%
rename from htdocs/core/modules/mailings/contacts1.modules.php
rename to public/core/modules/mailings/contacts1.modules.php
diff --git a/htdocs/core/modules/mailings/contacts2.modules.php b/public/core/modules/mailings/contacts2.modules.php
similarity index 100%
rename from htdocs/core/modules/mailings/contacts2.modules.php
rename to public/core/modules/mailings/contacts2.modules.php
diff --git a/htdocs/core/modules/mailings/contacts3.modules.php b/public/core/modules/mailings/contacts3.modules.php
similarity index 100%
rename from htdocs/core/modules/mailings/contacts3.modules.php
rename to public/core/modules/mailings/contacts3.modules.php
diff --git a/htdocs/core/modules/mailings/contacts4.modules.php b/public/core/modules/mailings/contacts4.modules.php
similarity index 100%
rename from htdocs/core/modules/mailings/contacts4.modules.php
rename to public/core/modules/mailings/contacts4.modules.php
diff --git a/htdocs/core/modules/mailings/example.modules.php b/public/core/modules/mailings/example.modules.php
similarity index 100%
rename from htdocs/core/modules/mailings/example.modules.php
rename to public/core/modules/mailings/example.modules.php
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/public/core/modules/mailings/fraise.modules.php
similarity index 100%
rename from htdocs/core/modules/mailings/fraise.modules.php
rename to public/core/modules/mailings/fraise.modules.php
diff --git a/htdocs/core/modules/mailings/framboise.modules.php b/public/core/modules/mailings/framboise.modules.php
similarity index 100%
rename from htdocs/core/modules/mailings/framboise.modules.php
rename to public/core/modules/mailings/framboise.modules.php
diff --git a/htdocs/core/modules/mailings/index.html b/public/core/modules/mailings/index.html
similarity index 100%
rename from htdocs/core/modules/mailings/index.html
rename to public/core/modules/mailings/index.html
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/public/core/modules/mailings/modules_mailings.php
similarity index 100%
rename from htdocs/core/modules/mailings/modules_mailings.php
rename to public/core/modules/mailings/modules_mailings.php
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/public/core/modules/mailings/pomme.modules.php
similarity index 100%
rename from htdocs/core/modules/mailings/pomme.modules.php
rename to public/core/modules/mailings/pomme.modules.php
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/public/core/modules/mailings/thirdparties.modules.php
similarity index 100%
rename from htdocs/core/modules/mailings/thirdparties.modules.php
rename to public/core/modules/mailings/thirdparties.modules.php
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/public/core/modules/mailings/thirdparties_services_expired.modules.php
similarity index 100%
rename from htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
rename to public/core/modules/mailings/thirdparties_services_expired.modules.php
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/public/core/modules/mailings/xinputfile.modules.php
similarity index 100%
rename from htdocs/core/modules/mailings/xinputfile.modules.php
rename to public/core/modules/mailings/xinputfile.modules.php
diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/public/core/modules/mailings/xinputuser.modules.php
similarity index 100%
rename from htdocs/core/modules/mailings/xinputuser.modules.php
rename to public/core/modules/mailings/xinputuser.modules.php
diff --git a/htdocs/core/modules/member/doc/index.html b/public/core/modules/member/doc/index.html
similarity index 100%
rename from htdocs/core/modules/member/doc/index.html
rename to public/core/modules/member/doc/index.html
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/public/core/modules/member/doc/pdf_standard.class.php
similarity index 100%
rename from htdocs/core/modules/member/doc/pdf_standard.class.php
rename to public/core/modules/member/doc/pdf_standard.class.php
diff --git a/htdocs/core/modules/member/index.html b/public/core/modules/member/index.html
similarity index 100%
rename from htdocs/core/modules/member/index.html
rename to public/core/modules/member/index.html
diff --git a/htdocs/core/modules/member/modules_cards.php b/public/core/modules/member/modules_cards.php
similarity index 100%
rename from htdocs/core/modules/member/modules_cards.php
rename to public/core/modules/member/modules_cards.php
diff --git a/htdocs/core/modules/modAccounting.class.php b/public/core/modules/modAccounting.class.php
similarity index 100%
rename from htdocs/core/modules/modAccounting.class.php
rename to public/core/modules/modAccounting.class.php
diff --git a/htdocs/core/modules/modAdherent.class.php b/public/core/modules/modAdherent.class.php
similarity index 100%
rename from htdocs/core/modules/modAdherent.class.php
rename to public/core/modules/modAdherent.class.php
diff --git a/htdocs/core/modules/modAgenda.class.php b/public/core/modules/modAgenda.class.php
similarity index 100%
rename from htdocs/core/modules/modAgenda.class.php
rename to public/core/modules/modAgenda.class.php
diff --git a/htdocs/core/modules/modApi.class.php b/public/core/modules/modApi.class.php
similarity index 100%
rename from htdocs/core/modules/modApi.class.php
rename to public/core/modules/modApi.class.php
diff --git a/htdocs/core/modules/modBanque.class.php b/public/core/modules/modBanque.class.php
similarity index 100%
rename from htdocs/core/modules/modBanque.class.php
rename to public/core/modules/modBanque.class.php
diff --git a/htdocs/core/modules/modBarcode.class.php b/public/core/modules/modBarcode.class.php
similarity index 100%
rename from htdocs/core/modules/modBarcode.class.php
rename to public/core/modules/modBarcode.class.php
diff --git a/htdocs/core/modules/modBookmark.class.php b/public/core/modules/modBookmark.class.php
similarity index 100%
rename from htdocs/core/modules/modBookmark.class.php
rename to public/core/modules/modBookmark.class.php
diff --git a/htdocs/core/modules/modCashDesk.class.php b/public/core/modules/modCashDesk.class.php
similarity index 100%
rename from htdocs/core/modules/modCashDesk.class.php
rename to public/core/modules/modCashDesk.class.php
diff --git a/htdocs/core/modules/modCategorie.class.php b/public/core/modules/modCategorie.class.php
similarity index 100%
rename from htdocs/core/modules/modCategorie.class.php
rename to public/core/modules/modCategorie.class.php
diff --git a/htdocs/core/modules/modClickToDial.class.php b/public/core/modules/modClickToDial.class.php
similarity index 100%
rename from htdocs/core/modules/modClickToDial.class.php
rename to public/core/modules/modClickToDial.class.php
diff --git a/htdocs/core/modules/modCommande.class.php b/public/core/modules/modCommande.class.php
similarity index 100%
rename from htdocs/core/modules/modCommande.class.php
rename to public/core/modules/modCommande.class.php
diff --git a/htdocs/core/modules/modComptabilite.class.php b/public/core/modules/modComptabilite.class.php
similarity index 100%
rename from htdocs/core/modules/modComptabilite.class.php
rename to public/core/modules/modComptabilite.class.php
diff --git a/htdocs/core/modules/modContrat.class.php b/public/core/modules/modContrat.class.php
similarity index 100%
rename from htdocs/core/modules/modContrat.class.php
rename to public/core/modules/modContrat.class.php
diff --git a/htdocs/core/modules/modCron.class.php b/public/core/modules/modCron.class.php
similarity index 100%
rename from htdocs/core/modules/modCron.class.php
rename to public/core/modules/modCron.class.php
diff --git a/htdocs/core/modules/modDeplacement.class.php b/public/core/modules/modDeplacement.class.php
similarity index 100%
rename from htdocs/core/modules/modDeplacement.class.php
rename to public/core/modules/modDeplacement.class.php
diff --git a/htdocs/core/modules/modDocumentGeneration.class.php b/public/core/modules/modDocumentGeneration.class.php
similarity index 100%
rename from htdocs/core/modules/modDocumentGeneration.class.php
rename to public/core/modules/modDocumentGeneration.class.php
diff --git a/htdocs/core/modules/modDon.class.php b/public/core/modules/modDon.class.php
similarity index 100%
rename from htdocs/core/modules/modDon.class.php
rename to public/core/modules/modDon.class.php
diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/public/core/modules/modDynamicPrices.class.php
similarity index 100%
rename from htdocs/core/modules/modDynamicPrices.class.php
rename to public/core/modules/modDynamicPrices.class.php
diff --git a/htdocs/core/modules/modECM.class.php b/public/core/modules/modECM.class.php
similarity index 100%
rename from htdocs/core/modules/modECM.class.php
rename to public/core/modules/modECM.class.php
diff --git a/htdocs/core/modules/modExpedition.class.php b/public/core/modules/modExpedition.class.php
similarity index 100%
rename from htdocs/core/modules/modExpedition.class.php
rename to public/core/modules/modExpedition.class.php
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/public/core/modules/modExpenseReport.class.php
similarity index 100%
rename from htdocs/core/modules/modExpenseReport.class.php
rename to public/core/modules/modExpenseReport.class.php
diff --git a/htdocs/core/modules/modExport.class.php b/public/core/modules/modExport.class.php
similarity index 100%
rename from htdocs/core/modules/modExport.class.php
rename to public/core/modules/modExport.class.php
diff --git a/htdocs/core/modules/modExternalRss.class.php b/public/core/modules/modExternalRss.class.php
similarity index 100%
rename from htdocs/core/modules/modExternalRss.class.php
rename to public/core/modules/modExternalRss.class.php
diff --git a/htdocs/core/modules/modExternalSite.class.php b/public/core/modules/modExternalSite.class.php
similarity index 100%
rename from htdocs/core/modules/modExternalSite.class.php
rename to public/core/modules/modExternalSite.class.php
diff --git a/htdocs/core/modules/modFTP.class.php b/public/core/modules/modFTP.class.php
similarity index 100%
rename from htdocs/core/modules/modFTP.class.php
rename to public/core/modules/modFTP.class.php
diff --git a/htdocs/core/modules/modFacture.class.php b/public/core/modules/modFacture.class.php
similarity index 100%
rename from htdocs/core/modules/modFacture.class.php
rename to public/core/modules/modFacture.class.php
diff --git a/htdocs/core/modules/modFckeditor.class.php b/public/core/modules/modFckeditor.class.php
similarity index 100%
rename from htdocs/core/modules/modFckeditor.class.php
rename to public/core/modules/modFckeditor.class.php
diff --git a/htdocs/core/modules/modFicheinter.class.php b/public/core/modules/modFicheinter.class.php
similarity index 100%
rename from htdocs/core/modules/modFicheinter.class.php
rename to public/core/modules/modFicheinter.class.php
diff --git a/htdocs/core/modules/modFournisseur.class.php b/public/core/modules/modFournisseur.class.php
similarity index 100%
rename from htdocs/core/modules/modFournisseur.class.php
rename to public/core/modules/modFournisseur.class.php
diff --git a/htdocs/core/modules/modGeoIPMaxmind.class.php b/public/core/modules/modGeoIPMaxmind.class.php
similarity index 100%
rename from htdocs/core/modules/modGeoIPMaxmind.class.php
rename to public/core/modules/modGeoIPMaxmind.class.php
diff --git a/htdocs/core/modules/modGravatar.class.php b/public/core/modules/modGravatar.class.php
similarity index 100%
rename from htdocs/core/modules/modGravatar.class.php
rename to public/core/modules/modGravatar.class.php
diff --git a/htdocs/core/modules/modHRM.class.php b/public/core/modules/modHRM.class.php
similarity index 100%
rename from htdocs/core/modules/modHRM.class.php
rename to public/core/modules/modHRM.class.php
diff --git a/htdocs/core/modules/modHoliday.class.php b/public/core/modules/modHoliday.class.php
similarity index 100%
rename from htdocs/core/modules/modHoliday.class.php
rename to public/core/modules/modHoliday.class.php
diff --git a/htdocs/core/modules/modImport.class.php b/public/core/modules/modImport.class.php
similarity index 100%
rename from htdocs/core/modules/modImport.class.php
rename to public/core/modules/modImport.class.php
diff --git a/htdocs/core/modules/modIncoterm.class.php b/public/core/modules/modIncoterm.class.php
similarity index 100%
rename from htdocs/core/modules/modIncoterm.class.php
rename to public/core/modules/modIncoterm.class.php
diff --git a/htdocs/core/modules/modLabel.class.php b/public/core/modules/modLabel.class.php
similarity index 100%
rename from htdocs/core/modules/modLabel.class.php
rename to public/core/modules/modLabel.class.php
diff --git a/htdocs/core/modules/modLdap.class.php b/public/core/modules/modLdap.class.php
similarity index 100%
rename from htdocs/core/modules/modLdap.class.php
rename to public/core/modules/modLdap.class.php
diff --git a/htdocs/core/modules/modLoan.class.php b/public/core/modules/modLoan.class.php
similarity index 100%
rename from htdocs/core/modules/modLoan.class.php
rename to public/core/modules/modLoan.class.php
diff --git a/htdocs/core/modules/modMailing.class.php b/public/core/modules/modMailing.class.php
similarity index 100%
rename from htdocs/core/modules/modMailing.class.php
rename to public/core/modules/modMailing.class.php
diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/public/core/modules/modMailmanSpip.class.php
similarity index 100%
rename from htdocs/core/modules/modMailmanSpip.class.php
rename to public/core/modules/modMailmanSpip.class.php
diff --git a/htdocs/core/modules/modMargin.class.php b/public/core/modules/modMargin.class.php
similarity index 100%
rename from htdocs/core/modules/modMargin.class.php
rename to public/core/modules/modMargin.class.php
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/public/core/modules/modMultiCurrency.class.php
similarity index 100%
rename from htdocs/core/modules/modMultiCurrency.class.php
rename to public/core/modules/modMultiCurrency.class.php
diff --git a/htdocs/core/modules/modNotification.class.php b/public/core/modules/modNotification.class.php
similarity index 100%
rename from htdocs/core/modules/modNotification.class.php
rename to public/core/modules/modNotification.class.php
diff --git a/htdocs/core/modules/modOauth.class.php b/public/core/modules/modOauth.class.php
similarity index 100%
rename from htdocs/core/modules/modOauth.class.php
rename to public/core/modules/modOauth.class.php
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/public/core/modules/modOpenSurvey.class.php
similarity index 100%
rename from htdocs/core/modules/modOpenSurvey.class.php
rename to public/core/modules/modOpenSurvey.class.php
diff --git a/htdocs/core/modules/modPaybox.class.php b/public/core/modules/modPaybox.class.php
similarity index 100%
rename from htdocs/core/modules/modPaybox.class.php
rename to public/core/modules/modPaybox.class.php
diff --git a/htdocs/core/modules/modPaypal.class.php b/public/core/modules/modPaypal.class.php
similarity index 100%
rename from htdocs/core/modules/modPaypal.class.php
rename to public/core/modules/modPaypal.class.php
diff --git a/htdocs/core/modules/modPrelevement.class.php b/public/core/modules/modPrelevement.class.php
similarity index 100%
rename from htdocs/core/modules/modPrelevement.class.php
rename to public/core/modules/modPrelevement.class.php
diff --git a/htdocs/core/modules/modPrinting.class.php b/public/core/modules/modPrinting.class.php
similarity index 100%
rename from htdocs/core/modules/modPrinting.class.php
rename to public/core/modules/modPrinting.class.php
diff --git a/htdocs/core/modules/modProduct.class.php b/public/core/modules/modProduct.class.php
similarity index 100%
rename from htdocs/core/modules/modProduct.class.php
rename to public/core/modules/modProduct.class.php
diff --git a/htdocs/core/modules/modProductBatch.class.php b/public/core/modules/modProductBatch.class.php
similarity index 100%
rename from htdocs/core/modules/modProductBatch.class.php
rename to public/core/modules/modProductBatch.class.php
diff --git a/htdocs/core/modules/modProjet.class.php b/public/core/modules/modProjet.class.php
similarity index 100%
rename from htdocs/core/modules/modProjet.class.php
rename to public/core/modules/modProjet.class.php
diff --git a/htdocs/core/modules/modPropale.class.php b/public/core/modules/modPropale.class.php
similarity index 100%
rename from htdocs/core/modules/modPropale.class.php
rename to public/core/modules/modPropale.class.php
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/public/core/modules/modReceiptPrinter.class.php
similarity index 100%
rename from htdocs/core/modules/modReceiptPrinter.class.php
rename to public/core/modules/modReceiptPrinter.class.php
diff --git a/htdocs/core/modules/modResource.class.php b/public/core/modules/modResource.class.php
similarity index 100%
rename from htdocs/core/modules/modResource.class.php
rename to public/core/modules/modResource.class.php
diff --git a/htdocs/core/modules/modSalaries.class.php b/public/core/modules/modSalaries.class.php
similarity index 100%
rename from htdocs/core/modules/modSalaries.class.php
rename to public/core/modules/modSalaries.class.php
diff --git a/htdocs/core/modules/modService.class.php b/public/core/modules/modService.class.php
similarity index 100%
rename from htdocs/core/modules/modService.class.php
rename to public/core/modules/modService.class.php
diff --git a/htdocs/core/modules/modSkype.class.php b/public/core/modules/modSkype.class.php
similarity index 100%
rename from htdocs/core/modules/modSkype.class.php
rename to public/core/modules/modSkype.class.php
diff --git a/htdocs/core/modules/modSociete.class.php b/public/core/modules/modSociete.class.php
similarity index 100%
rename from htdocs/core/modules/modSociete.class.php
rename to public/core/modules/modSociete.class.php
diff --git a/htdocs/core/modules/modStock.class.php b/public/core/modules/modStock.class.php
similarity index 100%
rename from htdocs/core/modules/modStock.class.php
rename to public/core/modules/modStock.class.php
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/public/core/modules/modSupplierProposal.class.php
similarity index 100%
rename from htdocs/core/modules/modSupplierProposal.class.php
rename to public/core/modules/modSupplierProposal.class.php
diff --git a/htdocs/core/modules/modSyslog.class.php b/public/core/modules/modSyslog.class.php
similarity index 100%
rename from htdocs/core/modules/modSyslog.class.php
rename to public/core/modules/modSyslog.class.php
diff --git a/htdocs/core/modules/modTax.class.php b/public/core/modules/modTax.class.php
similarity index 100%
rename from htdocs/core/modules/modTax.class.php
rename to public/core/modules/modTax.class.php
diff --git a/htdocs/core/modules/modUser.class.php b/public/core/modules/modUser.class.php
similarity index 100%
rename from htdocs/core/modules/modUser.class.php
rename to public/core/modules/modUser.class.php
diff --git a/htdocs/core/modules/modWebServices.class.php b/public/core/modules/modWebServices.class.php
similarity index 100%
rename from htdocs/core/modules/modWebServices.class.php
rename to public/core/modules/modWebServices.class.php
diff --git a/htdocs/core/modules/modWebServicesClient.class.php b/public/core/modules/modWebServicesClient.class.php
similarity index 100%
rename from htdocs/core/modules/modWebServicesClient.class.php
rename to public/core/modules/modWebServicesClient.class.php
diff --git a/htdocs/core/modules/modWebsites.class.php b/public/core/modules/modWebsites.class.php
similarity index 100%
rename from htdocs/core/modules/modWebsites.class.php
rename to public/core/modules/modWebsites.class.php
diff --git a/htdocs/core/modules/modWorkflow.class.php b/public/core/modules/modWorkflow.class.php
similarity index 100%
rename from htdocs/core/modules/modWorkflow.class.php
rename to public/core/modules/modWorkflow.class.php
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/public/core/modules/oauth/google_oauthcallback.php
similarity index 100%
rename from htdocs/core/modules/oauth/google_oauthcallback.php
rename to public/core/modules/oauth/google_oauthcallback.php
diff --git a/htdocs/core/modules/oauth/index.html b/public/core/modules/oauth/index.html
similarity index 100%
rename from htdocs/core/modules/oauth/index.html
rename to public/core/modules/oauth/index.html
diff --git a/htdocs/core/modules/payment/mod_payment_ant.php b/public/core/modules/payment/mod_payment_ant.php
similarity index 100%
rename from htdocs/core/modules/payment/mod_payment_ant.php
rename to public/core/modules/payment/mod_payment_ant.php
diff --git a/htdocs/core/modules/payment/mod_payment_cicada.php b/public/core/modules/payment/mod_payment_cicada.php
similarity index 100%
rename from htdocs/core/modules/payment/mod_payment_cicada.php
rename to public/core/modules/payment/mod_payment_cicada.php
diff --git a/htdocs/core/modules/payment/modules_payment.php b/public/core/modules/payment/modules_payment.php
similarity index 100%
rename from htdocs/core/modules/payment/modules_payment.php
rename to public/core/modules/payment/modules_payment.php
diff --git a/htdocs/core/modules/printing/index.html b/public/core/modules/printing/index.html
similarity index 100%
rename from htdocs/core/modules/printing/index.html
rename to public/core/modules/printing/index.html
diff --git a/htdocs/core/modules/printing/modules_printing.php b/public/core/modules/printing/modules_printing.php
similarity index 100%
rename from htdocs/core/modules/printing/modules_printing.php
rename to public/core/modules/printing/modules_printing.php
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/public/core/modules/printing/printgcp.modules.php
similarity index 100%
rename from htdocs/core/modules/printing/printgcp.modules.php
rename to public/core/modules/printing/printgcp.modules.php
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/public/core/modules/printing/printipp.modules.php
similarity index 100%
rename from htdocs/core/modules/printing/printipp.modules.php
rename to public/core/modules/printing/printipp.modules.php
diff --git a/htdocs/core/modules/printsheet/doc/index.html b/public/core/modules/printsheet/doc/index.html
similarity index 100%
rename from htdocs/core/modules/printsheet/doc/index.html
rename to public/core/modules/printsheet/doc/index.html
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/public/core/modules/printsheet/doc/pdf_standardlabel.class.php
similarity index 100%
rename from htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
rename to public/core/modules/printsheet/doc/pdf_standardlabel.class.php
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/public/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
similarity index 100%
rename from htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
rename to public/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
diff --git a/htdocs/core/modules/printsheet/index.html b/public/core/modules/printsheet/index.html
similarity index 100%
rename from htdocs/core/modules/printsheet/index.html
rename to public/core/modules/printsheet/index.html
diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/public/core/modules/printsheet/modules_labels.php
similarity index 100%
rename from htdocs/core/modules/printsheet/modules_labels.php
rename to public/core/modules/printsheet/modules_labels.php
diff --git a/htdocs/core/modules/product/index.html b/public/core/modules/product/index.html
similarity index 100%
rename from htdocs/core/modules/product/index.html
rename to public/core/modules/product/index.html
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/public/core/modules/product/mod_codeproduct_elephant.php
similarity index 100%
rename from htdocs/core/modules/product/mod_codeproduct_elephant.php
rename to public/core/modules/product/mod_codeproduct_elephant.php
diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/public/core/modules/product/mod_codeproduct_leopard.php
similarity index 100%
rename from htdocs/core/modules/product/mod_codeproduct_leopard.php
rename to public/core/modules/product/mod_codeproduct_leopard.php
diff --git a/htdocs/core/modules/product/modules_product.class.php b/public/core/modules/product/modules_product.class.php
similarity index 100%
rename from htdocs/core/modules/product/modules_product.class.php
rename to public/core/modules/product/modules_product.class.php
diff --git a/htdocs/core/modules/product/modules_product.php b/public/core/modules/product/modules_product.php
similarity index 100%
rename from htdocs/core/modules/product/modules_product.php
rename to public/core/modules/product/modules_product.php
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/public/core/modules/project/doc/doc_generic_project_odt.modules.php
similarity index 100%
rename from htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
rename to public/core/modules/project/doc/doc_generic_project_odt.modules.php
diff --git a/htdocs/core/modules/project/doc/index.html b/public/core/modules/project/doc/index.html
similarity index 100%
rename from htdocs/core/modules/project/doc/index.html
rename to public/core/modules/project/doc/index.html
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/public/core/modules/project/doc/pdf_baleine.modules.php
similarity index 100%
rename from htdocs/core/modules/project/doc/pdf_baleine.modules.php
rename to public/core/modules/project/doc/pdf_baleine.modules.php
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/public/core/modules/project/doc/pdf_beluga.modules.php
similarity index 100%
rename from htdocs/core/modules/project/doc/pdf_beluga.modules.php
rename to public/core/modules/project/doc/pdf_beluga.modules.php
diff --git a/htdocs/core/modules/project/index.html b/public/core/modules/project/index.html
similarity index 100%
rename from htdocs/core/modules/project/index.html
rename to public/core/modules/project/index.html
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/public/core/modules/project/mod_project_simple.php
similarity index 100%
rename from htdocs/core/modules/project/mod_project_simple.php
rename to public/core/modules/project/mod_project_simple.php
diff --git a/htdocs/core/modules/project/mod_project_universal.php b/public/core/modules/project/mod_project_universal.php
similarity index 100%
rename from htdocs/core/modules/project/mod_project_universal.php
rename to public/core/modules/project/mod_project_universal.php
diff --git a/htdocs/core/modules/project/modules_project.php b/public/core/modules/project/modules_project.php
similarity index 100%
rename from htdocs/core/modules/project/modules_project.php
rename to public/core/modules/project/modules_project.php
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/public/core/modules/project/task/doc/doc_generic_task_odt.modules.php
similarity index 100%
rename from htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
rename to public/core/modules/project/task/doc/doc_generic_task_odt.modules.php
diff --git a/htdocs/core/modules/project/task/doc/index.html b/public/core/modules/project/task/doc/index.html
similarity index 100%
rename from htdocs/core/modules/project/task/doc/index.html
rename to public/core/modules/project/task/doc/index.html
diff --git a/htdocs/core/modules/project/task/index.html b/public/core/modules/project/task/index.html
similarity index 100%
rename from htdocs/core/modules/project/task/index.html
rename to public/core/modules/project/task/index.html
diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/public/core/modules/project/task/mod_task_simple.php
similarity index 100%
rename from htdocs/core/modules/project/task/mod_task_simple.php
rename to public/core/modules/project/task/mod_task_simple.php
diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/public/core/modules/project/task/mod_task_universal.php
similarity index 100%
rename from htdocs/core/modules/project/task/mod_task_universal.php
rename to public/core/modules/project/task/mod_task_universal.php
diff --git a/htdocs/core/modules/project/task/modules_task.php b/public/core/modules/project/task/modules_task.php
similarity index 100%
rename from htdocs/core/modules/project/task/modules_task.php
rename to public/core/modules/project/task/modules_task.php
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/public/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
similarity index 100%
rename from htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
rename to public/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
diff --git a/htdocs/core/modules/propale/doc/index.html b/public/core/modules/propale/doc/index.html
similarity index 100%
rename from htdocs/core/modules/propale/doc/index.html
rename to public/core/modules/propale/doc/index.html
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/public/core/modules/propale/doc/pdf_azur.modules.php
similarity index 100%
rename from htdocs/core/modules/propale/doc/pdf_azur.modules.php
rename to public/core/modules/propale/doc/pdf_azur.modules.php
diff --git a/htdocs/core/modules/propale/index.html b/public/core/modules/propale/index.html
similarity index 100%
rename from htdocs/core/modules/propale/index.html
rename to public/core/modules/propale/index.html
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/public/core/modules/propale/mod_propale_marbre.php
similarity index 100%
rename from htdocs/core/modules/propale/mod_propale_marbre.php
rename to public/core/modules/propale/mod_propale_marbre.php
diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/public/core/modules/propale/mod_propale_saphir.php
similarity index 100%
rename from htdocs/core/modules/propale/mod_propale_saphir.php
rename to public/core/modules/propale/mod_propale_saphir.php
diff --git a/htdocs/core/modules/propale/modules_propale.php b/public/core/modules/propale/modules_propale.php
similarity index 100%
rename from htdocs/core/modules/propale/modules_propale.php
rename to public/core/modules/propale/modules_propale.php
diff --git a/htdocs/core/modules/rapport/index.html b/public/core/modules/rapport/index.html
similarity index 100%
rename from htdocs/core/modules/rapport/index.html
rename to public/core/modules/rapport/index.html
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/public/core/modules/rapport/pdf_paiement.class.php
similarity index 100%
rename from htdocs/core/modules/rapport/pdf_paiement.class.php
rename to public/core/modules/rapport/pdf_paiement.class.php
diff --git a/htdocs/core/modules/security/generate/README b/public/core/modules/security/generate/README
similarity index 100%
rename from htdocs/core/modules/security/generate/README
rename to public/core/modules/security/generate/README
diff --git a/htdocs/core/modules/security/generate/index.html b/public/core/modules/security/generate/index.html
similarity index 100%
rename from htdocs/core/modules/security/generate/index.html
rename to public/core/modules/security/generate/index.html
diff --git a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php b/public/core/modules/security/generate/modGeneratePassNone.class.php
similarity index 100%
rename from htdocs/core/modules/security/generate/modGeneratePassNone.class.php
rename to public/core/modules/security/generate/modGeneratePassNone.class.php
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/public/core/modules/security/generate/modGeneratePassPerso.class.php
similarity index 100%
rename from htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
rename to public/core/modules/security/generate/modGeneratePassPerso.class.php
diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/public/core/modules/security/generate/modGeneratePassStandard.class.php
similarity index 100%
rename from htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
rename to public/core/modules/security/generate/modGeneratePassStandard.class.php
diff --git a/htdocs/core/modules/security/generate/modules_genpassword.php b/public/core/modules/security/generate/modules_genpassword.php
similarity index 100%
rename from htdocs/core/modules/security/generate/modules_genpassword.php
rename to public/core/modules/security/generate/modules_genpassword.php
diff --git a/htdocs/core/modules/security/index.html b/public/core/modules/security/index.html
similarity index 100%
rename from htdocs/core/modules/security/index.html
rename to public/core/modules/security/index.html
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/public/core/modules/societe/doc/doc_generic_odt.modules.php
similarity index 100%
rename from htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
rename to public/core/modules/societe/doc/doc_generic_odt.modules.php
diff --git a/htdocs/core/modules/societe/doc/index.html b/public/core/modules/societe/doc/index.html
similarity index 100%
rename from htdocs/core/modules/societe/doc/index.html
rename to public/core/modules/societe/doc/index.html
diff --git a/htdocs/core/modules/societe/index.html b/public/core/modules/societe/index.html
similarity index 100%
rename from htdocs/core/modules/societe/index.html
rename to public/core/modules/societe/index.html
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/public/core/modules/societe/mod_codeclient_elephant.php
similarity index 100%
rename from htdocs/core/modules/societe/mod_codeclient_elephant.php
rename to public/core/modules/societe/mod_codeclient_elephant.php
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/public/core/modules/societe/mod_codeclient_leopard.php
similarity index 100%
rename from htdocs/core/modules/societe/mod_codeclient_leopard.php
rename to public/core/modules/societe/mod_codeclient_leopard.php
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/public/core/modules/societe/mod_codeclient_monkey.php
similarity index 100%
rename from htdocs/core/modules/societe/mod_codeclient_monkey.php
rename to public/core/modules/societe/mod_codeclient_monkey.php
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/public/core/modules/societe/mod_codecompta_aquarium.php
similarity index 100%
rename from htdocs/core/modules/societe/mod_codecompta_aquarium.php
rename to public/core/modules/societe/mod_codecompta_aquarium.php
diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/public/core/modules/societe/mod_codecompta_panicum.php
similarity index 100%
rename from htdocs/core/modules/societe/mod_codecompta_panicum.php
rename to public/core/modules/societe/mod_codecompta_panicum.php
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/public/core/modules/societe/modules_societe.class.php
similarity index 100%
rename from htdocs/core/modules/societe/modules_societe.class.php
rename to public/core/modules/societe/modules_societe.class.php
diff --git a/htdocs/core/modules/supplier_invoice/index.html b/public/core/modules/supplier_invoice/index.html
similarity index 100%
rename from htdocs/core/modules/supplier_invoice/index.html
rename to public/core/modules/supplier_invoice/index.html
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/public/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
similarity index 100%
rename from htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
rename to public/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/public/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
similarity index 100%
rename from htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
rename to public/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/public/core/modules/supplier_invoice/modules_facturefournisseur.php
similarity index 100%
rename from htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
rename to public/core/modules/supplier_invoice/modules_facturefournisseur.php
diff --git a/htdocs/core/modules/supplier_invoice/pdf/index.html b/public/core/modules/supplier_invoice/pdf/index.html
similarity index 100%
rename from htdocs/core/modules/supplier_invoice/pdf/index.html
rename to public/core/modules/supplier_invoice/pdf/index.html
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/public/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
similarity index 100%
rename from htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
rename to public/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
diff --git a/htdocs/core/modules/supplier_order/index.html b/public/core/modules/supplier_order/index.html
similarity index 100%
rename from htdocs/core/modules/supplier_order/index.html
rename to public/core/modules/supplier_order/index.html
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/public/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
similarity index 100%
rename from htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
rename to public/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/public/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
similarity index 100%
rename from htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
rename to public/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/public/core/modules/supplier_order/modules_commandefournisseur.php
similarity index 100%
rename from htdocs/core/modules/supplier_order/modules_commandefournisseur.php
rename to public/core/modules/supplier_order/modules_commandefournisseur.php
diff --git a/htdocs/core/modules/supplier_order/pdf/index.html b/public/core/modules/supplier_order/pdf/index.html
similarity index 100%
rename from htdocs/core/modules/supplier_order/pdf/index.html
rename to public/core/modules/supplier_order/pdf/index.html
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/public/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
similarity index 100%
rename from htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
rename to public/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/public/core/modules/supplier_payment/mod_supplier_payment_brodator.php
similarity index 100%
rename from htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
rename to public/core/modules/supplier_payment/mod_supplier_payment_brodator.php
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/public/core/modules/supplier_payment/mod_supplier_payment_bronan.php
similarity index 100%
rename from htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
rename to public/core/modules/supplier_payment/mod_supplier_payment_bronan.php
diff --git a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php b/public/core/modules/supplier_payment/modules_supplier_payment.php
similarity index 100%
rename from htdocs/core/modules/supplier_payment/modules_supplier_payment.php
rename to public/core/modules/supplier_payment/modules_supplier_payment.php
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/public/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
similarity index 100%
rename from htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
rename to public/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
diff --git a/htdocs/core/modules/supplier_proposal/doc/index.html b/public/core/modules/supplier_proposal/doc/index.html
similarity index 100%
rename from htdocs/core/modules/supplier_proposal/doc/index.html
rename to public/core/modules/supplier_proposal/doc/index.html
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/public/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
similarity index 100%
rename from htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
rename to public/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
diff --git a/htdocs/core/modules/supplier_proposal/index.html b/public/core/modules/supplier_proposal/index.html
similarity index 100%
rename from htdocs/core/modules/supplier_proposal/index.html
rename to public/core/modules/supplier_proposal/index.html
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/public/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
similarity index 100%
rename from htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
rename to public/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php b/public/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
similarity index 100%
rename from htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
rename to public/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
diff --git a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php b/public/core/modules/supplier_proposal/modules_supplier_proposal.php
similarity index 100%
rename from htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
rename to public/core/modules/supplier_proposal/modules_supplier_proposal.php
diff --git a/htdocs/core/modules/syslog/index.html b/public/core/modules/syslog/index.html
similarity index 100%
rename from htdocs/core/modules/syslog/index.html
rename to public/core/modules/syslog/index.html
diff --git a/htdocs/core/modules/syslog/logHandler.php b/public/core/modules/syslog/logHandler.php
similarity index 100%
rename from htdocs/core/modules/syslog/logHandler.php
rename to public/core/modules/syslog/logHandler.php
diff --git a/htdocs/core/modules/syslog/logHandlerInterface.php b/public/core/modules/syslog/logHandlerInterface.php
similarity index 100%
rename from htdocs/core/modules/syslog/logHandlerInterface.php
rename to public/core/modules/syslog/logHandlerInterface.php
diff --git a/htdocs/core/modules/syslog/mod_syslog_chromephp.php b/public/core/modules/syslog/mod_syslog_chromephp.php
similarity index 100%
rename from htdocs/core/modules/syslog/mod_syslog_chromephp.php
rename to public/core/modules/syslog/mod_syslog_chromephp.php
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/public/core/modules/syslog/mod_syslog_file.php
similarity index 100%
rename from htdocs/core/modules/syslog/mod_syslog_file.php
rename to public/core/modules/syslog/mod_syslog_file.php
diff --git a/htdocs/core/modules/syslog/mod_syslog_firephp.php b/public/core/modules/syslog/mod_syslog_firephp.php
similarity index 100%
rename from htdocs/core/modules/syslog/mod_syslog_firephp.php
rename to public/core/modules/syslog/mod_syslog_firephp.php
diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/public/core/modules/syslog/mod_syslog_syslog.php
similarity index 100%
rename from htdocs/core/modules/syslog/mod_syslog_syslog.php
rename to public/core/modules/syslog/mod_syslog_syslog.php
diff --git a/htdocs/core/photos_resize.php b/public/core/photos_resize.php
similarity index 100%
rename from htdocs/core/photos_resize.php
rename to public/core/photos_resize.php
diff --git a/htdocs/core/search.php b/public/core/search.php
similarity index 100%
rename from htdocs/core/search.php
rename to public/core/search.php
diff --git a/htdocs/core/search_page.php b/public/core/search_page.php
similarity index 100%
rename from htdocs/core/search_page.php
rename to public/core/search_page.php
diff --git a/htdocs/core/tools.php b/public/core/tools.php
similarity index 100%
rename from htdocs/core/tools.php
rename to public/core/tools.php
diff --git a/htdocs/core/tpl/README b/public/core/tpl/README
similarity index 100%
rename from htdocs/core/tpl/README
rename to public/core/tpl/README
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/public/core/tpl/admin_extrafields_add.tpl.php
similarity index 100%
rename from htdocs/core/tpl/admin_extrafields_add.tpl.php
rename to public/core/tpl/admin_extrafields_add.tpl.php
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/public/core/tpl/admin_extrafields_edit.tpl.php
similarity index 100%
rename from htdocs/core/tpl/admin_extrafields_edit.tpl.php
rename to public/core/tpl/admin_extrafields_edit.tpl.php
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/public/core/tpl/admin_extrafields_view.tpl.php
similarity index 100%
rename from htdocs/core/tpl/admin_extrafields_view.tpl.php
rename to public/core/tpl/admin_extrafields_view.tpl.php
diff --git a/htdocs/core/tpl/ajax/fileupload_main.tpl.php b/public/core/tpl/ajax/fileupload_main.tpl.php
similarity index 100%
rename from htdocs/core/tpl/ajax/fileupload_main.tpl.php
rename to public/core/tpl/ajax/fileupload_main.tpl.php
diff --git a/htdocs/core/tpl/ajax/fileupload_view.tpl.php b/public/core/tpl/ajax/fileupload_view.tpl.php
similarity index 100%
rename from htdocs/core/tpl/ajax/fileupload_view.tpl.php
rename to public/core/tpl/ajax/fileupload_view.tpl.php
diff --git a/htdocs/core/tpl/ajax/index.html b/public/core/tpl/ajax/index.html
similarity index 100%
rename from htdocs/core/tpl/ajax/index.html
rename to public/core/tpl/ajax/index.html
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/public/core/tpl/ajaxrow.tpl.php
similarity index 100%
rename from htdocs/core/tpl/ajaxrow.tpl.php
rename to public/core/tpl/ajaxrow.tpl.php
diff --git a/htdocs/core/tpl/bloc_showhide.tpl.php b/public/core/tpl/bloc_showhide.tpl.php
similarity index 100%
rename from htdocs/core/tpl/bloc_showhide.tpl.php
rename to public/core/tpl/bloc_showhide.tpl.php
diff --git a/htdocs/core/tpl/contacts.tpl.php b/public/core/tpl/contacts.tpl.php
similarity index 100%
rename from htdocs/core/tpl/contacts.tpl.php
rename to public/core/tpl/contacts.tpl.php
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/public/core/tpl/document_actions_post_headers.tpl.php
similarity index 100%
rename from htdocs/core/tpl/document_actions_post_headers.tpl.php
rename to public/core/tpl/document_actions_post_headers.tpl.php
diff --git a/htdocs/core/tpl/error.tpl.php b/public/core/tpl/error.tpl.php
similarity index 100%
rename from htdocs/core/tpl/error.tpl.php
rename to public/core/tpl/error.tpl.php
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/public/core/tpl/extrafields_view.tpl.php
similarity index 100%
rename from htdocs/core/tpl/extrafields_view.tpl.php
rename to public/core/tpl/extrafields_view.tpl.php
diff --git a/htdocs/core/tpl/footer.tpl.php b/public/core/tpl/footer.tpl.php
similarity index 100%
rename from htdocs/core/tpl/footer.tpl.php
rename to public/core/tpl/footer.tpl.php
diff --git a/htdocs/core/tpl/header.tpl.php b/public/core/tpl/header.tpl.php
similarity index 100%
rename from htdocs/core/tpl/header.tpl.php
rename to public/core/tpl/header.tpl.php
diff --git a/htdocs/core/tpl/index.html b/public/core/tpl/index.html
similarity index 100%
rename from htdocs/core/tpl/index.html
rename to public/core/tpl/index.html
diff --git a/htdocs/core/tpl/login.tpl.php b/public/core/tpl/login.tpl.php
similarity index 100%
rename from htdocs/core/tpl/login.tpl.php
rename to public/core/tpl/login.tpl.php
diff --git a/htdocs/core/tpl/notes.tpl.php b/public/core/tpl/notes.tpl.php
similarity index 100%
rename from htdocs/core/tpl/notes.tpl.php
rename to public/core/tpl/notes.tpl.php
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/public/core/tpl/objectline_create.tpl.php
similarity index 100%
rename from htdocs/core/tpl/objectline_create.tpl.php
rename to public/core/tpl/objectline_create.tpl.php
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/public/core/tpl/objectline_edit.tpl.php
similarity index 100%
rename from htdocs/core/tpl/objectline_edit.tpl.php
rename to public/core/tpl/objectline_edit.tpl.php
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/public/core/tpl/objectline_view.tpl.php
similarity index 100%
rename from htdocs/core/tpl/objectline_view.tpl.php
rename to public/core/tpl/objectline_view.tpl.php
diff --git a/htdocs/core/tpl/originproductline.tpl.php b/public/core/tpl/originproductline.tpl.php
similarity index 100%
rename from htdocs/core/tpl/originproductline.tpl.php
rename to public/core/tpl/originproductline.tpl.php
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/public/core/tpl/passwordforgotten.tpl.php
similarity index 100%
rename from htdocs/core/tpl/passwordforgotten.tpl.php
rename to public/core/tpl/passwordforgotten.tpl.php
diff --git a/htdocs/core/tpl/resource_add.tpl.php b/public/core/tpl/resource_add.tpl.php
similarity index 100%
rename from htdocs/core/tpl/resource_add.tpl.php
rename to public/core/tpl/resource_add.tpl.php
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/public/core/tpl/resource_view.tpl.php
similarity index 100%
rename from htdocs/core/tpl/resource_view.tpl.php
rename to public/core/tpl/resource_view.tpl.php
diff --git a/htdocs/core/triggers/README b/public/core/triggers/README
similarity index 100%
rename from htdocs/core/triggers/README
rename to public/core/triggers/README
diff --git a/htdocs/core/triggers/README-FR b/public/core/triggers/README-FR
similarity index 100%
rename from htdocs/core/triggers/README-FR
rename to public/core/triggers/README-FR
diff --git a/htdocs/core/triggers/dolibarrtriggers.class.php b/public/core/triggers/dolibarrtriggers.class.php
similarity index 100%
rename from htdocs/core/triggers/dolibarrtriggers.class.php
rename to public/core/triggers/dolibarrtriggers.class.php
diff --git a/htdocs/core/triggers/index.html b/public/core/triggers/index.html
similarity index 100%
rename from htdocs/core/triggers/index.html
rename to public/core/triggers/index.html
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/public/core/triggers/interface_20_all_Logevents.class.php
similarity index 100%
rename from htdocs/core/triggers/interface_20_all_Logevents.class.php
rename to public/core/triggers/interface_20_all_Logevents.class.php
diff --git a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php b/public/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
similarity index 100%
rename from htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
rename to public/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/public/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
similarity index 100%
rename from htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
rename to public/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/public/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
similarity index 100%
rename from htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
rename to public/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/public/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
similarity index 100%
rename from htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
rename to public/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/public/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
similarity index 100%
rename from htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
rename to public/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/public/core/triggers/interface_50_modNotification_Notification.class.php
similarity index 100%
rename from htdocs/core/triggers/interface_50_modNotification_Notification.class.php
rename to public/core/triggers/interface_50_modNotification_Notification.class.php
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/public/core/triggers/interface_90_all_Demo.class.php-NORUN
similarity index 100%
rename from htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
rename to public/core/triggers/interface_90_all_Demo.class.php-NORUN
diff --git a/htdocs/cron/admin/cron.php b/public/cron/admin/cron.php
similarity index 100%
rename from htdocs/cron/admin/cron.php
rename to public/cron/admin/cron.php
diff --git a/htdocs/cron/admin/index.html b/public/cron/admin/index.html
similarity index 100%
rename from htdocs/cron/admin/index.html
rename to public/cron/admin/index.html
diff --git a/htdocs/cron/card.php b/public/cron/card.php
similarity index 100%
rename from htdocs/cron/card.php
rename to public/cron/card.php
diff --git a/htdocs/cron/class/cronjob.class.php b/public/cron/class/cronjob.class.php
similarity index 100%
rename from htdocs/cron/class/cronjob.class.php
rename to public/cron/class/cronjob.class.php
diff --git a/htdocs/cron/class/index.html b/public/cron/class/index.html
similarity index 100%
rename from htdocs/cron/class/index.html
rename to public/cron/class/index.html
diff --git a/htdocs/cron/index.html b/public/cron/index.html
similarity index 100%
rename from htdocs/cron/index.html
rename to public/cron/index.html
diff --git a/htdocs/cron/info.php b/public/cron/info.php
similarity index 100%
rename from htdocs/cron/info.php
rename to public/cron/info.php
diff --git a/htdocs/cron/list.php b/public/cron/list.php
similarity index 100%
rename from htdocs/cron/list.php
rename to public/cron/list.php
diff --git a/htdocs/custom/.gitignore b/public/custom/.gitignore
similarity index 100%
rename from htdocs/custom/.gitignore
rename to public/custom/.gitignore
diff --git a/htdocs/custom/README.md b/public/custom/README.md
similarity index 100%
rename from htdocs/custom/README.md
rename to public/custom/README.md
diff --git a/htdocs/custom/index.html b/public/custom/index.html
similarity index 100%
rename from htdocs/custom/index.html
rename to public/custom/index.html
diff --git a/htdocs/document.php b/public/document.php
similarity index 100%
rename from htdocs/document.php
rename to public/document.php
diff --git a/htdocs/don/admin/donation.php b/public/don/admin/donation.php
similarity index 100%
rename from htdocs/don/admin/donation.php
rename to public/don/admin/donation.php
diff --git a/htdocs/don/admin/donation_extrafields.php b/public/don/admin/donation_extrafields.php
similarity index 100%
rename from htdocs/don/admin/donation_extrafields.php
rename to public/don/admin/donation_extrafields.php
diff --git a/htdocs/don/admin/index.html b/public/don/admin/index.html
similarity index 100%
rename from htdocs/don/admin/index.html
rename to public/don/admin/index.html
diff --git a/htdocs/don/card.php b/public/don/card.php
similarity index 100%
rename from htdocs/don/card.php
rename to public/don/card.php
diff --git a/htdocs/don/class/don.class.php b/public/don/class/don.class.php
similarity index 100%
rename from htdocs/don/class/don.class.php
rename to public/don/class/don.class.php
diff --git a/htdocs/don/class/donstats.class.php b/public/don/class/donstats.class.php
similarity index 100%
rename from htdocs/don/class/donstats.class.php
rename to public/don/class/donstats.class.php
diff --git a/htdocs/don/class/index.html b/public/don/class/index.html
similarity index 100%
rename from htdocs/don/class/index.html
rename to public/don/class/index.html
diff --git a/htdocs/don/class/paymentdonation.class.php b/public/don/class/paymentdonation.class.php
similarity index 100%
rename from htdocs/don/class/paymentdonation.class.php
rename to public/don/class/paymentdonation.class.php
diff --git a/htdocs/don/document.php b/public/don/document.php
similarity index 100%
rename from htdocs/don/document.php
rename to public/don/document.php
diff --git a/htdocs/don/index.html b/public/don/index.html
similarity index 100%
rename from htdocs/don/index.html
rename to public/don/index.html
diff --git a/htdocs/don/index.php b/public/don/index.php
similarity index 100%
rename from htdocs/don/index.php
rename to public/don/index.php
diff --git a/htdocs/don/info.php b/public/don/info.php
similarity index 100%
rename from htdocs/don/info.php
rename to public/don/info.php
diff --git a/htdocs/don/list.php b/public/don/list.php
similarity index 100%
rename from htdocs/don/list.php
rename to public/don/list.php
diff --git a/htdocs/don/note.php b/public/don/note.php
similarity index 100%
rename from htdocs/don/note.php
rename to public/don/note.php
diff --git a/htdocs/don/payment/card.php b/public/don/payment/card.php
similarity index 100%
rename from htdocs/don/payment/card.php
rename to public/don/payment/card.php
diff --git a/htdocs/don/payment/index.html b/public/don/payment/index.html
similarity index 100%
rename from htdocs/don/payment/index.html
rename to public/don/payment/index.html
diff --git a/htdocs/don/payment/payment.php b/public/don/payment/payment.php
similarity index 100%
rename from htdocs/don/payment/payment.php
rename to public/don/payment/payment.php
diff --git a/htdocs/don/stats/index.php b/public/don/stats/index.php
similarity index 100%
rename from htdocs/don/stats/index.php
rename to public/don/stats/index.php
diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/public/ecm/ajax/ecmdatabase.php
similarity index 100%
rename from htdocs/ecm/ajax/ecmdatabase.php
rename to public/ecm/ajax/ecmdatabase.php
diff --git a/htdocs/ecm/ajax/index.html b/public/ecm/ajax/index.html
similarity index 100%
rename from htdocs/ecm/ajax/index.html
rename to public/ecm/ajax/index.html
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/public/ecm/class/ecmdirectory.class.php
similarity index 100%
rename from htdocs/ecm/class/ecmdirectory.class.php
rename to public/ecm/class/ecmdirectory.class.php
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/public/ecm/class/htmlecm.form.class.php
similarity index 100%
rename from htdocs/ecm/class/htmlecm.form.class.php
rename to public/ecm/class/htmlecm.form.class.php
diff --git a/htdocs/ecm/class/index.html b/public/ecm/class/index.html
similarity index 100%
rename from htdocs/ecm/class/index.html
rename to public/ecm/class/index.html
diff --git a/htdocs/ecm/docdir.php b/public/ecm/docdir.php
similarity index 100%
rename from htdocs/ecm/docdir.php
rename to public/ecm/docdir.php
diff --git a/htdocs/ecm/docfile.php b/public/ecm/docfile.php
similarity index 100%
rename from htdocs/ecm/docfile.php
rename to public/ecm/docfile.php
diff --git a/htdocs/ecm/docmine.php b/public/ecm/docmine.php
similarity index 100%
rename from htdocs/ecm/docmine.php
rename to public/ecm/docmine.php
diff --git a/htdocs/ecm/docother.php b/public/ecm/docother.php
similarity index 100%
rename from htdocs/ecm/docother.php
rename to public/ecm/docother.php
diff --git a/htdocs/ecm/index.php b/public/ecm/index.php
similarity index 100%
rename from htdocs/ecm/index.php
rename to public/ecm/index.php
diff --git a/htdocs/ecm/index_auto.php b/public/ecm/index_auto.php
similarity index 100%
rename from htdocs/ecm/index_auto.php
rename to public/ecm/index_auto.php
diff --git a/htdocs/ecm/search.php b/public/ecm/search.php
similarity index 100%
rename from htdocs/ecm/search.php
rename to public/ecm/search.php
diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/public/ecm/tpl/enablefiletreeajax.tpl.php
similarity index 100%
rename from htdocs/ecm/tpl/enablefiletreeajax.tpl.php
rename to public/ecm/tpl/enablefiletreeajax.tpl.php
diff --git a/htdocs/ecm/tpl/index.html b/public/ecm/tpl/index.html
similarity index 100%
rename from htdocs/ecm/tpl/index.html
rename to public/ecm/tpl/index.html
diff --git a/htdocs/expedition/card.php b/public/expedition/card.php
similarity index 100%
rename from htdocs/expedition/card.php
rename to public/expedition/card.php
diff --git a/htdocs/expedition/class/expedition.class.php b/public/expedition/class/expedition.class.php
similarity index 100%
rename from htdocs/expedition/class/expedition.class.php
rename to public/expedition/class/expedition.class.php
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/public/expedition/class/expeditionbatch.class.php
similarity index 100%
rename from htdocs/expedition/class/expeditionbatch.class.php
rename to public/expedition/class/expeditionbatch.class.php
diff --git a/htdocs/expedition/class/expeditionstats.class.php b/public/expedition/class/expeditionstats.class.php
similarity index 100%
rename from htdocs/expedition/class/expeditionstats.class.php
rename to public/expedition/class/expeditionstats.class.php
diff --git a/htdocs/expedition/class/index.html b/public/expedition/class/index.html
similarity index 100%
rename from htdocs/expedition/class/index.html
rename to public/expedition/class/index.html
diff --git a/htdocs/expedition/contact.php b/public/expedition/contact.php
similarity index 100%
rename from htdocs/expedition/contact.php
rename to public/expedition/contact.php
diff --git a/htdocs/expedition/index.php b/public/expedition/index.php
similarity index 100%
rename from htdocs/expedition/index.php
rename to public/expedition/index.php
diff --git a/htdocs/expedition/list.php b/public/expedition/list.php
similarity index 100%
rename from htdocs/expedition/list.php
rename to public/expedition/list.php
diff --git a/htdocs/expedition/note.php b/public/expedition/note.php
similarity index 100%
rename from htdocs/expedition/note.php
rename to public/expedition/note.php
diff --git a/htdocs/expedition/shipment.php b/public/expedition/shipment.php
similarity index 100%
rename from htdocs/expedition/shipment.php
rename to public/expedition/shipment.php
diff --git a/htdocs/expedition/stats/index.php b/public/expedition/stats/index.php
similarity index 100%
rename from htdocs/expedition/stats/index.php
rename to public/expedition/stats/index.php
diff --git a/htdocs/expedition/stats/month.php b/public/expedition/stats/month.php
similarity index 100%
rename from htdocs/expedition/stats/month.php
rename to public/expedition/stats/month.php
diff --git a/htdocs/expedition/tpl/index.html b/public/expedition/tpl/index.html
similarity index 100%
rename from htdocs/expedition/tpl/index.html
rename to public/expedition/tpl/index.html
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/public/expedition/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from htdocs/expedition/tpl/linkedobjectblock.tpl.php
rename to public/expedition/tpl/linkedobjectblock.tpl.php
diff --git a/htdocs/expensereport/ajax/ajaxprojet.php b/public/expensereport/ajax/ajaxprojet.php
similarity index 100%
rename from htdocs/expensereport/ajax/ajaxprojet.php
rename to public/expensereport/ajax/ajaxprojet.php
diff --git a/htdocs/expensereport/ajax/index.html b/public/expensereport/ajax/index.html
similarity index 100%
rename from htdocs/expensereport/ajax/index.html
rename to public/expensereport/ajax/index.html
diff --git a/htdocs/expensereport/card.php b/public/expensereport/card.php
similarity index 100%
rename from htdocs/expensereport/card.php
rename to public/expensereport/card.php
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/public/expensereport/class/api_expensereports.class.php
similarity index 100%
rename from htdocs/expensereport/class/api_expensereports.class.php
rename to public/expensereport/class/api_expensereports.class.php
diff --git a/htdocs/expensereport/class/expensereport.class.php b/public/expensereport/class/expensereport.class.php
similarity index 100%
rename from htdocs/expensereport/class/expensereport.class.php
rename to public/expensereport/class/expensereport.class.php
diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/public/expensereport/class/expensereportstats.class.php
similarity index 100%
rename from htdocs/expensereport/class/expensereportstats.class.php
rename to public/expensereport/class/expensereportstats.class.php
diff --git a/htdocs/expensereport/class/index.html b/public/expensereport/class/index.html
similarity index 100%
rename from htdocs/expensereport/class/index.html
rename to public/expensereport/class/index.html
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/public/expensereport/class/paymentexpensereport.class.php
similarity index 100%
rename from htdocs/expensereport/class/paymentexpensereport.class.php
rename to public/expensereport/class/paymentexpensereport.class.php
diff --git a/htdocs/expensereport/document.php b/public/expensereport/document.php
similarity index 100%
rename from htdocs/expensereport/document.php
rename to public/expensereport/document.php
diff --git a/htdocs/expensereport/export_csv.php b/public/expensereport/export_csv.php
similarity index 100%
rename from htdocs/expensereport/export_csv.php
rename to public/expensereport/export_csv.php
diff --git a/htdocs/expensereport/index.html b/public/expensereport/index.html
similarity index 100%
rename from htdocs/expensereport/index.html
rename to public/expensereport/index.html
diff --git a/htdocs/expensereport/index.php b/public/expensereport/index.php
similarity index 100%
rename from htdocs/expensereport/index.php
rename to public/expensereport/index.php
diff --git a/htdocs/expensereport/info.php b/public/expensereport/info.php
similarity index 100%
rename from htdocs/expensereport/info.php
rename to public/expensereport/info.php
diff --git a/htdocs/expensereport/list.php b/public/expensereport/list.php
similarity index 100%
rename from htdocs/expensereport/list.php
rename to public/expensereport/list.php
diff --git a/htdocs/expensereport/note.php b/public/expensereport/note.php
similarity index 100%
rename from htdocs/expensereport/note.php
rename to public/expensereport/note.php
diff --git a/htdocs/expensereport/payment/card.php b/public/expensereport/payment/card.php
similarity index 100%
rename from htdocs/expensereport/payment/card.php
rename to public/expensereport/payment/card.php
diff --git a/htdocs/expensereport/payment/index.html b/public/expensereport/payment/index.html
similarity index 100%
rename from htdocs/expensereport/payment/index.html
rename to public/expensereport/payment/index.html
diff --git a/htdocs/expensereport/payment/payment.php b/public/expensereport/payment/payment.php
similarity index 100%
rename from htdocs/expensereport/payment/payment.php
rename to public/expensereport/payment/payment.php
diff --git a/htdocs/expensereport/stats/index.html b/public/expensereport/stats/index.html
similarity index 100%
rename from htdocs/expensereport/stats/index.html
rename to public/expensereport/stats/index.html
diff --git a/htdocs/expensereport/stats/index.php b/public/expensereport/stats/index.php
similarity index 100%
rename from htdocs/expensereport/stats/index.php
rename to public/expensereport/stats/index.php
diff --git a/htdocs/expensereport/synchro_compta.php b/public/expensereport/synchro_compta.php
similarity index 100%
rename from htdocs/expensereport/synchro_compta.php
rename to public/expensereport/synchro_compta.php
diff --git a/htdocs/expensereport/tpl/index.html b/public/expensereport/tpl/index.html
similarity index 100%
rename from htdocs/expensereport/tpl/index.html
rename to public/expensereport/tpl/index.html
diff --git a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php b/public/expensereport/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from htdocs/expensereport/tpl/linkedobjectblock.tpl.php
rename to public/expensereport/tpl/linkedobjectblock.tpl.php
diff --git a/htdocs/exports/class/export.class.php b/public/exports/class/export.class.php
similarity index 100%
rename from htdocs/exports/class/export.class.php
rename to public/exports/class/export.class.php
diff --git a/htdocs/exports/class/index.html b/public/exports/class/index.html
similarity index 100%
rename from htdocs/exports/class/index.html
rename to public/exports/class/index.html
diff --git a/htdocs/exports/export.php b/public/exports/export.php
similarity index 100%
rename from htdocs/exports/export.php
rename to public/exports/export.php
diff --git a/htdocs/exports/index.php b/public/exports/index.php
similarity index 100%
rename from htdocs/exports/index.php
rename to public/exports/index.php
diff --git a/htdocs/externalsite/admin/externalsite.php b/public/externalsite/admin/externalsite.php
similarity index 100%
rename from htdocs/externalsite/admin/externalsite.php
rename to public/externalsite/admin/externalsite.php
diff --git a/htdocs/externalsite/admin/index.html b/public/externalsite/admin/index.html
similarity index 100%
rename from htdocs/externalsite/admin/index.html
rename to public/externalsite/admin/index.html
diff --git a/htdocs/externalsite/frames.php b/public/externalsite/frames.php
similarity index 100%
rename from htdocs/externalsite/frames.php
rename to public/externalsite/frames.php
diff --git a/htdocs/externalsite/frametop.php b/public/externalsite/frametop.php
similarity index 100%
rename from htdocs/externalsite/frametop.php
rename to public/externalsite/frametop.php
diff --git a/htdocs/externalsite/index.html b/public/externalsite/index.html
similarity index 100%
rename from htdocs/externalsite/index.html
rename to public/externalsite/index.html
diff --git a/htdocs/favicon.ico b/public/favicon.ico
similarity index 100%
rename from htdocs/favicon.ico
rename to public/favicon.ico
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/public/fichinter/admin/fichinter_extrafields.php
similarity index 100%
rename from htdocs/fichinter/admin/fichinter_extrafields.php
rename to public/fichinter/admin/fichinter_extrafields.php
diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/public/fichinter/admin/fichinterdet_extrafields.php
similarity index 100%
rename from htdocs/fichinter/admin/fichinterdet_extrafields.php
rename to public/fichinter/admin/fichinterdet_extrafields.php
diff --git a/htdocs/fichinter/admin/index.html b/public/fichinter/admin/index.html
similarity index 100%
rename from htdocs/fichinter/admin/index.html
rename to public/fichinter/admin/index.html
diff --git a/htdocs/fichinter/apercu.php b/public/fichinter/apercu.php
similarity index 100%
rename from htdocs/fichinter/apercu.php
rename to public/fichinter/apercu.php
diff --git a/htdocs/fichinter/card.php b/public/fichinter/card.php
similarity index 100%
rename from htdocs/fichinter/card.php
rename to public/fichinter/card.php
diff --git a/htdocs/fichinter/class/fichinter.class.php b/public/fichinter/class/fichinter.class.php
similarity index 100%
rename from htdocs/fichinter/class/fichinter.class.php
rename to public/fichinter/class/fichinter.class.php
diff --git a/htdocs/fichinter/class/fichinterstats.class.php b/public/fichinter/class/fichinterstats.class.php
similarity index 100%
rename from htdocs/fichinter/class/fichinterstats.class.php
rename to public/fichinter/class/fichinterstats.class.php
diff --git a/htdocs/fichinter/class/index.html b/public/fichinter/class/index.html
similarity index 100%
rename from htdocs/fichinter/class/index.html
rename to public/fichinter/class/index.html
diff --git a/htdocs/fichinter/contact.php b/public/fichinter/contact.php
similarity index 100%
rename from htdocs/fichinter/contact.php
rename to public/fichinter/contact.php
diff --git a/htdocs/fichinter/document.php b/public/fichinter/document.php
similarity index 100%
rename from htdocs/fichinter/document.php
rename to public/fichinter/document.php
diff --git a/htdocs/fichinter/index.html b/public/fichinter/index.html
similarity index 100%
rename from htdocs/fichinter/index.html
rename to public/fichinter/index.html
diff --git a/htdocs/fichinter/index.php b/public/fichinter/index.php
similarity index 100%
rename from htdocs/fichinter/index.php
rename to public/fichinter/index.php
diff --git a/htdocs/fichinter/info.php b/public/fichinter/info.php
similarity index 100%
rename from htdocs/fichinter/info.php
rename to public/fichinter/info.php
diff --git a/htdocs/fichinter/list.php b/public/fichinter/list.php
similarity index 100%
rename from htdocs/fichinter/list.php
rename to public/fichinter/list.php
diff --git a/htdocs/fichinter/note.php b/public/fichinter/note.php
similarity index 100%
rename from htdocs/fichinter/note.php
rename to public/fichinter/note.php
diff --git a/htdocs/fichinter/stats/index.php b/public/fichinter/stats/index.php
similarity index 100%
rename from htdocs/fichinter/stats/index.php
rename to public/fichinter/stats/index.php
diff --git a/htdocs/fichinter/tpl/index.html b/public/fichinter/tpl/index.html
similarity index 100%
rename from htdocs/fichinter/tpl/index.html
rename to public/fichinter/tpl/index.html
diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/public/fichinter/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from htdocs/fichinter/tpl/linkedobjectblock.tpl.php
rename to public/fichinter/tpl/linkedobjectblock.tpl.php
diff --git a/htdocs/filefunc.inc.php b/public/filefunc.inc.php
similarity index 100%
rename from htdocs/filefunc.inc.php
rename to public/filefunc.inc.php
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/public/fourn/ajax/getSupplierPrices.php
similarity index 100%
rename from htdocs/fourn/ajax/getSupplierPrices.php
rename to public/fourn/ajax/getSupplierPrices.php
diff --git a/htdocs/fourn/ajax/index.html b/public/fourn/ajax/index.html
similarity index 100%
rename from htdocs/fourn/ajax/index.html
rename to public/fourn/ajax/index.html
diff --git a/htdocs/fourn/card.php b/public/fourn/card.php
similarity index 100%
rename from htdocs/fourn/card.php
rename to public/fourn/card.php
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/public/fourn/class/api_supplier_invoices.class.php
similarity index 100%
rename from htdocs/fourn/class/api_supplier_invoices.class.php
rename to public/fourn/class/api_supplier_invoices.class.php
diff --git a/htdocs/fourn/class/fournisseur.class.php b/public/fourn/class/fournisseur.class.php
similarity index 100%
rename from htdocs/fourn/class/fournisseur.class.php
rename to public/fourn/class/fournisseur.class.php
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/public/fourn/class/fournisseur.commande.class.php
similarity index 100%
rename from htdocs/fourn/class/fournisseur.commande.class.php
rename to public/fourn/class/fournisseur.commande.class.php
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/public/fourn/class/fournisseur.commande.dispatch.class.php
similarity index 100%
rename from htdocs/fourn/class/fournisseur.commande.dispatch.class.php
rename to public/fourn/class/fournisseur.commande.dispatch.class.php
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/public/fourn/class/fournisseur.facture.class.php
similarity index 100%
rename from htdocs/fourn/class/fournisseur.facture.class.php
rename to public/fourn/class/fournisseur.facture.class.php
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/public/fourn/class/fournisseur.product.class.php
similarity index 100%
rename from htdocs/fourn/class/fournisseur.product.class.php
rename to public/fourn/class/fournisseur.product.class.php
diff --git a/htdocs/fourn/class/index.html b/public/fourn/class/index.html
similarity index 100%
rename from htdocs/fourn/class/index.html
rename to public/fourn/class/index.html
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/public/fourn/class/paiementfourn.class.php
similarity index 100%
rename from htdocs/fourn/class/paiementfourn.class.php
rename to public/fourn/class/paiementfourn.class.php
diff --git a/htdocs/fourn/commande/card.php b/public/fourn/commande/card.php
similarity index 100%
rename from htdocs/fourn/commande/card.php
rename to public/fourn/commande/card.php
diff --git a/htdocs/fourn/commande/contact.php b/public/fourn/commande/contact.php
similarity index 100%
rename from htdocs/fourn/commande/contact.php
rename to public/fourn/commande/contact.php
diff --git a/htdocs/fourn/commande/dispatch.php b/public/fourn/commande/dispatch.php
similarity index 100%
rename from htdocs/fourn/commande/dispatch.php
rename to public/fourn/commande/dispatch.php
diff --git a/htdocs/fourn/commande/document.php b/public/fourn/commande/document.php
similarity index 100%
rename from htdocs/fourn/commande/document.php
rename to public/fourn/commande/document.php
diff --git a/htdocs/fourn/commande/index.php b/public/fourn/commande/index.php
similarity index 100%
rename from htdocs/fourn/commande/index.php
rename to public/fourn/commande/index.php
diff --git a/htdocs/fourn/commande/info.php b/public/fourn/commande/info.php
similarity index 100%
rename from htdocs/fourn/commande/info.php
rename to public/fourn/commande/info.php
diff --git a/htdocs/fourn/commande/list.php b/public/fourn/commande/list.php
similarity index 100%
rename from htdocs/fourn/commande/list.php
rename to public/fourn/commande/list.php
diff --git a/htdocs/fourn/commande/note.php b/public/fourn/commande/note.php
similarity index 100%
rename from htdocs/fourn/commande/note.php
rename to public/fourn/commande/note.php
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/public/fourn/commande/orderstoinvoice.php
similarity index 100%
rename from htdocs/fourn/commande/orderstoinvoice.php
rename to public/fourn/commande/orderstoinvoice.php
diff --git a/htdocs/fourn/commande/tpl/index.html b/public/fourn/commande/tpl/index.html
similarity index 100%
rename from htdocs/fourn/commande/tpl/index.html
rename to public/fourn/commande/tpl/index.html
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/public/fourn/commande/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
rename to public/fourn/commande/tpl/linkedobjectblock.tpl.php
diff --git a/htdocs/fourn/contact.php b/public/fourn/contact.php
similarity index 100%
rename from htdocs/fourn/contact.php
rename to public/fourn/contact.php
diff --git a/htdocs/fourn/facture/card.php b/public/fourn/facture/card.php
similarity index 100%
rename from htdocs/fourn/facture/card.php
rename to public/fourn/facture/card.php
diff --git a/htdocs/fourn/facture/contact.php b/public/fourn/facture/contact.php
similarity index 100%
rename from htdocs/fourn/facture/contact.php
rename to public/fourn/facture/contact.php
diff --git a/htdocs/fourn/facture/document.php b/public/fourn/facture/document.php
similarity index 100%
rename from htdocs/fourn/facture/document.php
rename to public/fourn/facture/document.php
diff --git a/htdocs/fourn/facture/impayees.php b/public/fourn/facture/impayees.php
similarity index 100%
rename from htdocs/fourn/facture/impayees.php
rename to public/fourn/facture/impayees.php
diff --git a/htdocs/fourn/facture/index.html b/public/fourn/facture/index.html
similarity index 100%
rename from htdocs/fourn/facture/index.html
rename to public/fourn/facture/index.html
diff --git a/htdocs/fourn/facture/info.php b/public/fourn/facture/info.php
similarity index 100%
rename from htdocs/fourn/facture/info.php
rename to public/fourn/facture/info.php
diff --git a/htdocs/fourn/facture/list.php b/public/fourn/facture/list.php
similarity index 100%
rename from htdocs/fourn/facture/list.php
rename to public/fourn/facture/list.php
diff --git a/htdocs/fourn/facture/note.php b/public/fourn/facture/note.php
similarity index 100%
rename from htdocs/fourn/facture/note.php
rename to public/fourn/facture/note.php
diff --git a/htdocs/fourn/facture/paiement.php b/public/fourn/facture/paiement.php
similarity index 100%
rename from htdocs/fourn/facture/paiement.php
rename to public/fourn/facture/paiement.php
diff --git a/htdocs/fourn/facture/tpl/index.html b/public/fourn/facture/tpl/index.html
similarity index 100%
rename from htdocs/fourn/facture/tpl/index.html
rename to public/fourn/facture/tpl/index.html
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/public/fourn/facture/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
rename to public/fourn/facture/tpl/linkedobjectblock.tpl.php
diff --git a/htdocs/fourn/index.php b/public/fourn/index.php
similarity index 100%
rename from htdocs/fourn/index.php
rename to public/fourn/index.php
diff --git a/htdocs/fourn/js/lib_dispatch.js b/public/fourn/js/lib_dispatch.js
similarity index 100%
rename from htdocs/fourn/js/lib_dispatch.js
rename to public/fourn/js/lib_dispatch.js
diff --git a/htdocs/fourn/paiement/card.php b/public/fourn/paiement/card.php
similarity index 100%
rename from htdocs/fourn/paiement/card.php
rename to public/fourn/paiement/card.php
diff --git a/htdocs/fourn/paiement/index.html b/public/fourn/paiement/index.html
similarity index 100%
rename from htdocs/fourn/paiement/index.html
rename to public/fourn/paiement/index.html
diff --git a/htdocs/fourn/paiement/info.php b/public/fourn/paiement/info.php
similarity index 100%
rename from htdocs/fourn/paiement/info.php
rename to public/fourn/paiement/info.php
diff --git a/htdocs/fourn/product/list.php b/public/fourn/product/list.php
similarity index 100%
rename from htdocs/fourn/product/list.php
rename to public/fourn/product/list.php
diff --git a/htdocs/fourn/recap-fourn.php b/public/fourn/recap-fourn.php
similarity index 100%
rename from htdocs/fourn/recap-fourn.php
rename to public/fourn/recap-fourn.php
diff --git a/htdocs/ftp/admin/ftpclient.php b/public/ftp/admin/ftpclient.php
similarity index 100%
rename from htdocs/ftp/admin/ftpclient.php
rename to public/ftp/admin/ftpclient.php
diff --git a/htdocs/ftp/admin/index.html b/public/ftp/admin/index.html
similarity index 100%
rename from htdocs/ftp/admin/index.html
rename to public/ftp/admin/index.html
diff --git a/htdocs/ftp/index.php b/public/ftp/index.php
similarity index 100%
rename from htdocs/ftp/index.php
rename to public/ftp/index.php
diff --git a/htdocs/holiday/card.php b/public/holiday/card.php
similarity index 100%
rename from htdocs/holiday/card.php
rename to public/holiday/card.php
diff --git a/htdocs/holiday/class/holiday.class.php b/public/holiday/class/holiday.class.php
similarity index 100%
rename from htdocs/holiday/class/holiday.class.php
rename to public/holiday/class/holiday.class.php
diff --git a/htdocs/holiday/class/index.html b/public/holiday/class/index.html
similarity index 100%
rename from htdocs/holiday/class/index.html
rename to public/holiday/class/index.html
diff --git a/htdocs/holiday/common.inc.php b/public/holiday/common.inc.php
similarity index 100%
rename from htdocs/holiday/common.inc.php
rename to public/holiday/common.inc.php
diff --git a/htdocs/holiday/define_holiday.php b/public/holiday/define_holiday.php
similarity index 100%
rename from htdocs/holiday/define_holiday.php
rename to public/holiday/define_holiday.php
diff --git a/htdocs/holiday/document.php b/public/holiday/document.php
similarity index 100%
rename from htdocs/holiday/document.php
rename to public/holiday/document.php
diff --git a/htdocs/holiday/img/add.png b/public/holiday/img/add.png
similarity index 100%
rename from htdocs/holiday/img/add.png
rename to public/holiday/img/add.png
diff --git a/htdocs/holiday/img/conges.png b/public/holiday/img/conges.png
similarity index 100%
rename from htdocs/holiday/img/conges.png
rename to public/holiday/img/conges.png
diff --git a/htdocs/holiday/img/delete.png b/public/holiday/img/delete.png
similarity index 100%
rename from htdocs/holiday/img/delete.png
rename to public/holiday/img/delete.png
diff --git a/htdocs/holiday/img/edit.png b/public/holiday/img/edit.png
similarity index 100%
rename from htdocs/holiday/img/edit.png
rename to public/holiday/img/edit.png
diff --git a/htdocs/holiday/img/index.html b/public/holiday/img/index.html
similarity index 100%
rename from htdocs/holiday/img/index.html
rename to public/holiday/img/index.html
diff --git a/htdocs/holiday/index.html b/public/holiday/index.html
similarity index 100%
rename from htdocs/holiday/index.html
rename to public/holiday/index.html
diff --git a/htdocs/holiday/list.php b/public/holiday/list.php
similarity index 100%
rename from htdocs/holiday/list.php
rename to public/holiday/list.php
diff --git a/htdocs/holiday/view_log.php b/public/holiday/view_log.php
similarity index 100%
rename from htdocs/holiday/view_log.php
rename to public/holiday/view_log.php
diff --git a/htdocs/hrm/admin/admin_establishment.php b/public/hrm/admin/admin_establishment.php
similarity index 100%
rename from htdocs/hrm/admin/admin_establishment.php
rename to public/hrm/admin/admin_establishment.php
diff --git a/htdocs/hrm/admin/admin_hrm.php b/public/hrm/admin/admin_hrm.php
similarity index 100%
rename from htdocs/hrm/admin/admin_hrm.php
rename to public/hrm/admin/admin_hrm.php
diff --git a/htdocs/hrm/admin/index.html b/public/hrm/admin/index.html
similarity index 100%
rename from htdocs/hrm/admin/index.html
rename to public/hrm/admin/index.html
diff --git a/htdocs/hrm/class/establishment.class.php b/public/hrm/class/establishment.class.php
similarity index 100%
rename from htdocs/hrm/class/establishment.class.php
rename to public/hrm/class/establishment.class.php
diff --git a/htdocs/hrm/class/index.html b/public/hrm/class/index.html
similarity index 100%
rename from htdocs/hrm/class/index.html
rename to public/hrm/class/index.html
diff --git a/htdocs/hrm/establishment/card.php b/public/hrm/establishment/card.php
similarity index 100%
rename from htdocs/hrm/establishment/card.php
rename to public/hrm/establishment/card.php
diff --git a/htdocs/hrm/establishment/index.html b/public/hrm/establishment/index.html
similarity index 100%
rename from htdocs/hrm/establishment/index.html
rename to public/hrm/establishment/index.html
diff --git a/htdocs/hrm/establishment/info.php b/public/hrm/establishment/info.php
similarity index 100%
rename from htdocs/hrm/establishment/info.php
rename to public/hrm/establishment/info.php
diff --git a/htdocs/hrm/index.html b/public/hrm/index.html
similarity index 100%
rename from htdocs/hrm/index.html
rename to public/hrm/index.html
diff --git a/htdocs/hrm/index.php b/public/hrm/index.php
similarity index 100%
rename from htdocs/hrm/index.php
rename to public/hrm/index.php
diff --git a/htdocs/imports/class/import.class.php b/public/imports/class/import.class.php
similarity index 100%
rename from htdocs/imports/class/import.class.php
rename to public/imports/class/import.class.php
diff --git a/htdocs/imports/class/index.html b/public/imports/class/index.html
similarity index 100%
rename from htdocs/imports/class/index.html
rename to public/imports/class/index.html
diff --git a/htdocs/imports/emptyexample.php b/public/imports/emptyexample.php
similarity index 100%
rename from htdocs/imports/emptyexample.php
rename to public/imports/emptyexample.php
diff --git a/htdocs/imports/import.php b/public/imports/import.php
similarity index 100%
rename from htdocs/imports/import.php
rename to public/imports/import.php
diff --git a/htdocs/imports/index.php b/public/imports/index.php
similarity index 100%
rename from htdocs/imports/index.php
rename to public/imports/index.php
diff --git a/htdocs/includes/OAuth/Common/AutoLoader.php b/public/includes/OAuth/Common/AutoLoader.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/AutoLoader.php
rename to public/includes/OAuth/Common/AutoLoader.php
diff --git a/htdocs/includes/OAuth/Common/Consumer/Credentials.php b/public/includes/OAuth/Common/Consumer/Credentials.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Consumer/Credentials.php
rename to public/includes/OAuth/Common/Consumer/Credentials.php
diff --git a/htdocs/includes/OAuth/Common/Consumer/CredentialsInterface.php b/public/includes/OAuth/Common/Consumer/CredentialsInterface.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Consumer/CredentialsInterface.php
rename to public/includes/OAuth/Common/Consumer/CredentialsInterface.php
diff --git a/htdocs/includes/OAuth/Common/Exception/Exception.php b/public/includes/OAuth/Common/Exception/Exception.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Exception/Exception.php
rename to public/includes/OAuth/Common/Exception/Exception.php
diff --git a/htdocs/includes/OAuth/Common/Http/Client/AbstractClient.php b/public/includes/OAuth/Common/Http/Client/AbstractClient.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Http/Client/AbstractClient.php
rename to public/includes/OAuth/Common/Http/Client/AbstractClient.php
diff --git a/htdocs/includes/OAuth/Common/Http/Client/ClientInterface.php b/public/includes/OAuth/Common/Http/Client/ClientInterface.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Http/Client/ClientInterface.php
rename to public/includes/OAuth/Common/Http/Client/ClientInterface.php
diff --git a/htdocs/includes/OAuth/Common/Http/Client/CurlClient.php b/public/includes/OAuth/Common/Http/Client/CurlClient.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Http/Client/CurlClient.php
rename to public/includes/OAuth/Common/Http/Client/CurlClient.php
diff --git a/htdocs/includes/OAuth/Common/Http/Client/StreamClient.php b/public/includes/OAuth/Common/Http/Client/StreamClient.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Http/Client/StreamClient.php
rename to public/includes/OAuth/Common/Http/Client/StreamClient.php
diff --git a/htdocs/includes/OAuth/Common/Http/Exception/TokenResponseException.php b/public/includes/OAuth/Common/Http/Exception/TokenResponseException.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Http/Exception/TokenResponseException.php
rename to public/includes/OAuth/Common/Http/Exception/TokenResponseException.php
diff --git a/htdocs/includes/OAuth/Common/Http/Uri/Uri.php b/public/includes/OAuth/Common/Http/Uri/Uri.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Http/Uri/Uri.php
rename to public/includes/OAuth/Common/Http/Uri/Uri.php
diff --git a/htdocs/includes/OAuth/Common/Http/Uri/UriFactory.php b/public/includes/OAuth/Common/Http/Uri/UriFactory.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Http/Uri/UriFactory.php
rename to public/includes/OAuth/Common/Http/Uri/UriFactory.php
diff --git a/htdocs/includes/OAuth/Common/Http/Uri/UriFactoryInterface.php b/public/includes/OAuth/Common/Http/Uri/UriFactoryInterface.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Http/Uri/UriFactoryInterface.php
rename to public/includes/OAuth/Common/Http/Uri/UriFactoryInterface.php
diff --git a/htdocs/includes/OAuth/Common/Http/Uri/UriInterface.php b/public/includes/OAuth/Common/Http/Uri/UriInterface.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Http/Uri/UriInterface.php
rename to public/includes/OAuth/Common/Http/Uri/UriInterface.php
diff --git a/htdocs/includes/OAuth/Common/Service/AbstractService.php b/public/includes/OAuth/Common/Service/AbstractService.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Service/AbstractService.php
rename to public/includes/OAuth/Common/Service/AbstractService.php
diff --git a/htdocs/includes/OAuth/Common/Service/ServiceInterface.php b/public/includes/OAuth/Common/Service/ServiceInterface.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Service/ServiceInterface.php
rename to public/includes/OAuth/Common/Service/ServiceInterface.php
diff --git a/htdocs/includes/OAuth/Common/Storage/DoliStorage.php b/public/includes/OAuth/Common/Storage/DoliStorage.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Storage/DoliStorage.php
rename to public/includes/OAuth/Common/Storage/DoliStorage.php
diff --git a/htdocs/includes/OAuth/Common/Storage/Exception/AuthorizationStateNotFoundException.php b/public/includes/OAuth/Common/Storage/Exception/AuthorizationStateNotFoundException.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Storage/Exception/AuthorizationStateNotFoundException.php
rename to public/includes/OAuth/Common/Storage/Exception/AuthorizationStateNotFoundException.php
diff --git a/htdocs/includes/OAuth/Common/Storage/Exception/StorageException.php b/public/includes/OAuth/Common/Storage/Exception/StorageException.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Storage/Exception/StorageException.php
rename to public/includes/OAuth/Common/Storage/Exception/StorageException.php
diff --git a/htdocs/includes/OAuth/Common/Storage/Exception/TokenNotFoundException.php b/public/includes/OAuth/Common/Storage/Exception/TokenNotFoundException.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Storage/Exception/TokenNotFoundException.php
rename to public/includes/OAuth/Common/Storage/Exception/TokenNotFoundException.php
diff --git a/htdocs/includes/OAuth/Common/Storage/Memory.php b/public/includes/OAuth/Common/Storage/Memory.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Storage/Memory.php
rename to public/includes/OAuth/Common/Storage/Memory.php
diff --git a/htdocs/includes/OAuth/Common/Storage/Redis.php b/public/includes/OAuth/Common/Storage/Redis.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Storage/Redis.php
rename to public/includes/OAuth/Common/Storage/Redis.php
diff --git a/htdocs/includes/OAuth/Common/Storage/Session.php b/public/includes/OAuth/Common/Storage/Session.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Storage/Session.php
rename to public/includes/OAuth/Common/Storage/Session.php
diff --git a/htdocs/includes/OAuth/Common/Storage/SymfonySession.php b/public/includes/OAuth/Common/Storage/SymfonySession.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Storage/SymfonySession.php
rename to public/includes/OAuth/Common/Storage/SymfonySession.php
diff --git a/htdocs/includes/OAuth/Common/Storage/TokenStorageInterface.php b/public/includes/OAuth/Common/Storage/TokenStorageInterface.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Storage/TokenStorageInterface.php
rename to public/includes/OAuth/Common/Storage/TokenStorageInterface.php
diff --git a/htdocs/includes/OAuth/Common/Token/AbstractToken.php b/public/includes/OAuth/Common/Token/AbstractToken.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Token/AbstractToken.php
rename to public/includes/OAuth/Common/Token/AbstractToken.php
diff --git a/htdocs/includes/OAuth/Common/Token/Exception/ExpiredTokenException.php b/public/includes/OAuth/Common/Token/Exception/ExpiredTokenException.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Token/Exception/ExpiredTokenException.php
rename to public/includes/OAuth/Common/Token/Exception/ExpiredTokenException.php
diff --git a/htdocs/includes/OAuth/Common/Token/TokenInterface.php b/public/includes/OAuth/Common/Token/TokenInterface.php
similarity index 100%
rename from htdocs/includes/OAuth/Common/Token/TokenInterface.php
rename to public/includes/OAuth/Common/Token/TokenInterface.php
diff --git a/htdocs/includes/OAuth/OAuth1/Service/AbstractService.php b/public/includes/OAuth/OAuth1/Service/AbstractService.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Service/AbstractService.php
rename to public/includes/OAuth/OAuth1/Service/AbstractService.php
diff --git a/htdocs/includes/OAuth/OAuth1/Service/BitBucket.php b/public/includes/OAuth/OAuth1/Service/BitBucket.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Service/BitBucket.php
rename to public/includes/OAuth/OAuth1/Service/BitBucket.php
diff --git a/htdocs/includes/OAuth/OAuth1/Service/Etsy.php b/public/includes/OAuth/OAuth1/Service/Etsy.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Service/Etsy.php
rename to public/includes/OAuth/OAuth1/Service/Etsy.php
diff --git a/htdocs/includes/OAuth/OAuth1/Service/FitBit.php b/public/includes/OAuth/OAuth1/Service/FitBit.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Service/FitBit.php
rename to public/includes/OAuth/OAuth1/Service/FitBit.php
diff --git a/htdocs/includes/OAuth/OAuth1/Service/FiveHundredPx.php b/public/includes/OAuth/OAuth1/Service/FiveHundredPx.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Service/FiveHundredPx.php
rename to public/includes/OAuth/OAuth1/Service/FiveHundredPx.php
diff --git a/htdocs/includes/OAuth/OAuth1/Service/Flickr.php b/public/includes/OAuth/OAuth1/Service/Flickr.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Service/Flickr.php
rename to public/includes/OAuth/OAuth1/Service/Flickr.php
diff --git a/htdocs/includes/OAuth/OAuth1/Service/QuickBooks.php b/public/includes/OAuth/OAuth1/Service/QuickBooks.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Service/QuickBooks.php
rename to public/includes/OAuth/OAuth1/Service/QuickBooks.php
diff --git a/htdocs/includes/OAuth/OAuth1/Service/Redmine.php b/public/includes/OAuth/OAuth1/Service/Redmine.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Service/Redmine.php
rename to public/includes/OAuth/OAuth1/Service/Redmine.php
diff --git a/htdocs/includes/OAuth/OAuth1/Service/ScoopIt.php b/public/includes/OAuth/OAuth1/Service/ScoopIt.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Service/ScoopIt.php
rename to public/includes/OAuth/OAuth1/Service/ScoopIt.php
diff --git a/htdocs/includes/OAuth/OAuth1/Service/ServiceInterface.php b/public/includes/OAuth/OAuth1/Service/ServiceInterface.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Service/ServiceInterface.php
rename to public/includes/OAuth/OAuth1/Service/ServiceInterface.php
diff --git a/htdocs/includes/OAuth/OAuth1/Service/Tumblr.php b/public/includes/OAuth/OAuth1/Service/Tumblr.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Service/Tumblr.php
rename to public/includes/OAuth/OAuth1/Service/Tumblr.php
diff --git a/htdocs/includes/OAuth/OAuth1/Service/Twitter.php b/public/includes/OAuth/OAuth1/Service/Twitter.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Service/Twitter.php
rename to public/includes/OAuth/OAuth1/Service/Twitter.php
diff --git a/htdocs/includes/OAuth/OAuth1/Service/Xing.php b/public/includes/OAuth/OAuth1/Service/Xing.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Service/Xing.php
rename to public/includes/OAuth/OAuth1/Service/Xing.php
diff --git a/htdocs/includes/OAuth/OAuth1/Service/Yahoo.php b/public/includes/OAuth/OAuth1/Service/Yahoo.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Service/Yahoo.php
rename to public/includes/OAuth/OAuth1/Service/Yahoo.php
diff --git a/htdocs/includes/OAuth/OAuth1/Signature/Exception/UnsupportedHashAlgorithmException.php b/public/includes/OAuth/OAuth1/Signature/Exception/UnsupportedHashAlgorithmException.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Signature/Exception/UnsupportedHashAlgorithmException.php
rename to public/includes/OAuth/OAuth1/Signature/Exception/UnsupportedHashAlgorithmException.php
diff --git a/htdocs/includes/OAuth/OAuth1/Signature/Signature.php b/public/includes/OAuth/OAuth1/Signature/Signature.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Signature/Signature.php
rename to public/includes/OAuth/OAuth1/Signature/Signature.php
diff --git a/htdocs/includes/OAuth/OAuth1/Signature/SignatureInterface.php b/public/includes/OAuth/OAuth1/Signature/SignatureInterface.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Signature/SignatureInterface.php
rename to public/includes/OAuth/OAuth1/Signature/SignatureInterface.php
diff --git a/htdocs/includes/OAuth/OAuth1/Token/StdOAuth1Token.php b/public/includes/OAuth/OAuth1/Token/StdOAuth1Token.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Token/StdOAuth1Token.php
rename to public/includes/OAuth/OAuth1/Token/StdOAuth1Token.php
diff --git a/htdocs/includes/OAuth/OAuth1/Token/TokenInterface.php b/public/includes/OAuth/OAuth1/Token/TokenInterface.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth1/Token/TokenInterface.php
rename to public/includes/OAuth/OAuth1/Token/TokenInterface.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/AbstractService.php b/public/includes/OAuth/OAuth2/Service/AbstractService.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/AbstractService.php
rename to public/includes/OAuth/OAuth2/Service/AbstractService.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Amazon.php b/public/includes/OAuth/OAuth2/Service/Amazon.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Amazon.php
rename to public/includes/OAuth/OAuth2/Service/Amazon.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Bitly.php b/public/includes/OAuth/OAuth2/Service/Bitly.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Bitly.php
rename to public/includes/OAuth/OAuth2/Service/Bitly.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Bitrix24.php b/public/includes/OAuth/OAuth2/Service/Bitrix24.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Bitrix24.php
rename to public/includes/OAuth/OAuth2/Service/Bitrix24.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Box.php b/public/includes/OAuth/OAuth2/Service/Box.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Box.php
rename to public/includes/OAuth/OAuth2/Service/Box.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Buffer.php b/public/includes/OAuth/OAuth2/Service/Buffer.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Buffer.php
rename to public/includes/OAuth/OAuth2/Service/Buffer.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Dailymotion.php b/public/includes/OAuth/OAuth2/Service/Dailymotion.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Dailymotion.php
rename to public/includes/OAuth/OAuth2/Service/Dailymotion.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Delicious.php b/public/includes/OAuth/OAuth2/Service/Delicious.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Delicious.php
rename to public/includes/OAuth/OAuth2/Service/Delicious.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/DeviantArt.php b/public/includes/OAuth/OAuth2/Service/DeviantArt.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/DeviantArt.php
rename to public/includes/OAuth/OAuth2/Service/DeviantArt.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Dropbox.php b/public/includes/OAuth/OAuth2/Service/Dropbox.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Dropbox.php
rename to public/includes/OAuth/OAuth2/Service/Dropbox.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/EveOnline.php b/public/includes/OAuth/OAuth2/Service/EveOnline.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/EveOnline.php
rename to public/includes/OAuth/OAuth2/Service/EveOnline.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAccessTypeException.php b/public/includes/OAuth/OAuth2/Service/Exception/InvalidAccessTypeException.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAccessTypeException.php
rename to public/includes/OAuth/OAuth2/Service/Exception/InvalidAccessTypeException.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAuthorizationStateException.php b/public/includes/OAuth/OAuth2/Service/Exception/InvalidAuthorizationStateException.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAuthorizationStateException.php
rename to public/includes/OAuth/OAuth2/Service/Exception/InvalidAuthorizationStateException.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidScopeException.php b/public/includes/OAuth/OAuth2/Service/Exception/InvalidScopeException.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidScopeException.php
rename to public/includes/OAuth/OAuth2/Service/Exception/InvalidScopeException.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Exception/MissingRefreshTokenException.php b/public/includes/OAuth/OAuth2/Service/Exception/MissingRefreshTokenException.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Exception/MissingRefreshTokenException.php
rename to public/includes/OAuth/OAuth2/Service/Exception/MissingRefreshTokenException.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Facebook.php b/public/includes/OAuth/OAuth2/Service/Facebook.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Facebook.php
rename to public/includes/OAuth/OAuth2/Service/Facebook.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Foursquare.php b/public/includes/OAuth/OAuth2/Service/Foursquare.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Foursquare.php
rename to public/includes/OAuth/OAuth2/Service/Foursquare.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/GitHub.php b/public/includes/OAuth/OAuth2/Service/GitHub.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/GitHub.php
rename to public/includes/OAuth/OAuth2/Service/GitHub.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Google.php b/public/includes/OAuth/OAuth2/Service/Google.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Google.php
rename to public/includes/OAuth/OAuth2/Service/Google.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Harvest.php b/public/includes/OAuth/OAuth2/Service/Harvest.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Harvest.php
rename to public/includes/OAuth/OAuth2/Service/Harvest.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Heroku.php b/public/includes/OAuth/OAuth2/Service/Heroku.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Heroku.php
rename to public/includes/OAuth/OAuth2/Service/Heroku.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Hubic.php b/public/includes/OAuth/OAuth2/Service/Hubic.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Hubic.php
rename to public/includes/OAuth/OAuth2/Service/Hubic.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Instagram.php b/public/includes/OAuth/OAuth2/Service/Instagram.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Instagram.php
rename to public/includes/OAuth/OAuth2/Service/Instagram.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/JawboneUP.php b/public/includes/OAuth/OAuth2/Service/JawboneUP.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/JawboneUP.php
rename to public/includes/OAuth/OAuth2/Service/JawboneUP.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Linkedin.php b/public/includes/OAuth/OAuth2/Service/Linkedin.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Linkedin.php
rename to public/includes/OAuth/OAuth2/Service/Linkedin.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Mailchimp.php b/public/includes/OAuth/OAuth2/Service/Mailchimp.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Mailchimp.php
rename to public/includes/OAuth/OAuth2/Service/Mailchimp.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Microsoft.php b/public/includes/OAuth/OAuth2/Service/Microsoft.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Microsoft.php
rename to public/includes/OAuth/OAuth2/Service/Microsoft.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Nest.php b/public/includes/OAuth/OAuth2/Service/Nest.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Nest.php
rename to public/includes/OAuth/OAuth2/Service/Nest.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Netatmo.php b/public/includes/OAuth/OAuth2/Service/Netatmo.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Netatmo.php
rename to public/includes/OAuth/OAuth2/Service/Netatmo.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/ParrotFlowerPower.php b/public/includes/OAuth/OAuth2/Service/ParrotFlowerPower.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/ParrotFlowerPower.php
rename to public/includes/OAuth/OAuth2/Service/ParrotFlowerPower.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Paypal.php b/public/includes/OAuth/OAuth2/Service/Paypal.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Paypal.php
rename to public/includes/OAuth/OAuth2/Service/Paypal.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Pocket.php b/public/includes/OAuth/OAuth2/Service/Pocket.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Pocket.php
rename to public/includes/OAuth/OAuth2/Service/Pocket.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Reddit.php b/public/includes/OAuth/OAuth2/Service/Reddit.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Reddit.php
rename to public/includes/OAuth/OAuth2/Service/Reddit.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/RunKeeper.php b/public/includes/OAuth/OAuth2/Service/RunKeeper.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/RunKeeper.php
rename to public/includes/OAuth/OAuth2/Service/RunKeeper.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Salesforce.php b/public/includes/OAuth/OAuth2/Service/Salesforce.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Salesforce.php
rename to public/includes/OAuth/OAuth2/Service/Salesforce.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/ServiceInterface.php b/public/includes/OAuth/OAuth2/Service/ServiceInterface.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/ServiceInterface.php
rename to public/includes/OAuth/OAuth2/Service/ServiceInterface.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/SoundCloud.php b/public/includes/OAuth/OAuth2/Service/SoundCloud.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/SoundCloud.php
rename to public/includes/OAuth/OAuth2/Service/SoundCloud.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Spotify.php b/public/includes/OAuth/OAuth2/Service/Spotify.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Spotify.php
rename to public/includes/OAuth/OAuth2/Service/Spotify.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Strava.php b/public/includes/OAuth/OAuth2/Service/Strava.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Strava.php
rename to public/includes/OAuth/OAuth2/Service/Strava.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Ustream.php b/public/includes/OAuth/OAuth2/Service/Ustream.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Ustream.php
rename to public/includes/OAuth/OAuth2/Service/Ustream.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Vimeo.php b/public/includes/OAuth/OAuth2/Service/Vimeo.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Vimeo.php
rename to public/includes/OAuth/OAuth2/Service/Vimeo.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Vkontakte.php b/public/includes/OAuth/OAuth2/Service/Vkontakte.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Vkontakte.php
rename to public/includes/OAuth/OAuth2/Service/Vkontakte.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Yahoo.php b/public/includes/OAuth/OAuth2/Service/Yahoo.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Yahoo.php
rename to public/includes/OAuth/OAuth2/Service/Yahoo.php
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Yammer.php b/public/includes/OAuth/OAuth2/Service/Yammer.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Service/Yammer.php
rename to public/includes/OAuth/OAuth2/Service/Yammer.php
diff --git a/htdocs/includes/OAuth/OAuth2/Token/StdOAuth2Token.php b/public/includes/OAuth/OAuth2/Token/StdOAuth2Token.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Token/StdOAuth2Token.php
rename to public/includes/OAuth/OAuth2/Token/StdOAuth2Token.php
diff --git a/htdocs/includes/OAuth/OAuth2/Token/TokenInterface.php b/public/includes/OAuth/OAuth2/Token/TokenInterface.php
similarity index 100%
rename from htdocs/includes/OAuth/OAuth2/Token/TokenInterface.php
rename to public/includes/OAuth/OAuth2/Token/TokenInterface.php
diff --git a/htdocs/includes/OAuth/ServiceFactory.php b/public/includes/OAuth/ServiceFactory.php
similarity index 100%
rename from htdocs/includes/OAuth/ServiceFactory.php
rename to public/includes/OAuth/ServiceFactory.php
diff --git a/htdocs/includes/OAuth/bootstrap.php b/public/includes/OAuth/bootstrap.php
similarity index 100%
rename from htdocs/includes/OAuth/bootstrap.php
rename to public/includes/OAuth/bootstrap.php
diff --git a/htdocs/includes/adodbtime/adodb-time.inc.php b/public/includes/adodbtime/adodb-time.inc.php
similarity index 100%
rename from htdocs/includes/adodbtime/adodb-time.inc.php
rename to public/includes/adodbtime/adodb-time.inc.php
diff --git a/htdocs/includes/adodbtime/index.html b/public/includes/adodbtime/index.html
similarity index 100%
rename from htdocs/includes/adodbtime/index.html
rename to public/includes/adodbtime/index.html
diff --git a/htdocs/includes/ccampbell/chromephp/ChromePhp.php b/public/includes/ccampbell/chromephp/ChromePhp.php
similarity index 100%
rename from htdocs/includes/ccampbell/chromephp/ChromePhp.php
rename to public/includes/ccampbell/chromephp/ChromePhp.php
diff --git a/htdocs/includes/ccampbell/chromephp/README.md b/public/includes/ccampbell/chromephp/README.md
similarity index 100%
rename from htdocs/includes/ccampbell/chromephp/README.md
rename to public/includes/ccampbell/chromephp/README.md
diff --git a/htdocs/includes/ccampbell/chromephp/composer.json b/public/includes/ccampbell/chromephp/composer.json
similarity index 100%
rename from htdocs/includes/ccampbell/chromephp/composer.json
rename to public/includes/ccampbell/chromephp/composer.json
diff --git a/htdocs/includes/ckeditor/ckeditor/CHANGES.md b/public/includes/ckeditor/ckeditor/CHANGES.md
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/CHANGES.md
rename to public/includes/ckeditor/ckeditor/CHANGES.md
diff --git a/htdocs/includes/ckeditor/ckeditor/LICENSE.md b/public/includes/ckeditor/ckeditor/LICENSE.md
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/LICENSE.md
rename to public/includes/ckeditor/ckeditor/LICENSE.md
diff --git a/htdocs/includes/ckeditor/ckeditor/README.md b/public/includes/ckeditor/ckeditor/README.md
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/README.md
rename to public/includes/ckeditor/ckeditor/README.md
diff --git a/htdocs/includes/ckeditor/ckeditor/adapters/jquery.js b/public/includes/ckeditor/ckeditor/adapters/jquery.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/adapters/jquery.js
rename to public/includes/ckeditor/ckeditor/adapters/jquery.js
diff --git a/htdocs/includes/ckeditor/ckeditor/bower.json b/public/includes/ckeditor/ckeditor/bower.json
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/bower.json
rename to public/includes/ckeditor/ckeditor/bower.json
diff --git a/htdocs/includes/ckeditor/ckeditor/build-config.js b/public/includes/ckeditor/ckeditor/build-config.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/build-config.js
rename to public/includes/ckeditor/ckeditor/build-config.js
diff --git a/htdocs/includes/ckeditor/ckeditor/ckeditor.js b/public/includes/ckeditor/ckeditor/ckeditor.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/ckeditor.js
rename to public/includes/ckeditor/ckeditor/ckeditor.js
diff --git a/htdocs/includes/ckeditor/ckeditor/composer.json b/public/includes/ckeditor/ckeditor/composer.json
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/composer.json
rename to public/includes/ckeditor/ckeditor/composer.json
diff --git a/htdocs/includes/ckeditor/ckeditor/config.js b/public/includes/ckeditor/ckeditor/config.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/config.js
rename to public/includes/ckeditor/ckeditor/config.js
diff --git a/htdocs/includes/ckeditor/ckeditor/contents.css b/public/includes/ckeditor/ckeditor/contents.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/contents.css
rename to public/includes/ckeditor/ckeditor/contents.css
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/af.js b/public/includes/ckeditor/ckeditor/lang/af.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/af.js
rename to public/includes/ckeditor/ckeditor/lang/af.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ar.js b/public/includes/ckeditor/ckeditor/lang/ar.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/ar.js
rename to public/includes/ckeditor/ckeditor/lang/ar.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/bg.js b/public/includes/ckeditor/ckeditor/lang/bg.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/bg.js
rename to public/includes/ckeditor/ckeditor/lang/bg.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/bn.js b/public/includes/ckeditor/ckeditor/lang/bn.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/bn.js
rename to public/includes/ckeditor/ckeditor/lang/bn.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/bs.js b/public/includes/ckeditor/ckeditor/lang/bs.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/bs.js
rename to public/includes/ckeditor/ckeditor/lang/bs.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ca.js b/public/includes/ckeditor/ckeditor/lang/ca.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/ca.js
rename to public/includes/ckeditor/ckeditor/lang/ca.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/cs.js b/public/includes/ckeditor/ckeditor/lang/cs.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/cs.js
rename to public/includes/ckeditor/ckeditor/lang/cs.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/cy.js b/public/includes/ckeditor/ckeditor/lang/cy.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/cy.js
rename to public/includes/ckeditor/ckeditor/lang/cy.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/da.js b/public/includes/ckeditor/ckeditor/lang/da.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/da.js
rename to public/includes/ckeditor/ckeditor/lang/da.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/de-ch.js b/public/includes/ckeditor/ckeditor/lang/de-ch.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/de-ch.js
rename to public/includes/ckeditor/ckeditor/lang/de-ch.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/de.js b/public/includes/ckeditor/ckeditor/lang/de.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/de.js
rename to public/includes/ckeditor/ckeditor/lang/de.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/el.js b/public/includes/ckeditor/ckeditor/lang/el.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/el.js
rename to public/includes/ckeditor/ckeditor/lang/el.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/en-au.js b/public/includes/ckeditor/ckeditor/lang/en-au.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/en-au.js
rename to public/includes/ckeditor/ckeditor/lang/en-au.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/en-ca.js b/public/includes/ckeditor/ckeditor/lang/en-ca.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/en-ca.js
rename to public/includes/ckeditor/ckeditor/lang/en-ca.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/en-gb.js b/public/includes/ckeditor/ckeditor/lang/en-gb.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/en-gb.js
rename to public/includes/ckeditor/ckeditor/lang/en-gb.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/en.js b/public/includes/ckeditor/ckeditor/lang/en.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/en.js
rename to public/includes/ckeditor/ckeditor/lang/en.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/eo.js b/public/includes/ckeditor/ckeditor/lang/eo.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/eo.js
rename to public/includes/ckeditor/ckeditor/lang/eo.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/es.js b/public/includes/ckeditor/ckeditor/lang/es.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/es.js
rename to public/includes/ckeditor/ckeditor/lang/es.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/et.js b/public/includes/ckeditor/ckeditor/lang/et.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/et.js
rename to public/includes/ckeditor/ckeditor/lang/et.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/eu.js b/public/includes/ckeditor/ckeditor/lang/eu.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/eu.js
rename to public/includes/ckeditor/ckeditor/lang/eu.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fa.js b/public/includes/ckeditor/ckeditor/lang/fa.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/fa.js
rename to public/includes/ckeditor/ckeditor/lang/fa.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fi.js b/public/includes/ckeditor/ckeditor/lang/fi.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/fi.js
rename to public/includes/ckeditor/ckeditor/lang/fi.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fo.js b/public/includes/ckeditor/ckeditor/lang/fo.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/fo.js
rename to public/includes/ckeditor/ckeditor/lang/fo.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fr-ca.js b/public/includes/ckeditor/ckeditor/lang/fr-ca.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/fr-ca.js
rename to public/includes/ckeditor/ckeditor/lang/fr-ca.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fr.js b/public/includes/ckeditor/ckeditor/lang/fr.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/fr.js
rename to public/includes/ckeditor/ckeditor/lang/fr.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/gl.js b/public/includes/ckeditor/ckeditor/lang/gl.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/gl.js
rename to public/includes/ckeditor/ckeditor/lang/gl.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/gu.js b/public/includes/ckeditor/ckeditor/lang/gu.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/gu.js
rename to public/includes/ckeditor/ckeditor/lang/gu.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/he.js b/public/includes/ckeditor/ckeditor/lang/he.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/he.js
rename to public/includes/ckeditor/ckeditor/lang/he.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/hi.js b/public/includes/ckeditor/ckeditor/lang/hi.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/hi.js
rename to public/includes/ckeditor/ckeditor/lang/hi.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/hr.js b/public/includes/ckeditor/ckeditor/lang/hr.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/hr.js
rename to public/includes/ckeditor/ckeditor/lang/hr.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/hu.js b/public/includes/ckeditor/ckeditor/lang/hu.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/hu.js
rename to public/includes/ckeditor/ckeditor/lang/hu.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/id.js b/public/includes/ckeditor/ckeditor/lang/id.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/id.js
rename to public/includes/ckeditor/ckeditor/lang/id.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/is.js b/public/includes/ckeditor/ckeditor/lang/is.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/is.js
rename to public/includes/ckeditor/ckeditor/lang/is.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/it.js b/public/includes/ckeditor/ckeditor/lang/it.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/it.js
rename to public/includes/ckeditor/ckeditor/lang/it.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ja.js b/public/includes/ckeditor/ckeditor/lang/ja.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/ja.js
rename to public/includes/ckeditor/ckeditor/lang/ja.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ka.js b/public/includes/ckeditor/ckeditor/lang/ka.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/ka.js
rename to public/includes/ckeditor/ckeditor/lang/ka.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/km.js b/public/includes/ckeditor/ckeditor/lang/km.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/km.js
rename to public/includes/ckeditor/ckeditor/lang/km.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ko.js b/public/includes/ckeditor/ckeditor/lang/ko.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/ko.js
rename to public/includes/ckeditor/ckeditor/lang/ko.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ku.js b/public/includes/ckeditor/ckeditor/lang/ku.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/ku.js
rename to public/includes/ckeditor/ckeditor/lang/ku.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/lt.js b/public/includes/ckeditor/ckeditor/lang/lt.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/lt.js
rename to public/includes/ckeditor/ckeditor/lang/lt.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/lv.js b/public/includes/ckeditor/ckeditor/lang/lv.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/lv.js
rename to public/includes/ckeditor/ckeditor/lang/lv.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/mk.js b/public/includes/ckeditor/ckeditor/lang/mk.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/mk.js
rename to public/includes/ckeditor/ckeditor/lang/mk.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/mn.js b/public/includes/ckeditor/ckeditor/lang/mn.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/mn.js
rename to public/includes/ckeditor/ckeditor/lang/mn.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ms.js b/public/includes/ckeditor/ckeditor/lang/ms.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/ms.js
rename to public/includes/ckeditor/ckeditor/lang/ms.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/nb.js b/public/includes/ckeditor/ckeditor/lang/nb.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/nb.js
rename to public/includes/ckeditor/ckeditor/lang/nb.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/nl.js b/public/includes/ckeditor/ckeditor/lang/nl.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/nl.js
rename to public/includes/ckeditor/ckeditor/lang/nl.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/no.js b/public/includes/ckeditor/ckeditor/lang/no.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/no.js
rename to public/includes/ckeditor/ckeditor/lang/no.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/pl.js b/public/includes/ckeditor/ckeditor/lang/pl.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/pl.js
rename to public/includes/ckeditor/ckeditor/lang/pl.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/pt-br.js b/public/includes/ckeditor/ckeditor/lang/pt-br.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/pt-br.js
rename to public/includes/ckeditor/ckeditor/lang/pt-br.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/pt.js b/public/includes/ckeditor/ckeditor/lang/pt.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/pt.js
rename to public/includes/ckeditor/ckeditor/lang/pt.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ro.js b/public/includes/ckeditor/ckeditor/lang/ro.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/ro.js
rename to public/includes/ckeditor/ckeditor/lang/ro.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ru.js b/public/includes/ckeditor/ckeditor/lang/ru.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/ru.js
rename to public/includes/ckeditor/ckeditor/lang/ru.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/si.js b/public/includes/ckeditor/ckeditor/lang/si.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/si.js
rename to public/includes/ckeditor/ckeditor/lang/si.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sk.js b/public/includes/ckeditor/ckeditor/lang/sk.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/sk.js
rename to public/includes/ckeditor/ckeditor/lang/sk.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sl.js b/public/includes/ckeditor/ckeditor/lang/sl.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/sl.js
rename to public/includes/ckeditor/ckeditor/lang/sl.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sq.js b/public/includes/ckeditor/ckeditor/lang/sq.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/sq.js
rename to public/includes/ckeditor/ckeditor/lang/sq.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sr-latn.js b/public/includes/ckeditor/ckeditor/lang/sr-latn.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/sr-latn.js
rename to public/includes/ckeditor/ckeditor/lang/sr-latn.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sr.js b/public/includes/ckeditor/ckeditor/lang/sr.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/sr.js
rename to public/includes/ckeditor/ckeditor/lang/sr.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sv.js b/public/includes/ckeditor/ckeditor/lang/sv.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/sv.js
rename to public/includes/ckeditor/ckeditor/lang/sv.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/th.js b/public/includes/ckeditor/ckeditor/lang/th.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/th.js
rename to public/includes/ckeditor/ckeditor/lang/th.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/tr.js b/public/includes/ckeditor/ckeditor/lang/tr.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/tr.js
rename to public/includes/ckeditor/ckeditor/lang/tr.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/tt.js b/public/includes/ckeditor/ckeditor/lang/tt.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/tt.js
rename to public/includes/ckeditor/ckeditor/lang/tt.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ug.js b/public/includes/ckeditor/ckeditor/lang/ug.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/ug.js
rename to public/includes/ckeditor/ckeditor/lang/ug.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/uk.js b/public/includes/ckeditor/ckeditor/lang/uk.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/uk.js
rename to public/includes/ckeditor/ckeditor/lang/uk.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/vi.js b/public/includes/ckeditor/ckeditor/lang/vi.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/vi.js
rename to public/includes/ckeditor/ckeditor/lang/vi.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/zh-cn.js b/public/includes/ckeditor/ckeditor/lang/zh-cn.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/zh-cn.js
rename to public/includes/ckeditor/ckeditor/lang/zh-cn.js
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/zh.js b/public/includes/ckeditor/ckeditor/lang/zh.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/lang/zh.js
rename to public/includes/ckeditor/ckeditor/lang/zh.js
diff --git a/htdocs/includes/ckeditor/ckeditor/package.json b/public/includes/ckeditor/ckeditor/package.json
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/package.json
rename to public/includes/ckeditor/ckeditor/package.json
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js b/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
rename to public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js b/public/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js
rename to public/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png b/public/includes/ckeditor/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
rename to public/includes/ckeditor/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/logo_ckeditor.png b/public/includes/ckeditor/ckeditor/plugins/about/dialogs/logo_ckeditor.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/logo_ckeditor.png
rename to public/includes/ckeditor/ckeditor/plugins/about/dialogs/logo_ckeditor.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js b/public/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
rename to public/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css b/public/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css
rename to public/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js b/public/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
rename to public/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js b/public/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
rename to public/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/div/dialogs/div.js b/public/includes/ckeditor/ckeditor/plugins/div/dialogs/div.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/div/dialogs/div.js
rename to public/includes/ckeditor/ckeditor/plugins/div/dialogs/div.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js b/public/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js
rename to public/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/flash/dialogs/flash.js b/public/includes/ckeditor/ckeditor/plugins/flash/dialogs/flash.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/flash/dialogs/flash.js
rename to public/includes/ckeditor/ckeditor/plugins/flash/dialogs/flash.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/flash/images/placeholder.png b/public/includes/ckeditor/ckeditor/plugins/flash/images/placeholder.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/flash/images/placeholder.png
rename to public/includes/ckeditor/ckeditor/plugins/flash/images/placeholder.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js b/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js
rename to public/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js b/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js
rename to public/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js b/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js
rename to public/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js b/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
rename to public/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js b/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js
rename to public/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js b/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js
rename to public/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js b/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
rename to public/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js b/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js
rename to public/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/images/hiddenfield.gif b/public/includes/ckeditor/ckeditor/plugins/forms/images/hiddenfield.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/forms/images/hiddenfield.gif
rename to public/includes/ckeditor/ckeditor/plugins/forms/images/hiddenfield.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/icons.png b/public/includes/ckeditor/ckeditor/plugins/icons.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/icons.png
rename to public/includes/ckeditor/ckeditor/plugins/icons.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/icons_hidpi.png b/public/includes/ckeditor/ckeditor/plugins/icons_hidpi.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/icons_hidpi.png
rename to public/includes/ckeditor/ckeditor/plugins/icons_hidpi.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js b/public/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
rename to public/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/iframe/images/placeholder.png b/public/includes/ckeditor/ckeditor/plugins/iframe/images/placeholder.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/iframe/images/placeholder.png
rename to public/includes/ckeditor/ckeditor/plugins/iframe/images/placeholder.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js b/public/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js
rename to public/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/image/images/noimage.png b/public/includes/ckeditor/ckeditor/plugins/image/images/noimage.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/image/images/noimage.png
rename to public/includes/ckeditor/ckeditor/plugins/image/images/noimage.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js b/public/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
rename to public/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js b/public/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js
rename to public/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/link/images/anchor.png b/public/includes/ckeditor/ckeditor/plugins/link/images/anchor.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/link/images/anchor.png
rename to public/includes/ckeditor/ckeditor/plugins/link/images/anchor.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/link/images/hidpi/anchor.png b/public/includes/ckeditor/ckeditor/plugins/link/images/hidpi/anchor.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/link/images/hidpi/anchor.png
rename to public/includes/ckeditor/ckeditor/plugins/link/images/hidpi/anchor.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js b/public/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
rename to public/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png b/public/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
rename to public/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon.png b/public/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon.png
rename to public/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/icon-rtl.png b/public/includes/ckeditor/ckeditor/plugins/magicline/images/icon-rtl.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/icon-rtl.png
rename to public/includes/ckeditor/ckeditor/plugins/magicline/images/icon-rtl.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/icon.png b/public/includes/ckeditor/ckeditor/plugins/magicline/images/icon.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/icon.png
rename to public/includes/ckeditor/ckeditor/plugins/magicline/images/icon.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/pagebreak/images/pagebreak.gif b/public/includes/ckeditor/ckeditor/plugins/pagebreak/images/pagebreak.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/pagebreak/images/pagebreak.gif
rename to public/includes/ckeditor/ckeditor/plugins/pagebreak/images/pagebreak.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js b/public/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
rename to public/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/preview/preview.html b/public/includes/ckeditor/ckeditor/plugins/preview/preview.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/preview/preview.html
rename to public/includes/ckeditor/ckeditor/plugins/preview/preview.html
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md b/public/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md
rename to public/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md b/public/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md
rename to public/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/README.md b/public/includes/ckeditor/ckeditor/plugins/scayt/README.md
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/scayt/README.md
rename to public/includes/ckeditor/ckeditor/plugins/scayt/README.md
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js b/public/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js
rename to public/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/toolbar.css b/public/includes/ckeditor/ckeditor/plugins/scayt/dialogs/toolbar.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/toolbar.css
rename to public/includes/ckeditor/ckeditor/plugins/scayt/dialogs/toolbar.css
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_address.png b/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_address.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_address.png
rename to public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_address.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_blockquote.png b/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_blockquote.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_blockquote.png
rename to public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_blockquote.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_div.png b/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_div.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_div.png
rename to public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_div.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h1.png b/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h1.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h1.png
rename to public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h1.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h2.png b/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h2.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h2.png
rename to public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h2.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h3.png b/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h3.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h3.png
rename to public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h3.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h4.png b/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h4.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h4.png
rename to public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h4.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h5.png b/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h5.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h5.png
rename to public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h5.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h6.png b/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h6.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h6.png
rename to public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h6.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_p.png b/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_p.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_p.png
rename to public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_p.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_pre.png b/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_pre.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_pre.png
rename to public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_pre.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js b/public/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
rename to public/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/embaressed_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/embaressed_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/embaressed_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/embaressed_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/heart.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/heart.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/heart.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/heart.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/heart.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/heart.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/heart.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/heart.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tounge_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/tounge_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tounge_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/tounge_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.gif b/public/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.gif
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.png b/public/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.png
rename to public/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.png
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js b/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js
rename to public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js b/public/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js
rename to public/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js b/public/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js
rename to public/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css b/public/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css
rename to public/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js b/public/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js
rename to public/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js b/public/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
rename to public/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template1.gif b/public/includes/ckeditor/ckeditor/plugins/templates/templates/images/template1.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template1.gif
rename to public/includes/ckeditor/ckeditor/plugins/templates/templates/images/template1.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template2.gif b/public/includes/ckeditor/ckeditor/plugins/templates/templates/images/template2.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template2.gif
rename to public/includes/ckeditor/ckeditor/plugins/templates/templates/images/template2.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template3.gif b/public/includes/ckeditor/ckeditor/plugins/templates/templates/images/template3.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template3.gif
rename to public/includes/ckeditor/ckeditor/plugins/templates/templates/images/template3.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md b/public/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md
rename to public/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/README.md b/public/includes/ckeditor/ckeditor/plugins/wsc/README.md
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/wsc/README.md
rename to public/includes/ckeditor/ckeditor/plugins/wsc/README.md
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html b/public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html
rename to public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmpFrameset.html b/public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
rename to public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css b/public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css
rename to public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js b/public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js
rename to public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc_ie.js b/public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc_ie.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc_ie.js
rename to public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc_ie.js
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/css/samples.css b/public/includes/ckeditor/ckeditor/samples/css/samples.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/css/samples.css
rename to public/includes/ckeditor/ckeditor/samples/css/samples.css
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/img/github-top.png b/public/includes/ckeditor/ckeditor/samples/img/github-top.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/img/github-top.png
rename to public/includes/ckeditor/ckeditor/samples/img/github-top.png
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/img/header-bg.png b/public/includes/ckeditor/ckeditor/samples/img/header-bg.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/img/header-bg.png
rename to public/includes/ckeditor/ckeditor/samples/img/header-bg.png
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/img/header-separator.png b/public/includes/ckeditor/ckeditor/samples/img/header-separator.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/img/header-separator.png
rename to public/includes/ckeditor/ckeditor/samples/img/header-separator.png
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/img/logo.png b/public/includes/ckeditor/ckeditor/samples/img/logo.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/img/logo.png
rename to public/includes/ckeditor/ckeditor/samples/img/logo.png
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/img/navigation-tip.png b/public/includes/ckeditor/ckeditor/samples/img/navigation-tip.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/img/navigation-tip.png
rename to public/includes/ckeditor/ckeditor/samples/img/navigation-tip.png
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/index.html b/public/includes/ckeditor/ckeditor/samples/index.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/index.html
rename to public/includes/ckeditor/ckeditor/samples/index.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/js/sample.js b/public/includes/ckeditor/ckeditor/samples/js/sample.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/js/sample.js
rename to public/includes/ckeditor/ckeditor/samples/js/sample.js
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/js/sf.js b/public/includes/ckeditor/ckeditor/samples/js/sf.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/js/sf.js
rename to public/includes/ckeditor/ckeditor/samples/js/sf.js
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/ajax.html b/public/includes/ckeditor/ckeditor/samples/old/ajax.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/ajax.html
rename to public/includes/ckeditor/ckeditor/samples/old/ajax.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/api.html b/public/includes/ckeditor/ckeditor/samples/old/api.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/api.html
rename to public/includes/ckeditor/ckeditor/samples/old/api.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/appendto.html b/public/includes/ckeditor/ckeditor/samples/old/appendto.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/appendto.html
rename to public/includes/ckeditor/ckeditor/samples/old/appendto.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/assets/inlineall/logo.png b/public/includes/ckeditor/ckeditor/samples/old/assets/inlineall/logo.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/assets/inlineall/logo.png
rename to public/includes/ckeditor/ckeditor/samples/old/assets/inlineall/logo.png
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css b/public/includes/ckeditor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
rename to public/includes/ckeditor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/assets/posteddata.php b/public/includes/ckeditor/ckeditor/samples/old/assets/posteddata.php
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/assets/posteddata.php
rename to public/includes/ckeditor/ckeditor/samples/old/assets/posteddata.php
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/assets/sample.jpg b/public/includes/ckeditor/ckeditor/samples/old/assets/sample.jpg
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/assets/sample.jpg
rename to public/includes/ckeditor/ckeditor/samples/old/assets/sample.jpg
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/assets/uilanguages/languages.js b/public/includes/ckeditor/ckeditor/samples/old/assets/uilanguages/languages.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/assets/uilanguages/languages.js
rename to public/includes/ckeditor/ckeditor/samples/old/assets/uilanguages/languages.js
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/datafiltering.html b/public/includes/ckeditor/ckeditor/samples/old/datafiltering.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/datafiltering.html
rename to public/includes/ckeditor/ckeditor/samples/old/datafiltering.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/dialog/assets/my_dialog.js b/public/includes/ckeditor/ckeditor/samples/old/dialog/assets/my_dialog.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/dialog/assets/my_dialog.js
rename to public/includes/ckeditor/ckeditor/samples/old/dialog/assets/my_dialog.js
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/dialog/dialog.html b/public/includes/ckeditor/ckeditor/samples/old/dialog/dialog.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/dialog/dialog.html
rename to public/includes/ckeditor/ckeditor/samples/old/dialog/dialog.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/divreplace.html b/public/includes/ckeditor/ckeditor/samples/old/divreplace.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/divreplace.html
rename to public/includes/ckeditor/ckeditor/samples/old/divreplace.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/enterkey/enterkey.html b/public/includes/ckeditor/ckeditor/samples/old/enterkey/enterkey.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/enterkey/enterkey.html
rename to public/includes/ckeditor/ckeditor/samples/old/enterkey/enterkey.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla b/public/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla
rename to public/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf b/public/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf
rename to public/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js b/public/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js
rename to public/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputforflash.html b/public/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputforflash.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputforflash.html
rename to public/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputforflash.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputhtml.html b/public/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputhtml.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputhtml.html
rename to public/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputhtml.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/index.html b/public/includes/ckeditor/ckeditor/samples/old/index.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/index.html
rename to public/includes/ckeditor/ckeditor/samples/old/index.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/inlineall.html b/public/includes/ckeditor/ckeditor/samples/old/inlineall.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/inlineall.html
rename to public/includes/ckeditor/ckeditor/samples/old/inlineall.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/inlinebycode.html b/public/includes/ckeditor/ckeditor/samples/old/inlinebycode.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/inlinebycode.html
rename to public/includes/ckeditor/ckeditor/samples/old/inlinebycode.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/inlinetextarea.html b/public/includes/ckeditor/ckeditor/samples/old/inlinetextarea.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/inlinetextarea.html
rename to public/includes/ckeditor/ckeditor/samples/old/inlinetextarea.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/jquery.html b/public/includes/ckeditor/ckeditor/samples/old/jquery.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/jquery.html
rename to public/includes/ckeditor/ckeditor/samples/old/jquery.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/magicline/magicline.html b/public/includes/ckeditor/ckeditor/samples/old/magicline/magicline.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/magicline/magicline.html
rename to public/includes/ckeditor/ckeditor/samples/old/magicline/magicline.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/readonly.html b/public/includes/ckeditor/ckeditor/samples/old/readonly.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/readonly.html
rename to public/includes/ckeditor/ckeditor/samples/old/readonly.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/replacebyclass.html b/public/includes/ckeditor/ckeditor/samples/old/replacebyclass.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/replacebyclass.html
rename to public/includes/ckeditor/ckeditor/samples/old/replacebyclass.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/replacebycode.html b/public/includes/ckeditor/ckeditor/samples/old/replacebycode.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/replacebycode.html
rename to public/includes/ckeditor/ckeditor/samples/old/replacebycode.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/sample.css b/public/includes/ckeditor/ckeditor/samples/old/sample.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/sample.css
rename to public/includes/ckeditor/ckeditor/samples/old/sample.css
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/sample.js b/public/includes/ckeditor/ckeditor/samples/old/sample.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/sample.js
rename to public/includes/ckeditor/ckeditor/samples/old/sample.js
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/sample_posteddata.php b/public/includes/ckeditor/ckeditor/samples/old/sample_posteddata.php
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/sample_posteddata.php
rename to public/includes/ckeditor/ckeditor/samples/old/sample_posteddata.php
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/tabindex.html b/public/includes/ckeditor/ckeditor/samples/old/tabindex.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/tabindex.html
rename to public/includes/ckeditor/ckeditor/samples/old/tabindex.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/toolbar/toolbar.html b/public/includes/ckeditor/ckeditor/samples/old/toolbar/toolbar.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/toolbar/toolbar.html
rename to public/includes/ckeditor/ckeditor/samples/old/toolbar/toolbar.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/uicolor.html b/public/includes/ckeditor/ckeditor/samples/old/uicolor.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/uicolor.html
rename to public/includes/ckeditor/ckeditor/samples/old/uicolor.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/uilanguages.html b/public/includes/ckeditor/ckeditor/samples/old/uilanguages.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/uilanguages.html
rename to public/includes/ckeditor/ckeditor/samples/old/uilanguages.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html b/public/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html
rename to public/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/xhtmlstyle.html b/public/includes/ckeditor/ckeditor/samples/old/xhtmlstyle.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/old/xhtmlstyle.html
rename to public/includes/ckeditor/ckeditor/samples/old/xhtmlstyle.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/css/fontello.css b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/css/fontello.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/css/fontello.css
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/css/fontello.css
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/config.json b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/config.json
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/config.json
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/config.json
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.eot b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.eot
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.eot
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.eot
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.svg b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.svg
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.svg
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.svg
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.ttf b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.woff b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.woff
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.woff
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.woff
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js b/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
rename to public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog.css b/public/includes/ckeditor/ckeditor/skins/moono/dialog.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/dialog.css
rename to public/includes/ckeditor/ckeditor/skins/moono/dialog.css
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css b/public/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css
rename to public/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css b/public/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css
rename to public/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css b/public/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css
rename to public/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css b/public/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css
rename to public/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor.css b/public/includes/ckeditor/ckeditor/skins/moono/editor.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/editor.css
rename to public/includes/ckeditor/ckeditor/skins/moono/editor.css
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css b/public/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css
rename to public/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie.css b/public/includes/ckeditor/ckeditor/skins/moono/editor_ie.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie.css
rename to public/includes/ckeditor/ckeditor/skins/moono/editor_ie.css
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css b/public/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css
rename to public/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css b/public/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css
rename to public/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css b/public/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css
rename to public/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/icons.png b/public/includes/ckeditor/ckeditor/skins/moono/icons.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/icons.png
rename to public/includes/ckeditor/ckeditor/skins/moono/icons.png
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/icons_hidpi.png b/public/includes/ckeditor/ckeditor/skins/moono/icons_hidpi.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/icons_hidpi.png
rename to public/includes/ckeditor/ckeditor/skins/moono/icons_hidpi.png
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/arrow.png b/public/includes/ckeditor/ckeditor/skins/moono/images/arrow.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/images/arrow.png
rename to public/includes/ckeditor/ckeditor/skins/moono/images/arrow.png
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/close.png b/public/includes/ckeditor/ckeditor/skins/moono/images/close.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/images/close.png
rename to public/includes/ckeditor/ckeditor/skins/moono/images/close.png
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/close.png b/public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/close.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/close.png
rename to public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/close.png
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.png b/public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.png
rename to public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.png
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png b/public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png
rename to public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png b/public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png
rename to public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/lock-open.png b/public/includes/ckeditor/ckeditor/skins/moono/images/lock-open.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/images/lock-open.png
rename to public/includes/ckeditor/ckeditor/skins/moono/images/lock-open.png
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/lock.png b/public/includes/ckeditor/ckeditor/skins/moono/images/lock.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/images/lock.png
rename to public/includes/ckeditor/ckeditor/skins/moono/images/lock.png
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/refresh.png b/public/includes/ckeditor/ckeditor/skins/moono/images/refresh.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/images/refresh.png
rename to public/includes/ckeditor/ckeditor/skins/moono/images/refresh.png
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/spinner.gif b/public/includes/ckeditor/ckeditor/skins/moono/images/spinner.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/images/spinner.gif
rename to public/includes/ckeditor/ckeditor/skins/moono/images/spinner.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/readme.md b/public/includes/ckeditor/ckeditor/skins/moono/readme.md
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/readme.md
rename to public/includes/ckeditor/ckeditor/skins/moono/readme.md
diff --git a/htdocs/includes/ckeditor/ckeditor/styles.js b/public/includes/ckeditor/ckeditor/styles.js
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/styles.js
rename to public/includes/ckeditor/ckeditor/styles.js
diff --git a/htdocs/includes/evalmath/README.md b/public/includes/evalmath/README.md
similarity index 100%
rename from htdocs/includes/evalmath/README.md
rename to public/includes/evalmath/README.md
diff --git a/htdocs/includes/evalmath/evalmath.class.php b/public/includes/evalmath/evalmath.class.php
similarity index 100%
rename from htdocs/includes/evalmath/evalmath.class.php
rename to public/includes/evalmath/evalmath.class.php
diff --git a/htdocs/includes/fonts/Aerial.ttf b/public/includes/fonts/Aerial.ttf
similarity index 100%
rename from htdocs/includes/fonts/Aerial.ttf
rename to public/includes/fonts/Aerial.ttf
diff --git a/htdocs/includes/fonts/AerialBd.ttf b/public/includes/fonts/AerialBd.ttf
similarity index 100%
rename from htdocs/includes/fonts/AerialBd.ttf
rename to public/includes/fonts/AerialBd.ttf
diff --git a/htdocs/includes/fonts/AerialBdIt.ttf b/public/includes/fonts/AerialBdIt.ttf
similarity index 100%
rename from htdocs/includes/fonts/AerialBdIt.ttf
rename to public/includes/fonts/AerialBdIt.ttf
diff --git a/htdocs/includes/fonts/AerialIt.ttf b/public/includes/fonts/AerialIt.ttf
similarity index 100%
rename from htdocs/includes/fonts/AerialIt.ttf
rename to public/includes/fonts/AerialIt.ttf
diff --git a/htdocs/includes/fonts/CHANGELOG.TXT b/public/includes/fonts/CHANGELOG.TXT
similarity index 100%
rename from htdocs/includes/fonts/CHANGELOG.TXT
rename to public/includes/fonts/CHANGELOG.TXT
diff --git a/htdocs/includes/fonts/COPYRIGHT.TXT b/public/includes/fonts/COPYRIGHT.TXT
similarity index 100%
rename from htdocs/includes/fonts/COPYRIGHT.TXT
rename to public/includes/fonts/COPYRIGHT.TXT
diff --git a/htdocs/includes/fpdfi/README.txt b/public/includes/fpdfi/README.txt
similarity index 100%
rename from htdocs/includes/fpdfi/README.txt
rename to public/includes/fpdfi/README.txt
diff --git a/htdocs/includes/fpdfi/filters/FilterASCII85.php b/public/includes/fpdfi/filters/FilterASCII85.php
similarity index 100%
rename from htdocs/includes/fpdfi/filters/FilterASCII85.php
rename to public/includes/fpdfi/filters/FilterASCII85.php
diff --git a/htdocs/includes/fpdfi/filters/FilterASCII85_FPDI.php b/public/includes/fpdfi/filters/FilterASCII85_FPDI.php
similarity index 100%
rename from htdocs/includes/fpdfi/filters/FilterASCII85_FPDI.php
rename to public/includes/fpdfi/filters/FilterASCII85_FPDI.php
diff --git a/htdocs/includes/fpdfi/filters/FilterASCIIHexDecode.php b/public/includes/fpdfi/filters/FilterASCIIHexDecode.php
similarity index 100%
rename from htdocs/includes/fpdfi/filters/FilterASCIIHexDecode.php
rename to public/includes/fpdfi/filters/FilterASCIIHexDecode.php
diff --git a/htdocs/includes/fpdfi/filters/FilterLZW.php b/public/includes/fpdfi/filters/FilterLZW.php
similarity index 100%
rename from htdocs/includes/fpdfi/filters/FilterLZW.php
rename to public/includes/fpdfi/filters/FilterLZW.php
diff --git a/htdocs/includes/fpdfi/filters/FilterLZW_FPDI.php b/public/includes/fpdfi/filters/FilterLZW_FPDI.php
similarity index 100%
rename from htdocs/includes/fpdfi/filters/FilterLZW_FPDI.php
rename to public/includes/fpdfi/filters/FilterLZW_FPDI.php
diff --git a/htdocs/includes/fpdfi/fpdf_tpl.php b/public/includes/fpdfi/fpdf_tpl.php
similarity index 100%
rename from htdocs/includes/fpdfi/fpdf_tpl.php
rename to public/includes/fpdfi/fpdf_tpl.php
diff --git a/htdocs/includes/fpdfi/fpdi.php b/public/includes/fpdfi/fpdi.php
similarity index 100%
rename from htdocs/includes/fpdfi/fpdi.php
rename to public/includes/fpdfi/fpdi.php
diff --git a/htdocs/includes/fpdfi/fpdi_bridge.php b/public/includes/fpdfi/fpdi_bridge.php
similarity index 100%
rename from htdocs/includes/fpdfi/fpdi_bridge.php
rename to public/includes/fpdfi/fpdi_bridge.php
diff --git a/htdocs/includes/fpdfi/fpdi_pdf_parser.php b/public/includes/fpdfi/fpdi_pdf_parser.php
similarity index 100%
rename from htdocs/includes/fpdfi/fpdi_pdf_parser.php
rename to public/includes/fpdfi/fpdi_pdf_parser.php
diff --git a/htdocs/includes/fpdfi/pdf_context.php b/public/includes/fpdfi/pdf_context.php
similarity index 100%
rename from htdocs/includes/fpdfi/pdf_context.php
rename to public/includes/fpdfi/pdf_context.php
diff --git a/htdocs/includes/fpdfi/pdf_parser.php b/public/includes/fpdfi/pdf_parser.php
similarity index 100%
rename from htdocs/includes/fpdfi/pdf_parser.php
rename to public/includes/fpdfi/pdf_parser.php
diff --git a/htdocs/includes/geoip/README.txt b/public/includes/geoip/README.txt
similarity index 100%
rename from htdocs/includes/geoip/README.txt
rename to public/includes/geoip/README.txt
diff --git a/htdocs/includes/geoip/geoip.inc b/public/includes/geoip/geoip.inc
similarity index 100%
rename from htdocs/includes/geoip/geoip.inc
rename to public/includes/geoip/geoip.inc
diff --git a/htdocs/includes/geoip/geoipcity.inc b/public/includes/geoip/geoipcity.inc
similarity index 100%
rename from htdocs/includes/geoip/geoipcity.inc
rename to public/includes/geoip/geoipcity.inc
diff --git a/htdocs/includes/geoip/geoipregionvars.php b/public/includes/geoip/geoipregionvars.php
similarity index 100%
rename from htdocs/includes/geoip/geoipregionvars.php
rename to public/includes/geoip/geoipregionvars.php
diff --git a/htdocs/includes/geoip/sample.php b/public/includes/geoip/sample.php
similarity index 100%
rename from htdocs/includes/geoip/sample.php
rename to public/includes/geoip/sample.php
diff --git a/htdocs/includes/geoip/sample_city.php b/public/includes/geoip/sample_city.php
similarity index 100%
rename from htdocs/includes/geoip/sample_city.php
rename to public/includes/geoip/sample_city.php
diff --git a/htdocs/includes/geoip/sample_distributed.php b/public/includes/geoip/sample_distributed.php
similarity index 100%
rename from htdocs/includes/geoip/sample_distributed.php
rename to public/includes/geoip/sample_distributed.php
diff --git a/htdocs/includes/geoip/sample_netspeed.php b/public/includes/geoip/sample_netspeed.php
similarity index 100%
rename from htdocs/includes/geoip/sample_netspeed.php
rename to public/includes/geoip/sample_netspeed.php
diff --git a/htdocs/includes/geoip/sample_org.php b/public/includes/geoip/sample_org.php
similarity index 100%
rename from htdocs/includes/geoip/sample_org.php
rename to public/includes/geoip/sample_org.php
diff --git a/htdocs/includes/geoip/sample_region.php b/public/includes/geoip/sample_region.php
similarity index 100%
rename from htdocs/includes/geoip/sample_region.php
rename to public/includes/geoip/sample_region.php
diff --git a/htdocs/includes/index.html b/public/includes/index.html
similarity index 100%
rename from htdocs/includes/index.html
rename to public/includes/index.html
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png b/public/includes/jquery/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to public/includes/jquery/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png b/public/includes/jquery/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png
rename to public/includes/jquery/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png b/public/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
rename to public/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png b/public/includes/jquery/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
rename to public/includes/jquery/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png b/public/includes/jquery/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
rename to public/includes/jquery/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/public/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
rename to public/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/public/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
rename to public/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/public/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
rename to public/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png b/public/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png
rename to public/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-icons_2e83ff_256x240.png b/public/includes/jquery/css/redmond/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-icons_2e83ff_256x240.png
rename to public/includes/jquery/css/redmond/images/ui-icons_2e83ff_256x240.png
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-icons_469bdd_256x240.png b/public/includes/jquery/css/redmond/images/ui-icons_469bdd_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-icons_469bdd_256x240.png
rename to public/includes/jquery/css/redmond/images/ui-icons_469bdd_256x240.png
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png b/public/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png
rename to public/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-icons_cd0a0a_256x240.png b/public/includes/jquery/css/redmond/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-icons_cd0a0a_256x240.png
rename to public/includes/jquery/css/redmond/images/ui-icons_cd0a0a_256x240.png
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-icons_d8e7f3_256x240.png b/public/includes/jquery/css/redmond/images/ui-icons_d8e7f3_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-icons_d8e7f3_256x240.png
rename to public/includes/jquery/css/redmond/images/ui-icons_d8e7f3_256x240.png
diff --git a/htdocs/includes/jquery/css/redmond/images/ui-icons_f9bd01_256x240.png b/public/includes/jquery/css/redmond/images/ui-icons_f9bd01_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/images/ui-icons_f9bd01_256x240.png
rename to public/includes/jquery/css/redmond/images/ui-icons_f9bd01_256x240.png
diff --git a/htdocs/includes/jquery/css/redmond/jquery-ui.css b/public/includes/jquery/css/redmond/jquery-ui.css
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/jquery-ui.css
rename to public/includes/jquery/css/redmond/jquery-ui.css
diff --git a/htdocs/includes/jquery/css/redmond/jquery-ui.min.css b/public/includes/jquery/css/redmond/jquery-ui.min.css
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/jquery-ui.min.css
rename to public/includes/jquery/css/redmond/jquery-ui.min.css
diff --git a/htdocs/includes/jquery/css/redmond/theme.css b/public/includes/jquery/css/redmond/theme.css
similarity index 100%
rename from htdocs/includes/jquery/css/redmond/theme.css
rename to public/includes/jquery/css/redmond/theme.css
diff --git a/htdocs/includes/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/public/includes/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to public/includes/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/htdocs/includes/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/public/includes/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
rename to public/includes/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/public/includes/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to public/includes/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/public/includes/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
rename to public/includes/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/public/includes/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
rename to public/includes/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/public/includes/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to public/includes/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/public/includes/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
rename to public/includes/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/htdocs/includes/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/public/includes/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to public/includes/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/htdocs/includes/jquery/css/smoothness/images/ui-icons_222222_256x240.png b/public/includes/jquery/css/smoothness/images/ui-icons_222222_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/images/ui-icons_222222_256x240.png
rename to public/includes/jquery/css/smoothness/images/ui-icons_222222_256x240.png
diff --git a/htdocs/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png b/public/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
rename to public/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
diff --git a/htdocs/includes/jquery/css/smoothness/images/ui-icons_454545_256x240.png b/public/includes/jquery/css/smoothness/images/ui-icons_454545_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/images/ui-icons_454545_256x240.png
rename to public/includes/jquery/css/smoothness/images/ui-icons_454545_256x240.png
diff --git a/htdocs/includes/jquery/css/smoothness/images/ui-icons_888888_256x240.png b/public/includes/jquery/css/smoothness/images/ui-icons_888888_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/images/ui-icons_888888_256x240.png
rename to public/includes/jquery/css/smoothness/images/ui-icons_888888_256x240.png
diff --git a/htdocs/includes/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png b/public/includes/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
rename to public/includes/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
diff --git a/htdocs/includes/jquery/css/smoothness/jquery-ui.css b/public/includes/jquery/css/smoothness/jquery-ui.css
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/jquery-ui.css
rename to public/includes/jquery/css/smoothness/jquery-ui.css
diff --git a/htdocs/includes/jquery/css/smoothness/jquery-ui.min.css b/public/includes/jquery/css/smoothness/jquery-ui.min.css
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/jquery-ui.min.css
rename to public/includes/jquery/css/smoothness/jquery-ui.min.css
diff --git a/htdocs/includes/jquery/css/smoothness/theme.css b/public/includes/jquery/css/smoothness/theme.css
similarity index 100%
rename from htdocs/includes/jquery/css/smoothness/theme.css
rename to public/includes/jquery/css/smoothness/theme.css
diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/public/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
rename to public/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/public/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
rename to public/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/public/includes/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
rename to public/includes/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/public/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
rename to public/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/public/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
rename to public/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/public/includes/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
rename to public/includes/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/public/includes/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
rename to public/includes/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/public/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
rename to public/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/public/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
rename to public/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png b/public/includes/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png
rename to public/includes/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png
diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png b/public/includes/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png
rename to public/includes/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png
diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png b/public/includes/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
rename to public/includes/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png b/public/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
rename to public/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
diff --git a/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png b/public/includes/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png
rename to public/includes/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png
diff --git a/htdocs/includes/jquery/css/ui-lightness/jquery-ui.css b/public/includes/jquery/css/ui-lightness/jquery-ui.css
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/jquery-ui.css
rename to public/includes/jquery/css/ui-lightness/jquery-ui.css
diff --git a/htdocs/includes/jquery/css/ui-lightness/jquery-ui.min.css b/public/includes/jquery/css/ui-lightness/jquery-ui.min.css
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/jquery-ui.min.css
rename to public/includes/jquery/css/ui-lightness/jquery-ui.min.css
diff --git a/htdocs/includes/jquery/css/ui-lightness/theme.css b/public/includes/jquery/css/ui-lightness/theme.css
similarity index 100%
rename from htdocs/includes/jquery/css/ui-lightness/theme.css
rename to public/includes/jquery/css/ui-lightness/theme.css
diff --git a/htdocs/includes/jquery/js/jquery-ui.js b/public/includes/jquery/js/jquery-ui.js
similarity index 100%
rename from htdocs/includes/jquery/js/jquery-ui.js
rename to public/includes/jquery/js/jquery-ui.js
diff --git a/htdocs/includes/jquery/js/jquery-ui.min.js b/public/includes/jquery/js/jquery-ui.min.js
similarity index 100%
rename from htdocs/includes/jquery/js/jquery-ui.min.js
rename to public/includes/jquery/js/jquery-ui.min.js
diff --git a/htdocs/includes/jquery/js/jquery.js b/public/includes/jquery/js/jquery.js
similarity index 100%
rename from htdocs/includes/jquery/js/jquery.js
rename to public/includes/jquery/js/jquery.js
diff --git a/htdocs/includes/jquery/js/jquery.min.js b/public/includes/jquery/js/jquery.min.js
similarity index 100%
rename from htdocs/includes/jquery/js/jquery.min.js
rename to public/includes/jquery/js/jquery.min.js
diff --git a/htdocs/includes/jquery/plugins/blockUI/jquery.blockUI.js b/public/includes/jquery/plugins/blockUI/jquery.blockUI.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/blockUI/jquery.blockUI.js
rename to public/includes/jquery/plugins/blockUI/jquery.blockUI.js
diff --git a/htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.css b/public/includes/jquery/plugins/colorpicker/jquery.colorpicker.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.css
rename to public/includes/jquery/plugins/colorpicker/jquery.colorpicker.css
diff --git a/htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.js b/public/includes/jquery/plugins/colorpicker/jquery.colorpicker.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.js
rename to public/includes/jquery/plugins/colorpicker/jquery.colorpicker.js
diff --git a/htdocs/includes/jquery/plugins/fileupload/README.md b/public/includes/jquery/plugins/fileupload/README.md
similarity index 100%
rename from htdocs/includes/jquery/plugins/fileupload/README.md
rename to public/includes/jquery/plugins/fileupload/README.md
diff --git a/htdocs/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css b/public/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css
rename to public/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css
diff --git a/htdocs/includes/jquery/plugins/fileupload/img/loading.gif b/public/includes/jquery/plugins/fileupload/img/loading.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/fileupload/img/loading.gif
rename to public/includes/jquery/plugins/fileupload/img/loading.gif
diff --git a/htdocs/includes/jquery/plugins/fileupload/img/progressbar.gif b/public/includes/jquery/plugins/fileupload/img/progressbar.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/fileupload/img/progressbar.gif
rename to public/includes/jquery/plugins/fileupload/img/progressbar.gif
diff --git a/htdocs/includes/jquery/plugins/fileupload/js/cors/jquery.postmessage-transport.js b/public/includes/jquery/plugins/fileupload/js/cors/jquery.postmessage-transport.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/fileupload/js/cors/jquery.postmessage-transport.js
rename to public/includes/jquery/plugins/fileupload/js/cors/jquery.postmessage-transport.js
diff --git a/htdocs/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport.js b/public/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport.js
rename to public/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport.js
diff --git a/htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp.js b/public/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp.js
rename to public/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp.js
diff --git a/htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui.js b/public/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui.js
rename to public/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui.js
diff --git a/htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js b/public/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
rename to public/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
diff --git a/htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload.js b/public/includes/jquery/plugins/fileupload/js/jquery.fileupload.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload.js
rename to public/includes/jquery/plugins/fileupload/js/jquery.fileupload.js
diff --git a/htdocs/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js b/public/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js
rename to public/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js
diff --git a/htdocs/includes/jquery/plugins/fileupload/js/locale.js b/public/includes/jquery/plugins/fileupload/js/locale.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/fileupload/js/locale.js
rename to public/includes/jquery/plugins/fileupload/js/locale.js
diff --git a/htdocs/includes/jquery/plugins/fileupload/js/main.js b/public/includes/jquery/plugins/fileupload/js/main.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/fileupload/js/main.js
rename to public/includes/jquery/plugins/fileupload/js/main.js
diff --git a/htdocs/includes/jquery/plugins/fileupload/js/vendor/jquery.ui.widget.js b/public/includes/jquery/plugins/fileupload/js/vendor/jquery.ui.widget.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/fileupload/js/vendor/jquery.ui.widget.js
rename to public/includes/jquery/plugins/fileupload/js/vendor/jquery.ui.widget.js
diff --git a/htdocs/includes/jquery/plugins/flot/API.md b/public/includes/jquery/plugins/flot/API.md
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/API.md
rename to public/includes/jquery/plugins/flot/API.md
diff --git a/htdocs/includes/jquery/plugins/flot/CONTRIBUTING.md b/public/includes/jquery/plugins/flot/CONTRIBUTING.md
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/CONTRIBUTING.md
rename to public/includes/jquery/plugins/flot/CONTRIBUTING.md
diff --git a/htdocs/includes/jquery/plugins/flot/FAQ.md b/public/includes/jquery/plugins/flot/FAQ.md
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/FAQ.md
rename to public/includes/jquery/plugins/flot/FAQ.md
diff --git a/htdocs/includes/jquery/plugins/flot/LICENSE.txt b/public/includes/jquery/plugins/flot/LICENSE.txt
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/LICENSE.txt
rename to public/includes/jquery/plugins/flot/LICENSE.txt
diff --git a/htdocs/includes/jquery/plugins/flot/Makefile b/public/includes/jquery/plugins/flot/Makefile
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/Makefile
rename to public/includes/jquery/plugins/flot/Makefile
diff --git a/htdocs/includes/jquery/plugins/flot/NEWS.md b/public/includes/jquery/plugins/flot/NEWS.md
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/NEWS.md
rename to public/includes/jquery/plugins/flot/NEWS.md
diff --git a/htdocs/includes/jquery/plugins/flot/PLUGINS.md b/public/includes/jquery/plugins/flot/PLUGINS.md
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/PLUGINS.md
rename to public/includes/jquery/plugins/flot/PLUGINS.md
diff --git a/htdocs/includes/jquery/plugins/flot/README.md b/public/includes/jquery/plugins/flot/README.md
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/README.md
rename to public/includes/jquery/plugins/flot/README.md
diff --git a/htdocs/includes/jquery/plugins/flot/excanvas.js b/public/includes/jquery/plugins/flot/excanvas.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/excanvas.js
rename to public/includes/jquery/plugins/flot/excanvas.js
diff --git a/htdocs/includes/jquery/plugins/flot/excanvas.min.js b/public/includes/jquery/plugins/flot/excanvas.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/excanvas.min.js
rename to public/includes/jquery/plugins/flot/excanvas.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.js b/public/includes/jquery/plugins/flot/jquery.colorhelpers.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.js
rename to public/includes/jquery/plugins/flot/jquery.colorhelpers.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.min.js b/public/includes/jquery/plugins/flot/jquery.colorhelpers.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.min.js
rename to public/includes/jquery/plugins/flot/jquery.colorhelpers.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.canvas.js b/public/includes/jquery/plugins/flot/jquery.flot.canvas.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.canvas.js
rename to public/includes/jquery/plugins/flot/jquery.flot.canvas.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.canvas.min.js b/public/includes/jquery/plugins/flot/jquery.flot.canvas.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.canvas.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.canvas.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.categories.js b/public/includes/jquery/plugins/flot/jquery.flot.categories.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.categories.js
rename to public/includes/jquery/plugins/flot/jquery.flot.categories.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.categories.min.js b/public/includes/jquery/plugins/flot/jquery.flot.categories.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.categories.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.categories.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.js b/public/includes/jquery/plugins/flot/jquery.flot.crosshair.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.js
rename to public/includes/jquery/plugins/flot/jquery.flot.crosshair.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.min.js b/public/includes/jquery/plugins/flot/jquery.flot.crosshair.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.crosshair.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.errorbars.js b/public/includes/jquery/plugins/flot/jquery.flot.errorbars.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.errorbars.js
rename to public/includes/jquery/plugins/flot/jquery.flot.errorbars.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.errorbars.min.js b/public/includes/jquery/plugins/flot/jquery.flot.errorbars.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.errorbars.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.errorbars.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.js b/public/includes/jquery/plugins/flot/jquery.flot.fillbetween.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.js
rename to public/includes/jquery/plugins/flot/jquery.flot.fillbetween.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.min.js b/public/includes/jquery/plugins/flot/jquery.flot.fillbetween.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.fillbetween.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.image.js b/public/includes/jquery/plugins/flot/jquery.flot.image.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.image.js
rename to public/includes/jquery/plugins/flot/jquery.flot.image.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.image.min.js b/public/includes/jquery/plugins/flot/jquery.flot.image.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.image.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.image.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.js b/public/includes/jquery/plugins/flot/jquery.flot.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.js
rename to public/includes/jquery/plugins/flot/jquery.flot.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.min.js b/public/includes/jquery/plugins/flot/jquery.flot.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.js b/public/includes/jquery/plugins/flot/jquery.flot.navigate.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.js
rename to public/includes/jquery/plugins/flot/jquery.flot.navigate.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.min.js b/public/includes/jquery/plugins/flot/jquery.flot.navigate.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.navigate.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.pie.js b/public/includes/jquery/plugins/flot/jquery.flot.pie.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.pie.js
rename to public/includes/jquery/plugins/flot/jquery.flot.pie.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.pie.min.js b/public/includes/jquery/plugins/flot/jquery.flot.pie.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.pie.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.pie.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.resize.js b/public/includes/jquery/plugins/flot/jquery.flot.resize.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.resize.js
rename to public/includes/jquery/plugins/flot/jquery.flot.resize.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.resize.min.js b/public/includes/jquery/plugins/flot/jquery.flot.resize.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.resize.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.resize.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.selection.js b/public/includes/jquery/plugins/flot/jquery.flot.selection.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.selection.js
rename to public/includes/jquery/plugins/flot/jquery.flot.selection.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.selection.min.js b/public/includes/jquery/plugins/flot/jquery.flot.selection.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.selection.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.selection.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.stack.js b/public/includes/jquery/plugins/flot/jquery.flot.stack.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.stack.js
rename to public/includes/jquery/plugins/flot/jquery.flot.stack.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.stack.min.js b/public/includes/jquery/plugins/flot/jquery.flot.stack.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.stack.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.stack.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.js b/public/includes/jquery/plugins/flot/jquery.flot.symbol.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.js
rename to public/includes/jquery/plugins/flot/jquery.flot.symbol.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.min.js b/public/includes/jquery/plugins/flot/jquery.flot.symbol.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.symbol.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.js b/public/includes/jquery/plugins/flot/jquery.flot.threshold.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.js
rename to public/includes/jquery/plugins/flot/jquery.flot.threshold.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.min.js b/public/includes/jquery/plugins/flot/jquery.flot.threshold.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.threshold.min.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.time.js b/public/includes/jquery/plugins/flot/jquery.flot.time.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.time.js
rename to public/includes/jquery/plugins/flot/jquery.flot.time.js
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.time.min.js b/public/includes/jquery/plugins/flot/jquery.flot.time.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/flot/jquery.flot.time.min.js
rename to public/includes/jquery/plugins/flot/jquery.flot.time.min.js
diff --git a/htdocs/includes/jquery/plugins/jcrop/css/Jcrop.gif b/public/includes/jquery/plugins/jcrop/css/Jcrop.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jcrop/css/Jcrop.gif
rename to public/includes/jquery/plugins/jcrop/css/Jcrop.gif
diff --git a/htdocs/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css b/public/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css
rename to public/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css
diff --git a/htdocs/includes/jquery/plugins/jcrop/index.html b/public/includes/jquery/plugins/jcrop/index.html
similarity index 100%
rename from htdocs/includes/jquery/plugins/jcrop/index.html
rename to public/includes/jquery/plugins/jcrop/index.html
diff --git a/htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js b/public/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
rename to public/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
diff --git a/htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js b/public/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
rename to public/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
diff --git a/htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js b/public/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js
rename to public/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js
diff --git a/htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.js b/public/includes/jquery/plugins/jeditable/jquery.jeditable.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.js
rename to public/includes/jquery/plugins/jeditable/jquery.jeditable.js
diff --git a/htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.min.js b/public/includes/jquery/plugins/jeditable/jquery.jeditable.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.min.js
rename to public/includes/jquery/plugins/jeditable/jquery.jeditable.min.js
diff --git a/htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js b/public/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js
rename to public/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js
diff --git a/htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js b/public/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js
rename to public/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js
diff --git a/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css b/public/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css
rename to public/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css
diff --git a/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.css b/public/includes/jquery/plugins/jnotify/jquery.jnotify.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.css
rename to public/includes/jquery/plugins/jnotify/jquery.jnotify.css
diff --git a/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.js b/public/includes/jquery/plugins/jnotify/jquery.jnotify.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.js
rename to public/includes/jquery/plugins/jnotify/jquery.jnotify.js
diff --git a/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.min.css b/public/includes/jquery/plugins/jnotify/jquery.jnotify.min.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.min.css
rename to public/includes/jquery/plugins/jnotify/jquery.jnotify.min.css
diff --git a/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.min.js b/public/includes/jquery/plugins/jnotify/jquery.jnotify.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.min.js
rename to public/includes/jquery/plugins/jnotify/jquery.jnotify.min.js
diff --git a/htdocs/includes/jquery/plugins/jpicker/ChangeLog.txt b/public/includes/jquery/plugins/jpicker/ChangeLog.txt
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/ChangeLog.txt
rename to public/includes/jquery/plugins/jpicker/ChangeLog.txt
diff --git a/htdocs/includes/jquery/plugins/jpicker/Example.html b/public/includes/jquery/plugins/jpicker/Example.html
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/Example.html
rename to public/includes/jquery/plugins/jpicker/Example.html
diff --git a/htdocs/includes/jquery/plugins/jpicker/ReadMe.txt b/public/includes/jquery/plugins/jpicker/ReadMe.txt
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/ReadMe.txt
rename to public/includes/jquery/plugins/jpicker/ReadMe.txt
diff --git a/htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css b/public/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css
rename to public/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css
diff --git a/htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css b/public/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css
rename to public/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css
diff --git a/htdocs/includes/jquery/plugins/jpicker/images/AlphaBar.png b/public/includes/jquery/plugins/jpicker/images/AlphaBar.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/images/AlphaBar.png
rename to public/includes/jquery/plugins/jpicker/images/AlphaBar.png
diff --git a/htdocs/includes/jquery/plugins/jpicker/images/Bars.png b/public/includes/jquery/plugins/jpicker/images/Bars.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/images/Bars.png
rename to public/includes/jquery/plugins/jpicker/images/Bars.png
diff --git a/htdocs/includes/jquery/plugins/jpicker/images/Maps.png b/public/includes/jquery/plugins/jpicker/images/Maps.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/images/Maps.png
rename to public/includes/jquery/plugins/jpicker/images/Maps.png
diff --git a/htdocs/includes/jquery/plugins/jpicker/images/NoColor.png b/public/includes/jquery/plugins/jpicker/images/NoColor.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/images/NoColor.png
rename to public/includes/jquery/plugins/jpicker/images/NoColor.png
diff --git a/htdocs/includes/jquery/plugins/jpicker/images/bar-opacity.png b/public/includes/jquery/plugins/jpicker/images/bar-opacity.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/images/bar-opacity.png
rename to public/includes/jquery/plugins/jpicker/images/bar-opacity.png
diff --git a/htdocs/includes/jquery/plugins/jpicker/images/map-opacity.png b/public/includes/jquery/plugins/jpicker/images/map-opacity.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/images/map-opacity.png
rename to public/includes/jquery/plugins/jpicker/images/map-opacity.png
diff --git a/htdocs/includes/jquery/plugins/jpicker/images/mappoint.gif b/public/includes/jquery/plugins/jpicker/images/mappoint.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/images/mappoint.gif
rename to public/includes/jquery/plugins/jpicker/images/mappoint.gif
diff --git a/htdocs/includes/jquery/plugins/jpicker/images/picker.gif b/public/includes/jquery/plugins/jpicker/images/picker.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/images/picker.gif
rename to public/includes/jquery/plugins/jpicker/images/picker.gif
diff --git a/htdocs/includes/jquery/plugins/jpicker/images/preview-opacity.png b/public/includes/jquery/plugins/jpicker/images/preview-opacity.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/images/preview-opacity.png
rename to public/includes/jquery/plugins/jpicker/images/preview-opacity.png
diff --git a/htdocs/includes/jquery/plugins/jpicker/images/rangearrows.gif b/public/includes/jquery/plugins/jpicker/images/rangearrows.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/images/rangearrows.gif
rename to public/includes/jquery/plugins/jpicker/images/rangearrows.gif
diff --git a/htdocs/includes/jquery/plugins/jpicker/jPicker.css b/public/includes/jquery/plugins/jpicker/jPicker.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/jPicker.css
rename to public/includes/jquery/plugins/jpicker/jPicker.css
diff --git a/htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.js b/public/includes/jquery/plugins/jpicker/jpicker-1.1.6.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.js
rename to public/includes/jquery/plugins/jpicker/jpicker-1.1.6.js
diff --git a/htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js b/public/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js
rename to public/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/application.png b/public/includes/jquery/plugins/jqueryFileTree/images/application.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/application.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/application.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/code.png b/public/includes/jquery/plugins/jqueryFileTree/images/code.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/code.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/code.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/css.png b/public/includes/jquery/plugins/jqueryFileTree/images/css.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/css.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/css.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/db.png b/public/includes/jquery/plugins/jqueryFileTree/images/db.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/db.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/db.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/directory.png b/public/includes/jquery/plugins/jqueryFileTree/images/directory.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/directory.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/directory.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/doc.png b/public/includes/jquery/plugins/jqueryFileTree/images/doc.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/doc.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/doc.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/file.png b/public/includes/jquery/plugins/jqueryFileTree/images/file.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/file.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/file.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/film.png b/public/includes/jquery/plugins/jqueryFileTree/images/film.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/film.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/film.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/flash.png b/public/includes/jquery/plugins/jqueryFileTree/images/flash.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/flash.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/flash.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/folder_open.png b/public/includes/jquery/plugins/jqueryFileTree/images/folder_open.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/folder_open.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/folder_open.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/html.png b/public/includes/jquery/plugins/jqueryFileTree/images/html.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/html.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/html.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/java.png b/public/includes/jquery/plugins/jqueryFileTree/images/java.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/java.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/java.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/linux.png b/public/includes/jquery/plugins/jqueryFileTree/images/linux.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/linux.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/linux.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/music.png b/public/includes/jquery/plugins/jqueryFileTree/images/music.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/music.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/music.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/pdf.png b/public/includes/jquery/plugins/jqueryFileTree/images/pdf.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/pdf.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/pdf.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/php.png b/public/includes/jquery/plugins/jqueryFileTree/images/php.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/php.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/php.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/picture.png b/public/includes/jquery/plugins/jqueryFileTree/images/picture.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/picture.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/picture.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/ppt.png b/public/includes/jquery/plugins/jqueryFileTree/images/ppt.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/ppt.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/ppt.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/psd.png b/public/includes/jquery/plugins/jqueryFileTree/images/psd.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/psd.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/psd.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/ruby.png b/public/includes/jquery/plugins/jqueryFileTree/images/ruby.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/ruby.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/ruby.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/script.png b/public/includes/jquery/plugins/jqueryFileTree/images/script.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/script.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/script.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/spinner.gif b/public/includes/jquery/plugins/jqueryFileTree/images/spinner.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/spinner.gif
rename to public/includes/jquery/plugins/jqueryFileTree/images/spinner.gif
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/txt.png b/public/includes/jquery/plugins/jqueryFileTree/images/txt.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/txt.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/txt.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/xls.png b/public/includes/jquery/plugins/jqueryFileTree/images/xls.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/xls.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/xls.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/images/zip.png b/public/includes/jquery/plugins/jqueryFileTree/images/zip.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/images/zip.png
rename to public/includes/jquery/plugins/jqueryFileTree/images/zip.png
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css b/public/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css
rename to public/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js b/public/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
rename to public/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/changelog.md b/public/includes/jquery/plugins/jquerytreeview/changelog.md
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/changelog.md
rename to public/includes/jquery/plugins/jquerytreeview/changelog.md
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/ajax-loader.gif b/public/includes/jquery/plugins/jquerytreeview/images/ajax-loader.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/ajax-loader.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/ajax-loader.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/file.gif b/public/includes/jquery/plugins/jquerytreeview/images/file.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/file.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/file.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/folder-closed.gif b/public/includes/jquery/plugins/jquerytreeview/images/folder-closed.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/folder-closed.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/folder-closed.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/folder.gif b/public/includes/jquery/plugins/jquerytreeview/images/folder.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/folder.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/folder.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/minus.gif b/public/includes/jquery/plugins/jquerytreeview/images/minus.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/minus.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/minus.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/plus.gif b/public/includes/jquery/plugins/jquerytreeview/images/plus.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/plus.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/plus.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-black-line.gif b/public/includes/jquery/plugins/jquerytreeview/images/treeview-black-line.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-black-line.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/treeview-black-line.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-black.gif b/public/includes/jquery/plugins/jquerytreeview/images/treeview-black.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-black.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/treeview-black.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-default-line.gif b/public/includes/jquery/plugins/jquerytreeview/images/treeview-default-line.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-default-line.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/treeview-default-line.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-default.gif b/public/includes/jquery/plugins/jquerytreeview/images/treeview-default.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-default.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/treeview-default.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam-line.gif b/public/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam-line.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam-line.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam-line.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam.gif b/public/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-gray-line.gif b/public/includes/jquery/plugins/jquerytreeview/images/treeview-gray-line.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-gray-line.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/treeview-gray-line.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-gray.gif b/public/includes/jquery/plugins/jquerytreeview/images/treeview-gray.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-gray.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/treeview-gray.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-red-line.gif b/public/includes/jquery/plugins/jquerytreeview/images/treeview-red-line.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-red-line.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/treeview-red-line.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-red.gif b/public/includes/jquery/plugins/jquerytreeview/images/treeview-red.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-red.gif
rename to public/includes/jquery/plugins/jquerytreeview/images/treeview-red.gif
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js b/public/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js
rename to public/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.css b/public/includes/jquery/plugins/jquerytreeview/jquery.treeview.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.css
rename to public/includes/jquery/plugins/jquerytreeview/jquery.treeview.css
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.edit.js b/public/includes/jquery/plugins/jquerytreeview/jquery.treeview.edit.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.edit.js
rename to public/includes/jquery/plugins/jquerytreeview/jquery.treeview.edit.js
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.js b/public/includes/jquery/plugins/jquerytreeview/jquery.treeview.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.js
rename to public/includes/jquery/plugins/jquerytreeview/jquery.treeview.js
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js b/public/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js
rename to public/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js b/public/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js
rename to public/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/readme.md b/public/includes/jquery/plugins/jquerytreeview/readme.md
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/readme.md
rename to public/includes/jquery/plugins/jquerytreeview/readme.md
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/screenshot.png b/public/includes/jquery/plugins/jquerytreeview/screenshot.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/jquerytreeview/screenshot.png
rename to public/includes/jquery/plugins/jquerytreeview/screenshot.png
diff --git a/htdocs/includes/jquery/plugins/layout/jquery.layout.js b/public/includes/jquery/plugins/layout/jquery.layout.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/layout/jquery.layout.js
rename to public/includes/jquery/plugins/layout/jquery.layout.js
diff --git a/htdocs/includes/jquery/plugins/layout/jquery.layout.min.js b/public/includes/jquery/plugins/layout/jquery.layout.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/layout/jquery.layout.min.js
rename to public/includes/jquery/plugins/layout/jquery.layout.min.js
diff --git a/htdocs/includes/jquery/plugins/mobile/images/ajax-loader.gif b/public/includes/jquery/plugins/mobile/images/ajax-loader.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/mobile/images/ajax-loader.gif
rename to public/includes/jquery/plugins/mobile/images/ajax-loader.gif
diff --git a/htdocs/includes/jquery/plugins/mobile/images/icons-18-black.png b/public/includes/jquery/plugins/mobile/images/icons-18-black.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/mobile/images/icons-18-black.png
rename to public/includes/jquery/plugins/mobile/images/icons-18-black.png
diff --git a/htdocs/includes/jquery/plugins/mobile/images/icons-18-white.png b/public/includes/jquery/plugins/mobile/images/icons-18-white.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/mobile/images/icons-18-white.png
rename to public/includes/jquery/plugins/mobile/images/icons-18-white.png
diff --git a/htdocs/includes/jquery/plugins/mobile/images/icons-36-black.png b/public/includes/jquery/plugins/mobile/images/icons-36-black.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/mobile/images/icons-36-black.png
rename to public/includes/jquery/plugins/mobile/images/icons-36-black.png
diff --git a/htdocs/includes/jquery/plugins/mobile/images/icons-36-white.png b/public/includes/jquery/plugins/mobile/images/icons-36-white.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/mobile/images/icons-36-white.png
rename to public/includes/jquery/plugins/mobile/images/icons-36-white.png
diff --git a/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.css b/public/includes/jquery/plugins/mobile/jquery.mobile-latest.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.css
rename to public/includes/jquery/plugins/mobile/jquery.mobile-latest.css
diff --git a/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.js b/public/includes/jquery/plugins/mobile/jquery.mobile-latest.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.js
rename to public/includes/jquery/plugins/mobile/jquery.mobile-latest.js
diff --git a/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css b/public/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css
rename to public/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css
diff --git a/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js b/public/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
rename to public/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
diff --git a/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt b/public/includes/jquery/plugins/multiselect/MIT-LICENSE.txt
similarity index 100%
rename from htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt
rename to public/includes/jquery/plugins/multiselect/MIT-LICENSE.txt
diff --git a/htdocs/includes/jquery/plugins/multiselect/css/ui.multiselect.css b/public/includes/jquery/plugins/multiselect/css/ui.multiselect.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/multiselect/css/ui.multiselect.css
rename to public/includes/jquery/plugins/multiselect/css/ui.multiselect.css
diff --git a/htdocs/includes/jquery/plugins/multiselect/js/ui.multiselect.js b/public/includes/jquery/plugins/multiselect/js/ui.multiselect.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/multiselect/js/ui.multiselect.js
rename to public/includes/jquery/plugins/multiselect/js/ui.multiselect.js
diff --git a/htdocs/includes/jquery/plugins/select2/.gitignore b/public/includes/jquery/plugins/select2/.gitignore
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/.gitignore
rename to public/includes/jquery/plugins/select2/.gitignore
diff --git a/htdocs/includes/jquery/plugins/select2/CONTRIBUTING.md b/public/includes/jquery/plugins/select2/CONTRIBUTING.md
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/CONTRIBUTING.md
rename to public/includes/jquery/plugins/select2/CONTRIBUTING.md
diff --git a/htdocs/includes/jquery/plugins/select2/LICENSE b/public/includes/jquery/plugins/select2/LICENSE
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/LICENSE
rename to public/includes/jquery/plugins/select2/LICENSE
diff --git a/htdocs/includes/jquery/plugins/select2/README.md b/public/includes/jquery/plugins/select2/README.md
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/README.md
rename to public/includes/jquery/plugins/select2/README.md
diff --git a/htdocs/includes/jquery/plugins/select2/bower.json b/public/includes/jquery/plugins/select2/bower.json
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/bower.json
rename to public/includes/jquery/plugins/select2/bower.json
diff --git a/htdocs/includes/jquery/plugins/select2/component.json b/public/includes/jquery/plugins/select2/component.json
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/component.json
rename to public/includes/jquery/plugins/select2/component.json
diff --git a/htdocs/includes/jquery/plugins/select2/composer.json b/public/includes/jquery/plugins/select2/composer.json
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/composer.json
rename to public/includes/jquery/plugins/select2/composer.json
diff --git a/htdocs/includes/jquery/plugins/select2/package.json b/public/includes/jquery/plugins/select2/package.json
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/package.json
rename to public/includes/jquery/plugins/select2/package.json
diff --git a/htdocs/includes/jquery/plugins/select2/release.sh b/public/includes/jquery/plugins/select2/release.sh
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/release.sh
rename to public/includes/jquery/plugins/select2/release.sh
diff --git a/htdocs/includes/jquery/plugins/select2/select2-bootstrap.css b/public/includes/jquery/plugins/select2/select2-bootstrap.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2-bootstrap.css
rename to public/includes/jquery/plugins/select2/select2-bootstrap.css
diff --git a/htdocs/includes/jquery/plugins/select2/select2-spinner.gif b/public/includes/jquery/plugins/select2/select2-spinner.gif
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2-spinner.gif
rename to public/includes/jquery/plugins/select2/select2-spinner.gif
diff --git a/htdocs/includes/jquery/plugins/select2/select2.css b/public/includes/jquery/plugins/select2/select2.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2.css
rename to public/includes/jquery/plugins/select2/select2.css
diff --git a/htdocs/includes/jquery/plugins/select2/select2.jquery.json b/public/includes/jquery/plugins/select2/select2.jquery.json
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2.jquery.json
rename to public/includes/jquery/plugins/select2/select2.jquery.json
diff --git a/htdocs/includes/jquery/plugins/select2/select2.js b/public/includes/jquery/plugins/select2/select2.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2.js
rename to public/includes/jquery/plugins/select2/select2.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2.min.js b/public/includes/jquery/plugins/select2/select2.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2.min.js
rename to public/includes/jquery/plugins/select2/select2.min.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2.png b/public/includes/jquery/plugins/select2/select2.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2.png
rename to public/includes/jquery/plugins/select2/select2.png
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ar.js b/public/includes/jquery/plugins/select2/select2_locale_ar.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_ar.js
rename to public/includes/jquery/plugins/select2/select2_locale_ar.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_az.js b/public/includes/jquery/plugins/select2/select2_locale_az.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_az.js
rename to public/includes/jquery/plugins/select2/select2_locale_az.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_bg.js b/public/includes/jquery/plugins/select2/select2_locale_bg.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_bg.js
rename to public/includes/jquery/plugins/select2/select2_locale_bg.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ca.js b/public/includes/jquery/plugins/select2/select2_locale_ca.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_ca.js
rename to public/includes/jquery/plugins/select2/select2_locale_ca.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_cs.js b/public/includes/jquery/plugins/select2/select2_locale_cs.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_cs.js
rename to public/includes/jquery/plugins/select2/select2_locale_cs.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_da.js b/public/includes/jquery/plugins/select2/select2_locale_da.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_da.js
rename to public/includes/jquery/plugins/select2/select2_locale_da.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_de.js b/public/includes/jquery/plugins/select2/select2_locale_de.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_de.js
rename to public/includes/jquery/plugins/select2/select2_locale_de.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_el.js b/public/includes/jquery/plugins/select2/select2_locale_el.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_el.js
rename to public/includes/jquery/plugins/select2/select2_locale_el.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_en.js.template b/public/includes/jquery/plugins/select2/select2_locale_en.js.template
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_en.js.template
rename to public/includes/jquery/plugins/select2/select2_locale_en.js.template
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_es.js b/public/includes/jquery/plugins/select2/select2_locale_es.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_es.js
rename to public/includes/jquery/plugins/select2/select2_locale_es.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_et.js b/public/includes/jquery/plugins/select2/select2_locale_et.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_et.js
rename to public/includes/jquery/plugins/select2/select2_locale_et.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_eu.js b/public/includes/jquery/plugins/select2/select2_locale_eu.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_eu.js
rename to public/includes/jquery/plugins/select2/select2_locale_eu.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_fa.js b/public/includes/jquery/plugins/select2/select2_locale_fa.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_fa.js
rename to public/includes/jquery/plugins/select2/select2_locale_fa.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_fi.js b/public/includes/jquery/plugins/select2/select2_locale_fi.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_fi.js
rename to public/includes/jquery/plugins/select2/select2_locale_fi.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_fr.js b/public/includes/jquery/plugins/select2/select2_locale_fr.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_fr.js
rename to public/includes/jquery/plugins/select2/select2_locale_fr.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_gl.js b/public/includes/jquery/plugins/select2/select2_locale_gl.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_gl.js
rename to public/includes/jquery/plugins/select2/select2_locale_gl.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_he.js b/public/includes/jquery/plugins/select2/select2_locale_he.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_he.js
rename to public/includes/jquery/plugins/select2/select2_locale_he.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_hr.js b/public/includes/jquery/plugins/select2/select2_locale_hr.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_hr.js
rename to public/includes/jquery/plugins/select2/select2_locale_hr.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_hu.js b/public/includes/jquery/plugins/select2/select2_locale_hu.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_hu.js
rename to public/includes/jquery/plugins/select2/select2_locale_hu.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_id.js b/public/includes/jquery/plugins/select2/select2_locale_id.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_id.js
rename to public/includes/jquery/plugins/select2/select2_locale_id.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_is.js b/public/includes/jquery/plugins/select2/select2_locale_is.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_is.js
rename to public/includes/jquery/plugins/select2/select2_locale_is.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_it.js b/public/includes/jquery/plugins/select2/select2_locale_it.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_it.js
rename to public/includes/jquery/plugins/select2/select2_locale_it.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ja.js b/public/includes/jquery/plugins/select2/select2_locale_ja.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_ja.js
rename to public/includes/jquery/plugins/select2/select2_locale_ja.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ka.js b/public/includes/jquery/plugins/select2/select2_locale_ka.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_ka.js
rename to public/includes/jquery/plugins/select2/select2_locale_ka.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ko.js b/public/includes/jquery/plugins/select2/select2_locale_ko.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_ko.js
rename to public/includes/jquery/plugins/select2/select2_locale_ko.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_lt.js b/public/includes/jquery/plugins/select2/select2_locale_lt.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_lt.js
rename to public/includes/jquery/plugins/select2/select2_locale_lt.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_lv.js b/public/includes/jquery/plugins/select2/select2_locale_lv.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_lv.js
rename to public/includes/jquery/plugins/select2/select2_locale_lv.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_mk.js b/public/includes/jquery/plugins/select2/select2_locale_mk.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_mk.js
rename to public/includes/jquery/plugins/select2/select2_locale_mk.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ms.js b/public/includes/jquery/plugins/select2/select2_locale_ms.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_ms.js
rename to public/includes/jquery/plugins/select2/select2_locale_ms.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_nb.js b/public/includes/jquery/plugins/select2/select2_locale_nb.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_nb.js
rename to public/includes/jquery/plugins/select2/select2_locale_nb.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_nl.js b/public/includes/jquery/plugins/select2/select2_locale_nl.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_nl.js
rename to public/includes/jquery/plugins/select2/select2_locale_nl.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_pl.js b/public/includes/jquery/plugins/select2/select2_locale_pl.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_pl.js
rename to public/includes/jquery/plugins/select2/select2_locale_pl.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_pt-BR.js b/public/includes/jquery/plugins/select2/select2_locale_pt-BR.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_pt-BR.js
rename to public/includes/jquery/plugins/select2/select2_locale_pt-BR.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_pt-PT.js b/public/includes/jquery/plugins/select2/select2_locale_pt-PT.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_pt-PT.js
rename to public/includes/jquery/plugins/select2/select2_locale_pt-PT.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ro.js b/public/includes/jquery/plugins/select2/select2_locale_ro.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_ro.js
rename to public/includes/jquery/plugins/select2/select2_locale_ro.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_rs.js b/public/includes/jquery/plugins/select2/select2_locale_rs.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_rs.js
rename to public/includes/jquery/plugins/select2/select2_locale_rs.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ru.js b/public/includes/jquery/plugins/select2/select2_locale_ru.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_ru.js
rename to public/includes/jquery/plugins/select2/select2_locale_ru.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_sk.js b/public/includes/jquery/plugins/select2/select2_locale_sk.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_sk.js
rename to public/includes/jquery/plugins/select2/select2_locale_sk.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_sv.js b/public/includes/jquery/plugins/select2/select2_locale_sv.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_sv.js
rename to public/includes/jquery/plugins/select2/select2_locale_sv.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_th.js b/public/includes/jquery/plugins/select2/select2_locale_th.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_th.js
rename to public/includes/jquery/plugins/select2/select2_locale_th.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_tr.js b/public/includes/jquery/plugins/select2/select2_locale_tr.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_tr.js
rename to public/includes/jquery/plugins/select2/select2_locale_tr.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_ug-CN.js b/public/includes/jquery/plugins/select2/select2_locale_ug-CN.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_ug-CN.js
rename to public/includes/jquery/plugins/select2/select2_locale_ug-CN.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_uk.js b/public/includes/jquery/plugins/select2/select2_locale_uk.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_uk.js
rename to public/includes/jquery/plugins/select2/select2_locale_uk.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_vi.js b/public/includes/jquery/plugins/select2/select2_locale_vi.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_vi.js
rename to public/includes/jquery/plugins/select2/select2_locale_vi.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_zh-CN.js b/public/includes/jquery/plugins/select2/select2_locale_zh-CN.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_zh-CN.js
rename to public/includes/jquery/plugins/select2/select2_locale_zh-CN.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2_locale_zh-TW.js b/public/includes/jquery/plugins/select2/select2_locale_zh-TW.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2_locale_zh-TW.js
rename to public/includes/jquery/plugins/select2/select2_locale_zh-TW.js
diff --git a/htdocs/includes/jquery/plugins/select2/select2x2.png b/public/includes/jquery/plugins/select2/select2x2.png
similarity index 100%
rename from htdocs/includes/jquery/plugins/select2/select2x2.png
rename to public/includes/jquery/plugins/select2/select2x2.png
diff --git a/htdocs/includes/jquery/plugins/tablednd/README.txt b/public/includes/jquery/plugins/tablednd/README.txt
similarity index 100%
rename from htdocs/includes/jquery/plugins/tablednd/README.txt
rename to public/includes/jquery/plugins/tablednd/README.txt
diff --git a/htdocs/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.js b/public/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.js
rename to public/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.js
diff --git a/htdocs/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js b/public/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js
rename to public/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js
diff --git a/htdocs/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css b/public/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css
rename to public/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css
diff --git a/htdocs/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js b/public/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js
rename to public/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js
diff --git a/htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.js b/public/includes/jquery/plugins/tiptip/jquery.tipTip.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.js
rename to public/includes/jquery/plugins/tiptip/jquery.tipTip.js
diff --git a/htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.min.js b/public/includes/jquery/plugins/tiptip/jquery.tipTip.min.js
similarity index 100%
rename from htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.min.js
rename to public/includes/jquery/plugins/tiptip/jquery.tipTip.min.js
diff --git a/htdocs/includes/jquery/plugins/tiptip/tipTip.css b/public/includes/jquery/plugins/tiptip/tipTip.css
similarity index 100%
rename from htdocs/includes/jquery/plugins/tiptip/tipTip.css
rename to public/includes/jquery/plugins/tiptip/tipTip.css
diff --git a/htdocs/includes/jsgantt/index.htm b/public/includes/jsgantt/index.htm
similarity index 100%
rename from htdocs/includes/jsgantt/index.htm
rename to public/includes/jsgantt/index.htm
diff --git a/htdocs/includes/jsgantt/jsgantt.css b/public/includes/jsgantt/jsgantt.css
similarity index 100%
rename from htdocs/includes/jsgantt/jsgantt.css
rename to public/includes/jsgantt/jsgantt.css
diff --git a/htdocs/includes/jsgantt/jsgantt.js b/public/includes/jsgantt/jsgantt.js
similarity index 100%
rename from htdocs/includes/jsgantt/jsgantt.js
rename to public/includes/jsgantt/jsgantt.js
diff --git a/htdocs/includes/jsgantt/jsgantt.min.js b/public/includes/jsgantt/jsgantt.min.js
similarity index 100%
rename from htdocs/includes/jsgantt/jsgantt.min.js
rename to public/includes/jsgantt/jsgantt.min.js
diff --git a/htdocs/includes/jsgantt/jsgantt_Minutes.html b/public/includes/jsgantt/jsgantt_Minutes.html
similarity index 100%
rename from htdocs/includes/jsgantt/jsgantt_Minutes.html
rename to public/includes/jsgantt/jsgantt_Minutes.html
diff --git a/htdocs/includes/jsgantt/jsgantt_exExternalXML.html b/public/includes/jsgantt/jsgantt_exExternalXML.html
similarity index 100%
rename from htdocs/includes/jsgantt/jsgantt_exExternalXML.html
rename to public/includes/jsgantt/jsgantt_exExternalXML.html
diff --git a/htdocs/includes/jsgantt/project.xml b/public/includes/jsgantt/project.xml
similarity index 100%
rename from htdocs/includes/jsgantt/project.xml
rename to public/includes/jsgantt/project.xml
diff --git a/htdocs/includes/jstz/jstz.js b/public/includes/jstz/jstz.js
similarity index 100%
rename from htdocs/includes/jstz/jstz.js
rename to public/includes/jstz/jstz.js
diff --git a/htdocs/includes/jstz/jstz.min.js b/public/includes/jstz/jstz.min.js
similarity index 100%
rename from htdocs/includes/jstz/jstz.min.js
rename to public/includes/jstz/jstz.min.js
diff --git a/htdocs/includes/mike42/escpos-php/.gitignore b/public/includes/mike42/escpos-php/.gitignore
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/.gitignore
rename to public/includes/mike42/escpos-php/.gitignore
diff --git a/htdocs/includes/mike42/escpos-php/Escpos.php b/public/includes/mike42/escpos-php/Escpos.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/Escpos.php
rename to public/includes/mike42/escpos-php/Escpos.php
diff --git a/htdocs/includes/mike42/escpos-php/LICENSE.md b/public/includes/mike42/escpos-php/LICENSE.md
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/LICENSE.md
rename to public/includes/mike42/escpos-php/LICENSE.md
diff --git a/htdocs/includes/mike42/escpos-php/README.md b/public/includes/mike42/escpos-php/README.md
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/README.md
rename to public/includes/mike42/escpos-php/README.md
diff --git a/htdocs/includes/mike42/escpos-php/composer.json b/public/includes/mike42/escpos-php/composer.json
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/composer.json
rename to public/includes/mike42/escpos-php/composer.json
diff --git a/htdocs/includes/mike42/escpos-php/composer.lock b/public/includes/mike42/escpos-php/composer.lock
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/composer.lock
rename to public/includes/mike42/escpos-php/composer.lock
diff --git a/htdocs/includes/mike42/escpos-php/doc/Makefile b/public/includes/mike42/escpos-php/doc/Makefile
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/doc/Makefile
rename to public/includes/mike42/escpos-php/doc/Makefile
diff --git a/htdocs/includes/mike42/escpos-php/doc/escpos.conf b/public/includes/mike42/escpos-php/doc/escpos.conf
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/doc/escpos.conf
rename to public/includes/mike42/escpos-php/doc/escpos.conf
diff --git a/htdocs/includes/mike42/escpos-php/example/README.md b/public/includes/mike42/escpos-php/example/README.md
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/README.md
rename to public/includes/mike42/escpos-php/example/README.md
diff --git a/htdocs/includes/mike42/escpos-php/example/barcode.php b/public/includes/mike42/escpos-php/example/barcode.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/barcode.php
rename to public/includes/mike42/escpos-php/example/barcode.php
diff --git a/htdocs/includes/mike42/escpos-php/example/bit-image.php b/public/includes/mike42/escpos-php/example/bit-image.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/bit-image.php
rename to public/includes/mike42/escpos-php/example/bit-image.php
diff --git a/htdocs/includes/mike42/escpos-php/example/character-encodings-with-images.php b/public/includes/mike42/escpos-php/example/character-encodings-with-images.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/character-encodings-with-images.php
rename to public/includes/mike42/escpos-php/example/character-encodings-with-images.php
diff --git a/htdocs/includes/mike42/escpos-php/example/character-encodings.php b/public/includes/mike42/escpos-php/example/character-encodings.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/character-encodings.php
rename to public/includes/mike42/escpos-php/example/character-encodings.php
diff --git a/htdocs/includes/mike42/escpos-php/example/character-tables.php b/public/includes/mike42/escpos-php/example/character-tables.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/character-tables.php
rename to public/includes/mike42/escpos-php/example/character-tables.php
diff --git a/htdocs/includes/mike42/escpos-php/example/demo.php b/public/includes/mike42/escpos-php/example/demo.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/demo.php
rename to public/includes/mike42/escpos-php/example/demo.php
diff --git a/htdocs/includes/mike42/escpos-php/example/graphics.php b/public/includes/mike42/escpos-php/example/graphics.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/graphics.php
rename to public/includes/mike42/escpos-php/example/graphics.php
diff --git a/htdocs/includes/mike42/escpos-php/example/interface/README.md b/public/includes/mike42/escpos-php/example/interface/README.md
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/interface/README.md
rename to public/includes/mike42/escpos-php/example/interface/README.md
diff --git a/htdocs/includes/mike42/escpos-php/example/interface/ethernet.php b/public/includes/mike42/escpos-php/example/interface/ethernet.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/interface/ethernet.php
rename to public/includes/mike42/escpos-php/example/interface/ethernet.php
diff --git a/htdocs/includes/mike42/escpos-php/example/interface/linux-usb.php b/public/includes/mike42/escpos-php/example/interface/linux-usb.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/interface/linux-usb.php
rename to public/includes/mike42/escpos-php/example/interface/linux-usb.php
diff --git a/htdocs/includes/mike42/escpos-php/example/interface/smb.php b/public/includes/mike42/escpos-php/example/interface/smb.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/interface/smb.php
rename to public/includes/mike42/escpos-php/example/interface/smb.php
diff --git a/htdocs/includes/mike42/escpos-php/example/interface/windows-lpt.php b/public/includes/mike42/escpos-php/example/interface/windows-lpt.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/interface/windows-lpt.php
rename to public/includes/mike42/escpos-php/example/interface/windows-lpt.php
diff --git a/htdocs/includes/mike42/escpos-php/example/interface/windows-usb.php b/public/includes/mike42/escpos-php/example/interface/windows-usb.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/interface/windows-usb.php
rename to public/includes/mike42/escpos-php/example/interface/windows-usb.php
diff --git a/htdocs/includes/mike42/escpos-php/example/print-from-html.php b/public/includes/mike42/escpos-php/example/print-from-html.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/print-from-html.php
rename to public/includes/mike42/escpos-php/example/print-from-html.php
diff --git a/htdocs/includes/mike42/escpos-php/example/print-from-pdf.php b/public/includes/mike42/escpos-php/example/print-from-pdf.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/print-from-pdf.php
rename to public/includes/mike42/escpos-php/example/print-from-pdf.php
diff --git a/htdocs/includes/mike42/escpos-php/example/qr-code.php b/public/includes/mike42/escpos-php/example/qr-code.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/qr-code.php
rename to public/includes/mike42/escpos-php/example/qr-code.php
diff --git a/htdocs/includes/mike42/escpos-php/example/receipt-with-logo.php b/public/includes/mike42/escpos-php/example/receipt-with-logo.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/receipt-with-logo.php
rename to public/includes/mike42/escpos-php/example/receipt-with-logo.php
diff --git a/htdocs/includes/mike42/escpos-php/example/resources/character-encoding-test-strings.inc b/public/includes/mike42/escpos-php/example/resources/character-encoding-test-strings.inc
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/resources/character-encoding-test-strings.inc
rename to public/includes/mike42/escpos-php/example/resources/character-encoding-test-strings.inc
diff --git a/htdocs/includes/mike42/escpos-php/example/resources/document.odt b/public/includes/mike42/escpos-php/example/resources/document.odt
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/resources/document.odt
rename to public/includes/mike42/escpos-php/example/resources/document.odt
diff --git a/htdocs/includes/mike42/escpos-php/example/resources/document.pdf b/public/includes/mike42/escpos-php/example/resources/document.pdf
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/resources/document.pdf
rename to public/includes/mike42/escpos-php/example/resources/document.pdf
diff --git a/htdocs/includes/mike42/escpos-php/example/resources/document.z b/public/includes/mike42/escpos-php/example/resources/document.z
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/resources/document.z
rename to public/includes/mike42/escpos-php/example/resources/document.z
diff --git a/htdocs/includes/mike42/escpos-php/example/resources/escpos-php-small.png b/public/includes/mike42/escpos-php/example/resources/escpos-php-small.png
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/resources/escpos-php-small.png
rename to public/includes/mike42/escpos-php/example/resources/escpos-php-small.png
diff --git a/htdocs/includes/mike42/escpos-php/example/resources/escpos-php.png b/public/includes/mike42/escpos-php/example/resources/escpos-php.png
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/resources/escpos-php.png
rename to public/includes/mike42/escpos-php/example/resources/escpos-php.png
diff --git a/htdocs/includes/mike42/escpos-php/example/resources/tux.png b/public/includes/mike42/escpos-php/example/resources/tux.png
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/resources/tux.png
rename to public/includes/mike42/escpos-php/example/resources/tux.png
diff --git a/htdocs/includes/mike42/escpos-php/example/specific/29-latvian-star-tup592.php b/public/includes/mike42/escpos-php/example/specific/29-latvian-star-tup592.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/specific/29-latvian-star-tup592.php
rename to public/includes/mike42/escpos-php/example/specific/29-latvian-star-tup592.php
diff --git a/htdocs/includes/mike42/escpos-php/example/specific/32-german-tm-t20-ii-custom-command.php b/public/includes/mike42/escpos-php/example/specific/32-german-tm-t20-ii-custom-command.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/specific/32-german-tm-t20-ii-custom-command.php
rename to public/includes/mike42/escpos-php/example/specific/32-german-tm-t20-ii-custom-command.php
diff --git a/htdocs/includes/mike42/escpos-php/example/specific/33-spanish-seypos-prp-300.php b/public/includes/mike42/escpos-php/example/specific/33-spanish-seypos-prp-300.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/specific/33-spanish-seypos-prp-300.php
rename to public/includes/mike42/escpos-php/example/specific/33-spanish-seypos-prp-300.php
diff --git a/htdocs/includes/mike42/escpos-php/example/specific/39-currency-symbols.php b/public/includes/mike42/escpos-php/example/specific/39-currency-symbols.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/specific/39-currency-symbols.php
rename to public/includes/mike42/escpos-php/example/specific/39-currency-symbols.php
diff --git a/htdocs/includes/mike42/escpos-php/example/specific/44-pound-symbol-star-tsp650.php b/public/includes/mike42/escpos-php/example/specific/44-pound-symbol-star-tsp650.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/specific/44-pound-symbol-star-tsp650.php
rename to public/includes/mike42/escpos-php/example/specific/44-pound-symbol-star-tsp650.php
diff --git a/htdocs/includes/mike42/escpos-php/example/specific/50-P-822D-greek.php b/public/includes/mike42/escpos-php/example/specific/50-P-822D-greek.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/specific/50-P-822D-greek.php
rename to public/includes/mike42/escpos-php/example/specific/50-P-822D-greek.php
diff --git a/htdocs/includes/mike42/escpos-php/example/specific/54-gfx-sidebyside.php b/public/includes/mike42/escpos-php/example/specific/54-gfx-sidebyside.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/specific/54-gfx-sidebyside.php
rename to public/includes/mike42/escpos-php/example/specific/54-gfx-sidebyside.php
diff --git a/htdocs/includes/mike42/escpos-php/example/specific/6-arabic-epos-tep-220m.php b/public/includes/mike42/escpos-php/example/specific/6-arabic-epos-tep-220m.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/specific/6-arabic-epos-tep-220m.php
rename to public/includes/mike42/escpos-php/example/specific/6-arabic-epos-tep-220m.php
diff --git a/htdocs/includes/mike42/escpos-php/example/specific/README.md b/public/includes/mike42/escpos-php/example/specific/README.md
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/specific/README.md
rename to public/includes/mike42/escpos-php/example/specific/README.md
diff --git a/htdocs/includes/mike42/escpos-php/example/text-size.php b/public/includes/mike42/escpos-php/example/text-size.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/example/text-size.php
rename to public/includes/mike42/escpos-php/example/text-size.php
diff --git a/htdocs/includes/mike42/escpos-php/src/AbstractCapabilityProfile.php b/public/includes/mike42/escpos-php/src/AbstractCapabilityProfile.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/AbstractCapabilityProfile.php
rename to public/includes/mike42/escpos-php/src/AbstractCapabilityProfile.php
diff --git a/htdocs/includes/mike42/escpos-php/src/CodePage.php b/public/includes/mike42/escpos-php/src/CodePage.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/CodePage.php
rename to public/includes/mike42/escpos-php/src/CodePage.php
diff --git a/htdocs/includes/mike42/escpos-php/src/DefaultCapabilityProfile.php b/public/includes/mike42/escpos-php/src/DefaultCapabilityProfile.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/DefaultCapabilityProfile.php
rename to public/includes/mike42/escpos-php/src/DefaultCapabilityProfile.php
diff --git a/htdocs/includes/mike42/escpos-php/src/DummyPrintConnector.php b/public/includes/mike42/escpos-php/src/DummyPrintConnector.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/DummyPrintConnector.php
rename to public/includes/mike42/escpos-php/src/DummyPrintConnector.php
diff --git a/htdocs/includes/mike42/escpos-php/src/EposTepCapabilityProfile.php b/public/includes/mike42/escpos-php/src/EposTepCapabilityProfile.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/EposTepCapabilityProfile.php
rename to public/includes/mike42/escpos-php/src/EposTepCapabilityProfile.php
diff --git a/htdocs/includes/mike42/escpos-php/src/EscposImage.php b/public/includes/mike42/escpos-php/src/EscposImage.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/EscposImage.php
rename to public/includes/mike42/escpos-php/src/EscposImage.php
diff --git a/htdocs/includes/mike42/escpos-php/src/EscposPrintBuffer.php b/public/includes/mike42/escpos-php/src/EscposPrintBuffer.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/EscposPrintBuffer.php
rename to public/includes/mike42/escpos-php/src/EscposPrintBuffer.php
diff --git a/htdocs/includes/mike42/escpos-php/src/FilePrintConnector.php b/public/includes/mike42/escpos-php/src/FilePrintConnector.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/FilePrintConnector.php
rename to public/includes/mike42/escpos-php/src/FilePrintConnector.php
diff --git a/htdocs/includes/mike42/escpos-php/src/ImagePrintBuffer.php b/public/includes/mike42/escpos-php/src/ImagePrintBuffer.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/ImagePrintBuffer.php
rename to public/includes/mike42/escpos-php/src/ImagePrintBuffer.php
diff --git a/htdocs/includes/mike42/escpos-php/src/NetworkPrintConnector.php b/public/includes/mike42/escpos-php/src/NetworkPrintConnector.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/NetworkPrintConnector.php
rename to public/includes/mike42/escpos-php/src/NetworkPrintConnector.php
diff --git a/htdocs/includes/mike42/escpos-php/src/P822DCapabilityProfile.php b/public/includes/mike42/escpos-php/src/P822DCapabilityProfile.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/P822DCapabilityProfile.php
rename to public/includes/mike42/escpos-php/src/P822DCapabilityProfile.php
diff --git a/htdocs/includes/mike42/escpos-php/src/PrintBuffer.php b/public/includes/mike42/escpos-php/src/PrintBuffer.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/PrintBuffer.php
rename to public/includes/mike42/escpos-php/src/PrintBuffer.php
diff --git a/htdocs/includes/mike42/escpos-php/src/PrintConnector.php b/public/includes/mike42/escpos-php/src/PrintConnector.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/PrintConnector.php
rename to public/includes/mike42/escpos-php/src/PrintConnector.php
diff --git a/htdocs/includes/mike42/escpos-php/src/SimpleCapabilityProfile.php b/public/includes/mike42/escpos-php/src/SimpleCapabilityProfile.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/SimpleCapabilityProfile.php
rename to public/includes/mike42/escpos-php/src/SimpleCapabilityProfile.php
diff --git a/htdocs/includes/mike42/escpos-php/src/StarCapabilityProfile.php b/public/includes/mike42/escpos-php/src/StarCapabilityProfile.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/StarCapabilityProfile.php
rename to public/includes/mike42/escpos-php/src/StarCapabilityProfile.php
diff --git a/htdocs/includes/mike42/escpos-php/src/WindowsPrintConnector.php b/public/includes/mike42/escpos-php/src/WindowsPrintConnector.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/WindowsPrintConnector.php
rename to public/includes/mike42/escpos-php/src/WindowsPrintConnector.php
diff --git a/htdocs/includes/mike42/escpos-php/src/cache/Characters-DefaultCapabilityProfile.ser.gz b/public/includes/mike42/escpos-php/src/cache/Characters-DefaultCapabilityProfile.ser.gz
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/cache/Characters-DefaultCapabilityProfile.ser.gz
rename to public/includes/mike42/escpos-php/src/cache/Characters-DefaultCapabilityProfile.ser.gz
diff --git a/htdocs/includes/mike42/escpos-php/src/cache/Characters-SimpleCapabilityProfile.ser.gz b/public/includes/mike42/escpos-php/src/cache/Characters-SimpleCapabilityProfile.ser.gz
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/cache/Characters-SimpleCapabilityProfile.ser.gz
rename to public/includes/mike42/escpos-php/src/cache/Characters-SimpleCapabilityProfile.ser.gz
diff --git a/htdocs/includes/mike42/escpos-php/src/cache/Characters-StarCapabilityProfile.ser.gz b/public/includes/mike42/escpos-php/src/cache/Characters-StarCapabilityProfile.ser.gz
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/src/cache/Characters-StarCapabilityProfile.ser.gz
rename to public/includes/mike42/escpos-php/src/cache/Characters-StarCapabilityProfile.ser.gz
diff --git a/htdocs/includes/mike42/escpos-php/test/bootstrap.php b/public/includes/mike42/escpos-php/test/bootstrap.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/bootstrap.php
rename to public/includes/mike42/escpos-php/test/bootstrap.php
diff --git a/htdocs/includes/mike42/escpos-php/test/integration/ExampleTest.php b/public/includes/mike42/escpos-php/test/integration/ExampleTest.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/integration/ExampleTest.php
rename to public/includes/mike42/escpos-php/test/integration/ExampleTest.php
diff --git a/htdocs/includes/mike42/escpos-php/test/integration/resources/output/barcode.bin b/public/includes/mike42/escpos-php/test/integration/resources/output/barcode.bin
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/integration/resources/output/barcode.bin
rename to public/includes/mike42/escpos-php/test/integration/resources/output/barcode.bin
diff --git a/htdocs/includes/mike42/escpos-php/test/integration/resources/output/bit-image.bin b/public/includes/mike42/escpos-php/test/integration/resources/output/bit-image.bin
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/integration/resources/output/bit-image.bin
rename to public/includes/mike42/escpos-php/test/integration/resources/output/bit-image.bin
diff --git a/htdocs/includes/mike42/escpos-php/test/integration/resources/output/character-encodings.bin b/public/includes/mike42/escpos-php/test/integration/resources/output/character-encodings.bin
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/integration/resources/output/character-encodings.bin
rename to public/includes/mike42/escpos-php/test/integration/resources/output/character-encodings.bin
diff --git a/htdocs/includes/mike42/escpos-php/test/integration/resources/output/character-tables.bin b/public/includes/mike42/escpos-php/test/integration/resources/output/character-tables.bin
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/integration/resources/output/character-tables.bin
rename to public/includes/mike42/escpos-php/test/integration/resources/output/character-tables.bin
diff --git a/htdocs/includes/mike42/escpos-php/test/integration/resources/output/demo.bin b/public/includes/mike42/escpos-php/test/integration/resources/output/demo.bin
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/integration/resources/output/demo.bin
rename to public/includes/mike42/escpos-php/test/integration/resources/output/demo.bin
diff --git a/htdocs/includes/mike42/escpos-php/test/integration/resources/output/graphics.bin b/public/includes/mike42/escpos-php/test/integration/resources/output/graphics.bin
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/integration/resources/output/graphics.bin
rename to public/includes/mike42/escpos-php/test/integration/resources/output/graphics.bin
diff --git a/htdocs/includes/mike42/escpos-php/test/integration/resources/output/interface.bin b/public/includes/mike42/escpos-php/test/integration/resources/output/interface.bin
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/integration/resources/output/interface.bin
rename to public/includes/mike42/escpos-php/test/integration/resources/output/interface.bin
diff --git a/htdocs/includes/mike42/escpos-php/test/integration/resources/output/print-from-pdf.bin.z b/public/includes/mike42/escpos-php/test/integration/resources/output/print-from-pdf.bin.z
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/integration/resources/output/print-from-pdf.bin.z
rename to public/includes/mike42/escpos-php/test/integration/resources/output/print-from-pdf.bin.z
diff --git a/htdocs/includes/mike42/escpos-php/test/integration/resources/output/qr-code.bin b/public/includes/mike42/escpos-php/test/integration/resources/output/qr-code.bin
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/integration/resources/output/qr-code.bin
rename to public/includes/mike42/escpos-php/test/integration/resources/output/qr-code.bin
diff --git a/htdocs/includes/mike42/escpos-php/test/integration/resources/output/receipt-with-logo.bin b/public/includes/mike42/escpos-php/test/integration/resources/output/receipt-with-logo.bin
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/integration/resources/output/receipt-with-logo.bin
rename to public/includes/mike42/escpos-php/test/integration/resources/output/receipt-with-logo.bin
diff --git a/htdocs/includes/mike42/escpos-php/test/integration/resources/output/text-size.bin b/public/includes/mike42/escpos-php/test/integration/resources/output/text-size.bin
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/integration/resources/output/text-size.bin
rename to public/includes/mike42/escpos-php/test/integration/resources/output/text-size.bin
diff --git a/htdocs/includes/mike42/escpos-php/test/phpunit.xml b/public/includes/mike42/escpos-php/test/phpunit.xml
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/phpunit.xml
rename to public/includes/mike42/escpos-php/test/phpunit.xml
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/AbstractCapabilityProfileTest.php b/public/includes/mike42/escpos-php/test/unit/AbstractCapabilityProfileTest.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/AbstractCapabilityProfileTest.php
rename to public/includes/mike42/escpos-php/test/unit/AbstractCapabilityProfileTest.php
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/EscposImageTest.php b/public/includes/mike42/escpos-php/test/unit/EscposImageTest.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/EscposImageTest.php
rename to public/includes/mike42/escpos-php/test/unit/EscposImageTest.php
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/EscposPrintBufferTest.php b/public/includes/mike42/escpos-php/test/unit/EscposPrintBufferTest.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/EscposPrintBufferTest.php
rename to public/includes/mike42/escpos-php/test/unit/EscposPrintBufferTest.php
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/EscposTest.php b/public/includes/mike42/escpos-php/test/unit/EscposTest.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/EscposTest.php
rename to public/includes/mike42/escpos-php/test/unit/EscposTest.php
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/WindowsPrintConnectorTest.php b/public/includes/mike42/escpos-php/test/unit/WindowsPrintConnectorTest.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/WindowsPrintConnectorTest.php
rename to public/includes/mike42/escpos-php/test/unit/WindowsPrintConnectorTest.php
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/black_transparent.gif b/public/includes/mike42/escpos-php/test/unit/resources/black_transparent.gif
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/black_transparent.gif
rename to public/includes/mike42/escpos-php/test/unit/resources/black_transparent.gif
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/black_transparent.png b/public/includes/mike42/escpos-php/test/unit/resources/black_transparent.png
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/black_transparent.png
rename to public/includes/mike42/escpos-php/test/unit/resources/black_transparent.png
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.bmp b/public/includes/mike42/escpos-php/test/unit/resources/black_white.bmp
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.bmp
rename to public/includes/mike42/escpos-php/test/unit/resources/black_white.bmp
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.gif b/public/includes/mike42/escpos-php/test/unit/resources/black_white.gif
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.gif
rename to public/includes/mike42/escpos-php/test/unit/resources/black_white.gif
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.jpg b/public/includes/mike42/escpos-php/test/unit/resources/black_white.jpg
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.jpg
rename to public/includes/mike42/escpos-php/test/unit/resources/black_white.jpg
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.png b/public/includes/mike42/escpos-php/test/unit/resources/black_white.png
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.png
rename to public/includes/mike42/escpos-php/test/unit/resources/black_white.png
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.bmp b/public/includes/mike42/escpos-php/test/unit/resources/canvas_black.bmp
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.bmp
rename to public/includes/mike42/escpos-php/test/unit/resources/canvas_black.bmp
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.gif b/public/includes/mike42/escpos-php/test/unit/resources/canvas_black.gif
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.gif
rename to public/includes/mike42/escpos-php/test/unit/resources/canvas_black.gif
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.jpg b/public/includes/mike42/escpos-php/test/unit/resources/canvas_black.jpg
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.jpg
rename to public/includes/mike42/escpos-php/test/unit/resources/canvas_black.jpg
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.png b/public/includes/mike42/escpos-php/test/unit/resources/canvas_black.png
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.png
rename to public/includes/mike42/escpos-php/test/unit/resources/canvas_black.png
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.bmp b/public/includes/mike42/escpos-php/test/unit/resources/canvas_white.bmp
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.bmp
rename to public/includes/mike42/escpos-php/test/unit/resources/canvas_white.bmp
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.gif b/public/includes/mike42/escpos-php/test/unit/resources/canvas_white.gif
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.gif
rename to public/includes/mike42/escpos-php/test/unit/resources/canvas_white.gif
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.jpg b/public/includes/mike42/escpos-php/test/unit/resources/canvas_white.jpg
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.jpg
rename to public/includes/mike42/escpos-php/test/unit/resources/canvas_white.jpg
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.png b/public/includes/mike42/escpos-php/test/unit/resources/canvas_white.png
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.png
rename to public/includes/mike42/escpos-php/test/unit/resources/canvas_white.png
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/demo.php b/public/includes/mike42/escpos-php/test/unit/resources/demo.php
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/demo.php
rename to public/includes/mike42/escpos-php/test/unit/resources/demo.php
diff --git a/htdocs/includes/mike42/escpos-php/test/unit/resources/doc.pdf b/public/includes/mike42/escpos-php/test/unit/resources/doc.pdf
similarity index 100%
rename from htdocs/includes/mike42/escpos-php/test/unit/resources/doc.pdf
rename to public/includes/mike42/escpos-php/test/unit/resources/doc.pdf
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/.gitignore b/public/includes/mobiledetect/mobiledetectlib/.gitignore
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/.gitignore
rename to public/includes/mobiledetect/mobiledetectlib/.gitignore
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/.php_cs b/public/includes/mobiledetect/mobiledetectlib/.php_cs
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/.php_cs
rename to public/includes/mobiledetect/mobiledetectlib/.php_cs
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/.travis.yml b/public/includes/mobiledetect/mobiledetectlib/.travis.yml
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/.travis.yml
rename to public/includes/mobiledetect/mobiledetectlib/.travis.yml
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt b/public/includes/mobiledetect/mobiledetectlib/LICENSE.txt
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt
rename to public/includes/mobiledetect/mobiledetectlib/LICENSE.txt
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json b/public/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
rename to public/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php b/public/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php
rename to public/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/README.md b/public/includes/mobiledetect/mobiledetectlib/README.md
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/README.md
rename to public/includes/mobiledetect/mobiledetectlib/README.md
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/composer.json b/public/includes/mobiledetect/mobiledetectlib/composer.json
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/composer.json
rename to public/includes/mobiledetect/mobiledetectlib/composer.json
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/examples/demo.php b/public/includes/mobiledetect/mobiledetectlib/examples/demo.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/examples/demo.php
rename to public/includes/mobiledetect/mobiledetectlib/examples/demo.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/examples/session_example.php b/public/includes/mobiledetect/mobiledetectlib/examples/session_example.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/examples/session_example.php
rename to public/includes/mobiledetect/mobiledetectlib/examples/session_example.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/examples/test.php b/public/includes/mobiledetect/mobiledetectlib/examples/test.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/examples/test.php
rename to public/includes/mobiledetect/mobiledetectlib/examples/test.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/export/exportToJSON.php b/public/includes/mobiledetect/mobiledetectlib/export/exportToJSON.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/export/exportToJSON.php
rename to public/includes/mobiledetect/mobiledetectlib/export/exportToJSON.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php b/public/includes/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php
rename to public/includes/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/BasicsTest.php b/public/includes/mobiledetect/mobiledetectlib/tests/BasicsTest.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/BasicsTest.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/BasicsTest.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/UA_List.inc.php b/public/includes/mobiledetect/mobiledetectlib/tests/UA_List.inc.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/UA_List.inc.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/UA_List.inc.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/UA_List.pending.txt b/public/includes/mobiledetect/mobiledetectlib/tests/UA_List.pending.txt
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/UA_List.pending.txt
rename to public/includes/mobiledetect/mobiledetectlib/tests/UA_List.pending.txt
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/UserAgentTest.php b/public/includes/mobiledetect/mobiledetectlib/tests/UserAgentTest.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/UserAgentTest.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/UserAgentTest.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/VendorsTest_tmp.php b/public/includes/mobiledetect/mobiledetectlib/tests/VendorsTest_tmp.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/VendorsTest_tmp.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/VendorsTest_tmp.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/bootstrap.php b/public/includes/mobiledetect/mobiledetectlib/tests/bootstrap.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/bootstrap.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/bootstrap.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/phpunit.xml b/public/includes/mobiledetect/mobiledetectlib/tests/phpunit.xml
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/phpunit.xml
rename to public/includes/mobiledetect/mobiledetectlib/tests/phpunit.xml
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Acer.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Acer.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Acer.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Acer.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Alcatel.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Alcatel.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Alcatel.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Alcatel.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Allview.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Allview.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Allview.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Allview.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Amazon.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Amazon.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Amazon.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Amazon.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Apple.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Apple.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Apple.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Apple.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Archos.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Archos.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Archos.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Archos.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Asus.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Asus.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Asus.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Asus.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Blackberry.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Blackberry.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Blackberry.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Blackberry.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Dell.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Dell.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Dell.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Dell.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Google.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Google.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Google.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Google.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HP.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HP.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HP.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HP.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HTC.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HTC.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HTC.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HTC.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Huawei.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Huawei.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Huawei.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Huawei.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/LG.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/LG.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/LG.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/LG.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lava.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lava.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lava.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lava.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Leader.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Leader.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Leader.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Leader.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lenovo.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lenovo.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lenovo.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lenovo.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Mi.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Mi.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Mi.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Mi.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Microsoft.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Microsoft.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Microsoft.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Microsoft.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Motorola.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Motorola.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Motorola.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Motorola.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Nokia.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Nokia.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Nokia.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Nokia.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Onda.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Onda.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Onda.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Onda.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Others.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Others.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Others.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Others.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Prestigio.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Prestigio.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Prestigio.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Prestigio.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Samsung.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Samsung.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Samsung.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Samsung.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Sony.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Sony.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Sony.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Sony.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/SpecialCases.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/SpecialCases.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/SpecialCases.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/SpecialCases.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Vodafone.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Vodafone.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Vodafone.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Vodafone.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/ZTE.php b/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/ZTE.php
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/ZTE.php
rename to public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/ZTE.php
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/ualist.json b/public/includes/mobiledetect/mobiledetectlib/tests/ualist.json
similarity index 100%
rename from htdocs/includes/mobiledetect/mobiledetectlib/tests/ualist.json
rename to public/includes/mobiledetect/mobiledetectlib/tests/ualist.json
diff --git a/htdocs/includes/nusoap/lib/Mail/mime.php b/public/includes/nusoap/lib/Mail/mime.php
similarity index 100%
rename from htdocs/includes/nusoap/lib/Mail/mime.php
rename to public/includes/nusoap/lib/Mail/mime.php
diff --git a/htdocs/includes/nusoap/lib/Mail/mimePart.php b/public/includes/nusoap/lib/Mail/mimePart.php
similarity index 100%
rename from htdocs/includes/nusoap/lib/Mail/mimePart.php
rename to public/includes/nusoap/lib/Mail/mimePart.php
diff --git a/htdocs/includes/nusoap/lib/changelog b/public/includes/nusoap/lib/changelog
similarity index 100%
rename from htdocs/includes/nusoap/lib/changelog
rename to public/includes/nusoap/lib/changelog
diff --git a/htdocs/includes/nusoap/lib/class.nusoap_base.php b/public/includes/nusoap/lib/class.nusoap_base.php
similarity index 100%
rename from htdocs/includes/nusoap/lib/class.nusoap_base.php
rename to public/includes/nusoap/lib/class.nusoap_base.php
diff --git a/htdocs/includes/nusoap/lib/class.soap_fault.php b/public/includes/nusoap/lib/class.soap_fault.php
similarity index 100%
rename from htdocs/includes/nusoap/lib/class.soap_fault.php
rename to public/includes/nusoap/lib/class.soap_fault.php
diff --git a/htdocs/includes/nusoap/lib/class.soap_parser.php b/public/includes/nusoap/lib/class.soap_parser.php
similarity index 100%
rename from htdocs/includes/nusoap/lib/class.soap_parser.php
rename to public/includes/nusoap/lib/class.soap_parser.php
diff --git a/htdocs/includes/nusoap/lib/class.soap_server.php b/public/includes/nusoap/lib/class.soap_server.php
similarity index 100%
rename from htdocs/includes/nusoap/lib/class.soap_server.php
rename to public/includes/nusoap/lib/class.soap_server.php
diff --git a/htdocs/includes/nusoap/lib/class.soap_transport_http.php b/public/includes/nusoap/lib/class.soap_transport_http.php
similarity index 100%
rename from htdocs/includes/nusoap/lib/class.soap_transport_http.php
rename to public/includes/nusoap/lib/class.soap_transport_http.php
diff --git a/htdocs/includes/nusoap/lib/class.soap_val.php b/public/includes/nusoap/lib/class.soap_val.php
similarity index 100%
rename from htdocs/includes/nusoap/lib/class.soap_val.php
rename to public/includes/nusoap/lib/class.soap_val.php
diff --git a/htdocs/includes/nusoap/lib/class.soapclient.php b/public/includes/nusoap/lib/class.soapclient.php
similarity index 100%
rename from htdocs/includes/nusoap/lib/class.soapclient.php
rename to public/includes/nusoap/lib/class.soapclient.php
diff --git a/htdocs/includes/nusoap/lib/class.wsdl.php b/public/includes/nusoap/lib/class.wsdl.php
similarity index 100%
rename from htdocs/includes/nusoap/lib/class.wsdl.php
rename to public/includes/nusoap/lib/class.wsdl.php
diff --git a/htdocs/includes/nusoap/lib/class.wsdlcache.php b/public/includes/nusoap/lib/class.wsdlcache.php
similarity index 100%
rename from htdocs/includes/nusoap/lib/class.wsdlcache.php
rename to public/includes/nusoap/lib/class.wsdlcache.php
diff --git a/htdocs/includes/nusoap/lib/class.xmlschema.php b/public/includes/nusoap/lib/class.xmlschema.php
similarity index 100%
rename from htdocs/includes/nusoap/lib/class.xmlschema.php
rename to public/includes/nusoap/lib/class.xmlschema.php
diff --git a/htdocs/includes/nusoap/lib/nusoap.php b/public/includes/nusoap/lib/nusoap.php
similarity index 100%
rename from htdocs/includes/nusoap/lib/nusoap.php
rename to public/includes/nusoap/lib/nusoap.php
diff --git a/htdocs/includes/nusoap/lib/nusoapmime.php b/public/includes/nusoap/lib/nusoapmime.php
similarity index 100%
rename from htdocs/includes/nusoap/lib/nusoapmime.php
rename to public/includes/nusoap/lib/nusoapmime.php
diff --git a/htdocs/includes/odtphp/Segment.php b/public/includes/odtphp/Segment.php
similarity index 100%
rename from htdocs/includes/odtphp/Segment.php
rename to public/includes/odtphp/Segment.php
diff --git a/htdocs/includes/odtphp/SegmentIterator.php b/public/includes/odtphp/SegmentIterator.php
similarity index 100%
rename from htdocs/includes/odtphp/SegmentIterator.php
rename to public/includes/odtphp/SegmentIterator.php
diff --git a/htdocs/includes/odtphp/odf.php b/public/includes/odtphp/odf.php
similarity index 100%
rename from htdocs/includes/odtphp/odf.php
rename to public/includes/odtphp/odf.php
diff --git a/htdocs/includes/odtphp/zip/PclZipProxy.php b/public/includes/odtphp/zip/PclZipProxy.php
similarity index 100%
rename from htdocs/includes/odtphp/zip/PclZipProxy.php
rename to public/includes/odtphp/zip/PclZipProxy.php
diff --git a/htdocs/includes/odtphp/zip/PhpZipProxy.php b/public/includes/odtphp/zip/PhpZipProxy.php
similarity index 100%
rename from htdocs/includes/odtphp/zip/PhpZipProxy.php
rename to public/includes/odtphp/zip/PhpZipProxy.php
diff --git a/htdocs/includes/odtphp/zip/ZipInterface.php b/public/includes/odtphp/zip/ZipInterface.php
similarity index 100%
rename from htdocs/includes/odtphp/zip/ZipInterface.php
rename to public/includes/odtphp/zip/ZipInterface.php
diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/public/includes/odtphp/zip/pclzip/gnu-lgpl.txt
similarity index 100%
rename from htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt
rename to public/includes/odtphp/zip/pclzip/gnu-lgpl.txt
diff --git a/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php b/public/includes/odtphp/zip/pclzip/pclzip.lib.php
similarity index 100%
rename from htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php
rename to public/includes/odtphp/zip/pclzip/pclzip.lib.php
diff --git a/htdocs/includes/odtphp/zip/pclzip/readme.txt b/public/includes/odtphp/zip/pclzip/readme.txt
similarity index 100%
rename from htdocs/includes/odtphp/zip/pclzip/readme.txt
rename to public/includes/odtphp/zip/pclzip/readme.txt
diff --git a/htdocs/includes/php-iban/.gitignore b/public/includes/php-iban/.gitignore
similarity index 100%
rename from htdocs/includes/php-iban/.gitignore
rename to public/includes/php-iban/.gitignore
diff --git a/htdocs/includes/php-iban/LICENSE b/public/includes/php-iban/LICENSE
similarity index 100%
rename from htdocs/includes/php-iban/LICENSE
rename to public/includes/php-iban/LICENSE
diff --git a/htdocs/includes/php-iban/mistranscriptions.txt b/public/includes/php-iban/mistranscriptions.txt
similarity index 100%
rename from htdocs/includes/php-iban/mistranscriptions.txt
rename to public/includes/php-iban/mistranscriptions.txt
diff --git a/htdocs/includes/php-iban/oophp-iban.php b/public/includes/php-iban/oophp-iban.php
similarity index 100%
rename from htdocs/includes/php-iban/oophp-iban.php
rename to public/includes/php-iban/oophp-iban.php
diff --git a/htdocs/includes/php-iban/php-iban.php b/public/includes/php-iban/php-iban.php
similarity index 100%
rename from htdocs/includes/php-iban/php-iban.php
rename to public/includes/php-iban/php-iban.php
diff --git a/htdocs/includes/php-iban/registry.txt b/public/includes/php-iban/registry.txt
similarity index 100%
rename from htdocs/includes/php-iban/registry.txt
rename to public/includes/php-iban/registry.txt
diff --git a/htdocs/includes/phpoffice/phpexcel/.gitattributes b/public/includes/phpoffice/phpexcel/.gitattributes
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/.gitattributes
rename to public/includes/phpoffice/phpexcel/.gitattributes
diff --git a/htdocs/includes/phpoffice/phpexcel/.gitignore b/public/includes/phpoffice/phpexcel/.gitignore
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/.gitignore
rename to public/includes/phpoffice/phpexcel/.gitignore
diff --git a/htdocs/includes/phpoffice/phpexcel/.travis.yml b/public/includes/phpoffice/phpexcel/.travis.yml
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/.travis.yml
rename to public/includes/phpoffice/phpexcel/.travis.yml
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Autoloader.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Autoloader.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Autoloader.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Autoloader.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/APC.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/APC.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/APC.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/APC.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/ICache.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/ICache.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/ICache.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/ICache.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memory.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memory.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memory.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memory.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorageFactory.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorageFactory.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorageFactory.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorageFactory.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/Logger.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/Logger.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/Logger.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/Logger.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Database.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Database.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Database.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Database.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/DateTime.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/DateTime.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/DateTime.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/DateTime.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Engineering.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Engineering.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Engineering.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Engineering.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Exception.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Exception.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Exception.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Exception.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/ExceptionHandler.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/ExceptionHandler.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/ExceptionHandler.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/ExceptionHandler.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Financial.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Financial.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Financial.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Financial.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaParser.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaParser.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaParser.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaParser.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaToken.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaToken.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaToken.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaToken.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Function.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Function.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Function.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Function.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Functions.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Functions.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Functions.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Functions.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Logical.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Logical.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Logical.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Logical.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/LookupRef.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/LookupRef.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/LookupRef.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/LookupRef.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/MathTrig.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/MathTrig.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/MathTrig.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/MathTrig.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Statistical.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Statistical.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Statistical.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Statistical.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/TextData.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/TextData.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/TextData.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/TextData.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Token/Stack.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Token/Stack.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Token/Stack.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Token/Stack.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/functionlist.txt b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/functionlist.txt
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/functionlist.txt
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/functionlist.txt
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/AdvancedValueBinder.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/AdvancedValueBinder.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/AdvancedValueBinder.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/AdvancedValueBinder.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataType.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataType.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataType.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataType.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DefaultValueBinder.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DefaultValueBinder.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DefaultValueBinder.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DefaultValueBinder.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/Hyperlink.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/Hyperlink.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/Hyperlink.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/Hyperlink.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/IValueBinder.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/IValueBinder.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/IValueBinder.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/IValueBinder.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Axis.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Axis.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Axis.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Axis.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeries.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeries.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeries.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeries.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeriesValues.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeriesValues.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeriesValues.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeriesValues.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Exception.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Exception.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Exception.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Exception.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/GridLines.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/GridLines.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/GridLines.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/GridLines.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Layout.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Layout.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Layout.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Layout.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Legend.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Legend.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Legend.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Legend.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/PlotArea.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/PlotArea.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/PlotArea.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/PlotArea.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Properties.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Properties.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Properties.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Properties.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Title.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Title.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Title.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Title.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Comment.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Comment.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Comment.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Comment.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentProperties.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentProperties.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentProperties.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentProperties.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentSecurity.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentSecurity.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentSecurity.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentSecurity.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Exception.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Exception.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Exception.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Exception.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/HashTable.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/HashTable.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/HashTable.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/HashTable.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Helper/HTML.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Helper/HTML.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Helper/HTML.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Helper/HTML.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IComparable.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/IComparable.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IComparable.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/IComparable.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/NamedRange.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/NamedRange.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/NamedRange.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/NamedRange.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Abstract.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Abstract.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Abstract.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Abstract.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/CSV.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/CSV.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/CSV.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/CSV.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/DefaultReadFilter.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/DefaultReadFilter.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/DefaultReadFilter.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/DefaultReadFilter.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2003XML.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2003XML.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2003XML.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2003XML.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Chart.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Chart.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Chart.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Chart.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Theme.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Theme.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Theme.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Theme.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/Escher.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/Escher.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/Escher.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/Escher.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Exception.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Exception.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Exception.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Exception.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Gnumeric.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Gnumeric.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Gnumeric.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Gnumeric.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/HTML.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/HTML.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/HTML.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/HTML.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReadFilter.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReadFilter.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReadFilter.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReadFilter.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReader.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReader.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReader.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReader.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/OOCalc.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/OOCalc.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/OOCalc.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/OOCalc.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/SYLK.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/SYLK.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/SYLK.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/SYLK.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/ReferenceHelper.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/ReferenceHelper.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/ReferenceHelper.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/ReferenceHelper.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/ITextElement.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/ITextElement.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/ITextElement.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/ITextElement.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/Run.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/Run.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/Run.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/Run.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/TextElement.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/TextElement.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/TextElement.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/TextElement.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Settings.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Settings.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Settings.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Settings.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/CodePage.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/CodePage.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/CodePage.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/CodePage.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Date.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Date.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Date.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Date.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Drawing.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Drawing.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Drawing.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Drawing.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Excel5.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Excel5.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Excel5.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Excel5.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/File.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/File.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/File.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/File.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Font.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Font.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Font.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Font.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/Matrix.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/Matrix.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/Matrix.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/Matrix.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Maths.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Maths.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Maths.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Maths.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/ChainedBlockStream.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/ChainedBlockStream.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/ChainedBlockStream.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/ChainedBlockStream.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/File.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/File.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/File.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/File.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/readme.txt b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/readme.txt
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/readme.txt
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/readme.txt
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PasswordHasher.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PasswordHasher.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PasswordHasher.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PasswordHasher.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/String.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/String.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/String.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/String.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/TimeZone.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/TimeZone.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/TimeZone.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/TimeZone.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/XMLWriter.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/XMLWriter.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/XMLWriter.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/XMLWriter.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipArchive.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipArchive.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipArchive.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipArchive.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipStreamWrapper.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipStreamWrapper.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipStreamWrapper.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipStreamWrapper.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/bestFitClass.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/bestFitClass.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/bestFitClass.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/bestFitClass.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/exponentialBestFitClass.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/exponentialBestFitClass.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/exponentialBestFitClass.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/exponentialBestFitClass.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/linearBestFitClass.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/linearBestFitClass.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/linearBestFitClass.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/linearBestFitClass.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/logarithmicBestFitClass.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/logarithmicBestFitClass.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/logarithmicBestFitClass.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/logarithmicBestFitClass.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/polynomialBestFitClass.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/polynomialBestFitClass.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/polynomialBestFitClass.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/polynomialBestFitClass.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/powerBestFitClass.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/powerBestFitClass.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/powerBestFitClass.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/powerBestFitClass.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/trendClass.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/trendClass.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/trendClass.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/trendClass.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Alignment.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Alignment.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Alignment.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Alignment.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Borders.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Borders.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Borders.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Borders.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Color.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Color.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Color.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Color.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Conditional.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Conditional.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Conditional.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Conditional.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Fill.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Fill.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Fill.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Fill.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Font.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Font.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Font.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Font.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/NumberFormat.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/NumberFormat.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/NumberFormat.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/NumberFormat.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Protection.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Protection.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Protection.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Protection.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Supervisor.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Supervisor.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Supervisor.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Supervisor.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/BaseDrawing.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/BaseDrawing.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/BaseDrawing.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/BaseDrawing.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/CellIterator.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/CellIterator.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/CellIterator.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/CellIterator.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Column.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Column.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Column.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Column.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnCellIterator.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnCellIterator.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnCellIterator.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnCellIterator.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnDimension.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnDimension.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnDimension.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnDimension.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnIterator.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnIterator.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnIterator.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnIterator.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing/Shadow.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing/Shadow.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing/Shadow.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing/Shadow.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooter.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooter.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooter.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooter.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/MemoryDrawing.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/MemoryDrawing.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/MemoryDrawing.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/MemoryDrawing.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageMargins.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageMargins.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageMargins.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageMargins.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageSetup.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageSetup.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageSetup.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageSetup.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Protection.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Protection.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Protection.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Protection.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Row.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Row.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Row.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Row.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowCellIterator.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowCellIterator.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowCellIterator.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowCellIterator.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowDimension.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowDimension.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowDimension.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowDimension.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowIterator.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowIterator.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowIterator.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowIterator.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/SheetView.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/SheetView.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/SheetView.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/SheetView.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/WorksheetIterator.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/WorksheetIterator.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/WorksheetIterator.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/WorksheetIterator.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Abstract.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Abstract.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Abstract.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Abstract.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/CSV.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/CSV.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/CSV.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/CSV.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Comments.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Comments.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Comments.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Comments.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/DocProps.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/DocProps.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/DocProps.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/DocProps.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Drawing.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Drawing.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Drawing.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Drawing.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Rels.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Rels.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Rels.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Rels.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsRibbon.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsRibbon.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsRibbon.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsRibbon.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsVBA.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsVBA.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsVBA.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsVBA.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/StringTable.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/StringTable.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/StringTable.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/StringTable.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Style.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Style.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Style.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Style.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Theme.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Theme.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Theme.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Theme.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Workbook.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Workbook.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Workbook.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Workbook.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Worksheet.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Worksheet.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Worksheet.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Worksheet.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/WriterPart.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/WriterPart.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/WriterPart.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/WriterPart.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Font.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Font.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Font.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Font.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Parser.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Parser.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Parser.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Parser.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Workbook.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Workbook.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Workbook.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Workbook.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Worksheet.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Worksheet.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Worksheet.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Worksheet.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Exception.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Exception.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Exception.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Exception.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/HTML.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/HTML.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/HTML.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/HTML.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/IWriter.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/IWriter.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/IWriter.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/IWriter.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/Core.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/Core.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/Core.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/Core.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/bg/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/bg/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/bg/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/bg/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions b/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
rename to public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
diff --git a/htdocs/includes/phpoffice/phpexcel/changelog.txt b/public/includes/phpoffice/phpexcel/changelog.txt
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/changelog.txt
rename to public/includes/phpoffice/phpexcel/changelog.txt
diff --git a/htdocs/includes/phpoffice/phpexcel/composer.json b/public/includes/phpoffice/phpexcel/composer.json
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/composer.json
rename to public/includes/phpoffice/phpexcel/composer.json
diff --git a/htdocs/includes/phpoffice/phpexcel/install.txt b/public/includes/phpoffice/phpexcel/install.txt
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/install.txt
rename to public/includes/phpoffice/phpexcel/install.txt
diff --git a/htdocs/includes/phpoffice/phpexcel/license.md b/public/includes/phpoffice/phpexcel/license.md
similarity index 100%
rename from htdocs/includes/phpoffice/phpexcel/license.md
rename to public/includes/phpoffice/phpexcel/license.md
diff --git a/htdocs/includes/printipp/BasicIPP.php b/public/includes/printipp/BasicIPP.php
similarity index 100%
rename from htdocs/includes/printipp/BasicIPP.php
rename to public/includes/printipp/BasicIPP.php
diff --git a/htdocs/includes/printipp/CupsPrintIPP.php b/public/includes/printipp/CupsPrintIPP.php
similarity index 100%
rename from htdocs/includes/printipp/CupsPrintIPP.php
rename to public/includes/printipp/CupsPrintIPP.php
diff --git a/htdocs/includes/printipp/ExtendedPrintIPP.php b/public/includes/printipp/ExtendedPrintIPP.php
similarity index 100%
rename from htdocs/includes/printipp/ExtendedPrintIPP.php
rename to public/includes/printipp/ExtendedPrintIPP.php
diff --git a/htdocs/includes/printipp/PrintIPP.php b/public/includes/printipp/PrintIPP.php
similarity index 100%
rename from htdocs/includes/printipp/PrintIPP.php
rename to public/includes/printipp/PrintIPP.php
diff --git a/htdocs/includes/printipp/http_class.php b/public/includes/printipp/http_class.php
similarity index 100%
rename from htdocs/includes/printipp/http_class.php
rename to public/includes/printipp/http_class.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/ApcCache.php b/public/includes/restler/framework/Luracast/Restler/ApcCache.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/ApcCache.php
rename to public/includes/restler/framework/Luracast/Restler/ApcCache.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php b/public/includes/restler/framework/Luracast/Restler/AutoLoader.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
rename to public/includes/restler/framework/Luracast/Restler/AutoLoader.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php b/public/includes/restler/framework/Luracast/Restler/CommentParser.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
rename to public/includes/restler/framework/Luracast/Restler/CommentParser.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Compose.php b/public/includes/restler/framework/Luracast/Restler/Compose.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Compose.php
rename to public/includes/restler/framework/Luracast/Restler/Compose.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php b/public/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php
rename to public/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Arr.php b/public/includes/restler/framework/Luracast/Restler/Data/Arr.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Data/Arr.php
rename to public/includes/restler/framework/Luracast/Restler/Data/Arr.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Invalid.php b/public/includes/restler/framework/Luracast/Restler/Data/Invalid.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Data/Invalid.php
rename to public/includes/restler/framework/Luracast/Restler/Data/Invalid.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Object.php b/public/includes/restler/framework/Luracast/Restler/Data/Object.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Data/Object.php
rename to public/includes/restler/framework/Luracast/Restler/Data/Object.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Text.php b/public/includes/restler/framework/Luracast/Restler/Data/Text.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Data/Text.php
rename to public/includes/restler/framework/Luracast/Restler/Data/Text.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php b/public/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php
rename to public/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/Validator.php b/public/includes/restler/framework/Luracast/Restler/Data/Validator.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Data/Validator.php
rename to public/includes/restler/framework/Luracast/Restler/Data/Validator.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/ValueObject.php b/public/includes/restler/framework/Luracast/Restler/Data/ValueObject.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Data/ValueObject.php
rename to public/includes/restler/framework/Luracast/Restler/Data/ValueObject.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/iValidate.php b/public/includes/restler/framework/Luracast/Restler/Data/iValidate.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Data/iValidate.php
rename to public/includes/restler/framework/Luracast/Restler/Data/iValidate.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Data/iValueObject.php b/public/includes/restler/framework/Luracast/Restler/Data/iValueObject.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Data/iValueObject.php
rename to public/includes/restler/framework/Luracast/Restler/Data/iValueObject.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Defaults.php b/public/includes/restler/framework/Luracast/Restler/Defaults.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Defaults.php
rename to public/includes/restler/framework/Luracast/Restler/Defaults.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php b/public/includes/restler/framework/Luracast/Restler/EventDispatcher.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php
rename to public/includes/restler/framework/Luracast/Restler/EventDispatcher.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Explorer.php b/public/includes/restler/framework/Luracast/Restler/Explorer.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Explorer.php
rename to public/includes/restler/framework/Luracast/Restler/Explorer.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/ExplorerInfo.php b/public/includes/restler/framework/Luracast/Restler/ExplorerInfo.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/ExplorerInfo.php
rename to public/includes/restler/framework/Luracast/Restler/ExplorerInfo.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php b/public/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php
rename to public/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Flash.php b/public/includes/restler/framework/Luracast/Restler/Flash.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Flash.php
rename to public/includes/restler/framework/Luracast/Restler/Flash.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/DependentFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/DependentFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/DependentFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/DependentFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/DependentMultiFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/DependentMultiFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/DependentMultiFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/DependentMultiFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/Format.php b/public/includes/restler/framework/Luracast/Restler/Format/Format.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/Format.php
rename to public/includes/restler/framework/Luracast/Restler/Format/Format.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/JsFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/JsFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/JsFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/JsFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php b/public/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php
rename to public/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/iFormat.php b/public/includes/restler/framework/Luracast/Restler/Format/iFormat.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Format/iFormat.php
rename to public/includes/restler/framework/Luracast/Restler/Format/iFormat.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/HumanReadableCache.php b/public/includes/restler/framework/Luracast/Restler/HumanReadableCache.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/HumanReadableCache.php
rename to public/includes/restler/framework/Luracast/Restler/HumanReadableCache.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php b/public/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php
rename to public/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/MemcacheCache.php b/public/includes/restler/framework/Luracast/Restler/MemcacheCache.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/MemcacheCache.php
rename to public/includes/restler/framework/Luracast/Restler/MemcacheCache.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/PassThrough.php b/public/includes/restler/framework/Luracast/Restler/PassThrough.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/PassThrough.php
rename to public/includes/restler/framework/Luracast/Restler/PassThrough.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/README.md b/public/includes/restler/framework/Luracast/Restler/README.md
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/README.md
rename to public/includes/restler/framework/Luracast/Restler/README.md
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Redirect.php b/public/includes/restler/framework/Luracast/Restler/Redirect.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Redirect.php
rename to public/includes/restler/framework/Luracast/Restler/Redirect.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Resources.php b/public/includes/restler/framework/Luracast/Restler/Resources.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Resources.php
rename to public/includes/restler/framework/Luracast/Restler/Resources.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/RestException.php b/public/includes/restler/framework/Luracast/Restler/RestException.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/RestException.php
rename to public/includes/restler/framework/Luracast/Restler/RestException.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Restler.php b/public/includes/restler/framework/Luracast/Restler/Restler.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Restler.php
rename to public/includes/restler/framework/Luracast/Restler/Restler.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Routes.php b/public/includes/restler/framework/Luracast/Restler/Routes.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Routes.php
rename to public/includes/restler/framework/Luracast/Restler/Routes.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Scope.php b/public/includes/restler/framework/Luracast/Restler/Scope.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Scope.php
rename to public/includes/restler/framework/Luracast/Restler/Scope.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php b/public/includes/restler/framework/Luracast/Restler/UI/Emmet.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
rename to public/includes/restler/framework/Luracast/Restler/UI/Emmet.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/FormStyles.php b/public/includes/restler/framework/Luracast/Restler/UI/FormStyles.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/UI/FormStyles.php
rename to public/includes/restler/framework/Luracast/Restler/UI/FormStyles.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Forms.php b/public/includes/restler/framework/Luracast/Restler/UI/Forms.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/UI/Forms.php
rename to public/includes/restler/framework/Luracast/Restler/UI/Forms.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php b/public/includes/restler/framework/Luracast/Restler/UI/Nav.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php
rename to public/includes/restler/framework/Luracast/Restler/UI/Nav.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Tags.php b/public/includes/restler/framework/Luracast/Restler/UI/Tags.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/UI/Tags.php
rename to public/includes/restler/framework/Luracast/Restler/UI/Tags.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/User.php b/public/includes/restler/framework/Luracast/Restler/User.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/User.php
rename to public/includes/restler/framework/Luracast/Restler/User.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Util.php b/public/includes/restler/framework/Luracast/Restler/Util.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/Util.php
rename to public/includes/restler/framework/Luracast/Restler/Util.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/compatibility/iAuthenticate.php b/public/includes/restler/framework/Luracast/Restler/compatibility/iAuthenticate.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/compatibility/iAuthenticate.php
rename to public/includes/restler/framework/Luracast/Restler/compatibility/iAuthenticate.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/compatibility/restler1.php b/public/includes/restler/framework/Luracast/Restler/compatibility/restler1.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/compatibility/restler1.php
rename to public/includes/restler/framework/Luracast/Restler/compatibility/restler1.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/compatibility/restler2.php b/public/includes/restler/framework/Luracast/Restler/compatibility/restler2.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/compatibility/restler2.php
rename to public/includes/restler/framework/Luracast/Restler/compatibility/restler2.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/composer.json b/public/includes/restler/framework/Luracast/Restler/composer.json
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/composer.json
rename to public/includes/restler/framework/Luracast/Restler/composer.json
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/reset.css b/public/includes/restler/framework/Luracast/Restler/explorer/css/reset.css
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/css/reset.css
rename to public/includes/restler/framework/Luracast/Restler/explorer/css/reset.css
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css b/public/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
rename to public/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/explorer_icons.png b/public/includes/restler/framework/Luracast/Restler/explorer/images/explorer_icons.png
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/images/explorer_icons.png
rename to public/includes/restler/framework/Luracast/Restler/explorer/images/explorer_icons.png
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png b/public/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png
rename to public/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/throbber.gif b/public/includes/restler/framework/Luracast/Restler/explorer/images/throbber.gif
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/images/throbber.gif
rename to public/includes/restler/framework/Luracast/Restler/explorer/images/throbber.gif
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html b/public/includes/restler/framework/Luracast/Restler/explorer/index.html
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
rename to public/includes/restler/framework/Luracast/Restler/explorer/index.html
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js b/public/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js
rename to public/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js b/public/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js
rename to public/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js b/public/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js
rename to public/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js b/public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js
rename to public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js b/public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js
rename to public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js b/public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js
rename to public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js b/public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js
rename to public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js b/public/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js
rename to public/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js b/public/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js
rename to public/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js b/public/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
rename to public/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js b/public/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
rename to public/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js b/public/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js
rename to public/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/o2c.html b/public/includes/restler/framework/Luracast/Restler/explorer/o2c.html
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/o2c.html
rename to public/includes/restler/framework/Luracast/Restler/explorer/o2c.html
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js b/public/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
rename to public/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js b/public/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
rename to public/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iAuthenticate.php b/public/includes/restler/framework/Luracast/Restler/iAuthenticate.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/iAuthenticate.php
rename to public/includes/restler/framework/Luracast/Restler/iAuthenticate.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iCache.php b/public/includes/restler/framework/Luracast/Restler/iCache.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/iCache.php
rename to public/includes/restler/framework/Luracast/Restler/iCache.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iCompose.php b/public/includes/restler/framework/Luracast/Restler/iCompose.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/iCompose.php
rename to public/includes/restler/framework/Luracast/Restler/iCompose.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iFilter.php b/public/includes/restler/framework/Luracast/Restler/iFilter.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/iFilter.php
rename to public/includes/restler/framework/Luracast/Restler/iFilter.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iIdentifyUser.php b/public/includes/restler/framework/Luracast/Restler/iIdentifyUser.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/iIdentifyUser.php
rename to public/includes/restler/framework/Luracast/Restler/iIdentifyUser.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php b/public/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php
rename to public/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/iUseAuthentication.php b/public/includes/restler/framework/Luracast/Restler/iUseAuthentication.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/iUseAuthentication.php
rename to public/includes/restler/framework/Luracast/Restler/iUseAuthentication.php
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/views/debug.css b/public/includes/restler/framework/Luracast/Restler/views/debug.css
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/views/debug.css
rename to public/includes/restler/framework/Luracast/Restler/views/debug.css
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/views/debug.php b/public/includes/restler/framework/Luracast/Restler/views/debug.php
similarity index 100%
rename from htdocs/includes/restler/framework/Luracast/Restler/views/debug.php
rename to public/includes/restler/framework/Luracast/Restler/views/debug.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift.php b/public/includes/swiftmailer/lib/classes/Swift.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift.php
rename to public/includes/swiftmailer/lib/classes/Swift.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Attachment.php b/public/includes/swiftmailer/lib/classes/Swift/Attachment.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Attachment.php
rename to public/includes/swiftmailer/lib/classes/Swift/Attachment.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php b/public/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
rename to public/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php b/public/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
rename to public/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php b/public/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
rename to public/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php b/public/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
rename to public/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader.php b/public/includes/swiftmailer/lib/classes/Swift/CharacterReader.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader.php
rename to public/includes/swiftmailer/lib/classes/Swift/CharacterReader.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php b/public/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
rename to public/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php b/public/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
rename to public/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php b/public/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
rename to public/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php b/public/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php
rename to public/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/public/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
rename to public/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream.php b/public/includes/swiftmailer/lib/classes/Swift/CharacterStream.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream.php
rename to public/includes/swiftmailer/lib/classes/Swift/CharacterStream.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php b/public/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
rename to public/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php b/public/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
rename to public/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/ConfigurableSpool.php b/public/includes/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
rename to public/includes/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php b/public/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php
rename to public/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/DependencyException.php b/public/includes/swiftmailer/lib/classes/Swift/DependencyException.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/DependencyException.php
rename to public/includes/swiftmailer/lib/classes/Swift/DependencyException.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php b/public/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php
rename to public/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder.php b/public/includes/swiftmailer/lib/classes/Swift/Encoder.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Encoder.php
rename to public/includes/swiftmailer/lib/classes/Swift/Encoder.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php b/public/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
rename to public/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php b/public/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
rename to public/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php b/public/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
rename to public/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoding.php b/public/includes/swiftmailer/lib/classes/Swift/Encoding.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Encoding.php
rename to public/includes/swiftmailer/lib/classes/Swift/Encoding.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php b/public/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php b/public/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/Event.php b/public/includes/swiftmailer/lib/classes/Swift/Events/Event.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/Event.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/Event.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php b/public/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventListener.php b/public/includes/swiftmailer/lib/classes/Swift/Events/EventListener.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventListener.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/EventListener.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php b/public/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php b/public/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php b/public/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php b/public/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php b/public/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php b/public/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php b/public/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php b/public/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php b/public/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php b/public/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
rename to public/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php b/public/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/FileSpool.php b/public/includes/swiftmailer/lib/classes/Swift/FileSpool.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/FileSpool.php
rename to public/includes/swiftmailer/lib/classes/Swift/FileSpool.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/FileStream.php b/public/includes/swiftmailer/lib/classes/Swift/FileStream.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/FileStream.php
rename to public/includes/swiftmailer/lib/classes/Swift/FileStream.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Filterable.php b/public/includes/swiftmailer/lib/classes/Swift/Filterable.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Filterable.php
rename to public/includes/swiftmailer/lib/classes/Swift/Filterable.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Image.php b/public/includes/swiftmailer/lib/classes/Swift/Image.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Image.php
rename to public/includes/swiftmailer/lib/classes/Swift/Image.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/InputByteStream.php b/public/includes/swiftmailer/lib/classes/Swift/InputByteStream.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/InputByteStream.php
rename to public/includes/swiftmailer/lib/classes/Swift/InputByteStream.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/IoException.php b/public/includes/swiftmailer/lib/classes/Swift/IoException.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/IoException.php
rename to public/includes/swiftmailer/lib/classes/Swift/IoException.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache.php b/public/includes/swiftmailer/lib/classes/Swift/KeyCache.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache.php
rename to public/includes/swiftmailer/lib/classes/Swift/KeyCache.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php b/public/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
rename to public/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php b/public/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
rename to public/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php b/public/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
rename to public/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php b/public/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
rename to public/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php b/public/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
rename to public/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php b/public/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/MailTransport.php b/public/includes/swiftmailer/lib/classes/Swift/MailTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/MailTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/MailTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer.php b/public/includes/swiftmailer/lib/classes/Swift/Mailer.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mailer.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mailer.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php b/public/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php b/public/includes/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/MemorySpool.php b/public/includes/swiftmailer/lib/classes/Swift/MemorySpool.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/MemorySpool.php
rename to public/includes/swiftmailer/lib/classes/Swift/MemorySpool.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Message.php b/public/includes/swiftmailer/lib/classes/Swift/Message.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Message.php
rename to public/includes/swiftmailer/lib/classes/Swift/Message.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Grammar.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/Grammar.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Grammar.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/Grammar.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Header.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/Header.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Header.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/Header.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Message.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/Message.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Message.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/Message.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php b/public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
rename to public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/MimePart.php b/public/includes/swiftmailer/lib/classes/Swift/MimePart.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/MimePart.php
rename to public/includes/swiftmailer/lib/classes/Swift/MimePart.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/NullTransport.php b/public/includes/swiftmailer/lib/classes/Swift/NullTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/NullTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/NullTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/OutputByteStream.php b/public/includes/swiftmailer/lib/classes/Swift/OutputByteStream.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/OutputByteStream.php
rename to public/includes/swiftmailer/lib/classes/Swift/OutputByteStream.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Logger.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/Logger.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Logger.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/Logger.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Timer.php b/public/includes/swiftmailer/lib/classes/Swift/Plugins/Timer.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Timer.php
rename to public/includes/swiftmailer/lib/classes/Swift/Plugins/Timer.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Preferences.php b/public/includes/swiftmailer/lib/classes/Swift/Preferences.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Preferences.php
rename to public/includes/swiftmailer/lib/classes/Swift/Preferences.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php b/public/includes/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php
rename to public/includes/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/RfcComplianceException.php b/public/includes/swiftmailer/lib/classes/Swift/RfcComplianceException.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/RfcComplianceException.php
rename to public/includes/swiftmailer/lib/classes/Swift/RfcComplianceException.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php b/public/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/SignedMessage.php b/public/includes/swiftmailer/lib/classes/Swift/SignedMessage.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/SignedMessage.php
rename to public/includes/swiftmailer/lib/classes/Swift/SignedMessage.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signer.php b/public/includes/swiftmailer/lib/classes/Swift/Signer.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Signer.php
rename to public/includes/swiftmailer/lib/classes/Swift/Signer.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php b/public/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
rename to public/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php b/public/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
rename to public/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php b/public/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
rename to public/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php b/public/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
rename to public/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php b/public/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
rename to public/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php b/public/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
rename to public/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php b/public/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Spool.php b/public/includes/swiftmailer/lib/classes/Swift/Spool.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Spool.php
rename to public/includes/swiftmailer/lib/classes/Swift/Spool.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php b/public/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilter.php b/public/includes/swiftmailer/lib/classes/Swift/StreamFilter.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilter.php
rename to public/includes/swiftmailer/lib/classes/Swift/StreamFilter.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/public/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
rename to public/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php b/public/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
rename to public/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php b/public/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
rename to public/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/SwiftException.php b/public/includes/swiftmailer/lib/classes/Swift/SwiftException.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/SwiftException.php
rename to public/includes/swiftmailer/lib/classes/Swift/SwiftException.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport.php b/public/includes/swiftmailer/lib/classes/Swift/Transport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/MailTransport.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php b/public/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
rename to public/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/TransportException.php b/public/includes/swiftmailer/lib/classes/Swift/TransportException.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/TransportException.php
rename to public/includes/swiftmailer/lib/classes/Swift/TransportException.php
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Validate.php b/public/includes/swiftmailer/lib/classes/Swift/Validate.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/classes/Swift/Validate.php
rename to public/includes/swiftmailer/lib/classes/Swift/Validate.php
diff --git a/htdocs/includes/swiftmailer/lib/dependency_maps/cache_deps.php b/public/includes/swiftmailer/lib/dependency_maps/cache_deps.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/dependency_maps/cache_deps.php
rename to public/includes/swiftmailer/lib/dependency_maps/cache_deps.php
diff --git a/htdocs/includes/swiftmailer/lib/dependency_maps/message_deps.php b/public/includes/swiftmailer/lib/dependency_maps/message_deps.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/dependency_maps/message_deps.php
rename to public/includes/swiftmailer/lib/dependency_maps/message_deps.php
diff --git a/htdocs/includes/swiftmailer/lib/dependency_maps/mime_deps.php b/public/includes/swiftmailer/lib/dependency_maps/mime_deps.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/dependency_maps/mime_deps.php
rename to public/includes/swiftmailer/lib/dependency_maps/mime_deps.php
diff --git a/htdocs/includes/swiftmailer/lib/dependency_maps/transport_deps.php b/public/includes/swiftmailer/lib/dependency_maps/transport_deps.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/dependency_maps/transport_deps.php
rename to public/includes/swiftmailer/lib/dependency_maps/transport_deps.php
diff --git a/htdocs/includes/swiftmailer/lib/mime_types.php b/public/includes/swiftmailer/lib/mime_types.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/mime_types.php
rename to public/includes/swiftmailer/lib/mime_types.php
diff --git a/htdocs/includes/swiftmailer/lib/preferences.php b/public/includes/swiftmailer/lib/preferences.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/preferences.php
rename to public/includes/swiftmailer/lib/preferences.php
diff --git a/htdocs/includes/swiftmailer/lib/swift_init.php b/public/includes/swiftmailer/lib/swift_init.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/swift_init.php
rename to public/includes/swiftmailer/lib/swift_init.php
diff --git a/htdocs/includes/swiftmailer/lib/swift_required.php b/public/includes/swiftmailer/lib/swift_required.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/swift_required.php
rename to public/includes/swiftmailer/lib/swift_required.php
diff --git a/htdocs/includes/swiftmailer/lib/swift_required_pear.php b/public/includes/swiftmailer/lib/swift_required_pear.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/swift_required_pear.php
rename to public/includes/swiftmailer/lib/swift_required_pear.php
diff --git a/htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php b/public/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
similarity index 100%
rename from htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
rename to public/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
diff --git a/htdocs/includes/tcpdi/fpdf_tpl.php b/public/includes/tcpdi/fpdf_tpl.php
similarity index 100%
rename from htdocs/includes/tcpdi/fpdf_tpl.php
rename to public/includes/tcpdi/fpdf_tpl.php
diff --git a/htdocs/includes/tcpdi/tcpdi.php b/public/includes/tcpdi/tcpdi.php
similarity index 100%
rename from htdocs/includes/tcpdi/tcpdi.php
rename to public/includes/tcpdi/tcpdi.php
diff --git a/htdocs/includes/tcpdi/tcpdi_parser.php b/public/includes/tcpdi/tcpdi_parser.php
similarity index 100%
rename from htdocs/includes/tcpdi/tcpdi_parser.php
rename to public/includes/tcpdi/tcpdi_parser.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/CHANGELOG.TXT b/public/includes/tecnickcom/tcpdf/CHANGELOG.TXT
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/CHANGELOG.TXT
rename to public/includes/tecnickcom/tcpdf/CHANGELOG.TXT
diff --git a/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT b/public/includes/tecnickcom/tcpdf/LICENSE.TXT
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT
rename to public/includes/tecnickcom/tcpdf/LICENSE.TXT
diff --git a/htdocs/includes/tecnickcom/tcpdf/README.TXT b/public/includes/tecnickcom/tcpdf/README.TXT
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/README.TXT
rename to public/includes/tecnickcom/tcpdf/README.TXT
diff --git a/htdocs/includes/tecnickcom/tcpdf/composer.json b/public/includes/tecnickcom/tcpdf/composer.json
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/composer.json
rename to public/includes/tecnickcom/tcpdf/composer.json
diff --git a/htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php b/public/includes/tecnickcom/tcpdf/config/tcpdf_config.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php
rename to public/includes/tecnickcom/tcpdf/config/tcpdf_config.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING b/public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING
rename to public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog b/public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog
rename to public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK b/public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK
rename to public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/README b/public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/README
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/README
rename to public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/README
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/aealarabiya.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/aealarabiya.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.php b/public/includes/tecnickcom/tcpdf/fonts/aealarabiya.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.php
rename to public/includes/tecnickcom/tcpdf/fonts/aealarabiya.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.z b/public/includes/tecnickcom/tcpdf/fonts/aealarabiya.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.z
rename to public/includes/tecnickcom/tcpdf/fonts/aealarabiya.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/aefurat.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/aefurat.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.php b/public/includes/tecnickcom/tcpdf/fonts/aefurat.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.php
rename to public/includes/tecnickcom/tcpdf/fonts/aefurat.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.z b/public/includes/tecnickcom/tcpdf/fonts/aefurat.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.z
rename to public/includes/tecnickcom/tcpdf/fonts/aefurat.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/cid0cs.php b/public/includes/tecnickcom/tcpdf/fonts/cid0cs.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/cid0cs.php
rename to public/includes/tecnickcom/tcpdf/fonts/cid0cs.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/cid0ct.php b/public/includes/tecnickcom/tcpdf/fonts/cid0ct.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/cid0ct.php
rename to public/includes/tecnickcom/tcpdf/fonts/cid0ct.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/cid0jp.php b/public/includes/tecnickcom/tcpdf/fonts/cid0jp.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/cid0jp.php
rename to public/includes/tecnickcom/tcpdf/fonts/cid0jp.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/cid0kr.php b/public/includes/tecnickcom/tcpdf/fonts/cid0kr.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/cid0kr.php
rename to public/includes/tecnickcom/tcpdf/fonts/cid0kr.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/courier.php b/public/includes/tecnickcom/tcpdf/fonts/courier.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/courier.php
rename to public/includes/tecnickcom/tcpdf/fonts/courier.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/courierb.php b/public/includes/tecnickcom/tcpdf/fonts/courierb.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/courierb.php
rename to public/includes/tecnickcom/tcpdf/fonts/courierb.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/courierbi.php b/public/includes/tecnickcom/tcpdf/fonts/courierbi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/courierbi.php
rename to public/includes/tecnickcom/tcpdf/fonts/courierbi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/courieri.php b/public/includes/tecnickcom/tcpdf/fonts/courieri.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/courieri.php
rename to public/includes/tecnickcom/tcpdf/fonts/courieri.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/README b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/README
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/README
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/README
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt b/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt
rename to public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusans.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusans.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.php b/public/includes/tecnickcom/tcpdf/fonts/dejavusans.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusans.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusans.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusans.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.php b/public/includes/tecnickcom/tcpdf/fonts/dejavusansb.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansb.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansb.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansb.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansbi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansbi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.php b/public/includes/tecnickcom/tcpdf/fonts/dejavusansbi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansbi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansbi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansbi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.php b/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.php b/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.php b/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.php b/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.php b/public/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.php b/public/includes/tecnickcom/tcpdf/fonts/dejavusansi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansmono.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansmono.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.php b/public/includes/tecnickcom/tcpdf/fonts/dejavusansmono.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansmono.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansmono.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansmono.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.php b/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.php b/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.php b/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.z b/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserif.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserif.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.php b/public/includes/tecnickcom/tcpdf/fonts/dejavuserif.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserif.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserif.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserif.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifb.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifb.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.php b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifb.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifb.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifb.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifb.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.php b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.php b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.php b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.php b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.php b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.php b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.php
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.z b/public/includes/tecnickcom/tcpdf/fonts/dejavuserifi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.z
rename to public/includes/tecnickcom/tcpdf/fonts/dejavuserifi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/AUTHORS b/public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/AUTHORS
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/AUTHORS
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/AUTHORS
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/COPYING b/public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/COPYING
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/COPYING
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/COPYING
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/CREDITS b/public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/CREDITS
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/CREDITS
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/CREDITS
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/ChangeLog b/public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/ChangeLog
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/ChangeLog
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/ChangeLog
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/INSTALL b/public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/INSTALL
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/INSTALL
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/INSTALL
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/README b/public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/README
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/README
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/README
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/AUTHORS b/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/AUTHORS
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/AUTHORS
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/AUTHORS
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING b/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/CREDITS b/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/CREDITS
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/CREDITS
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/CREDITS
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog b/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK b/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/INSTALL b/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/INSTALL
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/INSTALL
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/INSTALL
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/README b/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/README
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/README
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/README
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING b/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/USAGE b/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/USAGE
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/USAGE
rename to public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/USAGE
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freemono.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/freemono.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freemono.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/freemono.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freemono.php b/public/includes/tecnickcom/tcpdf/fonts/freemono.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freemono.php
rename to public/includes/tecnickcom/tcpdf/fonts/freemono.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freemono.z b/public/includes/tecnickcom/tcpdf/fonts/freemono.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freemono.z
rename to public/includes/tecnickcom/tcpdf/fonts/freemono.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/freemonob.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/freemonob.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.php b/public/includes/tecnickcom/tcpdf/fonts/freemonob.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.php
rename to public/includes/tecnickcom/tcpdf/fonts/freemonob.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.z b/public/includes/tecnickcom/tcpdf/fonts/freemonob.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.z
rename to public/includes/tecnickcom/tcpdf/fonts/freemonob.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/freemonobi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/freemonobi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.php b/public/includes/tecnickcom/tcpdf/fonts/freemonobi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.php
rename to public/includes/tecnickcom/tcpdf/fonts/freemonobi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.z b/public/includes/tecnickcom/tcpdf/fonts/freemonobi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.z
rename to public/includes/tecnickcom/tcpdf/fonts/freemonobi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/freemonoi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/freemonoi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.php b/public/includes/tecnickcom/tcpdf/fonts/freemonoi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.php
rename to public/includes/tecnickcom/tcpdf/fonts/freemonoi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.z b/public/includes/tecnickcom/tcpdf/fonts/freemonoi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.z
rename to public/includes/tecnickcom/tcpdf/fonts/freemonoi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freesans.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/freesans.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freesans.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/freesans.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freesans.php b/public/includes/tecnickcom/tcpdf/fonts/freesans.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freesans.php
rename to public/includes/tecnickcom/tcpdf/fonts/freesans.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freesans.z b/public/includes/tecnickcom/tcpdf/fonts/freesans.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freesans.z
rename to public/includes/tecnickcom/tcpdf/fonts/freesans.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/freesansb.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/freesansb.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.php b/public/includes/tecnickcom/tcpdf/fonts/freesansb.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.php
rename to public/includes/tecnickcom/tcpdf/fonts/freesansb.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.z b/public/includes/tecnickcom/tcpdf/fonts/freesansb.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.z
rename to public/includes/tecnickcom/tcpdf/fonts/freesansb.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/freesansbi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/freesansbi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.php b/public/includes/tecnickcom/tcpdf/fonts/freesansbi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.php
rename to public/includes/tecnickcom/tcpdf/fonts/freesansbi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.z b/public/includes/tecnickcom/tcpdf/fonts/freesansbi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.z
rename to public/includes/tecnickcom/tcpdf/fonts/freesansbi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/freesansi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/freesansi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.php b/public/includes/tecnickcom/tcpdf/fonts/freesansi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.php
rename to public/includes/tecnickcom/tcpdf/fonts/freesansi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.z b/public/includes/tecnickcom/tcpdf/fonts/freesansi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.z
rename to public/includes/tecnickcom/tcpdf/fonts/freesansi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/freeserif.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/freeserif.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.php b/public/includes/tecnickcom/tcpdf/fonts/freeserif.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.php
rename to public/includes/tecnickcom/tcpdf/fonts/freeserif.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.z b/public/includes/tecnickcom/tcpdf/fonts/freeserif.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.z
rename to public/includes/tecnickcom/tcpdf/fonts/freeserif.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/freeserifb.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/freeserifb.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.php b/public/includes/tecnickcom/tcpdf/fonts/freeserifb.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.php
rename to public/includes/tecnickcom/tcpdf/fonts/freeserifb.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.z b/public/includes/tecnickcom/tcpdf/fonts/freeserifb.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.z
rename to public/includes/tecnickcom/tcpdf/fonts/freeserifb.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/freeserifbi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/freeserifbi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.php b/public/includes/tecnickcom/tcpdf/fonts/freeserifbi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.php
rename to public/includes/tecnickcom/tcpdf/fonts/freeserifbi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.z b/public/includes/tecnickcom/tcpdf/fonts/freeserifbi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.z
rename to public/includes/tecnickcom/tcpdf/fonts/freeserifbi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.ctg.z b/public/includes/tecnickcom/tcpdf/fonts/freeserifi.ctg.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.ctg.z
rename to public/includes/tecnickcom/tcpdf/fonts/freeserifi.ctg.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.php b/public/includes/tecnickcom/tcpdf/fonts/freeserifi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.php
rename to public/includes/tecnickcom/tcpdf/fonts/freeserifi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.z b/public/includes/tecnickcom/tcpdf/fonts/freeserifi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.z
rename to public/includes/tecnickcom/tcpdf/fonts/freeserifi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/helvetica.php b/public/includes/tecnickcom/tcpdf/fonts/helvetica.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/helvetica.php
rename to public/includes/tecnickcom/tcpdf/fonts/helvetica.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/helveticab.php b/public/includes/tecnickcom/tcpdf/fonts/helveticab.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/helveticab.php
rename to public/includes/tecnickcom/tcpdf/fonts/helveticab.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/helveticabi.php b/public/includes/tecnickcom/tcpdf/fonts/helveticabi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/helveticabi.php
rename to public/includes/tecnickcom/tcpdf/fonts/helveticabi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/helveticai.php b/public/includes/tecnickcom/tcpdf/fonts/helveticai.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/helveticai.php
rename to public/includes/tecnickcom/tcpdf/fonts/helveticai.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/hysmyeongjostdmedium.php b/public/includes/tecnickcom/tcpdf/fonts/hysmyeongjostdmedium.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/hysmyeongjostdmedium.php
rename to public/includes/tecnickcom/tcpdf/fonts/hysmyeongjostdmedium.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/kozgopromedium.php b/public/includes/tecnickcom/tcpdf/fonts/kozgopromedium.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/kozgopromedium.php
rename to public/includes/tecnickcom/tcpdf/fonts/kozgopromedium.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/kozminproregular.php b/public/includes/tecnickcom/tcpdf/fonts/kozminproregular.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/kozminproregular.php
rename to public/includes/tecnickcom/tcpdf/fonts/kozminproregular.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/msungstdlight.php b/public/includes/tecnickcom/tcpdf/fonts/msungstdlight.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/msungstdlight.php
rename to public/includes/tecnickcom/tcpdf/fonts/msungstdlight.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourier.php b/public/includes/tecnickcom/tcpdf/fonts/pdfacourier.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourier.php
rename to public/includes/tecnickcom/tcpdf/fonts/pdfacourier.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourier.z b/public/includes/tecnickcom/tcpdf/fonts/pdfacourier.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourier.z
rename to public/includes/tecnickcom/tcpdf/fonts/pdfacourier.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierb.php b/public/includes/tecnickcom/tcpdf/fonts/pdfacourierb.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierb.php
rename to public/includes/tecnickcom/tcpdf/fonts/pdfacourierb.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierb.z b/public/includes/tecnickcom/tcpdf/fonts/pdfacourierb.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierb.z
rename to public/includes/tecnickcom/tcpdf/fonts/pdfacourierb.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.php b/public/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.php
rename to public/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.z b/public/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.z
rename to public/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourieri.php b/public/includes/tecnickcom/tcpdf/fonts/pdfacourieri.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourieri.php
rename to public/includes/tecnickcom/tcpdf/fonts/pdfacourieri.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourieri.z b/public/includes/tecnickcom/tcpdf/fonts/pdfacourieri.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourieri.z
rename to public/includes/tecnickcom/tcpdf/fonts/pdfacourieri.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.php b/public/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.php
rename to public/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.z b/public/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.z
rename to public/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.php b/public/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.php
rename to public/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.z b/public/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.z
rename to public/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.php b/public/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.php
rename to public/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.z b/public/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.z
rename to public/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.php b/public/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.php
rename to public/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.z b/public/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.z
rename to public/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfasymbol.php b/public/includes/tecnickcom/tcpdf/fonts/pdfasymbol.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfasymbol.php
rename to public/includes/tecnickcom/tcpdf/fonts/pdfasymbol.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfasymbol.z b/public/includes/tecnickcom/tcpdf/fonts/pdfasymbol.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfasymbol.z
rename to public/includes/tecnickcom/tcpdf/fonts/pdfasymbol.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimes.php b/public/includes/tecnickcom/tcpdf/fonts/pdfatimes.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimes.php
rename to public/includes/tecnickcom/tcpdf/fonts/pdfatimes.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimes.z b/public/includes/tecnickcom/tcpdf/fonts/pdfatimes.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimes.z
rename to public/includes/tecnickcom/tcpdf/fonts/pdfatimes.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesb.php b/public/includes/tecnickcom/tcpdf/fonts/pdfatimesb.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesb.php
rename to public/includes/tecnickcom/tcpdf/fonts/pdfatimesb.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesb.z b/public/includes/tecnickcom/tcpdf/fonts/pdfatimesb.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesb.z
rename to public/includes/tecnickcom/tcpdf/fonts/pdfatimesb.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.php b/public/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.php
rename to public/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.z b/public/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.z
rename to public/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesi.php b/public/includes/tecnickcom/tcpdf/fonts/pdfatimesi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesi.php
rename to public/includes/tecnickcom/tcpdf/fonts/pdfatimesi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesi.z b/public/includes/tecnickcom/tcpdf/fonts/pdfatimesi.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesi.z
rename to public/includes/tecnickcom/tcpdf/fonts/pdfatimesi.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.php b/public/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.php
rename to public/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.z b/public/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.z
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.z
rename to public/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.z
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/stsongstdlight.php b/public/includes/tecnickcom/tcpdf/fonts/stsongstdlight.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/stsongstdlight.php
rename to public/includes/tecnickcom/tcpdf/fonts/stsongstdlight.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/symbol.php b/public/includes/tecnickcom/tcpdf/fonts/symbol.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/symbol.php
rename to public/includes/tecnickcom/tcpdf/fonts/symbol.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/times.php b/public/includes/tecnickcom/tcpdf/fonts/times.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/times.php
rename to public/includes/tecnickcom/tcpdf/fonts/times.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/timesb.php b/public/includes/tecnickcom/tcpdf/fonts/timesb.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/timesb.php
rename to public/includes/tecnickcom/tcpdf/fonts/timesb.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/timesbi.php b/public/includes/tecnickcom/tcpdf/fonts/timesbi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/timesbi.php
rename to public/includes/tecnickcom/tcpdf/fonts/timesbi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/timesi.php b/public/includes/tecnickcom/tcpdf/fonts/timesi.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/timesi.php
rename to public/includes/tecnickcom/tcpdf/fonts/timesi.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ac15.php b/public/includes/tecnickcom/tcpdf/fonts/uni2cid_ac15.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ac15.php
rename to public/includes/tecnickcom/tcpdf/fonts/uni2cid_ac15.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ag15.php b/public/includes/tecnickcom/tcpdf/fonts/uni2cid_ag15.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ag15.php
rename to public/includes/tecnickcom/tcpdf/fonts/uni2cid_ag15.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_aj16.php b/public/includes/tecnickcom/tcpdf/fonts/uni2cid_aj16.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_aj16.php
rename to public/includes/tecnickcom/tcpdf/fonts/uni2cid_aj16.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ak12.php b/public/includes/tecnickcom/tcpdf/fonts/uni2cid_ak12.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ak12.php
rename to public/includes/tecnickcom/tcpdf/fonts/uni2cid_ak12.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/fonts/zapfdingbats.php b/public/includes/tecnickcom/tcpdf/fonts/zapfdingbats.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/fonts/zapfdingbats.php
rename to public/includes/tecnickcom/tcpdf/fonts/zapfdingbats.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php b/public/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php
rename to public/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php b/public/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php
rename to public/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php b/public/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php
rename to public/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/sRGB.icc b/public/includes/tecnickcom/tcpdf/include/sRGB.icc
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/include/sRGB.icc
rename to public/includes/tecnickcom/tcpdf/include/sRGB.icc
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_colors.php b/public/includes/tecnickcom/tcpdf/include/tcpdf_colors.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/include/tcpdf_colors.php
rename to public/includes/tecnickcom/tcpdf/include/tcpdf_colors.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_filters.php b/public/includes/tecnickcom/tcpdf/include/tcpdf_filters.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/include/tcpdf_filters.php
rename to public/includes/tecnickcom/tcpdf/include/tcpdf_filters.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_font_data.php b/public/includes/tecnickcom/tcpdf/include/tcpdf_font_data.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/include/tcpdf_font_data.php
rename to public/includes/tecnickcom/tcpdf/include/tcpdf_font_data.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php b/public/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php
rename to public/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_images.php b/public/includes/tecnickcom/tcpdf/include/tcpdf_images.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/include/tcpdf_images.php
rename to public/includes/tecnickcom/tcpdf/include/tcpdf_images.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php b/public/includes/tecnickcom/tcpdf/include/tcpdf_static.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
rename to public/includes/tecnickcom/tcpdf/include/tcpdf_static.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/tcpdf.php b/public/includes/tecnickcom/tcpdf/tcpdf.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/tcpdf.php
rename to public/includes/tecnickcom/tcpdf/tcpdf.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/tcpdf_autoconfig.php b/public/includes/tecnickcom/tcpdf/tcpdf_autoconfig.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/tcpdf_autoconfig.php
rename to public/includes/tecnickcom/tcpdf/tcpdf_autoconfig.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php b/public/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
rename to public/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_2d.php b/public/includes/tecnickcom/tcpdf/tcpdf_barcodes_2d.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_2d.php
rename to public/includes/tecnickcom/tcpdf/tcpdf_barcodes_2d.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/tcpdf_import.php b/public/includes/tecnickcom/tcpdf/tcpdf_import.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/tcpdf_import.php
rename to public/includes/tecnickcom/tcpdf/tcpdf_import.php
diff --git a/htdocs/includes/tecnickcom/tcpdf/tcpdf_parser.php b/public/includes/tecnickcom/tcpdf/tcpdf_parser.php
similarity index 100%
rename from htdocs/includes/tecnickcom/tcpdf/tcpdf_parser.php
rename to public/includes/tecnickcom/tcpdf/tcpdf_parser.php
diff --git a/htdocs/index.php b/public/index.php
similarity index 100%
rename from htdocs/index.php
rename to public/index.php
diff --git a/htdocs/install/.gitignore b/public/install/.gitignore
similarity index 100%
rename from htdocs/install/.gitignore
rename to public/install/.gitignore
diff --git a/htdocs/install/check.php b/public/install/check.php
similarity index 100%
rename from htdocs/install/check.php
rename to public/install/check.php
diff --git a/htdocs/install/default.css b/public/install/default.css
similarity index 100%
rename from htdocs/install/default.css
rename to public/install/default.css
diff --git a/htdocs/install/doctemplates/README b/public/install/doctemplates/README
similarity index 100%
rename from htdocs/install/doctemplates/README
rename to public/install/doctemplates/README
diff --git a/htdocs/install/doctemplates/index.html b/public/install/doctemplates/index.html
similarity index 100%
rename from htdocs/install/doctemplates/index.html
rename to public/install/doctemplates/index.html
diff --git a/htdocs/install/doctemplates/invoices/index.html b/public/install/doctemplates/invoices/index.html
similarity index 100%
rename from htdocs/install/doctemplates/invoices/index.html
rename to public/install/doctemplates/invoices/index.html
diff --git a/htdocs/install/doctemplates/invoices/template_invoice.odt b/public/install/doctemplates/invoices/template_invoice.odt
similarity index 100%
rename from htdocs/install/doctemplates/invoices/template_invoice.odt
rename to public/install/doctemplates/invoices/template_invoice.odt
diff --git a/htdocs/install/doctemplates/orders/index.html b/public/install/doctemplates/orders/index.html
similarity index 100%
rename from htdocs/install/doctemplates/orders/index.html
rename to public/install/doctemplates/orders/index.html
diff --git a/htdocs/install/doctemplates/orders/template_order.odt b/public/install/doctemplates/orders/template_order.odt
similarity index 100%
rename from htdocs/install/doctemplates/orders/template_order.odt
rename to public/install/doctemplates/orders/template_order.odt
diff --git a/htdocs/install/doctemplates/projects/index.html b/public/install/doctemplates/projects/index.html
similarity index 100%
rename from htdocs/install/doctemplates/projects/index.html
rename to public/install/doctemplates/projects/index.html
diff --git a/htdocs/install/doctemplates/projects/template_project.odt b/public/install/doctemplates/projects/template_project.odt
similarity index 100%
rename from htdocs/install/doctemplates/projects/template_project.odt
rename to public/install/doctemplates/projects/template_project.odt
diff --git a/htdocs/install/doctemplates/proposals/index.html b/public/install/doctemplates/proposals/index.html
similarity index 100%
rename from htdocs/install/doctemplates/proposals/index.html
rename to public/install/doctemplates/proposals/index.html
diff --git a/htdocs/install/doctemplates/proposals/template_proposal.odt b/public/install/doctemplates/proposals/template_proposal.odt
similarity index 100%
rename from htdocs/install/doctemplates/proposals/template_proposal.odt
rename to public/install/doctemplates/proposals/template_proposal.odt
diff --git a/htdocs/install/doctemplates/shipment/index.html b/public/install/doctemplates/shipment/index.html
similarity index 100%
rename from htdocs/install/doctemplates/shipment/index.html
rename to public/install/doctemplates/shipment/index.html
diff --git a/htdocs/install/doctemplates/shipment/template_shipment.odt b/public/install/doctemplates/shipment/template_shipment.odt
similarity index 100%
rename from htdocs/install/doctemplates/shipment/template_shipment.odt
rename to public/install/doctemplates/shipment/template_shipment.odt
diff --git a/htdocs/install/doctemplates/supplier_proposal/index.html b/public/install/doctemplates/supplier_proposal/index.html
similarity index 100%
rename from htdocs/install/doctemplates/supplier_proposal/index.html
rename to public/install/doctemplates/supplier_proposal/index.html
diff --git a/htdocs/install/doctemplates/supplier_proposal/template_supplier_proposal.odt b/public/install/doctemplates/supplier_proposal/template_supplier_proposal.odt
similarity index 100%
rename from htdocs/install/doctemplates/supplier_proposal/template_supplier_proposal.odt
rename to public/install/doctemplates/supplier_proposal/template_supplier_proposal.odt
diff --git a/htdocs/install/doctemplates/tasks/index.html b/public/install/doctemplates/tasks/index.html
similarity index 100%
rename from htdocs/install/doctemplates/tasks/index.html
rename to public/install/doctemplates/tasks/index.html
diff --git a/htdocs/install/doctemplates/tasks/template_task_summary.odt b/public/install/doctemplates/tasks/template_task_summary.odt
similarity index 100%
rename from htdocs/install/doctemplates/tasks/template_task_summary.odt
rename to public/install/doctemplates/tasks/template_task_summary.odt
diff --git a/htdocs/install/doctemplates/thirdparties/index.html b/public/install/doctemplates/thirdparties/index.html
similarity index 100%
rename from htdocs/install/doctemplates/thirdparties/index.html
rename to public/install/doctemplates/thirdparties/index.html
diff --git a/htdocs/install/doctemplates/thirdparties/template_thirdparty.ods b/public/install/doctemplates/thirdparties/template_thirdparty.ods
similarity index 100%
rename from htdocs/install/doctemplates/thirdparties/template_thirdparty.ods
rename to public/install/doctemplates/thirdparties/template_thirdparty.ods
diff --git a/htdocs/install/doctemplates/thirdparties/template_thirdparty.odt b/public/install/doctemplates/thirdparties/template_thirdparty.odt
similarity index 100%
rename from htdocs/install/doctemplates/thirdparties/template_thirdparty.odt
rename to public/install/doctemplates/thirdparties/template_thirdparty.odt
diff --git a/htdocs/install/fileconf.php b/public/install/fileconf.php
similarity index 100%
rename from htdocs/install/fileconf.php
rename to public/install/fileconf.php
diff --git a/htdocs/install/inc.php b/public/install/inc.php
similarity index 100%
rename from htdocs/install/inc.php
rename to public/install/inc.php
diff --git a/htdocs/install/index.php b/public/install/index.php
similarity index 100%
rename from htdocs/install/index.php
rename to public/install/index.php
diff --git a/htdocs/install/install.forced.sample.php b/public/install/install.forced.sample.php
similarity index 100%
rename from htdocs/install/install.forced.sample.php
rename to public/install/install.forced.sample.php
diff --git a/htdocs/install/lib/index.html b/public/install/lib/index.html
similarity index 100%
rename from htdocs/install/lib/index.html
rename to public/install/lib/index.html
diff --git a/htdocs/install/lib/repair.lib.php b/public/install/lib/repair.lib.php
similarity index 100%
rename from htdocs/install/lib/repair.lib.php
rename to public/install/lib/repair.lib.php
diff --git a/htdocs/install/mssql/README b/public/install/mssql/README
similarity index 100%
rename from htdocs/install/mssql/README
rename to public/install/mssql/README
diff --git a/htdocs/install/mssql/functions/index.html b/public/install/mssql/functions/index.html
similarity index 100%
rename from htdocs/install/mssql/functions/index.html
rename to public/install/mssql/functions/index.html
diff --git a/htdocs/install/mssql/index.html b/public/install/mssql/index.html
similarity index 100%
rename from htdocs/install/mssql/index.html
rename to public/install/mssql/index.html
diff --git a/htdocs/install/mysql/README b/public/install/mysql/README
similarity index 100%
rename from htdocs/install/mysql/README
rename to public/install/mysql/README
diff --git a/htdocs/install/mysql/data/index.html b/public/install/mysql/data/index.html
similarity index 100%
rename from htdocs/install/mysql/data/index.html
rename to public/install/mysql/data/index.html
diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/public/install/mysql/data/llx_00_c_country.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_00_c_country.sql
rename to public/install/mysql/data/llx_00_c_country.sql
diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/public/install/mysql/data/llx_10_c_regions.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_10_c_regions.sql
rename to public/install/mysql/data/llx_10_c_regions.sql
diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/public/install/mysql/data/llx_20_c_departements.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_20_c_departements.sql
rename to public/install/mysql/data/llx_20_c_departements.sql
diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/public/install/mysql/data/llx_accounting.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_accounting.sql
rename to public/install/mysql/data/llx_accounting.sql
diff --git a/htdocs/install/mysql/data/llx_accounting_category.sql b/public/install/mysql/data/llx_accounting_category.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_accounting_category.sql
rename to public/install/mysql/data/llx_accounting_category.sql
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/public/install/mysql/data/llx_c_action_trigger.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_action_trigger.sql
rename to public/install/mysql/data/llx_c_action_trigger.sql
diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/public/install/mysql/data/llx_c_actioncomm.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_actioncomm.sql
rename to public/install/mysql/data/llx_c_actioncomm.sql
diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/public/install/mysql/data/llx_c_availability.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_availability.sql
rename to public/install/mysql/data/llx_c_availability.sql
diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/public/install/mysql/data/llx_c_chargesociales.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_chargesociales.sql
rename to public/install/mysql/data/llx_c_chargesociales.sql
diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/public/install/mysql/data/llx_c_civilite.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_civilite.sql
rename to public/install/mysql/data/llx_c_civilite.sql
diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/public/install/mysql/data/llx_c_currencies.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_currencies.sql
rename to public/install/mysql/data/llx_c_currencies.sql
diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/public/install/mysql/data/llx_c_ecotaxe.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_ecotaxe.sql
rename to public/install/mysql/data/llx_c_ecotaxe.sql
diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/public/install/mysql/data/llx_c_effectif.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_effectif.sql
rename to public/install/mysql/data/llx_c_effectif.sql
diff --git a/htdocs/install/mysql/data/llx_c_format_cards.sql b/public/install/mysql/data/llx_c_format_cards.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_format_cards.sql
rename to public/install/mysql/data/llx_c_format_cards.sql
diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/public/install/mysql/data/llx_c_forme_juridique.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_forme_juridique.sql
rename to public/install/mysql/data/llx_c_forme_juridique.sql
diff --git a/htdocs/install/mysql/data/llx_c_holiday_type.sql b/public/install/mysql/data/llx_c_holiday_type.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_holiday_type.sql
rename to public/install/mysql/data/llx_c_holiday_type.sql
diff --git a/htdocs/install/mysql/data/llx_c_hrm_department.sql b/public/install/mysql/data/llx_c_hrm_department.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_hrm_department.sql
rename to public/install/mysql/data/llx_c_hrm_department.sql
diff --git a/htdocs/install/mysql/data/llx_c_hrm_function.sql b/public/install/mysql/data/llx_c_hrm_function.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_hrm_function.sql
rename to public/install/mysql/data/llx_c_hrm_function.sql
diff --git a/htdocs/install/mysql/data/llx_c_incoterms.sql b/public/install/mysql/data/llx_c_incoterms.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_incoterms.sql
rename to public/install/mysql/data/llx_c_incoterms.sql
diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/public/install/mysql/data/llx_c_input_method.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_input_method.sql
rename to public/install/mysql/data/llx_c_input_method.sql
diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/public/install/mysql/data/llx_c_input_reason.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_input_reason.sql
rename to public/install/mysql/data/llx_c_input_reason.sql
diff --git a/htdocs/install/mysql/data/llx_c_lead_status.sql b/public/install/mysql/data/llx_c_lead_status.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_lead_status.sql
rename to public/install/mysql/data/llx_c_lead_status.sql
diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/public/install/mysql/data/llx_c_paiement.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_paiement.sql
rename to public/install/mysql/data/llx_c_paiement.sql
diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/public/install/mysql/data/llx_c_paper_format.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_paper_format.sql
rename to public/install/mysql/data/llx_c_paper_format.sql
diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/public/install/mysql/data/llx_c_payment_term.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_payment_term.sql
rename to public/install/mysql/data/llx_c_payment_term.sql
diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/public/install/mysql/data/llx_c_propalst.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_propalst.sql
rename to public/install/mysql/data/llx_c_propalst.sql
diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/public/install/mysql/data/llx_c_prospectlevel.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_prospectlevel.sql
rename to public/install/mysql/data/llx_c_prospectlevel.sql
diff --git a/htdocs/install/mysql/data/llx_c_revenuestamp.sql b/public/install/mysql/data/llx_c_revenuestamp.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_revenuestamp.sql
rename to public/install/mysql/data/llx_c_revenuestamp.sql
diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/public/install/mysql/data/llx_c_shipment_mode.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_shipment_mode.sql
rename to public/install/mysql/data/llx_c_shipment_mode.sql
diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/public/install/mysql/data/llx_c_stcomm.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_stcomm.sql
rename to public/install/mysql/data/llx_c_stcomm.sql
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/public/install/mysql/data/llx_c_tva.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_tva.sql
rename to public/install/mysql/data/llx_c_tva.sql
diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/public/install/mysql/data/llx_c_type_contact.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_type_contact.sql
rename to public/install/mysql/data/llx_c_type_contact.sql
diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/public/install/mysql/data/llx_c_type_fees.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_type_fees.sql
rename to public/install/mysql/data/llx_c_type_fees.sql
diff --git a/htdocs/install/mysql/data/llx_c_type_resource.sql b/public/install/mysql/data/llx_c_type_resource.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_type_resource.sql
rename to public/install/mysql/data/llx_c_type_resource.sql
diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/public/install/mysql/data/llx_c_typent.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_typent.sql
rename to public/install/mysql/data/llx_c_typent.sql
diff --git a/htdocs/install/mysql/data/llx_c_units.sql b/public/install/mysql/data/llx_c_units.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_units.sql
rename to public/install/mysql/data/llx_c_units.sql
diff --git a/htdocs/install/mysql/data/llx_const.sql b/public/install/mysql/data/llx_const.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_const.sql
rename to public/install/mysql/data/llx_const.sql
diff --git a/htdocs/install/mysql/data/llx_holiday_config.sql b/public/install/mysql/data/llx_holiday_config.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_holiday_config.sql
rename to public/install/mysql/data/llx_holiday_config.sql
diff --git a/htdocs/install/mysql/functions/functions.sql b/public/install/mysql/functions/functions.sql
similarity index 100%
rename from htdocs/install/mysql/functions/functions.sql
rename to public/install/mysql/functions/functions.sql
diff --git a/htdocs/install/mysql/functions/index.html b/public/install/mysql/functions/index.html
similarity index 100%
rename from htdocs/install/mysql/functions/index.html
rename to public/install/mysql/functions/index.html
diff --git a/htdocs/install/mysql/index.html b/public/install/mysql/index.html
similarity index 100%
rename from htdocs/install/mysql/index.html
rename to public/install/mysql/index.html
diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/public/install/mysql/migration/3.0.0-3.1.0.sql
similarity index 100%
rename from htdocs/install/mysql/migration/3.0.0-3.1.0.sql
rename to public/install/mysql/migration/3.0.0-3.1.0.sql
diff --git a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql b/public/install/mysql/migration/3.1.0-3.2.0.sql
similarity index 100%
rename from htdocs/install/mysql/migration/3.1.0-3.2.0.sql
rename to public/install/mysql/migration/3.1.0-3.2.0.sql
diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/public/install/mysql/migration/3.2.0-3.3.0.sql
similarity index 100%
rename from htdocs/install/mysql/migration/3.2.0-3.3.0.sql
rename to public/install/mysql/migration/3.2.0-3.3.0.sql
diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/public/install/mysql/migration/3.3.0-3.4.0.sql
similarity index 100%
rename from htdocs/install/mysql/migration/3.3.0-3.4.0.sql
rename to public/install/mysql/migration/3.3.0-3.4.0.sql
diff --git a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql b/public/install/mysql/migration/3.4.0-3.5.0.sql
similarity index 100%
rename from htdocs/install/mysql/migration/3.4.0-3.5.0.sql
rename to public/install/mysql/migration/3.4.0-3.5.0.sql
diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/public/install/mysql/migration/3.5.0-3.6.0.sql
similarity index 100%
rename from htdocs/install/mysql/migration/3.5.0-3.6.0.sql
rename to public/install/mysql/migration/3.5.0-3.6.0.sql
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/public/install/mysql/migration/3.6.0-3.7.0.sql
similarity index 100%
rename from htdocs/install/mysql/migration/3.6.0-3.7.0.sql
rename to public/install/mysql/migration/3.6.0-3.7.0.sql
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/public/install/mysql/migration/3.7.0-3.8.0.sql
similarity index 100%
rename from htdocs/install/mysql/migration/3.7.0-3.8.0.sql
rename to public/install/mysql/migration/3.7.0-3.8.0.sql
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/public/install/mysql/migration/3.8.0-3.9.0.sql
similarity index 100%
rename from htdocs/install/mysql/migration/3.8.0-3.9.0.sql
rename to public/install/mysql/migration/3.8.0-3.9.0.sql
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/public/install/mysql/migration/3.9.0-4.0.0.sql
similarity index 100%
rename from htdocs/install/mysql/migration/3.9.0-4.0.0.sql
rename to public/install/mysql/migration/3.9.0-4.0.0.sql
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/public/install/mysql/migration/4.0.0-5.0.0.sql
similarity index 100%
rename from htdocs/install/mysql/migration/4.0.0-5.0.0.sql
rename to public/install/mysql/migration/4.0.0-5.0.0.sql
diff --git a/htdocs/install/mysql/migration/index.html b/public/install/mysql/migration/index.html
similarity index 100%
rename from htdocs/install/mysql/migration/index.html
rename to public/install/mysql/migration/index.html
diff --git a/htdocs/install/mysql/migration/repair.sql b/public/install/mysql/migration/repair.sql
similarity index 100%
rename from htdocs/install/mysql/migration/repair.sql
rename to public/install/mysql/migration/repair.sql
diff --git a/htdocs/install/mysql/tables/index.html b/public/install/mysql/tables/index.html
similarity index 100%
rename from htdocs/install/mysql/tables/index.html
rename to public/install/mysql/tables/index.html
diff --git a/htdocs/install/mysql/tables/llx_accounting_account.key.sql b/public/install/mysql/tables/llx_accounting_account.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_accounting_account.key.sql
rename to public/install/mysql/tables/llx_accounting_account.key.sql
diff --git a/htdocs/install/mysql/tables/llx_accounting_account.sql b/public/install/mysql/tables/llx_accounting_account.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_accounting_account.sql
rename to public/install/mysql/tables/llx_accounting_account.sql
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql b/public/install/mysql/tables/llx_accounting_bookkeeping.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql
rename to public/install/mysql/tables/llx_accounting_bookkeeping.key.sql
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/public/install/mysql/tables/llx_accounting_bookkeeping.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
rename to public/install/mysql/tables/llx_accounting_bookkeeping.sql
diff --git a/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql b/public/install/mysql/tables/llx_accounting_fiscalyear.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
rename to public/install/mysql/tables/llx_accounting_fiscalyear.sql
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.key.sql b/public/install/mysql/tables/llx_accounting_journal.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_accounting_journal.key.sql
rename to public/install/mysql/tables/llx_accounting_journal.key.sql
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.sql b/public/install/mysql/tables/llx_accounting_journal.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_accounting_journal.sql
rename to public/install/mysql/tables/llx_accounting_journal.sql
diff --git a/htdocs/install/mysql/tables/llx_accounting_system.key.sql b/public/install/mysql/tables/llx_accounting_system.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_accounting_system.key.sql
rename to public/install/mysql/tables/llx_accounting_system.key.sql
diff --git a/htdocs/install/mysql/tables/llx_accounting_system.sql b/public/install/mysql/tables/llx_accounting_system.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_accounting_system.sql
rename to public/install/mysql/tables/llx_accounting_system.sql
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/public/install/mysql/tables/llx_actioncomm.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_actioncomm.key.sql
rename to public/install/mysql/tables/llx_actioncomm.key.sql
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/public/install/mysql/tables/llx_actioncomm.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_actioncomm.sql
rename to public/install/mysql/tables/llx_actioncomm.sql
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_extrafields.key.sql b/public/install/mysql/tables/llx_actioncomm_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_actioncomm_extrafields.key.sql
rename to public/install/mysql/tables/llx_actioncomm_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql b/public/install/mysql/tables/llx_actioncomm_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql
rename to public/install/mysql/tables/llx_actioncomm_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql b/public/install/mysql/tables/llx_actioncomm_resources.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql
rename to public/install/mysql/tables/llx_actioncomm_resources.key.sql
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql b/public/install/mysql/tables/llx_actioncomm_resources.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_actioncomm_resources.sql
rename to public/install/mysql/tables/llx_actioncomm_resources.sql
diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/public/install/mysql/tables/llx_adherent.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_adherent.key.sql
rename to public/install/mysql/tables/llx_adherent.key.sql
diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/public/install/mysql/tables/llx_adherent.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_adherent.sql
rename to public/install/mysql/tables/llx_adherent.sql
diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/public/install/mysql/tables/llx_adherent_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql
rename to public/install/mysql/tables/llx_adherent_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/public/install/mysql/tables/llx_adherent_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_adherent_extrafields.sql
rename to public/install/mysql/tables/llx_adherent_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/public/install/mysql/tables/llx_adherent_type.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_adherent_type.key.sql
rename to public/install/mysql/tables/llx_adherent_type.key.sql
diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/public/install/mysql/tables/llx_adherent_type.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_adherent_type.sql
rename to public/install/mysql/tables/llx_adherent_type.sql
diff --git a/htdocs/install/mysql/tables/llx_adherent_type_extrafields.key.sql b/public/install/mysql/tables/llx_adherent_type_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_adherent_type_extrafields.key.sql
rename to public/install/mysql/tables/llx_adherent_type_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql b/public/install/mysql/tables/llx_adherent_type_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql
rename to public/install/mysql/tables/llx_adherent_type_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_advtargetemailing.key.sql b/public/install/mysql/tables/llx_advtargetemailing.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_advtargetemailing.key.sql
rename to public/install/mysql/tables/llx_advtargetemailing.key.sql
diff --git a/htdocs/install/mysql/tables/llx_advtargetemailing.sql b/public/install/mysql/tables/llx_advtargetemailing.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_advtargetemailing.sql
rename to public/install/mysql/tables/llx_advtargetemailing.sql
diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/public/install/mysql/tables/llx_bank.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bank.key.sql
rename to public/install/mysql/tables/llx_bank.key.sql
diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/public/install/mysql/tables/llx_bank.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bank.sql
rename to public/install/mysql/tables/llx_bank.sql
diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/public/install/mysql/tables/llx_bank_account.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bank_account.key.sql
rename to public/install/mysql/tables/llx_bank_account.key.sql
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/public/install/mysql/tables/llx_bank_account.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bank_account.sql
rename to public/install/mysql/tables/llx_bank_account.sql
diff --git a/htdocs/install/mysql/tables/llx_bank_account_extrafields.key.sql b/public/install/mysql/tables/llx_bank_account_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bank_account_extrafields.key.sql
rename to public/install/mysql/tables/llx_bank_account_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql b/public/install/mysql/tables/llx_bank_account_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
rename to public/install/mysql/tables/llx_bank_account_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/public/install/mysql/tables/llx_bank_categ.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bank_categ.sql
rename to public/install/mysql/tables/llx_bank_categ.sql
diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/public/install/mysql/tables/llx_bank_class.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bank_class.key.sql
rename to public/install/mysql/tables/llx_bank_class.key.sql
diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/public/install/mysql/tables/llx_bank_class.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bank_class.sql
rename to public/install/mysql/tables/llx_bank_class.sql
diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/public/install/mysql/tables/llx_bank_url.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bank_url.key.sql
rename to public/install/mysql/tables/llx_bank_url.key.sql
diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/public/install/mysql/tables/llx_bank_url.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bank_url.sql
rename to public/install/mysql/tables/llx_bank_url.sql
diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/public/install/mysql/tables/llx_bookmark.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bookmark.key.sql
rename to public/install/mysql/tables/llx_bookmark.key.sql
diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/public/install/mysql/tables/llx_bookmark.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bookmark.sql
rename to public/install/mysql/tables/llx_bookmark.sql
diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/public/install/mysql/tables/llx_bordereau_cheque.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql
rename to public/install/mysql/tables/llx_bordereau_cheque.key.sql
diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/public/install/mysql/tables/llx_bordereau_cheque.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_bordereau_cheque.sql
rename to public/install/mysql/tables/llx_bordereau_cheque.sql
diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/public/install/mysql/tables/llx_boxes.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_boxes.key.sql
rename to public/install/mysql/tables/llx_boxes.key.sql
diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/public/install/mysql/tables/llx_boxes.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_boxes.sql
rename to public/install/mysql/tables/llx_boxes.sql
diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/public/install/mysql/tables/llx_boxes_def.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_boxes_def.key.sql
rename to public/install/mysql/tables/llx_boxes_def.key.sql
diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/public/install/mysql/tables/llx_boxes_def.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_boxes_def.sql
rename to public/install/mysql/tables/llx_boxes_def.sql
diff --git a/htdocs/install/mysql/tables/llx_budget.sql b/public/install/mysql/tables/llx_budget.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_budget.sql
rename to public/install/mysql/tables/llx_budget.sql
diff --git a/htdocs/install/mysql/tables/llx_budget_lines.key.sql b/public/install/mysql/tables/llx_budget_lines.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_budget_lines.key.sql
rename to public/install/mysql/tables/llx_budget_lines.key.sql
diff --git a/htdocs/install/mysql/tables/llx_budget_lines.sql b/public/install/mysql/tables/llx_budget_lines.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_budget_lines.sql
rename to public/install/mysql/tables/llx_budget_lines.sql
diff --git a/htdocs/install/mysql/tables/llx_c_accounting_category.key.sql b/public/install/mysql/tables/llx_c_accounting_category.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
rename to public/install/mysql/tables/llx_c_accounting_category.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_accounting_category.sql b/public/install/mysql/tables/llx_c_accounting_category.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_accounting_category.sql
rename to public/install/mysql/tables/llx_c_accounting_category.sql
diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/public/install/mysql/tables/llx_c_action_trigger.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_action_trigger.key.sql
rename to public/install/mysql/tables/llx_c_action_trigger.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/public/install/mysql/tables/llx_c_action_trigger.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_action_trigger.sql
rename to public/install/mysql/tables/llx_c_action_trigger.sql
diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.key.sql b/public/install/mysql/tables/llx_c_actioncomm.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_actioncomm.key.sql
rename to public/install/mysql/tables/llx_c_actioncomm.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/public/install/mysql/tables/llx_c_actioncomm.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_actioncomm.sql
rename to public/install/mysql/tables/llx_c_actioncomm.sql
diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/public/install/mysql/tables/llx_c_availability.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_availability.key.sql
rename to public/install/mysql/tables/llx_c_availability.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/public/install/mysql/tables/llx_c_availability.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_availability.sql
rename to public/install/mysql/tables/llx_c_availability.sql
diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.key.sql b/public/install/mysql/tables/llx_c_barcode_type.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_barcode_type.key.sql
rename to public/install/mysql/tables/llx_c_barcode_type.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/public/install/mysql/tables/llx_c_barcode_type.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_barcode_type.sql
rename to public/install/mysql/tables/llx_c_barcode_type.sql
diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/public/install/mysql/tables/llx_c_chargesociales.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_chargesociales.sql
rename to public/install/mysql/tables/llx_c_chargesociales.sql
diff --git a/htdocs/install/mysql/tables/llx_c_civility.key.sql b/public/install/mysql/tables/llx_c_civility.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_civility.key.sql
rename to public/install/mysql/tables/llx_c_civility.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_civility.sql b/public/install/mysql/tables/llx_c_civility.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_civility.sql
rename to public/install/mysql/tables/llx_c_civility.sql
diff --git a/htdocs/install/mysql/tables/llx_c_country.key.sql b/public/install/mysql/tables/llx_c_country.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_country.key.sql
rename to public/install/mysql/tables/llx_c_country.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_country.sql b/public/install/mysql/tables/llx_c_country.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_country.sql
rename to public/install/mysql/tables/llx_c_country.sql
diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/public/install/mysql/tables/llx_c_currencies.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_currencies.key.sql
rename to public/install/mysql/tables/llx_c_currencies.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/public/install/mysql/tables/llx_c_currencies.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_currencies.sql
rename to public/install/mysql/tables/llx_c_currencies.sql
diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/public/install/mysql/tables/llx_c_departements.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_departements.key.sql
rename to public/install/mysql/tables/llx_c_departements.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_departements.sql b/public/install/mysql/tables/llx_c_departements.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_departements.sql
rename to public/install/mysql/tables/llx_c_departements.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/public/install/mysql/tables/llx_c_ecotaxe.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql
rename to public/install/mysql/tables/llx_c_ecotaxe.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/public/install/mysql/tables/llx_c_ecotaxe.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ecotaxe.sql
rename to public/install/mysql/tables/llx_c_ecotaxe.sql
diff --git a/htdocs/install/mysql/tables/llx_c_effectif.key.sql b/public/install/mysql/tables/llx_c_effectif.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_effectif.key.sql
rename to public/install/mysql/tables/llx_c_effectif.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/public/install/mysql/tables/llx_c_effectif.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_effectif.sql
rename to public/install/mysql/tables/llx_c_effectif.sql
diff --git a/htdocs/install/mysql/tables/llx_c_email_templates.key.sql b/public/install/mysql/tables/llx_c_email_templates.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_email_templates.key.sql
rename to public/install/mysql/tables/llx_c_email_templates.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_email_templates.sql b/public/install/mysql/tables/llx_c_email_templates.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_email_templates.sql
rename to public/install/mysql/tables/llx_c_email_templates.sql
diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/public/install/mysql/tables/llx_c_field_list.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_field_list.sql
rename to public/install/mysql/tables/llx_c_field_list.sql
diff --git a/htdocs/install/mysql/tables/llx_c_format_cards.sql b/public/install/mysql/tables/llx_c_format_cards.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_format_cards.sql
rename to public/install/mysql/tables/llx_c_format_cards.sql
diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/public/install/mysql/tables/llx_c_forme_juridique.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql
rename to public/install/mysql/tables/llx_c_forme_juridique.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/public/install/mysql/tables/llx_c_forme_juridique.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_forme_juridique.sql
rename to public/install/mysql/tables/llx_c_forme_juridique.sql
diff --git a/htdocs/install/mysql/tables/llx_c_holiday_types.key.sql b/public/install/mysql/tables/llx_c_holiday_types.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_holiday_types.key.sql
rename to public/install/mysql/tables/llx_c_holiday_types.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_holiday_types.sql b/public/install/mysql/tables/llx_c_holiday_types.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_holiday_types.sql
rename to public/install/mysql/tables/llx_c_holiday_types.sql
diff --git a/htdocs/install/mysql/tables/llx_c_hrm_department.sql b/public/install/mysql/tables/llx_c_hrm_department.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_hrm_department.sql
rename to public/install/mysql/tables/llx_c_hrm_department.sql
diff --git a/htdocs/install/mysql/tables/llx_c_hrm_function.sql b/public/install/mysql/tables/llx_c_hrm_function.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_hrm_function.sql
rename to public/install/mysql/tables/llx_c_hrm_function.sql
diff --git a/htdocs/install/mysql/tables/llx_c_incoterms.key.sql b/public/install/mysql/tables/llx_c_incoterms.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_incoterms.key.sql
rename to public/install/mysql/tables/llx_c_incoterms.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_incoterms.sql b/public/install/mysql/tables/llx_c_incoterms.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_incoterms.sql
rename to public/install/mysql/tables/llx_c_incoterms.sql
diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/public/install/mysql/tables/llx_c_input_method.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_input_method.key.sql
rename to public/install/mysql/tables/llx_c_input_method.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/public/install/mysql/tables/llx_c_input_method.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_input_method.sql
rename to public/install/mysql/tables/llx_c_input_method.sql
diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/public/install/mysql/tables/llx_c_input_reason.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_input_reason.key.sql
rename to public/install/mysql/tables/llx_c_input_reason.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/public/install/mysql/tables/llx_c_input_reason.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_input_reason.sql
rename to public/install/mysql/tables/llx_c_input_reason.sql
diff --git a/htdocs/install/mysql/tables/llx_c_lead_status.key.sql b/public/install/mysql/tables/llx_c_lead_status.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_lead_status.key.sql
rename to public/install/mysql/tables/llx_c_lead_status.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_lead_status.sql b/public/install/mysql/tables/llx_c_lead_status.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_lead_status.sql
rename to public/install/mysql/tables/llx_c_lead_status.sql
diff --git a/htdocs/install/mysql/tables/llx_c_paiement.key.sql b/public/install/mysql/tables/llx_c_paiement.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_paiement.key.sql
rename to public/install/mysql/tables/llx_c_paiement.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/public/install/mysql/tables/llx_c_paiement.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_paiement.sql
rename to public/install/mysql/tables/llx_c_paiement.sql
diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/public/install/mysql/tables/llx_c_paper_format.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_paper_format.sql
rename to public/install/mysql/tables/llx_c_paper_format.sql
diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/public/install/mysql/tables/llx_c_payment_term.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_payment_term.sql
rename to public/install/mysql/tables/llx_c_payment_term.sql
diff --git a/htdocs/install/mysql/tables/llx_c_price_expression.sql b/public/install/mysql/tables/llx_c_price_expression.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_price_expression.sql
rename to public/install/mysql/tables/llx_c_price_expression.sql
diff --git a/htdocs/install/mysql/tables/llx_c_price_global_variable.sql b/public/install/mysql/tables/llx_c_price_global_variable.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_price_global_variable.sql
rename to public/install/mysql/tables/llx_c_price_global_variable.sql
diff --git a/htdocs/install/mysql/tables/llx_c_price_global_variable_updater.sql b/public/install/mysql/tables/llx_c_price_global_variable_updater.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_price_global_variable_updater.sql
rename to public/install/mysql/tables/llx_c_price_global_variable_updater.sql
diff --git a/htdocs/install/mysql/tables/llx_c_propalst.key.sql b/public/install/mysql/tables/llx_c_propalst.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_propalst.key.sql
rename to public/install/mysql/tables/llx_c_propalst.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/public/install/mysql/tables/llx_c_propalst.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_propalst.sql
rename to public/install/mysql/tables/llx_c_propalst.sql
diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/public/install/mysql/tables/llx_c_prospectlevel.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_prospectlevel.sql
rename to public/install/mysql/tables/llx_c_prospectlevel.sql
diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/public/install/mysql/tables/llx_c_regions.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_regions.key.sql
rename to public/install/mysql/tables/llx_c_regions.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/public/install/mysql/tables/llx_c_regions.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_regions.sql
rename to public/install/mysql/tables/llx_c_regions.sql
diff --git a/htdocs/install/mysql/tables/llx_c_revenuestamp.sql b/public/install/mysql/tables/llx_c_revenuestamp.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_revenuestamp.sql
rename to public/install/mysql/tables/llx_c_revenuestamp.sql
diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.key.sql b/public/install/mysql/tables/llx_c_shipment_mode.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_shipment_mode.key.sql
rename to public/install/mysql/tables/llx_c_shipment_mode.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/public/install/mysql/tables/llx_c_shipment_mode.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_shipment_mode.sql
rename to public/install/mysql/tables/llx_c_shipment_mode.sql
diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.key.sql b/public/install/mysql/tables/llx_c_stcomm.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_stcomm.key.sql
rename to public/install/mysql/tables/llx_c_stcomm.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/public/install/mysql/tables/llx_c_stcomm.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_stcomm.sql
rename to public/install/mysql/tables/llx_c_stcomm.sql
diff --git a/htdocs/install/mysql/tables/llx_c_tva.key.sql b/public/install/mysql/tables/llx_c_tva.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_tva.key.sql
rename to public/install/mysql/tables/llx_c_tva.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/public/install/mysql/tables/llx_c_tva.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_tva.sql
rename to public/install/mysql/tables/llx_c_tva.sql
diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/public/install/mysql/tables/llx_c_type_contact.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_type_contact.key.sql
rename to public/install/mysql/tables/llx_c_type_contact.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/public/install/mysql/tables/llx_c_type_contact.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_type_contact.sql
rename to public/install/mysql/tables/llx_c_type_contact.sql
diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.key.sql b/public/install/mysql/tables/llx_c_type_fees.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_type_fees.key.sql
rename to public/install/mysql/tables/llx_c_type_fees.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/public/install/mysql/tables/llx_c_type_fees.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_type_fees.sql
rename to public/install/mysql/tables/llx_c_type_fees.sql
diff --git a/htdocs/install/mysql/tables/llx_c_type_resource.key.sql b/public/install/mysql/tables/llx_c_type_resource.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_type_resource.key.sql
rename to public/install/mysql/tables/llx_c_type_resource.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_type_resource.sql b/public/install/mysql/tables/llx_c_type_resource.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_type_resource.sql
rename to public/install/mysql/tables/llx_c_type_resource.sql
diff --git a/htdocs/install/mysql/tables/llx_c_typent.key.sql b/public/install/mysql/tables/llx_c_typent.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_typent.key.sql
rename to public/install/mysql/tables/llx_c_typent.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/public/install/mysql/tables/llx_c_typent.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_typent.sql
rename to public/install/mysql/tables/llx_c_typent.sql
diff --git a/htdocs/install/mysql/tables/llx_c_units.key.sql b/public/install/mysql/tables/llx_c_units.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_units.key.sql
rename to public/install/mysql/tables/llx_c_units.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_units.sql b/public/install/mysql/tables/llx_c_units.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_units.sql
rename to public/install/mysql/tables/llx_c_units.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/public/install/mysql/tables/llx_c_ziptown.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ziptown.key.sql
rename to public/install/mysql/tables/llx_c_ziptown.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/public/install/mysql/tables/llx_c_ziptown.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ziptown.sql
rename to public/install/mysql/tables/llx_c_ziptown.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/public/install/mysql/tables/llx_categorie.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie.key.sql
rename to public/install/mysql/tables/llx_categorie.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/public/install/mysql/tables/llx_categorie.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie.sql
rename to public/install/mysql/tables/llx_categorie.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_account.key.sql b/public/install/mysql/tables/llx_categorie_account.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_account.key.sql
rename to public/install/mysql/tables/llx_categorie_account.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_account.sql b/public/install/mysql/tables/llx_categorie_account.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_account.sql
rename to public/install/mysql/tables/llx_categorie_account.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_contact.key.sql b/public/install/mysql/tables/llx_categorie_contact.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_contact.key.sql
rename to public/install/mysql/tables/llx_categorie_contact.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_contact.sql b/public/install/mysql/tables/llx_categorie_contact.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_contact.sql
rename to public/install/mysql/tables/llx_categorie_contact.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.key.sql b/public/install/mysql/tables/llx_categorie_fournisseur.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_fournisseur.key.sql
rename to public/install/mysql/tables/llx_categorie_fournisseur.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/public/install/mysql/tables/llx_categorie_fournisseur.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_fournisseur.sql
rename to public/install/mysql/tables/llx_categorie_fournisseur.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_lang.key.sql b/public/install/mysql/tables/llx_categorie_lang.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_lang.key.sql
rename to public/install/mysql/tables/llx_categorie_lang.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_lang.sql b/public/install/mysql/tables/llx_categorie_lang.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_lang.sql
rename to public/install/mysql/tables/llx_categorie_lang.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/public/install/mysql/tables/llx_categorie_member.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_member.key.sql
rename to public/install/mysql/tables/llx_categorie_member.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/public/install/mysql/tables/llx_categorie_member.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_member.sql
rename to public/install/mysql/tables/llx_categorie_member.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/public/install/mysql/tables/llx_categorie_product.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_product.key.sql
rename to public/install/mysql/tables/llx_categorie_product.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/public/install/mysql/tables/llx_categorie_product.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_product.sql
rename to public/install/mysql/tables/llx_categorie_product.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_project.key.sql b/public/install/mysql/tables/llx_categorie_project.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_project.key.sql
rename to public/install/mysql/tables/llx_categorie_project.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_project.sql b/public/install/mysql/tables/llx_categorie_project.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_project.sql
rename to public/install/mysql/tables/llx_categorie_project.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/public/install/mysql/tables/llx_categorie_societe.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_societe.key.sql
rename to public/install/mysql/tables/llx_categorie_societe.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/public/install/mysql/tables/llx_categorie_societe.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_societe.sql
rename to public/install/mysql/tables/llx_categorie_societe.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_user.key.sql b/public/install/mysql/tables/llx_categorie_user.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_user.key.sql
rename to public/install/mysql/tables/llx_categorie_user.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_user.sql b/public/install/mysql/tables/llx_categorie_user.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_user.sql
rename to public/install/mysql/tables/llx_categorie_user.sql
diff --git a/htdocs/install/mysql/tables/llx_categories_extrafields.key.sql b/public/install/mysql/tables/llx_categories_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categories_extrafields.key.sql
rename to public/install/mysql/tables/llx_categories_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categories_extrafields.sql b/public/install/mysql/tables/llx_categories_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categories_extrafields.sql
rename to public/install/mysql/tables/llx_categories_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/public/install/mysql/tables/llx_chargesociales.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_chargesociales.sql
rename to public/install/mysql/tables/llx_chargesociales.sql
diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/public/install/mysql/tables/llx_commande.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande.key.sql
rename to public/install/mysql/tables/llx_commande.key.sql
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/public/install/mysql/tables/llx_commande.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande.sql
rename to public/install/mysql/tables/llx_commande.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_extrafields.key.sql b/public/install/mysql/tables/llx_commande_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_extrafields.key.sql
rename to public/install/mysql/tables/llx_commande_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_extrafields.sql b/public/install/mysql/tables/llx_commande_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_extrafields.sql
rename to public/install/mysql/tables/llx_commande_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/public/install/mysql/tables/llx_commande_fournisseur.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql
rename to public/install/mysql/tables/llx_commande_fournisseur.key.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/public/install/mysql/tables/llx_commande_fournisseur.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseur.sql
rename to public/install/mysql/tables/llx_commande_fournisseur.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/public/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql
rename to public/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/public/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
rename to public/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.key.sql b/public/install/mysql/tables/llx_commande_fournisseur_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.key.sql
rename to public/install/mysql/tables/llx_commande_fournisseur_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql b/public/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
rename to public/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/public/install/mysql/tables/llx_commande_fournisseur_log.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql
rename to public/install/mysql/tables/llx_commande_fournisseur_log.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql b/public/install/mysql/tables/llx_commande_fournisseurdet.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql
rename to public/install/mysql/tables/llx_commande_fournisseurdet.key.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/public/install/mysql/tables/llx_commande_fournisseurdet.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
rename to public/install/mysql/tables/llx_commande_fournisseurdet.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.key.sql b/public/install/mysql/tables/llx_commande_fournisseurdet_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.key.sql
rename to public/install/mysql/tables/llx_commande_fournisseurdet_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql b/public/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
rename to public/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/public/install/mysql/tables/llx_commandedet.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commandedet.key.sql
rename to public/install/mysql/tables/llx_commandedet.key.sql
diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/public/install/mysql/tables/llx_commandedet.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commandedet.sql
rename to public/install/mysql/tables/llx_commandedet.sql
diff --git a/htdocs/install/mysql/tables/llx_commandedet_extrafields.key.sql b/public/install/mysql/tables/llx_commandedet_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commandedet_extrafields.key.sql
rename to public/install/mysql/tables/llx_commandedet_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_commandedet_extrafields.sql b/public/install/mysql/tables/llx_commandedet_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
rename to public/install/mysql/tables/llx_commandedet_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/public/install/mysql/tables/llx_const.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_const.key.sql
rename to public/install/mysql/tables/llx_const.key.sql
diff --git a/htdocs/install/mysql/tables/llx_const.sql b/public/install/mysql/tables/llx_const.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_const.sql
rename to public/install/mysql/tables/llx_const.sql
diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/public/install/mysql/tables/llx_contrat.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_contrat.key.sql
rename to public/install/mysql/tables/llx_contrat.key.sql
diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/public/install/mysql/tables/llx_contrat.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_contrat.sql
rename to public/install/mysql/tables/llx_contrat.sql
diff --git a/htdocs/install/mysql/tables/llx_contrat_extrafields.key.sql b/public/install/mysql/tables/llx_contrat_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_contrat_extrafields.key.sql
rename to public/install/mysql/tables/llx_contrat_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_contrat_extrafields.sql b/public/install/mysql/tables/llx_contrat_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_contrat_extrafields.sql
rename to public/install/mysql/tables/llx_contrat_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/public/install/mysql/tables/llx_contratdet.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_contratdet.key.sql
rename to public/install/mysql/tables/llx_contratdet.key.sql
diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/public/install/mysql/tables/llx_contratdet.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_contratdet.sql
rename to public/install/mysql/tables/llx_contratdet.sql
diff --git a/htdocs/install/mysql/tables/llx_contratdet_extrafields.key.sql b/public/install/mysql/tables/llx_contratdet_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_contratdet_extrafields.key.sql
rename to public/install/mysql/tables/llx_contratdet_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_contratdet_extrafields.sql b/public/install/mysql/tables/llx_contratdet_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_contratdet_extrafields.sql
rename to public/install/mysql/tables/llx_contratdet_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/public/install/mysql/tables/llx_contratdet_log.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_contratdet_log.key.sql
rename to public/install/mysql/tables/llx_contratdet_log.key.sql
diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/public/install/mysql/tables/llx_contratdet_log.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_contratdet_log.sql
rename to public/install/mysql/tables/llx_contratdet_log.sql
diff --git a/htdocs/install/mysql/tables/llx_cronjob.key.sql b/public/install/mysql/tables/llx_cronjob.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_cronjob.key.sql
rename to public/install/mysql/tables/llx_cronjob.key.sql
diff --git a/htdocs/install/mysql/tables/llx_cronjob.sql b/public/install/mysql/tables/llx_cronjob.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_cronjob.sql
rename to public/install/mysql/tables/llx_cronjob.sql
diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/public/install/mysql/tables/llx_deplacement.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_deplacement.sql
rename to public/install/mysql/tables/llx_deplacement.sql
diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/public/install/mysql/tables/llx_document_model.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_document_model.key.sql
rename to public/install/mysql/tables/llx_document_model.key.sql
diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/public/install/mysql/tables/llx_document_model.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_document_model.sql
rename to public/install/mysql/tables/llx_document_model.sql
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/public/install/mysql/tables/llx_don.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_don.sql
rename to public/install/mysql/tables/llx_don.sql
diff --git a/htdocs/install/mysql/tables/llx_don_extrafields.key.sql b/public/install/mysql/tables/llx_don_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_don_extrafields.key.sql
rename to public/install/mysql/tables/llx_don_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_don_extrafields.sql b/public/install/mysql/tables/llx_don_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_don_extrafields.sql
rename to public/install/mysql/tables/llx_don_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/public/install/mysql/tables/llx_ecm_directories.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_ecm_directories.key.sql
rename to public/install/mysql/tables/llx_ecm_directories.key.sql
diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/public/install/mysql/tables/llx_ecm_directories.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_ecm_directories.sql
rename to public/install/mysql/tables/llx_ecm_directories.sql
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.key.sql b/public/install/mysql/tables/llx_ecm_files.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_ecm_files.key.sql
rename to public/install/mysql/tables/llx_ecm_files.key.sql
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/public/install/mysql/tables/llx_ecm_files.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_ecm_files.sql
rename to public/install/mysql/tables/llx_ecm_files.sql
diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/public/install/mysql/tables/llx_element_contact.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_element_contact.key.sql
rename to public/install/mysql/tables/llx_element_contact.key.sql
diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/public/install/mysql/tables/llx_element_contact.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_element_contact.sql
rename to public/install/mysql/tables/llx_element_contact.sql
diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/public/install/mysql/tables/llx_element_element.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_element_element.key.sql
rename to public/install/mysql/tables/llx_element_element.key.sql
diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/public/install/mysql/tables/llx_element_element.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_element_element.sql
rename to public/install/mysql/tables/llx_element_element.sql
diff --git a/htdocs/install/mysql/tables/llx_element_resources.key.sql b/public/install/mysql/tables/llx_element_resources.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_element_resources.key.sql
rename to public/install/mysql/tables/llx_element_resources.key.sql
diff --git a/htdocs/install/mysql/tables/llx_element_resources.sql b/public/install/mysql/tables/llx_element_resources.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_element_resources.sql
rename to public/install/mysql/tables/llx_element_resources.sql
diff --git a/htdocs/install/mysql/tables/llx_element_tag.key.sql b/public/install/mysql/tables/llx_element_tag.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_element_tag.key.sql
rename to public/install/mysql/tables/llx_element_tag.key.sql
diff --git a/htdocs/install/mysql/tables/llx_element_tag.sql b/public/install/mysql/tables/llx_element_tag.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_element_tag.sql
rename to public/install/mysql/tables/llx_element_tag.sql
diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/public/install/mysql/tables/llx_entrepot.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_entrepot.key.sql
rename to public/install/mysql/tables/llx_entrepot.key.sql
diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/public/install/mysql/tables/llx_entrepot.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_entrepot.sql
rename to public/install/mysql/tables/llx_entrepot.sql
diff --git a/htdocs/install/mysql/tables/llx_establishment.sql b/public/install/mysql/tables/llx_establishment.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_establishment.sql
rename to public/install/mysql/tables/llx_establishment.sql
diff --git a/htdocs/install/mysql/tables/llx_event_element.sql b/public/install/mysql/tables/llx_event_element.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_event_element.sql
rename to public/install/mysql/tables/llx_event_element.sql
diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/public/install/mysql/tables/llx_events.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_events.key.sql
rename to public/install/mysql/tables/llx_events.key.sql
diff --git a/htdocs/install/mysql/tables/llx_events.sql b/public/install/mysql/tables/llx_events.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_events.sql
rename to public/install/mysql/tables/llx_events.sql
diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/public/install/mysql/tables/llx_expedition.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expedition.key.sql
rename to public/install/mysql/tables/llx_expedition.key.sql
diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/public/install/mysql/tables/llx_expedition.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expedition.sql
rename to public/install/mysql/tables/llx_expedition.sql
diff --git a/htdocs/install/mysql/tables/llx_expedition_extrafields.key.sql b/public/install/mysql/tables/llx_expedition_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expedition_extrafields.key.sql
rename to public/install/mysql/tables/llx_expedition_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_expedition_extrafields.sql b/public/install/mysql/tables/llx_expedition_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expedition_extrafields.sql
rename to public/install/mysql/tables/llx_expedition_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/public/install/mysql/tables/llx_expeditiondet.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expeditiondet.key.sql
rename to public/install/mysql/tables/llx_expeditiondet.key.sql
diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/public/install/mysql/tables/llx_expeditiondet.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expeditiondet.sql
rename to public/install/mysql/tables/llx_expeditiondet.sql
diff --git a/htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql b/public/install/mysql/tables/llx_expeditiondet_batch.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
rename to public/install/mysql/tables/llx_expeditiondet_batch.key.sql
diff --git a/htdocs/install/mysql/tables/llx_expeditiondet_batch.sql b/public/install/mysql/tables/llx_expeditiondet_batch.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expeditiondet_batch.sql
rename to public/install/mysql/tables/llx_expeditiondet_batch.sql
diff --git a/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.key.sql b/public/install/mysql/tables/llx_expeditiondet_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expeditiondet_extrafields.key.sql
rename to public/install/mysql/tables/llx_expeditiondet_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql b/public/install/mysql/tables/llx_expeditiondet_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql
rename to public/install/mysql/tables/llx_expeditiondet_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_expensereport.key.sql b/public/install/mysql/tables/llx_expensereport.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expensereport.key.sql
rename to public/install/mysql/tables/llx_expensereport.key.sql
diff --git a/htdocs/install/mysql/tables/llx_expensereport.sql b/public/install/mysql/tables/llx_expensereport.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expensereport.sql
rename to public/install/mysql/tables/llx_expensereport.sql
diff --git a/htdocs/install/mysql/tables/llx_expensereport_det.sql b/public/install/mysql/tables/llx_expensereport_det.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expensereport_det.sql
rename to public/install/mysql/tables/llx_expensereport_det.sql
diff --git a/htdocs/install/mysql/tables/llx_expensereport_extrafields.key.sql b/public/install/mysql/tables/llx_expensereport_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expensereport_extrafields.key.sql
rename to public/install/mysql/tables/llx_expensereport_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_expensereport_extrafields.sql b/public/install/mysql/tables/llx_expensereport_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_expensereport_extrafields.sql
rename to public/install/mysql/tables/llx_expensereport_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/public/install/mysql/tables/llx_export_compta.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_export_compta.sql
rename to public/install/mysql/tables/llx_export_compta.sql
diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/public/install/mysql/tables/llx_export_model.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_export_model.key.sql
rename to public/install/mysql/tables/llx_export_model.key.sql
diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/public/install/mysql/tables/llx_export_model.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_export_model.sql
rename to public/install/mysql/tables/llx_export_model.sql
diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/public/install/mysql/tables/llx_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_extrafields.key.sql
rename to public/install/mysql/tables/llx_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/public/install/mysql/tables/llx_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_extrafields.sql
rename to public/install/mysql/tables/llx_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/public/install/mysql/tables/llx_facture.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture.key.sql
rename to public/install/mysql/tables/llx_facture.key.sql
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/public/install/mysql/tables/llx_facture.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture.sql
rename to public/install/mysql/tables/llx_facture.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_extrafields.key.sql b/public/install/mysql/tables/llx_facture_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_extrafields.key.sql
rename to public/install/mysql/tables/llx_facture_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_extrafields.sql b/public/install/mysql/tables/llx_facture_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_extrafields.sql
rename to public/install/mysql/tables/llx_facture_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/public/install/mysql/tables/llx_facture_fourn.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_fourn.key.sql
rename to public/install/mysql/tables/llx_facture_fourn.key.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/public/install/mysql/tables/llx_facture_fourn.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_fourn.sql
rename to public/install/mysql/tables/llx_facture_fourn.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/public/install/mysql/tables/llx_facture_fourn_det.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql
rename to public/install/mysql/tables/llx_facture_fourn_det.key.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/public/install/mysql/tables/llx_facture_fourn_det.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_fourn_det.sql
rename to public/install/mysql/tables/llx_facture_fourn_det.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.key.sql b/public/install/mysql/tables/llx_facture_fourn_det_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.key.sql
rename to public/install/mysql/tables/llx_facture_fourn_det_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql b/public/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
rename to public/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.key.sql b/public/install/mysql/tables/llx_facture_fourn_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_fourn_extrafields.key.sql
rename to public/install/mysql/tables/llx_facture_fourn_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql b/public/install/mysql/tables/llx_facture_fourn_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql
rename to public/install/mysql/tables/llx_facture_fourn_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/public/install/mysql/tables/llx_facture_rec.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_rec.key.sql
rename to public/install/mysql/tables/llx_facture_rec.key.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/public/install/mysql/tables/llx_facture_rec.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_rec.sql
rename to public/install/mysql/tables/llx_facture_rec.sql
diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/public/install/mysql/tables/llx_facturedet.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facturedet.key.sql
rename to public/install/mysql/tables/llx_facturedet.key.sql
diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/public/install/mysql/tables/llx_facturedet.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facturedet.sql
rename to public/install/mysql/tables/llx_facturedet.sql
diff --git a/htdocs/install/mysql/tables/llx_facturedet_extrafields.key.sql b/public/install/mysql/tables/llx_facturedet_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facturedet_extrafields.key.sql
rename to public/install/mysql/tables/llx_facturedet_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_facturedet_extrafields.sql b/public/install/mysql/tables/llx_facturedet_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
rename to public/install/mysql/tables/llx_facturedet_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.key.sql b/public/install/mysql/tables/llx_facturedet_rec.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facturedet_rec.key.sql
rename to public/install/mysql/tables/llx_facturedet_rec.key.sql
diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/public/install/mysql/tables/llx_facturedet_rec.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facturedet_rec.sql
rename to public/install/mysql/tables/llx_facturedet_rec.sql
diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/public/install/mysql/tables/llx_fichinter.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_fichinter.key.sql
rename to public/install/mysql/tables/llx_fichinter.key.sql
diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/public/install/mysql/tables/llx_fichinter.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_fichinter.sql
rename to public/install/mysql/tables/llx_fichinter.sql
diff --git a/htdocs/install/mysql/tables/llx_fichinter_extrafields.key.sql b/public/install/mysql/tables/llx_fichinter_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_fichinter_extrafields.key.sql
rename to public/install/mysql/tables/llx_fichinter_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql b/public/install/mysql/tables/llx_fichinter_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_fichinter_extrafields.sql
rename to public/install/mysql/tables/llx_fichinter_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/public/install/mysql/tables/llx_fichinterdet.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_fichinterdet.key.sql
rename to public/install/mysql/tables/llx_fichinterdet.key.sql
diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/public/install/mysql/tables/llx_fichinterdet.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_fichinterdet.sql
rename to public/install/mysql/tables/llx_fichinterdet.sql
diff --git a/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.key.sql b/public/install/mysql/tables/llx_fichinterdet_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_fichinterdet_extrafields.key.sql
rename to public/install/mysql/tables/llx_fichinterdet_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql b/public/install/mysql/tables/llx_fichinterdet_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql
rename to public/install/mysql/tables/llx_fichinterdet_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_holiday.key.sql b/public/install/mysql/tables/llx_holiday.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_holiday.key.sql
rename to public/install/mysql/tables/llx_holiday.key.sql
diff --git a/htdocs/install/mysql/tables/llx_holiday.sql b/public/install/mysql/tables/llx_holiday.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_holiday.sql
rename to public/install/mysql/tables/llx_holiday.sql
diff --git a/htdocs/install/mysql/tables/llx_holiday_config.sql b/public/install/mysql/tables/llx_holiday_config.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_holiday_config.sql
rename to public/install/mysql/tables/llx_holiday_config.sql
diff --git a/htdocs/install/mysql/tables/llx_holiday_logs.sql b/public/install/mysql/tables/llx_holiday_logs.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_holiday_logs.sql
rename to public/install/mysql/tables/llx_holiday_logs.sql
diff --git a/htdocs/install/mysql/tables/llx_holiday_users.sql b/public/install/mysql/tables/llx_holiday_users.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_holiday_users.sql
rename to public/install/mysql/tables/llx_holiday_users.sql
diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/public/install/mysql/tables/llx_import_model.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_import_model.key.sql
rename to public/install/mysql/tables/llx_import_model.key.sql
diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/public/install/mysql/tables/llx_import_model.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_import_model.sql
rename to public/install/mysql/tables/llx_import_model.sql
diff --git a/htdocs/install/mysql/tables/llx_links.key.sql b/public/install/mysql/tables/llx_links.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_links.key.sql
rename to public/install/mysql/tables/llx_links.key.sql
diff --git a/htdocs/install/mysql/tables/llx_links.sql b/public/install/mysql/tables/llx_links.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_links.sql
rename to public/install/mysql/tables/llx_links.sql
diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/public/install/mysql/tables/llx_livraison.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_livraison.key.sql
rename to public/install/mysql/tables/llx_livraison.key.sql
diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/public/install/mysql/tables/llx_livraison.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_livraison.sql
rename to public/install/mysql/tables/llx_livraison.sql
diff --git a/htdocs/install/mysql/tables/llx_livraison_extrafields.key.sql b/public/install/mysql/tables/llx_livraison_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_livraison_extrafields.key.sql
rename to public/install/mysql/tables/llx_livraison_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_livraison_extrafields.sql b/public/install/mysql/tables/llx_livraison_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_livraison_extrafields.sql
rename to public/install/mysql/tables/llx_livraison_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/public/install/mysql/tables/llx_livraisondet.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_livraisondet.key.sql
rename to public/install/mysql/tables/llx_livraisondet.key.sql
diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/public/install/mysql/tables/llx_livraisondet.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_livraisondet.sql
rename to public/install/mysql/tables/llx_livraisondet.sql
diff --git a/htdocs/install/mysql/tables/llx_livraisondet_extrafields.key.sql b/public/install/mysql/tables/llx_livraisondet_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_livraisondet_extrafields.key.sql
rename to public/install/mysql/tables/llx_livraisondet_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql b/public/install/mysql/tables/llx_livraisondet_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql
rename to public/install/mysql/tables/llx_livraisondet_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/public/install/mysql/tables/llx_loan.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_loan.sql
rename to public/install/mysql/tables/llx_loan.sql
diff --git a/htdocs/install/mysql/tables/llx_localtax.sql b/public/install/mysql/tables/llx_localtax.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_localtax.sql
rename to public/install/mysql/tables/llx_localtax.sql
diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/public/install/mysql/tables/llx_mailing.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_mailing.sql
rename to public/install/mysql/tables/llx_mailing.sql
diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/public/install/mysql/tables/llx_mailing_cibles.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_mailing_cibles.key.sql
rename to public/install/mysql/tables/llx_mailing_cibles.key.sql
diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/public/install/mysql/tables/llx_mailing_cibles.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_mailing_cibles.sql
rename to public/install/mysql/tables/llx_mailing_cibles.sql
diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/public/install/mysql/tables/llx_menu.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_menu.key.sql
rename to public/install/mysql/tables/llx_menu.key.sql
diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/public/install/mysql/tables/llx_menu.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_menu.sql
rename to public/install/mysql/tables/llx_menu.sql
diff --git a/htdocs/install/mysql/tables/llx_multicurrency.sql b/public/install/mysql/tables/llx_multicurrency.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_multicurrency.sql
rename to public/install/mysql/tables/llx_multicurrency.sql
diff --git a/htdocs/install/mysql/tables/llx_multicurrency_rate.sql b/public/install/mysql/tables/llx_multicurrency_rate.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_multicurrency_rate.sql
rename to public/install/mysql/tables/llx_multicurrency_rate.sql
diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/public/install/mysql/tables/llx_notify.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_notify.sql
rename to public/install/mysql/tables/llx_notify.sql
diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/public/install/mysql/tables/llx_notify_def.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_notify_def.sql
rename to public/install/mysql/tables/llx_notify_def.sql
diff --git a/htdocs/install/mysql/tables/llx_oauth_state.sql b/public/install/mysql/tables/llx_oauth_state.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_oauth_state.sql
rename to public/install/mysql/tables/llx_oauth_state.sql
diff --git a/htdocs/install/mysql/tables/llx_oauth_token.sql b/public/install/mysql/tables/llx_oauth_token.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_oauth_token.sql
rename to public/install/mysql/tables/llx_oauth_token.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_comments.key.sql b/public/install/mysql/tables/llx_opensurvey_comments.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_comments.key.sql
rename to public/install/mysql/tables/llx_opensurvey_comments.key.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_comments.sql b/public/install/mysql/tables/llx_opensurvey_comments.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_comments.sql
rename to public/install/mysql/tables/llx_opensurvey_comments.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_formquestions.sql b/public/install/mysql/tables/llx_opensurvey_formquestions.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_formquestions.sql
rename to public/install/mysql/tables/llx_opensurvey_formquestions.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.key.sql b/public/install/mysql/tables/llx_opensurvey_sondage.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_sondage.key.sql
rename to public/install/mysql/tables/llx_opensurvey_sondage.key.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql b/public/install/mysql/tables/llx_opensurvey_sondage.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
rename to public/install/mysql/tables/llx_opensurvey_sondage.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_user_formanswers.sql b/public/install/mysql/tables/llx_opensurvey_user_formanswers.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_user_formanswers.sql
rename to public/install/mysql/tables/llx_opensurvey_user_formanswers.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_user_studs.key.sql b/public/install/mysql/tables/llx_opensurvey_user_studs.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_user_studs.key.sql
rename to public/install/mysql/tables/llx_opensurvey_user_studs.key.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql b/public/install/mysql/tables/llx_opensurvey_user_studs.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
rename to public/install/mysql/tables/llx_opensurvey_user_studs.sql
diff --git a/htdocs/install/mysql/tables/llx_overwrite_trans.key.sql b/public/install/mysql/tables/llx_overwrite_trans.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_overwrite_trans.key.sql
rename to public/install/mysql/tables/llx_overwrite_trans.key.sql
diff --git a/htdocs/install/mysql/tables/llx_overwrite_trans.sql b/public/install/mysql/tables/llx_overwrite_trans.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_overwrite_trans.sql
rename to public/install/mysql/tables/llx_overwrite_trans.sql
diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/public/install/mysql/tables/llx_paiement.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_paiement.sql
rename to public/install/mysql/tables/llx_paiement.sql
diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/public/install/mysql/tables/llx_paiement_facture.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_paiement_facture.key.sql
rename to public/install/mysql/tables/llx_paiement_facture.key.sql
diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/public/install/mysql/tables/llx_paiement_facture.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_paiement_facture.sql
rename to public/install/mysql/tables/llx_paiement_facture.sql
diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/public/install/mysql/tables/llx_paiementcharge.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_paiementcharge.sql
rename to public/install/mysql/tables/llx_paiementcharge.sql
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/public/install/mysql/tables/llx_paiementfourn.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_paiementfourn.sql
rename to public/install/mysql/tables/llx_paiementfourn.sql
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/public/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql
rename to public/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/public/install/mysql/tables/llx_paiementfourn_facturefourn.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql
rename to public/install/mysql/tables/llx_paiementfourn_facturefourn.sql
diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/public/install/mysql/tables/llx_payment_donation.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_payment_donation.sql
rename to public/install/mysql/tables/llx_payment_donation.sql
diff --git a/htdocs/install/mysql/tables/llx_payment_expensereport.sql b/public/install/mysql/tables/llx_payment_expensereport.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_payment_expensereport.sql
rename to public/install/mysql/tables/llx_payment_expensereport.sql
diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/public/install/mysql/tables/llx_payment_loan.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_payment_loan.sql
rename to public/install/mysql/tables/llx_payment_loan.sql
diff --git a/htdocs/install/mysql/tables/llx_payment_salary.key.sql b/public/install/mysql/tables/llx_payment_salary.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_payment_salary.key.sql
rename to public/install/mysql/tables/llx_payment_salary.key.sql
diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/public/install/mysql/tables/llx_payment_salary.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_payment_salary.sql
rename to public/install/mysql/tables/llx_payment_salary.sql
diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/public/install/mysql/tables/llx_prelevement_bons.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_prelevement_bons.key.sql
rename to public/install/mysql/tables/llx_prelevement_bons.key.sql
diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/public/install/mysql/tables/llx_prelevement_bons.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_prelevement_bons.sql
rename to public/install/mysql/tables/llx_prelevement_bons.sql
diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/public/install/mysql/tables/llx_prelevement_facture.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_prelevement_facture.key.sql
rename to public/install/mysql/tables/llx_prelevement_facture.key.sql
diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/public/install/mysql/tables/llx_prelevement_facture.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_prelevement_facture.sql
rename to public/install/mysql/tables/llx_prelevement_facture.sql
diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/public/install/mysql/tables/llx_prelevement_facture_demande.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
rename to public/install/mysql/tables/llx_prelevement_facture_demande.sql
diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/public/install/mysql/tables/llx_prelevement_lignes.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql
rename to public/install/mysql/tables/llx_prelevement_lignes.key.sql
diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/public/install/mysql/tables/llx_prelevement_lignes.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_prelevement_lignes.sql
rename to public/install/mysql/tables/llx_prelevement_lignes.sql
diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/public/install/mysql/tables/llx_prelevement_rejet.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_prelevement_rejet.sql
rename to public/install/mysql/tables/llx_prelevement_rejet.sql
diff --git a/htdocs/install/mysql/tables/llx_printing.sql b/public/install/mysql/tables/llx_printing.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_printing.sql
rename to public/install/mysql/tables/llx_printing.sql
diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/public/install/mysql/tables/llx_product.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product.key.sql
rename to public/install/mysql/tables/llx_product.key.sql
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/public/install/mysql/tables/llx_product.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product.sql
rename to public/install/mysql/tables/llx_product.sql
diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/public/install/mysql/tables/llx_product_association.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_association.key.sql
rename to public/install/mysql/tables/llx_product_association.key.sql
diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/public/install/mysql/tables/llx_product_association.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_association.sql
rename to public/install/mysql/tables/llx_product_association.sql
diff --git a/htdocs/install/mysql/tables/llx_product_batch.key.sql b/public/install/mysql/tables/llx_product_batch.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_batch.key.sql
rename to public/install/mysql/tables/llx_product_batch.key.sql
diff --git a/htdocs/install/mysql/tables/llx_product_batch.sql b/public/install/mysql/tables/llx_product_batch.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_batch.sql
rename to public/install/mysql/tables/llx_product_batch.sql
diff --git a/htdocs/install/mysql/tables/llx_product_customer_price.key.sql b/public/install/mysql/tables/llx_product_customer_price.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_customer_price.key.sql
rename to public/install/mysql/tables/llx_product_customer_price.key.sql
diff --git a/htdocs/install/mysql/tables/llx_product_customer_price.sql b/public/install/mysql/tables/llx_product_customer_price.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_customer_price.sql
rename to public/install/mysql/tables/llx_product_customer_price.sql
diff --git a/htdocs/install/mysql/tables/llx_product_customer_price_log.sql b/public/install/mysql/tables/llx_product_customer_price_log.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_customer_price_log.sql
rename to public/install/mysql/tables/llx_product_customer_price_log.sql
diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/public/install/mysql/tables/llx_product_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_extrafields.key.sql
rename to public/install/mysql/tables/llx_product_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/public/install/mysql/tables/llx_product_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_extrafields.sql
rename to public/install/mysql/tables/llx_product_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/public/install/mysql/tables/llx_product_fournisseur_price.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql
rename to public/install/mysql/tables/llx_product_fournisseur_price.key.sql
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/public/install/mysql/tables/llx_product_fournisseur_price.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
rename to public/install/mysql/tables/llx_product_fournisseur_price.sql
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/public/install/mysql/tables/llx_product_fournisseur_price_log.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql
rename to public/install/mysql/tables/llx_product_fournisseur_price_log.sql
diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/public/install/mysql/tables/llx_product_lang.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_lang.key.sql
rename to public/install/mysql/tables/llx_product_lang.key.sql
diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/public/install/mysql/tables/llx_product_lang.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_lang.sql
rename to public/install/mysql/tables/llx_product_lang.sql
diff --git a/htdocs/install/mysql/tables/llx_product_lot.key.sql b/public/install/mysql/tables/llx_product_lot.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_lot.key.sql
rename to public/install/mysql/tables/llx_product_lot.key.sql
diff --git a/htdocs/install/mysql/tables/llx_product_lot.sql b/public/install/mysql/tables/llx_product_lot.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_lot.sql
rename to public/install/mysql/tables/llx_product_lot.sql
diff --git a/htdocs/install/mysql/tables/llx_product_lot_extrafields.key.sql b/public/install/mysql/tables/llx_product_lot_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_lot_extrafields.key.sql
rename to public/install/mysql/tables/llx_product_lot_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_product_lot_extrafields.sql b/public/install/mysql/tables/llx_product_lot_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_lot_extrafields.sql
rename to public/install/mysql/tables/llx_product_lot_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_product_price.key.sql b/public/install/mysql/tables/llx_product_price.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_price.key.sql
rename to public/install/mysql/tables/llx_product_price.key.sql
diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/public/install/mysql/tables/llx_product_price.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_price.sql
rename to public/install/mysql/tables/llx_product_price.sql
diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.key.sql b/public/install/mysql/tables/llx_product_price_by_qty.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_price_by_qty.key.sql
rename to public/install/mysql/tables/llx_product_price_by_qty.key.sql
diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql b/public/install/mysql/tables/llx_product_price_by_qty.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_price_by_qty.sql
rename to public/install/mysql/tables/llx_product_price_by_qty.sql
diff --git a/htdocs/install/mysql/tables/llx_product_pricerules.key.sql b/public/install/mysql/tables/llx_product_pricerules.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_pricerules.key.sql
rename to public/install/mysql/tables/llx_product_pricerules.key.sql
diff --git a/htdocs/install/mysql/tables/llx_product_pricerules.sql b/public/install/mysql/tables/llx_product_pricerules.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_pricerules.sql
rename to public/install/mysql/tables/llx_product_pricerules.sql
diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/public/install/mysql/tables/llx_product_stock.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_stock.key.sql
rename to public/install/mysql/tables/llx_product_stock.key.sql
diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/public/install/mysql/tables/llx_product_stock.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_stock.sql
rename to public/install/mysql/tables/llx_product_stock.sql
diff --git a/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql b/public/install/mysql/tables/llx_product_stock_entrepot.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
rename to public/install/mysql/tables/llx_product_stock_entrepot.sql
diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/public/install/mysql/tables/llx_projet.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_projet.key.sql
rename to public/install/mysql/tables/llx_projet.key.sql
diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/public/install/mysql/tables/llx_projet.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_projet.sql
rename to public/install/mysql/tables/llx_projet.sql
diff --git a/htdocs/install/mysql/tables/llx_projet_extrafields.key.sql b/public/install/mysql/tables/llx_projet_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_projet_extrafields.key.sql
rename to public/install/mysql/tables/llx_projet_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_projet_extrafields.sql b/public/install/mysql/tables/llx_projet_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_projet_extrafields.sql
rename to public/install/mysql/tables/llx_projet_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/public/install/mysql/tables/llx_projet_task.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_projet_task.key.sql
rename to public/install/mysql/tables/llx_projet_task.key.sql
diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/public/install/mysql/tables/llx_projet_task.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_projet_task.sql
rename to public/install/mysql/tables/llx_projet_task.sql
diff --git a/htdocs/install/mysql/tables/llx_projet_task_extrafields.key.sql b/public/install/mysql/tables/llx_projet_task_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_projet_task_extrafields.key.sql
rename to public/install/mysql/tables/llx_projet_task_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_projet_task_extrafields.sql b/public/install/mysql/tables/llx_projet_task_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_projet_task_extrafields.sql
rename to public/install/mysql/tables/llx_projet_task_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.key.sql b/public/install/mysql/tables/llx_projet_task_time.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_projet_task_time.key.sql
rename to public/install/mysql/tables/llx_projet_task_time.key.sql
diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/public/install/mysql/tables/llx_projet_task_time.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_projet_task_time.sql
rename to public/install/mysql/tables/llx_projet_task_time.sql
diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/public/install/mysql/tables/llx_propal.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_propal.key.sql
rename to public/install/mysql/tables/llx_propal.key.sql
diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/public/install/mysql/tables/llx_propal.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_propal.sql
rename to public/install/mysql/tables/llx_propal.sql
diff --git a/htdocs/install/mysql/tables/llx_propal_extrafields.key.sql b/public/install/mysql/tables/llx_propal_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_propal_extrafields.key.sql
rename to public/install/mysql/tables/llx_propal_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_propal_extrafields.sql b/public/install/mysql/tables/llx_propal_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_propal_extrafields.sql
rename to public/install/mysql/tables/llx_propal_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql b/public/install/mysql/tables/llx_propal_merge_pdf_product.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
rename to public/install/mysql/tables/llx_propal_merge_pdf_product.sql
diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/public/install/mysql/tables/llx_propaldet.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_propaldet.key.sql
rename to public/install/mysql/tables/llx_propaldet.key.sql
diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/public/install/mysql/tables/llx_propaldet.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_propaldet.sql
rename to public/install/mysql/tables/llx_propaldet.sql
diff --git a/htdocs/install/mysql/tables/llx_propaldet_extrafields.key.sql b/public/install/mysql/tables/llx_propaldet_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_propaldet_extrafields.key.sql
rename to public/install/mysql/tables/llx_propaldet_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_propaldet_extrafields.sql b/public/install/mysql/tables/llx_propaldet_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_propaldet_extrafields.sql
rename to public/install/mysql/tables/llx_propaldet_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_resource.key.sql b/public/install/mysql/tables/llx_resource.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_resource.key.sql
rename to public/install/mysql/tables/llx_resource.key.sql
diff --git a/htdocs/install/mysql/tables/llx_resource.sql b/public/install/mysql/tables/llx_resource.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_resource.sql
rename to public/install/mysql/tables/llx_resource.sql
diff --git a/htdocs/install/mysql/tables/llx_resource_extrafields.key.sql b/public/install/mysql/tables/llx_resource_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_resource_extrafields.key.sql
rename to public/install/mysql/tables/llx_resource_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_resource_extrafields.sql b/public/install/mysql/tables/llx_resource_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_resource_extrafields.sql
rename to public/install/mysql/tables/llx_resource_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/public/install/mysql/tables/llx_rights_def.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_rights_def.key.sql
rename to public/install/mysql/tables/llx_rights_def.key.sql
diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/public/install/mysql/tables/llx_rights_def.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_rights_def.sql
rename to public/install/mysql/tables/llx_rights_def.sql
diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/public/install/mysql/tables/llx_societe.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe.key.sql
rename to public/install/mysql/tables/llx_societe.key.sql
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/public/install/mysql/tables/llx_societe.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe.sql
rename to public/install/mysql/tables/llx_societe.sql
diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/public/install/mysql/tables/llx_societe_address.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe_address.sql
rename to public/install/mysql/tables/llx_societe_address.sql
diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/public/install/mysql/tables/llx_societe_commerciaux.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql
rename to public/install/mysql/tables/llx_societe_commerciaux.key.sql
diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/public/install/mysql/tables/llx_societe_commerciaux.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe_commerciaux.sql
rename to public/install/mysql/tables/llx_societe_commerciaux.sql
diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/public/install/mysql/tables/llx_societe_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe_extrafields.key.sql
rename to public/install/mysql/tables/llx_societe_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/public/install/mysql/tables/llx_societe_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe_extrafields.sql
rename to public/install/mysql/tables/llx_societe_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/public/install/mysql/tables/llx_societe_log.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe_log.sql
rename to public/install/mysql/tables/llx_societe_log.sql
diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/public/install/mysql/tables/llx_societe_prices.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe_prices.sql
rename to public/install/mysql/tables/llx_societe_prices.sql
diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/public/install/mysql/tables/llx_societe_remise.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe_remise.sql
rename to public/install/mysql/tables/llx_societe_remise.sql
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/public/install/mysql/tables/llx_societe_remise_except.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
rename to public/install/mysql/tables/llx_societe_remise_except.key.sql
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/public/install/mysql/tables/llx_societe_remise_except.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe_remise_except.sql
rename to public/install/mysql/tables/llx_societe_remise_except.sql
diff --git a/htdocs/install/mysql/tables/llx_societe_rib.key.sql b/public/install/mysql/tables/llx_societe_rib.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe_rib.key.sql
rename to public/install/mysql/tables/llx_societe_rib.key.sql
diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/public/install/mysql/tables/llx_societe_rib.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe_rib.sql
rename to public/install/mysql/tables/llx_societe_rib.sql
diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/public/install/mysql/tables/llx_socpeople.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_socpeople.key.sql
rename to public/install/mysql/tables/llx_socpeople.key.sql
diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/public/install/mysql/tables/llx_socpeople.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_socpeople.sql
rename to public/install/mysql/tables/llx_socpeople.sql
diff --git a/htdocs/install/mysql/tables/llx_socpeople_extrafields.key.sql b/public/install/mysql/tables/llx_socpeople_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_socpeople_extrafields.key.sql
rename to public/install/mysql/tables/llx_socpeople_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_socpeople_extrafields.sql b/public/install/mysql/tables/llx_socpeople_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_socpeople_extrafields.sql
rename to public/install/mysql/tables/llx_socpeople_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/public/install/mysql/tables/llx_stock_mouvement.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_stock_mouvement.key.sql
rename to public/install/mysql/tables/llx_stock_mouvement.key.sql
diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/public/install/mysql/tables/llx_stock_mouvement.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_stock_mouvement.sql
rename to public/install/mysql/tables/llx_stock_mouvement.sql
diff --git a/htdocs/install/mysql/tables/llx_subscription.key.sql b/public/install/mysql/tables/llx_subscription.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_subscription.key.sql
rename to public/install/mysql/tables/llx_subscription.key.sql
diff --git a/htdocs/install/mysql/tables/llx_subscription.sql b/public/install/mysql/tables/llx_subscription.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_subscription.sql
rename to public/install/mysql/tables/llx_subscription.sql
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal.sql b/public/install/mysql/tables/llx_supplier_proposal.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_supplier_proposal.sql
rename to public/install/mysql/tables/llx_supplier_proposal.sql
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql b/public/install/mysql/tables/llx_supplier_proposal_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
rename to public/install/mysql/tables/llx_supplier_proposal_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql b/public/install/mysql/tables/llx_supplier_proposaldet.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
rename to public/install/mysql/tables/llx_supplier_proposaldet.sql
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql b/public/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
rename to public/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/public/install/mysql/tables/llx_tva.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_tva.sql
rename to public/install/mysql/tables/llx_tva.sql
diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/public/install/mysql/tables/llx_user.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_user.key.sql
rename to public/install/mysql/tables/llx_user.key.sql
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/public/install/mysql/tables/llx_user.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_user.sql
rename to public/install/mysql/tables/llx_user.sql
diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/public/install/mysql/tables/llx_user_alert.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_user_alert.sql
rename to public/install/mysql/tables/llx_user_alert.sql
diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/public/install/mysql/tables/llx_user_clicktodial.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_user_clicktodial.sql
rename to public/install/mysql/tables/llx_user_clicktodial.sql
diff --git a/htdocs/install/mysql/tables/llx_user_employment.key.sql b/public/install/mysql/tables/llx_user_employment.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_user_employment.key.sql
rename to public/install/mysql/tables/llx_user_employment.key.sql
diff --git a/htdocs/install/mysql/tables/llx_user_employment.sql b/public/install/mysql/tables/llx_user_employment.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_user_employment.sql
rename to public/install/mysql/tables/llx_user_employment.sql
diff --git a/htdocs/install/mysql/tables/llx_user_extrafields.key.sql b/public/install/mysql/tables/llx_user_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_user_extrafields.key.sql
rename to public/install/mysql/tables/llx_user_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_user_extrafields.sql b/public/install/mysql/tables/llx_user_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_user_extrafields.sql
rename to public/install/mysql/tables/llx_user_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/public/install/mysql/tables/llx_user_param.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_user_param.key.sql
rename to public/install/mysql/tables/llx_user_param.key.sql
diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/public/install/mysql/tables/llx_user_param.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_user_param.sql
rename to public/install/mysql/tables/llx_user_param.sql
diff --git a/htdocs/install/mysql/tables/llx_user_rib.sql b/public/install/mysql/tables/llx_user_rib.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_user_rib.sql
rename to public/install/mysql/tables/llx_user_rib.sql
diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/public/install/mysql/tables/llx_user_rights.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_user_rights.key.sql
rename to public/install/mysql/tables/llx_user_rights.key.sql
diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/public/install/mysql/tables/llx_user_rights.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_user_rights.sql
rename to public/install/mysql/tables/llx_user_rights.sql
diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/public/install/mysql/tables/llx_usergroup.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_usergroup.key.sql
rename to public/install/mysql/tables/llx_usergroup.key.sql
diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/public/install/mysql/tables/llx_usergroup.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_usergroup.sql
rename to public/install/mysql/tables/llx_usergroup.sql
diff --git a/htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql b/public/install/mysql/tables/llx_usergroup_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql
rename to public/install/mysql/tables/llx_usergroup_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql b/public/install/mysql/tables/llx_usergroup_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
rename to public/install/mysql/tables/llx_usergroup_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/public/install/mysql/tables/llx_usergroup_rights.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_usergroup_rights.key.sql
rename to public/install/mysql/tables/llx_usergroup_rights.key.sql
diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/public/install/mysql/tables/llx_usergroup_rights.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_usergroup_rights.sql
rename to public/install/mysql/tables/llx_usergroup_rights.sql
diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/public/install/mysql/tables/llx_usergroup_user.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_usergroup_user.key.sql
rename to public/install/mysql/tables/llx_usergroup_user.key.sql
diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/public/install/mysql/tables/llx_usergroup_user.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_usergroup_user.sql
rename to public/install/mysql/tables/llx_usergroup_user.sql
diff --git a/htdocs/install/mysql/tables/llx_website.key.sql b/public/install/mysql/tables/llx_website.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website.key.sql
rename to public/install/mysql/tables/llx_website.key.sql
diff --git a/htdocs/install/mysql/tables/llx_website.sql b/public/install/mysql/tables/llx_website.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website.sql
rename to public/install/mysql/tables/llx_website.sql
diff --git a/htdocs/install/mysql/tables/llx_website_pages.key.sql b/public/install/mysql/tables/llx_website_pages.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website_pages.key.sql
rename to public/install/mysql/tables/llx_website_pages.key.sql
diff --git a/htdocs/install/mysql/tables/llx_website_pages.sql b/public/install/mysql/tables/llx_website_pages.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website_pages.sql
rename to public/install/mysql/tables/llx_website_pages.sql
diff --git a/htdocs/install/pgsql/README b/public/install/pgsql/README
similarity index 100%
rename from htdocs/install/pgsql/README
rename to public/install/pgsql/README
diff --git a/htdocs/install/pgsql/functions/functions.sql b/public/install/pgsql/functions/functions.sql
similarity index 100%
rename from htdocs/install/pgsql/functions/functions.sql
rename to public/install/pgsql/functions/functions.sql
diff --git a/htdocs/install/pgsql/functions/index.html b/public/install/pgsql/functions/index.html
similarity index 100%
rename from htdocs/install/pgsql/functions/index.html
rename to public/install/pgsql/functions/index.html
diff --git a/htdocs/install/pgsql/index.html b/public/install/pgsql/index.html
similarity index 100%
rename from htdocs/install/pgsql/index.html
rename to public/install/pgsql/index.html
diff --git a/htdocs/install/phpinfo.php b/public/install/phpinfo.php
similarity index 100%
rename from htdocs/install/phpinfo.php
rename to public/install/phpinfo.php
diff --git a/htdocs/install/repair.php b/public/install/repair.php
similarity index 100%
rename from htdocs/install/repair.php
rename to public/install/repair.php
diff --git a/htdocs/install/robots.txt b/public/install/robots.txt
similarity index 100%
rename from htdocs/install/robots.txt
rename to public/install/robots.txt
diff --git a/htdocs/install/sqlite3/functions/functions.sql b/public/install/sqlite3/functions/functions.sql
similarity index 100%
rename from htdocs/install/sqlite3/functions/functions.sql
rename to public/install/sqlite3/functions/functions.sql
diff --git a/htdocs/install/sqlite3/index.html b/public/install/sqlite3/index.html
similarity index 100%
rename from htdocs/install/sqlite3/index.html
rename to public/install/sqlite3/index.html
diff --git a/htdocs/install/step1.php b/public/install/step1.php
similarity index 100%
rename from htdocs/install/step1.php
rename to public/install/step1.php
diff --git a/htdocs/install/step2.php b/public/install/step2.php
similarity index 100%
rename from htdocs/install/step2.php
rename to public/install/step2.php
diff --git a/htdocs/install/step4.php b/public/install/step4.php
similarity index 100%
rename from htdocs/install/step4.php
rename to public/install/step4.php
diff --git a/htdocs/install/step5.php b/public/install/step5.php
similarity index 100%
rename from htdocs/install/step5.php
rename to public/install/step5.php
diff --git a/htdocs/install/upgrade.php b/public/install/upgrade.php
similarity index 100%
rename from htdocs/install/upgrade.php
rename to public/install/upgrade.php
diff --git a/htdocs/install/upgrade2.php b/public/install/upgrade2.php
similarity index 100%
rename from htdocs/install/upgrade2.php
rename to public/install/upgrade2.php
diff --git a/htdocs/langs/HOWTO-Translation.txt b/public/langs/HOWTO-Translation.txt
similarity index 100%
rename from htdocs/langs/HOWTO-Translation.txt
rename to public/langs/HOWTO-Translation.txt
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/public/langs/ar_SA/accountancy.lang
similarity index 100%
rename from htdocs/langs/ar_SA/accountancy.lang
rename to public/langs/ar_SA/accountancy.lang
diff --git a/htdocs/langs/ar_SA/admin.lang b/public/langs/ar_SA/admin.lang
similarity index 100%
rename from htdocs/langs/ar_SA/admin.lang
rename to public/langs/ar_SA/admin.lang
diff --git a/htdocs/langs/ar_SA/agenda.lang b/public/langs/ar_SA/agenda.lang
similarity index 100%
rename from htdocs/langs/ar_SA/agenda.lang
rename to public/langs/ar_SA/agenda.lang
diff --git a/htdocs/langs/ar_SA/banks.lang b/public/langs/ar_SA/banks.lang
similarity index 100%
rename from htdocs/langs/ar_SA/banks.lang
rename to public/langs/ar_SA/banks.lang
diff --git a/htdocs/langs/ar_SA/bills.lang b/public/langs/ar_SA/bills.lang
similarity index 100%
rename from htdocs/langs/ar_SA/bills.lang
rename to public/langs/ar_SA/bills.lang
diff --git a/htdocs/langs/ar_SA/bookmarks.lang b/public/langs/ar_SA/bookmarks.lang
similarity index 100%
rename from htdocs/langs/ar_SA/bookmarks.lang
rename to public/langs/ar_SA/bookmarks.lang
diff --git a/htdocs/langs/ar_SA/boxes.lang b/public/langs/ar_SA/boxes.lang
similarity index 100%
rename from htdocs/langs/ar_SA/boxes.lang
rename to public/langs/ar_SA/boxes.lang
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/public/langs/ar_SA/cashdesk.lang
similarity index 100%
rename from htdocs/langs/ar_SA/cashdesk.lang
rename to public/langs/ar_SA/cashdesk.lang
diff --git a/htdocs/langs/ar_SA/categories.lang b/public/langs/ar_SA/categories.lang
similarity index 100%
rename from htdocs/langs/ar_SA/categories.lang
rename to public/langs/ar_SA/categories.lang
diff --git a/htdocs/langs/ar_SA/commercial.lang b/public/langs/ar_SA/commercial.lang
similarity index 100%
rename from htdocs/langs/ar_SA/commercial.lang
rename to public/langs/ar_SA/commercial.lang
diff --git a/htdocs/langs/ar_SA/companies.lang b/public/langs/ar_SA/companies.lang
similarity index 100%
rename from htdocs/langs/ar_SA/companies.lang
rename to public/langs/ar_SA/companies.lang
diff --git a/htdocs/langs/ar_SA/compta.lang b/public/langs/ar_SA/compta.lang
similarity index 100%
rename from htdocs/langs/ar_SA/compta.lang
rename to public/langs/ar_SA/compta.lang
diff --git a/htdocs/langs/ar_SA/contracts.lang b/public/langs/ar_SA/contracts.lang
similarity index 100%
rename from htdocs/langs/ar_SA/contracts.lang
rename to public/langs/ar_SA/contracts.lang
diff --git a/htdocs/langs/ar_SA/cron.lang b/public/langs/ar_SA/cron.lang
similarity index 100%
rename from htdocs/langs/ar_SA/cron.lang
rename to public/langs/ar_SA/cron.lang
diff --git a/htdocs/langs/ar_SA/deliveries.lang b/public/langs/ar_SA/deliveries.lang
similarity index 100%
rename from htdocs/langs/ar_SA/deliveries.lang
rename to public/langs/ar_SA/deliveries.lang
diff --git a/htdocs/langs/ar_SA/dict.lang b/public/langs/ar_SA/dict.lang
similarity index 100%
rename from htdocs/langs/ar_SA/dict.lang
rename to public/langs/ar_SA/dict.lang
diff --git a/htdocs/langs/ar_SA/donations.lang b/public/langs/ar_SA/donations.lang
similarity index 100%
rename from htdocs/langs/ar_SA/donations.lang
rename to public/langs/ar_SA/donations.lang
diff --git a/htdocs/langs/ar_SA/ecm.lang b/public/langs/ar_SA/ecm.lang
similarity index 100%
rename from htdocs/langs/ar_SA/ecm.lang
rename to public/langs/ar_SA/ecm.lang
diff --git a/htdocs/langs/ar_SA/errors.lang b/public/langs/ar_SA/errors.lang
similarity index 100%
rename from htdocs/langs/ar_SA/errors.lang
rename to public/langs/ar_SA/errors.lang
diff --git a/htdocs/langs/ar_SA/exports.lang b/public/langs/ar_SA/exports.lang
similarity index 100%
rename from htdocs/langs/ar_SA/exports.lang
rename to public/langs/ar_SA/exports.lang
diff --git a/htdocs/langs/ar_SA/externalsite.lang b/public/langs/ar_SA/externalsite.lang
similarity index 100%
rename from htdocs/langs/ar_SA/externalsite.lang
rename to public/langs/ar_SA/externalsite.lang
diff --git a/htdocs/langs/ar_SA/ftp.lang b/public/langs/ar_SA/ftp.lang
similarity index 100%
rename from htdocs/langs/ar_SA/ftp.lang
rename to public/langs/ar_SA/ftp.lang
diff --git a/htdocs/langs/ar_SA/help.lang b/public/langs/ar_SA/help.lang
similarity index 100%
rename from htdocs/langs/ar_SA/help.lang
rename to public/langs/ar_SA/help.lang
diff --git a/htdocs/langs/ar_SA/holiday.lang b/public/langs/ar_SA/holiday.lang
similarity index 100%
rename from htdocs/langs/ar_SA/holiday.lang
rename to public/langs/ar_SA/holiday.lang
diff --git a/htdocs/langs/ar_SA/hrm.lang b/public/langs/ar_SA/hrm.lang
similarity index 100%
rename from htdocs/langs/ar_SA/hrm.lang
rename to public/langs/ar_SA/hrm.lang
diff --git a/htdocs/langs/ar_SA/incoterm.lang b/public/langs/ar_SA/incoterm.lang
similarity index 100%
rename from htdocs/langs/ar_SA/incoterm.lang
rename to public/langs/ar_SA/incoterm.lang
diff --git a/htdocs/langs/ar_SA/install.lang b/public/langs/ar_SA/install.lang
similarity index 100%
rename from htdocs/langs/ar_SA/install.lang
rename to public/langs/ar_SA/install.lang
diff --git a/htdocs/langs/ar_SA/interventions.lang b/public/langs/ar_SA/interventions.lang
similarity index 100%
rename from htdocs/langs/ar_SA/interventions.lang
rename to public/langs/ar_SA/interventions.lang
diff --git a/htdocs/langs/ar_SA/languages.lang b/public/langs/ar_SA/languages.lang
similarity index 100%
rename from htdocs/langs/ar_SA/languages.lang
rename to public/langs/ar_SA/languages.lang
diff --git a/htdocs/langs/ar_SA/ldap.lang b/public/langs/ar_SA/ldap.lang
similarity index 100%
rename from htdocs/langs/ar_SA/ldap.lang
rename to public/langs/ar_SA/ldap.lang
diff --git a/htdocs/langs/ar_SA/link.lang b/public/langs/ar_SA/link.lang
similarity index 100%
rename from htdocs/langs/ar_SA/link.lang
rename to public/langs/ar_SA/link.lang
diff --git a/htdocs/langs/ar_SA/loan.lang b/public/langs/ar_SA/loan.lang
similarity index 100%
rename from htdocs/langs/ar_SA/loan.lang
rename to public/langs/ar_SA/loan.lang
diff --git a/htdocs/langs/ar_SA/mailmanspip.lang b/public/langs/ar_SA/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/ar_SA/mailmanspip.lang
rename to public/langs/ar_SA/mailmanspip.lang
diff --git a/htdocs/langs/ar_SA/mails.lang b/public/langs/ar_SA/mails.lang
similarity index 100%
rename from htdocs/langs/ar_SA/mails.lang
rename to public/langs/ar_SA/mails.lang
diff --git a/htdocs/langs/ar_SA/main.lang b/public/langs/ar_SA/main.lang
similarity index 100%
rename from htdocs/langs/ar_SA/main.lang
rename to public/langs/ar_SA/main.lang
diff --git a/htdocs/langs/ar_SA/margins.lang b/public/langs/ar_SA/margins.lang
similarity index 100%
rename from htdocs/langs/ar_SA/margins.lang
rename to public/langs/ar_SA/margins.lang
diff --git a/htdocs/langs/ar_SA/members.lang b/public/langs/ar_SA/members.lang
similarity index 100%
rename from htdocs/langs/ar_SA/members.lang
rename to public/langs/ar_SA/members.lang
diff --git a/htdocs/langs/ar_SA/oauth.lang b/public/langs/ar_SA/oauth.lang
similarity index 100%
rename from htdocs/langs/ar_SA/oauth.lang
rename to public/langs/ar_SA/oauth.lang
diff --git a/htdocs/langs/ar_SA/opensurvey.lang b/public/langs/ar_SA/opensurvey.lang
similarity index 100%
rename from htdocs/langs/ar_SA/opensurvey.lang
rename to public/langs/ar_SA/opensurvey.lang
diff --git a/htdocs/langs/ar_SA/orders.lang b/public/langs/ar_SA/orders.lang
similarity index 100%
rename from htdocs/langs/ar_SA/orders.lang
rename to public/langs/ar_SA/orders.lang
diff --git a/htdocs/langs/ar_SA/other.lang b/public/langs/ar_SA/other.lang
similarity index 100%
rename from htdocs/langs/ar_SA/other.lang
rename to public/langs/ar_SA/other.lang
diff --git a/htdocs/langs/ar_SA/paybox.lang b/public/langs/ar_SA/paybox.lang
similarity index 100%
rename from htdocs/langs/ar_SA/paybox.lang
rename to public/langs/ar_SA/paybox.lang
diff --git a/htdocs/langs/ar_SA/paypal.lang b/public/langs/ar_SA/paypal.lang
similarity index 100%
rename from htdocs/langs/ar_SA/paypal.lang
rename to public/langs/ar_SA/paypal.lang
diff --git a/htdocs/langs/ar_SA/printing.lang b/public/langs/ar_SA/printing.lang
similarity index 100%
rename from htdocs/langs/ar_SA/printing.lang
rename to public/langs/ar_SA/printing.lang
diff --git a/htdocs/langs/ar_SA/productbatch.lang b/public/langs/ar_SA/productbatch.lang
similarity index 100%
rename from htdocs/langs/ar_SA/productbatch.lang
rename to public/langs/ar_SA/productbatch.lang
diff --git a/htdocs/langs/ar_SA/products.lang b/public/langs/ar_SA/products.lang
similarity index 100%
rename from htdocs/langs/ar_SA/products.lang
rename to public/langs/ar_SA/products.lang
diff --git a/htdocs/langs/ar_SA/projects.lang b/public/langs/ar_SA/projects.lang
similarity index 100%
rename from htdocs/langs/ar_SA/projects.lang
rename to public/langs/ar_SA/projects.lang
diff --git a/htdocs/langs/ar_SA/propal.lang b/public/langs/ar_SA/propal.lang
similarity index 100%
rename from htdocs/langs/ar_SA/propal.lang
rename to public/langs/ar_SA/propal.lang
diff --git a/htdocs/langs/ar_SA/receiptprinter.lang b/public/langs/ar_SA/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/ar_SA/receiptprinter.lang
rename to public/langs/ar_SA/receiptprinter.lang
diff --git a/htdocs/langs/ar_SA/resource.lang b/public/langs/ar_SA/resource.lang
similarity index 100%
rename from htdocs/langs/ar_SA/resource.lang
rename to public/langs/ar_SA/resource.lang
diff --git a/htdocs/langs/ar_SA/salaries.lang b/public/langs/ar_SA/salaries.lang
similarity index 100%
rename from htdocs/langs/ar_SA/salaries.lang
rename to public/langs/ar_SA/salaries.lang
diff --git a/htdocs/langs/ar_SA/sendings.lang b/public/langs/ar_SA/sendings.lang
similarity index 100%
rename from htdocs/langs/ar_SA/sendings.lang
rename to public/langs/ar_SA/sendings.lang
diff --git a/htdocs/langs/ar_SA/sms.lang b/public/langs/ar_SA/sms.lang
similarity index 100%
rename from htdocs/langs/ar_SA/sms.lang
rename to public/langs/ar_SA/sms.lang
diff --git a/htdocs/langs/ar_SA/stocks.lang b/public/langs/ar_SA/stocks.lang
similarity index 100%
rename from htdocs/langs/ar_SA/stocks.lang
rename to public/langs/ar_SA/stocks.lang
diff --git a/htdocs/langs/ar_SA/supplier_proposal.lang b/public/langs/ar_SA/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/ar_SA/supplier_proposal.lang
rename to public/langs/ar_SA/supplier_proposal.lang
diff --git a/htdocs/langs/ar_SA/suppliers.lang b/public/langs/ar_SA/suppliers.lang
similarity index 100%
rename from htdocs/langs/ar_SA/suppliers.lang
rename to public/langs/ar_SA/suppliers.lang
diff --git a/htdocs/langs/ar_SA/trips.lang b/public/langs/ar_SA/trips.lang
similarity index 100%
rename from htdocs/langs/ar_SA/trips.lang
rename to public/langs/ar_SA/trips.lang
diff --git a/htdocs/langs/ar_SA/users.lang b/public/langs/ar_SA/users.lang
similarity index 100%
rename from htdocs/langs/ar_SA/users.lang
rename to public/langs/ar_SA/users.lang
diff --git a/htdocs/langs/ar_SA/website.lang b/public/langs/ar_SA/website.lang
similarity index 100%
rename from htdocs/langs/ar_SA/website.lang
rename to public/langs/ar_SA/website.lang
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/public/langs/ar_SA/withdrawals.lang
similarity index 100%
rename from htdocs/langs/ar_SA/withdrawals.lang
rename to public/langs/ar_SA/withdrawals.lang
diff --git a/htdocs/langs/ar_SA/workflow.lang b/public/langs/ar_SA/workflow.lang
similarity index 100%
rename from htdocs/langs/ar_SA/workflow.lang
rename to public/langs/ar_SA/workflow.lang
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/public/langs/bg_BG/accountancy.lang
similarity index 100%
rename from htdocs/langs/bg_BG/accountancy.lang
rename to public/langs/bg_BG/accountancy.lang
diff --git a/htdocs/langs/bg_BG/admin.lang b/public/langs/bg_BG/admin.lang
similarity index 100%
rename from htdocs/langs/bg_BG/admin.lang
rename to public/langs/bg_BG/admin.lang
diff --git a/htdocs/langs/bg_BG/agenda.lang b/public/langs/bg_BG/agenda.lang
similarity index 100%
rename from htdocs/langs/bg_BG/agenda.lang
rename to public/langs/bg_BG/agenda.lang
diff --git a/htdocs/langs/bg_BG/banks.lang b/public/langs/bg_BG/banks.lang
similarity index 100%
rename from htdocs/langs/bg_BG/banks.lang
rename to public/langs/bg_BG/banks.lang
diff --git a/htdocs/langs/bg_BG/bills.lang b/public/langs/bg_BG/bills.lang
similarity index 100%
rename from htdocs/langs/bg_BG/bills.lang
rename to public/langs/bg_BG/bills.lang
diff --git a/htdocs/langs/bg_BG/bookmarks.lang b/public/langs/bg_BG/bookmarks.lang
similarity index 100%
rename from htdocs/langs/bg_BG/bookmarks.lang
rename to public/langs/bg_BG/bookmarks.lang
diff --git a/htdocs/langs/bg_BG/boxes.lang b/public/langs/bg_BG/boxes.lang
similarity index 100%
rename from htdocs/langs/bg_BG/boxes.lang
rename to public/langs/bg_BG/boxes.lang
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/public/langs/bg_BG/cashdesk.lang
similarity index 100%
rename from htdocs/langs/bg_BG/cashdesk.lang
rename to public/langs/bg_BG/cashdesk.lang
diff --git a/htdocs/langs/bg_BG/categories.lang b/public/langs/bg_BG/categories.lang
similarity index 100%
rename from htdocs/langs/bg_BG/categories.lang
rename to public/langs/bg_BG/categories.lang
diff --git a/htdocs/langs/bg_BG/commercial.lang b/public/langs/bg_BG/commercial.lang
similarity index 100%
rename from htdocs/langs/bg_BG/commercial.lang
rename to public/langs/bg_BG/commercial.lang
diff --git a/htdocs/langs/bg_BG/companies.lang b/public/langs/bg_BG/companies.lang
similarity index 100%
rename from htdocs/langs/bg_BG/companies.lang
rename to public/langs/bg_BG/companies.lang
diff --git a/htdocs/langs/bg_BG/compta.lang b/public/langs/bg_BG/compta.lang
similarity index 100%
rename from htdocs/langs/bg_BG/compta.lang
rename to public/langs/bg_BG/compta.lang
diff --git a/htdocs/langs/bg_BG/contracts.lang b/public/langs/bg_BG/contracts.lang
similarity index 100%
rename from htdocs/langs/bg_BG/contracts.lang
rename to public/langs/bg_BG/contracts.lang
diff --git a/htdocs/langs/bg_BG/cron.lang b/public/langs/bg_BG/cron.lang
similarity index 100%
rename from htdocs/langs/bg_BG/cron.lang
rename to public/langs/bg_BG/cron.lang
diff --git a/htdocs/langs/bg_BG/deliveries.lang b/public/langs/bg_BG/deliveries.lang
similarity index 100%
rename from htdocs/langs/bg_BG/deliveries.lang
rename to public/langs/bg_BG/deliveries.lang
diff --git a/htdocs/langs/bg_BG/dict.lang b/public/langs/bg_BG/dict.lang
similarity index 100%
rename from htdocs/langs/bg_BG/dict.lang
rename to public/langs/bg_BG/dict.lang
diff --git a/htdocs/langs/bg_BG/donations.lang b/public/langs/bg_BG/donations.lang
similarity index 100%
rename from htdocs/langs/bg_BG/donations.lang
rename to public/langs/bg_BG/donations.lang
diff --git a/htdocs/langs/bg_BG/ecm.lang b/public/langs/bg_BG/ecm.lang
similarity index 100%
rename from htdocs/langs/bg_BG/ecm.lang
rename to public/langs/bg_BG/ecm.lang
diff --git a/htdocs/langs/bg_BG/errors.lang b/public/langs/bg_BG/errors.lang
similarity index 100%
rename from htdocs/langs/bg_BG/errors.lang
rename to public/langs/bg_BG/errors.lang
diff --git a/htdocs/langs/bg_BG/exports.lang b/public/langs/bg_BG/exports.lang
similarity index 100%
rename from htdocs/langs/bg_BG/exports.lang
rename to public/langs/bg_BG/exports.lang
diff --git a/htdocs/langs/bg_BG/externalsite.lang b/public/langs/bg_BG/externalsite.lang
similarity index 100%
rename from htdocs/langs/bg_BG/externalsite.lang
rename to public/langs/bg_BG/externalsite.lang
diff --git a/htdocs/langs/bg_BG/ftp.lang b/public/langs/bg_BG/ftp.lang
similarity index 100%
rename from htdocs/langs/bg_BG/ftp.lang
rename to public/langs/bg_BG/ftp.lang
diff --git a/htdocs/langs/bg_BG/help.lang b/public/langs/bg_BG/help.lang
similarity index 100%
rename from htdocs/langs/bg_BG/help.lang
rename to public/langs/bg_BG/help.lang
diff --git a/htdocs/langs/bg_BG/holiday.lang b/public/langs/bg_BG/holiday.lang
similarity index 100%
rename from htdocs/langs/bg_BG/holiday.lang
rename to public/langs/bg_BG/holiday.lang
diff --git a/htdocs/langs/bg_BG/hrm.lang b/public/langs/bg_BG/hrm.lang
similarity index 100%
rename from htdocs/langs/bg_BG/hrm.lang
rename to public/langs/bg_BG/hrm.lang
diff --git a/htdocs/langs/bg_BG/incoterm.lang b/public/langs/bg_BG/incoterm.lang
similarity index 100%
rename from htdocs/langs/bg_BG/incoterm.lang
rename to public/langs/bg_BG/incoterm.lang
diff --git a/htdocs/langs/bg_BG/install.lang b/public/langs/bg_BG/install.lang
similarity index 100%
rename from htdocs/langs/bg_BG/install.lang
rename to public/langs/bg_BG/install.lang
diff --git a/htdocs/langs/bg_BG/interventions.lang b/public/langs/bg_BG/interventions.lang
similarity index 100%
rename from htdocs/langs/bg_BG/interventions.lang
rename to public/langs/bg_BG/interventions.lang
diff --git a/htdocs/langs/bg_BG/languages.lang b/public/langs/bg_BG/languages.lang
similarity index 100%
rename from htdocs/langs/bg_BG/languages.lang
rename to public/langs/bg_BG/languages.lang
diff --git a/htdocs/langs/bg_BG/ldap.lang b/public/langs/bg_BG/ldap.lang
similarity index 100%
rename from htdocs/langs/bg_BG/ldap.lang
rename to public/langs/bg_BG/ldap.lang
diff --git a/htdocs/langs/bg_BG/link.lang b/public/langs/bg_BG/link.lang
similarity index 100%
rename from htdocs/langs/bg_BG/link.lang
rename to public/langs/bg_BG/link.lang
diff --git a/htdocs/langs/bg_BG/loan.lang b/public/langs/bg_BG/loan.lang
similarity index 100%
rename from htdocs/langs/bg_BG/loan.lang
rename to public/langs/bg_BG/loan.lang
diff --git a/htdocs/langs/bg_BG/mailmanspip.lang b/public/langs/bg_BG/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/bg_BG/mailmanspip.lang
rename to public/langs/bg_BG/mailmanspip.lang
diff --git a/htdocs/langs/bg_BG/mails.lang b/public/langs/bg_BG/mails.lang
similarity index 100%
rename from htdocs/langs/bg_BG/mails.lang
rename to public/langs/bg_BG/mails.lang
diff --git a/htdocs/langs/bg_BG/main.lang b/public/langs/bg_BG/main.lang
similarity index 100%
rename from htdocs/langs/bg_BG/main.lang
rename to public/langs/bg_BG/main.lang
diff --git a/htdocs/langs/bg_BG/margins.lang b/public/langs/bg_BG/margins.lang
similarity index 100%
rename from htdocs/langs/bg_BG/margins.lang
rename to public/langs/bg_BG/margins.lang
diff --git a/htdocs/langs/bg_BG/members.lang b/public/langs/bg_BG/members.lang
similarity index 100%
rename from htdocs/langs/bg_BG/members.lang
rename to public/langs/bg_BG/members.lang
diff --git a/htdocs/langs/bg_BG/oauth.lang b/public/langs/bg_BG/oauth.lang
similarity index 100%
rename from htdocs/langs/bg_BG/oauth.lang
rename to public/langs/bg_BG/oauth.lang
diff --git a/htdocs/langs/bg_BG/opensurvey.lang b/public/langs/bg_BG/opensurvey.lang
similarity index 100%
rename from htdocs/langs/bg_BG/opensurvey.lang
rename to public/langs/bg_BG/opensurvey.lang
diff --git a/htdocs/langs/bg_BG/orders.lang b/public/langs/bg_BG/orders.lang
similarity index 100%
rename from htdocs/langs/bg_BG/orders.lang
rename to public/langs/bg_BG/orders.lang
diff --git a/htdocs/langs/bg_BG/other.lang b/public/langs/bg_BG/other.lang
similarity index 100%
rename from htdocs/langs/bg_BG/other.lang
rename to public/langs/bg_BG/other.lang
diff --git a/htdocs/langs/bg_BG/paybox.lang b/public/langs/bg_BG/paybox.lang
similarity index 100%
rename from htdocs/langs/bg_BG/paybox.lang
rename to public/langs/bg_BG/paybox.lang
diff --git a/htdocs/langs/bg_BG/paypal.lang b/public/langs/bg_BG/paypal.lang
similarity index 100%
rename from htdocs/langs/bg_BG/paypal.lang
rename to public/langs/bg_BG/paypal.lang
diff --git a/htdocs/langs/bg_BG/printing.lang b/public/langs/bg_BG/printing.lang
similarity index 100%
rename from htdocs/langs/bg_BG/printing.lang
rename to public/langs/bg_BG/printing.lang
diff --git a/htdocs/langs/bg_BG/productbatch.lang b/public/langs/bg_BG/productbatch.lang
similarity index 100%
rename from htdocs/langs/bg_BG/productbatch.lang
rename to public/langs/bg_BG/productbatch.lang
diff --git a/htdocs/langs/bg_BG/products.lang b/public/langs/bg_BG/products.lang
similarity index 100%
rename from htdocs/langs/bg_BG/products.lang
rename to public/langs/bg_BG/products.lang
diff --git a/htdocs/langs/bg_BG/projects.lang b/public/langs/bg_BG/projects.lang
similarity index 100%
rename from htdocs/langs/bg_BG/projects.lang
rename to public/langs/bg_BG/projects.lang
diff --git a/htdocs/langs/bg_BG/propal.lang b/public/langs/bg_BG/propal.lang
similarity index 100%
rename from htdocs/langs/bg_BG/propal.lang
rename to public/langs/bg_BG/propal.lang
diff --git a/htdocs/langs/bg_BG/receiptprinter.lang b/public/langs/bg_BG/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/bg_BG/receiptprinter.lang
rename to public/langs/bg_BG/receiptprinter.lang
diff --git a/htdocs/langs/bg_BG/resource.lang b/public/langs/bg_BG/resource.lang
similarity index 100%
rename from htdocs/langs/bg_BG/resource.lang
rename to public/langs/bg_BG/resource.lang
diff --git a/htdocs/langs/bg_BG/salaries.lang b/public/langs/bg_BG/salaries.lang
similarity index 100%
rename from htdocs/langs/bg_BG/salaries.lang
rename to public/langs/bg_BG/salaries.lang
diff --git a/htdocs/langs/bg_BG/sendings.lang b/public/langs/bg_BG/sendings.lang
similarity index 100%
rename from htdocs/langs/bg_BG/sendings.lang
rename to public/langs/bg_BG/sendings.lang
diff --git a/htdocs/langs/bg_BG/sms.lang b/public/langs/bg_BG/sms.lang
similarity index 100%
rename from htdocs/langs/bg_BG/sms.lang
rename to public/langs/bg_BG/sms.lang
diff --git a/htdocs/langs/bg_BG/stocks.lang b/public/langs/bg_BG/stocks.lang
similarity index 100%
rename from htdocs/langs/bg_BG/stocks.lang
rename to public/langs/bg_BG/stocks.lang
diff --git a/htdocs/langs/bg_BG/supplier_proposal.lang b/public/langs/bg_BG/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/bg_BG/supplier_proposal.lang
rename to public/langs/bg_BG/supplier_proposal.lang
diff --git a/htdocs/langs/bg_BG/suppliers.lang b/public/langs/bg_BG/suppliers.lang
similarity index 100%
rename from htdocs/langs/bg_BG/suppliers.lang
rename to public/langs/bg_BG/suppliers.lang
diff --git a/htdocs/langs/bg_BG/trips.lang b/public/langs/bg_BG/trips.lang
similarity index 100%
rename from htdocs/langs/bg_BG/trips.lang
rename to public/langs/bg_BG/trips.lang
diff --git a/htdocs/langs/bg_BG/users.lang b/public/langs/bg_BG/users.lang
similarity index 100%
rename from htdocs/langs/bg_BG/users.lang
rename to public/langs/bg_BG/users.lang
diff --git a/htdocs/langs/bg_BG/website.lang b/public/langs/bg_BG/website.lang
similarity index 100%
rename from htdocs/langs/bg_BG/website.lang
rename to public/langs/bg_BG/website.lang
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/public/langs/bg_BG/withdrawals.lang
similarity index 100%
rename from htdocs/langs/bg_BG/withdrawals.lang
rename to public/langs/bg_BG/withdrawals.lang
diff --git a/htdocs/langs/bg_BG/workflow.lang b/public/langs/bg_BG/workflow.lang
similarity index 100%
rename from htdocs/langs/bg_BG/workflow.lang
rename to public/langs/bg_BG/workflow.lang
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/public/langs/bn_BD/accountancy.lang
similarity index 100%
rename from htdocs/langs/bn_BD/accountancy.lang
rename to public/langs/bn_BD/accountancy.lang
diff --git a/htdocs/langs/bn_BD/admin.lang b/public/langs/bn_BD/admin.lang
similarity index 100%
rename from htdocs/langs/bn_BD/admin.lang
rename to public/langs/bn_BD/admin.lang
diff --git a/htdocs/langs/bn_BD/agenda.lang b/public/langs/bn_BD/agenda.lang
similarity index 100%
rename from htdocs/langs/bn_BD/agenda.lang
rename to public/langs/bn_BD/agenda.lang
diff --git a/htdocs/langs/bn_BD/banks.lang b/public/langs/bn_BD/banks.lang
similarity index 100%
rename from htdocs/langs/bn_BD/banks.lang
rename to public/langs/bn_BD/banks.lang
diff --git a/htdocs/langs/bn_BD/bills.lang b/public/langs/bn_BD/bills.lang
similarity index 100%
rename from htdocs/langs/bn_BD/bills.lang
rename to public/langs/bn_BD/bills.lang
diff --git a/htdocs/langs/bn_BD/bookmarks.lang b/public/langs/bn_BD/bookmarks.lang
similarity index 100%
rename from htdocs/langs/bn_BD/bookmarks.lang
rename to public/langs/bn_BD/bookmarks.lang
diff --git a/htdocs/langs/bn_BD/boxes.lang b/public/langs/bn_BD/boxes.lang
similarity index 100%
rename from htdocs/langs/bn_BD/boxes.lang
rename to public/langs/bn_BD/boxes.lang
diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/public/langs/bn_BD/cashdesk.lang
similarity index 100%
rename from htdocs/langs/bn_BD/cashdesk.lang
rename to public/langs/bn_BD/cashdesk.lang
diff --git a/htdocs/langs/bn_BD/categories.lang b/public/langs/bn_BD/categories.lang
similarity index 100%
rename from htdocs/langs/bn_BD/categories.lang
rename to public/langs/bn_BD/categories.lang
diff --git a/htdocs/langs/bn_BD/commercial.lang b/public/langs/bn_BD/commercial.lang
similarity index 100%
rename from htdocs/langs/bn_BD/commercial.lang
rename to public/langs/bn_BD/commercial.lang
diff --git a/htdocs/langs/bn_BD/companies.lang b/public/langs/bn_BD/companies.lang
similarity index 100%
rename from htdocs/langs/bn_BD/companies.lang
rename to public/langs/bn_BD/companies.lang
diff --git a/htdocs/langs/bn_BD/compta.lang b/public/langs/bn_BD/compta.lang
similarity index 100%
rename from htdocs/langs/bn_BD/compta.lang
rename to public/langs/bn_BD/compta.lang
diff --git a/htdocs/langs/bn_BD/contracts.lang b/public/langs/bn_BD/contracts.lang
similarity index 100%
rename from htdocs/langs/bn_BD/contracts.lang
rename to public/langs/bn_BD/contracts.lang
diff --git a/htdocs/langs/bn_BD/cron.lang b/public/langs/bn_BD/cron.lang
similarity index 100%
rename from htdocs/langs/bn_BD/cron.lang
rename to public/langs/bn_BD/cron.lang
diff --git a/htdocs/langs/bn_BD/deliveries.lang b/public/langs/bn_BD/deliveries.lang
similarity index 100%
rename from htdocs/langs/bn_BD/deliveries.lang
rename to public/langs/bn_BD/deliveries.lang
diff --git a/htdocs/langs/bn_BD/dict.lang b/public/langs/bn_BD/dict.lang
similarity index 100%
rename from htdocs/langs/bn_BD/dict.lang
rename to public/langs/bn_BD/dict.lang
diff --git a/htdocs/langs/bn_BD/donations.lang b/public/langs/bn_BD/donations.lang
similarity index 100%
rename from htdocs/langs/bn_BD/donations.lang
rename to public/langs/bn_BD/donations.lang
diff --git a/htdocs/langs/bn_BD/ecm.lang b/public/langs/bn_BD/ecm.lang
similarity index 100%
rename from htdocs/langs/bn_BD/ecm.lang
rename to public/langs/bn_BD/ecm.lang
diff --git a/htdocs/langs/bn_BD/errors.lang b/public/langs/bn_BD/errors.lang
similarity index 100%
rename from htdocs/langs/bn_BD/errors.lang
rename to public/langs/bn_BD/errors.lang
diff --git a/htdocs/langs/bn_BD/exports.lang b/public/langs/bn_BD/exports.lang
similarity index 100%
rename from htdocs/langs/bn_BD/exports.lang
rename to public/langs/bn_BD/exports.lang
diff --git a/htdocs/langs/bn_BD/externalsite.lang b/public/langs/bn_BD/externalsite.lang
similarity index 100%
rename from htdocs/langs/bn_BD/externalsite.lang
rename to public/langs/bn_BD/externalsite.lang
diff --git a/htdocs/langs/bn_BD/ftp.lang b/public/langs/bn_BD/ftp.lang
similarity index 100%
rename from htdocs/langs/bn_BD/ftp.lang
rename to public/langs/bn_BD/ftp.lang
diff --git a/htdocs/langs/bn_BD/help.lang b/public/langs/bn_BD/help.lang
similarity index 100%
rename from htdocs/langs/bn_BD/help.lang
rename to public/langs/bn_BD/help.lang
diff --git a/htdocs/langs/bn_BD/holiday.lang b/public/langs/bn_BD/holiday.lang
similarity index 100%
rename from htdocs/langs/bn_BD/holiday.lang
rename to public/langs/bn_BD/holiday.lang
diff --git a/htdocs/langs/bn_BD/hrm.lang b/public/langs/bn_BD/hrm.lang
similarity index 100%
rename from htdocs/langs/bn_BD/hrm.lang
rename to public/langs/bn_BD/hrm.lang
diff --git a/htdocs/langs/bn_BD/incoterm.lang b/public/langs/bn_BD/incoterm.lang
similarity index 100%
rename from htdocs/langs/bn_BD/incoterm.lang
rename to public/langs/bn_BD/incoterm.lang
diff --git a/htdocs/langs/bn_BD/install.lang b/public/langs/bn_BD/install.lang
similarity index 100%
rename from htdocs/langs/bn_BD/install.lang
rename to public/langs/bn_BD/install.lang
diff --git a/htdocs/langs/bn_BD/interventions.lang b/public/langs/bn_BD/interventions.lang
similarity index 100%
rename from htdocs/langs/bn_BD/interventions.lang
rename to public/langs/bn_BD/interventions.lang
diff --git a/htdocs/langs/bn_BD/languages.lang b/public/langs/bn_BD/languages.lang
similarity index 100%
rename from htdocs/langs/bn_BD/languages.lang
rename to public/langs/bn_BD/languages.lang
diff --git a/htdocs/langs/bn_BD/ldap.lang b/public/langs/bn_BD/ldap.lang
similarity index 100%
rename from htdocs/langs/bn_BD/ldap.lang
rename to public/langs/bn_BD/ldap.lang
diff --git a/htdocs/langs/bn_BD/link.lang b/public/langs/bn_BD/link.lang
similarity index 100%
rename from htdocs/langs/bn_BD/link.lang
rename to public/langs/bn_BD/link.lang
diff --git a/htdocs/langs/bn_BD/loan.lang b/public/langs/bn_BD/loan.lang
similarity index 100%
rename from htdocs/langs/bn_BD/loan.lang
rename to public/langs/bn_BD/loan.lang
diff --git a/htdocs/langs/bn_BD/mailmanspip.lang b/public/langs/bn_BD/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/bn_BD/mailmanspip.lang
rename to public/langs/bn_BD/mailmanspip.lang
diff --git a/htdocs/langs/bn_BD/mails.lang b/public/langs/bn_BD/mails.lang
similarity index 100%
rename from htdocs/langs/bn_BD/mails.lang
rename to public/langs/bn_BD/mails.lang
diff --git a/htdocs/langs/bn_BD/main.lang b/public/langs/bn_BD/main.lang
similarity index 100%
rename from htdocs/langs/bn_BD/main.lang
rename to public/langs/bn_BD/main.lang
diff --git a/htdocs/langs/bn_BD/margins.lang b/public/langs/bn_BD/margins.lang
similarity index 100%
rename from htdocs/langs/bn_BD/margins.lang
rename to public/langs/bn_BD/margins.lang
diff --git a/htdocs/langs/bn_BD/members.lang b/public/langs/bn_BD/members.lang
similarity index 100%
rename from htdocs/langs/bn_BD/members.lang
rename to public/langs/bn_BD/members.lang
diff --git a/htdocs/langs/bn_BD/oauth.lang b/public/langs/bn_BD/oauth.lang
similarity index 100%
rename from htdocs/langs/bn_BD/oauth.lang
rename to public/langs/bn_BD/oauth.lang
diff --git a/htdocs/langs/bn_BD/opensurvey.lang b/public/langs/bn_BD/opensurvey.lang
similarity index 100%
rename from htdocs/langs/bn_BD/opensurvey.lang
rename to public/langs/bn_BD/opensurvey.lang
diff --git a/htdocs/langs/bn_BD/orders.lang b/public/langs/bn_BD/orders.lang
similarity index 100%
rename from htdocs/langs/bn_BD/orders.lang
rename to public/langs/bn_BD/orders.lang
diff --git a/htdocs/langs/bn_BD/other.lang b/public/langs/bn_BD/other.lang
similarity index 100%
rename from htdocs/langs/bn_BD/other.lang
rename to public/langs/bn_BD/other.lang
diff --git a/htdocs/langs/bn_BD/paybox.lang b/public/langs/bn_BD/paybox.lang
similarity index 100%
rename from htdocs/langs/bn_BD/paybox.lang
rename to public/langs/bn_BD/paybox.lang
diff --git a/htdocs/langs/bn_BD/paypal.lang b/public/langs/bn_BD/paypal.lang
similarity index 100%
rename from htdocs/langs/bn_BD/paypal.lang
rename to public/langs/bn_BD/paypal.lang
diff --git a/htdocs/langs/bn_BD/printing.lang b/public/langs/bn_BD/printing.lang
similarity index 100%
rename from htdocs/langs/bn_BD/printing.lang
rename to public/langs/bn_BD/printing.lang
diff --git a/htdocs/langs/bn_BD/productbatch.lang b/public/langs/bn_BD/productbatch.lang
similarity index 100%
rename from htdocs/langs/bn_BD/productbatch.lang
rename to public/langs/bn_BD/productbatch.lang
diff --git a/htdocs/langs/bn_BD/products.lang b/public/langs/bn_BD/products.lang
similarity index 100%
rename from htdocs/langs/bn_BD/products.lang
rename to public/langs/bn_BD/products.lang
diff --git a/htdocs/langs/bn_BD/projects.lang b/public/langs/bn_BD/projects.lang
similarity index 100%
rename from htdocs/langs/bn_BD/projects.lang
rename to public/langs/bn_BD/projects.lang
diff --git a/htdocs/langs/bn_BD/propal.lang b/public/langs/bn_BD/propal.lang
similarity index 100%
rename from htdocs/langs/bn_BD/propal.lang
rename to public/langs/bn_BD/propal.lang
diff --git a/htdocs/langs/bn_BD/receiptprinter.lang b/public/langs/bn_BD/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/bn_BD/receiptprinter.lang
rename to public/langs/bn_BD/receiptprinter.lang
diff --git a/htdocs/langs/bn_BD/resource.lang b/public/langs/bn_BD/resource.lang
similarity index 100%
rename from htdocs/langs/bn_BD/resource.lang
rename to public/langs/bn_BD/resource.lang
diff --git a/htdocs/langs/bn_BD/salaries.lang b/public/langs/bn_BD/salaries.lang
similarity index 100%
rename from htdocs/langs/bn_BD/salaries.lang
rename to public/langs/bn_BD/salaries.lang
diff --git a/htdocs/langs/bn_BD/sendings.lang b/public/langs/bn_BD/sendings.lang
similarity index 100%
rename from htdocs/langs/bn_BD/sendings.lang
rename to public/langs/bn_BD/sendings.lang
diff --git a/htdocs/langs/bn_BD/sms.lang b/public/langs/bn_BD/sms.lang
similarity index 100%
rename from htdocs/langs/bn_BD/sms.lang
rename to public/langs/bn_BD/sms.lang
diff --git a/htdocs/langs/bn_BD/stocks.lang b/public/langs/bn_BD/stocks.lang
similarity index 100%
rename from htdocs/langs/bn_BD/stocks.lang
rename to public/langs/bn_BD/stocks.lang
diff --git a/htdocs/langs/bn_BD/supplier_proposal.lang b/public/langs/bn_BD/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/bn_BD/supplier_proposal.lang
rename to public/langs/bn_BD/supplier_proposal.lang
diff --git a/htdocs/langs/bn_BD/suppliers.lang b/public/langs/bn_BD/suppliers.lang
similarity index 100%
rename from htdocs/langs/bn_BD/suppliers.lang
rename to public/langs/bn_BD/suppliers.lang
diff --git a/htdocs/langs/bn_BD/trips.lang b/public/langs/bn_BD/trips.lang
similarity index 100%
rename from htdocs/langs/bn_BD/trips.lang
rename to public/langs/bn_BD/trips.lang
diff --git a/htdocs/langs/bn_BD/users.lang b/public/langs/bn_BD/users.lang
similarity index 100%
rename from htdocs/langs/bn_BD/users.lang
rename to public/langs/bn_BD/users.lang
diff --git a/htdocs/langs/bn_BD/website.lang b/public/langs/bn_BD/website.lang
similarity index 100%
rename from htdocs/langs/bn_BD/website.lang
rename to public/langs/bn_BD/website.lang
diff --git a/htdocs/langs/bn_BD/withdrawals.lang b/public/langs/bn_BD/withdrawals.lang
similarity index 100%
rename from htdocs/langs/bn_BD/withdrawals.lang
rename to public/langs/bn_BD/withdrawals.lang
diff --git a/htdocs/langs/bn_BD/workflow.lang b/public/langs/bn_BD/workflow.lang
similarity index 100%
rename from htdocs/langs/bn_BD/workflow.lang
rename to public/langs/bn_BD/workflow.lang
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/public/langs/bs_BA/accountancy.lang
similarity index 100%
rename from htdocs/langs/bs_BA/accountancy.lang
rename to public/langs/bs_BA/accountancy.lang
diff --git a/htdocs/langs/bs_BA/admin.lang b/public/langs/bs_BA/admin.lang
similarity index 100%
rename from htdocs/langs/bs_BA/admin.lang
rename to public/langs/bs_BA/admin.lang
diff --git a/htdocs/langs/bs_BA/agenda.lang b/public/langs/bs_BA/agenda.lang
similarity index 100%
rename from htdocs/langs/bs_BA/agenda.lang
rename to public/langs/bs_BA/agenda.lang
diff --git a/htdocs/langs/bs_BA/banks.lang b/public/langs/bs_BA/banks.lang
similarity index 100%
rename from htdocs/langs/bs_BA/banks.lang
rename to public/langs/bs_BA/banks.lang
diff --git a/htdocs/langs/bs_BA/bills.lang b/public/langs/bs_BA/bills.lang
similarity index 100%
rename from htdocs/langs/bs_BA/bills.lang
rename to public/langs/bs_BA/bills.lang
diff --git a/htdocs/langs/bs_BA/bookmarks.lang b/public/langs/bs_BA/bookmarks.lang
similarity index 100%
rename from htdocs/langs/bs_BA/bookmarks.lang
rename to public/langs/bs_BA/bookmarks.lang
diff --git a/htdocs/langs/bs_BA/boxes.lang b/public/langs/bs_BA/boxes.lang
similarity index 100%
rename from htdocs/langs/bs_BA/boxes.lang
rename to public/langs/bs_BA/boxes.lang
diff --git a/htdocs/langs/bs_BA/cashdesk.lang b/public/langs/bs_BA/cashdesk.lang
similarity index 100%
rename from htdocs/langs/bs_BA/cashdesk.lang
rename to public/langs/bs_BA/cashdesk.lang
diff --git a/htdocs/langs/bs_BA/categories.lang b/public/langs/bs_BA/categories.lang
similarity index 100%
rename from htdocs/langs/bs_BA/categories.lang
rename to public/langs/bs_BA/categories.lang
diff --git a/htdocs/langs/bs_BA/commercial.lang b/public/langs/bs_BA/commercial.lang
similarity index 100%
rename from htdocs/langs/bs_BA/commercial.lang
rename to public/langs/bs_BA/commercial.lang
diff --git a/htdocs/langs/bs_BA/companies.lang b/public/langs/bs_BA/companies.lang
similarity index 100%
rename from htdocs/langs/bs_BA/companies.lang
rename to public/langs/bs_BA/companies.lang
diff --git a/htdocs/langs/bs_BA/compta.lang b/public/langs/bs_BA/compta.lang
similarity index 100%
rename from htdocs/langs/bs_BA/compta.lang
rename to public/langs/bs_BA/compta.lang
diff --git a/htdocs/langs/bs_BA/contracts.lang b/public/langs/bs_BA/contracts.lang
similarity index 100%
rename from htdocs/langs/bs_BA/contracts.lang
rename to public/langs/bs_BA/contracts.lang
diff --git a/htdocs/langs/bs_BA/cron.lang b/public/langs/bs_BA/cron.lang
similarity index 100%
rename from htdocs/langs/bs_BA/cron.lang
rename to public/langs/bs_BA/cron.lang
diff --git a/htdocs/langs/bs_BA/deliveries.lang b/public/langs/bs_BA/deliveries.lang
similarity index 100%
rename from htdocs/langs/bs_BA/deliveries.lang
rename to public/langs/bs_BA/deliveries.lang
diff --git a/htdocs/langs/bs_BA/dict.lang b/public/langs/bs_BA/dict.lang
similarity index 100%
rename from htdocs/langs/bs_BA/dict.lang
rename to public/langs/bs_BA/dict.lang
diff --git a/htdocs/langs/bs_BA/donations.lang b/public/langs/bs_BA/donations.lang
similarity index 100%
rename from htdocs/langs/bs_BA/donations.lang
rename to public/langs/bs_BA/donations.lang
diff --git a/htdocs/langs/bs_BA/ecm.lang b/public/langs/bs_BA/ecm.lang
similarity index 100%
rename from htdocs/langs/bs_BA/ecm.lang
rename to public/langs/bs_BA/ecm.lang
diff --git a/htdocs/langs/bs_BA/errors.lang b/public/langs/bs_BA/errors.lang
similarity index 100%
rename from htdocs/langs/bs_BA/errors.lang
rename to public/langs/bs_BA/errors.lang
diff --git a/htdocs/langs/bs_BA/exports.lang b/public/langs/bs_BA/exports.lang
similarity index 100%
rename from htdocs/langs/bs_BA/exports.lang
rename to public/langs/bs_BA/exports.lang
diff --git a/htdocs/langs/bs_BA/externalsite.lang b/public/langs/bs_BA/externalsite.lang
similarity index 100%
rename from htdocs/langs/bs_BA/externalsite.lang
rename to public/langs/bs_BA/externalsite.lang
diff --git a/htdocs/langs/bs_BA/ftp.lang b/public/langs/bs_BA/ftp.lang
similarity index 100%
rename from htdocs/langs/bs_BA/ftp.lang
rename to public/langs/bs_BA/ftp.lang
diff --git a/htdocs/langs/bs_BA/help.lang b/public/langs/bs_BA/help.lang
similarity index 100%
rename from htdocs/langs/bs_BA/help.lang
rename to public/langs/bs_BA/help.lang
diff --git a/htdocs/langs/bs_BA/holiday.lang b/public/langs/bs_BA/holiday.lang
similarity index 100%
rename from htdocs/langs/bs_BA/holiday.lang
rename to public/langs/bs_BA/holiday.lang
diff --git a/htdocs/langs/bs_BA/hrm.lang b/public/langs/bs_BA/hrm.lang
similarity index 100%
rename from htdocs/langs/bs_BA/hrm.lang
rename to public/langs/bs_BA/hrm.lang
diff --git a/htdocs/langs/bs_BA/incoterm.lang b/public/langs/bs_BA/incoterm.lang
similarity index 100%
rename from htdocs/langs/bs_BA/incoterm.lang
rename to public/langs/bs_BA/incoterm.lang
diff --git a/htdocs/langs/bs_BA/install.lang b/public/langs/bs_BA/install.lang
similarity index 100%
rename from htdocs/langs/bs_BA/install.lang
rename to public/langs/bs_BA/install.lang
diff --git a/htdocs/langs/bs_BA/interventions.lang b/public/langs/bs_BA/interventions.lang
similarity index 100%
rename from htdocs/langs/bs_BA/interventions.lang
rename to public/langs/bs_BA/interventions.lang
diff --git a/htdocs/langs/bs_BA/languages.lang b/public/langs/bs_BA/languages.lang
similarity index 100%
rename from htdocs/langs/bs_BA/languages.lang
rename to public/langs/bs_BA/languages.lang
diff --git a/htdocs/langs/bs_BA/ldap.lang b/public/langs/bs_BA/ldap.lang
similarity index 100%
rename from htdocs/langs/bs_BA/ldap.lang
rename to public/langs/bs_BA/ldap.lang
diff --git a/htdocs/langs/bs_BA/link.lang b/public/langs/bs_BA/link.lang
similarity index 100%
rename from htdocs/langs/bs_BA/link.lang
rename to public/langs/bs_BA/link.lang
diff --git a/htdocs/langs/bs_BA/loan.lang b/public/langs/bs_BA/loan.lang
similarity index 100%
rename from htdocs/langs/bs_BA/loan.lang
rename to public/langs/bs_BA/loan.lang
diff --git a/htdocs/langs/bs_BA/mailmanspip.lang b/public/langs/bs_BA/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/bs_BA/mailmanspip.lang
rename to public/langs/bs_BA/mailmanspip.lang
diff --git a/htdocs/langs/bs_BA/mails.lang b/public/langs/bs_BA/mails.lang
similarity index 100%
rename from htdocs/langs/bs_BA/mails.lang
rename to public/langs/bs_BA/mails.lang
diff --git a/htdocs/langs/bs_BA/main.lang b/public/langs/bs_BA/main.lang
similarity index 100%
rename from htdocs/langs/bs_BA/main.lang
rename to public/langs/bs_BA/main.lang
diff --git a/htdocs/langs/bs_BA/margins.lang b/public/langs/bs_BA/margins.lang
similarity index 100%
rename from htdocs/langs/bs_BA/margins.lang
rename to public/langs/bs_BA/margins.lang
diff --git a/htdocs/langs/bs_BA/members.lang b/public/langs/bs_BA/members.lang
similarity index 100%
rename from htdocs/langs/bs_BA/members.lang
rename to public/langs/bs_BA/members.lang
diff --git a/htdocs/langs/bs_BA/oauth.lang b/public/langs/bs_BA/oauth.lang
similarity index 100%
rename from htdocs/langs/bs_BA/oauth.lang
rename to public/langs/bs_BA/oauth.lang
diff --git a/htdocs/langs/bs_BA/opensurvey.lang b/public/langs/bs_BA/opensurvey.lang
similarity index 100%
rename from htdocs/langs/bs_BA/opensurvey.lang
rename to public/langs/bs_BA/opensurvey.lang
diff --git a/htdocs/langs/bs_BA/orders.lang b/public/langs/bs_BA/orders.lang
similarity index 100%
rename from htdocs/langs/bs_BA/orders.lang
rename to public/langs/bs_BA/orders.lang
diff --git a/htdocs/langs/bs_BA/other.lang b/public/langs/bs_BA/other.lang
similarity index 100%
rename from htdocs/langs/bs_BA/other.lang
rename to public/langs/bs_BA/other.lang
diff --git a/htdocs/langs/bs_BA/paybox.lang b/public/langs/bs_BA/paybox.lang
similarity index 100%
rename from htdocs/langs/bs_BA/paybox.lang
rename to public/langs/bs_BA/paybox.lang
diff --git a/htdocs/langs/bs_BA/paypal.lang b/public/langs/bs_BA/paypal.lang
similarity index 100%
rename from htdocs/langs/bs_BA/paypal.lang
rename to public/langs/bs_BA/paypal.lang
diff --git a/htdocs/langs/bs_BA/printing.lang b/public/langs/bs_BA/printing.lang
similarity index 100%
rename from htdocs/langs/bs_BA/printing.lang
rename to public/langs/bs_BA/printing.lang
diff --git a/htdocs/langs/bs_BA/productbatch.lang b/public/langs/bs_BA/productbatch.lang
similarity index 100%
rename from htdocs/langs/bs_BA/productbatch.lang
rename to public/langs/bs_BA/productbatch.lang
diff --git a/htdocs/langs/bs_BA/products.lang b/public/langs/bs_BA/products.lang
similarity index 100%
rename from htdocs/langs/bs_BA/products.lang
rename to public/langs/bs_BA/products.lang
diff --git a/htdocs/langs/bs_BA/projects.lang b/public/langs/bs_BA/projects.lang
similarity index 100%
rename from htdocs/langs/bs_BA/projects.lang
rename to public/langs/bs_BA/projects.lang
diff --git a/htdocs/langs/bs_BA/propal.lang b/public/langs/bs_BA/propal.lang
similarity index 100%
rename from htdocs/langs/bs_BA/propal.lang
rename to public/langs/bs_BA/propal.lang
diff --git a/htdocs/langs/bs_BA/receiptprinter.lang b/public/langs/bs_BA/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/bs_BA/receiptprinter.lang
rename to public/langs/bs_BA/receiptprinter.lang
diff --git a/htdocs/langs/bs_BA/resource.lang b/public/langs/bs_BA/resource.lang
similarity index 100%
rename from htdocs/langs/bs_BA/resource.lang
rename to public/langs/bs_BA/resource.lang
diff --git a/htdocs/langs/bs_BA/salaries.lang b/public/langs/bs_BA/salaries.lang
similarity index 100%
rename from htdocs/langs/bs_BA/salaries.lang
rename to public/langs/bs_BA/salaries.lang
diff --git a/htdocs/langs/bs_BA/sendings.lang b/public/langs/bs_BA/sendings.lang
similarity index 100%
rename from htdocs/langs/bs_BA/sendings.lang
rename to public/langs/bs_BA/sendings.lang
diff --git a/htdocs/langs/bs_BA/sms.lang b/public/langs/bs_BA/sms.lang
similarity index 100%
rename from htdocs/langs/bs_BA/sms.lang
rename to public/langs/bs_BA/sms.lang
diff --git a/htdocs/langs/bs_BA/stocks.lang b/public/langs/bs_BA/stocks.lang
similarity index 100%
rename from htdocs/langs/bs_BA/stocks.lang
rename to public/langs/bs_BA/stocks.lang
diff --git a/htdocs/langs/bs_BA/supplier_proposal.lang b/public/langs/bs_BA/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/bs_BA/supplier_proposal.lang
rename to public/langs/bs_BA/supplier_proposal.lang
diff --git a/htdocs/langs/bs_BA/suppliers.lang b/public/langs/bs_BA/suppliers.lang
similarity index 100%
rename from htdocs/langs/bs_BA/suppliers.lang
rename to public/langs/bs_BA/suppliers.lang
diff --git a/htdocs/langs/bs_BA/trips.lang b/public/langs/bs_BA/trips.lang
similarity index 100%
rename from htdocs/langs/bs_BA/trips.lang
rename to public/langs/bs_BA/trips.lang
diff --git a/htdocs/langs/bs_BA/users.lang b/public/langs/bs_BA/users.lang
similarity index 100%
rename from htdocs/langs/bs_BA/users.lang
rename to public/langs/bs_BA/users.lang
diff --git a/htdocs/langs/bs_BA/website.lang b/public/langs/bs_BA/website.lang
similarity index 100%
rename from htdocs/langs/bs_BA/website.lang
rename to public/langs/bs_BA/website.lang
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/public/langs/bs_BA/withdrawals.lang
similarity index 100%
rename from htdocs/langs/bs_BA/withdrawals.lang
rename to public/langs/bs_BA/withdrawals.lang
diff --git a/htdocs/langs/bs_BA/workflow.lang b/public/langs/bs_BA/workflow.lang
similarity index 100%
rename from htdocs/langs/bs_BA/workflow.lang
rename to public/langs/bs_BA/workflow.lang
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/public/langs/ca_ES/accountancy.lang
similarity index 100%
rename from htdocs/langs/ca_ES/accountancy.lang
rename to public/langs/ca_ES/accountancy.lang
diff --git a/htdocs/langs/ca_ES/admin.lang b/public/langs/ca_ES/admin.lang
similarity index 100%
rename from htdocs/langs/ca_ES/admin.lang
rename to public/langs/ca_ES/admin.lang
diff --git a/htdocs/langs/ca_ES/agenda.lang b/public/langs/ca_ES/agenda.lang
similarity index 100%
rename from htdocs/langs/ca_ES/agenda.lang
rename to public/langs/ca_ES/agenda.lang
diff --git a/htdocs/langs/ca_ES/banks.lang b/public/langs/ca_ES/banks.lang
similarity index 100%
rename from htdocs/langs/ca_ES/banks.lang
rename to public/langs/ca_ES/banks.lang
diff --git a/htdocs/langs/ca_ES/bills.lang b/public/langs/ca_ES/bills.lang
similarity index 100%
rename from htdocs/langs/ca_ES/bills.lang
rename to public/langs/ca_ES/bills.lang
diff --git a/htdocs/langs/ca_ES/bookmarks.lang b/public/langs/ca_ES/bookmarks.lang
similarity index 100%
rename from htdocs/langs/ca_ES/bookmarks.lang
rename to public/langs/ca_ES/bookmarks.lang
diff --git a/htdocs/langs/ca_ES/boxes.lang b/public/langs/ca_ES/boxes.lang
similarity index 100%
rename from htdocs/langs/ca_ES/boxes.lang
rename to public/langs/ca_ES/boxes.lang
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/public/langs/ca_ES/cashdesk.lang
similarity index 100%
rename from htdocs/langs/ca_ES/cashdesk.lang
rename to public/langs/ca_ES/cashdesk.lang
diff --git a/htdocs/langs/ca_ES/categories.lang b/public/langs/ca_ES/categories.lang
similarity index 100%
rename from htdocs/langs/ca_ES/categories.lang
rename to public/langs/ca_ES/categories.lang
diff --git a/htdocs/langs/ca_ES/commercial.lang b/public/langs/ca_ES/commercial.lang
similarity index 100%
rename from htdocs/langs/ca_ES/commercial.lang
rename to public/langs/ca_ES/commercial.lang
diff --git a/htdocs/langs/ca_ES/companies.lang b/public/langs/ca_ES/companies.lang
similarity index 100%
rename from htdocs/langs/ca_ES/companies.lang
rename to public/langs/ca_ES/companies.lang
diff --git a/htdocs/langs/ca_ES/compta.lang b/public/langs/ca_ES/compta.lang
similarity index 100%
rename from htdocs/langs/ca_ES/compta.lang
rename to public/langs/ca_ES/compta.lang
diff --git a/htdocs/langs/ca_ES/contracts.lang b/public/langs/ca_ES/contracts.lang
similarity index 100%
rename from htdocs/langs/ca_ES/contracts.lang
rename to public/langs/ca_ES/contracts.lang
diff --git a/htdocs/langs/ca_ES/cron.lang b/public/langs/ca_ES/cron.lang
similarity index 100%
rename from htdocs/langs/ca_ES/cron.lang
rename to public/langs/ca_ES/cron.lang
diff --git a/htdocs/langs/ca_ES/deliveries.lang b/public/langs/ca_ES/deliveries.lang
similarity index 100%
rename from htdocs/langs/ca_ES/deliveries.lang
rename to public/langs/ca_ES/deliveries.lang
diff --git a/htdocs/langs/ca_ES/dict.lang b/public/langs/ca_ES/dict.lang
similarity index 100%
rename from htdocs/langs/ca_ES/dict.lang
rename to public/langs/ca_ES/dict.lang
diff --git a/htdocs/langs/ca_ES/donations.lang b/public/langs/ca_ES/donations.lang
similarity index 100%
rename from htdocs/langs/ca_ES/donations.lang
rename to public/langs/ca_ES/donations.lang
diff --git a/htdocs/langs/ca_ES/ecm.lang b/public/langs/ca_ES/ecm.lang
similarity index 100%
rename from htdocs/langs/ca_ES/ecm.lang
rename to public/langs/ca_ES/ecm.lang
diff --git a/htdocs/langs/ca_ES/errors.lang b/public/langs/ca_ES/errors.lang
similarity index 100%
rename from htdocs/langs/ca_ES/errors.lang
rename to public/langs/ca_ES/errors.lang
diff --git a/htdocs/langs/ca_ES/exports.lang b/public/langs/ca_ES/exports.lang
similarity index 100%
rename from htdocs/langs/ca_ES/exports.lang
rename to public/langs/ca_ES/exports.lang
diff --git a/htdocs/langs/ca_ES/externalsite.lang b/public/langs/ca_ES/externalsite.lang
similarity index 100%
rename from htdocs/langs/ca_ES/externalsite.lang
rename to public/langs/ca_ES/externalsite.lang
diff --git a/htdocs/langs/ca_ES/ftp.lang b/public/langs/ca_ES/ftp.lang
similarity index 100%
rename from htdocs/langs/ca_ES/ftp.lang
rename to public/langs/ca_ES/ftp.lang
diff --git a/htdocs/langs/ca_ES/help.lang b/public/langs/ca_ES/help.lang
similarity index 100%
rename from htdocs/langs/ca_ES/help.lang
rename to public/langs/ca_ES/help.lang
diff --git a/htdocs/langs/ca_ES/holiday.lang b/public/langs/ca_ES/holiday.lang
similarity index 100%
rename from htdocs/langs/ca_ES/holiday.lang
rename to public/langs/ca_ES/holiday.lang
diff --git a/htdocs/langs/ca_ES/hrm.lang b/public/langs/ca_ES/hrm.lang
similarity index 100%
rename from htdocs/langs/ca_ES/hrm.lang
rename to public/langs/ca_ES/hrm.lang
diff --git a/htdocs/langs/ca_ES/incoterm.lang b/public/langs/ca_ES/incoterm.lang
similarity index 100%
rename from htdocs/langs/ca_ES/incoterm.lang
rename to public/langs/ca_ES/incoterm.lang
diff --git a/htdocs/langs/ca_ES/install.lang b/public/langs/ca_ES/install.lang
similarity index 100%
rename from htdocs/langs/ca_ES/install.lang
rename to public/langs/ca_ES/install.lang
diff --git a/htdocs/langs/ca_ES/interventions.lang b/public/langs/ca_ES/interventions.lang
similarity index 100%
rename from htdocs/langs/ca_ES/interventions.lang
rename to public/langs/ca_ES/interventions.lang
diff --git a/htdocs/langs/ca_ES/languages.lang b/public/langs/ca_ES/languages.lang
similarity index 100%
rename from htdocs/langs/ca_ES/languages.lang
rename to public/langs/ca_ES/languages.lang
diff --git a/htdocs/langs/ca_ES/ldap.lang b/public/langs/ca_ES/ldap.lang
similarity index 100%
rename from htdocs/langs/ca_ES/ldap.lang
rename to public/langs/ca_ES/ldap.lang
diff --git a/htdocs/langs/ca_ES/link.lang b/public/langs/ca_ES/link.lang
similarity index 100%
rename from htdocs/langs/ca_ES/link.lang
rename to public/langs/ca_ES/link.lang
diff --git a/htdocs/langs/ca_ES/loan.lang b/public/langs/ca_ES/loan.lang
similarity index 100%
rename from htdocs/langs/ca_ES/loan.lang
rename to public/langs/ca_ES/loan.lang
diff --git a/htdocs/langs/ca_ES/mailmanspip.lang b/public/langs/ca_ES/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/ca_ES/mailmanspip.lang
rename to public/langs/ca_ES/mailmanspip.lang
diff --git a/htdocs/langs/ca_ES/mails.lang b/public/langs/ca_ES/mails.lang
similarity index 100%
rename from htdocs/langs/ca_ES/mails.lang
rename to public/langs/ca_ES/mails.lang
diff --git a/htdocs/langs/ca_ES/main.lang b/public/langs/ca_ES/main.lang
similarity index 100%
rename from htdocs/langs/ca_ES/main.lang
rename to public/langs/ca_ES/main.lang
diff --git a/htdocs/langs/ca_ES/margins.lang b/public/langs/ca_ES/margins.lang
similarity index 100%
rename from htdocs/langs/ca_ES/margins.lang
rename to public/langs/ca_ES/margins.lang
diff --git a/htdocs/langs/ca_ES/members.lang b/public/langs/ca_ES/members.lang
similarity index 100%
rename from htdocs/langs/ca_ES/members.lang
rename to public/langs/ca_ES/members.lang
diff --git a/htdocs/langs/ca_ES/oauth.lang b/public/langs/ca_ES/oauth.lang
similarity index 100%
rename from htdocs/langs/ca_ES/oauth.lang
rename to public/langs/ca_ES/oauth.lang
diff --git a/htdocs/langs/ca_ES/opensurvey.lang b/public/langs/ca_ES/opensurvey.lang
similarity index 100%
rename from htdocs/langs/ca_ES/opensurvey.lang
rename to public/langs/ca_ES/opensurvey.lang
diff --git a/htdocs/langs/ca_ES/orders.lang b/public/langs/ca_ES/orders.lang
similarity index 100%
rename from htdocs/langs/ca_ES/orders.lang
rename to public/langs/ca_ES/orders.lang
diff --git a/htdocs/langs/ca_ES/other.lang b/public/langs/ca_ES/other.lang
similarity index 100%
rename from htdocs/langs/ca_ES/other.lang
rename to public/langs/ca_ES/other.lang
diff --git a/htdocs/langs/ca_ES/paybox.lang b/public/langs/ca_ES/paybox.lang
similarity index 100%
rename from htdocs/langs/ca_ES/paybox.lang
rename to public/langs/ca_ES/paybox.lang
diff --git a/htdocs/langs/ca_ES/paypal.lang b/public/langs/ca_ES/paypal.lang
similarity index 100%
rename from htdocs/langs/ca_ES/paypal.lang
rename to public/langs/ca_ES/paypal.lang
diff --git a/htdocs/langs/ca_ES/printing.lang b/public/langs/ca_ES/printing.lang
similarity index 100%
rename from htdocs/langs/ca_ES/printing.lang
rename to public/langs/ca_ES/printing.lang
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/public/langs/ca_ES/productbatch.lang
similarity index 100%
rename from htdocs/langs/ca_ES/productbatch.lang
rename to public/langs/ca_ES/productbatch.lang
diff --git a/htdocs/langs/ca_ES/products.lang b/public/langs/ca_ES/products.lang
similarity index 100%
rename from htdocs/langs/ca_ES/products.lang
rename to public/langs/ca_ES/products.lang
diff --git a/htdocs/langs/ca_ES/projects.lang b/public/langs/ca_ES/projects.lang
similarity index 100%
rename from htdocs/langs/ca_ES/projects.lang
rename to public/langs/ca_ES/projects.lang
diff --git a/htdocs/langs/ca_ES/propal.lang b/public/langs/ca_ES/propal.lang
similarity index 100%
rename from htdocs/langs/ca_ES/propal.lang
rename to public/langs/ca_ES/propal.lang
diff --git a/htdocs/langs/ca_ES/receiptprinter.lang b/public/langs/ca_ES/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/ca_ES/receiptprinter.lang
rename to public/langs/ca_ES/receiptprinter.lang
diff --git a/htdocs/langs/ca_ES/resource.lang b/public/langs/ca_ES/resource.lang
similarity index 100%
rename from htdocs/langs/ca_ES/resource.lang
rename to public/langs/ca_ES/resource.lang
diff --git a/htdocs/langs/ca_ES/salaries.lang b/public/langs/ca_ES/salaries.lang
similarity index 100%
rename from htdocs/langs/ca_ES/salaries.lang
rename to public/langs/ca_ES/salaries.lang
diff --git a/htdocs/langs/ca_ES/sendings.lang b/public/langs/ca_ES/sendings.lang
similarity index 100%
rename from htdocs/langs/ca_ES/sendings.lang
rename to public/langs/ca_ES/sendings.lang
diff --git a/htdocs/langs/ca_ES/sms.lang b/public/langs/ca_ES/sms.lang
similarity index 100%
rename from htdocs/langs/ca_ES/sms.lang
rename to public/langs/ca_ES/sms.lang
diff --git a/htdocs/langs/ca_ES/stocks.lang b/public/langs/ca_ES/stocks.lang
similarity index 100%
rename from htdocs/langs/ca_ES/stocks.lang
rename to public/langs/ca_ES/stocks.lang
diff --git a/htdocs/langs/ca_ES/supplier_proposal.lang b/public/langs/ca_ES/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/ca_ES/supplier_proposal.lang
rename to public/langs/ca_ES/supplier_proposal.lang
diff --git a/htdocs/langs/ca_ES/suppliers.lang b/public/langs/ca_ES/suppliers.lang
similarity index 100%
rename from htdocs/langs/ca_ES/suppliers.lang
rename to public/langs/ca_ES/suppliers.lang
diff --git a/htdocs/langs/ca_ES/trips.lang b/public/langs/ca_ES/trips.lang
similarity index 100%
rename from htdocs/langs/ca_ES/trips.lang
rename to public/langs/ca_ES/trips.lang
diff --git a/htdocs/langs/ca_ES/users.lang b/public/langs/ca_ES/users.lang
similarity index 100%
rename from htdocs/langs/ca_ES/users.lang
rename to public/langs/ca_ES/users.lang
diff --git a/htdocs/langs/ca_ES/website.lang b/public/langs/ca_ES/website.lang
similarity index 100%
rename from htdocs/langs/ca_ES/website.lang
rename to public/langs/ca_ES/website.lang
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/public/langs/ca_ES/withdrawals.lang
similarity index 100%
rename from htdocs/langs/ca_ES/withdrawals.lang
rename to public/langs/ca_ES/withdrawals.lang
diff --git a/htdocs/langs/ca_ES/workflow.lang b/public/langs/ca_ES/workflow.lang
similarity index 100%
rename from htdocs/langs/ca_ES/workflow.lang
rename to public/langs/ca_ES/workflow.lang
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/public/langs/cs_CZ/accountancy.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/accountancy.lang
rename to public/langs/cs_CZ/accountancy.lang
diff --git a/htdocs/langs/cs_CZ/admin.lang b/public/langs/cs_CZ/admin.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/admin.lang
rename to public/langs/cs_CZ/admin.lang
diff --git a/htdocs/langs/cs_CZ/agenda.lang b/public/langs/cs_CZ/agenda.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/agenda.lang
rename to public/langs/cs_CZ/agenda.lang
diff --git a/htdocs/langs/cs_CZ/banks.lang b/public/langs/cs_CZ/banks.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/banks.lang
rename to public/langs/cs_CZ/banks.lang
diff --git a/htdocs/langs/cs_CZ/bills.lang b/public/langs/cs_CZ/bills.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/bills.lang
rename to public/langs/cs_CZ/bills.lang
diff --git a/htdocs/langs/cs_CZ/bookmarks.lang b/public/langs/cs_CZ/bookmarks.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/bookmarks.lang
rename to public/langs/cs_CZ/bookmarks.lang
diff --git a/htdocs/langs/cs_CZ/boxes.lang b/public/langs/cs_CZ/boxes.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/boxes.lang
rename to public/langs/cs_CZ/boxes.lang
diff --git a/htdocs/langs/cs_CZ/cashdesk.lang b/public/langs/cs_CZ/cashdesk.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/cashdesk.lang
rename to public/langs/cs_CZ/cashdesk.lang
diff --git a/htdocs/langs/cs_CZ/categories.lang b/public/langs/cs_CZ/categories.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/categories.lang
rename to public/langs/cs_CZ/categories.lang
diff --git a/htdocs/langs/cs_CZ/commercial.lang b/public/langs/cs_CZ/commercial.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/commercial.lang
rename to public/langs/cs_CZ/commercial.lang
diff --git a/htdocs/langs/cs_CZ/companies.lang b/public/langs/cs_CZ/companies.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/companies.lang
rename to public/langs/cs_CZ/companies.lang
diff --git a/htdocs/langs/cs_CZ/compta.lang b/public/langs/cs_CZ/compta.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/compta.lang
rename to public/langs/cs_CZ/compta.lang
diff --git a/htdocs/langs/cs_CZ/contracts.lang b/public/langs/cs_CZ/contracts.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/contracts.lang
rename to public/langs/cs_CZ/contracts.lang
diff --git a/htdocs/langs/cs_CZ/cron.lang b/public/langs/cs_CZ/cron.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/cron.lang
rename to public/langs/cs_CZ/cron.lang
diff --git a/htdocs/langs/cs_CZ/deliveries.lang b/public/langs/cs_CZ/deliveries.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/deliveries.lang
rename to public/langs/cs_CZ/deliveries.lang
diff --git a/htdocs/langs/cs_CZ/dict.lang b/public/langs/cs_CZ/dict.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/dict.lang
rename to public/langs/cs_CZ/dict.lang
diff --git a/htdocs/langs/cs_CZ/donations.lang b/public/langs/cs_CZ/donations.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/donations.lang
rename to public/langs/cs_CZ/donations.lang
diff --git a/htdocs/langs/cs_CZ/ecm.lang b/public/langs/cs_CZ/ecm.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/ecm.lang
rename to public/langs/cs_CZ/ecm.lang
diff --git a/htdocs/langs/cs_CZ/errors.lang b/public/langs/cs_CZ/errors.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/errors.lang
rename to public/langs/cs_CZ/errors.lang
diff --git a/htdocs/langs/cs_CZ/exports.lang b/public/langs/cs_CZ/exports.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/exports.lang
rename to public/langs/cs_CZ/exports.lang
diff --git a/htdocs/langs/cs_CZ/externalsite.lang b/public/langs/cs_CZ/externalsite.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/externalsite.lang
rename to public/langs/cs_CZ/externalsite.lang
diff --git a/htdocs/langs/cs_CZ/ftp.lang b/public/langs/cs_CZ/ftp.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/ftp.lang
rename to public/langs/cs_CZ/ftp.lang
diff --git a/htdocs/langs/cs_CZ/help.lang b/public/langs/cs_CZ/help.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/help.lang
rename to public/langs/cs_CZ/help.lang
diff --git a/htdocs/langs/cs_CZ/holiday.lang b/public/langs/cs_CZ/holiday.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/holiday.lang
rename to public/langs/cs_CZ/holiday.lang
diff --git a/htdocs/langs/cs_CZ/hrm.lang b/public/langs/cs_CZ/hrm.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/hrm.lang
rename to public/langs/cs_CZ/hrm.lang
diff --git a/htdocs/langs/cs_CZ/incoterm.lang b/public/langs/cs_CZ/incoterm.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/incoterm.lang
rename to public/langs/cs_CZ/incoterm.lang
diff --git a/htdocs/langs/cs_CZ/install.lang b/public/langs/cs_CZ/install.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/install.lang
rename to public/langs/cs_CZ/install.lang
diff --git a/htdocs/langs/cs_CZ/interventions.lang b/public/langs/cs_CZ/interventions.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/interventions.lang
rename to public/langs/cs_CZ/interventions.lang
diff --git a/htdocs/langs/cs_CZ/languages.lang b/public/langs/cs_CZ/languages.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/languages.lang
rename to public/langs/cs_CZ/languages.lang
diff --git a/htdocs/langs/cs_CZ/ldap.lang b/public/langs/cs_CZ/ldap.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/ldap.lang
rename to public/langs/cs_CZ/ldap.lang
diff --git a/htdocs/langs/cs_CZ/link.lang b/public/langs/cs_CZ/link.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/link.lang
rename to public/langs/cs_CZ/link.lang
diff --git a/htdocs/langs/cs_CZ/loan.lang b/public/langs/cs_CZ/loan.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/loan.lang
rename to public/langs/cs_CZ/loan.lang
diff --git a/htdocs/langs/cs_CZ/mailmanspip.lang b/public/langs/cs_CZ/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/mailmanspip.lang
rename to public/langs/cs_CZ/mailmanspip.lang
diff --git a/htdocs/langs/cs_CZ/mails.lang b/public/langs/cs_CZ/mails.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/mails.lang
rename to public/langs/cs_CZ/mails.lang
diff --git a/htdocs/langs/cs_CZ/main.lang b/public/langs/cs_CZ/main.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/main.lang
rename to public/langs/cs_CZ/main.lang
diff --git a/htdocs/langs/cs_CZ/margins.lang b/public/langs/cs_CZ/margins.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/margins.lang
rename to public/langs/cs_CZ/margins.lang
diff --git a/htdocs/langs/cs_CZ/members.lang b/public/langs/cs_CZ/members.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/members.lang
rename to public/langs/cs_CZ/members.lang
diff --git a/htdocs/langs/cs_CZ/oauth.lang b/public/langs/cs_CZ/oauth.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/oauth.lang
rename to public/langs/cs_CZ/oauth.lang
diff --git a/htdocs/langs/cs_CZ/opensurvey.lang b/public/langs/cs_CZ/opensurvey.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/opensurvey.lang
rename to public/langs/cs_CZ/opensurvey.lang
diff --git a/htdocs/langs/cs_CZ/orders.lang b/public/langs/cs_CZ/orders.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/orders.lang
rename to public/langs/cs_CZ/orders.lang
diff --git a/htdocs/langs/cs_CZ/other.lang b/public/langs/cs_CZ/other.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/other.lang
rename to public/langs/cs_CZ/other.lang
diff --git a/htdocs/langs/cs_CZ/paybox.lang b/public/langs/cs_CZ/paybox.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/paybox.lang
rename to public/langs/cs_CZ/paybox.lang
diff --git a/htdocs/langs/cs_CZ/paypal.lang b/public/langs/cs_CZ/paypal.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/paypal.lang
rename to public/langs/cs_CZ/paypal.lang
diff --git a/htdocs/langs/cs_CZ/printing.lang b/public/langs/cs_CZ/printing.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/printing.lang
rename to public/langs/cs_CZ/printing.lang
diff --git a/htdocs/langs/cs_CZ/productbatch.lang b/public/langs/cs_CZ/productbatch.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/productbatch.lang
rename to public/langs/cs_CZ/productbatch.lang
diff --git a/htdocs/langs/cs_CZ/products.lang b/public/langs/cs_CZ/products.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/products.lang
rename to public/langs/cs_CZ/products.lang
diff --git a/htdocs/langs/cs_CZ/projects.lang b/public/langs/cs_CZ/projects.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/projects.lang
rename to public/langs/cs_CZ/projects.lang
diff --git a/htdocs/langs/cs_CZ/propal.lang b/public/langs/cs_CZ/propal.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/propal.lang
rename to public/langs/cs_CZ/propal.lang
diff --git a/htdocs/langs/cs_CZ/receiptprinter.lang b/public/langs/cs_CZ/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/receiptprinter.lang
rename to public/langs/cs_CZ/receiptprinter.lang
diff --git a/htdocs/langs/cs_CZ/resource.lang b/public/langs/cs_CZ/resource.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/resource.lang
rename to public/langs/cs_CZ/resource.lang
diff --git a/htdocs/langs/cs_CZ/salaries.lang b/public/langs/cs_CZ/salaries.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/salaries.lang
rename to public/langs/cs_CZ/salaries.lang
diff --git a/htdocs/langs/cs_CZ/sendings.lang b/public/langs/cs_CZ/sendings.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/sendings.lang
rename to public/langs/cs_CZ/sendings.lang
diff --git a/htdocs/langs/cs_CZ/sms.lang b/public/langs/cs_CZ/sms.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/sms.lang
rename to public/langs/cs_CZ/sms.lang
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/public/langs/cs_CZ/stocks.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/stocks.lang
rename to public/langs/cs_CZ/stocks.lang
diff --git a/htdocs/langs/cs_CZ/supplier_proposal.lang b/public/langs/cs_CZ/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/supplier_proposal.lang
rename to public/langs/cs_CZ/supplier_proposal.lang
diff --git a/htdocs/langs/cs_CZ/suppliers.lang b/public/langs/cs_CZ/suppliers.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/suppliers.lang
rename to public/langs/cs_CZ/suppliers.lang
diff --git a/htdocs/langs/cs_CZ/trips.lang b/public/langs/cs_CZ/trips.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/trips.lang
rename to public/langs/cs_CZ/trips.lang
diff --git a/htdocs/langs/cs_CZ/users.lang b/public/langs/cs_CZ/users.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/users.lang
rename to public/langs/cs_CZ/users.lang
diff --git a/htdocs/langs/cs_CZ/website.lang b/public/langs/cs_CZ/website.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/website.lang
rename to public/langs/cs_CZ/website.lang
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/public/langs/cs_CZ/withdrawals.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/withdrawals.lang
rename to public/langs/cs_CZ/withdrawals.lang
diff --git a/htdocs/langs/cs_CZ/workflow.lang b/public/langs/cs_CZ/workflow.lang
similarity index 100%
rename from htdocs/langs/cs_CZ/workflow.lang
rename to public/langs/cs_CZ/workflow.lang
diff --git a/htdocs/langs/da_DK/accountancy.lang b/public/langs/da_DK/accountancy.lang
similarity index 100%
rename from htdocs/langs/da_DK/accountancy.lang
rename to public/langs/da_DK/accountancy.lang
diff --git a/htdocs/langs/da_DK/admin.lang b/public/langs/da_DK/admin.lang
similarity index 100%
rename from htdocs/langs/da_DK/admin.lang
rename to public/langs/da_DK/admin.lang
diff --git a/htdocs/langs/da_DK/agenda.lang b/public/langs/da_DK/agenda.lang
similarity index 100%
rename from htdocs/langs/da_DK/agenda.lang
rename to public/langs/da_DK/agenda.lang
diff --git a/htdocs/langs/da_DK/banks.lang b/public/langs/da_DK/banks.lang
similarity index 100%
rename from htdocs/langs/da_DK/banks.lang
rename to public/langs/da_DK/banks.lang
diff --git a/htdocs/langs/da_DK/bills.lang b/public/langs/da_DK/bills.lang
similarity index 100%
rename from htdocs/langs/da_DK/bills.lang
rename to public/langs/da_DK/bills.lang
diff --git a/htdocs/langs/da_DK/bookmarks.lang b/public/langs/da_DK/bookmarks.lang
similarity index 100%
rename from htdocs/langs/da_DK/bookmarks.lang
rename to public/langs/da_DK/bookmarks.lang
diff --git a/htdocs/langs/da_DK/boxes.lang b/public/langs/da_DK/boxes.lang
similarity index 100%
rename from htdocs/langs/da_DK/boxes.lang
rename to public/langs/da_DK/boxes.lang
diff --git a/htdocs/langs/da_DK/cashdesk.lang b/public/langs/da_DK/cashdesk.lang
similarity index 100%
rename from htdocs/langs/da_DK/cashdesk.lang
rename to public/langs/da_DK/cashdesk.lang
diff --git a/htdocs/langs/da_DK/categories.lang b/public/langs/da_DK/categories.lang
similarity index 100%
rename from htdocs/langs/da_DK/categories.lang
rename to public/langs/da_DK/categories.lang
diff --git a/htdocs/langs/da_DK/commercial.lang b/public/langs/da_DK/commercial.lang
similarity index 100%
rename from htdocs/langs/da_DK/commercial.lang
rename to public/langs/da_DK/commercial.lang
diff --git a/htdocs/langs/da_DK/companies.lang b/public/langs/da_DK/companies.lang
similarity index 100%
rename from htdocs/langs/da_DK/companies.lang
rename to public/langs/da_DK/companies.lang
diff --git a/htdocs/langs/da_DK/compta.lang b/public/langs/da_DK/compta.lang
similarity index 100%
rename from htdocs/langs/da_DK/compta.lang
rename to public/langs/da_DK/compta.lang
diff --git a/htdocs/langs/da_DK/contracts.lang b/public/langs/da_DK/contracts.lang
similarity index 100%
rename from htdocs/langs/da_DK/contracts.lang
rename to public/langs/da_DK/contracts.lang
diff --git a/htdocs/langs/da_DK/cron.lang b/public/langs/da_DK/cron.lang
similarity index 100%
rename from htdocs/langs/da_DK/cron.lang
rename to public/langs/da_DK/cron.lang
diff --git a/htdocs/langs/da_DK/deliveries.lang b/public/langs/da_DK/deliveries.lang
similarity index 100%
rename from htdocs/langs/da_DK/deliveries.lang
rename to public/langs/da_DK/deliveries.lang
diff --git a/htdocs/langs/da_DK/dict.lang b/public/langs/da_DK/dict.lang
similarity index 100%
rename from htdocs/langs/da_DK/dict.lang
rename to public/langs/da_DK/dict.lang
diff --git a/htdocs/langs/da_DK/donations.lang b/public/langs/da_DK/donations.lang
similarity index 100%
rename from htdocs/langs/da_DK/donations.lang
rename to public/langs/da_DK/donations.lang
diff --git a/htdocs/langs/da_DK/ecm.lang b/public/langs/da_DK/ecm.lang
similarity index 100%
rename from htdocs/langs/da_DK/ecm.lang
rename to public/langs/da_DK/ecm.lang
diff --git a/htdocs/langs/da_DK/errors.lang b/public/langs/da_DK/errors.lang
similarity index 100%
rename from htdocs/langs/da_DK/errors.lang
rename to public/langs/da_DK/errors.lang
diff --git a/htdocs/langs/da_DK/exports.lang b/public/langs/da_DK/exports.lang
similarity index 100%
rename from htdocs/langs/da_DK/exports.lang
rename to public/langs/da_DK/exports.lang
diff --git a/htdocs/langs/da_DK/externalsite.lang b/public/langs/da_DK/externalsite.lang
similarity index 100%
rename from htdocs/langs/da_DK/externalsite.lang
rename to public/langs/da_DK/externalsite.lang
diff --git a/htdocs/langs/da_DK/ftp.lang b/public/langs/da_DK/ftp.lang
similarity index 100%
rename from htdocs/langs/da_DK/ftp.lang
rename to public/langs/da_DK/ftp.lang
diff --git a/htdocs/langs/da_DK/help.lang b/public/langs/da_DK/help.lang
similarity index 100%
rename from htdocs/langs/da_DK/help.lang
rename to public/langs/da_DK/help.lang
diff --git a/htdocs/langs/da_DK/holiday.lang b/public/langs/da_DK/holiday.lang
similarity index 100%
rename from htdocs/langs/da_DK/holiday.lang
rename to public/langs/da_DK/holiday.lang
diff --git a/htdocs/langs/da_DK/hrm.lang b/public/langs/da_DK/hrm.lang
similarity index 100%
rename from htdocs/langs/da_DK/hrm.lang
rename to public/langs/da_DK/hrm.lang
diff --git a/htdocs/langs/da_DK/incoterm.lang b/public/langs/da_DK/incoterm.lang
similarity index 100%
rename from htdocs/langs/da_DK/incoterm.lang
rename to public/langs/da_DK/incoterm.lang
diff --git a/htdocs/langs/da_DK/install.lang b/public/langs/da_DK/install.lang
similarity index 100%
rename from htdocs/langs/da_DK/install.lang
rename to public/langs/da_DK/install.lang
diff --git a/htdocs/langs/da_DK/interventions.lang b/public/langs/da_DK/interventions.lang
similarity index 100%
rename from htdocs/langs/da_DK/interventions.lang
rename to public/langs/da_DK/interventions.lang
diff --git a/htdocs/langs/da_DK/languages.lang b/public/langs/da_DK/languages.lang
similarity index 100%
rename from htdocs/langs/da_DK/languages.lang
rename to public/langs/da_DK/languages.lang
diff --git a/htdocs/langs/da_DK/ldap.lang b/public/langs/da_DK/ldap.lang
similarity index 100%
rename from htdocs/langs/da_DK/ldap.lang
rename to public/langs/da_DK/ldap.lang
diff --git a/htdocs/langs/da_DK/link.lang b/public/langs/da_DK/link.lang
similarity index 100%
rename from htdocs/langs/da_DK/link.lang
rename to public/langs/da_DK/link.lang
diff --git a/htdocs/langs/da_DK/loan.lang b/public/langs/da_DK/loan.lang
similarity index 100%
rename from htdocs/langs/da_DK/loan.lang
rename to public/langs/da_DK/loan.lang
diff --git a/htdocs/langs/da_DK/mailmanspip.lang b/public/langs/da_DK/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/da_DK/mailmanspip.lang
rename to public/langs/da_DK/mailmanspip.lang
diff --git a/htdocs/langs/da_DK/mails.lang b/public/langs/da_DK/mails.lang
similarity index 100%
rename from htdocs/langs/da_DK/mails.lang
rename to public/langs/da_DK/mails.lang
diff --git a/htdocs/langs/da_DK/main.lang b/public/langs/da_DK/main.lang
similarity index 100%
rename from htdocs/langs/da_DK/main.lang
rename to public/langs/da_DK/main.lang
diff --git a/htdocs/langs/da_DK/margins.lang b/public/langs/da_DK/margins.lang
similarity index 100%
rename from htdocs/langs/da_DK/margins.lang
rename to public/langs/da_DK/margins.lang
diff --git a/htdocs/langs/da_DK/members.lang b/public/langs/da_DK/members.lang
similarity index 100%
rename from htdocs/langs/da_DK/members.lang
rename to public/langs/da_DK/members.lang
diff --git a/htdocs/langs/da_DK/oauth.lang b/public/langs/da_DK/oauth.lang
similarity index 100%
rename from htdocs/langs/da_DK/oauth.lang
rename to public/langs/da_DK/oauth.lang
diff --git a/htdocs/langs/da_DK/opensurvey.lang b/public/langs/da_DK/opensurvey.lang
similarity index 100%
rename from htdocs/langs/da_DK/opensurvey.lang
rename to public/langs/da_DK/opensurvey.lang
diff --git a/htdocs/langs/da_DK/orders.lang b/public/langs/da_DK/orders.lang
similarity index 100%
rename from htdocs/langs/da_DK/orders.lang
rename to public/langs/da_DK/orders.lang
diff --git a/htdocs/langs/da_DK/other.lang b/public/langs/da_DK/other.lang
similarity index 100%
rename from htdocs/langs/da_DK/other.lang
rename to public/langs/da_DK/other.lang
diff --git a/htdocs/langs/da_DK/paybox.lang b/public/langs/da_DK/paybox.lang
similarity index 100%
rename from htdocs/langs/da_DK/paybox.lang
rename to public/langs/da_DK/paybox.lang
diff --git a/htdocs/langs/da_DK/paypal.lang b/public/langs/da_DK/paypal.lang
similarity index 100%
rename from htdocs/langs/da_DK/paypal.lang
rename to public/langs/da_DK/paypal.lang
diff --git a/htdocs/langs/da_DK/printing.lang b/public/langs/da_DK/printing.lang
similarity index 100%
rename from htdocs/langs/da_DK/printing.lang
rename to public/langs/da_DK/printing.lang
diff --git a/htdocs/langs/da_DK/productbatch.lang b/public/langs/da_DK/productbatch.lang
similarity index 100%
rename from htdocs/langs/da_DK/productbatch.lang
rename to public/langs/da_DK/productbatch.lang
diff --git a/htdocs/langs/da_DK/products.lang b/public/langs/da_DK/products.lang
similarity index 100%
rename from htdocs/langs/da_DK/products.lang
rename to public/langs/da_DK/products.lang
diff --git a/htdocs/langs/da_DK/projects.lang b/public/langs/da_DK/projects.lang
similarity index 100%
rename from htdocs/langs/da_DK/projects.lang
rename to public/langs/da_DK/projects.lang
diff --git a/htdocs/langs/da_DK/propal.lang b/public/langs/da_DK/propal.lang
similarity index 100%
rename from htdocs/langs/da_DK/propal.lang
rename to public/langs/da_DK/propal.lang
diff --git a/htdocs/langs/da_DK/receiptprinter.lang b/public/langs/da_DK/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/da_DK/receiptprinter.lang
rename to public/langs/da_DK/receiptprinter.lang
diff --git a/htdocs/langs/da_DK/resource.lang b/public/langs/da_DK/resource.lang
similarity index 100%
rename from htdocs/langs/da_DK/resource.lang
rename to public/langs/da_DK/resource.lang
diff --git a/htdocs/langs/da_DK/salaries.lang b/public/langs/da_DK/salaries.lang
similarity index 100%
rename from htdocs/langs/da_DK/salaries.lang
rename to public/langs/da_DK/salaries.lang
diff --git a/htdocs/langs/da_DK/sendings.lang b/public/langs/da_DK/sendings.lang
similarity index 100%
rename from htdocs/langs/da_DK/sendings.lang
rename to public/langs/da_DK/sendings.lang
diff --git a/htdocs/langs/da_DK/sms.lang b/public/langs/da_DK/sms.lang
similarity index 100%
rename from htdocs/langs/da_DK/sms.lang
rename to public/langs/da_DK/sms.lang
diff --git a/htdocs/langs/da_DK/stocks.lang b/public/langs/da_DK/stocks.lang
similarity index 100%
rename from htdocs/langs/da_DK/stocks.lang
rename to public/langs/da_DK/stocks.lang
diff --git a/htdocs/langs/da_DK/supplier_proposal.lang b/public/langs/da_DK/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/da_DK/supplier_proposal.lang
rename to public/langs/da_DK/supplier_proposal.lang
diff --git a/htdocs/langs/da_DK/suppliers.lang b/public/langs/da_DK/suppliers.lang
similarity index 100%
rename from htdocs/langs/da_DK/suppliers.lang
rename to public/langs/da_DK/suppliers.lang
diff --git a/htdocs/langs/da_DK/trips.lang b/public/langs/da_DK/trips.lang
similarity index 100%
rename from htdocs/langs/da_DK/trips.lang
rename to public/langs/da_DK/trips.lang
diff --git a/htdocs/langs/da_DK/users.lang b/public/langs/da_DK/users.lang
similarity index 100%
rename from htdocs/langs/da_DK/users.lang
rename to public/langs/da_DK/users.lang
diff --git a/htdocs/langs/da_DK/website.lang b/public/langs/da_DK/website.lang
similarity index 100%
rename from htdocs/langs/da_DK/website.lang
rename to public/langs/da_DK/website.lang
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/public/langs/da_DK/withdrawals.lang
similarity index 100%
rename from htdocs/langs/da_DK/withdrawals.lang
rename to public/langs/da_DK/withdrawals.lang
diff --git a/htdocs/langs/da_DK/workflow.lang b/public/langs/da_DK/workflow.lang
similarity index 100%
rename from htdocs/langs/da_DK/workflow.lang
rename to public/langs/da_DK/workflow.lang
diff --git a/htdocs/langs/de_AT/accountancy.lang b/public/langs/de_AT/accountancy.lang
similarity index 100%
rename from htdocs/langs/de_AT/accountancy.lang
rename to public/langs/de_AT/accountancy.lang
diff --git a/htdocs/langs/de_AT/admin.lang b/public/langs/de_AT/admin.lang
similarity index 100%
rename from htdocs/langs/de_AT/admin.lang
rename to public/langs/de_AT/admin.lang
diff --git a/htdocs/langs/de_AT/agenda.lang b/public/langs/de_AT/agenda.lang
similarity index 100%
rename from htdocs/langs/de_AT/agenda.lang
rename to public/langs/de_AT/agenda.lang
diff --git a/htdocs/langs/de_AT/banks.lang b/public/langs/de_AT/banks.lang
similarity index 100%
rename from htdocs/langs/de_AT/banks.lang
rename to public/langs/de_AT/banks.lang
diff --git a/htdocs/langs/de_AT/bills.lang b/public/langs/de_AT/bills.lang
similarity index 100%
rename from htdocs/langs/de_AT/bills.lang
rename to public/langs/de_AT/bills.lang
diff --git a/htdocs/langs/de_AT/bookmarks.lang b/public/langs/de_AT/bookmarks.lang
similarity index 100%
rename from htdocs/langs/de_AT/bookmarks.lang
rename to public/langs/de_AT/bookmarks.lang
diff --git a/htdocs/langs/de_AT/boxes.lang b/public/langs/de_AT/boxes.lang
similarity index 100%
rename from htdocs/langs/de_AT/boxes.lang
rename to public/langs/de_AT/boxes.lang
diff --git a/htdocs/langs/de_AT/cashdesk.lang b/public/langs/de_AT/cashdesk.lang
similarity index 100%
rename from htdocs/langs/de_AT/cashdesk.lang
rename to public/langs/de_AT/cashdesk.lang
diff --git a/htdocs/langs/de_AT/categories.lang b/public/langs/de_AT/categories.lang
similarity index 100%
rename from htdocs/langs/de_AT/categories.lang
rename to public/langs/de_AT/categories.lang
diff --git a/htdocs/langs/de_AT/commercial.lang b/public/langs/de_AT/commercial.lang
similarity index 100%
rename from htdocs/langs/de_AT/commercial.lang
rename to public/langs/de_AT/commercial.lang
diff --git a/htdocs/langs/de_AT/companies.lang b/public/langs/de_AT/companies.lang
similarity index 100%
rename from htdocs/langs/de_AT/companies.lang
rename to public/langs/de_AT/companies.lang
diff --git a/htdocs/langs/de_AT/compta.lang b/public/langs/de_AT/compta.lang
similarity index 100%
rename from htdocs/langs/de_AT/compta.lang
rename to public/langs/de_AT/compta.lang
diff --git a/htdocs/langs/de_AT/contracts.lang b/public/langs/de_AT/contracts.lang
similarity index 100%
rename from htdocs/langs/de_AT/contracts.lang
rename to public/langs/de_AT/contracts.lang
diff --git a/htdocs/langs/de_AT/cron.lang b/public/langs/de_AT/cron.lang
similarity index 100%
rename from htdocs/langs/de_AT/cron.lang
rename to public/langs/de_AT/cron.lang
diff --git a/htdocs/langs/de_AT/deliveries.lang b/public/langs/de_AT/deliveries.lang
similarity index 100%
rename from htdocs/langs/de_AT/deliveries.lang
rename to public/langs/de_AT/deliveries.lang
diff --git a/htdocs/langs/de_AT/dict.lang b/public/langs/de_AT/dict.lang
similarity index 100%
rename from htdocs/langs/de_AT/dict.lang
rename to public/langs/de_AT/dict.lang
diff --git a/htdocs/langs/de_AT/donations.lang b/public/langs/de_AT/donations.lang
similarity index 100%
rename from htdocs/langs/de_AT/donations.lang
rename to public/langs/de_AT/donations.lang
diff --git a/htdocs/langs/de_AT/ecm.lang b/public/langs/de_AT/ecm.lang
similarity index 100%
rename from htdocs/langs/de_AT/ecm.lang
rename to public/langs/de_AT/ecm.lang
diff --git a/htdocs/langs/de_AT/errors.lang b/public/langs/de_AT/errors.lang
similarity index 100%
rename from htdocs/langs/de_AT/errors.lang
rename to public/langs/de_AT/errors.lang
diff --git a/htdocs/langs/de_AT/exports.lang b/public/langs/de_AT/exports.lang
similarity index 100%
rename from htdocs/langs/de_AT/exports.lang
rename to public/langs/de_AT/exports.lang
diff --git a/htdocs/langs/de_AT/externalsite.lang b/public/langs/de_AT/externalsite.lang
similarity index 100%
rename from htdocs/langs/de_AT/externalsite.lang
rename to public/langs/de_AT/externalsite.lang
diff --git a/htdocs/langs/de_AT/ftp.lang b/public/langs/de_AT/ftp.lang
similarity index 100%
rename from htdocs/langs/de_AT/ftp.lang
rename to public/langs/de_AT/ftp.lang
diff --git a/htdocs/langs/de_AT/help.lang b/public/langs/de_AT/help.lang
similarity index 100%
rename from htdocs/langs/de_AT/help.lang
rename to public/langs/de_AT/help.lang
diff --git a/htdocs/langs/de_AT/holiday.lang b/public/langs/de_AT/holiday.lang
similarity index 100%
rename from htdocs/langs/de_AT/holiday.lang
rename to public/langs/de_AT/holiday.lang
diff --git a/htdocs/langs/de_AT/hrm.lang b/public/langs/de_AT/hrm.lang
similarity index 100%
rename from htdocs/langs/de_AT/hrm.lang
rename to public/langs/de_AT/hrm.lang
diff --git a/htdocs/langs/de_AT/incoterm.lang b/public/langs/de_AT/incoterm.lang
similarity index 100%
rename from htdocs/langs/de_AT/incoterm.lang
rename to public/langs/de_AT/incoterm.lang
diff --git a/htdocs/langs/de_AT/install.lang b/public/langs/de_AT/install.lang
similarity index 100%
rename from htdocs/langs/de_AT/install.lang
rename to public/langs/de_AT/install.lang
diff --git a/htdocs/langs/de_AT/interventions.lang b/public/langs/de_AT/interventions.lang
similarity index 100%
rename from htdocs/langs/de_AT/interventions.lang
rename to public/langs/de_AT/interventions.lang
diff --git a/htdocs/langs/de_AT/languages.lang b/public/langs/de_AT/languages.lang
similarity index 100%
rename from htdocs/langs/de_AT/languages.lang
rename to public/langs/de_AT/languages.lang
diff --git a/htdocs/langs/de_AT/ldap.lang b/public/langs/de_AT/ldap.lang
similarity index 100%
rename from htdocs/langs/de_AT/ldap.lang
rename to public/langs/de_AT/ldap.lang
diff --git a/htdocs/langs/de_AT/link.lang b/public/langs/de_AT/link.lang
similarity index 100%
rename from htdocs/langs/de_AT/link.lang
rename to public/langs/de_AT/link.lang
diff --git a/htdocs/langs/de_AT/loan.lang b/public/langs/de_AT/loan.lang
similarity index 100%
rename from htdocs/langs/de_AT/loan.lang
rename to public/langs/de_AT/loan.lang
diff --git a/htdocs/langs/de_AT/mailmanspip.lang b/public/langs/de_AT/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/de_AT/mailmanspip.lang
rename to public/langs/de_AT/mailmanspip.lang
diff --git a/htdocs/langs/de_AT/mails.lang b/public/langs/de_AT/mails.lang
similarity index 100%
rename from htdocs/langs/de_AT/mails.lang
rename to public/langs/de_AT/mails.lang
diff --git a/htdocs/langs/de_AT/main.lang b/public/langs/de_AT/main.lang
similarity index 100%
rename from htdocs/langs/de_AT/main.lang
rename to public/langs/de_AT/main.lang
diff --git a/htdocs/langs/de_AT/margins.lang b/public/langs/de_AT/margins.lang
similarity index 100%
rename from htdocs/langs/de_AT/margins.lang
rename to public/langs/de_AT/margins.lang
diff --git a/htdocs/langs/de_AT/members.lang b/public/langs/de_AT/members.lang
similarity index 100%
rename from htdocs/langs/de_AT/members.lang
rename to public/langs/de_AT/members.lang
diff --git a/htdocs/langs/de_AT/oauth.lang b/public/langs/de_AT/oauth.lang
similarity index 100%
rename from htdocs/langs/de_AT/oauth.lang
rename to public/langs/de_AT/oauth.lang
diff --git a/htdocs/langs/de_AT/opensurvey.lang b/public/langs/de_AT/opensurvey.lang
similarity index 100%
rename from htdocs/langs/de_AT/opensurvey.lang
rename to public/langs/de_AT/opensurvey.lang
diff --git a/htdocs/langs/de_AT/orders.lang b/public/langs/de_AT/orders.lang
similarity index 100%
rename from htdocs/langs/de_AT/orders.lang
rename to public/langs/de_AT/orders.lang
diff --git a/htdocs/langs/de_AT/other.lang b/public/langs/de_AT/other.lang
similarity index 100%
rename from htdocs/langs/de_AT/other.lang
rename to public/langs/de_AT/other.lang
diff --git a/htdocs/langs/de_AT/paybox.lang b/public/langs/de_AT/paybox.lang
similarity index 100%
rename from htdocs/langs/de_AT/paybox.lang
rename to public/langs/de_AT/paybox.lang
diff --git a/htdocs/langs/de_AT/paypal.lang b/public/langs/de_AT/paypal.lang
similarity index 100%
rename from htdocs/langs/de_AT/paypal.lang
rename to public/langs/de_AT/paypal.lang
diff --git a/htdocs/langs/de_AT/printing.lang b/public/langs/de_AT/printing.lang
similarity index 100%
rename from htdocs/langs/de_AT/printing.lang
rename to public/langs/de_AT/printing.lang
diff --git a/htdocs/langs/de_AT/productbatch.lang b/public/langs/de_AT/productbatch.lang
similarity index 100%
rename from htdocs/langs/de_AT/productbatch.lang
rename to public/langs/de_AT/productbatch.lang
diff --git a/htdocs/langs/de_AT/products.lang b/public/langs/de_AT/products.lang
similarity index 100%
rename from htdocs/langs/de_AT/products.lang
rename to public/langs/de_AT/products.lang
diff --git a/htdocs/langs/de_AT/projects.lang b/public/langs/de_AT/projects.lang
similarity index 100%
rename from htdocs/langs/de_AT/projects.lang
rename to public/langs/de_AT/projects.lang
diff --git a/htdocs/langs/de_AT/propal.lang b/public/langs/de_AT/propal.lang
similarity index 100%
rename from htdocs/langs/de_AT/propal.lang
rename to public/langs/de_AT/propal.lang
diff --git a/htdocs/langs/de_AT/receiptprinter.lang b/public/langs/de_AT/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/de_AT/receiptprinter.lang
rename to public/langs/de_AT/receiptprinter.lang
diff --git a/htdocs/langs/de_AT/resource.lang b/public/langs/de_AT/resource.lang
similarity index 100%
rename from htdocs/langs/de_AT/resource.lang
rename to public/langs/de_AT/resource.lang
diff --git a/htdocs/langs/de_AT/salaries.lang b/public/langs/de_AT/salaries.lang
similarity index 100%
rename from htdocs/langs/de_AT/salaries.lang
rename to public/langs/de_AT/salaries.lang
diff --git a/htdocs/langs/de_AT/sendings.lang b/public/langs/de_AT/sendings.lang
similarity index 100%
rename from htdocs/langs/de_AT/sendings.lang
rename to public/langs/de_AT/sendings.lang
diff --git a/htdocs/langs/de_AT/sms.lang b/public/langs/de_AT/sms.lang
similarity index 100%
rename from htdocs/langs/de_AT/sms.lang
rename to public/langs/de_AT/sms.lang
diff --git a/htdocs/langs/de_AT/stocks.lang b/public/langs/de_AT/stocks.lang
similarity index 100%
rename from htdocs/langs/de_AT/stocks.lang
rename to public/langs/de_AT/stocks.lang
diff --git a/htdocs/langs/de_AT/supplier_proposal.lang b/public/langs/de_AT/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/de_AT/supplier_proposal.lang
rename to public/langs/de_AT/supplier_proposal.lang
diff --git a/htdocs/langs/de_AT/suppliers.lang b/public/langs/de_AT/suppliers.lang
similarity index 100%
rename from htdocs/langs/de_AT/suppliers.lang
rename to public/langs/de_AT/suppliers.lang
diff --git a/htdocs/langs/de_AT/trips.lang b/public/langs/de_AT/trips.lang
similarity index 100%
rename from htdocs/langs/de_AT/trips.lang
rename to public/langs/de_AT/trips.lang
diff --git a/htdocs/langs/de_AT/users.lang b/public/langs/de_AT/users.lang
similarity index 100%
rename from htdocs/langs/de_AT/users.lang
rename to public/langs/de_AT/users.lang
diff --git a/htdocs/langs/de_AT/website.lang b/public/langs/de_AT/website.lang
similarity index 100%
rename from htdocs/langs/de_AT/website.lang
rename to public/langs/de_AT/website.lang
diff --git a/htdocs/langs/de_AT/withdrawals.lang b/public/langs/de_AT/withdrawals.lang
similarity index 100%
rename from htdocs/langs/de_AT/withdrawals.lang
rename to public/langs/de_AT/withdrawals.lang
diff --git a/htdocs/langs/de_AT/workflow.lang b/public/langs/de_AT/workflow.lang
similarity index 100%
rename from htdocs/langs/de_AT/workflow.lang
rename to public/langs/de_AT/workflow.lang
diff --git a/htdocs/langs/de_CH/accountancy.lang b/public/langs/de_CH/accountancy.lang
similarity index 100%
rename from htdocs/langs/de_CH/accountancy.lang
rename to public/langs/de_CH/accountancy.lang
diff --git a/htdocs/langs/de_CH/admin.lang b/public/langs/de_CH/admin.lang
similarity index 100%
rename from htdocs/langs/de_CH/admin.lang
rename to public/langs/de_CH/admin.lang
diff --git a/htdocs/langs/de_CH/agenda.lang b/public/langs/de_CH/agenda.lang
similarity index 100%
rename from htdocs/langs/de_CH/agenda.lang
rename to public/langs/de_CH/agenda.lang
diff --git a/htdocs/langs/de_CH/banks.lang b/public/langs/de_CH/banks.lang
similarity index 100%
rename from htdocs/langs/de_CH/banks.lang
rename to public/langs/de_CH/banks.lang
diff --git a/htdocs/langs/de_CH/bills.lang b/public/langs/de_CH/bills.lang
similarity index 100%
rename from htdocs/langs/de_CH/bills.lang
rename to public/langs/de_CH/bills.lang
diff --git a/htdocs/langs/de_CH/bookmarks.lang b/public/langs/de_CH/bookmarks.lang
similarity index 100%
rename from htdocs/langs/de_CH/bookmarks.lang
rename to public/langs/de_CH/bookmarks.lang
diff --git a/htdocs/langs/de_CH/boxes.lang b/public/langs/de_CH/boxes.lang
similarity index 100%
rename from htdocs/langs/de_CH/boxes.lang
rename to public/langs/de_CH/boxes.lang
diff --git a/htdocs/langs/de_CH/cashdesk.lang b/public/langs/de_CH/cashdesk.lang
similarity index 100%
rename from htdocs/langs/de_CH/cashdesk.lang
rename to public/langs/de_CH/cashdesk.lang
diff --git a/htdocs/langs/de_CH/categories.lang b/public/langs/de_CH/categories.lang
similarity index 100%
rename from htdocs/langs/de_CH/categories.lang
rename to public/langs/de_CH/categories.lang
diff --git a/htdocs/langs/de_CH/commercial.lang b/public/langs/de_CH/commercial.lang
similarity index 100%
rename from htdocs/langs/de_CH/commercial.lang
rename to public/langs/de_CH/commercial.lang
diff --git a/htdocs/langs/de_CH/companies.lang b/public/langs/de_CH/companies.lang
similarity index 100%
rename from htdocs/langs/de_CH/companies.lang
rename to public/langs/de_CH/companies.lang
diff --git a/htdocs/langs/de_CH/compta.lang b/public/langs/de_CH/compta.lang
similarity index 100%
rename from htdocs/langs/de_CH/compta.lang
rename to public/langs/de_CH/compta.lang
diff --git a/htdocs/langs/de_CH/contracts.lang b/public/langs/de_CH/contracts.lang
similarity index 100%
rename from htdocs/langs/de_CH/contracts.lang
rename to public/langs/de_CH/contracts.lang
diff --git a/htdocs/langs/de_CH/cron.lang b/public/langs/de_CH/cron.lang
similarity index 100%
rename from htdocs/langs/de_CH/cron.lang
rename to public/langs/de_CH/cron.lang
diff --git a/htdocs/langs/de_CH/deliveries.lang b/public/langs/de_CH/deliveries.lang
similarity index 100%
rename from htdocs/langs/de_CH/deliveries.lang
rename to public/langs/de_CH/deliveries.lang
diff --git a/htdocs/langs/de_CH/dict.lang b/public/langs/de_CH/dict.lang
similarity index 100%
rename from htdocs/langs/de_CH/dict.lang
rename to public/langs/de_CH/dict.lang
diff --git a/htdocs/langs/de_CH/donations.lang b/public/langs/de_CH/donations.lang
similarity index 100%
rename from htdocs/langs/de_CH/donations.lang
rename to public/langs/de_CH/donations.lang
diff --git a/htdocs/langs/de_CH/ecm.lang b/public/langs/de_CH/ecm.lang
similarity index 100%
rename from htdocs/langs/de_CH/ecm.lang
rename to public/langs/de_CH/ecm.lang
diff --git a/htdocs/langs/de_CH/errors.lang b/public/langs/de_CH/errors.lang
similarity index 100%
rename from htdocs/langs/de_CH/errors.lang
rename to public/langs/de_CH/errors.lang
diff --git a/htdocs/langs/de_CH/exports.lang b/public/langs/de_CH/exports.lang
similarity index 100%
rename from htdocs/langs/de_CH/exports.lang
rename to public/langs/de_CH/exports.lang
diff --git a/htdocs/langs/de_CH/externalsite.lang b/public/langs/de_CH/externalsite.lang
similarity index 100%
rename from htdocs/langs/de_CH/externalsite.lang
rename to public/langs/de_CH/externalsite.lang
diff --git a/htdocs/langs/de_CH/ftp.lang b/public/langs/de_CH/ftp.lang
similarity index 100%
rename from htdocs/langs/de_CH/ftp.lang
rename to public/langs/de_CH/ftp.lang
diff --git a/htdocs/langs/de_CH/help.lang b/public/langs/de_CH/help.lang
similarity index 100%
rename from htdocs/langs/de_CH/help.lang
rename to public/langs/de_CH/help.lang
diff --git a/htdocs/langs/de_CH/holiday.lang b/public/langs/de_CH/holiday.lang
similarity index 100%
rename from htdocs/langs/de_CH/holiday.lang
rename to public/langs/de_CH/holiday.lang
diff --git a/htdocs/langs/de_CH/hrm.lang b/public/langs/de_CH/hrm.lang
similarity index 100%
rename from htdocs/langs/de_CH/hrm.lang
rename to public/langs/de_CH/hrm.lang
diff --git a/htdocs/langs/de_CH/incoterm.lang b/public/langs/de_CH/incoterm.lang
similarity index 100%
rename from htdocs/langs/de_CH/incoterm.lang
rename to public/langs/de_CH/incoterm.lang
diff --git a/htdocs/langs/de_CH/install.lang b/public/langs/de_CH/install.lang
similarity index 100%
rename from htdocs/langs/de_CH/install.lang
rename to public/langs/de_CH/install.lang
diff --git a/htdocs/langs/de_CH/interventions.lang b/public/langs/de_CH/interventions.lang
similarity index 100%
rename from htdocs/langs/de_CH/interventions.lang
rename to public/langs/de_CH/interventions.lang
diff --git a/htdocs/langs/de_CH/languages.lang b/public/langs/de_CH/languages.lang
similarity index 100%
rename from htdocs/langs/de_CH/languages.lang
rename to public/langs/de_CH/languages.lang
diff --git a/htdocs/langs/de_CH/ldap.lang b/public/langs/de_CH/ldap.lang
similarity index 100%
rename from htdocs/langs/de_CH/ldap.lang
rename to public/langs/de_CH/ldap.lang
diff --git a/htdocs/langs/de_CH/link.lang b/public/langs/de_CH/link.lang
similarity index 100%
rename from htdocs/langs/de_CH/link.lang
rename to public/langs/de_CH/link.lang
diff --git a/htdocs/langs/de_CH/loan.lang b/public/langs/de_CH/loan.lang
similarity index 100%
rename from htdocs/langs/de_CH/loan.lang
rename to public/langs/de_CH/loan.lang
diff --git a/htdocs/langs/de_CH/mailmanspip.lang b/public/langs/de_CH/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/de_CH/mailmanspip.lang
rename to public/langs/de_CH/mailmanspip.lang
diff --git a/htdocs/langs/de_CH/mails.lang b/public/langs/de_CH/mails.lang
similarity index 100%
rename from htdocs/langs/de_CH/mails.lang
rename to public/langs/de_CH/mails.lang
diff --git a/htdocs/langs/de_CH/main.lang b/public/langs/de_CH/main.lang
similarity index 100%
rename from htdocs/langs/de_CH/main.lang
rename to public/langs/de_CH/main.lang
diff --git a/htdocs/langs/de_CH/margins.lang b/public/langs/de_CH/margins.lang
similarity index 100%
rename from htdocs/langs/de_CH/margins.lang
rename to public/langs/de_CH/margins.lang
diff --git a/htdocs/langs/de_CH/members.lang b/public/langs/de_CH/members.lang
similarity index 100%
rename from htdocs/langs/de_CH/members.lang
rename to public/langs/de_CH/members.lang
diff --git a/htdocs/langs/de_CH/oauth.lang b/public/langs/de_CH/oauth.lang
similarity index 100%
rename from htdocs/langs/de_CH/oauth.lang
rename to public/langs/de_CH/oauth.lang
diff --git a/htdocs/langs/de_CH/opensurvey.lang b/public/langs/de_CH/opensurvey.lang
similarity index 100%
rename from htdocs/langs/de_CH/opensurvey.lang
rename to public/langs/de_CH/opensurvey.lang
diff --git a/htdocs/langs/de_CH/orders.lang b/public/langs/de_CH/orders.lang
similarity index 100%
rename from htdocs/langs/de_CH/orders.lang
rename to public/langs/de_CH/orders.lang
diff --git a/htdocs/langs/de_CH/other.lang b/public/langs/de_CH/other.lang
similarity index 100%
rename from htdocs/langs/de_CH/other.lang
rename to public/langs/de_CH/other.lang
diff --git a/htdocs/langs/de_CH/paybox.lang b/public/langs/de_CH/paybox.lang
similarity index 100%
rename from htdocs/langs/de_CH/paybox.lang
rename to public/langs/de_CH/paybox.lang
diff --git a/htdocs/langs/de_CH/paypal.lang b/public/langs/de_CH/paypal.lang
similarity index 100%
rename from htdocs/langs/de_CH/paypal.lang
rename to public/langs/de_CH/paypal.lang
diff --git a/htdocs/langs/de_CH/printing.lang b/public/langs/de_CH/printing.lang
similarity index 100%
rename from htdocs/langs/de_CH/printing.lang
rename to public/langs/de_CH/printing.lang
diff --git a/htdocs/langs/de_CH/productbatch.lang b/public/langs/de_CH/productbatch.lang
similarity index 100%
rename from htdocs/langs/de_CH/productbatch.lang
rename to public/langs/de_CH/productbatch.lang
diff --git a/htdocs/langs/de_CH/products.lang b/public/langs/de_CH/products.lang
similarity index 100%
rename from htdocs/langs/de_CH/products.lang
rename to public/langs/de_CH/products.lang
diff --git a/htdocs/langs/de_CH/projects.lang b/public/langs/de_CH/projects.lang
similarity index 100%
rename from htdocs/langs/de_CH/projects.lang
rename to public/langs/de_CH/projects.lang
diff --git a/htdocs/langs/de_CH/propal.lang b/public/langs/de_CH/propal.lang
similarity index 100%
rename from htdocs/langs/de_CH/propal.lang
rename to public/langs/de_CH/propal.lang
diff --git a/htdocs/langs/de_CH/receiptprinter.lang b/public/langs/de_CH/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/de_CH/receiptprinter.lang
rename to public/langs/de_CH/receiptprinter.lang
diff --git a/htdocs/langs/de_CH/resource.lang b/public/langs/de_CH/resource.lang
similarity index 100%
rename from htdocs/langs/de_CH/resource.lang
rename to public/langs/de_CH/resource.lang
diff --git a/htdocs/langs/de_CH/salaries.lang b/public/langs/de_CH/salaries.lang
similarity index 100%
rename from htdocs/langs/de_CH/salaries.lang
rename to public/langs/de_CH/salaries.lang
diff --git a/htdocs/langs/de_CH/sendings.lang b/public/langs/de_CH/sendings.lang
similarity index 100%
rename from htdocs/langs/de_CH/sendings.lang
rename to public/langs/de_CH/sendings.lang
diff --git a/htdocs/langs/de_CH/sms.lang b/public/langs/de_CH/sms.lang
similarity index 100%
rename from htdocs/langs/de_CH/sms.lang
rename to public/langs/de_CH/sms.lang
diff --git a/htdocs/langs/de_CH/stocks.lang b/public/langs/de_CH/stocks.lang
similarity index 100%
rename from htdocs/langs/de_CH/stocks.lang
rename to public/langs/de_CH/stocks.lang
diff --git a/htdocs/langs/de_CH/supplier_proposal.lang b/public/langs/de_CH/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/de_CH/supplier_proposal.lang
rename to public/langs/de_CH/supplier_proposal.lang
diff --git a/htdocs/langs/de_CH/suppliers.lang b/public/langs/de_CH/suppliers.lang
similarity index 100%
rename from htdocs/langs/de_CH/suppliers.lang
rename to public/langs/de_CH/suppliers.lang
diff --git a/htdocs/langs/de_CH/trips.lang b/public/langs/de_CH/trips.lang
similarity index 100%
rename from htdocs/langs/de_CH/trips.lang
rename to public/langs/de_CH/trips.lang
diff --git a/htdocs/langs/de_CH/users.lang b/public/langs/de_CH/users.lang
similarity index 100%
rename from htdocs/langs/de_CH/users.lang
rename to public/langs/de_CH/users.lang
diff --git a/htdocs/langs/de_CH/website.lang b/public/langs/de_CH/website.lang
similarity index 100%
rename from htdocs/langs/de_CH/website.lang
rename to public/langs/de_CH/website.lang
diff --git a/htdocs/langs/de_CH/withdrawals.lang b/public/langs/de_CH/withdrawals.lang
similarity index 100%
rename from htdocs/langs/de_CH/withdrawals.lang
rename to public/langs/de_CH/withdrawals.lang
diff --git a/htdocs/langs/de_CH/workflow.lang b/public/langs/de_CH/workflow.lang
similarity index 100%
rename from htdocs/langs/de_CH/workflow.lang
rename to public/langs/de_CH/workflow.lang
diff --git a/htdocs/langs/de_DE/accountancy.lang b/public/langs/de_DE/accountancy.lang
similarity index 100%
rename from htdocs/langs/de_DE/accountancy.lang
rename to public/langs/de_DE/accountancy.lang
diff --git a/htdocs/langs/de_DE/admin.lang b/public/langs/de_DE/admin.lang
similarity index 100%
rename from htdocs/langs/de_DE/admin.lang
rename to public/langs/de_DE/admin.lang
diff --git a/htdocs/langs/de_DE/agenda.lang b/public/langs/de_DE/agenda.lang
similarity index 100%
rename from htdocs/langs/de_DE/agenda.lang
rename to public/langs/de_DE/agenda.lang
diff --git a/htdocs/langs/de_DE/banks.lang b/public/langs/de_DE/banks.lang
similarity index 100%
rename from htdocs/langs/de_DE/banks.lang
rename to public/langs/de_DE/banks.lang
diff --git a/htdocs/langs/de_DE/bills.lang b/public/langs/de_DE/bills.lang
similarity index 100%
rename from htdocs/langs/de_DE/bills.lang
rename to public/langs/de_DE/bills.lang
diff --git a/htdocs/langs/de_DE/bookmarks.lang b/public/langs/de_DE/bookmarks.lang
similarity index 100%
rename from htdocs/langs/de_DE/bookmarks.lang
rename to public/langs/de_DE/bookmarks.lang
diff --git a/htdocs/langs/de_DE/boxes.lang b/public/langs/de_DE/boxes.lang
similarity index 100%
rename from htdocs/langs/de_DE/boxes.lang
rename to public/langs/de_DE/boxes.lang
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/public/langs/de_DE/cashdesk.lang
similarity index 100%
rename from htdocs/langs/de_DE/cashdesk.lang
rename to public/langs/de_DE/cashdesk.lang
diff --git a/htdocs/langs/de_DE/categories.lang b/public/langs/de_DE/categories.lang
similarity index 100%
rename from htdocs/langs/de_DE/categories.lang
rename to public/langs/de_DE/categories.lang
diff --git a/htdocs/langs/de_DE/commercial.lang b/public/langs/de_DE/commercial.lang
similarity index 100%
rename from htdocs/langs/de_DE/commercial.lang
rename to public/langs/de_DE/commercial.lang
diff --git a/htdocs/langs/de_DE/companies.lang b/public/langs/de_DE/companies.lang
similarity index 100%
rename from htdocs/langs/de_DE/companies.lang
rename to public/langs/de_DE/companies.lang
diff --git a/htdocs/langs/de_DE/compta.lang b/public/langs/de_DE/compta.lang
similarity index 100%
rename from htdocs/langs/de_DE/compta.lang
rename to public/langs/de_DE/compta.lang
diff --git a/htdocs/langs/de_DE/contracts.lang b/public/langs/de_DE/contracts.lang
similarity index 100%
rename from htdocs/langs/de_DE/contracts.lang
rename to public/langs/de_DE/contracts.lang
diff --git a/htdocs/langs/de_DE/cron.lang b/public/langs/de_DE/cron.lang
similarity index 100%
rename from htdocs/langs/de_DE/cron.lang
rename to public/langs/de_DE/cron.lang
diff --git a/htdocs/langs/de_DE/deliveries.lang b/public/langs/de_DE/deliveries.lang
similarity index 100%
rename from htdocs/langs/de_DE/deliveries.lang
rename to public/langs/de_DE/deliveries.lang
diff --git a/htdocs/langs/de_DE/dict.lang b/public/langs/de_DE/dict.lang
similarity index 100%
rename from htdocs/langs/de_DE/dict.lang
rename to public/langs/de_DE/dict.lang
diff --git a/htdocs/langs/de_DE/donations.lang b/public/langs/de_DE/donations.lang
similarity index 100%
rename from htdocs/langs/de_DE/donations.lang
rename to public/langs/de_DE/donations.lang
diff --git a/htdocs/langs/de_DE/ecm.lang b/public/langs/de_DE/ecm.lang
similarity index 100%
rename from htdocs/langs/de_DE/ecm.lang
rename to public/langs/de_DE/ecm.lang
diff --git a/htdocs/langs/de_DE/errors.lang b/public/langs/de_DE/errors.lang
similarity index 100%
rename from htdocs/langs/de_DE/errors.lang
rename to public/langs/de_DE/errors.lang
diff --git a/htdocs/langs/de_DE/exports.lang b/public/langs/de_DE/exports.lang
similarity index 100%
rename from htdocs/langs/de_DE/exports.lang
rename to public/langs/de_DE/exports.lang
diff --git a/htdocs/langs/de_DE/externalsite.lang b/public/langs/de_DE/externalsite.lang
similarity index 100%
rename from htdocs/langs/de_DE/externalsite.lang
rename to public/langs/de_DE/externalsite.lang
diff --git a/htdocs/langs/de_DE/ftp.lang b/public/langs/de_DE/ftp.lang
similarity index 100%
rename from htdocs/langs/de_DE/ftp.lang
rename to public/langs/de_DE/ftp.lang
diff --git a/htdocs/langs/de_DE/help.lang b/public/langs/de_DE/help.lang
similarity index 100%
rename from htdocs/langs/de_DE/help.lang
rename to public/langs/de_DE/help.lang
diff --git a/htdocs/langs/de_DE/holiday.lang b/public/langs/de_DE/holiday.lang
similarity index 100%
rename from htdocs/langs/de_DE/holiday.lang
rename to public/langs/de_DE/holiday.lang
diff --git a/htdocs/langs/de_DE/hrm.lang b/public/langs/de_DE/hrm.lang
similarity index 100%
rename from htdocs/langs/de_DE/hrm.lang
rename to public/langs/de_DE/hrm.lang
diff --git a/htdocs/langs/de_DE/incoterm.lang b/public/langs/de_DE/incoterm.lang
similarity index 100%
rename from htdocs/langs/de_DE/incoterm.lang
rename to public/langs/de_DE/incoterm.lang
diff --git a/htdocs/langs/de_DE/install.lang b/public/langs/de_DE/install.lang
similarity index 100%
rename from htdocs/langs/de_DE/install.lang
rename to public/langs/de_DE/install.lang
diff --git a/htdocs/langs/de_DE/interventions.lang b/public/langs/de_DE/interventions.lang
similarity index 100%
rename from htdocs/langs/de_DE/interventions.lang
rename to public/langs/de_DE/interventions.lang
diff --git a/htdocs/langs/de_DE/languages.lang b/public/langs/de_DE/languages.lang
similarity index 100%
rename from htdocs/langs/de_DE/languages.lang
rename to public/langs/de_DE/languages.lang
diff --git a/htdocs/langs/de_DE/ldap.lang b/public/langs/de_DE/ldap.lang
similarity index 100%
rename from htdocs/langs/de_DE/ldap.lang
rename to public/langs/de_DE/ldap.lang
diff --git a/htdocs/langs/de_DE/link.lang b/public/langs/de_DE/link.lang
similarity index 100%
rename from htdocs/langs/de_DE/link.lang
rename to public/langs/de_DE/link.lang
diff --git a/htdocs/langs/de_DE/loan.lang b/public/langs/de_DE/loan.lang
similarity index 100%
rename from htdocs/langs/de_DE/loan.lang
rename to public/langs/de_DE/loan.lang
diff --git a/htdocs/langs/de_DE/mailmanspip.lang b/public/langs/de_DE/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/de_DE/mailmanspip.lang
rename to public/langs/de_DE/mailmanspip.lang
diff --git a/htdocs/langs/de_DE/mails.lang b/public/langs/de_DE/mails.lang
similarity index 100%
rename from htdocs/langs/de_DE/mails.lang
rename to public/langs/de_DE/mails.lang
diff --git a/htdocs/langs/de_DE/main.lang b/public/langs/de_DE/main.lang
similarity index 100%
rename from htdocs/langs/de_DE/main.lang
rename to public/langs/de_DE/main.lang
diff --git a/htdocs/langs/de_DE/margins.lang b/public/langs/de_DE/margins.lang
similarity index 100%
rename from htdocs/langs/de_DE/margins.lang
rename to public/langs/de_DE/margins.lang
diff --git a/htdocs/langs/de_DE/members.lang b/public/langs/de_DE/members.lang
similarity index 100%
rename from htdocs/langs/de_DE/members.lang
rename to public/langs/de_DE/members.lang
diff --git a/htdocs/langs/de_DE/oauth.lang b/public/langs/de_DE/oauth.lang
similarity index 100%
rename from htdocs/langs/de_DE/oauth.lang
rename to public/langs/de_DE/oauth.lang
diff --git a/htdocs/langs/de_DE/opensurvey.lang b/public/langs/de_DE/opensurvey.lang
similarity index 100%
rename from htdocs/langs/de_DE/opensurvey.lang
rename to public/langs/de_DE/opensurvey.lang
diff --git a/htdocs/langs/de_DE/orders.lang b/public/langs/de_DE/orders.lang
similarity index 100%
rename from htdocs/langs/de_DE/orders.lang
rename to public/langs/de_DE/orders.lang
diff --git a/htdocs/langs/de_DE/other.lang b/public/langs/de_DE/other.lang
similarity index 100%
rename from htdocs/langs/de_DE/other.lang
rename to public/langs/de_DE/other.lang
diff --git a/htdocs/langs/de_DE/paybox.lang b/public/langs/de_DE/paybox.lang
similarity index 100%
rename from htdocs/langs/de_DE/paybox.lang
rename to public/langs/de_DE/paybox.lang
diff --git a/htdocs/langs/de_DE/paypal.lang b/public/langs/de_DE/paypal.lang
similarity index 100%
rename from htdocs/langs/de_DE/paypal.lang
rename to public/langs/de_DE/paypal.lang
diff --git a/htdocs/langs/de_DE/printing.lang b/public/langs/de_DE/printing.lang
similarity index 100%
rename from htdocs/langs/de_DE/printing.lang
rename to public/langs/de_DE/printing.lang
diff --git a/htdocs/langs/de_DE/productbatch.lang b/public/langs/de_DE/productbatch.lang
similarity index 100%
rename from htdocs/langs/de_DE/productbatch.lang
rename to public/langs/de_DE/productbatch.lang
diff --git a/htdocs/langs/de_DE/products.lang b/public/langs/de_DE/products.lang
similarity index 100%
rename from htdocs/langs/de_DE/products.lang
rename to public/langs/de_DE/products.lang
diff --git a/htdocs/langs/de_DE/projects.lang b/public/langs/de_DE/projects.lang
similarity index 100%
rename from htdocs/langs/de_DE/projects.lang
rename to public/langs/de_DE/projects.lang
diff --git a/htdocs/langs/de_DE/propal.lang b/public/langs/de_DE/propal.lang
similarity index 100%
rename from htdocs/langs/de_DE/propal.lang
rename to public/langs/de_DE/propal.lang
diff --git a/htdocs/langs/de_DE/receiptprinter.lang b/public/langs/de_DE/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/de_DE/receiptprinter.lang
rename to public/langs/de_DE/receiptprinter.lang
diff --git a/htdocs/langs/de_DE/resource.lang b/public/langs/de_DE/resource.lang
similarity index 100%
rename from htdocs/langs/de_DE/resource.lang
rename to public/langs/de_DE/resource.lang
diff --git a/htdocs/langs/de_DE/salaries.lang b/public/langs/de_DE/salaries.lang
similarity index 100%
rename from htdocs/langs/de_DE/salaries.lang
rename to public/langs/de_DE/salaries.lang
diff --git a/htdocs/langs/de_DE/sendings.lang b/public/langs/de_DE/sendings.lang
similarity index 100%
rename from htdocs/langs/de_DE/sendings.lang
rename to public/langs/de_DE/sendings.lang
diff --git a/htdocs/langs/de_DE/sms.lang b/public/langs/de_DE/sms.lang
similarity index 100%
rename from htdocs/langs/de_DE/sms.lang
rename to public/langs/de_DE/sms.lang
diff --git a/htdocs/langs/de_DE/stocks.lang b/public/langs/de_DE/stocks.lang
similarity index 100%
rename from htdocs/langs/de_DE/stocks.lang
rename to public/langs/de_DE/stocks.lang
diff --git a/htdocs/langs/de_DE/supplier_proposal.lang b/public/langs/de_DE/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/de_DE/supplier_proposal.lang
rename to public/langs/de_DE/supplier_proposal.lang
diff --git a/htdocs/langs/de_DE/suppliers.lang b/public/langs/de_DE/suppliers.lang
similarity index 100%
rename from htdocs/langs/de_DE/suppliers.lang
rename to public/langs/de_DE/suppliers.lang
diff --git a/htdocs/langs/de_DE/trips.lang b/public/langs/de_DE/trips.lang
similarity index 100%
rename from htdocs/langs/de_DE/trips.lang
rename to public/langs/de_DE/trips.lang
diff --git a/htdocs/langs/de_DE/users.lang b/public/langs/de_DE/users.lang
similarity index 100%
rename from htdocs/langs/de_DE/users.lang
rename to public/langs/de_DE/users.lang
diff --git a/htdocs/langs/de_DE/website.lang b/public/langs/de_DE/website.lang
similarity index 100%
rename from htdocs/langs/de_DE/website.lang
rename to public/langs/de_DE/website.lang
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/public/langs/de_DE/withdrawals.lang
similarity index 100%
rename from htdocs/langs/de_DE/withdrawals.lang
rename to public/langs/de_DE/withdrawals.lang
diff --git a/htdocs/langs/de_DE/workflow.lang b/public/langs/de_DE/workflow.lang
similarity index 100%
rename from htdocs/langs/de_DE/workflow.lang
rename to public/langs/de_DE/workflow.lang
diff --git a/htdocs/langs/el_GR/accountancy.lang b/public/langs/el_GR/accountancy.lang
similarity index 100%
rename from htdocs/langs/el_GR/accountancy.lang
rename to public/langs/el_GR/accountancy.lang
diff --git a/htdocs/langs/el_GR/admin.lang b/public/langs/el_GR/admin.lang
similarity index 100%
rename from htdocs/langs/el_GR/admin.lang
rename to public/langs/el_GR/admin.lang
diff --git a/htdocs/langs/el_GR/agenda.lang b/public/langs/el_GR/agenda.lang
similarity index 100%
rename from htdocs/langs/el_GR/agenda.lang
rename to public/langs/el_GR/agenda.lang
diff --git a/htdocs/langs/el_GR/banks.lang b/public/langs/el_GR/banks.lang
similarity index 100%
rename from htdocs/langs/el_GR/banks.lang
rename to public/langs/el_GR/banks.lang
diff --git a/htdocs/langs/el_GR/bills.lang b/public/langs/el_GR/bills.lang
similarity index 100%
rename from htdocs/langs/el_GR/bills.lang
rename to public/langs/el_GR/bills.lang
diff --git a/htdocs/langs/el_GR/bookmarks.lang b/public/langs/el_GR/bookmarks.lang
similarity index 100%
rename from htdocs/langs/el_GR/bookmarks.lang
rename to public/langs/el_GR/bookmarks.lang
diff --git a/htdocs/langs/el_GR/boxes.lang b/public/langs/el_GR/boxes.lang
similarity index 100%
rename from htdocs/langs/el_GR/boxes.lang
rename to public/langs/el_GR/boxes.lang
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/public/langs/el_GR/cashdesk.lang
similarity index 100%
rename from htdocs/langs/el_GR/cashdesk.lang
rename to public/langs/el_GR/cashdesk.lang
diff --git a/htdocs/langs/el_GR/categories.lang b/public/langs/el_GR/categories.lang
similarity index 100%
rename from htdocs/langs/el_GR/categories.lang
rename to public/langs/el_GR/categories.lang
diff --git a/htdocs/langs/el_GR/commercial.lang b/public/langs/el_GR/commercial.lang
similarity index 100%
rename from htdocs/langs/el_GR/commercial.lang
rename to public/langs/el_GR/commercial.lang
diff --git a/htdocs/langs/el_GR/commissions.lang b/public/langs/el_GR/commissions.lang
similarity index 100%
rename from htdocs/langs/el_GR/commissions.lang
rename to public/langs/el_GR/commissions.lang
diff --git a/htdocs/langs/el_GR/companies.lang b/public/langs/el_GR/companies.lang
similarity index 100%
rename from htdocs/langs/el_GR/companies.lang
rename to public/langs/el_GR/companies.lang
diff --git a/htdocs/langs/el_GR/compta.lang b/public/langs/el_GR/compta.lang
similarity index 100%
rename from htdocs/langs/el_GR/compta.lang
rename to public/langs/el_GR/compta.lang
diff --git a/htdocs/langs/el_GR/contracts.lang b/public/langs/el_GR/contracts.lang
similarity index 100%
rename from htdocs/langs/el_GR/contracts.lang
rename to public/langs/el_GR/contracts.lang
diff --git a/htdocs/langs/el_GR/cron.lang b/public/langs/el_GR/cron.lang
similarity index 100%
rename from htdocs/langs/el_GR/cron.lang
rename to public/langs/el_GR/cron.lang
diff --git a/htdocs/langs/el_GR/deliveries.lang b/public/langs/el_GR/deliveries.lang
similarity index 100%
rename from htdocs/langs/el_GR/deliveries.lang
rename to public/langs/el_GR/deliveries.lang
diff --git a/htdocs/langs/el_GR/dict.lang b/public/langs/el_GR/dict.lang
similarity index 100%
rename from htdocs/langs/el_GR/dict.lang
rename to public/langs/el_GR/dict.lang
diff --git a/htdocs/langs/el_GR/donations.lang b/public/langs/el_GR/donations.lang
similarity index 100%
rename from htdocs/langs/el_GR/donations.lang
rename to public/langs/el_GR/donations.lang
diff --git a/htdocs/langs/el_GR/ecm.lang b/public/langs/el_GR/ecm.lang
similarity index 100%
rename from htdocs/langs/el_GR/ecm.lang
rename to public/langs/el_GR/ecm.lang
diff --git a/htdocs/langs/el_GR/errors.lang b/public/langs/el_GR/errors.lang
similarity index 100%
rename from htdocs/langs/el_GR/errors.lang
rename to public/langs/el_GR/errors.lang
diff --git a/htdocs/langs/el_GR/exports.lang b/public/langs/el_GR/exports.lang
similarity index 100%
rename from htdocs/langs/el_GR/exports.lang
rename to public/langs/el_GR/exports.lang
diff --git a/htdocs/langs/el_GR/externalsite.lang b/public/langs/el_GR/externalsite.lang
similarity index 100%
rename from htdocs/langs/el_GR/externalsite.lang
rename to public/langs/el_GR/externalsite.lang
diff --git a/htdocs/langs/el_GR/ftp.lang b/public/langs/el_GR/ftp.lang
similarity index 100%
rename from htdocs/langs/el_GR/ftp.lang
rename to public/langs/el_GR/ftp.lang
diff --git a/htdocs/langs/el_GR/help.lang b/public/langs/el_GR/help.lang
similarity index 100%
rename from htdocs/langs/el_GR/help.lang
rename to public/langs/el_GR/help.lang
diff --git a/htdocs/langs/el_GR/holiday.lang b/public/langs/el_GR/holiday.lang
similarity index 100%
rename from htdocs/langs/el_GR/holiday.lang
rename to public/langs/el_GR/holiday.lang
diff --git a/htdocs/langs/el_GR/hrm.lang b/public/langs/el_GR/hrm.lang
similarity index 100%
rename from htdocs/langs/el_GR/hrm.lang
rename to public/langs/el_GR/hrm.lang
diff --git a/htdocs/langs/el_GR/incoterm.lang b/public/langs/el_GR/incoterm.lang
similarity index 100%
rename from htdocs/langs/el_GR/incoterm.lang
rename to public/langs/el_GR/incoterm.lang
diff --git a/htdocs/langs/el_GR/install.lang b/public/langs/el_GR/install.lang
similarity index 100%
rename from htdocs/langs/el_GR/install.lang
rename to public/langs/el_GR/install.lang
diff --git a/htdocs/langs/el_GR/interventions.lang b/public/langs/el_GR/interventions.lang
similarity index 100%
rename from htdocs/langs/el_GR/interventions.lang
rename to public/langs/el_GR/interventions.lang
diff --git a/htdocs/langs/el_GR/languages.lang b/public/langs/el_GR/languages.lang
similarity index 100%
rename from htdocs/langs/el_GR/languages.lang
rename to public/langs/el_GR/languages.lang
diff --git a/htdocs/langs/el_GR/ldap.lang b/public/langs/el_GR/ldap.lang
similarity index 100%
rename from htdocs/langs/el_GR/ldap.lang
rename to public/langs/el_GR/ldap.lang
diff --git a/htdocs/langs/el_GR/link.lang b/public/langs/el_GR/link.lang
similarity index 100%
rename from htdocs/langs/el_GR/link.lang
rename to public/langs/el_GR/link.lang
diff --git a/htdocs/langs/el_GR/loan.lang b/public/langs/el_GR/loan.lang
similarity index 100%
rename from htdocs/langs/el_GR/loan.lang
rename to public/langs/el_GR/loan.lang
diff --git a/htdocs/langs/el_GR/mailmanspip.lang b/public/langs/el_GR/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/el_GR/mailmanspip.lang
rename to public/langs/el_GR/mailmanspip.lang
diff --git a/htdocs/langs/el_GR/mails.lang b/public/langs/el_GR/mails.lang
similarity index 100%
rename from htdocs/langs/el_GR/mails.lang
rename to public/langs/el_GR/mails.lang
diff --git a/htdocs/langs/el_GR/main.lang b/public/langs/el_GR/main.lang
similarity index 100%
rename from htdocs/langs/el_GR/main.lang
rename to public/langs/el_GR/main.lang
diff --git a/htdocs/langs/el_GR/margins.lang b/public/langs/el_GR/margins.lang
similarity index 100%
rename from htdocs/langs/el_GR/margins.lang
rename to public/langs/el_GR/margins.lang
diff --git a/htdocs/langs/el_GR/members.lang b/public/langs/el_GR/members.lang
similarity index 100%
rename from htdocs/langs/el_GR/members.lang
rename to public/langs/el_GR/members.lang
diff --git a/htdocs/langs/el_GR/oauth.lang b/public/langs/el_GR/oauth.lang
similarity index 100%
rename from htdocs/langs/el_GR/oauth.lang
rename to public/langs/el_GR/oauth.lang
diff --git a/htdocs/langs/el_GR/opensurvey.lang b/public/langs/el_GR/opensurvey.lang
similarity index 100%
rename from htdocs/langs/el_GR/opensurvey.lang
rename to public/langs/el_GR/opensurvey.lang
diff --git a/htdocs/langs/el_GR/orders.lang b/public/langs/el_GR/orders.lang
similarity index 100%
rename from htdocs/langs/el_GR/orders.lang
rename to public/langs/el_GR/orders.lang
diff --git a/htdocs/langs/el_GR/other.lang b/public/langs/el_GR/other.lang
similarity index 100%
rename from htdocs/langs/el_GR/other.lang
rename to public/langs/el_GR/other.lang
diff --git a/htdocs/langs/el_GR/paybox.lang b/public/langs/el_GR/paybox.lang
similarity index 100%
rename from htdocs/langs/el_GR/paybox.lang
rename to public/langs/el_GR/paybox.lang
diff --git a/htdocs/langs/el_GR/paypal.lang b/public/langs/el_GR/paypal.lang
similarity index 100%
rename from htdocs/langs/el_GR/paypal.lang
rename to public/langs/el_GR/paypal.lang
diff --git a/htdocs/langs/el_GR/printing.lang b/public/langs/el_GR/printing.lang
similarity index 100%
rename from htdocs/langs/el_GR/printing.lang
rename to public/langs/el_GR/printing.lang
diff --git a/htdocs/langs/el_GR/productbatch.lang b/public/langs/el_GR/productbatch.lang
similarity index 100%
rename from htdocs/langs/el_GR/productbatch.lang
rename to public/langs/el_GR/productbatch.lang
diff --git a/htdocs/langs/el_GR/products.lang b/public/langs/el_GR/products.lang
similarity index 100%
rename from htdocs/langs/el_GR/products.lang
rename to public/langs/el_GR/products.lang
diff --git a/htdocs/langs/el_GR/projects.lang b/public/langs/el_GR/projects.lang
similarity index 100%
rename from htdocs/langs/el_GR/projects.lang
rename to public/langs/el_GR/projects.lang
diff --git a/htdocs/langs/el_GR/propal.lang b/public/langs/el_GR/propal.lang
similarity index 100%
rename from htdocs/langs/el_GR/propal.lang
rename to public/langs/el_GR/propal.lang
diff --git a/htdocs/langs/el_GR/receiptprinter.lang b/public/langs/el_GR/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/el_GR/receiptprinter.lang
rename to public/langs/el_GR/receiptprinter.lang
diff --git a/htdocs/langs/el_GR/resource.lang b/public/langs/el_GR/resource.lang
similarity index 100%
rename from htdocs/langs/el_GR/resource.lang
rename to public/langs/el_GR/resource.lang
diff --git a/htdocs/langs/el_GR/salaries.lang b/public/langs/el_GR/salaries.lang
similarity index 100%
rename from htdocs/langs/el_GR/salaries.lang
rename to public/langs/el_GR/salaries.lang
diff --git a/htdocs/langs/el_GR/sendings.lang b/public/langs/el_GR/sendings.lang
similarity index 100%
rename from htdocs/langs/el_GR/sendings.lang
rename to public/langs/el_GR/sendings.lang
diff --git a/htdocs/langs/el_GR/sms.lang b/public/langs/el_GR/sms.lang
similarity index 100%
rename from htdocs/langs/el_GR/sms.lang
rename to public/langs/el_GR/sms.lang
diff --git a/htdocs/langs/el_GR/stocks.lang b/public/langs/el_GR/stocks.lang
similarity index 100%
rename from htdocs/langs/el_GR/stocks.lang
rename to public/langs/el_GR/stocks.lang
diff --git a/htdocs/langs/el_GR/supplier_proposal.lang b/public/langs/el_GR/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/el_GR/supplier_proposal.lang
rename to public/langs/el_GR/supplier_proposal.lang
diff --git a/htdocs/langs/el_GR/suppliers.lang b/public/langs/el_GR/suppliers.lang
similarity index 100%
rename from htdocs/langs/el_GR/suppliers.lang
rename to public/langs/el_GR/suppliers.lang
diff --git a/htdocs/langs/el_GR/trips.lang b/public/langs/el_GR/trips.lang
similarity index 100%
rename from htdocs/langs/el_GR/trips.lang
rename to public/langs/el_GR/trips.lang
diff --git a/htdocs/langs/el_GR/users.lang b/public/langs/el_GR/users.lang
similarity index 100%
rename from htdocs/langs/el_GR/users.lang
rename to public/langs/el_GR/users.lang
diff --git a/htdocs/langs/el_GR/website.lang b/public/langs/el_GR/website.lang
similarity index 100%
rename from htdocs/langs/el_GR/website.lang
rename to public/langs/el_GR/website.lang
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/public/langs/el_GR/withdrawals.lang
similarity index 100%
rename from htdocs/langs/el_GR/withdrawals.lang
rename to public/langs/el_GR/withdrawals.lang
diff --git a/htdocs/langs/el_GR/workflow.lang b/public/langs/el_GR/workflow.lang
similarity index 100%
rename from htdocs/langs/el_GR/workflow.lang
rename to public/langs/el_GR/workflow.lang
diff --git a/htdocs/langs/en_AU/accountancy.lang b/public/langs/en_AU/accountancy.lang
similarity index 100%
rename from htdocs/langs/en_AU/accountancy.lang
rename to public/langs/en_AU/accountancy.lang
diff --git a/htdocs/langs/en_AU/admin.lang b/public/langs/en_AU/admin.lang
similarity index 100%
rename from htdocs/langs/en_AU/admin.lang
rename to public/langs/en_AU/admin.lang
diff --git a/htdocs/langs/en_AU/agenda.lang b/public/langs/en_AU/agenda.lang
similarity index 100%
rename from htdocs/langs/en_AU/agenda.lang
rename to public/langs/en_AU/agenda.lang
diff --git a/htdocs/langs/en_AU/banks.lang b/public/langs/en_AU/banks.lang
similarity index 100%
rename from htdocs/langs/en_AU/banks.lang
rename to public/langs/en_AU/banks.lang
diff --git a/htdocs/langs/en_AU/bills.lang b/public/langs/en_AU/bills.lang
similarity index 100%
rename from htdocs/langs/en_AU/bills.lang
rename to public/langs/en_AU/bills.lang
diff --git a/htdocs/langs/en_AU/bookmarks.lang b/public/langs/en_AU/bookmarks.lang
similarity index 100%
rename from htdocs/langs/en_AU/bookmarks.lang
rename to public/langs/en_AU/bookmarks.lang
diff --git a/htdocs/langs/en_AU/boxes.lang b/public/langs/en_AU/boxes.lang
similarity index 100%
rename from htdocs/langs/en_AU/boxes.lang
rename to public/langs/en_AU/boxes.lang
diff --git a/htdocs/langs/en_AU/cashdesk.lang b/public/langs/en_AU/cashdesk.lang
similarity index 100%
rename from htdocs/langs/en_AU/cashdesk.lang
rename to public/langs/en_AU/cashdesk.lang
diff --git a/htdocs/langs/en_AU/categories.lang b/public/langs/en_AU/categories.lang
similarity index 100%
rename from htdocs/langs/en_AU/categories.lang
rename to public/langs/en_AU/categories.lang
diff --git a/htdocs/langs/en_AU/commercial.lang b/public/langs/en_AU/commercial.lang
similarity index 100%
rename from htdocs/langs/en_AU/commercial.lang
rename to public/langs/en_AU/commercial.lang
diff --git a/htdocs/langs/en_AU/companies.lang b/public/langs/en_AU/companies.lang
similarity index 100%
rename from htdocs/langs/en_AU/companies.lang
rename to public/langs/en_AU/companies.lang
diff --git a/htdocs/langs/en_AU/compta.lang b/public/langs/en_AU/compta.lang
similarity index 100%
rename from htdocs/langs/en_AU/compta.lang
rename to public/langs/en_AU/compta.lang
diff --git a/htdocs/langs/en_AU/contracts.lang b/public/langs/en_AU/contracts.lang
similarity index 100%
rename from htdocs/langs/en_AU/contracts.lang
rename to public/langs/en_AU/contracts.lang
diff --git a/htdocs/langs/en_AU/cron.lang b/public/langs/en_AU/cron.lang
similarity index 100%
rename from htdocs/langs/en_AU/cron.lang
rename to public/langs/en_AU/cron.lang
diff --git a/htdocs/langs/en_AU/deliveries.lang b/public/langs/en_AU/deliveries.lang
similarity index 100%
rename from htdocs/langs/en_AU/deliveries.lang
rename to public/langs/en_AU/deliveries.lang
diff --git a/htdocs/langs/en_AU/dict.lang b/public/langs/en_AU/dict.lang
similarity index 100%
rename from htdocs/langs/en_AU/dict.lang
rename to public/langs/en_AU/dict.lang
diff --git a/htdocs/langs/en_AU/donations.lang b/public/langs/en_AU/donations.lang
similarity index 100%
rename from htdocs/langs/en_AU/donations.lang
rename to public/langs/en_AU/donations.lang
diff --git a/htdocs/langs/en_AU/ecm.lang b/public/langs/en_AU/ecm.lang
similarity index 100%
rename from htdocs/langs/en_AU/ecm.lang
rename to public/langs/en_AU/ecm.lang
diff --git a/htdocs/langs/en_AU/errors.lang b/public/langs/en_AU/errors.lang
similarity index 100%
rename from htdocs/langs/en_AU/errors.lang
rename to public/langs/en_AU/errors.lang
diff --git a/htdocs/langs/en_AU/exports.lang b/public/langs/en_AU/exports.lang
similarity index 100%
rename from htdocs/langs/en_AU/exports.lang
rename to public/langs/en_AU/exports.lang
diff --git a/htdocs/langs/en_AU/externalsite.lang b/public/langs/en_AU/externalsite.lang
similarity index 100%
rename from htdocs/langs/en_AU/externalsite.lang
rename to public/langs/en_AU/externalsite.lang
diff --git a/htdocs/langs/en_AU/ftp.lang b/public/langs/en_AU/ftp.lang
similarity index 100%
rename from htdocs/langs/en_AU/ftp.lang
rename to public/langs/en_AU/ftp.lang
diff --git a/htdocs/langs/en_AU/help.lang b/public/langs/en_AU/help.lang
similarity index 100%
rename from htdocs/langs/en_AU/help.lang
rename to public/langs/en_AU/help.lang
diff --git a/htdocs/langs/en_AU/holiday.lang b/public/langs/en_AU/holiday.lang
similarity index 100%
rename from htdocs/langs/en_AU/holiday.lang
rename to public/langs/en_AU/holiday.lang
diff --git a/htdocs/langs/en_AU/hrm.lang b/public/langs/en_AU/hrm.lang
similarity index 100%
rename from htdocs/langs/en_AU/hrm.lang
rename to public/langs/en_AU/hrm.lang
diff --git a/htdocs/langs/en_AU/incoterm.lang b/public/langs/en_AU/incoterm.lang
similarity index 100%
rename from htdocs/langs/en_AU/incoterm.lang
rename to public/langs/en_AU/incoterm.lang
diff --git a/htdocs/langs/en_AU/install.lang b/public/langs/en_AU/install.lang
similarity index 100%
rename from htdocs/langs/en_AU/install.lang
rename to public/langs/en_AU/install.lang
diff --git a/htdocs/langs/en_AU/interventions.lang b/public/langs/en_AU/interventions.lang
similarity index 100%
rename from htdocs/langs/en_AU/interventions.lang
rename to public/langs/en_AU/interventions.lang
diff --git a/htdocs/langs/en_AU/languages.lang b/public/langs/en_AU/languages.lang
similarity index 100%
rename from htdocs/langs/en_AU/languages.lang
rename to public/langs/en_AU/languages.lang
diff --git a/htdocs/langs/en_AU/ldap.lang b/public/langs/en_AU/ldap.lang
similarity index 100%
rename from htdocs/langs/en_AU/ldap.lang
rename to public/langs/en_AU/ldap.lang
diff --git a/htdocs/langs/en_AU/link.lang b/public/langs/en_AU/link.lang
similarity index 100%
rename from htdocs/langs/en_AU/link.lang
rename to public/langs/en_AU/link.lang
diff --git a/htdocs/langs/en_AU/loan.lang b/public/langs/en_AU/loan.lang
similarity index 100%
rename from htdocs/langs/en_AU/loan.lang
rename to public/langs/en_AU/loan.lang
diff --git a/htdocs/langs/en_AU/mailmanspip.lang b/public/langs/en_AU/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/en_AU/mailmanspip.lang
rename to public/langs/en_AU/mailmanspip.lang
diff --git a/htdocs/langs/en_AU/mails.lang b/public/langs/en_AU/mails.lang
similarity index 100%
rename from htdocs/langs/en_AU/mails.lang
rename to public/langs/en_AU/mails.lang
diff --git a/htdocs/langs/en_AU/main.lang b/public/langs/en_AU/main.lang
similarity index 100%
rename from htdocs/langs/en_AU/main.lang
rename to public/langs/en_AU/main.lang
diff --git a/htdocs/langs/en_AU/margins.lang b/public/langs/en_AU/margins.lang
similarity index 100%
rename from htdocs/langs/en_AU/margins.lang
rename to public/langs/en_AU/margins.lang
diff --git a/htdocs/langs/en_AU/members.lang b/public/langs/en_AU/members.lang
similarity index 100%
rename from htdocs/langs/en_AU/members.lang
rename to public/langs/en_AU/members.lang
diff --git a/htdocs/langs/en_AU/oauth.lang b/public/langs/en_AU/oauth.lang
similarity index 100%
rename from htdocs/langs/en_AU/oauth.lang
rename to public/langs/en_AU/oauth.lang
diff --git a/htdocs/langs/en_AU/opensurvey.lang b/public/langs/en_AU/opensurvey.lang
similarity index 100%
rename from htdocs/langs/en_AU/opensurvey.lang
rename to public/langs/en_AU/opensurvey.lang
diff --git a/htdocs/langs/en_AU/orders.lang b/public/langs/en_AU/orders.lang
similarity index 100%
rename from htdocs/langs/en_AU/orders.lang
rename to public/langs/en_AU/orders.lang
diff --git a/htdocs/langs/en_AU/other.lang b/public/langs/en_AU/other.lang
similarity index 100%
rename from htdocs/langs/en_AU/other.lang
rename to public/langs/en_AU/other.lang
diff --git a/htdocs/langs/en_AU/paybox.lang b/public/langs/en_AU/paybox.lang
similarity index 100%
rename from htdocs/langs/en_AU/paybox.lang
rename to public/langs/en_AU/paybox.lang
diff --git a/htdocs/langs/en_AU/paypal.lang b/public/langs/en_AU/paypal.lang
similarity index 100%
rename from htdocs/langs/en_AU/paypal.lang
rename to public/langs/en_AU/paypal.lang
diff --git a/htdocs/langs/en_AU/printing.lang b/public/langs/en_AU/printing.lang
similarity index 100%
rename from htdocs/langs/en_AU/printing.lang
rename to public/langs/en_AU/printing.lang
diff --git a/htdocs/langs/en_AU/productbatch.lang b/public/langs/en_AU/productbatch.lang
similarity index 100%
rename from htdocs/langs/en_AU/productbatch.lang
rename to public/langs/en_AU/productbatch.lang
diff --git a/htdocs/langs/en_AU/products.lang b/public/langs/en_AU/products.lang
similarity index 100%
rename from htdocs/langs/en_AU/products.lang
rename to public/langs/en_AU/products.lang
diff --git a/htdocs/langs/en_AU/projects.lang b/public/langs/en_AU/projects.lang
similarity index 100%
rename from htdocs/langs/en_AU/projects.lang
rename to public/langs/en_AU/projects.lang
diff --git a/htdocs/langs/en_AU/propal.lang b/public/langs/en_AU/propal.lang
similarity index 100%
rename from htdocs/langs/en_AU/propal.lang
rename to public/langs/en_AU/propal.lang
diff --git a/htdocs/langs/en_AU/receiptprinter.lang b/public/langs/en_AU/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/en_AU/receiptprinter.lang
rename to public/langs/en_AU/receiptprinter.lang
diff --git a/htdocs/langs/en_AU/resource.lang b/public/langs/en_AU/resource.lang
similarity index 100%
rename from htdocs/langs/en_AU/resource.lang
rename to public/langs/en_AU/resource.lang
diff --git a/htdocs/langs/en_AU/salaries.lang b/public/langs/en_AU/salaries.lang
similarity index 100%
rename from htdocs/langs/en_AU/salaries.lang
rename to public/langs/en_AU/salaries.lang
diff --git a/htdocs/langs/en_AU/sendings.lang b/public/langs/en_AU/sendings.lang
similarity index 100%
rename from htdocs/langs/en_AU/sendings.lang
rename to public/langs/en_AU/sendings.lang
diff --git a/htdocs/langs/en_AU/sms.lang b/public/langs/en_AU/sms.lang
similarity index 100%
rename from htdocs/langs/en_AU/sms.lang
rename to public/langs/en_AU/sms.lang
diff --git a/htdocs/langs/en_AU/stocks.lang b/public/langs/en_AU/stocks.lang
similarity index 100%
rename from htdocs/langs/en_AU/stocks.lang
rename to public/langs/en_AU/stocks.lang
diff --git a/htdocs/langs/en_AU/supplier_proposal.lang b/public/langs/en_AU/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/en_AU/supplier_proposal.lang
rename to public/langs/en_AU/supplier_proposal.lang
diff --git a/htdocs/langs/en_AU/suppliers.lang b/public/langs/en_AU/suppliers.lang
similarity index 100%
rename from htdocs/langs/en_AU/suppliers.lang
rename to public/langs/en_AU/suppliers.lang
diff --git a/htdocs/langs/en_AU/trips.lang b/public/langs/en_AU/trips.lang
similarity index 100%
rename from htdocs/langs/en_AU/trips.lang
rename to public/langs/en_AU/trips.lang
diff --git a/htdocs/langs/en_AU/users.lang b/public/langs/en_AU/users.lang
similarity index 100%
rename from htdocs/langs/en_AU/users.lang
rename to public/langs/en_AU/users.lang
diff --git a/htdocs/langs/en_AU/website.lang b/public/langs/en_AU/website.lang
similarity index 100%
rename from htdocs/langs/en_AU/website.lang
rename to public/langs/en_AU/website.lang
diff --git a/htdocs/langs/en_AU/withdrawals.lang b/public/langs/en_AU/withdrawals.lang
similarity index 100%
rename from htdocs/langs/en_AU/withdrawals.lang
rename to public/langs/en_AU/withdrawals.lang
diff --git a/htdocs/langs/en_AU/workflow.lang b/public/langs/en_AU/workflow.lang
similarity index 100%
rename from htdocs/langs/en_AU/workflow.lang
rename to public/langs/en_AU/workflow.lang
diff --git a/htdocs/langs/en_CA/accountancy.lang b/public/langs/en_CA/accountancy.lang
similarity index 100%
rename from htdocs/langs/en_CA/accountancy.lang
rename to public/langs/en_CA/accountancy.lang
diff --git a/htdocs/langs/en_CA/admin.lang b/public/langs/en_CA/admin.lang
similarity index 100%
rename from htdocs/langs/en_CA/admin.lang
rename to public/langs/en_CA/admin.lang
diff --git a/htdocs/langs/en_CA/agenda.lang b/public/langs/en_CA/agenda.lang
similarity index 100%
rename from htdocs/langs/en_CA/agenda.lang
rename to public/langs/en_CA/agenda.lang
diff --git a/htdocs/langs/en_CA/banks.lang b/public/langs/en_CA/banks.lang
similarity index 100%
rename from htdocs/langs/en_CA/banks.lang
rename to public/langs/en_CA/banks.lang
diff --git a/htdocs/langs/en_CA/bills.lang b/public/langs/en_CA/bills.lang
similarity index 100%
rename from htdocs/langs/en_CA/bills.lang
rename to public/langs/en_CA/bills.lang
diff --git a/htdocs/langs/en_CA/bookmarks.lang b/public/langs/en_CA/bookmarks.lang
similarity index 100%
rename from htdocs/langs/en_CA/bookmarks.lang
rename to public/langs/en_CA/bookmarks.lang
diff --git a/htdocs/langs/en_CA/boxes.lang b/public/langs/en_CA/boxes.lang
similarity index 100%
rename from htdocs/langs/en_CA/boxes.lang
rename to public/langs/en_CA/boxes.lang
diff --git a/htdocs/langs/en_CA/cashdesk.lang b/public/langs/en_CA/cashdesk.lang
similarity index 100%
rename from htdocs/langs/en_CA/cashdesk.lang
rename to public/langs/en_CA/cashdesk.lang
diff --git a/htdocs/langs/en_CA/categories.lang b/public/langs/en_CA/categories.lang
similarity index 100%
rename from htdocs/langs/en_CA/categories.lang
rename to public/langs/en_CA/categories.lang
diff --git a/htdocs/langs/en_CA/commercial.lang b/public/langs/en_CA/commercial.lang
similarity index 100%
rename from htdocs/langs/en_CA/commercial.lang
rename to public/langs/en_CA/commercial.lang
diff --git a/htdocs/langs/en_CA/companies.lang b/public/langs/en_CA/companies.lang
similarity index 100%
rename from htdocs/langs/en_CA/companies.lang
rename to public/langs/en_CA/companies.lang
diff --git a/htdocs/langs/en_CA/compta.lang b/public/langs/en_CA/compta.lang
similarity index 100%
rename from htdocs/langs/en_CA/compta.lang
rename to public/langs/en_CA/compta.lang
diff --git a/htdocs/langs/en_CA/contracts.lang b/public/langs/en_CA/contracts.lang
similarity index 100%
rename from htdocs/langs/en_CA/contracts.lang
rename to public/langs/en_CA/contracts.lang
diff --git a/htdocs/langs/en_CA/cron.lang b/public/langs/en_CA/cron.lang
similarity index 100%
rename from htdocs/langs/en_CA/cron.lang
rename to public/langs/en_CA/cron.lang
diff --git a/htdocs/langs/en_CA/deliveries.lang b/public/langs/en_CA/deliveries.lang
similarity index 100%
rename from htdocs/langs/en_CA/deliveries.lang
rename to public/langs/en_CA/deliveries.lang
diff --git a/htdocs/langs/en_CA/dict.lang b/public/langs/en_CA/dict.lang
similarity index 100%
rename from htdocs/langs/en_CA/dict.lang
rename to public/langs/en_CA/dict.lang
diff --git a/htdocs/langs/en_CA/donations.lang b/public/langs/en_CA/donations.lang
similarity index 100%
rename from htdocs/langs/en_CA/donations.lang
rename to public/langs/en_CA/donations.lang
diff --git a/htdocs/langs/en_CA/ecm.lang b/public/langs/en_CA/ecm.lang
similarity index 100%
rename from htdocs/langs/en_CA/ecm.lang
rename to public/langs/en_CA/ecm.lang
diff --git a/htdocs/langs/en_CA/errors.lang b/public/langs/en_CA/errors.lang
similarity index 100%
rename from htdocs/langs/en_CA/errors.lang
rename to public/langs/en_CA/errors.lang
diff --git a/htdocs/langs/en_CA/exports.lang b/public/langs/en_CA/exports.lang
similarity index 100%
rename from htdocs/langs/en_CA/exports.lang
rename to public/langs/en_CA/exports.lang
diff --git a/htdocs/langs/en_CA/externalsite.lang b/public/langs/en_CA/externalsite.lang
similarity index 100%
rename from htdocs/langs/en_CA/externalsite.lang
rename to public/langs/en_CA/externalsite.lang
diff --git a/htdocs/langs/en_CA/ftp.lang b/public/langs/en_CA/ftp.lang
similarity index 100%
rename from htdocs/langs/en_CA/ftp.lang
rename to public/langs/en_CA/ftp.lang
diff --git a/htdocs/langs/en_CA/help.lang b/public/langs/en_CA/help.lang
similarity index 100%
rename from htdocs/langs/en_CA/help.lang
rename to public/langs/en_CA/help.lang
diff --git a/htdocs/langs/en_CA/holiday.lang b/public/langs/en_CA/holiday.lang
similarity index 100%
rename from htdocs/langs/en_CA/holiday.lang
rename to public/langs/en_CA/holiday.lang
diff --git a/htdocs/langs/en_CA/hrm.lang b/public/langs/en_CA/hrm.lang
similarity index 100%
rename from htdocs/langs/en_CA/hrm.lang
rename to public/langs/en_CA/hrm.lang
diff --git a/htdocs/langs/en_CA/incoterm.lang b/public/langs/en_CA/incoterm.lang
similarity index 100%
rename from htdocs/langs/en_CA/incoterm.lang
rename to public/langs/en_CA/incoterm.lang
diff --git a/htdocs/langs/en_CA/install.lang b/public/langs/en_CA/install.lang
similarity index 100%
rename from htdocs/langs/en_CA/install.lang
rename to public/langs/en_CA/install.lang
diff --git a/htdocs/langs/en_CA/interventions.lang b/public/langs/en_CA/interventions.lang
similarity index 100%
rename from htdocs/langs/en_CA/interventions.lang
rename to public/langs/en_CA/interventions.lang
diff --git a/htdocs/langs/en_CA/languages.lang b/public/langs/en_CA/languages.lang
similarity index 100%
rename from htdocs/langs/en_CA/languages.lang
rename to public/langs/en_CA/languages.lang
diff --git a/htdocs/langs/en_CA/ldap.lang b/public/langs/en_CA/ldap.lang
similarity index 100%
rename from htdocs/langs/en_CA/ldap.lang
rename to public/langs/en_CA/ldap.lang
diff --git a/htdocs/langs/en_CA/link.lang b/public/langs/en_CA/link.lang
similarity index 100%
rename from htdocs/langs/en_CA/link.lang
rename to public/langs/en_CA/link.lang
diff --git a/htdocs/langs/en_CA/loan.lang b/public/langs/en_CA/loan.lang
similarity index 100%
rename from htdocs/langs/en_CA/loan.lang
rename to public/langs/en_CA/loan.lang
diff --git a/htdocs/langs/en_CA/mailmanspip.lang b/public/langs/en_CA/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/en_CA/mailmanspip.lang
rename to public/langs/en_CA/mailmanspip.lang
diff --git a/htdocs/langs/en_CA/mails.lang b/public/langs/en_CA/mails.lang
similarity index 100%
rename from htdocs/langs/en_CA/mails.lang
rename to public/langs/en_CA/mails.lang
diff --git a/htdocs/langs/en_CA/main.lang b/public/langs/en_CA/main.lang
similarity index 100%
rename from htdocs/langs/en_CA/main.lang
rename to public/langs/en_CA/main.lang
diff --git a/htdocs/langs/en_CA/margins.lang b/public/langs/en_CA/margins.lang
similarity index 100%
rename from htdocs/langs/en_CA/margins.lang
rename to public/langs/en_CA/margins.lang
diff --git a/htdocs/langs/en_CA/members.lang b/public/langs/en_CA/members.lang
similarity index 100%
rename from htdocs/langs/en_CA/members.lang
rename to public/langs/en_CA/members.lang
diff --git a/htdocs/langs/en_CA/oauth.lang b/public/langs/en_CA/oauth.lang
similarity index 100%
rename from htdocs/langs/en_CA/oauth.lang
rename to public/langs/en_CA/oauth.lang
diff --git a/htdocs/langs/en_CA/opensurvey.lang b/public/langs/en_CA/opensurvey.lang
similarity index 100%
rename from htdocs/langs/en_CA/opensurvey.lang
rename to public/langs/en_CA/opensurvey.lang
diff --git a/htdocs/langs/en_CA/orders.lang b/public/langs/en_CA/orders.lang
similarity index 100%
rename from htdocs/langs/en_CA/orders.lang
rename to public/langs/en_CA/orders.lang
diff --git a/htdocs/langs/en_CA/other.lang b/public/langs/en_CA/other.lang
similarity index 100%
rename from htdocs/langs/en_CA/other.lang
rename to public/langs/en_CA/other.lang
diff --git a/htdocs/langs/en_CA/paybox.lang b/public/langs/en_CA/paybox.lang
similarity index 100%
rename from htdocs/langs/en_CA/paybox.lang
rename to public/langs/en_CA/paybox.lang
diff --git a/htdocs/langs/en_CA/paypal.lang b/public/langs/en_CA/paypal.lang
similarity index 100%
rename from htdocs/langs/en_CA/paypal.lang
rename to public/langs/en_CA/paypal.lang
diff --git a/htdocs/langs/en_CA/printing.lang b/public/langs/en_CA/printing.lang
similarity index 100%
rename from htdocs/langs/en_CA/printing.lang
rename to public/langs/en_CA/printing.lang
diff --git a/htdocs/langs/en_CA/productbatch.lang b/public/langs/en_CA/productbatch.lang
similarity index 100%
rename from htdocs/langs/en_CA/productbatch.lang
rename to public/langs/en_CA/productbatch.lang
diff --git a/htdocs/langs/en_CA/products.lang b/public/langs/en_CA/products.lang
similarity index 100%
rename from htdocs/langs/en_CA/products.lang
rename to public/langs/en_CA/products.lang
diff --git a/htdocs/langs/en_CA/projects.lang b/public/langs/en_CA/projects.lang
similarity index 100%
rename from htdocs/langs/en_CA/projects.lang
rename to public/langs/en_CA/projects.lang
diff --git a/htdocs/langs/en_CA/propal.lang b/public/langs/en_CA/propal.lang
similarity index 100%
rename from htdocs/langs/en_CA/propal.lang
rename to public/langs/en_CA/propal.lang
diff --git a/htdocs/langs/en_CA/receiptprinter.lang b/public/langs/en_CA/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/en_CA/receiptprinter.lang
rename to public/langs/en_CA/receiptprinter.lang
diff --git a/htdocs/langs/en_CA/resource.lang b/public/langs/en_CA/resource.lang
similarity index 100%
rename from htdocs/langs/en_CA/resource.lang
rename to public/langs/en_CA/resource.lang
diff --git a/htdocs/langs/en_CA/salaries.lang b/public/langs/en_CA/salaries.lang
similarity index 100%
rename from htdocs/langs/en_CA/salaries.lang
rename to public/langs/en_CA/salaries.lang
diff --git a/htdocs/langs/en_CA/sendings.lang b/public/langs/en_CA/sendings.lang
similarity index 100%
rename from htdocs/langs/en_CA/sendings.lang
rename to public/langs/en_CA/sendings.lang
diff --git a/htdocs/langs/en_CA/sms.lang b/public/langs/en_CA/sms.lang
similarity index 100%
rename from htdocs/langs/en_CA/sms.lang
rename to public/langs/en_CA/sms.lang
diff --git a/htdocs/langs/en_CA/stocks.lang b/public/langs/en_CA/stocks.lang
similarity index 100%
rename from htdocs/langs/en_CA/stocks.lang
rename to public/langs/en_CA/stocks.lang
diff --git a/htdocs/langs/en_CA/supplier_proposal.lang b/public/langs/en_CA/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/en_CA/supplier_proposal.lang
rename to public/langs/en_CA/supplier_proposal.lang
diff --git a/htdocs/langs/en_CA/suppliers.lang b/public/langs/en_CA/suppliers.lang
similarity index 100%
rename from htdocs/langs/en_CA/suppliers.lang
rename to public/langs/en_CA/suppliers.lang
diff --git a/htdocs/langs/en_CA/trips.lang b/public/langs/en_CA/trips.lang
similarity index 100%
rename from htdocs/langs/en_CA/trips.lang
rename to public/langs/en_CA/trips.lang
diff --git a/htdocs/langs/en_CA/users.lang b/public/langs/en_CA/users.lang
similarity index 100%
rename from htdocs/langs/en_CA/users.lang
rename to public/langs/en_CA/users.lang
diff --git a/htdocs/langs/en_CA/website.lang b/public/langs/en_CA/website.lang
similarity index 100%
rename from htdocs/langs/en_CA/website.lang
rename to public/langs/en_CA/website.lang
diff --git a/htdocs/langs/en_CA/withdrawals.lang b/public/langs/en_CA/withdrawals.lang
similarity index 100%
rename from htdocs/langs/en_CA/withdrawals.lang
rename to public/langs/en_CA/withdrawals.lang
diff --git a/htdocs/langs/en_CA/workflow.lang b/public/langs/en_CA/workflow.lang
similarity index 100%
rename from htdocs/langs/en_CA/workflow.lang
rename to public/langs/en_CA/workflow.lang
diff --git a/htdocs/langs/en_GB/accountancy.lang b/public/langs/en_GB/accountancy.lang
similarity index 100%
rename from htdocs/langs/en_GB/accountancy.lang
rename to public/langs/en_GB/accountancy.lang
diff --git a/htdocs/langs/en_GB/admin.lang b/public/langs/en_GB/admin.lang
similarity index 100%
rename from htdocs/langs/en_GB/admin.lang
rename to public/langs/en_GB/admin.lang
diff --git a/htdocs/langs/en_GB/agenda.lang b/public/langs/en_GB/agenda.lang
similarity index 100%
rename from htdocs/langs/en_GB/agenda.lang
rename to public/langs/en_GB/agenda.lang
diff --git a/htdocs/langs/en_GB/banks.lang b/public/langs/en_GB/banks.lang
similarity index 100%
rename from htdocs/langs/en_GB/banks.lang
rename to public/langs/en_GB/banks.lang
diff --git a/htdocs/langs/en_GB/bills.lang b/public/langs/en_GB/bills.lang
similarity index 100%
rename from htdocs/langs/en_GB/bills.lang
rename to public/langs/en_GB/bills.lang
diff --git a/htdocs/langs/en_GB/bookmarks.lang b/public/langs/en_GB/bookmarks.lang
similarity index 100%
rename from htdocs/langs/en_GB/bookmarks.lang
rename to public/langs/en_GB/bookmarks.lang
diff --git a/htdocs/langs/en_GB/boxes.lang b/public/langs/en_GB/boxes.lang
similarity index 100%
rename from htdocs/langs/en_GB/boxes.lang
rename to public/langs/en_GB/boxes.lang
diff --git a/htdocs/langs/en_GB/cashdesk.lang b/public/langs/en_GB/cashdesk.lang
similarity index 100%
rename from htdocs/langs/en_GB/cashdesk.lang
rename to public/langs/en_GB/cashdesk.lang
diff --git a/htdocs/langs/en_GB/categories.lang b/public/langs/en_GB/categories.lang
similarity index 100%
rename from htdocs/langs/en_GB/categories.lang
rename to public/langs/en_GB/categories.lang
diff --git a/htdocs/langs/en_GB/commercial.lang b/public/langs/en_GB/commercial.lang
similarity index 100%
rename from htdocs/langs/en_GB/commercial.lang
rename to public/langs/en_GB/commercial.lang
diff --git a/htdocs/langs/en_GB/companies.lang b/public/langs/en_GB/companies.lang
similarity index 100%
rename from htdocs/langs/en_GB/companies.lang
rename to public/langs/en_GB/companies.lang
diff --git a/htdocs/langs/en_GB/compta.lang b/public/langs/en_GB/compta.lang
similarity index 100%
rename from htdocs/langs/en_GB/compta.lang
rename to public/langs/en_GB/compta.lang
diff --git a/htdocs/langs/en_GB/contracts.lang b/public/langs/en_GB/contracts.lang
similarity index 100%
rename from htdocs/langs/en_GB/contracts.lang
rename to public/langs/en_GB/contracts.lang
diff --git a/htdocs/langs/en_GB/cron.lang b/public/langs/en_GB/cron.lang
similarity index 100%
rename from htdocs/langs/en_GB/cron.lang
rename to public/langs/en_GB/cron.lang
diff --git a/htdocs/langs/en_GB/deliveries.lang b/public/langs/en_GB/deliveries.lang
similarity index 100%
rename from htdocs/langs/en_GB/deliveries.lang
rename to public/langs/en_GB/deliveries.lang
diff --git a/htdocs/langs/en_GB/dict.lang b/public/langs/en_GB/dict.lang
similarity index 100%
rename from htdocs/langs/en_GB/dict.lang
rename to public/langs/en_GB/dict.lang
diff --git a/htdocs/langs/en_GB/donations.lang b/public/langs/en_GB/donations.lang
similarity index 100%
rename from htdocs/langs/en_GB/donations.lang
rename to public/langs/en_GB/donations.lang
diff --git a/htdocs/langs/en_GB/ecm.lang b/public/langs/en_GB/ecm.lang
similarity index 100%
rename from htdocs/langs/en_GB/ecm.lang
rename to public/langs/en_GB/ecm.lang
diff --git a/htdocs/langs/en_GB/errors.lang b/public/langs/en_GB/errors.lang
similarity index 100%
rename from htdocs/langs/en_GB/errors.lang
rename to public/langs/en_GB/errors.lang
diff --git a/htdocs/langs/en_GB/exports.lang b/public/langs/en_GB/exports.lang
similarity index 100%
rename from htdocs/langs/en_GB/exports.lang
rename to public/langs/en_GB/exports.lang
diff --git a/htdocs/langs/en_GB/externalsite.lang b/public/langs/en_GB/externalsite.lang
similarity index 100%
rename from htdocs/langs/en_GB/externalsite.lang
rename to public/langs/en_GB/externalsite.lang
diff --git a/htdocs/langs/en_GB/ftp.lang b/public/langs/en_GB/ftp.lang
similarity index 100%
rename from htdocs/langs/en_GB/ftp.lang
rename to public/langs/en_GB/ftp.lang
diff --git a/htdocs/langs/en_GB/help.lang b/public/langs/en_GB/help.lang
similarity index 100%
rename from htdocs/langs/en_GB/help.lang
rename to public/langs/en_GB/help.lang
diff --git a/htdocs/langs/en_GB/holiday.lang b/public/langs/en_GB/holiday.lang
similarity index 100%
rename from htdocs/langs/en_GB/holiday.lang
rename to public/langs/en_GB/holiday.lang
diff --git a/htdocs/langs/en_GB/hrm.lang b/public/langs/en_GB/hrm.lang
similarity index 100%
rename from htdocs/langs/en_GB/hrm.lang
rename to public/langs/en_GB/hrm.lang
diff --git a/htdocs/langs/en_GB/incoterm.lang b/public/langs/en_GB/incoterm.lang
similarity index 100%
rename from htdocs/langs/en_GB/incoterm.lang
rename to public/langs/en_GB/incoterm.lang
diff --git a/htdocs/langs/en_GB/install.lang b/public/langs/en_GB/install.lang
similarity index 100%
rename from htdocs/langs/en_GB/install.lang
rename to public/langs/en_GB/install.lang
diff --git a/htdocs/langs/en_GB/interventions.lang b/public/langs/en_GB/interventions.lang
similarity index 100%
rename from htdocs/langs/en_GB/interventions.lang
rename to public/langs/en_GB/interventions.lang
diff --git a/htdocs/langs/en_GB/languages.lang b/public/langs/en_GB/languages.lang
similarity index 100%
rename from htdocs/langs/en_GB/languages.lang
rename to public/langs/en_GB/languages.lang
diff --git a/htdocs/langs/en_GB/ldap.lang b/public/langs/en_GB/ldap.lang
similarity index 100%
rename from htdocs/langs/en_GB/ldap.lang
rename to public/langs/en_GB/ldap.lang
diff --git a/htdocs/langs/en_GB/link.lang b/public/langs/en_GB/link.lang
similarity index 100%
rename from htdocs/langs/en_GB/link.lang
rename to public/langs/en_GB/link.lang
diff --git a/htdocs/langs/en_GB/loan.lang b/public/langs/en_GB/loan.lang
similarity index 100%
rename from htdocs/langs/en_GB/loan.lang
rename to public/langs/en_GB/loan.lang
diff --git a/htdocs/langs/en_GB/mailmanspip.lang b/public/langs/en_GB/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/en_GB/mailmanspip.lang
rename to public/langs/en_GB/mailmanspip.lang
diff --git a/htdocs/langs/en_GB/mails.lang b/public/langs/en_GB/mails.lang
similarity index 100%
rename from htdocs/langs/en_GB/mails.lang
rename to public/langs/en_GB/mails.lang
diff --git a/htdocs/langs/en_GB/main.lang b/public/langs/en_GB/main.lang
similarity index 100%
rename from htdocs/langs/en_GB/main.lang
rename to public/langs/en_GB/main.lang
diff --git a/htdocs/langs/en_GB/margins.lang b/public/langs/en_GB/margins.lang
similarity index 100%
rename from htdocs/langs/en_GB/margins.lang
rename to public/langs/en_GB/margins.lang
diff --git a/htdocs/langs/en_GB/members.lang b/public/langs/en_GB/members.lang
similarity index 100%
rename from htdocs/langs/en_GB/members.lang
rename to public/langs/en_GB/members.lang
diff --git a/htdocs/langs/en_GB/oauth.lang b/public/langs/en_GB/oauth.lang
similarity index 100%
rename from htdocs/langs/en_GB/oauth.lang
rename to public/langs/en_GB/oauth.lang
diff --git a/htdocs/langs/en_GB/opensurvey.lang b/public/langs/en_GB/opensurvey.lang
similarity index 100%
rename from htdocs/langs/en_GB/opensurvey.lang
rename to public/langs/en_GB/opensurvey.lang
diff --git a/htdocs/langs/en_GB/orders.lang b/public/langs/en_GB/orders.lang
similarity index 100%
rename from htdocs/langs/en_GB/orders.lang
rename to public/langs/en_GB/orders.lang
diff --git a/htdocs/langs/en_GB/other.lang b/public/langs/en_GB/other.lang
similarity index 100%
rename from htdocs/langs/en_GB/other.lang
rename to public/langs/en_GB/other.lang
diff --git a/htdocs/langs/en_GB/paybox.lang b/public/langs/en_GB/paybox.lang
similarity index 100%
rename from htdocs/langs/en_GB/paybox.lang
rename to public/langs/en_GB/paybox.lang
diff --git a/htdocs/langs/en_GB/paypal.lang b/public/langs/en_GB/paypal.lang
similarity index 100%
rename from htdocs/langs/en_GB/paypal.lang
rename to public/langs/en_GB/paypal.lang
diff --git a/htdocs/langs/en_GB/printing.lang b/public/langs/en_GB/printing.lang
similarity index 100%
rename from htdocs/langs/en_GB/printing.lang
rename to public/langs/en_GB/printing.lang
diff --git a/htdocs/langs/en_GB/productbatch.lang b/public/langs/en_GB/productbatch.lang
similarity index 100%
rename from htdocs/langs/en_GB/productbatch.lang
rename to public/langs/en_GB/productbatch.lang
diff --git a/htdocs/langs/en_GB/products.lang b/public/langs/en_GB/products.lang
similarity index 100%
rename from htdocs/langs/en_GB/products.lang
rename to public/langs/en_GB/products.lang
diff --git a/htdocs/langs/en_GB/projects.lang b/public/langs/en_GB/projects.lang
similarity index 100%
rename from htdocs/langs/en_GB/projects.lang
rename to public/langs/en_GB/projects.lang
diff --git a/htdocs/langs/en_GB/propal.lang b/public/langs/en_GB/propal.lang
similarity index 100%
rename from htdocs/langs/en_GB/propal.lang
rename to public/langs/en_GB/propal.lang
diff --git a/htdocs/langs/en_GB/receiptprinter.lang b/public/langs/en_GB/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/en_GB/receiptprinter.lang
rename to public/langs/en_GB/receiptprinter.lang
diff --git a/htdocs/langs/en_GB/resource.lang b/public/langs/en_GB/resource.lang
similarity index 100%
rename from htdocs/langs/en_GB/resource.lang
rename to public/langs/en_GB/resource.lang
diff --git a/htdocs/langs/en_GB/salaries.lang b/public/langs/en_GB/salaries.lang
similarity index 100%
rename from htdocs/langs/en_GB/salaries.lang
rename to public/langs/en_GB/salaries.lang
diff --git a/htdocs/langs/en_GB/sendings.lang b/public/langs/en_GB/sendings.lang
similarity index 100%
rename from htdocs/langs/en_GB/sendings.lang
rename to public/langs/en_GB/sendings.lang
diff --git a/htdocs/langs/en_GB/sms.lang b/public/langs/en_GB/sms.lang
similarity index 100%
rename from htdocs/langs/en_GB/sms.lang
rename to public/langs/en_GB/sms.lang
diff --git a/htdocs/langs/en_GB/stocks.lang b/public/langs/en_GB/stocks.lang
similarity index 100%
rename from htdocs/langs/en_GB/stocks.lang
rename to public/langs/en_GB/stocks.lang
diff --git a/htdocs/langs/en_GB/supplier_proposal.lang b/public/langs/en_GB/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/en_GB/supplier_proposal.lang
rename to public/langs/en_GB/supplier_proposal.lang
diff --git a/htdocs/langs/en_GB/suppliers.lang b/public/langs/en_GB/suppliers.lang
similarity index 100%
rename from htdocs/langs/en_GB/suppliers.lang
rename to public/langs/en_GB/suppliers.lang
diff --git a/htdocs/langs/en_GB/trips.lang b/public/langs/en_GB/trips.lang
similarity index 100%
rename from htdocs/langs/en_GB/trips.lang
rename to public/langs/en_GB/trips.lang
diff --git a/htdocs/langs/en_GB/users.lang b/public/langs/en_GB/users.lang
similarity index 100%
rename from htdocs/langs/en_GB/users.lang
rename to public/langs/en_GB/users.lang
diff --git a/htdocs/langs/en_GB/website.lang b/public/langs/en_GB/website.lang
similarity index 100%
rename from htdocs/langs/en_GB/website.lang
rename to public/langs/en_GB/website.lang
diff --git a/htdocs/langs/en_GB/withdrawals.lang b/public/langs/en_GB/withdrawals.lang
similarity index 100%
rename from htdocs/langs/en_GB/withdrawals.lang
rename to public/langs/en_GB/withdrawals.lang
diff --git a/htdocs/langs/en_GB/workflow.lang b/public/langs/en_GB/workflow.lang
similarity index 100%
rename from htdocs/langs/en_GB/workflow.lang
rename to public/langs/en_GB/workflow.lang
diff --git a/htdocs/langs/en_IN/accountancy.lang b/public/langs/en_IN/accountancy.lang
similarity index 100%
rename from htdocs/langs/en_IN/accountancy.lang
rename to public/langs/en_IN/accountancy.lang
diff --git a/htdocs/langs/en_IN/admin.lang b/public/langs/en_IN/admin.lang
similarity index 100%
rename from htdocs/langs/en_IN/admin.lang
rename to public/langs/en_IN/admin.lang
diff --git a/htdocs/langs/en_IN/agenda.lang b/public/langs/en_IN/agenda.lang
similarity index 100%
rename from htdocs/langs/en_IN/agenda.lang
rename to public/langs/en_IN/agenda.lang
diff --git a/htdocs/langs/en_IN/banks.lang b/public/langs/en_IN/banks.lang
similarity index 100%
rename from htdocs/langs/en_IN/banks.lang
rename to public/langs/en_IN/banks.lang
diff --git a/htdocs/langs/en_IN/bills.lang b/public/langs/en_IN/bills.lang
similarity index 100%
rename from htdocs/langs/en_IN/bills.lang
rename to public/langs/en_IN/bills.lang
diff --git a/htdocs/langs/en_IN/bookmarks.lang b/public/langs/en_IN/bookmarks.lang
similarity index 100%
rename from htdocs/langs/en_IN/bookmarks.lang
rename to public/langs/en_IN/bookmarks.lang
diff --git a/htdocs/langs/en_IN/boxes.lang b/public/langs/en_IN/boxes.lang
similarity index 100%
rename from htdocs/langs/en_IN/boxes.lang
rename to public/langs/en_IN/boxes.lang
diff --git a/htdocs/langs/en_IN/cashdesk.lang b/public/langs/en_IN/cashdesk.lang
similarity index 100%
rename from htdocs/langs/en_IN/cashdesk.lang
rename to public/langs/en_IN/cashdesk.lang
diff --git a/htdocs/langs/en_IN/categories.lang b/public/langs/en_IN/categories.lang
similarity index 100%
rename from htdocs/langs/en_IN/categories.lang
rename to public/langs/en_IN/categories.lang
diff --git a/htdocs/langs/en_IN/commercial.lang b/public/langs/en_IN/commercial.lang
similarity index 100%
rename from htdocs/langs/en_IN/commercial.lang
rename to public/langs/en_IN/commercial.lang
diff --git a/htdocs/langs/en_IN/companies.lang b/public/langs/en_IN/companies.lang
similarity index 100%
rename from htdocs/langs/en_IN/companies.lang
rename to public/langs/en_IN/companies.lang
diff --git a/htdocs/langs/en_IN/compta.lang b/public/langs/en_IN/compta.lang
similarity index 100%
rename from htdocs/langs/en_IN/compta.lang
rename to public/langs/en_IN/compta.lang
diff --git a/htdocs/langs/en_IN/contracts.lang b/public/langs/en_IN/contracts.lang
similarity index 100%
rename from htdocs/langs/en_IN/contracts.lang
rename to public/langs/en_IN/contracts.lang
diff --git a/htdocs/langs/en_IN/cron.lang b/public/langs/en_IN/cron.lang
similarity index 100%
rename from htdocs/langs/en_IN/cron.lang
rename to public/langs/en_IN/cron.lang
diff --git a/htdocs/langs/en_IN/deliveries.lang b/public/langs/en_IN/deliveries.lang
similarity index 100%
rename from htdocs/langs/en_IN/deliveries.lang
rename to public/langs/en_IN/deliveries.lang
diff --git a/htdocs/langs/en_IN/dict.lang b/public/langs/en_IN/dict.lang
similarity index 100%
rename from htdocs/langs/en_IN/dict.lang
rename to public/langs/en_IN/dict.lang
diff --git a/htdocs/langs/en_IN/donations.lang b/public/langs/en_IN/donations.lang
similarity index 100%
rename from htdocs/langs/en_IN/donations.lang
rename to public/langs/en_IN/donations.lang
diff --git a/htdocs/langs/en_IN/ecm.lang b/public/langs/en_IN/ecm.lang
similarity index 100%
rename from htdocs/langs/en_IN/ecm.lang
rename to public/langs/en_IN/ecm.lang
diff --git a/htdocs/langs/en_IN/errors.lang b/public/langs/en_IN/errors.lang
similarity index 100%
rename from htdocs/langs/en_IN/errors.lang
rename to public/langs/en_IN/errors.lang
diff --git a/htdocs/langs/en_IN/exports.lang b/public/langs/en_IN/exports.lang
similarity index 100%
rename from htdocs/langs/en_IN/exports.lang
rename to public/langs/en_IN/exports.lang
diff --git a/htdocs/langs/en_IN/externalsite.lang b/public/langs/en_IN/externalsite.lang
similarity index 100%
rename from htdocs/langs/en_IN/externalsite.lang
rename to public/langs/en_IN/externalsite.lang
diff --git a/htdocs/langs/en_IN/ftp.lang b/public/langs/en_IN/ftp.lang
similarity index 100%
rename from htdocs/langs/en_IN/ftp.lang
rename to public/langs/en_IN/ftp.lang
diff --git a/htdocs/langs/en_IN/help.lang b/public/langs/en_IN/help.lang
similarity index 100%
rename from htdocs/langs/en_IN/help.lang
rename to public/langs/en_IN/help.lang
diff --git a/htdocs/langs/en_IN/holiday.lang b/public/langs/en_IN/holiday.lang
similarity index 100%
rename from htdocs/langs/en_IN/holiday.lang
rename to public/langs/en_IN/holiday.lang
diff --git a/htdocs/langs/en_IN/hrm.lang b/public/langs/en_IN/hrm.lang
similarity index 100%
rename from htdocs/langs/en_IN/hrm.lang
rename to public/langs/en_IN/hrm.lang
diff --git a/htdocs/langs/en_IN/incoterm.lang b/public/langs/en_IN/incoterm.lang
similarity index 100%
rename from htdocs/langs/en_IN/incoterm.lang
rename to public/langs/en_IN/incoterm.lang
diff --git a/htdocs/langs/en_IN/install.lang b/public/langs/en_IN/install.lang
similarity index 100%
rename from htdocs/langs/en_IN/install.lang
rename to public/langs/en_IN/install.lang
diff --git a/htdocs/langs/en_IN/interventions.lang b/public/langs/en_IN/interventions.lang
similarity index 100%
rename from htdocs/langs/en_IN/interventions.lang
rename to public/langs/en_IN/interventions.lang
diff --git a/htdocs/langs/en_IN/languages.lang b/public/langs/en_IN/languages.lang
similarity index 100%
rename from htdocs/langs/en_IN/languages.lang
rename to public/langs/en_IN/languages.lang
diff --git a/htdocs/langs/en_IN/ldap.lang b/public/langs/en_IN/ldap.lang
similarity index 100%
rename from htdocs/langs/en_IN/ldap.lang
rename to public/langs/en_IN/ldap.lang
diff --git a/htdocs/langs/en_IN/link.lang b/public/langs/en_IN/link.lang
similarity index 100%
rename from htdocs/langs/en_IN/link.lang
rename to public/langs/en_IN/link.lang
diff --git a/htdocs/langs/en_IN/loan.lang b/public/langs/en_IN/loan.lang
similarity index 100%
rename from htdocs/langs/en_IN/loan.lang
rename to public/langs/en_IN/loan.lang
diff --git a/htdocs/langs/en_IN/mailmanspip.lang b/public/langs/en_IN/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/en_IN/mailmanspip.lang
rename to public/langs/en_IN/mailmanspip.lang
diff --git a/htdocs/langs/en_IN/mails.lang b/public/langs/en_IN/mails.lang
similarity index 100%
rename from htdocs/langs/en_IN/mails.lang
rename to public/langs/en_IN/mails.lang
diff --git a/htdocs/langs/en_IN/main.lang b/public/langs/en_IN/main.lang
similarity index 100%
rename from htdocs/langs/en_IN/main.lang
rename to public/langs/en_IN/main.lang
diff --git a/htdocs/langs/en_IN/margins.lang b/public/langs/en_IN/margins.lang
similarity index 100%
rename from htdocs/langs/en_IN/margins.lang
rename to public/langs/en_IN/margins.lang
diff --git a/htdocs/langs/en_IN/members.lang b/public/langs/en_IN/members.lang
similarity index 100%
rename from htdocs/langs/en_IN/members.lang
rename to public/langs/en_IN/members.lang
diff --git a/htdocs/langs/en_IN/oauth.lang b/public/langs/en_IN/oauth.lang
similarity index 100%
rename from htdocs/langs/en_IN/oauth.lang
rename to public/langs/en_IN/oauth.lang
diff --git a/htdocs/langs/en_IN/opensurvey.lang b/public/langs/en_IN/opensurvey.lang
similarity index 100%
rename from htdocs/langs/en_IN/opensurvey.lang
rename to public/langs/en_IN/opensurvey.lang
diff --git a/htdocs/langs/en_IN/orders.lang b/public/langs/en_IN/orders.lang
similarity index 100%
rename from htdocs/langs/en_IN/orders.lang
rename to public/langs/en_IN/orders.lang
diff --git a/htdocs/langs/en_IN/other.lang b/public/langs/en_IN/other.lang
similarity index 100%
rename from htdocs/langs/en_IN/other.lang
rename to public/langs/en_IN/other.lang
diff --git a/htdocs/langs/en_IN/paybox.lang b/public/langs/en_IN/paybox.lang
similarity index 100%
rename from htdocs/langs/en_IN/paybox.lang
rename to public/langs/en_IN/paybox.lang
diff --git a/htdocs/langs/en_IN/paypal.lang b/public/langs/en_IN/paypal.lang
similarity index 100%
rename from htdocs/langs/en_IN/paypal.lang
rename to public/langs/en_IN/paypal.lang
diff --git a/htdocs/langs/en_IN/printing.lang b/public/langs/en_IN/printing.lang
similarity index 100%
rename from htdocs/langs/en_IN/printing.lang
rename to public/langs/en_IN/printing.lang
diff --git a/htdocs/langs/en_IN/productbatch.lang b/public/langs/en_IN/productbatch.lang
similarity index 100%
rename from htdocs/langs/en_IN/productbatch.lang
rename to public/langs/en_IN/productbatch.lang
diff --git a/htdocs/langs/en_IN/products.lang b/public/langs/en_IN/products.lang
similarity index 100%
rename from htdocs/langs/en_IN/products.lang
rename to public/langs/en_IN/products.lang
diff --git a/htdocs/langs/en_IN/projects.lang b/public/langs/en_IN/projects.lang
similarity index 100%
rename from htdocs/langs/en_IN/projects.lang
rename to public/langs/en_IN/projects.lang
diff --git a/htdocs/langs/en_IN/propal.lang b/public/langs/en_IN/propal.lang
similarity index 100%
rename from htdocs/langs/en_IN/propal.lang
rename to public/langs/en_IN/propal.lang
diff --git a/htdocs/langs/en_IN/receiptprinter.lang b/public/langs/en_IN/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/en_IN/receiptprinter.lang
rename to public/langs/en_IN/receiptprinter.lang
diff --git a/htdocs/langs/en_IN/resource.lang b/public/langs/en_IN/resource.lang
similarity index 100%
rename from htdocs/langs/en_IN/resource.lang
rename to public/langs/en_IN/resource.lang
diff --git a/htdocs/langs/en_IN/salaries.lang b/public/langs/en_IN/salaries.lang
similarity index 100%
rename from htdocs/langs/en_IN/salaries.lang
rename to public/langs/en_IN/salaries.lang
diff --git a/htdocs/langs/en_IN/sendings.lang b/public/langs/en_IN/sendings.lang
similarity index 100%
rename from htdocs/langs/en_IN/sendings.lang
rename to public/langs/en_IN/sendings.lang
diff --git a/htdocs/langs/en_IN/sms.lang b/public/langs/en_IN/sms.lang
similarity index 100%
rename from htdocs/langs/en_IN/sms.lang
rename to public/langs/en_IN/sms.lang
diff --git a/htdocs/langs/en_IN/stocks.lang b/public/langs/en_IN/stocks.lang
similarity index 100%
rename from htdocs/langs/en_IN/stocks.lang
rename to public/langs/en_IN/stocks.lang
diff --git a/htdocs/langs/en_IN/supplier_proposal.lang b/public/langs/en_IN/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/en_IN/supplier_proposal.lang
rename to public/langs/en_IN/supplier_proposal.lang
diff --git a/htdocs/langs/en_IN/suppliers.lang b/public/langs/en_IN/suppliers.lang
similarity index 100%
rename from htdocs/langs/en_IN/suppliers.lang
rename to public/langs/en_IN/suppliers.lang
diff --git a/htdocs/langs/en_IN/trips.lang b/public/langs/en_IN/trips.lang
similarity index 100%
rename from htdocs/langs/en_IN/trips.lang
rename to public/langs/en_IN/trips.lang
diff --git a/htdocs/langs/en_IN/users.lang b/public/langs/en_IN/users.lang
similarity index 100%
rename from htdocs/langs/en_IN/users.lang
rename to public/langs/en_IN/users.lang
diff --git a/htdocs/langs/en_IN/website.lang b/public/langs/en_IN/website.lang
similarity index 100%
rename from htdocs/langs/en_IN/website.lang
rename to public/langs/en_IN/website.lang
diff --git a/htdocs/langs/en_IN/withdrawals.lang b/public/langs/en_IN/withdrawals.lang
similarity index 100%
rename from htdocs/langs/en_IN/withdrawals.lang
rename to public/langs/en_IN/withdrawals.lang
diff --git a/htdocs/langs/en_IN/workflow.lang b/public/langs/en_IN/workflow.lang
similarity index 100%
rename from htdocs/langs/en_IN/workflow.lang
rename to public/langs/en_IN/workflow.lang
diff --git a/htdocs/langs/en_NZ/companies.lang b/public/langs/en_NZ/companies.lang
similarity index 100%
rename from htdocs/langs/en_NZ/companies.lang
rename to public/langs/en_NZ/companies.lang
diff --git a/htdocs/langs/en_NZ/compta.lang b/public/langs/en_NZ/compta.lang
similarity index 100%
rename from htdocs/langs/en_NZ/compta.lang
rename to public/langs/en_NZ/compta.lang
diff --git a/htdocs/langs/en_NZ/main.lang b/public/langs/en_NZ/main.lang
similarity index 100%
rename from htdocs/langs/en_NZ/main.lang
rename to public/langs/en_NZ/main.lang
diff --git a/htdocs/langs/en_SA/main.lang b/public/langs/en_SA/main.lang
similarity index 100%
rename from htdocs/langs/en_SA/main.lang
rename to public/langs/en_SA/main.lang
diff --git a/htdocs/langs/en_SA/propal.lang b/public/langs/en_SA/propal.lang
similarity index 100%
rename from htdocs/langs/en_SA/propal.lang
rename to public/langs/en_SA/propal.lang
diff --git a/htdocs/langs/en_US/accountancy.lang b/public/langs/en_US/accountancy.lang
similarity index 100%
rename from htdocs/langs/en_US/accountancy.lang
rename to public/langs/en_US/accountancy.lang
diff --git a/htdocs/langs/en_US/admin.lang b/public/langs/en_US/admin.lang
similarity index 100%
rename from htdocs/langs/en_US/admin.lang
rename to public/langs/en_US/admin.lang
diff --git a/htdocs/langs/en_US/agenda.lang b/public/langs/en_US/agenda.lang
similarity index 100%
rename from htdocs/langs/en_US/agenda.lang
rename to public/langs/en_US/agenda.lang
diff --git a/htdocs/langs/en_US/banks.lang b/public/langs/en_US/banks.lang
similarity index 100%
rename from htdocs/langs/en_US/banks.lang
rename to public/langs/en_US/banks.lang
diff --git a/htdocs/langs/en_US/bills.lang b/public/langs/en_US/bills.lang
similarity index 100%
rename from htdocs/langs/en_US/bills.lang
rename to public/langs/en_US/bills.lang
diff --git a/htdocs/langs/en_US/bookmarks.lang b/public/langs/en_US/bookmarks.lang
similarity index 100%
rename from htdocs/langs/en_US/bookmarks.lang
rename to public/langs/en_US/bookmarks.lang
diff --git a/htdocs/langs/en_US/boxes.lang b/public/langs/en_US/boxes.lang
similarity index 100%
rename from htdocs/langs/en_US/boxes.lang
rename to public/langs/en_US/boxes.lang
diff --git a/htdocs/langs/en_US/cashdesk.lang b/public/langs/en_US/cashdesk.lang
similarity index 100%
rename from htdocs/langs/en_US/cashdesk.lang
rename to public/langs/en_US/cashdesk.lang
diff --git a/htdocs/langs/en_US/categories.lang b/public/langs/en_US/categories.lang
similarity index 100%
rename from htdocs/langs/en_US/categories.lang
rename to public/langs/en_US/categories.lang
diff --git a/htdocs/langs/en_US/commercial.lang b/public/langs/en_US/commercial.lang
similarity index 100%
rename from htdocs/langs/en_US/commercial.lang
rename to public/langs/en_US/commercial.lang
diff --git a/htdocs/langs/en_US/companies.lang b/public/langs/en_US/companies.lang
similarity index 100%
rename from htdocs/langs/en_US/companies.lang
rename to public/langs/en_US/companies.lang
diff --git a/htdocs/langs/en_US/compta.lang b/public/langs/en_US/compta.lang
similarity index 100%
rename from htdocs/langs/en_US/compta.lang
rename to public/langs/en_US/compta.lang
diff --git a/htdocs/langs/en_US/contracts.lang b/public/langs/en_US/contracts.lang
similarity index 100%
rename from htdocs/langs/en_US/contracts.lang
rename to public/langs/en_US/contracts.lang
diff --git a/htdocs/langs/en_US/cron.lang b/public/langs/en_US/cron.lang
similarity index 100%
rename from htdocs/langs/en_US/cron.lang
rename to public/langs/en_US/cron.lang
diff --git a/htdocs/langs/en_US/deliveries.lang b/public/langs/en_US/deliveries.lang
similarity index 100%
rename from htdocs/langs/en_US/deliveries.lang
rename to public/langs/en_US/deliveries.lang
diff --git a/htdocs/langs/en_US/dict.lang b/public/langs/en_US/dict.lang
similarity index 100%
rename from htdocs/langs/en_US/dict.lang
rename to public/langs/en_US/dict.lang
diff --git a/htdocs/langs/en_US/donations.lang b/public/langs/en_US/donations.lang
similarity index 100%
rename from htdocs/langs/en_US/donations.lang
rename to public/langs/en_US/donations.lang
diff --git a/htdocs/langs/en_US/ecm.lang b/public/langs/en_US/ecm.lang
similarity index 100%
rename from htdocs/langs/en_US/ecm.lang
rename to public/langs/en_US/ecm.lang
diff --git a/htdocs/langs/en_US/errors.lang b/public/langs/en_US/errors.lang
similarity index 100%
rename from htdocs/langs/en_US/errors.lang
rename to public/langs/en_US/errors.lang
diff --git a/htdocs/langs/en_US/exports.lang b/public/langs/en_US/exports.lang
similarity index 100%
rename from htdocs/langs/en_US/exports.lang
rename to public/langs/en_US/exports.lang
diff --git a/htdocs/langs/en_US/externalsite.lang b/public/langs/en_US/externalsite.lang
similarity index 100%
rename from htdocs/langs/en_US/externalsite.lang
rename to public/langs/en_US/externalsite.lang
diff --git a/htdocs/langs/en_US/ftp.lang b/public/langs/en_US/ftp.lang
similarity index 100%
rename from htdocs/langs/en_US/ftp.lang
rename to public/langs/en_US/ftp.lang
diff --git a/htdocs/langs/en_US/help.lang b/public/langs/en_US/help.lang
similarity index 100%
rename from htdocs/langs/en_US/help.lang
rename to public/langs/en_US/help.lang
diff --git a/htdocs/langs/en_US/holiday.lang b/public/langs/en_US/holiday.lang
similarity index 100%
rename from htdocs/langs/en_US/holiday.lang
rename to public/langs/en_US/holiday.lang
diff --git a/htdocs/langs/en_US/hrm.lang b/public/langs/en_US/hrm.lang
similarity index 100%
rename from htdocs/langs/en_US/hrm.lang
rename to public/langs/en_US/hrm.lang
diff --git a/htdocs/langs/en_US/incoterm.lang b/public/langs/en_US/incoterm.lang
similarity index 100%
rename from htdocs/langs/en_US/incoterm.lang
rename to public/langs/en_US/incoterm.lang
diff --git a/htdocs/langs/en_US/install.lang b/public/langs/en_US/install.lang
similarity index 100%
rename from htdocs/langs/en_US/install.lang
rename to public/langs/en_US/install.lang
diff --git a/htdocs/langs/en_US/interventions.lang b/public/langs/en_US/interventions.lang
similarity index 100%
rename from htdocs/langs/en_US/interventions.lang
rename to public/langs/en_US/interventions.lang
diff --git a/htdocs/langs/en_US/languages.lang b/public/langs/en_US/languages.lang
similarity index 100%
rename from htdocs/langs/en_US/languages.lang
rename to public/langs/en_US/languages.lang
diff --git a/htdocs/langs/en_US/ldap.lang b/public/langs/en_US/ldap.lang
similarity index 100%
rename from htdocs/langs/en_US/ldap.lang
rename to public/langs/en_US/ldap.lang
diff --git a/htdocs/langs/en_US/link.lang b/public/langs/en_US/link.lang
similarity index 100%
rename from htdocs/langs/en_US/link.lang
rename to public/langs/en_US/link.lang
diff --git a/htdocs/langs/en_US/loan.lang b/public/langs/en_US/loan.lang
similarity index 100%
rename from htdocs/langs/en_US/loan.lang
rename to public/langs/en_US/loan.lang
diff --git a/htdocs/langs/en_US/mailmanspip.lang b/public/langs/en_US/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/en_US/mailmanspip.lang
rename to public/langs/en_US/mailmanspip.lang
diff --git a/htdocs/langs/en_US/mails.lang b/public/langs/en_US/mails.lang
similarity index 100%
rename from htdocs/langs/en_US/mails.lang
rename to public/langs/en_US/mails.lang
diff --git a/htdocs/langs/en_US/main.lang b/public/langs/en_US/main.lang
similarity index 100%
rename from htdocs/langs/en_US/main.lang
rename to public/langs/en_US/main.lang
diff --git a/htdocs/langs/en_US/margins.lang b/public/langs/en_US/margins.lang
similarity index 100%
rename from htdocs/langs/en_US/margins.lang
rename to public/langs/en_US/margins.lang
diff --git a/htdocs/langs/en_US/members.lang b/public/langs/en_US/members.lang
similarity index 100%
rename from htdocs/langs/en_US/members.lang
rename to public/langs/en_US/members.lang
diff --git a/htdocs/langs/en_US/multicurrency.lang b/public/langs/en_US/multicurrency.lang
similarity index 100%
rename from htdocs/langs/en_US/multicurrency.lang
rename to public/langs/en_US/multicurrency.lang
diff --git a/htdocs/langs/en_US/oauth.lang b/public/langs/en_US/oauth.lang
similarity index 100%
rename from htdocs/langs/en_US/oauth.lang
rename to public/langs/en_US/oauth.lang
diff --git a/htdocs/langs/en_US/opensurvey.lang b/public/langs/en_US/opensurvey.lang
similarity index 100%
rename from htdocs/langs/en_US/opensurvey.lang
rename to public/langs/en_US/opensurvey.lang
diff --git a/htdocs/langs/en_US/orders.lang b/public/langs/en_US/orders.lang
similarity index 100%
rename from htdocs/langs/en_US/orders.lang
rename to public/langs/en_US/orders.lang
diff --git a/htdocs/langs/en_US/other.lang b/public/langs/en_US/other.lang
similarity index 100%
rename from htdocs/langs/en_US/other.lang
rename to public/langs/en_US/other.lang
diff --git a/htdocs/langs/en_US/paybox.lang b/public/langs/en_US/paybox.lang
similarity index 100%
rename from htdocs/langs/en_US/paybox.lang
rename to public/langs/en_US/paybox.lang
diff --git a/htdocs/langs/en_US/paypal.lang b/public/langs/en_US/paypal.lang
similarity index 100%
rename from htdocs/langs/en_US/paypal.lang
rename to public/langs/en_US/paypal.lang
diff --git a/htdocs/langs/en_US/printing.lang b/public/langs/en_US/printing.lang
similarity index 100%
rename from htdocs/langs/en_US/printing.lang
rename to public/langs/en_US/printing.lang
diff --git a/htdocs/langs/en_US/productbatch.lang b/public/langs/en_US/productbatch.lang
similarity index 100%
rename from htdocs/langs/en_US/productbatch.lang
rename to public/langs/en_US/productbatch.lang
diff --git a/htdocs/langs/en_US/products.lang b/public/langs/en_US/products.lang
similarity index 100%
rename from htdocs/langs/en_US/products.lang
rename to public/langs/en_US/products.lang
diff --git a/htdocs/langs/en_US/projects.lang b/public/langs/en_US/projects.lang
similarity index 100%
rename from htdocs/langs/en_US/projects.lang
rename to public/langs/en_US/projects.lang
diff --git a/htdocs/langs/en_US/propal.lang b/public/langs/en_US/propal.lang
similarity index 100%
rename from htdocs/langs/en_US/propal.lang
rename to public/langs/en_US/propal.lang
diff --git a/htdocs/langs/en_US/receiptprinter.lang b/public/langs/en_US/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/en_US/receiptprinter.lang
rename to public/langs/en_US/receiptprinter.lang
diff --git a/htdocs/langs/en_US/resource.lang b/public/langs/en_US/resource.lang
similarity index 100%
rename from htdocs/langs/en_US/resource.lang
rename to public/langs/en_US/resource.lang
diff --git a/htdocs/langs/en_US/salaries.lang b/public/langs/en_US/salaries.lang
similarity index 100%
rename from htdocs/langs/en_US/salaries.lang
rename to public/langs/en_US/salaries.lang
diff --git a/htdocs/langs/en_US/sendings.lang b/public/langs/en_US/sendings.lang
similarity index 100%
rename from htdocs/langs/en_US/sendings.lang
rename to public/langs/en_US/sendings.lang
diff --git a/htdocs/langs/en_US/sms.lang b/public/langs/en_US/sms.lang
similarity index 100%
rename from htdocs/langs/en_US/sms.lang
rename to public/langs/en_US/sms.lang
diff --git a/htdocs/langs/en_US/stocks.lang b/public/langs/en_US/stocks.lang
similarity index 100%
rename from htdocs/langs/en_US/stocks.lang
rename to public/langs/en_US/stocks.lang
diff --git a/htdocs/langs/en_US/supplier_proposal.lang b/public/langs/en_US/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/en_US/supplier_proposal.lang
rename to public/langs/en_US/supplier_proposal.lang
diff --git a/htdocs/langs/en_US/suppliers.lang b/public/langs/en_US/suppliers.lang
similarity index 100%
rename from htdocs/langs/en_US/suppliers.lang
rename to public/langs/en_US/suppliers.lang
diff --git a/htdocs/langs/en_US/trips.lang b/public/langs/en_US/trips.lang
similarity index 100%
rename from htdocs/langs/en_US/trips.lang
rename to public/langs/en_US/trips.lang
diff --git a/htdocs/langs/en_US/users.lang b/public/langs/en_US/users.lang
similarity index 100%
rename from htdocs/langs/en_US/users.lang
rename to public/langs/en_US/users.lang
diff --git a/htdocs/langs/en_US/website.lang b/public/langs/en_US/website.lang
similarity index 100%
rename from htdocs/langs/en_US/website.lang
rename to public/langs/en_US/website.lang
diff --git a/htdocs/langs/en_US/withdrawals.lang b/public/langs/en_US/withdrawals.lang
similarity index 100%
rename from htdocs/langs/en_US/withdrawals.lang
rename to public/langs/en_US/withdrawals.lang
diff --git a/htdocs/langs/en_US/workflow.lang b/public/langs/en_US/workflow.lang
similarity index 100%
rename from htdocs/langs/en_US/workflow.lang
rename to public/langs/en_US/workflow.lang
diff --git a/htdocs/langs/en_ZA/main.lang b/public/langs/en_ZA/main.lang
similarity index 100%
rename from htdocs/langs/en_ZA/main.lang
rename to public/langs/en_ZA/main.lang
diff --git a/htdocs/langs/es_AR/accountancy.lang b/public/langs/es_AR/accountancy.lang
similarity index 100%
rename from htdocs/langs/es_AR/accountancy.lang
rename to public/langs/es_AR/accountancy.lang
diff --git a/htdocs/langs/es_AR/admin.lang b/public/langs/es_AR/admin.lang
similarity index 100%
rename from htdocs/langs/es_AR/admin.lang
rename to public/langs/es_AR/admin.lang
diff --git a/htdocs/langs/es_AR/agenda.lang b/public/langs/es_AR/agenda.lang
similarity index 100%
rename from htdocs/langs/es_AR/agenda.lang
rename to public/langs/es_AR/agenda.lang
diff --git a/htdocs/langs/es_AR/banks.lang b/public/langs/es_AR/banks.lang
similarity index 100%
rename from htdocs/langs/es_AR/banks.lang
rename to public/langs/es_AR/banks.lang
diff --git a/htdocs/langs/es_AR/bills.lang b/public/langs/es_AR/bills.lang
similarity index 100%
rename from htdocs/langs/es_AR/bills.lang
rename to public/langs/es_AR/bills.lang
diff --git a/htdocs/langs/es_AR/bookmarks.lang b/public/langs/es_AR/bookmarks.lang
similarity index 100%
rename from htdocs/langs/es_AR/bookmarks.lang
rename to public/langs/es_AR/bookmarks.lang
diff --git a/htdocs/langs/es_AR/boxes.lang b/public/langs/es_AR/boxes.lang
similarity index 100%
rename from htdocs/langs/es_AR/boxes.lang
rename to public/langs/es_AR/boxes.lang
diff --git a/htdocs/langs/es_AR/cashdesk.lang b/public/langs/es_AR/cashdesk.lang
similarity index 100%
rename from htdocs/langs/es_AR/cashdesk.lang
rename to public/langs/es_AR/cashdesk.lang
diff --git a/htdocs/langs/es_AR/categories.lang b/public/langs/es_AR/categories.lang
similarity index 100%
rename from htdocs/langs/es_AR/categories.lang
rename to public/langs/es_AR/categories.lang
diff --git a/htdocs/langs/es_AR/commercial.lang b/public/langs/es_AR/commercial.lang
similarity index 100%
rename from htdocs/langs/es_AR/commercial.lang
rename to public/langs/es_AR/commercial.lang
diff --git a/htdocs/langs/es_AR/companies.lang b/public/langs/es_AR/companies.lang
similarity index 100%
rename from htdocs/langs/es_AR/companies.lang
rename to public/langs/es_AR/companies.lang
diff --git a/htdocs/langs/es_AR/compta.lang b/public/langs/es_AR/compta.lang
similarity index 100%
rename from htdocs/langs/es_AR/compta.lang
rename to public/langs/es_AR/compta.lang
diff --git a/htdocs/langs/es_AR/contracts.lang b/public/langs/es_AR/contracts.lang
similarity index 100%
rename from htdocs/langs/es_AR/contracts.lang
rename to public/langs/es_AR/contracts.lang
diff --git a/htdocs/langs/es_AR/cron.lang b/public/langs/es_AR/cron.lang
similarity index 100%
rename from htdocs/langs/es_AR/cron.lang
rename to public/langs/es_AR/cron.lang
diff --git a/htdocs/langs/es_AR/deliveries.lang b/public/langs/es_AR/deliveries.lang
similarity index 100%
rename from htdocs/langs/es_AR/deliveries.lang
rename to public/langs/es_AR/deliveries.lang
diff --git a/htdocs/langs/es_AR/dict.lang b/public/langs/es_AR/dict.lang
similarity index 100%
rename from htdocs/langs/es_AR/dict.lang
rename to public/langs/es_AR/dict.lang
diff --git a/htdocs/langs/es_AR/donations.lang b/public/langs/es_AR/donations.lang
similarity index 100%
rename from htdocs/langs/es_AR/donations.lang
rename to public/langs/es_AR/donations.lang
diff --git a/htdocs/langs/es_AR/ecm.lang b/public/langs/es_AR/ecm.lang
similarity index 100%
rename from htdocs/langs/es_AR/ecm.lang
rename to public/langs/es_AR/ecm.lang
diff --git a/htdocs/langs/es_AR/errors.lang b/public/langs/es_AR/errors.lang
similarity index 100%
rename from htdocs/langs/es_AR/errors.lang
rename to public/langs/es_AR/errors.lang
diff --git a/htdocs/langs/es_AR/exports.lang b/public/langs/es_AR/exports.lang
similarity index 100%
rename from htdocs/langs/es_AR/exports.lang
rename to public/langs/es_AR/exports.lang
diff --git a/htdocs/langs/es_AR/externalsite.lang b/public/langs/es_AR/externalsite.lang
similarity index 100%
rename from htdocs/langs/es_AR/externalsite.lang
rename to public/langs/es_AR/externalsite.lang
diff --git a/htdocs/langs/es_AR/ftp.lang b/public/langs/es_AR/ftp.lang
similarity index 100%
rename from htdocs/langs/es_AR/ftp.lang
rename to public/langs/es_AR/ftp.lang
diff --git a/htdocs/langs/es_AR/help.lang b/public/langs/es_AR/help.lang
similarity index 100%
rename from htdocs/langs/es_AR/help.lang
rename to public/langs/es_AR/help.lang
diff --git a/htdocs/langs/es_AR/holiday.lang b/public/langs/es_AR/holiday.lang
similarity index 100%
rename from htdocs/langs/es_AR/holiday.lang
rename to public/langs/es_AR/holiday.lang
diff --git a/htdocs/langs/es_AR/hrm.lang b/public/langs/es_AR/hrm.lang
similarity index 100%
rename from htdocs/langs/es_AR/hrm.lang
rename to public/langs/es_AR/hrm.lang
diff --git a/htdocs/langs/es_AR/incoterm.lang b/public/langs/es_AR/incoterm.lang
similarity index 100%
rename from htdocs/langs/es_AR/incoterm.lang
rename to public/langs/es_AR/incoterm.lang
diff --git a/htdocs/langs/es_AR/install.lang b/public/langs/es_AR/install.lang
similarity index 100%
rename from htdocs/langs/es_AR/install.lang
rename to public/langs/es_AR/install.lang
diff --git a/htdocs/langs/es_AR/interventions.lang b/public/langs/es_AR/interventions.lang
similarity index 100%
rename from htdocs/langs/es_AR/interventions.lang
rename to public/langs/es_AR/interventions.lang
diff --git a/htdocs/langs/es_AR/languages.lang b/public/langs/es_AR/languages.lang
similarity index 100%
rename from htdocs/langs/es_AR/languages.lang
rename to public/langs/es_AR/languages.lang
diff --git a/htdocs/langs/es_AR/ldap.lang b/public/langs/es_AR/ldap.lang
similarity index 100%
rename from htdocs/langs/es_AR/ldap.lang
rename to public/langs/es_AR/ldap.lang
diff --git a/htdocs/langs/es_AR/link.lang b/public/langs/es_AR/link.lang
similarity index 100%
rename from htdocs/langs/es_AR/link.lang
rename to public/langs/es_AR/link.lang
diff --git a/htdocs/langs/es_AR/loan.lang b/public/langs/es_AR/loan.lang
similarity index 100%
rename from htdocs/langs/es_AR/loan.lang
rename to public/langs/es_AR/loan.lang
diff --git a/htdocs/langs/es_AR/mailmanspip.lang b/public/langs/es_AR/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/es_AR/mailmanspip.lang
rename to public/langs/es_AR/mailmanspip.lang
diff --git a/htdocs/langs/es_AR/mails.lang b/public/langs/es_AR/mails.lang
similarity index 100%
rename from htdocs/langs/es_AR/mails.lang
rename to public/langs/es_AR/mails.lang
diff --git a/htdocs/langs/es_AR/main.lang b/public/langs/es_AR/main.lang
similarity index 100%
rename from htdocs/langs/es_AR/main.lang
rename to public/langs/es_AR/main.lang
diff --git a/htdocs/langs/es_AR/margins.lang b/public/langs/es_AR/margins.lang
similarity index 100%
rename from htdocs/langs/es_AR/margins.lang
rename to public/langs/es_AR/margins.lang
diff --git a/htdocs/langs/es_AR/members.lang b/public/langs/es_AR/members.lang
similarity index 100%
rename from htdocs/langs/es_AR/members.lang
rename to public/langs/es_AR/members.lang
diff --git a/htdocs/langs/es_AR/oauth.lang b/public/langs/es_AR/oauth.lang
similarity index 100%
rename from htdocs/langs/es_AR/oauth.lang
rename to public/langs/es_AR/oauth.lang
diff --git a/htdocs/langs/es_AR/opensurvey.lang b/public/langs/es_AR/opensurvey.lang
similarity index 100%
rename from htdocs/langs/es_AR/opensurvey.lang
rename to public/langs/es_AR/opensurvey.lang
diff --git a/htdocs/langs/es_AR/orders.lang b/public/langs/es_AR/orders.lang
similarity index 100%
rename from htdocs/langs/es_AR/orders.lang
rename to public/langs/es_AR/orders.lang
diff --git a/htdocs/langs/es_AR/other.lang b/public/langs/es_AR/other.lang
similarity index 100%
rename from htdocs/langs/es_AR/other.lang
rename to public/langs/es_AR/other.lang
diff --git a/htdocs/langs/es_AR/paybox.lang b/public/langs/es_AR/paybox.lang
similarity index 100%
rename from htdocs/langs/es_AR/paybox.lang
rename to public/langs/es_AR/paybox.lang
diff --git a/htdocs/langs/es_AR/paypal.lang b/public/langs/es_AR/paypal.lang
similarity index 100%
rename from htdocs/langs/es_AR/paypal.lang
rename to public/langs/es_AR/paypal.lang
diff --git a/htdocs/langs/es_AR/printing.lang b/public/langs/es_AR/printing.lang
similarity index 100%
rename from htdocs/langs/es_AR/printing.lang
rename to public/langs/es_AR/printing.lang
diff --git a/htdocs/langs/es_AR/productbatch.lang b/public/langs/es_AR/productbatch.lang
similarity index 100%
rename from htdocs/langs/es_AR/productbatch.lang
rename to public/langs/es_AR/productbatch.lang
diff --git a/htdocs/langs/es_AR/products.lang b/public/langs/es_AR/products.lang
similarity index 100%
rename from htdocs/langs/es_AR/products.lang
rename to public/langs/es_AR/products.lang
diff --git a/htdocs/langs/es_AR/projects.lang b/public/langs/es_AR/projects.lang
similarity index 100%
rename from htdocs/langs/es_AR/projects.lang
rename to public/langs/es_AR/projects.lang
diff --git a/htdocs/langs/es_AR/propal.lang b/public/langs/es_AR/propal.lang
similarity index 100%
rename from htdocs/langs/es_AR/propal.lang
rename to public/langs/es_AR/propal.lang
diff --git a/htdocs/langs/es_AR/receiptprinter.lang b/public/langs/es_AR/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/es_AR/receiptprinter.lang
rename to public/langs/es_AR/receiptprinter.lang
diff --git a/htdocs/langs/es_AR/resource.lang b/public/langs/es_AR/resource.lang
similarity index 100%
rename from htdocs/langs/es_AR/resource.lang
rename to public/langs/es_AR/resource.lang
diff --git a/htdocs/langs/es_AR/salaries.lang b/public/langs/es_AR/salaries.lang
similarity index 100%
rename from htdocs/langs/es_AR/salaries.lang
rename to public/langs/es_AR/salaries.lang
diff --git a/htdocs/langs/es_AR/sendings.lang b/public/langs/es_AR/sendings.lang
similarity index 100%
rename from htdocs/langs/es_AR/sendings.lang
rename to public/langs/es_AR/sendings.lang
diff --git a/htdocs/langs/es_AR/sms.lang b/public/langs/es_AR/sms.lang
similarity index 100%
rename from htdocs/langs/es_AR/sms.lang
rename to public/langs/es_AR/sms.lang
diff --git a/htdocs/langs/es_AR/stocks.lang b/public/langs/es_AR/stocks.lang
similarity index 100%
rename from htdocs/langs/es_AR/stocks.lang
rename to public/langs/es_AR/stocks.lang
diff --git a/htdocs/langs/es_AR/supplier_proposal.lang b/public/langs/es_AR/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/es_AR/supplier_proposal.lang
rename to public/langs/es_AR/supplier_proposal.lang
diff --git a/htdocs/langs/es_AR/suppliers.lang b/public/langs/es_AR/suppliers.lang
similarity index 100%
rename from htdocs/langs/es_AR/suppliers.lang
rename to public/langs/es_AR/suppliers.lang
diff --git a/htdocs/langs/es_AR/trips.lang b/public/langs/es_AR/trips.lang
similarity index 100%
rename from htdocs/langs/es_AR/trips.lang
rename to public/langs/es_AR/trips.lang
diff --git a/htdocs/langs/es_AR/users.lang b/public/langs/es_AR/users.lang
similarity index 100%
rename from htdocs/langs/es_AR/users.lang
rename to public/langs/es_AR/users.lang
diff --git a/htdocs/langs/es_AR/website.lang b/public/langs/es_AR/website.lang
similarity index 100%
rename from htdocs/langs/es_AR/website.lang
rename to public/langs/es_AR/website.lang
diff --git a/htdocs/langs/es_AR/withdrawals.lang b/public/langs/es_AR/withdrawals.lang
similarity index 100%
rename from htdocs/langs/es_AR/withdrawals.lang
rename to public/langs/es_AR/withdrawals.lang
diff --git a/htdocs/langs/es_AR/workflow.lang b/public/langs/es_AR/workflow.lang
similarity index 100%
rename from htdocs/langs/es_AR/workflow.lang
rename to public/langs/es_AR/workflow.lang
diff --git a/htdocs/langs/es_BO/accountancy.lang b/public/langs/es_BO/accountancy.lang
similarity index 100%
rename from htdocs/langs/es_BO/accountancy.lang
rename to public/langs/es_BO/accountancy.lang
diff --git a/htdocs/langs/es_BO/admin.lang b/public/langs/es_BO/admin.lang
similarity index 100%
rename from htdocs/langs/es_BO/admin.lang
rename to public/langs/es_BO/admin.lang
diff --git a/htdocs/langs/es_BO/agenda.lang b/public/langs/es_BO/agenda.lang
similarity index 100%
rename from htdocs/langs/es_BO/agenda.lang
rename to public/langs/es_BO/agenda.lang
diff --git a/htdocs/langs/es_BO/banks.lang b/public/langs/es_BO/banks.lang
similarity index 100%
rename from htdocs/langs/es_BO/banks.lang
rename to public/langs/es_BO/banks.lang
diff --git a/htdocs/langs/es_BO/bills.lang b/public/langs/es_BO/bills.lang
similarity index 100%
rename from htdocs/langs/es_BO/bills.lang
rename to public/langs/es_BO/bills.lang
diff --git a/htdocs/langs/es_BO/bookmarks.lang b/public/langs/es_BO/bookmarks.lang
similarity index 100%
rename from htdocs/langs/es_BO/bookmarks.lang
rename to public/langs/es_BO/bookmarks.lang
diff --git a/htdocs/langs/es_BO/boxes.lang b/public/langs/es_BO/boxes.lang
similarity index 100%
rename from htdocs/langs/es_BO/boxes.lang
rename to public/langs/es_BO/boxes.lang
diff --git a/htdocs/langs/es_BO/cashdesk.lang b/public/langs/es_BO/cashdesk.lang
similarity index 100%
rename from htdocs/langs/es_BO/cashdesk.lang
rename to public/langs/es_BO/cashdesk.lang
diff --git a/htdocs/langs/es_BO/categories.lang b/public/langs/es_BO/categories.lang
similarity index 100%
rename from htdocs/langs/es_BO/categories.lang
rename to public/langs/es_BO/categories.lang
diff --git a/htdocs/langs/es_BO/commercial.lang b/public/langs/es_BO/commercial.lang
similarity index 100%
rename from htdocs/langs/es_BO/commercial.lang
rename to public/langs/es_BO/commercial.lang
diff --git a/htdocs/langs/es_BO/companies.lang b/public/langs/es_BO/companies.lang
similarity index 100%
rename from htdocs/langs/es_BO/companies.lang
rename to public/langs/es_BO/companies.lang
diff --git a/htdocs/langs/es_BO/compta.lang b/public/langs/es_BO/compta.lang
similarity index 100%
rename from htdocs/langs/es_BO/compta.lang
rename to public/langs/es_BO/compta.lang
diff --git a/htdocs/langs/es_BO/contracts.lang b/public/langs/es_BO/contracts.lang
similarity index 100%
rename from htdocs/langs/es_BO/contracts.lang
rename to public/langs/es_BO/contracts.lang
diff --git a/htdocs/langs/es_BO/cron.lang b/public/langs/es_BO/cron.lang
similarity index 100%
rename from htdocs/langs/es_BO/cron.lang
rename to public/langs/es_BO/cron.lang
diff --git a/htdocs/langs/es_BO/deliveries.lang b/public/langs/es_BO/deliveries.lang
similarity index 100%
rename from htdocs/langs/es_BO/deliveries.lang
rename to public/langs/es_BO/deliveries.lang
diff --git a/htdocs/langs/es_BO/dict.lang b/public/langs/es_BO/dict.lang
similarity index 100%
rename from htdocs/langs/es_BO/dict.lang
rename to public/langs/es_BO/dict.lang
diff --git a/htdocs/langs/es_BO/donations.lang b/public/langs/es_BO/donations.lang
similarity index 100%
rename from htdocs/langs/es_BO/donations.lang
rename to public/langs/es_BO/donations.lang
diff --git a/htdocs/langs/es_BO/ecm.lang b/public/langs/es_BO/ecm.lang
similarity index 100%
rename from htdocs/langs/es_BO/ecm.lang
rename to public/langs/es_BO/ecm.lang
diff --git a/htdocs/langs/es_BO/errors.lang b/public/langs/es_BO/errors.lang
similarity index 100%
rename from htdocs/langs/es_BO/errors.lang
rename to public/langs/es_BO/errors.lang
diff --git a/htdocs/langs/es_BO/exports.lang b/public/langs/es_BO/exports.lang
similarity index 100%
rename from htdocs/langs/es_BO/exports.lang
rename to public/langs/es_BO/exports.lang
diff --git a/htdocs/langs/es_BO/externalsite.lang b/public/langs/es_BO/externalsite.lang
similarity index 100%
rename from htdocs/langs/es_BO/externalsite.lang
rename to public/langs/es_BO/externalsite.lang
diff --git a/htdocs/langs/es_BO/ftp.lang b/public/langs/es_BO/ftp.lang
similarity index 100%
rename from htdocs/langs/es_BO/ftp.lang
rename to public/langs/es_BO/ftp.lang
diff --git a/htdocs/langs/es_BO/help.lang b/public/langs/es_BO/help.lang
similarity index 100%
rename from htdocs/langs/es_BO/help.lang
rename to public/langs/es_BO/help.lang
diff --git a/htdocs/langs/es_BO/holiday.lang b/public/langs/es_BO/holiday.lang
similarity index 100%
rename from htdocs/langs/es_BO/holiday.lang
rename to public/langs/es_BO/holiday.lang
diff --git a/htdocs/langs/es_BO/hrm.lang b/public/langs/es_BO/hrm.lang
similarity index 100%
rename from htdocs/langs/es_BO/hrm.lang
rename to public/langs/es_BO/hrm.lang
diff --git a/htdocs/langs/es_BO/incoterm.lang b/public/langs/es_BO/incoterm.lang
similarity index 100%
rename from htdocs/langs/es_BO/incoterm.lang
rename to public/langs/es_BO/incoterm.lang
diff --git a/htdocs/langs/es_BO/install.lang b/public/langs/es_BO/install.lang
similarity index 100%
rename from htdocs/langs/es_BO/install.lang
rename to public/langs/es_BO/install.lang
diff --git a/htdocs/langs/es_BO/interventions.lang b/public/langs/es_BO/interventions.lang
similarity index 100%
rename from htdocs/langs/es_BO/interventions.lang
rename to public/langs/es_BO/interventions.lang
diff --git a/htdocs/langs/es_BO/languages.lang b/public/langs/es_BO/languages.lang
similarity index 100%
rename from htdocs/langs/es_BO/languages.lang
rename to public/langs/es_BO/languages.lang
diff --git a/htdocs/langs/es_BO/ldap.lang b/public/langs/es_BO/ldap.lang
similarity index 100%
rename from htdocs/langs/es_BO/ldap.lang
rename to public/langs/es_BO/ldap.lang
diff --git a/htdocs/langs/es_BO/link.lang b/public/langs/es_BO/link.lang
similarity index 100%
rename from htdocs/langs/es_BO/link.lang
rename to public/langs/es_BO/link.lang
diff --git a/htdocs/langs/es_BO/loan.lang b/public/langs/es_BO/loan.lang
similarity index 100%
rename from htdocs/langs/es_BO/loan.lang
rename to public/langs/es_BO/loan.lang
diff --git a/htdocs/langs/es_BO/mailmanspip.lang b/public/langs/es_BO/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/es_BO/mailmanspip.lang
rename to public/langs/es_BO/mailmanspip.lang
diff --git a/htdocs/langs/es_BO/mails.lang b/public/langs/es_BO/mails.lang
similarity index 100%
rename from htdocs/langs/es_BO/mails.lang
rename to public/langs/es_BO/mails.lang
diff --git a/htdocs/langs/es_BO/main.lang b/public/langs/es_BO/main.lang
similarity index 100%
rename from htdocs/langs/es_BO/main.lang
rename to public/langs/es_BO/main.lang
diff --git a/htdocs/langs/es_BO/margins.lang b/public/langs/es_BO/margins.lang
similarity index 100%
rename from htdocs/langs/es_BO/margins.lang
rename to public/langs/es_BO/margins.lang
diff --git a/htdocs/langs/es_BO/members.lang b/public/langs/es_BO/members.lang
similarity index 100%
rename from htdocs/langs/es_BO/members.lang
rename to public/langs/es_BO/members.lang
diff --git a/htdocs/langs/es_BO/oauth.lang b/public/langs/es_BO/oauth.lang
similarity index 100%
rename from htdocs/langs/es_BO/oauth.lang
rename to public/langs/es_BO/oauth.lang
diff --git a/htdocs/langs/es_BO/opensurvey.lang b/public/langs/es_BO/opensurvey.lang
similarity index 100%
rename from htdocs/langs/es_BO/opensurvey.lang
rename to public/langs/es_BO/opensurvey.lang
diff --git a/htdocs/langs/es_BO/orders.lang b/public/langs/es_BO/orders.lang
similarity index 100%
rename from htdocs/langs/es_BO/orders.lang
rename to public/langs/es_BO/orders.lang
diff --git a/htdocs/langs/es_BO/other.lang b/public/langs/es_BO/other.lang
similarity index 100%
rename from htdocs/langs/es_BO/other.lang
rename to public/langs/es_BO/other.lang
diff --git a/htdocs/langs/es_BO/paybox.lang b/public/langs/es_BO/paybox.lang
similarity index 100%
rename from htdocs/langs/es_BO/paybox.lang
rename to public/langs/es_BO/paybox.lang
diff --git a/htdocs/langs/es_BO/paypal.lang b/public/langs/es_BO/paypal.lang
similarity index 100%
rename from htdocs/langs/es_BO/paypal.lang
rename to public/langs/es_BO/paypal.lang
diff --git a/htdocs/langs/es_BO/printing.lang b/public/langs/es_BO/printing.lang
similarity index 100%
rename from htdocs/langs/es_BO/printing.lang
rename to public/langs/es_BO/printing.lang
diff --git a/htdocs/langs/es_BO/productbatch.lang b/public/langs/es_BO/productbatch.lang
similarity index 100%
rename from htdocs/langs/es_BO/productbatch.lang
rename to public/langs/es_BO/productbatch.lang
diff --git a/htdocs/langs/es_BO/products.lang b/public/langs/es_BO/products.lang
similarity index 100%
rename from htdocs/langs/es_BO/products.lang
rename to public/langs/es_BO/products.lang
diff --git a/htdocs/langs/es_BO/projects.lang b/public/langs/es_BO/projects.lang
similarity index 100%
rename from htdocs/langs/es_BO/projects.lang
rename to public/langs/es_BO/projects.lang
diff --git a/htdocs/langs/es_BO/propal.lang b/public/langs/es_BO/propal.lang
similarity index 100%
rename from htdocs/langs/es_BO/propal.lang
rename to public/langs/es_BO/propal.lang
diff --git a/htdocs/langs/es_BO/receiptprinter.lang b/public/langs/es_BO/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/es_BO/receiptprinter.lang
rename to public/langs/es_BO/receiptprinter.lang
diff --git a/htdocs/langs/es_BO/resource.lang b/public/langs/es_BO/resource.lang
similarity index 100%
rename from htdocs/langs/es_BO/resource.lang
rename to public/langs/es_BO/resource.lang
diff --git a/htdocs/langs/es_BO/salaries.lang b/public/langs/es_BO/salaries.lang
similarity index 100%
rename from htdocs/langs/es_BO/salaries.lang
rename to public/langs/es_BO/salaries.lang
diff --git a/htdocs/langs/es_BO/sendings.lang b/public/langs/es_BO/sendings.lang
similarity index 100%
rename from htdocs/langs/es_BO/sendings.lang
rename to public/langs/es_BO/sendings.lang
diff --git a/htdocs/langs/es_BO/sms.lang b/public/langs/es_BO/sms.lang
similarity index 100%
rename from htdocs/langs/es_BO/sms.lang
rename to public/langs/es_BO/sms.lang
diff --git a/htdocs/langs/es_BO/stocks.lang b/public/langs/es_BO/stocks.lang
similarity index 100%
rename from htdocs/langs/es_BO/stocks.lang
rename to public/langs/es_BO/stocks.lang
diff --git a/htdocs/langs/es_BO/supplier_proposal.lang b/public/langs/es_BO/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/es_BO/supplier_proposal.lang
rename to public/langs/es_BO/supplier_proposal.lang
diff --git a/htdocs/langs/es_BO/suppliers.lang b/public/langs/es_BO/suppliers.lang
similarity index 100%
rename from htdocs/langs/es_BO/suppliers.lang
rename to public/langs/es_BO/suppliers.lang
diff --git a/htdocs/langs/es_BO/trips.lang b/public/langs/es_BO/trips.lang
similarity index 100%
rename from htdocs/langs/es_BO/trips.lang
rename to public/langs/es_BO/trips.lang
diff --git a/htdocs/langs/es_BO/users.lang b/public/langs/es_BO/users.lang
similarity index 100%
rename from htdocs/langs/es_BO/users.lang
rename to public/langs/es_BO/users.lang
diff --git a/htdocs/langs/es_BO/website.lang b/public/langs/es_BO/website.lang
similarity index 100%
rename from htdocs/langs/es_BO/website.lang
rename to public/langs/es_BO/website.lang
diff --git a/htdocs/langs/es_BO/withdrawals.lang b/public/langs/es_BO/withdrawals.lang
similarity index 100%
rename from htdocs/langs/es_BO/withdrawals.lang
rename to public/langs/es_BO/withdrawals.lang
diff --git a/htdocs/langs/es_BO/workflow.lang b/public/langs/es_BO/workflow.lang
similarity index 100%
rename from htdocs/langs/es_BO/workflow.lang
rename to public/langs/es_BO/workflow.lang
diff --git a/htdocs/langs/es_CL/accountancy.lang b/public/langs/es_CL/accountancy.lang
similarity index 100%
rename from htdocs/langs/es_CL/accountancy.lang
rename to public/langs/es_CL/accountancy.lang
diff --git a/htdocs/langs/es_CL/admin.lang b/public/langs/es_CL/admin.lang
similarity index 100%
rename from htdocs/langs/es_CL/admin.lang
rename to public/langs/es_CL/admin.lang
diff --git a/htdocs/langs/es_CL/agenda.lang b/public/langs/es_CL/agenda.lang
similarity index 100%
rename from htdocs/langs/es_CL/agenda.lang
rename to public/langs/es_CL/agenda.lang
diff --git a/htdocs/langs/es_CL/banks.lang b/public/langs/es_CL/banks.lang
similarity index 100%
rename from htdocs/langs/es_CL/banks.lang
rename to public/langs/es_CL/banks.lang
diff --git a/htdocs/langs/es_CL/bills.lang b/public/langs/es_CL/bills.lang
similarity index 100%
rename from htdocs/langs/es_CL/bills.lang
rename to public/langs/es_CL/bills.lang
diff --git a/htdocs/langs/es_CL/bookmarks.lang b/public/langs/es_CL/bookmarks.lang
similarity index 100%
rename from htdocs/langs/es_CL/bookmarks.lang
rename to public/langs/es_CL/bookmarks.lang
diff --git a/htdocs/langs/es_CL/boxes.lang b/public/langs/es_CL/boxes.lang
similarity index 100%
rename from htdocs/langs/es_CL/boxes.lang
rename to public/langs/es_CL/boxes.lang
diff --git a/htdocs/langs/es_CL/cashdesk.lang b/public/langs/es_CL/cashdesk.lang
similarity index 100%
rename from htdocs/langs/es_CL/cashdesk.lang
rename to public/langs/es_CL/cashdesk.lang
diff --git a/htdocs/langs/es_CL/categories.lang b/public/langs/es_CL/categories.lang
similarity index 100%
rename from htdocs/langs/es_CL/categories.lang
rename to public/langs/es_CL/categories.lang
diff --git a/htdocs/langs/es_CL/commercial.lang b/public/langs/es_CL/commercial.lang
similarity index 100%
rename from htdocs/langs/es_CL/commercial.lang
rename to public/langs/es_CL/commercial.lang
diff --git a/htdocs/langs/es_CL/companies.lang b/public/langs/es_CL/companies.lang
similarity index 100%
rename from htdocs/langs/es_CL/companies.lang
rename to public/langs/es_CL/companies.lang
diff --git a/htdocs/langs/es_CL/compta.lang b/public/langs/es_CL/compta.lang
similarity index 100%
rename from htdocs/langs/es_CL/compta.lang
rename to public/langs/es_CL/compta.lang
diff --git a/htdocs/langs/es_CL/contracts.lang b/public/langs/es_CL/contracts.lang
similarity index 100%
rename from htdocs/langs/es_CL/contracts.lang
rename to public/langs/es_CL/contracts.lang
diff --git a/htdocs/langs/es_CL/cron.lang b/public/langs/es_CL/cron.lang
similarity index 100%
rename from htdocs/langs/es_CL/cron.lang
rename to public/langs/es_CL/cron.lang
diff --git a/htdocs/langs/es_CL/deliveries.lang b/public/langs/es_CL/deliveries.lang
similarity index 100%
rename from htdocs/langs/es_CL/deliveries.lang
rename to public/langs/es_CL/deliveries.lang
diff --git a/htdocs/langs/es_CL/dict.lang b/public/langs/es_CL/dict.lang
similarity index 100%
rename from htdocs/langs/es_CL/dict.lang
rename to public/langs/es_CL/dict.lang
diff --git a/htdocs/langs/es_CL/donations.lang b/public/langs/es_CL/donations.lang
similarity index 100%
rename from htdocs/langs/es_CL/donations.lang
rename to public/langs/es_CL/donations.lang
diff --git a/htdocs/langs/es_CL/ecm.lang b/public/langs/es_CL/ecm.lang
similarity index 100%
rename from htdocs/langs/es_CL/ecm.lang
rename to public/langs/es_CL/ecm.lang
diff --git a/htdocs/langs/es_CL/errors.lang b/public/langs/es_CL/errors.lang
similarity index 100%
rename from htdocs/langs/es_CL/errors.lang
rename to public/langs/es_CL/errors.lang
diff --git a/htdocs/langs/es_CL/exports.lang b/public/langs/es_CL/exports.lang
similarity index 100%
rename from htdocs/langs/es_CL/exports.lang
rename to public/langs/es_CL/exports.lang
diff --git a/htdocs/langs/es_CL/externalsite.lang b/public/langs/es_CL/externalsite.lang
similarity index 100%
rename from htdocs/langs/es_CL/externalsite.lang
rename to public/langs/es_CL/externalsite.lang
diff --git a/htdocs/langs/es_CL/ftp.lang b/public/langs/es_CL/ftp.lang
similarity index 100%
rename from htdocs/langs/es_CL/ftp.lang
rename to public/langs/es_CL/ftp.lang
diff --git a/htdocs/langs/es_CL/help.lang b/public/langs/es_CL/help.lang
similarity index 100%
rename from htdocs/langs/es_CL/help.lang
rename to public/langs/es_CL/help.lang
diff --git a/htdocs/langs/es_CL/holiday.lang b/public/langs/es_CL/holiday.lang
similarity index 100%
rename from htdocs/langs/es_CL/holiday.lang
rename to public/langs/es_CL/holiday.lang
diff --git a/htdocs/langs/es_CL/hrm.lang b/public/langs/es_CL/hrm.lang
similarity index 100%
rename from htdocs/langs/es_CL/hrm.lang
rename to public/langs/es_CL/hrm.lang
diff --git a/htdocs/langs/es_CL/incoterm.lang b/public/langs/es_CL/incoterm.lang
similarity index 100%
rename from htdocs/langs/es_CL/incoterm.lang
rename to public/langs/es_CL/incoterm.lang
diff --git a/htdocs/langs/es_CL/install.lang b/public/langs/es_CL/install.lang
similarity index 100%
rename from htdocs/langs/es_CL/install.lang
rename to public/langs/es_CL/install.lang
diff --git a/htdocs/langs/es_CL/interventions.lang b/public/langs/es_CL/interventions.lang
similarity index 100%
rename from htdocs/langs/es_CL/interventions.lang
rename to public/langs/es_CL/interventions.lang
diff --git a/htdocs/langs/es_CL/languages.lang b/public/langs/es_CL/languages.lang
similarity index 100%
rename from htdocs/langs/es_CL/languages.lang
rename to public/langs/es_CL/languages.lang
diff --git a/htdocs/langs/es_CL/ldap.lang b/public/langs/es_CL/ldap.lang
similarity index 100%
rename from htdocs/langs/es_CL/ldap.lang
rename to public/langs/es_CL/ldap.lang
diff --git a/htdocs/langs/es_CL/link.lang b/public/langs/es_CL/link.lang
similarity index 100%
rename from htdocs/langs/es_CL/link.lang
rename to public/langs/es_CL/link.lang
diff --git a/htdocs/langs/es_CL/loan.lang b/public/langs/es_CL/loan.lang
similarity index 100%
rename from htdocs/langs/es_CL/loan.lang
rename to public/langs/es_CL/loan.lang
diff --git a/htdocs/langs/es_CL/mailmanspip.lang b/public/langs/es_CL/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/es_CL/mailmanspip.lang
rename to public/langs/es_CL/mailmanspip.lang
diff --git a/htdocs/langs/es_CL/mails.lang b/public/langs/es_CL/mails.lang
similarity index 100%
rename from htdocs/langs/es_CL/mails.lang
rename to public/langs/es_CL/mails.lang
diff --git a/htdocs/langs/es_CL/main.lang b/public/langs/es_CL/main.lang
similarity index 100%
rename from htdocs/langs/es_CL/main.lang
rename to public/langs/es_CL/main.lang
diff --git a/htdocs/langs/es_CL/margins.lang b/public/langs/es_CL/margins.lang
similarity index 100%
rename from htdocs/langs/es_CL/margins.lang
rename to public/langs/es_CL/margins.lang
diff --git a/htdocs/langs/es_CL/members.lang b/public/langs/es_CL/members.lang
similarity index 100%
rename from htdocs/langs/es_CL/members.lang
rename to public/langs/es_CL/members.lang
diff --git a/htdocs/langs/es_CL/oauth.lang b/public/langs/es_CL/oauth.lang
similarity index 100%
rename from htdocs/langs/es_CL/oauth.lang
rename to public/langs/es_CL/oauth.lang
diff --git a/htdocs/langs/es_CL/opensurvey.lang b/public/langs/es_CL/opensurvey.lang
similarity index 100%
rename from htdocs/langs/es_CL/opensurvey.lang
rename to public/langs/es_CL/opensurvey.lang
diff --git a/htdocs/langs/es_CL/orders.lang b/public/langs/es_CL/orders.lang
similarity index 100%
rename from htdocs/langs/es_CL/orders.lang
rename to public/langs/es_CL/orders.lang
diff --git a/htdocs/langs/es_CL/other.lang b/public/langs/es_CL/other.lang
similarity index 100%
rename from htdocs/langs/es_CL/other.lang
rename to public/langs/es_CL/other.lang
diff --git a/htdocs/langs/es_CL/paybox.lang b/public/langs/es_CL/paybox.lang
similarity index 100%
rename from htdocs/langs/es_CL/paybox.lang
rename to public/langs/es_CL/paybox.lang
diff --git a/htdocs/langs/es_CL/paypal.lang b/public/langs/es_CL/paypal.lang
similarity index 100%
rename from htdocs/langs/es_CL/paypal.lang
rename to public/langs/es_CL/paypal.lang
diff --git a/htdocs/langs/es_CL/printing.lang b/public/langs/es_CL/printing.lang
similarity index 100%
rename from htdocs/langs/es_CL/printing.lang
rename to public/langs/es_CL/printing.lang
diff --git a/htdocs/langs/es_CL/productbatch.lang b/public/langs/es_CL/productbatch.lang
similarity index 100%
rename from htdocs/langs/es_CL/productbatch.lang
rename to public/langs/es_CL/productbatch.lang
diff --git a/htdocs/langs/es_CL/products.lang b/public/langs/es_CL/products.lang
similarity index 100%
rename from htdocs/langs/es_CL/products.lang
rename to public/langs/es_CL/products.lang
diff --git a/htdocs/langs/es_CL/projects.lang b/public/langs/es_CL/projects.lang
similarity index 100%
rename from htdocs/langs/es_CL/projects.lang
rename to public/langs/es_CL/projects.lang
diff --git a/htdocs/langs/es_CL/propal.lang b/public/langs/es_CL/propal.lang
similarity index 100%
rename from htdocs/langs/es_CL/propal.lang
rename to public/langs/es_CL/propal.lang
diff --git a/htdocs/langs/es_CL/receiptprinter.lang b/public/langs/es_CL/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/es_CL/receiptprinter.lang
rename to public/langs/es_CL/receiptprinter.lang
diff --git a/htdocs/langs/es_CL/resource.lang b/public/langs/es_CL/resource.lang
similarity index 100%
rename from htdocs/langs/es_CL/resource.lang
rename to public/langs/es_CL/resource.lang
diff --git a/htdocs/langs/es_CL/salaries.lang b/public/langs/es_CL/salaries.lang
similarity index 100%
rename from htdocs/langs/es_CL/salaries.lang
rename to public/langs/es_CL/salaries.lang
diff --git a/htdocs/langs/es_CL/sendings.lang b/public/langs/es_CL/sendings.lang
similarity index 100%
rename from htdocs/langs/es_CL/sendings.lang
rename to public/langs/es_CL/sendings.lang
diff --git a/htdocs/langs/es_CL/sms.lang b/public/langs/es_CL/sms.lang
similarity index 100%
rename from htdocs/langs/es_CL/sms.lang
rename to public/langs/es_CL/sms.lang
diff --git a/htdocs/langs/es_CL/stocks.lang b/public/langs/es_CL/stocks.lang
similarity index 100%
rename from htdocs/langs/es_CL/stocks.lang
rename to public/langs/es_CL/stocks.lang
diff --git a/htdocs/langs/es_CL/supplier_proposal.lang b/public/langs/es_CL/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/es_CL/supplier_proposal.lang
rename to public/langs/es_CL/supplier_proposal.lang
diff --git a/htdocs/langs/es_CL/suppliers.lang b/public/langs/es_CL/suppliers.lang
similarity index 100%
rename from htdocs/langs/es_CL/suppliers.lang
rename to public/langs/es_CL/suppliers.lang
diff --git a/htdocs/langs/es_CL/trips.lang b/public/langs/es_CL/trips.lang
similarity index 100%
rename from htdocs/langs/es_CL/trips.lang
rename to public/langs/es_CL/trips.lang
diff --git a/htdocs/langs/es_CL/users.lang b/public/langs/es_CL/users.lang
similarity index 100%
rename from htdocs/langs/es_CL/users.lang
rename to public/langs/es_CL/users.lang
diff --git a/htdocs/langs/es_CL/website.lang b/public/langs/es_CL/website.lang
similarity index 100%
rename from htdocs/langs/es_CL/website.lang
rename to public/langs/es_CL/website.lang
diff --git a/htdocs/langs/es_CL/withdrawals.lang b/public/langs/es_CL/withdrawals.lang
similarity index 100%
rename from htdocs/langs/es_CL/withdrawals.lang
rename to public/langs/es_CL/withdrawals.lang
diff --git a/htdocs/langs/es_CL/workflow.lang b/public/langs/es_CL/workflow.lang
similarity index 100%
rename from htdocs/langs/es_CL/workflow.lang
rename to public/langs/es_CL/workflow.lang
diff --git a/htdocs/langs/es_CO/accountancy.lang b/public/langs/es_CO/accountancy.lang
similarity index 100%
rename from htdocs/langs/es_CO/accountancy.lang
rename to public/langs/es_CO/accountancy.lang
diff --git a/htdocs/langs/es_CO/admin.lang b/public/langs/es_CO/admin.lang
similarity index 100%
rename from htdocs/langs/es_CO/admin.lang
rename to public/langs/es_CO/admin.lang
diff --git a/htdocs/langs/es_CO/agenda.lang b/public/langs/es_CO/agenda.lang
similarity index 100%
rename from htdocs/langs/es_CO/agenda.lang
rename to public/langs/es_CO/agenda.lang
diff --git a/htdocs/langs/es_CO/banks.lang b/public/langs/es_CO/banks.lang
similarity index 100%
rename from htdocs/langs/es_CO/banks.lang
rename to public/langs/es_CO/banks.lang
diff --git a/htdocs/langs/es_CO/bills.lang b/public/langs/es_CO/bills.lang
similarity index 100%
rename from htdocs/langs/es_CO/bills.lang
rename to public/langs/es_CO/bills.lang
diff --git a/htdocs/langs/es_CO/bookmarks.lang b/public/langs/es_CO/bookmarks.lang
similarity index 100%
rename from htdocs/langs/es_CO/bookmarks.lang
rename to public/langs/es_CO/bookmarks.lang
diff --git a/htdocs/langs/es_CO/boxes.lang b/public/langs/es_CO/boxes.lang
similarity index 100%
rename from htdocs/langs/es_CO/boxes.lang
rename to public/langs/es_CO/boxes.lang
diff --git a/htdocs/langs/es_CO/cashdesk.lang b/public/langs/es_CO/cashdesk.lang
similarity index 100%
rename from htdocs/langs/es_CO/cashdesk.lang
rename to public/langs/es_CO/cashdesk.lang
diff --git a/htdocs/langs/es_CO/categories.lang b/public/langs/es_CO/categories.lang
similarity index 100%
rename from htdocs/langs/es_CO/categories.lang
rename to public/langs/es_CO/categories.lang
diff --git a/htdocs/langs/es_CO/commercial.lang b/public/langs/es_CO/commercial.lang
similarity index 100%
rename from htdocs/langs/es_CO/commercial.lang
rename to public/langs/es_CO/commercial.lang
diff --git a/htdocs/langs/es_CO/companies.lang b/public/langs/es_CO/companies.lang
similarity index 100%
rename from htdocs/langs/es_CO/companies.lang
rename to public/langs/es_CO/companies.lang
diff --git a/htdocs/langs/es_CO/compta.lang b/public/langs/es_CO/compta.lang
similarity index 100%
rename from htdocs/langs/es_CO/compta.lang
rename to public/langs/es_CO/compta.lang
diff --git a/htdocs/langs/es_CO/contracts.lang b/public/langs/es_CO/contracts.lang
similarity index 100%
rename from htdocs/langs/es_CO/contracts.lang
rename to public/langs/es_CO/contracts.lang
diff --git a/htdocs/langs/es_CO/cron.lang b/public/langs/es_CO/cron.lang
similarity index 100%
rename from htdocs/langs/es_CO/cron.lang
rename to public/langs/es_CO/cron.lang
diff --git a/htdocs/langs/es_CO/deliveries.lang b/public/langs/es_CO/deliveries.lang
similarity index 100%
rename from htdocs/langs/es_CO/deliveries.lang
rename to public/langs/es_CO/deliveries.lang
diff --git a/htdocs/langs/es_CO/dict.lang b/public/langs/es_CO/dict.lang
similarity index 100%
rename from htdocs/langs/es_CO/dict.lang
rename to public/langs/es_CO/dict.lang
diff --git a/htdocs/langs/es_CO/donations.lang b/public/langs/es_CO/donations.lang
similarity index 100%
rename from htdocs/langs/es_CO/donations.lang
rename to public/langs/es_CO/donations.lang
diff --git a/htdocs/langs/es_CO/ecm.lang b/public/langs/es_CO/ecm.lang
similarity index 100%
rename from htdocs/langs/es_CO/ecm.lang
rename to public/langs/es_CO/ecm.lang
diff --git a/htdocs/langs/es_CO/errors.lang b/public/langs/es_CO/errors.lang
similarity index 100%
rename from htdocs/langs/es_CO/errors.lang
rename to public/langs/es_CO/errors.lang
diff --git a/htdocs/langs/es_CO/exports.lang b/public/langs/es_CO/exports.lang
similarity index 100%
rename from htdocs/langs/es_CO/exports.lang
rename to public/langs/es_CO/exports.lang
diff --git a/htdocs/langs/es_CO/externalsite.lang b/public/langs/es_CO/externalsite.lang
similarity index 100%
rename from htdocs/langs/es_CO/externalsite.lang
rename to public/langs/es_CO/externalsite.lang
diff --git a/htdocs/langs/es_CO/ftp.lang b/public/langs/es_CO/ftp.lang
similarity index 100%
rename from htdocs/langs/es_CO/ftp.lang
rename to public/langs/es_CO/ftp.lang
diff --git a/htdocs/langs/es_CO/help.lang b/public/langs/es_CO/help.lang
similarity index 100%
rename from htdocs/langs/es_CO/help.lang
rename to public/langs/es_CO/help.lang
diff --git a/htdocs/langs/es_CO/holiday.lang b/public/langs/es_CO/holiday.lang
similarity index 100%
rename from htdocs/langs/es_CO/holiday.lang
rename to public/langs/es_CO/holiday.lang
diff --git a/htdocs/langs/es_CO/hrm.lang b/public/langs/es_CO/hrm.lang
similarity index 100%
rename from htdocs/langs/es_CO/hrm.lang
rename to public/langs/es_CO/hrm.lang
diff --git a/htdocs/langs/es_CO/incoterm.lang b/public/langs/es_CO/incoterm.lang
similarity index 100%
rename from htdocs/langs/es_CO/incoterm.lang
rename to public/langs/es_CO/incoterm.lang
diff --git a/htdocs/langs/es_CO/install.lang b/public/langs/es_CO/install.lang
similarity index 100%
rename from htdocs/langs/es_CO/install.lang
rename to public/langs/es_CO/install.lang
diff --git a/htdocs/langs/es_CO/interventions.lang b/public/langs/es_CO/interventions.lang
similarity index 100%
rename from htdocs/langs/es_CO/interventions.lang
rename to public/langs/es_CO/interventions.lang
diff --git a/htdocs/langs/es_CO/languages.lang b/public/langs/es_CO/languages.lang
similarity index 100%
rename from htdocs/langs/es_CO/languages.lang
rename to public/langs/es_CO/languages.lang
diff --git a/htdocs/langs/es_CO/ldap.lang b/public/langs/es_CO/ldap.lang
similarity index 100%
rename from htdocs/langs/es_CO/ldap.lang
rename to public/langs/es_CO/ldap.lang
diff --git a/htdocs/langs/es_CO/link.lang b/public/langs/es_CO/link.lang
similarity index 100%
rename from htdocs/langs/es_CO/link.lang
rename to public/langs/es_CO/link.lang
diff --git a/htdocs/langs/es_CO/loan.lang b/public/langs/es_CO/loan.lang
similarity index 100%
rename from htdocs/langs/es_CO/loan.lang
rename to public/langs/es_CO/loan.lang
diff --git a/htdocs/langs/es_CO/mailmanspip.lang b/public/langs/es_CO/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/es_CO/mailmanspip.lang
rename to public/langs/es_CO/mailmanspip.lang
diff --git a/htdocs/langs/es_CO/mails.lang b/public/langs/es_CO/mails.lang
similarity index 100%
rename from htdocs/langs/es_CO/mails.lang
rename to public/langs/es_CO/mails.lang
diff --git a/htdocs/langs/es_CO/main.lang b/public/langs/es_CO/main.lang
similarity index 100%
rename from htdocs/langs/es_CO/main.lang
rename to public/langs/es_CO/main.lang
diff --git a/htdocs/langs/es_CO/margins.lang b/public/langs/es_CO/margins.lang
similarity index 100%
rename from htdocs/langs/es_CO/margins.lang
rename to public/langs/es_CO/margins.lang
diff --git a/htdocs/langs/es_CO/members.lang b/public/langs/es_CO/members.lang
similarity index 100%
rename from htdocs/langs/es_CO/members.lang
rename to public/langs/es_CO/members.lang
diff --git a/htdocs/langs/es_CO/oauth.lang b/public/langs/es_CO/oauth.lang
similarity index 100%
rename from htdocs/langs/es_CO/oauth.lang
rename to public/langs/es_CO/oauth.lang
diff --git a/htdocs/langs/es_CO/opensurvey.lang b/public/langs/es_CO/opensurvey.lang
similarity index 100%
rename from htdocs/langs/es_CO/opensurvey.lang
rename to public/langs/es_CO/opensurvey.lang
diff --git a/htdocs/langs/es_CO/orders.lang b/public/langs/es_CO/orders.lang
similarity index 100%
rename from htdocs/langs/es_CO/orders.lang
rename to public/langs/es_CO/orders.lang
diff --git a/htdocs/langs/es_CO/other.lang b/public/langs/es_CO/other.lang
similarity index 100%
rename from htdocs/langs/es_CO/other.lang
rename to public/langs/es_CO/other.lang
diff --git a/htdocs/langs/es_CO/paybox.lang b/public/langs/es_CO/paybox.lang
similarity index 100%
rename from htdocs/langs/es_CO/paybox.lang
rename to public/langs/es_CO/paybox.lang
diff --git a/htdocs/langs/es_CO/paypal.lang b/public/langs/es_CO/paypal.lang
similarity index 100%
rename from htdocs/langs/es_CO/paypal.lang
rename to public/langs/es_CO/paypal.lang
diff --git a/htdocs/langs/es_CO/printing.lang b/public/langs/es_CO/printing.lang
similarity index 100%
rename from htdocs/langs/es_CO/printing.lang
rename to public/langs/es_CO/printing.lang
diff --git a/htdocs/langs/es_CO/productbatch.lang b/public/langs/es_CO/productbatch.lang
similarity index 100%
rename from htdocs/langs/es_CO/productbatch.lang
rename to public/langs/es_CO/productbatch.lang
diff --git a/htdocs/langs/es_CO/products.lang b/public/langs/es_CO/products.lang
similarity index 100%
rename from htdocs/langs/es_CO/products.lang
rename to public/langs/es_CO/products.lang
diff --git a/htdocs/langs/es_CO/projects.lang b/public/langs/es_CO/projects.lang
similarity index 100%
rename from htdocs/langs/es_CO/projects.lang
rename to public/langs/es_CO/projects.lang
diff --git a/htdocs/langs/es_CO/propal.lang b/public/langs/es_CO/propal.lang
similarity index 100%
rename from htdocs/langs/es_CO/propal.lang
rename to public/langs/es_CO/propal.lang
diff --git a/htdocs/langs/es_CO/receiptprinter.lang b/public/langs/es_CO/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/es_CO/receiptprinter.lang
rename to public/langs/es_CO/receiptprinter.lang
diff --git a/htdocs/langs/es_CO/resource.lang b/public/langs/es_CO/resource.lang
similarity index 100%
rename from htdocs/langs/es_CO/resource.lang
rename to public/langs/es_CO/resource.lang
diff --git a/htdocs/langs/es_CO/salaries.lang b/public/langs/es_CO/salaries.lang
similarity index 100%
rename from htdocs/langs/es_CO/salaries.lang
rename to public/langs/es_CO/salaries.lang
diff --git a/htdocs/langs/es_CO/sendings.lang b/public/langs/es_CO/sendings.lang
similarity index 100%
rename from htdocs/langs/es_CO/sendings.lang
rename to public/langs/es_CO/sendings.lang
diff --git a/htdocs/langs/es_CO/sms.lang b/public/langs/es_CO/sms.lang
similarity index 100%
rename from htdocs/langs/es_CO/sms.lang
rename to public/langs/es_CO/sms.lang
diff --git a/htdocs/langs/es_CO/stocks.lang b/public/langs/es_CO/stocks.lang
similarity index 100%
rename from htdocs/langs/es_CO/stocks.lang
rename to public/langs/es_CO/stocks.lang
diff --git a/htdocs/langs/es_CO/supplier_proposal.lang b/public/langs/es_CO/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/es_CO/supplier_proposal.lang
rename to public/langs/es_CO/supplier_proposal.lang
diff --git a/htdocs/langs/es_CO/suppliers.lang b/public/langs/es_CO/suppliers.lang
similarity index 100%
rename from htdocs/langs/es_CO/suppliers.lang
rename to public/langs/es_CO/suppliers.lang
diff --git a/htdocs/langs/es_CO/trips.lang b/public/langs/es_CO/trips.lang
similarity index 100%
rename from htdocs/langs/es_CO/trips.lang
rename to public/langs/es_CO/trips.lang
diff --git a/htdocs/langs/es_CO/users.lang b/public/langs/es_CO/users.lang
similarity index 100%
rename from htdocs/langs/es_CO/users.lang
rename to public/langs/es_CO/users.lang
diff --git a/htdocs/langs/es_CO/website.lang b/public/langs/es_CO/website.lang
similarity index 100%
rename from htdocs/langs/es_CO/website.lang
rename to public/langs/es_CO/website.lang
diff --git a/htdocs/langs/es_CO/withdrawals.lang b/public/langs/es_CO/withdrawals.lang
similarity index 100%
rename from htdocs/langs/es_CO/withdrawals.lang
rename to public/langs/es_CO/withdrawals.lang
diff --git a/htdocs/langs/es_CO/workflow.lang b/public/langs/es_CO/workflow.lang
similarity index 100%
rename from htdocs/langs/es_CO/workflow.lang
rename to public/langs/es_CO/workflow.lang
diff --git a/htdocs/langs/es_DO/accountancy.lang b/public/langs/es_DO/accountancy.lang
similarity index 100%
rename from htdocs/langs/es_DO/accountancy.lang
rename to public/langs/es_DO/accountancy.lang
diff --git a/htdocs/langs/es_DO/admin.lang b/public/langs/es_DO/admin.lang
similarity index 100%
rename from htdocs/langs/es_DO/admin.lang
rename to public/langs/es_DO/admin.lang
diff --git a/htdocs/langs/es_DO/agenda.lang b/public/langs/es_DO/agenda.lang
similarity index 100%
rename from htdocs/langs/es_DO/agenda.lang
rename to public/langs/es_DO/agenda.lang
diff --git a/htdocs/langs/es_DO/banks.lang b/public/langs/es_DO/banks.lang
similarity index 100%
rename from htdocs/langs/es_DO/banks.lang
rename to public/langs/es_DO/banks.lang
diff --git a/htdocs/langs/es_DO/bills.lang b/public/langs/es_DO/bills.lang
similarity index 100%
rename from htdocs/langs/es_DO/bills.lang
rename to public/langs/es_DO/bills.lang
diff --git a/htdocs/langs/es_DO/bookmarks.lang b/public/langs/es_DO/bookmarks.lang
similarity index 100%
rename from htdocs/langs/es_DO/bookmarks.lang
rename to public/langs/es_DO/bookmarks.lang
diff --git a/htdocs/langs/es_DO/boxes.lang b/public/langs/es_DO/boxes.lang
similarity index 100%
rename from htdocs/langs/es_DO/boxes.lang
rename to public/langs/es_DO/boxes.lang
diff --git a/htdocs/langs/es_DO/cashdesk.lang b/public/langs/es_DO/cashdesk.lang
similarity index 100%
rename from htdocs/langs/es_DO/cashdesk.lang
rename to public/langs/es_DO/cashdesk.lang
diff --git a/htdocs/langs/es_DO/categories.lang b/public/langs/es_DO/categories.lang
similarity index 100%
rename from htdocs/langs/es_DO/categories.lang
rename to public/langs/es_DO/categories.lang
diff --git a/htdocs/langs/es_DO/commercial.lang b/public/langs/es_DO/commercial.lang
similarity index 100%
rename from htdocs/langs/es_DO/commercial.lang
rename to public/langs/es_DO/commercial.lang
diff --git a/htdocs/langs/es_DO/companies.lang b/public/langs/es_DO/companies.lang
similarity index 100%
rename from htdocs/langs/es_DO/companies.lang
rename to public/langs/es_DO/companies.lang
diff --git a/htdocs/langs/es_DO/compta.lang b/public/langs/es_DO/compta.lang
similarity index 100%
rename from htdocs/langs/es_DO/compta.lang
rename to public/langs/es_DO/compta.lang
diff --git a/htdocs/langs/es_DO/contracts.lang b/public/langs/es_DO/contracts.lang
similarity index 100%
rename from htdocs/langs/es_DO/contracts.lang
rename to public/langs/es_DO/contracts.lang
diff --git a/htdocs/langs/es_DO/cron.lang b/public/langs/es_DO/cron.lang
similarity index 100%
rename from htdocs/langs/es_DO/cron.lang
rename to public/langs/es_DO/cron.lang
diff --git a/htdocs/langs/es_DO/deliveries.lang b/public/langs/es_DO/deliveries.lang
similarity index 100%
rename from htdocs/langs/es_DO/deliveries.lang
rename to public/langs/es_DO/deliveries.lang
diff --git a/htdocs/langs/es_DO/dict.lang b/public/langs/es_DO/dict.lang
similarity index 100%
rename from htdocs/langs/es_DO/dict.lang
rename to public/langs/es_DO/dict.lang
diff --git a/htdocs/langs/es_DO/donations.lang b/public/langs/es_DO/donations.lang
similarity index 100%
rename from htdocs/langs/es_DO/donations.lang
rename to public/langs/es_DO/donations.lang
diff --git a/htdocs/langs/es_DO/ecm.lang b/public/langs/es_DO/ecm.lang
similarity index 100%
rename from htdocs/langs/es_DO/ecm.lang
rename to public/langs/es_DO/ecm.lang
diff --git a/htdocs/langs/es_DO/errors.lang b/public/langs/es_DO/errors.lang
similarity index 100%
rename from htdocs/langs/es_DO/errors.lang
rename to public/langs/es_DO/errors.lang
diff --git a/htdocs/langs/es_DO/exports.lang b/public/langs/es_DO/exports.lang
similarity index 100%
rename from htdocs/langs/es_DO/exports.lang
rename to public/langs/es_DO/exports.lang
diff --git a/htdocs/langs/es_DO/externalsite.lang b/public/langs/es_DO/externalsite.lang
similarity index 100%
rename from htdocs/langs/es_DO/externalsite.lang
rename to public/langs/es_DO/externalsite.lang
diff --git a/htdocs/langs/es_DO/ftp.lang b/public/langs/es_DO/ftp.lang
similarity index 100%
rename from htdocs/langs/es_DO/ftp.lang
rename to public/langs/es_DO/ftp.lang
diff --git a/htdocs/langs/es_DO/help.lang b/public/langs/es_DO/help.lang
similarity index 100%
rename from htdocs/langs/es_DO/help.lang
rename to public/langs/es_DO/help.lang
diff --git a/htdocs/langs/es_DO/holiday.lang b/public/langs/es_DO/holiday.lang
similarity index 100%
rename from htdocs/langs/es_DO/holiday.lang
rename to public/langs/es_DO/holiday.lang
diff --git a/htdocs/langs/es_DO/hrm.lang b/public/langs/es_DO/hrm.lang
similarity index 100%
rename from htdocs/langs/es_DO/hrm.lang
rename to public/langs/es_DO/hrm.lang
diff --git a/htdocs/langs/es_DO/incoterm.lang b/public/langs/es_DO/incoterm.lang
similarity index 100%
rename from htdocs/langs/es_DO/incoterm.lang
rename to public/langs/es_DO/incoterm.lang
diff --git a/htdocs/langs/es_DO/install.lang b/public/langs/es_DO/install.lang
similarity index 100%
rename from htdocs/langs/es_DO/install.lang
rename to public/langs/es_DO/install.lang
diff --git a/htdocs/langs/es_DO/interventions.lang b/public/langs/es_DO/interventions.lang
similarity index 100%
rename from htdocs/langs/es_DO/interventions.lang
rename to public/langs/es_DO/interventions.lang
diff --git a/htdocs/langs/es_DO/languages.lang b/public/langs/es_DO/languages.lang
similarity index 100%
rename from htdocs/langs/es_DO/languages.lang
rename to public/langs/es_DO/languages.lang
diff --git a/htdocs/langs/es_DO/ldap.lang b/public/langs/es_DO/ldap.lang
similarity index 100%
rename from htdocs/langs/es_DO/ldap.lang
rename to public/langs/es_DO/ldap.lang
diff --git a/htdocs/langs/es_DO/link.lang b/public/langs/es_DO/link.lang
similarity index 100%
rename from htdocs/langs/es_DO/link.lang
rename to public/langs/es_DO/link.lang
diff --git a/htdocs/langs/es_DO/loan.lang b/public/langs/es_DO/loan.lang
similarity index 100%
rename from htdocs/langs/es_DO/loan.lang
rename to public/langs/es_DO/loan.lang
diff --git a/htdocs/langs/es_DO/mailmanspip.lang b/public/langs/es_DO/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/es_DO/mailmanspip.lang
rename to public/langs/es_DO/mailmanspip.lang
diff --git a/htdocs/langs/es_DO/mails.lang b/public/langs/es_DO/mails.lang
similarity index 100%
rename from htdocs/langs/es_DO/mails.lang
rename to public/langs/es_DO/mails.lang
diff --git a/htdocs/langs/es_DO/main.lang b/public/langs/es_DO/main.lang
similarity index 100%
rename from htdocs/langs/es_DO/main.lang
rename to public/langs/es_DO/main.lang
diff --git a/htdocs/langs/es_DO/margins.lang b/public/langs/es_DO/margins.lang
similarity index 100%
rename from htdocs/langs/es_DO/margins.lang
rename to public/langs/es_DO/margins.lang
diff --git a/htdocs/langs/es_DO/members.lang b/public/langs/es_DO/members.lang
similarity index 100%
rename from htdocs/langs/es_DO/members.lang
rename to public/langs/es_DO/members.lang
diff --git a/htdocs/langs/es_DO/oauth.lang b/public/langs/es_DO/oauth.lang
similarity index 100%
rename from htdocs/langs/es_DO/oauth.lang
rename to public/langs/es_DO/oauth.lang
diff --git a/htdocs/langs/es_DO/opensurvey.lang b/public/langs/es_DO/opensurvey.lang
similarity index 100%
rename from htdocs/langs/es_DO/opensurvey.lang
rename to public/langs/es_DO/opensurvey.lang
diff --git a/htdocs/langs/es_DO/orders.lang b/public/langs/es_DO/orders.lang
similarity index 100%
rename from htdocs/langs/es_DO/orders.lang
rename to public/langs/es_DO/orders.lang
diff --git a/htdocs/langs/es_DO/other.lang b/public/langs/es_DO/other.lang
similarity index 100%
rename from htdocs/langs/es_DO/other.lang
rename to public/langs/es_DO/other.lang
diff --git a/htdocs/langs/es_DO/paybox.lang b/public/langs/es_DO/paybox.lang
similarity index 100%
rename from htdocs/langs/es_DO/paybox.lang
rename to public/langs/es_DO/paybox.lang
diff --git a/htdocs/langs/es_DO/paypal.lang b/public/langs/es_DO/paypal.lang
similarity index 100%
rename from htdocs/langs/es_DO/paypal.lang
rename to public/langs/es_DO/paypal.lang
diff --git a/htdocs/langs/es_DO/printing.lang b/public/langs/es_DO/printing.lang
similarity index 100%
rename from htdocs/langs/es_DO/printing.lang
rename to public/langs/es_DO/printing.lang
diff --git a/htdocs/langs/es_DO/productbatch.lang b/public/langs/es_DO/productbatch.lang
similarity index 100%
rename from htdocs/langs/es_DO/productbatch.lang
rename to public/langs/es_DO/productbatch.lang
diff --git a/htdocs/langs/es_DO/products.lang b/public/langs/es_DO/products.lang
similarity index 100%
rename from htdocs/langs/es_DO/products.lang
rename to public/langs/es_DO/products.lang
diff --git a/htdocs/langs/es_DO/projects.lang b/public/langs/es_DO/projects.lang
similarity index 100%
rename from htdocs/langs/es_DO/projects.lang
rename to public/langs/es_DO/projects.lang
diff --git a/htdocs/langs/es_DO/propal.lang b/public/langs/es_DO/propal.lang
similarity index 100%
rename from htdocs/langs/es_DO/propal.lang
rename to public/langs/es_DO/propal.lang
diff --git a/htdocs/langs/es_DO/receiptprinter.lang b/public/langs/es_DO/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/es_DO/receiptprinter.lang
rename to public/langs/es_DO/receiptprinter.lang
diff --git a/htdocs/langs/es_DO/resource.lang b/public/langs/es_DO/resource.lang
similarity index 100%
rename from htdocs/langs/es_DO/resource.lang
rename to public/langs/es_DO/resource.lang
diff --git a/htdocs/langs/es_DO/salaries.lang b/public/langs/es_DO/salaries.lang
similarity index 100%
rename from htdocs/langs/es_DO/salaries.lang
rename to public/langs/es_DO/salaries.lang
diff --git a/htdocs/langs/es_DO/sendings.lang b/public/langs/es_DO/sendings.lang
similarity index 100%
rename from htdocs/langs/es_DO/sendings.lang
rename to public/langs/es_DO/sendings.lang
diff --git a/htdocs/langs/es_DO/sms.lang b/public/langs/es_DO/sms.lang
similarity index 100%
rename from htdocs/langs/es_DO/sms.lang
rename to public/langs/es_DO/sms.lang
diff --git a/htdocs/langs/es_DO/stocks.lang b/public/langs/es_DO/stocks.lang
similarity index 100%
rename from htdocs/langs/es_DO/stocks.lang
rename to public/langs/es_DO/stocks.lang
diff --git a/htdocs/langs/es_DO/supplier_proposal.lang b/public/langs/es_DO/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/es_DO/supplier_proposal.lang
rename to public/langs/es_DO/supplier_proposal.lang
diff --git a/htdocs/langs/es_DO/suppliers.lang b/public/langs/es_DO/suppliers.lang
similarity index 100%
rename from htdocs/langs/es_DO/suppliers.lang
rename to public/langs/es_DO/suppliers.lang
diff --git a/htdocs/langs/es_DO/trips.lang b/public/langs/es_DO/trips.lang
similarity index 100%
rename from htdocs/langs/es_DO/trips.lang
rename to public/langs/es_DO/trips.lang
diff --git a/htdocs/langs/es_DO/users.lang b/public/langs/es_DO/users.lang
similarity index 100%
rename from htdocs/langs/es_DO/users.lang
rename to public/langs/es_DO/users.lang
diff --git a/htdocs/langs/es_DO/website.lang b/public/langs/es_DO/website.lang
similarity index 100%
rename from htdocs/langs/es_DO/website.lang
rename to public/langs/es_DO/website.lang
diff --git a/htdocs/langs/es_DO/withdrawals.lang b/public/langs/es_DO/withdrawals.lang
similarity index 100%
rename from htdocs/langs/es_DO/withdrawals.lang
rename to public/langs/es_DO/withdrawals.lang
diff --git a/htdocs/langs/es_DO/workflow.lang b/public/langs/es_DO/workflow.lang
similarity index 100%
rename from htdocs/langs/es_DO/workflow.lang
rename to public/langs/es_DO/workflow.lang
diff --git a/htdocs/langs/es_EC/accountancy.lang b/public/langs/es_EC/accountancy.lang
similarity index 100%
rename from htdocs/langs/es_EC/accountancy.lang
rename to public/langs/es_EC/accountancy.lang
diff --git a/htdocs/langs/es_EC/admin.lang b/public/langs/es_EC/admin.lang
similarity index 100%
rename from htdocs/langs/es_EC/admin.lang
rename to public/langs/es_EC/admin.lang
diff --git a/htdocs/langs/es_EC/agenda.lang b/public/langs/es_EC/agenda.lang
similarity index 100%
rename from htdocs/langs/es_EC/agenda.lang
rename to public/langs/es_EC/agenda.lang
diff --git a/htdocs/langs/es_EC/banks.lang b/public/langs/es_EC/banks.lang
similarity index 100%
rename from htdocs/langs/es_EC/banks.lang
rename to public/langs/es_EC/banks.lang
diff --git a/htdocs/langs/es_EC/bills.lang b/public/langs/es_EC/bills.lang
similarity index 100%
rename from htdocs/langs/es_EC/bills.lang
rename to public/langs/es_EC/bills.lang
diff --git a/htdocs/langs/es_EC/bookmarks.lang b/public/langs/es_EC/bookmarks.lang
similarity index 100%
rename from htdocs/langs/es_EC/bookmarks.lang
rename to public/langs/es_EC/bookmarks.lang
diff --git a/htdocs/langs/es_EC/boxes.lang b/public/langs/es_EC/boxes.lang
similarity index 100%
rename from htdocs/langs/es_EC/boxes.lang
rename to public/langs/es_EC/boxes.lang
diff --git a/htdocs/langs/es_EC/cashdesk.lang b/public/langs/es_EC/cashdesk.lang
similarity index 100%
rename from htdocs/langs/es_EC/cashdesk.lang
rename to public/langs/es_EC/cashdesk.lang
diff --git a/htdocs/langs/es_EC/categories.lang b/public/langs/es_EC/categories.lang
similarity index 100%
rename from htdocs/langs/es_EC/categories.lang
rename to public/langs/es_EC/categories.lang
diff --git a/htdocs/langs/es_EC/commercial.lang b/public/langs/es_EC/commercial.lang
similarity index 100%
rename from htdocs/langs/es_EC/commercial.lang
rename to public/langs/es_EC/commercial.lang
diff --git a/htdocs/langs/es_EC/companies.lang b/public/langs/es_EC/companies.lang
similarity index 100%
rename from htdocs/langs/es_EC/companies.lang
rename to public/langs/es_EC/companies.lang
diff --git a/htdocs/langs/es_EC/compta.lang b/public/langs/es_EC/compta.lang
similarity index 100%
rename from htdocs/langs/es_EC/compta.lang
rename to public/langs/es_EC/compta.lang
diff --git a/htdocs/langs/es_EC/contracts.lang b/public/langs/es_EC/contracts.lang
similarity index 100%
rename from htdocs/langs/es_EC/contracts.lang
rename to public/langs/es_EC/contracts.lang
diff --git a/htdocs/langs/es_EC/cron.lang b/public/langs/es_EC/cron.lang
similarity index 100%
rename from htdocs/langs/es_EC/cron.lang
rename to public/langs/es_EC/cron.lang
diff --git a/htdocs/langs/es_EC/deliveries.lang b/public/langs/es_EC/deliveries.lang
similarity index 100%
rename from htdocs/langs/es_EC/deliveries.lang
rename to public/langs/es_EC/deliveries.lang
diff --git a/htdocs/langs/es_EC/dict.lang b/public/langs/es_EC/dict.lang
similarity index 100%
rename from htdocs/langs/es_EC/dict.lang
rename to public/langs/es_EC/dict.lang
diff --git a/htdocs/langs/es_EC/donations.lang b/public/langs/es_EC/donations.lang
similarity index 100%
rename from htdocs/langs/es_EC/donations.lang
rename to public/langs/es_EC/donations.lang
diff --git a/htdocs/langs/es_EC/ecm.lang b/public/langs/es_EC/ecm.lang
similarity index 100%
rename from htdocs/langs/es_EC/ecm.lang
rename to public/langs/es_EC/ecm.lang
diff --git a/htdocs/langs/es_EC/errors.lang b/public/langs/es_EC/errors.lang
similarity index 100%
rename from htdocs/langs/es_EC/errors.lang
rename to public/langs/es_EC/errors.lang
diff --git a/htdocs/langs/es_EC/exports.lang b/public/langs/es_EC/exports.lang
similarity index 100%
rename from htdocs/langs/es_EC/exports.lang
rename to public/langs/es_EC/exports.lang
diff --git a/htdocs/langs/es_EC/externalsite.lang b/public/langs/es_EC/externalsite.lang
similarity index 100%
rename from htdocs/langs/es_EC/externalsite.lang
rename to public/langs/es_EC/externalsite.lang
diff --git a/htdocs/langs/es_EC/ftp.lang b/public/langs/es_EC/ftp.lang
similarity index 100%
rename from htdocs/langs/es_EC/ftp.lang
rename to public/langs/es_EC/ftp.lang
diff --git a/htdocs/langs/es_EC/help.lang b/public/langs/es_EC/help.lang
similarity index 100%
rename from htdocs/langs/es_EC/help.lang
rename to public/langs/es_EC/help.lang
diff --git a/htdocs/langs/es_EC/holiday.lang b/public/langs/es_EC/holiday.lang
similarity index 100%
rename from htdocs/langs/es_EC/holiday.lang
rename to public/langs/es_EC/holiday.lang
diff --git a/htdocs/langs/es_EC/hrm.lang b/public/langs/es_EC/hrm.lang
similarity index 100%
rename from htdocs/langs/es_EC/hrm.lang
rename to public/langs/es_EC/hrm.lang
diff --git a/htdocs/langs/es_EC/incoterm.lang b/public/langs/es_EC/incoterm.lang
similarity index 100%
rename from htdocs/langs/es_EC/incoterm.lang
rename to public/langs/es_EC/incoterm.lang
diff --git a/htdocs/langs/es_EC/install.lang b/public/langs/es_EC/install.lang
similarity index 100%
rename from htdocs/langs/es_EC/install.lang
rename to public/langs/es_EC/install.lang
diff --git a/htdocs/langs/es_EC/interventions.lang b/public/langs/es_EC/interventions.lang
similarity index 100%
rename from htdocs/langs/es_EC/interventions.lang
rename to public/langs/es_EC/interventions.lang
diff --git a/htdocs/langs/es_EC/languages.lang b/public/langs/es_EC/languages.lang
similarity index 100%
rename from htdocs/langs/es_EC/languages.lang
rename to public/langs/es_EC/languages.lang
diff --git a/htdocs/langs/es_EC/ldap.lang b/public/langs/es_EC/ldap.lang
similarity index 100%
rename from htdocs/langs/es_EC/ldap.lang
rename to public/langs/es_EC/ldap.lang
diff --git a/htdocs/langs/es_EC/link.lang b/public/langs/es_EC/link.lang
similarity index 100%
rename from htdocs/langs/es_EC/link.lang
rename to public/langs/es_EC/link.lang
diff --git a/htdocs/langs/es_EC/loan.lang b/public/langs/es_EC/loan.lang
similarity index 100%
rename from htdocs/langs/es_EC/loan.lang
rename to public/langs/es_EC/loan.lang
diff --git a/htdocs/langs/es_EC/mailmanspip.lang b/public/langs/es_EC/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/es_EC/mailmanspip.lang
rename to public/langs/es_EC/mailmanspip.lang
diff --git a/htdocs/langs/es_EC/mails.lang b/public/langs/es_EC/mails.lang
similarity index 100%
rename from htdocs/langs/es_EC/mails.lang
rename to public/langs/es_EC/mails.lang
diff --git a/htdocs/langs/es_EC/main.lang b/public/langs/es_EC/main.lang
similarity index 100%
rename from htdocs/langs/es_EC/main.lang
rename to public/langs/es_EC/main.lang
diff --git a/htdocs/langs/es_EC/margins.lang b/public/langs/es_EC/margins.lang
similarity index 100%
rename from htdocs/langs/es_EC/margins.lang
rename to public/langs/es_EC/margins.lang
diff --git a/htdocs/langs/es_EC/members.lang b/public/langs/es_EC/members.lang
similarity index 100%
rename from htdocs/langs/es_EC/members.lang
rename to public/langs/es_EC/members.lang
diff --git a/htdocs/langs/es_EC/oauth.lang b/public/langs/es_EC/oauth.lang
similarity index 100%
rename from htdocs/langs/es_EC/oauth.lang
rename to public/langs/es_EC/oauth.lang
diff --git a/htdocs/langs/es_EC/opensurvey.lang b/public/langs/es_EC/opensurvey.lang
similarity index 100%
rename from htdocs/langs/es_EC/opensurvey.lang
rename to public/langs/es_EC/opensurvey.lang
diff --git a/htdocs/langs/es_EC/orders.lang b/public/langs/es_EC/orders.lang
similarity index 100%
rename from htdocs/langs/es_EC/orders.lang
rename to public/langs/es_EC/orders.lang
diff --git a/htdocs/langs/es_EC/other.lang b/public/langs/es_EC/other.lang
similarity index 100%
rename from htdocs/langs/es_EC/other.lang
rename to public/langs/es_EC/other.lang
diff --git a/htdocs/langs/es_EC/paybox.lang b/public/langs/es_EC/paybox.lang
similarity index 100%
rename from htdocs/langs/es_EC/paybox.lang
rename to public/langs/es_EC/paybox.lang
diff --git a/htdocs/langs/es_EC/paypal.lang b/public/langs/es_EC/paypal.lang
similarity index 100%
rename from htdocs/langs/es_EC/paypal.lang
rename to public/langs/es_EC/paypal.lang
diff --git a/htdocs/langs/es_EC/printing.lang b/public/langs/es_EC/printing.lang
similarity index 100%
rename from htdocs/langs/es_EC/printing.lang
rename to public/langs/es_EC/printing.lang
diff --git a/htdocs/langs/es_EC/productbatch.lang b/public/langs/es_EC/productbatch.lang
similarity index 100%
rename from htdocs/langs/es_EC/productbatch.lang
rename to public/langs/es_EC/productbatch.lang
diff --git a/htdocs/langs/es_EC/products.lang b/public/langs/es_EC/products.lang
similarity index 100%
rename from htdocs/langs/es_EC/products.lang
rename to public/langs/es_EC/products.lang
diff --git a/htdocs/langs/es_EC/projects.lang b/public/langs/es_EC/projects.lang
similarity index 100%
rename from htdocs/langs/es_EC/projects.lang
rename to public/langs/es_EC/projects.lang
diff --git a/htdocs/langs/es_EC/propal.lang b/public/langs/es_EC/propal.lang
similarity index 100%
rename from htdocs/langs/es_EC/propal.lang
rename to public/langs/es_EC/propal.lang
diff --git a/htdocs/langs/es_EC/receiptprinter.lang b/public/langs/es_EC/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/es_EC/receiptprinter.lang
rename to public/langs/es_EC/receiptprinter.lang
diff --git a/htdocs/langs/es_EC/resource.lang b/public/langs/es_EC/resource.lang
similarity index 100%
rename from htdocs/langs/es_EC/resource.lang
rename to public/langs/es_EC/resource.lang
diff --git a/htdocs/langs/es_EC/salaries.lang b/public/langs/es_EC/salaries.lang
similarity index 100%
rename from htdocs/langs/es_EC/salaries.lang
rename to public/langs/es_EC/salaries.lang
diff --git a/htdocs/langs/es_EC/sendings.lang b/public/langs/es_EC/sendings.lang
similarity index 100%
rename from htdocs/langs/es_EC/sendings.lang
rename to public/langs/es_EC/sendings.lang
diff --git a/htdocs/langs/es_EC/sms.lang b/public/langs/es_EC/sms.lang
similarity index 100%
rename from htdocs/langs/es_EC/sms.lang
rename to public/langs/es_EC/sms.lang
diff --git a/htdocs/langs/es_EC/stocks.lang b/public/langs/es_EC/stocks.lang
similarity index 100%
rename from htdocs/langs/es_EC/stocks.lang
rename to public/langs/es_EC/stocks.lang
diff --git a/htdocs/langs/es_EC/supplier_proposal.lang b/public/langs/es_EC/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/es_EC/supplier_proposal.lang
rename to public/langs/es_EC/supplier_proposal.lang
diff --git a/htdocs/langs/es_EC/suppliers.lang b/public/langs/es_EC/suppliers.lang
similarity index 100%
rename from htdocs/langs/es_EC/suppliers.lang
rename to public/langs/es_EC/suppliers.lang
diff --git a/htdocs/langs/es_EC/trips.lang b/public/langs/es_EC/trips.lang
similarity index 100%
rename from htdocs/langs/es_EC/trips.lang
rename to public/langs/es_EC/trips.lang
diff --git a/htdocs/langs/es_EC/users.lang b/public/langs/es_EC/users.lang
similarity index 100%
rename from htdocs/langs/es_EC/users.lang
rename to public/langs/es_EC/users.lang
diff --git a/htdocs/langs/es_EC/website.lang b/public/langs/es_EC/website.lang
similarity index 100%
rename from htdocs/langs/es_EC/website.lang
rename to public/langs/es_EC/website.lang
diff --git a/htdocs/langs/es_EC/withdrawals.lang b/public/langs/es_EC/withdrawals.lang
similarity index 100%
rename from htdocs/langs/es_EC/withdrawals.lang
rename to public/langs/es_EC/withdrawals.lang
diff --git a/htdocs/langs/es_EC/workflow.lang b/public/langs/es_EC/workflow.lang
similarity index 100%
rename from htdocs/langs/es_EC/workflow.lang
rename to public/langs/es_EC/workflow.lang
diff --git a/htdocs/langs/es_ES/accountancy.lang b/public/langs/es_ES/accountancy.lang
similarity index 100%
rename from htdocs/langs/es_ES/accountancy.lang
rename to public/langs/es_ES/accountancy.lang
diff --git a/htdocs/langs/es_ES/admin.lang b/public/langs/es_ES/admin.lang
similarity index 100%
rename from htdocs/langs/es_ES/admin.lang
rename to public/langs/es_ES/admin.lang
diff --git a/htdocs/langs/es_ES/agenda.lang b/public/langs/es_ES/agenda.lang
similarity index 100%
rename from htdocs/langs/es_ES/agenda.lang
rename to public/langs/es_ES/agenda.lang
diff --git a/htdocs/langs/es_ES/banks.lang b/public/langs/es_ES/banks.lang
similarity index 100%
rename from htdocs/langs/es_ES/banks.lang
rename to public/langs/es_ES/banks.lang
diff --git a/htdocs/langs/es_ES/bills.lang b/public/langs/es_ES/bills.lang
similarity index 100%
rename from htdocs/langs/es_ES/bills.lang
rename to public/langs/es_ES/bills.lang
diff --git a/htdocs/langs/es_ES/bookmarks.lang b/public/langs/es_ES/bookmarks.lang
similarity index 100%
rename from htdocs/langs/es_ES/bookmarks.lang
rename to public/langs/es_ES/bookmarks.lang
diff --git a/htdocs/langs/es_ES/boxes.lang b/public/langs/es_ES/boxes.lang
similarity index 100%
rename from htdocs/langs/es_ES/boxes.lang
rename to public/langs/es_ES/boxes.lang
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/public/langs/es_ES/cashdesk.lang
similarity index 100%
rename from htdocs/langs/es_ES/cashdesk.lang
rename to public/langs/es_ES/cashdesk.lang
diff --git a/htdocs/langs/es_ES/categories.lang b/public/langs/es_ES/categories.lang
similarity index 100%
rename from htdocs/langs/es_ES/categories.lang
rename to public/langs/es_ES/categories.lang
diff --git a/htdocs/langs/es_ES/commercial.lang b/public/langs/es_ES/commercial.lang
similarity index 100%
rename from htdocs/langs/es_ES/commercial.lang
rename to public/langs/es_ES/commercial.lang
diff --git a/htdocs/langs/es_ES/companies.lang b/public/langs/es_ES/companies.lang
similarity index 100%
rename from htdocs/langs/es_ES/companies.lang
rename to public/langs/es_ES/companies.lang
diff --git a/htdocs/langs/es_ES/compta.lang b/public/langs/es_ES/compta.lang
similarity index 100%
rename from htdocs/langs/es_ES/compta.lang
rename to public/langs/es_ES/compta.lang
diff --git a/htdocs/langs/es_ES/contracts.lang b/public/langs/es_ES/contracts.lang
similarity index 100%
rename from htdocs/langs/es_ES/contracts.lang
rename to public/langs/es_ES/contracts.lang
diff --git a/htdocs/langs/es_ES/cron.lang b/public/langs/es_ES/cron.lang
similarity index 100%
rename from htdocs/langs/es_ES/cron.lang
rename to public/langs/es_ES/cron.lang
diff --git a/htdocs/langs/es_ES/deliveries.lang b/public/langs/es_ES/deliveries.lang
similarity index 100%
rename from htdocs/langs/es_ES/deliveries.lang
rename to public/langs/es_ES/deliveries.lang
diff --git a/htdocs/langs/es_ES/dict.lang b/public/langs/es_ES/dict.lang
similarity index 100%
rename from htdocs/langs/es_ES/dict.lang
rename to public/langs/es_ES/dict.lang
diff --git a/htdocs/langs/es_ES/donations.lang b/public/langs/es_ES/donations.lang
similarity index 100%
rename from htdocs/langs/es_ES/donations.lang
rename to public/langs/es_ES/donations.lang
diff --git a/htdocs/langs/es_ES/ecm.lang b/public/langs/es_ES/ecm.lang
similarity index 100%
rename from htdocs/langs/es_ES/ecm.lang
rename to public/langs/es_ES/ecm.lang
diff --git a/htdocs/langs/es_ES/errors.lang b/public/langs/es_ES/errors.lang
similarity index 100%
rename from htdocs/langs/es_ES/errors.lang
rename to public/langs/es_ES/errors.lang
diff --git a/htdocs/langs/es_ES/exports.lang b/public/langs/es_ES/exports.lang
similarity index 100%
rename from htdocs/langs/es_ES/exports.lang
rename to public/langs/es_ES/exports.lang
diff --git a/htdocs/langs/es_ES/externalsite.lang b/public/langs/es_ES/externalsite.lang
similarity index 100%
rename from htdocs/langs/es_ES/externalsite.lang
rename to public/langs/es_ES/externalsite.lang
diff --git a/htdocs/langs/es_ES/ftp.lang b/public/langs/es_ES/ftp.lang
similarity index 100%
rename from htdocs/langs/es_ES/ftp.lang
rename to public/langs/es_ES/ftp.lang
diff --git a/htdocs/langs/es_ES/help.lang b/public/langs/es_ES/help.lang
similarity index 100%
rename from htdocs/langs/es_ES/help.lang
rename to public/langs/es_ES/help.lang
diff --git a/htdocs/langs/es_ES/holiday.lang b/public/langs/es_ES/holiday.lang
similarity index 100%
rename from htdocs/langs/es_ES/holiday.lang
rename to public/langs/es_ES/holiday.lang
diff --git a/htdocs/langs/es_ES/hrm.lang b/public/langs/es_ES/hrm.lang
similarity index 100%
rename from htdocs/langs/es_ES/hrm.lang
rename to public/langs/es_ES/hrm.lang
diff --git a/htdocs/langs/es_ES/incoterm.lang b/public/langs/es_ES/incoterm.lang
similarity index 100%
rename from htdocs/langs/es_ES/incoterm.lang
rename to public/langs/es_ES/incoterm.lang
diff --git a/htdocs/langs/es_ES/install.lang b/public/langs/es_ES/install.lang
similarity index 100%
rename from htdocs/langs/es_ES/install.lang
rename to public/langs/es_ES/install.lang
diff --git a/htdocs/langs/es_ES/interventions.lang b/public/langs/es_ES/interventions.lang
similarity index 100%
rename from htdocs/langs/es_ES/interventions.lang
rename to public/langs/es_ES/interventions.lang
diff --git a/htdocs/langs/es_ES/languages.lang b/public/langs/es_ES/languages.lang
similarity index 100%
rename from htdocs/langs/es_ES/languages.lang
rename to public/langs/es_ES/languages.lang
diff --git a/htdocs/langs/es_ES/ldap.lang b/public/langs/es_ES/ldap.lang
similarity index 100%
rename from htdocs/langs/es_ES/ldap.lang
rename to public/langs/es_ES/ldap.lang
diff --git a/htdocs/langs/es_ES/link.lang b/public/langs/es_ES/link.lang
similarity index 100%
rename from htdocs/langs/es_ES/link.lang
rename to public/langs/es_ES/link.lang
diff --git a/htdocs/langs/es_ES/loan.lang b/public/langs/es_ES/loan.lang
similarity index 100%
rename from htdocs/langs/es_ES/loan.lang
rename to public/langs/es_ES/loan.lang
diff --git a/htdocs/langs/es_ES/mailmanspip.lang b/public/langs/es_ES/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/es_ES/mailmanspip.lang
rename to public/langs/es_ES/mailmanspip.lang
diff --git a/htdocs/langs/es_ES/mails.lang b/public/langs/es_ES/mails.lang
similarity index 100%
rename from htdocs/langs/es_ES/mails.lang
rename to public/langs/es_ES/mails.lang
diff --git a/htdocs/langs/es_ES/main.lang b/public/langs/es_ES/main.lang
similarity index 100%
rename from htdocs/langs/es_ES/main.lang
rename to public/langs/es_ES/main.lang
diff --git a/htdocs/langs/es_ES/margins.lang b/public/langs/es_ES/margins.lang
similarity index 100%
rename from htdocs/langs/es_ES/margins.lang
rename to public/langs/es_ES/margins.lang
diff --git a/htdocs/langs/es_ES/members.lang b/public/langs/es_ES/members.lang
similarity index 100%
rename from htdocs/langs/es_ES/members.lang
rename to public/langs/es_ES/members.lang
diff --git a/htdocs/langs/es_ES/oauth.lang b/public/langs/es_ES/oauth.lang
similarity index 100%
rename from htdocs/langs/es_ES/oauth.lang
rename to public/langs/es_ES/oauth.lang
diff --git a/htdocs/langs/es_ES/opensurvey.lang b/public/langs/es_ES/opensurvey.lang
similarity index 100%
rename from htdocs/langs/es_ES/opensurvey.lang
rename to public/langs/es_ES/opensurvey.lang
diff --git a/htdocs/langs/es_ES/orders.lang b/public/langs/es_ES/orders.lang
similarity index 100%
rename from htdocs/langs/es_ES/orders.lang
rename to public/langs/es_ES/orders.lang
diff --git a/htdocs/langs/es_ES/other.lang b/public/langs/es_ES/other.lang
similarity index 100%
rename from htdocs/langs/es_ES/other.lang
rename to public/langs/es_ES/other.lang
diff --git a/htdocs/langs/es_ES/paybox.lang b/public/langs/es_ES/paybox.lang
similarity index 100%
rename from htdocs/langs/es_ES/paybox.lang
rename to public/langs/es_ES/paybox.lang
diff --git a/htdocs/langs/es_ES/paypal.lang b/public/langs/es_ES/paypal.lang
similarity index 100%
rename from htdocs/langs/es_ES/paypal.lang
rename to public/langs/es_ES/paypal.lang
diff --git a/htdocs/langs/es_ES/printing.lang b/public/langs/es_ES/printing.lang
similarity index 100%
rename from htdocs/langs/es_ES/printing.lang
rename to public/langs/es_ES/printing.lang
diff --git a/htdocs/langs/es_ES/productbatch.lang b/public/langs/es_ES/productbatch.lang
similarity index 100%
rename from htdocs/langs/es_ES/productbatch.lang
rename to public/langs/es_ES/productbatch.lang
diff --git a/htdocs/langs/es_ES/products.lang b/public/langs/es_ES/products.lang
similarity index 100%
rename from htdocs/langs/es_ES/products.lang
rename to public/langs/es_ES/products.lang
diff --git a/htdocs/langs/es_ES/projects.lang b/public/langs/es_ES/projects.lang
similarity index 100%
rename from htdocs/langs/es_ES/projects.lang
rename to public/langs/es_ES/projects.lang
diff --git a/htdocs/langs/es_ES/propal.lang b/public/langs/es_ES/propal.lang
similarity index 100%
rename from htdocs/langs/es_ES/propal.lang
rename to public/langs/es_ES/propal.lang
diff --git a/htdocs/langs/es_ES/receiptprinter.lang b/public/langs/es_ES/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/es_ES/receiptprinter.lang
rename to public/langs/es_ES/receiptprinter.lang
diff --git a/htdocs/langs/es_ES/resource.lang b/public/langs/es_ES/resource.lang
similarity index 100%
rename from htdocs/langs/es_ES/resource.lang
rename to public/langs/es_ES/resource.lang
diff --git a/htdocs/langs/es_ES/salaries.lang b/public/langs/es_ES/salaries.lang
similarity index 100%
rename from htdocs/langs/es_ES/salaries.lang
rename to public/langs/es_ES/salaries.lang
diff --git a/htdocs/langs/es_ES/sendings.lang b/public/langs/es_ES/sendings.lang
similarity index 100%
rename from htdocs/langs/es_ES/sendings.lang
rename to public/langs/es_ES/sendings.lang
diff --git a/htdocs/langs/es_ES/sms.lang b/public/langs/es_ES/sms.lang
similarity index 100%
rename from htdocs/langs/es_ES/sms.lang
rename to public/langs/es_ES/sms.lang
diff --git a/htdocs/langs/es_ES/stocks.lang b/public/langs/es_ES/stocks.lang
similarity index 100%
rename from htdocs/langs/es_ES/stocks.lang
rename to public/langs/es_ES/stocks.lang
diff --git a/htdocs/langs/es_ES/supplier_proposal.lang b/public/langs/es_ES/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/es_ES/supplier_proposal.lang
rename to public/langs/es_ES/supplier_proposal.lang
diff --git a/htdocs/langs/es_ES/suppliers.lang b/public/langs/es_ES/suppliers.lang
similarity index 100%
rename from htdocs/langs/es_ES/suppliers.lang
rename to public/langs/es_ES/suppliers.lang
diff --git a/htdocs/langs/es_ES/trips.lang b/public/langs/es_ES/trips.lang
similarity index 100%
rename from htdocs/langs/es_ES/trips.lang
rename to public/langs/es_ES/trips.lang
diff --git a/htdocs/langs/es_ES/users.lang b/public/langs/es_ES/users.lang
similarity index 100%
rename from htdocs/langs/es_ES/users.lang
rename to public/langs/es_ES/users.lang
diff --git a/htdocs/langs/es_ES/website.lang b/public/langs/es_ES/website.lang
similarity index 100%
rename from htdocs/langs/es_ES/website.lang
rename to public/langs/es_ES/website.lang
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/public/langs/es_ES/withdrawals.lang
similarity index 100%
rename from htdocs/langs/es_ES/withdrawals.lang
rename to public/langs/es_ES/withdrawals.lang
diff --git a/htdocs/langs/es_ES/workflow.lang b/public/langs/es_ES/workflow.lang
similarity index 100%
rename from htdocs/langs/es_ES/workflow.lang
rename to public/langs/es_ES/workflow.lang
diff --git a/htdocs/langs/es_HN/admin.lang b/public/langs/es_HN/admin.lang
similarity index 100%
rename from htdocs/langs/es_HN/admin.lang
rename to public/langs/es_HN/admin.lang
diff --git a/htdocs/langs/es_HN/bills.lang b/public/langs/es_HN/bills.lang
similarity index 100%
rename from htdocs/langs/es_HN/bills.lang
rename to public/langs/es_HN/bills.lang
diff --git a/htdocs/langs/es_HN/companies.lang b/public/langs/es_HN/companies.lang
similarity index 100%
rename from htdocs/langs/es_HN/companies.lang
rename to public/langs/es_HN/companies.lang
diff --git a/htdocs/langs/es_HN/compta.lang b/public/langs/es_HN/compta.lang
similarity index 100%
rename from htdocs/langs/es_HN/compta.lang
rename to public/langs/es_HN/compta.lang
diff --git a/htdocs/langs/es_HN/main.lang b/public/langs/es_HN/main.lang
similarity index 100%
rename from htdocs/langs/es_HN/main.lang
rename to public/langs/es_HN/main.lang
diff --git a/htdocs/langs/es_HN/propal.lang b/public/langs/es_HN/propal.lang
similarity index 100%
rename from htdocs/langs/es_HN/propal.lang
rename to public/langs/es_HN/propal.lang
diff --git a/htdocs/langs/es_MX/accountancy.lang b/public/langs/es_MX/accountancy.lang
similarity index 100%
rename from htdocs/langs/es_MX/accountancy.lang
rename to public/langs/es_MX/accountancy.lang
diff --git a/htdocs/langs/es_MX/admin.lang b/public/langs/es_MX/admin.lang
similarity index 100%
rename from htdocs/langs/es_MX/admin.lang
rename to public/langs/es_MX/admin.lang
diff --git a/htdocs/langs/es_MX/agenda.lang b/public/langs/es_MX/agenda.lang
similarity index 100%
rename from htdocs/langs/es_MX/agenda.lang
rename to public/langs/es_MX/agenda.lang
diff --git a/htdocs/langs/es_MX/banks.lang b/public/langs/es_MX/banks.lang
similarity index 100%
rename from htdocs/langs/es_MX/banks.lang
rename to public/langs/es_MX/banks.lang
diff --git a/htdocs/langs/es_MX/bills.lang b/public/langs/es_MX/bills.lang
similarity index 100%
rename from htdocs/langs/es_MX/bills.lang
rename to public/langs/es_MX/bills.lang
diff --git a/htdocs/langs/es_MX/bookmarks.lang b/public/langs/es_MX/bookmarks.lang
similarity index 100%
rename from htdocs/langs/es_MX/bookmarks.lang
rename to public/langs/es_MX/bookmarks.lang
diff --git a/htdocs/langs/es_MX/boxes.lang b/public/langs/es_MX/boxes.lang
similarity index 100%
rename from htdocs/langs/es_MX/boxes.lang
rename to public/langs/es_MX/boxes.lang
diff --git a/htdocs/langs/es_MX/cashdesk.lang b/public/langs/es_MX/cashdesk.lang
similarity index 100%
rename from htdocs/langs/es_MX/cashdesk.lang
rename to public/langs/es_MX/cashdesk.lang
diff --git a/htdocs/langs/es_MX/categories.lang b/public/langs/es_MX/categories.lang
similarity index 100%
rename from htdocs/langs/es_MX/categories.lang
rename to public/langs/es_MX/categories.lang
diff --git a/htdocs/langs/es_MX/commercial.lang b/public/langs/es_MX/commercial.lang
similarity index 100%
rename from htdocs/langs/es_MX/commercial.lang
rename to public/langs/es_MX/commercial.lang
diff --git a/htdocs/langs/es_MX/companies.lang b/public/langs/es_MX/companies.lang
similarity index 100%
rename from htdocs/langs/es_MX/companies.lang
rename to public/langs/es_MX/companies.lang
diff --git a/htdocs/langs/es_MX/compta.lang b/public/langs/es_MX/compta.lang
similarity index 100%
rename from htdocs/langs/es_MX/compta.lang
rename to public/langs/es_MX/compta.lang
diff --git a/htdocs/langs/es_MX/contracts.lang b/public/langs/es_MX/contracts.lang
similarity index 100%
rename from htdocs/langs/es_MX/contracts.lang
rename to public/langs/es_MX/contracts.lang
diff --git a/htdocs/langs/es_MX/cron.lang b/public/langs/es_MX/cron.lang
similarity index 100%
rename from htdocs/langs/es_MX/cron.lang
rename to public/langs/es_MX/cron.lang
diff --git a/htdocs/langs/es_MX/deliveries.lang b/public/langs/es_MX/deliveries.lang
similarity index 100%
rename from htdocs/langs/es_MX/deliveries.lang
rename to public/langs/es_MX/deliveries.lang
diff --git a/htdocs/langs/es_MX/dict.lang b/public/langs/es_MX/dict.lang
similarity index 100%
rename from htdocs/langs/es_MX/dict.lang
rename to public/langs/es_MX/dict.lang
diff --git a/htdocs/langs/es_MX/donations.lang b/public/langs/es_MX/donations.lang
similarity index 100%
rename from htdocs/langs/es_MX/donations.lang
rename to public/langs/es_MX/donations.lang
diff --git a/htdocs/langs/es_MX/ecm.lang b/public/langs/es_MX/ecm.lang
similarity index 100%
rename from htdocs/langs/es_MX/ecm.lang
rename to public/langs/es_MX/ecm.lang
diff --git a/htdocs/langs/es_MX/errors.lang b/public/langs/es_MX/errors.lang
similarity index 100%
rename from htdocs/langs/es_MX/errors.lang
rename to public/langs/es_MX/errors.lang
diff --git a/htdocs/langs/es_MX/exports.lang b/public/langs/es_MX/exports.lang
similarity index 100%
rename from htdocs/langs/es_MX/exports.lang
rename to public/langs/es_MX/exports.lang
diff --git a/htdocs/langs/es_MX/externalsite.lang b/public/langs/es_MX/externalsite.lang
similarity index 100%
rename from htdocs/langs/es_MX/externalsite.lang
rename to public/langs/es_MX/externalsite.lang
diff --git a/htdocs/langs/es_MX/ftp.lang b/public/langs/es_MX/ftp.lang
similarity index 100%
rename from htdocs/langs/es_MX/ftp.lang
rename to public/langs/es_MX/ftp.lang
diff --git a/htdocs/langs/es_MX/help.lang b/public/langs/es_MX/help.lang
similarity index 100%
rename from htdocs/langs/es_MX/help.lang
rename to public/langs/es_MX/help.lang
diff --git a/htdocs/langs/es_MX/holiday.lang b/public/langs/es_MX/holiday.lang
similarity index 100%
rename from htdocs/langs/es_MX/holiday.lang
rename to public/langs/es_MX/holiday.lang
diff --git a/htdocs/langs/es_MX/hrm.lang b/public/langs/es_MX/hrm.lang
similarity index 100%
rename from htdocs/langs/es_MX/hrm.lang
rename to public/langs/es_MX/hrm.lang
diff --git a/htdocs/langs/es_MX/incoterm.lang b/public/langs/es_MX/incoterm.lang
similarity index 100%
rename from htdocs/langs/es_MX/incoterm.lang
rename to public/langs/es_MX/incoterm.lang
diff --git a/htdocs/langs/es_MX/install.lang b/public/langs/es_MX/install.lang
similarity index 100%
rename from htdocs/langs/es_MX/install.lang
rename to public/langs/es_MX/install.lang
diff --git a/htdocs/langs/es_MX/interventions.lang b/public/langs/es_MX/interventions.lang
similarity index 100%
rename from htdocs/langs/es_MX/interventions.lang
rename to public/langs/es_MX/interventions.lang
diff --git a/htdocs/langs/es_MX/languages.lang b/public/langs/es_MX/languages.lang
similarity index 100%
rename from htdocs/langs/es_MX/languages.lang
rename to public/langs/es_MX/languages.lang
diff --git a/htdocs/langs/es_MX/ldap.lang b/public/langs/es_MX/ldap.lang
similarity index 100%
rename from htdocs/langs/es_MX/ldap.lang
rename to public/langs/es_MX/ldap.lang
diff --git a/htdocs/langs/es_MX/link.lang b/public/langs/es_MX/link.lang
similarity index 100%
rename from htdocs/langs/es_MX/link.lang
rename to public/langs/es_MX/link.lang
diff --git a/htdocs/langs/es_MX/loan.lang b/public/langs/es_MX/loan.lang
similarity index 100%
rename from htdocs/langs/es_MX/loan.lang
rename to public/langs/es_MX/loan.lang
diff --git a/htdocs/langs/es_MX/mailmanspip.lang b/public/langs/es_MX/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/es_MX/mailmanspip.lang
rename to public/langs/es_MX/mailmanspip.lang
diff --git a/htdocs/langs/es_MX/mails.lang b/public/langs/es_MX/mails.lang
similarity index 100%
rename from htdocs/langs/es_MX/mails.lang
rename to public/langs/es_MX/mails.lang
diff --git a/htdocs/langs/es_MX/main.lang b/public/langs/es_MX/main.lang
similarity index 100%
rename from htdocs/langs/es_MX/main.lang
rename to public/langs/es_MX/main.lang
diff --git a/htdocs/langs/es_MX/margins.lang b/public/langs/es_MX/margins.lang
similarity index 100%
rename from htdocs/langs/es_MX/margins.lang
rename to public/langs/es_MX/margins.lang
diff --git a/htdocs/langs/es_MX/members.lang b/public/langs/es_MX/members.lang
similarity index 100%
rename from htdocs/langs/es_MX/members.lang
rename to public/langs/es_MX/members.lang
diff --git a/htdocs/langs/es_MX/oauth.lang b/public/langs/es_MX/oauth.lang
similarity index 100%
rename from htdocs/langs/es_MX/oauth.lang
rename to public/langs/es_MX/oauth.lang
diff --git a/htdocs/langs/es_MX/opensurvey.lang b/public/langs/es_MX/opensurvey.lang
similarity index 100%
rename from htdocs/langs/es_MX/opensurvey.lang
rename to public/langs/es_MX/opensurvey.lang
diff --git a/htdocs/langs/es_MX/orders.lang b/public/langs/es_MX/orders.lang
similarity index 100%
rename from htdocs/langs/es_MX/orders.lang
rename to public/langs/es_MX/orders.lang
diff --git a/htdocs/langs/es_MX/other.lang b/public/langs/es_MX/other.lang
similarity index 100%
rename from htdocs/langs/es_MX/other.lang
rename to public/langs/es_MX/other.lang
diff --git a/htdocs/langs/es_MX/paybox.lang b/public/langs/es_MX/paybox.lang
similarity index 100%
rename from htdocs/langs/es_MX/paybox.lang
rename to public/langs/es_MX/paybox.lang
diff --git a/htdocs/langs/es_MX/paypal.lang b/public/langs/es_MX/paypal.lang
similarity index 100%
rename from htdocs/langs/es_MX/paypal.lang
rename to public/langs/es_MX/paypal.lang
diff --git a/htdocs/langs/es_MX/printing.lang b/public/langs/es_MX/printing.lang
similarity index 100%
rename from htdocs/langs/es_MX/printing.lang
rename to public/langs/es_MX/printing.lang
diff --git a/htdocs/langs/es_MX/productbatch.lang b/public/langs/es_MX/productbatch.lang
similarity index 100%
rename from htdocs/langs/es_MX/productbatch.lang
rename to public/langs/es_MX/productbatch.lang
diff --git a/htdocs/langs/es_MX/products.lang b/public/langs/es_MX/products.lang
similarity index 100%
rename from htdocs/langs/es_MX/products.lang
rename to public/langs/es_MX/products.lang
diff --git a/htdocs/langs/es_MX/projects.lang b/public/langs/es_MX/projects.lang
similarity index 100%
rename from htdocs/langs/es_MX/projects.lang
rename to public/langs/es_MX/projects.lang
diff --git a/htdocs/langs/es_MX/propal.lang b/public/langs/es_MX/propal.lang
similarity index 100%
rename from htdocs/langs/es_MX/propal.lang
rename to public/langs/es_MX/propal.lang
diff --git a/htdocs/langs/es_MX/receiptprinter.lang b/public/langs/es_MX/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/es_MX/receiptprinter.lang
rename to public/langs/es_MX/receiptprinter.lang
diff --git a/htdocs/langs/es_MX/resource.lang b/public/langs/es_MX/resource.lang
similarity index 100%
rename from htdocs/langs/es_MX/resource.lang
rename to public/langs/es_MX/resource.lang
diff --git a/htdocs/langs/es_MX/salaries.lang b/public/langs/es_MX/salaries.lang
similarity index 100%
rename from htdocs/langs/es_MX/salaries.lang
rename to public/langs/es_MX/salaries.lang
diff --git a/htdocs/langs/es_MX/sendings.lang b/public/langs/es_MX/sendings.lang
similarity index 100%
rename from htdocs/langs/es_MX/sendings.lang
rename to public/langs/es_MX/sendings.lang
diff --git a/htdocs/langs/es_MX/sms.lang b/public/langs/es_MX/sms.lang
similarity index 100%
rename from htdocs/langs/es_MX/sms.lang
rename to public/langs/es_MX/sms.lang
diff --git a/htdocs/langs/es_MX/stocks.lang b/public/langs/es_MX/stocks.lang
similarity index 100%
rename from htdocs/langs/es_MX/stocks.lang
rename to public/langs/es_MX/stocks.lang
diff --git a/htdocs/langs/es_MX/supplier_proposal.lang b/public/langs/es_MX/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/es_MX/supplier_proposal.lang
rename to public/langs/es_MX/supplier_proposal.lang
diff --git a/htdocs/langs/es_MX/suppliers.lang b/public/langs/es_MX/suppliers.lang
similarity index 100%
rename from htdocs/langs/es_MX/suppliers.lang
rename to public/langs/es_MX/suppliers.lang
diff --git a/htdocs/langs/es_MX/trips.lang b/public/langs/es_MX/trips.lang
similarity index 100%
rename from htdocs/langs/es_MX/trips.lang
rename to public/langs/es_MX/trips.lang
diff --git a/htdocs/langs/es_MX/users.lang b/public/langs/es_MX/users.lang
similarity index 100%
rename from htdocs/langs/es_MX/users.lang
rename to public/langs/es_MX/users.lang
diff --git a/htdocs/langs/es_MX/website.lang b/public/langs/es_MX/website.lang
similarity index 100%
rename from htdocs/langs/es_MX/website.lang
rename to public/langs/es_MX/website.lang
diff --git a/htdocs/langs/es_MX/withdrawals.lang b/public/langs/es_MX/withdrawals.lang
similarity index 100%
rename from htdocs/langs/es_MX/withdrawals.lang
rename to public/langs/es_MX/withdrawals.lang
diff --git a/htdocs/langs/es_MX/workflow.lang b/public/langs/es_MX/workflow.lang
similarity index 100%
rename from htdocs/langs/es_MX/workflow.lang
rename to public/langs/es_MX/workflow.lang
diff --git a/htdocs/langs/es_PA/accountancy.lang b/public/langs/es_PA/accountancy.lang
similarity index 100%
rename from htdocs/langs/es_PA/accountancy.lang
rename to public/langs/es_PA/accountancy.lang
diff --git a/htdocs/langs/es_PA/admin.lang b/public/langs/es_PA/admin.lang
similarity index 100%
rename from htdocs/langs/es_PA/admin.lang
rename to public/langs/es_PA/admin.lang
diff --git a/htdocs/langs/es_PA/agenda.lang b/public/langs/es_PA/agenda.lang
similarity index 100%
rename from htdocs/langs/es_PA/agenda.lang
rename to public/langs/es_PA/agenda.lang
diff --git a/htdocs/langs/es_PA/banks.lang b/public/langs/es_PA/banks.lang
similarity index 100%
rename from htdocs/langs/es_PA/banks.lang
rename to public/langs/es_PA/banks.lang
diff --git a/htdocs/langs/es_PA/bills.lang b/public/langs/es_PA/bills.lang
similarity index 100%
rename from htdocs/langs/es_PA/bills.lang
rename to public/langs/es_PA/bills.lang
diff --git a/htdocs/langs/es_PA/bookmarks.lang b/public/langs/es_PA/bookmarks.lang
similarity index 100%
rename from htdocs/langs/es_PA/bookmarks.lang
rename to public/langs/es_PA/bookmarks.lang
diff --git a/htdocs/langs/es_PA/boxes.lang b/public/langs/es_PA/boxes.lang
similarity index 100%
rename from htdocs/langs/es_PA/boxes.lang
rename to public/langs/es_PA/boxes.lang
diff --git a/htdocs/langs/es_PA/cashdesk.lang b/public/langs/es_PA/cashdesk.lang
similarity index 100%
rename from htdocs/langs/es_PA/cashdesk.lang
rename to public/langs/es_PA/cashdesk.lang
diff --git a/htdocs/langs/es_PA/categories.lang b/public/langs/es_PA/categories.lang
similarity index 100%
rename from htdocs/langs/es_PA/categories.lang
rename to public/langs/es_PA/categories.lang
diff --git a/htdocs/langs/es_PA/commercial.lang b/public/langs/es_PA/commercial.lang
similarity index 100%
rename from htdocs/langs/es_PA/commercial.lang
rename to public/langs/es_PA/commercial.lang
diff --git a/htdocs/langs/es_PA/companies.lang b/public/langs/es_PA/companies.lang
similarity index 100%
rename from htdocs/langs/es_PA/companies.lang
rename to public/langs/es_PA/companies.lang
diff --git a/htdocs/langs/es_PA/compta.lang b/public/langs/es_PA/compta.lang
similarity index 100%
rename from htdocs/langs/es_PA/compta.lang
rename to public/langs/es_PA/compta.lang
diff --git a/htdocs/langs/es_PA/contracts.lang b/public/langs/es_PA/contracts.lang
similarity index 100%
rename from htdocs/langs/es_PA/contracts.lang
rename to public/langs/es_PA/contracts.lang
diff --git a/htdocs/langs/es_PA/cron.lang b/public/langs/es_PA/cron.lang
similarity index 100%
rename from htdocs/langs/es_PA/cron.lang
rename to public/langs/es_PA/cron.lang
diff --git a/htdocs/langs/es_PA/deliveries.lang b/public/langs/es_PA/deliveries.lang
similarity index 100%
rename from htdocs/langs/es_PA/deliveries.lang
rename to public/langs/es_PA/deliveries.lang
diff --git a/htdocs/langs/es_PA/dict.lang b/public/langs/es_PA/dict.lang
similarity index 100%
rename from htdocs/langs/es_PA/dict.lang
rename to public/langs/es_PA/dict.lang
diff --git a/htdocs/langs/es_PA/donations.lang b/public/langs/es_PA/donations.lang
similarity index 100%
rename from htdocs/langs/es_PA/donations.lang
rename to public/langs/es_PA/donations.lang
diff --git a/htdocs/langs/es_PA/ecm.lang b/public/langs/es_PA/ecm.lang
similarity index 100%
rename from htdocs/langs/es_PA/ecm.lang
rename to public/langs/es_PA/ecm.lang
diff --git a/htdocs/langs/es_PA/errors.lang b/public/langs/es_PA/errors.lang
similarity index 100%
rename from htdocs/langs/es_PA/errors.lang
rename to public/langs/es_PA/errors.lang
diff --git a/htdocs/langs/es_PA/exports.lang b/public/langs/es_PA/exports.lang
similarity index 100%
rename from htdocs/langs/es_PA/exports.lang
rename to public/langs/es_PA/exports.lang
diff --git a/htdocs/langs/es_PA/externalsite.lang b/public/langs/es_PA/externalsite.lang
similarity index 100%
rename from htdocs/langs/es_PA/externalsite.lang
rename to public/langs/es_PA/externalsite.lang
diff --git a/htdocs/langs/es_PA/ftp.lang b/public/langs/es_PA/ftp.lang
similarity index 100%
rename from htdocs/langs/es_PA/ftp.lang
rename to public/langs/es_PA/ftp.lang
diff --git a/htdocs/langs/es_PA/help.lang b/public/langs/es_PA/help.lang
similarity index 100%
rename from htdocs/langs/es_PA/help.lang
rename to public/langs/es_PA/help.lang
diff --git a/htdocs/langs/es_PA/holiday.lang b/public/langs/es_PA/holiday.lang
similarity index 100%
rename from htdocs/langs/es_PA/holiday.lang
rename to public/langs/es_PA/holiday.lang
diff --git a/htdocs/langs/es_PA/hrm.lang b/public/langs/es_PA/hrm.lang
similarity index 100%
rename from htdocs/langs/es_PA/hrm.lang
rename to public/langs/es_PA/hrm.lang
diff --git a/htdocs/langs/es_PA/incoterm.lang b/public/langs/es_PA/incoterm.lang
similarity index 100%
rename from htdocs/langs/es_PA/incoterm.lang
rename to public/langs/es_PA/incoterm.lang
diff --git a/htdocs/langs/es_PA/install.lang b/public/langs/es_PA/install.lang
similarity index 100%
rename from htdocs/langs/es_PA/install.lang
rename to public/langs/es_PA/install.lang
diff --git a/htdocs/langs/es_PA/interventions.lang b/public/langs/es_PA/interventions.lang
similarity index 100%
rename from htdocs/langs/es_PA/interventions.lang
rename to public/langs/es_PA/interventions.lang
diff --git a/htdocs/langs/es_PA/languages.lang b/public/langs/es_PA/languages.lang
similarity index 100%
rename from htdocs/langs/es_PA/languages.lang
rename to public/langs/es_PA/languages.lang
diff --git a/htdocs/langs/es_PA/ldap.lang b/public/langs/es_PA/ldap.lang
similarity index 100%
rename from htdocs/langs/es_PA/ldap.lang
rename to public/langs/es_PA/ldap.lang
diff --git a/htdocs/langs/es_PA/link.lang b/public/langs/es_PA/link.lang
similarity index 100%
rename from htdocs/langs/es_PA/link.lang
rename to public/langs/es_PA/link.lang
diff --git a/htdocs/langs/es_PA/loan.lang b/public/langs/es_PA/loan.lang
similarity index 100%
rename from htdocs/langs/es_PA/loan.lang
rename to public/langs/es_PA/loan.lang
diff --git a/htdocs/langs/es_PA/mailmanspip.lang b/public/langs/es_PA/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/es_PA/mailmanspip.lang
rename to public/langs/es_PA/mailmanspip.lang
diff --git a/htdocs/langs/es_PA/mails.lang b/public/langs/es_PA/mails.lang
similarity index 100%
rename from htdocs/langs/es_PA/mails.lang
rename to public/langs/es_PA/mails.lang
diff --git a/htdocs/langs/es_PA/main.lang b/public/langs/es_PA/main.lang
similarity index 100%
rename from htdocs/langs/es_PA/main.lang
rename to public/langs/es_PA/main.lang
diff --git a/htdocs/langs/es_PA/margins.lang b/public/langs/es_PA/margins.lang
similarity index 100%
rename from htdocs/langs/es_PA/margins.lang
rename to public/langs/es_PA/margins.lang
diff --git a/htdocs/langs/es_PA/members.lang b/public/langs/es_PA/members.lang
similarity index 100%
rename from htdocs/langs/es_PA/members.lang
rename to public/langs/es_PA/members.lang
diff --git a/htdocs/langs/es_PA/oauth.lang b/public/langs/es_PA/oauth.lang
similarity index 100%
rename from htdocs/langs/es_PA/oauth.lang
rename to public/langs/es_PA/oauth.lang
diff --git a/htdocs/langs/es_PA/opensurvey.lang b/public/langs/es_PA/opensurvey.lang
similarity index 100%
rename from htdocs/langs/es_PA/opensurvey.lang
rename to public/langs/es_PA/opensurvey.lang
diff --git a/htdocs/langs/es_PA/orders.lang b/public/langs/es_PA/orders.lang
similarity index 100%
rename from htdocs/langs/es_PA/orders.lang
rename to public/langs/es_PA/orders.lang
diff --git a/htdocs/langs/es_PA/other.lang b/public/langs/es_PA/other.lang
similarity index 100%
rename from htdocs/langs/es_PA/other.lang
rename to public/langs/es_PA/other.lang
diff --git a/htdocs/langs/es_PA/paybox.lang b/public/langs/es_PA/paybox.lang
similarity index 100%
rename from htdocs/langs/es_PA/paybox.lang
rename to public/langs/es_PA/paybox.lang
diff --git a/htdocs/langs/es_PA/paypal.lang b/public/langs/es_PA/paypal.lang
similarity index 100%
rename from htdocs/langs/es_PA/paypal.lang
rename to public/langs/es_PA/paypal.lang
diff --git a/htdocs/langs/es_PA/printing.lang b/public/langs/es_PA/printing.lang
similarity index 100%
rename from htdocs/langs/es_PA/printing.lang
rename to public/langs/es_PA/printing.lang
diff --git a/htdocs/langs/es_PA/productbatch.lang b/public/langs/es_PA/productbatch.lang
similarity index 100%
rename from htdocs/langs/es_PA/productbatch.lang
rename to public/langs/es_PA/productbatch.lang
diff --git a/htdocs/langs/es_PA/products.lang b/public/langs/es_PA/products.lang
similarity index 100%
rename from htdocs/langs/es_PA/products.lang
rename to public/langs/es_PA/products.lang
diff --git a/htdocs/langs/es_PA/projects.lang b/public/langs/es_PA/projects.lang
similarity index 100%
rename from htdocs/langs/es_PA/projects.lang
rename to public/langs/es_PA/projects.lang
diff --git a/htdocs/langs/es_PA/propal.lang b/public/langs/es_PA/propal.lang
similarity index 100%
rename from htdocs/langs/es_PA/propal.lang
rename to public/langs/es_PA/propal.lang
diff --git a/htdocs/langs/es_PA/receiptprinter.lang b/public/langs/es_PA/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/es_PA/receiptprinter.lang
rename to public/langs/es_PA/receiptprinter.lang
diff --git a/htdocs/langs/es_PA/resource.lang b/public/langs/es_PA/resource.lang
similarity index 100%
rename from htdocs/langs/es_PA/resource.lang
rename to public/langs/es_PA/resource.lang
diff --git a/htdocs/langs/es_PA/salaries.lang b/public/langs/es_PA/salaries.lang
similarity index 100%
rename from htdocs/langs/es_PA/salaries.lang
rename to public/langs/es_PA/salaries.lang
diff --git a/htdocs/langs/es_PA/sendings.lang b/public/langs/es_PA/sendings.lang
similarity index 100%
rename from htdocs/langs/es_PA/sendings.lang
rename to public/langs/es_PA/sendings.lang
diff --git a/htdocs/langs/es_PA/sms.lang b/public/langs/es_PA/sms.lang
similarity index 100%
rename from htdocs/langs/es_PA/sms.lang
rename to public/langs/es_PA/sms.lang
diff --git a/htdocs/langs/es_PA/stocks.lang b/public/langs/es_PA/stocks.lang
similarity index 100%
rename from htdocs/langs/es_PA/stocks.lang
rename to public/langs/es_PA/stocks.lang
diff --git a/htdocs/langs/es_PA/supplier_proposal.lang b/public/langs/es_PA/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/es_PA/supplier_proposal.lang
rename to public/langs/es_PA/supplier_proposal.lang
diff --git a/htdocs/langs/es_PA/suppliers.lang b/public/langs/es_PA/suppliers.lang
similarity index 100%
rename from htdocs/langs/es_PA/suppliers.lang
rename to public/langs/es_PA/suppliers.lang
diff --git a/htdocs/langs/es_PA/trips.lang b/public/langs/es_PA/trips.lang
similarity index 100%
rename from htdocs/langs/es_PA/trips.lang
rename to public/langs/es_PA/trips.lang
diff --git a/htdocs/langs/es_PA/users.lang b/public/langs/es_PA/users.lang
similarity index 100%
rename from htdocs/langs/es_PA/users.lang
rename to public/langs/es_PA/users.lang
diff --git a/htdocs/langs/es_PA/website.lang b/public/langs/es_PA/website.lang
similarity index 100%
rename from htdocs/langs/es_PA/website.lang
rename to public/langs/es_PA/website.lang
diff --git a/htdocs/langs/es_PA/withdrawals.lang b/public/langs/es_PA/withdrawals.lang
similarity index 100%
rename from htdocs/langs/es_PA/withdrawals.lang
rename to public/langs/es_PA/withdrawals.lang
diff --git a/htdocs/langs/es_PA/workflow.lang b/public/langs/es_PA/workflow.lang
similarity index 100%
rename from htdocs/langs/es_PA/workflow.lang
rename to public/langs/es_PA/workflow.lang
diff --git a/htdocs/langs/es_PE/accountancy.lang b/public/langs/es_PE/accountancy.lang
similarity index 100%
rename from htdocs/langs/es_PE/accountancy.lang
rename to public/langs/es_PE/accountancy.lang
diff --git a/htdocs/langs/es_PE/admin.lang b/public/langs/es_PE/admin.lang
similarity index 100%
rename from htdocs/langs/es_PE/admin.lang
rename to public/langs/es_PE/admin.lang
diff --git a/htdocs/langs/es_PE/agenda.lang b/public/langs/es_PE/agenda.lang
similarity index 100%
rename from htdocs/langs/es_PE/agenda.lang
rename to public/langs/es_PE/agenda.lang
diff --git a/htdocs/langs/es_PE/banks.lang b/public/langs/es_PE/banks.lang
similarity index 100%
rename from htdocs/langs/es_PE/banks.lang
rename to public/langs/es_PE/banks.lang
diff --git a/htdocs/langs/es_PE/bills.lang b/public/langs/es_PE/bills.lang
similarity index 100%
rename from htdocs/langs/es_PE/bills.lang
rename to public/langs/es_PE/bills.lang
diff --git a/htdocs/langs/es_PE/bookmarks.lang b/public/langs/es_PE/bookmarks.lang
similarity index 100%
rename from htdocs/langs/es_PE/bookmarks.lang
rename to public/langs/es_PE/bookmarks.lang
diff --git a/htdocs/langs/es_PE/boxes.lang b/public/langs/es_PE/boxes.lang
similarity index 100%
rename from htdocs/langs/es_PE/boxes.lang
rename to public/langs/es_PE/boxes.lang
diff --git a/htdocs/langs/es_PE/cashdesk.lang b/public/langs/es_PE/cashdesk.lang
similarity index 100%
rename from htdocs/langs/es_PE/cashdesk.lang
rename to public/langs/es_PE/cashdesk.lang
diff --git a/htdocs/langs/es_PE/categories.lang b/public/langs/es_PE/categories.lang
similarity index 100%
rename from htdocs/langs/es_PE/categories.lang
rename to public/langs/es_PE/categories.lang
diff --git a/htdocs/langs/es_PE/commercial.lang b/public/langs/es_PE/commercial.lang
similarity index 100%
rename from htdocs/langs/es_PE/commercial.lang
rename to public/langs/es_PE/commercial.lang
diff --git a/htdocs/langs/es_PE/companies.lang b/public/langs/es_PE/companies.lang
similarity index 100%
rename from htdocs/langs/es_PE/companies.lang
rename to public/langs/es_PE/companies.lang
diff --git a/htdocs/langs/es_PE/compta.lang b/public/langs/es_PE/compta.lang
similarity index 100%
rename from htdocs/langs/es_PE/compta.lang
rename to public/langs/es_PE/compta.lang
diff --git a/htdocs/langs/es_PE/contracts.lang b/public/langs/es_PE/contracts.lang
similarity index 100%
rename from htdocs/langs/es_PE/contracts.lang
rename to public/langs/es_PE/contracts.lang
diff --git a/htdocs/langs/es_PE/cron.lang b/public/langs/es_PE/cron.lang
similarity index 100%
rename from htdocs/langs/es_PE/cron.lang
rename to public/langs/es_PE/cron.lang
diff --git a/htdocs/langs/es_PE/deliveries.lang b/public/langs/es_PE/deliveries.lang
similarity index 100%
rename from htdocs/langs/es_PE/deliveries.lang
rename to public/langs/es_PE/deliveries.lang
diff --git a/htdocs/langs/es_PE/dict.lang b/public/langs/es_PE/dict.lang
similarity index 100%
rename from htdocs/langs/es_PE/dict.lang
rename to public/langs/es_PE/dict.lang
diff --git a/htdocs/langs/es_PE/donations.lang b/public/langs/es_PE/donations.lang
similarity index 100%
rename from htdocs/langs/es_PE/donations.lang
rename to public/langs/es_PE/donations.lang
diff --git a/htdocs/langs/es_PE/ecm.lang b/public/langs/es_PE/ecm.lang
similarity index 100%
rename from htdocs/langs/es_PE/ecm.lang
rename to public/langs/es_PE/ecm.lang
diff --git a/htdocs/langs/es_PE/errors.lang b/public/langs/es_PE/errors.lang
similarity index 100%
rename from htdocs/langs/es_PE/errors.lang
rename to public/langs/es_PE/errors.lang
diff --git a/htdocs/langs/es_PE/exports.lang b/public/langs/es_PE/exports.lang
similarity index 100%
rename from htdocs/langs/es_PE/exports.lang
rename to public/langs/es_PE/exports.lang
diff --git a/htdocs/langs/es_PE/externalsite.lang b/public/langs/es_PE/externalsite.lang
similarity index 100%
rename from htdocs/langs/es_PE/externalsite.lang
rename to public/langs/es_PE/externalsite.lang
diff --git a/htdocs/langs/es_PE/ftp.lang b/public/langs/es_PE/ftp.lang
similarity index 100%
rename from htdocs/langs/es_PE/ftp.lang
rename to public/langs/es_PE/ftp.lang
diff --git a/htdocs/langs/es_PE/help.lang b/public/langs/es_PE/help.lang
similarity index 100%
rename from htdocs/langs/es_PE/help.lang
rename to public/langs/es_PE/help.lang
diff --git a/htdocs/langs/es_PE/holiday.lang b/public/langs/es_PE/holiday.lang
similarity index 100%
rename from htdocs/langs/es_PE/holiday.lang
rename to public/langs/es_PE/holiday.lang
diff --git a/htdocs/langs/es_PE/hrm.lang b/public/langs/es_PE/hrm.lang
similarity index 100%
rename from htdocs/langs/es_PE/hrm.lang
rename to public/langs/es_PE/hrm.lang
diff --git a/htdocs/langs/es_PE/incoterm.lang b/public/langs/es_PE/incoterm.lang
similarity index 100%
rename from htdocs/langs/es_PE/incoterm.lang
rename to public/langs/es_PE/incoterm.lang
diff --git a/htdocs/langs/es_PE/install.lang b/public/langs/es_PE/install.lang
similarity index 100%
rename from htdocs/langs/es_PE/install.lang
rename to public/langs/es_PE/install.lang
diff --git a/htdocs/langs/es_PE/interventions.lang b/public/langs/es_PE/interventions.lang
similarity index 100%
rename from htdocs/langs/es_PE/interventions.lang
rename to public/langs/es_PE/interventions.lang
diff --git a/htdocs/langs/es_PE/languages.lang b/public/langs/es_PE/languages.lang
similarity index 100%
rename from htdocs/langs/es_PE/languages.lang
rename to public/langs/es_PE/languages.lang
diff --git a/htdocs/langs/es_PE/ldap.lang b/public/langs/es_PE/ldap.lang
similarity index 100%
rename from htdocs/langs/es_PE/ldap.lang
rename to public/langs/es_PE/ldap.lang
diff --git a/htdocs/langs/es_PE/link.lang b/public/langs/es_PE/link.lang
similarity index 100%
rename from htdocs/langs/es_PE/link.lang
rename to public/langs/es_PE/link.lang
diff --git a/htdocs/langs/es_PE/loan.lang b/public/langs/es_PE/loan.lang
similarity index 100%
rename from htdocs/langs/es_PE/loan.lang
rename to public/langs/es_PE/loan.lang
diff --git a/htdocs/langs/es_PE/mailmanspip.lang b/public/langs/es_PE/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/es_PE/mailmanspip.lang
rename to public/langs/es_PE/mailmanspip.lang
diff --git a/htdocs/langs/es_PE/mails.lang b/public/langs/es_PE/mails.lang
similarity index 100%
rename from htdocs/langs/es_PE/mails.lang
rename to public/langs/es_PE/mails.lang
diff --git a/htdocs/langs/es_PE/main.lang b/public/langs/es_PE/main.lang
similarity index 100%
rename from htdocs/langs/es_PE/main.lang
rename to public/langs/es_PE/main.lang
diff --git a/htdocs/langs/es_PE/margins.lang b/public/langs/es_PE/margins.lang
similarity index 100%
rename from htdocs/langs/es_PE/margins.lang
rename to public/langs/es_PE/margins.lang
diff --git a/htdocs/langs/es_PE/members.lang b/public/langs/es_PE/members.lang
similarity index 100%
rename from htdocs/langs/es_PE/members.lang
rename to public/langs/es_PE/members.lang
diff --git a/htdocs/langs/es_PE/oauth.lang b/public/langs/es_PE/oauth.lang
similarity index 100%
rename from htdocs/langs/es_PE/oauth.lang
rename to public/langs/es_PE/oauth.lang
diff --git a/htdocs/langs/es_PE/opensurvey.lang b/public/langs/es_PE/opensurvey.lang
similarity index 100%
rename from htdocs/langs/es_PE/opensurvey.lang
rename to public/langs/es_PE/opensurvey.lang
diff --git a/htdocs/langs/es_PE/orders.lang b/public/langs/es_PE/orders.lang
similarity index 100%
rename from htdocs/langs/es_PE/orders.lang
rename to public/langs/es_PE/orders.lang
diff --git a/htdocs/langs/es_PE/other.lang b/public/langs/es_PE/other.lang
similarity index 100%
rename from htdocs/langs/es_PE/other.lang
rename to public/langs/es_PE/other.lang
diff --git a/htdocs/langs/es_PE/paybox.lang b/public/langs/es_PE/paybox.lang
similarity index 100%
rename from htdocs/langs/es_PE/paybox.lang
rename to public/langs/es_PE/paybox.lang
diff --git a/htdocs/langs/es_PE/paypal.lang b/public/langs/es_PE/paypal.lang
similarity index 100%
rename from htdocs/langs/es_PE/paypal.lang
rename to public/langs/es_PE/paypal.lang
diff --git a/htdocs/langs/es_PE/printing.lang b/public/langs/es_PE/printing.lang
similarity index 100%
rename from htdocs/langs/es_PE/printing.lang
rename to public/langs/es_PE/printing.lang
diff --git a/htdocs/langs/es_PE/productbatch.lang b/public/langs/es_PE/productbatch.lang
similarity index 100%
rename from htdocs/langs/es_PE/productbatch.lang
rename to public/langs/es_PE/productbatch.lang
diff --git a/htdocs/langs/es_PE/products.lang b/public/langs/es_PE/products.lang
similarity index 100%
rename from htdocs/langs/es_PE/products.lang
rename to public/langs/es_PE/products.lang
diff --git a/htdocs/langs/es_PE/projects.lang b/public/langs/es_PE/projects.lang
similarity index 100%
rename from htdocs/langs/es_PE/projects.lang
rename to public/langs/es_PE/projects.lang
diff --git a/htdocs/langs/es_PE/propal.lang b/public/langs/es_PE/propal.lang
similarity index 100%
rename from htdocs/langs/es_PE/propal.lang
rename to public/langs/es_PE/propal.lang
diff --git a/htdocs/langs/es_PE/receiptprinter.lang b/public/langs/es_PE/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/es_PE/receiptprinter.lang
rename to public/langs/es_PE/receiptprinter.lang
diff --git a/htdocs/langs/es_PE/resource.lang b/public/langs/es_PE/resource.lang
similarity index 100%
rename from htdocs/langs/es_PE/resource.lang
rename to public/langs/es_PE/resource.lang
diff --git a/htdocs/langs/es_PE/salaries.lang b/public/langs/es_PE/salaries.lang
similarity index 100%
rename from htdocs/langs/es_PE/salaries.lang
rename to public/langs/es_PE/salaries.lang
diff --git a/htdocs/langs/es_PE/sendings.lang b/public/langs/es_PE/sendings.lang
similarity index 100%
rename from htdocs/langs/es_PE/sendings.lang
rename to public/langs/es_PE/sendings.lang
diff --git a/htdocs/langs/es_PE/sms.lang b/public/langs/es_PE/sms.lang
similarity index 100%
rename from htdocs/langs/es_PE/sms.lang
rename to public/langs/es_PE/sms.lang
diff --git a/htdocs/langs/es_PE/stocks.lang b/public/langs/es_PE/stocks.lang
similarity index 100%
rename from htdocs/langs/es_PE/stocks.lang
rename to public/langs/es_PE/stocks.lang
diff --git a/htdocs/langs/es_PE/supplier_proposal.lang b/public/langs/es_PE/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/es_PE/supplier_proposal.lang
rename to public/langs/es_PE/supplier_proposal.lang
diff --git a/htdocs/langs/es_PE/suppliers.lang b/public/langs/es_PE/suppliers.lang
similarity index 100%
rename from htdocs/langs/es_PE/suppliers.lang
rename to public/langs/es_PE/suppliers.lang
diff --git a/htdocs/langs/es_PE/trips.lang b/public/langs/es_PE/trips.lang
similarity index 100%
rename from htdocs/langs/es_PE/trips.lang
rename to public/langs/es_PE/trips.lang
diff --git a/htdocs/langs/es_PE/users.lang b/public/langs/es_PE/users.lang
similarity index 100%
rename from htdocs/langs/es_PE/users.lang
rename to public/langs/es_PE/users.lang
diff --git a/htdocs/langs/es_PE/website.lang b/public/langs/es_PE/website.lang
similarity index 100%
rename from htdocs/langs/es_PE/website.lang
rename to public/langs/es_PE/website.lang
diff --git a/htdocs/langs/es_PE/withdrawals.lang b/public/langs/es_PE/withdrawals.lang
similarity index 100%
rename from htdocs/langs/es_PE/withdrawals.lang
rename to public/langs/es_PE/withdrawals.lang
diff --git a/htdocs/langs/es_PE/workflow.lang b/public/langs/es_PE/workflow.lang
similarity index 100%
rename from htdocs/langs/es_PE/workflow.lang
rename to public/langs/es_PE/workflow.lang
diff --git a/htdocs/langs/es_PR/admin.lang b/public/langs/es_PR/admin.lang
similarity index 100%
rename from htdocs/langs/es_PR/admin.lang
rename to public/langs/es_PR/admin.lang
diff --git a/htdocs/langs/es_PR/bills.lang b/public/langs/es_PR/bills.lang
similarity index 100%
rename from htdocs/langs/es_PR/bills.lang
rename to public/langs/es_PR/bills.lang
diff --git a/htdocs/langs/es_PR/companies.lang b/public/langs/es_PR/companies.lang
similarity index 100%
rename from htdocs/langs/es_PR/companies.lang
rename to public/langs/es_PR/companies.lang
diff --git a/htdocs/langs/es_PR/compta.lang b/public/langs/es_PR/compta.lang
similarity index 100%
rename from htdocs/langs/es_PR/compta.lang
rename to public/langs/es_PR/compta.lang
diff --git a/htdocs/langs/es_PR/main.lang b/public/langs/es_PR/main.lang
similarity index 100%
rename from htdocs/langs/es_PR/main.lang
rename to public/langs/es_PR/main.lang
diff --git a/htdocs/langs/es_PR/propal.lang b/public/langs/es_PR/propal.lang
similarity index 100%
rename from htdocs/langs/es_PR/propal.lang
rename to public/langs/es_PR/propal.lang
diff --git a/htdocs/langs/es_PY/accountancy.lang b/public/langs/es_PY/accountancy.lang
similarity index 100%
rename from htdocs/langs/es_PY/accountancy.lang
rename to public/langs/es_PY/accountancy.lang
diff --git a/htdocs/langs/es_PY/admin.lang b/public/langs/es_PY/admin.lang
similarity index 100%
rename from htdocs/langs/es_PY/admin.lang
rename to public/langs/es_PY/admin.lang
diff --git a/htdocs/langs/es_PY/agenda.lang b/public/langs/es_PY/agenda.lang
similarity index 100%
rename from htdocs/langs/es_PY/agenda.lang
rename to public/langs/es_PY/agenda.lang
diff --git a/htdocs/langs/es_PY/banks.lang b/public/langs/es_PY/banks.lang
similarity index 100%
rename from htdocs/langs/es_PY/banks.lang
rename to public/langs/es_PY/banks.lang
diff --git a/htdocs/langs/es_PY/bills.lang b/public/langs/es_PY/bills.lang
similarity index 100%
rename from htdocs/langs/es_PY/bills.lang
rename to public/langs/es_PY/bills.lang
diff --git a/htdocs/langs/es_PY/bookmarks.lang b/public/langs/es_PY/bookmarks.lang
similarity index 100%
rename from htdocs/langs/es_PY/bookmarks.lang
rename to public/langs/es_PY/bookmarks.lang
diff --git a/htdocs/langs/es_PY/boxes.lang b/public/langs/es_PY/boxes.lang
similarity index 100%
rename from htdocs/langs/es_PY/boxes.lang
rename to public/langs/es_PY/boxes.lang
diff --git a/htdocs/langs/es_PY/cashdesk.lang b/public/langs/es_PY/cashdesk.lang
similarity index 100%
rename from htdocs/langs/es_PY/cashdesk.lang
rename to public/langs/es_PY/cashdesk.lang
diff --git a/htdocs/langs/es_PY/categories.lang b/public/langs/es_PY/categories.lang
similarity index 100%
rename from htdocs/langs/es_PY/categories.lang
rename to public/langs/es_PY/categories.lang
diff --git a/htdocs/langs/es_PY/commercial.lang b/public/langs/es_PY/commercial.lang
similarity index 100%
rename from htdocs/langs/es_PY/commercial.lang
rename to public/langs/es_PY/commercial.lang
diff --git a/htdocs/langs/es_PY/companies.lang b/public/langs/es_PY/companies.lang
similarity index 100%
rename from htdocs/langs/es_PY/companies.lang
rename to public/langs/es_PY/companies.lang
diff --git a/htdocs/langs/es_PY/compta.lang b/public/langs/es_PY/compta.lang
similarity index 100%
rename from htdocs/langs/es_PY/compta.lang
rename to public/langs/es_PY/compta.lang
diff --git a/htdocs/langs/es_PY/contracts.lang b/public/langs/es_PY/contracts.lang
similarity index 100%
rename from htdocs/langs/es_PY/contracts.lang
rename to public/langs/es_PY/contracts.lang
diff --git a/htdocs/langs/es_PY/cron.lang b/public/langs/es_PY/cron.lang
similarity index 100%
rename from htdocs/langs/es_PY/cron.lang
rename to public/langs/es_PY/cron.lang
diff --git a/htdocs/langs/es_PY/deliveries.lang b/public/langs/es_PY/deliveries.lang
similarity index 100%
rename from htdocs/langs/es_PY/deliveries.lang
rename to public/langs/es_PY/deliveries.lang
diff --git a/htdocs/langs/es_PY/dict.lang b/public/langs/es_PY/dict.lang
similarity index 100%
rename from htdocs/langs/es_PY/dict.lang
rename to public/langs/es_PY/dict.lang
diff --git a/htdocs/langs/es_PY/donations.lang b/public/langs/es_PY/donations.lang
similarity index 100%
rename from htdocs/langs/es_PY/donations.lang
rename to public/langs/es_PY/donations.lang
diff --git a/htdocs/langs/es_PY/ecm.lang b/public/langs/es_PY/ecm.lang
similarity index 100%
rename from htdocs/langs/es_PY/ecm.lang
rename to public/langs/es_PY/ecm.lang
diff --git a/htdocs/langs/es_PY/errors.lang b/public/langs/es_PY/errors.lang
similarity index 100%
rename from htdocs/langs/es_PY/errors.lang
rename to public/langs/es_PY/errors.lang
diff --git a/htdocs/langs/es_PY/exports.lang b/public/langs/es_PY/exports.lang
similarity index 100%
rename from htdocs/langs/es_PY/exports.lang
rename to public/langs/es_PY/exports.lang
diff --git a/htdocs/langs/es_PY/externalsite.lang b/public/langs/es_PY/externalsite.lang
similarity index 100%
rename from htdocs/langs/es_PY/externalsite.lang
rename to public/langs/es_PY/externalsite.lang
diff --git a/htdocs/langs/es_PY/ftp.lang b/public/langs/es_PY/ftp.lang
similarity index 100%
rename from htdocs/langs/es_PY/ftp.lang
rename to public/langs/es_PY/ftp.lang
diff --git a/htdocs/langs/es_PY/help.lang b/public/langs/es_PY/help.lang
similarity index 100%
rename from htdocs/langs/es_PY/help.lang
rename to public/langs/es_PY/help.lang
diff --git a/htdocs/langs/es_PY/holiday.lang b/public/langs/es_PY/holiday.lang
similarity index 100%
rename from htdocs/langs/es_PY/holiday.lang
rename to public/langs/es_PY/holiday.lang
diff --git a/htdocs/langs/es_PY/hrm.lang b/public/langs/es_PY/hrm.lang
similarity index 100%
rename from htdocs/langs/es_PY/hrm.lang
rename to public/langs/es_PY/hrm.lang
diff --git a/htdocs/langs/es_PY/incoterm.lang b/public/langs/es_PY/incoterm.lang
similarity index 100%
rename from htdocs/langs/es_PY/incoterm.lang
rename to public/langs/es_PY/incoterm.lang
diff --git a/htdocs/langs/es_PY/install.lang b/public/langs/es_PY/install.lang
similarity index 100%
rename from htdocs/langs/es_PY/install.lang
rename to public/langs/es_PY/install.lang
diff --git a/htdocs/langs/es_PY/interventions.lang b/public/langs/es_PY/interventions.lang
similarity index 100%
rename from htdocs/langs/es_PY/interventions.lang
rename to public/langs/es_PY/interventions.lang
diff --git a/htdocs/langs/es_PY/languages.lang b/public/langs/es_PY/languages.lang
similarity index 100%
rename from htdocs/langs/es_PY/languages.lang
rename to public/langs/es_PY/languages.lang
diff --git a/htdocs/langs/es_PY/ldap.lang b/public/langs/es_PY/ldap.lang
similarity index 100%
rename from htdocs/langs/es_PY/ldap.lang
rename to public/langs/es_PY/ldap.lang
diff --git a/htdocs/langs/es_PY/link.lang b/public/langs/es_PY/link.lang
similarity index 100%
rename from htdocs/langs/es_PY/link.lang
rename to public/langs/es_PY/link.lang
diff --git a/htdocs/langs/es_PY/loan.lang b/public/langs/es_PY/loan.lang
similarity index 100%
rename from htdocs/langs/es_PY/loan.lang
rename to public/langs/es_PY/loan.lang
diff --git a/htdocs/langs/es_PY/mailmanspip.lang b/public/langs/es_PY/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/es_PY/mailmanspip.lang
rename to public/langs/es_PY/mailmanspip.lang
diff --git a/htdocs/langs/es_PY/mails.lang b/public/langs/es_PY/mails.lang
similarity index 100%
rename from htdocs/langs/es_PY/mails.lang
rename to public/langs/es_PY/mails.lang
diff --git a/htdocs/langs/es_PY/main.lang b/public/langs/es_PY/main.lang
similarity index 100%
rename from htdocs/langs/es_PY/main.lang
rename to public/langs/es_PY/main.lang
diff --git a/htdocs/langs/es_PY/margins.lang b/public/langs/es_PY/margins.lang
similarity index 100%
rename from htdocs/langs/es_PY/margins.lang
rename to public/langs/es_PY/margins.lang
diff --git a/htdocs/langs/es_PY/members.lang b/public/langs/es_PY/members.lang
similarity index 100%
rename from htdocs/langs/es_PY/members.lang
rename to public/langs/es_PY/members.lang
diff --git a/htdocs/langs/es_PY/oauth.lang b/public/langs/es_PY/oauth.lang
similarity index 100%
rename from htdocs/langs/es_PY/oauth.lang
rename to public/langs/es_PY/oauth.lang
diff --git a/htdocs/langs/es_PY/opensurvey.lang b/public/langs/es_PY/opensurvey.lang
similarity index 100%
rename from htdocs/langs/es_PY/opensurvey.lang
rename to public/langs/es_PY/opensurvey.lang
diff --git a/htdocs/langs/es_PY/orders.lang b/public/langs/es_PY/orders.lang
similarity index 100%
rename from htdocs/langs/es_PY/orders.lang
rename to public/langs/es_PY/orders.lang
diff --git a/htdocs/langs/es_PY/other.lang b/public/langs/es_PY/other.lang
similarity index 100%
rename from htdocs/langs/es_PY/other.lang
rename to public/langs/es_PY/other.lang
diff --git a/htdocs/langs/es_PY/paybox.lang b/public/langs/es_PY/paybox.lang
similarity index 100%
rename from htdocs/langs/es_PY/paybox.lang
rename to public/langs/es_PY/paybox.lang
diff --git a/htdocs/langs/es_PY/paypal.lang b/public/langs/es_PY/paypal.lang
similarity index 100%
rename from htdocs/langs/es_PY/paypal.lang
rename to public/langs/es_PY/paypal.lang
diff --git a/htdocs/langs/es_PY/printing.lang b/public/langs/es_PY/printing.lang
similarity index 100%
rename from htdocs/langs/es_PY/printing.lang
rename to public/langs/es_PY/printing.lang
diff --git a/htdocs/langs/es_PY/productbatch.lang b/public/langs/es_PY/productbatch.lang
similarity index 100%
rename from htdocs/langs/es_PY/productbatch.lang
rename to public/langs/es_PY/productbatch.lang
diff --git a/htdocs/langs/es_PY/products.lang b/public/langs/es_PY/products.lang
similarity index 100%
rename from htdocs/langs/es_PY/products.lang
rename to public/langs/es_PY/products.lang
diff --git a/htdocs/langs/es_PY/projects.lang b/public/langs/es_PY/projects.lang
similarity index 100%
rename from htdocs/langs/es_PY/projects.lang
rename to public/langs/es_PY/projects.lang
diff --git a/htdocs/langs/es_PY/propal.lang b/public/langs/es_PY/propal.lang
similarity index 100%
rename from htdocs/langs/es_PY/propal.lang
rename to public/langs/es_PY/propal.lang
diff --git a/htdocs/langs/es_PY/receiptprinter.lang b/public/langs/es_PY/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/es_PY/receiptprinter.lang
rename to public/langs/es_PY/receiptprinter.lang
diff --git a/htdocs/langs/es_PY/resource.lang b/public/langs/es_PY/resource.lang
similarity index 100%
rename from htdocs/langs/es_PY/resource.lang
rename to public/langs/es_PY/resource.lang
diff --git a/htdocs/langs/es_PY/salaries.lang b/public/langs/es_PY/salaries.lang
similarity index 100%
rename from htdocs/langs/es_PY/salaries.lang
rename to public/langs/es_PY/salaries.lang
diff --git a/htdocs/langs/es_PY/sendings.lang b/public/langs/es_PY/sendings.lang
similarity index 100%
rename from htdocs/langs/es_PY/sendings.lang
rename to public/langs/es_PY/sendings.lang
diff --git a/htdocs/langs/es_PY/sms.lang b/public/langs/es_PY/sms.lang
similarity index 100%
rename from htdocs/langs/es_PY/sms.lang
rename to public/langs/es_PY/sms.lang
diff --git a/htdocs/langs/es_PY/stocks.lang b/public/langs/es_PY/stocks.lang
similarity index 100%
rename from htdocs/langs/es_PY/stocks.lang
rename to public/langs/es_PY/stocks.lang
diff --git a/htdocs/langs/es_PY/supplier_proposal.lang b/public/langs/es_PY/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/es_PY/supplier_proposal.lang
rename to public/langs/es_PY/supplier_proposal.lang
diff --git a/htdocs/langs/es_PY/suppliers.lang b/public/langs/es_PY/suppliers.lang
similarity index 100%
rename from htdocs/langs/es_PY/suppliers.lang
rename to public/langs/es_PY/suppliers.lang
diff --git a/htdocs/langs/es_PY/trips.lang b/public/langs/es_PY/trips.lang
similarity index 100%
rename from htdocs/langs/es_PY/trips.lang
rename to public/langs/es_PY/trips.lang
diff --git a/htdocs/langs/es_PY/users.lang b/public/langs/es_PY/users.lang
similarity index 100%
rename from htdocs/langs/es_PY/users.lang
rename to public/langs/es_PY/users.lang
diff --git a/htdocs/langs/es_PY/website.lang b/public/langs/es_PY/website.lang
similarity index 100%
rename from htdocs/langs/es_PY/website.lang
rename to public/langs/es_PY/website.lang
diff --git a/htdocs/langs/es_PY/withdrawals.lang b/public/langs/es_PY/withdrawals.lang
similarity index 100%
rename from htdocs/langs/es_PY/withdrawals.lang
rename to public/langs/es_PY/withdrawals.lang
diff --git a/htdocs/langs/es_PY/workflow.lang b/public/langs/es_PY/workflow.lang
similarity index 100%
rename from htdocs/langs/es_PY/workflow.lang
rename to public/langs/es_PY/workflow.lang
diff --git a/htdocs/langs/es_VE/accountancy.lang b/public/langs/es_VE/accountancy.lang
similarity index 100%
rename from htdocs/langs/es_VE/accountancy.lang
rename to public/langs/es_VE/accountancy.lang
diff --git a/htdocs/langs/es_VE/admin.lang b/public/langs/es_VE/admin.lang
similarity index 100%
rename from htdocs/langs/es_VE/admin.lang
rename to public/langs/es_VE/admin.lang
diff --git a/htdocs/langs/es_VE/agenda.lang b/public/langs/es_VE/agenda.lang
similarity index 100%
rename from htdocs/langs/es_VE/agenda.lang
rename to public/langs/es_VE/agenda.lang
diff --git a/htdocs/langs/es_VE/banks.lang b/public/langs/es_VE/banks.lang
similarity index 100%
rename from htdocs/langs/es_VE/banks.lang
rename to public/langs/es_VE/banks.lang
diff --git a/htdocs/langs/es_VE/bills.lang b/public/langs/es_VE/bills.lang
similarity index 100%
rename from htdocs/langs/es_VE/bills.lang
rename to public/langs/es_VE/bills.lang
diff --git a/htdocs/langs/es_VE/bookmarks.lang b/public/langs/es_VE/bookmarks.lang
similarity index 100%
rename from htdocs/langs/es_VE/bookmarks.lang
rename to public/langs/es_VE/bookmarks.lang
diff --git a/htdocs/langs/es_VE/boxes.lang b/public/langs/es_VE/boxes.lang
similarity index 100%
rename from htdocs/langs/es_VE/boxes.lang
rename to public/langs/es_VE/boxes.lang
diff --git a/htdocs/langs/es_VE/cashdesk.lang b/public/langs/es_VE/cashdesk.lang
similarity index 100%
rename from htdocs/langs/es_VE/cashdesk.lang
rename to public/langs/es_VE/cashdesk.lang
diff --git a/htdocs/langs/es_VE/categories.lang b/public/langs/es_VE/categories.lang
similarity index 100%
rename from htdocs/langs/es_VE/categories.lang
rename to public/langs/es_VE/categories.lang
diff --git a/htdocs/langs/es_VE/commercial.lang b/public/langs/es_VE/commercial.lang
similarity index 100%
rename from htdocs/langs/es_VE/commercial.lang
rename to public/langs/es_VE/commercial.lang
diff --git a/htdocs/langs/es_VE/companies.lang b/public/langs/es_VE/companies.lang
similarity index 100%
rename from htdocs/langs/es_VE/companies.lang
rename to public/langs/es_VE/companies.lang
diff --git a/htdocs/langs/es_VE/compta.lang b/public/langs/es_VE/compta.lang
similarity index 100%
rename from htdocs/langs/es_VE/compta.lang
rename to public/langs/es_VE/compta.lang
diff --git a/htdocs/langs/es_VE/contracts.lang b/public/langs/es_VE/contracts.lang
similarity index 100%
rename from htdocs/langs/es_VE/contracts.lang
rename to public/langs/es_VE/contracts.lang
diff --git a/htdocs/langs/es_VE/cron.lang b/public/langs/es_VE/cron.lang
similarity index 100%
rename from htdocs/langs/es_VE/cron.lang
rename to public/langs/es_VE/cron.lang
diff --git a/htdocs/langs/es_VE/deliveries.lang b/public/langs/es_VE/deliveries.lang
similarity index 100%
rename from htdocs/langs/es_VE/deliveries.lang
rename to public/langs/es_VE/deliveries.lang
diff --git a/htdocs/langs/es_VE/dict.lang b/public/langs/es_VE/dict.lang
similarity index 100%
rename from htdocs/langs/es_VE/dict.lang
rename to public/langs/es_VE/dict.lang
diff --git a/htdocs/langs/es_VE/donations.lang b/public/langs/es_VE/donations.lang
similarity index 100%
rename from htdocs/langs/es_VE/donations.lang
rename to public/langs/es_VE/donations.lang
diff --git a/htdocs/langs/es_VE/ecm.lang b/public/langs/es_VE/ecm.lang
similarity index 100%
rename from htdocs/langs/es_VE/ecm.lang
rename to public/langs/es_VE/ecm.lang
diff --git a/htdocs/langs/es_VE/errors.lang b/public/langs/es_VE/errors.lang
similarity index 100%
rename from htdocs/langs/es_VE/errors.lang
rename to public/langs/es_VE/errors.lang
diff --git a/htdocs/langs/es_VE/exports.lang b/public/langs/es_VE/exports.lang
similarity index 100%
rename from htdocs/langs/es_VE/exports.lang
rename to public/langs/es_VE/exports.lang
diff --git a/htdocs/langs/es_VE/externalsite.lang b/public/langs/es_VE/externalsite.lang
similarity index 100%
rename from htdocs/langs/es_VE/externalsite.lang
rename to public/langs/es_VE/externalsite.lang
diff --git a/htdocs/langs/es_VE/ftp.lang b/public/langs/es_VE/ftp.lang
similarity index 100%
rename from htdocs/langs/es_VE/ftp.lang
rename to public/langs/es_VE/ftp.lang
diff --git a/htdocs/langs/es_VE/help.lang b/public/langs/es_VE/help.lang
similarity index 100%
rename from htdocs/langs/es_VE/help.lang
rename to public/langs/es_VE/help.lang
diff --git a/htdocs/langs/es_VE/holiday.lang b/public/langs/es_VE/holiday.lang
similarity index 100%
rename from htdocs/langs/es_VE/holiday.lang
rename to public/langs/es_VE/holiday.lang
diff --git a/htdocs/langs/es_VE/hrm.lang b/public/langs/es_VE/hrm.lang
similarity index 100%
rename from htdocs/langs/es_VE/hrm.lang
rename to public/langs/es_VE/hrm.lang
diff --git a/htdocs/langs/es_VE/incoterm.lang b/public/langs/es_VE/incoterm.lang
similarity index 100%
rename from htdocs/langs/es_VE/incoterm.lang
rename to public/langs/es_VE/incoterm.lang
diff --git a/htdocs/langs/es_VE/install.lang b/public/langs/es_VE/install.lang
similarity index 100%
rename from htdocs/langs/es_VE/install.lang
rename to public/langs/es_VE/install.lang
diff --git a/htdocs/langs/es_VE/interventions.lang b/public/langs/es_VE/interventions.lang
similarity index 100%
rename from htdocs/langs/es_VE/interventions.lang
rename to public/langs/es_VE/interventions.lang
diff --git a/htdocs/langs/es_VE/languages.lang b/public/langs/es_VE/languages.lang
similarity index 100%
rename from htdocs/langs/es_VE/languages.lang
rename to public/langs/es_VE/languages.lang
diff --git a/htdocs/langs/es_VE/ldap.lang b/public/langs/es_VE/ldap.lang
similarity index 100%
rename from htdocs/langs/es_VE/ldap.lang
rename to public/langs/es_VE/ldap.lang
diff --git a/htdocs/langs/es_VE/link.lang b/public/langs/es_VE/link.lang
similarity index 100%
rename from htdocs/langs/es_VE/link.lang
rename to public/langs/es_VE/link.lang
diff --git a/htdocs/langs/es_VE/loan.lang b/public/langs/es_VE/loan.lang
similarity index 100%
rename from htdocs/langs/es_VE/loan.lang
rename to public/langs/es_VE/loan.lang
diff --git a/htdocs/langs/es_VE/mailmanspip.lang b/public/langs/es_VE/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/es_VE/mailmanspip.lang
rename to public/langs/es_VE/mailmanspip.lang
diff --git a/htdocs/langs/es_VE/mails.lang b/public/langs/es_VE/mails.lang
similarity index 100%
rename from htdocs/langs/es_VE/mails.lang
rename to public/langs/es_VE/mails.lang
diff --git a/htdocs/langs/es_VE/main.lang b/public/langs/es_VE/main.lang
similarity index 100%
rename from htdocs/langs/es_VE/main.lang
rename to public/langs/es_VE/main.lang
diff --git a/htdocs/langs/es_VE/margins.lang b/public/langs/es_VE/margins.lang
similarity index 100%
rename from htdocs/langs/es_VE/margins.lang
rename to public/langs/es_VE/margins.lang
diff --git a/htdocs/langs/es_VE/members.lang b/public/langs/es_VE/members.lang
similarity index 100%
rename from htdocs/langs/es_VE/members.lang
rename to public/langs/es_VE/members.lang
diff --git a/htdocs/langs/es_VE/oauth.lang b/public/langs/es_VE/oauth.lang
similarity index 100%
rename from htdocs/langs/es_VE/oauth.lang
rename to public/langs/es_VE/oauth.lang
diff --git a/htdocs/langs/es_VE/opensurvey.lang b/public/langs/es_VE/opensurvey.lang
similarity index 100%
rename from htdocs/langs/es_VE/opensurvey.lang
rename to public/langs/es_VE/opensurvey.lang
diff --git a/htdocs/langs/es_VE/orders.lang b/public/langs/es_VE/orders.lang
similarity index 100%
rename from htdocs/langs/es_VE/orders.lang
rename to public/langs/es_VE/orders.lang
diff --git a/htdocs/langs/es_VE/other.lang b/public/langs/es_VE/other.lang
similarity index 100%
rename from htdocs/langs/es_VE/other.lang
rename to public/langs/es_VE/other.lang
diff --git a/htdocs/langs/es_VE/paybox.lang b/public/langs/es_VE/paybox.lang
similarity index 100%
rename from htdocs/langs/es_VE/paybox.lang
rename to public/langs/es_VE/paybox.lang
diff --git a/htdocs/langs/es_VE/paypal.lang b/public/langs/es_VE/paypal.lang
similarity index 100%
rename from htdocs/langs/es_VE/paypal.lang
rename to public/langs/es_VE/paypal.lang
diff --git a/htdocs/langs/es_VE/printing.lang b/public/langs/es_VE/printing.lang
similarity index 100%
rename from htdocs/langs/es_VE/printing.lang
rename to public/langs/es_VE/printing.lang
diff --git a/htdocs/langs/es_VE/productbatch.lang b/public/langs/es_VE/productbatch.lang
similarity index 100%
rename from htdocs/langs/es_VE/productbatch.lang
rename to public/langs/es_VE/productbatch.lang
diff --git a/htdocs/langs/es_VE/products.lang b/public/langs/es_VE/products.lang
similarity index 100%
rename from htdocs/langs/es_VE/products.lang
rename to public/langs/es_VE/products.lang
diff --git a/htdocs/langs/es_VE/projects.lang b/public/langs/es_VE/projects.lang
similarity index 100%
rename from htdocs/langs/es_VE/projects.lang
rename to public/langs/es_VE/projects.lang
diff --git a/htdocs/langs/es_VE/propal.lang b/public/langs/es_VE/propal.lang
similarity index 100%
rename from htdocs/langs/es_VE/propal.lang
rename to public/langs/es_VE/propal.lang
diff --git a/htdocs/langs/es_VE/receiptprinter.lang b/public/langs/es_VE/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/es_VE/receiptprinter.lang
rename to public/langs/es_VE/receiptprinter.lang
diff --git a/htdocs/langs/es_VE/resource.lang b/public/langs/es_VE/resource.lang
similarity index 100%
rename from htdocs/langs/es_VE/resource.lang
rename to public/langs/es_VE/resource.lang
diff --git a/htdocs/langs/es_VE/salaries.lang b/public/langs/es_VE/salaries.lang
similarity index 100%
rename from htdocs/langs/es_VE/salaries.lang
rename to public/langs/es_VE/salaries.lang
diff --git a/htdocs/langs/es_VE/sendings.lang b/public/langs/es_VE/sendings.lang
similarity index 100%
rename from htdocs/langs/es_VE/sendings.lang
rename to public/langs/es_VE/sendings.lang
diff --git a/htdocs/langs/es_VE/sms.lang b/public/langs/es_VE/sms.lang
similarity index 100%
rename from htdocs/langs/es_VE/sms.lang
rename to public/langs/es_VE/sms.lang
diff --git a/htdocs/langs/es_VE/stocks.lang b/public/langs/es_VE/stocks.lang
similarity index 100%
rename from htdocs/langs/es_VE/stocks.lang
rename to public/langs/es_VE/stocks.lang
diff --git a/htdocs/langs/es_VE/supplier_proposal.lang b/public/langs/es_VE/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/es_VE/supplier_proposal.lang
rename to public/langs/es_VE/supplier_proposal.lang
diff --git a/htdocs/langs/es_VE/suppliers.lang b/public/langs/es_VE/suppliers.lang
similarity index 100%
rename from htdocs/langs/es_VE/suppliers.lang
rename to public/langs/es_VE/suppliers.lang
diff --git a/htdocs/langs/es_VE/trips.lang b/public/langs/es_VE/trips.lang
similarity index 100%
rename from htdocs/langs/es_VE/trips.lang
rename to public/langs/es_VE/trips.lang
diff --git a/htdocs/langs/es_VE/users.lang b/public/langs/es_VE/users.lang
similarity index 100%
rename from htdocs/langs/es_VE/users.lang
rename to public/langs/es_VE/users.lang
diff --git a/htdocs/langs/es_VE/website.lang b/public/langs/es_VE/website.lang
similarity index 100%
rename from htdocs/langs/es_VE/website.lang
rename to public/langs/es_VE/website.lang
diff --git a/htdocs/langs/es_VE/withdrawals.lang b/public/langs/es_VE/withdrawals.lang
similarity index 100%
rename from htdocs/langs/es_VE/withdrawals.lang
rename to public/langs/es_VE/withdrawals.lang
diff --git a/htdocs/langs/es_VE/workflow.lang b/public/langs/es_VE/workflow.lang
similarity index 100%
rename from htdocs/langs/es_VE/workflow.lang
rename to public/langs/es_VE/workflow.lang
diff --git a/htdocs/langs/et_EE/accountancy.lang b/public/langs/et_EE/accountancy.lang
similarity index 100%
rename from htdocs/langs/et_EE/accountancy.lang
rename to public/langs/et_EE/accountancy.lang
diff --git a/htdocs/langs/et_EE/admin.lang b/public/langs/et_EE/admin.lang
similarity index 100%
rename from htdocs/langs/et_EE/admin.lang
rename to public/langs/et_EE/admin.lang
diff --git a/htdocs/langs/et_EE/agenda.lang b/public/langs/et_EE/agenda.lang
similarity index 100%
rename from htdocs/langs/et_EE/agenda.lang
rename to public/langs/et_EE/agenda.lang
diff --git a/htdocs/langs/et_EE/banks.lang b/public/langs/et_EE/banks.lang
similarity index 100%
rename from htdocs/langs/et_EE/banks.lang
rename to public/langs/et_EE/banks.lang
diff --git a/htdocs/langs/et_EE/bills.lang b/public/langs/et_EE/bills.lang
similarity index 100%
rename from htdocs/langs/et_EE/bills.lang
rename to public/langs/et_EE/bills.lang
diff --git a/htdocs/langs/et_EE/bookmarks.lang b/public/langs/et_EE/bookmarks.lang
similarity index 100%
rename from htdocs/langs/et_EE/bookmarks.lang
rename to public/langs/et_EE/bookmarks.lang
diff --git a/htdocs/langs/et_EE/boxes.lang b/public/langs/et_EE/boxes.lang
similarity index 100%
rename from htdocs/langs/et_EE/boxes.lang
rename to public/langs/et_EE/boxes.lang
diff --git a/htdocs/langs/et_EE/cashdesk.lang b/public/langs/et_EE/cashdesk.lang
similarity index 100%
rename from htdocs/langs/et_EE/cashdesk.lang
rename to public/langs/et_EE/cashdesk.lang
diff --git a/htdocs/langs/et_EE/categories.lang b/public/langs/et_EE/categories.lang
similarity index 100%
rename from htdocs/langs/et_EE/categories.lang
rename to public/langs/et_EE/categories.lang
diff --git a/htdocs/langs/et_EE/commercial.lang b/public/langs/et_EE/commercial.lang
similarity index 100%
rename from htdocs/langs/et_EE/commercial.lang
rename to public/langs/et_EE/commercial.lang
diff --git a/htdocs/langs/et_EE/companies.lang b/public/langs/et_EE/companies.lang
similarity index 100%
rename from htdocs/langs/et_EE/companies.lang
rename to public/langs/et_EE/companies.lang
diff --git a/htdocs/langs/et_EE/compta.lang b/public/langs/et_EE/compta.lang
similarity index 100%
rename from htdocs/langs/et_EE/compta.lang
rename to public/langs/et_EE/compta.lang
diff --git a/htdocs/langs/et_EE/contracts.lang b/public/langs/et_EE/contracts.lang
similarity index 100%
rename from htdocs/langs/et_EE/contracts.lang
rename to public/langs/et_EE/contracts.lang
diff --git a/htdocs/langs/et_EE/cron.lang b/public/langs/et_EE/cron.lang
similarity index 100%
rename from htdocs/langs/et_EE/cron.lang
rename to public/langs/et_EE/cron.lang
diff --git a/htdocs/langs/et_EE/deliveries.lang b/public/langs/et_EE/deliveries.lang
similarity index 100%
rename from htdocs/langs/et_EE/deliveries.lang
rename to public/langs/et_EE/deliveries.lang
diff --git a/htdocs/langs/et_EE/dict.lang b/public/langs/et_EE/dict.lang
similarity index 100%
rename from htdocs/langs/et_EE/dict.lang
rename to public/langs/et_EE/dict.lang
diff --git a/htdocs/langs/et_EE/donations.lang b/public/langs/et_EE/donations.lang
similarity index 100%
rename from htdocs/langs/et_EE/donations.lang
rename to public/langs/et_EE/donations.lang
diff --git a/htdocs/langs/et_EE/ecm.lang b/public/langs/et_EE/ecm.lang
similarity index 100%
rename from htdocs/langs/et_EE/ecm.lang
rename to public/langs/et_EE/ecm.lang
diff --git a/htdocs/langs/et_EE/errors.lang b/public/langs/et_EE/errors.lang
similarity index 100%
rename from htdocs/langs/et_EE/errors.lang
rename to public/langs/et_EE/errors.lang
diff --git a/htdocs/langs/et_EE/exports.lang b/public/langs/et_EE/exports.lang
similarity index 100%
rename from htdocs/langs/et_EE/exports.lang
rename to public/langs/et_EE/exports.lang
diff --git a/htdocs/langs/et_EE/externalsite.lang b/public/langs/et_EE/externalsite.lang
similarity index 100%
rename from htdocs/langs/et_EE/externalsite.lang
rename to public/langs/et_EE/externalsite.lang
diff --git a/htdocs/langs/et_EE/ftp.lang b/public/langs/et_EE/ftp.lang
similarity index 100%
rename from htdocs/langs/et_EE/ftp.lang
rename to public/langs/et_EE/ftp.lang
diff --git a/htdocs/langs/et_EE/help.lang b/public/langs/et_EE/help.lang
similarity index 100%
rename from htdocs/langs/et_EE/help.lang
rename to public/langs/et_EE/help.lang
diff --git a/htdocs/langs/et_EE/holiday.lang b/public/langs/et_EE/holiday.lang
similarity index 100%
rename from htdocs/langs/et_EE/holiday.lang
rename to public/langs/et_EE/holiday.lang
diff --git a/htdocs/langs/et_EE/hrm.lang b/public/langs/et_EE/hrm.lang
similarity index 100%
rename from htdocs/langs/et_EE/hrm.lang
rename to public/langs/et_EE/hrm.lang
diff --git a/htdocs/langs/et_EE/incoterm.lang b/public/langs/et_EE/incoterm.lang
similarity index 100%
rename from htdocs/langs/et_EE/incoterm.lang
rename to public/langs/et_EE/incoterm.lang
diff --git a/htdocs/langs/et_EE/install.lang b/public/langs/et_EE/install.lang
similarity index 100%
rename from htdocs/langs/et_EE/install.lang
rename to public/langs/et_EE/install.lang
diff --git a/htdocs/langs/et_EE/interventions.lang b/public/langs/et_EE/interventions.lang
similarity index 100%
rename from htdocs/langs/et_EE/interventions.lang
rename to public/langs/et_EE/interventions.lang
diff --git a/htdocs/langs/et_EE/languages.lang b/public/langs/et_EE/languages.lang
similarity index 100%
rename from htdocs/langs/et_EE/languages.lang
rename to public/langs/et_EE/languages.lang
diff --git a/htdocs/langs/et_EE/ldap.lang b/public/langs/et_EE/ldap.lang
similarity index 100%
rename from htdocs/langs/et_EE/ldap.lang
rename to public/langs/et_EE/ldap.lang
diff --git a/htdocs/langs/et_EE/link.lang b/public/langs/et_EE/link.lang
similarity index 100%
rename from htdocs/langs/et_EE/link.lang
rename to public/langs/et_EE/link.lang
diff --git a/htdocs/langs/et_EE/loan.lang b/public/langs/et_EE/loan.lang
similarity index 100%
rename from htdocs/langs/et_EE/loan.lang
rename to public/langs/et_EE/loan.lang
diff --git a/htdocs/langs/et_EE/mailmanspip.lang b/public/langs/et_EE/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/et_EE/mailmanspip.lang
rename to public/langs/et_EE/mailmanspip.lang
diff --git a/htdocs/langs/et_EE/mails.lang b/public/langs/et_EE/mails.lang
similarity index 100%
rename from htdocs/langs/et_EE/mails.lang
rename to public/langs/et_EE/mails.lang
diff --git a/htdocs/langs/et_EE/main.lang b/public/langs/et_EE/main.lang
similarity index 100%
rename from htdocs/langs/et_EE/main.lang
rename to public/langs/et_EE/main.lang
diff --git a/htdocs/langs/et_EE/margins.lang b/public/langs/et_EE/margins.lang
similarity index 100%
rename from htdocs/langs/et_EE/margins.lang
rename to public/langs/et_EE/margins.lang
diff --git a/htdocs/langs/et_EE/members.lang b/public/langs/et_EE/members.lang
similarity index 100%
rename from htdocs/langs/et_EE/members.lang
rename to public/langs/et_EE/members.lang
diff --git a/htdocs/langs/et_EE/oauth.lang b/public/langs/et_EE/oauth.lang
similarity index 100%
rename from htdocs/langs/et_EE/oauth.lang
rename to public/langs/et_EE/oauth.lang
diff --git a/htdocs/langs/et_EE/opensurvey.lang b/public/langs/et_EE/opensurvey.lang
similarity index 100%
rename from htdocs/langs/et_EE/opensurvey.lang
rename to public/langs/et_EE/opensurvey.lang
diff --git a/htdocs/langs/et_EE/orders.lang b/public/langs/et_EE/orders.lang
similarity index 100%
rename from htdocs/langs/et_EE/orders.lang
rename to public/langs/et_EE/orders.lang
diff --git a/htdocs/langs/et_EE/other.lang b/public/langs/et_EE/other.lang
similarity index 100%
rename from htdocs/langs/et_EE/other.lang
rename to public/langs/et_EE/other.lang
diff --git a/htdocs/langs/et_EE/paybox.lang b/public/langs/et_EE/paybox.lang
similarity index 100%
rename from htdocs/langs/et_EE/paybox.lang
rename to public/langs/et_EE/paybox.lang
diff --git a/htdocs/langs/et_EE/paypal.lang b/public/langs/et_EE/paypal.lang
similarity index 100%
rename from htdocs/langs/et_EE/paypal.lang
rename to public/langs/et_EE/paypal.lang
diff --git a/htdocs/langs/et_EE/printing.lang b/public/langs/et_EE/printing.lang
similarity index 100%
rename from htdocs/langs/et_EE/printing.lang
rename to public/langs/et_EE/printing.lang
diff --git a/htdocs/langs/et_EE/productbatch.lang b/public/langs/et_EE/productbatch.lang
similarity index 100%
rename from htdocs/langs/et_EE/productbatch.lang
rename to public/langs/et_EE/productbatch.lang
diff --git a/htdocs/langs/et_EE/products.lang b/public/langs/et_EE/products.lang
similarity index 100%
rename from htdocs/langs/et_EE/products.lang
rename to public/langs/et_EE/products.lang
diff --git a/htdocs/langs/et_EE/projects.lang b/public/langs/et_EE/projects.lang
similarity index 100%
rename from htdocs/langs/et_EE/projects.lang
rename to public/langs/et_EE/projects.lang
diff --git a/htdocs/langs/et_EE/propal.lang b/public/langs/et_EE/propal.lang
similarity index 100%
rename from htdocs/langs/et_EE/propal.lang
rename to public/langs/et_EE/propal.lang
diff --git a/htdocs/langs/et_EE/receiptprinter.lang b/public/langs/et_EE/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/et_EE/receiptprinter.lang
rename to public/langs/et_EE/receiptprinter.lang
diff --git a/htdocs/langs/et_EE/resource.lang b/public/langs/et_EE/resource.lang
similarity index 100%
rename from htdocs/langs/et_EE/resource.lang
rename to public/langs/et_EE/resource.lang
diff --git a/htdocs/langs/et_EE/salaries.lang b/public/langs/et_EE/salaries.lang
similarity index 100%
rename from htdocs/langs/et_EE/salaries.lang
rename to public/langs/et_EE/salaries.lang
diff --git a/htdocs/langs/et_EE/sendings.lang b/public/langs/et_EE/sendings.lang
similarity index 100%
rename from htdocs/langs/et_EE/sendings.lang
rename to public/langs/et_EE/sendings.lang
diff --git a/htdocs/langs/et_EE/sms.lang b/public/langs/et_EE/sms.lang
similarity index 100%
rename from htdocs/langs/et_EE/sms.lang
rename to public/langs/et_EE/sms.lang
diff --git a/htdocs/langs/et_EE/stocks.lang b/public/langs/et_EE/stocks.lang
similarity index 100%
rename from htdocs/langs/et_EE/stocks.lang
rename to public/langs/et_EE/stocks.lang
diff --git a/htdocs/langs/et_EE/supplier_proposal.lang b/public/langs/et_EE/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/et_EE/supplier_proposal.lang
rename to public/langs/et_EE/supplier_proposal.lang
diff --git a/htdocs/langs/et_EE/suppliers.lang b/public/langs/et_EE/suppliers.lang
similarity index 100%
rename from htdocs/langs/et_EE/suppliers.lang
rename to public/langs/et_EE/suppliers.lang
diff --git a/htdocs/langs/et_EE/trips.lang b/public/langs/et_EE/trips.lang
similarity index 100%
rename from htdocs/langs/et_EE/trips.lang
rename to public/langs/et_EE/trips.lang
diff --git a/htdocs/langs/et_EE/users.lang b/public/langs/et_EE/users.lang
similarity index 100%
rename from htdocs/langs/et_EE/users.lang
rename to public/langs/et_EE/users.lang
diff --git a/htdocs/langs/et_EE/website.lang b/public/langs/et_EE/website.lang
similarity index 100%
rename from htdocs/langs/et_EE/website.lang
rename to public/langs/et_EE/website.lang
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/public/langs/et_EE/withdrawals.lang
similarity index 100%
rename from htdocs/langs/et_EE/withdrawals.lang
rename to public/langs/et_EE/withdrawals.lang
diff --git a/htdocs/langs/et_EE/workflow.lang b/public/langs/et_EE/workflow.lang
similarity index 100%
rename from htdocs/langs/et_EE/workflow.lang
rename to public/langs/et_EE/workflow.lang
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/public/langs/eu_ES/accountancy.lang
similarity index 100%
rename from htdocs/langs/eu_ES/accountancy.lang
rename to public/langs/eu_ES/accountancy.lang
diff --git a/htdocs/langs/eu_ES/admin.lang b/public/langs/eu_ES/admin.lang
similarity index 100%
rename from htdocs/langs/eu_ES/admin.lang
rename to public/langs/eu_ES/admin.lang
diff --git a/htdocs/langs/eu_ES/agenda.lang b/public/langs/eu_ES/agenda.lang
similarity index 100%
rename from htdocs/langs/eu_ES/agenda.lang
rename to public/langs/eu_ES/agenda.lang
diff --git a/htdocs/langs/eu_ES/banks.lang b/public/langs/eu_ES/banks.lang
similarity index 100%
rename from htdocs/langs/eu_ES/banks.lang
rename to public/langs/eu_ES/banks.lang
diff --git a/htdocs/langs/eu_ES/bills.lang b/public/langs/eu_ES/bills.lang
similarity index 100%
rename from htdocs/langs/eu_ES/bills.lang
rename to public/langs/eu_ES/bills.lang
diff --git a/htdocs/langs/eu_ES/bookmarks.lang b/public/langs/eu_ES/bookmarks.lang
similarity index 100%
rename from htdocs/langs/eu_ES/bookmarks.lang
rename to public/langs/eu_ES/bookmarks.lang
diff --git a/htdocs/langs/eu_ES/boxes.lang b/public/langs/eu_ES/boxes.lang
similarity index 100%
rename from htdocs/langs/eu_ES/boxes.lang
rename to public/langs/eu_ES/boxes.lang
diff --git a/htdocs/langs/eu_ES/cashdesk.lang b/public/langs/eu_ES/cashdesk.lang
similarity index 100%
rename from htdocs/langs/eu_ES/cashdesk.lang
rename to public/langs/eu_ES/cashdesk.lang
diff --git a/htdocs/langs/eu_ES/categories.lang b/public/langs/eu_ES/categories.lang
similarity index 100%
rename from htdocs/langs/eu_ES/categories.lang
rename to public/langs/eu_ES/categories.lang
diff --git a/htdocs/langs/eu_ES/commercial.lang b/public/langs/eu_ES/commercial.lang
similarity index 100%
rename from htdocs/langs/eu_ES/commercial.lang
rename to public/langs/eu_ES/commercial.lang
diff --git a/htdocs/langs/eu_ES/companies.lang b/public/langs/eu_ES/companies.lang
similarity index 100%
rename from htdocs/langs/eu_ES/companies.lang
rename to public/langs/eu_ES/companies.lang
diff --git a/htdocs/langs/eu_ES/compta.lang b/public/langs/eu_ES/compta.lang
similarity index 100%
rename from htdocs/langs/eu_ES/compta.lang
rename to public/langs/eu_ES/compta.lang
diff --git a/htdocs/langs/eu_ES/contracts.lang b/public/langs/eu_ES/contracts.lang
similarity index 100%
rename from htdocs/langs/eu_ES/contracts.lang
rename to public/langs/eu_ES/contracts.lang
diff --git a/htdocs/langs/eu_ES/cron.lang b/public/langs/eu_ES/cron.lang
similarity index 100%
rename from htdocs/langs/eu_ES/cron.lang
rename to public/langs/eu_ES/cron.lang
diff --git a/htdocs/langs/eu_ES/deliveries.lang b/public/langs/eu_ES/deliveries.lang
similarity index 100%
rename from htdocs/langs/eu_ES/deliveries.lang
rename to public/langs/eu_ES/deliveries.lang
diff --git a/htdocs/langs/eu_ES/dict.lang b/public/langs/eu_ES/dict.lang
similarity index 100%
rename from htdocs/langs/eu_ES/dict.lang
rename to public/langs/eu_ES/dict.lang
diff --git a/htdocs/langs/eu_ES/donations.lang b/public/langs/eu_ES/donations.lang
similarity index 100%
rename from htdocs/langs/eu_ES/donations.lang
rename to public/langs/eu_ES/donations.lang
diff --git a/htdocs/langs/eu_ES/ecm.lang b/public/langs/eu_ES/ecm.lang
similarity index 100%
rename from htdocs/langs/eu_ES/ecm.lang
rename to public/langs/eu_ES/ecm.lang
diff --git a/htdocs/langs/eu_ES/errors.lang b/public/langs/eu_ES/errors.lang
similarity index 100%
rename from htdocs/langs/eu_ES/errors.lang
rename to public/langs/eu_ES/errors.lang
diff --git a/htdocs/langs/eu_ES/expensereports.lang b/public/langs/eu_ES/expensereports.lang
similarity index 100%
rename from htdocs/langs/eu_ES/expensereports.lang
rename to public/langs/eu_ES/expensereports.lang
diff --git a/htdocs/langs/eu_ES/exports.lang b/public/langs/eu_ES/exports.lang
similarity index 100%
rename from htdocs/langs/eu_ES/exports.lang
rename to public/langs/eu_ES/exports.lang
diff --git a/htdocs/langs/eu_ES/externalsite.lang b/public/langs/eu_ES/externalsite.lang
similarity index 100%
rename from htdocs/langs/eu_ES/externalsite.lang
rename to public/langs/eu_ES/externalsite.lang
diff --git a/htdocs/langs/eu_ES/ftp.lang b/public/langs/eu_ES/ftp.lang
similarity index 100%
rename from htdocs/langs/eu_ES/ftp.lang
rename to public/langs/eu_ES/ftp.lang
diff --git a/htdocs/langs/eu_ES/help.lang b/public/langs/eu_ES/help.lang
similarity index 100%
rename from htdocs/langs/eu_ES/help.lang
rename to public/langs/eu_ES/help.lang
diff --git a/htdocs/langs/eu_ES/holiday.lang b/public/langs/eu_ES/holiday.lang
similarity index 100%
rename from htdocs/langs/eu_ES/holiday.lang
rename to public/langs/eu_ES/holiday.lang
diff --git a/htdocs/langs/eu_ES/hrm.lang b/public/langs/eu_ES/hrm.lang
similarity index 100%
rename from htdocs/langs/eu_ES/hrm.lang
rename to public/langs/eu_ES/hrm.lang
diff --git a/htdocs/langs/eu_ES/incoterm.lang b/public/langs/eu_ES/incoterm.lang
similarity index 100%
rename from htdocs/langs/eu_ES/incoterm.lang
rename to public/langs/eu_ES/incoterm.lang
diff --git a/htdocs/langs/eu_ES/install.lang b/public/langs/eu_ES/install.lang
similarity index 100%
rename from htdocs/langs/eu_ES/install.lang
rename to public/langs/eu_ES/install.lang
diff --git a/htdocs/langs/eu_ES/interventions.lang b/public/langs/eu_ES/interventions.lang
similarity index 100%
rename from htdocs/langs/eu_ES/interventions.lang
rename to public/langs/eu_ES/interventions.lang
diff --git a/htdocs/langs/eu_ES/languages.lang b/public/langs/eu_ES/languages.lang
similarity index 100%
rename from htdocs/langs/eu_ES/languages.lang
rename to public/langs/eu_ES/languages.lang
diff --git a/htdocs/langs/eu_ES/ldap.lang b/public/langs/eu_ES/ldap.lang
similarity index 100%
rename from htdocs/langs/eu_ES/ldap.lang
rename to public/langs/eu_ES/ldap.lang
diff --git a/htdocs/langs/eu_ES/link.lang b/public/langs/eu_ES/link.lang
similarity index 100%
rename from htdocs/langs/eu_ES/link.lang
rename to public/langs/eu_ES/link.lang
diff --git a/htdocs/langs/eu_ES/loan.lang b/public/langs/eu_ES/loan.lang
similarity index 100%
rename from htdocs/langs/eu_ES/loan.lang
rename to public/langs/eu_ES/loan.lang
diff --git a/htdocs/langs/eu_ES/mailmanspip.lang b/public/langs/eu_ES/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/eu_ES/mailmanspip.lang
rename to public/langs/eu_ES/mailmanspip.lang
diff --git a/htdocs/langs/eu_ES/mails.lang b/public/langs/eu_ES/mails.lang
similarity index 100%
rename from htdocs/langs/eu_ES/mails.lang
rename to public/langs/eu_ES/mails.lang
diff --git a/htdocs/langs/eu_ES/main.lang b/public/langs/eu_ES/main.lang
similarity index 100%
rename from htdocs/langs/eu_ES/main.lang
rename to public/langs/eu_ES/main.lang
diff --git a/htdocs/langs/eu_ES/margins.lang b/public/langs/eu_ES/margins.lang
similarity index 100%
rename from htdocs/langs/eu_ES/margins.lang
rename to public/langs/eu_ES/margins.lang
diff --git a/htdocs/langs/eu_ES/members.lang b/public/langs/eu_ES/members.lang
similarity index 100%
rename from htdocs/langs/eu_ES/members.lang
rename to public/langs/eu_ES/members.lang
diff --git a/htdocs/langs/eu_ES/oauth.lang b/public/langs/eu_ES/oauth.lang
similarity index 100%
rename from htdocs/langs/eu_ES/oauth.lang
rename to public/langs/eu_ES/oauth.lang
diff --git a/htdocs/langs/eu_ES/opensurvey.lang b/public/langs/eu_ES/opensurvey.lang
similarity index 100%
rename from htdocs/langs/eu_ES/opensurvey.lang
rename to public/langs/eu_ES/opensurvey.lang
diff --git a/htdocs/langs/eu_ES/orders.lang b/public/langs/eu_ES/orders.lang
similarity index 100%
rename from htdocs/langs/eu_ES/orders.lang
rename to public/langs/eu_ES/orders.lang
diff --git a/htdocs/langs/eu_ES/other.lang b/public/langs/eu_ES/other.lang
similarity index 100%
rename from htdocs/langs/eu_ES/other.lang
rename to public/langs/eu_ES/other.lang
diff --git a/htdocs/langs/eu_ES/paybox.lang b/public/langs/eu_ES/paybox.lang
similarity index 100%
rename from htdocs/langs/eu_ES/paybox.lang
rename to public/langs/eu_ES/paybox.lang
diff --git a/htdocs/langs/eu_ES/paypal.lang b/public/langs/eu_ES/paypal.lang
similarity index 100%
rename from htdocs/langs/eu_ES/paypal.lang
rename to public/langs/eu_ES/paypal.lang
diff --git a/htdocs/langs/eu_ES/printing.lang b/public/langs/eu_ES/printing.lang
similarity index 100%
rename from htdocs/langs/eu_ES/printing.lang
rename to public/langs/eu_ES/printing.lang
diff --git a/htdocs/langs/eu_ES/productbatch.lang b/public/langs/eu_ES/productbatch.lang
similarity index 100%
rename from htdocs/langs/eu_ES/productbatch.lang
rename to public/langs/eu_ES/productbatch.lang
diff --git a/htdocs/langs/eu_ES/products.lang b/public/langs/eu_ES/products.lang
similarity index 100%
rename from htdocs/langs/eu_ES/products.lang
rename to public/langs/eu_ES/products.lang
diff --git a/htdocs/langs/eu_ES/projects.lang b/public/langs/eu_ES/projects.lang
similarity index 100%
rename from htdocs/langs/eu_ES/projects.lang
rename to public/langs/eu_ES/projects.lang
diff --git a/htdocs/langs/eu_ES/propal.lang b/public/langs/eu_ES/propal.lang
similarity index 100%
rename from htdocs/langs/eu_ES/propal.lang
rename to public/langs/eu_ES/propal.lang
diff --git a/htdocs/langs/eu_ES/receiptprinter.lang b/public/langs/eu_ES/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/eu_ES/receiptprinter.lang
rename to public/langs/eu_ES/receiptprinter.lang
diff --git a/htdocs/langs/eu_ES/resource.lang b/public/langs/eu_ES/resource.lang
similarity index 100%
rename from htdocs/langs/eu_ES/resource.lang
rename to public/langs/eu_ES/resource.lang
diff --git a/htdocs/langs/eu_ES/salaries.lang b/public/langs/eu_ES/salaries.lang
similarity index 100%
rename from htdocs/langs/eu_ES/salaries.lang
rename to public/langs/eu_ES/salaries.lang
diff --git a/htdocs/langs/eu_ES/sendings.lang b/public/langs/eu_ES/sendings.lang
similarity index 100%
rename from htdocs/langs/eu_ES/sendings.lang
rename to public/langs/eu_ES/sendings.lang
diff --git a/htdocs/langs/eu_ES/sms.lang b/public/langs/eu_ES/sms.lang
similarity index 100%
rename from htdocs/langs/eu_ES/sms.lang
rename to public/langs/eu_ES/sms.lang
diff --git a/htdocs/langs/eu_ES/stocks.lang b/public/langs/eu_ES/stocks.lang
similarity index 100%
rename from htdocs/langs/eu_ES/stocks.lang
rename to public/langs/eu_ES/stocks.lang
diff --git a/htdocs/langs/eu_ES/supplier_proposal.lang b/public/langs/eu_ES/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/eu_ES/supplier_proposal.lang
rename to public/langs/eu_ES/supplier_proposal.lang
diff --git a/htdocs/langs/eu_ES/suppliers.lang b/public/langs/eu_ES/suppliers.lang
similarity index 100%
rename from htdocs/langs/eu_ES/suppliers.lang
rename to public/langs/eu_ES/suppliers.lang
diff --git a/htdocs/langs/eu_ES/trips.lang b/public/langs/eu_ES/trips.lang
similarity index 100%
rename from htdocs/langs/eu_ES/trips.lang
rename to public/langs/eu_ES/trips.lang
diff --git a/htdocs/langs/eu_ES/users.lang b/public/langs/eu_ES/users.lang
similarity index 100%
rename from htdocs/langs/eu_ES/users.lang
rename to public/langs/eu_ES/users.lang
diff --git a/htdocs/langs/eu_ES/website.lang b/public/langs/eu_ES/website.lang
similarity index 100%
rename from htdocs/langs/eu_ES/website.lang
rename to public/langs/eu_ES/website.lang
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/public/langs/eu_ES/withdrawals.lang
similarity index 100%
rename from htdocs/langs/eu_ES/withdrawals.lang
rename to public/langs/eu_ES/withdrawals.lang
diff --git a/htdocs/langs/eu_ES/workflow.lang b/public/langs/eu_ES/workflow.lang
similarity index 100%
rename from htdocs/langs/eu_ES/workflow.lang
rename to public/langs/eu_ES/workflow.lang
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/public/langs/fa_IR/accountancy.lang
similarity index 100%
rename from htdocs/langs/fa_IR/accountancy.lang
rename to public/langs/fa_IR/accountancy.lang
diff --git a/htdocs/langs/fa_IR/admin.lang b/public/langs/fa_IR/admin.lang
similarity index 100%
rename from htdocs/langs/fa_IR/admin.lang
rename to public/langs/fa_IR/admin.lang
diff --git a/htdocs/langs/fa_IR/agenda.lang b/public/langs/fa_IR/agenda.lang
similarity index 100%
rename from htdocs/langs/fa_IR/agenda.lang
rename to public/langs/fa_IR/agenda.lang
diff --git a/htdocs/langs/fa_IR/banks.lang b/public/langs/fa_IR/banks.lang
similarity index 100%
rename from htdocs/langs/fa_IR/banks.lang
rename to public/langs/fa_IR/banks.lang
diff --git a/htdocs/langs/fa_IR/bills.lang b/public/langs/fa_IR/bills.lang
similarity index 100%
rename from htdocs/langs/fa_IR/bills.lang
rename to public/langs/fa_IR/bills.lang
diff --git a/htdocs/langs/fa_IR/bookmarks.lang b/public/langs/fa_IR/bookmarks.lang
similarity index 100%
rename from htdocs/langs/fa_IR/bookmarks.lang
rename to public/langs/fa_IR/bookmarks.lang
diff --git a/htdocs/langs/fa_IR/boxes.lang b/public/langs/fa_IR/boxes.lang
similarity index 100%
rename from htdocs/langs/fa_IR/boxes.lang
rename to public/langs/fa_IR/boxes.lang
diff --git a/htdocs/langs/fa_IR/cashdesk.lang b/public/langs/fa_IR/cashdesk.lang
similarity index 100%
rename from htdocs/langs/fa_IR/cashdesk.lang
rename to public/langs/fa_IR/cashdesk.lang
diff --git a/htdocs/langs/fa_IR/categories.lang b/public/langs/fa_IR/categories.lang
similarity index 100%
rename from htdocs/langs/fa_IR/categories.lang
rename to public/langs/fa_IR/categories.lang
diff --git a/htdocs/langs/fa_IR/commercial.lang b/public/langs/fa_IR/commercial.lang
similarity index 100%
rename from htdocs/langs/fa_IR/commercial.lang
rename to public/langs/fa_IR/commercial.lang
diff --git a/htdocs/langs/fa_IR/companies.lang b/public/langs/fa_IR/companies.lang
similarity index 100%
rename from htdocs/langs/fa_IR/companies.lang
rename to public/langs/fa_IR/companies.lang
diff --git a/htdocs/langs/fa_IR/compta.lang b/public/langs/fa_IR/compta.lang
similarity index 100%
rename from htdocs/langs/fa_IR/compta.lang
rename to public/langs/fa_IR/compta.lang
diff --git a/htdocs/langs/fa_IR/contracts.lang b/public/langs/fa_IR/contracts.lang
similarity index 100%
rename from htdocs/langs/fa_IR/contracts.lang
rename to public/langs/fa_IR/contracts.lang
diff --git a/htdocs/langs/fa_IR/cron.lang b/public/langs/fa_IR/cron.lang
similarity index 100%
rename from htdocs/langs/fa_IR/cron.lang
rename to public/langs/fa_IR/cron.lang
diff --git a/htdocs/langs/fa_IR/deliveries.lang b/public/langs/fa_IR/deliveries.lang
similarity index 100%
rename from htdocs/langs/fa_IR/deliveries.lang
rename to public/langs/fa_IR/deliveries.lang
diff --git a/htdocs/langs/fa_IR/dict.lang b/public/langs/fa_IR/dict.lang
similarity index 100%
rename from htdocs/langs/fa_IR/dict.lang
rename to public/langs/fa_IR/dict.lang
diff --git a/htdocs/langs/fa_IR/domains.lang b/public/langs/fa_IR/domains.lang
similarity index 100%
rename from htdocs/langs/fa_IR/domains.lang
rename to public/langs/fa_IR/domains.lang
diff --git a/htdocs/langs/fa_IR/donations.lang b/public/langs/fa_IR/donations.lang
similarity index 100%
rename from htdocs/langs/fa_IR/donations.lang
rename to public/langs/fa_IR/donations.lang
diff --git a/htdocs/langs/fa_IR/ecm.lang b/public/langs/fa_IR/ecm.lang
similarity index 100%
rename from htdocs/langs/fa_IR/ecm.lang
rename to public/langs/fa_IR/ecm.lang
diff --git a/htdocs/langs/fa_IR/errors.lang b/public/langs/fa_IR/errors.lang
similarity index 100%
rename from htdocs/langs/fa_IR/errors.lang
rename to public/langs/fa_IR/errors.lang
diff --git a/htdocs/langs/fa_IR/exports.lang b/public/langs/fa_IR/exports.lang
similarity index 100%
rename from htdocs/langs/fa_IR/exports.lang
rename to public/langs/fa_IR/exports.lang
diff --git a/htdocs/langs/fa_IR/externalsite.lang b/public/langs/fa_IR/externalsite.lang
similarity index 100%
rename from htdocs/langs/fa_IR/externalsite.lang
rename to public/langs/fa_IR/externalsite.lang
diff --git a/htdocs/langs/fa_IR/ftp.lang b/public/langs/fa_IR/ftp.lang
similarity index 100%
rename from htdocs/langs/fa_IR/ftp.lang
rename to public/langs/fa_IR/ftp.lang
diff --git a/htdocs/langs/fa_IR/help.lang b/public/langs/fa_IR/help.lang
similarity index 100%
rename from htdocs/langs/fa_IR/help.lang
rename to public/langs/fa_IR/help.lang
diff --git a/htdocs/langs/fa_IR/holiday.lang b/public/langs/fa_IR/holiday.lang
similarity index 100%
rename from htdocs/langs/fa_IR/holiday.lang
rename to public/langs/fa_IR/holiday.lang
diff --git a/htdocs/langs/fa_IR/hrm.lang b/public/langs/fa_IR/hrm.lang
similarity index 100%
rename from htdocs/langs/fa_IR/hrm.lang
rename to public/langs/fa_IR/hrm.lang
diff --git a/htdocs/langs/fa_IR/incoterm.lang b/public/langs/fa_IR/incoterm.lang
similarity index 100%
rename from htdocs/langs/fa_IR/incoterm.lang
rename to public/langs/fa_IR/incoterm.lang
diff --git a/htdocs/langs/fa_IR/install.lang b/public/langs/fa_IR/install.lang
similarity index 100%
rename from htdocs/langs/fa_IR/install.lang
rename to public/langs/fa_IR/install.lang
diff --git a/htdocs/langs/fa_IR/interventions.lang b/public/langs/fa_IR/interventions.lang
similarity index 100%
rename from htdocs/langs/fa_IR/interventions.lang
rename to public/langs/fa_IR/interventions.lang
diff --git a/htdocs/langs/fa_IR/languages.lang b/public/langs/fa_IR/languages.lang
similarity index 100%
rename from htdocs/langs/fa_IR/languages.lang
rename to public/langs/fa_IR/languages.lang
diff --git a/htdocs/langs/fa_IR/ldap.lang b/public/langs/fa_IR/ldap.lang
similarity index 100%
rename from htdocs/langs/fa_IR/ldap.lang
rename to public/langs/fa_IR/ldap.lang
diff --git a/htdocs/langs/fa_IR/link.lang b/public/langs/fa_IR/link.lang
similarity index 100%
rename from htdocs/langs/fa_IR/link.lang
rename to public/langs/fa_IR/link.lang
diff --git a/htdocs/langs/fa_IR/loan.lang b/public/langs/fa_IR/loan.lang
similarity index 100%
rename from htdocs/langs/fa_IR/loan.lang
rename to public/langs/fa_IR/loan.lang
diff --git a/htdocs/langs/fa_IR/mailmanspip.lang b/public/langs/fa_IR/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/fa_IR/mailmanspip.lang
rename to public/langs/fa_IR/mailmanspip.lang
diff --git a/htdocs/langs/fa_IR/mails.lang b/public/langs/fa_IR/mails.lang
similarity index 100%
rename from htdocs/langs/fa_IR/mails.lang
rename to public/langs/fa_IR/mails.lang
diff --git a/htdocs/langs/fa_IR/main.lang b/public/langs/fa_IR/main.lang
similarity index 100%
rename from htdocs/langs/fa_IR/main.lang
rename to public/langs/fa_IR/main.lang
diff --git a/htdocs/langs/fa_IR/margins.lang b/public/langs/fa_IR/margins.lang
similarity index 100%
rename from htdocs/langs/fa_IR/margins.lang
rename to public/langs/fa_IR/margins.lang
diff --git a/htdocs/langs/fa_IR/members.lang b/public/langs/fa_IR/members.lang
similarity index 100%
rename from htdocs/langs/fa_IR/members.lang
rename to public/langs/fa_IR/members.lang
diff --git a/htdocs/langs/fa_IR/oauth.lang b/public/langs/fa_IR/oauth.lang
similarity index 100%
rename from htdocs/langs/fa_IR/oauth.lang
rename to public/langs/fa_IR/oauth.lang
diff --git a/htdocs/langs/fa_IR/opensurvey.lang b/public/langs/fa_IR/opensurvey.lang
similarity index 100%
rename from htdocs/langs/fa_IR/opensurvey.lang
rename to public/langs/fa_IR/opensurvey.lang
diff --git a/htdocs/langs/fa_IR/orders.lang b/public/langs/fa_IR/orders.lang
similarity index 100%
rename from htdocs/langs/fa_IR/orders.lang
rename to public/langs/fa_IR/orders.lang
diff --git a/htdocs/langs/fa_IR/other.lang b/public/langs/fa_IR/other.lang
similarity index 100%
rename from htdocs/langs/fa_IR/other.lang
rename to public/langs/fa_IR/other.lang
diff --git a/htdocs/langs/fa_IR/paybox.lang b/public/langs/fa_IR/paybox.lang
similarity index 100%
rename from htdocs/langs/fa_IR/paybox.lang
rename to public/langs/fa_IR/paybox.lang
diff --git a/htdocs/langs/fa_IR/paypal.lang b/public/langs/fa_IR/paypal.lang
similarity index 100%
rename from htdocs/langs/fa_IR/paypal.lang
rename to public/langs/fa_IR/paypal.lang
diff --git a/htdocs/langs/fa_IR/printing.lang b/public/langs/fa_IR/printing.lang
similarity index 100%
rename from htdocs/langs/fa_IR/printing.lang
rename to public/langs/fa_IR/printing.lang
diff --git a/htdocs/langs/fa_IR/productbatch.lang b/public/langs/fa_IR/productbatch.lang
similarity index 100%
rename from htdocs/langs/fa_IR/productbatch.lang
rename to public/langs/fa_IR/productbatch.lang
diff --git a/htdocs/langs/fa_IR/products.lang b/public/langs/fa_IR/products.lang
similarity index 100%
rename from htdocs/langs/fa_IR/products.lang
rename to public/langs/fa_IR/products.lang
diff --git a/htdocs/langs/fa_IR/projects.lang b/public/langs/fa_IR/projects.lang
similarity index 100%
rename from htdocs/langs/fa_IR/projects.lang
rename to public/langs/fa_IR/projects.lang
diff --git a/htdocs/langs/fa_IR/propal.lang b/public/langs/fa_IR/propal.lang
similarity index 100%
rename from htdocs/langs/fa_IR/propal.lang
rename to public/langs/fa_IR/propal.lang
diff --git a/htdocs/langs/fa_IR/receiptprinter.lang b/public/langs/fa_IR/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/fa_IR/receiptprinter.lang
rename to public/langs/fa_IR/receiptprinter.lang
diff --git a/htdocs/langs/fa_IR/resource.lang b/public/langs/fa_IR/resource.lang
similarity index 100%
rename from htdocs/langs/fa_IR/resource.lang
rename to public/langs/fa_IR/resource.lang
diff --git a/htdocs/langs/fa_IR/salaries.lang b/public/langs/fa_IR/salaries.lang
similarity index 100%
rename from htdocs/langs/fa_IR/salaries.lang
rename to public/langs/fa_IR/salaries.lang
diff --git a/htdocs/langs/fa_IR/sendings.lang b/public/langs/fa_IR/sendings.lang
similarity index 100%
rename from htdocs/langs/fa_IR/sendings.lang
rename to public/langs/fa_IR/sendings.lang
diff --git a/htdocs/langs/fa_IR/sms.lang b/public/langs/fa_IR/sms.lang
similarity index 100%
rename from htdocs/langs/fa_IR/sms.lang
rename to public/langs/fa_IR/sms.lang
diff --git a/htdocs/langs/fa_IR/stocks.lang b/public/langs/fa_IR/stocks.lang
similarity index 100%
rename from htdocs/langs/fa_IR/stocks.lang
rename to public/langs/fa_IR/stocks.lang
diff --git a/htdocs/langs/fa_IR/supplier_proposal.lang b/public/langs/fa_IR/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/fa_IR/supplier_proposal.lang
rename to public/langs/fa_IR/supplier_proposal.lang
diff --git a/htdocs/langs/fa_IR/suppliers.lang b/public/langs/fa_IR/suppliers.lang
similarity index 100%
rename from htdocs/langs/fa_IR/suppliers.lang
rename to public/langs/fa_IR/suppliers.lang
diff --git a/htdocs/langs/fa_IR/trips.lang b/public/langs/fa_IR/trips.lang
similarity index 100%
rename from htdocs/langs/fa_IR/trips.lang
rename to public/langs/fa_IR/trips.lang
diff --git a/htdocs/langs/fa_IR/users.lang b/public/langs/fa_IR/users.lang
similarity index 100%
rename from htdocs/langs/fa_IR/users.lang
rename to public/langs/fa_IR/users.lang
diff --git a/htdocs/langs/fa_IR/website.lang b/public/langs/fa_IR/website.lang
similarity index 100%
rename from htdocs/langs/fa_IR/website.lang
rename to public/langs/fa_IR/website.lang
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/public/langs/fa_IR/withdrawals.lang
similarity index 100%
rename from htdocs/langs/fa_IR/withdrawals.lang
rename to public/langs/fa_IR/withdrawals.lang
diff --git a/htdocs/langs/fa_IR/workflow.lang b/public/langs/fa_IR/workflow.lang
similarity index 100%
rename from htdocs/langs/fa_IR/workflow.lang
rename to public/langs/fa_IR/workflow.lang
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/public/langs/fi_FI/accountancy.lang
similarity index 100%
rename from htdocs/langs/fi_FI/accountancy.lang
rename to public/langs/fi_FI/accountancy.lang
diff --git a/htdocs/langs/fi_FI/admin.lang b/public/langs/fi_FI/admin.lang
similarity index 100%
rename from htdocs/langs/fi_FI/admin.lang
rename to public/langs/fi_FI/admin.lang
diff --git a/htdocs/langs/fi_FI/agenda.lang b/public/langs/fi_FI/agenda.lang
similarity index 100%
rename from htdocs/langs/fi_FI/agenda.lang
rename to public/langs/fi_FI/agenda.lang
diff --git a/htdocs/langs/fi_FI/banks.lang b/public/langs/fi_FI/banks.lang
similarity index 100%
rename from htdocs/langs/fi_FI/banks.lang
rename to public/langs/fi_FI/banks.lang
diff --git a/htdocs/langs/fi_FI/bills.lang b/public/langs/fi_FI/bills.lang
similarity index 100%
rename from htdocs/langs/fi_FI/bills.lang
rename to public/langs/fi_FI/bills.lang
diff --git a/htdocs/langs/fi_FI/bookmarks.lang b/public/langs/fi_FI/bookmarks.lang
similarity index 100%
rename from htdocs/langs/fi_FI/bookmarks.lang
rename to public/langs/fi_FI/bookmarks.lang
diff --git a/htdocs/langs/fi_FI/boxes.lang b/public/langs/fi_FI/boxes.lang
similarity index 100%
rename from htdocs/langs/fi_FI/boxes.lang
rename to public/langs/fi_FI/boxes.lang
diff --git a/htdocs/langs/fi_FI/cashdesk.lang b/public/langs/fi_FI/cashdesk.lang
similarity index 100%
rename from htdocs/langs/fi_FI/cashdesk.lang
rename to public/langs/fi_FI/cashdesk.lang
diff --git a/htdocs/langs/fi_FI/categories.lang b/public/langs/fi_FI/categories.lang
similarity index 100%
rename from htdocs/langs/fi_FI/categories.lang
rename to public/langs/fi_FI/categories.lang
diff --git a/htdocs/langs/fi_FI/commercial.lang b/public/langs/fi_FI/commercial.lang
similarity index 100%
rename from htdocs/langs/fi_FI/commercial.lang
rename to public/langs/fi_FI/commercial.lang
diff --git a/htdocs/langs/fi_FI/companies.lang b/public/langs/fi_FI/companies.lang
similarity index 100%
rename from htdocs/langs/fi_FI/companies.lang
rename to public/langs/fi_FI/companies.lang
diff --git a/htdocs/langs/fi_FI/compta.lang b/public/langs/fi_FI/compta.lang
similarity index 100%
rename from htdocs/langs/fi_FI/compta.lang
rename to public/langs/fi_FI/compta.lang
diff --git a/htdocs/langs/fi_FI/contracts.lang b/public/langs/fi_FI/contracts.lang
similarity index 100%
rename from htdocs/langs/fi_FI/contracts.lang
rename to public/langs/fi_FI/contracts.lang
diff --git a/htdocs/langs/fi_FI/cron.lang b/public/langs/fi_FI/cron.lang
similarity index 100%
rename from htdocs/langs/fi_FI/cron.lang
rename to public/langs/fi_FI/cron.lang
diff --git a/htdocs/langs/fi_FI/deliveries.lang b/public/langs/fi_FI/deliveries.lang
similarity index 100%
rename from htdocs/langs/fi_FI/deliveries.lang
rename to public/langs/fi_FI/deliveries.lang
diff --git a/htdocs/langs/fi_FI/dict.lang b/public/langs/fi_FI/dict.lang
similarity index 100%
rename from htdocs/langs/fi_FI/dict.lang
rename to public/langs/fi_FI/dict.lang
diff --git a/htdocs/langs/fi_FI/donations.lang b/public/langs/fi_FI/donations.lang
similarity index 100%
rename from htdocs/langs/fi_FI/donations.lang
rename to public/langs/fi_FI/donations.lang
diff --git a/htdocs/langs/fi_FI/ecm.lang b/public/langs/fi_FI/ecm.lang
similarity index 100%
rename from htdocs/langs/fi_FI/ecm.lang
rename to public/langs/fi_FI/ecm.lang
diff --git a/htdocs/langs/fi_FI/errors.lang b/public/langs/fi_FI/errors.lang
similarity index 100%
rename from htdocs/langs/fi_FI/errors.lang
rename to public/langs/fi_FI/errors.lang
diff --git a/htdocs/langs/fi_FI/exports.lang b/public/langs/fi_FI/exports.lang
similarity index 100%
rename from htdocs/langs/fi_FI/exports.lang
rename to public/langs/fi_FI/exports.lang
diff --git a/htdocs/langs/fi_FI/externalsite.lang b/public/langs/fi_FI/externalsite.lang
similarity index 100%
rename from htdocs/langs/fi_FI/externalsite.lang
rename to public/langs/fi_FI/externalsite.lang
diff --git a/htdocs/langs/fi_FI/ftp.lang b/public/langs/fi_FI/ftp.lang
similarity index 100%
rename from htdocs/langs/fi_FI/ftp.lang
rename to public/langs/fi_FI/ftp.lang
diff --git a/htdocs/langs/fi_FI/help.lang b/public/langs/fi_FI/help.lang
similarity index 100%
rename from htdocs/langs/fi_FI/help.lang
rename to public/langs/fi_FI/help.lang
diff --git a/htdocs/langs/fi_FI/holiday.lang b/public/langs/fi_FI/holiday.lang
similarity index 100%
rename from htdocs/langs/fi_FI/holiday.lang
rename to public/langs/fi_FI/holiday.lang
diff --git a/htdocs/langs/fi_FI/hrm.lang b/public/langs/fi_FI/hrm.lang
similarity index 100%
rename from htdocs/langs/fi_FI/hrm.lang
rename to public/langs/fi_FI/hrm.lang
diff --git a/htdocs/langs/fi_FI/incoterm.lang b/public/langs/fi_FI/incoterm.lang
similarity index 100%
rename from htdocs/langs/fi_FI/incoterm.lang
rename to public/langs/fi_FI/incoterm.lang
diff --git a/htdocs/langs/fi_FI/install.lang b/public/langs/fi_FI/install.lang
similarity index 100%
rename from htdocs/langs/fi_FI/install.lang
rename to public/langs/fi_FI/install.lang
diff --git a/htdocs/langs/fi_FI/interventions.lang b/public/langs/fi_FI/interventions.lang
similarity index 100%
rename from htdocs/langs/fi_FI/interventions.lang
rename to public/langs/fi_FI/interventions.lang
diff --git a/htdocs/langs/fi_FI/languages.lang b/public/langs/fi_FI/languages.lang
similarity index 100%
rename from htdocs/langs/fi_FI/languages.lang
rename to public/langs/fi_FI/languages.lang
diff --git a/htdocs/langs/fi_FI/ldap.lang b/public/langs/fi_FI/ldap.lang
similarity index 100%
rename from htdocs/langs/fi_FI/ldap.lang
rename to public/langs/fi_FI/ldap.lang
diff --git a/htdocs/langs/fi_FI/link.lang b/public/langs/fi_FI/link.lang
similarity index 100%
rename from htdocs/langs/fi_FI/link.lang
rename to public/langs/fi_FI/link.lang
diff --git a/htdocs/langs/fi_FI/loan.lang b/public/langs/fi_FI/loan.lang
similarity index 100%
rename from htdocs/langs/fi_FI/loan.lang
rename to public/langs/fi_FI/loan.lang
diff --git a/htdocs/langs/fi_FI/mailmanspip.lang b/public/langs/fi_FI/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/fi_FI/mailmanspip.lang
rename to public/langs/fi_FI/mailmanspip.lang
diff --git a/htdocs/langs/fi_FI/mails.lang b/public/langs/fi_FI/mails.lang
similarity index 100%
rename from htdocs/langs/fi_FI/mails.lang
rename to public/langs/fi_FI/mails.lang
diff --git a/htdocs/langs/fi_FI/main.lang b/public/langs/fi_FI/main.lang
similarity index 100%
rename from htdocs/langs/fi_FI/main.lang
rename to public/langs/fi_FI/main.lang
diff --git a/htdocs/langs/fi_FI/margins.lang b/public/langs/fi_FI/margins.lang
similarity index 100%
rename from htdocs/langs/fi_FI/margins.lang
rename to public/langs/fi_FI/margins.lang
diff --git a/htdocs/langs/fi_FI/members.lang b/public/langs/fi_FI/members.lang
similarity index 100%
rename from htdocs/langs/fi_FI/members.lang
rename to public/langs/fi_FI/members.lang
diff --git a/htdocs/langs/fi_FI/oauth.lang b/public/langs/fi_FI/oauth.lang
similarity index 100%
rename from htdocs/langs/fi_FI/oauth.lang
rename to public/langs/fi_FI/oauth.lang
diff --git a/htdocs/langs/fi_FI/opensurvey.lang b/public/langs/fi_FI/opensurvey.lang
similarity index 100%
rename from htdocs/langs/fi_FI/opensurvey.lang
rename to public/langs/fi_FI/opensurvey.lang
diff --git a/htdocs/langs/fi_FI/orders.lang b/public/langs/fi_FI/orders.lang
similarity index 100%
rename from htdocs/langs/fi_FI/orders.lang
rename to public/langs/fi_FI/orders.lang
diff --git a/htdocs/langs/fi_FI/other.lang b/public/langs/fi_FI/other.lang
similarity index 100%
rename from htdocs/langs/fi_FI/other.lang
rename to public/langs/fi_FI/other.lang
diff --git a/htdocs/langs/fi_FI/paybox.lang b/public/langs/fi_FI/paybox.lang
similarity index 100%
rename from htdocs/langs/fi_FI/paybox.lang
rename to public/langs/fi_FI/paybox.lang
diff --git a/htdocs/langs/fi_FI/paypal.lang b/public/langs/fi_FI/paypal.lang
similarity index 100%
rename from htdocs/langs/fi_FI/paypal.lang
rename to public/langs/fi_FI/paypal.lang
diff --git a/htdocs/langs/fi_FI/printing.lang b/public/langs/fi_FI/printing.lang
similarity index 100%
rename from htdocs/langs/fi_FI/printing.lang
rename to public/langs/fi_FI/printing.lang
diff --git a/htdocs/langs/fi_FI/productbatch.lang b/public/langs/fi_FI/productbatch.lang
similarity index 100%
rename from htdocs/langs/fi_FI/productbatch.lang
rename to public/langs/fi_FI/productbatch.lang
diff --git a/htdocs/langs/fi_FI/products.lang b/public/langs/fi_FI/products.lang
similarity index 100%
rename from htdocs/langs/fi_FI/products.lang
rename to public/langs/fi_FI/products.lang
diff --git a/htdocs/langs/fi_FI/projects.lang b/public/langs/fi_FI/projects.lang
similarity index 100%
rename from htdocs/langs/fi_FI/projects.lang
rename to public/langs/fi_FI/projects.lang
diff --git a/htdocs/langs/fi_FI/propal.lang b/public/langs/fi_FI/propal.lang
similarity index 100%
rename from htdocs/langs/fi_FI/propal.lang
rename to public/langs/fi_FI/propal.lang
diff --git a/htdocs/langs/fi_FI/receiptprinter.lang b/public/langs/fi_FI/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/fi_FI/receiptprinter.lang
rename to public/langs/fi_FI/receiptprinter.lang
diff --git a/htdocs/langs/fi_FI/resource.lang b/public/langs/fi_FI/resource.lang
similarity index 100%
rename from htdocs/langs/fi_FI/resource.lang
rename to public/langs/fi_FI/resource.lang
diff --git a/htdocs/langs/fi_FI/salaries.lang b/public/langs/fi_FI/salaries.lang
similarity index 100%
rename from htdocs/langs/fi_FI/salaries.lang
rename to public/langs/fi_FI/salaries.lang
diff --git a/htdocs/langs/fi_FI/sendings.lang b/public/langs/fi_FI/sendings.lang
similarity index 100%
rename from htdocs/langs/fi_FI/sendings.lang
rename to public/langs/fi_FI/sendings.lang
diff --git a/htdocs/langs/fi_FI/sms.lang b/public/langs/fi_FI/sms.lang
similarity index 100%
rename from htdocs/langs/fi_FI/sms.lang
rename to public/langs/fi_FI/sms.lang
diff --git a/htdocs/langs/fi_FI/stocks.lang b/public/langs/fi_FI/stocks.lang
similarity index 100%
rename from htdocs/langs/fi_FI/stocks.lang
rename to public/langs/fi_FI/stocks.lang
diff --git a/htdocs/langs/fi_FI/supplier_proposal.lang b/public/langs/fi_FI/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/fi_FI/supplier_proposal.lang
rename to public/langs/fi_FI/supplier_proposal.lang
diff --git a/htdocs/langs/fi_FI/suppliers.lang b/public/langs/fi_FI/suppliers.lang
similarity index 100%
rename from htdocs/langs/fi_FI/suppliers.lang
rename to public/langs/fi_FI/suppliers.lang
diff --git a/htdocs/langs/fi_FI/trips.lang b/public/langs/fi_FI/trips.lang
similarity index 100%
rename from htdocs/langs/fi_FI/trips.lang
rename to public/langs/fi_FI/trips.lang
diff --git a/htdocs/langs/fi_FI/users.lang b/public/langs/fi_FI/users.lang
similarity index 100%
rename from htdocs/langs/fi_FI/users.lang
rename to public/langs/fi_FI/users.lang
diff --git a/htdocs/langs/fi_FI/website.lang b/public/langs/fi_FI/website.lang
similarity index 100%
rename from htdocs/langs/fi_FI/website.lang
rename to public/langs/fi_FI/website.lang
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/public/langs/fi_FI/withdrawals.lang
similarity index 100%
rename from htdocs/langs/fi_FI/withdrawals.lang
rename to public/langs/fi_FI/withdrawals.lang
diff --git a/htdocs/langs/fi_FI/workflow.lang b/public/langs/fi_FI/workflow.lang
similarity index 100%
rename from htdocs/langs/fi_FI/workflow.lang
rename to public/langs/fi_FI/workflow.lang
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/public/langs/fr_BE/accountancy.lang
similarity index 100%
rename from htdocs/langs/fr_BE/accountancy.lang
rename to public/langs/fr_BE/accountancy.lang
diff --git a/htdocs/langs/fr_BE/admin.lang b/public/langs/fr_BE/admin.lang
similarity index 100%
rename from htdocs/langs/fr_BE/admin.lang
rename to public/langs/fr_BE/admin.lang
diff --git a/htdocs/langs/fr_BE/agenda.lang b/public/langs/fr_BE/agenda.lang
similarity index 100%
rename from htdocs/langs/fr_BE/agenda.lang
rename to public/langs/fr_BE/agenda.lang
diff --git a/htdocs/langs/fr_BE/banks.lang b/public/langs/fr_BE/banks.lang
similarity index 100%
rename from htdocs/langs/fr_BE/banks.lang
rename to public/langs/fr_BE/banks.lang
diff --git a/htdocs/langs/fr_BE/bills.lang b/public/langs/fr_BE/bills.lang
similarity index 100%
rename from htdocs/langs/fr_BE/bills.lang
rename to public/langs/fr_BE/bills.lang
diff --git a/htdocs/langs/fr_BE/bookmarks.lang b/public/langs/fr_BE/bookmarks.lang
similarity index 100%
rename from htdocs/langs/fr_BE/bookmarks.lang
rename to public/langs/fr_BE/bookmarks.lang
diff --git a/htdocs/langs/fr_BE/boxes.lang b/public/langs/fr_BE/boxes.lang
similarity index 100%
rename from htdocs/langs/fr_BE/boxes.lang
rename to public/langs/fr_BE/boxes.lang
diff --git a/htdocs/langs/fr_BE/cashdesk.lang b/public/langs/fr_BE/cashdesk.lang
similarity index 100%
rename from htdocs/langs/fr_BE/cashdesk.lang
rename to public/langs/fr_BE/cashdesk.lang
diff --git a/htdocs/langs/fr_BE/categories.lang b/public/langs/fr_BE/categories.lang
similarity index 100%
rename from htdocs/langs/fr_BE/categories.lang
rename to public/langs/fr_BE/categories.lang
diff --git a/htdocs/langs/fr_BE/commercial.lang b/public/langs/fr_BE/commercial.lang
similarity index 100%
rename from htdocs/langs/fr_BE/commercial.lang
rename to public/langs/fr_BE/commercial.lang
diff --git a/htdocs/langs/fr_BE/companies.lang b/public/langs/fr_BE/companies.lang
similarity index 100%
rename from htdocs/langs/fr_BE/companies.lang
rename to public/langs/fr_BE/companies.lang
diff --git a/htdocs/langs/fr_BE/compta.lang b/public/langs/fr_BE/compta.lang
similarity index 100%
rename from htdocs/langs/fr_BE/compta.lang
rename to public/langs/fr_BE/compta.lang
diff --git a/htdocs/langs/fr_BE/contracts.lang b/public/langs/fr_BE/contracts.lang
similarity index 100%
rename from htdocs/langs/fr_BE/contracts.lang
rename to public/langs/fr_BE/contracts.lang
diff --git a/htdocs/langs/fr_BE/cron.lang b/public/langs/fr_BE/cron.lang
similarity index 100%
rename from htdocs/langs/fr_BE/cron.lang
rename to public/langs/fr_BE/cron.lang
diff --git a/htdocs/langs/fr_BE/deliveries.lang b/public/langs/fr_BE/deliveries.lang
similarity index 100%
rename from htdocs/langs/fr_BE/deliveries.lang
rename to public/langs/fr_BE/deliveries.lang
diff --git a/htdocs/langs/fr_BE/dict.lang b/public/langs/fr_BE/dict.lang
similarity index 100%
rename from htdocs/langs/fr_BE/dict.lang
rename to public/langs/fr_BE/dict.lang
diff --git a/htdocs/langs/fr_BE/donations.lang b/public/langs/fr_BE/donations.lang
similarity index 100%
rename from htdocs/langs/fr_BE/donations.lang
rename to public/langs/fr_BE/donations.lang
diff --git a/htdocs/langs/fr_BE/ecm.lang b/public/langs/fr_BE/ecm.lang
similarity index 100%
rename from htdocs/langs/fr_BE/ecm.lang
rename to public/langs/fr_BE/ecm.lang
diff --git a/htdocs/langs/fr_BE/errors.lang b/public/langs/fr_BE/errors.lang
similarity index 100%
rename from htdocs/langs/fr_BE/errors.lang
rename to public/langs/fr_BE/errors.lang
diff --git a/htdocs/langs/fr_BE/exports.lang b/public/langs/fr_BE/exports.lang
similarity index 100%
rename from htdocs/langs/fr_BE/exports.lang
rename to public/langs/fr_BE/exports.lang
diff --git a/htdocs/langs/fr_BE/externalsite.lang b/public/langs/fr_BE/externalsite.lang
similarity index 100%
rename from htdocs/langs/fr_BE/externalsite.lang
rename to public/langs/fr_BE/externalsite.lang
diff --git a/htdocs/langs/fr_BE/ftp.lang b/public/langs/fr_BE/ftp.lang
similarity index 100%
rename from htdocs/langs/fr_BE/ftp.lang
rename to public/langs/fr_BE/ftp.lang
diff --git a/htdocs/langs/fr_BE/help.lang b/public/langs/fr_BE/help.lang
similarity index 100%
rename from htdocs/langs/fr_BE/help.lang
rename to public/langs/fr_BE/help.lang
diff --git a/htdocs/langs/fr_BE/holiday.lang b/public/langs/fr_BE/holiday.lang
similarity index 100%
rename from htdocs/langs/fr_BE/holiday.lang
rename to public/langs/fr_BE/holiday.lang
diff --git a/htdocs/langs/fr_BE/hrm.lang b/public/langs/fr_BE/hrm.lang
similarity index 100%
rename from htdocs/langs/fr_BE/hrm.lang
rename to public/langs/fr_BE/hrm.lang
diff --git a/htdocs/langs/fr_BE/incoterm.lang b/public/langs/fr_BE/incoterm.lang
similarity index 100%
rename from htdocs/langs/fr_BE/incoterm.lang
rename to public/langs/fr_BE/incoterm.lang
diff --git a/htdocs/langs/fr_BE/install.lang b/public/langs/fr_BE/install.lang
similarity index 100%
rename from htdocs/langs/fr_BE/install.lang
rename to public/langs/fr_BE/install.lang
diff --git a/htdocs/langs/fr_BE/interventions.lang b/public/langs/fr_BE/interventions.lang
similarity index 100%
rename from htdocs/langs/fr_BE/interventions.lang
rename to public/langs/fr_BE/interventions.lang
diff --git a/htdocs/langs/fr_BE/languages.lang b/public/langs/fr_BE/languages.lang
similarity index 100%
rename from htdocs/langs/fr_BE/languages.lang
rename to public/langs/fr_BE/languages.lang
diff --git a/htdocs/langs/fr_BE/ldap.lang b/public/langs/fr_BE/ldap.lang
similarity index 100%
rename from htdocs/langs/fr_BE/ldap.lang
rename to public/langs/fr_BE/ldap.lang
diff --git a/htdocs/langs/fr_BE/link.lang b/public/langs/fr_BE/link.lang
similarity index 100%
rename from htdocs/langs/fr_BE/link.lang
rename to public/langs/fr_BE/link.lang
diff --git a/htdocs/langs/fr_BE/loan.lang b/public/langs/fr_BE/loan.lang
similarity index 100%
rename from htdocs/langs/fr_BE/loan.lang
rename to public/langs/fr_BE/loan.lang
diff --git a/htdocs/langs/fr_BE/mailmanspip.lang b/public/langs/fr_BE/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/fr_BE/mailmanspip.lang
rename to public/langs/fr_BE/mailmanspip.lang
diff --git a/htdocs/langs/fr_BE/mails.lang b/public/langs/fr_BE/mails.lang
similarity index 100%
rename from htdocs/langs/fr_BE/mails.lang
rename to public/langs/fr_BE/mails.lang
diff --git a/htdocs/langs/fr_BE/main.lang b/public/langs/fr_BE/main.lang
similarity index 100%
rename from htdocs/langs/fr_BE/main.lang
rename to public/langs/fr_BE/main.lang
diff --git a/htdocs/langs/fr_BE/margins.lang b/public/langs/fr_BE/margins.lang
similarity index 100%
rename from htdocs/langs/fr_BE/margins.lang
rename to public/langs/fr_BE/margins.lang
diff --git a/htdocs/langs/fr_BE/members.lang b/public/langs/fr_BE/members.lang
similarity index 100%
rename from htdocs/langs/fr_BE/members.lang
rename to public/langs/fr_BE/members.lang
diff --git a/htdocs/langs/fr_BE/oauth.lang b/public/langs/fr_BE/oauth.lang
similarity index 100%
rename from htdocs/langs/fr_BE/oauth.lang
rename to public/langs/fr_BE/oauth.lang
diff --git a/htdocs/langs/fr_BE/opensurvey.lang b/public/langs/fr_BE/opensurvey.lang
similarity index 100%
rename from htdocs/langs/fr_BE/opensurvey.lang
rename to public/langs/fr_BE/opensurvey.lang
diff --git a/htdocs/langs/fr_BE/orders.lang b/public/langs/fr_BE/orders.lang
similarity index 100%
rename from htdocs/langs/fr_BE/orders.lang
rename to public/langs/fr_BE/orders.lang
diff --git a/htdocs/langs/fr_BE/other.lang b/public/langs/fr_BE/other.lang
similarity index 100%
rename from htdocs/langs/fr_BE/other.lang
rename to public/langs/fr_BE/other.lang
diff --git a/htdocs/langs/fr_BE/paybox.lang b/public/langs/fr_BE/paybox.lang
similarity index 100%
rename from htdocs/langs/fr_BE/paybox.lang
rename to public/langs/fr_BE/paybox.lang
diff --git a/htdocs/langs/fr_BE/paypal.lang b/public/langs/fr_BE/paypal.lang
similarity index 100%
rename from htdocs/langs/fr_BE/paypal.lang
rename to public/langs/fr_BE/paypal.lang
diff --git a/htdocs/langs/fr_BE/printing.lang b/public/langs/fr_BE/printing.lang
similarity index 100%
rename from htdocs/langs/fr_BE/printing.lang
rename to public/langs/fr_BE/printing.lang
diff --git a/htdocs/langs/fr_BE/productbatch.lang b/public/langs/fr_BE/productbatch.lang
similarity index 100%
rename from htdocs/langs/fr_BE/productbatch.lang
rename to public/langs/fr_BE/productbatch.lang
diff --git a/htdocs/langs/fr_BE/products.lang b/public/langs/fr_BE/products.lang
similarity index 100%
rename from htdocs/langs/fr_BE/products.lang
rename to public/langs/fr_BE/products.lang
diff --git a/htdocs/langs/fr_BE/projects.lang b/public/langs/fr_BE/projects.lang
similarity index 100%
rename from htdocs/langs/fr_BE/projects.lang
rename to public/langs/fr_BE/projects.lang
diff --git a/htdocs/langs/fr_BE/propal.lang b/public/langs/fr_BE/propal.lang
similarity index 100%
rename from htdocs/langs/fr_BE/propal.lang
rename to public/langs/fr_BE/propal.lang
diff --git a/htdocs/langs/fr_BE/receiptprinter.lang b/public/langs/fr_BE/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/fr_BE/receiptprinter.lang
rename to public/langs/fr_BE/receiptprinter.lang
diff --git a/htdocs/langs/fr_BE/resource.lang b/public/langs/fr_BE/resource.lang
similarity index 100%
rename from htdocs/langs/fr_BE/resource.lang
rename to public/langs/fr_BE/resource.lang
diff --git a/htdocs/langs/fr_BE/salaries.lang b/public/langs/fr_BE/salaries.lang
similarity index 100%
rename from htdocs/langs/fr_BE/salaries.lang
rename to public/langs/fr_BE/salaries.lang
diff --git a/htdocs/langs/fr_BE/sendings.lang b/public/langs/fr_BE/sendings.lang
similarity index 100%
rename from htdocs/langs/fr_BE/sendings.lang
rename to public/langs/fr_BE/sendings.lang
diff --git a/htdocs/langs/fr_BE/sms.lang b/public/langs/fr_BE/sms.lang
similarity index 100%
rename from htdocs/langs/fr_BE/sms.lang
rename to public/langs/fr_BE/sms.lang
diff --git a/htdocs/langs/fr_BE/stocks.lang b/public/langs/fr_BE/stocks.lang
similarity index 100%
rename from htdocs/langs/fr_BE/stocks.lang
rename to public/langs/fr_BE/stocks.lang
diff --git a/htdocs/langs/fr_BE/supplier_proposal.lang b/public/langs/fr_BE/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/fr_BE/supplier_proposal.lang
rename to public/langs/fr_BE/supplier_proposal.lang
diff --git a/htdocs/langs/fr_BE/suppliers.lang b/public/langs/fr_BE/suppliers.lang
similarity index 100%
rename from htdocs/langs/fr_BE/suppliers.lang
rename to public/langs/fr_BE/suppliers.lang
diff --git a/htdocs/langs/fr_BE/trips.lang b/public/langs/fr_BE/trips.lang
similarity index 100%
rename from htdocs/langs/fr_BE/trips.lang
rename to public/langs/fr_BE/trips.lang
diff --git a/htdocs/langs/fr_BE/users.lang b/public/langs/fr_BE/users.lang
similarity index 100%
rename from htdocs/langs/fr_BE/users.lang
rename to public/langs/fr_BE/users.lang
diff --git a/htdocs/langs/fr_BE/website.lang b/public/langs/fr_BE/website.lang
similarity index 100%
rename from htdocs/langs/fr_BE/website.lang
rename to public/langs/fr_BE/website.lang
diff --git a/htdocs/langs/fr_BE/withdrawals.lang b/public/langs/fr_BE/withdrawals.lang
similarity index 100%
rename from htdocs/langs/fr_BE/withdrawals.lang
rename to public/langs/fr_BE/withdrawals.lang
diff --git a/htdocs/langs/fr_BE/workflow.lang b/public/langs/fr_BE/workflow.lang
similarity index 100%
rename from htdocs/langs/fr_BE/workflow.lang
rename to public/langs/fr_BE/workflow.lang
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/public/langs/fr_CA/accountancy.lang
similarity index 100%
rename from htdocs/langs/fr_CA/accountancy.lang
rename to public/langs/fr_CA/accountancy.lang
diff --git a/htdocs/langs/fr_CA/admin.lang b/public/langs/fr_CA/admin.lang
similarity index 100%
rename from htdocs/langs/fr_CA/admin.lang
rename to public/langs/fr_CA/admin.lang
diff --git a/htdocs/langs/fr_CA/agenda.lang b/public/langs/fr_CA/agenda.lang
similarity index 100%
rename from htdocs/langs/fr_CA/agenda.lang
rename to public/langs/fr_CA/agenda.lang
diff --git a/htdocs/langs/fr_CA/banks.lang b/public/langs/fr_CA/banks.lang
similarity index 100%
rename from htdocs/langs/fr_CA/banks.lang
rename to public/langs/fr_CA/banks.lang
diff --git a/htdocs/langs/fr_CA/bills.lang b/public/langs/fr_CA/bills.lang
similarity index 100%
rename from htdocs/langs/fr_CA/bills.lang
rename to public/langs/fr_CA/bills.lang
diff --git a/htdocs/langs/fr_CA/bookmarks.lang b/public/langs/fr_CA/bookmarks.lang
similarity index 100%
rename from htdocs/langs/fr_CA/bookmarks.lang
rename to public/langs/fr_CA/bookmarks.lang
diff --git a/htdocs/langs/fr_CA/boxes.lang b/public/langs/fr_CA/boxes.lang
similarity index 100%
rename from htdocs/langs/fr_CA/boxes.lang
rename to public/langs/fr_CA/boxes.lang
diff --git a/htdocs/langs/fr_CA/cashdesk.lang b/public/langs/fr_CA/cashdesk.lang
similarity index 100%
rename from htdocs/langs/fr_CA/cashdesk.lang
rename to public/langs/fr_CA/cashdesk.lang
diff --git a/htdocs/langs/fr_CA/categories.lang b/public/langs/fr_CA/categories.lang
similarity index 100%
rename from htdocs/langs/fr_CA/categories.lang
rename to public/langs/fr_CA/categories.lang
diff --git a/htdocs/langs/fr_CA/commercial.lang b/public/langs/fr_CA/commercial.lang
similarity index 100%
rename from htdocs/langs/fr_CA/commercial.lang
rename to public/langs/fr_CA/commercial.lang
diff --git a/htdocs/langs/fr_CA/companies.lang b/public/langs/fr_CA/companies.lang
similarity index 100%
rename from htdocs/langs/fr_CA/companies.lang
rename to public/langs/fr_CA/companies.lang
diff --git a/htdocs/langs/fr_CA/compta.lang b/public/langs/fr_CA/compta.lang
similarity index 100%
rename from htdocs/langs/fr_CA/compta.lang
rename to public/langs/fr_CA/compta.lang
diff --git a/htdocs/langs/fr_CA/contracts.lang b/public/langs/fr_CA/contracts.lang
similarity index 100%
rename from htdocs/langs/fr_CA/contracts.lang
rename to public/langs/fr_CA/contracts.lang
diff --git a/htdocs/langs/fr_CA/cron.lang b/public/langs/fr_CA/cron.lang
similarity index 100%
rename from htdocs/langs/fr_CA/cron.lang
rename to public/langs/fr_CA/cron.lang
diff --git a/htdocs/langs/fr_CA/deliveries.lang b/public/langs/fr_CA/deliveries.lang
similarity index 100%
rename from htdocs/langs/fr_CA/deliveries.lang
rename to public/langs/fr_CA/deliveries.lang
diff --git a/htdocs/langs/fr_CA/dict.lang b/public/langs/fr_CA/dict.lang
similarity index 100%
rename from htdocs/langs/fr_CA/dict.lang
rename to public/langs/fr_CA/dict.lang
diff --git a/htdocs/langs/fr_CA/donations.lang b/public/langs/fr_CA/donations.lang
similarity index 100%
rename from htdocs/langs/fr_CA/donations.lang
rename to public/langs/fr_CA/donations.lang
diff --git a/htdocs/langs/fr_CA/ecm.lang b/public/langs/fr_CA/ecm.lang
similarity index 100%
rename from htdocs/langs/fr_CA/ecm.lang
rename to public/langs/fr_CA/ecm.lang
diff --git a/htdocs/langs/fr_CA/errors.lang b/public/langs/fr_CA/errors.lang
similarity index 100%
rename from htdocs/langs/fr_CA/errors.lang
rename to public/langs/fr_CA/errors.lang
diff --git a/htdocs/langs/fr_CA/exports.lang b/public/langs/fr_CA/exports.lang
similarity index 100%
rename from htdocs/langs/fr_CA/exports.lang
rename to public/langs/fr_CA/exports.lang
diff --git a/htdocs/langs/fr_CA/externalsite.lang b/public/langs/fr_CA/externalsite.lang
similarity index 100%
rename from htdocs/langs/fr_CA/externalsite.lang
rename to public/langs/fr_CA/externalsite.lang
diff --git a/htdocs/langs/fr_CA/ftp.lang b/public/langs/fr_CA/ftp.lang
similarity index 100%
rename from htdocs/langs/fr_CA/ftp.lang
rename to public/langs/fr_CA/ftp.lang
diff --git a/htdocs/langs/fr_CA/help.lang b/public/langs/fr_CA/help.lang
similarity index 100%
rename from htdocs/langs/fr_CA/help.lang
rename to public/langs/fr_CA/help.lang
diff --git a/htdocs/langs/fr_CA/holiday.lang b/public/langs/fr_CA/holiday.lang
similarity index 100%
rename from htdocs/langs/fr_CA/holiday.lang
rename to public/langs/fr_CA/holiday.lang
diff --git a/htdocs/langs/fr_CA/hrm.lang b/public/langs/fr_CA/hrm.lang
similarity index 100%
rename from htdocs/langs/fr_CA/hrm.lang
rename to public/langs/fr_CA/hrm.lang
diff --git a/htdocs/langs/fr_CA/incoterm.lang b/public/langs/fr_CA/incoterm.lang
similarity index 100%
rename from htdocs/langs/fr_CA/incoterm.lang
rename to public/langs/fr_CA/incoterm.lang
diff --git a/htdocs/langs/fr_CA/install.lang b/public/langs/fr_CA/install.lang
similarity index 100%
rename from htdocs/langs/fr_CA/install.lang
rename to public/langs/fr_CA/install.lang
diff --git a/htdocs/langs/fr_CA/interventions.lang b/public/langs/fr_CA/interventions.lang
similarity index 100%
rename from htdocs/langs/fr_CA/interventions.lang
rename to public/langs/fr_CA/interventions.lang
diff --git a/htdocs/langs/fr_CA/languages.lang b/public/langs/fr_CA/languages.lang
similarity index 100%
rename from htdocs/langs/fr_CA/languages.lang
rename to public/langs/fr_CA/languages.lang
diff --git a/htdocs/langs/fr_CA/ldap.lang b/public/langs/fr_CA/ldap.lang
similarity index 100%
rename from htdocs/langs/fr_CA/ldap.lang
rename to public/langs/fr_CA/ldap.lang
diff --git a/htdocs/langs/fr_CA/link.lang b/public/langs/fr_CA/link.lang
similarity index 100%
rename from htdocs/langs/fr_CA/link.lang
rename to public/langs/fr_CA/link.lang
diff --git a/htdocs/langs/fr_CA/loan.lang b/public/langs/fr_CA/loan.lang
similarity index 100%
rename from htdocs/langs/fr_CA/loan.lang
rename to public/langs/fr_CA/loan.lang
diff --git a/htdocs/langs/fr_CA/mailmanspip.lang b/public/langs/fr_CA/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/fr_CA/mailmanspip.lang
rename to public/langs/fr_CA/mailmanspip.lang
diff --git a/htdocs/langs/fr_CA/mails.lang b/public/langs/fr_CA/mails.lang
similarity index 100%
rename from htdocs/langs/fr_CA/mails.lang
rename to public/langs/fr_CA/mails.lang
diff --git a/htdocs/langs/fr_CA/main.lang b/public/langs/fr_CA/main.lang
similarity index 100%
rename from htdocs/langs/fr_CA/main.lang
rename to public/langs/fr_CA/main.lang
diff --git a/htdocs/langs/fr_CA/margins.lang b/public/langs/fr_CA/margins.lang
similarity index 100%
rename from htdocs/langs/fr_CA/margins.lang
rename to public/langs/fr_CA/margins.lang
diff --git a/htdocs/langs/fr_CA/members.lang b/public/langs/fr_CA/members.lang
similarity index 100%
rename from htdocs/langs/fr_CA/members.lang
rename to public/langs/fr_CA/members.lang
diff --git a/htdocs/langs/fr_CA/oauth.lang b/public/langs/fr_CA/oauth.lang
similarity index 100%
rename from htdocs/langs/fr_CA/oauth.lang
rename to public/langs/fr_CA/oauth.lang
diff --git a/htdocs/langs/fr_CA/opensurvey.lang b/public/langs/fr_CA/opensurvey.lang
similarity index 100%
rename from htdocs/langs/fr_CA/opensurvey.lang
rename to public/langs/fr_CA/opensurvey.lang
diff --git a/htdocs/langs/fr_CA/orders.lang b/public/langs/fr_CA/orders.lang
similarity index 100%
rename from htdocs/langs/fr_CA/orders.lang
rename to public/langs/fr_CA/orders.lang
diff --git a/htdocs/langs/fr_CA/other.lang b/public/langs/fr_CA/other.lang
similarity index 100%
rename from htdocs/langs/fr_CA/other.lang
rename to public/langs/fr_CA/other.lang
diff --git a/htdocs/langs/fr_CA/paybox.lang b/public/langs/fr_CA/paybox.lang
similarity index 100%
rename from htdocs/langs/fr_CA/paybox.lang
rename to public/langs/fr_CA/paybox.lang
diff --git a/htdocs/langs/fr_CA/paypal.lang b/public/langs/fr_CA/paypal.lang
similarity index 100%
rename from htdocs/langs/fr_CA/paypal.lang
rename to public/langs/fr_CA/paypal.lang
diff --git a/htdocs/langs/fr_CA/printing.lang b/public/langs/fr_CA/printing.lang
similarity index 100%
rename from htdocs/langs/fr_CA/printing.lang
rename to public/langs/fr_CA/printing.lang
diff --git a/htdocs/langs/fr_CA/productbatch.lang b/public/langs/fr_CA/productbatch.lang
similarity index 100%
rename from htdocs/langs/fr_CA/productbatch.lang
rename to public/langs/fr_CA/productbatch.lang
diff --git a/htdocs/langs/fr_CA/products.lang b/public/langs/fr_CA/products.lang
similarity index 100%
rename from htdocs/langs/fr_CA/products.lang
rename to public/langs/fr_CA/products.lang
diff --git a/htdocs/langs/fr_CA/projects.lang b/public/langs/fr_CA/projects.lang
similarity index 100%
rename from htdocs/langs/fr_CA/projects.lang
rename to public/langs/fr_CA/projects.lang
diff --git a/htdocs/langs/fr_CA/propal.lang b/public/langs/fr_CA/propal.lang
similarity index 100%
rename from htdocs/langs/fr_CA/propal.lang
rename to public/langs/fr_CA/propal.lang
diff --git a/htdocs/langs/fr_CA/receiptprinter.lang b/public/langs/fr_CA/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/fr_CA/receiptprinter.lang
rename to public/langs/fr_CA/receiptprinter.lang
diff --git a/htdocs/langs/fr_CA/resource.lang b/public/langs/fr_CA/resource.lang
similarity index 100%
rename from htdocs/langs/fr_CA/resource.lang
rename to public/langs/fr_CA/resource.lang
diff --git a/htdocs/langs/fr_CA/salaries.lang b/public/langs/fr_CA/salaries.lang
similarity index 100%
rename from htdocs/langs/fr_CA/salaries.lang
rename to public/langs/fr_CA/salaries.lang
diff --git a/htdocs/langs/fr_CA/sendings.lang b/public/langs/fr_CA/sendings.lang
similarity index 100%
rename from htdocs/langs/fr_CA/sendings.lang
rename to public/langs/fr_CA/sendings.lang
diff --git a/htdocs/langs/fr_CA/sms.lang b/public/langs/fr_CA/sms.lang
similarity index 100%
rename from htdocs/langs/fr_CA/sms.lang
rename to public/langs/fr_CA/sms.lang
diff --git a/htdocs/langs/fr_CA/stocks.lang b/public/langs/fr_CA/stocks.lang
similarity index 100%
rename from htdocs/langs/fr_CA/stocks.lang
rename to public/langs/fr_CA/stocks.lang
diff --git a/htdocs/langs/fr_CA/supplier_proposal.lang b/public/langs/fr_CA/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/fr_CA/supplier_proposal.lang
rename to public/langs/fr_CA/supplier_proposal.lang
diff --git a/htdocs/langs/fr_CA/suppliers.lang b/public/langs/fr_CA/suppliers.lang
similarity index 100%
rename from htdocs/langs/fr_CA/suppliers.lang
rename to public/langs/fr_CA/suppliers.lang
diff --git a/htdocs/langs/fr_CA/trips.lang b/public/langs/fr_CA/trips.lang
similarity index 100%
rename from htdocs/langs/fr_CA/trips.lang
rename to public/langs/fr_CA/trips.lang
diff --git a/htdocs/langs/fr_CA/users.lang b/public/langs/fr_CA/users.lang
similarity index 100%
rename from htdocs/langs/fr_CA/users.lang
rename to public/langs/fr_CA/users.lang
diff --git a/htdocs/langs/fr_CA/website.lang b/public/langs/fr_CA/website.lang
similarity index 100%
rename from htdocs/langs/fr_CA/website.lang
rename to public/langs/fr_CA/website.lang
diff --git a/htdocs/langs/fr_CA/withdrawals.lang b/public/langs/fr_CA/withdrawals.lang
similarity index 100%
rename from htdocs/langs/fr_CA/withdrawals.lang
rename to public/langs/fr_CA/withdrawals.lang
diff --git a/htdocs/langs/fr_CA/workflow.lang b/public/langs/fr_CA/workflow.lang
similarity index 100%
rename from htdocs/langs/fr_CA/workflow.lang
rename to public/langs/fr_CA/workflow.lang
diff --git a/htdocs/langs/fr_CH/accountancy.lang b/public/langs/fr_CH/accountancy.lang
similarity index 100%
rename from htdocs/langs/fr_CH/accountancy.lang
rename to public/langs/fr_CH/accountancy.lang
diff --git a/htdocs/langs/fr_CH/admin.lang b/public/langs/fr_CH/admin.lang
similarity index 100%
rename from htdocs/langs/fr_CH/admin.lang
rename to public/langs/fr_CH/admin.lang
diff --git a/htdocs/langs/fr_CH/agenda.lang b/public/langs/fr_CH/agenda.lang
similarity index 100%
rename from htdocs/langs/fr_CH/agenda.lang
rename to public/langs/fr_CH/agenda.lang
diff --git a/htdocs/langs/fr_CH/banks.lang b/public/langs/fr_CH/banks.lang
similarity index 100%
rename from htdocs/langs/fr_CH/banks.lang
rename to public/langs/fr_CH/banks.lang
diff --git a/htdocs/langs/fr_CH/bills.lang b/public/langs/fr_CH/bills.lang
similarity index 100%
rename from htdocs/langs/fr_CH/bills.lang
rename to public/langs/fr_CH/bills.lang
diff --git a/htdocs/langs/fr_CH/bookmarks.lang b/public/langs/fr_CH/bookmarks.lang
similarity index 100%
rename from htdocs/langs/fr_CH/bookmarks.lang
rename to public/langs/fr_CH/bookmarks.lang
diff --git a/htdocs/langs/fr_CH/boxes.lang b/public/langs/fr_CH/boxes.lang
similarity index 100%
rename from htdocs/langs/fr_CH/boxes.lang
rename to public/langs/fr_CH/boxes.lang
diff --git a/htdocs/langs/fr_CH/cashdesk.lang b/public/langs/fr_CH/cashdesk.lang
similarity index 100%
rename from htdocs/langs/fr_CH/cashdesk.lang
rename to public/langs/fr_CH/cashdesk.lang
diff --git a/htdocs/langs/fr_CH/categories.lang b/public/langs/fr_CH/categories.lang
similarity index 100%
rename from htdocs/langs/fr_CH/categories.lang
rename to public/langs/fr_CH/categories.lang
diff --git a/htdocs/langs/fr_CH/commercial.lang b/public/langs/fr_CH/commercial.lang
similarity index 100%
rename from htdocs/langs/fr_CH/commercial.lang
rename to public/langs/fr_CH/commercial.lang
diff --git a/htdocs/langs/fr_CH/companies.lang b/public/langs/fr_CH/companies.lang
similarity index 100%
rename from htdocs/langs/fr_CH/companies.lang
rename to public/langs/fr_CH/companies.lang
diff --git a/htdocs/langs/fr_CH/compta.lang b/public/langs/fr_CH/compta.lang
similarity index 100%
rename from htdocs/langs/fr_CH/compta.lang
rename to public/langs/fr_CH/compta.lang
diff --git a/htdocs/langs/fr_CH/contracts.lang b/public/langs/fr_CH/contracts.lang
similarity index 100%
rename from htdocs/langs/fr_CH/contracts.lang
rename to public/langs/fr_CH/contracts.lang
diff --git a/htdocs/langs/fr_CH/cron.lang b/public/langs/fr_CH/cron.lang
similarity index 100%
rename from htdocs/langs/fr_CH/cron.lang
rename to public/langs/fr_CH/cron.lang
diff --git a/htdocs/langs/fr_CH/deliveries.lang b/public/langs/fr_CH/deliveries.lang
similarity index 100%
rename from htdocs/langs/fr_CH/deliveries.lang
rename to public/langs/fr_CH/deliveries.lang
diff --git a/htdocs/langs/fr_CH/dict.lang b/public/langs/fr_CH/dict.lang
similarity index 100%
rename from htdocs/langs/fr_CH/dict.lang
rename to public/langs/fr_CH/dict.lang
diff --git a/htdocs/langs/fr_CH/donations.lang b/public/langs/fr_CH/donations.lang
similarity index 100%
rename from htdocs/langs/fr_CH/donations.lang
rename to public/langs/fr_CH/donations.lang
diff --git a/htdocs/langs/fr_CH/ecm.lang b/public/langs/fr_CH/ecm.lang
similarity index 100%
rename from htdocs/langs/fr_CH/ecm.lang
rename to public/langs/fr_CH/ecm.lang
diff --git a/htdocs/langs/fr_CH/errors.lang b/public/langs/fr_CH/errors.lang
similarity index 100%
rename from htdocs/langs/fr_CH/errors.lang
rename to public/langs/fr_CH/errors.lang
diff --git a/htdocs/langs/fr_CH/exports.lang b/public/langs/fr_CH/exports.lang
similarity index 100%
rename from htdocs/langs/fr_CH/exports.lang
rename to public/langs/fr_CH/exports.lang
diff --git a/htdocs/langs/fr_CH/externalsite.lang b/public/langs/fr_CH/externalsite.lang
similarity index 100%
rename from htdocs/langs/fr_CH/externalsite.lang
rename to public/langs/fr_CH/externalsite.lang
diff --git a/htdocs/langs/fr_CH/ftp.lang b/public/langs/fr_CH/ftp.lang
similarity index 100%
rename from htdocs/langs/fr_CH/ftp.lang
rename to public/langs/fr_CH/ftp.lang
diff --git a/htdocs/langs/fr_CH/help.lang b/public/langs/fr_CH/help.lang
similarity index 100%
rename from htdocs/langs/fr_CH/help.lang
rename to public/langs/fr_CH/help.lang
diff --git a/htdocs/langs/fr_CH/holiday.lang b/public/langs/fr_CH/holiday.lang
similarity index 100%
rename from htdocs/langs/fr_CH/holiday.lang
rename to public/langs/fr_CH/holiday.lang
diff --git a/htdocs/langs/fr_CH/hrm.lang b/public/langs/fr_CH/hrm.lang
similarity index 100%
rename from htdocs/langs/fr_CH/hrm.lang
rename to public/langs/fr_CH/hrm.lang
diff --git a/htdocs/langs/fr_CH/incoterm.lang b/public/langs/fr_CH/incoterm.lang
similarity index 100%
rename from htdocs/langs/fr_CH/incoterm.lang
rename to public/langs/fr_CH/incoterm.lang
diff --git a/htdocs/langs/fr_CH/install.lang b/public/langs/fr_CH/install.lang
similarity index 100%
rename from htdocs/langs/fr_CH/install.lang
rename to public/langs/fr_CH/install.lang
diff --git a/htdocs/langs/fr_CH/interventions.lang b/public/langs/fr_CH/interventions.lang
similarity index 100%
rename from htdocs/langs/fr_CH/interventions.lang
rename to public/langs/fr_CH/interventions.lang
diff --git a/htdocs/langs/fr_CH/languages.lang b/public/langs/fr_CH/languages.lang
similarity index 100%
rename from htdocs/langs/fr_CH/languages.lang
rename to public/langs/fr_CH/languages.lang
diff --git a/htdocs/langs/fr_CH/ldap.lang b/public/langs/fr_CH/ldap.lang
similarity index 100%
rename from htdocs/langs/fr_CH/ldap.lang
rename to public/langs/fr_CH/ldap.lang
diff --git a/htdocs/langs/fr_CH/link.lang b/public/langs/fr_CH/link.lang
similarity index 100%
rename from htdocs/langs/fr_CH/link.lang
rename to public/langs/fr_CH/link.lang
diff --git a/htdocs/langs/fr_CH/loan.lang b/public/langs/fr_CH/loan.lang
similarity index 100%
rename from htdocs/langs/fr_CH/loan.lang
rename to public/langs/fr_CH/loan.lang
diff --git a/htdocs/langs/fr_CH/mailmanspip.lang b/public/langs/fr_CH/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/fr_CH/mailmanspip.lang
rename to public/langs/fr_CH/mailmanspip.lang
diff --git a/htdocs/langs/fr_CH/mails.lang b/public/langs/fr_CH/mails.lang
similarity index 100%
rename from htdocs/langs/fr_CH/mails.lang
rename to public/langs/fr_CH/mails.lang
diff --git a/htdocs/langs/fr_CH/main.lang b/public/langs/fr_CH/main.lang
similarity index 100%
rename from htdocs/langs/fr_CH/main.lang
rename to public/langs/fr_CH/main.lang
diff --git a/htdocs/langs/fr_CH/margins.lang b/public/langs/fr_CH/margins.lang
similarity index 100%
rename from htdocs/langs/fr_CH/margins.lang
rename to public/langs/fr_CH/margins.lang
diff --git a/htdocs/langs/fr_CH/members.lang b/public/langs/fr_CH/members.lang
similarity index 100%
rename from htdocs/langs/fr_CH/members.lang
rename to public/langs/fr_CH/members.lang
diff --git a/htdocs/langs/fr_CH/oauth.lang b/public/langs/fr_CH/oauth.lang
similarity index 100%
rename from htdocs/langs/fr_CH/oauth.lang
rename to public/langs/fr_CH/oauth.lang
diff --git a/htdocs/langs/fr_CH/opensurvey.lang b/public/langs/fr_CH/opensurvey.lang
similarity index 100%
rename from htdocs/langs/fr_CH/opensurvey.lang
rename to public/langs/fr_CH/opensurvey.lang
diff --git a/htdocs/langs/fr_CH/orders.lang b/public/langs/fr_CH/orders.lang
similarity index 100%
rename from htdocs/langs/fr_CH/orders.lang
rename to public/langs/fr_CH/orders.lang
diff --git a/htdocs/langs/fr_CH/other.lang b/public/langs/fr_CH/other.lang
similarity index 100%
rename from htdocs/langs/fr_CH/other.lang
rename to public/langs/fr_CH/other.lang
diff --git a/htdocs/langs/fr_CH/paybox.lang b/public/langs/fr_CH/paybox.lang
similarity index 100%
rename from htdocs/langs/fr_CH/paybox.lang
rename to public/langs/fr_CH/paybox.lang
diff --git a/htdocs/langs/fr_CH/paypal.lang b/public/langs/fr_CH/paypal.lang
similarity index 100%
rename from htdocs/langs/fr_CH/paypal.lang
rename to public/langs/fr_CH/paypal.lang
diff --git a/htdocs/langs/fr_CH/printing.lang b/public/langs/fr_CH/printing.lang
similarity index 100%
rename from htdocs/langs/fr_CH/printing.lang
rename to public/langs/fr_CH/printing.lang
diff --git a/htdocs/langs/fr_CH/productbatch.lang b/public/langs/fr_CH/productbatch.lang
similarity index 100%
rename from htdocs/langs/fr_CH/productbatch.lang
rename to public/langs/fr_CH/productbatch.lang
diff --git a/htdocs/langs/fr_CH/products.lang b/public/langs/fr_CH/products.lang
similarity index 100%
rename from htdocs/langs/fr_CH/products.lang
rename to public/langs/fr_CH/products.lang
diff --git a/htdocs/langs/fr_CH/projects.lang b/public/langs/fr_CH/projects.lang
similarity index 100%
rename from htdocs/langs/fr_CH/projects.lang
rename to public/langs/fr_CH/projects.lang
diff --git a/htdocs/langs/fr_CH/propal.lang b/public/langs/fr_CH/propal.lang
similarity index 100%
rename from htdocs/langs/fr_CH/propal.lang
rename to public/langs/fr_CH/propal.lang
diff --git a/htdocs/langs/fr_CH/receiptprinter.lang b/public/langs/fr_CH/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/fr_CH/receiptprinter.lang
rename to public/langs/fr_CH/receiptprinter.lang
diff --git a/htdocs/langs/fr_CH/resource.lang b/public/langs/fr_CH/resource.lang
similarity index 100%
rename from htdocs/langs/fr_CH/resource.lang
rename to public/langs/fr_CH/resource.lang
diff --git a/htdocs/langs/fr_CH/salaries.lang b/public/langs/fr_CH/salaries.lang
similarity index 100%
rename from htdocs/langs/fr_CH/salaries.lang
rename to public/langs/fr_CH/salaries.lang
diff --git a/htdocs/langs/fr_CH/sendings.lang b/public/langs/fr_CH/sendings.lang
similarity index 100%
rename from htdocs/langs/fr_CH/sendings.lang
rename to public/langs/fr_CH/sendings.lang
diff --git a/htdocs/langs/fr_CH/sms.lang b/public/langs/fr_CH/sms.lang
similarity index 100%
rename from htdocs/langs/fr_CH/sms.lang
rename to public/langs/fr_CH/sms.lang
diff --git a/htdocs/langs/fr_CH/stocks.lang b/public/langs/fr_CH/stocks.lang
similarity index 100%
rename from htdocs/langs/fr_CH/stocks.lang
rename to public/langs/fr_CH/stocks.lang
diff --git a/htdocs/langs/fr_CH/supplier_proposal.lang b/public/langs/fr_CH/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/fr_CH/supplier_proposal.lang
rename to public/langs/fr_CH/supplier_proposal.lang
diff --git a/htdocs/langs/fr_CH/suppliers.lang b/public/langs/fr_CH/suppliers.lang
similarity index 100%
rename from htdocs/langs/fr_CH/suppliers.lang
rename to public/langs/fr_CH/suppliers.lang
diff --git a/htdocs/langs/fr_CH/trips.lang b/public/langs/fr_CH/trips.lang
similarity index 100%
rename from htdocs/langs/fr_CH/trips.lang
rename to public/langs/fr_CH/trips.lang
diff --git a/htdocs/langs/fr_CH/users.lang b/public/langs/fr_CH/users.lang
similarity index 100%
rename from htdocs/langs/fr_CH/users.lang
rename to public/langs/fr_CH/users.lang
diff --git a/htdocs/langs/fr_CH/website.lang b/public/langs/fr_CH/website.lang
similarity index 100%
rename from htdocs/langs/fr_CH/website.lang
rename to public/langs/fr_CH/website.lang
diff --git a/htdocs/langs/fr_CH/withdrawals.lang b/public/langs/fr_CH/withdrawals.lang
similarity index 100%
rename from htdocs/langs/fr_CH/withdrawals.lang
rename to public/langs/fr_CH/withdrawals.lang
diff --git a/htdocs/langs/fr_CH/workflow.lang b/public/langs/fr_CH/workflow.lang
similarity index 100%
rename from htdocs/langs/fr_CH/workflow.lang
rename to public/langs/fr_CH/workflow.lang
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/public/langs/fr_FR/accountancy.lang
similarity index 100%
rename from htdocs/langs/fr_FR/accountancy.lang
rename to public/langs/fr_FR/accountancy.lang
diff --git a/htdocs/langs/fr_FR/admin.lang b/public/langs/fr_FR/admin.lang
similarity index 100%
rename from htdocs/langs/fr_FR/admin.lang
rename to public/langs/fr_FR/admin.lang
diff --git a/htdocs/langs/fr_FR/agenda.lang b/public/langs/fr_FR/agenda.lang
similarity index 100%
rename from htdocs/langs/fr_FR/agenda.lang
rename to public/langs/fr_FR/agenda.lang
diff --git a/htdocs/langs/fr_FR/banks.lang b/public/langs/fr_FR/banks.lang
similarity index 100%
rename from htdocs/langs/fr_FR/banks.lang
rename to public/langs/fr_FR/banks.lang
diff --git a/htdocs/langs/fr_FR/bills.lang b/public/langs/fr_FR/bills.lang
similarity index 100%
rename from htdocs/langs/fr_FR/bills.lang
rename to public/langs/fr_FR/bills.lang
diff --git a/htdocs/langs/fr_FR/bookmarks.lang b/public/langs/fr_FR/bookmarks.lang
similarity index 100%
rename from htdocs/langs/fr_FR/bookmarks.lang
rename to public/langs/fr_FR/bookmarks.lang
diff --git a/htdocs/langs/fr_FR/boxes.lang b/public/langs/fr_FR/boxes.lang
similarity index 100%
rename from htdocs/langs/fr_FR/boxes.lang
rename to public/langs/fr_FR/boxes.lang
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/public/langs/fr_FR/cashdesk.lang
similarity index 100%
rename from htdocs/langs/fr_FR/cashdesk.lang
rename to public/langs/fr_FR/cashdesk.lang
diff --git a/htdocs/langs/fr_FR/categories.lang b/public/langs/fr_FR/categories.lang
similarity index 100%
rename from htdocs/langs/fr_FR/categories.lang
rename to public/langs/fr_FR/categories.lang
diff --git a/htdocs/langs/fr_FR/commercial.lang b/public/langs/fr_FR/commercial.lang
similarity index 100%
rename from htdocs/langs/fr_FR/commercial.lang
rename to public/langs/fr_FR/commercial.lang
diff --git a/htdocs/langs/fr_FR/companies.lang b/public/langs/fr_FR/companies.lang
similarity index 100%
rename from htdocs/langs/fr_FR/companies.lang
rename to public/langs/fr_FR/companies.lang
diff --git a/htdocs/langs/fr_FR/compta.lang b/public/langs/fr_FR/compta.lang
similarity index 100%
rename from htdocs/langs/fr_FR/compta.lang
rename to public/langs/fr_FR/compta.lang
diff --git a/htdocs/langs/fr_FR/contracts.lang b/public/langs/fr_FR/contracts.lang
similarity index 100%
rename from htdocs/langs/fr_FR/contracts.lang
rename to public/langs/fr_FR/contracts.lang
diff --git a/htdocs/langs/fr_FR/cron.lang b/public/langs/fr_FR/cron.lang
similarity index 100%
rename from htdocs/langs/fr_FR/cron.lang
rename to public/langs/fr_FR/cron.lang
diff --git a/htdocs/langs/fr_FR/deliveries.lang b/public/langs/fr_FR/deliveries.lang
similarity index 100%
rename from htdocs/langs/fr_FR/deliveries.lang
rename to public/langs/fr_FR/deliveries.lang
diff --git a/htdocs/langs/fr_FR/dict.lang b/public/langs/fr_FR/dict.lang
similarity index 100%
rename from htdocs/langs/fr_FR/dict.lang
rename to public/langs/fr_FR/dict.lang
diff --git a/htdocs/langs/fr_FR/donations.lang b/public/langs/fr_FR/donations.lang
similarity index 100%
rename from htdocs/langs/fr_FR/donations.lang
rename to public/langs/fr_FR/donations.lang
diff --git a/htdocs/langs/fr_FR/ecm.lang b/public/langs/fr_FR/ecm.lang
similarity index 100%
rename from htdocs/langs/fr_FR/ecm.lang
rename to public/langs/fr_FR/ecm.lang
diff --git a/htdocs/langs/fr_FR/errors.lang b/public/langs/fr_FR/errors.lang
similarity index 100%
rename from htdocs/langs/fr_FR/errors.lang
rename to public/langs/fr_FR/errors.lang
diff --git a/htdocs/langs/fr_FR/expensereports.lang b/public/langs/fr_FR/expensereports.lang
similarity index 100%
rename from htdocs/langs/fr_FR/expensereports.lang
rename to public/langs/fr_FR/expensereports.lang
diff --git a/htdocs/langs/fr_FR/exports.lang b/public/langs/fr_FR/exports.lang
similarity index 100%
rename from htdocs/langs/fr_FR/exports.lang
rename to public/langs/fr_FR/exports.lang
diff --git a/htdocs/langs/fr_FR/externalsite.lang b/public/langs/fr_FR/externalsite.lang
similarity index 100%
rename from htdocs/langs/fr_FR/externalsite.lang
rename to public/langs/fr_FR/externalsite.lang
diff --git a/htdocs/langs/fr_FR/ftp.lang b/public/langs/fr_FR/ftp.lang
similarity index 100%
rename from htdocs/langs/fr_FR/ftp.lang
rename to public/langs/fr_FR/ftp.lang
diff --git a/htdocs/langs/fr_FR/help.lang b/public/langs/fr_FR/help.lang
similarity index 100%
rename from htdocs/langs/fr_FR/help.lang
rename to public/langs/fr_FR/help.lang
diff --git a/htdocs/langs/fr_FR/holiday.lang b/public/langs/fr_FR/holiday.lang
similarity index 100%
rename from htdocs/langs/fr_FR/holiday.lang
rename to public/langs/fr_FR/holiday.lang
diff --git a/htdocs/langs/fr_FR/hrm.lang b/public/langs/fr_FR/hrm.lang
similarity index 100%
rename from htdocs/langs/fr_FR/hrm.lang
rename to public/langs/fr_FR/hrm.lang
diff --git a/htdocs/langs/fr_FR/incoterm.lang b/public/langs/fr_FR/incoterm.lang
similarity index 100%
rename from htdocs/langs/fr_FR/incoterm.lang
rename to public/langs/fr_FR/incoterm.lang
diff --git a/htdocs/langs/fr_FR/install.lang b/public/langs/fr_FR/install.lang
similarity index 100%
rename from htdocs/langs/fr_FR/install.lang
rename to public/langs/fr_FR/install.lang
diff --git a/htdocs/langs/fr_FR/interventions.lang b/public/langs/fr_FR/interventions.lang
similarity index 100%
rename from htdocs/langs/fr_FR/interventions.lang
rename to public/langs/fr_FR/interventions.lang
diff --git a/htdocs/langs/fr_FR/languages.lang b/public/langs/fr_FR/languages.lang
similarity index 100%
rename from htdocs/langs/fr_FR/languages.lang
rename to public/langs/fr_FR/languages.lang
diff --git a/htdocs/langs/fr_FR/ldap.lang b/public/langs/fr_FR/ldap.lang
similarity index 100%
rename from htdocs/langs/fr_FR/ldap.lang
rename to public/langs/fr_FR/ldap.lang
diff --git a/htdocs/langs/fr_FR/link.lang b/public/langs/fr_FR/link.lang
similarity index 100%
rename from htdocs/langs/fr_FR/link.lang
rename to public/langs/fr_FR/link.lang
diff --git a/htdocs/langs/fr_FR/loan.lang b/public/langs/fr_FR/loan.lang
similarity index 100%
rename from htdocs/langs/fr_FR/loan.lang
rename to public/langs/fr_FR/loan.lang
diff --git a/htdocs/langs/fr_FR/mailmanspip.lang b/public/langs/fr_FR/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/fr_FR/mailmanspip.lang
rename to public/langs/fr_FR/mailmanspip.lang
diff --git a/htdocs/langs/fr_FR/mails.lang b/public/langs/fr_FR/mails.lang
similarity index 100%
rename from htdocs/langs/fr_FR/mails.lang
rename to public/langs/fr_FR/mails.lang
diff --git a/htdocs/langs/fr_FR/main.lang b/public/langs/fr_FR/main.lang
similarity index 100%
rename from htdocs/langs/fr_FR/main.lang
rename to public/langs/fr_FR/main.lang
diff --git a/htdocs/langs/fr_FR/margins.lang b/public/langs/fr_FR/margins.lang
similarity index 100%
rename from htdocs/langs/fr_FR/margins.lang
rename to public/langs/fr_FR/margins.lang
diff --git a/htdocs/langs/fr_FR/members.lang b/public/langs/fr_FR/members.lang
similarity index 100%
rename from htdocs/langs/fr_FR/members.lang
rename to public/langs/fr_FR/members.lang
diff --git a/htdocs/langs/fr_FR/oauth.lang b/public/langs/fr_FR/oauth.lang
similarity index 100%
rename from htdocs/langs/fr_FR/oauth.lang
rename to public/langs/fr_FR/oauth.lang
diff --git a/htdocs/langs/fr_FR/opensurvey.lang b/public/langs/fr_FR/opensurvey.lang
similarity index 100%
rename from htdocs/langs/fr_FR/opensurvey.lang
rename to public/langs/fr_FR/opensurvey.lang
diff --git a/htdocs/langs/fr_FR/orders.lang b/public/langs/fr_FR/orders.lang
similarity index 100%
rename from htdocs/langs/fr_FR/orders.lang
rename to public/langs/fr_FR/orders.lang
diff --git a/htdocs/langs/fr_FR/other.lang b/public/langs/fr_FR/other.lang
similarity index 100%
rename from htdocs/langs/fr_FR/other.lang
rename to public/langs/fr_FR/other.lang
diff --git a/htdocs/langs/fr_FR/paybox.lang b/public/langs/fr_FR/paybox.lang
similarity index 100%
rename from htdocs/langs/fr_FR/paybox.lang
rename to public/langs/fr_FR/paybox.lang
diff --git a/htdocs/langs/fr_FR/paypal.lang b/public/langs/fr_FR/paypal.lang
similarity index 100%
rename from htdocs/langs/fr_FR/paypal.lang
rename to public/langs/fr_FR/paypal.lang
diff --git a/htdocs/langs/fr_FR/printing.lang b/public/langs/fr_FR/printing.lang
similarity index 100%
rename from htdocs/langs/fr_FR/printing.lang
rename to public/langs/fr_FR/printing.lang
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/public/langs/fr_FR/productbatch.lang
similarity index 100%
rename from htdocs/langs/fr_FR/productbatch.lang
rename to public/langs/fr_FR/productbatch.lang
diff --git a/htdocs/langs/fr_FR/products.lang b/public/langs/fr_FR/products.lang
similarity index 100%
rename from htdocs/langs/fr_FR/products.lang
rename to public/langs/fr_FR/products.lang
diff --git a/htdocs/langs/fr_FR/projects.lang b/public/langs/fr_FR/projects.lang
similarity index 100%
rename from htdocs/langs/fr_FR/projects.lang
rename to public/langs/fr_FR/projects.lang
diff --git a/htdocs/langs/fr_FR/propal.lang b/public/langs/fr_FR/propal.lang
similarity index 100%
rename from htdocs/langs/fr_FR/propal.lang
rename to public/langs/fr_FR/propal.lang
diff --git a/htdocs/langs/fr_FR/receiptprinter.lang b/public/langs/fr_FR/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/fr_FR/receiptprinter.lang
rename to public/langs/fr_FR/receiptprinter.lang
diff --git a/htdocs/langs/fr_FR/resource.lang b/public/langs/fr_FR/resource.lang
similarity index 100%
rename from htdocs/langs/fr_FR/resource.lang
rename to public/langs/fr_FR/resource.lang
diff --git a/htdocs/langs/fr_FR/salaries.lang b/public/langs/fr_FR/salaries.lang
similarity index 100%
rename from htdocs/langs/fr_FR/salaries.lang
rename to public/langs/fr_FR/salaries.lang
diff --git a/htdocs/langs/fr_FR/sendings.lang b/public/langs/fr_FR/sendings.lang
similarity index 100%
rename from htdocs/langs/fr_FR/sendings.lang
rename to public/langs/fr_FR/sendings.lang
diff --git a/htdocs/langs/fr_FR/sms.lang b/public/langs/fr_FR/sms.lang
similarity index 100%
rename from htdocs/langs/fr_FR/sms.lang
rename to public/langs/fr_FR/sms.lang
diff --git a/htdocs/langs/fr_FR/stocks.lang b/public/langs/fr_FR/stocks.lang
similarity index 100%
rename from htdocs/langs/fr_FR/stocks.lang
rename to public/langs/fr_FR/stocks.lang
diff --git a/htdocs/langs/fr_FR/supplier_proposal.lang b/public/langs/fr_FR/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/fr_FR/supplier_proposal.lang
rename to public/langs/fr_FR/supplier_proposal.lang
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/public/langs/fr_FR/suppliers.lang
similarity index 100%
rename from htdocs/langs/fr_FR/suppliers.lang
rename to public/langs/fr_FR/suppliers.lang
diff --git a/htdocs/langs/fr_FR/trips.lang b/public/langs/fr_FR/trips.lang
similarity index 100%
rename from htdocs/langs/fr_FR/trips.lang
rename to public/langs/fr_FR/trips.lang
diff --git a/htdocs/langs/fr_FR/users.lang b/public/langs/fr_FR/users.lang
similarity index 100%
rename from htdocs/langs/fr_FR/users.lang
rename to public/langs/fr_FR/users.lang
diff --git a/htdocs/langs/fr_FR/website.lang b/public/langs/fr_FR/website.lang
similarity index 100%
rename from htdocs/langs/fr_FR/website.lang
rename to public/langs/fr_FR/website.lang
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/public/langs/fr_FR/withdrawals.lang
similarity index 100%
rename from htdocs/langs/fr_FR/withdrawals.lang
rename to public/langs/fr_FR/withdrawals.lang
diff --git a/htdocs/langs/fr_FR/workflow.lang b/public/langs/fr_FR/workflow.lang
similarity index 100%
rename from htdocs/langs/fr_FR/workflow.lang
rename to public/langs/fr_FR/workflow.lang
diff --git a/htdocs/langs/fr_NC/admin.lang b/public/langs/fr_NC/admin.lang
similarity index 100%
rename from htdocs/langs/fr_NC/admin.lang
rename to public/langs/fr_NC/admin.lang
diff --git a/htdocs/langs/fr_NC/companies.lang b/public/langs/fr_NC/companies.lang
similarity index 100%
rename from htdocs/langs/fr_NC/companies.lang
rename to public/langs/fr_NC/companies.lang
diff --git a/htdocs/langs/fr_NC/compta.lang b/public/langs/fr_NC/compta.lang
similarity index 100%
rename from htdocs/langs/fr_NC/compta.lang
rename to public/langs/fr_NC/compta.lang
diff --git a/htdocs/langs/fr_NC/main.lang b/public/langs/fr_NC/main.lang
similarity index 100%
rename from htdocs/langs/fr_NC/main.lang
rename to public/langs/fr_NC/main.lang
diff --git a/htdocs/langs/he_IL/accountancy.lang b/public/langs/he_IL/accountancy.lang
similarity index 100%
rename from htdocs/langs/he_IL/accountancy.lang
rename to public/langs/he_IL/accountancy.lang
diff --git a/htdocs/langs/he_IL/admin.lang b/public/langs/he_IL/admin.lang
similarity index 100%
rename from htdocs/langs/he_IL/admin.lang
rename to public/langs/he_IL/admin.lang
diff --git a/htdocs/langs/he_IL/agenda.lang b/public/langs/he_IL/agenda.lang
similarity index 100%
rename from htdocs/langs/he_IL/agenda.lang
rename to public/langs/he_IL/agenda.lang
diff --git a/htdocs/langs/he_IL/banks.lang b/public/langs/he_IL/banks.lang
similarity index 100%
rename from htdocs/langs/he_IL/banks.lang
rename to public/langs/he_IL/banks.lang
diff --git a/htdocs/langs/he_IL/bills.lang b/public/langs/he_IL/bills.lang
similarity index 100%
rename from htdocs/langs/he_IL/bills.lang
rename to public/langs/he_IL/bills.lang
diff --git a/htdocs/langs/he_IL/bookmarks.lang b/public/langs/he_IL/bookmarks.lang
similarity index 100%
rename from htdocs/langs/he_IL/bookmarks.lang
rename to public/langs/he_IL/bookmarks.lang
diff --git a/htdocs/langs/he_IL/boxes.lang b/public/langs/he_IL/boxes.lang
similarity index 100%
rename from htdocs/langs/he_IL/boxes.lang
rename to public/langs/he_IL/boxes.lang
diff --git a/htdocs/langs/he_IL/cashdesk.lang b/public/langs/he_IL/cashdesk.lang
similarity index 100%
rename from htdocs/langs/he_IL/cashdesk.lang
rename to public/langs/he_IL/cashdesk.lang
diff --git a/htdocs/langs/he_IL/categories.lang b/public/langs/he_IL/categories.lang
similarity index 100%
rename from htdocs/langs/he_IL/categories.lang
rename to public/langs/he_IL/categories.lang
diff --git a/htdocs/langs/he_IL/commercial.lang b/public/langs/he_IL/commercial.lang
similarity index 100%
rename from htdocs/langs/he_IL/commercial.lang
rename to public/langs/he_IL/commercial.lang
diff --git a/htdocs/langs/he_IL/companies.lang b/public/langs/he_IL/companies.lang
similarity index 100%
rename from htdocs/langs/he_IL/companies.lang
rename to public/langs/he_IL/companies.lang
diff --git a/htdocs/langs/he_IL/compta.lang b/public/langs/he_IL/compta.lang
similarity index 100%
rename from htdocs/langs/he_IL/compta.lang
rename to public/langs/he_IL/compta.lang
diff --git a/htdocs/langs/he_IL/contracts.lang b/public/langs/he_IL/contracts.lang
similarity index 100%
rename from htdocs/langs/he_IL/contracts.lang
rename to public/langs/he_IL/contracts.lang
diff --git a/htdocs/langs/he_IL/cron.lang b/public/langs/he_IL/cron.lang
similarity index 100%
rename from htdocs/langs/he_IL/cron.lang
rename to public/langs/he_IL/cron.lang
diff --git a/htdocs/langs/he_IL/deliveries.lang b/public/langs/he_IL/deliveries.lang
similarity index 100%
rename from htdocs/langs/he_IL/deliveries.lang
rename to public/langs/he_IL/deliveries.lang
diff --git a/htdocs/langs/he_IL/dict.lang b/public/langs/he_IL/dict.lang
similarity index 100%
rename from htdocs/langs/he_IL/dict.lang
rename to public/langs/he_IL/dict.lang
diff --git a/htdocs/langs/he_IL/donations.lang b/public/langs/he_IL/donations.lang
similarity index 100%
rename from htdocs/langs/he_IL/donations.lang
rename to public/langs/he_IL/donations.lang
diff --git a/htdocs/langs/he_IL/ecm.lang b/public/langs/he_IL/ecm.lang
similarity index 100%
rename from htdocs/langs/he_IL/ecm.lang
rename to public/langs/he_IL/ecm.lang
diff --git a/htdocs/langs/he_IL/errors.lang b/public/langs/he_IL/errors.lang
similarity index 100%
rename from htdocs/langs/he_IL/errors.lang
rename to public/langs/he_IL/errors.lang
diff --git a/htdocs/langs/he_IL/exports.lang b/public/langs/he_IL/exports.lang
similarity index 100%
rename from htdocs/langs/he_IL/exports.lang
rename to public/langs/he_IL/exports.lang
diff --git a/htdocs/langs/he_IL/externalsite.lang b/public/langs/he_IL/externalsite.lang
similarity index 100%
rename from htdocs/langs/he_IL/externalsite.lang
rename to public/langs/he_IL/externalsite.lang
diff --git a/htdocs/langs/he_IL/ftp.lang b/public/langs/he_IL/ftp.lang
similarity index 100%
rename from htdocs/langs/he_IL/ftp.lang
rename to public/langs/he_IL/ftp.lang
diff --git a/htdocs/langs/he_IL/help.lang b/public/langs/he_IL/help.lang
similarity index 100%
rename from htdocs/langs/he_IL/help.lang
rename to public/langs/he_IL/help.lang
diff --git a/htdocs/langs/he_IL/holiday.lang b/public/langs/he_IL/holiday.lang
similarity index 100%
rename from htdocs/langs/he_IL/holiday.lang
rename to public/langs/he_IL/holiday.lang
diff --git a/htdocs/langs/he_IL/hrm.lang b/public/langs/he_IL/hrm.lang
similarity index 100%
rename from htdocs/langs/he_IL/hrm.lang
rename to public/langs/he_IL/hrm.lang
diff --git a/htdocs/langs/he_IL/incoterm.lang b/public/langs/he_IL/incoterm.lang
similarity index 100%
rename from htdocs/langs/he_IL/incoterm.lang
rename to public/langs/he_IL/incoterm.lang
diff --git a/htdocs/langs/he_IL/install.lang b/public/langs/he_IL/install.lang
similarity index 100%
rename from htdocs/langs/he_IL/install.lang
rename to public/langs/he_IL/install.lang
diff --git a/htdocs/langs/he_IL/interventions.lang b/public/langs/he_IL/interventions.lang
similarity index 100%
rename from htdocs/langs/he_IL/interventions.lang
rename to public/langs/he_IL/interventions.lang
diff --git a/htdocs/langs/he_IL/languages.lang b/public/langs/he_IL/languages.lang
similarity index 100%
rename from htdocs/langs/he_IL/languages.lang
rename to public/langs/he_IL/languages.lang
diff --git a/htdocs/langs/he_IL/ldap.lang b/public/langs/he_IL/ldap.lang
similarity index 100%
rename from htdocs/langs/he_IL/ldap.lang
rename to public/langs/he_IL/ldap.lang
diff --git a/htdocs/langs/he_IL/link.lang b/public/langs/he_IL/link.lang
similarity index 100%
rename from htdocs/langs/he_IL/link.lang
rename to public/langs/he_IL/link.lang
diff --git a/htdocs/langs/he_IL/loan.lang b/public/langs/he_IL/loan.lang
similarity index 100%
rename from htdocs/langs/he_IL/loan.lang
rename to public/langs/he_IL/loan.lang
diff --git a/htdocs/langs/he_IL/mailmanspip.lang b/public/langs/he_IL/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/he_IL/mailmanspip.lang
rename to public/langs/he_IL/mailmanspip.lang
diff --git a/htdocs/langs/he_IL/mails.lang b/public/langs/he_IL/mails.lang
similarity index 100%
rename from htdocs/langs/he_IL/mails.lang
rename to public/langs/he_IL/mails.lang
diff --git a/htdocs/langs/he_IL/main.lang b/public/langs/he_IL/main.lang
similarity index 100%
rename from htdocs/langs/he_IL/main.lang
rename to public/langs/he_IL/main.lang
diff --git a/htdocs/langs/he_IL/margins.lang b/public/langs/he_IL/margins.lang
similarity index 100%
rename from htdocs/langs/he_IL/margins.lang
rename to public/langs/he_IL/margins.lang
diff --git a/htdocs/langs/he_IL/members.lang b/public/langs/he_IL/members.lang
similarity index 100%
rename from htdocs/langs/he_IL/members.lang
rename to public/langs/he_IL/members.lang
diff --git a/htdocs/langs/he_IL/oauth.lang b/public/langs/he_IL/oauth.lang
similarity index 100%
rename from htdocs/langs/he_IL/oauth.lang
rename to public/langs/he_IL/oauth.lang
diff --git a/htdocs/langs/he_IL/opensurvey.lang b/public/langs/he_IL/opensurvey.lang
similarity index 100%
rename from htdocs/langs/he_IL/opensurvey.lang
rename to public/langs/he_IL/opensurvey.lang
diff --git a/htdocs/langs/he_IL/orders.lang b/public/langs/he_IL/orders.lang
similarity index 100%
rename from htdocs/langs/he_IL/orders.lang
rename to public/langs/he_IL/orders.lang
diff --git a/htdocs/langs/he_IL/other.lang b/public/langs/he_IL/other.lang
similarity index 100%
rename from htdocs/langs/he_IL/other.lang
rename to public/langs/he_IL/other.lang
diff --git a/htdocs/langs/he_IL/paybox.lang b/public/langs/he_IL/paybox.lang
similarity index 100%
rename from htdocs/langs/he_IL/paybox.lang
rename to public/langs/he_IL/paybox.lang
diff --git a/htdocs/langs/he_IL/paypal.lang b/public/langs/he_IL/paypal.lang
similarity index 100%
rename from htdocs/langs/he_IL/paypal.lang
rename to public/langs/he_IL/paypal.lang
diff --git a/htdocs/langs/he_IL/printing.lang b/public/langs/he_IL/printing.lang
similarity index 100%
rename from htdocs/langs/he_IL/printing.lang
rename to public/langs/he_IL/printing.lang
diff --git a/htdocs/langs/he_IL/productbatch.lang b/public/langs/he_IL/productbatch.lang
similarity index 100%
rename from htdocs/langs/he_IL/productbatch.lang
rename to public/langs/he_IL/productbatch.lang
diff --git a/htdocs/langs/he_IL/products.lang b/public/langs/he_IL/products.lang
similarity index 100%
rename from htdocs/langs/he_IL/products.lang
rename to public/langs/he_IL/products.lang
diff --git a/htdocs/langs/he_IL/projects.lang b/public/langs/he_IL/projects.lang
similarity index 100%
rename from htdocs/langs/he_IL/projects.lang
rename to public/langs/he_IL/projects.lang
diff --git a/htdocs/langs/he_IL/propal.lang b/public/langs/he_IL/propal.lang
similarity index 100%
rename from htdocs/langs/he_IL/propal.lang
rename to public/langs/he_IL/propal.lang
diff --git a/htdocs/langs/he_IL/receiptprinter.lang b/public/langs/he_IL/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/he_IL/receiptprinter.lang
rename to public/langs/he_IL/receiptprinter.lang
diff --git a/htdocs/langs/he_IL/resource.lang b/public/langs/he_IL/resource.lang
similarity index 100%
rename from htdocs/langs/he_IL/resource.lang
rename to public/langs/he_IL/resource.lang
diff --git a/htdocs/langs/he_IL/salaries.lang b/public/langs/he_IL/salaries.lang
similarity index 100%
rename from htdocs/langs/he_IL/salaries.lang
rename to public/langs/he_IL/salaries.lang
diff --git a/htdocs/langs/he_IL/sendings.lang b/public/langs/he_IL/sendings.lang
similarity index 100%
rename from htdocs/langs/he_IL/sendings.lang
rename to public/langs/he_IL/sendings.lang
diff --git a/htdocs/langs/he_IL/sms.lang b/public/langs/he_IL/sms.lang
similarity index 100%
rename from htdocs/langs/he_IL/sms.lang
rename to public/langs/he_IL/sms.lang
diff --git a/htdocs/langs/he_IL/stocks.lang b/public/langs/he_IL/stocks.lang
similarity index 100%
rename from htdocs/langs/he_IL/stocks.lang
rename to public/langs/he_IL/stocks.lang
diff --git a/htdocs/langs/he_IL/supplier_proposal.lang b/public/langs/he_IL/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/he_IL/supplier_proposal.lang
rename to public/langs/he_IL/supplier_proposal.lang
diff --git a/htdocs/langs/he_IL/suppliers.lang b/public/langs/he_IL/suppliers.lang
similarity index 100%
rename from htdocs/langs/he_IL/suppliers.lang
rename to public/langs/he_IL/suppliers.lang
diff --git a/htdocs/langs/he_IL/trips.lang b/public/langs/he_IL/trips.lang
similarity index 100%
rename from htdocs/langs/he_IL/trips.lang
rename to public/langs/he_IL/trips.lang
diff --git a/htdocs/langs/he_IL/users.lang b/public/langs/he_IL/users.lang
similarity index 100%
rename from htdocs/langs/he_IL/users.lang
rename to public/langs/he_IL/users.lang
diff --git a/htdocs/langs/he_IL/website.lang b/public/langs/he_IL/website.lang
similarity index 100%
rename from htdocs/langs/he_IL/website.lang
rename to public/langs/he_IL/website.lang
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/public/langs/he_IL/withdrawals.lang
similarity index 100%
rename from htdocs/langs/he_IL/withdrawals.lang
rename to public/langs/he_IL/withdrawals.lang
diff --git a/htdocs/langs/he_IL/workflow.lang b/public/langs/he_IL/workflow.lang
similarity index 100%
rename from htdocs/langs/he_IL/workflow.lang
rename to public/langs/he_IL/workflow.lang
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/public/langs/hr_HR/accountancy.lang
similarity index 100%
rename from htdocs/langs/hr_HR/accountancy.lang
rename to public/langs/hr_HR/accountancy.lang
diff --git a/htdocs/langs/hr_HR/admin.lang b/public/langs/hr_HR/admin.lang
similarity index 100%
rename from htdocs/langs/hr_HR/admin.lang
rename to public/langs/hr_HR/admin.lang
diff --git a/htdocs/langs/hr_HR/agenda.lang b/public/langs/hr_HR/agenda.lang
similarity index 100%
rename from htdocs/langs/hr_HR/agenda.lang
rename to public/langs/hr_HR/agenda.lang
diff --git a/htdocs/langs/hr_HR/banks.lang b/public/langs/hr_HR/banks.lang
similarity index 100%
rename from htdocs/langs/hr_HR/banks.lang
rename to public/langs/hr_HR/banks.lang
diff --git a/htdocs/langs/hr_HR/bills.lang b/public/langs/hr_HR/bills.lang
similarity index 100%
rename from htdocs/langs/hr_HR/bills.lang
rename to public/langs/hr_HR/bills.lang
diff --git a/htdocs/langs/hr_HR/bookmarks.lang b/public/langs/hr_HR/bookmarks.lang
similarity index 100%
rename from htdocs/langs/hr_HR/bookmarks.lang
rename to public/langs/hr_HR/bookmarks.lang
diff --git a/htdocs/langs/hr_HR/boxes.lang b/public/langs/hr_HR/boxes.lang
similarity index 100%
rename from htdocs/langs/hr_HR/boxes.lang
rename to public/langs/hr_HR/boxes.lang
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/public/langs/hr_HR/cashdesk.lang
similarity index 100%
rename from htdocs/langs/hr_HR/cashdesk.lang
rename to public/langs/hr_HR/cashdesk.lang
diff --git a/htdocs/langs/hr_HR/categories.lang b/public/langs/hr_HR/categories.lang
similarity index 100%
rename from htdocs/langs/hr_HR/categories.lang
rename to public/langs/hr_HR/categories.lang
diff --git a/htdocs/langs/hr_HR/commercial.lang b/public/langs/hr_HR/commercial.lang
similarity index 100%
rename from htdocs/langs/hr_HR/commercial.lang
rename to public/langs/hr_HR/commercial.lang
diff --git a/htdocs/langs/hr_HR/companies.lang b/public/langs/hr_HR/companies.lang
similarity index 100%
rename from htdocs/langs/hr_HR/companies.lang
rename to public/langs/hr_HR/companies.lang
diff --git a/htdocs/langs/hr_HR/compta.lang b/public/langs/hr_HR/compta.lang
similarity index 100%
rename from htdocs/langs/hr_HR/compta.lang
rename to public/langs/hr_HR/compta.lang
diff --git a/htdocs/langs/hr_HR/contracts.lang b/public/langs/hr_HR/contracts.lang
similarity index 100%
rename from htdocs/langs/hr_HR/contracts.lang
rename to public/langs/hr_HR/contracts.lang
diff --git a/htdocs/langs/hr_HR/cron.lang b/public/langs/hr_HR/cron.lang
similarity index 100%
rename from htdocs/langs/hr_HR/cron.lang
rename to public/langs/hr_HR/cron.lang
diff --git a/htdocs/langs/hr_HR/deliveries.lang b/public/langs/hr_HR/deliveries.lang
similarity index 100%
rename from htdocs/langs/hr_HR/deliveries.lang
rename to public/langs/hr_HR/deliveries.lang
diff --git a/htdocs/langs/hr_HR/dict.lang b/public/langs/hr_HR/dict.lang
similarity index 100%
rename from htdocs/langs/hr_HR/dict.lang
rename to public/langs/hr_HR/dict.lang
diff --git a/htdocs/langs/hr_HR/donations.lang b/public/langs/hr_HR/donations.lang
similarity index 100%
rename from htdocs/langs/hr_HR/donations.lang
rename to public/langs/hr_HR/donations.lang
diff --git a/htdocs/langs/hr_HR/ecm.lang b/public/langs/hr_HR/ecm.lang
similarity index 100%
rename from htdocs/langs/hr_HR/ecm.lang
rename to public/langs/hr_HR/ecm.lang
diff --git a/htdocs/langs/hr_HR/errors.lang b/public/langs/hr_HR/errors.lang
similarity index 100%
rename from htdocs/langs/hr_HR/errors.lang
rename to public/langs/hr_HR/errors.lang
diff --git a/htdocs/langs/hr_HR/exports.lang b/public/langs/hr_HR/exports.lang
similarity index 100%
rename from htdocs/langs/hr_HR/exports.lang
rename to public/langs/hr_HR/exports.lang
diff --git a/htdocs/langs/hr_HR/externalsite.lang b/public/langs/hr_HR/externalsite.lang
similarity index 100%
rename from htdocs/langs/hr_HR/externalsite.lang
rename to public/langs/hr_HR/externalsite.lang
diff --git a/htdocs/langs/hr_HR/ftp.lang b/public/langs/hr_HR/ftp.lang
similarity index 100%
rename from htdocs/langs/hr_HR/ftp.lang
rename to public/langs/hr_HR/ftp.lang
diff --git a/htdocs/langs/hr_HR/help.lang b/public/langs/hr_HR/help.lang
similarity index 100%
rename from htdocs/langs/hr_HR/help.lang
rename to public/langs/hr_HR/help.lang
diff --git a/htdocs/langs/hr_HR/holiday.lang b/public/langs/hr_HR/holiday.lang
similarity index 100%
rename from htdocs/langs/hr_HR/holiday.lang
rename to public/langs/hr_HR/holiday.lang
diff --git a/htdocs/langs/hr_HR/hrm.lang b/public/langs/hr_HR/hrm.lang
similarity index 100%
rename from htdocs/langs/hr_HR/hrm.lang
rename to public/langs/hr_HR/hrm.lang
diff --git a/htdocs/langs/hr_HR/incoterm.lang b/public/langs/hr_HR/incoterm.lang
similarity index 100%
rename from htdocs/langs/hr_HR/incoterm.lang
rename to public/langs/hr_HR/incoterm.lang
diff --git a/htdocs/langs/hr_HR/install.lang b/public/langs/hr_HR/install.lang
similarity index 100%
rename from htdocs/langs/hr_HR/install.lang
rename to public/langs/hr_HR/install.lang
diff --git a/htdocs/langs/hr_HR/interventions.lang b/public/langs/hr_HR/interventions.lang
similarity index 100%
rename from htdocs/langs/hr_HR/interventions.lang
rename to public/langs/hr_HR/interventions.lang
diff --git a/htdocs/langs/hr_HR/languages.lang b/public/langs/hr_HR/languages.lang
similarity index 100%
rename from htdocs/langs/hr_HR/languages.lang
rename to public/langs/hr_HR/languages.lang
diff --git a/htdocs/langs/hr_HR/ldap.lang b/public/langs/hr_HR/ldap.lang
similarity index 100%
rename from htdocs/langs/hr_HR/ldap.lang
rename to public/langs/hr_HR/ldap.lang
diff --git a/htdocs/langs/hr_HR/link.lang b/public/langs/hr_HR/link.lang
similarity index 100%
rename from htdocs/langs/hr_HR/link.lang
rename to public/langs/hr_HR/link.lang
diff --git a/htdocs/langs/hr_HR/loan.lang b/public/langs/hr_HR/loan.lang
similarity index 100%
rename from htdocs/langs/hr_HR/loan.lang
rename to public/langs/hr_HR/loan.lang
diff --git a/htdocs/langs/hr_HR/mailmanspip.lang b/public/langs/hr_HR/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/hr_HR/mailmanspip.lang
rename to public/langs/hr_HR/mailmanspip.lang
diff --git a/htdocs/langs/hr_HR/mails.lang b/public/langs/hr_HR/mails.lang
similarity index 100%
rename from htdocs/langs/hr_HR/mails.lang
rename to public/langs/hr_HR/mails.lang
diff --git a/htdocs/langs/hr_HR/main.lang b/public/langs/hr_HR/main.lang
similarity index 100%
rename from htdocs/langs/hr_HR/main.lang
rename to public/langs/hr_HR/main.lang
diff --git a/htdocs/langs/hr_HR/margins.lang b/public/langs/hr_HR/margins.lang
similarity index 100%
rename from htdocs/langs/hr_HR/margins.lang
rename to public/langs/hr_HR/margins.lang
diff --git a/htdocs/langs/hr_HR/members.lang b/public/langs/hr_HR/members.lang
similarity index 100%
rename from htdocs/langs/hr_HR/members.lang
rename to public/langs/hr_HR/members.lang
diff --git a/htdocs/langs/hr_HR/oauth.lang b/public/langs/hr_HR/oauth.lang
similarity index 100%
rename from htdocs/langs/hr_HR/oauth.lang
rename to public/langs/hr_HR/oauth.lang
diff --git a/htdocs/langs/hr_HR/opensurvey.lang b/public/langs/hr_HR/opensurvey.lang
similarity index 100%
rename from htdocs/langs/hr_HR/opensurvey.lang
rename to public/langs/hr_HR/opensurvey.lang
diff --git a/htdocs/langs/hr_HR/orders.lang b/public/langs/hr_HR/orders.lang
similarity index 100%
rename from htdocs/langs/hr_HR/orders.lang
rename to public/langs/hr_HR/orders.lang
diff --git a/htdocs/langs/hr_HR/other.lang b/public/langs/hr_HR/other.lang
similarity index 100%
rename from htdocs/langs/hr_HR/other.lang
rename to public/langs/hr_HR/other.lang
diff --git a/htdocs/langs/hr_HR/paybox.lang b/public/langs/hr_HR/paybox.lang
similarity index 100%
rename from htdocs/langs/hr_HR/paybox.lang
rename to public/langs/hr_HR/paybox.lang
diff --git a/htdocs/langs/hr_HR/paypal.lang b/public/langs/hr_HR/paypal.lang
similarity index 100%
rename from htdocs/langs/hr_HR/paypal.lang
rename to public/langs/hr_HR/paypal.lang
diff --git a/htdocs/langs/hr_HR/printing.lang b/public/langs/hr_HR/printing.lang
similarity index 100%
rename from htdocs/langs/hr_HR/printing.lang
rename to public/langs/hr_HR/printing.lang
diff --git a/htdocs/langs/hr_HR/productbatch.lang b/public/langs/hr_HR/productbatch.lang
similarity index 100%
rename from htdocs/langs/hr_HR/productbatch.lang
rename to public/langs/hr_HR/productbatch.lang
diff --git a/htdocs/langs/hr_HR/products.lang b/public/langs/hr_HR/products.lang
similarity index 100%
rename from htdocs/langs/hr_HR/products.lang
rename to public/langs/hr_HR/products.lang
diff --git a/htdocs/langs/hr_HR/projects.lang b/public/langs/hr_HR/projects.lang
similarity index 100%
rename from htdocs/langs/hr_HR/projects.lang
rename to public/langs/hr_HR/projects.lang
diff --git a/htdocs/langs/hr_HR/propal.lang b/public/langs/hr_HR/propal.lang
similarity index 100%
rename from htdocs/langs/hr_HR/propal.lang
rename to public/langs/hr_HR/propal.lang
diff --git a/htdocs/langs/hr_HR/receiptprinter.lang b/public/langs/hr_HR/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/hr_HR/receiptprinter.lang
rename to public/langs/hr_HR/receiptprinter.lang
diff --git a/htdocs/langs/hr_HR/resource.lang b/public/langs/hr_HR/resource.lang
similarity index 100%
rename from htdocs/langs/hr_HR/resource.lang
rename to public/langs/hr_HR/resource.lang
diff --git a/htdocs/langs/hr_HR/salaries.lang b/public/langs/hr_HR/salaries.lang
similarity index 100%
rename from htdocs/langs/hr_HR/salaries.lang
rename to public/langs/hr_HR/salaries.lang
diff --git a/htdocs/langs/hr_HR/sendings.lang b/public/langs/hr_HR/sendings.lang
similarity index 100%
rename from htdocs/langs/hr_HR/sendings.lang
rename to public/langs/hr_HR/sendings.lang
diff --git a/htdocs/langs/hr_HR/sms.lang b/public/langs/hr_HR/sms.lang
similarity index 100%
rename from htdocs/langs/hr_HR/sms.lang
rename to public/langs/hr_HR/sms.lang
diff --git a/htdocs/langs/hr_HR/stocks.lang b/public/langs/hr_HR/stocks.lang
similarity index 100%
rename from htdocs/langs/hr_HR/stocks.lang
rename to public/langs/hr_HR/stocks.lang
diff --git a/htdocs/langs/hr_HR/supplier_proposal.lang b/public/langs/hr_HR/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/hr_HR/supplier_proposal.lang
rename to public/langs/hr_HR/supplier_proposal.lang
diff --git a/htdocs/langs/hr_HR/suppliers.lang b/public/langs/hr_HR/suppliers.lang
similarity index 100%
rename from htdocs/langs/hr_HR/suppliers.lang
rename to public/langs/hr_HR/suppliers.lang
diff --git a/htdocs/langs/hr_HR/trips.lang b/public/langs/hr_HR/trips.lang
similarity index 100%
rename from htdocs/langs/hr_HR/trips.lang
rename to public/langs/hr_HR/trips.lang
diff --git a/htdocs/langs/hr_HR/users.lang b/public/langs/hr_HR/users.lang
similarity index 100%
rename from htdocs/langs/hr_HR/users.lang
rename to public/langs/hr_HR/users.lang
diff --git a/htdocs/langs/hr_HR/website.lang b/public/langs/hr_HR/website.lang
similarity index 100%
rename from htdocs/langs/hr_HR/website.lang
rename to public/langs/hr_HR/website.lang
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/public/langs/hr_HR/withdrawals.lang
similarity index 100%
rename from htdocs/langs/hr_HR/withdrawals.lang
rename to public/langs/hr_HR/withdrawals.lang
diff --git a/htdocs/langs/hr_HR/workflow.lang b/public/langs/hr_HR/workflow.lang
similarity index 100%
rename from htdocs/langs/hr_HR/workflow.lang
rename to public/langs/hr_HR/workflow.lang
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/public/langs/hu_HU/accountancy.lang
similarity index 100%
rename from htdocs/langs/hu_HU/accountancy.lang
rename to public/langs/hu_HU/accountancy.lang
diff --git a/htdocs/langs/hu_HU/admin.lang b/public/langs/hu_HU/admin.lang
similarity index 100%
rename from htdocs/langs/hu_HU/admin.lang
rename to public/langs/hu_HU/admin.lang
diff --git a/htdocs/langs/hu_HU/agenda.lang b/public/langs/hu_HU/agenda.lang
similarity index 100%
rename from htdocs/langs/hu_HU/agenda.lang
rename to public/langs/hu_HU/agenda.lang
diff --git a/htdocs/langs/hu_HU/banks.lang b/public/langs/hu_HU/banks.lang
similarity index 100%
rename from htdocs/langs/hu_HU/banks.lang
rename to public/langs/hu_HU/banks.lang
diff --git a/htdocs/langs/hu_HU/bills.lang b/public/langs/hu_HU/bills.lang
similarity index 100%
rename from htdocs/langs/hu_HU/bills.lang
rename to public/langs/hu_HU/bills.lang
diff --git a/htdocs/langs/hu_HU/bookmarks.lang b/public/langs/hu_HU/bookmarks.lang
similarity index 100%
rename from htdocs/langs/hu_HU/bookmarks.lang
rename to public/langs/hu_HU/bookmarks.lang
diff --git a/htdocs/langs/hu_HU/boxes.lang b/public/langs/hu_HU/boxes.lang
similarity index 100%
rename from htdocs/langs/hu_HU/boxes.lang
rename to public/langs/hu_HU/boxes.lang
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/public/langs/hu_HU/cashdesk.lang
similarity index 100%
rename from htdocs/langs/hu_HU/cashdesk.lang
rename to public/langs/hu_HU/cashdesk.lang
diff --git a/htdocs/langs/hu_HU/categories.lang b/public/langs/hu_HU/categories.lang
similarity index 100%
rename from htdocs/langs/hu_HU/categories.lang
rename to public/langs/hu_HU/categories.lang
diff --git a/htdocs/langs/hu_HU/commercial.lang b/public/langs/hu_HU/commercial.lang
similarity index 100%
rename from htdocs/langs/hu_HU/commercial.lang
rename to public/langs/hu_HU/commercial.lang
diff --git a/htdocs/langs/hu_HU/companies.lang b/public/langs/hu_HU/companies.lang
similarity index 100%
rename from htdocs/langs/hu_HU/companies.lang
rename to public/langs/hu_HU/companies.lang
diff --git a/htdocs/langs/hu_HU/compta.lang b/public/langs/hu_HU/compta.lang
similarity index 100%
rename from htdocs/langs/hu_HU/compta.lang
rename to public/langs/hu_HU/compta.lang
diff --git a/htdocs/langs/hu_HU/contracts.lang b/public/langs/hu_HU/contracts.lang
similarity index 100%
rename from htdocs/langs/hu_HU/contracts.lang
rename to public/langs/hu_HU/contracts.lang
diff --git a/htdocs/langs/hu_HU/cron.lang b/public/langs/hu_HU/cron.lang
similarity index 100%
rename from htdocs/langs/hu_HU/cron.lang
rename to public/langs/hu_HU/cron.lang
diff --git a/htdocs/langs/hu_HU/deliveries.lang b/public/langs/hu_HU/deliveries.lang
similarity index 100%
rename from htdocs/langs/hu_HU/deliveries.lang
rename to public/langs/hu_HU/deliveries.lang
diff --git a/htdocs/langs/hu_HU/dict.lang b/public/langs/hu_HU/dict.lang
similarity index 100%
rename from htdocs/langs/hu_HU/dict.lang
rename to public/langs/hu_HU/dict.lang
diff --git a/htdocs/langs/hu_HU/donations.lang b/public/langs/hu_HU/donations.lang
similarity index 100%
rename from htdocs/langs/hu_HU/donations.lang
rename to public/langs/hu_HU/donations.lang
diff --git a/htdocs/langs/hu_HU/ecm.lang b/public/langs/hu_HU/ecm.lang
similarity index 100%
rename from htdocs/langs/hu_HU/ecm.lang
rename to public/langs/hu_HU/ecm.lang
diff --git a/htdocs/langs/hu_HU/errors.lang b/public/langs/hu_HU/errors.lang
similarity index 100%
rename from htdocs/langs/hu_HU/errors.lang
rename to public/langs/hu_HU/errors.lang
diff --git a/htdocs/langs/hu_HU/exports.lang b/public/langs/hu_HU/exports.lang
similarity index 100%
rename from htdocs/langs/hu_HU/exports.lang
rename to public/langs/hu_HU/exports.lang
diff --git a/htdocs/langs/hu_HU/externalsite.lang b/public/langs/hu_HU/externalsite.lang
similarity index 100%
rename from htdocs/langs/hu_HU/externalsite.lang
rename to public/langs/hu_HU/externalsite.lang
diff --git a/htdocs/langs/hu_HU/ftp.lang b/public/langs/hu_HU/ftp.lang
similarity index 100%
rename from htdocs/langs/hu_HU/ftp.lang
rename to public/langs/hu_HU/ftp.lang
diff --git a/htdocs/langs/hu_HU/help.lang b/public/langs/hu_HU/help.lang
similarity index 100%
rename from htdocs/langs/hu_HU/help.lang
rename to public/langs/hu_HU/help.lang
diff --git a/htdocs/langs/hu_HU/holiday.lang b/public/langs/hu_HU/holiday.lang
similarity index 100%
rename from htdocs/langs/hu_HU/holiday.lang
rename to public/langs/hu_HU/holiday.lang
diff --git a/htdocs/langs/hu_HU/hrm.lang b/public/langs/hu_HU/hrm.lang
similarity index 100%
rename from htdocs/langs/hu_HU/hrm.lang
rename to public/langs/hu_HU/hrm.lang
diff --git a/htdocs/langs/hu_HU/incoterm.lang b/public/langs/hu_HU/incoterm.lang
similarity index 100%
rename from htdocs/langs/hu_HU/incoterm.lang
rename to public/langs/hu_HU/incoterm.lang
diff --git a/htdocs/langs/hu_HU/install.lang b/public/langs/hu_HU/install.lang
similarity index 100%
rename from htdocs/langs/hu_HU/install.lang
rename to public/langs/hu_HU/install.lang
diff --git a/htdocs/langs/hu_HU/interventions.lang b/public/langs/hu_HU/interventions.lang
similarity index 100%
rename from htdocs/langs/hu_HU/interventions.lang
rename to public/langs/hu_HU/interventions.lang
diff --git a/htdocs/langs/hu_HU/languages.lang b/public/langs/hu_HU/languages.lang
similarity index 100%
rename from htdocs/langs/hu_HU/languages.lang
rename to public/langs/hu_HU/languages.lang
diff --git a/htdocs/langs/hu_HU/ldap.lang b/public/langs/hu_HU/ldap.lang
similarity index 100%
rename from htdocs/langs/hu_HU/ldap.lang
rename to public/langs/hu_HU/ldap.lang
diff --git a/htdocs/langs/hu_HU/link.lang b/public/langs/hu_HU/link.lang
similarity index 100%
rename from htdocs/langs/hu_HU/link.lang
rename to public/langs/hu_HU/link.lang
diff --git a/htdocs/langs/hu_HU/loan.lang b/public/langs/hu_HU/loan.lang
similarity index 100%
rename from htdocs/langs/hu_HU/loan.lang
rename to public/langs/hu_HU/loan.lang
diff --git a/htdocs/langs/hu_HU/mailmanspip.lang b/public/langs/hu_HU/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/hu_HU/mailmanspip.lang
rename to public/langs/hu_HU/mailmanspip.lang
diff --git a/htdocs/langs/hu_HU/mails.lang b/public/langs/hu_HU/mails.lang
similarity index 100%
rename from htdocs/langs/hu_HU/mails.lang
rename to public/langs/hu_HU/mails.lang
diff --git a/htdocs/langs/hu_HU/main.lang b/public/langs/hu_HU/main.lang
similarity index 100%
rename from htdocs/langs/hu_HU/main.lang
rename to public/langs/hu_HU/main.lang
diff --git a/htdocs/langs/hu_HU/margins.lang b/public/langs/hu_HU/margins.lang
similarity index 100%
rename from htdocs/langs/hu_HU/margins.lang
rename to public/langs/hu_HU/margins.lang
diff --git a/htdocs/langs/hu_HU/members.lang b/public/langs/hu_HU/members.lang
similarity index 100%
rename from htdocs/langs/hu_HU/members.lang
rename to public/langs/hu_HU/members.lang
diff --git a/htdocs/langs/hu_HU/oauth.lang b/public/langs/hu_HU/oauth.lang
similarity index 100%
rename from htdocs/langs/hu_HU/oauth.lang
rename to public/langs/hu_HU/oauth.lang
diff --git a/htdocs/langs/hu_HU/opensurvey.lang b/public/langs/hu_HU/opensurvey.lang
similarity index 100%
rename from htdocs/langs/hu_HU/opensurvey.lang
rename to public/langs/hu_HU/opensurvey.lang
diff --git a/htdocs/langs/hu_HU/orders.lang b/public/langs/hu_HU/orders.lang
similarity index 100%
rename from htdocs/langs/hu_HU/orders.lang
rename to public/langs/hu_HU/orders.lang
diff --git a/htdocs/langs/hu_HU/other.lang b/public/langs/hu_HU/other.lang
similarity index 100%
rename from htdocs/langs/hu_HU/other.lang
rename to public/langs/hu_HU/other.lang
diff --git a/htdocs/langs/hu_HU/paybox.lang b/public/langs/hu_HU/paybox.lang
similarity index 100%
rename from htdocs/langs/hu_HU/paybox.lang
rename to public/langs/hu_HU/paybox.lang
diff --git a/htdocs/langs/hu_HU/paypal.lang b/public/langs/hu_HU/paypal.lang
similarity index 100%
rename from htdocs/langs/hu_HU/paypal.lang
rename to public/langs/hu_HU/paypal.lang
diff --git a/htdocs/langs/hu_HU/printing.lang b/public/langs/hu_HU/printing.lang
similarity index 100%
rename from htdocs/langs/hu_HU/printing.lang
rename to public/langs/hu_HU/printing.lang
diff --git a/htdocs/langs/hu_HU/productbatch.lang b/public/langs/hu_HU/productbatch.lang
similarity index 100%
rename from htdocs/langs/hu_HU/productbatch.lang
rename to public/langs/hu_HU/productbatch.lang
diff --git a/htdocs/langs/hu_HU/products.lang b/public/langs/hu_HU/products.lang
similarity index 100%
rename from htdocs/langs/hu_HU/products.lang
rename to public/langs/hu_HU/products.lang
diff --git a/htdocs/langs/hu_HU/projects.lang b/public/langs/hu_HU/projects.lang
similarity index 100%
rename from htdocs/langs/hu_HU/projects.lang
rename to public/langs/hu_HU/projects.lang
diff --git a/htdocs/langs/hu_HU/propal.lang b/public/langs/hu_HU/propal.lang
similarity index 100%
rename from htdocs/langs/hu_HU/propal.lang
rename to public/langs/hu_HU/propal.lang
diff --git a/htdocs/langs/hu_HU/receiptprinter.lang b/public/langs/hu_HU/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/hu_HU/receiptprinter.lang
rename to public/langs/hu_HU/receiptprinter.lang
diff --git a/htdocs/langs/hu_HU/resource.lang b/public/langs/hu_HU/resource.lang
similarity index 100%
rename from htdocs/langs/hu_HU/resource.lang
rename to public/langs/hu_HU/resource.lang
diff --git a/htdocs/langs/hu_HU/salaries.lang b/public/langs/hu_HU/salaries.lang
similarity index 100%
rename from htdocs/langs/hu_HU/salaries.lang
rename to public/langs/hu_HU/salaries.lang
diff --git a/htdocs/langs/hu_HU/sendings.lang b/public/langs/hu_HU/sendings.lang
similarity index 100%
rename from htdocs/langs/hu_HU/sendings.lang
rename to public/langs/hu_HU/sendings.lang
diff --git a/htdocs/langs/hu_HU/sms.lang b/public/langs/hu_HU/sms.lang
similarity index 100%
rename from htdocs/langs/hu_HU/sms.lang
rename to public/langs/hu_HU/sms.lang
diff --git a/htdocs/langs/hu_HU/stocks.lang b/public/langs/hu_HU/stocks.lang
similarity index 100%
rename from htdocs/langs/hu_HU/stocks.lang
rename to public/langs/hu_HU/stocks.lang
diff --git a/htdocs/langs/hu_HU/supplier_proposal.lang b/public/langs/hu_HU/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/hu_HU/supplier_proposal.lang
rename to public/langs/hu_HU/supplier_proposal.lang
diff --git a/htdocs/langs/hu_HU/suppliers.lang b/public/langs/hu_HU/suppliers.lang
similarity index 100%
rename from htdocs/langs/hu_HU/suppliers.lang
rename to public/langs/hu_HU/suppliers.lang
diff --git a/htdocs/langs/hu_HU/trips.lang b/public/langs/hu_HU/trips.lang
similarity index 100%
rename from htdocs/langs/hu_HU/trips.lang
rename to public/langs/hu_HU/trips.lang
diff --git a/htdocs/langs/hu_HU/users.lang b/public/langs/hu_HU/users.lang
similarity index 100%
rename from htdocs/langs/hu_HU/users.lang
rename to public/langs/hu_HU/users.lang
diff --git a/htdocs/langs/hu_HU/website.lang b/public/langs/hu_HU/website.lang
similarity index 100%
rename from htdocs/langs/hu_HU/website.lang
rename to public/langs/hu_HU/website.lang
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/public/langs/hu_HU/withdrawals.lang
similarity index 100%
rename from htdocs/langs/hu_HU/withdrawals.lang
rename to public/langs/hu_HU/withdrawals.lang
diff --git a/htdocs/langs/hu_HU/workflow.lang b/public/langs/hu_HU/workflow.lang
similarity index 100%
rename from htdocs/langs/hu_HU/workflow.lang
rename to public/langs/hu_HU/workflow.lang
diff --git a/htdocs/langs/id_ID/accountancy.lang b/public/langs/id_ID/accountancy.lang
similarity index 100%
rename from htdocs/langs/id_ID/accountancy.lang
rename to public/langs/id_ID/accountancy.lang
diff --git a/htdocs/langs/id_ID/admin.lang b/public/langs/id_ID/admin.lang
similarity index 100%
rename from htdocs/langs/id_ID/admin.lang
rename to public/langs/id_ID/admin.lang
diff --git a/htdocs/langs/id_ID/agenda.lang b/public/langs/id_ID/agenda.lang
similarity index 100%
rename from htdocs/langs/id_ID/agenda.lang
rename to public/langs/id_ID/agenda.lang
diff --git a/htdocs/langs/id_ID/banks.lang b/public/langs/id_ID/banks.lang
similarity index 100%
rename from htdocs/langs/id_ID/banks.lang
rename to public/langs/id_ID/banks.lang
diff --git a/htdocs/langs/id_ID/bills.lang b/public/langs/id_ID/bills.lang
similarity index 100%
rename from htdocs/langs/id_ID/bills.lang
rename to public/langs/id_ID/bills.lang
diff --git a/htdocs/langs/id_ID/bookmarks.lang b/public/langs/id_ID/bookmarks.lang
similarity index 100%
rename from htdocs/langs/id_ID/bookmarks.lang
rename to public/langs/id_ID/bookmarks.lang
diff --git a/htdocs/langs/id_ID/boxes.lang b/public/langs/id_ID/boxes.lang
similarity index 100%
rename from htdocs/langs/id_ID/boxes.lang
rename to public/langs/id_ID/boxes.lang
diff --git a/htdocs/langs/id_ID/cashdesk.lang b/public/langs/id_ID/cashdesk.lang
similarity index 100%
rename from htdocs/langs/id_ID/cashdesk.lang
rename to public/langs/id_ID/cashdesk.lang
diff --git a/htdocs/langs/id_ID/categories.lang b/public/langs/id_ID/categories.lang
similarity index 100%
rename from htdocs/langs/id_ID/categories.lang
rename to public/langs/id_ID/categories.lang
diff --git a/htdocs/langs/id_ID/commercial.lang b/public/langs/id_ID/commercial.lang
similarity index 100%
rename from htdocs/langs/id_ID/commercial.lang
rename to public/langs/id_ID/commercial.lang
diff --git a/htdocs/langs/id_ID/companies.lang b/public/langs/id_ID/companies.lang
similarity index 100%
rename from htdocs/langs/id_ID/companies.lang
rename to public/langs/id_ID/companies.lang
diff --git a/htdocs/langs/id_ID/compta.lang b/public/langs/id_ID/compta.lang
similarity index 100%
rename from htdocs/langs/id_ID/compta.lang
rename to public/langs/id_ID/compta.lang
diff --git a/htdocs/langs/id_ID/contracts.lang b/public/langs/id_ID/contracts.lang
similarity index 100%
rename from htdocs/langs/id_ID/contracts.lang
rename to public/langs/id_ID/contracts.lang
diff --git a/htdocs/langs/id_ID/cron.lang b/public/langs/id_ID/cron.lang
similarity index 100%
rename from htdocs/langs/id_ID/cron.lang
rename to public/langs/id_ID/cron.lang
diff --git a/htdocs/langs/id_ID/deliveries.lang b/public/langs/id_ID/deliveries.lang
similarity index 100%
rename from htdocs/langs/id_ID/deliveries.lang
rename to public/langs/id_ID/deliveries.lang
diff --git a/htdocs/langs/id_ID/dict.lang b/public/langs/id_ID/dict.lang
similarity index 100%
rename from htdocs/langs/id_ID/dict.lang
rename to public/langs/id_ID/dict.lang
diff --git a/htdocs/langs/id_ID/donations.lang b/public/langs/id_ID/donations.lang
similarity index 100%
rename from htdocs/langs/id_ID/donations.lang
rename to public/langs/id_ID/donations.lang
diff --git a/htdocs/langs/id_ID/ecm.lang b/public/langs/id_ID/ecm.lang
similarity index 100%
rename from htdocs/langs/id_ID/ecm.lang
rename to public/langs/id_ID/ecm.lang
diff --git a/htdocs/langs/id_ID/errors.lang b/public/langs/id_ID/errors.lang
similarity index 100%
rename from htdocs/langs/id_ID/errors.lang
rename to public/langs/id_ID/errors.lang
diff --git a/htdocs/langs/id_ID/exports.lang b/public/langs/id_ID/exports.lang
similarity index 100%
rename from htdocs/langs/id_ID/exports.lang
rename to public/langs/id_ID/exports.lang
diff --git a/htdocs/langs/id_ID/externalsite.lang b/public/langs/id_ID/externalsite.lang
similarity index 100%
rename from htdocs/langs/id_ID/externalsite.lang
rename to public/langs/id_ID/externalsite.lang
diff --git a/htdocs/langs/id_ID/ftp.lang b/public/langs/id_ID/ftp.lang
similarity index 100%
rename from htdocs/langs/id_ID/ftp.lang
rename to public/langs/id_ID/ftp.lang
diff --git a/htdocs/langs/id_ID/help.lang b/public/langs/id_ID/help.lang
similarity index 100%
rename from htdocs/langs/id_ID/help.lang
rename to public/langs/id_ID/help.lang
diff --git a/htdocs/langs/id_ID/holiday.lang b/public/langs/id_ID/holiday.lang
similarity index 100%
rename from htdocs/langs/id_ID/holiday.lang
rename to public/langs/id_ID/holiday.lang
diff --git a/htdocs/langs/id_ID/hrm.lang b/public/langs/id_ID/hrm.lang
similarity index 100%
rename from htdocs/langs/id_ID/hrm.lang
rename to public/langs/id_ID/hrm.lang
diff --git a/htdocs/langs/id_ID/incoterm.lang b/public/langs/id_ID/incoterm.lang
similarity index 100%
rename from htdocs/langs/id_ID/incoterm.lang
rename to public/langs/id_ID/incoterm.lang
diff --git a/htdocs/langs/id_ID/install.lang b/public/langs/id_ID/install.lang
similarity index 100%
rename from htdocs/langs/id_ID/install.lang
rename to public/langs/id_ID/install.lang
diff --git a/htdocs/langs/id_ID/interventions.lang b/public/langs/id_ID/interventions.lang
similarity index 100%
rename from htdocs/langs/id_ID/interventions.lang
rename to public/langs/id_ID/interventions.lang
diff --git a/htdocs/langs/id_ID/languages.lang b/public/langs/id_ID/languages.lang
similarity index 100%
rename from htdocs/langs/id_ID/languages.lang
rename to public/langs/id_ID/languages.lang
diff --git a/htdocs/langs/id_ID/ldap.lang b/public/langs/id_ID/ldap.lang
similarity index 100%
rename from htdocs/langs/id_ID/ldap.lang
rename to public/langs/id_ID/ldap.lang
diff --git a/htdocs/langs/id_ID/link.lang b/public/langs/id_ID/link.lang
similarity index 100%
rename from htdocs/langs/id_ID/link.lang
rename to public/langs/id_ID/link.lang
diff --git a/htdocs/langs/id_ID/loan.lang b/public/langs/id_ID/loan.lang
similarity index 100%
rename from htdocs/langs/id_ID/loan.lang
rename to public/langs/id_ID/loan.lang
diff --git a/htdocs/langs/id_ID/mailmanspip.lang b/public/langs/id_ID/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/id_ID/mailmanspip.lang
rename to public/langs/id_ID/mailmanspip.lang
diff --git a/htdocs/langs/id_ID/mails.lang b/public/langs/id_ID/mails.lang
similarity index 100%
rename from htdocs/langs/id_ID/mails.lang
rename to public/langs/id_ID/mails.lang
diff --git a/htdocs/langs/id_ID/main.lang b/public/langs/id_ID/main.lang
similarity index 100%
rename from htdocs/langs/id_ID/main.lang
rename to public/langs/id_ID/main.lang
diff --git a/htdocs/langs/id_ID/margins.lang b/public/langs/id_ID/margins.lang
similarity index 100%
rename from htdocs/langs/id_ID/margins.lang
rename to public/langs/id_ID/margins.lang
diff --git a/htdocs/langs/id_ID/members.lang b/public/langs/id_ID/members.lang
similarity index 100%
rename from htdocs/langs/id_ID/members.lang
rename to public/langs/id_ID/members.lang
diff --git a/htdocs/langs/id_ID/oauth.lang b/public/langs/id_ID/oauth.lang
similarity index 100%
rename from htdocs/langs/id_ID/oauth.lang
rename to public/langs/id_ID/oauth.lang
diff --git a/htdocs/langs/id_ID/opensurvey.lang b/public/langs/id_ID/opensurvey.lang
similarity index 100%
rename from htdocs/langs/id_ID/opensurvey.lang
rename to public/langs/id_ID/opensurvey.lang
diff --git a/htdocs/langs/id_ID/orders.lang b/public/langs/id_ID/orders.lang
similarity index 100%
rename from htdocs/langs/id_ID/orders.lang
rename to public/langs/id_ID/orders.lang
diff --git a/htdocs/langs/id_ID/other.lang b/public/langs/id_ID/other.lang
similarity index 100%
rename from htdocs/langs/id_ID/other.lang
rename to public/langs/id_ID/other.lang
diff --git a/htdocs/langs/id_ID/paybox.lang b/public/langs/id_ID/paybox.lang
similarity index 100%
rename from htdocs/langs/id_ID/paybox.lang
rename to public/langs/id_ID/paybox.lang
diff --git a/htdocs/langs/id_ID/paypal.lang b/public/langs/id_ID/paypal.lang
similarity index 100%
rename from htdocs/langs/id_ID/paypal.lang
rename to public/langs/id_ID/paypal.lang
diff --git a/htdocs/langs/id_ID/printing.lang b/public/langs/id_ID/printing.lang
similarity index 100%
rename from htdocs/langs/id_ID/printing.lang
rename to public/langs/id_ID/printing.lang
diff --git a/htdocs/langs/id_ID/productbatch.lang b/public/langs/id_ID/productbatch.lang
similarity index 100%
rename from htdocs/langs/id_ID/productbatch.lang
rename to public/langs/id_ID/productbatch.lang
diff --git a/htdocs/langs/id_ID/products.lang b/public/langs/id_ID/products.lang
similarity index 100%
rename from htdocs/langs/id_ID/products.lang
rename to public/langs/id_ID/products.lang
diff --git a/htdocs/langs/id_ID/projects.lang b/public/langs/id_ID/projects.lang
similarity index 100%
rename from htdocs/langs/id_ID/projects.lang
rename to public/langs/id_ID/projects.lang
diff --git a/htdocs/langs/id_ID/propal.lang b/public/langs/id_ID/propal.lang
similarity index 100%
rename from htdocs/langs/id_ID/propal.lang
rename to public/langs/id_ID/propal.lang
diff --git a/htdocs/langs/id_ID/receiptprinter.lang b/public/langs/id_ID/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/id_ID/receiptprinter.lang
rename to public/langs/id_ID/receiptprinter.lang
diff --git a/htdocs/langs/id_ID/resource.lang b/public/langs/id_ID/resource.lang
similarity index 100%
rename from htdocs/langs/id_ID/resource.lang
rename to public/langs/id_ID/resource.lang
diff --git a/htdocs/langs/id_ID/salaries.lang b/public/langs/id_ID/salaries.lang
similarity index 100%
rename from htdocs/langs/id_ID/salaries.lang
rename to public/langs/id_ID/salaries.lang
diff --git a/htdocs/langs/id_ID/sendings.lang b/public/langs/id_ID/sendings.lang
similarity index 100%
rename from htdocs/langs/id_ID/sendings.lang
rename to public/langs/id_ID/sendings.lang
diff --git a/htdocs/langs/id_ID/sms.lang b/public/langs/id_ID/sms.lang
similarity index 100%
rename from htdocs/langs/id_ID/sms.lang
rename to public/langs/id_ID/sms.lang
diff --git a/htdocs/langs/id_ID/stocks.lang b/public/langs/id_ID/stocks.lang
similarity index 100%
rename from htdocs/langs/id_ID/stocks.lang
rename to public/langs/id_ID/stocks.lang
diff --git a/htdocs/langs/id_ID/supplier_proposal.lang b/public/langs/id_ID/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/id_ID/supplier_proposal.lang
rename to public/langs/id_ID/supplier_proposal.lang
diff --git a/htdocs/langs/id_ID/suppliers.lang b/public/langs/id_ID/suppliers.lang
similarity index 100%
rename from htdocs/langs/id_ID/suppliers.lang
rename to public/langs/id_ID/suppliers.lang
diff --git a/htdocs/langs/id_ID/trips.lang b/public/langs/id_ID/trips.lang
similarity index 100%
rename from htdocs/langs/id_ID/trips.lang
rename to public/langs/id_ID/trips.lang
diff --git a/htdocs/langs/id_ID/users.lang b/public/langs/id_ID/users.lang
similarity index 100%
rename from htdocs/langs/id_ID/users.lang
rename to public/langs/id_ID/users.lang
diff --git a/htdocs/langs/id_ID/website.lang b/public/langs/id_ID/website.lang
similarity index 100%
rename from htdocs/langs/id_ID/website.lang
rename to public/langs/id_ID/website.lang
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/public/langs/id_ID/withdrawals.lang
similarity index 100%
rename from htdocs/langs/id_ID/withdrawals.lang
rename to public/langs/id_ID/withdrawals.lang
diff --git a/htdocs/langs/id_ID/workflow.lang b/public/langs/id_ID/workflow.lang
similarity index 100%
rename from htdocs/langs/id_ID/workflow.lang
rename to public/langs/id_ID/workflow.lang
diff --git a/htdocs/langs/is_IS/accountancy.lang b/public/langs/is_IS/accountancy.lang
similarity index 100%
rename from htdocs/langs/is_IS/accountancy.lang
rename to public/langs/is_IS/accountancy.lang
diff --git a/htdocs/langs/is_IS/admin.lang b/public/langs/is_IS/admin.lang
similarity index 100%
rename from htdocs/langs/is_IS/admin.lang
rename to public/langs/is_IS/admin.lang
diff --git a/htdocs/langs/is_IS/agenda.lang b/public/langs/is_IS/agenda.lang
similarity index 100%
rename from htdocs/langs/is_IS/agenda.lang
rename to public/langs/is_IS/agenda.lang
diff --git a/htdocs/langs/is_IS/banks.lang b/public/langs/is_IS/banks.lang
similarity index 100%
rename from htdocs/langs/is_IS/banks.lang
rename to public/langs/is_IS/banks.lang
diff --git a/htdocs/langs/is_IS/bills.lang b/public/langs/is_IS/bills.lang
similarity index 100%
rename from htdocs/langs/is_IS/bills.lang
rename to public/langs/is_IS/bills.lang
diff --git a/htdocs/langs/is_IS/bookmarks.lang b/public/langs/is_IS/bookmarks.lang
similarity index 100%
rename from htdocs/langs/is_IS/bookmarks.lang
rename to public/langs/is_IS/bookmarks.lang
diff --git a/htdocs/langs/is_IS/boxes.lang b/public/langs/is_IS/boxes.lang
similarity index 100%
rename from htdocs/langs/is_IS/boxes.lang
rename to public/langs/is_IS/boxes.lang
diff --git a/htdocs/langs/is_IS/cashdesk.lang b/public/langs/is_IS/cashdesk.lang
similarity index 100%
rename from htdocs/langs/is_IS/cashdesk.lang
rename to public/langs/is_IS/cashdesk.lang
diff --git a/htdocs/langs/is_IS/categories.lang b/public/langs/is_IS/categories.lang
similarity index 100%
rename from htdocs/langs/is_IS/categories.lang
rename to public/langs/is_IS/categories.lang
diff --git a/htdocs/langs/is_IS/commercial.lang b/public/langs/is_IS/commercial.lang
similarity index 100%
rename from htdocs/langs/is_IS/commercial.lang
rename to public/langs/is_IS/commercial.lang
diff --git a/htdocs/langs/is_IS/companies.lang b/public/langs/is_IS/companies.lang
similarity index 100%
rename from htdocs/langs/is_IS/companies.lang
rename to public/langs/is_IS/companies.lang
diff --git a/htdocs/langs/is_IS/compta.lang b/public/langs/is_IS/compta.lang
similarity index 100%
rename from htdocs/langs/is_IS/compta.lang
rename to public/langs/is_IS/compta.lang
diff --git a/htdocs/langs/is_IS/contracts.lang b/public/langs/is_IS/contracts.lang
similarity index 100%
rename from htdocs/langs/is_IS/contracts.lang
rename to public/langs/is_IS/contracts.lang
diff --git a/htdocs/langs/is_IS/cron.lang b/public/langs/is_IS/cron.lang
similarity index 100%
rename from htdocs/langs/is_IS/cron.lang
rename to public/langs/is_IS/cron.lang
diff --git a/htdocs/langs/is_IS/deliveries.lang b/public/langs/is_IS/deliveries.lang
similarity index 100%
rename from htdocs/langs/is_IS/deliveries.lang
rename to public/langs/is_IS/deliveries.lang
diff --git a/htdocs/langs/is_IS/dict.lang b/public/langs/is_IS/dict.lang
similarity index 100%
rename from htdocs/langs/is_IS/dict.lang
rename to public/langs/is_IS/dict.lang
diff --git a/htdocs/langs/is_IS/donations.lang b/public/langs/is_IS/donations.lang
similarity index 100%
rename from htdocs/langs/is_IS/donations.lang
rename to public/langs/is_IS/donations.lang
diff --git a/htdocs/langs/is_IS/ecm.lang b/public/langs/is_IS/ecm.lang
similarity index 100%
rename from htdocs/langs/is_IS/ecm.lang
rename to public/langs/is_IS/ecm.lang
diff --git a/htdocs/langs/is_IS/errors.lang b/public/langs/is_IS/errors.lang
similarity index 100%
rename from htdocs/langs/is_IS/errors.lang
rename to public/langs/is_IS/errors.lang
diff --git a/htdocs/langs/is_IS/exports.lang b/public/langs/is_IS/exports.lang
similarity index 100%
rename from htdocs/langs/is_IS/exports.lang
rename to public/langs/is_IS/exports.lang
diff --git a/htdocs/langs/is_IS/externalsite.lang b/public/langs/is_IS/externalsite.lang
similarity index 100%
rename from htdocs/langs/is_IS/externalsite.lang
rename to public/langs/is_IS/externalsite.lang
diff --git a/htdocs/langs/is_IS/ftp.lang b/public/langs/is_IS/ftp.lang
similarity index 100%
rename from htdocs/langs/is_IS/ftp.lang
rename to public/langs/is_IS/ftp.lang
diff --git a/htdocs/langs/is_IS/help.lang b/public/langs/is_IS/help.lang
similarity index 100%
rename from htdocs/langs/is_IS/help.lang
rename to public/langs/is_IS/help.lang
diff --git a/htdocs/langs/is_IS/holiday.lang b/public/langs/is_IS/holiday.lang
similarity index 100%
rename from htdocs/langs/is_IS/holiday.lang
rename to public/langs/is_IS/holiday.lang
diff --git a/htdocs/langs/is_IS/hrm.lang b/public/langs/is_IS/hrm.lang
similarity index 100%
rename from htdocs/langs/is_IS/hrm.lang
rename to public/langs/is_IS/hrm.lang
diff --git a/htdocs/langs/is_IS/incoterm.lang b/public/langs/is_IS/incoterm.lang
similarity index 100%
rename from htdocs/langs/is_IS/incoterm.lang
rename to public/langs/is_IS/incoterm.lang
diff --git a/htdocs/langs/is_IS/install.lang b/public/langs/is_IS/install.lang
similarity index 100%
rename from htdocs/langs/is_IS/install.lang
rename to public/langs/is_IS/install.lang
diff --git a/htdocs/langs/is_IS/interventions.lang b/public/langs/is_IS/interventions.lang
similarity index 100%
rename from htdocs/langs/is_IS/interventions.lang
rename to public/langs/is_IS/interventions.lang
diff --git a/htdocs/langs/is_IS/languages.lang b/public/langs/is_IS/languages.lang
similarity index 100%
rename from htdocs/langs/is_IS/languages.lang
rename to public/langs/is_IS/languages.lang
diff --git a/htdocs/langs/is_IS/ldap.lang b/public/langs/is_IS/ldap.lang
similarity index 100%
rename from htdocs/langs/is_IS/ldap.lang
rename to public/langs/is_IS/ldap.lang
diff --git a/htdocs/langs/is_IS/link.lang b/public/langs/is_IS/link.lang
similarity index 100%
rename from htdocs/langs/is_IS/link.lang
rename to public/langs/is_IS/link.lang
diff --git a/htdocs/langs/is_IS/loan.lang b/public/langs/is_IS/loan.lang
similarity index 100%
rename from htdocs/langs/is_IS/loan.lang
rename to public/langs/is_IS/loan.lang
diff --git a/htdocs/langs/is_IS/mailmanspip.lang b/public/langs/is_IS/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/is_IS/mailmanspip.lang
rename to public/langs/is_IS/mailmanspip.lang
diff --git a/htdocs/langs/is_IS/mails.lang b/public/langs/is_IS/mails.lang
similarity index 100%
rename from htdocs/langs/is_IS/mails.lang
rename to public/langs/is_IS/mails.lang
diff --git a/htdocs/langs/is_IS/main.lang b/public/langs/is_IS/main.lang
similarity index 100%
rename from htdocs/langs/is_IS/main.lang
rename to public/langs/is_IS/main.lang
diff --git a/htdocs/langs/is_IS/margins.lang b/public/langs/is_IS/margins.lang
similarity index 100%
rename from htdocs/langs/is_IS/margins.lang
rename to public/langs/is_IS/margins.lang
diff --git a/htdocs/langs/is_IS/members.lang b/public/langs/is_IS/members.lang
similarity index 100%
rename from htdocs/langs/is_IS/members.lang
rename to public/langs/is_IS/members.lang
diff --git a/htdocs/langs/is_IS/oauth.lang b/public/langs/is_IS/oauth.lang
similarity index 100%
rename from htdocs/langs/is_IS/oauth.lang
rename to public/langs/is_IS/oauth.lang
diff --git a/htdocs/langs/is_IS/opensurvey.lang b/public/langs/is_IS/opensurvey.lang
similarity index 100%
rename from htdocs/langs/is_IS/opensurvey.lang
rename to public/langs/is_IS/opensurvey.lang
diff --git a/htdocs/langs/is_IS/orders.lang b/public/langs/is_IS/orders.lang
similarity index 100%
rename from htdocs/langs/is_IS/orders.lang
rename to public/langs/is_IS/orders.lang
diff --git a/htdocs/langs/is_IS/other.lang b/public/langs/is_IS/other.lang
similarity index 100%
rename from htdocs/langs/is_IS/other.lang
rename to public/langs/is_IS/other.lang
diff --git a/htdocs/langs/is_IS/paybox.lang b/public/langs/is_IS/paybox.lang
similarity index 100%
rename from htdocs/langs/is_IS/paybox.lang
rename to public/langs/is_IS/paybox.lang
diff --git a/htdocs/langs/is_IS/paypal.lang b/public/langs/is_IS/paypal.lang
similarity index 100%
rename from htdocs/langs/is_IS/paypal.lang
rename to public/langs/is_IS/paypal.lang
diff --git a/htdocs/langs/is_IS/printing.lang b/public/langs/is_IS/printing.lang
similarity index 100%
rename from htdocs/langs/is_IS/printing.lang
rename to public/langs/is_IS/printing.lang
diff --git a/htdocs/langs/is_IS/productbatch.lang b/public/langs/is_IS/productbatch.lang
similarity index 100%
rename from htdocs/langs/is_IS/productbatch.lang
rename to public/langs/is_IS/productbatch.lang
diff --git a/htdocs/langs/is_IS/products.lang b/public/langs/is_IS/products.lang
similarity index 100%
rename from htdocs/langs/is_IS/products.lang
rename to public/langs/is_IS/products.lang
diff --git a/htdocs/langs/is_IS/projects.lang b/public/langs/is_IS/projects.lang
similarity index 100%
rename from htdocs/langs/is_IS/projects.lang
rename to public/langs/is_IS/projects.lang
diff --git a/htdocs/langs/is_IS/propal.lang b/public/langs/is_IS/propal.lang
similarity index 100%
rename from htdocs/langs/is_IS/propal.lang
rename to public/langs/is_IS/propal.lang
diff --git a/htdocs/langs/is_IS/receiptprinter.lang b/public/langs/is_IS/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/is_IS/receiptprinter.lang
rename to public/langs/is_IS/receiptprinter.lang
diff --git a/htdocs/langs/is_IS/resource.lang b/public/langs/is_IS/resource.lang
similarity index 100%
rename from htdocs/langs/is_IS/resource.lang
rename to public/langs/is_IS/resource.lang
diff --git a/htdocs/langs/is_IS/salaries.lang b/public/langs/is_IS/salaries.lang
similarity index 100%
rename from htdocs/langs/is_IS/salaries.lang
rename to public/langs/is_IS/salaries.lang
diff --git a/htdocs/langs/is_IS/sendings.lang b/public/langs/is_IS/sendings.lang
similarity index 100%
rename from htdocs/langs/is_IS/sendings.lang
rename to public/langs/is_IS/sendings.lang
diff --git a/htdocs/langs/is_IS/sms.lang b/public/langs/is_IS/sms.lang
similarity index 100%
rename from htdocs/langs/is_IS/sms.lang
rename to public/langs/is_IS/sms.lang
diff --git a/htdocs/langs/is_IS/stocks.lang b/public/langs/is_IS/stocks.lang
similarity index 100%
rename from htdocs/langs/is_IS/stocks.lang
rename to public/langs/is_IS/stocks.lang
diff --git a/htdocs/langs/is_IS/supplier_proposal.lang b/public/langs/is_IS/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/is_IS/supplier_proposal.lang
rename to public/langs/is_IS/supplier_proposal.lang
diff --git a/htdocs/langs/is_IS/suppliers.lang b/public/langs/is_IS/suppliers.lang
similarity index 100%
rename from htdocs/langs/is_IS/suppliers.lang
rename to public/langs/is_IS/suppliers.lang
diff --git a/htdocs/langs/is_IS/trips.lang b/public/langs/is_IS/trips.lang
similarity index 100%
rename from htdocs/langs/is_IS/trips.lang
rename to public/langs/is_IS/trips.lang
diff --git a/htdocs/langs/is_IS/users.lang b/public/langs/is_IS/users.lang
similarity index 100%
rename from htdocs/langs/is_IS/users.lang
rename to public/langs/is_IS/users.lang
diff --git a/htdocs/langs/is_IS/website.lang b/public/langs/is_IS/website.lang
similarity index 100%
rename from htdocs/langs/is_IS/website.lang
rename to public/langs/is_IS/website.lang
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/public/langs/is_IS/withdrawals.lang
similarity index 100%
rename from htdocs/langs/is_IS/withdrawals.lang
rename to public/langs/is_IS/withdrawals.lang
diff --git a/htdocs/langs/is_IS/workflow.lang b/public/langs/is_IS/workflow.lang
similarity index 100%
rename from htdocs/langs/is_IS/workflow.lang
rename to public/langs/is_IS/workflow.lang
diff --git a/htdocs/langs/it_IT/accountancy.lang b/public/langs/it_IT/accountancy.lang
similarity index 100%
rename from htdocs/langs/it_IT/accountancy.lang
rename to public/langs/it_IT/accountancy.lang
diff --git a/htdocs/langs/it_IT/admin.lang b/public/langs/it_IT/admin.lang
similarity index 100%
rename from htdocs/langs/it_IT/admin.lang
rename to public/langs/it_IT/admin.lang
diff --git a/htdocs/langs/it_IT/agenda.lang b/public/langs/it_IT/agenda.lang
similarity index 100%
rename from htdocs/langs/it_IT/agenda.lang
rename to public/langs/it_IT/agenda.lang
diff --git a/htdocs/langs/it_IT/banks.lang b/public/langs/it_IT/banks.lang
similarity index 100%
rename from htdocs/langs/it_IT/banks.lang
rename to public/langs/it_IT/banks.lang
diff --git a/htdocs/langs/it_IT/bills.lang b/public/langs/it_IT/bills.lang
similarity index 100%
rename from htdocs/langs/it_IT/bills.lang
rename to public/langs/it_IT/bills.lang
diff --git a/htdocs/langs/it_IT/bookmarks.lang b/public/langs/it_IT/bookmarks.lang
similarity index 100%
rename from htdocs/langs/it_IT/bookmarks.lang
rename to public/langs/it_IT/bookmarks.lang
diff --git a/htdocs/langs/it_IT/boxes.lang b/public/langs/it_IT/boxes.lang
similarity index 100%
rename from htdocs/langs/it_IT/boxes.lang
rename to public/langs/it_IT/boxes.lang
diff --git a/htdocs/langs/it_IT/cashdesk.lang b/public/langs/it_IT/cashdesk.lang
similarity index 100%
rename from htdocs/langs/it_IT/cashdesk.lang
rename to public/langs/it_IT/cashdesk.lang
diff --git a/htdocs/langs/it_IT/categories.lang b/public/langs/it_IT/categories.lang
similarity index 100%
rename from htdocs/langs/it_IT/categories.lang
rename to public/langs/it_IT/categories.lang
diff --git a/htdocs/langs/it_IT/commercial.lang b/public/langs/it_IT/commercial.lang
similarity index 100%
rename from htdocs/langs/it_IT/commercial.lang
rename to public/langs/it_IT/commercial.lang
diff --git a/htdocs/langs/it_IT/companies.lang b/public/langs/it_IT/companies.lang
similarity index 100%
rename from htdocs/langs/it_IT/companies.lang
rename to public/langs/it_IT/companies.lang
diff --git a/htdocs/langs/it_IT/compta.lang b/public/langs/it_IT/compta.lang
similarity index 100%
rename from htdocs/langs/it_IT/compta.lang
rename to public/langs/it_IT/compta.lang
diff --git a/htdocs/langs/it_IT/contracts.lang b/public/langs/it_IT/contracts.lang
similarity index 100%
rename from htdocs/langs/it_IT/contracts.lang
rename to public/langs/it_IT/contracts.lang
diff --git a/htdocs/langs/it_IT/cron.lang b/public/langs/it_IT/cron.lang
similarity index 100%
rename from htdocs/langs/it_IT/cron.lang
rename to public/langs/it_IT/cron.lang
diff --git a/htdocs/langs/it_IT/deliveries.lang b/public/langs/it_IT/deliveries.lang
similarity index 100%
rename from htdocs/langs/it_IT/deliveries.lang
rename to public/langs/it_IT/deliveries.lang
diff --git a/htdocs/langs/it_IT/dict.lang b/public/langs/it_IT/dict.lang
similarity index 100%
rename from htdocs/langs/it_IT/dict.lang
rename to public/langs/it_IT/dict.lang
diff --git a/htdocs/langs/it_IT/donations.lang b/public/langs/it_IT/donations.lang
similarity index 100%
rename from htdocs/langs/it_IT/donations.lang
rename to public/langs/it_IT/donations.lang
diff --git a/htdocs/langs/it_IT/ecm.lang b/public/langs/it_IT/ecm.lang
similarity index 100%
rename from htdocs/langs/it_IT/ecm.lang
rename to public/langs/it_IT/ecm.lang
diff --git a/htdocs/langs/it_IT/errors.lang b/public/langs/it_IT/errors.lang
similarity index 100%
rename from htdocs/langs/it_IT/errors.lang
rename to public/langs/it_IT/errors.lang
diff --git a/htdocs/langs/it_IT/exports.lang b/public/langs/it_IT/exports.lang
similarity index 100%
rename from htdocs/langs/it_IT/exports.lang
rename to public/langs/it_IT/exports.lang
diff --git a/htdocs/langs/it_IT/externalsite.lang b/public/langs/it_IT/externalsite.lang
similarity index 100%
rename from htdocs/langs/it_IT/externalsite.lang
rename to public/langs/it_IT/externalsite.lang
diff --git a/htdocs/langs/it_IT/ftp.lang b/public/langs/it_IT/ftp.lang
similarity index 100%
rename from htdocs/langs/it_IT/ftp.lang
rename to public/langs/it_IT/ftp.lang
diff --git a/htdocs/langs/it_IT/google.lang b/public/langs/it_IT/google.lang
similarity index 100%
rename from htdocs/langs/it_IT/google.lang
rename to public/langs/it_IT/google.lang
diff --git a/htdocs/langs/it_IT/help.lang b/public/langs/it_IT/help.lang
similarity index 100%
rename from htdocs/langs/it_IT/help.lang
rename to public/langs/it_IT/help.lang
diff --git a/htdocs/langs/it_IT/holiday.lang b/public/langs/it_IT/holiday.lang
similarity index 100%
rename from htdocs/langs/it_IT/holiday.lang
rename to public/langs/it_IT/holiday.lang
diff --git a/htdocs/langs/it_IT/hrm.lang b/public/langs/it_IT/hrm.lang
similarity index 100%
rename from htdocs/langs/it_IT/hrm.lang
rename to public/langs/it_IT/hrm.lang
diff --git a/htdocs/langs/it_IT/incoterm.lang b/public/langs/it_IT/incoterm.lang
similarity index 100%
rename from htdocs/langs/it_IT/incoterm.lang
rename to public/langs/it_IT/incoterm.lang
diff --git a/htdocs/langs/it_IT/install.lang b/public/langs/it_IT/install.lang
similarity index 100%
rename from htdocs/langs/it_IT/install.lang
rename to public/langs/it_IT/install.lang
diff --git a/htdocs/langs/it_IT/interventions.lang b/public/langs/it_IT/interventions.lang
similarity index 100%
rename from htdocs/langs/it_IT/interventions.lang
rename to public/langs/it_IT/interventions.lang
diff --git a/htdocs/langs/it_IT/languages.lang b/public/langs/it_IT/languages.lang
similarity index 100%
rename from htdocs/langs/it_IT/languages.lang
rename to public/langs/it_IT/languages.lang
diff --git a/htdocs/langs/it_IT/ldap.lang b/public/langs/it_IT/ldap.lang
similarity index 100%
rename from htdocs/langs/it_IT/ldap.lang
rename to public/langs/it_IT/ldap.lang
diff --git a/htdocs/langs/it_IT/link.lang b/public/langs/it_IT/link.lang
similarity index 100%
rename from htdocs/langs/it_IT/link.lang
rename to public/langs/it_IT/link.lang
diff --git a/htdocs/langs/it_IT/loan.lang b/public/langs/it_IT/loan.lang
similarity index 100%
rename from htdocs/langs/it_IT/loan.lang
rename to public/langs/it_IT/loan.lang
diff --git a/htdocs/langs/it_IT/mailmanspip.lang b/public/langs/it_IT/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/it_IT/mailmanspip.lang
rename to public/langs/it_IT/mailmanspip.lang
diff --git a/htdocs/langs/it_IT/mails.lang b/public/langs/it_IT/mails.lang
similarity index 100%
rename from htdocs/langs/it_IT/mails.lang
rename to public/langs/it_IT/mails.lang
diff --git a/htdocs/langs/it_IT/main.lang b/public/langs/it_IT/main.lang
similarity index 100%
rename from htdocs/langs/it_IT/main.lang
rename to public/langs/it_IT/main.lang
diff --git a/htdocs/langs/it_IT/margins.lang b/public/langs/it_IT/margins.lang
similarity index 100%
rename from htdocs/langs/it_IT/margins.lang
rename to public/langs/it_IT/margins.lang
diff --git a/htdocs/langs/it_IT/members.lang b/public/langs/it_IT/members.lang
similarity index 100%
rename from htdocs/langs/it_IT/members.lang
rename to public/langs/it_IT/members.lang
diff --git a/htdocs/langs/it_IT/oauth.lang b/public/langs/it_IT/oauth.lang
similarity index 100%
rename from htdocs/langs/it_IT/oauth.lang
rename to public/langs/it_IT/oauth.lang
diff --git a/htdocs/langs/it_IT/opensurvey.lang b/public/langs/it_IT/opensurvey.lang
similarity index 100%
rename from htdocs/langs/it_IT/opensurvey.lang
rename to public/langs/it_IT/opensurvey.lang
diff --git a/htdocs/langs/it_IT/orders.lang b/public/langs/it_IT/orders.lang
similarity index 100%
rename from htdocs/langs/it_IT/orders.lang
rename to public/langs/it_IT/orders.lang
diff --git a/htdocs/langs/it_IT/other.lang b/public/langs/it_IT/other.lang
similarity index 100%
rename from htdocs/langs/it_IT/other.lang
rename to public/langs/it_IT/other.lang
diff --git a/htdocs/langs/it_IT/paybox.lang b/public/langs/it_IT/paybox.lang
similarity index 100%
rename from htdocs/langs/it_IT/paybox.lang
rename to public/langs/it_IT/paybox.lang
diff --git a/htdocs/langs/it_IT/paypal.lang b/public/langs/it_IT/paypal.lang
similarity index 100%
rename from htdocs/langs/it_IT/paypal.lang
rename to public/langs/it_IT/paypal.lang
diff --git a/htdocs/langs/it_IT/printing.lang b/public/langs/it_IT/printing.lang
similarity index 100%
rename from htdocs/langs/it_IT/printing.lang
rename to public/langs/it_IT/printing.lang
diff --git a/htdocs/langs/it_IT/productbatch.lang b/public/langs/it_IT/productbatch.lang
similarity index 100%
rename from htdocs/langs/it_IT/productbatch.lang
rename to public/langs/it_IT/productbatch.lang
diff --git a/htdocs/langs/it_IT/products.lang b/public/langs/it_IT/products.lang
similarity index 100%
rename from htdocs/langs/it_IT/products.lang
rename to public/langs/it_IT/products.lang
diff --git a/htdocs/langs/it_IT/projects.lang b/public/langs/it_IT/projects.lang
similarity index 100%
rename from htdocs/langs/it_IT/projects.lang
rename to public/langs/it_IT/projects.lang
diff --git a/htdocs/langs/it_IT/propal.lang b/public/langs/it_IT/propal.lang
similarity index 100%
rename from htdocs/langs/it_IT/propal.lang
rename to public/langs/it_IT/propal.lang
diff --git a/htdocs/langs/it_IT/receiptprinter.lang b/public/langs/it_IT/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/it_IT/receiptprinter.lang
rename to public/langs/it_IT/receiptprinter.lang
diff --git a/htdocs/langs/it_IT/resource.lang b/public/langs/it_IT/resource.lang
similarity index 100%
rename from htdocs/langs/it_IT/resource.lang
rename to public/langs/it_IT/resource.lang
diff --git a/htdocs/langs/it_IT/salaries.lang b/public/langs/it_IT/salaries.lang
similarity index 100%
rename from htdocs/langs/it_IT/salaries.lang
rename to public/langs/it_IT/salaries.lang
diff --git a/htdocs/langs/it_IT/sendings.lang b/public/langs/it_IT/sendings.lang
similarity index 100%
rename from htdocs/langs/it_IT/sendings.lang
rename to public/langs/it_IT/sendings.lang
diff --git a/htdocs/langs/it_IT/sms.lang b/public/langs/it_IT/sms.lang
similarity index 100%
rename from htdocs/langs/it_IT/sms.lang
rename to public/langs/it_IT/sms.lang
diff --git a/htdocs/langs/it_IT/stocks.lang b/public/langs/it_IT/stocks.lang
similarity index 100%
rename from htdocs/langs/it_IT/stocks.lang
rename to public/langs/it_IT/stocks.lang
diff --git a/htdocs/langs/it_IT/supplier_proposal.lang b/public/langs/it_IT/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/it_IT/supplier_proposal.lang
rename to public/langs/it_IT/supplier_proposal.lang
diff --git a/htdocs/langs/it_IT/suppliers.lang b/public/langs/it_IT/suppliers.lang
similarity index 100%
rename from htdocs/langs/it_IT/suppliers.lang
rename to public/langs/it_IT/suppliers.lang
diff --git a/htdocs/langs/it_IT/trips.lang b/public/langs/it_IT/trips.lang
similarity index 100%
rename from htdocs/langs/it_IT/trips.lang
rename to public/langs/it_IT/trips.lang
diff --git a/htdocs/langs/it_IT/users.lang b/public/langs/it_IT/users.lang
similarity index 100%
rename from htdocs/langs/it_IT/users.lang
rename to public/langs/it_IT/users.lang
diff --git a/htdocs/langs/it_IT/website.lang b/public/langs/it_IT/website.lang
similarity index 100%
rename from htdocs/langs/it_IT/website.lang
rename to public/langs/it_IT/website.lang
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/public/langs/it_IT/withdrawals.lang
similarity index 100%
rename from htdocs/langs/it_IT/withdrawals.lang
rename to public/langs/it_IT/withdrawals.lang
diff --git a/htdocs/langs/it_IT/workflow.lang b/public/langs/it_IT/workflow.lang
similarity index 100%
rename from htdocs/langs/it_IT/workflow.lang
rename to public/langs/it_IT/workflow.lang
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/public/langs/ja_JP/accountancy.lang
similarity index 100%
rename from htdocs/langs/ja_JP/accountancy.lang
rename to public/langs/ja_JP/accountancy.lang
diff --git a/htdocs/langs/ja_JP/admin.lang b/public/langs/ja_JP/admin.lang
similarity index 100%
rename from htdocs/langs/ja_JP/admin.lang
rename to public/langs/ja_JP/admin.lang
diff --git a/htdocs/langs/ja_JP/agenda.lang b/public/langs/ja_JP/agenda.lang
similarity index 100%
rename from htdocs/langs/ja_JP/agenda.lang
rename to public/langs/ja_JP/agenda.lang
diff --git a/htdocs/langs/ja_JP/banks.lang b/public/langs/ja_JP/banks.lang
similarity index 100%
rename from htdocs/langs/ja_JP/banks.lang
rename to public/langs/ja_JP/banks.lang
diff --git a/htdocs/langs/ja_JP/bills.lang b/public/langs/ja_JP/bills.lang
similarity index 100%
rename from htdocs/langs/ja_JP/bills.lang
rename to public/langs/ja_JP/bills.lang
diff --git a/htdocs/langs/ja_JP/bookmarks.lang b/public/langs/ja_JP/bookmarks.lang
similarity index 100%
rename from htdocs/langs/ja_JP/bookmarks.lang
rename to public/langs/ja_JP/bookmarks.lang
diff --git a/htdocs/langs/ja_JP/boxes.lang b/public/langs/ja_JP/boxes.lang
similarity index 100%
rename from htdocs/langs/ja_JP/boxes.lang
rename to public/langs/ja_JP/boxes.lang
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/public/langs/ja_JP/cashdesk.lang
similarity index 100%
rename from htdocs/langs/ja_JP/cashdesk.lang
rename to public/langs/ja_JP/cashdesk.lang
diff --git a/htdocs/langs/ja_JP/categories.lang b/public/langs/ja_JP/categories.lang
similarity index 100%
rename from htdocs/langs/ja_JP/categories.lang
rename to public/langs/ja_JP/categories.lang
diff --git a/htdocs/langs/ja_JP/commercial.lang b/public/langs/ja_JP/commercial.lang
similarity index 100%
rename from htdocs/langs/ja_JP/commercial.lang
rename to public/langs/ja_JP/commercial.lang
diff --git a/htdocs/langs/ja_JP/companies.lang b/public/langs/ja_JP/companies.lang
similarity index 100%
rename from htdocs/langs/ja_JP/companies.lang
rename to public/langs/ja_JP/companies.lang
diff --git a/htdocs/langs/ja_JP/compta.lang b/public/langs/ja_JP/compta.lang
similarity index 100%
rename from htdocs/langs/ja_JP/compta.lang
rename to public/langs/ja_JP/compta.lang
diff --git a/htdocs/langs/ja_JP/contracts.lang b/public/langs/ja_JP/contracts.lang
similarity index 100%
rename from htdocs/langs/ja_JP/contracts.lang
rename to public/langs/ja_JP/contracts.lang
diff --git a/htdocs/langs/ja_JP/cron.lang b/public/langs/ja_JP/cron.lang
similarity index 100%
rename from htdocs/langs/ja_JP/cron.lang
rename to public/langs/ja_JP/cron.lang
diff --git a/htdocs/langs/ja_JP/deliveries.lang b/public/langs/ja_JP/deliveries.lang
similarity index 100%
rename from htdocs/langs/ja_JP/deliveries.lang
rename to public/langs/ja_JP/deliveries.lang
diff --git a/htdocs/langs/ja_JP/dict.lang b/public/langs/ja_JP/dict.lang
similarity index 100%
rename from htdocs/langs/ja_JP/dict.lang
rename to public/langs/ja_JP/dict.lang
diff --git a/htdocs/langs/ja_JP/donations.lang b/public/langs/ja_JP/donations.lang
similarity index 100%
rename from htdocs/langs/ja_JP/donations.lang
rename to public/langs/ja_JP/donations.lang
diff --git a/htdocs/langs/ja_JP/ecm.lang b/public/langs/ja_JP/ecm.lang
similarity index 100%
rename from htdocs/langs/ja_JP/ecm.lang
rename to public/langs/ja_JP/ecm.lang
diff --git a/htdocs/langs/ja_JP/errors.lang b/public/langs/ja_JP/errors.lang
similarity index 100%
rename from htdocs/langs/ja_JP/errors.lang
rename to public/langs/ja_JP/errors.lang
diff --git a/htdocs/langs/ja_JP/exports.lang b/public/langs/ja_JP/exports.lang
similarity index 100%
rename from htdocs/langs/ja_JP/exports.lang
rename to public/langs/ja_JP/exports.lang
diff --git a/htdocs/langs/ja_JP/externalsite.lang b/public/langs/ja_JP/externalsite.lang
similarity index 100%
rename from htdocs/langs/ja_JP/externalsite.lang
rename to public/langs/ja_JP/externalsite.lang
diff --git a/htdocs/langs/ja_JP/ftp.lang b/public/langs/ja_JP/ftp.lang
similarity index 100%
rename from htdocs/langs/ja_JP/ftp.lang
rename to public/langs/ja_JP/ftp.lang
diff --git a/htdocs/langs/ja_JP/help.lang b/public/langs/ja_JP/help.lang
similarity index 100%
rename from htdocs/langs/ja_JP/help.lang
rename to public/langs/ja_JP/help.lang
diff --git a/htdocs/langs/ja_JP/holiday.lang b/public/langs/ja_JP/holiday.lang
similarity index 100%
rename from htdocs/langs/ja_JP/holiday.lang
rename to public/langs/ja_JP/holiday.lang
diff --git a/htdocs/langs/ja_JP/hrm.lang b/public/langs/ja_JP/hrm.lang
similarity index 100%
rename from htdocs/langs/ja_JP/hrm.lang
rename to public/langs/ja_JP/hrm.lang
diff --git a/htdocs/langs/ja_JP/incoterm.lang b/public/langs/ja_JP/incoterm.lang
similarity index 100%
rename from htdocs/langs/ja_JP/incoterm.lang
rename to public/langs/ja_JP/incoterm.lang
diff --git a/htdocs/langs/ja_JP/install.lang b/public/langs/ja_JP/install.lang
similarity index 100%
rename from htdocs/langs/ja_JP/install.lang
rename to public/langs/ja_JP/install.lang
diff --git a/htdocs/langs/ja_JP/interventions.lang b/public/langs/ja_JP/interventions.lang
similarity index 100%
rename from htdocs/langs/ja_JP/interventions.lang
rename to public/langs/ja_JP/interventions.lang
diff --git a/htdocs/langs/ja_JP/languages.lang b/public/langs/ja_JP/languages.lang
similarity index 100%
rename from htdocs/langs/ja_JP/languages.lang
rename to public/langs/ja_JP/languages.lang
diff --git a/htdocs/langs/ja_JP/ldap.lang b/public/langs/ja_JP/ldap.lang
similarity index 100%
rename from htdocs/langs/ja_JP/ldap.lang
rename to public/langs/ja_JP/ldap.lang
diff --git a/htdocs/langs/ja_JP/link.lang b/public/langs/ja_JP/link.lang
similarity index 100%
rename from htdocs/langs/ja_JP/link.lang
rename to public/langs/ja_JP/link.lang
diff --git a/htdocs/langs/ja_JP/loan.lang b/public/langs/ja_JP/loan.lang
similarity index 100%
rename from htdocs/langs/ja_JP/loan.lang
rename to public/langs/ja_JP/loan.lang
diff --git a/htdocs/langs/ja_JP/mailmanspip.lang b/public/langs/ja_JP/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/ja_JP/mailmanspip.lang
rename to public/langs/ja_JP/mailmanspip.lang
diff --git a/htdocs/langs/ja_JP/mails.lang b/public/langs/ja_JP/mails.lang
similarity index 100%
rename from htdocs/langs/ja_JP/mails.lang
rename to public/langs/ja_JP/mails.lang
diff --git a/htdocs/langs/ja_JP/main.lang b/public/langs/ja_JP/main.lang
similarity index 100%
rename from htdocs/langs/ja_JP/main.lang
rename to public/langs/ja_JP/main.lang
diff --git a/htdocs/langs/ja_JP/margins.lang b/public/langs/ja_JP/margins.lang
similarity index 100%
rename from htdocs/langs/ja_JP/margins.lang
rename to public/langs/ja_JP/margins.lang
diff --git a/htdocs/langs/ja_JP/members.lang b/public/langs/ja_JP/members.lang
similarity index 100%
rename from htdocs/langs/ja_JP/members.lang
rename to public/langs/ja_JP/members.lang
diff --git a/htdocs/langs/ja_JP/oauth.lang b/public/langs/ja_JP/oauth.lang
similarity index 100%
rename from htdocs/langs/ja_JP/oauth.lang
rename to public/langs/ja_JP/oauth.lang
diff --git a/htdocs/langs/ja_JP/opensurvey.lang b/public/langs/ja_JP/opensurvey.lang
similarity index 100%
rename from htdocs/langs/ja_JP/opensurvey.lang
rename to public/langs/ja_JP/opensurvey.lang
diff --git a/htdocs/langs/ja_JP/orders.lang b/public/langs/ja_JP/orders.lang
similarity index 100%
rename from htdocs/langs/ja_JP/orders.lang
rename to public/langs/ja_JP/orders.lang
diff --git a/htdocs/langs/ja_JP/other.lang b/public/langs/ja_JP/other.lang
similarity index 100%
rename from htdocs/langs/ja_JP/other.lang
rename to public/langs/ja_JP/other.lang
diff --git a/htdocs/langs/ja_JP/paybox.lang b/public/langs/ja_JP/paybox.lang
similarity index 100%
rename from htdocs/langs/ja_JP/paybox.lang
rename to public/langs/ja_JP/paybox.lang
diff --git a/htdocs/langs/ja_JP/paypal.lang b/public/langs/ja_JP/paypal.lang
similarity index 100%
rename from htdocs/langs/ja_JP/paypal.lang
rename to public/langs/ja_JP/paypal.lang
diff --git a/htdocs/langs/ja_JP/printing.lang b/public/langs/ja_JP/printing.lang
similarity index 100%
rename from htdocs/langs/ja_JP/printing.lang
rename to public/langs/ja_JP/printing.lang
diff --git a/htdocs/langs/ja_JP/productbatch.lang b/public/langs/ja_JP/productbatch.lang
similarity index 100%
rename from htdocs/langs/ja_JP/productbatch.lang
rename to public/langs/ja_JP/productbatch.lang
diff --git a/htdocs/langs/ja_JP/products.lang b/public/langs/ja_JP/products.lang
similarity index 100%
rename from htdocs/langs/ja_JP/products.lang
rename to public/langs/ja_JP/products.lang
diff --git a/htdocs/langs/ja_JP/projects.lang b/public/langs/ja_JP/projects.lang
similarity index 100%
rename from htdocs/langs/ja_JP/projects.lang
rename to public/langs/ja_JP/projects.lang
diff --git a/htdocs/langs/ja_JP/propal.lang b/public/langs/ja_JP/propal.lang
similarity index 100%
rename from htdocs/langs/ja_JP/propal.lang
rename to public/langs/ja_JP/propal.lang
diff --git a/htdocs/langs/ja_JP/receiptprinter.lang b/public/langs/ja_JP/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/ja_JP/receiptprinter.lang
rename to public/langs/ja_JP/receiptprinter.lang
diff --git a/htdocs/langs/ja_JP/resource.lang b/public/langs/ja_JP/resource.lang
similarity index 100%
rename from htdocs/langs/ja_JP/resource.lang
rename to public/langs/ja_JP/resource.lang
diff --git a/htdocs/langs/ja_JP/salaries.lang b/public/langs/ja_JP/salaries.lang
similarity index 100%
rename from htdocs/langs/ja_JP/salaries.lang
rename to public/langs/ja_JP/salaries.lang
diff --git a/htdocs/langs/ja_JP/sendings.lang b/public/langs/ja_JP/sendings.lang
similarity index 100%
rename from htdocs/langs/ja_JP/sendings.lang
rename to public/langs/ja_JP/sendings.lang
diff --git a/htdocs/langs/ja_JP/sms.lang b/public/langs/ja_JP/sms.lang
similarity index 100%
rename from htdocs/langs/ja_JP/sms.lang
rename to public/langs/ja_JP/sms.lang
diff --git a/htdocs/langs/ja_JP/stocks.lang b/public/langs/ja_JP/stocks.lang
similarity index 100%
rename from htdocs/langs/ja_JP/stocks.lang
rename to public/langs/ja_JP/stocks.lang
diff --git a/htdocs/langs/ja_JP/supplier_proposal.lang b/public/langs/ja_JP/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/ja_JP/supplier_proposal.lang
rename to public/langs/ja_JP/supplier_proposal.lang
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/public/langs/ja_JP/suppliers.lang
similarity index 100%
rename from htdocs/langs/ja_JP/suppliers.lang
rename to public/langs/ja_JP/suppliers.lang
diff --git a/htdocs/langs/ja_JP/trips.lang b/public/langs/ja_JP/trips.lang
similarity index 100%
rename from htdocs/langs/ja_JP/trips.lang
rename to public/langs/ja_JP/trips.lang
diff --git a/htdocs/langs/ja_JP/users.lang b/public/langs/ja_JP/users.lang
similarity index 100%
rename from htdocs/langs/ja_JP/users.lang
rename to public/langs/ja_JP/users.lang
diff --git a/htdocs/langs/ja_JP/website.lang b/public/langs/ja_JP/website.lang
similarity index 100%
rename from htdocs/langs/ja_JP/website.lang
rename to public/langs/ja_JP/website.lang
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/public/langs/ja_JP/withdrawals.lang
similarity index 100%
rename from htdocs/langs/ja_JP/withdrawals.lang
rename to public/langs/ja_JP/withdrawals.lang
diff --git a/htdocs/langs/ja_JP/workflow.lang b/public/langs/ja_JP/workflow.lang
similarity index 100%
rename from htdocs/langs/ja_JP/workflow.lang
rename to public/langs/ja_JP/workflow.lang
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/public/langs/ka_GE/accountancy.lang
similarity index 100%
rename from htdocs/langs/ka_GE/accountancy.lang
rename to public/langs/ka_GE/accountancy.lang
diff --git a/htdocs/langs/ka_GE/admin.lang b/public/langs/ka_GE/admin.lang
similarity index 100%
rename from htdocs/langs/ka_GE/admin.lang
rename to public/langs/ka_GE/admin.lang
diff --git a/htdocs/langs/ka_GE/agenda.lang b/public/langs/ka_GE/agenda.lang
similarity index 100%
rename from htdocs/langs/ka_GE/agenda.lang
rename to public/langs/ka_GE/agenda.lang
diff --git a/htdocs/langs/ka_GE/banks.lang b/public/langs/ka_GE/banks.lang
similarity index 100%
rename from htdocs/langs/ka_GE/banks.lang
rename to public/langs/ka_GE/banks.lang
diff --git a/htdocs/langs/ka_GE/bills.lang b/public/langs/ka_GE/bills.lang
similarity index 100%
rename from htdocs/langs/ka_GE/bills.lang
rename to public/langs/ka_GE/bills.lang
diff --git a/htdocs/langs/ka_GE/bookmarks.lang b/public/langs/ka_GE/bookmarks.lang
similarity index 100%
rename from htdocs/langs/ka_GE/bookmarks.lang
rename to public/langs/ka_GE/bookmarks.lang
diff --git a/htdocs/langs/ka_GE/boxes.lang b/public/langs/ka_GE/boxes.lang
similarity index 100%
rename from htdocs/langs/ka_GE/boxes.lang
rename to public/langs/ka_GE/boxes.lang
diff --git a/htdocs/langs/ka_GE/cashdesk.lang b/public/langs/ka_GE/cashdesk.lang
similarity index 100%
rename from htdocs/langs/ka_GE/cashdesk.lang
rename to public/langs/ka_GE/cashdesk.lang
diff --git a/htdocs/langs/ka_GE/categories.lang b/public/langs/ka_GE/categories.lang
similarity index 100%
rename from htdocs/langs/ka_GE/categories.lang
rename to public/langs/ka_GE/categories.lang
diff --git a/htdocs/langs/ka_GE/commercial.lang b/public/langs/ka_GE/commercial.lang
similarity index 100%
rename from htdocs/langs/ka_GE/commercial.lang
rename to public/langs/ka_GE/commercial.lang
diff --git a/htdocs/langs/ka_GE/companies.lang b/public/langs/ka_GE/companies.lang
similarity index 100%
rename from htdocs/langs/ka_GE/companies.lang
rename to public/langs/ka_GE/companies.lang
diff --git a/htdocs/langs/ka_GE/compta.lang b/public/langs/ka_GE/compta.lang
similarity index 100%
rename from htdocs/langs/ka_GE/compta.lang
rename to public/langs/ka_GE/compta.lang
diff --git a/htdocs/langs/ka_GE/contracts.lang b/public/langs/ka_GE/contracts.lang
similarity index 100%
rename from htdocs/langs/ka_GE/contracts.lang
rename to public/langs/ka_GE/contracts.lang
diff --git a/htdocs/langs/ka_GE/cron.lang b/public/langs/ka_GE/cron.lang
similarity index 100%
rename from htdocs/langs/ka_GE/cron.lang
rename to public/langs/ka_GE/cron.lang
diff --git a/htdocs/langs/ka_GE/deliveries.lang b/public/langs/ka_GE/deliveries.lang
similarity index 100%
rename from htdocs/langs/ka_GE/deliveries.lang
rename to public/langs/ka_GE/deliveries.lang
diff --git a/htdocs/langs/ka_GE/dict.lang b/public/langs/ka_GE/dict.lang
similarity index 100%
rename from htdocs/langs/ka_GE/dict.lang
rename to public/langs/ka_GE/dict.lang
diff --git a/htdocs/langs/ka_GE/donations.lang b/public/langs/ka_GE/donations.lang
similarity index 100%
rename from htdocs/langs/ka_GE/donations.lang
rename to public/langs/ka_GE/donations.lang
diff --git a/htdocs/langs/ka_GE/ecm.lang b/public/langs/ka_GE/ecm.lang
similarity index 100%
rename from htdocs/langs/ka_GE/ecm.lang
rename to public/langs/ka_GE/ecm.lang
diff --git a/htdocs/langs/ka_GE/errors.lang b/public/langs/ka_GE/errors.lang
similarity index 100%
rename from htdocs/langs/ka_GE/errors.lang
rename to public/langs/ka_GE/errors.lang
diff --git a/htdocs/langs/ka_GE/exports.lang b/public/langs/ka_GE/exports.lang
similarity index 100%
rename from htdocs/langs/ka_GE/exports.lang
rename to public/langs/ka_GE/exports.lang
diff --git a/htdocs/langs/ka_GE/externalsite.lang b/public/langs/ka_GE/externalsite.lang
similarity index 100%
rename from htdocs/langs/ka_GE/externalsite.lang
rename to public/langs/ka_GE/externalsite.lang
diff --git a/htdocs/langs/ka_GE/ftp.lang b/public/langs/ka_GE/ftp.lang
similarity index 100%
rename from htdocs/langs/ka_GE/ftp.lang
rename to public/langs/ka_GE/ftp.lang
diff --git a/htdocs/langs/ka_GE/help.lang b/public/langs/ka_GE/help.lang
similarity index 100%
rename from htdocs/langs/ka_GE/help.lang
rename to public/langs/ka_GE/help.lang
diff --git a/htdocs/langs/ka_GE/holiday.lang b/public/langs/ka_GE/holiday.lang
similarity index 100%
rename from htdocs/langs/ka_GE/holiday.lang
rename to public/langs/ka_GE/holiday.lang
diff --git a/htdocs/langs/ka_GE/hrm.lang b/public/langs/ka_GE/hrm.lang
similarity index 100%
rename from htdocs/langs/ka_GE/hrm.lang
rename to public/langs/ka_GE/hrm.lang
diff --git a/htdocs/langs/ka_GE/incoterm.lang b/public/langs/ka_GE/incoterm.lang
similarity index 100%
rename from htdocs/langs/ka_GE/incoterm.lang
rename to public/langs/ka_GE/incoterm.lang
diff --git a/htdocs/langs/ka_GE/install.lang b/public/langs/ka_GE/install.lang
similarity index 100%
rename from htdocs/langs/ka_GE/install.lang
rename to public/langs/ka_GE/install.lang
diff --git a/htdocs/langs/ka_GE/interventions.lang b/public/langs/ka_GE/interventions.lang
similarity index 100%
rename from htdocs/langs/ka_GE/interventions.lang
rename to public/langs/ka_GE/interventions.lang
diff --git a/htdocs/langs/ka_GE/languages.lang b/public/langs/ka_GE/languages.lang
similarity index 100%
rename from htdocs/langs/ka_GE/languages.lang
rename to public/langs/ka_GE/languages.lang
diff --git a/htdocs/langs/ka_GE/ldap.lang b/public/langs/ka_GE/ldap.lang
similarity index 100%
rename from htdocs/langs/ka_GE/ldap.lang
rename to public/langs/ka_GE/ldap.lang
diff --git a/htdocs/langs/ka_GE/link.lang b/public/langs/ka_GE/link.lang
similarity index 100%
rename from htdocs/langs/ka_GE/link.lang
rename to public/langs/ka_GE/link.lang
diff --git a/htdocs/langs/ka_GE/loan.lang b/public/langs/ka_GE/loan.lang
similarity index 100%
rename from htdocs/langs/ka_GE/loan.lang
rename to public/langs/ka_GE/loan.lang
diff --git a/htdocs/langs/ka_GE/mailmanspip.lang b/public/langs/ka_GE/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/ka_GE/mailmanspip.lang
rename to public/langs/ka_GE/mailmanspip.lang
diff --git a/htdocs/langs/ka_GE/mails.lang b/public/langs/ka_GE/mails.lang
similarity index 100%
rename from htdocs/langs/ka_GE/mails.lang
rename to public/langs/ka_GE/mails.lang
diff --git a/htdocs/langs/ka_GE/main.lang b/public/langs/ka_GE/main.lang
similarity index 100%
rename from htdocs/langs/ka_GE/main.lang
rename to public/langs/ka_GE/main.lang
diff --git a/htdocs/langs/ka_GE/margins.lang b/public/langs/ka_GE/margins.lang
similarity index 100%
rename from htdocs/langs/ka_GE/margins.lang
rename to public/langs/ka_GE/margins.lang
diff --git a/htdocs/langs/ka_GE/members.lang b/public/langs/ka_GE/members.lang
similarity index 100%
rename from htdocs/langs/ka_GE/members.lang
rename to public/langs/ka_GE/members.lang
diff --git a/htdocs/langs/ka_GE/oauth.lang b/public/langs/ka_GE/oauth.lang
similarity index 100%
rename from htdocs/langs/ka_GE/oauth.lang
rename to public/langs/ka_GE/oauth.lang
diff --git a/htdocs/langs/ka_GE/opensurvey.lang b/public/langs/ka_GE/opensurvey.lang
similarity index 100%
rename from htdocs/langs/ka_GE/opensurvey.lang
rename to public/langs/ka_GE/opensurvey.lang
diff --git a/htdocs/langs/ka_GE/orders.lang b/public/langs/ka_GE/orders.lang
similarity index 100%
rename from htdocs/langs/ka_GE/orders.lang
rename to public/langs/ka_GE/orders.lang
diff --git a/htdocs/langs/ka_GE/other.lang b/public/langs/ka_GE/other.lang
similarity index 100%
rename from htdocs/langs/ka_GE/other.lang
rename to public/langs/ka_GE/other.lang
diff --git a/htdocs/langs/ka_GE/paybox.lang b/public/langs/ka_GE/paybox.lang
similarity index 100%
rename from htdocs/langs/ka_GE/paybox.lang
rename to public/langs/ka_GE/paybox.lang
diff --git a/htdocs/langs/ka_GE/paypal.lang b/public/langs/ka_GE/paypal.lang
similarity index 100%
rename from htdocs/langs/ka_GE/paypal.lang
rename to public/langs/ka_GE/paypal.lang
diff --git a/htdocs/langs/ka_GE/printing.lang b/public/langs/ka_GE/printing.lang
similarity index 100%
rename from htdocs/langs/ka_GE/printing.lang
rename to public/langs/ka_GE/printing.lang
diff --git a/htdocs/langs/ka_GE/productbatch.lang b/public/langs/ka_GE/productbatch.lang
similarity index 100%
rename from htdocs/langs/ka_GE/productbatch.lang
rename to public/langs/ka_GE/productbatch.lang
diff --git a/htdocs/langs/ka_GE/products.lang b/public/langs/ka_GE/products.lang
similarity index 100%
rename from htdocs/langs/ka_GE/products.lang
rename to public/langs/ka_GE/products.lang
diff --git a/htdocs/langs/ka_GE/projects.lang b/public/langs/ka_GE/projects.lang
similarity index 100%
rename from htdocs/langs/ka_GE/projects.lang
rename to public/langs/ka_GE/projects.lang
diff --git a/htdocs/langs/ka_GE/propal.lang b/public/langs/ka_GE/propal.lang
similarity index 100%
rename from htdocs/langs/ka_GE/propal.lang
rename to public/langs/ka_GE/propal.lang
diff --git a/htdocs/langs/ka_GE/receiptprinter.lang b/public/langs/ka_GE/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/ka_GE/receiptprinter.lang
rename to public/langs/ka_GE/receiptprinter.lang
diff --git a/htdocs/langs/ka_GE/resource.lang b/public/langs/ka_GE/resource.lang
similarity index 100%
rename from htdocs/langs/ka_GE/resource.lang
rename to public/langs/ka_GE/resource.lang
diff --git a/htdocs/langs/ka_GE/salaries.lang b/public/langs/ka_GE/salaries.lang
similarity index 100%
rename from htdocs/langs/ka_GE/salaries.lang
rename to public/langs/ka_GE/salaries.lang
diff --git a/htdocs/langs/ka_GE/sendings.lang b/public/langs/ka_GE/sendings.lang
similarity index 100%
rename from htdocs/langs/ka_GE/sendings.lang
rename to public/langs/ka_GE/sendings.lang
diff --git a/htdocs/langs/ka_GE/sms.lang b/public/langs/ka_GE/sms.lang
similarity index 100%
rename from htdocs/langs/ka_GE/sms.lang
rename to public/langs/ka_GE/sms.lang
diff --git a/htdocs/langs/ka_GE/stocks.lang b/public/langs/ka_GE/stocks.lang
similarity index 100%
rename from htdocs/langs/ka_GE/stocks.lang
rename to public/langs/ka_GE/stocks.lang
diff --git a/htdocs/langs/ka_GE/supplier_proposal.lang b/public/langs/ka_GE/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/ka_GE/supplier_proposal.lang
rename to public/langs/ka_GE/supplier_proposal.lang
diff --git a/htdocs/langs/ka_GE/suppliers.lang b/public/langs/ka_GE/suppliers.lang
similarity index 100%
rename from htdocs/langs/ka_GE/suppliers.lang
rename to public/langs/ka_GE/suppliers.lang
diff --git a/htdocs/langs/ka_GE/trips.lang b/public/langs/ka_GE/trips.lang
similarity index 100%
rename from htdocs/langs/ka_GE/trips.lang
rename to public/langs/ka_GE/trips.lang
diff --git a/htdocs/langs/ka_GE/users.lang b/public/langs/ka_GE/users.lang
similarity index 100%
rename from htdocs/langs/ka_GE/users.lang
rename to public/langs/ka_GE/users.lang
diff --git a/htdocs/langs/ka_GE/website.lang b/public/langs/ka_GE/website.lang
similarity index 100%
rename from htdocs/langs/ka_GE/website.lang
rename to public/langs/ka_GE/website.lang
diff --git a/htdocs/langs/ka_GE/withdrawals.lang b/public/langs/ka_GE/withdrawals.lang
similarity index 100%
rename from htdocs/langs/ka_GE/withdrawals.lang
rename to public/langs/ka_GE/withdrawals.lang
diff --git a/htdocs/langs/ka_GE/workflow.lang b/public/langs/ka_GE/workflow.lang
similarity index 100%
rename from htdocs/langs/ka_GE/workflow.lang
rename to public/langs/ka_GE/workflow.lang
diff --git a/htdocs/langs/km_KH/accountancy.lang b/public/langs/km_KH/accountancy.lang
similarity index 100%
rename from htdocs/langs/km_KH/accountancy.lang
rename to public/langs/km_KH/accountancy.lang
diff --git a/htdocs/langs/km_KH/admin.lang b/public/langs/km_KH/admin.lang
similarity index 100%
rename from htdocs/langs/km_KH/admin.lang
rename to public/langs/km_KH/admin.lang
diff --git a/htdocs/langs/km_KH/agenda.lang b/public/langs/km_KH/agenda.lang
similarity index 100%
rename from htdocs/langs/km_KH/agenda.lang
rename to public/langs/km_KH/agenda.lang
diff --git a/htdocs/langs/km_KH/banks.lang b/public/langs/km_KH/banks.lang
similarity index 100%
rename from htdocs/langs/km_KH/banks.lang
rename to public/langs/km_KH/banks.lang
diff --git a/htdocs/langs/km_KH/bills.lang b/public/langs/km_KH/bills.lang
similarity index 100%
rename from htdocs/langs/km_KH/bills.lang
rename to public/langs/km_KH/bills.lang
diff --git a/htdocs/langs/km_KH/bookmarks.lang b/public/langs/km_KH/bookmarks.lang
similarity index 100%
rename from htdocs/langs/km_KH/bookmarks.lang
rename to public/langs/km_KH/bookmarks.lang
diff --git a/htdocs/langs/km_KH/boxes.lang b/public/langs/km_KH/boxes.lang
similarity index 100%
rename from htdocs/langs/km_KH/boxes.lang
rename to public/langs/km_KH/boxes.lang
diff --git a/htdocs/langs/km_KH/cashdesk.lang b/public/langs/km_KH/cashdesk.lang
similarity index 100%
rename from htdocs/langs/km_KH/cashdesk.lang
rename to public/langs/km_KH/cashdesk.lang
diff --git a/htdocs/langs/km_KH/categories.lang b/public/langs/km_KH/categories.lang
similarity index 100%
rename from htdocs/langs/km_KH/categories.lang
rename to public/langs/km_KH/categories.lang
diff --git a/htdocs/langs/km_KH/commercial.lang b/public/langs/km_KH/commercial.lang
similarity index 100%
rename from htdocs/langs/km_KH/commercial.lang
rename to public/langs/km_KH/commercial.lang
diff --git a/htdocs/langs/km_KH/companies.lang b/public/langs/km_KH/companies.lang
similarity index 100%
rename from htdocs/langs/km_KH/companies.lang
rename to public/langs/km_KH/companies.lang
diff --git a/htdocs/langs/km_KH/compta.lang b/public/langs/km_KH/compta.lang
similarity index 100%
rename from htdocs/langs/km_KH/compta.lang
rename to public/langs/km_KH/compta.lang
diff --git a/htdocs/langs/km_KH/contracts.lang b/public/langs/km_KH/contracts.lang
similarity index 100%
rename from htdocs/langs/km_KH/contracts.lang
rename to public/langs/km_KH/contracts.lang
diff --git a/htdocs/langs/km_KH/cron.lang b/public/langs/km_KH/cron.lang
similarity index 100%
rename from htdocs/langs/km_KH/cron.lang
rename to public/langs/km_KH/cron.lang
diff --git a/htdocs/langs/km_KH/deliveries.lang b/public/langs/km_KH/deliveries.lang
similarity index 100%
rename from htdocs/langs/km_KH/deliveries.lang
rename to public/langs/km_KH/deliveries.lang
diff --git a/htdocs/langs/km_KH/dict.lang b/public/langs/km_KH/dict.lang
similarity index 100%
rename from htdocs/langs/km_KH/dict.lang
rename to public/langs/km_KH/dict.lang
diff --git a/htdocs/langs/km_KH/donations.lang b/public/langs/km_KH/donations.lang
similarity index 100%
rename from htdocs/langs/km_KH/donations.lang
rename to public/langs/km_KH/donations.lang
diff --git a/htdocs/langs/km_KH/ecm.lang b/public/langs/km_KH/ecm.lang
similarity index 100%
rename from htdocs/langs/km_KH/ecm.lang
rename to public/langs/km_KH/ecm.lang
diff --git a/htdocs/langs/km_KH/errors.lang b/public/langs/km_KH/errors.lang
similarity index 100%
rename from htdocs/langs/km_KH/errors.lang
rename to public/langs/km_KH/errors.lang
diff --git a/htdocs/langs/km_KH/exports.lang b/public/langs/km_KH/exports.lang
similarity index 100%
rename from htdocs/langs/km_KH/exports.lang
rename to public/langs/km_KH/exports.lang
diff --git a/htdocs/langs/km_KH/externalsite.lang b/public/langs/km_KH/externalsite.lang
similarity index 100%
rename from htdocs/langs/km_KH/externalsite.lang
rename to public/langs/km_KH/externalsite.lang
diff --git a/htdocs/langs/km_KH/ftp.lang b/public/langs/km_KH/ftp.lang
similarity index 100%
rename from htdocs/langs/km_KH/ftp.lang
rename to public/langs/km_KH/ftp.lang
diff --git a/htdocs/langs/km_KH/help.lang b/public/langs/km_KH/help.lang
similarity index 100%
rename from htdocs/langs/km_KH/help.lang
rename to public/langs/km_KH/help.lang
diff --git a/htdocs/langs/km_KH/holiday.lang b/public/langs/km_KH/holiday.lang
similarity index 100%
rename from htdocs/langs/km_KH/holiday.lang
rename to public/langs/km_KH/holiday.lang
diff --git a/htdocs/langs/km_KH/hrm.lang b/public/langs/km_KH/hrm.lang
similarity index 100%
rename from htdocs/langs/km_KH/hrm.lang
rename to public/langs/km_KH/hrm.lang
diff --git a/htdocs/langs/km_KH/incoterm.lang b/public/langs/km_KH/incoterm.lang
similarity index 100%
rename from htdocs/langs/km_KH/incoterm.lang
rename to public/langs/km_KH/incoterm.lang
diff --git a/htdocs/langs/km_KH/install.lang b/public/langs/km_KH/install.lang
similarity index 100%
rename from htdocs/langs/km_KH/install.lang
rename to public/langs/km_KH/install.lang
diff --git a/htdocs/langs/km_KH/interventions.lang b/public/langs/km_KH/interventions.lang
similarity index 100%
rename from htdocs/langs/km_KH/interventions.lang
rename to public/langs/km_KH/interventions.lang
diff --git a/htdocs/langs/km_KH/languages.lang b/public/langs/km_KH/languages.lang
similarity index 100%
rename from htdocs/langs/km_KH/languages.lang
rename to public/langs/km_KH/languages.lang
diff --git a/htdocs/langs/km_KH/ldap.lang b/public/langs/km_KH/ldap.lang
similarity index 100%
rename from htdocs/langs/km_KH/ldap.lang
rename to public/langs/km_KH/ldap.lang
diff --git a/htdocs/langs/km_KH/link.lang b/public/langs/km_KH/link.lang
similarity index 100%
rename from htdocs/langs/km_KH/link.lang
rename to public/langs/km_KH/link.lang
diff --git a/htdocs/langs/km_KH/loan.lang b/public/langs/km_KH/loan.lang
similarity index 100%
rename from htdocs/langs/km_KH/loan.lang
rename to public/langs/km_KH/loan.lang
diff --git a/htdocs/langs/km_KH/mailmanspip.lang b/public/langs/km_KH/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/km_KH/mailmanspip.lang
rename to public/langs/km_KH/mailmanspip.lang
diff --git a/htdocs/langs/km_KH/mails.lang b/public/langs/km_KH/mails.lang
similarity index 100%
rename from htdocs/langs/km_KH/mails.lang
rename to public/langs/km_KH/mails.lang
diff --git a/htdocs/langs/km_KH/main.lang b/public/langs/km_KH/main.lang
similarity index 100%
rename from htdocs/langs/km_KH/main.lang
rename to public/langs/km_KH/main.lang
diff --git a/htdocs/langs/km_KH/margins.lang b/public/langs/km_KH/margins.lang
similarity index 100%
rename from htdocs/langs/km_KH/margins.lang
rename to public/langs/km_KH/margins.lang
diff --git a/htdocs/langs/km_KH/members.lang b/public/langs/km_KH/members.lang
similarity index 100%
rename from htdocs/langs/km_KH/members.lang
rename to public/langs/km_KH/members.lang
diff --git a/htdocs/langs/km_KH/oauth.lang b/public/langs/km_KH/oauth.lang
similarity index 100%
rename from htdocs/langs/km_KH/oauth.lang
rename to public/langs/km_KH/oauth.lang
diff --git a/htdocs/langs/km_KH/opensurvey.lang b/public/langs/km_KH/opensurvey.lang
similarity index 100%
rename from htdocs/langs/km_KH/opensurvey.lang
rename to public/langs/km_KH/opensurvey.lang
diff --git a/htdocs/langs/km_KH/orders.lang b/public/langs/km_KH/orders.lang
similarity index 100%
rename from htdocs/langs/km_KH/orders.lang
rename to public/langs/km_KH/orders.lang
diff --git a/htdocs/langs/km_KH/other.lang b/public/langs/km_KH/other.lang
similarity index 100%
rename from htdocs/langs/km_KH/other.lang
rename to public/langs/km_KH/other.lang
diff --git a/htdocs/langs/km_KH/paybox.lang b/public/langs/km_KH/paybox.lang
similarity index 100%
rename from htdocs/langs/km_KH/paybox.lang
rename to public/langs/km_KH/paybox.lang
diff --git a/htdocs/langs/km_KH/paypal.lang b/public/langs/km_KH/paypal.lang
similarity index 100%
rename from htdocs/langs/km_KH/paypal.lang
rename to public/langs/km_KH/paypal.lang
diff --git a/htdocs/langs/km_KH/printing.lang b/public/langs/km_KH/printing.lang
similarity index 100%
rename from htdocs/langs/km_KH/printing.lang
rename to public/langs/km_KH/printing.lang
diff --git a/htdocs/langs/km_KH/productbatch.lang b/public/langs/km_KH/productbatch.lang
similarity index 100%
rename from htdocs/langs/km_KH/productbatch.lang
rename to public/langs/km_KH/productbatch.lang
diff --git a/htdocs/langs/km_KH/products.lang b/public/langs/km_KH/products.lang
similarity index 100%
rename from htdocs/langs/km_KH/products.lang
rename to public/langs/km_KH/products.lang
diff --git a/htdocs/langs/km_KH/projects.lang b/public/langs/km_KH/projects.lang
similarity index 100%
rename from htdocs/langs/km_KH/projects.lang
rename to public/langs/km_KH/projects.lang
diff --git a/htdocs/langs/km_KH/propal.lang b/public/langs/km_KH/propal.lang
similarity index 100%
rename from htdocs/langs/km_KH/propal.lang
rename to public/langs/km_KH/propal.lang
diff --git a/htdocs/langs/km_KH/receiptprinter.lang b/public/langs/km_KH/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/km_KH/receiptprinter.lang
rename to public/langs/km_KH/receiptprinter.lang
diff --git a/htdocs/langs/km_KH/resource.lang b/public/langs/km_KH/resource.lang
similarity index 100%
rename from htdocs/langs/km_KH/resource.lang
rename to public/langs/km_KH/resource.lang
diff --git a/htdocs/langs/km_KH/salaries.lang b/public/langs/km_KH/salaries.lang
similarity index 100%
rename from htdocs/langs/km_KH/salaries.lang
rename to public/langs/km_KH/salaries.lang
diff --git a/htdocs/langs/km_KH/sendings.lang b/public/langs/km_KH/sendings.lang
similarity index 100%
rename from htdocs/langs/km_KH/sendings.lang
rename to public/langs/km_KH/sendings.lang
diff --git a/htdocs/langs/km_KH/sms.lang b/public/langs/km_KH/sms.lang
similarity index 100%
rename from htdocs/langs/km_KH/sms.lang
rename to public/langs/km_KH/sms.lang
diff --git a/htdocs/langs/km_KH/stocks.lang b/public/langs/km_KH/stocks.lang
similarity index 100%
rename from htdocs/langs/km_KH/stocks.lang
rename to public/langs/km_KH/stocks.lang
diff --git a/htdocs/langs/km_KH/supplier_proposal.lang b/public/langs/km_KH/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/km_KH/supplier_proposal.lang
rename to public/langs/km_KH/supplier_proposal.lang
diff --git a/htdocs/langs/km_KH/suppliers.lang b/public/langs/km_KH/suppliers.lang
similarity index 100%
rename from htdocs/langs/km_KH/suppliers.lang
rename to public/langs/km_KH/suppliers.lang
diff --git a/htdocs/langs/km_KH/trips.lang b/public/langs/km_KH/trips.lang
similarity index 100%
rename from htdocs/langs/km_KH/trips.lang
rename to public/langs/km_KH/trips.lang
diff --git a/htdocs/langs/km_KH/users.lang b/public/langs/km_KH/users.lang
similarity index 100%
rename from htdocs/langs/km_KH/users.lang
rename to public/langs/km_KH/users.lang
diff --git a/htdocs/langs/km_KH/website.lang b/public/langs/km_KH/website.lang
similarity index 100%
rename from htdocs/langs/km_KH/website.lang
rename to public/langs/km_KH/website.lang
diff --git a/htdocs/langs/km_KH/withdrawals.lang b/public/langs/km_KH/withdrawals.lang
similarity index 100%
rename from htdocs/langs/km_KH/withdrawals.lang
rename to public/langs/km_KH/withdrawals.lang
diff --git a/htdocs/langs/km_KH/workflow.lang b/public/langs/km_KH/workflow.lang
similarity index 100%
rename from htdocs/langs/km_KH/workflow.lang
rename to public/langs/km_KH/workflow.lang
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/public/langs/kn_IN/accountancy.lang
similarity index 100%
rename from htdocs/langs/kn_IN/accountancy.lang
rename to public/langs/kn_IN/accountancy.lang
diff --git a/htdocs/langs/kn_IN/admin.lang b/public/langs/kn_IN/admin.lang
similarity index 100%
rename from htdocs/langs/kn_IN/admin.lang
rename to public/langs/kn_IN/admin.lang
diff --git a/htdocs/langs/kn_IN/agenda.lang b/public/langs/kn_IN/agenda.lang
similarity index 100%
rename from htdocs/langs/kn_IN/agenda.lang
rename to public/langs/kn_IN/agenda.lang
diff --git a/htdocs/langs/kn_IN/banks.lang b/public/langs/kn_IN/banks.lang
similarity index 100%
rename from htdocs/langs/kn_IN/banks.lang
rename to public/langs/kn_IN/banks.lang
diff --git a/htdocs/langs/kn_IN/bills.lang b/public/langs/kn_IN/bills.lang
similarity index 100%
rename from htdocs/langs/kn_IN/bills.lang
rename to public/langs/kn_IN/bills.lang
diff --git a/htdocs/langs/kn_IN/bookmarks.lang b/public/langs/kn_IN/bookmarks.lang
similarity index 100%
rename from htdocs/langs/kn_IN/bookmarks.lang
rename to public/langs/kn_IN/bookmarks.lang
diff --git a/htdocs/langs/kn_IN/boxes.lang b/public/langs/kn_IN/boxes.lang
similarity index 100%
rename from htdocs/langs/kn_IN/boxes.lang
rename to public/langs/kn_IN/boxes.lang
diff --git a/htdocs/langs/kn_IN/cashdesk.lang b/public/langs/kn_IN/cashdesk.lang
similarity index 100%
rename from htdocs/langs/kn_IN/cashdesk.lang
rename to public/langs/kn_IN/cashdesk.lang
diff --git a/htdocs/langs/kn_IN/categories.lang b/public/langs/kn_IN/categories.lang
similarity index 100%
rename from htdocs/langs/kn_IN/categories.lang
rename to public/langs/kn_IN/categories.lang
diff --git a/htdocs/langs/kn_IN/commercial.lang b/public/langs/kn_IN/commercial.lang
similarity index 100%
rename from htdocs/langs/kn_IN/commercial.lang
rename to public/langs/kn_IN/commercial.lang
diff --git a/htdocs/langs/kn_IN/companies.lang b/public/langs/kn_IN/companies.lang
similarity index 100%
rename from htdocs/langs/kn_IN/companies.lang
rename to public/langs/kn_IN/companies.lang
diff --git a/htdocs/langs/kn_IN/compta.lang b/public/langs/kn_IN/compta.lang
similarity index 100%
rename from htdocs/langs/kn_IN/compta.lang
rename to public/langs/kn_IN/compta.lang
diff --git a/htdocs/langs/kn_IN/contracts.lang b/public/langs/kn_IN/contracts.lang
similarity index 100%
rename from htdocs/langs/kn_IN/contracts.lang
rename to public/langs/kn_IN/contracts.lang
diff --git a/htdocs/langs/kn_IN/cron.lang b/public/langs/kn_IN/cron.lang
similarity index 100%
rename from htdocs/langs/kn_IN/cron.lang
rename to public/langs/kn_IN/cron.lang
diff --git a/htdocs/langs/kn_IN/deliveries.lang b/public/langs/kn_IN/deliveries.lang
similarity index 100%
rename from htdocs/langs/kn_IN/deliveries.lang
rename to public/langs/kn_IN/deliveries.lang
diff --git a/htdocs/langs/kn_IN/dict.lang b/public/langs/kn_IN/dict.lang
similarity index 100%
rename from htdocs/langs/kn_IN/dict.lang
rename to public/langs/kn_IN/dict.lang
diff --git a/htdocs/langs/kn_IN/donations.lang b/public/langs/kn_IN/donations.lang
similarity index 100%
rename from htdocs/langs/kn_IN/donations.lang
rename to public/langs/kn_IN/donations.lang
diff --git a/htdocs/langs/kn_IN/ecm.lang b/public/langs/kn_IN/ecm.lang
similarity index 100%
rename from htdocs/langs/kn_IN/ecm.lang
rename to public/langs/kn_IN/ecm.lang
diff --git a/htdocs/langs/kn_IN/errors.lang b/public/langs/kn_IN/errors.lang
similarity index 100%
rename from htdocs/langs/kn_IN/errors.lang
rename to public/langs/kn_IN/errors.lang
diff --git a/htdocs/langs/kn_IN/exports.lang b/public/langs/kn_IN/exports.lang
similarity index 100%
rename from htdocs/langs/kn_IN/exports.lang
rename to public/langs/kn_IN/exports.lang
diff --git a/htdocs/langs/kn_IN/externalsite.lang b/public/langs/kn_IN/externalsite.lang
similarity index 100%
rename from htdocs/langs/kn_IN/externalsite.lang
rename to public/langs/kn_IN/externalsite.lang
diff --git a/htdocs/langs/kn_IN/ftp.lang b/public/langs/kn_IN/ftp.lang
similarity index 100%
rename from htdocs/langs/kn_IN/ftp.lang
rename to public/langs/kn_IN/ftp.lang
diff --git a/htdocs/langs/kn_IN/help.lang b/public/langs/kn_IN/help.lang
similarity index 100%
rename from htdocs/langs/kn_IN/help.lang
rename to public/langs/kn_IN/help.lang
diff --git a/htdocs/langs/kn_IN/holiday.lang b/public/langs/kn_IN/holiday.lang
similarity index 100%
rename from htdocs/langs/kn_IN/holiday.lang
rename to public/langs/kn_IN/holiday.lang
diff --git a/htdocs/langs/kn_IN/hrm.lang b/public/langs/kn_IN/hrm.lang
similarity index 100%
rename from htdocs/langs/kn_IN/hrm.lang
rename to public/langs/kn_IN/hrm.lang
diff --git a/htdocs/langs/kn_IN/incoterm.lang b/public/langs/kn_IN/incoterm.lang
similarity index 100%
rename from htdocs/langs/kn_IN/incoterm.lang
rename to public/langs/kn_IN/incoterm.lang
diff --git a/htdocs/langs/kn_IN/install.lang b/public/langs/kn_IN/install.lang
similarity index 100%
rename from htdocs/langs/kn_IN/install.lang
rename to public/langs/kn_IN/install.lang
diff --git a/htdocs/langs/kn_IN/interventions.lang b/public/langs/kn_IN/interventions.lang
similarity index 100%
rename from htdocs/langs/kn_IN/interventions.lang
rename to public/langs/kn_IN/interventions.lang
diff --git a/htdocs/langs/kn_IN/languages.lang b/public/langs/kn_IN/languages.lang
similarity index 100%
rename from htdocs/langs/kn_IN/languages.lang
rename to public/langs/kn_IN/languages.lang
diff --git a/htdocs/langs/kn_IN/ldap.lang b/public/langs/kn_IN/ldap.lang
similarity index 100%
rename from htdocs/langs/kn_IN/ldap.lang
rename to public/langs/kn_IN/ldap.lang
diff --git a/htdocs/langs/kn_IN/link.lang b/public/langs/kn_IN/link.lang
similarity index 100%
rename from htdocs/langs/kn_IN/link.lang
rename to public/langs/kn_IN/link.lang
diff --git a/htdocs/langs/kn_IN/loan.lang b/public/langs/kn_IN/loan.lang
similarity index 100%
rename from htdocs/langs/kn_IN/loan.lang
rename to public/langs/kn_IN/loan.lang
diff --git a/htdocs/langs/kn_IN/mailmanspip.lang b/public/langs/kn_IN/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/kn_IN/mailmanspip.lang
rename to public/langs/kn_IN/mailmanspip.lang
diff --git a/htdocs/langs/kn_IN/mails.lang b/public/langs/kn_IN/mails.lang
similarity index 100%
rename from htdocs/langs/kn_IN/mails.lang
rename to public/langs/kn_IN/mails.lang
diff --git a/htdocs/langs/kn_IN/main.lang b/public/langs/kn_IN/main.lang
similarity index 100%
rename from htdocs/langs/kn_IN/main.lang
rename to public/langs/kn_IN/main.lang
diff --git a/htdocs/langs/kn_IN/margins.lang b/public/langs/kn_IN/margins.lang
similarity index 100%
rename from htdocs/langs/kn_IN/margins.lang
rename to public/langs/kn_IN/margins.lang
diff --git a/htdocs/langs/kn_IN/members.lang b/public/langs/kn_IN/members.lang
similarity index 100%
rename from htdocs/langs/kn_IN/members.lang
rename to public/langs/kn_IN/members.lang
diff --git a/htdocs/langs/kn_IN/oauth.lang b/public/langs/kn_IN/oauth.lang
similarity index 100%
rename from htdocs/langs/kn_IN/oauth.lang
rename to public/langs/kn_IN/oauth.lang
diff --git a/htdocs/langs/kn_IN/opensurvey.lang b/public/langs/kn_IN/opensurvey.lang
similarity index 100%
rename from htdocs/langs/kn_IN/opensurvey.lang
rename to public/langs/kn_IN/opensurvey.lang
diff --git a/htdocs/langs/kn_IN/orders.lang b/public/langs/kn_IN/orders.lang
similarity index 100%
rename from htdocs/langs/kn_IN/orders.lang
rename to public/langs/kn_IN/orders.lang
diff --git a/htdocs/langs/kn_IN/other.lang b/public/langs/kn_IN/other.lang
similarity index 100%
rename from htdocs/langs/kn_IN/other.lang
rename to public/langs/kn_IN/other.lang
diff --git a/htdocs/langs/kn_IN/paybox.lang b/public/langs/kn_IN/paybox.lang
similarity index 100%
rename from htdocs/langs/kn_IN/paybox.lang
rename to public/langs/kn_IN/paybox.lang
diff --git a/htdocs/langs/kn_IN/paypal.lang b/public/langs/kn_IN/paypal.lang
similarity index 100%
rename from htdocs/langs/kn_IN/paypal.lang
rename to public/langs/kn_IN/paypal.lang
diff --git a/htdocs/langs/kn_IN/printing.lang b/public/langs/kn_IN/printing.lang
similarity index 100%
rename from htdocs/langs/kn_IN/printing.lang
rename to public/langs/kn_IN/printing.lang
diff --git a/htdocs/langs/kn_IN/productbatch.lang b/public/langs/kn_IN/productbatch.lang
similarity index 100%
rename from htdocs/langs/kn_IN/productbatch.lang
rename to public/langs/kn_IN/productbatch.lang
diff --git a/htdocs/langs/kn_IN/products.lang b/public/langs/kn_IN/products.lang
similarity index 100%
rename from htdocs/langs/kn_IN/products.lang
rename to public/langs/kn_IN/products.lang
diff --git a/htdocs/langs/kn_IN/projects.lang b/public/langs/kn_IN/projects.lang
similarity index 100%
rename from htdocs/langs/kn_IN/projects.lang
rename to public/langs/kn_IN/projects.lang
diff --git a/htdocs/langs/kn_IN/propal.lang b/public/langs/kn_IN/propal.lang
similarity index 100%
rename from htdocs/langs/kn_IN/propal.lang
rename to public/langs/kn_IN/propal.lang
diff --git a/htdocs/langs/kn_IN/receiptprinter.lang b/public/langs/kn_IN/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/kn_IN/receiptprinter.lang
rename to public/langs/kn_IN/receiptprinter.lang
diff --git a/htdocs/langs/kn_IN/resource.lang b/public/langs/kn_IN/resource.lang
similarity index 100%
rename from htdocs/langs/kn_IN/resource.lang
rename to public/langs/kn_IN/resource.lang
diff --git a/htdocs/langs/kn_IN/salaries.lang b/public/langs/kn_IN/salaries.lang
similarity index 100%
rename from htdocs/langs/kn_IN/salaries.lang
rename to public/langs/kn_IN/salaries.lang
diff --git a/htdocs/langs/kn_IN/sendings.lang b/public/langs/kn_IN/sendings.lang
similarity index 100%
rename from htdocs/langs/kn_IN/sendings.lang
rename to public/langs/kn_IN/sendings.lang
diff --git a/htdocs/langs/kn_IN/sms.lang b/public/langs/kn_IN/sms.lang
similarity index 100%
rename from htdocs/langs/kn_IN/sms.lang
rename to public/langs/kn_IN/sms.lang
diff --git a/htdocs/langs/kn_IN/stocks.lang b/public/langs/kn_IN/stocks.lang
similarity index 100%
rename from htdocs/langs/kn_IN/stocks.lang
rename to public/langs/kn_IN/stocks.lang
diff --git a/htdocs/langs/kn_IN/supplier_proposal.lang b/public/langs/kn_IN/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/kn_IN/supplier_proposal.lang
rename to public/langs/kn_IN/supplier_proposal.lang
diff --git a/htdocs/langs/kn_IN/suppliers.lang b/public/langs/kn_IN/suppliers.lang
similarity index 100%
rename from htdocs/langs/kn_IN/suppliers.lang
rename to public/langs/kn_IN/suppliers.lang
diff --git a/htdocs/langs/kn_IN/trips.lang b/public/langs/kn_IN/trips.lang
similarity index 100%
rename from htdocs/langs/kn_IN/trips.lang
rename to public/langs/kn_IN/trips.lang
diff --git a/htdocs/langs/kn_IN/users.lang b/public/langs/kn_IN/users.lang
similarity index 100%
rename from htdocs/langs/kn_IN/users.lang
rename to public/langs/kn_IN/users.lang
diff --git a/htdocs/langs/kn_IN/website.lang b/public/langs/kn_IN/website.lang
similarity index 100%
rename from htdocs/langs/kn_IN/website.lang
rename to public/langs/kn_IN/website.lang
diff --git a/htdocs/langs/kn_IN/withdrawals.lang b/public/langs/kn_IN/withdrawals.lang
similarity index 100%
rename from htdocs/langs/kn_IN/withdrawals.lang
rename to public/langs/kn_IN/withdrawals.lang
diff --git a/htdocs/langs/kn_IN/workflow.lang b/public/langs/kn_IN/workflow.lang
similarity index 100%
rename from htdocs/langs/kn_IN/workflow.lang
rename to public/langs/kn_IN/workflow.lang
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/public/langs/ko_KR/accountancy.lang
similarity index 100%
rename from htdocs/langs/ko_KR/accountancy.lang
rename to public/langs/ko_KR/accountancy.lang
diff --git a/htdocs/langs/ko_KR/admin.lang b/public/langs/ko_KR/admin.lang
similarity index 100%
rename from htdocs/langs/ko_KR/admin.lang
rename to public/langs/ko_KR/admin.lang
diff --git a/htdocs/langs/ko_KR/agenda.lang b/public/langs/ko_KR/agenda.lang
similarity index 100%
rename from htdocs/langs/ko_KR/agenda.lang
rename to public/langs/ko_KR/agenda.lang
diff --git a/htdocs/langs/ko_KR/banks.lang b/public/langs/ko_KR/banks.lang
similarity index 100%
rename from htdocs/langs/ko_KR/banks.lang
rename to public/langs/ko_KR/banks.lang
diff --git a/htdocs/langs/ko_KR/bills.lang b/public/langs/ko_KR/bills.lang
similarity index 100%
rename from htdocs/langs/ko_KR/bills.lang
rename to public/langs/ko_KR/bills.lang
diff --git a/htdocs/langs/ko_KR/bookmarks.lang b/public/langs/ko_KR/bookmarks.lang
similarity index 100%
rename from htdocs/langs/ko_KR/bookmarks.lang
rename to public/langs/ko_KR/bookmarks.lang
diff --git a/htdocs/langs/ko_KR/boxes.lang b/public/langs/ko_KR/boxes.lang
similarity index 100%
rename from htdocs/langs/ko_KR/boxes.lang
rename to public/langs/ko_KR/boxes.lang
diff --git a/htdocs/langs/ko_KR/cashdesk.lang b/public/langs/ko_KR/cashdesk.lang
similarity index 100%
rename from htdocs/langs/ko_KR/cashdesk.lang
rename to public/langs/ko_KR/cashdesk.lang
diff --git a/htdocs/langs/ko_KR/categories.lang b/public/langs/ko_KR/categories.lang
similarity index 100%
rename from htdocs/langs/ko_KR/categories.lang
rename to public/langs/ko_KR/categories.lang
diff --git a/htdocs/langs/ko_KR/commercial.lang b/public/langs/ko_KR/commercial.lang
similarity index 100%
rename from htdocs/langs/ko_KR/commercial.lang
rename to public/langs/ko_KR/commercial.lang
diff --git a/htdocs/langs/ko_KR/companies.lang b/public/langs/ko_KR/companies.lang
similarity index 100%
rename from htdocs/langs/ko_KR/companies.lang
rename to public/langs/ko_KR/companies.lang
diff --git a/htdocs/langs/ko_KR/compta.lang b/public/langs/ko_KR/compta.lang
similarity index 100%
rename from htdocs/langs/ko_KR/compta.lang
rename to public/langs/ko_KR/compta.lang
diff --git a/htdocs/langs/ko_KR/contracts.lang b/public/langs/ko_KR/contracts.lang
similarity index 100%
rename from htdocs/langs/ko_KR/contracts.lang
rename to public/langs/ko_KR/contracts.lang
diff --git a/htdocs/langs/ko_KR/cron.lang b/public/langs/ko_KR/cron.lang
similarity index 100%
rename from htdocs/langs/ko_KR/cron.lang
rename to public/langs/ko_KR/cron.lang
diff --git a/htdocs/langs/ko_KR/deliveries.lang b/public/langs/ko_KR/deliveries.lang
similarity index 100%
rename from htdocs/langs/ko_KR/deliveries.lang
rename to public/langs/ko_KR/deliveries.lang
diff --git a/htdocs/langs/ko_KR/dict.lang b/public/langs/ko_KR/dict.lang
similarity index 100%
rename from htdocs/langs/ko_KR/dict.lang
rename to public/langs/ko_KR/dict.lang
diff --git a/htdocs/langs/ko_KR/donations.lang b/public/langs/ko_KR/donations.lang
similarity index 100%
rename from htdocs/langs/ko_KR/donations.lang
rename to public/langs/ko_KR/donations.lang
diff --git a/htdocs/langs/ko_KR/ecm.lang b/public/langs/ko_KR/ecm.lang
similarity index 100%
rename from htdocs/langs/ko_KR/ecm.lang
rename to public/langs/ko_KR/ecm.lang
diff --git a/htdocs/langs/ko_KR/errors.lang b/public/langs/ko_KR/errors.lang
similarity index 100%
rename from htdocs/langs/ko_KR/errors.lang
rename to public/langs/ko_KR/errors.lang
diff --git a/htdocs/langs/ko_KR/exports.lang b/public/langs/ko_KR/exports.lang
similarity index 100%
rename from htdocs/langs/ko_KR/exports.lang
rename to public/langs/ko_KR/exports.lang
diff --git a/htdocs/langs/ko_KR/externalsite.lang b/public/langs/ko_KR/externalsite.lang
similarity index 100%
rename from htdocs/langs/ko_KR/externalsite.lang
rename to public/langs/ko_KR/externalsite.lang
diff --git a/htdocs/langs/ko_KR/ftp.lang b/public/langs/ko_KR/ftp.lang
similarity index 100%
rename from htdocs/langs/ko_KR/ftp.lang
rename to public/langs/ko_KR/ftp.lang
diff --git a/htdocs/langs/ko_KR/help.lang b/public/langs/ko_KR/help.lang
similarity index 100%
rename from htdocs/langs/ko_KR/help.lang
rename to public/langs/ko_KR/help.lang
diff --git a/htdocs/langs/ko_KR/holiday.lang b/public/langs/ko_KR/holiday.lang
similarity index 100%
rename from htdocs/langs/ko_KR/holiday.lang
rename to public/langs/ko_KR/holiday.lang
diff --git a/htdocs/langs/ko_KR/hrm.lang b/public/langs/ko_KR/hrm.lang
similarity index 100%
rename from htdocs/langs/ko_KR/hrm.lang
rename to public/langs/ko_KR/hrm.lang
diff --git a/htdocs/langs/ko_KR/incoterm.lang b/public/langs/ko_KR/incoterm.lang
similarity index 100%
rename from htdocs/langs/ko_KR/incoterm.lang
rename to public/langs/ko_KR/incoterm.lang
diff --git a/htdocs/langs/ko_KR/install.lang b/public/langs/ko_KR/install.lang
similarity index 100%
rename from htdocs/langs/ko_KR/install.lang
rename to public/langs/ko_KR/install.lang
diff --git a/htdocs/langs/ko_KR/interventions.lang b/public/langs/ko_KR/interventions.lang
similarity index 100%
rename from htdocs/langs/ko_KR/interventions.lang
rename to public/langs/ko_KR/interventions.lang
diff --git a/htdocs/langs/ko_KR/languages.lang b/public/langs/ko_KR/languages.lang
similarity index 100%
rename from htdocs/langs/ko_KR/languages.lang
rename to public/langs/ko_KR/languages.lang
diff --git a/htdocs/langs/ko_KR/ldap.lang b/public/langs/ko_KR/ldap.lang
similarity index 100%
rename from htdocs/langs/ko_KR/ldap.lang
rename to public/langs/ko_KR/ldap.lang
diff --git a/htdocs/langs/ko_KR/link.lang b/public/langs/ko_KR/link.lang
similarity index 100%
rename from htdocs/langs/ko_KR/link.lang
rename to public/langs/ko_KR/link.lang
diff --git a/htdocs/langs/ko_KR/loan.lang b/public/langs/ko_KR/loan.lang
similarity index 100%
rename from htdocs/langs/ko_KR/loan.lang
rename to public/langs/ko_KR/loan.lang
diff --git a/htdocs/langs/ko_KR/mailmanspip.lang b/public/langs/ko_KR/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/ko_KR/mailmanspip.lang
rename to public/langs/ko_KR/mailmanspip.lang
diff --git a/htdocs/langs/ko_KR/mails.lang b/public/langs/ko_KR/mails.lang
similarity index 100%
rename from htdocs/langs/ko_KR/mails.lang
rename to public/langs/ko_KR/mails.lang
diff --git a/htdocs/langs/ko_KR/main.lang b/public/langs/ko_KR/main.lang
similarity index 100%
rename from htdocs/langs/ko_KR/main.lang
rename to public/langs/ko_KR/main.lang
diff --git a/htdocs/langs/ko_KR/margins.lang b/public/langs/ko_KR/margins.lang
similarity index 100%
rename from htdocs/langs/ko_KR/margins.lang
rename to public/langs/ko_KR/margins.lang
diff --git a/htdocs/langs/ko_KR/members.lang b/public/langs/ko_KR/members.lang
similarity index 100%
rename from htdocs/langs/ko_KR/members.lang
rename to public/langs/ko_KR/members.lang
diff --git a/htdocs/langs/ko_KR/oauth.lang b/public/langs/ko_KR/oauth.lang
similarity index 100%
rename from htdocs/langs/ko_KR/oauth.lang
rename to public/langs/ko_KR/oauth.lang
diff --git a/htdocs/langs/ko_KR/opensurvey.lang b/public/langs/ko_KR/opensurvey.lang
similarity index 100%
rename from htdocs/langs/ko_KR/opensurvey.lang
rename to public/langs/ko_KR/opensurvey.lang
diff --git a/htdocs/langs/ko_KR/orders.lang b/public/langs/ko_KR/orders.lang
similarity index 100%
rename from htdocs/langs/ko_KR/orders.lang
rename to public/langs/ko_KR/orders.lang
diff --git a/htdocs/langs/ko_KR/other.lang b/public/langs/ko_KR/other.lang
similarity index 100%
rename from htdocs/langs/ko_KR/other.lang
rename to public/langs/ko_KR/other.lang
diff --git a/htdocs/langs/ko_KR/paybox.lang b/public/langs/ko_KR/paybox.lang
similarity index 100%
rename from htdocs/langs/ko_KR/paybox.lang
rename to public/langs/ko_KR/paybox.lang
diff --git a/htdocs/langs/ko_KR/paypal.lang b/public/langs/ko_KR/paypal.lang
similarity index 100%
rename from htdocs/langs/ko_KR/paypal.lang
rename to public/langs/ko_KR/paypal.lang
diff --git a/htdocs/langs/ko_KR/printing.lang b/public/langs/ko_KR/printing.lang
similarity index 100%
rename from htdocs/langs/ko_KR/printing.lang
rename to public/langs/ko_KR/printing.lang
diff --git a/htdocs/langs/ko_KR/productbatch.lang b/public/langs/ko_KR/productbatch.lang
similarity index 100%
rename from htdocs/langs/ko_KR/productbatch.lang
rename to public/langs/ko_KR/productbatch.lang
diff --git a/htdocs/langs/ko_KR/products.lang b/public/langs/ko_KR/products.lang
similarity index 100%
rename from htdocs/langs/ko_KR/products.lang
rename to public/langs/ko_KR/products.lang
diff --git a/htdocs/langs/ko_KR/projects.lang b/public/langs/ko_KR/projects.lang
similarity index 100%
rename from htdocs/langs/ko_KR/projects.lang
rename to public/langs/ko_KR/projects.lang
diff --git a/htdocs/langs/ko_KR/propal.lang b/public/langs/ko_KR/propal.lang
similarity index 100%
rename from htdocs/langs/ko_KR/propal.lang
rename to public/langs/ko_KR/propal.lang
diff --git a/htdocs/langs/ko_KR/receiptprinter.lang b/public/langs/ko_KR/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/ko_KR/receiptprinter.lang
rename to public/langs/ko_KR/receiptprinter.lang
diff --git a/htdocs/langs/ko_KR/resource.lang b/public/langs/ko_KR/resource.lang
similarity index 100%
rename from htdocs/langs/ko_KR/resource.lang
rename to public/langs/ko_KR/resource.lang
diff --git a/htdocs/langs/ko_KR/salaries.lang b/public/langs/ko_KR/salaries.lang
similarity index 100%
rename from htdocs/langs/ko_KR/salaries.lang
rename to public/langs/ko_KR/salaries.lang
diff --git a/htdocs/langs/ko_KR/sendings.lang b/public/langs/ko_KR/sendings.lang
similarity index 100%
rename from htdocs/langs/ko_KR/sendings.lang
rename to public/langs/ko_KR/sendings.lang
diff --git a/htdocs/langs/ko_KR/sms.lang b/public/langs/ko_KR/sms.lang
similarity index 100%
rename from htdocs/langs/ko_KR/sms.lang
rename to public/langs/ko_KR/sms.lang
diff --git a/htdocs/langs/ko_KR/stocks.lang b/public/langs/ko_KR/stocks.lang
similarity index 100%
rename from htdocs/langs/ko_KR/stocks.lang
rename to public/langs/ko_KR/stocks.lang
diff --git a/htdocs/langs/ko_KR/supplier_proposal.lang b/public/langs/ko_KR/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/ko_KR/supplier_proposal.lang
rename to public/langs/ko_KR/supplier_proposal.lang
diff --git a/htdocs/langs/ko_KR/suppliers.lang b/public/langs/ko_KR/suppliers.lang
similarity index 100%
rename from htdocs/langs/ko_KR/suppliers.lang
rename to public/langs/ko_KR/suppliers.lang
diff --git a/htdocs/langs/ko_KR/trips.lang b/public/langs/ko_KR/trips.lang
similarity index 100%
rename from htdocs/langs/ko_KR/trips.lang
rename to public/langs/ko_KR/trips.lang
diff --git a/htdocs/langs/ko_KR/users.lang b/public/langs/ko_KR/users.lang
similarity index 100%
rename from htdocs/langs/ko_KR/users.lang
rename to public/langs/ko_KR/users.lang
diff --git a/htdocs/langs/ko_KR/website.lang b/public/langs/ko_KR/website.lang
similarity index 100%
rename from htdocs/langs/ko_KR/website.lang
rename to public/langs/ko_KR/website.lang
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/public/langs/ko_KR/withdrawals.lang
similarity index 100%
rename from htdocs/langs/ko_KR/withdrawals.lang
rename to public/langs/ko_KR/withdrawals.lang
diff --git a/htdocs/langs/ko_KR/workflow.lang b/public/langs/ko_KR/workflow.lang
similarity index 100%
rename from htdocs/langs/ko_KR/workflow.lang
rename to public/langs/ko_KR/workflow.lang
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/public/langs/lo_LA/accountancy.lang
similarity index 100%
rename from htdocs/langs/lo_LA/accountancy.lang
rename to public/langs/lo_LA/accountancy.lang
diff --git a/htdocs/langs/lo_LA/admin.lang b/public/langs/lo_LA/admin.lang
similarity index 100%
rename from htdocs/langs/lo_LA/admin.lang
rename to public/langs/lo_LA/admin.lang
diff --git a/htdocs/langs/lo_LA/agenda.lang b/public/langs/lo_LA/agenda.lang
similarity index 100%
rename from htdocs/langs/lo_LA/agenda.lang
rename to public/langs/lo_LA/agenda.lang
diff --git a/htdocs/langs/lo_LA/banks.lang b/public/langs/lo_LA/banks.lang
similarity index 100%
rename from htdocs/langs/lo_LA/banks.lang
rename to public/langs/lo_LA/banks.lang
diff --git a/htdocs/langs/lo_LA/bills.lang b/public/langs/lo_LA/bills.lang
similarity index 100%
rename from htdocs/langs/lo_LA/bills.lang
rename to public/langs/lo_LA/bills.lang
diff --git a/htdocs/langs/lo_LA/bookmarks.lang b/public/langs/lo_LA/bookmarks.lang
similarity index 100%
rename from htdocs/langs/lo_LA/bookmarks.lang
rename to public/langs/lo_LA/bookmarks.lang
diff --git a/htdocs/langs/lo_LA/boxes.lang b/public/langs/lo_LA/boxes.lang
similarity index 100%
rename from htdocs/langs/lo_LA/boxes.lang
rename to public/langs/lo_LA/boxes.lang
diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/public/langs/lo_LA/cashdesk.lang
similarity index 100%
rename from htdocs/langs/lo_LA/cashdesk.lang
rename to public/langs/lo_LA/cashdesk.lang
diff --git a/htdocs/langs/lo_LA/categories.lang b/public/langs/lo_LA/categories.lang
similarity index 100%
rename from htdocs/langs/lo_LA/categories.lang
rename to public/langs/lo_LA/categories.lang
diff --git a/htdocs/langs/lo_LA/commercial.lang b/public/langs/lo_LA/commercial.lang
similarity index 100%
rename from htdocs/langs/lo_LA/commercial.lang
rename to public/langs/lo_LA/commercial.lang
diff --git a/htdocs/langs/lo_LA/companies.lang b/public/langs/lo_LA/companies.lang
similarity index 100%
rename from htdocs/langs/lo_LA/companies.lang
rename to public/langs/lo_LA/companies.lang
diff --git a/htdocs/langs/lo_LA/compta.lang b/public/langs/lo_LA/compta.lang
similarity index 100%
rename from htdocs/langs/lo_LA/compta.lang
rename to public/langs/lo_LA/compta.lang
diff --git a/htdocs/langs/lo_LA/contracts.lang b/public/langs/lo_LA/contracts.lang
similarity index 100%
rename from htdocs/langs/lo_LA/contracts.lang
rename to public/langs/lo_LA/contracts.lang
diff --git a/htdocs/langs/lo_LA/cron.lang b/public/langs/lo_LA/cron.lang
similarity index 100%
rename from htdocs/langs/lo_LA/cron.lang
rename to public/langs/lo_LA/cron.lang
diff --git a/htdocs/langs/lo_LA/deliveries.lang b/public/langs/lo_LA/deliveries.lang
similarity index 100%
rename from htdocs/langs/lo_LA/deliveries.lang
rename to public/langs/lo_LA/deliveries.lang
diff --git a/htdocs/langs/lo_LA/dict.lang b/public/langs/lo_LA/dict.lang
similarity index 100%
rename from htdocs/langs/lo_LA/dict.lang
rename to public/langs/lo_LA/dict.lang
diff --git a/htdocs/langs/lo_LA/donations.lang b/public/langs/lo_LA/donations.lang
similarity index 100%
rename from htdocs/langs/lo_LA/donations.lang
rename to public/langs/lo_LA/donations.lang
diff --git a/htdocs/langs/lo_LA/ecm.lang b/public/langs/lo_LA/ecm.lang
similarity index 100%
rename from htdocs/langs/lo_LA/ecm.lang
rename to public/langs/lo_LA/ecm.lang
diff --git a/htdocs/langs/lo_LA/errors.lang b/public/langs/lo_LA/errors.lang
similarity index 100%
rename from htdocs/langs/lo_LA/errors.lang
rename to public/langs/lo_LA/errors.lang
diff --git a/htdocs/langs/lo_LA/exports.lang b/public/langs/lo_LA/exports.lang
similarity index 100%
rename from htdocs/langs/lo_LA/exports.lang
rename to public/langs/lo_LA/exports.lang
diff --git a/htdocs/langs/lo_LA/externalsite.lang b/public/langs/lo_LA/externalsite.lang
similarity index 100%
rename from htdocs/langs/lo_LA/externalsite.lang
rename to public/langs/lo_LA/externalsite.lang
diff --git a/htdocs/langs/lo_LA/ftp.lang b/public/langs/lo_LA/ftp.lang
similarity index 100%
rename from htdocs/langs/lo_LA/ftp.lang
rename to public/langs/lo_LA/ftp.lang
diff --git a/htdocs/langs/lo_LA/help.lang b/public/langs/lo_LA/help.lang
similarity index 100%
rename from htdocs/langs/lo_LA/help.lang
rename to public/langs/lo_LA/help.lang
diff --git a/htdocs/langs/lo_LA/holiday.lang b/public/langs/lo_LA/holiday.lang
similarity index 100%
rename from htdocs/langs/lo_LA/holiday.lang
rename to public/langs/lo_LA/holiday.lang
diff --git a/htdocs/langs/lo_LA/hrm.lang b/public/langs/lo_LA/hrm.lang
similarity index 100%
rename from htdocs/langs/lo_LA/hrm.lang
rename to public/langs/lo_LA/hrm.lang
diff --git a/htdocs/langs/lo_LA/incoterm.lang b/public/langs/lo_LA/incoterm.lang
similarity index 100%
rename from htdocs/langs/lo_LA/incoterm.lang
rename to public/langs/lo_LA/incoterm.lang
diff --git a/htdocs/langs/lo_LA/install.lang b/public/langs/lo_LA/install.lang
similarity index 100%
rename from htdocs/langs/lo_LA/install.lang
rename to public/langs/lo_LA/install.lang
diff --git a/htdocs/langs/lo_LA/interventions.lang b/public/langs/lo_LA/interventions.lang
similarity index 100%
rename from htdocs/langs/lo_LA/interventions.lang
rename to public/langs/lo_LA/interventions.lang
diff --git a/htdocs/langs/lo_LA/languages.lang b/public/langs/lo_LA/languages.lang
similarity index 100%
rename from htdocs/langs/lo_LA/languages.lang
rename to public/langs/lo_LA/languages.lang
diff --git a/htdocs/langs/lo_LA/ldap.lang b/public/langs/lo_LA/ldap.lang
similarity index 100%
rename from htdocs/langs/lo_LA/ldap.lang
rename to public/langs/lo_LA/ldap.lang
diff --git a/htdocs/langs/lo_LA/link.lang b/public/langs/lo_LA/link.lang
similarity index 100%
rename from htdocs/langs/lo_LA/link.lang
rename to public/langs/lo_LA/link.lang
diff --git a/htdocs/langs/lo_LA/loan.lang b/public/langs/lo_LA/loan.lang
similarity index 100%
rename from htdocs/langs/lo_LA/loan.lang
rename to public/langs/lo_LA/loan.lang
diff --git a/htdocs/langs/lo_LA/mailmanspip.lang b/public/langs/lo_LA/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/lo_LA/mailmanspip.lang
rename to public/langs/lo_LA/mailmanspip.lang
diff --git a/htdocs/langs/lo_LA/mails.lang b/public/langs/lo_LA/mails.lang
similarity index 100%
rename from htdocs/langs/lo_LA/mails.lang
rename to public/langs/lo_LA/mails.lang
diff --git a/htdocs/langs/lo_LA/main.lang b/public/langs/lo_LA/main.lang
similarity index 100%
rename from htdocs/langs/lo_LA/main.lang
rename to public/langs/lo_LA/main.lang
diff --git a/htdocs/langs/lo_LA/margins.lang b/public/langs/lo_LA/margins.lang
similarity index 100%
rename from htdocs/langs/lo_LA/margins.lang
rename to public/langs/lo_LA/margins.lang
diff --git a/htdocs/langs/lo_LA/members.lang b/public/langs/lo_LA/members.lang
similarity index 100%
rename from htdocs/langs/lo_LA/members.lang
rename to public/langs/lo_LA/members.lang
diff --git a/htdocs/langs/lo_LA/oauth.lang b/public/langs/lo_LA/oauth.lang
similarity index 100%
rename from htdocs/langs/lo_LA/oauth.lang
rename to public/langs/lo_LA/oauth.lang
diff --git a/htdocs/langs/lo_LA/opensurvey.lang b/public/langs/lo_LA/opensurvey.lang
similarity index 100%
rename from htdocs/langs/lo_LA/opensurvey.lang
rename to public/langs/lo_LA/opensurvey.lang
diff --git a/htdocs/langs/lo_LA/orders.lang b/public/langs/lo_LA/orders.lang
similarity index 100%
rename from htdocs/langs/lo_LA/orders.lang
rename to public/langs/lo_LA/orders.lang
diff --git a/htdocs/langs/lo_LA/other.lang b/public/langs/lo_LA/other.lang
similarity index 100%
rename from htdocs/langs/lo_LA/other.lang
rename to public/langs/lo_LA/other.lang
diff --git a/htdocs/langs/lo_LA/paybox.lang b/public/langs/lo_LA/paybox.lang
similarity index 100%
rename from htdocs/langs/lo_LA/paybox.lang
rename to public/langs/lo_LA/paybox.lang
diff --git a/htdocs/langs/lo_LA/paypal.lang b/public/langs/lo_LA/paypal.lang
similarity index 100%
rename from htdocs/langs/lo_LA/paypal.lang
rename to public/langs/lo_LA/paypal.lang
diff --git a/htdocs/langs/lo_LA/printing.lang b/public/langs/lo_LA/printing.lang
similarity index 100%
rename from htdocs/langs/lo_LA/printing.lang
rename to public/langs/lo_LA/printing.lang
diff --git a/htdocs/langs/lo_LA/productbatch.lang b/public/langs/lo_LA/productbatch.lang
similarity index 100%
rename from htdocs/langs/lo_LA/productbatch.lang
rename to public/langs/lo_LA/productbatch.lang
diff --git a/htdocs/langs/lo_LA/products.lang b/public/langs/lo_LA/products.lang
similarity index 100%
rename from htdocs/langs/lo_LA/products.lang
rename to public/langs/lo_LA/products.lang
diff --git a/htdocs/langs/lo_LA/projects.lang b/public/langs/lo_LA/projects.lang
similarity index 100%
rename from htdocs/langs/lo_LA/projects.lang
rename to public/langs/lo_LA/projects.lang
diff --git a/htdocs/langs/lo_LA/propal.lang b/public/langs/lo_LA/propal.lang
similarity index 100%
rename from htdocs/langs/lo_LA/propal.lang
rename to public/langs/lo_LA/propal.lang
diff --git a/htdocs/langs/lo_LA/receiptprinter.lang b/public/langs/lo_LA/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/lo_LA/receiptprinter.lang
rename to public/langs/lo_LA/receiptprinter.lang
diff --git a/htdocs/langs/lo_LA/resource.lang b/public/langs/lo_LA/resource.lang
similarity index 100%
rename from htdocs/langs/lo_LA/resource.lang
rename to public/langs/lo_LA/resource.lang
diff --git a/htdocs/langs/lo_LA/salaries.lang b/public/langs/lo_LA/salaries.lang
similarity index 100%
rename from htdocs/langs/lo_LA/salaries.lang
rename to public/langs/lo_LA/salaries.lang
diff --git a/htdocs/langs/lo_LA/sendings.lang b/public/langs/lo_LA/sendings.lang
similarity index 100%
rename from htdocs/langs/lo_LA/sendings.lang
rename to public/langs/lo_LA/sendings.lang
diff --git a/htdocs/langs/lo_LA/sms.lang b/public/langs/lo_LA/sms.lang
similarity index 100%
rename from htdocs/langs/lo_LA/sms.lang
rename to public/langs/lo_LA/sms.lang
diff --git a/htdocs/langs/lo_LA/stocks.lang b/public/langs/lo_LA/stocks.lang
similarity index 100%
rename from htdocs/langs/lo_LA/stocks.lang
rename to public/langs/lo_LA/stocks.lang
diff --git a/htdocs/langs/lo_LA/supplier_proposal.lang b/public/langs/lo_LA/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/lo_LA/supplier_proposal.lang
rename to public/langs/lo_LA/supplier_proposal.lang
diff --git a/htdocs/langs/lo_LA/suppliers.lang b/public/langs/lo_LA/suppliers.lang
similarity index 100%
rename from htdocs/langs/lo_LA/suppliers.lang
rename to public/langs/lo_LA/suppliers.lang
diff --git a/htdocs/langs/lo_LA/trips.lang b/public/langs/lo_LA/trips.lang
similarity index 100%
rename from htdocs/langs/lo_LA/trips.lang
rename to public/langs/lo_LA/trips.lang
diff --git a/htdocs/langs/lo_LA/users.lang b/public/langs/lo_LA/users.lang
similarity index 100%
rename from htdocs/langs/lo_LA/users.lang
rename to public/langs/lo_LA/users.lang
diff --git a/htdocs/langs/lo_LA/website.lang b/public/langs/lo_LA/website.lang
similarity index 100%
rename from htdocs/langs/lo_LA/website.lang
rename to public/langs/lo_LA/website.lang
diff --git a/htdocs/langs/lo_LA/withdrawals.lang b/public/langs/lo_LA/withdrawals.lang
similarity index 100%
rename from htdocs/langs/lo_LA/withdrawals.lang
rename to public/langs/lo_LA/withdrawals.lang
diff --git a/htdocs/langs/lo_LA/workflow.lang b/public/langs/lo_LA/workflow.lang
similarity index 100%
rename from htdocs/langs/lo_LA/workflow.lang
rename to public/langs/lo_LA/workflow.lang
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/public/langs/lt_LT/accountancy.lang
similarity index 100%
rename from htdocs/langs/lt_LT/accountancy.lang
rename to public/langs/lt_LT/accountancy.lang
diff --git a/htdocs/langs/lt_LT/admin.lang b/public/langs/lt_LT/admin.lang
similarity index 100%
rename from htdocs/langs/lt_LT/admin.lang
rename to public/langs/lt_LT/admin.lang
diff --git a/htdocs/langs/lt_LT/agenda.lang b/public/langs/lt_LT/agenda.lang
similarity index 100%
rename from htdocs/langs/lt_LT/agenda.lang
rename to public/langs/lt_LT/agenda.lang
diff --git a/htdocs/langs/lt_LT/banks.lang b/public/langs/lt_LT/banks.lang
similarity index 100%
rename from htdocs/langs/lt_LT/banks.lang
rename to public/langs/lt_LT/banks.lang
diff --git a/htdocs/langs/lt_LT/bills.lang b/public/langs/lt_LT/bills.lang
similarity index 100%
rename from htdocs/langs/lt_LT/bills.lang
rename to public/langs/lt_LT/bills.lang
diff --git a/htdocs/langs/lt_LT/bookmarks.lang b/public/langs/lt_LT/bookmarks.lang
similarity index 100%
rename from htdocs/langs/lt_LT/bookmarks.lang
rename to public/langs/lt_LT/bookmarks.lang
diff --git a/htdocs/langs/lt_LT/boxes.lang b/public/langs/lt_LT/boxes.lang
similarity index 100%
rename from htdocs/langs/lt_LT/boxes.lang
rename to public/langs/lt_LT/boxes.lang
diff --git a/htdocs/langs/lt_LT/cashdesk.lang b/public/langs/lt_LT/cashdesk.lang
similarity index 100%
rename from htdocs/langs/lt_LT/cashdesk.lang
rename to public/langs/lt_LT/cashdesk.lang
diff --git a/htdocs/langs/lt_LT/categories.lang b/public/langs/lt_LT/categories.lang
similarity index 100%
rename from htdocs/langs/lt_LT/categories.lang
rename to public/langs/lt_LT/categories.lang
diff --git a/htdocs/langs/lt_LT/commercial.lang b/public/langs/lt_LT/commercial.lang
similarity index 100%
rename from htdocs/langs/lt_LT/commercial.lang
rename to public/langs/lt_LT/commercial.lang
diff --git a/htdocs/langs/lt_LT/companies.lang b/public/langs/lt_LT/companies.lang
similarity index 100%
rename from htdocs/langs/lt_LT/companies.lang
rename to public/langs/lt_LT/companies.lang
diff --git a/htdocs/langs/lt_LT/compta.lang b/public/langs/lt_LT/compta.lang
similarity index 100%
rename from htdocs/langs/lt_LT/compta.lang
rename to public/langs/lt_LT/compta.lang
diff --git a/htdocs/langs/lt_LT/contracts.lang b/public/langs/lt_LT/contracts.lang
similarity index 100%
rename from htdocs/langs/lt_LT/contracts.lang
rename to public/langs/lt_LT/contracts.lang
diff --git a/htdocs/langs/lt_LT/cron.lang b/public/langs/lt_LT/cron.lang
similarity index 100%
rename from htdocs/langs/lt_LT/cron.lang
rename to public/langs/lt_LT/cron.lang
diff --git a/htdocs/langs/lt_LT/deliveries.lang b/public/langs/lt_LT/deliveries.lang
similarity index 100%
rename from htdocs/langs/lt_LT/deliveries.lang
rename to public/langs/lt_LT/deliveries.lang
diff --git a/htdocs/langs/lt_LT/dict.lang b/public/langs/lt_LT/dict.lang
similarity index 100%
rename from htdocs/langs/lt_LT/dict.lang
rename to public/langs/lt_LT/dict.lang
diff --git a/htdocs/langs/lt_LT/donations.lang b/public/langs/lt_LT/donations.lang
similarity index 100%
rename from htdocs/langs/lt_LT/donations.lang
rename to public/langs/lt_LT/donations.lang
diff --git a/htdocs/langs/lt_LT/ecm.lang b/public/langs/lt_LT/ecm.lang
similarity index 100%
rename from htdocs/langs/lt_LT/ecm.lang
rename to public/langs/lt_LT/ecm.lang
diff --git a/htdocs/langs/lt_LT/errors.lang b/public/langs/lt_LT/errors.lang
similarity index 100%
rename from htdocs/langs/lt_LT/errors.lang
rename to public/langs/lt_LT/errors.lang
diff --git a/htdocs/langs/lt_LT/exports.lang b/public/langs/lt_LT/exports.lang
similarity index 100%
rename from htdocs/langs/lt_LT/exports.lang
rename to public/langs/lt_LT/exports.lang
diff --git a/htdocs/langs/lt_LT/externalsite.lang b/public/langs/lt_LT/externalsite.lang
similarity index 100%
rename from htdocs/langs/lt_LT/externalsite.lang
rename to public/langs/lt_LT/externalsite.lang
diff --git a/htdocs/langs/lt_LT/ftp.lang b/public/langs/lt_LT/ftp.lang
similarity index 100%
rename from htdocs/langs/lt_LT/ftp.lang
rename to public/langs/lt_LT/ftp.lang
diff --git a/htdocs/langs/lt_LT/help.lang b/public/langs/lt_LT/help.lang
similarity index 100%
rename from htdocs/langs/lt_LT/help.lang
rename to public/langs/lt_LT/help.lang
diff --git a/htdocs/langs/lt_LT/holiday.lang b/public/langs/lt_LT/holiday.lang
similarity index 100%
rename from htdocs/langs/lt_LT/holiday.lang
rename to public/langs/lt_LT/holiday.lang
diff --git a/htdocs/langs/lt_LT/hrm.lang b/public/langs/lt_LT/hrm.lang
similarity index 100%
rename from htdocs/langs/lt_LT/hrm.lang
rename to public/langs/lt_LT/hrm.lang
diff --git a/htdocs/langs/lt_LT/incoterm.lang b/public/langs/lt_LT/incoterm.lang
similarity index 100%
rename from htdocs/langs/lt_LT/incoterm.lang
rename to public/langs/lt_LT/incoterm.lang
diff --git a/htdocs/langs/lt_LT/install.lang b/public/langs/lt_LT/install.lang
similarity index 100%
rename from htdocs/langs/lt_LT/install.lang
rename to public/langs/lt_LT/install.lang
diff --git a/htdocs/langs/lt_LT/interventions.lang b/public/langs/lt_LT/interventions.lang
similarity index 100%
rename from htdocs/langs/lt_LT/interventions.lang
rename to public/langs/lt_LT/interventions.lang
diff --git a/htdocs/langs/lt_LT/languages.lang b/public/langs/lt_LT/languages.lang
similarity index 100%
rename from htdocs/langs/lt_LT/languages.lang
rename to public/langs/lt_LT/languages.lang
diff --git a/htdocs/langs/lt_LT/ldap.lang b/public/langs/lt_LT/ldap.lang
similarity index 100%
rename from htdocs/langs/lt_LT/ldap.lang
rename to public/langs/lt_LT/ldap.lang
diff --git a/htdocs/langs/lt_LT/link.lang b/public/langs/lt_LT/link.lang
similarity index 100%
rename from htdocs/langs/lt_LT/link.lang
rename to public/langs/lt_LT/link.lang
diff --git a/htdocs/langs/lt_LT/loan.lang b/public/langs/lt_LT/loan.lang
similarity index 100%
rename from htdocs/langs/lt_LT/loan.lang
rename to public/langs/lt_LT/loan.lang
diff --git a/htdocs/langs/lt_LT/mailmanspip.lang b/public/langs/lt_LT/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/lt_LT/mailmanspip.lang
rename to public/langs/lt_LT/mailmanspip.lang
diff --git a/htdocs/langs/lt_LT/mails.lang b/public/langs/lt_LT/mails.lang
similarity index 100%
rename from htdocs/langs/lt_LT/mails.lang
rename to public/langs/lt_LT/mails.lang
diff --git a/htdocs/langs/lt_LT/main.lang b/public/langs/lt_LT/main.lang
similarity index 100%
rename from htdocs/langs/lt_LT/main.lang
rename to public/langs/lt_LT/main.lang
diff --git a/htdocs/langs/lt_LT/margins.lang b/public/langs/lt_LT/margins.lang
similarity index 100%
rename from htdocs/langs/lt_LT/margins.lang
rename to public/langs/lt_LT/margins.lang
diff --git a/htdocs/langs/lt_LT/members.lang b/public/langs/lt_LT/members.lang
similarity index 100%
rename from htdocs/langs/lt_LT/members.lang
rename to public/langs/lt_LT/members.lang
diff --git a/htdocs/langs/lt_LT/oauth.lang b/public/langs/lt_LT/oauth.lang
similarity index 100%
rename from htdocs/langs/lt_LT/oauth.lang
rename to public/langs/lt_LT/oauth.lang
diff --git a/htdocs/langs/lt_LT/opensurvey.lang b/public/langs/lt_LT/opensurvey.lang
similarity index 100%
rename from htdocs/langs/lt_LT/opensurvey.lang
rename to public/langs/lt_LT/opensurvey.lang
diff --git a/htdocs/langs/lt_LT/orders.lang b/public/langs/lt_LT/orders.lang
similarity index 100%
rename from htdocs/langs/lt_LT/orders.lang
rename to public/langs/lt_LT/orders.lang
diff --git a/htdocs/langs/lt_LT/other.lang b/public/langs/lt_LT/other.lang
similarity index 100%
rename from htdocs/langs/lt_LT/other.lang
rename to public/langs/lt_LT/other.lang
diff --git a/htdocs/langs/lt_LT/paybox.lang b/public/langs/lt_LT/paybox.lang
similarity index 100%
rename from htdocs/langs/lt_LT/paybox.lang
rename to public/langs/lt_LT/paybox.lang
diff --git a/htdocs/langs/lt_LT/paypal.lang b/public/langs/lt_LT/paypal.lang
similarity index 100%
rename from htdocs/langs/lt_LT/paypal.lang
rename to public/langs/lt_LT/paypal.lang
diff --git a/htdocs/langs/lt_LT/printing.lang b/public/langs/lt_LT/printing.lang
similarity index 100%
rename from htdocs/langs/lt_LT/printing.lang
rename to public/langs/lt_LT/printing.lang
diff --git a/htdocs/langs/lt_LT/productbatch.lang b/public/langs/lt_LT/productbatch.lang
similarity index 100%
rename from htdocs/langs/lt_LT/productbatch.lang
rename to public/langs/lt_LT/productbatch.lang
diff --git a/htdocs/langs/lt_LT/products.lang b/public/langs/lt_LT/products.lang
similarity index 100%
rename from htdocs/langs/lt_LT/products.lang
rename to public/langs/lt_LT/products.lang
diff --git a/htdocs/langs/lt_LT/projects.lang b/public/langs/lt_LT/projects.lang
similarity index 100%
rename from htdocs/langs/lt_LT/projects.lang
rename to public/langs/lt_LT/projects.lang
diff --git a/htdocs/langs/lt_LT/propal.lang b/public/langs/lt_LT/propal.lang
similarity index 100%
rename from htdocs/langs/lt_LT/propal.lang
rename to public/langs/lt_LT/propal.lang
diff --git a/htdocs/langs/lt_LT/receiptprinter.lang b/public/langs/lt_LT/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/lt_LT/receiptprinter.lang
rename to public/langs/lt_LT/receiptprinter.lang
diff --git a/htdocs/langs/lt_LT/resource.lang b/public/langs/lt_LT/resource.lang
similarity index 100%
rename from htdocs/langs/lt_LT/resource.lang
rename to public/langs/lt_LT/resource.lang
diff --git a/htdocs/langs/lt_LT/salaries.lang b/public/langs/lt_LT/salaries.lang
similarity index 100%
rename from htdocs/langs/lt_LT/salaries.lang
rename to public/langs/lt_LT/salaries.lang
diff --git a/htdocs/langs/lt_LT/sendings.lang b/public/langs/lt_LT/sendings.lang
similarity index 100%
rename from htdocs/langs/lt_LT/sendings.lang
rename to public/langs/lt_LT/sendings.lang
diff --git a/htdocs/langs/lt_LT/sms.lang b/public/langs/lt_LT/sms.lang
similarity index 100%
rename from htdocs/langs/lt_LT/sms.lang
rename to public/langs/lt_LT/sms.lang
diff --git a/htdocs/langs/lt_LT/stocks.lang b/public/langs/lt_LT/stocks.lang
similarity index 100%
rename from htdocs/langs/lt_LT/stocks.lang
rename to public/langs/lt_LT/stocks.lang
diff --git a/htdocs/langs/lt_LT/supplier_proposal.lang b/public/langs/lt_LT/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/lt_LT/supplier_proposal.lang
rename to public/langs/lt_LT/supplier_proposal.lang
diff --git a/htdocs/langs/lt_LT/suppliers.lang b/public/langs/lt_LT/suppliers.lang
similarity index 100%
rename from htdocs/langs/lt_LT/suppliers.lang
rename to public/langs/lt_LT/suppliers.lang
diff --git a/htdocs/langs/lt_LT/trips.lang b/public/langs/lt_LT/trips.lang
similarity index 100%
rename from htdocs/langs/lt_LT/trips.lang
rename to public/langs/lt_LT/trips.lang
diff --git a/htdocs/langs/lt_LT/users.lang b/public/langs/lt_LT/users.lang
similarity index 100%
rename from htdocs/langs/lt_LT/users.lang
rename to public/langs/lt_LT/users.lang
diff --git a/htdocs/langs/lt_LT/website.lang b/public/langs/lt_LT/website.lang
similarity index 100%
rename from htdocs/langs/lt_LT/website.lang
rename to public/langs/lt_LT/website.lang
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/public/langs/lt_LT/withdrawals.lang
similarity index 100%
rename from htdocs/langs/lt_LT/withdrawals.lang
rename to public/langs/lt_LT/withdrawals.lang
diff --git a/htdocs/langs/lt_LT/workflow.lang b/public/langs/lt_LT/workflow.lang
similarity index 100%
rename from htdocs/langs/lt_LT/workflow.lang
rename to public/langs/lt_LT/workflow.lang
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/public/langs/lv_LV/accountancy.lang
similarity index 100%
rename from htdocs/langs/lv_LV/accountancy.lang
rename to public/langs/lv_LV/accountancy.lang
diff --git a/htdocs/langs/lv_LV/admin.lang b/public/langs/lv_LV/admin.lang
similarity index 100%
rename from htdocs/langs/lv_LV/admin.lang
rename to public/langs/lv_LV/admin.lang
diff --git a/htdocs/langs/lv_LV/agenda.lang b/public/langs/lv_LV/agenda.lang
similarity index 100%
rename from htdocs/langs/lv_LV/agenda.lang
rename to public/langs/lv_LV/agenda.lang
diff --git a/htdocs/langs/lv_LV/banks.lang b/public/langs/lv_LV/banks.lang
similarity index 100%
rename from htdocs/langs/lv_LV/banks.lang
rename to public/langs/lv_LV/banks.lang
diff --git a/htdocs/langs/lv_LV/bills.lang b/public/langs/lv_LV/bills.lang
similarity index 100%
rename from htdocs/langs/lv_LV/bills.lang
rename to public/langs/lv_LV/bills.lang
diff --git a/htdocs/langs/lv_LV/bookmarks.lang b/public/langs/lv_LV/bookmarks.lang
similarity index 100%
rename from htdocs/langs/lv_LV/bookmarks.lang
rename to public/langs/lv_LV/bookmarks.lang
diff --git a/htdocs/langs/lv_LV/boxes.lang b/public/langs/lv_LV/boxes.lang
similarity index 100%
rename from htdocs/langs/lv_LV/boxes.lang
rename to public/langs/lv_LV/boxes.lang
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/public/langs/lv_LV/cashdesk.lang
similarity index 100%
rename from htdocs/langs/lv_LV/cashdesk.lang
rename to public/langs/lv_LV/cashdesk.lang
diff --git a/htdocs/langs/lv_LV/categories.lang b/public/langs/lv_LV/categories.lang
similarity index 100%
rename from htdocs/langs/lv_LV/categories.lang
rename to public/langs/lv_LV/categories.lang
diff --git a/htdocs/langs/lv_LV/commercial.lang b/public/langs/lv_LV/commercial.lang
similarity index 100%
rename from htdocs/langs/lv_LV/commercial.lang
rename to public/langs/lv_LV/commercial.lang
diff --git a/htdocs/langs/lv_LV/companies.lang b/public/langs/lv_LV/companies.lang
similarity index 100%
rename from htdocs/langs/lv_LV/companies.lang
rename to public/langs/lv_LV/companies.lang
diff --git a/htdocs/langs/lv_LV/compta.lang b/public/langs/lv_LV/compta.lang
similarity index 100%
rename from htdocs/langs/lv_LV/compta.lang
rename to public/langs/lv_LV/compta.lang
diff --git a/htdocs/langs/lv_LV/contracts.lang b/public/langs/lv_LV/contracts.lang
similarity index 100%
rename from htdocs/langs/lv_LV/contracts.lang
rename to public/langs/lv_LV/contracts.lang
diff --git a/htdocs/langs/lv_LV/cron.lang b/public/langs/lv_LV/cron.lang
similarity index 100%
rename from htdocs/langs/lv_LV/cron.lang
rename to public/langs/lv_LV/cron.lang
diff --git a/htdocs/langs/lv_LV/deliveries.lang b/public/langs/lv_LV/deliveries.lang
similarity index 100%
rename from htdocs/langs/lv_LV/deliveries.lang
rename to public/langs/lv_LV/deliveries.lang
diff --git a/htdocs/langs/lv_LV/dict.lang b/public/langs/lv_LV/dict.lang
similarity index 100%
rename from htdocs/langs/lv_LV/dict.lang
rename to public/langs/lv_LV/dict.lang
diff --git a/htdocs/langs/lv_LV/donations.lang b/public/langs/lv_LV/donations.lang
similarity index 100%
rename from htdocs/langs/lv_LV/donations.lang
rename to public/langs/lv_LV/donations.lang
diff --git a/htdocs/langs/lv_LV/ecm.lang b/public/langs/lv_LV/ecm.lang
similarity index 100%
rename from htdocs/langs/lv_LV/ecm.lang
rename to public/langs/lv_LV/ecm.lang
diff --git a/htdocs/langs/lv_LV/errors.lang b/public/langs/lv_LV/errors.lang
similarity index 100%
rename from htdocs/langs/lv_LV/errors.lang
rename to public/langs/lv_LV/errors.lang
diff --git a/htdocs/langs/lv_LV/exports.lang b/public/langs/lv_LV/exports.lang
similarity index 100%
rename from htdocs/langs/lv_LV/exports.lang
rename to public/langs/lv_LV/exports.lang
diff --git a/htdocs/langs/lv_LV/externalsite.lang b/public/langs/lv_LV/externalsite.lang
similarity index 100%
rename from htdocs/langs/lv_LV/externalsite.lang
rename to public/langs/lv_LV/externalsite.lang
diff --git a/htdocs/langs/lv_LV/ftp.lang b/public/langs/lv_LV/ftp.lang
similarity index 100%
rename from htdocs/langs/lv_LV/ftp.lang
rename to public/langs/lv_LV/ftp.lang
diff --git a/htdocs/langs/lv_LV/help.lang b/public/langs/lv_LV/help.lang
similarity index 100%
rename from htdocs/langs/lv_LV/help.lang
rename to public/langs/lv_LV/help.lang
diff --git a/htdocs/langs/lv_LV/holiday.lang b/public/langs/lv_LV/holiday.lang
similarity index 100%
rename from htdocs/langs/lv_LV/holiday.lang
rename to public/langs/lv_LV/holiday.lang
diff --git a/htdocs/langs/lv_LV/hrm.lang b/public/langs/lv_LV/hrm.lang
similarity index 100%
rename from htdocs/langs/lv_LV/hrm.lang
rename to public/langs/lv_LV/hrm.lang
diff --git a/htdocs/langs/lv_LV/incoterm.lang b/public/langs/lv_LV/incoterm.lang
similarity index 100%
rename from htdocs/langs/lv_LV/incoterm.lang
rename to public/langs/lv_LV/incoterm.lang
diff --git a/htdocs/langs/lv_LV/install.lang b/public/langs/lv_LV/install.lang
similarity index 100%
rename from htdocs/langs/lv_LV/install.lang
rename to public/langs/lv_LV/install.lang
diff --git a/htdocs/langs/lv_LV/interventions.lang b/public/langs/lv_LV/interventions.lang
similarity index 100%
rename from htdocs/langs/lv_LV/interventions.lang
rename to public/langs/lv_LV/interventions.lang
diff --git a/htdocs/langs/lv_LV/languages.lang b/public/langs/lv_LV/languages.lang
similarity index 100%
rename from htdocs/langs/lv_LV/languages.lang
rename to public/langs/lv_LV/languages.lang
diff --git a/htdocs/langs/lv_LV/ldap.lang b/public/langs/lv_LV/ldap.lang
similarity index 100%
rename from htdocs/langs/lv_LV/ldap.lang
rename to public/langs/lv_LV/ldap.lang
diff --git a/htdocs/langs/lv_LV/link.lang b/public/langs/lv_LV/link.lang
similarity index 100%
rename from htdocs/langs/lv_LV/link.lang
rename to public/langs/lv_LV/link.lang
diff --git a/htdocs/langs/lv_LV/loan.lang b/public/langs/lv_LV/loan.lang
similarity index 100%
rename from htdocs/langs/lv_LV/loan.lang
rename to public/langs/lv_LV/loan.lang
diff --git a/htdocs/langs/lv_LV/mailmanspip.lang b/public/langs/lv_LV/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/lv_LV/mailmanspip.lang
rename to public/langs/lv_LV/mailmanspip.lang
diff --git a/htdocs/langs/lv_LV/mails.lang b/public/langs/lv_LV/mails.lang
similarity index 100%
rename from htdocs/langs/lv_LV/mails.lang
rename to public/langs/lv_LV/mails.lang
diff --git a/htdocs/langs/lv_LV/main.lang b/public/langs/lv_LV/main.lang
similarity index 100%
rename from htdocs/langs/lv_LV/main.lang
rename to public/langs/lv_LV/main.lang
diff --git a/htdocs/langs/lv_LV/margins.lang b/public/langs/lv_LV/margins.lang
similarity index 100%
rename from htdocs/langs/lv_LV/margins.lang
rename to public/langs/lv_LV/margins.lang
diff --git a/htdocs/langs/lv_LV/members.lang b/public/langs/lv_LV/members.lang
similarity index 100%
rename from htdocs/langs/lv_LV/members.lang
rename to public/langs/lv_LV/members.lang
diff --git a/htdocs/langs/lv_LV/oauth.lang b/public/langs/lv_LV/oauth.lang
similarity index 100%
rename from htdocs/langs/lv_LV/oauth.lang
rename to public/langs/lv_LV/oauth.lang
diff --git a/htdocs/langs/lv_LV/opensurvey.lang b/public/langs/lv_LV/opensurvey.lang
similarity index 100%
rename from htdocs/langs/lv_LV/opensurvey.lang
rename to public/langs/lv_LV/opensurvey.lang
diff --git a/htdocs/langs/lv_LV/orders.lang b/public/langs/lv_LV/orders.lang
similarity index 100%
rename from htdocs/langs/lv_LV/orders.lang
rename to public/langs/lv_LV/orders.lang
diff --git a/htdocs/langs/lv_LV/other.lang b/public/langs/lv_LV/other.lang
similarity index 100%
rename from htdocs/langs/lv_LV/other.lang
rename to public/langs/lv_LV/other.lang
diff --git a/htdocs/langs/lv_LV/paybox.lang b/public/langs/lv_LV/paybox.lang
similarity index 100%
rename from htdocs/langs/lv_LV/paybox.lang
rename to public/langs/lv_LV/paybox.lang
diff --git a/htdocs/langs/lv_LV/paypal.lang b/public/langs/lv_LV/paypal.lang
similarity index 100%
rename from htdocs/langs/lv_LV/paypal.lang
rename to public/langs/lv_LV/paypal.lang
diff --git a/htdocs/langs/lv_LV/printing.lang b/public/langs/lv_LV/printing.lang
similarity index 100%
rename from htdocs/langs/lv_LV/printing.lang
rename to public/langs/lv_LV/printing.lang
diff --git a/htdocs/langs/lv_LV/productbatch.lang b/public/langs/lv_LV/productbatch.lang
similarity index 100%
rename from htdocs/langs/lv_LV/productbatch.lang
rename to public/langs/lv_LV/productbatch.lang
diff --git a/htdocs/langs/lv_LV/products.lang b/public/langs/lv_LV/products.lang
similarity index 100%
rename from htdocs/langs/lv_LV/products.lang
rename to public/langs/lv_LV/products.lang
diff --git a/htdocs/langs/lv_LV/projects.lang b/public/langs/lv_LV/projects.lang
similarity index 100%
rename from htdocs/langs/lv_LV/projects.lang
rename to public/langs/lv_LV/projects.lang
diff --git a/htdocs/langs/lv_LV/propal.lang b/public/langs/lv_LV/propal.lang
similarity index 100%
rename from htdocs/langs/lv_LV/propal.lang
rename to public/langs/lv_LV/propal.lang
diff --git a/htdocs/langs/lv_LV/receiptprinter.lang b/public/langs/lv_LV/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/lv_LV/receiptprinter.lang
rename to public/langs/lv_LV/receiptprinter.lang
diff --git a/htdocs/langs/lv_LV/resource.lang b/public/langs/lv_LV/resource.lang
similarity index 100%
rename from htdocs/langs/lv_LV/resource.lang
rename to public/langs/lv_LV/resource.lang
diff --git a/htdocs/langs/lv_LV/salaries.lang b/public/langs/lv_LV/salaries.lang
similarity index 100%
rename from htdocs/langs/lv_LV/salaries.lang
rename to public/langs/lv_LV/salaries.lang
diff --git a/htdocs/langs/lv_LV/sendings.lang b/public/langs/lv_LV/sendings.lang
similarity index 100%
rename from htdocs/langs/lv_LV/sendings.lang
rename to public/langs/lv_LV/sendings.lang
diff --git a/htdocs/langs/lv_LV/sms.lang b/public/langs/lv_LV/sms.lang
similarity index 100%
rename from htdocs/langs/lv_LV/sms.lang
rename to public/langs/lv_LV/sms.lang
diff --git a/htdocs/langs/lv_LV/stocks.lang b/public/langs/lv_LV/stocks.lang
similarity index 100%
rename from htdocs/langs/lv_LV/stocks.lang
rename to public/langs/lv_LV/stocks.lang
diff --git a/htdocs/langs/lv_LV/supplier_proposal.lang b/public/langs/lv_LV/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/lv_LV/supplier_proposal.lang
rename to public/langs/lv_LV/supplier_proposal.lang
diff --git a/htdocs/langs/lv_LV/suppliers.lang b/public/langs/lv_LV/suppliers.lang
similarity index 100%
rename from htdocs/langs/lv_LV/suppliers.lang
rename to public/langs/lv_LV/suppliers.lang
diff --git a/htdocs/langs/lv_LV/trips.lang b/public/langs/lv_LV/trips.lang
similarity index 100%
rename from htdocs/langs/lv_LV/trips.lang
rename to public/langs/lv_LV/trips.lang
diff --git a/htdocs/langs/lv_LV/users.lang b/public/langs/lv_LV/users.lang
similarity index 100%
rename from htdocs/langs/lv_LV/users.lang
rename to public/langs/lv_LV/users.lang
diff --git a/htdocs/langs/lv_LV/website.lang b/public/langs/lv_LV/website.lang
similarity index 100%
rename from htdocs/langs/lv_LV/website.lang
rename to public/langs/lv_LV/website.lang
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/public/langs/lv_LV/withdrawals.lang
similarity index 100%
rename from htdocs/langs/lv_LV/withdrawals.lang
rename to public/langs/lv_LV/withdrawals.lang
diff --git a/htdocs/langs/lv_LV/workflow.lang b/public/langs/lv_LV/workflow.lang
similarity index 100%
rename from htdocs/langs/lv_LV/workflow.lang
rename to public/langs/lv_LV/workflow.lang
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/public/langs/mk_MK/accountancy.lang
similarity index 100%
rename from htdocs/langs/mk_MK/accountancy.lang
rename to public/langs/mk_MK/accountancy.lang
diff --git a/htdocs/langs/mk_MK/admin.lang b/public/langs/mk_MK/admin.lang
similarity index 100%
rename from htdocs/langs/mk_MK/admin.lang
rename to public/langs/mk_MK/admin.lang
diff --git a/htdocs/langs/mk_MK/agenda.lang b/public/langs/mk_MK/agenda.lang
similarity index 100%
rename from htdocs/langs/mk_MK/agenda.lang
rename to public/langs/mk_MK/agenda.lang
diff --git a/htdocs/langs/mk_MK/banks.lang b/public/langs/mk_MK/banks.lang
similarity index 100%
rename from htdocs/langs/mk_MK/banks.lang
rename to public/langs/mk_MK/banks.lang
diff --git a/htdocs/langs/mk_MK/bills.lang b/public/langs/mk_MK/bills.lang
similarity index 100%
rename from htdocs/langs/mk_MK/bills.lang
rename to public/langs/mk_MK/bills.lang
diff --git a/htdocs/langs/mk_MK/bookmarks.lang b/public/langs/mk_MK/bookmarks.lang
similarity index 100%
rename from htdocs/langs/mk_MK/bookmarks.lang
rename to public/langs/mk_MK/bookmarks.lang
diff --git a/htdocs/langs/mk_MK/boxes.lang b/public/langs/mk_MK/boxes.lang
similarity index 100%
rename from htdocs/langs/mk_MK/boxes.lang
rename to public/langs/mk_MK/boxes.lang
diff --git a/htdocs/langs/mk_MK/cashdesk.lang b/public/langs/mk_MK/cashdesk.lang
similarity index 100%
rename from htdocs/langs/mk_MK/cashdesk.lang
rename to public/langs/mk_MK/cashdesk.lang
diff --git a/htdocs/langs/mk_MK/categories.lang b/public/langs/mk_MK/categories.lang
similarity index 100%
rename from htdocs/langs/mk_MK/categories.lang
rename to public/langs/mk_MK/categories.lang
diff --git a/htdocs/langs/mk_MK/commercial.lang b/public/langs/mk_MK/commercial.lang
similarity index 100%
rename from htdocs/langs/mk_MK/commercial.lang
rename to public/langs/mk_MK/commercial.lang
diff --git a/htdocs/langs/mk_MK/companies.lang b/public/langs/mk_MK/companies.lang
similarity index 100%
rename from htdocs/langs/mk_MK/companies.lang
rename to public/langs/mk_MK/companies.lang
diff --git a/htdocs/langs/mk_MK/compta.lang b/public/langs/mk_MK/compta.lang
similarity index 100%
rename from htdocs/langs/mk_MK/compta.lang
rename to public/langs/mk_MK/compta.lang
diff --git a/htdocs/langs/mk_MK/contracts.lang b/public/langs/mk_MK/contracts.lang
similarity index 100%
rename from htdocs/langs/mk_MK/contracts.lang
rename to public/langs/mk_MK/contracts.lang
diff --git a/htdocs/langs/mk_MK/cron.lang b/public/langs/mk_MK/cron.lang
similarity index 100%
rename from htdocs/langs/mk_MK/cron.lang
rename to public/langs/mk_MK/cron.lang
diff --git a/htdocs/langs/mk_MK/deliveries.lang b/public/langs/mk_MK/deliveries.lang
similarity index 100%
rename from htdocs/langs/mk_MK/deliveries.lang
rename to public/langs/mk_MK/deliveries.lang
diff --git a/htdocs/langs/mk_MK/dict.lang b/public/langs/mk_MK/dict.lang
similarity index 100%
rename from htdocs/langs/mk_MK/dict.lang
rename to public/langs/mk_MK/dict.lang
diff --git a/htdocs/langs/mk_MK/donations.lang b/public/langs/mk_MK/donations.lang
similarity index 100%
rename from htdocs/langs/mk_MK/donations.lang
rename to public/langs/mk_MK/donations.lang
diff --git a/htdocs/langs/mk_MK/ecm.lang b/public/langs/mk_MK/ecm.lang
similarity index 100%
rename from htdocs/langs/mk_MK/ecm.lang
rename to public/langs/mk_MK/ecm.lang
diff --git a/htdocs/langs/mk_MK/errors.lang b/public/langs/mk_MK/errors.lang
similarity index 100%
rename from htdocs/langs/mk_MK/errors.lang
rename to public/langs/mk_MK/errors.lang
diff --git a/htdocs/langs/mk_MK/exports.lang b/public/langs/mk_MK/exports.lang
similarity index 100%
rename from htdocs/langs/mk_MK/exports.lang
rename to public/langs/mk_MK/exports.lang
diff --git a/htdocs/langs/mk_MK/externalsite.lang b/public/langs/mk_MK/externalsite.lang
similarity index 100%
rename from htdocs/langs/mk_MK/externalsite.lang
rename to public/langs/mk_MK/externalsite.lang
diff --git a/htdocs/langs/mk_MK/ftp.lang b/public/langs/mk_MK/ftp.lang
similarity index 100%
rename from htdocs/langs/mk_MK/ftp.lang
rename to public/langs/mk_MK/ftp.lang
diff --git a/htdocs/langs/mk_MK/help.lang b/public/langs/mk_MK/help.lang
similarity index 100%
rename from htdocs/langs/mk_MK/help.lang
rename to public/langs/mk_MK/help.lang
diff --git a/htdocs/langs/mk_MK/holiday.lang b/public/langs/mk_MK/holiday.lang
similarity index 100%
rename from htdocs/langs/mk_MK/holiday.lang
rename to public/langs/mk_MK/holiday.lang
diff --git a/htdocs/langs/mk_MK/hrm.lang b/public/langs/mk_MK/hrm.lang
similarity index 100%
rename from htdocs/langs/mk_MK/hrm.lang
rename to public/langs/mk_MK/hrm.lang
diff --git a/htdocs/langs/mk_MK/incoterm.lang b/public/langs/mk_MK/incoterm.lang
similarity index 100%
rename from htdocs/langs/mk_MK/incoterm.lang
rename to public/langs/mk_MK/incoterm.lang
diff --git a/htdocs/langs/mk_MK/install.lang b/public/langs/mk_MK/install.lang
similarity index 100%
rename from htdocs/langs/mk_MK/install.lang
rename to public/langs/mk_MK/install.lang
diff --git a/htdocs/langs/mk_MK/interventions.lang b/public/langs/mk_MK/interventions.lang
similarity index 100%
rename from htdocs/langs/mk_MK/interventions.lang
rename to public/langs/mk_MK/interventions.lang
diff --git a/htdocs/langs/mk_MK/languages.lang b/public/langs/mk_MK/languages.lang
similarity index 100%
rename from htdocs/langs/mk_MK/languages.lang
rename to public/langs/mk_MK/languages.lang
diff --git a/htdocs/langs/mk_MK/ldap.lang b/public/langs/mk_MK/ldap.lang
similarity index 100%
rename from htdocs/langs/mk_MK/ldap.lang
rename to public/langs/mk_MK/ldap.lang
diff --git a/htdocs/langs/mk_MK/link.lang b/public/langs/mk_MK/link.lang
similarity index 100%
rename from htdocs/langs/mk_MK/link.lang
rename to public/langs/mk_MK/link.lang
diff --git a/htdocs/langs/mk_MK/loan.lang b/public/langs/mk_MK/loan.lang
similarity index 100%
rename from htdocs/langs/mk_MK/loan.lang
rename to public/langs/mk_MK/loan.lang
diff --git a/htdocs/langs/mk_MK/mailmanspip.lang b/public/langs/mk_MK/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/mk_MK/mailmanspip.lang
rename to public/langs/mk_MK/mailmanspip.lang
diff --git a/htdocs/langs/mk_MK/mails.lang b/public/langs/mk_MK/mails.lang
similarity index 100%
rename from htdocs/langs/mk_MK/mails.lang
rename to public/langs/mk_MK/mails.lang
diff --git a/htdocs/langs/mk_MK/main.lang b/public/langs/mk_MK/main.lang
similarity index 100%
rename from htdocs/langs/mk_MK/main.lang
rename to public/langs/mk_MK/main.lang
diff --git a/htdocs/langs/mk_MK/margins.lang b/public/langs/mk_MK/margins.lang
similarity index 100%
rename from htdocs/langs/mk_MK/margins.lang
rename to public/langs/mk_MK/margins.lang
diff --git a/htdocs/langs/mk_MK/members.lang b/public/langs/mk_MK/members.lang
similarity index 100%
rename from htdocs/langs/mk_MK/members.lang
rename to public/langs/mk_MK/members.lang
diff --git a/htdocs/langs/mk_MK/oauth.lang b/public/langs/mk_MK/oauth.lang
similarity index 100%
rename from htdocs/langs/mk_MK/oauth.lang
rename to public/langs/mk_MK/oauth.lang
diff --git a/htdocs/langs/mk_MK/opensurvey.lang b/public/langs/mk_MK/opensurvey.lang
similarity index 100%
rename from htdocs/langs/mk_MK/opensurvey.lang
rename to public/langs/mk_MK/opensurvey.lang
diff --git a/htdocs/langs/mk_MK/orders.lang b/public/langs/mk_MK/orders.lang
similarity index 100%
rename from htdocs/langs/mk_MK/orders.lang
rename to public/langs/mk_MK/orders.lang
diff --git a/htdocs/langs/mk_MK/other.lang b/public/langs/mk_MK/other.lang
similarity index 100%
rename from htdocs/langs/mk_MK/other.lang
rename to public/langs/mk_MK/other.lang
diff --git a/htdocs/langs/mk_MK/paybox.lang b/public/langs/mk_MK/paybox.lang
similarity index 100%
rename from htdocs/langs/mk_MK/paybox.lang
rename to public/langs/mk_MK/paybox.lang
diff --git a/htdocs/langs/mk_MK/paypal.lang b/public/langs/mk_MK/paypal.lang
similarity index 100%
rename from htdocs/langs/mk_MK/paypal.lang
rename to public/langs/mk_MK/paypal.lang
diff --git a/htdocs/langs/mk_MK/printing.lang b/public/langs/mk_MK/printing.lang
similarity index 100%
rename from htdocs/langs/mk_MK/printing.lang
rename to public/langs/mk_MK/printing.lang
diff --git a/htdocs/langs/mk_MK/productbatch.lang b/public/langs/mk_MK/productbatch.lang
similarity index 100%
rename from htdocs/langs/mk_MK/productbatch.lang
rename to public/langs/mk_MK/productbatch.lang
diff --git a/htdocs/langs/mk_MK/products.lang b/public/langs/mk_MK/products.lang
similarity index 100%
rename from htdocs/langs/mk_MK/products.lang
rename to public/langs/mk_MK/products.lang
diff --git a/htdocs/langs/mk_MK/projects.lang b/public/langs/mk_MK/projects.lang
similarity index 100%
rename from htdocs/langs/mk_MK/projects.lang
rename to public/langs/mk_MK/projects.lang
diff --git a/htdocs/langs/mk_MK/propal.lang b/public/langs/mk_MK/propal.lang
similarity index 100%
rename from htdocs/langs/mk_MK/propal.lang
rename to public/langs/mk_MK/propal.lang
diff --git a/htdocs/langs/mk_MK/receiptprinter.lang b/public/langs/mk_MK/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/mk_MK/receiptprinter.lang
rename to public/langs/mk_MK/receiptprinter.lang
diff --git a/htdocs/langs/mk_MK/resource.lang b/public/langs/mk_MK/resource.lang
similarity index 100%
rename from htdocs/langs/mk_MK/resource.lang
rename to public/langs/mk_MK/resource.lang
diff --git a/htdocs/langs/mk_MK/salaries.lang b/public/langs/mk_MK/salaries.lang
similarity index 100%
rename from htdocs/langs/mk_MK/salaries.lang
rename to public/langs/mk_MK/salaries.lang
diff --git a/htdocs/langs/mk_MK/sendings.lang b/public/langs/mk_MK/sendings.lang
similarity index 100%
rename from htdocs/langs/mk_MK/sendings.lang
rename to public/langs/mk_MK/sendings.lang
diff --git a/htdocs/langs/mk_MK/sms.lang b/public/langs/mk_MK/sms.lang
similarity index 100%
rename from htdocs/langs/mk_MK/sms.lang
rename to public/langs/mk_MK/sms.lang
diff --git a/htdocs/langs/mk_MK/stocks.lang b/public/langs/mk_MK/stocks.lang
similarity index 100%
rename from htdocs/langs/mk_MK/stocks.lang
rename to public/langs/mk_MK/stocks.lang
diff --git a/htdocs/langs/mk_MK/supplier_proposal.lang b/public/langs/mk_MK/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/mk_MK/supplier_proposal.lang
rename to public/langs/mk_MK/supplier_proposal.lang
diff --git a/htdocs/langs/mk_MK/suppliers.lang b/public/langs/mk_MK/suppliers.lang
similarity index 100%
rename from htdocs/langs/mk_MK/suppliers.lang
rename to public/langs/mk_MK/suppliers.lang
diff --git a/htdocs/langs/mk_MK/trips.lang b/public/langs/mk_MK/trips.lang
similarity index 100%
rename from htdocs/langs/mk_MK/trips.lang
rename to public/langs/mk_MK/trips.lang
diff --git a/htdocs/langs/mk_MK/users.lang b/public/langs/mk_MK/users.lang
similarity index 100%
rename from htdocs/langs/mk_MK/users.lang
rename to public/langs/mk_MK/users.lang
diff --git a/htdocs/langs/mk_MK/website.lang b/public/langs/mk_MK/website.lang
similarity index 100%
rename from htdocs/langs/mk_MK/website.lang
rename to public/langs/mk_MK/website.lang
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/public/langs/mk_MK/withdrawals.lang
similarity index 100%
rename from htdocs/langs/mk_MK/withdrawals.lang
rename to public/langs/mk_MK/withdrawals.lang
diff --git a/htdocs/langs/mk_MK/workflow.lang b/public/langs/mk_MK/workflow.lang
similarity index 100%
rename from htdocs/langs/mk_MK/workflow.lang
rename to public/langs/mk_MK/workflow.lang
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/public/langs/mn_MN/accountancy.lang
similarity index 100%
rename from htdocs/langs/mn_MN/accountancy.lang
rename to public/langs/mn_MN/accountancy.lang
diff --git a/htdocs/langs/mn_MN/admin.lang b/public/langs/mn_MN/admin.lang
similarity index 100%
rename from htdocs/langs/mn_MN/admin.lang
rename to public/langs/mn_MN/admin.lang
diff --git a/htdocs/langs/mn_MN/agenda.lang b/public/langs/mn_MN/agenda.lang
similarity index 100%
rename from htdocs/langs/mn_MN/agenda.lang
rename to public/langs/mn_MN/agenda.lang
diff --git a/htdocs/langs/mn_MN/banks.lang b/public/langs/mn_MN/banks.lang
similarity index 100%
rename from htdocs/langs/mn_MN/banks.lang
rename to public/langs/mn_MN/banks.lang
diff --git a/htdocs/langs/mn_MN/bills.lang b/public/langs/mn_MN/bills.lang
similarity index 100%
rename from htdocs/langs/mn_MN/bills.lang
rename to public/langs/mn_MN/bills.lang
diff --git a/htdocs/langs/mn_MN/bookmarks.lang b/public/langs/mn_MN/bookmarks.lang
similarity index 100%
rename from htdocs/langs/mn_MN/bookmarks.lang
rename to public/langs/mn_MN/bookmarks.lang
diff --git a/htdocs/langs/mn_MN/boxes.lang b/public/langs/mn_MN/boxes.lang
similarity index 100%
rename from htdocs/langs/mn_MN/boxes.lang
rename to public/langs/mn_MN/boxes.lang
diff --git a/htdocs/langs/mn_MN/cashdesk.lang b/public/langs/mn_MN/cashdesk.lang
similarity index 100%
rename from htdocs/langs/mn_MN/cashdesk.lang
rename to public/langs/mn_MN/cashdesk.lang
diff --git a/htdocs/langs/mn_MN/categories.lang b/public/langs/mn_MN/categories.lang
similarity index 100%
rename from htdocs/langs/mn_MN/categories.lang
rename to public/langs/mn_MN/categories.lang
diff --git a/htdocs/langs/mn_MN/commercial.lang b/public/langs/mn_MN/commercial.lang
similarity index 100%
rename from htdocs/langs/mn_MN/commercial.lang
rename to public/langs/mn_MN/commercial.lang
diff --git a/htdocs/langs/mn_MN/companies.lang b/public/langs/mn_MN/companies.lang
similarity index 100%
rename from htdocs/langs/mn_MN/companies.lang
rename to public/langs/mn_MN/companies.lang
diff --git a/htdocs/langs/mn_MN/compta.lang b/public/langs/mn_MN/compta.lang
similarity index 100%
rename from htdocs/langs/mn_MN/compta.lang
rename to public/langs/mn_MN/compta.lang
diff --git a/htdocs/langs/mn_MN/contracts.lang b/public/langs/mn_MN/contracts.lang
similarity index 100%
rename from htdocs/langs/mn_MN/contracts.lang
rename to public/langs/mn_MN/contracts.lang
diff --git a/htdocs/langs/mn_MN/cron.lang b/public/langs/mn_MN/cron.lang
similarity index 100%
rename from htdocs/langs/mn_MN/cron.lang
rename to public/langs/mn_MN/cron.lang
diff --git a/htdocs/langs/mn_MN/deliveries.lang b/public/langs/mn_MN/deliveries.lang
similarity index 100%
rename from htdocs/langs/mn_MN/deliveries.lang
rename to public/langs/mn_MN/deliveries.lang
diff --git a/htdocs/langs/mn_MN/dict.lang b/public/langs/mn_MN/dict.lang
similarity index 100%
rename from htdocs/langs/mn_MN/dict.lang
rename to public/langs/mn_MN/dict.lang
diff --git a/htdocs/langs/mn_MN/donations.lang b/public/langs/mn_MN/donations.lang
similarity index 100%
rename from htdocs/langs/mn_MN/donations.lang
rename to public/langs/mn_MN/donations.lang
diff --git a/htdocs/langs/mn_MN/ecm.lang b/public/langs/mn_MN/ecm.lang
similarity index 100%
rename from htdocs/langs/mn_MN/ecm.lang
rename to public/langs/mn_MN/ecm.lang
diff --git a/htdocs/langs/mn_MN/errors.lang b/public/langs/mn_MN/errors.lang
similarity index 100%
rename from htdocs/langs/mn_MN/errors.lang
rename to public/langs/mn_MN/errors.lang
diff --git a/htdocs/langs/mn_MN/exports.lang b/public/langs/mn_MN/exports.lang
similarity index 100%
rename from htdocs/langs/mn_MN/exports.lang
rename to public/langs/mn_MN/exports.lang
diff --git a/htdocs/langs/mn_MN/externalsite.lang b/public/langs/mn_MN/externalsite.lang
similarity index 100%
rename from htdocs/langs/mn_MN/externalsite.lang
rename to public/langs/mn_MN/externalsite.lang
diff --git a/htdocs/langs/mn_MN/ftp.lang b/public/langs/mn_MN/ftp.lang
similarity index 100%
rename from htdocs/langs/mn_MN/ftp.lang
rename to public/langs/mn_MN/ftp.lang
diff --git a/htdocs/langs/mn_MN/help.lang b/public/langs/mn_MN/help.lang
similarity index 100%
rename from htdocs/langs/mn_MN/help.lang
rename to public/langs/mn_MN/help.lang
diff --git a/htdocs/langs/mn_MN/holiday.lang b/public/langs/mn_MN/holiday.lang
similarity index 100%
rename from htdocs/langs/mn_MN/holiday.lang
rename to public/langs/mn_MN/holiday.lang
diff --git a/htdocs/langs/mn_MN/hrm.lang b/public/langs/mn_MN/hrm.lang
similarity index 100%
rename from htdocs/langs/mn_MN/hrm.lang
rename to public/langs/mn_MN/hrm.lang
diff --git a/htdocs/langs/mn_MN/incoterm.lang b/public/langs/mn_MN/incoterm.lang
similarity index 100%
rename from htdocs/langs/mn_MN/incoterm.lang
rename to public/langs/mn_MN/incoterm.lang
diff --git a/htdocs/langs/mn_MN/install.lang b/public/langs/mn_MN/install.lang
similarity index 100%
rename from htdocs/langs/mn_MN/install.lang
rename to public/langs/mn_MN/install.lang
diff --git a/htdocs/langs/mn_MN/interventions.lang b/public/langs/mn_MN/interventions.lang
similarity index 100%
rename from htdocs/langs/mn_MN/interventions.lang
rename to public/langs/mn_MN/interventions.lang
diff --git a/htdocs/langs/mn_MN/languages.lang b/public/langs/mn_MN/languages.lang
similarity index 100%
rename from htdocs/langs/mn_MN/languages.lang
rename to public/langs/mn_MN/languages.lang
diff --git a/htdocs/langs/mn_MN/ldap.lang b/public/langs/mn_MN/ldap.lang
similarity index 100%
rename from htdocs/langs/mn_MN/ldap.lang
rename to public/langs/mn_MN/ldap.lang
diff --git a/htdocs/langs/mn_MN/link.lang b/public/langs/mn_MN/link.lang
similarity index 100%
rename from htdocs/langs/mn_MN/link.lang
rename to public/langs/mn_MN/link.lang
diff --git a/htdocs/langs/mn_MN/loan.lang b/public/langs/mn_MN/loan.lang
similarity index 100%
rename from htdocs/langs/mn_MN/loan.lang
rename to public/langs/mn_MN/loan.lang
diff --git a/htdocs/langs/mn_MN/mailmanspip.lang b/public/langs/mn_MN/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/mn_MN/mailmanspip.lang
rename to public/langs/mn_MN/mailmanspip.lang
diff --git a/htdocs/langs/mn_MN/mails.lang b/public/langs/mn_MN/mails.lang
similarity index 100%
rename from htdocs/langs/mn_MN/mails.lang
rename to public/langs/mn_MN/mails.lang
diff --git a/htdocs/langs/mn_MN/main.lang b/public/langs/mn_MN/main.lang
similarity index 100%
rename from htdocs/langs/mn_MN/main.lang
rename to public/langs/mn_MN/main.lang
diff --git a/htdocs/langs/mn_MN/margins.lang b/public/langs/mn_MN/margins.lang
similarity index 100%
rename from htdocs/langs/mn_MN/margins.lang
rename to public/langs/mn_MN/margins.lang
diff --git a/htdocs/langs/mn_MN/members.lang b/public/langs/mn_MN/members.lang
similarity index 100%
rename from htdocs/langs/mn_MN/members.lang
rename to public/langs/mn_MN/members.lang
diff --git a/htdocs/langs/mn_MN/oauth.lang b/public/langs/mn_MN/oauth.lang
similarity index 100%
rename from htdocs/langs/mn_MN/oauth.lang
rename to public/langs/mn_MN/oauth.lang
diff --git a/htdocs/langs/mn_MN/opensurvey.lang b/public/langs/mn_MN/opensurvey.lang
similarity index 100%
rename from htdocs/langs/mn_MN/opensurvey.lang
rename to public/langs/mn_MN/opensurvey.lang
diff --git a/htdocs/langs/mn_MN/orders.lang b/public/langs/mn_MN/orders.lang
similarity index 100%
rename from htdocs/langs/mn_MN/orders.lang
rename to public/langs/mn_MN/orders.lang
diff --git a/htdocs/langs/mn_MN/other.lang b/public/langs/mn_MN/other.lang
similarity index 100%
rename from htdocs/langs/mn_MN/other.lang
rename to public/langs/mn_MN/other.lang
diff --git a/htdocs/langs/mn_MN/paybox.lang b/public/langs/mn_MN/paybox.lang
similarity index 100%
rename from htdocs/langs/mn_MN/paybox.lang
rename to public/langs/mn_MN/paybox.lang
diff --git a/htdocs/langs/mn_MN/paypal.lang b/public/langs/mn_MN/paypal.lang
similarity index 100%
rename from htdocs/langs/mn_MN/paypal.lang
rename to public/langs/mn_MN/paypal.lang
diff --git a/htdocs/langs/mn_MN/printing.lang b/public/langs/mn_MN/printing.lang
similarity index 100%
rename from htdocs/langs/mn_MN/printing.lang
rename to public/langs/mn_MN/printing.lang
diff --git a/htdocs/langs/mn_MN/productbatch.lang b/public/langs/mn_MN/productbatch.lang
similarity index 100%
rename from htdocs/langs/mn_MN/productbatch.lang
rename to public/langs/mn_MN/productbatch.lang
diff --git a/htdocs/langs/mn_MN/products.lang b/public/langs/mn_MN/products.lang
similarity index 100%
rename from htdocs/langs/mn_MN/products.lang
rename to public/langs/mn_MN/products.lang
diff --git a/htdocs/langs/mn_MN/projects.lang b/public/langs/mn_MN/projects.lang
similarity index 100%
rename from htdocs/langs/mn_MN/projects.lang
rename to public/langs/mn_MN/projects.lang
diff --git a/htdocs/langs/mn_MN/propal.lang b/public/langs/mn_MN/propal.lang
similarity index 100%
rename from htdocs/langs/mn_MN/propal.lang
rename to public/langs/mn_MN/propal.lang
diff --git a/htdocs/langs/mn_MN/receiptprinter.lang b/public/langs/mn_MN/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/mn_MN/receiptprinter.lang
rename to public/langs/mn_MN/receiptprinter.lang
diff --git a/htdocs/langs/mn_MN/resource.lang b/public/langs/mn_MN/resource.lang
similarity index 100%
rename from htdocs/langs/mn_MN/resource.lang
rename to public/langs/mn_MN/resource.lang
diff --git a/htdocs/langs/mn_MN/salaries.lang b/public/langs/mn_MN/salaries.lang
similarity index 100%
rename from htdocs/langs/mn_MN/salaries.lang
rename to public/langs/mn_MN/salaries.lang
diff --git a/htdocs/langs/mn_MN/sendings.lang b/public/langs/mn_MN/sendings.lang
similarity index 100%
rename from htdocs/langs/mn_MN/sendings.lang
rename to public/langs/mn_MN/sendings.lang
diff --git a/htdocs/langs/mn_MN/sms.lang b/public/langs/mn_MN/sms.lang
similarity index 100%
rename from htdocs/langs/mn_MN/sms.lang
rename to public/langs/mn_MN/sms.lang
diff --git a/htdocs/langs/mn_MN/stocks.lang b/public/langs/mn_MN/stocks.lang
similarity index 100%
rename from htdocs/langs/mn_MN/stocks.lang
rename to public/langs/mn_MN/stocks.lang
diff --git a/htdocs/langs/mn_MN/supplier_proposal.lang b/public/langs/mn_MN/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/mn_MN/supplier_proposal.lang
rename to public/langs/mn_MN/supplier_proposal.lang
diff --git a/htdocs/langs/mn_MN/suppliers.lang b/public/langs/mn_MN/suppliers.lang
similarity index 100%
rename from htdocs/langs/mn_MN/suppliers.lang
rename to public/langs/mn_MN/suppliers.lang
diff --git a/htdocs/langs/mn_MN/trips.lang b/public/langs/mn_MN/trips.lang
similarity index 100%
rename from htdocs/langs/mn_MN/trips.lang
rename to public/langs/mn_MN/trips.lang
diff --git a/htdocs/langs/mn_MN/users.lang b/public/langs/mn_MN/users.lang
similarity index 100%
rename from htdocs/langs/mn_MN/users.lang
rename to public/langs/mn_MN/users.lang
diff --git a/htdocs/langs/mn_MN/website.lang b/public/langs/mn_MN/website.lang
similarity index 100%
rename from htdocs/langs/mn_MN/website.lang
rename to public/langs/mn_MN/website.lang
diff --git a/htdocs/langs/mn_MN/withdrawals.lang b/public/langs/mn_MN/withdrawals.lang
similarity index 100%
rename from htdocs/langs/mn_MN/withdrawals.lang
rename to public/langs/mn_MN/withdrawals.lang
diff --git a/htdocs/langs/mn_MN/workflow.lang b/public/langs/mn_MN/workflow.lang
similarity index 100%
rename from htdocs/langs/mn_MN/workflow.lang
rename to public/langs/mn_MN/workflow.lang
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/public/langs/nb_NO/accountancy.lang
similarity index 100%
rename from htdocs/langs/nb_NO/accountancy.lang
rename to public/langs/nb_NO/accountancy.lang
diff --git a/htdocs/langs/nb_NO/admin.lang b/public/langs/nb_NO/admin.lang
similarity index 100%
rename from htdocs/langs/nb_NO/admin.lang
rename to public/langs/nb_NO/admin.lang
diff --git a/htdocs/langs/nb_NO/agenda.lang b/public/langs/nb_NO/agenda.lang
similarity index 100%
rename from htdocs/langs/nb_NO/agenda.lang
rename to public/langs/nb_NO/agenda.lang
diff --git a/htdocs/langs/nb_NO/banks.lang b/public/langs/nb_NO/banks.lang
similarity index 100%
rename from htdocs/langs/nb_NO/banks.lang
rename to public/langs/nb_NO/banks.lang
diff --git a/htdocs/langs/nb_NO/bills.lang b/public/langs/nb_NO/bills.lang
similarity index 100%
rename from htdocs/langs/nb_NO/bills.lang
rename to public/langs/nb_NO/bills.lang
diff --git a/htdocs/langs/nb_NO/bookmarks.lang b/public/langs/nb_NO/bookmarks.lang
similarity index 100%
rename from htdocs/langs/nb_NO/bookmarks.lang
rename to public/langs/nb_NO/bookmarks.lang
diff --git a/htdocs/langs/nb_NO/boxes.lang b/public/langs/nb_NO/boxes.lang
similarity index 100%
rename from htdocs/langs/nb_NO/boxes.lang
rename to public/langs/nb_NO/boxes.lang
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/public/langs/nb_NO/cashdesk.lang
similarity index 100%
rename from htdocs/langs/nb_NO/cashdesk.lang
rename to public/langs/nb_NO/cashdesk.lang
diff --git a/htdocs/langs/nb_NO/categories.lang b/public/langs/nb_NO/categories.lang
similarity index 100%
rename from htdocs/langs/nb_NO/categories.lang
rename to public/langs/nb_NO/categories.lang
diff --git a/htdocs/langs/nb_NO/commercial.lang b/public/langs/nb_NO/commercial.lang
similarity index 100%
rename from htdocs/langs/nb_NO/commercial.lang
rename to public/langs/nb_NO/commercial.lang
diff --git a/htdocs/langs/nb_NO/companies.lang b/public/langs/nb_NO/companies.lang
similarity index 100%
rename from htdocs/langs/nb_NO/companies.lang
rename to public/langs/nb_NO/companies.lang
diff --git a/htdocs/langs/nb_NO/compta.lang b/public/langs/nb_NO/compta.lang
similarity index 100%
rename from htdocs/langs/nb_NO/compta.lang
rename to public/langs/nb_NO/compta.lang
diff --git a/htdocs/langs/nb_NO/contracts.lang b/public/langs/nb_NO/contracts.lang
similarity index 100%
rename from htdocs/langs/nb_NO/contracts.lang
rename to public/langs/nb_NO/contracts.lang
diff --git a/htdocs/langs/nb_NO/cron.lang b/public/langs/nb_NO/cron.lang
similarity index 100%
rename from htdocs/langs/nb_NO/cron.lang
rename to public/langs/nb_NO/cron.lang
diff --git a/htdocs/langs/nb_NO/deliveries.lang b/public/langs/nb_NO/deliveries.lang
similarity index 100%
rename from htdocs/langs/nb_NO/deliveries.lang
rename to public/langs/nb_NO/deliveries.lang
diff --git a/htdocs/langs/nb_NO/dict.lang b/public/langs/nb_NO/dict.lang
similarity index 100%
rename from htdocs/langs/nb_NO/dict.lang
rename to public/langs/nb_NO/dict.lang
diff --git a/htdocs/langs/nb_NO/donations.lang b/public/langs/nb_NO/donations.lang
similarity index 100%
rename from htdocs/langs/nb_NO/donations.lang
rename to public/langs/nb_NO/donations.lang
diff --git a/htdocs/langs/nb_NO/ecm.lang b/public/langs/nb_NO/ecm.lang
similarity index 100%
rename from htdocs/langs/nb_NO/ecm.lang
rename to public/langs/nb_NO/ecm.lang
diff --git a/htdocs/langs/nb_NO/errors.lang b/public/langs/nb_NO/errors.lang
similarity index 100%
rename from htdocs/langs/nb_NO/errors.lang
rename to public/langs/nb_NO/errors.lang
diff --git a/htdocs/langs/nb_NO/exports.lang b/public/langs/nb_NO/exports.lang
similarity index 100%
rename from htdocs/langs/nb_NO/exports.lang
rename to public/langs/nb_NO/exports.lang
diff --git a/htdocs/langs/nb_NO/externalsite.lang b/public/langs/nb_NO/externalsite.lang
similarity index 100%
rename from htdocs/langs/nb_NO/externalsite.lang
rename to public/langs/nb_NO/externalsite.lang
diff --git a/htdocs/langs/nb_NO/ftp.lang b/public/langs/nb_NO/ftp.lang
similarity index 100%
rename from htdocs/langs/nb_NO/ftp.lang
rename to public/langs/nb_NO/ftp.lang
diff --git a/htdocs/langs/nb_NO/help.lang b/public/langs/nb_NO/help.lang
similarity index 100%
rename from htdocs/langs/nb_NO/help.lang
rename to public/langs/nb_NO/help.lang
diff --git a/htdocs/langs/nb_NO/holiday.lang b/public/langs/nb_NO/holiday.lang
similarity index 100%
rename from htdocs/langs/nb_NO/holiday.lang
rename to public/langs/nb_NO/holiday.lang
diff --git a/htdocs/langs/nb_NO/hrm.lang b/public/langs/nb_NO/hrm.lang
similarity index 100%
rename from htdocs/langs/nb_NO/hrm.lang
rename to public/langs/nb_NO/hrm.lang
diff --git a/htdocs/langs/nb_NO/incoterm.lang b/public/langs/nb_NO/incoterm.lang
similarity index 100%
rename from htdocs/langs/nb_NO/incoterm.lang
rename to public/langs/nb_NO/incoterm.lang
diff --git a/htdocs/langs/nb_NO/install.lang b/public/langs/nb_NO/install.lang
similarity index 100%
rename from htdocs/langs/nb_NO/install.lang
rename to public/langs/nb_NO/install.lang
diff --git a/htdocs/langs/nb_NO/interventions.lang b/public/langs/nb_NO/interventions.lang
similarity index 100%
rename from htdocs/langs/nb_NO/interventions.lang
rename to public/langs/nb_NO/interventions.lang
diff --git a/htdocs/langs/nb_NO/languages.lang b/public/langs/nb_NO/languages.lang
similarity index 100%
rename from htdocs/langs/nb_NO/languages.lang
rename to public/langs/nb_NO/languages.lang
diff --git a/htdocs/langs/nb_NO/ldap.lang b/public/langs/nb_NO/ldap.lang
similarity index 100%
rename from htdocs/langs/nb_NO/ldap.lang
rename to public/langs/nb_NO/ldap.lang
diff --git a/htdocs/langs/nb_NO/link.lang b/public/langs/nb_NO/link.lang
similarity index 100%
rename from htdocs/langs/nb_NO/link.lang
rename to public/langs/nb_NO/link.lang
diff --git a/htdocs/langs/nb_NO/loan.lang b/public/langs/nb_NO/loan.lang
similarity index 100%
rename from htdocs/langs/nb_NO/loan.lang
rename to public/langs/nb_NO/loan.lang
diff --git a/htdocs/langs/nb_NO/mailmanspip.lang b/public/langs/nb_NO/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/nb_NO/mailmanspip.lang
rename to public/langs/nb_NO/mailmanspip.lang
diff --git a/htdocs/langs/nb_NO/mails.lang b/public/langs/nb_NO/mails.lang
similarity index 100%
rename from htdocs/langs/nb_NO/mails.lang
rename to public/langs/nb_NO/mails.lang
diff --git a/htdocs/langs/nb_NO/main.lang b/public/langs/nb_NO/main.lang
similarity index 100%
rename from htdocs/langs/nb_NO/main.lang
rename to public/langs/nb_NO/main.lang
diff --git a/htdocs/langs/nb_NO/margins.lang b/public/langs/nb_NO/margins.lang
similarity index 100%
rename from htdocs/langs/nb_NO/margins.lang
rename to public/langs/nb_NO/margins.lang
diff --git a/htdocs/langs/nb_NO/members.lang b/public/langs/nb_NO/members.lang
similarity index 100%
rename from htdocs/langs/nb_NO/members.lang
rename to public/langs/nb_NO/members.lang
diff --git a/htdocs/langs/nb_NO/oauth.lang b/public/langs/nb_NO/oauth.lang
similarity index 100%
rename from htdocs/langs/nb_NO/oauth.lang
rename to public/langs/nb_NO/oauth.lang
diff --git a/htdocs/langs/nb_NO/opensurvey.lang b/public/langs/nb_NO/opensurvey.lang
similarity index 100%
rename from htdocs/langs/nb_NO/opensurvey.lang
rename to public/langs/nb_NO/opensurvey.lang
diff --git a/htdocs/langs/nb_NO/orders.lang b/public/langs/nb_NO/orders.lang
similarity index 100%
rename from htdocs/langs/nb_NO/orders.lang
rename to public/langs/nb_NO/orders.lang
diff --git a/htdocs/langs/nb_NO/other.lang b/public/langs/nb_NO/other.lang
similarity index 100%
rename from htdocs/langs/nb_NO/other.lang
rename to public/langs/nb_NO/other.lang
diff --git a/htdocs/langs/nb_NO/paybox.lang b/public/langs/nb_NO/paybox.lang
similarity index 100%
rename from htdocs/langs/nb_NO/paybox.lang
rename to public/langs/nb_NO/paybox.lang
diff --git a/htdocs/langs/nb_NO/paypal.lang b/public/langs/nb_NO/paypal.lang
similarity index 100%
rename from htdocs/langs/nb_NO/paypal.lang
rename to public/langs/nb_NO/paypal.lang
diff --git a/htdocs/langs/nb_NO/printing.lang b/public/langs/nb_NO/printing.lang
similarity index 100%
rename from htdocs/langs/nb_NO/printing.lang
rename to public/langs/nb_NO/printing.lang
diff --git a/htdocs/langs/nb_NO/productbatch.lang b/public/langs/nb_NO/productbatch.lang
similarity index 100%
rename from htdocs/langs/nb_NO/productbatch.lang
rename to public/langs/nb_NO/productbatch.lang
diff --git a/htdocs/langs/nb_NO/products.lang b/public/langs/nb_NO/products.lang
similarity index 100%
rename from htdocs/langs/nb_NO/products.lang
rename to public/langs/nb_NO/products.lang
diff --git a/htdocs/langs/nb_NO/projects.lang b/public/langs/nb_NO/projects.lang
similarity index 100%
rename from htdocs/langs/nb_NO/projects.lang
rename to public/langs/nb_NO/projects.lang
diff --git a/htdocs/langs/nb_NO/propal.lang b/public/langs/nb_NO/propal.lang
similarity index 100%
rename from htdocs/langs/nb_NO/propal.lang
rename to public/langs/nb_NO/propal.lang
diff --git a/htdocs/langs/nb_NO/receiptprinter.lang b/public/langs/nb_NO/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/nb_NO/receiptprinter.lang
rename to public/langs/nb_NO/receiptprinter.lang
diff --git a/htdocs/langs/nb_NO/resource.lang b/public/langs/nb_NO/resource.lang
similarity index 100%
rename from htdocs/langs/nb_NO/resource.lang
rename to public/langs/nb_NO/resource.lang
diff --git a/htdocs/langs/nb_NO/salaries.lang b/public/langs/nb_NO/salaries.lang
similarity index 100%
rename from htdocs/langs/nb_NO/salaries.lang
rename to public/langs/nb_NO/salaries.lang
diff --git a/htdocs/langs/nb_NO/sendings.lang b/public/langs/nb_NO/sendings.lang
similarity index 100%
rename from htdocs/langs/nb_NO/sendings.lang
rename to public/langs/nb_NO/sendings.lang
diff --git a/htdocs/langs/nb_NO/sms.lang b/public/langs/nb_NO/sms.lang
similarity index 100%
rename from htdocs/langs/nb_NO/sms.lang
rename to public/langs/nb_NO/sms.lang
diff --git a/htdocs/langs/nb_NO/stocks.lang b/public/langs/nb_NO/stocks.lang
similarity index 100%
rename from htdocs/langs/nb_NO/stocks.lang
rename to public/langs/nb_NO/stocks.lang
diff --git a/htdocs/langs/nb_NO/supplier_proposal.lang b/public/langs/nb_NO/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/nb_NO/supplier_proposal.lang
rename to public/langs/nb_NO/supplier_proposal.lang
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/public/langs/nb_NO/suppliers.lang
similarity index 100%
rename from htdocs/langs/nb_NO/suppliers.lang
rename to public/langs/nb_NO/suppliers.lang
diff --git a/htdocs/langs/nb_NO/trips.lang b/public/langs/nb_NO/trips.lang
similarity index 100%
rename from htdocs/langs/nb_NO/trips.lang
rename to public/langs/nb_NO/trips.lang
diff --git a/htdocs/langs/nb_NO/users.lang b/public/langs/nb_NO/users.lang
similarity index 100%
rename from htdocs/langs/nb_NO/users.lang
rename to public/langs/nb_NO/users.lang
diff --git a/htdocs/langs/nb_NO/website.lang b/public/langs/nb_NO/website.lang
similarity index 100%
rename from htdocs/langs/nb_NO/website.lang
rename to public/langs/nb_NO/website.lang
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/public/langs/nb_NO/withdrawals.lang
similarity index 100%
rename from htdocs/langs/nb_NO/withdrawals.lang
rename to public/langs/nb_NO/withdrawals.lang
diff --git a/htdocs/langs/nb_NO/workflow.lang b/public/langs/nb_NO/workflow.lang
similarity index 100%
rename from htdocs/langs/nb_NO/workflow.lang
rename to public/langs/nb_NO/workflow.lang
diff --git a/htdocs/langs/nl_BE/accountancy.lang b/public/langs/nl_BE/accountancy.lang
similarity index 100%
rename from htdocs/langs/nl_BE/accountancy.lang
rename to public/langs/nl_BE/accountancy.lang
diff --git a/htdocs/langs/nl_BE/admin.lang b/public/langs/nl_BE/admin.lang
similarity index 100%
rename from htdocs/langs/nl_BE/admin.lang
rename to public/langs/nl_BE/admin.lang
diff --git a/htdocs/langs/nl_BE/agenda.lang b/public/langs/nl_BE/agenda.lang
similarity index 100%
rename from htdocs/langs/nl_BE/agenda.lang
rename to public/langs/nl_BE/agenda.lang
diff --git a/htdocs/langs/nl_BE/banks.lang b/public/langs/nl_BE/banks.lang
similarity index 100%
rename from htdocs/langs/nl_BE/banks.lang
rename to public/langs/nl_BE/banks.lang
diff --git a/htdocs/langs/nl_BE/bills.lang b/public/langs/nl_BE/bills.lang
similarity index 100%
rename from htdocs/langs/nl_BE/bills.lang
rename to public/langs/nl_BE/bills.lang
diff --git a/htdocs/langs/nl_BE/bookmarks.lang b/public/langs/nl_BE/bookmarks.lang
similarity index 100%
rename from htdocs/langs/nl_BE/bookmarks.lang
rename to public/langs/nl_BE/bookmarks.lang
diff --git a/htdocs/langs/nl_BE/boxes.lang b/public/langs/nl_BE/boxes.lang
similarity index 100%
rename from htdocs/langs/nl_BE/boxes.lang
rename to public/langs/nl_BE/boxes.lang
diff --git a/htdocs/langs/nl_BE/cashdesk.lang b/public/langs/nl_BE/cashdesk.lang
similarity index 100%
rename from htdocs/langs/nl_BE/cashdesk.lang
rename to public/langs/nl_BE/cashdesk.lang
diff --git a/htdocs/langs/nl_BE/categories.lang b/public/langs/nl_BE/categories.lang
similarity index 100%
rename from htdocs/langs/nl_BE/categories.lang
rename to public/langs/nl_BE/categories.lang
diff --git a/htdocs/langs/nl_BE/commercial.lang b/public/langs/nl_BE/commercial.lang
similarity index 100%
rename from htdocs/langs/nl_BE/commercial.lang
rename to public/langs/nl_BE/commercial.lang
diff --git a/htdocs/langs/nl_BE/companies.lang b/public/langs/nl_BE/companies.lang
similarity index 100%
rename from htdocs/langs/nl_BE/companies.lang
rename to public/langs/nl_BE/companies.lang
diff --git a/htdocs/langs/nl_BE/compta.lang b/public/langs/nl_BE/compta.lang
similarity index 100%
rename from htdocs/langs/nl_BE/compta.lang
rename to public/langs/nl_BE/compta.lang
diff --git a/htdocs/langs/nl_BE/contracts.lang b/public/langs/nl_BE/contracts.lang
similarity index 100%
rename from htdocs/langs/nl_BE/contracts.lang
rename to public/langs/nl_BE/contracts.lang
diff --git a/htdocs/langs/nl_BE/cron.lang b/public/langs/nl_BE/cron.lang
similarity index 100%
rename from htdocs/langs/nl_BE/cron.lang
rename to public/langs/nl_BE/cron.lang
diff --git a/htdocs/langs/nl_BE/deliveries.lang b/public/langs/nl_BE/deliveries.lang
similarity index 100%
rename from htdocs/langs/nl_BE/deliveries.lang
rename to public/langs/nl_BE/deliveries.lang
diff --git a/htdocs/langs/nl_BE/dict.lang b/public/langs/nl_BE/dict.lang
similarity index 100%
rename from htdocs/langs/nl_BE/dict.lang
rename to public/langs/nl_BE/dict.lang
diff --git a/htdocs/langs/nl_BE/donations.lang b/public/langs/nl_BE/donations.lang
similarity index 100%
rename from htdocs/langs/nl_BE/donations.lang
rename to public/langs/nl_BE/donations.lang
diff --git a/htdocs/langs/nl_BE/ecm.lang b/public/langs/nl_BE/ecm.lang
similarity index 100%
rename from htdocs/langs/nl_BE/ecm.lang
rename to public/langs/nl_BE/ecm.lang
diff --git a/htdocs/langs/nl_BE/errors.lang b/public/langs/nl_BE/errors.lang
similarity index 100%
rename from htdocs/langs/nl_BE/errors.lang
rename to public/langs/nl_BE/errors.lang
diff --git a/htdocs/langs/nl_BE/exports.lang b/public/langs/nl_BE/exports.lang
similarity index 100%
rename from htdocs/langs/nl_BE/exports.lang
rename to public/langs/nl_BE/exports.lang
diff --git a/htdocs/langs/nl_BE/externalsite.lang b/public/langs/nl_BE/externalsite.lang
similarity index 100%
rename from htdocs/langs/nl_BE/externalsite.lang
rename to public/langs/nl_BE/externalsite.lang
diff --git a/htdocs/langs/nl_BE/ftp.lang b/public/langs/nl_BE/ftp.lang
similarity index 100%
rename from htdocs/langs/nl_BE/ftp.lang
rename to public/langs/nl_BE/ftp.lang
diff --git a/htdocs/langs/nl_BE/help.lang b/public/langs/nl_BE/help.lang
similarity index 100%
rename from htdocs/langs/nl_BE/help.lang
rename to public/langs/nl_BE/help.lang
diff --git a/htdocs/langs/nl_BE/holiday.lang b/public/langs/nl_BE/holiday.lang
similarity index 100%
rename from htdocs/langs/nl_BE/holiday.lang
rename to public/langs/nl_BE/holiday.lang
diff --git a/htdocs/langs/nl_BE/hrm.lang b/public/langs/nl_BE/hrm.lang
similarity index 100%
rename from htdocs/langs/nl_BE/hrm.lang
rename to public/langs/nl_BE/hrm.lang
diff --git a/htdocs/langs/nl_BE/incoterm.lang b/public/langs/nl_BE/incoterm.lang
similarity index 100%
rename from htdocs/langs/nl_BE/incoterm.lang
rename to public/langs/nl_BE/incoterm.lang
diff --git a/htdocs/langs/nl_BE/install.lang b/public/langs/nl_BE/install.lang
similarity index 100%
rename from htdocs/langs/nl_BE/install.lang
rename to public/langs/nl_BE/install.lang
diff --git a/htdocs/langs/nl_BE/interventions.lang b/public/langs/nl_BE/interventions.lang
similarity index 100%
rename from htdocs/langs/nl_BE/interventions.lang
rename to public/langs/nl_BE/interventions.lang
diff --git a/htdocs/langs/nl_BE/languages.lang b/public/langs/nl_BE/languages.lang
similarity index 100%
rename from htdocs/langs/nl_BE/languages.lang
rename to public/langs/nl_BE/languages.lang
diff --git a/htdocs/langs/nl_BE/ldap.lang b/public/langs/nl_BE/ldap.lang
similarity index 100%
rename from htdocs/langs/nl_BE/ldap.lang
rename to public/langs/nl_BE/ldap.lang
diff --git a/htdocs/langs/nl_BE/link.lang b/public/langs/nl_BE/link.lang
similarity index 100%
rename from htdocs/langs/nl_BE/link.lang
rename to public/langs/nl_BE/link.lang
diff --git a/htdocs/langs/nl_BE/loan.lang b/public/langs/nl_BE/loan.lang
similarity index 100%
rename from htdocs/langs/nl_BE/loan.lang
rename to public/langs/nl_BE/loan.lang
diff --git a/htdocs/langs/nl_BE/mailmanspip.lang b/public/langs/nl_BE/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/nl_BE/mailmanspip.lang
rename to public/langs/nl_BE/mailmanspip.lang
diff --git a/htdocs/langs/nl_BE/mails.lang b/public/langs/nl_BE/mails.lang
similarity index 100%
rename from htdocs/langs/nl_BE/mails.lang
rename to public/langs/nl_BE/mails.lang
diff --git a/htdocs/langs/nl_BE/main.lang b/public/langs/nl_BE/main.lang
similarity index 100%
rename from htdocs/langs/nl_BE/main.lang
rename to public/langs/nl_BE/main.lang
diff --git a/htdocs/langs/nl_BE/margins.lang b/public/langs/nl_BE/margins.lang
similarity index 100%
rename from htdocs/langs/nl_BE/margins.lang
rename to public/langs/nl_BE/margins.lang
diff --git a/htdocs/langs/nl_BE/members.lang b/public/langs/nl_BE/members.lang
similarity index 100%
rename from htdocs/langs/nl_BE/members.lang
rename to public/langs/nl_BE/members.lang
diff --git a/htdocs/langs/nl_BE/oauth.lang b/public/langs/nl_BE/oauth.lang
similarity index 100%
rename from htdocs/langs/nl_BE/oauth.lang
rename to public/langs/nl_BE/oauth.lang
diff --git a/htdocs/langs/nl_BE/opensurvey.lang b/public/langs/nl_BE/opensurvey.lang
similarity index 100%
rename from htdocs/langs/nl_BE/opensurvey.lang
rename to public/langs/nl_BE/opensurvey.lang
diff --git a/htdocs/langs/nl_BE/orders.lang b/public/langs/nl_BE/orders.lang
similarity index 100%
rename from htdocs/langs/nl_BE/orders.lang
rename to public/langs/nl_BE/orders.lang
diff --git a/htdocs/langs/nl_BE/other.lang b/public/langs/nl_BE/other.lang
similarity index 100%
rename from htdocs/langs/nl_BE/other.lang
rename to public/langs/nl_BE/other.lang
diff --git a/htdocs/langs/nl_BE/paybox.lang b/public/langs/nl_BE/paybox.lang
similarity index 100%
rename from htdocs/langs/nl_BE/paybox.lang
rename to public/langs/nl_BE/paybox.lang
diff --git a/htdocs/langs/nl_BE/paypal.lang b/public/langs/nl_BE/paypal.lang
similarity index 100%
rename from htdocs/langs/nl_BE/paypal.lang
rename to public/langs/nl_BE/paypal.lang
diff --git a/htdocs/langs/nl_BE/printing.lang b/public/langs/nl_BE/printing.lang
similarity index 100%
rename from htdocs/langs/nl_BE/printing.lang
rename to public/langs/nl_BE/printing.lang
diff --git a/htdocs/langs/nl_BE/productbatch.lang b/public/langs/nl_BE/productbatch.lang
similarity index 100%
rename from htdocs/langs/nl_BE/productbatch.lang
rename to public/langs/nl_BE/productbatch.lang
diff --git a/htdocs/langs/nl_BE/products.lang b/public/langs/nl_BE/products.lang
similarity index 100%
rename from htdocs/langs/nl_BE/products.lang
rename to public/langs/nl_BE/products.lang
diff --git a/htdocs/langs/nl_BE/projects.lang b/public/langs/nl_BE/projects.lang
similarity index 100%
rename from htdocs/langs/nl_BE/projects.lang
rename to public/langs/nl_BE/projects.lang
diff --git a/htdocs/langs/nl_BE/propal.lang b/public/langs/nl_BE/propal.lang
similarity index 100%
rename from htdocs/langs/nl_BE/propal.lang
rename to public/langs/nl_BE/propal.lang
diff --git a/htdocs/langs/nl_BE/receiptprinter.lang b/public/langs/nl_BE/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/nl_BE/receiptprinter.lang
rename to public/langs/nl_BE/receiptprinter.lang
diff --git a/htdocs/langs/nl_BE/resource.lang b/public/langs/nl_BE/resource.lang
similarity index 100%
rename from htdocs/langs/nl_BE/resource.lang
rename to public/langs/nl_BE/resource.lang
diff --git a/htdocs/langs/nl_BE/salaries.lang b/public/langs/nl_BE/salaries.lang
similarity index 100%
rename from htdocs/langs/nl_BE/salaries.lang
rename to public/langs/nl_BE/salaries.lang
diff --git a/htdocs/langs/nl_BE/sendings.lang b/public/langs/nl_BE/sendings.lang
similarity index 100%
rename from htdocs/langs/nl_BE/sendings.lang
rename to public/langs/nl_BE/sendings.lang
diff --git a/htdocs/langs/nl_BE/sms.lang b/public/langs/nl_BE/sms.lang
similarity index 100%
rename from htdocs/langs/nl_BE/sms.lang
rename to public/langs/nl_BE/sms.lang
diff --git a/htdocs/langs/nl_BE/stocks.lang b/public/langs/nl_BE/stocks.lang
similarity index 100%
rename from htdocs/langs/nl_BE/stocks.lang
rename to public/langs/nl_BE/stocks.lang
diff --git a/htdocs/langs/nl_BE/supplier_proposal.lang b/public/langs/nl_BE/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/nl_BE/supplier_proposal.lang
rename to public/langs/nl_BE/supplier_proposal.lang
diff --git a/htdocs/langs/nl_BE/suppliers.lang b/public/langs/nl_BE/suppliers.lang
similarity index 100%
rename from htdocs/langs/nl_BE/suppliers.lang
rename to public/langs/nl_BE/suppliers.lang
diff --git a/htdocs/langs/nl_BE/trips.lang b/public/langs/nl_BE/trips.lang
similarity index 100%
rename from htdocs/langs/nl_BE/trips.lang
rename to public/langs/nl_BE/trips.lang
diff --git a/htdocs/langs/nl_BE/users.lang b/public/langs/nl_BE/users.lang
similarity index 100%
rename from htdocs/langs/nl_BE/users.lang
rename to public/langs/nl_BE/users.lang
diff --git a/htdocs/langs/nl_BE/website.lang b/public/langs/nl_BE/website.lang
similarity index 100%
rename from htdocs/langs/nl_BE/website.lang
rename to public/langs/nl_BE/website.lang
diff --git a/htdocs/langs/nl_BE/withdrawals.lang b/public/langs/nl_BE/withdrawals.lang
similarity index 100%
rename from htdocs/langs/nl_BE/withdrawals.lang
rename to public/langs/nl_BE/withdrawals.lang
diff --git a/htdocs/langs/nl_BE/workflow.lang b/public/langs/nl_BE/workflow.lang
similarity index 100%
rename from htdocs/langs/nl_BE/workflow.lang
rename to public/langs/nl_BE/workflow.lang
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/public/langs/nl_NL/accountancy.lang
similarity index 100%
rename from htdocs/langs/nl_NL/accountancy.lang
rename to public/langs/nl_NL/accountancy.lang
diff --git a/htdocs/langs/nl_NL/admin.lang b/public/langs/nl_NL/admin.lang
similarity index 100%
rename from htdocs/langs/nl_NL/admin.lang
rename to public/langs/nl_NL/admin.lang
diff --git a/htdocs/langs/nl_NL/agenda.lang b/public/langs/nl_NL/agenda.lang
similarity index 100%
rename from htdocs/langs/nl_NL/agenda.lang
rename to public/langs/nl_NL/agenda.lang
diff --git a/htdocs/langs/nl_NL/banks.lang b/public/langs/nl_NL/banks.lang
similarity index 100%
rename from htdocs/langs/nl_NL/banks.lang
rename to public/langs/nl_NL/banks.lang
diff --git a/htdocs/langs/nl_NL/bills.lang b/public/langs/nl_NL/bills.lang
similarity index 100%
rename from htdocs/langs/nl_NL/bills.lang
rename to public/langs/nl_NL/bills.lang
diff --git a/htdocs/langs/nl_NL/bookmarks.lang b/public/langs/nl_NL/bookmarks.lang
similarity index 100%
rename from htdocs/langs/nl_NL/bookmarks.lang
rename to public/langs/nl_NL/bookmarks.lang
diff --git a/htdocs/langs/nl_NL/boxes.lang b/public/langs/nl_NL/boxes.lang
similarity index 100%
rename from htdocs/langs/nl_NL/boxes.lang
rename to public/langs/nl_NL/boxes.lang
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/public/langs/nl_NL/cashdesk.lang
similarity index 100%
rename from htdocs/langs/nl_NL/cashdesk.lang
rename to public/langs/nl_NL/cashdesk.lang
diff --git a/htdocs/langs/nl_NL/categories.lang b/public/langs/nl_NL/categories.lang
similarity index 100%
rename from htdocs/langs/nl_NL/categories.lang
rename to public/langs/nl_NL/categories.lang
diff --git a/htdocs/langs/nl_NL/commercial.lang b/public/langs/nl_NL/commercial.lang
similarity index 100%
rename from htdocs/langs/nl_NL/commercial.lang
rename to public/langs/nl_NL/commercial.lang
diff --git a/htdocs/langs/nl_NL/companies.lang b/public/langs/nl_NL/companies.lang
similarity index 100%
rename from htdocs/langs/nl_NL/companies.lang
rename to public/langs/nl_NL/companies.lang
diff --git a/htdocs/langs/nl_NL/compta.lang b/public/langs/nl_NL/compta.lang
similarity index 100%
rename from htdocs/langs/nl_NL/compta.lang
rename to public/langs/nl_NL/compta.lang
diff --git a/htdocs/langs/nl_NL/contracts.lang b/public/langs/nl_NL/contracts.lang
similarity index 100%
rename from htdocs/langs/nl_NL/contracts.lang
rename to public/langs/nl_NL/contracts.lang
diff --git a/htdocs/langs/nl_NL/cron.lang b/public/langs/nl_NL/cron.lang
similarity index 100%
rename from htdocs/langs/nl_NL/cron.lang
rename to public/langs/nl_NL/cron.lang
diff --git a/htdocs/langs/nl_NL/deliveries.lang b/public/langs/nl_NL/deliveries.lang
similarity index 100%
rename from htdocs/langs/nl_NL/deliveries.lang
rename to public/langs/nl_NL/deliveries.lang
diff --git a/htdocs/langs/nl_NL/dict.lang b/public/langs/nl_NL/dict.lang
similarity index 100%
rename from htdocs/langs/nl_NL/dict.lang
rename to public/langs/nl_NL/dict.lang
diff --git a/htdocs/langs/nl_NL/donations.lang b/public/langs/nl_NL/donations.lang
similarity index 100%
rename from htdocs/langs/nl_NL/donations.lang
rename to public/langs/nl_NL/donations.lang
diff --git a/htdocs/langs/nl_NL/ecm.lang b/public/langs/nl_NL/ecm.lang
similarity index 100%
rename from htdocs/langs/nl_NL/ecm.lang
rename to public/langs/nl_NL/ecm.lang
diff --git a/htdocs/langs/nl_NL/errors.lang b/public/langs/nl_NL/errors.lang
similarity index 100%
rename from htdocs/langs/nl_NL/errors.lang
rename to public/langs/nl_NL/errors.lang
diff --git a/htdocs/langs/nl_NL/exports.lang b/public/langs/nl_NL/exports.lang
similarity index 100%
rename from htdocs/langs/nl_NL/exports.lang
rename to public/langs/nl_NL/exports.lang
diff --git a/htdocs/langs/nl_NL/externalsite.lang b/public/langs/nl_NL/externalsite.lang
similarity index 100%
rename from htdocs/langs/nl_NL/externalsite.lang
rename to public/langs/nl_NL/externalsite.lang
diff --git a/htdocs/langs/nl_NL/ftp.lang b/public/langs/nl_NL/ftp.lang
similarity index 100%
rename from htdocs/langs/nl_NL/ftp.lang
rename to public/langs/nl_NL/ftp.lang
diff --git a/htdocs/langs/nl_NL/help.lang b/public/langs/nl_NL/help.lang
similarity index 100%
rename from htdocs/langs/nl_NL/help.lang
rename to public/langs/nl_NL/help.lang
diff --git a/htdocs/langs/nl_NL/holiday.lang b/public/langs/nl_NL/holiday.lang
similarity index 100%
rename from htdocs/langs/nl_NL/holiday.lang
rename to public/langs/nl_NL/holiday.lang
diff --git a/htdocs/langs/nl_NL/hrm.lang b/public/langs/nl_NL/hrm.lang
similarity index 100%
rename from htdocs/langs/nl_NL/hrm.lang
rename to public/langs/nl_NL/hrm.lang
diff --git a/htdocs/langs/nl_NL/incoterm.lang b/public/langs/nl_NL/incoterm.lang
similarity index 100%
rename from htdocs/langs/nl_NL/incoterm.lang
rename to public/langs/nl_NL/incoterm.lang
diff --git a/htdocs/langs/nl_NL/install.lang b/public/langs/nl_NL/install.lang
similarity index 100%
rename from htdocs/langs/nl_NL/install.lang
rename to public/langs/nl_NL/install.lang
diff --git a/htdocs/langs/nl_NL/interventions.lang b/public/langs/nl_NL/interventions.lang
similarity index 100%
rename from htdocs/langs/nl_NL/interventions.lang
rename to public/langs/nl_NL/interventions.lang
diff --git a/htdocs/langs/nl_NL/languages.lang b/public/langs/nl_NL/languages.lang
similarity index 100%
rename from htdocs/langs/nl_NL/languages.lang
rename to public/langs/nl_NL/languages.lang
diff --git a/htdocs/langs/nl_NL/ldap.lang b/public/langs/nl_NL/ldap.lang
similarity index 100%
rename from htdocs/langs/nl_NL/ldap.lang
rename to public/langs/nl_NL/ldap.lang
diff --git a/htdocs/langs/nl_NL/link.lang b/public/langs/nl_NL/link.lang
similarity index 100%
rename from htdocs/langs/nl_NL/link.lang
rename to public/langs/nl_NL/link.lang
diff --git a/htdocs/langs/nl_NL/loan.lang b/public/langs/nl_NL/loan.lang
similarity index 100%
rename from htdocs/langs/nl_NL/loan.lang
rename to public/langs/nl_NL/loan.lang
diff --git a/htdocs/langs/nl_NL/mailmanspip.lang b/public/langs/nl_NL/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/nl_NL/mailmanspip.lang
rename to public/langs/nl_NL/mailmanspip.lang
diff --git a/htdocs/langs/nl_NL/mails.lang b/public/langs/nl_NL/mails.lang
similarity index 100%
rename from htdocs/langs/nl_NL/mails.lang
rename to public/langs/nl_NL/mails.lang
diff --git a/htdocs/langs/nl_NL/main.lang b/public/langs/nl_NL/main.lang
similarity index 100%
rename from htdocs/langs/nl_NL/main.lang
rename to public/langs/nl_NL/main.lang
diff --git a/htdocs/langs/nl_NL/margins.lang b/public/langs/nl_NL/margins.lang
similarity index 100%
rename from htdocs/langs/nl_NL/margins.lang
rename to public/langs/nl_NL/margins.lang
diff --git a/htdocs/langs/nl_NL/members.lang b/public/langs/nl_NL/members.lang
similarity index 100%
rename from htdocs/langs/nl_NL/members.lang
rename to public/langs/nl_NL/members.lang
diff --git a/htdocs/langs/nl_NL/oauth.lang b/public/langs/nl_NL/oauth.lang
similarity index 100%
rename from htdocs/langs/nl_NL/oauth.lang
rename to public/langs/nl_NL/oauth.lang
diff --git a/htdocs/langs/nl_NL/opensurvey.lang b/public/langs/nl_NL/opensurvey.lang
similarity index 100%
rename from htdocs/langs/nl_NL/opensurvey.lang
rename to public/langs/nl_NL/opensurvey.lang
diff --git a/htdocs/langs/nl_NL/orders.lang b/public/langs/nl_NL/orders.lang
similarity index 100%
rename from htdocs/langs/nl_NL/orders.lang
rename to public/langs/nl_NL/orders.lang
diff --git a/htdocs/langs/nl_NL/other.lang b/public/langs/nl_NL/other.lang
similarity index 100%
rename from htdocs/langs/nl_NL/other.lang
rename to public/langs/nl_NL/other.lang
diff --git a/htdocs/langs/nl_NL/paybox.lang b/public/langs/nl_NL/paybox.lang
similarity index 100%
rename from htdocs/langs/nl_NL/paybox.lang
rename to public/langs/nl_NL/paybox.lang
diff --git a/htdocs/langs/nl_NL/paypal.lang b/public/langs/nl_NL/paypal.lang
similarity index 100%
rename from htdocs/langs/nl_NL/paypal.lang
rename to public/langs/nl_NL/paypal.lang
diff --git a/htdocs/langs/nl_NL/printing.lang b/public/langs/nl_NL/printing.lang
similarity index 100%
rename from htdocs/langs/nl_NL/printing.lang
rename to public/langs/nl_NL/printing.lang
diff --git a/htdocs/langs/nl_NL/productbatch.lang b/public/langs/nl_NL/productbatch.lang
similarity index 100%
rename from htdocs/langs/nl_NL/productbatch.lang
rename to public/langs/nl_NL/productbatch.lang
diff --git a/htdocs/langs/nl_NL/products.lang b/public/langs/nl_NL/products.lang
similarity index 100%
rename from htdocs/langs/nl_NL/products.lang
rename to public/langs/nl_NL/products.lang
diff --git a/htdocs/langs/nl_NL/projects.lang b/public/langs/nl_NL/projects.lang
similarity index 100%
rename from htdocs/langs/nl_NL/projects.lang
rename to public/langs/nl_NL/projects.lang
diff --git a/htdocs/langs/nl_NL/propal.lang b/public/langs/nl_NL/propal.lang
similarity index 100%
rename from htdocs/langs/nl_NL/propal.lang
rename to public/langs/nl_NL/propal.lang
diff --git a/htdocs/langs/nl_NL/receiptprinter.lang b/public/langs/nl_NL/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/nl_NL/receiptprinter.lang
rename to public/langs/nl_NL/receiptprinter.lang
diff --git a/htdocs/langs/nl_NL/resource.lang b/public/langs/nl_NL/resource.lang
similarity index 100%
rename from htdocs/langs/nl_NL/resource.lang
rename to public/langs/nl_NL/resource.lang
diff --git a/htdocs/langs/nl_NL/salaries.lang b/public/langs/nl_NL/salaries.lang
similarity index 100%
rename from htdocs/langs/nl_NL/salaries.lang
rename to public/langs/nl_NL/salaries.lang
diff --git a/htdocs/langs/nl_NL/sendings.lang b/public/langs/nl_NL/sendings.lang
similarity index 100%
rename from htdocs/langs/nl_NL/sendings.lang
rename to public/langs/nl_NL/sendings.lang
diff --git a/htdocs/langs/nl_NL/sms.lang b/public/langs/nl_NL/sms.lang
similarity index 100%
rename from htdocs/langs/nl_NL/sms.lang
rename to public/langs/nl_NL/sms.lang
diff --git a/htdocs/langs/nl_NL/stocks.lang b/public/langs/nl_NL/stocks.lang
similarity index 100%
rename from htdocs/langs/nl_NL/stocks.lang
rename to public/langs/nl_NL/stocks.lang
diff --git a/htdocs/langs/nl_NL/supplier_proposal.lang b/public/langs/nl_NL/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/nl_NL/supplier_proposal.lang
rename to public/langs/nl_NL/supplier_proposal.lang
diff --git a/htdocs/langs/nl_NL/suppliers.lang b/public/langs/nl_NL/suppliers.lang
similarity index 100%
rename from htdocs/langs/nl_NL/suppliers.lang
rename to public/langs/nl_NL/suppliers.lang
diff --git a/htdocs/langs/nl_NL/trips.lang b/public/langs/nl_NL/trips.lang
similarity index 100%
rename from htdocs/langs/nl_NL/trips.lang
rename to public/langs/nl_NL/trips.lang
diff --git a/htdocs/langs/nl_NL/users.lang b/public/langs/nl_NL/users.lang
similarity index 100%
rename from htdocs/langs/nl_NL/users.lang
rename to public/langs/nl_NL/users.lang
diff --git a/htdocs/langs/nl_NL/website.lang b/public/langs/nl_NL/website.lang
similarity index 100%
rename from htdocs/langs/nl_NL/website.lang
rename to public/langs/nl_NL/website.lang
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/public/langs/nl_NL/withdrawals.lang
similarity index 100%
rename from htdocs/langs/nl_NL/withdrawals.lang
rename to public/langs/nl_NL/withdrawals.lang
diff --git a/htdocs/langs/nl_NL/workflow.lang b/public/langs/nl_NL/workflow.lang
similarity index 100%
rename from htdocs/langs/nl_NL/workflow.lang
rename to public/langs/nl_NL/workflow.lang
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/public/langs/pl_PL/accountancy.lang
similarity index 100%
rename from htdocs/langs/pl_PL/accountancy.lang
rename to public/langs/pl_PL/accountancy.lang
diff --git a/htdocs/langs/pl_PL/admin.lang b/public/langs/pl_PL/admin.lang
similarity index 100%
rename from htdocs/langs/pl_PL/admin.lang
rename to public/langs/pl_PL/admin.lang
diff --git a/htdocs/langs/pl_PL/agenda.lang b/public/langs/pl_PL/agenda.lang
similarity index 100%
rename from htdocs/langs/pl_PL/agenda.lang
rename to public/langs/pl_PL/agenda.lang
diff --git a/htdocs/langs/pl_PL/banks.lang b/public/langs/pl_PL/banks.lang
similarity index 100%
rename from htdocs/langs/pl_PL/banks.lang
rename to public/langs/pl_PL/banks.lang
diff --git a/htdocs/langs/pl_PL/bills.lang b/public/langs/pl_PL/bills.lang
similarity index 100%
rename from htdocs/langs/pl_PL/bills.lang
rename to public/langs/pl_PL/bills.lang
diff --git a/htdocs/langs/pl_PL/bookmarks.lang b/public/langs/pl_PL/bookmarks.lang
similarity index 100%
rename from htdocs/langs/pl_PL/bookmarks.lang
rename to public/langs/pl_PL/bookmarks.lang
diff --git a/htdocs/langs/pl_PL/boxes.lang b/public/langs/pl_PL/boxes.lang
similarity index 100%
rename from htdocs/langs/pl_PL/boxes.lang
rename to public/langs/pl_PL/boxes.lang
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/public/langs/pl_PL/cashdesk.lang
similarity index 100%
rename from htdocs/langs/pl_PL/cashdesk.lang
rename to public/langs/pl_PL/cashdesk.lang
diff --git a/htdocs/langs/pl_PL/categories.lang b/public/langs/pl_PL/categories.lang
similarity index 100%
rename from htdocs/langs/pl_PL/categories.lang
rename to public/langs/pl_PL/categories.lang
diff --git a/htdocs/langs/pl_PL/commercial.lang b/public/langs/pl_PL/commercial.lang
similarity index 100%
rename from htdocs/langs/pl_PL/commercial.lang
rename to public/langs/pl_PL/commercial.lang
diff --git a/htdocs/langs/pl_PL/companies.lang b/public/langs/pl_PL/companies.lang
similarity index 100%
rename from htdocs/langs/pl_PL/companies.lang
rename to public/langs/pl_PL/companies.lang
diff --git a/htdocs/langs/pl_PL/compta.lang b/public/langs/pl_PL/compta.lang
similarity index 100%
rename from htdocs/langs/pl_PL/compta.lang
rename to public/langs/pl_PL/compta.lang
diff --git a/htdocs/langs/pl_PL/contracts.lang b/public/langs/pl_PL/contracts.lang
similarity index 100%
rename from htdocs/langs/pl_PL/contracts.lang
rename to public/langs/pl_PL/contracts.lang
diff --git a/htdocs/langs/pl_PL/cron.lang b/public/langs/pl_PL/cron.lang
similarity index 100%
rename from htdocs/langs/pl_PL/cron.lang
rename to public/langs/pl_PL/cron.lang
diff --git a/htdocs/langs/pl_PL/deliveries.lang b/public/langs/pl_PL/deliveries.lang
similarity index 100%
rename from htdocs/langs/pl_PL/deliveries.lang
rename to public/langs/pl_PL/deliveries.lang
diff --git a/htdocs/langs/pl_PL/dict.lang b/public/langs/pl_PL/dict.lang
similarity index 100%
rename from htdocs/langs/pl_PL/dict.lang
rename to public/langs/pl_PL/dict.lang
diff --git a/htdocs/langs/pl_PL/donations.lang b/public/langs/pl_PL/donations.lang
similarity index 100%
rename from htdocs/langs/pl_PL/donations.lang
rename to public/langs/pl_PL/donations.lang
diff --git a/htdocs/langs/pl_PL/ecm.lang b/public/langs/pl_PL/ecm.lang
similarity index 100%
rename from htdocs/langs/pl_PL/ecm.lang
rename to public/langs/pl_PL/ecm.lang
diff --git a/htdocs/langs/pl_PL/errors.lang b/public/langs/pl_PL/errors.lang
similarity index 100%
rename from htdocs/langs/pl_PL/errors.lang
rename to public/langs/pl_PL/errors.lang
diff --git a/htdocs/langs/pl_PL/exports.lang b/public/langs/pl_PL/exports.lang
similarity index 100%
rename from htdocs/langs/pl_PL/exports.lang
rename to public/langs/pl_PL/exports.lang
diff --git a/htdocs/langs/pl_PL/externalsite.lang b/public/langs/pl_PL/externalsite.lang
similarity index 100%
rename from htdocs/langs/pl_PL/externalsite.lang
rename to public/langs/pl_PL/externalsite.lang
diff --git a/htdocs/langs/pl_PL/ftp.lang b/public/langs/pl_PL/ftp.lang
similarity index 100%
rename from htdocs/langs/pl_PL/ftp.lang
rename to public/langs/pl_PL/ftp.lang
diff --git a/htdocs/langs/pl_PL/help.lang b/public/langs/pl_PL/help.lang
similarity index 100%
rename from htdocs/langs/pl_PL/help.lang
rename to public/langs/pl_PL/help.lang
diff --git a/htdocs/langs/pl_PL/holiday.lang b/public/langs/pl_PL/holiday.lang
similarity index 100%
rename from htdocs/langs/pl_PL/holiday.lang
rename to public/langs/pl_PL/holiday.lang
diff --git a/htdocs/langs/pl_PL/hrm.lang b/public/langs/pl_PL/hrm.lang
similarity index 100%
rename from htdocs/langs/pl_PL/hrm.lang
rename to public/langs/pl_PL/hrm.lang
diff --git a/htdocs/langs/pl_PL/incoterm.lang b/public/langs/pl_PL/incoterm.lang
similarity index 100%
rename from htdocs/langs/pl_PL/incoterm.lang
rename to public/langs/pl_PL/incoterm.lang
diff --git a/htdocs/langs/pl_PL/install.lang b/public/langs/pl_PL/install.lang
similarity index 100%
rename from htdocs/langs/pl_PL/install.lang
rename to public/langs/pl_PL/install.lang
diff --git a/htdocs/langs/pl_PL/interventions.lang b/public/langs/pl_PL/interventions.lang
similarity index 100%
rename from htdocs/langs/pl_PL/interventions.lang
rename to public/langs/pl_PL/interventions.lang
diff --git a/htdocs/langs/pl_PL/languages.lang b/public/langs/pl_PL/languages.lang
similarity index 100%
rename from htdocs/langs/pl_PL/languages.lang
rename to public/langs/pl_PL/languages.lang
diff --git a/htdocs/langs/pl_PL/ldap.lang b/public/langs/pl_PL/ldap.lang
similarity index 100%
rename from htdocs/langs/pl_PL/ldap.lang
rename to public/langs/pl_PL/ldap.lang
diff --git a/htdocs/langs/pl_PL/link.lang b/public/langs/pl_PL/link.lang
similarity index 100%
rename from htdocs/langs/pl_PL/link.lang
rename to public/langs/pl_PL/link.lang
diff --git a/htdocs/langs/pl_PL/loan.lang b/public/langs/pl_PL/loan.lang
similarity index 100%
rename from htdocs/langs/pl_PL/loan.lang
rename to public/langs/pl_PL/loan.lang
diff --git a/htdocs/langs/pl_PL/mailmanspip.lang b/public/langs/pl_PL/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/pl_PL/mailmanspip.lang
rename to public/langs/pl_PL/mailmanspip.lang
diff --git a/htdocs/langs/pl_PL/mails.lang b/public/langs/pl_PL/mails.lang
similarity index 100%
rename from htdocs/langs/pl_PL/mails.lang
rename to public/langs/pl_PL/mails.lang
diff --git a/htdocs/langs/pl_PL/main.lang b/public/langs/pl_PL/main.lang
similarity index 100%
rename from htdocs/langs/pl_PL/main.lang
rename to public/langs/pl_PL/main.lang
diff --git a/htdocs/langs/pl_PL/margins.lang b/public/langs/pl_PL/margins.lang
similarity index 100%
rename from htdocs/langs/pl_PL/margins.lang
rename to public/langs/pl_PL/margins.lang
diff --git a/htdocs/langs/pl_PL/members.lang b/public/langs/pl_PL/members.lang
similarity index 100%
rename from htdocs/langs/pl_PL/members.lang
rename to public/langs/pl_PL/members.lang
diff --git a/htdocs/langs/pl_PL/oauth.lang b/public/langs/pl_PL/oauth.lang
similarity index 100%
rename from htdocs/langs/pl_PL/oauth.lang
rename to public/langs/pl_PL/oauth.lang
diff --git a/htdocs/langs/pl_PL/opensurvey.lang b/public/langs/pl_PL/opensurvey.lang
similarity index 100%
rename from htdocs/langs/pl_PL/opensurvey.lang
rename to public/langs/pl_PL/opensurvey.lang
diff --git a/htdocs/langs/pl_PL/orders.lang b/public/langs/pl_PL/orders.lang
similarity index 100%
rename from htdocs/langs/pl_PL/orders.lang
rename to public/langs/pl_PL/orders.lang
diff --git a/htdocs/langs/pl_PL/other.lang b/public/langs/pl_PL/other.lang
similarity index 100%
rename from htdocs/langs/pl_PL/other.lang
rename to public/langs/pl_PL/other.lang
diff --git a/htdocs/langs/pl_PL/paybox.lang b/public/langs/pl_PL/paybox.lang
similarity index 100%
rename from htdocs/langs/pl_PL/paybox.lang
rename to public/langs/pl_PL/paybox.lang
diff --git a/htdocs/langs/pl_PL/paypal.lang b/public/langs/pl_PL/paypal.lang
similarity index 100%
rename from htdocs/langs/pl_PL/paypal.lang
rename to public/langs/pl_PL/paypal.lang
diff --git a/htdocs/langs/pl_PL/printing.lang b/public/langs/pl_PL/printing.lang
similarity index 100%
rename from htdocs/langs/pl_PL/printing.lang
rename to public/langs/pl_PL/printing.lang
diff --git a/htdocs/langs/pl_PL/productbatch.lang b/public/langs/pl_PL/productbatch.lang
similarity index 100%
rename from htdocs/langs/pl_PL/productbatch.lang
rename to public/langs/pl_PL/productbatch.lang
diff --git a/htdocs/langs/pl_PL/products.lang b/public/langs/pl_PL/products.lang
similarity index 100%
rename from htdocs/langs/pl_PL/products.lang
rename to public/langs/pl_PL/products.lang
diff --git a/htdocs/langs/pl_PL/projects.lang b/public/langs/pl_PL/projects.lang
similarity index 100%
rename from htdocs/langs/pl_PL/projects.lang
rename to public/langs/pl_PL/projects.lang
diff --git a/htdocs/langs/pl_PL/propal.lang b/public/langs/pl_PL/propal.lang
similarity index 100%
rename from htdocs/langs/pl_PL/propal.lang
rename to public/langs/pl_PL/propal.lang
diff --git a/htdocs/langs/pl_PL/receiptprinter.lang b/public/langs/pl_PL/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/pl_PL/receiptprinter.lang
rename to public/langs/pl_PL/receiptprinter.lang
diff --git a/htdocs/langs/pl_PL/resource.lang b/public/langs/pl_PL/resource.lang
similarity index 100%
rename from htdocs/langs/pl_PL/resource.lang
rename to public/langs/pl_PL/resource.lang
diff --git a/htdocs/langs/pl_PL/salaries.lang b/public/langs/pl_PL/salaries.lang
similarity index 100%
rename from htdocs/langs/pl_PL/salaries.lang
rename to public/langs/pl_PL/salaries.lang
diff --git a/htdocs/langs/pl_PL/sendings.lang b/public/langs/pl_PL/sendings.lang
similarity index 100%
rename from htdocs/langs/pl_PL/sendings.lang
rename to public/langs/pl_PL/sendings.lang
diff --git a/htdocs/langs/pl_PL/sms.lang b/public/langs/pl_PL/sms.lang
similarity index 100%
rename from htdocs/langs/pl_PL/sms.lang
rename to public/langs/pl_PL/sms.lang
diff --git a/htdocs/langs/pl_PL/stocks.lang b/public/langs/pl_PL/stocks.lang
similarity index 100%
rename from htdocs/langs/pl_PL/stocks.lang
rename to public/langs/pl_PL/stocks.lang
diff --git a/htdocs/langs/pl_PL/supplier_proposal.lang b/public/langs/pl_PL/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/pl_PL/supplier_proposal.lang
rename to public/langs/pl_PL/supplier_proposal.lang
diff --git a/htdocs/langs/pl_PL/suppliers.lang b/public/langs/pl_PL/suppliers.lang
similarity index 100%
rename from htdocs/langs/pl_PL/suppliers.lang
rename to public/langs/pl_PL/suppliers.lang
diff --git a/htdocs/langs/pl_PL/trips.lang b/public/langs/pl_PL/trips.lang
similarity index 100%
rename from htdocs/langs/pl_PL/trips.lang
rename to public/langs/pl_PL/trips.lang
diff --git a/htdocs/langs/pl_PL/users.lang b/public/langs/pl_PL/users.lang
similarity index 100%
rename from htdocs/langs/pl_PL/users.lang
rename to public/langs/pl_PL/users.lang
diff --git a/htdocs/langs/pl_PL/website.lang b/public/langs/pl_PL/website.lang
similarity index 100%
rename from htdocs/langs/pl_PL/website.lang
rename to public/langs/pl_PL/website.lang
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/public/langs/pl_PL/withdrawals.lang
similarity index 100%
rename from htdocs/langs/pl_PL/withdrawals.lang
rename to public/langs/pl_PL/withdrawals.lang
diff --git a/htdocs/langs/pl_PL/workflow.lang b/public/langs/pl_PL/workflow.lang
similarity index 100%
rename from htdocs/langs/pl_PL/workflow.lang
rename to public/langs/pl_PL/workflow.lang
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/public/langs/pt_BR/accountancy.lang
similarity index 100%
rename from htdocs/langs/pt_BR/accountancy.lang
rename to public/langs/pt_BR/accountancy.lang
diff --git a/htdocs/langs/pt_BR/admin.lang b/public/langs/pt_BR/admin.lang
similarity index 100%
rename from htdocs/langs/pt_BR/admin.lang
rename to public/langs/pt_BR/admin.lang
diff --git a/htdocs/langs/pt_BR/agenda.lang b/public/langs/pt_BR/agenda.lang
similarity index 100%
rename from htdocs/langs/pt_BR/agenda.lang
rename to public/langs/pt_BR/agenda.lang
diff --git a/htdocs/langs/pt_BR/banks.lang b/public/langs/pt_BR/banks.lang
similarity index 100%
rename from htdocs/langs/pt_BR/banks.lang
rename to public/langs/pt_BR/banks.lang
diff --git a/htdocs/langs/pt_BR/bills.lang b/public/langs/pt_BR/bills.lang
similarity index 100%
rename from htdocs/langs/pt_BR/bills.lang
rename to public/langs/pt_BR/bills.lang
diff --git a/htdocs/langs/pt_BR/bookmarks.lang b/public/langs/pt_BR/bookmarks.lang
similarity index 100%
rename from htdocs/langs/pt_BR/bookmarks.lang
rename to public/langs/pt_BR/bookmarks.lang
diff --git a/htdocs/langs/pt_BR/boxes.lang b/public/langs/pt_BR/boxes.lang
similarity index 100%
rename from htdocs/langs/pt_BR/boxes.lang
rename to public/langs/pt_BR/boxes.lang
diff --git a/htdocs/langs/pt_BR/cashdesk.lang b/public/langs/pt_BR/cashdesk.lang
similarity index 100%
rename from htdocs/langs/pt_BR/cashdesk.lang
rename to public/langs/pt_BR/cashdesk.lang
diff --git a/htdocs/langs/pt_BR/categories.lang b/public/langs/pt_BR/categories.lang
similarity index 100%
rename from htdocs/langs/pt_BR/categories.lang
rename to public/langs/pt_BR/categories.lang
diff --git a/htdocs/langs/pt_BR/commercial.lang b/public/langs/pt_BR/commercial.lang
similarity index 100%
rename from htdocs/langs/pt_BR/commercial.lang
rename to public/langs/pt_BR/commercial.lang
diff --git a/htdocs/langs/pt_BR/companies.lang b/public/langs/pt_BR/companies.lang
similarity index 100%
rename from htdocs/langs/pt_BR/companies.lang
rename to public/langs/pt_BR/companies.lang
diff --git a/htdocs/langs/pt_BR/compta.lang b/public/langs/pt_BR/compta.lang
similarity index 100%
rename from htdocs/langs/pt_BR/compta.lang
rename to public/langs/pt_BR/compta.lang
diff --git a/htdocs/langs/pt_BR/contracts.lang b/public/langs/pt_BR/contracts.lang
similarity index 100%
rename from htdocs/langs/pt_BR/contracts.lang
rename to public/langs/pt_BR/contracts.lang
diff --git a/htdocs/langs/pt_BR/cron.lang b/public/langs/pt_BR/cron.lang
similarity index 100%
rename from htdocs/langs/pt_BR/cron.lang
rename to public/langs/pt_BR/cron.lang
diff --git a/htdocs/langs/pt_BR/deliveries.lang b/public/langs/pt_BR/deliveries.lang
similarity index 100%
rename from htdocs/langs/pt_BR/deliveries.lang
rename to public/langs/pt_BR/deliveries.lang
diff --git a/htdocs/langs/pt_BR/dict.lang b/public/langs/pt_BR/dict.lang
similarity index 100%
rename from htdocs/langs/pt_BR/dict.lang
rename to public/langs/pt_BR/dict.lang
diff --git a/htdocs/langs/pt_BR/donations.lang b/public/langs/pt_BR/donations.lang
similarity index 100%
rename from htdocs/langs/pt_BR/donations.lang
rename to public/langs/pt_BR/donations.lang
diff --git a/htdocs/langs/pt_BR/ecm.lang b/public/langs/pt_BR/ecm.lang
similarity index 100%
rename from htdocs/langs/pt_BR/ecm.lang
rename to public/langs/pt_BR/ecm.lang
diff --git a/htdocs/langs/pt_BR/errors.lang b/public/langs/pt_BR/errors.lang
similarity index 100%
rename from htdocs/langs/pt_BR/errors.lang
rename to public/langs/pt_BR/errors.lang
diff --git a/htdocs/langs/pt_BR/exports.lang b/public/langs/pt_BR/exports.lang
similarity index 100%
rename from htdocs/langs/pt_BR/exports.lang
rename to public/langs/pt_BR/exports.lang
diff --git a/htdocs/langs/pt_BR/externalsite.lang b/public/langs/pt_BR/externalsite.lang
similarity index 100%
rename from htdocs/langs/pt_BR/externalsite.lang
rename to public/langs/pt_BR/externalsite.lang
diff --git a/htdocs/langs/pt_BR/ftp.lang b/public/langs/pt_BR/ftp.lang
similarity index 100%
rename from htdocs/langs/pt_BR/ftp.lang
rename to public/langs/pt_BR/ftp.lang
diff --git a/htdocs/langs/pt_BR/help.lang b/public/langs/pt_BR/help.lang
similarity index 100%
rename from htdocs/langs/pt_BR/help.lang
rename to public/langs/pt_BR/help.lang
diff --git a/htdocs/langs/pt_BR/holiday.lang b/public/langs/pt_BR/holiday.lang
similarity index 100%
rename from htdocs/langs/pt_BR/holiday.lang
rename to public/langs/pt_BR/holiday.lang
diff --git a/htdocs/langs/pt_BR/hrm.lang b/public/langs/pt_BR/hrm.lang
similarity index 100%
rename from htdocs/langs/pt_BR/hrm.lang
rename to public/langs/pt_BR/hrm.lang
diff --git a/htdocs/langs/pt_BR/incoterm.lang b/public/langs/pt_BR/incoterm.lang
similarity index 100%
rename from htdocs/langs/pt_BR/incoterm.lang
rename to public/langs/pt_BR/incoterm.lang
diff --git a/htdocs/langs/pt_BR/install.lang b/public/langs/pt_BR/install.lang
similarity index 100%
rename from htdocs/langs/pt_BR/install.lang
rename to public/langs/pt_BR/install.lang
diff --git a/htdocs/langs/pt_BR/interventions.lang b/public/langs/pt_BR/interventions.lang
similarity index 100%
rename from htdocs/langs/pt_BR/interventions.lang
rename to public/langs/pt_BR/interventions.lang
diff --git a/htdocs/langs/pt_BR/languages.lang b/public/langs/pt_BR/languages.lang
similarity index 100%
rename from htdocs/langs/pt_BR/languages.lang
rename to public/langs/pt_BR/languages.lang
diff --git a/htdocs/langs/pt_BR/ldap.lang b/public/langs/pt_BR/ldap.lang
similarity index 100%
rename from htdocs/langs/pt_BR/ldap.lang
rename to public/langs/pt_BR/ldap.lang
diff --git a/htdocs/langs/pt_BR/link.lang b/public/langs/pt_BR/link.lang
similarity index 100%
rename from htdocs/langs/pt_BR/link.lang
rename to public/langs/pt_BR/link.lang
diff --git a/htdocs/langs/pt_BR/loan.lang b/public/langs/pt_BR/loan.lang
similarity index 100%
rename from htdocs/langs/pt_BR/loan.lang
rename to public/langs/pt_BR/loan.lang
diff --git a/htdocs/langs/pt_BR/mailmanspip.lang b/public/langs/pt_BR/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/pt_BR/mailmanspip.lang
rename to public/langs/pt_BR/mailmanspip.lang
diff --git a/htdocs/langs/pt_BR/mails.lang b/public/langs/pt_BR/mails.lang
similarity index 100%
rename from htdocs/langs/pt_BR/mails.lang
rename to public/langs/pt_BR/mails.lang
diff --git a/htdocs/langs/pt_BR/main.lang b/public/langs/pt_BR/main.lang
similarity index 100%
rename from htdocs/langs/pt_BR/main.lang
rename to public/langs/pt_BR/main.lang
diff --git a/htdocs/langs/pt_BR/margins.lang b/public/langs/pt_BR/margins.lang
similarity index 100%
rename from htdocs/langs/pt_BR/margins.lang
rename to public/langs/pt_BR/margins.lang
diff --git a/htdocs/langs/pt_BR/members.lang b/public/langs/pt_BR/members.lang
similarity index 100%
rename from htdocs/langs/pt_BR/members.lang
rename to public/langs/pt_BR/members.lang
diff --git a/htdocs/langs/pt_BR/oauth.lang b/public/langs/pt_BR/oauth.lang
similarity index 100%
rename from htdocs/langs/pt_BR/oauth.lang
rename to public/langs/pt_BR/oauth.lang
diff --git a/htdocs/langs/pt_BR/opensurvey.lang b/public/langs/pt_BR/opensurvey.lang
similarity index 100%
rename from htdocs/langs/pt_BR/opensurvey.lang
rename to public/langs/pt_BR/opensurvey.lang
diff --git a/htdocs/langs/pt_BR/orders.lang b/public/langs/pt_BR/orders.lang
similarity index 100%
rename from htdocs/langs/pt_BR/orders.lang
rename to public/langs/pt_BR/orders.lang
diff --git a/htdocs/langs/pt_BR/other.lang b/public/langs/pt_BR/other.lang
similarity index 100%
rename from htdocs/langs/pt_BR/other.lang
rename to public/langs/pt_BR/other.lang
diff --git a/htdocs/langs/pt_BR/paybox.lang b/public/langs/pt_BR/paybox.lang
similarity index 100%
rename from htdocs/langs/pt_BR/paybox.lang
rename to public/langs/pt_BR/paybox.lang
diff --git a/htdocs/langs/pt_BR/paypal.lang b/public/langs/pt_BR/paypal.lang
similarity index 100%
rename from htdocs/langs/pt_BR/paypal.lang
rename to public/langs/pt_BR/paypal.lang
diff --git a/htdocs/langs/pt_BR/printing.lang b/public/langs/pt_BR/printing.lang
similarity index 100%
rename from htdocs/langs/pt_BR/printing.lang
rename to public/langs/pt_BR/printing.lang
diff --git a/htdocs/langs/pt_BR/productbatch.lang b/public/langs/pt_BR/productbatch.lang
similarity index 100%
rename from htdocs/langs/pt_BR/productbatch.lang
rename to public/langs/pt_BR/productbatch.lang
diff --git a/htdocs/langs/pt_BR/products.lang b/public/langs/pt_BR/products.lang
similarity index 100%
rename from htdocs/langs/pt_BR/products.lang
rename to public/langs/pt_BR/products.lang
diff --git a/htdocs/langs/pt_BR/projects.lang b/public/langs/pt_BR/projects.lang
similarity index 100%
rename from htdocs/langs/pt_BR/projects.lang
rename to public/langs/pt_BR/projects.lang
diff --git a/htdocs/langs/pt_BR/propal.lang b/public/langs/pt_BR/propal.lang
similarity index 100%
rename from htdocs/langs/pt_BR/propal.lang
rename to public/langs/pt_BR/propal.lang
diff --git a/htdocs/langs/pt_BR/receiptprinter.lang b/public/langs/pt_BR/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/pt_BR/receiptprinter.lang
rename to public/langs/pt_BR/receiptprinter.lang
diff --git a/htdocs/langs/pt_BR/resource.lang b/public/langs/pt_BR/resource.lang
similarity index 100%
rename from htdocs/langs/pt_BR/resource.lang
rename to public/langs/pt_BR/resource.lang
diff --git a/htdocs/langs/pt_BR/salaries.lang b/public/langs/pt_BR/salaries.lang
similarity index 100%
rename from htdocs/langs/pt_BR/salaries.lang
rename to public/langs/pt_BR/salaries.lang
diff --git a/htdocs/langs/pt_BR/sendings.lang b/public/langs/pt_BR/sendings.lang
similarity index 100%
rename from htdocs/langs/pt_BR/sendings.lang
rename to public/langs/pt_BR/sendings.lang
diff --git a/htdocs/langs/pt_BR/sms.lang b/public/langs/pt_BR/sms.lang
similarity index 100%
rename from htdocs/langs/pt_BR/sms.lang
rename to public/langs/pt_BR/sms.lang
diff --git a/htdocs/langs/pt_BR/stocks.lang b/public/langs/pt_BR/stocks.lang
similarity index 100%
rename from htdocs/langs/pt_BR/stocks.lang
rename to public/langs/pt_BR/stocks.lang
diff --git a/htdocs/langs/pt_BR/supplier_proposal.lang b/public/langs/pt_BR/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/pt_BR/supplier_proposal.lang
rename to public/langs/pt_BR/supplier_proposal.lang
diff --git a/htdocs/langs/pt_BR/suppliers.lang b/public/langs/pt_BR/suppliers.lang
similarity index 100%
rename from htdocs/langs/pt_BR/suppliers.lang
rename to public/langs/pt_BR/suppliers.lang
diff --git a/htdocs/langs/pt_BR/trips.lang b/public/langs/pt_BR/trips.lang
similarity index 100%
rename from htdocs/langs/pt_BR/trips.lang
rename to public/langs/pt_BR/trips.lang
diff --git a/htdocs/langs/pt_BR/users.lang b/public/langs/pt_BR/users.lang
similarity index 100%
rename from htdocs/langs/pt_BR/users.lang
rename to public/langs/pt_BR/users.lang
diff --git a/htdocs/langs/pt_BR/website.lang b/public/langs/pt_BR/website.lang
similarity index 100%
rename from htdocs/langs/pt_BR/website.lang
rename to public/langs/pt_BR/website.lang
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/public/langs/pt_BR/withdrawals.lang
similarity index 100%
rename from htdocs/langs/pt_BR/withdrawals.lang
rename to public/langs/pt_BR/withdrawals.lang
diff --git a/htdocs/langs/pt_BR/workflow.lang b/public/langs/pt_BR/workflow.lang
similarity index 100%
rename from htdocs/langs/pt_BR/workflow.lang
rename to public/langs/pt_BR/workflow.lang
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/public/langs/pt_PT/accountancy.lang
similarity index 100%
rename from htdocs/langs/pt_PT/accountancy.lang
rename to public/langs/pt_PT/accountancy.lang
diff --git a/htdocs/langs/pt_PT/admin.lang b/public/langs/pt_PT/admin.lang
similarity index 100%
rename from htdocs/langs/pt_PT/admin.lang
rename to public/langs/pt_PT/admin.lang
diff --git a/htdocs/langs/pt_PT/agenda.lang b/public/langs/pt_PT/agenda.lang
similarity index 100%
rename from htdocs/langs/pt_PT/agenda.lang
rename to public/langs/pt_PT/agenda.lang
diff --git a/htdocs/langs/pt_PT/banks.lang b/public/langs/pt_PT/banks.lang
similarity index 100%
rename from htdocs/langs/pt_PT/banks.lang
rename to public/langs/pt_PT/banks.lang
diff --git a/htdocs/langs/pt_PT/bills.lang b/public/langs/pt_PT/bills.lang
similarity index 100%
rename from htdocs/langs/pt_PT/bills.lang
rename to public/langs/pt_PT/bills.lang
diff --git a/htdocs/langs/pt_PT/bookmarks.lang b/public/langs/pt_PT/bookmarks.lang
similarity index 100%
rename from htdocs/langs/pt_PT/bookmarks.lang
rename to public/langs/pt_PT/bookmarks.lang
diff --git a/htdocs/langs/pt_PT/boxes.lang b/public/langs/pt_PT/boxes.lang
similarity index 100%
rename from htdocs/langs/pt_PT/boxes.lang
rename to public/langs/pt_PT/boxes.lang
diff --git a/htdocs/langs/pt_PT/cashdesk.lang b/public/langs/pt_PT/cashdesk.lang
similarity index 100%
rename from htdocs/langs/pt_PT/cashdesk.lang
rename to public/langs/pt_PT/cashdesk.lang
diff --git a/htdocs/langs/pt_PT/categories.lang b/public/langs/pt_PT/categories.lang
similarity index 100%
rename from htdocs/langs/pt_PT/categories.lang
rename to public/langs/pt_PT/categories.lang
diff --git a/htdocs/langs/pt_PT/commercial.lang b/public/langs/pt_PT/commercial.lang
similarity index 100%
rename from htdocs/langs/pt_PT/commercial.lang
rename to public/langs/pt_PT/commercial.lang
diff --git a/htdocs/langs/pt_PT/companies.lang b/public/langs/pt_PT/companies.lang
similarity index 100%
rename from htdocs/langs/pt_PT/companies.lang
rename to public/langs/pt_PT/companies.lang
diff --git a/htdocs/langs/pt_PT/compta.lang b/public/langs/pt_PT/compta.lang
similarity index 100%
rename from htdocs/langs/pt_PT/compta.lang
rename to public/langs/pt_PT/compta.lang
diff --git a/htdocs/langs/pt_PT/contracts.lang b/public/langs/pt_PT/contracts.lang
similarity index 100%
rename from htdocs/langs/pt_PT/contracts.lang
rename to public/langs/pt_PT/contracts.lang
diff --git a/htdocs/langs/pt_PT/cron.lang b/public/langs/pt_PT/cron.lang
similarity index 100%
rename from htdocs/langs/pt_PT/cron.lang
rename to public/langs/pt_PT/cron.lang
diff --git a/htdocs/langs/pt_PT/deliveries.lang b/public/langs/pt_PT/deliveries.lang
similarity index 100%
rename from htdocs/langs/pt_PT/deliveries.lang
rename to public/langs/pt_PT/deliveries.lang
diff --git a/htdocs/langs/pt_PT/dict.lang b/public/langs/pt_PT/dict.lang
similarity index 100%
rename from htdocs/langs/pt_PT/dict.lang
rename to public/langs/pt_PT/dict.lang
diff --git a/htdocs/langs/pt_PT/donations.lang b/public/langs/pt_PT/donations.lang
similarity index 100%
rename from htdocs/langs/pt_PT/donations.lang
rename to public/langs/pt_PT/donations.lang
diff --git a/htdocs/langs/pt_PT/ecm.lang b/public/langs/pt_PT/ecm.lang
similarity index 100%
rename from htdocs/langs/pt_PT/ecm.lang
rename to public/langs/pt_PT/ecm.lang
diff --git a/htdocs/langs/pt_PT/errors.lang b/public/langs/pt_PT/errors.lang
similarity index 100%
rename from htdocs/langs/pt_PT/errors.lang
rename to public/langs/pt_PT/errors.lang
diff --git a/htdocs/langs/pt_PT/exports.lang b/public/langs/pt_PT/exports.lang
similarity index 100%
rename from htdocs/langs/pt_PT/exports.lang
rename to public/langs/pt_PT/exports.lang
diff --git a/htdocs/langs/pt_PT/externalsite.lang b/public/langs/pt_PT/externalsite.lang
similarity index 100%
rename from htdocs/langs/pt_PT/externalsite.lang
rename to public/langs/pt_PT/externalsite.lang
diff --git a/htdocs/langs/pt_PT/ftp.lang b/public/langs/pt_PT/ftp.lang
similarity index 100%
rename from htdocs/langs/pt_PT/ftp.lang
rename to public/langs/pt_PT/ftp.lang
diff --git a/htdocs/langs/pt_PT/help.lang b/public/langs/pt_PT/help.lang
similarity index 100%
rename from htdocs/langs/pt_PT/help.lang
rename to public/langs/pt_PT/help.lang
diff --git a/htdocs/langs/pt_PT/holiday.lang b/public/langs/pt_PT/holiday.lang
similarity index 100%
rename from htdocs/langs/pt_PT/holiday.lang
rename to public/langs/pt_PT/holiday.lang
diff --git a/htdocs/langs/pt_PT/hrm.lang b/public/langs/pt_PT/hrm.lang
similarity index 100%
rename from htdocs/langs/pt_PT/hrm.lang
rename to public/langs/pt_PT/hrm.lang
diff --git a/htdocs/langs/pt_PT/incoterm.lang b/public/langs/pt_PT/incoterm.lang
similarity index 100%
rename from htdocs/langs/pt_PT/incoterm.lang
rename to public/langs/pt_PT/incoterm.lang
diff --git a/htdocs/langs/pt_PT/install.lang b/public/langs/pt_PT/install.lang
similarity index 100%
rename from htdocs/langs/pt_PT/install.lang
rename to public/langs/pt_PT/install.lang
diff --git a/htdocs/langs/pt_PT/interventions.lang b/public/langs/pt_PT/interventions.lang
similarity index 100%
rename from htdocs/langs/pt_PT/interventions.lang
rename to public/langs/pt_PT/interventions.lang
diff --git a/htdocs/langs/pt_PT/languages.lang b/public/langs/pt_PT/languages.lang
similarity index 100%
rename from htdocs/langs/pt_PT/languages.lang
rename to public/langs/pt_PT/languages.lang
diff --git a/htdocs/langs/pt_PT/ldap.lang b/public/langs/pt_PT/ldap.lang
similarity index 100%
rename from htdocs/langs/pt_PT/ldap.lang
rename to public/langs/pt_PT/ldap.lang
diff --git a/htdocs/langs/pt_PT/link.lang b/public/langs/pt_PT/link.lang
similarity index 100%
rename from htdocs/langs/pt_PT/link.lang
rename to public/langs/pt_PT/link.lang
diff --git a/htdocs/langs/pt_PT/loan.lang b/public/langs/pt_PT/loan.lang
similarity index 100%
rename from htdocs/langs/pt_PT/loan.lang
rename to public/langs/pt_PT/loan.lang
diff --git a/htdocs/langs/pt_PT/mailmanspip.lang b/public/langs/pt_PT/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/pt_PT/mailmanspip.lang
rename to public/langs/pt_PT/mailmanspip.lang
diff --git a/htdocs/langs/pt_PT/mails.lang b/public/langs/pt_PT/mails.lang
similarity index 100%
rename from htdocs/langs/pt_PT/mails.lang
rename to public/langs/pt_PT/mails.lang
diff --git a/htdocs/langs/pt_PT/main.lang b/public/langs/pt_PT/main.lang
similarity index 100%
rename from htdocs/langs/pt_PT/main.lang
rename to public/langs/pt_PT/main.lang
diff --git a/htdocs/langs/pt_PT/margins.lang b/public/langs/pt_PT/margins.lang
similarity index 100%
rename from htdocs/langs/pt_PT/margins.lang
rename to public/langs/pt_PT/margins.lang
diff --git a/htdocs/langs/pt_PT/members.lang b/public/langs/pt_PT/members.lang
similarity index 100%
rename from htdocs/langs/pt_PT/members.lang
rename to public/langs/pt_PT/members.lang
diff --git a/htdocs/langs/pt_PT/oauth.lang b/public/langs/pt_PT/oauth.lang
similarity index 100%
rename from htdocs/langs/pt_PT/oauth.lang
rename to public/langs/pt_PT/oauth.lang
diff --git a/htdocs/langs/pt_PT/opensurvey.lang b/public/langs/pt_PT/opensurvey.lang
similarity index 100%
rename from htdocs/langs/pt_PT/opensurvey.lang
rename to public/langs/pt_PT/opensurvey.lang
diff --git a/htdocs/langs/pt_PT/orders.lang b/public/langs/pt_PT/orders.lang
similarity index 100%
rename from htdocs/langs/pt_PT/orders.lang
rename to public/langs/pt_PT/orders.lang
diff --git a/htdocs/langs/pt_PT/other.lang b/public/langs/pt_PT/other.lang
similarity index 100%
rename from htdocs/langs/pt_PT/other.lang
rename to public/langs/pt_PT/other.lang
diff --git a/htdocs/langs/pt_PT/paybox.lang b/public/langs/pt_PT/paybox.lang
similarity index 100%
rename from htdocs/langs/pt_PT/paybox.lang
rename to public/langs/pt_PT/paybox.lang
diff --git a/htdocs/langs/pt_PT/paypal.lang b/public/langs/pt_PT/paypal.lang
similarity index 100%
rename from htdocs/langs/pt_PT/paypal.lang
rename to public/langs/pt_PT/paypal.lang
diff --git a/htdocs/langs/pt_PT/printing.lang b/public/langs/pt_PT/printing.lang
similarity index 100%
rename from htdocs/langs/pt_PT/printing.lang
rename to public/langs/pt_PT/printing.lang
diff --git a/htdocs/langs/pt_PT/productbatch.lang b/public/langs/pt_PT/productbatch.lang
similarity index 100%
rename from htdocs/langs/pt_PT/productbatch.lang
rename to public/langs/pt_PT/productbatch.lang
diff --git a/htdocs/langs/pt_PT/products.lang b/public/langs/pt_PT/products.lang
similarity index 100%
rename from htdocs/langs/pt_PT/products.lang
rename to public/langs/pt_PT/products.lang
diff --git a/htdocs/langs/pt_PT/projects.lang b/public/langs/pt_PT/projects.lang
similarity index 100%
rename from htdocs/langs/pt_PT/projects.lang
rename to public/langs/pt_PT/projects.lang
diff --git a/htdocs/langs/pt_PT/propal.lang b/public/langs/pt_PT/propal.lang
similarity index 100%
rename from htdocs/langs/pt_PT/propal.lang
rename to public/langs/pt_PT/propal.lang
diff --git a/htdocs/langs/pt_PT/receiptprinter.lang b/public/langs/pt_PT/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/pt_PT/receiptprinter.lang
rename to public/langs/pt_PT/receiptprinter.lang
diff --git a/htdocs/langs/pt_PT/resource.lang b/public/langs/pt_PT/resource.lang
similarity index 100%
rename from htdocs/langs/pt_PT/resource.lang
rename to public/langs/pt_PT/resource.lang
diff --git a/htdocs/langs/pt_PT/salaries.lang b/public/langs/pt_PT/salaries.lang
similarity index 100%
rename from htdocs/langs/pt_PT/salaries.lang
rename to public/langs/pt_PT/salaries.lang
diff --git a/htdocs/langs/pt_PT/sendings.lang b/public/langs/pt_PT/sendings.lang
similarity index 100%
rename from htdocs/langs/pt_PT/sendings.lang
rename to public/langs/pt_PT/sendings.lang
diff --git a/htdocs/langs/pt_PT/sms.lang b/public/langs/pt_PT/sms.lang
similarity index 100%
rename from htdocs/langs/pt_PT/sms.lang
rename to public/langs/pt_PT/sms.lang
diff --git a/htdocs/langs/pt_PT/stocks.lang b/public/langs/pt_PT/stocks.lang
similarity index 100%
rename from htdocs/langs/pt_PT/stocks.lang
rename to public/langs/pt_PT/stocks.lang
diff --git a/htdocs/langs/pt_PT/supplier_proposal.lang b/public/langs/pt_PT/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/pt_PT/supplier_proposal.lang
rename to public/langs/pt_PT/supplier_proposal.lang
diff --git a/htdocs/langs/pt_PT/suppliers.lang b/public/langs/pt_PT/suppliers.lang
similarity index 100%
rename from htdocs/langs/pt_PT/suppliers.lang
rename to public/langs/pt_PT/suppliers.lang
diff --git a/htdocs/langs/pt_PT/trips.lang b/public/langs/pt_PT/trips.lang
similarity index 100%
rename from htdocs/langs/pt_PT/trips.lang
rename to public/langs/pt_PT/trips.lang
diff --git a/htdocs/langs/pt_PT/users.lang b/public/langs/pt_PT/users.lang
similarity index 100%
rename from htdocs/langs/pt_PT/users.lang
rename to public/langs/pt_PT/users.lang
diff --git a/htdocs/langs/pt_PT/website.lang b/public/langs/pt_PT/website.lang
similarity index 100%
rename from htdocs/langs/pt_PT/website.lang
rename to public/langs/pt_PT/website.lang
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/public/langs/pt_PT/withdrawals.lang
similarity index 100%
rename from htdocs/langs/pt_PT/withdrawals.lang
rename to public/langs/pt_PT/withdrawals.lang
diff --git a/htdocs/langs/pt_PT/workflow.lang b/public/langs/pt_PT/workflow.lang
similarity index 100%
rename from htdocs/langs/pt_PT/workflow.lang
rename to public/langs/pt_PT/workflow.lang
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/public/langs/ro_RO/accountancy.lang
similarity index 100%
rename from htdocs/langs/ro_RO/accountancy.lang
rename to public/langs/ro_RO/accountancy.lang
diff --git a/htdocs/langs/ro_RO/admin.lang b/public/langs/ro_RO/admin.lang
similarity index 100%
rename from htdocs/langs/ro_RO/admin.lang
rename to public/langs/ro_RO/admin.lang
diff --git a/htdocs/langs/ro_RO/agenda.lang b/public/langs/ro_RO/agenda.lang
similarity index 100%
rename from htdocs/langs/ro_RO/agenda.lang
rename to public/langs/ro_RO/agenda.lang
diff --git a/htdocs/langs/ro_RO/banks.lang b/public/langs/ro_RO/banks.lang
similarity index 100%
rename from htdocs/langs/ro_RO/banks.lang
rename to public/langs/ro_RO/banks.lang
diff --git a/htdocs/langs/ro_RO/bills.lang b/public/langs/ro_RO/bills.lang
similarity index 100%
rename from htdocs/langs/ro_RO/bills.lang
rename to public/langs/ro_RO/bills.lang
diff --git a/htdocs/langs/ro_RO/bookmarks.lang b/public/langs/ro_RO/bookmarks.lang
similarity index 100%
rename from htdocs/langs/ro_RO/bookmarks.lang
rename to public/langs/ro_RO/bookmarks.lang
diff --git a/htdocs/langs/ro_RO/boxes.lang b/public/langs/ro_RO/boxes.lang
similarity index 100%
rename from htdocs/langs/ro_RO/boxes.lang
rename to public/langs/ro_RO/boxes.lang
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/public/langs/ro_RO/cashdesk.lang
similarity index 100%
rename from htdocs/langs/ro_RO/cashdesk.lang
rename to public/langs/ro_RO/cashdesk.lang
diff --git a/htdocs/langs/ro_RO/categories.lang b/public/langs/ro_RO/categories.lang
similarity index 100%
rename from htdocs/langs/ro_RO/categories.lang
rename to public/langs/ro_RO/categories.lang
diff --git a/htdocs/langs/ro_RO/commercial.lang b/public/langs/ro_RO/commercial.lang
similarity index 100%
rename from htdocs/langs/ro_RO/commercial.lang
rename to public/langs/ro_RO/commercial.lang
diff --git a/htdocs/langs/ro_RO/companies.lang b/public/langs/ro_RO/companies.lang
similarity index 100%
rename from htdocs/langs/ro_RO/companies.lang
rename to public/langs/ro_RO/companies.lang
diff --git a/htdocs/langs/ro_RO/compta.lang b/public/langs/ro_RO/compta.lang
similarity index 100%
rename from htdocs/langs/ro_RO/compta.lang
rename to public/langs/ro_RO/compta.lang
diff --git a/htdocs/langs/ro_RO/contracts.lang b/public/langs/ro_RO/contracts.lang
similarity index 100%
rename from htdocs/langs/ro_RO/contracts.lang
rename to public/langs/ro_RO/contracts.lang
diff --git a/htdocs/langs/ro_RO/cron.lang b/public/langs/ro_RO/cron.lang
similarity index 100%
rename from htdocs/langs/ro_RO/cron.lang
rename to public/langs/ro_RO/cron.lang
diff --git a/htdocs/langs/ro_RO/deliveries.lang b/public/langs/ro_RO/deliveries.lang
similarity index 100%
rename from htdocs/langs/ro_RO/deliveries.lang
rename to public/langs/ro_RO/deliveries.lang
diff --git a/htdocs/langs/ro_RO/dict.lang b/public/langs/ro_RO/dict.lang
similarity index 100%
rename from htdocs/langs/ro_RO/dict.lang
rename to public/langs/ro_RO/dict.lang
diff --git a/htdocs/langs/ro_RO/donations.lang b/public/langs/ro_RO/donations.lang
similarity index 100%
rename from htdocs/langs/ro_RO/donations.lang
rename to public/langs/ro_RO/donations.lang
diff --git a/htdocs/langs/ro_RO/ecm.lang b/public/langs/ro_RO/ecm.lang
similarity index 100%
rename from htdocs/langs/ro_RO/ecm.lang
rename to public/langs/ro_RO/ecm.lang
diff --git a/htdocs/langs/ro_RO/errors.lang b/public/langs/ro_RO/errors.lang
similarity index 100%
rename from htdocs/langs/ro_RO/errors.lang
rename to public/langs/ro_RO/errors.lang
diff --git a/htdocs/langs/ro_RO/exports.lang b/public/langs/ro_RO/exports.lang
similarity index 100%
rename from htdocs/langs/ro_RO/exports.lang
rename to public/langs/ro_RO/exports.lang
diff --git a/htdocs/langs/ro_RO/externalsite.lang b/public/langs/ro_RO/externalsite.lang
similarity index 100%
rename from htdocs/langs/ro_RO/externalsite.lang
rename to public/langs/ro_RO/externalsite.lang
diff --git a/htdocs/langs/ro_RO/ftp.lang b/public/langs/ro_RO/ftp.lang
similarity index 100%
rename from htdocs/langs/ro_RO/ftp.lang
rename to public/langs/ro_RO/ftp.lang
diff --git a/htdocs/langs/ro_RO/help.lang b/public/langs/ro_RO/help.lang
similarity index 100%
rename from htdocs/langs/ro_RO/help.lang
rename to public/langs/ro_RO/help.lang
diff --git a/htdocs/langs/ro_RO/holiday.lang b/public/langs/ro_RO/holiday.lang
similarity index 100%
rename from htdocs/langs/ro_RO/holiday.lang
rename to public/langs/ro_RO/holiday.lang
diff --git a/htdocs/langs/ro_RO/hrm.lang b/public/langs/ro_RO/hrm.lang
similarity index 100%
rename from htdocs/langs/ro_RO/hrm.lang
rename to public/langs/ro_RO/hrm.lang
diff --git a/htdocs/langs/ro_RO/incoterm.lang b/public/langs/ro_RO/incoterm.lang
similarity index 100%
rename from htdocs/langs/ro_RO/incoterm.lang
rename to public/langs/ro_RO/incoterm.lang
diff --git a/htdocs/langs/ro_RO/install.lang b/public/langs/ro_RO/install.lang
similarity index 100%
rename from htdocs/langs/ro_RO/install.lang
rename to public/langs/ro_RO/install.lang
diff --git a/htdocs/langs/ro_RO/interventions.lang b/public/langs/ro_RO/interventions.lang
similarity index 100%
rename from htdocs/langs/ro_RO/interventions.lang
rename to public/langs/ro_RO/interventions.lang
diff --git a/htdocs/langs/ro_RO/languages.lang b/public/langs/ro_RO/languages.lang
similarity index 100%
rename from htdocs/langs/ro_RO/languages.lang
rename to public/langs/ro_RO/languages.lang
diff --git a/htdocs/langs/ro_RO/ldap.lang b/public/langs/ro_RO/ldap.lang
similarity index 100%
rename from htdocs/langs/ro_RO/ldap.lang
rename to public/langs/ro_RO/ldap.lang
diff --git a/htdocs/langs/ro_RO/link.lang b/public/langs/ro_RO/link.lang
similarity index 100%
rename from htdocs/langs/ro_RO/link.lang
rename to public/langs/ro_RO/link.lang
diff --git a/htdocs/langs/ro_RO/loan.lang b/public/langs/ro_RO/loan.lang
similarity index 100%
rename from htdocs/langs/ro_RO/loan.lang
rename to public/langs/ro_RO/loan.lang
diff --git a/htdocs/langs/ro_RO/mailmanspip.lang b/public/langs/ro_RO/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/ro_RO/mailmanspip.lang
rename to public/langs/ro_RO/mailmanspip.lang
diff --git a/htdocs/langs/ro_RO/mails.lang b/public/langs/ro_RO/mails.lang
similarity index 100%
rename from htdocs/langs/ro_RO/mails.lang
rename to public/langs/ro_RO/mails.lang
diff --git a/htdocs/langs/ro_RO/main.lang b/public/langs/ro_RO/main.lang
similarity index 100%
rename from htdocs/langs/ro_RO/main.lang
rename to public/langs/ro_RO/main.lang
diff --git a/htdocs/langs/ro_RO/margins.lang b/public/langs/ro_RO/margins.lang
similarity index 100%
rename from htdocs/langs/ro_RO/margins.lang
rename to public/langs/ro_RO/margins.lang
diff --git a/htdocs/langs/ro_RO/members.lang b/public/langs/ro_RO/members.lang
similarity index 100%
rename from htdocs/langs/ro_RO/members.lang
rename to public/langs/ro_RO/members.lang
diff --git a/htdocs/langs/ro_RO/oauth.lang b/public/langs/ro_RO/oauth.lang
similarity index 100%
rename from htdocs/langs/ro_RO/oauth.lang
rename to public/langs/ro_RO/oauth.lang
diff --git a/htdocs/langs/ro_RO/opensurvey.lang b/public/langs/ro_RO/opensurvey.lang
similarity index 100%
rename from htdocs/langs/ro_RO/opensurvey.lang
rename to public/langs/ro_RO/opensurvey.lang
diff --git a/htdocs/langs/ro_RO/orders.lang b/public/langs/ro_RO/orders.lang
similarity index 100%
rename from htdocs/langs/ro_RO/orders.lang
rename to public/langs/ro_RO/orders.lang
diff --git a/htdocs/langs/ro_RO/other.lang b/public/langs/ro_RO/other.lang
similarity index 100%
rename from htdocs/langs/ro_RO/other.lang
rename to public/langs/ro_RO/other.lang
diff --git a/htdocs/langs/ro_RO/paybox.lang b/public/langs/ro_RO/paybox.lang
similarity index 100%
rename from htdocs/langs/ro_RO/paybox.lang
rename to public/langs/ro_RO/paybox.lang
diff --git a/htdocs/langs/ro_RO/paypal.lang b/public/langs/ro_RO/paypal.lang
similarity index 100%
rename from htdocs/langs/ro_RO/paypal.lang
rename to public/langs/ro_RO/paypal.lang
diff --git a/htdocs/langs/ro_RO/printing.lang b/public/langs/ro_RO/printing.lang
similarity index 100%
rename from htdocs/langs/ro_RO/printing.lang
rename to public/langs/ro_RO/printing.lang
diff --git a/htdocs/langs/ro_RO/productbatch.lang b/public/langs/ro_RO/productbatch.lang
similarity index 100%
rename from htdocs/langs/ro_RO/productbatch.lang
rename to public/langs/ro_RO/productbatch.lang
diff --git a/htdocs/langs/ro_RO/products.lang b/public/langs/ro_RO/products.lang
similarity index 100%
rename from htdocs/langs/ro_RO/products.lang
rename to public/langs/ro_RO/products.lang
diff --git a/htdocs/langs/ro_RO/projects.lang b/public/langs/ro_RO/projects.lang
similarity index 100%
rename from htdocs/langs/ro_RO/projects.lang
rename to public/langs/ro_RO/projects.lang
diff --git a/htdocs/langs/ro_RO/propal.lang b/public/langs/ro_RO/propal.lang
similarity index 100%
rename from htdocs/langs/ro_RO/propal.lang
rename to public/langs/ro_RO/propal.lang
diff --git a/htdocs/langs/ro_RO/receiptprinter.lang b/public/langs/ro_RO/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/ro_RO/receiptprinter.lang
rename to public/langs/ro_RO/receiptprinter.lang
diff --git a/htdocs/langs/ro_RO/resource.lang b/public/langs/ro_RO/resource.lang
similarity index 100%
rename from htdocs/langs/ro_RO/resource.lang
rename to public/langs/ro_RO/resource.lang
diff --git a/htdocs/langs/ro_RO/salaries.lang b/public/langs/ro_RO/salaries.lang
similarity index 100%
rename from htdocs/langs/ro_RO/salaries.lang
rename to public/langs/ro_RO/salaries.lang
diff --git a/htdocs/langs/ro_RO/sendings.lang b/public/langs/ro_RO/sendings.lang
similarity index 100%
rename from htdocs/langs/ro_RO/sendings.lang
rename to public/langs/ro_RO/sendings.lang
diff --git a/htdocs/langs/ro_RO/sms.lang b/public/langs/ro_RO/sms.lang
similarity index 100%
rename from htdocs/langs/ro_RO/sms.lang
rename to public/langs/ro_RO/sms.lang
diff --git a/htdocs/langs/ro_RO/stocks.lang b/public/langs/ro_RO/stocks.lang
similarity index 100%
rename from htdocs/langs/ro_RO/stocks.lang
rename to public/langs/ro_RO/stocks.lang
diff --git a/htdocs/langs/ro_RO/supplier_proposal.lang b/public/langs/ro_RO/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/ro_RO/supplier_proposal.lang
rename to public/langs/ro_RO/supplier_proposal.lang
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/public/langs/ro_RO/suppliers.lang
similarity index 100%
rename from htdocs/langs/ro_RO/suppliers.lang
rename to public/langs/ro_RO/suppliers.lang
diff --git a/htdocs/langs/ro_RO/trips.lang b/public/langs/ro_RO/trips.lang
similarity index 100%
rename from htdocs/langs/ro_RO/trips.lang
rename to public/langs/ro_RO/trips.lang
diff --git a/htdocs/langs/ro_RO/users.lang b/public/langs/ro_RO/users.lang
similarity index 100%
rename from htdocs/langs/ro_RO/users.lang
rename to public/langs/ro_RO/users.lang
diff --git a/htdocs/langs/ro_RO/website.lang b/public/langs/ro_RO/website.lang
similarity index 100%
rename from htdocs/langs/ro_RO/website.lang
rename to public/langs/ro_RO/website.lang
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/public/langs/ro_RO/withdrawals.lang
similarity index 100%
rename from htdocs/langs/ro_RO/withdrawals.lang
rename to public/langs/ro_RO/withdrawals.lang
diff --git a/htdocs/langs/ro_RO/workflow.lang b/public/langs/ro_RO/workflow.lang
similarity index 100%
rename from htdocs/langs/ro_RO/workflow.lang
rename to public/langs/ro_RO/workflow.lang
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/public/langs/ru_RU/accountancy.lang
similarity index 100%
rename from htdocs/langs/ru_RU/accountancy.lang
rename to public/langs/ru_RU/accountancy.lang
diff --git a/htdocs/langs/ru_RU/admin.lang b/public/langs/ru_RU/admin.lang
similarity index 100%
rename from htdocs/langs/ru_RU/admin.lang
rename to public/langs/ru_RU/admin.lang
diff --git a/htdocs/langs/ru_RU/agenda.lang b/public/langs/ru_RU/agenda.lang
similarity index 100%
rename from htdocs/langs/ru_RU/agenda.lang
rename to public/langs/ru_RU/agenda.lang
diff --git a/htdocs/langs/ru_RU/banks.lang b/public/langs/ru_RU/banks.lang
similarity index 100%
rename from htdocs/langs/ru_RU/banks.lang
rename to public/langs/ru_RU/banks.lang
diff --git a/htdocs/langs/ru_RU/bills.lang b/public/langs/ru_RU/bills.lang
similarity index 100%
rename from htdocs/langs/ru_RU/bills.lang
rename to public/langs/ru_RU/bills.lang
diff --git a/htdocs/langs/ru_RU/bookmarks.lang b/public/langs/ru_RU/bookmarks.lang
similarity index 100%
rename from htdocs/langs/ru_RU/bookmarks.lang
rename to public/langs/ru_RU/bookmarks.lang
diff --git a/htdocs/langs/ru_RU/boxes.lang b/public/langs/ru_RU/boxes.lang
similarity index 100%
rename from htdocs/langs/ru_RU/boxes.lang
rename to public/langs/ru_RU/boxes.lang
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/public/langs/ru_RU/cashdesk.lang
similarity index 100%
rename from htdocs/langs/ru_RU/cashdesk.lang
rename to public/langs/ru_RU/cashdesk.lang
diff --git a/htdocs/langs/ru_RU/categories.lang b/public/langs/ru_RU/categories.lang
similarity index 100%
rename from htdocs/langs/ru_RU/categories.lang
rename to public/langs/ru_RU/categories.lang
diff --git a/htdocs/langs/ru_RU/commercial.lang b/public/langs/ru_RU/commercial.lang
similarity index 100%
rename from htdocs/langs/ru_RU/commercial.lang
rename to public/langs/ru_RU/commercial.lang
diff --git a/htdocs/langs/ru_RU/companies.lang b/public/langs/ru_RU/companies.lang
similarity index 100%
rename from htdocs/langs/ru_RU/companies.lang
rename to public/langs/ru_RU/companies.lang
diff --git a/htdocs/langs/ru_RU/compta.lang b/public/langs/ru_RU/compta.lang
similarity index 100%
rename from htdocs/langs/ru_RU/compta.lang
rename to public/langs/ru_RU/compta.lang
diff --git a/htdocs/langs/ru_RU/contracts.lang b/public/langs/ru_RU/contracts.lang
similarity index 100%
rename from htdocs/langs/ru_RU/contracts.lang
rename to public/langs/ru_RU/contracts.lang
diff --git a/htdocs/langs/ru_RU/cron.lang b/public/langs/ru_RU/cron.lang
similarity index 100%
rename from htdocs/langs/ru_RU/cron.lang
rename to public/langs/ru_RU/cron.lang
diff --git a/htdocs/langs/ru_RU/deliveries.lang b/public/langs/ru_RU/deliveries.lang
similarity index 100%
rename from htdocs/langs/ru_RU/deliveries.lang
rename to public/langs/ru_RU/deliveries.lang
diff --git a/htdocs/langs/ru_RU/dict.lang b/public/langs/ru_RU/dict.lang
similarity index 100%
rename from htdocs/langs/ru_RU/dict.lang
rename to public/langs/ru_RU/dict.lang
diff --git a/htdocs/langs/ru_RU/donations.lang b/public/langs/ru_RU/donations.lang
similarity index 100%
rename from htdocs/langs/ru_RU/donations.lang
rename to public/langs/ru_RU/donations.lang
diff --git a/htdocs/langs/ru_RU/ecm.lang b/public/langs/ru_RU/ecm.lang
similarity index 100%
rename from htdocs/langs/ru_RU/ecm.lang
rename to public/langs/ru_RU/ecm.lang
diff --git a/htdocs/langs/ru_RU/errors.lang b/public/langs/ru_RU/errors.lang
similarity index 100%
rename from htdocs/langs/ru_RU/errors.lang
rename to public/langs/ru_RU/errors.lang
diff --git a/htdocs/langs/ru_RU/exports.lang b/public/langs/ru_RU/exports.lang
similarity index 100%
rename from htdocs/langs/ru_RU/exports.lang
rename to public/langs/ru_RU/exports.lang
diff --git a/htdocs/langs/ru_RU/externalsite.lang b/public/langs/ru_RU/externalsite.lang
similarity index 100%
rename from htdocs/langs/ru_RU/externalsite.lang
rename to public/langs/ru_RU/externalsite.lang
diff --git a/htdocs/langs/ru_RU/ftp.lang b/public/langs/ru_RU/ftp.lang
similarity index 100%
rename from htdocs/langs/ru_RU/ftp.lang
rename to public/langs/ru_RU/ftp.lang
diff --git a/htdocs/langs/ru_RU/help.lang b/public/langs/ru_RU/help.lang
similarity index 100%
rename from htdocs/langs/ru_RU/help.lang
rename to public/langs/ru_RU/help.lang
diff --git a/htdocs/langs/ru_RU/holiday.lang b/public/langs/ru_RU/holiday.lang
similarity index 100%
rename from htdocs/langs/ru_RU/holiday.lang
rename to public/langs/ru_RU/holiday.lang
diff --git a/htdocs/langs/ru_RU/hrm.lang b/public/langs/ru_RU/hrm.lang
similarity index 100%
rename from htdocs/langs/ru_RU/hrm.lang
rename to public/langs/ru_RU/hrm.lang
diff --git a/htdocs/langs/ru_RU/incoterm.lang b/public/langs/ru_RU/incoterm.lang
similarity index 100%
rename from htdocs/langs/ru_RU/incoterm.lang
rename to public/langs/ru_RU/incoterm.lang
diff --git a/htdocs/langs/ru_RU/install.lang b/public/langs/ru_RU/install.lang
similarity index 100%
rename from htdocs/langs/ru_RU/install.lang
rename to public/langs/ru_RU/install.lang
diff --git a/htdocs/langs/ru_RU/interventions.lang b/public/langs/ru_RU/interventions.lang
similarity index 100%
rename from htdocs/langs/ru_RU/interventions.lang
rename to public/langs/ru_RU/interventions.lang
diff --git a/htdocs/langs/ru_RU/languages.lang b/public/langs/ru_RU/languages.lang
similarity index 100%
rename from htdocs/langs/ru_RU/languages.lang
rename to public/langs/ru_RU/languages.lang
diff --git a/htdocs/langs/ru_RU/ldap.lang b/public/langs/ru_RU/ldap.lang
similarity index 100%
rename from htdocs/langs/ru_RU/ldap.lang
rename to public/langs/ru_RU/ldap.lang
diff --git a/htdocs/langs/ru_RU/link.lang b/public/langs/ru_RU/link.lang
similarity index 100%
rename from htdocs/langs/ru_RU/link.lang
rename to public/langs/ru_RU/link.lang
diff --git a/htdocs/langs/ru_RU/loan.lang b/public/langs/ru_RU/loan.lang
similarity index 100%
rename from htdocs/langs/ru_RU/loan.lang
rename to public/langs/ru_RU/loan.lang
diff --git a/htdocs/langs/ru_RU/mailmanspip.lang b/public/langs/ru_RU/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/ru_RU/mailmanspip.lang
rename to public/langs/ru_RU/mailmanspip.lang
diff --git a/htdocs/langs/ru_RU/mails.lang b/public/langs/ru_RU/mails.lang
similarity index 100%
rename from htdocs/langs/ru_RU/mails.lang
rename to public/langs/ru_RU/mails.lang
diff --git a/htdocs/langs/ru_RU/main.lang b/public/langs/ru_RU/main.lang
similarity index 100%
rename from htdocs/langs/ru_RU/main.lang
rename to public/langs/ru_RU/main.lang
diff --git a/htdocs/langs/ru_RU/margins.lang b/public/langs/ru_RU/margins.lang
similarity index 100%
rename from htdocs/langs/ru_RU/margins.lang
rename to public/langs/ru_RU/margins.lang
diff --git a/htdocs/langs/ru_RU/members.lang b/public/langs/ru_RU/members.lang
similarity index 100%
rename from htdocs/langs/ru_RU/members.lang
rename to public/langs/ru_RU/members.lang
diff --git a/htdocs/langs/ru_RU/oauth.lang b/public/langs/ru_RU/oauth.lang
similarity index 100%
rename from htdocs/langs/ru_RU/oauth.lang
rename to public/langs/ru_RU/oauth.lang
diff --git a/htdocs/langs/ru_RU/opensurvey.lang b/public/langs/ru_RU/opensurvey.lang
similarity index 100%
rename from htdocs/langs/ru_RU/opensurvey.lang
rename to public/langs/ru_RU/opensurvey.lang
diff --git a/htdocs/langs/ru_RU/orders.lang b/public/langs/ru_RU/orders.lang
similarity index 100%
rename from htdocs/langs/ru_RU/orders.lang
rename to public/langs/ru_RU/orders.lang
diff --git a/htdocs/langs/ru_RU/other.lang b/public/langs/ru_RU/other.lang
similarity index 100%
rename from htdocs/langs/ru_RU/other.lang
rename to public/langs/ru_RU/other.lang
diff --git a/htdocs/langs/ru_RU/paybox.lang b/public/langs/ru_RU/paybox.lang
similarity index 100%
rename from htdocs/langs/ru_RU/paybox.lang
rename to public/langs/ru_RU/paybox.lang
diff --git a/htdocs/langs/ru_RU/paypal.lang b/public/langs/ru_RU/paypal.lang
similarity index 100%
rename from htdocs/langs/ru_RU/paypal.lang
rename to public/langs/ru_RU/paypal.lang
diff --git a/htdocs/langs/ru_RU/printing.lang b/public/langs/ru_RU/printing.lang
similarity index 100%
rename from htdocs/langs/ru_RU/printing.lang
rename to public/langs/ru_RU/printing.lang
diff --git a/htdocs/langs/ru_RU/productbatch.lang b/public/langs/ru_RU/productbatch.lang
similarity index 100%
rename from htdocs/langs/ru_RU/productbatch.lang
rename to public/langs/ru_RU/productbatch.lang
diff --git a/htdocs/langs/ru_RU/products.lang b/public/langs/ru_RU/products.lang
similarity index 100%
rename from htdocs/langs/ru_RU/products.lang
rename to public/langs/ru_RU/products.lang
diff --git a/htdocs/langs/ru_RU/projects.lang b/public/langs/ru_RU/projects.lang
similarity index 100%
rename from htdocs/langs/ru_RU/projects.lang
rename to public/langs/ru_RU/projects.lang
diff --git a/htdocs/langs/ru_RU/propal.lang b/public/langs/ru_RU/propal.lang
similarity index 100%
rename from htdocs/langs/ru_RU/propal.lang
rename to public/langs/ru_RU/propal.lang
diff --git a/htdocs/langs/ru_RU/receiptprinter.lang b/public/langs/ru_RU/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/ru_RU/receiptprinter.lang
rename to public/langs/ru_RU/receiptprinter.lang
diff --git a/htdocs/langs/ru_RU/resource.lang b/public/langs/ru_RU/resource.lang
similarity index 100%
rename from htdocs/langs/ru_RU/resource.lang
rename to public/langs/ru_RU/resource.lang
diff --git a/htdocs/langs/ru_RU/salaries.lang b/public/langs/ru_RU/salaries.lang
similarity index 100%
rename from htdocs/langs/ru_RU/salaries.lang
rename to public/langs/ru_RU/salaries.lang
diff --git a/htdocs/langs/ru_RU/sendings.lang b/public/langs/ru_RU/sendings.lang
similarity index 100%
rename from htdocs/langs/ru_RU/sendings.lang
rename to public/langs/ru_RU/sendings.lang
diff --git a/htdocs/langs/ru_RU/sms.lang b/public/langs/ru_RU/sms.lang
similarity index 100%
rename from htdocs/langs/ru_RU/sms.lang
rename to public/langs/ru_RU/sms.lang
diff --git a/htdocs/langs/ru_RU/stocks.lang b/public/langs/ru_RU/stocks.lang
similarity index 100%
rename from htdocs/langs/ru_RU/stocks.lang
rename to public/langs/ru_RU/stocks.lang
diff --git a/htdocs/langs/ru_RU/supplier_proposal.lang b/public/langs/ru_RU/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/ru_RU/supplier_proposal.lang
rename to public/langs/ru_RU/supplier_proposal.lang
diff --git a/htdocs/langs/ru_RU/suppliers.lang b/public/langs/ru_RU/suppliers.lang
similarity index 100%
rename from htdocs/langs/ru_RU/suppliers.lang
rename to public/langs/ru_RU/suppliers.lang
diff --git a/htdocs/langs/ru_RU/trips.lang b/public/langs/ru_RU/trips.lang
similarity index 100%
rename from htdocs/langs/ru_RU/trips.lang
rename to public/langs/ru_RU/trips.lang
diff --git a/htdocs/langs/ru_RU/users.lang b/public/langs/ru_RU/users.lang
similarity index 100%
rename from htdocs/langs/ru_RU/users.lang
rename to public/langs/ru_RU/users.lang
diff --git a/htdocs/langs/ru_RU/website.lang b/public/langs/ru_RU/website.lang
similarity index 100%
rename from htdocs/langs/ru_RU/website.lang
rename to public/langs/ru_RU/website.lang
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/public/langs/ru_RU/withdrawals.lang
similarity index 100%
rename from htdocs/langs/ru_RU/withdrawals.lang
rename to public/langs/ru_RU/withdrawals.lang
diff --git a/htdocs/langs/ru_RU/workflow.lang b/public/langs/ru_RU/workflow.lang
similarity index 100%
rename from htdocs/langs/ru_RU/workflow.lang
rename to public/langs/ru_RU/workflow.lang
diff --git a/htdocs/langs/ru_UA/banks.lang b/public/langs/ru_UA/banks.lang
similarity index 100%
rename from htdocs/langs/ru_UA/banks.lang
rename to public/langs/ru_UA/banks.lang
diff --git a/htdocs/langs/ru_UA/bookmarks.lang b/public/langs/ru_UA/bookmarks.lang
similarity index 100%
rename from htdocs/langs/ru_UA/bookmarks.lang
rename to public/langs/ru_UA/bookmarks.lang
diff --git a/htdocs/langs/ru_UA/compta.lang b/public/langs/ru_UA/compta.lang
similarity index 100%
rename from htdocs/langs/ru_UA/compta.lang
rename to public/langs/ru_UA/compta.lang
diff --git a/htdocs/langs/ru_UA/contracts.lang b/public/langs/ru_UA/contracts.lang
similarity index 100%
rename from htdocs/langs/ru_UA/contracts.lang
rename to public/langs/ru_UA/contracts.lang
diff --git a/htdocs/langs/ru_UA/dict.lang b/public/langs/ru_UA/dict.lang
similarity index 100%
rename from htdocs/langs/ru_UA/dict.lang
rename to public/langs/ru_UA/dict.lang
diff --git a/htdocs/langs/ru_UA/ecm.lang b/public/langs/ru_UA/ecm.lang
similarity index 100%
rename from htdocs/langs/ru_UA/ecm.lang
rename to public/langs/ru_UA/ecm.lang
diff --git a/htdocs/langs/ru_UA/errors.lang b/public/langs/ru_UA/errors.lang
similarity index 100%
rename from htdocs/langs/ru_UA/errors.lang
rename to public/langs/ru_UA/errors.lang
diff --git a/htdocs/langs/ru_UA/ftp.lang b/public/langs/ru_UA/ftp.lang
similarity index 100%
rename from htdocs/langs/ru_UA/ftp.lang
rename to public/langs/ru_UA/ftp.lang
diff --git a/htdocs/langs/ru_UA/install.lang b/public/langs/ru_UA/install.lang
similarity index 100%
rename from htdocs/langs/ru_UA/install.lang
rename to public/langs/ru_UA/install.lang
diff --git a/htdocs/langs/ru_UA/interventions.lang b/public/langs/ru_UA/interventions.lang
similarity index 100%
rename from htdocs/langs/ru_UA/interventions.lang
rename to public/langs/ru_UA/interventions.lang
diff --git a/htdocs/langs/ru_UA/mails.lang b/public/langs/ru_UA/mails.lang
similarity index 100%
rename from htdocs/langs/ru_UA/mails.lang
rename to public/langs/ru_UA/mails.lang
diff --git a/htdocs/langs/ru_UA/main.lang b/public/langs/ru_UA/main.lang
similarity index 100%
rename from htdocs/langs/ru_UA/main.lang
rename to public/langs/ru_UA/main.lang
diff --git a/htdocs/langs/ru_UA/other.lang b/public/langs/ru_UA/other.lang
similarity index 100%
rename from htdocs/langs/ru_UA/other.lang
rename to public/langs/ru_UA/other.lang
diff --git a/htdocs/langs/ru_UA/paybox.lang b/public/langs/ru_UA/paybox.lang
similarity index 100%
rename from htdocs/langs/ru_UA/paybox.lang
rename to public/langs/ru_UA/paybox.lang
diff --git a/htdocs/langs/ru_UA/paypal.lang b/public/langs/ru_UA/paypal.lang
similarity index 100%
rename from htdocs/langs/ru_UA/paypal.lang
rename to public/langs/ru_UA/paypal.lang
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/public/langs/sk_SK/accountancy.lang
similarity index 100%
rename from htdocs/langs/sk_SK/accountancy.lang
rename to public/langs/sk_SK/accountancy.lang
diff --git a/htdocs/langs/sk_SK/admin.lang b/public/langs/sk_SK/admin.lang
similarity index 100%
rename from htdocs/langs/sk_SK/admin.lang
rename to public/langs/sk_SK/admin.lang
diff --git a/htdocs/langs/sk_SK/agenda.lang b/public/langs/sk_SK/agenda.lang
similarity index 100%
rename from htdocs/langs/sk_SK/agenda.lang
rename to public/langs/sk_SK/agenda.lang
diff --git a/htdocs/langs/sk_SK/banks.lang b/public/langs/sk_SK/banks.lang
similarity index 100%
rename from htdocs/langs/sk_SK/banks.lang
rename to public/langs/sk_SK/banks.lang
diff --git a/htdocs/langs/sk_SK/bills.lang b/public/langs/sk_SK/bills.lang
similarity index 100%
rename from htdocs/langs/sk_SK/bills.lang
rename to public/langs/sk_SK/bills.lang
diff --git a/htdocs/langs/sk_SK/bookmarks.lang b/public/langs/sk_SK/bookmarks.lang
similarity index 100%
rename from htdocs/langs/sk_SK/bookmarks.lang
rename to public/langs/sk_SK/bookmarks.lang
diff --git a/htdocs/langs/sk_SK/boxes.lang b/public/langs/sk_SK/boxes.lang
similarity index 100%
rename from htdocs/langs/sk_SK/boxes.lang
rename to public/langs/sk_SK/boxes.lang
diff --git a/htdocs/langs/sk_SK/cashdesk.lang b/public/langs/sk_SK/cashdesk.lang
similarity index 100%
rename from htdocs/langs/sk_SK/cashdesk.lang
rename to public/langs/sk_SK/cashdesk.lang
diff --git a/htdocs/langs/sk_SK/categories.lang b/public/langs/sk_SK/categories.lang
similarity index 100%
rename from htdocs/langs/sk_SK/categories.lang
rename to public/langs/sk_SK/categories.lang
diff --git a/htdocs/langs/sk_SK/commercial.lang b/public/langs/sk_SK/commercial.lang
similarity index 100%
rename from htdocs/langs/sk_SK/commercial.lang
rename to public/langs/sk_SK/commercial.lang
diff --git a/htdocs/langs/sk_SK/companies.lang b/public/langs/sk_SK/companies.lang
similarity index 100%
rename from htdocs/langs/sk_SK/companies.lang
rename to public/langs/sk_SK/companies.lang
diff --git a/htdocs/langs/sk_SK/compta.lang b/public/langs/sk_SK/compta.lang
similarity index 100%
rename from htdocs/langs/sk_SK/compta.lang
rename to public/langs/sk_SK/compta.lang
diff --git a/htdocs/langs/sk_SK/contracts.lang b/public/langs/sk_SK/contracts.lang
similarity index 100%
rename from htdocs/langs/sk_SK/contracts.lang
rename to public/langs/sk_SK/contracts.lang
diff --git a/htdocs/langs/sk_SK/cron.lang b/public/langs/sk_SK/cron.lang
similarity index 100%
rename from htdocs/langs/sk_SK/cron.lang
rename to public/langs/sk_SK/cron.lang
diff --git a/htdocs/langs/sk_SK/deliveries.lang b/public/langs/sk_SK/deliveries.lang
similarity index 100%
rename from htdocs/langs/sk_SK/deliveries.lang
rename to public/langs/sk_SK/deliveries.lang
diff --git a/htdocs/langs/sk_SK/dict.lang b/public/langs/sk_SK/dict.lang
similarity index 100%
rename from htdocs/langs/sk_SK/dict.lang
rename to public/langs/sk_SK/dict.lang
diff --git a/htdocs/langs/sk_SK/donations.lang b/public/langs/sk_SK/donations.lang
similarity index 100%
rename from htdocs/langs/sk_SK/donations.lang
rename to public/langs/sk_SK/donations.lang
diff --git a/htdocs/langs/sk_SK/ecm.lang b/public/langs/sk_SK/ecm.lang
similarity index 100%
rename from htdocs/langs/sk_SK/ecm.lang
rename to public/langs/sk_SK/ecm.lang
diff --git a/htdocs/langs/sk_SK/errors.lang b/public/langs/sk_SK/errors.lang
similarity index 100%
rename from htdocs/langs/sk_SK/errors.lang
rename to public/langs/sk_SK/errors.lang
diff --git a/htdocs/langs/sk_SK/exports.lang b/public/langs/sk_SK/exports.lang
similarity index 100%
rename from htdocs/langs/sk_SK/exports.lang
rename to public/langs/sk_SK/exports.lang
diff --git a/htdocs/langs/sk_SK/externalsite.lang b/public/langs/sk_SK/externalsite.lang
similarity index 100%
rename from htdocs/langs/sk_SK/externalsite.lang
rename to public/langs/sk_SK/externalsite.lang
diff --git a/htdocs/langs/sk_SK/ftp.lang b/public/langs/sk_SK/ftp.lang
similarity index 100%
rename from htdocs/langs/sk_SK/ftp.lang
rename to public/langs/sk_SK/ftp.lang
diff --git a/htdocs/langs/sk_SK/help.lang b/public/langs/sk_SK/help.lang
similarity index 100%
rename from htdocs/langs/sk_SK/help.lang
rename to public/langs/sk_SK/help.lang
diff --git a/htdocs/langs/sk_SK/holiday.lang b/public/langs/sk_SK/holiday.lang
similarity index 100%
rename from htdocs/langs/sk_SK/holiday.lang
rename to public/langs/sk_SK/holiday.lang
diff --git a/htdocs/langs/sk_SK/hrm.lang b/public/langs/sk_SK/hrm.lang
similarity index 100%
rename from htdocs/langs/sk_SK/hrm.lang
rename to public/langs/sk_SK/hrm.lang
diff --git a/htdocs/langs/sk_SK/incoterm.lang b/public/langs/sk_SK/incoterm.lang
similarity index 100%
rename from htdocs/langs/sk_SK/incoterm.lang
rename to public/langs/sk_SK/incoterm.lang
diff --git a/htdocs/langs/sk_SK/install.lang b/public/langs/sk_SK/install.lang
similarity index 100%
rename from htdocs/langs/sk_SK/install.lang
rename to public/langs/sk_SK/install.lang
diff --git a/htdocs/langs/sk_SK/interventions.lang b/public/langs/sk_SK/interventions.lang
similarity index 100%
rename from htdocs/langs/sk_SK/interventions.lang
rename to public/langs/sk_SK/interventions.lang
diff --git a/htdocs/langs/sk_SK/languages.lang b/public/langs/sk_SK/languages.lang
similarity index 100%
rename from htdocs/langs/sk_SK/languages.lang
rename to public/langs/sk_SK/languages.lang
diff --git a/htdocs/langs/sk_SK/ldap.lang b/public/langs/sk_SK/ldap.lang
similarity index 100%
rename from htdocs/langs/sk_SK/ldap.lang
rename to public/langs/sk_SK/ldap.lang
diff --git a/htdocs/langs/sk_SK/link.lang b/public/langs/sk_SK/link.lang
similarity index 100%
rename from htdocs/langs/sk_SK/link.lang
rename to public/langs/sk_SK/link.lang
diff --git a/htdocs/langs/sk_SK/loan.lang b/public/langs/sk_SK/loan.lang
similarity index 100%
rename from htdocs/langs/sk_SK/loan.lang
rename to public/langs/sk_SK/loan.lang
diff --git a/htdocs/langs/sk_SK/mailmanspip.lang b/public/langs/sk_SK/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/sk_SK/mailmanspip.lang
rename to public/langs/sk_SK/mailmanspip.lang
diff --git a/htdocs/langs/sk_SK/mails.lang b/public/langs/sk_SK/mails.lang
similarity index 100%
rename from htdocs/langs/sk_SK/mails.lang
rename to public/langs/sk_SK/mails.lang
diff --git a/htdocs/langs/sk_SK/main.lang b/public/langs/sk_SK/main.lang
similarity index 100%
rename from htdocs/langs/sk_SK/main.lang
rename to public/langs/sk_SK/main.lang
diff --git a/htdocs/langs/sk_SK/margins.lang b/public/langs/sk_SK/margins.lang
similarity index 100%
rename from htdocs/langs/sk_SK/margins.lang
rename to public/langs/sk_SK/margins.lang
diff --git a/htdocs/langs/sk_SK/members.lang b/public/langs/sk_SK/members.lang
similarity index 100%
rename from htdocs/langs/sk_SK/members.lang
rename to public/langs/sk_SK/members.lang
diff --git a/htdocs/langs/sk_SK/oauth.lang b/public/langs/sk_SK/oauth.lang
similarity index 100%
rename from htdocs/langs/sk_SK/oauth.lang
rename to public/langs/sk_SK/oauth.lang
diff --git a/htdocs/langs/sk_SK/opensurvey.lang b/public/langs/sk_SK/opensurvey.lang
similarity index 100%
rename from htdocs/langs/sk_SK/opensurvey.lang
rename to public/langs/sk_SK/opensurvey.lang
diff --git a/htdocs/langs/sk_SK/orders.lang b/public/langs/sk_SK/orders.lang
similarity index 100%
rename from htdocs/langs/sk_SK/orders.lang
rename to public/langs/sk_SK/orders.lang
diff --git a/htdocs/langs/sk_SK/other.lang b/public/langs/sk_SK/other.lang
similarity index 100%
rename from htdocs/langs/sk_SK/other.lang
rename to public/langs/sk_SK/other.lang
diff --git a/htdocs/langs/sk_SK/paybox.lang b/public/langs/sk_SK/paybox.lang
similarity index 100%
rename from htdocs/langs/sk_SK/paybox.lang
rename to public/langs/sk_SK/paybox.lang
diff --git a/htdocs/langs/sk_SK/paypal.lang b/public/langs/sk_SK/paypal.lang
similarity index 100%
rename from htdocs/langs/sk_SK/paypal.lang
rename to public/langs/sk_SK/paypal.lang
diff --git a/htdocs/langs/sk_SK/printing.lang b/public/langs/sk_SK/printing.lang
similarity index 100%
rename from htdocs/langs/sk_SK/printing.lang
rename to public/langs/sk_SK/printing.lang
diff --git a/htdocs/langs/sk_SK/productbatch.lang b/public/langs/sk_SK/productbatch.lang
similarity index 100%
rename from htdocs/langs/sk_SK/productbatch.lang
rename to public/langs/sk_SK/productbatch.lang
diff --git a/htdocs/langs/sk_SK/products.lang b/public/langs/sk_SK/products.lang
similarity index 100%
rename from htdocs/langs/sk_SK/products.lang
rename to public/langs/sk_SK/products.lang
diff --git a/htdocs/langs/sk_SK/projects.lang b/public/langs/sk_SK/projects.lang
similarity index 100%
rename from htdocs/langs/sk_SK/projects.lang
rename to public/langs/sk_SK/projects.lang
diff --git a/htdocs/langs/sk_SK/propal.lang b/public/langs/sk_SK/propal.lang
similarity index 100%
rename from htdocs/langs/sk_SK/propal.lang
rename to public/langs/sk_SK/propal.lang
diff --git a/htdocs/langs/sk_SK/receiptprinter.lang b/public/langs/sk_SK/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/sk_SK/receiptprinter.lang
rename to public/langs/sk_SK/receiptprinter.lang
diff --git a/htdocs/langs/sk_SK/resource.lang b/public/langs/sk_SK/resource.lang
similarity index 100%
rename from htdocs/langs/sk_SK/resource.lang
rename to public/langs/sk_SK/resource.lang
diff --git a/htdocs/langs/sk_SK/salaries.lang b/public/langs/sk_SK/salaries.lang
similarity index 100%
rename from htdocs/langs/sk_SK/salaries.lang
rename to public/langs/sk_SK/salaries.lang
diff --git a/htdocs/langs/sk_SK/sendings.lang b/public/langs/sk_SK/sendings.lang
similarity index 100%
rename from htdocs/langs/sk_SK/sendings.lang
rename to public/langs/sk_SK/sendings.lang
diff --git a/htdocs/langs/sk_SK/sms.lang b/public/langs/sk_SK/sms.lang
similarity index 100%
rename from htdocs/langs/sk_SK/sms.lang
rename to public/langs/sk_SK/sms.lang
diff --git a/htdocs/langs/sk_SK/stocks.lang b/public/langs/sk_SK/stocks.lang
similarity index 100%
rename from htdocs/langs/sk_SK/stocks.lang
rename to public/langs/sk_SK/stocks.lang
diff --git a/htdocs/langs/sk_SK/supplier_proposal.lang b/public/langs/sk_SK/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/sk_SK/supplier_proposal.lang
rename to public/langs/sk_SK/supplier_proposal.lang
diff --git a/htdocs/langs/sk_SK/suppliers.lang b/public/langs/sk_SK/suppliers.lang
similarity index 100%
rename from htdocs/langs/sk_SK/suppliers.lang
rename to public/langs/sk_SK/suppliers.lang
diff --git a/htdocs/langs/sk_SK/trips.lang b/public/langs/sk_SK/trips.lang
similarity index 100%
rename from htdocs/langs/sk_SK/trips.lang
rename to public/langs/sk_SK/trips.lang
diff --git a/htdocs/langs/sk_SK/users.lang b/public/langs/sk_SK/users.lang
similarity index 100%
rename from htdocs/langs/sk_SK/users.lang
rename to public/langs/sk_SK/users.lang
diff --git a/htdocs/langs/sk_SK/website.lang b/public/langs/sk_SK/website.lang
similarity index 100%
rename from htdocs/langs/sk_SK/website.lang
rename to public/langs/sk_SK/website.lang
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/public/langs/sk_SK/withdrawals.lang
similarity index 100%
rename from htdocs/langs/sk_SK/withdrawals.lang
rename to public/langs/sk_SK/withdrawals.lang
diff --git a/htdocs/langs/sk_SK/workflow.lang b/public/langs/sk_SK/workflow.lang
similarity index 100%
rename from htdocs/langs/sk_SK/workflow.lang
rename to public/langs/sk_SK/workflow.lang
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/public/langs/sl_SI/accountancy.lang
similarity index 100%
rename from htdocs/langs/sl_SI/accountancy.lang
rename to public/langs/sl_SI/accountancy.lang
diff --git a/htdocs/langs/sl_SI/admin.lang b/public/langs/sl_SI/admin.lang
similarity index 100%
rename from htdocs/langs/sl_SI/admin.lang
rename to public/langs/sl_SI/admin.lang
diff --git a/htdocs/langs/sl_SI/agenda.lang b/public/langs/sl_SI/agenda.lang
similarity index 100%
rename from htdocs/langs/sl_SI/agenda.lang
rename to public/langs/sl_SI/agenda.lang
diff --git a/htdocs/langs/sl_SI/banks.lang b/public/langs/sl_SI/banks.lang
similarity index 100%
rename from htdocs/langs/sl_SI/banks.lang
rename to public/langs/sl_SI/banks.lang
diff --git a/htdocs/langs/sl_SI/bills.lang b/public/langs/sl_SI/bills.lang
similarity index 100%
rename from htdocs/langs/sl_SI/bills.lang
rename to public/langs/sl_SI/bills.lang
diff --git a/htdocs/langs/sl_SI/bookmarks.lang b/public/langs/sl_SI/bookmarks.lang
similarity index 100%
rename from htdocs/langs/sl_SI/bookmarks.lang
rename to public/langs/sl_SI/bookmarks.lang
diff --git a/htdocs/langs/sl_SI/boxes.lang b/public/langs/sl_SI/boxes.lang
similarity index 100%
rename from htdocs/langs/sl_SI/boxes.lang
rename to public/langs/sl_SI/boxes.lang
diff --git a/htdocs/langs/sl_SI/cashdesk.lang b/public/langs/sl_SI/cashdesk.lang
similarity index 100%
rename from htdocs/langs/sl_SI/cashdesk.lang
rename to public/langs/sl_SI/cashdesk.lang
diff --git a/htdocs/langs/sl_SI/categories.lang b/public/langs/sl_SI/categories.lang
similarity index 100%
rename from htdocs/langs/sl_SI/categories.lang
rename to public/langs/sl_SI/categories.lang
diff --git a/htdocs/langs/sl_SI/commercial.lang b/public/langs/sl_SI/commercial.lang
similarity index 100%
rename from htdocs/langs/sl_SI/commercial.lang
rename to public/langs/sl_SI/commercial.lang
diff --git a/htdocs/langs/sl_SI/companies.lang b/public/langs/sl_SI/companies.lang
similarity index 100%
rename from htdocs/langs/sl_SI/companies.lang
rename to public/langs/sl_SI/companies.lang
diff --git a/htdocs/langs/sl_SI/compta.lang b/public/langs/sl_SI/compta.lang
similarity index 100%
rename from htdocs/langs/sl_SI/compta.lang
rename to public/langs/sl_SI/compta.lang
diff --git a/htdocs/langs/sl_SI/contracts.lang b/public/langs/sl_SI/contracts.lang
similarity index 100%
rename from htdocs/langs/sl_SI/contracts.lang
rename to public/langs/sl_SI/contracts.lang
diff --git a/htdocs/langs/sl_SI/cron.lang b/public/langs/sl_SI/cron.lang
similarity index 100%
rename from htdocs/langs/sl_SI/cron.lang
rename to public/langs/sl_SI/cron.lang
diff --git a/htdocs/langs/sl_SI/deliveries.lang b/public/langs/sl_SI/deliveries.lang
similarity index 100%
rename from htdocs/langs/sl_SI/deliveries.lang
rename to public/langs/sl_SI/deliveries.lang
diff --git a/htdocs/langs/sl_SI/dict.lang b/public/langs/sl_SI/dict.lang
similarity index 100%
rename from htdocs/langs/sl_SI/dict.lang
rename to public/langs/sl_SI/dict.lang
diff --git a/htdocs/langs/sl_SI/donations.lang b/public/langs/sl_SI/donations.lang
similarity index 100%
rename from htdocs/langs/sl_SI/donations.lang
rename to public/langs/sl_SI/donations.lang
diff --git a/htdocs/langs/sl_SI/ecm.lang b/public/langs/sl_SI/ecm.lang
similarity index 100%
rename from htdocs/langs/sl_SI/ecm.lang
rename to public/langs/sl_SI/ecm.lang
diff --git a/htdocs/langs/sl_SI/errors.lang b/public/langs/sl_SI/errors.lang
similarity index 100%
rename from htdocs/langs/sl_SI/errors.lang
rename to public/langs/sl_SI/errors.lang
diff --git a/htdocs/langs/sl_SI/exports.lang b/public/langs/sl_SI/exports.lang
similarity index 100%
rename from htdocs/langs/sl_SI/exports.lang
rename to public/langs/sl_SI/exports.lang
diff --git a/htdocs/langs/sl_SI/externalsite.lang b/public/langs/sl_SI/externalsite.lang
similarity index 100%
rename from htdocs/langs/sl_SI/externalsite.lang
rename to public/langs/sl_SI/externalsite.lang
diff --git a/htdocs/langs/sl_SI/ftp.lang b/public/langs/sl_SI/ftp.lang
similarity index 100%
rename from htdocs/langs/sl_SI/ftp.lang
rename to public/langs/sl_SI/ftp.lang
diff --git a/htdocs/langs/sl_SI/help.lang b/public/langs/sl_SI/help.lang
similarity index 100%
rename from htdocs/langs/sl_SI/help.lang
rename to public/langs/sl_SI/help.lang
diff --git a/htdocs/langs/sl_SI/holiday.lang b/public/langs/sl_SI/holiday.lang
similarity index 100%
rename from htdocs/langs/sl_SI/holiday.lang
rename to public/langs/sl_SI/holiday.lang
diff --git a/htdocs/langs/sl_SI/hrm.lang b/public/langs/sl_SI/hrm.lang
similarity index 100%
rename from htdocs/langs/sl_SI/hrm.lang
rename to public/langs/sl_SI/hrm.lang
diff --git a/htdocs/langs/sl_SI/incoterm.lang b/public/langs/sl_SI/incoterm.lang
similarity index 100%
rename from htdocs/langs/sl_SI/incoterm.lang
rename to public/langs/sl_SI/incoterm.lang
diff --git a/htdocs/langs/sl_SI/install.lang b/public/langs/sl_SI/install.lang
similarity index 100%
rename from htdocs/langs/sl_SI/install.lang
rename to public/langs/sl_SI/install.lang
diff --git a/htdocs/langs/sl_SI/interventions.lang b/public/langs/sl_SI/interventions.lang
similarity index 100%
rename from htdocs/langs/sl_SI/interventions.lang
rename to public/langs/sl_SI/interventions.lang
diff --git a/htdocs/langs/sl_SI/languages.lang b/public/langs/sl_SI/languages.lang
similarity index 100%
rename from htdocs/langs/sl_SI/languages.lang
rename to public/langs/sl_SI/languages.lang
diff --git a/htdocs/langs/sl_SI/ldap.lang b/public/langs/sl_SI/ldap.lang
similarity index 100%
rename from htdocs/langs/sl_SI/ldap.lang
rename to public/langs/sl_SI/ldap.lang
diff --git a/htdocs/langs/sl_SI/link.lang b/public/langs/sl_SI/link.lang
similarity index 100%
rename from htdocs/langs/sl_SI/link.lang
rename to public/langs/sl_SI/link.lang
diff --git a/htdocs/langs/sl_SI/loan.lang b/public/langs/sl_SI/loan.lang
similarity index 100%
rename from htdocs/langs/sl_SI/loan.lang
rename to public/langs/sl_SI/loan.lang
diff --git a/htdocs/langs/sl_SI/mailmanspip.lang b/public/langs/sl_SI/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/sl_SI/mailmanspip.lang
rename to public/langs/sl_SI/mailmanspip.lang
diff --git a/htdocs/langs/sl_SI/mails.lang b/public/langs/sl_SI/mails.lang
similarity index 100%
rename from htdocs/langs/sl_SI/mails.lang
rename to public/langs/sl_SI/mails.lang
diff --git a/htdocs/langs/sl_SI/main.lang b/public/langs/sl_SI/main.lang
similarity index 100%
rename from htdocs/langs/sl_SI/main.lang
rename to public/langs/sl_SI/main.lang
diff --git a/htdocs/langs/sl_SI/margins.lang b/public/langs/sl_SI/margins.lang
similarity index 100%
rename from htdocs/langs/sl_SI/margins.lang
rename to public/langs/sl_SI/margins.lang
diff --git a/htdocs/langs/sl_SI/members.lang b/public/langs/sl_SI/members.lang
similarity index 100%
rename from htdocs/langs/sl_SI/members.lang
rename to public/langs/sl_SI/members.lang
diff --git a/htdocs/langs/sl_SI/oauth.lang b/public/langs/sl_SI/oauth.lang
similarity index 100%
rename from htdocs/langs/sl_SI/oauth.lang
rename to public/langs/sl_SI/oauth.lang
diff --git a/htdocs/langs/sl_SI/opensurvey.lang b/public/langs/sl_SI/opensurvey.lang
similarity index 100%
rename from htdocs/langs/sl_SI/opensurvey.lang
rename to public/langs/sl_SI/opensurvey.lang
diff --git a/htdocs/langs/sl_SI/orders.lang b/public/langs/sl_SI/orders.lang
similarity index 100%
rename from htdocs/langs/sl_SI/orders.lang
rename to public/langs/sl_SI/orders.lang
diff --git a/htdocs/langs/sl_SI/other.lang b/public/langs/sl_SI/other.lang
similarity index 100%
rename from htdocs/langs/sl_SI/other.lang
rename to public/langs/sl_SI/other.lang
diff --git a/htdocs/langs/sl_SI/paybox.lang b/public/langs/sl_SI/paybox.lang
similarity index 100%
rename from htdocs/langs/sl_SI/paybox.lang
rename to public/langs/sl_SI/paybox.lang
diff --git a/htdocs/langs/sl_SI/paypal.lang b/public/langs/sl_SI/paypal.lang
similarity index 100%
rename from htdocs/langs/sl_SI/paypal.lang
rename to public/langs/sl_SI/paypal.lang
diff --git a/htdocs/langs/sl_SI/printing.lang b/public/langs/sl_SI/printing.lang
similarity index 100%
rename from htdocs/langs/sl_SI/printing.lang
rename to public/langs/sl_SI/printing.lang
diff --git a/htdocs/langs/sl_SI/productbatch.lang b/public/langs/sl_SI/productbatch.lang
similarity index 100%
rename from htdocs/langs/sl_SI/productbatch.lang
rename to public/langs/sl_SI/productbatch.lang
diff --git a/htdocs/langs/sl_SI/products.lang b/public/langs/sl_SI/products.lang
similarity index 100%
rename from htdocs/langs/sl_SI/products.lang
rename to public/langs/sl_SI/products.lang
diff --git a/htdocs/langs/sl_SI/projects.lang b/public/langs/sl_SI/projects.lang
similarity index 100%
rename from htdocs/langs/sl_SI/projects.lang
rename to public/langs/sl_SI/projects.lang
diff --git a/htdocs/langs/sl_SI/propal.lang b/public/langs/sl_SI/propal.lang
similarity index 100%
rename from htdocs/langs/sl_SI/propal.lang
rename to public/langs/sl_SI/propal.lang
diff --git a/htdocs/langs/sl_SI/receiptprinter.lang b/public/langs/sl_SI/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/sl_SI/receiptprinter.lang
rename to public/langs/sl_SI/receiptprinter.lang
diff --git a/htdocs/langs/sl_SI/resource.lang b/public/langs/sl_SI/resource.lang
similarity index 100%
rename from htdocs/langs/sl_SI/resource.lang
rename to public/langs/sl_SI/resource.lang
diff --git a/htdocs/langs/sl_SI/salaries.lang b/public/langs/sl_SI/salaries.lang
similarity index 100%
rename from htdocs/langs/sl_SI/salaries.lang
rename to public/langs/sl_SI/salaries.lang
diff --git a/htdocs/langs/sl_SI/sendings.lang b/public/langs/sl_SI/sendings.lang
similarity index 100%
rename from htdocs/langs/sl_SI/sendings.lang
rename to public/langs/sl_SI/sendings.lang
diff --git a/htdocs/langs/sl_SI/sms.lang b/public/langs/sl_SI/sms.lang
similarity index 100%
rename from htdocs/langs/sl_SI/sms.lang
rename to public/langs/sl_SI/sms.lang
diff --git a/htdocs/langs/sl_SI/stocks.lang b/public/langs/sl_SI/stocks.lang
similarity index 100%
rename from htdocs/langs/sl_SI/stocks.lang
rename to public/langs/sl_SI/stocks.lang
diff --git a/htdocs/langs/sl_SI/supplier_proposal.lang b/public/langs/sl_SI/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/sl_SI/supplier_proposal.lang
rename to public/langs/sl_SI/supplier_proposal.lang
diff --git a/htdocs/langs/sl_SI/suppliers.lang b/public/langs/sl_SI/suppliers.lang
similarity index 100%
rename from htdocs/langs/sl_SI/suppliers.lang
rename to public/langs/sl_SI/suppliers.lang
diff --git a/htdocs/langs/sl_SI/trips.lang b/public/langs/sl_SI/trips.lang
similarity index 100%
rename from htdocs/langs/sl_SI/trips.lang
rename to public/langs/sl_SI/trips.lang
diff --git a/htdocs/langs/sl_SI/users.lang b/public/langs/sl_SI/users.lang
similarity index 100%
rename from htdocs/langs/sl_SI/users.lang
rename to public/langs/sl_SI/users.lang
diff --git a/htdocs/langs/sl_SI/website.lang b/public/langs/sl_SI/website.lang
similarity index 100%
rename from htdocs/langs/sl_SI/website.lang
rename to public/langs/sl_SI/website.lang
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/public/langs/sl_SI/withdrawals.lang
similarity index 100%
rename from htdocs/langs/sl_SI/withdrawals.lang
rename to public/langs/sl_SI/withdrawals.lang
diff --git a/htdocs/langs/sl_SI/workflow.lang b/public/langs/sl_SI/workflow.lang
similarity index 100%
rename from htdocs/langs/sl_SI/workflow.lang
rename to public/langs/sl_SI/workflow.lang
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/public/langs/sq_AL/accountancy.lang
similarity index 100%
rename from htdocs/langs/sq_AL/accountancy.lang
rename to public/langs/sq_AL/accountancy.lang
diff --git a/htdocs/langs/sq_AL/admin.lang b/public/langs/sq_AL/admin.lang
similarity index 100%
rename from htdocs/langs/sq_AL/admin.lang
rename to public/langs/sq_AL/admin.lang
diff --git a/htdocs/langs/sq_AL/agenda.lang b/public/langs/sq_AL/agenda.lang
similarity index 100%
rename from htdocs/langs/sq_AL/agenda.lang
rename to public/langs/sq_AL/agenda.lang
diff --git a/htdocs/langs/sq_AL/banks.lang b/public/langs/sq_AL/banks.lang
similarity index 100%
rename from htdocs/langs/sq_AL/banks.lang
rename to public/langs/sq_AL/banks.lang
diff --git a/htdocs/langs/sq_AL/bills.lang b/public/langs/sq_AL/bills.lang
similarity index 100%
rename from htdocs/langs/sq_AL/bills.lang
rename to public/langs/sq_AL/bills.lang
diff --git a/htdocs/langs/sq_AL/bookmarks.lang b/public/langs/sq_AL/bookmarks.lang
similarity index 100%
rename from htdocs/langs/sq_AL/bookmarks.lang
rename to public/langs/sq_AL/bookmarks.lang
diff --git a/htdocs/langs/sq_AL/boxes.lang b/public/langs/sq_AL/boxes.lang
similarity index 100%
rename from htdocs/langs/sq_AL/boxes.lang
rename to public/langs/sq_AL/boxes.lang
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/public/langs/sq_AL/cashdesk.lang
similarity index 100%
rename from htdocs/langs/sq_AL/cashdesk.lang
rename to public/langs/sq_AL/cashdesk.lang
diff --git a/htdocs/langs/sq_AL/categories.lang b/public/langs/sq_AL/categories.lang
similarity index 100%
rename from htdocs/langs/sq_AL/categories.lang
rename to public/langs/sq_AL/categories.lang
diff --git a/htdocs/langs/sq_AL/commercial.lang b/public/langs/sq_AL/commercial.lang
similarity index 100%
rename from htdocs/langs/sq_AL/commercial.lang
rename to public/langs/sq_AL/commercial.lang
diff --git a/htdocs/langs/sq_AL/companies.lang b/public/langs/sq_AL/companies.lang
similarity index 100%
rename from htdocs/langs/sq_AL/companies.lang
rename to public/langs/sq_AL/companies.lang
diff --git a/htdocs/langs/sq_AL/compta.lang b/public/langs/sq_AL/compta.lang
similarity index 100%
rename from htdocs/langs/sq_AL/compta.lang
rename to public/langs/sq_AL/compta.lang
diff --git a/htdocs/langs/sq_AL/contracts.lang b/public/langs/sq_AL/contracts.lang
similarity index 100%
rename from htdocs/langs/sq_AL/contracts.lang
rename to public/langs/sq_AL/contracts.lang
diff --git a/htdocs/langs/sq_AL/cron.lang b/public/langs/sq_AL/cron.lang
similarity index 100%
rename from htdocs/langs/sq_AL/cron.lang
rename to public/langs/sq_AL/cron.lang
diff --git a/htdocs/langs/sq_AL/deliveries.lang b/public/langs/sq_AL/deliveries.lang
similarity index 100%
rename from htdocs/langs/sq_AL/deliveries.lang
rename to public/langs/sq_AL/deliveries.lang
diff --git a/htdocs/langs/sq_AL/dict.lang b/public/langs/sq_AL/dict.lang
similarity index 100%
rename from htdocs/langs/sq_AL/dict.lang
rename to public/langs/sq_AL/dict.lang
diff --git a/htdocs/langs/sq_AL/donations.lang b/public/langs/sq_AL/donations.lang
similarity index 100%
rename from htdocs/langs/sq_AL/donations.lang
rename to public/langs/sq_AL/donations.lang
diff --git a/htdocs/langs/sq_AL/ecm.lang b/public/langs/sq_AL/ecm.lang
similarity index 100%
rename from htdocs/langs/sq_AL/ecm.lang
rename to public/langs/sq_AL/ecm.lang
diff --git a/htdocs/langs/sq_AL/errors.lang b/public/langs/sq_AL/errors.lang
similarity index 100%
rename from htdocs/langs/sq_AL/errors.lang
rename to public/langs/sq_AL/errors.lang
diff --git a/htdocs/langs/sq_AL/exports.lang b/public/langs/sq_AL/exports.lang
similarity index 100%
rename from htdocs/langs/sq_AL/exports.lang
rename to public/langs/sq_AL/exports.lang
diff --git a/htdocs/langs/sq_AL/externalsite.lang b/public/langs/sq_AL/externalsite.lang
similarity index 100%
rename from htdocs/langs/sq_AL/externalsite.lang
rename to public/langs/sq_AL/externalsite.lang
diff --git a/htdocs/langs/sq_AL/ftp.lang b/public/langs/sq_AL/ftp.lang
similarity index 100%
rename from htdocs/langs/sq_AL/ftp.lang
rename to public/langs/sq_AL/ftp.lang
diff --git a/htdocs/langs/sq_AL/help.lang b/public/langs/sq_AL/help.lang
similarity index 100%
rename from htdocs/langs/sq_AL/help.lang
rename to public/langs/sq_AL/help.lang
diff --git a/htdocs/langs/sq_AL/holiday.lang b/public/langs/sq_AL/holiday.lang
similarity index 100%
rename from htdocs/langs/sq_AL/holiday.lang
rename to public/langs/sq_AL/holiday.lang
diff --git a/htdocs/langs/sq_AL/hrm.lang b/public/langs/sq_AL/hrm.lang
similarity index 100%
rename from htdocs/langs/sq_AL/hrm.lang
rename to public/langs/sq_AL/hrm.lang
diff --git a/htdocs/langs/sq_AL/incoterm.lang b/public/langs/sq_AL/incoterm.lang
similarity index 100%
rename from htdocs/langs/sq_AL/incoterm.lang
rename to public/langs/sq_AL/incoterm.lang
diff --git a/htdocs/langs/sq_AL/install.lang b/public/langs/sq_AL/install.lang
similarity index 100%
rename from htdocs/langs/sq_AL/install.lang
rename to public/langs/sq_AL/install.lang
diff --git a/htdocs/langs/sq_AL/interventions.lang b/public/langs/sq_AL/interventions.lang
similarity index 100%
rename from htdocs/langs/sq_AL/interventions.lang
rename to public/langs/sq_AL/interventions.lang
diff --git a/htdocs/langs/sq_AL/languages.lang b/public/langs/sq_AL/languages.lang
similarity index 100%
rename from htdocs/langs/sq_AL/languages.lang
rename to public/langs/sq_AL/languages.lang
diff --git a/htdocs/langs/sq_AL/ldap.lang b/public/langs/sq_AL/ldap.lang
similarity index 100%
rename from htdocs/langs/sq_AL/ldap.lang
rename to public/langs/sq_AL/ldap.lang
diff --git a/htdocs/langs/sq_AL/link.lang b/public/langs/sq_AL/link.lang
similarity index 100%
rename from htdocs/langs/sq_AL/link.lang
rename to public/langs/sq_AL/link.lang
diff --git a/htdocs/langs/sq_AL/loan.lang b/public/langs/sq_AL/loan.lang
similarity index 100%
rename from htdocs/langs/sq_AL/loan.lang
rename to public/langs/sq_AL/loan.lang
diff --git a/htdocs/langs/sq_AL/mailmanspip.lang b/public/langs/sq_AL/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/sq_AL/mailmanspip.lang
rename to public/langs/sq_AL/mailmanspip.lang
diff --git a/htdocs/langs/sq_AL/mails.lang b/public/langs/sq_AL/mails.lang
similarity index 100%
rename from htdocs/langs/sq_AL/mails.lang
rename to public/langs/sq_AL/mails.lang
diff --git a/htdocs/langs/sq_AL/main.lang b/public/langs/sq_AL/main.lang
similarity index 100%
rename from htdocs/langs/sq_AL/main.lang
rename to public/langs/sq_AL/main.lang
diff --git a/htdocs/langs/sq_AL/margins.lang b/public/langs/sq_AL/margins.lang
similarity index 100%
rename from htdocs/langs/sq_AL/margins.lang
rename to public/langs/sq_AL/margins.lang
diff --git a/htdocs/langs/sq_AL/members.lang b/public/langs/sq_AL/members.lang
similarity index 100%
rename from htdocs/langs/sq_AL/members.lang
rename to public/langs/sq_AL/members.lang
diff --git a/htdocs/langs/sq_AL/oauth.lang b/public/langs/sq_AL/oauth.lang
similarity index 100%
rename from htdocs/langs/sq_AL/oauth.lang
rename to public/langs/sq_AL/oauth.lang
diff --git a/htdocs/langs/sq_AL/opensurvey.lang b/public/langs/sq_AL/opensurvey.lang
similarity index 100%
rename from htdocs/langs/sq_AL/opensurvey.lang
rename to public/langs/sq_AL/opensurvey.lang
diff --git a/htdocs/langs/sq_AL/orders.lang b/public/langs/sq_AL/orders.lang
similarity index 100%
rename from htdocs/langs/sq_AL/orders.lang
rename to public/langs/sq_AL/orders.lang
diff --git a/htdocs/langs/sq_AL/other.lang b/public/langs/sq_AL/other.lang
similarity index 100%
rename from htdocs/langs/sq_AL/other.lang
rename to public/langs/sq_AL/other.lang
diff --git a/htdocs/langs/sq_AL/paybox.lang b/public/langs/sq_AL/paybox.lang
similarity index 100%
rename from htdocs/langs/sq_AL/paybox.lang
rename to public/langs/sq_AL/paybox.lang
diff --git a/htdocs/langs/sq_AL/paypal.lang b/public/langs/sq_AL/paypal.lang
similarity index 100%
rename from htdocs/langs/sq_AL/paypal.lang
rename to public/langs/sq_AL/paypal.lang
diff --git a/htdocs/langs/sq_AL/printing.lang b/public/langs/sq_AL/printing.lang
similarity index 100%
rename from htdocs/langs/sq_AL/printing.lang
rename to public/langs/sq_AL/printing.lang
diff --git a/htdocs/langs/sq_AL/productbatch.lang b/public/langs/sq_AL/productbatch.lang
similarity index 100%
rename from htdocs/langs/sq_AL/productbatch.lang
rename to public/langs/sq_AL/productbatch.lang
diff --git a/htdocs/langs/sq_AL/products.lang b/public/langs/sq_AL/products.lang
similarity index 100%
rename from htdocs/langs/sq_AL/products.lang
rename to public/langs/sq_AL/products.lang
diff --git a/htdocs/langs/sq_AL/projects.lang b/public/langs/sq_AL/projects.lang
similarity index 100%
rename from htdocs/langs/sq_AL/projects.lang
rename to public/langs/sq_AL/projects.lang
diff --git a/htdocs/langs/sq_AL/propal.lang b/public/langs/sq_AL/propal.lang
similarity index 100%
rename from htdocs/langs/sq_AL/propal.lang
rename to public/langs/sq_AL/propal.lang
diff --git a/htdocs/langs/sq_AL/receiptprinter.lang b/public/langs/sq_AL/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/sq_AL/receiptprinter.lang
rename to public/langs/sq_AL/receiptprinter.lang
diff --git a/htdocs/langs/sq_AL/resource.lang b/public/langs/sq_AL/resource.lang
similarity index 100%
rename from htdocs/langs/sq_AL/resource.lang
rename to public/langs/sq_AL/resource.lang
diff --git a/htdocs/langs/sq_AL/salaries.lang b/public/langs/sq_AL/salaries.lang
similarity index 100%
rename from htdocs/langs/sq_AL/salaries.lang
rename to public/langs/sq_AL/salaries.lang
diff --git a/htdocs/langs/sq_AL/sendings.lang b/public/langs/sq_AL/sendings.lang
similarity index 100%
rename from htdocs/langs/sq_AL/sendings.lang
rename to public/langs/sq_AL/sendings.lang
diff --git a/htdocs/langs/sq_AL/sms.lang b/public/langs/sq_AL/sms.lang
similarity index 100%
rename from htdocs/langs/sq_AL/sms.lang
rename to public/langs/sq_AL/sms.lang
diff --git a/htdocs/langs/sq_AL/stocks.lang b/public/langs/sq_AL/stocks.lang
similarity index 100%
rename from htdocs/langs/sq_AL/stocks.lang
rename to public/langs/sq_AL/stocks.lang
diff --git a/htdocs/langs/sq_AL/supplier_proposal.lang b/public/langs/sq_AL/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/sq_AL/supplier_proposal.lang
rename to public/langs/sq_AL/supplier_proposal.lang
diff --git a/htdocs/langs/sq_AL/suppliers.lang b/public/langs/sq_AL/suppliers.lang
similarity index 100%
rename from htdocs/langs/sq_AL/suppliers.lang
rename to public/langs/sq_AL/suppliers.lang
diff --git a/htdocs/langs/sq_AL/trips.lang b/public/langs/sq_AL/trips.lang
similarity index 100%
rename from htdocs/langs/sq_AL/trips.lang
rename to public/langs/sq_AL/trips.lang
diff --git a/htdocs/langs/sq_AL/users.lang b/public/langs/sq_AL/users.lang
similarity index 100%
rename from htdocs/langs/sq_AL/users.lang
rename to public/langs/sq_AL/users.lang
diff --git a/htdocs/langs/sq_AL/website.lang b/public/langs/sq_AL/website.lang
similarity index 100%
rename from htdocs/langs/sq_AL/website.lang
rename to public/langs/sq_AL/website.lang
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/public/langs/sq_AL/withdrawals.lang
similarity index 100%
rename from htdocs/langs/sq_AL/withdrawals.lang
rename to public/langs/sq_AL/withdrawals.lang
diff --git a/htdocs/langs/sq_AL/workflow.lang b/public/langs/sq_AL/workflow.lang
similarity index 100%
rename from htdocs/langs/sq_AL/workflow.lang
rename to public/langs/sq_AL/workflow.lang
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/public/langs/sr_RS/accountancy.lang
similarity index 100%
rename from htdocs/langs/sr_RS/accountancy.lang
rename to public/langs/sr_RS/accountancy.lang
diff --git a/htdocs/langs/sr_RS/admin.lang b/public/langs/sr_RS/admin.lang
similarity index 100%
rename from htdocs/langs/sr_RS/admin.lang
rename to public/langs/sr_RS/admin.lang
diff --git a/htdocs/langs/sr_RS/agenda.lang b/public/langs/sr_RS/agenda.lang
similarity index 100%
rename from htdocs/langs/sr_RS/agenda.lang
rename to public/langs/sr_RS/agenda.lang
diff --git a/htdocs/langs/sr_RS/banks.lang b/public/langs/sr_RS/banks.lang
similarity index 100%
rename from htdocs/langs/sr_RS/banks.lang
rename to public/langs/sr_RS/banks.lang
diff --git a/htdocs/langs/sr_RS/bills.lang b/public/langs/sr_RS/bills.lang
similarity index 100%
rename from htdocs/langs/sr_RS/bills.lang
rename to public/langs/sr_RS/bills.lang
diff --git a/htdocs/langs/sr_RS/bookmarks.lang b/public/langs/sr_RS/bookmarks.lang
similarity index 100%
rename from htdocs/langs/sr_RS/bookmarks.lang
rename to public/langs/sr_RS/bookmarks.lang
diff --git a/htdocs/langs/sr_RS/boxes.lang b/public/langs/sr_RS/boxes.lang
similarity index 100%
rename from htdocs/langs/sr_RS/boxes.lang
rename to public/langs/sr_RS/boxes.lang
diff --git a/htdocs/langs/sr_RS/cashdesk.lang b/public/langs/sr_RS/cashdesk.lang
similarity index 100%
rename from htdocs/langs/sr_RS/cashdesk.lang
rename to public/langs/sr_RS/cashdesk.lang
diff --git a/htdocs/langs/sr_RS/categories.lang b/public/langs/sr_RS/categories.lang
similarity index 100%
rename from htdocs/langs/sr_RS/categories.lang
rename to public/langs/sr_RS/categories.lang
diff --git a/htdocs/langs/sr_RS/commercial.lang b/public/langs/sr_RS/commercial.lang
similarity index 100%
rename from htdocs/langs/sr_RS/commercial.lang
rename to public/langs/sr_RS/commercial.lang
diff --git a/htdocs/langs/sr_RS/companies.lang b/public/langs/sr_RS/companies.lang
similarity index 100%
rename from htdocs/langs/sr_RS/companies.lang
rename to public/langs/sr_RS/companies.lang
diff --git a/htdocs/langs/sr_RS/compta.lang b/public/langs/sr_RS/compta.lang
similarity index 100%
rename from htdocs/langs/sr_RS/compta.lang
rename to public/langs/sr_RS/compta.lang
diff --git a/htdocs/langs/sr_RS/contracts.lang b/public/langs/sr_RS/contracts.lang
similarity index 100%
rename from htdocs/langs/sr_RS/contracts.lang
rename to public/langs/sr_RS/contracts.lang
diff --git a/htdocs/langs/sr_RS/cron.lang b/public/langs/sr_RS/cron.lang
similarity index 100%
rename from htdocs/langs/sr_RS/cron.lang
rename to public/langs/sr_RS/cron.lang
diff --git a/htdocs/langs/sr_RS/deliveries.lang b/public/langs/sr_RS/deliveries.lang
similarity index 100%
rename from htdocs/langs/sr_RS/deliveries.lang
rename to public/langs/sr_RS/deliveries.lang
diff --git a/htdocs/langs/sr_RS/dict.lang b/public/langs/sr_RS/dict.lang
similarity index 100%
rename from htdocs/langs/sr_RS/dict.lang
rename to public/langs/sr_RS/dict.lang
diff --git a/htdocs/langs/sr_RS/donations.lang b/public/langs/sr_RS/donations.lang
similarity index 100%
rename from htdocs/langs/sr_RS/donations.lang
rename to public/langs/sr_RS/donations.lang
diff --git a/htdocs/langs/sr_RS/ecm.lang b/public/langs/sr_RS/ecm.lang
similarity index 100%
rename from htdocs/langs/sr_RS/ecm.lang
rename to public/langs/sr_RS/ecm.lang
diff --git a/htdocs/langs/sr_RS/errors.lang b/public/langs/sr_RS/errors.lang
similarity index 100%
rename from htdocs/langs/sr_RS/errors.lang
rename to public/langs/sr_RS/errors.lang
diff --git a/htdocs/langs/sr_RS/exports.lang b/public/langs/sr_RS/exports.lang
similarity index 100%
rename from htdocs/langs/sr_RS/exports.lang
rename to public/langs/sr_RS/exports.lang
diff --git a/htdocs/langs/sr_RS/externalsite.lang b/public/langs/sr_RS/externalsite.lang
similarity index 100%
rename from htdocs/langs/sr_RS/externalsite.lang
rename to public/langs/sr_RS/externalsite.lang
diff --git a/htdocs/langs/sr_RS/ftp.lang b/public/langs/sr_RS/ftp.lang
similarity index 100%
rename from htdocs/langs/sr_RS/ftp.lang
rename to public/langs/sr_RS/ftp.lang
diff --git a/htdocs/langs/sr_RS/help.lang b/public/langs/sr_RS/help.lang
similarity index 100%
rename from htdocs/langs/sr_RS/help.lang
rename to public/langs/sr_RS/help.lang
diff --git a/htdocs/langs/sr_RS/holiday.lang b/public/langs/sr_RS/holiday.lang
similarity index 100%
rename from htdocs/langs/sr_RS/holiday.lang
rename to public/langs/sr_RS/holiday.lang
diff --git a/htdocs/langs/sr_RS/incoterm.lang b/public/langs/sr_RS/incoterm.lang
similarity index 100%
rename from htdocs/langs/sr_RS/incoterm.lang
rename to public/langs/sr_RS/incoterm.lang
diff --git a/htdocs/langs/sr_RS/install.lang b/public/langs/sr_RS/install.lang
similarity index 100%
rename from htdocs/langs/sr_RS/install.lang
rename to public/langs/sr_RS/install.lang
diff --git a/htdocs/langs/sr_RS/interventions.lang b/public/langs/sr_RS/interventions.lang
similarity index 100%
rename from htdocs/langs/sr_RS/interventions.lang
rename to public/langs/sr_RS/interventions.lang
diff --git a/htdocs/langs/sr_RS/languages.lang b/public/langs/sr_RS/languages.lang
similarity index 100%
rename from htdocs/langs/sr_RS/languages.lang
rename to public/langs/sr_RS/languages.lang
diff --git a/htdocs/langs/sr_RS/ldap.lang b/public/langs/sr_RS/ldap.lang
similarity index 100%
rename from htdocs/langs/sr_RS/ldap.lang
rename to public/langs/sr_RS/ldap.lang
diff --git a/htdocs/langs/sr_RS/link.lang b/public/langs/sr_RS/link.lang
similarity index 100%
rename from htdocs/langs/sr_RS/link.lang
rename to public/langs/sr_RS/link.lang
diff --git a/htdocs/langs/sr_RS/loan.lang b/public/langs/sr_RS/loan.lang
similarity index 100%
rename from htdocs/langs/sr_RS/loan.lang
rename to public/langs/sr_RS/loan.lang
diff --git a/htdocs/langs/sr_RS/mailmanspip.lang b/public/langs/sr_RS/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/sr_RS/mailmanspip.lang
rename to public/langs/sr_RS/mailmanspip.lang
diff --git a/htdocs/langs/sr_RS/mails.lang b/public/langs/sr_RS/mails.lang
similarity index 100%
rename from htdocs/langs/sr_RS/mails.lang
rename to public/langs/sr_RS/mails.lang
diff --git a/htdocs/langs/sr_RS/main.lang b/public/langs/sr_RS/main.lang
similarity index 100%
rename from htdocs/langs/sr_RS/main.lang
rename to public/langs/sr_RS/main.lang
diff --git a/htdocs/langs/sr_RS/margins.lang b/public/langs/sr_RS/margins.lang
similarity index 100%
rename from htdocs/langs/sr_RS/margins.lang
rename to public/langs/sr_RS/margins.lang
diff --git a/htdocs/langs/sr_RS/members.lang b/public/langs/sr_RS/members.lang
similarity index 100%
rename from htdocs/langs/sr_RS/members.lang
rename to public/langs/sr_RS/members.lang
diff --git a/htdocs/langs/sr_RS/opensurvey.lang b/public/langs/sr_RS/opensurvey.lang
similarity index 100%
rename from htdocs/langs/sr_RS/opensurvey.lang
rename to public/langs/sr_RS/opensurvey.lang
diff --git a/htdocs/langs/sr_RS/orders.lang b/public/langs/sr_RS/orders.lang
similarity index 100%
rename from htdocs/langs/sr_RS/orders.lang
rename to public/langs/sr_RS/orders.lang
diff --git a/htdocs/langs/sr_RS/other.lang b/public/langs/sr_RS/other.lang
similarity index 100%
rename from htdocs/langs/sr_RS/other.lang
rename to public/langs/sr_RS/other.lang
diff --git a/htdocs/langs/sr_RS/paybox.lang b/public/langs/sr_RS/paybox.lang
similarity index 100%
rename from htdocs/langs/sr_RS/paybox.lang
rename to public/langs/sr_RS/paybox.lang
diff --git a/htdocs/langs/sr_RS/paypal.lang b/public/langs/sr_RS/paypal.lang
similarity index 100%
rename from htdocs/langs/sr_RS/paypal.lang
rename to public/langs/sr_RS/paypal.lang
diff --git a/htdocs/langs/sr_RS/printing.lang b/public/langs/sr_RS/printing.lang
similarity index 100%
rename from htdocs/langs/sr_RS/printing.lang
rename to public/langs/sr_RS/printing.lang
diff --git a/htdocs/langs/sr_RS/productbatch.lang b/public/langs/sr_RS/productbatch.lang
similarity index 100%
rename from htdocs/langs/sr_RS/productbatch.lang
rename to public/langs/sr_RS/productbatch.lang
diff --git a/htdocs/langs/sr_RS/products.lang b/public/langs/sr_RS/products.lang
similarity index 100%
rename from htdocs/langs/sr_RS/products.lang
rename to public/langs/sr_RS/products.lang
diff --git a/htdocs/langs/sr_RS/projects.lang b/public/langs/sr_RS/projects.lang
similarity index 100%
rename from htdocs/langs/sr_RS/projects.lang
rename to public/langs/sr_RS/projects.lang
diff --git a/htdocs/langs/sr_RS/propal.lang b/public/langs/sr_RS/propal.lang
similarity index 100%
rename from htdocs/langs/sr_RS/propal.lang
rename to public/langs/sr_RS/propal.lang
diff --git a/htdocs/langs/sr_RS/resource.lang b/public/langs/sr_RS/resource.lang
similarity index 100%
rename from htdocs/langs/sr_RS/resource.lang
rename to public/langs/sr_RS/resource.lang
diff --git a/htdocs/langs/sr_RS/salaries.lang b/public/langs/sr_RS/salaries.lang
similarity index 100%
rename from htdocs/langs/sr_RS/salaries.lang
rename to public/langs/sr_RS/salaries.lang
diff --git a/htdocs/langs/sr_RS/sendings.lang b/public/langs/sr_RS/sendings.lang
similarity index 100%
rename from htdocs/langs/sr_RS/sendings.lang
rename to public/langs/sr_RS/sendings.lang
diff --git a/htdocs/langs/sr_RS/sms.lang b/public/langs/sr_RS/sms.lang
similarity index 100%
rename from htdocs/langs/sr_RS/sms.lang
rename to public/langs/sr_RS/sms.lang
diff --git a/htdocs/langs/sr_RS/stocks.lang b/public/langs/sr_RS/stocks.lang
similarity index 100%
rename from htdocs/langs/sr_RS/stocks.lang
rename to public/langs/sr_RS/stocks.lang
diff --git a/htdocs/langs/sr_RS/suppliers.lang b/public/langs/sr_RS/suppliers.lang
similarity index 100%
rename from htdocs/langs/sr_RS/suppliers.lang
rename to public/langs/sr_RS/suppliers.lang
diff --git a/htdocs/langs/sr_RS/trips.lang b/public/langs/sr_RS/trips.lang
similarity index 100%
rename from htdocs/langs/sr_RS/trips.lang
rename to public/langs/sr_RS/trips.lang
diff --git a/htdocs/langs/sr_RS/users.lang b/public/langs/sr_RS/users.lang
similarity index 100%
rename from htdocs/langs/sr_RS/users.lang
rename to public/langs/sr_RS/users.lang
diff --git a/htdocs/langs/sr_RS/withdrawals.lang b/public/langs/sr_RS/withdrawals.lang
similarity index 100%
rename from htdocs/langs/sr_RS/withdrawals.lang
rename to public/langs/sr_RS/withdrawals.lang
diff --git a/htdocs/langs/sr_RS/workflow.lang b/public/langs/sr_RS/workflow.lang
similarity index 100%
rename from htdocs/langs/sr_RS/workflow.lang
rename to public/langs/sr_RS/workflow.lang
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/public/langs/sv_SE/accountancy.lang
similarity index 100%
rename from htdocs/langs/sv_SE/accountancy.lang
rename to public/langs/sv_SE/accountancy.lang
diff --git a/htdocs/langs/sv_SE/admin.lang b/public/langs/sv_SE/admin.lang
similarity index 100%
rename from htdocs/langs/sv_SE/admin.lang
rename to public/langs/sv_SE/admin.lang
diff --git a/htdocs/langs/sv_SE/agenda.lang b/public/langs/sv_SE/agenda.lang
similarity index 100%
rename from htdocs/langs/sv_SE/agenda.lang
rename to public/langs/sv_SE/agenda.lang
diff --git a/htdocs/langs/sv_SE/banks.lang b/public/langs/sv_SE/banks.lang
similarity index 100%
rename from htdocs/langs/sv_SE/banks.lang
rename to public/langs/sv_SE/banks.lang
diff --git a/htdocs/langs/sv_SE/bills.lang b/public/langs/sv_SE/bills.lang
similarity index 100%
rename from htdocs/langs/sv_SE/bills.lang
rename to public/langs/sv_SE/bills.lang
diff --git a/htdocs/langs/sv_SE/bookmarks.lang b/public/langs/sv_SE/bookmarks.lang
similarity index 100%
rename from htdocs/langs/sv_SE/bookmarks.lang
rename to public/langs/sv_SE/bookmarks.lang
diff --git a/htdocs/langs/sv_SE/boxes.lang b/public/langs/sv_SE/boxes.lang
similarity index 100%
rename from htdocs/langs/sv_SE/boxes.lang
rename to public/langs/sv_SE/boxes.lang
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/public/langs/sv_SE/cashdesk.lang
similarity index 100%
rename from htdocs/langs/sv_SE/cashdesk.lang
rename to public/langs/sv_SE/cashdesk.lang
diff --git a/htdocs/langs/sv_SE/categories.lang b/public/langs/sv_SE/categories.lang
similarity index 100%
rename from htdocs/langs/sv_SE/categories.lang
rename to public/langs/sv_SE/categories.lang
diff --git a/htdocs/langs/sv_SE/commercial.lang b/public/langs/sv_SE/commercial.lang
similarity index 100%
rename from htdocs/langs/sv_SE/commercial.lang
rename to public/langs/sv_SE/commercial.lang
diff --git a/htdocs/langs/sv_SE/companies.lang b/public/langs/sv_SE/companies.lang
similarity index 100%
rename from htdocs/langs/sv_SE/companies.lang
rename to public/langs/sv_SE/companies.lang
diff --git a/htdocs/langs/sv_SE/compta.lang b/public/langs/sv_SE/compta.lang
similarity index 100%
rename from htdocs/langs/sv_SE/compta.lang
rename to public/langs/sv_SE/compta.lang
diff --git a/htdocs/langs/sv_SE/contracts.lang b/public/langs/sv_SE/contracts.lang
similarity index 100%
rename from htdocs/langs/sv_SE/contracts.lang
rename to public/langs/sv_SE/contracts.lang
diff --git a/htdocs/langs/sv_SE/cron.lang b/public/langs/sv_SE/cron.lang
similarity index 100%
rename from htdocs/langs/sv_SE/cron.lang
rename to public/langs/sv_SE/cron.lang
diff --git a/htdocs/langs/sv_SE/deliveries.lang b/public/langs/sv_SE/deliveries.lang
similarity index 100%
rename from htdocs/langs/sv_SE/deliveries.lang
rename to public/langs/sv_SE/deliveries.lang
diff --git a/htdocs/langs/sv_SE/dict.lang b/public/langs/sv_SE/dict.lang
similarity index 100%
rename from htdocs/langs/sv_SE/dict.lang
rename to public/langs/sv_SE/dict.lang
diff --git a/htdocs/langs/sv_SE/donations.lang b/public/langs/sv_SE/donations.lang
similarity index 100%
rename from htdocs/langs/sv_SE/donations.lang
rename to public/langs/sv_SE/donations.lang
diff --git a/htdocs/langs/sv_SE/ecm.lang b/public/langs/sv_SE/ecm.lang
similarity index 100%
rename from htdocs/langs/sv_SE/ecm.lang
rename to public/langs/sv_SE/ecm.lang
diff --git a/htdocs/langs/sv_SE/errors.lang b/public/langs/sv_SE/errors.lang
similarity index 100%
rename from htdocs/langs/sv_SE/errors.lang
rename to public/langs/sv_SE/errors.lang
diff --git a/htdocs/langs/sv_SE/exports.lang b/public/langs/sv_SE/exports.lang
similarity index 100%
rename from htdocs/langs/sv_SE/exports.lang
rename to public/langs/sv_SE/exports.lang
diff --git a/htdocs/langs/sv_SE/externalsite.lang b/public/langs/sv_SE/externalsite.lang
similarity index 100%
rename from htdocs/langs/sv_SE/externalsite.lang
rename to public/langs/sv_SE/externalsite.lang
diff --git a/htdocs/langs/sv_SE/ftp.lang b/public/langs/sv_SE/ftp.lang
similarity index 100%
rename from htdocs/langs/sv_SE/ftp.lang
rename to public/langs/sv_SE/ftp.lang
diff --git a/htdocs/langs/sv_SE/help.lang b/public/langs/sv_SE/help.lang
similarity index 100%
rename from htdocs/langs/sv_SE/help.lang
rename to public/langs/sv_SE/help.lang
diff --git a/htdocs/langs/sv_SE/holiday.lang b/public/langs/sv_SE/holiday.lang
similarity index 100%
rename from htdocs/langs/sv_SE/holiday.lang
rename to public/langs/sv_SE/holiday.lang
diff --git a/htdocs/langs/sv_SE/hrm.lang b/public/langs/sv_SE/hrm.lang
similarity index 100%
rename from htdocs/langs/sv_SE/hrm.lang
rename to public/langs/sv_SE/hrm.lang
diff --git a/htdocs/langs/sv_SE/incoterm.lang b/public/langs/sv_SE/incoterm.lang
similarity index 100%
rename from htdocs/langs/sv_SE/incoterm.lang
rename to public/langs/sv_SE/incoterm.lang
diff --git a/htdocs/langs/sv_SE/install.lang b/public/langs/sv_SE/install.lang
similarity index 100%
rename from htdocs/langs/sv_SE/install.lang
rename to public/langs/sv_SE/install.lang
diff --git a/htdocs/langs/sv_SE/interventions.lang b/public/langs/sv_SE/interventions.lang
similarity index 100%
rename from htdocs/langs/sv_SE/interventions.lang
rename to public/langs/sv_SE/interventions.lang
diff --git a/htdocs/langs/sv_SE/languages.lang b/public/langs/sv_SE/languages.lang
similarity index 100%
rename from htdocs/langs/sv_SE/languages.lang
rename to public/langs/sv_SE/languages.lang
diff --git a/htdocs/langs/sv_SE/ldap.lang b/public/langs/sv_SE/ldap.lang
similarity index 100%
rename from htdocs/langs/sv_SE/ldap.lang
rename to public/langs/sv_SE/ldap.lang
diff --git a/htdocs/langs/sv_SE/link.lang b/public/langs/sv_SE/link.lang
similarity index 100%
rename from htdocs/langs/sv_SE/link.lang
rename to public/langs/sv_SE/link.lang
diff --git a/htdocs/langs/sv_SE/loan.lang b/public/langs/sv_SE/loan.lang
similarity index 100%
rename from htdocs/langs/sv_SE/loan.lang
rename to public/langs/sv_SE/loan.lang
diff --git a/htdocs/langs/sv_SE/mailmanspip.lang b/public/langs/sv_SE/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/sv_SE/mailmanspip.lang
rename to public/langs/sv_SE/mailmanspip.lang
diff --git a/htdocs/langs/sv_SE/mails.lang b/public/langs/sv_SE/mails.lang
similarity index 100%
rename from htdocs/langs/sv_SE/mails.lang
rename to public/langs/sv_SE/mails.lang
diff --git a/htdocs/langs/sv_SE/main.lang b/public/langs/sv_SE/main.lang
similarity index 100%
rename from htdocs/langs/sv_SE/main.lang
rename to public/langs/sv_SE/main.lang
diff --git a/htdocs/langs/sv_SE/margins.lang b/public/langs/sv_SE/margins.lang
similarity index 100%
rename from htdocs/langs/sv_SE/margins.lang
rename to public/langs/sv_SE/margins.lang
diff --git a/htdocs/langs/sv_SE/members.lang b/public/langs/sv_SE/members.lang
similarity index 100%
rename from htdocs/langs/sv_SE/members.lang
rename to public/langs/sv_SE/members.lang
diff --git a/htdocs/langs/sv_SE/oauth.lang b/public/langs/sv_SE/oauth.lang
similarity index 100%
rename from htdocs/langs/sv_SE/oauth.lang
rename to public/langs/sv_SE/oauth.lang
diff --git a/htdocs/langs/sv_SE/opensurvey.lang b/public/langs/sv_SE/opensurvey.lang
similarity index 100%
rename from htdocs/langs/sv_SE/opensurvey.lang
rename to public/langs/sv_SE/opensurvey.lang
diff --git a/htdocs/langs/sv_SE/orders.lang b/public/langs/sv_SE/orders.lang
similarity index 100%
rename from htdocs/langs/sv_SE/orders.lang
rename to public/langs/sv_SE/orders.lang
diff --git a/htdocs/langs/sv_SE/other.lang b/public/langs/sv_SE/other.lang
similarity index 100%
rename from htdocs/langs/sv_SE/other.lang
rename to public/langs/sv_SE/other.lang
diff --git a/htdocs/langs/sv_SE/paybox.lang b/public/langs/sv_SE/paybox.lang
similarity index 100%
rename from htdocs/langs/sv_SE/paybox.lang
rename to public/langs/sv_SE/paybox.lang
diff --git a/htdocs/langs/sv_SE/paypal.lang b/public/langs/sv_SE/paypal.lang
similarity index 100%
rename from htdocs/langs/sv_SE/paypal.lang
rename to public/langs/sv_SE/paypal.lang
diff --git a/htdocs/langs/sv_SE/printing.lang b/public/langs/sv_SE/printing.lang
similarity index 100%
rename from htdocs/langs/sv_SE/printing.lang
rename to public/langs/sv_SE/printing.lang
diff --git a/htdocs/langs/sv_SE/productbatch.lang b/public/langs/sv_SE/productbatch.lang
similarity index 100%
rename from htdocs/langs/sv_SE/productbatch.lang
rename to public/langs/sv_SE/productbatch.lang
diff --git a/htdocs/langs/sv_SE/products.lang b/public/langs/sv_SE/products.lang
similarity index 100%
rename from htdocs/langs/sv_SE/products.lang
rename to public/langs/sv_SE/products.lang
diff --git a/htdocs/langs/sv_SE/projects.lang b/public/langs/sv_SE/projects.lang
similarity index 100%
rename from htdocs/langs/sv_SE/projects.lang
rename to public/langs/sv_SE/projects.lang
diff --git a/htdocs/langs/sv_SE/propal.lang b/public/langs/sv_SE/propal.lang
similarity index 100%
rename from htdocs/langs/sv_SE/propal.lang
rename to public/langs/sv_SE/propal.lang
diff --git a/htdocs/langs/sv_SE/receiptprinter.lang b/public/langs/sv_SE/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/sv_SE/receiptprinter.lang
rename to public/langs/sv_SE/receiptprinter.lang
diff --git a/htdocs/langs/sv_SE/resource.lang b/public/langs/sv_SE/resource.lang
similarity index 100%
rename from htdocs/langs/sv_SE/resource.lang
rename to public/langs/sv_SE/resource.lang
diff --git a/htdocs/langs/sv_SE/salaries.lang b/public/langs/sv_SE/salaries.lang
similarity index 100%
rename from htdocs/langs/sv_SE/salaries.lang
rename to public/langs/sv_SE/salaries.lang
diff --git a/htdocs/langs/sv_SE/sendings.lang b/public/langs/sv_SE/sendings.lang
similarity index 100%
rename from htdocs/langs/sv_SE/sendings.lang
rename to public/langs/sv_SE/sendings.lang
diff --git a/htdocs/langs/sv_SE/sms.lang b/public/langs/sv_SE/sms.lang
similarity index 100%
rename from htdocs/langs/sv_SE/sms.lang
rename to public/langs/sv_SE/sms.lang
diff --git a/htdocs/langs/sv_SE/stocks.lang b/public/langs/sv_SE/stocks.lang
similarity index 100%
rename from htdocs/langs/sv_SE/stocks.lang
rename to public/langs/sv_SE/stocks.lang
diff --git a/htdocs/langs/sv_SE/supplier_proposal.lang b/public/langs/sv_SE/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/sv_SE/supplier_proposal.lang
rename to public/langs/sv_SE/supplier_proposal.lang
diff --git a/htdocs/langs/sv_SE/suppliers.lang b/public/langs/sv_SE/suppliers.lang
similarity index 100%
rename from htdocs/langs/sv_SE/suppliers.lang
rename to public/langs/sv_SE/suppliers.lang
diff --git a/htdocs/langs/sv_SE/trips.lang b/public/langs/sv_SE/trips.lang
similarity index 100%
rename from htdocs/langs/sv_SE/trips.lang
rename to public/langs/sv_SE/trips.lang
diff --git a/htdocs/langs/sv_SE/users.lang b/public/langs/sv_SE/users.lang
similarity index 100%
rename from htdocs/langs/sv_SE/users.lang
rename to public/langs/sv_SE/users.lang
diff --git a/htdocs/langs/sv_SE/website.lang b/public/langs/sv_SE/website.lang
similarity index 100%
rename from htdocs/langs/sv_SE/website.lang
rename to public/langs/sv_SE/website.lang
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/public/langs/sv_SE/withdrawals.lang
similarity index 100%
rename from htdocs/langs/sv_SE/withdrawals.lang
rename to public/langs/sv_SE/withdrawals.lang
diff --git a/htdocs/langs/sv_SE/workflow.lang b/public/langs/sv_SE/workflow.lang
similarity index 100%
rename from htdocs/langs/sv_SE/workflow.lang
rename to public/langs/sv_SE/workflow.lang
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/public/langs/sw_SW/accountancy.lang
similarity index 100%
rename from htdocs/langs/sw_SW/accountancy.lang
rename to public/langs/sw_SW/accountancy.lang
diff --git a/htdocs/langs/sw_SW/admin.lang b/public/langs/sw_SW/admin.lang
similarity index 100%
rename from htdocs/langs/sw_SW/admin.lang
rename to public/langs/sw_SW/admin.lang
diff --git a/htdocs/langs/sw_SW/agenda.lang b/public/langs/sw_SW/agenda.lang
similarity index 100%
rename from htdocs/langs/sw_SW/agenda.lang
rename to public/langs/sw_SW/agenda.lang
diff --git a/htdocs/langs/sw_SW/banks.lang b/public/langs/sw_SW/banks.lang
similarity index 100%
rename from htdocs/langs/sw_SW/banks.lang
rename to public/langs/sw_SW/banks.lang
diff --git a/htdocs/langs/sw_SW/bills.lang b/public/langs/sw_SW/bills.lang
similarity index 100%
rename from htdocs/langs/sw_SW/bills.lang
rename to public/langs/sw_SW/bills.lang
diff --git a/htdocs/langs/sw_SW/bookmarks.lang b/public/langs/sw_SW/bookmarks.lang
similarity index 100%
rename from htdocs/langs/sw_SW/bookmarks.lang
rename to public/langs/sw_SW/bookmarks.lang
diff --git a/htdocs/langs/sw_SW/boxes.lang b/public/langs/sw_SW/boxes.lang
similarity index 100%
rename from htdocs/langs/sw_SW/boxes.lang
rename to public/langs/sw_SW/boxes.lang
diff --git a/htdocs/langs/sw_SW/cashdesk.lang b/public/langs/sw_SW/cashdesk.lang
similarity index 100%
rename from htdocs/langs/sw_SW/cashdesk.lang
rename to public/langs/sw_SW/cashdesk.lang
diff --git a/htdocs/langs/sw_SW/categories.lang b/public/langs/sw_SW/categories.lang
similarity index 100%
rename from htdocs/langs/sw_SW/categories.lang
rename to public/langs/sw_SW/categories.lang
diff --git a/htdocs/langs/sw_SW/commercial.lang b/public/langs/sw_SW/commercial.lang
similarity index 100%
rename from htdocs/langs/sw_SW/commercial.lang
rename to public/langs/sw_SW/commercial.lang
diff --git a/htdocs/langs/sw_SW/companies.lang b/public/langs/sw_SW/companies.lang
similarity index 100%
rename from htdocs/langs/sw_SW/companies.lang
rename to public/langs/sw_SW/companies.lang
diff --git a/htdocs/langs/sw_SW/compta.lang b/public/langs/sw_SW/compta.lang
similarity index 100%
rename from htdocs/langs/sw_SW/compta.lang
rename to public/langs/sw_SW/compta.lang
diff --git a/htdocs/langs/sw_SW/contracts.lang b/public/langs/sw_SW/contracts.lang
similarity index 100%
rename from htdocs/langs/sw_SW/contracts.lang
rename to public/langs/sw_SW/contracts.lang
diff --git a/htdocs/langs/sw_SW/cron.lang b/public/langs/sw_SW/cron.lang
similarity index 100%
rename from htdocs/langs/sw_SW/cron.lang
rename to public/langs/sw_SW/cron.lang
diff --git a/htdocs/langs/sw_SW/deliveries.lang b/public/langs/sw_SW/deliveries.lang
similarity index 100%
rename from htdocs/langs/sw_SW/deliveries.lang
rename to public/langs/sw_SW/deliveries.lang
diff --git a/htdocs/langs/sw_SW/dict.lang b/public/langs/sw_SW/dict.lang
similarity index 100%
rename from htdocs/langs/sw_SW/dict.lang
rename to public/langs/sw_SW/dict.lang
diff --git a/htdocs/langs/sw_SW/donations.lang b/public/langs/sw_SW/donations.lang
similarity index 100%
rename from htdocs/langs/sw_SW/donations.lang
rename to public/langs/sw_SW/donations.lang
diff --git a/htdocs/langs/sw_SW/ecm.lang b/public/langs/sw_SW/ecm.lang
similarity index 100%
rename from htdocs/langs/sw_SW/ecm.lang
rename to public/langs/sw_SW/ecm.lang
diff --git a/htdocs/langs/sw_SW/errors.lang b/public/langs/sw_SW/errors.lang
similarity index 100%
rename from htdocs/langs/sw_SW/errors.lang
rename to public/langs/sw_SW/errors.lang
diff --git a/htdocs/langs/sw_SW/exports.lang b/public/langs/sw_SW/exports.lang
similarity index 100%
rename from htdocs/langs/sw_SW/exports.lang
rename to public/langs/sw_SW/exports.lang
diff --git a/htdocs/langs/sw_SW/externalsite.lang b/public/langs/sw_SW/externalsite.lang
similarity index 100%
rename from htdocs/langs/sw_SW/externalsite.lang
rename to public/langs/sw_SW/externalsite.lang
diff --git a/htdocs/langs/sw_SW/ftp.lang b/public/langs/sw_SW/ftp.lang
similarity index 100%
rename from htdocs/langs/sw_SW/ftp.lang
rename to public/langs/sw_SW/ftp.lang
diff --git a/htdocs/langs/sw_SW/help.lang b/public/langs/sw_SW/help.lang
similarity index 100%
rename from htdocs/langs/sw_SW/help.lang
rename to public/langs/sw_SW/help.lang
diff --git a/htdocs/langs/sw_SW/holiday.lang b/public/langs/sw_SW/holiday.lang
similarity index 100%
rename from htdocs/langs/sw_SW/holiday.lang
rename to public/langs/sw_SW/holiday.lang
diff --git a/htdocs/langs/sw_SW/incoterm.lang b/public/langs/sw_SW/incoterm.lang
similarity index 100%
rename from htdocs/langs/sw_SW/incoterm.lang
rename to public/langs/sw_SW/incoterm.lang
diff --git a/htdocs/langs/sw_SW/install.lang b/public/langs/sw_SW/install.lang
similarity index 100%
rename from htdocs/langs/sw_SW/install.lang
rename to public/langs/sw_SW/install.lang
diff --git a/htdocs/langs/sw_SW/interventions.lang b/public/langs/sw_SW/interventions.lang
similarity index 100%
rename from htdocs/langs/sw_SW/interventions.lang
rename to public/langs/sw_SW/interventions.lang
diff --git a/htdocs/langs/sw_SW/languages.lang b/public/langs/sw_SW/languages.lang
similarity index 100%
rename from htdocs/langs/sw_SW/languages.lang
rename to public/langs/sw_SW/languages.lang
diff --git a/htdocs/langs/sw_SW/ldap.lang b/public/langs/sw_SW/ldap.lang
similarity index 100%
rename from htdocs/langs/sw_SW/ldap.lang
rename to public/langs/sw_SW/ldap.lang
diff --git a/htdocs/langs/sw_SW/link.lang b/public/langs/sw_SW/link.lang
similarity index 100%
rename from htdocs/langs/sw_SW/link.lang
rename to public/langs/sw_SW/link.lang
diff --git a/htdocs/langs/sw_SW/loan.lang b/public/langs/sw_SW/loan.lang
similarity index 100%
rename from htdocs/langs/sw_SW/loan.lang
rename to public/langs/sw_SW/loan.lang
diff --git a/htdocs/langs/sw_SW/mailmanspip.lang b/public/langs/sw_SW/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/sw_SW/mailmanspip.lang
rename to public/langs/sw_SW/mailmanspip.lang
diff --git a/htdocs/langs/sw_SW/mails.lang b/public/langs/sw_SW/mails.lang
similarity index 100%
rename from htdocs/langs/sw_SW/mails.lang
rename to public/langs/sw_SW/mails.lang
diff --git a/htdocs/langs/sw_SW/main.lang b/public/langs/sw_SW/main.lang
similarity index 100%
rename from htdocs/langs/sw_SW/main.lang
rename to public/langs/sw_SW/main.lang
diff --git a/htdocs/langs/sw_SW/margins.lang b/public/langs/sw_SW/margins.lang
similarity index 100%
rename from htdocs/langs/sw_SW/margins.lang
rename to public/langs/sw_SW/margins.lang
diff --git a/htdocs/langs/sw_SW/members.lang b/public/langs/sw_SW/members.lang
similarity index 100%
rename from htdocs/langs/sw_SW/members.lang
rename to public/langs/sw_SW/members.lang
diff --git a/htdocs/langs/sw_SW/opensurvey.lang b/public/langs/sw_SW/opensurvey.lang
similarity index 100%
rename from htdocs/langs/sw_SW/opensurvey.lang
rename to public/langs/sw_SW/opensurvey.lang
diff --git a/htdocs/langs/sw_SW/orders.lang b/public/langs/sw_SW/orders.lang
similarity index 100%
rename from htdocs/langs/sw_SW/orders.lang
rename to public/langs/sw_SW/orders.lang
diff --git a/htdocs/langs/sw_SW/other.lang b/public/langs/sw_SW/other.lang
similarity index 100%
rename from htdocs/langs/sw_SW/other.lang
rename to public/langs/sw_SW/other.lang
diff --git a/htdocs/langs/sw_SW/paybox.lang b/public/langs/sw_SW/paybox.lang
similarity index 100%
rename from htdocs/langs/sw_SW/paybox.lang
rename to public/langs/sw_SW/paybox.lang
diff --git a/htdocs/langs/sw_SW/paypal.lang b/public/langs/sw_SW/paypal.lang
similarity index 100%
rename from htdocs/langs/sw_SW/paypal.lang
rename to public/langs/sw_SW/paypal.lang
diff --git a/htdocs/langs/sw_SW/printing.lang b/public/langs/sw_SW/printing.lang
similarity index 100%
rename from htdocs/langs/sw_SW/printing.lang
rename to public/langs/sw_SW/printing.lang
diff --git a/htdocs/langs/sw_SW/productbatch.lang b/public/langs/sw_SW/productbatch.lang
similarity index 100%
rename from htdocs/langs/sw_SW/productbatch.lang
rename to public/langs/sw_SW/productbatch.lang
diff --git a/htdocs/langs/sw_SW/products.lang b/public/langs/sw_SW/products.lang
similarity index 100%
rename from htdocs/langs/sw_SW/products.lang
rename to public/langs/sw_SW/products.lang
diff --git a/htdocs/langs/sw_SW/projects.lang b/public/langs/sw_SW/projects.lang
similarity index 100%
rename from htdocs/langs/sw_SW/projects.lang
rename to public/langs/sw_SW/projects.lang
diff --git a/htdocs/langs/sw_SW/propal.lang b/public/langs/sw_SW/propal.lang
similarity index 100%
rename from htdocs/langs/sw_SW/propal.lang
rename to public/langs/sw_SW/propal.lang
diff --git a/htdocs/langs/sw_SW/resource.lang b/public/langs/sw_SW/resource.lang
similarity index 100%
rename from htdocs/langs/sw_SW/resource.lang
rename to public/langs/sw_SW/resource.lang
diff --git a/htdocs/langs/sw_SW/salaries.lang b/public/langs/sw_SW/salaries.lang
similarity index 100%
rename from htdocs/langs/sw_SW/salaries.lang
rename to public/langs/sw_SW/salaries.lang
diff --git a/htdocs/langs/sw_SW/sendings.lang b/public/langs/sw_SW/sendings.lang
similarity index 100%
rename from htdocs/langs/sw_SW/sendings.lang
rename to public/langs/sw_SW/sendings.lang
diff --git a/htdocs/langs/sw_SW/sms.lang b/public/langs/sw_SW/sms.lang
similarity index 100%
rename from htdocs/langs/sw_SW/sms.lang
rename to public/langs/sw_SW/sms.lang
diff --git a/htdocs/langs/sw_SW/stocks.lang b/public/langs/sw_SW/stocks.lang
similarity index 100%
rename from htdocs/langs/sw_SW/stocks.lang
rename to public/langs/sw_SW/stocks.lang
diff --git a/htdocs/langs/sw_SW/suppliers.lang b/public/langs/sw_SW/suppliers.lang
similarity index 100%
rename from htdocs/langs/sw_SW/suppliers.lang
rename to public/langs/sw_SW/suppliers.lang
diff --git a/htdocs/langs/sw_SW/trips.lang b/public/langs/sw_SW/trips.lang
similarity index 100%
rename from htdocs/langs/sw_SW/trips.lang
rename to public/langs/sw_SW/trips.lang
diff --git a/htdocs/langs/sw_SW/users.lang b/public/langs/sw_SW/users.lang
similarity index 100%
rename from htdocs/langs/sw_SW/users.lang
rename to public/langs/sw_SW/users.lang
diff --git a/htdocs/langs/sw_SW/withdrawals.lang b/public/langs/sw_SW/withdrawals.lang
similarity index 100%
rename from htdocs/langs/sw_SW/withdrawals.lang
rename to public/langs/sw_SW/withdrawals.lang
diff --git a/htdocs/langs/sw_SW/workflow.lang b/public/langs/sw_SW/workflow.lang
similarity index 100%
rename from htdocs/langs/sw_SW/workflow.lang
rename to public/langs/sw_SW/workflow.lang
diff --git a/htdocs/langs/th_TH/accountancy.lang b/public/langs/th_TH/accountancy.lang
similarity index 100%
rename from htdocs/langs/th_TH/accountancy.lang
rename to public/langs/th_TH/accountancy.lang
diff --git a/htdocs/langs/th_TH/admin.lang b/public/langs/th_TH/admin.lang
similarity index 100%
rename from htdocs/langs/th_TH/admin.lang
rename to public/langs/th_TH/admin.lang
diff --git a/htdocs/langs/th_TH/agenda.lang b/public/langs/th_TH/agenda.lang
similarity index 100%
rename from htdocs/langs/th_TH/agenda.lang
rename to public/langs/th_TH/agenda.lang
diff --git a/htdocs/langs/th_TH/banks.lang b/public/langs/th_TH/banks.lang
similarity index 100%
rename from htdocs/langs/th_TH/banks.lang
rename to public/langs/th_TH/banks.lang
diff --git a/htdocs/langs/th_TH/bills.lang b/public/langs/th_TH/bills.lang
similarity index 100%
rename from htdocs/langs/th_TH/bills.lang
rename to public/langs/th_TH/bills.lang
diff --git a/htdocs/langs/th_TH/bookmarks.lang b/public/langs/th_TH/bookmarks.lang
similarity index 100%
rename from htdocs/langs/th_TH/bookmarks.lang
rename to public/langs/th_TH/bookmarks.lang
diff --git a/htdocs/langs/th_TH/boxes.lang b/public/langs/th_TH/boxes.lang
similarity index 100%
rename from htdocs/langs/th_TH/boxes.lang
rename to public/langs/th_TH/boxes.lang
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/public/langs/th_TH/cashdesk.lang
similarity index 100%
rename from htdocs/langs/th_TH/cashdesk.lang
rename to public/langs/th_TH/cashdesk.lang
diff --git a/htdocs/langs/th_TH/categories.lang b/public/langs/th_TH/categories.lang
similarity index 100%
rename from htdocs/langs/th_TH/categories.lang
rename to public/langs/th_TH/categories.lang
diff --git a/htdocs/langs/th_TH/commercial.lang b/public/langs/th_TH/commercial.lang
similarity index 100%
rename from htdocs/langs/th_TH/commercial.lang
rename to public/langs/th_TH/commercial.lang
diff --git a/htdocs/langs/th_TH/companies.lang b/public/langs/th_TH/companies.lang
similarity index 100%
rename from htdocs/langs/th_TH/companies.lang
rename to public/langs/th_TH/companies.lang
diff --git a/htdocs/langs/th_TH/compta.lang b/public/langs/th_TH/compta.lang
similarity index 100%
rename from htdocs/langs/th_TH/compta.lang
rename to public/langs/th_TH/compta.lang
diff --git a/htdocs/langs/th_TH/contracts.lang b/public/langs/th_TH/contracts.lang
similarity index 100%
rename from htdocs/langs/th_TH/contracts.lang
rename to public/langs/th_TH/contracts.lang
diff --git a/htdocs/langs/th_TH/cron.lang b/public/langs/th_TH/cron.lang
similarity index 100%
rename from htdocs/langs/th_TH/cron.lang
rename to public/langs/th_TH/cron.lang
diff --git a/htdocs/langs/th_TH/deliveries.lang b/public/langs/th_TH/deliveries.lang
similarity index 100%
rename from htdocs/langs/th_TH/deliveries.lang
rename to public/langs/th_TH/deliveries.lang
diff --git a/htdocs/langs/th_TH/dict.lang b/public/langs/th_TH/dict.lang
similarity index 100%
rename from htdocs/langs/th_TH/dict.lang
rename to public/langs/th_TH/dict.lang
diff --git a/htdocs/langs/th_TH/donations.lang b/public/langs/th_TH/donations.lang
similarity index 100%
rename from htdocs/langs/th_TH/donations.lang
rename to public/langs/th_TH/donations.lang
diff --git a/htdocs/langs/th_TH/ecm.lang b/public/langs/th_TH/ecm.lang
similarity index 100%
rename from htdocs/langs/th_TH/ecm.lang
rename to public/langs/th_TH/ecm.lang
diff --git a/htdocs/langs/th_TH/errors.lang b/public/langs/th_TH/errors.lang
similarity index 100%
rename from htdocs/langs/th_TH/errors.lang
rename to public/langs/th_TH/errors.lang
diff --git a/htdocs/langs/th_TH/exports.lang b/public/langs/th_TH/exports.lang
similarity index 100%
rename from htdocs/langs/th_TH/exports.lang
rename to public/langs/th_TH/exports.lang
diff --git a/htdocs/langs/th_TH/externalsite.lang b/public/langs/th_TH/externalsite.lang
similarity index 100%
rename from htdocs/langs/th_TH/externalsite.lang
rename to public/langs/th_TH/externalsite.lang
diff --git a/htdocs/langs/th_TH/ftp.lang b/public/langs/th_TH/ftp.lang
similarity index 100%
rename from htdocs/langs/th_TH/ftp.lang
rename to public/langs/th_TH/ftp.lang
diff --git a/htdocs/langs/th_TH/help.lang b/public/langs/th_TH/help.lang
similarity index 100%
rename from htdocs/langs/th_TH/help.lang
rename to public/langs/th_TH/help.lang
diff --git a/htdocs/langs/th_TH/holiday.lang b/public/langs/th_TH/holiday.lang
similarity index 100%
rename from htdocs/langs/th_TH/holiday.lang
rename to public/langs/th_TH/holiday.lang
diff --git a/htdocs/langs/th_TH/hrm.lang b/public/langs/th_TH/hrm.lang
similarity index 100%
rename from htdocs/langs/th_TH/hrm.lang
rename to public/langs/th_TH/hrm.lang
diff --git a/htdocs/langs/th_TH/incoterm.lang b/public/langs/th_TH/incoterm.lang
similarity index 100%
rename from htdocs/langs/th_TH/incoterm.lang
rename to public/langs/th_TH/incoterm.lang
diff --git a/htdocs/langs/th_TH/install.lang b/public/langs/th_TH/install.lang
similarity index 100%
rename from htdocs/langs/th_TH/install.lang
rename to public/langs/th_TH/install.lang
diff --git a/htdocs/langs/th_TH/interventions.lang b/public/langs/th_TH/interventions.lang
similarity index 100%
rename from htdocs/langs/th_TH/interventions.lang
rename to public/langs/th_TH/interventions.lang
diff --git a/htdocs/langs/th_TH/languages.lang b/public/langs/th_TH/languages.lang
similarity index 100%
rename from htdocs/langs/th_TH/languages.lang
rename to public/langs/th_TH/languages.lang
diff --git a/htdocs/langs/th_TH/ldap.lang b/public/langs/th_TH/ldap.lang
similarity index 100%
rename from htdocs/langs/th_TH/ldap.lang
rename to public/langs/th_TH/ldap.lang
diff --git a/htdocs/langs/th_TH/link.lang b/public/langs/th_TH/link.lang
similarity index 100%
rename from htdocs/langs/th_TH/link.lang
rename to public/langs/th_TH/link.lang
diff --git a/htdocs/langs/th_TH/loan.lang b/public/langs/th_TH/loan.lang
similarity index 100%
rename from htdocs/langs/th_TH/loan.lang
rename to public/langs/th_TH/loan.lang
diff --git a/htdocs/langs/th_TH/mailmanspip.lang b/public/langs/th_TH/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/th_TH/mailmanspip.lang
rename to public/langs/th_TH/mailmanspip.lang
diff --git a/htdocs/langs/th_TH/mails.lang b/public/langs/th_TH/mails.lang
similarity index 100%
rename from htdocs/langs/th_TH/mails.lang
rename to public/langs/th_TH/mails.lang
diff --git a/htdocs/langs/th_TH/main.lang b/public/langs/th_TH/main.lang
similarity index 100%
rename from htdocs/langs/th_TH/main.lang
rename to public/langs/th_TH/main.lang
diff --git a/htdocs/langs/th_TH/margins.lang b/public/langs/th_TH/margins.lang
similarity index 100%
rename from htdocs/langs/th_TH/margins.lang
rename to public/langs/th_TH/margins.lang
diff --git a/htdocs/langs/th_TH/members.lang b/public/langs/th_TH/members.lang
similarity index 100%
rename from htdocs/langs/th_TH/members.lang
rename to public/langs/th_TH/members.lang
diff --git a/htdocs/langs/th_TH/oauth.lang b/public/langs/th_TH/oauth.lang
similarity index 100%
rename from htdocs/langs/th_TH/oauth.lang
rename to public/langs/th_TH/oauth.lang
diff --git a/htdocs/langs/th_TH/opensurvey.lang b/public/langs/th_TH/opensurvey.lang
similarity index 100%
rename from htdocs/langs/th_TH/opensurvey.lang
rename to public/langs/th_TH/opensurvey.lang
diff --git a/htdocs/langs/th_TH/orders.lang b/public/langs/th_TH/orders.lang
similarity index 100%
rename from htdocs/langs/th_TH/orders.lang
rename to public/langs/th_TH/orders.lang
diff --git a/htdocs/langs/th_TH/other.lang b/public/langs/th_TH/other.lang
similarity index 100%
rename from htdocs/langs/th_TH/other.lang
rename to public/langs/th_TH/other.lang
diff --git a/htdocs/langs/th_TH/paybox.lang b/public/langs/th_TH/paybox.lang
similarity index 100%
rename from htdocs/langs/th_TH/paybox.lang
rename to public/langs/th_TH/paybox.lang
diff --git a/htdocs/langs/th_TH/paypal.lang b/public/langs/th_TH/paypal.lang
similarity index 100%
rename from htdocs/langs/th_TH/paypal.lang
rename to public/langs/th_TH/paypal.lang
diff --git a/htdocs/langs/th_TH/printing.lang b/public/langs/th_TH/printing.lang
similarity index 100%
rename from htdocs/langs/th_TH/printing.lang
rename to public/langs/th_TH/printing.lang
diff --git a/htdocs/langs/th_TH/productbatch.lang b/public/langs/th_TH/productbatch.lang
similarity index 100%
rename from htdocs/langs/th_TH/productbatch.lang
rename to public/langs/th_TH/productbatch.lang
diff --git a/htdocs/langs/th_TH/products.lang b/public/langs/th_TH/products.lang
similarity index 100%
rename from htdocs/langs/th_TH/products.lang
rename to public/langs/th_TH/products.lang
diff --git a/htdocs/langs/th_TH/projects.lang b/public/langs/th_TH/projects.lang
similarity index 100%
rename from htdocs/langs/th_TH/projects.lang
rename to public/langs/th_TH/projects.lang
diff --git a/htdocs/langs/th_TH/propal.lang b/public/langs/th_TH/propal.lang
similarity index 100%
rename from htdocs/langs/th_TH/propal.lang
rename to public/langs/th_TH/propal.lang
diff --git a/htdocs/langs/th_TH/receiptprinter.lang b/public/langs/th_TH/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/th_TH/receiptprinter.lang
rename to public/langs/th_TH/receiptprinter.lang
diff --git a/htdocs/langs/th_TH/resource.lang b/public/langs/th_TH/resource.lang
similarity index 100%
rename from htdocs/langs/th_TH/resource.lang
rename to public/langs/th_TH/resource.lang
diff --git a/htdocs/langs/th_TH/salaries.lang b/public/langs/th_TH/salaries.lang
similarity index 100%
rename from htdocs/langs/th_TH/salaries.lang
rename to public/langs/th_TH/salaries.lang
diff --git a/htdocs/langs/th_TH/sendings.lang b/public/langs/th_TH/sendings.lang
similarity index 100%
rename from htdocs/langs/th_TH/sendings.lang
rename to public/langs/th_TH/sendings.lang
diff --git a/htdocs/langs/th_TH/sms.lang b/public/langs/th_TH/sms.lang
similarity index 100%
rename from htdocs/langs/th_TH/sms.lang
rename to public/langs/th_TH/sms.lang
diff --git a/htdocs/langs/th_TH/stocks.lang b/public/langs/th_TH/stocks.lang
similarity index 100%
rename from htdocs/langs/th_TH/stocks.lang
rename to public/langs/th_TH/stocks.lang
diff --git a/htdocs/langs/th_TH/supplier_proposal.lang b/public/langs/th_TH/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/th_TH/supplier_proposal.lang
rename to public/langs/th_TH/supplier_proposal.lang
diff --git a/htdocs/langs/th_TH/suppliers.lang b/public/langs/th_TH/suppliers.lang
similarity index 100%
rename from htdocs/langs/th_TH/suppliers.lang
rename to public/langs/th_TH/suppliers.lang
diff --git a/htdocs/langs/th_TH/trips.lang b/public/langs/th_TH/trips.lang
similarity index 100%
rename from htdocs/langs/th_TH/trips.lang
rename to public/langs/th_TH/trips.lang
diff --git a/htdocs/langs/th_TH/users.lang b/public/langs/th_TH/users.lang
similarity index 100%
rename from htdocs/langs/th_TH/users.lang
rename to public/langs/th_TH/users.lang
diff --git a/htdocs/langs/th_TH/website.lang b/public/langs/th_TH/website.lang
similarity index 100%
rename from htdocs/langs/th_TH/website.lang
rename to public/langs/th_TH/website.lang
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/public/langs/th_TH/withdrawals.lang
similarity index 100%
rename from htdocs/langs/th_TH/withdrawals.lang
rename to public/langs/th_TH/withdrawals.lang
diff --git a/htdocs/langs/th_TH/workflow.lang b/public/langs/th_TH/workflow.lang
similarity index 100%
rename from htdocs/langs/th_TH/workflow.lang
rename to public/langs/th_TH/workflow.lang
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/public/langs/tr_TR/accountancy.lang
similarity index 100%
rename from htdocs/langs/tr_TR/accountancy.lang
rename to public/langs/tr_TR/accountancy.lang
diff --git a/htdocs/langs/tr_TR/admin.lang b/public/langs/tr_TR/admin.lang
similarity index 100%
rename from htdocs/langs/tr_TR/admin.lang
rename to public/langs/tr_TR/admin.lang
diff --git a/htdocs/langs/tr_TR/agenda.lang b/public/langs/tr_TR/agenda.lang
similarity index 100%
rename from htdocs/langs/tr_TR/agenda.lang
rename to public/langs/tr_TR/agenda.lang
diff --git a/htdocs/langs/tr_TR/banks.lang b/public/langs/tr_TR/banks.lang
similarity index 100%
rename from htdocs/langs/tr_TR/banks.lang
rename to public/langs/tr_TR/banks.lang
diff --git a/htdocs/langs/tr_TR/bills.lang b/public/langs/tr_TR/bills.lang
similarity index 100%
rename from htdocs/langs/tr_TR/bills.lang
rename to public/langs/tr_TR/bills.lang
diff --git a/htdocs/langs/tr_TR/bookmarks.lang b/public/langs/tr_TR/bookmarks.lang
similarity index 100%
rename from htdocs/langs/tr_TR/bookmarks.lang
rename to public/langs/tr_TR/bookmarks.lang
diff --git a/htdocs/langs/tr_TR/boxes.lang b/public/langs/tr_TR/boxes.lang
similarity index 100%
rename from htdocs/langs/tr_TR/boxes.lang
rename to public/langs/tr_TR/boxes.lang
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/public/langs/tr_TR/cashdesk.lang
similarity index 100%
rename from htdocs/langs/tr_TR/cashdesk.lang
rename to public/langs/tr_TR/cashdesk.lang
diff --git a/htdocs/langs/tr_TR/categories.lang b/public/langs/tr_TR/categories.lang
similarity index 100%
rename from htdocs/langs/tr_TR/categories.lang
rename to public/langs/tr_TR/categories.lang
diff --git a/htdocs/langs/tr_TR/commercial.lang b/public/langs/tr_TR/commercial.lang
similarity index 100%
rename from htdocs/langs/tr_TR/commercial.lang
rename to public/langs/tr_TR/commercial.lang
diff --git a/htdocs/langs/tr_TR/commissions.lang b/public/langs/tr_TR/commissions.lang
similarity index 100%
rename from htdocs/langs/tr_TR/commissions.lang
rename to public/langs/tr_TR/commissions.lang
diff --git a/htdocs/langs/tr_TR/companies.lang b/public/langs/tr_TR/companies.lang
similarity index 100%
rename from htdocs/langs/tr_TR/companies.lang
rename to public/langs/tr_TR/companies.lang
diff --git a/htdocs/langs/tr_TR/compta.lang b/public/langs/tr_TR/compta.lang
similarity index 100%
rename from htdocs/langs/tr_TR/compta.lang
rename to public/langs/tr_TR/compta.lang
diff --git a/htdocs/langs/tr_TR/contracts.lang b/public/langs/tr_TR/contracts.lang
similarity index 100%
rename from htdocs/langs/tr_TR/contracts.lang
rename to public/langs/tr_TR/contracts.lang
diff --git a/htdocs/langs/tr_TR/cron.lang b/public/langs/tr_TR/cron.lang
similarity index 100%
rename from htdocs/langs/tr_TR/cron.lang
rename to public/langs/tr_TR/cron.lang
diff --git a/htdocs/langs/tr_TR/deliveries.lang b/public/langs/tr_TR/deliveries.lang
similarity index 100%
rename from htdocs/langs/tr_TR/deliveries.lang
rename to public/langs/tr_TR/deliveries.lang
diff --git a/htdocs/langs/tr_TR/dict.lang b/public/langs/tr_TR/dict.lang
similarity index 100%
rename from htdocs/langs/tr_TR/dict.lang
rename to public/langs/tr_TR/dict.lang
diff --git a/htdocs/langs/tr_TR/donations.lang b/public/langs/tr_TR/donations.lang
similarity index 100%
rename from htdocs/langs/tr_TR/donations.lang
rename to public/langs/tr_TR/donations.lang
diff --git a/htdocs/langs/tr_TR/ecm.lang b/public/langs/tr_TR/ecm.lang
similarity index 100%
rename from htdocs/langs/tr_TR/ecm.lang
rename to public/langs/tr_TR/ecm.lang
diff --git a/htdocs/langs/tr_TR/errors.lang b/public/langs/tr_TR/errors.lang
similarity index 100%
rename from htdocs/langs/tr_TR/errors.lang
rename to public/langs/tr_TR/errors.lang
diff --git a/htdocs/langs/tr_TR/exports.lang b/public/langs/tr_TR/exports.lang
similarity index 100%
rename from htdocs/langs/tr_TR/exports.lang
rename to public/langs/tr_TR/exports.lang
diff --git a/htdocs/langs/tr_TR/externalsite.lang b/public/langs/tr_TR/externalsite.lang
similarity index 100%
rename from htdocs/langs/tr_TR/externalsite.lang
rename to public/langs/tr_TR/externalsite.lang
diff --git a/htdocs/langs/tr_TR/ftp.lang b/public/langs/tr_TR/ftp.lang
similarity index 100%
rename from htdocs/langs/tr_TR/ftp.lang
rename to public/langs/tr_TR/ftp.lang
diff --git a/htdocs/langs/tr_TR/help.lang b/public/langs/tr_TR/help.lang
similarity index 100%
rename from htdocs/langs/tr_TR/help.lang
rename to public/langs/tr_TR/help.lang
diff --git a/htdocs/langs/tr_TR/holiday.lang b/public/langs/tr_TR/holiday.lang
similarity index 100%
rename from htdocs/langs/tr_TR/holiday.lang
rename to public/langs/tr_TR/holiday.lang
diff --git a/htdocs/langs/tr_TR/hrm.lang b/public/langs/tr_TR/hrm.lang
similarity index 100%
rename from htdocs/langs/tr_TR/hrm.lang
rename to public/langs/tr_TR/hrm.lang
diff --git a/htdocs/langs/tr_TR/incoterm.lang b/public/langs/tr_TR/incoterm.lang
similarity index 100%
rename from htdocs/langs/tr_TR/incoterm.lang
rename to public/langs/tr_TR/incoterm.lang
diff --git a/htdocs/langs/tr_TR/install.lang b/public/langs/tr_TR/install.lang
similarity index 100%
rename from htdocs/langs/tr_TR/install.lang
rename to public/langs/tr_TR/install.lang
diff --git a/htdocs/langs/tr_TR/interventions.lang b/public/langs/tr_TR/interventions.lang
similarity index 100%
rename from htdocs/langs/tr_TR/interventions.lang
rename to public/langs/tr_TR/interventions.lang
diff --git a/htdocs/langs/tr_TR/languages.lang b/public/langs/tr_TR/languages.lang
similarity index 100%
rename from htdocs/langs/tr_TR/languages.lang
rename to public/langs/tr_TR/languages.lang
diff --git a/htdocs/langs/tr_TR/ldap.lang b/public/langs/tr_TR/ldap.lang
similarity index 100%
rename from htdocs/langs/tr_TR/ldap.lang
rename to public/langs/tr_TR/ldap.lang
diff --git a/htdocs/langs/tr_TR/link.lang b/public/langs/tr_TR/link.lang
similarity index 100%
rename from htdocs/langs/tr_TR/link.lang
rename to public/langs/tr_TR/link.lang
diff --git a/htdocs/langs/tr_TR/loan.lang b/public/langs/tr_TR/loan.lang
similarity index 100%
rename from htdocs/langs/tr_TR/loan.lang
rename to public/langs/tr_TR/loan.lang
diff --git a/htdocs/langs/tr_TR/mailmanspip.lang b/public/langs/tr_TR/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/tr_TR/mailmanspip.lang
rename to public/langs/tr_TR/mailmanspip.lang
diff --git a/htdocs/langs/tr_TR/mails.lang b/public/langs/tr_TR/mails.lang
similarity index 100%
rename from htdocs/langs/tr_TR/mails.lang
rename to public/langs/tr_TR/mails.lang
diff --git a/htdocs/langs/tr_TR/main.lang b/public/langs/tr_TR/main.lang
similarity index 100%
rename from htdocs/langs/tr_TR/main.lang
rename to public/langs/tr_TR/main.lang
diff --git a/htdocs/langs/tr_TR/margins.lang b/public/langs/tr_TR/margins.lang
similarity index 100%
rename from htdocs/langs/tr_TR/margins.lang
rename to public/langs/tr_TR/margins.lang
diff --git a/htdocs/langs/tr_TR/members.lang b/public/langs/tr_TR/members.lang
similarity index 100%
rename from htdocs/langs/tr_TR/members.lang
rename to public/langs/tr_TR/members.lang
diff --git a/htdocs/langs/tr_TR/oauth.lang b/public/langs/tr_TR/oauth.lang
similarity index 100%
rename from htdocs/langs/tr_TR/oauth.lang
rename to public/langs/tr_TR/oauth.lang
diff --git a/htdocs/langs/tr_TR/opensurvey.lang b/public/langs/tr_TR/opensurvey.lang
similarity index 100%
rename from htdocs/langs/tr_TR/opensurvey.lang
rename to public/langs/tr_TR/opensurvey.lang
diff --git a/htdocs/langs/tr_TR/orders.lang b/public/langs/tr_TR/orders.lang
similarity index 100%
rename from htdocs/langs/tr_TR/orders.lang
rename to public/langs/tr_TR/orders.lang
diff --git a/htdocs/langs/tr_TR/other.lang b/public/langs/tr_TR/other.lang
similarity index 100%
rename from htdocs/langs/tr_TR/other.lang
rename to public/langs/tr_TR/other.lang
diff --git a/htdocs/langs/tr_TR/paybox.lang b/public/langs/tr_TR/paybox.lang
similarity index 100%
rename from htdocs/langs/tr_TR/paybox.lang
rename to public/langs/tr_TR/paybox.lang
diff --git a/htdocs/langs/tr_TR/paypal.lang b/public/langs/tr_TR/paypal.lang
similarity index 100%
rename from htdocs/langs/tr_TR/paypal.lang
rename to public/langs/tr_TR/paypal.lang
diff --git a/htdocs/langs/tr_TR/printing.lang b/public/langs/tr_TR/printing.lang
similarity index 100%
rename from htdocs/langs/tr_TR/printing.lang
rename to public/langs/tr_TR/printing.lang
diff --git a/htdocs/langs/tr_TR/productbatch.lang b/public/langs/tr_TR/productbatch.lang
similarity index 100%
rename from htdocs/langs/tr_TR/productbatch.lang
rename to public/langs/tr_TR/productbatch.lang
diff --git a/htdocs/langs/tr_TR/products.lang b/public/langs/tr_TR/products.lang
similarity index 100%
rename from htdocs/langs/tr_TR/products.lang
rename to public/langs/tr_TR/products.lang
diff --git a/htdocs/langs/tr_TR/projects.lang b/public/langs/tr_TR/projects.lang
similarity index 100%
rename from htdocs/langs/tr_TR/projects.lang
rename to public/langs/tr_TR/projects.lang
diff --git a/htdocs/langs/tr_TR/propal.lang b/public/langs/tr_TR/propal.lang
similarity index 100%
rename from htdocs/langs/tr_TR/propal.lang
rename to public/langs/tr_TR/propal.lang
diff --git a/htdocs/langs/tr_TR/receiptprinter.lang b/public/langs/tr_TR/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/tr_TR/receiptprinter.lang
rename to public/langs/tr_TR/receiptprinter.lang
diff --git a/htdocs/langs/tr_TR/resource.lang b/public/langs/tr_TR/resource.lang
similarity index 100%
rename from htdocs/langs/tr_TR/resource.lang
rename to public/langs/tr_TR/resource.lang
diff --git a/htdocs/langs/tr_TR/salaries.lang b/public/langs/tr_TR/salaries.lang
similarity index 100%
rename from htdocs/langs/tr_TR/salaries.lang
rename to public/langs/tr_TR/salaries.lang
diff --git a/htdocs/langs/tr_TR/sendings.lang b/public/langs/tr_TR/sendings.lang
similarity index 100%
rename from htdocs/langs/tr_TR/sendings.lang
rename to public/langs/tr_TR/sendings.lang
diff --git a/htdocs/langs/tr_TR/sms.lang b/public/langs/tr_TR/sms.lang
similarity index 100%
rename from htdocs/langs/tr_TR/sms.lang
rename to public/langs/tr_TR/sms.lang
diff --git a/htdocs/langs/tr_TR/stocks.lang b/public/langs/tr_TR/stocks.lang
similarity index 100%
rename from htdocs/langs/tr_TR/stocks.lang
rename to public/langs/tr_TR/stocks.lang
diff --git a/htdocs/langs/tr_TR/supplier_proposal.lang b/public/langs/tr_TR/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/tr_TR/supplier_proposal.lang
rename to public/langs/tr_TR/supplier_proposal.lang
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/public/langs/tr_TR/suppliers.lang
similarity index 100%
rename from htdocs/langs/tr_TR/suppliers.lang
rename to public/langs/tr_TR/suppliers.lang
diff --git a/htdocs/langs/tr_TR/trips.lang b/public/langs/tr_TR/trips.lang
similarity index 100%
rename from htdocs/langs/tr_TR/trips.lang
rename to public/langs/tr_TR/trips.lang
diff --git a/htdocs/langs/tr_TR/users.lang b/public/langs/tr_TR/users.lang
similarity index 100%
rename from htdocs/langs/tr_TR/users.lang
rename to public/langs/tr_TR/users.lang
diff --git a/htdocs/langs/tr_TR/website.lang b/public/langs/tr_TR/website.lang
similarity index 100%
rename from htdocs/langs/tr_TR/website.lang
rename to public/langs/tr_TR/website.lang
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/public/langs/tr_TR/withdrawals.lang
similarity index 100%
rename from htdocs/langs/tr_TR/withdrawals.lang
rename to public/langs/tr_TR/withdrawals.lang
diff --git a/htdocs/langs/tr_TR/workflow.lang b/public/langs/tr_TR/workflow.lang
similarity index 100%
rename from htdocs/langs/tr_TR/workflow.lang
rename to public/langs/tr_TR/workflow.lang
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/public/langs/uk_UA/accountancy.lang
similarity index 100%
rename from htdocs/langs/uk_UA/accountancy.lang
rename to public/langs/uk_UA/accountancy.lang
diff --git a/htdocs/langs/uk_UA/admin.lang b/public/langs/uk_UA/admin.lang
similarity index 100%
rename from htdocs/langs/uk_UA/admin.lang
rename to public/langs/uk_UA/admin.lang
diff --git a/htdocs/langs/uk_UA/agenda.lang b/public/langs/uk_UA/agenda.lang
similarity index 100%
rename from htdocs/langs/uk_UA/agenda.lang
rename to public/langs/uk_UA/agenda.lang
diff --git a/htdocs/langs/uk_UA/banks.lang b/public/langs/uk_UA/banks.lang
similarity index 100%
rename from htdocs/langs/uk_UA/banks.lang
rename to public/langs/uk_UA/banks.lang
diff --git a/htdocs/langs/uk_UA/bills.lang b/public/langs/uk_UA/bills.lang
similarity index 100%
rename from htdocs/langs/uk_UA/bills.lang
rename to public/langs/uk_UA/bills.lang
diff --git a/htdocs/langs/uk_UA/bookmarks.lang b/public/langs/uk_UA/bookmarks.lang
similarity index 100%
rename from htdocs/langs/uk_UA/bookmarks.lang
rename to public/langs/uk_UA/bookmarks.lang
diff --git a/htdocs/langs/uk_UA/boxes.lang b/public/langs/uk_UA/boxes.lang
similarity index 100%
rename from htdocs/langs/uk_UA/boxes.lang
rename to public/langs/uk_UA/boxes.lang
diff --git a/htdocs/langs/uk_UA/cashdesk.lang b/public/langs/uk_UA/cashdesk.lang
similarity index 100%
rename from htdocs/langs/uk_UA/cashdesk.lang
rename to public/langs/uk_UA/cashdesk.lang
diff --git a/htdocs/langs/uk_UA/categories.lang b/public/langs/uk_UA/categories.lang
similarity index 100%
rename from htdocs/langs/uk_UA/categories.lang
rename to public/langs/uk_UA/categories.lang
diff --git a/htdocs/langs/uk_UA/commercial.lang b/public/langs/uk_UA/commercial.lang
similarity index 100%
rename from htdocs/langs/uk_UA/commercial.lang
rename to public/langs/uk_UA/commercial.lang
diff --git a/htdocs/langs/uk_UA/companies.lang b/public/langs/uk_UA/companies.lang
similarity index 100%
rename from htdocs/langs/uk_UA/companies.lang
rename to public/langs/uk_UA/companies.lang
diff --git a/htdocs/langs/uk_UA/compta.lang b/public/langs/uk_UA/compta.lang
similarity index 100%
rename from htdocs/langs/uk_UA/compta.lang
rename to public/langs/uk_UA/compta.lang
diff --git a/htdocs/langs/uk_UA/contracts.lang b/public/langs/uk_UA/contracts.lang
similarity index 100%
rename from htdocs/langs/uk_UA/contracts.lang
rename to public/langs/uk_UA/contracts.lang
diff --git a/htdocs/langs/uk_UA/cron.lang b/public/langs/uk_UA/cron.lang
similarity index 100%
rename from htdocs/langs/uk_UA/cron.lang
rename to public/langs/uk_UA/cron.lang
diff --git a/htdocs/langs/uk_UA/deliveries.lang b/public/langs/uk_UA/deliveries.lang
similarity index 100%
rename from htdocs/langs/uk_UA/deliveries.lang
rename to public/langs/uk_UA/deliveries.lang
diff --git a/htdocs/langs/uk_UA/dict.lang b/public/langs/uk_UA/dict.lang
similarity index 100%
rename from htdocs/langs/uk_UA/dict.lang
rename to public/langs/uk_UA/dict.lang
diff --git a/htdocs/langs/uk_UA/donations.lang b/public/langs/uk_UA/donations.lang
similarity index 100%
rename from htdocs/langs/uk_UA/donations.lang
rename to public/langs/uk_UA/donations.lang
diff --git a/htdocs/langs/uk_UA/ecm.lang b/public/langs/uk_UA/ecm.lang
similarity index 100%
rename from htdocs/langs/uk_UA/ecm.lang
rename to public/langs/uk_UA/ecm.lang
diff --git a/htdocs/langs/uk_UA/errors.lang b/public/langs/uk_UA/errors.lang
similarity index 100%
rename from htdocs/langs/uk_UA/errors.lang
rename to public/langs/uk_UA/errors.lang
diff --git a/htdocs/langs/uk_UA/exports.lang b/public/langs/uk_UA/exports.lang
similarity index 100%
rename from htdocs/langs/uk_UA/exports.lang
rename to public/langs/uk_UA/exports.lang
diff --git a/htdocs/langs/uk_UA/externalsite.lang b/public/langs/uk_UA/externalsite.lang
similarity index 100%
rename from htdocs/langs/uk_UA/externalsite.lang
rename to public/langs/uk_UA/externalsite.lang
diff --git a/htdocs/langs/uk_UA/ftp.lang b/public/langs/uk_UA/ftp.lang
similarity index 100%
rename from htdocs/langs/uk_UA/ftp.lang
rename to public/langs/uk_UA/ftp.lang
diff --git a/htdocs/langs/uk_UA/help.lang b/public/langs/uk_UA/help.lang
similarity index 100%
rename from htdocs/langs/uk_UA/help.lang
rename to public/langs/uk_UA/help.lang
diff --git a/htdocs/langs/uk_UA/holiday.lang b/public/langs/uk_UA/holiday.lang
similarity index 100%
rename from htdocs/langs/uk_UA/holiday.lang
rename to public/langs/uk_UA/holiday.lang
diff --git a/htdocs/langs/uk_UA/hrm.lang b/public/langs/uk_UA/hrm.lang
similarity index 100%
rename from htdocs/langs/uk_UA/hrm.lang
rename to public/langs/uk_UA/hrm.lang
diff --git a/htdocs/langs/uk_UA/incoterm.lang b/public/langs/uk_UA/incoterm.lang
similarity index 100%
rename from htdocs/langs/uk_UA/incoterm.lang
rename to public/langs/uk_UA/incoterm.lang
diff --git a/htdocs/langs/uk_UA/install.lang b/public/langs/uk_UA/install.lang
similarity index 100%
rename from htdocs/langs/uk_UA/install.lang
rename to public/langs/uk_UA/install.lang
diff --git a/htdocs/langs/uk_UA/interventions.lang b/public/langs/uk_UA/interventions.lang
similarity index 100%
rename from htdocs/langs/uk_UA/interventions.lang
rename to public/langs/uk_UA/interventions.lang
diff --git a/htdocs/langs/uk_UA/languages.lang b/public/langs/uk_UA/languages.lang
similarity index 100%
rename from htdocs/langs/uk_UA/languages.lang
rename to public/langs/uk_UA/languages.lang
diff --git a/htdocs/langs/uk_UA/ldap.lang b/public/langs/uk_UA/ldap.lang
similarity index 100%
rename from htdocs/langs/uk_UA/ldap.lang
rename to public/langs/uk_UA/ldap.lang
diff --git a/htdocs/langs/uk_UA/link.lang b/public/langs/uk_UA/link.lang
similarity index 100%
rename from htdocs/langs/uk_UA/link.lang
rename to public/langs/uk_UA/link.lang
diff --git a/htdocs/langs/uk_UA/loan.lang b/public/langs/uk_UA/loan.lang
similarity index 100%
rename from htdocs/langs/uk_UA/loan.lang
rename to public/langs/uk_UA/loan.lang
diff --git a/htdocs/langs/uk_UA/mailmanspip.lang b/public/langs/uk_UA/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/uk_UA/mailmanspip.lang
rename to public/langs/uk_UA/mailmanspip.lang
diff --git a/htdocs/langs/uk_UA/mails.lang b/public/langs/uk_UA/mails.lang
similarity index 100%
rename from htdocs/langs/uk_UA/mails.lang
rename to public/langs/uk_UA/mails.lang
diff --git a/htdocs/langs/uk_UA/main.lang b/public/langs/uk_UA/main.lang
similarity index 100%
rename from htdocs/langs/uk_UA/main.lang
rename to public/langs/uk_UA/main.lang
diff --git a/htdocs/langs/uk_UA/margins.lang b/public/langs/uk_UA/margins.lang
similarity index 100%
rename from htdocs/langs/uk_UA/margins.lang
rename to public/langs/uk_UA/margins.lang
diff --git a/htdocs/langs/uk_UA/members.lang b/public/langs/uk_UA/members.lang
similarity index 100%
rename from htdocs/langs/uk_UA/members.lang
rename to public/langs/uk_UA/members.lang
diff --git a/htdocs/langs/uk_UA/oauth.lang b/public/langs/uk_UA/oauth.lang
similarity index 100%
rename from htdocs/langs/uk_UA/oauth.lang
rename to public/langs/uk_UA/oauth.lang
diff --git a/htdocs/langs/uk_UA/opensurvey.lang b/public/langs/uk_UA/opensurvey.lang
similarity index 100%
rename from htdocs/langs/uk_UA/opensurvey.lang
rename to public/langs/uk_UA/opensurvey.lang
diff --git a/htdocs/langs/uk_UA/orders.lang b/public/langs/uk_UA/orders.lang
similarity index 100%
rename from htdocs/langs/uk_UA/orders.lang
rename to public/langs/uk_UA/orders.lang
diff --git a/htdocs/langs/uk_UA/other.lang b/public/langs/uk_UA/other.lang
similarity index 100%
rename from htdocs/langs/uk_UA/other.lang
rename to public/langs/uk_UA/other.lang
diff --git a/htdocs/langs/uk_UA/paybox.lang b/public/langs/uk_UA/paybox.lang
similarity index 100%
rename from htdocs/langs/uk_UA/paybox.lang
rename to public/langs/uk_UA/paybox.lang
diff --git a/htdocs/langs/uk_UA/paypal.lang b/public/langs/uk_UA/paypal.lang
similarity index 100%
rename from htdocs/langs/uk_UA/paypal.lang
rename to public/langs/uk_UA/paypal.lang
diff --git a/htdocs/langs/uk_UA/printing.lang b/public/langs/uk_UA/printing.lang
similarity index 100%
rename from htdocs/langs/uk_UA/printing.lang
rename to public/langs/uk_UA/printing.lang
diff --git a/htdocs/langs/uk_UA/productbatch.lang b/public/langs/uk_UA/productbatch.lang
similarity index 100%
rename from htdocs/langs/uk_UA/productbatch.lang
rename to public/langs/uk_UA/productbatch.lang
diff --git a/htdocs/langs/uk_UA/products.lang b/public/langs/uk_UA/products.lang
similarity index 100%
rename from htdocs/langs/uk_UA/products.lang
rename to public/langs/uk_UA/products.lang
diff --git a/htdocs/langs/uk_UA/projects.lang b/public/langs/uk_UA/projects.lang
similarity index 100%
rename from htdocs/langs/uk_UA/projects.lang
rename to public/langs/uk_UA/projects.lang
diff --git a/htdocs/langs/uk_UA/propal.lang b/public/langs/uk_UA/propal.lang
similarity index 100%
rename from htdocs/langs/uk_UA/propal.lang
rename to public/langs/uk_UA/propal.lang
diff --git a/htdocs/langs/uk_UA/receiptprinter.lang b/public/langs/uk_UA/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/uk_UA/receiptprinter.lang
rename to public/langs/uk_UA/receiptprinter.lang
diff --git a/htdocs/langs/uk_UA/resource.lang b/public/langs/uk_UA/resource.lang
similarity index 100%
rename from htdocs/langs/uk_UA/resource.lang
rename to public/langs/uk_UA/resource.lang
diff --git a/htdocs/langs/uk_UA/salaries.lang b/public/langs/uk_UA/salaries.lang
similarity index 100%
rename from htdocs/langs/uk_UA/salaries.lang
rename to public/langs/uk_UA/salaries.lang
diff --git a/htdocs/langs/uk_UA/sendings.lang b/public/langs/uk_UA/sendings.lang
similarity index 100%
rename from htdocs/langs/uk_UA/sendings.lang
rename to public/langs/uk_UA/sendings.lang
diff --git a/htdocs/langs/uk_UA/sms.lang b/public/langs/uk_UA/sms.lang
similarity index 100%
rename from htdocs/langs/uk_UA/sms.lang
rename to public/langs/uk_UA/sms.lang
diff --git a/htdocs/langs/uk_UA/stocks.lang b/public/langs/uk_UA/stocks.lang
similarity index 100%
rename from htdocs/langs/uk_UA/stocks.lang
rename to public/langs/uk_UA/stocks.lang
diff --git a/htdocs/langs/uk_UA/supplier_proposal.lang b/public/langs/uk_UA/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/uk_UA/supplier_proposal.lang
rename to public/langs/uk_UA/supplier_proposal.lang
diff --git a/htdocs/langs/uk_UA/suppliers.lang b/public/langs/uk_UA/suppliers.lang
similarity index 100%
rename from htdocs/langs/uk_UA/suppliers.lang
rename to public/langs/uk_UA/suppliers.lang
diff --git a/htdocs/langs/uk_UA/trips.lang b/public/langs/uk_UA/trips.lang
similarity index 100%
rename from htdocs/langs/uk_UA/trips.lang
rename to public/langs/uk_UA/trips.lang
diff --git a/htdocs/langs/uk_UA/users.lang b/public/langs/uk_UA/users.lang
similarity index 100%
rename from htdocs/langs/uk_UA/users.lang
rename to public/langs/uk_UA/users.lang
diff --git a/htdocs/langs/uk_UA/website.lang b/public/langs/uk_UA/website.lang
similarity index 100%
rename from htdocs/langs/uk_UA/website.lang
rename to public/langs/uk_UA/website.lang
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/public/langs/uk_UA/withdrawals.lang
similarity index 100%
rename from htdocs/langs/uk_UA/withdrawals.lang
rename to public/langs/uk_UA/withdrawals.lang
diff --git a/htdocs/langs/uk_UA/workflow.lang b/public/langs/uk_UA/workflow.lang
similarity index 100%
rename from htdocs/langs/uk_UA/workflow.lang
rename to public/langs/uk_UA/workflow.lang
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/public/langs/uz_UZ/accountancy.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/accountancy.lang
rename to public/langs/uz_UZ/accountancy.lang
diff --git a/htdocs/langs/uz_UZ/admin.lang b/public/langs/uz_UZ/admin.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/admin.lang
rename to public/langs/uz_UZ/admin.lang
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/public/langs/uz_UZ/agenda.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/agenda.lang
rename to public/langs/uz_UZ/agenda.lang
diff --git a/htdocs/langs/uz_UZ/banks.lang b/public/langs/uz_UZ/banks.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/banks.lang
rename to public/langs/uz_UZ/banks.lang
diff --git a/htdocs/langs/uz_UZ/bills.lang b/public/langs/uz_UZ/bills.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/bills.lang
rename to public/langs/uz_UZ/bills.lang
diff --git a/htdocs/langs/uz_UZ/bookmarks.lang b/public/langs/uz_UZ/bookmarks.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/bookmarks.lang
rename to public/langs/uz_UZ/bookmarks.lang
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/public/langs/uz_UZ/boxes.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/boxes.lang
rename to public/langs/uz_UZ/boxes.lang
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/public/langs/uz_UZ/cashdesk.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/cashdesk.lang
rename to public/langs/uz_UZ/cashdesk.lang
diff --git a/htdocs/langs/uz_UZ/categories.lang b/public/langs/uz_UZ/categories.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/categories.lang
rename to public/langs/uz_UZ/categories.lang
diff --git a/htdocs/langs/uz_UZ/commercial.lang b/public/langs/uz_UZ/commercial.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/commercial.lang
rename to public/langs/uz_UZ/commercial.lang
diff --git a/htdocs/langs/uz_UZ/companies.lang b/public/langs/uz_UZ/companies.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/companies.lang
rename to public/langs/uz_UZ/companies.lang
diff --git a/htdocs/langs/uz_UZ/compta.lang b/public/langs/uz_UZ/compta.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/compta.lang
rename to public/langs/uz_UZ/compta.lang
diff --git a/htdocs/langs/uz_UZ/contracts.lang b/public/langs/uz_UZ/contracts.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/contracts.lang
rename to public/langs/uz_UZ/contracts.lang
diff --git a/htdocs/langs/uz_UZ/cron.lang b/public/langs/uz_UZ/cron.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/cron.lang
rename to public/langs/uz_UZ/cron.lang
diff --git a/htdocs/langs/uz_UZ/deliveries.lang b/public/langs/uz_UZ/deliveries.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/deliveries.lang
rename to public/langs/uz_UZ/deliveries.lang
diff --git a/htdocs/langs/uz_UZ/dict.lang b/public/langs/uz_UZ/dict.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/dict.lang
rename to public/langs/uz_UZ/dict.lang
diff --git a/htdocs/langs/uz_UZ/donations.lang b/public/langs/uz_UZ/donations.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/donations.lang
rename to public/langs/uz_UZ/donations.lang
diff --git a/htdocs/langs/uz_UZ/ecm.lang b/public/langs/uz_UZ/ecm.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/ecm.lang
rename to public/langs/uz_UZ/ecm.lang
diff --git a/htdocs/langs/uz_UZ/errors.lang b/public/langs/uz_UZ/errors.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/errors.lang
rename to public/langs/uz_UZ/errors.lang
diff --git a/htdocs/langs/uz_UZ/exports.lang b/public/langs/uz_UZ/exports.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/exports.lang
rename to public/langs/uz_UZ/exports.lang
diff --git a/htdocs/langs/uz_UZ/externalsite.lang b/public/langs/uz_UZ/externalsite.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/externalsite.lang
rename to public/langs/uz_UZ/externalsite.lang
diff --git a/htdocs/langs/uz_UZ/ftp.lang b/public/langs/uz_UZ/ftp.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/ftp.lang
rename to public/langs/uz_UZ/ftp.lang
diff --git a/htdocs/langs/uz_UZ/help.lang b/public/langs/uz_UZ/help.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/help.lang
rename to public/langs/uz_UZ/help.lang
diff --git a/htdocs/langs/uz_UZ/holiday.lang b/public/langs/uz_UZ/holiday.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/holiday.lang
rename to public/langs/uz_UZ/holiday.lang
diff --git a/htdocs/langs/uz_UZ/incoterm.lang b/public/langs/uz_UZ/incoterm.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/incoterm.lang
rename to public/langs/uz_UZ/incoterm.lang
diff --git a/htdocs/langs/uz_UZ/install.lang b/public/langs/uz_UZ/install.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/install.lang
rename to public/langs/uz_UZ/install.lang
diff --git a/htdocs/langs/uz_UZ/interventions.lang b/public/langs/uz_UZ/interventions.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/interventions.lang
rename to public/langs/uz_UZ/interventions.lang
diff --git a/htdocs/langs/uz_UZ/languages.lang b/public/langs/uz_UZ/languages.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/languages.lang
rename to public/langs/uz_UZ/languages.lang
diff --git a/htdocs/langs/uz_UZ/ldap.lang b/public/langs/uz_UZ/ldap.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/ldap.lang
rename to public/langs/uz_UZ/ldap.lang
diff --git a/htdocs/langs/uz_UZ/link.lang b/public/langs/uz_UZ/link.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/link.lang
rename to public/langs/uz_UZ/link.lang
diff --git a/htdocs/langs/uz_UZ/loan.lang b/public/langs/uz_UZ/loan.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/loan.lang
rename to public/langs/uz_UZ/loan.lang
diff --git a/htdocs/langs/uz_UZ/mailmanspip.lang b/public/langs/uz_UZ/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/mailmanspip.lang
rename to public/langs/uz_UZ/mailmanspip.lang
diff --git a/htdocs/langs/uz_UZ/mails.lang b/public/langs/uz_UZ/mails.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/mails.lang
rename to public/langs/uz_UZ/mails.lang
diff --git a/htdocs/langs/uz_UZ/main.lang b/public/langs/uz_UZ/main.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/main.lang
rename to public/langs/uz_UZ/main.lang
diff --git a/htdocs/langs/uz_UZ/margins.lang b/public/langs/uz_UZ/margins.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/margins.lang
rename to public/langs/uz_UZ/margins.lang
diff --git a/htdocs/langs/uz_UZ/members.lang b/public/langs/uz_UZ/members.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/members.lang
rename to public/langs/uz_UZ/members.lang
diff --git a/htdocs/langs/uz_UZ/opensurvey.lang b/public/langs/uz_UZ/opensurvey.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/opensurvey.lang
rename to public/langs/uz_UZ/opensurvey.lang
diff --git a/htdocs/langs/uz_UZ/orders.lang b/public/langs/uz_UZ/orders.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/orders.lang
rename to public/langs/uz_UZ/orders.lang
diff --git a/htdocs/langs/uz_UZ/other.lang b/public/langs/uz_UZ/other.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/other.lang
rename to public/langs/uz_UZ/other.lang
diff --git a/htdocs/langs/uz_UZ/paybox.lang b/public/langs/uz_UZ/paybox.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/paybox.lang
rename to public/langs/uz_UZ/paybox.lang
diff --git a/htdocs/langs/uz_UZ/paypal.lang b/public/langs/uz_UZ/paypal.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/paypal.lang
rename to public/langs/uz_UZ/paypal.lang
diff --git a/htdocs/langs/uz_UZ/printing.lang b/public/langs/uz_UZ/printing.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/printing.lang
rename to public/langs/uz_UZ/printing.lang
diff --git a/htdocs/langs/uz_UZ/productbatch.lang b/public/langs/uz_UZ/productbatch.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/productbatch.lang
rename to public/langs/uz_UZ/productbatch.lang
diff --git a/htdocs/langs/uz_UZ/products.lang b/public/langs/uz_UZ/products.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/products.lang
rename to public/langs/uz_UZ/products.lang
diff --git a/htdocs/langs/uz_UZ/projects.lang b/public/langs/uz_UZ/projects.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/projects.lang
rename to public/langs/uz_UZ/projects.lang
diff --git a/htdocs/langs/uz_UZ/propal.lang b/public/langs/uz_UZ/propal.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/propal.lang
rename to public/langs/uz_UZ/propal.lang
diff --git a/htdocs/langs/uz_UZ/resource.lang b/public/langs/uz_UZ/resource.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/resource.lang
rename to public/langs/uz_UZ/resource.lang
diff --git a/htdocs/langs/uz_UZ/salaries.lang b/public/langs/uz_UZ/salaries.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/salaries.lang
rename to public/langs/uz_UZ/salaries.lang
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/public/langs/uz_UZ/sendings.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/sendings.lang
rename to public/langs/uz_UZ/sendings.lang
diff --git a/htdocs/langs/uz_UZ/sms.lang b/public/langs/uz_UZ/sms.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/sms.lang
rename to public/langs/uz_UZ/sms.lang
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/public/langs/uz_UZ/stocks.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/stocks.lang
rename to public/langs/uz_UZ/stocks.lang
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/public/langs/uz_UZ/suppliers.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/suppliers.lang
rename to public/langs/uz_UZ/suppliers.lang
diff --git a/htdocs/langs/uz_UZ/trips.lang b/public/langs/uz_UZ/trips.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/trips.lang
rename to public/langs/uz_UZ/trips.lang
diff --git a/htdocs/langs/uz_UZ/users.lang b/public/langs/uz_UZ/users.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/users.lang
rename to public/langs/uz_UZ/users.lang
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/public/langs/uz_UZ/withdrawals.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/withdrawals.lang
rename to public/langs/uz_UZ/withdrawals.lang
diff --git a/htdocs/langs/uz_UZ/workflow.lang b/public/langs/uz_UZ/workflow.lang
similarity index 100%
rename from htdocs/langs/uz_UZ/workflow.lang
rename to public/langs/uz_UZ/workflow.lang
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/public/langs/vi_VN/accountancy.lang
similarity index 100%
rename from htdocs/langs/vi_VN/accountancy.lang
rename to public/langs/vi_VN/accountancy.lang
diff --git a/htdocs/langs/vi_VN/admin.lang b/public/langs/vi_VN/admin.lang
similarity index 100%
rename from htdocs/langs/vi_VN/admin.lang
rename to public/langs/vi_VN/admin.lang
diff --git a/htdocs/langs/vi_VN/agenda.lang b/public/langs/vi_VN/agenda.lang
similarity index 100%
rename from htdocs/langs/vi_VN/agenda.lang
rename to public/langs/vi_VN/agenda.lang
diff --git a/htdocs/langs/vi_VN/banks.lang b/public/langs/vi_VN/banks.lang
similarity index 100%
rename from htdocs/langs/vi_VN/banks.lang
rename to public/langs/vi_VN/banks.lang
diff --git a/htdocs/langs/vi_VN/bills.lang b/public/langs/vi_VN/bills.lang
similarity index 100%
rename from htdocs/langs/vi_VN/bills.lang
rename to public/langs/vi_VN/bills.lang
diff --git a/htdocs/langs/vi_VN/bookmarks.lang b/public/langs/vi_VN/bookmarks.lang
similarity index 100%
rename from htdocs/langs/vi_VN/bookmarks.lang
rename to public/langs/vi_VN/bookmarks.lang
diff --git a/htdocs/langs/vi_VN/boxes.lang b/public/langs/vi_VN/boxes.lang
similarity index 100%
rename from htdocs/langs/vi_VN/boxes.lang
rename to public/langs/vi_VN/boxes.lang
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/public/langs/vi_VN/cashdesk.lang
similarity index 100%
rename from htdocs/langs/vi_VN/cashdesk.lang
rename to public/langs/vi_VN/cashdesk.lang
diff --git a/htdocs/langs/vi_VN/categories.lang b/public/langs/vi_VN/categories.lang
similarity index 100%
rename from htdocs/langs/vi_VN/categories.lang
rename to public/langs/vi_VN/categories.lang
diff --git a/htdocs/langs/vi_VN/commercial.lang b/public/langs/vi_VN/commercial.lang
similarity index 100%
rename from htdocs/langs/vi_VN/commercial.lang
rename to public/langs/vi_VN/commercial.lang
diff --git a/htdocs/langs/vi_VN/companies.lang b/public/langs/vi_VN/companies.lang
similarity index 100%
rename from htdocs/langs/vi_VN/companies.lang
rename to public/langs/vi_VN/companies.lang
diff --git a/htdocs/langs/vi_VN/compta.lang b/public/langs/vi_VN/compta.lang
similarity index 100%
rename from htdocs/langs/vi_VN/compta.lang
rename to public/langs/vi_VN/compta.lang
diff --git a/htdocs/langs/vi_VN/contracts.lang b/public/langs/vi_VN/contracts.lang
similarity index 100%
rename from htdocs/langs/vi_VN/contracts.lang
rename to public/langs/vi_VN/contracts.lang
diff --git a/htdocs/langs/vi_VN/cron.lang b/public/langs/vi_VN/cron.lang
similarity index 100%
rename from htdocs/langs/vi_VN/cron.lang
rename to public/langs/vi_VN/cron.lang
diff --git a/htdocs/langs/vi_VN/deliveries.lang b/public/langs/vi_VN/deliveries.lang
similarity index 100%
rename from htdocs/langs/vi_VN/deliveries.lang
rename to public/langs/vi_VN/deliveries.lang
diff --git a/htdocs/langs/vi_VN/dict.lang b/public/langs/vi_VN/dict.lang
similarity index 100%
rename from htdocs/langs/vi_VN/dict.lang
rename to public/langs/vi_VN/dict.lang
diff --git a/htdocs/langs/vi_VN/donations.lang b/public/langs/vi_VN/donations.lang
similarity index 100%
rename from htdocs/langs/vi_VN/donations.lang
rename to public/langs/vi_VN/donations.lang
diff --git a/htdocs/langs/vi_VN/ecm.lang b/public/langs/vi_VN/ecm.lang
similarity index 100%
rename from htdocs/langs/vi_VN/ecm.lang
rename to public/langs/vi_VN/ecm.lang
diff --git a/htdocs/langs/vi_VN/errors.lang b/public/langs/vi_VN/errors.lang
similarity index 100%
rename from htdocs/langs/vi_VN/errors.lang
rename to public/langs/vi_VN/errors.lang
diff --git a/htdocs/langs/vi_VN/exports.lang b/public/langs/vi_VN/exports.lang
similarity index 100%
rename from htdocs/langs/vi_VN/exports.lang
rename to public/langs/vi_VN/exports.lang
diff --git a/htdocs/langs/vi_VN/externalsite.lang b/public/langs/vi_VN/externalsite.lang
similarity index 100%
rename from htdocs/langs/vi_VN/externalsite.lang
rename to public/langs/vi_VN/externalsite.lang
diff --git a/htdocs/langs/vi_VN/ftp.lang b/public/langs/vi_VN/ftp.lang
similarity index 100%
rename from htdocs/langs/vi_VN/ftp.lang
rename to public/langs/vi_VN/ftp.lang
diff --git a/htdocs/langs/vi_VN/help.lang b/public/langs/vi_VN/help.lang
similarity index 100%
rename from htdocs/langs/vi_VN/help.lang
rename to public/langs/vi_VN/help.lang
diff --git a/htdocs/langs/vi_VN/holiday.lang b/public/langs/vi_VN/holiday.lang
similarity index 100%
rename from htdocs/langs/vi_VN/holiday.lang
rename to public/langs/vi_VN/holiday.lang
diff --git a/htdocs/langs/vi_VN/hrm.lang b/public/langs/vi_VN/hrm.lang
similarity index 100%
rename from htdocs/langs/vi_VN/hrm.lang
rename to public/langs/vi_VN/hrm.lang
diff --git a/htdocs/langs/vi_VN/incoterm.lang b/public/langs/vi_VN/incoterm.lang
similarity index 100%
rename from htdocs/langs/vi_VN/incoterm.lang
rename to public/langs/vi_VN/incoterm.lang
diff --git a/htdocs/langs/vi_VN/install.lang b/public/langs/vi_VN/install.lang
similarity index 100%
rename from htdocs/langs/vi_VN/install.lang
rename to public/langs/vi_VN/install.lang
diff --git a/htdocs/langs/vi_VN/interventions.lang b/public/langs/vi_VN/interventions.lang
similarity index 100%
rename from htdocs/langs/vi_VN/interventions.lang
rename to public/langs/vi_VN/interventions.lang
diff --git a/htdocs/langs/vi_VN/languages.lang b/public/langs/vi_VN/languages.lang
similarity index 100%
rename from htdocs/langs/vi_VN/languages.lang
rename to public/langs/vi_VN/languages.lang
diff --git a/htdocs/langs/vi_VN/ldap.lang b/public/langs/vi_VN/ldap.lang
similarity index 100%
rename from htdocs/langs/vi_VN/ldap.lang
rename to public/langs/vi_VN/ldap.lang
diff --git a/htdocs/langs/vi_VN/link.lang b/public/langs/vi_VN/link.lang
similarity index 100%
rename from htdocs/langs/vi_VN/link.lang
rename to public/langs/vi_VN/link.lang
diff --git a/htdocs/langs/vi_VN/loan.lang b/public/langs/vi_VN/loan.lang
similarity index 100%
rename from htdocs/langs/vi_VN/loan.lang
rename to public/langs/vi_VN/loan.lang
diff --git a/htdocs/langs/vi_VN/mailmanspip.lang b/public/langs/vi_VN/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/vi_VN/mailmanspip.lang
rename to public/langs/vi_VN/mailmanspip.lang
diff --git a/htdocs/langs/vi_VN/mails.lang b/public/langs/vi_VN/mails.lang
similarity index 100%
rename from htdocs/langs/vi_VN/mails.lang
rename to public/langs/vi_VN/mails.lang
diff --git a/htdocs/langs/vi_VN/main.lang b/public/langs/vi_VN/main.lang
similarity index 100%
rename from htdocs/langs/vi_VN/main.lang
rename to public/langs/vi_VN/main.lang
diff --git a/htdocs/langs/vi_VN/margins.lang b/public/langs/vi_VN/margins.lang
similarity index 100%
rename from htdocs/langs/vi_VN/margins.lang
rename to public/langs/vi_VN/margins.lang
diff --git a/htdocs/langs/vi_VN/members.lang b/public/langs/vi_VN/members.lang
similarity index 100%
rename from htdocs/langs/vi_VN/members.lang
rename to public/langs/vi_VN/members.lang
diff --git a/htdocs/langs/vi_VN/oauth.lang b/public/langs/vi_VN/oauth.lang
similarity index 100%
rename from htdocs/langs/vi_VN/oauth.lang
rename to public/langs/vi_VN/oauth.lang
diff --git a/htdocs/langs/vi_VN/opensurvey.lang b/public/langs/vi_VN/opensurvey.lang
similarity index 100%
rename from htdocs/langs/vi_VN/opensurvey.lang
rename to public/langs/vi_VN/opensurvey.lang
diff --git a/htdocs/langs/vi_VN/orders.lang b/public/langs/vi_VN/orders.lang
similarity index 100%
rename from htdocs/langs/vi_VN/orders.lang
rename to public/langs/vi_VN/orders.lang
diff --git a/htdocs/langs/vi_VN/other.lang b/public/langs/vi_VN/other.lang
similarity index 100%
rename from htdocs/langs/vi_VN/other.lang
rename to public/langs/vi_VN/other.lang
diff --git a/htdocs/langs/vi_VN/paybox.lang b/public/langs/vi_VN/paybox.lang
similarity index 100%
rename from htdocs/langs/vi_VN/paybox.lang
rename to public/langs/vi_VN/paybox.lang
diff --git a/htdocs/langs/vi_VN/paypal.lang b/public/langs/vi_VN/paypal.lang
similarity index 100%
rename from htdocs/langs/vi_VN/paypal.lang
rename to public/langs/vi_VN/paypal.lang
diff --git a/htdocs/langs/vi_VN/printing.lang b/public/langs/vi_VN/printing.lang
similarity index 100%
rename from htdocs/langs/vi_VN/printing.lang
rename to public/langs/vi_VN/printing.lang
diff --git a/htdocs/langs/vi_VN/productbatch.lang b/public/langs/vi_VN/productbatch.lang
similarity index 100%
rename from htdocs/langs/vi_VN/productbatch.lang
rename to public/langs/vi_VN/productbatch.lang
diff --git a/htdocs/langs/vi_VN/products.lang b/public/langs/vi_VN/products.lang
similarity index 100%
rename from htdocs/langs/vi_VN/products.lang
rename to public/langs/vi_VN/products.lang
diff --git a/htdocs/langs/vi_VN/projects.lang b/public/langs/vi_VN/projects.lang
similarity index 100%
rename from htdocs/langs/vi_VN/projects.lang
rename to public/langs/vi_VN/projects.lang
diff --git a/htdocs/langs/vi_VN/propal.lang b/public/langs/vi_VN/propal.lang
similarity index 100%
rename from htdocs/langs/vi_VN/propal.lang
rename to public/langs/vi_VN/propal.lang
diff --git a/htdocs/langs/vi_VN/receiptprinter.lang b/public/langs/vi_VN/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/vi_VN/receiptprinter.lang
rename to public/langs/vi_VN/receiptprinter.lang
diff --git a/htdocs/langs/vi_VN/resource.lang b/public/langs/vi_VN/resource.lang
similarity index 100%
rename from htdocs/langs/vi_VN/resource.lang
rename to public/langs/vi_VN/resource.lang
diff --git a/htdocs/langs/vi_VN/salaries.lang b/public/langs/vi_VN/salaries.lang
similarity index 100%
rename from htdocs/langs/vi_VN/salaries.lang
rename to public/langs/vi_VN/salaries.lang
diff --git a/htdocs/langs/vi_VN/sendings.lang b/public/langs/vi_VN/sendings.lang
similarity index 100%
rename from htdocs/langs/vi_VN/sendings.lang
rename to public/langs/vi_VN/sendings.lang
diff --git a/htdocs/langs/vi_VN/sms.lang b/public/langs/vi_VN/sms.lang
similarity index 100%
rename from htdocs/langs/vi_VN/sms.lang
rename to public/langs/vi_VN/sms.lang
diff --git a/htdocs/langs/vi_VN/stocks.lang b/public/langs/vi_VN/stocks.lang
similarity index 100%
rename from htdocs/langs/vi_VN/stocks.lang
rename to public/langs/vi_VN/stocks.lang
diff --git a/htdocs/langs/vi_VN/supplier_proposal.lang b/public/langs/vi_VN/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/vi_VN/supplier_proposal.lang
rename to public/langs/vi_VN/supplier_proposal.lang
diff --git a/htdocs/langs/vi_VN/suppliers.lang b/public/langs/vi_VN/suppliers.lang
similarity index 100%
rename from htdocs/langs/vi_VN/suppliers.lang
rename to public/langs/vi_VN/suppliers.lang
diff --git a/htdocs/langs/vi_VN/trips.lang b/public/langs/vi_VN/trips.lang
similarity index 100%
rename from htdocs/langs/vi_VN/trips.lang
rename to public/langs/vi_VN/trips.lang
diff --git a/htdocs/langs/vi_VN/users.lang b/public/langs/vi_VN/users.lang
similarity index 100%
rename from htdocs/langs/vi_VN/users.lang
rename to public/langs/vi_VN/users.lang
diff --git a/htdocs/langs/vi_VN/website.lang b/public/langs/vi_VN/website.lang
similarity index 100%
rename from htdocs/langs/vi_VN/website.lang
rename to public/langs/vi_VN/website.lang
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/public/langs/vi_VN/withdrawals.lang
similarity index 100%
rename from htdocs/langs/vi_VN/withdrawals.lang
rename to public/langs/vi_VN/withdrawals.lang
diff --git a/htdocs/langs/vi_VN/workflow.lang b/public/langs/vi_VN/workflow.lang
similarity index 100%
rename from htdocs/langs/vi_VN/workflow.lang
rename to public/langs/vi_VN/workflow.lang
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/public/langs/zh_CN/accountancy.lang
similarity index 100%
rename from htdocs/langs/zh_CN/accountancy.lang
rename to public/langs/zh_CN/accountancy.lang
diff --git a/htdocs/langs/zh_CN/admin.lang b/public/langs/zh_CN/admin.lang
similarity index 100%
rename from htdocs/langs/zh_CN/admin.lang
rename to public/langs/zh_CN/admin.lang
diff --git a/htdocs/langs/zh_CN/agenda.lang b/public/langs/zh_CN/agenda.lang
similarity index 100%
rename from htdocs/langs/zh_CN/agenda.lang
rename to public/langs/zh_CN/agenda.lang
diff --git a/htdocs/langs/zh_CN/banks.lang b/public/langs/zh_CN/banks.lang
similarity index 100%
rename from htdocs/langs/zh_CN/banks.lang
rename to public/langs/zh_CN/banks.lang
diff --git a/htdocs/langs/zh_CN/bills.lang b/public/langs/zh_CN/bills.lang
similarity index 100%
rename from htdocs/langs/zh_CN/bills.lang
rename to public/langs/zh_CN/bills.lang
diff --git a/htdocs/langs/zh_CN/bookmarks.lang b/public/langs/zh_CN/bookmarks.lang
similarity index 100%
rename from htdocs/langs/zh_CN/bookmarks.lang
rename to public/langs/zh_CN/bookmarks.lang
diff --git a/htdocs/langs/zh_CN/boxes.lang b/public/langs/zh_CN/boxes.lang
similarity index 100%
rename from htdocs/langs/zh_CN/boxes.lang
rename to public/langs/zh_CN/boxes.lang
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/public/langs/zh_CN/cashdesk.lang
similarity index 100%
rename from htdocs/langs/zh_CN/cashdesk.lang
rename to public/langs/zh_CN/cashdesk.lang
diff --git a/htdocs/langs/zh_CN/categories.lang b/public/langs/zh_CN/categories.lang
similarity index 100%
rename from htdocs/langs/zh_CN/categories.lang
rename to public/langs/zh_CN/categories.lang
diff --git a/htdocs/langs/zh_CN/commercial.lang b/public/langs/zh_CN/commercial.lang
similarity index 100%
rename from htdocs/langs/zh_CN/commercial.lang
rename to public/langs/zh_CN/commercial.lang
diff --git a/htdocs/langs/zh_CN/companies.lang b/public/langs/zh_CN/companies.lang
similarity index 100%
rename from htdocs/langs/zh_CN/companies.lang
rename to public/langs/zh_CN/companies.lang
diff --git a/htdocs/langs/zh_CN/compta.lang b/public/langs/zh_CN/compta.lang
similarity index 100%
rename from htdocs/langs/zh_CN/compta.lang
rename to public/langs/zh_CN/compta.lang
diff --git a/htdocs/langs/zh_CN/contracts.lang b/public/langs/zh_CN/contracts.lang
similarity index 100%
rename from htdocs/langs/zh_CN/contracts.lang
rename to public/langs/zh_CN/contracts.lang
diff --git a/htdocs/langs/zh_CN/cron.lang b/public/langs/zh_CN/cron.lang
similarity index 100%
rename from htdocs/langs/zh_CN/cron.lang
rename to public/langs/zh_CN/cron.lang
diff --git a/htdocs/langs/zh_CN/deliveries.lang b/public/langs/zh_CN/deliveries.lang
similarity index 100%
rename from htdocs/langs/zh_CN/deliveries.lang
rename to public/langs/zh_CN/deliveries.lang
diff --git a/htdocs/langs/zh_CN/dict.lang b/public/langs/zh_CN/dict.lang
similarity index 100%
rename from htdocs/langs/zh_CN/dict.lang
rename to public/langs/zh_CN/dict.lang
diff --git a/htdocs/langs/zh_CN/donations.lang b/public/langs/zh_CN/donations.lang
similarity index 100%
rename from htdocs/langs/zh_CN/donations.lang
rename to public/langs/zh_CN/donations.lang
diff --git a/htdocs/langs/zh_CN/ecm.lang b/public/langs/zh_CN/ecm.lang
similarity index 100%
rename from htdocs/langs/zh_CN/ecm.lang
rename to public/langs/zh_CN/ecm.lang
diff --git a/htdocs/langs/zh_CN/errors.lang b/public/langs/zh_CN/errors.lang
similarity index 100%
rename from htdocs/langs/zh_CN/errors.lang
rename to public/langs/zh_CN/errors.lang
diff --git a/htdocs/langs/zh_CN/exports.lang b/public/langs/zh_CN/exports.lang
similarity index 100%
rename from htdocs/langs/zh_CN/exports.lang
rename to public/langs/zh_CN/exports.lang
diff --git a/htdocs/langs/zh_CN/externalsite.lang b/public/langs/zh_CN/externalsite.lang
similarity index 100%
rename from htdocs/langs/zh_CN/externalsite.lang
rename to public/langs/zh_CN/externalsite.lang
diff --git a/htdocs/langs/zh_CN/ftp.lang b/public/langs/zh_CN/ftp.lang
similarity index 100%
rename from htdocs/langs/zh_CN/ftp.lang
rename to public/langs/zh_CN/ftp.lang
diff --git a/htdocs/langs/zh_CN/help.lang b/public/langs/zh_CN/help.lang
similarity index 100%
rename from htdocs/langs/zh_CN/help.lang
rename to public/langs/zh_CN/help.lang
diff --git a/htdocs/langs/zh_CN/holiday.lang b/public/langs/zh_CN/holiday.lang
similarity index 100%
rename from htdocs/langs/zh_CN/holiday.lang
rename to public/langs/zh_CN/holiday.lang
diff --git a/htdocs/langs/zh_CN/hrm.lang b/public/langs/zh_CN/hrm.lang
similarity index 100%
rename from htdocs/langs/zh_CN/hrm.lang
rename to public/langs/zh_CN/hrm.lang
diff --git a/htdocs/langs/zh_CN/incoterm.lang b/public/langs/zh_CN/incoterm.lang
similarity index 100%
rename from htdocs/langs/zh_CN/incoterm.lang
rename to public/langs/zh_CN/incoterm.lang
diff --git a/htdocs/langs/zh_CN/install.lang b/public/langs/zh_CN/install.lang
similarity index 100%
rename from htdocs/langs/zh_CN/install.lang
rename to public/langs/zh_CN/install.lang
diff --git a/htdocs/langs/zh_CN/interventions.lang b/public/langs/zh_CN/interventions.lang
similarity index 100%
rename from htdocs/langs/zh_CN/interventions.lang
rename to public/langs/zh_CN/interventions.lang
diff --git a/htdocs/langs/zh_CN/languages.lang b/public/langs/zh_CN/languages.lang
similarity index 100%
rename from htdocs/langs/zh_CN/languages.lang
rename to public/langs/zh_CN/languages.lang
diff --git a/htdocs/langs/zh_CN/ldap.lang b/public/langs/zh_CN/ldap.lang
similarity index 100%
rename from htdocs/langs/zh_CN/ldap.lang
rename to public/langs/zh_CN/ldap.lang
diff --git a/htdocs/langs/zh_CN/link.lang b/public/langs/zh_CN/link.lang
similarity index 100%
rename from htdocs/langs/zh_CN/link.lang
rename to public/langs/zh_CN/link.lang
diff --git a/htdocs/langs/zh_CN/loan.lang b/public/langs/zh_CN/loan.lang
similarity index 100%
rename from htdocs/langs/zh_CN/loan.lang
rename to public/langs/zh_CN/loan.lang
diff --git a/htdocs/langs/zh_CN/mailmanspip.lang b/public/langs/zh_CN/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/zh_CN/mailmanspip.lang
rename to public/langs/zh_CN/mailmanspip.lang
diff --git a/htdocs/langs/zh_CN/mails.lang b/public/langs/zh_CN/mails.lang
similarity index 100%
rename from htdocs/langs/zh_CN/mails.lang
rename to public/langs/zh_CN/mails.lang
diff --git a/htdocs/langs/zh_CN/main.lang b/public/langs/zh_CN/main.lang
similarity index 100%
rename from htdocs/langs/zh_CN/main.lang
rename to public/langs/zh_CN/main.lang
diff --git a/htdocs/langs/zh_CN/margins.lang b/public/langs/zh_CN/margins.lang
similarity index 100%
rename from htdocs/langs/zh_CN/margins.lang
rename to public/langs/zh_CN/margins.lang
diff --git a/htdocs/langs/zh_CN/members.lang b/public/langs/zh_CN/members.lang
similarity index 100%
rename from htdocs/langs/zh_CN/members.lang
rename to public/langs/zh_CN/members.lang
diff --git a/htdocs/langs/zh_CN/oauth.lang b/public/langs/zh_CN/oauth.lang
similarity index 100%
rename from htdocs/langs/zh_CN/oauth.lang
rename to public/langs/zh_CN/oauth.lang
diff --git a/htdocs/langs/zh_CN/opensurvey.lang b/public/langs/zh_CN/opensurvey.lang
similarity index 100%
rename from htdocs/langs/zh_CN/opensurvey.lang
rename to public/langs/zh_CN/opensurvey.lang
diff --git a/htdocs/langs/zh_CN/orders.lang b/public/langs/zh_CN/orders.lang
similarity index 100%
rename from htdocs/langs/zh_CN/orders.lang
rename to public/langs/zh_CN/orders.lang
diff --git a/htdocs/langs/zh_CN/other.lang b/public/langs/zh_CN/other.lang
similarity index 100%
rename from htdocs/langs/zh_CN/other.lang
rename to public/langs/zh_CN/other.lang
diff --git a/htdocs/langs/zh_CN/paybox.lang b/public/langs/zh_CN/paybox.lang
similarity index 100%
rename from htdocs/langs/zh_CN/paybox.lang
rename to public/langs/zh_CN/paybox.lang
diff --git a/htdocs/langs/zh_CN/paypal.lang b/public/langs/zh_CN/paypal.lang
similarity index 100%
rename from htdocs/langs/zh_CN/paypal.lang
rename to public/langs/zh_CN/paypal.lang
diff --git a/htdocs/langs/zh_CN/printing.lang b/public/langs/zh_CN/printing.lang
similarity index 100%
rename from htdocs/langs/zh_CN/printing.lang
rename to public/langs/zh_CN/printing.lang
diff --git a/htdocs/langs/zh_CN/productbatch.lang b/public/langs/zh_CN/productbatch.lang
similarity index 100%
rename from htdocs/langs/zh_CN/productbatch.lang
rename to public/langs/zh_CN/productbatch.lang
diff --git a/htdocs/langs/zh_CN/products.lang b/public/langs/zh_CN/products.lang
similarity index 100%
rename from htdocs/langs/zh_CN/products.lang
rename to public/langs/zh_CN/products.lang
diff --git a/htdocs/langs/zh_CN/projects.lang b/public/langs/zh_CN/projects.lang
similarity index 100%
rename from htdocs/langs/zh_CN/projects.lang
rename to public/langs/zh_CN/projects.lang
diff --git a/htdocs/langs/zh_CN/propal.lang b/public/langs/zh_CN/propal.lang
similarity index 100%
rename from htdocs/langs/zh_CN/propal.lang
rename to public/langs/zh_CN/propal.lang
diff --git a/htdocs/langs/zh_CN/receiptprinter.lang b/public/langs/zh_CN/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/zh_CN/receiptprinter.lang
rename to public/langs/zh_CN/receiptprinter.lang
diff --git a/htdocs/langs/zh_CN/resource.lang b/public/langs/zh_CN/resource.lang
similarity index 100%
rename from htdocs/langs/zh_CN/resource.lang
rename to public/langs/zh_CN/resource.lang
diff --git a/htdocs/langs/zh_CN/salaries.lang b/public/langs/zh_CN/salaries.lang
similarity index 100%
rename from htdocs/langs/zh_CN/salaries.lang
rename to public/langs/zh_CN/salaries.lang
diff --git a/htdocs/langs/zh_CN/sendings.lang b/public/langs/zh_CN/sendings.lang
similarity index 100%
rename from htdocs/langs/zh_CN/sendings.lang
rename to public/langs/zh_CN/sendings.lang
diff --git a/htdocs/langs/zh_CN/sms.lang b/public/langs/zh_CN/sms.lang
similarity index 100%
rename from htdocs/langs/zh_CN/sms.lang
rename to public/langs/zh_CN/sms.lang
diff --git a/htdocs/langs/zh_CN/stocks.lang b/public/langs/zh_CN/stocks.lang
similarity index 100%
rename from htdocs/langs/zh_CN/stocks.lang
rename to public/langs/zh_CN/stocks.lang
diff --git a/htdocs/langs/zh_CN/supplier_proposal.lang b/public/langs/zh_CN/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/zh_CN/supplier_proposal.lang
rename to public/langs/zh_CN/supplier_proposal.lang
diff --git a/htdocs/langs/zh_CN/suppliers.lang b/public/langs/zh_CN/suppliers.lang
similarity index 100%
rename from htdocs/langs/zh_CN/suppliers.lang
rename to public/langs/zh_CN/suppliers.lang
diff --git a/htdocs/langs/zh_CN/trips.lang b/public/langs/zh_CN/trips.lang
similarity index 100%
rename from htdocs/langs/zh_CN/trips.lang
rename to public/langs/zh_CN/trips.lang
diff --git a/htdocs/langs/zh_CN/users.lang b/public/langs/zh_CN/users.lang
similarity index 100%
rename from htdocs/langs/zh_CN/users.lang
rename to public/langs/zh_CN/users.lang
diff --git a/htdocs/langs/zh_CN/website.lang b/public/langs/zh_CN/website.lang
similarity index 100%
rename from htdocs/langs/zh_CN/website.lang
rename to public/langs/zh_CN/website.lang
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/public/langs/zh_CN/withdrawals.lang
similarity index 100%
rename from htdocs/langs/zh_CN/withdrawals.lang
rename to public/langs/zh_CN/withdrawals.lang
diff --git a/htdocs/langs/zh_CN/workflow.lang b/public/langs/zh_CN/workflow.lang
similarity index 100%
rename from htdocs/langs/zh_CN/workflow.lang
rename to public/langs/zh_CN/workflow.lang
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/public/langs/zh_TW/accountancy.lang
similarity index 100%
rename from htdocs/langs/zh_TW/accountancy.lang
rename to public/langs/zh_TW/accountancy.lang
diff --git a/htdocs/langs/zh_TW/admin.lang b/public/langs/zh_TW/admin.lang
similarity index 100%
rename from htdocs/langs/zh_TW/admin.lang
rename to public/langs/zh_TW/admin.lang
diff --git a/htdocs/langs/zh_TW/agenda.lang b/public/langs/zh_TW/agenda.lang
similarity index 100%
rename from htdocs/langs/zh_TW/agenda.lang
rename to public/langs/zh_TW/agenda.lang
diff --git a/htdocs/langs/zh_TW/banks.lang b/public/langs/zh_TW/banks.lang
similarity index 100%
rename from htdocs/langs/zh_TW/banks.lang
rename to public/langs/zh_TW/banks.lang
diff --git a/htdocs/langs/zh_TW/bills.lang b/public/langs/zh_TW/bills.lang
similarity index 100%
rename from htdocs/langs/zh_TW/bills.lang
rename to public/langs/zh_TW/bills.lang
diff --git a/htdocs/langs/zh_TW/bookmarks.lang b/public/langs/zh_TW/bookmarks.lang
similarity index 100%
rename from htdocs/langs/zh_TW/bookmarks.lang
rename to public/langs/zh_TW/bookmarks.lang
diff --git a/htdocs/langs/zh_TW/boxes.lang b/public/langs/zh_TW/boxes.lang
similarity index 100%
rename from htdocs/langs/zh_TW/boxes.lang
rename to public/langs/zh_TW/boxes.lang
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/public/langs/zh_TW/cashdesk.lang
similarity index 100%
rename from htdocs/langs/zh_TW/cashdesk.lang
rename to public/langs/zh_TW/cashdesk.lang
diff --git a/htdocs/langs/zh_TW/categories.lang b/public/langs/zh_TW/categories.lang
similarity index 100%
rename from htdocs/langs/zh_TW/categories.lang
rename to public/langs/zh_TW/categories.lang
diff --git a/htdocs/langs/zh_TW/commercial.lang b/public/langs/zh_TW/commercial.lang
similarity index 100%
rename from htdocs/langs/zh_TW/commercial.lang
rename to public/langs/zh_TW/commercial.lang
diff --git a/htdocs/langs/zh_TW/companies.lang b/public/langs/zh_TW/companies.lang
similarity index 100%
rename from htdocs/langs/zh_TW/companies.lang
rename to public/langs/zh_TW/companies.lang
diff --git a/htdocs/langs/zh_TW/compta.lang b/public/langs/zh_TW/compta.lang
similarity index 100%
rename from htdocs/langs/zh_TW/compta.lang
rename to public/langs/zh_TW/compta.lang
diff --git a/htdocs/langs/zh_TW/contracts.lang b/public/langs/zh_TW/contracts.lang
similarity index 100%
rename from htdocs/langs/zh_TW/contracts.lang
rename to public/langs/zh_TW/contracts.lang
diff --git a/htdocs/langs/zh_TW/cron.lang b/public/langs/zh_TW/cron.lang
similarity index 100%
rename from htdocs/langs/zh_TW/cron.lang
rename to public/langs/zh_TW/cron.lang
diff --git a/htdocs/langs/zh_TW/deliveries.lang b/public/langs/zh_TW/deliveries.lang
similarity index 100%
rename from htdocs/langs/zh_TW/deliveries.lang
rename to public/langs/zh_TW/deliveries.lang
diff --git a/htdocs/langs/zh_TW/dict.lang b/public/langs/zh_TW/dict.lang
similarity index 100%
rename from htdocs/langs/zh_TW/dict.lang
rename to public/langs/zh_TW/dict.lang
diff --git a/htdocs/langs/zh_TW/donations.lang b/public/langs/zh_TW/donations.lang
similarity index 100%
rename from htdocs/langs/zh_TW/donations.lang
rename to public/langs/zh_TW/donations.lang
diff --git a/htdocs/langs/zh_TW/ecm.lang b/public/langs/zh_TW/ecm.lang
similarity index 100%
rename from htdocs/langs/zh_TW/ecm.lang
rename to public/langs/zh_TW/ecm.lang
diff --git a/htdocs/langs/zh_TW/errors.lang b/public/langs/zh_TW/errors.lang
similarity index 100%
rename from htdocs/langs/zh_TW/errors.lang
rename to public/langs/zh_TW/errors.lang
diff --git a/htdocs/langs/zh_TW/exports.lang b/public/langs/zh_TW/exports.lang
similarity index 100%
rename from htdocs/langs/zh_TW/exports.lang
rename to public/langs/zh_TW/exports.lang
diff --git a/htdocs/langs/zh_TW/externalsite.lang b/public/langs/zh_TW/externalsite.lang
similarity index 100%
rename from htdocs/langs/zh_TW/externalsite.lang
rename to public/langs/zh_TW/externalsite.lang
diff --git a/htdocs/langs/zh_TW/ftp.lang b/public/langs/zh_TW/ftp.lang
similarity index 100%
rename from htdocs/langs/zh_TW/ftp.lang
rename to public/langs/zh_TW/ftp.lang
diff --git a/htdocs/langs/zh_TW/help.lang b/public/langs/zh_TW/help.lang
similarity index 100%
rename from htdocs/langs/zh_TW/help.lang
rename to public/langs/zh_TW/help.lang
diff --git a/htdocs/langs/zh_TW/holiday.lang b/public/langs/zh_TW/holiday.lang
similarity index 100%
rename from htdocs/langs/zh_TW/holiday.lang
rename to public/langs/zh_TW/holiday.lang
diff --git a/htdocs/langs/zh_TW/hrm.lang b/public/langs/zh_TW/hrm.lang
similarity index 100%
rename from htdocs/langs/zh_TW/hrm.lang
rename to public/langs/zh_TW/hrm.lang
diff --git a/htdocs/langs/zh_TW/incoterm.lang b/public/langs/zh_TW/incoterm.lang
similarity index 100%
rename from htdocs/langs/zh_TW/incoterm.lang
rename to public/langs/zh_TW/incoterm.lang
diff --git a/htdocs/langs/zh_TW/install.lang b/public/langs/zh_TW/install.lang
similarity index 100%
rename from htdocs/langs/zh_TW/install.lang
rename to public/langs/zh_TW/install.lang
diff --git a/htdocs/langs/zh_TW/interventions.lang b/public/langs/zh_TW/interventions.lang
similarity index 100%
rename from htdocs/langs/zh_TW/interventions.lang
rename to public/langs/zh_TW/interventions.lang
diff --git a/htdocs/langs/zh_TW/languages.lang b/public/langs/zh_TW/languages.lang
similarity index 100%
rename from htdocs/langs/zh_TW/languages.lang
rename to public/langs/zh_TW/languages.lang
diff --git a/htdocs/langs/zh_TW/ldap.lang b/public/langs/zh_TW/ldap.lang
similarity index 100%
rename from htdocs/langs/zh_TW/ldap.lang
rename to public/langs/zh_TW/ldap.lang
diff --git a/htdocs/langs/zh_TW/link.lang b/public/langs/zh_TW/link.lang
similarity index 100%
rename from htdocs/langs/zh_TW/link.lang
rename to public/langs/zh_TW/link.lang
diff --git a/htdocs/langs/zh_TW/loan.lang b/public/langs/zh_TW/loan.lang
similarity index 100%
rename from htdocs/langs/zh_TW/loan.lang
rename to public/langs/zh_TW/loan.lang
diff --git a/htdocs/langs/zh_TW/mailmanspip.lang b/public/langs/zh_TW/mailmanspip.lang
similarity index 100%
rename from htdocs/langs/zh_TW/mailmanspip.lang
rename to public/langs/zh_TW/mailmanspip.lang
diff --git a/htdocs/langs/zh_TW/mails.lang b/public/langs/zh_TW/mails.lang
similarity index 100%
rename from htdocs/langs/zh_TW/mails.lang
rename to public/langs/zh_TW/mails.lang
diff --git a/htdocs/langs/zh_TW/main.lang b/public/langs/zh_TW/main.lang
similarity index 100%
rename from htdocs/langs/zh_TW/main.lang
rename to public/langs/zh_TW/main.lang
diff --git a/htdocs/langs/zh_TW/margins.lang b/public/langs/zh_TW/margins.lang
similarity index 100%
rename from htdocs/langs/zh_TW/margins.lang
rename to public/langs/zh_TW/margins.lang
diff --git a/htdocs/langs/zh_TW/members.lang b/public/langs/zh_TW/members.lang
similarity index 100%
rename from htdocs/langs/zh_TW/members.lang
rename to public/langs/zh_TW/members.lang
diff --git a/htdocs/langs/zh_TW/oauth.lang b/public/langs/zh_TW/oauth.lang
similarity index 100%
rename from htdocs/langs/zh_TW/oauth.lang
rename to public/langs/zh_TW/oauth.lang
diff --git a/htdocs/langs/zh_TW/opensurvey.lang b/public/langs/zh_TW/opensurvey.lang
similarity index 100%
rename from htdocs/langs/zh_TW/opensurvey.lang
rename to public/langs/zh_TW/opensurvey.lang
diff --git a/htdocs/langs/zh_TW/orders.lang b/public/langs/zh_TW/orders.lang
similarity index 100%
rename from htdocs/langs/zh_TW/orders.lang
rename to public/langs/zh_TW/orders.lang
diff --git a/htdocs/langs/zh_TW/other.lang b/public/langs/zh_TW/other.lang
similarity index 100%
rename from htdocs/langs/zh_TW/other.lang
rename to public/langs/zh_TW/other.lang
diff --git a/htdocs/langs/zh_TW/paybox.lang b/public/langs/zh_TW/paybox.lang
similarity index 100%
rename from htdocs/langs/zh_TW/paybox.lang
rename to public/langs/zh_TW/paybox.lang
diff --git a/htdocs/langs/zh_TW/paypal.lang b/public/langs/zh_TW/paypal.lang
similarity index 100%
rename from htdocs/langs/zh_TW/paypal.lang
rename to public/langs/zh_TW/paypal.lang
diff --git a/htdocs/langs/zh_TW/printing.lang b/public/langs/zh_TW/printing.lang
similarity index 100%
rename from htdocs/langs/zh_TW/printing.lang
rename to public/langs/zh_TW/printing.lang
diff --git a/htdocs/langs/zh_TW/productbatch.lang b/public/langs/zh_TW/productbatch.lang
similarity index 100%
rename from htdocs/langs/zh_TW/productbatch.lang
rename to public/langs/zh_TW/productbatch.lang
diff --git a/htdocs/langs/zh_TW/products.lang b/public/langs/zh_TW/products.lang
similarity index 100%
rename from htdocs/langs/zh_TW/products.lang
rename to public/langs/zh_TW/products.lang
diff --git a/htdocs/langs/zh_TW/projects.lang b/public/langs/zh_TW/projects.lang
similarity index 100%
rename from htdocs/langs/zh_TW/projects.lang
rename to public/langs/zh_TW/projects.lang
diff --git a/htdocs/langs/zh_TW/propal.lang b/public/langs/zh_TW/propal.lang
similarity index 100%
rename from htdocs/langs/zh_TW/propal.lang
rename to public/langs/zh_TW/propal.lang
diff --git a/htdocs/langs/zh_TW/receiptprinter.lang b/public/langs/zh_TW/receiptprinter.lang
similarity index 100%
rename from htdocs/langs/zh_TW/receiptprinter.lang
rename to public/langs/zh_TW/receiptprinter.lang
diff --git a/htdocs/langs/zh_TW/resource.lang b/public/langs/zh_TW/resource.lang
similarity index 100%
rename from htdocs/langs/zh_TW/resource.lang
rename to public/langs/zh_TW/resource.lang
diff --git a/htdocs/langs/zh_TW/salaries.lang b/public/langs/zh_TW/salaries.lang
similarity index 100%
rename from htdocs/langs/zh_TW/salaries.lang
rename to public/langs/zh_TW/salaries.lang
diff --git a/htdocs/langs/zh_TW/sendings.lang b/public/langs/zh_TW/sendings.lang
similarity index 100%
rename from htdocs/langs/zh_TW/sendings.lang
rename to public/langs/zh_TW/sendings.lang
diff --git a/htdocs/langs/zh_TW/sms.lang b/public/langs/zh_TW/sms.lang
similarity index 100%
rename from htdocs/langs/zh_TW/sms.lang
rename to public/langs/zh_TW/sms.lang
diff --git a/htdocs/langs/zh_TW/stocks.lang b/public/langs/zh_TW/stocks.lang
similarity index 100%
rename from htdocs/langs/zh_TW/stocks.lang
rename to public/langs/zh_TW/stocks.lang
diff --git a/htdocs/langs/zh_TW/supplier_proposal.lang b/public/langs/zh_TW/supplier_proposal.lang
similarity index 100%
rename from htdocs/langs/zh_TW/supplier_proposal.lang
rename to public/langs/zh_TW/supplier_proposal.lang
diff --git a/htdocs/langs/zh_TW/suppliers.lang b/public/langs/zh_TW/suppliers.lang
similarity index 100%
rename from htdocs/langs/zh_TW/suppliers.lang
rename to public/langs/zh_TW/suppliers.lang
diff --git a/htdocs/langs/zh_TW/trips.lang b/public/langs/zh_TW/trips.lang
similarity index 100%
rename from htdocs/langs/zh_TW/trips.lang
rename to public/langs/zh_TW/trips.lang
diff --git a/htdocs/langs/zh_TW/users.lang b/public/langs/zh_TW/users.lang
similarity index 100%
rename from htdocs/langs/zh_TW/users.lang
rename to public/langs/zh_TW/users.lang
diff --git a/htdocs/langs/zh_TW/website.lang b/public/langs/zh_TW/website.lang
similarity index 100%
rename from htdocs/langs/zh_TW/website.lang
rename to public/langs/zh_TW/website.lang
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/public/langs/zh_TW/withdrawals.lang
similarity index 100%
rename from htdocs/langs/zh_TW/withdrawals.lang
rename to public/langs/zh_TW/withdrawals.lang
diff --git a/htdocs/langs/zh_TW/workflow.lang b/public/langs/zh_TW/workflow.lang
similarity index 100%
rename from htdocs/langs/zh_TW/workflow.lang
rename to public/langs/zh_TW/workflow.lang
diff --git a/htdocs/livraison/card.php b/public/livraison/card.php
similarity index 100%
rename from htdocs/livraison/card.php
rename to public/livraison/card.php
diff --git a/htdocs/livraison/class/index.html b/public/livraison/class/index.html
similarity index 100%
rename from htdocs/livraison/class/index.html
rename to public/livraison/class/index.html
diff --git a/htdocs/livraison/class/livraison.class.php b/public/livraison/class/livraison.class.php
similarity index 100%
rename from htdocs/livraison/class/livraison.class.php
rename to public/livraison/class/livraison.class.php
diff --git a/htdocs/livraison/index.html b/public/livraison/index.html
similarity index 100%
rename from htdocs/livraison/index.html
rename to public/livraison/index.html
diff --git a/htdocs/loan/calc.php b/public/loan/calc.php
similarity index 100%
rename from htdocs/loan/calc.php
rename to public/loan/calc.php
diff --git a/htdocs/loan/card.php b/public/loan/card.php
similarity index 100%
rename from htdocs/loan/card.php
rename to public/loan/card.php
diff --git a/htdocs/loan/class/index.html b/public/loan/class/index.html
similarity index 100%
rename from htdocs/loan/class/index.html
rename to public/loan/class/index.html
diff --git a/htdocs/loan/class/loan.class.php b/public/loan/class/loan.class.php
similarity index 100%
rename from htdocs/loan/class/loan.class.php
rename to public/loan/class/loan.class.php
diff --git a/htdocs/loan/class/paymentloan.class.php b/public/loan/class/paymentloan.class.php
similarity index 100%
rename from htdocs/loan/class/paymentloan.class.php
rename to public/loan/class/paymentloan.class.php
diff --git a/htdocs/loan/document.php b/public/loan/document.php
similarity index 100%
rename from htdocs/loan/document.php
rename to public/loan/document.php
diff --git a/htdocs/loan/index.html b/public/loan/index.html
similarity index 100%
rename from htdocs/loan/index.html
rename to public/loan/index.html
diff --git a/htdocs/loan/index.php b/public/loan/index.php
similarity index 100%
rename from htdocs/loan/index.php
rename to public/loan/index.php
diff --git a/htdocs/loan/info.php b/public/loan/info.php
similarity index 100%
rename from htdocs/loan/info.php
rename to public/loan/info.php
diff --git a/htdocs/loan/note.php b/public/loan/note.php
similarity index 100%
rename from htdocs/loan/note.php
rename to public/loan/note.php
diff --git a/htdocs/loan/payment/card.php b/public/loan/payment/card.php
similarity index 100%
rename from htdocs/loan/payment/card.php
rename to public/loan/payment/card.php
diff --git a/htdocs/loan/payment/index.html b/public/loan/payment/index.html
similarity index 100%
rename from htdocs/loan/payment/index.html
rename to public/loan/payment/index.html
diff --git a/htdocs/loan/payment/payment.php b/public/loan/payment/payment.php
similarity index 100%
rename from htdocs/loan/payment/payment.php
rename to public/loan/payment/payment.php
diff --git a/htdocs/mailmanspip/class/index.html b/public/mailmanspip/class/index.html
similarity index 100%
rename from htdocs/mailmanspip/class/index.html
rename to public/mailmanspip/class/index.html
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/public/mailmanspip/class/mailmanspip.class.php
similarity index 100%
rename from htdocs/mailmanspip/class/mailmanspip.class.php
rename to public/mailmanspip/class/mailmanspip.class.php
diff --git a/htdocs/mailmanspip/index.html b/public/mailmanspip/index.html
similarity index 100%
rename from htdocs/mailmanspip/index.html
rename to public/mailmanspip/index.html
diff --git a/htdocs/main.inc.php b/public/main.inc.php
similarity index 100%
rename from htdocs/main.inc.php
rename to public/main.inc.php
diff --git a/htdocs/margin/admin/index.html b/public/margin/admin/index.html
similarity index 100%
rename from htdocs/margin/admin/index.html
rename to public/margin/admin/index.html
diff --git a/htdocs/margin/admin/margin.php b/public/margin/admin/margin.php
similarity index 100%
rename from htdocs/margin/admin/margin.php
rename to public/margin/admin/margin.php
diff --git a/htdocs/margin/agentMargins.php b/public/margin/agentMargins.php
similarity index 100%
rename from htdocs/margin/agentMargins.php
rename to public/margin/agentMargins.php
diff --git a/htdocs/margin/checkMargins.php b/public/margin/checkMargins.php
similarity index 100%
rename from htdocs/margin/checkMargins.php
rename to public/margin/checkMargins.php
diff --git a/htdocs/margin/customerMargins.php b/public/margin/customerMargins.php
similarity index 100%
rename from htdocs/margin/customerMargins.php
rename to public/margin/customerMargins.php
diff --git a/htdocs/margin/index.php b/public/margin/index.php
similarity index 100%
rename from htdocs/margin/index.php
rename to public/margin/index.php
diff --git a/htdocs/margin/lib/index.html b/public/margin/lib/index.html
similarity index 100%
rename from htdocs/margin/lib/index.html
rename to public/margin/lib/index.html
diff --git a/htdocs/margin/lib/margins.lib.php b/public/margin/lib/margins.lib.php
similarity index 100%
rename from htdocs/margin/lib/margins.lib.php
rename to public/margin/lib/margins.lib.php
diff --git a/htdocs/margin/productMargins.php b/public/margin/productMargins.php
similarity index 100%
rename from htdocs/margin/productMargins.php
rename to public/margin/productMargins.php
diff --git a/htdocs/margin/tabs/index.html b/public/margin/tabs/index.html
similarity index 100%
rename from htdocs/margin/tabs/index.html
rename to public/margin/tabs/index.html
diff --git a/htdocs/margin/tabs/productMargins.php b/public/margin/tabs/productMargins.php
similarity index 100%
rename from htdocs/margin/tabs/productMargins.php
rename to public/margin/tabs/productMargins.php
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/public/margin/tabs/thirdpartyMargins.php
similarity index 100%
rename from htdocs/margin/tabs/thirdpartyMargins.php
rename to public/margin/tabs/thirdpartyMargins.php
diff --git a/htdocs/master.inc.php b/public/master.inc.php
similarity index 100%
rename from htdocs/master.inc.php
rename to public/master.inc.php
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/public/multicurrency/class/multicurrency.class.php
similarity index 100%
rename from htdocs/multicurrency/class/multicurrency.class.php
rename to public/multicurrency/class/multicurrency.class.php
diff --git a/htdocs/opensurvey/card.php b/public/opensurvey/card.php
similarity index 100%
rename from htdocs/opensurvey/card.php
rename to public/opensurvey/card.php
diff --git a/htdocs/opensurvey/class/index.html b/public/opensurvey/class/index.html
similarity index 100%
rename from htdocs/opensurvey/class/index.html
rename to public/opensurvey/class/index.html
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/public/opensurvey/class/opensurveysondage.class.php
similarity index 100%
rename from htdocs/opensurvey/class/opensurveysondage.class.php
rename to public/opensurvey/class/opensurveysondage.class.php
diff --git a/htdocs/opensurvey/css/index.html b/public/opensurvey/css/index.html
similarity index 100%
rename from htdocs/opensurvey/css/index.html
rename to public/opensurvey/css/index.html
diff --git a/htdocs/opensurvey/css/style.css b/public/opensurvey/css/style.css
similarity index 100%
rename from htdocs/opensurvey/css/style.css
rename to public/opensurvey/css/style.css
diff --git a/htdocs/opensurvey/exportcsv.php b/public/opensurvey/exportcsv.php
similarity index 100%
rename from htdocs/opensurvey/exportcsv.php
rename to public/opensurvey/exportcsv.php
diff --git a/htdocs/opensurvey/fonctions.php b/public/opensurvey/fonctions.php
similarity index 100%
rename from htdocs/opensurvey/fonctions.php
rename to public/opensurvey/fonctions.php
diff --git a/htdocs/opensurvey/img/accept-24.png b/public/opensurvey/img/accept-24.png
similarity index 100%
rename from htdocs/opensurvey/img/accept-24.png
rename to public/opensurvey/img/accept-24.png
diff --git a/htdocs/opensurvey/img/accept.png b/public/opensurvey/img/accept.png
similarity index 100%
rename from htdocs/opensurvey/img/accept.png
rename to public/opensurvey/img/accept.png
diff --git a/htdocs/opensurvey/img/add-16.png b/public/opensurvey/img/add-16.png
similarity index 100%
rename from htdocs/opensurvey/img/add-16.png
rename to public/opensurvey/img/add-16.png
diff --git a/htdocs/opensurvey/img/add-24.png b/public/opensurvey/img/add-24.png
similarity index 100%
rename from htdocs/opensurvey/img/add-24.png
rename to public/opensurvey/img/add-24.png
diff --git a/htdocs/opensurvey/img/calendar-32.png b/public/opensurvey/img/calendar-32.png
similarity index 100%
rename from htdocs/opensurvey/img/calendar-32.png
rename to public/opensurvey/img/calendar-32.png
diff --git a/htdocs/opensurvey/img/chart-32.png b/public/opensurvey/img/chart-32.png
similarity index 100%
rename from htdocs/opensurvey/img/chart-32.png
rename to public/opensurvey/img/chart-32.png
diff --git a/htdocs/opensurvey/img/date.png b/public/opensurvey/img/date.png
similarity index 100%
rename from htdocs/opensurvey/img/date.png
rename to public/opensurvey/img/date.png
diff --git a/htdocs/opensurvey/img/fforward.png b/public/opensurvey/img/fforward.png
similarity index 100%
rename from htdocs/opensurvey/img/fforward.png
rename to public/opensurvey/img/fforward.png
diff --git a/htdocs/opensurvey/img/index.html b/public/opensurvey/img/index.html
similarity index 100%
rename from htdocs/opensurvey/img/index.html
rename to public/opensurvey/img/index.html
diff --git a/htdocs/opensurvey/img/medaille.png b/public/opensurvey/img/medaille.png
similarity index 100%
rename from htdocs/opensurvey/img/medaille.png
rename to public/opensurvey/img/medaille.png
diff --git a/htdocs/opensurvey/img/next.png b/public/opensurvey/img/next.png
similarity index 100%
rename from htdocs/opensurvey/img/next.png
rename to public/opensurvey/img/next.png
diff --git a/htdocs/opensurvey/img/object_opensurvey.png b/public/opensurvey/img/object_opensurvey.png
similarity index 100%
rename from htdocs/opensurvey/img/object_opensurvey.png
rename to public/opensurvey/img/object_opensurvey.png
diff --git a/htdocs/opensurvey/img/opensurvey.png b/public/opensurvey/img/opensurvey.png
similarity index 100%
rename from htdocs/opensurvey/img/opensurvey.png
rename to public/opensurvey/img/opensurvey.png
diff --git a/htdocs/opensurvey/img/previous.png b/public/opensurvey/img/previous.png
similarity index 100%
rename from htdocs/opensurvey/img/previous.png
rename to public/opensurvey/img/previous.png
diff --git a/htdocs/opensurvey/img/rewind.png b/public/opensurvey/img/rewind.png
similarity index 100%
rename from htdocs/opensurvey/img/rewind.png
rename to public/opensurvey/img/rewind.png
diff --git a/htdocs/opensurvey/img/sondage2.png b/public/opensurvey/img/sondage2.png
similarity index 100%
rename from htdocs/opensurvey/img/sondage2.png
rename to public/opensurvey/img/sondage2.png
diff --git a/htdocs/opensurvey/index.php b/public/opensurvey/index.php
similarity index 100%
rename from htdocs/opensurvey/index.php
rename to public/opensurvey/index.php
diff --git a/htdocs/opensurvey/list.php b/public/opensurvey/list.php
similarity index 100%
rename from htdocs/opensurvey/list.php
rename to public/opensurvey/list.php
diff --git a/htdocs/opensurvey/results.php b/public/opensurvey/results.php
similarity index 100%
rename from htdocs/opensurvey/results.php
rename to public/opensurvey/results.php
diff --git a/htdocs/opensurvey/wizard/choix_autre.php b/public/opensurvey/wizard/choix_autre.php
similarity index 100%
rename from htdocs/opensurvey/wizard/choix_autre.php
rename to public/opensurvey/wizard/choix_autre.php
diff --git a/htdocs/opensurvey/wizard/choix_date.php b/public/opensurvey/wizard/choix_date.php
similarity index 100%
rename from htdocs/opensurvey/wizard/choix_date.php
rename to public/opensurvey/wizard/choix_date.php
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/public/opensurvey/wizard/create_survey.php
similarity index 100%
rename from htdocs/opensurvey/wizard/create_survey.php
rename to public/opensurvey/wizard/create_survey.php
diff --git a/htdocs/opensurvey/wizard/index.php b/public/opensurvey/wizard/index.php
similarity index 100%
rename from htdocs/opensurvey/wizard/index.php
rename to public/opensurvey/wizard/index.php
diff --git a/htdocs/paybox/admin/index.html b/public/paybox/admin/index.html
similarity index 100%
rename from htdocs/paybox/admin/index.html
rename to public/paybox/admin/index.html
diff --git a/htdocs/paybox/admin/paybox.php b/public/paybox/admin/paybox.php
similarity index 100%
rename from htdocs/paybox/admin/paybox.php
rename to public/paybox/admin/paybox.php
diff --git a/htdocs/paybox/img/index.html b/public/paybox/img/index.html
similarity index 100%
rename from htdocs/paybox/img/index.html
rename to public/paybox/img/index.html
diff --git a/htdocs/paybox/img/object_paybox.png b/public/paybox/img/object_paybox.png
similarity index 100%
rename from htdocs/paybox/img/object_paybox.png
rename to public/paybox/img/object_paybox.png
diff --git a/htdocs/paybox/index.html b/public/paybox/index.html
similarity index 100%
rename from htdocs/paybox/index.html
rename to public/paybox/index.html
diff --git a/htdocs/paybox/lib/index.html b/public/paybox/lib/index.html
similarity index 100%
rename from htdocs/paybox/lib/index.html
rename to public/paybox/lib/index.html
diff --git a/htdocs/paybox/lib/paybox.lib.php b/public/paybox/lib/paybox.lib.php
similarity index 100%
rename from htdocs/paybox/lib/paybox.lib.php
rename to public/paybox/lib/paybox.lib.php
diff --git a/htdocs/paypal/admin/index.html b/public/paypal/admin/index.html
similarity index 100%
rename from htdocs/paypal/admin/index.html
rename to public/paypal/admin/index.html
diff --git a/htdocs/paypal/admin/paypal.php b/public/paypal/admin/paypal.php
similarity index 100%
rename from htdocs/paypal/admin/paypal.php
rename to public/paypal/admin/paypal.php
diff --git a/htdocs/paypal/img/index.html b/public/paypal/img/index.html
similarity index 100%
rename from htdocs/paypal/img/index.html
rename to public/paypal/img/index.html
diff --git a/htdocs/paypal/img/object_paypal.png b/public/paypal/img/object_paypal.png
similarity index 100%
rename from htdocs/paypal/img/object_paypal.png
rename to public/paypal/img/object_paypal.png
diff --git a/htdocs/paypal/index.html b/public/paypal/index.html
similarity index 100%
rename from htdocs/paypal/index.html
rename to public/paypal/index.html
diff --git a/htdocs/paypal/lib/index.html b/public/paypal/lib/index.html
similarity index 100%
rename from htdocs/paypal/lib/index.html
rename to public/paypal/lib/index.html
diff --git a/htdocs/paypal/lib/paypal.lib.php b/public/paypal/lib/paypal.lib.php
similarity index 100%
rename from htdocs/paypal/lib/paypal.lib.php
rename to public/paypal/lib/paypal.lib.php
diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/public/paypal/lib/paypalfunctions.lib.php
similarity index 100%
rename from htdocs/paypal/lib/paypalfunctions.lib.php
rename to public/paypal/lib/paypalfunctions.lib.php
diff --git a/htdocs/printing/admin/index.html b/public/printing/admin/index.html
similarity index 100%
rename from htdocs/printing/admin/index.html
rename to public/printing/admin/index.html
diff --git a/htdocs/printing/admin/printing.php b/public/printing/admin/printing.php
similarity index 100%
rename from htdocs/printing/admin/printing.php
rename to public/printing/admin/printing.php
diff --git a/htdocs/printing/index.php b/public/printing/index.php
similarity index 100%
rename from htdocs/printing/index.php
rename to public/printing/index.php
diff --git a/htdocs/printing/lib/index.html b/public/printing/lib/index.html
similarity index 100%
rename from htdocs/printing/lib/index.html
rename to public/printing/lib/index.html
diff --git a/htdocs/printing/lib/printing.lib.php b/public/printing/lib/printing.lib.php
similarity index 100%
rename from htdocs/printing/lib/printing.lib.php
rename to public/printing/lib/printing.lib.php
diff --git a/htdocs/product/admin/dynamic_prices.php b/public/product/admin/dynamic_prices.php
similarity index 100%
rename from htdocs/product/admin/dynamic_prices.php
rename to public/product/admin/dynamic_prices.php
diff --git a/htdocs/product/admin/index.html b/public/product/admin/index.html
similarity index 100%
rename from htdocs/product/admin/index.html
rename to public/product/admin/index.html
diff --git a/htdocs/product/admin/price_rules.php b/public/product/admin/price_rules.php
similarity index 100%
rename from htdocs/product/admin/price_rules.php
rename to public/product/admin/price_rules.php
diff --git a/htdocs/product/admin/product.php b/public/product/admin/product.php
similarity index 100%
rename from htdocs/product/admin/product.php
rename to public/product/admin/product.php
diff --git a/htdocs/product/admin/product_extrafields.php b/public/product/admin/product_extrafields.php
similarity index 100%
rename from htdocs/product/admin/product_extrafields.php
rename to public/product/admin/product_extrafields.php
diff --git a/htdocs/product/admin/product_lot_extrafields.php b/public/product/admin/product_lot_extrafields.php
similarity index 100%
rename from htdocs/product/admin/product_lot_extrafields.php
rename to public/product/admin/product_lot_extrafields.php
diff --git a/htdocs/product/admin/product_tools.php b/public/product/admin/product_tools.php
similarity index 100%
rename from htdocs/product/admin/product_tools.php
rename to public/product/admin/product_tools.php
diff --git a/htdocs/product/ajax/index.html b/public/product/ajax/index.html
similarity index 100%
rename from htdocs/product/ajax/index.html
rename to public/product/ajax/index.html
diff --git a/htdocs/product/ajax/products.php b/public/product/ajax/products.php
similarity index 100%
rename from htdocs/product/ajax/products.php
rename to public/product/ajax/products.php
diff --git a/htdocs/product/canvas/index.html b/public/product/canvas/index.html
similarity index 100%
rename from htdocs/product/canvas/index.html
rename to public/product/canvas/index.html
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/public/product/canvas/product/actions_card_product.class.php
similarity index 100%
rename from htdocs/product/canvas/product/actions_card_product.class.php
rename to public/product/canvas/product/actions_card_product.class.php
diff --git a/htdocs/product/canvas/product/index.html b/public/product/canvas/product/index.html
similarity index 100%
rename from htdocs/product/canvas/product/index.html
rename to public/product/canvas/product/index.html
diff --git a/htdocs/product/canvas/product/tpl/card_create.tpl.php b/public/product/canvas/product/tpl/card_create.tpl.php
similarity index 100%
rename from htdocs/product/canvas/product/tpl/card_create.tpl.php
rename to public/product/canvas/product/tpl/card_create.tpl.php
diff --git a/htdocs/product/canvas/product/tpl/card_edit.tpl.php b/public/product/canvas/product/tpl/card_edit.tpl.php
similarity index 100%
rename from htdocs/product/canvas/product/tpl/card_edit.tpl.php
rename to public/product/canvas/product/tpl/card_edit.tpl.php
diff --git a/htdocs/product/canvas/product/tpl/card_view.tpl.php b/public/product/canvas/product/tpl/card_view.tpl.php
similarity index 100%
rename from htdocs/product/canvas/product/tpl/card_view.tpl.php
rename to public/product/canvas/product/tpl/card_view.tpl.php
diff --git a/htdocs/product/canvas/product/tpl/index.html b/public/product/canvas/product/tpl/index.html
similarity index 100%
rename from htdocs/product/canvas/product/tpl/index.html
rename to public/product/canvas/product/tpl/index.html
diff --git a/htdocs/product/canvas/product/tpl/list.tpl.php b/public/product/canvas/product/tpl/list.tpl.php
similarity index 100%
rename from htdocs/product/canvas/product/tpl/list.tpl.php
rename to public/product/canvas/product/tpl/list.tpl.php
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/public/product/canvas/service/actions_card_service.class.php
similarity index 100%
rename from htdocs/product/canvas/service/actions_card_service.class.php
rename to public/product/canvas/service/actions_card_service.class.php
diff --git a/htdocs/product/canvas/service/index.html b/public/product/canvas/service/index.html
similarity index 100%
rename from htdocs/product/canvas/service/index.html
rename to public/product/canvas/service/index.html
diff --git a/htdocs/product/canvas/service/tpl/card_create.tpl.php b/public/product/canvas/service/tpl/card_create.tpl.php
similarity index 100%
rename from htdocs/product/canvas/service/tpl/card_create.tpl.php
rename to public/product/canvas/service/tpl/card_create.tpl.php
diff --git a/htdocs/product/canvas/service/tpl/card_edit.tpl.php b/public/product/canvas/service/tpl/card_edit.tpl.php
similarity index 100%
rename from htdocs/product/canvas/service/tpl/card_edit.tpl.php
rename to public/product/canvas/service/tpl/card_edit.tpl.php
diff --git a/htdocs/product/canvas/service/tpl/card_view.tpl.php b/public/product/canvas/service/tpl/card_view.tpl.php
similarity index 100%
rename from htdocs/product/canvas/service/tpl/card_view.tpl.php
rename to public/product/canvas/service/tpl/card_view.tpl.php
diff --git a/htdocs/product/canvas/service/tpl/index.html b/public/product/canvas/service/tpl/index.html
similarity index 100%
rename from htdocs/product/canvas/service/tpl/index.html
rename to public/product/canvas/service/tpl/index.html
diff --git a/htdocs/product/canvas/service/tpl/list.tpl.php b/public/product/canvas/service/tpl/list.tpl.php
similarity index 100%
rename from htdocs/product/canvas/service/tpl/list.tpl.php
rename to public/product/canvas/service/tpl/list.tpl.php
diff --git a/htdocs/product/card.php b/public/product/card.php
similarity index 100%
rename from htdocs/product/card.php
rename to public/product/card.php
diff --git a/htdocs/product/class/api_deprecated_product.class.php b/public/product/class/api_deprecated_product.class.php
similarity index 100%
rename from htdocs/product/class/api_deprecated_product.class.php
rename to public/product/class/api_deprecated_product.class.php
diff --git a/htdocs/product/class/api_products.class.php b/public/product/class/api_products.class.php
similarity index 100%
rename from htdocs/product/class/api_products.class.php
rename to public/product/class/api_products.class.php
diff --git a/htdocs/product/class/html.formproduct.class.php b/public/product/class/html.formproduct.class.php
similarity index 100%
rename from htdocs/product/class/html.formproduct.class.php
rename to public/product/class/html.formproduct.class.php
diff --git a/htdocs/product/class/index.html b/public/product/class/index.html
similarity index 100%
rename from htdocs/product/class/index.html
rename to public/product/class/index.html
diff --git a/htdocs/product/class/product.class.php b/public/product/class/product.class.php
similarity index 100%
rename from htdocs/product/class/product.class.php
rename to public/product/class/product.class.php
diff --git a/htdocs/product/class/productbatch.class.php b/public/product/class/productbatch.class.php
similarity index 100%
rename from htdocs/product/class/productbatch.class.php
rename to public/product/class/productbatch.class.php
diff --git a/htdocs/product/class/productcustomerprice.class.php b/public/product/class/productcustomerprice.class.php
similarity index 100%
rename from htdocs/product/class/productcustomerprice.class.php
rename to public/product/class/productcustomerprice.class.php
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/public/product/class/propalmergepdfproduct.class.php
similarity index 100%
rename from htdocs/product/class/propalmergepdfproduct.class.php
rename to public/product/class/propalmergepdfproduct.class.php
diff --git a/htdocs/product/class/service.class.php b/public/product/class/service.class.php
similarity index 100%
rename from htdocs/product/class/service.class.php
rename to public/product/class/service.class.php
diff --git a/htdocs/product/composition/card.php b/public/product/composition/card.php
similarity index 100%
rename from htdocs/product/composition/card.php
rename to public/product/composition/card.php
diff --git a/htdocs/product/composition/index.html b/public/product/composition/index.html
similarity index 100%
rename from htdocs/product/composition/index.html
rename to public/product/composition/index.html
diff --git a/htdocs/product/document.php b/public/product/document.php
similarity index 100%
rename from htdocs/product/document.php
rename to public/product/document.php
diff --git a/htdocs/product/dynamic_price/class/price_expression.class.php b/public/product/dynamic_price/class/price_expression.class.php
similarity index 100%
rename from htdocs/product/dynamic_price/class/price_expression.class.php
rename to public/product/dynamic_price/class/price_expression.class.php
diff --git a/htdocs/product/dynamic_price/class/price_global_variable.class.php b/public/product/dynamic_price/class/price_global_variable.class.php
similarity index 100%
rename from htdocs/product/dynamic_price/class/price_global_variable.class.php
rename to public/product/dynamic_price/class/price_global_variable.class.php
diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/public/product/dynamic_price/class/price_global_variable_updater.class.php
similarity index 100%
rename from htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
rename to public/product/dynamic_price/class/price_global_variable_updater.class.php
diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/public/product/dynamic_price/class/price_parser.class.php
similarity index 100%
rename from htdocs/product/dynamic_price/class/price_parser.class.php
rename to public/product/dynamic_price/class/price_parser.class.php
diff --git a/htdocs/product/dynamic_price/editor.php b/public/product/dynamic_price/editor.php
similarity index 100%
rename from htdocs/product/dynamic_price/editor.php
rename to public/product/dynamic_price/editor.php
diff --git a/htdocs/product/fournisseurs.php b/public/product/fournisseurs.php
similarity index 100%
rename from htdocs/product/fournisseurs.php
rename to public/product/fournisseurs.php
diff --git a/htdocs/product/index.php b/public/product/index.php
similarity index 100%
rename from htdocs/product/index.php
rename to public/product/index.php
diff --git a/htdocs/product/info.php b/public/product/info.php
similarity index 100%
rename from htdocs/product/info.php
rename to public/product/info.php
diff --git a/htdocs/product/list.php b/public/product/list.php
similarity index 100%
rename from htdocs/product/list.php
rename to public/product/list.php
diff --git a/htdocs/product/note.php b/public/product/note.php
similarity index 100%
rename from htdocs/product/note.php
rename to public/product/note.php
diff --git a/htdocs/product/popuprop.php b/public/product/popuprop.php
similarity index 100%
rename from htdocs/product/popuprop.php
rename to public/product/popuprop.php
diff --git a/htdocs/product/price.php b/public/product/price.php
similarity index 100%
rename from htdocs/product/price.php
rename to public/product/price.php
diff --git a/htdocs/product/reassort.php b/public/product/reassort.php
similarity index 100%
rename from htdocs/product/reassort.php
rename to public/product/reassort.php
diff --git a/htdocs/product/reassortlot.php b/public/product/reassortlot.php
similarity index 100%
rename from htdocs/product/reassortlot.php
rename to public/product/reassortlot.php
diff --git a/htdocs/product/stats/card.php b/public/product/stats/card.php
similarity index 100%
rename from htdocs/product/stats/card.php
rename to public/product/stats/card.php
diff --git a/htdocs/product/stats/commande.php b/public/product/stats/commande.php
similarity index 100%
rename from htdocs/product/stats/commande.php
rename to public/product/stats/commande.php
diff --git a/htdocs/product/stats/commande_fournisseur.php b/public/product/stats/commande_fournisseur.php
similarity index 100%
rename from htdocs/product/stats/commande_fournisseur.php
rename to public/product/stats/commande_fournisseur.php
diff --git a/htdocs/product/stats/contrat.php b/public/product/stats/contrat.php
similarity index 100%
rename from htdocs/product/stats/contrat.php
rename to public/product/stats/contrat.php
diff --git a/htdocs/product/stats/facture.php b/public/product/stats/facture.php
similarity index 100%
rename from htdocs/product/stats/facture.php
rename to public/product/stats/facture.php
diff --git a/htdocs/product/stats/facture_fournisseur.php b/public/product/stats/facture_fournisseur.php
similarity index 100%
rename from htdocs/product/stats/facture_fournisseur.php
rename to public/product/stats/facture_fournisseur.php
diff --git a/htdocs/product/stats/index.html b/public/product/stats/index.html
similarity index 100%
rename from htdocs/product/stats/index.html
rename to public/product/stats/index.html
diff --git a/htdocs/product/stats/propal.php b/public/product/stats/propal.php
similarity index 100%
rename from htdocs/product/stats/propal.php
rename to public/product/stats/propal.php
diff --git a/htdocs/product/stock/card.php b/public/product/stock/card.php
similarity index 100%
rename from htdocs/product/stock/card.php
rename to public/product/stock/card.php
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/public/product/stock/class/api_stockmovements.class.php
similarity index 100%
rename from htdocs/product/stock/class/api_stockmovements.class.php
rename to public/product/stock/class/api_stockmovements.class.php
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/public/product/stock/class/api_warehouses.class.php
similarity index 100%
rename from htdocs/product/stock/class/api_warehouses.class.php
rename to public/product/stock/class/api_warehouses.class.php
diff --git a/htdocs/product/stock/class/entrepot.class.php b/public/product/stock/class/entrepot.class.php
similarity index 100%
rename from htdocs/product/stock/class/entrepot.class.php
rename to public/product/stock/class/entrepot.class.php
diff --git a/htdocs/product/stock/class/index.html b/public/product/stock/class/index.html
similarity index 100%
rename from htdocs/product/stock/class/index.html
rename to public/product/stock/class/index.html
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/public/product/stock/class/mouvementstock.class.php
similarity index 100%
rename from htdocs/product/stock/class/mouvementstock.class.php
rename to public/product/stock/class/mouvementstock.class.php
diff --git a/htdocs/product/stock/class/productlot.class.php b/public/product/stock/class/productlot.class.php
similarity index 100%
rename from htdocs/product/stock/class/productlot.class.php
rename to public/product/stock/class/productlot.class.php
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/public/product/stock/class/productstockentrepot.class.php
similarity index 100%
rename from htdocs/product/stock/class/productstockentrepot.class.php
rename to public/product/stock/class/productstockentrepot.class.php
diff --git a/htdocs/product/stock/fiche-valo.php b/public/product/stock/fiche-valo.php
similarity index 100%
rename from htdocs/product/stock/fiche-valo.php
rename to public/product/stock/fiche-valo.php
diff --git a/htdocs/product/stock/img/index.html b/public/product/stock/img/index.html
similarity index 100%
rename from htdocs/product/stock/img/index.html
rename to public/product/stock/img/index.html
diff --git a/htdocs/product/stock/img/no.png b/public/product/stock/img/no.png
similarity index 100%
rename from htdocs/product/stock/img/no.png
rename to public/product/stock/img/no.png
diff --git a/htdocs/product/stock/img/yes.png b/public/product/stock/img/yes.png
similarity index 100%
rename from htdocs/product/stock/img/yes.png
rename to public/product/stock/img/yes.png
diff --git a/htdocs/product/stock/index.php b/public/product/stock/index.php
similarity index 100%
rename from htdocs/product/stock/index.php
rename to public/product/stock/index.php
diff --git a/htdocs/product/stock/info.php b/public/product/stock/info.php
similarity index 100%
rename from htdocs/product/stock/info.php
rename to public/product/stock/info.php
diff --git a/htdocs/product/stock/lib/index.html b/public/product/stock/lib/index.html
similarity index 100%
rename from htdocs/product/stock/lib/index.html
rename to public/product/stock/lib/index.html
diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/public/product/stock/lib/replenishment.lib.php
similarity index 100%
rename from htdocs/product/stock/lib/replenishment.lib.php
rename to public/product/stock/lib/replenishment.lib.php
diff --git a/htdocs/product/stock/list.php b/public/product/stock/list.php
similarity index 100%
rename from htdocs/product/stock/list.php
rename to public/product/stock/list.php
diff --git a/htdocs/product/stock/massstockmove.php b/public/product/stock/massstockmove.php
similarity index 100%
rename from htdocs/product/stock/massstockmove.php
rename to public/product/stock/massstockmove.php
diff --git a/htdocs/product/stock/mouvement.php b/public/product/stock/mouvement.php
similarity index 100%
rename from htdocs/product/stock/mouvement.php
rename to public/product/stock/mouvement.php
diff --git a/htdocs/product/stock/product.php b/public/product/stock/product.php
similarity index 100%
rename from htdocs/product/stock/product.php
rename to public/product/stock/product.php
diff --git a/htdocs/product/stock/productlot_card.php b/public/product/stock/productlot_card.php
similarity index 100%
rename from htdocs/product/stock/productlot_card.php
rename to public/product/stock/productlot_card.php
diff --git a/htdocs/product/stock/productlot_list.php b/public/product/stock/productlot_list.php
similarity index 100%
rename from htdocs/product/stock/productlot_list.php
rename to public/product/stock/productlot_list.php
diff --git a/htdocs/product/stock/replenish.php b/public/product/stock/replenish.php
similarity index 100%
rename from htdocs/product/stock/replenish.php
rename to public/product/stock/replenish.php
diff --git a/htdocs/product/stock/replenishorders.php b/public/product/stock/replenishorders.php
similarity index 100%
rename from htdocs/product/stock/replenishorders.php
rename to public/product/stock/replenishorders.php
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/public/product/stock/tpl/stockcorrection.tpl.php
similarity index 100%
rename from htdocs/product/stock/tpl/stockcorrection.tpl.php
rename to public/product/stock/tpl/stockcorrection.tpl.php
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/public/product/stock/tpl/stocktransfer.tpl.php
similarity index 100%
rename from htdocs/product/stock/tpl/stocktransfer.tpl.php
rename to public/product/stock/tpl/stocktransfer.tpl.php
diff --git a/htdocs/product/stock/valo.php b/public/product/stock/valo.php
similarity index 100%
rename from htdocs/product/stock/valo.php
rename to public/product/stock/valo.php
diff --git a/htdocs/product/traduction.php b/public/product/traduction.php
similarity index 100%
rename from htdocs/product/traduction.php
rename to public/product/traduction.php
diff --git a/htdocs/projet/activity/index.php b/public/projet/activity/index.php
similarity index 100%
rename from htdocs/projet/activity/index.php
rename to public/projet/activity/index.php
diff --git a/htdocs/projet/activity/perday.php b/public/projet/activity/perday.php
similarity index 100%
rename from htdocs/projet/activity/perday.php
rename to public/projet/activity/perday.php
diff --git a/htdocs/projet/activity/perweek.php b/public/projet/activity/perweek.php
similarity index 100%
rename from htdocs/projet/activity/perweek.php
rename to public/projet/activity/perweek.php
diff --git a/htdocs/projet/admin/index.html b/public/projet/admin/index.html
similarity index 100%
rename from htdocs/projet/admin/index.html
rename to public/projet/admin/index.html
diff --git a/htdocs/projet/admin/project.php b/public/projet/admin/project.php
similarity index 100%
rename from htdocs/projet/admin/project.php
rename to public/projet/admin/project.php
diff --git a/htdocs/projet/admin/project_extrafields.php b/public/projet/admin/project_extrafields.php
similarity index 100%
rename from htdocs/projet/admin/project_extrafields.php
rename to public/projet/admin/project_extrafields.php
diff --git a/htdocs/projet/admin/project_task_extrafields.php b/public/projet/admin/project_task_extrafields.php
similarity index 100%
rename from htdocs/projet/admin/project_task_extrafields.php
rename to public/projet/admin/project_task_extrafields.php
diff --git a/htdocs/projet/ajax/projects.php b/public/projet/ajax/projects.php
similarity index 100%
rename from htdocs/projet/ajax/projects.php
rename to public/projet/ajax/projects.php
diff --git a/htdocs/projet/card.php b/public/projet/card.php
similarity index 100%
rename from htdocs/projet/card.php
rename to public/projet/card.php
diff --git a/htdocs/projet/class/api_projects.class.php b/public/projet/class/api_projects.class.php
similarity index 100%
rename from htdocs/projet/class/api_projects.class.php
rename to public/projet/class/api_projects.class.php
diff --git a/htdocs/projet/class/api_tasks.class.php b/public/projet/class/api_tasks.class.php
similarity index 100%
rename from htdocs/projet/class/api_tasks.class.php
rename to public/projet/class/api_tasks.class.php
diff --git a/htdocs/projet/class/index.html b/public/projet/class/index.html
similarity index 100%
rename from htdocs/projet/class/index.html
rename to public/projet/class/index.html
diff --git a/htdocs/projet/class/project.class.php b/public/projet/class/project.class.php
similarity index 100%
rename from htdocs/projet/class/project.class.php
rename to public/projet/class/project.class.php
diff --git a/htdocs/projet/class/projectstats.class.php b/public/projet/class/projectstats.class.php
similarity index 100%
rename from htdocs/projet/class/projectstats.class.php
rename to public/projet/class/projectstats.class.php
diff --git a/htdocs/projet/class/task.class.php b/public/projet/class/task.class.php
similarity index 100%
rename from htdocs/projet/class/task.class.php
rename to public/projet/class/task.class.php
diff --git a/htdocs/projet/contact.php b/public/projet/contact.php
similarity index 100%
rename from htdocs/projet/contact.php
rename to public/projet/contact.php
diff --git a/htdocs/projet/document.php b/public/projet/document.php
similarity index 100%
rename from htdocs/projet/document.php
rename to public/projet/document.php
diff --git a/htdocs/projet/element.php b/public/projet/element.php
similarity index 100%
rename from htdocs/projet/element.php
rename to public/projet/element.php
diff --git a/htdocs/projet/ganttchart.inc.php b/public/projet/ganttchart.inc.php
similarity index 100%
rename from htdocs/projet/ganttchart.inc.php
rename to public/projet/ganttchart.inc.php
diff --git a/htdocs/projet/ganttview.php b/public/projet/ganttview.php
similarity index 100%
rename from htdocs/projet/ganttview.php
rename to public/projet/ganttview.php
diff --git a/htdocs/projet/graph_opportunities.inc.php b/public/projet/graph_opportunities.inc.php
similarity index 100%
rename from htdocs/projet/graph_opportunities.inc.php
rename to public/projet/graph_opportunities.inc.php
diff --git a/htdocs/projet/index.php b/public/projet/index.php
similarity index 100%
rename from htdocs/projet/index.php
rename to public/projet/index.php
diff --git a/htdocs/projet/info.php b/public/projet/info.php
similarity index 100%
rename from htdocs/projet/info.php
rename to public/projet/info.php
diff --git a/htdocs/projet/jsgantt_language.js.php b/public/projet/jsgantt_language.js.php
similarity index 100%
rename from htdocs/projet/jsgantt_language.js.php
rename to public/projet/jsgantt_language.js.php
diff --git a/htdocs/projet/list.php b/public/projet/list.php
similarity index 100%
rename from htdocs/projet/list.php
rename to public/projet/list.php
diff --git a/htdocs/projet/note.php b/public/projet/note.php
similarity index 100%
rename from htdocs/projet/note.php
rename to public/projet/note.php
diff --git a/htdocs/projet/stats/index.php b/public/projet/stats/index.php
similarity index 100%
rename from htdocs/projet/stats/index.php
rename to public/projet/stats/index.php
diff --git a/htdocs/projet/tasks.php b/public/projet/tasks.php
similarity index 100%
rename from htdocs/projet/tasks.php
rename to public/projet/tasks.php
diff --git a/htdocs/projet/tasks/contact.php b/public/projet/tasks/contact.php
similarity index 100%
rename from htdocs/projet/tasks/contact.php
rename to public/projet/tasks/contact.php
diff --git a/htdocs/projet/tasks/document.php b/public/projet/tasks/document.php
similarity index 100%
rename from htdocs/projet/tasks/document.php
rename to public/projet/tasks/document.php
diff --git a/htdocs/projet/tasks/list.php b/public/projet/tasks/list.php
similarity index 100%
rename from htdocs/projet/tasks/list.php
rename to public/projet/tasks/list.php
diff --git a/htdocs/projet/tasks/note.php b/public/projet/tasks/note.php
similarity index 100%
rename from htdocs/projet/tasks/note.php
rename to public/projet/tasks/note.php
diff --git a/htdocs/projet/tasks/task.php b/public/projet/tasks/task.php
similarity index 100%
rename from htdocs/projet/tasks/task.php
rename to public/projet/tasks/task.php
diff --git a/htdocs/projet/tasks/time.php b/public/projet/tasks/time.php
similarity index 100%
rename from htdocs/projet/tasks/time.php
rename to public/projet/tasks/time.php
diff --git a/htdocs/public/agenda/agendaexport.php b/public/public/agenda/agendaexport.php
similarity index 100%
rename from htdocs/public/agenda/agendaexport.php
rename to public/public/agenda/agendaexport.php
diff --git a/htdocs/public/agenda/index.php b/public/public/agenda/index.php
similarity index 100%
rename from htdocs/public/agenda/index.php
rename to public/public/agenda/index.php
diff --git a/htdocs/public/cron/cron_run_jobs.php b/public/public/cron/cron_run_jobs.php
similarity index 100%
rename from htdocs/public/cron/cron_run_jobs.php
rename to public/public/cron/cron_run_jobs.php
diff --git a/htdocs/public/cron/index.html b/public/public/cron/index.html
similarity index 100%
rename from htdocs/public/cron/index.html
rename to public/public/cron/index.html
diff --git a/htdocs/public/demo/dolibarr_screenshot2.png b/public/public/demo/dolibarr_screenshot2.png
similarity index 100%
rename from htdocs/public/demo/dolibarr_screenshot2.png
rename to public/public/demo/dolibarr_screenshot2.png
diff --git a/htdocs/public/demo/dolibarr_screenshot6.png b/public/public/demo/dolibarr_screenshot6.png
similarity index 100%
rename from htdocs/public/demo/dolibarr_screenshot6.png
rename to public/public/demo/dolibarr_screenshot6.png
diff --git a/htdocs/public/demo/dolibarr_screenshot8.png b/public/public/demo/dolibarr_screenshot8.png
similarity index 100%
rename from htdocs/public/demo/dolibarr_screenshot8.png
rename to public/public/demo/dolibarr_screenshot8.png
diff --git a/htdocs/public/demo/dolibarr_screenshot9.png b/public/public/demo/dolibarr_screenshot9.png
similarity index 100%
rename from htdocs/public/demo/dolibarr_screenshot9.png
rename to public/public/demo/dolibarr_screenshot9.png
diff --git a/htdocs/public/demo/index.php b/public/public/demo/index.php
similarity index 100%
rename from htdocs/public/demo/index.php
rename to public/public/demo/index.php
diff --git a/htdocs/public/donations/donateurs_code.php b/public/public/donations/donateurs_code.php
similarity index 100%
rename from htdocs/public/donations/donateurs_code.php
rename to public/public/donations/donateurs_code.php
diff --git a/htdocs/public/donations/index.php b/public/public/donations/index.php
similarity index 100%
rename from htdocs/public/donations/index.php
rename to public/public/donations/index.php
diff --git a/htdocs/public/emailing/index.html b/public/public/emailing/index.html
similarity index 100%
rename from htdocs/public/emailing/index.html
rename to public/public/emailing/index.html
diff --git a/htdocs/public/emailing/mailing-read.php b/public/public/emailing/mailing-read.php
similarity index 100%
rename from htdocs/public/emailing/mailing-read.php
rename to public/public/emailing/mailing-read.php
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/public/public/emailing/mailing-unsubscribe.php
similarity index 100%
rename from htdocs/public/emailing/mailing-unsubscribe.php
rename to public/public/emailing/mailing-unsubscribe.php
diff --git a/htdocs/public/error-401.php b/public/public/error-401.php
similarity index 100%
rename from htdocs/public/error-401.php
rename to public/public/error-401.php
diff --git a/htdocs/public/error-404.php b/public/public/error-404.php
similarity index 100%
rename from htdocs/public/error-404.php
rename to public/public/error-404.php
diff --git a/htdocs/public/index.php b/public/public/index.php
similarity index 100%
rename from htdocs/public/index.php
rename to public/public/index.php
diff --git a/htdocs/public/members/index.php b/public/public/members/index.php
similarity index 100%
rename from htdocs/public/members/index.php
rename to public/public/members/index.php
diff --git a/htdocs/public/members/new.php b/public/public/members/new.php
similarity index 100%
rename from htdocs/public/members/new.php
rename to public/public/members/new.php
diff --git a/htdocs/public/members/public_card.php b/public/public/members/public_card.php
similarity index 100%
rename from htdocs/public/members/public_card.php
rename to public/public/members/public_card.php
diff --git a/htdocs/public/members/public_list.php b/public/public/members/public_list.php
similarity index 100%
rename from htdocs/public/members/public_list.php
rename to public/public/members/public_list.php
diff --git a/htdocs/public/notice.php b/public/public/notice.php
similarity index 100%
rename from htdocs/public/notice.php
rename to public/public/notice.php
diff --git a/htdocs/public/opensurvey/index.html b/public/public/opensurvey/index.html
similarity index 100%
rename from htdocs/public/opensurvey/index.html
rename to public/public/opensurvey/index.html
diff --git a/htdocs/public/opensurvey/studs.php b/public/public/opensurvey/studs.php
similarity index 100%
rename from htdocs/public/opensurvey/studs.php
rename to public/public/opensurvey/studs.php
diff --git a/htdocs/public/paybox/index.php b/public/public/paybox/index.php
similarity index 100%
rename from htdocs/public/paybox/index.php
rename to public/public/paybox/index.php
diff --git a/htdocs/public/paybox/newpayment.php b/public/public/paybox/newpayment.php
similarity index 100%
rename from htdocs/public/paybox/newpayment.php
rename to public/public/paybox/newpayment.php
diff --git a/htdocs/public/paybox/paymentko.php b/public/public/paybox/paymentko.php
similarity index 100%
rename from htdocs/public/paybox/paymentko.php
rename to public/public/paybox/paymentko.php
diff --git a/htdocs/public/paybox/paymentok.php b/public/public/paybox/paymentok.php
similarity index 100%
rename from htdocs/public/paybox/paymentok.php
rename to public/public/paybox/paymentok.php
diff --git a/htdocs/public/paypal/index.php b/public/public/paypal/index.php
similarity index 100%
rename from htdocs/public/paypal/index.php
rename to public/public/paypal/index.php
diff --git a/htdocs/public/paypal/newpayment.php b/public/public/paypal/newpayment.php
similarity index 100%
rename from htdocs/public/paypal/newpayment.php
rename to public/public/paypal/newpayment.php
diff --git a/htdocs/public/paypal/paymentko.php b/public/public/paypal/paymentko.php
similarity index 100%
rename from htdocs/public/paypal/paymentko.php
rename to public/public/paypal/paymentko.php
diff --git a/htdocs/public/paypal/paymentok.php b/public/public/paypal/paymentok.php
similarity index 100%
rename from htdocs/public/paypal/paymentok.php
rename to public/public/paypal/paymentok.php
diff --git a/htdocs/public/test/test_arrays.php b/public/public/test/test_arrays.php
similarity index 100%
rename from htdocs/public/test/test_arrays.php
rename to public/public/test/test_arrays.php
diff --git a/htdocs/public/test/test_forms.php b/public/public/test/test_forms.php
similarity index 100%
rename from htdocs/public/test/test_forms.php
rename to public/public/test/test_forms.php
diff --git a/htdocs/public/theme/common/index.php b/public/public/theme/common/index.php
similarity index 100%
rename from htdocs/public/theme/common/index.php
rename to public/public/theme/common/index.php
diff --git a/htdocs/public/theme/common/nophoto.png b/public/public/theme/common/nophoto.png
similarity index 100%
rename from htdocs/public/theme/common/nophoto.png
rename to public/public/theme/common/nophoto.png
diff --git a/htdocs/public/theme/common/user_anonymous.png b/public/public/theme/common/user_anonymous.png
similarity index 100%
rename from htdocs/public/theme/common/user_anonymous.png
rename to public/public/theme/common/user_anonymous.png
diff --git a/htdocs/public/theme/common/user_man.png b/public/public/theme/common/user_man.png
similarity index 100%
rename from htdocs/public/theme/common/user_man.png
rename to public/public/theme/common/user_man.png
diff --git a/htdocs/public/theme/common/user_woman.png b/public/public/theme/common/user_woman.png
similarity index 100%
rename from htdocs/public/theme/common/user_woman.png
rename to public/public/theme/common/user_woman.png
diff --git a/htdocs/public/theme/index.php b/public/public/theme/index.php
similarity index 100%
rename from htdocs/public/theme/index.php
rename to public/public/theme/index.php
diff --git a/htdocs/public/websites/index.php b/public/public/websites/index.php
similarity index 100%
rename from htdocs/public/websites/index.php
rename to public/public/websites/index.php
diff --git a/htdocs/public/websites/styles.css.php b/public/public/websites/styles.css.php
similarity index 100%
rename from htdocs/public/websites/styles.css.php
rename to public/public/websites/styles.css.php
diff --git a/htdocs/resource/add.php b/public/resource/add.php
similarity index 100%
rename from htdocs/resource/add.php
rename to public/resource/add.php
diff --git a/htdocs/resource/card.php b/public/resource/card.php
similarity index 100%
rename from htdocs/resource/card.php
rename to public/resource/card.php
diff --git a/htdocs/resource/class/dolresource.class.php b/public/resource/class/dolresource.class.php
similarity index 100%
rename from htdocs/resource/class/dolresource.class.php
rename to public/resource/class/dolresource.class.php
diff --git a/htdocs/resource/class/html.formresource.class.php b/public/resource/class/html.formresource.class.php
similarity index 100%
rename from htdocs/resource/class/html.formresource.class.php
rename to public/resource/class/html.formresource.class.php
diff --git a/htdocs/resource/class/index.html b/public/resource/class/index.html
similarity index 100%
rename from htdocs/resource/class/index.html
rename to public/resource/class/index.html
diff --git a/htdocs/resource/contact.php b/public/resource/contact.php
similarity index 100%
rename from htdocs/resource/contact.php
rename to public/resource/contact.php
diff --git a/htdocs/resource/document.php b/public/resource/document.php
similarity index 100%
rename from htdocs/resource/document.php
rename to public/resource/document.php
diff --git a/htdocs/resource/element_resource.php b/public/resource/element_resource.php
similarity index 100%
rename from htdocs/resource/element_resource.php
rename to public/resource/element_resource.php
diff --git a/htdocs/resource/index.html b/public/resource/index.html
similarity index 100%
rename from htdocs/resource/index.html
rename to public/resource/index.html
diff --git a/htdocs/resource/list.php b/public/resource/list.php
similarity index 100%
rename from htdocs/resource/list.php
rename to public/resource/list.php
diff --git a/htdocs/resource/note.php b/public/resource/note.php
similarity index 100%
rename from htdocs/resource/note.php
rename to public/resource/note.php
diff --git a/htdocs/robots.txt b/public/robots.txt
similarity index 100%
rename from htdocs/robots.txt
rename to public/robots.txt
diff --git a/htdocs/societe/admin/contact_extrafields.php b/public/societe/admin/contact_extrafields.php
similarity index 100%
rename from htdocs/societe/admin/contact_extrafields.php
rename to public/societe/admin/contact_extrafields.php
diff --git a/htdocs/societe/admin/societe.php b/public/societe/admin/societe.php
similarity index 100%
rename from htdocs/societe/admin/societe.php
rename to public/societe/admin/societe.php
diff --git a/htdocs/societe/admin/societe_extrafields.php b/public/societe/admin/societe_extrafields.php
similarity index 100%
rename from htdocs/societe/admin/societe_extrafields.php
rename to public/societe/admin/societe_extrafields.php
diff --git a/htdocs/societe/agenda.php b/public/societe/agenda.php
similarity index 100%
rename from htdocs/societe/agenda.php
rename to public/societe/agenda.php
diff --git a/htdocs/societe/ajax/company.php b/public/societe/ajax/company.php
similarity index 100%
rename from htdocs/societe/ajax/company.php
rename to public/societe/ajax/company.php
diff --git a/htdocs/societe/ajax/index.html b/public/societe/ajax/index.html
similarity index 100%
rename from htdocs/societe/ajax/index.html
rename to public/societe/ajax/index.html
diff --git a/htdocs/societe/ajaxcompanies.php b/public/societe/ajaxcompanies.php
similarity index 100%
rename from htdocs/societe/ajaxcompanies.php
rename to public/societe/ajaxcompanies.php
diff --git a/htdocs/societe/ajaxcountries.php b/public/societe/ajaxcountries.php
similarity index 100%
rename from htdocs/societe/ajaxcountries.php
rename to public/societe/ajaxcountries.php
diff --git a/htdocs/societe/canvas/README b/public/societe/canvas/README
similarity index 100%
rename from htdocs/societe/canvas/README
rename to public/societe/canvas/README
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/public/societe/canvas/actions_card_common.class.php
similarity index 100%
rename from htdocs/societe/canvas/actions_card_common.class.php
rename to public/societe/canvas/actions_card_common.class.php
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/public/societe/canvas/company/actions_card_company.class.php
similarity index 100%
rename from htdocs/societe/canvas/company/actions_card_company.class.php
rename to public/societe/canvas/company/actions_card_company.class.php
diff --git a/htdocs/societe/canvas/company/index.html b/public/societe/canvas/company/index.html
similarity index 100%
rename from htdocs/societe/canvas/company/index.html
rename to public/societe/canvas/company/index.html
diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/public/societe/canvas/company/tpl/card_create.tpl.php
similarity index 100%
rename from htdocs/societe/canvas/company/tpl/card_create.tpl.php
rename to public/societe/canvas/company/tpl/card_create.tpl.php
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/public/societe/canvas/company/tpl/card_edit.tpl.php
similarity index 100%
rename from htdocs/societe/canvas/company/tpl/card_edit.tpl.php
rename to public/societe/canvas/company/tpl/card_edit.tpl.php
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/public/societe/canvas/company/tpl/card_view.tpl.php
similarity index 100%
rename from htdocs/societe/canvas/company/tpl/card_view.tpl.php
rename to public/societe/canvas/company/tpl/card_view.tpl.php
diff --git a/htdocs/societe/canvas/company/tpl/index.html b/public/societe/canvas/company/tpl/index.html
similarity index 100%
rename from htdocs/societe/canvas/company/tpl/index.html
rename to public/societe/canvas/company/tpl/index.html
diff --git a/htdocs/societe/canvas/index.html b/public/societe/canvas/index.html
similarity index 100%
rename from htdocs/societe/canvas/index.html
rename to public/societe/canvas/index.html
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/public/societe/canvas/individual/actions_card_individual.class.php
similarity index 100%
rename from htdocs/societe/canvas/individual/actions_card_individual.class.php
rename to public/societe/canvas/individual/actions_card_individual.class.php
diff --git a/htdocs/societe/canvas/individual/index.html b/public/societe/canvas/individual/index.html
similarity index 100%
rename from htdocs/societe/canvas/individual/index.html
rename to public/societe/canvas/individual/index.html
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/public/societe/canvas/individual/tpl/card_create.tpl.php
similarity index 100%
rename from htdocs/societe/canvas/individual/tpl/card_create.tpl.php
rename to public/societe/canvas/individual/tpl/card_create.tpl.php
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/public/societe/canvas/individual/tpl/card_edit.tpl.php
similarity index 100%
rename from htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
rename to public/societe/canvas/individual/tpl/card_edit.tpl.php
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/public/societe/canvas/individual/tpl/card_view.tpl.php
similarity index 100%
rename from htdocs/societe/canvas/individual/tpl/card_view.tpl.php
rename to public/societe/canvas/individual/tpl/card_view.tpl.php
diff --git a/htdocs/societe/canvas/individual/tpl/index.html b/public/societe/canvas/individual/tpl/index.html
similarity index 100%
rename from htdocs/societe/canvas/individual/tpl/index.html
rename to public/societe/canvas/individual/tpl/index.html
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/public/societe/checkvat/checkVatPopup.php
similarity index 100%
rename from htdocs/societe/checkvat/checkVatPopup.php
rename to public/societe/checkvat/checkVatPopup.php
diff --git a/htdocs/societe/checkvat/checkVatService.xml b/public/societe/checkvat/checkVatService.xml
similarity index 100%
rename from htdocs/societe/checkvat/checkVatService.xml
rename to public/societe/checkvat/checkVatService.xml
diff --git a/htdocs/societe/checkvat/index.html b/public/societe/checkvat/index.html
similarity index 100%
rename from htdocs/societe/checkvat/index.html
rename to public/societe/checkvat/index.html
diff --git a/htdocs/societe/class/address.class.php b/public/societe/class/address.class.php
similarity index 100%
rename from htdocs/societe/class/address.class.php
rename to public/societe/class/address.class.php
diff --git a/htdocs/societe/class/api_contacts.class.php b/public/societe/class/api_contacts.class.php
similarity index 100%
rename from htdocs/societe/class/api_contacts.class.php
rename to public/societe/class/api_contacts.class.php
diff --git a/htdocs/societe/class/api_deprecated_contact.class.php b/public/societe/class/api_deprecated_contact.class.php
similarity index 100%
rename from htdocs/societe/class/api_deprecated_contact.class.php
rename to public/societe/class/api_deprecated_contact.class.php
diff --git a/htdocs/societe/class/api_deprecated_thirdparty.class.php b/public/societe/class/api_deprecated_thirdparty.class.php
similarity index 100%
rename from htdocs/societe/class/api_deprecated_thirdparty.class.php
rename to public/societe/class/api_deprecated_thirdparty.class.php
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/public/societe/class/api_thirdparties.class.php
similarity index 100%
rename from htdocs/societe/class/api_thirdparties.class.php
rename to public/societe/class/api_thirdparties.class.php
diff --git a/htdocs/societe/class/client.class.php b/public/societe/class/client.class.php
similarity index 100%
rename from htdocs/societe/class/client.class.php
rename to public/societe/class/client.class.php
diff --git a/htdocs/societe/class/companybankaccount.class.php b/public/societe/class/companybankaccount.class.php
similarity index 100%
rename from htdocs/societe/class/companybankaccount.class.php
rename to public/societe/class/companybankaccount.class.php
diff --git a/htdocs/societe/class/index.html b/public/societe/class/index.html
similarity index 100%
rename from htdocs/societe/class/index.html
rename to public/societe/class/index.html
diff --git a/htdocs/societe/class/societe.class.php b/public/societe/class/societe.class.php
similarity index 100%
rename from htdocs/societe/class/societe.class.php
rename to public/societe/class/societe.class.php
diff --git a/htdocs/societe/commerciaux.php b/public/societe/commerciaux.php
similarity index 100%
rename from htdocs/societe/commerciaux.php
rename to public/societe/commerciaux.php
diff --git a/htdocs/societe/consumption.php b/public/societe/consumption.php
similarity index 100%
rename from htdocs/societe/consumption.php
rename to public/societe/consumption.php
diff --git a/htdocs/societe/document.php b/public/societe/document.php
similarity index 100%
rename from htdocs/societe/document.php
rename to public/societe/document.php
diff --git a/htdocs/societe/index.php b/public/societe/index.php
similarity index 100%
rename from htdocs/societe/index.php
rename to public/societe/index.php
diff --git a/htdocs/societe/list.php b/public/societe/list.php
similarity index 100%
rename from htdocs/societe/list.php
rename to public/societe/list.php
diff --git a/htdocs/societe/note.php b/public/societe/note.php
similarity index 100%
rename from htdocs/societe/note.php
rename to public/societe/note.php
diff --git a/htdocs/societe/notify/card.php b/public/societe/notify/card.php
similarity index 100%
rename from htdocs/societe/notify/card.php
rename to public/societe/notify/card.php
diff --git a/htdocs/societe/notify/index.php b/public/societe/notify/index.php
similarity index 100%
rename from htdocs/societe/notify/index.php
rename to public/societe/notify/index.php
diff --git a/htdocs/societe/price.php b/public/societe/price.php
similarity index 100%
rename from htdocs/societe/price.php
rename to public/societe/price.php
diff --git a/htdocs/societe/project.php b/public/societe/project.php
similarity index 100%
rename from htdocs/societe/project.php
rename to public/societe/project.php
diff --git a/htdocs/societe/rib.php b/public/societe/rib.php
similarity index 100%
rename from htdocs/societe/rib.php
rename to public/societe/rib.php
diff --git a/htdocs/societe/soc.php b/public/societe/soc.php
similarity index 100%
rename from htdocs/societe/soc.php
rename to public/societe/soc.php
diff --git a/htdocs/societe/societecontact.php b/public/societe/societecontact.php
similarity index 100%
rename from htdocs/societe/societecontact.php
rename to public/societe/societecontact.php
diff --git a/htdocs/societe/tpl/index.html b/public/societe/tpl/index.html
similarity index 100%
rename from htdocs/societe/tpl/index.html
rename to public/societe/tpl/index.html
diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/public/societe/tpl/linesalesrepresentative.tpl.php
similarity index 100%
rename from htdocs/societe/tpl/linesalesrepresentative.tpl.php
rename to public/societe/tpl/linesalesrepresentative.tpl.php
diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/public/supplier_proposal/admin/supplier_proposal_extrafields.php
similarity index 100%
rename from htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
rename to public/supplier_proposal/admin/supplier_proposal_extrafields.php
diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/public/supplier_proposal/admin/supplier_proposaldet_extrafields.php
similarity index 100%
rename from htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
rename to public/supplier_proposal/admin/supplier_proposaldet_extrafields.php
diff --git a/htdocs/supplier_proposal/card.php b/public/supplier_proposal/card.php
similarity index 100%
rename from htdocs/supplier_proposal/card.php
rename to public/supplier_proposal/card.php
diff --git a/htdocs/supplier_proposal/class/index.html b/public/supplier_proposal/class/index.html
similarity index 100%
rename from htdocs/supplier_proposal/class/index.html
rename to public/supplier_proposal/class/index.html
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/public/supplier_proposal/class/supplier_proposal.class.php
similarity index 100%
rename from htdocs/supplier_proposal/class/supplier_proposal.class.php
rename to public/supplier_proposal/class/supplier_proposal.class.php
diff --git a/htdocs/supplier_proposal/document.php b/public/supplier_proposal/document.php
similarity index 100%
rename from htdocs/supplier_proposal/document.php
rename to public/supplier_proposal/document.php
diff --git a/htdocs/supplier_proposal/index.php b/public/supplier_proposal/index.php
similarity index 100%
rename from htdocs/supplier_proposal/index.php
rename to public/supplier_proposal/index.php
diff --git a/htdocs/supplier_proposal/info.php b/public/supplier_proposal/info.php
similarity index 100%
rename from htdocs/supplier_proposal/info.php
rename to public/supplier_proposal/info.php
diff --git a/htdocs/supplier_proposal/list.php b/public/supplier_proposal/list.php
similarity index 100%
rename from htdocs/supplier_proposal/list.php
rename to public/supplier_proposal/list.php
diff --git a/htdocs/supplier_proposal/note.php b/public/supplier_proposal/note.php
similarity index 100%
rename from htdocs/supplier_proposal/note.php
rename to public/supplier_proposal/note.php
diff --git a/htdocs/supplier_proposal/tpl/index.html b/public/supplier_proposal/tpl/index.html
similarity index 100%
rename from htdocs/supplier_proposal/tpl/index.html
rename to public/supplier_proposal/tpl/index.html
diff --git a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php b/public/supplier_proposal/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
rename to public/supplier_proposal/tpl/linkedobjectblock.tpl.php
diff --git a/htdocs/support/background.png b/public/support/background.png
similarity index 100%
rename from htdocs/support/background.png
rename to public/support/background.png
diff --git a/htdocs/support/default.css b/public/support/default.css
similarity index 100%
rename from htdocs/support/default.css
rename to public/support/default.css
diff --git a/htdocs/support/helpcenter.png b/public/support/helpcenter.png
similarity index 100%
rename from htdocs/support/helpcenter.png
rename to public/support/helpcenter.png
diff --git a/htdocs/support/inc.php b/public/support/inc.php
similarity index 100%
rename from htdocs/support/inc.php
rename to public/support/inc.php
diff --git a/htdocs/support/index.php b/public/support/index.php
similarity index 100%
rename from htdocs/support/index.php
rename to public/support/index.php
diff --git a/htdocs/support/internet.png b/public/support/internet.png
similarity index 100%
rename from htdocs/support/internet.png
rename to public/support/internet.png
diff --git a/htdocs/support/mail.png b/public/support/mail.png
similarity index 100%
rename from htdocs/support/mail.png
rename to public/support/mail.png
diff --git a/htdocs/support/online.php b/public/support/online.php
similarity index 100%
rename from htdocs/support/online.php
rename to public/support/online.php
diff --git a/htdocs/support/pagemaster.png b/public/support/pagemaster.png
similarity index 100%
rename from htdocs/support/pagemaster.png
rename to public/support/pagemaster.png
diff --git a/htdocs/support/redstar.png b/public/support/redstar.png
similarity index 100%
rename from htdocs/support/redstar.png
rename to public/support/redstar.png
diff --git a/htdocs/support/star.png b/public/support/star.png
similarity index 100%
rename from htdocs/support/star.png
rename to public/support/star.png
diff --git a/htdocs/support/who.png b/public/support/who.png
similarity index 100%
rename from htdocs/support/who.png
rename to public/support/who.png
diff --git a/htdocs/theme/.gitignore b/public/theme/.gitignore
similarity index 100%
rename from htdocs/theme/.gitignore
rename to public/theme/.gitignore
diff --git a/htdocs/theme/common/colorpicker.png b/public/theme/common/colorpicker.png
similarity index 100%
rename from htdocs/theme/common/colorpicker.png
rename to public/theme/common/colorpicker.png
diff --git a/htdocs/theme/common/devices/audio-card.png b/public/theme/common/devices/audio-card.png
similarity index 100%
rename from htdocs/theme/common/devices/audio-card.png
rename to public/theme/common/devices/audio-card.png
diff --git a/htdocs/theme/common/devices/audio-headset.png b/public/theme/common/devices/audio-headset.png
similarity index 100%
rename from htdocs/theme/common/devices/audio-headset.png
rename to public/theme/common/devices/audio-headset.png
diff --git a/htdocs/theme/common/devices/audio-input-line.png b/public/theme/common/devices/audio-input-line.png
similarity index 100%
rename from htdocs/theme/common/devices/audio-input-line.png
rename to public/theme/common/devices/audio-input-line.png
diff --git a/htdocs/theme/common/devices/audio-input-microphone.png b/public/theme/common/devices/audio-input-microphone.png
similarity index 100%
rename from htdocs/theme/common/devices/audio-input-microphone.png
rename to public/theme/common/devices/audio-input-microphone.png
diff --git a/htdocs/theme/common/devices/battery.png b/public/theme/common/devices/battery.png
similarity index 100%
rename from htdocs/theme/common/devices/battery.png
rename to public/theme/common/devices/battery.png
diff --git a/htdocs/theme/common/devices/camera-photo.png b/public/theme/common/devices/camera-photo.png
similarity index 100%
rename from htdocs/theme/common/devices/camera-photo.png
rename to public/theme/common/devices/camera-photo.png
diff --git a/htdocs/theme/common/devices/camera-web.png b/public/theme/common/devices/camera-web.png
similarity index 100%
rename from htdocs/theme/common/devices/camera-web.png
rename to public/theme/common/devices/camera-web.png
diff --git a/htdocs/theme/common/devices/computer-laptop.png b/public/theme/common/devices/computer-laptop.png
similarity index 100%
rename from htdocs/theme/common/devices/computer-laptop.png
rename to public/theme/common/devices/computer-laptop.png
diff --git a/htdocs/theme/common/devices/computer.png b/public/theme/common/devices/computer.png
similarity index 100%
rename from htdocs/theme/common/devices/computer.png
rename to public/theme/common/devices/computer.png
diff --git a/htdocs/theme/common/devices/cpu.png b/public/theme/common/devices/cpu.png
similarity index 100%
rename from htdocs/theme/common/devices/cpu.png
rename to public/theme/common/devices/cpu.png
diff --git a/htdocs/theme/common/devices/drive-harddisk.png b/public/theme/common/devices/drive-harddisk.png
similarity index 100%
rename from htdocs/theme/common/devices/drive-harddisk.png
rename to public/theme/common/devices/drive-harddisk.png
diff --git a/htdocs/theme/common/devices/drive-optical.png b/public/theme/common/devices/drive-optical.png
similarity index 100%
rename from htdocs/theme/common/devices/drive-optical.png
rename to public/theme/common/devices/drive-optical.png
diff --git a/htdocs/theme/common/devices/drive-removable-media-usb-pendrive.png b/public/theme/common/devices/drive-removable-media-usb-pendrive.png
similarity index 100%
rename from htdocs/theme/common/devices/drive-removable-media-usb-pendrive.png
rename to public/theme/common/devices/drive-removable-media-usb-pendrive.png
diff --git a/htdocs/theme/common/devices/drive-removable-media-usb.png b/public/theme/common/devices/drive-removable-media-usb.png
similarity index 100%
rename from htdocs/theme/common/devices/drive-removable-media-usb.png
rename to public/theme/common/devices/drive-removable-media-usb.png
diff --git a/htdocs/theme/common/devices/drive-removable-media.png b/public/theme/common/devices/drive-removable-media.png
similarity index 100%
rename from htdocs/theme/common/devices/drive-removable-media.png
rename to public/theme/common/devices/drive-removable-media.png
diff --git a/htdocs/theme/common/devices/index.html b/public/theme/common/devices/index.html
similarity index 100%
rename from htdocs/theme/common/devices/index.html
rename to public/theme/common/devices/index.html
diff --git a/htdocs/theme/common/devices/input-gaming.png b/public/theme/common/devices/input-gaming.png
similarity index 100%
rename from htdocs/theme/common/devices/input-gaming.png
rename to public/theme/common/devices/input-gaming.png
diff --git a/htdocs/theme/common/devices/input-keyboard.png b/public/theme/common/devices/input-keyboard.png
similarity index 100%
rename from htdocs/theme/common/devices/input-keyboard.png
rename to public/theme/common/devices/input-keyboard.png
diff --git a/htdocs/theme/common/devices/input-mouse.png b/public/theme/common/devices/input-mouse.png
similarity index 100%
rename from htdocs/theme/common/devices/input-mouse.png
rename to public/theme/common/devices/input-mouse.png
diff --git a/htdocs/theme/common/devices/input-tablet.png b/public/theme/common/devices/input-tablet.png
similarity index 100%
rename from htdocs/theme/common/devices/input-tablet.png
rename to public/theme/common/devices/input-tablet.png
diff --git a/htdocs/theme/common/devices/media-flash-memory-stick.png b/public/theme/common/devices/media-flash-memory-stick.png
similarity index 100%
rename from htdocs/theme/common/devices/media-flash-memory-stick.png
rename to public/theme/common/devices/media-flash-memory-stick.png
diff --git a/htdocs/theme/common/devices/media-flash-sd-mmc.png b/public/theme/common/devices/media-flash-sd-mmc.png
similarity index 100%
rename from htdocs/theme/common/devices/media-flash-sd-mmc.png
rename to public/theme/common/devices/media-flash-sd-mmc.png
diff --git a/htdocs/theme/common/devices/media-flash-smart-media.png b/public/theme/common/devices/media-flash-smart-media.png
similarity index 100%
rename from htdocs/theme/common/devices/media-flash-smart-media.png
rename to public/theme/common/devices/media-flash-smart-media.png
diff --git a/htdocs/theme/common/devices/media-flash.png b/public/theme/common/devices/media-flash.png
similarity index 100%
rename from htdocs/theme/common/devices/media-flash.png
rename to public/theme/common/devices/media-flash.png
diff --git a/htdocs/theme/common/devices/media-floppy.png b/public/theme/common/devices/media-floppy.png
similarity index 100%
rename from htdocs/theme/common/devices/media-floppy.png
rename to public/theme/common/devices/media-floppy.png
diff --git a/htdocs/theme/common/devices/media-optical-audio.png b/public/theme/common/devices/media-optical-audio.png
similarity index 100%
rename from htdocs/theme/common/devices/media-optical-audio.png
rename to public/theme/common/devices/media-optical-audio.png
diff --git a/htdocs/theme/common/devices/media-optical-blu-ray.png b/public/theme/common/devices/media-optical-blu-ray.png
similarity index 100%
rename from htdocs/theme/common/devices/media-optical-blu-ray.png
rename to public/theme/common/devices/media-optical-blu-ray.png
diff --git a/htdocs/theme/common/devices/media-optical-data.png b/public/theme/common/devices/media-optical-data.png
similarity index 100%
rename from htdocs/theme/common/devices/media-optical-data.png
rename to public/theme/common/devices/media-optical-data.png
diff --git a/htdocs/theme/common/devices/media-optical-dvd-video.png b/public/theme/common/devices/media-optical-dvd-video.png
similarity index 100%
rename from htdocs/theme/common/devices/media-optical-dvd-video.png
rename to public/theme/common/devices/media-optical-dvd-video.png
diff --git a/htdocs/theme/common/devices/media-optical-dvd.png b/public/theme/common/devices/media-optical-dvd.png
similarity index 100%
rename from htdocs/theme/common/devices/media-optical-dvd.png
rename to public/theme/common/devices/media-optical-dvd.png
diff --git a/htdocs/theme/common/devices/media-optical-mixed-cd.png b/public/theme/common/devices/media-optical-mixed-cd.png
similarity index 100%
rename from htdocs/theme/common/devices/media-optical-mixed-cd.png
rename to public/theme/common/devices/media-optical-mixed-cd.png
diff --git a/htdocs/theme/common/devices/media-optical-recordable.png b/public/theme/common/devices/media-optical-recordable.png
similarity index 100%
rename from htdocs/theme/common/devices/media-optical-recordable.png
rename to public/theme/common/devices/media-optical-recordable.png
diff --git a/htdocs/theme/common/devices/media-optical-video.png b/public/theme/common/devices/media-optical-video.png
similarity index 100%
rename from htdocs/theme/common/devices/media-optical-video.png
rename to public/theme/common/devices/media-optical-video.png
diff --git a/htdocs/theme/common/devices/media-optical.png b/public/theme/common/devices/media-optical.png
similarity index 100%
rename from htdocs/theme/common/devices/media-optical.png
rename to public/theme/common/devices/media-optical.png
diff --git a/htdocs/theme/common/devices/media-tape.png b/public/theme/common/devices/media-tape.png
similarity index 100%
rename from htdocs/theme/common/devices/media-tape.png
rename to public/theme/common/devices/media-tape.png
diff --git a/htdocs/theme/common/devices/modem.png b/public/theme/common/devices/modem.png
similarity index 100%
rename from htdocs/theme/common/devices/modem.png
rename to public/theme/common/devices/modem.png
diff --git a/htdocs/theme/common/devices/multimedia-player-apple-ipod.png b/public/theme/common/devices/multimedia-player-apple-ipod.png
similarity index 100%
rename from htdocs/theme/common/devices/multimedia-player-apple-ipod.png
rename to public/theme/common/devices/multimedia-player-apple-ipod.png
diff --git a/htdocs/theme/common/devices/multimedia-player.png b/public/theme/common/devices/multimedia-player.png
similarity index 100%
rename from htdocs/theme/common/devices/multimedia-player.png
rename to public/theme/common/devices/multimedia-player.png
diff --git a/htdocs/theme/common/devices/network-wired.png b/public/theme/common/devices/network-wired.png
similarity index 100%
rename from htdocs/theme/common/devices/network-wired.png
rename to public/theme/common/devices/network-wired.png
diff --git a/htdocs/theme/common/devices/network-wireless-connected-00.png b/public/theme/common/devices/network-wireless-connected-00.png
similarity index 100%
rename from htdocs/theme/common/devices/network-wireless-connected-00.png
rename to public/theme/common/devices/network-wireless-connected-00.png
diff --git a/htdocs/theme/common/devices/network-wireless-connected-100.png b/public/theme/common/devices/network-wireless-connected-100.png
similarity index 100%
rename from htdocs/theme/common/devices/network-wireless-connected-100.png
rename to public/theme/common/devices/network-wireless-connected-100.png
diff --git a/htdocs/theme/common/devices/network-wireless-connected-25.png b/public/theme/common/devices/network-wireless-connected-25.png
similarity index 100%
rename from htdocs/theme/common/devices/network-wireless-connected-25.png
rename to public/theme/common/devices/network-wireless-connected-25.png
diff --git a/htdocs/theme/common/devices/network-wireless-connected-50.png b/public/theme/common/devices/network-wireless-connected-50.png
similarity index 100%
rename from htdocs/theme/common/devices/network-wireless-connected-50.png
rename to public/theme/common/devices/network-wireless-connected-50.png
diff --git a/htdocs/theme/common/devices/network-wireless-connected-75.png b/public/theme/common/devices/network-wireless-connected-75.png
similarity index 100%
rename from htdocs/theme/common/devices/network-wireless-connected-75.png
rename to public/theme/common/devices/network-wireless-connected-75.png
diff --git a/htdocs/theme/common/devices/network-wireless-disconnected.png b/public/theme/common/devices/network-wireless-disconnected.png
similarity index 100%
rename from htdocs/theme/common/devices/network-wireless-disconnected.png
rename to public/theme/common/devices/network-wireless-disconnected.png
diff --git a/htdocs/theme/common/devices/network-wireless.png b/public/theme/common/devices/network-wireless.png
similarity index 100%
rename from htdocs/theme/common/devices/network-wireless.png
rename to public/theme/common/devices/network-wireless.png
diff --git a/htdocs/theme/common/devices/pda.png b/public/theme/common/devices/pda.png
similarity index 100%
rename from htdocs/theme/common/devices/pda.png
rename to public/theme/common/devices/pda.png
diff --git a/htdocs/theme/common/devices/phone-openmoko-freerunner.png b/public/theme/common/devices/phone-openmoko-freerunner.png
similarity index 100%
rename from htdocs/theme/common/devices/phone-openmoko-freerunner.png
rename to public/theme/common/devices/phone-openmoko-freerunner.png
diff --git a/htdocs/theme/common/devices/phone.png b/public/theme/common/devices/phone.png
similarity index 100%
rename from htdocs/theme/common/devices/phone.png
rename to public/theme/common/devices/phone.png
diff --git a/htdocs/theme/common/devices/printer-laser.png b/public/theme/common/devices/printer-laser.png
similarity index 100%
rename from htdocs/theme/common/devices/printer-laser.png
rename to public/theme/common/devices/printer-laser.png
diff --git a/htdocs/theme/common/devices/printer.png b/public/theme/common/devices/printer.png
similarity index 100%
rename from htdocs/theme/common/devices/printer.png
rename to public/theme/common/devices/printer.png
diff --git a/htdocs/theme/common/devices/scanner.png b/public/theme/common/devices/scanner.png
similarity index 100%
rename from htdocs/theme/common/devices/scanner.png
rename to public/theme/common/devices/scanner.png
diff --git a/htdocs/theme/common/devices/video-display.png b/public/theme/common/devices/video-display.png
similarity index 100%
rename from htdocs/theme/common/devices/video-display.png
rename to public/theme/common/devices/video-display.png
diff --git a/htdocs/theme/common/devices/video-projector.png b/public/theme/common/devices/video-projector.png
similarity index 100%
rename from htdocs/theme/common/devices/video-projector.png
rename to public/theme/common/devices/video-projector.png
diff --git a/htdocs/theme/common/devices/video-television.png b/public/theme/common/devices/video-television.png
similarity index 100%
rename from htdocs/theme/common/devices/video-television.png
rename to public/theme/common/devices/video-television.png
diff --git a/htdocs/theme/common/dolibarr_box.png b/public/theme/common/dolibarr_box.png
similarity index 100%
rename from htdocs/theme/common/dolibarr_box.png
rename to public/theme/common/dolibarr_box.png
diff --git a/htdocs/theme/common/dolibarr_logo_bw.png b/public/theme/common/dolibarr_logo_bw.png
similarity index 100%
rename from htdocs/theme/common/dolibarr_logo_bw.png
rename to public/theme/common/dolibarr_logo_bw.png
diff --git a/htdocs/theme/common/dolistore.jpg b/public/theme/common/dolistore.jpg
similarity index 100%
rename from htdocs/theme/common/dolistore.jpg
rename to public/theme/common/dolistore.jpg
diff --git a/htdocs/theme/common/emotes/face-angel.png b/public/theme/common/emotes/face-angel.png
similarity index 100%
rename from htdocs/theme/common/emotes/face-angel.png
rename to public/theme/common/emotes/face-angel.png
diff --git a/htdocs/theme/common/emotes/face-embarrassed.png b/public/theme/common/emotes/face-embarrassed.png
similarity index 100%
rename from htdocs/theme/common/emotes/face-embarrassed.png
rename to public/theme/common/emotes/face-embarrassed.png
diff --git a/htdocs/theme/common/emotes/face-kiss.png b/public/theme/common/emotes/face-kiss.png
similarity index 100%
rename from htdocs/theme/common/emotes/face-kiss.png
rename to public/theme/common/emotes/face-kiss.png
diff --git a/htdocs/theme/common/emotes/face-laugh.png b/public/theme/common/emotes/face-laugh.png
similarity index 100%
rename from htdocs/theme/common/emotes/face-laugh.png
rename to public/theme/common/emotes/face-laugh.png
diff --git a/htdocs/theme/common/emotes/face-plain.png b/public/theme/common/emotes/face-plain.png
similarity index 100%
rename from htdocs/theme/common/emotes/face-plain.png
rename to public/theme/common/emotes/face-plain.png
diff --git a/htdocs/theme/common/emotes/face-raspberry.png b/public/theme/common/emotes/face-raspberry.png
similarity index 100%
rename from htdocs/theme/common/emotes/face-raspberry.png
rename to public/theme/common/emotes/face-raspberry.png
diff --git a/htdocs/theme/common/emotes/face-sad.png b/public/theme/common/emotes/face-sad.png
similarity index 100%
rename from htdocs/theme/common/emotes/face-sad.png
rename to public/theme/common/emotes/face-sad.png
diff --git a/htdocs/theme/common/emotes/face-smile-big.png b/public/theme/common/emotes/face-smile-big.png
similarity index 100%
rename from htdocs/theme/common/emotes/face-smile-big.png
rename to public/theme/common/emotes/face-smile-big.png
diff --git a/htdocs/theme/common/emotes/face-smile.png b/public/theme/common/emotes/face-smile.png
similarity index 100%
rename from htdocs/theme/common/emotes/face-smile.png
rename to public/theme/common/emotes/face-smile.png
diff --git a/htdocs/theme/common/emotes/face-surprise.png b/public/theme/common/emotes/face-surprise.png
similarity index 100%
rename from htdocs/theme/common/emotes/face-surprise.png
rename to public/theme/common/emotes/face-surprise.png
diff --git a/htdocs/theme/common/emotes/face-uncertain.png b/public/theme/common/emotes/face-uncertain.png
similarity index 100%
rename from htdocs/theme/common/emotes/face-uncertain.png
rename to public/theme/common/emotes/face-uncertain.png
diff --git a/htdocs/theme/common/emotes/face-wink.png b/public/theme/common/emotes/face-wink.png
similarity index 100%
rename from htdocs/theme/common/emotes/face-wink.png
rename to public/theme/common/emotes/face-wink.png
diff --git a/htdocs/theme/common/emotes/index.html b/public/theme/common/emotes/index.html
similarity index 100%
rename from htdocs/theme/common/emotes/index.html
rename to public/theme/common/emotes/index.html
diff --git a/htdocs/theme/common/flags/ad.png b/public/theme/common/flags/ad.png
similarity index 100%
rename from htdocs/theme/common/flags/ad.png
rename to public/theme/common/flags/ad.png
diff --git a/htdocs/theme/common/flags/ae.png b/public/theme/common/flags/ae.png
similarity index 100%
rename from htdocs/theme/common/flags/ae.png
rename to public/theme/common/flags/ae.png
diff --git a/htdocs/theme/common/flags/af.png b/public/theme/common/flags/af.png
similarity index 100%
rename from htdocs/theme/common/flags/af.png
rename to public/theme/common/flags/af.png
diff --git a/htdocs/theme/common/flags/ag.png b/public/theme/common/flags/ag.png
similarity index 100%
rename from htdocs/theme/common/flags/ag.png
rename to public/theme/common/flags/ag.png
diff --git a/htdocs/theme/common/flags/ai.png b/public/theme/common/flags/ai.png
similarity index 100%
rename from htdocs/theme/common/flags/ai.png
rename to public/theme/common/flags/ai.png
diff --git a/htdocs/theme/common/flags/al.png b/public/theme/common/flags/al.png
similarity index 100%
rename from htdocs/theme/common/flags/al.png
rename to public/theme/common/flags/al.png
diff --git a/htdocs/theme/common/flags/am.png b/public/theme/common/flags/am.png
similarity index 100%
rename from htdocs/theme/common/flags/am.png
rename to public/theme/common/flags/am.png
diff --git a/htdocs/theme/common/flags/an.png b/public/theme/common/flags/an.png
similarity index 100%
rename from htdocs/theme/common/flags/an.png
rename to public/theme/common/flags/an.png
diff --git a/htdocs/theme/common/flags/ao.png b/public/theme/common/flags/ao.png
similarity index 100%
rename from htdocs/theme/common/flags/ao.png
rename to public/theme/common/flags/ao.png
diff --git a/htdocs/theme/common/flags/ar.png b/public/theme/common/flags/ar.png
similarity index 100%
rename from htdocs/theme/common/flags/ar.png
rename to public/theme/common/flags/ar.png
diff --git a/htdocs/theme/common/flags/as.png b/public/theme/common/flags/as.png
similarity index 100%
rename from htdocs/theme/common/flags/as.png
rename to public/theme/common/flags/as.png
diff --git a/htdocs/theme/common/flags/at.png b/public/theme/common/flags/at.png
similarity index 100%
rename from htdocs/theme/common/flags/at.png
rename to public/theme/common/flags/at.png
diff --git a/htdocs/theme/common/flags/au.png b/public/theme/common/flags/au.png
similarity index 100%
rename from htdocs/theme/common/flags/au.png
rename to public/theme/common/flags/au.png
diff --git a/htdocs/theme/common/flags/aw.png b/public/theme/common/flags/aw.png
similarity index 100%
rename from htdocs/theme/common/flags/aw.png
rename to public/theme/common/flags/aw.png
diff --git a/htdocs/theme/common/flags/ax.png b/public/theme/common/flags/ax.png
similarity index 100%
rename from htdocs/theme/common/flags/ax.png
rename to public/theme/common/flags/ax.png
diff --git a/htdocs/theme/common/flags/az.png b/public/theme/common/flags/az.png
similarity index 100%
rename from htdocs/theme/common/flags/az.png
rename to public/theme/common/flags/az.png
diff --git a/htdocs/theme/common/flags/ba.png b/public/theme/common/flags/ba.png
similarity index 100%
rename from htdocs/theme/common/flags/ba.png
rename to public/theme/common/flags/ba.png
diff --git a/htdocs/theme/common/flags/bb.png b/public/theme/common/flags/bb.png
similarity index 100%
rename from htdocs/theme/common/flags/bb.png
rename to public/theme/common/flags/bb.png
diff --git a/htdocs/theme/common/flags/bd.png b/public/theme/common/flags/bd.png
similarity index 100%
rename from htdocs/theme/common/flags/bd.png
rename to public/theme/common/flags/bd.png
diff --git a/htdocs/theme/common/flags/be.png b/public/theme/common/flags/be.png
similarity index 100%
rename from htdocs/theme/common/flags/be.png
rename to public/theme/common/flags/be.png
diff --git a/htdocs/theme/common/flags/bf.png b/public/theme/common/flags/bf.png
similarity index 100%
rename from htdocs/theme/common/flags/bf.png
rename to public/theme/common/flags/bf.png
diff --git a/htdocs/theme/common/flags/bg.png b/public/theme/common/flags/bg.png
similarity index 100%
rename from htdocs/theme/common/flags/bg.png
rename to public/theme/common/flags/bg.png
diff --git a/htdocs/theme/common/flags/bh.png b/public/theme/common/flags/bh.png
similarity index 100%
rename from htdocs/theme/common/flags/bh.png
rename to public/theme/common/flags/bh.png
diff --git a/htdocs/theme/common/flags/bi.png b/public/theme/common/flags/bi.png
similarity index 100%
rename from htdocs/theme/common/flags/bi.png
rename to public/theme/common/flags/bi.png
diff --git a/htdocs/theme/common/flags/bj.png b/public/theme/common/flags/bj.png
similarity index 100%
rename from htdocs/theme/common/flags/bj.png
rename to public/theme/common/flags/bj.png
diff --git a/htdocs/theme/common/flags/bm.png b/public/theme/common/flags/bm.png
similarity index 100%
rename from htdocs/theme/common/flags/bm.png
rename to public/theme/common/flags/bm.png
diff --git a/htdocs/theme/common/flags/bn.png b/public/theme/common/flags/bn.png
similarity index 100%
rename from htdocs/theme/common/flags/bn.png
rename to public/theme/common/flags/bn.png
diff --git a/htdocs/theme/common/flags/bo.png b/public/theme/common/flags/bo.png
similarity index 100%
rename from htdocs/theme/common/flags/bo.png
rename to public/theme/common/flags/bo.png
diff --git a/htdocs/theme/common/flags/br.png b/public/theme/common/flags/br.png
similarity index 100%
rename from htdocs/theme/common/flags/br.png
rename to public/theme/common/flags/br.png
diff --git a/htdocs/theme/common/flags/bs.png b/public/theme/common/flags/bs.png
similarity index 100%
rename from htdocs/theme/common/flags/bs.png
rename to public/theme/common/flags/bs.png
diff --git a/htdocs/theme/common/flags/bt.png b/public/theme/common/flags/bt.png
similarity index 100%
rename from htdocs/theme/common/flags/bt.png
rename to public/theme/common/flags/bt.png
diff --git a/htdocs/theme/common/flags/bv.png b/public/theme/common/flags/bv.png
similarity index 100%
rename from htdocs/theme/common/flags/bv.png
rename to public/theme/common/flags/bv.png
diff --git a/htdocs/theme/common/flags/bw.png b/public/theme/common/flags/bw.png
similarity index 100%
rename from htdocs/theme/common/flags/bw.png
rename to public/theme/common/flags/bw.png
diff --git a/htdocs/theme/common/flags/by.png b/public/theme/common/flags/by.png
similarity index 100%
rename from htdocs/theme/common/flags/by.png
rename to public/theme/common/flags/by.png
diff --git a/htdocs/theme/common/flags/bz.png b/public/theme/common/flags/bz.png
similarity index 100%
rename from htdocs/theme/common/flags/bz.png
rename to public/theme/common/flags/bz.png
diff --git a/htdocs/theme/common/flags/ca.png b/public/theme/common/flags/ca.png
similarity index 100%
rename from htdocs/theme/common/flags/ca.png
rename to public/theme/common/flags/ca.png
diff --git a/htdocs/theme/common/flags/catalonia.png b/public/theme/common/flags/catalonia.png
similarity index 100%
rename from htdocs/theme/common/flags/catalonia.png
rename to public/theme/common/flags/catalonia.png
diff --git a/htdocs/theme/common/flags/cc.png b/public/theme/common/flags/cc.png
similarity index 100%
rename from htdocs/theme/common/flags/cc.png
rename to public/theme/common/flags/cc.png
diff --git a/htdocs/theme/common/flags/cd.png b/public/theme/common/flags/cd.png
similarity index 100%
rename from htdocs/theme/common/flags/cd.png
rename to public/theme/common/flags/cd.png
diff --git a/htdocs/theme/common/flags/cf.png b/public/theme/common/flags/cf.png
similarity index 100%
rename from htdocs/theme/common/flags/cf.png
rename to public/theme/common/flags/cf.png
diff --git a/htdocs/theme/common/flags/cg.png b/public/theme/common/flags/cg.png
similarity index 100%
rename from htdocs/theme/common/flags/cg.png
rename to public/theme/common/flags/cg.png
diff --git a/htdocs/theme/common/flags/ch.png b/public/theme/common/flags/ch.png
similarity index 100%
rename from htdocs/theme/common/flags/ch.png
rename to public/theme/common/flags/ch.png
diff --git a/htdocs/theme/common/flags/ci.png b/public/theme/common/flags/ci.png
similarity index 100%
rename from htdocs/theme/common/flags/ci.png
rename to public/theme/common/flags/ci.png
diff --git a/htdocs/theme/common/flags/ck.png b/public/theme/common/flags/ck.png
similarity index 100%
rename from htdocs/theme/common/flags/ck.png
rename to public/theme/common/flags/ck.png
diff --git a/htdocs/theme/common/flags/cl.png b/public/theme/common/flags/cl.png
similarity index 100%
rename from htdocs/theme/common/flags/cl.png
rename to public/theme/common/flags/cl.png
diff --git a/htdocs/theme/common/flags/cm.png b/public/theme/common/flags/cm.png
similarity index 100%
rename from htdocs/theme/common/flags/cm.png
rename to public/theme/common/flags/cm.png
diff --git a/htdocs/theme/common/flags/cn.png b/public/theme/common/flags/cn.png
similarity index 100%
rename from htdocs/theme/common/flags/cn.png
rename to public/theme/common/flags/cn.png
diff --git a/htdocs/theme/common/flags/co.png b/public/theme/common/flags/co.png
similarity index 100%
rename from htdocs/theme/common/flags/co.png
rename to public/theme/common/flags/co.png
diff --git a/htdocs/theme/common/flags/cr.png b/public/theme/common/flags/cr.png
similarity index 100%
rename from htdocs/theme/common/flags/cr.png
rename to public/theme/common/flags/cr.png
diff --git a/htdocs/theme/common/flags/cs.png b/public/theme/common/flags/cs.png
similarity index 100%
rename from htdocs/theme/common/flags/cs.png
rename to public/theme/common/flags/cs.png
diff --git a/htdocs/theme/common/flags/cu.png b/public/theme/common/flags/cu.png
similarity index 100%
rename from htdocs/theme/common/flags/cu.png
rename to public/theme/common/flags/cu.png
diff --git a/htdocs/theme/common/flags/cv.png b/public/theme/common/flags/cv.png
similarity index 100%
rename from htdocs/theme/common/flags/cv.png
rename to public/theme/common/flags/cv.png
diff --git a/htdocs/theme/common/flags/cx.png b/public/theme/common/flags/cx.png
similarity index 100%
rename from htdocs/theme/common/flags/cx.png
rename to public/theme/common/flags/cx.png
diff --git a/htdocs/theme/common/flags/cy.png b/public/theme/common/flags/cy.png
similarity index 100%
rename from htdocs/theme/common/flags/cy.png
rename to public/theme/common/flags/cy.png
diff --git a/htdocs/theme/common/flags/cz.png b/public/theme/common/flags/cz.png
similarity index 100%
rename from htdocs/theme/common/flags/cz.png
rename to public/theme/common/flags/cz.png
diff --git a/htdocs/theme/common/flags/de.png b/public/theme/common/flags/de.png
similarity index 100%
rename from htdocs/theme/common/flags/de.png
rename to public/theme/common/flags/de.png
diff --git a/htdocs/theme/common/flags/dj.png b/public/theme/common/flags/dj.png
similarity index 100%
rename from htdocs/theme/common/flags/dj.png
rename to public/theme/common/flags/dj.png
diff --git a/htdocs/theme/common/flags/dk.png b/public/theme/common/flags/dk.png
similarity index 100%
rename from htdocs/theme/common/flags/dk.png
rename to public/theme/common/flags/dk.png
diff --git a/htdocs/theme/common/flags/dm.png b/public/theme/common/flags/dm.png
similarity index 100%
rename from htdocs/theme/common/flags/dm.png
rename to public/theme/common/flags/dm.png
diff --git a/htdocs/theme/common/flags/do.png b/public/theme/common/flags/do.png
similarity index 100%
rename from htdocs/theme/common/flags/do.png
rename to public/theme/common/flags/do.png
diff --git a/htdocs/theme/common/flags/dz.png b/public/theme/common/flags/dz.png
similarity index 100%
rename from htdocs/theme/common/flags/dz.png
rename to public/theme/common/flags/dz.png
diff --git a/htdocs/theme/common/flags/ec.png b/public/theme/common/flags/ec.png
similarity index 100%
rename from htdocs/theme/common/flags/ec.png
rename to public/theme/common/flags/ec.png
diff --git a/htdocs/theme/common/flags/ee.png b/public/theme/common/flags/ee.png
similarity index 100%
rename from htdocs/theme/common/flags/ee.png
rename to public/theme/common/flags/ee.png
diff --git a/htdocs/theme/common/flags/eg.png b/public/theme/common/flags/eg.png
similarity index 100%
rename from htdocs/theme/common/flags/eg.png
rename to public/theme/common/flags/eg.png
diff --git a/htdocs/theme/common/flags/eh.png b/public/theme/common/flags/eh.png
similarity index 100%
rename from htdocs/theme/common/flags/eh.png
rename to public/theme/common/flags/eh.png
diff --git a/htdocs/theme/common/flags/en.png b/public/theme/common/flags/en.png
similarity index 100%
rename from htdocs/theme/common/flags/en.png
rename to public/theme/common/flags/en.png
diff --git a/htdocs/theme/common/flags/england.png b/public/theme/common/flags/england.png
similarity index 100%
rename from htdocs/theme/common/flags/england.png
rename to public/theme/common/flags/england.png
diff --git a/htdocs/theme/common/flags/er.png b/public/theme/common/flags/er.png
similarity index 100%
rename from htdocs/theme/common/flags/er.png
rename to public/theme/common/flags/er.png
diff --git a/htdocs/theme/common/flags/es.png b/public/theme/common/flags/es.png
similarity index 100%
rename from htdocs/theme/common/flags/es.png
rename to public/theme/common/flags/es.png
diff --git a/htdocs/theme/common/flags/et.png b/public/theme/common/flags/et.png
similarity index 100%
rename from htdocs/theme/common/flags/et.png
rename to public/theme/common/flags/et.png
diff --git a/htdocs/theme/common/flags/eu.png b/public/theme/common/flags/eu.png
similarity index 100%
rename from htdocs/theme/common/flags/eu.png
rename to public/theme/common/flags/eu.png
diff --git a/htdocs/theme/common/flags/fam.png b/public/theme/common/flags/fam.png
similarity index 100%
rename from htdocs/theme/common/flags/fam.png
rename to public/theme/common/flags/fam.png
diff --git a/htdocs/theme/common/flags/fi.png b/public/theme/common/flags/fi.png
similarity index 100%
rename from htdocs/theme/common/flags/fi.png
rename to public/theme/common/flags/fi.png
diff --git a/htdocs/theme/common/flags/fj.png b/public/theme/common/flags/fj.png
similarity index 100%
rename from htdocs/theme/common/flags/fj.png
rename to public/theme/common/flags/fj.png
diff --git a/htdocs/theme/common/flags/fk.png b/public/theme/common/flags/fk.png
similarity index 100%
rename from htdocs/theme/common/flags/fk.png
rename to public/theme/common/flags/fk.png
diff --git a/htdocs/theme/common/flags/fm.png b/public/theme/common/flags/fm.png
similarity index 100%
rename from htdocs/theme/common/flags/fm.png
rename to public/theme/common/flags/fm.png
diff --git a/htdocs/theme/common/flags/fo.png b/public/theme/common/flags/fo.png
similarity index 100%
rename from htdocs/theme/common/flags/fo.png
rename to public/theme/common/flags/fo.png
diff --git a/htdocs/theme/common/flags/fr.png b/public/theme/common/flags/fr.png
similarity index 100%
rename from htdocs/theme/common/flags/fr.png
rename to public/theme/common/flags/fr.png
diff --git a/htdocs/theme/common/flags/ga.png b/public/theme/common/flags/ga.png
similarity index 100%
rename from htdocs/theme/common/flags/ga.png
rename to public/theme/common/flags/ga.png
diff --git a/htdocs/theme/common/flags/gb.png b/public/theme/common/flags/gb.png
similarity index 100%
rename from htdocs/theme/common/flags/gb.png
rename to public/theme/common/flags/gb.png
diff --git a/htdocs/theme/common/flags/gd.png b/public/theme/common/flags/gd.png
similarity index 100%
rename from htdocs/theme/common/flags/gd.png
rename to public/theme/common/flags/gd.png
diff --git a/htdocs/theme/common/flags/ge.png b/public/theme/common/flags/ge.png
similarity index 100%
rename from htdocs/theme/common/flags/ge.png
rename to public/theme/common/flags/ge.png
diff --git a/htdocs/theme/common/flags/gf.png b/public/theme/common/flags/gf.png
similarity index 100%
rename from htdocs/theme/common/flags/gf.png
rename to public/theme/common/flags/gf.png
diff --git a/htdocs/theme/common/flags/gg.png b/public/theme/common/flags/gg.png
similarity index 100%
rename from htdocs/theme/common/flags/gg.png
rename to public/theme/common/flags/gg.png
diff --git a/htdocs/theme/common/flags/gh.png b/public/theme/common/flags/gh.png
similarity index 100%
rename from htdocs/theme/common/flags/gh.png
rename to public/theme/common/flags/gh.png
diff --git a/htdocs/theme/common/flags/gi.png b/public/theme/common/flags/gi.png
similarity index 100%
rename from htdocs/theme/common/flags/gi.png
rename to public/theme/common/flags/gi.png
diff --git a/htdocs/theme/common/flags/gl.png b/public/theme/common/flags/gl.png
similarity index 100%
rename from htdocs/theme/common/flags/gl.png
rename to public/theme/common/flags/gl.png
diff --git a/htdocs/theme/common/flags/gm.png b/public/theme/common/flags/gm.png
similarity index 100%
rename from htdocs/theme/common/flags/gm.png
rename to public/theme/common/flags/gm.png
diff --git a/htdocs/theme/common/flags/gn.png b/public/theme/common/flags/gn.png
similarity index 100%
rename from htdocs/theme/common/flags/gn.png
rename to public/theme/common/flags/gn.png
diff --git a/htdocs/theme/common/flags/gp.png b/public/theme/common/flags/gp.png
similarity index 100%
rename from htdocs/theme/common/flags/gp.png
rename to public/theme/common/flags/gp.png
diff --git a/htdocs/theme/common/flags/gq.png b/public/theme/common/flags/gq.png
similarity index 100%
rename from htdocs/theme/common/flags/gq.png
rename to public/theme/common/flags/gq.png
diff --git a/htdocs/theme/common/flags/gr.png b/public/theme/common/flags/gr.png
similarity index 100%
rename from htdocs/theme/common/flags/gr.png
rename to public/theme/common/flags/gr.png
diff --git a/htdocs/theme/common/flags/gs.png b/public/theme/common/flags/gs.png
similarity index 100%
rename from htdocs/theme/common/flags/gs.png
rename to public/theme/common/flags/gs.png
diff --git a/htdocs/theme/common/flags/gt.png b/public/theme/common/flags/gt.png
similarity index 100%
rename from htdocs/theme/common/flags/gt.png
rename to public/theme/common/flags/gt.png
diff --git a/htdocs/theme/common/flags/gu.png b/public/theme/common/flags/gu.png
similarity index 100%
rename from htdocs/theme/common/flags/gu.png
rename to public/theme/common/flags/gu.png
diff --git a/htdocs/theme/common/flags/gw.png b/public/theme/common/flags/gw.png
similarity index 100%
rename from htdocs/theme/common/flags/gw.png
rename to public/theme/common/flags/gw.png
diff --git a/htdocs/theme/common/flags/gy.png b/public/theme/common/flags/gy.png
similarity index 100%
rename from htdocs/theme/common/flags/gy.png
rename to public/theme/common/flags/gy.png
diff --git a/htdocs/theme/common/flags/hk.png b/public/theme/common/flags/hk.png
similarity index 100%
rename from htdocs/theme/common/flags/hk.png
rename to public/theme/common/flags/hk.png
diff --git a/htdocs/theme/common/flags/hm.png b/public/theme/common/flags/hm.png
similarity index 100%
rename from htdocs/theme/common/flags/hm.png
rename to public/theme/common/flags/hm.png
diff --git a/htdocs/theme/common/flags/hn.png b/public/theme/common/flags/hn.png
similarity index 100%
rename from htdocs/theme/common/flags/hn.png
rename to public/theme/common/flags/hn.png
diff --git a/htdocs/theme/common/flags/hr.png b/public/theme/common/flags/hr.png
similarity index 100%
rename from htdocs/theme/common/flags/hr.png
rename to public/theme/common/flags/hr.png
diff --git a/htdocs/theme/common/flags/ht.png b/public/theme/common/flags/ht.png
similarity index 100%
rename from htdocs/theme/common/flags/ht.png
rename to public/theme/common/flags/ht.png
diff --git a/htdocs/theme/common/flags/hu.png b/public/theme/common/flags/hu.png
similarity index 100%
rename from htdocs/theme/common/flags/hu.png
rename to public/theme/common/flags/hu.png
diff --git a/htdocs/theme/common/flags/id.png b/public/theme/common/flags/id.png
similarity index 100%
rename from htdocs/theme/common/flags/id.png
rename to public/theme/common/flags/id.png
diff --git a/htdocs/theme/common/flags/ie.png b/public/theme/common/flags/ie.png
similarity index 100%
rename from htdocs/theme/common/flags/ie.png
rename to public/theme/common/flags/ie.png
diff --git a/htdocs/theme/common/flags/il.png b/public/theme/common/flags/il.png
similarity index 100%
rename from htdocs/theme/common/flags/il.png
rename to public/theme/common/flags/il.png
diff --git a/htdocs/theme/common/flags/in.png b/public/theme/common/flags/in.png
similarity index 100%
rename from htdocs/theme/common/flags/in.png
rename to public/theme/common/flags/in.png
diff --git a/htdocs/theme/common/flags/index.html b/public/theme/common/flags/index.html
similarity index 100%
rename from htdocs/theme/common/flags/index.html
rename to public/theme/common/flags/index.html
diff --git a/htdocs/theme/common/flags/int.png b/public/theme/common/flags/int.png
similarity index 100%
rename from htdocs/theme/common/flags/int.png
rename to public/theme/common/flags/int.png
diff --git a/htdocs/theme/common/flags/io.png b/public/theme/common/flags/io.png
similarity index 100%
rename from htdocs/theme/common/flags/io.png
rename to public/theme/common/flags/io.png
diff --git a/htdocs/theme/common/flags/iq.png b/public/theme/common/flags/iq.png
similarity index 100%
rename from htdocs/theme/common/flags/iq.png
rename to public/theme/common/flags/iq.png
diff --git a/htdocs/theme/common/flags/ir.png b/public/theme/common/flags/ir.png
similarity index 100%
rename from htdocs/theme/common/flags/ir.png
rename to public/theme/common/flags/ir.png
diff --git a/htdocs/theme/common/flags/is.png b/public/theme/common/flags/is.png
similarity index 100%
rename from htdocs/theme/common/flags/is.png
rename to public/theme/common/flags/is.png
diff --git a/htdocs/theme/common/flags/it.png b/public/theme/common/flags/it.png
similarity index 100%
rename from htdocs/theme/common/flags/it.png
rename to public/theme/common/flags/it.png
diff --git a/htdocs/theme/common/flags/jm.png b/public/theme/common/flags/jm.png
similarity index 100%
rename from htdocs/theme/common/flags/jm.png
rename to public/theme/common/flags/jm.png
diff --git a/htdocs/theme/common/flags/jo.png b/public/theme/common/flags/jo.png
similarity index 100%
rename from htdocs/theme/common/flags/jo.png
rename to public/theme/common/flags/jo.png
diff --git a/htdocs/theme/common/flags/jp.png b/public/theme/common/flags/jp.png
similarity index 100%
rename from htdocs/theme/common/flags/jp.png
rename to public/theme/common/flags/jp.png
diff --git a/htdocs/theme/common/flags/ke.png b/public/theme/common/flags/ke.png
similarity index 100%
rename from htdocs/theme/common/flags/ke.png
rename to public/theme/common/flags/ke.png
diff --git a/htdocs/theme/common/flags/kg.png b/public/theme/common/flags/kg.png
similarity index 100%
rename from htdocs/theme/common/flags/kg.png
rename to public/theme/common/flags/kg.png
diff --git a/htdocs/theme/common/flags/kh.png b/public/theme/common/flags/kh.png
similarity index 100%
rename from htdocs/theme/common/flags/kh.png
rename to public/theme/common/flags/kh.png
diff --git a/htdocs/theme/common/flags/ki.png b/public/theme/common/flags/ki.png
similarity index 100%
rename from htdocs/theme/common/flags/ki.png
rename to public/theme/common/flags/ki.png
diff --git a/htdocs/theme/common/flags/km.png b/public/theme/common/flags/km.png
similarity index 100%
rename from htdocs/theme/common/flags/km.png
rename to public/theme/common/flags/km.png
diff --git a/htdocs/theme/common/flags/kn.png b/public/theme/common/flags/kn.png
similarity index 100%
rename from htdocs/theme/common/flags/kn.png
rename to public/theme/common/flags/kn.png
diff --git a/htdocs/theme/common/flags/kp.png b/public/theme/common/flags/kp.png
similarity index 100%
rename from htdocs/theme/common/flags/kp.png
rename to public/theme/common/flags/kp.png
diff --git a/htdocs/theme/common/flags/kr.png b/public/theme/common/flags/kr.png
similarity index 100%
rename from htdocs/theme/common/flags/kr.png
rename to public/theme/common/flags/kr.png
diff --git a/htdocs/theme/common/flags/kw.png b/public/theme/common/flags/kw.png
similarity index 100%
rename from htdocs/theme/common/flags/kw.png
rename to public/theme/common/flags/kw.png
diff --git a/htdocs/theme/common/flags/ky.png b/public/theme/common/flags/ky.png
similarity index 100%
rename from htdocs/theme/common/flags/ky.png
rename to public/theme/common/flags/ky.png
diff --git a/htdocs/theme/common/flags/kz.png b/public/theme/common/flags/kz.png
similarity index 100%
rename from htdocs/theme/common/flags/kz.png
rename to public/theme/common/flags/kz.png
diff --git a/htdocs/theme/common/flags/la.png b/public/theme/common/flags/la.png
similarity index 100%
rename from htdocs/theme/common/flags/la.png
rename to public/theme/common/flags/la.png
diff --git a/htdocs/theme/common/flags/lb.png b/public/theme/common/flags/lb.png
similarity index 100%
rename from htdocs/theme/common/flags/lb.png
rename to public/theme/common/flags/lb.png
diff --git a/htdocs/theme/common/flags/lc.png b/public/theme/common/flags/lc.png
similarity index 100%
rename from htdocs/theme/common/flags/lc.png
rename to public/theme/common/flags/lc.png
diff --git a/htdocs/theme/common/flags/li.png b/public/theme/common/flags/li.png
similarity index 100%
rename from htdocs/theme/common/flags/li.png
rename to public/theme/common/flags/li.png
diff --git a/htdocs/theme/common/flags/lk.png b/public/theme/common/flags/lk.png
similarity index 100%
rename from htdocs/theme/common/flags/lk.png
rename to public/theme/common/flags/lk.png
diff --git a/htdocs/theme/common/flags/lr.png b/public/theme/common/flags/lr.png
similarity index 100%
rename from htdocs/theme/common/flags/lr.png
rename to public/theme/common/flags/lr.png
diff --git a/htdocs/theme/common/flags/ls.png b/public/theme/common/flags/ls.png
similarity index 100%
rename from htdocs/theme/common/flags/ls.png
rename to public/theme/common/flags/ls.png
diff --git a/htdocs/theme/common/flags/lt.png b/public/theme/common/flags/lt.png
similarity index 100%
rename from htdocs/theme/common/flags/lt.png
rename to public/theme/common/flags/lt.png
diff --git a/htdocs/theme/common/flags/lu.png b/public/theme/common/flags/lu.png
similarity index 100%
rename from htdocs/theme/common/flags/lu.png
rename to public/theme/common/flags/lu.png
diff --git a/htdocs/theme/common/flags/lv.png b/public/theme/common/flags/lv.png
similarity index 100%
rename from htdocs/theme/common/flags/lv.png
rename to public/theme/common/flags/lv.png
diff --git a/htdocs/theme/common/flags/ly.png b/public/theme/common/flags/ly.png
similarity index 100%
rename from htdocs/theme/common/flags/ly.png
rename to public/theme/common/flags/ly.png
diff --git a/htdocs/theme/common/flags/ma.png b/public/theme/common/flags/ma.png
similarity index 100%
rename from htdocs/theme/common/flags/ma.png
rename to public/theme/common/flags/ma.png
diff --git a/htdocs/theme/common/flags/mc.png b/public/theme/common/flags/mc.png
similarity index 100%
rename from htdocs/theme/common/flags/mc.png
rename to public/theme/common/flags/mc.png
diff --git a/htdocs/theme/common/flags/md.png b/public/theme/common/flags/md.png
similarity index 100%
rename from htdocs/theme/common/flags/md.png
rename to public/theme/common/flags/md.png
diff --git a/htdocs/theme/common/flags/me.png b/public/theme/common/flags/me.png
similarity index 100%
rename from htdocs/theme/common/flags/me.png
rename to public/theme/common/flags/me.png
diff --git a/htdocs/theme/common/flags/mg.png b/public/theme/common/flags/mg.png
similarity index 100%
rename from htdocs/theme/common/flags/mg.png
rename to public/theme/common/flags/mg.png
diff --git a/htdocs/theme/common/flags/mh.png b/public/theme/common/flags/mh.png
similarity index 100%
rename from htdocs/theme/common/flags/mh.png
rename to public/theme/common/flags/mh.png
diff --git a/htdocs/theme/common/flags/mk.png b/public/theme/common/flags/mk.png
similarity index 100%
rename from htdocs/theme/common/flags/mk.png
rename to public/theme/common/flags/mk.png
diff --git a/htdocs/theme/common/flags/ml.png b/public/theme/common/flags/ml.png
similarity index 100%
rename from htdocs/theme/common/flags/ml.png
rename to public/theme/common/flags/ml.png
diff --git a/htdocs/theme/common/flags/mm.png b/public/theme/common/flags/mm.png
similarity index 100%
rename from htdocs/theme/common/flags/mm.png
rename to public/theme/common/flags/mm.png
diff --git a/htdocs/theme/common/flags/mn.png b/public/theme/common/flags/mn.png
similarity index 100%
rename from htdocs/theme/common/flags/mn.png
rename to public/theme/common/flags/mn.png
diff --git a/htdocs/theme/common/flags/mo.png b/public/theme/common/flags/mo.png
similarity index 100%
rename from htdocs/theme/common/flags/mo.png
rename to public/theme/common/flags/mo.png
diff --git a/htdocs/theme/common/flags/mp.png b/public/theme/common/flags/mp.png
similarity index 100%
rename from htdocs/theme/common/flags/mp.png
rename to public/theme/common/flags/mp.png
diff --git a/htdocs/theme/common/flags/mq.png b/public/theme/common/flags/mq.png
similarity index 100%
rename from htdocs/theme/common/flags/mq.png
rename to public/theme/common/flags/mq.png
diff --git a/htdocs/theme/common/flags/mr.png b/public/theme/common/flags/mr.png
similarity index 100%
rename from htdocs/theme/common/flags/mr.png
rename to public/theme/common/flags/mr.png
diff --git a/htdocs/theme/common/flags/ms.png b/public/theme/common/flags/ms.png
similarity index 100%
rename from htdocs/theme/common/flags/ms.png
rename to public/theme/common/flags/ms.png
diff --git a/htdocs/theme/common/flags/mt.png b/public/theme/common/flags/mt.png
similarity index 100%
rename from htdocs/theme/common/flags/mt.png
rename to public/theme/common/flags/mt.png
diff --git a/htdocs/theme/common/flags/mu.png b/public/theme/common/flags/mu.png
similarity index 100%
rename from htdocs/theme/common/flags/mu.png
rename to public/theme/common/flags/mu.png
diff --git a/htdocs/theme/common/flags/mv.png b/public/theme/common/flags/mv.png
similarity index 100%
rename from htdocs/theme/common/flags/mv.png
rename to public/theme/common/flags/mv.png
diff --git a/htdocs/theme/common/flags/mw.png b/public/theme/common/flags/mw.png
similarity index 100%
rename from htdocs/theme/common/flags/mw.png
rename to public/theme/common/flags/mw.png
diff --git a/htdocs/theme/common/flags/mx.png b/public/theme/common/flags/mx.png
similarity index 100%
rename from htdocs/theme/common/flags/mx.png
rename to public/theme/common/flags/mx.png
diff --git a/htdocs/theme/common/flags/my.png b/public/theme/common/flags/my.png
similarity index 100%
rename from htdocs/theme/common/flags/my.png
rename to public/theme/common/flags/my.png
diff --git a/htdocs/theme/common/flags/mz.png b/public/theme/common/flags/mz.png
similarity index 100%
rename from htdocs/theme/common/flags/mz.png
rename to public/theme/common/flags/mz.png
diff --git a/htdocs/theme/common/flags/na.png b/public/theme/common/flags/na.png
similarity index 100%
rename from htdocs/theme/common/flags/na.png
rename to public/theme/common/flags/na.png
diff --git a/htdocs/theme/common/flags/nc.png b/public/theme/common/flags/nc.png
similarity index 100%
rename from htdocs/theme/common/flags/nc.png
rename to public/theme/common/flags/nc.png
diff --git a/htdocs/theme/common/flags/ne.png b/public/theme/common/flags/ne.png
similarity index 100%
rename from htdocs/theme/common/flags/ne.png
rename to public/theme/common/flags/ne.png
diff --git a/htdocs/theme/common/flags/nf.png b/public/theme/common/flags/nf.png
similarity index 100%
rename from htdocs/theme/common/flags/nf.png
rename to public/theme/common/flags/nf.png
diff --git a/htdocs/theme/common/flags/ng.png b/public/theme/common/flags/ng.png
similarity index 100%
rename from htdocs/theme/common/flags/ng.png
rename to public/theme/common/flags/ng.png
diff --git a/htdocs/theme/common/flags/ni.png b/public/theme/common/flags/ni.png
similarity index 100%
rename from htdocs/theme/common/flags/ni.png
rename to public/theme/common/flags/ni.png
diff --git a/htdocs/theme/common/flags/nl.png b/public/theme/common/flags/nl.png
similarity index 100%
rename from htdocs/theme/common/flags/nl.png
rename to public/theme/common/flags/nl.png
diff --git a/htdocs/theme/common/flags/no.png b/public/theme/common/flags/no.png
similarity index 100%
rename from htdocs/theme/common/flags/no.png
rename to public/theme/common/flags/no.png
diff --git a/htdocs/theme/common/flags/np.png b/public/theme/common/flags/np.png
similarity index 100%
rename from htdocs/theme/common/flags/np.png
rename to public/theme/common/flags/np.png
diff --git a/htdocs/theme/common/flags/nr.png b/public/theme/common/flags/nr.png
similarity index 100%
rename from htdocs/theme/common/flags/nr.png
rename to public/theme/common/flags/nr.png
diff --git a/htdocs/theme/common/flags/nu.png b/public/theme/common/flags/nu.png
similarity index 100%
rename from htdocs/theme/common/flags/nu.png
rename to public/theme/common/flags/nu.png
diff --git a/htdocs/theme/common/flags/nz.png b/public/theme/common/flags/nz.png
similarity index 100%
rename from htdocs/theme/common/flags/nz.png
rename to public/theme/common/flags/nz.png
diff --git a/htdocs/theme/common/flags/om.png b/public/theme/common/flags/om.png
similarity index 100%
rename from htdocs/theme/common/flags/om.png
rename to public/theme/common/flags/om.png
diff --git a/htdocs/theme/common/flags/pa.png b/public/theme/common/flags/pa.png
similarity index 100%
rename from htdocs/theme/common/flags/pa.png
rename to public/theme/common/flags/pa.png
diff --git a/htdocs/theme/common/flags/pe.png b/public/theme/common/flags/pe.png
similarity index 100%
rename from htdocs/theme/common/flags/pe.png
rename to public/theme/common/flags/pe.png
diff --git a/htdocs/theme/common/flags/pf.png b/public/theme/common/flags/pf.png
similarity index 100%
rename from htdocs/theme/common/flags/pf.png
rename to public/theme/common/flags/pf.png
diff --git a/htdocs/theme/common/flags/pg.png b/public/theme/common/flags/pg.png
similarity index 100%
rename from htdocs/theme/common/flags/pg.png
rename to public/theme/common/flags/pg.png
diff --git a/htdocs/theme/common/flags/ph.png b/public/theme/common/flags/ph.png
similarity index 100%
rename from htdocs/theme/common/flags/ph.png
rename to public/theme/common/flags/ph.png
diff --git a/htdocs/theme/common/flags/pk.png b/public/theme/common/flags/pk.png
similarity index 100%
rename from htdocs/theme/common/flags/pk.png
rename to public/theme/common/flags/pk.png
diff --git a/htdocs/theme/common/flags/pl.png b/public/theme/common/flags/pl.png
similarity index 100%
rename from htdocs/theme/common/flags/pl.png
rename to public/theme/common/flags/pl.png
diff --git a/htdocs/theme/common/flags/pm.png b/public/theme/common/flags/pm.png
similarity index 100%
rename from htdocs/theme/common/flags/pm.png
rename to public/theme/common/flags/pm.png
diff --git a/htdocs/theme/common/flags/pn.png b/public/theme/common/flags/pn.png
similarity index 100%
rename from htdocs/theme/common/flags/pn.png
rename to public/theme/common/flags/pn.png
diff --git a/htdocs/theme/common/flags/pr.png b/public/theme/common/flags/pr.png
similarity index 100%
rename from htdocs/theme/common/flags/pr.png
rename to public/theme/common/flags/pr.png
diff --git a/htdocs/theme/common/flags/ps.png b/public/theme/common/flags/ps.png
similarity index 100%
rename from htdocs/theme/common/flags/ps.png
rename to public/theme/common/flags/ps.png
diff --git a/htdocs/theme/common/flags/pt.png b/public/theme/common/flags/pt.png
similarity index 100%
rename from htdocs/theme/common/flags/pt.png
rename to public/theme/common/flags/pt.png
diff --git a/htdocs/theme/common/flags/pw.png b/public/theme/common/flags/pw.png
similarity index 100%
rename from htdocs/theme/common/flags/pw.png
rename to public/theme/common/flags/pw.png
diff --git a/htdocs/theme/common/flags/py.png b/public/theme/common/flags/py.png
similarity index 100%
rename from htdocs/theme/common/flags/py.png
rename to public/theme/common/flags/py.png
diff --git a/htdocs/theme/common/flags/qa.png b/public/theme/common/flags/qa.png
similarity index 100%
rename from htdocs/theme/common/flags/qa.png
rename to public/theme/common/flags/qa.png
diff --git a/htdocs/theme/common/flags/re.png b/public/theme/common/flags/re.png
similarity index 100%
rename from htdocs/theme/common/flags/re.png
rename to public/theme/common/flags/re.png
diff --git a/htdocs/theme/common/flags/ro.png b/public/theme/common/flags/ro.png
similarity index 100%
rename from htdocs/theme/common/flags/ro.png
rename to public/theme/common/flags/ro.png
diff --git a/htdocs/theme/common/flags/rs.png b/public/theme/common/flags/rs.png
similarity index 100%
rename from htdocs/theme/common/flags/rs.png
rename to public/theme/common/flags/rs.png
diff --git a/htdocs/theme/common/flags/ru.png b/public/theme/common/flags/ru.png
similarity index 100%
rename from htdocs/theme/common/flags/ru.png
rename to public/theme/common/flags/ru.png
diff --git a/htdocs/theme/common/flags/rw.png b/public/theme/common/flags/rw.png
similarity index 100%
rename from htdocs/theme/common/flags/rw.png
rename to public/theme/common/flags/rw.png
diff --git a/htdocs/theme/common/flags/sa.png b/public/theme/common/flags/sa.png
similarity index 100%
rename from htdocs/theme/common/flags/sa.png
rename to public/theme/common/flags/sa.png
diff --git a/htdocs/theme/common/flags/sb.png b/public/theme/common/flags/sb.png
similarity index 100%
rename from htdocs/theme/common/flags/sb.png
rename to public/theme/common/flags/sb.png
diff --git a/htdocs/theme/common/flags/sc.png b/public/theme/common/flags/sc.png
similarity index 100%
rename from htdocs/theme/common/flags/sc.png
rename to public/theme/common/flags/sc.png
diff --git a/htdocs/theme/common/flags/scotland.png b/public/theme/common/flags/scotland.png
similarity index 100%
rename from htdocs/theme/common/flags/scotland.png
rename to public/theme/common/flags/scotland.png
diff --git a/htdocs/theme/common/flags/sd.png b/public/theme/common/flags/sd.png
similarity index 100%
rename from htdocs/theme/common/flags/sd.png
rename to public/theme/common/flags/sd.png
diff --git a/htdocs/theme/common/flags/se.png b/public/theme/common/flags/se.png
similarity index 100%
rename from htdocs/theme/common/flags/se.png
rename to public/theme/common/flags/se.png
diff --git a/htdocs/theme/common/flags/sg.png b/public/theme/common/flags/sg.png
similarity index 100%
rename from htdocs/theme/common/flags/sg.png
rename to public/theme/common/flags/sg.png
diff --git a/htdocs/theme/common/flags/sh.png b/public/theme/common/flags/sh.png
similarity index 100%
rename from htdocs/theme/common/flags/sh.png
rename to public/theme/common/flags/sh.png
diff --git a/htdocs/theme/common/flags/si.png b/public/theme/common/flags/si.png
similarity index 100%
rename from htdocs/theme/common/flags/si.png
rename to public/theme/common/flags/si.png
diff --git a/htdocs/theme/common/flags/sj.png b/public/theme/common/flags/sj.png
similarity index 100%
rename from htdocs/theme/common/flags/sj.png
rename to public/theme/common/flags/sj.png
diff --git a/htdocs/theme/common/flags/sk.png b/public/theme/common/flags/sk.png
similarity index 100%
rename from htdocs/theme/common/flags/sk.png
rename to public/theme/common/flags/sk.png
diff --git a/htdocs/theme/common/flags/sl.png b/public/theme/common/flags/sl.png
similarity index 100%
rename from htdocs/theme/common/flags/sl.png
rename to public/theme/common/flags/sl.png
diff --git a/htdocs/theme/common/flags/sm.png b/public/theme/common/flags/sm.png
similarity index 100%
rename from htdocs/theme/common/flags/sm.png
rename to public/theme/common/flags/sm.png
diff --git a/htdocs/theme/common/flags/sn.png b/public/theme/common/flags/sn.png
similarity index 100%
rename from htdocs/theme/common/flags/sn.png
rename to public/theme/common/flags/sn.png
diff --git a/htdocs/theme/common/flags/so.png b/public/theme/common/flags/so.png
similarity index 100%
rename from htdocs/theme/common/flags/so.png
rename to public/theme/common/flags/so.png
diff --git a/htdocs/theme/common/flags/sr.png b/public/theme/common/flags/sr.png
similarity index 100%
rename from htdocs/theme/common/flags/sr.png
rename to public/theme/common/flags/sr.png
diff --git a/htdocs/theme/common/flags/st.png b/public/theme/common/flags/st.png
similarity index 100%
rename from htdocs/theme/common/flags/st.png
rename to public/theme/common/flags/st.png
diff --git a/htdocs/theme/common/flags/sv.png b/public/theme/common/flags/sv.png
similarity index 100%
rename from htdocs/theme/common/flags/sv.png
rename to public/theme/common/flags/sv.png
diff --git a/htdocs/theme/common/flags/sy.png b/public/theme/common/flags/sy.png
similarity index 100%
rename from htdocs/theme/common/flags/sy.png
rename to public/theme/common/flags/sy.png
diff --git a/htdocs/theme/common/flags/sz.png b/public/theme/common/flags/sz.png
similarity index 100%
rename from htdocs/theme/common/flags/sz.png
rename to public/theme/common/flags/sz.png
diff --git a/htdocs/theme/common/flags/tc.png b/public/theme/common/flags/tc.png
similarity index 100%
rename from htdocs/theme/common/flags/tc.png
rename to public/theme/common/flags/tc.png
diff --git a/htdocs/theme/common/flags/td.png b/public/theme/common/flags/td.png
similarity index 100%
rename from htdocs/theme/common/flags/td.png
rename to public/theme/common/flags/td.png
diff --git a/htdocs/theme/common/flags/tf.png b/public/theme/common/flags/tf.png
similarity index 100%
rename from htdocs/theme/common/flags/tf.png
rename to public/theme/common/flags/tf.png
diff --git a/htdocs/theme/common/flags/tg.png b/public/theme/common/flags/tg.png
similarity index 100%
rename from htdocs/theme/common/flags/tg.png
rename to public/theme/common/flags/tg.png
diff --git a/htdocs/theme/common/flags/th.png b/public/theme/common/flags/th.png
similarity index 100%
rename from htdocs/theme/common/flags/th.png
rename to public/theme/common/flags/th.png
diff --git a/htdocs/theme/common/flags/tj.png b/public/theme/common/flags/tj.png
similarity index 100%
rename from htdocs/theme/common/flags/tj.png
rename to public/theme/common/flags/tj.png
diff --git a/htdocs/theme/common/flags/tk.png b/public/theme/common/flags/tk.png
similarity index 100%
rename from htdocs/theme/common/flags/tk.png
rename to public/theme/common/flags/tk.png
diff --git a/htdocs/theme/common/flags/tl.png b/public/theme/common/flags/tl.png
similarity index 100%
rename from htdocs/theme/common/flags/tl.png
rename to public/theme/common/flags/tl.png
diff --git a/htdocs/theme/common/flags/tm.png b/public/theme/common/flags/tm.png
similarity index 100%
rename from htdocs/theme/common/flags/tm.png
rename to public/theme/common/flags/tm.png
diff --git a/htdocs/theme/common/flags/tn.png b/public/theme/common/flags/tn.png
similarity index 100%
rename from htdocs/theme/common/flags/tn.png
rename to public/theme/common/flags/tn.png
diff --git a/htdocs/theme/common/flags/to.png b/public/theme/common/flags/to.png
similarity index 100%
rename from htdocs/theme/common/flags/to.png
rename to public/theme/common/flags/to.png
diff --git a/htdocs/theme/common/flags/tr.png b/public/theme/common/flags/tr.png
similarity index 100%
rename from htdocs/theme/common/flags/tr.png
rename to public/theme/common/flags/tr.png
diff --git a/htdocs/theme/common/flags/trans.png b/public/theme/common/flags/trans.png
similarity index 100%
rename from htdocs/theme/common/flags/trans.png
rename to public/theme/common/flags/trans.png
diff --git a/htdocs/theme/common/flags/tt.png b/public/theme/common/flags/tt.png
similarity index 100%
rename from htdocs/theme/common/flags/tt.png
rename to public/theme/common/flags/tt.png
diff --git a/htdocs/theme/common/flags/tv.png b/public/theme/common/flags/tv.png
similarity index 100%
rename from htdocs/theme/common/flags/tv.png
rename to public/theme/common/flags/tv.png
diff --git a/htdocs/theme/common/flags/tw.png b/public/theme/common/flags/tw.png
similarity index 100%
rename from htdocs/theme/common/flags/tw.png
rename to public/theme/common/flags/tw.png
diff --git a/htdocs/theme/common/flags/tz.png b/public/theme/common/flags/tz.png
similarity index 100%
rename from htdocs/theme/common/flags/tz.png
rename to public/theme/common/flags/tz.png
diff --git a/htdocs/theme/common/flags/ua.png b/public/theme/common/flags/ua.png
similarity index 100%
rename from htdocs/theme/common/flags/ua.png
rename to public/theme/common/flags/ua.png
diff --git a/htdocs/theme/common/flags/ug.png b/public/theme/common/flags/ug.png
similarity index 100%
rename from htdocs/theme/common/flags/ug.png
rename to public/theme/common/flags/ug.png
diff --git a/htdocs/theme/common/flags/uk.png b/public/theme/common/flags/uk.png
similarity index 100%
rename from htdocs/theme/common/flags/uk.png
rename to public/theme/common/flags/uk.png
diff --git a/htdocs/theme/common/flags/um.png b/public/theme/common/flags/um.png
similarity index 100%
rename from htdocs/theme/common/flags/um.png
rename to public/theme/common/flags/um.png
diff --git a/htdocs/theme/common/flags/us.png b/public/theme/common/flags/us.png
similarity index 100%
rename from htdocs/theme/common/flags/us.png
rename to public/theme/common/flags/us.png
diff --git a/htdocs/theme/common/flags/uy.png b/public/theme/common/flags/uy.png
similarity index 100%
rename from htdocs/theme/common/flags/uy.png
rename to public/theme/common/flags/uy.png
diff --git a/htdocs/theme/common/flags/uz.png b/public/theme/common/flags/uz.png
similarity index 100%
rename from htdocs/theme/common/flags/uz.png
rename to public/theme/common/flags/uz.png
diff --git a/htdocs/theme/common/flags/va.png b/public/theme/common/flags/va.png
similarity index 100%
rename from htdocs/theme/common/flags/va.png
rename to public/theme/common/flags/va.png
diff --git a/htdocs/theme/common/flags/vc.png b/public/theme/common/flags/vc.png
similarity index 100%
rename from htdocs/theme/common/flags/vc.png
rename to public/theme/common/flags/vc.png
diff --git a/htdocs/theme/common/flags/ve.png b/public/theme/common/flags/ve.png
similarity index 100%
rename from htdocs/theme/common/flags/ve.png
rename to public/theme/common/flags/ve.png
diff --git a/htdocs/theme/common/flags/vg.png b/public/theme/common/flags/vg.png
similarity index 100%
rename from htdocs/theme/common/flags/vg.png
rename to public/theme/common/flags/vg.png
diff --git a/htdocs/theme/common/flags/vi.png b/public/theme/common/flags/vi.png
similarity index 100%
rename from htdocs/theme/common/flags/vi.png
rename to public/theme/common/flags/vi.png
diff --git a/htdocs/theme/common/flags/vn.png b/public/theme/common/flags/vn.png
similarity index 100%
rename from htdocs/theme/common/flags/vn.png
rename to public/theme/common/flags/vn.png
diff --git a/htdocs/theme/common/flags/vu.png b/public/theme/common/flags/vu.png
similarity index 100%
rename from htdocs/theme/common/flags/vu.png
rename to public/theme/common/flags/vu.png
diff --git a/htdocs/theme/common/flags/wales.png b/public/theme/common/flags/wales.png
similarity index 100%
rename from htdocs/theme/common/flags/wales.png
rename to public/theme/common/flags/wales.png
diff --git a/htdocs/theme/common/flags/wf.png b/public/theme/common/flags/wf.png
similarity index 100%
rename from htdocs/theme/common/flags/wf.png
rename to public/theme/common/flags/wf.png
diff --git a/htdocs/theme/common/flags/ws.png b/public/theme/common/flags/ws.png
similarity index 100%
rename from htdocs/theme/common/flags/ws.png
rename to public/theme/common/flags/ws.png
diff --git a/htdocs/theme/common/flags/ye.png b/public/theme/common/flags/ye.png
similarity index 100%
rename from htdocs/theme/common/flags/ye.png
rename to public/theme/common/flags/ye.png
diff --git a/htdocs/theme/common/flags/yt.png b/public/theme/common/flags/yt.png
similarity index 100%
rename from htdocs/theme/common/flags/yt.png
rename to public/theme/common/flags/yt.png
diff --git a/htdocs/theme/common/flags/za.png b/public/theme/common/flags/za.png
similarity index 100%
rename from htdocs/theme/common/flags/za.png
rename to public/theme/common/flags/za.png
diff --git a/htdocs/theme/common/flags/zm.png b/public/theme/common/flags/zm.png
similarity index 100%
rename from htdocs/theme/common/flags/zm.png
rename to public/theme/common/flags/zm.png
diff --git a/htdocs/theme/common/flags/zw.png b/public/theme/common/flags/zw.png
similarity index 100%
rename from htdocs/theme/common/flags/zw.png
rename to public/theme/common/flags/zw.png
diff --git a/htdocs/theme/common/folder-new.png b/public/theme/common/folder-new.png
similarity index 100%
rename from htdocs/theme/common/folder-new.png
rename to public/theme/common/folder-new.png
diff --git a/htdocs/theme/common/gmap.png b/public/theme/common/gmap.png
similarity index 100%
rename from htdocs/theme/common/gmap.png
rename to public/theme/common/gmap.png
diff --git a/htdocs/theme/common/help.png b/public/theme/common/help.png
similarity index 100%
rename from htdocs/theme/common/help.png
rename to public/theme/common/help.png
diff --git a/htdocs/theme/common/ical.gif b/public/theme/common/ical.gif
similarity index 100%
rename from htdocs/theme/common/ical.gif
rename to public/theme/common/ical.gif
diff --git a/htdocs/theme/common/index.html b/public/theme/common/index.html
similarity index 100%
rename from htdocs/theme/common/index.html
rename to public/theme/common/index.html
diff --git a/htdocs/theme/common/information.png b/public/theme/common/information.png
similarity index 100%
rename from htdocs/theme/common/information.png
rename to public/theme/common/information.png
diff --git a/htdocs/theme/common/logo_cerfa.png b/public/theme/common/logo_cerfa.png
similarity index 100%
rename from htdocs/theme/common/logo_cerfa.png
rename to public/theme/common/logo_cerfa.png
diff --git a/htdocs/theme/common/mime/archive.png b/public/theme/common/mime/archive.png
similarity index 100%
rename from htdocs/theme/common/mime/archive.png
rename to public/theme/common/mime/archive.png
diff --git a/htdocs/theme/common/mime/audio.png b/public/theme/common/mime/audio.png
similarity index 100%
rename from htdocs/theme/common/mime/audio.png
rename to public/theme/common/mime/audio.png
diff --git a/htdocs/theme/common/mime/css.png b/public/theme/common/mime/css.png
similarity index 100%
rename from htdocs/theme/common/mime/css.png
rename to public/theme/common/mime/css.png
diff --git a/htdocs/theme/common/mime/doc.png b/public/theme/common/mime/doc.png
similarity index 100%
rename from htdocs/theme/common/mime/doc.png
rename to public/theme/common/mime/doc.png
diff --git a/htdocs/theme/common/mime/dotnet.png b/public/theme/common/mime/dotnet.png
similarity index 100%
rename from htdocs/theme/common/mime/dotnet.png
rename to public/theme/common/mime/dotnet.png
diff --git a/htdocs/theme/common/mime/encrypt.png b/public/theme/common/mime/encrypt.png
similarity index 100%
rename from htdocs/theme/common/mime/encrypt.png
rename to public/theme/common/mime/encrypt.png
diff --git a/htdocs/theme/common/mime/error.png b/public/theme/common/mime/error.png
similarity index 100%
rename from htdocs/theme/common/mime/error.png
rename to public/theme/common/mime/error.png
diff --git a/htdocs/theme/common/mime/flash.png b/public/theme/common/mime/flash.png
similarity index 100%
rename from htdocs/theme/common/mime/flash.png
rename to public/theme/common/mime/flash.png
diff --git a/htdocs/theme/common/mime/glasses.png b/public/theme/common/mime/glasses.png
similarity index 100%
rename from htdocs/theme/common/mime/glasses.png
rename to public/theme/common/mime/glasses.png
diff --git a/htdocs/theme/common/mime/html.png b/public/theme/common/mime/html.png
similarity index 100%
rename from htdocs/theme/common/mime/html.png
rename to public/theme/common/mime/html.png
diff --git a/htdocs/theme/common/mime/image.png b/public/theme/common/mime/image.png
similarity index 100%
rename from htdocs/theme/common/mime/image.png
rename to public/theme/common/mime/image.png
diff --git a/htdocs/theme/common/mime/index.html b/public/theme/common/mime/index.html
similarity index 100%
rename from htdocs/theme/common/mime/index.html
rename to public/theme/common/mime/index.html
diff --git a/htdocs/theme/common/mime/jnlp.png b/public/theme/common/mime/jnlp.png
similarity index 100%
rename from htdocs/theme/common/mime/jnlp.png
rename to public/theme/common/mime/jnlp.png
diff --git a/htdocs/theme/common/mime/jscript.png b/public/theme/common/mime/jscript.png
similarity index 100%
rename from htdocs/theme/common/mime/jscript.png
rename to public/theme/common/mime/jscript.png
diff --git a/htdocs/theme/common/mime/library.png b/public/theme/common/mime/library.png
similarity index 100%
rename from htdocs/theme/common/mime/library.png
rename to public/theme/common/mime/library.png
diff --git a/htdocs/theme/common/mime/lit.png b/public/theme/common/mime/lit.png
similarity index 100%
rename from htdocs/theme/common/mime/lit.png
rename to public/theme/common/mime/lit.png
diff --git a/htdocs/theme/common/mime/mdb.png b/public/theme/common/mime/mdb.png
similarity index 100%
rename from htdocs/theme/common/mime/mdb.png
rename to public/theme/common/mime/mdb.png
diff --git a/htdocs/theme/common/mime/notavailable.png b/public/theme/common/mime/notavailable.png
similarity index 100%
rename from htdocs/theme/common/mime/notavailable.png
rename to public/theme/common/mime/notavailable.png
diff --git a/htdocs/theme/common/mime/ooffice.png b/public/theme/common/mime/ooffice.png
similarity index 100%
rename from htdocs/theme/common/mime/ooffice.png
rename to public/theme/common/mime/ooffice.png
diff --git a/htdocs/theme/common/mime/other.png b/public/theme/common/mime/other.png
similarity index 100%
rename from htdocs/theme/common/mime/other.png
rename to public/theme/common/mime/other.png
diff --git a/htdocs/theme/common/mime/page.png b/public/theme/common/mime/page.png
similarity index 100%
rename from htdocs/theme/common/mime/page.png
rename to public/theme/common/mime/page.png
diff --git a/htdocs/theme/common/mime/pdf.png b/public/theme/common/mime/pdf.png
similarity index 100%
rename from htdocs/theme/common/mime/pdf.png
rename to public/theme/common/mime/pdf.png
diff --git a/htdocs/theme/common/mime/php.png b/public/theme/common/mime/php.png
similarity index 100%
rename from htdocs/theme/common/mime/php.png
rename to public/theme/common/mime/php.png
diff --git a/htdocs/theme/common/mime/pl.png b/public/theme/common/mime/pl.png
similarity index 100%
rename from htdocs/theme/common/mime/pl.png
rename to public/theme/common/mime/pl.png
diff --git a/htdocs/theme/common/mime/ppt.png b/public/theme/common/mime/ppt.png
similarity index 100%
rename from htdocs/theme/common/mime/ppt.png
rename to public/theme/common/mime/ppt.png
diff --git a/htdocs/theme/common/mime/readme.txt b/public/theme/common/mime/readme.txt
similarity index 100%
rename from htdocs/theme/common/mime/readme.txt
rename to public/theme/common/mime/readme.txt
diff --git a/htdocs/theme/common/mime/rss.png b/public/theme/common/mime/rss.png
similarity index 100%
rename from htdocs/theme/common/mime/rss.png
rename to public/theme/common/mime/rss.png
diff --git a/htdocs/theme/common/mime/script.png b/public/theme/common/mime/script.png
similarity index 100%
rename from htdocs/theme/common/mime/script.png
rename to public/theme/common/mime/script.png
diff --git a/htdocs/theme/common/mime/svg.png b/public/theme/common/mime/svg.png
similarity index 100%
rename from htdocs/theme/common/mime/svg.png
rename to public/theme/common/mime/svg.png
diff --git a/htdocs/theme/common/mime/text.png b/public/theme/common/mime/text.png
similarity index 100%
rename from htdocs/theme/common/mime/text.png
rename to public/theme/common/mime/text.png
diff --git a/htdocs/theme/common/mime/ttf.png b/public/theme/common/mime/ttf.png
similarity index 100%
rename from htdocs/theme/common/mime/ttf.png
rename to public/theme/common/mime/ttf.png
diff --git a/htdocs/theme/common/mime/unknown.png b/public/theme/common/mime/unknown.png
similarity index 100%
rename from htdocs/theme/common/mime/unknown.png
rename to public/theme/common/mime/unknown.png
diff --git a/htdocs/theme/common/mime/video.png b/public/theme/common/mime/video.png
similarity index 100%
rename from htdocs/theme/common/mime/video.png
rename to public/theme/common/mime/video.png
diff --git a/htdocs/theme/common/mime/xls.png b/public/theme/common/mime/xls.png
similarity index 100%
rename from htdocs/theme/common/mime/xls.png
rename to public/theme/common/mime/xls.png
diff --git a/htdocs/theme/common/paypal.png b/public/theme/common/paypal.png
similarity index 100%
rename from htdocs/theme/common/paypal.png
rename to public/theme/common/paypal.png
diff --git a/htdocs/theme/common/redstar.png b/public/theme/common/redstar.png
similarity index 100%
rename from htdocs/theme/common/redstar.png
rename to public/theme/common/redstar.png
diff --git a/htdocs/theme/common/rss.gif b/public/theme/common/rss.gif
similarity index 100%
rename from htdocs/theme/common/rss.gif
rename to public/theme/common/rss.gif
diff --git a/htdocs/theme/common/skype_callbutton.png b/public/theme/common/skype_callbutton.png
similarity index 100%
rename from htdocs/theme/common/skype_callbutton.png
rename to public/theme/common/skype_callbutton.png
diff --git a/htdocs/theme/common/skype_chatbutton.png b/public/theme/common/skype_chatbutton.png
similarity index 100%
rename from htdocs/theme/common/skype_chatbutton.png
rename to public/theme/common/skype_chatbutton.png
diff --git a/htdocs/theme/common/star.png b/public/theme/common/star.png
similarity index 100%
rename from htdocs/theme/common/star.png
rename to public/theme/common/star.png
diff --git a/htdocs/theme/common/transform-crop-and-resize.png b/public/theme/common/transform-crop-and-resize.png
similarity index 100%
rename from htdocs/theme/common/transform-crop-and-resize.png
rename to public/theme/common/transform-crop-and-resize.png
diff --git a/htdocs/theme/common/transparent.png b/public/theme/common/transparent.png
similarity index 100%
rename from htdocs/theme/common/transparent.png
rename to public/theme/common/transparent.png
diff --git a/htdocs/theme/common/treemenu/base.gif b/public/theme/common/treemenu/base.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/base.gif
rename to public/theme/common/treemenu/base.gif
diff --git a/htdocs/theme/common/treemenu/branch.gif b/public/theme/common/treemenu/branch.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/branch.gif
rename to public/theme/common/treemenu/branch.gif
diff --git a/htdocs/theme/common/treemenu/branchbottom.gif b/public/theme/common/treemenu/branchbottom.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/branchbottom.gif
rename to public/theme/common/treemenu/branchbottom.gif
diff --git a/htdocs/theme/common/treemenu/branchtop.gif b/public/theme/common/treemenu/branchtop.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/branchtop.gif
rename to public/theme/common/treemenu/branchtop.gif
diff --git a/htdocs/theme/common/treemenu/folder-expanded.gif b/public/theme/common/treemenu/folder-expanded.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/folder-expanded.gif
rename to public/theme/common/treemenu/folder-expanded.gif
diff --git a/htdocs/theme/common/treemenu/folder.gif b/public/theme/common/treemenu/folder.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/folder.gif
rename to public/theme/common/treemenu/folder.gif
diff --git a/htdocs/theme/common/treemenu/folder2-expanded.png b/public/theme/common/treemenu/folder2-expanded.png
similarity index 100%
rename from htdocs/theme/common/treemenu/folder2-expanded.png
rename to public/theme/common/treemenu/folder2-expanded.png
diff --git a/htdocs/theme/common/treemenu/folder2.png b/public/theme/common/treemenu/folder2.png
similarity index 100%
rename from htdocs/theme/common/treemenu/folder2.png
rename to public/theme/common/treemenu/folder2.png
diff --git a/htdocs/theme/common/treemenu/imgfolder.gif b/public/theme/common/treemenu/imgfolder.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/imgfolder.gif
rename to public/theme/common/treemenu/imgfolder.gif
diff --git a/htdocs/theme/common/treemenu/index.html b/public/theme/common/treemenu/index.html
similarity index 100%
rename from htdocs/theme/common/treemenu/index.html
rename to public/theme/common/treemenu/index.html
diff --git a/htdocs/theme/common/treemenu/line.gif b/public/theme/common/treemenu/line.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/line.gif
rename to public/theme/common/treemenu/line.gif
diff --git a/htdocs/theme/common/treemenu/linebottom.gif b/public/theme/common/treemenu/linebottom.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/linebottom.gif
rename to public/theme/common/treemenu/linebottom.gif
diff --git a/htdocs/theme/common/treemenu/minus.gif b/public/theme/common/treemenu/minus.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/minus.gif
rename to public/theme/common/treemenu/minus.gif
diff --git a/htdocs/theme/common/treemenu/minusbottom.gif b/public/theme/common/treemenu/minusbottom.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/minusbottom.gif
rename to public/theme/common/treemenu/minusbottom.gif
diff --git a/htdocs/theme/common/treemenu/minustop.gif b/public/theme/common/treemenu/minustop.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/minustop.gif
rename to public/theme/common/treemenu/minustop.gif
diff --git a/htdocs/theme/common/treemenu/minustop2.gif b/public/theme/common/treemenu/minustop2.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/minustop2.gif
rename to public/theme/common/treemenu/minustop2.gif
diff --git a/htdocs/theme/common/treemenu/minustop3.gif b/public/theme/common/treemenu/minustop3.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/minustop3.gif
rename to public/theme/common/treemenu/minustop3.gif
diff --git a/htdocs/theme/common/treemenu/page.gif b/public/theme/common/treemenu/page.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/page.gif
rename to public/theme/common/treemenu/page.gif
diff --git a/htdocs/theme/common/treemenu/plus.gif b/public/theme/common/treemenu/plus.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/plus.gif
rename to public/theme/common/treemenu/plus.gif
diff --git a/htdocs/theme/common/treemenu/plusbottom.gif b/public/theme/common/treemenu/plusbottom.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/plusbottom.gif
rename to public/theme/common/treemenu/plusbottom.gif
diff --git a/htdocs/theme/common/treemenu/plustop.gif b/public/theme/common/treemenu/plustop.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/plustop.gif
rename to public/theme/common/treemenu/plustop.gif
diff --git a/htdocs/theme/common/treemenu/plustop2.gif b/public/theme/common/treemenu/plustop2.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/plustop2.gif
rename to public/theme/common/treemenu/plustop2.gif
diff --git a/htdocs/theme/common/treemenu/plustop3.gif b/public/theme/common/treemenu/plustop3.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/plustop3.gif
rename to public/theme/common/treemenu/plustop3.gif
diff --git a/htdocs/theme/common/treemenu/trash.gif b/public/theme/common/treemenu/trash.gif
similarity index 100%
rename from htdocs/theme/common/treemenu/trash.gif
rename to public/theme/common/treemenu/trash.gif
diff --git a/htdocs/theme/common/vcal.gif b/public/theme/common/vcal.gif
similarity index 100%
rename from htdocs/theme/common/vcal.gif
rename to public/theme/common/vcal.gif
diff --git a/htdocs/theme/common/view-refresh.png b/public/theme/common/view-refresh.png
similarity index 100%
rename from htdocs/theme/common/view-refresh.png
rename to public/theme/common/view-refresh.png
diff --git a/htdocs/theme/dolibarr.png b/public/theme/dolibarr.png
similarity index 100%
rename from htdocs/theme/dolibarr.png
rename to public/theme/dolibarr.png
diff --git a/htdocs/theme/dolibarr_logo.png b/public/theme/dolibarr_logo.png
similarity index 100%
rename from htdocs/theme/dolibarr_logo.png
rename to public/theme/dolibarr_logo.png
diff --git a/htdocs/theme/dolibarr_preferred_partner_int.png b/public/theme/dolibarr_preferred_partner_int.png
similarity index 100%
rename from htdocs/theme/dolibarr_preferred_partner_int.png
rename to public/theme/dolibarr_preferred_partner_int.png
diff --git a/htdocs/theme/doliforge_logo.png b/public/theme/doliforge_logo.png
similarity index 100%
rename from htdocs/theme/doliforge_logo.png
rename to public/theme/doliforge_logo.png
diff --git a/htdocs/theme/dolistore_logo.png b/public/theme/dolistore_logo.png
similarity index 100%
rename from htdocs/theme/dolistore_logo.png
rename to public/theme/dolistore_logo.png
diff --git a/htdocs/theme/eldy/.gitignore b/public/theme/eldy/.gitignore
similarity index 100%
rename from htdocs/theme/eldy/.gitignore
rename to public/theme/eldy/.gitignore
diff --git a/htdocs/theme/eldy/AUTHOR b/public/theme/eldy/AUTHOR
similarity index 100%
rename from htdocs/theme/eldy/AUTHOR
rename to public/theme/eldy/AUTHOR
diff --git a/htdocs/theme/eldy/ckeditor/config.js b/public/theme/eldy/ckeditor/config.js
similarity index 100%
rename from htdocs/theme/eldy/ckeditor/config.js
rename to public/theme/eldy/ckeditor/config.js
diff --git a/htdocs/theme/eldy/ckeditor/index.html b/public/theme/eldy/ckeditor/index.html
similarity index 100%
rename from htdocs/theme/eldy/ckeditor/index.html
rename to public/theme/eldy/ckeditor/index.html
diff --git a/htdocs/theme/eldy/graph-color.php b/public/theme/eldy/graph-color.php
similarity index 100%
rename from htdocs/theme/eldy/graph-color.php
rename to public/theme/eldy/graph-color.php
diff --git a/htdocs/theme/eldy/img/1downarrow.png b/public/theme/eldy/img/1downarrow.png
similarity index 100%
rename from htdocs/theme/eldy/img/1downarrow.png
rename to public/theme/eldy/img/1downarrow.png
diff --git a/htdocs/theme/eldy/img/1downarrow_selected.png b/public/theme/eldy/img/1downarrow_selected.png
similarity index 100%
rename from htdocs/theme/eldy/img/1downarrow_selected.png
rename to public/theme/eldy/img/1downarrow_selected.png
diff --git a/htdocs/theme/eldy/img/1leftarrow.png b/public/theme/eldy/img/1leftarrow.png
similarity index 100%
rename from htdocs/theme/eldy/img/1leftarrow.png
rename to public/theme/eldy/img/1leftarrow.png
diff --git a/htdocs/theme/eldy/img/1leftarrow_selected.png b/public/theme/eldy/img/1leftarrow_selected.png
similarity index 100%
rename from htdocs/theme/eldy/img/1leftarrow_selected.png
rename to public/theme/eldy/img/1leftarrow_selected.png
diff --git a/htdocs/theme/eldy/img/1rightarrow.png b/public/theme/eldy/img/1rightarrow.png
similarity index 100%
rename from htdocs/theme/eldy/img/1rightarrow.png
rename to public/theme/eldy/img/1rightarrow.png
diff --git a/htdocs/theme/eldy/img/1rightarrow_selected.png b/public/theme/eldy/img/1rightarrow_selected.png
similarity index 100%
rename from htdocs/theme/eldy/img/1rightarrow_selected.png
rename to public/theme/eldy/img/1rightarrow_selected.png
diff --git a/htdocs/theme/eldy/img/1uparrow.png b/public/theme/eldy/img/1uparrow.png
similarity index 100%
rename from htdocs/theme/eldy/img/1uparrow.png
rename to public/theme/eldy/img/1uparrow.png
diff --git a/htdocs/theme/eldy/img/1uparrow_selected.png b/public/theme/eldy/img/1uparrow_selected.png
similarity index 100%
rename from htdocs/theme/eldy/img/1uparrow_selected.png
rename to public/theme/eldy/img/1uparrow_selected.png
diff --git a/htdocs/theme/eldy/img/addfile.png b/public/theme/eldy/img/addfile.png
similarity index 100%
rename from htdocs/theme/eldy/img/addfile.png
rename to public/theme/eldy/img/addfile.png
diff --git a/htdocs/theme/eldy/img/background.png b/public/theme/eldy/img/background.png
similarity index 100%
rename from htdocs/theme/eldy/img/background.png
rename to public/theme/eldy/img/background.png
diff --git a/htdocs/theme/eldy/img/bg-bas-rubrique.png b/public/theme/eldy/img/bg-bas-rubrique.png
similarity index 100%
rename from htdocs/theme/eldy/img/bg-bas-rubrique.png
rename to public/theme/eldy/img/bg-bas-rubrique.png
diff --git a/htdocs/theme/eldy/img/bg-rubrique.png b/public/theme/eldy/img/bg-rubrique.png
similarity index 100%
rename from htdocs/theme/eldy/img/bg-rubrique.png
rename to public/theme/eldy/img/bg-rubrique.png
diff --git a/htdocs/theme/eldy/img/bg-titre-rubrique.png b/public/theme/eldy/img/bg-titre-rubrique.png
similarity index 100%
rename from htdocs/theme/eldy/img/bg-titre-rubrique.png
rename to public/theme/eldy/img/bg-titre-rubrique.png
diff --git a/htdocs/theme/eldy/img/button_bg.png b/public/theme/eldy/img/button_bg.png
similarity index 100%
rename from htdocs/theme/eldy/img/button_bg.png
rename to public/theme/eldy/img/button_bg.png
diff --git a/htdocs/theme/eldy/img/button_edit.png b/public/theme/eldy/img/button_edit.png
similarity index 100%
rename from htdocs/theme/eldy/img/button_edit.png
rename to public/theme/eldy/img/button_edit.png
diff --git a/htdocs/theme/eldy/img/calc.png b/public/theme/eldy/img/calc.png
similarity index 100%
rename from htdocs/theme/eldy/img/calc.png
rename to public/theme/eldy/img/calc.png
diff --git a/htdocs/theme/eldy/img/calendar.png b/public/theme/eldy/img/calendar.png
similarity index 100%
rename from htdocs/theme/eldy/img/calendar.png
rename to public/theme/eldy/img/calendar.png
diff --git a/htdocs/theme/eldy/img/call.png b/public/theme/eldy/img/call.png
similarity index 100%
rename from htdocs/theme/eldy/img/call.png
rename to public/theme/eldy/img/call.png
diff --git a/htdocs/theme/eldy/img/call_out.png b/public/theme/eldy/img/call_out.png
similarity index 100%
rename from htdocs/theme/eldy/img/call_out.png
rename to public/theme/eldy/img/call_out.png
diff --git a/htdocs/theme/eldy/img/close.png b/public/theme/eldy/img/close.png
similarity index 100%
rename from htdocs/theme/eldy/img/close.png
rename to public/theme/eldy/img/close.png
diff --git a/htdocs/theme/eldy/img/close_title.png b/public/theme/eldy/img/close_title.png
similarity index 100%
rename from htdocs/theme/eldy/img/close_title.png
rename to public/theme/eldy/img/close_title.png
diff --git a/htdocs/theme/eldy/img/credit_card.png b/public/theme/eldy/img/credit_card.png
similarity index 100%
rename from htdocs/theme/eldy/img/credit_card.png
rename to public/theme/eldy/img/credit_card.png
diff --git a/htdocs/theme/eldy/img/delete.png b/public/theme/eldy/img/delete.png
similarity index 100%
rename from htdocs/theme/eldy/img/delete.png
rename to public/theme/eldy/img/delete.png
diff --git a/htdocs/theme/eldy/img/detail.png b/public/theme/eldy/img/detail.png
similarity index 100%
rename from htdocs/theme/eldy/img/detail.png
rename to public/theme/eldy/img/detail.png
diff --git a/htdocs/theme/eldy/img/disable.png b/public/theme/eldy/img/disable.png
similarity index 100%
rename from htdocs/theme/eldy/img/disable.png
rename to public/theme/eldy/img/disable.png
diff --git a/htdocs/theme/eldy/img/edit.png b/public/theme/eldy/img/edit.png
similarity index 100%
rename from htdocs/theme/eldy/img/edit.png
rename to public/theme/eldy/img/edit.png
diff --git a/htdocs/theme/eldy/img/edit_add.png b/public/theme/eldy/img/edit_add.png
similarity index 100%
rename from htdocs/theme/eldy/img/edit_add.png
rename to public/theme/eldy/img/edit_add.png
diff --git a/htdocs/theme/eldy/img/edit_remove.png b/public/theme/eldy/img/edit_remove.png
similarity index 100%
rename from htdocs/theme/eldy/img/edit_remove.png
rename to public/theme/eldy/img/edit_remove.png
diff --git a/htdocs/theme/eldy/img/editdelete.png b/public/theme/eldy/img/editdelete.png
similarity index 100%
rename from htdocs/theme/eldy/img/editdelete.png
rename to public/theme/eldy/img/editdelete.png
diff --git a/htdocs/theme/eldy/img/error.png b/public/theme/eldy/img/error.png
similarity index 100%
rename from htdocs/theme/eldy/img/error.png
rename to public/theme/eldy/img/error.png
diff --git a/htdocs/theme/eldy/img/external.png b/public/theme/eldy/img/external.png
similarity index 100%
rename from htdocs/theme/eldy/img/external.png
rename to public/theme/eldy/img/external.png
diff --git a/htdocs/theme/eldy/img/favicon.ico b/public/theme/eldy/img/favicon.ico
similarity index 100%
rename from htdocs/theme/eldy/img/favicon.ico
rename to public/theme/eldy/img/favicon.ico
diff --git a/htdocs/theme/eldy/img/file.png b/public/theme/eldy/img/file.png
similarity index 100%
rename from htdocs/theme/eldy/img/file.png
rename to public/theme/eldy/img/file.png
diff --git a/htdocs/theme/eldy/img/filenew.png b/public/theme/eldy/img/filenew.png
similarity index 100%
rename from htdocs/theme/eldy/img/filenew.png
rename to public/theme/eldy/img/filenew.png
diff --git a/htdocs/theme/eldy/img/filter.png b/public/theme/eldy/img/filter.png
similarity index 100%
rename from htdocs/theme/eldy/img/filter.png
rename to public/theme/eldy/img/filter.png
diff --git a/htdocs/theme/eldy/img/folder-open.png b/public/theme/eldy/img/folder-open.png
similarity index 100%
rename from htdocs/theme/eldy/img/folder-open.png
rename to public/theme/eldy/img/folder-open.png
diff --git a/htdocs/theme/eldy/img/folder.png b/public/theme/eldy/img/folder.png
similarity index 100%
rename from htdocs/theme/eldy/img/folder.png
rename to public/theme/eldy/img/folder.png
diff --git a/htdocs/theme/eldy/img/gradient.gif b/public/theme/eldy/img/gradient.gif
similarity index 100%
rename from htdocs/theme/eldy/img/gradient.gif
rename to public/theme/eldy/img/gradient.gif
diff --git a/htdocs/theme/eldy/img/grip.png b/public/theme/eldy/img/grip.png
similarity index 100%
rename from htdocs/theme/eldy/img/grip.png
rename to public/theme/eldy/img/grip.png
diff --git a/htdocs/theme/eldy/img/grip_title.png b/public/theme/eldy/img/grip_title.png
similarity index 100%
rename from htdocs/theme/eldy/img/grip_title.png
rename to public/theme/eldy/img/grip_title.png
diff --git a/htdocs/theme/eldy/img/headbg.jpg b/public/theme/eldy/img/headbg.jpg
similarity index 100%
rename from htdocs/theme/eldy/img/headbg.jpg
rename to public/theme/eldy/img/headbg.jpg
diff --git a/htdocs/theme/eldy/img/headbg2.jpg b/public/theme/eldy/img/headbg2.jpg
similarity index 100%
rename from htdocs/theme/eldy/img/headbg2.jpg
rename to public/theme/eldy/img/headbg2.jpg
diff --git a/htdocs/theme/eldy/img/help.png b/public/theme/eldy/img/help.png
similarity index 100%
rename from htdocs/theme/eldy/img/help.png
rename to public/theme/eldy/img/help.png
diff --git a/htdocs/theme/eldy/img/helpdoc.png b/public/theme/eldy/img/helpdoc.png
similarity index 100%
rename from htdocs/theme/eldy/img/helpdoc.png
rename to public/theme/eldy/img/helpdoc.png
diff --git a/htdocs/theme/eldy/img/helpdoc_top.png b/public/theme/eldy/img/helpdoc_top.png
similarity index 100%
rename from htdocs/theme/eldy/img/helpdoc_top.png
rename to public/theme/eldy/img/helpdoc_top.png
diff --git a/htdocs/theme/eldy/img/high.png b/public/theme/eldy/img/high.png
similarity index 100%
rename from htdocs/theme/eldy/img/high.png
rename to public/theme/eldy/img/high.png
diff --git a/htdocs/theme/eldy/img/history.png b/public/theme/eldy/img/history.png
similarity index 100%
rename from htdocs/theme/eldy/img/history.png
rename to public/theme/eldy/img/history.png
diff --git a/htdocs/theme/eldy/img/index.html b/public/theme/eldy/img/index.html
similarity index 100%
rename from htdocs/theme/eldy/img/index.html
rename to public/theme/eldy/img/index.html
diff --git a/htdocs/theme/eldy/img/info.png b/public/theme/eldy/img/info.png
similarity index 100%
rename from htdocs/theme/eldy/img/info.png
rename to public/theme/eldy/img/info.png
diff --git a/htdocs/theme/eldy/img/info_black.png b/public/theme/eldy/img/info_black.png
similarity index 100%
rename from htdocs/theme/eldy/img/info_black.png
rename to public/theme/eldy/img/info_black.png
diff --git a/htdocs/theme/eldy/img/list.png b/public/theme/eldy/img/list.png
similarity index 100%
rename from htdocs/theme/eldy/img/list.png
rename to public/theme/eldy/img/list.png
diff --git a/htdocs/theme/eldy/img/liste_titre.png b/public/theme/eldy/img/liste_titre.png
similarity index 100%
rename from htdocs/theme/eldy/img/liste_titre.png
rename to public/theme/eldy/img/liste_titre.png
diff --git a/htdocs/theme/eldy/img/liste_titre2.png b/public/theme/eldy/img/liste_titre2.png
similarity index 100%
rename from htdocs/theme/eldy/img/liste_titre2.png
rename to public/theme/eldy/img/liste_titre2.png
diff --git a/htdocs/theme/eldy/img/listlight.png b/public/theme/eldy/img/listlight.png
similarity index 100%
rename from htdocs/theme/eldy/img/listlight.png
rename to public/theme/eldy/img/listlight.png
diff --git a/htdocs/theme/eldy/img/lock.png b/public/theme/eldy/img/lock.png
similarity index 100%
rename from htdocs/theme/eldy/img/lock.png
rename to public/theme/eldy/img/lock.png
diff --git a/htdocs/theme/eldy/img/login_background.png b/public/theme/eldy/img/login_background.png
similarity index 100%
rename from htdocs/theme/eldy/img/login_background.png
rename to public/theme/eldy/img/login_background.png
diff --git a/htdocs/theme/eldy/img/logo_setup.svg b/public/theme/eldy/img/logo_setup.svg
similarity index 100%
rename from htdocs/theme/eldy/img/logo_setup.svg
rename to public/theme/eldy/img/logo_setup.svg
diff --git a/htdocs/theme/eldy/img/logout.png b/public/theme/eldy/img/logout.png
similarity index 100%
rename from htdocs/theme/eldy/img/logout.png
rename to public/theme/eldy/img/logout.png
diff --git a/htdocs/theme/eldy/img/logout_top.png b/public/theme/eldy/img/logout_top.png
similarity index 100%
rename from htdocs/theme/eldy/img/logout_top.png
rename to public/theme/eldy/img/logout_top.png
diff --git a/htdocs/theme/eldy/img/menus/README.md b/public/theme/eldy/img/menus/README.md
similarity index 100%
rename from htdocs/theme/eldy/img/menus/README.md
rename to public/theme/eldy/img/menus/README.md
diff --git a/htdocs/theme/eldy/img/menus/agenda.png b/public/theme/eldy/img/menus/agenda.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/agenda.png
rename to public/theme/eldy/img/menus/agenda.png
diff --git a/htdocs/theme/eldy/img/menus/agenda_over.png b/public/theme/eldy/img/menus/agenda_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/agenda_over.png
rename to public/theme/eldy/img/menus/agenda_over.png
diff --git a/htdocs/theme/eldy/img/menus/bank.png b/public/theme/eldy/img/menus/bank.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/bank.png
rename to public/theme/eldy/img/menus/bank.png
diff --git a/htdocs/theme/eldy/img/menus/bank_over.png b/public/theme/eldy/img/menus/bank_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/bank_over.png
rename to public/theme/eldy/img/menus/bank_over.png
diff --git a/htdocs/theme/eldy/img/menus/chart.png b/public/theme/eldy/img/menus/chart.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/chart.png
rename to public/theme/eldy/img/menus/chart.png
diff --git a/htdocs/theme/eldy/img/menus/commercial.png b/public/theme/eldy/img/menus/commercial.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/commercial.png
rename to public/theme/eldy/img/menus/commercial.png
diff --git a/htdocs/theme/eldy/img/menus/commercial_over.png b/public/theme/eldy/img/menus/commercial_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/commercial_over.png
rename to public/theme/eldy/img/menus/commercial_over.png
diff --git a/htdocs/theme/eldy/img/menus/company.png b/public/theme/eldy/img/menus/company.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/company.png
rename to public/theme/eldy/img/menus/company.png
diff --git a/htdocs/theme/eldy/img/menus/company_over.png b/public/theme/eldy/img/menus/company_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/company_over.png
rename to public/theme/eldy/img/menus/company_over.png
diff --git a/htdocs/theme/eldy/img/menus/ecm.png b/public/theme/eldy/img/menus/ecm.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/ecm.png
rename to public/theme/eldy/img/menus/ecm.png
diff --git a/htdocs/theme/eldy/img/menus/ecm_over.png b/public/theme/eldy/img/menus/ecm_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/ecm_over.png
rename to public/theme/eldy/img/menus/ecm_over.png
diff --git a/htdocs/theme/eldy/img/menus/externalsite.png b/public/theme/eldy/img/menus/externalsite.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/externalsite.png
rename to public/theme/eldy/img/menus/externalsite.png
diff --git a/htdocs/theme/eldy/img/menus/externalsite_over.png b/public/theme/eldy/img/menus/externalsite_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/externalsite_over.png
rename to public/theme/eldy/img/menus/externalsite_over.png
diff --git a/htdocs/theme/eldy/img/menus/ftp.png b/public/theme/eldy/img/menus/ftp.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/ftp.png
rename to public/theme/eldy/img/menus/ftp.png
diff --git a/htdocs/theme/eldy/img/menus/ftp_over.png b/public/theme/eldy/img/menus/ftp_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/ftp_over.png
rename to public/theme/eldy/img/menus/ftp_over.png
diff --git a/htdocs/theme/eldy/img/menus/generic1.png b/public/theme/eldy/img/menus/generic1.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/generic1.png
rename to public/theme/eldy/img/menus/generic1.png
diff --git a/htdocs/theme/eldy/img/menus/generic1_over.png b/public/theme/eldy/img/menus/generic1_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/generic1_over.png
rename to public/theme/eldy/img/menus/generic1_over.png
diff --git a/htdocs/theme/eldy/img/menus/generic2.png b/public/theme/eldy/img/menus/generic2.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/generic2.png
rename to public/theme/eldy/img/menus/generic2.png
diff --git a/htdocs/theme/eldy/img/menus/generic2_over.png b/public/theme/eldy/img/menus/generic2_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/generic2_over.png
rename to public/theme/eldy/img/menus/generic2_over.png
diff --git a/htdocs/theme/eldy/img/menus/generic3.png b/public/theme/eldy/img/menus/generic3.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/generic3.png
rename to public/theme/eldy/img/menus/generic3.png
diff --git a/htdocs/theme/eldy/img/menus/generic3_over.png b/public/theme/eldy/img/menus/generic3_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/generic3_over.png
rename to public/theme/eldy/img/menus/generic3_over.png
diff --git a/htdocs/theme/eldy/img/menus/generic4.png b/public/theme/eldy/img/menus/generic4.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/generic4.png
rename to public/theme/eldy/img/menus/generic4.png
diff --git a/htdocs/theme/eldy/img/menus/generic4_over.png b/public/theme/eldy/img/menus/generic4_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/generic4_over.png
rename to public/theme/eldy/img/menus/generic4_over.png
diff --git a/htdocs/theme/eldy/img/menus/globe.png b/public/theme/eldy/img/menus/globe.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/globe.png
rename to public/theme/eldy/img/menus/globe.png
diff --git a/htdocs/theme/eldy/img/menus/globe_over.png b/public/theme/eldy/img/menus/globe_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/globe_over.png
rename to public/theme/eldy/img/menus/globe_over.png
diff --git a/htdocs/theme/eldy/img/menus/holiday.png b/public/theme/eldy/img/menus/holiday.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/holiday.png
rename to public/theme/eldy/img/menus/holiday.png
diff --git a/htdocs/theme/eldy/img/menus/home.png b/public/theme/eldy/img/menus/home.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/home.png
rename to public/theme/eldy/img/menus/home.png
diff --git a/htdocs/theme/eldy/img/menus/home_over.png b/public/theme/eldy/img/menus/home_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/home_over.png
rename to public/theme/eldy/img/menus/home_over.png
diff --git a/htdocs/theme/eldy/img/menus/index.html b/public/theme/eldy/img/menus/index.html
similarity index 100%
rename from htdocs/theme/eldy/img/menus/index.html
rename to public/theme/eldy/img/menus/index.html
diff --git a/htdocs/theme/eldy/img/menus/mail.png b/public/theme/eldy/img/menus/mail.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/mail.png
rename to public/theme/eldy/img/menus/mail.png
diff --git a/htdocs/theme/eldy/img/menus/mail_over.png b/public/theme/eldy/img/menus/mail_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/mail_over.png
rename to public/theme/eldy/img/menus/mail_over.png
diff --git a/htdocs/theme/eldy/img/menus/members.png b/public/theme/eldy/img/menus/members.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/members.png
rename to public/theme/eldy/img/menus/members.png
diff --git a/htdocs/theme/eldy/img/menus/members_over.png b/public/theme/eldy/img/menus/members_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/members_over.png
rename to public/theme/eldy/img/menus/members_over.png
diff --git a/htdocs/theme/eldy/img/menus/menu.png b/public/theme/eldy/img/menus/menu.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/menu.png
rename to public/theme/eldy/img/menus/menu.png
diff --git a/htdocs/theme/eldy/img/menus/money.png b/public/theme/eldy/img/menus/money.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/money.png
rename to public/theme/eldy/img/menus/money.png
diff --git a/htdocs/theme/eldy/img/menus/money_over.png b/public/theme/eldy/img/menus/money_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/money_over.png
rename to public/theme/eldy/img/menus/money_over.png
diff --git a/htdocs/theme/eldy/img/menus/pointofsale.png b/public/theme/eldy/img/menus/pointofsale.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/pointofsale.png
rename to public/theme/eldy/img/menus/pointofsale.png
diff --git a/htdocs/theme/eldy/img/menus/pointofsale_over.png b/public/theme/eldy/img/menus/pointofsale_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/pointofsale_over.png
rename to public/theme/eldy/img/menus/pointofsale_over.png
diff --git a/htdocs/theme/eldy/img/menus/products.png b/public/theme/eldy/img/menus/products.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/products.png
rename to public/theme/eldy/img/menus/products.png
diff --git a/htdocs/theme/eldy/img/menus/products_over.png b/public/theme/eldy/img/menus/products_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/products_over.png
rename to public/theme/eldy/img/menus/products_over.png
diff --git a/htdocs/theme/eldy/img/menus/project.png b/public/theme/eldy/img/menus/project.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/project.png
rename to public/theme/eldy/img/menus/project.png
diff --git a/htdocs/theme/eldy/img/menus/project_over.png b/public/theme/eldy/img/menus/project_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/project_over.png
rename to public/theme/eldy/img/menus/project_over.png
diff --git a/htdocs/theme/eldy/img/menus/shop.png b/public/theme/eldy/img/menus/shop.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/shop.png
rename to public/theme/eldy/img/menus/shop.png
diff --git a/htdocs/theme/eldy/img/menus/shop_over.png b/public/theme/eldy/img/menus/shop_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/shop_over.png
rename to public/theme/eldy/img/menus/shop_over.png
diff --git a/htdocs/theme/eldy/img/menus/tools.png b/public/theme/eldy/img/menus/tools.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/tools.png
rename to public/theme/eldy/img/menus/tools.png
diff --git a/htdocs/theme/eldy/img/menus/tools_over.png b/public/theme/eldy/img/menus/tools_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus/tools_over.png
rename to public/theme/eldy/img/menus/tools_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/agenda.png b/public/theme/eldy/img/menus_black/agenda.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/agenda.png
rename to public/theme/eldy/img/menus_black/agenda.png
diff --git a/htdocs/theme/eldy/img/menus_black/agenda_over.png b/public/theme/eldy/img/menus_black/agenda_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/agenda_over.png
rename to public/theme/eldy/img/menus_black/agenda_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/bank.png b/public/theme/eldy/img/menus_black/bank.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/bank.png
rename to public/theme/eldy/img/menus_black/bank.png
diff --git a/htdocs/theme/eldy/img/menus_black/bank_over.png b/public/theme/eldy/img/menus_black/bank_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/bank_over.png
rename to public/theme/eldy/img/menus_black/bank_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/commercial.png b/public/theme/eldy/img/menus_black/commercial.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/commercial.png
rename to public/theme/eldy/img/menus_black/commercial.png
diff --git a/htdocs/theme/eldy/img/menus_black/commercial_over.png b/public/theme/eldy/img/menus_black/commercial_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/commercial_over.png
rename to public/theme/eldy/img/menus_black/commercial_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/company.png b/public/theme/eldy/img/menus_black/company.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/company.png
rename to public/theme/eldy/img/menus_black/company.png
diff --git a/htdocs/theme/eldy/img/menus_black/company_over.png b/public/theme/eldy/img/menus_black/company_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/company_over.png
rename to public/theme/eldy/img/menus_black/company_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/ecm.png b/public/theme/eldy/img/menus_black/ecm.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/ecm.png
rename to public/theme/eldy/img/menus_black/ecm.png
diff --git a/htdocs/theme/eldy/img/menus_black/ecm_over.png b/public/theme/eldy/img/menus_black/ecm_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/ecm_over.png
rename to public/theme/eldy/img/menus_black/ecm_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/externalsite.png b/public/theme/eldy/img/menus_black/externalsite.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/externalsite.png
rename to public/theme/eldy/img/menus_black/externalsite.png
diff --git a/htdocs/theme/eldy/img/menus_black/externalsite_over.png b/public/theme/eldy/img/menus_black/externalsite_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/externalsite_over.png
rename to public/theme/eldy/img/menus_black/externalsite_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/ftp.png b/public/theme/eldy/img/menus_black/ftp.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/ftp.png
rename to public/theme/eldy/img/menus_black/ftp.png
diff --git a/htdocs/theme/eldy/img/menus_black/ftp_over.png b/public/theme/eldy/img/menus_black/ftp_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/ftp_over.png
rename to public/theme/eldy/img/menus_black/ftp_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/generic1.png b/public/theme/eldy/img/menus_black/generic1.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/generic1.png
rename to public/theme/eldy/img/menus_black/generic1.png
diff --git a/htdocs/theme/eldy/img/menus_black/generic1_over.png b/public/theme/eldy/img/menus_black/generic1_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/generic1_over.png
rename to public/theme/eldy/img/menus_black/generic1_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/generic2.png b/public/theme/eldy/img/menus_black/generic2.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/generic2.png
rename to public/theme/eldy/img/menus_black/generic2.png
diff --git a/htdocs/theme/eldy/img/menus_black/generic2_over.png b/public/theme/eldy/img/menus_black/generic2_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/generic2_over.png
rename to public/theme/eldy/img/menus_black/generic2_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/generic3.png b/public/theme/eldy/img/menus_black/generic3.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/generic3.png
rename to public/theme/eldy/img/menus_black/generic3.png
diff --git a/htdocs/theme/eldy/img/menus_black/generic3_over.png b/public/theme/eldy/img/menus_black/generic3_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/generic3_over.png
rename to public/theme/eldy/img/menus_black/generic3_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/generic4.png b/public/theme/eldy/img/menus_black/generic4.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/generic4.png
rename to public/theme/eldy/img/menus_black/generic4.png
diff --git a/htdocs/theme/eldy/img/menus_black/generic4_over.png b/public/theme/eldy/img/menus_black/generic4_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/generic4_over.png
rename to public/theme/eldy/img/menus_black/generic4_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/globe.png b/public/theme/eldy/img/menus_black/globe.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/globe.png
rename to public/theme/eldy/img/menus_black/globe.png
diff --git a/htdocs/theme/eldy/img/menus_black/globe_over.png b/public/theme/eldy/img/menus_black/globe_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/globe_over.png
rename to public/theme/eldy/img/menus_black/globe_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/holiday.png b/public/theme/eldy/img/menus_black/holiday.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/holiday.png
rename to public/theme/eldy/img/menus_black/holiday.png
diff --git a/htdocs/theme/eldy/img/menus_black/home.png b/public/theme/eldy/img/menus_black/home.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/home.png
rename to public/theme/eldy/img/menus_black/home.png
diff --git a/htdocs/theme/eldy/img/menus_black/home_over.png b/public/theme/eldy/img/menus_black/home_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/home_over.png
rename to public/theme/eldy/img/menus_black/home_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/mail.png b/public/theme/eldy/img/menus_black/mail.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/mail.png
rename to public/theme/eldy/img/menus_black/mail.png
diff --git a/htdocs/theme/eldy/img/menus_black/mail_over.png b/public/theme/eldy/img/menus_black/mail_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/mail_over.png
rename to public/theme/eldy/img/menus_black/mail_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/members.png b/public/theme/eldy/img/menus_black/members.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/members.png
rename to public/theme/eldy/img/menus_black/members.png
diff --git a/htdocs/theme/eldy/img/menus_black/members_over.png b/public/theme/eldy/img/menus_black/members_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/members_over.png
rename to public/theme/eldy/img/menus_black/members_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/menu.png b/public/theme/eldy/img/menus_black/menu.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/menu.png
rename to public/theme/eldy/img/menus_black/menu.png
diff --git a/htdocs/theme/eldy/img/menus_black/money.png b/public/theme/eldy/img/menus_black/money.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/money.png
rename to public/theme/eldy/img/menus_black/money.png
diff --git a/htdocs/theme/eldy/img/menus_black/money_over.png b/public/theme/eldy/img/menus_black/money_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/money_over.png
rename to public/theme/eldy/img/menus_black/money_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/pointofsale.png b/public/theme/eldy/img/menus_black/pointofsale.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/pointofsale.png
rename to public/theme/eldy/img/menus_black/pointofsale.png
diff --git a/htdocs/theme/eldy/img/menus_black/pointofsale_over.png b/public/theme/eldy/img/menus_black/pointofsale_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/pointofsale_over.png
rename to public/theme/eldy/img/menus_black/pointofsale_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/products.png b/public/theme/eldy/img/menus_black/products.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/products.png
rename to public/theme/eldy/img/menus_black/products.png
diff --git a/htdocs/theme/eldy/img/menus_black/products_over.png b/public/theme/eldy/img/menus_black/products_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/products_over.png
rename to public/theme/eldy/img/menus_black/products_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/project.png b/public/theme/eldy/img/menus_black/project.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/project.png
rename to public/theme/eldy/img/menus_black/project.png
diff --git a/htdocs/theme/eldy/img/menus_black/project_over.png b/public/theme/eldy/img/menus_black/project_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/project_over.png
rename to public/theme/eldy/img/menus_black/project_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/shop.png b/public/theme/eldy/img/menus_black/shop.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/shop.png
rename to public/theme/eldy/img/menus_black/shop.png
diff --git a/htdocs/theme/eldy/img/menus_black/shop_over.png b/public/theme/eldy/img/menus_black/shop_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/shop_over.png
rename to public/theme/eldy/img/menus_black/shop_over.png
diff --git a/htdocs/theme/eldy/img/menus_black/tools.png b/public/theme/eldy/img/menus_black/tools.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/tools.png
rename to public/theme/eldy/img/menus_black/tools.png
diff --git a/htdocs/theme/eldy/img/menus_black/tools_over.png b/public/theme/eldy/img/menus_black/tools_over.png
similarity index 100%
rename from htdocs/theme/eldy/img/menus_black/tools_over.png
rename to public/theme/eldy/img/menus_black/tools_over.png
diff --git a/htdocs/theme/eldy/img/menutab-r.png b/public/theme/eldy/img/menutab-r.png
similarity index 100%
rename from htdocs/theme/eldy/img/menutab-r.png
rename to public/theme/eldy/img/menutab-r.png
diff --git a/htdocs/theme/eldy/img/nav-overlay.png b/public/theme/eldy/img/nav-overlay.png
similarity index 100%
rename from htdocs/theme/eldy/img/nav-overlay.png
rename to public/theme/eldy/img/nav-overlay.png
diff --git a/htdocs/theme/eldy/img/nav-overlay3.png b/public/theme/eldy/img/nav-overlay3.png
similarity index 100%
rename from htdocs/theme/eldy/img/nav-overlay3.png
rename to public/theme/eldy/img/nav-overlay3.png
diff --git a/htdocs/theme/eldy/img/next.png b/public/theme/eldy/img/next.png
similarity index 100%
rename from htdocs/theme/eldy/img/next.png
rename to public/theme/eldy/img/next.png
diff --git a/htdocs/theme/eldy/img/nographyet.svg b/public/theme/eldy/img/nographyet.svg
similarity index 100%
rename from htdocs/theme/eldy/img/nographyet.svg
rename to public/theme/eldy/img/nographyet.svg
diff --git a/htdocs/theme/eldy/img/object_account.png b/public/theme/eldy/img/object_account.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_account.png
rename to public/theme/eldy/img/object_account.png
diff --git a/htdocs/theme/eldy/img/object_accounting.png b/public/theme/eldy/img/object_accounting.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_accounting.png
rename to public/theme/eldy/img/object_accounting.png
diff --git a/htdocs/theme/eldy/img/object_action.png b/public/theme/eldy/img/object_action.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_action.png
rename to public/theme/eldy/img/object_action.png
diff --git a/htdocs/theme/eldy/img/object_address.png b/public/theme/eldy/img/object_address.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_address.png
rename to public/theme/eldy/img/object_address.png
diff --git a/htdocs/theme/eldy/img/object_barcode.png b/public/theme/eldy/img/object_barcode.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_barcode.png
rename to public/theme/eldy/img/object_barcode.png
diff --git a/htdocs/theme/eldy/img/object_bill.png b/public/theme/eldy/img/object_bill.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_bill.png
rename to public/theme/eldy/img/object_bill.png
diff --git a/htdocs/theme/eldy/img/object_billa.png b/public/theme/eldy/img/object_billa.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_billa.png
rename to public/theme/eldy/img/object_billa.png
diff --git a/htdocs/theme/eldy/img/object_billd.png b/public/theme/eldy/img/object_billd.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_billd.png
rename to public/theme/eldy/img/object_billd.png
diff --git a/htdocs/theme/eldy/img/object_billr.png b/public/theme/eldy/img/object_billr.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_billr.png
rename to public/theme/eldy/img/object_billr.png
diff --git a/htdocs/theme/eldy/img/object_book.png b/public/theme/eldy/img/object_book.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_book.png
rename to public/theme/eldy/img/object_book.png
diff --git a/htdocs/theme/eldy/img/object_bookmark.png b/public/theme/eldy/img/object_bookmark.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_bookmark.png
rename to public/theme/eldy/img/object_bookmark.png
diff --git a/htdocs/theme/eldy/img/object_building.png b/public/theme/eldy/img/object_building.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_building.png
rename to public/theme/eldy/img/object_building.png
diff --git a/htdocs/theme/eldy/img/object_calendar.png b/public/theme/eldy/img/object_calendar.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_calendar.png
rename to public/theme/eldy/img/object_calendar.png
diff --git a/htdocs/theme/eldy/img/object_calendarday.png b/public/theme/eldy/img/object_calendarday.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_calendarday.png
rename to public/theme/eldy/img/object_calendarday.png
diff --git a/htdocs/theme/eldy/img/object_calendargantt.png b/public/theme/eldy/img/object_calendargantt.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_calendargantt.png
rename to public/theme/eldy/img/object_calendargantt.png
diff --git a/htdocs/theme/eldy/img/object_calendarpertype.png b/public/theme/eldy/img/object_calendarpertype.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_calendarpertype.png
rename to public/theme/eldy/img/object_calendarpertype.png
diff --git a/htdocs/theme/eldy/img/object_calendarperuser.png b/public/theme/eldy/img/object_calendarperuser.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_calendarperuser.png
rename to public/theme/eldy/img/object_calendarperuser.png
diff --git a/htdocs/theme/eldy/img/object_calendarweek.png b/public/theme/eldy/img/object_calendarweek.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_calendarweek.png
rename to public/theme/eldy/img/object_calendarweek.png
diff --git a/htdocs/theme/eldy/img/object_category-expanded.png b/public/theme/eldy/img/object_category-expanded.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_category-expanded.png
rename to public/theme/eldy/img/object_category-expanded.png
diff --git a/htdocs/theme/eldy/img/object_category.png b/public/theme/eldy/img/object_category.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_category.png
rename to public/theme/eldy/img/object_category.png
diff --git a/htdocs/theme/eldy/img/object_commercial.png b/public/theme/eldy/img/object_commercial.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_commercial.png
rename to public/theme/eldy/img/object_commercial.png
diff --git a/htdocs/theme/eldy/img/object_company.png b/public/theme/eldy/img/object_company.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_company.png
rename to public/theme/eldy/img/object_company.png
diff --git a/htdocs/theme/eldy/img/object_contact.png b/public/theme/eldy/img/object_contact.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_contact.png
rename to public/theme/eldy/img/object_contact.png
diff --git a/htdocs/theme/eldy/img/object_contract.png b/public/theme/eldy/img/object_contract.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_contract.png
rename to public/theme/eldy/img/object_contract.png
diff --git a/htdocs/theme/eldy/img/object_cron.png b/public/theme/eldy/img/object_cron.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_cron.png
rename to public/theme/eldy/img/object_cron.png
diff --git a/htdocs/theme/eldy/img/object_dir.png b/public/theme/eldy/img/object_dir.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_dir.png
rename to public/theme/eldy/img/object_dir.png
diff --git a/htdocs/theme/eldy/img/object_email.png b/public/theme/eldy/img/object_email.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_email.png
rename to public/theme/eldy/img/object_email.png
diff --git a/htdocs/theme/eldy/img/object_energy.png b/public/theme/eldy/img/object_energy.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_energy.png
rename to public/theme/eldy/img/object_energy.png
diff --git a/htdocs/theme/eldy/img/object_generic.png b/public/theme/eldy/img/object_generic.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_generic.png
rename to public/theme/eldy/img/object_generic.png
diff --git a/htdocs/theme/eldy/img/object_globe.png b/public/theme/eldy/img/object_globe.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_globe.png
rename to public/theme/eldy/img/object_globe.png
diff --git a/htdocs/theme/eldy/img/object_gravatar.png b/public/theme/eldy/img/object_gravatar.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_gravatar.png
rename to public/theme/eldy/img/object_gravatar.png
diff --git a/htdocs/theme/eldy/img/object_group.png b/public/theme/eldy/img/object_group.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_group.png
rename to public/theme/eldy/img/object_group.png
diff --git a/htdocs/theme/eldy/img/object_holiday.png b/public/theme/eldy/img/object_holiday.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_holiday.png
rename to public/theme/eldy/img/object_holiday.png
diff --git a/htdocs/theme/eldy/img/object_intervention.png b/public/theme/eldy/img/object_intervention.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_intervention.png
rename to public/theme/eldy/img/object_intervention.png
diff --git a/htdocs/theme/eldy/img/object_invoice.png b/public/theme/eldy/img/object_invoice.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_invoice.png
rename to public/theme/eldy/img/object_invoice.png
diff --git a/htdocs/theme/eldy/img/object_label.png b/public/theme/eldy/img/object_label.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_label.png
rename to public/theme/eldy/img/object_label.png
diff --git a/htdocs/theme/eldy/img/object_list.png b/public/theme/eldy/img/object_list.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_list.png
rename to public/theme/eldy/img/object_list.png
diff --git a/htdocs/theme/eldy/img/object_margin.png b/public/theme/eldy/img/object_margin.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_margin.png
rename to public/theme/eldy/img/object_margin.png
diff --git a/htdocs/theme/eldy/img/object_multicurrency.png b/public/theme/eldy/img/object_multicurrency.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_multicurrency.png
rename to public/theme/eldy/img/object_multicurrency.png
diff --git a/htdocs/theme/eldy/img/object_opensurvey.png b/public/theme/eldy/img/object_opensurvey.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_opensurvey.png
rename to public/theme/eldy/img/object_opensurvey.png
diff --git a/htdocs/theme/eldy/img/object_order.png b/public/theme/eldy/img/object_order.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_order.png
rename to public/theme/eldy/img/object_order.png
diff --git a/htdocs/theme/eldy/img/object_payment.png b/public/theme/eldy/img/object_payment.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_payment.png
rename to public/theme/eldy/img/object_payment.png
diff --git a/htdocs/theme/eldy/img/object_phoning.png b/public/theme/eldy/img/object_phoning.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_phoning.png
rename to public/theme/eldy/img/object_phoning.png
diff --git a/htdocs/theme/eldy/img/object_phoning_fax.png b/public/theme/eldy/img/object_phoning_fax.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_phoning_fax.png
rename to public/theme/eldy/img/object_phoning_fax.png
diff --git a/htdocs/theme/eldy/img/object_printer.png b/public/theme/eldy/img/object_printer.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_printer.png
rename to public/theme/eldy/img/object_printer.png
diff --git a/htdocs/theme/eldy/img/object_product.png b/public/theme/eldy/img/object_product.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_product.png
rename to public/theme/eldy/img/object_product.png
diff --git a/htdocs/theme/eldy/img/object_project.png b/public/theme/eldy/img/object_project.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_project.png
rename to public/theme/eldy/img/object_project.png
diff --git a/htdocs/theme/eldy/img/object_projectpub.png b/public/theme/eldy/img/object_projectpub.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_projectpub.png
rename to public/theme/eldy/img/object_projectpub.png
diff --git a/htdocs/theme/eldy/img/object_projecttask.png b/public/theme/eldy/img/object_projecttask.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_projecttask.png
rename to public/theme/eldy/img/object_projecttask.png
diff --git a/htdocs/theme/eldy/img/object_propal.png b/public/theme/eldy/img/object_propal.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_propal.png
rename to public/theme/eldy/img/object_propal.png
diff --git a/htdocs/theme/eldy/img/object_reduc.png b/public/theme/eldy/img/object_reduc.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_reduc.png
rename to public/theme/eldy/img/object_reduc.png
diff --git a/htdocs/theme/eldy/img/object_resource.png b/public/theme/eldy/img/object_resource.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_resource.png
rename to public/theme/eldy/img/object_resource.png
diff --git a/htdocs/theme/eldy/img/object_rss.png b/public/theme/eldy/img/object_rss.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_rss.png
rename to public/theme/eldy/img/object_rss.png
diff --git a/htdocs/theme/eldy/img/object_sending.png b/public/theme/eldy/img/object_sending.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_sending.png
rename to public/theme/eldy/img/object_sending.png
diff --git a/htdocs/theme/eldy/img/object_service.png b/public/theme/eldy/img/object_service.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_service.png
rename to public/theme/eldy/img/object_service.png
diff --git a/htdocs/theme/eldy/img/object_skype.png b/public/theme/eldy/img/object_skype.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_skype.png
rename to public/theme/eldy/img/object_skype.png
diff --git a/htdocs/theme/eldy/img/object_stock.png b/public/theme/eldy/img/object_stock.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_stock.png
rename to public/theme/eldy/img/object_stock.png
diff --git a/htdocs/theme/eldy/img/object_supplier_proposal.png b/public/theme/eldy/img/object_supplier_proposal.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_supplier_proposal.png
rename to public/theme/eldy/img/object_supplier_proposal.png
diff --git a/htdocs/theme/eldy/img/object_task.png b/public/theme/eldy/img/object_task.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_task.png
rename to public/theme/eldy/img/object_task.png
diff --git a/htdocs/theme/eldy/img/object_task_time.png b/public/theme/eldy/img/object_task_time.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_task_time.png
rename to public/theme/eldy/img/object_task_time.png
diff --git a/htdocs/theme/eldy/img/object_tax.png b/public/theme/eldy/img/object_tax.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_tax.png
rename to public/theme/eldy/img/object_tax.png
diff --git a/htdocs/theme/eldy/img/object_technic.png b/public/theme/eldy/img/object_technic.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_technic.png
rename to public/theme/eldy/img/object_technic.png
diff --git a/htdocs/theme/eldy/img/object_trip.png b/public/theme/eldy/img/object_trip.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_trip.png
rename to public/theme/eldy/img/object_trip.png
diff --git a/htdocs/theme/eldy/img/object_user.png b/public/theme/eldy/img/object_user.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_user.png
rename to public/theme/eldy/img/object_user.png
diff --git a/htdocs/theme/eldy/img/off.png b/public/theme/eldy/img/off.png
similarity index 100%
rename from htdocs/theme/eldy/img/off.png
rename to public/theme/eldy/img/off.png
diff --git a/htdocs/theme/eldy/img/on.png b/public/theme/eldy/img/on.png
similarity index 100%
rename from htdocs/theme/eldy/img/on.png
rename to public/theme/eldy/img/on.png
diff --git a/htdocs/theme/eldy/img/pdf2.png b/public/theme/eldy/img/pdf2.png
similarity index 100%
rename from htdocs/theme/eldy/img/pdf2.png
rename to public/theme/eldy/img/pdf2.png
diff --git a/htdocs/theme/eldy/img/pdf3.png b/public/theme/eldy/img/pdf3.png
similarity index 100%
rename from htdocs/theme/eldy/img/pdf3.png
rename to public/theme/eldy/img/pdf3.png
diff --git a/htdocs/theme/eldy/img/play.png b/public/theme/eldy/img/play.png
similarity index 100%
rename from htdocs/theme/eldy/img/play.png
rename to public/theme/eldy/img/play.png
diff --git a/htdocs/theme/eldy/img/playdisabled.png b/public/theme/eldy/img/playdisabled.png
similarity index 100%
rename from htdocs/theme/eldy/img/playdisabled.png
rename to public/theme/eldy/img/playdisabled.png
diff --git a/htdocs/theme/eldy/img/preview.png b/public/theme/eldy/img/preview.png
similarity index 100%
rename from htdocs/theme/eldy/img/preview.png
rename to public/theme/eldy/img/preview.png
diff --git a/htdocs/theme/eldy/img/preview_ext.png b/public/theme/eldy/img/preview_ext.png
similarity index 100%
rename from htdocs/theme/eldy/img/preview_ext.png
rename to public/theme/eldy/img/preview_ext.png
diff --git a/htdocs/theme/eldy/img/previous.png b/public/theme/eldy/img/previous.png
similarity index 100%
rename from htdocs/theme/eldy/img/previous.png
rename to public/theme/eldy/img/previous.png
diff --git a/htdocs/theme/eldy/img/printer.png b/public/theme/eldy/img/printer.png
similarity index 100%
rename from htdocs/theme/eldy/img/printer.png
rename to public/theme/eldy/img/printer.png
diff --git a/htdocs/theme/eldy/img/printer_top.png b/public/theme/eldy/img/printer_top.png
similarity index 100%
rename from htdocs/theme/eldy/img/printer_top.png
rename to public/theme/eldy/img/printer_top.png
diff --git a/htdocs/theme/eldy/img/puce.png b/public/theme/eldy/img/puce.png
similarity index 100%
rename from htdocs/theme/eldy/img/puce.png
rename to public/theme/eldy/img/puce.png
diff --git a/htdocs/theme/eldy/img/recent.png b/public/theme/eldy/img/recent.png
similarity index 100%
rename from htdocs/theme/eldy/img/recent.png
rename to public/theme/eldy/img/recent.png
diff --git a/htdocs/theme/eldy/img/redstar.png b/public/theme/eldy/img/redstar.png
similarity index 100%
rename from htdocs/theme/eldy/img/redstar.png
rename to public/theme/eldy/img/redstar.png
diff --git a/htdocs/theme/eldy/img/refresh.png b/public/theme/eldy/img/refresh.png
similarity index 100%
rename from htdocs/theme/eldy/img/refresh.png
rename to public/theme/eldy/img/refresh.png
diff --git a/htdocs/theme/eldy/img/reload.png b/public/theme/eldy/img/reload.png
similarity index 100%
rename from htdocs/theme/eldy/img/reload.png
rename to public/theme/eldy/img/reload.png
diff --git a/htdocs/theme/eldy/img/rightarrow.png b/public/theme/eldy/img/rightarrow.png
similarity index 100%
rename from htdocs/theme/eldy/img/rightarrow.png
rename to public/theme/eldy/img/rightarrow.png
diff --git a/htdocs/theme/eldy/img/search.png b/public/theme/eldy/img/search.png
similarity index 100%
rename from htdocs/theme/eldy/img/search.png
rename to public/theme/eldy/img/search.png
diff --git a/htdocs/theme/eldy/img/searchclear.png b/public/theme/eldy/img/searchclear.png
similarity index 100%
rename from htdocs/theme/eldy/img/searchclear.png
rename to public/theme/eldy/img/searchclear.png
diff --git a/htdocs/theme/eldy/img/setup.png b/public/theme/eldy/img/setup.png
similarity index 100%
rename from htdocs/theme/eldy/img/setup.png
rename to public/theme/eldy/img/setup.png
diff --git a/htdocs/theme/eldy/img/sort_asc.png b/public/theme/eldy/img/sort_asc.png
similarity index 100%
rename from htdocs/theme/eldy/img/sort_asc.png
rename to public/theme/eldy/img/sort_asc.png
diff --git a/htdocs/theme/eldy/img/sort_asc_disabled.png b/public/theme/eldy/img/sort_asc_disabled.png
similarity index 100%
rename from htdocs/theme/eldy/img/sort_asc_disabled.png
rename to public/theme/eldy/img/sort_asc_disabled.png
diff --git a/htdocs/theme/eldy/img/sort_desc.png b/public/theme/eldy/img/sort_desc.png
similarity index 100%
rename from htdocs/theme/eldy/img/sort_desc.png
rename to public/theme/eldy/img/sort_desc.png
diff --git a/htdocs/theme/eldy/img/sort_desc_disabled.png b/public/theme/eldy/img/sort_desc_disabled.png
similarity index 100%
rename from htdocs/theme/eldy/img/sort_desc_disabled.png
rename to public/theme/eldy/img/sort_desc_disabled.png
diff --git a/htdocs/theme/eldy/img/split.png b/public/theme/eldy/img/split.png
similarity index 100%
rename from htdocs/theme/eldy/img/split.png
rename to public/theme/eldy/img/split.png
diff --git a/htdocs/theme/eldy/img/star.png b/public/theme/eldy/img/star.png
similarity index 100%
rename from htdocs/theme/eldy/img/star.png
rename to public/theme/eldy/img/star.png
diff --git a/htdocs/theme/eldy/img/stats.png b/public/theme/eldy/img/stats.png
similarity index 100%
rename from htdocs/theme/eldy/img/stats.png
rename to public/theme/eldy/img/stats.png
diff --git a/htdocs/theme/eldy/img/statut0.png b/public/theme/eldy/img/statut0.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut0.png
rename to public/theme/eldy/img/statut0.png
diff --git a/htdocs/theme/eldy/img/statut0_40x40.png b/public/theme/eldy/img/statut0_40x40.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut0_40x40.png
rename to public/theme/eldy/img/statut0_40x40.png
diff --git a/htdocs/theme/eldy/img/statut1.png b/public/theme/eldy/img/statut1.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut1.png
rename to public/theme/eldy/img/statut1.png
diff --git a/htdocs/theme/eldy/img/statut1_40x40.png b/public/theme/eldy/img/statut1_40x40.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut1_40x40.png
rename to public/theme/eldy/img/statut1_40x40.png
diff --git a/htdocs/theme/eldy/img/statut3.png b/public/theme/eldy/img/statut3.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut3.png
rename to public/theme/eldy/img/statut3.png
diff --git a/htdocs/theme/eldy/img/statut3_40x40.png b/public/theme/eldy/img/statut3_40x40.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut3_40x40.png
rename to public/theme/eldy/img/statut3_40x40.png
diff --git a/htdocs/theme/eldy/img/statut4.png b/public/theme/eldy/img/statut4.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut4.png
rename to public/theme/eldy/img/statut4.png
diff --git a/htdocs/theme/eldy/img/statut4_40x40.png b/public/theme/eldy/img/statut4_40x40.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut4_40x40.png
rename to public/theme/eldy/img/statut4_40x40.png
diff --git a/htdocs/theme/eldy/img/statut5.png b/public/theme/eldy/img/statut5.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut5.png
rename to public/theme/eldy/img/statut5.png
diff --git a/htdocs/theme/eldy/img/statut5_40x40.png b/public/theme/eldy/img/statut5_40x40.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut5_40x40.png
rename to public/theme/eldy/img/statut5_40x40.png
diff --git a/htdocs/theme/eldy/img/statut6.png b/public/theme/eldy/img/statut6.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut6.png
rename to public/theme/eldy/img/statut6.png
diff --git a/htdocs/theme/eldy/img/statut6_40x40.png b/public/theme/eldy/img/statut6_40x40.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut6_40x40.png
rename to public/theme/eldy/img/statut6_40x40.png
diff --git a/htdocs/theme/eldy/img/statut7.png b/public/theme/eldy/img/statut7.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut7.png
rename to public/theme/eldy/img/statut7.png
diff --git a/htdocs/theme/eldy/img/statut7_40x40.png b/public/theme/eldy/img/statut7_40x40.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut7_40x40.png
rename to public/theme/eldy/img/statut7_40x40.png
diff --git a/htdocs/theme/eldy/img/statut8.png b/public/theme/eldy/img/statut8.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut8.png
rename to public/theme/eldy/img/statut8.png
diff --git a/htdocs/theme/eldy/img/statut8_40x40.png b/public/theme/eldy/img/statut8_40x40.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut8_40x40.png
rename to public/theme/eldy/img/statut8_40x40.png
diff --git a/htdocs/theme/eldy/img/statut9.png b/public/theme/eldy/img/statut9.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut9.png
rename to public/theme/eldy/img/statut9.png
diff --git a/htdocs/theme/eldy/img/statut9_40x40.png b/public/theme/eldy/img/statut9_40x40.png
similarity index 100%
rename from htdocs/theme/eldy/img/statut9_40x40.png
rename to public/theme/eldy/img/statut9_40x40.png
diff --git a/htdocs/theme/eldy/img/stcomm-1.png b/public/theme/eldy/img/stcomm-1.png
similarity index 100%
rename from htdocs/theme/eldy/img/stcomm-1.png
rename to public/theme/eldy/img/stcomm-1.png
diff --git a/htdocs/theme/eldy/img/stcomm0.png b/public/theme/eldy/img/stcomm0.png
similarity index 100%
rename from htdocs/theme/eldy/img/stcomm0.png
rename to public/theme/eldy/img/stcomm0.png
diff --git a/htdocs/theme/eldy/img/stcomm1.png b/public/theme/eldy/img/stcomm1.png
similarity index 100%
rename from htdocs/theme/eldy/img/stcomm1.png
rename to public/theme/eldy/img/stcomm1.png
diff --git a/htdocs/theme/eldy/img/stcomm2.png b/public/theme/eldy/img/stcomm2.png
similarity index 100%
rename from htdocs/theme/eldy/img/stcomm2.png
rename to public/theme/eldy/img/stcomm2.png
diff --git a/htdocs/theme/eldy/img/stcomm3.png b/public/theme/eldy/img/stcomm3.png
similarity index 100%
rename from htdocs/theme/eldy/img/stcomm3.png
rename to public/theme/eldy/img/stcomm3.png
diff --git a/htdocs/theme/eldy/img/stcomm4.png b/public/theme/eldy/img/stcomm4.png
similarity index 100%
rename from htdocs/theme/eldy/img/stcomm4.png
rename to public/theme/eldy/img/stcomm4.png
diff --git a/htdocs/theme/eldy/img/switch_off.png b/public/theme/eldy/img/switch_off.png
similarity index 100%
rename from htdocs/theme/eldy/img/switch_off.png
rename to public/theme/eldy/img/switch_off.png
diff --git a/htdocs/theme/eldy/img/switch_on.png b/public/theme/eldy/img/switch_on.png
similarity index 100%
rename from htdocs/theme/eldy/img/switch_on.png
rename to public/theme/eldy/img/switch_on.png
diff --git a/htdocs/theme/eldy/img/tab_background.png b/public/theme/eldy/img/tab_background.png
similarity index 100%
rename from htdocs/theme/eldy/img/tab_background.png
rename to public/theme/eldy/img/tab_background.png
diff --git a/htdocs/theme/eldy/img/tick.png b/public/theme/eldy/img/tick.png
similarity index 100%
rename from htdocs/theme/eldy/img/tick.png
rename to public/theme/eldy/img/tick.png
diff --git a/htdocs/theme/eldy/img/title.gif b/public/theme/eldy/img/title.gif
similarity index 100%
rename from htdocs/theme/eldy/img/title.gif
rename to public/theme/eldy/img/title.gif
diff --git a/htdocs/theme/eldy/img/title.png b/public/theme/eldy/img/title.png
similarity index 100%
rename from htdocs/theme/eldy/img/title.png
rename to public/theme/eldy/img/title.png
diff --git a/htdocs/theme/eldy/img/title_accountancy.png b/public/theme/eldy/img/title_accountancy.png
similarity index 100%
rename from htdocs/theme/eldy/img/title_accountancy.png
rename to public/theme/eldy/img/title_accountancy.png
diff --git a/htdocs/theme/eldy/img/title_agenda.png b/public/theme/eldy/img/title_agenda.png
similarity index 100%
rename from htdocs/theme/eldy/img/title_agenda.png
rename to public/theme/eldy/img/title_agenda.png
diff --git a/htdocs/theme/eldy/img/title_bank.png b/public/theme/eldy/img/title_bank.png
similarity index 100%
rename from htdocs/theme/eldy/img/title_bank.png
rename to public/theme/eldy/img/title_bank.png
diff --git a/htdocs/theme/eldy/img/title_commercial.png b/public/theme/eldy/img/title_commercial.png
similarity index 100%
rename from htdocs/theme/eldy/img/title_commercial.png
rename to public/theme/eldy/img/title_commercial.png
diff --git a/htdocs/theme/eldy/img/title_companies.png b/public/theme/eldy/img/title_companies.png
similarity index 100%
rename from htdocs/theme/eldy/img/title_companies.png
rename to public/theme/eldy/img/title_companies.png
diff --git a/htdocs/theme/eldy/img/title_generic.png b/public/theme/eldy/img/title_generic.png
similarity index 100%
rename from htdocs/theme/eldy/img/title_generic.png
rename to public/theme/eldy/img/title_generic.png
diff --git a/htdocs/theme/eldy/img/title_home.png b/public/theme/eldy/img/title_home.png
similarity index 100%
rename from htdocs/theme/eldy/img/title_home.png
rename to public/theme/eldy/img/title_home.png
diff --git a/htdocs/theme/eldy/img/title_hrm.png b/public/theme/eldy/img/title_hrm.png
similarity index 100%
rename from htdocs/theme/eldy/img/title_hrm.png
rename to public/theme/eldy/img/title_hrm.png
diff --git a/htdocs/theme/eldy/img/title_products.png b/public/theme/eldy/img/title_products.png
similarity index 100%
rename from htdocs/theme/eldy/img/title_products.png
rename to public/theme/eldy/img/title_products.png
diff --git a/htdocs/theme/eldy/img/title_project.png b/public/theme/eldy/img/title_project.png
similarity index 100%
rename from htdocs/theme/eldy/img/title_project.png
rename to public/theme/eldy/img/title_project.png
diff --git a/htdocs/theme/eldy/img/title_setup.png b/public/theme/eldy/img/title_setup.png
similarity index 100%
rename from htdocs/theme/eldy/img/title_setup.png
rename to public/theme/eldy/img/title_setup.png
diff --git a/htdocs/theme/eldy/img/tmenu.jpg b/public/theme/eldy/img/tmenu.jpg
similarity index 100%
rename from htdocs/theme/eldy/img/tmenu.jpg
rename to public/theme/eldy/img/tmenu.jpg
diff --git a/htdocs/theme/eldy/img/tmenu2.jpg b/public/theme/eldy/img/tmenu2.jpg
similarity index 100%
rename from htdocs/theme/eldy/img/tmenu2.jpg
rename to public/theme/eldy/img/tmenu2.jpg
diff --git a/htdocs/theme/eldy/img/tmenu3.jpg b/public/theme/eldy/img/tmenu3.jpg
similarity index 100%
rename from htdocs/theme/eldy/img/tmenu3.jpg
rename to public/theme/eldy/img/tmenu3.jpg
diff --git a/htdocs/theme/eldy/img/tmenu_inverse.jpg b/public/theme/eldy/img/tmenu_inverse.jpg
similarity index 100%
rename from htdocs/theme/eldy/img/tmenu_inverse.jpg
rename to public/theme/eldy/img/tmenu_inverse.jpg
diff --git a/htdocs/theme/eldy/img/unlock.png b/public/theme/eldy/img/unlock.png
similarity index 100%
rename from htdocs/theme/eldy/img/unlock.png
rename to public/theme/eldy/img/unlock.png
diff --git a/htdocs/theme/eldy/img/uparrow.png b/public/theme/eldy/img/uparrow.png
similarity index 100%
rename from htdocs/theme/eldy/img/uparrow.png
rename to public/theme/eldy/img/uparrow.png
diff --git a/htdocs/theme/eldy/img/upload.png b/public/theme/eldy/img/upload.png
similarity index 100%
rename from htdocs/theme/eldy/img/upload.png
rename to public/theme/eldy/img/upload.png
diff --git a/htdocs/theme/eldy/img/vcard.png b/public/theme/eldy/img/vcard.png
similarity index 100%
rename from htdocs/theme/eldy/img/vcard.png
rename to public/theme/eldy/img/vcard.png
diff --git a/htdocs/theme/eldy/img/view.png b/public/theme/eldy/img/view.png
similarity index 100%
rename from htdocs/theme/eldy/img/view.png
rename to public/theme/eldy/img/view.png
diff --git a/htdocs/theme/eldy/img/warning.png b/public/theme/eldy/img/warning.png
similarity index 100%
rename from htdocs/theme/eldy/img/warning.png
rename to public/theme/eldy/img/warning.png
diff --git a/htdocs/theme/eldy/img/weather/index.html b/public/theme/eldy/img/weather/index.html
similarity index 100%
rename from htdocs/theme/eldy/img/weather/index.html
rename to public/theme/eldy/img/weather/index.html
diff --git a/htdocs/theme/eldy/img/weather/weather-clear-night.png b/public/theme/eldy/img/weather/weather-clear-night.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-clear-night.png
rename to public/theme/eldy/img/weather/weather-clear-night.png
diff --git a/htdocs/theme/eldy/img/weather/weather-clear.png b/public/theme/eldy/img/weather/weather-clear.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-clear.png
rename to public/theme/eldy/img/weather/weather-clear.png
diff --git a/htdocs/theme/eldy/img/weather/weather-clouds-night.png b/public/theme/eldy/img/weather/weather-clouds-night.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-clouds-night.png
rename to public/theme/eldy/img/weather/weather-clouds-night.png
diff --git a/htdocs/theme/eldy/img/weather/weather-clouds.png b/public/theme/eldy/img/weather/weather-clouds.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-clouds.png
rename to public/theme/eldy/img/weather/weather-clouds.png
diff --git a/htdocs/theme/eldy/img/weather/weather-few-clouds-night.png b/public/theme/eldy/img/weather/weather-few-clouds-night.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-few-clouds-night.png
rename to public/theme/eldy/img/weather/weather-few-clouds-night.png
diff --git a/htdocs/theme/eldy/img/weather/weather-few-clouds.png b/public/theme/eldy/img/weather/weather-few-clouds.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-few-clouds.png
rename to public/theme/eldy/img/weather/weather-few-clouds.png
diff --git a/htdocs/theme/eldy/img/weather/weather-freezing-rain.png b/public/theme/eldy/img/weather/weather-freezing-rain.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-freezing-rain.png
rename to public/theme/eldy/img/weather/weather-freezing-rain.png
diff --git a/htdocs/theme/eldy/img/weather/weather-hail.png b/public/theme/eldy/img/weather/weather-hail.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-hail.png
rename to public/theme/eldy/img/weather/weather-hail.png
diff --git a/htdocs/theme/eldy/img/weather/weather-many-clouds.png b/public/theme/eldy/img/weather/weather-many-clouds.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-many-clouds.png
rename to public/theme/eldy/img/weather/weather-many-clouds.png
diff --git a/htdocs/theme/eldy/img/weather/weather-mist.png b/public/theme/eldy/img/weather/weather-mist.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-mist.png
rename to public/theme/eldy/img/weather/weather-mist.png
diff --git a/htdocs/theme/eldy/img/weather/weather-showers-day.png b/public/theme/eldy/img/weather/weather-showers-day.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-showers-day.png
rename to public/theme/eldy/img/weather/weather-showers-day.png
diff --git a/htdocs/theme/eldy/img/weather/weather-showers-night.png b/public/theme/eldy/img/weather/weather-showers-night.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-showers-night.png
rename to public/theme/eldy/img/weather/weather-showers-night.png
diff --git a/htdocs/theme/eldy/img/weather/weather-showers-scattered-day.png b/public/theme/eldy/img/weather/weather-showers-scattered-day.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-showers-scattered-day.png
rename to public/theme/eldy/img/weather/weather-showers-scattered-day.png
diff --git a/htdocs/theme/eldy/img/weather/weather-showers-scattered-night.png b/public/theme/eldy/img/weather/weather-showers-scattered-night.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-showers-scattered-night.png
rename to public/theme/eldy/img/weather/weather-showers-scattered-night.png
diff --git a/htdocs/theme/eldy/img/weather/weather-showers-scattered.png b/public/theme/eldy/img/weather/weather-showers-scattered.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-showers-scattered.png
rename to public/theme/eldy/img/weather/weather-showers-scattered.png
diff --git a/htdocs/theme/eldy/img/weather/weather-showers.png b/public/theme/eldy/img/weather/weather-showers.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-showers.png
rename to public/theme/eldy/img/weather/weather-showers.png
diff --git a/htdocs/theme/eldy/img/weather/weather-snow-rain.png b/public/theme/eldy/img/weather/weather-snow-rain.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-snow-rain.png
rename to public/theme/eldy/img/weather/weather-snow-rain.png
diff --git a/htdocs/theme/eldy/img/weather/weather-snow-scattered-day.png b/public/theme/eldy/img/weather/weather-snow-scattered-day.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-snow-scattered-day.png
rename to public/theme/eldy/img/weather/weather-snow-scattered-day.png
diff --git a/htdocs/theme/eldy/img/weather/weather-snow-scattered-night.png b/public/theme/eldy/img/weather/weather-snow-scattered-night.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-snow-scattered-night.png
rename to public/theme/eldy/img/weather/weather-snow-scattered-night.png
diff --git a/htdocs/theme/eldy/img/weather/weather-snow-scattered.png b/public/theme/eldy/img/weather/weather-snow-scattered.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-snow-scattered.png
rename to public/theme/eldy/img/weather/weather-snow-scattered.png
diff --git a/htdocs/theme/eldy/img/weather/weather-snow.png b/public/theme/eldy/img/weather/weather-snow.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-snow.png
rename to public/theme/eldy/img/weather/weather-snow.png
diff --git a/htdocs/theme/eldy/img/weather/weather-storm-day.png b/public/theme/eldy/img/weather/weather-storm-day.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-storm-day.png
rename to public/theme/eldy/img/weather/weather-storm-day.png
diff --git a/htdocs/theme/eldy/img/weather/weather-storm-night.png b/public/theme/eldy/img/weather/weather-storm-night.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-storm-night.png
rename to public/theme/eldy/img/weather/weather-storm-night.png
diff --git a/htdocs/theme/eldy/img/weather/weather-storm.png b/public/theme/eldy/img/weather/weather-storm.png
similarity index 100%
rename from htdocs/theme/eldy/img/weather/weather-storm.png
rename to public/theme/eldy/img/weather/weather-storm.png
diff --git a/htdocs/theme/eldy/img/working.gif b/public/theme/eldy/img/working.gif
similarity index 100%
rename from htdocs/theme/eldy/img/working.gif
rename to public/theme/eldy/img/working.gif
diff --git a/htdocs/theme/eldy/img/working2.gif b/public/theme/eldy/img/working2.gif
similarity index 100%
rename from htdocs/theme/eldy/img/working2.gif
rename to public/theme/eldy/img/working2.gif
diff --git a/htdocs/theme/eldy/index.html b/public/theme/eldy/index.html
similarity index 100%
rename from htdocs/theme/eldy/index.html
rename to public/theme/eldy/index.html
diff --git a/htdocs/theme/eldy/style.css.php b/public/theme/eldy/style.css.php
similarity index 100%
rename from htdocs/theme/eldy/style.css.php
rename to public/theme/eldy/style.css.php
diff --git a/htdocs/theme/eldy/thumb.png b/public/theme/eldy/thumb.png
similarity index 100%
rename from htdocs/theme/eldy/thumb.png
rename to public/theme/eldy/thumb.png
diff --git a/htdocs/theme/eldy/tpl/README b/public/theme/eldy/tpl/README
similarity index 100%
rename from htdocs/theme/eldy/tpl/README
rename to public/theme/eldy/tpl/README
diff --git a/htdocs/theme/eldy/tpl/index.html b/public/theme/eldy/tpl/index.html
similarity index 100%
rename from htdocs/theme/eldy/tpl/index.html
rename to public/theme/eldy/tpl/index.html
diff --git a/htdocs/theme/index.html b/public/theme/index.html
similarity index 100%
rename from htdocs/theme/index.html
rename to public/theme/index.html
diff --git a/htdocs/theme/login_background.png b/public/theme/login_background.png
similarity index 100%
rename from htdocs/theme/login_background.png
rename to public/theme/login_background.png
diff --git a/htdocs/theme/login_logo.png b/public/theme/login_logo.png
similarity index 100%
rename from htdocs/theme/login_logo.png
rename to public/theme/login_logo.png
diff --git a/htdocs/theme/md/.gitignore b/public/theme/md/.gitignore
similarity index 100%
rename from htdocs/theme/md/.gitignore
rename to public/theme/md/.gitignore
diff --git a/htdocs/theme/md/AUTHOR b/public/theme/md/AUTHOR
similarity index 100%
rename from htdocs/theme/md/AUTHOR
rename to public/theme/md/AUTHOR
diff --git a/htdocs/theme/md/ckeditor/config.js b/public/theme/md/ckeditor/config.js
similarity index 100%
rename from htdocs/theme/md/ckeditor/config.js
rename to public/theme/md/ckeditor/config.js
diff --git a/htdocs/theme/md/ckeditor/index.html b/public/theme/md/ckeditor/index.html
similarity index 100%
rename from htdocs/theme/md/ckeditor/index.html
rename to public/theme/md/ckeditor/index.html
diff --git a/htdocs/theme/md/graph-color.php b/public/theme/md/graph-color.php
similarity index 100%
rename from htdocs/theme/md/graph-color.php
rename to public/theme/md/graph-color.php
diff --git a/htdocs/theme/md/img/1downarrow.png b/public/theme/md/img/1downarrow.png
similarity index 100%
rename from htdocs/theme/md/img/1downarrow.png
rename to public/theme/md/img/1downarrow.png
diff --git a/htdocs/theme/md/img/1downarrow_selected.png b/public/theme/md/img/1downarrow_selected.png
similarity index 100%
rename from htdocs/theme/md/img/1downarrow_selected.png
rename to public/theme/md/img/1downarrow_selected.png
diff --git a/htdocs/theme/md/img/1leftarrow.png b/public/theme/md/img/1leftarrow.png
similarity index 100%
rename from htdocs/theme/md/img/1leftarrow.png
rename to public/theme/md/img/1leftarrow.png
diff --git a/htdocs/theme/md/img/1leftarrow_selected.png b/public/theme/md/img/1leftarrow_selected.png
similarity index 100%
rename from htdocs/theme/md/img/1leftarrow_selected.png
rename to public/theme/md/img/1leftarrow_selected.png
diff --git a/htdocs/theme/md/img/1rightarrow.png b/public/theme/md/img/1rightarrow.png
similarity index 100%
rename from htdocs/theme/md/img/1rightarrow.png
rename to public/theme/md/img/1rightarrow.png
diff --git a/htdocs/theme/md/img/1rightarrow_selected.png b/public/theme/md/img/1rightarrow_selected.png
similarity index 100%
rename from htdocs/theme/md/img/1rightarrow_selected.png
rename to public/theme/md/img/1rightarrow_selected.png
diff --git a/htdocs/theme/md/img/1uparrow.png b/public/theme/md/img/1uparrow.png
similarity index 100%
rename from htdocs/theme/md/img/1uparrow.png
rename to public/theme/md/img/1uparrow.png
diff --git a/htdocs/theme/md/img/1uparrow_selected.png b/public/theme/md/img/1uparrow_selected.png
similarity index 100%
rename from htdocs/theme/md/img/1uparrow_selected.png
rename to public/theme/md/img/1uparrow_selected.png
diff --git a/htdocs/theme/md/img/addfile.png b/public/theme/md/img/addfile.png
similarity index 100%
rename from htdocs/theme/md/img/addfile.png
rename to public/theme/md/img/addfile.png
diff --git a/htdocs/theme/md/img/background.png b/public/theme/md/img/background.png
similarity index 100%
rename from htdocs/theme/md/img/background.png
rename to public/theme/md/img/background.png
diff --git a/htdocs/theme/md/img/bg-bas-rubrique.png b/public/theme/md/img/bg-bas-rubrique.png
similarity index 100%
rename from htdocs/theme/md/img/bg-bas-rubrique.png
rename to public/theme/md/img/bg-bas-rubrique.png
diff --git a/htdocs/theme/md/img/bg-rubrique.png b/public/theme/md/img/bg-rubrique.png
similarity index 100%
rename from htdocs/theme/md/img/bg-rubrique.png
rename to public/theme/md/img/bg-rubrique.png
diff --git a/htdocs/theme/md/img/bg-titre-rubrique.png b/public/theme/md/img/bg-titre-rubrique.png
similarity index 100%
rename from htdocs/theme/md/img/bg-titre-rubrique.png
rename to public/theme/md/img/bg-titre-rubrique.png
diff --git a/htdocs/theme/md/img/button_bg.png b/public/theme/md/img/button_bg.png
similarity index 100%
rename from htdocs/theme/md/img/button_bg.png
rename to public/theme/md/img/button_bg.png
diff --git a/htdocs/theme/md/img/button_edit.png b/public/theme/md/img/button_edit.png
similarity index 100%
rename from htdocs/theme/md/img/button_edit.png
rename to public/theme/md/img/button_edit.png
diff --git a/htdocs/theme/md/img/calc.png b/public/theme/md/img/calc.png
similarity index 100%
rename from htdocs/theme/md/img/calc.png
rename to public/theme/md/img/calc.png
diff --git a/htdocs/theme/md/img/calendar.png b/public/theme/md/img/calendar.png
similarity index 100%
rename from htdocs/theme/md/img/calendar.png
rename to public/theme/md/img/calendar.png
diff --git a/htdocs/theme/md/img/call.png b/public/theme/md/img/call.png
similarity index 100%
rename from htdocs/theme/md/img/call.png
rename to public/theme/md/img/call.png
diff --git a/htdocs/theme/md/img/call_out.png b/public/theme/md/img/call_out.png
similarity index 100%
rename from htdocs/theme/md/img/call_out.png
rename to public/theme/md/img/call_out.png
diff --git a/htdocs/theme/md/img/close.png b/public/theme/md/img/close.png
similarity index 100%
rename from htdocs/theme/md/img/close.png
rename to public/theme/md/img/close.png
diff --git a/htdocs/theme/md/img/close_title.png b/public/theme/md/img/close_title.png
similarity index 100%
rename from htdocs/theme/md/img/close_title.png
rename to public/theme/md/img/close_title.png
diff --git a/htdocs/theme/md/img/credit_card.png b/public/theme/md/img/credit_card.png
similarity index 100%
rename from htdocs/theme/md/img/credit_card.png
rename to public/theme/md/img/credit_card.png
diff --git a/htdocs/theme/md/img/delete.png b/public/theme/md/img/delete.png
similarity index 100%
rename from htdocs/theme/md/img/delete.png
rename to public/theme/md/img/delete.png
diff --git a/htdocs/theme/md/img/detail.png b/public/theme/md/img/detail.png
similarity index 100%
rename from htdocs/theme/md/img/detail.png
rename to public/theme/md/img/detail.png
diff --git a/htdocs/theme/md/img/disable.png b/public/theme/md/img/disable.png
similarity index 100%
rename from htdocs/theme/md/img/disable.png
rename to public/theme/md/img/disable.png
diff --git a/htdocs/theme/md/img/edit.png b/public/theme/md/img/edit.png
similarity index 100%
rename from htdocs/theme/md/img/edit.png
rename to public/theme/md/img/edit.png
diff --git a/htdocs/theme/md/img/edit_add.png b/public/theme/md/img/edit_add.png
similarity index 100%
rename from htdocs/theme/md/img/edit_add.png
rename to public/theme/md/img/edit_add.png
diff --git a/htdocs/theme/md/img/edit_remove.png b/public/theme/md/img/edit_remove.png
similarity index 100%
rename from htdocs/theme/md/img/edit_remove.png
rename to public/theme/md/img/edit_remove.png
diff --git a/htdocs/theme/md/img/editdelete.png b/public/theme/md/img/editdelete.png
similarity index 100%
rename from htdocs/theme/md/img/editdelete.png
rename to public/theme/md/img/editdelete.png
diff --git a/htdocs/theme/md/img/error.png b/public/theme/md/img/error.png
similarity index 100%
rename from htdocs/theme/md/img/error.png
rename to public/theme/md/img/error.png
diff --git a/htdocs/theme/md/img/external.png b/public/theme/md/img/external.png
similarity index 100%
rename from htdocs/theme/md/img/external.png
rename to public/theme/md/img/external.png
diff --git a/htdocs/theme/md/img/favicon.ico b/public/theme/md/img/favicon.ico
similarity index 100%
rename from htdocs/theme/md/img/favicon.ico
rename to public/theme/md/img/favicon.ico
diff --git a/htdocs/theme/md/img/file.png b/public/theme/md/img/file.png
similarity index 100%
rename from htdocs/theme/md/img/file.png
rename to public/theme/md/img/file.png
diff --git a/htdocs/theme/md/img/filenew.png b/public/theme/md/img/filenew.png
similarity index 100%
rename from htdocs/theme/md/img/filenew.png
rename to public/theme/md/img/filenew.png
diff --git a/htdocs/theme/md/img/filter.png b/public/theme/md/img/filter.png
similarity index 100%
rename from htdocs/theme/md/img/filter.png
rename to public/theme/md/img/filter.png
diff --git a/htdocs/theme/md/img/folder-open.png b/public/theme/md/img/folder-open.png
similarity index 100%
rename from htdocs/theme/md/img/folder-open.png
rename to public/theme/md/img/folder-open.png
diff --git a/htdocs/theme/md/img/folder.png b/public/theme/md/img/folder.png
similarity index 100%
rename from htdocs/theme/md/img/folder.png
rename to public/theme/md/img/folder.png
diff --git a/htdocs/theme/md/img/gradient.gif b/public/theme/md/img/gradient.gif
similarity index 100%
rename from htdocs/theme/md/img/gradient.gif
rename to public/theme/md/img/gradient.gif
diff --git a/htdocs/theme/md/img/grip.png b/public/theme/md/img/grip.png
similarity index 100%
rename from htdocs/theme/md/img/grip.png
rename to public/theme/md/img/grip.png
diff --git a/htdocs/theme/md/img/grip_title.png b/public/theme/md/img/grip_title.png
similarity index 100%
rename from htdocs/theme/md/img/grip_title.png
rename to public/theme/md/img/grip_title.png
diff --git a/htdocs/theme/md/img/headbg.jpg b/public/theme/md/img/headbg.jpg
similarity index 100%
rename from htdocs/theme/md/img/headbg.jpg
rename to public/theme/md/img/headbg.jpg
diff --git a/htdocs/theme/md/img/headbg2.jpg b/public/theme/md/img/headbg2.jpg
similarity index 100%
rename from htdocs/theme/md/img/headbg2.jpg
rename to public/theme/md/img/headbg2.jpg
diff --git a/htdocs/theme/md/img/help.png b/public/theme/md/img/help.png
similarity index 100%
rename from htdocs/theme/md/img/help.png
rename to public/theme/md/img/help.png
diff --git a/htdocs/theme/md/img/helpdoc.png b/public/theme/md/img/helpdoc.png
similarity index 100%
rename from htdocs/theme/md/img/helpdoc.png
rename to public/theme/md/img/helpdoc.png
diff --git a/htdocs/theme/md/img/helpdoc_top.png b/public/theme/md/img/helpdoc_top.png
similarity index 100%
rename from htdocs/theme/md/img/helpdoc_top.png
rename to public/theme/md/img/helpdoc_top.png
diff --git a/htdocs/theme/md/img/high.png b/public/theme/md/img/high.png
similarity index 100%
rename from htdocs/theme/md/img/high.png
rename to public/theme/md/img/high.png
diff --git a/htdocs/theme/md/img/history.png b/public/theme/md/img/history.png
similarity index 100%
rename from htdocs/theme/md/img/history.png
rename to public/theme/md/img/history.png
diff --git a/htdocs/theme/md/img/index.html b/public/theme/md/img/index.html
similarity index 100%
rename from htdocs/theme/md/img/index.html
rename to public/theme/md/img/index.html
diff --git a/htdocs/theme/md/img/info.png b/public/theme/md/img/info.png
similarity index 100%
rename from htdocs/theme/md/img/info.png
rename to public/theme/md/img/info.png
diff --git a/htdocs/theme/md/img/info_black.png b/public/theme/md/img/info_black.png
similarity index 100%
rename from htdocs/theme/md/img/info_black.png
rename to public/theme/md/img/info_black.png
diff --git a/htdocs/theme/md/img/list.png b/public/theme/md/img/list.png
similarity index 100%
rename from htdocs/theme/md/img/list.png
rename to public/theme/md/img/list.png
diff --git a/htdocs/theme/md/img/liste_titre.png b/public/theme/md/img/liste_titre.png
similarity index 100%
rename from htdocs/theme/md/img/liste_titre.png
rename to public/theme/md/img/liste_titre.png
diff --git a/htdocs/theme/md/img/liste_titre2.png b/public/theme/md/img/liste_titre2.png
similarity index 100%
rename from htdocs/theme/md/img/liste_titre2.png
rename to public/theme/md/img/liste_titre2.png
diff --git a/htdocs/theme/md/img/listlight.png b/public/theme/md/img/listlight.png
similarity index 100%
rename from htdocs/theme/md/img/listlight.png
rename to public/theme/md/img/listlight.png
diff --git a/htdocs/theme/md/img/lock.png b/public/theme/md/img/lock.png
similarity index 100%
rename from htdocs/theme/md/img/lock.png
rename to public/theme/md/img/lock.png
diff --git a/htdocs/theme/md/img/login_background.png b/public/theme/md/img/login_background.png
similarity index 100%
rename from htdocs/theme/md/img/login_background.png
rename to public/theme/md/img/login_background.png
diff --git a/htdocs/theme/md/img/logo_setup.svg b/public/theme/md/img/logo_setup.svg
similarity index 100%
rename from htdocs/theme/md/img/logo_setup.svg
rename to public/theme/md/img/logo_setup.svg
diff --git a/htdocs/theme/md/img/logout.png b/public/theme/md/img/logout.png
similarity index 100%
rename from htdocs/theme/md/img/logout.png
rename to public/theme/md/img/logout.png
diff --git a/htdocs/theme/md/img/logout_top.png b/public/theme/md/img/logout_top.png
similarity index 100%
rename from htdocs/theme/md/img/logout_top.png
rename to public/theme/md/img/logout_top.png
diff --git a/htdocs/theme/md/img/menu.png b/public/theme/md/img/menu.png
similarity index 100%
rename from htdocs/theme/md/img/menu.png
rename to public/theme/md/img/menu.png
diff --git a/htdocs/theme/md/img/menus/agenda.png b/public/theme/md/img/menus/agenda.png
similarity index 100%
rename from htdocs/theme/md/img/menus/agenda.png
rename to public/theme/md/img/menus/agenda.png
diff --git a/htdocs/theme/md/img/menus/bank.png b/public/theme/md/img/menus/bank.png
similarity index 100%
rename from htdocs/theme/md/img/menus/bank.png
rename to public/theme/md/img/menus/bank.png
diff --git a/htdocs/theme/md/img/menus/cart.png b/public/theme/md/img/menus/cart.png
similarity index 100%
rename from htdocs/theme/md/img/menus/cart.png
rename to public/theme/md/img/menus/cart.png
diff --git a/htdocs/theme/md/img/menus/chart.png b/public/theme/md/img/menus/chart.png
similarity index 100%
rename from htdocs/theme/md/img/menus/chart.png
rename to public/theme/md/img/menus/chart.png
diff --git a/htdocs/theme/md/img/menus/commercial.png b/public/theme/md/img/menus/commercial.png
similarity index 100%
rename from htdocs/theme/md/img/menus/commercial.png
rename to public/theme/md/img/menus/commercial.png
diff --git a/htdocs/theme/md/img/menus/company.png b/public/theme/md/img/menus/company.png
similarity index 100%
rename from htdocs/theme/md/img/menus/company.png
rename to public/theme/md/img/menus/company.png
diff --git a/htdocs/theme/md/img/menus/ecm.png b/public/theme/md/img/menus/ecm.png
similarity index 100%
rename from htdocs/theme/md/img/menus/ecm.png
rename to public/theme/md/img/menus/ecm.png
diff --git a/htdocs/theme/md/img/menus/externalsite.png b/public/theme/md/img/menus/externalsite.png
similarity index 100%
rename from htdocs/theme/md/img/menus/externalsite.png
rename to public/theme/md/img/menus/externalsite.png
diff --git a/htdocs/theme/md/img/menus/ftp.png b/public/theme/md/img/menus/ftp.png
similarity index 100%
rename from htdocs/theme/md/img/menus/ftp.png
rename to public/theme/md/img/menus/ftp.png
diff --git a/htdocs/theme/md/img/menus/generic1.png b/public/theme/md/img/menus/generic1.png
similarity index 100%
rename from htdocs/theme/md/img/menus/generic1.png
rename to public/theme/md/img/menus/generic1.png
diff --git a/htdocs/theme/md/img/menus/generic2.png b/public/theme/md/img/menus/generic2.png
similarity index 100%
rename from htdocs/theme/md/img/menus/generic2.png
rename to public/theme/md/img/menus/generic2.png
diff --git a/htdocs/theme/md/img/menus/generic3.png b/public/theme/md/img/menus/generic3.png
similarity index 100%
rename from htdocs/theme/md/img/menus/generic3.png
rename to public/theme/md/img/menus/generic3.png
diff --git a/htdocs/theme/md/img/menus/generic4.png b/public/theme/md/img/menus/generic4.png
similarity index 100%
rename from htdocs/theme/md/img/menus/generic4.png
rename to public/theme/md/img/menus/generic4.png
diff --git a/htdocs/theme/md/img/menus/globe.png b/public/theme/md/img/menus/globe.png
similarity index 100%
rename from htdocs/theme/md/img/menus/globe.png
rename to public/theme/md/img/menus/globe.png
diff --git a/htdocs/theme/md/img/menus/graph.png b/public/theme/md/img/menus/graph.png
similarity index 100%
rename from htdocs/theme/md/img/menus/graph.png
rename to public/theme/md/img/menus/graph.png
diff --git a/htdocs/theme/md/img/menus/holiday.png b/public/theme/md/img/menus/holiday.png
similarity index 100%
rename from htdocs/theme/md/img/menus/holiday.png
rename to public/theme/md/img/menus/holiday.png
diff --git a/htdocs/theme/md/img/menus/home.png b/public/theme/md/img/menus/home.png
similarity index 100%
rename from htdocs/theme/md/img/menus/home.png
rename to public/theme/md/img/menus/home.png
diff --git a/htdocs/theme/md/img/menus/index.html b/public/theme/md/img/menus/index.html
similarity index 100%
rename from htdocs/theme/md/img/menus/index.html
rename to public/theme/md/img/menus/index.html
diff --git a/htdocs/theme/md/img/menus/mail.png b/public/theme/md/img/menus/mail.png
similarity index 100%
rename from htdocs/theme/md/img/menus/mail.png
rename to public/theme/md/img/menus/mail.png
diff --git a/htdocs/theme/md/img/menus/members.png b/public/theme/md/img/menus/members.png
similarity index 100%
rename from htdocs/theme/md/img/menus/members.png
rename to public/theme/md/img/menus/members.png
diff --git a/htdocs/theme/md/img/menus/menu.png b/public/theme/md/img/menus/menu.png
similarity index 100%
rename from htdocs/theme/md/img/menus/menu.png
rename to public/theme/md/img/menus/menu.png
diff --git a/htdocs/theme/md/img/menus/money.png b/public/theme/md/img/menus/money.png
similarity index 100%
rename from htdocs/theme/md/img/menus/money.png
rename to public/theme/md/img/menus/money.png
diff --git a/htdocs/theme/md/img/menus/pointofsale.png b/public/theme/md/img/menus/pointofsale.png
similarity index 100%
rename from htdocs/theme/md/img/menus/pointofsale.png
rename to public/theme/md/img/menus/pointofsale.png
diff --git a/htdocs/theme/md/img/menus/products.png b/public/theme/md/img/menus/products.png
similarity index 100%
rename from htdocs/theme/md/img/menus/products.png
rename to public/theme/md/img/menus/products.png
diff --git a/htdocs/theme/md/img/menus/project.png b/public/theme/md/img/menus/project.png
similarity index 100%
rename from htdocs/theme/md/img/menus/project.png
rename to public/theme/md/img/menus/project.png
diff --git a/htdocs/theme/md/img/menus/shop.png b/public/theme/md/img/menus/shop.png
similarity index 100%
rename from htdocs/theme/md/img/menus/shop.png
rename to public/theme/md/img/menus/shop.png
diff --git a/htdocs/theme/md/img/menus/tools.png b/public/theme/md/img/menus/tools.png
similarity index 100%
rename from htdocs/theme/md/img/menus/tools.png
rename to public/theme/md/img/menus/tools.png
diff --git a/htdocs/theme/md/img/menutab-r.png b/public/theme/md/img/menutab-r.png
similarity index 100%
rename from htdocs/theme/md/img/menutab-r.png
rename to public/theme/md/img/menutab-r.png
diff --git a/htdocs/theme/md/img/nav-overlay.png b/public/theme/md/img/nav-overlay.png
similarity index 100%
rename from htdocs/theme/md/img/nav-overlay.png
rename to public/theme/md/img/nav-overlay.png
diff --git a/htdocs/theme/md/img/nav-overlay3.png b/public/theme/md/img/nav-overlay3.png
similarity index 100%
rename from htdocs/theme/md/img/nav-overlay3.png
rename to public/theme/md/img/nav-overlay3.png
diff --git a/htdocs/theme/md/img/next.png b/public/theme/md/img/next.png
similarity index 100%
rename from htdocs/theme/md/img/next.png
rename to public/theme/md/img/next.png
diff --git a/htdocs/theme/md/img/nographyet.svg b/public/theme/md/img/nographyet.svg
similarity index 100%
rename from htdocs/theme/md/img/nographyet.svg
rename to public/theme/md/img/nographyet.svg
diff --git a/htdocs/theme/md/img/object_account.png b/public/theme/md/img/object_account.png
similarity index 100%
rename from htdocs/theme/md/img/object_account.png
rename to public/theme/md/img/object_account.png
diff --git a/htdocs/theme/md/img/object_accounting.png b/public/theme/md/img/object_accounting.png
similarity index 100%
rename from htdocs/theme/md/img/object_accounting.png
rename to public/theme/md/img/object_accounting.png
diff --git a/htdocs/theme/md/img/object_action.png b/public/theme/md/img/object_action.png
similarity index 100%
rename from htdocs/theme/md/img/object_action.png
rename to public/theme/md/img/object_action.png
diff --git a/htdocs/theme/md/img/object_address.png b/public/theme/md/img/object_address.png
similarity index 100%
rename from htdocs/theme/md/img/object_address.png
rename to public/theme/md/img/object_address.png
diff --git a/htdocs/theme/md/img/object_barcode.png b/public/theme/md/img/object_barcode.png
similarity index 100%
rename from htdocs/theme/md/img/object_barcode.png
rename to public/theme/md/img/object_barcode.png
diff --git a/htdocs/theme/md/img/object_bill.png b/public/theme/md/img/object_bill.png
similarity index 100%
rename from htdocs/theme/md/img/object_bill.png
rename to public/theme/md/img/object_bill.png
diff --git a/htdocs/theme/md/img/object_billa.png b/public/theme/md/img/object_billa.png
similarity index 100%
rename from htdocs/theme/md/img/object_billa.png
rename to public/theme/md/img/object_billa.png
diff --git a/htdocs/theme/md/img/object_billd.png b/public/theme/md/img/object_billd.png
similarity index 100%
rename from htdocs/theme/md/img/object_billd.png
rename to public/theme/md/img/object_billd.png
diff --git a/htdocs/theme/md/img/object_billr.png b/public/theme/md/img/object_billr.png
similarity index 100%
rename from htdocs/theme/md/img/object_billr.png
rename to public/theme/md/img/object_billr.png
diff --git a/htdocs/theme/md/img/object_book.png b/public/theme/md/img/object_book.png
similarity index 100%
rename from htdocs/theme/md/img/object_book.png
rename to public/theme/md/img/object_book.png
diff --git a/htdocs/theme/md/img/object_bookmark.png b/public/theme/md/img/object_bookmark.png
similarity index 100%
rename from htdocs/theme/md/img/object_bookmark.png
rename to public/theme/md/img/object_bookmark.png
diff --git a/htdocs/theme/md/img/object_building.png b/public/theme/md/img/object_building.png
similarity index 100%
rename from htdocs/theme/md/img/object_building.png
rename to public/theme/md/img/object_building.png
diff --git a/htdocs/theme/md/img/object_calendar.png b/public/theme/md/img/object_calendar.png
similarity index 100%
rename from htdocs/theme/md/img/object_calendar.png
rename to public/theme/md/img/object_calendar.png
diff --git a/htdocs/theme/md/img/object_calendarday.png b/public/theme/md/img/object_calendarday.png
similarity index 100%
rename from htdocs/theme/md/img/object_calendarday.png
rename to public/theme/md/img/object_calendarday.png
diff --git a/htdocs/theme/md/img/object_calendargantt.png b/public/theme/md/img/object_calendargantt.png
similarity index 100%
rename from htdocs/theme/md/img/object_calendargantt.png
rename to public/theme/md/img/object_calendargantt.png
diff --git a/htdocs/theme/md/img/object_calendarpertype.png b/public/theme/md/img/object_calendarpertype.png
similarity index 100%
rename from htdocs/theme/md/img/object_calendarpertype.png
rename to public/theme/md/img/object_calendarpertype.png
diff --git a/htdocs/theme/md/img/object_calendarperuser.png b/public/theme/md/img/object_calendarperuser.png
similarity index 100%
rename from htdocs/theme/md/img/object_calendarperuser.png
rename to public/theme/md/img/object_calendarperuser.png
diff --git a/htdocs/theme/md/img/object_calendarweek.png b/public/theme/md/img/object_calendarweek.png
similarity index 100%
rename from htdocs/theme/md/img/object_calendarweek.png
rename to public/theme/md/img/object_calendarweek.png
diff --git a/htdocs/theme/md/img/object_category-expanded.png b/public/theme/md/img/object_category-expanded.png
similarity index 100%
rename from htdocs/theme/md/img/object_category-expanded.png
rename to public/theme/md/img/object_category-expanded.png
diff --git a/htdocs/theme/md/img/object_category.png b/public/theme/md/img/object_category.png
similarity index 100%
rename from htdocs/theme/md/img/object_category.png
rename to public/theme/md/img/object_category.png
diff --git a/htdocs/theme/md/img/object_commercial.png b/public/theme/md/img/object_commercial.png
similarity index 100%
rename from htdocs/theme/md/img/object_commercial.png
rename to public/theme/md/img/object_commercial.png
diff --git a/htdocs/theme/md/img/object_company.png b/public/theme/md/img/object_company.png
similarity index 100%
rename from htdocs/theme/md/img/object_company.png
rename to public/theme/md/img/object_company.png
diff --git a/htdocs/theme/md/img/object_contact.png b/public/theme/md/img/object_contact.png
similarity index 100%
rename from htdocs/theme/md/img/object_contact.png
rename to public/theme/md/img/object_contact.png
diff --git a/htdocs/theme/md/img/object_contract.png b/public/theme/md/img/object_contract.png
similarity index 100%
rename from htdocs/theme/md/img/object_contract.png
rename to public/theme/md/img/object_contract.png
diff --git a/htdocs/theme/md/img/object_cron.png b/public/theme/md/img/object_cron.png
similarity index 100%
rename from htdocs/theme/md/img/object_cron.png
rename to public/theme/md/img/object_cron.png
diff --git a/htdocs/theme/md/img/object_dir.png b/public/theme/md/img/object_dir.png
similarity index 100%
rename from htdocs/theme/md/img/object_dir.png
rename to public/theme/md/img/object_dir.png
diff --git a/htdocs/theme/md/img/object_email.png b/public/theme/md/img/object_email.png
similarity index 100%
rename from htdocs/theme/md/img/object_email.png
rename to public/theme/md/img/object_email.png
diff --git a/htdocs/theme/md/img/object_energy.png b/public/theme/md/img/object_energy.png
similarity index 100%
rename from htdocs/theme/md/img/object_energy.png
rename to public/theme/md/img/object_energy.png
diff --git a/htdocs/theme/md/img/object_generic.png b/public/theme/md/img/object_generic.png
similarity index 100%
rename from htdocs/theme/md/img/object_generic.png
rename to public/theme/md/img/object_generic.png
diff --git a/htdocs/theme/md/img/object_globe.png b/public/theme/md/img/object_globe.png
similarity index 100%
rename from htdocs/theme/md/img/object_globe.png
rename to public/theme/md/img/object_globe.png
diff --git a/htdocs/theme/md/img/object_gravatar.png b/public/theme/md/img/object_gravatar.png
similarity index 100%
rename from htdocs/theme/md/img/object_gravatar.png
rename to public/theme/md/img/object_gravatar.png
diff --git a/htdocs/theme/md/img/object_group.png b/public/theme/md/img/object_group.png
similarity index 100%
rename from htdocs/theme/md/img/object_group.png
rename to public/theme/md/img/object_group.png
diff --git a/htdocs/theme/md/img/object_holiday.png b/public/theme/md/img/object_holiday.png
similarity index 100%
rename from htdocs/theme/md/img/object_holiday.png
rename to public/theme/md/img/object_holiday.png
diff --git a/htdocs/theme/md/img/object_intervention.png b/public/theme/md/img/object_intervention.png
similarity index 100%
rename from htdocs/theme/md/img/object_intervention.png
rename to public/theme/md/img/object_intervention.png
diff --git a/htdocs/theme/md/img/object_invoice.png b/public/theme/md/img/object_invoice.png
similarity index 100%
rename from htdocs/theme/md/img/object_invoice.png
rename to public/theme/md/img/object_invoice.png
diff --git a/htdocs/theme/md/img/object_label.png b/public/theme/md/img/object_label.png
similarity index 100%
rename from htdocs/theme/md/img/object_label.png
rename to public/theme/md/img/object_label.png
diff --git a/htdocs/theme/md/img/object_list.png b/public/theme/md/img/object_list.png
similarity index 100%
rename from htdocs/theme/md/img/object_list.png
rename to public/theme/md/img/object_list.png
diff --git a/htdocs/theme/md/img/object_margin.png b/public/theme/md/img/object_margin.png
similarity index 100%
rename from htdocs/theme/md/img/object_margin.png
rename to public/theme/md/img/object_margin.png
diff --git a/htdocs/theme/md/img/object_opensurvey.png b/public/theme/md/img/object_opensurvey.png
similarity index 100%
rename from htdocs/theme/md/img/object_opensurvey.png
rename to public/theme/md/img/object_opensurvey.png
diff --git a/htdocs/theme/md/img/object_order.png b/public/theme/md/img/object_order.png
similarity index 100%
rename from htdocs/theme/md/img/object_order.png
rename to public/theme/md/img/object_order.png
diff --git a/htdocs/theme/md/img/object_payment.png b/public/theme/md/img/object_payment.png
similarity index 100%
rename from htdocs/theme/md/img/object_payment.png
rename to public/theme/md/img/object_payment.png
diff --git a/htdocs/theme/md/img/object_phoning.png b/public/theme/md/img/object_phoning.png
similarity index 100%
rename from htdocs/theme/md/img/object_phoning.png
rename to public/theme/md/img/object_phoning.png
diff --git a/htdocs/theme/md/img/object_phoning_fax.png b/public/theme/md/img/object_phoning_fax.png
similarity index 100%
rename from htdocs/theme/md/img/object_phoning_fax.png
rename to public/theme/md/img/object_phoning_fax.png
diff --git a/htdocs/theme/md/img/object_printer.png b/public/theme/md/img/object_printer.png
similarity index 100%
rename from htdocs/theme/md/img/object_printer.png
rename to public/theme/md/img/object_printer.png
diff --git a/htdocs/theme/md/img/object_product.png b/public/theme/md/img/object_product.png
similarity index 100%
rename from htdocs/theme/md/img/object_product.png
rename to public/theme/md/img/object_product.png
diff --git a/htdocs/theme/md/img/object_project.png b/public/theme/md/img/object_project.png
similarity index 100%
rename from htdocs/theme/md/img/object_project.png
rename to public/theme/md/img/object_project.png
diff --git a/htdocs/theme/md/img/object_projectpub.png b/public/theme/md/img/object_projectpub.png
similarity index 100%
rename from htdocs/theme/md/img/object_projectpub.png
rename to public/theme/md/img/object_projectpub.png
diff --git a/htdocs/theme/md/img/object_projecttask.png b/public/theme/md/img/object_projecttask.png
similarity index 100%
rename from htdocs/theme/md/img/object_projecttask.png
rename to public/theme/md/img/object_projecttask.png
diff --git a/htdocs/theme/md/img/object_propal.png b/public/theme/md/img/object_propal.png
similarity index 100%
rename from htdocs/theme/md/img/object_propal.png
rename to public/theme/md/img/object_propal.png
diff --git a/htdocs/theme/md/img/object_reduc.png b/public/theme/md/img/object_reduc.png
similarity index 100%
rename from htdocs/theme/md/img/object_reduc.png
rename to public/theme/md/img/object_reduc.png
diff --git a/htdocs/theme/md/img/object_resource.png b/public/theme/md/img/object_resource.png
similarity index 100%
rename from htdocs/theme/md/img/object_resource.png
rename to public/theme/md/img/object_resource.png
diff --git a/htdocs/theme/md/img/object_rss.png b/public/theme/md/img/object_rss.png
similarity index 100%
rename from htdocs/theme/md/img/object_rss.png
rename to public/theme/md/img/object_rss.png
diff --git a/htdocs/theme/md/img/object_sending.png b/public/theme/md/img/object_sending.png
similarity index 100%
rename from htdocs/theme/md/img/object_sending.png
rename to public/theme/md/img/object_sending.png
diff --git a/htdocs/theme/md/img/object_service.png b/public/theme/md/img/object_service.png
similarity index 100%
rename from htdocs/theme/md/img/object_service.png
rename to public/theme/md/img/object_service.png
diff --git a/htdocs/theme/md/img/object_skype.png b/public/theme/md/img/object_skype.png
similarity index 100%
rename from htdocs/theme/md/img/object_skype.png
rename to public/theme/md/img/object_skype.png
diff --git a/htdocs/theme/md/img/object_stock.png b/public/theme/md/img/object_stock.png
similarity index 100%
rename from htdocs/theme/md/img/object_stock.png
rename to public/theme/md/img/object_stock.png
diff --git a/htdocs/theme/md/img/object_supplier_proposal.png b/public/theme/md/img/object_supplier_proposal.png
similarity index 100%
rename from htdocs/theme/md/img/object_supplier_proposal.png
rename to public/theme/md/img/object_supplier_proposal.png
diff --git a/htdocs/theme/md/img/object_task.png b/public/theme/md/img/object_task.png
similarity index 100%
rename from htdocs/theme/md/img/object_task.png
rename to public/theme/md/img/object_task.png
diff --git a/htdocs/theme/md/img/object_task_time.png b/public/theme/md/img/object_task_time.png
similarity index 100%
rename from htdocs/theme/md/img/object_task_time.png
rename to public/theme/md/img/object_task_time.png
diff --git a/htdocs/theme/md/img/object_tax.png b/public/theme/md/img/object_tax.png
similarity index 100%
rename from htdocs/theme/md/img/object_tax.png
rename to public/theme/md/img/object_tax.png
diff --git a/htdocs/theme/md/img/object_technic.png b/public/theme/md/img/object_technic.png
similarity index 100%
rename from htdocs/theme/md/img/object_technic.png
rename to public/theme/md/img/object_technic.png
diff --git a/htdocs/theme/md/img/object_trip.png b/public/theme/md/img/object_trip.png
similarity index 100%
rename from htdocs/theme/md/img/object_trip.png
rename to public/theme/md/img/object_trip.png
diff --git a/htdocs/theme/md/img/object_user.png b/public/theme/md/img/object_user.png
similarity index 100%
rename from htdocs/theme/md/img/object_user.png
rename to public/theme/md/img/object_user.png
diff --git a/htdocs/theme/md/img/off.png b/public/theme/md/img/off.png
similarity index 100%
rename from htdocs/theme/md/img/off.png
rename to public/theme/md/img/off.png
diff --git a/htdocs/theme/md/img/on.png b/public/theme/md/img/on.png
similarity index 100%
rename from htdocs/theme/md/img/on.png
rename to public/theme/md/img/on.png
diff --git a/htdocs/theme/md/img/pdf2.png b/public/theme/md/img/pdf2.png
similarity index 100%
rename from htdocs/theme/md/img/pdf2.png
rename to public/theme/md/img/pdf2.png
diff --git a/htdocs/theme/md/img/pdf3.png b/public/theme/md/img/pdf3.png
similarity index 100%
rename from htdocs/theme/md/img/pdf3.png
rename to public/theme/md/img/pdf3.png
diff --git a/htdocs/theme/md/img/play.png b/public/theme/md/img/play.png
similarity index 100%
rename from htdocs/theme/md/img/play.png
rename to public/theme/md/img/play.png
diff --git a/htdocs/theme/md/img/playdisabled.png b/public/theme/md/img/playdisabled.png
similarity index 100%
rename from htdocs/theme/md/img/playdisabled.png
rename to public/theme/md/img/playdisabled.png
diff --git a/htdocs/theme/md/img/preview.png b/public/theme/md/img/preview.png
similarity index 100%
rename from htdocs/theme/md/img/preview.png
rename to public/theme/md/img/preview.png
diff --git a/htdocs/theme/md/img/preview_ext.png b/public/theme/md/img/preview_ext.png
similarity index 100%
rename from htdocs/theme/md/img/preview_ext.png
rename to public/theme/md/img/preview_ext.png
diff --git a/htdocs/theme/md/img/previous.png b/public/theme/md/img/previous.png
similarity index 100%
rename from htdocs/theme/md/img/previous.png
rename to public/theme/md/img/previous.png
diff --git a/htdocs/theme/md/img/printer.png b/public/theme/md/img/printer.png
similarity index 100%
rename from htdocs/theme/md/img/printer.png
rename to public/theme/md/img/printer.png
diff --git a/htdocs/theme/md/img/printer_top.png b/public/theme/md/img/printer_top.png
similarity index 100%
rename from htdocs/theme/md/img/printer_top.png
rename to public/theme/md/img/printer_top.png
diff --git a/htdocs/theme/md/img/puce.png b/public/theme/md/img/puce.png
similarity index 100%
rename from htdocs/theme/md/img/puce.png
rename to public/theme/md/img/puce.png
diff --git a/htdocs/theme/md/img/recent.png b/public/theme/md/img/recent.png
similarity index 100%
rename from htdocs/theme/md/img/recent.png
rename to public/theme/md/img/recent.png
diff --git a/htdocs/theme/md/img/redstar.png b/public/theme/md/img/redstar.png
similarity index 100%
rename from htdocs/theme/md/img/redstar.png
rename to public/theme/md/img/redstar.png
diff --git a/htdocs/theme/md/img/refresh.png b/public/theme/md/img/refresh.png
similarity index 100%
rename from htdocs/theme/md/img/refresh.png
rename to public/theme/md/img/refresh.png
diff --git a/htdocs/theme/md/img/reload.png b/public/theme/md/img/reload.png
similarity index 100%
rename from htdocs/theme/md/img/reload.png
rename to public/theme/md/img/reload.png
diff --git a/htdocs/theme/md/img/rightarrow.png b/public/theme/md/img/rightarrow.png
similarity index 100%
rename from htdocs/theme/md/img/rightarrow.png
rename to public/theme/md/img/rightarrow.png
diff --git a/htdocs/theme/md/img/search.png b/public/theme/md/img/search.png
similarity index 100%
rename from htdocs/theme/md/img/search.png
rename to public/theme/md/img/search.png
diff --git a/htdocs/theme/md/img/searchclear.png b/public/theme/md/img/searchclear.png
similarity index 100%
rename from htdocs/theme/md/img/searchclear.png
rename to public/theme/md/img/searchclear.png
diff --git a/htdocs/theme/md/img/setup.png b/public/theme/md/img/setup.png
similarity index 100%
rename from htdocs/theme/md/img/setup.png
rename to public/theme/md/img/setup.png
diff --git a/htdocs/theme/md/img/sort_asc.png b/public/theme/md/img/sort_asc.png
similarity index 100%
rename from htdocs/theme/md/img/sort_asc.png
rename to public/theme/md/img/sort_asc.png
diff --git a/htdocs/theme/md/img/sort_asc_disabled.png b/public/theme/md/img/sort_asc_disabled.png
similarity index 100%
rename from htdocs/theme/md/img/sort_asc_disabled.png
rename to public/theme/md/img/sort_asc_disabled.png
diff --git a/htdocs/theme/md/img/sort_desc.png b/public/theme/md/img/sort_desc.png
similarity index 100%
rename from htdocs/theme/md/img/sort_desc.png
rename to public/theme/md/img/sort_desc.png
diff --git a/htdocs/theme/md/img/sort_desc_disabled.png b/public/theme/md/img/sort_desc_disabled.png
similarity index 100%
rename from htdocs/theme/md/img/sort_desc_disabled.png
rename to public/theme/md/img/sort_desc_disabled.png
diff --git a/htdocs/theme/md/img/split.png b/public/theme/md/img/split.png
similarity index 100%
rename from htdocs/theme/md/img/split.png
rename to public/theme/md/img/split.png
diff --git a/htdocs/theme/md/img/star.png b/public/theme/md/img/star.png
similarity index 100%
rename from htdocs/theme/md/img/star.png
rename to public/theme/md/img/star.png
diff --git a/htdocs/theme/md/img/stats.png b/public/theme/md/img/stats.png
similarity index 100%
rename from htdocs/theme/md/img/stats.png
rename to public/theme/md/img/stats.png
diff --git a/htdocs/theme/md/img/statut0.png b/public/theme/md/img/statut0.png
similarity index 100%
rename from htdocs/theme/md/img/statut0.png
rename to public/theme/md/img/statut0.png
diff --git a/htdocs/theme/md/img/statut0_40x40.png b/public/theme/md/img/statut0_40x40.png
similarity index 100%
rename from htdocs/theme/md/img/statut0_40x40.png
rename to public/theme/md/img/statut0_40x40.png
diff --git a/htdocs/theme/md/img/statut1.png b/public/theme/md/img/statut1.png
similarity index 100%
rename from htdocs/theme/md/img/statut1.png
rename to public/theme/md/img/statut1.png
diff --git a/htdocs/theme/md/img/statut1_40x40.png b/public/theme/md/img/statut1_40x40.png
similarity index 100%
rename from htdocs/theme/md/img/statut1_40x40.png
rename to public/theme/md/img/statut1_40x40.png
diff --git a/htdocs/theme/md/img/statut3.png b/public/theme/md/img/statut3.png
similarity index 100%
rename from htdocs/theme/md/img/statut3.png
rename to public/theme/md/img/statut3.png
diff --git a/htdocs/theme/md/img/statut3_40x40.png b/public/theme/md/img/statut3_40x40.png
similarity index 100%
rename from htdocs/theme/md/img/statut3_40x40.png
rename to public/theme/md/img/statut3_40x40.png
diff --git a/htdocs/theme/md/img/statut4.png b/public/theme/md/img/statut4.png
similarity index 100%
rename from htdocs/theme/md/img/statut4.png
rename to public/theme/md/img/statut4.png
diff --git a/htdocs/theme/md/img/statut4_40x40.png b/public/theme/md/img/statut4_40x40.png
similarity index 100%
rename from htdocs/theme/md/img/statut4_40x40.png
rename to public/theme/md/img/statut4_40x40.png
diff --git a/htdocs/theme/md/img/statut5.png b/public/theme/md/img/statut5.png
similarity index 100%
rename from htdocs/theme/md/img/statut5.png
rename to public/theme/md/img/statut5.png
diff --git a/htdocs/theme/md/img/statut5_40x40.png b/public/theme/md/img/statut5_40x40.png
similarity index 100%
rename from htdocs/theme/md/img/statut5_40x40.png
rename to public/theme/md/img/statut5_40x40.png
diff --git a/htdocs/theme/md/img/statut6.png b/public/theme/md/img/statut6.png
similarity index 100%
rename from htdocs/theme/md/img/statut6.png
rename to public/theme/md/img/statut6.png
diff --git a/htdocs/theme/md/img/statut6_40x40.png b/public/theme/md/img/statut6_40x40.png
similarity index 100%
rename from htdocs/theme/md/img/statut6_40x40.png
rename to public/theme/md/img/statut6_40x40.png
diff --git a/htdocs/theme/md/img/statut7.png b/public/theme/md/img/statut7.png
similarity index 100%
rename from htdocs/theme/md/img/statut7.png
rename to public/theme/md/img/statut7.png
diff --git a/htdocs/theme/md/img/statut7_40x40.png b/public/theme/md/img/statut7_40x40.png
similarity index 100%
rename from htdocs/theme/md/img/statut7_40x40.png
rename to public/theme/md/img/statut7_40x40.png
diff --git a/htdocs/theme/md/img/statut8.png b/public/theme/md/img/statut8.png
similarity index 100%
rename from htdocs/theme/md/img/statut8.png
rename to public/theme/md/img/statut8.png
diff --git a/htdocs/theme/md/img/statut8_40x40.png b/public/theme/md/img/statut8_40x40.png
similarity index 100%
rename from htdocs/theme/md/img/statut8_40x40.png
rename to public/theme/md/img/statut8_40x40.png
diff --git a/htdocs/theme/md/img/statut9.png b/public/theme/md/img/statut9.png
similarity index 100%
rename from htdocs/theme/md/img/statut9.png
rename to public/theme/md/img/statut9.png
diff --git a/htdocs/theme/md/img/statut9_40x40.png b/public/theme/md/img/statut9_40x40.png
similarity index 100%
rename from htdocs/theme/md/img/statut9_40x40.png
rename to public/theme/md/img/statut9_40x40.png
diff --git a/htdocs/theme/md/img/stcomm-1.png b/public/theme/md/img/stcomm-1.png
similarity index 100%
rename from htdocs/theme/md/img/stcomm-1.png
rename to public/theme/md/img/stcomm-1.png
diff --git a/htdocs/theme/md/img/stcomm0.png b/public/theme/md/img/stcomm0.png
similarity index 100%
rename from htdocs/theme/md/img/stcomm0.png
rename to public/theme/md/img/stcomm0.png
diff --git a/htdocs/theme/md/img/stcomm1.png b/public/theme/md/img/stcomm1.png
similarity index 100%
rename from htdocs/theme/md/img/stcomm1.png
rename to public/theme/md/img/stcomm1.png
diff --git a/htdocs/theme/md/img/stcomm2.png b/public/theme/md/img/stcomm2.png
similarity index 100%
rename from htdocs/theme/md/img/stcomm2.png
rename to public/theme/md/img/stcomm2.png
diff --git a/htdocs/theme/md/img/stcomm3.png b/public/theme/md/img/stcomm3.png
similarity index 100%
rename from htdocs/theme/md/img/stcomm3.png
rename to public/theme/md/img/stcomm3.png
diff --git a/htdocs/theme/md/img/stcomm4.png b/public/theme/md/img/stcomm4.png
similarity index 100%
rename from htdocs/theme/md/img/stcomm4.png
rename to public/theme/md/img/stcomm4.png
diff --git a/htdocs/theme/md/img/switch_off.png b/public/theme/md/img/switch_off.png
similarity index 100%
rename from htdocs/theme/md/img/switch_off.png
rename to public/theme/md/img/switch_off.png
diff --git a/htdocs/theme/md/img/switch_off_old.png b/public/theme/md/img/switch_off_old.png
similarity index 100%
rename from htdocs/theme/md/img/switch_off_old.png
rename to public/theme/md/img/switch_off_old.png
diff --git a/htdocs/theme/md/img/switch_on.png b/public/theme/md/img/switch_on.png
similarity index 100%
rename from htdocs/theme/md/img/switch_on.png
rename to public/theme/md/img/switch_on.png
diff --git a/htdocs/theme/md/img/switch_on_old.png b/public/theme/md/img/switch_on_old.png
similarity index 100%
rename from htdocs/theme/md/img/switch_on_old.png
rename to public/theme/md/img/switch_on_old.png
diff --git a/htdocs/theme/md/img/tab_background.png b/public/theme/md/img/tab_background.png
similarity index 100%
rename from htdocs/theme/md/img/tab_background.png
rename to public/theme/md/img/tab_background.png
diff --git a/htdocs/theme/md/img/tick.png b/public/theme/md/img/tick.png
similarity index 100%
rename from htdocs/theme/md/img/tick.png
rename to public/theme/md/img/tick.png
diff --git a/htdocs/theme/md/img/title.gif b/public/theme/md/img/title.gif
similarity index 100%
rename from htdocs/theme/md/img/title.gif
rename to public/theme/md/img/title.gif
diff --git a/htdocs/theme/md/img/title.png b/public/theme/md/img/title.png
similarity index 100%
rename from htdocs/theme/md/img/title.png
rename to public/theme/md/img/title.png
diff --git a/htdocs/theme/md/img/title_accountancy.png b/public/theme/md/img/title_accountancy.png
similarity index 100%
rename from htdocs/theme/md/img/title_accountancy.png
rename to public/theme/md/img/title_accountancy.png
diff --git a/htdocs/theme/md/img/title_agenda.png b/public/theme/md/img/title_agenda.png
similarity index 100%
rename from htdocs/theme/md/img/title_agenda.png
rename to public/theme/md/img/title_agenda.png
diff --git a/htdocs/theme/md/img/title_bank.png b/public/theme/md/img/title_bank.png
similarity index 100%
rename from htdocs/theme/md/img/title_bank.png
rename to public/theme/md/img/title_bank.png
diff --git a/htdocs/theme/md/img/title_commercial.png b/public/theme/md/img/title_commercial.png
similarity index 100%
rename from htdocs/theme/md/img/title_commercial.png
rename to public/theme/md/img/title_commercial.png
diff --git a/htdocs/theme/md/img/title_companies.png b/public/theme/md/img/title_companies.png
similarity index 100%
rename from htdocs/theme/md/img/title_companies.png
rename to public/theme/md/img/title_companies.png
diff --git a/htdocs/theme/md/img/title_generic.png b/public/theme/md/img/title_generic.png
similarity index 100%
rename from htdocs/theme/md/img/title_generic.png
rename to public/theme/md/img/title_generic.png
diff --git a/htdocs/theme/md/img/title_home.png b/public/theme/md/img/title_home.png
similarity index 100%
rename from htdocs/theme/md/img/title_home.png
rename to public/theme/md/img/title_home.png
diff --git a/htdocs/theme/md/img/title_hrm.png b/public/theme/md/img/title_hrm.png
similarity index 100%
rename from htdocs/theme/md/img/title_hrm.png
rename to public/theme/md/img/title_hrm.png
diff --git a/htdocs/theme/md/img/title_products.png b/public/theme/md/img/title_products.png
similarity index 100%
rename from htdocs/theme/md/img/title_products.png
rename to public/theme/md/img/title_products.png
diff --git a/htdocs/theme/md/img/title_project.png b/public/theme/md/img/title_project.png
similarity index 100%
rename from htdocs/theme/md/img/title_project.png
rename to public/theme/md/img/title_project.png
diff --git a/htdocs/theme/md/img/title_setup.png b/public/theme/md/img/title_setup.png
similarity index 100%
rename from htdocs/theme/md/img/title_setup.png
rename to public/theme/md/img/title_setup.png
diff --git a/htdocs/theme/md/img/tmenu.jpg b/public/theme/md/img/tmenu.jpg
similarity index 100%
rename from htdocs/theme/md/img/tmenu.jpg
rename to public/theme/md/img/tmenu.jpg
diff --git a/htdocs/theme/md/img/tmenu2.jpg b/public/theme/md/img/tmenu2.jpg
similarity index 100%
rename from htdocs/theme/md/img/tmenu2.jpg
rename to public/theme/md/img/tmenu2.jpg
diff --git a/htdocs/theme/md/img/tmenu3.jpg b/public/theme/md/img/tmenu3.jpg
similarity index 100%
rename from htdocs/theme/md/img/tmenu3.jpg
rename to public/theme/md/img/tmenu3.jpg
diff --git a/htdocs/theme/md/img/tmenu_inverse.jpg b/public/theme/md/img/tmenu_inverse.jpg
similarity index 100%
rename from htdocs/theme/md/img/tmenu_inverse.jpg
rename to public/theme/md/img/tmenu_inverse.jpg
diff --git a/htdocs/theme/md/img/unlock.png b/public/theme/md/img/unlock.png
similarity index 100%
rename from htdocs/theme/md/img/unlock.png
rename to public/theme/md/img/unlock.png
diff --git a/htdocs/theme/md/img/uparrow.png b/public/theme/md/img/uparrow.png
similarity index 100%
rename from htdocs/theme/md/img/uparrow.png
rename to public/theme/md/img/uparrow.png
diff --git a/htdocs/theme/md/img/upload.png b/public/theme/md/img/upload.png
similarity index 100%
rename from htdocs/theme/md/img/upload.png
rename to public/theme/md/img/upload.png
diff --git a/htdocs/theme/md/img/vcard.png b/public/theme/md/img/vcard.png
similarity index 100%
rename from htdocs/theme/md/img/vcard.png
rename to public/theme/md/img/vcard.png
diff --git a/htdocs/theme/md/img/view.png b/public/theme/md/img/view.png
similarity index 100%
rename from htdocs/theme/md/img/view.png
rename to public/theme/md/img/view.png
diff --git a/htdocs/theme/md/img/warning.png b/public/theme/md/img/warning.png
similarity index 100%
rename from htdocs/theme/md/img/warning.png
rename to public/theme/md/img/warning.png
diff --git a/htdocs/theme/md/img/weather/index.html b/public/theme/md/img/weather/index.html
similarity index 100%
rename from htdocs/theme/md/img/weather/index.html
rename to public/theme/md/img/weather/index.html
diff --git a/htdocs/theme/md/img/weather/weather-clear-night.png b/public/theme/md/img/weather/weather-clear-night.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-clear-night.png
rename to public/theme/md/img/weather/weather-clear-night.png
diff --git a/htdocs/theme/md/img/weather/weather-clear.png b/public/theme/md/img/weather/weather-clear.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-clear.png
rename to public/theme/md/img/weather/weather-clear.png
diff --git a/htdocs/theme/md/img/weather/weather-clouds-night.png b/public/theme/md/img/weather/weather-clouds-night.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-clouds-night.png
rename to public/theme/md/img/weather/weather-clouds-night.png
diff --git a/htdocs/theme/md/img/weather/weather-clouds.png b/public/theme/md/img/weather/weather-clouds.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-clouds.png
rename to public/theme/md/img/weather/weather-clouds.png
diff --git a/htdocs/theme/md/img/weather/weather-few-clouds-night.png b/public/theme/md/img/weather/weather-few-clouds-night.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-few-clouds-night.png
rename to public/theme/md/img/weather/weather-few-clouds-night.png
diff --git a/htdocs/theme/md/img/weather/weather-few-clouds.png b/public/theme/md/img/weather/weather-few-clouds.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-few-clouds.png
rename to public/theme/md/img/weather/weather-few-clouds.png
diff --git a/htdocs/theme/md/img/weather/weather-freezing-rain.png b/public/theme/md/img/weather/weather-freezing-rain.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-freezing-rain.png
rename to public/theme/md/img/weather/weather-freezing-rain.png
diff --git a/htdocs/theme/md/img/weather/weather-hail.png b/public/theme/md/img/weather/weather-hail.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-hail.png
rename to public/theme/md/img/weather/weather-hail.png
diff --git a/htdocs/theme/md/img/weather/weather-many-clouds.png b/public/theme/md/img/weather/weather-many-clouds.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-many-clouds.png
rename to public/theme/md/img/weather/weather-many-clouds.png
diff --git a/htdocs/theme/md/img/weather/weather-mist.png b/public/theme/md/img/weather/weather-mist.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-mist.png
rename to public/theme/md/img/weather/weather-mist.png
diff --git a/htdocs/theme/md/img/weather/weather-showers-day.png b/public/theme/md/img/weather/weather-showers-day.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-showers-day.png
rename to public/theme/md/img/weather/weather-showers-day.png
diff --git a/htdocs/theme/md/img/weather/weather-showers-night.png b/public/theme/md/img/weather/weather-showers-night.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-showers-night.png
rename to public/theme/md/img/weather/weather-showers-night.png
diff --git a/htdocs/theme/md/img/weather/weather-showers-scattered-day.png b/public/theme/md/img/weather/weather-showers-scattered-day.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-showers-scattered-day.png
rename to public/theme/md/img/weather/weather-showers-scattered-day.png
diff --git a/htdocs/theme/md/img/weather/weather-showers-scattered-night.png b/public/theme/md/img/weather/weather-showers-scattered-night.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-showers-scattered-night.png
rename to public/theme/md/img/weather/weather-showers-scattered-night.png
diff --git a/htdocs/theme/md/img/weather/weather-showers-scattered.png b/public/theme/md/img/weather/weather-showers-scattered.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-showers-scattered.png
rename to public/theme/md/img/weather/weather-showers-scattered.png
diff --git a/htdocs/theme/md/img/weather/weather-showers.png b/public/theme/md/img/weather/weather-showers.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-showers.png
rename to public/theme/md/img/weather/weather-showers.png
diff --git a/htdocs/theme/md/img/weather/weather-snow-rain.png b/public/theme/md/img/weather/weather-snow-rain.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-snow-rain.png
rename to public/theme/md/img/weather/weather-snow-rain.png
diff --git a/htdocs/theme/md/img/weather/weather-snow-scattered-day.png b/public/theme/md/img/weather/weather-snow-scattered-day.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-snow-scattered-day.png
rename to public/theme/md/img/weather/weather-snow-scattered-day.png
diff --git a/htdocs/theme/md/img/weather/weather-snow-scattered-night.png b/public/theme/md/img/weather/weather-snow-scattered-night.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-snow-scattered-night.png
rename to public/theme/md/img/weather/weather-snow-scattered-night.png
diff --git a/htdocs/theme/md/img/weather/weather-snow-scattered.png b/public/theme/md/img/weather/weather-snow-scattered.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-snow-scattered.png
rename to public/theme/md/img/weather/weather-snow-scattered.png
diff --git a/htdocs/theme/md/img/weather/weather-snow.png b/public/theme/md/img/weather/weather-snow.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-snow.png
rename to public/theme/md/img/weather/weather-snow.png
diff --git a/htdocs/theme/md/img/weather/weather-storm-day.png b/public/theme/md/img/weather/weather-storm-day.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-storm-day.png
rename to public/theme/md/img/weather/weather-storm-day.png
diff --git a/htdocs/theme/md/img/weather/weather-storm-night.png b/public/theme/md/img/weather/weather-storm-night.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-storm-night.png
rename to public/theme/md/img/weather/weather-storm-night.png
diff --git a/htdocs/theme/md/img/weather/weather-storm.png b/public/theme/md/img/weather/weather-storm.png
similarity index 100%
rename from htdocs/theme/md/img/weather/weather-storm.png
rename to public/theme/md/img/weather/weather-storm.png
diff --git a/htdocs/theme/md/img/working.gif b/public/theme/md/img/working.gif
similarity index 100%
rename from htdocs/theme/md/img/working.gif
rename to public/theme/md/img/working.gif
diff --git a/htdocs/theme/md/img/working2.gif b/public/theme/md/img/working2.gif
similarity index 100%
rename from htdocs/theme/md/img/working2.gif
rename to public/theme/md/img/working2.gif
diff --git a/htdocs/theme/md/index.html b/public/theme/md/index.html
similarity index 100%
rename from htdocs/theme/md/index.html
rename to public/theme/md/index.html
diff --git a/htdocs/theme/md/style.css.php b/public/theme/md/style.css.php
similarity index 100%
rename from htdocs/theme/md/style.css.php
rename to public/theme/md/style.css.php
diff --git a/htdocs/theme/md/thumb.png b/public/theme/md/thumb.png
similarity index 100%
rename from htdocs/theme/md/thumb.png
rename to public/theme/md/thumb.png
diff --git a/htdocs/theme/md/tpl/README b/public/theme/md/tpl/README
similarity index 100%
rename from htdocs/theme/md/tpl/README
rename to public/theme/md/tpl/README
diff --git a/htdocs/theme/md/tpl/index.html b/public/theme/md/tpl/index.html
similarity index 100%
rename from htdocs/theme/md/tpl/index.html
rename to public/theme/md/tpl/index.html
diff --git a/htdocs/user/admin/group_extrafields.php b/public/user/admin/group_extrafields.php
similarity index 100%
rename from htdocs/user/admin/group_extrafields.php
rename to public/user/admin/group_extrafields.php
diff --git a/htdocs/user/admin/index.html b/public/user/admin/index.html
similarity index 100%
rename from htdocs/user/admin/index.html
rename to public/user/admin/index.html
diff --git a/htdocs/user/admin/user_extrafields.php b/public/user/admin/user_extrafields.php
similarity index 100%
rename from htdocs/user/admin/user_extrafields.php
rename to public/user/admin/user_extrafields.php
diff --git a/htdocs/user/agenda_extsites.php b/public/user/agenda_extsites.php
similarity index 100%
rename from htdocs/user/agenda_extsites.php
rename to public/user/agenda_extsites.php
diff --git a/htdocs/user/bank.php b/public/user/bank.php
similarity index 100%
rename from htdocs/user/bank.php
rename to public/user/bank.php
diff --git a/htdocs/user/card.php b/public/user/card.php
similarity index 100%
rename from htdocs/user/card.php
rename to public/user/card.php
diff --git a/htdocs/user/class/api_deprecated_user.class.php b/public/user/class/api_deprecated_user.class.php
similarity index 100%
rename from htdocs/user/class/api_deprecated_user.class.php
rename to public/user/class/api_deprecated_user.class.php
diff --git a/htdocs/user/class/api_users.class.php b/public/user/class/api_users.class.php
similarity index 100%
rename from htdocs/user/class/api_users.class.php
rename to public/user/class/api_users.class.php
diff --git a/htdocs/user/class/index.html b/public/user/class/index.html
similarity index 100%
rename from htdocs/user/class/index.html
rename to public/user/class/index.html
diff --git a/htdocs/user/class/user.class.php b/public/user/class/user.class.php
similarity index 100%
rename from htdocs/user/class/user.class.php
rename to public/user/class/user.class.php
diff --git a/htdocs/user/class/userbankaccount.class.php b/public/user/class/userbankaccount.class.php
similarity index 100%
rename from htdocs/user/class/userbankaccount.class.php
rename to public/user/class/userbankaccount.class.php
diff --git a/htdocs/user/class/usergroup.class.php b/public/user/class/usergroup.class.php
similarity index 100%
rename from htdocs/user/class/usergroup.class.php
rename to public/user/class/usergroup.class.php
diff --git a/htdocs/user/clicktodial.php b/public/user/clicktodial.php
similarity index 100%
rename from htdocs/user/clicktodial.php
rename to public/user/clicktodial.php
diff --git a/htdocs/user/document.php b/public/user/document.php
similarity index 100%
rename from htdocs/user/document.php
rename to public/user/document.php
diff --git a/htdocs/user/group/card.php b/public/user/group/card.php
similarity index 100%
rename from htdocs/user/group/card.php
rename to public/user/group/card.php
diff --git a/htdocs/user/group/index.php b/public/user/group/index.php
similarity index 100%
rename from htdocs/user/group/index.php
rename to public/user/group/index.php
diff --git a/htdocs/user/group/ldap.php b/public/user/group/ldap.php
similarity index 100%
rename from htdocs/user/group/ldap.php
rename to public/user/group/ldap.php
diff --git a/htdocs/user/group/perms.php b/public/user/group/perms.php
similarity index 100%
rename from htdocs/user/group/perms.php
rename to public/user/group/perms.php
diff --git a/htdocs/user/hierarchy.php b/public/user/hierarchy.php
similarity index 100%
rename from htdocs/user/hierarchy.php
rename to public/user/hierarchy.php
diff --git a/htdocs/user/home.php b/public/user/home.php
similarity index 100%
rename from htdocs/user/home.php
rename to public/user/home.php
diff --git a/htdocs/user/index.php b/public/user/index.php
similarity index 100%
rename from htdocs/user/index.php
rename to public/user/index.php
diff --git a/htdocs/user/info.php b/public/user/info.php
similarity index 100%
rename from htdocs/user/info.php
rename to public/user/info.php
diff --git a/htdocs/user/ldap.php b/public/user/ldap.php
similarity index 100%
rename from htdocs/user/ldap.php
rename to public/user/ldap.php
diff --git a/htdocs/user/logout.php b/public/user/logout.php
similarity index 100%
rename from htdocs/user/logout.php
rename to public/user/logout.php
diff --git a/htdocs/user/note.php b/public/user/note.php
similarity index 100%
rename from htdocs/user/note.php
rename to public/user/note.php
diff --git a/htdocs/user/notify/card.php b/public/user/notify/card.php
similarity index 100%
rename from htdocs/user/notify/card.php
rename to public/user/notify/card.php
diff --git a/htdocs/user/param_ihm.php b/public/user/param_ihm.php
similarity index 100%
rename from htdocs/user/param_ihm.php
rename to public/user/param_ihm.php
diff --git a/htdocs/user/passwordforgotten.php b/public/user/passwordforgotten.php
similarity index 100%
rename from htdocs/user/passwordforgotten.php
rename to public/user/passwordforgotten.php
diff --git a/htdocs/user/perms.php b/public/user/perms.php
similarity index 100%
rename from htdocs/user/perms.php
rename to public/user/perms.php
diff --git a/htdocs/viewimage.php b/public/viewimage.php
similarity index 100%
rename from htdocs/viewimage.php
rename to public/viewimage.php
diff --git a/htdocs/webservices/README.md b/public/webservices/README.md
similarity index 100%
rename from htdocs/webservices/README.md
rename to public/webservices/README.md
diff --git a/htdocs/webservices/admin/index.php b/public/webservices/admin/index.php
similarity index 100%
rename from htdocs/webservices/admin/index.php
rename to public/webservices/admin/index.php
diff --git a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN b/public/webservices/demo_wsclient_actioncomm.php-NORUN
similarity index 100%
rename from htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
rename to public/webservices/demo_wsclient_actioncomm.php-NORUN
diff --git a/htdocs/webservices/demo_wsclient_category.php-NORUN b/public/webservices/demo_wsclient_category.php-NORUN
similarity index 100%
rename from htdocs/webservices/demo_wsclient_category.php-NORUN
rename to public/webservices/demo_wsclient_category.php-NORUN
diff --git a/htdocs/webservices/demo_wsclient_invoice.php-NORUN b/public/webservices/demo_wsclient_invoice.php-NORUN
similarity index 100%
rename from htdocs/webservices/demo_wsclient_invoice.php-NORUN
rename to public/webservices/demo_wsclient_invoice.php-NORUN
diff --git a/htdocs/webservices/demo_wsclient_order.php-NORUN b/public/webservices/demo_wsclient_order.php-NORUN
similarity index 100%
rename from htdocs/webservices/demo_wsclient_order.php-NORUN
rename to public/webservices/demo_wsclient_order.php-NORUN
diff --git a/htdocs/webservices/demo_wsclient_other.php-NORUN b/public/webservices/demo_wsclient_other.php-NORUN
similarity index 100%
rename from htdocs/webservices/demo_wsclient_other.php-NORUN
rename to public/webservices/demo_wsclient_other.php-NORUN
diff --git a/htdocs/webservices/demo_wsclient_productorservice.php-NORUN b/public/webservices/demo_wsclient_productorservice.php-NORUN
similarity index 100%
rename from htdocs/webservices/demo_wsclient_productorservice.php-NORUN
rename to public/webservices/demo_wsclient_productorservice.php-NORUN
diff --git a/htdocs/webservices/demo_wsclient_project.php-NORUN b/public/webservices/demo_wsclient_project.php-NORUN
similarity index 100%
rename from htdocs/webservices/demo_wsclient_project.php-NORUN
rename to public/webservices/demo_wsclient_project.php-NORUN
diff --git a/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN b/public/webservices/demo_wsclient_thirdparty.php-NORUN
similarity index 100%
rename from htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
rename to public/webservices/demo_wsclient_thirdparty.php-NORUN
diff --git a/htdocs/webservices/index.php b/public/webservices/index.php
similarity index 100%
rename from htdocs/webservices/index.php
rename to public/webservices/index.php
diff --git a/htdocs/webservices/server_actioncomm.php b/public/webservices/server_actioncomm.php
similarity index 100%
rename from htdocs/webservices/server_actioncomm.php
rename to public/webservices/server_actioncomm.php
diff --git a/htdocs/webservices/server_category.php b/public/webservices/server_category.php
similarity index 100%
rename from htdocs/webservices/server_category.php
rename to public/webservices/server_category.php
diff --git a/htdocs/webservices/server_contact.php b/public/webservices/server_contact.php
similarity index 100%
rename from htdocs/webservices/server_contact.php
rename to public/webservices/server_contact.php
diff --git a/htdocs/webservices/server_invoice.php b/public/webservices/server_invoice.php
similarity index 100%
rename from htdocs/webservices/server_invoice.php
rename to public/webservices/server_invoice.php
diff --git a/htdocs/webservices/server_order.php b/public/webservices/server_order.php
similarity index 100%
rename from htdocs/webservices/server_order.php
rename to public/webservices/server_order.php
diff --git a/htdocs/webservices/server_other.php b/public/webservices/server_other.php
similarity index 100%
rename from htdocs/webservices/server_other.php
rename to public/webservices/server_other.php
diff --git a/htdocs/webservices/server_productorservice.php b/public/webservices/server_productorservice.php
similarity index 100%
rename from htdocs/webservices/server_productorservice.php
rename to public/webservices/server_productorservice.php
diff --git a/htdocs/webservices/server_project.php b/public/webservices/server_project.php
similarity index 100%
rename from htdocs/webservices/server_project.php
rename to public/webservices/server_project.php
diff --git a/htdocs/webservices/server_supplier_invoice.php b/public/webservices/server_supplier_invoice.php
similarity index 100%
rename from htdocs/webservices/server_supplier_invoice.php
rename to public/webservices/server_supplier_invoice.php
diff --git a/htdocs/webservices/server_thirdparty.php b/public/webservices/server_thirdparty.php
similarity index 100%
rename from htdocs/webservices/server_thirdparty.php
rename to public/webservices/server_thirdparty.php
diff --git a/htdocs/webservices/server_user.php b/public/webservices/server_user.php
similarity index 100%
rename from htdocs/webservices/server_user.php
rename to public/webservices/server_user.php
diff --git a/htdocs/websites/class/website.class.php b/public/websites/class/website.class.php
similarity index 100%
rename from htdocs/websites/class/website.class.php
rename to public/websites/class/website.class.php
diff --git a/htdocs/websites/class/websitepage.class.php b/public/websites/class/websitepage.class.php
similarity index 100%
rename from htdocs/websites/class/websitepage.class.php
rename to public/websites/class/websitepage.class.php
diff --git a/htdocs/websites/frametop.php b/public/websites/frametop.php
similarity index 100%
rename from htdocs/websites/frametop.php
rename to public/websites/frametop.php
diff --git a/htdocs/websites/index.html b/public/websites/index.html
similarity index 100%
rename from htdocs/websites/index.html
rename to public/websites/index.html
diff --git a/htdocs/websites/index.php b/public/websites/index.php
similarity index 100%
rename from htdocs/websites/index.php
rename to public/websites/index.php

From 4d375bcf958bed8cffe9b4b56f9fa58f3f669472 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Fri, 16 Dec 2016 11:31:14 +0100
Subject: [PATCH 0071/1163] debug translate

---
 htdocs/core/class/listview.class.php       | 95 +++++++---------------
 htdocs/core/js/listview.js                 | 56 ++++++-------
 htdocs/core/modules/modInventory.class.php | 11 +--
 htdocs/inventory/inventory.php             | 17 ++--
 htdocs/langs/en_US/inventory.lang          |  4 +-
 htdocs/langs/fr_FR/inventory.lang          |  4 +-
 6 files changed, 75 insertions(+), 112 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index e94a648ec27..d276853a362 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -68,7 +68,6 @@ class Listview {
 			$TParam['orderBy'] = $POSTList[$this->id]['orderBy']; 
 		}
 		
-	//	print_r($TParam);
 	}
 	private function getSearchNull($key, &$TParam) {
 		return !empty($TParam['search'][$key]['allow_is_null']);
@@ -80,7 +79,7 @@ class Listview {
 			if (!is_array($TParam['search'][$key]['table'])) $TParam['search'][$key]['table'] = array($TParam['search'][$key]['table']);
 			
 			foreach ($TParam['search'][$key]['table'] as $prefix_table) {
-				$TPrefixe[] = '`'.$prefix_table.'`.'; 
+				$TPrefixe[] = $prefix_table.'.'; 
 			}
 		}
 		
@@ -90,27 +89,18 @@ class Listview {
 			
 			foreach ($TParam['search'][$key]['field'] as $i => $field) {
 				$prefixe = !empty($TPrefixe[$i]) ? $TPrefixe[$i] : $TPrefixe[0];
-				$TKey[] = $prefixe.'`'. $field .'`';
+				$TKey[] = $prefixe. $field ;
 			}
 		} else {
-			$TKey[] =$TPrefixe[0].'`'. strtr($key,';','*').'`';
+			$TKey[] =$TPrefixe[0].$key;
 		}
 		
 		return $TKey;
 	} 
-	private function getSearchValue($value) {
-		$value = strtr(trim($value),';','*');	
-			
-		return $value;
-	}
 	
 	private function dateToSQLDate($date) {
 		
-		list($dd,$mm,$aaaa) = explode('/', substr($date,0,10));
-		
-		$value = date('Y-m-d', mktime(0,0,0,$mm,$dd,$aaaa));
-		
-		return $value;
+		return $this->db->jdate($date);
 	}
 	
 	private function addSqlFromTypeDate(&$TSQLMore, &$value, $sKey, $sBindKey)
@@ -118,19 +108,10 @@ class Listview {
 		if(is_array($value))
 		{
 			
-			unset($this->TBind[$sBindKey]);
-			// Si le type de "recherche" est "calendars" on a 2 champs de transmis, [début et fin] ou [que début] ou [que fin] => un BETWEEN Sql serait utile que dans le 1er cas 
-			// donc l'utilisation des opérateur >= et <= permettent un fonctionnement générique
 			$TSQLDate=array();
 			if(!empty($value['start']))
 			{
 				$valueDeb = $this->dateToSQLDate($value['start']);
-				
-				if(isset($this->TBind[$sBindKey.'_start'])) // TODO can't use this in query case
-				{
-					$this->TBind[$sBindKey.'_start'] = $valueDeb;
-				}
-				
 				$TSQLDate[]=$sKey." >= '".$valueDeb." 00:00:00'" ;
 				
 			}
@@ -138,10 +119,6 @@ class Listview {
 			if(!empty($value['end']))
 			{
 				$valueFin = $this->dateToSQLDate($value['end']);
-				if(isset($this->TBind[$sBindKey.'_end'])) { // TODO can't use this in query case
-					$this->TBind[$sBindKey.'_end'] = $valueFin;
-				}
-				
 				$TSQLDate[]=$sKey." <= '".$valueFin." 23:59:59'" ;	
 				
 			}
@@ -150,25 +127,15 @@ class Listview {
 		}
 		else
 		{
-			// Sinon je communique une date directement au format d/m/Y et la méthode du dessous reformat en Y-m-d
 			$value = $this->dateToSQLDate($value);
-			if(isset($this->TBind[$sBindKey]))
-			{
-				$this->TBind[$sBindKey] = $value;
-			}
-			else
-			{
-				// Le % en fin de chaine permet de trouver un resultat si le contenu est au format Y-m-d H:i:s et non en Y-m-d
-				$TSQLMore[]=$sKey." LIKE '".$value."%'" ;
-			}
+			$TSQLMore[]=$sKey." LIKE '".$value."%'" ;
+			
 		}
 	}
 	
 	private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $sBindKey, $key)
 	{
 	
-		$value = $this->getSearchValue($value);
-		
 		if(isset($TParam['operator'][$key]))
 		{
 			if($TParam['operator'][$key] == '<' || $TParam['operator'][$key] == '>' || $TParam['operator'][$key]=='=')
@@ -207,7 +174,6 @@ class Listview {
 			foreach($_REQUEST['Listview'][$this->id]['search'] as $key=>$value)
 			{
 				$TsKey = $this->getSearchKey($key, $TParam);
-				$TsBindKey = $this->getTsBindKey($TsKey);
 				
 				//if (!empty($value)) var_dump($TsKey, $TsBindKey, '==================================');
 				$TSQLMore = array();
@@ -217,38 +183,32 @@ class Listview {
 				
 				foreach ($TsKey as $i => &$sKey)
 				{
-					//if (!empty($value)) var_dump($sKey);
-					$sBindKey = $TsBindKey[$i];
-					
 					if($allow_is_null && !empty($_REQUEST['Listview'][$this->id]['search_on_null'][$key]))
 					{
-						$this->TBind[$sBindKey.'_null'] = $sKey.' IS NULL ';
 						$TSQLMore[] = $sKey.' IS NULL ';
 						$search_on_null = true;
 						
-						if(isset($this->TBind[$sBindKey])) $this->TBind[$sBindKey]= '';
 						$value = '';
 					}
 					elseif($allow_is_null)
 					{
-						$this->TBind[$sBindKey.'_null'] =0; // $sKey.' IS NOT NULL ';
-						//$TSQLMore[] =  $sKey.' IS NOT NULL ';
+						null;
 					}
 					
 					if($value!='') { // pas empty car biensûr le statut = 0 existe dans de nombreux cas
 						
 						if(isset($TParam['type'][$key]) && ($TParam['type'][$key]==='date' || $TParam['type'][$key]==='datetime'))
 						{
-							$this->addSqlFromTypeDate($TSQLMore, $value, $sKey, $sBindKey);
+							$this->addSqlFromTypeDate($TSQLMore, $value, $sKey);
 						}
 						else
 						{
-							$this->addSqlFromOther($TSQLMore, $value, $TParam, $sKey, $sBindKey, $key);
+							$this->addSqlFromOther($TSQLMore, $value, $TParam, $sKey, $key);
 						}
 					}
 				}
 
-				if(!isset($this->TBind[$sBindKey]) && !empty($TSQLMore))
+				if(!empty($TSQLMore))
 				{
 					$sql.=' AND ( '.implode(' OR ',$TSQLMore).' ) ';
 				}
@@ -282,13 +242,11 @@ class Listview {
 	}
 
 	private function setSearch(&$THeader, &$TParam) {
-		global $langs;
+		global $langs, $form;
 		
 		if(empty($TParam['search'])) return array();
 		
 		$TSearch=array();
-		$form=new TFormCore;
-		$form->strict_string_compare = true;
 		
 		$nb_search_in_bar = 0;
 		
@@ -296,20 +254,22 @@ class Listview {
 			foreach($THeader as $key=>$libelle) { // init
 				if(empty($TSearch[$key]))$TSearch[$key]='';
 			}
-		}		
+		}	
+		
+		$ListPOST = GETPOST('Listview');
+		
 		foreach($TParam['search'] as $key=>$param_search) {
 			
-		
-			$value = isset($_REQUEST['Listview'][$this->id]['search'][$key]) ? $_REQUEST['Listview'][$this->id]['search'][$key] : '';
+			$value = isset($ListPOST[$this->id]['search'][$key]) ? $ListPOST[$this->id]['search'][$key] : '';
 			
 			$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search;  
 			
 			if(is_array($typeRecherche)) {
-				$typeRecherche = array(''=>' ') + $typeRecherche;
-				$fsearch=$form->combo('','Listview['.$this->id.'][search]['.$key.']', $typeRecherche,$value,0,'',' listviewtbs="combo" init-value="'.$value.'" ');
+				$fsearch=$form->selectarray('Listview['.$this->id.'][search]['.$key.']', $typeRecherche,$value,1);
 			}
 			else if($typeRecherche==='calendar') {
-				$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
+				$fsearch = $form->select_date($value, 'Listview['.$this->id.'][search]['.$key.']',0, 0, 1, "", 1, 0, 1);
+				//$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
 			}
 			else if($typeRecherche==='calendars') {
 				$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.'][start]',isset($value['start'])?$value['start']:'',10,10,' listviewtbs="calendars" ')
@@ -340,7 +300,7 @@ class Listview {
 				
 		}
 		
-		$search_button = ' <a href="#" onclick="ListviewsubmitSearch(this);" class="list-search-link">'.$TParam['liste']['picto_search'].'</a>';
+		$search_button = ' <a href="#" onclick="Listview_submitSearch(this);" class="list-search-link">'.$TParam['liste']['picto_search'].'</a>';
 
 		if(!empty($TParam['liste']['head_search'])) {
 			$TParam['liste']['head_search'].='<div align="right">'.$langs->trans('Search').' '.$search_button.'</div>';
@@ -406,8 +366,8 @@ class Listview {
 
 	private function getJS(&$TParam) {
 		$javaScript = '<script language="javascript">
-		if(typeof(TListview_include)=="undefined") {
-			document.write("<script type=\"text/javascript\" src=\"'.DOL_URL_ROOT.'/core/js/list.view.js\"></scr");
+		if(typeof(Listview_include)=="undefined") {
+			document.write("<script type=\"text/javascript\" src=\"'.DOL_URL_ROOT.'/core/js/listview.js?version='.DOL_VERSION.'\"></scr");
 	  		document.write("ipt>");
 		}
 		</script>';
@@ -542,10 +502,13 @@ class Listview {
 		
 		$out.='</tr>';
 			
-		if(!empty($TParam['liste']['nbSearch'])) {
-		$out.='<tr class="liste_titre barre-recherche">
-					<td class="liste_titre">'.img_search().'</td>
-				</tr>';
+		if(count($TSearch)>0) {
+			$out.='<tr class="liste_titre barre-recherche">';
+			foreach($TSearch as $field=>$search) {
+				$out.='<td class="liste_titre">'.$search.'</td>';
+				
+			}
+			$out.='</tr>';
 		}
 				
 		$out.='</thead><tbody>';
diff --git a/htdocs/core/js/listview.js b/htdocs/core/js/listview.js
index 1157c2ef4b8..03ca7f72508 100644
--- a/htdocs/core/js/listview.js
+++ b/htdocs/core/js/listview.js
@@ -1,27 +1,27 @@
-var TListTBS_include = true;
+var Listview_include = true;
 
-function TListTBS_OrderDown(idListe, column) {
+function Listview_OrderDown(idListe, column) {
 	var base_url = document.location.href;
 	
-	base_url = TListTBS_recup_form_param(idListe,base_url);
-	base_url = TListTBS_removeParam(base_url,'TListTBS['+encodeURIComponent(idListe)+'][orderBy]');
+	base_url = Listview_recup_form_param(idListe,base_url);
+	base_url = Listview_removeParam(base_url,'Listview['+encodeURIComponent(idListe)+'][orderBy]');
 	
-	base_url = TListTBS_removeParam(base_url,'get-all-for-export');
+	base_url = Listview_removeParam(base_url,'get-all-for-export');
 	
-	document.location.href=TListTBS_modifyUrl(base_url,"TListTBS["+encodeURIComponent(idListe)+"][orderBy]["+encodeURIComponent(column)+"]","DESC");
+	document.location.href=Listview_modifyUrl(base_url,"Listview["+encodeURIComponent(idListe)+"][orderBy]["+encodeURIComponent(column)+"]","DESC");
 }
-function TListTBS_OrderUp(idListe, column) {
+function Listview_OrderUp(idListe, column) {
 	
 	var base_url = document.location.href;
 	
-	base_url = TListTBS_recup_form_param(idListe,base_url);
-	base_url = TListTBS_removeParam(base_url,'TListTBS['+encodeURIComponent(idListe)+'][orderBy]');
+	base_url = Listview_recup_form_param(idListe,base_url);
+	base_url = Listview_removeParam(base_url,'Listview['+encodeURIComponent(idListe)+'][orderBy]');
 	
-	base_url = TListTBS_removeParam(base_url,'get-all-for-export');
+	base_url = Listview_removeParam(base_url,'get-all-for-export');
 	
-	document.location.href=TListTBS_modifyUrl(base_url,"TListTBS["+encodeURIComponent(idListe)+"][orderBy]["+encodeURIComponent(column)+"]","ASC");
+	document.location.href=Listview_modifyUrl(base_url,"Listview["+encodeURIComponent(idListe)+"][orderBy]["+encodeURIComponent(column)+"]","ASC");
 }
-function TListTBS_modifyUrl(strURL,paramName,paramNewValue){
+function Listview_modifyUrl(strURL,paramName,paramNewValue){
 	    if (strURL.indexOf(paramName+'=')!=-1){
         	
                 var strFirstPart=strURL.substring(0,strURL.indexOf(paramName+'=',0))+paramName+'=';
@@ -39,7 +39,7 @@ function TListTBS_modifyUrl(strURL,paramName,paramNewValue){
         
         return strURL;
 }
-function TListTBS_removeParam(strURL, paramMask) {
+function Listview_removeParam(strURL, paramMask) {
 	var cpt=0;
 	var url = '';
 	
@@ -60,11 +60,11 @@ function TListTBS_removeParam(strURL, paramMask) {
 	 return url;
 }
 
-function TListTBS_recup_form_param(idListe,base_url) {
+function Listview_recup_form_param(idListe,base_url) {
 	
 	$('#'+idListe+' tr.barre-recherche [listviewtbs],#'+idListe+' tr.barre-recherche-head input,#'+idListe+' tr.barre-recherche-head select,#'+idListe+' div.tabsAction input[listviewtbs]').each(function(i,item) {
 		if($(item).attr("name")) {
-			base_url = TListTBS_modifyUrl(base_url, $(item).attr("name") , $(item).val());
+			base_url = Listview_modifyUrl(base_url, $(item).attr("name") , $(item).val());
 		}
 		
 	});
@@ -72,37 +72,37 @@ function TListTBS_recup_form_param(idListe,base_url) {
 	return base_url;
 }
 
-function TListTBS_GoToPage(idListe,pageNumber){
+function Listview_GoToPage(idListe,pageNumber){
 	
 	var base_url = document.location.href;
 	
-	base_url = TListTBS_recup_form_param(idListe,base_url);
-	base_url =TListTBS_modifyUrl(base_url,"TListTBS["+encodeURIComponent(idListe)+"][page]",pageNumber);
+	base_url = Listview_recup_form_param(idListe,base_url);
+	base_url =Listview_modifyUrl(base_url,"Listview["+encodeURIComponent(idListe)+"][page]",pageNumber);
 	
-	base_url = TListTBS_removeParam(base_url,'get-all-for-export');
+	base_url = Listview_removeParam(base_url,'get-all-for-export');
 	
 	document.location.href=base_url;
 }
-function TListTBS_submitSearch(obj) {
+function Listview_submitSearch(obj) {
 	
 	$(obj).closest('form').submit();
-	//console.log($(obj).closest('form'));
+
 }
-function TListTBS_launch_downloadAs(mode,url,token,session_name) {
-	 $('#listTBSdAS_export_form').remove();
+function Listview_launch_downloadAs(mode,url,token,session_name) {
+	 $('#listviewdAS_export_form').remove();
 	
-	$form = $('<form action="'+url+'" method="post" name="listTBSdAS_export_form" id="listTBSdAS_export_form"></form>');
+	$form = $('<form action="'+url+'" method="post" name="listviewdAS_export_form" id="listTBSdAS_export_form"></form>');
 	$form.append('<input type="hidden" name="mode" value="'+mode+'" />');
 	$form.append('<input type="hidden" name="token" value="'+token+'" />');
 	$form.append('<input type="hidden" name="session_name" value="'+session_name+'" />');
 	
 	$('body').append($form);
 	
-    $('#listTBSdAS_export_form').submit();
+    $('#listviewdAS_export_form').submit();
 	
 }
 
-function TListTBS_downloadAs(obj, mode,url,token,session_name) {
+function Listview_downloadAs(obj, mode,url,token,session_name) {
 	
 	$form = $(obj).closest('form');
 	$div = $form.find('div.tabsAction');
@@ -112,7 +112,7 @@ function TListTBS_downloadAs(obj, mode,url,token,session_name) {
 	$div.append('<input type="hidden" listviewtbs="hidden" name="session_name" value="'+session_name+'" />');
 	$div.append('<input type="hidden" listviewtbs="hidden" name="get-all-for-export" value="1" />');
 	
-	TListTBS_submitSearch(obj);
+	Listview_submitSearch(obj);
 }
 
 $(document).ready(function() {
@@ -137,7 +137,7 @@ $(document).ready(function() {
 	});
 	
 	if(typeof $_GET["get-all-for-export"] != "undefined") {
-		TListTBS_launch_downloadAs($_GET["mode"],$_GET["url"],$_GET["token"],$_GET["session_name"]);
+		Listview_launch_downloadAs($_GET["mode"],$_GET["url"],$_GET["token"],$_GET["session_name"]);
 	}
 	
 });
diff --git a/htdocs/core/modules/modInventory.class.php b/htdocs/core/modules/modInventory.class.php
index 31170375752..abe65b65647 100644
--- a/htdocs/core/modules/modInventory.class.php
+++ b/htdocs/core/modules/modInventory.class.php
@@ -66,7 +66,7 @@ class modinventory extends DolibarrModules
 		// Name of image file used for this module.
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='inventory@inventory';
+		$this->picto='inventory';
 
 		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
 		// for default path (eg: /inventory/core/xxxxx) (0=disable, 1=enable)
@@ -167,8 +167,6 @@ class modinventory extends DolibarrModules
 		// Example:
 		//$this->boxes=array(array(0=>array('file'=>'myboxa.php','note'=>'','enabledbydefaulton'=>'Home'),1=>array('file'=>'myboxb.php','note'=>''),2=>array('file'=>'myboxc.php','note'=>'')););
 
-		$langs->load('inventory@inventory');
-		
 		// Permissions
 		$this->rights = array();		// Permission array used by this module
 		$r=0;
@@ -249,11 +247,11 @@ class modinventory extends DolibarrModules
 		// $r++;
 		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=stock',			                // Put 0 if this is a top menu
 								'type'=>'left',			                // This is a Top menu entry
-								'titre'=>'Liste des inventaires',
+								'titre'=>'ListInventory',
 								'mainmenu'=>'inventory',
 								'leftmenu'=>'inventory',
 								'url'=>'/inventory/inventory.php?action=list',
-								'langs'=>'inventory@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 								'position'=>100,
 								'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
 								'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
@@ -263,11 +261,10 @@ class modinventory extends DolibarrModules
 		
 		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=stock',			                // Put 0 if this is a top menu
 								'type'=>'left',			                // This is a Top menu entry
-								'titre'=>'Nouvel inventaire',
+								'titre'=>'NewInventory',
 								'mainmenu'=>'inventory',
 								'leftmenu'=>'inventory',
 								'url'=>'/inventory/inventory.php?action=create',
-								'langs'=>'inventory@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 								'position'=>100,
 								'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
 								'perms'=>'$user->rights->inventory->create',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index d0ca303c239..f0a0d073a27 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -266,8 +266,8 @@ function _action()
 			
 			header('Location: '.dol_buildpath('/inventory/inventory.php?action=list', 1));
 			exit;
-			//_list();
 			
+			break;
 		case 'exportCSV':
 			
 			$id = GETPOST('id');
@@ -309,18 +309,14 @@ function _list()
 	$THide = array('label');
 
 	echo $l->render(Inventory::getSQL('All'), array(
-		'limit'=>array(
-			'nbLine'=>'30'
-		)
-		,'subQuery'=>array()
-		,'link'=>array(
+		'link'=>array(
 			'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
 		)
 		,'translate'=>array()
 		,'hide'=>$THide
 		,'type'=>array(
-			'date_cre'=>'date'
-			,'date_maj'=>'datetime'
+			'datec'=>'date'
+			,'tms'=>'datetime'
 			,'date_inventory'=>'date'
 		)
 		,'liste'=>array(
@@ -343,7 +339,10 @@ function _list()
 		,'eval'=>array(
 			'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))'
 			,'rowid'=>'Inventory::getLink(@val@)'
-            
+		)
+		,'search'=>array(
+				'date_inventory'=>'calendar'
+				
 		)
 	));
 
diff --git a/htdocs/langs/en_US/inventory.lang b/htdocs/langs/en_US/inventory.lang
index ba947f09d77..152aceed862 100644
--- a/htdocs/langs/en_US/inventory.lang
+++ b/htdocs/langs/en_US/inventory.lang
@@ -49,4 +49,6 @@ ConfirmFlushInventory=Do you confirm this action ?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
-RegulateStock=Regulate Stock
\ No newline at end of file
+RegulateStock=Regulate Stock
+ListInventory=Inventories list
+NewInventory=New inventory
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/inventory.lang b/htdocs/langs/fr_FR/inventory.lang
index 85fdf3112dc..546a5202976 100644
--- a/htdocs/langs/fr_FR/inventory.lang
+++ b/htdocs/langs/fr_FR/inventory.lang
@@ -47,4 +47,6 @@ ConfirmFlushInventory=Do you confirm this action ?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
-RegulateStock=Regulate Stock
\ No newline at end of file
+RegulateStock=Regulate Stock
+InventoryDate=Inventory date
+DateUpdate=Last update
\ No newline at end of file

From 79867a85d05d6730eaa88951c7ab149745efa89e Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Fri, 16 Dec 2016 16:09:02 +0100
Subject: [PATCH 0072/1163] fix list issue

---
 htdocs/core/class/listview.class.php       |  74 +++++++--------
 htdocs/core/js/listview.js                 |  10 +-
 htdocs/core/modules/modInventory.class.php |   2 +-
 htdocs/inventory/class/inventory.class.php |   2 +-
 htdocs/inventory/inventory.php             |  68 +-------------
 htdocs/inventory/list.php                  | 103 +++++++++++++++++++++
 6 files changed, 152 insertions(+), 107 deletions(-)
 create mode 100644 htdocs/inventory/list.php

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index d276853a362..6b57fd36a21 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -40,7 +40,7 @@ class Listview {
 		if(!isset($TParam['link']))$TParam['link']=array();
 		if(!isset($TParam['type']))$TParam['type']=array();
 		if(!isset($TParam['orderby']['noOrder']))$TParam['orderby']['noOrder']=array();
-		if(!isset($TParam['no-select'])) $TParam['no-select'] = 1;
+		if(!isset($TParam['allow-fields-select'])) $TParam['allow-fields-select'] = 0;
 		
 		if(!isset($TParam['list']))$TParam['list']=array();
 		$TParam['list'] = array_merge(array(
@@ -53,7 +53,7 @@ class Listview {
 			,'orderUp'=>''
 			,'id'=>$this->id
 			,'head_search'=>''
-			,'export'=>array()
+			,'export'=>array() //TODO include native export
 			,'view_type'=>'' //TODO to include graph or kanban instead of list
 		),$TParam['list']);
 		
@@ -133,7 +133,7 @@ class Listview {
 		}
 	}
 	
-	private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $sBindKey, $key)
+	private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $key)
 	{
 	
 		if(isset($TParam['operator'][$key]))
@@ -272,38 +272,40 @@ class Listview {
 				//$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
 			}
 			else if($typeRecherche==='calendars') {
-				$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.'][start]',isset($value['start'])?$value['start']:'',10,10,' listviewtbs="calendars" ')
-					.' '.$form->calendrier('','Listview['.$this->id.'][search]['.$key.'][end]',isset($value['end'])?$value['end']:'',10,10,' listviewtbs="calendars" ');	
+				
+				$fsearch = $form->select_date(isset($value['start'])?$value['start']:'', 'Listview['.$this->id.'][search]['.$key.'][start]',0, 0, 1, "", 1, 0, 1)
+						 . $form->select_date(isset($value['end'])?$value['end']:'', 'Listview['.$this->id.'][search]['.$key.'][end]',0, 0, 1, "", 1, 0, 1);
+				
 			}
 			else if(is_string($typeRecherche)) {
 				$fsearch=$TParam['search'][$key];	
 			}
 			else {
-				$fsearch=$form->texte('','Listview['.$this->id.'][search]['.$key.']',$value,15,255,' listviewtbs="input" ');	
+				$fsearch='<input type="text" name="Listview['.$this->id.'][search]['.$key.']" id="Listview['.$this->id.'][search]['.$key.']" value="'.$value.'" size="15" />';
 			}
 
 			if(!empty($param_search['allow_is_null'])) {
-				$valueNull = isset($_REQUEST['Listview'][$this->id]['search_on_null'][$key]) ? 1 : 0;
+				$valueNull = isset($ListPOST[$this->id]['search_on_null'][$key]) ? 1 : 0;
 				$fsearch.=' '.$form->checkbox1('', 'Listview['.$this->id.'][search_on_null]['.$key.']',1, $valueNull,' onclick=" if($(this).is(\':checked\')){ $(this).prev().val(\'\'); }" ').img_help(1, $langs->trans('SearchOnNUllValue'));
 			}
 			
 
-			if(!empty($THeader[$key]) || $this->getViewType($TParam) == 'chart') {
+			if(!empty($THeader[$key])) {
 				$TSearch[$key] = $fsearch;
 				$nb_search_in_bar++;
 			}
 			else {
 				
-				$libelle = !empty($TParam['title'][$key]) ? $TParam['title'][$key] : $key ;
-				$TParam['liste']['head_search'].='<div>'.$libelle.' '.$fsearch.'</div>';	
+				$label = !empty($TParam['title'][$key]) ? $TParam['title'][$key] : $key ;
+				$TParam['list']['head_search'].='<div><span style="min-width:200px;display:inline-block;">'.$libelle.'</span> '.$fsearch.'</div>';	
 			}
 				
 		}
 		
-		$search_button = ' <a href="#" onclick="Listview_submitSearch(this);" class="list-search-link">'.$TParam['liste']['picto_search'].'</a>';
+		$search_button = ' <a href="#" onclick="Listview_submitSearch(this);" class="list-search-link">'.img_search().'</a>';
 
-		if(!empty($TParam['liste']['head_search'])) {
-			$TParam['liste']['head_search'].='<div align="right">'.$langs->trans('Search').' '.$search_button.'</div>';
+		if(!empty($TParam['list']['head_search'])) {
+			$TParam['list']['head_search']='<div style="float:right;">'.$search_button.'</div>'.$TParam['list']['head_search'];
 		}
 		
 		if($nb_search_in_bar>0) {
@@ -364,7 +366,7 @@ class Listview {
 		return array($TTotal,$TTotalGroup);
 	}
 
-	private function getJS(&$TParam) {
+	private function getJS() {
 		$javaScript = '<script language="javascript">
 		if(typeof(Listview_include)=="undefined") {
 			document.write("<script type=\"text/javascript\" src=\"'.DOL_URL_ROOT.'/core/js/listview.js?version='.DOL_VERSION.'\"></scr");
@@ -467,34 +469,32 @@ class Listview {
 	
 	private function renderList(&$THeader, &$TField, &$TTotal,&$TTotalGroup, &$TParam) {
 		
-		$javaScript = $this->getJS($TParam);
-		
-		/*$TPagination=array(
-			'pagination'=>array('pageSize'=>$TParam['limit']['nbLine'], 'pageNum'=>$TParam['limit']['page'], 'blockName'=>'champs', 'totalNB'=>count($TField))
-		);*/
-		
 		$TSearch = $this->setSearch($THeader, $TParam);
 		$TExport=$this->setExport($TParam, $TField, $THeader);
 		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
-		$out = $javaScript;
+		$out = $this->getJS();
 		$out.=load_fiche_titre($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $TParam['limit']['page'], count($TField), 'title_products.png', 0, '', '', $limit);
 		$out.='<table id="'.$this->id.'" class="liste" width="100%">
 			<thead>';
 		
-		if(!empty($TParam['liste']['head_search'])) {
+		if(!empty($TParam['list']['head_search'])) {
 			$out.='<tr class="liste_titre barre-recherche-head">
-					<td colspan="'.$TParam['liste']['nb_columns'].'">'.$TParam['liste']['head_search'].'</td>
+					<td colspan="'.count($THeader).'">'.$TParam['list']['head_search'].'</td>
 				</tr>';
 		}
 			
 		$out.='<tr class="liste_titre">';
 		
-		foreach($THeader as $head) {
+		foreach($THeader as $field=>$head) {
+			if(empty($head['width']))$head['width']='auto';
+			
 			$out.='<th style="width:'.$head['width'].';text-align:'.$head['text-align'].'" class="liste_titre">'.$head['libelle'];
-						
-			if($head['order']) $out.='<span class="nowrap">[onshow;block=span; when [entete.order]==1]<a href="javascript:Listview_OrderDown(\'[liste.id]\',\'[entete.$;strconv=js]\')">'.img_down().'</a>
-								<a href="javascript:Listview_OrderUp(\'[liste.id]\', \'[entete.$;strconv=js]\')">'.img_up().'</a></span>';
+				
+			if($head['order']) $out.='<span class="nowrap">
+					<a href="javascript:Listview_OrderDown(\''.$this->id.'\',\''.$field.'\')">'.img_down().'</a>
+					<a href="javascript:Listview_OrderUp(\''.$this->id.'\', \''.$field.'\')">'.img_up().'</a>
+			</span>';
 			
 			$out.=$head['more'];
 			$out.='</th>';
@@ -517,7 +517,7 @@ class Listview {
 		
 		if(empty($TField)) {
 			$out.='<tr class="'.$class.'">
-					<td colspan="'.$TParam['liste']['nb_columns'].'">'.$TParam['liste']['messageNothing'].'</td></tr>';
+					<td colspan="'.$TParam['list']['nb_columns'].'">'.$TParam['list']['messageNothing'].'</td></tr>';
 			
 		}
 		else{
@@ -537,7 +537,7 @@ class Listview {
 			
 			$out.='</tbody>';
 			
-			if(!empty($TParam['liste']['haveTotal'])) {
+			if(!empty($TParam['list']['haveTotal'])) {
 				$out.='<tfoot>
 				<tr class="liste_total">';
 			
@@ -584,8 +584,8 @@ class Listview {
 			foreach($TParam['orderBy'] as $field=>$order) {
 				if(!$first) $sql.=',';
 				
-				if($order=='DESC')$TParam['liste']['orderDown'] = $field;
-				else $TParam['liste']['orderUp'] = $field;
+				if($order=='DESC')$TParam['list']['orderDown'] = $field;
+				else $TParam['list']['orderUp'] = $field;
 				
 				if(strpos($field,'.')===false)	$sql.='`'.$field.'` '.$order;
 				else $sql.=$field.' '.$order;
@@ -610,7 +610,7 @@ class Listview {
 		
 		foreach($TField as $row) {
 			if($first) {
-				$this->init_entete($THeader, $TParam, $row);
+				$this->initHeader($THeader, $TParam, $row);
 				$first=false;
 			}	
 			
@@ -619,7 +619,7 @@ class Listview {
 
 	}
 	
-	private function init_entete(&$THeader, &$TParam, $currentLine) {
+	private function initHeader(&$THeader, &$TParam, $currentLine) {
 		
 		$TField=$TFieldVisibility=array();
 		
@@ -630,9 +630,9 @@ class Listview {
 		global $user;
 		
 		$contextpage=md5($_SERVER['PHP_SELF']);
-		if(empty($TParam['no-select'])) {
+		if(!empty($TParam['allow-field-select'])) {
 			
-			dol_include_once('/core/class/html.form.class.php');
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 			
 			global $db,$conf,$user;
 			$form=new Form($db);
@@ -693,7 +693,7 @@ class Listview {
 				$lastfield = $field;
 				$THeader[$field] = array(
 					'libelle'=>$libelle
-					,'order'=>((in_array($field, $TParam['orderby']['noOrder']) || $this->typeRender != 'sql') ? 0 : 1)
+					,'order'=>(in_array($field, $TParam['orderby']['noOrder']) ? 0 : 1)
 					,'width'=>(!empty($TParam['size']['width'][$field]) ? $TParam['size']['width'][$field] : 'auto')
 					,'text-align'=>(!empty($TParam['position']['text-align'][$field]) ? $TParam['position']['text-align'][$field] : 'auto')
 					,'more'=>''
@@ -843,7 +843,7 @@ class Listview {
 			$first=true;
 			while($currentLine = $this->db->fetch_object($res)) {
 				if($first) {
-					$this->init_entete($THeader, $TParam, $currentLine);
+					$this->initHeader($THeader, $TParam, $currentLine);
 					$first = false;
 				}
 				
diff --git a/htdocs/core/js/listview.js b/htdocs/core/js/listview.js
index 03ca7f72508..0affb264474 100644
--- a/htdocs/core/js/listview.js
+++ b/htdocs/core/js/listview.js
@@ -85,7 +85,15 @@ function Listview_GoToPage(idListe,pageNumber){
 }
 function Listview_submitSearch(obj) {
 	
-	$(obj).closest('form').submit();
+	$form = $(obj).closest('form');
+	console.log($form);
+	if($form.length>0){
+		$form.submit();
+	}
+	else{
+		//There is no form for search action
+		null;
+	}
 
 }
 function Listview_launch_downloadAs(mode,url,token,session_name) {
diff --git a/htdocs/core/modules/modInventory.class.php b/htdocs/core/modules/modInventory.class.php
index abe65b65647..d3ee39c89ff 100644
--- a/htdocs/core/modules/modInventory.class.php
+++ b/htdocs/core/modules/modInventory.class.php
@@ -250,7 +250,7 @@ class modinventory extends DolibarrModules
 								'titre'=>'ListInventory',
 								'mainmenu'=>'inventory',
 								'leftmenu'=>'inventory',
-								'url'=>'/inventory/inventory.php?action=list',
+								'url'=>'/inventory/list.php',
 								'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 								'position'=>100,
 								'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index b39445807e9..344252f4dc4 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -362,7 +362,7 @@ class Inventory extends CoreObject
 		
 		if($type=='All') {
 			
-			$sql="SELECT i.rowid, e.label, i.date_inventory, i.fk_warehouse, i.datec, i.tms, i.status
+			$sql="SELECT i.rowid,i.title, e.label, i.date_inventory, i.fk_warehouse, i.datec, i.tms, i.status
 				  FROM ".MAIN_DB_PREFIX."inventory i
 				  LEFT JOIN ".MAIN_DB_PREFIX."entrepot e ON (e.rowid = i.fk_warehouse)
 				  WHERE i.entity=".(int) $conf->entity;
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index f0a0d073a27..e8918f021d0 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -53,11 +53,6 @@ function _action()
 	$action=GETPOST('action');
 	
 	switch($action) {
-		case 'list':
-			_list();
-
-			break;
-		
 		case 'create':
 			if (!$user->rights->inventory->create) accessforbidden();
 			
@@ -264,7 +259,7 @@ function _action()
 			
 			setEventMessage($langs->trans('InventoryDeleted'));
 			
-			header('Location: '.dol_buildpath('/inventory/inventory.php?action=list', 1));
+			header('Location: '.dol_buildpath('/inventory/list.php', 1));
 			exit;
 			
 			break;
@@ -296,67 +291,6 @@ function _action()
 	
 }
 
-function _list() 
-{
-	
-	global $db, $conf, $langs, $user;
-		
-	llxHeader('',$langs->trans('inventoryListTitle'),'','');
-	
-	$inventory = new Inventory($db);
-	$l = new ListView($db,'listInventory');
-
-	$THide = array('label');
-
-	echo $l->render(Inventory::getSQL('All'), array(
-		'link'=>array(
-			'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
-		)
-		,'translate'=>array()
-		,'hide'=>$THide
-		,'type'=>array(
-			'datec'=>'date'
-			,'tms'=>'datetime'
-			,'date_inventory'=>'date'
-		)
-		,'liste'=>array(
-			'titre'=>$langs->trans('inventoryListTitle')
-			,'image'=>img_picto('','title.png', '', 0)
-			,'picto_precedent'=>img_picto('','back.png', '', 0)
-			,'picto_suivant'=>img_picto('','next.png', '', 0)
-			,'noheader'=> (int)isset($_REQUEST['fk_soc']) | (int)isset($_REQUEST['fk_product'])
-			,'messageNothing'=>$langs->trans('inventoryListEmpty')
-			,'picto_search'=>img_picto('','search.png', '', 0)
-		)
-		,'title'=>array(
-			'rowid'=>$langs->trans('Title')
-			,'fk_warehouse'=>$langs->trans('Warehouse')
-			,'date_inventory'=>$langs->trans('InventoryDate')
-			,'datec'=>$langs->trans('DateCreation')
-			,'tms'=>$langs->trans('DateUpdate')
-			,'status'=>$langs->trans('Status')
-		)
-		,'eval'=>array(
-			'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))'
-			,'rowid'=>'Inventory::getLink(@val@)'
-		)
-		,'search'=>array(
-				'date_inventory'=>'calendar'
-				
-		)
-	));
-
-
-	if ($user->rights->inventory->create)
-	{
-		print '<div class="tabsAction">';
-		print '<a class="butAction" href="inventory.php?action=create">'.$langs->trans('inventoryCreate').'</a>';
-		print '</div>';
-	}
-
-	llxFooter('');
-}
-
 function _card_warehouse(&$inventory)
 {
 	global $langs,$conf,$db, $user, $form;
diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
new file mode 100644
index 00000000000..a2294029657
--- /dev/null
+++ b/htdocs/inventory/list.php
@@ -0,0 +1,103 @@
+<?php
+/* Copyright (C) 2016		ATM Consulting			<support@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/inventory/inventory.php
+ *	\ingroup    product
+ *	\brief      File of class to manage inventory
+ */
+ 
+require_once '../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php';
+require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/inventory/lib/inventory.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+
+$langs->load("stock");
+$langs->load("inventory");
+
+if(!$user->rights->inventory->read) accessforbidden();
+
+_list();
+
+
+function _list() 
+{
+	
+	global $db, $conf, $langs, $user;
+		
+	llxHeader('',$langs->trans('inventoryListTitle'),'','');
+	
+	echo '<form name="formListInvetory" action="'.$_SERVER['PHP_SELF'].'" method="post" >';
+	
+	$inventory = new Inventory($db);
+	$l = new ListView($db,'listInventory');
+
+	$THide = array('label','title');
+
+	echo $l->render(Inventory::getSQL('All'), array(
+		'link'=>array(
+			'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
+		)
+		,'translate'=>array()
+		,'hide'=>$THide
+		,'type'=>array(
+			'datec'=>'date'
+			,'tms'=>'datetime'
+			,'date_inventory'=>'date'
+		)
+		,'list'=>array(
+			'title'=>$langs->trans('inventoryListTitle')
+			,'messageNothing'=>$langs->trans('inventoryListEmpty')
+		)
+		,'title'=>array(
+			'rowid'=>$langs->trans('Title')
+			,'fk_warehouse'=>$langs->trans('Warehouse')
+			,'date_inventory'=>$langs->trans('InventoryDate')
+			,'datec'=>$langs->trans('DateCreation')
+			,'tms'=>$langs->trans('DateUpdate')
+			,'status'=>$langs->trans('Status')
+		)
+		,'eval'=>array(
+			'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))'
+			,'rowid'=>'Inventory::getLink(@val@)'
+		)
+		,'search'=>array(
+				'date_inventory'=>'calendar'
+				,'title'=>true
+				
+		)
+	));
+
+
+	if ($user->rights->inventory->create)
+	{
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="inventory.php?action=create">'.$langs->trans('inventoryCreate').'</a>';
+		print '</div>';
+	}
+
+	echo '</form>';
+	
+	llxFooter('');
+}
\ No newline at end of file

From 41ddaf5d9b83b4b0a1f6eb4e1251818cf30d426f Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Fri, 16 Dec 2016 16:28:10 +0100
Subject: [PATCH 0073/1163] fix but major bug on date name, as to seach a
 solution

---
 htdocs/core/class/listview.class.php | 19 +++++++++++--------
 htdocs/inventory/inventory.php       |  4 ++--
 htdocs/inventory/list.php            |  5 ++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 6b57fd36a21..1333e5b0e6c 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -103,7 +103,7 @@ class Listview {
 		return $this->db->jdate($date);
 	}
 	
-	private function addSqlFromTypeDate(&$TSQLMore, &$value, $sKey, $sBindKey)
+	private function addSqlFromTypeDate(&$TSQLMore, &$value, $sKey)
 	{
 		if(is_array($value))
 		{
@@ -135,7 +135,8 @@ class Listview {
 	
 	private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $key)
 	{
-	
+		if($value==-1) return false;
+			
 		if(isset($TParam['operator'][$key]))
 		{
 			if($TParam['operator'][$key] == '<' || $TParam['operator'][$key] == '>' || $TParam['operator'][$key]=='=')
@@ -154,16 +155,18 @@ class Listview {
 		}
 		else
 		{
-			if(strpos($value,'%')===false) $value = '%'.$value.'%';
-			$TSQLMore[]=$sKey." LIKE '".addslashes($value)."'" ;
+				if(strpos($value,'%')===false) $value = '%'.$value.'%';
+				$TSQLMore[]=$sKey." LIKE '".addslashes($value)."'" ;
 		}
 		
-	
+		return true;
 	}
 
 	private function search($sql,&$TParam) {
 	
-		if(!empty($_REQUEST['Listview'][$this->id]['search'])) {
+		$ListPOST = GETPOST('Listview');
+		
+		if(!empty($ListPOST[$this->id]['search'])) {
 			$sqlGROUPBY='';
 			if(strpos($sql,'GROUP BY')!==false) { //TODO regex
 				list($sql, $sqlGROUPBY) = explode('GROUP BY', $sql);
@@ -171,7 +174,7 @@ class Listview {
 			
 			if(strpos($sql,'WHERE ')===false)$sql.=' WHERE 1 '; //TODO regex
 			
-			foreach($_REQUEST['Listview'][$this->id]['search'] as $key=>$value)
+			foreach($ListPOST[$this->id]['search'] as $key=>$value)
 			{
 				$TsKey = $this->getSearchKey($key, $TParam);
 				
@@ -183,7 +186,7 @@ class Listview {
 				
 				foreach ($TsKey as $i => &$sKey)
 				{
-					if($allow_is_null && !empty($_REQUEST['Listview'][$this->id]['search_on_null'][$key]))
+					if($allow_is_null && !empty($ListPOST[$this->id]['search_on_null'][$key]))
 					{
 						$TSQLMore[] = $sKey.' IS NULL ';
 						$search_on_null = true;
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index e8918f021d0..7e43c3ce44e 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -270,7 +270,7 @@ function _action()
 			$inventory = new Inventory($db);
 			$inventory->fetch($id);
 			
-			exportCSV($inventory);
+			_exportCSV($inventory);
 			
 			exit;
 			break;
@@ -476,7 +476,7 @@ function _card_line(&$inventory, &$lines, $mode)
 
 }
 
-function exportCSV(&$inventory) {
+function _exportCSV(&$inventory) {
 	global $conf;
 	
 	header('Content-Type: application/octet-stream');
diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index a2294029657..c6846cfc618 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -83,9 +83,8 @@ function _list()
 			,'rowid'=>'Inventory::getLink(@val@)'
 		)
 		,'search'=>array(
-				'date_inventory'=>'calendar'
-				,'title'=>true
-				
+				'date_inventory'=>'calendars'
+				,'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
 		)
 	));
 

From f0ea6104014733ab3a955e476ace4f81e7bd3d3c Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Fri, 16 Dec 2016 17:06:05 +0100
Subject: [PATCH 0074/1163] change date value

---
 htdocs/core/class/listview.class.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 1333e5b0e6c..46a766a1206 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -173,6 +173,7 @@ class Listview {
 			}
 			
 			if(strpos($sql,'WHERE ')===false)$sql.=' WHERE 1 '; //TODO regex
+			//TODO	$value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
 			
 			foreach($ListPOST[$this->id]['search'] as $key=>$value)
 			{
@@ -271,13 +272,19 @@ class Listview {
 				$fsearch=$form->selectarray('Listview['.$this->id.'][search]['.$key.']', $typeRecherche,$value,1);
 			}
 			else if($typeRecherche==='calendar') {
-				$fsearch = $form->select_date($value, 'Listview['.$this->id.'][search]['.$key.']',0, 0, 1, "", 1, 0, 1);
+				
+				$value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
+				
+				$fsearch = $form->select_date($value, 'Listview_'.$this->id.'_search_'.$key,0, 0, 1, "", 1, 0, 1);
 				//$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
 			}
 			else if($typeRecherche==='calendars') {
 				
-				$fsearch = $form->select_date(isset($value['start'])?$value['start']:'', 'Listview['.$this->id.'][search]['.$key.'][start]',0, 0, 1, "", 1, 0, 1)
-						 . $form->select_date(isset($value['end'])?$value['end']:'', 'Listview['.$this->id.'][search]['.$key.'][end]',0, 0, 1, "", 1, 0, 1);
+				$value_start = GETPOST('Listview_'.$this->id.'_search_'.$key.'_start') ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startmonth'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startday'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startyear') ) : '';
+				$value_end = GETPOST('Listview_'.$this->id.'_search_'.$key.'_end') ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endmonth'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endday'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endyear') ) : '';
+			
+				$fsearch = $form->select_date($value_start, 'Listview_'.$this->id.'_search_'.$key.'_start',0, 0, 1, "", 1, 0, 1)
+						 . $form->select_date($value_end, 'Listview_'.$this->id.'_search_'.$key.'_end',0, 0, 1, "", 1, 0, 1);
 				
 			}
 			else if(is_string($typeRecherche)) {
@@ -837,7 +844,7 @@ class Listview {
 		$this->TTotalTmp=array();
 		
 		$this->THideFlip = array_flip($TParam['hide']);
-
+var_dump($this->sql);
 		$res = $this->db->query($this->sql);
 		if($res!==false) {
 			

From a736f3782c410f30b79e2c7be4804fcf5043b361 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Dec 2016 13:21:09 +0100
Subject: [PATCH 0075/1163] FIX security bugs

---
 htdocs/accountancy/bookkeeping/balancebymonth.php    |  4 +++-
 htdocs/accountancy/customer/index.php                |  4 ++--
 htdocs/accountancy/report/result.php                 |  4 +++-
 htdocs/accountancy/supplier/index.php                |  4 ++--
 htdocs/asterisk/wrapper.php                          |  8 ++++----
 htdocs/categories/traduction.php                     |  2 +-
 htdocs/install/step4.php                             |  2 +-
 htdocs/loan/calc.php                                 | 12 ++++++------
 htdocs/loan/payment/card.php                         |  4 ++--
 .../canvas/product/actions_card_product.class.php    |  5 ++---
 .../canvas/service/actions_card_service.class.php    |  4 ++--
 htdocs/product/traduction.php                        |  2 +-
 12 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php
index 9202371e5a5..83908f72172 100644
--- a/htdocs/accountancy/bookkeeping/balancebymonth.php
+++ b/htdocs/accountancy/bookkeeping/balancebymonth.php
@@ -38,7 +38,7 @@ $langs->load("other");
 $langs->load("accountancy");
 
 // Filter
-$year = $_GET["year"];
+$year = GETPOST("year",'int');
 if ($year == 0) {
 	$year_current = strftime("%Y", time());
 	$year_start = $year_current;
@@ -47,9 +47,11 @@ if ($year == 0) {
 	$year_start = $year;
 }
 
+
 /*
  * View
  */
+
 llxHeader('', $langs->trans("Bookkeeping"));
 
 $textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current - 1) . '">' . img_previous() . '</a>';
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index fea8281935f..ef5c512179a 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -47,7 +47,7 @@ if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
 // Filter
-$year = $_GET["year"];
+$year = GETPOST("year",'int');
 if ($year == 0) {
 	$year_current = strftime("%Y", time());
 	$year_start = $year_current;
@@ -57,7 +57,7 @@ if ($year == 0) {
 }
 
 // Validate History
-$action = GETPOST('action');
+$action = GETPOST('action','alpha');
 
 
 
diff --git a/htdocs/accountancy/report/result.php b/htdocs/accountancy/report/result.php
index e31e1c92f17..317b7193ff3 100644
--- a/htdocs/accountancy/report/result.php
+++ b/htdocs/accountancy/report/result.php
@@ -43,7 +43,7 @@ $rowid = GETPOST('rowid', 'int');
 $cancel = GETPOST('cancel');
 
 // Filter
-$year = $_GET["year"];
+$year = GETPOST('year','int');
 if ($year == 0) {
 	$year_current = strftime("%Y", time());
 	$year_start = $year_current;
@@ -64,9 +64,11 @@ if (! $user->rights->accounting->comptarapport->lire)
 
 $AccCat = new AccountancyCategory($db);
 
+
 /*
  * View
  */
+
 llxheader('', $langs->trans('ReportInOut'));
 
 $formaccounting = new FormAccounting($db);
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 82c7cebe087..ef7d470bb07 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -45,7 +45,7 @@ if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
 // Filter
-$year = $_GET["year"];
+$year = GETPOST("year",'int');
 if ($year == 0) {
 	$year_current = strftime("%Y", time());
 	$year_start = $year_current;
@@ -55,7 +55,7 @@ if ($year == 0) {
 }
 
 // Validate History
-$action = GETPOST('action');
+$action = GETPOST('action', 'alpha');
 
 
 /*
diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index e5c9a6b2093..381750546ce 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -85,10 +85,10 @@ if (! isset($conf->global->ASTERISK_PRIORITY))  $conf->global->ASTERISK_PRIORITY
 if (! isset($conf->global->ASTERISK_MAX_RETRY)) $conf->global->ASTERISK_MAX_RETRY="2";
 
 
-$login = $_GET['login'];
-$password = $_GET['password'];
-$caller = $_GET['caller'];
-$called = $_GET['called'];
+$login = GETPOST('login');
+$password = GETPOST('password');
+$caller = GETPOST('caller');
+$called = GETPOST('called');
 
 // IP address of Asterisk server
 $strHost = $conf->global->ASTERISK_HOST;
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 00741f81390..1967727b32f 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -277,7 +277,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="vadd">';
-	print '<input type="hidden" name="id" value="'.$_GET["id"].'">';
+	print '<input type="hidden" name="id" value="'.$id.'">';
 
 	print '<table class="border" width="100%">';
 	print '<tr><td class="fieldtitlecreate fieldrequired">'.$langs->trans('Translation').'</td><td>';
diff --git a/htdocs/install/step4.php b/htdocs/install/step4.php
index ce16596bdbf..740a45a9063 100644
--- a/htdocs/install/step4.php
+++ b/htdocs/install/step4.php
@@ -79,7 +79,7 @@ $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db-
 if ($db->ok)
 {
     print '<tr><td>'.$langs->trans("DolibarrAdminLogin").' :</td><td>';
-	print '<input name="login" type="text" value="' . (!empty($_GET["login"]) ? $_GET["login"] : (isset($force_install_dolibarrlogin) ? $force_install_dolibarrlogin : '')) . '"' . (@$force_install_noedit == 2 && $force_install_dolibarrlogin !== null ? ' disabled' : '') . '></td></tr>';
+	print '<input name="login" type="text" value="' . (!empty($_GET["login"]) ? GETPOST("login") : (isset($force_install_dolibarrlogin) ? $force_install_dolibarrlogin : '')) . '"' . (@$force_install_noedit == 2 && $force_install_dolibarrlogin !== null ? ' disabled' : '') . '></td></tr>';
     print '<tr><td>'.$langs->trans("Password").' :</td><td>';
     print '<input type="password" name="pass"></td></tr>';
     print '<tr><td>'.$langs->trans("PasswordAgain").' :</td><td>';
diff --git a/htdocs/loan/calc.php b/htdocs/loan/calc.php
index b6e649962fa..76b4c989aa7 100644
--- a/htdocs/loan/calc.php
+++ b/htdocs/loan/calc.php
@@ -49,12 +49,12 @@ $error                           = false;
  * Set the USER INPUT values
  * --------------------------------------------------- */
 if (isset($_REQUEST['form_complete'])) {
-    $sale_price                      = $_REQUEST['sale_price'];
-    $annual_interest_percent         = $_REQUEST['annual_interest_percent'];
-    $year_term                       = $_REQUEST['year_term'];
-    $down_percent                    = $_REQUEST['down_percent'];
-    $show_progress                   = (isset($_REQUEST['show_progress'])) ? $_REQUEST['show_progress'] : false;
-    $form_complete                   = $_REQUEST['form_complete'];
+    $sale_price                      = GETPOST('sale_price');
+    $annual_interest_percent         = GETPOST('annual_interest_percent');
+    $year_term                       = GETPOST('year_term');
+    $down_percent                    = GETPOST('down_percent');
+    $show_progress                   = (isset($_REQUEST['show_progress'])) ? GETPOST('show_progress') : false;
+    $form_complete                   = GETPOST('form_complete');
 }
 
 // This function does the actual mortgage calculations
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 41f332e5dd0..c76b0565a3f 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -32,7 +32,7 @@ $langs->load('companies');
 $langs->load('loan');
 
 // Security check
-$id=GETPOST("id");
+$id=GETPOST("id",'int');
 $action=GETPOST("action");
 $confirm=GETPOST('confirm');
 if ($user->societe_id) $socid=$user->societe_id;
@@ -120,7 +120,7 @@ $form = new Form($db);
 
 $h=0;
 
-$head[$h][0] = DOL_URL_ROOT.'/loan/payment/card.php?id='.$_GET["id"];
+$head[$h][0] = DOL_URL_ROOT.'/loan/payment/card.php?id='.$id;
 $head[$h][1] = $langs->trans("Card");
 $hselected = $h;
 $h++;
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index e32d31122dc..06803e8239d 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -325,16 +325,15 @@ class ActionsCardProduct
 
         $this->list_datas = array();
 
-		//$_GET["sall"] = 'LL';
 		// Clean parameters
-		$sall=trim(isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"]);
+		$sall=trim(GETPOST("sall"));
 
 		foreach($this->field_list as $field)
 		{
 			if ($field['enabled'])
 			{
 				$fieldname = "s".$field['alias'];
-				$$fieldname = trim(isset($_GET[$fieldname])?$_GET[$fieldname]:$_POST[$fieldname]);
+				$$fieldname = trim(GETPOST($fieldname));
 			}
 		}
 
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index 7bc04ecb42a..af6fbccc320 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -308,9 +308,9 @@ class ActionsCardService
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
 		// We'll need this table joined to the select in order to filter by categ
 		if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_product as cp";
-		if ($_GET["fourn_id"] > 0)
+		if (GETPOST("fourn_id",'int') > 0)
 		{
-			$fourn_id = $_GET["fourn_id"];
+			$fourn_id = GETPOST("fourn_id",'int');
 			$sql.= ", ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
 		}
 		$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 1f6ae678a81..f616004db42 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -305,7 +305,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="vadd">';
-	print '<input type="hidden" name="id" value="'.$_GET["id"].'">';
+	print '<input type="hidden" name="id" value="'.GETPOST("id",'int').'">';
 
 	print '<table class="border" width="100%">';
 	print '<tr><td valign="top" class="titlefieldcreate fieldrequired">'.$langs->trans('Language').'</td><td>';

From 6653e2dbe72e59d2d112075687d8a116f2acf90a Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@gmail.com>
Date: Mon, 19 Dec 2016 03:42:36 -0300
Subject: [PATCH 0076/1163] Revert "Code refactoring. Improve folder structure.
 For better project implementation. Most hosting server have a default folder
 public or public_html insted of htdocs, htdocs is a exclusive folder for
 apache web server, for example is no the same folder in NGINX."

This reverts commit e91c2c6e77fd1f5a33eba12124ffbd1599e930cd.
---
 {public => htdocs}/.gitignore                       |   0
 {public => htdocs}/accountancy/admin/account.php    |   0
 .../accountancy/admin/accountmodel.php              |   0
 {public => htdocs}/accountancy/admin/card.php       |   0
 {public => htdocs}/accountancy/admin/categories.php |   0
 .../accountancy/admin/defaultaccounts.php           |   0
 {public => htdocs}/accountancy/admin/export.php     |   0
 {public => htdocs}/accountancy/admin/fiscalyear.php |   0
 .../accountancy/admin/fiscalyear_card.php           |   0
 .../accountancy/admin/fiscalyear_info.php           |   0
 .../accountancy/admin/importaccounts.php            |   0
 {public => htdocs}/accountancy/admin/index.html     |   0
 {public => htdocs}/accountancy/admin/index.php      |   0
 {public => htdocs}/accountancy/admin/journal.php    |   0
 .../accountancy/admin/productaccount.php            |   0
 .../accountancy/bookkeeping/balance.php             |   0
 .../accountancy/bookkeeping/balancebymonth.php      |   0
 {public => htdocs}/accountancy/bookkeeping/card.php |   0
 .../accountancy/bookkeeping/index.html              |   0
 {public => htdocs}/accountancy/bookkeeping/list.php |   0
 .../accountancy/bookkeeping/listbyaccount.php       |   0
 .../accountancy/bookkeeping/listbyyear.php          |   0
 .../accountancy/class/accountancycategory.class.php |   0
 .../accountancy/class/accountancyexport.class.php   |   0
 .../accountancy/class/accountancysystem.class.php   |   0
 .../accountancy/class/accountingaccount.class.php   |   0
 .../accountancy/class/bookkeeping.class.php         |   0
 .../class/html.formventilation.class.php            |   0
 {public => htdocs}/accountancy/class/index.html     |   0
 {public => htdocs}/accountancy/customer/card.php    |   0
 {public => htdocs}/accountancy/customer/index.html  |   0
 {public => htdocs}/accountancy/customer/index.php   |   0
 {public => htdocs}/accountancy/customer/lines.php   |   0
 {public => htdocs}/accountancy/customer/list.php    |   0
 .../accountancy/expensereport/card.php              |   0
 .../accountancy/expensereport/index.html            |   0
 .../accountancy/expensereport/index.php             |   0
 .../accountancy/expensereport/lines.php             |   0
 .../accountancy/expensereport/list.php              |   0
 {public => htdocs}/accountancy/index.html           |   0
 {public => htdocs}/accountancy/index.php            |   0
 .../accountancy/journal/bankjournal.php             |   0
 .../accountancy/journal/expensereportsjournal.php   |   0
 {public => htdocs}/accountancy/journal/index.html   |   0
 .../accountancy/journal/purchasesjournal.php        |   0
 .../accountancy/journal/sellsjournal.php            |   0
 {public => htdocs}/accountancy/report/index.html    |   0
 {public => htdocs}/accountancy/report/result.php    |   0
 {public => htdocs}/accountancy/supplier/card.php    |   0
 {public => htdocs}/accountancy/supplier/index.html  |   0
 {public => htdocs}/accountancy/supplier/index.php   |   0
 {public => htdocs}/accountancy/supplier/lines.php   |   0
 {public => htdocs}/accountancy/supplier/list.php    |   0
 .../accountancy/tpl/export_journal.tpl.php          |   0
 {public => htdocs}/accountancy/tpl/index.html       |   0
 {public => htdocs}/adherents/admin/adherent.php     |   0
 .../adherents/admin/adherent_extrafields.php        |   0
 .../adherents/admin/adherent_type_extrafields.php   |   0
 {public => htdocs}/adherents/admin/index.html       |   0
 {public => htdocs}/adherents/admin/public.php       |   0
 {public => htdocs}/adherents/agenda.php             |   0
 .../canvas/actions_adherentcard_common.class.php    |   0
 .../default/actions_adherentcard_default.class.php  |   0
 .../adherents/canvas/default/index.html             |   0
 .../canvas/default/tpl/adherentcard_create.tpl.php  |   0
 .../canvas/default/tpl/adherentcard_edit.tpl.php    |   0
 .../canvas/default/tpl/adherentcard_view.tpl.php    |   0
 .../adherents/canvas/default/tpl/index.html         |   0
 {public => htdocs}/adherents/canvas/index.html      |   0
 {public => htdocs}/adherents/card.php               |   0
 {public => htdocs}/adherents/cartes/carte.php       |   0
 {public => htdocs}/adherents/cartes/index.html      |   0
 .../adherents/class/adherent.class.php              |   0
 .../adherents/class/adherent_type.class.php         |   0
 .../adherents/class/adherentstats.class.php         |   0
 .../adherents/class/api_members.class.php           |   0
 .../adherents/class/api_subscriptions.class.php     |   0
 {public => htdocs}/adherents/class/index.html       |   0
 .../adherents/class/subscription.class.php          |   0
 {public => htdocs}/adherents/document.php           |   0
 {public => htdocs}/adherents/htpasswd.php           |   0
 {public => htdocs}/adherents/index.php              |   0
 {public => htdocs}/adherents/ldap.php               |   0
 {public => htdocs}/adherents/list.php               |   0
 {public => htdocs}/adherents/note.php               |   0
 {public => htdocs}/adherents/stats/byproperties.php |   0
 {public => htdocs}/adherents/stats/geo.php          |   0
 {public => htdocs}/adherents/stats/index.html       |   0
 {public => htdocs}/adherents/stats/index.php        |   0
 {public => htdocs}/adherents/subscription.php       |   0
 {public => htdocs}/adherents/subscription/card.php  |   0
 .../adherents/subscription/index.html               |   0
 {public => htdocs}/adherents/subscription/info.php  |   0
 {public => htdocs}/adherents/subscription/list.php  |   0
 {public => htdocs}/adherents/tpl/index.html         |   0
 .../adherents/tpl/linkedobjectblock.tpl.php         |   0
 {public => htdocs}/adherents/type.php               |   0
 {public => htdocs}/admin/agenda.php                 |   0
 {public => htdocs}/admin/agenda_extrafields.php     |   0
 {public => htdocs}/admin/agenda_extsites.php        |   0
 {public => htdocs}/admin/agenda_other.php           |   0
 {public => htdocs}/admin/agenda_xcal.php            |   0
 {public => htdocs}/admin/bank.php                   |   0
 {public => htdocs}/admin/bank_extrafields.php       |   0
 {public => htdocs}/admin/barcode.php                |   0
 {public => htdocs}/admin/boxes.php                  |   0
 {public => htdocs}/admin/chequereceipts.php         |   0
 {public => htdocs}/admin/clicktodial.php            |   0
 {public => htdocs}/admin/commande.php               |   0
 {public => htdocs}/admin/company.php                |   0
 {public => htdocs}/admin/compta.php                 |   0
 {public => htdocs}/admin/confexped.php              |   0
 {public => htdocs}/admin/const.php                  |   0
 {public => htdocs}/admin/contract.php               |   0
 {public => htdocs}/admin/delais.php                 |   0
 {public => htdocs}/admin/dict.php                   |   0
 {public => htdocs}/admin/ecm.php                    |   0
 {public => htdocs}/admin/events.php                 |   0
 {public => htdocs}/admin/expedition.php             |   0
 {public => htdocs}/admin/expedition_extrafields.php |   0
 .../admin/expeditiondet_extrafields.php             |   0
 {public => htdocs}/admin/expensereport.php          |   0
 .../admin/expensereport_extrafields.php             |   0
 {public => htdocs}/admin/external_rss.php           |   0
 {public => htdocs}/admin/facture.php                |   0
 {public => htdocs}/admin/fckeditor.php              |   0
 {public => htdocs}/admin/fichinter.php              |   0
 {public => htdocs}/admin/geoipmaxmind.php           |   0
 {public => htdocs}/admin/ihm.php                    |   0
 {public => htdocs}/admin/index.php                  |   0
 {public => htdocs}/admin/ldap.php                   |   0
 {public => htdocs}/admin/ldap_contacts.php          |   0
 {public => htdocs}/admin/ldap_groups.php            |   0
 {public => htdocs}/admin/ldap_members.php           |   0
 {public => htdocs}/admin/ldap_users.php             |   0
 {public => htdocs}/admin/limits.php                 |   0
 {public => htdocs}/admin/livraison.php              |   0
 {public => htdocs}/admin/livraison_extrafields.php  |   0
 .../admin/livraisondet_extrafields.php              |   0
 {public => htdocs}/admin/loan.php                   |   0
 {public => htdocs}/admin/mailing.php                |   0
 {public => htdocs}/admin/mailman.php                |   0
 {public => htdocs}/admin/mails.php                  |   0
 {public => htdocs}/admin/menus.php                  |   0
 {public => htdocs}/admin/menus/edit.php             |   0
 {public => htdocs}/admin/menus/index.php            |   0
 {public => htdocs}/admin/menus/other.php            |   0
 {public => htdocs}/admin/modules.php                |   0
 {public => htdocs}/admin/multicurrency.php          |   0
 {public => htdocs}/admin/notification.php           |   0
 {public => htdocs}/admin/oauth.php                  |   0
 {public => htdocs}/admin/oauthlogintokens.php       |   0
 {public => htdocs}/admin/order_extrafields.php      |   0
 {public => htdocs}/admin/orderdet_extrafields.php   |   0
 {public => htdocs}/admin/payment.php                |   0
 {public => htdocs}/admin/pdf.php                    |   0
 {public => htdocs}/admin/perms.php                  |   0
 {public => htdocs}/admin/prelevement.php            |   0
 {public => htdocs}/admin/propal.php                 |   0
 {public => htdocs}/admin/proxy.php                  |   0
 {public => htdocs}/admin/receiptprinter.php         |   0
 {public => htdocs}/admin/resource.php               |   0
 {public => htdocs}/admin/resource_extrafields.php   |   0
 {public => htdocs}/admin/salaries.php               |   0
 {public => htdocs}/admin/security.php               |   0
 {public => htdocs}/admin/security_file.php          |   0
 {public => htdocs}/admin/security_other.php         |   0
 {public => htdocs}/admin/sms.php                    |   0
 {public => htdocs}/admin/spip.php                   |   0
 {public => htdocs}/admin/stock.php                  |   0
 {public => htdocs}/admin/supplier_invoice.php       |   0
 {public => htdocs}/admin/supplier_order.php         |   0
 {public => htdocs}/admin/supplier_payment.php       |   0
 {public => htdocs}/admin/supplier_proposal.php      |   0
 .../admin/supplierinvoice_extrafields.php           |   0
 .../admin/supplierinvoicedet_extrafields.php        |   0
 .../admin/supplierorder_extrafields.php             |   0
 .../admin/supplierorderdet_extrafields.php          |   0
 {public => htdocs}/admin/syslog.php                 |   0
 {public => htdocs}/admin/system/about.php           |   0
 {public => htdocs}/admin/system/browser.php         |   0
 {public => htdocs}/admin/system/constall.php        |   0
 {public => htdocs}/admin/system/database-tables.php |   0
 {public => htdocs}/admin/system/database.php        |   0
 {public => htdocs}/admin/system/dbtable.php         |   0
 {public => htdocs}/admin/system/dolibarr.php        |   0
 {public => htdocs}/admin/system/filecheck.php       |   0
 {public => htdocs}/admin/system/index.php           |   0
 {public => htdocs}/admin/system/modules.php         |   0
 {public => htdocs}/admin/system/os.php              |   0
 {public => htdocs}/admin/system/perf.php            |   0
 {public => htdocs}/admin/system/phpinfo.php         |   0
 {public => htdocs}/admin/system/web.php             |   0
 {public => htdocs}/admin/system/xcache.php          |   0
 {public => htdocs}/admin/system/xdebug.php          |   0
 {public => htdocs}/admin/taxes.php                  |   0
 {public => htdocs}/admin/tools/dolibarr_export.php  |   0
 {public => htdocs}/admin/tools/dolibarr_import.php  |   0
 {public => htdocs}/admin/tools/eaccelerator.php     |   0
 {public => htdocs}/admin/tools/export.php           |   0
 {public => htdocs}/admin/tools/index.php            |   0
 {public => htdocs}/admin/tools/listevents.php       |   0
 {public => htdocs}/admin/tools/listsessions.php     |   0
 {public => htdocs}/admin/tools/purge.php            |   0
 {public => htdocs}/admin/tools/update.php           |   0
 {public => htdocs}/admin/translation.php            |   0
 {public => htdocs}/admin/triggers.php               |   0
 {public => htdocs}/admin/user.php                   |   0
 {public => htdocs}/admin/websites.php               |   0
 {public => htdocs}/admin/workflow.php               |   0
 {public => htdocs}/api/README.md                    |   0
 {public => htdocs}/api/admin/explorer.php           |   0
 {public => htdocs}/api/admin/index.php              |   0
 {public => htdocs}/api/class/api.class.php          |   0
 {public => htdocs}/api/class/api_access.class.php   |   0
 .../api/class/api_dictionnarycountries.class.php    |   0
 .../api/class/api_dictionnarytowns.class.php        |   0
 {public => htdocs}/api/class/api_login.class.php    |   0
 {public => htdocs}/api/class/api_status.class.php   |   0
 {public => htdocs}/api/class/index.html             |   0
 {public => htdocs}/api/index.php                    |   0
 {public => htdocs}/asterisk/cidlookup.php           |   0
 {public => htdocs}/asterisk/index.html              |   0
 {public => htdocs}/asterisk/wrapper.php             |   0
 {public => htdocs}/barcode/codeinit.php             |   0
 {public => htdocs}/barcode/index.html               |   0
 {public => htdocs}/barcode/printsheet.php           |   0
 {public => htdocs}/bookmarks/admin/bookmark.php     |   0
 {public => htdocs}/bookmarks/admin/index.html       |   0
 {public => htdocs}/bookmarks/bookmarks.lib.php      |   0
 {public => htdocs}/bookmarks/card.php               |   0
 .../bookmarks/class/bookmark.class.php              |   0
 {public => htdocs}/bookmarks/class/index.html       |   0
 {public => htdocs}/bookmarks/index.html             |   0
 {public => htdocs}/bookmarks/list.php               |   0
 {public => htdocs}/cache.manifest                   |   0
 {public => htdocs}/cashdesk/admin/cashdesk.php      |   0
 {public => htdocs}/cashdesk/admin/index.html        |   0
 {public => htdocs}/cashdesk/affContenu.php          |   0
 {public => htdocs}/cashdesk/affIndex.php            |   0
 {public => htdocs}/cashdesk/affPied.php             |   0
 {public => htdocs}/cashdesk/class/Auth.class.php    |   0
 .../cashdesk/class/Facturation.class.php            |   0
 {public => htdocs}/cashdesk/class/index.html        |   0
 {public => htdocs}/cashdesk/css/index.html          |   0
 {public => htdocs}/cashdesk/css/style.css           |   0
 {public => htdocs}/cashdesk/deconnexion.php         |   0
 {public => htdocs}/cashdesk/facturation.php         |   0
 {public => htdocs}/cashdesk/facturation_dhtml.php   |   0
 {public => htdocs}/cashdesk/facturation_verif.php   |   0
 {public => htdocs}/cashdesk/img/basket_delete.png   | Bin
 .../cashdesk/img/bg_conteneur_droite.png            | Bin
 .../cashdesk/img/bg_conteneur_gauche.png            | Bin
 {public => htdocs}/cashdesk/img/bg_entete.png       | Bin
 {public => htdocs}/cashdesk/img/bg_pied.png         | Bin
 {public => htdocs}/cashdesk/img/calendrier.png      | Bin
 {public => htdocs}/cashdesk/img/decrypted.png       | Bin
 {public => htdocs}/cashdesk/img/gescom.png          | Bin
 {public => htdocs}/cashdesk/img/index.html          |   0
 {public => htdocs}/cashdesk/img/lock.png            | Bin
 {public => htdocs}/cashdesk/img/login.png           | Bin
 {public => htdocs}/cashdesk/img/new.png             | Bin
 .../cashdesk/include/environnement.php              |   0
 {public => htdocs}/cashdesk/include/index.html      |   0
 {public => htdocs}/cashdesk/include/keypad.php      |   0
 {public => htdocs}/cashdesk/index.php               |   0
 {public => htdocs}/cashdesk/index_verif.php         |   0
 {public => htdocs}/cashdesk/javascript/dhtml.js     |   0
 .../cashdesk/javascript/facturation1.js             |   0
 {public => htdocs}/cashdesk/javascript/index.html   |   0
 {public => htdocs}/cashdesk/javascript/keypad.js    |   0
 .../cashdesk/tpl/facturation1.tpl.php               |   0
 {public => htdocs}/cashdesk/tpl/index.html          |   0
 .../cashdesk/tpl/liste_articles.tpl.php             |   0
 {public => htdocs}/cashdesk/tpl/menu.tpl.php        |   0
 {public => htdocs}/cashdesk/tpl/ticket.tpl.php      |   0
 {public => htdocs}/cashdesk/tpl/validation1.tpl.php |   0
 {public => htdocs}/cashdesk/tpl/validation2.tpl.php |   0
 {public => htdocs}/cashdesk/validation.php          |   0
 {public => htdocs}/cashdesk/validation_ok.php       |   0
 {public => htdocs}/cashdesk/validation_ticket.php   |   0
 {public => htdocs}/cashdesk/validation_verif.php    |   0
 {public => htdocs}/categories/admin/categorie.php   |   0
 .../categories/admin/categorie_extrafields.php      |   0
 {public => htdocs}/categories/admin/index.html      |   0
 {public => htdocs}/categories/card.php              |   0
 .../categories/class/api_categories.class.php       |   0
 .../class/api_deprecated_category.class.php         |   0
 .../categories/class/categorie.class.php            |   0
 {public => htdocs}/categories/class/index.html      |   0
 {public => htdocs}/categories/edit.php              |   0
 {public => htdocs}/categories/index.php             |   0
 {public => htdocs}/categories/photos.php            |   0
 {public => htdocs}/categories/traduction.php        |   0
 {public => htdocs}/categories/viewcat.php           |   0
 {public => htdocs}/comm/action/card.php             |   0
 .../comm/action/class/actioncomm.class.php          |   0
 .../comm/action/class/api_agendaevents.class.php    |   0
 .../comm/action/class/cactioncomm.class.php         |   0
 {public => htdocs}/comm/action/class/ical.class.php |   0
 {public => htdocs}/comm/action/class/index.html     |   0
 {public => htdocs}/comm/action/document.php         |   0
 {public => htdocs}/comm/action/index.php            |   0
 {public => htdocs}/comm/action/info.php             |   0
 {public => htdocs}/comm/action/listactions.php      |   0
 {public => htdocs}/comm/action/pertype.php          |   0
 {public => htdocs}/comm/action/peruser.php          |   0
 {public => htdocs}/comm/action/rapport/index.php    |   0
 {public => htdocs}/comm/address.php                 |   0
 {public => htdocs}/comm/admin/index.html            |   0
 .../comm/admin/propal_extrafields.php               |   0
 .../comm/admin/propaldet_extrafields.php            |   0
 {public => htdocs}/comm/card.php                    |   0
 {public => htdocs}/comm/contact.php                 |   0
 {public => htdocs}/comm/index.php                   |   0
 .../comm/mailing/advtargetemailing.php              |   0
 {public => htdocs}/comm/mailing/card.php            |   0
 {public => htdocs}/comm/mailing/cibles.php          |   0
 .../comm/mailing/class/advtargetemailing.class.php  |   0
 .../class/html.formadvtargetemailing.class.php      |   0
 {public => htdocs}/comm/mailing/class/index.html    |   0
 .../comm/mailing/class/mailing.class.php            |   0
 {public => htdocs}/comm/mailing/index.php           |   0
 {public => htdocs}/comm/mailing/info.php            |   0
 {public => htdocs}/comm/mailing/list.php            |   0
 {public => htdocs}/comm/multiprix.php               |   0
 {public => htdocs}/comm/propal/apercu.php           |   0
 {public => htdocs}/comm/propal/card.php             |   0
 .../comm/propal/class/api_proposals.class.php       |   0
 {public => htdocs}/comm/propal/class/index.html     |   0
 .../comm/propal/class/propal.class.php              |   0
 .../comm/propal/class/propalestats.class.php        |   0
 {public => htdocs}/comm/propal/contact.php          |   0
 {public => htdocs}/comm/propal/document.php         |   0
 {public => htdocs}/comm/propal/index.php            |   0
 {public => htdocs}/comm/propal/info.php             |   0
 {public => htdocs}/comm/propal/list.php             |   0
 {public => htdocs}/comm/propal/note.php             |   0
 {public => htdocs}/comm/propal/stats/index.php      |   0
 {public => htdocs}/comm/propal/tpl/index.html       |   0
 .../comm/propal/tpl/linkedobjectblock.tpl.php       |   0
 {public => htdocs}/comm/prospect/index.php          |   0
 {public => htdocs}/comm/prospect/recap-prospect.php |   0
 {public => htdocs}/comm/recap-client.php            |   0
 {public => htdocs}/comm/remise.php                  |   0
 {public => htdocs}/comm/remx.php                    |   0
 {public => htdocs}/commande/apercu.php              |   0
 {public => htdocs}/commande/card.php                |   0
 .../class/api_deprecated_commande.class.php         |   0
 .../commande/class/api_orders.class.php             |   0
 .../commande/class/commande.class.php               |   0
 .../commande/class/commandestats.class.php          |   0
 {public => htdocs}/commande/class/index.html        |   0
 {public => htdocs}/commande/contact.php             |   0
 {public => htdocs}/commande/customer.php            |   0
 {public => htdocs}/commande/document.php            |   0
 {public => htdocs}/commande/index.php               |   0
 {public => htdocs}/commande/info.php                |   0
 {public => htdocs}/commande/list.php                |   0
 {public => htdocs}/commande/note.php                |   0
 {public => htdocs}/commande/orderstoinvoice.php     |   0
 {public => htdocs}/commande/stats/index.php         |   0
 {public => htdocs}/commande/tpl/index.html          |   0
 .../commande/tpl/linkedobjectblock.tpl.php          |   0
 {public => htdocs}/compta/ajaxpayment.php           |   0
 {public => htdocs}/compta/bank/annuel.php           |   0
 {public => htdocs}/compta/bank/bankentries.php      |   0
 {public => htdocs}/compta/bank/bilan.php            |   0
 {public => htdocs}/compta/bank/budget.php           |   0
 {public => htdocs}/compta/bank/card.php             |   0
 {public => htdocs}/compta/bank/categ.php            |   0
 .../compta/bank/class/account.class.php             |   0
 .../compta/bank/class/api_bankaccounts.class.php    |   0
 .../compta/bank/class/bankcateg.class.php           |   0
 {public => htdocs}/compta/bank/class/index.html     |   0
 {public => htdocs}/compta/bank/document.php         |   0
 {public => htdocs}/compta/bank/graph.php            |   0
 {public => htdocs}/compta/bank/index.php            |   0
 {public => htdocs}/compta/bank/info.php             |   0
 {public => htdocs}/compta/bank/ligne.php            |   0
 {public => htdocs}/compta/bank/releve.php           |   0
 {public => htdocs}/compta/bank/transfer.php         |   0
 {public => htdocs}/compta/bank/treso.php            |   0
 {public => htdocs}/compta/charges/index.php         |   0
 {public => htdocs}/compta/clients.php               |   0
 {public => htdocs}/compta/deplacement/card.php      |   0
 .../compta/deplacement/class/deplacement.class.php  |   0
 .../deplacement/class/deplacementstats.class.php    |   0
 .../compta/deplacement/class/index.html             |   0
 {public => htdocs}/compta/deplacement/document.php  |   0
 {public => htdocs}/compta/deplacement/index.php     |   0
 {public => htdocs}/compta/deplacement/info.php      |   0
 {public => htdocs}/compta/deplacement/list.php      |   0
 .../compta/deplacement/stats/index.php              |   0
 {public => htdocs}/compta/facture.php               |   0
 .../facture/admin/facture_cust_extrafields.php      |   0
 .../facture/admin/facturedet_cust_extrafields.php   |   0
 {public => htdocs}/compta/facture/admin/index.html  |   0
 {public => htdocs}/compta/facture/apercu.php        |   0
 .../facture/class/api_deprecated_invoice.class.php  |   0
 .../compta/facture/class/api_invoices.class.php     |   0
 .../compta/facture/class/facture-rec.class.php      |   0
 .../compta/facture/class/facture.class.php          |   0
 .../compta/facture/class/facturestats.class.php     |   0
 {public => htdocs}/compta/facture/class/index.html  |   0
 .../compta/facture/class/paymentterm.class.php      |   0
 {public => htdocs}/compta/facture/contact.php       |   0
 {public => htdocs}/compta/facture/document.php      |   0
 {public => htdocs}/compta/facture/fiche-rec.php     |   0
 {public => htdocs}/compta/facture/index.html        |   0
 {public => htdocs}/compta/facture/info.php          |   0
 {public => htdocs}/compta/facture/list.php          |   0
 {public => htdocs}/compta/facture/note.php          |   0
 {public => htdocs}/compta/facture/prelevement.php   |   0
 {public => htdocs}/compta/facture/stats/index.php   |   0
 {public => htdocs}/compta/facture/tpl/index.html    |   0
 .../compta/facture/tpl/linkedobjectblock.tpl.php    |   0
 .../facture/tpl/linkedobjectblockForRec.tpl.php     |   0
 {public => htdocs}/compta/index.php                 |   0
 {public => htdocs}/compta/journal/index.html        |   0
 .../compta/journal/purchasesjournal.php             |   0
 {public => htdocs}/compta/journal/sellsjournal.php  |   0
 {public => htdocs}/compta/localtax/card.php         |   0
 {public => htdocs}/compta/localtax/class/index.html |   0
 .../compta/localtax/class/localtax.class.php        |   0
 {public => htdocs}/compta/localtax/clients.php      |   0
 {public => htdocs}/compta/localtax/index.php        |   0
 .../compta/localtax/quadri_detail.php               |   0
 {public => htdocs}/compta/localtax/reglement.php    |   0
 {public => htdocs}/compta/paiement.php              |   0
 {public => htdocs}/compta/paiement/avalider.php     |   0
 {public => htdocs}/compta/paiement/card.php         |   0
 {public => htdocs}/compta/paiement/cheque/card.php  |   0
 .../compta/paiement/cheque/class/index.html         |   0
 .../paiement/cheque/class/remisecheque.class.php    |   0
 {public => htdocs}/compta/paiement/cheque/index.php |   0
 {public => htdocs}/compta/paiement/cheque/list.php  |   0
 .../compta/paiement/class/cpaiement.class.php       |   0
 {public => htdocs}/compta/paiement/class/index.html |   0
 .../compta/paiement/class/paiement.class.php        |   0
 {public => htdocs}/compta/paiement/index.php        |   0
 {public => htdocs}/compta/paiement/info.php         |   0
 {public => htdocs}/compta/paiement/list.php         |   0
 {public => htdocs}/compta/paiement/rapport.php      |   0
 {public => htdocs}/compta/paiement_charge.php       |   0
 {public => htdocs}/compta/payment_sc/card.php       |   0
 {public => htdocs}/compta/payment_sc/index.html     |   0
 {public => htdocs}/compta/prelevement/bons.php      |   0
 {public => htdocs}/compta/prelevement/card.php      |   0
 .../prelevement/class/bonprelevement.class.php      |   0
 .../compta/prelevement/class/index.html             |   0
 .../prelevement/class/ligneprelevement.class.php    |   0
 .../prelevement/class/rejetprelevement.class.php    |   0
 {public => htdocs}/compta/prelevement/create.php    |   0
 {public => htdocs}/compta/prelevement/demandes.php  |   0
 {public => htdocs}/compta/prelevement/factures.php  |   0
 .../compta/prelevement/fiche-rejet.php              |   0
 .../compta/prelevement/fiche-stat.php               |   0
 {public => htdocs}/compta/prelevement/index.php     |   0
 {public => htdocs}/compta/prelevement/ligne.php     |   0
 {public => htdocs}/compta/prelevement/list.php      |   0
 {public => htdocs}/compta/prelevement/rejets.php    |   0
 {public => htdocs}/compta/prelevement/stats.php     |   0
 {public => htdocs}/compta/recap-compta.php          |   0
 {public => htdocs}/compta/resultat/clientfourn.php  |   0
 {public => htdocs}/compta/resultat/index.php        |   0
 {public => htdocs}/compta/salaries/card.php         |   0
 {public => htdocs}/compta/salaries/class/index.html |   0
 .../compta/salaries/class/paymentsalary.class.php   |   0
 {public => htdocs}/compta/salaries/document.php     |   0
 {public => htdocs}/compta/salaries/index.php        |   0
 {public => htdocs}/compta/salaries/info.php         |   0
 {public => htdocs}/compta/sociales/card.php         |   0
 .../compta/sociales/class/cchargesociales.class.php |   0
 .../compta/sociales/class/chargesociales.class.php  |   0
 {public => htdocs}/compta/sociales/class/index.html |   0
 .../class/paymentsocialcontribution.class.php       |   0
 {public => htdocs}/compta/sociales/document.php     |   0
 {public => htdocs}/compta/sociales/index.php        |   0
 {public => htdocs}/compta/sociales/info.php         |   0
 {public => htdocs}/compta/sociales/payments.php     |   0
 {public => htdocs}/compta/stats/cabyprodserv.php    |   0
 {public => htdocs}/compta/stats/cabyuser.php        |   0
 {public => htdocs}/compta/stats/casoc.php           |   0
 {public => htdocs}/compta/stats/index.php           |   0
 {public => htdocs}/compta/tva/card.php              |   0
 {public => htdocs}/compta/tva/class/index.html      |   0
 {public => htdocs}/compta/tva/class/tva.class.php   |   0
 {public => htdocs}/compta/tva/clients.php           |   0
 {public => htdocs}/compta/tva/index.php             |   0
 {public => htdocs}/compta/tva/info.php              |   0
 {public => htdocs}/compta/tva/quadri.php            |   0
 {public => htdocs}/compta/tva/quadri_detail.php     |   0
 {public => htdocs}/compta/tva/quarter_report.php    |   0
 {public => htdocs}/compta/tva/reglement.php         |   0
 {public => htdocs}/conf/.gitignore                  |   0
 {public => htdocs}/conf/.htaccess                   |   0
 {public => htdocs}/conf/conf.php.example            |   0
 {public => htdocs}/conf/index.html                  |   0
 .../canvas/actions_contactcard_common.class.php     |   0
 .../default/actions_contactcard_default.class.php   |   0
 .../contact/canvas/default/index.html               |   0
 .../canvas/default/tpl/contactcard_create.tpl.php   |   0
 .../canvas/default/tpl/contactcard_edit.tpl.php     |   0
 .../canvas/default/tpl/contactcard_view.tpl.php     |   0
 .../contact/canvas/default/tpl/index.html           |   0
 {public => htdocs}/contact/canvas/index.html        |   0
 {public => htdocs}/contact/card.php                 |   0
 {public => htdocs}/contact/class/contact.class.php  |   0
 {public => htdocs}/contact/class/index.html         |   0
 {public => htdocs}/contact/document.php             |   0
 {public => htdocs}/contact/index.html               |   0
 {public => htdocs}/contact/info.php                 |   0
 {public => htdocs}/contact/ldap.php                 |   0
 {public => htdocs}/contact/list.php                 |   0
 {public => htdocs}/contact/note.php                 |   0
 {public => htdocs}/contact/perso.php                |   0
 {public => htdocs}/contact/vcard.php                |   0
 .../contrat/admin/contract_extrafields.php          |   0
 .../contrat/admin/contractdet_extrafields.php       |   0
 {public => htdocs}/contrat/admin/index.html         |   0
 {public => htdocs}/contrat/card.php                 |   0
 {public => htdocs}/contrat/class/contrat.class.php  |   0
 {public => htdocs}/contrat/class/index.html         |   0
 {public => htdocs}/contrat/contact.php              |   0
 {public => htdocs}/contrat/document.php             |   0
 {public => htdocs}/contrat/index.php                |   0
 {public => htdocs}/contrat/info.php                 |   0
 {public => htdocs}/contrat/list.php                 |   0
 {public => htdocs}/contrat/note.php                 |   0
 {public => htdocs}/contrat/services.php             |   0
 {public => htdocs}/contrat/tpl/index.html           |   0
 .../contrat/tpl/linkedobjectblock.tpl.php           |   0
 {public => htdocs}/core/actions_builddoc.inc.php    |   0
 .../core/actions_changeselectedfields.inc.php       |   0
 {public => htdocs}/core/actions_dellink.inc.php     |   0
 {public => htdocs}/core/actions_extrafields.inc.php |   0
 {public => htdocs}/core/actions_fetchobject.inc.php |   0
 {public => htdocs}/core/actions_lineupdown.inc.php  |   0
 {public => htdocs}/core/actions_linkedfiles.inc.php |   0
 {public => htdocs}/core/actions_massactions.inc.php |   0
 {public => htdocs}/core/actions_printing.inc.php    |   0
 {public => htdocs}/core/actions_sendmails.inc.php   |   0
 {public => htdocs}/core/actions_setnotes.inc.php    |   0
 {public => htdocs}/core/ajax/ajaxdirpreview.php     |   0
 {public => htdocs}/core/ajax/ajaxdirtree.php        |   0
 {public => htdocs}/core/ajax/bankconciliate.php     |   0
 {public => htdocs}/core/ajax/box.php                |   0
 {public => htdocs}/core/ajax/constantonoff.php      |   0
 {public => htdocs}/core/ajax/contacts.php           |   0
 {public => htdocs}/core/ajax/extraparams.php        |   0
 {public => htdocs}/core/ajax/fileupload.php         |   0
 {public => htdocs}/core/ajax/index.html             |   0
 {public => htdocs}/core/ajax/loadinplace.php        |   0
 {public => htdocs}/core/ajax/objectonoff.php        |   0
 {public => htdocs}/core/ajax/price.php              |   0
 {public => htdocs}/core/ajax/row.php                |   0
 {public => htdocs}/core/ajax/saveinplace.php        |   0
 {public => htdocs}/core/ajax/security.php           |   0
 {public => htdocs}/core/ajax/selectsearchbox.php    |   0
 {public => htdocs}/core/ajax/vatrates.php           |   0
 {public => htdocs}/core/ajax/ziptown.php            |   0
 {public => htdocs}/core/antispamimage.php           |   0
 {public => htdocs}/core/boxes/box_actions.php       |   0
 {public => htdocs}/core/boxes/box_activity.php      |   0
 {public => htdocs}/core/boxes/box_bookmarks.php     |   0
 {public => htdocs}/core/boxes/box_clients.php       |   0
 {public => htdocs}/core/boxes/box_commandes.php     |   0
 {public => htdocs}/core/boxes/box_comptes.php       |   0
 {public => htdocs}/core/boxes/box_contacts.php      |   0
 {public => htdocs}/core/boxes/box_contracts.php     |   0
 {public => htdocs}/core/boxes/box_external_rss.php  |   0
 {public => htdocs}/core/boxes/box_factures.php      |   0
 .../core/boxes/box_factures_fourn.php               |   0
 .../core/boxes/box_factures_fourn_imp.php           |   0
 {public => htdocs}/core/boxes/box_factures_imp.php  |   0
 {public => htdocs}/core/boxes/box_ficheinter.php    |   0
 {public => htdocs}/core/boxes/box_fournisseurs.php  |   0
 {public => htdocs}/core/boxes/box_goodcustomers.php |   0
 .../core/boxes/box_graph_invoices_permonth.php      |   0
 .../boxes/box_graph_invoices_supplier_permonth.php  |   0
 .../core/boxes/box_graph_orders_permonth.php        |   0
 .../boxes/box_graph_orders_supplier_permonth.php    |   0
 .../core/boxes/box_graph_product_distribution.php   |   0
 .../core/boxes/box_graph_propales_permonth.php      |   0
 {public => htdocs}/core/boxes/box_members.php       |   0
 {public => htdocs}/core/boxes/box_produits.php      |   0
 .../core/boxes/box_produits_alerte_stock.php        |   0
 {public => htdocs}/core/boxes/box_project.php       |   0
 {public => htdocs}/core/boxes/box_propales.php      |   0
 {public => htdocs}/core/boxes/box_prospect.php      |   0
 .../core/boxes/box_services_contracts.php           |   0
 .../core/boxes/box_services_expired.php             |   0
 .../core/boxes/box_supplier_orders.php              |   0
 {public => htdocs}/core/boxes/box_task.php          |   0
 {public => htdocs}/core/boxes/index.html            |   0
 {public => htdocs}/core/boxes/modules_boxes.php     |   0
 {public => htdocs}/core/class/CMailFile.class.php   |   0
 {public => htdocs}/core/class/CSMSFile.class.php    |   0
 {public => htdocs}/core/class/antivir.class.php     |   0
 {public => htdocs}/core/class/canvas.class.php      |   0
 {public => htdocs}/core/class/ccountry.class.php    |   0
 .../core/class/commondocgenerator.class.php         |   0
 .../core/class/commoninvoice.class.php              |   0
 .../core/class/commonobject.class.php               |   0
 .../core/class/commonobjectline.class.php           |   0
 {public => htdocs}/core/class/commonorder.class.php |   0
 .../core/class/commonstickergenerator.class.php     |   0
 {public => htdocs}/core/class/conf.class.php        |   0
 {public => htdocs}/core/class/cookie.class.php      |   0
 {public => htdocs}/core/class/cstate.class.php      |   0
 {public => htdocs}/core/class/ctypent.class.php     |   0
 {public => htdocs}/core/class/discount.class.php    |   0
 {public => htdocs}/core/class/doleditor.class.php   |   0
 .../core/class/dolexception.class.php               |   0
 {public => htdocs}/core/class/dolgeoip.class.php    |   0
 {public => htdocs}/core/class/dolgraph.class.php    |   0
 {public => htdocs}/core/class/dolprintipp.class.php |   0
 .../core/class/dolreceiptprinter.class.php          |   0
 {public => htdocs}/core/class/events.class.php      |   0
 {public => htdocs}/core/class/extrafields.class.php |   0
 {public => htdocs}/core/class/fileupload.class.php  |   0
 {public => htdocs}/core/class/fiscalyear.class.php  |   0
 .../core/class/genericobject.class.php              |   0
 {public => htdocs}/core/class/google.class.php      |   0
 {public => htdocs}/core/class/hookmanager.class.php |   0
 {public => htdocs}/core/class/html.form.class.php   |   0
 .../core/class/html.formaccounting.class.php        |   0
 .../core/class/html.formactions.class.php           |   0
 .../core/class/html.formadmin.class.php             |   0
 .../core/class/html.formbank.class.php              |   0
 .../core/class/html.formbarcode.class.php           |   0
 .../core/class/html.formcompany.class.php           |   0
 .../core/class/html.formcontract.class.php          |   0
 .../core/class/html.formcron.class.php              |   0
 .../core/class/html.formfile.class.php              |   0
 .../core/class/html.formintervention.class.php      |   0
 .../core/class/html.formmail.class.php              |   0
 .../core/class/html.formmailing.class.php           |   0
 .../core/class/html.formmargin.class.php            |   0
 .../core/class/html.formorder.class.php             |   0
 .../core/class/html.formother.class.php             |   0
 .../core/class/html.formprojet.class.php            |   0
 .../core/class/html.formpropal.class.php            |   0
 .../core/class/html.formsms.class.php               |   0
 .../core/class/html.formsocialcontrib.class.php     |   0
 {public => htdocs}/core/class/index.html            |   0
 {public => htdocs}/core/class/infobox.class.php     |   0
 {public => htdocs}/core/class/interfaces.class.php  |   0
 {public => htdocs}/core/class/ldap.class.php        |   0
 {public => htdocs}/core/class/link.class.php        |   0
 {public => htdocs}/core/class/menu.class.php        |   0
 {public => htdocs}/core/class/menubase.class.php    |   0
 {public => htdocs}/core/class/notify.class.php      |   0
 {public => htdocs}/core/class/openid.class.php      |   0
 {public => htdocs}/core/class/rssparser.class.php   |   0
 {public => htdocs}/core/class/smtps.class.php       |   0
 {public => htdocs}/core/class/stats.class.php       |   0
 {public => htdocs}/core/class/translate.class.php   |   0
 {public => htdocs}/core/class/utils.class.php       |   0
 {public => htdocs}/core/class/vcard.class.php       |   0
 .../core/class/workboardresponse.class.php          |   0
 {public => htdocs}/core/datepicker.php              |   0
 {public => htdocs}/core/db/Database.interface.php   |   0
 {public => htdocs}/core/db/DoliDB.class.php         |   0
 {public => htdocs}/core/db/index.html               |   0
 {public => htdocs}/core/db/mssql.class.php          |   0
 {public => htdocs}/core/db/mysqli.class.php         |   0
 {public => htdocs}/core/db/pgsql.class.php          |   0
 {public => htdocs}/core/db/sqlite3.class.php        |   0
 {public => htdocs}/core/doxygen.php                 |   0
 {public => htdocs}/core/extrafieldsinexport.inc.php |   0
 .../core/filemanagerdol/browser/default/browser.css |   0
 .../core/filemanagerdol/browser/default/browser.php |   0
 .../browser/default/frmactualfolder.php             |   0
 .../browser/default/frmcreatefolder.php             |   0
 .../filemanagerdol/browser/default/frmfolders.php   |   0
 .../browser/default/frmresourceslist.php            |   0
 .../filemanagerdol/browser/default/frmupload.php    |   0
 .../browser/default/images/Folder.gif               | Bin
 .../browser/default/images/FolderUp.gif             | Bin
 .../browser/default/images/icons/32/ai.gif          | Bin
 .../browser/default/images/icons/32/avi.gif         | Bin
 .../browser/default/images/icons/32/bmp.gif         | Bin
 .../browser/default/images/icons/32/cs.gif          | Bin
 .../default/images/icons/32/default.icon.gif        | Bin
 .../browser/default/images/icons/32/dll.gif         | Bin
 .../browser/default/images/icons/32/doc.gif         | Bin
 .../browser/default/images/icons/32/exe.gif         | Bin
 .../browser/default/images/icons/32/fla.gif         | Bin
 .../browser/default/images/icons/32/gif.gif         | Bin
 .../browser/default/images/icons/32/htm.gif         | Bin
 .../browser/default/images/icons/32/html.gif        | Bin
 .../browser/default/images/icons/32/index.html      |   0
 .../browser/default/images/icons/32/jpg.gif         | Bin
 .../browser/default/images/icons/32/js.gif          | Bin
 .../browser/default/images/icons/32/mdb.gif         | Bin
 .../browser/default/images/icons/32/mp3.gif         | Bin
 .../browser/default/images/icons/32/pdf.gif         | Bin
 .../browser/default/images/icons/32/png.gif         | Bin
 .../browser/default/images/icons/32/ppt.gif         | Bin
 .../browser/default/images/icons/32/rdp.gif         | Bin
 .../browser/default/images/icons/32/swf.gif         | Bin
 .../browser/default/images/icons/32/swt.gif         | Bin
 .../browser/default/images/icons/32/txt.gif         | Bin
 .../browser/default/images/icons/32/vsd.gif         | Bin
 .../browser/default/images/icons/32/xls.gif         | Bin
 .../browser/default/images/icons/32/xml.gif         | Bin
 .../browser/default/images/icons/32/zip.gif         | Bin
 .../browser/default/images/icons/ai.gif             | Bin
 .../browser/default/images/icons/avi.gif            | Bin
 .../browser/default/images/icons/bmp.gif            | Bin
 .../browser/default/images/icons/cs.gif             | Bin
 .../browser/default/images/icons/default.icon.gif   | Bin
 .../browser/default/images/icons/dll.gif            | Bin
 .../browser/default/images/icons/doc.gif            | Bin
 .../browser/default/images/icons/exe.gif            | Bin
 .../browser/default/images/icons/fla.gif            | Bin
 .../browser/default/images/icons/gif.gif            | Bin
 .../browser/default/images/icons/htm.gif            | Bin
 .../browser/default/images/icons/html.gif           | Bin
 .../browser/default/images/icons/index.html         |   0
 .../browser/default/images/icons/jpg.gif            | Bin
 .../browser/default/images/icons/js.gif             | Bin
 .../browser/default/images/icons/mdb.gif            | Bin
 .../browser/default/images/icons/mp3.gif            | Bin
 .../browser/default/images/icons/pdf.gif            | Bin
 .../browser/default/images/icons/png.gif            | Bin
 .../browser/default/images/icons/ppt.gif            | Bin
 .../browser/default/images/icons/rdp.gif            | Bin
 .../browser/default/images/icons/swf.gif            | Bin
 .../browser/default/images/icons/swt.gif            | Bin
 .../browser/default/images/icons/txt.gif            | Bin
 .../browser/default/images/icons/vsd.gif            | Bin
 .../browser/default/images/icons/xls.gif            | Bin
 .../browser/default/images/icons/xml.gif            | Bin
 .../browser/default/images/icons/zip.gif            | Bin
 .../browser/default/images/index.html               |   0
 .../core/filemanagerdol/browser/default/index.html  |   0
 .../filemanagerdol/browser/default/js/common.js     |   0
 .../filemanagerdol/browser/default/js/fckxml.js     |   0
 .../filemanagerdol/browser/default/js/index.html    |   0
 .../core/filemanagerdol/browser/default/spacer.gif  | Bin
 .../core/filemanagerdol/browser/index.html          |   0
 .../core/filemanagerdol/connectors/index.html       |   0
 .../core/filemanagerdol/connectors/php/basexml.php  |   0
 .../core/filemanagerdol/connectors/php/commands.php |   0
 .../core/filemanagerdol/connectors/php/config.php   |   0
 .../filemanagerdol/connectors/php/connector.php     |   0
 .../core/filemanagerdol/connectors/php/index.html   |   0
 .../core/filemanagerdol/connectors/php/io.php       |   0
 .../core/filemanagerdol/connectors/php/upload.php   |   0
 .../core/filemanagerdol/connectors/php/util.php     |   0
 {public => htdocs}/core/filemanagerdol/index.html   |   0
 {public => htdocs}/core/get_menudiv.php             |   0
 {public => htdocs}/core/index.html                  |   0
 {public => htdocs}/core/js/blockUI.js               |   0
 {public => htdocs}/core/js/datepicker.js.php        |   0
 {public => htdocs}/core/js/dst.js                   |   0
 {public => htdocs}/core/js/editinplace.js           |   0
 {public => htdocs}/core/js/index.html               |   0
 {public => htdocs}/core/js/jnotify.js               |   0
 {public => htdocs}/core/js/lib_batch.js             |   0
 {public => htdocs}/core/js/lib_head.js.php          |   0
 {public => htdocs}/core/js/lib_photosresize.js      |   0
 {public => htdocs}/core/js/lib_rare.js              |   0
 {public => htdocs}/core/js/select2_locale.js.php    |   0
 {public => htdocs}/core/js/timepicker.js.php        |   0
 {public => htdocs}/core/js/timesheet.js             |   0
 {public => htdocs}/core/lib/accounting.lib.php      |   0
 {public => htdocs}/core/lib/admin.lib.php           |   0
 {public => htdocs}/core/lib/agenda.lib.php          |   0
 {public => htdocs}/core/lib/ajax.lib.php            |   0
 {public => htdocs}/core/lib/bank.lib.php            |   0
 {public => htdocs}/core/lib/barcode.lib.php         |   0
 {public => htdocs}/core/lib/categories.lib.php      |   0
 {public => htdocs}/core/lib/company.lib.php         |   0
 {public => htdocs}/core/lib/contact.lib.php         |   0
 {public => htdocs}/core/lib/contract.lib.php        |   0
 {public => htdocs}/core/lib/cron.lib.php            |   0
 {public => htdocs}/core/lib/date.lib.php            |   0
 {public => htdocs}/core/lib/doc.lib.php             |   0
 {public => htdocs}/core/lib/doleditor.lib.php       |   0
 {public => htdocs}/core/lib/donation.lib.php        |   0
 {public => htdocs}/core/lib/ecm.lib.php             |   0
 {public => htdocs}/core/lib/emailing.lib.php        |   0
 {public => htdocs}/core/lib/expedition.lib.php      |   0
 {public => htdocs}/core/lib/expensereport.lib.php   |   0
 {public => htdocs}/core/lib/fichinter.lib.php       |   0
 {public => htdocs}/core/lib/files.lib.php           |   0
 {public => htdocs}/core/lib/fiscalyear.lib.php      |   0
 {public => htdocs}/core/lib/format_cards.lib.php    |   0
 {public => htdocs}/core/lib/fourn.lib.php           |   0
 {public => htdocs}/core/lib/functions.lib.php       |   0
 {public => htdocs}/core/lib/functions2.lib.php      |   0
 {public => htdocs}/core/lib/functions_ch.lib.php    |   0
 .../core/lib/functionsnumtoword.lib.php             |   0
 {public => htdocs}/core/lib/geturl.lib.php          |   0
 {public => htdocs}/core/lib/holiday.lib.php         |   0
 {public => htdocs}/core/lib/hrm.lib.php             |   0
 {public => htdocs}/core/lib/images.lib.php          |   0
 {public => htdocs}/core/lib/import.lib.php          |   0
 {public => htdocs}/core/lib/index.html              |   0
 {public => htdocs}/core/lib/invoice.lib.php         |   0
 {public => htdocs}/core/lib/invoice2.lib.php        |   0
 {public => htdocs}/core/lib/json.lib.php            |   0
 {public => htdocs}/core/lib/ldap.lib.php            |   0
 {public => htdocs}/core/lib/loan.lib.php            |   0
 {public => htdocs}/core/lib/mailmanspip.lib.php     |   0
 {public => htdocs}/core/lib/member.lib.php          |   0
 {public => htdocs}/core/lib/memory.lib.php          |   0
 {public => htdocs}/core/lib/multicurrency.lib.php   |   0
 {public => htdocs}/core/lib/oauth.lib.php           |   0
 {public => htdocs}/core/lib/order.lib.php           |   0
 {public => htdocs}/core/lib/payments.lib.php        |   0
 {public => htdocs}/core/lib/pdf.lib.php             |   0
 {public => htdocs}/core/lib/prelevement.lib.php     |   0
 {public => htdocs}/core/lib/price.lib.php           |   0
 {public => htdocs}/core/lib/product.lib.php         |   0
 {public => htdocs}/core/lib/project.lib.php         |   0
 {public => htdocs}/core/lib/propal.lib.php          |   0
 {public => htdocs}/core/lib/receiptprinter.lib.php  |   0
 {public => htdocs}/core/lib/report.lib.php          |   0
 {public => htdocs}/core/lib/resource.lib.php        |   0
 {public => htdocs}/core/lib/salaries.lib.php        |   0
 {public => htdocs}/core/lib/security.lib.php        |   0
 {public => htdocs}/core/lib/security2.lib.php       |   0
 {public => htdocs}/core/lib/sendings.lib.php        |   0
 {public => htdocs}/core/lib/stock.lib.php           |   0
 .../core/lib/supplier_proposal.lib.php              |   0
 {public => htdocs}/core/lib/tax.lib.php             |   0
 {public => htdocs}/core/lib/treeview.lib.php        |   0
 {public => htdocs}/core/lib/trip.lib.php            |   0
 {public => htdocs}/core/lib/usergroups.lib.php      |   0
 {public => htdocs}/core/lib/vat.lib.php             |   0
 {public => htdocs}/core/lib/ws.lib.php              |   0
 {public => htdocs}/core/lib/xcal.lib.php            |   0
 {public => htdocs}/core/login/README.txt            |   0
 .../core/login/functions_dolibarr.php               |   0
 {public => htdocs}/core/login/functions_empty.php   |   0
 .../core/login/functions_forceuser.php              |   0
 {public => htdocs}/core/login/functions_http.php    |   0
 {public => htdocs}/core/login/functions_ldap.php    |   0
 {public => htdocs}/core/login/functions_openid.php  |   0
 {public => htdocs}/core/login/index.html            |   0
 {public => htdocs}/core/menus/index.html            |   0
 {public => htdocs}/core/menus/init_menu_auguria.sql |   0
 .../core/menus/standard/auguria.lib.php             |   0
 .../core/menus/standard/auguria_menu.php            |   0
 {public => htdocs}/core/menus/standard/eldy.lib.php |   0
 .../core/menus/standard/eldy_menu.php               |   0
 {public => htdocs}/core/menus/standard/empty.php    |   0
 {public => htdocs}/core/menus/standard/index.html   |   0
 .../core/modules/DolibarrModules.class.php          |   0
 {public => htdocs}/core/modules/action/index.html   |   0
 .../core/modules/action/modules_action.php          |   0
 .../core/modules/action/rapport.pdf.php             |   0
 .../core/modules/bank/doc/pdf_ban.modules.php       |   0
 .../modules/bank/doc/pdf_sepamandate.modules.php    |   0
 .../core/modules/bank/modules_bank.php              |   0
 .../core/modules/barcode/doc/index.html             |   0
 .../core/modules/barcode/doc/phpbarcode.modules.php |   0
 .../modules/barcode/doc/tcpdfbarcode.modules.php    |   0
 {public => htdocs}/core/modules/barcode/index.html  |   0
 .../barcode/mod_barcode_product_standard.php        |   0
 .../core/modules/barcode/modules_barcode.class.php  |   0
 .../core/modules/cheque/doc/index.html              |   0
 .../core/modules/cheque/doc/pdf_blochet.class.php   |   0
 {public => htdocs}/core/modules/cheque/index.html   |   0
 .../core/modules/cheque/mod_chequereceipt_mint.php  |   0
 .../core/modules/cheque/mod_chequereceipt_thyme.php |   0
 .../core/modules/cheque/modules_chequereceipts.php  |   0
 .../commande/doc/doc_generic_order_odt.modules.php  |   0
 .../core/modules/commande/doc/index.html            |   0
 .../modules/commande/doc/pdf_einstein.modules.php   |   0
 .../modules/commande/doc/pdf_proforma.modules.php   |   0
 {public => htdocs}/core/modules/commande/index.html |   0
 .../core/modules/commande/mod_commande_marbre.php   |   0
 .../core/modules/commande/mod_commande_saphir.php   |   0
 .../core/modules/commande/modules_commande.php      |   0
 .../core/modules/contract/doc/index.html            |   0
 .../modules/contract/doc/pdf_strato.modules.php     |   0
 {public => htdocs}/core/modules/contract/index.html |   0
 .../core/modules/contract/mod_contract_magre.php    |   0
 .../core/modules/contract/mod_contract_olive.php    |   0
 .../core/modules/contract/mod_contract_serpis.php   |   0
 .../core/modules/contract/modules_contract.php      |   0
 .../core/modules/dons/html_cerfafr.html             |   0
 .../core/modules/dons/html_cerfafr.modules.php      |   0
 {public => htdocs}/core/modules/dons/index.html     |   0
 .../core/modules/dons/modules_don.php               |   0
 .../doc/doc_generic_shipment_odt.modules.php        |   0
 .../core/modules/expedition/doc/index.html          |   0
 .../modules/expedition/doc/pdf_merou.modules.php    |   0
 .../modules/expedition/doc/pdf_rouget.modules.php   |   0
 .../core/modules/expedition/index.html              |   0
 .../modules/expedition/mod_expedition_ribera.php    |   0
 .../modules/expedition/mod_expedition_safor.php     |   0
 .../core/modules/expedition/modules_expedition.php  |   0
 .../expensereport/doc/pdf_standard.modules.php      |   0
 .../modules/expensereport/modules_expensereport.php |   0
 .../core/modules/export/export_csv.modules.php      |   0
 .../core/modules/export/export_excel.modules.php    |   0
 .../modules/export/export_excel2007.modules.php     |   0
 .../core/modules/export/export_tsv.modules.php      |   0
 {public => htdocs}/core/modules/export/index.html   |   0
 .../core/modules/export/modules_export.php          |   0
 .../facture/doc/doc_generic_invoice_odt.modules.php |   0
 .../core/modules/facture/doc/index.html             |   0
 .../core/modules/facture/doc/pdf_crabe.modules.php  |   0
 {public => htdocs}/core/modules/facture/index.html  |   0
 .../core/modules/facture/mod_facture_mars.php       |   0
 .../core/modules/facture/mod_facture_mercure.php    |   0
 .../core/modules/facture/mod_facture_terre.php      |   0
 .../core/modules/facture/modules_facture.php        |   0
 .../core/modules/fichinter/doc/index.html           |   0
 .../modules/fichinter/doc/pdf_soleil.modules.php    |   0
 .../core/modules/fichinter/index.html               |   0
 .../core/modules/fichinter/mod_arctic.php           |   0
 .../core/modules/fichinter/mod_pacific.php          |   0
 .../core/modules/fichinter/modules_fichinter.php    |   0
 .../core/modules/import/import_csv.modules.php      |   0
 .../core/modules/import/import_xlsx.modules.php     |   0
 {public => htdocs}/core/modules/import/index.html   |   0
 .../core/modules/import/modules_import.php          |   0
 {public => htdocs}/core/modules/index.html          |   0
 .../core/modules/livraison/doc/index.html           |   0
 .../modules/livraison/doc/pdf_typhon.modules.php    |   0
 .../core/modules/livraison/index.html               |   0
 .../core/modules/livraison/mod_livraison_jade.php   |   0
 .../core/modules/livraison/mod_livraison_saphir.php |   0
 .../core/modules/livraison/modules_livraison.php    |   0
 {public => htdocs}/core/modules/mailings/README     |   0
 .../modules/mailings/advthirdparties.modules.php    |   0
 .../core/modules/mailings/contacts1.modules.php     |   0
 .../core/modules/mailings/contacts2.modules.php     |   0
 .../core/modules/mailings/contacts3.modules.php     |   0
 .../core/modules/mailings/contacts4.modules.php     |   0
 .../core/modules/mailings/example.modules.php       |   0
 .../core/modules/mailings/fraise.modules.php        |   0
 .../core/modules/mailings/framboise.modules.php     |   0
 {public => htdocs}/core/modules/mailings/index.html |   0
 .../core/modules/mailings/modules_mailings.php      |   0
 .../core/modules/mailings/pomme.modules.php         |   0
 .../core/modules/mailings/thirdparties.modules.php  |   0
 .../thirdparties_services_expired.modules.php       |   0
 .../core/modules/mailings/xinputfile.modules.php    |   0
 .../core/modules/mailings/xinputuser.modules.php    |   0
 .../core/modules/member/doc/index.html              |   0
 .../core/modules/member/doc/pdf_standard.class.php  |   0
 {public => htdocs}/core/modules/member/index.html   |   0
 .../core/modules/member/modules_cards.php           |   0
 .../core/modules/modAccounting.class.php            |   0
 .../core/modules/modAdherent.class.php              |   0
 {public => htdocs}/core/modules/modAgenda.class.php |   0
 {public => htdocs}/core/modules/modApi.class.php    |   0
 {public => htdocs}/core/modules/modBanque.class.php |   0
 .../core/modules/modBarcode.class.php               |   0
 .../core/modules/modBookmark.class.php              |   0
 .../core/modules/modCashDesk.class.php              |   0
 .../core/modules/modCategorie.class.php             |   0
 .../core/modules/modClickToDial.class.php           |   0
 .../core/modules/modCommande.class.php              |   0
 .../core/modules/modComptabilite.class.php          |   0
 .../core/modules/modContrat.class.php               |   0
 {public => htdocs}/core/modules/modCron.class.php   |   0
 .../core/modules/modDeplacement.class.php           |   0
 .../core/modules/modDocumentGeneration.class.php    |   0
 {public => htdocs}/core/modules/modDon.class.php    |   0
 .../core/modules/modDynamicPrices.class.php         |   0
 {public => htdocs}/core/modules/modECM.class.php    |   0
 .../core/modules/modExpedition.class.php            |   0
 .../core/modules/modExpenseReport.class.php         |   0
 {public => htdocs}/core/modules/modExport.class.php |   0
 .../core/modules/modExternalRss.class.php           |   0
 .../core/modules/modExternalSite.class.php          |   0
 {public => htdocs}/core/modules/modFTP.class.php    |   0
 .../core/modules/modFacture.class.php               |   0
 .../core/modules/modFckeditor.class.php             |   0
 .../core/modules/modFicheinter.class.php            |   0
 .../core/modules/modFournisseur.class.php           |   0
 .../core/modules/modGeoIPMaxmind.class.php          |   0
 .../core/modules/modGravatar.class.php              |   0
 {public => htdocs}/core/modules/modHRM.class.php    |   0
 .../core/modules/modHoliday.class.php               |   0
 {public => htdocs}/core/modules/modImport.class.php |   0
 .../core/modules/modIncoterm.class.php              |   0
 {public => htdocs}/core/modules/modLabel.class.php  |   0
 {public => htdocs}/core/modules/modLdap.class.php   |   0
 {public => htdocs}/core/modules/modLoan.class.php   |   0
 .../core/modules/modMailing.class.php               |   0
 .../core/modules/modMailmanSpip.class.php           |   0
 {public => htdocs}/core/modules/modMargin.class.php |   0
 .../core/modules/modMultiCurrency.class.php         |   0
 .../core/modules/modNotification.class.php          |   0
 {public => htdocs}/core/modules/modOauth.class.php  |   0
 .../core/modules/modOpenSurvey.class.php            |   0
 {public => htdocs}/core/modules/modPaybox.class.php |   0
 {public => htdocs}/core/modules/modPaypal.class.php |   0
 .../core/modules/modPrelevement.class.php           |   0
 .../core/modules/modPrinting.class.php              |   0
 .../core/modules/modProduct.class.php               |   0
 .../core/modules/modProductBatch.class.php          |   0
 {public => htdocs}/core/modules/modProjet.class.php |   0
 .../core/modules/modPropale.class.php               |   0
 .../core/modules/modReceiptPrinter.class.php        |   0
 .../core/modules/modResource.class.php              |   0
 .../core/modules/modSalaries.class.php              |   0
 .../core/modules/modService.class.php               |   0
 {public => htdocs}/core/modules/modSkype.class.php  |   0
 .../core/modules/modSociete.class.php               |   0
 {public => htdocs}/core/modules/modStock.class.php  |   0
 .../core/modules/modSupplierProposal.class.php      |   0
 {public => htdocs}/core/modules/modSyslog.class.php |   0
 {public => htdocs}/core/modules/modTax.class.php    |   0
 {public => htdocs}/core/modules/modUser.class.php   |   0
 .../core/modules/modWebServices.class.php           |   0
 .../core/modules/modWebServicesClient.class.php     |   0
 .../core/modules/modWebsites.class.php              |   0
 .../core/modules/modWorkflow.class.php              |   0
 .../core/modules/oauth/google_oauthcallback.php     |   0
 {public => htdocs}/core/modules/oauth/index.html    |   0
 .../core/modules/payment/mod_payment_ant.php        |   0
 .../core/modules/payment/mod_payment_cicada.php     |   0
 .../core/modules/payment/modules_payment.php        |   0
 {public => htdocs}/core/modules/printing/index.html |   0
 .../core/modules/printing/modules_printing.php      |   0
 .../core/modules/printing/printgcp.modules.php      |   0
 .../core/modules/printing/printipp.modules.php      |   0
 .../core/modules/printsheet/doc/index.html          |   0
 .../printsheet/doc/pdf_standardlabel.class.php      |   0
 .../modules/printsheet/doc/pdf_tcpdflabel.class.php |   0
 .../core/modules/printsheet/index.html              |   0
 .../core/modules/printsheet/modules_labels.php      |   0
 {public => htdocs}/core/modules/product/index.html  |   0
 .../modules/product/mod_codeproduct_elephant.php    |   0
 .../modules/product/mod_codeproduct_leopard.php     |   0
 .../core/modules/product/modules_product.class.php  |   0
 .../core/modules/product/modules_product.php        |   0
 .../project/doc/doc_generic_project_odt.modules.php |   0
 .../core/modules/project/doc/index.html             |   0
 .../modules/project/doc/pdf_baleine.modules.php     |   0
 .../core/modules/project/doc/pdf_beluga.modules.php |   0
 {public => htdocs}/core/modules/project/index.html  |   0
 .../core/modules/project/mod_project_simple.php     |   0
 .../core/modules/project/mod_project_universal.php  |   0
 .../core/modules/project/modules_project.php        |   0
 .../task/doc/doc_generic_task_odt.modules.php       |   0
 .../core/modules/project/task/doc/index.html        |   0
 .../core/modules/project/task/index.html            |   0
 .../core/modules/project/task/mod_task_simple.php   |   0
 .../modules/project/task/mod_task_universal.php     |   0
 .../core/modules/project/task/modules_task.php      |   0
 .../doc/doc_generic_proposal_odt.modules.php        |   0
 .../core/modules/propale/doc/index.html             |   0
 .../core/modules/propale/doc/pdf_azur.modules.php   |   0
 {public => htdocs}/core/modules/propale/index.html  |   0
 .../core/modules/propale/mod_propale_marbre.php     |   0
 .../core/modules/propale/mod_propale_saphir.php     |   0
 .../core/modules/propale/modules_propale.php        |   0
 {public => htdocs}/core/modules/rapport/index.html  |   0
 .../core/modules/rapport/pdf_paiement.class.php     |   0
 .../core/modules/security/generate/README           |   0
 .../core/modules/security/generate/index.html       |   0
 .../security/generate/modGeneratePassNone.class.php |   0
 .../generate/modGeneratePassPerso.class.php         |   0
 .../generate/modGeneratePassStandard.class.php      |   0
 .../security/generate/modules_genpassword.php       |   0
 {public => htdocs}/core/modules/security/index.html |   0
 .../modules/societe/doc/doc_generic_odt.modules.php |   0
 .../core/modules/societe/doc/index.html             |   0
 {public => htdocs}/core/modules/societe/index.html  |   0
 .../modules/societe/mod_codeclient_elephant.php     |   0
 .../core/modules/societe/mod_codeclient_leopard.php |   0
 .../core/modules/societe/mod_codeclient_monkey.php  |   0
 .../modules/societe/mod_codecompta_aquarium.php     |   0
 .../core/modules/societe/mod_codecompta_panicum.php |   0
 .../core/modules/societe/modules_societe.class.php  |   0
 .../core/modules/supplier_invoice/index.html        |   0
 .../mod_facture_fournisseur_cactus.php              |   0
 .../mod_facture_fournisseur_tulip.php               |   0
 .../supplier_invoice/modules_facturefournisseur.php |   0
 .../core/modules/supplier_invoice/pdf/index.html    |   0
 .../supplier_invoice/pdf/pdf_canelle.modules.php    |   0
 .../core/modules/supplier_order/index.html          |   0
 .../mod_commande_fournisseur_muguet.php             |   0
 .../mod_commande_fournisseur_orchidee.php           |   0
 .../supplier_order/modules_commandefournisseur.php  |   0
 .../core/modules/supplier_order/pdf/index.html      |   0
 .../supplier_order/pdf/pdf_muscadet.modules.php     |   0
 .../mod_supplier_payment_brodator.php               |   0
 .../mod_supplier_payment_bronan.php                 |   0
 .../supplier_payment/modules_supplier_payment.php   |   0
 .../doc_generic_supplier_proposal_odt.modules.php   |   0
 .../core/modules/supplier_proposal/doc/index.html   |   0
 .../supplier_proposal/doc/pdf_aurore.modules.php    |   0
 .../core/modules/supplier_proposal/index.html       |   0
 .../mod_supplier_proposal_marbre.php                |   0
 .../mod_supplier_proposal_saphir.php                |   0
 .../supplier_proposal/modules_supplier_proposal.php |   0
 {public => htdocs}/core/modules/syslog/index.html   |   0
 .../core/modules/syslog/logHandler.php              |   0
 .../core/modules/syslog/logHandlerInterface.php     |   0
 .../core/modules/syslog/mod_syslog_chromephp.php    |   0
 .../core/modules/syslog/mod_syslog_file.php         |   0
 .../core/modules/syslog/mod_syslog_firephp.php      |   0
 .../core/modules/syslog/mod_syslog_syslog.php       |   0
 {public => htdocs}/core/photos_resize.php           |   0
 {public => htdocs}/core/search.php                  |   0
 {public => htdocs}/core/search_page.php             |   0
 {public => htdocs}/core/tools.php                   |   0
 {public => htdocs}/core/tpl/README                  |   0
 .../core/tpl/admin_extrafields_add.tpl.php          |   0
 .../core/tpl/admin_extrafields_edit.tpl.php         |   0
 .../core/tpl/admin_extrafields_view.tpl.php         |   0
 .../core/tpl/ajax/fileupload_main.tpl.php           |   0
 .../core/tpl/ajax/fileupload_view.tpl.php           |   0
 {public => htdocs}/core/tpl/ajax/index.html         |   0
 {public => htdocs}/core/tpl/ajaxrow.tpl.php         |   0
 {public => htdocs}/core/tpl/bloc_showhide.tpl.php   |   0
 {public => htdocs}/core/tpl/contacts.tpl.php        |   0
 .../core/tpl/document_actions_post_headers.tpl.php  |   0
 {public => htdocs}/core/tpl/error.tpl.php           |   0
 .../core/tpl/extrafields_view.tpl.php               |   0
 {public => htdocs}/core/tpl/footer.tpl.php          |   0
 {public => htdocs}/core/tpl/header.tpl.php          |   0
 {public => htdocs}/core/tpl/index.html              |   0
 {public => htdocs}/core/tpl/login.tpl.php           |   0
 {public => htdocs}/core/tpl/notes.tpl.php           |   0
 .../core/tpl/objectline_create.tpl.php              |   0
 {public => htdocs}/core/tpl/objectline_edit.tpl.php |   0
 {public => htdocs}/core/tpl/objectline_view.tpl.php |   0
 .../core/tpl/originproductline.tpl.php              |   0
 .../core/tpl/passwordforgotten.tpl.php              |   0
 {public => htdocs}/core/tpl/resource_add.tpl.php    |   0
 {public => htdocs}/core/tpl/resource_view.tpl.php   |   0
 {public => htdocs}/core/triggers/README             |   0
 {public => htdocs}/core/triggers/README-FR          |   0
 .../core/triggers/dolibarrtriggers.class.php        |   0
 {public => htdocs}/core/triggers/index.html         |   0
 .../triggers/interface_20_all_Logevents.class.php   |   0
 .../interface_20_modPaypal_PaypalWorkflow.class.php |   0
 ...terface_20_modWorkflow_WorkflowManager.class.php |   0
 .../interface_50_modAgenda_ActionsAuto.class.php    |   0
 .../interface_50_modLdap_Ldapsynchro.class.php      |   0
 ...e_50_modMailmanspip_Mailmanspipsynchro.class.php |   0
 ...erface_50_modNotification_Notification.class.php |   0
 .../triggers/interface_90_all_Demo.class.php-NORUN  |   0
 {public => htdocs}/cron/admin/cron.php              |   0
 {public => htdocs}/cron/admin/index.html            |   0
 {public => htdocs}/cron/card.php                    |   0
 {public => htdocs}/cron/class/cronjob.class.php     |   0
 {public => htdocs}/cron/class/index.html            |   0
 {public => htdocs}/cron/index.html                  |   0
 {public => htdocs}/cron/info.php                    |   0
 {public => htdocs}/cron/list.php                    |   0
 {public => htdocs}/custom/.gitignore                |   0
 {public => htdocs}/custom/README.md                 |   0
 {public => htdocs}/custom/index.html                |   0
 {public => htdocs}/document.php                     |   0
 {public => htdocs}/don/admin/donation.php           |   0
 .../don/admin/donation_extrafields.php              |   0
 {public => htdocs}/don/admin/index.html             |   0
 {public => htdocs}/don/card.php                     |   0
 {public => htdocs}/don/class/don.class.php          |   0
 {public => htdocs}/don/class/donstats.class.php     |   0
 {public => htdocs}/don/class/index.html             |   0
 .../don/class/paymentdonation.class.php             |   0
 {public => htdocs}/don/document.php                 |   0
 {public => htdocs}/don/index.html                   |   0
 {public => htdocs}/don/index.php                    |   0
 {public => htdocs}/don/info.php                     |   0
 {public => htdocs}/don/list.php                     |   0
 {public => htdocs}/don/note.php                     |   0
 {public => htdocs}/don/payment/card.php             |   0
 {public => htdocs}/don/payment/index.html           |   0
 {public => htdocs}/don/payment/payment.php          |   0
 {public => htdocs}/don/stats/index.php              |   0
 {public => htdocs}/ecm/ajax/ecmdatabase.php         |   0
 {public => htdocs}/ecm/ajax/index.html              |   0
 {public => htdocs}/ecm/class/ecmdirectory.class.php |   0
 {public => htdocs}/ecm/class/htmlecm.form.class.php |   0
 {public => htdocs}/ecm/class/index.html             |   0
 {public => htdocs}/ecm/docdir.php                   |   0
 {public => htdocs}/ecm/docfile.php                  |   0
 {public => htdocs}/ecm/docmine.php                  |   0
 {public => htdocs}/ecm/docother.php                 |   0
 {public => htdocs}/ecm/index.php                    |   0
 {public => htdocs}/ecm/index_auto.php               |   0
 {public => htdocs}/ecm/search.php                   |   0
 .../ecm/tpl/enablefiletreeajax.tpl.php              |   0
 {public => htdocs}/ecm/tpl/index.html               |   0
 {public => htdocs}/expedition/card.php              |   0
 .../expedition/class/expedition.class.php           |   0
 .../expedition/class/expeditionbatch.class.php      |   0
 .../expedition/class/expeditionstats.class.php      |   0
 {public => htdocs}/expedition/class/index.html      |   0
 {public => htdocs}/expedition/contact.php           |   0
 {public => htdocs}/expedition/index.php             |   0
 {public => htdocs}/expedition/list.php              |   0
 {public => htdocs}/expedition/note.php              |   0
 {public => htdocs}/expedition/shipment.php          |   0
 {public => htdocs}/expedition/stats/index.php       |   0
 {public => htdocs}/expedition/stats/month.php       |   0
 {public => htdocs}/expedition/tpl/index.html        |   0
 .../expedition/tpl/linkedobjectblock.tpl.php        |   0
 .../expensereport/ajax/ajaxprojet.php               |   0
 {public => htdocs}/expensereport/ajax/index.html    |   0
 {public => htdocs}/expensereport/card.php           |   0
 .../class/api_expensereports.class.php              |   0
 .../expensereport/class/expensereport.class.php     |   0
 .../class/expensereportstats.class.php              |   0
 {public => htdocs}/expensereport/class/index.html   |   0
 .../class/paymentexpensereport.class.php            |   0
 {public => htdocs}/expensereport/document.php       |   0
 {public => htdocs}/expensereport/export_csv.php     |   0
 {public => htdocs}/expensereport/index.html         |   0
 {public => htdocs}/expensereport/index.php          |   0
 {public => htdocs}/expensereport/info.php           |   0
 {public => htdocs}/expensereport/list.php           |   0
 {public => htdocs}/expensereport/note.php           |   0
 {public => htdocs}/expensereport/payment/card.php   |   0
 {public => htdocs}/expensereport/payment/index.html |   0
 .../expensereport/payment/payment.php               |   0
 {public => htdocs}/expensereport/stats/index.html   |   0
 {public => htdocs}/expensereport/stats/index.php    |   0
 {public => htdocs}/expensereport/synchro_compta.php |   0
 {public => htdocs}/expensereport/tpl/index.html     |   0
 .../expensereport/tpl/linkedobjectblock.tpl.php     |   0
 {public => htdocs}/exports/class/export.class.php   |   0
 {public => htdocs}/exports/class/index.html         |   0
 {public => htdocs}/exports/export.php               |   0
 {public => htdocs}/exports/index.php                |   0
 .../externalsite/admin/externalsite.php             |   0
 {public => htdocs}/externalsite/admin/index.html    |   0
 {public => htdocs}/externalsite/frames.php          |   0
 {public => htdocs}/externalsite/frametop.php        |   0
 {public => htdocs}/externalsite/index.html          |   0
 {public => htdocs}/favicon.ico                      | Bin
 .../fichinter/admin/fichinter_extrafields.php       |   0
 .../fichinter/admin/fichinterdet_extrafields.php    |   0
 {public => htdocs}/fichinter/admin/index.html       |   0
 {public => htdocs}/fichinter/apercu.php             |   0
 {public => htdocs}/fichinter/card.php               |   0
 .../fichinter/class/fichinter.class.php             |   0
 .../fichinter/class/fichinterstats.class.php        |   0
 {public => htdocs}/fichinter/class/index.html       |   0
 {public => htdocs}/fichinter/contact.php            |   0
 {public => htdocs}/fichinter/document.php           |   0
 {public => htdocs}/fichinter/index.html             |   0
 {public => htdocs}/fichinter/index.php              |   0
 {public => htdocs}/fichinter/info.php               |   0
 {public => htdocs}/fichinter/list.php               |   0
 {public => htdocs}/fichinter/note.php               |   0
 {public => htdocs}/fichinter/stats/index.php        |   0
 {public => htdocs}/fichinter/tpl/index.html         |   0
 .../fichinter/tpl/linkedobjectblock.tpl.php         |   0
 {public => htdocs}/filefunc.inc.php                 |   0
 {public => htdocs}/fourn/ajax/getSupplierPrices.php |   0
 {public => htdocs}/fourn/ajax/index.html            |   0
 {public => htdocs}/fourn/card.php                   |   0
 .../fourn/class/api_supplier_invoices.class.php     |   0
 .../fourn/class/fournisseur.class.php               |   0
 .../fourn/class/fournisseur.commande.class.php      |   0
 .../class/fournisseur.commande.dispatch.class.php   |   0
 .../fourn/class/fournisseur.facture.class.php       |   0
 .../fourn/class/fournisseur.product.class.php       |   0
 {public => htdocs}/fourn/class/index.html           |   0
 .../fourn/class/paiementfourn.class.php             |   0
 {public => htdocs}/fourn/commande/card.php          |   0
 {public => htdocs}/fourn/commande/contact.php       |   0
 {public => htdocs}/fourn/commande/dispatch.php      |   0
 {public => htdocs}/fourn/commande/document.php      |   0
 {public => htdocs}/fourn/commande/index.php         |   0
 {public => htdocs}/fourn/commande/info.php          |   0
 {public => htdocs}/fourn/commande/list.php          |   0
 {public => htdocs}/fourn/commande/note.php          |   0
 .../fourn/commande/orderstoinvoice.php              |   0
 {public => htdocs}/fourn/commande/tpl/index.html    |   0
 .../fourn/commande/tpl/linkedobjectblock.tpl.php    |   0
 {public => htdocs}/fourn/contact.php                |   0
 {public => htdocs}/fourn/facture/card.php           |   0
 {public => htdocs}/fourn/facture/contact.php        |   0
 {public => htdocs}/fourn/facture/document.php       |   0
 {public => htdocs}/fourn/facture/impayees.php       |   0
 {public => htdocs}/fourn/facture/index.html         |   0
 {public => htdocs}/fourn/facture/info.php           |   0
 {public => htdocs}/fourn/facture/list.php           |   0
 {public => htdocs}/fourn/facture/note.php           |   0
 {public => htdocs}/fourn/facture/paiement.php       |   0
 {public => htdocs}/fourn/facture/tpl/index.html     |   0
 .../fourn/facture/tpl/linkedobjectblock.tpl.php     |   0
 {public => htdocs}/fourn/index.php                  |   0
 {public => htdocs}/fourn/js/lib_dispatch.js         |   0
 {public => htdocs}/fourn/paiement/card.php          |   0
 {public => htdocs}/fourn/paiement/index.html        |   0
 {public => htdocs}/fourn/paiement/info.php          |   0
 {public => htdocs}/fourn/product/list.php           |   0
 {public => htdocs}/fourn/recap-fourn.php            |   0
 {public => htdocs}/ftp/admin/ftpclient.php          |   0
 {public => htdocs}/ftp/admin/index.html             |   0
 {public => htdocs}/ftp/index.php                    |   0
 {public => htdocs}/holiday/card.php                 |   0
 {public => htdocs}/holiday/class/holiday.class.php  |   0
 {public => htdocs}/holiday/class/index.html         |   0
 {public => htdocs}/holiday/common.inc.php           |   0
 {public => htdocs}/holiday/define_holiday.php       |   0
 {public => htdocs}/holiday/document.php             |   0
 {public => htdocs}/holiday/img/add.png              | Bin
 {public => htdocs}/holiday/img/conges.png           | Bin
 {public => htdocs}/holiday/img/delete.png           | Bin
 {public => htdocs}/holiday/img/edit.png             | Bin
 {public => htdocs}/holiday/img/index.html           |   0
 {public => htdocs}/holiday/index.html               |   0
 {public => htdocs}/holiday/list.php                 |   0
 {public => htdocs}/holiday/view_log.php             |   0
 .../hrm/admin/admin_establishment.php               |   0
 {public => htdocs}/hrm/admin/admin_hrm.php          |   0
 {public => htdocs}/hrm/admin/index.html             |   0
 .../hrm/class/establishment.class.php               |   0
 {public => htdocs}/hrm/class/index.html             |   0
 {public => htdocs}/hrm/establishment/card.php       |   0
 {public => htdocs}/hrm/establishment/index.html     |   0
 {public => htdocs}/hrm/establishment/info.php       |   0
 {public => htdocs}/hrm/index.html                   |   0
 {public => htdocs}/hrm/index.php                    |   0
 {public => htdocs}/imports/class/import.class.php   |   0
 {public => htdocs}/imports/class/index.html         |   0
 {public => htdocs}/imports/emptyexample.php         |   0
 {public => htdocs}/imports/import.php               |   0
 {public => htdocs}/imports/index.php                |   0
 .../includes/OAuth/Common/AutoLoader.php            |   0
 .../includes/OAuth/Common/Consumer/Credentials.php  |   0
 .../OAuth/Common/Consumer/CredentialsInterface.php  |   0
 .../includes/OAuth/Common/Exception/Exception.php   |   0
 .../OAuth/Common/Http/Client/AbstractClient.php     |   0
 .../OAuth/Common/Http/Client/ClientInterface.php    |   0
 .../OAuth/Common/Http/Client/CurlClient.php         |   0
 .../OAuth/Common/Http/Client/StreamClient.php       |   0
 .../Http/Exception/TokenResponseException.php       |   0
 .../includes/OAuth/Common/Http/Uri/Uri.php          |   0
 .../includes/OAuth/Common/Http/Uri/UriFactory.php   |   0
 .../OAuth/Common/Http/Uri/UriFactoryInterface.php   |   0
 .../includes/OAuth/Common/Http/Uri/UriInterface.php |   0
 .../OAuth/Common/Service/AbstractService.php        |   0
 .../OAuth/Common/Service/ServiceInterface.php       |   0
 .../includes/OAuth/Common/Storage/DoliStorage.php   |   0
 .../AuthorizationStateNotFoundException.php         |   0
 .../Common/Storage/Exception/StorageException.php   |   0
 .../Storage/Exception/TokenNotFoundException.php    |   0
 .../includes/OAuth/Common/Storage/Memory.php        |   0
 .../includes/OAuth/Common/Storage/Redis.php         |   0
 .../includes/OAuth/Common/Storage/Session.php       |   0
 .../OAuth/Common/Storage/SymfonySession.php         |   0
 .../OAuth/Common/Storage/TokenStorageInterface.php  |   0
 .../includes/OAuth/Common/Token/AbstractToken.php   |   0
 .../Token/Exception/ExpiredTokenException.php       |   0
 .../includes/OAuth/Common/Token/TokenInterface.php  |   0
 .../OAuth/OAuth1/Service/AbstractService.php        |   0
 .../includes/OAuth/OAuth1/Service/BitBucket.php     |   0
 .../includes/OAuth/OAuth1/Service/Etsy.php          |   0
 .../includes/OAuth/OAuth1/Service/FitBit.php        |   0
 .../includes/OAuth/OAuth1/Service/FiveHundredPx.php |   0
 .../includes/OAuth/OAuth1/Service/Flickr.php        |   0
 .../includes/OAuth/OAuth1/Service/QuickBooks.php    |   0
 .../includes/OAuth/OAuth1/Service/Redmine.php       |   0
 .../includes/OAuth/OAuth1/Service/ScoopIt.php       |   0
 .../OAuth/OAuth1/Service/ServiceInterface.php       |   0
 .../includes/OAuth/OAuth1/Service/Tumblr.php        |   0
 .../includes/OAuth/OAuth1/Service/Twitter.php       |   0
 .../includes/OAuth/OAuth1/Service/Xing.php          |   0
 .../includes/OAuth/OAuth1/Service/Yahoo.php         |   0
 .../Exception/UnsupportedHashAlgorithmException.php |   0
 .../includes/OAuth/OAuth1/Signature/Signature.php   |   0
 .../OAuth/OAuth1/Signature/SignatureInterface.php   |   0
 .../includes/OAuth/OAuth1/Token/StdOAuth1Token.php  |   0
 .../includes/OAuth/OAuth1/Token/TokenInterface.php  |   0
 .../OAuth/OAuth2/Service/AbstractService.php        |   0
 .../includes/OAuth/OAuth2/Service/Amazon.php        |   0
 .../includes/OAuth/OAuth2/Service/Bitly.php         |   0
 .../includes/OAuth/OAuth2/Service/Bitrix24.php      |   0
 .../includes/OAuth/OAuth2/Service/Box.php           |   0
 .../includes/OAuth/OAuth2/Service/Buffer.php        |   0
 .../includes/OAuth/OAuth2/Service/Dailymotion.php   |   0
 .../includes/OAuth/OAuth2/Service/Delicious.php     |   0
 .../includes/OAuth/OAuth2/Service/DeviantArt.php    |   0
 .../includes/OAuth/OAuth2/Service/Dropbox.php       |   0
 .../includes/OAuth/OAuth2/Service/EveOnline.php     |   0
 .../Exception/InvalidAccessTypeException.php        |   0
 .../InvalidAuthorizationStateException.php          |   0
 .../Service/Exception/InvalidScopeException.php     |   0
 .../Exception/MissingRefreshTokenException.php      |   0
 .../includes/OAuth/OAuth2/Service/Facebook.php      |   0
 .../includes/OAuth/OAuth2/Service/Foursquare.php    |   0
 .../includes/OAuth/OAuth2/Service/GitHub.php        |   0
 .../includes/OAuth/OAuth2/Service/Google.php        |   0
 .../includes/OAuth/OAuth2/Service/Harvest.php       |   0
 .../includes/OAuth/OAuth2/Service/Heroku.php        |   0
 .../includes/OAuth/OAuth2/Service/Hubic.php         |   0
 .../includes/OAuth/OAuth2/Service/Instagram.php     |   0
 .../includes/OAuth/OAuth2/Service/JawboneUP.php     |   0
 .../includes/OAuth/OAuth2/Service/Linkedin.php      |   0
 .../includes/OAuth/OAuth2/Service/Mailchimp.php     |   0
 .../includes/OAuth/OAuth2/Service/Microsoft.php     |   0
 .../includes/OAuth/OAuth2/Service/Nest.php          |   0
 .../includes/OAuth/OAuth2/Service/Netatmo.php       |   0
 .../OAuth/OAuth2/Service/ParrotFlowerPower.php      |   0
 .../includes/OAuth/OAuth2/Service/Paypal.php        |   0
 .../includes/OAuth/OAuth2/Service/Pocket.php        |   0
 .../includes/OAuth/OAuth2/Service/Reddit.php        |   0
 .../includes/OAuth/OAuth2/Service/RunKeeper.php     |   0
 .../includes/OAuth/OAuth2/Service/Salesforce.php    |   0
 .../OAuth/OAuth2/Service/ServiceInterface.php       |   0
 .../includes/OAuth/OAuth2/Service/SoundCloud.php    |   0
 .../includes/OAuth/OAuth2/Service/Spotify.php       |   0
 .../includes/OAuth/OAuth2/Service/Strava.php        |   0
 .../includes/OAuth/OAuth2/Service/Ustream.php       |   0
 .../includes/OAuth/OAuth2/Service/Vimeo.php         |   0
 .../includes/OAuth/OAuth2/Service/Vkontakte.php     |   0
 .../includes/OAuth/OAuth2/Service/Yahoo.php         |   0
 .../includes/OAuth/OAuth2/Service/Yammer.php        |   0
 .../includes/OAuth/OAuth2/Token/StdOAuth2Token.php  |   0
 .../includes/OAuth/OAuth2/Token/TokenInterface.php  |   0
 .../includes/OAuth/ServiceFactory.php               |   0
 {public => htdocs}/includes/OAuth/bootstrap.php     |   0
 .../includes/adodbtime/adodb-time.inc.php           |   0
 {public => htdocs}/includes/adodbtime/index.html    |   0
 .../includes/ccampbell/chromephp/ChromePhp.php      |   0
 .../includes/ccampbell/chromephp/README.md          |   0
 .../includes/ccampbell/chromephp/composer.json      |   0
 .../includes/ckeditor/ckeditor/CHANGES.md           |   0
 .../includes/ckeditor/ckeditor/LICENSE.md           |   0
 .../includes/ckeditor/ckeditor/README.md            |   0
 .../includes/ckeditor/ckeditor/adapters/jquery.js   |   0
 .../includes/ckeditor/ckeditor/bower.json           |   0
 .../includes/ckeditor/ckeditor/build-config.js      |   0
 .../includes/ckeditor/ckeditor/ckeditor.js          |   0
 .../includes/ckeditor/ckeditor/composer.json        |   0
 .../includes/ckeditor/ckeditor/config.js            |   0
 .../includes/ckeditor/ckeditor/contents.css         |   0
 .../includes/ckeditor/ckeditor/lang/af.js           |   0
 .../includes/ckeditor/ckeditor/lang/ar.js           |   0
 .../includes/ckeditor/ckeditor/lang/bg.js           |   0
 .../includes/ckeditor/ckeditor/lang/bn.js           |   0
 .../includes/ckeditor/ckeditor/lang/bs.js           |   0
 .../includes/ckeditor/ckeditor/lang/ca.js           |   0
 .../includes/ckeditor/ckeditor/lang/cs.js           |   0
 .../includes/ckeditor/ckeditor/lang/cy.js           |   0
 .../includes/ckeditor/ckeditor/lang/da.js           |   0
 .../includes/ckeditor/ckeditor/lang/de-ch.js        |   0
 .../includes/ckeditor/ckeditor/lang/de.js           |   0
 .../includes/ckeditor/ckeditor/lang/el.js           |   0
 .../includes/ckeditor/ckeditor/lang/en-au.js        |   0
 .../includes/ckeditor/ckeditor/lang/en-ca.js        |   0
 .../includes/ckeditor/ckeditor/lang/en-gb.js        |   0
 .../includes/ckeditor/ckeditor/lang/en.js           |   0
 .../includes/ckeditor/ckeditor/lang/eo.js           |   0
 .../includes/ckeditor/ckeditor/lang/es.js           |   0
 .../includes/ckeditor/ckeditor/lang/et.js           |   0
 .../includes/ckeditor/ckeditor/lang/eu.js           |   0
 .../includes/ckeditor/ckeditor/lang/fa.js           |   0
 .../includes/ckeditor/ckeditor/lang/fi.js           |   0
 .../includes/ckeditor/ckeditor/lang/fo.js           |   0
 .../includes/ckeditor/ckeditor/lang/fr-ca.js        |   0
 .../includes/ckeditor/ckeditor/lang/fr.js           |   0
 .../includes/ckeditor/ckeditor/lang/gl.js           |   0
 .../includes/ckeditor/ckeditor/lang/gu.js           |   0
 .../includes/ckeditor/ckeditor/lang/he.js           |   0
 .../includes/ckeditor/ckeditor/lang/hi.js           |   0
 .../includes/ckeditor/ckeditor/lang/hr.js           |   0
 .../includes/ckeditor/ckeditor/lang/hu.js           |   0
 .../includes/ckeditor/ckeditor/lang/id.js           |   0
 .../includes/ckeditor/ckeditor/lang/is.js           |   0
 .../includes/ckeditor/ckeditor/lang/it.js           |   0
 .../includes/ckeditor/ckeditor/lang/ja.js           |   0
 .../includes/ckeditor/ckeditor/lang/ka.js           |   0
 .../includes/ckeditor/ckeditor/lang/km.js           |   0
 .../includes/ckeditor/ckeditor/lang/ko.js           |   0
 .../includes/ckeditor/ckeditor/lang/ku.js           |   0
 .../includes/ckeditor/ckeditor/lang/lt.js           |   0
 .../includes/ckeditor/ckeditor/lang/lv.js           |   0
 .../includes/ckeditor/ckeditor/lang/mk.js           |   0
 .../includes/ckeditor/ckeditor/lang/mn.js           |   0
 .../includes/ckeditor/ckeditor/lang/ms.js           |   0
 .../includes/ckeditor/ckeditor/lang/nb.js           |   0
 .../includes/ckeditor/ckeditor/lang/nl.js           |   0
 .../includes/ckeditor/ckeditor/lang/no.js           |   0
 .../includes/ckeditor/ckeditor/lang/pl.js           |   0
 .../includes/ckeditor/ckeditor/lang/pt-br.js        |   0
 .../includes/ckeditor/ckeditor/lang/pt.js           |   0
 .../includes/ckeditor/ckeditor/lang/ro.js           |   0
 .../includes/ckeditor/ckeditor/lang/ru.js           |   0
 .../includes/ckeditor/ckeditor/lang/si.js           |   0
 .../includes/ckeditor/ckeditor/lang/sk.js           |   0
 .../includes/ckeditor/ckeditor/lang/sl.js           |   0
 .../includes/ckeditor/ckeditor/lang/sq.js           |   0
 .../includes/ckeditor/ckeditor/lang/sr-latn.js      |   0
 .../includes/ckeditor/ckeditor/lang/sr.js           |   0
 .../includes/ckeditor/ckeditor/lang/sv.js           |   0
 .../includes/ckeditor/ckeditor/lang/th.js           |   0
 .../includes/ckeditor/ckeditor/lang/tr.js           |   0
 .../includes/ckeditor/ckeditor/lang/tt.js           |   0
 .../includes/ckeditor/ckeditor/lang/ug.js           |   0
 .../includes/ckeditor/ckeditor/lang/uk.js           |   0
 .../includes/ckeditor/ckeditor/lang/vi.js           |   0
 .../includes/ckeditor/ckeditor/lang/zh-cn.js        |   0
 .../includes/ckeditor/ckeditor/lang/zh.js           |   0
 .../includes/ckeditor/ckeditor/package.json         |   0
 .../ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js   |   0
 .../a11yhelp/dialogs/lang/_translationstatus.txt    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/af.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ar.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/bg.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ca.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/cs.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/cy.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/da.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/de.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/el.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/en.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/eo.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/es.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/et.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/eu.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/fa.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/fi.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/fo.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/fr.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/gl.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/gu.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/he.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/hi.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/hr.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/hu.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/id.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/it.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ja.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/km.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ko.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ku.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/lt.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/lv.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/mk.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/mn.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/nb.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/nl.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/no.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/pl.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/pt.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ro.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ru.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/si.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/sk.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/sl.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/sq.js    |   0
 .../plugins/a11yhelp/dialogs/lang/sr-latn.js        |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/sr.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/sv.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/th.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/tr.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/tt.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/ug.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/uk.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/vi.js    |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js |   0
 .../ckeditor/plugins/a11yhelp/dialogs/lang/zh.js    |   0
 .../ckeditor/plugins/about/dialogs/about.js         |   0
 .../plugins/about/dialogs/hidpi/logo_ckeditor.png   | Bin
 .../plugins/about/dialogs/logo_ckeditor.png         | Bin
 .../ckeditor/plugins/clipboard/dialogs/paste.js     |   0
 .../plugins/colordialog/dialogs/colordialog.css     |   0
 .../plugins/colordialog/dialogs/colordialog.js      |   0
 .../ckeditor/plugins/dialog/dialogDefinition.js     |   0
 .../ckeditor/ckeditor/plugins/div/dialogs/div.js    |   0
 .../ckeditor/ckeditor/plugins/find/dialogs/find.js  |   0
 .../ckeditor/plugins/flash/dialogs/flash.js         |   0
 .../ckeditor/plugins/flash/images/placeholder.png   | Bin
 .../ckeditor/plugins/forms/dialogs/button.js        |   0
 .../ckeditor/plugins/forms/dialogs/checkbox.js      |   0
 .../ckeditor/ckeditor/plugins/forms/dialogs/form.js |   0
 .../ckeditor/plugins/forms/dialogs/hiddenfield.js   |   0
 .../ckeditor/plugins/forms/dialogs/radio.js         |   0
 .../ckeditor/plugins/forms/dialogs/select.js        |   0
 .../ckeditor/plugins/forms/dialogs/textarea.js      |   0
 .../ckeditor/plugins/forms/dialogs/textfield.js     |   0
 .../ckeditor/plugins/forms/images/hiddenfield.gif   | Bin
 .../includes/ckeditor/ckeditor/plugins/icons.png    | Bin
 .../ckeditor/ckeditor/plugins/icons_hidpi.png       | Bin
 .../ckeditor/plugins/iframe/dialogs/iframe.js       |   0
 .../ckeditor/plugins/iframe/images/placeholder.png  | Bin
 .../ckeditor/plugins/image/dialogs/image.js         |   0
 .../ckeditor/plugins/image/images/noimage.png       | Bin
 .../ckeditor/plugins/link/dialogs/anchor.js         |   0
 .../ckeditor/ckeditor/plugins/link/dialogs/link.js  |   0
 .../ckeditor/plugins/link/images/anchor.png         | Bin
 .../ckeditor/plugins/link/images/hidpi/anchor.png   | Bin
 .../ckeditor/plugins/liststyle/dialogs/liststyle.js |   0
 .../plugins/magicline/images/hidpi/icon-rtl.png     | Bin
 .../plugins/magicline/images/hidpi/icon.png         | Bin
 .../ckeditor/plugins/magicline/images/icon-rtl.png  | Bin
 .../ckeditor/plugins/magicline/images/icon.png      | Bin
 .../ckeditor/plugins/pagebreak/images/pagebreak.gif | Bin
 .../plugins/pastefromword/filter/default.js         |   0
 .../ckeditor/ckeditor/plugins/preview/preview.html  |   0
 .../ckeditor/ckeditor/plugins/scayt/CHANGELOG.md    |   0
 .../ckeditor/ckeditor/plugins/scayt/LICENSE.md      |   0
 .../ckeditor/ckeditor/plugins/scayt/README.md       |   0
 .../ckeditor/plugins/scayt/dialogs/options.js       |   0
 .../ckeditor/plugins/scayt/dialogs/toolbar.css      |   0
 .../plugins/showblocks/images/block_address.png     | Bin
 .../plugins/showblocks/images/block_blockquote.png  | Bin
 .../plugins/showblocks/images/block_div.png         | Bin
 .../ckeditor/plugins/showblocks/images/block_h1.png | Bin
 .../ckeditor/plugins/showblocks/images/block_h2.png | Bin
 .../ckeditor/plugins/showblocks/images/block_h3.png | Bin
 .../ckeditor/plugins/showblocks/images/block_h4.png | Bin
 .../ckeditor/plugins/showblocks/images/block_h5.png | Bin
 .../ckeditor/plugins/showblocks/images/block_h6.png | Bin
 .../ckeditor/plugins/showblocks/images/block_p.png  | Bin
 .../plugins/showblocks/images/block_pre.png         | Bin
 .../ckeditor/plugins/smiley/dialogs/smiley.js       |   0
 .../ckeditor/plugins/smiley/images/angel_smile.gif  | Bin
 .../ckeditor/plugins/smiley/images/angel_smile.png  | Bin
 .../ckeditor/plugins/smiley/images/angry_smile.gif  | Bin
 .../ckeditor/plugins/smiley/images/angry_smile.png  | Bin
 .../ckeditor/plugins/smiley/images/broken_heart.gif | Bin
 .../ckeditor/plugins/smiley/images/broken_heart.png | Bin
 .../plugins/smiley/images/confused_smile.gif        | Bin
 .../plugins/smiley/images/confused_smile.png        | Bin
 .../ckeditor/plugins/smiley/images/cry_smile.gif    | Bin
 .../ckeditor/plugins/smiley/images/cry_smile.png    | Bin
 .../ckeditor/plugins/smiley/images/devil_smile.gif  | Bin
 .../ckeditor/plugins/smiley/images/devil_smile.png  | Bin
 .../plugins/smiley/images/embaressed_smile.gif      | Bin
 .../plugins/smiley/images/embarrassed_smile.gif     | Bin
 .../plugins/smiley/images/embarrassed_smile.png     | Bin
 .../ckeditor/plugins/smiley/images/envelope.gif     | Bin
 .../ckeditor/plugins/smiley/images/envelope.png     | Bin
 .../ckeditor/plugins/smiley/images/heart.gif        | Bin
 .../ckeditor/plugins/smiley/images/heart.png        | Bin
 .../ckeditor/plugins/smiley/images/kiss.gif         | Bin
 .../ckeditor/plugins/smiley/images/kiss.png         | Bin
 .../ckeditor/plugins/smiley/images/lightbulb.gif    | Bin
 .../ckeditor/plugins/smiley/images/lightbulb.png    | Bin
 .../ckeditor/plugins/smiley/images/omg_smile.gif    | Bin
 .../ckeditor/plugins/smiley/images/omg_smile.png    | Bin
 .../plugins/smiley/images/regular_smile.gif         | Bin
 .../plugins/smiley/images/regular_smile.png         | Bin
 .../ckeditor/plugins/smiley/images/sad_smile.gif    | Bin
 .../ckeditor/plugins/smiley/images/sad_smile.png    | Bin
 .../ckeditor/plugins/smiley/images/shades_smile.gif | Bin
 .../ckeditor/plugins/smiley/images/shades_smile.png | Bin
 .../ckeditor/plugins/smiley/images/teeth_smile.gif  | Bin
 .../ckeditor/plugins/smiley/images/teeth_smile.png  | Bin
 .../ckeditor/plugins/smiley/images/thumbs_down.gif  | Bin
 .../ckeditor/plugins/smiley/images/thumbs_down.png  | Bin
 .../ckeditor/plugins/smiley/images/thumbs_up.gif    | Bin
 .../ckeditor/plugins/smiley/images/thumbs_up.png    | Bin
 .../ckeditor/plugins/smiley/images/tongue_smile.gif | Bin
 .../ckeditor/plugins/smiley/images/tongue_smile.png | Bin
 .../ckeditor/plugins/smiley/images/tounge_smile.gif | Bin
 .../smiley/images/whatchutalkingabout_smile.gif     | Bin
 .../smiley/images/whatchutalkingabout_smile.png     | Bin
 .../ckeditor/plugins/smiley/images/wink_smile.gif   | Bin
 .../ckeditor/plugins/smiley/images/wink_smile.png   | Bin
 .../specialchar/dialogs/lang/_translationstatus.txt |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/af.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/ar.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/bg.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/ca.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/cs.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/cy.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/da.js |   0
 .../plugins/specialchar/dialogs/lang/de-ch.js       |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/de.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/el.js |   0
 .../plugins/specialchar/dialogs/lang/en-gb.js       |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/en.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/eo.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/es.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/et.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/eu.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/fa.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/fi.js |   0
 .../plugins/specialchar/dialogs/lang/fr-ca.js       |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/fr.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/gl.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/he.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/hr.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/hu.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/id.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/it.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/ja.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/km.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/ko.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/ku.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/lt.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/lv.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/nb.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/nl.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/no.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/pl.js |   0
 .../plugins/specialchar/dialogs/lang/pt-br.js       |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/pt.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/ru.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/si.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/sk.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/sl.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/sq.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/sv.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/th.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/tr.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/tt.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/ug.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/uk.js |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/vi.js |   0
 .../plugins/specialchar/dialogs/lang/zh-cn.js       |   0
 .../ckeditor/plugins/specialchar/dialogs/lang/zh.js |   0
 .../plugins/specialchar/dialogs/specialchar.js      |   0
 .../ckeditor/plugins/table/dialogs/table.js         |   0
 .../plugins/tabletools/dialogs/tableCell.js         |   0
 .../plugins/templates/dialogs/templates.css         |   0
 .../ckeditor/plugins/templates/dialogs/templates.js |   0
 .../ckeditor/plugins/templates/templates/default.js |   0
 .../templates/templates/images/template1.gif        | Bin
 .../templates/templates/images/template2.gif        | Bin
 .../templates/templates/images/template3.gif        | Bin
 .../ckeditor/ckeditor/plugins/wsc/LICENSE.md        |   0
 .../ckeditor/ckeditor/plugins/wsc/README.md         |   0
 .../ckeditor/plugins/wsc/dialogs/ciframe.html       |   0
 .../ckeditor/plugins/wsc/dialogs/tmpFrameset.html   |   0
 .../ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css   |   0
 .../ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js    |   0
 .../ckeditor/ckeditor/plugins/wsc/dialogs/wsc_ie.js |   0
 .../ckeditor/ckeditor/samples/css/samples.css       |   0
 .../ckeditor/ckeditor/samples/img/github-top.png    | Bin
 .../ckeditor/ckeditor/samples/img/header-bg.png     | Bin
 .../ckeditor/samples/img/header-separator.png       | Bin
 .../includes/ckeditor/ckeditor/samples/img/logo.png | Bin
 .../ckeditor/samples/img/navigation-tip.png         | Bin
 .../includes/ckeditor/ckeditor/samples/index.html   |   0
 .../includes/ckeditor/ckeditor/samples/js/sample.js |   0
 .../includes/ckeditor/ckeditor/samples/js/sf.js     |   0
 .../ckeditor/ckeditor/samples/old/ajax.html         |   0
 .../includes/ckeditor/ckeditor/samples/old/api.html |   0
 .../ckeditor/ckeditor/samples/old/appendto.html     |   0
 .../ckeditor/samples/old/assets/inlineall/logo.png  | Bin
 .../samples/old/assets/outputxhtml/outputxhtml.css  |   0
 .../ckeditor/samples/old/assets/posteddata.php      |   0
 .../ckeditor/ckeditor/samples/old/assets/sample.jpg | Bin
 .../samples/old/assets/uilanguages/languages.js     |   0
 .../ckeditor/samples/old/datafiltering.html         |   0
 .../ckeditor/samples/old/dialog/assets/my_dialog.js |   0
 .../ckeditor/samples/old/dialog/dialog.html         |   0
 .../ckeditor/ckeditor/samples/old/divreplace.html   |   0
 .../ckeditor/samples/old/enterkey/enterkey.html     |   0
 .../assets/outputforflash/outputforflash.fla        | Bin
 .../assets/outputforflash/outputforflash.swf        | Bin
 .../htmlwriter/assets/outputforflash/swfobject.js   |   0
 .../samples/old/htmlwriter/outputforflash.html      |   0
 .../ckeditor/samples/old/htmlwriter/outputhtml.html |   0
 .../ckeditor/ckeditor/samples/old/index.html        |   0
 .../ckeditor/ckeditor/samples/old/inlineall.html    |   0
 .../ckeditor/ckeditor/samples/old/inlinebycode.html |   0
 .../ckeditor/samples/old/inlinetextarea.html        |   0
 .../ckeditor/ckeditor/samples/old/jquery.html       |   0
 .../ckeditor/samples/old/magicline/magicline.html   |   0
 .../ckeditor/ckeditor/samples/old/readonly.html     |   0
 .../ckeditor/samples/old/replacebyclass.html        |   0
 .../ckeditor/samples/old/replacebycode.html         |   0
 .../ckeditor/ckeditor/samples/old/sample.css        |   0
 .../ckeditor/ckeditor/samples/old/sample.js         |   0
 .../ckeditor/samples/old/sample_posteddata.php      |   0
 .../ckeditor/ckeditor/samples/old/tabindex.html     |   0
 .../ckeditor/samples/old/toolbar/toolbar.html       |   0
 .../ckeditor/ckeditor/samples/old/uicolor.html      |   0
 .../ckeditor/ckeditor/samples/old/uilanguages.html  |   0
 .../ckeditor/samples/old/wysiwygarea/fullpage.html  |   0
 .../ckeditor/ckeditor/samples/old/xhtmlstyle.html   |   0
 .../samples/toolbarconfigurator/css/fontello.css    |   0
 .../samples/toolbarconfigurator/font/LICENSE.txt    |   0
 .../samples/toolbarconfigurator/font/config.json    |   0
 .../samples/toolbarconfigurator/font/fontello.eot   | Bin
 .../samples/toolbarconfigurator/font/fontello.svg   |   0
 .../samples/toolbarconfigurator/font/fontello.ttf   | Bin
 .../samples/toolbarconfigurator/font/fontello.woff  | Bin
 .../ckeditor/samples/toolbarconfigurator/index.html |   0
 .../js/abstracttoolbarmodifier.js                   |   0
 .../toolbarconfigurator/js/fulltoolbareditor.js     |   0
 .../toolbarconfigurator/js/toolbarmodifier.js       |   0
 .../toolbarconfigurator/js/toolbartextmodifier.js   |   0
 .../toolbarconfigurator/lib/codemirror/LICENSE      |   0
 .../lib/codemirror/codemirror.css                   |   0
 .../lib/codemirror/codemirror.js                    |   0
 .../lib/codemirror/javascript.js                    |   0
 .../toolbarconfigurator/lib/codemirror/neo.css      |   0
 .../lib/codemirror/show-hint.css                    |   0
 .../toolbarconfigurator/lib/codemirror/show-hint.js |   0
 .../ckeditor/ckeditor/skins/moono/dialog.css        |   0
 .../ckeditor/ckeditor/skins/moono/dialog_ie.css     |   0
 .../ckeditor/ckeditor/skins/moono/dialog_ie7.css    |   0
 .../ckeditor/ckeditor/skins/moono/dialog_ie8.css    |   0
 .../ckeditor/skins/moono/dialog_iequirks.css        |   0
 .../ckeditor/ckeditor/skins/moono/editor.css        |   0
 .../ckeditor/ckeditor/skins/moono/editor_gecko.css  |   0
 .../ckeditor/ckeditor/skins/moono/editor_ie.css     |   0
 .../ckeditor/ckeditor/skins/moono/editor_ie7.css    |   0
 .../ckeditor/ckeditor/skins/moono/editor_ie8.css    |   0
 .../ckeditor/skins/moono/editor_iequirks.css        |   0
 .../ckeditor/ckeditor/skins/moono/icons.png         | Bin
 .../ckeditor/ckeditor/skins/moono/icons_hidpi.png   | Bin
 .../ckeditor/ckeditor/skins/moono/images/arrow.png  | Bin
 .../ckeditor/ckeditor/skins/moono/images/close.png  | Bin
 .../ckeditor/skins/moono/images/hidpi/close.png     | Bin
 .../ckeditor/skins/moono/images/hidpi/lock-open.png | Bin
 .../ckeditor/skins/moono/images/hidpi/lock.png      | Bin
 .../ckeditor/skins/moono/images/hidpi/refresh.png   | Bin
 .../ckeditor/skins/moono/images/lock-open.png       | Bin
 .../ckeditor/ckeditor/skins/moono/images/lock.png   | Bin
 .../ckeditor/skins/moono/images/refresh.png         | Bin
 .../ckeditor/skins/moono/images/spinner.gif         | Bin
 .../ckeditor/ckeditor/skins/moono/readme.md         |   0
 .../includes/ckeditor/ckeditor/styles.js            |   0
 {public => htdocs}/includes/evalmath/README.md      |   0
 .../includes/evalmath/evalmath.class.php            |   0
 {public => htdocs}/includes/fonts/Aerial.ttf        | Bin
 {public => htdocs}/includes/fonts/AerialBd.ttf      | Bin
 {public => htdocs}/includes/fonts/AerialBdIt.ttf    | Bin
 {public => htdocs}/includes/fonts/AerialIt.ttf      | Bin
 {public => htdocs}/includes/fonts/CHANGELOG.TXT     |   0
 {public => htdocs}/includes/fonts/COPYRIGHT.TXT     |   0
 {public => htdocs}/includes/fpdfi/README.txt        |   0
 .../includes/fpdfi/filters/FilterASCII85.php        |   0
 .../includes/fpdfi/filters/FilterASCII85_FPDI.php   |   0
 .../includes/fpdfi/filters/FilterASCIIHexDecode.php |   0
 .../includes/fpdfi/filters/FilterLZW.php            |   0
 .../includes/fpdfi/filters/FilterLZW_FPDI.php       |   0
 {public => htdocs}/includes/fpdfi/fpdf_tpl.php      |   0
 {public => htdocs}/includes/fpdfi/fpdi.php          |   0
 {public => htdocs}/includes/fpdfi/fpdi_bridge.php   |   0
 .../includes/fpdfi/fpdi_pdf_parser.php              |   0
 {public => htdocs}/includes/fpdfi/pdf_context.php   |   0
 {public => htdocs}/includes/fpdfi/pdf_parser.php    |   0
 {public => htdocs}/includes/geoip/README.txt        |   0
 {public => htdocs}/includes/geoip/geoip.inc         |   0
 {public => htdocs}/includes/geoip/geoipcity.inc     |   0
 .../includes/geoip/geoipregionvars.php              |   0
 {public => htdocs}/includes/geoip/sample.php        |   0
 {public => htdocs}/includes/geoip/sample_city.php   |   0
 .../includes/geoip/sample_distributed.php           |   0
 .../includes/geoip/sample_netspeed.php              |   0
 {public => htdocs}/includes/geoip/sample_org.php    |   0
 {public => htdocs}/includes/geoip/sample_region.php |   0
 {public => htdocs}/includes/index.html              |   0
 .../redmond/images/ui-bg_flat_0_aaaaaa_40x100.png   | Bin
 .../redmond/images/ui-bg_flat_55_fbec88_40x100.png  | Bin
 .../redmond/images/ui-bg_glass_75_d0e5f5_1x400.png  | Bin
 .../redmond/images/ui-bg_glass_85_dfeffc_1x400.png  | Bin
 .../redmond/images/ui-bg_glass_95_fef1ec_1x400.png  | Bin
 .../images/ui-bg_gloss-wave_55_5c9ccc_500x100.png   | Bin
 .../images/ui-bg_inset-hard_100_f5f8f9_1x100.png    | Bin
 .../images/ui-bg_inset-hard_100_fcfdfd_1x100.png    | Bin
 .../css/redmond/images/ui-icons_217bc0_256x240.png  | Bin
 .../css/redmond/images/ui-icons_2e83ff_256x240.png  | Bin
 .../css/redmond/images/ui-icons_469bdd_256x240.png  | Bin
 .../css/redmond/images/ui-icons_6da8d5_256x240.png  | Bin
 .../css/redmond/images/ui-icons_cd0a0a_256x240.png  | Bin
 .../css/redmond/images/ui-icons_d8e7f3_256x240.png  | Bin
 .../css/redmond/images/ui-icons_f9bd01_256x240.png  | Bin
 .../includes/jquery/css/redmond/jquery-ui.css       |   0
 .../includes/jquery/css/redmond/jquery-ui.min.css   |   0
 .../includes/jquery/css/redmond/theme.css           |   0
 .../images/ui-bg_flat_0_aaaaaa_40x100.png           | Bin
 .../images/ui-bg_flat_75_ffffff_40x100.png          | Bin
 .../images/ui-bg_glass_55_fbf9ee_1x400.png          | Bin
 .../images/ui-bg_glass_65_ffffff_1x400.png          | Bin
 .../images/ui-bg_glass_75_dadada_1x400.png          | Bin
 .../images/ui-bg_glass_75_e6e6e6_1x400.png          | Bin
 .../images/ui-bg_glass_95_fef1ec_1x400.png          | Bin
 .../images/ui-bg_highlight-soft_75_cccccc_1x100.png | Bin
 .../smoothness/images/ui-icons_222222_256x240.png   | Bin
 .../smoothness/images/ui-icons_2e83ff_256x240.png   | Bin
 .../smoothness/images/ui-icons_454545_256x240.png   | Bin
 .../smoothness/images/ui-icons_888888_256x240.png   | Bin
 .../smoothness/images/ui-icons_cd0a0a_256x240.png   | Bin
 .../includes/jquery/css/smoothness/jquery-ui.css    |   0
 .../jquery/css/smoothness/jquery-ui.min.css         |   0
 .../includes/jquery/css/smoothness/theme.css        |   0
 .../ui-bg_diagonals-thick_18_b81900_40x40.png       | Bin
 .../ui-bg_diagonals-thick_20_666666_40x40.png       | Bin
 .../images/ui-bg_flat_10_000000_40x100.png          | Bin
 .../images/ui-bg_glass_100_f6f6f6_1x400.png         | Bin
 .../images/ui-bg_glass_100_fdf5ce_1x400.png         | Bin
 .../images/ui-bg_glass_65_ffffff_1x400.png          | Bin
 .../images/ui-bg_gloss-wave_35_f6a828_500x100.png   | Bin
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png       | Bin
 .../images/ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin
 .../ui-lightness/images/ui-icons_222222_256x240.png | Bin
 .../ui-lightness/images/ui-icons_228ef1_256x240.png | Bin
 .../ui-lightness/images/ui-icons_ef8c08_256x240.png | Bin
 .../ui-lightness/images/ui-icons_ffd27a_256x240.png | Bin
 .../ui-lightness/images/ui-icons_ffffff_256x240.png | Bin
 .../includes/jquery/css/ui-lightness/jquery-ui.css  |   0
 .../jquery/css/ui-lightness/jquery-ui.min.css       |   0
 .../includes/jquery/css/ui-lightness/theme.css      |   0
 {public => htdocs}/includes/jquery/js/jquery-ui.js  |   0
 .../includes/jquery/js/jquery-ui.min.js             |   0
 {public => htdocs}/includes/jquery/js/jquery.js     |   0
 {public => htdocs}/includes/jquery/js/jquery.min.js |   0
 .../jquery/plugins/blockUI/jquery.blockUI.js        |   0
 .../plugins/colorpicker/jquery.colorpicker.css      |   0
 .../plugins/colorpicker/jquery.colorpicker.js       |   0
 .../includes/jquery/plugins/fileupload/README.md    |   0
 .../plugins/fileupload/css/jquery.fileupload-ui.css |   0
 .../jquery/plugins/fileupload/img/loading.gif       | Bin
 .../jquery/plugins/fileupload/img/progressbar.gif   | Bin
 .../js/cors/jquery.postmessage-transport.js         |   0
 .../fileupload/js/cors/jquery.xdr-transport.js      |   0
 .../plugins/fileupload/js/jquery.fileupload-fp.js   |   0
 .../plugins/fileupload/js/jquery.fileupload-jui.js  |   0
 .../plugins/fileupload/js/jquery.fileupload-ui.js   |   0
 .../plugins/fileupload/js/jquery.fileupload.js      |   0
 .../fileupload/js/jquery.iframe-transport.js        |   0
 .../includes/jquery/plugins/fileupload/js/locale.js |   0
 .../includes/jquery/plugins/fileupload/js/main.js   |   0
 .../fileupload/js/vendor/jquery.ui.widget.js        |   0
 .../includes/jquery/plugins/flot/API.md             |   0
 .../includes/jquery/plugins/flot/CONTRIBUTING.md    |   0
 .../includes/jquery/plugins/flot/FAQ.md             |   0
 .../includes/jquery/plugins/flot/LICENSE.txt        |   0
 .../includes/jquery/plugins/flot/Makefile           |   0
 .../includes/jquery/plugins/flot/NEWS.md            |   0
 .../includes/jquery/plugins/flot/PLUGINS.md         |   0
 .../includes/jquery/plugins/flot/README.md          |   0
 .../includes/jquery/plugins/flot/excanvas.js        |   0
 .../includes/jquery/plugins/flot/excanvas.min.js    |   0
 .../jquery/plugins/flot/jquery.colorhelpers.js      |   0
 .../jquery/plugins/flot/jquery.colorhelpers.min.js  |   0
 .../jquery/plugins/flot/jquery.flot.canvas.js       |   0
 .../jquery/plugins/flot/jquery.flot.canvas.min.js   |   0
 .../jquery/plugins/flot/jquery.flot.categories.js   |   0
 .../plugins/flot/jquery.flot.categories.min.js      |   0
 .../jquery/plugins/flot/jquery.flot.crosshair.js    |   0
 .../plugins/flot/jquery.flot.crosshair.min.js       |   0
 .../jquery/plugins/flot/jquery.flot.errorbars.js    |   0
 .../plugins/flot/jquery.flot.errorbars.min.js       |   0
 .../jquery/plugins/flot/jquery.flot.fillbetween.js  |   0
 .../plugins/flot/jquery.flot.fillbetween.min.js     |   0
 .../jquery/plugins/flot/jquery.flot.image.js        |   0
 .../jquery/plugins/flot/jquery.flot.image.min.js    |   0
 .../includes/jquery/plugins/flot/jquery.flot.js     |   0
 .../includes/jquery/plugins/flot/jquery.flot.min.js |   0
 .../jquery/plugins/flot/jquery.flot.navigate.js     |   0
 .../jquery/plugins/flot/jquery.flot.navigate.min.js |   0
 .../includes/jquery/plugins/flot/jquery.flot.pie.js |   0
 .../jquery/plugins/flot/jquery.flot.pie.min.js      |   0
 .../jquery/plugins/flot/jquery.flot.resize.js       |   0
 .../jquery/plugins/flot/jquery.flot.resize.min.js   |   0
 .../jquery/plugins/flot/jquery.flot.selection.js    |   0
 .../plugins/flot/jquery.flot.selection.min.js       |   0
 .../jquery/plugins/flot/jquery.flot.stack.js        |   0
 .../jquery/plugins/flot/jquery.flot.stack.min.js    |   0
 .../jquery/plugins/flot/jquery.flot.symbol.js       |   0
 .../jquery/plugins/flot/jquery.flot.symbol.min.js   |   0
 .../jquery/plugins/flot/jquery.flot.threshold.js    |   0
 .../plugins/flot/jquery.flot.threshold.min.js       |   0
 .../jquery/plugins/flot/jquery.flot.time.js         |   0
 .../jquery/plugins/flot/jquery.flot.time.min.js     |   0
 .../includes/jquery/plugins/jcrop/css/Jcrop.gif     | Bin
 .../jquery/plugins/jcrop/css/jquery.Jcrop.css       |   0
 .../includes/jquery/plugins/jcrop/index.html        |   0
 .../jquery/plugins/jcrop/js/jquery.Jcrop.js         |   0
 .../jquery/plugins/jcrop/js/jquery.Jcrop.min.js     |   0
 .../plugins/jeditable/jquery.jeditable.ckeditor.js  |   0
 .../jquery/plugins/jeditable/jquery.jeditable.js    |   0
 .../plugins/jeditable/jquery.jeditable.min.js       |   0
 .../jeditable/jquery.jeditable.ui-autocomplete.js   |   0
 .../jeditable/jquery.jeditable.ui-datepicker.js     |   0
 .../plugins/jnotify/jquery.jnotify-alt.min.css      |   0
 .../jquery/plugins/jnotify/jquery.jnotify.css       |   0
 .../jquery/plugins/jnotify/jquery.jnotify.js        |   0
 .../jquery/plugins/jnotify/jquery.jnotify.min.css   |   0
 .../jquery/plugins/jnotify/jquery.jnotify.min.js    |   0
 .../includes/jquery/plugins/jpicker/ChangeLog.txt   |   0
 .../includes/jquery/plugins/jpicker/Example.html    |   0
 .../includes/jquery/plugins/jpicker/ReadMe.txt      |   0
 .../jquery/plugins/jpicker/css/jPicker-1.1.6.css    |   0
 .../plugins/jpicker/css/jPicker-1.1.6.min.css       |   0
 .../jquery/plugins/jpicker/images/AlphaBar.png      | Bin
 .../includes/jquery/plugins/jpicker/images/Bars.png | Bin
 .../includes/jquery/plugins/jpicker/images/Maps.png | Bin
 .../jquery/plugins/jpicker/images/NoColor.png       | Bin
 .../jquery/plugins/jpicker/images/bar-opacity.png   | Bin
 .../jquery/plugins/jpicker/images/map-opacity.png   | Bin
 .../jquery/plugins/jpicker/images/mappoint.gif      | Bin
 .../jquery/plugins/jpicker/images/picker.gif        | Bin
 .../plugins/jpicker/images/preview-opacity.png      | Bin
 .../jquery/plugins/jpicker/images/rangearrows.gif   | Bin
 .../includes/jquery/plugins/jpicker/jPicker.css     |   0
 .../jquery/plugins/jpicker/jpicker-1.1.6.js         |   0
 .../jquery/plugins/jpicker/jpicker-1.1.6.min.js     |   0
 .../plugins/jqueryFileTree/images/application.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/code.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/css.png    | Bin
 .../jquery/plugins/jqueryFileTree/images/db.png     | Bin
 .../plugins/jqueryFileTree/images/directory.png     | Bin
 .../jquery/plugins/jqueryFileTree/images/doc.png    | Bin
 .../jquery/plugins/jqueryFileTree/images/file.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/film.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/flash.png  | Bin
 .../plugins/jqueryFileTree/images/folder_open.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/html.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/java.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/linux.png  | Bin
 .../jquery/plugins/jqueryFileTree/images/music.png  | Bin
 .../jquery/plugins/jqueryFileTree/images/pdf.png    | Bin
 .../jquery/plugins/jqueryFileTree/images/php.png    | Bin
 .../plugins/jqueryFileTree/images/picture.png       | Bin
 .../jquery/plugins/jqueryFileTree/images/ppt.png    | Bin
 .../jquery/plugins/jqueryFileTree/images/psd.png    | Bin
 .../jquery/plugins/jqueryFileTree/images/ruby.png   | Bin
 .../jquery/plugins/jqueryFileTree/images/script.png | Bin
 .../plugins/jqueryFileTree/images/spinner.gif       | Bin
 .../jquery/plugins/jqueryFileTree/images/txt.png    | Bin
 .../jquery/plugins/jqueryFileTree/images/xls.png    | Bin
 .../jquery/plugins/jqueryFileTree/images/zip.png    | Bin
 .../plugins/jqueryFileTree/jqueryFileTree.css       |   0
 .../jquery/plugins/jqueryFileTree/jqueryFileTree.js |   0
 .../jquery/plugins/jquerytreeview/changelog.md      |   0
 .../plugins/jquerytreeview/images/ajax-loader.gif   | Bin
 .../jquery/plugins/jquerytreeview/images/file.gif   | Bin
 .../plugins/jquerytreeview/images/folder-closed.gif | Bin
 .../jquery/plugins/jquerytreeview/images/folder.gif | Bin
 .../jquery/plugins/jquerytreeview/images/minus.gif  | Bin
 .../jquery/plugins/jquerytreeview/images/plus.gif   | Bin
 .../jquerytreeview/images/treeview-black-line.gif   | Bin
 .../jquerytreeview/images/treeview-black.gif        | Bin
 .../jquerytreeview/images/treeview-default-line.gif | Bin
 .../jquerytreeview/images/treeview-default.gif      | Bin
 .../images/treeview-famfamfam-line.gif              | Bin
 .../jquerytreeview/images/treeview-famfamfam.gif    | Bin
 .../jquerytreeview/images/treeview-gray-line.gif    | Bin
 .../plugins/jquerytreeview/images/treeview-gray.gif | Bin
 .../jquerytreeview/images/treeview-red-line.gif     | Bin
 .../plugins/jquerytreeview/images/treeview-red.gif  | Bin
 .../plugins/jquerytreeview/jquery.treeview.async.js |   0
 .../plugins/jquerytreeview/jquery.treeview.css      |   0
 .../plugins/jquerytreeview/jquery.treeview.edit.js  |   0
 .../plugins/jquerytreeview/jquery.treeview.js       |   0
 .../jquerytreeview/jquery.treeview.sortable.js      |   0
 .../plugins/jquerytreeview/lib/jquery.cookie.js     |   0
 .../jquery/plugins/jquerytreeview/readme.md         |   0
 .../jquery/plugins/jquerytreeview/screenshot.png    | Bin
 .../includes/jquery/plugins/layout/jquery.layout.js |   0
 .../jquery/plugins/layout/jquery.layout.min.js      |   0
 .../jquery/plugins/mobile/images/ajax-loader.gif    | Bin
 .../jquery/plugins/mobile/images/icons-18-black.png | Bin
 .../jquery/plugins/mobile/images/icons-18-white.png | Bin
 .../jquery/plugins/mobile/images/icons-36-black.png | Bin
 .../jquery/plugins/mobile/images/icons-36-white.png | Bin
 .../jquery/plugins/mobile/jquery.mobile-latest.css  |   0
 .../jquery/plugins/mobile/jquery.mobile-latest.js   |   0
 .../plugins/mobile/jquery.mobile-latest.min.css     |   0
 .../plugins/mobile/jquery.mobile-latest.min.js      |   0
 .../jquery/plugins/multiselect/MIT-LICENSE.txt      |   0
 .../plugins/multiselect/css/ui.multiselect.css      |   0
 .../jquery/plugins/multiselect/js/ui.multiselect.js |   0
 .../includes/jquery/plugins/select2/.gitignore      |   0
 .../includes/jquery/plugins/select2/CONTRIBUTING.md |   0
 .../includes/jquery/plugins/select2/LICENSE         |   0
 .../includes/jquery/plugins/select2/README.md       |   0
 .../includes/jquery/plugins/select2/bower.json      |   0
 .../includes/jquery/plugins/select2/component.json  |   0
 .../includes/jquery/plugins/select2/composer.json   |   0
 .../includes/jquery/plugins/select2/package.json    |   0
 .../includes/jquery/plugins/select2/release.sh      |   0
 .../jquery/plugins/select2/select2-bootstrap.css    |   0
 .../jquery/plugins/select2/select2-spinner.gif      | Bin
 .../includes/jquery/plugins/select2/select2.css     |   0
 .../jquery/plugins/select2/select2.jquery.json      |   0
 .../includes/jquery/plugins/select2/select2.js      |   0
 .../includes/jquery/plugins/select2/select2.min.js  |   0
 .../includes/jquery/plugins/select2/select2.png     | Bin
 .../jquery/plugins/select2/select2_locale_ar.js     |   0
 .../jquery/plugins/select2/select2_locale_az.js     |   0
 .../jquery/plugins/select2/select2_locale_bg.js     |   0
 .../jquery/plugins/select2/select2_locale_ca.js     |   0
 .../jquery/plugins/select2/select2_locale_cs.js     |   0
 .../jquery/plugins/select2/select2_locale_da.js     |   0
 .../jquery/plugins/select2/select2_locale_de.js     |   0
 .../jquery/plugins/select2/select2_locale_el.js     |   0
 .../plugins/select2/select2_locale_en.js.template   |   0
 .../jquery/plugins/select2/select2_locale_es.js     |   0
 .../jquery/plugins/select2/select2_locale_et.js     |   0
 .../jquery/plugins/select2/select2_locale_eu.js     |   0
 .../jquery/plugins/select2/select2_locale_fa.js     |   0
 .../jquery/plugins/select2/select2_locale_fi.js     |   0
 .../jquery/plugins/select2/select2_locale_fr.js     |   0
 .../jquery/plugins/select2/select2_locale_gl.js     |   0
 .../jquery/plugins/select2/select2_locale_he.js     |   0
 .../jquery/plugins/select2/select2_locale_hr.js     |   0
 .../jquery/plugins/select2/select2_locale_hu.js     |   0
 .../jquery/plugins/select2/select2_locale_id.js     |   0
 .../jquery/plugins/select2/select2_locale_is.js     |   0
 .../jquery/plugins/select2/select2_locale_it.js     |   0
 .../jquery/plugins/select2/select2_locale_ja.js     |   0
 .../jquery/plugins/select2/select2_locale_ka.js     |   0
 .../jquery/plugins/select2/select2_locale_ko.js     |   0
 .../jquery/plugins/select2/select2_locale_lt.js     |   0
 .../jquery/plugins/select2/select2_locale_lv.js     |   0
 .../jquery/plugins/select2/select2_locale_mk.js     |   0
 .../jquery/plugins/select2/select2_locale_ms.js     |   0
 .../jquery/plugins/select2/select2_locale_nb.js     |   0
 .../jquery/plugins/select2/select2_locale_nl.js     |   0
 .../jquery/plugins/select2/select2_locale_pl.js     |   0
 .../jquery/plugins/select2/select2_locale_pt-BR.js  |   0
 .../jquery/plugins/select2/select2_locale_pt-PT.js  |   0
 .../jquery/plugins/select2/select2_locale_ro.js     |   0
 .../jquery/plugins/select2/select2_locale_rs.js     |   0
 .../jquery/plugins/select2/select2_locale_ru.js     |   0
 .../jquery/plugins/select2/select2_locale_sk.js     |   0
 .../jquery/plugins/select2/select2_locale_sv.js     |   0
 .../jquery/plugins/select2/select2_locale_th.js     |   0
 .../jquery/plugins/select2/select2_locale_tr.js     |   0
 .../jquery/plugins/select2/select2_locale_ug-CN.js  |   0
 .../jquery/plugins/select2/select2_locale_uk.js     |   0
 .../jquery/plugins/select2/select2_locale_vi.js     |   0
 .../jquery/plugins/select2/select2_locale_zh-CN.js  |   0
 .../jquery/plugins/select2/select2_locale_zh-TW.js  |   0
 .../includes/jquery/plugins/select2/select2x2.png   | Bin
 .../includes/jquery/plugins/tablednd/README.txt     |   0
 .../jquery/plugins/tablednd/jquery.tablednd.0.6.js  |   0
 .../plugins/tablednd/jquery.tablednd.0.6.min.js     |   0
 .../timepicker/jquery-ui-timepicker-addon.css       |   0
 .../timepicker/jquery-ui-timepicker-addon.js        |   0
 .../includes/jquery/plugins/tiptip/jquery.tipTip.js |   0
 .../jquery/plugins/tiptip/jquery.tipTip.min.js      |   0
 .../includes/jquery/plugins/tiptip/tipTip.css       |   0
 {public => htdocs}/includes/jsgantt/index.htm       |   0
 {public => htdocs}/includes/jsgantt/jsgantt.css     |   0
 {public => htdocs}/includes/jsgantt/jsgantt.js      |   0
 {public => htdocs}/includes/jsgantt/jsgantt.min.js  |   0
 .../includes/jsgantt/jsgantt_Minutes.html           |   0
 .../includes/jsgantt/jsgantt_exExternalXML.html     |   0
 {public => htdocs}/includes/jsgantt/project.xml     |   0
 {public => htdocs}/includes/jstz/jstz.js            |   0
 {public => htdocs}/includes/jstz/jstz.min.js        |   0
 .../includes/mike42/escpos-php/.gitignore           |   0
 .../includes/mike42/escpos-php/Escpos.php           |   0
 .../includes/mike42/escpos-php/LICENSE.md           |   0
 .../includes/mike42/escpos-php/README.md            |   0
 .../includes/mike42/escpos-php/composer.json        |   0
 .../includes/mike42/escpos-php/composer.lock        |   0
 .../includes/mike42/escpos-php/doc/Makefile         |   0
 .../includes/mike42/escpos-php/doc/escpos.conf      |   0
 .../includes/mike42/escpos-php/example/README.md    |   0
 .../includes/mike42/escpos-php/example/barcode.php  |   0
 .../mike42/escpos-php/example/bit-image.php         |   0
 .../example/character-encodings-with-images.php     |   0
 .../escpos-php/example/character-encodings.php      |   0
 .../mike42/escpos-php/example/character-tables.php  |   0
 .../includes/mike42/escpos-php/example/demo.php     |   0
 .../includes/mike42/escpos-php/example/graphics.php |   0
 .../mike42/escpos-php/example/interface/README.md   |   0
 .../escpos-php/example/interface/ethernet.php       |   0
 .../escpos-php/example/interface/linux-usb.php      |   0
 .../mike42/escpos-php/example/interface/smb.php     |   0
 .../escpos-php/example/interface/windows-lpt.php    |   0
 .../escpos-php/example/interface/windows-usb.php    |   0
 .../mike42/escpos-php/example/print-from-html.php   |   0
 .../mike42/escpos-php/example/print-from-pdf.php    |   0
 .../includes/mike42/escpos-php/example/qr-code.php  |   0
 .../mike42/escpos-php/example/receipt-with-logo.php |   0
 .../resources/character-encoding-test-strings.inc   |   0
 .../escpos-php/example/resources/document.odt       | Bin
 .../escpos-php/example/resources/document.pdf       | Bin
 .../mike42/escpos-php/example/resources/document.z  | Bin
 .../example/resources/escpos-php-small.png          | Bin
 .../escpos-php/example/resources/escpos-php.png     | Bin
 .../mike42/escpos-php/example/resources/tux.png     | Bin
 .../example/specific/29-latvian-star-tup592.php     |   0
 .../specific/32-german-tm-t20-ii-custom-command.php |   0
 .../example/specific/33-spanish-seypos-prp-300.php  |   0
 .../example/specific/39-currency-symbols.php        |   0
 .../specific/44-pound-symbol-star-tsp650.php        |   0
 .../escpos-php/example/specific/50-P-822D-greek.php |   0
 .../example/specific/54-gfx-sidebyside.php          |   0
 .../example/specific/6-arabic-epos-tep-220m.php     |   0
 .../mike42/escpos-php/example/specific/README.md    |   0
 .../mike42/escpos-php/example/text-size.php         |   0
 .../escpos-php/src/AbstractCapabilityProfile.php    |   0
 .../includes/mike42/escpos-php/src/CodePage.php     |   0
 .../escpos-php/src/DefaultCapabilityProfile.php     |   0
 .../mike42/escpos-php/src/DummyPrintConnector.php   |   0
 .../escpos-php/src/EposTepCapabilityProfile.php     |   0
 .../includes/mike42/escpos-php/src/EscposImage.php  |   0
 .../mike42/escpos-php/src/EscposPrintBuffer.php     |   0
 .../mike42/escpos-php/src/FilePrintConnector.php    |   0
 .../mike42/escpos-php/src/ImagePrintBuffer.php      |   0
 .../mike42/escpos-php/src/NetworkPrintConnector.php |   0
 .../escpos-php/src/P822DCapabilityProfile.php       |   0
 .../includes/mike42/escpos-php/src/PrintBuffer.php  |   0
 .../mike42/escpos-php/src/PrintConnector.php        |   0
 .../escpos-php/src/SimpleCapabilityProfile.php      |   0
 .../mike42/escpos-php/src/StarCapabilityProfile.php |   0
 .../mike42/escpos-php/src/WindowsPrintConnector.php |   0
 .../Characters-DefaultCapabilityProfile.ser.gz      | Bin
 .../cache/Characters-SimpleCapabilityProfile.ser.gz | Bin
 .../cache/Characters-StarCapabilityProfile.ser.gz   | Bin
 .../includes/mike42/escpos-php/test/bootstrap.php   |   0
 .../escpos-php/test/integration/ExampleTest.php     |   0
 .../test/integration/resources/output/barcode.bin   | Bin
 .../test/integration/resources/output/bit-image.bin | Bin
 .../resources/output/character-encodings.bin        | Bin
 .../resources/output/character-tables.bin           | Bin
 .../test/integration/resources/output/demo.bin      | Bin
 .../test/integration/resources/output/graphics.bin  | Bin
 .../test/integration/resources/output/interface.bin |   0
 .../resources/output/print-from-pdf.bin.z           | Bin
 .../test/integration/resources/output/qr-code.bin   | Bin
 .../resources/output/receipt-with-logo.bin          | Bin
 .../test/integration/resources/output/text-size.bin | Bin
 .../includes/mike42/escpos-php/test/phpunit.xml     |   0
 .../test/unit/AbstractCapabilityProfileTest.php     |   0
 .../mike42/escpos-php/test/unit/EscposImageTest.php |   0
 .../escpos-php/test/unit/EscposPrintBufferTest.php  |   0
 .../mike42/escpos-php/test/unit/EscposTest.php      |   0
 .../test/unit/WindowsPrintConnectorTest.php         |   0
 .../test/unit/resources/black_transparent.gif       | Bin
 .../test/unit/resources/black_transparent.png       | Bin
 .../escpos-php/test/unit/resources/black_white.bmp  | Bin
 .../escpos-php/test/unit/resources/black_white.gif  | Bin
 .../escpos-php/test/unit/resources/black_white.jpg  | Bin
 .../escpos-php/test/unit/resources/black_white.png  | Bin
 .../escpos-php/test/unit/resources/canvas_black.bmp | Bin
 .../escpos-php/test/unit/resources/canvas_black.gif | Bin
 .../escpos-php/test/unit/resources/canvas_black.jpg | Bin
 .../escpos-php/test/unit/resources/canvas_black.png | Bin
 .../escpos-php/test/unit/resources/canvas_white.bmp | Bin
 .../escpos-php/test/unit/resources/canvas_white.gif | Bin
 .../escpos-php/test/unit/resources/canvas_white.jpg | Bin
 .../escpos-php/test/unit/resources/canvas_white.png | Bin
 .../mike42/escpos-php/test/unit/resources/demo.php  |   0
 .../mike42/escpos-php/test/unit/resources/doc.pdf   | Bin
 .../mobiledetect/mobiledetectlib/.gitignore         |   0
 .../includes/mobiledetect/mobiledetectlib/.php_cs   |   0
 .../mobiledetect/mobiledetectlib/.travis.yml        |   0
 .../mobiledetect/mobiledetectlib/LICENSE.txt        |   0
 .../mobiledetect/mobiledetectlib/Mobile_Detect.json |   0
 .../mobiledetect/mobiledetectlib/Mobile_Detect.php  |   0
 .../includes/mobiledetect/mobiledetectlib/README.md |   0
 .../mobiledetect/mobiledetectlib/composer.json      |   0
 .../mobiledetect/mobiledetectlib/examples/demo.php  |   0
 .../mobiledetectlib/examples/session_example.php    |   0
 .../mobiledetect/mobiledetectlib/examples/test.php  |   0
 .../mobiledetectlib/export/exportToJSON.php         |   0
 .../namespaced/Detection/MobileDetect.php           |   0
 .../mobiledetectlib/tests/BasicsTest.php            |   0
 .../mobiledetectlib/tests/UA_List.inc.php           |   0
 .../mobiledetectlib/tests/UA_List.pending.txt       |   0
 .../mobiledetectlib/tests/UserAgentTest.php         |   0
 .../mobiledetectlib/tests/VendorsTest_tmp.php       |   0
 .../mobiledetectlib/tests/bootstrap.php             |   0
 .../mobiledetect/mobiledetectlib/tests/phpunit.xml  |   0
 .../tests/providers/vendors/Acer.php                |   0
 .../tests/providers/vendors/Alcatel.php             |   0
 .../tests/providers/vendors/Allview.php             |   0
 .../tests/providers/vendors/Amazon.php              |   0
 .../tests/providers/vendors/Apple.php               |   0
 .../tests/providers/vendors/Archos.php              |   0
 .../tests/providers/vendors/Asus.php                |   0
 .../tests/providers/vendors/Blackberry.php          |   0
 .../tests/providers/vendors/Dell.php                |   0
 .../tests/providers/vendors/Google.php              |   0
 .../mobiledetectlib/tests/providers/vendors/HP.php  |   0
 .../mobiledetectlib/tests/providers/vendors/HTC.php |   0
 .../tests/providers/vendors/Huawei.php              |   0
 .../mobiledetectlib/tests/providers/vendors/LG.php  |   0
 .../tests/providers/vendors/Lava.php                |   0
 .../tests/providers/vendors/Leader.php              |   0
 .../tests/providers/vendors/Lenovo.php              |   0
 .../mobiledetectlib/tests/providers/vendors/Mi.php  |   0
 .../tests/providers/vendors/Microsoft.php           |   0
 .../tests/providers/vendors/Motorola.php            |   0
 .../tests/providers/vendors/Nokia.php               |   0
 .../tests/providers/vendors/Onda.php                |   0
 .../tests/providers/vendors/Others.php              |   0
 .../tests/providers/vendors/Prestigio.php           |   0
 .../tests/providers/vendors/Samsung.php             |   0
 .../tests/providers/vendors/Sony.php                |   0
 .../tests/providers/vendors/SpecialCases.php        |   0
 .../tests/providers/vendors/Vodafone.php            |   0
 .../mobiledetectlib/tests/providers/vendors/ZTE.php |   0
 .../mobiledetect/mobiledetectlib/tests/ualist.json  |   0
 .../includes/nusoap/lib/Mail/mime.php               |   0
 .../includes/nusoap/lib/Mail/mimePart.php           |   0
 {public => htdocs}/includes/nusoap/lib/changelog    |   0
 .../includes/nusoap/lib/class.nusoap_base.php       |   0
 .../includes/nusoap/lib/class.soap_fault.php        |   0
 .../includes/nusoap/lib/class.soap_parser.php       |   0
 .../includes/nusoap/lib/class.soap_server.php       |   0
 .../nusoap/lib/class.soap_transport_http.php        |   0
 .../includes/nusoap/lib/class.soap_val.php          |   0
 .../includes/nusoap/lib/class.soapclient.php        |   0
 .../includes/nusoap/lib/class.wsdl.php              |   0
 .../includes/nusoap/lib/class.wsdlcache.php         |   0
 .../includes/nusoap/lib/class.xmlschema.php         |   0
 {public => htdocs}/includes/nusoap/lib/nusoap.php   |   0
 .../includes/nusoap/lib/nusoapmime.php              |   0
 {public => htdocs}/includes/odtphp/Segment.php      |   0
 .../includes/odtphp/SegmentIterator.php             |   0
 {public => htdocs}/includes/odtphp/odf.php          |   0
 .../includes/odtphp/zip/PclZipProxy.php             |   0
 .../includes/odtphp/zip/PhpZipProxy.php             |   0
 .../includes/odtphp/zip/ZipInterface.php            |   0
 .../includes/odtphp/zip/pclzip/gnu-lgpl.txt         |   0
 .../includes/odtphp/zip/pclzip/pclzip.lib.php       |   0
 .../includes/odtphp/zip/pclzip/readme.txt           |   0
 {public => htdocs}/includes/php-iban/.gitignore     |   0
 {public => htdocs}/includes/php-iban/LICENSE        |   0
 .../includes/php-iban/mistranscriptions.txt         |   0
 {public => htdocs}/includes/php-iban/oophp-iban.php |   0
 {public => htdocs}/includes/php-iban/php-iban.php   |   0
 {public => htdocs}/includes/php-iban/registry.txt   |   0
 .../includes/phpoffice/phpexcel/.gitattributes      |   0
 .../includes/phpoffice/phpexcel/.gitignore          |   0
 .../includes/phpoffice/phpexcel/.travis.yml         |   0
 .../phpoffice/phpexcel/Classes/PHPExcel.php         |   0
 .../phpexcel/Classes/PHPExcel/Autoloader.php        |   0
 .../Classes/PHPExcel/CachedObjectStorage/APC.php    |   0
 .../PHPExcel/CachedObjectStorage/CacheBase.php      |   0
 .../PHPExcel/CachedObjectStorage/DiscISAM.php       |   0
 .../Classes/PHPExcel/CachedObjectStorage/ICache.php |   0
 .../PHPExcel/CachedObjectStorage/Igbinary.php       |   0
 .../PHPExcel/CachedObjectStorage/Memcache.php       |   0
 .../Classes/PHPExcel/CachedObjectStorage/Memory.php |   0
 .../PHPExcel/CachedObjectStorage/MemoryGZip.php     |   0
 .../CachedObjectStorage/MemorySerialized.php        |   0
 .../PHPExcel/CachedObjectStorage/PHPTemp.php        |   0
 .../Classes/PHPExcel/CachedObjectStorage/SQLite.php |   0
 .../PHPExcel/CachedObjectStorage/SQLite3.php        |   0
 .../PHPExcel/CachedObjectStorage/Wincache.php       |   0
 .../Classes/PHPExcel/CachedObjectStorageFactory.php |   0
 .../PHPExcel/CalcEngine/CyclicReferenceStack.php    |   0
 .../phpexcel/Classes/PHPExcel/CalcEngine/Logger.php |   0
 .../phpexcel/Classes/PHPExcel/Calculation.php       |   0
 .../Classes/PHPExcel/Calculation/Database.php       |   0
 .../Classes/PHPExcel/Calculation/DateTime.php       |   0
 .../Classes/PHPExcel/Calculation/Engineering.php    |   0
 .../Classes/PHPExcel/Calculation/Exception.php      |   0
 .../PHPExcel/Calculation/ExceptionHandler.php       |   0
 .../Classes/PHPExcel/Calculation/Financial.php      |   0
 .../Classes/PHPExcel/Calculation/FormulaParser.php  |   0
 .../Classes/PHPExcel/Calculation/FormulaToken.php   |   0
 .../Classes/PHPExcel/Calculation/Function.php       |   0
 .../Classes/PHPExcel/Calculation/Functions.php      |   0
 .../Classes/PHPExcel/Calculation/Logical.php        |   0
 .../Classes/PHPExcel/Calculation/LookupRef.php      |   0
 .../Classes/PHPExcel/Calculation/MathTrig.php       |   0
 .../Classes/PHPExcel/Calculation/Statistical.php    |   0
 .../Classes/PHPExcel/Calculation/TextData.php       |   0
 .../Classes/PHPExcel/Calculation/Token/Stack.php    |   0
 .../Classes/PHPExcel/Calculation/functionlist.txt   |   0
 .../phpoffice/phpexcel/Classes/PHPExcel/Cell.php    |   0
 .../Classes/PHPExcel/Cell/AdvancedValueBinder.php   |   0
 .../phpexcel/Classes/PHPExcel/Cell/DataType.php     |   0
 .../Classes/PHPExcel/Cell/DataValidation.php        |   0
 .../Classes/PHPExcel/Cell/DefaultValueBinder.php    |   0
 .../phpexcel/Classes/PHPExcel/Cell/Hyperlink.php    |   0
 .../phpexcel/Classes/PHPExcel/Cell/IValueBinder.php |   0
 .../phpoffice/phpexcel/Classes/PHPExcel/Chart.php   |   0
 .../phpexcel/Classes/PHPExcel/Chart/Axis.php        |   0
 .../phpexcel/Classes/PHPExcel/Chart/DataSeries.php  |   0
 .../Classes/PHPExcel/Chart/DataSeriesValues.php     |   0
 .../phpexcel/Classes/PHPExcel/Chart/Exception.php   |   0
 .../phpexcel/Classes/PHPExcel/Chart/GridLines.php   |   0
 .../phpexcel/Classes/PHPExcel/Chart/Layout.php      |   0
 .../phpexcel/Classes/PHPExcel/Chart/Legend.php      |   0
 .../phpexcel/Classes/PHPExcel/Chart/PlotArea.php    |   0
 .../phpexcel/Classes/PHPExcel/Chart/Properties.php  |   0
 .../Chart/Renderer/PHP Charting Libraries.txt       |   0
 .../Classes/PHPExcel/Chart/Renderer/jpgraph.php     |   0
 .../phpexcel/Classes/PHPExcel/Chart/Title.php       |   0
 .../phpoffice/phpexcel/Classes/PHPExcel/Comment.php |   0
 .../Classes/PHPExcel/DocumentProperties.php         |   0
 .../phpexcel/Classes/PHPExcel/DocumentSecurity.php  |   0
 .../phpexcel/Classes/PHPExcel/Exception.php         |   0
 .../phpexcel/Classes/PHPExcel/HashTable.php         |   0
 .../phpexcel/Classes/PHPExcel/Helper/HTML.php       |   0
 .../phpexcel/Classes/PHPExcel/IComparable.php       |   0
 .../phpexcel/Classes/PHPExcel/IOFactory.php         |   0
 .../phpexcel/Classes/PHPExcel/NamedRange.php        |   0
 .../phpexcel/Classes/PHPExcel/Reader/Abstract.php   |   0
 .../phpexcel/Classes/PHPExcel/Reader/CSV.php        |   0
 .../Classes/PHPExcel/Reader/DefaultReadFilter.php   |   0
 .../Classes/PHPExcel/Reader/Excel2003XML.php        |   0
 .../phpexcel/Classes/PHPExcel/Reader/Excel2007.php  |   0
 .../Classes/PHPExcel/Reader/Excel2007/Chart.php     |   0
 .../Classes/PHPExcel/Reader/Excel2007/Theme.php     |   0
 .../phpexcel/Classes/PHPExcel/Reader/Excel5.php     |   0
 .../Classes/PHPExcel/Reader/Excel5/Escher.php       |   0
 .../phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php |   0
 .../phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php |   0
 .../phpexcel/Classes/PHPExcel/Reader/Exception.php  |   0
 .../phpexcel/Classes/PHPExcel/Reader/Gnumeric.php   |   0
 .../phpexcel/Classes/PHPExcel/Reader/HTML.php       |   0
 .../Classes/PHPExcel/Reader/IReadFilter.php         |   0
 .../phpexcel/Classes/PHPExcel/Reader/IReader.php    |   0
 .../phpexcel/Classes/PHPExcel/Reader/OOCalc.php     |   0
 .../phpexcel/Classes/PHPExcel/Reader/SYLK.php       |   0
 .../phpexcel/Classes/PHPExcel/ReferenceHelper.php   |   0
 .../phpexcel/Classes/PHPExcel/RichText.php          |   0
 .../Classes/PHPExcel/RichText/ITextElement.php      |   0
 .../phpexcel/Classes/PHPExcel/RichText/Run.php      |   0
 .../Classes/PHPExcel/RichText/TextElement.php       |   0
 .../phpexcel/Classes/PHPExcel/Settings.php          |   0
 .../phpexcel/Classes/PHPExcel/Shared/CodePage.php   |   0
 .../phpexcel/Classes/PHPExcel/Shared/Date.php       |   0
 .../phpexcel/Classes/PHPExcel/Shared/Drawing.php    |   0
 .../phpexcel/Classes/PHPExcel/Shared/Escher.php     |   0
 .../Classes/PHPExcel/Shared/Escher/DgContainer.php  |   0
 .../Shared/Escher/DgContainer/SpgrContainer.php     |   0
 .../DgContainer/SpgrContainer/SpContainer.php       |   0
 .../Classes/PHPExcel/Shared/Escher/DggContainer.php |   0
 .../Shared/Escher/DggContainer/BstoreContainer.php  |   0
 .../Escher/DggContainer/BstoreContainer/BSE.php     |   0
 .../DggContainer/BstoreContainer/BSE/Blip.php       |   0
 .../phpexcel/Classes/PHPExcel/Shared/Excel5.php     |   0
 .../phpexcel/Classes/PHPExcel/Shared/File.php       |   0
 .../phpexcel/Classes/PHPExcel/Shared/Font.php       |   0
 .../Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT      |   0
 .../PHPExcel/Shared/JAMA/CholeskyDecomposition.php  |   0
 .../Shared/JAMA/EigenvalueDecomposition.php         |   0
 .../PHPExcel/Shared/JAMA/LUDecomposition.php        |   0
 .../Classes/PHPExcel/Shared/JAMA/Matrix.php         |   0
 .../PHPExcel/Shared/JAMA/QRDecomposition.php        |   0
 .../Shared/JAMA/SingularValueDecomposition.php      |   0
 .../Classes/PHPExcel/Shared/JAMA/utils/Error.php    |   0
 .../Classes/PHPExcel/Shared/JAMA/utils/Maths.php    |   0
 .../phpexcel/Classes/PHPExcel/Shared/OLE.php        |   0
 .../PHPExcel/Shared/OLE/ChainedBlockStream.php      |   0
 .../phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php    |   0
 .../Classes/PHPExcel/Shared/OLE/PPS/File.php        |   0
 .../Classes/PHPExcel/Shared/OLE/PPS/Root.php        |   0
 .../phpexcel/Classes/PHPExcel/Shared/OLERead.php    |   0
 .../Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt     |   0
 .../Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php   |   0
 .../Classes/PHPExcel/Shared/PCLZip/readme.txt       |   0
 .../Classes/PHPExcel/Shared/PasswordHasher.php      |   0
 .../phpexcel/Classes/PHPExcel/Shared/String.php     |   0
 .../phpexcel/Classes/PHPExcel/Shared/TimeZone.php   |   0
 .../phpexcel/Classes/PHPExcel/Shared/XMLWriter.php  |   0
 .../phpexcel/Classes/PHPExcel/Shared/ZipArchive.php |   0
 .../Classes/PHPExcel/Shared/ZipStreamWrapper.php    |   0
 .../Classes/PHPExcel/Shared/trend/bestFitClass.php  |   0
 .../Shared/trend/exponentialBestFitClass.php        |   0
 .../PHPExcel/Shared/trend/linearBestFitClass.php    |   0
 .../Shared/trend/logarithmicBestFitClass.php        |   0
 .../Shared/trend/polynomialBestFitClass.php         |   0
 .../PHPExcel/Shared/trend/powerBestFitClass.php     |   0
 .../Classes/PHPExcel/Shared/trend/trendClass.php    |   0
 .../phpoffice/phpexcel/Classes/PHPExcel/Style.php   |   0
 .../phpexcel/Classes/PHPExcel/Style/Alignment.php   |   0
 .../phpexcel/Classes/PHPExcel/Style/Border.php      |   0
 .../phpexcel/Classes/PHPExcel/Style/Borders.php     |   0
 .../phpexcel/Classes/PHPExcel/Style/Color.php       |   0
 .../phpexcel/Classes/PHPExcel/Style/Conditional.php |   0
 .../phpexcel/Classes/PHPExcel/Style/Fill.php        |   0
 .../phpexcel/Classes/PHPExcel/Style/Font.php        |   0
 .../Classes/PHPExcel/Style/NumberFormat.php         |   0
 .../phpexcel/Classes/PHPExcel/Style/Protection.php  |   0
 .../phpexcel/Classes/PHPExcel/Style/Supervisor.php  |   0
 .../phpexcel/Classes/PHPExcel/Worksheet.php         |   0
 .../Classes/PHPExcel/Worksheet/AutoFilter.php       |   0
 .../PHPExcel/Worksheet/AutoFilter/Column.php        |   0
 .../PHPExcel/Worksheet/AutoFilter/Column/Rule.php   |   0
 .../Classes/PHPExcel/Worksheet/BaseDrawing.php      |   0
 .../Classes/PHPExcel/Worksheet/CellIterator.php     |   0
 .../phpexcel/Classes/PHPExcel/Worksheet/Column.php  |   0
 .../PHPExcel/Worksheet/ColumnCellIterator.php       |   0
 .../Classes/PHPExcel/Worksheet/ColumnDimension.php  |   0
 .../Classes/PHPExcel/Worksheet/ColumnIterator.php   |   0
 .../phpexcel/Classes/PHPExcel/Worksheet/Drawing.php |   0
 .../Classes/PHPExcel/Worksheet/Drawing/Shadow.php   |   0
 .../Classes/PHPExcel/Worksheet/HeaderFooter.php     |   0
 .../PHPExcel/Worksheet/HeaderFooterDrawing.php      |   0
 .../Classes/PHPExcel/Worksheet/MemoryDrawing.php    |   0
 .../Classes/PHPExcel/Worksheet/PageMargins.php      |   0
 .../Classes/PHPExcel/Worksheet/PageSetup.php        |   0
 .../Classes/PHPExcel/Worksheet/Protection.php       |   0
 .../phpexcel/Classes/PHPExcel/Worksheet/Row.php     |   0
 .../Classes/PHPExcel/Worksheet/RowCellIterator.php  |   0
 .../Classes/PHPExcel/Worksheet/RowDimension.php     |   0
 .../Classes/PHPExcel/Worksheet/RowIterator.php      |   0
 .../Classes/PHPExcel/Worksheet/SheetView.php        |   0
 .../phpexcel/Classes/PHPExcel/WorksheetIterator.php |   0
 .../phpexcel/Classes/PHPExcel/Writer/Abstract.php   |   0
 .../phpexcel/Classes/PHPExcel/Writer/CSV.php        |   0
 .../phpexcel/Classes/PHPExcel/Writer/Excel2007.php  |   0
 .../Classes/PHPExcel/Writer/Excel2007/Chart.php     |   0
 .../Classes/PHPExcel/Writer/Excel2007/Comments.php  |   0
 .../PHPExcel/Writer/Excel2007/ContentTypes.php      |   0
 .../Classes/PHPExcel/Writer/Excel2007/DocProps.php  |   0
 .../Classes/PHPExcel/Writer/Excel2007/Drawing.php   |   0
 .../Classes/PHPExcel/Writer/Excel2007/Rels.php      |   0
 .../PHPExcel/Writer/Excel2007/RelsRibbon.php        |   0
 .../Classes/PHPExcel/Writer/Excel2007/RelsVBA.php   |   0
 .../PHPExcel/Writer/Excel2007/StringTable.php       |   0
 .../Classes/PHPExcel/Writer/Excel2007/Style.php     |   0
 .../Classes/PHPExcel/Writer/Excel2007/Theme.php     |   0
 .../Classes/PHPExcel/Writer/Excel2007/Workbook.php  |   0
 .../Classes/PHPExcel/Writer/Excel2007/Worksheet.php |   0
 .../PHPExcel/Writer/Excel2007/WriterPart.php        |   0
 .../phpexcel/Classes/PHPExcel/Writer/Excel5.php     |   0
 .../Classes/PHPExcel/Writer/Excel5/BIFFwriter.php   |   0
 .../Classes/PHPExcel/Writer/Excel5/Escher.php       |   0
 .../Classes/PHPExcel/Writer/Excel5/Font.php         |   0
 .../Classes/PHPExcel/Writer/Excel5/Parser.php       |   0
 .../Classes/PHPExcel/Writer/Excel5/Workbook.php     |   0
 .../Classes/PHPExcel/Writer/Excel5/Worksheet.php    |   0
 .../phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php  |   0
 .../phpexcel/Classes/PHPExcel/Writer/Exception.php  |   0
 .../phpexcel/Classes/PHPExcel/Writer/HTML.php       |   0
 .../phpexcel/Classes/PHPExcel/Writer/IWriter.php    |   0
 .../Classes/PHPExcel/Writer/OpenDocument.php        |   0
 .../PHPExcel/Writer/OpenDocument/Cell/Comment.php   |   0
 .../PHPExcel/Writer/OpenDocument/Content.php        |   0
 .../Classes/PHPExcel/Writer/OpenDocument/Meta.php   |   0
 .../PHPExcel/Writer/OpenDocument/MetaInf.php        |   0
 .../PHPExcel/Writer/OpenDocument/Mimetype.php       |   0
 .../PHPExcel/Writer/OpenDocument/Settings.php       |   0
 .../Classes/PHPExcel/Writer/OpenDocument/Styles.php |   0
 .../PHPExcel/Writer/OpenDocument/Thumbnails.php     |   0
 .../PHPExcel/Writer/OpenDocument/WriterPart.php     |   0
 .../phpexcel/Classes/PHPExcel/Writer/PDF.php        |   0
 .../phpexcel/Classes/PHPExcel/Writer/PDF/Core.php   |   0
 .../phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php |   0
 .../phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php   |   0
 .../phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php  |   0
 .../phpexcel/Classes/PHPExcel/locale/bg/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/cs/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/cs/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/da/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/da/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/de/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/de/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/en/uk/config   |   0
 .../phpexcel/Classes/PHPExcel/locale/es/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/es/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/fi/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/fi/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/fr/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/fr/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/hu/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/hu/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/it/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/it/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/nl/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/nl/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/no/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/no/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/pl/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/pl/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/pt/br/config   |   0
 .../Classes/PHPExcel/locale/pt/br/functions         |   0
 .../phpexcel/Classes/PHPExcel/locale/pt/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/pt/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/ru/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/ru/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/sv/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/sv/functions   |   0
 .../phpexcel/Classes/PHPExcel/locale/tr/config      |   0
 .../phpexcel/Classes/PHPExcel/locale/tr/functions   |   0
 .../includes/phpoffice/phpexcel/changelog.txt       |   0
 .../includes/phpoffice/phpexcel/composer.json       |   0
 .../includes/phpoffice/phpexcel/install.txt         |   0
 .../includes/phpoffice/phpexcel/license.md          |   0
 {public => htdocs}/includes/printipp/BasicIPP.php   |   0
 .../includes/printipp/CupsPrintIPP.php              |   0
 .../includes/printipp/ExtendedPrintIPP.php          |   0
 {public => htdocs}/includes/printipp/PrintIPP.php   |   0
 {public => htdocs}/includes/printipp/http_class.php |   0
 .../restler/framework/Luracast/Restler/ApcCache.php |   0
 .../framework/Luracast/Restler/AutoLoader.php       |   0
 .../framework/Luracast/Restler/CommentParser.php    |   0
 .../restler/framework/Luracast/Restler/Compose.php  |   0
 .../Luracast/Restler/Data/ApiMethodInfo.php         |   0
 .../restler/framework/Luracast/Restler/Data/Arr.php |   0
 .../framework/Luracast/Restler/Data/Invalid.php     |   0
 .../framework/Luracast/Restler/Data/Object.php      |   0
 .../framework/Luracast/Restler/Data/Text.php        |   0
 .../Luracast/Restler/Data/ValidationInfo.php        |   0
 .../framework/Luracast/Restler/Data/Validator.php   |   0
 .../framework/Luracast/Restler/Data/ValueObject.php |   0
 .../framework/Luracast/Restler/Data/iValidate.php   |   0
 .../Luracast/Restler/Data/iValueObject.php          |   0
 .../restler/framework/Luracast/Restler/Defaults.php |   0
 .../framework/Luracast/Restler/EventDispatcher.php  |   0
 .../restler/framework/Luracast/Restler/Explorer.php |   0
 .../framework/Luracast/Restler/ExplorerInfo.php     |   0
 .../framework/Luracast/Restler/Filter/RateLimit.php |   0
 .../restler/framework/Luracast/Restler/Flash.php    |   0
 .../framework/Luracast/Restler/Format/AmfFormat.php |   0
 .../framework/Luracast/Restler/Format/CsvFormat.php |   0
 .../Luracast/Restler/Format/DependentFormat.php     |   0
 .../Restler/Format/DependentMultiFormat.php         |   0
 .../framework/Luracast/Restler/Format/Format.php    |   0
 .../Luracast/Restler/Format/HtmlFormat.php          |   0
 .../framework/Luracast/Restler/Format/JsFormat.php  |   0
 .../Luracast/Restler/Format/JsonFormat.php          |   0
 .../Luracast/Restler/Format/MultiFormat.php         |   0
 .../Luracast/Restler/Format/PlistFormat.php         |   0
 .../framework/Luracast/Restler/Format/TsvFormat.php |   0
 .../Luracast/Restler/Format/UploadFormat.php        |   0
 .../Luracast/Restler/Format/UrlEncodedFormat.php    |   0
 .../framework/Luracast/Restler/Format/XmlFormat.php |   0
 .../Luracast/Restler/Format/YamlFormat.php          |   0
 .../Luracast/Restler/Format/iDecodeStream.php       |   0
 .../framework/Luracast/Restler/Format/iFormat.php   |   0
 .../Luracast/Restler/HumanReadableCache.php         |   0
 .../Luracast/Restler/InvalidAuthCredentials.php     |   0
 .../framework/Luracast/Restler/MemcacheCache.php    |   0
 .../framework/Luracast/Restler/PassThrough.php      |   0
 .../restler/framework/Luracast/Restler/README.md    |   0
 .../restler/framework/Luracast/Restler/Redirect.php |   0
 .../framework/Luracast/Restler/Resources.php        |   0
 .../framework/Luracast/Restler/RestException.php    |   0
 .../restler/framework/Luracast/Restler/Restler.php  |   0
 .../restler/framework/Luracast/Restler/Routes.php   |   0
 .../restler/framework/Luracast/Restler/Scope.php    |   0
 .../restler/framework/Luracast/Restler/UI/Emmet.php |   0
 .../framework/Luracast/Restler/UI/FormStyles.php    |   0
 .../restler/framework/Luracast/Restler/UI/Forms.php |   0
 .../restler/framework/Luracast/Restler/UI/Nav.php   |   0
 .../restler/framework/Luracast/Restler/UI/Tags.php  |   0
 .../restler/framework/Luracast/Restler/User.php     |   0
 .../restler/framework/Luracast/Restler/Util.php     |   0
 .../Restler/compatibility/iAuthenticate.php         |   0
 .../Luracast/Restler/compatibility/restler1.php     |   0
 .../Luracast/Restler/compatibility/restler2.php     |   0
 .../framework/Luracast/Restler/composer.json        |   0
 .../Luracast/Restler/explorer/css/reset.css         |   0
 .../Luracast/Restler/explorer/css/screen.css        |   0
 .../Restler/explorer/images/explorer_icons.png      | Bin
 .../Luracast/Restler/explorer/images/logo_small.png | Bin
 .../Luracast/Restler/explorer/images/throbber.gif   | Bin
 .../framework/Luracast/Restler/explorer/index.html  |   0
 .../Luracast/Restler/explorer/lib/backbone-min.js   |   0
 .../Restler/explorer/lib/handlebars-1.0.0.js        |   0
 .../Restler/explorer/lib/highlight.7.3.pack.js      |   0
 .../Restler/explorer/lib/jquery-1.8.0.min.js        |   0
 .../Restler/explorer/lib/jquery.ba-bbq.min.js       |   0
 .../Restler/explorer/lib/jquery.slideto.min.js      |   0
 .../Restler/explorer/lib/jquery.wiggle.min.js       |   0
 .../Luracast/Restler/explorer/lib/shred.bundle.js   |   0
 .../Luracast/Restler/explorer/lib/shred/content.js  |   0
 .../Luracast/Restler/explorer/lib/swagger-oauth.js  |   0
 .../Luracast/Restler/explorer/lib/swagger.js        |   0
 .../Luracast/Restler/explorer/lib/underscore-min.js |   0
 .../framework/Luracast/Restler/explorer/o2c.html    |   0
 .../Luracast/Restler/explorer/swagger-ui.js         |   0
 .../Luracast/Restler/explorer/swagger-ui.min.js     |   0
 .../framework/Luracast/Restler/iAuthenticate.php    |   0
 .../restler/framework/Luracast/Restler/iCache.php   |   0
 .../restler/framework/Luracast/Restler/iCompose.php |   0
 .../restler/framework/Luracast/Restler/iFilter.php  |   0
 .../framework/Luracast/Restler/iIdentifyUser.php    |   0
 .../Luracast/Restler/iProvideMultiVersionApi.php    |   0
 .../Luracast/Restler/iUseAuthentication.php         |   0
 .../framework/Luracast/Restler/views/debug.css      |   0
 .../framework/Luracast/Restler/views/debug.php      |   0
 .../includes/swiftmailer/lib/classes/Swift.php      |   0
 .../swiftmailer/lib/classes/Swift/Attachment.php    |   0
 .../ByteStream/AbstractFilterableInputStream.php    |   0
 .../classes/Swift/ByteStream/ArrayByteStream.php    |   0
 .../lib/classes/Swift/ByteStream/FileByteStream.php |   0
 .../Swift/ByteStream/TemporaryFileByteStream.php    |   0
 .../lib/classes/Swift/CharacterReader.php           |   0
 .../CharacterReader/GenericFixedWidthReader.php     |   0
 .../classes/Swift/CharacterReader/UsAsciiReader.php |   0
 .../classes/Swift/CharacterReader/Utf8Reader.php    |   0
 .../lib/classes/Swift/CharacterReaderFactory.php    |   0
 .../SimpleCharacterReaderFactory.php                |   0
 .../lib/classes/Swift/CharacterStream.php           |   0
 .../Swift/CharacterStream/ArrayCharacterStream.php  |   0
 .../Swift/CharacterStream/NgCharacterStream.php     |   0
 .../lib/classes/Swift/ConfigurableSpool.php         |   0
 .../lib/classes/Swift/DependencyContainer.php       |   0
 .../lib/classes/Swift/DependencyException.php       |   0
 .../swiftmailer/lib/classes/Swift/EmbeddedFile.php  |   0
 .../swiftmailer/lib/classes/Swift/Encoder.php       |   0
 .../lib/classes/Swift/Encoder/Base64Encoder.php     |   0
 .../lib/classes/Swift/Encoder/QpEncoder.php         |   0
 .../lib/classes/Swift/Encoder/Rfc2231Encoder.php    |   0
 .../swiftmailer/lib/classes/Swift/Encoding.php      |   0
 .../lib/classes/Swift/Events/CommandEvent.php       |   0
 .../lib/classes/Swift/Events/CommandListener.php    |   0
 .../swiftmailer/lib/classes/Swift/Events/Event.php  |   0
 .../lib/classes/Swift/Events/EventDispatcher.php    |   0
 .../lib/classes/Swift/Events/EventListener.php      |   0
 .../lib/classes/Swift/Events/EventObject.php        |   0
 .../lib/classes/Swift/Events/ResponseEvent.php      |   0
 .../lib/classes/Swift/Events/ResponseListener.php   |   0
 .../lib/classes/Swift/Events/SendEvent.php          |   0
 .../lib/classes/Swift/Events/SendListener.php       |   0
 .../classes/Swift/Events/SimpleEventDispatcher.php  |   0
 .../classes/Swift/Events/TransportChangeEvent.php   |   0
 .../Swift/Events/TransportChangeListener.php        |   0
 .../Swift/Events/TransportExceptionEvent.php        |   0
 .../Swift/Events/TransportExceptionListener.php     |   0
 .../lib/classes/Swift/FailoverTransport.php         |   0
 .../swiftmailer/lib/classes/Swift/FileSpool.php     |   0
 .../swiftmailer/lib/classes/Swift/FileStream.php    |   0
 .../swiftmailer/lib/classes/Swift/Filterable.php    |   0
 .../swiftmailer/lib/classes/Swift/Image.php         |   0
 .../lib/classes/Swift/InputByteStream.php           |   0
 .../swiftmailer/lib/classes/Swift/IoException.php   |   0
 .../swiftmailer/lib/classes/Swift/KeyCache.php      |   0
 .../lib/classes/Swift/KeyCache/ArrayKeyCache.php    |   0
 .../lib/classes/Swift/KeyCache/DiskKeyCache.php     |   0
 .../classes/Swift/KeyCache/KeyCacheInputStream.php  |   0
 .../lib/classes/Swift/KeyCache/NullKeyCache.php     |   0
 .../Swift/KeyCache/SimpleKeyCacheInputStream.php    |   0
 .../lib/classes/Swift/LoadBalancedTransport.php     |   0
 .../swiftmailer/lib/classes/Swift/MailTransport.php |   0
 .../swiftmailer/lib/classes/Swift/Mailer.php        |   0
 .../classes/Swift/Mailer/ArrayRecipientIterator.php |   0
 .../lib/classes/Swift/Mailer/RecipientIterator.php  |   0
 .../swiftmailer/lib/classes/Swift/MemorySpool.php   |   0
 .../swiftmailer/lib/classes/Swift/Message.php       |   0
 .../lib/classes/Swift/Mime/Attachment.php           |   0
 .../lib/classes/Swift/Mime/CharsetObserver.php      |   0
 .../lib/classes/Swift/Mime/ContentEncoder.php       |   0
 .../Mime/ContentEncoder/Base64ContentEncoder.php    |   0
 .../Mime/ContentEncoder/NativeQpContentEncoder.php  |   0
 .../Mime/ContentEncoder/PlainContentEncoder.php     |   0
 .../Swift/Mime/ContentEncoder/QpContentEncoder.php  |   0
 .../Mime/ContentEncoder/QpContentEncoderProxy.php   |   0
 .../Swift/Mime/ContentEncoder/RawContentEncoder.php |   0
 .../lib/classes/Swift/Mime/EmbeddedFile.php         |   0
 .../lib/classes/Swift/Mime/EncodingObserver.php     |   0
 .../swiftmailer/lib/classes/Swift/Mime/Grammar.php  |   0
 .../swiftmailer/lib/classes/Swift/Mime/Header.php   |   0
 .../lib/classes/Swift/Mime/HeaderEncoder.php        |   0
 .../Mime/HeaderEncoder/Base64HeaderEncoder.php      |   0
 .../Swift/Mime/HeaderEncoder/QpHeaderEncoder.php    |   0
 .../lib/classes/Swift/Mime/HeaderFactory.php        |   0
 .../lib/classes/Swift/Mime/HeaderSet.php            |   0
 .../classes/Swift/Mime/Headers/AbstractHeader.php   |   0
 .../lib/classes/Swift/Mime/Headers/DateHeader.php   |   0
 .../Swift/Mime/Headers/IdentificationHeader.php     |   0
 .../classes/Swift/Mime/Headers/MailboxHeader.php    |   0
 .../classes/Swift/Mime/Headers/OpenDKIMHeader.php   |   0
 .../Swift/Mime/Headers/ParameterizedHeader.php      |   0
 .../lib/classes/Swift/Mime/Headers/PathHeader.php   |   0
 .../Swift/Mime/Headers/UnstructuredHeader.php       |   0
 .../swiftmailer/lib/classes/Swift/Mime/Message.php  |   0
 .../lib/classes/Swift/Mime/MimeEntity.php           |   0
 .../swiftmailer/lib/classes/Swift/Mime/MimePart.php |   0
 .../lib/classes/Swift/Mime/ParameterizedHeader.php  |   0
 .../lib/classes/Swift/Mime/SimpleHeaderFactory.php  |   0
 .../lib/classes/Swift/Mime/SimpleHeaderSet.php      |   0
 .../lib/classes/Swift/Mime/SimpleMessage.php        |   0
 .../lib/classes/Swift/Mime/SimpleMimeEntity.php     |   0
 .../swiftmailer/lib/classes/Swift/MimePart.php      |   0
 .../swiftmailer/lib/classes/Swift/NullTransport.php |   0
 .../lib/classes/Swift/OutputByteStream.php          |   0
 .../lib/classes/Swift/Plugins/AntiFloodPlugin.php   |   0
 .../Swift/Plugins/BandwidthMonitorPlugin.php        |   0
 .../Swift/Plugins/Decorator/Replacements.php        |   0
 .../lib/classes/Swift/Plugins/DecoratorPlugin.php   |   0
 .../lib/classes/Swift/Plugins/ImpersonatePlugin.php |   0
 .../lib/classes/Swift/Plugins/Logger.php            |   0
 .../lib/classes/Swift/Plugins/LoggerPlugin.php      |   0
 .../classes/Swift/Plugins/Loggers/ArrayLogger.php   |   0
 .../classes/Swift/Plugins/Loggers/EchoLogger.php    |   0
 .../lib/classes/Swift/Plugins/MessageLogger.php     |   0
 .../classes/Swift/Plugins/Pop/Pop3Connection.php    |   0
 .../lib/classes/Swift/Plugins/Pop/Pop3Exception.php |   0
 .../classes/Swift/Plugins/PopBeforeSmtpPlugin.php   |   0
 .../lib/classes/Swift/Plugins/RedirectingPlugin.php |   0
 .../lib/classes/Swift/Plugins/Reporter.php          |   0
 .../lib/classes/Swift/Plugins/ReporterPlugin.php    |   0
 .../classes/Swift/Plugins/Reporters/HitReporter.php |   0
 .../Swift/Plugins/Reporters/HtmlReporter.php        |   0
 .../lib/classes/Swift/Plugins/Sleeper.php           |   0
 .../lib/classes/Swift/Plugins/ThrottlerPlugin.php   |   0
 .../swiftmailer/lib/classes/Swift/Plugins/Timer.php |   0
 .../swiftmailer/lib/classes/Swift/Preferences.php   |   0
 .../lib/classes/Swift/ReplacementFilterFactory.php  |   0
 .../lib/classes/Swift/RfcComplianceException.php    |   0
 .../lib/classes/Swift/SendmailTransport.php         |   0
 .../swiftmailer/lib/classes/Swift/SignedMessage.php |   0
 .../swiftmailer/lib/classes/Swift/Signer.php        |   0
 .../lib/classes/Swift/Signers/BodySigner.php        |   0
 .../lib/classes/Swift/Signers/DKIMSigner.php        |   0
 .../lib/classes/Swift/Signers/DomainKeySigner.php   |   0
 .../lib/classes/Swift/Signers/HeaderSigner.php      |   0
 .../lib/classes/Swift/Signers/OpenDKIMSigner.php    |   0
 .../lib/classes/Swift/Signers/SMimeSigner.php       |   0
 .../swiftmailer/lib/classes/Swift/SmtpTransport.php |   0
 .../swiftmailer/lib/classes/Swift/Spool.php         |   0
 .../lib/classes/Swift/SpoolTransport.php            |   0
 .../swiftmailer/lib/classes/Swift/StreamFilter.php  |   0
 .../StreamFilters/ByteArrayReplacementFilter.php    |   0
 .../Swift/StreamFilters/StringReplacementFilter.php |   0
 .../StringReplacementFilterFactory.php              |   0
 .../lib/classes/Swift/SwiftException.php            |   0
 .../swiftmailer/lib/classes/Swift/Transport.php     |   0
 .../Swift/Transport/AbstractSmtpTransport.php       |   0
 .../Transport/Esmtp/Auth/CramMd5Authenticator.php   |   0
 .../Transport/Esmtp/Auth/LoginAuthenticator.php     |   0
 .../Transport/Esmtp/Auth/NTLMAuthenticator.php      |   0
 .../Transport/Esmtp/Auth/PlainAuthenticator.php     |   0
 .../Transport/Esmtp/Auth/XOAuth2Authenticator.php   |   0
 .../classes/Swift/Transport/Esmtp/AuthHandler.php   |   0
 .../classes/Swift/Transport/Esmtp/Authenticator.php |   0
 .../lib/classes/Swift/Transport/EsmtpHandler.php    |   0
 .../lib/classes/Swift/Transport/EsmtpTransport.php  |   0
 .../classes/Swift/Transport/FailoverTransport.php   |   0
 .../lib/classes/Swift/Transport/IoBuffer.php        |   0
 .../Swift/Transport/LoadBalancedTransport.php       |   0
 .../lib/classes/Swift/Transport/MailInvoker.php     |   0
 .../lib/classes/Swift/Transport/MailTransport.php   |   0
 .../lib/classes/Swift/Transport/NullTransport.php   |   0
 .../classes/Swift/Transport/SendmailTransport.php   |   0
 .../classes/Swift/Transport/SimpleMailInvoker.php   |   0
 .../lib/classes/Swift/Transport/SmtpAgent.php       |   0
 .../lib/classes/Swift/Transport/SpoolTransport.php  |   0
 .../lib/classes/Swift/Transport/StreamBuffer.php    |   0
 .../lib/classes/Swift/TransportException.php        |   0
 .../swiftmailer/lib/classes/Swift/Validate.php      |   0
 .../swiftmailer/lib/dependency_maps/cache_deps.php  |   0
 .../lib/dependency_maps/message_deps.php            |   0
 .../swiftmailer/lib/dependency_maps/mime_deps.php   |   0
 .../lib/dependency_maps/transport_deps.php          |   0
 .../includes/swiftmailer/lib/mime_types.php         |   0
 .../includes/swiftmailer/lib/preferences.php        |   0
 .../includes/swiftmailer/lib/swift_init.php         |   0
 .../includes/swiftmailer/lib/swift_required.php     |   0
 .../swiftmailer/lib/swift_required_pear.php         |   0
 .../lib/swiftmailer_generate_mimes_config.php       |   0
 {public => htdocs}/includes/tcpdi/fpdf_tpl.php      |   0
 {public => htdocs}/includes/tcpdi/tcpdi.php         |   0
 {public => htdocs}/includes/tcpdi/tcpdi_parser.php  |   0
 .../includes/tecnickcom/tcpdf/CHANGELOG.TXT         |   0
 .../includes/tecnickcom/tcpdf/LICENSE.TXT           |   0
 .../includes/tecnickcom/tcpdf/README.TXT            |   0
 .../includes/tecnickcom/tcpdf/composer.json         |   0
 .../tecnickcom/tcpdf/config/tcpdf_config.php        |   0
 .../tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING     |   0
 .../tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog   |   0
 .../tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK     |   0
 .../tecnickcom/tcpdf/fonts/ae_fonts_2.0/README      |   0
 .../tecnickcom/tcpdf/fonts/aealarabiya.ctg.z        | Bin
 .../includes/tecnickcom/tcpdf/fonts/aealarabiya.php |   0
 .../includes/tecnickcom/tcpdf/fonts/aealarabiya.z   | Bin
 .../includes/tecnickcom/tcpdf/fonts/aefurat.ctg.z   | Bin
 .../includes/tecnickcom/tcpdf/fonts/aefurat.php     |   0
 .../includes/tecnickcom/tcpdf/fonts/aefurat.z       | Bin
 .../includes/tecnickcom/tcpdf/fonts/cid0cs.php      |   0
 .../includes/tecnickcom/tcpdf/fonts/cid0ct.php      |   0
 .../includes/tecnickcom/tcpdf/fonts/cid0jp.php      |   0
 .../includes/tecnickcom/tcpdf/fonts/cid0kr.php      |   0
 .../includes/tecnickcom/tcpdf/fonts/courier.php     |   0
 .../includes/tecnickcom/tcpdf/fonts/courierb.php    |   0
 .../includes/tecnickcom/tcpdf/fonts/courierbi.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/courieri.php    |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS       |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS          |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE       |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS          |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/README        |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt    |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt  |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS       |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS          |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE       |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS          |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/README        |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt    |   0
 .../tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt  |   0
 .../tecnickcom/tcpdf/fonts/dejavusans.ctg.z         | Bin
 .../includes/tecnickcom/tcpdf/fonts/dejavusans.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavusans.z    | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansb.ctg.z        | Bin
 .../includes/tecnickcom/tcpdf/fonts/dejavusansb.php |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavusansb.z   | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansbi.ctg.z       | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansbi.php         |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavusansbi.z  | Bin
 .../tcpdf/fonts/dejavusanscondensed.ctg.z           | Bin
 .../tecnickcom/tcpdf/fonts/dejavusanscondensed.php  |   0
 .../tecnickcom/tcpdf/fonts/dejavusanscondensed.z    | Bin
 .../tcpdf/fonts/dejavusanscondensedb.ctg.z          | Bin
 .../tecnickcom/tcpdf/fonts/dejavusanscondensedb.php |   0
 .../tecnickcom/tcpdf/fonts/dejavusanscondensedb.z   | Bin
 .../tcpdf/fonts/dejavusanscondensedbi.ctg.z         | Bin
 .../tcpdf/fonts/dejavusanscondensedbi.php           |   0
 .../tecnickcom/tcpdf/fonts/dejavusanscondensedbi.z  | Bin
 .../tcpdf/fonts/dejavusanscondensedi.ctg.z          | Bin
 .../tecnickcom/tcpdf/fonts/dejavusanscondensedi.php |   0
 .../tecnickcom/tcpdf/fonts/dejavusanscondensedi.z   | Bin
 .../tcpdf/fonts/dejavusansextralight.ctg.z          | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansextralight.php |   0
 .../tecnickcom/tcpdf/fonts/dejavusansextralight.z   | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansi.ctg.z        | Bin
 .../includes/tecnickcom/tcpdf/fonts/dejavusansi.php |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavusansi.z   | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmono.ctg.z     | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmono.php       |   0
 .../tecnickcom/tcpdf/fonts/dejavusansmono.z         | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmonob.ctg.z    | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmonob.php      |   0
 .../tecnickcom/tcpdf/fonts/dejavusansmonob.z        | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmonobi.ctg.z   | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmonobi.php     |   0
 .../tecnickcom/tcpdf/fonts/dejavusansmonobi.z       | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmonoi.ctg.z    | Bin
 .../tecnickcom/tcpdf/fonts/dejavusansmonoi.php      |   0
 .../tecnickcom/tcpdf/fonts/dejavusansmonoi.z        | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserif.ctg.z        | Bin
 .../includes/tecnickcom/tcpdf/fonts/dejavuserif.php |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavuserif.z   | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserifb.ctg.z       | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserifb.php         |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavuserifb.z  | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserifbi.ctg.z      | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserifbi.php        |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavuserifbi.z | Bin
 .../tcpdf/fonts/dejavuserifcondensed.ctg.z          | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserifcondensed.php |   0
 .../tecnickcom/tcpdf/fonts/dejavuserifcondensed.z   | Bin
 .../tcpdf/fonts/dejavuserifcondensedb.ctg.z         | Bin
 .../tcpdf/fonts/dejavuserifcondensedb.php           |   0
 .../tecnickcom/tcpdf/fonts/dejavuserifcondensedb.z  | Bin
 .../tcpdf/fonts/dejavuserifcondensedbi.ctg.z        | Bin
 .../tcpdf/fonts/dejavuserifcondensedbi.php          |   0
 .../tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.z | Bin
 .../tcpdf/fonts/dejavuserifcondensedi.ctg.z         | Bin
 .../tcpdf/fonts/dejavuserifcondensedi.php           |   0
 .../tecnickcom/tcpdf/fonts/dejavuserifcondensedi.z  | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserifi.ctg.z       | Bin
 .../tecnickcom/tcpdf/fonts/dejavuserifi.php         |   0
 .../includes/tecnickcom/tcpdf/fonts/dejavuserifi.z  | Bin
 .../tcpdf/fonts/freefont-20100919/AUTHORS           |   0
 .../tcpdf/fonts/freefont-20100919/COPYING           |   0
 .../tcpdf/fonts/freefont-20100919/CREDITS           |   0
 .../tcpdf/fonts/freefont-20100919/ChangeLog         |   0
 .../tcpdf/fonts/freefont-20100919/INSTALL           |   0
 .../tecnickcom/tcpdf/fonts/freefont-20100919/README |   0
 .../tcpdf/fonts/freefont-20120503/AUTHORS           |   0
 .../tcpdf/fonts/freefont-20120503/COPYING           |   0
 .../tcpdf/fonts/freefont-20120503/CREDITS           |   0
 .../tcpdf/fonts/freefont-20120503/ChangeLog         |   0
 .../fonts/freefont-20120503/ChangeLog.10070.BAK     |   0
 .../tcpdf/fonts/freefont-20120503/INSTALL           |   0
 .../tecnickcom/tcpdf/fonts/freefont-20120503/README |   0
 .../tcpdf/fonts/freefont-20120503/TROUBLESHOOTING   |   0
 .../tecnickcom/tcpdf/fonts/freefont-20120503/USAGE  |   0
 .../includes/tecnickcom/tcpdf/fonts/freemono.ctg.z  | Bin
 .../includes/tecnickcom/tcpdf/fonts/freemono.php    |   0
 .../includes/tecnickcom/tcpdf/fonts/freemono.z      | Bin
 .../includes/tecnickcom/tcpdf/fonts/freemonob.ctg.z | Bin
 .../includes/tecnickcom/tcpdf/fonts/freemonob.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/freemonob.z     | Bin
 .../tecnickcom/tcpdf/fonts/freemonobi.ctg.z         | Bin
 .../includes/tecnickcom/tcpdf/fonts/freemonobi.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/freemonobi.z    | Bin
 .../includes/tecnickcom/tcpdf/fonts/freemonoi.ctg.z | Bin
 .../includes/tecnickcom/tcpdf/fonts/freemonoi.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/freemonoi.z     | Bin
 .../includes/tecnickcom/tcpdf/fonts/freesans.ctg.z  | Bin
 .../includes/tecnickcom/tcpdf/fonts/freesans.php    |   0
 .../includes/tecnickcom/tcpdf/fonts/freesans.z      | Bin
 .../includes/tecnickcom/tcpdf/fonts/freesansb.ctg.z | Bin
 .../includes/tecnickcom/tcpdf/fonts/freesansb.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/freesansb.z     | Bin
 .../tecnickcom/tcpdf/fonts/freesansbi.ctg.z         | Bin
 .../includes/tecnickcom/tcpdf/fonts/freesansbi.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/freesansbi.z    | Bin
 .../includes/tecnickcom/tcpdf/fonts/freesansi.ctg.z | Bin
 .../includes/tecnickcom/tcpdf/fonts/freesansi.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/freesansi.z     | Bin
 .../includes/tecnickcom/tcpdf/fonts/freeserif.ctg.z | Bin
 .../includes/tecnickcom/tcpdf/fonts/freeserif.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/freeserif.z     | Bin
 .../tecnickcom/tcpdf/fonts/freeserifb.ctg.z         | Bin
 .../includes/tecnickcom/tcpdf/fonts/freeserifb.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/freeserifb.z    | Bin
 .../tecnickcom/tcpdf/fonts/freeserifbi.ctg.z        | Bin
 .../includes/tecnickcom/tcpdf/fonts/freeserifbi.php |   0
 .../includes/tecnickcom/tcpdf/fonts/freeserifbi.z   | Bin
 .../tecnickcom/tcpdf/fonts/freeserifi.ctg.z         | Bin
 .../includes/tecnickcom/tcpdf/fonts/freeserifi.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/freeserifi.z    | Bin
 .../includes/tecnickcom/tcpdf/fonts/helvetica.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/helveticab.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/helveticabi.php |   0
 .../includes/tecnickcom/tcpdf/fonts/helveticai.php  |   0
 .../tecnickcom/tcpdf/fonts/hysmyeongjostdmedium.php |   0
 .../tecnickcom/tcpdf/fonts/kozgopromedium.php       |   0
 .../tecnickcom/tcpdf/fonts/kozminproregular.php     |   0
 .../tecnickcom/tcpdf/fonts/msungstdlight.php        |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfacourier.php |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfacourier.z   | Bin
 .../tecnickcom/tcpdf/fonts/pdfacourierb.php         |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfacourierb.z  | Bin
 .../tecnickcom/tcpdf/fonts/pdfacourierbi.php        |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfacourierbi.z | Bin
 .../tecnickcom/tcpdf/fonts/pdfacourieri.php         |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfacourieri.z  | Bin
 .../tecnickcom/tcpdf/fonts/pdfahelvetica.php        |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfahelvetica.z | Bin
 .../tecnickcom/tcpdf/fonts/pdfahelveticab.php       |   0
 .../tecnickcom/tcpdf/fonts/pdfahelveticab.z         | Bin
 .../tecnickcom/tcpdf/fonts/pdfahelveticabi.php      |   0
 .../tecnickcom/tcpdf/fonts/pdfahelveticabi.z        | Bin
 .../tecnickcom/tcpdf/fonts/pdfahelveticai.php       |   0
 .../tecnickcom/tcpdf/fonts/pdfahelveticai.z         | Bin
 .../includes/tecnickcom/tcpdf/fonts/pdfasymbol.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfasymbol.z    | Bin
 .../includes/tecnickcom/tcpdf/fonts/pdfatimes.php   |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfatimes.z     | Bin
 .../includes/tecnickcom/tcpdf/fonts/pdfatimesb.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfatimesb.z    | Bin
 .../includes/tecnickcom/tcpdf/fonts/pdfatimesbi.php |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfatimesbi.z   | Bin
 .../includes/tecnickcom/tcpdf/fonts/pdfatimesi.php  |   0
 .../includes/tecnickcom/tcpdf/fonts/pdfatimesi.z    | Bin
 .../tecnickcom/tcpdf/fonts/pdfazapfdingbats.php     |   0
 .../tecnickcom/tcpdf/fonts/pdfazapfdingbats.z       | Bin
 .../tecnickcom/tcpdf/fonts/stsongstdlight.php       |   0
 .../includes/tecnickcom/tcpdf/fonts/symbol.php      |   0
 .../includes/tecnickcom/tcpdf/fonts/times.php       |   0
 .../includes/tecnickcom/tcpdf/fonts/timesb.php      |   0
 .../includes/tecnickcom/tcpdf/fonts/timesbi.php     |   0
 .../includes/tecnickcom/tcpdf/fonts/timesi.php      |   0
 .../tecnickcom/tcpdf/fonts/uni2cid_ac15.php         |   0
 .../tecnickcom/tcpdf/fonts/uni2cid_ag15.php         |   0
 .../tecnickcom/tcpdf/fonts/uni2cid_aj16.php         |   0
 .../tecnickcom/tcpdf/fonts/uni2cid_ak12.php         |   0
 .../tecnickcom/tcpdf/fonts/zapfdingbats.php         |   0
 .../tcpdf/include/barcodes/datamatrix.php           |   0
 .../tecnickcom/tcpdf/include/barcodes/pdf417.php    |   0
 .../tecnickcom/tcpdf/include/barcodes/qrcode.php    |   0
 .../includes/tecnickcom/tcpdf/include/sRGB.icc      | Bin
 .../tecnickcom/tcpdf/include/tcpdf_colors.php       |   0
 .../tecnickcom/tcpdf/include/tcpdf_filters.php      |   0
 .../tecnickcom/tcpdf/include/tcpdf_font_data.php    |   0
 .../tecnickcom/tcpdf/include/tcpdf_fonts.php        |   0
 .../tecnickcom/tcpdf/include/tcpdf_images.php       |   0
 .../tecnickcom/tcpdf/include/tcpdf_static.php       |   0
 .../includes/tecnickcom/tcpdf/tcpdf.php             |   0
 .../includes/tecnickcom/tcpdf/tcpdf_autoconfig.php  |   0
 .../includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php |   0
 .../includes/tecnickcom/tcpdf/tcpdf_barcodes_2d.php |   0
 .../includes/tecnickcom/tcpdf/tcpdf_import.php      |   0
 .../includes/tecnickcom/tcpdf/tcpdf_parser.php      |   0
 {public => htdocs}/index.php                        |   0
 {public => htdocs}/install/.gitignore               |   0
 {public => htdocs}/install/check.php                |   0
 {public => htdocs}/install/default.css              |   0
 {public => htdocs}/install/doctemplates/README      |   0
 {public => htdocs}/install/doctemplates/index.html  |   0
 .../install/doctemplates/invoices/index.html        |   0
 .../doctemplates/invoices/template_invoice.odt      | Bin
 .../install/doctemplates/orders/index.html          |   0
 .../install/doctemplates/orders/template_order.odt  | Bin
 .../install/doctemplates/projects/index.html        |   0
 .../doctemplates/projects/template_project.odt      | Bin
 .../install/doctemplates/proposals/index.html       |   0
 .../doctemplates/proposals/template_proposal.odt    | Bin
 .../install/doctemplates/shipment/index.html        |   0
 .../doctemplates/shipment/template_shipment.odt     | Bin
 .../doctemplates/supplier_proposal/index.html       |   0
 .../template_supplier_proposal.odt                  | Bin
 .../install/doctemplates/tasks/index.html           |   0
 .../doctemplates/tasks/template_task_summary.odt    | Bin
 .../install/doctemplates/thirdparties/index.html    |   0
 .../thirdparties/template_thirdparty.ods            | Bin
 .../thirdparties/template_thirdparty.odt            | Bin
 {public => htdocs}/install/fileconf.php             |   0
 {public => htdocs}/install/inc.php                  |   0
 {public => htdocs}/install/index.php                |   0
 .../install/install.forced.sample.php               |   0
 {public => htdocs}/install/lib/index.html           |   0
 {public => htdocs}/install/lib/repair.lib.php       |   0
 {public => htdocs}/install/mssql/README             |   0
 .../install/mssql/functions/index.html              |   0
 {public => htdocs}/install/mssql/index.html         |   0
 {public => htdocs}/install/mysql/README             |   0
 {public => htdocs}/install/mysql/data/index.html    |   0
 .../install/mysql/data/llx_00_c_country.sql         |   0
 .../install/mysql/data/llx_10_c_regions.sql         |   0
 .../install/mysql/data/llx_20_c_departements.sql    |   0
 .../install/mysql/data/llx_accounting.sql           |   0
 .../install/mysql/data/llx_accounting_category.sql  |   0
 .../install/mysql/data/llx_c_action_trigger.sql     |   0
 .../install/mysql/data/llx_c_actioncomm.sql         |   0
 .../install/mysql/data/llx_c_availability.sql       |   0
 .../install/mysql/data/llx_c_chargesociales.sql     |   0
 .../install/mysql/data/llx_c_civilite.sql           |   0
 .../install/mysql/data/llx_c_currencies.sql         |   0
 .../install/mysql/data/llx_c_ecotaxe.sql            |   0
 .../install/mysql/data/llx_c_effectif.sql           |   0
 .../install/mysql/data/llx_c_format_cards.sql       |   0
 .../install/mysql/data/llx_c_forme_juridique.sql    |   0
 .../install/mysql/data/llx_c_holiday_type.sql       |   0
 .../install/mysql/data/llx_c_hrm_department.sql     |   0
 .../install/mysql/data/llx_c_hrm_function.sql       |   0
 .../install/mysql/data/llx_c_incoterms.sql          |   0
 .../install/mysql/data/llx_c_input_method.sql       |   0
 .../install/mysql/data/llx_c_input_reason.sql       |   0
 .../install/mysql/data/llx_c_lead_status.sql        |   0
 .../install/mysql/data/llx_c_paiement.sql           |   0
 .../install/mysql/data/llx_c_paper_format.sql       |   0
 .../install/mysql/data/llx_c_payment_term.sql       |   0
 .../install/mysql/data/llx_c_propalst.sql           |   0
 .../install/mysql/data/llx_c_prospectlevel.sql      |   0
 .../install/mysql/data/llx_c_revenuestamp.sql       |   0
 .../install/mysql/data/llx_c_shipment_mode.sql      |   0
 .../install/mysql/data/llx_c_stcomm.sql             |   0
 {public => htdocs}/install/mysql/data/llx_c_tva.sql |   0
 .../install/mysql/data/llx_c_type_contact.sql       |   0
 .../install/mysql/data/llx_c_type_fees.sql          |   0
 .../install/mysql/data/llx_c_type_resource.sql      |   0
 .../install/mysql/data/llx_c_typent.sql             |   0
 .../install/mysql/data/llx_c_units.sql              |   0
 {public => htdocs}/install/mysql/data/llx_const.sql |   0
 .../install/mysql/data/llx_holiday_config.sql       |   0
 .../install/mysql/functions/functions.sql           |   0
 .../install/mysql/functions/index.html              |   0
 {public => htdocs}/install/mysql/index.html         |   0
 .../install/mysql/migration/3.0.0-3.1.0.sql         |   0
 .../install/mysql/migration/3.1.0-3.2.0.sql         |   0
 .../install/mysql/migration/3.2.0-3.3.0.sql         |   0
 .../install/mysql/migration/3.3.0-3.4.0.sql         |   0
 .../install/mysql/migration/3.4.0-3.5.0.sql         |   0
 .../install/mysql/migration/3.5.0-3.6.0.sql         |   0
 .../install/mysql/migration/3.6.0-3.7.0.sql         |   0
 .../install/mysql/migration/3.7.0-3.8.0.sql         |   0
 .../install/mysql/migration/3.8.0-3.9.0.sql         |   0
 .../install/mysql/migration/3.9.0-4.0.0.sql         |   0
 .../install/mysql/migration/4.0.0-5.0.0.sql         |   0
 .../install/mysql/migration/index.html              |   0
 .../install/mysql/migration/repair.sql              |   0
 {public => htdocs}/install/mysql/tables/index.html  |   0
 .../mysql/tables/llx_accounting_account.key.sql     |   0
 .../install/mysql/tables/llx_accounting_account.sql |   0
 .../mysql/tables/llx_accounting_bookkeeping.key.sql |   0
 .../mysql/tables/llx_accounting_bookkeeping.sql     |   0
 .../mysql/tables/llx_accounting_fiscalyear.sql      |   0
 .../mysql/tables/llx_accounting_journal.key.sql     |   0
 .../install/mysql/tables/llx_accounting_journal.sql |   0
 .../mysql/tables/llx_accounting_system.key.sql      |   0
 .../install/mysql/tables/llx_accounting_system.sql  |   0
 .../install/mysql/tables/llx_actioncomm.key.sql     |   0
 .../install/mysql/tables/llx_actioncomm.sql         |   0
 .../mysql/tables/llx_actioncomm_extrafields.key.sql |   0
 .../mysql/tables/llx_actioncomm_extrafields.sql     |   0
 .../mysql/tables/llx_actioncomm_resources.key.sql   |   0
 .../mysql/tables/llx_actioncomm_resources.sql       |   0
 .../install/mysql/tables/llx_adherent.key.sql       |   0
 .../install/mysql/tables/llx_adherent.sql           |   0
 .../mysql/tables/llx_adherent_extrafields.key.sql   |   0
 .../mysql/tables/llx_adherent_extrafields.sql       |   0
 .../install/mysql/tables/llx_adherent_type.key.sql  |   0
 .../install/mysql/tables/llx_adherent_type.sql      |   0
 .../tables/llx_adherent_type_extrafields.key.sql    |   0
 .../mysql/tables/llx_adherent_type_extrafields.sql  |   0
 .../mysql/tables/llx_advtargetemailing.key.sql      |   0
 .../install/mysql/tables/llx_advtargetemailing.sql  |   0
 .../install/mysql/tables/llx_bank.key.sql           |   0
 .../install/mysql/tables/llx_bank.sql               |   0
 .../install/mysql/tables/llx_bank_account.key.sql   |   0
 .../install/mysql/tables/llx_bank_account.sql       |   0
 .../tables/llx_bank_account_extrafields.key.sql     |   0
 .../mysql/tables/llx_bank_account_extrafields.sql   |   0
 .../install/mysql/tables/llx_bank_categ.sql         |   0
 .../install/mysql/tables/llx_bank_class.key.sql     |   0
 .../install/mysql/tables/llx_bank_class.sql         |   0
 .../install/mysql/tables/llx_bank_url.key.sql       |   0
 .../install/mysql/tables/llx_bank_url.sql           |   0
 .../install/mysql/tables/llx_bookmark.key.sql       |   0
 .../install/mysql/tables/llx_bookmark.sql           |   0
 .../mysql/tables/llx_bordereau_cheque.key.sql       |   0
 .../install/mysql/tables/llx_bordereau_cheque.sql   |   0
 .../install/mysql/tables/llx_boxes.key.sql          |   0
 .../install/mysql/tables/llx_boxes.sql              |   0
 .../install/mysql/tables/llx_boxes_def.key.sql      |   0
 .../install/mysql/tables/llx_boxes_def.sql          |   0
 .../install/mysql/tables/llx_budget.sql             |   0
 .../install/mysql/tables/llx_budget_lines.key.sql   |   0
 .../install/mysql/tables/llx_budget_lines.sql       |   0
 .../mysql/tables/llx_c_accounting_category.key.sql  |   0
 .../mysql/tables/llx_c_accounting_category.sql      |   0
 .../mysql/tables/llx_c_action_trigger.key.sql       |   0
 .../install/mysql/tables/llx_c_action_trigger.sql   |   0
 .../install/mysql/tables/llx_c_actioncomm.key.sql   |   0
 .../install/mysql/tables/llx_c_actioncomm.sql       |   0
 .../install/mysql/tables/llx_c_availability.key.sql |   0
 .../install/mysql/tables/llx_c_availability.sql     |   0
 .../install/mysql/tables/llx_c_barcode_type.key.sql |   0
 .../install/mysql/tables/llx_c_barcode_type.sql     |   0
 .../install/mysql/tables/llx_c_chargesociales.sql   |   0
 .../install/mysql/tables/llx_c_civility.key.sql     |   0
 .../install/mysql/tables/llx_c_civility.sql         |   0
 .../install/mysql/tables/llx_c_country.key.sql      |   0
 .../install/mysql/tables/llx_c_country.sql          |   0
 .../install/mysql/tables/llx_c_currencies.key.sql   |   0
 .../install/mysql/tables/llx_c_currencies.sql       |   0
 .../install/mysql/tables/llx_c_departements.key.sql |   0
 .../install/mysql/tables/llx_c_departements.sql     |   0
 .../install/mysql/tables/llx_c_ecotaxe.key.sql      |   0
 .../install/mysql/tables/llx_c_ecotaxe.sql          |   0
 .../install/mysql/tables/llx_c_effectif.key.sql     |   0
 .../install/mysql/tables/llx_c_effectif.sql         |   0
 .../mysql/tables/llx_c_email_templates.key.sql      |   0
 .../install/mysql/tables/llx_c_email_templates.sql  |   0
 .../install/mysql/tables/llx_c_field_list.sql       |   0
 .../install/mysql/tables/llx_c_format_cards.sql     |   0
 .../mysql/tables/llx_c_forme_juridique.key.sql      |   0
 .../install/mysql/tables/llx_c_forme_juridique.sql  |   0
 .../mysql/tables/llx_c_holiday_types.key.sql        |   0
 .../install/mysql/tables/llx_c_holiday_types.sql    |   0
 .../install/mysql/tables/llx_c_hrm_department.sql   |   0
 .../install/mysql/tables/llx_c_hrm_function.sql     |   0
 .../install/mysql/tables/llx_c_incoterms.key.sql    |   0
 .../install/mysql/tables/llx_c_incoterms.sql        |   0
 .../install/mysql/tables/llx_c_input_method.key.sql |   0
 .../install/mysql/tables/llx_c_input_method.sql     |   0
 .../install/mysql/tables/llx_c_input_reason.key.sql |   0
 .../install/mysql/tables/llx_c_input_reason.sql     |   0
 .../install/mysql/tables/llx_c_lead_status.key.sql  |   0
 .../install/mysql/tables/llx_c_lead_status.sql      |   0
 .../install/mysql/tables/llx_c_paiement.key.sql     |   0
 .../install/mysql/tables/llx_c_paiement.sql         |   0
 .../install/mysql/tables/llx_c_paper_format.sql     |   0
 .../install/mysql/tables/llx_c_payment_term.sql     |   0
 .../install/mysql/tables/llx_c_price_expression.sql |   0
 .../mysql/tables/llx_c_price_global_variable.sql    |   0
 .../tables/llx_c_price_global_variable_updater.sql  |   0
 .../install/mysql/tables/llx_c_propalst.key.sql     |   0
 .../install/mysql/tables/llx_c_propalst.sql         |   0
 .../install/mysql/tables/llx_c_prospectlevel.sql    |   0
 .../install/mysql/tables/llx_c_regions.key.sql      |   0
 .../install/mysql/tables/llx_c_regions.sql          |   0
 .../install/mysql/tables/llx_c_revenuestamp.sql     |   0
 .../mysql/tables/llx_c_shipment_mode.key.sql        |   0
 .../install/mysql/tables/llx_c_shipment_mode.sql    |   0
 .../install/mysql/tables/llx_c_stcomm.key.sql       |   0
 .../install/mysql/tables/llx_c_stcomm.sql           |   0
 .../install/mysql/tables/llx_c_tva.key.sql          |   0
 .../install/mysql/tables/llx_c_tva.sql              |   0
 .../install/mysql/tables/llx_c_type_contact.key.sql |   0
 .../install/mysql/tables/llx_c_type_contact.sql     |   0
 .../install/mysql/tables/llx_c_type_fees.key.sql    |   0
 .../install/mysql/tables/llx_c_type_fees.sql        |   0
 .../mysql/tables/llx_c_type_resource.key.sql        |   0
 .../install/mysql/tables/llx_c_type_resource.sql    |   0
 .../install/mysql/tables/llx_c_typent.key.sql       |   0
 .../install/mysql/tables/llx_c_typent.sql           |   0
 .../install/mysql/tables/llx_c_units.key.sql        |   0
 .../install/mysql/tables/llx_c_units.sql            |   0
 .../install/mysql/tables/llx_c_ziptown.key.sql      |   0
 .../install/mysql/tables/llx_c_ziptown.sql          |   0
 .../install/mysql/tables/llx_categorie.key.sql      |   0
 .../install/mysql/tables/llx_categorie.sql          |   0
 .../mysql/tables/llx_categorie_account.key.sql      |   0
 .../install/mysql/tables/llx_categorie_account.sql  |   0
 .../mysql/tables/llx_categorie_contact.key.sql      |   0
 .../install/mysql/tables/llx_categorie_contact.sql  |   0
 .../mysql/tables/llx_categorie_fournisseur.key.sql  |   0
 .../mysql/tables/llx_categorie_fournisseur.sql      |   0
 .../install/mysql/tables/llx_categorie_lang.key.sql |   0
 .../install/mysql/tables/llx_categorie_lang.sql     |   0
 .../mysql/tables/llx_categorie_member.key.sql       |   0
 .../install/mysql/tables/llx_categorie_member.sql   |   0
 .../mysql/tables/llx_categorie_product.key.sql      |   0
 .../install/mysql/tables/llx_categorie_product.sql  |   0
 .../mysql/tables/llx_categorie_project.key.sql      |   0
 .../install/mysql/tables/llx_categorie_project.sql  |   0
 .../mysql/tables/llx_categorie_societe.key.sql      |   0
 .../install/mysql/tables/llx_categorie_societe.sql  |   0
 .../install/mysql/tables/llx_categorie_user.key.sql |   0
 .../install/mysql/tables/llx_categorie_user.sql     |   0
 .../mysql/tables/llx_categories_extrafields.key.sql |   0
 .../mysql/tables/llx_categories_extrafields.sql     |   0
 .../install/mysql/tables/llx_chargesociales.sql     |   0
 .../install/mysql/tables/llx_commande.key.sql       |   0
 .../install/mysql/tables/llx_commande.sql           |   0
 .../mysql/tables/llx_commande_extrafields.key.sql   |   0
 .../mysql/tables/llx_commande_extrafields.sql       |   0
 .../mysql/tables/llx_commande_fournisseur.key.sql   |   0
 .../mysql/tables/llx_commande_fournisseur.sql       |   0
 .../llx_commande_fournisseur_dispatch.key.sql       |   0
 .../tables/llx_commande_fournisseur_dispatch.sql    |   0
 .../llx_commande_fournisseur_extrafields.key.sql    |   0
 .../tables/llx_commande_fournisseur_extrafields.sql |   0
 .../mysql/tables/llx_commande_fournisseur_log.sql   |   0
 .../tables/llx_commande_fournisseurdet.key.sql      |   0
 .../mysql/tables/llx_commande_fournisseurdet.sql    |   0
 .../llx_commande_fournisseurdet_extrafields.key.sql |   0
 .../llx_commande_fournisseurdet_extrafields.sql     |   0
 .../install/mysql/tables/llx_commandedet.key.sql    |   0
 .../install/mysql/tables/llx_commandedet.sql        |   0
 .../tables/llx_commandedet_extrafields.key.sql      |   0
 .../mysql/tables/llx_commandedet_extrafields.sql    |   0
 .../install/mysql/tables/llx_const.key.sql          |   0
 .../install/mysql/tables/llx_const.sql              |   0
 .../install/mysql/tables/llx_contrat.key.sql        |   0
 .../install/mysql/tables/llx_contrat.sql            |   0
 .../mysql/tables/llx_contrat_extrafields.key.sql    |   0
 .../mysql/tables/llx_contrat_extrafields.sql        |   0
 .../install/mysql/tables/llx_contratdet.key.sql     |   0
 .../install/mysql/tables/llx_contratdet.sql         |   0
 .../mysql/tables/llx_contratdet_extrafields.key.sql |   0
 .../mysql/tables/llx_contratdet_extrafields.sql     |   0
 .../install/mysql/tables/llx_contratdet_log.key.sql |   0
 .../install/mysql/tables/llx_contratdet_log.sql     |   0
 .../install/mysql/tables/llx_cronjob.key.sql        |   0
 .../install/mysql/tables/llx_cronjob.sql            |   0
 .../install/mysql/tables/llx_deplacement.sql        |   0
 .../install/mysql/tables/llx_document_model.key.sql |   0
 .../install/mysql/tables/llx_document_model.sql     |   0
 {public => htdocs}/install/mysql/tables/llx_don.sql |   0
 .../mysql/tables/llx_don_extrafields.key.sql        |   0
 .../install/mysql/tables/llx_don_extrafields.sql    |   0
 .../mysql/tables/llx_ecm_directories.key.sql        |   0
 .../install/mysql/tables/llx_ecm_directories.sql    |   0
 .../install/mysql/tables/llx_ecm_files.key.sql      |   0
 .../install/mysql/tables/llx_ecm_files.sql          |   0
 .../mysql/tables/llx_element_contact.key.sql        |   0
 .../install/mysql/tables/llx_element_contact.sql    |   0
 .../mysql/tables/llx_element_element.key.sql        |   0
 .../install/mysql/tables/llx_element_element.sql    |   0
 .../mysql/tables/llx_element_resources.key.sql      |   0
 .../install/mysql/tables/llx_element_resources.sql  |   0
 .../install/mysql/tables/llx_element_tag.key.sql    |   0
 .../install/mysql/tables/llx_element_tag.sql        |   0
 .../install/mysql/tables/llx_entrepot.key.sql       |   0
 .../install/mysql/tables/llx_entrepot.sql           |   0
 .../install/mysql/tables/llx_establishment.sql      |   0
 .../install/mysql/tables/llx_event_element.sql      |   0
 .../install/mysql/tables/llx_events.key.sql         |   0
 .../install/mysql/tables/llx_events.sql             |   0
 .../install/mysql/tables/llx_expedition.key.sql     |   0
 .../install/mysql/tables/llx_expedition.sql         |   0
 .../mysql/tables/llx_expedition_extrafields.key.sql |   0
 .../mysql/tables/llx_expedition_extrafields.sql     |   0
 .../install/mysql/tables/llx_expeditiondet.key.sql  |   0
 .../install/mysql/tables/llx_expeditiondet.sql      |   0
 .../mysql/tables/llx_expeditiondet_batch.key.sql    |   0
 .../mysql/tables/llx_expeditiondet_batch.sql        |   0
 .../tables/llx_expeditiondet_extrafields.key.sql    |   0
 .../mysql/tables/llx_expeditiondet_extrafields.sql  |   0
 .../install/mysql/tables/llx_expensereport.key.sql  |   0
 .../install/mysql/tables/llx_expensereport.sql      |   0
 .../install/mysql/tables/llx_expensereport_det.sql  |   0
 .../tables/llx_expensereport_extrafields.key.sql    |   0
 .../mysql/tables/llx_expensereport_extrafields.sql  |   0
 .../install/mysql/tables/llx_export_compta.sql      |   0
 .../install/mysql/tables/llx_export_model.key.sql   |   0
 .../install/mysql/tables/llx_export_model.sql       |   0
 .../install/mysql/tables/llx_extrafields.key.sql    |   0
 .../install/mysql/tables/llx_extrafields.sql        |   0
 .../install/mysql/tables/llx_facture.key.sql        |   0
 .../install/mysql/tables/llx_facture.sql            |   0
 .../mysql/tables/llx_facture_extrafields.key.sql    |   0
 .../mysql/tables/llx_facture_extrafields.sql        |   0
 .../install/mysql/tables/llx_facture_fourn.key.sql  |   0
 .../install/mysql/tables/llx_facture_fourn.sql      |   0
 .../mysql/tables/llx_facture_fourn_det.key.sql      |   0
 .../install/mysql/tables/llx_facture_fourn_det.sql  |   0
 .../llx_facture_fourn_det_extrafields.key.sql       |   0
 .../tables/llx_facture_fourn_det_extrafields.sql    |   0
 .../tables/llx_facture_fourn_extrafields.key.sql    |   0
 .../mysql/tables/llx_facture_fourn_extrafields.sql  |   0
 .../install/mysql/tables/llx_facture_rec.key.sql    |   0
 .../install/mysql/tables/llx_facture_rec.sql        |   0
 .../install/mysql/tables/llx_facturedet.key.sql     |   0
 .../install/mysql/tables/llx_facturedet.sql         |   0
 .../mysql/tables/llx_facturedet_extrafields.key.sql |   0
 .../mysql/tables/llx_facturedet_extrafields.sql     |   0
 .../install/mysql/tables/llx_facturedet_rec.key.sql |   0
 .../install/mysql/tables/llx_facturedet_rec.sql     |   0
 .../install/mysql/tables/llx_fichinter.key.sql      |   0
 .../install/mysql/tables/llx_fichinter.sql          |   0
 .../mysql/tables/llx_fichinter_extrafields.key.sql  |   0
 .../mysql/tables/llx_fichinter_extrafields.sql      |   0
 .../install/mysql/tables/llx_fichinterdet.key.sql   |   0
 .../install/mysql/tables/llx_fichinterdet.sql       |   0
 .../tables/llx_fichinterdet_extrafields.key.sql     |   0
 .../mysql/tables/llx_fichinterdet_extrafields.sql   |   0
 .../install/mysql/tables/llx_holiday.key.sql        |   0
 .../install/mysql/tables/llx_holiday.sql            |   0
 .../install/mysql/tables/llx_holiday_config.sql     |   0
 .../install/mysql/tables/llx_holiday_logs.sql       |   0
 .../install/mysql/tables/llx_holiday_users.sql      |   0
 .../install/mysql/tables/llx_import_model.key.sql   |   0
 .../install/mysql/tables/llx_import_model.sql       |   0
 .../install/mysql/tables/llx_links.key.sql          |   0
 .../install/mysql/tables/llx_links.sql              |   0
 .../install/mysql/tables/llx_livraison.key.sql      |   0
 .../install/mysql/tables/llx_livraison.sql          |   0
 .../mysql/tables/llx_livraison_extrafields.key.sql  |   0
 .../mysql/tables/llx_livraison_extrafields.sql      |   0
 .../install/mysql/tables/llx_livraisondet.key.sql   |   0
 .../install/mysql/tables/llx_livraisondet.sql       |   0
 .../tables/llx_livraisondet_extrafields.key.sql     |   0
 .../mysql/tables/llx_livraisondet_extrafields.sql   |   0
 .../install/mysql/tables/llx_loan.sql               |   0
 .../install/mysql/tables/llx_localtax.sql           |   0
 .../install/mysql/tables/llx_mailing.sql            |   0
 .../install/mysql/tables/llx_mailing_cibles.key.sql |   0
 .../install/mysql/tables/llx_mailing_cibles.sql     |   0
 .../install/mysql/tables/llx_menu.key.sql           |   0
 .../install/mysql/tables/llx_menu.sql               |   0
 .../install/mysql/tables/llx_multicurrency.sql      |   0
 .../install/mysql/tables/llx_multicurrency_rate.sql |   0
 .../install/mysql/tables/llx_notify.sql             |   0
 .../install/mysql/tables/llx_notify_def.sql         |   0
 .../install/mysql/tables/llx_oauth_state.sql        |   0
 .../install/mysql/tables/llx_oauth_token.sql        |   0
 .../mysql/tables/llx_opensurvey_comments.key.sql    |   0
 .../mysql/tables/llx_opensurvey_comments.sql        |   0
 .../mysql/tables/llx_opensurvey_formquestions.sql   |   0
 .../mysql/tables/llx_opensurvey_sondage.key.sql     |   0
 .../install/mysql/tables/llx_opensurvey_sondage.sql |   0
 .../tables/llx_opensurvey_user_formanswers.sql      |   0
 .../mysql/tables/llx_opensurvey_user_studs.key.sql  |   0
 .../mysql/tables/llx_opensurvey_user_studs.sql      |   0
 .../mysql/tables/llx_overwrite_trans.key.sql        |   0
 .../install/mysql/tables/llx_overwrite_trans.sql    |   0
 .../install/mysql/tables/llx_paiement.sql           |   0
 .../mysql/tables/llx_paiement_facture.key.sql       |   0
 .../install/mysql/tables/llx_paiement_facture.sql   |   0
 .../install/mysql/tables/llx_paiementcharge.sql     |   0
 .../install/mysql/tables/llx_paiementfourn.sql      |   0
 .../tables/llx_paiementfourn_facturefourn.key.sql   |   0
 .../mysql/tables/llx_paiementfourn_facturefourn.sql |   0
 .../install/mysql/tables/llx_payment_donation.sql   |   0
 .../mysql/tables/llx_payment_expensereport.sql      |   0
 .../install/mysql/tables/llx_payment_loan.sql       |   0
 .../install/mysql/tables/llx_payment_salary.key.sql |   0
 .../install/mysql/tables/llx_payment_salary.sql     |   0
 .../mysql/tables/llx_prelevement_bons.key.sql       |   0
 .../install/mysql/tables/llx_prelevement_bons.sql   |   0
 .../mysql/tables/llx_prelevement_facture.key.sql    |   0
 .../mysql/tables/llx_prelevement_facture.sql        |   0
 .../tables/llx_prelevement_facture_demande.sql      |   0
 .../mysql/tables/llx_prelevement_lignes.key.sql     |   0
 .../install/mysql/tables/llx_prelevement_lignes.sql |   0
 .../install/mysql/tables/llx_prelevement_rejet.sql  |   0
 .../install/mysql/tables/llx_printing.sql           |   0
 .../install/mysql/tables/llx_product.key.sql        |   0
 .../install/mysql/tables/llx_product.sql            |   0
 .../mysql/tables/llx_product_association.key.sql    |   0
 .../mysql/tables/llx_product_association.sql        |   0
 .../install/mysql/tables/llx_product_batch.key.sql  |   0
 .../install/mysql/tables/llx_product_batch.sql      |   0
 .../mysql/tables/llx_product_customer_price.key.sql |   0
 .../mysql/tables/llx_product_customer_price.sql     |   0
 .../mysql/tables/llx_product_customer_price_log.sql |   0
 .../mysql/tables/llx_product_extrafields.key.sql    |   0
 .../mysql/tables/llx_product_extrafields.sql        |   0
 .../tables/llx_product_fournisseur_price.key.sql    |   0
 .../mysql/tables/llx_product_fournisseur_price.sql  |   0
 .../tables/llx_product_fournisseur_price_log.sql    |   0
 .../install/mysql/tables/llx_product_lang.key.sql   |   0
 .../install/mysql/tables/llx_product_lang.sql       |   0
 .../install/mysql/tables/llx_product_lot.key.sql    |   0
 .../install/mysql/tables/llx_product_lot.sql        |   0
 .../tables/llx_product_lot_extrafields.key.sql      |   0
 .../mysql/tables/llx_product_lot_extrafields.sql    |   0
 .../install/mysql/tables/llx_product_price.key.sql  |   0
 .../install/mysql/tables/llx_product_price.sql      |   0
 .../mysql/tables/llx_product_price_by_qty.key.sql   |   0
 .../mysql/tables/llx_product_price_by_qty.sql       |   0
 .../mysql/tables/llx_product_pricerules.key.sql     |   0
 .../install/mysql/tables/llx_product_pricerules.sql |   0
 .../install/mysql/tables/llx_product_stock.key.sql  |   0
 .../install/mysql/tables/llx_product_stock.sql      |   0
 .../mysql/tables/llx_product_stock_entrepot.sql     |   0
 .../install/mysql/tables/llx_projet.key.sql         |   0
 .../install/mysql/tables/llx_projet.sql             |   0
 .../mysql/tables/llx_projet_extrafields.key.sql     |   0
 .../install/mysql/tables/llx_projet_extrafields.sql |   0
 .../install/mysql/tables/llx_projet_task.key.sql    |   0
 .../install/mysql/tables/llx_projet_task.sql        |   0
 .../tables/llx_projet_task_extrafields.key.sql      |   0
 .../mysql/tables/llx_projet_task_extrafields.sql    |   0
 .../mysql/tables/llx_projet_task_time.key.sql       |   0
 .../install/mysql/tables/llx_projet_task_time.sql   |   0
 .../install/mysql/tables/llx_propal.key.sql         |   0
 .../install/mysql/tables/llx_propal.sql             |   0
 .../mysql/tables/llx_propal_extrafields.key.sql     |   0
 .../install/mysql/tables/llx_propal_extrafields.sql |   0
 .../mysql/tables/llx_propal_merge_pdf_product.sql   |   0
 .../install/mysql/tables/llx_propaldet.key.sql      |   0
 .../install/mysql/tables/llx_propaldet.sql          |   0
 .../mysql/tables/llx_propaldet_extrafields.key.sql  |   0
 .../mysql/tables/llx_propaldet_extrafields.sql      |   0
 .../install/mysql/tables/llx_resource.key.sql       |   0
 .../install/mysql/tables/llx_resource.sql           |   0
 .../mysql/tables/llx_resource_extrafields.key.sql   |   0
 .../mysql/tables/llx_resource_extrafields.sql       |   0
 .../install/mysql/tables/llx_rights_def.key.sql     |   0
 .../install/mysql/tables/llx_rights_def.sql         |   0
 .../install/mysql/tables/llx_societe.key.sql        |   0
 .../install/mysql/tables/llx_societe.sql            |   0
 .../install/mysql/tables/llx_societe_address.sql    |   0
 .../mysql/tables/llx_societe_commerciaux.key.sql    |   0
 .../mysql/tables/llx_societe_commerciaux.sql        |   0
 .../mysql/tables/llx_societe_extrafields.key.sql    |   0
 .../mysql/tables/llx_societe_extrafields.sql        |   0
 .../install/mysql/tables/llx_societe_log.sql        |   0
 .../install/mysql/tables/llx_societe_prices.sql     |   0
 .../install/mysql/tables/llx_societe_remise.sql     |   0
 .../mysql/tables/llx_societe_remise_except.key.sql  |   0
 .../mysql/tables/llx_societe_remise_except.sql      |   0
 .../install/mysql/tables/llx_societe_rib.key.sql    |   0
 .../install/mysql/tables/llx_societe_rib.sql        |   0
 .../install/mysql/tables/llx_socpeople.key.sql      |   0
 .../install/mysql/tables/llx_socpeople.sql          |   0
 .../mysql/tables/llx_socpeople_extrafields.key.sql  |   0
 .../mysql/tables/llx_socpeople_extrafields.sql      |   0
 .../mysql/tables/llx_stock_mouvement.key.sql        |   0
 .../install/mysql/tables/llx_stock_mouvement.sql    |   0
 .../install/mysql/tables/llx_subscription.key.sql   |   0
 .../install/mysql/tables/llx_subscription.sql       |   0
 .../install/mysql/tables/llx_supplier_proposal.sql  |   0
 .../tables/llx_supplier_proposal_extrafields.sql    |   0
 .../mysql/tables/llx_supplier_proposaldet.sql       |   0
 .../tables/llx_supplier_proposaldet_extrafields.sql |   0
 {public => htdocs}/install/mysql/tables/llx_tva.sql |   0
 .../install/mysql/tables/llx_user.key.sql           |   0
 .../install/mysql/tables/llx_user.sql               |   0
 .../install/mysql/tables/llx_user_alert.sql         |   0
 .../install/mysql/tables/llx_user_clicktodial.sql   |   0
 .../mysql/tables/llx_user_employment.key.sql        |   0
 .../install/mysql/tables/llx_user_employment.sql    |   0
 .../mysql/tables/llx_user_extrafields.key.sql       |   0
 .../install/mysql/tables/llx_user_extrafields.sql   |   0
 .../install/mysql/tables/llx_user_param.key.sql     |   0
 .../install/mysql/tables/llx_user_param.sql         |   0
 .../install/mysql/tables/llx_user_rib.sql           |   0
 .../install/mysql/tables/llx_user_rights.key.sql    |   0
 .../install/mysql/tables/llx_user_rights.sql        |   0
 .../install/mysql/tables/llx_usergroup.key.sql      |   0
 .../install/mysql/tables/llx_usergroup.sql          |   0
 .../mysql/tables/llx_usergroup_extrafields.key.sql  |   0
 .../mysql/tables/llx_usergroup_extrafields.sql      |   0
 .../mysql/tables/llx_usergroup_rights.key.sql       |   0
 .../install/mysql/tables/llx_usergroup_rights.sql   |   0
 .../install/mysql/tables/llx_usergroup_user.key.sql |   0
 .../install/mysql/tables/llx_usergroup_user.sql     |   0
 .../install/mysql/tables/llx_website.key.sql        |   0
 .../install/mysql/tables/llx_website.sql            |   0
 .../install/mysql/tables/llx_website_pages.key.sql  |   0
 .../install/mysql/tables/llx_website_pages.sql      |   0
 {public => htdocs}/install/pgsql/README             |   0
 .../install/pgsql/functions/functions.sql           |   0
 .../install/pgsql/functions/index.html              |   0
 {public => htdocs}/install/pgsql/index.html         |   0
 {public => htdocs}/install/phpinfo.php              |   0
 {public => htdocs}/install/repair.php               |   0
 {public => htdocs}/install/robots.txt               |   0
 .../install/sqlite3/functions/functions.sql         |   0
 {public => htdocs}/install/sqlite3/index.html       |   0
 {public => htdocs}/install/step1.php                |   0
 {public => htdocs}/install/step2.php                |   0
 {public => htdocs}/install/step4.php                |   0
 {public => htdocs}/install/step5.php                |   0
 {public => htdocs}/install/upgrade.php              |   0
 {public => htdocs}/install/upgrade2.php             |   0
 {public => htdocs}/langs/HOWTO-Translation.txt      |   0
 {public => htdocs}/langs/ar_SA/accountancy.lang     |   0
 {public => htdocs}/langs/ar_SA/admin.lang           |   0
 {public => htdocs}/langs/ar_SA/agenda.lang          |   0
 {public => htdocs}/langs/ar_SA/banks.lang           |   0
 {public => htdocs}/langs/ar_SA/bills.lang           |   0
 {public => htdocs}/langs/ar_SA/bookmarks.lang       |   0
 {public => htdocs}/langs/ar_SA/boxes.lang           |   0
 {public => htdocs}/langs/ar_SA/cashdesk.lang        |   0
 {public => htdocs}/langs/ar_SA/categories.lang      |   0
 {public => htdocs}/langs/ar_SA/commercial.lang      |   0
 {public => htdocs}/langs/ar_SA/companies.lang       |   0
 {public => htdocs}/langs/ar_SA/compta.lang          |   0
 {public => htdocs}/langs/ar_SA/contracts.lang       |   0
 {public => htdocs}/langs/ar_SA/cron.lang            |   0
 {public => htdocs}/langs/ar_SA/deliveries.lang      |   0
 {public => htdocs}/langs/ar_SA/dict.lang            |   0
 {public => htdocs}/langs/ar_SA/donations.lang       |   0
 {public => htdocs}/langs/ar_SA/ecm.lang             |   0
 {public => htdocs}/langs/ar_SA/errors.lang          |   0
 {public => htdocs}/langs/ar_SA/exports.lang         |   0
 {public => htdocs}/langs/ar_SA/externalsite.lang    |   0
 {public => htdocs}/langs/ar_SA/ftp.lang             |   0
 {public => htdocs}/langs/ar_SA/help.lang            |   0
 {public => htdocs}/langs/ar_SA/holiday.lang         |   0
 {public => htdocs}/langs/ar_SA/hrm.lang             |   0
 {public => htdocs}/langs/ar_SA/incoterm.lang        |   0
 {public => htdocs}/langs/ar_SA/install.lang         |   0
 {public => htdocs}/langs/ar_SA/interventions.lang   |   0
 {public => htdocs}/langs/ar_SA/languages.lang       |   0
 {public => htdocs}/langs/ar_SA/ldap.lang            |   0
 {public => htdocs}/langs/ar_SA/link.lang            |   0
 {public => htdocs}/langs/ar_SA/loan.lang            |   0
 {public => htdocs}/langs/ar_SA/mailmanspip.lang     |   0
 {public => htdocs}/langs/ar_SA/mails.lang           |   0
 {public => htdocs}/langs/ar_SA/main.lang            |   0
 {public => htdocs}/langs/ar_SA/margins.lang         |   0
 {public => htdocs}/langs/ar_SA/members.lang         |   0
 {public => htdocs}/langs/ar_SA/oauth.lang           |   0
 {public => htdocs}/langs/ar_SA/opensurvey.lang      |   0
 {public => htdocs}/langs/ar_SA/orders.lang          |   0
 {public => htdocs}/langs/ar_SA/other.lang           |   0
 {public => htdocs}/langs/ar_SA/paybox.lang          |   0
 {public => htdocs}/langs/ar_SA/paypal.lang          |   0
 {public => htdocs}/langs/ar_SA/printing.lang        |   0
 {public => htdocs}/langs/ar_SA/productbatch.lang    |   0
 {public => htdocs}/langs/ar_SA/products.lang        |   0
 {public => htdocs}/langs/ar_SA/projects.lang        |   0
 {public => htdocs}/langs/ar_SA/propal.lang          |   0
 {public => htdocs}/langs/ar_SA/receiptprinter.lang  |   0
 {public => htdocs}/langs/ar_SA/resource.lang        |   0
 {public => htdocs}/langs/ar_SA/salaries.lang        |   0
 {public => htdocs}/langs/ar_SA/sendings.lang        |   0
 {public => htdocs}/langs/ar_SA/sms.lang             |   0
 {public => htdocs}/langs/ar_SA/stocks.lang          |   0
 .../langs/ar_SA/supplier_proposal.lang              |   0
 {public => htdocs}/langs/ar_SA/suppliers.lang       |   0
 {public => htdocs}/langs/ar_SA/trips.lang           |   0
 {public => htdocs}/langs/ar_SA/users.lang           |   0
 {public => htdocs}/langs/ar_SA/website.lang         |   0
 {public => htdocs}/langs/ar_SA/withdrawals.lang     |   0
 {public => htdocs}/langs/ar_SA/workflow.lang        |   0
 {public => htdocs}/langs/bg_BG/accountancy.lang     |   0
 {public => htdocs}/langs/bg_BG/admin.lang           |   0
 {public => htdocs}/langs/bg_BG/agenda.lang          |   0
 {public => htdocs}/langs/bg_BG/banks.lang           |   0
 {public => htdocs}/langs/bg_BG/bills.lang           |   0
 {public => htdocs}/langs/bg_BG/bookmarks.lang       |   0
 {public => htdocs}/langs/bg_BG/boxes.lang           |   0
 {public => htdocs}/langs/bg_BG/cashdesk.lang        |   0
 {public => htdocs}/langs/bg_BG/categories.lang      |   0
 {public => htdocs}/langs/bg_BG/commercial.lang      |   0
 {public => htdocs}/langs/bg_BG/companies.lang       |   0
 {public => htdocs}/langs/bg_BG/compta.lang          |   0
 {public => htdocs}/langs/bg_BG/contracts.lang       |   0
 {public => htdocs}/langs/bg_BG/cron.lang            |   0
 {public => htdocs}/langs/bg_BG/deliveries.lang      |   0
 {public => htdocs}/langs/bg_BG/dict.lang            |   0
 {public => htdocs}/langs/bg_BG/donations.lang       |   0
 {public => htdocs}/langs/bg_BG/ecm.lang             |   0
 {public => htdocs}/langs/bg_BG/errors.lang          |   0
 {public => htdocs}/langs/bg_BG/exports.lang         |   0
 {public => htdocs}/langs/bg_BG/externalsite.lang    |   0
 {public => htdocs}/langs/bg_BG/ftp.lang             |   0
 {public => htdocs}/langs/bg_BG/help.lang            |   0
 {public => htdocs}/langs/bg_BG/holiday.lang         |   0
 {public => htdocs}/langs/bg_BG/hrm.lang             |   0
 {public => htdocs}/langs/bg_BG/incoterm.lang        |   0
 {public => htdocs}/langs/bg_BG/install.lang         |   0
 {public => htdocs}/langs/bg_BG/interventions.lang   |   0
 {public => htdocs}/langs/bg_BG/languages.lang       |   0
 {public => htdocs}/langs/bg_BG/ldap.lang            |   0
 {public => htdocs}/langs/bg_BG/link.lang            |   0
 {public => htdocs}/langs/bg_BG/loan.lang            |   0
 {public => htdocs}/langs/bg_BG/mailmanspip.lang     |   0
 {public => htdocs}/langs/bg_BG/mails.lang           |   0
 {public => htdocs}/langs/bg_BG/main.lang            |   0
 {public => htdocs}/langs/bg_BG/margins.lang         |   0
 {public => htdocs}/langs/bg_BG/members.lang         |   0
 {public => htdocs}/langs/bg_BG/oauth.lang           |   0
 {public => htdocs}/langs/bg_BG/opensurvey.lang      |   0
 {public => htdocs}/langs/bg_BG/orders.lang          |   0
 {public => htdocs}/langs/bg_BG/other.lang           |   0
 {public => htdocs}/langs/bg_BG/paybox.lang          |   0
 {public => htdocs}/langs/bg_BG/paypal.lang          |   0
 {public => htdocs}/langs/bg_BG/printing.lang        |   0
 {public => htdocs}/langs/bg_BG/productbatch.lang    |   0
 {public => htdocs}/langs/bg_BG/products.lang        |   0
 {public => htdocs}/langs/bg_BG/projects.lang        |   0
 {public => htdocs}/langs/bg_BG/propal.lang          |   0
 {public => htdocs}/langs/bg_BG/receiptprinter.lang  |   0
 {public => htdocs}/langs/bg_BG/resource.lang        |   0
 {public => htdocs}/langs/bg_BG/salaries.lang        |   0
 {public => htdocs}/langs/bg_BG/sendings.lang        |   0
 {public => htdocs}/langs/bg_BG/sms.lang             |   0
 {public => htdocs}/langs/bg_BG/stocks.lang          |   0
 .../langs/bg_BG/supplier_proposal.lang              |   0
 {public => htdocs}/langs/bg_BG/suppliers.lang       |   0
 {public => htdocs}/langs/bg_BG/trips.lang           |   0
 {public => htdocs}/langs/bg_BG/users.lang           |   0
 {public => htdocs}/langs/bg_BG/website.lang         |   0
 {public => htdocs}/langs/bg_BG/withdrawals.lang     |   0
 {public => htdocs}/langs/bg_BG/workflow.lang        |   0
 {public => htdocs}/langs/bn_BD/accountancy.lang     |   0
 {public => htdocs}/langs/bn_BD/admin.lang           |   0
 {public => htdocs}/langs/bn_BD/agenda.lang          |   0
 {public => htdocs}/langs/bn_BD/banks.lang           |   0
 {public => htdocs}/langs/bn_BD/bills.lang           |   0
 {public => htdocs}/langs/bn_BD/bookmarks.lang       |   0
 {public => htdocs}/langs/bn_BD/boxes.lang           |   0
 {public => htdocs}/langs/bn_BD/cashdesk.lang        |   0
 {public => htdocs}/langs/bn_BD/categories.lang      |   0
 {public => htdocs}/langs/bn_BD/commercial.lang      |   0
 {public => htdocs}/langs/bn_BD/companies.lang       |   0
 {public => htdocs}/langs/bn_BD/compta.lang          |   0
 {public => htdocs}/langs/bn_BD/contracts.lang       |   0
 {public => htdocs}/langs/bn_BD/cron.lang            |   0
 {public => htdocs}/langs/bn_BD/deliveries.lang      |   0
 {public => htdocs}/langs/bn_BD/dict.lang            |   0
 {public => htdocs}/langs/bn_BD/donations.lang       |   0
 {public => htdocs}/langs/bn_BD/ecm.lang             |   0
 {public => htdocs}/langs/bn_BD/errors.lang          |   0
 {public => htdocs}/langs/bn_BD/exports.lang         |   0
 {public => htdocs}/langs/bn_BD/externalsite.lang    |   0
 {public => htdocs}/langs/bn_BD/ftp.lang             |   0
 {public => htdocs}/langs/bn_BD/help.lang            |   0
 {public => htdocs}/langs/bn_BD/holiday.lang         |   0
 {public => htdocs}/langs/bn_BD/hrm.lang             |   0
 {public => htdocs}/langs/bn_BD/incoterm.lang        |   0
 {public => htdocs}/langs/bn_BD/install.lang         |   0
 {public => htdocs}/langs/bn_BD/interventions.lang   |   0
 {public => htdocs}/langs/bn_BD/languages.lang       |   0
 {public => htdocs}/langs/bn_BD/ldap.lang            |   0
 {public => htdocs}/langs/bn_BD/link.lang            |   0
 {public => htdocs}/langs/bn_BD/loan.lang            |   0
 {public => htdocs}/langs/bn_BD/mailmanspip.lang     |   0
 {public => htdocs}/langs/bn_BD/mails.lang           |   0
 {public => htdocs}/langs/bn_BD/main.lang            |   0
 {public => htdocs}/langs/bn_BD/margins.lang         |   0
 {public => htdocs}/langs/bn_BD/members.lang         |   0
 {public => htdocs}/langs/bn_BD/oauth.lang           |   0
 {public => htdocs}/langs/bn_BD/opensurvey.lang      |   0
 {public => htdocs}/langs/bn_BD/orders.lang          |   0
 {public => htdocs}/langs/bn_BD/other.lang           |   0
 {public => htdocs}/langs/bn_BD/paybox.lang          |   0
 {public => htdocs}/langs/bn_BD/paypal.lang          |   0
 {public => htdocs}/langs/bn_BD/printing.lang        |   0
 {public => htdocs}/langs/bn_BD/productbatch.lang    |   0
 {public => htdocs}/langs/bn_BD/products.lang        |   0
 {public => htdocs}/langs/bn_BD/projects.lang        |   0
 {public => htdocs}/langs/bn_BD/propal.lang          |   0
 {public => htdocs}/langs/bn_BD/receiptprinter.lang  |   0
 {public => htdocs}/langs/bn_BD/resource.lang        |   0
 {public => htdocs}/langs/bn_BD/salaries.lang        |   0
 {public => htdocs}/langs/bn_BD/sendings.lang        |   0
 {public => htdocs}/langs/bn_BD/sms.lang             |   0
 {public => htdocs}/langs/bn_BD/stocks.lang          |   0
 .../langs/bn_BD/supplier_proposal.lang              |   0
 {public => htdocs}/langs/bn_BD/suppliers.lang       |   0
 {public => htdocs}/langs/bn_BD/trips.lang           |   0
 {public => htdocs}/langs/bn_BD/users.lang           |   0
 {public => htdocs}/langs/bn_BD/website.lang         |   0
 {public => htdocs}/langs/bn_BD/withdrawals.lang     |   0
 {public => htdocs}/langs/bn_BD/workflow.lang        |   0
 {public => htdocs}/langs/bs_BA/accountancy.lang     |   0
 {public => htdocs}/langs/bs_BA/admin.lang           |   0
 {public => htdocs}/langs/bs_BA/agenda.lang          |   0
 {public => htdocs}/langs/bs_BA/banks.lang           |   0
 {public => htdocs}/langs/bs_BA/bills.lang           |   0
 {public => htdocs}/langs/bs_BA/bookmarks.lang       |   0
 {public => htdocs}/langs/bs_BA/boxes.lang           |   0
 {public => htdocs}/langs/bs_BA/cashdesk.lang        |   0
 {public => htdocs}/langs/bs_BA/categories.lang      |   0
 {public => htdocs}/langs/bs_BA/commercial.lang      |   0
 {public => htdocs}/langs/bs_BA/companies.lang       |   0
 {public => htdocs}/langs/bs_BA/compta.lang          |   0
 {public => htdocs}/langs/bs_BA/contracts.lang       |   0
 {public => htdocs}/langs/bs_BA/cron.lang            |   0
 {public => htdocs}/langs/bs_BA/deliveries.lang      |   0
 {public => htdocs}/langs/bs_BA/dict.lang            |   0
 {public => htdocs}/langs/bs_BA/donations.lang       |   0
 {public => htdocs}/langs/bs_BA/ecm.lang             |   0
 {public => htdocs}/langs/bs_BA/errors.lang          |   0
 {public => htdocs}/langs/bs_BA/exports.lang         |   0
 {public => htdocs}/langs/bs_BA/externalsite.lang    |   0
 {public => htdocs}/langs/bs_BA/ftp.lang             |   0
 {public => htdocs}/langs/bs_BA/help.lang            |   0
 {public => htdocs}/langs/bs_BA/holiday.lang         |   0
 {public => htdocs}/langs/bs_BA/hrm.lang             |   0
 {public => htdocs}/langs/bs_BA/incoterm.lang        |   0
 {public => htdocs}/langs/bs_BA/install.lang         |   0
 {public => htdocs}/langs/bs_BA/interventions.lang   |   0
 {public => htdocs}/langs/bs_BA/languages.lang       |   0
 {public => htdocs}/langs/bs_BA/ldap.lang            |   0
 {public => htdocs}/langs/bs_BA/link.lang            |   0
 {public => htdocs}/langs/bs_BA/loan.lang            |   0
 {public => htdocs}/langs/bs_BA/mailmanspip.lang     |   0
 {public => htdocs}/langs/bs_BA/mails.lang           |   0
 {public => htdocs}/langs/bs_BA/main.lang            |   0
 {public => htdocs}/langs/bs_BA/margins.lang         |   0
 {public => htdocs}/langs/bs_BA/members.lang         |   0
 {public => htdocs}/langs/bs_BA/oauth.lang           |   0
 {public => htdocs}/langs/bs_BA/opensurvey.lang      |   0
 {public => htdocs}/langs/bs_BA/orders.lang          |   0
 {public => htdocs}/langs/bs_BA/other.lang           |   0
 {public => htdocs}/langs/bs_BA/paybox.lang          |   0
 {public => htdocs}/langs/bs_BA/paypal.lang          |   0
 {public => htdocs}/langs/bs_BA/printing.lang        |   0
 {public => htdocs}/langs/bs_BA/productbatch.lang    |   0
 {public => htdocs}/langs/bs_BA/products.lang        |   0
 {public => htdocs}/langs/bs_BA/projects.lang        |   0
 {public => htdocs}/langs/bs_BA/propal.lang          |   0
 {public => htdocs}/langs/bs_BA/receiptprinter.lang  |   0
 {public => htdocs}/langs/bs_BA/resource.lang        |   0
 {public => htdocs}/langs/bs_BA/salaries.lang        |   0
 {public => htdocs}/langs/bs_BA/sendings.lang        |   0
 {public => htdocs}/langs/bs_BA/sms.lang             |   0
 {public => htdocs}/langs/bs_BA/stocks.lang          |   0
 .../langs/bs_BA/supplier_proposal.lang              |   0
 {public => htdocs}/langs/bs_BA/suppliers.lang       |   0
 {public => htdocs}/langs/bs_BA/trips.lang           |   0
 {public => htdocs}/langs/bs_BA/users.lang           |   0
 {public => htdocs}/langs/bs_BA/website.lang         |   0
 {public => htdocs}/langs/bs_BA/withdrawals.lang     |   0
 {public => htdocs}/langs/bs_BA/workflow.lang        |   0
 {public => htdocs}/langs/ca_ES/accountancy.lang     |   0
 {public => htdocs}/langs/ca_ES/admin.lang           |   0
 {public => htdocs}/langs/ca_ES/agenda.lang          |   0
 {public => htdocs}/langs/ca_ES/banks.lang           |   0
 {public => htdocs}/langs/ca_ES/bills.lang           |   0
 {public => htdocs}/langs/ca_ES/bookmarks.lang       |   0
 {public => htdocs}/langs/ca_ES/boxes.lang           |   0
 {public => htdocs}/langs/ca_ES/cashdesk.lang        |   0
 {public => htdocs}/langs/ca_ES/categories.lang      |   0
 {public => htdocs}/langs/ca_ES/commercial.lang      |   0
 {public => htdocs}/langs/ca_ES/companies.lang       |   0
 {public => htdocs}/langs/ca_ES/compta.lang          |   0
 {public => htdocs}/langs/ca_ES/contracts.lang       |   0
 {public => htdocs}/langs/ca_ES/cron.lang            |   0
 {public => htdocs}/langs/ca_ES/deliveries.lang      |   0
 {public => htdocs}/langs/ca_ES/dict.lang            |   0
 {public => htdocs}/langs/ca_ES/donations.lang       |   0
 {public => htdocs}/langs/ca_ES/ecm.lang             |   0
 {public => htdocs}/langs/ca_ES/errors.lang          |   0
 {public => htdocs}/langs/ca_ES/exports.lang         |   0
 {public => htdocs}/langs/ca_ES/externalsite.lang    |   0
 {public => htdocs}/langs/ca_ES/ftp.lang             |   0
 {public => htdocs}/langs/ca_ES/help.lang            |   0
 {public => htdocs}/langs/ca_ES/holiday.lang         |   0
 {public => htdocs}/langs/ca_ES/hrm.lang             |   0
 {public => htdocs}/langs/ca_ES/incoterm.lang        |   0
 {public => htdocs}/langs/ca_ES/install.lang         |   0
 {public => htdocs}/langs/ca_ES/interventions.lang   |   0
 {public => htdocs}/langs/ca_ES/languages.lang       |   0
 {public => htdocs}/langs/ca_ES/ldap.lang            |   0
 {public => htdocs}/langs/ca_ES/link.lang            |   0
 {public => htdocs}/langs/ca_ES/loan.lang            |   0
 {public => htdocs}/langs/ca_ES/mailmanspip.lang     |   0
 {public => htdocs}/langs/ca_ES/mails.lang           |   0
 {public => htdocs}/langs/ca_ES/main.lang            |   0
 {public => htdocs}/langs/ca_ES/margins.lang         |   0
 {public => htdocs}/langs/ca_ES/members.lang         |   0
 {public => htdocs}/langs/ca_ES/oauth.lang           |   0
 {public => htdocs}/langs/ca_ES/opensurvey.lang      |   0
 {public => htdocs}/langs/ca_ES/orders.lang          |   0
 {public => htdocs}/langs/ca_ES/other.lang           |   0
 {public => htdocs}/langs/ca_ES/paybox.lang          |   0
 {public => htdocs}/langs/ca_ES/paypal.lang          |   0
 {public => htdocs}/langs/ca_ES/printing.lang        |   0
 {public => htdocs}/langs/ca_ES/productbatch.lang    |   0
 {public => htdocs}/langs/ca_ES/products.lang        |   0
 {public => htdocs}/langs/ca_ES/projects.lang        |   0
 {public => htdocs}/langs/ca_ES/propal.lang          |   0
 {public => htdocs}/langs/ca_ES/receiptprinter.lang  |   0
 {public => htdocs}/langs/ca_ES/resource.lang        |   0
 {public => htdocs}/langs/ca_ES/salaries.lang        |   0
 {public => htdocs}/langs/ca_ES/sendings.lang        |   0
 {public => htdocs}/langs/ca_ES/sms.lang             |   0
 {public => htdocs}/langs/ca_ES/stocks.lang          |   0
 .../langs/ca_ES/supplier_proposal.lang              |   0
 {public => htdocs}/langs/ca_ES/suppliers.lang       |   0
 {public => htdocs}/langs/ca_ES/trips.lang           |   0
 {public => htdocs}/langs/ca_ES/users.lang           |   0
 {public => htdocs}/langs/ca_ES/website.lang         |   0
 {public => htdocs}/langs/ca_ES/withdrawals.lang     |   0
 {public => htdocs}/langs/ca_ES/workflow.lang        |   0
 {public => htdocs}/langs/cs_CZ/accountancy.lang     |   0
 {public => htdocs}/langs/cs_CZ/admin.lang           |   0
 {public => htdocs}/langs/cs_CZ/agenda.lang          |   0
 {public => htdocs}/langs/cs_CZ/banks.lang           |   0
 {public => htdocs}/langs/cs_CZ/bills.lang           |   0
 {public => htdocs}/langs/cs_CZ/bookmarks.lang       |   0
 {public => htdocs}/langs/cs_CZ/boxes.lang           |   0
 {public => htdocs}/langs/cs_CZ/cashdesk.lang        |   0
 {public => htdocs}/langs/cs_CZ/categories.lang      |   0
 {public => htdocs}/langs/cs_CZ/commercial.lang      |   0
 {public => htdocs}/langs/cs_CZ/companies.lang       |   0
 {public => htdocs}/langs/cs_CZ/compta.lang          |   0
 {public => htdocs}/langs/cs_CZ/contracts.lang       |   0
 {public => htdocs}/langs/cs_CZ/cron.lang            |   0
 {public => htdocs}/langs/cs_CZ/deliveries.lang      |   0
 {public => htdocs}/langs/cs_CZ/dict.lang            |   0
 {public => htdocs}/langs/cs_CZ/donations.lang       |   0
 {public => htdocs}/langs/cs_CZ/ecm.lang             |   0
 {public => htdocs}/langs/cs_CZ/errors.lang          |   0
 {public => htdocs}/langs/cs_CZ/exports.lang         |   0
 {public => htdocs}/langs/cs_CZ/externalsite.lang    |   0
 {public => htdocs}/langs/cs_CZ/ftp.lang             |   0
 {public => htdocs}/langs/cs_CZ/help.lang            |   0
 {public => htdocs}/langs/cs_CZ/holiday.lang         |   0
 {public => htdocs}/langs/cs_CZ/hrm.lang             |   0
 {public => htdocs}/langs/cs_CZ/incoterm.lang        |   0
 {public => htdocs}/langs/cs_CZ/install.lang         |   0
 {public => htdocs}/langs/cs_CZ/interventions.lang   |   0
 {public => htdocs}/langs/cs_CZ/languages.lang       |   0
 {public => htdocs}/langs/cs_CZ/ldap.lang            |   0
 {public => htdocs}/langs/cs_CZ/link.lang            |   0
 {public => htdocs}/langs/cs_CZ/loan.lang            |   0
 {public => htdocs}/langs/cs_CZ/mailmanspip.lang     |   0
 {public => htdocs}/langs/cs_CZ/mails.lang           |   0
 {public => htdocs}/langs/cs_CZ/main.lang            |   0
 {public => htdocs}/langs/cs_CZ/margins.lang         |   0
 {public => htdocs}/langs/cs_CZ/members.lang         |   0
 {public => htdocs}/langs/cs_CZ/oauth.lang           |   0
 {public => htdocs}/langs/cs_CZ/opensurvey.lang      |   0
 {public => htdocs}/langs/cs_CZ/orders.lang          |   0
 {public => htdocs}/langs/cs_CZ/other.lang           |   0
 {public => htdocs}/langs/cs_CZ/paybox.lang          |   0
 {public => htdocs}/langs/cs_CZ/paypal.lang          |   0
 {public => htdocs}/langs/cs_CZ/printing.lang        |   0
 {public => htdocs}/langs/cs_CZ/productbatch.lang    |   0
 {public => htdocs}/langs/cs_CZ/products.lang        |   0
 {public => htdocs}/langs/cs_CZ/projects.lang        |   0
 {public => htdocs}/langs/cs_CZ/propal.lang          |   0
 {public => htdocs}/langs/cs_CZ/receiptprinter.lang  |   0
 {public => htdocs}/langs/cs_CZ/resource.lang        |   0
 {public => htdocs}/langs/cs_CZ/salaries.lang        |   0
 {public => htdocs}/langs/cs_CZ/sendings.lang        |   0
 {public => htdocs}/langs/cs_CZ/sms.lang             |   0
 {public => htdocs}/langs/cs_CZ/stocks.lang          |   0
 .../langs/cs_CZ/supplier_proposal.lang              |   0
 {public => htdocs}/langs/cs_CZ/suppliers.lang       |   0
 {public => htdocs}/langs/cs_CZ/trips.lang           |   0
 {public => htdocs}/langs/cs_CZ/users.lang           |   0
 {public => htdocs}/langs/cs_CZ/website.lang         |   0
 {public => htdocs}/langs/cs_CZ/withdrawals.lang     |   0
 {public => htdocs}/langs/cs_CZ/workflow.lang        |   0
 {public => htdocs}/langs/da_DK/accountancy.lang     |   0
 {public => htdocs}/langs/da_DK/admin.lang           |   0
 {public => htdocs}/langs/da_DK/agenda.lang          |   0
 {public => htdocs}/langs/da_DK/banks.lang           |   0
 {public => htdocs}/langs/da_DK/bills.lang           |   0
 {public => htdocs}/langs/da_DK/bookmarks.lang       |   0
 {public => htdocs}/langs/da_DK/boxes.lang           |   0
 {public => htdocs}/langs/da_DK/cashdesk.lang        |   0
 {public => htdocs}/langs/da_DK/categories.lang      |   0
 {public => htdocs}/langs/da_DK/commercial.lang      |   0
 {public => htdocs}/langs/da_DK/companies.lang       |   0
 {public => htdocs}/langs/da_DK/compta.lang          |   0
 {public => htdocs}/langs/da_DK/contracts.lang       |   0
 {public => htdocs}/langs/da_DK/cron.lang            |   0
 {public => htdocs}/langs/da_DK/deliveries.lang      |   0
 {public => htdocs}/langs/da_DK/dict.lang            |   0
 {public => htdocs}/langs/da_DK/donations.lang       |   0
 {public => htdocs}/langs/da_DK/ecm.lang             |   0
 {public => htdocs}/langs/da_DK/errors.lang          |   0
 {public => htdocs}/langs/da_DK/exports.lang         |   0
 {public => htdocs}/langs/da_DK/externalsite.lang    |   0
 {public => htdocs}/langs/da_DK/ftp.lang             |   0
 {public => htdocs}/langs/da_DK/help.lang            |   0
 {public => htdocs}/langs/da_DK/holiday.lang         |   0
 {public => htdocs}/langs/da_DK/hrm.lang             |   0
 {public => htdocs}/langs/da_DK/incoterm.lang        |   0
 {public => htdocs}/langs/da_DK/install.lang         |   0
 {public => htdocs}/langs/da_DK/interventions.lang   |   0
 {public => htdocs}/langs/da_DK/languages.lang       |   0
 {public => htdocs}/langs/da_DK/ldap.lang            |   0
 {public => htdocs}/langs/da_DK/link.lang            |   0
 {public => htdocs}/langs/da_DK/loan.lang            |   0
 {public => htdocs}/langs/da_DK/mailmanspip.lang     |   0
 {public => htdocs}/langs/da_DK/mails.lang           |   0
 {public => htdocs}/langs/da_DK/main.lang            |   0
 {public => htdocs}/langs/da_DK/margins.lang         |   0
 {public => htdocs}/langs/da_DK/members.lang         |   0
 {public => htdocs}/langs/da_DK/oauth.lang           |   0
 {public => htdocs}/langs/da_DK/opensurvey.lang      |   0
 {public => htdocs}/langs/da_DK/orders.lang          |   0
 {public => htdocs}/langs/da_DK/other.lang           |   0
 {public => htdocs}/langs/da_DK/paybox.lang          |   0
 {public => htdocs}/langs/da_DK/paypal.lang          |   0
 {public => htdocs}/langs/da_DK/printing.lang        |   0
 {public => htdocs}/langs/da_DK/productbatch.lang    |   0
 {public => htdocs}/langs/da_DK/products.lang        |   0
 {public => htdocs}/langs/da_DK/projects.lang        |   0
 {public => htdocs}/langs/da_DK/propal.lang          |   0
 {public => htdocs}/langs/da_DK/receiptprinter.lang  |   0
 {public => htdocs}/langs/da_DK/resource.lang        |   0
 {public => htdocs}/langs/da_DK/salaries.lang        |   0
 {public => htdocs}/langs/da_DK/sendings.lang        |   0
 {public => htdocs}/langs/da_DK/sms.lang             |   0
 {public => htdocs}/langs/da_DK/stocks.lang          |   0
 .../langs/da_DK/supplier_proposal.lang              |   0
 {public => htdocs}/langs/da_DK/suppliers.lang       |   0
 {public => htdocs}/langs/da_DK/trips.lang           |   0
 {public => htdocs}/langs/da_DK/users.lang           |   0
 {public => htdocs}/langs/da_DK/website.lang         |   0
 {public => htdocs}/langs/da_DK/withdrawals.lang     |   0
 {public => htdocs}/langs/da_DK/workflow.lang        |   0
 {public => htdocs}/langs/de_AT/accountancy.lang     |   0
 {public => htdocs}/langs/de_AT/admin.lang           |   0
 {public => htdocs}/langs/de_AT/agenda.lang          |   0
 {public => htdocs}/langs/de_AT/banks.lang           |   0
 {public => htdocs}/langs/de_AT/bills.lang           |   0
 {public => htdocs}/langs/de_AT/bookmarks.lang       |   0
 {public => htdocs}/langs/de_AT/boxes.lang           |   0
 {public => htdocs}/langs/de_AT/cashdesk.lang        |   0
 {public => htdocs}/langs/de_AT/categories.lang      |   0
 {public => htdocs}/langs/de_AT/commercial.lang      |   0
 {public => htdocs}/langs/de_AT/companies.lang       |   0
 {public => htdocs}/langs/de_AT/compta.lang          |   0
 {public => htdocs}/langs/de_AT/contracts.lang       |   0
 {public => htdocs}/langs/de_AT/cron.lang            |   0
 {public => htdocs}/langs/de_AT/deliveries.lang      |   0
 {public => htdocs}/langs/de_AT/dict.lang            |   0
 {public => htdocs}/langs/de_AT/donations.lang       |   0
 {public => htdocs}/langs/de_AT/ecm.lang             |   0
 {public => htdocs}/langs/de_AT/errors.lang          |   0
 {public => htdocs}/langs/de_AT/exports.lang         |   0
 {public => htdocs}/langs/de_AT/externalsite.lang    |   0
 {public => htdocs}/langs/de_AT/ftp.lang             |   0
 {public => htdocs}/langs/de_AT/help.lang            |   0
 {public => htdocs}/langs/de_AT/holiday.lang         |   0
 {public => htdocs}/langs/de_AT/hrm.lang             |   0
 {public => htdocs}/langs/de_AT/incoterm.lang        |   0
 {public => htdocs}/langs/de_AT/install.lang         |   0
 {public => htdocs}/langs/de_AT/interventions.lang   |   0
 {public => htdocs}/langs/de_AT/languages.lang       |   0
 {public => htdocs}/langs/de_AT/ldap.lang            |   0
 {public => htdocs}/langs/de_AT/link.lang            |   0
 {public => htdocs}/langs/de_AT/loan.lang            |   0
 {public => htdocs}/langs/de_AT/mailmanspip.lang     |   0
 {public => htdocs}/langs/de_AT/mails.lang           |   0
 {public => htdocs}/langs/de_AT/main.lang            |   0
 {public => htdocs}/langs/de_AT/margins.lang         |   0
 {public => htdocs}/langs/de_AT/members.lang         |   0
 {public => htdocs}/langs/de_AT/oauth.lang           |   0
 {public => htdocs}/langs/de_AT/opensurvey.lang      |   0
 {public => htdocs}/langs/de_AT/orders.lang          |   0
 {public => htdocs}/langs/de_AT/other.lang           |   0
 {public => htdocs}/langs/de_AT/paybox.lang          |   0
 {public => htdocs}/langs/de_AT/paypal.lang          |   0
 {public => htdocs}/langs/de_AT/printing.lang        |   0
 {public => htdocs}/langs/de_AT/productbatch.lang    |   0
 {public => htdocs}/langs/de_AT/products.lang        |   0
 {public => htdocs}/langs/de_AT/projects.lang        |   0
 {public => htdocs}/langs/de_AT/propal.lang          |   0
 {public => htdocs}/langs/de_AT/receiptprinter.lang  |   0
 {public => htdocs}/langs/de_AT/resource.lang        |   0
 {public => htdocs}/langs/de_AT/salaries.lang        |   0
 {public => htdocs}/langs/de_AT/sendings.lang        |   0
 {public => htdocs}/langs/de_AT/sms.lang             |   0
 {public => htdocs}/langs/de_AT/stocks.lang          |   0
 .../langs/de_AT/supplier_proposal.lang              |   0
 {public => htdocs}/langs/de_AT/suppliers.lang       |   0
 {public => htdocs}/langs/de_AT/trips.lang           |   0
 {public => htdocs}/langs/de_AT/users.lang           |   0
 {public => htdocs}/langs/de_AT/website.lang         |   0
 {public => htdocs}/langs/de_AT/withdrawals.lang     |   0
 {public => htdocs}/langs/de_AT/workflow.lang        |   0
 {public => htdocs}/langs/de_CH/accountancy.lang     |   0
 {public => htdocs}/langs/de_CH/admin.lang           |   0
 {public => htdocs}/langs/de_CH/agenda.lang          |   0
 {public => htdocs}/langs/de_CH/banks.lang           |   0
 {public => htdocs}/langs/de_CH/bills.lang           |   0
 {public => htdocs}/langs/de_CH/bookmarks.lang       |   0
 {public => htdocs}/langs/de_CH/boxes.lang           |   0
 {public => htdocs}/langs/de_CH/cashdesk.lang        |   0
 {public => htdocs}/langs/de_CH/categories.lang      |   0
 {public => htdocs}/langs/de_CH/commercial.lang      |   0
 {public => htdocs}/langs/de_CH/companies.lang       |   0
 {public => htdocs}/langs/de_CH/compta.lang          |   0
 {public => htdocs}/langs/de_CH/contracts.lang       |   0
 {public => htdocs}/langs/de_CH/cron.lang            |   0
 {public => htdocs}/langs/de_CH/deliveries.lang      |   0
 {public => htdocs}/langs/de_CH/dict.lang            |   0
 {public => htdocs}/langs/de_CH/donations.lang       |   0
 {public => htdocs}/langs/de_CH/ecm.lang             |   0
 {public => htdocs}/langs/de_CH/errors.lang          |   0
 {public => htdocs}/langs/de_CH/exports.lang         |   0
 {public => htdocs}/langs/de_CH/externalsite.lang    |   0
 {public => htdocs}/langs/de_CH/ftp.lang             |   0
 {public => htdocs}/langs/de_CH/help.lang            |   0
 {public => htdocs}/langs/de_CH/holiday.lang         |   0
 {public => htdocs}/langs/de_CH/hrm.lang             |   0
 {public => htdocs}/langs/de_CH/incoterm.lang        |   0
 {public => htdocs}/langs/de_CH/install.lang         |   0
 {public => htdocs}/langs/de_CH/interventions.lang   |   0
 {public => htdocs}/langs/de_CH/languages.lang       |   0
 {public => htdocs}/langs/de_CH/ldap.lang            |   0
 {public => htdocs}/langs/de_CH/link.lang            |   0
 {public => htdocs}/langs/de_CH/loan.lang            |   0
 {public => htdocs}/langs/de_CH/mailmanspip.lang     |   0
 {public => htdocs}/langs/de_CH/mails.lang           |   0
 {public => htdocs}/langs/de_CH/main.lang            |   0
 {public => htdocs}/langs/de_CH/margins.lang         |   0
 {public => htdocs}/langs/de_CH/members.lang         |   0
 {public => htdocs}/langs/de_CH/oauth.lang           |   0
 {public => htdocs}/langs/de_CH/opensurvey.lang      |   0
 {public => htdocs}/langs/de_CH/orders.lang          |   0
 {public => htdocs}/langs/de_CH/other.lang           |   0
 {public => htdocs}/langs/de_CH/paybox.lang          |   0
 {public => htdocs}/langs/de_CH/paypal.lang          |   0
 {public => htdocs}/langs/de_CH/printing.lang        |   0
 {public => htdocs}/langs/de_CH/productbatch.lang    |   0
 {public => htdocs}/langs/de_CH/products.lang        |   0
 {public => htdocs}/langs/de_CH/projects.lang        |   0
 {public => htdocs}/langs/de_CH/propal.lang          |   0
 {public => htdocs}/langs/de_CH/receiptprinter.lang  |   0
 {public => htdocs}/langs/de_CH/resource.lang        |   0
 {public => htdocs}/langs/de_CH/salaries.lang        |   0
 {public => htdocs}/langs/de_CH/sendings.lang        |   0
 {public => htdocs}/langs/de_CH/sms.lang             |   0
 {public => htdocs}/langs/de_CH/stocks.lang          |   0
 .../langs/de_CH/supplier_proposal.lang              |   0
 {public => htdocs}/langs/de_CH/suppliers.lang       |   0
 {public => htdocs}/langs/de_CH/trips.lang           |   0
 {public => htdocs}/langs/de_CH/users.lang           |   0
 {public => htdocs}/langs/de_CH/website.lang         |   0
 {public => htdocs}/langs/de_CH/withdrawals.lang     |   0
 {public => htdocs}/langs/de_CH/workflow.lang        |   0
 {public => htdocs}/langs/de_DE/accountancy.lang     |   0
 {public => htdocs}/langs/de_DE/admin.lang           |   0
 {public => htdocs}/langs/de_DE/agenda.lang          |   0
 {public => htdocs}/langs/de_DE/banks.lang           |   0
 {public => htdocs}/langs/de_DE/bills.lang           |   0
 {public => htdocs}/langs/de_DE/bookmarks.lang       |   0
 {public => htdocs}/langs/de_DE/boxes.lang           |   0
 {public => htdocs}/langs/de_DE/cashdesk.lang        |   0
 {public => htdocs}/langs/de_DE/categories.lang      |   0
 {public => htdocs}/langs/de_DE/commercial.lang      |   0
 {public => htdocs}/langs/de_DE/companies.lang       |   0
 {public => htdocs}/langs/de_DE/compta.lang          |   0
 {public => htdocs}/langs/de_DE/contracts.lang       |   0
 {public => htdocs}/langs/de_DE/cron.lang            |   0
 {public => htdocs}/langs/de_DE/deliveries.lang      |   0
 {public => htdocs}/langs/de_DE/dict.lang            |   0
 {public => htdocs}/langs/de_DE/donations.lang       |   0
 {public => htdocs}/langs/de_DE/ecm.lang             |   0
 {public => htdocs}/langs/de_DE/errors.lang          |   0
 {public => htdocs}/langs/de_DE/exports.lang         |   0
 {public => htdocs}/langs/de_DE/externalsite.lang    |   0
 {public => htdocs}/langs/de_DE/ftp.lang             |   0
 {public => htdocs}/langs/de_DE/help.lang            |   0
 {public => htdocs}/langs/de_DE/holiday.lang         |   0
 {public => htdocs}/langs/de_DE/hrm.lang             |   0
 {public => htdocs}/langs/de_DE/incoterm.lang        |   0
 {public => htdocs}/langs/de_DE/install.lang         |   0
 {public => htdocs}/langs/de_DE/interventions.lang   |   0
 {public => htdocs}/langs/de_DE/languages.lang       |   0
 {public => htdocs}/langs/de_DE/ldap.lang            |   0
 {public => htdocs}/langs/de_DE/link.lang            |   0
 {public => htdocs}/langs/de_DE/loan.lang            |   0
 {public => htdocs}/langs/de_DE/mailmanspip.lang     |   0
 {public => htdocs}/langs/de_DE/mails.lang           |   0
 {public => htdocs}/langs/de_DE/main.lang            |   0
 {public => htdocs}/langs/de_DE/margins.lang         |   0
 {public => htdocs}/langs/de_DE/members.lang         |   0
 {public => htdocs}/langs/de_DE/oauth.lang           |   0
 {public => htdocs}/langs/de_DE/opensurvey.lang      |   0
 {public => htdocs}/langs/de_DE/orders.lang          |   0
 {public => htdocs}/langs/de_DE/other.lang           |   0
 {public => htdocs}/langs/de_DE/paybox.lang          |   0
 {public => htdocs}/langs/de_DE/paypal.lang          |   0
 {public => htdocs}/langs/de_DE/printing.lang        |   0
 {public => htdocs}/langs/de_DE/productbatch.lang    |   0
 {public => htdocs}/langs/de_DE/products.lang        |   0
 {public => htdocs}/langs/de_DE/projects.lang        |   0
 {public => htdocs}/langs/de_DE/propal.lang          |   0
 {public => htdocs}/langs/de_DE/receiptprinter.lang  |   0
 {public => htdocs}/langs/de_DE/resource.lang        |   0
 {public => htdocs}/langs/de_DE/salaries.lang        |   0
 {public => htdocs}/langs/de_DE/sendings.lang        |   0
 {public => htdocs}/langs/de_DE/sms.lang             |   0
 {public => htdocs}/langs/de_DE/stocks.lang          |   0
 .../langs/de_DE/supplier_proposal.lang              |   0
 {public => htdocs}/langs/de_DE/suppliers.lang       |   0
 {public => htdocs}/langs/de_DE/trips.lang           |   0
 {public => htdocs}/langs/de_DE/users.lang           |   0
 {public => htdocs}/langs/de_DE/website.lang         |   0
 {public => htdocs}/langs/de_DE/withdrawals.lang     |   0
 {public => htdocs}/langs/de_DE/workflow.lang        |   0
 {public => htdocs}/langs/el_GR/accountancy.lang     |   0
 {public => htdocs}/langs/el_GR/admin.lang           |   0
 {public => htdocs}/langs/el_GR/agenda.lang          |   0
 {public => htdocs}/langs/el_GR/banks.lang           |   0
 {public => htdocs}/langs/el_GR/bills.lang           |   0
 {public => htdocs}/langs/el_GR/bookmarks.lang       |   0
 {public => htdocs}/langs/el_GR/boxes.lang           |   0
 {public => htdocs}/langs/el_GR/cashdesk.lang        |   0
 {public => htdocs}/langs/el_GR/categories.lang      |   0
 {public => htdocs}/langs/el_GR/commercial.lang      |   0
 {public => htdocs}/langs/el_GR/commissions.lang     |   0
 {public => htdocs}/langs/el_GR/companies.lang       |   0
 {public => htdocs}/langs/el_GR/compta.lang          |   0
 {public => htdocs}/langs/el_GR/contracts.lang       |   0
 {public => htdocs}/langs/el_GR/cron.lang            |   0
 {public => htdocs}/langs/el_GR/deliveries.lang      |   0
 {public => htdocs}/langs/el_GR/dict.lang            |   0
 {public => htdocs}/langs/el_GR/donations.lang       |   0
 {public => htdocs}/langs/el_GR/ecm.lang             |   0
 {public => htdocs}/langs/el_GR/errors.lang          |   0
 {public => htdocs}/langs/el_GR/exports.lang         |   0
 {public => htdocs}/langs/el_GR/externalsite.lang    |   0
 {public => htdocs}/langs/el_GR/ftp.lang             |   0
 {public => htdocs}/langs/el_GR/help.lang            |   0
 {public => htdocs}/langs/el_GR/holiday.lang         |   0
 {public => htdocs}/langs/el_GR/hrm.lang             |   0
 {public => htdocs}/langs/el_GR/incoterm.lang        |   0
 {public => htdocs}/langs/el_GR/install.lang         |   0
 {public => htdocs}/langs/el_GR/interventions.lang   |   0
 {public => htdocs}/langs/el_GR/languages.lang       |   0
 {public => htdocs}/langs/el_GR/ldap.lang            |   0
 {public => htdocs}/langs/el_GR/link.lang            |   0
 {public => htdocs}/langs/el_GR/loan.lang            |   0
 {public => htdocs}/langs/el_GR/mailmanspip.lang     |   0
 {public => htdocs}/langs/el_GR/mails.lang           |   0
 {public => htdocs}/langs/el_GR/main.lang            |   0
 {public => htdocs}/langs/el_GR/margins.lang         |   0
 {public => htdocs}/langs/el_GR/members.lang         |   0
 {public => htdocs}/langs/el_GR/oauth.lang           |   0
 {public => htdocs}/langs/el_GR/opensurvey.lang      |   0
 {public => htdocs}/langs/el_GR/orders.lang          |   0
 {public => htdocs}/langs/el_GR/other.lang           |   0
 {public => htdocs}/langs/el_GR/paybox.lang          |   0
 {public => htdocs}/langs/el_GR/paypal.lang          |   0
 {public => htdocs}/langs/el_GR/printing.lang        |   0
 {public => htdocs}/langs/el_GR/productbatch.lang    |   0
 {public => htdocs}/langs/el_GR/products.lang        |   0
 {public => htdocs}/langs/el_GR/projects.lang        |   0
 {public => htdocs}/langs/el_GR/propal.lang          |   0
 {public => htdocs}/langs/el_GR/receiptprinter.lang  |   0
 {public => htdocs}/langs/el_GR/resource.lang        |   0
 {public => htdocs}/langs/el_GR/salaries.lang        |   0
 {public => htdocs}/langs/el_GR/sendings.lang        |   0
 {public => htdocs}/langs/el_GR/sms.lang             |   0
 {public => htdocs}/langs/el_GR/stocks.lang          |   0
 .../langs/el_GR/supplier_proposal.lang              |   0
 {public => htdocs}/langs/el_GR/suppliers.lang       |   0
 {public => htdocs}/langs/el_GR/trips.lang           |   0
 {public => htdocs}/langs/el_GR/users.lang           |   0
 {public => htdocs}/langs/el_GR/website.lang         |   0
 {public => htdocs}/langs/el_GR/withdrawals.lang     |   0
 {public => htdocs}/langs/el_GR/workflow.lang        |   0
 {public => htdocs}/langs/en_AU/accountancy.lang     |   0
 {public => htdocs}/langs/en_AU/admin.lang           |   0
 {public => htdocs}/langs/en_AU/agenda.lang          |   0
 {public => htdocs}/langs/en_AU/banks.lang           |   0
 {public => htdocs}/langs/en_AU/bills.lang           |   0
 {public => htdocs}/langs/en_AU/bookmarks.lang       |   0
 {public => htdocs}/langs/en_AU/boxes.lang           |   0
 {public => htdocs}/langs/en_AU/cashdesk.lang        |   0
 {public => htdocs}/langs/en_AU/categories.lang      |   0
 {public => htdocs}/langs/en_AU/commercial.lang      |   0
 {public => htdocs}/langs/en_AU/companies.lang       |   0
 {public => htdocs}/langs/en_AU/compta.lang          |   0
 {public => htdocs}/langs/en_AU/contracts.lang       |   0
 {public => htdocs}/langs/en_AU/cron.lang            |   0
 {public => htdocs}/langs/en_AU/deliveries.lang      |   0
 {public => htdocs}/langs/en_AU/dict.lang            |   0
 {public => htdocs}/langs/en_AU/donations.lang       |   0
 {public => htdocs}/langs/en_AU/ecm.lang             |   0
 {public => htdocs}/langs/en_AU/errors.lang          |   0
 {public => htdocs}/langs/en_AU/exports.lang         |   0
 {public => htdocs}/langs/en_AU/externalsite.lang    |   0
 {public => htdocs}/langs/en_AU/ftp.lang             |   0
 {public => htdocs}/langs/en_AU/help.lang            |   0
 {public => htdocs}/langs/en_AU/holiday.lang         |   0
 {public => htdocs}/langs/en_AU/hrm.lang             |   0
 {public => htdocs}/langs/en_AU/incoterm.lang        |   0
 {public => htdocs}/langs/en_AU/install.lang         |   0
 {public => htdocs}/langs/en_AU/interventions.lang   |   0
 {public => htdocs}/langs/en_AU/languages.lang       |   0
 {public => htdocs}/langs/en_AU/ldap.lang            |   0
 {public => htdocs}/langs/en_AU/link.lang            |   0
 {public => htdocs}/langs/en_AU/loan.lang            |   0
 {public => htdocs}/langs/en_AU/mailmanspip.lang     |   0
 {public => htdocs}/langs/en_AU/mails.lang           |   0
 {public => htdocs}/langs/en_AU/main.lang            |   0
 {public => htdocs}/langs/en_AU/margins.lang         |   0
 {public => htdocs}/langs/en_AU/members.lang         |   0
 {public => htdocs}/langs/en_AU/oauth.lang           |   0
 {public => htdocs}/langs/en_AU/opensurvey.lang      |   0
 {public => htdocs}/langs/en_AU/orders.lang          |   0
 {public => htdocs}/langs/en_AU/other.lang           |   0
 {public => htdocs}/langs/en_AU/paybox.lang          |   0
 {public => htdocs}/langs/en_AU/paypal.lang          |   0
 {public => htdocs}/langs/en_AU/printing.lang        |   0
 {public => htdocs}/langs/en_AU/productbatch.lang    |   0
 {public => htdocs}/langs/en_AU/products.lang        |   0
 {public => htdocs}/langs/en_AU/projects.lang        |   0
 {public => htdocs}/langs/en_AU/propal.lang          |   0
 {public => htdocs}/langs/en_AU/receiptprinter.lang  |   0
 {public => htdocs}/langs/en_AU/resource.lang        |   0
 {public => htdocs}/langs/en_AU/salaries.lang        |   0
 {public => htdocs}/langs/en_AU/sendings.lang        |   0
 {public => htdocs}/langs/en_AU/sms.lang             |   0
 {public => htdocs}/langs/en_AU/stocks.lang          |   0
 .../langs/en_AU/supplier_proposal.lang              |   0
 {public => htdocs}/langs/en_AU/suppliers.lang       |   0
 {public => htdocs}/langs/en_AU/trips.lang           |   0
 {public => htdocs}/langs/en_AU/users.lang           |   0
 {public => htdocs}/langs/en_AU/website.lang         |   0
 {public => htdocs}/langs/en_AU/withdrawals.lang     |   0
 {public => htdocs}/langs/en_AU/workflow.lang        |   0
 {public => htdocs}/langs/en_CA/accountancy.lang     |   0
 {public => htdocs}/langs/en_CA/admin.lang           |   0
 {public => htdocs}/langs/en_CA/agenda.lang          |   0
 {public => htdocs}/langs/en_CA/banks.lang           |   0
 {public => htdocs}/langs/en_CA/bills.lang           |   0
 {public => htdocs}/langs/en_CA/bookmarks.lang       |   0
 {public => htdocs}/langs/en_CA/boxes.lang           |   0
 {public => htdocs}/langs/en_CA/cashdesk.lang        |   0
 {public => htdocs}/langs/en_CA/categories.lang      |   0
 {public => htdocs}/langs/en_CA/commercial.lang      |   0
 {public => htdocs}/langs/en_CA/companies.lang       |   0
 {public => htdocs}/langs/en_CA/compta.lang          |   0
 {public => htdocs}/langs/en_CA/contracts.lang       |   0
 {public => htdocs}/langs/en_CA/cron.lang            |   0
 {public => htdocs}/langs/en_CA/deliveries.lang      |   0
 {public => htdocs}/langs/en_CA/dict.lang            |   0
 {public => htdocs}/langs/en_CA/donations.lang       |   0
 {public => htdocs}/langs/en_CA/ecm.lang             |   0
 {public => htdocs}/langs/en_CA/errors.lang          |   0
 {public => htdocs}/langs/en_CA/exports.lang         |   0
 {public => htdocs}/langs/en_CA/externalsite.lang    |   0
 {public => htdocs}/langs/en_CA/ftp.lang             |   0
 {public => htdocs}/langs/en_CA/help.lang            |   0
 {public => htdocs}/langs/en_CA/holiday.lang         |   0
 {public => htdocs}/langs/en_CA/hrm.lang             |   0
 {public => htdocs}/langs/en_CA/incoterm.lang        |   0
 {public => htdocs}/langs/en_CA/install.lang         |   0
 {public => htdocs}/langs/en_CA/interventions.lang   |   0
 {public => htdocs}/langs/en_CA/languages.lang       |   0
 {public => htdocs}/langs/en_CA/ldap.lang            |   0
 {public => htdocs}/langs/en_CA/link.lang            |   0
 {public => htdocs}/langs/en_CA/loan.lang            |   0
 {public => htdocs}/langs/en_CA/mailmanspip.lang     |   0
 {public => htdocs}/langs/en_CA/mails.lang           |   0
 {public => htdocs}/langs/en_CA/main.lang            |   0
 {public => htdocs}/langs/en_CA/margins.lang         |   0
 {public => htdocs}/langs/en_CA/members.lang         |   0
 {public => htdocs}/langs/en_CA/oauth.lang           |   0
 {public => htdocs}/langs/en_CA/opensurvey.lang      |   0
 {public => htdocs}/langs/en_CA/orders.lang          |   0
 {public => htdocs}/langs/en_CA/other.lang           |   0
 {public => htdocs}/langs/en_CA/paybox.lang          |   0
 {public => htdocs}/langs/en_CA/paypal.lang          |   0
 {public => htdocs}/langs/en_CA/printing.lang        |   0
 {public => htdocs}/langs/en_CA/productbatch.lang    |   0
 {public => htdocs}/langs/en_CA/products.lang        |   0
 {public => htdocs}/langs/en_CA/projects.lang        |   0
 {public => htdocs}/langs/en_CA/propal.lang          |   0
 {public => htdocs}/langs/en_CA/receiptprinter.lang  |   0
 {public => htdocs}/langs/en_CA/resource.lang        |   0
 {public => htdocs}/langs/en_CA/salaries.lang        |   0
 {public => htdocs}/langs/en_CA/sendings.lang        |   0
 {public => htdocs}/langs/en_CA/sms.lang             |   0
 {public => htdocs}/langs/en_CA/stocks.lang          |   0
 .../langs/en_CA/supplier_proposal.lang              |   0
 {public => htdocs}/langs/en_CA/suppliers.lang       |   0
 {public => htdocs}/langs/en_CA/trips.lang           |   0
 {public => htdocs}/langs/en_CA/users.lang           |   0
 {public => htdocs}/langs/en_CA/website.lang         |   0
 {public => htdocs}/langs/en_CA/withdrawals.lang     |   0
 {public => htdocs}/langs/en_CA/workflow.lang        |   0
 {public => htdocs}/langs/en_GB/accountancy.lang     |   0
 {public => htdocs}/langs/en_GB/admin.lang           |   0
 {public => htdocs}/langs/en_GB/agenda.lang          |   0
 {public => htdocs}/langs/en_GB/banks.lang           |   0
 {public => htdocs}/langs/en_GB/bills.lang           |   0
 {public => htdocs}/langs/en_GB/bookmarks.lang       |   0
 {public => htdocs}/langs/en_GB/boxes.lang           |   0
 {public => htdocs}/langs/en_GB/cashdesk.lang        |   0
 {public => htdocs}/langs/en_GB/categories.lang      |   0
 {public => htdocs}/langs/en_GB/commercial.lang      |   0
 {public => htdocs}/langs/en_GB/companies.lang       |   0
 {public => htdocs}/langs/en_GB/compta.lang          |   0
 {public => htdocs}/langs/en_GB/contracts.lang       |   0
 {public => htdocs}/langs/en_GB/cron.lang            |   0
 {public => htdocs}/langs/en_GB/deliveries.lang      |   0
 {public => htdocs}/langs/en_GB/dict.lang            |   0
 {public => htdocs}/langs/en_GB/donations.lang       |   0
 {public => htdocs}/langs/en_GB/ecm.lang             |   0
 {public => htdocs}/langs/en_GB/errors.lang          |   0
 {public => htdocs}/langs/en_GB/exports.lang         |   0
 {public => htdocs}/langs/en_GB/externalsite.lang    |   0
 {public => htdocs}/langs/en_GB/ftp.lang             |   0
 {public => htdocs}/langs/en_GB/help.lang            |   0
 {public => htdocs}/langs/en_GB/holiday.lang         |   0
 {public => htdocs}/langs/en_GB/hrm.lang             |   0
 {public => htdocs}/langs/en_GB/incoterm.lang        |   0
 {public => htdocs}/langs/en_GB/install.lang         |   0
 {public => htdocs}/langs/en_GB/interventions.lang   |   0
 {public => htdocs}/langs/en_GB/languages.lang       |   0
 {public => htdocs}/langs/en_GB/ldap.lang            |   0
 {public => htdocs}/langs/en_GB/link.lang            |   0
 {public => htdocs}/langs/en_GB/loan.lang            |   0
 {public => htdocs}/langs/en_GB/mailmanspip.lang     |   0
 {public => htdocs}/langs/en_GB/mails.lang           |   0
 {public => htdocs}/langs/en_GB/main.lang            |   0
 {public => htdocs}/langs/en_GB/margins.lang         |   0
 {public => htdocs}/langs/en_GB/members.lang         |   0
 {public => htdocs}/langs/en_GB/oauth.lang           |   0
 {public => htdocs}/langs/en_GB/opensurvey.lang      |   0
 {public => htdocs}/langs/en_GB/orders.lang          |   0
 {public => htdocs}/langs/en_GB/other.lang           |   0
 {public => htdocs}/langs/en_GB/paybox.lang          |   0
 {public => htdocs}/langs/en_GB/paypal.lang          |   0
 {public => htdocs}/langs/en_GB/printing.lang        |   0
 {public => htdocs}/langs/en_GB/productbatch.lang    |   0
 {public => htdocs}/langs/en_GB/products.lang        |   0
 {public => htdocs}/langs/en_GB/projects.lang        |   0
 {public => htdocs}/langs/en_GB/propal.lang          |   0
 {public => htdocs}/langs/en_GB/receiptprinter.lang  |   0
 {public => htdocs}/langs/en_GB/resource.lang        |   0
 {public => htdocs}/langs/en_GB/salaries.lang        |   0
 {public => htdocs}/langs/en_GB/sendings.lang        |   0
 {public => htdocs}/langs/en_GB/sms.lang             |   0
 {public => htdocs}/langs/en_GB/stocks.lang          |   0
 .../langs/en_GB/supplier_proposal.lang              |   0
 {public => htdocs}/langs/en_GB/suppliers.lang       |   0
 {public => htdocs}/langs/en_GB/trips.lang           |   0
 {public => htdocs}/langs/en_GB/users.lang           |   0
 {public => htdocs}/langs/en_GB/website.lang         |   0
 {public => htdocs}/langs/en_GB/withdrawals.lang     |   0
 {public => htdocs}/langs/en_GB/workflow.lang        |   0
 {public => htdocs}/langs/en_IN/accountancy.lang     |   0
 {public => htdocs}/langs/en_IN/admin.lang           |   0
 {public => htdocs}/langs/en_IN/agenda.lang          |   0
 {public => htdocs}/langs/en_IN/banks.lang           |   0
 {public => htdocs}/langs/en_IN/bills.lang           |   0
 {public => htdocs}/langs/en_IN/bookmarks.lang       |   0
 {public => htdocs}/langs/en_IN/boxes.lang           |   0
 {public => htdocs}/langs/en_IN/cashdesk.lang        |   0
 {public => htdocs}/langs/en_IN/categories.lang      |   0
 {public => htdocs}/langs/en_IN/commercial.lang      |   0
 {public => htdocs}/langs/en_IN/companies.lang       |   0
 {public => htdocs}/langs/en_IN/compta.lang          |   0
 {public => htdocs}/langs/en_IN/contracts.lang       |   0
 {public => htdocs}/langs/en_IN/cron.lang            |   0
 {public => htdocs}/langs/en_IN/deliveries.lang      |   0
 {public => htdocs}/langs/en_IN/dict.lang            |   0
 {public => htdocs}/langs/en_IN/donations.lang       |   0
 {public => htdocs}/langs/en_IN/ecm.lang             |   0
 {public => htdocs}/langs/en_IN/errors.lang          |   0
 {public => htdocs}/langs/en_IN/exports.lang         |   0
 {public => htdocs}/langs/en_IN/externalsite.lang    |   0
 {public => htdocs}/langs/en_IN/ftp.lang             |   0
 {public => htdocs}/langs/en_IN/help.lang            |   0
 {public => htdocs}/langs/en_IN/holiday.lang         |   0
 {public => htdocs}/langs/en_IN/hrm.lang             |   0
 {public => htdocs}/langs/en_IN/incoterm.lang        |   0
 {public => htdocs}/langs/en_IN/install.lang         |   0
 {public => htdocs}/langs/en_IN/interventions.lang   |   0
 {public => htdocs}/langs/en_IN/languages.lang       |   0
 {public => htdocs}/langs/en_IN/ldap.lang            |   0
 {public => htdocs}/langs/en_IN/link.lang            |   0
 {public => htdocs}/langs/en_IN/loan.lang            |   0
 {public => htdocs}/langs/en_IN/mailmanspip.lang     |   0
 {public => htdocs}/langs/en_IN/mails.lang           |   0
 {public => htdocs}/langs/en_IN/main.lang            |   0
 {public => htdocs}/langs/en_IN/margins.lang         |   0
 {public => htdocs}/langs/en_IN/members.lang         |   0
 {public => htdocs}/langs/en_IN/oauth.lang           |   0
 {public => htdocs}/langs/en_IN/opensurvey.lang      |   0
 {public => htdocs}/langs/en_IN/orders.lang          |   0
 {public => htdocs}/langs/en_IN/other.lang           |   0
 {public => htdocs}/langs/en_IN/paybox.lang          |   0
 {public => htdocs}/langs/en_IN/paypal.lang          |   0
 {public => htdocs}/langs/en_IN/printing.lang        |   0
 {public => htdocs}/langs/en_IN/productbatch.lang    |   0
 {public => htdocs}/langs/en_IN/products.lang        |   0
 {public => htdocs}/langs/en_IN/projects.lang        |   0
 {public => htdocs}/langs/en_IN/propal.lang          |   0
 {public => htdocs}/langs/en_IN/receiptprinter.lang  |   0
 {public => htdocs}/langs/en_IN/resource.lang        |   0
 {public => htdocs}/langs/en_IN/salaries.lang        |   0
 {public => htdocs}/langs/en_IN/sendings.lang        |   0
 {public => htdocs}/langs/en_IN/sms.lang             |   0
 {public => htdocs}/langs/en_IN/stocks.lang          |   0
 .../langs/en_IN/supplier_proposal.lang              |   0
 {public => htdocs}/langs/en_IN/suppliers.lang       |   0
 {public => htdocs}/langs/en_IN/trips.lang           |   0
 {public => htdocs}/langs/en_IN/users.lang           |   0
 {public => htdocs}/langs/en_IN/website.lang         |   0
 {public => htdocs}/langs/en_IN/withdrawals.lang     |   0
 {public => htdocs}/langs/en_IN/workflow.lang        |   0
 {public => htdocs}/langs/en_NZ/companies.lang       |   0
 {public => htdocs}/langs/en_NZ/compta.lang          |   0
 {public => htdocs}/langs/en_NZ/main.lang            |   0
 {public => htdocs}/langs/en_SA/main.lang            |   0
 {public => htdocs}/langs/en_SA/propal.lang          |   0
 {public => htdocs}/langs/en_US/accountancy.lang     |   0
 {public => htdocs}/langs/en_US/admin.lang           |   0
 {public => htdocs}/langs/en_US/agenda.lang          |   0
 {public => htdocs}/langs/en_US/banks.lang           |   0
 {public => htdocs}/langs/en_US/bills.lang           |   0
 {public => htdocs}/langs/en_US/bookmarks.lang       |   0
 {public => htdocs}/langs/en_US/boxes.lang           |   0
 {public => htdocs}/langs/en_US/cashdesk.lang        |   0
 {public => htdocs}/langs/en_US/categories.lang      |   0
 {public => htdocs}/langs/en_US/commercial.lang      |   0
 {public => htdocs}/langs/en_US/companies.lang       |   0
 {public => htdocs}/langs/en_US/compta.lang          |   0
 {public => htdocs}/langs/en_US/contracts.lang       |   0
 {public => htdocs}/langs/en_US/cron.lang            |   0
 {public => htdocs}/langs/en_US/deliveries.lang      |   0
 {public => htdocs}/langs/en_US/dict.lang            |   0
 {public => htdocs}/langs/en_US/donations.lang       |   0
 {public => htdocs}/langs/en_US/ecm.lang             |   0
 {public => htdocs}/langs/en_US/errors.lang          |   0
 {public => htdocs}/langs/en_US/exports.lang         |   0
 {public => htdocs}/langs/en_US/externalsite.lang    |   0
 {public => htdocs}/langs/en_US/ftp.lang             |   0
 {public => htdocs}/langs/en_US/help.lang            |   0
 {public => htdocs}/langs/en_US/holiday.lang         |   0
 {public => htdocs}/langs/en_US/hrm.lang             |   0
 {public => htdocs}/langs/en_US/incoterm.lang        |   0
 {public => htdocs}/langs/en_US/install.lang         |   0
 {public => htdocs}/langs/en_US/interventions.lang   |   0
 {public => htdocs}/langs/en_US/languages.lang       |   0
 {public => htdocs}/langs/en_US/ldap.lang            |   0
 {public => htdocs}/langs/en_US/link.lang            |   0
 {public => htdocs}/langs/en_US/loan.lang            |   0
 {public => htdocs}/langs/en_US/mailmanspip.lang     |   0
 {public => htdocs}/langs/en_US/mails.lang           |   0
 {public => htdocs}/langs/en_US/main.lang            |   0
 {public => htdocs}/langs/en_US/margins.lang         |   0
 {public => htdocs}/langs/en_US/members.lang         |   0
 {public => htdocs}/langs/en_US/multicurrency.lang   |   0
 {public => htdocs}/langs/en_US/oauth.lang           |   0
 {public => htdocs}/langs/en_US/opensurvey.lang      |   0
 {public => htdocs}/langs/en_US/orders.lang          |   0
 {public => htdocs}/langs/en_US/other.lang           |   0
 {public => htdocs}/langs/en_US/paybox.lang          |   0
 {public => htdocs}/langs/en_US/paypal.lang          |   0
 {public => htdocs}/langs/en_US/printing.lang        |   0
 {public => htdocs}/langs/en_US/productbatch.lang    |   0
 {public => htdocs}/langs/en_US/products.lang        |   0
 {public => htdocs}/langs/en_US/projects.lang        |   0
 {public => htdocs}/langs/en_US/propal.lang          |   0
 {public => htdocs}/langs/en_US/receiptprinter.lang  |   0
 {public => htdocs}/langs/en_US/resource.lang        |   0
 {public => htdocs}/langs/en_US/salaries.lang        |   0
 {public => htdocs}/langs/en_US/sendings.lang        |   0
 {public => htdocs}/langs/en_US/sms.lang             |   0
 {public => htdocs}/langs/en_US/stocks.lang          |   0
 .../langs/en_US/supplier_proposal.lang              |   0
 {public => htdocs}/langs/en_US/suppliers.lang       |   0
 {public => htdocs}/langs/en_US/trips.lang           |   0
 {public => htdocs}/langs/en_US/users.lang           |   0
 {public => htdocs}/langs/en_US/website.lang         |   0
 {public => htdocs}/langs/en_US/withdrawals.lang     |   0
 {public => htdocs}/langs/en_US/workflow.lang        |   0
 {public => htdocs}/langs/en_ZA/main.lang            |   0
 {public => htdocs}/langs/es_AR/accountancy.lang     |   0
 {public => htdocs}/langs/es_AR/admin.lang           |   0
 {public => htdocs}/langs/es_AR/agenda.lang          |   0
 {public => htdocs}/langs/es_AR/banks.lang           |   0
 {public => htdocs}/langs/es_AR/bills.lang           |   0
 {public => htdocs}/langs/es_AR/bookmarks.lang       |   0
 {public => htdocs}/langs/es_AR/boxes.lang           |   0
 {public => htdocs}/langs/es_AR/cashdesk.lang        |   0
 {public => htdocs}/langs/es_AR/categories.lang      |   0
 {public => htdocs}/langs/es_AR/commercial.lang      |   0
 {public => htdocs}/langs/es_AR/companies.lang       |   0
 {public => htdocs}/langs/es_AR/compta.lang          |   0
 {public => htdocs}/langs/es_AR/contracts.lang       |   0
 {public => htdocs}/langs/es_AR/cron.lang            |   0
 {public => htdocs}/langs/es_AR/deliveries.lang      |   0
 {public => htdocs}/langs/es_AR/dict.lang            |   0
 {public => htdocs}/langs/es_AR/donations.lang       |   0
 {public => htdocs}/langs/es_AR/ecm.lang             |   0
 {public => htdocs}/langs/es_AR/errors.lang          |   0
 {public => htdocs}/langs/es_AR/exports.lang         |   0
 {public => htdocs}/langs/es_AR/externalsite.lang    |   0
 {public => htdocs}/langs/es_AR/ftp.lang             |   0
 {public => htdocs}/langs/es_AR/help.lang            |   0
 {public => htdocs}/langs/es_AR/holiday.lang         |   0
 {public => htdocs}/langs/es_AR/hrm.lang             |   0
 {public => htdocs}/langs/es_AR/incoterm.lang        |   0
 {public => htdocs}/langs/es_AR/install.lang         |   0
 {public => htdocs}/langs/es_AR/interventions.lang   |   0
 {public => htdocs}/langs/es_AR/languages.lang       |   0
 {public => htdocs}/langs/es_AR/ldap.lang            |   0
 {public => htdocs}/langs/es_AR/link.lang            |   0
 {public => htdocs}/langs/es_AR/loan.lang            |   0
 {public => htdocs}/langs/es_AR/mailmanspip.lang     |   0
 {public => htdocs}/langs/es_AR/mails.lang           |   0
 {public => htdocs}/langs/es_AR/main.lang            |   0
 {public => htdocs}/langs/es_AR/margins.lang         |   0
 {public => htdocs}/langs/es_AR/members.lang         |   0
 {public => htdocs}/langs/es_AR/oauth.lang           |   0
 {public => htdocs}/langs/es_AR/opensurvey.lang      |   0
 {public => htdocs}/langs/es_AR/orders.lang          |   0
 {public => htdocs}/langs/es_AR/other.lang           |   0
 {public => htdocs}/langs/es_AR/paybox.lang          |   0
 {public => htdocs}/langs/es_AR/paypal.lang          |   0
 {public => htdocs}/langs/es_AR/printing.lang        |   0
 {public => htdocs}/langs/es_AR/productbatch.lang    |   0
 {public => htdocs}/langs/es_AR/products.lang        |   0
 {public => htdocs}/langs/es_AR/projects.lang        |   0
 {public => htdocs}/langs/es_AR/propal.lang          |   0
 {public => htdocs}/langs/es_AR/receiptprinter.lang  |   0
 {public => htdocs}/langs/es_AR/resource.lang        |   0
 {public => htdocs}/langs/es_AR/salaries.lang        |   0
 {public => htdocs}/langs/es_AR/sendings.lang        |   0
 {public => htdocs}/langs/es_AR/sms.lang             |   0
 {public => htdocs}/langs/es_AR/stocks.lang          |   0
 .../langs/es_AR/supplier_proposal.lang              |   0
 {public => htdocs}/langs/es_AR/suppliers.lang       |   0
 {public => htdocs}/langs/es_AR/trips.lang           |   0
 {public => htdocs}/langs/es_AR/users.lang           |   0
 {public => htdocs}/langs/es_AR/website.lang         |   0
 {public => htdocs}/langs/es_AR/withdrawals.lang     |   0
 {public => htdocs}/langs/es_AR/workflow.lang        |   0
 {public => htdocs}/langs/es_BO/accountancy.lang     |   0
 {public => htdocs}/langs/es_BO/admin.lang           |   0
 {public => htdocs}/langs/es_BO/agenda.lang          |   0
 {public => htdocs}/langs/es_BO/banks.lang           |   0
 {public => htdocs}/langs/es_BO/bills.lang           |   0
 {public => htdocs}/langs/es_BO/bookmarks.lang       |   0
 {public => htdocs}/langs/es_BO/boxes.lang           |   0
 {public => htdocs}/langs/es_BO/cashdesk.lang        |   0
 {public => htdocs}/langs/es_BO/categories.lang      |   0
 {public => htdocs}/langs/es_BO/commercial.lang      |   0
 {public => htdocs}/langs/es_BO/companies.lang       |   0
 {public => htdocs}/langs/es_BO/compta.lang          |   0
 {public => htdocs}/langs/es_BO/contracts.lang       |   0
 {public => htdocs}/langs/es_BO/cron.lang            |   0
 {public => htdocs}/langs/es_BO/deliveries.lang      |   0
 {public => htdocs}/langs/es_BO/dict.lang            |   0
 {public => htdocs}/langs/es_BO/donations.lang       |   0
 {public => htdocs}/langs/es_BO/ecm.lang             |   0
 {public => htdocs}/langs/es_BO/errors.lang          |   0
 {public => htdocs}/langs/es_BO/exports.lang         |   0
 {public => htdocs}/langs/es_BO/externalsite.lang    |   0
 {public => htdocs}/langs/es_BO/ftp.lang             |   0
 {public => htdocs}/langs/es_BO/help.lang            |   0
 {public => htdocs}/langs/es_BO/holiday.lang         |   0
 {public => htdocs}/langs/es_BO/hrm.lang             |   0
 {public => htdocs}/langs/es_BO/incoterm.lang        |   0
 {public => htdocs}/langs/es_BO/install.lang         |   0
 {public => htdocs}/langs/es_BO/interventions.lang   |   0
 {public => htdocs}/langs/es_BO/languages.lang       |   0
 {public => htdocs}/langs/es_BO/ldap.lang            |   0
 {public => htdocs}/langs/es_BO/link.lang            |   0
 {public => htdocs}/langs/es_BO/loan.lang            |   0
 {public => htdocs}/langs/es_BO/mailmanspip.lang     |   0
 {public => htdocs}/langs/es_BO/mails.lang           |   0
 {public => htdocs}/langs/es_BO/main.lang            |   0
 {public => htdocs}/langs/es_BO/margins.lang         |   0
 {public => htdocs}/langs/es_BO/members.lang         |   0
 {public => htdocs}/langs/es_BO/oauth.lang           |   0
 {public => htdocs}/langs/es_BO/opensurvey.lang      |   0
 {public => htdocs}/langs/es_BO/orders.lang          |   0
 {public => htdocs}/langs/es_BO/other.lang           |   0
 {public => htdocs}/langs/es_BO/paybox.lang          |   0
 {public => htdocs}/langs/es_BO/paypal.lang          |   0
 {public => htdocs}/langs/es_BO/printing.lang        |   0
 {public => htdocs}/langs/es_BO/productbatch.lang    |   0
 {public => htdocs}/langs/es_BO/products.lang        |   0
 {public => htdocs}/langs/es_BO/projects.lang        |   0
 {public => htdocs}/langs/es_BO/propal.lang          |   0
 {public => htdocs}/langs/es_BO/receiptprinter.lang  |   0
 {public => htdocs}/langs/es_BO/resource.lang        |   0
 {public => htdocs}/langs/es_BO/salaries.lang        |   0
 {public => htdocs}/langs/es_BO/sendings.lang        |   0
 {public => htdocs}/langs/es_BO/sms.lang             |   0
 {public => htdocs}/langs/es_BO/stocks.lang          |   0
 .../langs/es_BO/supplier_proposal.lang              |   0
 {public => htdocs}/langs/es_BO/suppliers.lang       |   0
 {public => htdocs}/langs/es_BO/trips.lang           |   0
 {public => htdocs}/langs/es_BO/users.lang           |   0
 {public => htdocs}/langs/es_BO/website.lang         |   0
 {public => htdocs}/langs/es_BO/withdrawals.lang     |   0
 {public => htdocs}/langs/es_BO/workflow.lang        |   0
 {public => htdocs}/langs/es_CL/accountancy.lang     |   0
 {public => htdocs}/langs/es_CL/admin.lang           |   0
 {public => htdocs}/langs/es_CL/agenda.lang          |   0
 {public => htdocs}/langs/es_CL/banks.lang           |   0
 {public => htdocs}/langs/es_CL/bills.lang           |   0
 {public => htdocs}/langs/es_CL/bookmarks.lang       |   0
 {public => htdocs}/langs/es_CL/boxes.lang           |   0
 {public => htdocs}/langs/es_CL/cashdesk.lang        |   0
 {public => htdocs}/langs/es_CL/categories.lang      |   0
 {public => htdocs}/langs/es_CL/commercial.lang      |   0
 {public => htdocs}/langs/es_CL/companies.lang       |   0
 {public => htdocs}/langs/es_CL/compta.lang          |   0
 {public => htdocs}/langs/es_CL/contracts.lang       |   0
 {public => htdocs}/langs/es_CL/cron.lang            |   0
 {public => htdocs}/langs/es_CL/deliveries.lang      |   0
 {public => htdocs}/langs/es_CL/dict.lang            |   0
 {public => htdocs}/langs/es_CL/donations.lang       |   0
 {public => htdocs}/langs/es_CL/ecm.lang             |   0
 {public => htdocs}/langs/es_CL/errors.lang          |   0
 {public => htdocs}/langs/es_CL/exports.lang         |   0
 {public => htdocs}/langs/es_CL/externalsite.lang    |   0
 {public => htdocs}/langs/es_CL/ftp.lang             |   0
 {public => htdocs}/langs/es_CL/help.lang            |   0
 {public => htdocs}/langs/es_CL/holiday.lang         |   0
 {public => htdocs}/langs/es_CL/hrm.lang             |   0
 {public => htdocs}/langs/es_CL/incoterm.lang        |   0
 {public => htdocs}/langs/es_CL/install.lang         |   0
 {public => htdocs}/langs/es_CL/interventions.lang   |   0
 {public => htdocs}/langs/es_CL/languages.lang       |   0
 {public => htdocs}/langs/es_CL/ldap.lang            |   0
 {public => htdocs}/langs/es_CL/link.lang            |   0
 {public => htdocs}/langs/es_CL/loan.lang            |   0
 {public => htdocs}/langs/es_CL/mailmanspip.lang     |   0
 {public => htdocs}/langs/es_CL/mails.lang           |   0
 {public => htdocs}/langs/es_CL/main.lang            |   0
 {public => htdocs}/langs/es_CL/margins.lang         |   0
 {public => htdocs}/langs/es_CL/members.lang         |   0
 {public => htdocs}/langs/es_CL/oauth.lang           |   0
 {public => htdocs}/langs/es_CL/opensurvey.lang      |   0
 {public => htdocs}/langs/es_CL/orders.lang          |   0
 {public => htdocs}/langs/es_CL/other.lang           |   0
 {public => htdocs}/langs/es_CL/paybox.lang          |   0
 {public => htdocs}/langs/es_CL/paypal.lang          |   0
 {public => htdocs}/langs/es_CL/printing.lang        |   0
 {public => htdocs}/langs/es_CL/productbatch.lang    |   0
 {public => htdocs}/langs/es_CL/products.lang        |   0
 {public => htdocs}/langs/es_CL/projects.lang        |   0
 {public => htdocs}/langs/es_CL/propal.lang          |   0
 {public => htdocs}/langs/es_CL/receiptprinter.lang  |   0
 {public => htdocs}/langs/es_CL/resource.lang        |   0
 {public => htdocs}/langs/es_CL/salaries.lang        |   0
 {public => htdocs}/langs/es_CL/sendings.lang        |   0
 {public => htdocs}/langs/es_CL/sms.lang             |   0
 {public => htdocs}/langs/es_CL/stocks.lang          |   0
 .../langs/es_CL/supplier_proposal.lang              |   0
 {public => htdocs}/langs/es_CL/suppliers.lang       |   0
 {public => htdocs}/langs/es_CL/trips.lang           |   0
 {public => htdocs}/langs/es_CL/users.lang           |   0
 {public => htdocs}/langs/es_CL/website.lang         |   0
 {public => htdocs}/langs/es_CL/withdrawals.lang     |   0
 {public => htdocs}/langs/es_CL/workflow.lang        |   0
 {public => htdocs}/langs/es_CO/accountancy.lang     |   0
 {public => htdocs}/langs/es_CO/admin.lang           |   0
 {public => htdocs}/langs/es_CO/agenda.lang          |   0
 {public => htdocs}/langs/es_CO/banks.lang           |   0
 {public => htdocs}/langs/es_CO/bills.lang           |   0
 {public => htdocs}/langs/es_CO/bookmarks.lang       |   0
 {public => htdocs}/langs/es_CO/boxes.lang           |   0
 {public => htdocs}/langs/es_CO/cashdesk.lang        |   0
 {public => htdocs}/langs/es_CO/categories.lang      |   0
 {public => htdocs}/langs/es_CO/commercial.lang      |   0
 {public => htdocs}/langs/es_CO/companies.lang       |   0
 {public => htdocs}/langs/es_CO/compta.lang          |   0
 {public => htdocs}/langs/es_CO/contracts.lang       |   0
 {public => htdocs}/langs/es_CO/cron.lang            |   0
 {public => htdocs}/langs/es_CO/deliveries.lang      |   0
 {public => htdocs}/langs/es_CO/dict.lang            |   0
 {public => htdocs}/langs/es_CO/donations.lang       |   0
 {public => htdocs}/langs/es_CO/ecm.lang             |   0
 {public => htdocs}/langs/es_CO/errors.lang          |   0
 {public => htdocs}/langs/es_CO/exports.lang         |   0
 {public => htdocs}/langs/es_CO/externalsite.lang    |   0
 {public => htdocs}/langs/es_CO/ftp.lang             |   0
 {public => htdocs}/langs/es_CO/help.lang            |   0
 {public => htdocs}/langs/es_CO/holiday.lang         |   0
 {public => htdocs}/langs/es_CO/hrm.lang             |   0
 {public => htdocs}/langs/es_CO/incoterm.lang        |   0
 {public => htdocs}/langs/es_CO/install.lang         |   0
 {public => htdocs}/langs/es_CO/interventions.lang   |   0
 {public => htdocs}/langs/es_CO/languages.lang       |   0
 {public => htdocs}/langs/es_CO/ldap.lang            |   0
 {public => htdocs}/langs/es_CO/link.lang            |   0
 {public => htdocs}/langs/es_CO/loan.lang            |   0
 {public => htdocs}/langs/es_CO/mailmanspip.lang     |   0
 {public => htdocs}/langs/es_CO/mails.lang           |   0
 {public => htdocs}/langs/es_CO/main.lang            |   0
 {public => htdocs}/langs/es_CO/margins.lang         |   0
 {public => htdocs}/langs/es_CO/members.lang         |   0
 {public => htdocs}/langs/es_CO/oauth.lang           |   0
 {public => htdocs}/langs/es_CO/opensurvey.lang      |   0
 {public => htdocs}/langs/es_CO/orders.lang          |   0
 {public => htdocs}/langs/es_CO/other.lang           |   0
 {public => htdocs}/langs/es_CO/paybox.lang          |   0
 {public => htdocs}/langs/es_CO/paypal.lang          |   0
 {public => htdocs}/langs/es_CO/printing.lang        |   0
 {public => htdocs}/langs/es_CO/productbatch.lang    |   0
 {public => htdocs}/langs/es_CO/products.lang        |   0
 {public => htdocs}/langs/es_CO/projects.lang        |   0
 {public => htdocs}/langs/es_CO/propal.lang          |   0
 {public => htdocs}/langs/es_CO/receiptprinter.lang  |   0
 {public => htdocs}/langs/es_CO/resource.lang        |   0
 {public => htdocs}/langs/es_CO/salaries.lang        |   0
 {public => htdocs}/langs/es_CO/sendings.lang        |   0
 {public => htdocs}/langs/es_CO/sms.lang             |   0
 {public => htdocs}/langs/es_CO/stocks.lang          |   0
 .../langs/es_CO/supplier_proposal.lang              |   0
 {public => htdocs}/langs/es_CO/suppliers.lang       |   0
 {public => htdocs}/langs/es_CO/trips.lang           |   0
 {public => htdocs}/langs/es_CO/users.lang           |   0
 {public => htdocs}/langs/es_CO/website.lang         |   0
 {public => htdocs}/langs/es_CO/withdrawals.lang     |   0
 {public => htdocs}/langs/es_CO/workflow.lang        |   0
 {public => htdocs}/langs/es_DO/accountancy.lang     |   0
 {public => htdocs}/langs/es_DO/admin.lang           |   0
 {public => htdocs}/langs/es_DO/agenda.lang          |   0
 {public => htdocs}/langs/es_DO/banks.lang           |   0
 {public => htdocs}/langs/es_DO/bills.lang           |   0
 {public => htdocs}/langs/es_DO/bookmarks.lang       |   0
 {public => htdocs}/langs/es_DO/boxes.lang           |   0
 {public => htdocs}/langs/es_DO/cashdesk.lang        |   0
 {public => htdocs}/langs/es_DO/categories.lang      |   0
 {public => htdocs}/langs/es_DO/commercial.lang      |   0
 {public => htdocs}/langs/es_DO/companies.lang       |   0
 {public => htdocs}/langs/es_DO/compta.lang          |   0
 {public => htdocs}/langs/es_DO/contracts.lang       |   0
 {public => htdocs}/langs/es_DO/cron.lang            |   0
 {public => htdocs}/langs/es_DO/deliveries.lang      |   0
 {public => htdocs}/langs/es_DO/dict.lang            |   0
 {public => htdocs}/langs/es_DO/donations.lang       |   0
 {public => htdocs}/langs/es_DO/ecm.lang             |   0
 {public => htdocs}/langs/es_DO/errors.lang          |   0
 {public => htdocs}/langs/es_DO/exports.lang         |   0
 {public => htdocs}/langs/es_DO/externalsite.lang    |   0
 {public => htdocs}/langs/es_DO/ftp.lang             |   0
 {public => htdocs}/langs/es_DO/help.lang            |   0
 {public => htdocs}/langs/es_DO/holiday.lang         |   0
 {public => htdocs}/langs/es_DO/hrm.lang             |   0
 {public => htdocs}/langs/es_DO/incoterm.lang        |   0
 {public => htdocs}/langs/es_DO/install.lang         |   0
 {public => htdocs}/langs/es_DO/interventions.lang   |   0
 {public => htdocs}/langs/es_DO/languages.lang       |   0
 {public => htdocs}/langs/es_DO/ldap.lang            |   0
 {public => htdocs}/langs/es_DO/link.lang            |   0
 {public => htdocs}/langs/es_DO/loan.lang            |   0
 {public => htdocs}/langs/es_DO/mailmanspip.lang     |   0
 {public => htdocs}/langs/es_DO/mails.lang           |   0
 {public => htdocs}/langs/es_DO/main.lang            |   0
 {public => htdocs}/langs/es_DO/margins.lang         |   0
 {public => htdocs}/langs/es_DO/members.lang         |   0
 {public => htdocs}/langs/es_DO/oauth.lang           |   0
 {public => htdocs}/langs/es_DO/opensurvey.lang      |   0
 {public => htdocs}/langs/es_DO/orders.lang          |   0
 {public => htdocs}/langs/es_DO/other.lang           |   0
 {public => htdocs}/langs/es_DO/paybox.lang          |   0
 {public => htdocs}/langs/es_DO/paypal.lang          |   0
 {public => htdocs}/langs/es_DO/printing.lang        |   0
 {public => htdocs}/langs/es_DO/productbatch.lang    |   0
 {public => htdocs}/langs/es_DO/products.lang        |   0
 {public => htdocs}/langs/es_DO/projects.lang        |   0
 {public => htdocs}/langs/es_DO/propal.lang          |   0
 {public => htdocs}/langs/es_DO/receiptprinter.lang  |   0
 {public => htdocs}/langs/es_DO/resource.lang        |   0
 {public => htdocs}/langs/es_DO/salaries.lang        |   0
 {public => htdocs}/langs/es_DO/sendings.lang        |   0
 {public => htdocs}/langs/es_DO/sms.lang             |   0
 {public => htdocs}/langs/es_DO/stocks.lang          |   0
 .../langs/es_DO/supplier_proposal.lang              |   0
 {public => htdocs}/langs/es_DO/suppliers.lang       |   0
 {public => htdocs}/langs/es_DO/trips.lang           |   0
 {public => htdocs}/langs/es_DO/users.lang           |   0
 {public => htdocs}/langs/es_DO/website.lang         |   0
 {public => htdocs}/langs/es_DO/withdrawals.lang     |   0
 {public => htdocs}/langs/es_DO/workflow.lang        |   0
 {public => htdocs}/langs/es_EC/accountancy.lang     |   0
 {public => htdocs}/langs/es_EC/admin.lang           |   0
 {public => htdocs}/langs/es_EC/agenda.lang          |   0
 {public => htdocs}/langs/es_EC/banks.lang           |   0
 {public => htdocs}/langs/es_EC/bills.lang           |   0
 {public => htdocs}/langs/es_EC/bookmarks.lang       |   0
 {public => htdocs}/langs/es_EC/boxes.lang           |   0
 {public => htdocs}/langs/es_EC/cashdesk.lang        |   0
 {public => htdocs}/langs/es_EC/categories.lang      |   0
 {public => htdocs}/langs/es_EC/commercial.lang      |   0
 {public => htdocs}/langs/es_EC/companies.lang       |   0
 {public => htdocs}/langs/es_EC/compta.lang          |   0
 {public => htdocs}/langs/es_EC/contracts.lang       |   0
 {public => htdocs}/langs/es_EC/cron.lang            |   0
 {public => htdocs}/langs/es_EC/deliveries.lang      |   0
 {public => htdocs}/langs/es_EC/dict.lang            |   0
 {public => htdocs}/langs/es_EC/donations.lang       |   0
 {public => htdocs}/langs/es_EC/ecm.lang             |   0
 {public => htdocs}/langs/es_EC/errors.lang          |   0
 {public => htdocs}/langs/es_EC/exports.lang         |   0
 {public => htdocs}/langs/es_EC/externalsite.lang    |   0
 {public => htdocs}/langs/es_EC/ftp.lang             |   0
 {public => htdocs}/langs/es_EC/help.lang            |   0
 {public => htdocs}/langs/es_EC/holiday.lang         |   0
 {public => htdocs}/langs/es_EC/hrm.lang             |   0
 {public => htdocs}/langs/es_EC/incoterm.lang        |   0
 {public => htdocs}/langs/es_EC/install.lang         |   0
 {public => htdocs}/langs/es_EC/interventions.lang   |   0
 {public => htdocs}/langs/es_EC/languages.lang       |   0
 {public => htdocs}/langs/es_EC/ldap.lang            |   0
 {public => htdocs}/langs/es_EC/link.lang            |   0
 {public => htdocs}/langs/es_EC/loan.lang            |   0
 {public => htdocs}/langs/es_EC/mailmanspip.lang     |   0
 {public => htdocs}/langs/es_EC/mails.lang           |   0
 {public => htdocs}/langs/es_EC/main.lang            |   0
 {public => htdocs}/langs/es_EC/margins.lang         |   0
 {public => htdocs}/langs/es_EC/members.lang         |   0
 {public => htdocs}/langs/es_EC/oauth.lang           |   0
 {public => htdocs}/langs/es_EC/opensurvey.lang      |   0
 {public => htdocs}/langs/es_EC/orders.lang          |   0
 {public => htdocs}/langs/es_EC/other.lang           |   0
 {public => htdocs}/langs/es_EC/paybox.lang          |   0
 {public => htdocs}/langs/es_EC/paypal.lang          |   0
 {public => htdocs}/langs/es_EC/printing.lang        |   0
 {public => htdocs}/langs/es_EC/productbatch.lang    |   0
 {public => htdocs}/langs/es_EC/products.lang        |   0
 {public => htdocs}/langs/es_EC/projects.lang        |   0
 {public => htdocs}/langs/es_EC/propal.lang          |   0
 {public => htdocs}/langs/es_EC/receiptprinter.lang  |   0
 {public => htdocs}/langs/es_EC/resource.lang        |   0
 {public => htdocs}/langs/es_EC/salaries.lang        |   0
 {public => htdocs}/langs/es_EC/sendings.lang        |   0
 {public => htdocs}/langs/es_EC/sms.lang             |   0
 {public => htdocs}/langs/es_EC/stocks.lang          |   0
 .../langs/es_EC/supplier_proposal.lang              |   0
 {public => htdocs}/langs/es_EC/suppliers.lang       |   0
 {public => htdocs}/langs/es_EC/trips.lang           |   0
 {public => htdocs}/langs/es_EC/users.lang           |   0
 {public => htdocs}/langs/es_EC/website.lang         |   0
 {public => htdocs}/langs/es_EC/withdrawals.lang     |   0
 {public => htdocs}/langs/es_EC/workflow.lang        |   0
 {public => htdocs}/langs/es_ES/accountancy.lang     |   0
 {public => htdocs}/langs/es_ES/admin.lang           |   0
 {public => htdocs}/langs/es_ES/agenda.lang          |   0
 {public => htdocs}/langs/es_ES/banks.lang           |   0
 {public => htdocs}/langs/es_ES/bills.lang           |   0
 {public => htdocs}/langs/es_ES/bookmarks.lang       |   0
 {public => htdocs}/langs/es_ES/boxes.lang           |   0
 {public => htdocs}/langs/es_ES/cashdesk.lang        |   0
 {public => htdocs}/langs/es_ES/categories.lang      |   0
 {public => htdocs}/langs/es_ES/commercial.lang      |   0
 {public => htdocs}/langs/es_ES/companies.lang       |   0
 {public => htdocs}/langs/es_ES/compta.lang          |   0
 {public => htdocs}/langs/es_ES/contracts.lang       |   0
 {public => htdocs}/langs/es_ES/cron.lang            |   0
 {public => htdocs}/langs/es_ES/deliveries.lang      |   0
 {public => htdocs}/langs/es_ES/dict.lang            |   0
 {public => htdocs}/langs/es_ES/donations.lang       |   0
 {public => htdocs}/langs/es_ES/ecm.lang             |   0
 {public => htdocs}/langs/es_ES/errors.lang          |   0
 {public => htdocs}/langs/es_ES/exports.lang         |   0
 {public => htdocs}/langs/es_ES/externalsite.lang    |   0
 {public => htdocs}/langs/es_ES/ftp.lang             |   0
 {public => htdocs}/langs/es_ES/help.lang            |   0
 {public => htdocs}/langs/es_ES/holiday.lang         |   0
 {public => htdocs}/langs/es_ES/hrm.lang             |   0
 {public => htdocs}/langs/es_ES/incoterm.lang        |   0
 {public => htdocs}/langs/es_ES/install.lang         |   0
 {public => htdocs}/langs/es_ES/interventions.lang   |   0
 {public => htdocs}/langs/es_ES/languages.lang       |   0
 {public => htdocs}/langs/es_ES/ldap.lang            |   0
 {public => htdocs}/langs/es_ES/link.lang            |   0
 {public => htdocs}/langs/es_ES/loan.lang            |   0
 {public => htdocs}/langs/es_ES/mailmanspip.lang     |   0
 {public => htdocs}/langs/es_ES/mails.lang           |   0
 {public => htdocs}/langs/es_ES/main.lang            |   0
 {public => htdocs}/langs/es_ES/margins.lang         |   0
 {public => htdocs}/langs/es_ES/members.lang         |   0
 {public => htdocs}/langs/es_ES/oauth.lang           |   0
 {public => htdocs}/langs/es_ES/opensurvey.lang      |   0
 {public => htdocs}/langs/es_ES/orders.lang          |   0
 {public => htdocs}/langs/es_ES/other.lang           |   0
 {public => htdocs}/langs/es_ES/paybox.lang          |   0
 {public => htdocs}/langs/es_ES/paypal.lang          |   0
 {public => htdocs}/langs/es_ES/printing.lang        |   0
 {public => htdocs}/langs/es_ES/productbatch.lang    |   0
 {public => htdocs}/langs/es_ES/products.lang        |   0
 {public => htdocs}/langs/es_ES/projects.lang        |   0
 {public => htdocs}/langs/es_ES/propal.lang          |   0
 {public => htdocs}/langs/es_ES/receiptprinter.lang  |   0
 {public => htdocs}/langs/es_ES/resource.lang        |   0
 {public => htdocs}/langs/es_ES/salaries.lang        |   0
 {public => htdocs}/langs/es_ES/sendings.lang        |   0
 {public => htdocs}/langs/es_ES/sms.lang             |   0
 {public => htdocs}/langs/es_ES/stocks.lang          |   0
 .../langs/es_ES/supplier_proposal.lang              |   0
 {public => htdocs}/langs/es_ES/suppliers.lang       |   0
 {public => htdocs}/langs/es_ES/trips.lang           |   0
 {public => htdocs}/langs/es_ES/users.lang           |   0
 {public => htdocs}/langs/es_ES/website.lang         |   0
 {public => htdocs}/langs/es_ES/withdrawals.lang     |   0
 {public => htdocs}/langs/es_ES/workflow.lang        |   0
 {public => htdocs}/langs/es_HN/admin.lang           |   0
 {public => htdocs}/langs/es_HN/bills.lang           |   0
 {public => htdocs}/langs/es_HN/companies.lang       |   0
 {public => htdocs}/langs/es_HN/compta.lang          |   0
 {public => htdocs}/langs/es_HN/main.lang            |   0
 {public => htdocs}/langs/es_HN/propal.lang          |   0
 {public => htdocs}/langs/es_MX/accountancy.lang     |   0
 {public => htdocs}/langs/es_MX/admin.lang           |   0
 {public => htdocs}/langs/es_MX/agenda.lang          |   0
 {public => htdocs}/langs/es_MX/banks.lang           |   0
 {public => htdocs}/langs/es_MX/bills.lang           |   0
 {public => htdocs}/langs/es_MX/bookmarks.lang       |   0
 {public => htdocs}/langs/es_MX/boxes.lang           |   0
 {public => htdocs}/langs/es_MX/cashdesk.lang        |   0
 {public => htdocs}/langs/es_MX/categories.lang      |   0
 {public => htdocs}/langs/es_MX/commercial.lang      |   0
 {public => htdocs}/langs/es_MX/companies.lang       |   0
 {public => htdocs}/langs/es_MX/compta.lang          |   0
 {public => htdocs}/langs/es_MX/contracts.lang       |   0
 {public => htdocs}/langs/es_MX/cron.lang            |   0
 {public => htdocs}/langs/es_MX/deliveries.lang      |   0
 {public => htdocs}/langs/es_MX/dict.lang            |   0
 {public => htdocs}/langs/es_MX/donations.lang       |   0
 {public => htdocs}/langs/es_MX/ecm.lang             |   0
 {public => htdocs}/langs/es_MX/errors.lang          |   0
 {public => htdocs}/langs/es_MX/exports.lang         |   0
 {public => htdocs}/langs/es_MX/externalsite.lang    |   0
 {public => htdocs}/langs/es_MX/ftp.lang             |   0
 {public => htdocs}/langs/es_MX/help.lang            |   0
 {public => htdocs}/langs/es_MX/holiday.lang         |   0
 {public => htdocs}/langs/es_MX/hrm.lang             |   0
 {public => htdocs}/langs/es_MX/incoterm.lang        |   0
 {public => htdocs}/langs/es_MX/install.lang         |   0
 {public => htdocs}/langs/es_MX/interventions.lang   |   0
 {public => htdocs}/langs/es_MX/languages.lang       |   0
 {public => htdocs}/langs/es_MX/ldap.lang            |   0
 {public => htdocs}/langs/es_MX/link.lang            |   0
 {public => htdocs}/langs/es_MX/loan.lang            |   0
 {public => htdocs}/langs/es_MX/mailmanspip.lang     |   0
 {public => htdocs}/langs/es_MX/mails.lang           |   0
 {public => htdocs}/langs/es_MX/main.lang            |   0
 {public => htdocs}/langs/es_MX/margins.lang         |   0
 {public => htdocs}/langs/es_MX/members.lang         |   0
 {public => htdocs}/langs/es_MX/oauth.lang           |   0
 {public => htdocs}/langs/es_MX/opensurvey.lang      |   0
 {public => htdocs}/langs/es_MX/orders.lang          |   0
 {public => htdocs}/langs/es_MX/other.lang           |   0
 {public => htdocs}/langs/es_MX/paybox.lang          |   0
 {public => htdocs}/langs/es_MX/paypal.lang          |   0
 {public => htdocs}/langs/es_MX/printing.lang        |   0
 {public => htdocs}/langs/es_MX/productbatch.lang    |   0
 {public => htdocs}/langs/es_MX/products.lang        |   0
 {public => htdocs}/langs/es_MX/projects.lang        |   0
 {public => htdocs}/langs/es_MX/propal.lang          |   0
 {public => htdocs}/langs/es_MX/receiptprinter.lang  |   0
 {public => htdocs}/langs/es_MX/resource.lang        |   0
 {public => htdocs}/langs/es_MX/salaries.lang        |   0
 {public => htdocs}/langs/es_MX/sendings.lang        |   0
 {public => htdocs}/langs/es_MX/sms.lang             |   0
 {public => htdocs}/langs/es_MX/stocks.lang          |   0
 .../langs/es_MX/supplier_proposal.lang              |   0
 {public => htdocs}/langs/es_MX/suppliers.lang       |   0
 {public => htdocs}/langs/es_MX/trips.lang           |   0
 {public => htdocs}/langs/es_MX/users.lang           |   0
 {public => htdocs}/langs/es_MX/website.lang         |   0
 {public => htdocs}/langs/es_MX/withdrawals.lang     |   0
 {public => htdocs}/langs/es_MX/workflow.lang        |   0
 {public => htdocs}/langs/es_PA/accountancy.lang     |   0
 {public => htdocs}/langs/es_PA/admin.lang           |   0
 {public => htdocs}/langs/es_PA/agenda.lang          |   0
 {public => htdocs}/langs/es_PA/banks.lang           |   0
 {public => htdocs}/langs/es_PA/bills.lang           |   0
 {public => htdocs}/langs/es_PA/bookmarks.lang       |   0
 {public => htdocs}/langs/es_PA/boxes.lang           |   0
 {public => htdocs}/langs/es_PA/cashdesk.lang        |   0
 {public => htdocs}/langs/es_PA/categories.lang      |   0
 {public => htdocs}/langs/es_PA/commercial.lang      |   0
 {public => htdocs}/langs/es_PA/companies.lang       |   0
 {public => htdocs}/langs/es_PA/compta.lang          |   0
 {public => htdocs}/langs/es_PA/contracts.lang       |   0
 {public => htdocs}/langs/es_PA/cron.lang            |   0
 {public => htdocs}/langs/es_PA/deliveries.lang      |   0
 {public => htdocs}/langs/es_PA/dict.lang            |   0
 {public => htdocs}/langs/es_PA/donations.lang       |   0
 {public => htdocs}/langs/es_PA/ecm.lang             |   0
 {public => htdocs}/langs/es_PA/errors.lang          |   0
 {public => htdocs}/langs/es_PA/exports.lang         |   0
 {public => htdocs}/langs/es_PA/externalsite.lang    |   0
 {public => htdocs}/langs/es_PA/ftp.lang             |   0
 {public => htdocs}/langs/es_PA/help.lang            |   0
 {public => htdocs}/langs/es_PA/holiday.lang         |   0
 {public => htdocs}/langs/es_PA/hrm.lang             |   0
 {public => htdocs}/langs/es_PA/incoterm.lang        |   0
 {public => htdocs}/langs/es_PA/install.lang         |   0
 {public => htdocs}/langs/es_PA/interventions.lang   |   0
 {public => htdocs}/langs/es_PA/languages.lang       |   0
 {public => htdocs}/langs/es_PA/ldap.lang            |   0
 {public => htdocs}/langs/es_PA/link.lang            |   0
 {public => htdocs}/langs/es_PA/loan.lang            |   0
 {public => htdocs}/langs/es_PA/mailmanspip.lang     |   0
 {public => htdocs}/langs/es_PA/mails.lang           |   0
 {public => htdocs}/langs/es_PA/main.lang            |   0
 {public => htdocs}/langs/es_PA/margins.lang         |   0
 {public => htdocs}/langs/es_PA/members.lang         |   0
 {public => htdocs}/langs/es_PA/oauth.lang           |   0
 {public => htdocs}/langs/es_PA/opensurvey.lang      |   0
 {public => htdocs}/langs/es_PA/orders.lang          |   0
 {public => htdocs}/langs/es_PA/other.lang           |   0
 {public => htdocs}/langs/es_PA/paybox.lang          |   0
 {public => htdocs}/langs/es_PA/paypal.lang          |   0
 {public => htdocs}/langs/es_PA/printing.lang        |   0
 {public => htdocs}/langs/es_PA/productbatch.lang    |   0
 {public => htdocs}/langs/es_PA/products.lang        |   0
 {public => htdocs}/langs/es_PA/projects.lang        |   0
 {public => htdocs}/langs/es_PA/propal.lang          |   0
 {public => htdocs}/langs/es_PA/receiptprinter.lang  |   0
 {public => htdocs}/langs/es_PA/resource.lang        |   0
 {public => htdocs}/langs/es_PA/salaries.lang        |   0
 {public => htdocs}/langs/es_PA/sendings.lang        |   0
 {public => htdocs}/langs/es_PA/sms.lang             |   0
 {public => htdocs}/langs/es_PA/stocks.lang          |   0
 .../langs/es_PA/supplier_proposal.lang              |   0
 {public => htdocs}/langs/es_PA/suppliers.lang       |   0
 {public => htdocs}/langs/es_PA/trips.lang           |   0
 {public => htdocs}/langs/es_PA/users.lang           |   0
 {public => htdocs}/langs/es_PA/website.lang         |   0
 {public => htdocs}/langs/es_PA/withdrawals.lang     |   0
 {public => htdocs}/langs/es_PA/workflow.lang        |   0
 {public => htdocs}/langs/es_PE/accountancy.lang     |   0
 {public => htdocs}/langs/es_PE/admin.lang           |   0
 {public => htdocs}/langs/es_PE/agenda.lang          |   0
 {public => htdocs}/langs/es_PE/banks.lang           |   0
 {public => htdocs}/langs/es_PE/bills.lang           |   0
 {public => htdocs}/langs/es_PE/bookmarks.lang       |   0
 {public => htdocs}/langs/es_PE/boxes.lang           |   0
 {public => htdocs}/langs/es_PE/cashdesk.lang        |   0
 {public => htdocs}/langs/es_PE/categories.lang      |   0
 {public => htdocs}/langs/es_PE/commercial.lang      |   0
 {public => htdocs}/langs/es_PE/companies.lang       |   0
 {public => htdocs}/langs/es_PE/compta.lang          |   0
 {public => htdocs}/langs/es_PE/contracts.lang       |   0
 {public => htdocs}/langs/es_PE/cron.lang            |   0
 {public => htdocs}/langs/es_PE/deliveries.lang      |   0
 {public => htdocs}/langs/es_PE/dict.lang            |   0
 {public => htdocs}/langs/es_PE/donations.lang       |   0
 {public => htdocs}/langs/es_PE/ecm.lang             |   0
 {public => htdocs}/langs/es_PE/errors.lang          |   0
 {public => htdocs}/langs/es_PE/exports.lang         |   0
 {public => htdocs}/langs/es_PE/externalsite.lang    |   0
 {public => htdocs}/langs/es_PE/ftp.lang             |   0
 {public => htdocs}/langs/es_PE/help.lang            |   0
 {public => htdocs}/langs/es_PE/holiday.lang         |   0
 {public => htdocs}/langs/es_PE/hrm.lang             |   0
 {public => htdocs}/langs/es_PE/incoterm.lang        |   0
 {public => htdocs}/langs/es_PE/install.lang         |   0
 {public => htdocs}/langs/es_PE/interventions.lang   |   0
 {public => htdocs}/langs/es_PE/languages.lang       |   0
 {public => htdocs}/langs/es_PE/ldap.lang            |   0
 {public => htdocs}/langs/es_PE/link.lang            |   0
 {public => htdocs}/langs/es_PE/loan.lang            |   0
 {public => htdocs}/langs/es_PE/mailmanspip.lang     |   0
 {public => htdocs}/langs/es_PE/mails.lang           |   0
 {public => htdocs}/langs/es_PE/main.lang            |   0
 {public => htdocs}/langs/es_PE/margins.lang         |   0
 {public => htdocs}/langs/es_PE/members.lang         |   0
 {public => htdocs}/langs/es_PE/oauth.lang           |   0
 {public => htdocs}/langs/es_PE/opensurvey.lang      |   0
 {public => htdocs}/langs/es_PE/orders.lang          |   0
 {public => htdocs}/langs/es_PE/other.lang           |   0
 {public => htdocs}/langs/es_PE/paybox.lang          |   0
 {public => htdocs}/langs/es_PE/paypal.lang          |   0
 {public => htdocs}/langs/es_PE/printing.lang        |   0
 {public => htdocs}/langs/es_PE/productbatch.lang    |   0
 {public => htdocs}/langs/es_PE/products.lang        |   0
 {public => htdocs}/langs/es_PE/projects.lang        |   0
 {public => htdocs}/langs/es_PE/propal.lang          |   0
 {public => htdocs}/langs/es_PE/receiptprinter.lang  |   0
 {public => htdocs}/langs/es_PE/resource.lang        |   0
 {public => htdocs}/langs/es_PE/salaries.lang        |   0
 {public => htdocs}/langs/es_PE/sendings.lang        |   0
 {public => htdocs}/langs/es_PE/sms.lang             |   0
 {public => htdocs}/langs/es_PE/stocks.lang          |   0
 .../langs/es_PE/supplier_proposal.lang              |   0
 {public => htdocs}/langs/es_PE/suppliers.lang       |   0
 {public => htdocs}/langs/es_PE/trips.lang           |   0
 {public => htdocs}/langs/es_PE/users.lang           |   0
 {public => htdocs}/langs/es_PE/website.lang         |   0
 {public => htdocs}/langs/es_PE/withdrawals.lang     |   0
 {public => htdocs}/langs/es_PE/workflow.lang        |   0
 {public => htdocs}/langs/es_PR/admin.lang           |   0
 {public => htdocs}/langs/es_PR/bills.lang           |   0
 {public => htdocs}/langs/es_PR/companies.lang       |   0
 {public => htdocs}/langs/es_PR/compta.lang          |   0
 {public => htdocs}/langs/es_PR/main.lang            |   0
 {public => htdocs}/langs/es_PR/propal.lang          |   0
 {public => htdocs}/langs/es_PY/accountancy.lang     |   0
 {public => htdocs}/langs/es_PY/admin.lang           |   0
 {public => htdocs}/langs/es_PY/agenda.lang          |   0
 {public => htdocs}/langs/es_PY/banks.lang           |   0
 {public => htdocs}/langs/es_PY/bills.lang           |   0
 {public => htdocs}/langs/es_PY/bookmarks.lang       |   0
 {public => htdocs}/langs/es_PY/boxes.lang           |   0
 {public => htdocs}/langs/es_PY/cashdesk.lang        |   0
 {public => htdocs}/langs/es_PY/categories.lang      |   0
 {public => htdocs}/langs/es_PY/commercial.lang      |   0
 {public => htdocs}/langs/es_PY/companies.lang       |   0
 {public => htdocs}/langs/es_PY/compta.lang          |   0
 {public => htdocs}/langs/es_PY/contracts.lang       |   0
 {public => htdocs}/langs/es_PY/cron.lang            |   0
 {public => htdocs}/langs/es_PY/deliveries.lang      |   0
 {public => htdocs}/langs/es_PY/dict.lang            |   0
 {public => htdocs}/langs/es_PY/donations.lang       |   0
 {public => htdocs}/langs/es_PY/ecm.lang             |   0
 {public => htdocs}/langs/es_PY/errors.lang          |   0
 {public => htdocs}/langs/es_PY/exports.lang         |   0
 {public => htdocs}/langs/es_PY/externalsite.lang    |   0
 {public => htdocs}/langs/es_PY/ftp.lang             |   0
 {public => htdocs}/langs/es_PY/help.lang            |   0
 {public => htdocs}/langs/es_PY/holiday.lang         |   0
 {public => htdocs}/langs/es_PY/hrm.lang             |   0
 {public => htdocs}/langs/es_PY/incoterm.lang        |   0
 {public => htdocs}/langs/es_PY/install.lang         |   0
 {public => htdocs}/langs/es_PY/interventions.lang   |   0
 {public => htdocs}/langs/es_PY/languages.lang       |   0
 {public => htdocs}/langs/es_PY/ldap.lang            |   0
 {public => htdocs}/langs/es_PY/link.lang            |   0
 {public => htdocs}/langs/es_PY/loan.lang            |   0
 {public => htdocs}/langs/es_PY/mailmanspip.lang     |   0
 {public => htdocs}/langs/es_PY/mails.lang           |   0
 {public => htdocs}/langs/es_PY/main.lang            |   0
 {public => htdocs}/langs/es_PY/margins.lang         |   0
 {public => htdocs}/langs/es_PY/members.lang         |   0
 {public => htdocs}/langs/es_PY/oauth.lang           |   0
 {public => htdocs}/langs/es_PY/opensurvey.lang      |   0
 {public => htdocs}/langs/es_PY/orders.lang          |   0
 {public => htdocs}/langs/es_PY/other.lang           |   0
 {public => htdocs}/langs/es_PY/paybox.lang          |   0
 {public => htdocs}/langs/es_PY/paypal.lang          |   0
 {public => htdocs}/langs/es_PY/printing.lang        |   0
 {public => htdocs}/langs/es_PY/productbatch.lang    |   0
 {public => htdocs}/langs/es_PY/products.lang        |   0
 {public => htdocs}/langs/es_PY/projects.lang        |   0
 {public => htdocs}/langs/es_PY/propal.lang          |   0
 {public => htdocs}/langs/es_PY/receiptprinter.lang  |   0
 {public => htdocs}/langs/es_PY/resource.lang        |   0
 {public => htdocs}/langs/es_PY/salaries.lang        |   0
 {public => htdocs}/langs/es_PY/sendings.lang        |   0
 {public => htdocs}/langs/es_PY/sms.lang             |   0
 {public => htdocs}/langs/es_PY/stocks.lang          |   0
 .../langs/es_PY/supplier_proposal.lang              |   0
 {public => htdocs}/langs/es_PY/suppliers.lang       |   0
 {public => htdocs}/langs/es_PY/trips.lang           |   0
 {public => htdocs}/langs/es_PY/users.lang           |   0
 {public => htdocs}/langs/es_PY/website.lang         |   0
 {public => htdocs}/langs/es_PY/withdrawals.lang     |   0
 {public => htdocs}/langs/es_PY/workflow.lang        |   0
 {public => htdocs}/langs/es_VE/accountancy.lang     |   0
 {public => htdocs}/langs/es_VE/admin.lang           |   0
 {public => htdocs}/langs/es_VE/agenda.lang          |   0
 {public => htdocs}/langs/es_VE/banks.lang           |   0
 {public => htdocs}/langs/es_VE/bills.lang           |   0
 {public => htdocs}/langs/es_VE/bookmarks.lang       |   0
 {public => htdocs}/langs/es_VE/boxes.lang           |   0
 {public => htdocs}/langs/es_VE/cashdesk.lang        |   0
 {public => htdocs}/langs/es_VE/categories.lang      |   0
 {public => htdocs}/langs/es_VE/commercial.lang      |   0
 {public => htdocs}/langs/es_VE/companies.lang       |   0
 {public => htdocs}/langs/es_VE/compta.lang          |   0
 {public => htdocs}/langs/es_VE/contracts.lang       |   0
 {public => htdocs}/langs/es_VE/cron.lang            |   0
 {public => htdocs}/langs/es_VE/deliveries.lang      |   0
 {public => htdocs}/langs/es_VE/dict.lang            |   0
 {public => htdocs}/langs/es_VE/donations.lang       |   0
 {public => htdocs}/langs/es_VE/ecm.lang             |   0
 {public => htdocs}/langs/es_VE/errors.lang          |   0
 {public => htdocs}/langs/es_VE/exports.lang         |   0
 {public => htdocs}/langs/es_VE/externalsite.lang    |   0
 {public => htdocs}/langs/es_VE/ftp.lang             |   0
 {public => htdocs}/langs/es_VE/help.lang            |   0
 {public => htdocs}/langs/es_VE/holiday.lang         |   0
 {public => htdocs}/langs/es_VE/hrm.lang             |   0
 {public => htdocs}/langs/es_VE/incoterm.lang        |   0
 {public => htdocs}/langs/es_VE/install.lang         |   0
 {public => htdocs}/langs/es_VE/interventions.lang   |   0
 {public => htdocs}/langs/es_VE/languages.lang       |   0
 {public => htdocs}/langs/es_VE/ldap.lang            |   0
 {public => htdocs}/langs/es_VE/link.lang            |   0
 {public => htdocs}/langs/es_VE/loan.lang            |   0
 {public => htdocs}/langs/es_VE/mailmanspip.lang     |   0
 {public => htdocs}/langs/es_VE/mails.lang           |   0
 {public => htdocs}/langs/es_VE/main.lang            |   0
 {public => htdocs}/langs/es_VE/margins.lang         |   0
 {public => htdocs}/langs/es_VE/members.lang         |   0
 {public => htdocs}/langs/es_VE/oauth.lang           |   0
 {public => htdocs}/langs/es_VE/opensurvey.lang      |   0
 {public => htdocs}/langs/es_VE/orders.lang          |   0
 {public => htdocs}/langs/es_VE/other.lang           |   0
 {public => htdocs}/langs/es_VE/paybox.lang          |   0
 {public => htdocs}/langs/es_VE/paypal.lang          |   0
 {public => htdocs}/langs/es_VE/printing.lang        |   0
 {public => htdocs}/langs/es_VE/productbatch.lang    |   0
 {public => htdocs}/langs/es_VE/products.lang        |   0
 {public => htdocs}/langs/es_VE/projects.lang        |   0
 {public => htdocs}/langs/es_VE/propal.lang          |   0
 {public => htdocs}/langs/es_VE/receiptprinter.lang  |   0
 {public => htdocs}/langs/es_VE/resource.lang        |   0
 {public => htdocs}/langs/es_VE/salaries.lang        |   0
 {public => htdocs}/langs/es_VE/sendings.lang        |   0
 {public => htdocs}/langs/es_VE/sms.lang             |   0
 {public => htdocs}/langs/es_VE/stocks.lang          |   0
 .../langs/es_VE/supplier_proposal.lang              |   0
 {public => htdocs}/langs/es_VE/suppliers.lang       |   0
 {public => htdocs}/langs/es_VE/trips.lang           |   0
 {public => htdocs}/langs/es_VE/users.lang           |   0
 {public => htdocs}/langs/es_VE/website.lang         |   0
 {public => htdocs}/langs/es_VE/withdrawals.lang     |   0
 {public => htdocs}/langs/es_VE/workflow.lang        |   0
 {public => htdocs}/langs/et_EE/accountancy.lang     |   0
 {public => htdocs}/langs/et_EE/admin.lang           |   0
 {public => htdocs}/langs/et_EE/agenda.lang          |   0
 {public => htdocs}/langs/et_EE/banks.lang           |   0
 {public => htdocs}/langs/et_EE/bills.lang           |   0
 {public => htdocs}/langs/et_EE/bookmarks.lang       |   0
 {public => htdocs}/langs/et_EE/boxes.lang           |   0
 {public => htdocs}/langs/et_EE/cashdesk.lang        |   0
 {public => htdocs}/langs/et_EE/categories.lang      |   0
 {public => htdocs}/langs/et_EE/commercial.lang      |   0
 {public => htdocs}/langs/et_EE/companies.lang       |   0
 {public => htdocs}/langs/et_EE/compta.lang          |   0
 {public => htdocs}/langs/et_EE/contracts.lang       |   0
 {public => htdocs}/langs/et_EE/cron.lang            |   0
 {public => htdocs}/langs/et_EE/deliveries.lang      |   0
 {public => htdocs}/langs/et_EE/dict.lang            |   0
 {public => htdocs}/langs/et_EE/donations.lang       |   0
 {public => htdocs}/langs/et_EE/ecm.lang             |   0
 {public => htdocs}/langs/et_EE/errors.lang          |   0
 {public => htdocs}/langs/et_EE/exports.lang         |   0
 {public => htdocs}/langs/et_EE/externalsite.lang    |   0
 {public => htdocs}/langs/et_EE/ftp.lang             |   0
 {public => htdocs}/langs/et_EE/help.lang            |   0
 {public => htdocs}/langs/et_EE/holiday.lang         |   0
 {public => htdocs}/langs/et_EE/hrm.lang             |   0
 {public => htdocs}/langs/et_EE/incoterm.lang        |   0
 {public => htdocs}/langs/et_EE/install.lang         |   0
 {public => htdocs}/langs/et_EE/interventions.lang   |   0
 {public => htdocs}/langs/et_EE/languages.lang       |   0
 {public => htdocs}/langs/et_EE/ldap.lang            |   0
 {public => htdocs}/langs/et_EE/link.lang            |   0
 {public => htdocs}/langs/et_EE/loan.lang            |   0
 {public => htdocs}/langs/et_EE/mailmanspip.lang     |   0
 {public => htdocs}/langs/et_EE/mails.lang           |   0
 {public => htdocs}/langs/et_EE/main.lang            |   0
 {public => htdocs}/langs/et_EE/margins.lang         |   0
 {public => htdocs}/langs/et_EE/members.lang         |   0
 {public => htdocs}/langs/et_EE/oauth.lang           |   0
 {public => htdocs}/langs/et_EE/opensurvey.lang      |   0
 {public => htdocs}/langs/et_EE/orders.lang          |   0
 {public => htdocs}/langs/et_EE/other.lang           |   0
 {public => htdocs}/langs/et_EE/paybox.lang          |   0
 {public => htdocs}/langs/et_EE/paypal.lang          |   0
 {public => htdocs}/langs/et_EE/printing.lang        |   0
 {public => htdocs}/langs/et_EE/productbatch.lang    |   0
 {public => htdocs}/langs/et_EE/products.lang        |   0
 {public => htdocs}/langs/et_EE/projects.lang        |   0
 {public => htdocs}/langs/et_EE/propal.lang          |   0
 {public => htdocs}/langs/et_EE/receiptprinter.lang  |   0
 {public => htdocs}/langs/et_EE/resource.lang        |   0
 {public => htdocs}/langs/et_EE/salaries.lang        |   0
 {public => htdocs}/langs/et_EE/sendings.lang        |   0
 {public => htdocs}/langs/et_EE/sms.lang             |   0
 {public => htdocs}/langs/et_EE/stocks.lang          |   0
 .../langs/et_EE/supplier_proposal.lang              |   0
 {public => htdocs}/langs/et_EE/suppliers.lang       |   0
 {public => htdocs}/langs/et_EE/trips.lang           |   0
 {public => htdocs}/langs/et_EE/users.lang           |   0
 {public => htdocs}/langs/et_EE/website.lang         |   0
 {public => htdocs}/langs/et_EE/withdrawals.lang     |   0
 {public => htdocs}/langs/et_EE/workflow.lang        |   0
 {public => htdocs}/langs/eu_ES/accountancy.lang     |   0
 {public => htdocs}/langs/eu_ES/admin.lang           |   0
 {public => htdocs}/langs/eu_ES/agenda.lang          |   0
 {public => htdocs}/langs/eu_ES/banks.lang           |   0
 {public => htdocs}/langs/eu_ES/bills.lang           |   0
 {public => htdocs}/langs/eu_ES/bookmarks.lang       |   0
 {public => htdocs}/langs/eu_ES/boxes.lang           |   0
 {public => htdocs}/langs/eu_ES/cashdesk.lang        |   0
 {public => htdocs}/langs/eu_ES/categories.lang      |   0
 {public => htdocs}/langs/eu_ES/commercial.lang      |   0
 {public => htdocs}/langs/eu_ES/companies.lang       |   0
 {public => htdocs}/langs/eu_ES/compta.lang          |   0
 {public => htdocs}/langs/eu_ES/contracts.lang       |   0
 {public => htdocs}/langs/eu_ES/cron.lang            |   0
 {public => htdocs}/langs/eu_ES/deliveries.lang      |   0
 {public => htdocs}/langs/eu_ES/dict.lang            |   0
 {public => htdocs}/langs/eu_ES/donations.lang       |   0
 {public => htdocs}/langs/eu_ES/ecm.lang             |   0
 {public => htdocs}/langs/eu_ES/errors.lang          |   0
 {public => htdocs}/langs/eu_ES/expensereports.lang  |   0
 {public => htdocs}/langs/eu_ES/exports.lang         |   0
 {public => htdocs}/langs/eu_ES/externalsite.lang    |   0
 {public => htdocs}/langs/eu_ES/ftp.lang             |   0
 {public => htdocs}/langs/eu_ES/help.lang            |   0
 {public => htdocs}/langs/eu_ES/holiday.lang         |   0
 {public => htdocs}/langs/eu_ES/hrm.lang             |   0
 {public => htdocs}/langs/eu_ES/incoterm.lang        |   0
 {public => htdocs}/langs/eu_ES/install.lang         |   0
 {public => htdocs}/langs/eu_ES/interventions.lang   |   0
 {public => htdocs}/langs/eu_ES/languages.lang       |   0
 {public => htdocs}/langs/eu_ES/ldap.lang            |   0
 {public => htdocs}/langs/eu_ES/link.lang            |   0
 {public => htdocs}/langs/eu_ES/loan.lang            |   0
 {public => htdocs}/langs/eu_ES/mailmanspip.lang     |   0
 {public => htdocs}/langs/eu_ES/mails.lang           |   0
 {public => htdocs}/langs/eu_ES/main.lang            |   0
 {public => htdocs}/langs/eu_ES/margins.lang         |   0
 {public => htdocs}/langs/eu_ES/members.lang         |   0
 {public => htdocs}/langs/eu_ES/oauth.lang           |   0
 {public => htdocs}/langs/eu_ES/opensurvey.lang      |   0
 {public => htdocs}/langs/eu_ES/orders.lang          |   0
 {public => htdocs}/langs/eu_ES/other.lang           |   0
 {public => htdocs}/langs/eu_ES/paybox.lang          |   0
 {public => htdocs}/langs/eu_ES/paypal.lang          |   0
 {public => htdocs}/langs/eu_ES/printing.lang        |   0
 {public => htdocs}/langs/eu_ES/productbatch.lang    |   0
 {public => htdocs}/langs/eu_ES/products.lang        |   0
 {public => htdocs}/langs/eu_ES/projects.lang        |   0
 {public => htdocs}/langs/eu_ES/propal.lang          |   0
 {public => htdocs}/langs/eu_ES/receiptprinter.lang  |   0
 {public => htdocs}/langs/eu_ES/resource.lang        |   0
 {public => htdocs}/langs/eu_ES/salaries.lang        |   0
 {public => htdocs}/langs/eu_ES/sendings.lang        |   0
 {public => htdocs}/langs/eu_ES/sms.lang             |   0
 {public => htdocs}/langs/eu_ES/stocks.lang          |   0
 .../langs/eu_ES/supplier_proposal.lang              |   0
 {public => htdocs}/langs/eu_ES/suppliers.lang       |   0
 {public => htdocs}/langs/eu_ES/trips.lang           |   0
 {public => htdocs}/langs/eu_ES/users.lang           |   0
 {public => htdocs}/langs/eu_ES/website.lang         |   0
 {public => htdocs}/langs/eu_ES/withdrawals.lang     |   0
 {public => htdocs}/langs/eu_ES/workflow.lang        |   0
 {public => htdocs}/langs/fa_IR/accountancy.lang     |   0
 {public => htdocs}/langs/fa_IR/admin.lang           |   0
 {public => htdocs}/langs/fa_IR/agenda.lang          |   0
 {public => htdocs}/langs/fa_IR/banks.lang           |   0
 {public => htdocs}/langs/fa_IR/bills.lang           |   0
 {public => htdocs}/langs/fa_IR/bookmarks.lang       |   0
 {public => htdocs}/langs/fa_IR/boxes.lang           |   0
 {public => htdocs}/langs/fa_IR/cashdesk.lang        |   0
 {public => htdocs}/langs/fa_IR/categories.lang      |   0
 {public => htdocs}/langs/fa_IR/commercial.lang      |   0
 {public => htdocs}/langs/fa_IR/companies.lang       |   0
 {public => htdocs}/langs/fa_IR/compta.lang          |   0
 {public => htdocs}/langs/fa_IR/contracts.lang       |   0
 {public => htdocs}/langs/fa_IR/cron.lang            |   0
 {public => htdocs}/langs/fa_IR/deliveries.lang      |   0
 {public => htdocs}/langs/fa_IR/dict.lang            |   0
 {public => htdocs}/langs/fa_IR/domains.lang         |   0
 {public => htdocs}/langs/fa_IR/donations.lang       |   0
 {public => htdocs}/langs/fa_IR/ecm.lang             |   0
 {public => htdocs}/langs/fa_IR/errors.lang          |   0
 {public => htdocs}/langs/fa_IR/exports.lang         |   0
 {public => htdocs}/langs/fa_IR/externalsite.lang    |   0
 {public => htdocs}/langs/fa_IR/ftp.lang             |   0
 {public => htdocs}/langs/fa_IR/help.lang            |   0
 {public => htdocs}/langs/fa_IR/holiday.lang         |   0
 {public => htdocs}/langs/fa_IR/hrm.lang             |   0
 {public => htdocs}/langs/fa_IR/incoterm.lang        |   0
 {public => htdocs}/langs/fa_IR/install.lang         |   0
 {public => htdocs}/langs/fa_IR/interventions.lang   |   0
 {public => htdocs}/langs/fa_IR/languages.lang       |   0
 {public => htdocs}/langs/fa_IR/ldap.lang            |   0
 {public => htdocs}/langs/fa_IR/link.lang            |   0
 {public => htdocs}/langs/fa_IR/loan.lang            |   0
 {public => htdocs}/langs/fa_IR/mailmanspip.lang     |   0
 {public => htdocs}/langs/fa_IR/mails.lang           |   0
 {public => htdocs}/langs/fa_IR/main.lang            |   0
 {public => htdocs}/langs/fa_IR/margins.lang         |   0
 {public => htdocs}/langs/fa_IR/members.lang         |   0
 {public => htdocs}/langs/fa_IR/oauth.lang           |   0
 {public => htdocs}/langs/fa_IR/opensurvey.lang      |   0
 {public => htdocs}/langs/fa_IR/orders.lang          |   0
 {public => htdocs}/langs/fa_IR/other.lang           |   0
 {public => htdocs}/langs/fa_IR/paybox.lang          |   0
 {public => htdocs}/langs/fa_IR/paypal.lang          |   0
 {public => htdocs}/langs/fa_IR/printing.lang        |   0
 {public => htdocs}/langs/fa_IR/productbatch.lang    |   0
 {public => htdocs}/langs/fa_IR/products.lang        |   0
 {public => htdocs}/langs/fa_IR/projects.lang        |   0
 {public => htdocs}/langs/fa_IR/propal.lang          |   0
 {public => htdocs}/langs/fa_IR/receiptprinter.lang  |   0
 {public => htdocs}/langs/fa_IR/resource.lang        |   0
 {public => htdocs}/langs/fa_IR/salaries.lang        |   0
 {public => htdocs}/langs/fa_IR/sendings.lang        |   0
 {public => htdocs}/langs/fa_IR/sms.lang             |   0
 {public => htdocs}/langs/fa_IR/stocks.lang          |   0
 .../langs/fa_IR/supplier_proposal.lang              |   0
 {public => htdocs}/langs/fa_IR/suppliers.lang       |   0
 {public => htdocs}/langs/fa_IR/trips.lang           |   0
 {public => htdocs}/langs/fa_IR/users.lang           |   0
 {public => htdocs}/langs/fa_IR/website.lang         |   0
 {public => htdocs}/langs/fa_IR/withdrawals.lang     |   0
 {public => htdocs}/langs/fa_IR/workflow.lang        |   0
 {public => htdocs}/langs/fi_FI/accountancy.lang     |   0
 {public => htdocs}/langs/fi_FI/admin.lang           |   0
 {public => htdocs}/langs/fi_FI/agenda.lang          |   0
 {public => htdocs}/langs/fi_FI/banks.lang           |   0
 {public => htdocs}/langs/fi_FI/bills.lang           |   0
 {public => htdocs}/langs/fi_FI/bookmarks.lang       |   0
 {public => htdocs}/langs/fi_FI/boxes.lang           |   0
 {public => htdocs}/langs/fi_FI/cashdesk.lang        |   0
 {public => htdocs}/langs/fi_FI/categories.lang      |   0
 {public => htdocs}/langs/fi_FI/commercial.lang      |   0
 {public => htdocs}/langs/fi_FI/companies.lang       |   0
 {public => htdocs}/langs/fi_FI/compta.lang          |   0
 {public => htdocs}/langs/fi_FI/contracts.lang       |   0
 {public => htdocs}/langs/fi_FI/cron.lang            |   0
 {public => htdocs}/langs/fi_FI/deliveries.lang      |   0
 {public => htdocs}/langs/fi_FI/dict.lang            |   0
 {public => htdocs}/langs/fi_FI/donations.lang       |   0
 {public => htdocs}/langs/fi_FI/ecm.lang             |   0
 {public => htdocs}/langs/fi_FI/errors.lang          |   0
 {public => htdocs}/langs/fi_FI/exports.lang         |   0
 {public => htdocs}/langs/fi_FI/externalsite.lang    |   0
 {public => htdocs}/langs/fi_FI/ftp.lang             |   0
 {public => htdocs}/langs/fi_FI/help.lang            |   0
 {public => htdocs}/langs/fi_FI/holiday.lang         |   0
 {public => htdocs}/langs/fi_FI/hrm.lang             |   0
 {public => htdocs}/langs/fi_FI/incoterm.lang        |   0
 {public => htdocs}/langs/fi_FI/install.lang         |   0
 {public => htdocs}/langs/fi_FI/interventions.lang   |   0
 {public => htdocs}/langs/fi_FI/languages.lang       |   0
 {public => htdocs}/langs/fi_FI/ldap.lang            |   0
 {public => htdocs}/langs/fi_FI/link.lang            |   0
 {public => htdocs}/langs/fi_FI/loan.lang            |   0
 {public => htdocs}/langs/fi_FI/mailmanspip.lang     |   0
 {public => htdocs}/langs/fi_FI/mails.lang           |   0
 {public => htdocs}/langs/fi_FI/main.lang            |   0
 {public => htdocs}/langs/fi_FI/margins.lang         |   0
 {public => htdocs}/langs/fi_FI/members.lang         |   0
 {public => htdocs}/langs/fi_FI/oauth.lang           |   0
 {public => htdocs}/langs/fi_FI/opensurvey.lang      |   0
 {public => htdocs}/langs/fi_FI/orders.lang          |   0
 {public => htdocs}/langs/fi_FI/other.lang           |   0
 {public => htdocs}/langs/fi_FI/paybox.lang          |   0
 {public => htdocs}/langs/fi_FI/paypal.lang          |   0
 {public => htdocs}/langs/fi_FI/printing.lang        |   0
 {public => htdocs}/langs/fi_FI/productbatch.lang    |   0
 {public => htdocs}/langs/fi_FI/products.lang        |   0
 {public => htdocs}/langs/fi_FI/projects.lang        |   0
 {public => htdocs}/langs/fi_FI/propal.lang          |   0
 {public => htdocs}/langs/fi_FI/receiptprinter.lang  |   0
 {public => htdocs}/langs/fi_FI/resource.lang        |   0
 {public => htdocs}/langs/fi_FI/salaries.lang        |   0
 {public => htdocs}/langs/fi_FI/sendings.lang        |   0
 {public => htdocs}/langs/fi_FI/sms.lang             |   0
 {public => htdocs}/langs/fi_FI/stocks.lang          |   0
 .../langs/fi_FI/supplier_proposal.lang              |   0
 {public => htdocs}/langs/fi_FI/suppliers.lang       |   0
 {public => htdocs}/langs/fi_FI/trips.lang           |   0
 {public => htdocs}/langs/fi_FI/users.lang           |   0
 {public => htdocs}/langs/fi_FI/website.lang         |   0
 {public => htdocs}/langs/fi_FI/withdrawals.lang     |   0
 {public => htdocs}/langs/fi_FI/workflow.lang        |   0
 {public => htdocs}/langs/fr_BE/accountancy.lang     |   0
 {public => htdocs}/langs/fr_BE/admin.lang           |   0
 {public => htdocs}/langs/fr_BE/agenda.lang          |   0
 {public => htdocs}/langs/fr_BE/banks.lang           |   0
 {public => htdocs}/langs/fr_BE/bills.lang           |   0
 {public => htdocs}/langs/fr_BE/bookmarks.lang       |   0
 {public => htdocs}/langs/fr_BE/boxes.lang           |   0
 {public => htdocs}/langs/fr_BE/cashdesk.lang        |   0
 {public => htdocs}/langs/fr_BE/categories.lang      |   0
 {public => htdocs}/langs/fr_BE/commercial.lang      |   0
 {public => htdocs}/langs/fr_BE/companies.lang       |   0
 {public => htdocs}/langs/fr_BE/compta.lang          |   0
 {public => htdocs}/langs/fr_BE/contracts.lang       |   0
 {public => htdocs}/langs/fr_BE/cron.lang            |   0
 {public => htdocs}/langs/fr_BE/deliveries.lang      |   0
 {public => htdocs}/langs/fr_BE/dict.lang            |   0
 {public => htdocs}/langs/fr_BE/donations.lang       |   0
 {public => htdocs}/langs/fr_BE/ecm.lang             |   0
 {public => htdocs}/langs/fr_BE/errors.lang          |   0
 {public => htdocs}/langs/fr_BE/exports.lang         |   0
 {public => htdocs}/langs/fr_BE/externalsite.lang    |   0
 {public => htdocs}/langs/fr_BE/ftp.lang             |   0
 {public => htdocs}/langs/fr_BE/help.lang            |   0
 {public => htdocs}/langs/fr_BE/holiday.lang         |   0
 {public => htdocs}/langs/fr_BE/hrm.lang             |   0
 {public => htdocs}/langs/fr_BE/incoterm.lang        |   0
 {public => htdocs}/langs/fr_BE/install.lang         |   0
 {public => htdocs}/langs/fr_BE/interventions.lang   |   0
 {public => htdocs}/langs/fr_BE/languages.lang       |   0
 {public => htdocs}/langs/fr_BE/ldap.lang            |   0
 {public => htdocs}/langs/fr_BE/link.lang            |   0
 {public => htdocs}/langs/fr_BE/loan.lang            |   0
 {public => htdocs}/langs/fr_BE/mailmanspip.lang     |   0
 {public => htdocs}/langs/fr_BE/mails.lang           |   0
 {public => htdocs}/langs/fr_BE/main.lang            |   0
 {public => htdocs}/langs/fr_BE/margins.lang         |   0
 {public => htdocs}/langs/fr_BE/members.lang         |   0
 {public => htdocs}/langs/fr_BE/oauth.lang           |   0
 {public => htdocs}/langs/fr_BE/opensurvey.lang      |   0
 {public => htdocs}/langs/fr_BE/orders.lang          |   0
 {public => htdocs}/langs/fr_BE/other.lang           |   0
 {public => htdocs}/langs/fr_BE/paybox.lang          |   0
 {public => htdocs}/langs/fr_BE/paypal.lang          |   0
 {public => htdocs}/langs/fr_BE/printing.lang        |   0
 {public => htdocs}/langs/fr_BE/productbatch.lang    |   0
 {public => htdocs}/langs/fr_BE/products.lang        |   0
 {public => htdocs}/langs/fr_BE/projects.lang        |   0
 {public => htdocs}/langs/fr_BE/propal.lang          |   0
 {public => htdocs}/langs/fr_BE/receiptprinter.lang  |   0
 {public => htdocs}/langs/fr_BE/resource.lang        |   0
 {public => htdocs}/langs/fr_BE/salaries.lang        |   0
 {public => htdocs}/langs/fr_BE/sendings.lang        |   0
 {public => htdocs}/langs/fr_BE/sms.lang             |   0
 {public => htdocs}/langs/fr_BE/stocks.lang          |   0
 .../langs/fr_BE/supplier_proposal.lang              |   0
 {public => htdocs}/langs/fr_BE/suppliers.lang       |   0
 {public => htdocs}/langs/fr_BE/trips.lang           |   0
 {public => htdocs}/langs/fr_BE/users.lang           |   0
 {public => htdocs}/langs/fr_BE/website.lang         |   0
 {public => htdocs}/langs/fr_BE/withdrawals.lang     |   0
 {public => htdocs}/langs/fr_BE/workflow.lang        |   0
 {public => htdocs}/langs/fr_CA/accountancy.lang     |   0
 {public => htdocs}/langs/fr_CA/admin.lang           |   0
 {public => htdocs}/langs/fr_CA/agenda.lang          |   0
 {public => htdocs}/langs/fr_CA/banks.lang           |   0
 {public => htdocs}/langs/fr_CA/bills.lang           |   0
 {public => htdocs}/langs/fr_CA/bookmarks.lang       |   0
 {public => htdocs}/langs/fr_CA/boxes.lang           |   0
 {public => htdocs}/langs/fr_CA/cashdesk.lang        |   0
 {public => htdocs}/langs/fr_CA/categories.lang      |   0
 {public => htdocs}/langs/fr_CA/commercial.lang      |   0
 {public => htdocs}/langs/fr_CA/companies.lang       |   0
 {public => htdocs}/langs/fr_CA/compta.lang          |   0
 {public => htdocs}/langs/fr_CA/contracts.lang       |   0
 {public => htdocs}/langs/fr_CA/cron.lang            |   0
 {public => htdocs}/langs/fr_CA/deliveries.lang      |   0
 {public => htdocs}/langs/fr_CA/dict.lang            |   0
 {public => htdocs}/langs/fr_CA/donations.lang       |   0
 {public => htdocs}/langs/fr_CA/ecm.lang             |   0
 {public => htdocs}/langs/fr_CA/errors.lang          |   0
 {public => htdocs}/langs/fr_CA/exports.lang         |   0
 {public => htdocs}/langs/fr_CA/externalsite.lang    |   0
 {public => htdocs}/langs/fr_CA/ftp.lang             |   0
 {public => htdocs}/langs/fr_CA/help.lang            |   0
 {public => htdocs}/langs/fr_CA/holiday.lang         |   0
 {public => htdocs}/langs/fr_CA/hrm.lang             |   0
 {public => htdocs}/langs/fr_CA/incoterm.lang        |   0
 {public => htdocs}/langs/fr_CA/install.lang         |   0
 {public => htdocs}/langs/fr_CA/interventions.lang   |   0
 {public => htdocs}/langs/fr_CA/languages.lang       |   0
 {public => htdocs}/langs/fr_CA/ldap.lang            |   0
 {public => htdocs}/langs/fr_CA/link.lang            |   0
 {public => htdocs}/langs/fr_CA/loan.lang            |   0
 {public => htdocs}/langs/fr_CA/mailmanspip.lang     |   0
 {public => htdocs}/langs/fr_CA/mails.lang           |   0
 {public => htdocs}/langs/fr_CA/main.lang            |   0
 {public => htdocs}/langs/fr_CA/margins.lang         |   0
 {public => htdocs}/langs/fr_CA/members.lang         |   0
 {public => htdocs}/langs/fr_CA/oauth.lang           |   0
 {public => htdocs}/langs/fr_CA/opensurvey.lang      |   0
 {public => htdocs}/langs/fr_CA/orders.lang          |   0
 {public => htdocs}/langs/fr_CA/other.lang           |   0
 {public => htdocs}/langs/fr_CA/paybox.lang          |   0
 {public => htdocs}/langs/fr_CA/paypal.lang          |   0
 {public => htdocs}/langs/fr_CA/printing.lang        |   0
 {public => htdocs}/langs/fr_CA/productbatch.lang    |   0
 {public => htdocs}/langs/fr_CA/products.lang        |   0
 {public => htdocs}/langs/fr_CA/projects.lang        |   0
 {public => htdocs}/langs/fr_CA/propal.lang          |   0
 {public => htdocs}/langs/fr_CA/receiptprinter.lang  |   0
 {public => htdocs}/langs/fr_CA/resource.lang        |   0
 {public => htdocs}/langs/fr_CA/salaries.lang        |   0
 {public => htdocs}/langs/fr_CA/sendings.lang        |   0
 {public => htdocs}/langs/fr_CA/sms.lang             |   0
 {public => htdocs}/langs/fr_CA/stocks.lang          |   0
 .../langs/fr_CA/supplier_proposal.lang              |   0
 {public => htdocs}/langs/fr_CA/suppliers.lang       |   0
 {public => htdocs}/langs/fr_CA/trips.lang           |   0
 {public => htdocs}/langs/fr_CA/users.lang           |   0
 {public => htdocs}/langs/fr_CA/website.lang         |   0
 {public => htdocs}/langs/fr_CA/withdrawals.lang     |   0
 {public => htdocs}/langs/fr_CA/workflow.lang        |   0
 {public => htdocs}/langs/fr_CH/accountancy.lang     |   0
 {public => htdocs}/langs/fr_CH/admin.lang           |   0
 {public => htdocs}/langs/fr_CH/agenda.lang          |   0
 {public => htdocs}/langs/fr_CH/banks.lang           |   0
 {public => htdocs}/langs/fr_CH/bills.lang           |   0
 {public => htdocs}/langs/fr_CH/bookmarks.lang       |   0
 {public => htdocs}/langs/fr_CH/boxes.lang           |   0
 {public => htdocs}/langs/fr_CH/cashdesk.lang        |   0
 {public => htdocs}/langs/fr_CH/categories.lang      |   0
 {public => htdocs}/langs/fr_CH/commercial.lang      |   0
 {public => htdocs}/langs/fr_CH/companies.lang       |   0
 {public => htdocs}/langs/fr_CH/compta.lang          |   0
 {public => htdocs}/langs/fr_CH/contracts.lang       |   0
 {public => htdocs}/langs/fr_CH/cron.lang            |   0
 {public => htdocs}/langs/fr_CH/deliveries.lang      |   0
 {public => htdocs}/langs/fr_CH/dict.lang            |   0
 {public => htdocs}/langs/fr_CH/donations.lang       |   0
 {public => htdocs}/langs/fr_CH/ecm.lang             |   0
 {public => htdocs}/langs/fr_CH/errors.lang          |   0
 {public => htdocs}/langs/fr_CH/exports.lang         |   0
 {public => htdocs}/langs/fr_CH/externalsite.lang    |   0
 {public => htdocs}/langs/fr_CH/ftp.lang             |   0
 {public => htdocs}/langs/fr_CH/help.lang            |   0
 {public => htdocs}/langs/fr_CH/holiday.lang         |   0
 {public => htdocs}/langs/fr_CH/hrm.lang             |   0
 {public => htdocs}/langs/fr_CH/incoterm.lang        |   0
 {public => htdocs}/langs/fr_CH/install.lang         |   0
 {public => htdocs}/langs/fr_CH/interventions.lang   |   0
 {public => htdocs}/langs/fr_CH/languages.lang       |   0
 {public => htdocs}/langs/fr_CH/ldap.lang            |   0
 {public => htdocs}/langs/fr_CH/link.lang            |   0
 {public => htdocs}/langs/fr_CH/loan.lang            |   0
 {public => htdocs}/langs/fr_CH/mailmanspip.lang     |   0
 {public => htdocs}/langs/fr_CH/mails.lang           |   0
 {public => htdocs}/langs/fr_CH/main.lang            |   0
 {public => htdocs}/langs/fr_CH/margins.lang         |   0
 {public => htdocs}/langs/fr_CH/members.lang         |   0
 {public => htdocs}/langs/fr_CH/oauth.lang           |   0
 {public => htdocs}/langs/fr_CH/opensurvey.lang      |   0
 {public => htdocs}/langs/fr_CH/orders.lang          |   0
 {public => htdocs}/langs/fr_CH/other.lang           |   0
 {public => htdocs}/langs/fr_CH/paybox.lang          |   0
 {public => htdocs}/langs/fr_CH/paypal.lang          |   0
 {public => htdocs}/langs/fr_CH/printing.lang        |   0
 {public => htdocs}/langs/fr_CH/productbatch.lang    |   0
 {public => htdocs}/langs/fr_CH/products.lang        |   0
 {public => htdocs}/langs/fr_CH/projects.lang        |   0
 {public => htdocs}/langs/fr_CH/propal.lang          |   0
 {public => htdocs}/langs/fr_CH/receiptprinter.lang  |   0
 {public => htdocs}/langs/fr_CH/resource.lang        |   0
 {public => htdocs}/langs/fr_CH/salaries.lang        |   0
 {public => htdocs}/langs/fr_CH/sendings.lang        |   0
 {public => htdocs}/langs/fr_CH/sms.lang             |   0
 {public => htdocs}/langs/fr_CH/stocks.lang          |   0
 .../langs/fr_CH/supplier_proposal.lang              |   0
 {public => htdocs}/langs/fr_CH/suppliers.lang       |   0
 {public => htdocs}/langs/fr_CH/trips.lang           |   0
 {public => htdocs}/langs/fr_CH/users.lang           |   0
 {public => htdocs}/langs/fr_CH/website.lang         |   0
 {public => htdocs}/langs/fr_CH/withdrawals.lang     |   0
 {public => htdocs}/langs/fr_CH/workflow.lang        |   0
 {public => htdocs}/langs/fr_FR/accountancy.lang     |   0
 {public => htdocs}/langs/fr_FR/admin.lang           |   0
 {public => htdocs}/langs/fr_FR/agenda.lang          |   0
 {public => htdocs}/langs/fr_FR/banks.lang           |   0
 {public => htdocs}/langs/fr_FR/bills.lang           |   0
 {public => htdocs}/langs/fr_FR/bookmarks.lang       |   0
 {public => htdocs}/langs/fr_FR/boxes.lang           |   0
 {public => htdocs}/langs/fr_FR/cashdesk.lang        |   0
 {public => htdocs}/langs/fr_FR/categories.lang      |   0
 {public => htdocs}/langs/fr_FR/commercial.lang      |   0
 {public => htdocs}/langs/fr_FR/companies.lang       |   0
 {public => htdocs}/langs/fr_FR/compta.lang          |   0
 {public => htdocs}/langs/fr_FR/contracts.lang       |   0
 {public => htdocs}/langs/fr_FR/cron.lang            |   0
 {public => htdocs}/langs/fr_FR/deliveries.lang      |   0
 {public => htdocs}/langs/fr_FR/dict.lang            |   0
 {public => htdocs}/langs/fr_FR/donations.lang       |   0
 {public => htdocs}/langs/fr_FR/ecm.lang             |   0
 {public => htdocs}/langs/fr_FR/errors.lang          |   0
 {public => htdocs}/langs/fr_FR/expensereports.lang  |   0
 {public => htdocs}/langs/fr_FR/exports.lang         |   0
 {public => htdocs}/langs/fr_FR/externalsite.lang    |   0
 {public => htdocs}/langs/fr_FR/ftp.lang             |   0
 {public => htdocs}/langs/fr_FR/help.lang            |   0
 {public => htdocs}/langs/fr_FR/holiday.lang         |   0
 {public => htdocs}/langs/fr_FR/hrm.lang             |   0
 {public => htdocs}/langs/fr_FR/incoterm.lang        |   0
 {public => htdocs}/langs/fr_FR/install.lang         |   0
 {public => htdocs}/langs/fr_FR/interventions.lang   |   0
 {public => htdocs}/langs/fr_FR/languages.lang       |   0
 {public => htdocs}/langs/fr_FR/ldap.lang            |   0
 {public => htdocs}/langs/fr_FR/link.lang            |   0
 {public => htdocs}/langs/fr_FR/loan.lang            |   0
 {public => htdocs}/langs/fr_FR/mailmanspip.lang     |   0
 {public => htdocs}/langs/fr_FR/mails.lang           |   0
 {public => htdocs}/langs/fr_FR/main.lang            |   0
 {public => htdocs}/langs/fr_FR/margins.lang         |   0
 {public => htdocs}/langs/fr_FR/members.lang         |   0
 {public => htdocs}/langs/fr_FR/oauth.lang           |   0
 {public => htdocs}/langs/fr_FR/opensurvey.lang      |   0
 {public => htdocs}/langs/fr_FR/orders.lang          |   0
 {public => htdocs}/langs/fr_FR/other.lang           |   0
 {public => htdocs}/langs/fr_FR/paybox.lang          |   0
 {public => htdocs}/langs/fr_FR/paypal.lang          |   0
 {public => htdocs}/langs/fr_FR/printing.lang        |   0
 {public => htdocs}/langs/fr_FR/productbatch.lang    |   0
 {public => htdocs}/langs/fr_FR/products.lang        |   0
 {public => htdocs}/langs/fr_FR/projects.lang        |   0
 {public => htdocs}/langs/fr_FR/propal.lang          |   0
 {public => htdocs}/langs/fr_FR/receiptprinter.lang  |   0
 {public => htdocs}/langs/fr_FR/resource.lang        |   0
 {public => htdocs}/langs/fr_FR/salaries.lang        |   0
 {public => htdocs}/langs/fr_FR/sendings.lang        |   0
 {public => htdocs}/langs/fr_FR/sms.lang             |   0
 {public => htdocs}/langs/fr_FR/stocks.lang          |   0
 .../langs/fr_FR/supplier_proposal.lang              |   0
 {public => htdocs}/langs/fr_FR/suppliers.lang       |   0
 {public => htdocs}/langs/fr_FR/trips.lang           |   0
 {public => htdocs}/langs/fr_FR/users.lang           |   0
 {public => htdocs}/langs/fr_FR/website.lang         |   0
 {public => htdocs}/langs/fr_FR/withdrawals.lang     |   0
 {public => htdocs}/langs/fr_FR/workflow.lang        |   0
 {public => htdocs}/langs/fr_NC/admin.lang           |   0
 {public => htdocs}/langs/fr_NC/companies.lang       |   0
 {public => htdocs}/langs/fr_NC/compta.lang          |   0
 {public => htdocs}/langs/fr_NC/main.lang            |   0
 {public => htdocs}/langs/he_IL/accountancy.lang     |   0
 {public => htdocs}/langs/he_IL/admin.lang           |   0
 {public => htdocs}/langs/he_IL/agenda.lang          |   0
 {public => htdocs}/langs/he_IL/banks.lang           |   0
 {public => htdocs}/langs/he_IL/bills.lang           |   0
 {public => htdocs}/langs/he_IL/bookmarks.lang       |   0
 {public => htdocs}/langs/he_IL/boxes.lang           |   0
 {public => htdocs}/langs/he_IL/cashdesk.lang        |   0
 {public => htdocs}/langs/he_IL/categories.lang      |   0
 {public => htdocs}/langs/he_IL/commercial.lang      |   0
 {public => htdocs}/langs/he_IL/companies.lang       |   0
 {public => htdocs}/langs/he_IL/compta.lang          |   0
 {public => htdocs}/langs/he_IL/contracts.lang       |   0
 {public => htdocs}/langs/he_IL/cron.lang            |   0
 {public => htdocs}/langs/he_IL/deliveries.lang      |   0
 {public => htdocs}/langs/he_IL/dict.lang            |   0
 {public => htdocs}/langs/he_IL/donations.lang       |   0
 {public => htdocs}/langs/he_IL/ecm.lang             |   0
 {public => htdocs}/langs/he_IL/errors.lang          |   0
 {public => htdocs}/langs/he_IL/exports.lang         |   0
 {public => htdocs}/langs/he_IL/externalsite.lang    |   0
 {public => htdocs}/langs/he_IL/ftp.lang             |   0
 {public => htdocs}/langs/he_IL/help.lang            |   0
 {public => htdocs}/langs/he_IL/holiday.lang         |   0
 {public => htdocs}/langs/he_IL/hrm.lang             |   0
 {public => htdocs}/langs/he_IL/incoterm.lang        |   0
 {public => htdocs}/langs/he_IL/install.lang         |   0
 {public => htdocs}/langs/he_IL/interventions.lang   |   0
 {public => htdocs}/langs/he_IL/languages.lang       |   0
 {public => htdocs}/langs/he_IL/ldap.lang            |   0
 {public => htdocs}/langs/he_IL/link.lang            |   0
 {public => htdocs}/langs/he_IL/loan.lang            |   0
 {public => htdocs}/langs/he_IL/mailmanspip.lang     |   0
 {public => htdocs}/langs/he_IL/mails.lang           |   0
 {public => htdocs}/langs/he_IL/main.lang            |   0
 {public => htdocs}/langs/he_IL/margins.lang         |   0
 {public => htdocs}/langs/he_IL/members.lang         |   0
 {public => htdocs}/langs/he_IL/oauth.lang           |   0
 {public => htdocs}/langs/he_IL/opensurvey.lang      |   0
 {public => htdocs}/langs/he_IL/orders.lang          |   0
 {public => htdocs}/langs/he_IL/other.lang           |   0
 {public => htdocs}/langs/he_IL/paybox.lang          |   0
 {public => htdocs}/langs/he_IL/paypal.lang          |   0
 {public => htdocs}/langs/he_IL/printing.lang        |   0
 {public => htdocs}/langs/he_IL/productbatch.lang    |   0
 {public => htdocs}/langs/he_IL/products.lang        |   0
 {public => htdocs}/langs/he_IL/projects.lang        |   0
 {public => htdocs}/langs/he_IL/propal.lang          |   0
 {public => htdocs}/langs/he_IL/receiptprinter.lang  |   0
 {public => htdocs}/langs/he_IL/resource.lang        |   0
 {public => htdocs}/langs/he_IL/salaries.lang        |   0
 {public => htdocs}/langs/he_IL/sendings.lang        |   0
 {public => htdocs}/langs/he_IL/sms.lang             |   0
 {public => htdocs}/langs/he_IL/stocks.lang          |   0
 .../langs/he_IL/supplier_proposal.lang              |   0
 {public => htdocs}/langs/he_IL/suppliers.lang       |   0
 {public => htdocs}/langs/he_IL/trips.lang           |   0
 {public => htdocs}/langs/he_IL/users.lang           |   0
 {public => htdocs}/langs/he_IL/website.lang         |   0
 {public => htdocs}/langs/he_IL/withdrawals.lang     |   0
 {public => htdocs}/langs/he_IL/workflow.lang        |   0
 {public => htdocs}/langs/hr_HR/accountancy.lang     |   0
 {public => htdocs}/langs/hr_HR/admin.lang           |   0
 {public => htdocs}/langs/hr_HR/agenda.lang          |   0
 {public => htdocs}/langs/hr_HR/banks.lang           |   0
 {public => htdocs}/langs/hr_HR/bills.lang           |   0
 {public => htdocs}/langs/hr_HR/bookmarks.lang       |   0
 {public => htdocs}/langs/hr_HR/boxes.lang           |   0
 {public => htdocs}/langs/hr_HR/cashdesk.lang        |   0
 {public => htdocs}/langs/hr_HR/categories.lang      |   0
 {public => htdocs}/langs/hr_HR/commercial.lang      |   0
 {public => htdocs}/langs/hr_HR/companies.lang       |   0
 {public => htdocs}/langs/hr_HR/compta.lang          |   0
 {public => htdocs}/langs/hr_HR/contracts.lang       |   0
 {public => htdocs}/langs/hr_HR/cron.lang            |   0
 {public => htdocs}/langs/hr_HR/deliveries.lang      |   0
 {public => htdocs}/langs/hr_HR/dict.lang            |   0
 {public => htdocs}/langs/hr_HR/donations.lang       |   0
 {public => htdocs}/langs/hr_HR/ecm.lang             |   0
 {public => htdocs}/langs/hr_HR/errors.lang          |   0
 {public => htdocs}/langs/hr_HR/exports.lang         |   0
 {public => htdocs}/langs/hr_HR/externalsite.lang    |   0
 {public => htdocs}/langs/hr_HR/ftp.lang             |   0
 {public => htdocs}/langs/hr_HR/help.lang            |   0
 {public => htdocs}/langs/hr_HR/holiday.lang         |   0
 {public => htdocs}/langs/hr_HR/hrm.lang             |   0
 {public => htdocs}/langs/hr_HR/incoterm.lang        |   0
 {public => htdocs}/langs/hr_HR/install.lang         |   0
 {public => htdocs}/langs/hr_HR/interventions.lang   |   0
 {public => htdocs}/langs/hr_HR/languages.lang       |   0
 {public => htdocs}/langs/hr_HR/ldap.lang            |   0
 {public => htdocs}/langs/hr_HR/link.lang            |   0
 {public => htdocs}/langs/hr_HR/loan.lang            |   0
 {public => htdocs}/langs/hr_HR/mailmanspip.lang     |   0
 {public => htdocs}/langs/hr_HR/mails.lang           |   0
 {public => htdocs}/langs/hr_HR/main.lang            |   0
 {public => htdocs}/langs/hr_HR/margins.lang         |   0
 {public => htdocs}/langs/hr_HR/members.lang         |   0
 {public => htdocs}/langs/hr_HR/oauth.lang           |   0
 {public => htdocs}/langs/hr_HR/opensurvey.lang      |   0
 {public => htdocs}/langs/hr_HR/orders.lang          |   0
 {public => htdocs}/langs/hr_HR/other.lang           |   0
 {public => htdocs}/langs/hr_HR/paybox.lang          |   0
 {public => htdocs}/langs/hr_HR/paypal.lang          |   0
 {public => htdocs}/langs/hr_HR/printing.lang        |   0
 {public => htdocs}/langs/hr_HR/productbatch.lang    |   0
 {public => htdocs}/langs/hr_HR/products.lang        |   0
 {public => htdocs}/langs/hr_HR/projects.lang        |   0
 {public => htdocs}/langs/hr_HR/propal.lang          |   0
 {public => htdocs}/langs/hr_HR/receiptprinter.lang  |   0
 {public => htdocs}/langs/hr_HR/resource.lang        |   0
 {public => htdocs}/langs/hr_HR/salaries.lang        |   0
 {public => htdocs}/langs/hr_HR/sendings.lang        |   0
 {public => htdocs}/langs/hr_HR/sms.lang             |   0
 {public => htdocs}/langs/hr_HR/stocks.lang          |   0
 .../langs/hr_HR/supplier_proposal.lang              |   0
 {public => htdocs}/langs/hr_HR/suppliers.lang       |   0
 {public => htdocs}/langs/hr_HR/trips.lang           |   0
 {public => htdocs}/langs/hr_HR/users.lang           |   0
 {public => htdocs}/langs/hr_HR/website.lang         |   0
 {public => htdocs}/langs/hr_HR/withdrawals.lang     |   0
 {public => htdocs}/langs/hr_HR/workflow.lang        |   0
 {public => htdocs}/langs/hu_HU/accountancy.lang     |   0
 {public => htdocs}/langs/hu_HU/admin.lang           |   0
 {public => htdocs}/langs/hu_HU/agenda.lang          |   0
 {public => htdocs}/langs/hu_HU/banks.lang           |   0
 {public => htdocs}/langs/hu_HU/bills.lang           |   0
 {public => htdocs}/langs/hu_HU/bookmarks.lang       |   0
 {public => htdocs}/langs/hu_HU/boxes.lang           |   0
 {public => htdocs}/langs/hu_HU/cashdesk.lang        |   0
 {public => htdocs}/langs/hu_HU/categories.lang      |   0
 {public => htdocs}/langs/hu_HU/commercial.lang      |   0
 {public => htdocs}/langs/hu_HU/companies.lang       |   0
 {public => htdocs}/langs/hu_HU/compta.lang          |   0
 {public => htdocs}/langs/hu_HU/contracts.lang       |   0
 {public => htdocs}/langs/hu_HU/cron.lang            |   0
 {public => htdocs}/langs/hu_HU/deliveries.lang      |   0
 {public => htdocs}/langs/hu_HU/dict.lang            |   0
 {public => htdocs}/langs/hu_HU/donations.lang       |   0
 {public => htdocs}/langs/hu_HU/ecm.lang             |   0
 {public => htdocs}/langs/hu_HU/errors.lang          |   0
 {public => htdocs}/langs/hu_HU/exports.lang         |   0
 {public => htdocs}/langs/hu_HU/externalsite.lang    |   0
 {public => htdocs}/langs/hu_HU/ftp.lang             |   0
 {public => htdocs}/langs/hu_HU/help.lang            |   0
 {public => htdocs}/langs/hu_HU/holiday.lang         |   0
 {public => htdocs}/langs/hu_HU/hrm.lang             |   0
 {public => htdocs}/langs/hu_HU/incoterm.lang        |   0
 {public => htdocs}/langs/hu_HU/install.lang         |   0
 {public => htdocs}/langs/hu_HU/interventions.lang   |   0
 {public => htdocs}/langs/hu_HU/languages.lang       |   0
 {public => htdocs}/langs/hu_HU/ldap.lang            |   0
 {public => htdocs}/langs/hu_HU/link.lang            |   0
 {public => htdocs}/langs/hu_HU/loan.lang            |   0
 {public => htdocs}/langs/hu_HU/mailmanspip.lang     |   0
 {public => htdocs}/langs/hu_HU/mails.lang           |   0
 {public => htdocs}/langs/hu_HU/main.lang            |   0
 {public => htdocs}/langs/hu_HU/margins.lang         |   0
 {public => htdocs}/langs/hu_HU/members.lang         |   0
 {public => htdocs}/langs/hu_HU/oauth.lang           |   0
 {public => htdocs}/langs/hu_HU/opensurvey.lang      |   0
 {public => htdocs}/langs/hu_HU/orders.lang          |   0
 {public => htdocs}/langs/hu_HU/other.lang           |   0
 {public => htdocs}/langs/hu_HU/paybox.lang          |   0
 {public => htdocs}/langs/hu_HU/paypal.lang          |   0
 {public => htdocs}/langs/hu_HU/printing.lang        |   0
 {public => htdocs}/langs/hu_HU/productbatch.lang    |   0
 {public => htdocs}/langs/hu_HU/products.lang        |   0
 {public => htdocs}/langs/hu_HU/projects.lang        |   0
 {public => htdocs}/langs/hu_HU/propal.lang          |   0
 {public => htdocs}/langs/hu_HU/receiptprinter.lang  |   0
 {public => htdocs}/langs/hu_HU/resource.lang        |   0
 {public => htdocs}/langs/hu_HU/salaries.lang        |   0
 {public => htdocs}/langs/hu_HU/sendings.lang        |   0
 {public => htdocs}/langs/hu_HU/sms.lang             |   0
 {public => htdocs}/langs/hu_HU/stocks.lang          |   0
 .../langs/hu_HU/supplier_proposal.lang              |   0
 {public => htdocs}/langs/hu_HU/suppliers.lang       |   0
 {public => htdocs}/langs/hu_HU/trips.lang           |   0
 {public => htdocs}/langs/hu_HU/users.lang           |   0
 {public => htdocs}/langs/hu_HU/website.lang         |   0
 {public => htdocs}/langs/hu_HU/withdrawals.lang     |   0
 {public => htdocs}/langs/hu_HU/workflow.lang        |   0
 {public => htdocs}/langs/id_ID/accountancy.lang     |   0
 {public => htdocs}/langs/id_ID/admin.lang           |   0
 {public => htdocs}/langs/id_ID/agenda.lang          |   0
 {public => htdocs}/langs/id_ID/banks.lang           |   0
 {public => htdocs}/langs/id_ID/bills.lang           |   0
 {public => htdocs}/langs/id_ID/bookmarks.lang       |   0
 {public => htdocs}/langs/id_ID/boxes.lang           |   0
 {public => htdocs}/langs/id_ID/cashdesk.lang        |   0
 {public => htdocs}/langs/id_ID/categories.lang      |   0
 {public => htdocs}/langs/id_ID/commercial.lang      |   0
 {public => htdocs}/langs/id_ID/companies.lang       |   0
 {public => htdocs}/langs/id_ID/compta.lang          |   0
 {public => htdocs}/langs/id_ID/contracts.lang       |   0
 {public => htdocs}/langs/id_ID/cron.lang            |   0
 {public => htdocs}/langs/id_ID/deliveries.lang      |   0
 {public => htdocs}/langs/id_ID/dict.lang            |   0
 {public => htdocs}/langs/id_ID/donations.lang       |   0
 {public => htdocs}/langs/id_ID/ecm.lang             |   0
 {public => htdocs}/langs/id_ID/errors.lang          |   0
 {public => htdocs}/langs/id_ID/exports.lang         |   0
 {public => htdocs}/langs/id_ID/externalsite.lang    |   0
 {public => htdocs}/langs/id_ID/ftp.lang             |   0
 {public => htdocs}/langs/id_ID/help.lang            |   0
 {public => htdocs}/langs/id_ID/holiday.lang         |   0
 {public => htdocs}/langs/id_ID/hrm.lang             |   0
 {public => htdocs}/langs/id_ID/incoterm.lang        |   0
 {public => htdocs}/langs/id_ID/install.lang         |   0
 {public => htdocs}/langs/id_ID/interventions.lang   |   0
 {public => htdocs}/langs/id_ID/languages.lang       |   0
 {public => htdocs}/langs/id_ID/ldap.lang            |   0
 {public => htdocs}/langs/id_ID/link.lang            |   0
 {public => htdocs}/langs/id_ID/loan.lang            |   0
 {public => htdocs}/langs/id_ID/mailmanspip.lang     |   0
 {public => htdocs}/langs/id_ID/mails.lang           |   0
 {public => htdocs}/langs/id_ID/main.lang            |   0
 {public => htdocs}/langs/id_ID/margins.lang         |   0
 {public => htdocs}/langs/id_ID/members.lang         |   0
 {public => htdocs}/langs/id_ID/oauth.lang           |   0
 {public => htdocs}/langs/id_ID/opensurvey.lang      |   0
 {public => htdocs}/langs/id_ID/orders.lang          |   0
 {public => htdocs}/langs/id_ID/other.lang           |   0
 {public => htdocs}/langs/id_ID/paybox.lang          |   0
 {public => htdocs}/langs/id_ID/paypal.lang          |   0
 {public => htdocs}/langs/id_ID/printing.lang        |   0
 {public => htdocs}/langs/id_ID/productbatch.lang    |   0
 {public => htdocs}/langs/id_ID/products.lang        |   0
 {public => htdocs}/langs/id_ID/projects.lang        |   0
 {public => htdocs}/langs/id_ID/propal.lang          |   0
 {public => htdocs}/langs/id_ID/receiptprinter.lang  |   0
 {public => htdocs}/langs/id_ID/resource.lang        |   0
 {public => htdocs}/langs/id_ID/salaries.lang        |   0
 {public => htdocs}/langs/id_ID/sendings.lang        |   0
 {public => htdocs}/langs/id_ID/sms.lang             |   0
 {public => htdocs}/langs/id_ID/stocks.lang          |   0
 .../langs/id_ID/supplier_proposal.lang              |   0
 {public => htdocs}/langs/id_ID/suppliers.lang       |   0
 {public => htdocs}/langs/id_ID/trips.lang           |   0
 {public => htdocs}/langs/id_ID/users.lang           |   0
 {public => htdocs}/langs/id_ID/website.lang         |   0
 {public => htdocs}/langs/id_ID/withdrawals.lang     |   0
 {public => htdocs}/langs/id_ID/workflow.lang        |   0
 {public => htdocs}/langs/is_IS/accountancy.lang     |   0
 {public => htdocs}/langs/is_IS/admin.lang           |   0
 {public => htdocs}/langs/is_IS/agenda.lang          |   0
 {public => htdocs}/langs/is_IS/banks.lang           |   0
 {public => htdocs}/langs/is_IS/bills.lang           |   0
 {public => htdocs}/langs/is_IS/bookmarks.lang       |   0
 {public => htdocs}/langs/is_IS/boxes.lang           |   0
 {public => htdocs}/langs/is_IS/cashdesk.lang        |   0
 {public => htdocs}/langs/is_IS/categories.lang      |   0
 {public => htdocs}/langs/is_IS/commercial.lang      |   0
 {public => htdocs}/langs/is_IS/companies.lang       |   0
 {public => htdocs}/langs/is_IS/compta.lang          |   0
 {public => htdocs}/langs/is_IS/contracts.lang       |   0
 {public => htdocs}/langs/is_IS/cron.lang            |   0
 {public => htdocs}/langs/is_IS/deliveries.lang      |   0
 {public => htdocs}/langs/is_IS/dict.lang            |   0
 {public => htdocs}/langs/is_IS/donations.lang       |   0
 {public => htdocs}/langs/is_IS/ecm.lang             |   0
 {public => htdocs}/langs/is_IS/errors.lang          |   0
 {public => htdocs}/langs/is_IS/exports.lang         |   0
 {public => htdocs}/langs/is_IS/externalsite.lang    |   0
 {public => htdocs}/langs/is_IS/ftp.lang             |   0
 {public => htdocs}/langs/is_IS/help.lang            |   0
 {public => htdocs}/langs/is_IS/holiday.lang         |   0
 {public => htdocs}/langs/is_IS/hrm.lang             |   0
 {public => htdocs}/langs/is_IS/incoterm.lang        |   0
 {public => htdocs}/langs/is_IS/install.lang         |   0
 {public => htdocs}/langs/is_IS/interventions.lang   |   0
 {public => htdocs}/langs/is_IS/languages.lang       |   0
 {public => htdocs}/langs/is_IS/ldap.lang            |   0
 {public => htdocs}/langs/is_IS/link.lang            |   0
 {public => htdocs}/langs/is_IS/loan.lang            |   0
 {public => htdocs}/langs/is_IS/mailmanspip.lang     |   0
 {public => htdocs}/langs/is_IS/mails.lang           |   0
 {public => htdocs}/langs/is_IS/main.lang            |   0
 {public => htdocs}/langs/is_IS/margins.lang         |   0
 {public => htdocs}/langs/is_IS/members.lang         |   0
 {public => htdocs}/langs/is_IS/oauth.lang           |   0
 {public => htdocs}/langs/is_IS/opensurvey.lang      |   0
 {public => htdocs}/langs/is_IS/orders.lang          |   0
 {public => htdocs}/langs/is_IS/other.lang           |   0
 {public => htdocs}/langs/is_IS/paybox.lang          |   0
 {public => htdocs}/langs/is_IS/paypal.lang          |   0
 {public => htdocs}/langs/is_IS/printing.lang        |   0
 {public => htdocs}/langs/is_IS/productbatch.lang    |   0
 {public => htdocs}/langs/is_IS/products.lang        |   0
 {public => htdocs}/langs/is_IS/projects.lang        |   0
 {public => htdocs}/langs/is_IS/propal.lang          |   0
 {public => htdocs}/langs/is_IS/receiptprinter.lang  |   0
 {public => htdocs}/langs/is_IS/resource.lang        |   0
 {public => htdocs}/langs/is_IS/salaries.lang        |   0
 {public => htdocs}/langs/is_IS/sendings.lang        |   0
 {public => htdocs}/langs/is_IS/sms.lang             |   0
 {public => htdocs}/langs/is_IS/stocks.lang          |   0
 .../langs/is_IS/supplier_proposal.lang              |   0
 {public => htdocs}/langs/is_IS/suppliers.lang       |   0
 {public => htdocs}/langs/is_IS/trips.lang           |   0
 {public => htdocs}/langs/is_IS/users.lang           |   0
 {public => htdocs}/langs/is_IS/website.lang         |   0
 {public => htdocs}/langs/is_IS/withdrawals.lang     |   0
 {public => htdocs}/langs/is_IS/workflow.lang        |   0
 {public => htdocs}/langs/it_IT/accountancy.lang     |   0
 {public => htdocs}/langs/it_IT/admin.lang           |   0
 {public => htdocs}/langs/it_IT/agenda.lang          |   0
 {public => htdocs}/langs/it_IT/banks.lang           |   0
 {public => htdocs}/langs/it_IT/bills.lang           |   0
 {public => htdocs}/langs/it_IT/bookmarks.lang       |   0
 {public => htdocs}/langs/it_IT/boxes.lang           |   0
 {public => htdocs}/langs/it_IT/cashdesk.lang        |   0
 {public => htdocs}/langs/it_IT/categories.lang      |   0
 {public => htdocs}/langs/it_IT/commercial.lang      |   0
 {public => htdocs}/langs/it_IT/companies.lang       |   0
 {public => htdocs}/langs/it_IT/compta.lang          |   0
 {public => htdocs}/langs/it_IT/contracts.lang       |   0
 {public => htdocs}/langs/it_IT/cron.lang            |   0
 {public => htdocs}/langs/it_IT/deliveries.lang      |   0
 {public => htdocs}/langs/it_IT/dict.lang            |   0
 {public => htdocs}/langs/it_IT/donations.lang       |   0
 {public => htdocs}/langs/it_IT/ecm.lang             |   0
 {public => htdocs}/langs/it_IT/errors.lang          |   0
 {public => htdocs}/langs/it_IT/exports.lang         |   0
 {public => htdocs}/langs/it_IT/externalsite.lang    |   0
 {public => htdocs}/langs/it_IT/ftp.lang             |   0
 {public => htdocs}/langs/it_IT/google.lang          |   0
 {public => htdocs}/langs/it_IT/help.lang            |   0
 {public => htdocs}/langs/it_IT/holiday.lang         |   0
 {public => htdocs}/langs/it_IT/hrm.lang             |   0
 {public => htdocs}/langs/it_IT/incoterm.lang        |   0
 {public => htdocs}/langs/it_IT/install.lang         |   0
 {public => htdocs}/langs/it_IT/interventions.lang   |   0
 {public => htdocs}/langs/it_IT/languages.lang       |   0
 {public => htdocs}/langs/it_IT/ldap.lang            |   0
 {public => htdocs}/langs/it_IT/link.lang            |   0
 {public => htdocs}/langs/it_IT/loan.lang            |   0
 {public => htdocs}/langs/it_IT/mailmanspip.lang     |   0
 {public => htdocs}/langs/it_IT/mails.lang           |   0
 {public => htdocs}/langs/it_IT/main.lang            |   0
 {public => htdocs}/langs/it_IT/margins.lang         |   0
 {public => htdocs}/langs/it_IT/members.lang         |   0
 {public => htdocs}/langs/it_IT/oauth.lang           |   0
 {public => htdocs}/langs/it_IT/opensurvey.lang      |   0
 {public => htdocs}/langs/it_IT/orders.lang          |   0
 {public => htdocs}/langs/it_IT/other.lang           |   0
 {public => htdocs}/langs/it_IT/paybox.lang          |   0
 {public => htdocs}/langs/it_IT/paypal.lang          |   0
 {public => htdocs}/langs/it_IT/printing.lang        |   0
 {public => htdocs}/langs/it_IT/productbatch.lang    |   0
 {public => htdocs}/langs/it_IT/products.lang        |   0
 {public => htdocs}/langs/it_IT/projects.lang        |   0
 {public => htdocs}/langs/it_IT/propal.lang          |   0
 {public => htdocs}/langs/it_IT/receiptprinter.lang  |   0
 {public => htdocs}/langs/it_IT/resource.lang        |   0
 {public => htdocs}/langs/it_IT/salaries.lang        |   0
 {public => htdocs}/langs/it_IT/sendings.lang        |   0
 {public => htdocs}/langs/it_IT/sms.lang             |   0
 {public => htdocs}/langs/it_IT/stocks.lang          |   0
 .../langs/it_IT/supplier_proposal.lang              |   0
 {public => htdocs}/langs/it_IT/suppliers.lang       |   0
 {public => htdocs}/langs/it_IT/trips.lang           |   0
 {public => htdocs}/langs/it_IT/users.lang           |   0
 {public => htdocs}/langs/it_IT/website.lang         |   0
 {public => htdocs}/langs/it_IT/withdrawals.lang     |   0
 {public => htdocs}/langs/it_IT/workflow.lang        |   0
 {public => htdocs}/langs/ja_JP/accountancy.lang     |   0
 {public => htdocs}/langs/ja_JP/admin.lang           |   0
 {public => htdocs}/langs/ja_JP/agenda.lang          |   0
 {public => htdocs}/langs/ja_JP/banks.lang           |   0
 {public => htdocs}/langs/ja_JP/bills.lang           |   0
 {public => htdocs}/langs/ja_JP/bookmarks.lang       |   0
 {public => htdocs}/langs/ja_JP/boxes.lang           |   0
 {public => htdocs}/langs/ja_JP/cashdesk.lang        |   0
 {public => htdocs}/langs/ja_JP/categories.lang      |   0
 {public => htdocs}/langs/ja_JP/commercial.lang      |   0
 {public => htdocs}/langs/ja_JP/companies.lang       |   0
 {public => htdocs}/langs/ja_JP/compta.lang          |   0
 {public => htdocs}/langs/ja_JP/contracts.lang       |   0
 {public => htdocs}/langs/ja_JP/cron.lang            |   0
 {public => htdocs}/langs/ja_JP/deliveries.lang      |   0
 {public => htdocs}/langs/ja_JP/dict.lang            |   0
 {public => htdocs}/langs/ja_JP/donations.lang       |   0
 {public => htdocs}/langs/ja_JP/ecm.lang             |   0
 {public => htdocs}/langs/ja_JP/errors.lang          |   0
 {public => htdocs}/langs/ja_JP/exports.lang         |   0
 {public => htdocs}/langs/ja_JP/externalsite.lang    |   0
 {public => htdocs}/langs/ja_JP/ftp.lang             |   0
 {public => htdocs}/langs/ja_JP/help.lang            |   0
 {public => htdocs}/langs/ja_JP/holiday.lang         |   0
 {public => htdocs}/langs/ja_JP/hrm.lang             |   0
 {public => htdocs}/langs/ja_JP/incoterm.lang        |   0
 {public => htdocs}/langs/ja_JP/install.lang         |   0
 {public => htdocs}/langs/ja_JP/interventions.lang   |   0
 {public => htdocs}/langs/ja_JP/languages.lang       |   0
 {public => htdocs}/langs/ja_JP/ldap.lang            |   0
 {public => htdocs}/langs/ja_JP/link.lang            |   0
 {public => htdocs}/langs/ja_JP/loan.lang            |   0
 {public => htdocs}/langs/ja_JP/mailmanspip.lang     |   0
 {public => htdocs}/langs/ja_JP/mails.lang           |   0
 {public => htdocs}/langs/ja_JP/main.lang            |   0
 {public => htdocs}/langs/ja_JP/margins.lang         |   0
 {public => htdocs}/langs/ja_JP/members.lang         |   0
 {public => htdocs}/langs/ja_JP/oauth.lang           |   0
 {public => htdocs}/langs/ja_JP/opensurvey.lang      |   0
 {public => htdocs}/langs/ja_JP/orders.lang          |   0
 {public => htdocs}/langs/ja_JP/other.lang           |   0
 {public => htdocs}/langs/ja_JP/paybox.lang          |   0
 {public => htdocs}/langs/ja_JP/paypal.lang          |   0
 {public => htdocs}/langs/ja_JP/printing.lang        |   0
 {public => htdocs}/langs/ja_JP/productbatch.lang    |   0
 {public => htdocs}/langs/ja_JP/products.lang        |   0
 {public => htdocs}/langs/ja_JP/projects.lang        |   0
 {public => htdocs}/langs/ja_JP/propal.lang          |   0
 {public => htdocs}/langs/ja_JP/receiptprinter.lang  |   0
 {public => htdocs}/langs/ja_JP/resource.lang        |   0
 {public => htdocs}/langs/ja_JP/salaries.lang        |   0
 {public => htdocs}/langs/ja_JP/sendings.lang        |   0
 {public => htdocs}/langs/ja_JP/sms.lang             |   0
 {public => htdocs}/langs/ja_JP/stocks.lang          |   0
 .../langs/ja_JP/supplier_proposal.lang              |   0
 {public => htdocs}/langs/ja_JP/suppliers.lang       |   0
 {public => htdocs}/langs/ja_JP/trips.lang           |   0
 {public => htdocs}/langs/ja_JP/users.lang           |   0
 {public => htdocs}/langs/ja_JP/website.lang         |   0
 {public => htdocs}/langs/ja_JP/withdrawals.lang     |   0
 {public => htdocs}/langs/ja_JP/workflow.lang        |   0
 {public => htdocs}/langs/ka_GE/accountancy.lang     |   0
 {public => htdocs}/langs/ka_GE/admin.lang           |   0
 {public => htdocs}/langs/ka_GE/agenda.lang          |   0
 {public => htdocs}/langs/ka_GE/banks.lang           |   0
 {public => htdocs}/langs/ka_GE/bills.lang           |   0
 {public => htdocs}/langs/ka_GE/bookmarks.lang       |   0
 {public => htdocs}/langs/ka_GE/boxes.lang           |   0
 {public => htdocs}/langs/ka_GE/cashdesk.lang        |   0
 {public => htdocs}/langs/ka_GE/categories.lang      |   0
 {public => htdocs}/langs/ka_GE/commercial.lang      |   0
 {public => htdocs}/langs/ka_GE/companies.lang       |   0
 {public => htdocs}/langs/ka_GE/compta.lang          |   0
 {public => htdocs}/langs/ka_GE/contracts.lang       |   0
 {public => htdocs}/langs/ka_GE/cron.lang            |   0
 {public => htdocs}/langs/ka_GE/deliveries.lang      |   0
 {public => htdocs}/langs/ka_GE/dict.lang            |   0
 {public => htdocs}/langs/ka_GE/donations.lang       |   0
 {public => htdocs}/langs/ka_GE/ecm.lang             |   0
 {public => htdocs}/langs/ka_GE/errors.lang          |   0
 {public => htdocs}/langs/ka_GE/exports.lang         |   0
 {public => htdocs}/langs/ka_GE/externalsite.lang    |   0
 {public => htdocs}/langs/ka_GE/ftp.lang             |   0
 {public => htdocs}/langs/ka_GE/help.lang            |   0
 {public => htdocs}/langs/ka_GE/holiday.lang         |   0
 {public => htdocs}/langs/ka_GE/hrm.lang             |   0
 {public => htdocs}/langs/ka_GE/incoterm.lang        |   0
 {public => htdocs}/langs/ka_GE/install.lang         |   0
 {public => htdocs}/langs/ka_GE/interventions.lang   |   0
 {public => htdocs}/langs/ka_GE/languages.lang       |   0
 {public => htdocs}/langs/ka_GE/ldap.lang            |   0
 {public => htdocs}/langs/ka_GE/link.lang            |   0
 {public => htdocs}/langs/ka_GE/loan.lang            |   0
 {public => htdocs}/langs/ka_GE/mailmanspip.lang     |   0
 {public => htdocs}/langs/ka_GE/mails.lang           |   0
 {public => htdocs}/langs/ka_GE/main.lang            |   0
 {public => htdocs}/langs/ka_GE/margins.lang         |   0
 {public => htdocs}/langs/ka_GE/members.lang         |   0
 {public => htdocs}/langs/ka_GE/oauth.lang           |   0
 {public => htdocs}/langs/ka_GE/opensurvey.lang      |   0
 {public => htdocs}/langs/ka_GE/orders.lang          |   0
 {public => htdocs}/langs/ka_GE/other.lang           |   0
 {public => htdocs}/langs/ka_GE/paybox.lang          |   0
 {public => htdocs}/langs/ka_GE/paypal.lang          |   0
 {public => htdocs}/langs/ka_GE/printing.lang        |   0
 {public => htdocs}/langs/ka_GE/productbatch.lang    |   0
 {public => htdocs}/langs/ka_GE/products.lang        |   0
 {public => htdocs}/langs/ka_GE/projects.lang        |   0
 {public => htdocs}/langs/ka_GE/propal.lang          |   0
 {public => htdocs}/langs/ka_GE/receiptprinter.lang  |   0
 {public => htdocs}/langs/ka_GE/resource.lang        |   0
 {public => htdocs}/langs/ka_GE/salaries.lang        |   0
 {public => htdocs}/langs/ka_GE/sendings.lang        |   0
 {public => htdocs}/langs/ka_GE/sms.lang             |   0
 {public => htdocs}/langs/ka_GE/stocks.lang          |   0
 .../langs/ka_GE/supplier_proposal.lang              |   0
 {public => htdocs}/langs/ka_GE/suppliers.lang       |   0
 {public => htdocs}/langs/ka_GE/trips.lang           |   0
 {public => htdocs}/langs/ka_GE/users.lang           |   0
 {public => htdocs}/langs/ka_GE/website.lang         |   0
 {public => htdocs}/langs/ka_GE/withdrawals.lang     |   0
 {public => htdocs}/langs/ka_GE/workflow.lang        |   0
 {public => htdocs}/langs/km_KH/accountancy.lang     |   0
 {public => htdocs}/langs/km_KH/admin.lang           |   0
 {public => htdocs}/langs/km_KH/agenda.lang          |   0
 {public => htdocs}/langs/km_KH/banks.lang           |   0
 {public => htdocs}/langs/km_KH/bills.lang           |   0
 {public => htdocs}/langs/km_KH/bookmarks.lang       |   0
 {public => htdocs}/langs/km_KH/boxes.lang           |   0
 {public => htdocs}/langs/km_KH/cashdesk.lang        |   0
 {public => htdocs}/langs/km_KH/categories.lang      |   0
 {public => htdocs}/langs/km_KH/commercial.lang      |   0
 {public => htdocs}/langs/km_KH/companies.lang       |   0
 {public => htdocs}/langs/km_KH/compta.lang          |   0
 {public => htdocs}/langs/km_KH/contracts.lang       |   0
 {public => htdocs}/langs/km_KH/cron.lang            |   0
 {public => htdocs}/langs/km_KH/deliveries.lang      |   0
 {public => htdocs}/langs/km_KH/dict.lang            |   0
 {public => htdocs}/langs/km_KH/donations.lang       |   0
 {public => htdocs}/langs/km_KH/ecm.lang             |   0
 {public => htdocs}/langs/km_KH/errors.lang          |   0
 {public => htdocs}/langs/km_KH/exports.lang         |   0
 {public => htdocs}/langs/km_KH/externalsite.lang    |   0
 {public => htdocs}/langs/km_KH/ftp.lang             |   0
 {public => htdocs}/langs/km_KH/help.lang            |   0
 {public => htdocs}/langs/km_KH/holiday.lang         |   0
 {public => htdocs}/langs/km_KH/hrm.lang             |   0
 {public => htdocs}/langs/km_KH/incoterm.lang        |   0
 {public => htdocs}/langs/km_KH/install.lang         |   0
 {public => htdocs}/langs/km_KH/interventions.lang   |   0
 {public => htdocs}/langs/km_KH/languages.lang       |   0
 {public => htdocs}/langs/km_KH/ldap.lang            |   0
 {public => htdocs}/langs/km_KH/link.lang            |   0
 {public => htdocs}/langs/km_KH/loan.lang            |   0
 {public => htdocs}/langs/km_KH/mailmanspip.lang     |   0
 {public => htdocs}/langs/km_KH/mails.lang           |   0
 {public => htdocs}/langs/km_KH/main.lang            |   0
 {public => htdocs}/langs/km_KH/margins.lang         |   0
 {public => htdocs}/langs/km_KH/members.lang         |   0
 {public => htdocs}/langs/km_KH/oauth.lang           |   0
 {public => htdocs}/langs/km_KH/opensurvey.lang      |   0
 {public => htdocs}/langs/km_KH/orders.lang          |   0
 {public => htdocs}/langs/km_KH/other.lang           |   0
 {public => htdocs}/langs/km_KH/paybox.lang          |   0
 {public => htdocs}/langs/km_KH/paypal.lang          |   0
 {public => htdocs}/langs/km_KH/printing.lang        |   0
 {public => htdocs}/langs/km_KH/productbatch.lang    |   0
 {public => htdocs}/langs/km_KH/products.lang        |   0
 {public => htdocs}/langs/km_KH/projects.lang        |   0
 {public => htdocs}/langs/km_KH/propal.lang          |   0
 {public => htdocs}/langs/km_KH/receiptprinter.lang  |   0
 {public => htdocs}/langs/km_KH/resource.lang        |   0
 {public => htdocs}/langs/km_KH/salaries.lang        |   0
 {public => htdocs}/langs/km_KH/sendings.lang        |   0
 {public => htdocs}/langs/km_KH/sms.lang             |   0
 {public => htdocs}/langs/km_KH/stocks.lang          |   0
 .../langs/km_KH/supplier_proposal.lang              |   0
 {public => htdocs}/langs/km_KH/suppliers.lang       |   0
 {public => htdocs}/langs/km_KH/trips.lang           |   0
 {public => htdocs}/langs/km_KH/users.lang           |   0
 {public => htdocs}/langs/km_KH/website.lang         |   0
 {public => htdocs}/langs/km_KH/withdrawals.lang     |   0
 {public => htdocs}/langs/km_KH/workflow.lang        |   0
 {public => htdocs}/langs/kn_IN/accountancy.lang     |   0
 {public => htdocs}/langs/kn_IN/admin.lang           |   0
 {public => htdocs}/langs/kn_IN/agenda.lang          |   0
 {public => htdocs}/langs/kn_IN/banks.lang           |   0
 {public => htdocs}/langs/kn_IN/bills.lang           |   0
 {public => htdocs}/langs/kn_IN/bookmarks.lang       |   0
 {public => htdocs}/langs/kn_IN/boxes.lang           |   0
 {public => htdocs}/langs/kn_IN/cashdesk.lang        |   0
 {public => htdocs}/langs/kn_IN/categories.lang      |   0
 {public => htdocs}/langs/kn_IN/commercial.lang      |   0
 {public => htdocs}/langs/kn_IN/companies.lang       |   0
 {public => htdocs}/langs/kn_IN/compta.lang          |   0
 {public => htdocs}/langs/kn_IN/contracts.lang       |   0
 {public => htdocs}/langs/kn_IN/cron.lang            |   0
 {public => htdocs}/langs/kn_IN/deliveries.lang      |   0
 {public => htdocs}/langs/kn_IN/dict.lang            |   0
 {public => htdocs}/langs/kn_IN/donations.lang       |   0
 {public => htdocs}/langs/kn_IN/ecm.lang             |   0
 {public => htdocs}/langs/kn_IN/errors.lang          |   0
 {public => htdocs}/langs/kn_IN/exports.lang         |   0
 {public => htdocs}/langs/kn_IN/externalsite.lang    |   0
 {public => htdocs}/langs/kn_IN/ftp.lang             |   0
 {public => htdocs}/langs/kn_IN/help.lang            |   0
 {public => htdocs}/langs/kn_IN/holiday.lang         |   0
 {public => htdocs}/langs/kn_IN/hrm.lang             |   0
 {public => htdocs}/langs/kn_IN/incoterm.lang        |   0
 {public => htdocs}/langs/kn_IN/install.lang         |   0
 {public => htdocs}/langs/kn_IN/interventions.lang   |   0
 {public => htdocs}/langs/kn_IN/languages.lang       |   0
 {public => htdocs}/langs/kn_IN/ldap.lang            |   0
 {public => htdocs}/langs/kn_IN/link.lang            |   0
 {public => htdocs}/langs/kn_IN/loan.lang            |   0
 {public => htdocs}/langs/kn_IN/mailmanspip.lang     |   0
 {public => htdocs}/langs/kn_IN/mails.lang           |   0
 {public => htdocs}/langs/kn_IN/main.lang            |   0
 {public => htdocs}/langs/kn_IN/margins.lang         |   0
 {public => htdocs}/langs/kn_IN/members.lang         |   0
 {public => htdocs}/langs/kn_IN/oauth.lang           |   0
 {public => htdocs}/langs/kn_IN/opensurvey.lang      |   0
 {public => htdocs}/langs/kn_IN/orders.lang          |   0
 {public => htdocs}/langs/kn_IN/other.lang           |   0
 {public => htdocs}/langs/kn_IN/paybox.lang          |   0
 {public => htdocs}/langs/kn_IN/paypal.lang          |   0
 {public => htdocs}/langs/kn_IN/printing.lang        |   0
 {public => htdocs}/langs/kn_IN/productbatch.lang    |   0
 {public => htdocs}/langs/kn_IN/products.lang        |   0
 {public => htdocs}/langs/kn_IN/projects.lang        |   0
 {public => htdocs}/langs/kn_IN/propal.lang          |   0
 {public => htdocs}/langs/kn_IN/receiptprinter.lang  |   0
 {public => htdocs}/langs/kn_IN/resource.lang        |   0
 {public => htdocs}/langs/kn_IN/salaries.lang        |   0
 {public => htdocs}/langs/kn_IN/sendings.lang        |   0
 {public => htdocs}/langs/kn_IN/sms.lang             |   0
 {public => htdocs}/langs/kn_IN/stocks.lang          |   0
 .../langs/kn_IN/supplier_proposal.lang              |   0
 {public => htdocs}/langs/kn_IN/suppliers.lang       |   0
 {public => htdocs}/langs/kn_IN/trips.lang           |   0
 {public => htdocs}/langs/kn_IN/users.lang           |   0
 {public => htdocs}/langs/kn_IN/website.lang         |   0
 {public => htdocs}/langs/kn_IN/withdrawals.lang     |   0
 {public => htdocs}/langs/kn_IN/workflow.lang        |   0
 {public => htdocs}/langs/ko_KR/accountancy.lang     |   0
 {public => htdocs}/langs/ko_KR/admin.lang           |   0
 {public => htdocs}/langs/ko_KR/agenda.lang          |   0
 {public => htdocs}/langs/ko_KR/banks.lang           |   0
 {public => htdocs}/langs/ko_KR/bills.lang           |   0
 {public => htdocs}/langs/ko_KR/bookmarks.lang       |   0
 {public => htdocs}/langs/ko_KR/boxes.lang           |   0
 {public => htdocs}/langs/ko_KR/cashdesk.lang        |   0
 {public => htdocs}/langs/ko_KR/categories.lang      |   0
 {public => htdocs}/langs/ko_KR/commercial.lang      |   0
 {public => htdocs}/langs/ko_KR/companies.lang       |   0
 {public => htdocs}/langs/ko_KR/compta.lang          |   0
 {public => htdocs}/langs/ko_KR/contracts.lang       |   0
 {public => htdocs}/langs/ko_KR/cron.lang            |   0
 {public => htdocs}/langs/ko_KR/deliveries.lang      |   0
 {public => htdocs}/langs/ko_KR/dict.lang            |   0
 {public => htdocs}/langs/ko_KR/donations.lang       |   0
 {public => htdocs}/langs/ko_KR/ecm.lang             |   0
 {public => htdocs}/langs/ko_KR/errors.lang          |   0
 {public => htdocs}/langs/ko_KR/exports.lang         |   0
 {public => htdocs}/langs/ko_KR/externalsite.lang    |   0
 {public => htdocs}/langs/ko_KR/ftp.lang             |   0
 {public => htdocs}/langs/ko_KR/help.lang            |   0
 {public => htdocs}/langs/ko_KR/holiday.lang         |   0
 {public => htdocs}/langs/ko_KR/hrm.lang             |   0
 {public => htdocs}/langs/ko_KR/incoterm.lang        |   0
 {public => htdocs}/langs/ko_KR/install.lang         |   0
 {public => htdocs}/langs/ko_KR/interventions.lang   |   0
 {public => htdocs}/langs/ko_KR/languages.lang       |   0
 {public => htdocs}/langs/ko_KR/ldap.lang            |   0
 {public => htdocs}/langs/ko_KR/link.lang            |   0
 {public => htdocs}/langs/ko_KR/loan.lang            |   0
 {public => htdocs}/langs/ko_KR/mailmanspip.lang     |   0
 {public => htdocs}/langs/ko_KR/mails.lang           |   0
 {public => htdocs}/langs/ko_KR/main.lang            |   0
 {public => htdocs}/langs/ko_KR/margins.lang         |   0
 {public => htdocs}/langs/ko_KR/members.lang         |   0
 {public => htdocs}/langs/ko_KR/oauth.lang           |   0
 {public => htdocs}/langs/ko_KR/opensurvey.lang      |   0
 {public => htdocs}/langs/ko_KR/orders.lang          |   0
 {public => htdocs}/langs/ko_KR/other.lang           |   0
 {public => htdocs}/langs/ko_KR/paybox.lang          |   0
 {public => htdocs}/langs/ko_KR/paypal.lang          |   0
 {public => htdocs}/langs/ko_KR/printing.lang        |   0
 {public => htdocs}/langs/ko_KR/productbatch.lang    |   0
 {public => htdocs}/langs/ko_KR/products.lang        |   0
 {public => htdocs}/langs/ko_KR/projects.lang        |   0
 {public => htdocs}/langs/ko_KR/propal.lang          |   0
 {public => htdocs}/langs/ko_KR/receiptprinter.lang  |   0
 {public => htdocs}/langs/ko_KR/resource.lang        |   0
 {public => htdocs}/langs/ko_KR/salaries.lang        |   0
 {public => htdocs}/langs/ko_KR/sendings.lang        |   0
 {public => htdocs}/langs/ko_KR/sms.lang             |   0
 {public => htdocs}/langs/ko_KR/stocks.lang          |   0
 .../langs/ko_KR/supplier_proposal.lang              |   0
 {public => htdocs}/langs/ko_KR/suppliers.lang       |   0
 {public => htdocs}/langs/ko_KR/trips.lang           |   0
 {public => htdocs}/langs/ko_KR/users.lang           |   0
 {public => htdocs}/langs/ko_KR/website.lang         |   0
 {public => htdocs}/langs/ko_KR/withdrawals.lang     |   0
 {public => htdocs}/langs/ko_KR/workflow.lang        |   0
 {public => htdocs}/langs/lo_LA/accountancy.lang     |   0
 {public => htdocs}/langs/lo_LA/admin.lang           |   0
 {public => htdocs}/langs/lo_LA/agenda.lang          |   0
 {public => htdocs}/langs/lo_LA/banks.lang           |   0
 {public => htdocs}/langs/lo_LA/bills.lang           |   0
 {public => htdocs}/langs/lo_LA/bookmarks.lang       |   0
 {public => htdocs}/langs/lo_LA/boxes.lang           |   0
 {public => htdocs}/langs/lo_LA/cashdesk.lang        |   0
 {public => htdocs}/langs/lo_LA/categories.lang      |   0
 {public => htdocs}/langs/lo_LA/commercial.lang      |   0
 {public => htdocs}/langs/lo_LA/companies.lang       |   0
 {public => htdocs}/langs/lo_LA/compta.lang          |   0
 {public => htdocs}/langs/lo_LA/contracts.lang       |   0
 {public => htdocs}/langs/lo_LA/cron.lang            |   0
 {public => htdocs}/langs/lo_LA/deliveries.lang      |   0
 {public => htdocs}/langs/lo_LA/dict.lang            |   0
 {public => htdocs}/langs/lo_LA/donations.lang       |   0
 {public => htdocs}/langs/lo_LA/ecm.lang             |   0
 {public => htdocs}/langs/lo_LA/errors.lang          |   0
 {public => htdocs}/langs/lo_LA/exports.lang         |   0
 {public => htdocs}/langs/lo_LA/externalsite.lang    |   0
 {public => htdocs}/langs/lo_LA/ftp.lang             |   0
 {public => htdocs}/langs/lo_LA/help.lang            |   0
 {public => htdocs}/langs/lo_LA/holiday.lang         |   0
 {public => htdocs}/langs/lo_LA/hrm.lang             |   0
 {public => htdocs}/langs/lo_LA/incoterm.lang        |   0
 {public => htdocs}/langs/lo_LA/install.lang         |   0
 {public => htdocs}/langs/lo_LA/interventions.lang   |   0
 {public => htdocs}/langs/lo_LA/languages.lang       |   0
 {public => htdocs}/langs/lo_LA/ldap.lang            |   0
 {public => htdocs}/langs/lo_LA/link.lang            |   0
 {public => htdocs}/langs/lo_LA/loan.lang            |   0
 {public => htdocs}/langs/lo_LA/mailmanspip.lang     |   0
 {public => htdocs}/langs/lo_LA/mails.lang           |   0
 {public => htdocs}/langs/lo_LA/main.lang            |   0
 {public => htdocs}/langs/lo_LA/margins.lang         |   0
 {public => htdocs}/langs/lo_LA/members.lang         |   0
 {public => htdocs}/langs/lo_LA/oauth.lang           |   0
 {public => htdocs}/langs/lo_LA/opensurvey.lang      |   0
 {public => htdocs}/langs/lo_LA/orders.lang          |   0
 {public => htdocs}/langs/lo_LA/other.lang           |   0
 {public => htdocs}/langs/lo_LA/paybox.lang          |   0
 {public => htdocs}/langs/lo_LA/paypal.lang          |   0
 {public => htdocs}/langs/lo_LA/printing.lang        |   0
 {public => htdocs}/langs/lo_LA/productbatch.lang    |   0
 {public => htdocs}/langs/lo_LA/products.lang        |   0
 {public => htdocs}/langs/lo_LA/projects.lang        |   0
 {public => htdocs}/langs/lo_LA/propal.lang          |   0
 {public => htdocs}/langs/lo_LA/receiptprinter.lang  |   0
 {public => htdocs}/langs/lo_LA/resource.lang        |   0
 {public => htdocs}/langs/lo_LA/salaries.lang        |   0
 {public => htdocs}/langs/lo_LA/sendings.lang        |   0
 {public => htdocs}/langs/lo_LA/sms.lang             |   0
 {public => htdocs}/langs/lo_LA/stocks.lang          |   0
 .../langs/lo_LA/supplier_proposal.lang              |   0
 {public => htdocs}/langs/lo_LA/suppliers.lang       |   0
 {public => htdocs}/langs/lo_LA/trips.lang           |   0
 {public => htdocs}/langs/lo_LA/users.lang           |   0
 {public => htdocs}/langs/lo_LA/website.lang         |   0
 {public => htdocs}/langs/lo_LA/withdrawals.lang     |   0
 {public => htdocs}/langs/lo_LA/workflow.lang        |   0
 {public => htdocs}/langs/lt_LT/accountancy.lang     |   0
 {public => htdocs}/langs/lt_LT/admin.lang           |   0
 {public => htdocs}/langs/lt_LT/agenda.lang          |   0
 {public => htdocs}/langs/lt_LT/banks.lang           |   0
 {public => htdocs}/langs/lt_LT/bills.lang           |   0
 {public => htdocs}/langs/lt_LT/bookmarks.lang       |   0
 {public => htdocs}/langs/lt_LT/boxes.lang           |   0
 {public => htdocs}/langs/lt_LT/cashdesk.lang        |   0
 {public => htdocs}/langs/lt_LT/categories.lang      |   0
 {public => htdocs}/langs/lt_LT/commercial.lang      |   0
 {public => htdocs}/langs/lt_LT/companies.lang       |   0
 {public => htdocs}/langs/lt_LT/compta.lang          |   0
 {public => htdocs}/langs/lt_LT/contracts.lang       |   0
 {public => htdocs}/langs/lt_LT/cron.lang            |   0
 {public => htdocs}/langs/lt_LT/deliveries.lang      |   0
 {public => htdocs}/langs/lt_LT/dict.lang            |   0
 {public => htdocs}/langs/lt_LT/donations.lang       |   0
 {public => htdocs}/langs/lt_LT/ecm.lang             |   0
 {public => htdocs}/langs/lt_LT/errors.lang          |   0
 {public => htdocs}/langs/lt_LT/exports.lang         |   0
 {public => htdocs}/langs/lt_LT/externalsite.lang    |   0
 {public => htdocs}/langs/lt_LT/ftp.lang             |   0
 {public => htdocs}/langs/lt_LT/help.lang            |   0
 {public => htdocs}/langs/lt_LT/holiday.lang         |   0
 {public => htdocs}/langs/lt_LT/hrm.lang             |   0
 {public => htdocs}/langs/lt_LT/incoterm.lang        |   0
 {public => htdocs}/langs/lt_LT/install.lang         |   0
 {public => htdocs}/langs/lt_LT/interventions.lang   |   0
 {public => htdocs}/langs/lt_LT/languages.lang       |   0
 {public => htdocs}/langs/lt_LT/ldap.lang            |   0
 {public => htdocs}/langs/lt_LT/link.lang            |   0
 {public => htdocs}/langs/lt_LT/loan.lang            |   0
 {public => htdocs}/langs/lt_LT/mailmanspip.lang     |   0
 {public => htdocs}/langs/lt_LT/mails.lang           |   0
 {public => htdocs}/langs/lt_LT/main.lang            |   0
 {public => htdocs}/langs/lt_LT/margins.lang         |   0
 {public => htdocs}/langs/lt_LT/members.lang         |   0
 {public => htdocs}/langs/lt_LT/oauth.lang           |   0
 {public => htdocs}/langs/lt_LT/opensurvey.lang      |   0
 {public => htdocs}/langs/lt_LT/orders.lang          |   0
 {public => htdocs}/langs/lt_LT/other.lang           |   0
 {public => htdocs}/langs/lt_LT/paybox.lang          |   0
 {public => htdocs}/langs/lt_LT/paypal.lang          |   0
 {public => htdocs}/langs/lt_LT/printing.lang        |   0
 {public => htdocs}/langs/lt_LT/productbatch.lang    |   0
 {public => htdocs}/langs/lt_LT/products.lang        |   0
 {public => htdocs}/langs/lt_LT/projects.lang        |   0
 {public => htdocs}/langs/lt_LT/propal.lang          |   0
 {public => htdocs}/langs/lt_LT/receiptprinter.lang  |   0
 {public => htdocs}/langs/lt_LT/resource.lang        |   0
 {public => htdocs}/langs/lt_LT/salaries.lang        |   0
 {public => htdocs}/langs/lt_LT/sendings.lang        |   0
 {public => htdocs}/langs/lt_LT/sms.lang             |   0
 {public => htdocs}/langs/lt_LT/stocks.lang          |   0
 .../langs/lt_LT/supplier_proposal.lang              |   0
 {public => htdocs}/langs/lt_LT/suppliers.lang       |   0
 {public => htdocs}/langs/lt_LT/trips.lang           |   0
 {public => htdocs}/langs/lt_LT/users.lang           |   0
 {public => htdocs}/langs/lt_LT/website.lang         |   0
 {public => htdocs}/langs/lt_LT/withdrawals.lang     |   0
 {public => htdocs}/langs/lt_LT/workflow.lang        |   0
 {public => htdocs}/langs/lv_LV/accountancy.lang     |   0
 {public => htdocs}/langs/lv_LV/admin.lang           |   0
 {public => htdocs}/langs/lv_LV/agenda.lang          |   0
 {public => htdocs}/langs/lv_LV/banks.lang           |   0
 {public => htdocs}/langs/lv_LV/bills.lang           |   0
 {public => htdocs}/langs/lv_LV/bookmarks.lang       |   0
 {public => htdocs}/langs/lv_LV/boxes.lang           |   0
 {public => htdocs}/langs/lv_LV/cashdesk.lang        |   0
 {public => htdocs}/langs/lv_LV/categories.lang      |   0
 {public => htdocs}/langs/lv_LV/commercial.lang      |   0
 {public => htdocs}/langs/lv_LV/companies.lang       |   0
 {public => htdocs}/langs/lv_LV/compta.lang          |   0
 {public => htdocs}/langs/lv_LV/contracts.lang       |   0
 {public => htdocs}/langs/lv_LV/cron.lang            |   0
 {public => htdocs}/langs/lv_LV/deliveries.lang      |   0
 {public => htdocs}/langs/lv_LV/dict.lang            |   0
 {public => htdocs}/langs/lv_LV/donations.lang       |   0
 {public => htdocs}/langs/lv_LV/ecm.lang             |   0
 {public => htdocs}/langs/lv_LV/errors.lang          |   0
 {public => htdocs}/langs/lv_LV/exports.lang         |   0
 {public => htdocs}/langs/lv_LV/externalsite.lang    |   0
 {public => htdocs}/langs/lv_LV/ftp.lang             |   0
 {public => htdocs}/langs/lv_LV/help.lang            |   0
 {public => htdocs}/langs/lv_LV/holiday.lang         |   0
 {public => htdocs}/langs/lv_LV/hrm.lang             |   0
 {public => htdocs}/langs/lv_LV/incoterm.lang        |   0
 {public => htdocs}/langs/lv_LV/install.lang         |   0
 {public => htdocs}/langs/lv_LV/interventions.lang   |   0
 {public => htdocs}/langs/lv_LV/languages.lang       |   0
 {public => htdocs}/langs/lv_LV/ldap.lang            |   0
 {public => htdocs}/langs/lv_LV/link.lang            |   0
 {public => htdocs}/langs/lv_LV/loan.lang            |   0
 {public => htdocs}/langs/lv_LV/mailmanspip.lang     |   0
 {public => htdocs}/langs/lv_LV/mails.lang           |   0
 {public => htdocs}/langs/lv_LV/main.lang            |   0
 {public => htdocs}/langs/lv_LV/margins.lang         |   0
 {public => htdocs}/langs/lv_LV/members.lang         |   0
 {public => htdocs}/langs/lv_LV/oauth.lang           |   0
 {public => htdocs}/langs/lv_LV/opensurvey.lang      |   0
 {public => htdocs}/langs/lv_LV/orders.lang          |   0
 {public => htdocs}/langs/lv_LV/other.lang           |   0
 {public => htdocs}/langs/lv_LV/paybox.lang          |   0
 {public => htdocs}/langs/lv_LV/paypal.lang          |   0
 {public => htdocs}/langs/lv_LV/printing.lang        |   0
 {public => htdocs}/langs/lv_LV/productbatch.lang    |   0
 {public => htdocs}/langs/lv_LV/products.lang        |   0
 {public => htdocs}/langs/lv_LV/projects.lang        |   0
 {public => htdocs}/langs/lv_LV/propal.lang          |   0
 {public => htdocs}/langs/lv_LV/receiptprinter.lang  |   0
 {public => htdocs}/langs/lv_LV/resource.lang        |   0
 {public => htdocs}/langs/lv_LV/salaries.lang        |   0
 {public => htdocs}/langs/lv_LV/sendings.lang        |   0
 {public => htdocs}/langs/lv_LV/sms.lang             |   0
 {public => htdocs}/langs/lv_LV/stocks.lang          |   0
 .../langs/lv_LV/supplier_proposal.lang              |   0
 {public => htdocs}/langs/lv_LV/suppliers.lang       |   0
 {public => htdocs}/langs/lv_LV/trips.lang           |   0
 {public => htdocs}/langs/lv_LV/users.lang           |   0
 {public => htdocs}/langs/lv_LV/website.lang         |   0
 {public => htdocs}/langs/lv_LV/withdrawals.lang     |   0
 {public => htdocs}/langs/lv_LV/workflow.lang        |   0
 {public => htdocs}/langs/mk_MK/accountancy.lang     |   0
 {public => htdocs}/langs/mk_MK/admin.lang           |   0
 {public => htdocs}/langs/mk_MK/agenda.lang          |   0
 {public => htdocs}/langs/mk_MK/banks.lang           |   0
 {public => htdocs}/langs/mk_MK/bills.lang           |   0
 {public => htdocs}/langs/mk_MK/bookmarks.lang       |   0
 {public => htdocs}/langs/mk_MK/boxes.lang           |   0
 {public => htdocs}/langs/mk_MK/cashdesk.lang        |   0
 {public => htdocs}/langs/mk_MK/categories.lang      |   0
 {public => htdocs}/langs/mk_MK/commercial.lang      |   0
 {public => htdocs}/langs/mk_MK/companies.lang       |   0
 {public => htdocs}/langs/mk_MK/compta.lang          |   0
 {public => htdocs}/langs/mk_MK/contracts.lang       |   0
 {public => htdocs}/langs/mk_MK/cron.lang            |   0
 {public => htdocs}/langs/mk_MK/deliveries.lang      |   0
 {public => htdocs}/langs/mk_MK/dict.lang            |   0
 {public => htdocs}/langs/mk_MK/donations.lang       |   0
 {public => htdocs}/langs/mk_MK/ecm.lang             |   0
 {public => htdocs}/langs/mk_MK/errors.lang          |   0
 {public => htdocs}/langs/mk_MK/exports.lang         |   0
 {public => htdocs}/langs/mk_MK/externalsite.lang    |   0
 {public => htdocs}/langs/mk_MK/ftp.lang             |   0
 {public => htdocs}/langs/mk_MK/help.lang            |   0
 {public => htdocs}/langs/mk_MK/holiday.lang         |   0
 {public => htdocs}/langs/mk_MK/hrm.lang             |   0
 {public => htdocs}/langs/mk_MK/incoterm.lang        |   0
 {public => htdocs}/langs/mk_MK/install.lang         |   0
 {public => htdocs}/langs/mk_MK/interventions.lang   |   0
 {public => htdocs}/langs/mk_MK/languages.lang       |   0
 {public => htdocs}/langs/mk_MK/ldap.lang            |   0
 {public => htdocs}/langs/mk_MK/link.lang            |   0
 {public => htdocs}/langs/mk_MK/loan.lang            |   0
 {public => htdocs}/langs/mk_MK/mailmanspip.lang     |   0
 {public => htdocs}/langs/mk_MK/mails.lang           |   0
 {public => htdocs}/langs/mk_MK/main.lang            |   0
 {public => htdocs}/langs/mk_MK/margins.lang         |   0
 {public => htdocs}/langs/mk_MK/members.lang         |   0
 {public => htdocs}/langs/mk_MK/oauth.lang           |   0
 {public => htdocs}/langs/mk_MK/opensurvey.lang      |   0
 {public => htdocs}/langs/mk_MK/orders.lang          |   0
 {public => htdocs}/langs/mk_MK/other.lang           |   0
 {public => htdocs}/langs/mk_MK/paybox.lang          |   0
 {public => htdocs}/langs/mk_MK/paypal.lang          |   0
 {public => htdocs}/langs/mk_MK/printing.lang        |   0
 {public => htdocs}/langs/mk_MK/productbatch.lang    |   0
 {public => htdocs}/langs/mk_MK/products.lang        |   0
 {public => htdocs}/langs/mk_MK/projects.lang        |   0
 {public => htdocs}/langs/mk_MK/propal.lang          |   0
 {public => htdocs}/langs/mk_MK/receiptprinter.lang  |   0
 {public => htdocs}/langs/mk_MK/resource.lang        |   0
 {public => htdocs}/langs/mk_MK/salaries.lang        |   0
 {public => htdocs}/langs/mk_MK/sendings.lang        |   0
 {public => htdocs}/langs/mk_MK/sms.lang             |   0
 {public => htdocs}/langs/mk_MK/stocks.lang          |   0
 .../langs/mk_MK/supplier_proposal.lang              |   0
 {public => htdocs}/langs/mk_MK/suppliers.lang       |   0
 {public => htdocs}/langs/mk_MK/trips.lang           |   0
 {public => htdocs}/langs/mk_MK/users.lang           |   0
 {public => htdocs}/langs/mk_MK/website.lang         |   0
 {public => htdocs}/langs/mk_MK/withdrawals.lang     |   0
 {public => htdocs}/langs/mk_MK/workflow.lang        |   0
 {public => htdocs}/langs/mn_MN/accountancy.lang     |   0
 {public => htdocs}/langs/mn_MN/admin.lang           |   0
 {public => htdocs}/langs/mn_MN/agenda.lang          |   0
 {public => htdocs}/langs/mn_MN/banks.lang           |   0
 {public => htdocs}/langs/mn_MN/bills.lang           |   0
 {public => htdocs}/langs/mn_MN/bookmarks.lang       |   0
 {public => htdocs}/langs/mn_MN/boxes.lang           |   0
 {public => htdocs}/langs/mn_MN/cashdesk.lang        |   0
 {public => htdocs}/langs/mn_MN/categories.lang      |   0
 {public => htdocs}/langs/mn_MN/commercial.lang      |   0
 {public => htdocs}/langs/mn_MN/companies.lang       |   0
 {public => htdocs}/langs/mn_MN/compta.lang          |   0
 {public => htdocs}/langs/mn_MN/contracts.lang       |   0
 {public => htdocs}/langs/mn_MN/cron.lang            |   0
 {public => htdocs}/langs/mn_MN/deliveries.lang      |   0
 {public => htdocs}/langs/mn_MN/dict.lang            |   0
 {public => htdocs}/langs/mn_MN/donations.lang       |   0
 {public => htdocs}/langs/mn_MN/ecm.lang             |   0
 {public => htdocs}/langs/mn_MN/errors.lang          |   0
 {public => htdocs}/langs/mn_MN/exports.lang         |   0
 {public => htdocs}/langs/mn_MN/externalsite.lang    |   0
 {public => htdocs}/langs/mn_MN/ftp.lang             |   0
 {public => htdocs}/langs/mn_MN/help.lang            |   0
 {public => htdocs}/langs/mn_MN/holiday.lang         |   0
 {public => htdocs}/langs/mn_MN/hrm.lang             |   0
 {public => htdocs}/langs/mn_MN/incoterm.lang        |   0
 {public => htdocs}/langs/mn_MN/install.lang         |   0
 {public => htdocs}/langs/mn_MN/interventions.lang   |   0
 {public => htdocs}/langs/mn_MN/languages.lang       |   0
 {public => htdocs}/langs/mn_MN/ldap.lang            |   0
 {public => htdocs}/langs/mn_MN/link.lang            |   0
 {public => htdocs}/langs/mn_MN/loan.lang            |   0
 {public => htdocs}/langs/mn_MN/mailmanspip.lang     |   0
 {public => htdocs}/langs/mn_MN/mails.lang           |   0
 {public => htdocs}/langs/mn_MN/main.lang            |   0
 {public => htdocs}/langs/mn_MN/margins.lang         |   0
 {public => htdocs}/langs/mn_MN/members.lang         |   0
 {public => htdocs}/langs/mn_MN/oauth.lang           |   0
 {public => htdocs}/langs/mn_MN/opensurvey.lang      |   0
 {public => htdocs}/langs/mn_MN/orders.lang          |   0
 {public => htdocs}/langs/mn_MN/other.lang           |   0
 {public => htdocs}/langs/mn_MN/paybox.lang          |   0
 {public => htdocs}/langs/mn_MN/paypal.lang          |   0
 {public => htdocs}/langs/mn_MN/printing.lang        |   0
 {public => htdocs}/langs/mn_MN/productbatch.lang    |   0
 {public => htdocs}/langs/mn_MN/products.lang        |   0
 {public => htdocs}/langs/mn_MN/projects.lang        |   0
 {public => htdocs}/langs/mn_MN/propal.lang          |   0
 {public => htdocs}/langs/mn_MN/receiptprinter.lang  |   0
 {public => htdocs}/langs/mn_MN/resource.lang        |   0
 {public => htdocs}/langs/mn_MN/salaries.lang        |   0
 {public => htdocs}/langs/mn_MN/sendings.lang        |   0
 {public => htdocs}/langs/mn_MN/sms.lang             |   0
 {public => htdocs}/langs/mn_MN/stocks.lang          |   0
 .../langs/mn_MN/supplier_proposal.lang              |   0
 {public => htdocs}/langs/mn_MN/suppliers.lang       |   0
 {public => htdocs}/langs/mn_MN/trips.lang           |   0
 {public => htdocs}/langs/mn_MN/users.lang           |   0
 {public => htdocs}/langs/mn_MN/website.lang         |   0
 {public => htdocs}/langs/mn_MN/withdrawals.lang     |   0
 {public => htdocs}/langs/mn_MN/workflow.lang        |   0
 {public => htdocs}/langs/nb_NO/accountancy.lang     |   0
 {public => htdocs}/langs/nb_NO/admin.lang           |   0
 {public => htdocs}/langs/nb_NO/agenda.lang          |   0
 {public => htdocs}/langs/nb_NO/banks.lang           |   0
 {public => htdocs}/langs/nb_NO/bills.lang           |   0
 {public => htdocs}/langs/nb_NO/bookmarks.lang       |   0
 {public => htdocs}/langs/nb_NO/boxes.lang           |   0
 {public => htdocs}/langs/nb_NO/cashdesk.lang        |   0
 {public => htdocs}/langs/nb_NO/categories.lang      |   0
 {public => htdocs}/langs/nb_NO/commercial.lang      |   0
 {public => htdocs}/langs/nb_NO/companies.lang       |   0
 {public => htdocs}/langs/nb_NO/compta.lang          |   0
 {public => htdocs}/langs/nb_NO/contracts.lang       |   0
 {public => htdocs}/langs/nb_NO/cron.lang            |   0
 {public => htdocs}/langs/nb_NO/deliveries.lang      |   0
 {public => htdocs}/langs/nb_NO/dict.lang            |   0
 {public => htdocs}/langs/nb_NO/donations.lang       |   0
 {public => htdocs}/langs/nb_NO/ecm.lang             |   0
 {public => htdocs}/langs/nb_NO/errors.lang          |   0
 {public => htdocs}/langs/nb_NO/exports.lang         |   0
 {public => htdocs}/langs/nb_NO/externalsite.lang    |   0
 {public => htdocs}/langs/nb_NO/ftp.lang             |   0
 {public => htdocs}/langs/nb_NO/help.lang            |   0
 {public => htdocs}/langs/nb_NO/holiday.lang         |   0
 {public => htdocs}/langs/nb_NO/hrm.lang             |   0
 {public => htdocs}/langs/nb_NO/incoterm.lang        |   0
 {public => htdocs}/langs/nb_NO/install.lang         |   0
 {public => htdocs}/langs/nb_NO/interventions.lang   |   0
 {public => htdocs}/langs/nb_NO/languages.lang       |   0
 {public => htdocs}/langs/nb_NO/ldap.lang            |   0
 {public => htdocs}/langs/nb_NO/link.lang            |   0
 {public => htdocs}/langs/nb_NO/loan.lang            |   0
 {public => htdocs}/langs/nb_NO/mailmanspip.lang     |   0
 {public => htdocs}/langs/nb_NO/mails.lang           |   0
 {public => htdocs}/langs/nb_NO/main.lang            |   0
 {public => htdocs}/langs/nb_NO/margins.lang         |   0
 {public => htdocs}/langs/nb_NO/members.lang         |   0
 {public => htdocs}/langs/nb_NO/oauth.lang           |   0
 {public => htdocs}/langs/nb_NO/opensurvey.lang      |   0
 {public => htdocs}/langs/nb_NO/orders.lang          |   0
 {public => htdocs}/langs/nb_NO/other.lang           |   0
 {public => htdocs}/langs/nb_NO/paybox.lang          |   0
 {public => htdocs}/langs/nb_NO/paypal.lang          |   0
 {public => htdocs}/langs/nb_NO/printing.lang        |   0
 {public => htdocs}/langs/nb_NO/productbatch.lang    |   0
 {public => htdocs}/langs/nb_NO/products.lang        |   0
 {public => htdocs}/langs/nb_NO/projects.lang        |   0
 {public => htdocs}/langs/nb_NO/propal.lang          |   0
 {public => htdocs}/langs/nb_NO/receiptprinter.lang  |   0
 {public => htdocs}/langs/nb_NO/resource.lang        |   0
 {public => htdocs}/langs/nb_NO/salaries.lang        |   0
 {public => htdocs}/langs/nb_NO/sendings.lang        |   0
 {public => htdocs}/langs/nb_NO/sms.lang             |   0
 {public => htdocs}/langs/nb_NO/stocks.lang          |   0
 .../langs/nb_NO/supplier_proposal.lang              |   0
 {public => htdocs}/langs/nb_NO/suppliers.lang       |   0
 {public => htdocs}/langs/nb_NO/trips.lang           |   0
 {public => htdocs}/langs/nb_NO/users.lang           |   0
 {public => htdocs}/langs/nb_NO/website.lang         |   0
 {public => htdocs}/langs/nb_NO/withdrawals.lang     |   0
 {public => htdocs}/langs/nb_NO/workflow.lang        |   0
 {public => htdocs}/langs/nl_BE/accountancy.lang     |   0
 {public => htdocs}/langs/nl_BE/admin.lang           |   0
 {public => htdocs}/langs/nl_BE/agenda.lang          |   0
 {public => htdocs}/langs/nl_BE/banks.lang           |   0
 {public => htdocs}/langs/nl_BE/bills.lang           |   0
 {public => htdocs}/langs/nl_BE/bookmarks.lang       |   0
 {public => htdocs}/langs/nl_BE/boxes.lang           |   0
 {public => htdocs}/langs/nl_BE/cashdesk.lang        |   0
 {public => htdocs}/langs/nl_BE/categories.lang      |   0
 {public => htdocs}/langs/nl_BE/commercial.lang      |   0
 {public => htdocs}/langs/nl_BE/companies.lang       |   0
 {public => htdocs}/langs/nl_BE/compta.lang          |   0
 {public => htdocs}/langs/nl_BE/contracts.lang       |   0
 {public => htdocs}/langs/nl_BE/cron.lang            |   0
 {public => htdocs}/langs/nl_BE/deliveries.lang      |   0
 {public => htdocs}/langs/nl_BE/dict.lang            |   0
 {public => htdocs}/langs/nl_BE/donations.lang       |   0
 {public => htdocs}/langs/nl_BE/ecm.lang             |   0
 {public => htdocs}/langs/nl_BE/errors.lang          |   0
 {public => htdocs}/langs/nl_BE/exports.lang         |   0
 {public => htdocs}/langs/nl_BE/externalsite.lang    |   0
 {public => htdocs}/langs/nl_BE/ftp.lang             |   0
 {public => htdocs}/langs/nl_BE/help.lang            |   0
 {public => htdocs}/langs/nl_BE/holiday.lang         |   0
 {public => htdocs}/langs/nl_BE/hrm.lang             |   0
 {public => htdocs}/langs/nl_BE/incoterm.lang        |   0
 {public => htdocs}/langs/nl_BE/install.lang         |   0
 {public => htdocs}/langs/nl_BE/interventions.lang   |   0
 {public => htdocs}/langs/nl_BE/languages.lang       |   0
 {public => htdocs}/langs/nl_BE/ldap.lang            |   0
 {public => htdocs}/langs/nl_BE/link.lang            |   0
 {public => htdocs}/langs/nl_BE/loan.lang            |   0
 {public => htdocs}/langs/nl_BE/mailmanspip.lang     |   0
 {public => htdocs}/langs/nl_BE/mails.lang           |   0
 {public => htdocs}/langs/nl_BE/main.lang            |   0
 {public => htdocs}/langs/nl_BE/margins.lang         |   0
 {public => htdocs}/langs/nl_BE/members.lang         |   0
 {public => htdocs}/langs/nl_BE/oauth.lang           |   0
 {public => htdocs}/langs/nl_BE/opensurvey.lang      |   0
 {public => htdocs}/langs/nl_BE/orders.lang          |   0
 {public => htdocs}/langs/nl_BE/other.lang           |   0
 {public => htdocs}/langs/nl_BE/paybox.lang          |   0
 {public => htdocs}/langs/nl_BE/paypal.lang          |   0
 {public => htdocs}/langs/nl_BE/printing.lang        |   0
 {public => htdocs}/langs/nl_BE/productbatch.lang    |   0
 {public => htdocs}/langs/nl_BE/products.lang        |   0
 {public => htdocs}/langs/nl_BE/projects.lang        |   0
 {public => htdocs}/langs/nl_BE/propal.lang          |   0
 {public => htdocs}/langs/nl_BE/receiptprinter.lang  |   0
 {public => htdocs}/langs/nl_BE/resource.lang        |   0
 {public => htdocs}/langs/nl_BE/salaries.lang        |   0
 {public => htdocs}/langs/nl_BE/sendings.lang        |   0
 {public => htdocs}/langs/nl_BE/sms.lang             |   0
 {public => htdocs}/langs/nl_BE/stocks.lang          |   0
 .../langs/nl_BE/supplier_proposal.lang              |   0
 {public => htdocs}/langs/nl_BE/suppliers.lang       |   0
 {public => htdocs}/langs/nl_BE/trips.lang           |   0
 {public => htdocs}/langs/nl_BE/users.lang           |   0
 {public => htdocs}/langs/nl_BE/website.lang         |   0
 {public => htdocs}/langs/nl_BE/withdrawals.lang     |   0
 {public => htdocs}/langs/nl_BE/workflow.lang        |   0
 {public => htdocs}/langs/nl_NL/accountancy.lang     |   0
 {public => htdocs}/langs/nl_NL/admin.lang           |   0
 {public => htdocs}/langs/nl_NL/agenda.lang          |   0
 {public => htdocs}/langs/nl_NL/banks.lang           |   0
 {public => htdocs}/langs/nl_NL/bills.lang           |   0
 {public => htdocs}/langs/nl_NL/bookmarks.lang       |   0
 {public => htdocs}/langs/nl_NL/boxes.lang           |   0
 {public => htdocs}/langs/nl_NL/cashdesk.lang        |   0
 {public => htdocs}/langs/nl_NL/categories.lang      |   0
 {public => htdocs}/langs/nl_NL/commercial.lang      |   0
 {public => htdocs}/langs/nl_NL/companies.lang       |   0
 {public => htdocs}/langs/nl_NL/compta.lang          |   0
 {public => htdocs}/langs/nl_NL/contracts.lang       |   0
 {public => htdocs}/langs/nl_NL/cron.lang            |   0
 {public => htdocs}/langs/nl_NL/deliveries.lang      |   0
 {public => htdocs}/langs/nl_NL/dict.lang            |   0
 {public => htdocs}/langs/nl_NL/donations.lang       |   0
 {public => htdocs}/langs/nl_NL/ecm.lang             |   0
 {public => htdocs}/langs/nl_NL/errors.lang          |   0
 {public => htdocs}/langs/nl_NL/exports.lang         |   0
 {public => htdocs}/langs/nl_NL/externalsite.lang    |   0
 {public => htdocs}/langs/nl_NL/ftp.lang             |   0
 {public => htdocs}/langs/nl_NL/help.lang            |   0
 {public => htdocs}/langs/nl_NL/holiday.lang         |   0
 {public => htdocs}/langs/nl_NL/hrm.lang             |   0
 {public => htdocs}/langs/nl_NL/incoterm.lang        |   0
 {public => htdocs}/langs/nl_NL/install.lang         |   0
 {public => htdocs}/langs/nl_NL/interventions.lang   |   0
 {public => htdocs}/langs/nl_NL/languages.lang       |   0
 {public => htdocs}/langs/nl_NL/ldap.lang            |   0
 {public => htdocs}/langs/nl_NL/link.lang            |   0
 {public => htdocs}/langs/nl_NL/loan.lang            |   0
 {public => htdocs}/langs/nl_NL/mailmanspip.lang     |   0
 {public => htdocs}/langs/nl_NL/mails.lang           |   0
 {public => htdocs}/langs/nl_NL/main.lang            |   0
 {public => htdocs}/langs/nl_NL/margins.lang         |   0
 {public => htdocs}/langs/nl_NL/members.lang         |   0
 {public => htdocs}/langs/nl_NL/oauth.lang           |   0
 {public => htdocs}/langs/nl_NL/opensurvey.lang      |   0
 {public => htdocs}/langs/nl_NL/orders.lang          |   0
 {public => htdocs}/langs/nl_NL/other.lang           |   0
 {public => htdocs}/langs/nl_NL/paybox.lang          |   0
 {public => htdocs}/langs/nl_NL/paypal.lang          |   0
 {public => htdocs}/langs/nl_NL/printing.lang        |   0
 {public => htdocs}/langs/nl_NL/productbatch.lang    |   0
 {public => htdocs}/langs/nl_NL/products.lang        |   0
 {public => htdocs}/langs/nl_NL/projects.lang        |   0
 {public => htdocs}/langs/nl_NL/propal.lang          |   0
 {public => htdocs}/langs/nl_NL/receiptprinter.lang  |   0
 {public => htdocs}/langs/nl_NL/resource.lang        |   0
 {public => htdocs}/langs/nl_NL/salaries.lang        |   0
 {public => htdocs}/langs/nl_NL/sendings.lang        |   0
 {public => htdocs}/langs/nl_NL/sms.lang             |   0
 {public => htdocs}/langs/nl_NL/stocks.lang          |   0
 .../langs/nl_NL/supplier_proposal.lang              |   0
 {public => htdocs}/langs/nl_NL/suppliers.lang       |   0
 {public => htdocs}/langs/nl_NL/trips.lang           |   0
 {public => htdocs}/langs/nl_NL/users.lang           |   0
 {public => htdocs}/langs/nl_NL/website.lang         |   0
 {public => htdocs}/langs/nl_NL/withdrawals.lang     |   0
 {public => htdocs}/langs/nl_NL/workflow.lang        |   0
 {public => htdocs}/langs/pl_PL/accountancy.lang     |   0
 {public => htdocs}/langs/pl_PL/admin.lang           |   0
 {public => htdocs}/langs/pl_PL/agenda.lang          |   0
 {public => htdocs}/langs/pl_PL/banks.lang           |   0
 {public => htdocs}/langs/pl_PL/bills.lang           |   0
 {public => htdocs}/langs/pl_PL/bookmarks.lang       |   0
 {public => htdocs}/langs/pl_PL/boxes.lang           |   0
 {public => htdocs}/langs/pl_PL/cashdesk.lang        |   0
 {public => htdocs}/langs/pl_PL/categories.lang      |   0
 {public => htdocs}/langs/pl_PL/commercial.lang      |   0
 {public => htdocs}/langs/pl_PL/companies.lang       |   0
 {public => htdocs}/langs/pl_PL/compta.lang          |   0
 {public => htdocs}/langs/pl_PL/contracts.lang       |   0
 {public => htdocs}/langs/pl_PL/cron.lang            |   0
 {public => htdocs}/langs/pl_PL/deliveries.lang      |   0
 {public => htdocs}/langs/pl_PL/dict.lang            |   0
 {public => htdocs}/langs/pl_PL/donations.lang       |   0
 {public => htdocs}/langs/pl_PL/ecm.lang             |   0
 {public => htdocs}/langs/pl_PL/errors.lang          |   0
 {public => htdocs}/langs/pl_PL/exports.lang         |   0
 {public => htdocs}/langs/pl_PL/externalsite.lang    |   0
 {public => htdocs}/langs/pl_PL/ftp.lang             |   0
 {public => htdocs}/langs/pl_PL/help.lang            |   0
 {public => htdocs}/langs/pl_PL/holiday.lang         |   0
 {public => htdocs}/langs/pl_PL/hrm.lang             |   0
 {public => htdocs}/langs/pl_PL/incoterm.lang        |   0
 {public => htdocs}/langs/pl_PL/install.lang         |   0
 {public => htdocs}/langs/pl_PL/interventions.lang   |   0
 {public => htdocs}/langs/pl_PL/languages.lang       |   0
 {public => htdocs}/langs/pl_PL/ldap.lang            |   0
 {public => htdocs}/langs/pl_PL/link.lang            |   0
 {public => htdocs}/langs/pl_PL/loan.lang            |   0
 {public => htdocs}/langs/pl_PL/mailmanspip.lang     |   0
 {public => htdocs}/langs/pl_PL/mails.lang           |   0
 {public => htdocs}/langs/pl_PL/main.lang            |   0
 {public => htdocs}/langs/pl_PL/margins.lang         |   0
 {public => htdocs}/langs/pl_PL/members.lang         |   0
 {public => htdocs}/langs/pl_PL/oauth.lang           |   0
 {public => htdocs}/langs/pl_PL/opensurvey.lang      |   0
 {public => htdocs}/langs/pl_PL/orders.lang          |   0
 {public => htdocs}/langs/pl_PL/other.lang           |   0
 {public => htdocs}/langs/pl_PL/paybox.lang          |   0
 {public => htdocs}/langs/pl_PL/paypal.lang          |   0
 {public => htdocs}/langs/pl_PL/printing.lang        |   0
 {public => htdocs}/langs/pl_PL/productbatch.lang    |   0
 {public => htdocs}/langs/pl_PL/products.lang        |   0
 {public => htdocs}/langs/pl_PL/projects.lang        |   0
 {public => htdocs}/langs/pl_PL/propal.lang          |   0
 {public => htdocs}/langs/pl_PL/receiptprinter.lang  |   0
 {public => htdocs}/langs/pl_PL/resource.lang        |   0
 {public => htdocs}/langs/pl_PL/salaries.lang        |   0
 {public => htdocs}/langs/pl_PL/sendings.lang        |   0
 {public => htdocs}/langs/pl_PL/sms.lang             |   0
 {public => htdocs}/langs/pl_PL/stocks.lang          |   0
 .../langs/pl_PL/supplier_proposal.lang              |   0
 {public => htdocs}/langs/pl_PL/suppliers.lang       |   0
 {public => htdocs}/langs/pl_PL/trips.lang           |   0
 {public => htdocs}/langs/pl_PL/users.lang           |   0
 {public => htdocs}/langs/pl_PL/website.lang         |   0
 {public => htdocs}/langs/pl_PL/withdrawals.lang     |   0
 {public => htdocs}/langs/pl_PL/workflow.lang        |   0
 {public => htdocs}/langs/pt_BR/accountancy.lang     |   0
 {public => htdocs}/langs/pt_BR/admin.lang           |   0
 {public => htdocs}/langs/pt_BR/agenda.lang          |   0
 {public => htdocs}/langs/pt_BR/banks.lang           |   0
 {public => htdocs}/langs/pt_BR/bills.lang           |   0
 {public => htdocs}/langs/pt_BR/bookmarks.lang       |   0
 {public => htdocs}/langs/pt_BR/boxes.lang           |   0
 {public => htdocs}/langs/pt_BR/cashdesk.lang        |   0
 {public => htdocs}/langs/pt_BR/categories.lang      |   0
 {public => htdocs}/langs/pt_BR/commercial.lang      |   0
 {public => htdocs}/langs/pt_BR/companies.lang       |   0
 {public => htdocs}/langs/pt_BR/compta.lang          |   0
 {public => htdocs}/langs/pt_BR/contracts.lang       |   0
 {public => htdocs}/langs/pt_BR/cron.lang            |   0
 {public => htdocs}/langs/pt_BR/deliveries.lang      |   0
 {public => htdocs}/langs/pt_BR/dict.lang            |   0
 {public => htdocs}/langs/pt_BR/donations.lang       |   0
 {public => htdocs}/langs/pt_BR/ecm.lang             |   0
 {public => htdocs}/langs/pt_BR/errors.lang          |   0
 {public => htdocs}/langs/pt_BR/exports.lang         |   0
 {public => htdocs}/langs/pt_BR/externalsite.lang    |   0
 {public => htdocs}/langs/pt_BR/ftp.lang             |   0
 {public => htdocs}/langs/pt_BR/help.lang            |   0
 {public => htdocs}/langs/pt_BR/holiday.lang         |   0
 {public => htdocs}/langs/pt_BR/hrm.lang             |   0
 {public => htdocs}/langs/pt_BR/incoterm.lang        |   0
 {public => htdocs}/langs/pt_BR/install.lang         |   0
 {public => htdocs}/langs/pt_BR/interventions.lang   |   0
 {public => htdocs}/langs/pt_BR/languages.lang       |   0
 {public => htdocs}/langs/pt_BR/ldap.lang            |   0
 {public => htdocs}/langs/pt_BR/link.lang            |   0
 {public => htdocs}/langs/pt_BR/loan.lang            |   0
 {public => htdocs}/langs/pt_BR/mailmanspip.lang     |   0
 {public => htdocs}/langs/pt_BR/mails.lang           |   0
 {public => htdocs}/langs/pt_BR/main.lang            |   0
 {public => htdocs}/langs/pt_BR/margins.lang         |   0
 {public => htdocs}/langs/pt_BR/members.lang         |   0
 {public => htdocs}/langs/pt_BR/oauth.lang           |   0
 {public => htdocs}/langs/pt_BR/opensurvey.lang      |   0
 {public => htdocs}/langs/pt_BR/orders.lang          |   0
 {public => htdocs}/langs/pt_BR/other.lang           |   0
 {public => htdocs}/langs/pt_BR/paybox.lang          |   0
 {public => htdocs}/langs/pt_BR/paypal.lang          |   0
 {public => htdocs}/langs/pt_BR/printing.lang        |   0
 {public => htdocs}/langs/pt_BR/productbatch.lang    |   0
 {public => htdocs}/langs/pt_BR/products.lang        |   0
 {public => htdocs}/langs/pt_BR/projects.lang        |   0
 {public => htdocs}/langs/pt_BR/propal.lang          |   0
 {public => htdocs}/langs/pt_BR/receiptprinter.lang  |   0
 {public => htdocs}/langs/pt_BR/resource.lang        |   0
 {public => htdocs}/langs/pt_BR/salaries.lang        |   0
 {public => htdocs}/langs/pt_BR/sendings.lang        |   0
 {public => htdocs}/langs/pt_BR/sms.lang             |   0
 {public => htdocs}/langs/pt_BR/stocks.lang          |   0
 .../langs/pt_BR/supplier_proposal.lang              |   0
 {public => htdocs}/langs/pt_BR/suppliers.lang       |   0
 {public => htdocs}/langs/pt_BR/trips.lang           |   0
 {public => htdocs}/langs/pt_BR/users.lang           |   0
 {public => htdocs}/langs/pt_BR/website.lang         |   0
 {public => htdocs}/langs/pt_BR/withdrawals.lang     |   0
 {public => htdocs}/langs/pt_BR/workflow.lang        |   0
 {public => htdocs}/langs/pt_PT/accountancy.lang     |   0
 {public => htdocs}/langs/pt_PT/admin.lang           |   0
 {public => htdocs}/langs/pt_PT/agenda.lang          |   0
 {public => htdocs}/langs/pt_PT/banks.lang           |   0
 {public => htdocs}/langs/pt_PT/bills.lang           |   0
 {public => htdocs}/langs/pt_PT/bookmarks.lang       |   0
 {public => htdocs}/langs/pt_PT/boxes.lang           |   0
 {public => htdocs}/langs/pt_PT/cashdesk.lang        |   0
 {public => htdocs}/langs/pt_PT/categories.lang      |   0
 {public => htdocs}/langs/pt_PT/commercial.lang      |   0
 {public => htdocs}/langs/pt_PT/companies.lang       |   0
 {public => htdocs}/langs/pt_PT/compta.lang          |   0
 {public => htdocs}/langs/pt_PT/contracts.lang       |   0
 {public => htdocs}/langs/pt_PT/cron.lang            |   0
 {public => htdocs}/langs/pt_PT/deliveries.lang      |   0
 {public => htdocs}/langs/pt_PT/dict.lang            |   0
 {public => htdocs}/langs/pt_PT/donations.lang       |   0
 {public => htdocs}/langs/pt_PT/ecm.lang             |   0
 {public => htdocs}/langs/pt_PT/errors.lang          |   0
 {public => htdocs}/langs/pt_PT/exports.lang         |   0
 {public => htdocs}/langs/pt_PT/externalsite.lang    |   0
 {public => htdocs}/langs/pt_PT/ftp.lang             |   0
 {public => htdocs}/langs/pt_PT/help.lang            |   0
 {public => htdocs}/langs/pt_PT/holiday.lang         |   0
 {public => htdocs}/langs/pt_PT/hrm.lang             |   0
 {public => htdocs}/langs/pt_PT/incoterm.lang        |   0
 {public => htdocs}/langs/pt_PT/install.lang         |   0
 {public => htdocs}/langs/pt_PT/interventions.lang   |   0
 {public => htdocs}/langs/pt_PT/languages.lang       |   0
 {public => htdocs}/langs/pt_PT/ldap.lang            |   0
 {public => htdocs}/langs/pt_PT/link.lang            |   0
 {public => htdocs}/langs/pt_PT/loan.lang            |   0
 {public => htdocs}/langs/pt_PT/mailmanspip.lang     |   0
 {public => htdocs}/langs/pt_PT/mails.lang           |   0
 {public => htdocs}/langs/pt_PT/main.lang            |   0
 {public => htdocs}/langs/pt_PT/margins.lang         |   0
 {public => htdocs}/langs/pt_PT/members.lang         |   0
 {public => htdocs}/langs/pt_PT/oauth.lang           |   0
 {public => htdocs}/langs/pt_PT/opensurvey.lang      |   0
 {public => htdocs}/langs/pt_PT/orders.lang          |   0
 {public => htdocs}/langs/pt_PT/other.lang           |   0
 {public => htdocs}/langs/pt_PT/paybox.lang          |   0
 {public => htdocs}/langs/pt_PT/paypal.lang          |   0
 {public => htdocs}/langs/pt_PT/printing.lang        |   0
 {public => htdocs}/langs/pt_PT/productbatch.lang    |   0
 {public => htdocs}/langs/pt_PT/products.lang        |   0
 {public => htdocs}/langs/pt_PT/projects.lang        |   0
 {public => htdocs}/langs/pt_PT/propal.lang          |   0
 {public => htdocs}/langs/pt_PT/receiptprinter.lang  |   0
 {public => htdocs}/langs/pt_PT/resource.lang        |   0
 {public => htdocs}/langs/pt_PT/salaries.lang        |   0
 {public => htdocs}/langs/pt_PT/sendings.lang        |   0
 {public => htdocs}/langs/pt_PT/sms.lang             |   0
 {public => htdocs}/langs/pt_PT/stocks.lang          |   0
 .../langs/pt_PT/supplier_proposal.lang              |   0
 {public => htdocs}/langs/pt_PT/suppliers.lang       |   0
 {public => htdocs}/langs/pt_PT/trips.lang           |   0
 {public => htdocs}/langs/pt_PT/users.lang           |   0
 {public => htdocs}/langs/pt_PT/website.lang         |   0
 {public => htdocs}/langs/pt_PT/withdrawals.lang     |   0
 {public => htdocs}/langs/pt_PT/workflow.lang        |   0
 {public => htdocs}/langs/ro_RO/accountancy.lang     |   0
 {public => htdocs}/langs/ro_RO/admin.lang           |   0
 {public => htdocs}/langs/ro_RO/agenda.lang          |   0
 {public => htdocs}/langs/ro_RO/banks.lang           |   0
 {public => htdocs}/langs/ro_RO/bills.lang           |   0
 {public => htdocs}/langs/ro_RO/bookmarks.lang       |   0
 {public => htdocs}/langs/ro_RO/boxes.lang           |   0
 {public => htdocs}/langs/ro_RO/cashdesk.lang        |   0
 {public => htdocs}/langs/ro_RO/categories.lang      |   0
 {public => htdocs}/langs/ro_RO/commercial.lang      |   0
 {public => htdocs}/langs/ro_RO/companies.lang       |   0
 {public => htdocs}/langs/ro_RO/compta.lang          |   0
 {public => htdocs}/langs/ro_RO/contracts.lang       |   0
 {public => htdocs}/langs/ro_RO/cron.lang            |   0
 {public => htdocs}/langs/ro_RO/deliveries.lang      |   0
 {public => htdocs}/langs/ro_RO/dict.lang            |   0
 {public => htdocs}/langs/ro_RO/donations.lang       |   0
 {public => htdocs}/langs/ro_RO/ecm.lang             |   0
 {public => htdocs}/langs/ro_RO/errors.lang          |   0
 {public => htdocs}/langs/ro_RO/exports.lang         |   0
 {public => htdocs}/langs/ro_RO/externalsite.lang    |   0
 {public => htdocs}/langs/ro_RO/ftp.lang             |   0
 {public => htdocs}/langs/ro_RO/help.lang            |   0
 {public => htdocs}/langs/ro_RO/holiday.lang         |   0
 {public => htdocs}/langs/ro_RO/hrm.lang             |   0
 {public => htdocs}/langs/ro_RO/incoterm.lang        |   0
 {public => htdocs}/langs/ro_RO/install.lang         |   0
 {public => htdocs}/langs/ro_RO/interventions.lang   |   0
 {public => htdocs}/langs/ro_RO/languages.lang       |   0
 {public => htdocs}/langs/ro_RO/ldap.lang            |   0
 {public => htdocs}/langs/ro_RO/link.lang            |   0
 {public => htdocs}/langs/ro_RO/loan.lang            |   0
 {public => htdocs}/langs/ro_RO/mailmanspip.lang     |   0
 {public => htdocs}/langs/ro_RO/mails.lang           |   0
 {public => htdocs}/langs/ro_RO/main.lang            |   0
 {public => htdocs}/langs/ro_RO/margins.lang         |   0
 {public => htdocs}/langs/ro_RO/members.lang         |   0
 {public => htdocs}/langs/ro_RO/oauth.lang           |   0
 {public => htdocs}/langs/ro_RO/opensurvey.lang      |   0
 {public => htdocs}/langs/ro_RO/orders.lang          |   0
 {public => htdocs}/langs/ro_RO/other.lang           |   0
 {public => htdocs}/langs/ro_RO/paybox.lang          |   0
 {public => htdocs}/langs/ro_RO/paypal.lang          |   0
 {public => htdocs}/langs/ro_RO/printing.lang        |   0
 {public => htdocs}/langs/ro_RO/productbatch.lang    |   0
 {public => htdocs}/langs/ro_RO/products.lang        |   0
 {public => htdocs}/langs/ro_RO/projects.lang        |   0
 {public => htdocs}/langs/ro_RO/propal.lang          |   0
 {public => htdocs}/langs/ro_RO/receiptprinter.lang  |   0
 {public => htdocs}/langs/ro_RO/resource.lang        |   0
 {public => htdocs}/langs/ro_RO/salaries.lang        |   0
 {public => htdocs}/langs/ro_RO/sendings.lang        |   0
 {public => htdocs}/langs/ro_RO/sms.lang             |   0
 {public => htdocs}/langs/ro_RO/stocks.lang          |   0
 .../langs/ro_RO/supplier_proposal.lang              |   0
 {public => htdocs}/langs/ro_RO/suppliers.lang       |   0
 {public => htdocs}/langs/ro_RO/trips.lang           |   0
 {public => htdocs}/langs/ro_RO/users.lang           |   0
 {public => htdocs}/langs/ro_RO/website.lang         |   0
 {public => htdocs}/langs/ro_RO/withdrawals.lang     |   0
 {public => htdocs}/langs/ro_RO/workflow.lang        |   0
 {public => htdocs}/langs/ru_RU/accountancy.lang     |   0
 {public => htdocs}/langs/ru_RU/admin.lang           |   0
 {public => htdocs}/langs/ru_RU/agenda.lang          |   0
 {public => htdocs}/langs/ru_RU/banks.lang           |   0
 {public => htdocs}/langs/ru_RU/bills.lang           |   0
 {public => htdocs}/langs/ru_RU/bookmarks.lang       |   0
 {public => htdocs}/langs/ru_RU/boxes.lang           |   0
 {public => htdocs}/langs/ru_RU/cashdesk.lang        |   0
 {public => htdocs}/langs/ru_RU/categories.lang      |   0
 {public => htdocs}/langs/ru_RU/commercial.lang      |   0
 {public => htdocs}/langs/ru_RU/companies.lang       |   0
 {public => htdocs}/langs/ru_RU/compta.lang          |   0
 {public => htdocs}/langs/ru_RU/contracts.lang       |   0
 {public => htdocs}/langs/ru_RU/cron.lang            |   0
 {public => htdocs}/langs/ru_RU/deliveries.lang      |   0
 {public => htdocs}/langs/ru_RU/dict.lang            |   0
 {public => htdocs}/langs/ru_RU/donations.lang       |   0
 {public => htdocs}/langs/ru_RU/ecm.lang             |   0
 {public => htdocs}/langs/ru_RU/errors.lang          |   0
 {public => htdocs}/langs/ru_RU/exports.lang         |   0
 {public => htdocs}/langs/ru_RU/externalsite.lang    |   0
 {public => htdocs}/langs/ru_RU/ftp.lang             |   0
 {public => htdocs}/langs/ru_RU/help.lang            |   0
 {public => htdocs}/langs/ru_RU/holiday.lang         |   0
 {public => htdocs}/langs/ru_RU/hrm.lang             |   0
 {public => htdocs}/langs/ru_RU/incoterm.lang        |   0
 {public => htdocs}/langs/ru_RU/install.lang         |   0
 {public => htdocs}/langs/ru_RU/interventions.lang   |   0
 {public => htdocs}/langs/ru_RU/languages.lang       |   0
 {public => htdocs}/langs/ru_RU/ldap.lang            |   0
 {public => htdocs}/langs/ru_RU/link.lang            |   0
 {public => htdocs}/langs/ru_RU/loan.lang            |   0
 {public => htdocs}/langs/ru_RU/mailmanspip.lang     |   0
 {public => htdocs}/langs/ru_RU/mails.lang           |   0
 {public => htdocs}/langs/ru_RU/main.lang            |   0
 {public => htdocs}/langs/ru_RU/margins.lang         |   0
 {public => htdocs}/langs/ru_RU/members.lang         |   0
 {public => htdocs}/langs/ru_RU/oauth.lang           |   0
 {public => htdocs}/langs/ru_RU/opensurvey.lang      |   0
 {public => htdocs}/langs/ru_RU/orders.lang          |   0
 {public => htdocs}/langs/ru_RU/other.lang           |   0
 {public => htdocs}/langs/ru_RU/paybox.lang          |   0
 {public => htdocs}/langs/ru_RU/paypal.lang          |   0
 {public => htdocs}/langs/ru_RU/printing.lang        |   0
 {public => htdocs}/langs/ru_RU/productbatch.lang    |   0
 {public => htdocs}/langs/ru_RU/products.lang        |   0
 {public => htdocs}/langs/ru_RU/projects.lang        |   0
 {public => htdocs}/langs/ru_RU/propal.lang          |   0
 {public => htdocs}/langs/ru_RU/receiptprinter.lang  |   0
 {public => htdocs}/langs/ru_RU/resource.lang        |   0
 {public => htdocs}/langs/ru_RU/salaries.lang        |   0
 {public => htdocs}/langs/ru_RU/sendings.lang        |   0
 {public => htdocs}/langs/ru_RU/sms.lang             |   0
 {public => htdocs}/langs/ru_RU/stocks.lang          |   0
 .../langs/ru_RU/supplier_proposal.lang              |   0
 {public => htdocs}/langs/ru_RU/suppliers.lang       |   0
 {public => htdocs}/langs/ru_RU/trips.lang           |   0
 {public => htdocs}/langs/ru_RU/users.lang           |   0
 {public => htdocs}/langs/ru_RU/website.lang         |   0
 {public => htdocs}/langs/ru_RU/withdrawals.lang     |   0
 {public => htdocs}/langs/ru_RU/workflow.lang        |   0
 {public => htdocs}/langs/ru_UA/banks.lang           |   0
 {public => htdocs}/langs/ru_UA/bookmarks.lang       |   0
 {public => htdocs}/langs/ru_UA/compta.lang          |   0
 {public => htdocs}/langs/ru_UA/contracts.lang       |   0
 {public => htdocs}/langs/ru_UA/dict.lang            |   0
 {public => htdocs}/langs/ru_UA/ecm.lang             |   0
 {public => htdocs}/langs/ru_UA/errors.lang          |   0
 {public => htdocs}/langs/ru_UA/ftp.lang             |   0
 {public => htdocs}/langs/ru_UA/install.lang         |   0
 {public => htdocs}/langs/ru_UA/interventions.lang   |   0
 {public => htdocs}/langs/ru_UA/mails.lang           |   0
 {public => htdocs}/langs/ru_UA/main.lang            |   0
 {public => htdocs}/langs/ru_UA/other.lang           |   0
 {public => htdocs}/langs/ru_UA/paybox.lang          |   0
 {public => htdocs}/langs/ru_UA/paypal.lang          |   0
 {public => htdocs}/langs/sk_SK/accountancy.lang     |   0
 {public => htdocs}/langs/sk_SK/admin.lang           |   0
 {public => htdocs}/langs/sk_SK/agenda.lang          |   0
 {public => htdocs}/langs/sk_SK/banks.lang           |   0
 {public => htdocs}/langs/sk_SK/bills.lang           |   0
 {public => htdocs}/langs/sk_SK/bookmarks.lang       |   0
 {public => htdocs}/langs/sk_SK/boxes.lang           |   0
 {public => htdocs}/langs/sk_SK/cashdesk.lang        |   0
 {public => htdocs}/langs/sk_SK/categories.lang      |   0
 {public => htdocs}/langs/sk_SK/commercial.lang      |   0
 {public => htdocs}/langs/sk_SK/companies.lang       |   0
 {public => htdocs}/langs/sk_SK/compta.lang          |   0
 {public => htdocs}/langs/sk_SK/contracts.lang       |   0
 {public => htdocs}/langs/sk_SK/cron.lang            |   0
 {public => htdocs}/langs/sk_SK/deliveries.lang      |   0
 {public => htdocs}/langs/sk_SK/dict.lang            |   0
 {public => htdocs}/langs/sk_SK/donations.lang       |   0
 {public => htdocs}/langs/sk_SK/ecm.lang             |   0
 {public => htdocs}/langs/sk_SK/errors.lang          |   0
 {public => htdocs}/langs/sk_SK/exports.lang         |   0
 {public => htdocs}/langs/sk_SK/externalsite.lang    |   0
 {public => htdocs}/langs/sk_SK/ftp.lang             |   0
 {public => htdocs}/langs/sk_SK/help.lang            |   0
 {public => htdocs}/langs/sk_SK/holiday.lang         |   0
 {public => htdocs}/langs/sk_SK/hrm.lang             |   0
 {public => htdocs}/langs/sk_SK/incoterm.lang        |   0
 {public => htdocs}/langs/sk_SK/install.lang         |   0
 {public => htdocs}/langs/sk_SK/interventions.lang   |   0
 {public => htdocs}/langs/sk_SK/languages.lang       |   0
 {public => htdocs}/langs/sk_SK/ldap.lang            |   0
 {public => htdocs}/langs/sk_SK/link.lang            |   0
 {public => htdocs}/langs/sk_SK/loan.lang            |   0
 {public => htdocs}/langs/sk_SK/mailmanspip.lang     |   0
 {public => htdocs}/langs/sk_SK/mails.lang           |   0
 {public => htdocs}/langs/sk_SK/main.lang            |   0
 {public => htdocs}/langs/sk_SK/margins.lang         |   0
 {public => htdocs}/langs/sk_SK/members.lang         |   0
 {public => htdocs}/langs/sk_SK/oauth.lang           |   0
 {public => htdocs}/langs/sk_SK/opensurvey.lang      |   0
 {public => htdocs}/langs/sk_SK/orders.lang          |   0
 {public => htdocs}/langs/sk_SK/other.lang           |   0
 {public => htdocs}/langs/sk_SK/paybox.lang          |   0
 {public => htdocs}/langs/sk_SK/paypal.lang          |   0
 {public => htdocs}/langs/sk_SK/printing.lang        |   0
 {public => htdocs}/langs/sk_SK/productbatch.lang    |   0
 {public => htdocs}/langs/sk_SK/products.lang        |   0
 {public => htdocs}/langs/sk_SK/projects.lang        |   0
 {public => htdocs}/langs/sk_SK/propal.lang          |   0
 {public => htdocs}/langs/sk_SK/receiptprinter.lang  |   0
 {public => htdocs}/langs/sk_SK/resource.lang        |   0
 {public => htdocs}/langs/sk_SK/salaries.lang        |   0
 {public => htdocs}/langs/sk_SK/sendings.lang        |   0
 {public => htdocs}/langs/sk_SK/sms.lang             |   0
 {public => htdocs}/langs/sk_SK/stocks.lang          |   0
 .../langs/sk_SK/supplier_proposal.lang              |   0
 {public => htdocs}/langs/sk_SK/suppliers.lang       |   0
 {public => htdocs}/langs/sk_SK/trips.lang           |   0
 {public => htdocs}/langs/sk_SK/users.lang           |   0
 {public => htdocs}/langs/sk_SK/website.lang         |   0
 {public => htdocs}/langs/sk_SK/withdrawals.lang     |   0
 {public => htdocs}/langs/sk_SK/workflow.lang        |   0
 {public => htdocs}/langs/sl_SI/accountancy.lang     |   0
 {public => htdocs}/langs/sl_SI/admin.lang           |   0
 {public => htdocs}/langs/sl_SI/agenda.lang          |   0
 {public => htdocs}/langs/sl_SI/banks.lang           |   0
 {public => htdocs}/langs/sl_SI/bills.lang           |   0
 {public => htdocs}/langs/sl_SI/bookmarks.lang       |   0
 {public => htdocs}/langs/sl_SI/boxes.lang           |   0
 {public => htdocs}/langs/sl_SI/cashdesk.lang        |   0
 {public => htdocs}/langs/sl_SI/categories.lang      |   0
 {public => htdocs}/langs/sl_SI/commercial.lang      |   0
 {public => htdocs}/langs/sl_SI/companies.lang       |   0
 {public => htdocs}/langs/sl_SI/compta.lang          |   0
 {public => htdocs}/langs/sl_SI/contracts.lang       |   0
 {public => htdocs}/langs/sl_SI/cron.lang            |   0
 {public => htdocs}/langs/sl_SI/deliveries.lang      |   0
 {public => htdocs}/langs/sl_SI/dict.lang            |   0
 {public => htdocs}/langs/sl_SI/donations.lang       |   0
 {public => htdocs}/langs/sl_SI/ecm.lang             |   0
 {public => htdocs}/langs/sl_SI/errors.lang          |   0
 {public => htdocs}/langs/sl_SI/exports.lang         |   0
 {public => htdocs}/langs/sl_SI/externalsite.lang    |   0
 {public => htdocs}/langs/sl_SI/ftp.lang             |   0
 {public => htdocs}/langs/sl_SI/help.lang            |   0
 {public => htdocs}/langs/sl_SI/holiday.lang         |   0
 {public => htdocs}/langs/sl_SI/hrm.lang             |   0
 {public => htdocs}/langs/sl_SI/incoterm.lang        |   0
 {public => htdocs}/langs/sl_SI/install.lang         |   0
 {public => htdocs}/langs/sl_SI/interventions.lang   |   0
 {public => htdocs}/langs/sl_SI/languages.lang       |   0
 {public => htdocs}/langs/sl_SI/ldap.lang            |   0
 {public => htdocs}/langs/sl_SI/link.lang            |   0
 {public => htdocs}/langs/sl_SI/loan.lang            |   0
 {public => htdocs}/langs/sl_SI/mailmanspip.lang     |   0
 {public => htdocs}/langs/sl_SI/mails.lang           |   0
 {public => htdocs}/langs/sl_SI/main.lang            |   0
 {public => htdocs}/langs/sl_SI/margins.lang         |   0
 {public => htdocs}/langs/sl_SI/members.lang         |   0
 {public => htdocs}/langs/sl_SI/oauth.lang           |   0
 {public => htdocs}/langs/sl_SI/opensurvey.lang      |   0
 {public => htdocs}/langs/sl_SI/orders.lang          |   0
 {public => htdocs}/langs/sl_SI/other.lang           |   0
 {public => htdocs}/langs/sl_SI/paybox.lang          |   0
 {public => htdocs}/langs/sl_SI/paypal.lang          |   0
 {public => htdocs}/langs/sl_SI/printing.lang        |   0
 {public => htdocs}/langs/sl_SI/productbatch.lang    |   0
 {public => htdocs}/langs/sl_SI/products.lang        |   0
 {public => htdocs}/langs/sl_SI/projects.lang        |   0
 {public => htdocs}/langs/sl_SI/propal.lang          |   0
 {public => htdocs}/langs/sl_SI/receiptprinter.lang  |   0
 {public => htdocs}/langs/sl_SI/resource.lang        |   0
 {public => htdocs}/langs/sl_SI/salaries.lang        |   0
 {public => htdocs}/langs/sl_SI/sendings.lang        |   0
 {public => htdocs}/langs/sl_SI/sms.lang             |   0
 {public => htdocs}/langs/sl_SI/stocks.lang          |   0
 .../langs/sl_SI/supplier_proposal.lang              |   0
 {public => htdocs}/langs/sl_SI/suppliers.lang       |   0
 {public => htdocs}/langs/sl_SI/trips.lang           |   0
 {public => htdocs}/langs/sl_SI/users.lang           |   0
 {public => htdocs}/langs/sl_SI/website.lang         |   0
 {public => htdocs}/langs/sl_SI/withdrawals.lang     |   0
 {public => htdocs}/langs/sl_SI/workflow.lang        |   0
 {public => htdocs}/langs/sq_AL/accountancy.lang     |   0
 {public => htdocs}/langs/sq_AL/admin.lang           |   0
 {public => htdocs}/langs/sq_AL/agenda.lang          |   0
 {public => htdocs}/langs/sq_AL/banks.lang           |   0
 {public => htdocs}/langs/sq_AL/bills.lang           |   0
 {public => htdocs}/langs/sq_AL/bookmarks.lang       |   0
 {public => htdocs}/langs/sq_AL/boxes.lang           |   0
 {public => htdocs}/langs/sq_AL/cashdesk.lang        |   0
 {public => htdocs}/langs/sq_AL/categories.lang      |   0
 {public => htdocs}/langs/sq_AL/commercial.lang      |   0
 {public => htdocs}/langs/sq_AL/companies.lang       |   0
 {public => htdocs}/langs/sq_AL/compta.lang          |   0
 {public => htdocs}/langs/sq_AL/contracts.lang       |   0
 {public => htdocs}/langs/sq_AL/cron.lang            |   0
 {public => htdocs}/langs/sq_AL/deliveries.lang      |   0
 {public => htdocs}/langs/sq_AL/dict.lang            |   0
 {public => htdocs}/langs/sq_AL/donations.lang       |   0
 {public => htdocs}/langs/sq_AL/ecm.lang             |   0
 {public => htdocs}/langs/sq_AL/errors.lang          |   0
 {public => htdocs}/langs/sq_AL/exports.lang         |   0
 {public => htdocs}/langs/sq_AL/externalsite.lang    |   0
 {public => htdocs}/langs/sq_AL/ftp.lang             |   0
 {public => htdocs}/langs/sq_AL/help.lang            |   0
 {public => htdocs}/langs/sq_AL/holiday.lang         |   0
 {public => htdocs}/langs/sq_AL/hrm.lang             |   0
 {public => htdocs}/langs/sq_AL/incoterm.lang        |   0
 {public => htdocs}/langs/sq_AL/install.lang         |   0
 {public => htdocs}/langs/sq_AL/interventions.lang   |   0
 {public => htdocs}/langs/sq_AL/languages.lang       |   0
 {public => htdocs}/langs/sq_AL/ldap.lang            |   0
 {public => htdocs}/langs/sq_AL/link.lang            |   0
 {public => htdocs}/langs/sq_AL/loan.lang            |   0
 {public => htdocs}/langs/sq_AL/mailmanspip.lang     |   0
 {public => htdocs}/langs/sq_AL/mails.lang           |   0
 {public => htdocs}/langs/sq_AL/main.lang            |   0
 {public => htdocs}/langs/sq_AL/margins.lang         |   0
 {public => htdocs}/langs/sq_AL/members.lang         |   0
 {public => htdocs}/langs/sq_AL/oauth.lang           |   0
 {public => htdocs}/langs/sq_AL/opensurvey.lang      |   0
 {public => htdocs}/langs/sq_AL/orders.lang          |   0
 {public => htdocs}/langs/sq_AL/other.lang           |   0
 {public => htdocs}/langs/sq_AL/paybox.lang          |   0
 {public => htdocs}/langs/sq_AL/paypal.lang          |   0
 {public => htdocs}/langs/sq_AL/printing.lang        |   0
 {public => htdocs}/langs/sq_AL/productbatch.lang    |   0
 {public => htdocs}/langs/sq_AL/products.lang        |   0
 {public => htdocs}/langs/sq_AL/projects.lang        |   0
 {public => htdocs}/langs/sq_AL/propal.lang          |   0
 {public => htdocs}/langs/sq_AL/receiptprinter.lang  |   0
 {public => htdocs}/langs/sq_AL/resource.lang        |   0
 {public => htdocs}/langs/sq_AL/salaries.lang        |   0
 {public => htdocs}/langs/sq_AL/sendings.lang        |   0
 {public => htdocs}/langs/sq_AL/sms.lang             |   0
 {public => htdocs}/langs/sq_AL/stocks.lang          |   0
 .../langs/sq_AL/supplier_proposal.lang              |   0
 {public => htdocs}/langs/sq_AL/suppliers.lang       |   0
 {public => htdocs}/langs/sq_AL/trips.lang           |   0
 {public => htdocs}/langs/sq_AL/users.lang           |   0
 {public => htdocs}/langs/sq_AL/website.lang         |   0
 {public => htdocs}/langs/sq_AL/withdrawals.lang     |   0
 {public => htdocs}/langs/sq_AL/workflow.lang        |   0
 {public => htdocs}/langs/sr_RS/accountancy.lang     |   0
 {public => htdocs}/langs/sr_RS/admin.lang           |   0
 {public => htdocs}/langs/sr_RS/agenda.lang          |   0
 {public => htdocs}/langs/sr_RS/banks.lang           |   0
 {public => htdocs}/langs/sr_RS/bills.lang           |   0
 {public => htdocs}/langs/sr_RS/bookmarks.lang       |   0
 {public => htdocs}/langs/sr_RS/boxes.lang           |   0
 {public => htdocs}/langs/sr_RS/cashdesk.lang        |   0
 {public => htdocs}/langs/sr_RS/categories.lang      |   0
 {public => htdocs}/langs/sr_RS/commercial.lang      |   0
 {public => htdocs}/langs/sr_RS/companies.lang       |   0
 {public => htdocs}/langs/sr_RS/compta.lang          |   0
 {public => htdocs}/langs/sr_RS/contracts.lang       |   0
 {public => htdocs}/langs/sr_RS/cron.lang            |   0
 {public => htdocs}/langs/sr_RS/deliveries.lang      |   0
 {public => htdocs}/langs/sr_RS/dict.lang            |   0
 {public => htdocs}/langs/sr_RS/donations.lang       |   0
 {public => htdocs}/langs/sr_RS/ecm.lang             |   0
 {public => htdocs}/langs/sr_RS/errors.lang          |   0
 {public => htdocs}/langs/sr_RS/exports.lang         |   0
 {public => htdocs}/langs/sr_RS/externalsite.lang    |   0
 {public => htdocs}/langs/sr_RS/ftp.lang             |   0
 {public => htdocs}/langs/sr_RS/help.lang            |   0
 {public => htdocs}/langs/sr_RS/holiday.lang         |   0
 {public => htdocs}/langs/sr_RS/incoterm.lang        |   0
 {public => htdocs}/langs/sr_RS/install.lang         |   0
 {public => htdocs}/langs/sr_RS/interventions.lang   |   0
 {public => htdocs}/langs/sr_RS/languages.lang       |   0
 {public => htdocs}/langs/sr_RS/ldap.lang            |   0
 {public => htdocs}/langs/sr_RS/link.lang            |   0
 {public => htdocs}/langs/sr_RS/loan.lang            |   0
 {public => htdocs}/langs/sr_RS/mailmanspip.lang     |   0
 {public => htdocs}/langs/sr_RS/mails.lang           |   0
 {public => htdocs}/langs/sr_RS/main.lang            |   0
 {public => htdocs}/langs/sr_RS/margins.lang         |   0
 {public => htdocs}/langs/sr_RS/members.lang         |   0
 {public => htdocs}/langs/sr_RS/opensurvey.lang      |   0
 {public => htdocs}/langs/sr_RS/orders.lang          |   0
 {public => htdocs}/langs/sr_RS/other.lang           |   0
 {public => htdocs}/langs/sr_RS/paybox.lang          |   0
 {public => htdocs}/langs/sr_RS/paypal.lang          |   0
 {public => htdocs}/langs/sr_RS/printing.lang        |   0
 {public => htdocs}/langs/sr_RS/productbatch.lang    |   0
 {public => htdocs}/langs/sr_RS/products.lang        |   0
 {public => htdocs}/langs/sr_RS/projects.lang        |   0
 {public => htdocs}/langs/sr_RS/propal.lang          |   0
 {public => htdocs}/langs/sr_RS/resource.lang        |   0
 {public => htdocs}/langs/sr_RS/salaries.lang        |   0
 {public => htdocs}/langs/sr_RS/sendings.lang        |   0
 {public => htdocs}/langs/sr_RS/sms.lang             |   0
 {public => htdocs}/langs/sr_RS/stocks.lang          |   0
 {public => htdocs}/langs/sr_RS/suppliers.lang       |   0
 {public => htdocs}/langs/sr_RS/trips.lang           |   0
 {public => htdocs}/langs/sr_RS/users.lang           |   0
 {public => htdocs}/langs/sr_RS/withdrawals.lang     |   0
 {public => htdocs}/langs/sr_RS/workflow.lang        |   0
 {public => htdocs}/langs/sv_SE/accountancy.lang     |   0
 {public => htdocs}/langs/sv_SE/admin.lang           |   0
 {public => htdocs}/langs/sv_SE/agenda.lang          |   0
 {public => htdocs}/langs/sv_SE/banks.lang           |   0
 {public => htdocs}/langs/sv_SE/bills.lang           |   0
 {public => htdocs}/langs/sv_SE/bookmarks.lang       |   0
 {public => htdocs}/langs/sv_SE/boxes.lang           |   0
 {public => htdocs}/langs/sv_SE/cashdesk.lang        |   0
 {public => htdocs}/langs/sv_SE/categories.lang      |   0
 {public => htdocs}/langs/sv_SE/commercial.lang      |   0
 {public => htdocs}/langs/sv_SE/companies.lang       |   0
 {public => htdocs}/langs/sv_SE/compta.lang          |   0
 {public => htdocs}/langs/sv_SE/contracts.lang       |   0
 {public => htdocs}/langs/sv_SE/cron.lang            |   0
 {public => htdocs}/langs/sv_SE/deliveries.lang      |   0
 {public => htdocs}/langs/sv_SE/dict.lang            |   0
 {public => htdocs}/langs/sv_SE/donations.lang       |   0
 {public => htdocs}/langs/sv_SE/ecm.lang             |   0
 {public => htdocs}/langs/sv_SE/errors.lang          |   0
 {public => htdocs}/langs/sv_SE/exports.lang         |   0
 {public => htdocs}/langs/sv_SE/externalsite.lang    |   0
 {public => htdocs}/langs/sv_SE/ftp.lang             |   0
 {public => htdocs}/langs/sv_SE/help.lang            |   0
 {public => htdocs}/langs/sv_SE/holiday.lang         |   0
 {public => htdocs}/langs/sv_SE/hrm.lang             |   0
 {public => htdocs}/langs/sv_SE/incoterm.lang        |   0
 {public => htdocs}/langs/sv_SE/install.lang         |   0
 {public => htdocs}/langs/sv_SE/interventions.lang   |   0
 {public => htdocs}/langs/sv_SE/languages.lang       |   0
 {public => htdocs}/langs/sv_SE/ldap.lang            |   0
 {public => htdocs}/langs/sv_SE/link.lang            |   0
 {public => htdocs}/langs/sv_SE/loan.lang            |   0
 {public => htdocs}/langs/sv_SE/mailmanspip.lang     |   0
 {public => htdocs}/langs/sv_SE/mails.lang           |   0
 {public => htdocs}/langs/sv_SE/main.lang            |   0
 {public => htdocs}/langs/sv_SE/margins.lang         |   0
 {public => htdocs}/langs/sv_SE/members.lang         |   0
 {public => htdocs}/langs/sv_SE/oauth.lang           |   0
 {public => htdocs}/langs/sv_SE/opensurvey.lang      |   0
 {public => htdocs}/langs/sv_SE/orders.lang          |   0
 {public => htdocs}/langs/sv_SE/other.lang           |   0
 {public => htdocs}/langs/sv_SE/paybox.lang          |   0
 {public => htdocs}/langs/sv_SE/paypal.lang          |   0
 {public => htdocs}/langs/sv_SE/printing.lang        |   0
 {public => htdocs}/langs/sv_SE/productbatch.lang    |   0
 {public => htdocs}/langs/sv_SE/products.lang        |   0
 {public => htdocs}/langs/sv_SE/projects.lang        |   0
 {public => htdocs}/langs/sv_SE/propal.lang          |   0
 {public => htdocs}/langs/sv_SE/receiptprinter.lang  |   0
 {public => htdocs}/langs/sv_SE/resource.lang        |   0
 {public => htdocs}/langs/sv_SE/salaries.lang        |   0
 {public => htdocs}/langs/sv_SE/sendings.lang        |   0
 {public => htdocs}/langs/sv_SE/sms.lang             |   0
 {public => htdocs}/langs/sv_SE/stocks.lang          |   0
 .../langs/sv_SE/supplier_proposal.lang              |   0
 {public => htdocs}/langs/sv_SE/suppliers.lang       |   0
 {public => htdocs}/langs/sv_SE/trips.lang           |   0
 {public => htdocs}/langs/sv_SE/users.lang           |   0
 {public => htdocs}/langs/sv_SE/website.lang         |   0
 {public => htdocs}/langs/sv_SE/withdrawals.lang     |   0
 {public => htdocs}/langs/sv_SE/workflow.lang        |   0
 {public => htdocs}/langs/sw_SW/accountancy.lang     |   0
 {public => htdocs}/langs/sw_SW/admin.lang           |   0
 {public => htdocs}/langs/sw_SW/agenda.lang          |   0
 {public => htdocs}/langs/sw_SW/banks.lang           |   0
 {public => htdocs}/langs/sw_SW/bills.lang           |   0
 {public => htdocs}/langs/sw_SW/bookmarks.lang       |   0
 {public => htdocs}/langs/sw_SW/boxes.lang           |   0
 {public => htdocs}/langs/sw_SW/cashdesk.lang        |   0
 {public => htdocs}/langs/sw_SW/categories.lang      |   0
 {public => htdocs}/langs/sw_SW/commercial.lang      |   0
 {public => htdocs}/langs/sw_SW/companies.lang       |   0
 {public => htdocs}/langs/sw_SW/compta.lang          |   0
 {public => htdocs}/langs/sw_SW/contracts.lang       |   0
 {public => htdocs}/langs/sw_SW/cron.lang            |   0
 {public => htdocs}/langs/sw_SW/deliveries.lang      |   0
 {public => htdocs}/langs/sw_SW/dict.lang            |   0
 {public => htdocs}/langs/sw_SW/donations.lang       |   0
 {public => htdocs}/langs/sw_SW/ecm.lang             |   0
 {public => htdocs}/langs/sw_SW/errors.lang          |   0
 {public => htdocs}/langs/sw_SW/exports.lang         |   0
 {public => htdocs}/langs/sw_SW/externalsite.lang    |   0
 {public => htdocs}/langs/sw_SW/ftp.lang             |   0
 {public => htdocs}/langs/sw_SW/help.lang            |   0
 {public => htdocs}/langs/sw_SW/holiday.lang         |   0
 {public => htdocs}/langs/sw_SW/incoterm.lang        |   0
 {public => htdocs}/langs/sw_SW/install.lang         |   0
 {public => htdocs}/langs/sw_SW/interventions.lang   |   0
 {public => htdocs}/langs/sw_SW/languages.lang       |   0
 {public => htdocs}/langs/sw_SW/ldap.lang            |   0
 {public => htdocs}/langs/sw_SW/link.lang            |   0
 {public => htdocs}/langs/sw_SW/loan.lang            |   0
 {public => htdocs}/langs/sw_SW/mailmanspip.lang     |   0
 {public => htdocs}/langs/sw_SW/mails.lang           |   0
 {public => htdocs}/langs/sw_SW/main.lang            |   0
 {public => htdocs}/langs/sw_SW/margins.lang         |   0
 {public => htdocs}/langs/sw_SW/members.lang         |   0
 {public => htdocs}/langs/sw_SW/opensurvey.lang      |   0
 {public => htdocs}/langs/sw_SW/orders.lang          |   0
 {public => htdocs}/langs/sw_SW/other.lang           |   0
 {public => htdocs}/langs/sw_SW/paybox.lang          |   0
 {public => htdocs}/langs/sw_SW/paypal.lang          |   0
 {public => htdocs}/langs/sw_SW/printing.lang        |   0
 {public => htdocs}/langs/sw_SW/productbatch.lang    |   0
 {public => htdocs}/langs/sw_SW/products.lang        |   0
 {public => htdocs}/langs/sw_SW/projects.lang        |   0
 {public => htdocs}/langs/sw_SW/propal.lang          |   0
 {public => htdocs}/langs/sw_SW/resource.lang        |   0
 {public => htdocs}/langs/sw_SW/salaries.lang        |   0
 {public => htdocs}/langs/sw_SW/sendings.lang        |   0
 {public => htdocs}/langs/sw_SW/sms.lang             |   0
 {public => htdocs}/langs/sw_SW/stocks.lang          |   0
 {public => htdocs}/langs/sw_SW/suppliers.lang       |   0
 {public => htdocs}/langs/sw_SW/trips.lang           |   0
 {public => htdocs}/langs/sw_SW/users.lang           |   0
 {public => htdocs}/langs/sw_SW/withdrawals.lang     |   0
 {public => htdocs}/langs/sw_SW/workflow.lang        |   0
 {public => htdocs}/langs/th_TH/accountancy.lang     |   0
 {public => htdocs}/langs/th_TH/admin.lang           |   0
 {public => htdocs}/langs/th_TH/agenda.lang          |   0
 {public => htdocs}/langs/th_TH/banks.lang           |   0
 {public => htdocs}/langs/th_TH/bills.lang           |   0
 {public => htdocs}/langs/th_TH/bookmarks.lang       |   0
 {public => htdocs}/langs/th_TH/boxes.lang           |   0
 {public => htdocs}/langs/th_TH/cashdesk.lang        |   0
 {public => htdocs}/langs/th_TH/categories.lang      |   0
 {public => htdocs}/langs/th_TH/commercial.lang      |   0
 {public => htdocs}/langs/th_TH/companies.lang       |   0
 {public => htdocs}/langs/th_TH/compta.lang          |   0
 {public => htdocs}/langs/th_TH/contracts.lang       |   0
 {public => htdocs}/langs/th_TH/cron.lang            |   0
 {public => htdocs}/langs/th_TH/deliveries.lang      |   0
 {public => htdocs}/langs/th_TH/dict.lang            |   0
 {public => htdocs}/langs/th_TH/donations.lang       |   0
 {public => htdocs}/langs/th_TH/ecm.lang             |   0
 {public => htdocs}/langs/th_TH/errors.lang          |   0
 {public => htdocs}/langs/th_TH/exports.lang         |   0
 {public => htdocs}/langs/th_TH/externalsite.lang    |   0
 {public => htdocs}/langs/th_TH/ftp.lang             |   0
 {public => htdocs}/langs/th_TH/help.lang            |   0
 {public => htdocs}/langs/th_TH/holiday.lang         |   0
 {public => htdocs}/langs/th_TH/hrm.lang             |   0
 {public => htdocs}/langs/th_TH/incoterm.lang        |   0
 {public => htdocs}/langs/th_TH/install.lang         |   0
 {public => htdocs}/langs/th_TH/interventions.lang   |   0
 {public => htdocs}/langs/th_TH/languages.lang       |   0
 {public => htdocs}/langs/th_TH/ldap.lang            |   0
 {public => htdocs}/langs/th_TH/link.lang            |   0
 {public => htdocs}/langs/th_TH/loan.lang            |   0
 {public => htdocs}/langs/th_TH/mailmanspip.lang     |   0
 {public => htdocs}/langs/th_TH/mails.lang           |   0
 {public => htdocs}/langs/th_TH/main.lang            |   0
 {public => htdocs}/langs/th_TH/margins.lang         |   0
 {public => htdocs}/langs/th_TH/members.lang         |   0
 {public => htdocs}/langs/th_TH/oauth.lang           |   0
 {public => htdocs}/langs/th_TH/opensurvey.lang      |   0
 {public => htdocs}/langs/th_TH/orders.lang          |   0
 {public => htdocs}/langs/th_TH/other.lang           |   0
 {public => htdocs}/langs/th_TH/paybox.lang          |   0
 {public => htdocs}/langs/th_TH/paypal.lang          |   0
 {public => htdocs}/langs/th_TH/printing.lang        |   0
 {public => htdocs}/langs/th_TH/productbatch.lang    |   0
 {public => htdocs}/langs/th_TH/products.lang        |   0
 {public => htdocs}/langs/th_TH/projects.lang        |   0
 {public => htdocs}/langs/th_TH/propal.lang          |   0
 {public => htdocs}/langs/th_TH/receiptprinter.lang  |   0
 {public => htdocs}/langs/th_TH/resource.lang        |   0
 {public => htdocs}/langs/th_TH/salaries.lang        |   0
 {public => htdocs}/langs/th_TH/sendings.lang        |   0
 {public => htdocs}/langs/th_TH/sms.lang             |   0
 {public => htdocs}/langs/th_TH/stocks.lang          |   0
 .../langs/th_TH/supplier_proposal.lang              |   0
 {public => htdocs}/langs/th_TH/suppliers.lang       |   0
 {public => htdocs}/langs/th_TH/trips.lang           |   0
 {public => htdocs}/langs/th_TH/users.lang           |   0
 {public => htdocs}/langs/th_TH/website.lang         |   0
 {public => htdocs}/langs/th_TH/withdrawals.lang     |   0
 {public => htdocs}/langs/th_TH/workflow.lang        |   0
 {public => htdocs}/langs/tr_TR/accountancy.lang     |   0
 {public => htdocs}/langs/tr_TR/admin.lang           |   0
 {public => htdocs}/langs/tr_TR/agenda.lang          |   0
 {public => htdocs}/langs/tr_TR/banks.lang           |   0
 {public => htdocs}/langs/tr_TR/bills.lang           |   0
 {public => htdocs}/langs/tr_TR/bookmarks.lang       |   0
 {public => htdocs}/langs/tr_TR/boxes.lang           |   0
 {public => htdocs}/langs/tr_TR/cashdesk.lang        |   0
 {public => htdocs}/langs/tr_TR/categories.lang      |   0
 {public => htdocs}/langs/tr_TR/commercial.lang      |   0
 {public => htdocs}/langs/tr_TR/commissions.lang     |   0
 {public => htdocs}/langs/tr_TR/companies.lang       |   0
 {public => htdocs}/langs/tr_TR/compta.lang          |   0
 {public => htdocs}/langs/tr_TR/contracts.lang       |   0
 {public => htdocs}/langs/tr_TR/cron.lang            |   0
 {public => htdocs}/langs/tr_TR/deliveries.lang      |   0
 {public => htdocs}/langs/tr_TR/dict.lang            |   0
 {public => htdocs}/langs/tr_TR/donations.lang       |   0
 {public => htdocs}/langs/tr_TR/ecm.lang             |   0
 {public => htdocs}/langs/tr_TR/errors.lang          |   0
 {public => htdocs}/langs/tr_TR/exports.lang         |   0
 {public => htdocs}/langs/tr_TR/externalsite.lang    |   0
 {public => htdocs}/langs/tr_TR/ftp.lang             |   0
 {public => htdocs}/langs/tr_TR/help.lang            |   0
 {public => htdocs}/langs/tr_TR/holiday.lang         |   0
 {public => htdocs}/langs/tr_TR/hrm.lang             |   0
 {public => htdocs}/langs/tr_TR/incoterm.lang        |   0
 {public => htdocs}/langs/tr_TR/install.lang         |   0
 {public => htdocs}/langs/tr_TR/interventions.lang   |   0
 {public => htdocs}/langs/tr_TR/languages.lang       |   0
 {public => htdocs}/langs/tr_TR/ldap.lang            |   0
 {public => htdocs}/langs/tr_TR/link.lang            |   0
 {public => htdocs}/langs/tr_TR/loan.lang            |   0
 {public => htdocs}/langs/tr_TR/mailmanspip.lang     |   0
 {public => htdocs}/langs/tr_TR/mails.lang           |   0
 {public => htdocs}/langs/tr_TR/main.lang            |   0
 {public => htdocs}/langs/tr_TR/margins.lang         |   0
 {public => htdocs}/langs/tr_TR/members.lang         |   0
 {public => htdocs}/langs/tr_TR/oauth.lang           |   0
 {public => htdocs}/langs/tr_TR/opensurvey.lang      |   0
 {public => htdocs}/langs/tr_TR/orders.lang          |   0
 {public => htdocs}/langs/tr_TR/other.lang           |   0
 {public => htdocs}/langs/tr_TR/paybox.lang          |   0
 {public => htdocs}/langs/tr_TR/paypal.lang          |   0
 {public => htdocs}/langs/tr_TR/printing.lang        |   0
 {public => htdocs}/langs/tr_TR/productbatch.lang    |   0
 {public => htdocs}/langs/tr_TR/products.lang        |   0
 {public => htdocs}/langs/tr_TR/projects.lang        |   0
 {public => htdocs}/langs/tr_TR/propal.lang          |   0
 {public => htdocs}/langs/tr_TR/receiptprinter.lang  |   0
 {public => htdocs}/langs/tr_TR/resource.lang        |   0
 {public => htdocs}/langs/tr_TR/salaries.lang        |   0
 {public => htdocs}/langs/tr_TR/sendings.lang        |   0
 {public => htdocs}/langs/tr_TR/sms.lang             |   0
 {public => htdocs}/langs/tr_TR/stocks.lang          |   0
 .../langs/tr_TR/supplier_proposal.lang              |   0
 {public => htdocs}/langs/tr_TR/suppliers.lang       |   0
 {public => htdocs}/langs/tr_TR/trips.lang           |   0
 {public => htdocs}/langs/tr_TR/users.lang           |   0
 {public => htdocs}/langs/tr_TR/website.lang         |   0
 {public => htdocs}/langs/tr_TR/withdrawals.lang     |   0
 {public => htdocs}/langs/tr_TR/workflow.lang        |   0
 {public => htdocs}/langs/uk_UA/accountancy.lang     |   0
 {public => htdocs}/langs/uk_UA/admin.lang           |   0
 {public => htdocs}/langs/uk_UA/agenda.lang          |   0
 {public => htdocs}/langs/uk_UA/banks.lang           |   0
 {public => htdocs}/langs/uk_UA/bills.lang           |   0
 {public => htdocs}/langs/uk_UA/bookmarks.lang       |   0
 {public => htdocs}/langs/uk_UA/boxes.lang           |   0
 {public => htdocs}/langs/uk_UA/cashdesk.lang        |   0
 {public => htdocs}/langs/uk_UA/categories.lang      |   0
 {public => htdocs}/langs/uk_UA/commercial.lang      |   0
 {public => htdocs}/langs/uk_UA/companies.lang       |   0
 {public => htdocs}/langs/uk_UA/compta.lang          |   0
 {public => htdocs}/langs/uk_UA/contracts.lang       |   0
 {public => htdocs}/langs/uk_UA/cron.lang            |   0
 {public => htdocs}/langs/uk_UA/deliveries.lang      |   0
 {public => htdocs}/langs/uk_UA/dict.lang            |   0
 {public => htdocs}/langs/uk_UA/donations.lang       |   0
 {public => htdocs}/langs/uk_UA/ecm.lang             |   0
 {public => htdocs}/langs/uk_UA/errors.lang          |   0
 {public => htdocs}/langs/uk_UA/exports.lang         |   0
 {public => htdocs}/langs/uk_UA/externalsite.lang    |   0
 {public => htdocs}/langs/uk_UA/ftp.lang             |   0
 {public => htdocs}/langs/uk_UA/help.lang            |   0
 {public => htdocs}/langs/uk_UA/holiday.lang         |   0
 {public => htdocs}/langs/uk_UA/hrm.lang             |   0
 {public => htdocs}/langs/uk_UA/incoterm.lang        |   0
 {public => htdocs}/langs/uk_UA/install.lang         |   0
 {public => htdocs}/langs/uk_UA/interventions.lang   |   0
 {public => htdocs}/langs/uk_UA/languages.lang       |   0
 {public => htdocs}/langs/uk_UA/ldap.lang            |   0
 {public => htdocs}/langs/uk_UA/link.lang            |   0
 {public => htdocs}/langs/uk_UA/loan.lang            |   0
 {public => htdocs}/langs/uk_UA/mailmanspip.lang     |   0
 {public => htdocs}/langs/uk_UA/mails.lang           |   0
 {public => htdocs}/langs/uk_UA/main.lang            |   0
 {public => htdocs}/langs/uk_UA/margins.lang         |   0
 {public => htdocs}/langs/uk_UA/members.lang         |   0
 {public => htdocs}/langs/uk_UA/oauth.lang           |   0
 {public => htdocs}/langs/uk_UA/opensurvey.lang      |   0
 {public => htdocs}/langs/uk_UA/orders.lang          |   0
 {public => htdocs}/langs/uk_UA/other.lang           |   0
 {public => htdocs}/langs/uk_UA/paybox.lang          |   0
 {public => htdocs}/langs/uk_UA/paypal.lang          |   0
 {public => htdocs}/langs/uk_UA/printing.lang        |   0
 {public => htdocs}/langs/uk_UA/productbatch.lang    |   0
 {public => htdocs}/langs/uk_UA/products.lang        |   0
 {public => htdocs}/langs/uk_UA/projects.lang        |   0
 {public => htdocs}/langs/uk_UA/propal.lang          |   0
 {public => htdocs}/langs/uk_UA/receiptprinter.lang  |   0
 {public => htdocs}/langs/uk_UA/resource.lang        |   0
 {public => htdocs}/langs/uk_UA/salaries.lang        |   0
 {public => htdocs}/langs/uk_UA/sendings.lang        |   0
 {public => htdocs}/langs/uk_UA/sms.lang             |   0
 {public => htdocs}/langs/uk_UA/stocks.lang          |   0
 .../langs/uk_UA/supplier_proposal.lang              |   0
 {public => htdocs}/langs/uk_UA/suppliers.lang       |   0
 {public => htdocs}/langs/uk_UA/trips.lang           |   0
 {public => htdocs}/langs/uk_UA/users.lang           |   0
 {public => htdocs}/langs/uk_UA/website.lang         |   0
 {public => htdocs}/langs/uk_UA/withdrawals.lang     |   0
 {public => htdocs}/langs/uk_UA/workflow.lang        |   0
 {public => htdocs}/langs/uz_UZ/accountancy.lang     |   0
 {public => htdocs}/langs/uz_UZ/admin.lang           |   0
 {public => htdocs}/langs/uz_UZ/agenda.lang          |   0
 {public => htdocs}/langs/uz_UZ/banks.lang           |   0
 {public => htdocs}/langs/uz_UZ/bills.lang           |   0
 {public => htdocs}/langs/uz_UZ/bookmarks.lang       |   0
 {public => htdocs}/langs/uz_UZ/boxes.lang           |   0
 {public => htdocs}/langs/uz_UZ/cashdesk.lang        |   0
 {public => htdocs}/langs/uz_UZ/categories.lang      |   0
 {public => htdocs}/langs/uz_UZ/commercial.lang      |   0
 {public => htdocs}/langs/uz_UZ/companies.lang       |   0
 {public => htdocs}/langs/uz_UZ/compta.lang          |   0
 {public => htdocs}/langs/uz_UZ/contracts.lang       |   0
 {public => htdocs}/langs/uz_UZ/cron.lang            |   0
 {public => htdocs}/langs/uz_UZ/deliveries.lang      |   0
 {public => htdocs}/langs/uz_UZ/dict.lang            |   0
 {public => htdocs}/langs/uz_UZ/donations.lang       |   0
 {public => htdocs}/langs/uz_UZ/ecm.lang             |   0
 {public => htdocs}/langs/uz_UZ/errors.lang          |   0
 {public => htdocs}/langs/uz_UZ/exports.lang         |   0
 {public => htdocs}/langs/uz_UZ/externalsite.lang    |   0
 {public => htdocs}/langs/uz_UZ/ftp.lang             |   0
 {public => htdocs}/langs/uz_UZ/help.lang            |   0
 {public => htdocs}/langs/uz_UZ/holiday.lang         |   0
 {public => htdocs}/langs/uz_UZ/incoterm.lang        |   0
 {public => htdocs}/langs/uz_UZ/install.lang         |   0
 {public => htdocs}/langs/uz_UZ/interventions.lang   |   0
 {public => htdocs}/langs/uz_UZ/languages.lang       |   0
 {public => htdocs}/langs/uz_UZ/ldap.lang            |   0
 {public => htdocs}/langs/uz_UZ/link.lang            |   0
 {public => htdocs}/langs/uz_UZ/loan.lang            |   0
 {public => htdocs}/langs/uz_UZ/mailmanspip.lang     |   0
 {public => htdocs}/langs/uz_UZ/mails.lang           |   0
 {public => htdocs}/langs/uz_UZ/main.lang            |   0
 {public => htdocs}/langs/uz_UZ/margins.lang         |   0
 {public => htdocs}/langs/uz_UZ/members.lang         |   0
 {public => htdocs}/langs/uz_UZ/opensurvey.lang      |   0
 {public => htdocs}/langs/uz_UZ/orders.lang          |   0
 {public => htdocs}/langs/uz_UZ/other.lang           |   0
 {public => htdocs}/langs/uz_UZ/paybox.lang          |   0
 {public => htdocs}/langs/uz_UZ/paypal.lang          |   0
 {public => htdocs}/langs/uz_UZ/printing.lang        |   0
 {public => htdocs}/langs/uz_UZ/productbatch.lang    |   0
 {public => htdocs}/langs/uz_UZ/products.lang        |   0
 {public => htdocs}/langs/uz_UZ/projects.lang        |   0
 {public => htdocs}/langs/uz_UZ/propal.lang          |   0
 {public => htdocs}/langs/uz_UZ/resource.lang        |   0
 {public => htdocs}/langs/uz_UZ/salaries.lang        |   0
 {public => htdocs}/langs/uz_UZ/sendings.lang        |   0
 {public => htdocs}/langs/uz_UZ/sms.lang             |   0
 {public => htdocs}/langs/uz_UZ/stocks.lang          |   0
 {public => htdocs}/langs/uz_UZ/suppliers.lang       |   0
 {public => htdocs}/langs/uz_UZ/trips.lang           |   0
 {public => htdocs}/langs/uz_UZ/users.lang           |   0
 {public => htdocs}/langs/uz_UZ/withdrawals.lang     |   0
 {public => htdocs}/langs/uz_UZ/workflow.lang        |   0
 {public => htdocs}/langs/vi_VN/accountancy.lang     |   0
 {public => htdocs}/langs/vi_VN/admin.lang           |   0
 {public => htdocs}/langs/vi_VN/agenda.lang          |   0
 {public => htdocs}/langs/vi_VN/banks.lang           |   0
 {public => htdocs}/langs/vi_VN/bills.lang           |   0
 {public => htdocs}/langs/vi_VN/bookmarks.lang       |   0
 {public => htdocs}/langs/vi_VN/boxes.lang           |   0
 {public => htdocs}/langs/vi_VN/cashdesk.lang        |   0
 {public => htdocs}/langs/vi_VN/categories.lang      |   0
 {public => htdocs}/langs/vi_VN/commercial.lang      |   0
 {public => htdocs}/langs/vi_VN/companies.lang       |   0
 {public => htdocs}/langs/vi_VN/compta.lang          |   0
 {public => htdocs}/langs/vi_VN/contracts.lang       |   0
 {public => htdocs}/langs/vi_VN/cron.lang            |   0
 {public => htdocs}/langs/vi_VN/deliveries.lang      |   0
 {public => htdocs}/langs/vi_VN/dict.lang            |   0
 {public => htdocs}/langs/vi_VN/donations.lang       |   0
 {public => htdocs}/langs/vi_VN/ecm.lang             |   0
 {public => htdocs}/langs/vi_VN/errors.lang          |   0
 {public => htdocs}/langs/vi_VN/exports.lang         |   0
 {public => htdocs}/langs/vi_VN/externalsite.lang    |   0
 {public => htdocs}/langs/vi_VN/ftp.lang             |   0
 {public => htdocs}/langs/vi_VN/help.lang            |   0
 {public => htdocs}/langs/vi_VN/holiday.lang         |   0
 {public => htdocs}/langs/vi_VN/hrm.lang             |   0
 {public => htdocs}/langs/vi_VN/incoterm.lang        |   0
 {public => htdocs}/langs/vi_VN/install.lang         |   0
 {public => htdocs}/langs/vi_VN/interventions.lang   |   0
 {public => htdocs}/langs/vi_VN/languages.lang       |   0
 {public => htdocs}/langs/vi_VN/ldap.lang            |   0
 {public => htdocs}/langs/vi_VN/link.lang            |   0
 {public => htdocs}/langs/vi_VN/loan.lang            |   0
 {public => htdocs}/langs/vi_VN/mailmanspip.lang     |   0
 {public => htdocs}/langs/vi_VN/mails.lang           |   0
 {public => htdocs}/langs/vi_VN/main.lang            |   0
 {public => htdocs}/langs/vi_VN/margins.lang         |   0
 {public => htdocs}/langs/vi_VN/members.lang         |   0
 {public => htdocs}/langs/vi_VN/oauth.lang           |   0
 {public => htdocs}/langs/vi_VN/opensurvey.lang      |   0
 {public => htdocs}/langs/vi_VN/orders.lang          |   0
 {public => htdocs}/langs/vi_VN/other.lang           |   0
 {public => htdocs}/langs/vi_VN/paybox.lang          |   0
 {public => htdocs}/langs/vi_VN/paypal.lang          |   0
 {public => htdocs}/langs/vi_VN/printing.lang        |   0
 {public => htdocs}/langs/vi_VN/productbatch.lang    |   0
 {public => htdocs}/langs/vi_VN/products.lang        |   0
 {public => htdocs}/langs/vi_VN/projects.lang        |   0
 {public => htdocs}/langs/vi_VN/propal.lang          |   0
 {public => htdocs}/langs/vi_VN/receiptprinter.lang  |   0
 {public => htdocs}/langs/vi_VN/resource.lang        |   0
 {public => htdocs}/langs/vi_VN/salaries.lang        |   0
 {public => htdocs}/langs/vi_VN/sendings.lang        |   0
 {public => htdocs}/langs/vi_VN/sms.lang             |   0
 {public => htdocs}/langs/vi_VN/stocks.lang          |   0
 .../langs/vi_VN/supplier_proposal.lang              |   0
 {public => htdocs}/langs/vi_VN/suppliers.lang       |   0
 {public => htdocs}/langs/vi_VN/trips.lang           |   0
 {public => htdocs}/langs/vi_VN/users.lang           |   0
 {public => htdocs}/langs/vi_VN/website.lang         |   0
 {public => htdocs}/langs/vi_VN/withdrawals.lang     |   0
 {public => htdocs}/langs/vi_VN/workflow.lang        |   0
 {public => htdocs}/langs/zh_CN/accountancy.lang     |   0
 {public => htdocs}/langs/zh_CN/admin.lang           |   0
 {public => htdocs}/langs/zh_CN/agenda.lang          |   0
 {public => htdocs}/langs/zh_CN/banks.lang           |   0
 {public => htdocs}/langs/zh_CN/bills.lang           |   0
 {public => htdocs}/langs/zh_CN/bookmarks.lang       |   0
 {public => htdocs}/langs/zh_CN/boxes.lang           |   0
 {public => htdocs}/langs/zh_CN/cashdesk.lang        |   0
 {public => htdocs}/langs/zh_CN/categories.lang      |   0
 {public => htdocs}/langs/zh_CN/commercial.lang      |   0
 {public => htdocs}/langs/zh_CN/companies.lang       |   0
 {public => htdocs}/langs/zh_CN/compta.lang          |   0
 {public => htdocs}/langs/zh_CN/contracts.lang       |   0
 {public => htdocs}/langs/zh_CN/cron.lang            |   0
 {public => htdocs}/langs/zh_CN/deliveries.lang      |   0
 {public => htdocs}/langs/zh_CN/dict.lang            |   0
 {public => htdocs}/langs/zh_CN/donations.lang       |   0
 {public => htdocs}/langs/zh_CN/ecm.lang             |   0
 {public => htdocs}/langs/zh_CN/errors.lang          |   0
 {public => htdocs}/langs/zh_CN/exports.lang         |   0
 {public => htdocs}/langs/zh_CN/externalsite.lang    |   0
 {public => htdocs}/langs/zh_CN/ftp.lang             |   0
 {public => htdocs}/langs/zh_CN/help.lang            |   0
 {public => htdocs}/langs/zh_CN/holiday.lang         |   0
 {public => htdocs}/langs/zh_CN/hrm.lang             |   0
 {public => htdocs}/langs/zh_CN/incoterm.lang        |   0
 {public => htdocs}/langs/zh_CN/install.lang         |   0
 {public => htdocs}/langs/zh_CN/interventions.lang   |   0
 {public => htdocs}/langs/zh_CN/languages.lang       |   0
 {public => htdocs}/langs/zh_CN/ldap.lang            |   0
 {public => htdocs}/langs/zh_CN/link.lang            |   0
 {public => htdocs}/langs/zh_CN/loan.lang            |   0
 {public => htdocs}/langs/zh_CN/mailmanspip.lang     |   0
 {public => htdocs}/langs/zh_CN/mails.lang           |   0
 {public => htdocs}/langs/zh_CN/main.lang            |   0
 {public => htdocs}/langs/zh_CN/margins.lang         |   0
 {public => htdocs}/langs/zh_CN/members.lang         |   0
 {public => htdocs}/langs/zh_CN/oauth.lang           |   0
 {public => htdocs}/langs/zh_CN/opensurvey.lang      |   0
 {public => htdocs}/langs/zh_CN/orders.lang          |   0
 {public => htdocs}/langs/zh_CN/other.lang           |   0
 {public => htdocs}/langs/zh_CN/paybox.lang          |   0
 {public => htdocs}/langs/zh_CN/paypal.lang          |   0
 {public => htdocs}/langs/zh_CN/printing.lang        |   0
 {public => htdocs}/langs/zh_CN/productbatch.lang    |   0
 {public => htdocs}/langs/zh_CN/products.lang        |   0
 {public => htdocs}/langs/zh_CN/projects.lang        |   0
 {public => htdocs}/langs/zh_CN/propal.lang          |   0
 {public => htdocs}/langs/zh_CN/receiptprinter.lang  |   0
 {public => htdocs}/langs/zh_CN/resource.lang        |   0
 {public => htdocs}/langs/zh_CN/salaries.lang        |   0
 {public => htdocs}/langs/zh_CN/sendings.lang        |   0
 {public => htdocs}/langs/zh_CN/sms.lang             |   0
 {public => htdocs}/langs/zh_CN/stocks.lang          |   0
 .../langs/zh_CN/supplier_proposal.lang              |   0
 {public => htdocs}/langs/zh_CN/suppliers.lang       |   0
 {public => htdocs}/langs/zh_CN/trips.lang           |   0
 {public => htdocs}/langs/zh_CN/users.lang           |   0
 {public => htdocs}/langs/zh_CN/website.lang         |   0
 {public => htdocs}/langs/zh_CN/withdrawals.lang     |   0
 {public => htdocs}/langs/zh_CN/workflow.lang        |   0
 {public => htdocs}/langs/zh_TW/accountancy.lang     |   0
 {public => htdocs}/langs/zh_TW/admin.lang           |   0
 {public => htdocs}/langs/zh_TW/agenda.lang          |   0
 {public => htdocs}/langs/zh_TW/banks.lang           |   0
 {public => htdocs}/langs/zh_TW/bills.lang           |   0
 {public => htdocs}/langs/zh_TW/bookmarks.lang       |   0
 {public => htdocs}/langs/zh_TW/boxes.lang           |   0
 {public => htdocs}/langs/zh_TW/cashdesk.lang        |   0
 {public => htdocs}/langs/zh_TW/categories.lang      |   0
 {public => htdocs}/langs/zh_TW/commercial.lang      |   0
 {public => htdocs}/langs/zh_TW/companies.lang       |   0
 {public => htdocs}/langs/zh_TW/compta.lang          |   0
 {public => htdocs}/langs/zh_TW/contracts.lang       |   0
 {public => htdocs}/langs/zh_TW/cron.lang            |   0
 {public => htdocs}/langs/zh_TW/deliveries.lang      |   0
 {public => htdocs}/langs/zh_TW/dict.lang            |   0
 {public => htdocs}/langs/zh_TW/donations.lang       |   0
 {public => htdocs}/langs/zh_TW/ecm.lang             |   0
 {public => htdocs}/langs/zh_TW/errors.lang          |   0
 {public => htdocs}/langs/zh_TW/exports.lang         |   0
 {public => htdocs}/langs/zh_TW/externalsite.lang    |   0
 {public => htdocs}/langs/zh_TW/ftp.lang             |   0
 {public => htdocs}/langs/zh_TW/help.lang            |   0
 {public => htdocs}/langs/zh_TW/holiday.lang         |   0
 {public => htdocs}/langs/zh_TW/hrm.lang             |   0
 {public => htdocs}/langs/zh_TW/incoterm.lang        |   0
 {public => htdocs}/langs/zh_TW/install.lang         |   0
 {public => htdocs}/langs/zh_TW/interventions.lang   |   0
 {public => htdocs}/langs/zh_TW/languages.lang       |   0
 {public => htdocs}/langs/zh_TW/ldap.lang            |   0
 {public => htdocs}/langs/zh_TW/link.lang            |   0
 {public => htdocs}/langs/zh_TW/loan.lang            |   0
 {public => htdocs}/langs/zh_TW/mailmanspip.lang     |   0
 {public => htdocs}/langs/zh_TW/mails.lang           |   0
 {public => htdocs}/langs/zh_TW/main.lang            |   0
 {public => htdocs}/langs/zh_TW/margins.lang         |   0
 {public => htdocs}/langs/zh_TW/members.lang         |   0
 {public => htdocs}/langs/zh_TW/oauth.lang           |   0
 {public => htdocs}/langs/zh_TW/opensurvey.lang      |   0
 {public => htdocs}/langs/zh_TW/orders.lang          |   0
 {public => htdocs}/langs/zh_TW/other.lang           |   0
 {public => htdocs}/langs/zh_TW/paybox.lang          |   0
 {public => htdocs}/langs/zh_TW/paypal.lang          |   0
 {public => htdocs}/langs/zh_TW/printing.lang        |   0
 {public => htdocs}/langs/zh_TW/productbatch.lang    |   0
 {public => htdocs}/langs/zh_TW/products.lang        |   0
 {public => htdocs}/langs/zh_TW/projects.lang        |   0
 {public => htdocs}/langs/zh_TW/propal.lang          |   0
 {public => htdocs}/langs/zh_TW/receiptprinter.lang  |   0
 {public => htdocs}/langs/zh_TW/resource.lang        |   0
 {public => htdocs}/langs/zh_TW/salaries.lang        |   0
 {public => htdocs}/langs/zh_TW/sendings.lang        |   0
 {public => htdocs}/langs/zh_TW/sms.lang             |   0
 {public => htdocs}/langs/zh_TW/stocks.lang          |   0
 .../langs/zh_TW/supplier_proposal.lang              |   0
 {public => htdocs}/langs/zh_TW/suppliers.lang       |   0
 {public => htdocs}/langs/zh_TW/trips.lang           |   0
 {public => htdocs}/langs/zh_TW/users.lang           |   0
 {public => htdocs}/langs/zh_TW/website.lang         |   0
 {public => htdocs}/langs/zh_TW/withdrawals.lang     |   0
 {public => htdocs}/langs/zh_TW/workflow.lang        |   0
 {public => htdocs}/livraison/card.php               |   0
 {public => htdocs}/livraison/class/index.html       |   0
 .../livraison/class/livraison.class.php             |   0
 {public => htdocs}/livraison/index.html             |   0
 {public => htdocs}/loan/calc.php                    |   0
 {public => htdocs}/loan/card.php                    |   0
 {public => htdocs}/loan/class/index.html            |   0
 {public => htdocs}/loan/class/loan.class.php        |   0
 {public => htdocs}/loan/class/paymentloan.class.php |   0
 {public => htdocs}/loan/document.php                |   0
 {public => htdocs}/loan/index.html                  |   0
 {public => htdocs}/loan/index.php                   |   0
 {public => htdocs}/loan/info.php                    |   0
 {public => htdocs}/loan/note.php                    |   0
 {public => htdocs}/loan/payment/card.php            |   0
 {public => htdocs}/loan/payment/index.html          |   0
 {public => htdocs}/loan/payment/payment.php         |   0
 {public => htdocs}/mailmanspip/class/index.html     |   0
 .../mailmanspip/class/mailmanspip.class.php         |   0
 {public => htdocs}/mailmanspip/index.html           |   0
 {public => htdocs}/main.inc.php                     |   0
 {public => htdocs}/margin/admin/index.html          |   0
 {public => htdocs}/margin/admin/margin.php          |   0
 {public => htdocs}/margin/agentMargins.php          |   0
 {public => htdocs}/margin/checkMargins.php          |   0
 {public => htdocs}/margin/customerMargins.php       |   0
 {public => htdocs}/margin/index.php                 |   0
 {public => htdocs}/margin/lib/index.html            |   0
 {public => htdocs}/margin/lib/margins.lib.php       |   0
 {public => htdocs}/margin/productMargins.php        |   0
 {public => htdocs}/margin/tabs/index.html           |   0
 {public => htdocs}/margin/tabs/productMargins.php   |   0
 .../margin/tabs/thirdpartyMargins.php               |   0
 {public => htdocs}/master.inc.php                   |   0
 .../multicurrency/class/multicurrency.class.php     |   0
 {public => htdocs}/opensurvey/card.php              |   0
 {public => htdocs}/opensurvey/class/index.html      |   0
 .../opensurvey/class/opensurveysondage.class.php    |   0
 {public => htdocs}/opensurvey/css/index.html        |   0
 {public => htdocs}/opensurvey/css/style.css         |   0
 {public => htdocs}/opensurvey/exportcsv.php         |   0
 {public => htdocs}/opensurvey/fonctions.php         |   0
 {public => htdocs}/opensurvey/img/accept-24.png     | Bin
 {public => htdocs}/opensurvey/img/accept.png        | Bin
 {public => htdocs}/opensurvey/img/add-16.png        | Bin
 {public => htdocs}/opensurvey/img/add-24.png        | Bin
 {public => htdocs}/opensurvey/img/calendar-32.png   | Bin
 {public => htdocs}/opensurvey/img/chart-32.png      | Bin
 {public => htdocs}/opensurvey/img/date.png          | Bin
 {public => htdocs}/opensurvey/img/fforward.png      | Bin
 {public => htdocs}/opensurvey/img/index.html        |   0
 {public => htdocs}/opensurvey/img/medaille.png      | Bin
 {public => htdocs}/opensurvey/img/next.png          | Bin
 .../opensurvey/img/object_opensurvey.png            | Bin
 {public => htdocs}/opensurvey/img/opensurvey.png    | Bin
 {public => htdocs}/opensurvey/img/previous.png      | Bin
 {public => htdocs}/opensurvey/img/rewind.png        | Bin
 {public => htdocs}/opensurvey/img/sondage2.png      | Bin
 {public => htdocs}/opensurvey/index.php             |   0
 {public => htdocs}/opensurvey/list.php              |   0
 {public => htdocs}/opensurvey/results.php           |   0
 .../opensurvey/wizard/choix_autre.php               |   0
 {public => htdocs}/opensurvey/wizard/choix_date.php |   0
 .../opensurvey/wizard/create_survey.php             |   0
 {public => htdocs}/opensurvey/wizard/index.php      |   0
 {public => htdocs}/paybox/admin/index.html          |   0
 {public => htdocs}/paybox/admin/paybox.php          |   0
 {public => htdocs}/paybox/img/index.html            |   0
 {public => htdocs}/paybox/img/object_paybox.png     | Bin
 {public => htdocs}/paybox/index.html                |   0
 {public => htdocs}/paybox/lib/index.html            |   0
 {public => htdocs}/paybox/lib/paybox.lib.php        |   0
 {public => htdocs}/paypal/admin/index.html          |   0
 {public => htdocs}/paypal/admin/paypal.php          |   0
 {public => htdocs}/paypal/img/index.html            |   0
 {public => htdocs}/paypal/img/object_paypal.png     | Bin
 {public => htdocs}/paypal/index.html                |   0
 {public => htdocs}/paypal/lib/index.html            |   0
 {public => htdocs}/paypal/lib/paypal.lib.php        |   0
 .../paypal/lib/paypalfunctions.lib.php              |   0
 {public => htdocs}/printing/admin/index.html        |   0
 {public => htdocs}/printing/admin/printing.php      |   0
 {public => htdocs}/printing/index.php               |   0
 {public => htdocs}/printing/lib/index.html          |   0
 {public => htdocs}/printing/lib/printing.lib.php    |   0
 {public => htdocs}/product/admin/dynamic_prices.php |   0
 {public => htdocs}/product/admin/index.html         |   0
 {public => htdocs}/product/admin/price_rules.php    |   0
 {public => htdocs}/product/admin/product.php        |   0
 .../product/admin/product_extrafields.php           |   0
 .../product/admin/product_lot_extrafields.php       |   0
 {public => htdocs}/product/admin/product_tools.php  |   0
 {public => htdocs}/product/ajax/index.html          |   0
 {public => htdocs}/product/ajax/products.php        |   0
 {public => htdocs}/product/canvas/index.html        |   0
 .../canvas/product/actions_card_product.class.php   |   0
 .../product/canvas/product/index.html               |   0
 .../product/canvas/product/tpl/card_create.tpl.php  |   0
 .../product/canvas/product/tpl/card_edit.tpl.php    |   0
 .../product/canvas/product/tpl/card_view.tpl.php    |   0
 .../product/canvas/product/tpl/index.html           |   0
 .../product/canvas/product/tpl/list.tpl.php         |   0
 .../canvas/service/actions_card_service.class.php   |   0
 .../product/canvas/service/index.html               |   0
 .../product/canvas/service/tpl/card_create.tpl.php  |   0
 .../product/canvas/service/tpl/card_edit.tpl.php    |   0
 .../product/canvas/service/tpl/card_view.tpl.php    |   0
 .../product/canvas/service/tpl/index.html           |   0
 .../product/canvas/service/tpl/list.tpl.php         |   0
 {public => htdocs}/product/card.php                 |   0
 .../product/class/api_deprecated_product.class.php  |   0
 .../product/class/api_products.class.php            |   0
 .../product/class/html.formproduct.class.php        |   0
 {public => htdocs}/product/class/index.html         |   0
 {public => htdocs}/product/class/product.class.php  |   0
 .../product/class/productbatch.class.php            |   0
 .../product/class/productcustomerprice.class.php    |   0
 .../product/class/propalmergepdfproduct.class.php   |   0
 {public => htdocs}/product/class/service.class.php  |   0
 {public => htdocs}/product/composition/card.php     |   0
 {public => htdocs}/product/composition/index.html   |   0
 {public => htdocs}/product/document.php             |   0
 .../dynamic_price/class/price_expression.class.php  |   0
 .../class/price_global_variable.class.php           |   0
 .../class/price_global_variable_updater.class.php   |   0
 .../dynamic_price/class/price_parser.class.php      |   0
 {public => htdocs}/product/dynamic_price/editor.php |   0
 {public => htdocs}/product/fournisseurs.php         |   0
 {public => htdocs}/product/index.php                |   0
 {public => htdocs}/product/info.php                 |   0
 {public => htdocs}/product/list.php                 |   0
 {public => htdocs}/product/note.php                 |   0
 {public => htdocs}/product/popuprop.php             |   0
 {public => htdocs}/product/price.php                |   0
 {public => htdocs}/product/reassort.php             |   0
 {public => htdocs}/product/reassortlot.php          |   0
 {public => htdocs}/product/stats/card.php           |   0
 {public => htdocs}/product/stats/commande.php       |   0
 .../product/stats/commande_fournisseur.php          |   0
 {public => htdocs}/product/stats/contrat.php        |   0
 {public => htdocs}/product/stats/facture.php        |   0
 .../product/stats/facture_fournisseur.php           |   0
 {public => htdocs}/product/stats/index.html         |   0
 {public => htdocs}/product/stats/propal.php         |   0
 {public => htdocs}/product/stock/card.php           |   0
 .../stock/class/api_stockmovements.class.php        |   0
 .../product/stock/class/api_warehouses.class.php    |   0
 .../product/stock/class/entrepot.class.php          |   0
 {public => htdocs}/product/stock/class/index.html   |   0
 .../product/stock/class/mouvementstock.class.php    |   0
 .../product/stock/class/productlot.class.php        |   0
 .../stock/class/productstockentrepot.class.php      |   0
 {public => htdocs}/product/stock/fiche-valo.php     |   0
 {public => htdocs}/product/stock/img/index.html     |   0
 {public => htdocs}/product/stock/img/no.png         | Bin
 {public => htdocs}/product/stock/img/yes.png        | Bin
 {public => htdocs}/product/stock/index.php          |   0
 {public => htdocs}/product/stock/info.php           |   0
 {public => htdocs}/product/stock/lib/index.html     |   0
 .../product/stock/lib/replenishment.lib.php         |   0
 {public => htdocs}/product/stock/list.php           |   0
 {public => htdocs}/product/stock/massstockmove.php  |   0
 {public => htdocs}/product/stock/mouvement.php      |   0
 {public => htdocs}/product/stock/product.php        |   0
 .../product/stock/productlot_card.php               |   0
 .../product/stock/productlot_list.php               |   0
 {public => htdocs}/product/stock/replenish.php      |   0
 .../product/stock/replenishorders.php               |   0
 .../product/stock/tpl/stockcorrection.tpl.php       |   0
 .../product/stock/tpl/stocktransfer.tpl.php         |   0
 {public => htdocs}/product/stock/valo.php           |   0
 {public => htdocs}/product/traduction.php           |   0
 {public => htdocs}/projet/activity/index.php        |   0
 {public => htdocs}/projet/activity/perday.php       |   0
 {public => htdocs}/projet/activity/perweek.php      |   0
 {public => htdocs}/projet/admin/index.html          |   0
 {public => htdocs}/projet/admin/project.php         |   0
 .../projet/admin/project_extrafields.php            |   0
 .../projet/admin/project_task_extrafields.php       |   0
 {public => htdocs}/projet/ajax/projects.php         |   0
 {public => htdocs}/projet/card.php                  |   0
 .../projet/class/api_projects.class.php             |   0
 {public => htdocs}/projet/class/api_tasks.class.php |   0
 {public => htdocs}/projet/class/index.html          |   0
 {public => htdocs}/projet/class/project.class.php   |   0
 .../projet/class/projectstats.class.php             |   0
 {public => htdocs}/projet/class/task.class.php      |   0
 {public => htdocs}/projet/contact.php               |   0
 {public => htdocs}/projet/document.php              |   0
 {public => htdocs}/projet/element.php               |   0
 {public => htdocs}/projet/ganttchart.inc.php        |   0
 {public => htdocs}/projet/ganttview.php             |   0
 .../projet/graph_opportunities.inc.php              |   0
 {public => htdocs}/projet/index.php                 |   0
 {public => htdocs}/projet/info.php                  |   0
 {public => htdocs}/projet/jsgantt_language.js.php   |   0
 {public => htdocs}/projet/list.php                  |   0
 {public => htdocs}/projet/note.php                  |   0
 {public => htdocs}/projet/stats/index.php           |   0
 {public => htdocs}/projet/tasks.php                 |   0
 {public => htdocs}/projet/tasks/contact.php         |   0
 {public => htdocs}/projet/tasks/document.php        |   0
 {public => htdocs}/projet/tasks/list.php            |   0
 {public => htdocs}/projet/tasks/note.php            |   0
 {public => htdocs}/projet/tasks/task.php            |   0
 {public => htdocs}/projet/tasks/time.php            |   0
 {public => htdocs}/public/agenda/agendaexport.php   |   0
 {public => htdocs}/public/agenda/index.php          |   0
 {public => htdocs}/public/cron/cron_run_jobs.php    |   0
 {public => htdocs}/public/cron/index.html           |   0
 .../public/demo/dolibarr_screenshot2.png            | Bin
 .../public/demo/dolibarr_screenshot6.png            | Bin
 .../public/demo/dolibarr_screenshot8.png            | Bin
 .../public/demo/dolibarr_screenshot9.png            | Bin
 {public => htdocs}/public/demo/index.php            |   0
 .../public/donations/donateurs_code.php             |   0
 {public => htdocs}/public/donations/index.php       |   0
 {public => htdocs}/public/emailing/index.html       |   0
 {public => htdocs}/public/emailing/mailing-read.php |   0
 .../public/emailing/mailing-unsubscribe.php         |   0
 {public => htdocs}/public/error-401.php             |   0
 {public => htdocs}/public/error-404.php             |   0
 {public => htdocs}/public/index.php                 |   0
 {public => htdocs}/public/members/index.php         |   0
 {public => htdocs}/public/members/new.php           |   0
 {public => htdocs}/public/members/public_card.php   |   0
 {public => htdocs}/public/members/public_list.php   |   0
 {public => htdocs}/public/notice.php                |   0
 {public => htdocs}/public/opensurvey/index.html     |   0
 {public => htdocs}/public/opensurvey/studs.php      |   0
 {public => htdocs}/public/paybox/index.php          |   0
 {public => htdocs}/public/paybox/newpayment.php     |   0
 {public => htdocs}/public/paybox/paymentko.php      |   0
 {public => htdocs}/public/paybox/paymentok.php      |   0
 {public => htdocs}/public/paypal/index.php          |   0
 {public => htdocs}/public/paypal/newpayment.php     |   0
 {public => htdocs}/public/paypal/paymentko.php      |   0
 {public => htdocs}/public/paypal/paymentok.php      |   0
 {public => htdocs}/public/test/test_arrays.php      |   0
 {public => htdocs}/public/test/test_forms.php       |   0
 {public => htdocs}/public/theme/common/index.php    |   0
 {public => htdocs}/public/theme/common/nophoto.png  | Bin
 .../public/theme/common/user_anonymous.png          | Bin
 {public => htdocs}/public/theme/common/user_man.png | Bin
 .../public/theme/common/user_woman.png              | Bin
 {public => htdocs}/public/theme/index.php           |   0
 {public => htdocs}/public/websites/index.php        |   0
 {public => htdocs}/public/websites/styles.css.php   |   0
 {public => htdocs}/resource/add.php                 |   0
 {public => htdocs}/resource/card.php                |   0
 .../resource/class/dolresource.class.php            |   0
 .../resource/class/html.formresource.class.php      |   0
 {public => htdocs}/resource/class/index.html        |   0
 {public => htdocs}/resource/contact.php             |   0
 {public => htdocs}/resource/document.php            |   0
 {public => htdocs}/resource/element_resource.php    |   0
 {public => htdocs}/resource/index.html              |   0
 {public => htdocs}/resource/list.php                |   0
 {public => htdocs}/resource/note.php                |   0
 {public => htdocs}/robots.txt                       |   0
 .../societe/admin/contact_extrafields.php           |   0
 {public => htdocs}/societe/admin/societe.php        |   0
 .../societe/admin/societe_extrafields.php           |   0
 {public => htdocs}/societe/agenda.php               |   0
 {public => htdocs}/societe/ajax/company.php         |   0
 {public => htdocs}/societe/ajax/index.html          |   0
 {public => htdocs}/societe/ajaxcompanies.php        |   0
 {public => htdocs}/societe/ajaxcountries.php        |   0
 {public => htdocs}/societe/canvas/README            |   0
 .../societe/canvas/actions_card_common.class.php    |   0
 .../canvas/company/actions_card_company.class.php   |   0
 .../societe/canvas/company/index.html               |   0
 .../societe/canvas/company/tpl/card_create.tpl.php  |   0
 .../societe/canvas/company/tpl/card_edit.tpl.php    |   0
 .../societe/canvas/company/tpl/card_view.tpl.php    |   0
 .../societe/canvas/company/tpl/index.html           |   0
 {public => htdocs}/societe/canvas/index.html        |   0
 .../individual/actions_card_individual.class.php    |   0
 .../societe/canvas/individual/index.html            |   0
 .../canvas/individual/tpl/card_create.tpl.php       |   0
 .../societe/canvas/individual/tpl/card_edit.tpl.php |   0
 .../societe/canvas/individual/tpl/card_view.tpl.php |   0
 .../societe/canvas/individual/tpl/index.html        |   0
 .../societe/checkvat/checkVatPopup.php              |   0
 .../societe/checkvat/checkVatService.xml            |   0
 {public => htdocs}/societe/checkvat/index.html      |   0
 {public => htdocs}/societe/class/address.class.php  |   0
 .../societe/class/api_contacts.class.php            |   0
 .../societe/class/api_deprecated_contact.class.php  |   0
 .../class/api_deprecated_thirdparty.class.php       |   0
 .../societe/class/api_thirdparties.class.php        |   0
 {public => htdocs}/societe/class/client.class.php   |   0
 .../societe/class/companybankaccount.class.php      |   0
 {public => htdocs}/societe/class/index.html         |   0
 {public => htdocs}/societe/class/societe.class.php  |   0
 {public => htdocs}/societe/commerciaux.php          |   0
 {public => htdocs}/societe/consumption.php          |   0
 {public => htdocs}/societe/document.php             |   0
 {public => htdocs}/societe/index.php                |   0
 {public => htdocs}/societe/list.php                 |   0
 {public => htdocs}/societe/note.php                 |   0
 {public => htdocs}/societe/notify/card.php          |   0
 {public => htdocs}/societe/notify/index.php         |   0
 {public => htdocs}/societe/price.php                |   0
 {public => htdocs}/societe/project.php              |   0
 {public => htdocs}/societe/rib.php                  |   0
 {public => htdocs}/societe/soc.php                  |   0
 {public => htdocs}/societe/societecontact.php       |   0
 {public => htdocs}/societe/tpl/index.html           |   0
 .../societe/tpl/linesalesrepresentative.tpl.php     |   0
 .../admin/supplier_proposal_extrafields.php         |   0
 .../admin/supplier_proposaldet_extrafields.php      |   0
 {public => htdocs}/supplier_proposal/card.php       |   0
 .../supplier_proposal/class/index.html              |   0
 .../class/supplier_proposal.class.php               |   0
 {public => htdocs}/supplier_proposal/document.php   |   0
 {public => htdocs}/supplier_proposal/index.php      |   0
 {public => htdocs}/supplier_proposal/info.php       |   0
 {public => htdocs}/supplier_proposal/list.php       |   0
 {public => htdocs}/supplier_proposal/note.php       |   0
 {public => htdocs}/supplier_proposal/tpl/index.html |   0
 .../supplier_proposal/tpl/linkedobjectblock.tpl.php |   0
 {public => htdocs}/support/background.png           | Bin
 {public => htdocs}/support/default.css              |   0
 {public => htdocs}/support/helpcenter.png           | Bin
 {public => htdocs}/support/inc.php                  |   0
 {public => htdocs}/support/index.php                |   0
 {public => htdocs}/support/internet.png             | Bin
 {public => htdocs}/support/mail.png                 | Bin
 {public => htdocs}/support/online.php               |   0
 {public => htdocs}/support/pagemaster.png           | Bin
 {public => htdocs}/support/redstar.png              | Bin
 {public => htdocs}/support/star.png                 | Bin
 {public => htdocs}/support/who.png                  | Bin
 {public => htdocs}/theme/.gitignore                 |   0
 {public => htdocs}/theme/common/colorpicker.png     | Bin
 .../theme/common/devices/audio-card.png             | Bin
 .../theme/common/devices/audio-headset.png          | Bin
 .../theme/common/devices/audio-input-line.png       | Bin
 .../theme/common/devices/audio-input-microphone.png | Bin
 {public => htdocs}/theme/common/devices/battery.png | Bin
 .../theme/common/devices/camera-photo.png           | Bin
 .../theme/common/devices/camera-web.png             | Bin
 .../theme/common/devices/computer-laptop.png        | Bin
 .../theme/common/devices/computer.png               | Bin
 {public => htdocs}/theme/common/devices/cpu.png     | Bin
 .../theme/common/devices/drive-harddisk.png         | Bin
 .../theme/common/devices/drive-optical.png          | Bin
 .../devices/drive-removable-media-usb-pendrive.png  | Bin
 .../common/devices/drive-removable-media-usb.png    | Bin
 .../theme/common/devices/drive-removable-media.png  | Bin
 {public => htdocs}/theme/common/devices/index.html  |   0
 .../theme/common/devices/input-gaming.png           | Bin
 .../theme/common/devices/input-keyboard.png         | Bin
 .../theme/common/devices/input-mouse.png            | Bin
 .../theme/common/devices/input-tablet.png           | Bin
 .../common/devices/media-flash-memory-stick.png     | Bin
 .../theme/common/devices/media-flash-sd-mmc.png     | Bin
 .../common/devices/media-flash-smart-media.png      | Bin
 .../theme/common/devices/media-flash.png            | Bin
 .../theme/common/devices/media-floppy.png           | Bin
 .../theme/common/devices/media-optical-audio.png    | Bin
 .../theme/common/devices/media-optical-blu-ray.png  | Bin
 .../theme/common/devices/media-optical-data.png     | Bin
 .../common/devices/media-optical-dvd-video.png      | Bin
 .../theme/common/devices/media-optical-dvd.png      | Bin
 .../theme/common/devices/media-optical-mixed-cd.png | Bin
 .../common/devices/media-optical-recordable.png     | Bin
 .../theme/common/devices/media-optical-video.png    | Bin
 .../theme/common/devices/media-optical.png          | Bin
 .../theme/common/devices/media-tape.png             | Bin
 {public => htdocs}/theme/common/devices/modem.png   | Bin
 .../common/devices/multimedia-player-apple-ipod.png | Bin
 .../theme/common/devices/multimedia-player.png      | Bin
 .../theme/common/devices/network-wired.png          | Bin
 .../devices/network-wireless-connected-00.png       | Bin
 .../devices/network-wireless-connected-100.png      | Bin
 .../devices/network-wireless-connected-25.png       | Bin
 .../devices/network-wireless-connected-50.png       | Bin
 .../devices/network-wireless-connected-75.png       | Bin
 .../devices/network-wireless-disconnected.png       | Bin
 .../theme/common/devices/network-wireless.png       | Bin
 {public => htdocs}/theme/common/devices/pda.png     | Bin
 .../common/devices/phone-openmoko-freerunner.png    | Bin
 {public => htdocs}/theme/common/devices/phone.png   | Bin
 .../theme/common/devices/printer-laser.png          | Bin
 {public => htdocs}/theme/common/devices/printer.png | Bin
 {public => htdocs}/theme/common/devices/scanner.png | Bin
 .../theme/common/devices/video-display.png          | Bin
 .../theme/common/devices/video-projector.png        | Bin
 .../theme/common/devices/video-television.png       | Bin
 {public => htdocs}/theme/common/dolibarr_box.png    | Bin
 .../theme/common/dolibarr_logo_bw.png               | Bin
 {public => htdocs}/theme/common/dolistore.jpg       | Bin
 .../theme/common/emotes/face-angel.png              | Bin
 .../theme/common/emotes/face-embarrassed.png        | Bin
 .../theme/common/emotes/face-kiss.png               | Bin
 .../theme/common/emotes/face-laugh.png              | Bin
 .../theme/common/emotes/face-plain.png              | Bin
 .../theme/common/emotes/face-raspberry.png          | Bin
 {public => htdocs}/theme/common/emotes/face-sad.png | Bin
 .../theme/common/emotes/face-smile-big.png          | Bin
 .../theme/common/emotes/face-smile.png              | Bin
 .../theme/common/emotes/face-surprise.png           | Bin
 .../theme/common/emotes/face-uncertain.png          | Bin
 .../theme/common/emotes/face-wink.png               | Bin
 {public => htdocs}/theme/common/emotes/index.html   |   0
 {public => htdocs}/theme/common/flags/ad.png        | Bin
 {public => htdocs}/theme/common/flags/ae.png        | Bin
 {public => htdocs}/theme/common/flags/af.png        | Bin
 {public => htdocs}/theme/common/flags/ag.png        | Bin
 {public => htdocs}/theme/common/flags/ai.png        | Bin
 {public => htdocs}/theme/common/flags/al.png        | Bin
 {public => htdocs}/theme/common/flags/am.png        | Bin
 {public => htdocs}/theme/common/flags/an.png        | Bin
 {public => htdocs}/theme/common/flags/ao.png        | Bin
 {public => htdocs}/theme/common/flags/ar.png        | Bin
 {public => htdocs}/theme/common/flags/as.png        | Bin
 {public => htdocs}/theme/common/flags/at.png        | Bin
 {public => htdocs}/theme/common/flags/au.png        | Bin
 {public => htdocs}/theme/common/flags/aw.png        | Bin
 {public => htdocs}/theme/common/flags/ax.png        | Bin
 {public => htdocs}/theme/common/flags/az.png        | Bin
 {public => htdocs}/theme/common/flags/ba.png        | Bin
 {public => htdocs}/theme/common/flags/bb.png        | Bin
 {public => htdocs}/theme/common/flags/bd.png        | Bin
 {public => htdocs}/theme/common/flags/be.png        | Bin
 {public => htdocs}/theme/common/flags/bf.png        | Bin
 {public => htdocs}/theme/common/flags/bg.png        | Bin
 {public => htdocs}/theme/common/flags/bh.png        | Bin
 {public => htdocs}/theme/common/flags/bi.png        | Bin
 {public => htdocs}/theme/common/flags/bj.png        | Bin
 {public => htdocs}/theme/common/flags/bm.png        | Bin
 {public => htdocs}/theme/common/flags/bn.png        | Bin
 {public => htdocs}/theme/common/flags/bo.png        | Bin
 {public => htdocs}/theme/common/flags/br.png        | Bin
 {public => htdocs}/theme/common/flags/bs.png        | Bin
 {public => htdocs}/theme/common/flags/bt.png        | Bin
 {public => htdocs}/theme/common/flags/bv.png        | Bin
 {public => htdocs}/theme/common/flags/bw.png        | Bin
 {public => htdocs}/theme/common/flags/by.png        | Bin
 {public => htdocs}/theme/common/flags/bz.png        | Bin
 {public => htdocs}/theme/common/flags/ca.png        | Bin
 {public => htdocs}/theme/common/flags/catalonia.png | Bin
 {public => htdocs}/theme/common/flags/cc.png        | Bin
 {public => htdocs}/theme/common/flags/cd.png        | Bin
 {public => htdocs}/theme/common/flags/cf.png        | Bin
 {public => htdocs}/theme/common/flags/cg.png        | Bin
 {public => htdocs}/theme/common/flags/ch.png        | Bin
 {public => htdocs}/theme/common/flags/ci.png        | Bin
 {public => htdocs}/theme/common/flags/ck.png        | Bin
 {public => htdocs}/theme/common/flags/cl.png        | Bin
 {public => htdocs}/theme/common/flags/cm.png        | Bin
 {public => htdocs}/theme/common/flags/cn.png        | Bin
 {public => htdocs}/theme/common/flags/co.png        | Bin
 {public => htdocs}/theme/common/flags/cr.png        | Bin
 {public => htdocs}/theme/common/flags/cs.png        | Bin
 {public => htdocs}/theme/common/flags/cu.png        | Bin
 {public => htdocs}/theme/common/flags/cv.png        | Bin
 {public => htdocs}/theme/common/flags/cx.png        | Bin
 {public => htdocs}/theme/common/flags/cy.png        | Bin
 {public => htdocs}/theme/common/flags/cz.png        | Bin
 {public => htdocs}/theme/common/flags/de.png        | Bin
 {public => htdocs}/theme/common/flags/dj.png        | Bin
 {public => htdocs}/theme/common/flags/dk.png        | Bin
 {public => htdocs}/theme/common/flags/dm.png        | Bin
 {public => htdocs}/theme/common/flags/do.png        | Bin
 {public => htdocs}/theme/common/flags/dz.png        | Bin
 {public => htdocs}/theme/common/flags/ec.png        | Bin
 {public => htdocs}/theme/common/flags/ee.png        | Bin
 {public => htdocs}/theme/common/flags/eg.png        | Bin
 {public => htdocs}/theme/common/flags/eh.png        | Bin
 {public => htdocs}/theme/common/flags/en.png        | Bin
 {public => htdocs}/theme/common/flags/england.png   | Bin
 {public => htdocs}/theme/common/flags/er.png        | Bin
 {public => htdocs}/theme/common/flags/es.png        | Bin
 {public => htdocs}/theme/common/flags/et.png        | Bin
 {public => htdocs}/theme/common/flags/eu.png        | Bin
 {public => htdocs}/theme/common/flags/fam.png       | Bin
 {public => htdocs}/theme/common/flags/fi.png        | Bin
 {public => htdocs}/theme/common/flags/fj.png        | Bin
 {public => htdocs}/theme/common/flags/fk.png        | Bin
 {public => htdocs}/theme/common/flags/fm.png        | Bin
 {public => htdocs}/theme/common/flags/fo.png        | Bin
 {public => htdocs}/theme/common/flags/fr.png        | Bin
 {public => htdocs}/theme/common/flags/ga.png        | Bin
 {public => htdocs}/theme/common/flags/gb.png        | Bin
 {public => htdocs}/theme/common/flags/gd.png        | Bin
 {public => htdocs}/theme/common/flags/ge.png        | Bin
 {public => htdocs}/theme/common/flags/gf.png        | Bin
 {public => htdocs}/theme/common/flags/gg.png        | Bin
 {public => htdocs}/theme/common/flags/gh.png        | Bin
 {public => htdocs}/theme/common/flags/gi.png        | Bin
 {public => htdocs}/theme/common/flags/gl.png        | Bin
 {public => htdocs}/theme/common/flags/gm.png        | Bin
 {public => htdocs}/theme/common/flags/gn.png        | Bin
 {public => htdocs}/theme/common/flags/gp.png        | Bin
 {public => htdocs}/theme/common/flags/gq.png        | Bin
 {public => htdocs}/theme/common/flags/gr.png        | Bin
 {public => htdocs}/theme/common/flags/gs.png        | Bin
 {public => htdocs}/theme/common/flags/gt.png        | Bin
 {public => htdocs}/theme/common/flags/gu.png        | Bin
 {public => htdocs}/theme/common/flags/gw.png        | Bin
 {public => htdocs}/theme/common/flags/gy.png        | Bin
 {public => htdocs}/theme/common/flags/hk.png        | Bin
 {public => htdocs}/theme/common/flags/hm.png        | Bin
 {public => htdocs}/theme/common/flags/hn.png        | Bin
 {public => htdocs}/theme/common/flags/hr.png        | Bin
 {public => htdocs}/theme/common/flags/ht.png        | Bin
 {public => htdocs}/theme/common/flags/hu.png        | Bin
 {public => htdocs}/theme/common/flags/id.png        | Bin
 {public => htdocs}/theme/common/flags/ie.png        | Bin
 {public => htdocs}/theme/common/flags/il.png        | Bin
 {public => htdocs}/theme/common/flags/in.png        | Bin
 {public => htdocs}/theme/common/flags/index.html    |   0
 {public => htdocs}/theme/common/flags/int.png       | Bin
 {public => htdocs}/theme/common/flags/io.png        | Bin
 {public => htdocs}/theme/common/flags/iq.png        | Bin
 {public => htdocs}/theme/common/flags/ir.png        | Bin
 {public => htdocs}/theme/common/flags/is.png        | Bin
 {public => htdocs}/theme/common/flags/it.png        | Bin
 {public => htdocs}/theme/common/flags/jm.png        | Bin
 {public => htdocs}/theme/common/flags/jo.png        | Bin
 {public => htdocs}/theme/common/flags/jp.png        | Bin
 {public => htdocs}/theme/common/flags/ke.png        | Bin
 {public => htdocs}/theme/common/flags/kg.png        | Bin
 {public => htdocs}/theme/common/flags/kh.png        | Bin
 {public => htdocs}/theme/common/flags/ki.png        | Bin
 {public => htdocs}/theme/common/flags/km.png        | Bin
 {public => htdocs}/theme/common/flags/kn.png        | Bin
 {public => htdocs}/theme/common/flags/kp.png        | Bin
 {public => htdocs}/theme/common/flags/kr.png        | Bin
 {public => htdocs}/theme/common/flags/kw.png        | Bin
 {public => htdocs}/theme/common/flags/ky.png        | Bin
 {public => htdocs}/theme/common/flags/kz.png        | Bin
 {public => htdocs}/theme/common/flags/la.png        | Bin
 {public => htdocs}/theme/common/flags/lb.png        | Bin
 {public => htdocs}/theme/common/flags/lc.png        | Bin
 {public => htdocs}/theme/common/flags/li.png        | Bin
 {public => htdocs}/theme/common/flags/lk.png        | Bin
 {public => htdocs}/theme/common/flags/lr.png        | Bin
 {public => htdocs}/theme/common/flags/ls.png        | Bin
 {public => htdocs}/theme/common/flags/lt.png        | Bin
 {public => htdocs}/theme/common/flags/lu.png        | Bin
 {public => htdocs}/theme/common/flags/lv.png        | Bin
 {public => htdocs}/theme/common/flags/ly.png        | Bin
 {public => htdocs}/theme/common/flags/ma.png        | Bin
 {public => htdocs}/theme/common/flags/mc.png        | Bin
 {public => htdocs}/theme/common/flags/md.png        | Bin
 {public => htdocs}/theme/common/flags/me.png        | Bin
 {public => htdocs}/theme/common/flags/mg.png        | Bin
 {public => htdocs}/theme/common/flags/mh.png        | Bin
 {public => htdocs}/theme/common/flags/mk.png        | Bin
 {public => htdocs}/theme/common/flags/ml.png        | Bin
 {public => htdocs}/theme/common/flags/mm.png        | Bin
 {public => htdocs}/theme/common/flags/mn.png        | Bin
 {public => htdocs}/theme/common/flags/mo.png        | Bin
 {public => htdocs}/theme/common/flags/mp.png        | Bin
 {public => htdocs}/theme/common/flags/mq.png        | Bin
 {public => htdocs}/theme/common/flags/mr.png        | Bin
 {public => htdocs}/theme/common/flags/ms.png        | Bin
 {public => htdocs}/theme/common/flags/mt.png        | Bin
 {public => htdocs}/theme/common/flags/mu.png        | Bin
 {public => htdocs}/theme/common/flags/mv.png        | Bin
 {public => htdocs}/theme/common/flags/mw.png        | Bin
 {public => htdocs}/theme/common/flags/mx.png        | Bin
 {public => htdocs}/theme/common/flags/my.png        | Bin
 {public => htdocs}/theme/common/flags/mz.png        | Bin
 {public => htdocs}/theme/common/flags/na.png        | Bin
 {public => htdocs}/theme/common/flags/nc.png        | Bin
 {public => htdocs}/theme/common/flags/ne.png        | Bin
 {public => htdocs}/theme/common/flags/nf.png        | Bin
 {public => htdocs}/theme/common/flags/ng.png        | Bin
 {public => htdocs}/theme/common/flags/ni.png        | Bin
 {public => htdocs}/theme/common/flags/nl.png        | Bin
 {public => htdocs}/theme/common/flags/no.png        | Bin
 {public => htdocs}/theme/common/flags/np.png        | Bin
 {public => htdocs}/theme/common/flags/nr.png        | Bin
 {public => htdocs}/theme/common/flags/nu.png        | Bin
 {public => htdocs}/theme/common/flags/nz.png        | Bin
 {public => htdocs}/theme/common/flags/om.png        | Bin
 {public => htdocs}/theme/common/flags/pa.png        | Bin
 {public => htdocs}/theme/common/flags/pe.png        | Bin
 {public => htdocs}/theme/common/flags/pf.png        | Bin
 {public => htdocs}/theme/common/flags/pg.png        | Bin
 {public => htdocs}/theme/common/flags/ph.png        | Bin
 {public => htdocs}/theme/common/flags/pk.png        | Bin
 {public => htdocs}/theme/common/flags/pl.png        | Bin
 {public => htdocs}/theme/common/flags/pm.png        | Bin
 {public => htdocs}/theme/common/flags/pn.png        | Bin
 {public => htdocs}/theme/common/flags/pr.png        | Bin
 {public => htdocs}/theme/common/flags/ps.png        | Bin
 {public => htdocs}/theme/common/flags/pt.png        | Bin
 {public => htdocs}/theme/common/flags/pw.png        | Bin
 {public => htdocs}/theme/common/flags/py.png        | Bin
 {public => htdocs}/theme/common/flags/qa.png        | Bin
 {public => htdocs}/theme/common/flags/re.png        | Bin
 {public => htdocs}/theme/common/flags/ro.png        | Bin
 {public => htdocs}/theme/common/flags/rs.png        | Bin
 {public => htdocs}/theme/common/flags/ru.png        | Bin
 {public => htdocs}/theme/common/flags/rw.png        | Bin
 {public => htdocs}/theme/common/flags/sa.png        | Bin
 {public => htdocs}/theme/common/flags/sb.png        | Bin
 {public => htdocs}/theme/common/flags/sc.png        | Bin
 {public => htdocs}/theme/common/flags/scotland.png  | Bin
 {public => htdocs}/theme/common/flags/sd.png        | Bin
 {public => htdocs}/theme/common/flags/se.png        | Bin
 {public => htdocs}/theme/common/flags/sg.png        | Bin
 {public => htdocs}/theme/common/flags/sh.png        | Bin
 {public => htdocs}/theme/common/flags/si.png        | Bin
 {public => htdocs}/theme/common/flags/sj.png        | Bin
 {public => htdocs}/theme/common/flags/sk.png        | Bin
 {public => htdocs}/theme/common/flags/sl.png        | Bin
 {public => htdocs}/theme/common/flags/sm.png        | Bin
 {public => htdocs}/theme/common/flags/sn.png        | Bin
 {public => htdocs}/theme/common/flags/so.png        | Bin
 {public => htdocs}/theme/common/flags/sr.png        | Bin
 {public => htdocs}/theme/common/flags/st.png        | Bin
 {public => htdocs}/theme/common/flags/sv.png        | Bin
 {public => htdocs}/theme/common/flags/sy.png        | Bin
 {public => htdocs}/theme/common/flags/sz.png        | Bin
 {public => htdocs}/theme/common/flags/tc.png        | Bin
 {public => htdocs}/theme/common/flags/td.png        | Bin
 {public => htdocs}/theme/common/flags/tf.png        | Bin
 {public => htdocs}/theme/common/flags/tg.png        | Bin
 {public => htdocs}/theme/common/flags/th.png        | Bin
 {public => htdocs}/theme/common/flags/tj.png        | Bin
 {public => htdocs}/theme/common/flags/tk.png        | Bin
 {public => htdocs}/theme/common/flags/tl.png        | Bin
 {public => htdocs}/theme/common/flags/tm.png        | Bin
 {public => htdocs}/theme/common/flags/tn.png        | Bin
 {public => htdocs}/theme/common/flags/to.png        | Bin
 {public => htdocs}/theme/common/flags/tr.png        | Bin
 {public => htdocs}/theme/common/flags/trans.png     | Bin
 {public => htdocs}/theme/common/flags/tt.png        | Bin
 {public => htdocs}/theme/common/flags/tv.png        | Bin
 {public => htdocs}/theme/common/flags/tw.png        | Bin
 {public => htdocs}/theme/common/flags/tz.png        | Bin
 {public => htdocs}/theme/common/flags/ua.png        | Bin
 {public => htdocs}/theme/common/flags/ug.png        | Bin
 {public => htdocs}/theme/common/flags/uk.png        | Bin
 {public => htdocs}/theme/common/flags/um.png        | Bin
 {public => htdocs}/theme/common/flags/us.png        | Bin
 {public => htdocs}/theme/common/flags/uy.png        | Bin
 {public => htdocs}/theme/common/flags/uz.png        | Bin
 {public => htdocs}/theme/common/flags/va.png        | Bin
 {public => htdocs}/theme/common/flags/vc.png        | Bin
 {public => htdocs}/theme/common/flags/ve.png        | Bin
 {public => htdocs}/theme/common/flags/vg.png        | Bin
 {public => htdocs}/theme/common/flags/vi.png        | Bin
 {public => htdocs}/theme/common/flags/vn.png        | Bin
 {public => htdocs}/theme/common/flags/vu.png        | Bin
 {public => htdocs}/theme/common/flags/wales.png     | Bin
 {public => htdocs}/theme/common/flags/wf.png        | Bin
 {public => htdocs}/theme/common/flags/ws.png        | Bin
 {public => htdocs}/theme/common/flags/ye.png        | Bin
 {public => htdocs}/theme/common/flags/yt.png        | Bin
 {public => htdocs}/theme/common/flags/za.png        | Bin
 {public => htdocs}/theme/common/flags/zm.png        | Bin
 {public => htdocs}/theme/common/flags/zw.png        | Bin
 {public => htdocs}/theme/common/folder-new.png      | Bin
 {public => htdocs}/theme/common/gmap.png            | Bin
 {public => htdocs}/theme/common/help.png            | Bin
 {public => htdocs}/theme/common/ical.gif            | Bin
 {public => htdocs}/theme/common/index.html          |   0
 {public => htdocs}/theme/common/information.png     | Bin
 {public => htdocs}/theme/common/logo_cerfa.png      | Bin
 {public => htdocs}/theme/common/mime/archive.png    | Bin
 {public => htdocs}/theme/common/mime/audio.png      | Bin
 {public => htdocs}/theme/common/mime/css.png        | Bin
 {public => htdocs}/theme/common/mime/doc.png        | Bin
 {public => htdocs}/theme/common/mime/dotnet.png     | Bin
 {public => htdocs}/theme/common/mime/encrypt.png    | Bin
 {public => htdocs}/theme/common/mime/error.png      | Bin
 {public => htdocs}/theme/common/mime/flash.png      | Bin
 {public => htdocs}/theme/common/mime/glasses.png    | Bin
 {public => htdocs}/theme/common/mime/html.png       | Bin
 {public => htdocs}/theme/common/mime/image.png      | Bin
 {public => htdocs}/theme/common/mime/index.html     |   0
 {public => htdocs}/theme/common/mime/jnlp.png       | Bin
 {public => htdocs}/theme/common/mime/jscript.png    | Bin
 {public => htdocs}/theme/common/mime/library.png    | Bin
 {public => htdocs}/theme/common/mime/lit.png        | Bin
 {public => htdocs}/theme/common/mime/mdb.png        | Bin
 .../theme/common/mime/notavailable.png              | Bin
 {public => htdocs}/theme/common/mime/ooffice.png    | Bin
 {public => htdocs}/theme/common/mime/other.png      | Bin
 {public => htdocs}/theme/common/mime/page.png       | Bin
 {public => htdocs}/theme/common/mime/pdf.png        | Bin
 {public => htdocs}/theme/common/mime/php.png        | Bin
 {public => htdocs}/theme/common/mime/pl.png         | Bin
 {public => htdocs}/theme/common/mime/ppt.png        | Bin
 {public => htdocs}/theme/common/mime/readme.txt     |   0
 {public => htdocs}/theme/common/mime/rss.png        | Bin
 {public => htdocs}/theme/common/mime/script.png     | Bin
 {public => htdocs}/theme/common/mime/svg.png        | Bin
 {public => htdocs}/theme/common/mime/text.png       | Bin
 {public => htdocs}/theme/common/mime/ttf.png        | Bin
 {public => htdocs}/theme/common/mime/unknown.png    | Bin
 {public => htdocs}/theme/common/mime/video.png      | Bin
 {public => htdocs}/theme/common/mime/xls.png        | Bin
 {public => htdocs}/theme/common/paypal.png          | Bin
 {public => htdocs}/theme/common/redstar.png         | Bin
 {public => htdocs}/theme/common/rss.gif             | Bin
 .../theme/common/skype_callbutton.png               | Bin
 .../theme/common/skype_chatbutton.png               | Bin
 {public => htdocs}/theme/common/star.png            | Bin
 .../theme/common/transform-crop-and-resize.png      | Bin
 {public => htdocs}/theme/common/transparent.png     | Bin
 {public => htdocs}/theme/common/treemenu/base.gif   | Bin
 {public => htdocs}/theme/common/treemenu/branch.gif | Bin
 .../theme/common/treemenu/branchbottom.gif          | Bin
 .../theme/common/treemenu/branchtop.gif             | Bin
 .../theme/common/treemenu/folder-expanded.gif       | Bin
 {public => htdocs}/theme/common/treemenu/folder.gif | Bin
 .../theme/common/treemenu/folder2-expanded.png      | Bin
 .../theme/common/treemenu/folder2.png               | Bin
 .../theme/common/treemenu/imgfolder.gif             | Bin
 {public => htdocs}/theme/common/treemenu/index.html |   0
 {public => htdocs}/theme/common/treemenu/line.gif   | Bin
 .../theme/common/treemenu/linebottom.gif            | Bin
 {public => htdocs}/theme/common/treemenu/minus.gif  | Bin
 .../theme/common/treemenu/minusbottom.gif           | Bin
 .../theme/common/treemenu/minustop.gif              | Bin
 .../theme/common/treemenu/minustop2.gif             | Bin
 .../theme/common/treemenu/minustop3.gif             | Bin
 {public => htdocs}/theme/common/treemenu/page.gif   | Bin
 {public => htdocs}/theme/common/treemenu/plus.gif   | Bin
 .../theme/common/treemenu/plusbottom.gif            | Bin
 .../theme/common/treemenu/plustop.gif               | Bin
 .../theme/common/treemenu/plustop2.gif              | Bin
 .../theme/common/treemenu/plustop3.gif              | Bin
 {public => htdocs}/theme/common/treemenu/trash.gif  | Bin
 {public => htdocs}/theme/common/vcal.gif            | Bin
 {public => htdocs}/theme/common/view-refresh.png    | Bin
 {public => htdocs}/theme/dolibarr.png               | Bin
 {public => htdocs}/theme/dolibarr_logo.png          | Bin
 .../theme/dolibarr_preferred_partner_int.png        | Bin
 {public => htdocs}/theme/doliforge_logo.png         | Bin
 {public => htdocs}/theme/dolistore_logo.png         | Bin
 {public => htdocs}/theme/eldy/.gitignore            |   0
 {public => htdocs}/theme/eldy/AUTHOR                |   0
 {public => htdocs}/theme/eldy/ckeditor/config.js    |   0
 {public => htdocs}/theme/eldy/ckeditor/index.html   |   0
 {public => htdocs}/theme/eldy/graph-color.php       |   0
 {public => htdocs}/theme/eldy/img/1downarrow.png    | Bin
 .../theme/eldy/img/1downarrow_selected.png          | Bin
 {public => htdocs}/theme/eldy/img/1leftarrow.png    | Bin
 .../theme/eldy/img/1leftarrow_selected.png          | Bin
 {public => htdocs}/theme/eldy/img/1rightarrow.png   | Bin
 .../theme/eldy/img/1rightarrow_selected.png         | Bin
 {public => htdocs}/theme/eldy/img/1uparrow.png      | Bin
 .../theme/eldy/img/1uparrow_selected.png            | Bin
 {public => htdocs}/theme/eldy/img/addfile.png       | Bin
 {public => htdocs}/theme/eldy/img/background.png    | Bin
 .../theme/eldy/img/bg-bas-rubrique.png              | Bin
 {public => htdocs}/theme/eldy/img/bg-rubrique.png   | Bin
 .../theme/eldy/img/bg-titre-rubrique.png            | Bin
 {public => htdocs}/theme/eldy/img/button_bg.png     | Bin
 {public => htdocs}/theme/eldy/img/button_edit.png   | Bin
 {public => htdocs}/theme/eldy/img/calc.png          | Bin
 {public => htdocs}/theme/eldy/img/calendar.png      | Bin
 {public => htdocs}/theme/eldy/img/call.png          | Bin
 {public => htdocs}/theme/eldy/img/call_out.png      | Bin
 {public => htdocs}/theme/eldy/img/close.png         | Bin
 {public => htdocs}/theme/eldy/img/close_title.png   | Bin
 {public => htdocs}/theme/eldy/img/credit_card.png   | Bin
 {public => htdocs}/theme/eldy/img/delete.png        | Bin
 {public => htdocs}/theme/eldy/img/detail.png        | Bin
 {public => htdocs}/theme/eldy/img/disable.png       | Bin
 {public => htdocs}/theme/eldy/img/edit.png          | Bin
 {public => htdocs}/theme/eldy/img/edit_add.png      | Bin
 {public => htdocs}/theme/eldy/img/edit_remove.png   | Bin
 {public => htdocs}/theme/eldy/img/editdelete.png    | Bin
 {public => htdocs}/theme/eldy/img/error.png         | Bin
 {public => htdocs}/theme/eldy/img/external.png      | Bin
 {public => htdocs}/theme/eldy/img/favicon.ico       | Bin
 {public => htdocs}/theme/eldy/img/file.png          | Bin
 {public => htdocs}/theme/eldy/img/filenew.png       | Bin
 {public => htdocs}/theme/eldy/img/filter.png        | Bin
 {public => htdocs}/theme/eldy/img/folder-open.png   | Bin
 {public => htdocs}/theme/eldy/img/folder.png        | Bin
 {public => htdocs}/theme/eldy/img/gradient.gif      | Bin
 {public => htdocs}/theme/eldy/img/grip.png          | Bin
 {public => htdocs}/theme/eldy/img/grip_title.png    | Bin
 {public => htdocs}/theme/eldy/img/headbg.jpg        | Bin
 {public => htdocs}/theme/eldy/img/headbg2.jpg       | Bin
 {public => htdocs}/theme/eldy/img/help.png          | Bin
 {public => htdocs}/theme/eldy/img/helpdoc.png       | Bin
 {public => htdocs}/theme/eldy/img/helpdoc_top.png   | Bin
 {public => htdocs}/theme/eldy/img/high.png          | Bin
 {public => htdocs}/theme/eldy/img/history.png       | Bin
 {public => htdocs}/theme/eldy/img/index.html        |   0
 {public => htdocs}/theme/eldy/img/info.png          | Bin
 {public => htdocs}/theme/eldy/img/info_black.png    | Bin
 {public => htdocs}/theme/eldy/img/list.png          | Bin
 {public => htdocs}/theme/eldy/img/liste_titre.png   | Bin
 {public => htdocs}/theme/eldy/img/liste_titre2.png  | Bin
 {public => htdocs}/theme/eldy/img/listlight.png     | Bin
 {public => htdocs}/theme/eldy/img/lock.png          | Bin
 .../theme/eldy/img/login_background.png             | Bin
 {public => htdocs}/theme/eldy/img/logo_setup.svg    |   0
 {public => htdocs}/theme/eldy/img/logout.png        | Bin
 {public => htdocs}/theme/eldy/img/logout_top.png    | Bin
 {public => htdocs}/theme/eldy/img/menus/README.md   |   0
 {public => htdocs}/theme/eldy/img/menus/agenda.png  | Bin
 .../theme/eldy/img/menus/agenda_over.png            | Bin
 {public => htdocs}/theme/eldy/img/menus/bank.png    | Bin
 .../theme/eldy/img/menus/bank_over.png              | Bin
 {public => htdocs}/theme/eldy/img/menus/chart.png   | Bin
 .../theme/eldy/img/menus/commercial.png             | Bin
 .../theme/eldy/img/menus/commercial_over.png        | Bin
 {public => htdocs}/theme/eldy/img/menus/company.png | Bin
 .../theme/eldy/img/menus/company_over.png           | Bin
 {public => htdocs}/theme/eldy/img/menus/ecm.png     | Bin
 .../theme/eldy/img/menus/ecm_over.png               | Bin
 .../theme/eldy/img/menus/externalsite.png           | Bin
 .../theme/eldy/img/menus/externalsite_over.png      | Bin
 {public => htdocs}/theme/eldy/img/menus/ftp.png     | Bin
 .../theme/eldy/img/menus/ftp_over.png               | Bin
 .../theme/eldy/img/menus/generic1.png               | Bin
 .../theme/eldy/img/menus/generic1_over.png          | Bin
 .../theme/eldy/img/menus/generic2.png               | Bin
 .../theme/eldy/img/menus/generic2_over.png          | Bin
 .../theme/eldy/img/menus/generic3.png               | Bin
 .../theme/eldy/img/menus/generic3_over.png          | Bin
 .../theme/eldy/img/menus/generic4.png               | Bin
 .../theme/eldy/img/menus/generic4_over.png          | Bin
 {public => htdocs}/theme/eldy/img/menus/globe.png   | Bin
 .../theme/eldy/img/menus/globe_over.png             | Bin
 {public => htdocs}/theme/eldy/img/menus/holiday.png | Bin
 {public => htdocs}/theme/eldy/img/menus/home.png    | Bin
 .../theme/eldy/img/menus/home_over.png              | Bin
 {public => htdocs}/theme/eldy/img/menus/index.html  |   0
 {public => htdocs}/theme/eldy/img/menus/mail.png    | Bin
 .../theme/eldy/img/menus/mail_over.png              | Bin
 {public => htdocs}/theme/eldy/img/menus/members.png | Bin
 .../theme/eldy/img/menus/members_over.png           | Bin
 {public => htdocs}/theme/eldy/img/menus/menu.png    | Bin
 {public => htdocs}/theme/eldy/img/menus/money.png   | Bin
 .../theme/eldy/img/menus/money_over.png             | Bin
 .../theme/eldy/img/menus/pointofsale.png            | Bin
 .../theme/eldy/img/menus/pointofsale_over.png       | Bin
 .../theme/eldy/img/menus/products.png               | Bin
 .../theme/eldy/img/menus/products_over.png          | Bin
 {public => htdocs}/theme/eldy/img/menus/project.png | Bin
 .../theme/eldy/img/menus/project_over.png           | Bin
 {public => htdocs}/theme/eldy/img/menus/shop.png    | Bin
 .../theme/eldy/img/menus/shop_over.png              | Bin
 {public => htdocs}/theme/eldy/img/menus/tools.png   | Bin
 .../theme/eldy/img/menus/tools_over.png             | Bin
 .../theme/eldy/img/menus_black/agenda.png           | Bin
 .../theme/eldy/img/menus_black/agenda_over.png      | Bin
 .../theme/eldy/img/menus_black/bank.png             | Bin
 .../theme/eldy/img/menus_black/bank_over.png        | Bin
 .../theme/eldy/img/menus_black/commercial.png       | Bin
 .../theme/eldy/img/menus_black/commercial_over.png  | Bin
 .../theme/eldy/img/menus_black/company.png          | Bin
 .../theme/eldy/img/menus_black/company_over.png     | Bin
 .../theme/eldy/img/menus_black/ecm.png              | Bin
 .../theme/eldy/img/menus_black/ecm_over.png         | Bin
 .../theme/eldy/img/menus_black/externalsite.png     | Bin
 .../eldy/img/menus_black/externalsite_over.png      | Bin
 .../theme/eldy/img/menus_black/ftp.png              | Bin
 .../theme/eldy/img/menus_black/ftp_over.png         | Bin
 .../theme/eldy/img/menus_black/generic1.png         | Bin
 .../theme/eldy/img/menus_black/generic1_over.png    | Bin
 .../theme/eldy/img/menus_black/generic2.png         | Bin
 .../theme/eldy/img/menus_black/generic2_over.png    | Bin
 .../theme/eldy/img/menus_black/generic3.png         | Bin
 .../theme/eldy/img/menus_black/generic3_over.png    | Bin
 .../theme/eldy/img/menus_black/generic4.png         | Bin
 .../theme/eldy/img/menus_black/generic4_over.png    | Bin
 .../theme/eldy/img/menus_black/globe.png            | Bin
 .../theme/eldy/img/menus_black/globe_over.png       | Bin
 .../theme/eldy/img/menus_black/holiday.png          | Bin
 .../theme/eldy/img/menus_black/home.png             | Bin
 .../theme/eldy/img/menus_black/home_over.png        | Bin
 .../theme/eldy/img/menus_black/mail.png             | Bin
 .../theme/eldy/img/menus_black/mail_over.png        | Bin
 .../theme/eldy/img/menus_black/members.png          | Bin
 .../theme/eldy/img/menus_black/members_over.png     | Bin
 .../theme/eldy/img/menus_black/menu.png             | Bin
 .../theme/eldy/img/menus_black/money.png            | Bin
 .../theme/eldy/img/menus_black/money_over.png       | Bin
 .../theme/eldy/img/menus_black/pointofsale.png      | Bin
 .../theme/eldy/img/menus_black/pointofsale_over.png | Bin
 .../theme/eldy/img/menus_black/products.png         | Bin
 .../theme/eldy/img/menus_black/products_over.png    | Bin
 .../theme/eldy/img/menus_black/project.png          | Bin
 .../theme/eldy/img/menus_black/project_over.png     | Bin
 .../theme/eldy/img/menus_black/shop.png             | Bin
 .../theme/eldy/img/menus_black/shop_over.png        | Bin
 .../theme/eldy/img/menus_black/tools.png            | Bin
 .../theme/eldy/img/menus_black/tools_over.png       | Bin
 {public => htdocs}/theme/eldy/img/menutab-r.png     | Bin
 {public => htdocs}/theme/eldy/img/nav-overlay.png   | Bin
 {public => htdocs}/theme/eldy/img/nav-overlay3.png  | Bin
 {public => htdocs}/theme/eldy/img/next.png          | Bin
 {public => htdocs}/theme/eldy/img/nographyet.svg    |   0
 .../theme/eldy/img/object_account.png               | Bin
 .../theme/eldy/img/object_accounting.png            | Bin
 {public => htdocs}/theme/eldy/img/object_action.png | Bin
 .../theme/eldy/img/object_address.png               | Bin
 .../theme/eldy/img/object_barcode.png               | Bin
 {public => htdocs}/theme/eldy/img/object_bill.png   | Bin
 {public => htdocs}/theme/eldy/img/object_billa.png  | Bin
 {public => htdocs}/theme/eldy/img/object_billd.png  | Bin
 {public => htdocs}/theme/eldy/img/object_billr.png  | Bin
 {public => htdocs}/theme/eldy/img/object_book.png   | Bin
 .../theme/eldy/img/object_bookmark.png              | Bin
 .../theme/eldy/img/object_building.png              | Bin
 .../theme/eldy/img/object_calendar.png              | Bin
 .../theme/eldy/img/object_calendarday.png           | Bin
 .../theme/eldy/img/object_calendargantt.png         | Bin
 .../theme/eldy/img/object_calendarpertype.png       | Bin
 .../theme/eldy/img/object_calendarperuser.png       | Bin
 .../theme/eldy/img/object_calendarweek.png          | Bin
 .../theme/eldy/img/object_category-expanded.png     | Bin
 .../theme/eldy/img/object_category.png              | Bin
 .../theme/eldy/img/object_commercial.png            | Bin
 .../theme/eldy/img/object_company.png               | Bin
 .../theme/eldy/img/object_contact.png               | Bin
 .../theme/eldy/img/object_contract.png              | Bin
 {public => htdocs}/theme/eldy/img/object_cron.png   | Bin
 {public => htdocs}/theme/eldy/img/object_dir.png    | Bin
 {public => htdocs}/theme/eldy/img/object_email.png  | Bin
 {public => htdocs}/theme/eldy/img/object_energy.png | Bin
 .../theme/eldy/img/object_generic.png               | Bin
 {public => htdocs}/theme/eldy/img/object_globe.png  | Bin
 .../theme/eldy/img/object_gravatar.png              | Bin
 {public => htdocs}/theme/eldy/img/object_group.png  | Bin
 .../theme/eldy/img/object_holiday.png               | Bin
 .../theme/eldy/img/object_intervention.png          | Bin
 .../theme/eldy/img/object_invoice.png               | Bin
 {public => htdocs}/theme/eldy/img/object_label.png  | Bin
 {public => htdocs}/theme/eldy/img/object_list.png   | Bin
 {public => htdocs}/theme/eldy/img/object_margin.png | Bin
 .../theme/eldy/img/object_multicurrency.png         | Bin
 .../theme/eldy/img/object_opensurvey.png            | Bin
 {public => htdocs}/theme/eldy/img/object_order.png  | Bin
 .../theme/eldy/img/object_payment.png               | Bin
 .../theme/eldy/img/object_phoning.png               | Bin
 .../theme/eldy/img/object_phoning_fax.png           | Bin
 .../theme/eldy/img/object_printer.png               | Bin
 .../theme/eldy/img/object_product.png               | Bin
 .../theme/eldy/img/object_project.png               | Bin
 .../theme/eldy/img/object_projectpub.png            | Bin
 .../theme/eldy/img/object_projecttask.png           | Bin
 {public => htdocs}/theme/eldy/img/object_propal.png | Bin
 {public => htdocs}/theme/eldy/img/object_reduc.png  | Bin
 .../theme/eldy/img/object_resource.png              | Bin
 {public => htdocs}/theme/eldy/img/object_rss.png    | Bin
 .../theme/eldy/img/object_sending.png               | Bin
 .../theme/eldy/img/object_service.png               | Bin
 {public => htdocs}/theme/eldy/img/object_skype.png  | Bin
 {public => htdocs}/theme/eldy/img/object_stock.png  | Bin
 .../theme/eldy/img/object_supplier_proposal.png     | Bin
 {public => htdocs}/theme/eldy/img/object_task.png   | Bin
 .../theme/eldy/img/object_task_time.png             | Bin
 {public => htdocs}/theme/eldy/img/object_tax.png    | Bin
 .../theme/eldy/img/object_technic.png               | Bin
 {public => htdocs}/theme/eldy/img/object_trip.png   | Bin
 {public => htdocs}/theme/eldy/img/object_user.png   | Bin
 {public => htdocs}/theme/eldy/img/off.png           | Bin
 {public => htdocs}/theme/eldy/img/on.png            | Bin
 {public => htdocs}/theme/eldy/img/pdf2.png          | Bin
 {public => htdocs}/theme/eldy/img/pdf3.png          | Bin
 {public => htdocs}/theme/eldy/img/play.png          | Bin
 {public => htdocs}/theme/eldy/img/playdisabled.png  | Bin
 {public => htdocs}/theme/eldy/img/preview.png       | Bin
 {public => htdocs}/theme/eldy/img/preview_ext.png   | Bin
 {public => htdocs}/theme/eldy/img/previous.png      | Bin
 {public => htdocs}/theme/eldy/img/printer.png       | Bin
 {public => htdocs}/theme/eldy/img/printer_top.png   | Bin
 {public => htdocs}/theme/eldy/img/puce.png          | Bin
 {public => htdocs}/theme/eldy/img/recent.png        | Bin
 {public => htdocs}/theme/eldy/img/redstar.png       | Bin
 {public => htdocs}/theme/eldy/img/refresh.png       | Bin
 {public => htdocs}/theme/eldy/img/reload.png        | Bin
 {public => htdocs}/theme/eldy/img/rightarrow.png    | Bin
 {public => htdocs}/theme/eldy/img/search.png        | Bin
 {public => htdocs}/theme/eldy/img/searchclear.png   | Bin
 {public => htdocs}/theme/eldy/img/setup.png         | Bin
 {public => htdocs}/theme/eldy/img/sort_asc.png      | Bin
 .../theme/eldy/img/sort_asc_disabled.png            | Bin
 {public => htdocs}/theme/eldy/img/sort_desc.png     | Bin
 .../theme/eldy/img/sort_desc_disabled.png           | Bin
 {public => htdocs}/theme/eldy/img/split.png         | Bin
 {public => htdocs}/theme/eldy/img/star.png          | Bin
 {public => htdocs}/theme/eldy/img/stats.png         | Bin
 {public => htdocs}/theme/eldy/img/statut0.png       | Bin
 {public => htdocs}/theme/eldy/img/statut0_40x40.png | Bin
 {public => htdocs}/theme/eldy/img/statut1.png       | Bin
 {public => htdocs}/theme/eldy/img/statut1_40x40.png | Bin
 {public => htdocs}/theme/eldy/img/statut3.png       | Bin
 {public => htdocs}/theme/eldy/img/statut3_40x40.png | Bin
 {public => htdocs}/theme/eldy/img/statut4.png       | Bin
 {public => htdocs}/theme/eldy/img/statut4_40x40.png | Bin
 {public => htdocs}/theme/eldy/img/statut5.png       | Bin
 {public => htdocs}/theme/eldy/img/statut5_40x40.png | Bin
 {public => htdocs}/theme/eldy/img/statut6.png       | Bin
 {public => htdocs}/theme/eldy/img/statut6_40x40.png | Bin
 {public => htdocs}/theme/eldy/img/statut7.png       | Bin
 {public => htdocs}/theme/eldy/img/statut7_40x40.png | Bin
 {public => htdocs}/theme/eldy/img/statut8.png       | Bin
 {public => htdocs}/theme/eldy/img/statut8_40x40.png | Bin
 {public => htdocs}/theme/eldy/img/statut9.png       | Bin
 {public => htdocs}/theme/eldy/img/statut9_40x40.png | Bin
 {public => htdocs}/theme/eldy/img/stcomm-1.png      | Bin
 {public => htdocs}/theme/eldy/img/stcomm0.png       | Bin
 {public => htdocs}/theme/eldy/img/stcomm1.png       | Bin
 {public => htdocs}/theme/eldy/img/stcomm2.png       | Bin
 {public => htdocs}/theme/eldy/img/stcomm3.png       | Bin
 {public => htdocs}/theme/eldy/img/stcomm4.png       | Bin
 {public => htdocs}/theme/eldy/img/switch_off.png    | Bin
 {public => htdocs}/theme/eldy/img/switch_on.png     | Bin
 .../theme/eldy/img/tab_background.png               | Bin
 {public => htdocs}/theme/eldy/img/tick.png          | Bin
 {public => htdocs}/theme/eldy/img/title.gif         | Bin
 {public => htdocs}/theme/eldy/img/title.png         | Bin
 .../theme/eldy/img/title_accountancy.png            | Bin
 {public => htdocs}/theme/eldy/img/title_agenda.png  | Bin
 {public => htdocs}/theme/eldy/img/title_bank.png    | Bin
 .../theme/eldy/img/title_commercial.png             | Bin
 .../theme/eldy/img/title_companies.png              | Bin
 {public => htdocs}/theme/eldy/img/title_generic.png | Bin
 {public => htdocs}/theme/eldy/img/title_home.png    | Bin
 {public => htdocs}/theme/eldy/img/title_hrm.png     | Bin
 .../theme/eldy/img/title_products.png               | Bin
 {public => htdocs}/theme/eldy/img/title_project.png | Bin
 {public => htdocs}/theme/eldy/img/title_setup.png   | Bin
 {public => htdocs}/theme/eldy/img/tmenu.jpg         | Bin
 {public => htdocs}/theme/eldy/img/tmenu2.jpg        | Bin
 {public => htdocs}/theme/eldy/img/tmenu3.jpg        | Bin
 {public => htdocs}/theme/eldy/img/tmenu_inverse.jpg | Bin
 {public => htdocs}/theme/eldy/img/unlock.png        | Bin
 {public => htdocs}/theme/eldy/img/uparrow.png       | Bin
 {public => htdocs}/theme/eldy/img/upload.png        | Bin
 {public => htdocs}/theme/eldy/img/vcard.png         | Bin
 {public => htdocs}/theme/eldy/img/view.png          | Bin
 {public => htdocs}/theme/eldy/img/warning.png       | Bin
 .../theme/eldy/img/weather/index.html               |   0
 .../theme/eldy/img/weather/weather-clear-night.png  | Bin
 .../theme/eldy/img/weather/weather-clear.png        | Bin
 .../theme/eldy/img/weather/weather-clouds-night.png | Bin
 .../theme/eldy/img/weather/weather-clouds.png       | Bin
 .../eldy/img/weather/weather-few-clouds-night.png   | Bin
 .../theme/eldy/img/weather/weather-few-clouds.png   | Bin
 .../eldy/img/weather/weather-freezing-rain.png      | Bin
 .../theme/eldy/img/weather/weather-hail.png         | Bin
 .../theme/eldy/img/weather/weather-many-clouds.png  | Bin
 .../theme/eldy/img/weather/weather-mist.png         | Bin
 .../theme/eldy/img/weather/weather-showers-day.png  | Bin
 .../eldy/img/weather/weather-showers-night.png      | Bin
 .../img/weather/weather-showers-scattered-day.png   | Bin
 .../img/weather/weather-showers-scattered-night.png | Bin
 .../eldy/img/weather/weather-showers-scattered.png  | Bin
 .../theme/eldy/img/weather/weather-showers.png      | Bin
 .../theme/eldy/img/weather/weather-snow-rain.png    | Bin
 .../eldy/img/weather/weather-snow-scattered-day.png | Bin
 .../img/weather/weather-snow-scattered-night.png    | Bin
 .../eldy/img/weather/weather-snow-scattered.png     | Bin
 .../theme/eldy/img/weather/weather-snow.png         | Bin
 .../theme/eldy/img/weather/weather-storm-day.png    | Bin
 .../theme/eldy/img/weather/weather-storm-night.png  | Bin
 .../theme/eldy/img/weather/weather-storm.png        | Bin
 {public => htdocs}/theme/eldy/img/working.gif       | Bin
 {public => htdocs}/theme/eldy/img/working2.gif      | Bin
 {public => htdocs}/theme/eldy/index.html            |   0
 {public => htdocs}/theme/eldy/style.css.php         |   0
 {public => htdocs}/theme/eldy/thumb.png             | Bin
 {public => htdocs}/theme/eldy/tpl/README            |   0
 {public => htdocs}/theme/eldy/tpl/index.html        |   0
 {public => htdocs}/theme/index.html                 |   0
 {public => htdocs}/theme/login_background.png       | Bin
 {public => htdocs}/theme/login_logo.png             | Bin
 {public => htdocs}/theme/md/.gitignore              |   0
 {public => htdocs}/theme/md/AUTHOR                  |   0
 {public => htdocs}/theme/md/ckeditor/config.js      |   0
 {public => htdocs}/theme/md/ckeditor/index.html     |   0
 {public => htdocs}/theme/md/graph-color.php         |   0
 {public => htdocs}/theme/md/img/1downarrow.png      | Bin
 .../theme/md/img/1downarrow_selected.png            | Bin
 {public => htdocs}/theme/md/img/1leftarrow.png      | Bin
 .../theme/md/img/1leftarrow_selected.png            | Bin
 {public => htdocs}/theme/md/img/1rightarrow.png     | Bin
 .../theme/md/img/1rightarrow_selected.png           | Bin
 {public => htdocs}/theme/md/img/1uparrow.png        | Bin
 .../theme/md/img/1uparrow_selected.png              | Bin
 {public => htdocs}/theme/md/img/addfile.png         | Bin
 {public => htdocs}/theme/md/img/background.png      | Bin
 {public => htdocs}/theme/md/img/bg-bas-rubrique.png | Bin
 {public => htdocs}/theme/md/img/bg-rubrique.png     | Bin
 .../theme/md/img/bg-titre-rubrique.png              | Bin
 {public => htdocs}/theme/md/img/button_bg.png       | Bin
 {public => htdocs}/theme/md/img/button_edit.png     | Bin
 {public => htdocs}/theme/md/img/calc.png            | Bin
 {public => htdocs}/theme/md/img/calendar.png        | Bin
 {public => htdocs}/theme/md/img/call.png            | Bin
 {public => htdocs}/theme/md/img/call_out.png        | Bin
 {public => htdocs}/theme/md/img/close.png           | Bin
 {public => htdocs}/theme/md/img/close_title.png     | Bin
 {public => htdocs}/theme/md/img/credit_card.png     | Bin
 {public => htdocs}/theme/md/img/delete.png          | Bin
 {public => htdocs}/theme/md/img/detail.png          | Bin
 {public => htdocs}/theme/md/img/disable.png         | Bin
 {public => htdocs}/theme/md/img/edit.png            | Bin
 {public => htdocs}/theme/md/img/edit_add.png        | Bin
 {public => htdocs}/theme/md/img/edit_remove.png     | Bin
 {public => htdocs}/theme/md/img/editdelete.png      | Bin
 {public => htdocs}/theme/md/img/error.png           | Bin
 {public => htdocs}/theme/md/img/external.png        | Bin
 {public => htdocs}/theme/md/img/favicon.ico         | Bin
 {public => htdocs}/theme/md/img/file.png            | Bin
 {public => htdocs}/theme/md/img/filenew.png         | Bin
 {public => htdocs}/theme/md/img/filter.png          | Bin
 {public => htdocs}/theme/md/img/folder-open.png     | Bin
 {public => htdocs}/theme/md/img/folder.png          | Bin
 {public => htdocs}/theme/md/img/gradient.gif        | Bin
 {public => htdocs}/theme/md/img/grip.png            | Bin
 {public => htdocs}/theme/md/img/grip_title.png      | Bin
 {public => htdocs}/theme/md/img/headbg.jpg          | Bin
 {public => htdocs}/theme/md/img/headbg2.jpg         | Bin
 {public => htdocs}/theme/md/img/help.png            | Bin
 {public => htdocs}/theme/md/img/helpdoc.png         | Bin
 {public => htdocs}/theme/md/img/helpdoc_top.png     | Bin
 {public => htdocs}/theme/md/img/high.png            | Bin
 {public => htdocs}/theme/md/img/history.png         | Bin
 {public => htdocs}/theme/md/img/index.html          |   0
 {public => htdocs}/theme/md/img/info.png            | Bin
 {public => htdocs}/theme/md/img/info_black.png      | Bin
 {public => htdocs}/theme/md/img/list.png            | Bin
 {public => htdocs}/theme/md/img/liste_titre.png     | Bin
 {public => htdocs}/theme/md/img/liste_titre2.png    | Bin
 {public => htdocs}/theme/md/img/listlight.png       | Bin
 {public => htdocs}/theme/md/img/lock.png            | Bin
 .../theme/md/img/login_background.png               | Bin
 {public => htdocs}/theme/md/img/logo_setup.svg      |   0
 {public => htdocs}/theme/md/img/logout.png          | Bin
 {public => htdocs}/theme/md/img/logout_top.png      | Bin
 {public => htdocs}/theme/md/img/menu.png            | Bin
 {public => htdocs}/theme/md/img/menus/agenda.png    | Bin
 {public => htdocs}/theme/md/img/menus/bank.png      | Bin
 {public => htdocs}/theme/md/img/menus/cart.png      | Bin
 {public => htdocs}/theme/md/img/menus/chart.png     | Bin
 .../theme/md/img/menus/commercial.png               | Bin
 {public => htdocs}/theme/md/img/menus/company.png   | Bin
 {public => htdocs}/theme/md/img/menus/ecm.png       | Bin
 .../theme/md/img/menus/externalsite.png             | Bin
 {public => htdocs}/theme/md/img/menus/ftp.png       | Bin
 {public => htdocs}/theme/md/img/menus/generic1.png  | Bin
 {public => htdocs}/theme/md/img/menus/generic2.png  | Bin
 {public => htdocs}/theme/md/img/menus/generic3.png  | Bin
 {public => htdocs}/theme/md/img/menus/generic4.png  | Bin
 {public => htdocs}/theme/md/img/menus/globe.png     | Bin
 {public => htdocs}/theme/md/img/menus/graph.png     | Bin
 {public => htdocs}/theme/md/img/menus/holiday.png   | Bin
 {public => htdocs}/theme/md/img/menus/home.png      | Bin
 {public => htdocs}/theme/md/img/menus/index.html    |   0
 {public => htdocs}/theme/md/img/menus/mail.png      | Bin
 {public => htdocs}/theme/md/img/menus/members.png   | Bin
 {public => htdocs}/theme/md/img/menus/menu.png      | Bin
 {public => htdocs}/theme/md/img/menus/money.png     | Bin
 .../theme/md/img/menus/pointofsale.png              | Bin
 {public => htdocs}/theme/md/img/menus/products.png  | Bin
 {public => htdocs}/theme/md/img/menus/project.png   | Bin
 {public => htdocs}/theme/md/img/menus/shop.png      | Bin
 {public => htdocs}/theme/md/img/menus/tools.png     | Bin
 {public => htdocs}/theme/md/img/menutab-r.png       | Bin
 {public => htdocs}/theme/md/img/nav-overlay.png     | Bin
 {public => htdocs}/theme/md/img/nav-overlay3.png    | Bin
 {public => htdocs}/theme/md/img/next.png            | Bin
 {public => htdocs}/theme/md/img/nographyet.svg      |   0
 {public => htdocs}/theme/md/img/object_account.png  | Bin
 .../theme/md/img/object_accounting.png              | Bin
 {public => htdocs}/theme/md/img/object_action.png   | Bin
 {public => htdocs}/theme/md/img/object_address.png  | Bin
 {public => htdocs}/theme/md/img/object_barcode.png  | Bin
 {public => htdocs}/theme/md/img/object_bill.png     | Bin
 {public => htdocs}/theme/md/img/object_billa.png    | Bin
 {public => htdocs}/theme/md/img/object_billd.png    | Bin
 {public => htdocs}/theme/md/img/object_billr.png    | Bin
 {public => htdocs}/theme/md/img/object_book.png     | Bin
 {public => htdocs}/theme/md/img/object_bookmark.png | Bin
 {public => htdocs}/theme/md/img/object_building.png | Bin
 {public => htdocs}/theme/md/img/object_calendar.png | Bin
 .../theme/md/img/object_calendarday.png             | Bin
 .../theme/md/img/object_calendargantt.png           | Bin
 .../theme/md/img/object_calendarpertype.png         | Bin
 .../theme/md/img/object_calendarperuser.png         | Bin
 .../theme/md/img/object_calendarweek.png            | Bin
 .../theme/md/img/object_category-expanded.png       | Bin
 {public => htdocs}/theme/md/img/object_category.png | Bin
 .../theme/md/img/object_commercial.png              | Bin
 {public => htdocs}/theme/md/img/object_company.png  | Bin
 {public => htdocs}/theme/md/img/object_contact.png  | Bin
 {public => htdocs}/theme/md/img/object_contract.png | Bin
 {public => htdocs}/theme/md/img/object_cron.png     | Bin
 {public => htdocs}/theme/md/img/object_dir.png      | Bin
 {public => htdocs}/theme/md/img/object_email.png    | Bin
 {public => htdocs}/theme/md/img/object_energy.png   | Bin
 {public => htdocs}/theme/md/img/object_generic.png  | Bin
 {public => htdocs}/theme/md/img/object_globe.png    | Bin
 {public => htdocs}/theme/md/img/object_gravatar.png | Bin
 {public => htdocs}/theme/md/img/object_group.png    | Bin
 {public => htdocs}/theme/md/img/object_holiday.png  | Bin
 .../theme/md/img/object_intervention.png            | Bin
 {public => htdocs}/theme/md/img/object_invoice.png  | Bin
 {public => htdocs}/theme/md/img/object_label.png    | Bin
 {public => htdocs}/theme/md/img/object_list.png     | Bin
 {public => htdocs}/theme/md/img/object_margin.png   | Bin
 .../theme/md/img/object_opensurvey.png              | Bin
 {public => htdocs}/theme/md/img/object_order.png    | Bin
 {public => htdocs}/theme/md/img/object_payment.png  | Bin
 {public => htdocs}/theme/md/img/object_phoning.png  | Bin
 .../theme/md/img/object_phoning_fax.png             | Bin
 {public => htdocs}/theme/md/img/object_printer.png  | Bin
 {public => htdocs}/theme/md/img/object_product.png  | Bin
 {public => htdocs}/theme/md/img/object_project.png  | Bin
 .../theme/md/img/object_projectpub.png              | Bin
 .../theme/md/img/object_projecttask.png             | Bin
 {public => htdocs}/theme/md/img/object_propal.png   | Bin
 {public => htdocs}/theme/md/img/object_reduc.png    | Bin
 {public => htdocs}/theme/md/img/object_resource.png | Bin
 {public => htdocs}/theme/md/img/object_rss.png      | Bin
 {public => htdocs}/theme/md/img/object_sending.png  | Bin
 {public => htdocs}/theme/md/img/object_service.png  | Bin
 {public => htdocs}/theme/md/img/object_skype.png    | Bin
 {public => htdocs}/theme/md/img/object_stock.png    | Bin
 .../theme/md/img/object_supplier_proposal.png       | Bin
 {public => htdocs}/theme/md/img/object_task.png     | Bin
 .../theme/md/img/object_task_time.png               | Bin
 {public => htdocs}/theme/md/img/object_tax.png      | Bin
 {public => htdocs}/theme/md/img/object_technic.png  | Bin
 {public => htdocs}/theme/md/img/object_trip.png     | Bin
 {public => htdocs}/theme/md/img/object_user.png     | Bin
 {public => htdocs}/theme/md/img/off.png             | Bin
 {public => htdocs}/theme/md/img/on.png              | Bin
 {public => htdocs}/theme/md/img/pdf2.png            | Bin
 {public => htdocs}/theme/md/img/pdf3.png            | Bin
 {public => htdocs}/theme/md/img/play.png            | Bin
 {public => htdocs}/theme/md/img/playdisabled.png    | Bin
 {public => htdocs}/theme/md/img/preview.png         | Bin
 {public => htdocs}/theme/md/img/preview_ext.png     | Bin
 {public => htdocs}/theme/md/img/previous.png        | Bin
 {public => htdocs}/theme/md/img/printer.png         | Bin
 {public => htdocs}/theme/md/img/printer_top.png     | Bin
 {public => htdocs}/theme/md/img/puce.png            | Bin
 {public => htdocs}/theme/md/img/recent.png          | Bin
 {public => htdocs}/theme/md/img/redstar.png         | Bin
 {public => htdocs}/theme/md/img/refresh.png         | Bin
 {public => htdocs}/theme/md/img/reload.png          | Bin
 {public => htdocs}/theme/md/img/rightarrow.png      | Bin
 {public => htdocs}/theme/md/img/search.png          | Bin
 {public => htdocs}/theme/md/img/searchclear.png     | Bin
 {public => htdocs}/theme/md/img/setup.png           | Bin
 {public => htdocs}/theme/md/img/sort_asc.png        | Bin
 .../theme/md/img/sort_asc_disabled.png              | Bin
 {public => htdocs}/theme/md/img/sort_desc.png       | Bin
 .../theme/md/img/sort_desc_disabled.png             | Bin
 {public => htdocs}/theme/md/img/split.png           | Bin
 {public => htdocs}/theme/md/img/star.png            | Bin
 {public => htdocs}/theme/md/img/stats.png           | Bin
 {public => htdocs}/theme/md/img/statut0.png         | Bin
 {public => htdocs}/theme/md/img/statut0_40x40.png   | Bin
 {public => htdocs}/theme/md/img/statut1.png         | Bin
 {public => htdocs}/theme/md/img/statut1_40x40.png   | Bin
 {public => htdocs}/theme/md/img/statut3.png         | Bin
 {public => htdocs}/theme/md/img/statut3_40x40.png   | Bin
 {public => htdocs}/theme/md/img/statut4.png         | Bin
 {public => htdocs}/theme/md/img/statut4_40x40.png   | Bin
 {public => htdocs}/theme/md/img/statut5.png         | Bin
 {public => htdocs}/theme/md/img/statut5_40x40.png   | Bin
 {public => htdocs}/theme/md/img/statut6.png         | Bin
 {public => htdocs}/theme/md/img/statut6_40x40.png   | Bin
 {public => htdocs}/theme/md/img/statut7.png         | Bin
 {public => htdocs}/theme/md/img/statut7_40x40.png   | Bin
 {public => htdocs}/theme/md/img/statut8.png         | Bin
 {public => htdocs}/theme/md/img/statut8_40x40.png   | Bin
 {public => htdocs}/theme/md/img/statut9.png         | Bin
 {public => htdocs}/theme/md/img/statut9_40x40.png   | Bin
 {public => htdocs}/theme/md/img/stcomm-1.png        | Bin
 {public => htdocs}/theme/md/img/stcomm0.png         | Bin
 {public => htdocs}/theme/md/img/stcomm1.png         | Bin
 {public => htdocs}/theme/md/img/stcomm2.png         | Bin
 {public => htdocs}/theme/md/img/stcomm3.png         | Bin
 {public => htdocs}/theme/md/img/stcomm4.png         | Bin
 {public => htdocs}/theme/md/img/switch_off.png      | Bin
 {public => htdocs}/theme/md/img/switch_off_old.png  | Bin
 {public => htdocs}/theme/md/img/switch_on.png       | Bin
 {public => htdocs}/theme/md/img/switch_on_old.png   | Bin
 {public => htdocs}/theme/md/img/tab_background.png  | Bin
 {public => htdocs}/theme/md/img/tick.png            | Bin
 {public => htdocs}/theme/md/img/title.gif           | Bin
 {public => htdocs}/theme/md/img/title.png           | Bin
 .../theme/md/img/title_accountancy.png              | Bin
 {public => htdocs}/theme/md/img/title_agenda.png    | Bin
 {public => htdocs}/theme/md/img/title_bank.png      | Bin
 .../theme/md/img/title_commercial.png               | Bin
 {public => htdocs}/theme/md/img/title_companies.png | Bin
 {public => htdocs}/theme/md/img/title_generic.png   | Bin
 {public => htdocs}/theme/md/img/title_home.png      | Bin
 {public => htdocs}/theme/md/img/title_hrm.png       | Bin
 {public => htdocs}/theme/md/img/title_products.png  | Bin
 {public => htdocs}/theme/md/img/title_project.png   | Bin
 {public => htdocs}/theme/md/img/title_setup.png     | Bin
 {public => htdocs}/theme/md/img/tmenu.jpg           | Bin
 {public => htdocs}/theme/md/img/tmenu2.jpg          | Bin
 {public => htdocs}/theme/md/img/tmenu3.jpg          | Bin
 {public => htdocs}/theme/md/img/tmenu_inverse.jpg   | Bin
 {public => htdocs}/theme/md/img/unlock.png          | Bin
 {public => htdocs}/theme/md/img/uparrow.png         | Bin
 {public => htdocs}/theme/md/img/upload.png          | Bin
 {public => htdocs}/theme/md/img/vcard.png           | Bin
 {public => htdocs}/theme/md/img/view.png            | Bin
 {public => htdocs}/theme/md/img/warning.png         | Bin
 {public => htdocs}/theme/md/img/weather/index.html  |   0
 .../theme/md/img/weather/weather-clear-night.png    | Bin
 .../theme/md/img/weather/weather-clear.png          | Bin
 .../theme/md/img/weather/weather-clouds-night.png   | Bin
 .../theme/md/img/weather/weather-clouds.png         | Bin
 .../md/img/weather/weather-few-clouds-night.png     | Bin
 .../theme/md/img/weather/weather-few-clouds.png     | Bin
 .../theme/md/img/weather/weather-freezing-rain.png  | Bin
 .../theme/md/img/weather/weather-hail.png           | Bin
 .../theme/md/img/weather/weather-many-clouds.png    | Bin
 .../theme/md/img/weather/weather-mist.png           | Bin
 .../theme/md/img/weather/weather-showers-day.png    | Bin
 .../theme/md/img/weather/weather-showers-night.png  | Bin
 .../img/weather/weather-showers-scattered-day.png   | Bin
 .../img/weather/weather-showers-scattered-night.png | Bin
 .../md/img/weather/weather-showers-scattered.png    | Bin
 .../theme/md/img/weather/weather-showers.png        | Bin
 .../theme/md/img/weather/weather-snow-rain.png      | Bin
 .../md/img/weather/weather-snow-scattered-day.png   | Bin
 .../md/img/weather/weather-snow-scattered-night.png | Bin
 .../theme/md/img/weather/weather-snow-scattered.png | Bin
 .../theme/md/img/weather/weather-snow.png           | Bin
 .../theme/md/img/weather/weather-storm-day.png      | Bin
 .../theme/md/img/weather/weather-storm-night.png    | Bin
 .../theme/md/img/weather/weather-storm.png          | Bin
 {public => htdocs}/theme/md/img/working.gif         | Bin
 {public => htdocs}/theme/md/img/working2.gif        | Bin
 {public => htdocs}/theme/md/index.html              |   0
 {public => htdocs}/theme/md/style.css.php           |   0
 {public => htdocs}/theme/md/thumb.png               | Bin
 {public => htdocs}/theme/md/tpl/README              |   0
 {public => htdocs}/theme/md/tpl/index.html          |   0
 {public => htdocs}/user/admin/group_extrafields.php |   0
 {public => htdocs}/user/admin/index.html            |   0
 {public => htdocs}/user/admin/user_extrafields.php  |   0
 {public => htdocs}/user/agenda_extsites.php         |   0
 {public => htdocs}/user/bank.php                    |   0
 {public => htdocs}/user/card.php                    |   0
 .../user/class/api_deprecated_user.class.php        |   0
 {public => htdocs}/user/class/api_users.class.php   |   0
 {public => htdocs}/user/class/index.html            |   0
 {public => htdocs}/user/class/user.class.php        |   0
 .../user/class/userbankaccount.class.php            |   0
 {public => htdocs}/user/class/usergroup.class.php   |   0
 {public => htdocs}/user/clicktodial.php             |   0
 {public => htdocs}/user/document.php                |   0
 {public => htdocs}/user/group/card.php              |   0
 {public => htdocs}/user/group/index.php             |   0
 {public => htdocs}/user/group/ldap.php              |   0
 {public => htdocs}/user/group/perms.php             |   0
 {public => htdocs}/user/hierarchy.php               |   0
 {public => htdocs}/user/home.php                    |   0
 {public => htdocs}/user/index.php                   |   0
 {public => htdocs}/user/info.php                    |   0
 {public => htdocs}/user/ldap.php                    |   0
 {public => htdocs}/user/logout.php                  |   0
 {public => htdocs}/user/note.php                    |   0
 {public => htdocs}/user/notify/card.php             |   0
 {public => htdocs}/user/param_ihm.php               |   0
 {public => htdocs}/user/passwordforgotten.php       |   0
 {public => htdocs}/user/perms.php                   |   0
 {public => htdocs}/viewimage.php                    |   0
 {public => htdocs}/webservices/README.md            |   0
 {public => htdocs}/webservices/admin/index.php      |   0
 .../webservices/demo_wsclient_actioncomm.php-NORUN  |   0
 .../webservices/demo_wsclient_category.php-NORUN    |   0
 .../webservices/demo_wsclient_invoice.php-NORUN     |   0
 .../webservices/demo_wsclient_order.php-NORUN       |   0
 .../webservices/demo_wsclient_other.php-NORUN       |   0
 .../demo_wsclient_productorservice.php-NORUN        |   0
 .../webservices/demo_wsclient_project.php-NORUN     |   0
 .../webservices/demo_wsclient_thirdparty.php-NORUN  |   0
 {public => htdocs}/webservices/index.php            |   0
 .../webservices/server_actioncomm.php               |   0
 {public => htdocs}/webservices/server_category.php  |   0
 {public => htdocs}/webservices/server_contact.php   |   0
 {public => htdocs}/webservices/server_invoice.php   |   0
 {public => htdocs}/webservices/server_order.php     |   0
 {public => htdocs}/webservices/server_other.php     |   0
 .../webservices/server_productorservice.php         |   0
 {public => htdocs}/webservices/server_project.php   |   0
 .../webservices/server_supplier_invoice.php         |   0
 .../webservices/server_thirdparty.php               |   0
 {public => htdocs}/webservices/server_user.php      |   0
 {public => htdocs}/websites/class/website.class.php |   0
 .../websites/class/websitepage.class.php            |   0
 {public => htdocs}/websites/frametop.php            |   0
 {public => htdocs}/websites/index.html              |   0
 {public => htdocs}/websites/index.php               |   0
 9472 files changed, 0 insertions(+), 0 deletions(-)
 rename {public => htdocs}/.gitignore (100%)
 rename {public => htdocs}/accountancy/admin/account.php (100%)
 rename {public => htdocs}/accountancy/admin/accountmodel.php (100%)
 rename {public => htdocs}/accountancy/admin/card.php (100%)
 rename {public => htdocs}/accountancy/admin/categories.php (100%)
 rename {public => htdocs}/accountancy/admin/defaultaccounts.php (100%)
 rename {public => htdocs}/accountancy/admin/export.php (100%)
 rename {public => htdocs}/accountancy/admin/fiscalyear.php (100%)
 rename {public => htdocs}/accountancy/admin/fiscalyear_card.php (100%)
 rename {public => htdocs}/accountancy/admin/fiscalyear_info.php (100%)
 rename {public => htdocs}/accountancy/admin/importaccounts.php (100%)
 rename {public => htdocs}/accountancy/admin/index.html (100%)
 rename {public => htdocs}/accountancy/admin/index.php (100%)
 rename {public => htdocs}/accountancy/admin/journal.php (100%)
 rename {public => htdocs}/accountancy/admin/productaccount.php (100%)
 rename {public => htdocs}/accountancy/bookkeeping/balance.php (100%)
 rename {public => htdocs}/accountancy/bookkeeping/balancebymonth.php (100%)
 rename {public => htdocs}/accountancy/bookkeeping/card.php (100%)
 rename {public => htdocs}/accountancy/bookkeeping/index.html (100%)
 rename {public => htdocs}/accountancy/bookkeeping/list.php (100%)
 rename {public => htdocs}/accountancy/bookkeeping/listbyaccount.php (100%)
 rename {public => htdocs}/accountancy/bookkeeping/listbyyear.php (100%)
 rename {public => htdocs}/accountancy/class/accountancycategory.class.php (100%)
 rename {public => htdocs}/accountancy/class/accountancyexport.class.php (100%)
 rename {public => htdocs}/accountancy/class/accountancysystem.class.php (100%)
 rename {public => htdocs}/accountancy/class/accountingaccount.class.php (100%)
 rename {public => htdocs}/accountancy/class/bookkeeping.class.php (100%)
 rename {public => htdocs}/accountancy/class/html.formventilation.class.php (100%)
 rename {public => htdocs}/accountancy/class/index.html (100%)
 rename {public => htdocs}/accountancy/customer/card.php (100%)
 rename {public => htdocs}/accountancy/customer/index.html (100%)
 rename {public => htdocs}/accountancy/customer/index.php (100%)
 rename {public => htdocs}/accountancy/customer/lines.php (100%)
 rename {public => htdocs}/accountancy/customer/list.php (100%)
 rename {public => htdocs}/accountancy/expensereport/card.php (100%)
 rename {public => htdocs}/accountancy/expensereport/index.html (100%)
 rename {public => htdocs}/accountancy/expensereport/index.php (100%)
 rename {public => htdocs}/accountancy/expensereport/lines.php (100%)
 rename {public => htdocs}/accountancy/expensereport/list.php (100%)
 rename {public => htdocs}/accountancy/index.html (100%)
 rename {public => htdocs}/accountancy/index.php (100%)
 rename {public => htdocs}/accountancy/journal/bankjournal.php (100%)
 rename {public => htdocs}/accountancy/journal/expensereportsjournal.php (100%)
 rename {public => htdocs}/accountancy/journal/index.html (100%)
 rename {public => htdocs}/accountancy/journal/purchasesjournal.php (100%)
 rename {public => htdocs}/accountancy/journal/sellsjournal.php (100%)
 rename {public => htdocs}/accountancy/report/index.html (100%)
 rename {public => htdocs}/accountancy/report/result.php (100%)
 rename {public => htdocs}/accountancy/supplier/card.php (100%)
 rename {public => htdocs}/accountancy/supplier/index.html (100%)
 rename {public => htdocs}/accountancy/supplier/index.php (100%)
 rename {public => htdocs}/accountancy/supplier/lines.php (100%)
 rename {public => htdocs}/accountancy/supplier/list.php (100%)
 rename {public => htdocs}/accountancy/tpl/export_journal.tpl.php (100%)
 rename {public => htdocs}/accountancy/tpl/index.html (100%)
 rename {public => htdocs}/adherents/admin/adherent.php (100%)
 rename {public => htdocs}/adherents/admin/adherent_extrafields.php (100%)
 rename {public => htdocs}/adherents/admin/adherent_type_extrafields.php (100%)
 rename {public => htdocs}/adherents/admin/index.html (100%)
 rename {public => htdocs}/adherents/admin/public.php (100%)
 rename {public => htdocs}/adherents/agenda.php (100%)
 rename {public => htdocs}/adherents/canvas/actions_adherentcard_common.class.php (100%)
 rename {public => htdocs}/adherents/canvas/default/actions_adherentcard_default.class.php (100%)
 rename {public => htdocs}/adherents/canvas/default/index.html (100%)
 rename {public => htdocs}/adherents/canvas/default/tpl/adherentcard_create.tpl.php (100%)
 rename {public => htdocs}/adherents/canvas/default/tpl/adherentcard_edit.tpl.php (100%)
 rename {public => htdocs}/adherents/canvas/default/tpl/adherentcard_view.tpl.php (100%)
 rename {public => htdocs}/adherents/canvas/default/tpl/index.html (100%)
 rename {public => htdocs}/adherents/canvas/index.html (100%)
 rename {public => htdocs}/adherents/card.php (100%)
 rename {public => htdocs}/adherents/cartes/carte.php (100%)
 rename {public => htdocs}/adherents/cartes/index.html (100%)
 rename {public => htdocs}/adherents/class/adherent.class.php (100%)
 rename {public => htdocs}/adherents/class/adherent_type.class.php (100%)
 rename {public => htdocs}/adherents/class/adherentstats.class.php (100%)
 rename {public => htdocs}/adherents/class/api_members.class.php (100%)
 rename {public => htdocs}/adherents/class/api_subscriptions.class.php (100%)
 rename {public => htdocs}/adherents/class/index.html (100%)
 rename {public => htdocs}/adherents/class/subscription.class.php (100%)
 rename {public => htdocs}/adherents/document.php (100%)
 rename {public => htdocs}/adherents/htpasswd.php (100%)
 rename {public => htdocs}/adherents/index.php (100%)
 rename {public => htdocs}/adherents/ldap.php (100%)
 rename {public => htdocs}/adherents/list.php (100%)
 rename {public => htdocs}/adherents/note.php (100%)
 rename {public => htdocs}/adherents/stats/byproperties.php (100%)
 rename {public => htdocs}/adherents/stats/geo.php (100%)
 rename {public => htdocs}/adherents/stats/index.html (100%)
 rename {public => htdocs}/adherents/stats/index.php (100%)
 rename {public => htdocs}/adherents/subscription.php (100%)
 rename {public => htdocs}/adherents/subscription/card.php (100%)
 rename {public => htdocs}/adherents/subscription/index.html (100%)
 rename {public => htdocs}/adherents/subscription/info.php (100%)
 rename {public => htdocs}/adherents/subscription/list.php (100%)
 rename {public => htdocs}/adherents/tpl/index.html (100%)
 rename {public => htdocs}/adherents/tpl/linkedobjectblock.tpl.php (100%)
 rename {public => htdocs}/adherents/type.php (100%)
 rename {public => htdocs}/admin/agenda.php (100%)
 rename {public => htdocs}/admin/agenda_extrafields.php (100%)
 rename {public => htdocs}/admin/agenda_extsites.php (100%)
 rename {public => htdocs}/admin/agenda_other.php (100%)
 rename {public => htdocs}/admin/agenda_xcal.php (100%)
 rename {public => htdocs}/admin/bank.php (100%)
 rename {public => htdocs}/admin/bank_extrafields.php (100%)
 rename {public => htdocs}/admin/barcode.php (100%)
 rename {public => htdocs}/admin/boxes.php (100%)
 rename {public => htdocs}/admin/chequereceipts.php (100%)
 rename {public => htdocs}/admin/clicktodial.php (100%)
 rename {public => htdocs}/admin/commande.php (100%)
 rename {public => htdocs}/admin/company.php (100%)
 rename {public => htdocs}/admin/compta.php (100%)
 rename {public => htdocs}/admin/confexped.php (100%)
 rename {public => htdocs}/admin/const.php (100%)
 rename {public => htdocs}/admin/contract.php (100%)
 rename {public => htdocs}/admin/delais.php (100%)
 rename {public => htdocs}/admin/dict.php (100%)
 rename {public => htdocs}/admin/ecm.php (100%)
 rename {public => htdocs}/admin/events.php (100%)
 rename {public => htdocs}/admin/expedition.php (100%)
 rename {public => htdocs}/admin/expedition_extrafields.php (100%)
 rename {public => htdocs}/admin/expeditiondet_extrafields.php (100%)
 rename {public => htdocs}/admin/expensereport.php (100%)
 rename {public => htdocs}/admin/expensereport_extrafields.php (100%)
 rename {public => htdocs}/admin/external_rss.php (100%)
 rename {public => htdocs}/admin/facture.php (100%)
 rename {public => htdocs}/admin/fckeditor.php (100%)
 rename {public => htdocs}/admin/fichinter.php (100%)
 rename {public => htdocs}/admin/geoipmaxmind.php (100%)
 rename {public => htdocs}/admin/ihm.php (100%)
 rename {public => htdocs}/admin/index.php (100%)
 rename {public => htdocs}/admin/ldap.php (100%)
 rename {public => htdocs}/admin/ldap_contacts.php (100%)
 rename {public => htdocs}/admin/ldap_groups.php (100%)
 rename {public => htdocs}/admin/ldap_members.php (100%)
 rename {public => htdocs}/admin/ldap_users.php (100%)
 rename {public => htdocs}/admin/limits.php (100%)
 rename {public => htdocs}/admin/livraison.php (100%)
 rename {public => htdocs}/admin/livraison_extrafields.php (100%)
 rename {public => htdocs}/admin/livraisondet_extrafields.php (100%)
 rename {public => htdocs}/admin/loan.php (100%)
 rename {public => htdocs}/admin/mailing.php (100%)
 rename {public => htdocs}/admin/mailman.php (100%)
 rename {public => htdocs}/admin/mails.php (100%)
 rename {public => htdocs}/admin/menus.php (100%)
 rename {public => htdocs}/admin/menus/edit.php (100%)
 rename {public => htdocs}/admin/menus/index.php (100%)
 rename {public => htdocs}/admin/menus/other.php (100%)
 rename {public => htdocs}/admin/modules.php (100%)
 rename {public => htdocs}/admin/multicurrency.php (100%)
 rename {public => htdocs}/admin/notification.php (100%)
 rename {public => htdocs}/admin/oauth.php (100%)
 rename {public => htdocs}/admin/oauthlogintokens.php (100%)
 rename {public => htdocs}/admin/order_extrafields.php (100%)
 rename {public => htdocs}/admin/orderdet_extrafields.php (100%)
 rename {public => htdocs}/admin/payment.php (100%)
 rename {public => htdocs}/admin/pdf.php (100%)
 rename {public => htdocs}/admin/perms.php (100%)
 rename {public => htdocs}/admin/prelevement.php (100%)
 rename {public => htdocs}/admin/propal.php (100%)
 rename {public => htdocs}/admin/proxy.php (100%)
 rename {public => htdocs}/admin/receiptprinter.php (100%)
 rename {public => htdocs}/admin/resource.php (100%)
 rename {public => htdocs}/admin/resource_extrafields.php (100%)
 rename {public => htdocs}/admin/salaries.php (100%)
 rename {public => htdocs}/admin/security.php (100%)
 rename {public => htdocs}/admin/security_file.php (100%)
 rename {public => htdocs}/admin/security_other.php (100%)
 rename {public => htdocs}/admin/sms.php (100%)
 rename {public => htdocs}/admin/spip.php (100%)
 rename {public => htdocs}/admin/stock.php (100%)
 rename {public => htdocs}/admin/supplier_invoice.php (100%)
 rename {public => htdocs}/admin/supplier_order.php (100%)
 rename {public => htdocs}/admin/supplier_payment.php (100%)
 rename {public => htdocs}/admin/supplier_proposal.php (100%)
 rename {public => htdocs}/admin/supplierinvoice_extrafields.php (100%)
 rename {public => htdocs}/admin/supplierinvoicedet_extrafields.php (100%)
 rename {public => htdocs}/admin/supplierorder_extrafields.php (100%)
 rename {public => htdocs}/admin/supplierorderdet_extrafields.php (100%)
 rename {public => htdocs}/admin/syslog.php (100%)
 rename {public => htdocs}/admin/system/about.php (100%)
 rename {public => htdocs}/admin/system/browser.php (100%)
 rename {public => htdocs}/admin/system/constall.php (100%)
 rename {public => htdocs}/admin/system/database-tables.php (100%)
 rename {public => htdocs}/admin/system/database.php (100%)
 rename {public => htdocs}/admin/system/dbtable.php (100%)
 rename {public => htdocs}/admin/system/dolibarr.php (100%)
 rename {public => htdocs}/admin/system/filecheck.php (100%)
 rename {public => htdocs}/admin/system/index.php (100%)
 rename {public => htdocs}/admin/system/modules.php (100%)
 rename {public => htdocs}/admin/system/os.php (100%)
 rename {public => htdocs}/admin/system/perf.php (100%)
 rename {public => htdocs}/admin/system/phpinfo.php (100%)
 rename {public => htdocs}/admin/system/web.php (100%)
 rename {public => htdocs}/admin/system/xcache.php (100%)
 rename {public => htdocs}/admin/system/xdebug.php (100%)
 rename {public => htdocs}/admin/taxes.php (100%)
 rename {public => htdocs}/admin/tools/dolibarr_export.php (100%)
 rename {public => htdocs}/admin/tools/dolibarr_import.php (100%)
 rename {public => htdocs}/admin/tools/eaccelerator.php (100%)
 rename {public => htdocs}/admin/tools/export.php (100%)
 rename {public => htdocs}/admin/tools/index.php (100%)
 rename {public => htdocs}/admin/tools/listevents.php (100%)
 rename {public => htdocs}/admin/tools/listsessions.php (100%)
 rename {public => htdocs}/admin/tools/purge.php (100%)
 rename {public => htdocs}/admin/tools/update.php (100%)
 rename {public => htdocs}/admin/translation.php (100%)
 rename {public => htdocs}/admin/triggers.php (100%)
 rename {public => htdocs}/admin/user.php (100%)
 rename {public => htdocs}/admin/websites.php (100%)
 rename {public => htdocs}/admin/workflow.php (100%)
 rename {public => htdocs}/api/README.md (100%)
 rename {public => htdocs}/api/admin/explorer.php (100%)
 rename {public => htdocs}/api/admin/index.php (100%)
 rename {public => htdocs}/api/class/api.class.php (100%)
 rename {public => htdocs}/api/class/api_access.class.php (100%)
 rename {public => htdocs}/api/class/api_dictionnarycountries.class.php (100%)
 rename {public => htdocs}/api/class/api_dictionnarytowns.class.php (100%)
 rename {public => htdocs}/api/class/api_login.class.php (100%)
 rename {public => htdocs}/api/class/api_status.class.php (100%)
 rename {public => htdocs}/api/class/index.html (100%)
 rename {public => htdocs}/api/index.php (100%)
 rename {public => htdocs}/asterisk/cidlookup.php (100%)
 rename {public => htdocs}/asterisk/index.html (100%)
 rename {public => htdocs}/asterisk/wrapper.php (100%)
 rename {public => htdocs}/barcode/codeinit.php (100%)
 rename {public => htdocs}/barcode/index.html (100%)
 rename {public => htdocs}/barcode/printsheet.php (100%)
 rename {public => htdocs}/bookmarks/admin/bookmark.php (100%)
 rename {public => htdocs}/bookmarks/admin/index.html (100%)
 rename {public => htdocs}/bookmarks/bookmarks.lib.php (100%)
 rename {public => htdocs}/bookmarks/card.php (100%)
 rename {public => htdocs}/bookmarks/class/bookmark.class.php (100%)
 rename {public => htdocs}/bookmarks/class/index.html (100%)
 rename {public => htdocs}/bookmarks/index.html (100%)
 rename {public => htdocs}/bookmarks/list.php (100%)
 rename {public => htdocs}/cache.manifest (100%)
 rename {public => htdocs}/cashdesk/admin/cashdesk.php (100%)
 rename {public => htdocs}/cashdesk/admin/index.html (100%)
 rename {public => htdocs}/cashdesk/affContenu.php (100%)
 rename {public => htdocs}/cashdesk/affIndex.php (100%)
 rename {public => htdocs}/cashdesk/affPied.php (100%)
 rename {public => htdocs}/cashdesk/class/Auth.class.php (100%)
 rename {public => htdocs}/cashdesk/class/Facturation.class.php (100%)
 rename {public => htdocs}/cashdesk/class/index.html (100%)
 rename {public => htdocs}/cashdesk/css/index.html (100%)
 rename {public => htdocs}/cashdesk/css/style.css (100%)
 rename {public => htdocs}/cashdesk/deconnexion.php (100%)
 rename {public => htdocs}/cashdesk/facturation.php (100%)
 rename {public => htdocs}/cashdesk/facturation_dhtml.php (100%)
 rename {public => htdocs}/cashdesk/facturation_verif.php (100%)
 rename {public => htdocs}/cashdesk/img/basket_delete.png (100%)
 rename {public => htdocs}/cashdesk/img/bg_conteneur_droite.png (100%)
 rename {public => htdocs}/cashdesk/img/bg_conteneur_gauche.png (100%)
 rename {public => htdocs}/cashdesk/img/bg_entete.png (100%)
 rename {public => htdocs}/cashdesk/img/bg_pied.png (100%)
 rename {public => htdocs}/cashdesk/img/calendrier.png (100%)
 rename {public => htdocs}/cashdesk/img/decrypted.png (100%)
 rename {public => htdocs}/cashdesk/img/gescom.png (100%)
 rename {public => htdocs}/cashdesk/img/index.html (100%)
 rename {public => htdocs}/cashdesk/img/lock.png (100%)
 rename {public => htdocs}/cashdesk/img/login.png (100%)
 rename {public => htdocs}/cashdesk/img/new.png (100%)
 rename {public => htdocs}/cashdesk/include/environnement.php (100%)
 rename {public => htdocs}/cashdesk/include/index.html (100%)
 rename {public => htdocs}/cashdesk/include/keypad.php (100%)
 rename {public => htdocs}/cashdesk/index.php (100%)
 rename {public => htdocs}/cashdesk/index_verif.php (100%)
 rename {public => htdocs}/cashdesk/javascript/dhtml.js (100%)
 rename {public => htdocs}/cashdesk/javascript/facturation1.js (100%)
 rename {public => htdocs}/cashdesk/javascript/index.html (100%)
 rename {public => htdocs}/cashdesk/javascript/keypad.js (100%)
 rename {public => htdocs}/cashdesk/tpl/facturation1.tpl.php (100%)
 rename {public => htdocs}/cashdesk/tpl/index.html (100%)
 rename {public => htdocs}/cashdesk/tpl/liste_articles.tpl.php (100%)
 rename {public => htdocs}/cashdesk/tpl/menu.tpl.php (100%)
 rename {public => htdocs}/cashdesk/tpl/ticket.tpl.php (100%)
 rename {public => htdocs}/cashdesk/tpl/validation1.tpl.php (100%)
 rename {public => htdocs}/cashdesk/tpl/validation2.tpl.php (100%)
 rename {public => htdocs}/cashdesk/validation.php (100%)
 rename {public => htdocs}/cashdesk/validation_ok.php (100%)
 rename {public => htdocs}/cashdesk/validation_ticket.php (100%)
 rename {public => htdocs}/cashdesk/validation_verif.php (100%)
 rename {public => htdocs}/categories/admin/categorie.php (100%)
 rename {public => htdocs}/categories/admin/categorie_extrafields.php (100%)
 rename {public => htdocs}/categories/admin/index.html (100%)
 rename {public => htdocs}/categories/card.php (100%)
 rename {public => htdocs}/categories/class/api_categories.class.php (100%)
 rename {public => htdocs}/categories/class/api_deprecated_category.class.php (100%)
 rename {public => htdocs}/categories/class/categorie.class.php (100%)
 rename {public => htdocs}/categories/class/index.html (100%)
 rename {public => htdocs}/categories/edit.php (100%)
 rename {public => htdocs}/categories/index.php (100%)
 rename {public => htdocs}/categories/photos.php (100%)
 rename {public => htdocs}/categories/traduction.php (100%)
 rename {public => htdocs}/categories/viewcat.php (100%)
 rename {public => htdocs}/comm/action/card.php (100%)
 rename {public => htdocs}/comm/action/class/actioncomm.class.php (100%)
 rename {public => htdocs}/comm/action/class/api_agendaevents.class.php (100%)
 rename {public => htdocs}/comm/action/class/cactioncomm.class.php (100%)
 rename {public => htdocs}/comm/action/class/ical.class.php (100%)
 rename {public => htdocs}/comm/action/class/index.html (100%)
 rename {public => htdocs}/comm/action/document.php (100%)
 rename {public => htdocs}/comm/action/index.php (100%)
 rename {public => htdocs}/comm/action/info.php (100%)
 rename {public => htdocs}/comm/action/listactions.php (100%)
 rename {public => htdocs}/comm/action/pertype.php (100%)
 rename {public => htdocs}/comm/action/peruser.php (100%)
 rename {public => htdocs}/comm/action/rapport/index.php (100%)
 rename {public => htdocs}/comm/address.php (100%)
 rename {public => htdocs}/comm/admin/index.html (100%)
 rename {public => htdocs}/comm/admin/propal_extrafields.php (100%)
 rename {public => htdocs}/comm/admin/propaldet_extrafields.php (100%)
 rename {public => htdocs}/comm/card.php (100%)
 rename {public => htdocs}/comm/contact.php (100%)
 rename {public => htdocs}/comm/index.php (100%)
 rename {public => htdocs}/comm/mailing/advtargetemailing.php (100%)
 rename {public => htdocs}/comm/mailing/card.php (100%)
 rename {public => htdocs}/comm/mailing/cibles.php (100%)
 rename {public => htdocs}/comm/mailing/class/advtargetemailing.class.php (100%)
 rename {public => htdocs}/comm/mailing/class/html.formadvtargetemailing.class.php (100%)
 rename {public => htdocs}/comm/mailing/class/index.html (100%)
 rename {public => htdocs}/comm/mailing/class/mailing.class.php (100%)
 rename {public => htdocs}/comm/mailing/index.php (100%)
 rename {public => htdocs}/comm/mailing/info.php (100%)
 rename {public => htdocs}/comm/mailing/list.php (100%)
 rename {public => htdocs}/comm/multiprix.php (100%)
 rename {public => htdocs}/comm/propal/apercu.php (100%)
 rename {public => htdocs}/comm/propal/card.php (100%)
 rename {public => htdocs}/comm/propal/class/api_proposals.class.php (100%)
 rename {public => htdocs}/comm/propal/class/index.html (100%)
 rename {public => htdocs}/comm/propal/class/propal.class.php (100%)
 rename {public => htdocs}/comm/propal/class/propalestats.class.php (100%)
 rename {public => htdocs}/comm/propal/contact.php (100%)
 rename {public => htdocs}/comm/propal/document.php (100%)
 rename {public => htdocs}/comm/propal/index.php (100%)
 rename {public => htdocs}/comm/propal/info.php (100%)
 rename {public => htdocs}/comm/propal/list.php (100%)
 rename {public => htdocs}/comm/propal/note.php (100%)
 rename {public => htdocs}/comm/propal/stats/index.php (100%)
 rename {public => htdocs}/comm/propal/tpl/index.html (100%)
 rename {public => htdocs}/comm/propal/tpl/linkedobjectblock.tpl.php (100%)
 rename {public => htdocs}/comm/prospect/index.php (100%)
 rename {public => htdocs}/comm/prospect/recap-prospect.php (100%)
 rename {public => htdocs}/comm/recap-client.php (100%)
 rename {public => htdocs}/comm/remise.php (100%)
 rename {public => htdocs}/comm/remx.php (100%)
 rename {public => htdocs}/commande/apercu.php (100%)
 rename {public => htdocs}/commande/card.php (100%)
 rename {public => htdocs}/commande/class/api_deprecated_commande.class.php (100%)
 rename {public => htdocs}/commande/class/api_orders.class.php (100%)
 rename {public => htdocs}/commande/class/commande.class.php (100%)
 rename {public => htdocs}/commande/class/commandestats.class.php (100%)
 rename {public => htdocs}/commande/class/index.html (100%)
 rename {public => htdocs}/commande/contact.php (100%)
 rename {public => htdocs}/commande/customer.php (100%)
 rename {public => htdocs}/commande/document.php (100%)
 rename {public => htdocs}/commande/index.php (100%)
 rename {public => htdocs}/commande/info.php (100%)
 rename {public => htdocs}/commande/list.php (100%)
 rename {public => htdocs}/commande/note.php (100%)
 rename {public => htdocs}/commande/orderstoinvoice.php (100%)
 rename {public => htdocs}/commande/stats/index.php (100%)
 rename {public => htdocs}/commande/tpl/index.html (100%)
 rename {public => htdocs}/commande/tpl/linkedobjectblock.tpl.php (100%)
 rename {public => htdocs}/compta/ajaxpayment.php (100%)
 rename {public => htdocs}/compta/bank/annuel.php (100%)
 rename {public => htdocs}/compta/bank/bankentries.php (100%)
 rename {public => htdocs}/compta/bank/bilan.php (100%)
 rename {public => htdocs}/compta/bank/budget.php (100%)
 rename {public => htdocs}/compta/bank/card.php (100%)
 rename {public => htdocs}/compta/bank/categ.php (100%)
 rename {public => htdocs}/compta/bank/class/account.class.php (100%)
 rename {public => htdocs}/compta/bank/class/api_bankaccounts.class.php (100%)
 rename {public => htdocs}/compta/bank/class/bankcateg.class.php (100%)
 rename {public => htdocs}/compta/bank/class/index.html (100%)
 rename {public => htdocs}/compta/bank/document.php (100%)
 rename {public => htdocs}/compta/bank/graph.php (100%)
 rename {public => htdocs}/compta/bank/index.php (100%)
 rename {public => htdocs}/compta/bank/info.php (100%)
 rename {public => htdocs}/compta/bank/ligne.php (100%)
 rename {public => htdocs}/compta/bank/releve.php (100%)
 rename {public => htdocs}/compta/bank/transfer.php (100%)
 rename {public => htdocs}/compta/bank/treso.php (100%)
 rename {public => htdocs}/compta/charges/index.php (100%)
 rename {public => htdocs}/compta/clients.php (100%)
 rename {public => htdocs}/compta/deplacement/card.php (100%)
 rename {public => htdocs}/compta/deplacement/class/deplacement.class.php (100%)
 rename {public => htdocs}/compta/deplacement/class/deplacementstats.class.php (100%)
 rename {public => htdocs}/compta/deplacement/class/index.html (100%)
 rename {public => htdocs}/compta/deplacement/document.php (100%)
 rename {public => htdocs}/compta/deplacement/index.php (100%)
 rename {public => htdocs}/compta/deplacement/info.php (100%)
 rename {public => htdocs}/compta/deplacement/list.php (100%)
 rename {public => htdocs}/compta/deplacement/stats/index.php (100%)
 rename {public => htdocs}/compta/facture.php (100%)
 rename {public => htdocs}/compta/facture/admin/facture_cust_extrafields.php (100%)
 rename {public => htdocs}/compta/facture/admin/facturedet_cust_extrafields.php (100%)
 rename {public => htdocs}/compta/facture/admin/index.html (100%)
 rename {public => htdocs}/compta/facture/apercu.php (100%)
 rename {public => htdocs}/compta/facture/class/api_deprecated_invoice.class.php (100%)
 rename {public => htdocs}/compta/facture/class/api_invoices.class.php (100%)
 rename {public => htdocs}/compta/facture/class/facture-rec.class.php (100%)
 rename {public => htdocs}/compta/facture/class/facture.class.php (100%)
 rename {public => htdocs}/compta/facture/class/facturestats.class.php (100%)
 rename {public => htdocs}/compta/facture/class/index.html (100%)
 rename {public => htdocs}/compta/facture/class/paymentterm.class.php (100%)
 rename {public => htdocs}/compta/facture/contact.php (100%)
 rename {public => htdocs}/compta/facture/document.php (100%)
 rename {public => htdocs}/compta/facture/fiche-rec.php (100%)
 rename {public => htdocs}/compta/facture/index.html (100%)
 rename {public => htdocs}/compta/facture/info.php (100%)
 rename {public => htdocs}/compta/facture/list.php (100%)
 rename {public => htdocs}/compta/facture/note.php (100%)
 rename {public => htdocs}/compta/facture/prelevement.php (100%)
 rename {public => htdocs}/compta/facture/stats/index.php (100%)
 rename {public => htdocs}/compta/facture/tpl/index.html (100%)
 rename {public => htdocs}/compta/facture/tpl/linkedobjectblock.tpl.php (100%)
 rename {public => htdocs}/compta/facture/tpl/linkedobjectblockForRec.tpl.php (100%)
 rename {public => htdocs}/compta/index.php (100%)
 rename {public => htdocs}/compta/journal/index.html (100%)
 rename {public => htdocs}/compta/journal/purchasesjournal.php (100%)
 rename {public => htdocs}/compta/journal/sellsjournal.php (100%)
 rename {public => htdocs}/compta/localtax/card.php (100%)
 rename {public => htdocs}/compta/localtax/class/index.html (100%)
 rename {public => htdocs}/compta/localtax/class/localtax.class.php (100%)
 rename {public => htdocs}/compta/localtax/clients.php (100%)
 rename {public => htdocs}/compta/localtax/index.php (100%)
 rename {public => htdocs}/compta/localtax/quadri_detail.php (100%)
 rename {public => htdocs}/compta/localtax/reglement.php (100%)
 rename {public => htdocs}/compta/paiement.php (100%)
 rename {public => htdocs}/compta/paiement/avalider.php (100%)
 rename {public => htdocs}/compta/paiement/card.php (100%)
 rename {public => htdocs}/compta/paiement/cheque/card.php (100%)
 rename {public => htdocs}/compta/paiement/cheque/class/index.html (100%)
 rename {public => htdocs}/compta/paiement/cheque/class/remisecheque.class.php (100%)
 rename {public => htdocs}/compta/paiement/cheque/index.php (100%)
 rename {public => htdocs}/compta/paiement/cheque/list.php (100%)
 rename {public => htdocs}/compta/paiement/class/cpaiement.class.php (100%)
 rename {public => htdocs}/compta/paiement/class/index.html (100%)
 rename {public => htdocs}/compta/paiement/class/paiement.class.php (100%)
 rename {public => htdocs}/compta/paiement/index.php (100%)
 rename {public => htdocs}/compta/paiement/info.php (100%)
 rename {public => htdocs}/compta/paiement/list.php (100%)
 rename {public => htdocs}/compta/paiement/rapport.php (100%)
 rename {public => htdocs}/compta/paiement_charge.php (100%)
 rename {public => htdocs}/compta/payment_sc/card.php (100%)
 rename {public => htdocs}/compta/payment_sc/index.html (100%)
 rename {public => htdocs}/compta/prelevement/bons.php (100%)
 rename {public => htdocs}/compta/prelevement/card.php (100%)
 rename {public => htdocs}/compta/prelevement/class/bonprelevement.class.php (100%)
 rename {public => htdocs}/compta/prelevement/class/index.html (100%)
 rename {public => htdocs}/compta/prelevement/class/ligneprelevement.class.php (100%)
 rename {public => htdocs}/compta/prelevement/class/rejetprelevement.class.php (100%)
 rename {public => htdocs}/compta/prelevement/create.php (100%)
 rename {public => htdocs}/compta/prelevement/demandes.php (100%)
 rename {public => htdocs}/compta/prelevement/factures.php (100%)
 rename {public => htdocs}/compta/prelevement/fiche-rejet.php (100%)
 rename {public => htdocs}/compta/prelevement/fiche-stat.php (100%)
 rename {public => htdocs}/compta/prelevement/index.php (100%)
 rename {public => htdocs}/compta/prelevement/ligne.php (100%)
 rename {public => htdocs}/compta/prelevement/list.php (100%)
 rename {public => htdocs}/compta/prelevement/rejets.php (100%)
 rename {public => htdocs}/compta/prelevement/stats.php (100%)
 rename {public => htdocs}/compta/recap-compta.php (100%)
 rename {public => htdocs}/compta/resultat/clientfourn.php (100%)
 rename {public => htdocs}/compta/resultat/index.php (100%)
 rename {public => htdocs}/compta/salaries/card.php (100%)
 rename {public => htdocs}/compta/salaries/class/index.html (100%)
 rename {public => htdocs}/compta/salaries/class/paymentsalary.class.php (100%)
 rename {public => htdocs}/compta/salaries/document.php (100%)
 rename {public => htdocs}/compta/salaries/index.php (100%)
 rename {public => htdocs}/compta/salaries/info.php (100%)
 rename {public => htdocs}/compta/sociales/card.php (100%)
 rename {public => htdocs}/compta/sociales/class/cchargesociales.class.php (100%)
 rename {public => htdocs}/compta/sociales/class/chargesociales.class.php (100%)
 rename {public => htdocs}/compta/sociales/class/index.html (100%)
 rename {public => htdocs}/compta/sociales/class/paymentsocialcontribution.class.php (100%)
 rename {public => htdocs}/compta/sociales/document.php (100%)
 rename {public => htdocs}/compta/sociales/index.php (100%)
 rename {public => htdocs}/compta/sociales/info.php (100%)
 rename {public => htdocs}/compta/sociales/payments.php (100%)
 rename {public => htdocs}/compta/stats/cabyprodserv.php (100%)
 rename {public => htdocs}/compta/stats/cabyuser.php (100%)
 rename {public => htdocs}/compta/stats/casoc.php (100%)
 rename {public => htdocs}/compta/stats/index.php (100%)
 rename {public => htdocs}/compta/tva/card.php (100%)
 rename {public => htdocs}/compta/tva/class/index.html (100%)
 rename {public => htdocs}/compta/tva/class/tva.class.php (100%)
 rename {public => htdocs}/compta/tva/clients.php (100%)
 rename {public => htdocs}/compta/tva/index.php (100%)
 rename {public => htdocs}/compta/tva/info.php (100%)
 rename {public => htdocs}/compta/tva/quadri.php (100%)
 rename {public => htdocs}/compta/tva/quadri_detail.php (100%)
 rename {public => htdocs}/compta/tva/quarter_report.php (100%)
 rename {public => htdocs}/compta/tva/reglement.php (100%)
 rename {public => htdocs}/conf/.gitignore (100%)
 rename {public => htdocs}/conf/.htaccess (100%)
 rename {public => htdocs}/conf/conf.php.example (100%)
 rename {public => htdocs}/conf/index.html (100%)
 rename {public => htdocs}/contact/canvas/actions_contactcard_common.class.php (100%)
 rename {public => htdocs}/contact/canvas/default/actions_contactcard_default.class.php (100%)
 rename {public => htdocs}/contact/canvas/default/index.html (100%)
 rename {public => htdocs}/contact/canvas/default/tpl/contactcard_create.tpl.php (100%)
 rename {public => htdocs}/contact/canvas/default/tpl/contactcard_edit.tpl.php (100%)
 rename {public => htdocs}/contact/canvas/default/tpl/contactcard_view.tpl.php (100%)
 rename {public => htdocs}/contact/canvas/default/tpl/index.html (100%)
 rename {public => htdocs}/contact/canvas/index.html (100%)
 rename {public => htdocs}/contact/card.php (100%)
 rename {public => htdocs}/contact/class/contact.class.php (100%)
 rename {public => htdocs}/contact/class/index.html (100%)
 rename {public => htdocs}/contact/document.php (100%)
 rename {public => htdocs}/contact/index.html (100%)
 rename {public => htdocs}/contact/info.php (100%)
 rename {public => htdocs}/contact/ldap.php (100%)
 rename {public => htdocs}/contact/list.php (100%)
 rename {public => htdocs}/contact/note.php (100%)
 rename {public => htdocs}/contact/perso.php (100%)
 rename {public => htdocs}/contact/vcard.php (100%)
 rename {public => htdocs}/contrat/admin/contract_extrafields.php (100%)
 rename {public => htdocs}/contrat/admin/contractdet_extrafields.php (100%)
 rename {public => htdocs}/contrat/admin/index.html (100%)
 rename {public => htdocs}/contrat/card.php (100%)
 rename {public => htdocs}/contrat/class/contrat.class.php (100%)
 rename {public => htdocs}/contrat/class/index.html (100%)
 rename {public => htdocs}/contrat/contact.php (100%)
 rename {public => htdocs}/contrat/document.php (100%)
 rename {public => htdocs}/contrat/index.php (100%)
 rename {public => htdocs}/contrat/info.php (100%)
 rename {public => htdocs}/contrat/list.php (100%)
 rename {public => htdocs}/contrat/note.php (100%)
 rename {public => htdocs}/contrat/services.php (100%)
 rename {public => htdocs}/contrat/tpl/index.html (100%)
 rename {public => htdocs}/contrat/tpl/linkedobjectblock.tpl.php (100%)
 rename {public => htdocs}/core/actions_builddoc.inc.php (100%)
 rename {public => htdocs}/core/actions_changeselectedfields.inc.php (100%)
 rename {public => htdocs}/core/actions_dellink.inc.php (100%)
 rename {public => htdocs}/core/actions_extrafields.inc.php (100%)
 rename {public => htdocs}/core/actions_fetchobject.inc.php (100%)
 rename {public => htdocs}/core/actions_lineupdown.inc.php (100%)
 rename {public => htdocs}/core/actions_linkedfiles.inc.php (100%)
 rename {public => htdocs}/core/actions_massactions.inc.php (100%)
 rename {public => htdocs}/core/actions_printing.inc.php (100%)
 rename {public => htdocs}/core/actions_sendmails.inc.php (100%)
 rename {public => htdocs}/core/actions_setnotes.inc.php (100%)
 rename {public => htdocs}/core/ajax/ajaxdirpreview.php (100%)
 rename {public => htdocs}/core/ajax/ajaxdirtree.php (100%)
 rename {public => htdocs}/core/ajax/bankconciliate.php (100%)
 rename {public => htdocs}/core/ajax/box.php (100%)
 rename {public => htdocs}/core/ajax/constantonoff.php (100%)
 rename {public => htdocs}/core/ajax/contacts.php (100%)
 rename {public => htdocs}/core/ajax/extraparams.php (100%)
 rename {public => htdocs}/core/ajax/fileupload.php (100%)
 rename {public => htdocs}/core/ajax/index.html (100%)
 rename {public => htdocs}/core/ajax/loadinplace.php (100%)
 rename {public => htdocs}/core/ajax/objectonoff.php (100%)
 rename {public => htdocs}/core/ajax/price.php (100%)
 rename {public => htdocs}/core/ajax/row.php (100%)
 rename {public => htdocs}/core/ajax/saveinplace.php (100%)
 rename {public => htdocs}/core/ajax/security.php (100%)
 rename {public => htdocs}/core/ajax/selectsearchbox.php (100%)
 rename {public => htdocs}/core/ajax/vatrates.php (100%)
 rename {public => htdocs}/core/ajax/ziptown.php (100%)
 rename {public => htdocs}/core/antispamimage.php (100%)
 rename {public => htdocs}/core/boxes/box_actions.php (100%)
 rename {public => htdocs}/core/boxes/box_activity.php (100%)
 rename {public => htdocs}/core/boxes/box_bookmarks.php (100%)
 rename {public => htdocs}/core/boxes/box_clients.php (100%)
 rename {public => htdocs}/core/boxes/box_commandes.php (100%)
 rename {public => htdocs}/core/boxes/box_comptes.php (100%)
 rename {public => htdocs}/core/boxes/box_contacts.php (100%)
 rename {public => htdocs}/core/boxes/box_contracts.php (100%)
 rename {public => htdocs}/core/boxes/box_external_rss.php (100%)
 rename {public => htdocs}/core/boxes/box_factures.php (100%)
 rename {public => htdocs}/core/boxes/box_factures_fourn.php (100%)
 rename {public => htdocs}/core/boxes/box_factures_fourn_imp.php (100%)
 rename {public => htdocs}/core/boxes/box_factures_imp.php (100%)
 rename {public => htdocs}/core/boxes/box_ficheinter.php (100%)
 rename {public => htdocs}/core/boxes/box_fournisseurs.php (100%)
 rename {public => htdocs}/core/boxes/box_goodcustomers.php (100%)
 rename {public => htdocs}/core/boxes/box_graph_invoices_permonth.php (100%)
 rename {public => htdocs}/core/boxes/box_graph_invoices_supplier_permonth.php (100%)
 rename {public => htdocs}/core/boxes/box_graph_orders_permonth.php (100%)
 rename {public => htdocs}/core/boxes/box_graph_orders_supplier_permonth.php (100%)
 rename {public => htdocs}/core/boxes/box_graph_product_distribution.php (100%)
 rename {public => htdocs}/core/boxes/box_graph_propales_permonth.php (100%)
 rename {public => htdocs}/core/boxes/box_members.php (100%)
 rename {public => htdocs}/core/boxes/box_produits.php (100%)
 rename {public => htdocs}/core/boxes/box_produits_alerte_stock.php (100%)
 rename {public => htdocs}/core/boxes/box_project.php (100%)
 rename {public => htdocs}/core/boxes/box_propales.php (100%)
 rename {public => htdocs}/core/boxes/box_prospect.php (100%)
 rename {public => htdocs}/core/boxes/box_services_contracts.php (100%)
 rename {public => htdocs}/core/boxes/box_services_expired.php (100%)
 rename {public => htdocs}/core/boxes/box_supplier_orders.php (100%)
 rename {public => htdocs}/core/boxes/box_task.php (100%)
 rename {public => htdocs}/core/boxes/index.html (100%)
 rename {public => htdocs}/core/boxes/modules_boxes.php (100%)
 rename {public => htdocs}/core/class/CMailFile.class.php (100%)
 rename {public => htdocs}/core/class/CSMSFile.class.php (100%)
 rename {public => htdocs}/core/class/antivir.class.php (100%)
 rename {public => htdocs}/core/class/canvas.class.php (100%)
 rename {public => htdocs}/core/class/ccountry.class.php (100%)
 rename {public => htdocs}/core/class/commondocgenerator.class.php (100%)
 rename {public => htdocs}/core/class/commoninvoice.class.php (100%)
 rename {public => htdocs}/core/class/commonobject.class.php (100%)
 rename {public => htdocs}/core/class/commonobjectline.class.php (100%)
 rename {public => htdocs}/core/class/commonorder.class.php (100%)
 rename {public => htdocs}/core/class/commonstickergenerator.class.php (100%)
 rename {public => htdocs}/core/class/conf.class.php (100%)
 rename {public => htdocs}/core/class/cookie.class.php (100%)
 rename {public => htdocs}/core/class/cstate.class.php (100%)
 rename {public => htdocs}/core/class/ctypent.class.php (100%)
 rename {public => htdocs}/core/class/discount.class.php (100%)
 rename {public => htdocs}/core/class/doleditor.class.php (100%)
 rename {public => htdocs}/core/class/dolexception.class.php (100%)
 rename {public => htdocs}/core/class/dolgeoip.class.php (100%)
 rename {public => htdocs}/core/class/dolgraph.class.php (100%)
 rename {public => htdocs}/core/class/dolprintipp.class.php (100%)
 rename {public => htdocs}/core/class/dolreceiptprinter.class.php (100%)
 rename {public => htdocs}/core/class/events.class.php (100%)
 rename {public => htdocs}/core/class/extrafields.class.php (100%)
 rename {public => htdocs}/core/class/fileupload.class.php (100%)
 rename {public => htdocs}/core/class/fiscalyear.class.php (100%)
 rename {public => htdocs}/core/class/genericobject.class.php (100%)
 rename {public => htdocs}/core/class/google.class.php (100%)
 rename {public => htdocs}/core/class/hookmanager.class.php (100%)
 rename {public => htdocs}/core/class/html.form.class.php (100%)
 rename {public => htdocs}/core/class/html.formaccounting.class.php (100%)
 rename {public => htdocs}/core/class/html.formactions.class.php (100%)
 rename {public => htdocs}/core/class/html.formadmin.class.php (100%)
 rename {public => htdocs}/core/class/html.formbank.class.php (100%)
 rename {public => htdocs}/core/class/html.formbarcode.class.php (100%)
 rename {public => htdocs}/core/class/html.formcompany.class.php (100%)
 rename {public => htdocs}/core/class/html.formcontract.class.php (100%)
 rename {public => htdocs}/core/class/html.formcron.class.php (100%)
 rename {public => htdocs}/core/class/html.formfile.class.php (100%)
 rename {public => htdocs}/core/class/html.formintervention.class.php (100%)
 rename {public => htdocs}/core/class/html.formmail.class.php (100%)
 rename {public => htdocs}/core/class/html.formmailing.class.php (100%)
 rename {public => htdocs}/core/class/html.formmargin.class.php (100%)
 rename {public => htdocs}/core/class/html.formorder.class.php (100%)
 rename {public => htdocs}/core/class/html.formother.class.php (100%)
 rename {public => htdocs}/core/class/html.formprojet.class.php (100%)
 rename {public => htdocs}/core/class/html.formpropal.class.php (100%)
 rename {public => htdocs}/core/class/html.formsms.class.php (100%)
 rename {public => htdocs}/core/class/html.formsocialcontrib.class.php (100%)
 rename {public => htdocs}/core/class/index.html (100%)
 rename {public => htdocs}/core/class/infobox.class.php (100%)
 rename {public => htdocs}/core/class/interfaces.class.php (100%)
 rename {public => htdocs}/core/class/ldap.class.php (100%)
 rename {public => htdocs}/core/class/link.class.php (100%)
 rename {public => htdocs}/core/class/menu.class.php (100%)
 rename {public => htdocs}/core/class/menubase.class.php (100%)
 rename {public => htdocs}/core/class/notify.class.php (100%)
 rename {public => htdocs}/core/class/openid.class.php (100%)
 rename {public => htdocs}/core/class/rssparser.class.php (100%)
 rename {public => htdocs}/core/class/smtps.class.php (100%)
 rename {public => htdocs}/core/class/stats.class.php (100%)
 rename {public => htdocs}/core/class/translate.class.php (100%)
 rename {public => htdocs}/core/class/utils.class.php (100%)
 rename {public => htdocs}/core/class/vcard.class.php (100%)
 rename {public => htdocs}/core/class/workboardresponse.class.php (100%)
 rename {public => htdocs}/core/datepicker.php (100%)
 rename {public => htdocs}/core/db/Database.interface.php (100%)
 rename {public => htdocs}/core/db/DoliDB.class.php (100%)
 rename {public => htdocs}/core/db/index.html (100%)
 rename {public => htdocs}/core/db/mssql.class.php (100%)
 rename {public => htdocs}/core/db/mysqli.class.php (100%)
 rename {public => htdocs}/core/db/pgsql.class.php (100%)
 rename {public => htdocs}/core/db/sqlite3.class.php (100%)
 rename {public => htdocs}/core/doxygen.php (100%)
 rename {public => htdocs}/core/extrafieldsinexport.inc.php (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/browser.css (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/browser.php (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/frmactualfolder.php (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/frmcreatefolder.php (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/frmfolders.php (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/frmresourceslist.php (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/frmupload.php (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/Folder.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/FolderUp.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/ai.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/avi.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/bmp.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/cs.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/dll.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/doc.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/exe.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/fla.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/gif.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/htm.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/html.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/index.html (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/jpg.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/js.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/mdb.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/mp3.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/pdf.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/png.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/ppt.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/rdp.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/swf.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/swt.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/txt.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/vsd.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/xls.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/xml.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/32/zip.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/ai.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/avi.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/bmp.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/cs.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/default.icon.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/dll.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/doc.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/exe.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/fla.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/gif.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/htm.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/html.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/index.html (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/jpg.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/js.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/mdb.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/mp3.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/pdf.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/png.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/ppt.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/rdp.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/swf.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/swt.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/txt.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/vsd.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/xls.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/xml.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/icons/zip.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/images/index.html (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/index.html (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/js/common.js (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/js/fckxml.js (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/js/index.html (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/default/spacer.gif (100%)
 rename {public => htdocs}/core/filemanagerdol/browser/index.html (100%)
 rename {public => htdocs}/core/filemanagerdol/connectors/index.html (100%)
 rename {public => htdocs}/core/filemanagerdol/connectors/php/basexml.php (100%)
 rename {public => htdocs}/core/filemanagerdol/connectors/php/commands.php (100%)
 rename {public => htdocs}/core/filemanagerdol/connectors/php/config.php (100%)
 rename {public => htdocs}/core/filemanagerdol/connectors/php/connector.php (100%)
 rename {public => htdocs}/core/filemanagerdol/connectors/php/index.html (100%)
 rename {public => htdocs}/core/filemanagerdol/connectors/php/io.php (100%)
 rename {public => htdocs}/core/filemanagerdol/connectors/php/upload.php (100%)
 rename {public => htdocs}/core/filemanagerdol/connectors/php/util.php (100%)
 rename {public => htdocs}/core/filemanagerdol/index.html (100%)
 rename {public => htdocs}/core/get_menudiv.php (100%)
 rename {public => htdocs}/core/index.html (100%)
 rename {public => htdocs}/core/js/blockUI.js (100%)
 rename {public => htdocs}/core/js/datepicker.js.php (100%)
 rename {public => htdocs}/core/js/dst.js (100%)
 rename {public => htdocs}/core/js/editinplace.js (100%)
 rename {public => htdocs}/core/js/index.html (100%)
 rename {public => htdocs}/core/js/jnotify.js (100%)
 rename {public => htdocs}/core/js/lib_batch.js (100%)
 rename {public => htdocs}/core/js/lib_head.js.php (100%)
 rename {public => htdocs}/core/js/lib_photosresize.js (100%)
 rename {public => htdocs}/core/js/lib_rare.js (100%)
 rename {public => htdocs}/core/js/select2_locale.js.php (100%)
 rename {public => htdocs}/core/js/timepicker.js.php (100%)
 rename {public => htdocs}/core/js/timesheet.js (100%)
 rename {public => htdocs}/core/lib/accounting.lib.php (100%)
 rename {public => htdocs}/core/lib/admin.lib.php (100%)
 rename {public => htdocs}/core/lib/agenda.lib.php (100%)
 rename {public => htdocs}/core/lib/ajax.lib.php (100%)
 rename {public => htdocs}/core/lib/bank.lib.php (100%)
 rename {public => htdocs}/core/lib/barcode.lib.php (100%)
 rename {public => htdocs}/core/lib/categories.lib.php (100%)
 rename {public => htdocs}/core/lib/company.lib.php (100%)
 rename {public => htdocs}/core/lib/contact.lib.php (100%)
 rename {public => htdocs}/core/lib/contract.lib.php (100%)
 rename {public => htdocs}/core/lib/cron.lib.php (100%)
 rename {public => htdocs}/core/lib/date.lib.php (100%)
 rename {public => htdocs}/core/lib/doc.lib.php (100%)
 rename {public => htdocs}/core/lib/doleditor.lib.php (100%)
 rename {public => htdocs}/core/lib/donation.lib.php (100%)
 rename {public => htdocs}/core/lib/ecm.lib.php (100%)
 rename {public => htdocs}/core/lib/emailing.lib.php (100%)
 rename {public => htdocs}/core/lib/expedition.lib.php (100%)
 rename {public => htdocs}/core/lib/expensereport.lib.php (100%)
 rename {public => htdocs}/core/lib/fichinter.lib.php (100%)
 rename {public => htdocs}/core/lib/files.lib.php (100%)
 rename {public => htdocs}/core/lib/fiscalyear.lib.php (100%)
 rename {public => htdocs}/core/lib/format_cards.lib.php (100%)
 rename {public => htdocs}/core/lib/fourn.lib.php (100%)
 rename {public => htdocs}/core/lib/functions.lib.php (100%)
 rename {public => htdocs}/core/lib/functions2.lib.php (100%)
 rename {public => htdocs}/core/lib/functions_ch.lib.php (100%)
 rename {public => htdocs}/core/lib/functionsnumtoword.lib.php (100%)
 rename {public => htdocs}/core/lib/geturl.lib.php (100%)
 rename {public => htdocs}/core/lib/holiday.lib.php (100%)
 rename {public => htdocs}/core/lib/hrm.lib.php (100%)
 rename {public => htdocs}/core/lib/images.lib.php (100%)
 rename {public => htdocs}/core/lib/import.lib.php (100%)
 rename {public => htdocs}/core/lib/index.html (100%)
 rename {public => htdocs}/core/lib/invoice.lib.php (100%)
 rename {public => htdocs}/core/lib/invoice2.lib.php (100%)
 rename {public => htdocs}/core/lib/json.lib.php (100%)
 rename {public => htdocs}/core/lib/ldap.lib.php (100%)
 rename {public => htdocs}/core/lib/loan.lib.php (100%)
 rename {public => htdocs}/core/lib/mailmanspip.lib.php (100%)
 rename {public => htdocs}/core/lib/member.lib.php (100%)
 rename {public => htdocs}/core/lib/memory.lib.php (100%)
 rename {public => htdocs}/core/lib/multicurrency.lib.php (100%)
 rename {public => htdocs}/core/lib/oauth.lib.php (100%)
 rename {public => htdocs}/core/lib/order.lib.php (100%)
 rename {public => htdocs}/core/lib/payments.lib.php (100%)
 rename {public => htdocs}/core/lib/pdf.lib.php (100%)
 rename {public => htdocs}/core/lib/prelevement.lib.php (100%)
 rename {public => htdocs}/core/lib/price.lib.php (100%)
 rename {public => htdocs}/core/lib/product.lib.php (100%)
 rename {public => htdocs}/core/lib/project.lib.php (100%)
 rename {public => htdocs}/core/lib/propal.lib.php (100%)
 rename {public => htdocs}/core/lib/receiptprinter.lib.php (100%)
 rename {public => htdocs}/core/lib/report.lib.php (100%)
 rename {public => htdocs}/core/lib/resource.lib.php (100%)
 rename {public => htdocs}/core/lib/salaries.lib.php (100%)
 rename {public => htdocs}/core/lib/security.lib.php (100%)
 rename {public => htdocs}/core/lib/security2.lib.php (100%)
 rename {public => htdocs}/core/lib/sendings.lib.php (100%)
 rename {public => htdocs}/core/lib/stock.lib.php (100%)
 rename {public => htdocs}/core/lib/supplier_proposal.lib.php (100%)
 rename {public => htdocs}/core/lib/tax.lib.php (100%)
 rename {public => htdocs}/core/lib/treeview.lib.php (100%)
 rename {public => htdocs}/core/lib/trip.lib.php (100%)
 rename {public => htdocs}/core/lib/usergroups.lib.php (100%)
 rename {public => htdocs}/core/lib/vat.lib.php (100%)
 rename {public => htdocs}/core/lib/ws.lib.php (100%)
 rename {public => htdocs}/core/lib/xcal.lib.php (100%)
 rename {public => htdocs}/core/login/README.txt (100%)
 rename {public => htdocs}/core/login/functions_dolibarr.php (100%)
 rename {public => htdocs}/core/login/functions_empty.php (100%)
 rename {public => htdocs}/core/login/functions_forceuser.php (100%)
 rename {public => htdocs}/core/login/functions_http.php (100%)
 rename {public => htdocs}/core/login/functions_ldap.php (100%)
 rename {public => htdocs}/core/login/functions_openid.php (100%)
 rename {public => htdocs}/core/login/index.html (100%)
 rename {public => htdocs}/core/menus/index.html (100%)
 rename {public => htdocs}/core/menus/init_menu_auguria.sql (100%)
 rename {public => htdocs}/core/menus/standard/auguria.lib.php (100%)
 rename {public => htdocs}/core/menus/standard/auguria_menu.php (100%)
 rename {public => htdocs}/core/menus/standard/eldy.lib.php (100%)
 rename {public => htdocs}/core/menus/standard/eldy_menu.php (100%)
 rename {public => htdocs}/core/menus/standard/empty.php (100%)
 rename {public => htdocs}/core/menus/standard/index.html (100%)
 rename {public => htdocs}/core/modules/DolibarrModules.class.php (100%)
 rename {public => htdocs}/core/modules/action/index.html (100%)
 rename {public => htdocs}/core/modules/action/modules_action.php (100%)
 rename {public => htdocs}/core/modules/action/rapport.pdf.php (100%)
 rename {public => htdocs}/core/modules/bank/doc/pdf_ban.modules.php (100%)
 rename {public => htdocs}/core/modules/bank/doc/pdf_sepamandate.modules.php (100%)
 rename {public => htdocs}/core/modules/bank/modules_bank.php (100%)
 rename {public => htdocs}/core/modules/barcode/doc/index.html (100%)
 rename {public => htdocs}/core/modules/barcode/doc/phpbarcode.modules.php (100%)
 rename {public => htdocs}/core/modules/barcode/doc/tcpdfbarcode.modules.php (100%)
 rename {public => htdocs}/core/modules/barcode/index.html (100%)
 rename {public => htdocs}/core/modules/barcode/mod_barcode_product_standard.php (100%)
 rename {public => htdocs}/core/modules/barcode/modules_barcode.class.php (100%)
 rename {public => htdocs}/core/modules/cheque/doc/index.html (100%)
 rename {public => htdocs}/core/modules/cheque/doc/pdf_blochet.class.php (100%)
 rename {public => htdocs}/core/modules/cheque/index.html (100%)
 rename {public => htdocs}/core/modules/cheque/mod_chequereceipt_mint.php (100%)
 rename {public => htdocs}/core/modules/cheque/mod_chequereceipt_thyme.php (100%)
 rename {public => htdocs}/core/modules/cheque/modules_chequereceipts.php (100%)
 rename {public => htdocs}/core/modules/commande/doc/doc_generic_order_odt.modules.php (100%)
 rename {public => htdocs}/core/modules/commande/doc/index.html (100%)
 rename {public => htdocs}/core/modules/commande/doc/pdf_einstein.modules.php (100%)
 rename {public => htdocs}/core/modules/commande/doc/pdf_proforma.modules.php (100%)
 rename {public => htdocs}/core/modules/commande/index.html (100%)
 rename {public => htdocs}/core/modules/commande/mod_commande_marbre.php (100%)
 rename {public => htdocs}/core/modules/commande/mod_commande_saphir.php (100%)
 rename {public => htdocs}/core/modules/commande/modules_commande.php (100%)
 rename {public => htdocs}/core/modules/contract/doc/index.html (100%)
 rename {public => htdocs}/core/modules/contract/doc/pdf_strato.modules.php (100%)
 rename {public => htdocs}/core/modules/contract/index.html (100%)
 rename {public => htdocs}/core/modules/contract/mod_contract_magre.php (100%)
 rename {public => htdocs}/core/modules/contract/mod_contract_olive.php (100%)
 rename {public => htdocs}/core/modules/contract/mod_contract_serpis.php (100%)
 rename {public => htdocs}/core/modules/contract/modules_contract.php (100%)
 rename {public => htdocs}/core/modules/dons/html_cerfafr.html (100%)
 rename {public => htdocs}/core/modules/dons/html_cerfafr.modules.php (100%)
 rename {public => htdocs}/core/modules/dons/index.html (100%)
 rename {public => htdocs}/core/modules/dons/modules_don.php (100%)
 rename {public => htdocs}/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php (100%)
 rename {public => htdocs}/core/modules/expedition/doc/index.html (100%)
 rename {public => htdocs}/core/modules/expedition/doc/pdf_merou.modules.php (100%)
 rename {public => htdocs}/core/modules/expedition/doc/pdf_rouget.modules.php (100%)
 rename {public => htdocs}/core/modules/expedition/index.html (100%)
 rename {public => htdocs}/core/modules/expedition/mod_expedition_ribera.php (100%)
 rename {public => htdocs}/core/modules/expedition/mod_expedition_safor.php (100%)
 rename {public => htdocs}/core/modules/expedition/modules_expedition.php (100%)
 rename {public => htdocs}/core/modules/expensereport/doc/pdf_standard.modules.php (100%)
 rename {public => htdocs}/core/modules/expensereport/modules_expensereport.php (100%)
 rename {public => htdocs}/core/modules/export/export_csv.modules.php (100%)
 rename {public => htdocs}/core/modules/export/export_excel.modules.php (100%)
 rename {public => htdocs}/core/modules/export/export_excel2007.modules.php (100%)
 rename {public => htdocs}/core/modules/export/export_tsv.modules.php (100%)
 rename {public => htdocs}/core/modules/export/index.html (100%)
 rename {public => htdocs}/core/modules/export/modules_export.php (100%)
 rename {public => htdocs}/core/modules/facture/doc/doc_generic_invoice_odt.modules.php (100%)
 rename {public => htdocs}/core/modules/facture/doc/index.html (100%)
 rename {public => htdocs}/core/modules/facture/doc/pdf_crabe.modules.php (100%)
 rename {public => htdocs}/core/modules/facture/index.html (100%)
 rename {public => htdocs}/core/modules/facture/mod_facture_mars.php (100%)
 rename {public => htdocs}/core/modules/facture/mod_facture_mercure.php (100%)
 rename {public => htdocs}/core/modules/facture/mod_facture_terre.php (100%)
 rename {public => htdocs}/core/modules/facture/modules_facture.php (100%)
 rename {public => htdocs}/core/modules/fichinter/doc/index.html (100%)
 rename {public => htdocs}/core/modules/fichinter/doc/pdf_soleil.modules.php (100%)
 rename {public => htdocs}/core/modules/fichinter/index.html (100%)
 rename {public => htdocs}/core/modules/fichinter/mod_arctic.php (100%)
 rename {public => htdocs}/core/modules/fichinter/mod_pacific.php (100%)
 rename {public => htdocs}/core/modules/fichinter/modules_fichinter.php (100%)
 rename {public => htdocs}/core/modules/import/import_csv.modules.php (100%)
 rename {public => htdocs}/core/modules/import/import_xlsx.modules.php (100%)
 rename {public => htdocs}/core/modules/import/index.html (100%)
 rename {public => htdocs}/core/modules/import/modules_import.php (100%)
 rename {public => htdocs}/core/modules/index.html (100%)
 rename {public => htdocs}/core/modules/livraison/doc/index.html (100%)
 rename {public => htdocs}/core/modules/livraison/doc/pdf_typhon.modules.php (100%)
 rename {public => htdocs}/core/modules/livraison/index.html (100%)
 rename {public => htdocs}/core/modules/livraison/mod_livraison_jade.php (100%)
 rename {public => htdocs}/core/modules/livraison/mod_livraison_saphir.php (100%)
 rename {public => htdocs}/core/modules/livraison/modules_livraison.php (100%)
 rename {public => htdocs}/core/modules/mailings/README (100%)
 rename {public => htdocs}/core/modules/mailings/advthirdparties.modules.php (100%)
 rename {public => htdocs}/core/modules/mailings/contacts1.modules.php (100%)
 rename {public => htdocs}/core/modules/mailings/contacts2.modules.php (100%)
 rename {public => htdocs}/core/modules/mailings/contacts3.modules.php (100%)
 rename {public => htdocs}/core/modules/mailings/contacts4.modules.php (100%)
 rename {public => htdocs}/core/modules/mailings/example.modules.php (100%)
 rename {public => htdocs}/core/modules/mailings/fraise.modules.php (100%)
 rename {public => htdocs}/core/modules/mailings/framboise.modules.php (100%)
 rename {public => htdocs}/core/modules/mailings/index.html (100%)
 rename {public => htdocs}/core/modules/mailings/modules_mailings.php (100%)
 rename {public => htdocs}/core/modules/mailings/pomme.modules.php (100%)
 rename {public => htdocs}/core/modules/mailings/thirdparties.modules.php (100%)
 rename {public => htdocs}/core/modules/mailings/thirdparties_services_expired.modules.php (100%)
 rename {public => htdocs}/core/modules/mailings/xinputfile.modules.php (100%)
 rename {public => htdocs}/core/modules/mailings/xinputuser.modules.php (100%)
 rename {public => htdocs}/core/modules/member/doc/index.html (100%)
 rename {public => htdocs}/core/modules/member/doc/pdf_standard.class.php (100%)
 rename {public => htdocs}/core/modules/member/index.html (100%)
 rename {public => htdocs}/core/modules/member/modules_cards.php (100%)
 rename {public => htdocs}/core/modules/modAccounting.class.php (100%)
 rename {public => htdocs}/core/modules/modAdherent.class.php (100%)
 rename {public => htdocs}/core/modules/modAgenda.class.php (100%)
 rename {public => htdocs}/core/modules/modApi.class.php (100%)
 rename {public => htdocs}/core/modules/modBanque.class.php (100%)
 rename {public => htdocs}/core/modules/modBarcode.class.php (100%)
 rename {public => htdocs}/core/modules/modBookmark.class.php (100%)
 rename {public => htdocs}/core/modules/modCashDesk.class.php (100%)
 rename {public => htdocs}/core/modules/modCategorie.class.php (100%)
 rename {public => htdocs}/core/modules/modClickToDial.class.php (100%)
 rename {public => htdocs}/core/modules/modCommande.class.php (100%)
 rename {public => htdocs}/core/modules/modComptabilite.class.php (100%)
 rename {public => htdocs}/core/modules/modContrat.class.php (100%)
 rename {public => htdocs}/core/modules/modCron.class.php (100%)
 rename {public => htdocs}/core/modules/modDeplacement.class.php (100%)
 rename {public => htdocs}/core/modules/modDocumentGeneration.class.php (100%)
 rename {public => htdocs}/core/modules/modDon.class.php (100%)
 rename {public => htdocs}/core/modules/modDynamicPrices.class.php (100%)
 rename {public => htdocs}/core/modules/modECM.class.php (100%)
 rename {public => htdocs}/core/modules/modExpedition.class.php (100%)
 rename {public => htdocs}/core/modules/modExpenseReport.class.php (100%)
 rename {public => htdocs}/core/modules/modExport.class.php (100%)
 rename {public => htdocs}/core/modules/modExternalRss.class.php (100%)
 rename {public => htdocs}/core/modules/modExternalSite.class.php (100%)
 rename {public => htdocs}/core/modules/modFTP.class.php (100%)
 rename {public => htdocs}/core/modules/modFacture.class.php (100%)
 rename {public => htdocs}/core/modules/modFckeditor.class.php (100%)
 rename {public => htdocs}/core/modules/modFicheinter.class.php (100%)
 rename {public => htdocs}/core/modules/modFournisseur.class.php (100%)
 rename {public => htdocs}/core/modules/modGeoIPMaxmind.class.php (100%)
 rename {public => htdocs}/core/modules/modGravatar.class.php (100%)
 rename {public => htdocs}/core/modules/modHRM.class.php (100%)
 rename {public => htdocs}/core/modules/modHoliday.class.php (100%)
 rename {public => htdocs}/core/modules/modImport.class.php (100%)
 rename {public => htdocs}/core/modules/modIncoterm.class.php (100%)
 rename {public => htdocs}/core/modules/modLabel.class.php (100%)
 rename {public => htdocs}/core/modules/modLdap.class.php (100%)
 rename {public => htdocs}/core/modules/modLoan.class.php (100%)
 rename {public => htdocs}/core/modules/modMailing.class.php (100%)
 rename {public => htdocs}/core/modules/modMailmanSpip.class.php (100%)
 rename {public => htdocs}/core/modules/modMargin.class.php (100%)
 rename {public => htdocs}/core/modules/modMultiCurrency.class.php (100%)
 rename {public => htdocs}/core/modules/modNotification.class.php (100%)
 rename {public => htdocs}/core/modules/modOauth.class.php (100%)
 rename {public => htdocs}/core/modules/modOpenSurvey.class.php (100%)
 rename {public => htdocs}/core/modules/modPaybox.class.php (100%)
 rename {public => htdocs}/core/modules/modPaypal.class.php (100%)
 rename {public => htdocs}/core/modules/modPrelevement.class.php (100%)
 rename {public => htdocs}/core/modules/modPrinting.class.php (100%)
 rename {public => htdocs}/core/modules/modProduct.class.php (100%)
 rename {public => htdocs}/core/modules/modProductBatch.class.php (100%)
 rename {public => htdocs}/core/modules/modProjet.class.php (100%)
 rename {public => htdocs}/core/modules/modPropale.class.php (100%)
 rename {public => htdocs}/core/modules/modReceiptPrinter.class.php (100%)
 rename {public => htdocs}/core/modules/modResource.class.php (100%)
 rename {public => htdocs}/core/modules/modSalaries.class.php (100%)
 rename {public => htdocs}/core/modules/modService.class.php (100%)
 rename {public => htdocs}/core/modules/modSkype.class.php (100%)
 rename {public => htdocs}/core/modules/modSociete.class.php (100%)
 rename {public => htdocs}/core/modules/modStock.class.php (100%)
 rename {public => htdocs}/core/modules/modSupplierProposal.class.php (100%)
 rename {public => htdocs}/core/modules/modSyslog.class.php (100%)
 rename {public => htdocs}/core/modules/modTax.class.php (100%)
 rename {public => htdocs}/core/modules/modUser.class.php (100%)
 rename {public => htdocs}/core/modules/modWebServices.class.php (100%)
 rename {public => htdocs}/core/modules/modWebServicesClient.class.php (100%)
 rename {public => htdocs}/core/modules/modWebsites.class.php (100%)
 rename {public => htdocs}/core/modules/modWorkflow.class.php (100%)
 rename {public => htdocs}/core/modules/oauth/google_oauthcallback.php (100%)
 rename {public => htdocs}/core/modules/oauth/index.html (100%)
 rename {public => htdocs}/core/modules/payment/mod_payment_ant.php (100%)
 rename {public => htdocs}/core/modules/payment/mod_payment_cicada.php (100%)
 rename {public => htdocs}/core/modules/payment/modules_payment.php (100%)
 rename {public => htdocs}/core/modules/printing/index.html (100%)
 rename {public => htdocs}/core/modules/printing/modules_printing.php (100%)
 rename {public => htdocs}/core/modules/printing/printgcp.modules.php (100%)
 rename {public => htdocs}/core/modules/printing/printipp.modules.php (100%)
 rename {public => htdocs}/core/modules/printsheet/doc/index.html (100%)
 rename {public => htdocs}/core/modules/printsheet/doc/pdf_standardlabel.class.php (100%)
 rename {public => htdocs}/core/modules/printsheet/doc/pdf_tcpdflabel.class.php (100%)
 rename {public => htdocs}/core/modules/printsheet/index.html (100%)
 rename {public => htdocs}/core/modules/printsheet/modules_labels.php (100%)
 rename {public => htdocs}/core/modules/product/index.html (100%)
 rename {public => htdocs}/core/modules/product/mod_codeproduct_elephant.php (100%)
 rename {public => htdocs}/core/modules/product/mod_codeproduct_leopard.php (100%)
 rename {public => htdocs}/core/modules/product/modules_product.class.php (100%)
 rename {public => htdocs}/core/modules/product/modules_product.php (100%)
 rename {public => htdocs}/core/modules/project/doc/doc_generic_project_odt.modules.php (100%)
 rename {public => htdocs}/core/modules/project/doc/index.html (100%)
 rename {public => htdocs}/core/modules/project/doc/pdf_baleine.modules.php (100%)
 rename {public => htdocs}/core/modules/project/doc/pdf_beluga.modules.php (100%)
 rename {public => htdocs}/core/modules/project/index.html (100%)
 rename {public => htdocs}/core/modules/project/mod_project_simple.php (100%)
 rename {public => htdocs}/core/modules/project/mod_project_universal.php (100%)
 rename {public => htdocs}/core/modules/project/modules_project.php (100%)
 rename {public => htdocs}/core/modules/project/task/doc/doc_generic_task_odt.modules.php (100%)
 rename {public => htdocs}/core/modules/project/task/doc/index.html (100%)
 rename {public => htdocs}/core/modules/project/task/index.html (100%)
 rename {public => htdocs}/core/modules/project/task/mod_task_simple.php (100%)
 rename {public => htdocs}/core/modules/project/task/mod_task_universal.php (100%)
 rename {public => htdocs}/core/modules/project/task/modules_task.php (100%)
 rename {public => htdocs}/core/modules/propale/doc/doc_generic_proposal_odt.modules.php (100%)
 rename {public => htdocs}/core/modules/propale/doc/index.html (100%)
 rename {public => htdocs}/core/modules/propale/doc/pdf_azur.modules.php (100%)
 rename {public => htdocs}/core/modules/propale/index.html (100%)
 rename {public => htdocs}/core/modules/propale/mod_propale_marbre.php (100%)
 rename {public => htdocs}/core/modules/propale/mod_propale_saphir.php (100%)
 rename {public => htdocs}/core/modules/propale/modules_propale.php (100%)
 rename {public => htdocs}/core/modules/rapport/index.html (100%)
 rename {public => htdocs}/core/modules/rapport/pdf_paiement.class.php (100%)
 rename {public => htdocs}/core/modules/security/generate/README (100%)
 rename {public => htdocs}/core/modules/security/generate/index.html (100%)
 rename {public => htdocs}/core/modules/security/generate/modGeneratePassNone.class.php (100%)
 rename {public => htdocs}/core/modules/security/generate/modGeneratePassPerso.class.php (100%)
 rename {public => htdocs}/core/modules/security/generate/modGeneratePassStandard.class.php (100%)
 rename {public => htdocs}/core/modules/security/generate/modules_genpassword.php (100%)
 rename {public => htdocs}/core/modules/security/index.html (100%)
 rename {public => htdocs}/core/modules/societe/doc/doc_generic_odt.modules.php (100%)
 rename {public => htdocs}/core/modules/societe/doc/index.html (100%)
 rename {public => htdocs}/core/modules/societe/index.html (100%)
 rename {public => htdocs}/core/modules/societe/mod_codeclient_elephant.php (100%)
 rename {public => htdocs}/core/modules/societe/mod_codeclient_leopard.php (100%)
 rename {public => htdocs}/core/modules/societe/mod_codeclient_monkey.php (100%)
 rename {public => htdocs}/core/modules/societe/mod_codecompta_aquarium.php (100%)
 rename {public => htdocs}/core/modules/societe/mod_codecompta_panicum.php (100%)
 rename {public => htdocs}/core/modules/societe/modules_societe.class.php (100%)
 rename {public => htdocs}/core/modules/supplier_invoice/index.html (100%)
 rename {public => htdocs}/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php (100%)
 rename {public => htdocs}/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php (100%)
 rename {public => htdocs}/core/modules/supplier_invoice/modules_facturefournisseur.php (100%)
 rename {public => htdocs}/core/modules/supplier_invoice/pdf/index.html (100%)
 rename {public => htdocs}/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php (100%)
 rename {public => htdocs}/core/modules/supplier_order/index.html (100%)
 rename {public => htdocs}/core/modules/supplier_order/mod_commande_fournisseur_muguet.php (100%)
 rename {public => htdocs}/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php (100%)
 rename {public => htdocs}/core/modules/supplier_order/modules_commandefournisseur.php (100%)
 rename {public => htdocs}/core/modules/supplier_order/pdf/index.html (100%)
 rename {public => htdocs}/core/modules/supplier_order/pdf/pdf_muscadet.modules.php (100%)
 rename {public => htdocs}/core/modules/supplier_payment/mod_supplier_payment_brodator.php (100%)
 rename {public => htdocs}/core/modules/supplier_payment/mod_supplier_payment_bronan.php (100%)
 rename {public => htdocs}/core/modules/supplier_payment/modules_supplier_payment.php (100%)
 rename {public => htdocs}/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php (100%)
 rename {public => htdocs}/core/modules/supplier_proposal/doc/index.html (100%)
 rename {public => htdocs}/core/modules/supplier_proposal/doc/pdf_aurore.modules.php (100%)
 rename {public => htdocs}/core/modules/supplier_proposal/index.html (100%)
 rename {public => htdocs}/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php (100%)
 rename {public => htdocs}/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php (100%)
 rename {public => htdocs}/core/modules/supplier_proposal/modules_supplier_proposal.php (100%)
 rename {public => htdocs}/core/modules/syslog/index.html (100%)
 rename {public => htdocs}/core/modules/syslog/logHandler.php (100%)
 rename {public => htdocs}/core/modules/syslog/logHandlerInterface.php (100%)
 rename {public => htdocs}/core/modules/syslog/mod_syslog_chromephp.php (100%)
 rename {public => htdocs}/core/modules/syslog/mod_syslog_file.php (100%)
 rename {public => htdocs}/core/modules/syslog/mod_syslog_firephp.php (100%)
 rename {public => htdocs}/core/modules/syslog/mod_syslog_syslog.php (100%)
 rename {public => htdocs}/core/photos_resize.php (100%)
 rename {public => htdocs}/core/search.php (100%)
 rename {public => htdocs}/core/search_page.php (100%)
 rename {public => htdocs}/core/tools.php (100%)
 rename {public => htdocs}/core/tpl/README (100%)
 rename {public => htdocs}/core/tpl/admin_extrafields_add.tpl.php (100%)
 rename {public => htdocs}/core/tpl/admin_extrafields_edit.tpl.php (100%)
 rename {public => htdocs}/core/tpl/admin_extrafields_view.tpl.php (100%)
 rename {public => htdocs}/core/tpl/ajax/fileupload_main.tpl.php (100%)
 rename {public => htdocs}/core/tpl/ajax/fileupload_view.tpl.php (100%)
 rename {public => htdocs}/core/tpl/ajax/index.html (100%)
 rename {public => htdocs}/core/tpl/ajaxrow.tpl.php (100%)
 rename {public => htdocs}/core/tpl/bloc_showhide.tpl.php (100%)
 rename {public => htdocs}/core/tpl/contacts.tpl.php (100%)
 rename {public => htdocs}/core/tpl/document_actions_post_headers.tpl.php (100%)
 rename {public => htdocs}/core/tpl/error.tpl.php (100%)
 rename {public => htdocs}/core/tpl/extrafields_view.tpl.php (100%)
 rename {public => htdocs}/core/tpl/footer.tpl.php (100%)
 rename {public => htdocs}/core/tpl/header.tpl.php (100%)
 rename {public => htdocs}/core/tpl/index.html (100%)
 rename {public => htdocs}/core/tpl/login.tpl.php (100%)
 rename {public => htdocs}/core/tpl/notes.tpl.php (100%)
 rename {public => htdocs}/core/tpl/objectline_create.tpl.php (100%)
 rename {public => htdocs}/core/tpl/objectline_edit.tpl.php (100%)
 rename {public => htdocs}/core/tpl/objectline_view.tpl.php (100%)
 rename {public => htdocs}/core/tpl/originproductline.tpl.php (100%)
 rename {public => htdocs}/core/tpl/passwordforgotten.tpl.php (100%)
 rename {public => htdocs}/core/tpl/resource_add.tpl.php (100%)
 rename {public => htdocs}/core/tpl/resource_view.tpl.php (100%)
 rename {public => htdocs}/core/triggers/README (100%)
 rename {public => htdocs}/core/triggers/README-FR (100%)
 rename {public => htdocs}/core/triggers/dolibarrtriggers.class.php (100%)
 rename {public => htdocs}/core/triggers/index.html (100%)
 rename {public => htdocs}/core/triggers/interface_20_all_Logevents.class.php (100%)
 rename {public => htdocs}/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php (100%)
 rename {public => htdocs}/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php (100%)
 rename {public => htdocs}/core/triggers/interface_50_modAgenda_ActionsAuto.class.php (100%)
 rename {public => htdocs}/core/triggers/interface_50_modLdap_Ldapsynchro.class.php (100%)
 rename {public => htdocs}/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php (100%)
 rename {public => htdocs}/core/triggers/interface_50_modNotification_Notification.class.php (100%)
 rename {public => htdocs}/core/triggers/interface_90_all_Demo.class.php-NORUN (100%)
 rename {public => htdocs}/cron/admin/cron.php (100%)
 rename {public => htdocs}/cron/admin/index.html (100%)
 rename {public => htdocs}/cron/card.php (100%)
 rename {public => htdocs}/cron/class/cronjob.class.php (100%)
 rename {public => htdocs}/cron/class/index.html (100%)
 rename {public => htdocs}/cron/index.html (100%)
 rename {public => htdocs}/cron/info.php (100%)
 rename {public => htdocs}/cron/list.php (100%)
 rename {public => htdocs}/custom/.gitignore (100%)
 rename {public => htdocs}/custom/README.md (100%)
 rename {public => htdocs}/custom/index.html (100%)
 rename {public => htdocs}/document.php (100%)
 rename {public => htdocs}/don/admin/donation.php (100%)
 rename {public => htdocs}/don/admin/donation_extrafields.php (100%)
 rename {public => htdocs}/don/admin/index.html (100%)
 rename {public => htdocs}/don/card.php (100%)
 rename {public => htdocs}/don/class/don.class.php (100%)
 rename {public => htdocs}/don/class/donstats.class.php (100%)
 rename {public => htdocs}/don/class/index.html (100%)
 rename {public => htdocs}/don/class/paymentdonation.class.php (100%)
 rename {public => htdocs}/don/document.php (100%)
 rename {public => htdocs}/don/index.html (100%)
 rename {public => htdocs}/don/index.php (100%)
 rename {public => htdocs}/don/info.php (100%)
 rename {public => htdocs}/don/list.php (100%)
 rename {public => htdocs}/don/note.php (100%)
 rename {public => htdocs}/don/payment/card.php (100%)
 rename {public => htdocs}/don/payment/index.html (100%)
 rename {public => htdocs}/don/payment/payment.php (100%)
 rename {public => htdocs}/don/stats/index.php (100%)
 rename {public => htdocs}/ecm/ajax/ecmdatabase.php (100%)
 rename {public => htdocs}/ecm/ajax/index.html (100%)
 rename {public => htdocs}/ecm/class/ecmdirectory.class.php (100%)
 rename {public => htdocs}/ecm/class/htmlecm.form.class.php (100%)
 rename {public => htdocs}/ecm/class/index.html (100%)
 rename {public => htdocs}/ecm/docdir.php (100%)
 rename {public => htdocs}/ecm/docfile.php (100%)
 rename {public => htdocs}/ecm/docmine.php (100%)
 rename {public => htdocs}/ecm/docother.php (100%)
 rename {public => htdocs}/ecm/index.php (100%)
 rename {public => htdocs}/ecm/index_auto.php (100%)
 rename {public => htdocs}/ecm/search.php (100%)
 rename {public => htdocs}/ecm/tpl/enablefiletreeajax.tpl.php (100%)
 rename {public => htdocs}/ecm/tpl/index.html (100%)
 rename {public => htdocs}/expedition/card.php (100%)
 rename {public => htdocs}/expedition/class/expedition.class.php (100%)
 rename {public => htdocs}/expedition/class/expeditionbatch.class.php (100%)
 rename {public => htdocs}/expedition/class/expeditionstats.class.php (100%)
 rename {public => htdocs}/expedition/class/index.html (100%)
 rename {public => htdocs}/expedition/contact.php (100%)
 rename {public => htdocs}/expedition/index.php (100%)
 rename {public => htdocs}/expedition/list.php (100%)
 rename {public => htdocs}/expedition/note.php (100%)
 rename {public => htdocs}/expedition/shipment.php (100%)
 rename {public => htdocs}/expedition/stats/index.php (100%)
 rename {public => htdocs}/expedition/stats/month.php (100%)
 rename {public => htdocs}/expedition/tpl/index.html (100%)
 rename {public => htdocs}/expedition/tpl/linkedobjectblock.tpl.php (100%)
 rename {public => htdocs}/expensereport/ajax/ajaxprojet.php (100%)
 rename {public => htdocs}/expensereport/ajax/index.html (100%)
 rename {public => htdocs}/expensereport/card.php (100%)
 rename {public => htdocs}/expensereport/class/api_expensereports.class.php (100%)
 rename {public => htdocs}/expensereport/class/expensereport.class.php (100%)
 rename {public => htdocs}/expensereport/class/expensereportstats.class.php (100%)
 rename {public => htdocs}/expensereport/class/index.html (100%)
 rename {public => htdocs}/expensereport/class/paymentexpensereport.class.php (100%)
 rename {public => htdocs}/expensereport/document.php (100%)
 rename {public => htdocs}/expensereport/export_csv.php (100%)
 rename {public => htdocs}/expensereport/index.html (100%)
 rename {public => htdocs}/expensereport/index.php (100%)
 rename {public => htdocs}/expensereport/info.php (100%)
 rename {public => htdocs}/expensereport/list.php (100%)
 rename {public => htdocs}/expensereport/note.php (100%)
 rename {public => htdocs}/expensereport/payment/card.php (100%)
 rename {public => htdocs}/expensereport/payment/index.html (100%)
 rename {public => htdocs}/expensereport/payment/payment.php (100%)
 rename {public => htdocs}/expensereport/stats/index.html (100%)
 rename {public => htdocs}/expensereport/stats/index.php (100%)
 rename {public => htdocs}/expensereport/synchro_compta.php (100%)
 rename {public => htdocs}/expensereport/tpl/index.html (100%)
 rename {public => htdocs}/expensereport/tpl/linkedobjectblock.tpl.php (100%)
 rename {public => htdocs}/exports/class/export.class.php (100%)
 rename {public => htdocs}/exports/class/index.html (100%)
 rename {public => htdocs}/exports/export.php (100%)
 rename {public => htdocs}/exports/index.php (100%)
 rename {public => htdocs}/externalsite/admin/externalsite.php (100%)
 rename {public => htdocs}/externalsite/admin/index.html (100%)
 rename {public => htdocs}/externalsite/frames.php (100%)
 rename {public => htdocs}/externalsite/frametop.php (100%)
 rename {public => htdocs}/externalsite/index.html (100%)
 rename {public => htdocs}/favicon.ico (100%)
 rename {public => htdocs}/fichinter/admin/fichinter_extrafields.php (100%)
 rename {public => htdocs}/fichinter/admin/fichinterdet_extrafields.php (100%)
 rename {public => htdocs}/fichinter/admin/index.html (100%)
 rename {public => htdocs}/fichinter/apercu.php (100%)
 rename {public => htdocs}/fichinter/card.php (100%)
 rename {public => htdocs}/fichinter/class/fichinter.class.php (100%)
 rename {public => htdocs}/fichinter/class/fichinterstats.class.php (100%)
 rename {public => htdocs}/fichinter/class/index.html (100%)
 rename {public => htdocs}/fichinter/contact.php (100%)
 rename {public => htdocs}/fichinter/document.php (100%)
 rename {public => htdocs}/fichinter/index.html (100%)
 rename {public => htdocs}/fichinter/index.php (100%)
 rename {public => htdocs}/fichinter/info.php (100%)
 rename {public => htdocs}/fichinter/list.php (100%)
 rename {public => htdocs}/fichinter/note.php (100%)
 rename {public => htdocs}/fichinter/stats/index.php (100%)
 rename {public => htdocs}/fichinter/tpl/index.html (100%)
 rename {public => htdocs}/fichinter/tpl/linkedobjectblock.tpl.php (100%)
 rename {public => htdocs}/filefunc.inc.php (100%)
 rename {public => htdocs}/fourn/ajax/getSupplierPrices.php (100%)
 rename {public => htdocs}/fourn/ajax/index.html (100%)
 rename {public => htdocs}/fourn/card.php (100%)
 rename {public => htdocs}/fourn/class/api_supplier_invoices.class.php (100%)
 rename {public => htdocs}/fourn/class/fournisseur.class.php (100%)
 rename {public => htdocs}/fourn/class/fournisseur.commande.class.php (100%)
 rename {public => htdocs}/fourn/class/fournisseur.commande.dispatch.class.php (100%)
 rename {public => htdocs}/fourn/class/fournisseur.facture.class.php (100%)
 rename {public => htdocs}/fourn/class/fournisseur.product.class.php (100%)
 rename {public => htdocs}/fourn/class/index.html (100%)
 rename {public => htdocs}/fourn/class/paiementfourn.class.php (100%)
 rename {public => htdocs}/fourn/commande/card.php (100%)
 rename {public => htdocs}/fourn/commande/contact.php (100%)
 rename {public => htdocs}/fourn/commande/dispatch.php (100%)
 rename {public => htdocs}/fourn/commande/document.php (100%)
 rename {public => htdocs}/fourn/commande/index.php (100%)
 rename {public => htdocs}/fourn/commande/info.php (100%)
 rename {public => htdocs}/fourn/commande/list.php (100%)
 rename {public => htdocs}/fourn/commande/note.php (100%)
 rename {public => htdocs}/fourn/commande/orderstoinvoice.php (100%)
 rename {public => htdocs}/fourn/commande/tpl/index.html (100%)
 rename {public => htdocs}/fourn/commande/tpl/linkedobjectblock.tpl.php (100%)
 rename {public => htdocs}/fourn/contact.php (100%)
 rename {public => htdocs}/fourn/facture/card.php (100%)
 rename {public => htdocs}/fourn/facture/contact.php (100%)
 rename {public => htdocs}/fourn/facture/document.php (100%)
 rename {public => htdocs}/fourn/facture/impayees.php (100%)
 rename {public => htdocs}/fourn/facture/index.html (100%)
 rename {public => htdocs}/fourn/facture/info.php (100%)
 rename {public => htdocs}/fourn/facture/list.php (100%)
 rename {public => htdocs}/fourn/facture/note.php (100%)
 rename {public => htdocs}/fourn/facture/paiement.php (100%)
 rename {public => htdocs}/fourn/facture/tpl/index.html (100%)
 rename {public => htdocs}/fourn/facture/tpl/linkedobjectblock.tpl.php (100%)
 rename {public => htdocs}/fourn/index.php (100%)
 rename {public => htdocs}/fourn/js/lib_dispatch.js (100%)
 rename {public => htdocs}/fourn/paiement/card.php (100%)
 rename {public => htdocs}/fourn/paiement/index.html (100%)
 rename {public => htdocs}/fourn/paiement/info.php (100%)
 rename {public => htdocs}/fourn/product/list.php (100%)
 rename {public => htdocs}/fourn/recap-fourn.php (100%)
 rename {public => htdocs}/ftp/admin/ftpclient.php (100%)
 rename {public => htdocs}/ftp/admin/index.html (100%)
 rename {public => htdocs}/ftp/index.php (100%)
 rename {public => htdocs}/holiday/card.php (100%)
 rename {public => htdocs}/holiday/class/holiday.class.php (100%)
 rename {public => htdocs}/holiday/class/index.html (100%)
 rename {public => htdocs}/holiday/common.inc.php (100%)
 rename {public => htdocs}/holiday/define_holiday.php (100%)
 rename {public => htdocs}/holiday/document.php (100%)
 rename {public => htdocs}/holiday/img/add.png (100%)
 rename {public => htdocs}/holiday/img/conges.png (100%)
 rename {public => htdocs}/holiday/img/delete.png (100%)
 rename {public => htdocs}/holiday/img/edit.png (100%)
 rename {public => htdocs}/holiday/img/index.html (100%)
 rename {public => htdocs}/holiday/index.html (100%)
 rename {public => htdocs}/holiday/list.php (100%)
 rename {public => htdocs}/holiday/view_log.php (100%)
 rename {public => htdocs}/hrm/admin/admin_establishment.php (100%)
 rename {public => htdocs}/hrm/admin/admin_hrm.php (100%)
 rename {public => htdocs}/hrm/admin/index.html (100%)
 rename {public => htdocs}/hrm/class/establishment.class.php (100%)
 rename {public => htdocs}/hrm/class/index.html (100%)
 rename {public => htdocs}/hrm/establishment/card.php (100%)
 rename {public => htdocs}/hrm/establishment/index.html (100%)
 rename {public => htdocs}/hrm/establishment/info.php (100%)
 rename {public => htdocs}/hrm/index.html (100%)
 rename {public => htdocs}/hrm/index.php (100%)
 rename {public => htdocs}/imports/class/import.class.php (100%)
 rename {public => htdocs}/imports/class/index.html (100%)
 rename {public => htdocs}/imports/emptyexample.php (100%)
 rename {public => htdocs}/imports/import.php (100%)
 rename {public => htdocs}/imports/index.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/AutoLoader.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Consumer/Credentials.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Consumer/CredentialsInterface.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Exception/Exception.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Http/Client/AbstractClient.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Http/Client/ClientInterface.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Http/Client/CurlClient.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Http/Client/StreamClient.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Http/Exception/TokenResponseException.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Http/Uri/Uri.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Http/Uri/UriFactory.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Http/Uri/UriFactoryInterface.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Http/Uri/UriInterface.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Service/AbstractService.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Service/ServiceInterface.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Storage/DoliStorage.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Storage/Exception/AuthorizationStateNotFoundException.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Storage/Exception/StorageException.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Storage/Exception/TokenNotFoundException.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Storage/Memory.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Storage/Redis.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Storage/Session.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Storage/SymfonySession.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Storage/TokenStorageInterface.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Token/AbstractToken.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Token/Exception/ExpiredTokenException.php (100%)
 rename {public => htdocs}/includes/OAuth/Common/Token/TokenInterface.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Service/AbstractService.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Service/BitBucket.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Service/Etsy.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Service/FitBit.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Service/FiveHundredPx.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Service/Flickr.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Service/QuickBooks.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Service/Redmine.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Service/ScoopIt.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Service/ServiceInterface.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Service/Tumblr.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Service/Twitter.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Service/Xing.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Service/Yahoo.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Signature/Exception/UnsupportedHashAlgorithmException.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Signature/Signature.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Signature/SignatureInterface.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Token/StdOAuth1Token.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth1/Token/TokenInterface.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/AbstractService.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Amazon.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Bitly.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Bitrix24.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Box.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Buffer.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Dailymotion.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Delicious.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/DeviantArt.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Dropbox.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/EveOnline.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Exception/InvalidAccessTypeException.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Exception/InvalidAuthorizationStateException.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Exception/InvalidScopeException.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Exception/MissingRefreshTokenException.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Facebook.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Foursquare.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/GitHub.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Google.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Harvest.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Heroku.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Hubic.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Instagram.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/JawboneUP.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Linkedin.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Mailchimp.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Microsoft.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Nest.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Netatmo.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/ParrotFlowerPower.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Paypal.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Pocket.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Reddit.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/RunKeeper.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Salesforce.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/ServiceInterface.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/SoundCloud.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Spotify.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Strava.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Ustream.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Vimeo.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Vkontakte.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Yahoo.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Service/Yammer.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Token/StdOAuth2Token.php (100%)
 rename {public => htdocs}/includes/OAuth/OAuth2/Token/TokenInterface.php (100%)
 rename {public => htdocs}/includes/OAuth/ServiceFactory.php (100%)
 rename {public => htdocs}/includes/OAuth/bootstrap.php (100%)
 rename {public => htdocs}/includes/adodbtime/adodb-time.inc.php (100%)
 rename {public => htdocs}/includes/adodbtime/index.html (100%)
 rename {public => htdocs}/includes/ccampbell/chromephp/ChromePhp.php (100%)
 rename {public => htdocs}/includes/ccampbell/chromephp/README.md (100%)
 rename {public => htdocs}/includes/ccampbell/chromephp/composer.json (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/CHANGES.md (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/LICENSE.md (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/README.md (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/adapters/jquery.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/bower.json (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/build-config.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/ckeditor.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/composer.json (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/config.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/contents.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/af.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/ar.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/bg.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/bn.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/bs.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/ca.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/cs.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/cy.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/da.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/de-ch.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/de.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/el.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/en-au.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/en-ca.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/en-gb.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/en.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/eo.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/es.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/et.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/eu.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/fa.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/fi.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/fo.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/fr-ca.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/fr.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/gl.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/gu.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/he.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/hi.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/hr.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/hu.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/id.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/is.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/it.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/ja.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/ka.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/km.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/ko.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/ku.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/lt.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/lv.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/mk.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/mn.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/ms.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/nb.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/nl.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/no.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/pl.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/pt-br.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/pt.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/ro.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/ru.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/si.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/sk.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/sl.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/sq.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/sr-latn.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/sr.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/sv.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/th.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/tr.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/tt.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/ug.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/uk.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/vi.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/zh-cn.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/lang/zh.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/package.json (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/about/dialogs/logo_ckeditor.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/div/dialogs/div.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/flash/dialogs/flash.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/flash/images/placeholder.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/forms/images/hiddenfield.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/icons.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/icons_hidpi.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/iframe/images/placeholder.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/image/images/noimage.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/link/images/anchor.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/link/images/hidpi/anchor.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/magicline/images/icon-rtl.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/magicline/images/icon.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/pagebreak/images/pagebreak.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/preview/preview.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/scayt/README.md (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/scayt/dialogs/toolbar.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_address.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_blockquote.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_div.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h1.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h2.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h3.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h4.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h5.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h6.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_p.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/showblocks/images/block_pre.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/embaressed_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/heart.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/heart.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/tounge_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/templates/templates/default.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/templates/templates/images/template1.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/templates/templates/images/template2.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/templates/templates/images/template3.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/wsc/README.md (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmpFrameset.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc_ie.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/css/samples.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/img/github-top.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/img/header-bg.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/img/header-separator.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/img/logo.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/img/navigation-tip.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/index.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/js/sample.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/js/sf.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/ajax.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/api.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/appendto.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/assets/inlineall/logo.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/assets/posteddata.php (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/assets/sample.jpg (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/assets/uilanguages/languages.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/datafiltering.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/dialog/assets/my_dialog.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/dialog/dialog.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/divreplace.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/enterkey/enterkey.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputforflash.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputhtml.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/index.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/inlineall.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/inlinebycode.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/inlinetextarea.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/jquery.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/magicline/magicline.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/readonly.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/replacebyclass.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/replacebycode.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/sample.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/sample.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/sample_posteddata.php (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/tabindex.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/toolbar/toolbar.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/uicolor.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/uilanguages.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/old/xhtmlstyle.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/css/fontello.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/config.json (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.eot (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.svg (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.ttf (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.woff (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/dialog.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/editor.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/editor_ie.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/icons.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/icons_hidpi.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/images/arrow.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/images/close.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/images/hidpi/close.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/images/lock-open.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/images/lock.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/images/refresh.png (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/images/spinner.gif (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/skins/moono/readme.md (100%)
 rename {public => htdocs}/includes/ckeditor/ckeditor/styles.js (100%)
 rename {public => htdocs}/includes/evalmath/README.md (100%)
 rename {public => htdocs}/includes/evalmath/evalmath.class.php (100%)
 rename {public => htdocs}/includes/fonts/Aerial.ttf (100%)
 rename {public => htdocs}/includes/fonts/AerialBd.ttf (100%)
 rename {public => htdocs}/includes/fonts/AerialBdIt.ttf (100%)
 rename {public => htdocs}/includes/fonts/AerialIt.ttf (100%)
 rename {public => htdocs}/includes/fonts/CHANGELOG.TXT (100%)
 rename {public => htdocs}/includes/fonts/COPYRIGHT.TXT (100%)
 rename {public => htdocs}/includes/fpdfi/README.txt (100%)
 rename {public => htdocs}/includes/fpdfi/filters/FilterASCII85.php (100%)
 rename {public => htdocs}/includes/fpdfi/filters/FilterASCII85_FPDI.php (100%)
 rename {public => htdocs}/includes/fpdfi/filters/FilterASCIIHexDecode.php (100%)
 rename {public => htdocs}/includes/fpdfi/filters/FilterLZW.php (100%)
 rename {public => htdocs}/includes/fpdfi/filters/FilterLZW_FPDI.php (100%)
 rename {public => htdocs}/includes/fpdfi/fpdf_tpl.php (100%)
 rename {public => htdocs}/includes/fpdfi/fpdi.php (100%)
 rename {public => htdocs}/includes/fpdfi/fpdi_bridge.php (100%)
 rename {public => htdocs}/includes/fpdfi/fpdi_pdf_parser.php (100%)
 rename {public => htdocs}/includes/fpdfi/pdf_context.php (100%)
 rename {public => htdocs}/includes/fpdfi/pdf_parser.php (100%)
 rename {public => htdocs}/includes/geoip/README.txt (100%)
 rename {public => htdocs}/includes/geoip/geoip.inc (100%)
 rename {public => htdocs}/includes/geoip/geoipcity.inc (100%)
 rename {public => htdocs}/includes/geoip/geoipregionvars.php (100%)
 rename {public => htdocs}/includes/geoip/sample.php (100%)
 rename {public => htdocs}/includes/geoip/sample_city.php (100%)
 rename {public => htdocs}/includes/geoip/sample_distributed.php (100%)
 rename {public => htdocs}/includes/geoip/sample_netspeed.php (100%)
 rename {public => htdocs}/includes/geoip/sample_org.php (100%)
 rename {public => htdocs}/includes/geoip/sample_region.php (100%)
 rename {public => htdocs}/includes/index.html (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-icons_2e83ff_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-icons_469bdd_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-icons_cd0a0a_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-icons_d8e7f3_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/images/ui-icons_f9bd01_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/jquery-ui.css (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/jquery-ui.min.css (100%)
 rename {public => htdocs}/includes/jquery/css/redmond/theme.css (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/images/ui-icons_222222_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/images/ui-icons_454545_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/images/ui-icons_888888_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/jquery-ui.css (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/jquery-ui.min.css (100%)
 rename {public => htdocs}/includes/jquery/css/smoothness/theme.css (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/jquery-ui.css (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/jquery-ui.min.css (100%)
 rename {public => htdocs}/includes/jquery/css/ui-lightness/theme.css (100%)
 rename {public => htdocs}/includes/jquery/js/jquery-ui.js (100%)
 rename {public => htdocs}/includes/jquery/js/jquery-ui.min.js (100%)
 rename {public => htdocs}/includes/jquery/js/jquery.js (100%)
 rename {public => htdocs}/includes/jquery/js/jquery.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/blockUI/jquery.blockUI.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/colorpicker/jquery.colorpicker.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/colorpicker/jquery.colorpicker.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/fileupload/README.md (100%)
 rename {public => htdocs}/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/fileupload/img/loading.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/fileupload/img/progressbar.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/fileupload/js/cors/jquery.postmessage-transport.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/fileupload/js/jquery.fileupload.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/fileupload/js/locale.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/fileupload/js/main.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/fileupload/js/vendor/jquery.ui.widget.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/API.md (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/CONTRIBUTING.md (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/FAQ.md (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/LICENSE.txt (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/Makefile (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/NEWS.md (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/PLUGINS.md (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/README.md (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/excanvas.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/excanvas.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.colorhelpers.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.colorhelpers.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.canvas.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.canvas.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.categories.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.categories.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.crosshair.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.crosshair.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.errorbars.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.errorbars.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.fillbetween.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.fillbetween.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.image.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.image.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.navigate.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.navigate.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.pie.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.pie.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.resize.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.resize.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.selection.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.selection.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.stack.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.stack.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.symbol.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.symbol.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.threshold.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.threshold.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.time.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/flot/jquery.flot.time.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jcrop/css/Jcrop.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/jcrop/index.html (100%)
 rename {public => htdocs}/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jeditable/jquery.jeditable.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jeditable/jquery.jeditable.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/jnotify/jquery.jnotify.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/jnotify/jquery.jnotify.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jnotify/jquery.jnotify.min.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/jnotify/jquery.jnotify.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/ChangeLog.txt (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/Example.html (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/ReadMe.txt (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/images/AlphaBar.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/images/Bars.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/images/Maps.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/images/NoColor.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/images/bar-opacity.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/images/map-opacity.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/images/mappoint.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/images/picker.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/images/preview-opacity.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/images/rangearrows.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/jPicker.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/jpicker-1.1.6.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/application.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/code.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/css.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/db.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/directory.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/doc.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/file.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/film.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/flash.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/folder_open.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/html.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/java.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/linux.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/music.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/pdf.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/php.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/picture.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/ppt.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/psd.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/ruby.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/script.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/spinner.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/txt.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/xls.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/images/zip.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/changelog.md (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/ajax-loader.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/file.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/folder-closed.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/folder.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/minus.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/plus.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/treeview-black-line.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/treeview-black.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/treeview-default-line.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/treeview-default.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam-line.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/treeview-gray-line.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/treeview-gray.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/treeview-red-line.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/images/treeview-red.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/jquery.treeview.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/jquery.treeview.edit.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/jquery.treeview.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/readme.md (100%)
 rename {public => htdocs}/includes/jquery/plugins/jquerytreeview/screenshot.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/layout/jquery.layout.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/layout/jquery.layout.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/mobile/images/ajax-loader.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/mobile/images/icons-18-black.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/mobile/images/icons-18-white.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/mobile/images/icons-36-black.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/mobile/images/icons-36-white.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/mobile/jquery.mobile-latest.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/mobile/jquery.mobile-latest.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/multiselect/MIT-LICENSE.txt (100%)
 rename {public => htdocs}/includes/jquery/plugins/multiselect/css/ui.multiselect.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/multiselect/js/ui.multiselect.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/.gitignore (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/CONTRIBUTING.md (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/LICENSE (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/README.md (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/bower.json (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/component.json (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/composer.json (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/package.json (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/release.sh (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2-bootstrap.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2-spinner.gif (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2.jquery.json (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_ar.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_az.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_bg.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_ca.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_cs.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_da.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_de.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_el.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_en.js.template (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_es.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_et.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_eu.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_fa.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_fi.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_fr.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_gl.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_he.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_hr.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_hu.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_id.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_is.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_it.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_ja.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_ka.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_ko.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_lt.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_lv.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_mk.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_ms.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_nb.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_nl.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_pl.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_pt-BR.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_pt-PT.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_ro.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_rs.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_ru.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_sk.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_sv.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_th.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_tr.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_ug-CN.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_uk.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_vi.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_zh-CN.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2_locale_zh-TW.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/select2/select2x2.png (100%)
 rename {public => htdocs}/includes/jquery/plugins/tablednd/README.txt (100%)
 rename {public => htdocs}/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css (100%)
 rename {public => htdocs}/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/tiptip/jquery.tipTip.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/tiptip/jquery.tipTip.min.js (100%)
 rename {public => htdocs}/includes/jquery/plugins/tiptip/tipTip.css (100%)
 rename {public => htdocs}/includes/jsgantt/index.htm (100%)
 rename {public => htdocs}/includes/jsgantt/jsgantt.css (100%)
 rename {public => htdocs}/includes/jsgantt/jsgantt.js (100%)
 rename {public => htdocs}/includes/jsgantt/jsgantt.min.js (100%)
 rename {public => htdocs}/includes/jsgantt/jsgantt_Minutes.html (100%)
 rename {public => htdocs}/includes/jsgantt/jsgantt_exExternalXML.html (100%)
 rename {public => htdocs}/includes/jsgantt/project.xml (100%)
 rename {public => htdocs}/includes/jstz/jstz.js (100%)
 rename {public => htdocs}/includes/jstz/jstz.min.js (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/.gitignore (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/Escpos.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/LICENSE.md (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/README.md (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/composer.json (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/composer.lock (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/doc/Makefile (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/doc/escpos.conf (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/README.md (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/barcode.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/bit-image.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/character-encodings-with-images.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/character-encodings.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/character-tables.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/demo.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/graphics.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/interface/README.md (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/interface/ethernet.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/interface/linux-usb.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/interface/smb.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/interface/windows-lpt.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/interface/windows-usb.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/print-from-html.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/print-from-pdf.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/qr-code.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/receipt-with-logo.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/resources/character-encoding-test-strings.inc (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/resources/document.odt (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/resources/document.pdf (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/resources/document.z (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/resources/escpos-php-small.png (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/resources/escpos-php.png (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/resources/tux.png (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/specific/29-latvian-star-tup592.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/specific/32-german-tm-t20-ii-custom-command.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/specific/33-spanish-seypos-prp-300.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/specific/39-currency-symbols.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/specific/44-pound-symbol-star-tsp650.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/specific/50-P-822D-greek.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/specific/54-gfx-sidebyside.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/specific/6-arabic-epos-tep-220m.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/specific/README.md (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/example/text-size.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/AbstractCapabilityProfile.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/CodePage.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/DefaultCapabilityProfile.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/DummyPrintConnector.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/EposTepCapabilityProfile.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/EscposImage.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/EscposPrintBuffer.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/FilePrintConnector.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/ImagePrintBuffer.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/NetworkPrintConnector.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/P822DCapabilityProfile.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/PrintBuffer.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/PrintConnector.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/SimpleCapabilityProfile.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/StarCapabilityProfile.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/WindowsPrintConnector.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/cache/Characters-DefaultCapabilityProfile.ser.gz (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/cache/Characters-SimpleCapabilityProfile.ser.gz (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/src/cache/Characters-StarCapabilityProfile.ser.gz (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/bootstrap.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/integration/ExampleTest.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/integration/resources/output/barcode.bin (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/integration/resources/output/bit-image.bin (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/integration/resources/output/character-encodings.bin (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/integration/resources/output/character-tables.bin (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/integration/resources/output/demo.bin (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/integration/resources/output/graphics.bin (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/integration/resources/output/interface.bin (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/integration/resources/output/print-from-pdf.bin.z (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/integration/resources/output/qr-code.bin (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/integration/resources/output/receipt-with-logo.bin (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/integration/resources/output/text-size.bin (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/phpunit.xml (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/AbstractCapabilityProfileTest.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/EscposImageTest.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/EscposPrintBufferTest.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/EscposTest.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/WindowsPrintConnectorTest.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/black_transparent.gif (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/black_transparent.png (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/black_white.bmp (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/black_white.gif (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/black_white.jpg (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/black_white.png (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/canvas_black.bmp (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/canvas_black.gif (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/canvas_black.jpg (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/canvas_black.png (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/canvas_white.bmp (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/canvas_white.gif (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/canvas_white.jpg (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/canvas_white.png (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/demo.php (100%)
 rename {public => htdocs}/includes/mike42/escpos-php/test/unit/resources/doc.pdf (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/.gitignore (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/.php_cs (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/.travis.yml (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/LICENSE.txt (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/README.md (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/composer.json (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/examples/demo.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/examples/session_example.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/examples/test.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/export/exportToJSON.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/BasicsTest.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/UA_List.inc.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/UA_List.pending.txt (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/UserAgentTest.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/VendorsTest_tmp.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/bootstrap.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/phpunit.xml (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Acer.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Alcatel.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Allview.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Amazon.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Apple.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Archos.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Asus.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Blackberry.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Dell.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Google.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HP.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HTC.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Huawei.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/LG.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lava.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Leader.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lenovo.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Mi.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Microsoft.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Motorola.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Nokia.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Onda.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Others.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Prestigio.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Samsung.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Sony.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/SpecialCases.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Vodafone.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/ZTE.php (100%)
 rename {public => htdocs}/includes/mobiledetect/mobiledetectlib/tests/ualist.json (100%)
 rename {public => htdocs}/includes/nusoap/lib/Mail/mime.php (100%)
 rename {public => htdocs}/includes/nusoap/lib/Mail/mimePart.php (100%)
 rename {public => htdocs}/includes/nusoap/lib/changelog (100%)
 rename {public => htdocs}/includes/nusoap/lib/class.nusoap_base.php (100%)
 rename {public => htdocs}/includes/nusoap/lib/class.soap_fault.php (100%)
 rename {public => htdocs}/includes/nusoap/lib/class.soap_parser.php (100%)
 rename {public => htdocs}/includes/nusoap/lib/class.soap_server.php (100%)
 rename {public => htdocs}/includes/nusoap/lib/class.soap_transport_http.php (100%)
 rename {public => htdocs}/includes/nusoap/lib/class.soap_val.php (100%)
 rename {public => htdocs}/includes/nusoap/lib/class.soapclient.php (100%)
 rename {public => htdocs}/includes/nusoap/lib/class.wsdl.php (100%)
 rename {public => htdocs}/includes/nusoap/lib/class.wsdlcache.php (100%)
 rename {public => htdocs}/includes/nusoap/lib/class.xmlschema.php (100%)
 rename {public => htdocs}/includes/nusoap/lib/nusoap.php (100%)
 rename {public => htdocs}/includes/nusoap/lib/nusoapmime.php (100%)
 rename {public => htdocs}/includes/odtphp/Segment.php (100%)
 rename {public => htdocs}/includes/odtphp/SegmentIterator.php (100%)
 rename {public => htdocs}/includes/odtphp/odf.php (100%)
 rename {public => htdocs}/includes/odtphp/zip/PclZipProxy.php (100%)
 rename {public => htdocs}/includes/odtphp/zip/PhpZipProxy.php (100%)
 rename {public => htdocs}/includes/odtphp/zip/ZipInterface.php (100%)
 rename {public => htdocs}/includes/odtphp/zip/pclzip/gnu-lgpl.txt (100%)
 rename {public => htdocs}/includes/odtphp/zip/pclzip/pclzip.lib.php (100%)
 rename {public => htdocs}/includes/odtphp/zip/pclzip/readme.txt (100%)
 rename {public => htdocs}/includes/php-iban/.gitignore (100%)
 rename {public => htdocs}/includes/php-iban/LICENSE (100%)
 rename {public => htdocs}/includes/php-iban/mistranscriptions.txt (100%)
 rename {public => htdocs}/includes/php-iban/oophp-iban.php (100%)
 rename {public => htdocs}/includes/php-iban/php-iban.php (100%)
 rename {public => htdocs}/includes/php-iban/registry.txt (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/.gitattributes (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/.gitignore (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/.travis.yml (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Autoloader.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/APC.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/ICache.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memory.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorageFactory.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/Logger.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Database.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/DateTime.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Engineering.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Exception.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/ExceptionHandler.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Financial.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaParser.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaToken.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Function.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Functions.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Logical.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/LookupRef.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/MathTrig.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Statistical.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/TextData.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Token/Stack.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/functionlist.txt (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/AdvancedValueBinder.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataType.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DefaultValueBinder.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/Hyperlink.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/IValueBinder.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Axis.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeries.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeriesValues.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Exception.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/GridLines.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Layout.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Legend.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/PlotArea.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Properties.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Title.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Comment.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentProperties.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentSecurity.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Exception.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/HashTable.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Helper/HTML.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/IComparable.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/NamedRange.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Abstract.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/CSV.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/DefaultReadFilter.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2003XML.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Chart.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Theme.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/Escher.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Exception.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Gnumeric.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/HTML.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReadFilter.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReader.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/OOCalc.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/SYLK.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/ReferenceHelper.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/ITextElement.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/Run.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/TextElement.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Settings.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/CodePage.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Date.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Drawing.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Excel5.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/File.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Font.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/Matrix.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Maths.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/ChainedBlockStream.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/File.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/readme.txt (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PasswordHasher.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/String.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/TimeZone.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/XMLWriter.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipArchive.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipStreamWrapper.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/bestFitClass.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/exponentialBestFitClass.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/linearBestFitClass.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/logarithmicBestFitClass.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/polynomialBestFitClass.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/powerBestFitClass.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/trendClass.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Alignment.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Borders.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Color.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Conditional.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Fill.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Font.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/NumberFormat.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Protection.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Supervisor.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/BaseDrawing.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/CellIterator.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Column.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnCellIterator.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnDimension.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnIterator.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing/Shadow.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooter.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/MemoryDrawing.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageMargins.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageSetup.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Protection.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Row.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowCellIterator.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowDimension.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowIterator.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/SheetView.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/WorksheetIterator.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Abstract.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/CSV.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Comments.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/DocProps.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Drawing.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Rels.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsRibbon.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsVBA.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/StringTable.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Style.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Theme.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Workbook.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Worksheet.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/WriterPart.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Font.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Parser.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Workbook.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Worksheet.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Exception.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/HTML.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/IWriter.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/Core.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/bg/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/changelog.txt (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/composer.json (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/install.txt (100%)
 rename {public => htdocs}/includes/phpoffice/phpexcel/license.md (100%)
 rename {public => htdocs}/includes/printipp/BasicIPP.php (100%)
 rename {public => htdocs}/includes/printipp/CupsPrintIPP.php (100%)
 rename {public => htdocs}/includes/printipp/ExtendedPrintIPP.php (100%)
 rename {public => htdocs}/includes/printipp/PrintIPP.php (100%)
 rename {public => htdocs}/includes/printipp/http_class.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/ApcCache.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/AutoLoader.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/CommentParser.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Compose.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Data/Arr.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Data/Invalid.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Data/Object.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Data/Text.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Data/Validator.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Data/ValueObject.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Data/iValidate.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Data/iValueObject.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Defaults.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/EventDispatcher.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Explorer.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/ExplorerInfo.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Flash.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/DependentFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/DependentMultiFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/Format.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/JsFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Format/iFormat.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/HumanReadableCache.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/MemcacheCache.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/PassThrough.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/README.md (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Redirect.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Resources.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/RestException.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Restler.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Routes.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Scope.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/UI/Emmet.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/UI/FormStyles.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/UI/Forms.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/UI/Nav.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/UI/Tags.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/User.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/Util.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/compatibility/iAuthenticate.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/compatibility/restler1.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/compatibility/restler2.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/composer.json (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/css/reset.css (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/css/screen.css (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/images/explorer_icons.png (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/images/throbber.gif (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/index.html (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/o2c.html (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/iAuthenticate.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/iCache.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/iCompose.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/iFilter.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/iIdentifyUser.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/iUseAuthentication.php (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/views/debug.css (100%)
 rename {public => htdocs}/includes/restler/framework/Luracast/Restler/views/debug.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Attachment.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/CharacterReader.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/CharacterStream.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/ConfigurableSpool.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/DependencyException.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Encoder.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Encoding.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/Event.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/EventListener.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/FileSpool.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/FileStream.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Filterable.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Image.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/InputByteStream.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/IoException.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/KeyCache.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/MailTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mailer.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/MemorySpool.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Message.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/Grammar.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/Header.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/Message.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/MimePart.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/NullTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/OutputByteStream.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/Logger.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Plugins/Timer.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Preferences.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/RfcComplianceException.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/SignedMessage.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Signer.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Spool.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/StreamFilter.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/SwiftException.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/MailTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/TransportException.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/classes/Swift/Validate.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/dependency_maps/cache_deps.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/dependency_maps/message_deps.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/dependency_maps/mime_deps.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/dependency_maps/transport_deps.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/mime_types.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/preferences.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/swift_init.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/swift_required.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/swift_required_pear.php (100%)
 rename {public => htdocs}/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php (100%)
 rename {public => htdocs}/includes/tcpdi/fpdf_tpl.php (100%)
 rename {public => htdocs}/includes/tcpdi/tcpdi.php (100%)
 rename {public => htdocs}/includes/tcpdi/tcpdi_parser.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/CHANGELOG.TXT (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/LICENSE.TXT (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/README.TXT (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/composer.json (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/config/tcpdf_config.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/README (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/aealarabiya.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/aealarabiya.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/aealarabiya.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/aefurat.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/aefurat.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/aefurat.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/cid0cs.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/cid0ct.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/cid0jp.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/cid0kr.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/courier.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/courierb.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/courierbi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/courieri.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/README (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusans.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusans.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusans.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansb.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansb.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansbi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansbi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansbi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansmono.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansmono.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansmono.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserif.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserif.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserif.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifb.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifb.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifb.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/dejavuserifi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20100919/AUTHORS (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20100919/COPYING (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20100919/CREDITS (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20100919/ChangeLog (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20100919/INSTALL (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20100919/README (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/AUTHORS (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/CREDITS (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/INSTALL (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/README (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freefont-20120503/USAGE (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freemono.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freemono.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freemono.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freemonob.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freemonob.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freemonob.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freemonobi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freemonobi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freemonobi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freemonoi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freemonoi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freemonoi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freesans.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freesans.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freesans.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freesansb.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freesansb.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freesansb.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freesansbi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freesansbi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freesansbi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freesansi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freesansi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freesansi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freeserif.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freeserif.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freeserif.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freeserifb.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freeserifb.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freeserifb.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freeserifbi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freeserifbi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freeserifbi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freeserifi.ctg.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freeserifi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/freeserifi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/helvetica.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/helveticab.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/helveticabi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/helveticai.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/hysmyeongjostdmedium.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/kozgopromedium.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/kozminproregular.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/msungstdlight.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfacourier.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfacourier.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfacourierb.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfacourierb.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfacourieri.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfacourieri.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfasymbol.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfasymbol.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfatimes.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfatimes.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfatimesb.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfatimesb.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfatimesi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfatimesi.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.z (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/stsongstdlight.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/symbol.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/times.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/timesb.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/timesbi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/timesi.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/uni2cid_ac15.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/uni2cid_ag15.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/uni2cid_aj16.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/uni2cid_ak12.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/fonts/zapfdingbats.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/include/sRGB.icc (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/include/tcpdf_colors.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/include/tcpdf_filters.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/include/tcpdf_font_data.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/include/tcpdf_images.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/include/tcpdf_static.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/tcpdf.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/tcpdf_autoconfig.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/tcpdf_barcodes_2d.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/tcpdf_import.php (100%)
 rename {public => htdocs}/includes/tecnickcom/tcpdf/tcpdf_parser.php (100%)
 rename {public => htdocs}/index.php (100%)
 rename {public => htdocs}/install/.gitignore (100%)
 rename {public => htdocs}/install/check.php (100%)
 rename {public => htdocs}/install/default.css (100%)
 rename {public => htdocs}/install/doctemplates/README (100%)
 rename {public => htdocs}/install/doctemplates/index.html (100%)
 rename {public => htdocs}/install/doctemplates/invoices/index.html (100%)
 rename {public => htdocs}/install/doctemplates/invoices/template_invoice.odt (100%)
 rename {public => htdocs}/install/doctemplates/orders/index.html (100%)
 rename {public => htdocs}/install/doctemplates/orders/template_order.odt (100%)
 rename {public => htdocs}/install/doctemplates/projects/index.html (100%)
 rename {public => htdocs}/install/doctemplates/projects/template_project.odt (100%)
 rename {public => htdocs}/install/doctemplates/proposals/index.html (100%)
 rename {public => htdocs}/install/doctemplates/proposals/template_proposal.odt (100%)
 rename {public => htdocs}/install/doctemplates/shipment/index.html (100%)
 rename {public => htdocs}/install/doctemplates/shipment/template_shipment.odt (100%)
 rename {public => htdocs}/install/doctemplates/supplier_proposal/index.html (100%)
 rename {public => htdocs}/install/doctemplates/supplier_proposal/template_supplier_proposal.odt (100%)
 rename {public => htdocs}/install/doctemplates/tasks/index.html (100%)
 rename {public => htdocs}/install/doctemplates/tasks/template_task_summary.odt (100%)
 rename {public => htdocs}/install/doctemplates/thirdparties/index.html (100%)
 rename {public => htdocs}/install/doctemplates/thirdparties/template_thirdparty.ods (100%)
 rename {public => htdocs}/install/doctemplates/thirdparties/template_thirdparty.odt (100%)
 rename {public => htdocs}/install/fileconf.php (100%)
 rename {public => htdocs}/install/inc.php (100%)
 rename {public => htdocs}/install/index.php (100%)
 rename {public => htdocs}/install/install.forced.sample.php (100%)
 rename {public => htdocs}/install/lib/index.html (100%)
 rename {public => htdocs}/install/lib/repair.lib.php (100%)
 rename {public => htdocs}/install/mssql/README (100%)
 rename {public => htdocs}/install/mssql/functions/index.html (100%)
 rename {public => htdocs}/install/mssql/index.html (100%)
 rename {public => htdocs}/install/mysql/README (100%)
 rename {public => htdocs}/install/mysql/data/index.html (100%)
 rename {public => htdocs}/install/mysql/data/llx_00_c_country.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_10_c_regions.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_20_c_departements.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_accounting.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_accounting_category.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_action_trigger.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_actioncomm.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_availability.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_chargesociales.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_civilite.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_currencies.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_ecotaxe.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_effectif.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_format_cards.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_forme_juridique.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_holiday_type.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_hrm_department.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_hrm_function.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_incoterms.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_input_method.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_input_reason.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_lead_status.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_paiement.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_paper_format.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_payment_term.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_propalst.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_prospectlevel.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_revenuestamp.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_shipment_mode.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_stcomm.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_tva.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_type_contact.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_type_fees.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_type_resource.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_typent.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_c_units.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_const.sql (100%)
 rename {public => htdocs}/install/mysql/data/llx_holiday_config.sql (100%)
 rename {public => htdocs}/install/mysql/functions/functions.sql (100%)
 rename {public => htdocs}/install/mysql/functions/index.html (100%)
 rename {public => htdocs}/install/mysql/index.html (100%)
 rename {public => htdocs}/install/mysql/migration/3.0.0-3.1.0.sql (100%)
 rename {public => htdocs}/install/mysql/migration/3.1.0-3.2.0.sql (100%)
 rename {public => htdocs}/install/mysql/migration/3.2.0-3.3.0.sql (100%)
 rename {public => htdocs}/install/mysql/migration/3.3.0-3.4.0.sql (100%)
 rename {public => htdocs}/install/mysql/migration/3.4.0-3.5.0.sql (100%)
 rename {public => htdocs}/install/mysql/migration/3.5.0-3.6.0.sql (100%)
 rename {public => htdocs}/install/mysql/migration/3.6.0-3.7.0.sql (100%)
 rename {public => htdocs}/install/mysql/migration/3.7.0-3.8.0.sql (100%)
 rename {public => htdocs}/install/mysql/migration/3.8.0-3.9.0.sql (100%)
 rename {public => htdocs}/install/mysql/migration/3.9.0-4.0.0.sql (100%)
 rename {public => htdocs}/install/mysql/migration/4.0.0-5.0.0.sql (100%)
 rename {public => htdocs}/install/mysql/migration/index.html (100%)
 rename {public => htdocs}/install/mysql/migration/repair.sql (100%)
 rename {public => htdocs}/install/mysql/tables/index.html (100%)
 rename {public => htdocs}/install/mysql/tables/llx_accounting_account.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_accounting_account.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_accounting_bookkeeping.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_accounting_bookkeeping.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_accounting_fiscalyear.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_accounting_journal.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_accounting_journal.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_accounting_system.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_accounting_system.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_actioncomm.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_actioncomm.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_actioncomm_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_actioncomm_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_actioncomm_resources.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_actioncomm_resources.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_adherent.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_adherent.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_adherent_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_adherent_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_adherent_type.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_adherent_type.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_adherent_type_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_adherent_type_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_advtargetemailing.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_advtargetemailing.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bank.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bank.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bank_account.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bank_account.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bank_account_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bank_account_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bank_categ.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bank_class.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bank_class.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bank_url.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bank_url.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bookmark.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bookmark.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bordereau_cheque.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_bordereau_cheque.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_boxes.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_boxes.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_boxes_def.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_boxes_def.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_budget.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_budget_lines.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_budget_lines.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_accounting_category.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_accounting_category.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_action_trigger.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_action_trigger.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_actioncomm.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_actioncomm.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_availability.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_availability.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_barcode_type.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_barcode_type.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_chargesociales.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_civility.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_civility.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_country.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_country.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_currencies.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_currencies.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_departements.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_departements.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_ecotaxe.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_ecotaxe.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_effectif.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_effectif.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_email_templates.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_email_templates.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_field_list.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_format_cards.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_forme_juridique.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_forme_juridique.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_holiday_types.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_holiday_types.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_hrm_department.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_hrm_function.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_incoterms.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_incoterms.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_input_method.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_input_method.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_input_reason.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_input_reason.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_lead_status.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_lead_status.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_paiement.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_paiement.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_paper_format.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_payment_term.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_price_expression.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_price_global_variable.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_price_global_variable_updater.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_propalst.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_propalst.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_prospectlevel.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_regions.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_regions.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_revenuestamp.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_shipment_mode.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_shipment_mode.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_stcomm.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_stcomm.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_tva.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_tva.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_type_contact.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_type_contact.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_type_fees.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_type_fees.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_type_resource.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_type_resource.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_typent.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_typent.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_units.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_units.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_ziptown.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_c_ziptown.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_account.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_account.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_contact.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_contact.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_fournisseur.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_fournisseur.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_lang.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_lang.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_member.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_member.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_product.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_product.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_project.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_project.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_societe.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_societe.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_user.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categorie_user.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categories_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_categories_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_chargesociales.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande_fournisseur.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande_fournisseur.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande_fournisseur_dispatch.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande_fournisseur_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande_fournisseur_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande_fournisseur_log.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande_fournisseurdet.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande_fournisseurdet.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande_fournisseurdet_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commandedet.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commandedet.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commandedet_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_commandedet_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_const.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_const.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_contrat.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_contrat.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_contrat_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_contrat_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_contratdet.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_contratdet.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_contratdet_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_contratdet_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_contratdet_log.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_contratdet_log.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_cronjob.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_cronjob.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_deplacement.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_document_model.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_document_model.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_don.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_don_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_don_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_ecm_directories.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_ecm_directories.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_ecm_files.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_ecm_files.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_element_contact.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_element_contact.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_element_element.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_element_element.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_element_resources.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_element_resources.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_element_tag.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_element_tag.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_entrepot.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_entrepot.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_establishment.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_event_element.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_events.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_events.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expedition.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expedition.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expedition_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expedition_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expeditiondet.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expeditiondet.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expeditiondet_batch.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expeditiondet_batch.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expeditiondet_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expeditiondet_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expensereport.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expensereport.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expensereport_det.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expensereport_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_expensereport_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_export_compta.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_export_model.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_export_model.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facture.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facture.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facture_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facture_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facture_fourn.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facture_fourn.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facture_fourn_det.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facture_fourn_det.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facture_fourn_det_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facture_fourn_det_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facture_fourn_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facture_fourn_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facture_rec.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facture_rec.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facturedet.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facturedet.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facturedet_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facturedet_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facturedet_rec.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_facturedet_rec.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_fichinter.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_fichinter.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_fichinter_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_fichinter_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_fichinterdet.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_fichinterdet.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_fichinterdet_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_fichinterdet_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_holiday.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_holiday.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_holiday_config.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_holiday_logs.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_holiday_users.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_import_model.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_import_model.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_links.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_links.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_livraison.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_livraison.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_livraison_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_livraison_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_livraisondet.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_livraisondet.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_livraisondet_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_livraisondet_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_loan.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_localtax.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_mailing.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_mailing_cibles.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_mailing_cibles.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_menu.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_menu.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_multicurrency.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_multicurrency_rate.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_notify.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_notify_def.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_oauth_state.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_oauth_token.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_opensurvey_comments.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_opensurvey_comments.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_opensurvey_formquestions.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_opensurvey_sondage.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_opensurvey_sondage.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_opensurvey_user_formanswers.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_opensurvey_user_studs.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_opensurvey_user_studs.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_overwrite_trans.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_overwrite_trans.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_paiement.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_paiement_facture.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_paiement_facture.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_paiementcharge.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_paiementfourn.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_paiementfourn_facturefourn.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_payment_donation.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_payment_expensereport.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_payment_loan.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_payment_salary.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_payment_salary.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_prelevement_bons.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_prelevement_bons.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_prelevement_facture.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_prelevement_facture.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_prelevement_facture_demande.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_prelevement_lignes.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_prelevement_lignes.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_prelevement_rejet.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_printing.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_association.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_association.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_batch.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_batch.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_customer_price.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_customer_price.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_customer_price_log.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_fournisseur_price.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_fournisseur_price.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_fournisseur_price_log.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_lang.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_lang.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_lot.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_lot.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_lot_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_lot_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_price.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_price.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_price_by_qty.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_price_by_qty.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_pricerules.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_pricerules.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_stock.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_stock.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_product_stock_entrepot.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_projet.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_projet.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_projet_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_projet_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_projet_task.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_projet_task.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_projet_task_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_projet_task_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_projet_task_time.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_projet_task_time.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_propal.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_propal.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_propal_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_propal_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_propal_merge_pdf_product.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_propaldet.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_propaldet.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_propaldet_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_propaldet_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_resource.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_resource.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_resource_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_resource_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_rights_def.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_rights_def.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_societe.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_societe.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_societe_address.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_societe_commerciaux.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_societe_commerciaux.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_societe_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_societe_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_societe_log.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_societe_prices.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_societe_remise.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_societe_remise_except.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_societe_remise_except.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_societe_rib.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_societe_rib.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_socpeople.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_socpeople.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_socpeople_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_socpeople_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_stock_mouvement.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_stock_mouvement.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_subscription.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_subscription.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_supplier_proposal.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_supplier_proposal_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_supplier_proposaldet.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_tva.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_user.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_user.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_user_alert.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_user_clicktodial.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_user_employment.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_user_employment.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_user_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_user_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_user_param.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_user_param.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_user_rib.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_user_rights.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_user_rights.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_usergroup.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_usergroup.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_usergroup_extrafields.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_usergroup_extrafields.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_usergroup_rights.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_usergroup_rights.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_usergroup_user.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_usergroup_user.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_website.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_website.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_website_pages.key.sql (100%)
 rename {public => htdocs}/install/mysql/tables/llx_website_pages.sql (100%)
 rename {public => htdocs}/install/pgsql/README (100%)
 rename {public => htdocs}/install/pgsql/functions/functions.sql (100%)
 rename {public => htdocs}/install/pgsql/functions/index.html (100%)
 rename {public => htdocs}/install/pgsql/index.html (100%)
 rename {public => htdocs}/install/phpinfo.php (100%)
 rename {public => htdocs}/install/repair.php (100%)
 rename {public => htdocs}/install/robots.txt (100%)
 rename {public => htdocs}/install/sqlite3/functions/functions.sql (100%)
 rename {public => htdocs}/install/sqlite3/index.html (100%)
 rename {public => htdocs}/install/step1.php (100%)
 rename {public => htdocs}/install/step2.php (100%)
 rename {public => htdocs}/install/step4.php (100%)
 rename {public => htdocs}/install/step5.php (100%)
 rename {public => htdocs}/install/upgrade.php (100%)
 rename {public => htdocs}/install/upgrade2.php (100%)
 rename {public => htdocs}/langs/HOWTO-Translation.txt (100%)
 rename {public => htdocs}/langs/ar_SA/accountancy.lang (100%)
 rename {public => htdocs}/langs/ar_SA/admin.lang (100%)
 rename {public => htdocs}/langs/ar_SA/agenda.lang (100%)
 rename {public => htdocs}/langs/ar_SA/banks.lang (100%)
 rename {public => htdocs}/langs/ar_SA/bills.lang (100%)
 rename {public => htdocs}/langs/ar_SA/bookmarks.lang (100%)
 rename {public => htdocs}/langs/ar_SA/boxes.lang (100%)
 rename {public => htdocs}/langs/ar_SA/cashdesk.lang (100%)
 rename {public => htdocs}/langs/ar_SA/categories.lang (100%)
 rename {public => htdocs}/langs/ar_SA/commercial.lang (100%)
 rename {public => htdocs}/langs/ar_SA/companies.lang (100%)
 rename {public => htdocs}/langs/ar_SA/compta.lang (100%)
 rename {public => htdocs}/langs/ar_SA/contracts.lang (100%)
 rename {public => htdocs}/langs/ar_SA/cron.lang (100%)
 rename {public => htdocs}/langs/ar_SA/deliveries.lang (100%)
 rename {public => htdocs}/langs/ar_SA/dict.lang (100%)
 rename {public => htdocs}/langs/ar_SA/donations.lang (100%)
 rename {public => htdocs}/langs/ar_SA/ecm.lang (100%)
 rename {public => htdocs}/langs/ar_SA/errors.lang (100%)
 rename {public => htdocs}/langs/ar_SA/exports.lang (100%)
 rename {public => htdocs}/langs/ar_SA/externalsite.lang (100%)
 rename {public => htdocs}/langs/ar_SA/ftp.lang (100%)
 rename {public => htdocs}/langs/ar_SA/help.lang (100%)
 rename {public => htdocs}/langs/ar_SA/holiday.lang (100%)
 rename {public => htdocs}/langs/ar_SA/hrm.lang (100%)
 rename {public => htdocs}/langs/ar_SA/incoterm.lang (100%)
 rename {public => htdocs}/langs/ar_SA/install.lang (100%)
 rename {public => htdocs}/langs/ar_SA/interventions.lang (100%)
 rename {public => htdocs}/langs/ar_SA/languages.lang (100%)
 rename {public => htdocs}/langs/ar_SA/ldap.lang (100%)
 rename {public => htdocs}/langs/ar_SA/link.lang (100%)
 rename {public => htdocs}/langs/ar_SA/loan.lang (100%)
 rename {public => htdocs}/langs/ar_SA/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/ar_SA/mails.lang (100%)
 rename {public => htdocs}/langs/ar_SA/main.lang (100%)
 rename {public => htdocs}/langs/ar_SA/margins.lang (100%)
 rename {public => htdocs}/langs/ar_SA/members.lang (100%)
 rename {public => htdocs}/langs/ar_SA/oauth.lang (100%)
 rename {public => htdocs}/langs/ar_SA/opensurvey.lang (100%)
 rename {public => htdocs}/langs/ar_SA/orders.lang (100%)
 rename {public => htdocs}/langs/ar_SA/other.lang (100%)
 rename {public => htdocs}/langs/ar_SA/paybox.lang (100%)
 rename {public => htdocs}/langs/ar_SA/paypal.lang (100%)
 rename {public => htdocs}/langs/ar_SA/printing.lang (100%)
 rename {public => htdocs}/langs/ar_SA/productbatch.lang (100%)
 rename {public => htdocs}/langs/ar_SA/products.lang (100%)
 rename {public => htdocs}/langs/ar_SA/projects.lang (100%)
 rename {public => htdocs}/langs/ar_SA/propal.lang (100%)
 rename {public => htdocs}/langs/ar_SA/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/ar_SA/resource.lang (100%)
 rename {public => htdocs}/langs/ar_SA/salaries.lang (100%)
 rename {public => htdocs}/langs/ar_SA/sendings.lang (100%)
 rename {public => htdocs}/langs/ar_SA/sms.lang (100%)
 rename {public => htdocs}/langs/ar_SA/stocks.lang (100%)
 rename {public => htdocs}/langs/ar_SA/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/ar_SA/suppliers.lang (100%)
 rename {public => htdocs}/langs/ar_SA/trips.lang (100%)
 rename {public => htdocs}/langs/ar_SA/users.lang (100%)
 rename {public => htdocs}/langs/ar_SA/website.lang (100%)
 rename {public => htdocs}/langs/ar_SA/withdrawals.lang (100%)
 rename {public => htdocs}/langs/ar_SA/workflow.lang (100%)
 rename {public => htdocs}/langs/bg_BG/accountancy.lang (100%)
 rename {public => htdocs}/langs/bg_BG/admin.lang (100%)
 rename {public => htdocs}/langs/bg_BG/agenda.lang (100%)
 rename {public => htdocs}/langs/bg_BG/banks.lang (100%)
 rename {public => htdocs}/langs/bg_BG/bills.lang (100%)
 rename {public => htdocs}/langs/bg_BG/bookmarks.lang (100%)
 rename {public => htdocs}/langs/bg_BG/boxes.lang (100%)
 rename {public => htdocs}/langs/bg_BG/cashdesk.lang (100%)
 rename {public => htdocs}/langs/bg_BG/categories.lang (100%)
 rename {public => htdocs}/langs/bg_BG/commercial.lang (100%)
 rename {public => htdocs}/langs/bg_BG/companies.lang (100%)
 rename {public => htdocs}/langs/bg_BG/compta.lang (100%)
 rename {public => htdocs}/langs/bg_BG/contracts.lang (100%)
 rename {public => htdocs}/langs/bg_BG/cron.lang (100%)
 rename {public => htdocs}/langs/bg_BG/deliveries.lang (100%)
 rename {public => htdocs}/langs/bg_BG/dict.lang (100%)
 rename {public => htdocs}/langs/bg_BG/donations.lang (100%)
 rename {public => htdocs}/langs/bg_BG/ecm.lang (100%)
 rename {public => htdocs}/langs/bg_BG/errors.lang (100%)
 rename {public => htdocs}/langs/bg_BG/exports.lang (100%)
 rename {public => htdocs}/langs/bg_BG/externalsite.lang (100%)
 rename {public => htdocs}/langs/bg_BG/ftp.lang (100%)
 rename {public => htdocs}/langs/bg_BG/help.lang (100%)
 rename {public => htdocs}/langs/bg_BG/holiday.lang (100%)
 rename {public => htdocs}/langs/bg_BG/hrm.lang (100%)
 rename {public => htdocs}/langs/bg_BG/incoterm.lang (100%)
 rename {public => htdocs}/langs/bg_BG/install.lang (100%)
 rename {public => htdocs}/langs/bg_BG/interventions.lang (100%)
 rename {public => htdocs}/langs/bg_BG/languages.lang (100%)
 rename {public => htdocs}/langs/bg_BG/ldap.lang (100%)
 rename {public => htdocs}/langs/bg_BG/link.lang (100%)
 rename {public => htdocs}/langs/bg_BG/loan.lang (100%)
 rename {public => htdocs}/langs/bg_BG/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/bg_BG/mails.lang (100%)
 rename {public => htdocs}/langs/bg_BG/main.lang (100%)
 rename {public => htdocs}/langs/bg_BG/margins.lang (100%)
 rename {public => htdocs}/langs/bg_BG/members.lang (100%)
 rename {public => htdocs}/langs/bg_BG/oauth.lang (100%)
 rename {public => htdocs}/langs/bg_BG/opensurvey.lang (100%)
 rename {public => htdocs}/langs/bg_BG/orders.lang (100%)
 rename {public => htdocs}/langs/bg_BG/other.lang (100%)
 rename {public => htdocs}/langs/bg_BG/paybox.lang (100%)
 rename {public => htdocs}/langs/bg_BG/paypal.lang (100%)
 rename {public => htdocs}/langs/bg_BG/printing.lang (100%)
 rename {public => htdocs}/langs/bg_BG/productbatch.lang (100%)
 rename {public => htdocs}/langs/bg_BG/products.lang (100%)
 rename {public => htdocs}/langs/bg_BG/projects.lang (100%)
 rename {public => htdocs}/langs/bg_BG/propal.lang (100%)
 rename {public => htdocs}/langs/bg_BG/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/bg_BG/resource.lang (100%)
 rename {public => htdocs}/langs/bg_BG/salaries.lang (100%)
 rename {public => htdocs}/langs/bg_BG/sendings.lang (100%)
 rename {public => htdocs}/langs/bg_BG/sms.lang (100%)
 rename {public => htdocs}/langs/bg_BG/stocks.lang (100%)
 rename {public => htdocs}/langs/bg_BG/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/bg_BG/suppliers.lang (100%)
 rename {public => htdocs}/langs/bg_BG/trips.lang (100%)
 rename {public => htdocs}/langs/bg_BG/users.lang (100%)
 rename {public => htdocs}/langs/bg_BG/website.lang (100%)
 rename {public => htdocs}/langs/bg_BG/withdrawals.lang (100%)
 rename {public => htdocs}/langs/bg_BG/workflow.lang (100%)
 rename {public => htdocs}/langs/bn_BD/accountancy.lang (100%)
 rename {public => htdocs}/langs/bn_BD/admin.lang (100%)
 rename {public => htdocs}/langs/bn_BD/agenda.lang (100%)
 rename {public => htdocs}/langs/bn_BD/banks.lang (100%)
 rename {public => htdocs}/langs/bn_BD/bills.lang (100%)
 rename {public => htdocs}/langs/bn_BD/bookmarks.lang (100%)
 rename {public => htdocs}/langs/bn_BD/boxes.lang (100%)
 rename {public => htdocs}/langs/bn_BD/cashdesk.lang (100%)
 rename {public => htdocs}/langs/bn_BD/categories.lang (100%)
 rename {public => htdocs}/langs/bn_BD/commercial.lang (100%)
 rename {public => htdocs}/langs/bn_BD/companies.lang (100%)
 rename {public => htdocs}/langs/bn_BD/compta.lang (100%)
 rename {public => htdocs}/langs/bn_BD/contracts.lang (100%)
 rename {public => htdocs}/langs/bn_BD/cron.lang (100%)
 rename {public => htdocs}/langs/bn_BD/deliveries.lang (100%)
 rename {public => htdocs}/langs/bn_BD/dict.lang (100%)
 rename {public => htdocs}/langs/bn_BD/donations.lang (100%)
 rename {public => htdocs}/langs/bn_BD/ecm.lang (100%)
 rename {public => htdocs}/langs/bn_BD/errors.lang (100%)
 rename {public => htdocs}/langs/bn_BD/exports.lang (100%)
 rename {public => htdocs}/langs/bn_BD/externalsite.lang (100%)
 rename {public => htdocs}/langs/bn_BD/ftp.lang (100%)
 rename {public => htdocs}/langs/bn_BD/help.lang (100%)
 rename {public => htdocs}/langs/bn_BD/holiday.lang (100%)
 rename {public => htdocs}/langs/bn_BD/hrm.lang (100%)
 rename {public => htdocs}/langs/bn_BD/incoterm.lang (100%)
 rename {public => htdocs}/langs/bn_BD/install.lang (100%)
 rename {public => htdocs}/langs/bn_BD/interventions.lang (100%)
 rename {public => htdocs}/langs/bn_BD/languages.lang (100%)
 rename {public => htdocs}/langs/bn_BD/ldap.lang (100%)
 rename {public => htdocs}/langs/bn_BD/link.lang (100%)
 rename {public => htdocs}/langs/bn_BD/loan.lang (100%)
 rename {public => htdocs}/langs/bn_BD/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/bn_BD/mails.lang (100%)
 rename {public => htdocs}/langs/bn_BD/main.lang (100%)
 rename {public => htdocs}/langs/bn_BD/margins.lang (100%)
 rename {public => htdocs}/langs/bn_BD/members.lang (100%)
 rename {public => htdocs}/langs/bn_BD/oauth.lang (100%)
 rename {public => htdocs}/langs/bn_BD/opensurvey.lang (100%)
 rename {public => htdocs}/langs/bn_BD/orders.lang (100%)
 rename {public => htdocs}/langs/bn_BD/other.lang (100%)
 rename {public => htdocs}/langs/bn_BD/paybox.lang (100%)
 rename {public => htdocs}/langs/bn_BD/paypal.lang (100%)
 rename {public => htdocs}/langs/bn_BD/printing.lang (100%)
 rename {public => htdocs}/langs/bn_BD/productbatch.lang (100%)
 rename {public => htdocs}/langs/bn_BD/products.lang (100%)
 rename {public => htdocs}/langs/bn_BD/projects.lang (100%)
 rename {public => htdocs}/langs/bn_BD/propal.lang (100%)
 rename {public => htdocs}/langs/bn_BD/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/bn_BD/resource.lang (100%)
 rename {public => htdocs}/langs/bn_BD/salaries.lang (100%)
 rename {public => htdocs}/langs/bn_BD/sendings.lang (100%)
 rename {public => htdocs}/langs/bn_BD/sms.lang (100%)
 rename {public => htdocs}/langs/bn_BD/stocks.lang (100%)
 rename {public => htdocs}/langs/bn_BD/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/bn_BD/suppliers.lang (100%)
 rename {public => htdocs}/langs/bn_BD/trips.lang (100%)
 rename {public => htdocs}/langs/bn_BD/users.lang (100%)
 rename {public => htdocs}/langs/bn_BD/website.lang (100%)
 rename {public => htdocs}/langs/bn_BD/withdrawals.lang (100%)
 rename {public => htdocs}/langs/bn_BD/workflow.lang (100%)
 rename {public => htdocs}/langs/bs_BA/accountancy.lang (100%)
 rename {public => htdocs}/langs/bs_BA/admin.lang (100%)
 rename {public => htdocs}/langs/bs_BA/agenda.lang (100%)
 rename {public => htdocs}/langs/bs_BA/banks.lang (100%)
 rename {public => htdocs}/langs/bs_BA/bills.lang (100%)
 rename {public => htdocs}/langs/bs_BA/bookmarks.lang (100%)
 rename {public => htdocs}/langs/bs_BA/boxes.lang (100%)
 rename {public => htdocs}/langs/bs_BA/cashdesk.lang (100%)
 rename {public => htdocs}/langs/bs_BA/categories.lang (100%)
 rename {public => htdocs}/langs/bs_BA/commercial.lang (100%)
 rename {public => htdocs}/langs/bs_BA/companies.lang (100%)
 rename {public => htdocs}/langs/bs_BA/compta.lang (100%)
 rename {public => htdocs}/langs/bs_BA/contracts.lang (100%)
 rename {public => htdocs}/langs/bs_BA/cron.lang (100%)
 rename {public => htdocs}/langs/bs_BA/deliveries.lang (100%)
 rename {public => htdocs}/langs/bs_BA/dict.lang (100%)
 rename {public => htdocs}/langs/bs_BA/donations.lang (100%)
 rename {public => htdocs}/langs/bs_BA/ecm.lang (100%)
 rename {public => htdocs}/langs/bs_BA/errors.lang (100%)
 rename {public => htdocs}/langs/bs_BA/exports.lang (100%)
 rename {public => htdocs}/langs/bs_BA/externalsite.lang (100%)
 rename {public => htdocs}/langs/bs_BA/ftp.lang (100%)
 rename {public => htdocs}/langs/bs_BA/help.lang (100%)
 rename {public => htdocs}/langs/bs_BA/holiday.lang (100%)
 rename {public => htdocs}/langs/bs_BA/hrm.lang (100%)
 rename {public => htdocs}/langs/bs_BA/incoterm.lang (100%)
 rename {public => htdocs}/langs/bs_BA/install.lang (100%)
 rename {public => htdocs}/langs/bs_BA/interventions.lang (100%)
 rename {public => htdocs}/langs/bs_BA/languages.lang (100%)
 rename {public => htdocs}/langs/bs_BA/ldap.lang (100%)
 rename {public => htdocs}/langs/bs_BA/link.lang (100%)
 rename {public => htdocs}/langs/bs_BA/loan.lang (100%)
 rename {public => htdocs}/langs/bs_BA/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/bs_BA/mails.lang (100%)
 rename {public => htdocs}/langs/bs_BA/main.lang (100%)
 rename {public => htdocs}/langs/bs_BA/margins.lang (100%)
 rename {public => htdocs}/langs/bs_BA/members.lang (100%)
 rename {public => htdocs}/langs/bs_BA/oauth.lang (100%)
 rename {public => htdocs}/langs/bs_BA/opensurvey.lang (100%)
 rename {public => htdocs}/langs/bs_BA/orders.lang (100%)
 rename {public => htdocs}/langs/bs_BA/other.lang (100%)
 rename {public => htdocs}/langs/bs_BA/paybox.lang (100%)
 rename {public => htdocs}/langs/bs_BA/paypal.lang (100%)
 rename {public => htdocs}/langs/bs_BA/printing.lang (100%)
 rename {public => htdocs}/langs/bs_BA/productbatch.lang (100%)
 rename {public => htdocs}/langs/bs_BA/products.lang (100%)
 rename {public => htdocs}/langs/bs_BA/projects.lang (100%)
 rename {public => htdocs}/langs/bs_BA/propal.lang (100%)
 rename {public => htdocs}/langs/bs_BA/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/bs_BA/resource.lang (100%)
 rename {public => htdocs}/langs/bs_BA/salaries.lang (100%)
 rename {public => htdocs}/langs/bs_BA/sendings.lang (100%)
 rename {public => htdocs}/langs/bs_BA/sms.lang (100%)
 rename {public => htdocs}/langs/bs_BA/stocks.lang (100%)
 rename {public => htdocs}/langs/bs_BA/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/bs_BA/suppliers.lang (100%)
 rename {public => htdocs}/langs/bs_BA/trips.lang (100%)
 rename {public => htdocs}/langs/bs_BA/users.lang (100%)
 rename {public => htdocs}/langs/bs_BA/website.lang (100%)
 rename {public => htdocs}/langs/bs_BA/withdrawals.lang (100%)
 rename {public => htdocs}/langs/bs_BA/workflow.lang (100%)
 rename {public => htdocs}/langs/ca_ES/accountancy.lang (100%)
 rename {public => htdocs}/langs/ca_ES/admin.lang (100%)
 rename {public => htdocs}/langs/ca_ES/agenda.lang (100%)
 rename {public => htdocs}/langs/ca_ES/banks.lang (100%)
 rename {public => htdocs}/langs/ca_ES/bills.lang (100%)
 rename {public => htdocs}/langs/ca_ES/bookmarks.lang (100%)
 rename {public => htdocs}/langs/ca_ES/boxes.lang (100%)
 rename {public => htdocs}/langs/ca_ES/cashdesk.lang (100%)
 rename {public => htdocs}/langs/ca_ES/categories.lang (100%)
 rename {public => htdocs}/langs/ca_ES/commercial.lang (100%)
 rename {public => htdocs}/langs/ca_ES/companies.lang (100%)
 rename {public => htdocs}/langs/ca_ES/compta.lang (100%)
 rename {public => htdocs}/langs/ca_ES/contracts.lang (100%)
 rename {public => htdocs}/langs/ca_ES/cron.lang (100%)
 rename {public => htdocs}/langs/ca_ES/deliveries.lang (100%)
 rename {public => htdocs}/langs/ca_ES/dict.lang (100%)
 rename {public => htdocs}/langs/ca_ES/donations.lang (100%)
 rename {public => htdocs}/langs/ca_ES/ecm.lang (100%)
 rename {public => htdocs}/langs/ca_ES/errors.lang (100%)
 rename {public => htdocs}/langs/ca_ES/exports.lang (100%)
 rename {public => htdocs}/langs/ca_ES/externalsite.lang (100%)
 rename {public => htdocs}/langs/ca_ES/ftp.lang (100%)
 rename {public => htdocs}/langs/ca_ES/help.lang (100%)
 rename {public => htdocs}/langs/ca_ES/holiday.lang (100%)
 rename {public => htdocs}/langs/ca_ES/hrm.lang (100%)
 rename {public => htdocs}/langs/ca_ES/incoterm.lang (100%)
 rename {public => htdocs}/langs/ca_ES/install.lang (100%)
 rename {public => htdocs}/langs/ca_ES/interventions.lang (100%)
 rename {public => htdocs}/langs/ca_ES/languages.lang (100%)
 rename {public => htdocs}/langs/ca_ES/ldap.lang (100%)
 rename {public => htdocs}/langs/ca_ES/link.lang (100%)
 rename {public => htdocs}/langs/ca_ES/loan.lang (100%)
 rename {public => htdocs}/langs/ca_ES/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/ca_ES/mails.lang (100%)
 rename {public => htdocs}/langs/ca_ES/main.lang (100%)
 rename {public => htdocs}/langs/ca_ES/margins.lang (100%)
 rename {public => htdocs}/langs/ca_ES/members.lang (100%)
 rename {public => htdocs}/langs/ca_ES/oauth.lang (100%)
 rename {public => htdocs}/langs/ca_ES/opensurvey.lang (100%)
 rename {public => htdocs}/langs/ca_ES/orders.lang (100%)
 rename {public => htdocs}/langs/ca_ES/other.lang (100%)
 rename {public => htdocs}/langs/ca_ES/paybox.lang (100%)
 rename {public => htdocs}/langs/ca_ES/paypal.lang (100%)
 rename {public => htdocs}/langs/ca_ES/printing.lang (100%)
 rename {public => htdocs}/langs/ca_ES/productbatch.lang (100%)
 rename {public => htdocs}/langs/ca_ES/products.lang (100%)
 rename {public => htdocs}/langs/ca_ES/projects.lang (100%)
 rename {public => htdocs}/langs/ca_ES/propal.lang (100%)
 rename {public => htdocs}/langs/ca_ES/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/ca_ES/resource.lang (100%)
 rename {public => htdocs}/langs/ca_ES/salaries.lang (100%)
 rename {public => htdocs}/langs/ca_ES/sendings.lang (100%)
 rename {public => htdocs}/langs/ca_ES/sms.lang (100%)
 rename {public => htdocs}/langs/ca_ES/stocks.lang (100%)
 rename {public => htdocs}/langs/ca_ES/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/ca_ES/suppliers.lang (100%)
 rename {public => htdocs}/langs/ca_ES/trips.lang (100%)
 rename {public => htdocs}/langs/ca_ES/users.lang (100%)
 rename {public => htdocs}/langs/ca_ES/website.lang (100%)
 rename {public => htdocs}/langs/ca_ES/withdrawals.lang (100%)
 rename {public => htdocs}/langs/ca_ES/workflow.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/accountancy.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/admin.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/agenda.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/banks.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/bills.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/bookmarks.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/boxes.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/cashdesk.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/categories.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/commercial.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/companies.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/compta.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/contracts.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/cron.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/deliveries.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/dict.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/donations.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/ecm.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/errors.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/exports.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/externalsite.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/ftp.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/help.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/holiday.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/hrm.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/incoterm.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/install.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/interventions.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/languages.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/ldap.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/link.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/loan.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/mails.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/main.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/margins.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/members.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/oauth.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/opensurvey.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/orders.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/other.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/paybox.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/paypal.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/printing.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/productbatch.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/products.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/projects.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/propal.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/resource.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/salaries.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/sendings.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/sms.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/stocks.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/suppliers.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/trips.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/users.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/website.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/withdrawals.lang (100%)
 rename {public => htdocs}/langs/cs_CZ/workflow.lang (100%)
 rename {public => htdocs}/langs/da_DK/accountancy.lang (100%)
 rename {public => htdocs}/langs/da_DK/admin.lang (100%)
 rename {public => htdocs}/langs/da_DK/agenda.lang (100%)
 rename {public => htdocs}/langs/da_DK/banks.lang (100%)
 rename {public => htdocs}/langs/da_DK/bills.lang (100%)
 rename {public => htdocs}/langs/da_DK/bookmarks.lang (100%)
 rename {public => htdocs}/langs/da_DK/boxes.lang (100%)
 rename {public => htdocs}/langs/da_DK/cashdesk.lang (100%)
 rename {public => htdocs}/langs/da_DK/categories.lang (100%)
 rename {public => htdocs}/langs/da_DK/commercial.lang (100%)
 rename {public => htdocs}/langs/da_DK/companies.lang (100%)
 rename {public => htdocs}/langs/da_DK/compta.lang (100%)
 rename {public => htdocs}/langs/da_DK/contracts.lang (100%)
 rename {public => htdocs}/langs/da_DK/cron.lang (100%)
 rename {public => htdocs}/langs/da_DK/deliveries.lang (100%)
 rename {public => htdocs}/langs/da_DK/dict.lang (100%)
 rename {public => htdocs}/langs/da_DK/donations.lang (100%)
 rename {public => htdocs}/langs/da_DK/ecm.lang (100%)
 rename {public => htdocs}/langs/da_DK/errors.lang (100%)
 rename {public => htdocs}/langs/da_DK/exports.lang (100%)
 rename {public => htdocs}/langs/da_DK/externalsite.lang (100%)
 rename {public => htdocs}/langs/da_DK/ftp.lang (100%)
 rename {public => htdocs}/langs/da_DK/help.lang (100%)
 rename {public => htdocs}/langs/da_DK/holiday.lang (100%)
 rename {public => htdocs}/langs/da_DK/hrm.lang (100%)
 rename {public => htdocs}/langs/da_DK/incoterm.lang (100%)
 rename {public => htdocs}/langs/da_DK/install.lang (100%)
 rename {public => htdocs}/langs/da_DK/interventions.lang (100%)
 rename {public => htdocs}/langs/da_DK/languages.lang (100%)
 rename {public => htdocs}/langs/da_DK/ldap.lang (100%)
 rename {public => htdocs}/langs/da_DK/link.lang (100%)
 rename {public => htdocs}/langs/da_DK/loan.lang (100%)
 rename {public => htdocs}/langs/da_DK/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/da_DK/mails.lang (100%)
 rename {public => htdocs}/langs/da_DK/main.lang (100%)
 rename {public => htdocs}/langs/da_DK/margins.lang (100%)
 rename {public => htdocs}/langs/da_DK/members.lang (100%)
 rename {public => htdocs}/langs/da_DK/oauth.lang (100%)
 rename {public => htdocs}/langs/da_DK/opensurvey.lang (100%)
 rename {public => htdocs}/langs/da_DK/orders.lang (100%)
 rename {public => htdocs}/langs/da_DK/other.lang (100%)
 rename {public => htdocs}/langs/da_DK/paybox.lang (100%)
 rename {public => htdocs}/langs/da_DK/paypal.lang (100%)
 rename {public => htdocs}/langs/da_DK/printing.lang (100%)
 rename {public => htdocs}/langs/da_DK/productbatch.lang (100%)
 rename {public => htdocs}/langs/da_DK/products.lang (100%)
 rename {public => htdocs}/langs/da_DK/projects.lang (100%)
 rename {public => htdocs}/langs/da_DK/propal.lang (100%)
 rename {public => htdocs}/langs/da_DK/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/da_DK/resource.lang (100%)
 rename {public => htdocs}/langs/da_DK/salaries.lang (100%)
 rename {public => htdocs}/langs/da_DK/sendings.lang (100%)
 rename {public => htdocs}/langs/da_DK/sms.lang (100%)
 rename {public => htdocs}/langs/da_DK/stocks.lang (100%)
 rename {public => htdocs}/langs/da_DK/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/da_DK/suppliers.lang (100%)
 rename {public => htdocs}/langs/da_DK/trips.lang (100%)
 rename {public => htdocs}/langs/da_DK/users.lang (100%)
 rename {public => htdocs}/langs/da_DK/website.lang (100%)
 rename {public => htdocs}/langs/da_DK/withdrawals.lang (100%)
 rename {public => htdocs}/langs/da_DK/workflow.lang (100%)
 rename {public => htdocs}/langs/de_AT/accountancy.lang (100%)
 rename {public => htdocs}/langs/de_AT/admin.lang (100%)
 rename {public => htdocs}/langs/de_AT/agenda.lang (100%)
 rename {public => htdocs}/langs/de_AT/banks.lang (100%)
 rename {public => htdocs}/langs/de_AT/bills.lang (100%)
 rename {public => htdocs}/langs/de_AT/bookmarks.lang (100%)
 rename {public => htdocs}/langs/de_AT/boxes.lang (100%)
 rename {public => htdocs}/langs/de_AT/cashdesk.lang (100%)
 rename {public => htdocs}/langs/de_AT/categories.lang (100%)
 rename {public => htdocs}/langs/de_AT/commercial.lang (100%)
 rename {public => htdocs}/langs/de_AT/companies.lang (100%)
 rename {public => htdocs}/langs/de_AT/compta.lang (100%)
 rename {public => htdocs}/langs/de_AT/contracts.lang (100%)
 rename {public => htdocs}/langs/de_AT/cron.lang (100%)
 rename {public => htdocs}/langs/de_AT/deliveries.lang (100%)
 rename {public => htdocs}/langs/de_AT/dict.lang (100%)
 rename {public => htdocs}/langs/de_AT/donations.lang (100%)
 rename {public => htdocs}/langs/de_AT/ecm.lang (100%)
 rename {public => htdocs}/langs/de_AT/errors.lang (100%)
 rename {public => htdocs}/langs/de_AT/exports.lang (100%)
 rename {public => htdocs}/langs/de_AT/externalsite.lang (100%)
 rename {public => htdocs}/langs/de_AT/ftp.lang (100%)
 rename {public => htdocs}/langs/de_AT/help.lang (100%)
 rename {public => htdocs}/langs/de_AT/holiday.lang (100%)
 rename {public => htdocs}/langs/de_AT/hrm.lang (100%)
 rename {public => htdocs}/langs/de_AT/incoterm.lang (100%)
 rename {public => htdocs}/langs/de_AT/install.lang (100%)
 rename {public => htdocs}/langs/de_AT/interventions.lang (100%)
 rename {public => htdocs}/langs/de_AT/languages.lang (100%)
 rename {public => htdocs}/langs/de_AT/ldap.lang (100%)
 rename {public => htdocs}/langs/de_AT/link.lang (100%)
 rename {public => htdocs}/langs/de_AT/loan.lang (100%)
 rename {public => htdocs}/langs/de_AT/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/de_AT/mails.lang (100%)
 rename {public => htdocs}/langs/de_AT/main.lang (100%)
 rename {public => htdocs}/langs/de_AT/margins.lang (100%)
 rename {public => htdocs}/langs/de_AT/members.lang (100%)
 rename {public => htdocs}/langs/de_AT/oauth.lang (100%)
 rename {public => htdocs}/langs/de_AT/opensurvey.lang (100%)
 rename {public => htdocs}/langs/de_AT/orders.lang (100%)
 rename {public => htdocs}/langs/de_AT/other.lang (100%)
 rename {public => htdocs}/langs/de_AT/paybox.lang (100%)
 rename {public => htdocs}/langs/de_AT/paypal.lang (100%)
 rename {public => htdocs}/langs/de_AT/printing.lang (100%)
 rename {public => htdocs}/langs/de_AT/productbatch.lang (100%)
 rename {public => htdocs}/langs/de_AT/products.lang (100%)
 rename {public => htdocs}/langs/de_AT/projects.lang (100%)
 rename {public => htdocs}/langs/de_AT/propal.lang (100%)
 rename {public => htdocs}/langs/de_AT/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/de_AT/resource.lang (100%)
 rename {public => htdocs}/langs/de_AT/salaries.lang (100%)
 rename {public => htdocs}/langs/de_AT/sendings.lang (100%)
 rename {public => htdocs}/langs/de_AT/sms.lang (100%)
 rename {public => htdocs}/langs/de_AT/stocks.lang (100%)
 rename {public => htdocs}/langs/de_AT/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/de_AT/suppliers.lang (100%)
 rename {public => htdocs}/langs/de_AT/trips.lang (100%)
 rename {public => htdocs}/langs/de_AT/users.lang (100%)
 rename {public => htdocs}/langs/de_AT/website.lang (100%)
 rename {public => htdocs}/langs/de_AT/withdrawals.lang (100%)
 rename {public => htdocs}/langs/de_AT/workflow.lang (100%)
 rename {public => htdocs}/langs/de_CH/accountancy.lang (100%)
 rename {public => htdocs}/langs/de_CH/admin.lang (100%)
 rename {public => htdocs}/langs/de_CH/agenda.lang (100%)
 rename {public => htdocs}/langs/de_CH/banks.lang (100%)
 rename {public => htdocs}/langs/de_CH/bills.lang (100%)
 rename {public => htdocs}/langs/de_CH/bookmarks.lang (100%)
 rename {public => htdocs}/langs/de_CH/boxes.lang (100%)
 rename {public => htdocs}/langs/de_CH/cashdesk.lang (100%)
 rename {public => htdocs}/langs/de_CH/categories.lang (100%)
 rename {public => htdocs}/langs/de_CH/commercial.lang (100%)
 rename {public => htdocs}/langs/de_CH/companies.lang (100%)
 rename {public => htdocs}/langs/de_CH/compta.lang (100%)
 rename {public => htdocs}/langs/de_CH/contracts.lang (100%)
 rename {public => htdocs}/langs/de_CH/cron.lang (100%)
 rename {public => htdocs}/langs/de_CH/deliveries.lang (100%)
 rename {public => htdocs}/langs/de_CH/dict.lang (100%)
 rename {public => htdocs}/langs/de_CH/donations.lang (100%)
 rename {public => htdocs}/langs/de_CH/ecm.lang (100%)
 rename {public => htdocs}/langs/de_CH/errors.lang (100%)
 rename {public => htdocs}/langs/de_CH/exports.lang (100%)
 rename {public => htdocs}/langs/de_CH/externalsite.lang (100%)
 rename {public => htdocs}/langs/de_CH/ftp.lang (100%)
 rename {public => htdocs}/langs/de_CH/help.lang (100%)
 rename {public => htdocs}/langs/de_CH/holiday.lang (100%)
 rename {public => htdocs}/langs/de_CH/hrm.lang (100%)
 rename {public => htdocs}/langs/de_CH/incoterm.lang (100%)
 rename {public => htdocs}/langs/de_CH/install.lang (100%)
 rename {public => htdocs}/langs/de_CH/interventions.lang (100%)
 rename {public => htdocs}/langs/de_CH/languages.lang (100%)
 rename {public => htdocs}/langs/de_CH/ldap.lang (100%)
 rename {public => htdocs}/langs/de_CH/link.lang (100%)
 rename {public => htdocs}/langs/de_CH/loan.lang (100%)
 rename {public => htdocs}/langs/de_CH/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/de_CH/mails.lang (100%)
 rename {public => htdocs}/langs/de_CH/main.lang (100%)
 rename {public => htdocs}/langs/de_CH/margins.lang (100%)
 rename {public => htdocs}/langs/de_CH/members.lang (100%)
 rename {public => htdocs}/langs/de_CH/oauth.lang (100%)
 rename {public => htdocs}/langs/de_CH/opensurvey.lang (100%)
 rename {public => htdocs}/langs/de_CH/orders.lang (100%)
 rename {public => htdocs}/langs/de_CH/other.lang (100%)
 rename {public => htdocs}/langs/de_CH/paybox.lang (100%)
 rename {public => htdocs}/langs/de_CH/paypal.lang (100%)
 rename {public => htdocs}/langs/de_CH/printing.lang (100%)
 rename {public => htdocs}/langs/de_CH/productbatch.lang (100%)
 rename {public => htdocs}/langs/de_CH/products.lang (100%)
 rename {public => htdocs}/langs/de_CH/projects.lang (100%)
 rename {public => htdocs}/langs/de_CH/propal.lang (100%)
 rename {public => htdocs}/langs/de_CH/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/de_CH/resource.lang (100%)
 rename {public => htdocs}/langs/de_CH/salaries.lang (100%)
 rename {public => htdocs}/langs/de_CH/sendings.lang (100%)
 rename {public => htdocs}/langs/de_CH/sms.lang (100%)
 rename {public => htdocs}/langs/de_CH/stocks.lang (100%)
 rename {public => htdocs}/langs/de_CH/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/de_CH/suppliers.lang (100%)
 rename {public => htdocs}/langs/de_CH/trips.lang (100%)
 rename {public => htdocs}/langs/de_CH/users.lang (100%)
 rename {public => htdocs}/langs/de_CH/website.lang (100%)
 rename {public => htdocs}/langs/de_CH/withdrawals.lang (100%)
 rename {public => htdocs}/langs/de_CH/workflow.lang (100%)
 rename {public => htdocs}/langs/de_DE/accountancy.lang (100%)
 rename {public => htdocs}/langs/de_DE/admin.lang (100%)
 rename {public => htdocs}/langs/de_DE/agenda.lang (100%)
 rename {public => htdocs}/langs/de_DE/banks.lang (100%)
 rename {public => htdocs}/langs/de_DE/bills.lang (100%)
 rename {public => htdocs}/langs/de_DE/bookmarks.lang (100%)
 rename {public => htdocs}/langs/de_DE/boxes.lang (100%)
 rename {public => htdocs}/langs/de_DE/cashdesk.lang (100%)
 rename {public => htdocs}/langs/de_DE/categories.lang (100%)
 rename {public => htdocs}/langs/de_DE/commercial.lang (100%)
 rename {public => htdocs}/langs/de_DE/companies.lang (100%)
 rename {public => htdocs}/langs/de_DE/compta.lang (100%)
 rename {public => htdocs}/langs/de_DE/contracts.lang (100%)
 rename {public => htdocs}/langs/de_DE/cron.lang (100%)
 rename {public => htdocs}/langs/de_DE/deliveries.lang (100%)
 rename {public => htdocs}/langs/de_DE/dict.lang (100%)
 rename {public => htdocs}/langs/de_DE/donations.lang (100%)
 rename {public => htdocs}/langs/de_DE/ecm.lang (100%)
 rename {public => htdocs}/langs/de_DE/errors.lang (100%)
 rename {public => htdocs}/langs/de_DE/exports.lang (100%)
 rename {public => htdocs}/langs/de_DE/externalsite.lang (100%)
 rename {public => htdocs}/langs/de_DE/ftp.lang (100%)
 rename {public => htdocs}/langs/de_DE/help.lang (100%)
 rename {public => htdocs}/langs/de_DE/holiday.lang (100%)
 rename {public => htdocs}/langs/de_DE/hrm.lang (100%)
 rename {public => htdocs}/langs/de_DE/incoterm.lang (100%)
 rename {public => htdocs}/langs/de_DE/install.lang (100%)
 rename {public => htdocs}/langs/de_DE/interventions.lang (100%)
 rename {public => htdocs}/langs/de_DE/languages.lang (100%)
 rename {public => htdocs}/langs/de_DE/ldap.lang (100%)
 rename {public => htdocs}/langs/de_DE/link.lang (100%)
 rename {public => htdocs}/langs/de_DE/loan.lang (100%)
 rename {public => htdocs}/langs/de_DE/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/de_DE/mails.lang (100%)
 rename {public => htdocs}/langs/de_DE/main.lang (100%)
 rename {public => htdocs}/langs/de_DE/margins.lang (100%)
 rename {public => htdocs}/langs/de_DE/members.lang (100%)
 rename {public => htdocs}/langs/de_DE/oauth.lang (100%)
 rename {public => htdocs}/langs/de_DE/opensurvey.lang (100%)
 rename {public => htdocs}/langs/de_DE/orders.lang (100%)
 rename {public => htdocs}/langs/de_DE/other.lang (100%)
 rename {public => htdocs}/langs/de_DE/paybox.lang (100%)
 rename {public => htdocs}/langs/de_DE/paypal.lang (100%)
 rename {public => htdocs}/langs/de_DE/printing.lang (100%)
 rename {public => htdocs}/langs/de_DE/productbatch.lang (100%)
 rename {public => htdocs}/langs/de_DE/products.lang (100%)
 rename {public => htdocs}/langs/de_DE/projects.lang (100%)
 rename {public => htdocs}/langs/de_DE/propal.lang (100%)
 rename {public => htdocs}/langs/de_DE/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/de_DE/resource.lang (100%)
 rename {public => htdocs}/langs/de_DE/salaries.lang (100%)
 rename {public => htdocs}/langs/de_DE/sendings.lang (100%)
 rename {public => htdocs}/langs/de_DE/sms.lang (100%)
 rename {public => htdocs}/langs/de_DE/stocks.lang (100%)
 rename {public => htdocs}/langs/de_DE/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/de_DE/suppliers.lang (100%)
 rename {public => htdocs}/langs/de_DE/trips.lang (100%)
 rename {public => htdocs}/langs/de_DE/users.lang (100%)
 rename {public => htdocs}/langs/de_DE/website.lang (100%)
 rename {public => htdocs}/langs/de_DE/withdrawals.lang (100%)
 rename {public => htdocs}/langs/de_DE/workflow.lang (100%)
 rename {public => htdocs}/langs/el_GR/accountancy.lang (100%)
 rename {public => htdocs}/langs/el_GR/admin.lang (100%)
 rename {public => htdocs}/langs/el_GR/agenda.lang (100%)
 rename {public => htdocs}/langs/el_GR/banks.lang (100%)
 rename {public => htdocs}/langs/el_GR/bills.lang (100%)
 rename {public => htdocs}/langs/el_GR/bookmarks.lang (100%)
 rename {public => htdocs}/langs/el_GR/boxes.lang (100%)
 rename {public => htdocs}/langs/el_GR/cashdesk.lang (100%)
 rename {public => htdocs}/langs/el_GR/categories.lang (100%)
 rename {public => htdocs}/langs/el_GR/commercial.lang (100%)
 rename {public => htdocs}/langs/el_GR/commissions.lang (100%)
 rename {public => htdocs}/langs/el_GR/companies.lang (100%)
 rename {public => htdocs}/langs/el_GR/compta.lang (100%)
 rename {public => htdocs}/langs/el_GR/contracts.lang (100%)
 rename {public => htdocs}/langs/el_GR/cron.lang (100%)
 rename {public => htdocs}/langs/el_GR/deliveries.lang (100%)
 rename {public => htdocs}/langs/el_GR/dict.lang (100%)
 rename {public => htdocs}/langs/el_GR/donations.lang (100%)
 rename {public => htdocs}/langs/el_GR/ecm.lang (100%)
 rename {public => htdocs}/langs/el_GR/errors.lang (100%)
 rename {public => htdocs}/langs/el_GR/exports.lang (100%)
 rename {public => htdocs}/langs/el_GR/externalsite.lang (100%)
 rename {public => htdocs}/langs/el_GR/ftp.lang (100%)
 rename {public => htdocs}/langs/el_GR/help.lang (100%)
 rename {public => htdocs}/langs/el_GR/holiday.lang (100%)
 rename {public => htdocs}/langs/el_GR/hrm.lang (100%)
 rename {public => htdocs}/langs/el_GR/incoterm.lang (100%)
 rename {public => htdocs}/langs/el_GR/install.lang (100%)
 rename {public => htdocs}/langs/el_GR/interventions.lang (100%)
 rename {public => htdocs}/langs/el_GR/languages.lang (100%)
 rename {public => htdocs}/langs/el_GR/ldap.lang (100%)
 rename {public => htdocs}/langs/el_GR/link.lang (100%)
 rename {public => htdocs}/langs/el_GR/loan.lang (100%)
 rename {public => htdocs}/langs/el_GR/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/el_GR/mails.lang (100%)
 rename {public => htdocs}/langs/el_GR/main.lang (100%)
 rename {public => htdocs}/langs/el_GR/margins.lang (100%)
 rename {public => htdocs}/langs/el_GR/members.lang (100%)
 rename {public => htdocs}/langs/el_GR/oauth.lang (100%)
 rename {public => htdocs}/langs/el_GR/opensurvey.lang (100%)
 rename {public => htdocs}/langs/el_GR/orders.lang (100%)
 rename {public => htdocs}/langs/el_GR/other.lang (100%)
 rename {public => htdocs}/langs/el_GR/paybox.lang (100%)
 rename {public => htdocs}/langs/el_GR/paypal.lang (100%)
 rename {public => htdocs}/langs/el_GR/printing.lang (100%)
 rename {public => htdocs}/langs/el_GR/productbatch.lang (100%)
 rename {public => htdocs}/langs/el_GR/products.lang (100%)
 rename {public => htdocs}/langs/el_GR/projects.lang (100%)
 rename {public => htdocs}/langs/el_GR/propal.lang (100%)
 rename {public => htdocs}/langs/el_GR/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/el_GR/resource.lang (100%)
 rename {public => htdocs}/langs/el_GR/salaries.lang (100%)
 rename {public => htdocs}/langs/el_GR/sendings.lang (100%)
 rename {public => htdocs}/langs/el_GR/sms.lang (100%)
 rename {public => htdocs}/langs/el_GR/stocks.lang (100%)
 rename {public => htdocs}/langs/el_GR/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/el_GR/suppliers.lang (100%)
 rename {public => htdocs}/langs/el_GR/trips.lang (100%)
 rename {public => htdocs}/langs/el_GR/users.lang (100%)
 rename {public => htdocs}/langs/el_GR/website.lang (100%)
 rename {public => htdocs}/langs/el_GR/withdrawals.lang (100%)
 rename {public => htdocs}/langs/el_GR/workflow.lang (100%)
 rename {public => htdocs}/langs/en_AU/accountancy.lang (100%)
 rename {public => htdocs}/langs/en_AU/admin.lang (100%)
 rename {public => htdocs}/langs/en_AU/agenda.lang (100%)
 rename {public => htdocs}/langs/en_AU/banks.lang (100%)
 rename {public => htdocs}/langs/en_AU/bills.lang (100%)
 rename {public => htdocs}/langs/en_AU/bookmarks.lang (100%)
 rename {public => htdocs}/langs/en_AU/boxes.lang (100%)
 rename {public => htdocs}/langs/en_AU/cashdesk.lang (100%)
 rename {public => htdocs}/langs/en_AU/categories.lang (100%)
 rename {public => htdocs}/langs/en_AU/commercial.lang (100%)
 rename {public => htdocs}/langs/en_AU/companies.lang (100%)
 rename {public => htdocs}/langs/en_AU/compta.lang (100%)
 rename {public => htdocs}/langs/en_AU/contracts.lang (100%)
 rename {public => htdocs}/langs/en_AU/cron.lang (100%)
 rename {public => htdocs}/langs/en_AU/deliveries.lang (100%)
 rename {public => htdocs}/langs/en_AU/dict.lang (100%)
 rename {public => htdocs}/langs/en_AU/donations.lang (100%)
 rename {public => htdocs}/langs/en_AU/ecm.lang (100%)
 rename {public => htdocs}/langs/en_AU/errors.lang (100%)
 rename {public => htdocs}/langs/en_AU/exports.lang (100%)
 rename {public => htdocs}/langs/en_AU/externalsite.lang (100%)
 rename {public => htdocs}/langs/en_AU/ftp.lang (100%)
 rename {public => htdocs}/langs/en_AU/help.lang (100%)
 rename {public => htdocs}/langs/en_AU/holiday.lang (100%)
 rename {public => htdocs}/langs/en_AU/hrm.lang (100%)
 rename {public => htdocs}/langs/en_AU/incoterm.lang (100%)
 rename {public => htdocs}/langs/en_AU/install.lang (100%)
 rename {public => htdocs}/langs/en_AU/interventions.lang (100%)
 rename {public => htdocs}/langs/en_AU/languages.lang (100%)
 rename {public => htdocs}/langs/en_AU/ldap.lang (100%)
 rename {public => htdocs}/langs/en_AU/link.lang (100%)
 rename {public => htdocs}/langs/en_AU/loan.lang (100%)
 rename {public => htdocs}/langs/en_AU/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/en_AU/mails.lang (100%)
 rename {public => htdocs}/langs/en_AU/main.lang (100%)
 rename {public => htdocs}/langs/en_AU/margins.lang (100%)
 rename {public => htdocs}/langs/en_AU/members.lang (100%)
 rename {public => htdocs}/langs/en_AU/oauth.lang (100%)
 rename {public => htdocs}/langs/en_AU/opensurvey.lang (100%)
 rename {public => htdocs}/langs/en_AU/orders.lang (100%)
 rename {public => htdocs}/langs/en_AU/other.lang (100%)
 rename {public => htdocs}/langs/en_AU/paybox.lang (100%)
 rename {public => htdocs}/langs/en_AU/paypal.lang (100%)
 rename {public => htdocs}/langs/en_AU/printing.lang (100%)
 rename {public => htdocs}/langs/en_AU/productbatch.lang (100%)
 rename {public => htdocs}/langs/en_AU/products.lang (100%)
 rename {public => htdocs}/langs/en_AU/projects.lang (100%)
 rename {public => htdocs}/langs/en_AU/propal.lang (100%)
 rename {public => htdocs}/langs/en_AU/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/en_AU/resource.lang (100%)
 rename {public => htdocs}/langs/en_AU/salaries.lang (100%)
 rename {public => htdocs}/langs/en_AU/sendings.lang (100%)
 rename {public => htdocs}/langs/en_AU/sms.lang (100%)
 rename {public => htdocs}/langs/en_AU/stocks.lang (100%)
 rename {public => htdocs}/langs/en_AU/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/en_AU/suppliers.lang (100%)
 rename {public => htdocs}/langs/en_AU/trips.lang (100%)
 rename {public => htdocs}/langs/en_AU/users.lang (100%)
 rename {public => htdocs}/langs/en_AU/website.lang (100%)
 rename {public => htdocs}/langs/en_AU/withdrawals.lang (100%)
 rename {public => htdocs}/langs/en_AU/workflow.lang (100%)
 rename {public => htdocs}/langs/en_CA/accountancy.lang (100%)
 rename {public => htdocs}/langs/en_CA/admin.lang (100%)
 rename {public => htdocs}/langs/en_CA/agenda.lang (100%)
 rename {public => htdocs}/langs/en_CA/banks.lang (100%)
 rename {public => htdocs}/langs/en_CA/bills.lang (100%)
 rename {public => htdocs}/langs/en_CA/bookmarks.lang (100%)
 rename {public => htdocs}/langs/en_CA/boxes.lang (100%)
 rename {public => htdocs}/langs/en_CA/cashdesk.lang (100%)
 rename {public => htdocs}/langs/en_CA/categories.lang (100%)
 rename {public => htdocs}/langs/en_CA/commercial.lang (100%)
 rename {public => htdocs}/langs/en_CA/companies.lang (100%)
 rename {public => htdocs}/langs/en_CA/compta.lang (100%)
 rename {public => htdocs}/langs/en_CA/contracts.lang (100%)
 rename {public => htdocs}/langs/en_CA/cron.lang (100%)
 rename {public => htdocs}/langs/en_CA/deliveries.lang (100%)
 rename {public => htdocs}/langs/en_CA/dict.lang (100%)
 rename {public => htdocs}/langs/en_CA/donations.lang (100%)
 rename {public => htdocs}/langs/en_CA/ecm.lang (100%)
 rename {public => htdocs}/langs/en_CA/errors.lang (100%)
 rename {public => htdocs}/langs/en_CA/exports.lang (100%)
 rename {public => htdocs}/langs/en_CA/externalsite.lang (100%)
 rename {public => htdocs}/langs/en_CA/ftp.lang (100%)
 rename {public => htdocs}/langs/en_CA/help.lang (100%)
 rename {public => htdocs}/langs/en_CA/holiday.lang (100%)
 rename {public => htdocs}/langs/en_CA/hrm.lang (100%)
 rename {public => htdocs}/langs/en_CA/incoterm.lang (100%)
 rename {public => htdocs}/langs/en_CA/install.lang (100%)
 rename {public => htdocs}/langs/en_CA/interventions.lang (100%)
 rename {public => htdocs}/langs/en_CA/languages.lang (100%)
 rename {public => htdocs}/langs/en_CA/ldap.lang (100%)
 rename {public => htdocs}/langs/en_CA/link.lang (100%)
 rename {public => htdocs}/langs/en_CA/loan.lang (100%)
 rename {public => htdocs}/langs/en_CA/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/en_CA/mails.lang (100%)
 rename {public => htdocs}/langs/en_CA/main.lang (100%)
 rename {public => htdocs}/langs/en_CA/margins.lang (100%)
 rename {public => htdocs}/langs/en_CA/members.lang (100%)
 rename {public => htdocs}/langs/en_CA/oauth.lang (100%)
 rename {public => htdocs}/langs/en_CA/opensurvey.lang (100%)
 rename {public => htdocs}/langs/en_CA/orders.lang (100%)
 rename {public => htdocs}/langs/en_CA/other.lang (100%)
 rename {public => htdocs}/langs/en_CA/paybox.lang (100%)
 rename {public => htdocs}/langs/en_CA/paypal.lang (100%)
 rename {public => htdocs}/langs/en_CA/printing.lang (100%)
 rename {public => htdocs}/langs/en_CA/productbatch.lang (100%)
 rename {public => htdocs}/langs/en_CA/products.lang (100%)
 rename {public => htdocs}/langs/en_CA/projects.lang (100%)
 rename {public => htdocs}/langs/en_CA/propal.lang (100%)
 rename {public => htdocs}/langs/en_CA/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/en_CA/resource.lang (100%)
 rename {public => htdocs}/langs/en_CA/salaries.lang (100%)
 rename {public => htdocs}/langs/en_CA/sendings.lang (100%)
 rename {public => htdocs}/langs/en_CA/sms.lang (100%)
 rename {public => htdocs}/langs/en_CA/stocks.lang (100%)
 rename {public => htdocs}/langs/en_CA/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/en_CA/suppliers.lang (100%)
 rename {public => htdocs}/langs/en_CA/trips.lang (100%)
 rename {public => htdocs}/langs/en_CA/users.lang (100%)
 rename {public => htdocs}/langs/en_CA/website.lang (100%)
 rename {public => htdocs}/langs/en_CA/withdrawals.lang (100%)
 rename {public => htdocs}/langs/en_CA/workflow.lang (100%)
 rename {public => htdocs}/langs/en_GB/accountancy.lang (100%)
 rename {public => htdocs}/langs/en_GB/admin.lang (100%)
 rename {public => htdocs}/langs/en_GB/agenda.lang (100%)
 rename {public => htdocs}/langs/en_GB/banks.lang (100%)
 rename {public => htdocs}/langs/en_GB/bills.lang (100%)
 rename {public => htdocs}/langs/en_GB/bookmarks.lang (100%)
 rename {public => htdocs}/langs/en_GB/boxes.lang (100%)
 rename {public => htdocs}/langs/en_GB/cashdesk.lang (100%)
 rename {public => htdocs}/langs/en_GB/categories.lang (100%)
 rename {public => htdocs}/langs/en_GB/commercial.lang (100%)
 rename {public => htdocs}/langs/en_GB/companies.lang (100%)
 rename {public => htdocs}/langs/en_GB/compta.lang (100%)
 rename {public => htdocs}/langs/en_GB/contracts.lang (100%)
 rename {public => htdocs}/langs/en_GB/cron.lang (100%)
 rename {public => htdocs}/langs/en_GB/deliveries.lang (100%)
 rename {public => htdocs}/langs/en_GB/dict.lang (100%)
 rename {public => htdocs}/langs/en_GB/donations.lang (100%)
 rename {public => htdocs}/langs/en_GB/ecm.lang (100%)
 rename {public => htdocs}/langs/en_GB/errors.lang (100%)
 rename {public => htdocs}/langs/en_GB/exports.lang (100%)
 rename {public => htdocs}/langs/en_GB/externalsite.lang (100%)
 rename {public => htdocs}/langs/en_GB/ftp.lang (100%)
 rename {public => htdocs}/langs/en_GB/help.lang (100%)
 rename {public => htdocs}/langs/en_GB/holiday.lang (100%)
 rename {public => htdocs}/langs/en_GB/hrm.lang (100%)
 rename {public => htdocs}/langs/en_GB/incoterm.lang (100%)
 rename {public => htdocs}/langs/en_GB/install.lang (100%)
 rename {public => htdocs}/langs/en_GB/interventions.lang (100%)
 rename {public => htdocs}/langs/en_GB/languages.lang (100%)
 rename {public => htdocs}/langs/en_GB/ldap.lang (100%)
 rename {public => htdocs}/langs/en_GB/link.lang (100%)
 rename {public => htdocs}/langs/en_GB/loan.lang (100%)
 rename {public => htdocs}/langs/en_GB/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/en_GB/mails.lang (100%)
 rename {public => htdocs}/langs/en_GB/main.lang (100%)
 rename {public => htdocs}/langs/en_GB/margins.lang (100%)
 rename {public => htdocs}/langs/en_GB/members.lang (100%)
 rename {public => htdocs}/langs/en_GB/oauth.lang (100%)
 rename {public => htdocs}/langs/en_GB/opensurvey.lang (100%)
 rename {public => htdocs}/langs/en_GB/orders.lang (100%)
 rename {public => htdocs}/langs/en_GB/other.lang (100%)
 rename {public => htdocs}/langs/en_GB/paybox.lang (100%)
 rename {public => htdocs}/langs/en_GB/paypal.lang (100%)
 rename {public => htdocs}/langs/en_GB/printing.lang (100%)
 rename {public => htdocs}/langs/en_GB/productbatch.lang (100%)
 rename {public => htdocs}/langs/en_GB/products.lang (100%)
 rename {public => htdocs}/langs/en_GB/projects.lang (100%)
 rename {public => htdocs}/langs/en_GB/propal.lang (100%)
 rename {public => htdocs}/langs/en_GB/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/en_GB/resource.lang (100%)
 rename {public => htdocs}/langs/en_GB/salaries.lang (100%)
 rename {public => htdocs}/langs/en_GB/sendings.lang (100%)
 rename {public => htdocs}/langs/en_GB/sms.lang (100%)
 rename {public => htdocs}/langs/en_GB/stocks.lang (100%)
 rename {public => htdocs}/langs/en_GB/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/en_GB/suppliers.lang (100%)
 rename {public => htdocs}/langs/en_GB/trips.lang (100%)
 rename {public => htdocs}/langs/en_GB/users.lang (100%)
 rename {public => htdocs}/langs/en_GB/website.lang (100%)
 rename {public => htdocs}/langs/en_GB/withdrawals.lang (100%)
 rename {public => htdocs}/langs/en_GB/workflow.lang (100%)
 rename {public => htdocs}/langs/en_IN/accountancy.lang (100%)
 rename {public => htdocs}/langs/en_IN/admin.lang (100%)
 rename {public => htdocs}/langs/en_IN/agenda.lang (100%)
 rename {public => htdocs}/langs/en_IN/banks.lang (100%)
 rename {public => htdocs}/langs/en_IN/bills.lang (100%)
 rename {public => htdocs}/langs/en_IN/bookmarks.lang (100%)
 rename {public => htdocs}/langs/en_IN/boxes.lang (100%)
 rename {public => htdocs}/langs/en_IN/cashdesk.lang (100%)
 rename {public => htdocs}/langs/en_IN/categories.lang (100%)
 rename {public => htdocs}/langs/en_IN/commercial.lang (100%)
 rename {public => htdocs}/langs/en_IN/companies.lang (100%)
 rename {public => htdocs}/langs/en_IN/compta.lang (100%)
 rename {public => htdocs}/langs/en_IN/contracts.lang (100%)
 rename {public => htdocs}/langs/en_IN/cron.lang (100%)
 rename {public => htdocs}/langs/en_IN/deliveries.lang (100%)
 rename {public => htdocs}/langs/en_IN/dict.lang (100%)
 rename {public => htdocs}/langs/en_IN/donations.lang (100%)
 rename {public => htdocs}/langs/en_IN/ecm.lang (100%)
 rename {public => htdocs}/langs/en_IN/errors.lang (100%)
 rename {public => htdocs}/langs/en_IN/exports.lang (100%)
 rename {public => htdocs}/langs/en_IN/externalsite.lang (100%)
 rename {public => htdocs}/langs/en_IN/ftp.lang (100%)
 rename {public => htdocs}/langs/en_IN/help.lang (100%)
 rename {public => htdocs}/langs/en_IN/holiday.lang (100%)
 rename {public => htdocs}/langs/en_IN/hrm.lang (100%)
 rename {public => htdocs}/langs/en_IN/incoterm.lang (100%)
 rename {public => htdocs}/langs/en_IN/install.lang (100%)
 rename {public => htdocs}/langs/en_IN/interventions.lang (100%)
 rename {public => htdocs}/langs/en_IN/languages.lang (100%)
 rename {public => htdocs}/langs/en_IN/ldap.lang (100%)
 rename {public => htdocs}/langs/en_IN/link.lang (100%)
 rename {public => htdocs}/langs/en_IN/loan.lang (100%)
 rename {public => htdocs}/langs/en_IN/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/en_IN/mails.lang (100%)
 rename {public => htdocs}/langs/en_IN/main.lang (100%)
 rename {public => htdocs}/langs/en_IN/margins.lang (100%)
 rename {public => htdocs}/langs/en_IN/members.lang (100%)
 rename {public => htdocs}/langs/en_IN/oauth.lang (100%)
 rename {public => htdocs}/langs/en_IN/opensurvey.lang (100%)
 rename {public => htdocs}/langs/en_IN/orders.lang (100%)
 rename {public => htdocs}/langs/en_IN/other.lang (100%)
 rename {public => htdocs}/langs/en_IN/paybox.lang (100%)
 rename {public => htdocs}/langs/en_IN/paypal.lang (100%)
 rename {public => htdocs}/langs/en_IN/printing.lang (100%)
 rename {public => htdocs}/langs/en_IN/productbatch.lang (100%)
 rename {public => htdocs}/langs/en_IN/products.lang (100%)
 rename {public => htdocs}/langs/en_IN/projects.lang (100%)
 rename {public => htdocs}/langs/en_IN/propal.lang (100%)
 rename {public => htdocs}/langs/en_IN/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/en_IN/resource.lang (100%)
 rename {public => htdocs}/langs/en_IN/salaries.lang (100%)
 rename {public => htdocs}/langs/en_IN/sendings.lang (100%)
 rename {public => htdocs}/langs/en_IN/sms.lang (100%)
 rename {public => htdocs}/langs/en_IN/stocks.lang (100%)
 rename {public => htdocs}/langs/en_IN/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/en_IN/suppliers.lang (100%)
 rename {public => htdocs}/langs/en_IN/trips.lang (100%)
 rename {public => htdocs}/langs/en_IN/users.lang (100%)
 rename {public => htdocs}/langs/en_IN/website.lang (100%)
 rename {public => htdocs}/langs/en_IN/withdrawals.lang (100%)
 rename {public => htdocs}/langs/en_IN/workflow.lang (100%)
 rename {public => htdocs}/langs/en_NZ/companies.lang (100%)
 rename {public => htdocs}/langs/en_NZ/compta.lang (100%)
 rename {public => htdocs}/langs/en_NZ/main.lang (100%)
 rename {public => htdocs}/langs/en_SA/main.lang (100%)
 rename {public => htdocs}/langs/en_SA/propal.lang (100%)
 rename {public => htdocs}/langs/en_US/accountancy.lang (100%)
 rename {public => htdocs}/langs/en_US/admin.lang (100%)
 rename {public => htdocs}/langs/en_US/agenda.lang (100%)
 rename {public => htdocs}/langs/en_US/banks.lang (100%)
 rename {public => htdocs}/langs/en_US/bills.lang (100%)
 rename {public => htdocs}/langs/en_US/bookmarks.lang (100%)
 rename {public => htdocs}/langs/en_US/boxes.lang (100%)
 rename {public => htdocs}/langs/en_US/cashdesk.lang (100%)
 rename {public => htdocs}/langs/en_US/categories.lang (100%)
 rename {public => htdocs}/langs/en_US/commercial.lang (100%)
 rename {public => htdocs}/langs/en_US/companies.lang (100%)
 rename {public => htdocs}/langs/en_US/compta.lang (100%)
 rename {public => htdocs}/langs/en_US/contracts.lang (100%)
 rename {public => htdocs}/langs/en_US/cron.lang (100%)
 rename {public => htdocs}/langs/en_US/deliveries.lang (100%)
 rename {public => htdocs}/langs/en_US/dict.lang (100%)
 rename {public => htdocs}/langs/en_US/donations.lang (100%)
 rename {public => htdocs}/langs/en_US/ecm.lang (100%)
 rename {public => htdocs}/langs/en_US/errors.lang (100%)
 rename {public => htdocs}/langs/en_US/exports.lang (100%)
 rename {public => htdocs}/langs/en_US/externalsite.lang (100%)
 rename {public => htdocs}/langs/en_US/ftp.lang (100%)
 rename {public => htdocs}/langs/en_US/help.lang (100%)
 rename {public => htdocs}/langs/en_US/holiday.lang (100%)
 rename {public => htdocs}/langs/en_US/hrm.lang (100%)
 rename {public => htdocs}/langs/en_US/incoterm.lang (100%)
 rename {public => htdocs}/langs/en_US/install.lang (100%)
 rename {public => htdocs}/langs/en_US/interventions.lang (100%)
 rename {public => htdocs}/langs/en_US/languages.lang (100%)
 rename {public => htdocs}/langs/en_US/ldap.lang (100%)
 rename {public => htdocs}/langs/en_US/link.lang (100%)
 rename {public => htdocs}/langs/en_US/loan.lang (100%)
 rename {public => htdocs}/langs/en_US/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/en_US/mails.lang (100%)
 rename {public => htdocs}/langs/en_US/main.lang (100%)
 rename {public => htdocs}/langs/en_US/margins.lang (100%)
 rename {public => htdocs}/langs/en_US/members.lang (100%)
 rename {public => htdocs}/langs/en_US/multicurrency.lang (100%)
 rename {public => htdocs}/langs/en_US/oauth.lang (100%)
 rename {public => htdocs}/langs/en_US/opensurvey.lang (100%)
 rename {public => htdocs}/langs/en_US/orders.lang (100%)
 rename {public => htdocs}/langs/en_US/other.lang (100%)
 rename {public => htdocs}/langs/en_US/paybox.lang (100%)
 rename {public => htdocs}/langs/en_US/paypal.lang (100%)
 rename {public => htdocs}/langs/en_US/printing.lang (100%)
 rename {public => htdocs}/langs/en_US/productbatch.lang (100%)
 rename {public => htdocs}/langs/en_US/products.lang (100%)
 rename {public => htdocs}/langs/en_US/projects.lang (100%)
 rename {public => htdocs}/langs/en_US/propal.lang (100%)
 rename {public => htdocs}/langs/en_US/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/en_US/resource.lang (100%)
 rename {public => htdocs}/langs/en_US/salaries.lang (100%)
 rename {public => htdocs}/langs/en_US/sendings.lang (100%)
 rename {public => htdocs}/langs/en_US/sms.lang (100%)
 rename {public => htdocs}/langs/en_US/stocks.lang (100%)
 rename {public => htdocs}/langs/en_US/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/en_US/suppliers.lang (100%)
 rename {public => htdocs}/langs/en_US/trips.lang (100%)
 rename {public => htdocs}/langs/en_US/users.lang (100%)
 rename {public => htdocs}/langs/en_US/website.lang (100%)
 rename {public => htdocs}/langs/en_US/withdrawals.lang (100%)
 rename {public => htdocs}/langs/en_US/workflow.lang (100%)
 rename {public => htdocs}/langs/en_ZA/main.lang (100%)
 rename {public => htdocs}/langs/es_AR/accountancy.lang (100%)
 rename {public => htdocs}/langs/es_AR/admin.lang (100%)
 rename {public => htdocs}/langs/es_AR/agenda.lang (100%)
 rename {public => htdocs}/langs/es_AR/banks.lang (100%)
 rename {public => htdocs}/langs/es_AR/bills.lang (100%)
 rename {public => htdocs}/langs/es_AR/bookmarks.lang (100%)
 rename {public => htdocs}/langs/es_AR/boxes.lang (100%)
 rename {public => htdocs}/langs/es_AR/cashdesk.lang (100%)
 rename {public => htdocs}/langs/es_AR/categories.lang (100%)
 rename {public => htdocs}/langs/es_AR/commercial.lang (100%)
 rename {public => htdocs}/langs/es_AR/companies.lang (100%)
 rename {public => htdocs}/langs/es_AR/compta.lang (100%)
 rename {public => htdocs}/langs/es_AR/contracts.lang (100%)
 rename {public => htdocs}/langs/es_AR/cron.lang (100%)
 rename {public => htdocs}/langs/es_AR/deliveries.lang (100%)
 rename {public => htdocs}/langs/es_AR/dict.lang (100%)
 rename {public => htdocs}/langs/es_AR/donations.lang (100%)
 rename {public => htdocs}/langs/es_AR/ecm.lang (100%)
 rename {public => htdocs}/langs/es_AR/errors.lang (100%)
 rename {public => htdocs}/langs/es_AR/exports.lang (100%)
 rename {public => htdocs}/langs/es_AR/externalsite.lang (100%)
 rename {public => htdocs}/langs/es_AR/ftp.lang (100%)
 rename {public => htdocs}/langs/es_AR/help.lang (100%)
 rename {public => htdocs}/langs/es_AR/holiday.lang (100%)
 rename {public => htdocs}/langs/es_AR/hrm.lang (100%)
 rename {public => htdocs}/langs/es_AR/incoterm.lang (100%)
 rename {public => htdocs}/langs/es_AR/install.lang (100%)
 rename {public => htdocs}/langs/es_AR/interventions.lang (100%)
 rename {public => htdocs}/langs/es_AR/languages.lang (100%)
 rename {public => htdocs}/langs/es_AR/ldap.lang (100%)
 rename {public => htdocs}/langs/es_AR/link.lang (100%)
 rename {public => htdocs}/langs/es_AR/loan.lang (100%)
 rename {public => htdocs}/langs/es_AR/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/es_AR/mails.lang (100%)
 rename {public => htdocs}/langs/es_AR/main.lang (100%)
 rename {public => htdocs}/langs/es_AR/margins.lang (100%)
 rename {public => htdocs}/langs/es_AR/members.lang (100%)
 rename {public => htdocs}/langs/es_AR/oauth.lang (100%)
 rename {public => htdocs}/langs/es_AR/opensurvey.lang (100%)
 rename {public => htdocs}/langs/es_AR/orders.lang (100%)
 rename {public => htdocs}/langs/es_AR/other.lang (100%)
 rename {public => htdocs}/langs/es_AR/paybox.lang (100%)
 rename {public => htdocs}/langs/es_AR/paypal.lang (100%)
 rename {public => htdocs}/langs/es_AR/printing.lang (100%)
 rename {public => htdocs}/langs/es_AR/productbatch.lang (100%)
 rename {public => htdocs}/langs/es_AR/products.lang (100%)
 rename {public => htdocs}/langs/es_AR/projects.lang (100%)
 rename {public => htdocs}/langs/es_AR/propal.lang (100%)
 rename {public => htdocs}/langs/es_AR/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/es_AR/resource.lang (100%)
 rename {public => htdocs}/langs/es_AR/salaries.lang (100%)
 rename {public => htdocs}/langs/es_AR/sendings.lang (100%)
 rename {public => htdocs}/langs/es_AR/sms.lang (100%)
 rename {public => htdocs}/langs/es_AR/stocks.lang (100%)
 rename {public => htdocs}/langs/es_AR/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/es_AR/suppliers.lang (100%)
 rename {public => htdocs}/langs/es_AR/trips.lang (100%)
 rename {public => htdocs}/langs/es_AR/users.lang (100%)
 rename {public => htdocs}/langs/es_AR/website.lang (100%)
 rename {public => htdocs}/langs/es_AR/withdrawals.lang (100%)
 rename {public => htdocs}/langs/es_AR/workflow.lang (100%)
 rename {public => htdocs}/langs/es_BO/accountancy.lang (100%)
 rename {public => htdocs}/langs/es_BO/admin.lang (100%)
 rename {public => htdocs}/langs/es_BO/agenda.lang (100%)
 rename {public => htdocs}/langs/es_BO/banks.lang (100%)
 rename {public => htdocs}/langs/es_BO/bills.lang (100%)
 rename {public => htdocs}/langs/es_BO/bookmarks.lang (100%)
 rename {public => htdocs}/langs/es_BO/boxes.lang (100%)
 rename {public => htdocs}/langs/es_BO/cashdesk.lang (100%)
 rename {public => htdocs}/langs/es_BO/categories.lang (100%)
 rename {public => htdocs}/langs/es_BO/commercial.lang (100%)
 rename {public => htdocs}/langs/es_BO/companies.lang (100%)
 rename {public => htdocs}/langs/es_BO/compta.lang (100%)
 rename {public => htdocs}/langs/es_BO/contracts.lang (100%)
 rename {public => htdocs}/langs/es_BO/cron.lang (100%)
 rename {public => htdocs}/langs/es_BO/deliveries.lang (100%)
 rename {public => htdocs}/langs/es_BO/dict.lang (100%)
 rename {public => htdocs}/langs/es_BO/donations.lang (100%)
 rename {public => htdocs}/langs/es_BO/ecm.lang (100%)
 rename {public => htdocs}/langs/es_BO/errors.lang (100%)
 rename {public => htdocs}/langs/es_BO/exports.lang (100%)
 rename {public => htdocs}/langs/es_BO/externalsite.lang (100%)
 rename {public => htdocs}/langs/es_BO/ftp.lang (100%)
 rename {public => htdocs}/langs/es_BO/help.lang (100%)
 rename {public => htdocs}/langs/es_BO/holiday.lang (100%)
 rename {public => htdocs}/langs/es_BO/hrm.lang (100%)
 rename {public => htdocs}/langs/es_BO/incoterm.lang (100%)
 rename {public => htdocs}/langs/es_BO/install.lang (100%)
 rename {public => htdocs}/langs/es_BO/interventions.lang (100%)
 rename {public => htdocs}/langs/es_BO/languages.lang (100%)
 rename {public => htdocs}/langs/es_BO/ldap.lang (100%)
 rename {public => htdocs}/langs/es_BO/link.lang (100%)
 rename {public => htdocs}/langs/es_BO/loan.lang (100%)
 rename {public => htdocs}/langs/es_BO/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/es_BO/mails.lang (100%)
 rename {public => htdocs}/langs/es_BO/main.lang (100%)
 rename {public => htdocs}/langs/es_BO/margins.lang (100%)
 rename {public => htdocs}/langs/es_BO/members.lang (100%)
 rename {public => htdocs}/langs/es_BO/oauth.lang (100%)
 rename {public => htdocs}/langs/es_BO/opensurvey.lang (100%)
 rename {public => htdocs}/langs/es_BO/orders.lang (100%)
 rename {public => htdocs}/langs/es_BO/other.lang (100%)
 rename {public => htdocs}/langs/es_BO/paybox.lang (100%)
 rename {public => htdocs}/langs/es_BO/paypal.lang (100%)
 rename {public => htdocs}/langs/es_BO/printing.lang (100%)
 rename {public => htdocs}/langs/es_BO/productbatch.lang (100%)
 rename {public => htdocs}/langs/es_BO/products.lang (100%)
 rename {public => htdocs}/langs/es_BO/projects.lang (100%)
 rename {public => htdocs}/langs/es_BO/propal.lang (100%)
 rename {public => htdocs}/langs/es_BO/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/es_BO/resource.lang (100%)
 rename {public => htdocs}/langs/es_BO/salaries.lang (100%)
 rename {public => htdocs}/langs/es_BO/sendings.lang (100%)
 rename {public => htdocs}/langs/es_BO/sms.lang (100%)
 rename {public => htdocs}/langs/es_BO/stocks.lang (100%)
 rename {public => htdocs}/langs/es_BO/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/es_BO/suppliers.lang (100%)
 rename {public => htdocs}/langs/es_BO/trips.lang (100%)
 rename {public => htdocs}/langs/es_BO/users.lang (100%)
 rename {public => htdocs}/langs/es_BO/website.lang (100%)
 rename {public => htdocs}/langs/es_BO/withdrawals.lang (100%)
 rename {public => htdocs}/langs/es_BO/workflow.lang (100%)
 rename {public => htdocs}/langs/es_CL/accountancy.lang (100%)
 rename {public => htdocs}/langs/es_CL/admin.lang (100%)
 rename {public => htdocs}/langs/es_CL/agenda.lang (100%)
 rename {public => htdocs}/langs/es_CL/banks.lang (100%)
 rename {public => htdocs}/langs/es_CL/bills.lang (100%)
 rename {public => htdocs}/langs/es_CL/bookmarks.lang (100%)
 rename {public => htdocs}/langs/es_CL/boxes.lang (100%)
 rename {public => htdocs}/langs/es_CL/cashdesk.lang (100%)
 rename {public => htdocs}/langs/es_CL/categories.lang (100%)
 rename {public => htdocs}/langs/es_CL/commercial.lang (100%)
 rename {public => htdocs}/langs/es_CL/companies.lang (100%)
 rename {public => htdocs}/langs/es_CL/compta.lang (100%)
 rename {public => htdocs}/langs/es_CL/contracts.lang (100%)
 rename {public => htdocs}/langs/es_CL/cron.lang (100%)
 rename {public => htdocs}/langs/es_CL/deliveries.lang (100%)
 rename {public => htdocs}/langs/es_CL/dict.lang (100%)
 rename {public => htdocs}/langs/es_CL/donations.lang (100%)
 rename {public => htdocs}/langs/es_CL/ecm.lang (100%)
 rename {public => htdocs}/langs/es_CL/errors.lang (100%)
 rename {public => htdocs}/langs/es_CL/exports.lang (100%)
 rename {public => htdocs}/langs/es_CL/externalsite.lang (100%)
 rename {public => htdocs}/langs/es_CL/ftp.lang (100%)
 rename {public => htdocs}/langs/es_CL/help.lang (100%)
 rename {public => htdocs}/langs/es_CL/holiday.lang (100%)
 rename {public => htdocs}/langs/es_CL/hrm.lang (100%)
 rename {public => htdocs}/langs/es_CL/incoterm.lang (100%)
 rename {public => htdocs}/langs/es_CL/install.lang (100%)
 rename {public => htdocs}/langs/es_CL/interventions.lang (100%)
 rename {public => htdocs}/langs/es_CL/languages.lang (100%)
 rename {public => htdocs}/langs/es_CL/ldap.lang (100%)
 rename {public => htdocs}/langs/es_CL/link.lang (100%)
 rename {public => htdocs}/langs/es_CL/loan.lang (100%)
 rename {public => htdocs}/langs/es_CL/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/es_CL/mails.lang (100%)
 rename {public => htdocs}/langs/es_CL/main.lang (100%)
 rename {public => htdocs}/langs/es_CL/margins.lang (100%)
 rename {public => htdocs}/langs/es_CL/members.lang (100%)
 rename {public => htdocs}/langs/es_CL/oauth.lang (100%)
 rename {public => htdocs}/langs/es_CL/opensurvey.lang (100%)
 rename {public => htdocs}/langs/es_CL/orders.lang (100%)
 rename {public => htdocs}/langs/es_CL/other.lang (100%)
 rename {public => htdocs}/langs/es_CL/paybox.lang (100%)
 rename {public => htdocs}/langs/es_CL/paypal.lang (100%)
 rename {public => htdocs}/langs/es_CL/printing.lang (100%)
 rename {public => htdocs}/langs/es_CL/productbatch.lang (100%)
 rename {public => htdocs}/langs/es_CL/products.lang (100%)
 rename {public => htdocs}/langs/es_CL/projects.lang (100%)
 rename {public => htdocs}/langs/es_CL/propal.lang (100%)
 rename {public => htdocs}/langs/es_CL/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/es_CL/resource.lang (100%)
 rename {public => htdocs}/langs/es_CL/salaries.lang (100%)
 rename {public => htdocs}/langs/es_CL/sendings.lang (100%)
 rename {public => htdocs}/langs/es_CL/sms.lang (100%)
 rename {public => htdocs}/langs/es_CL/stocks.lang (100%)
 rename {public => htdocs}/langs/es_CL/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/es_CL/suppliers.lang (100%)
 rename {public => htdocs}/langs/es_CL/trips.lang (100%)
 rename {public => htdocs}/langs/es_CL/users.lang (100%)
 rename {public => htdocs}/langs/es_CL/website.lang (100%)
 rename {public => htdocs}/langs/es_CL/withdrawals.lang (100%)
 rename {public => htdocs}/langs/es_CL/workflow.lang (100%)
 rename {public => htdocs}/langs/es_CO/accountancy.lang (100%)
 rename {public => htdocs}/langs/es_CO/admin.lang (100%)
 rename {public => htdocs}/langs/es_CO/agenda.lang (100%)
 rename {public => htdocs}/langs/es_CO/banks.lang (100%)
 rename {public => htdocs}/langs/es_CO/bills.lang (100%)
 rename {public => htdocs}/langs/es_CO/bookmarks.lang (100%)
 rename {public => htdocs}/langs/es_CO/boxes.lang (100%)
 rename {public => htdocs}/langs/es_CO/cashdesk.lang (100%)
 rename {public => htdocs}/langs/es_CO/categories.lang (100%)
 rename {public => htdocs}/langs/es_CO/commercial.lang (100%)
 rename {public => htdocs}/langs/es_CO/companies.lang (100%)
 rename {public => htdocs}/langs/es_CO/compta.lang (100%)
 rename {public => htdocs}/langs/es_CO/contracts.lang (100%)
 rename {public => htdocs}/langs/es_CO/cron.lang (100%)
 rename {public => htdocs}/langs/es_CO/deliveries.lang (100%)
 rename {public => htdocs}/langs/es_CO/dict.lang (100%)
 rename {public => htdocs}/langs/es_CO/donations.lang (100%)
 rename {public => htdocs}/langs/es_CO/ecm.lang (100%)
 rename {public => htdocs}/langs/es_CO/errors.lang (100%)
 rename {public => htdocs}/langs/es_CO/exports.lang (100%)
 rename {public => htdocs}/langs/es_CO/externalsite.lang (100%)
 rename {public => htdocs}/langs/es_CO/ftp.lang (100%)
 rename {public => htdocs}/langs/es_CO/help.lang (100%)
 rename {public => htdocs}/langs/es_CO/holiday.lang (100%)
 rename {public => htdocs}/langs/es_CO/hrm.lang (100%)
 rename {public => htdocs}/langs/es_CO/incoterm.lang (100%)
 rename {public => htdocs}/langs/es_CO/install.lang (100%)
 rename {public => htdocs}/langs/es_CO/interventions.lang (100%)
 rename {public => htdocs}/langs/es_CO/languages.lang (100%)
 rename {public => htdocs}/langs/es_CO/ldap.lang (100%)
 rename {public => htdocs}/langs/es_CO/link.lang (100%)
 rename {public => htdocs}/langs/es_CO/loan.lang (100%)
 rename {public => htdocs}/langs/es_CO/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/es_CO/mails.lang (100%)
 rename {public => htdocs}/langs/es_CO/main.lang (100%)
 rename {public => htdocs}/langs/es_CO/margins.lang (100%)
 rename {public => htdocs}/langs/es_CO/members.lang (100%)
 rename {public => htdocs}/langs/es_CO/oauth.lang (100%)
 rename {public => htdocs}/langs/es_CO/opensurvey.lang (100%)
 rename {public => htdocs}/langs/es_CO/orders.lang (100%)
 rename {public => htdocs}/langs/es_CO/other.lang (100%)
 rename {public => htdocs}/langs/es_CO/paybox.lang (100%)
 rename {public => htdocs}/langs/es_CO/paypal.lang (100%)
 rename {public => htdocs}/langs/es_CO/printing.lang (100%)
 rename {public => htdocs}/langs/es_CO/productbatch.lang (100%)
 rename {public => htdocs}/langs/es_CO/products.lang (100%)
 rename {public => htdocs}/langs/es_CO/projects.lang (100%)
 rename {public => htdocs}/langs/es_CO/propal.lang (100%)
 rename {public => htdocs}/langs/es_CO/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/es_CO/resource.lang (100%)
 rename {public => htdocs}/langs/es_CO/salaries.lang (100%)
 rename {public => htdocs}/langs/es_CO/sendings.lang (100%)
 rename {public => htdocs}/langs/es_CO/sms.lang (100%)
 rename {public => htdocs}/langs/es_CO/stocks.lang (100%)
 rename {public => htdocs}/langs/es_CO/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/es_CO/suppliers.lang (100%)
 rename {public => htdocs}/langs/es_CO/trips.lang (100%)
 rename {public => htdocs}/langs/es_CO/users.lang (100%)
 rename {public => htdocs}/langs/es_CO/website.lang (100%)
 rename {public => htdocs}/langs/es_CO/withdrawals.lang (100%)
 rename {public => htdocs}/langs/es_CO/workflow.lang (100%)
 rename {public => htdocs}/langs/es_DO/accountancy.lang (100%)
 rename {public => htdocs}/langs/es_DO/admin.lang (100%)
 rename {public => htdocs}/langs/es_DO/agenda.lang (100%)
 rename {public => htdocs}/langs/es_DO/banks.lang (100%)
 rename {public => htdocs}/langs/es_DO/bills.lang (100%)
 rename {public => htdocs}/langs/es_DO/bookmarks.lang (100%)
 rename {public => htdocs}/langs/es_DO/boxes.lang (100%)
 rename {public => htdocs}/langs/es_DO/cashdesk.lang (100%)
 rename {public => htdocs}/langs/es_DO/categories.lang (100%)
 rename {public => htdocs}/langs/es_DO/commercial.lang (100%)
 rename {public => htdocs}/langs/es_DO/companies.lang (100%)
 rename {public => htdocs}/langs/es_DO/compta.lang (100%)
 rename {public => htdocs}/langs/es_DO/contracts.lang (100%)
 rename {public => htdocs}/langs/es_DO/cron.lang (100%)
 rename {public => htdocs}/langs/es_DO/deliveries.lang (100%)
 rename {public => htdocs}/langs/es_DO/dict.lang (100%)
 rename {public => htdocs}/langs/es_DO/donations.lang (100%)
 rename {public => htdocs}/langs/es_DO/ecm.lang (100%)
 rename {public => htdocs}/langs/es_DO/errors.lang (100%)
 rename {public => htdocs}/langs/es_DO/exports.lang (100%)
 rename {public => htdocs}/langs/es_DO/externalsite.lang (100%)
 rename {public => htdocs}/langs/es_DO/ftp.lang (100%)
 rename {public => htdocs}/langs/es_DO/help.lang (100%)
 rename {public => htdocs}/langs/es_DO/holiday.lang (100%)
 rename {public => htdocs}/langs/es_DO/hrm.lang (100%)
 rename {public => htdocs}/langs/es_DO/incoterm.lang (100%)
 rename {public => htdocs}/langs/es_DO/install.lang (100%)
 rename {public => htdocs}/langs/es_DO/interventions.lang (100%)
 rename {public => htdocs}/langs/es_DO/languages.lang (100%)
 rename {public => htdocs}/langs/es_DO/ldap.lang (100%)
 rename {public => htdocs}/langs/es_DO/link.lang (100%)
 rename {public => htdocs}/langs/es_DO/loan.lang (100%)
 rename {public => htdocs}/langs/es_DO/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/es_DO/mails.lang (100%)
 rename {public => htdocs}/langs/es_DO/main.lang (100%)
 rename {public => htdocs}/langs/es_DO/margins.lang (100%)
 rename {public => htdocs}/langs/es_DO/members.lang (100%)
 rename {public => htdocs}/langs/es_DO/oauth.lang (100%)
 rename {public => htdocs}/langs/es_DO/opensurvey.lang (100%)
 rename {public => htdocs}/langs/es_DO/orders.lang (100%)
 rename {public => htdocs}/langs/es_DO/other.lang (100%)
 rename {public => htdocs}/langs/es_DO/paybox.lang (100%)
 rename {public => htdocs}/langs/es_DO/paypal.lang (100%)
 rename {public => htdocs}/langs/es_DO/printing.lang (100%)
 rename {public => htdocs}/langs/es_DO/productbatch.lang (100%)
 rename {public => htdocs}/langs/es_DO/products.lang (100%)
 rename {public => htdocs}/langs/es_DO/projects.lang (100%)
 rename {public => htdocs}/langs/es_DO/propal.lang (100%)
 rename {public => htdocs}/langs/es_DO/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/es_DO/resource.lang (100%)
 rename {public => htdocs}/langs/es_DO/salaries.lang (100%)
 rename {public => htdocs}/langs/es_DO/sendings.lang (100%)
 rename {public => htdocs}/langs/es_DO/sms.lang (100%)
 rename {public => htdocs}/langs/es_DO/stocks.lang (100%)
 rename {public => htdocs}/langs/es_DO/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/es_DO/suppliers.lang (100%)
 rename {public => htdocs}/langs/es_DO/trips.lang (100%)
 rename {public => htdocs}/langs/es_DO/users.lang (100%)
 rename {public => htdocs}/langs/es_DO/website.lang (100%)
 rename {public => htdocs}/langs/es_DO/withdrawals.lang (100%)
 rename {public => htdocs}/langs/es_DO/workflow.lang (100%)
 rename {public => htdocs}/langs/es_EC/accountancy.lang (100%)
 rename {public => htdocs}/langs/es_EC/admin.lang (100%)
 rename {public => htdocs}/langs/es_EC/agenda.lang (100%)
 rename {public => htdocs}/langs/es_EC/banks.lang (100%)
 rename {public => htdocs}/langs/es_EC/bills.lang (100%)
 rename {public => htdocs}/langs/es_EC/bookmarks.lang (100%)
 rename {public => htdocs}/langs/es_EC/boxes.lang (100%)
 rename {public => htdocs}/langs/es_EC/cashdesk.lang (100%)
 rename {public => htdocs}/langs/es_EC/categories.lang (100%)
 rename {public => htdocs}/langs/es_EC/commercial.lang (100%)
 rename {public => htdocs}/langs/es_EC/companies.lang (100%)
 rename {public => htdocs}/langs/es_EC/compta.lang (100%)
 rename {public => htdocs}/langs/es_EC/contracts.lang (100%)
 rename {public => htdocs}/langs/es_EC/cron.lang (100%)
 rename {public => htdocs}/langs/es_EC/deliveries.lang (100%)
 rename {public => htdocs}/langs/es_EC/dict.lang (100%)
 rename {public => htdocs}/langs/es_EC/donations.lang (100%)
 rename {public => htdocs}/langs/es_EC/ecm.lang (100%)
 rename {public => htdocs}/langs/es_EC/errors.lang (100%)
 rename {public => htdocs}/langs/es_EC/exports.lang (100%)
 rename {public => htdocs}/langs/es_EC/externalsite.lang (100%)
 rename {public => htdocs}/langs/es_EC/ftp.lang (100%)
 rename {public => htdocs}/langs/es_EC/help.lang (100%)
 rename {public => htdocs}/langs/es_EC/holiday.lang (100%)
 rename {public => htdocs}/langs/es_EC/hrm.lang (100%)
 rename {public => htdocs}/langs/es_EC/incoterm.lang (100%)
 rename {public => htdocs}/langs/es_EC/install.lang (100%)
 rename {public => htdocs}/langs/es_EC/interventions.lang (100%)
 rename {public => htdocs}/langs/es_EC/languages.lang (100%)
 rename {public => htdocs}/langs/es_EC/ldap.lang (100%)
 rename {public => htdocs}/langs/es_EC/link.lang (100%)
 rename {public => htdocs}/langs/es_EC/loan.lang (100%)
 rename {public => htdocs}/langs/es_EC/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/es_EC/mails.lang (100%)
 rename {public => htdocs}/langs/es_EC/main.lang (100%)
 rename {public => htdocs}/langs/es_EC/margins.lang (100%)
 rename {public => htdocs}/langs/es_EC/members.lang (100%)
 rename {public => htdocs}/langs/es_EC/oauth.lang (100%)
 rename {public => htdocs}/langs/es_EC/opensurvey.lang (100%)
 rename {public => htdocs}/langs/es_EC/orders.lang (100%)
 rename {public => htdocs}/langs/es_EC/other.lang (100%)
 rename {public => htdocs}/langs/es_EC/paybox.lang (100%)
 rename {public => htdocs}/langs/es_EC/paypal.lang (100%)
 rename {public => htdocs}/langs/es_EC/printing.lang (100%)
 rename {public => htdocs}/langs/es_EC/productbatch.lang (100%)
 rename {public => htdocs}/langs/es_EC/products.lang (100%)
 rename {public => htdocs}/langs/es_EC/projects.lang (100%)
 rename {public => htdocs}/langs/es_EC/propal.lang (100%)
 rename {public => htdocs}/langs/es_EC/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/es_EC/resource.lang (100%)
 rename {public => htdocs}/langs/es_EC/salaries.lang (100%)
 rename {public => htdocs}/langs/es_EC/sendings.lang (100%)
 rename {public => htdocs}/langs/es_EC/sms.lang (100%)
 rename {public => htdocs}/langs/es_EC/stocks.lang (100%)
 rename {public => htdocs}/langs/es_EC/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/es_EC/suppliers.lang (100%)
 rename {public => htdocs}/langs/es_EC/trips.lang (100%)
 rename {public => htdocs}/langs/es_EC/users.lang (100%)
 rename {public => htdocs}/langs/es_EC/website.lang (100%)
 rename {public => htdocs}/langs/es_EC/withdrawals.lang (100%)
 rename {public => htdocs}/langs/es_EC/workflow.lang (100%)
 rename {public => htdocs}/langs/es_ES/accountancy.lang (100%)
 rename {public => htdocs}/langs/es_ES/admin.lang (100%)
 rename {public => htdocs}/langs/es_ES/agenda.lang (100%)
 rename {public => htdocs}/langs/es_ES/banks.lang (100%)
 rename {public => htdocs}/langs/es_ES/bills.lang (100%)
 rename {public => htdocs}/langs/es_ES/bookmarks.lang (100%)
 rename {public => htdocs}/langs/es_ES/boxes.lang (100%)
 rename {public => htdocs}/langs/es_ES/cashdesk.lang (100%)
 rename {public => htdocs}/langs/es_ES/categories.lang (100%)
 rename {public => htdocs}/langs/es_ES/commercial.lang (100%)
 rename {public => htdocs}/langs/es_ES/companies.lang (100%)
 rename {public => htdocs}/langs/es_ES/compta.lang (100%)
 rename {public => htdocs}/langs/es_ES/contracts.lang (100%)
 rename {public => htdocs}/langs/es_ES/cron.lang (100%)
 rename {public => htdocs}/langs/es_ES/deliveries.lang (100%)
 rename {public => htdocs}/langs/es_ES/dict.lang (100%)
 rename {public => htdocs}/langs/es_ES/donations.lang (100%)
 rename {public => htdocs}/langs/es_ES/ecm.lang (100%)
 rename {public => htdocs}/langs/es_ES/errors.lang (100%)
 rename {public => htdocs}/langs/es_ES/exports.lang (100%)
 rename {public => htdocs}/langs/es_ES/externalsite.lang (100%)
 rename {public => htdocs}/langs/es_ES/ftp.lang (100%)
 rename {public => htdocs}/langs/es_ES/help.lang (100%)
 rename {public => htdocs}/langs/es_ES/holiday.lang (100%)
 rename {public => htdocs}/langs/es_ES/hrm.lang (100%)
 rename {public => htdocs}/langs/es_ES/incoterm.lang (100%)
 rename {public => htdocs}/langs/es_ES/install.lang (100%)
 rename {public => htdocs}/langs/es_ES/interventions.lang (100%)
 rename {public => htdocs}/langs/es_ES/languages.lang (100%)
 rename {public => htdocs}/langs/es_ES/ldap.lang (100%)
 rename {public => htdocs}/langs/es_ES/link.lang (100%)
 rename {public => htdocs}/langs/es_ES/loan.lang (100%)
 rename {public => htdocs}/langs/es_ES/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/es_ES/mails.lang (100%)
 rename {public => htdocs}/langs/es_ES/main.lang (100%)
 rename {public => htdocs}/langs/es_ES/margins.lang (100%)
 rename {public => htdocs}/langs/es_ES/members.lang (100%)
 rename {public => htdocs}/langs/es_ES/oauth.lang (100%)
 rename {public => htdocs}/langs/es_ES/opensurvey.lang (100%)
 rename {public => htdocs}/langs/es_ES/orders.lang (100%)
 rename {public => htdocs}/langs/es_ES/other.lang (100%)
 rename {public => htdocs}/langs/es_ES/paybox.lang (100%)
 rename {public => htdocs}/langs/es_ES/paypal.lang (100%)
 rename {public => htdocs}/langs/es_ES/printing.lang (100%)
 rename {public => htdocs}/langs/es_ES/productbatch.lang (100%)
 rename {public => htdocs}/langs/es_ES/products.lang (100%)
 rename {public => htdocs}/langs/es_ES/projects.lang (100%)
 rename {public => htdocs}/langs/es_ES/propal.lang (100%)
 rename {public => htdocs}/langs/es_ES/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/es_ES/resource.lang (100%)
 rename {public => htdocs}/langs/es_ES/salaries.lang (100%)
 rename {public => htdocs}/langs/es_ES/sendings.lang (100%)
 rename {public => htdocs}/langs/es_ES/sms.lang (100%)
 rename {public => htdocs}/langs/es_ES/stocks.lang (100%)
 rename {public => htdocs}/langs/es_ES/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/es_ES/suppliers.lang (100%)
 rename {public => htdocs}/langs/es_ES/trips.lang (100%)
 rename {public => htdocs}/langs/es_ES/users.lang (100%)
 rename {public => htdocs}/langs/es_ES/website.lang (100%)
 rename {public => htdocs}/langs/es_ES/withdrawals.lang (100%)
 rename {public => htdocs}/langs/es_ES/workflow.lang (100%)
 rename {public => htdocs}/langs/es_HN/admin.lang (100%)
 rename {public => htdocs}/langs/es_HN/bills.lang (100%)
 rename {public => htdocs}/langs/es_HN/companies.lang (100%)
 rename {public => htdocs}/langs/es_HN/compta.lang (100%)
 rename {public => htdocs}/langs/es_HN/main.lang (100%)
 rename {public => htdocs}/langs/es_HN/propal.lang (100%)
 rename {public => htdocs}/langs/es_MX/accountancy.lang (100%)
 rename {public => htdocs}/langs/es_MX/admin.lang (100%)
 rename {public => htdocs}/langs/es_MX/agenda.lang (100%)
 rename {public => htdocs}/langs/es_MX/banks.lang (100%)
 rename {public => htdocs}/langs/es_MX/bills.lang (100%)
 rename {public => htdocs}/langs/es_MX/bookmarks.lang (100%)
 rename {public => htdocs}/langs/es_MX/boxes.lang (100%)
 rename {public => htdocs}/langs/es_MX/cashdesk.lang (100%)
 rename {public => htdocs}/langs/es_MX/categories.lang (100%)
 rename {public => htdocs}/langs/es_MX/commercial.lang (100%)
 rename {public => htdocs}/langs/es_MX/companies.lang (100%)
 rename {public => htdocs}/langs/es_MX/compta.lang (100%)
 rename {public => htdocs}/langs/es_MX/contracts.lang (100%)
 rename {public => htdocs}/langs/es_MX/cron.lang (100%)
 rename {public => htdocs}/langs/es_MX/deliveries.lang (100%)
 rename {public => htdocs}/langs/es_MX/dict.lang (100%)
 rename {public => htdocs}/langs/es_MX/donations.lang (100%)
 rename {public => htdocs}/langs/es_MX/ecm.lang (100%)
 rename {public => htdocs}/langs/es_MX/errors.lang (100%)
 rename {public => htdocs}/langs/es_MX/exports.lang (100%)
 rename {public => htdocs}/langs/es_MX/externalsite.lang (100%)
 rename {public => htdocs}/langs/es_MX/ftp.lang (100%)
 rename {public => htdocs}/langs/es_MX/help.lang (100%)
 rename {public => htdocs}/langs/es_MX/holiday.lang (100%)
 rename {public => htdocs}/langs/es_MX/hrm.lang (100%)
 rename {public => htdocs}/langs/es_MX/incoterm.lang (100%)
 rename {public => htdocs}/langs/es_MX/install.lang (100%)
 rename {public => htdocs}/langs/es_MX/interventions.lang (100%)
 rename {public => htdocs}/langs/es_MX/languages.lang (100%)
 rename {public => htdocs}/langs/es_MX/ldap.lang (100%)
 rename {public => htdocs}/langs/es_MX/link.lang (100%)
 rename {public => htdocs}/langs/es_MX/loan.lang (100%)
 rename {public => htdocs}/langs/es_MX/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/es_MX/mails.lang (100%)
 rename {public => htdocs}/langs/es_MX/main.lang (100%)
 rename {public => htdocs}/langs/es_MX/margins.lang (100%)
 rename {public => htdocs}/langs/es_MX/members.lang (100%)
 rename {public => htdocs}/langs/es_MX/oauth.lang (100%)
 rename {public => htdocs}/langs/es_MX/opensurvey.lang (100%)
 rename {public => htdocs}/langs/es_MX/orders.lang (100%)
 rename {public => htdocs}/langs/es_MX/other.lang (100%)
 rename {public => htdocs}/langs/es_MX/paybox.lang (100%)
 rename {public => htdocs}/langs/es_MX/paypal.lang (100%)
 rename {public => htdocs}/langs/es_MX/printing.lang (100%)
 rename {public => htdocs}/langs/es_MX/productbatch.lang (100%)
 rename {public => htdocs}/langs/es_MX/products.lang (100%)
 rename {public => htdocs}/langs/es_MX/projects.lang (100%)
 rename {public => htdocs}/langs/es_MX/propal.lang (100%)
 rename {public => htdocs}/langs/es_MX/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/es_MX/resource.lang (100%)
 rename {public => htdocs}/langs/es_MX/salaries.lang (100%)
 rename {public => htdocs}/langs/es_MX/sendings.lang (100%)
 rename {public => htdocs}/langs/es_MX/sms.lang (100%)
 rename {public => htdocs}/langs/es_MX/stocks.lang (100%)
 rename {public => htdocs}/langs/es_MX/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/es_MX/suppliers.lang (100%)
 rename {public => htdocs}/langs/es_MX/trips.lang (100%)
 rename {public => htdocs}/langs/es_MX/users.lang (100%)
 rename {public => htdocs}/langs/es_MX/website.lang (100%)
 rename {public => htdocs}/langs/es_MX/withdrawals.lang (100%)
 rename {public => htdocs}/langs/es_MX/workflow.lang (100%)
 rename {public => htdocs}/langs/es_PA/accountancy.lang (100%)
 rename {public => htdocs}/langs/es_PA/admin.lang (100%)
 rename {public => htdocs}/langs/es_PA/agenda.lang (100%)
 rename {public => htdocs}/langs/es_PA/banks.lang (100%)
 rename {public => htdocs}/langs/es_PA/bills.lang (100%)
 rename {public => htdocs}/langs/es_PA/bookmarks.lang (100%)
 rename {public => htdocs}/langs/es_PA/boxes.lang (100%)
 rename {public => htdocs}/langs/es_PA/cashdesk.lang (100%)
 rename {public => htdocs}/langs/es_PA/categories.lang (100%)
 rename {public => htdocs}/langs/es_PA/commercial.lang (100%)
 rename {public => htdocs}/langs/es_PA/companies.lang (100%)
 rename {public => htdocs}/langs/es_PA/compta.lang (100%)
 rename {public => htdocs}/langs/es_PA/contracts.lang (100%)
 rename {public => htdocs}/langs/es_PA/cron.lang (100%)
 rename {public => htdocs}/langs/es_PA/deliveries.lang (100%)
 rename {public => htdocs}/langs/es_PA/dict.lang (100%)
 rename {public => htdocs}/langs/es_PA/donations.lang (100%)
 rename {public => htdocs}/langs/es_PA/ecm.lang (100%)
 rename {public => htdocs}/langs/es_PA/errors.lang (100%)
 rename {public => htdocs}/langs/es_PA/exports.lang (100%)
 rename {public => htdocs}/langs/es_PA/externalsite.lang (100%)
 rename {public => htdocs}/langs/es_PA/ftp.lang (100%)
 rename {public => htdocs}/langs/es_PA/help.lang (100%)
 rename {public => htdocs}/langs/es_PA/holiday.lang (100%)
 rename {public => htdocs}/langs/es_PA/hrm.lang (100%)
 rename {public => htdocs}/langs/es_PA/incoterm.lang (100%)
 rename {public => htdocs}/langs/es_PA/install.lang (100%)
 rename {public => htdocs}/langs/es_PA/interventions.lang (100%)
 rename {public => htdocs}/langs/es_PA/languages.lang (100%)
 rename {public => htdocs}/langs/es_PA/ldap.lang (100%)
 rename {public => htdocs}/langs/es_PA/link.lang (100%)
 rename {public => htdocs}/langs/es_PA/loan.lang (100%)
 rename {public => htdocs}/langs/es_PA/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/es_PA/mails.lang (100%)
 rename {public => htdocs}/langs/es_PA/main.lang (100%)
 rename {public => htdocs}/langs/es_PA/margins.lang (100%)
 rename {public => htdocs}/langs/es_PA/members.lang (100%)
 rename {public => htdocs}/langs/es_PA/oauth.lang (100%)
 rename {public => htdocs}/langs/es_PA/opensurvey.lang (100%)
 rename {public => htdocs}/langs/es_PA/orders.lang (100%)
 rename {public => htdocs}/langs/es_PA/other.lang (100%)
 rename {public => htdocs}/langs/es_PA/paybox.lang (100%)
 rename {public => htdocs}/langs/es_PA/paypal.lang (100%)
 rename {public => htdocs}/langs/es_PA/printing.lang (100%)
 rename {public => htdocs}/langs/es_PA/productbatch.lang (100%)
 rename {public => htdocs}/langs/es_PA/products.lang (100%)
 rename {public => htdocs}/langs/es_PA/projects.lang (100%)
 rename {public => htdocs}/langs/es_PA/propal.lang (100%)
 rename {public => htdocs}/langs/es_PA/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/es_PA/resource.lang (100%)
 rename {public => htdocs}/langs/es_PA/salaries.lang (100%)
 rename {public => htdocs}/langs/es_PA/sendings.lang (100%)
 rename {public => htdocs}/langs/es_PA/sms.lang (100%)
 rename {public => htdocs}/langs/es_PA/stocks.lang (100%)
 rename {public => htdocs}/langs/es_PA/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/es_PA/suppliers.lang (100%)
 rename {public => htdocs}/langs/es_PA/trips.lang (100%)
 rename {public => htdocs}/langs/es_PA/users.lang (100%)
 rename {public => htdocs}/langs/es_PA/website.lang (100%)
 rename {public => htdocs}/langs/es_PA/withdrawals.lang (100%)
 rename {public => htdocs}/langs/es_PA/workflow.lang (100%)
 rename {public => htdocs}/langs/es_PE/accountancy.lang (100%)
 rename {public => htdocs}/langs/es_PE/admin.lang (100%)
 rename {public => htdocs}/langs/es_PE/agenda.lang (100%)
 rename {public => htdocs}/langs/es_PE/banks.lang (100%)
 rename {public => htdocs}/langs/es_PE/bills.lang (100%)
 rename {public => htdocs}/langs/es_PE/bookmarks.lang (100%)
 rename {public => htdocs}/langs/es_PE/boxes.lang (100%)
 rename {public => htdocs}/langs/es_PE/cashdesk.lang (100%)
 rename {public => htdocs}/langs/es_PE/categories.lang (100%)
 rename {public => htdocs}/langs/es_PE/commercial.lang (100%)
 rename {public => htdocs}/langs/es_PE/companies.lang (100%)
 rename {public => htdocs}/langs/es_PE/compta.lang (100%)
 rename {public => htdocs}/langs/es_PE/contracts.lang (100%)
 rename {public => htdocs}/langs/es_PE/cron.lang (100%)
 rename {public => htdocs}/langs/es_PE/deliveries.lang (100%)
 rename {public => htdocs}/langs/es_PE/dict.lang (100%)
 rename {public => htdocs}/langs/es_PE/donations.lang (100%)
 rename {public => htdocs}/langs/es_PE/ecm.lang (100%)
 rename {public => htdocs}/langs/es_PE/errors.lang (100%)
 rename {public => htdocs}/langs/es_PE/exports.lang (100%)
 rename {public => htdocs}/langs/es_PE/externalsite.lang (100%)
 rename {public => htdocs}/langs/es_PE/ftp.lang (100%)
 rename {public => htdocs}/langs/es_PE/help.lang (100%)
 rename {public => htdocs}/langs/es_PE/holiday.lang (100%)
 rename {public => htdocs}/langs/es_PE/hrm.lang (100%)
 rename {public => htdocs}/langs/es_PE/incoterm.lang (100%)
 rename {public => htdocs}/langs/es_PE/install.lang (100%)
 rename {public => htdocs}/langs/es_PE/interventions.lang (100%)
 rename {public => htdocs}/langs/es_PE/languages.lang (100%)
 rename {public => htdocs}/langs/es_PE/ldap.lang (100%)
 rename {public => htdocs}/langs/es_PE/link.lang (100%)
 rename {public => htdocs}/langs/es_PE/loan.lang (100%)
 rename {public => htdocs}/langs/es_PE/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/es_PE/mails.lang (100%)
 rename {public => htdocs}/langs/es_PE/main.lang (100%)
 rename {public => htdocs}/langs/es_PE/margins.lang (100%)
 rename {public => htdocs}/langs/es_PE/members.lang (100%)
 rename {public => htdocs}/langs/es_PE/oauth.lang (100%)
 rename {public => htdocs}/langs/es_PE/opensurvey.lang (100%)
 rename {public => htdocs}/langs/es_PE/orders.lang (100%)
 rename {public => htdocs}/langs/es_PE/other.lang (100%)
 rename {public => htdocs}/langs/es_PE/paybox.lang (100%)
 rename {public => htdocs}/langs/es_PE/paypal.lang (100%)
 rename {public => htdocs}/langs/es_PE/printing.lang (100%)
 rename {public => htdocs}/langs/es_PE/productbatch.lang (100%)
 rename {public => htdocs}/langs/es_PE/products.lang (100%)
 rename {public => htdocs}/langs/es_PE/projects.lang (100%)
 rename {public => htdocs}/langs/es_PE/propal.lang (100%)
 rename {public => htdocs}/langs/es_PE/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/es_PE/resource.lang (100%)
 rename {public => htdocs}/langs/es_PE/salaries.lang (100%)
 rename {public => htdocs}/langs/es_PE/sendings.lang (100%)
 rename {public => htdocs}/langs/es_PE/sms.lang (100%)
 rename {public => htdocs}/langs/es_PE/stocks.lang (100%)
 rename {public => htdocs}/langs/es_PE/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/es_PE/suppliers.lang (100%)
 rename {public => htdocs}/langs/es_PE/trips.lang (100%)
 rename {public => htdocs}/langs/es_PE/users.lang (100%)
 rename {public => htdocs}/langs/es_PE/website.lang (100%)
 rename {public => htdocs}/langs/es_PE/withdrawals.lang (100%)
 rename {public => htdocs}/langs/es_PE/workflow.lang (100%)
 rename {public => htdocs}/langs/es_PR/admin.lang (100%)
 rename {public => htdocs}/langs/es_PR/bills.lang (100%)
 rename {public => htdocs}/langs/es_PR/companies.lang (100%)
 rename {public => htdocs}/langs/es_PR/compta.lang (100%)
 rename {public => htdocs}/langs/es_PR/main.lang (100%)
 rename {public => htdocs}/langs/es_PR/propal.lang (100%)
 rename {public => htdocs}/langs/es_PY/accountancy.lang (100%)
 rename {public => htdocs}/langs/es_PY/admin.lang (100%)
 rename {public => htdocs}/langs/es_PY/agenda.lang (100%)
 rename {public => htdocs}/langs/es_PY/banks.lang (100%)
 rename {public => htdocs}/langs/es_PY/bills.lang (100%)
 rename {public => htdocs}/langs/es_PY/bookmarks.lang (100%)
 rename {public => htdocs}/langs/es_PY/boxes.lang (100%)
 rename {public => htdocs}/langs/es_PY/cashdesk.lang (100%)
 rename {public => htdocs}/langs/es_PY/categories.lang (100%)
 rename {public => htdocs}/langs/es_PY/commercial.lang (100%)
 rename {public => htdocs}/langs/es_PY/companies.lang (100%)
 rename {public => htdocs}/langs/es_PY/compta.lang (100%)
 rename {public => htdocs}/langs/es_PY/contracts.lang (100%)
 rename {public => htdocs}/langs/es_PY/cron.lang (100%)
 rename {public => htdocs}/langs/es_PY/deliveries.lang (100%)
 rename {public => htdocs}/langs/es_PY/dict.lang (100%)
 rename {public => htdocs}/langs/es_PY/donations.lang (100%)
 rename {public => htdocs}/langs/es_PY/ecm.lang (100%)
 rename {public => htdocs}/langs/es_PY/errors.lang (100%)
 rename {public => htdocs}/langs/es_PY/exports.lang (100%)
 rename {public => htdocs}/langs/es_PY/externalsite.lang (100%)
 rename {public => htdocs}/langs/es_PY/ftp.lang (100%)
 rename {public => htdocs}/langs/es_PY/help.lang (100%)
 rename {public => htdocs}/langs/es_PY/holiday.lang (100%)
 rename {public => htdocs}/langs/es_PY/hrm.lang (100%)
 rename {public => htdocs}/langs/es_PY/incoterm.lang (100%)
 rename {public => htdocs}/langs/es_PY/install.lang (100%)
 rename {public => htdocs}/langs/es_PY/interventions.lang (100%)
 rename {public => htdocs}/langs/es_PY/languages.lang (100%)
 rename {public => htdocs}/langs/es_PY/ldap.lang (100%)
 rename {public => htdocs}/langs/es_PY/link.lang (100%)
 rename {public => htdocs}/langs/es_PY/loan.lang (100%)
 rename {public => htdocs}/langs/es_PY/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/es_PY/mails.lang (100%)
 rename {public => htdocs}/langs/es_PY/main.lang (100%)
 rename {public => htdocs}/langs/es_PY/margins.lang (100%)
 rename {public => htdocs}/langs/es_PY/members.lang (100%)
 rename {public => htdocs}/langs/es_PY/oauth.lang (100%)
 rename {public => htdocs}/langs/es_PY/opensurvey.lang (100%)
 rename {public => htdocs}/langs/es_PY/orders.lang (100%)
 rename {public => htdocs}/langs/es_PY/other.lang (100%)
 rename {public => htdocs}/langs/es_PY/paybox.lang (100%)
 rename {public => htdocs}/langs/es_PY/paypal.lang (100%)
 rename {public => htdocs}/langs/es_PY/printing.lang (100%)
 rename {public => htdocs}/langs/es_PY/productbatch.lang (100%)
 rename {public => htdocs}/langs/es_PY/products.lang (100%)
 rename {public => htdocs}/langs/es_PY/projects.lang (100%)
 rename {public => htdocs}/langs/es_PY/propal.lang (100%)
 rename {public => htdocs}/langs/es_PY/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/es_PY/resource.lang (100%)
 rename {public => htdocs}/langs/es_PY/salaries.lang (100%)
 rename {public => htdocs}/langs/es_PY/sendings.lang (100%)
 rename {public => htdocs}/langs/es_PY/sms.lang (100%)
 rename {public => htdocs}/langs/es_PY/stocks.lang (100%)
 rename {public => htdocs}/langs/es_PY/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/es_PY/suppliers.lang (100%)
 rename {public => htdocs}/langs/es_PY/trips.lang (100%)
 rename {public => htdocs}/langs/es_PY/users.lang (100%)
 rename {public => htdocs}/langs/es_PY/website.lang (100%)
 rename {public => htdocs}/langs/es_PY/withdrawals.lang (100%)
 rename {public => htdocs}/langs/es_PY/workflow.lang (100%)
 rename {public => htdocs}/langs/es_VE/accountancy.lang (100%)
 rename {public => htdocs}/langs/es_VE/admin.lang (100%)
 rename {public => htdocs}/langs/es_VE/agenda.lang (100%)
 rename {public => htdocs}/langs/es_VE/banks.lang (100%)
 rename {public => htdocs}/langs/es_VE/bills.lang (100%)
 rename {public => htdocs}/langs/es_VE/bookmarks.lang (100%)
 rename {public => htdocs}/langs/es_VE/boxes.lang (100%)
 rename {public => htdocs}/langs/es_VE/cashdesk.lang (100%)
 rename {public => htdocs}/langs/es_VE/categories.lang (100%)
 rename {public => htdocs}/langs/es_VE/commercial.lang (100%)
 rename {public => htdocs}/langs/es_VE/companies.lang (100%)
 rename {public => htdocs}/langs/es_VE/compta.lang (100%)
 rename {public => htdocs}/langs/es_VE/contracts.lang (100%)
 rename {public => htdocs}/langs/es_VE/cron.lang (100%)
 rename {public => htdocs}/langs/es_VE/deliveries.lang (100%)
 rename {public => htdocs}/langs/es_VE/dict.lang (100%)
 rename {public => htdocs}/langs/es_VE/donations.lang (100%)
 rename {public => htdocs}/langs/es_VE/ecm.lang (100%)
 rename {public => htdocs}/langs/es_VE/errors.lang (100%)
 rename {public => htdocs}/langs/es_VE/exports.lang (100%)
 rename {public => htdocs}/langs/es_VE/externalsite.lang (100%)
 rename {public => htdocs}/langs/es_VE/ftp.lang (100%)
 rename {public => htdocs}/langs/es_VE/help.lang (100%)
 rename {public => htdocs}/langs/es_VE/holiday.lang (100%)
 rename {public => htdocs}/langs/es_VE/hrm.lang (100%)
 rename {public => htdocs}/langs/es_VE/incoterm.lang (100%)
 rename {public => htdocs}/langs/es_VE/install.lang (100%)
 rename {public => htdocs}/langs/es_VE/interventions.lang (100%)
 rename {public => htdocs}/langs/es_VE/languages.lang (100%)
 rename {public => htdocs}/langs/es_VE/ldap.lang (100%)
 rename {public => htdocs}/langs/es_VE/link.lang (100%)
 rename {public => htdocs}/langs/es_VE/loan.lang (100%)
 rename {public => htdocs}/langs/es_VE/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/es_VE/mails.lang (100%)
 rename {public => htdocs}/langs/es_VE/main.lang (100%)
 rename {public => htdocs}/langs/es_VE/margins.lang (100%)
 rename {public => htdocs}/langs/es_VE/members.lang (100%)
 rename {public => htdocs}/langs/es_VE/oauth.lang (100%)
 rename {public => htdocs}/langs/es_VE/opensurvey.lang (100%)
 rename {public => htdocs}/langs/es_VE/orders.lang (100%)
 rename {public => htdocs}/langs/es_VE/other.lang (100%)
 rename {public => htdocs}/langs/es_VE/paybox.lang (100%)
 rename {public => htdocs}/langs/es_VE/paypal.lang (100%)
 rename {public => htdocs}/langs/es_VE/printing.lang (100%)
 rename {public => htdocs}/langs/es_VE/productbatch.lang (100%)
 rename {public => htdocs}/langs/es_VE/products.lang (100%)
 rename {public => htdocs}/langs/es_VE/projects.lang (100%)
 rename {public => htdocs}/langs/es_VE/propal.lang (100%)
 rename {public => htdocs}/langs/es_VE/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/es_VE/resource.lang (100%)
 rename {public => htdocs}/langs/es_VE/salaries.lang (100%)
 rename {public => htdocs}/langs/es_VE/sendings.lang (100%)
 rename {public => htdocs}/langs/es_VE/sms.lang (100%)
 rename {public => htdocs}/langs/es_VE/stocks.lang (100%)
 rename {public => htdocs}/langs/es_VE/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/es_VE/suppliers.lang (100%)
 rename {public => htdocs}/langs/es_VE/trips.lang (100%)
 rename {public => htdocs}/langs/es_VE/users.lang (100%)
 rename {public => htdocs}/langs/es_VE/website.lang (100%)
 rename {public => htdocs}/langs/es_VE/withdrawals.lang (100%)
 rename {public => htdocs}/langs/es_VE/workflow.lang (100%)
 rename {public => htdocs}/langs/et_EE/accountancy.lang (100%)
 rename {public => htdocs}/langs/et_EE/admin.lang (100%)
 rename {public => htdocs}/langs/et_EE/agenda.lang (100%)
 rename {public => htdocs}/langs/et_EE/banks.lang (100%)
 rename {public => htdocs}/langs/et_EE/bills.lang (100%)
 rename {public => htdocs}/langs/et_EE/bookmarks.lang (100%)
 rename {public => htdocs}/langs/et_EE/boxes.lang (100%)
 rename {public => htdocs}/langs/et_EE/cashdesk.lang (100%)
 rename {public => htdocs}/langs/et_EE/categories.lang (100%)
 rename {public => htdocs}/langs/et_EE/commercial.lang (100%)
 rename {public => htdocs}/langs/et_EE/companies.lang (100%)
 rename {public => htdocs}/langs/et_EE/compta.lang (100%)
 rename {public => htdocs}/langs/et_EE/contracts.lang (100%)
 rename {public => htdocs}/langs/et_EE/cron.lang (100%)
 rename {public => htdocs}/langs/et_EE/deliveries.lang (100%)
 rename {public => htdocs}/langs/et_EE/dict.lang (100%)
 rename {public => htdocs}/langs/et_EE/donations.lang (100%)
 rename {public => htdocs}/langs/et_EE/ecm.lang (100%)
 rename {public => htdocs}/langs/et_EE/errors.lang (100%)
 rename {public => htdocs}/langs/et_EE/exports.lang (100%)
 rename {public => htdocs}/langs/et_EE/externalsite.lang (100%)
 rename {public => htdocs}/langs/et_EE/ftp.lang (100%)
 rename {public => htdocs}/langs/et_EE/help.lang (100%)
 rename {public => htdocs}/langs/et_EE/holiday.lang (100%)
 rename {public => htdocs}/langs/et_EE/hrm.lang (100%)
 rename {public => htdocs}/langs/et_EE/incoterm.lang (100%)
 rename {public => htdocs}/langs/et_EE/install.lang (100%)
 rename {public => htdocs}/langs/et_EE/interventions.lang (100%)
 rename {public => htdocs}/langs/et_EE/languages.lang (100%)
 rename {public => htdocs}/langs/et_EE/ldap.lang (100%)
 rename {public => htdocs}/langs/et_EE/link.lang (100%)
 rename {public => htdocs}/langs/et_EE/loan.lang (100%)
 rename {public => htdocs}/langs/et_EE/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/et_EE/mails.lang (100%)
 rename {public => htdocs}/langs/et_EE/main.lang (100%)
 rename {public => htdocs}/langs/et_EE/margins.lang (100%)
 rename {public => htdocs}/langs/et_EE/members.lang (100%)
 rename {public => htdocs}/langs/et_EE/oauth.lang (100%)
 rename {public => htdocs}/langs/et_EE/opensurvey.lang (100%)
 rename {public => htdocs}/langs/et_EE/orders.lang (100%)
 rename {public => htdocs}/langs/et_EE/other.lang (100%)
 rename {public => htdocs}/langs/et_EE/paybox.lang (100%)
 rename {public => htdocs}/langs/et_EE/paypal.lang (100%)
 rename {public => htdocs}/langs/et_EE/printing.lang (100%)
 rename {public => htdocs}/langs/et_EE/productbatch.lang (100%)
 rename {public => htdocs}/langs/et_EE/products.lang (100%)
 rename {public => htdocs}/langs/et_EE/projects.lang (100%)
 rename {public => htdocs}/langs/et_EE/propal.lang (100%)
 rename {public => htdocs}/langs/et_EE/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/et_EE/resource.lang (100%)
 rename {public => htdocs}/langs/et_EE/salaries.lang (100%)
 rename {public => htdocs}/langs/et_EE/sendings.lang (100%)
 rename {public => htdocs}/langs/et_EE/sms.lang (100%)
 rename {public => htdocs}/langs/et_EE/stocks.lang (100%)
 rename {public => htdocs}/langs/et_EE/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/et_EE/suppliers.lang (100%)
 rename {public => htdocs}/langs/et_EE/trips.lang (100%)
 rename {public => htdocs}/langs/et_EE/users.lang (100%)
 rename {public => htdocs}/langs/et_EE/website.lang (100%)
 rename {public => htdocs}/langs/et_EE/withdrawals.lang (100%)
 rename {public => htdocs}/langs/et_EE/workflow.lang (100%)
 rename {public => htdocs}/langs/eu_ES/accountancy.lang (100%)
 rename {public => htdocs}/langs/eu_ES/admin.lang (100%)
 rename {public => htdocs}/langs/eu_ES/agenda.lang (100%)
 rename {public => htdocs}/langs/eu_ES/banks.lang (100%)
 rename {public => htdocs}/langs/eu_ES/bills.lang (100%)
 rename {public => htdocs}/langs/eu_ES/bookmarks.lang (100%)
 rename {public => htdocs}/langs/eu_ES/boxes.lang (100%)
 rename {public => htdocs}/langs/eu_ES/cashdesk.lang (100%)
 rename {public => htdocs}/langs/eu_ES/categories.lang (100%)
 rename {public => htdocs}/langs/eu_ES/commercial.lang (100%)
 rename {public => htdocs}/langs/eu_ES/companies.lang (100%)
 rename {public => htdocs}/langs/eu_ES/compta.lang (100%)
 rename {public => htdocs}/langs/eu_ES/contracts.lang (100%)
 rename {public => htdocs}/langs/eu_ES/cron.lang (100%)
 rename {public => htdocs}/langs/eu_ES/deliveries.lang (100%)
 rename {public => htdocs}/langs/eu_ES/dict.lang (100%)
 rename {public => htdocs}/langs/eu_ES/donations.lang (100%)
 rename {public => htdocs}/langs/eu_ES/ecm.lang (100%)
 rename {public => htdocs}/langs/eu_ES/errors.lang (100%)
 rename {public => htdocs}/langs/eu_ES/expensereports.lang (100%)
 rename {public => htdocs}/langs/eu_ES/exports.lang (100%)
 rename {public => htdocs}/langs/eu_ES/externalsite.lang (100%)
 rename {public => htdocs}/langs/eu_ES/ftp.lang (100%)
 rename {public => htdocs}/langs/eu_ES/help.lang (100%)
 rename {public => htdocs}/langs/eu_ES/holiday.lang (100%)
 rename {public => htdocs}/langs/eu_ES/hrm.lang (100%)
 rename {public => htdocs}/langs/eu_ES/incoterm.lang (100%)
 rename {public => htdocs}/langs/eu_ES/install.lang (100%)
 rename {public => htdocs}/langs/eu_ES/interventions.lang (100%)
 rename {public => htdocs}/langs/eu_ES/languages.lang (100%)
 rename {public => htdocs}/langs/eu_ES/ldap.lang (100%)
 rename {public => htdocs}/langs/eu_ES/link.lang (100%)
 rename {public => htdocs}/langs/eu_ES/loan.lang (100%)
 rename {public => htdocs}/langs/eu_ES/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/eu_ES/mails.lang (100%)
 rename {public => htdocs}/langs/eu_ES/main.lang (100%)
 rename {public => htdocs}/langs/eu_ES/margins.lang (100%)
 rename {public => htdocs}/langs/eu_ES/members.lang (100%)
 rename {public => htdocs}/langs/eu_ES/oauth.lang (100%)
 rename {public => htdocs}/langs/eu_ES/opensurvey.lang (100%)
 rename {public => htdocs}/langs/eu_ES/orders.lang (100%)
 rename {public => htdocs}/langs/eu_ES/other.lang (100%)
 rename {public => htdocs}/langs/eu_ES/paybox.lang (100%)
 rename {public => htdocs}/langs/eu_ES/paypal.lang (100%)
 rename {public => htdocs}/langs/eu_ES/printing.lang (100%)
 rename {public => htdocs}/langs/eu_ES/productbatch.lang (100%)
 rename {public => htdocs}/langs/eu_ES/products.lang (100%)
 rename {public => htdocs}/langs/eu_ES/projects.lang (100%)
 rename {public => htdocs}/langs/eu_ES/propal.lang (100%)
 rename {public => htdocs}/langs/eu_ES/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/eu_ES/resource.lang (100%)
 rename {public => htdocs}/langs/eu_ES/salaries.lang (100%)
 rename {public => htdocs}/langs/eu_ES/sendings.lang (100%)
 rename {public => htdocs}/langs/eu_ES/sms.lang (100%)
 rename {public => htdocs}/langs/eu_ES/stocks.lang (100%)
 rename {public => htdocs}/langs/eu_ES/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/eu_ES/suppliers.lang (100%)
 rename {public => htdocs}/langs/eu_ES/trips.lang (100%)
 rename {public => htdocs}/langs/eu_ES/users.lang (100%)
 rename {public => htdocs}/langs/eu_ES/website.lang (100%)
 rename {public => htdocs}/langs/eu_ES/withdrawals.lang (100%)
 rename {public => htdocs}/langs/eu_ES/workflow.lang (100%)
 rename {public => htdocs}/langs/fa_IR/accountancy.lang (100%)
 rename {public => htdocs}/langs/fa_IR/admin.lang (100%)
 rename {public => htdocs}/langs/fa_IR/agenda.lang (100%)
 rename {public => htdocs}/langs/fa_IR/banks.lang (100%)
 rename {public => htdocs}/langs/fa_IR/bills.lang (100%)
 rename {public => htdocs}/langs/fa_IR/bookmarks.lang (100%)
 rename {public => htdocs}/langs/fa_IR/boxes.lang (100%)
 rename {public => htdocs}/langs/fa_IR/cashdesk.lang (100%)
 rename {public => htdocs}/langs/fa_IR/categories.lang (100%)
 rename {public => htdocs}/langs/fa_IR/commercial.lang (100%)
 rename {public => htdocs}/langs/fa_IR/companies.lang (100%)
 rename {public => htdocs}/langs/fa_IR/compta.lang (100%)
 rename {public => htdocs}/langs/fa_IR/contracts.lang (100%)
 rename {public => htdocs}/langs/fa_IR/cron.lang (100%)
 rename {public => htdocs}/langs/fa_IR/deliveries.lang (100%)
 rename {public => htdocs}/langs/fa_IR/dict.lang (100%)
 rename {public => htdocs}/langs/fa_IR/domains.lang (100%)
 rename {public => htdocs}/langs/fa_IR/donations.lang (100%)
 rename {public => htdocs}/langs/fa_IR/ecm.lang (100%)
 rename {public => htdocs}/langs/fa_IR/errors.lang (100%)
 rename {public => htdocs}/langs/fa_IR/exports.lang (100%)
 rename {public => htdocs}/langs/fa_IR/externalsite.lang (100%)
 rename {public => htdocs}/langs/fa_IR/ftp.lang (100%)
 rename {public => htdocs}/langs/fa_IR/help.lang (100%)
 rename {public => htdocs}/langs/fa_IR/holiday.lang (100%)
 rename {public => htdocs}/langs/fa_IR/hrm.lang (100%)
 rename {public => htdocs}/langs/fa_IR/incoterm.lang (100%)
 rename {public => htdocs}/langs/fa_IR/install.lang (100%)
 rename {public => htdocs}/langs/fa_IR/interventions.lang (100%)
 rename {public => htdocs}/langs/fa_IR/languages.lang (100%)
 rename {public => htdocs}/langs/fa_IR/ldap.lang (100%)
 rename {public => htdocs}/langs/fa_IR/link.lang (100%)
 rename {public => htdocs}/langs/fa_IR/loan.lang (100%)
 rename {public => htdocs}/langs/fa_IR/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/fa_IR/mails.lang (100%)
 rename {public => htdocs}/langs/fa_IR/main.lang (100%)
 rename {public => htdocs}/langs/fa_IR/margins.lang (100%)
 rename {public => htdocs}/langs/fa_IR/members.lang (100%)
 rename {public => htdocs}/langs/fa_IR/oauth.lang (100%)
 rename {public => htdocs}/langs/fa_IR/opensurvey.lang (100%)
 rename {public => htdocs}/langs/fa_IR/orders.lang (100%)
 rename {public => htdocs}/langs/fa_IR/other.lang (100%)
 rename {public => htdocs}/langs/fa_IR/paybox.lang (100%)
 rename {public => htdocs}/langs/fa_IR/paypal.lang (100%)
 rename {public => htdocs}/langs/fa_IR/printing.lang (100%)
 rename {public => htdocs}/langs/fa_IR/productbatch.lang (100%)
 rename {public => htdocs}/langs/fa_IR/products.lang (100%)
 rename {public => htdocs}/langs/fa_IR/projects.lang (100%)
 rename {public => htdocs}/langs/fa_IR/propal.lang (100%)
 rename {public => htdocs}/langs/fa_IR/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/fa_IR/resource.lang (100%)
 rename {public => htdocs}/langs/fa_IR/salaries.lang (100%)
 rename {public => htdocs}/langs/fa_IR/sendings.lang (100%)
 rename {public => htdocs}/langs/fa_IR/sms.lang (100%)
 rename {public => htdocs}/langs/fa_IR/stocks.lang (100%)
 rename {public => htdocs}/langs/fa_IR/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/fa_IR/suppliers.lang (100%)
 rename {public => htdocs}/langs/fa_IR/trips.lang (100%)
 rename {public => htdocs}/langs/fa_IR/users.lang (100%)
 rename {public => htdocs}/langs/fa_IR/website.lang (100%)
 rename {public => htdocs}/langs/fa_IR/withdrawals.lang (100%)
 rename {public => htdocs}/langs/fa_IR/workflow.lang (100%)
 rename {public => htdocs}/langs/fi_FI/accountancy.lang (100%)
 rename {public => htdocs}/langs/fi_FI/admin.lang (100%)
 rename {public => htdocs}/langs/fi_FI/agenda.lang (100%)
 rename {public => htdocs}/langs/fi_FI/banks.lang (100%)
 rename {public => htdocs}/langs/fi_FI/bills.lang (100%)
 rename {public => htdocs}/langs/fi_FI/bookmarks.lang (100%)
 rename {public => htdocs}/langs/fi_FI/boxes.lang (100%)
 rename {public => htdocs}/langs/fi_FI/cashdesk.lang (100%)
 rename {public => htdocs}/langs/fi_FI/categories.lang (100%)
 rename {public => htdocs}/langs/fi_FI/commercial.lang (100%)
 rename {public => htdocs}/langs/fi_FI/companies.lang (100%)
 rename {public => htdocs}/langs/fi_FI/compta.lang (100%)
 rename {public => htdocs}/langs/fi_FI/contracts.lang (100%)
 rename {public => htdocs}/langs/fi_FI/cron.lang (100%)
 rename {public => htdocs}/langs/fi_FI/deliveries.lang (100%)
 rename {public => htdocs}/langs/fi_FI/dict.lang (100%)
 rename {public => htdocs}/langs/fi_FI/donations.lang (100%)
 rename {public => htdocs}/langs/fi_FI/ecm.lang (100%)
 rename {public => htdocs}/langs/fi_FI/errors.lang (100%)
 rename {public => htdocs}/langs/fi_FI/exports.lang (100%)
 rename {public => htdocs}/langs/fi_FI/externalsite.lang (100%)
 rename {public => htdocs}/langs/fi_FI/ftp.lang (100%)
 rename {public => htdocs}/langs/fi_FI/help.lang (100%)
 rename {public => htdocs}/langs/fi_FI/holiday.lang (100%)
 rename {public => htdocs}/langs/fi_FI/hrm.lang (100%)
 rename {public => htdocs}/langs/fi_FI/incoterm.lang (100%)
 rename {public => htdocs}/langs/fi_FI/install.lang (100%)
 rename {public => htdocs}/langs/fi_FI/interventions.lang (100%)
 rename {public => htdocs}/langs/fi_FI/languages.lang (100%)
 rename {public => htdocs}/langs/fi_FI/ldap.lang (100%)
 rename {public => htdocs}/langs/fi_FI/link.lang (100%)
 rename {public => htdocs}/langs/fi_FI/loan.lang (100%)
 rename {public => htdocs}/langs/fi_FI/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/fi_FI/mails.lang (100%)
 rename {public => htdocs}/langs/fi_FI/main.lang (100%)
 rename {public => htdocs}/langs/fi_FI/margins.lang (100%)
 rename {public => htdocs}/langs/fi_FI/members.lang (100%)
 rename {public => htdocs}/langs/fi_FI/oauth.lang (100%)
 rename {public => htdocs}/langs/fi_FI/opensurvey.lang (100%)
 rename {public => htdocs}/langs/fi_FI/orders.lang (100%)
 rename {public => htdocs}/langs/fi_FI/other.lang (100%)
 rename {public => htdocs}/langs/fi_FI/paybox.lang (100%)
 rename {public => htdocs}/langs/fi_FI/paypal.lang (100%)
 rename {public => htdocs}/langs/fi_FI/printing.lang (100%)
 rename {public => htdocs}/langs/fi_FI/productbatch.lang (100%)
 rename {public => htdocs}/langs/fi_FI/products.lang (100%)
 rename {public => htdocs}/langs/fi_FI/projects.lang (100%)
 rename {public => htdocs}/langs/fi_FI/propal.lang (100%)
 rename {public => htdocs}/langs/fi_FI/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/fi_FI/resource.lang (100%)
 rename {public => htdocs}/langs/fi_FI/salaries.lang (100%)
 rename {public => htdocs}/langs/fi_FI/sendings.lang (100%)
 rename {public => htdocs}/langs/fi_FI/sms.lang (100%)
 rename {public => htdocs}/langs/fi_FI/stocks.lang (100%)
 rename {public => htdocs}/langs/fi_FI/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/fi_FI/suppliers.lang (100%)
 rename {public => htdocs}/langs/fi_FI/trips.lang (100%)
 rename {public => htdocs}/langs/fi_FI/users.lang (100%)
 rename {public => htdocs}/langs/fi_FI/website.lang (100%)
 rename {public => htdocs}/langs/fi_FI/withdrawals.lang (100%)
 rename {public => htdocs}/langs/fi_FI/workflow.lang (100%)
 rename {public => htdocs}/langs/fr_BE/accountancy.lang (100%)
 rename {public => htdocs}/langs/fr_BE/admin.lang (100%)
 rename {public => htdocs}/langs/fr_BE/agenda.lang (100%)
 rename {public => htdocs}/langs/fr_BE/banks.lang (100%)
 rename {public => htdocs}/langs/fr_BE/bills.lang (100%)
 rename {public => htdocs}/langs/fr_BE/bookmarks.lang (100%)
 rename {public => htdocs}/langs/fr_BE/boxes.lang (100%)
 rename {public => htdocs}/langs/fr_BE/cashdesk.lang (100%)
 rename {public => htdocs}/langs/fr_BE/categories.lang (100%)
 rename {public => htdocs}/langs/fr_BE/commercial.lang (100%)
 rename {public => htdocs}/langs/fr_BE/companies.lang (100%)
 rename {public => htdocs}/langs/fr_BE/compta.lang (100%)
 rename {public => htdocs}/langs/fr_BE/contracts.lang (100%)
 rename {public => htdocs}/langs/fr_BE/cron.lang (100%)
 rename {public => htdocs}/langs/fr_BE/deliveries.lang (100%)
 rename {public => htdocs}/langs/fr_BE/dict.lang (100%)
 rename {public => htdocs}/langs/fr_BE/donations.lang (100%)
 rename {public => htdocs}/langs/fr_BE/ecm.lang (100%)
 rename {public => htdocs}/langs/fr_BE/errors.lang (100%)
 rename {public => htdocs}/langs/fr_BE/exports.lang (100%)
 rename {public => htdocs}/langs/fr_BE/externalsite.lang (100%)
 rename {public => htdocs}/langs/fr_BE/ftp.lang (100%)
 rename {public => htdocs}/langs/fr_BE/help.lang (100%)
 rename {public => htdocs}/langs/fr_BE/holiday.lang (100%)
 rename {public => htdocs}/langs/fr_BE/hrm.lang (100%)
 rename {public => htdocs}/langs/fr_BE/incoterm.lang (100%)
 rename {public => htdocs}/langs/fr_BE/install.lang (100%)
 rename {public => htdocs}/langs/fr_BE/interventions.lang (100%)
 rename {public => htdocs}/langs/fr_BE/languages.lang (100%)
 rename {public => htdocs}/langs/fr_BE/ldap.lang (100%)
 rename {public => htdocs}/langs/fr_BE/link.lang (100%)
 rename {public => htdocs}/langs/fr_BE/loan.lang (100%)
 rename {public => htdocs}/langs/fr_BE/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/fr_BE/mails.lang (100%)
 rename {public => htdocs}/langs/fr_BE/main.lang (100%)
 rename {public => htdocs}/langs/fr_BE/margins.lang (100%)
 rename {public => htdocs}/langs/fr_BE/members.lang (100%)
 rename {public => htdocs}/langs/fr_BE/oauth.lang (100%)
 rename {public => htdocs}/langs/fr_BE/opensurvey.lang (100%)
 rename {public => htdocs}/langs/fr_BE/orders.lang (100%)
 rename {public => htdocs}/langs/fr_BE/other.lang (100%)
 rename {public => htdocs}/langs/fr_BE/paybox.lang (100%)
 rename {public => htdocs}/langs/fr_BE/paypal.lang (100%)
 rename {public => htdocs}/langs/fr_BE/printing.lang (100%)
 rename {public => htdocs}/langs/fr_BE/productbatch.lang (100%)
 rename {public => htdocs}/langs/fr_BE/products.lang (100%)
 rename {public => htdocs}/langs/fr_BE/projects.lang (100%)
 rename {public => htdocs}/langs/fr_BE/propal.lang (100%)
 rename {public => htdocs}/langs/fr_BE/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/fr_BE/resource.lang (100%)
 rename {public => htdocs}/langs/fr_BE/salaries.lang (100%)
 rename {public => htdocs}/langs/fr_BE/sendings.lang (100%)
 rename {public => htdocs}/langs/fr_BE/sms.lang (100%)
 rename {public => htdocs}/langs/fr_BE/stocks.lang (100%)
 rename {public => htdocs}/langs/fr_BE/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/fr_BE/suppliers.lang (100%)
 rename {public => htdocs}/langs/fr_BE/trips.lang (100%)
 rename {public => htdocs}/langs/fr_BE/users.lang (100%)
 rename {public => htdocs}/langs/fr_BE/website.lang (100%)
 rename {public => htdocs}/langs/fr_BE/withdrawals.lang (100%)
 rename {public => htdocs}/langs/fr_BE/workflow.lang (100%)
 rename {public => htdocs}/langs/fr_CA/accountancy.lang (100%)
 rename {public => htdocs}/langs/fr_CA/admin.lang (100%)
 rename {public => htdocs}/langs/fr_CA/agenda.lang (100%)
 rename {public => htdocs}/langs/fr_CA/banks.lang (100%)
 rename {public => htdocs}/langs/fr_CA/bills.lang (100%)
 rename {public => htdocs}/langs/fr_CA/bookmarks.lang (100%)
 rename {public => htdocs}/langs/fr_CA/boxes.lang (100%)
 rename {public => htdocs}/langs/fr_CA/cashdesk.lang (100%)
 rename {public => htdocs}/langs/fr_CA/categories.lang (100%)
 rename {public => htdocs}/langs/fr_CA/commercial.lang (100%)
 rename {public => htdocs}/langs/fr_CA/companies.lang (100%)
 rename {public => htdocs}/langs/fr_CA/compta.lang (100%)
 rename {public => htdocs}/langs/fr_CA/contracts.lang (100%)
 rename {public => htdocs}/langs/fr_CA/cron.lang (100%)
 rename {public => htdocs}/langs/fr_CA/deliveries.lang (100%)
 rename {public => htdocs}/langs/fr_CA/dict.lang (100%)
 rename {public => htdocs}/langs/fr_CA/donations.lang (100%)
 rename {public => htdocs}/langs/fr_CA/ecm.lang (100%)
 rename {public => htdocs}/langs/fr_CA/errors.lang (100%)
 rename {public => htdocs}/langs/fr_CA/exports.lang (100%)
 rename {public => htdocs}/langs/fr_CA/externalsite.lang (100%)
 rename {public => htdocs}/langs/fr_CA/ftp.lang (100%)
 rename {public => htdocs}/langs/fr_CA/help.lang (100%)
 rename {public => htdocs}/langs/fr_CA/holiday.lang (100%)
 rename {public => htdocs}/langs/fr_CA/hrm.lang (100%)
 rename {public => htdocs}/langs/fr_CA/incoterm.lang (100%)
 rename {public => htdocs}/langs/fr_CA/install.lang (100%)
 rename {public => htdocs}/langs/fr_CA/interventions.lang (100%)
 rename {public => htdocs}/langs/fr_CA/languages.lang (100%)
 rename {public => htdocs}/langs/fr_CA/ldap.lang (100%)
 rename {public => htdocs}/langs/fr_CA/link.lang (100%)
 rename {public => htdocs}/langs/fr_CA/loan.lang (100%)
 rename {public => htdocs}/langs/fr_CA/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/fr_CA/mails.lang (100%)
 rename {public => htdocs}/langs/fr_CA/main.lang (100%)
 rename {public => htdocs}/langs/fr_CA/margins.lang (100%)
 rename {public => htdocs}/langs/fr_CA/members.lang (100%)
 rename {public => htdocs}/langs/fr_CA/oauth.lang (100%)
 rename {public => htdocs}/langs/fr_CA/opensurvey.lang (100%)
 rename {public => htdocs}/langs/fr_CA/orders.lang (100%)
 rename {public => htdocs}/langs/fr_CA/other.lang (100%)
 rename {public => htdocs}/langs/fr_CA/paybox.lang (100%)
 rename {public => htdocs}/langs/fr_CA/paypal.lang (100%)
 rename {public => htdocs}/langs/fr_CA/printing.lang (100%)
 rename {public => htdocs}/langs/fr_CA/productbatch.lang (100%)
 rename {public => htdocs}/langs/fr_CA/products.lang (100%)
 rename {public => htdocs}/langs/fr_CA/projects.lang (100%)
 rename {public => htdocs}/langs/fr_CA/propal.lang (100%)
 rename {public => htdocs}/langs/fr_CA/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/fr_CA/resource.lang (100%)
 rename {public => htdocs}/langs/fr_CA/salaries.lang (100%)
 rename {public => htdocs}/langs/fr_CA/sendings.lang (100%)
 rename {public => htdocs}/langs/fr_CA/sms.lang (100%)
 rename {public => htdocs}/langs/fr_CA/stocks.lang (100%)
 rename {public => htdocs}/langs/fr_CA/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/fr_CA/suppliers.lang (100%)
 rename {public => htdocs}/langs/fr_CA/trips.lang (100%)
 rename {public => htdocs}/langs/fr_CA/users.lang (100%)
 rename {public => htdocs}/langs/fr_CA/website.lang (100%)
 rename {public => htdocs}/langs/fr_CA/withdrawals.lang (100%)
 rename {public => htdocs}/langs/fr_CA/workflow.lang (100%)
 rename {public => htdocs}/langs/fr_CH/accountancy.lang (100%)
 rename {public => htdocs}/langs/fr_CH/admin.lang (100%)
 rename {public => htdocs}/langs/fr_CH/agenda.lang (100%)
 rename {public => htdocs}/langs/fr_CH/banks.lang (100%)
 rename {public => htdocs}/langs/fr_CH/bills.lang (100%)
 rename {public => htdocs}/langs/fr_CH/bookmarks.lang (100%)
 rename {public => htdocs}/langs/fr_CH/boxes.lang (100%)
 rename {public => htdocs}/langs/fr_CH/cashdesk.lang (100%)
 rename {public => htdocs}/langs/fr_CH/categories.lang (100%)
 rename {public => htdocs}/langs/fr_CH/commercial.lang (100%)
 rename {public => htdocs}/langs/fr_CH/companies.lang (100%)
 rename {public => htdocs}/langs/fr_CH/compta.lang (100%)
 rename {public => htdocs}/langs/fr_CH/contracts.lang (100%)
 rename {public => htdocs}/langs/fr_CH/cron.lang (100%)
 rename {public => htdocs}/langs/fr_CH/deliveries.lang (100%)
 rename {public => htdocs}/langs/fr_CH/dict.lang (100%)
 rename {public => htdocs}/langs/fr_CH/donations.lang (100%)
 rename {public => htdocs}/langs/fr_CH/ecm.lang (100%)
 rename {public => htdocs}/langs/fr_CH/errors.lang (100%)
 rename {public => htdocs}/langs/fr_CH/exports.lang (100%)
 rename {public => htdocs}/langs/fr_CH/externalsite.lang (100%)
 rename {public => htdocs}/langs/fr_CH/ftp.lang (100%)
 rename {public => htdocs}/langs/fr_CH/help.lang (100%)
 rename {public => htdocs}/langs/fr_CH/holiday.lang (100%)
 rename {public => htdocs}/langs/fr_CH/hrm.lang (100%)
 rename {public => htdocs}/langs/fr_CH/incoterm.lang (100%)
 rename {public => htdocs}/langs/fr_CH/install.lang (100%)
 rename {public => htdocs}/langs/fr_CH/interventions.lang (100%)
 rename {public => htdocs}/langs/fr_CH/languages.lang (100%)
 rename {public => htdocs}/langs/fr_CH/ldap.lang (100%)
 rename {public => htdocs}/langs/fr_CH/link.lang (100%)
 rename {public => htdocs}/langs/fr_CH/loan.lang (100%)
 rename {public => htdocs}/langs/fr_CH/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/fr_CH/mails.lang (100%)
 rename {public => htdocs}/langs/fr_CH/main.lang (100%)
 rename {public => htdocs}/langs/fr_CH/margins.lang (100%)
 rename {public => htdocs}/langs/fr_CH/members.lang (100%)
 rename {public => htdocs}/langs/fr_CH/oauth.lang (100%)
 rename {public => htdocs}/langs/fr_CH/opensurvey.lang (100%)
 rename {public => htdocs}/langs/fr_CH/orders.lang (100%)
 rename {public => htdocs}/langs/fr_CH/other.lang (100%)
 rename {public => htdocs}/langs/fr_CH/paybox.lang (100%)
 rename {public => htdocs}/langs/fr_CH/paypal.lang (100%)
 rename {public => htdocs}/langs/fr_CH/printing.lang (100%)
 rename {public => htdocs}/langs/fr_CH/productbatch.lang (100%)
 rename {public => htdocs}/langs/fr_CH/products.lang (100%)
 rename {public => htdocs}/langs/fr_CH/projects.lang (100%)
 rename {public => htdocs}/langs/fr_CH/propal.lang (100%)
 rename {public => htdocs}/langs/fr_CH/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/fr_CH/resource.lang (100%)
 rename {public => htdocs}/langs/fr_CH/salaries.lang (100%)
 rename {public => htdocs}/langs/fr_CH/sendings.lang (100%)
 rename {public => htdocs}/langs/fr_CH/sms.lang (100%)
 rename {public => htdocs}/langs/fr_CH/stocks.lang (100%)
 rename {public => htdocs}/langs/fr_CH/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/fr_CH/suppliers.lang (100%)
 rename {public => htdocs}/langs/fr_CH/trips.lang (100%)
 rename {public => htdocs}/langs/fr_CH/users.lang (100%)
 rename {public => htdocs}/langs/fr_CH/website.lang (100%)
 rename {public => htdocs}/langs/fr_CH/withdrawals.lang (100%)
 rename {public => htdocs}/langs/fr_CH/workflow.lang (100%)
 rename {public => htdocs}/langs/fr_FR/accountancy.lang (100%)
 rename {public => htdocs}/langs/fr_FR/admin.lang (100%)
 rename {public => htdocs}/langs/fr_FR/agenda.lang (100%)
 rename {public => htdocs}/langs/fr_FR/banks.lang (100%)
 rename {public => htdocs}/langs/fr_FR/bills.lang (100%)
 rename {public => htdocs}/langs/fr_FR/bookmarks.lang (100%)
 rename {public => htdocs}/langs/fr_FR/boxes.lang (100%)
 rename {public => htdocs}/langs/fr_FR/cashdesk.lang (100%)
 rename {public => htdocs}/langs/fr_FR/categories.lang (100%)
 rename {public => htdocs}/langs/fr_FR/commercial.lang (100%)
 rename {public => htdocs}/langs/fr_FR/companies.lang (100%)
 rename {public => htdocs}/langs/fr_FR/compta.lang (100%)
 rename {public => htdocs}/langs/fr_FR/contracts.lang (100%)
 rename {public => htdocs}/langs/fr_FR/cron.lang (100%)
 rename {public => htdocs}/langs/fr_FR/deliveries.lang (100%)
 rename {public => htdocs}/langs/fr_FR/dict.lang (100%)
 rename {public => htdocs}/langs/fr_FR/donations.lang (100%)
 rename {public => htdocs}/langs/fr_FR/ecm.lang (100%)
 rename {public => htdocs}/langs/fr_FR/errors.lang (100%)
 rename {public => htdocs}/langs/fr_FR/expensereports.lang (100%)
 rename {public => htdocs}/langs/fr_FR/exports.lang (100%)
 rename {public => htdocs}/langs/fr_FR/externalsite.lang (100%)
 rename {public => htdocs}/langs/fr_FR/ftp.lang (100%)
 rename {public => htdocs}/langs/fr_FR/help.lang (100%)
 rename {public => htdocs}/langs/fr_FR/holiday.lang (100%)
 rename {public => htdocs}/langs/fr_FR/hrm.lang (100%)
 rename {public => htdocs}/langs/fr_FR/incoterm.lang (100%)
 rename {public => htdocs}/langs/fr_FR/install.lang (100%)
 rename {public => htdocs}/langs/fr_FR/interventions.lang (100%)
 rename {public => htdocs}/langs/fr_FR/languages.lang (100%)
 rename {public => htdocs}/langs/fr_FR/ldap.lang (100%)
 rename {public => htdocs}/langs/fr_FR/link.lang (100%)
 rename {public => htdocs}/langs/fr_FR/loan.lang (100%)
 rename {public => htdocs}/langs/fr_FR/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/fr_FR/mails.lang (100%)
 rename {public => htdocs}/langs/fr_FR/main.lang (100%)
 rename {public => htdocs}/langs/fr_FR/margins.lang (100%)
 rename {public => htdocs}/langs/fr_FR/members.lang (100%)
 rename {public => htdocs}/langs/fr_FR/oauth.lang (100%)
 rename {public => htdocs}/langs/fr_FR/opensurvey.lang (100%)
 rename {public => htdocs}/langs/fr_FR/orders.lang (100%)
 rename {public => htdocs}/langs/fr_FR/other.lang (100%)
 rename {public => htdocs}/langs/fr_FR/paybox.lang (100%)
 rename {public => htdocs}/langs/fr_FR/paypal.lang (100%)
 rename {public => htdocs}/langs/fr_FR/printing.lang (100%)
 rename {public => htdocs}/langs/fr_FR/productbatch.lang (100%)
 rename {public => htdocs}/langs/fr_FR/products.lang (100%)
 rename {public => htdocs}/langs/fr_FR/projects.lang (100%)
 rename {public => htdocs}/langs/fr_FR/propal.lang (100%)
 rename {public => htdocs}/langs/fr_FR/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/fr_FR/resource.lang (100%)
 rename {public => htdocs}/langs/fr_FR/salaries.lang (100%)
 rename {public => htdocs}/langs/fr_FR/sendings.lang (100%)
 rename {public => htdocs}/langs/fr_FR/sms.lang (100%)
 rename {public => htdocs}/langs/fr_FR/stocks.lang (100%)
 rename {public => htdocs}/langs/fr_FR/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/fr_FR/suppliers.lang (100%)
 rename {public => htdocs}/langs/fr_FR/trips.lang (100%)
 rename {public => htdocs}/langs/fr_FR/users.lang (100%)
 rename {public => htdocs}/langs/fr_FR/website.lang (100%)
 rename {public => htdocs}/langs/fr_FR/withdrawals.lang (100%)
 rename {public => htdocs}/langs/fr_FR/workflow.lang (100%)
 rename {public => htdocs}/langs/fr_NC/admin.lang (100%)
 rename {public => htdocs}/langs/fr_NC/companies.lang (100%)
 rename {public => htdocs}/langs/fr_NC/compta.lang (100%)
 rename {public => htdocs}/langs/fr_NC/main.lang (100%)
 rename {public => htdocs}/langs/he_IL/accountancy.lang (100%)
 rename {public => htdocs}/langs/he_IL/admin.lang (100%)
 rename {public => htdocs}/langs/he_IL/agenda.lang (100%)
 rename {public => htdocs}/langs/he_IL/banks.lang (100%)
 rename {public => htdocs}/langs/he_IL/bills.lang (100%)
 rename {public => htdocs}/langs/he_IL/bookmarks.lang (100%)
 rename {public => htdocs}/langs/he_IL/boxes.lang (100%)
 rename {public => htdocs}/langs/he_IL/cashdesk.lang (100%)
 rename {public => htdocs}/langs/he_IL/categories.lang (100%)
 rename {public => htdocs}/langs/he_IL/commercial.lang (100%)
 rename {public => htdocs}/langs/he_IL/companies.lang (100%)
 rename {public => htdocs}/langs/he_IL/compta.lang (100%)
 rename {public => htdocs}/langs/he_IL/contracts.lang (100%)
 rename {public => htdocs}/langs/he_IL/cron.lang (100%)
 rename {public => htdocs}/langs/he_IL/deliveries.lang (100%)
 rename {public => htdocs}/langs/he_IL/dict.lang (100%)
 rename {public => htdocs}/langs/he_IL/donations.lang (100%)
 rename {public => htdocs}/langs/he_IL/ecm.lang (100%)
 rename {public => htdocs}/langs/he_IL/errors.lang (100%)
 rename {public => htdocs}/langs/he_IL/exports.lang (100%)
 rename {public => htdocs}/langs/he_IL/externalsite.lang (100%)
 rename {public => htdocs}/langs/he_IL/ftp.lang (100%)
 rename {public => htdocs}/langs/he_IL/help.lang (100%)
 rename {public => htdocs}/langs/he_IL/holiday.lang (100%)
 rename {public => htdocs}/langs/he_IL/hrm.lang (100%)
 rename {public => htdocs}/langs/he_IL/incoterm.lang (100%)
 rename {public => htdocs}/langs/he_IL/install.lang (100%)
 rename {public => htdocs}/langs/he_IL/interventions.lang (100%)
 rename {public => htdocs}/langs/he_IL/languages.lang (100%)
 rename {public => htdocs}/langs/he_IL/ldap.lang (100%)
 rename {public => htdocs}/langs/he_IL/link.lang (100%)
 rename {public => htdocs}/langs/he_IL/loan.lang (100%)
 rename {public => htdocs}/langs/he_IL/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/he_IL/mails.lang (100%)
 rename {public => htdocs}/langs/he_IL/main.lang (100%)
 rename {public => htdocs}/langs/he_IL/margins.lang (100%)
 rename {public => htdocs}/langs/he_IL/members.lang (100%)
 rename {public => htdocs}/langs/he_IL/oauth.lang (100%)
 rename {public => htdocs}/langs/he_IL/opensurvey.lang (100%)
 rename {public => htdocs}/langs/he_IL/orders.lang (100%)
 rename {public => htdocs}/langs/he_IL/other.lang (100%)
 rename {public => htdocs}/langs/he_IL/paybox.lang (100%)
 rename {public => htdocs}/langs/he_IL/paypal.lang (100%)
 rename {public => htdocs}/langs/he_IL/printing.lang (100%)
 rename {public => htdocs}/langs/he_IL/productbatch.lang (100%)
 rename {public => htdocs}/langs/he_IL/products.lang (100%)
 rename {public => htdocs}/langs/he_IL/projects.lang (100%)
 rename {public => htdocs}/langs/he_IL/propal.lang (100%)
 rename {public => htdocs}/langs/he_IL/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/he_IL/resource.lang (100%)
 rename {public => htdocs}/langs/he_IL/salaries.lang (100%)
 rename {public => htdocs}/langs/he_IL/sendings.lang (100%)
 rename {public => htdocs}/langs/he_IL/sms.lang (100%)
 rename {public => htdocs}/langs/he_IL/stocks.lang (100%)
 rename {public => htdocs}/langs/he_IL/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/he_IL/suppliers.lang (100%)
 rename {public => htdocs}/langs/he_IL/trips.lang (100%)
 rename {public => htdocs}/langs/he_IL/users.lang (100%)
 rename {public => htdocs}/langs/he_IL/website.lang (100%)
 rename {public => htdocs}/langs/he_IL/withdrawals.lang (100%)
 rename {public => htdocs}/langs/he_IL/workflow.lang (100%)
 rename {public => htdocs}/langs/hr_HR/accountancy.lang (100%)
 rename {public => htdocs}/langs/hr_HR/admin.lang (100%)
 rename {public => htdocs}/langs/hr_HR/agenda.lang (100%)
 rename {public => htdocs}/langs/hr_HR/banks.lang (100%)
 rename {public => htdocs}/langs/hr_HR/bills.lang (100%)
 rename {public => htdocs}/langs/hr_HR/bookmarks.lang (100%)
 rename {public => htdocs}/langs/hr_HR/boxes.lang (100%)
 rename {public => htdocs}/langs/hr_HR/cashdesk.lang (100%)
 rename {public => htdocs}/langs/hr_HR/categories.lang (100%)
 rename {public => htdocs}/langs/hr_HR/commercial.lang (100%)
 rename {public => htdocs}/langs/hr_HR/companies.lang (100%)
 rename {public => htdocs}/langs/hr_HR/compta.lang (100%)
 rename {public => htdocs}/langs/hr_HR/contracts.lang (100%)
 rename {public => htdocs}/langs/hr_HR/cron.lang (100%)
 rename {public => htdocs}/langs/hr_HR/deliveries.lang (100%)
 rename {public => htdocs}/langs/hr_HR/dict.lang (100%)
 rename {public => htdocs}/langs/hr_HR/donations.lang (100%)
 rename {public => htdocs}/langs/hr_HR/ecm.lang (100%)
 rename {public => htdocs}/langs/hr_HR/errors.lang (100%)
 rename {public => htdocs}/langs/hr_HR/exports.lang (100%)
 rename {public => htdocs}/langs/hr_HR/externalsite.lang (100%)
 rename {public => htdocs}/langs/hr_HR/ftp.lang (100%)
 rename {public => htdocs}/langs/hr_HR/help.lang (100%)
 rename {public => htdocs}/langs/hr_HR/holiday.lang (100%)
 rename {public => htdocs}/langs/hr_HR/hrm.lang (100%)
 rename {public => htdocs}/langs/hr_HR/incoterm.lang (100%)
 rename {public => htdocs}/langs/hr_HR/install.lang (100%)
 rename {public => htdocs}/langs/hr_HR/interventions.lang (100%)
 rename {public => htdocs}/langs/hr_HR/languages.lang (100%)
 rename {public => htdocs}/langs/hr_HR/ldap.lang (100%)
 rename {public => htdocs}/langs/hr_HR/link.lang (100%)
 rename {public => htdocs}/langs/hr_HR/loan.lang (100%)
 rename {public => htdocs}/langs/hr_HR/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/hr_HR/mails.lang (100%)
 rename {public => htdocs}/langs/hr_HR/main.lang (100%)
 rename {public => htdocs}/langs/hr_HR/margins.lang (100%)
 rename {public => htdocs}/langs/hr_HR/members.lang (100%)
 rename {public => htdocs}/langs/hr_HR/oauth.lang (100%)
 rename {public => htdocs}/langs/hr_HR/opensurvey.lang (100%)
 rename {public => htdocs}/langs/hr_HR/orders.lang (100%)
 rename {public => htdocs}/langs/hr_HR/other.lang (100%)
 rename {public => htdocs}/langs/hr_HR/paybox.lang (100%)
 rename {public => htdocs}/langs/hr_HR/paypal.lang (100%)
 rename {public => htdocs}/langs/hr_HR/printing.lang (100%)
 rename {public => htdocs}/langs/hr_HR/productbatch.lang (100%)
 rename {public => htdocs}/langs/hr_HR/products.lang (100%)
 rename {public => htdocs}/langs/hr_HR/projects.lang (100%)
 rename {public => htdocs}/langs/hr_HR/propal.lang (100%)
 rename {public => htdocs}/langs/hr_HR/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/hr_HR/resource.lang (100%)
 rename {public => htdocs}/langs/hr_HR/salaries.lang (100%)
 rename {public => htdocs}/langs/hr_HR/sendings.lang (100%)
 rename {public => htdocs}/langs/hr_HR/sms.lang (100%)
 rename {public => htdocs}/langs/hr_HR/stocks.lang (100%)
 rename {public => htdocs}/langs/hr_HR/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/hr_HR/suppliers.lang (100%)
 rename {public => htdocs}/langs/hr_HR/trips.lang (100%)
 rename {public => htdocs}/langs/hr_HR/users.lang (100%)
 rename {public => htdocs}/langs/hr_HR/website.lang (100%)
 rename {public => htdocs}/langs/hr_HR/withdrawals.lang (100%)
 rename {public => htdocs}/langs/hr_HR/workflow.lang (100%)
 rename {public => htdocs}/langs/hu_HU/accountancy.lang (100%)
 rename {public => htdocs}/langs/hu_HU/admin.lang (100%)
 rename {public => htdocs}/langs/hu_HU/agenda.lang (100%)
 rename {public => htdocs}/langs/hu_HU/banks.lang (100%)
 rename {public => htdocs}/langs/hu_HU/bills.lang (100%)
 rename {public => htdocs}/langs/hu_HU/bookmarks.lang (100%)
 rename {public => htdocs}/langs/hu_HU/boxes.lang (100%)
 rename {public => htdocs}/langs/hu_HU/cashdesk.lang (100%)
 rename {public => htdocs}/langs/hu_HU/categories.lang (100%)
 rename {public => htdocs}/langs/hu_HU/commercial.lang (100%)
 rename {public => htdocs}/langs/hu_HU/companies.lang (100%)
 rename {public => htdocs}/langs/hu_HU/compta.lang (100%)
 rename {public => htdocs}/langs/hu_HU/contracts.lang (100%)
 rename {public => htdocs}/langs/hu_HU/cron.lang (100%)
 rename {public => htdocs}/langs/hu_HU/deliveries.lang (100%)
 rename {public => htdocs}/langs/hu_HU/dict.lang (100%)
 rename {public => htdocs}/langs/hu_HU/donations.lang (100%)
 rename {public => htdocs}/langs/hu_HU/ecm.lang (100%)
 rename {public => htdocs}/langs/hu_HU/errors.lang (100%)
 rename {public => htdocs}/langs/hu_HU/exports.lang (100%)
 rename {public => htdocs}/langs/hu_HU/externalsite.lang (100%)
 rename {public => htdocs}/langs/hu_HU/ftp.lang (100%)
 rename {public => htdocs}/langs/hu_HU/help.lang (100%)
 rename {public => htdocs}/langs/hu_HU/holiday.lang (100%)
 rename {public => htdocs}/langs/hu_HU/hrm.lang (100%)
 rename {public => htdocs}/langs/hu_HU/incoterm.lang (100%)
 rename {public => htdocs}/langs/hu_HU/install.lang (100%)
 rename {public => htdocs}/langs/hu_HU/interventions.lang (100%)
 rename {public => htdocs}/langs/hu_HU/languages.lang (100%)
 rename {public => htdocs}/langs/hu_HU/ldap.lang (100%)
 rename {public => htdocs}/langs/hu_HU/link.lang (100%)
 rename {public => htdocs}/langs/hu_HU/loan.lang (100%)
 rename {public => htdocs}/langs/hu_HU/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/hu_HU/mails.lang (100%)
 rename {public => htdocs}/langs/hu_HU/main.lang (100%)
 rename {public => htdocs}/langs/hu_HU/margins.lang (100%)
 rename {public => htdocs}/langs/hu_HU/members.lang (100%)
 rename {public => htdocs}/langs/hu_HU/oauth.lang (100%)
 rename {public => htdocs}/langs/hu_HU/opensurvey.lang (100%)
 rename {public => htdocs}/langs/hu_HU/orders.lang (100%)
 rename {public => htdocs}/langs/hu_HU/other.lang (100%)
 rename {public => htdocs}/langs/hu_HU/paybox.lang (100%)
 rename {public => htdocs}/langs/hu_HU/paypal.lang (100%)
 rename {public => htdocs}/langs/hu_HU/printing.lang (100%)
 rename {public => htdocs}/langs/hu_HU/productbatch.lang (100%)
 rename {public => htdocs}/langs/hu_HU/products.lang (100%)
 rename {public => htdocs}/langs/hu_HU/projects.lang (100%)
 rename {public => htdocs}/langs/hu_HU/propal.lang (100%)
 rename {public => htdocs}/langs/hu_HU/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/hu_HU/resource.lang (100%)
 rename {public => htdocs}/langs/hu_HU/salaries.lang (100%)
 rename {public => htdocs}/langs/hu_HU/sendings.lang (100%)
 rename {public => htdocs}/langs/hu_HU/sms.lang (100%)
 rename {public => htdocs}/langs/hu_HU/stocks.lang (100%)
 rename {public => htdocs}/langs/hu_HU/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/hu_HU/suppliers.lang (100%)
 rename {public => htdocs}/langs/hu_HU/trips.lang (100%)
 rename {public => htdocs}/langs/hu_HU/users.lang (100%)
 rename {public => htdocs}/langs/hu_HU/website.lang (100%)
 rename {public => htdocs}/langs/hu_HU/withdrawals.lang (100%)
 rename {public => htdocs}/langs/hu_HU/workflow.lang (100%)
 rename {public => htdocs}/langs/id_ID/accountancy.lang (100%)
 rename {public => htdocs}/langs/id_ID/admin.lang (100%)
 rename {public => htdocs}/langs/id_ID/agenda.lang (100%)
 rename {public => htdocs}/langs/id_ID/banks.lang (100%)
 rename {public => htdocs}/langs/id_ID/bills.lang (100%)
 rename {public => htdocs}/langs/id_ID/bookmarks.lang (100%)
 rename {public => htdocs}/langs/id_ID/boxes.lang (100%)
 rename {public => htdocs}/langs/id_ID/cashdesk.lang (100%)
 rename {public => htdocs}/langs/id_ID/categories.lang (100%)
 rename {public => htdocs}/langs/id_ID/commercial.lang (100%)
 rename {public => htdocs}/langs/id_ID/companies.lang (100%)
 rename {public => htdocs}/langs/id_ID/compta.lang (100%)
 rename {public => htdocs}/langs/id_ID/contracts.lang (100%)
 rename {public => htdocs}/langs/id_ID/cron.lang (100%)
 rename {public => htdocs}/langs/id_ID/deliveries.lang (100%)
 rename {public => htdocs}/langs/id_ID/dict.lang (100%)
 rename {public => htdocs}/langs/id_ID/donations.lang (100%)
 rename {public => htdocs}/langs/id_ID/ecm.lang (100%)
 rename {public => htdocs}/langs/id_ID/errors.lang (100%)
 rename {public => htdocs}/langs/id_ID/exports.lang (100%)
 rename {public => htdocs}/langs/id_ID/externalsite.lang (100%)
 rename {public => htdocs}/langs/id_ID/ftp.lang (100%)
 rename {public => htdocs}/langs/id_ID/help.lang (100%)
 rename {public => htdocs}/langs/id_ID/holiday.lang (100%)
 rename {public => htdocs}/langs/id_ID/hrm.lang (100%)
 rename {public => htdocs}/langs/id_ID/incoterm.lang (100%)
 rename {public => htdocs}/langs/id_ID/install.lang (100%)
 rename {public => htdocs}/langs/id_ID/interventions.lang (100%)
 rename {public => htdocs}/langs/id_ID/languages.lang (100%)
 rename {public => htdocs}/langs/id_ID/ldap.lang (100%)
 rename {public => htdocs}/langs/id_ID/link.lang (100%)
 rename {public => htdocs}/langs/id_ID/loan.lang (100%)
 rename {public => htdocs}/langs/id_ID/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/id_ID/mails.lang (100%)
 rename {public => htdocs}/langs/id_ID/main.lang (100%)
 rename {public => htdocs}/langs/id_ID/margins.lang (100%)
 rename {public => htdocs}/langs/id_ID/members.lang (100%)
 rename {public => htdocs}/langs/id_ID/oauth.lang (100%)
 rename {public => htdocs}/langs/id_ID/opensurvey.lang (100%)
 rename {public => htdocs}/langs/id_ID/orders.lang (100%)
 rename {public => htdocs}/langs/id_ID/other.lang (100%)
 rename {public => htdocs}/langs/id_ID/paybox.lang (100%)
 rename {public => htdocs}/langs/id_ID/paypal.lang (100%)
 rename {public => htdocs}/langs/id_ID/printing.lang (100%)
 rename {public => htdocs}/langs/id_ID/productbatch.lang (100%)
 rename {public => htdocs}/langs/id_ID/products.lang (100%)
 rename {public => htdocs}/langs/id_ID/projects.lang (100%)
 rename {public => htdocs}/langs/id_ID/propal.lang (100%)
 rename {public => htdocs}/langs/id_ID/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/id_ID/resource.lang (100%)
 rename {public => htdocs}/langs/id_ID/salaries.lang (100%)
 rename {public => htdocs}/langs/id_ID/sendings.lang (100%)
 rename {public => htdocs}/langs/id_ID/sms.lang (100%)
 rename {public => htdocs}/langs/id_ID/stocks.lang (100%)
 rename {public => htdocs}/langs/id_ID/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/id_ID/suppliers.lang (100%)
 rename {public => htdocs}/langs/id_ID/trips.lang (100%)
 rename {public => htdocs}/langs/id_ID/users.lang (100%)
 rename {public => htdocs}/langs/id_ID/website.lang (100%)
 rename {public => htdocs}/langs/id_ID/withdrawals.lang (100%)
 rename {public => htdocs}/langs/id_ID/workflow.lang (100%)
 rename {public => htdocs}/langs/is_IS/accountancy.lang (100%)
 rename {public => htdocs}/langs/is_IS/admin.lang (100%)
 rename {public => htdocs}/langs/is_IS/agenda.lang (100%)
 rename {public => htdocs}/langs/is_IS/banks.lang (100%)
 rename {public => htdocs}/langs/is_IS/bills.lang (100%)
 rename {public => htdocs}/langs/is_IS/bookmarks.lang (100%)
 rename {public => htdocs}/langs/is_IS/boxes.lang (100%)
 rename {public => htdocs}/langs/is_IS/cashdesk.lang (100%)
 rename {public => htdocs}/langs/is_IS/categories.lang (100%)
 rename {public => htdocs}/langs/is_IS/commercial.lang (100%)
 rename {public => htdocs}/langs/is_IS/companies.lang (100%)
 rename {public => htdocs}/langs/is_IS/compta.lang (100%)
 rename {public => htdocs}/langs/is_IS/contracts.lang (100%)
 rename {public => htdocs}/langs/is_IS/cron.lang (100%)
 rename {public => htdocs}/langs/is_IS/deliveries.lang (100%)
 rename {public => htdocs}/langs/is_IS/dict.lang (100%)
 rename {public => htdocs}/langs/is_IS/donations.lang (100%)
 rename {public => htdocs}/langs/is_IS/ecm.lang (100%)
 rename {public => htdocs}/langs/is_IS/errors.lang (100%)
 rename {public => htdocs}/langs/is_IS/exports.lang (100%)
 rename {public => htdocs}/langs/is_IS/externalsite.lang (100%)
 rename {public => htdocs}/langs/is_IS/ftp.lang (100%)
 rename {public => htdocs}/langs/is_IS/help.lang (100%)
 rename {public => htdocs}/langs/is_IS/holiday.lang (100%)
 rename {public => htdocs}/langs/is_IS/hrm.lang (100%)
 rename {public => htdocs}/langs/is_IS/incoterm.lang (100%)
 rename {public => htdocs}/langs/is_IS/install.lang (100%)
 rename {public => htdocs}/langs/is_IS/interventions.lang (100%)
 rename {public => htdocs}/langs/is_IS/languages.lang (100%)
 rename {public => htdocs}/langs/is_IS/ldap.lang (100%)
 rename {public => htdocs}/langs/is_IS/link.lang (100%)
 rename {public => htdocs}/langs/is_IS/loan.lang (100%)
 rename {public => htdocs}/langs/is_IS/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/is_IS/mails.lang (100%)
 rename {public => htdocs}/langs/is_IS/main.lang (100%)
 rename {public => htdocs}/langs/is_IS/margins.lang (100%)
 rename {public => htdocs}/langs/is_IS/members.lang (100%)
 rename {public => htdocs}/langs/is_IS/oauth.lang (100%)
 rename {public => htdocs}/langs/is_IS/opensurvey.lang (100%)
 rename {public => htdocs}/langs/is_IS/orders.lang (100%)
 rename {public => htdocs}/langs/is_IS/other.lang (100%)
 rename {public => htdocs}/langs/is_IS/paybox.lang (100%)
 rename {public => htdocs}/langs/is_IS/paypal.lang (100%)
 rename {public => htdocs}/langs/is_IS/printing.lang (100%)
 rename {public => htdocs}/langs/is_IS/productbatch.lang (100%)
 rename {public => htdocs}/langs/is_IS/products.lang (100%)
 rename {public => htdocs}/langs/is_IS/projects.lang (100%)
 rename {public => htdocs}/langs/is_IS/propal.lang (100%)
 rename {public => htdocs}/langs/is_IS/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/is_IS/resource.lang (100%)
 rename {public => htdocs}/langs/is_IS/salaries.lang (100%)
 rename {public => htdocs}/langs/is_IS/sendings.lang (100%)
 rename {public => htdocs}/langs/is_IS/sms.lang (100%)
 rename {public => htdocs}/langs/is_IS/stocks.lang (100%)
 rename {public => htdocs}/langs/is_IS/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/is_IS/suppliers.lang (100%)
 rename {public => htdocs}/langs/is_IS/trips.lang (100%)
 rename {public => htdocs}/langs/is_IS/users.lang (100%)
 rename {public => htdocs}/langs/is_IS/website.lang (100%)
 rename {public => htdocs}/langs/is_IS/withdrawals.lang (100%)
 rename {public => htdocs}/langs/is_IS/workflow.lang (100%)
 rename {public => htdocs}/langs/it_IT/accountancy.lang (100%)
 rename {public => htdocs}/langs/it_IT/admin.lang (100%)
 rename {public => htdocs}/langs/it_IT/agenda.lang (100%)
 rename {public => htdocs}/langs/it_IT/banks.lang (100%)
 rename {public => htdocs}/langs/it_IT/bills.lang (100%)
 rename {public => htdocs}/langs/it_IT/bookmarks.lang (100%)
 rename {public => htdocs}/langs/it_IT/boxes.lang (100%)
 rename {public => htdocs}/langs/it_IT/cashdesk.lang (100%)
 rename {public => htdocs}/langs/it_IT/categories.lang (100%)
 rename {public => htdocs}/langs/it_IT/commercial.lang (100%)
 rename {public => htdocs}/langs/it_IT/companies.lang (100%)
 rename {public => htdocs}/langs/it_IT/compta.lang (100%)
 rename {public => htdocs}/langs/it_IT/contracts.lang (100%)
 rename {public => htdocs}/langs/it_IT/cron.lang (100%)
 rename {public => htdocs}/langs/it_IT/deliveries.lang (100%)
 rename {public => htdocs}/langs/it_IT/dict.lang (100%)
 rename {public => htdocs}/langs/it_IT/donations.lang (100%)
 rename {public => htdocs}/langs/it_IT/ecm.lang (100%)
 rename {public => htdocs}/langs/it_IT/errors.lang (100%)
 rename {public => htdocs}/langs/it_IT/exports.lang (100%)
 rename {public => htdocs}/langs/it_IT/externalsite.lang (100%)
 rename {public => htdocs}/langs/it_IT/ftp.lang (100%)
 rename {public => htdocs}/langs/it_IT/google.lang (100%)
 rename {public => htdocs}/langs/it_IT/help.lang (100%)
 rename {public => htdocs}/langs/it_IT/holiday.lang (100%)
 rename {public => htdocs}/langs/it_IT/hrm.lang (100%)
 rename {public => htdocs}/langs/it_IT/incoterm.lang (100%)
 rename {public => htdocs}/langs/it_IT/install.lang (100%)
 rename {public => htdocs}/langs/it_IT/interventions.lang (100%)
 rename {public => htdocs}/langs/it_IT/languages.lang (100%)
 rename {public => htdocs}/langs/it_IT/ldap.lang (100%)
 rename {public => htdocs}/langs/it_IT/link.lang (100%)
 rename {public => htdocs}/langs/it_IT/loan.lang (100%)
 rename {public => htdocs}/langs/it_IT/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/it_IT/mails.lang (100%)
 rename {public => htdocs}/langs/it_IT/main.lang (100%)
 rename {public => htdocs}/langs/it_IT/margins.lang (100%)
 rename {public => htdocs}/langs/it_IT/members.lang (100%)
 rename {public => htdocs}/langs/it_IT/oauth.lang (100%)
 rename {public => htdocs}/langs/it_IT/opensurvey.lang (100%)
 rename {public => htdocs}/langs/it_IT/orders.lang (100%)
 rename {public => htdocs}/langs/it_IT/other.lang (100%)
 rename {public => htdocs}/langs/it_IT/paybox.lang (100%)
 rename {public => htdocs}/langs/it_IT/paypal.lang (100%)
 rename {public => htdocs}/langs/it_IT/printing.lang (100%)
 rename {public => htdocs}/langs/it_IT/productbatch.lang (100%)
 rename {public => htdocs}/langs/it_IT/products.lang (100%)
 rename {public => htdocs}/langs/it_IT/projects.lang (100%)
 rename {public => htdocs}/langs/it_IT/propal.lang (100%)
 rename {public => htdocs}/langs/it_IT/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/it_IT/resource.lang (100%)
 rename {public => htdocs}/langs/it_IT/salaries.lang (100%)
 rename {public => htdocs}/langs/it_IT/sendings.lang (100%)
 rename {public => htdocs}/langs/it_IT/sms.lang (100%)
 rename {public => htdocs}/langs/it_IT/stocks.lang (100%)
 rename {public => htdocs}/langs/it_IT/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/it_IT/suppliers.lang (100%)
 rename {public => htdocs}/langs/it_IT/trips.lang (100%)
 rename {public => htdocs}/langs/it_IT/users.lang (100%)
 rename {public => htdocs}/langs/it_IT/website.lang (100%)
 rename {public => htdocs}/langs/it_IT/withdrawals.lang (100%)
 rename {public => htdocs}/langs/it_IT/workflow.lang (100%)
 rename {public => htdocs}/langs/ja_JP/accountancy.lang (100%)
 rename {public => htdocs}/langs/ja_JP/admin.lang (100%)
 rename {public => htdocs}/langs/ja_JP/agenda.lang (100%)
 rename {public => htdocs}/langs/ja_JP/banks.lang (100%)
 rename {public => htdocs}/langs/ja_JP/bills.lang (100%)
 rename {public => htdocs}/langs/ja_JP/bookmarks.lang (100%)
 rename {public => htdocs}/langs/ja_JP/boxes.lang (100%)
 rename {public => htdocs}/langs/ja_JP/cashdesk.lang (100%)
 rename {public => htdocs}/langs/ja_JP/categories.lang (100%)
 rename {public => htdocs}/langs/ja_JP/commercial.lang (100%)
 rename {public => htdocs}/langs/ja_JP/companies.lang (100%)
 rename {public => htdocs}/langs/ja_JP/compta.lang (100%)
 rename {public => htdocs}/langs/ja_JP/contracts.lang (100%)
 rename {public => htdocs}/langs/ja_JP/cron.lang (100%)
 rename {public => htdocs}/langs/ja_JP/deliveries.lang (100%)
 rename {public => htdocs}/langs/ja_JP/dict.lang (100%)
 rename {public => htdocs}/langs/ja_JP/donations.lang (100%)
 rename {public => htdocs}/langs/ja_JP/ecm.lang (100%)
 rename {public => htdocs}/langs/ja_JP/errors.lang (100%)
 rename {public => htdocs}/langs/ja_JP/exports.lang (100%)
 rename {public => htdocs}/langs/ja_JP/externalsite.lang (100%)
 rename {public => htdocs}/langs/ja_JP/ftp.lang (100%)
 rename {public => htdocs}/langs/ja_JP/help.lang (100%)
 rename {public => htdocs}/langs/ja_JP/holiday.lang (100%)
 rename {public => htdocs}/langs/ja_JP/hrm.lang (100%)
 rename {public => htdocs}/langs/ja_JP/incoterm.lang (100%)
 rename {public => htdocs}/langs/ja_JP/install.lang (100%)
 rename {public => htdocs}/langs/ja_JP/interventions.lang (100%)
 rename {public => htdocs}/langs/ja_JP/languages.lang (100%)
 rename {public => htdocs}/langs/ja_JP/ldap.lang (100%)
 rename {public => htdocs}/langs/ja_JP/link.lang (100%)
 rename {public => htdocs}/langs/ja_JP/loan.lang (100%)
 rename {public => htdocs}/langs/ja_JP/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/ja_JP/mails.lang (100%)
 rename {public => htdocs}/langs/ja_JP/main.lang (100%)
 rename {public => htdocs}/langs/ja_JP/margins.lang (100%)
 rename {public => htdocs}/langs/ja_JP/members.lang (100%)
 rename {public => htdocs}/langs/ja_JP/oauth.lang (100%)
 rename {public => htdocs}/langs/ja_JP/opensurvey.lang (100%)
 rename {public => htdocs}/langs/ja_JP/orders.lang (100%)
 rename {public => htdocs}/langs/ja_JP/other.lang (100%)
 rename {public => htdocs}/langs/ja_JP/paybox.lang (100%)
 rename {public => htdocs}/langs/ja_JP/paypal.lang (100%)
 rename {public => htdocs}/langs/ja_JP/printing.lang (100%)
 rename {public => htdocs}/langs/ja_JP/productbatch.lang (100%)
 rename {public => htdocs}/langs/ja_JP/products.lang (100%)
 rename {public => htdocs}/langs/ja_JP/projects.lang (100%)
 rename {public => htdocs}/langs/ja_JP/propal.lang (100%)
 rename {public => htdocs}/langs/ja_JP/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/ja_JP/resource.lang (100%)
 rename {public => htdocs}/langs/ja_JP/salaries.lang (100%)
 rename {public => htdocs}/langs/ja_JP/sendings.lang (100%)
 rename {public => htdocs}/langs/ja_JP/sms.lang (100%)
 rename {public => htdocs}/langs/ja_JP/stocks.lang (100%)
 rename {public => htdocs}/langs/ja_JP/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/ja_JP/suppliers.lang (100%)
 rename {public => htdocs}/langs/ja_JP/trips.lang (100%)
 rename {public => htdocs}/langs/ja_JP/users.lang (100%)
 rename {public => htdocs}/langs/ja_JP/website.lang (100%)
 rename {public => htdocs}/langs/ja_JP/withdrawals.lang (100%)
 rename {public => htdocs}/langs/ja_JP/workflow.lang (100%)
 rename {public => htdocs}/langs/ka_GE/accountancy.lang (100%)
 rename {public => htdocs}/langs/ka_GE/admin.lang (100%)
 rename {public => htdocs}/langs/ka_GE/agenda.lang (100%)
 rename {public => htdocs}/langs/ka_GE/banks.lang (100%)
 rename {public => htdocs}/langs/ka_GE/bills.lang (100%)
 rename {public => htdocs}/langs/ka_GE/bookmarks.lang (100%)
 rename {public => htdocs}/langs/ka_GE/boxes.lang (100%)
 rename {public => htdocs}/langs/ka_GE/cashdesk.lang (100%)
 rename {public => htdocs}/langs/ka_GE/categories.lang (100%)
 rename {public => htdocs}/langs/ka_GE/commercial.lang (100%)
 rename {public => htdocs}/langs/ka_GE/companies.lang (100%)
 rename {public => htdocs}/langs/ka_GE/compta.lang (100%)
 rename {public => htdocs}/langs/ka_GE/contracts.lang (100%)
 rename {public => htdocs}/langs/ka_GE/cron.lang (100%)
 rename {public => htdocs}/langs/ka_GE/deliveries.lang (100%)
 rename {public => htdocs}/langs/ka_GE/dict.lang (100%)
 rename {public => htdocs}/langs/ka_GE/donations.lang (100%)
 rename {public => htdocs}/langs/ka_GE/ecm.lang (100%)
 rename {public => htdocs}/langs/ka_GE/errors.lang (100%)
 rename {public => htdocs}/langs/ka_GE/exports.lang (100%)
 rename {public => htdocs}/langs/ka_GE/externalsite.lang (100%)
 rename {public => htdocs}/langs/ka_GE/ftp.lang (100%)
 rename {public => htdocs}/langs/ka_GE/help.lang (100%)
 rename {public => htdocs}/langs/ka_GE/holiday.lang (100%)
 rename {public => htdocs}/langs/ka_GE/hrm.lang (100%)
 rename {public => htdocs}/langs/ka_GE/incoterm.lang (100%)
 rename {public => htdocs}/langs/ka_GE/install.lang (100%)
 rename {public => htdocs}/langs/ka_GE/interventions.lang (100%)
 rename {public => htdocs}/langs/ka_GE/languages.lang (100%)
 rename {public => htdocs}/langs/ka_GE/ldap.lang (100%)
 rename {public => htdocs}/langs/ka_GE/link.lang (100%)
 rename {public => htdocs}/langs/ka_GE/loan.lang (100%)
 rename {public => htdocs}/langs/ka_GE/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/ka_GE/mails.lang (100%)
 rename {public => htdocs}/langs/ka_GE/main.lang (100%)
 rename {public => htdocs}/langs/ka_GE/margins.lang (100%)
 rename {public => htdocs}/langs/ka_GE/members.lang (100%)
 rename {public => htdocs}/langs/ka_GE/oauth.lang (100%)
 rename {public => htdocs}/langs/ka_GE/opensurvey.lang (100%)
 rename {public => htdocs}/langs/ka_GE/orders.lang (100%)
 rename {public => htdocs}/langs/ka_GE/other.lang (100%)
 rename {public => htdocs}/langs/ka_GE/paybox.lang (100%)
 rename {public => htdocs}/langs/ka_GE/paypal.lang (100%)
 rename {public => htdocs}/langs/ka_GE/printing.lang (100%)
 rename {public => htdocs}/langs/ka_GE/productbatch.lang (100%)
 rename {public => htdocs}/langs/ka_GE/products.lang (100%)
 rename {public => htdocs}/langs/ka_GE/projects.lang (100%)
 rename {public => htdocs}/langs/ka_GE/propal.lang (100%)
 rename {public => htdocs}/langs/ka_GE/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/ka_GE/resource.lang (100%)
 rename {public => htdocs}/langs/ka_GE/salaries.lang (100%)
 rename {public => htdocs}/langs/ka_GE/sendings.lang (100%)
 rename {public => htdocs}/langs/ka_GE/sms.lang (100%)
 rename {public => htdocs}/langs/ka_GE/stocks.lang (100%)
 rename {public => htdocs}/langs/ka_GE/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/ka_GE/suppliers.lang (100%)
 rename {public => htdocs}/langs/ka_GE/trips.lang (100%)
 rename {public => htdocs}/langs/ka_GE/users.lang (100%)
 rename {public => htdocs}/langs/ka_GE/website.lang (100%)
 rename {public => htdocs}/langs/ka_GE/withdrawals.lang (100%)
 rename {public => htdocs}/langs/ka_GE/workflow.lang (100%)
 rename {public => htdocs}/langs/km_KH/accountancy.lang (100%)
 rename {public => htdocs}/langs/km_KH/admin.lang (100%)
 rename {public => htdocs}/langs/km_KH/agenda.lang (100%)
 rename {public => htdocs}/langs/km_KH/banks.lang (100%)
 rename {public => htdocs}/langs/km_KH/bills.lang (100%)
 rename {public => htdocs}/langs/km_KH/bookmarks.lang (100%)
 rename {public => htdocs}/langs/km_KH/boxes.lang (100%)
 rename {public => htdocs}/langs/km_KH/cashdesk.lang (100%)
 rename {public => htdocs}/langs/km_KH/categories.lang (100%)
 rename {public => htdocs}/langs/km_KH/commercial.lang (100%)
 rename {public => htdocs}/langs/km_KH/companies.lang (100%)
 rename {public => htdocs}/langs/km_KH/compta.lang (100%)
 rename {public => htdocs}/langs/km_KH/contracts.lang (100%)
 rename {public => htdocs}/langs/km_KH/cron.lang (100%)
 rename {public => htdocs}/langs/km_KH/deliveries.lang (100%)
 rename {public => htdocs}/langs/km_KH/dict.lang (100%)
 rename {public => htdocs}/langs/km_KH/donations.lang (100%)
 rename {public => htdocs}/langs/km_KH/ecm.lang (100%)
 rename {public => htdocs}/langs/km_KH/errors.lang (100%)
 rename {public => htdocs}/langs/km_KH/exports.lang (100%)
 rename {public => htdocs}/langs/km_KH/externalsite.lang (100%)
 rename {public => htdocs}/langs/km_KH/ftp.lang (100%)
 rename {public => htdocs}/langs/km_KH/help.lang (100%)
 rename {public => htdocs}/langs/km_KH/holiday.lang (100%)
 rename {public => htdocs}/langs/km_KH/hrm.lang (100%)
 rename {public => htdocs}/langs/km_KH/incoterm.lang (100%)
 rename {public => htdocs}/langs/km_KH/install.lang (100%)
 rename {public => htdocs}/langs/km_KH/interventions.lang (100%)
 rename {public => htdocs}/langs/km_KH/languages.lang (100%)
 rename {public => htdocs}/langs/km_KH/ldap.lang (100%)
 rename {public => htdocs}/langs/km_KH/link.lang (100%)
 rename {public => htdocs}/langs/km_KH/loan.lang (100%)
 rename {public => htdocs}/langs/km_KH/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/km_KH/mails.lang (100%)
 rename {public => htdocs}/langs/km_KH/main.lang (100%)
 rename {public => htdocs}/langs/km_KH/margins.lang (100%)
 rename {public => htdocs}/langs/km_KH/members.lang (100%)
 rename {public => htdocs}/langs/km_KH/oauth.lang (100%)
 rename {public => htdocs}/langs/km_KH/opensurvey.lang (100%)
 rename {public => htdocs}/langs/km_KH/orders.lang (100%)
 rename {public => htdocs}/langs/km_KH/other.lang (100%)
 rename {public => htdocs}/langs/km_KH/paybox.lang (100%)
 rename {public => htdocs}/langs/km_KH/paypal.lang (100%)
 rename {public => htdocs}/langs/km_KH/printing.lang (100%)
 rename {public => htdocs}/langs/km_KH/productbatch.lang (100%)
 rename {public => htdocs}/langs/km_KH/products.lang (100%)
 rename {public => htdocs}/langs/km_KH/projects.lang (100%)
 rename {public => htdocs}/langs/km_KH/propal.lang (100%)
 rename {public => htdocs}/langs/km_KH/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/km_KH/resource.lang (100%)
 rename {public => htdocs}/langs/km_KH/salaries.lang (100%)
 rename {public => htdocs}/langs/km_KH/sendings.lang (100%)
 rename {public => htdocs}/langs/km_KH/sms.lang (100%)
 rename {public => htdocs}/langs/km_KH/stocks.lang (100%)
 rename {public => htdocs}/langs/km_KH/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/km_KH/suppliers.lang (100%)
 rename {public => htdocs}/langs/km_KH/trips.lang (100%)
 rename {public => htdocs}/langs/km_KH/users.lang (100%)
 rename {public => htdocs}/langs/km_KH/website.lang (100%)
 rename {public => htdocs}/langs/km_KH/withdrawals.lang (100%)
 rename {public => htdocs}/langs/km_KH/workflow.lang (100%)
 rename {public => htdocs}/langs/kn_IN/accountancy.lang (100%)
 rename {public => htdocs}/langs/kn_IN/admin.lang (100%)
 rename {public => htdocs}/langs/kn_IN/agenda.lang (100%)
 rename {public => htdocs}/langs/kn_IN/banks.lang (100%)
 rename {public => htdocs}/langs/kn_IN/bills.lang (100%)
 rename {public => htdocs}/langs/kn_IN/bookmarks.lang (100%)
 rename {public => htdocs}/langs/kn_IN/boxes.lang (100%)
 rename {public => htdocs}/langs/kn_IN/cashdesk.lang (100%)
 rename {public => htdocs}/langs/kn_IN/categories.lang (100%)
 rename {public => htdocs}/langs/kn_IN/commercial.lang (100%)
 rename {public => htdocs}/langs/kn_IN/companies.lang (100%)
 rename {public => htdocs}/langs/kn_IN/compta.lang (100%)
 rename {public => htdocs}/langs/kn_IN/contracts.lang (100%)
 rename {public => htdocs}/langs/kn_IN/cron.lang (100%)
 rename {public => htdocs}/langs/kn_IN/deliveries.lang (100%)
 rename {public => htdocs}/langs/kn_IN/dict.lang (100%)
 rename {public => htdocs}/langs/kn_IN/donations.lang (100%)
 rename {public => htdocs}/langs/kn_IN/ecm.lang (100%)
 rename {public => htdocs}/langs/kn_IN/errors.lang (100%)
 rename {public => htdocs}/langs/kn_IN/exports.lang (100%)
 rename {public => htdocs}/langs/kn_IN/externalsite.lang (100%)
 rename {public => htdocs}/langs/kn_IN/ftp.lang (100%)
 rename {public => htdocs}/langs/kn_IN/help.lang (100%)
 rename {public => htdocs}/langs/kn_IN/holiday.lang (100%)
 rename {public => htdocs}/langs/kn_IN/hrm.lang (100%)
 rename {public => htdocs}/langs/kn_IN/incoterm.lang (100%)
 rename {public => htdocs}/langs/kn_IN/install.lang (100%)
 rename {public => htdocs}/langs/kn_IN/interventions.lang (100%)
 rename {public => htdocs}/langs/kn_IN/languages.lang (100%)
 rename {public => htdocs}/langs/kn_IN/ldap.lang (100%)
 rename {public => htdocs}/langs/kn_IN/link.lang (100%)
 rename {public => htdocs}/langs/kn_IN/loan.lang (100%)
 rename {public => htdocs}/langs/kn_IN/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/kn_IN/mails.lang (100%)
 rename {public => htdocs}/langs/kn_IN/main.lang (100%)
 rename {public => htdocs}/langs/kn_IN/margins.lang (100%)
 rename {public => htdocs}/langs/kn_IN/members.lang (100%)
 rename {public => htdocs}/langs/kn_IN/oauth.lang (100%)
 rename {public => htdocs}/langs/kn_IN/opensurvey.lang (100%)
 rename {public => htdocs}/langs/kn_IN/orders.lang (100%)
 rename {public => htdocs}/langs/kn_IN/other.lang (100%)
 rename {public => htdocs}/langs/kn_IN/paybox.lang (100%)
 rename {public => htdocs}/langs/kn_IN/paypal.lang (100%)
 rename {public => htdocs}/langs/kn_IN/printing.lang (100%)
 rename {public => htdocs}/langs/kn_IN/productbatch.lang (100%)
 rename {public => htdocs}/langs/kn_IN/products.lang (100%)
 rename {public => htdocs}/langs/kn_IN/projects.lang (100%)
 rename {public => htdocs}/langs/kn_IN/propal.lang (100%)
 rename {public => htdocs}/langs/kn_IN/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/kn_IN/resource.lang (100%)
 rename {public => htdocs}/langs/kn_IN/salaries.lang (100%)
 rename {public => htdocs}/langs/kn_IN/sendings.lang (100%)
 rename {public => htdocs}/langs/kn_IN/sms.lang (100%)
 rename {public => htdocs}/langs/kn_IN/stocks.lang (100%)
 rename {public => htdocs}/langs/kn_IN/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/kn_IN/suppliers.lang (100%)
 rename {public => htdocs}/langs/kn_IN/trips.lang (100%)
 rename {public => htdocs}/langs/kn_IN/users.lang (100%)
 rename {public => htdocs}/langs/kn_IN/website.lang (100%)
 rename {public => htdocs}/langs/kn_IN/withdrawals.lang (100%)
 rename {public => htdocs}/langs/kn_IN/workflow.lang (100%)
 rename {public => htdocs}/langs/ko_KR/accountancy.lang (100%)
 rename {public => htdocs}/langs/ko_KR/admin.lang (100%)
 rename {public => htdocs}/langs/ko_KR/agenda.lang (100%)
 rename {public => htdocs}/langs/ko_KR/banks.lang (100%)
 rename {public => htdocs}/langs/ko_KR/bills.lang (100%)
 rename {public => htdocs}/langs/ko_KR/bookmarks.lang (100%)
 rename {public => htdocs}/langs/ko_KR/boxes.lang (100%)
 rename {public => htdocs}/langs/ko_KR/cashdesk.lang (100%)
 rename {public => htdocs}/langs/ko_KR/categories.lang (100%)
 rename {public => htdocs}/langs/ko_KR/commercial.lang (100%)
 rename {public => htdocs}/langs/ko_KR/companies.lang (100%)
 rename {public => htdocs}/langs/ko_KR/compta.lang (100%)
 rename {public => htdocs}/langs/ko_KR/contracts.lang (100%)
 rename {public => htdocs}/langs/ko_KR/cron.lang (100%)
 rename {public => htdocs}/langs/ko_KR/deliveries.lang (100%)
 rename {public => htdocs}/langs/ko_KR/dict.lang (100%)
 rename {public => htdocs}/langs/ko_KR/donations.lang (100%)
 rename {public => htdocs}/langs/ko_KR/ecm.lang (100%)
 rename {public => htdocs}/langs/ko_KR/errors.lang (100%)
 rename {public => htdocs}/langs/ko_KR/exports.lang (100%)
 rename {public => htdocs}/langs/ko_KR/externalsite.lang (100%)
 rename {public => htdocs}/langs/ko_KR/ftp.lang (100%)
 rename {public => htdocs}/langs/ko_KR/help.lang (100%)
 rename {public => htdocs}/langs/ko_KR/holiday.lang (100%)
 rename {public => htdocs}/langs/ko_KR/hrm.lang (100%)
 rename {public => htdocs}/langs/ko_KR/incoterm.lang (100%)
 rename {public => htdocs}/langs/ko_KR/install.lang (100%)
 rename {public => htdocs}/langs/ko_KR/interventions.lang (100%)
 rename {public => htdocs}/langs/ko_KR/languages.lang (100%)
 rename {public => htdocs}/langs/ko_KR/ldap.lang (100%)
 rename {public => htdocs}/langs/ko_KR/link.lang (100%)
 rename {public => htdocs}/langs/ko_KR/loan.lang (100%)
 rename {public => htdocs}/langs/ko_KR/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/ko_KR/mails.lang (100%)
 rename {public => htdocs}/langs/ko_KR/main.lang (100%)
 rename {public => htdocs}/langs/ko_KR/margins.lang (100%)
 rename {public => htdocs}/langs/ko_KR/members.lang (100%)
 rename {public => htdocs}/langs/ko_KR/oauth.lang (100%)
 rename {public => htdocs}/langs/ko_KR/opensurvey.lang (100%)
 rename {public => htdocs}/langs/ko_KR/orders.lang (100%)
 rename {public => htdocs}/langs/ko_KR/other.lang (100%)
 rename {public => htdocs}/langs/ko_KR/paybox.lang (100%)
 rename {public => htdocs}/langs/ko_KR/paypal.lang (100%)
 rename {public => htdocs}/langs/ko_KR/printing.lang (100%)
 rename {public => htdocs}/langs/ko_KR/productbatch.lang (100%)
 rename {public => htdocs}/langs/ko_KR/products.lang (100%)
 rename {public => htdocs}/langs/ko_KR/projects.lang (100%)
 rename {public => htdocs}/langs/ko_KR/propal.lang (100%)
 rename {public => htdocs}/langs/ko_KR/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/ko_KR/resource.lang (100%)
 rename {public => htdocs}/langs/ko_KR/salaries.lang (100%)
 rename {public => htdocs}/langs/ko_KR/sendings.lang (100%)
 rename {public => htdocs}/langs/ko_KR/sms.lang (100%)
 rename {public => htdocs}/langs/ko_KR/stocks.lang (100%)
 rename {public => htdocs}/langs/ko_KR/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/ko_KR/suppliers.lang (100%)
 rename {public => htdocs}/langs/ko_KR/trips.lang (100%)
 rename {public => htdocs}/langs/ko_KR/users.lang (100%)
 rename {public => htdocs}/langs/ko_KR/website.lang (100%)
 rename {public => htdocs}/langs/ko_KR/withdrawals.lang (100%)
 rename {public => htdocs}/langs/ko_KR/workflow.lang (100%)
 rename {public => htdocs}/langs/lo_LA/accountancy.lang (100%)
 rename {public => htdocs}/langs/lo_LA/admin.lang (100%)
 rename {public => htdocs}/langs/lo_LA/agenda.lang (100%)
 rename {public => htdocs}/langs/lo_LA/banks.lang (100%)
 rename {public => htdocs}/langs/lo_LA/bills.lang (100%)
 rename {public => htdocs}/langs/lo_LA/bookmarks.lang (100%)
 rename {public => htdocs}/langs/lo_LA/boxes.lang (100%)
 rename {public => htdocs}/langs/lo_LA/cashdesk.lang (100%)
 rename {public => htdocs}/langs/lo_LA/categories.lang (100%)
 rename {public => htdocs}/langs/lo_LA/commercial.lang (100%)
 rename {public => htdocs}/langs/lo_LA/companies.lang (100%)
 rename {public => htdocs}/langs/lo_LA/compta.lang (100%)
 rename {public => htdocs}/langs/lo_LA/contracts.lang (100%)
 rename {public => htdocs}/langs/lo_LA/cron.lang (100%)
 rename {public => htdocs}/langs/lo_LA/deliveries.lang (100%)
 rename {public => htdocs}/langs/lo_LA/dict.lang (100%)
 rename {public => htdocs}/langs/lo_LA/donations.lang (100%)
 rename {public => htdocs}/langs/lo_LA/ecm.lang (100%)
 rename {public => htdocs}/langs/lo_LA/errors.lang (100%)
 rename {public => htdocs}/langs/lo_LA/exports.lang (100%)
 rename {public => htdocs}/langs/lo_LA/externalsite.lang (100%)
 rename {public => htdocs}/langs/lo_LA/ftp.lang (100%)
 rename {public => htdocs}/langs/lo_LA/help.lang (100%)
 rename {public => htdocs}/langs/lo_LA/holiday.lang (100%)
 rename {public => htdocs}/langs/lo_LA/hrm.lang (100%)
 rename {public => htdocs}/langs/lo_LA/incoterm.lang (100%)
 rename {public => htdocs}/langs/lo_LA/install.lang (100%)
 rename {public => htdocs}/langs/lo_LA/interventions.lang (100%)
 rename {public => htdocs}/langs/lo_LA/languages.lang (100%)
 rename {public => htdocs}/langs/lo_LA/ldap.lang (100%)
 rename {public => htdocs}/langs/lo_LA/link.lang (100%)
 rename {public => htdocs}/langs/lo_LA/loan.lang (100%)
 rename {public => htdocs}/langs/lo_LA/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/lo_LA/mails.lang (100%)
 rename {public => htdocs}/langs/lo_LA/main.lang (100%)
 rename {public => htdocs}/langs/lo_LA/margins.lang (100%)
 rename {public => htdocs}/langs/lo_LA/members.lang (100%)
 rename {public => htdocs}/langs/lo_LA/oauth.lang (100%)
 rename {public => htdocs}/langs/lo_LA/opensurvey.lang (100%)
 rename {public => htdocs}/langs/lo_LA/orders.lang (100%)
 rename {public => htdocs}/langs/lo_LA/other.lang (100%)
 rename {public => htdocs}/langs/lo_LA/paybox.lang (100%)
 rename {public => htdocs}/langs/lo_LA/paypal.lang (100%)
 rename {public => htdocs}/langs/lo_LA/printing.lang (100%)
 rename {public => htdocs}/langs/lo_LA/productbatch.lang (100%)
 rename {public => htdocs}/langs/lo_LA/products.lang (100%)
 rename {public => htdocs}/langs/lo_LA/projects.lang (100%)
 rename {public => htdocs}/langs/lo_LA/propal.lang (100%)
 rename {public => htdocs}/langs/lo_LA/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/lo_LA/resource.lang (100%)
 rename {public => htdocs}/langs/lo_LA/salaries.lang (100%)
 rename {public => htdocs}/langs/lo_LA/sendings.lang (100%)
 rename {public => htdocs}/langs/lo_LA/sms.lang (100%)
 rename {public => htdocs}/langs/lo_LA/stocks.lang (100%)
 rename {public => htdocs}/langs/lo_LA/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/lo_LA/suppliers.lang (100%)
 rename {public => htdocs}/langs/lo_LA/trips.lang (100%)
 rename {public => htdocs}/langs/lo_LA/users.lang (100%)
 rename {public => htdocs}/langs/lo_LA/website.lang (100%)
 rename {public => htdocs}/langs/lo_LA/withdrawals.lang (100%)
 rename {public => htdocs}/langs/lo_LA/workflow.lang (100%)
 rename {public => htdocs}/langs/lt_LT/accountancy.lang (100%)
 rename {public => htdocs}/langs/lt_LT/admin.lang (100%)
 rename {public => htdocs}/langs/lt_LT/agenda.lang (100%)
 rename {public => htdocs}/langs/lt_LT/banks.lang (100%)
 rename {public => htdocs}/langs/lt_LT/bills.lang (100%)
 rename {public => htdocs}/langs/lt_LT/bookmarks.lang (100%)
 rename {public => htdocs}/langs/lt_LT/boxes.lang (100%)
 rename {public => htdocs}/langs/lt_LT/cashdesk.lang (100%)
 rename {public => htdocs}/langs/lt_LT/categories.lang (100%)
 rename {public => htdocs}/langs/lt_LT/commercial.lang (100%)
 rename {public => htdocs}/langs/lt_LT/companies.lang (100%)
 rename {public => htdocs}/langs/lt_LT/compta.lang (100%)
 rename {public => htdocs}/langs/lt_LT/contracts.lang (100%)
 rename {public => htdocs}/langs/lt_LT/cron.lang (100%)
 rename {public => htdocs}/langs/lt_LT/deliveries.lang (100%)
 rename {public => htdocs}/langs/lt_LT/dict.lang (100%)
 rename {public => htdocs}/langs/lt_LT/donations.lang (100%)
 rename {public => htdocs}/langs/lt_LT/ecm.lang (100%)
 rename {public => htdocs}/langs/lt_LT/errors.lang (100%)
 rename {public => htdocs}/langs/lt_LT/exports.lang (100%)
 rename {public => htdocs}/langs/lt_LT/externalsite.lang (100%)
 rename {public => htdocs}/langs/lt_LT/ftp.lang (100%)
 rename {public => htdocs}/langs/lt_LT/help.lang (100%)
 rename {public => htdocs}/langs/lt_LT/holiday.lang (100%)
 rename {public => htdocs}/langs/lt_LT/hrm.lang (100%)
 rename {public => htdocs}/langs/lt_LT/incoterm.lang (100%)
 rename {public => htdocs}/langs/lt_LT/install.lang (100%)
 rename {public => htdocs}/langs/lt_LT/interventions.lang (100%)
 rename {public => htdocs}/langs/lt_LT/languages.lang (100%)
 rename {public => htdocs}/langs/lt_LT/ldap.lang (100%)
 rename {public => htdocs}/langs/lt_LT/link.lang (100%)
 rename {public => htdocs}/langs/lt_LT/loan.lang (100%)
 rename {public => htdocs}/langs/lt_LT/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/lt_LT/mails.lang (100%)
 rename {public => htdocs}/langs/lt_LT/main.lang (100%)
 rename {public => htdocs}/langs/lt_LT/margins.lang (100%)
 rename {public => htdocs}/langs/lt_LT/members.lang (100%)
 rename {public => htdocs}/langs/lt_LT/oauth.lang (100%)
 rename {public => htdocs}/langs/lt_LT/opensurvey.lang (100%)
 rename {public => htdocs}/langs/lt_LT/orders.lang (100%)
 rename {public => htdocs}/langs/lt_LT/other.lang (100%)
 rename {public => htdocs}/langs/lt_LT/paybox.lang (100%)
 rename {public => htdocs}/langs/lt_LT/paypal.lang (100%)
 rename {public => htdocs}/langs/lt_LT/printing.lang (100%)
 rename {public => htdocs}/langs/lt_LT/productbatch.lang (100%)
 rename {public => htdocs}/langs/lt_LT/products.lang (100%)
 rename {public => htdocs}/langs/lt_LT/projects.lang (100%)
 rename {public => htdocs}/langs/lt_LT/propal.lang (100%)
 rename {public => htdocs}/langs/lt_LT/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/lt_LT/resource.lang (100%)
 rename {public => htdocs}/langs/lt_LT/salaries.lang (100%)
 rename {public => htdocs}/langs/lt_LT/sendings.lang (100%)
 rename {public => htdocs}/langs/lt_LT/sms.lang (100%)
 rename {public => htdocs}/langs/lt_LT/stocks.lang (100%)
 rename {public => htdocs}/langs/lt_LT/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/lt_LT/suppliers.lang (100%)
 rename {public => htdocs}/langs/lt_LT/trips.lang (100%)
 rename {public => htdocs}/langs/lt_LT/users.lang (100%)
 rename {public => htdocs}/langs/lt_LT/website.lang (100%)
 rename {public => htdocs}/langs/lt_LT/withdrawals.lang (100%)
 rename {public => htdocs}/langs/lt_LT/workflow.lang (100%)
 rename {public => htdocs}/langs/lv_LV/accountancy.lang (100%)
 rename {public => htdocs}/langs/lv_LV/admin.lang (100%)
 rename {public => htdocs}/langs/lv_LV/agenda.lang (100%)
 rename {public => htdocs}/langs/lv_LV/banks.lang (100%)
 rename {public => htdocs}/langs/lv_LV/bills.lang (100%)
 rename {public => htdocs}/langs/lv_LV/bookmarks.lang (100%)
 rename {public => htdocs}/langs/lv_LV/boxes.lang (100%)
 rename {public => htdocs}/langs/lv_LV/cashdesk.lang (100%)
 rename {public => htdocs}/langs/lv_LV/categories.lang (100%)
 rename {public => htdocs}/langs/lv_LV/commercial.lang (100%)
 rename {public => htdocs}/langs/lv_LV/companies.lang (100%)
 rename {public => htdocs}/langs/lv_LV/compta.lang (100%)
 rename {public => htdocs}/langs/lv_LV/contracts.lang (100%)
 rename {public => htdocs}/langs/lv_LV/cron.lang (100%)
 rename {public => htdocs}/langs/lv_LV/deliveries.lang (100%)
 rename {public => htdocs}/langs/lv_LV/dict.lang (100%)
 rename {public => htdocs}/langs/lv_LV/donations.lang (100%)
 rename {public => htdocs}/langs/lv_LV/ecm.lang (100%)
 rename {public => htdocs}/langs/lv_LV/errors.lang (100%)
 rename {public => htdocs}/langs/lv_LV/exports.lang (100%)
 rename {public => htdocs}/langs/lv_LV/externalsite.lang (100%)
 rename {public => htdocs}/langs/lv_LV/ftp.lang (100%)
 rename {public => htdocs}/langs/lv_LV/help.lang (100%)
 rename {public => htdocs}/langs/lv_LV/holiday.lang (100%)
 rename {public => htdocs}/langs/lv_LV/hrm.lang (100%)
 rename {public => htdocs}/langs/lv_LV/incoterm.lang (100%)
 rename {public => htdocs}/langs/lv_LV/install.lang (100%)
 rename {public => htdocs}/langs/lv_LV/interventions.lang (100%)
 rename {public => htdocs}/langs/lv_LV/languages.lang (100%)
 rename {public => htdocs}/langs/lv_LV/ldap.lang (100%)
 rename {public => htdocs}/langs/lv_LV/link.lang (100%)
 rename {public => htdocs}/langs/lv_LV/loan.lang (100%)
 rename {public => htdocs}/langs/lv_LV/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/lv_LV/mails.lang (100%)
 rename {public => htdocs}/langs/lv_LV/main.lang (100%)
 rename {public => htdocs}/langs/lv_LV/margins.lang (100%)
 rename {public => htdocs}/langs/lv_LV/members.lang (100%)
 rename {public => htdocs}/langs/lv_LV/oauth.lang (100%)
 rename {public => htdocs}/langs/lv_LV/opensurvey.lang (100%)
 rename {public => htdocs}/langs/lv_LV/orders.lang (100%)
 rename {public => htdocs}/langs/lv_LV/other.lang (100%)
 rename {public => htdocs}/langs/lv_LV/paybox.lang (100%)
 rename {public => htdocs}/langs/lv_LV/paypal.lang (100%)
 rename {public => htdocs}/langs/lv_LV/printing.lang (100%)
 rename {public => htdocs}/langs/lv_LV/productbatch.lang (100%)
 rename {public => htdocs}/langs/lv_LV/products.lang (100%)
 rename {public => htdocs}/langs/lv_LV/projects.lang (100%)
 rename {public => htdocs}/langs/lv_LV/propal.lang (100%)
 rename {public => htdocs}/langs/lv_LV/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/lv_LV/resource.lang (100%)
 rename {public => htdocs}/langs/lv_LV/salaries.lang (100%)
 rename {public => htdocs}/langs/lv_LV/sendings.lang (100%)
 rename {public => htdocs}/langs/lv_LV/sms.lang (100%)
 rename {public => htdocs}/langs/lv_LV/stocks.lang (100%)
 rename {public => htdocs}/langs/lv_LV/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/lv_LV/suppliers.lang (100%)
 rename {public => htdocs}/langs/lv_LV/trips.lang (100%)
 rename {public => htdocs}/langs/lv_LV/users.lang (100%)
 rename {public => htdocs}/langs/lv_LV/website.lang (100%)
 rename {public => htdocs}/langs/lv_LV/withdrawals.lang (100%)
 rename {public => htdocs}/langs/lv_LV/workflow.lang (100%)
 rename {public => htdocs}/langs/mk_MK/accountancy.lang (100%)
 rename {public => htdocs}/langs/mk_MK/admin.lang (100%)
 rename {public => htdocs}/langs/mk_MK/agenda.lang (100%)
 rename {public => htdocs}/langs/mk_MK/banks.lang (100%)
 rename {public => htdocs}/langs/mk_MK/bills.lang (100%)
 rename {public => htdocs}/langs/mk_MK/bookmarks.lang (100%)
 rename {public => htdocs}/langs/mk_MK/boxes.lang (100%)
 rename {public => htdocs}/langs/mk_MK/cashdesk.lang (100%)
 rename {public => htdocs}/langs/mk_MK/categories.lang (100%)
 rename {public => htdocs}/langs/mk_MK/commercial.lang (100%)
 rename {public => htdocs}/langs/mk_MK/companies.lang (100%)
 rename {public => htdocs}/langs/mk_MK/compta.lang (100%)
 rename {public => htdocs}/langs/mk_MK/contracts.lang (100%)
 rename {public => htdocs}/langs/mk_MK/cron.lang (100%)
 rename {public => htdocs}/langs/mk_MK/deliveries.lang (100%)
 rename {public => htdocs}/langs/mk_MK/dict.lang (100%)
 rename {public => htdocs}/langs/mk_MK/donations.lang (100%)
 rename {public => htdocs}/langs/mk_MK/ecm.lang (100%)
 rename {public => htdocs}/langs/mk_MK/errors.lang (100%)
 rename {public => htdocs}/langs/mk_MK/exports.lang (100%)
 rename {public => htdocs}/langs/mk_MK/externalsite.lang (100%)
 rename {public => htdocs}/langs/mk_MK/ftp.lang (100%)
 rename {public => htdocs}/langs/mk_MK/help.lang (100%)
 rename {public => htdocs}/langs/mk_MK/holiday.lang (100%)
 rename {public => htdocs}/langs/mk_MK/hrm.lang (100%)
 rename {public => htdocs}/langs/mk_MK/incoterm.lang (100%)
 rename {public => htdocs}/langs/mk_MK/install.lang (100%)
 rename {public => htdocs}/langs/mk_MK/interventions.lang (100%)
 rename {public => htdocs}/langs/mk_MK/languages.lang (100%)
 rename {public => htdocs}/langs/mk_MK/ldap.lang (100%)
 rename {public => htdocs}/langs/mk_MK/link.lang (100%)
 rename {public => htdocs}/langs/mk_MK/loan.lang (100%)
 rename {public => htdocs}/langs/mk_MK/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/mk_MK/mails.lang (100%)
 rename {public => htdocs}/langs/mk_MK/main.lang (100%)
 rename {public => htdocs}/langs/mk_MK/margins.lang (100%)
 rename {public => htdocs}/langs/mk_MK/members.lang (100%)
 rename {public => htdocs}/langs/mk_MK/oauth.lang (100%)
 rename {public => htdocs}/langs/mk_MK/opensurvey.lang (100%)
 rename {public => htdocs}/langs/mk_MK/orders.lang (100%)
 rename {public => htdocs}/langs/mk_MK/other.lang (100%)
 rename {public => htdocs}/langs/mk_MK/paybox.lang (100%)
 rename {public => htdocs}/langs/mk_MK/paypal.lang (100%)
 rename {public => htdocs}/langs/mk_MK/printing.lang (100%)
 rename {public => htdocs}/langs/mk_MK/productbatch.lang (100%)
 rename {public => htdocs}/langs/mk_MK/products.lang (100%)
 rename {public => htdocs}/langs/mk_MK/projects.lang (100%)
 rename {public => htdocs}/langs/mk_MK/propal.lang (100%)
 rename {public => htdocs}/langs/mk_MK/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/mk_MK/resource.lang (100%)
 rename {public => htdocs}/langs/mk_MK/salaries.lang (100%)
 rename {public => htdocs}/langs/mk_MK/sendings.lang (100%)
 rename {public => htdocs}/langs/mk_MK/sms.lang (100%)
 rename {public => htdocs}/langs/mk_MK/stocks.lang (100%)
 rename {public => htdocs}/langs/mk_MK/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/mk_MK/suppliers.lang (100%)
 rename {public => htdocs}/langs/mk_MK/trips.lang (100%)
 rename {public => htdocs}/langs/mk_MK/users.lang (100%)
 rename {public => htdocs}/langs/mk_MK/website.lang (100%)
 rename {public => htdocs}/langs/mk_MK/withdrawals.lang (100%)
 rename {public => htdocs}/langs/mk_MK/workflow.lang (100%)
 rename {public => htdocs}/langs/mn_MN/accountancy.lang (100%)
 rename {public => htdocs}/langs/mn_MN/admin.lang (100%)
 rename {public => htdocs}/langs/mn_MN/agenda.lang (100%)
 rename {public => htdocs}/langs/mn_MN/banks.lang (100%)
 rename {public => htdocs}/langs/mn_MN/bills.lang (100%)
 rename {public => htdocs}/langs/mn_MN/bookmarks.lang (100%)
 rename {public => htdocs}/langs/mn_MN/boxes.lang (100%)
 rename {public => htdocs}/langs/mn_MN/cashdesk.lang (100%)
 rename {public => htdocs}/langs/mn_MN/categories.lang (100%)
 rename {public => htdocs}/langs/mn_MN/commercial.lang (100%)
 rename {public => htdocs}/langs/mn_MN/companies.lang (100%)
 rename {public => htdocs}/langs/mn_MN/compta.lang (100%)
 rename {public => htdocs}/langs/mn_MN/contracts.lang (100%)
 rename {public => htdocs}/langs/mn_MN/cron.lang (100%)
 rename {public => htdocs}/langs/mn_MN/deliveries.lang (100%)
 rename {public => htdocs}/langs/mn_MN/dict.lang (100%)
 rename {public => htdocs}/langs/mn_MN/donations.lang (100%)
 rename {public => htdocs}/langs/mn_MN/ecm.lang (100%)
 rename {public => htdocs}/langs/mn_MN/errors.lang (100%)
 rename {public => htdocs}/langs/mn_MN/exports.lang (100%)
 rename {public => htdocs}/langs/mn_MN/externalsite.lang (100%)
 rename {public => htdocs}/langs/mn_MN/ftp.lang (100%)
 rename {public => htdocs}/langs/mn_MN/help.lang (100%)
 rename {public => htdocs}/langs/mn_MN/holiday.lang (100%)
 rename {public => htdocs}/langs/mn_MN/hrm.lang (100%)
 rename {public => htdocs}/langs/mn_MN/incoterm.lang (100%)
 rename {public => htdocs}/langs/mn_MN/install.lang (100%)
 rename {public => htdocs}/langs/mn_MN/interventions.lang (100%)
 rename {public => htdocs}/langs/mn_MN/languages.lang (100%)
 rename {public => htdocs}/langs/mn_MN/ldap.lang (100%)
 rename {public => htdocs}/langs/mn_MN/link.lang (100%)
 rename {public => htdocs}/langs/mn_MN/loan.lang (100%)
 rename {public => htdocs}/langs/mn_MN/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/mn_MN/mails.lang (100%)
 rename {public => htdocs}/langs/mn_MN/main.lang (100%)
 rename {public => htdocs}/langs/mn_MN/margins.lang (100%)
 rename {public => htdocs}/langs/mn_MN/members.lang (100%)
 rename {public => htdocs}/langs/mn_MN/oauth.lang (100%)
 rename {public => htdocs}/langs/mn_MN/opensurvey.lang (100%)
 rename {public => htdocs}/langs/mn_MN/orders.lang (100%)
 rename {public => htdocs}/langs/mn_MN/other.lang (100%)
 rename {public => htdocs}/langs/mn_MN/paybox.lang (100%)
 rename {public => htdocs}/langs/mn_MN/paypal.lang (100%)
 rename {public => htdocs}/langs/mn_MN/printing.lang (100%)
 rename {public => htdocs}/langs/mn_MN/productbatch.lang (100%)
 rename {public => htdocs}/langs/mn_MN/products.lang (100%)
 rename {public => htdocs}/langs/mn_MN/projects.lang (100%)
 rename {public => htdocs}/langs/mn_MN/propal.lang (100%)
 rename {public => htdocs}/langs/mn_MN/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/mn_MN/resource.lang (100%)
 rename {public => htdocs}/langs/mn_MN/salaries.lang (100%)
 rename {public => htdocs}/langs/mn_MN/sendings.lang (100%)
 rename {public => htdocs}/langs/mn_MN/sms.lang (100%)
 rename {public => htdocs}/langs/mn_MN/stocks.lang (100%)
 rename {public => htdocs}/langs/mn_MN/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/mn_MN/suppliers.lang (100%)
 rename {public => htdocs}/langs/mn_MN/trips.lang (100%)
 rename {public => htdocs}/langs/mn_MN/users.lang (100%)
 rename {public => htdocs}/langs/mn_MN/website.lang (100%)
 rename {public => htdocs}/langs/mn_MN/withdrawals.lang (100%)
 rename {public => htdocs}/langs/mn_MN/workflow.lang (100%)
 rename {public => htdocs}/langs/nb_NO/accountancy.lang (100%)
 rename {public => htdocs}/langs/nb_NO/admin.lang (100%)
 rename {public => htdocs}/langs/nb_NO/agenda.lang (100%)
 rename {public => htdocs}/langs/nb_NO/banks.lang (100%)
 rename {public => htdocs}/langs/nb_NO/bills.lang (100%)
 rename {public => htdocs}/langs/nb_NO/bookmarks.lang (100%)
 rename {public => htdocs}/langs/nb_NO/boxes.lang (100%)
 rename {public => htdocs}/langs/nb_NO/cashdesk.lang (100%)
 rename {public => htdocs}/langs/nb_NO/categories.lang (100%)
 rename {public => htdocs}/langs/nb_NO/commercial.lang (100%)
 rename {public => htdocs}/langs/nb_NO/companies.lang (100%)
 rename {public => htdocs}/langs/nb_NO/compta.lang (100%)
 rename {public => htdocs}/langs/nb_NO/contracts.lang (100%)
 rename {public => htdocs}/langs/nb_NO/cron.lang (100%)
 rename {public => htdocs}/langs/nb_NO/deliveries.lang (100%)
 rename {public => htdocs}/langs/nb_NO/dict.lang (100%)
 rename {public => htdocs}/langs/nb_NO/donations.lang (100%)
 rename {public => htdocs}/langs/nb_NO/ecm.lang (100%)
 rename {public => htdocs}/langs/nb_NO/errors.lang (100%)
 rename {public => htdocs}/langs/nb_NO/exports.lang (100%)
 rename {public => htdocs}/langs/nb_NO/externalsite.lang (100%)
 rename {public => htdocs}/langs/nb_NO/ftp.lang (100%)
 rename {public => htdocs}/langs/nb_NO/help.lang (100%)
 rename {public => htdocs}/langs/nb_NO/holiday.lang (100%)
 rename {public => htdocs}/langs/nb_NO/hrm.lang (100%)
 rename {public => htdocs}/langs/nb_NO/incoterm.lang (100%)
 rename {public => htdocs}/langs/nb_NO/install.lang (100%)
 rename {public => htdocs}/langs/nb_NO/interventions.lang (100%)
 rename {public => htdocs}/langs/nb_NO/languages.lang (100%)
 rename {public => htdocs}/langs/nb_NO/ldap.lang (100%)
 rename {public => htdocs}/langs/nb_NO/link.lang (100%)
 rename {public => htdocs}/langs/nb_NO/loan.lang (100%)
 rename {public => htdocs}/langs/nb_NO/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/nb_NO/mails.lang (100%)
 rename {public => htdocs}/langs/nb_NO/main.lang (100%)
 rename {public => htdocs}/langs/nb_NO/margins.lang (100%)
 rename {public => htdocs}/langs/nb_NO/members.lang (100%)
 rename {public => htdocs}/langs/nb_NO/oauth.lang (100%)
 rename {public => htdocs}/langs/nb_NO/opensurvey.lang (100%)
 rename {public => htdocs}/langs/nb_NO/orders.lang (100%)
 rename {public => htdocs}/langs/nb_NO/other.lang (100%)
 rename {public => htdocs}/langs/nb_NO/paybox.lang (100%)
 rename {public => htdocs}/langs/nb_NO/paypal.lang (100%)
 rename {public => htdocs}/langs/nb_NO/printing.lang (100%)
 rename {public => htdocs}/langs/nb_NO/productbatch.lang (100%)
 rename {public => htdocs}/langs/nb_NO/products.lang (100%)
 rename {public => htdocs}/langs/nb_NO/projects.lang (100%)
 rename {public => htdocs}/langs/nb_NO/propal.lang (100%)
 rename {public => htdocs}/langs/nb_NO/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/nb_NO/resource.lang (100%)
 rename {public => htdocs}/langs/nb_NO/salaries.lang (100%)
 rename {public => htdocs}/langs/nb_NO/sendings.lang (100%)
 rename {public => htdocs}/langs/nb_NO/sms.lang (100%)
 rename {public => htdocs}/langs/nb_NO/stocks.lang (100%)
 rename {public => htdocs}/langs/nb_NO/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/nb_NO/suppliers.lang (100%)
 rename {public => htdocs}/langs/nb_NO/trips.lang (100%)
 rename {public => htdocs}/langs/nb_NO/users.lang (100%)
 rename {public => htdocs}/langs/nb_NO/website.lang (100%)
 rename {public => htdocs}/langs/nb_NO/withdrawals.lang (100%)
 rename {public => htdocs}/langs/nb_NO/workflow.lang (100%)
 rename {public => htdocs}/langs/nl_BE/accountancy.lang (100%)
 rename {public => htdocs}/langs/nl_BE/admin.lang (100%)
 rename {public => htdocs}/langs/nl_BE/agenda.lang (100%)
 rename {public => htdocs}/langs/nl_BE/banks.lang (100%)
 rename {public => htdocs}/langs/nl_BE/bills.lang (100%)
 rename {public => htdocs}/langs/nl_BE/bookmarks.lang (100%)
 rename {public => htdocs}/langs/nl_BE/boxes.lang (100%)
 rename {public => htdocs}/langs/nl_BE/cashdesk.lang (100%)
 rename {public => htdocs}/langs/nl_BE/categories.lang (100%)
 rename {public => htdocs}/langs/nl_BE/commercial.lang (100%)
 rename {public => htdocs}/langs/nl_BE/companies.lang (100%)
 rename {public => htdocs}/langs/nl_BE/compta.lang (100%)
 rename {public => htdocs}/langs/nl_BE/contracts.lang (100%)
 rename {public => htdocs}/langs/nl_BE/cron.lang (100%)
 rename {public => htdocs}/langs/nl_BE/deliveries.lang (100%)
 rename {public => htdocs}/langs/nl_BE/dict.lang (100%)
 rename {public => htdocs}/langs/nl_BE/donations.lang (100%)
 rename {public => htdocs}/langs/nl_BE/ecm.lang (100%)
 rename {public => htdocs}/langs/nl_BE/errors.lang (100%)
 rename {public => htdocs}/langs/nl_BE/exports.lang (100%)
 rename {public => htdocs}/langs/nl_BE/externalsite.lang (100%)
 rename {public => htdocs}/langs/nl_BE/ftp.lang (100%)
 rename {public => htdocs}/langs/nl_BE/help.lang (100%)
 rename {public => htdocs}/langs/nl_BE/holiday.lang (100%)
 rename {public => htdocs}/langs/nl_BE/hrm.lang (100%)
 rename {public => htdocs}/langs/nl_BE/incoterm.lang (100%)
 rename {public => htdocs}/langs/nl_BE/install.lang (100%)
 rename {public => htdocs}/langs/nl_BE/interventions.lang (100%)
 rename {public => htdocs}/langs/nl_BE/languages.lang (100%)
 rename {public => htdocs}/langs/nl_BE/ldap.lang (100%)
 rename {public => htdocs}/langs/nl_BE/link.lang (100%)
 rename {public => htdocs}/langs/nl_BE/loan.lang (100%)
 rename {public => htdocs}/langs/nl_BE/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/nl_BE/mails.lang (100%)
 rename {public => htdocs}/langs/nl_BE/main.lang (100%)
 rename {public => htdocs}/langs/nl_BE/margins.lang (100%)
 rename {public => htdocs}/langs/nl_BE/members.lang (100%)
 rename {public => htdocs}/langs/nl_BE/oauth.lang (100%)
 rename {public => htdocs}/langs/nl_BE/opensurvey.lang (100%)
 rename {public => htdocs}/langs/nl_BE/orders.lang (100%)
 rename {public => htdocs}/langs/nl_BE/other.lang (100%)
 rename {public => htdocs}/langs/nl_BE/paybox.lang (100%)
 rename {public => htdocs}/langs/nl_BE/paypal.lang (100%)
 rename {public => htdocs}/langs/nl_BE/printing.lang (100%)
 rename {public => htdocs}/langs/nl_BE/productbatch.lang (100%)
 rename {public => htdocs}/langs/nl_BE/products.lang (100%)
 rename {public => htdocs}/langs/nl_BE/projects.lang (100%)
 rename {public => htdocs}/langs/nl_BE/propal.lang (100%)
 rename {public => htdocs}/langs/nl_BE/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/nl_BE/resource.lang (100%)
 rename {public => htdocs}/langs/nl_BE/salaries.lang (100%)
 rename {public => htdocs}/langs/nl_BE/sendings.lang (100%)
 rename {public => htdocs}/langs/nl_BE/sms.lang (100%)
 rename {public => htdocs}/langs/nl_BE/stocks.lang (100%)
 rename {public => htdocs}/langs/nl_BE/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/nl_BE/suppliers.lang (100%)
 rename {public => htdocs}/langs/nl_BE/trips.lang (100%)
 rename {public => htdocs}/langs/nl_BE/users.lang (100%)
 rename {public => htdocs}/langs/nl_BE/website.lang (100%)
 rename {public => htdocs}/langs/nl_BE/withdrawals.lang (100%)
 rename {public => htdocs}/langs/nl_BE/workflow.lang (100%)
 rename {public => htdocs}/langs/nl_NL/accountancy.lang (100%)
 rename {public => htdocs}/langs/nl_NL/admin.lang (100%)
 rename {public => htdocs}/langs/nl_NL/agenda.lang (100%)
 rename {public => htdocs}/langs/nl_NL/banks.lang (100%)
 rename {public => htdocs}/langs/nl_NL/bills.lang (100%)
 rename {public => htdocs}/langs/nl_NL/bookmarks.lang (100%)
 rename {public => htdocs}/langs/nl_NL/boxes.lang (100%)
 rename {public => htdocs}/langs/nl_NL/cashdesk.lang (100%)
 rename {public => htdocs}/langs/nl_NL/categories.lang (100%)
 rename {public => htdocs}/langs/nl_NL/commercial.lang (100%)
 rename {public => htdocs}/langs/nl_NL/companies.lang (100%)
 rename {public => htdocs}/langs/nl_NL/compta.lang (100%)
 rename {public => htdocs}/langs/nl_NL/contracts.lang (100%)
 rename {public => htdocs}/langs/nl_NL/cron.lang (100%)
 rename {public => htdocs}/langs/nl_NL/deliveries.lang (100%)
 rename {public => htdocs}/langs/nl_NL/dict.lang (100%)
 rename {public => htdocs}/langs/nl_NL/donations.lang (100%)
 rename {public => htdocs}/langs/nl_NL/ecm.lang (100%)
 rename {public => htdocs}/langs/nl_NL/errors.lang (100%)
 rename {public => htdocs}/langs/nl_NL/exports.lang (100%)
 rename {public => htdocs}/langs/nl_NL/externalsite.lang (100%)
 rename {public => htdocs}/langs/nl_NL/ftp.lang (100%)
 rename {public => htdocs}/langs/nl_NL/help.lang (100%)
 rename {public => htdocs}/langs/nl_NL/holiday.lang (100%)
 rename {public => htdocs}/langs/nl_NL/hrm.lang (100%)
 rename {public => htdocs}/langs/nl_NL/incoterm.lang (100%)
 rename {public => htdocs}/langs/nl_NL/install.lang (100%)
 rename {public => htdocs}/langs/nl_NL/interventions.lang (100%)
 rename {public => htdocs}/langs/nl_NL/languages.lang (100%)
 rename {public => htdocs}/langs/nl_NL/ldap.lang (100%)
 rename {public => htdocs}/langs/nl_NL/link.lang (100%)
 rename {public => htdocs}/langs/nl_NL/loan.lang (100%)
 rename {public => htdocs}/langs/nl_NL/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/nl_NL/mails.lang (100%)
 rename {public => htdocs}/langs/nl_NL/main.lang (100%)
 rename {public => htdocs}/langs/nl_NL/margins.lang (100%)
 rename {public => htdocs}/langs/nl_NL/members.lang (100%)
 rename {public => htdocs}/langs/nl_NL/oauth.lang (100%)
 rename {public => htdocs}/langs/nl_NL/opensurvey.lang (100%)
 rename {public => htdocs}/langs/nl_NL/orders.lang (100%)
 rename {public => htdocs}/langs/nl_NL/other.lang (100%)
 rename {public => htdocs}/langs/nl_NL/paybox.lang (100%)
 rename {public => htdocs}/langs/nl_NL/paypal.lang (100%)
 rename {public => htdocs}/langs/nl_NL/printing.lang (100%)
 rename {public => htdocs}/langs/nl_NL/productbatch.lang (100%)
 rename {public => htdocs}/langs/nl_NL/products.lang (100%)
 rename {public => htdocs}/langs/nl_NL/projects.lang (100%)
 rename {public => htdocs}/langs/nl_NL/propal.lang (100%)
 rename {public => htdocs}/langs/nl_NL/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/nl_NL/resource.lang (100%)
 rename {public => htdocs}/langs/nl_NL/salaries.lang (100%)
 rename {public => htdocs}/langs/nl_NL/sendings.lang (100%)
 rename {public => htdocs}/langs/nl_NL/sms.lang (100%)
 rename {public => htdocs}/langs/nl_NL/stocks.lang (100%)
 rename {public => htdocs}/langs/nl_NL/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/nl_NL/suppliers.lang (100%)
 rename {public => htdocs}/langs/nl_NL/trips.lang (100%)
 rename {public => htdocs}/langs/nl_NL/users.lang (100%)
 rename {public => htdocs}/langs/nl_NL/website.lang (100%)
 rename {public => htdocs}/langs/nl_NL/withdrawals.lang (100%)
 rename {public => htdocs}/langs/nl_NL/workflow.lang (100%)
 rename {public => htdocs}/langs/pl_PL/accountancy.lang (100%)
 rename {public => htdocs}/langs/pl_PL/admin.lang (100%)
 rename {public => htdocs}/langs/pl_PL/agenda.lang (100%)
 rename {public => htdocs}/langs/pl_PL/banks.lang (100%)
 rename {public => htdocs}/langs/pl_PL/bills.lang (100%)
 rename {public => htdocs}/langs/pl_PL/bookmarks.lang (100%)
 rename {public => htdocs}/langs/pl_PL/boxes.lang (100%)
 rename {public => htdocs}/langs/pl_PL/cashdesk.lang (100%)
 rename {public => htdocs}/langs/pl_PL/categories.lang (100%)
 rename {public => htdocs}/langs/pl_PL/commercial.lang (100%)
 rename {public => htdocs}/langs/pl_PL/companies.lang (100%)
 rename {public => htdocs}/langs/pl_PL/compta.lang (100%)
 rename {public => htdocs}/langs/pl_PL/contracts.lang (100%)
 rename {public => htdocs}/langs/pl_PL/cron.lang (100%)
 rename {public => htdocs}/langs/pl_PL/deliveries.lang (100%)
 rename {public => htdocs}/langs/pl_PL/dict.lang (100%)
 rename {public => htdocs}/langs/pl_PL/donations.lang (100%)
 rename {public => htdocs}/langs/pl_PL/ecm.lang (100%)
 rename {public => htdocs}/langs/pl_PL/errors.lang (100%)
 rename {public => htdocs}/langs/pl_PL/exports.lang (100%)
 rename {public => htdocs}/langs/pl_PL/externalsite.lang (100%)
 rename {public => htdocs}/langs/pl_PL/ftp.lang (100%)
 rename {public => htdocs}/langs/pl_PL/help.lang (100%)
 rename {public => htdocs}/langs/pl_PL/holiday.lang (100%)
 rename {public => htdocs}/langs/pl_PL/hrm.lang (100%)
 rename {public => htdocs}/langs/pl_PL/incoterm.lang (100%)
 rename {public => htdocs}/langs/pl_PL/install.lang (100%)
 rename {public => htdocs}/langs/pl_PL/interventions.lang (100%)
 rename {public => htdocs}/langs/pl_PL/languages.lang (100%)
 rename {public => htdocs}/langs/pl_PL/ldap.lang (100%)
 rename {public => htdocs}/langs/pl_PL/link.lang (100%)
 rename {public => htdocs}/langs/pl_PL/loan.lang (100%)
 rename {public => htdocs}/langs/pl_PL/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/pl_PL/mails.lang (100%)
 rename {public => htdocs}/langs/pl_PL/main.lang (100%)
 rename {public => htdocs}/langs/pl_PL/margins.lang (100%)
 rename {public => htdocs}/langs/pl_PL/members.lang (100%)
 rename {public => htdocs}/langs/pl_PL/oauth.lang (100%)
 rename {public => htdocs}/langs/pl_PL/opensurvey.lang (100%)
 rename {public => htdocs}/langs/pl_PL/orders.lang (100%)
 rename {public => htdocs}/langs/pl_PL/other.lang (100%)
 rename {public => htdocs}/langs/pl_PL/paybox.lang (100%)
 rename {public => htdocs}/langs/pl_PL/paypal.lang (100%)
 rename {public => htdocs}/langs/pl_PL/printing.lang (100%)
 rename {public => htdocs}/langs/pl_PL/productbatch.lang (100%)
 rename {public => htdocs}/langs/pl_PL/products.lang (100%)
 rename {public => htdocs}/langs/pl_PL/projects.lang (100%)
 rename {public => htdocs}/langs/pl_PL/propal.lang (100%)
 rename {public => htdocs}/langs/pl_PL/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/pl_PL/resource.lang (100%)
 rename {public => htdocs}/langs/pl_PL/salaries.lang (100%)
 rename {public => htdocs}/langs/pl_PL/sendings.lang (100%)
 rename {public => htdocs}/langs/pl_PL/sms.lang (100%)
 rename {public => htdocs}/langs/pl_PL/stocks.lang (100%)
 rename {public => htdocs}/langs/pl_PL/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/pl_PL/suppliers.lang (100%)
 rename {public => htdocs}/langs/pl_PL/trips.lang (100%)
 rename {public => htdocs}/langs/pl_PL/users.lang (100%)
 rename {public => htdocs}/langs/pl_PL/website.lang (100%)
 rename {public => htdocs}/langs/pl_PL/withdrawals.lang (100%)
 rename {public => htdocs}/langs/pl_PL/workflow.lang (100%)
 rename {public => htdocs}/langs/pt_BR/accountancy.lang (100%)
 rename {public => htdocs}/langs/pt_BR/admin.lang (100%)
 rename {public => htdocs}/langs/pt_BR/agenda.lang (100%)
 rename {public => htdocs}/langs/pt_BR/banks.lang (100%)
 rename {public => htdocs}/langs/pt_BR/bills.lang (100%)
 rename {public => htdocs}/langs/pt_BR/bookmarks.lang (100%)
 rename {public => htdocs}/langs/pt_BR/boxes.lang (100%)
 rename {public => htdocs}/langs/pt_BR/cashdesk.lang (100%)
 rename {public => htdocs}/langs/pt_BR/categories.lang (100%)
 rename {public => htdocs}/langs/pt_BR/commercial.lang (100%)
 rename {public => htdocs}/langs/pt_BR/companies.lang (100%)
 rename {public => htdocs}/langs/pt_BR/compta.lang (100%)
 rename {public => htdocs}/langs/pt_BR/contracts.lang (100%)
 rename {public => htdocs}/langs/pt_BR/cron.lang (100%)
 rename {public => htdocs}/langs/pt_BR/deliveries.lang (100%)
 rename {public => htdocs}/langs/pt_BR/dict.lang (100%)
 rename {public => htdocs}/langs/pt_BR/donations.lang (100%)
 rename {public => htdocs}/langs/pt_BR/ecm.lang (100%)
 rename {public => htdocs}/langs/pt_BR/errors.lang (100%)
 rename {public => htdocs}/langs/pt_BR/exports.lang (100%)
 rename {public => htdocs}/langs/pt_BR/externalsite.lang (100%)
 rename {public => htdocs}/langs/pt_BR/ftp.lang (100%)
 rename {public => htdocs}/langs/pt_BR/help.lang (100%)
 rename {public => htdocs}/langs/pt_BR/holiday.lang (100%)
 rename {public => htdocs}/langs/pt_BR/hrm.lang (100%)
 rename {public => htdocs}/langs/pt_BR/incoterm.lang (100%)
 rename {public => htdocs}/langs/pt_BR/install.lang (100%)
 rename {public => htdocs}/langs/pt_BR/interventions.lang (100%)
 rename {public => htdocs}/langs/pt_BR/languages.lang (100%)
 rename {public => htdocs}/langs/pt_BR/ldap.lang (100%)
 rename {public => htdocs}/langs/pt_BR/link.lang (100%)
 rename {public => htdocs}/langs/pt_BR/loan.lang (100%)
 rename {public => htdocs}/langs/pt_BR/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/pt_BR/mails.lang (100%)
 rename {public => htdocs}/langs/pt_BR/main.lang (100%)
 rename {public => htdocs}/langs/pt_BR/margins.lang (100%)
 rename {public => htdocs}/langs/pt_BR/members.lang (100%)
 rename {public => htdocs}/langs/pt_BR/oauth.lang (100%)
 rename {public => htdocs}/langs/pt_BR/opensurvey.lang (100%)
 rename {public => htdocs}/langs/pt_BR/orders.lang (100%)
 rename {public => htdocs}/langs/pt_BR/other.lang (100%)
 rename {public => htdocs}/langs/pt_BR/paybox.lang (100%)
 rename {public => htdocs}/langs/pt_BR/paypal.lang (100%)
 rename {public => htdocs}/langs/pt_BR/printing.lang (100%)
 rename {public => htdocs}/langs/pt_BR/productbatch.lang (100%)
 rename {public => htdocs}/langs/pt_BR/products.lang (100%)
 rename {public => htdocs}/langs/pt_BR/projects.lang (100%)
 rename {public => htdocs}/langs/pt_BR/propal.lang (100%)
 rename {public => htdocs}/langs/pt_BR/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/pt_BR/resource.lang (100%)
 rename {public => htdocs}/langs/pt_BR/salaries.lang (100%)
 rename {public => htdocs}/langs/pt_BR/sendings.lang (100%)
 rename {public => htdocs}/langs/pt_BR/sms.lang (100%)
 rename {public => htdocs}/langs/pt_BR/stocks.lang (100%)
 rename {public => htdocs}/langs/pt_BR/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/pt_BR/suppliers.lang (100%)
 rename {public => htdocs}/langs/pt_BR/trips.lang (100%)
 rename {public => htdocs}/langs/pt_BR/users.lang (100%)
 rename {public => htdocs}/langs/pt_BR/website.lang (100%)
 rename {public => htdocs}/langs/pt_BR/withdrawals.lang (100%)
 rename {public => htdocs}/langs/pt_BR/workflow.lang (100%)
 rename {public => htdocs}/langs/pt_PT/accountancy.lang (100%)
 rename {public => htdocs}/langs/pt_PT/admin.lang (100%)
 rename {public => htdocs}/langs/pt_PT/agenda.lang (100%)
 rename {public => htdocs}/langs/pt_PT/banks.lang (100%)
 rename {public => htdocs}/langs/pt_PT/bills.lang (100%)
 rename {public => htdocs}/langs/pt_PT/bookmarks.lang (100%)
 rename {public => htdocs}/langs/pt_PT/boxes.lang (100%)
 rename {public => htdocs}/langs/pt_PT/cashdesk.lang (100%)
 rename {public => htdocs}/langs/pt_PT/categories.lang (100%)
 rename {public => htdocs}/langs/pt_PT/commercial.lang (100%)
 rename {public => htdocs}/langs/pt_PT/companies.lang (100%)
 rename {public => htdocs}/langs/pt_PT/compta.lang (100%)
 rename {public => htdocs}/langs/pt_PT/contracts.lang (100%)
 rename {public => htdocs}/langs/pt_PT/cron.lang (100%)
 rename {public => htdocs}/langs/pt_PT/deliveries.lang (100%)
 rename {public => htdocs}/langs/pt_PT/dict.lang (100%)
 rename {public => htdocs}/langs/pt_PT/donations.lang (100%)
 rename {public => htdocs}/langs/pt_PT/ecm.lang (100%)
 rename {public => htdocs}/langs/pt_PT/errors.lang (100%)
 rename {public => htdocs}/langs/pt_PT/exports.lang (100%)
 rename {public => htdocs}/langs/pt_PT/externalsite.lang (100%)
 rename {public => htdocs}/langs/pt_PT/ftp.lang (100%)
 rename {public => htdocs}/langs/pt_PT/help.lang (100%)
 rename {public => htdocs}/langs/pt_PT/holiday.lang (100%)
 rename {public => htdocs}/langs/pt_PT/hrm.lang (100%)
 rename {public => htdocs}/langs/pt_PT/incoterm.lang (100%)
 rename {public => htdocs}/langs/pt_PT/install.lang (100%)
 rename {public => htdocs}/langs/pt_PT/interventions.lang (100%)
 rename {public => htdocs}/langs/pt_PT/languages.lang (100%)
 rename {public => htdocs}/langs/pt_PT/ldap.lang (100%)
 rename {public => htdocs}/langs/pt_PT/link.lang (100%)
 rename {public => htdocs}/langs/pt_PT/loan.lang (100%)
 rename {public => htdocs}/langs/pt_PT/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/pt_PT/mails.lang (100%)
 rename {public => htdocs}/langs/pt_PT/main.lang (100%)
 rename {public => htdocs}/langs/pt_PT/margins.lang (100%)
 rename {public => htdocs}/langs/pt_PT/members.lang (100%)
 rename {public => htdocs}/langs/pt_PT/oauth.lang (100%)
 rename {public => htdocs}/langs/pt_PT/opensurvey.lang (100%)
 rename {public => htdocs}/langs/pt_PT/orders.lang (100%)
 rename {public => htdocs}/langs/pt_PT/other.lang (100%)
 rename {public => htdocs}/langs/pt_PT/paybox.lang (100%)
 rename {public => htdocs}/langs/pt_PT/paypal.lang (100%)
 rename {public => htdocs}/langs/pt_PT/printing.lang (100%)
 rename {public => htdocs}/langs/pt_PT/productbatch.lang (100%)
 rename {public => htdocs}/langs/pt_PT/products.lang (100%)
 rename {public => htdocs}/langs/pt_PT/projects.lang (100%)
 rename {public => htdocs}/langs/pt_PT/propal.lang (100%)
 rename {public => htdocs}/langs/pt_PT/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/pt_PT/resource.lang (100%)
 rename {public => htdocs}/langs/pt_PT/salaries.lang (100%)
 rename {public => htdocs}/langs/pt_PT/sendings.lang (100%)
 rename {public => htdocs}/langs/pt_PT/sms.lang (100%)
 rename {public => htdocs}/langs/pt_PT/stocks.lang (100%)
 rename {public => htdocs}/langs/pt_PT/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/pt_PT/suppliers.lang (100%)
 rename {public => htdocs}/langs/pt_PT/trips.lang (100%)
 rename {public => htdocs}/langs/pt_PT/users.lang (100%)
 rename {public => htdocs}/langs/pt_PT/website.lang (100%)
 rename {public => htdocs}/langs/pt_PT/withdrawals.lang (100%)
 rename {public => htdocs}/langs/pt_PT/workflow.lang (100%)
 rename {public => htdocs}/langs/ro_RO/accountancy.lang (100%)
 rename {public => htdocs}/langs/ro_RO/admin.lang (100%)
 rename {public => htdocs}/langs/ro_RO/agenda.lang (100%)
 rename {public => htdocs}/langs/ro_RO/banks.lang (100%)
 rename {public => htdocs}/langs/ro_RO/bills.lang (100%)
 rename {public => htdocs}/langs/ro_RO/bookmarks.lang (100%)
 rename {public => htdocs}/langs/ro_RO/boxes.lang (100%)
 rename {public => htdocs}/langs/ro_RO/cashdesk.lang (100%)
 rename {public => htdocs}/langs/ro_RO/categories.lang (100%)
 rename {public => htdocs}/langs/ro_RO/commercial.lang (100%)
 rename {public => htdocs}/langs/ro_RO/companies.lang (100%)
 rename {public => htdocs}/langs/ro_RO/compta.lang (100%)
 rename {public => htdocs}/langs/ro_RO/contracts.lang (100%)
 rename {public => htdocs}/langs/ro_RO/cron.lang (100%)
 rename {public => htdocs}/langs/ro_RO/deliveries.lang (100%)
 rename {public => htdocs}/langs/ro_RO/dict.lang (100%)
 rename {public => htdocs}/langs/ro_RO/donations.lang (100%)
 rename {public => htdocs}/langs/ro_RO/ecm.lang (100%)
 rename {public => htdocs}/langs/ro_RO/errors.lang (100%)
 rename {public => htdocs}/langs/ro_RO/exports.lang (100%)
 rename {public => htdocs}/langs/ro_RO/externalsite.lang (100%)
 rename {public => htdocs}/langs/ro_RO/ftp.lang (100%)
 rename {public => htdocs}/langs/ro_RO/help.lang (100%)
 rename {public => htdocs}/langs/ro_RO/holiday.lang (100%)
 rename {public => htdocs}/langs/ro_RO/hrm.lang (100%)
 rename {public => htdocs}/langs/ro_RO/incoterm.lang (100%)
 rename {public => htdocs}/langs/ro_RO/install.lang (100%)
 rename {public => htdocs}/langs/ro_RO/interventions.lang (100%)
 rename {public => htdocs}/langs/ro_RO/languages.lang (100%)
 rename {public => htdocs}/langs/ro_RO/ldap.lang (100%)
 rename {public => htdocs}/langs/ro_RO/link.lang (100%)
 rename {public => htdocs}/langs/ro_RO/loan.lang (100%)
 rename {public => htdocs}/langs/ro_RO/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/ro_RO/mails.lang (100%)
 rename {public => htdocs}/langs/ro_RO/main.lang (100%)
 rename {public => htdocs}/langs/ro_RO/margins.lang (100%)
 rename {public => htdocs}/langs/ro_RO/members.lang (100%)
 rename {public => htdocs}/langs/ro_RO/oauth.lang (100%)
 rename {public => htdocs}/langs/ro_RO/opensurvey.lang (100%)
 rename {public => htdocs}/langs/ro_RO/orders.lang (100%)
 rename {public => htdocs}/langs/ro_RO/other.lang (100%)
 rename {public => htdocs}/langs/ro_RO/paybox.lang (100%)
 rename {public => htdocs}/langs/ro_RO/paypal.lang (100%)
 rename {public => htdocs}/langs/ro_RO/printing.lang (100%)
 rename {public => htdocs}/langs/ro_RO/productbatch.lang (100%)
 rename {public => htdocs}/langs/ro_RO/products.lang (100%)
 rename {public => htdocs}/langs/ro_RO/projects.lang (100%)
 rename {public => htdocs}/langs/ro_RO/propal.lang (100%)
 rename {public => htdocs}/langs/ro_RO/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/ro_RO/resource.lang (100%)
 rename {public => htdocs}/langs/ro_RO/salaries.lang (100%)
 rename {public => htdocs}/langs/ro_RO/sendings.lang (100%)
 rename {public => htdocs}/langs/ro_RO/sms.lang (100%)
 rename {public => htdocs}/langs/ro_RO/stocks.lang (100%)
 rename {public => htdocs}/langs/ro_RO/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/ro_RO/suppliers.lang (100%)
 rename {public => htdocs}/langs/ro_RO/trips.lang (100%)
 rename {public => htdocs}/langs/ro_RO/users.lang (100%)
 rename {public => htdocs}/langs/ro_RO/website.lang (100%)
 rename {public => htdocs}/langs/ro_RO/withdrawals.lang (100%)
 rename {public => htdocs}/langs/ro_RO/workflow.lang (100%)
 rename {public => htdocs}/langs/ru_RU/accountancy.lang (100%)
 rename {public => htdocs}/langs/ru_RU/admin.lang (100%)
 rename {public => htdocs}/langs/ru_RU/agenda.lang (100%)
 rename {public => htdocs}/langs/ru_RU/banks.lang (100%)
 rename {public => htdocs}/langs/ru_RU/bills.lang (100%)
 rename {public => htdocs}/langs/ru_RU/bookmarks.lang (100%)
 rename {public => htdocs}/langs/ru_RU/boxes.lang (100%)
 rename {public => htdocs}/langs/ru_RU/cashdesk.lang (100%)
 rename {public => htdocs}/langs/ru_RU/categories.lang (100%)
 rename {public => htdocs}/langs/ru_RU/commercial.lang (100%)
 rename {public => htdocs}/langs/ru_RU/companies.lang (100%)
 rename {public => htdocs}/langs/ru_RU/compta.lang (100%)
 rename {public => htdocs}/langs/ru_RU/contracts.lang (100%)
 rename {public => htdocs}/langs/ru_RU/cron.lang (100%)
 rename {public => htdocs}/langs/ru_RU/deliveries.lang (100%)
 rename {public => htdocs}/langs/ru_RU/dict.lang (100%)
 rename {public => htdocs}/langs/ru_RU/donations.lang (100%)
 rename {public => htdocs}/langs/ru_RU/ecm.lang (100%)
 rename {public => htdocs}/langs/ru_RU/errors.lang (100%)
 rename {public => htdocs}/langs/ru_RU/exports.lang (100%)
 rename {public => htdocs}/langs/ru_RU/externalsite.lang (100%)
 rename {public => htdocs}/langs/ru_RU/ftp.lang (100%)
 rename {public => htdocs}/langs/ru_RU/help.lang (100%)
 rename {public => htdocs}/langs/ru_RU/holiday.lang (100%)
 rename {public => htdocs}/langs/ru_RU/hrm.lang (100%)
 rename {public => htdocs}/langs/ru_RU/incoterm.lang (100%)
 rename {public => htdocs}/langs/ru_RU/install.lang (100%)
 rename {public => htdocs}/langs/ru_RU/interventions.lang (100%)
 rename {public => htdocs}/langs/ru_RU/languages.lang (100%)
 rename {public => htdocs}/langs/ru_RU/ldap.lang (100%)
 rename {public => htdocs}/langs/ru_RU/link.lang (100%)
 rename {public => htdocs}/langs/ru_RU/loan.lang (100%)
 rename {public => htdocs}/langs/ru_RU/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/ru_RU/mails.lang (100%)
 rename {public => htdocs}/langs/ru_RU/main.lang (100%)
 rename {public => htdocs}/langs/ru_RU/margins.lang (100%)
 rename {public => htdocs}/langs/ru_RU/members.lang (100%)
 rename {public => htdocs}/langs/ru_RU/oauth.lang (100%)
 rename {public => htdocs}/langs/ru_RU/opensurvey.lang (100%)
 rename {public => htdocs}/langs/ru_RU/orders.lang (100%)
 rename {public => htdocs}/langs/ru_RU/other.lang (100%)
 rename {public => htdocs}/langs/ru_RU/paybox.lang (100%)
 rename {public => htdocs}/langs/ru_RU/paypal.lang (100%)
 rename {public => htdocs}/langs/ru_RU/printing.lang (100%)
 rename {public => htdocs}/langs/ru_RU/productbatch.lang (100%)
 rename {public => htdocs}/langs/ru_RU/products.lang (100%)
 rename {public => htdocs}/langs/ru_RU/projects.lang (100%)
 rename {public => htdocs}/langs/ru_RU/propal.lang (100%)
 rename {public => htdocs}/langs/ru_RU/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/ru_RU/resource.lang (100%)
 rename {public => htdocs}/langs/ru_RU/salaries.lang (100%)
 rename {public => htdocs}/langs/ru_RU/sendings.lang (100%)
 rename {public => htdocs}/langs/ru_RU/sms.lang (100%)
 rename {public => htdocs}/langs/ru_RU/stocks.lang (100%)
 rename {public => htdocs}/langs/ru_RU/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/ru_RU/suppliers.lang (100%)
 rename {public => htdocs}/langs/ru_RU/trips.lang (100%)
 rename {public => htdocs}/langs/ru_RU/users.lang (100%)
 rename {public => htdocs}/langs/ru_RU/website.lang (100%)
 rename {public => htdocs}/langs/ru_RU/withdrawals.lang (100%)
 rename {public => htdocs}/langs/ru_RU/workflow.lang (100%)
 rename {public => htdocs}/langs/ru_UA/banks.lang (100%)
 rename {public => htdocs}/langs/ru_UA/bookmarks.lang (100%)
 rename {public => htdocs}/langs/ru_UA/compta.lang (100%)
 rename {public => htdocs}/langs/ru_UA/contracts.lang (100%)
 rename {public => htdocs}/langs/ru_UA/dict.lang (100%)
 rename {public => htdocs}/langs/ru_UA/ecm.lang (100%)
 rename {public => htdocs}/langs/ru_UA/errors.lang (100%)
 rename {public => htdocs}/langs/ru_UA/ftp.lang (100%)
 rename {public => htdocs}/langs/ru_UA/install.lang (100%)
 rename {public => htdocs}/langs/ru_UA/interventions.lang (100%)
 rename {public => htdocs}/langs/ru_UA/mails.lang (100%)
 rename {public => htdocs}/langs/ru_UA/main.lang (100%)
 rename {public => htdocs}/langs/ru_UA/other.lang (100%)
 rename {public => htdocs}/langs/ru_UA/paybox.lang (100%)
 rename {public => htdocs}/langs/ru_UA/paypal.lang (100%)
 rename {public => htdocs}/langs/sk_SK/accountancy.lang (100%)
 rename {public => htdocs}/langs/sk_SK/admin.lang (100%)
 rename {public => htdocs}/langs/sk_SK/agenda.lang (100%)
 rename {public => htdocs}/langs/sk_SK/banks.lang (100%)
 rename {public => htdocs}/langs/sk_SK/bills.lang (100%)
 rename {public => htdocs}/langs/sk_SK/bookmarks.lang (100%)
 rename {public => htdocs}/langs/sk_SK/boxes.lang (100%)
 rename {public => htdocs}/langs/sk_SK/cashdesk.lang (100%)
 rename {public => htdocs}/langs/sk_SK/categories.lang (100%)
 rename {public => htdocs}/langs/sk_SK/commercial.lang (100%)
 rename {public => htdocs}/langs/sk_SK/companies.lang (100%)
 rename {public => htdocs}/langs/sk_SK/compta.lang (100%)
 rename {public => htdocs}/langs/sk_SK/contracts.lang (100%)
 rename {public => htdocs}/langs/sk_SK/cron.lang (100%)
 rename {public => htdocs}/langs/sk_SK/deliveries.lang (100%)
 rename {public => htdocs}/langs/sk_SK/dict.lang (100%)
 rename {public => htdocs}/langs/sk_SK/donations.lang (100%)
 rename {public => htdocs}/langs/sk_SK/ecm.lang (100%)
 rename {public => htdocs}/langs/sk_SK/errors.lang (100%)
 rename {public => htdocs}/langs/sk_SK/exports.lang (100%)
 rename {public => htdocs}/langs/sk_SK/externalsite.lang (100%)
 rename {public => htdocs}/langs/sk_SK/ftp.lang (100%)
 rename {public => htdocs}/langs/sk_SK/help.lang (100%)
 rename {public => htdocs}/langs/sk_SK/holiday.lang (100%)
 rename {public => htdocs}/langs/sk_SK/hrm.lang (100%)
 rename {public => htdocs}/langs/sk_SK/incoterm.lang (100%)
 rename {public => htdocs}/langs/sk_SK/install.lang (100%)
 rename {public => htdocs}/langs/sk_SK/interventions.lang (100%)
 rename {public => htdocs}/langs/sk_SK/languages.lang (100%)
 rename {public => htdocs}/langs/sk_SK/ldap.lang (100%)
 rename {public => htdocs}/langs/sk_SK/link.lang (100%)
 rename {public => htdocs}/langs/sk_SK/loan.lang (100%)
 rename {public => htdocs}/langs/sk_SK/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/sk_SK/mails.lang (100%)
 rename {public => htdocs}/langs/sk_SK/main.lang (100%)
 rename {public => htdocs}/langs/sk_SK/margins.lang (100%)
 rename {public => htdocs}/langs/sk_SK/members.lang (100%)
 rename {public => htdocs}/langs/sk_SK/oauth.lang (100%)
 rename {public => htdocs}/langs/sk_SK/opensurvey.lang (100%)
 rename {public => htdocs}/langs/sk_SK/orders.lang (100%)
 rename {public => htdocs}/langs/sk_SK/other.lang (100%)
 rename {public => htdocs}/langs/sk_SK/paybox.lang (100%)
 rename {public => htdocs}/langs/sk_SK/paypal.lang (100%)
 rename {public => htdocs}/langs/sk_SK/printing.lang (100%)
 rename {public => htdocs}/langs/sk_SK/productbatch.lang (100%)
 rename {public => htdocs}/langs/sk_SK/products.lang (100%)
 rename {public => htdocs}/langs/sk_SK/projects.lang (100%)
 rename {public => htdocs}/langs/sk_SK/propal.lang (100%)
 rename {public => htdocs}/langs/sk_SK/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/sk_SK/resource.lang (100%)
 rename {public => htdocs}/langs/sk_SK/salaries.lang (100%)
 rename {public => htdocs}/langs/sk_SK/sendings.lang (100%)
 rename {public => htdocs}/langs/sk_SK/sms.lang (100%)
 rename {public => htdocs}/langs/sk_SK/stocks.lang (100%)
 rename {public => htdocs}/langs/sk_SK/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/sk_SK/suppliers.lang (100%)
 rename {public => htdocs}/langs/sk_SK/trips.lang (100%)
 rename {public => htdocs}/langs/sk_SK/users.lang (100%)
 rename {public => htdocs}/langs/sk_SK/website.lang (100%)
 rename {public => htdocs}/langs/sk_SK/withdrawals.lang (100%)
 rename {public => htdocs}/langs/sk_SK/workflow.lang (100%)
 rename {public => htdocs}/langs/sl_SI/accountancy.lang (100%)
 rename {public => htdocs}/langs/sl_SI/admin.lang (100%)
 rename {public => htdocs}/langs/sl_SI/agenda.lang (100%)
 rename {public => htdocs}/langs/sl_SI/banks.lang (100%)
 rename {public => htdocs}/langs/sl_SI/bills.lang (100%)
 rename {public => htdocs}/langs/sl_SI/bookmarks.lang (100%)
 rename {public => htdocs}/langs/sl_SI/boxes.lang (100%)
 rename {public => htdocs}/langs/sl_SI/cashdesk.lang (100%)
 rename {public => htdocs}/langs/sl_SI/categories.lang (100%)
 rename {public => htdocs}/langs/sl_SI/commercial.lang (100%)
 rename {public => htdocs}/langs/sl_SI/companies.lang (100%)
 rename {public => htdocs}/langs/sl_SI/compta.lang (100%)
 rename {public => htdocs}/langs/sl_SI/contracts.lang (100%)
 rename {public => htdocs}/langs/sl_SI/cron.lang (100%)
 rename {public => htdocs}/langs/sl_SI/deliveries.lang (100%)
 rename {public => htdocs}/langs/sl_SI/dict.lang (100%)
 rename {public => htdocs}/langs/sl_SI/donations.lang (100%)
 rename {public => htdocs}/langs/sl_SI/ecm.lang (100%)
 rename {public => htdocs}/langs/sl_SI/errors.lang (100%)
 rename {public => htdocs}/langs/sl_SI/exports.lang (100%)
 rename {public => htdocs}/langs/sl_SI/externalsite.lang (100%)
 rename {public => htdocs}/langs/sl_SI/ftp.lang (100%)
 rename {public => htdocs}/langs/sl_SI/help.lang (100%)
 rename {public => htdocs}/langs/sl_SI/holiday.lang (100%)
 rename {public => htdocs}/langs/sl_SI/hrm.lang (100%)
 rename {public => htdocs}/langs/sl_SI/incoterm.lang (100%)
 rename {public => htdocs}/langs/sl_SI/install.lang (100%)
 rename {public => htdocs}/langs/sl_SI/interventions.lang (100%)
 rename {public => htdocs}/langs/sl_SI/languages.lang (100%)
 rename {public => htdocs}/langs/sl_SI/ldap.lang (100%)
 rename {public => htdocs}/langs/sl_SI/link.lang (100%)
 rename {public => htdocs}/langs/sl_SI/loan.lang (100%)
 rename {public => htdocs}/langs/sl_SI/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/sl_SI/mails.lang (100%)
 rename {public => htdocs}/langs/sl_SI/main.lang (100%)
 rename {public => htdocs}/langs/sl_SI/margins.lang (100%)
 rename {public => htdocs}/langs/sl_SI/members.lang (100%)
 rename {public => htdocs}/langs/sl_SI/oauth.lang (100%)
 rename {public => htdocs}/langs/sl_SI/opensurvey.lang (100%)
 rename {public => htdocs}/langs/sl_SI/orders.lang (100%)
 rename {public => htdocs}/langs/sl_SI/other.lang (100%)
 rename {public => htdocs}/langs/sl_SI/paybox.lang (100%)
 rename {public => htdocs}/langs/sl_SI/paypal.lang (100%)
 rename {public => htdocs}/langs/sl_SI/printing.lang (100%)
 rename {public => htdocs}/langs/sl_SI/productbatch.lang (100%)
 rename {public => htdocs}/langs/sl_SI/products.lang (100%)
 rename {public => htdocs}/langs/sl_SI/projects.lang (100%)
 rename {public => htdocs}/langs/sl_SI/propal.lang (100%)
 rename {public => htdocs}/langs/sl_SI/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/sl_SI/resource.lang (100%)
 rename {public => htdocs}/langs/sl_SI/salaries.lang (100%)
 rename {public => htdocs}/langs/sl_SI/sendings.lang (100%)
 rename {public => htdocs}/langs/sl_SI/sms.lang (100%)
 rename {public => htdocs}/langs/sl_SI/stocks.lang (100%)
 rename {public => htdocs}/langs/sl_SI/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/sl_SI/suppliers.lang (100%)
 rename {public => htdocs}/langs/sl_SI/trips.lang (100%)
 rename {public => htdocs}/langs/sl_SI/users.lang (100%)
 rename {public => htdocs}/langs/sl_SI/website.lang (100%)
 rename {public => htdocs}/langs/sl_SI/withdrawals.lang (100%)
 rename {public => htdocs}/langs/sl_SI/workflow.lang (100%)
 rename {public => htdocs}/langs/sq_AL/accountancy.lang (100%)
 rename {public => htdocs}/langs/sq_AL/admin.lang (100%)
 rename {public => htdocs}/langs/sq_AL/agenda.lang (100%)
 rename {public => htdocs}/langs/sq_AL/banks.lang (100%)
 rename {public => htdocs}/langs/sq_AL/bills.lang (100%)
 rename {public => htdocs}/langs/sq_AL/bookmarks.lang (100%)
 rename {public => htdocs}/langs/sq_AL/boxes.lang (100%)
 rename {public => htdocs}/langs/sq_AL/cashdesk.lang (100%)
 rename {public => htdocs}/langs/sq_AL/categories.lang (100%)
 rename {public => htdocs}/langs/sq_AL/commercial.lang (100%)
 rename {public => htdocs}/langs/sq_AL/companies.lang (100%)
 rename {public => htdocs}/langs/sq_AL/compta.lang (100%)
 rename {public => htdocs}/langs/sq_AL/contracts.lang (100%)
 rename {public => htdocs}/langs/sq_AL/cron.lang (100%)
 rename {public => htdocs}/langs/sq_AL/deliveries.lang (100%)
 rename {public => htdocs}/langs/sq_AL/dict.lang (100%)
 rename {public => htdocs}/langs/sq_AL/donations.lang (100%)
 rename {public => htdocs}/langs/sq_AL/ecm.lang (100%)
 rename {public => htdocs}/langs/sq_AL/errors.lang (100%)
 rename {public => htdocs}/langs/sq_AL/exports.lang (100%)
 rename {public => htdocs}/langs/sq_AL/externalsite.lang (100%)
 rename {public => htdocs}/langs/sq_AL/ftp.lang (100%)
 rename {public => htdocs}/langs/sq_AL/help.lang (100%)
 rename {public => htdocs}/langs/sq_AL/holiday.lang (100%)
 rename {public => htdocs}/langs/sq_AL/hrm.lang (100%)
 rename {public => htdocs}/langs/sq_AL/incoterm.lang (100%)
 rename {public => htdocs}/langs/sq_AL/install.lang (100%)
 rename {public => htdocs}/langs/sq_AL/interventions.lang (100%)
 rename {public => htdocs}/langs/sq_AL/languages.lang (100%)
 rename {public => htdocs}/langs/sq_AL/ldap.lang (100%)
 rename {public => htdocs}/langs/sq_AL/link.lang (100%)
 rename {public => htdocs}/langs/sq_AL/loan.lang (100%)
 rename {public => htdocs}/langs/sq_AL/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/sq_AL/mails.lang (100%)
 rename {public => htdocs}/langs/sq_AL/main.lang (100%)
 rename {public => htdocs}/langs/sq_AL/margins.lang (100%)
 rename {public => htdocs}/langs/sq_AL/members.lang (100%)
 rename {public => htdocs}/langs/sq_AL/oauth.lang (100%)
 rename {public => htdocs}/langs/sq_AL/opensurvey.lang (100%)
 rename {public => htdocs}/langs/sq_AL/orders.lang (100%)
 rename {public => htdocs}/langs/sq_AL/other.lang (100%)
 rename {public => htdocs}/langs/sq_AL/paybox.lang (100%)
 rename {public => htdocs}/langs/sq_AL/paypal.lang (100%)
 rename {public => htdocs}/langs/sq_AL/printing.lang (100%)
 rename {public => htdocs}/langs/sq_AL/productbatch.lang (100%)
 rename {public => htdocs}/langs/sq_AL/products.lang (100%)
 rename {public => htdocs}/langs/sq_AL/projects.lang (100%)
 rename {public => htdocs}/langs/sq_AL/propal.lang (100%)
 rename {public => htdocs}/langs/sq_AL/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/sq_AL/resource.lang (100%)
 rename {public => htdocs}/langs/sq_AL/salaries.lang (100%)
 rename {public => htdocs}/langs/sq_AL/sendings.lang (100%)
 rename {public => htdocs}/langs/sq_AL/sms.lang (100%)
 rename {public => htdocs}/langs/sq_AL/stocks.lang (100%)
 rename {public => htdocs}/langs/sq_AL/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/sq_AL/suppliers.lang (100%)
 rename {public => htdocs}/langs/sq_AL/trips.lang (100%)
 rename {public => htdocs}/langs/sq_AL/users.lang (100%)
 rename {public => htdocs}/langs/sq_AL/website.lang (100%)
 rename {public => htdocs}/langs/sq_AL/withdrawals.lang (100%)
 rename {public => htdocs}/langs/sq_AL/workflow.lang (100%)
 rename {public => htdocs}/langs/sr_RS/accountancy.lang (100%)
 rename {public => htdocs}/langs/sr_RS/admin.lang (100%)
 rename {public => htdocs}/langs/sr_RS/agenda.lang (100%)
 rename {public => htdocs}/langs/sr_RS/banks.lang (100%)
 rename {public => htdocs}/langs/sr_RS/bills.lang (100%)
 rename {public => htdocs}/langs/sr_RS/bookmarks.lang (100%)
 rename {public => htdocs}/langs/sr_RS/boxes.lang (100%)
 rename {public => htdocs}/langs/sr_RS/cashdesk.lang (100%)
 rename {public => htdocs}/langs/sr_RS/categories.lang (100%)
 rename {public => htdocs}/langs/sr_RS/commercial.lang (100%)
 rename {public => htdocs}/langs/sr_RS/companies.lang (100%)
 rename {public => htdocs}/langs/sr_RS/compta.lang (100%)
 rename {public => htdocs}/langs/sr_RS/contracts.lang (100%)
 rename {public => htdocs}/langs/sr_RS/cron.lang (100%)
 rename {public => htdocs}/langs/sr_RS/deliveries.lang (100%)
 rename {public => htdocs}/langs/sr_RS/dict.lang (100%)
 rename {public => htdocs}/langs/sr_RS/donations.lang (100%)
 rename {public => htdocs}/langs/sr_RS/ecm.lang (100%)
 rename {public => htdocs}/langs/sr_RS/errors.lang (100%)
 rename {public => htdocs}/langs/sr_RS/exports.lang (100%)
 rename {public => htdocs}/langs/sr_RS/externalsite.lang (100%)
 rename {public => htdocs}/langs/sr_RS/ftp.lang (100%)
 rename {public => htdocs}/langs/sr_RS/help.lang (100%)
 rename {public => htdocs}/langs/sr_RS/holiday.lang (100%)
 rename {public => htdocs}/langs/sr_RS/incoterm.lang (100%)
 rename {public => htdocs}/langs/sr_RS/install.lang (100%)
 rename {public => htdocs}/langs/sr_RS/interventions.lang (100%)
 rename {public => htdocs}/langs/sr_RS/languages.lang (100%)
 rename {public => htdocs}/langs/sr_RS/ldap.lang (100%)
 rename {public => htdocs}/langs/sr_RS/link.lang (100%)
 rename {public => htdocs}/langs/sr_RS/loan.lang (100%)
 rename {public => htdocs}/langs/sr_RS/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/sr_RS/mails.lang (100%)
 rename {public => htdocs}/langs/sr_RS/main.lang (100%)
 rename {public => htdocs}/langs/sr_RS/margins.lang (100%)
 rename {public => htdocs}/langs/sr_RS/members.lang (100%)
 rename {public => htdocs}/langs/sr_RS/opensurvey.lang (100%)
 rename {public => htdocs}/langs/sr_RS/orders.lang (100%)
 rename {public => htdocs}/langs/sr_RS/other.lang (100%)
 rename {public => htdocs}/langs/sr_RS/paybox.lang (100%)
 rename {public => htdocs}/langs/sr_RS/paypal.lang (100%)
 rename {public => htdocs}/langs/sr_RS/printing.lang (100%)
 rename {public => htdocs}/langs/sr_RS/productbatch.lang (100%)
 rename {public => htdocs}/langs/sr_RS/products.lang (100%)
 rename {public => htdocs}/langs/sr_RS/projects.lang (100%)
 rename {public => htdocs}/langs/sr_RS/propal.lang (100%)
 rename {public => htdocs}/langs/sr_RS/resource.lang (100%)
 rename {public => htdocs}/langs/sr_RS/salaries.lang (100%)
 rename {public => htdocs}/langs/sr_RS/sendings.lang (100%)
 rename {public => htdocs}/langs/sr_RS/sms.lang (100%)
 rename {public => htdocs}/langs/sr_RS/stocks.lang (100%)
 rename {public => htdocs}/langs/sr_RS/suppliers.lang (100%)
 rename {public => htdocs}/langs/sr_RS/trips.lang (100%)
 rename {public => htdocs}/langs/sr_RS/users.lang (100%)
 rename {public => htdocs}/langs/sr_RS/withdrawals.lang (100%)
 rename {public => htdocs}/langs/sr_RS/workflow.lang (100%)
 rename {public => htdocs}/langs/sv_SE/accountancy.lang (100%)
 rename {public => htdocs}/langs/sv_SE/admin.lang (100%)
 rename {public => htdocs}/langs/sv_SE/agenda.lang (100%)
 rename {public => htdocs}/langs/sv_SE/banks.lang (100%)
 rename {public => htdocs}/langs/sv_SE/bills.lang (100%)
 rename {public => htdocs}/langs/sv_SE/bookmarks.lang (100%)
 rename {public => htdocs}/langs/sv_SE/boxes.lang (100%)
 rename {public => htdocs}/langs/sv_SE/cashdesk.lang (100%)
 rename {public => htdocs}/langs/sv_SE/categories.lang (100%)
 rename {public => htdocs}/langs/sv_SE/commercial.lang (100%)
 rename {public => htdocs}/langs/sv_SE/companies.lang (100%)
 rename {public => htdocs}/langs/sv_SE/compta.lang (100%)
 rename {public => htdocs}/langs/sv_SE/contracts.lang (100%)
 rename {public => htdocs}/langs/sv_SE/cron.lang (100%)
 rename {public => htdocs}/langs/sv_SE/deliveries.lang (100%)
 rename {public => htdocs}/langs/sv_SE/dict.lang (100%)
 rename {public => htdocs}/langs/sv_SE/donations.lang (100%)
 rename {public => htdocs}/langs/sv_SE/ecm.lang (100%)
 rename {public => htdocs}/langs/sv_SE/errors.lang (100%)
 rename {public => htdocs}/langs/sv_SE/exports.lang (100%)
 rename {public => htdocs}/langs/sv_SE/externalsite.lang (100%)
 rename {public => htdocs}/langs/sv_SE/ftp.lang (100%)
 rename {public => htdocs}/langs/sv_SE/help.lang (100%)
 rename {public => htdocs}/langs/sv_SE/holiday.lang (100%)
 rename {public => htdocs}/langs/sv_SE/hrm.lang (100%)
 rename {public => htdocs}/langs/sv_SE/incoterm.lang (100%)
 rename {public => htdocs}/langs/sv_SE/install.lang (100%)
 rename {public => htdocs}/langs/sv_SE/interventions.lang (100%)
 rename {public => htdocs}/langs/sv_SE/languages.lang (100%)
 rename {public => htdocs}/langs/sv_SE/ldap.lang (100%)
 rename {public => htdocs}/langs/sv_SE/link.lang (100%)
 rename {public => htdocs}/langs/sv_SE/loan.lang (100%)
 rename {public => htdocs}/langs/sv_SE/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/sv_SE/mails.lang (100%)
 rename {public => htdocs}/langs/sv_SE/main.lang (100%)
 rename {public => htdocs}/langs/sv_SE/margins.lang (100%)
 rename {public => htdocs}/langs/sv_SE/members.lang (100%)
 rename {public => htdocs}/langs/sv_SE/oauth.lang (100%)
 rename {public => htdocs}/langs/sv_SE/opensurvey.lang (100%)
 rename {public => htdocs}/langs/sv_SE/orders.lang (100%)
 rename {public => htdocs}/langs/sv_SE/other.lang (100%)
 rename {public => htdocs}/langs/sv_SE/paybox.lang (100%)
 rename {public => htdocs}/langs/sv_SE/paypal.lang (100%)
 rename {public => htdocs}/langs/sv_SE/printing.lang (100%)
 rename {public => htdocs}/langs/sv_SE/productbatch.lang (100%)
 rename {public => htdocs}/langs/sv_SE/products.lang (100%)
 rename {public => htdocs}/langs/sv_SE/projects.lang (100%)
 rename {public => htdocs}/langs/sv_SE/propal.lang (100%)
 rename {public => htdocs}/langs/sv_SE/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/sv_SE/resource.lang (100%)
 rename {public => htdocs}/langs/sv_SE/salaries.lang (100%)
 rename {public => htdocs}/langs/sv_SE/sendings.lang (100%)
 rename {public => htdocs}/langs/sv_SE/sms.lang (100%)
 rename {public => htdocs}/langs/sv_SE/stocks.lang (100%)
 rename {public => htdocs}/langs/sv_SE/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/sv_SE/suppliers.lang (100%)
 rename {public => htdocs}/langs/sv_SE/trips.lang (100%)
 rename {public => htdocs}/langs/sv_SE/users.lang (100%)
 rename {public => htdocs}/langs/sv_SE/website.lang (100%)
 rename {public => htdocs}/langs/sv_SE/withdrawals.lang (100%)
 rename {public => htdocs}/langs/sv_SE/workflow.lang (100%)
 rename {public => htdocs}/langs/sw_SW/accountancy.lang (100%)
 rename {public => htdocs}/langs/sw_SW/admin.lang (100%)
 rename {public => htdocs}/langs/sw_SW/agenda.lang (100%)
 rename {public => htdocs}/langs/sw_SW/banks.lang (100%)
 rename {public => htdocs}/langs/sw_SW/bills.lang (100%)
 rename {public => htdocs}/langs/sw_SW/bookmarks.lang (100%)
 rename {public => htdocs}/langs/sw_SW/boxes.lang (100%)
 rename {public => htdocs}/langs/sw_SW/cashdesk.lang (100%)
 rename {public => htdocs}/langs/sw_SW/categories.lang (100%)
 rename {public => htdocs}/langs/sw_SW/commercial.lang (100%)
 rename {public => htdocs}/langs/sw_SW/companies.lang (100%)
 rename {public => htdocs}/langs/sw_SW/compta.lang (100%)
 rename {public => htdocs}/langs/sw_SW/contracts.lang (100%)
 rename {public => htdocs}/langs/sw_SW/cron.lang (100%)
 rename {public => htdocs}/langs/sw_SW/deliveries.lang (100%)
 rename {public => htdocs}/langs/sw_SW/dict.lang (100%)
 rename {public => htdocs}/langs/sw_SW/donations.lang (100%)
 rename {public => htdocs}/langs/sw_SW/ecm.lang (100%)
 rename {public => htdocs}/langs/sw_SW/errors.lang (100%)
 rename {public => htdocs}/langs/sw_SW/exports.lang (100%)
 rename {public => htdocs}/langs/sw_SW/externalsite.lang (100%)
 rename {public => htdocs}/langs/sw_SW/ftp.lang (100%)
 rename {public => htdocs}/langs/sw_SW/help.lang (100%)
 rename {public => htdocs}/langs/sw_SW/holiday.lang (100%)
 rename {public => htdocs}/langs/sw_SW/incoterm.lang (100%)
 rename {public => htdocs}/langs/sw_SW/install.lang (100%)
 rename {public => htdocs}/langs/sw_SW/interventions.lang (100%)
 rename {public => htdocs}/langs/sw_SW/languages.lang (100%)
 rename {public => htdocs}/langs/sw_SW/ldap.lang (100%)
 rename {public => htdocs}/langs/sw_SW/link.lang (100%)
 rename {public => htdocs}/langs/sw_SW/loan.lang (100%)
 rename {public => htdocs}/langs/sw_SW/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/sw_SW/mails.lang (100%)
 rename {public => htdocs}/langs/sw_SW/main.lang (100%)
 rename {public => htdocs}/langs/sw_SW/margins.lang (100%)
 rename {public => htdocs}/langs/sw_SW/members.lang (100%)
 rename {public => htdocs}/langs/sw_SW/opensurvey.lang (100%)
 rename {public => htdocs}/langs/sw_SW/orders.lang (100%)
 rename {public => htdocs}/langs/sw_SW/other.lang (100%)
 rename {public => htdocs}/langs/sw_SW/paybox.lang (100%)
 rename {public => htdocs}/langs/sw_SW/paypal.lang (100%)
 rename {public => htdocs}/langs/sw_SW/printing.lang (100%)
 rename {public => htdocs}/langs/sw_SW/productbatch.lang (100%)
 rename {public => htdocs}/langs/sw_SW/products.lang (100%)
 rename {public => htdocs}/langs/sw_SW/projects.lang (100%)
 rename {public => htdocs}/langs/sw_SW/propal.lang (100%)
 rename {public => htdocs}/langs/sw_SW/resource.lang (100%)
 rename {public => htdocs}/langs/sw_SW/salaries.lang (100%)
 rename {public => htdocs}/langs/sw_SW/sendings.lang (100%)
 rename {public => htdocs}/langs/sw_SW/sms.lang (100%)
 rename {public => htdocs}/langs/sw_SW/stocks.lang (100%)
 rename {public => htdocs}/langs/sw_SW/suppliers.lang (100%)
 rename {public => htdocs}/langs/sw_SW/trips.lang (100%)
 rename {public => htdocs}/langs/sw_SW/users.lang (100%)
 rename {public => htdocs}/langs/sw_SW/withdrawals.lang (100%)
 rename {public => htdocs}/langs/sw_SW/workflow.lang (100%)
 rename {public => htdocs}/langs/th_TH/accountancy.lang (100%)
 rename {public => htdocs}/langs/th_TH/admin.lang (100%)
 rename {public => htdocs}/langs/th_TH/agenda.lang (100%)
 rename {public => htdocs}/langs/th_TH/banks.lang (100%)
 rename {public => htdocs}/langs/th_TH/bills.lang (100%)
 rename {public => htdocs}/langs/th_TH/bookmarks.lang (100%)
 rename {public => htdocs}/langs/th_TH/boxes.lang (100%)
 rename {public => htdocs}/langs/th_TH/cashdesk.lang (100%)
 rename {public => htdocs}/langs/th_TH/categories.lang (100%)
 rename {public => htdocs}/langs/th_TH/commercial.lang (100%)
 rename {public => htdocs}/langs/th_TH/companies.lang (100%)
 rename {public => htdocs}/langs/th_TH/compta.lang (100%)
 rename {public => htdocs}/langs/th_TH/contracts.lang (100%)
 rename {public => htdocs}/langs/th_TH/cron.lang (100%)
 rename {public => htdocs}/langs/th_TH/deliveries.lang (100%)
 rename {public => htdocs}/langs/th_TH/dict.lang (100%)
 rename {public => htdocs}/langs/th_TH/donations.lang (100%)
 rename {public => htdocs}/langs/th_TH/ecm.lang (100%)
 rename {public => htdocs}/langs/th_TH/errors.lang (100%)
 rename {public => htdocs}/langs/th_TH/exports.lang (100%)
 rename {public => htdocs}/langs/th_TH/externalsite.lang (100%)
 rename {public => htdocs}/langs/th_TH/ftp.lang (100%)
 rename {public => htdocs}/langs/th_TH/help.lang (100%)
 rename {public => htdocs}/langs/th_TH/holiday.lang (100%)
 rename {public => htdocs}/langs/th_TH/hrm.lang (100%)
 rename {public => htdocs}/langs/th_TH/incoterm.lang (100%)
 rename {public => htdocs}/langs/th_TH/install.lang (100%)
 rename {public => htdocs}/langs/th_TH/interventions.lang (100%)
 rename {public => htdocs}/langs/th_TH/languages.lang (100%)
 rename {public => htdocs}/langs/th_TH/ldap.lang (100%)
 rename {public => htdocs}/langs/th_TH/link.lang (100%)
 rename {public => htdocs}/langs/th_TH/loan.lang (100%)
 rename {public => htdocs}/langs/th_TH/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/th_TH/mails.lang (100%)
 rename {public => htdocs}/langs/th_TH/main.lang (100%)
 rename {public => htdocs}/langs/th_TH/margins.lang (100%)
 rename {public => htdocs}/langs/th_TH/members.lang (100%)
 rename {public => htdocs}/langs/th_TH/oauth.lang (100%)
 rename {public => htdocs}/langs/th_TH/opensurvey.lang (100%)
 rename {public => htdocs}/langs/th_TH/orders.lang (100%)
 rename {public => htdocs}/langs/th_TH/other.lang (100%)
 rename {public => htdocs}/langs/th_TH/paybox.lang (100%)
 rename {public => htdocs}/langs/th_TH/paypal.lang (100%)
 rename {public => htdocs}/langs/th_TH/printing.lang (100%)
 rename {public => htdocs}/langs/th_TH/productbatch.lang (100%)
 rename {public => htdocs}/langs/th_TH/products.lang (100%)
 rename {public => htdocs}/langs/th_TH/projects.lang (100%)
 rename {public => htdocs}/langs/th_TH/propal.lang (100%)
 rename {public => htdocs}/langs/th_TH/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/th_TH/resource.lang (100%)
 rename {public => htdocs}/langs/th_TH/salaries.lang (100%)
 rename {public => htdocs}/langs/th_TH/sendings.lang (100%)
 rename {public => htdocs}/langs/th_TH/sms.lang (100%)
 rename {public => htdocs}/langs/th_TH/stocks.lang (100%)
 rename {public => htdocs}/langs/th_TH/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/th_TH/suppliers.lang (100%)
 rename {public => htdocs}/langs/th_TH/trips.lang (100%)
 rename {public => htdocs}/langs/th_TH/users.lang (100%)
 rename {public => htdocs}/langs/th_TH/website.lang (100%)
 rename {public => htdocs}/langs/th_TH/withdrawals.lang (100%)
 rename {public => htdocs}/langs/th_TH/workflow.lang (100%)
 rename {public => htdocs}/langs/tr_TR/accountancy.lang (100%)
 rename {public => htdocs}/langs/tr_TR/admin.lang (100%)
 rename {public => htdocs}/langs/tr_TR/agenda.lang (100%)
 rename {public => htdocs}/langs/tr_TR/banks.lang (100%)
 rename {public => htdocs}/langs/tr_TR/bills.lang (100%)
 rename {public => htdocs}/langs/tr_TR/bookmarks.lang (100%)
 rename {public => htdocs}/langs/tr_TR/boxes.lang (100%)
 rename {public => htdocs}/langs/tr_TR/cashdesk.lang (100%)
 rename {public => htdocs}/langs/tr_TR/categories.lang (100%)
 rename {public => htdocs}/langs/tr_TR/commercial.lang (100%)
 rename {public => htdocs}/langs/tr_TR/commissions.lang (100%)
 rename {public => htdocs}/langs/tr_TR/companies.lang (100%)
 rename {public => htdocs}/langs/tr_TR/compta.lang (100%)
 rename {public => htdocs}/langs/tr_TR/contracts.lang (100%)
 rename {public => htdocs}/langs/tr_TR/cron.lang (100%)
 rename {public => htdocs}/langs/tr_TR/deliveries.lang (100%)
 rename {public => htdocs}/langs/tr_TR/dict.lang (100%)
 rename {public => htdocs}/langs/tr_TR/donations.lang (100%)
 rename {public => htdocs}/langs/tr_TR/ecm.lang (100%)
 rename {public => htdocs}/langs/tr_TR/errors.lang (100%)
 rename {public => htdocs}/langs/tr_TR/exports.lang (100%)
 rename {public => htdocs}/langs/tr_TR/externalsite.lang (100%)
 rename {public => htdocs}/langs/tr_TR/ftp.lang (100%)
 rename {public => htdocs}/langs/tr_TR/help.lang (100%)
 rename {public => htdocs}/langs/tr_TR/holiday.lang (100%)
 rename {public => htdocs}/langs/tr_TR/hrm.lang (100%)
 rename {public => htdocs}/langs/tr_TR/incoterm.lang (100%)
 rename {public => htdocs}/langs/tr_TR/install.lang (100%)
 rename {public => htdocs}/langs/tr_TR/interventions.lang (100%)
 rename {public => htdocs}/langs/tr_TR/languages.lang (100%)
 rename {public => htdocs}/langs/tr_TR/ldap.lang (100%)
 rename {public => htdocs}/langs/tr_TR/link.lang (100%)
 rename {public => htdocs}/langs/tr_TR/loan.lang (100%)
 rename {public => htdocs}/langs/tr_TR/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/tr_TR/mails.lang (100%)
 rename {public => htdocs}/langs/tr_TR/main.lang (100%)
 rename {public => htdocs}/langs/tr_TR/margins.lang (100%)
 rename {public => htdocs}/langs/tr_TR/members.lang (100%)
 rename {public => htdocs}/langs/tr_TR/oauth.lang (100%)
 rename {public => htdocs}/langs/tr_TR/opensurvey.lang (100%)
 rename {public => htdocs}/langs/tr_TR/orders.lang (100%)
 rename {public => htdocs}/langs/tr_TR/other.lang (100%)
 rename {public => htdocs}/langs/tr_TR/paybox.lang (100%)
 rename {public => htdocs}/langs/tr_TR/paypal.lang (100%)
 rename {public => htdocs}/langs/tr_TR/printing.lang (100%)
 rename {public => htdocs}/langs/tr_TR/productbatch.lang (100%)
 rename {public => htdocs}/langs/tr_TR/products.lang (100%)
 rename {public => htdocs}/langs/tr_TR/projects.lang (100%)
 rename {public => htdocs}/langs/tr_TR/propal.lang (100%)
 rename {public => htdocs}/langs/tr_TR/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/tr_TR/resource.lang (100%)
 rename {public => htdocs}/langs/tr_TR/salaries.lang (100%)
 rename {public => htdocs}/langs/tr_TR/sendings.lang (100%)
 rename {public => htdocs}/langs/tr_TR/sms.lang (100%)
 rename {public => htdocs}/langs/tr_TR/stocks.lang (100%)
 rename {public => htdocs}/langs/tr_TR/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/tr_TR/suppliers.lang (100%)
 rename {public => htdocs}/langs/tr_TR/trips.lang (100%)
 rename {public => htdocs}/langs/tr_TR/users.lang (100%)
 rename {public => htdocs}/langs/tr_TR/website.lang (100%)
 rename {public => htdocs}/langs/tr_TR/withdrawals.lang (100%)
 rename {public => htdocs}/langs/tr_TR/workflow.lang (100%)
 rename {public => htdocs}/langs/uk_UA/accountancy.lang (100%)
 rename {public => htdocs}/langs/uk_UA/admin.lang (100%)
 rename {public => htdocs}/langs/uk_UA/agenda.lang (100%)
 rename {public => htdocs}/langs/uk_UA/banks.lang (100%)
 rename {public => htdocs}/langs/uk_UA/bills.lang (100%)
 rename {public => htdocs}/langs/uk_UA/bookmarks.lang (100%)
 rename {public => htdocs}/langs/uk_UA/boxes.lang (100%)
 rename {public => htdocs}/langs/uk_UA/cashdesk.lang (100%)
 rename {public => htdocs}/langs/uk_UA/categories.lang (100%)
 rename {public => htdocs}/langs/uk_UA/commercial.lang (100%)
 rename {public => htdocs}/langs/uk_UA/companies.lang (100%)
 rename {public => htdocs}/langs/uk_UA/compta.lang (100%)
 rename {public => htdocs}/langs/uk_UA/contracts.lang (100%)
 rename {public => htdocs}/langs/uk_UA/cron.lang (100%)
 rename {public => htdocs}/langs/uk_UA/deliveries.lang (100%)
 rename {public => htdocs}/langs/uk_UA/dict.lang (100%)
 rename {public => htdocs}/langs/uk_UA/donations.lang (100%)
 rename {public => htdocs}/langs/uk_UA/ecm.lang (100%)
 rename {public => htdocs}/langs/uk_UA/errors.lang (100%)
 rename {public => htdocs}/langs/uk_UA/exports.lang (100%)
 rename {public => htdocs}/langs/uk_UA/externalsite.lang (100%)
 rename {public => htdocs}/langs/uk_UA/ftp.lang (100%)
 rename {public => htdocs}/langs/uk_UA/help.lang (100%)
 rename {public => htdocs}/langs/uk_UA/holiday.lang (100%)
 rename {public => htdocs}/langs/uk_UA/hrm.lang (100%)
 rename {public => htdocs}/langs/uk_UA/incoterm.lang (100%)
 rename {public => htdocs}/langs/uk_UA/install.lang (100%)
 rename {public => htdocs}/langs/uk_UA/interventions.lang (100%)
 rename {public => htdocs}/langs/uk_UA/languages.lang (100%)
 rename {public => htdocs}/langs/uk_UA/ldap.lang (100%)
 rename {public => htdocs}/langs/uk_UA/link.lang (100%)
 rename {public => htdocs}/langs/uk_UA/loan.lang (100%)
 rename {public => htdocs}/langs/uk_UA/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/uk_UA/mails.lang (100%)
 rename {public => htdocs}/langs/uk_UA/main.lang (100%)
 rename {public => htdocs}/langs/uk_UA/margins.lang (100%)
 rename {public => htdocs}/langs/uk_UA/members.lang (100%)
 rename {public => htdocs}/langs/uk_UA/oauth.lang (100%)
 rename {public => htdocs}/langs/uk_UA/opensurvey.lang (100%)
 rename {public => htdocs}/langs/uk_UA/orders.lang (100%)
 rename {public => htdocs}/langs/uk_UA/other.lang (100%)
 rename {public => htdocs}/langs/uk_UA/paybox.lang (100%)
 rename {public => htdocs}/langs/uk_UA/paypal.lang (100%)
 rename {public => htdocs}/langs/uk_UA/printing.lang (100%)
 rename {public => htdocs}/langs/uk_UA/productbatch.lang (100%)
 rename {public => htdocs}/langs/uk_UA/products.lang (100%)
 rename {public => htdocs}/langs/uk_UA/projects.lang (100%)
 rename {public => htdocs}/langs/uk_UA/propal.lang (100%)
 rename {public => htdocs}/langs/uk_UA/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/uk_UA/resource.lang (100%)
 rename {public => htdocs}/langs/uk_UA/salaries.lang (100%)
 rename {public => htdocs}/langs/uk_UA/sendings.lang (100%)
 rename {public => htdocs}/langs/uk_UA/sms.lang (100%)
 rename {public => htdocs}/langs/uk_UA/stocks.lang (100%)
 rename {public => htdocs}/langs/uk_UA/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/uk_UA/suppliers.lang (100%)
 rename {public => htdocs}/langs/uk_UA/trips.lang (100%)
 rename {public => htdocs}/langs/uk_UA/users.lang (100%)
 rename {public => htdocs}/langs/uk_UA/website.lang (100%)
 rename {public => htdocs}/langs/uk_UA/withdrawals.lang (100%)
 rename {public => htdocs}/langs/uk_UA/workflow.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/accountancy.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/admin.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/agenda.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/banks.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/bills.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/bookmarks.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/boxes.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/cashdesk.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/categories.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/commercial.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/companies.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/compta.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/contracts.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/cron.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/deliveries.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/dict.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/donations.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/ecm.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/errors.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/exports.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/externalsite.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/ftp.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/help.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/holiday.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/incoterm.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/install.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/interventions.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/languages.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/ldap.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/link.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/loan.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/mails.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/main.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/margins.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/members.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/opensurvey.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/orders.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/other.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/paybox.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/paypal.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/printing.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/productbatch.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/products.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/projects.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/propal.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/resource.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/salaries.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/sendings.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/sms.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/stocks.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/suppliers.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/trips.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/users.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/withdrawals.lang (100%)
 rename {public => htdocs}/langs/uz_UZ/workflow.lang (100%)
 rename {public => htdocs}/langs/vi_VN/accountancy.lang (100%)
 rename {public => htdocs}/langs/vi_VN/admin.lang (100%)
 rename {public => htdocs}/langs/vi_VN/agenda.lang (100%)
 rename {public => htdocs}/langs/vi_VN/banks.lang (100%)
 rename {public => htdocs}/langs/vi_VN/bills.lang (100%)
 rename {public => htdocs}/langs/vi_VN/bookmarks.lang (100%)
 rename {public => htdocs}/langs/vi_VN/boxes.lang (100%)
 rename {public => htdocs}/langs/vi_VN/cashdesk.lang (100%)
 rename {public => htdocs}/langs/vi_VN/categories.lang (100%)
 rename {public => htdocs}/langs/vi_VN/commercial.lang (100%)
 rename {public => htdocs}/langs/vi_VN/companies.lang (100%)
 rename {public => htdocs}/langs/vi_VN/compta.lang (100%)
 rename {public => htdocs}/langs/vi_VN/contracts.lang (100%)
 rename {public => htdocs}/langs/vi_VN/cron.lang (100%)
 rename {public => htdocs}/langs/vi_VN/deliveries.lang (100%)
 rename {public => htdocs}/langs/vi_VN/dict.lang (100%)
 rename {public => htdocs}/langs/vi_VN/donations.lang (100%)
 rename {public => htdocs}/langs/vi_VN/ecm.lang (100%)
 rename {public => htdocs}/langs/vi_VN/errors.lang (100%)
 rename {public => htdocs}/langs/vi_VN/exports.lang (100%)
 rename {public => htdocs}/langs/vi_VN/externalsite.lang (100%)
 rename {public => htdocs}/langs/vi_VN/ftp.lang (100%)
 rename {public => htdocs}/langs/vi_VN/help.lang (100%)
 rename {public => htdocs}/langs/vi_VN/holiday.lang (100%)
 rename {public => htdocs}/langs/vi_VN/hrm.lang (100%)
 rename {public => htdocs}/langs/vi_VN/incoterm.lang (100%)
 rename {public => htdocs}/langs/vi_VN/install.lang (100%)
 rename {public => htdocs}/langs/vi_VN/interventions.lang (100%)
 rename {public => htdocs}/langs/vi_VN/languages.lang (100%)
 rename {public => htdocs}/langs/vi_VN/ldap.lang (100%)
 rename {public => htdocs}/langs/vi_VN/link.lang (100%)
 rename {public => htdocs}/langs/vi_VN/loan.lang (100%)
 rename {public => htdocs}/langs/vi_VN/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/vi_VN/mails.lang (100%)
 rename {public => htdocs}/langs/vi_VN/main.lang (100%)
 rename {public => htdocs}/langs/vi_VN/margins.lang (100%)
 rename {public => htdocs}/langs/vi_VN/members.lang (100%)
 rename {public => htdocs}/langs/vi_VN/oauth.lang (100%)
 rename {public => htdocs}/langs/vi_VN/opensurvey.lang (100%)
 rename {public => htdocs}/langs/vi_VN/orders.lang (100%)
 rename {public => htdocs}/langs/vi_VN/other.lang (100%)
 rename {public => htdocs}/langs/vi_VN/paybox.lang (100%)
 rename {public => htdocs}/langs/vi_VN/paypal.lang (100%)
 rename {public => htdocs}/langs/vi_VN/printing.lang (100%)
 rename {public => htdocs}/langs/vi_VN/productbatch.lang (100%)
 rename {public => htdocs}/langs/vi_VN/products.lang (100%)
 rename {public => htdocs}/langs/vi_VN/projects.lang (100%)
 rename {public => htdocs}/langs/vi_VN/propal.lang (100%)
 rename {public => htdocs}/langs/vi_VN/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/vi_VN/resource.lang (100%)
 rename {public => htdocs}/langs/vi_VN/salaries.lang (100%)
 rename {public => htdocs}/langs/vi_VN/sendings.lang (100%)
 rename {public => htdocs}/langs/vi_VN/sms.lang (100%)
 rename {public => htdocs}/langs/vi_VN/stocks.lang (100%)
 rename {public => htdocs}/langs/vi_VN/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/vi_VN/suppliers.lang (100%)
 rename {public => htdocs}/langs/vi_VN/trips.lang (100%)
 rename {public => htdocs}/langs/vi_VN/users.lang (100%)
 rename {public => htdocs}/langs/vi_VN/website.lang (100%)
 rename {public => htdocs}/langs/vi_VN/withdrawals.lang (100%)
 rename {public => htdocs}/langs/vi_VN/workflow.lang (100%)
 rename {public => htdocs}/langs/zh_CN/accountancy.lang (100%)
 rename {public => htdocs}/langs/zh_CN/admin.lang (100%)
 rename {public => htdocs}/langs/zh_CN/agenda.lang (100%)
 rename {public => htdocs}/langs/zh_CN/banks.lang (100%)
 rename {public => htdocs}/langs/zh_CN/bills.lang (100%)
 rename {public => htdocs}/langs/zh_CN/bookmarks.lang (100%)
 rename {public => htdocs}/langs/zh_CN/boxes.lang (100%)
 rename {public => htdocs}/langs/zh_CN/cashdesk.lang (100%)
 rename {public => htdocs}/langs/zh_CN/categories.lang (100%)
 rename {public => htdocs}/langs/zh_CN/commercial.lang (100%)
 rename {public => htdocs}/langs/zh_CN/companies.lang (100%)
 rename {public => htdocs}/langs/zh_CN/compta.lang (100%)
 rename {public => htdocs}/langs/zh_CN/contracts.lang (100%)
 rename {public => htdocs}/langs/zh_CN/cron.lang (100%)
 rename {public => htdocs}/langs/zh_CN/deliveries.lang (100%)
 rename {public => htdocs}/langs/zh_CN/dict.lang (100%)
 rename {public => htdocs}/langs/zh_CN/donations.lang (100%)
 rename {public => htdocs}/langs/zh_CN/ecm.lang (100%)
 rename {public => htdocs}/langs/zh_CN/errors.lang (100%)
 rename {public => htdocs}/langs/zh_CN/exports.lang (100%)
 rename {public => htdocs}/langs/zh_CN/externalsite.lang (100%)
 rename {public => htdocs}/langs/zh_CN/ftp.lang (100%)
 rename {public => htdocs}/langs/zh_CN/help.lang (100%)
 rename {public => htdocs}/langs/zh_CN/holiday.lang (100%)
 rename {public => htdocs}/langs/zh_CN/hrm.lang (100%)
 rename {public => htdocs}/langs/zh_CN/incoterm.lang (100%)
 rename {public => htdocs}/langs/zh_CN/install.lang (100%)
 rename {public => htdocs}/langs/zh_CN/interventions.lang (100%)
 rename {public => htdocs}/langs/zh_CN/languages.lang (100%)
 rename {public => htdocs}/langs/zh_CN/ldap.lang (100%)
 rename {public => htdocs}/langs/zh_CN/link.lang (100%)
 rename {public => htdocs}/langs/zh_CN/loan.lang (100%)
 rename {public => htdocs}/langs/zh_CN/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/zh_CN/mails.lang (100%)
 rename {public => htdocs}/langs/zh_CN/main.lang (100%)
 rename {public => htdocs}/langs/zh_CN/margins.lang (100%)
 rename {public => htdocs}/langs/zh_CN/members.lang (100%)
 rename {public => htdocs}/langs/zh_CN/oauth.lang (100%)
 rename {public => htdocs}/langs/zh_CN/opensurvey.lang (100%)
 rename {public => htdocs}/langs/zh_CN/orders.lang (100%)
 rename {public => htdocs}/langs/zh_CN/other.lang (100%)
 rename {public => htdocs}/langs/zh_CN/paybox.lang (100%)
 rename {public => htdocs}/langs/zh_CN/paypal.lang (100%)
 rename {public => htdocs}/langs/zh_CN/printing.lang (100%)
 rename {public => htdocs}/langs/zh_CN/productbatch.lang (100%)
 rename {public => htdocs}/langs/zh_CN/products.lang (100%)
 rename {public => htdocs}/langs/zh_CN/projects.lang (100%)
 rename {public => htdocs}/langs/zh_CN/propal.lang (100%)
 rename {public => htdocs}/langs/zh_CN/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/zh_CN/resource.lang (100%)
 rename {public => htdocs}/langs/zh_CN/salaries.lang (100%)
 rename {public => htdocs}/langs/zh_CN/sendings.lang (100%)
 rename {public => htdocs}/langs/zh_CN/sms.lang (100%)
 rename {public => htdocs}/langs/zh_CN/stocks.lang (100%)
 rename {public => htdocs}/langs/zh_CN/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/zh_CN/suppliers.lang (100%)
 rename {public => htdocs}/langs/zh_CN/trips.lang (100%)
 rename {public => htdocs}/langs/zh_CN/users.lang (100%)
 rename {public => htdocs}/langs/zh_CN/website.lang (100%)
 rename {public => htdocs}/langs/zh_CN/withdrawals.lang (100%)
 rename {public => htdocs}/langs/zh_CN/workflow.lang (100%)
 rename {public => htdocs}/langs/zh_TW/accountancy.lang (100%)
 rename {public => htdocs}/langs/zh_TW/admin.lang (100%)
 rename {public => htdocs}/langs/zh_TW/agenda.lang (100%)
 rename {public => htdocs}/langs/zh_TW/banks.lang (100%)
 rename {public => htdocs}/langs/zh_TW/bills.lang (100%)
 rename {public => htdocs}/langs/zh_TW/bookmarks.lang (100%)
 rename {public => htdocs}/langs/zh_TW/boxes.lang (100%)
 rename {public => htdocs}/langs/zh_TW/cashdesk.lang (100%)
 rename {public => htdocs}/langs/zh_TW/categories.lang (100%)
 rename {public => htdocs}/langs/zh_TW/commercial.lang (100%)
 rename {public => htdocs}/langs/zh_TW/companies.lang (100%)
 rename {public => htdocs}/langs/zh_TW/compta.lang (100%)
 rename {public => htdocs}/langs/zh_TW/contracts.lang (100%)
 rename {public => htdocs}/langs/zh_TW/cron.lang (100%)
 rename {public => htdocs}/langs/zh_TW/deliveries.lang (100%)
 rename {public => htdocs}/langs/zh_TW/dict.lang (100%)
 rename {public => htdocs}/langs/zh_TW/donations.lang (100%)
 rename {public => htdocs}/langs/zh_TW/ecm.lang (100%)
 rename {public => htdocs}/langs/zh_TW/errors.lang (100%)
 rename {public => htdocs}/langs/zh_TW/exports.lang (100%)
 rename {public => htdocs}/langs/zh_TW/externalsite.lang (100%)
 rename {public => htdocs}/langs/zh_TW/ftp.lang (100%)
 rename {public => htdocs}/langs/zh_TW/help.lang (100%)
 rename {public => htdocs}/langs/zh_TW/holiday.lang (100%)
 rename {public => htdocs}/langs/zh_TW/hrm.lang (100%)
 rename {public => htdocs}/langs/zh_TW/incoterm.lang (100%)
 rename {public => htdocs}/langs/zh_TW/install.lang (100%)
 rename {public => htdocs}/langs/zh_TW/interventions.lang (100%)
 rename {public => htdocs}/langs/zh_TW/languages.lang (100%)
 rename {public => htdocs}/langs/zh_TW/ldap.lang (100%)
 rename {public => htdocs}/langs/zh_TW/link.lang (100%)
 rename {public => htdocs}/langs/zh_TW/loan.lang (100%)
 rename {public => htdocs}/langs/zh_TW/mailmanspip.lang (100%)
 rename {public => htdocs}/langs/zh_TW/mails.lang (100%)
 rename {public => htdocs}/langs/zh_TW/main.lang (100%)
 rename {public => htdocs}/langs/zh_TW/margins.lang (100%)
 rename {public => htdocs}/langs/zh_TW/members.lang (100%)
 rename {public => htdocs}/langs/zh_TW/oauth.lang (100%)
 rename {public => htdocs}/langs/zh_TW/opensurvey.lang (100%)
 rename {public => htdocs}/langs/zh_TW/orders.lang (100%)
 rename {public => htdocs}/langs/zh_TW/other.lang (100%)
 rename {public => htdocs}/langs/zh_TW/paybox.lang (100%)
 rename {public => htdocs}/langs/zh_TW/paypal.lang (100%)
 rename {public => htdocs}/langs/zh_TW/printing.lang (100%)
 rename {public => htdocs}/langs/zh_TW/productbatch.lang (100%)
 rename {public => htdocs}/langs/zh_TW/products.lang (100%)
 rename {public => htdocs}/langs/zh_TW/projects.lang (100%)
 rename {public => htdocs}/langs/zh_TW/propal.lang (100%)
 rename {public => htdocs}/langs/zh_TW/receiptprinter.lang (100%)
 rename {public => htdocs}/langs/zh_TW/resource.lang (100%)
 rename {public => htdocs}/langs/zh_TW/salaries.lang (100%)
 rename {public => htdocs}/langs/zh_TW/sendings.lang (100%)
 rename {public => htdocs}/langs/zh_TW/sms.lang (100%)
 rename {public => htdocs}/langs/zh_TW/stocks.lang (100%)
 rename {public => htdocs}/langs/zh_TW/supplier_proposal.lang (100%)
 rename {public => htdocs}/langs/zh_TW/suppliers.lang (100%)
 rename {public => htdocs}/langs/zh_TW/trips.lang (100%)
 rename {public => htdocs}/langs/zh_TW/users.lang (100%)
 rename {public => htdocs}/langs/zh_TW/website.lang (100%)
 rename {public => htdocs}/langs/zh_TW/withdrawals.lang (100%)
 rename {public => htdocs}/langs/zh_TW/workflow.lang (100%)
 rename {public => htdocs}/livraison/card.php (100%)
 rename {public => htdocs}/livraison/class/index.html (100%)
 rename {public => htdocs}/livraison/class/livraison.class.php (100%)
 rename {public => htdocs}/livraison/index.html (100%)
 rename {public => htdocs}/loan/calc.php (100%)
 rename {public => htdocs}/loan/card.php (100%)
 rename {public => htdocs}/loan/class/index.html (100%)
 rename {public => htdocs}/loan/class/loan.class.php (100%)
 rename {public => htdocs}/loan/class/paymentloan.class.php (100%)
 rename {public => htdocs}/loan/document.php (100%)
 rename {public => htdocs}/loan/index.html (100%)
 rename {public => htdocs}/loan/index.php (100%)
 rename {public => htdocs}/loan/info.php (100%)
 rename {public => htdocs}/loan/note.php (100%)
 rename {public => htdocs}/loan/payment/card.php (100%)
 rename {public => htdocs}/loan/payment/index.html (100%)
 rename {public => htdocs}/loan/payment/payment.php (100%)
 rename {public => htdocs}/mailmanspip/class/index.html (100%)
 rename {public => htdocs}/mailmanspip/class/mailmanspip.class.php (100%)
 rename {public => htdocs}/mailmanspip/index.html (100%)
 rename {public => htdocs}/main.inc.php (100%)
 rename {public => htdocs}/margin/admin/index.html (100%)
 rename {public => htdocs}/margin/admin/margin.php (100%)
 rename {public => htdocs}/margin/agentMargins.php (100%)
 rename {public => htdocs}/margin/checkMargins.php (100%)
 rename {public => htdocs}/margin/customerMargins.php (100%)
 rename {public => htdocs}/margin/index.php (100%)
 rename {public => htdocs}/margin/lib/index.html (100%)
 rename {public => htdocs}/margin/lib/margins.lib.php (100%)
 rename {public => htdocs}/margin/productMargins.php (100%)
 rename {public => htdocs}/margin/tabs/index.html (100%)
 rename {public => htdocs}/margin/tabs/productMargins.php (100%)
 rename {public => htdocs}/margin/tabs/thirdpartyMargins.php (100%)
 rename {public => htdocs}/master.inc.php (100%)
 rename {public => htdocs}/multicurrency/class/multicurrency.class.php (100%)
 rename {public => htdocs}/opensurvey/card.php (100%)
 rename {public => htdocs}/opensurvey/class/index.html (100%)
 rename {public => htdocs}/opensurvey/class/opensurveysondage.class.php (100%)
 rename {public => htdocs}/opensurvey/css/index.html (100%)
 rename {public => htdocs}/opensurvey/css/style.css (100%)
 rename {public => htdocs}/opensurvey/exportcsv.php (100%)
 rename {public => htdocs}/opensurvey/fonctions.php (100%)
 rename {public => htdocs}/opensurvey/img/accept-24.png (100%)
 rename {public => htdocs}/opensurvey/img/accept.png (100%)
 rename {public => htdocs}/opensurvey/img/add-16.png (100%)
 rename {public => htdocs}/opensurvey/img/add-24.png (100%)
 rename {public => htdocs}/opensurvey/img/calendar-32.png (100%)
 rename {public => htdocs}/opensurvey/img/chart-32.png (100%)
 rename {public => htdocs}/opensurvey/img/date.png (100%)
 rename {public => htdocs}/opensurvey/img/fforward.png (100%)
 rename {public => htdocs}/opensurvey/img/index.html (100%)
 rename {public => htdocs}/opensurvey/img/medaille.png (100%)
 rename {public => htdocs}/opensurvey/img/next.png (100%)
 rename {public => htdocs}/opensurvey/img/object_opensurvey.png (100%)
 rename {public => htdocs}/opensurvey/img/opensurvey.png (100%)
 rename {public => htdocs}/opensurvey/img/previous.png (100%)
 rename {public => htdocs}/opensurvey/img/rewind.png (100%)
 rename {public => htdocs}/opensurvey/img/sondage2.png (100%)
 rename {public => htdocs}/opensurvey/index.php (100%)
 rename {public => htdocs}/opensurvey/list.php (100%)
 rename {public => htdocs}/opensurvey/results.php (100%)
 rename {public => htdocs}/opensurvey/wizard/choix_autre.php (100%)
 rename {public => htdocs}/opensurvey/wizard/choix_date.php (100%)
 rename {public => htdocs}/opensurvey/wizard/create_survey.php (100%)
 rename {public => htdocs}/opensurvey/wizard/index.php (100%)
 rename {public => htdocs}/paybox/admin/index.html (100%)
 rename {public => htdocs}/paybox/admin/paybox.php (100%)
 rename {public => htdocs}/paybox/img/index.html (100%)
 rename {public => htdocs}/paybox/img/object_paybox.png (100%)
 rename {public => htdocs}/paybox/index.html (100%)
 rename {public => htdocs}/paybox/lib/index.html (100%)
 rename {public => htdocs}/paybox/lib/paybox.lib.php (100%)
 rename {public => htdocs}/paypal/admin/index.html (100%)
 rename {public => htdocs}/paypal/admin/paypal.php (100%)
 rename {public => htdocs}/paypal/img/index.html (100%)
 rename {public => htdocs}/paypal/img/object_paypal.png (100%)
 rename {public => htdocs}/paypal/index.html (100%)
 rename {public => htdocs}/paypal/lib/index.html (100%)
 rename {public => htdocs}/paypal/lib/paypal.lib.php (100%)
 rename {public => htdocs}/paypal/lib/paypalfunctions.lib.php (100%)
 rename {public => htdocs}/printing/admin/index.html (100%)
 rename {public => htdocs}/printing/admin/printing.php (100%)
 rename {public => htdocs}/printing/index.php (100%)
 rename {public => htdocs}/printing/lib/index.html (100%)
 rename {public => htdocs}/printing/lib/printing.lib.php (100%)
 rename {public => htdocs}/product/admin/dynamic_prices.php (100%)
 rename {public => htdocs}/product/admin/index.html (100%)
 rename {public => htdocs}/product/admin/price_rules.php (100%)
 rename {public => htdocs}/product/admin/product.php (100%)
 rename {public => htdocs}/product/admin/product_extrafields.php (100%)
 rename {public => htdocs}/product/admin/product_lot_extrafields.php (100%)
 rename {public => htdocs}/product/admin/product_tools.php (100%)
 rename {public => htdocs}/product/ajax/index.html (100%)
 rename {public => htdocs}/product/ajax/products.php (100%)
 rename {public => htdocs}/product/canvas/index.html (100%)
 rename {public => htdocs}/product/canvas/product/actions_card_product.class.php (100%)
 rename {public => htdocs}/product/canvas/product/index.html (100%)
 rename {public => htdocs}/product/canvas/product/tpl/card_create.tpl.php (100%)
 rename {public => htdocs}/product/canvas/product/tpl/card_edit.tpl.php (100%)
 rename {public => htdocs}/product/canvas/product/tpl/card_view.tpl.php (100%)
 rename {public => htdocs}/product/canvas/product/tpl/index.html (100%)
 rename {public => htdocs}/product/canvas/product/tpl/list.tpl.php (100%)
 rename {public => htdocs}/product/canvas/service/actions_card_service.class.php (100%)
 rename {public => htdocs}/product/canvas/service/index.html (100%)
 rename {public => htdocs}/product/canvas/service/tpl/card_create.tpl.php (100%)
 rename {public => htdocs}/product/canvas/service/tpl/card_edit.tpl.php (100%)
 rename {public => htdocs}/product/canvas/service/tpl/card_view.tpl.php (100%)
 rename {public => htdocs}/product/canvas/service/tpl/index.html (100%)
 rename {public => htdocs}/product/canvas/service/tpl/list.tpl.php (100%)
 rename {public => htdocs}/product/card.php (100%)
 rename {public => htdocs}/product/class/api_deprecated_product.class.php (100%)
 rename {public => htdocs}/product/class/api_products.class.php (100%)
 rename {public => htdocs}/product/class/html.formproduct.class.php (100%)
 rename {public => htdocs}/product/class/index.html (100%)
 rename {public => htdocs}/product/class/product.class.php (100%)
 rename {public => htdocs}/product/class/productbatch.class.php (100%)
 rename {public => htdocs}/product/class/productcustomerprice.class.php (100%)
 rename {public => htdocs}/product/class/propalmergepdfproduct.class.php (100%)
 rename {public => htdocs}/product/class/service.class.php (100%)
 rename {public => htdocs}/product/composition/card.php (100%)
 rename {public => htdocs}/product/composition/index.html (100%)
 rename {public => htdocs}/product/document.php (100%)
 rename {public => htdocs}/product/dynamic_price/class/price_expression.class.php (100%)
 rename {public => htdocs}/product/dynamic_price/class/price_global_variable.class.php (100%)
 rename {public => htdocs}/product/dynamic_price/class/price_global_variable_updater.class.php (100%)
 rename {public => htdocs}/product/dynamic_price/class/price_parser.class.php (100%)
 rename {public => htdocs}/product/dynamic_price/editor.php (100%)
 rename {public => htdocs}/product/fournisseurs.php (100%)
 rename {public => htdocs}/product/index.php (100%)
 rename {public => htdocs}/product/info.php (100%)
 rename {public => htdocs}/product/list.php (100%)
 rename {public => htdocs}/product/note.php (100%)
 rename {public => htdocs}/product/popuprop.php (100%)
 rename {public => htdocs}/product/price.php (100%)
 rename {public => htdocs}/product/reassort.php (100%)
 rename {public => htdocs}/product/reassortlot.php (100%)
 rename {public => htdocs}/product/stats/card.php (100%)
 rename {public => htdocs}/product/stats/commande.php (100%)
 rename {public => htdocs}/product/stats/commande_fournisseur.php (100%)
 rename {public => htdocs}/product/stats/contrat.php (100%)
 rename {public => htdocs}/product/stats/facture.php (100%)
 rename {public => htdocs}/product/stats/facture_fournisseur.php (100%)
 rename {public => htdocs}/product/stats/index.html (100%)
 rename {public => htdocs}/product/stats/propal.php (100%)
 rename {public => htdocs}/product/stock/card.php (100%)
 rename {public => htdocs}/product/stock/class/api_stockmovements.class.php (100%)
 rename {public => htdocs}/product/stock/class/api_warehouses.class.php (100%)
 rename {public => htdocs}/product/stock/class/entrepot.class.php (100%)
 rename {public => htdocs}/product/stock/class/index.html (100%)
 rename {public => htdocs}/product/stock/class/mouvementstock.class.php (100%)
 rename {public => htdocs}/product/stock/class/productlot.class.php (100%)
 rename {public => htdocs}/product/stock/class/productstockentrepot.class.php (100%)
 rename {public => htdocs}/product/stock/fiche-valo.php (100%)
 rename {public => htdocs}/product/stock/img/index.html (100%)
 rename {public => htdocs}/product/stock/img/no.png (100%)
 rename {public => htdocs}/product/stock/img/yes.png (100%)
 rename {public => htdocs}/product/stock/index.php (100%)
 rename {public => htdocs}/product/stock/info.php (100%)
 rename {public => htdocs}/product/stock/lib/index.html (100%)
 rename {public => htdocs}/product/stock/lib/replenishment.lib.php (100%)
 rename {public => htdocs}/product/stock/list.php (100%)
 rename {public => htdocs}/product/stock/massstockmove.php (100%)
 rename {public => htdocs}/product/stock/mouvement.php (100%)
 rename {public => htdocs}/product/stock/product.php (100%)
 rename {public => htdocs}/product/stock/productlot_card.php (100%)
 rename {public => htdocs}/product/stock/productlot_list.php (100%)
 rename {public => htdocs}/product/stock/replenish.php (100%)
 rename {public => htdocs}/product/stock/replenishorders.php (100%)
 rename {public => htdocs}/product/stock/tpl/stockcorrection.tpl.php (100%)
 rename {public => htdocs}/product/stock/tpl/stocktransfer.tpl.php (100%)
 rename {public => htdocs}/product/stock/valo.php (100%)
 rename {public => htdocs}/product/traduction.php (100%)
 rename {public => htdocs}/projet/activity/index.php (100%)
 rename {public => htdocs}/projet/activity/perday.php (100%)
 rename {public => htdocs}/projet/activity/perweek.php (100%)
 rename {public => htdocs}/projet/admin/index.html (100%)
 rename {public => htdocs}/projet/admin/project.php (100%)
 rename {public => htdocs}/projet/admin/project_extrafields.php (100%)
 rename {public => htdocs}/projet/admin/project_task_extrafields.php (100%)
 rename {public => htdocs}/projet/ajax/projects.php (100%)
 rename {public => htdocs}/projet/card.php (100%)
 rename {public => htdocs}/projet/class/api_projects.class.php (100%)
 rename {public => htdocs}/projet/class/api_tasks.class.php (100%)
 rename {public => htdocs}/projet/class/index.html (100%)
 rename {public => htdocs}/projet/class/project.class.php (100%)
 rename {public => htdocs}/projet/class/projectstats.class.php (100%)
 rename {public => htdocs}/projet/class/task.class.php (100%)
 rename {public => htdocs}/projet/contact.php (100%)
 rename {public => htdocs}/projet/document.php (100%)
 rename {public => htdocs}/projet/element.php (100%)
 rename {public => htdocs}/projet/ganttchart.inc.php (100%)
 rename {public => htdocs}/projet/ganttview.php (100%)
 rename {public => htdocs}/projet/graph_opportunities.inc.php (100%)
 rename {public => htdocs}/projet/index.php (100%)
 rename {public => htdocs}/projet/info.php (100%)
 rename {public => htdocs}/projet/jsgantt_language.js.php (100%)
 rename {public => htdocs}/projet/list.php (100%)
 rename {public => htdocs}/projet/note.php (100%)
 rename {public => htdocs}/projet/stats/index.php (100%)
 rename {public => htdocs}/projet/tasks.php (100%)
 rename {public => htdocs}/projet/tasks/contact.php (100%)
 rename {public => htdocs}/projet/tasks/document.php (100%)
 rename {public => htdocs}/projet/tasks/list.php (100%)
 rename {public => htdocs}/projet/tasks/note.php (100%)
 rename {public => htdocs}/projet/tasks/task.php (100%)
 rename {public => htdocs}/projet/tasks/time.php (100%)
 rename {public => htdocs}/public/agenda/agendaexport.php (100%)
 rename {public => htdocs}/public/agenda/index.php (100%)
 rename {public => htdocs}/public/cron/cron_run_jobs.php (100%)
 rename {public => htdocs}/public/cron/index.html (100%)
 rename {public => htdocs}/public/demo/dolibarr_screenshot2.png (100%)
 rename {public => htdocs}/public/demo/dolibarr_screenshot6.png (100%)
 rename {public => htdocs}/public/demo/dolibarr_screenshot8.png (100%)
 rename {public => htdocs}/public/demo/dolibarr_screenshot9.png (100%)
 rename {public => htdocs}/public/demo/index.php (100%)
 rename {public => htdocs}/public/donations/donateurs_code.php (100%)
 rename {public => htdocs}/public/donations/index.php (100%)
 rename {public => htdocs}/public/emailing/index.html (100%)
 rename {public => htdocs}/public/emailing/mailing-read.php (100%)
 rename {public => htdocs}/public/emailing/mailing-unsubscribe.php (100%)
 rename {public => htdocs}/public/error-401.php (100%)
 rename {public => htdocs}/public/error-404.php (100%)
 rename {public => htdocs}/public/index.php (100%)
 rename {public => htdocs}/public/members/index.php (100%)
 rename {public => htdocs}/public/members/new.php (100%)
 rename {public => htdocs}/public/members/public_card.php (100%)
 rename {public => htdocs}/public/members/public_list.php (100%)
 rename {public => htdocs}/public/notice.php (100%)
 rename {public => htdocs}/public/opensurvey/index.html (100%)
 rename {public => htdocs}/public/opensurvey/studs.php (100%)
 rename {public => htdocs}/public/paybox/index.php (100%)
 rename {public => htdocs}/public/paybox/newpayment.php (100%)
 rename {public => htdocs}/public/paybox/paymentko.php (100%)
 rename {public => htdocs}/public/paybox/paymentok.php (100%)
 rename {public => htdocs}/public/paypal/index.php (100%)
 rename {public => htdocs}/public/paypal/newpayment.php (100%)
 rename {public => htdocs}/public/paypal/paymentko.php (100%)
 rename {public => htdocs}/public/paypal/paymentok.php (100%)
 rename {public => htdocs}/public/test/test_arrays.php (100%)
 rename {public => htdocs}/public/test/test_forms.php (100%)
 rename {public => htdocs}/public/theme/common/index.php (100%)
 rename {public => htdocs}/public/theme/common/nophoto.png (100%)
 rename {public => htdocs}/public/theme/common/user_anonymous.png (100%)
 rename {public => htdocs}/public/theme/common/user_man.png (100%)
 rename {public => htdocs}/public/theme/common/user_woman.png (100%)
 rename {public => htdocs}/public/theme/index.php (100%)
 rename {public => htdocs}/public/websites/index.php (100%)
 rename {public => htdocs}/public/websites/styles.css.php (100%)
 rename {public => htdocs}/resource/add.php (100%)
 rename {public => htdocs}/resource/card.php (100%)
 rename {public => htdocs}/resource/class/dolresource.class.php (100%)
 rename {public => htdocs}/resource/class/html.formresource.class.php (100%)
 rename {public => htdocs}/resource/class/index.html (100%)
 rename {public => htdocs}/resource/contact.php (100%)
 rename {public => htdocs}/resource/document.php (100%)
 rename {public => htdocs}/resource/element_resource.php (100%)
 rename {public => htdocs}/resource/index.html (100%)
 rename {public => htdocs}/resource/list.php (100%)
 rename {public => htdocs}/resource/note.php (100%)
 rename {public => htdocs}/robots.txt (100%)
 rename {public => htdocs}/societe/admin/contact_extrafields.php (100%)
 rename {public => htdocs}/societe/admin/societe.php (100%)
 rename {public => htdocs}/societe/admin/societe_extrafields.php (100%)
 rename {public => htdocs}/societe/agenda.php (100%)
 rename {public => htdocs}/societe/ajax/company.php (100%)
 rename {public => htdocs}/societe/ajax/index.html (100%)
 rename {public => htdocs}/societe/ajaxcompanies.php (100%)
 rename {public => htdocs}/societe/ajaxcountries.php (100%)
 rename {public => htdocs}/societe/canvas/README (100%)
 rename {public => htdocs}/societe/canvas/actions_card_common.class.php (100%)
 rename {public => htdocs}/societe/canvas/company/actions_card_company.class.php (100%)
 rename {public => htdocs}/societe/canvas/company/index.html (100%)
 rename {public => htdocs}/societe/canvas/company/tpl/card_create.tpl.php (100%)
 rename {public => htdocs}/societe/canvas/company/tpl/card_edit.tpl.php (100%)
 rename {public => htdocs}/societe/canvas/company/tpl/card_view.tpl.php (100%)
 rename {public => htdocs}/societe/canvas/company/tpl/index.html (100%)
 rename {public => htdocs}/societe/canvas/index.html (100%)
 rename {public => htdocs}/societe/canvas/individual/actions_card_individual.class.php (100%)
 rename {public => htdocs}/societe/canvas/individual/index.html (100%)
 rename {public => htdocs}/societe/canvas/individual/tpl/card_create.tpl.php (100%)
 rename {public => htdocs}/societe/canvas/individual/tpl/card_edit.tpl.php (100%)
 rename {public => htdocs}/societe/canvas/individual/tpl/card_view.tpl.php (100%)
 rename {public => htdocs}/societe/canvas/individual/tpl/index.html (100%)
 rename {public => htdocs}/societe/checkvat/checkVatPopup.php (100%)
 rename {public => htdocs}/societe/checkvat/checkVatService.xml (100%)
 rename {public => htdocs}/societe/checkvat/index.html (100%)
 rename {public => htdocs}/societe/class/address.class.php (100%)
 rename {public => htdocs}/societe/class/api_contacts.class.php (100%)
 rename {public => htdocs}/societe/class/api_deprecated_contact.class.php (100%)
 rename {public => htdocs}/societe/class/api_deprecated_thirdparty.class.php (100%)
 rename {public => htdocs}/societe/class/api_thirdparties.class.php (100%)
 rename {public => htdocs}/societe/class/client.class.php (100%)
 rename {public => htdocs}/societe/class/companybankaccount.class.php (100%)
 rename {public => htdocs}/societe/class/index.html (100%)
 rename {public => htdocs}/societe/class/societe.class.php (100%)
 rename {public => htdocs}/societe/commerciaux.php (100%)
 rename {public => htdocs}/societe/consumption.php (100%)
 rename {public => htdocs}/societe/document.php (100%)
 rename {public => htdocs}/societe/index.php (100%)
 rename {public => htdocs}/societe/list.php (100%)
 rename {public => htdocs}/societe/note.php (100%)
 rename {public => htdocs}/societe/notify/card.php (100%)
 rename {public => htdocs}/societe/notify/index.php (100%)
 rename {public => htdocs}/societe/price.php (100%)
 rename {public => htdocs}/societe/project.php (100%)
 rename {public => htdocs}/societe/rib.php (100%)
 rename {public => htdocs}/societe/soc.php (100%)
 rename {public => htdocs}/societe/societecontact.php (100%)
 rename {public => htdocs}/societe/tpl/index.html (100%)
 rename {public => htdocs}/societe/tpl/linesalesrepresentative.tpl.php (100%)
 rename {public => htdocs}/supplier_proposal/admin/supplier_proposal_extrafields.php (100%)
 rename {public => htdocs}/supplier_proposal/admin/supplier_proposaldet_extrafields.php (100%)
 rename {public => htdocs}/supplier_proposal/card.php (100%)
 rename {public => htdocs}/supplier_proposal/class/index.html (100%)
 rename {public => htdocs}/supplier_proposal/class/supplier_proposal.class.php (100%)
 rename {public => htdocs}/supplier_proposal/document.php (100%)
 rename {public => htdocs}/supplier_proposal/index.php (100%)
 rename {public => htdocs}/supplier_proposal/info.php (100%)
 rename {public => htdocs}/supplier_proposal/list.php (100%)
 rename {public => htdocs}/supplier_proposal/note.php (100%)
 rename {public => htdocs}/supplier_proposal/tpl/index.html (100%)
 rename {public => htdocs}/supplier_proposal/tpl/linkedobjectblock.tpl.php (100%)
 rename {public => htdocs}/support/background.png (100%)
 rename {public => htdocs}/support/default.css (100%)
 rename {public => htdocs}/support/helpcenter.png (100%)
 rename {public => htdocs}/support/inc.php (100%)
 rename {public => htdocs}/support/index.php (100%)
 rename {public => htdocs}/support/internet.png (100%)
 rename {public => htdocs}/support/mail.png (100%)
 rename {public => htdocs}/support/online.php (100%)
 rename {public => htdocs}/support/pagemaster.png (100%)
 rename {public => htdocs}/support/redstar.png (100%)
 rename {public => htdocs}/support/star.png (100%)
 rename {public => htdocs}/support/who.png (100%)
 rename {public => htdocs}/theme/.gitignore (100%)
 rename {public => htdocs}/theme/common/colorpicker.png (100%)
 rename {public => htdocs}/theme/common/devices/audio-card.png (100%)
 rename {public => htdocs}/theme/common/devices/audio-headset.png (100%)
 rename {public => htdocs}/theme/common/devices/audio-input-line.png (100%)
 rename {public => htdocs}/theme/common/devices/audio-input-microphone.png (100%)
 rename {public => htdocs}/theme/common/devices/battery.png (100%)
 rename {public => htdocs}/theme/common/devices/camera-photo.png (100%)
 rename {public => htdocs}/theme/common/devices/camera-web.png (100%)
 rename {public => htdocs}/theme/common/devices/computer-laptop.png (100%)
 rename {public => htdocs}/theme/common/devices/computer.png (100%)
 rename {public => htdocs}/theme/common/devices/cpu.png (100%)
 rename {public => htdocs}/theme/common/devices/drive-harddisk.png (100%)
 rename {public => htdocs}/theme/common/devices/drive-optical.png (100%)
 rename {public => htdocs}/theme/common/devices/drive-removable-media-usb-pendrive.png (100%)
 rename {public => htdocs}/theme/common/devices/drive-removable-media-usb.png (100%)
 rename {public => htdocs}/theme/common/devices/drive-removable-media.png (100%)
 rename {public => htdocs}/theme/common/devices/index.html (100%)
 rename {public => htdocs}/theme/common/devices/input-gaming.png (100%)
 rename {public => htdocs}/theme/common/devices/input-keyboard.png (100%)
 rename {public => htdocs}/theme/common/devices/input-mouse.png (100%)
 rename {public => htdocs}/theme/common/devices/input-tablet.png (100%)
 rename {public => htdocs}/theme/common/devices/media-flash-memory-stick.png (100%)
 rename {public => htdocs}/theme/common/devices/media-flash-sd-mmc.png (100%)
 rename {public => htdocs}/theme/common/devices/media-flash-smart-media.png (100%)
 rename {public => htdocs}/theme/common/devices/media-flash.png (100%)
 rename {public => htdocs}/theme/common/devices/media-floppy.png (100%)
 rename {public => htdocs}/theme/common/devices/media-optical-audio.png (100%)
 rename {public => htdocs}/theme/common/devices/media-optical-blu-ray.png (100%)
 rename {public => htdocs}/theme/common/devices/media-optical-data.png (100%)
 rename {public => htdocs}/theme/common/devices/media-optical-dvd-video.png (100%)
 rename {public => htdocs}/theme/common/devices/media-optical-dvd.png (100%)
 rename {public => htdocs}/theme/common/devices/media-optical-mixed-cd.png (100%)
 rename {public => htdocs}/theme/common/devices/media-optical-recordable.png (100%)
 rename {public => htdocs}/theme/common/devices/media-optical-video.png (100%)
 rename {public => htdocs}/theme/common/devices/media-optical.png (100%)
 rename {public => htdocs}/theme/common/devices/media-tape.png (100%)
 rename {public => htdocs}/theme/common/devices/modem.png (100%)
 rename {public => htdocs}/theme/common/devices/multimedia-player-apple-ipod.png (100%)
 rename {public => htdocs}/theme/common/devices/multimedia-player.png (100%)
 rename {public => htdocs}/theme/common/devices/network-wired.png (100%)
 rename {public => htdocs}/theme/common/devices/network-wireless-connected-00.png (100%)
 rename {public => htdocs}/theme/common/devices/network-wireless-connected-100.png (100%)
 rename {public => htdocs}/theme/common/devices/network-wireless-connected-25.png (100%)
 rename {public => htdocs}/theme/common/devices/network-wireless-connected-50.png (100%)
 rename {public => htdocs}/theme/common/devices/network-wireless-connected-75.png (100%)
 rename {public => htdocs}/theme/common/devices/network-wireless-disconnected.png (100%)
 rename {public => htdocs}/theme/common/devices/network-wireless.png (100%)
 rename {public => htdocs}/theme/common/devices/pda.png (100%)
 rename {public => htdocs}/theme/common/devices/phone-openmoko-freerunner.png (100%)
 rename {public => htdocs}/theme/common/devices/phone.png (100%)
 rename {public => htdocs}/theme/common/devices/printer-laser.png (100%)
 rename {public => htdocs}/theme/common/devices/printer.png (100%)
 rename {public => htdocs}/theme/common/devices/scanner.png (100%)
 rename {public => htdocs}/theme/common/devices/video-display.png (100%)
 rename {public => htdocs}/theme/common/devices/video-projector.png (100%)
 rename {public => htdocs}/theme/common/devices/video-television.png (100%)
 rename {public => htdocs}/theme/common/dolibarr_box.png (100%)
 rename {public => htdocs}/theme/common/dolibarr_logo_bw.png (100%)
 rename {public => htdocs}/theme/common/dolistore.jpg (100%)
 rename {public => htdocs}/theme/common/emotes/face-angel.png (100%)
 rename {public => htdocs}/theme/common/emotes/face-embarrassed.png (100%)
 rename {public => htdocs}/theme/common/emotes/face-kiss.png (100%)
 rename {public => htdocs}/theme/common/emotes/face-laugh.png (100%)
 rename {public => htdocs}/theme/common/emotes/face-plain.png (100%)
 rename {public => htdocs}/theme/common/emotes/face-raspberry.png (100%)
 rename {public => htdocs}/theme/common/emotes/face-sad.png (100%)
 rename {public => htdocs}/theme/common/emotes/face-smile-big.png (100%)
 rename {public => htdocs}/theme/common/emotes/face-smile.png (100%)
 rename {public => htdocs}/theme/common/emotes/face-surprise.png (100%)
 rename {public => htdocs}/theme/common/emotes/face-uncertain.png (100%)
 rename {public => htdocs}/theme/common/emotes/face-wink.png (100%)
 rename {public => htdocs}/theme/common/emotes/index.html (100%)
 rename {public => htdocs}/theme/common/flags/ad.png (100%)
 rename {public => htdocs}/theme/common/flags/ae.png (100%)
 rename {public => htdocs}/theme/common/flags/af.png (100%)
 rename {public => htdocs}/theme/common/flags/ag.png (100%)
 rename {public => htdocs}/theme/common/flags/ai.png (100%)
 rename {public => htdocs}/theme/common/flags/al.png (100%)
 rename {public => htdocs}/theme/common/flags/am.png (100%)
 rename {public => htdocs}/theme/common/flags/an.png (100%)
 rename {public => htdocs}/theme/common/flags/ao.png (100%)
 rename {public => htdocs}/theme/common/flags/ar.png (100%)
 rename {public => htdocs}/theme/common/flags/as.png (100%)
 rename {public => htdocs}/theme/common/flags/at.png (100%)
 rename {public => htdocs}/theme/common/flags/au.png (100%)
 rename {public => htdocs}/theme/common/flags/aw.png (100%)
 rename {public => htdocs}/theme/common/flags/ax.png (100%)
 rename {public => htdocs}/theme/common/flags/az.png (100%)
 rename {public => htdocs}/theme/common/flags/ba.png (100%)
 rename {public => htdocs}/theme/common/flags/bb.png (100%)
 rename {public => htdocs}/theme/common/flags/bd.png (100%)
 rename {public => htdocs}/theme/common/flags/be.png (100%)
 rename {public => htdocs}/theme/common/flags/bf.png (100%)
 rename {public => htdocs}/theme/common/flags/bg.png (100%)
 rename {public => htdocs}/theme/common/flags/bh.png (100%)
 rename {public => htdocs}/theme/common/flags/bi.png (100%)
 rename {public => htdocs}/theme/common/flags/bj.png (100%)
 rename {public => htdocs}/theme/common/flags/bm.png (100%)
 rename {public => htdocs}/theme/common/flags/bn.png (100%)
 rename {public => htdocs}/theme/common/flags/bo.png (100%)
 rename {public => htdocs}/theme/common/flags/br.png (100%)
 rename {public => htdocs}/theme/common/flags/bs.png (100%)
 rename {public => htdocs}/theme/common/flags/bt.png (100%)
 rename {public => htdocs}/theme/common/flags/bv.png (100%)
 rename {public => htdocs}/theme/common/flags/bw.png (100%)
 rename {public => htdocs}/theme/common/flags/by.png (100%)
 rename {public => htdocs}/theme/common/flags/bz.png (100%)
 rename {public => htdocs}/theme/common/flags/ca.png (100%)
 rename {public => htdocs}/theme/common/flags/catalonia.png (100%)
 rename {public => htdocs}/theme/common/flags/cc.png (100%)
 rename {public => htdocs}/theme/common/flags/cd.png (100%)
 rename {public => htdocs}/theme/common/flags/cf.png (100%)
 rename {public => htdocs}/theme/common/flags/cg.png (100%)
 rename {public => htdocs}/theme/common/flags/ch.png (100%)
 rename {public => htdocs}/theme/common/flags/ci.png (100%)
 rename {public => htdocs}/theme/common/flags/ck.png (100%)
 rename {public => htdocs}/theme/common/flags/cl.png (100%)
 rename {public => htdocs}/theme/common/flags/cm.png (100%)
 rename {public => htdocs}/theme/common/flags/cn.png (100%)
 rename {public => htdocs}/theme/common/flags/co.png (100%)
 rename {public => htdocs}/theme/common/flags/cr.png (100%)
 rename {public => htdocs}/theme/common/flags/cs.png (100%)
 rename {public => htdocs}/theme/common/flags/cu.png (100%)
 rename {public => htdocs}/theme/common/flags/cv.png (100%)
 rename {public => htdocs}/theme/common/flags/cx.png (100%)
 rename {public => htdocs}/theme/common/flags/cy.png (100%)
 rename {public => htdocs}/theme/common/flags/cz.png (100%)
 rename {public => htdocs}/theme/common/flags/de.png (100%)
 rename {public => htdocs}/theme/common/flags/dj.png (100%)
 rename {public => htdocs}/theme/common/flags/dk.png (100%)
 rename {public => htdocs}/theme/common/flags/dm.png (100%)
 rename {public => htdocs}/theme/common/flags/do.png (100%)
 rename {public => htdocs}/theme/common/flags/dz.png (100%)
 rename {public => htdocs}/theme/common/flags/ec.png (100%)
 rename {public => htdocs}/theme/common/flags/ee.png (100%)
 rename {public => htdocs}/theme/common/flags/eg.png (100%)
 rename {public => htdocs}/theme/common/flags/eh.png (100%)
 rename {public => htdocs}/theme/common/flags/en.png (100%)
 rename {public => htdocs}/theme/common/flags/england.png (100%)
 rename {public => htdocs}/theme/common/flags/er.png (100%)
 rename {public => htdocs}/theme/common/flags/es.png (100%)
 rename {public => htdocs}/theme/common/flags/et.png (100%)
 rename {public => htdocs}/theme/common/flags/eu.png (100%)
 rename {public => htdocs}/theme/common/flags/fam.png (100%)
 rename {public => htdocs}/theme/common/flags/fi.png (100%)
 rename {public => htdocs}/theme/common/flags/fj.png (100%)
 rename {public => htdocs}/theme/common/flags/fk.png (100%)
 rename {public => htdocs}/theme/common/flags/fm.png (100%)
 rename {public => htdocs}/theme/common/flags/fo.png (100%)
 rename {public => htdocs}/theme/common/flags/fr.png (100%)
 rename {public => htdocs}/theme/common/flags/ga.png (100%)
 rename {public => htdocs}/theme/common/flags/gb.png (100%)
 rename {public => htdocs}/theme/common/flags/gd.png (100%)
 rename {public => htdocs}/theme/common/flags/ge.png (100%)
 rename {public => htdocs}/theme/common/flags/gf.png (100%)
 rename {public => htdocs}/theme/common/flags/gg.png (100%)
 rename {public => htdocs}/theme/common/flags/gh.png (100%)
 rename {public => htdocs}/theme/common/flags/gi.png (100%)
 rename {public => htdocs}/theme/common/flags/gl.png (100%)
 rename {public => htdocs}/theme/common/flags/gm.png (100%)
 rename {public => htdocs}/theme/common/flags/gn.png (100%)
 rename {public => htdocs}/theme/common/flags/gp.png (100%)
 rename {public => htdocs}/theme/common/flags/gq.png (100%)
 rename {public => htdocs}/theme/common/flags/gr.png (100%)
 rename {public => htdocs}/theme/common/flags/gs.png (100%)
 rename {public => htdocs}/theme/common/flags/gt.png (100%)
 rename {public => htdocs}/theme/common/flags/gu.png (100%)
 rename {public => htdocs}/theme/common/flags/gw.png (100%)
 rename {public => htdocs}/theme/common/flags/gy.png (100%)
 rename {public => htdocs}/theme/common/flags/hk.png (100%)
 rename {public => htdocs}/theme/common/flags/hm.png (100%)
 rename {public => htdocs}/theme/common/flags/hn.png (100%)
 rename {public => htdocs}/theme/common/flags/hr.png (100%)
 rename {public => htdocs}/theme/common/flags/ht.png (100%)
 rename {public => htdocs}/theme/common/flags/hu.png (100%)
 rename {public => htdocs}/theme/common/flags/id.png (100%)
 rename {public => htdocs}/theme/common/flags/ie.png (100%)
 rename {public => htdocs}/theme/common/flags/il.png (100%)
 rename {public => htdocs}/theme/common/flags/in.png (100%)
 rename {public => htdocs}/theme/common/flags/index.html (100%)
 rename {public => htdocs}/theme/common/flags/int.png (100%)
 rename {public => htdocs}/theme/common/flags/io.png (100%)
 rename {public => htdocs}/theme/common/flags/iq.png (100%)
 rename {public => htdocs}/theme/common/flags/ir.png (100%)
 rename {public => htdocs}/theme/common/flags/is.png (100%)
 rename {public => htdocs}/theme/common/flags/it.png (100%)
 rename {public => htdocs}/theme/common/flags/jm.png (100%)
 rename {public => htdocs}/theme/common/flags/jo.png (100%)
 rename {public => htdocs}/theme/common/flags/jp.png (100%)
 rename {public => htdocs}/theme/common/flags/ke.png (100%)
 rename {public => htdocs}/theme/common/flags/kg.png (100%)
 rename {public => htdocs}/theme/common/flags/kh.png (100%)
 rename {public => htdocs}/theme/common/flags/ki.png (100%)
 rename {public => htdocs}/theme/common/flags/km.png (100%)
 rename {public => htdocs}/theme/common/flags/kn.png (100%)
 rename {public => htdocs}/theme/common/flags/kp.png (100%)
 rename {public => htdocs}/theme/common/flags/kr.png (100%)
 rename {public => htdocs}/theme/common/flags/kw.png (100%)
 rename {public => htdocs}/theme/common/flags/ky.png (100%)
 rename {public => htdocs}/theme/common/flags/kz.png (100%)
 rename {public => htdocs}/theme/common/flags/la.png (100%)
 rename {public => htdocs}/theme/common/flags/lb.png (100%)
 rename {public => htdocs}/theme/common/flags/lc.png (100%)
 rename {public => htdocs}/theme/common/flags/li.png (100%)
 rename {public => htdocs}/theme/common/flags/lk.png (100%)
 rename {public => htdocs}/theme/common/flags/lr.png (100%)
 rename {public => htdocs}/theme/common/flags/ls.png (100%)
 rename {public => htdocs}/theme/common/flags/lt.png (100%)
 rename {public => htdocs}/theme/common/flags/lu.png (100%)
 rename {public => htdocs}/theme/common/flags/lv.png (100%)
 rename {public => htdocs}/theme/common/flags/ly.png (100%)
 rename {public => htdocs}/theme/common/flags/ma.png (100%)
 rename {public => htdocs}/theme/common/flags/mc.png (100%)
 rename {public => htdocs}/theme/common/flags/md.png (100%)
 rename {public => htdocs}/theme/common/flags/me.png (100%)
 rename {public => htdocs}/theme/common/flags/mg.png (100%)
 rename {public => htdocs}/theme/common/flags/mh.png (100%)
 rename {public => htdocs}/theme/common/flags/mk.png (100%)
 rename {public => htdocs}/theme/common/flags/ml.png (100%)
 rename {public => htdocs}/theme/common/flags/mm.png (100%)
 rename {public => htdocs}/theme/common/flags/mn.png (100%)
 rename {public => htdocs}/theme/common/flags/mo.png (100%)
 rename {public => htdocs}/theme/common/flags/mp.png (100%)
 rename {public => htdocs}/theme/common/flags/mq.png (100%)
 rename {public => htdocs}/theme/common/flags/mr.png (100%)
 rename {public => htdocs}/theme/common/flags/ms.png (100%)
 rename {public => htdocs}/theme/common/flags/mt.png (100%)
 rename {public => htdocs}/theme/common/flags/mu.png (100%)
 rename {public => htdocs}/theme/common/flags/mv.png (100%)
 rename {public => htdocs}/theme/common/flags/mw.png (100%)
 rename {public => htdocs}/theme/common/flags/mx.png (100%)
 rename {public => htdocs}/theme/common/flags/my.png (100%)
 rename {public => htdocs}/theme/common/flags/mz.png (100%)
 rename {public => htdocs}/theme/common/flags/na.png (100%)
 rename {public => htdocs}/theme/common/flags/nc.png (100%)
 rename {public => htdocs}/theme/common/flags/ne.png (100%)
 rename {public => htdocs}/theme/common/flags/nf.png (100%)
 rename {public => htdocs}/theme/common/flags/ng.png (100%)
 rename {public => htdocs}/theme/common/flags/ni.png (100%)
 rename {public => htdocs}/theme/common/flags/nl.png (100%)
 rename {public => htdocs}/theme/common/flags/no.png (100%)
 rename {public => htdocs}/theme/common/flags/np.png (100%)
 rename {public => htdocs}/theme/common/flags/nr.png (100%)
 rename {public => htdocs}/theme/common/flags/nu.png (100%)
 rename {public => htdocs}/theme/common/flags/nz.png (100%)
 rename {public => htdocs}/theme/common/flags/om.png (100%)
 rename {public => htdocs}/theme/common/flags/pa.png (100%)
 rename {public => htdocs}/theme/common/flags/pe.png (100%)
 rename {public => htdocs}/theme/common/flags/pf.png (100%)
 rename {public => htdocs}/theme/common/flags/pg.png (100%)
 rename {public => htdocs}/theme/common/flags/ph.png (100%)
 rename {public => htdocs}/theme/common/flags/pk.png (100%)
 rename {public => htdocs}/theme/common/flags/pl.png (100%)
 rename {public => htdocs}/theme/common/flags/pm.png (100%)
 rename {public => htdocs}/theme/common/flags/pn.png (100%)
 rename {public => htdocs}/theme/common/flags/pr.png (100%)
 rename {public => htdocs}/theme/common/flags/ps.png (100%)
 rename {public => htdocs}/theme/common/flags/pt.png (100%)
 rename {public => htdocs}/theme/common/flags/pw.png (100%)
 rename {public => htdocs}/theme/common/flags/py.png (100%)
 rename {public => htdocs}/theme/common/flags/qa.png (100%)
 rename {public => htdocs}/theme/common/flags/re.png (100%)
 rename {public => htdocs}/theme/common/flags/ro.png (100%)
 rename {public => htdocs}/theme/common/flags/rs.png (100%)
 rename {public => htdocs}/theme/common/flags/ru.png (100%)
 rename {public => htdocs}/theme/common/flags/rw.png (100%)
 rename {public => htdocs}/theme/common/flags/sa.png (100%)
 rename {public => htdocs}/theme/common/flags/sb.png (100%)
 rename {public => htdocs}/theme/common/flags/sc.png (100%)
 rename {public => htdocs}/theme/common/flags/scotland.png (100%)
 rename {public => htdocs}/theme/common/flags/sd.png (100%)
 rename {public => htdocs}/theme/common/flags/se.png (100%)
 rename {public => htdocs}/theme/common/flags/sg.png (100%)
 rename {public => htdocs}/theme/common/flags/sh.png (100%)
 rename {public => htdocs}/theme/common/flags/si.png (100%)
 rename {public => htdocs}/theme/common/flags/sj.png (100%)
 rename {public => htdocs}/theme/common/flags/sk.png (100%)
 rename {public => htdocs}/theme/common/flags/sl.png (100%)
 rename {public => htdocs}/theme/common/flags/sm.png (100%)
 rename {public => htdocs}/theme/common/flags/sn.png (100%)
 rename {public => htdocs}/theme/common/flags/so.png (100%)
 rename {public => htdocs}/theme/common/flags/sr.png (100%)
 rename {public => htdocs}/theme/common/flags/st.png (100%)
 rename {public => htdocs}/theme/common/flags/sv.png (100%)
 rename {public => htdocs}/theme/common/flags/sy.png (100%)
 rename {public => htdocs}/theme/common/flags/sz.png (100%)
 rename {public => htdocs}/theme/common/flags/tc.png (100%)
 rename {public => htdocs}/theme/common/flags/td.png (100%)
 rename {public => htdocs}/theme/common/flags/tf.png (100%)
 rename {public => htdocs}/theme/common/flags/tg.png (100%)
 rename {public => htdocs}/theme/common/flags/th.png (100%)
 rename {public => htdocs}/theme/common/flags/tj.png (100%)
 rename {public => htdocs}/theme/common/flags/tk.png (100%)
 rename {public => htdocs}/theme/common/flags/tl.png (100%)
 rename {public => htdocs}/theme/common/flags/tm.png (100%)
 rename {public => htdocs}/theme/common/flags/tn.png (100%)
 rename {public => htdocs}/theme/common/flags/to.png (100%)
 rename {public => htdocs}/theme/common/flags/tr.png (100%)
 rename {public => htdocs}/theme/common/flags/trans.png (100%)
 rename {public => htdocs}/theme/common/flags/tt.png (100%)
 rename {public => htdocs}/theme/common/flags/tv.png (100%)
 rename {public => htdocs}/theme/common/flags/tw.png (100%)
 rename {public => htdocs}/theme/common/flags/tz.png (100%)
 rename {public => htdocs}/theme/common/flags/ua.png (100%)
 rename {public => htdocs}/theme/common/flags/ug.png (100%)
 rename {public => htdocs}/theme/common/flags/uk.png (100%)
 rename {public => htdocs}/theme/common/flags/um.png (100%)
 rename {public => htdocs}/theme/common/flags/us.png (100%)
 rename {public => htdocs}/theme/common/flags/uy.png (100%)
 rename {public => htdocs}/theme/common/flags/uz.png (100%)
 rename {public => htdocs}/theme/common/flags/va.png (100%)
 rename {public => htdocs}/theme/common/flags/vc.png (100%)
 rename {public => htdocs}/theme/common/flags/ve.png (100%)
 rename {public => htdocs}/theme/common/flags/vg.png (100%)
 rename {public => htdocs}/theme/common/flags/vi.png (100%)
 rename {public => htdocs}/theme/common/flags/vn.png (100%)
 rename {public => htdocs}/theme/common/flags/vu.png (100%)
 rename {public => htdocs}/theme/common/flags/wales.png (100%)
 rename {public => htdocs}/theme/common/flags/wf.png (100%)
 rename {public => htdocs}/theme/common/flags/ws.png (100%)
 rename {public => htdocs}/theme/common/flags/ye.png (100%)
 rename {public => htdocs}/theme/common/flags/yt.png (100%)
 rename {public => htdocs}/theme/common/flags/za.png (100%)
 rename {public => htdocs}/theme/common/flags/zm.png (100%)
 rename {public => htdocs}/theme/common/flags/zw.png (100%)
 rename {public => htdocs}/theme/common/folder-new.png (100%)
 rename {public => htdocs}/theme/common/gmap.png (100%)
 rename {public => htdocs}/theme/common/help.png (100%)
 rename {public => htdocs}/theme/common/ical.gif (100%)
 rename {public => htdocs}/theme/common/index.html (100%)
 rename {public => htdocs}/theme/common/information.png (100%)
 rename {public => htdocs}/theme/common/logo_cerfa.png (100%)
 rename {public => htdocs}/theme/common/mime/archive.png (100%)
 rename {public => htdocs}/theme/common/mime/audio.png (100%)
 rename {public => htdocs}/theme/common/mime/css.png (100%)
 rename {public => htdocs}/theme/common/mime/doc.png (100%)
 rename {public => htdocs}/theme/common/mime/dotnet.png (100%)
 rename {public => htdocs}/theme/common/mime/encrypt.png (100%)
 rename {public => htdocs}/theme/common/mime/error.png (100%)
 rename {public => htdocs}/theme/common/mime/flash.png (100%)
 rename {public => htdocs}/theme/common/mime/glasses.png (100%)
 rename {public => htdocs}/theme/common/mime/html.png (100%)
 rename {public => htdocs}/theme/common/mime/image.png (100%)
 rename {public => htdocs}/theme/common/mime/index.html (100%)
 rename {public => htdocs}/theme/common/mime/jnlp.png (100%)
 rename {public => htdocs}/theme/common/mime/jscript.png (100%)
 rename {public => htdocs}/theme/common/mime/library.png (100%)
 rename {public => htdocs}/theme/common/mime/lit.png (100%)
 rename {public => htdocs}/theme/common/mime/mdb.png (100%)
 rename {public => htdocs}/theme/common/mime/notavailable.png (100%)
 rename {public => htdocs}/theme/common/mime/ooffice.png (100%)
 rename {public => htdocs}/theme/common/mime/other.png (100%)
 rename {public => htdocs}/theme/common/mime/page.png (100%)
 rename {public => htdocs}/theme/common/mime/pdf.png (100%)
 rename {public => htdocs}/theme/common/mime/php.png (100%)
 rename {public => htdocs}/theme/common/mime/pl.png (100%)
 rename {public => htdocs}/theme/common/mime/ppt.png (100%)
 rename {public => htdocs}/theme/common/mime/readme.txt (100%)
 rename {public => htdocs}/theme/common/mime/rss.png (100%)
 rename {public => htdocs}/theme/common/mime/script.png (100%)
 rename {public => htdocs}/theme/common/mime/svg.png (100%)
 rename {public => htdocs}/theme/common/mime/text.png (100%)
 rename {public => htdocs}/theme/common/mime/ttf.png (100%)
 rename {public => htdocs}/theme/common/mime/unknown.png (100%)
 rename {public => htdocs}/theme/common/mime/video.png (100%)
 rename {public => htdocs}/theme/common/mime/xls.png (100%)
 rename {public => htdocs}/theme/common/paypal.png (100%)
 rename {public => htdocs}/theme/common/redstar.png (100%)
 rename {public => htdocs}/theme/common/rss.gif (100%)
 rename {public => htdocs}/theme/common/skype_callbutton.png (100%)
 rename {public => htdocs}/theme/common/skype_chatbutton.png (100%)
 rename {public => htdocs}/theme/common/star.png (100%)
 rename {public => htdocs}/theme/common/transform-crop-and-resize.png (100%)
 rename {public => htdocs}/theme/common/transparent.png (100%)
 rename {public => htdocs}/theme/common/treemenu/base.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/branch.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/branchbottom.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/branchtop.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/folder-expanded.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/folder.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/folder2-expanded.png (100%)
 rename {public => htdocs}/theme/common/treemenu/folder2.png (100%)
 rename {public => htdocs}/theme/common/treemenu/imgfolder.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/index.html (100%)
 rename {public => htdocs}/theme/common/treemenu/line.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/linebottom.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/minus.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/minusbottom.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/minustop.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/minustop2.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/minustop3.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/page.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/plus.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/plusbottom.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/plustop.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/plustop2.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/plustop3.gif (100%)
 rename {public => htdocs}/theme/common/treemenu/trash.gif (100%)
 rename {public => htdocs}/theme/common/vcal.gif (100%)
 rename {public => htdocs}/theme/common/view-refresh.png (100%)
 rename {public => htdocs}/theme/dolibarr.png (100%)
 rename {public => htdocs}/theme/dolibarr_logo.png (100%)
 rename {public => htdocs}/theme/dolibarr_preferred_partner_int.png (100%)
 rename {public => htdocs}/theme/doliforge_logo.png (100%)
 rename {public => htdocs}/theme/dolistore_logo.png (100%)
 rename {public => htdocs}/theme/eldy/.gitignore (100%)
 rename {public => htdocs}/theme/eldy/AUTHOR (100%)
 rename {public => htdocs}/theme/eldy/ckeditor/config.js (100%)
 rename {public => htdocs}/theme/eldy/ckeditor/index.html (100%)
 rename {public => htdocs}/theme/eldy/graph-color.php (100%)
 rename {public => htdocs}/theme/eldy/img/1downarrow.png (100%)
 rename {public => htdocs}/theme/eldy/img/1downarrow_selected.png (100%)
 rename {public => htdocs}/theme/eldy/img/1leftarrow.png (100%)
 rename {public => htdocs}/theme/eldy/img/1leftarrow_selected.png (100%)
 rename {public => htdocs}/theme/eldy/img/1rightarrow.png (100%)
 rename {public => htdocs}/theme/eldy/img/1rightarrow_selected.png (100%)
 rename {public => htdocs}/theme/eldy/img/1uparrow.png (100%)
 rename {public => htdocs}/theme/eldy/img/1uparrow_selected.png (100%)
 rename {public => htdocs}/theme/eldy/img/addfile.png (100%)
 rename {public => htdocs}/theme/eldy/img/background.png (100%)
 rename {public => htdocs}/theme/eldy/img/bg-bas-rubrique.png (100%)
 rename {public => htdocs}/theme/eldy/img/bg-rubrique.png (100%)
 rename {public => htdocs}/theme/eldy/img/bg-titre-rubrique.png (100%)
 rename {public => htdocs}/theme/eldy/img/button_bg.png (100%)
 rename {public => htdocs}/theme/eldy/img/button_edit.png (100%)
 rename {public => htdocs}/theme/eldy/img/calc.png (100%)
 rename {public => htdocs}/theme/eldy/img/calendar.png (100%)
 rename {public => htdocs}/theme/eldy/img/call.png (100%)
 rename {public => htdocs}/theme/eldy/img/call_out.png (100%)
 rename {public => htdocs}/theme/eldy/img/close.png (100%)
 rename {public => htdocs}/theme/eldy/img/close_title.png (100%)
 rename {public => htdocs}/theme/eldy/img/credit_card.png (100%)
 rename {public => htdocs}/theme/eldy/img/delete.png (100%)
 rename {public => htdocs}/theme/eldy/img/detail.png (100%)
 rename {public => htdocs}/theme/eldy/img/disable.png (100%)
 rename {public => htdocs}/theme/eldy/img/edit.png (100%)
 rename {public => htdocs}/theme/eldy/img/edit_add.png (100%)
 rename {public => htdocs}/theme/eldy/img/edit_remove.png (100%)
 rename {public => htdocs}/theme/eldy/img/editdelete.png (100%)
 rename {public => htdocs}/theme/eldy/img/error.png (100%)
 rename {public => htdocs}/theme/eldy/img/external.png (100%)
 rename {public => htdocs}/theme/eldy/img/favicon.ico (100%)
 rename {public => htdocs}/theme/eldy/img/file.png (100%)
 rename {public => htdocs}/theme/eldy/img/filenew.png (100%)
 rename {public => htdocs}/theme/eldy/img/filter.png (100%)
 rename {public => htdocs}/theme/eldy/img/folder-open.png (100%)
 rename {public => htdocs}/theme/eldy/img/folder.png (100%)
 rename {public => htdocs}/theme/eldy/img/gradient.gif (100%)
 rename {public => htdocs}/theme/eldy/img/grip.png (100%)
 rename {public => htdocs}/theme/eldy/img/grip_title.png (100%)
 rename {public => htdocs}/theme/eldy/img/headbg.jpg (100%)
 rename {public => htdocs}/theme/eldy/img/headbg2.jpg (100%)
 rename {public => htdocs}/theme/eldy/img/help.png (100%)
 rename {public => htdocs}/theme/eldy/img/helpdoc.png (100%)
 rename {public => htdocs}/theme/eldy/img/helpdoc_top.png (100%)
 rename {public => htdocs}/theme/eldy/img/high.png (100%)
 rename {public => htdocs}/theme/eldy/img/history.png (100%)
 rename {public => htdocs}/theme/eldy/img/index.html (100%)
 rename {public => htdocs}/theme/eldy/img/info.png (100%)
 rename {public => htdocs}/theme/eldy/img/info_black.png (100%)
 rename {public => htdocs}/theme/eldy/img/list.png (100%)
 rename {public => htdocs}/theme/eldy/img/liste_titre.png (100%)
 rename {public => htdocs}/theme/eldy/img/liste_titre2.png (100%)
 rename {public => htdocs}/theme/eldy/img/listlight.png (100%)
 rename {public => htdocs}/theme/eldy/img/lock.png (100%)
 rename {public => htdocs}/theme/eldy/img/login_background.png (100%)
 rename {public => htdocs}/theme/eldy/img/logo_setup.svg (100%)
 rename {public => htdocs}/theme/eldy/img/logout.png (100%)
 rename {public => htdocs}/theme/eldy/img/logout_top.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/README.md (100%)
 rename {public => htdocs}/theme/eldy/img/menus/agenda.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/agenda_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/bank.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/bank_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/chart.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/commercial.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/commercial_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/company.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/company_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/ecm.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/ecm_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/externalsite.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/externalsite_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/ftp.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/ftp_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/generic1.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/generic1_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/generic2.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/generic2_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/generic3.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/generic3_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/generic4.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/generic4_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/globe.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/globe_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/holiday.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/home.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/home_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/index.html (100%)
 rename {public => htdocs}/theme/eldy/img/menus/mail.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/mail_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/members.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/members_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/menu.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/money.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/money_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/pointofsale.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/pointofsale_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/products.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/products_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/project.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/project_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/shop.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/shop_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/tools.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus/tools_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/agenda.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/agenda_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/bank.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/bank_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/commercial.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/commercial_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/company.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/company_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/ecm.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/ecm_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/externalsite.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/externalsite_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/ftp.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/ftp_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/generic1.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/generic1_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/generic2.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/generic2_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/generic3.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/generic3_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/generic4.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/generic4_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/globe.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/globe_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/holiday.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/home.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/home_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/mail.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/mail_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/members.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/members_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/menu.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/money.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/money_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/pointofsale.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/pointofsale_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/products.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/products_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/project.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/project_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/shop.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/shop_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/tools.png (100%)
 rename {public => htdocs}/theme/eldy/img/menus_black/tools_over.png (100%)
 rename {public => htdocs}/theme/eldy/img/menutab-r.png (100%)
 rename {public => htdocs}/theme/eldy/img/nav-overlay.png (100%)
 rename {public => htdocs}/theme/eldy/img/nav-overlay3.png (100%)
 rename {public => htdocs}/theme/eldy/img/next.png (100%)
 rename {public => htdocs}/theme/eldy/img/nographyet.svg (100%)
 rename {public => htdocs}/theme/eldy/img/object_account.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_accounting.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_action.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_address.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_barcode.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_bill.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_billa.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_billd.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_billr.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_book.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_bookmark.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_building.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_calendar.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_calendarday.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_calendargantt.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_calendarpertype.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_calendarperuser.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_calendarweek.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_category-expanded.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_category.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_commercial.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_company.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_contact.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_contract.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_cron.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_dir.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_email.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_energy.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_generic.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_globe.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_gravatar.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_group.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_holiday.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_intervention.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_invoice.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_label.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_list.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_margin.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_multicurrency.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_opensurvey.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_order.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_payment.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_phoning.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_phoning_fax.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_printer.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_product.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_project.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_projectpub.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_projecttask.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_propal.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_reduc.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_resource.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_rss.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_sending.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_service.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_skype.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_stock.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_supplier_proposal.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_task.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_task_time.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_tax.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_technic.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_trip.png (100%)
 rename {public => htdocs}/theme/eldy/img/object_user.png (100%)
 rename {public => htdocs}/theme/eldy/img/off.png (100%)
 rename {public => htdocs}/theme/eldy/img/on.png (100%)
 rename {public => htdocs}/theme/eldy/img/pdf2.png (100%)
 rename {public => htdocs}/theme/eldy/img/pdf3.png (100%)
 rename {public => htdocs}/theme/eldy/img/play.png (100%)
 rename {public => htdocs}/theme/eldy/img/playdisabled.png (100%)
 rename {public => htdocs}/theme/eldy/img/preview.png (100%)
 rename {public => htdocs}/theme/eldy/img/preview_ext.png (100%)
 rename {public => htdocs}/theme/eldy/img/previous.png (100%)
 rename {public => htdocs}/theme/eldy/img/printer.png (100%)
 rename {public => htdocs}/theme/eldy/img/printer_top.png (100%)
 rename {public => htdocs}/theme/eldy/img/puce.png (100%)
 rename {public => htdocs}/theme/eldy/img/recent.png (100%)
 rename {public => htdocs}/theme/eldy/img/redstar.png (100%)
 rename {public => htdocs}/theme/eldy/img/refresh.png (100%)
 rename {public => htdocs}/theme/eldy/img/reload.png (100%)
 rename {public => htdocs}/theme/eldy/img/rightarrow.png (100%)
 rename {public => htdocs}/theme/eldy/img/search.png (100%)
 rename {public => htdocs}/theme/eldy/img/searchclear.png (100%)
 rename {public => htdocs}/theme/eldy/img/setup.png (100%)
 rename {public => htdocs}/theme/eldy/img/sort_asc.png (100%)
 rename {public => htdocs}/theme/eldy/img/sort_asc_disabled.png (100%)
 rename {public => htdocs}/theme/eldy/img/sort_desc.png (100%)
 rename {public => htdocs}/theme/eldy/img/sort_desc_disabled.png (100%)
 rename {public => htdocs}/theme/eldy/img/split.png (100%)
 rename {public => htdocs}/theme/eldy/img/star.png (100%)
 rename {public => htdocs}/theme/eldy/img/stats.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut0.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut0_40x40.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut1.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut1_40x40.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut3.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut3_40x40.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut4.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut4_40x40.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut5.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut5_40x40.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut6.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut6_40x40.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut7.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut7_40x40.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut8.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut8_40x40.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut9.png (100%)
 rename {public => htdocs}/theme/eldy/img/statut9_40x40.png (100%)
 rename {public => htdocs}/theme/eldy/img/stcomm-1.png (100%)
 rename {public => htdocs}/theme/eldy/img/stcomm0.png (100%)
 rename {public => htdocs}/theme/eldy/img/stcomm1.png (100%)
 rename {public => htdocs}/theme/eldy/img/stcomm2.png (100%)
 rename {public => htdocs}/theme/eldy/img/stcomm3.png (100%)
 rename {public => htdocs}/theme/eldy/img/stcomm4.png (100%)
 rename {public => htdocs}/theme/eldy/img/switch_off.png (100%)
 rename {public => htdocs}/theme/eldy/img/switch_on.png (100%)
 rename {public => htdocs}/theme/eldy/img/tab_background.png (100%)
 rename {public => htdocs}/theme/eldy/img/tick.png (100%)
 rename {public => htdocs}/theme/eldy/img/title.gif (100%)
 rename {public => htdocs}/theme/eldy/img/title.png (100%)
 rename {public => htdocs}/theme/eldy/img/title_accountancy.png (100%)
 rename {public => htdocs}/theme/eldy/img/title_agenda.png (100%)
 rename {public => htdocs}/theme/eldy/img/title_bank.png (100%)
 rename {public => htdocs}/theme/eldy/img/title_commercial.png (100%)
 rename {public => htdocs}/theme/eldy/img/title_companies.png (100%)
 rename {public => htdocs}/theme/eldy/img/title_generic.png (100%)
 rename {public => htdocs}/theme/eldy/img/title_home.png (100%)
 rename {public => htdocs}/theme/eldy/img/title_hrm.png (100%)
 rename {public => htdocs}/theme/eldy/img/title_products.png (100%)
 rename {public => htdocs}/theme/eldy/img/title_project.png (100%)
 rename {public => htdocs}/theme/eldy/img/title_setup.png (100%)
 rename {public => htdocs}/theme/eldy/img/tmenu.jpg (100%)
 rename {public => htdocs}/theme/eldy/img/tmenu2.jpg (100%)
 rename {public => htdocs}/theme/eldy/img/tmenu3.jpg (100%)
 rename {public => htdocs}/theme/eldy/img/tmenu_inverse.jpg (100%)
 rename {public => htdocs}/theme/eldy/img/unlock.png (100%)
 rename {public => htdocs}/theme/eldy/img/uparrow.png (100%)
 rename {public => htdocs}/theme/eldy/img/upload.png (100%)
 rename {public => htdocs}/theme/eldy/img/vcard.png (100%)
 rename {public => htdocs}/theme/eldy/img/view.png (100%)
 rename {public => htdocs}/theme/eldy/img/warning.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/index.html (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-clear-night.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-clear.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-clouds-night.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-clouds.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-few-clouds-night.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-few-clouds.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-freezing-rain.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-hail.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-many-clouds.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-mist.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-showers-day.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-showers-night.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-showers-scattered-day.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-showers-scattered-night.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-showers-scattered.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-showers.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-snow-rain.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-snow-scattered-day.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-snow-scattered-night.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-snow-scattered.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-snow.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-storm-day.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-storm-night.png (100%)
 rename {public => htdocs}/theme/eldy/img/weather/weather-storm.png (100%)
 rename {public => htdocs}/theme/eldy/img/working.gif (100%)
 rename {public => htdocs}/theme/eldy/img/working2.gif (100%)
 rename {public => htdocs}/theme/eldy/index.html (100%)
 rename {public => htdocs}/theme/eldy/style.css.php (100%)
 rename {public => htdocs}/theme/eldy/thumb.png (100%)
 rename {public => htdocs}/theme/eldy/tpl/README (100%)
 rename {public => htdocs}/theme/eldy/tpl/index.html (100%)
 rename {public => htdocs}/theme/index.html (100%)
 rename {public => htdocs}/theme/login_background.png (100%)
 rename {public => htdocs}/theme/login_logo.png (100%)
 rename {public => htdocs}/theme/md/.gitignore (100%)
 rename {public => htdocs}/theme/md/AUTHOR (100%)
 rename {public => htdocs}/theme/md/ckeditor/config.js (100%)
 rename {public => htdocs}/theme/md/ckeditor/index.html (100%)
 rename {public => htdocs}/theme/md/graph-color.php (100%)
 rename {public => htdocs}/theme/md/img/1downarrow.png (100%)
 rename {public => htdocs}/theme/md/img/1downarrow_selected.png (100%)
 rename {public => htdocs}/theme/md/img/1leftarrow.png (100%)
 rename {public => htdocs}/theme/md/img/1leftarrow_selected.png (100%)
 rename {public => htdocs}/theme/md/img/1rightarrow.png (100%)
 rename {public => htdocs}/theme/md/img/1rightarrow_selected.png (100%)
 rename {public => htdocs}/theme/md/img/1uparrow.png (100%)
 rename {public => htdocs}/theme/md/img/1uparrow_selected.png (100%)
 rename {public => htdocs}/theme/md/img/addfile.png (100%)
 rename {public => htdocs}/theme/md/img/background.png (100%)
 rename {public => htdocs}/theme/md/img/bg-bas-rubrique.png (100%)
 rename {public => htdocs}/theme/md/img/bg-rubrique.png (100%)
 rename {public => htdocs}/theme/md/img/bg-titre-rubrique.png (100%)
 rename {public => htdocs}/theme/md/img/button_bg.png (100%)
 rename {public => htdocs}/theme/md/img/button_edit.png (100%)
 rename {public => htdocs}/theme/md/img/calc.png (100%)
 rename {public => htdocs}/theme/md/img/calendar.png (100%)
 rename {public => htdocs}/theme/md/img/call.png (100%)
 rename {public => htdocs}/theme/md/img/call_out.png (100%)
 rename {public => htdocs}/theme/md/img/close.png (100%)
 rename {public => htdocs}/theme/md/img/close_title.png (100%)
 rename {public => htdocs}/theme/md/img/credit_card.png (100%)
 rename {public => htdocs}/theme/md/img/delete.png (100%)
 rename {public => htdocs}/theme/md/img/detail.png (100%)
 rename {public => htdocs}/theme/md/img/disable.png (100%)
 rename {public => htdocs}/theme/md/img/edit.png (100%)
 rename {public => htdocs}/theme/md/img/edit_add.png (100%)
 rename {public => htdocs}/theme/md/img/edit_remove.png (100%)
 rename {public => htdocs}/theme/md/img/editdelete.png (100%)
 rename {public => htdocs}/theme/md/img/error.png (100%)
 rename {public => htdocs}/theme/md/img/external.png (100%)
 rename {public => htdocs}/theme/md/img/favicon.ico (100%)
 rename {public => htdocs}/theme/md/img/file.png (100%)
 rename {public => htdocs}/theme/md/img/filenew.png (100%)
 rename {public => htdocs}/theme/md/img/filter.png (100%)
 rename {public => htdocs}/theme/md/img/folder-open.png (100%)
 rename {public => htdocs}/theme/md/img/folder.png (100%)
 rename {public => htdocs}/theme/md/img/gradient.gif (100%)
 rename {public => htdocs}/theme/md/img/grip.png (100%)
 rename {public => htdocs}/theme/md/img/grip_title.png (100%)
 rename {public => htdocs}/theme/md/img/headbg.jpg (100%)
 rename {public => htdocs}/theme/md/img/headbg2.jpg (100%)
 rename {public => htdocs}/theme/md/img/help.png (100%)
 rename {public => htdocs}/theme/md/img/helpdoc.png (100%)
 rename {public => htdocs}/theme/md/img/helpdoc_top.png (100%)
 rename {public => htdocs}/theme/md/img/high.png (100%)
 rename {public => htdocs}/theme/md/img/history.png (100%)
 rename {public => htdocs}/theme/md/img/index.html (100%)
 rename {public => htdocs}/theme/md/img/info.png (100%)
 rename {public => htdocs}/theme/md/img/info_black.png (100%)
 rename {public => htdocs}/theme/md/img/list.png (100%)
 rename {public => htdocs}/theme/md/img/liste_titre.png (100%)
 rename {public => htdocs}/theme/md/img/liste_titre2.png (100%)
 rename {public => htdocs}/theme/md/img/listlight.png (100%)
 rename {public => htdocs}/theme/md/img/lock.png (100%)
 rename {public => htdocs}/theme/md/img/login_background.png (100%)
 rename {public => htdocs}/theme/md/img/logo_setup.svg (100%)
 rename {public => htdocs}/theme/md/img/logout.png (100%)
 rename {public => htdocs}/theme/md/img/logout_top.png (100%)
 rename {public => htdocs}/theme/md/img/menu.png (100%)
 rename {public => htdocs}/theme/md/img/menus/agenda.png (100%)
 rename {public => htdocs}/theme/md/img/menus/bank.png (100%)
 rename {public => htdocs}/theme/md/img/menus/cart.png (100%)
 rename {public => htdocs}/theme/md/img/menus/chart.png (100%)
 rename {public => htdocs}/theme/md/img/menus/commercial.png (100%)
 rename {public => htdocs}/theme/md/img/menus/company.png (100%)
 rename {public => htdocs}/theme/md/img/menus/ecm.png (100%)
 rename {public => htdocs}/theme/md/img/menus/externalsite.png (100%)
 rename {public => htdocs}/theme/md/img/menus/ftp.png (100%)
 rename {public => htdocs}/theme/md/img/menus/generic1.png (100%)
 rename {public => htdocs}/theme/md/img/menus/generic2.png (100%)
 rename {public => htdocs}/theme/md/img/menus/generic3.png (100%)
 rename {public => htdocs}/theme/md/img/menus/generic4.png (100%)
 rename {public => htdocs}/theme/md/img/menus/globe.png (100%)
 rename {public => htdocs}/theme/md/img/menus/graph.png (100%)
 rename {public => htdocs}/theme/md/img/menus/holiday.png (100%)
 rename {public => htdocs}/theme/md/img/menus/home.png (100%)
 rename {public => htdocs}/theme/md/img/menus/index.html (100%)
 rename {public => htdocs}/theme/md/img/menus/mail.png (100%)
 rename {public => htdocs}/theme/md/img/menus/members.png (100%)
 rename {public => htdocs}/theme/md/img/menus/menu.png (100%)
 rename {public => htdocs}/theme/md/img/menus/money.png (100%)
 rename {public => htdocs}/theme/md/img/menus/pointofsale.png (100%)
 rename {public => htdocs}/theme/md/img/menus/products.png (100%)
 rename {public => htdocs}/theme/md/img/menus/project.png (100%)
 rename {public => htdocs}/theme/md/img/menus/shop.png (100%)
 rename {public => htdocs}/theme/md/img/menus/tools.png (100%)
 rename {public => htdocs}/theme/md/img/menutab-r.png (100%)
 rename {public => htdocs}/theme/md/img/nav-overlay.png (100%)
 rename {public => htdocs}/theme/md/img/nav-overlay3.png (100%)
 rename {public => htdocs}/theme/md/img/next.png (100%)
 rename {public => htdocs}/theme/md/img/nographyet.svg (100%)
 rename {public => htdocs}/theme/md/img/object_account.png (100%)
 rename {public => htdocs}/theme/md/img/object_accounting.png (100%)
 rename {public => htdocs}/theme/md/img/object_action.png (100%)
 rename {public => htdocs}/theme/md/img/object_address.png (100%)
 rename {public => htdocs}/theme/md/img/object_barcode.png (100%)
 rename {public => htdocs}/theme/md/img/object_bill.png (100%)
 rename {public => htdocs}/theme/md/img/object_billa.png (100%)
 rename {public => htdocs}/theme/md/img/object_billd.png (100%)
 rename {public => htdocs}/theme/md/img/object_billr.png (100%)
 rename {public => htdocs}/theme/md/img/object_book.png (100%)
 rename {public => htdocs}/theme/md/img/object_bookmark.png (100%)
 rename {public => htdocs}/theme/md/img/object_building.png (100%)
 rename {public => htdocs}/theme/md/img/object_calendar.png (100%)
 rename {public => htdocs}/theme/md/img/object_calendarday.png (100%)
 rename {public => htdocs}/theme/md/img/object_calendargantt.png (100%)
 rename {public => htdocs}/theme/md/img/object_calendarpertype.png (100%)
 rename {public => htdocs}/theme/md/img/object_calendarperuser.png (100%)
 rename {public => htdocs}/theme/md/img/object_calendarweek.png (100%)
 rename {public => htdocs}/theme/md/img/object_category-expanded.png (100%)
 rename {public => htdocs}/theme/md/img/object_category.png (100%)
 rename {public => htdocs}/theme/md/img/object_commercial.png (100%)
 rename {public => htdocs}/theme/md/img/object_company.png (100%)
 rename {public => htdocs}/theme/md/img/object_contact.png (100%)
 rename {public => htdocs}/theme/md/img/object_contract.png (100%)
 rename {public => htdocs}/theme/md/img/object_cron.png (100%)
 rename {public => htdocs}/theme/md/img/object_dir.png (100%)
 rename {public => htdocs}/theme/md/img/object_email.png (100%)
 rename {public => htdocs}/theme/md/img/object_energy.png (100%)
 rename {public => htdocs}/theme/md/img/object_generic.png (100%)
 rename {public => htdocs}/theme/md/img/object_globe.png (100%)
 rename {public => htdocs}/theme/md/img/object_gravatar.png (100%)
 rename {public => htdocs}/theme/md/img/object_group.png (100%)
 rename {public => htdocs}/theme/md/img/object_holiday.png (100%)
 rename {public => htdocs}/theme/md/img/object_intervention.png (100%)
 rename {public => htdocs}/theme/md/img/object_invoice.png (100%)
 rename {public => htdocs}/theme/md/img/object_label.png (100%)
 rename {public => htdocs}/theme/md/img/object_list.png (100%)
 rename {public => htdocs}/theme/md/img/object_margin.png (100%)
 rename {public => htdocs}/theme/md/img/object_opensurvey.png (100%)
 rename {public => htdocs}/theme/md/img/object_order.png (100%)
 rename {public => htdocs}/theme/md/img/object_payment.png (100%)
 rename {public => htdocs}/theme/md/img/object_phoning.png (100%)
 rename {public => htdocs}/theme/md/img/object_phoning_fax.png (100%)
 rename {public => htdocs}/theme/md/img/object_printer.png (100%)
 rename {public => htdocs}/theme/md/img/object_product.png (100%)
 rename {public => htdocs}/theme/md/img/object_project.png (100%)
 rename {public => htdocs}/theme/md/img/object_projectpub.png (100%)
 rename {public => htdocs}/theme/md/img/object_projecttask.png (100%)
 rename {public => htdocs}/theme/md/img/object_propal.png (100%)
 rename {public => htdocs}/theme/md/img/object_reduc.png (100%)
 rename {public => htdocs}/theme/md/img/object_resource.png (100%)
 rename {public => htdocs}/theme/md/img/object_rss.png (100%)
 rename {public => htdocs}/theme/md/img/object_sending.png (100%)
 rename {public => htdocs}/theme/md/img/object_service.png (100%)
 rename {public => htdocs}/theme/md/img/object_skype.png (100%)
 rename {public => htdocs}/theme/md/img/object_stock.png (100%)
 rename {public => htdocs}/theme/md/img/object_supplier_proposal.png (100%)
 rename {public => htdocs}/theme/md/img/object_task.png (100%)
 rename {public => htdocs}/theme/md/img/object_task_time.png (100%)
 rename {public => htdocs}/theme/md/img/object_tax.png (100%)
 rename {public => htdocs}/theme/md/img/object_technic.png (100%)
 rename {public => htdocs}/theme/md/img/object_trip.png (100%)
 rename {public => htdocs}/theme/md/img/object_user.png (100%)
 rename {public => htdocs}/theme/md/img/off.png (100%)
 rename {public => htdocs}/theme/md/img/on.png (100%)
 rename {public => htdocs}/theme/md/img/pdf2.png (100%)
 rename {public => htdocs}/theme/md/img/pdf3.png (100%)
 rename {public => htdocs}/theme/md/img/play.png (100%)
 rename {public => htdocs}/theme/md/img/playdisabled.png (100%)
 rename {public => htdocs}/theme/md/img/preview.png (100%)
 rename {public => htdocs}/theme/md/img/preview_ext.png (100%)
 rename {public => htdocs}/theme/md/img/previous.png (100%)
 rename {public => htdocs}/theme/md/img/printer.png (100%)
 rename {public => htdocs}/theme/md/img/printer_top.png (100%)
 rename {public => htdocs}/theme/md/img/puce.png (100%)
 rename {public => htdocs}/theme/md/img/recent.png (100%)
 rename {public => htdocs}/theme/md/img/redstar.png (100%)
 rename {public => htdocs}/theme/md/img/refresh.png (100%)
 rename {public => htdocs}/theme/md/img/reload.png (100%)
 rename {public => htdocs}/theme/md/img/rightarrow.png (100%)
 rename {public => htdocs}/theme/md/img/search.png (100%)
 rename {public => htdocs}/theme/md/img/searchclear.png (100%)
 rename {public => htdocs}/theme/md/img/setup.png (100%)
 rename {public => htdocs}/theme/md/img/sort_asc.png (100%)
 rename {public => htdocs}/theme/md/img/sort_asc_disabled.png (100%)
 rename {public => htdocs}/theme/md/img/sort_desc.png (100%)
 rename {public => htdocs}/theme/md/img/sort_desc_disabled.png (100%)
 rename {public => htdocs}/theme/md/img/split.png (100%)
 rename {public => htdocs}/theme/md/img/star.png (100%)
 rename {public => htdocs}/theme/md/img/stats.png (100%)
 rename {public => htdocs}/theme/md/img/statut0.png (100%)
 rename {public => htdocs}/theme/md/img/statut0_40x40.png (100%)
 rename {public => htdocs}/theme/md/img/statut1.png (100%)
 rename {public => htdocs}/theme/md/img/statut1_40x40.png (100%)
 rename {public => htdocs}/theme/md/img/statut3.png (100%)
 rename {public => htdocs}/theme/md/img/statut3_40x40.png (100%)
 rename {public => htdocs}/theme/md/img/statut4.png (100%)
 rename {public => htdocs}/theme/md/img/statut4_40x40.png (100%)
 rename {public => htdocs}/theme/md/img/statut5.png (100%)
 rename {public => htdocs}/theme/md/img/statut5_40x40.png (100%)
 rename {public => htdocs}/theme/md/img/statut6.png (100%)
 rename {public => htdocs}/theme/md/img/statut6_40x40.png (100%)
 rename {public => htdocs}/theme/md/img/statut7.png (100%)
 rename {public => htdocs}/theme/md/img/statut7_40x40.png (100%)
 rename {public => htdocs}/theme/md/img/statut8.png (100%)
 rename {public => htdocs}/theme/md/img/statut8_40x40.png (100%)
 rename {public => htdocs}/theme/md/img/statut9.png (100%)
 rename {public => htdocs}/theme/md/img/statut9_40x40.png (100%)
 rename {public => htdocs}/theme/md/img/stcomm-1.png (100%)
 rename {public => htdocs}/theme/md/img/stcomm0.png (100%)
 rename {public => htdocs}/theme/md/img/stcomm1.png (100%)
 rename {public => htdocs}/theme/md/img/stcomm2.png (100%)
 rename {public => htdocs}/theme/md/img/stcomm3.png (100%)
 rename {public => htdocs}/theme/md/img/stcomm4.png (100%)
 rename {public => htdocs}/theme/md/img/switch_off.png (100%)
 rename {public => htdocs}/theme/md/img/switch_off_old.png (100%)
 rename {public => htdocs}/theme/md/img/switch_on.png (100%)
 rename {public => htdocs}/theme/md/img/switch_on_old.png (100%)
 rename {public => htdocs}/theme/md/img/tab_background.png (100%)
 rename {public => htdocs}/theme/md/img/tick.png (100%)
 rename {public => htdocs}/theme/md/img/title.gif (100%)
 rename {public => htdocs}/theme/md/img/title.png (100%)
 rename {public => htdocs}/theme/md/img/title_accountancy.png (100%)
 rename {public => htdocs}/theme/md/img/title_agenda.png (100%)
 rename {public => htdocs}/theme/md/img/title_bank.png (100%)
 rename {public => htdocs}/theme/md/img/title_commercial.png (100%)
 rename {public => htdocs}/theme/md/img/title_companies.png (100%)
 rename {public => htdocs}/theme/md/img/title_generic.png (100%)
 rename {public => htdocs}/theme/md/img/title_home.png (100%)
 rename {public => htdocs}/theme/md/img/title_hrm.png (100%)
 rename {public => htdocs}/theme/md/img/title_products.png (100%)
 rename {public => htdocs}/theme/md/img/title_project.png (100%)
 rename {public => htdocs}/theme/md/img/title_setup.png (100%)
 rename {public => htdocs}/theme/md/img/tmenu.jpg (100%)
 rename {public => htdocs}/theme/md/img/tmenu2.jpg (100%)
 rename {public => htdocs}/theme/md/img/tmenu3.jpg (100%)
 rename {public => htdocs}/theme/md/img/tmenu_inverse.jpg (100%)
 rename {public => htdocs}/theme/md/img/unlock.png (100%)
 rename {public => htdocs}/theme/md/img/uparrow.png (100%)
 rename {public => htdocs}/theme/md/img/upload.png (100%)
 rename {public => htdocs}/theme/md/img/vcard.png (100%)
 rename {public => htdocs}/theme/md/img/view.png (100%)
 rename {public => htdocs}/theme/md/img/warning.png (100%)
 rename {public => htdocs}/theme/md/img/weather/index.html (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-clear-night.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-clear.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-clouds-night.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-clouds.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-few-clouds-night.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-few-clouds.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-freezing-rain.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-hail.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-many-clouds.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-mist.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-showers-day.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-showers-night.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-showers-scattered-day.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-showers-scattered-night.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-showers-scattered.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-showers.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-snow-rain.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-snow-scattered-day.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-snow-scattered-night.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-snow-scattered.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-snow.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-storm-day.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-storm-night.png (100%)
 rename {public => htdocs}/theme/md/img/weather/weather-storm.png (100%)
 rename {public => htdocs}/theme/md/img/working.gif (100%)
 rename {public => htdocs}/theme/md/img/working2.gif (100%)
 rename {public => htdocs}/theme/md/index.html (100%)
 rename {public => htdocs}/theme/md/style.css.php (100%)
 rename {public => htdocs}/theme/md/thumb.png (100%)
 rename {public => htdocs}/theme/md/tpl/README (100%)
 rename {public => htdocs}/theme/md/tpl/index.html (100%)
 rename {public => htdocs}/user/admin/group_extrafields.php (100%)
 rename {public => htdocs}/user/admin/index.html (100%)
 rename {public => htdocs}/user/admin/user_extrafields.php (100%)
 rename {public => htdocs}/user/agenda_extsites.php (100%)
 rename {public => htdocs}/user/bank.php (100%)
 rename {public => htdocs}/user/card.php (100%)
 rename {public => htdocs}/user/class/api_deprecated_user.class.php (100%)
 rename {public => htdocs}/user/class/api_users.class.php (100%)
 rename {public => htdocs}/user/class/index.html (100%)
 rename {public => htdocs}/user/class/user.class.php (100%)
 rename {public => htdocs}/user/class/userbankaccount.class.php (100%)
 rename {public => htdocs}/user/class/usergroup.class.php (100%)
 rename {public => htdocs}/user/clicktodial.php (100%)
 rename {public => htdocs}/user/document.php (100%)
 rename {public => htdocs}/user/group/card.php (100%)
 rename {public => htdocs}/user/group/index.php (100%)
 rename {public => htdocs}/user/group/ldap.php (100%)
 rename {public => htdocs}/user/group/perms.php (100%)
 rename {public => htdocs}/user/hierarchy.php (100%)
 rename {public => htdocs}/user/home.php (100%)
 rename {public => htdocs}/user/index.php (100%)
 rename {public => htdocs}/user/info.php (100%)
 rename {public => htdocs}/user/ldap.php (100%)
 rename {public => htdocs}/user/logout.php (100%)
 rename {public => htdocs}/user/note.php (100%)
 rename {public => htdocs}/user/notify/card.php (100%)
 rename {public => htdocs}/user/param_ihm.php (100%)
 rename {public => htdocs}/user/passwordforgotten.php (100%)
 rename {public => htdocs}/user/perms.php (100%)
 rename {public => htdocs}/viewimage.php (100%)
 rename {public => htdocs}/webservices/README.md (100%)
 rename {public => htdocs}/webservices/admin/index.php (100%)
 rename {public => htdocs}/webservices/demo_wsclient_actioncomm.php-NORUN (100%)
 rename {public => htdocs}/webservices/demo_wsclient_category.php-NORUN (100%)
 rename {public => htdocs}/webservices/demo_wsclient_invoice.php-NORUN (100%)
 rename {public => htdocs}/webservices/demo_wsclient_order.php-NORUN (100%)
 rename {public => htdocs}/webservices/demo_wsclient_other.php-NORUN (100%)
 rename {public => htdocs}/webservices/demo_wsclient_productorservice.php-NORUN (100%)
 rename {public => htdocs}/webservices/demo_wsclient_project.php-NORUN (100%)
 rename {public => htdocs}/webservices/demo_wsclient_thirdparty.php-NORUN (100%)
 rename {public => htdocs}/webservices/index.php (100%)
 rename {public => htdocs}/webservices/server_actioncomm.php (100%)
 rename {public => htdocs}/webservices/server_category.php (100%)
 rename {public => htdocs}/webservices/server_contact.php (100%)
 rename {public => htdocs}/webservices/server_invoice.php (100%)
 rename {public => htdocs}/webservices/server_order.php (100%)
 rename {public => htdocs}/webservices/server_other.php (100%)
 rename {public => htdocs}/webservices/server_productorservice.php (100%)
 rename {public => htdocs}/webservices/server_project.php (100%)
 rename {public => htdocs}/webservices/server_supplier_invoice.php (100%)
 rename {public => htdocs}/webservices/server_thirdparty.php (100%)
 rename {public => htdocs}/webservices/server_user.php (100%)
 rename {public => htdocs}/websites/class/website.class.php (100%)
 rename {public => htdocs}/websites/class/websitepage.class.php (100%)
 rename {public => htdocs}/websites/frametop.php (100%)
 rename {public => htdocs}/websites/index.html (100%)
 rename {public => htdocs}/websites/index.php (100%)

diff --git a/public/.gitignore b/htdocs/.gitignore
similarity index 100%
rename from public/.gitignore
rename to htdocs/.gitignore
diff --git a/public/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
similarity index 100%
rename from public/accountancy/admin/account.php
rename to htdocs/accountancy/admin/account.php
diff --git a/public/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
similarity index 100%
rename from public/accountancy/admin/accountmodel.php
rename to htdocs/accountancy/admin/accountmodel.php
diff --git a/public/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
similarity index 100%
rename from public/accountancy/admin/card.php
rename to htdocs/accountancy/admin/card.php
diff --git a/public/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
similarity index 100%
rename from public/accountancy/admin/categories.php
rename to htdocs/accountancy/admin/categories.php
diff --git a/public/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
similarity index 100%
rename from public/accountancy/admin/defaultaccounts.php
rename to htdocs/accountancy/admin/defaultaccounts.php
diff --git a/public/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
similarity index 100%
rename from public/accountancy/admin/export.php
rename to htdocs/accountancy/admin/export.php
diff --git a/public/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
similarity index 100%
rename from public/accountancy/admin/fiscalyear.php
rename to htdocs/accountancy/admin/fiscalyear.php
diff --git a/public/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
similarity index 100%
rename from public/accountancy/admin/fiscalyear_card.php
rename to htdocs/accountancy/admin/fiscalyear_card.php
diff --git a/public/accountancy/admin/fiscalyear_info.php b/htdocs/accountancy/admin/fiscalyear_info.php
similarity index 100%
rename from public/accountancy/admin/fiscalyear_info.php
rename to htdocs/accountancy/admin/fiscalyear_info.php
diff --git a/public/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
similarity index 100%
rename from public/accountancy/admin/importaccounts.php
rename to htdocs/accountancy/admin/importaccounts.php
diff --git a/public/accountancy/admin/index.html b/htdocs/accountancy/admin/index.html
similarity index 100%
rename from public/accountancy/admin/index.html
rename to htdocs/accountancy/admin/index.html
diff --git a/public/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
similarity index 100%
rename from public/accountancy/admin/index.php
rename to htdocs/accountancy/admin/index.php
diff --git a/public/accountancy/admin/journal.php b/htdocs/accountancy/admin/journal.php
similarity index 100%
rename from public/accountancy/admin/journal.php
rename to htdocs/accountancy/admin/journal.php
diff --git a/public/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
similarity index 100%
rename from public/accountancy/admin/productaccount.php
rename to htdocs/accountancy/admin/productaccount.php
diff --git a/public/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
similarity index 100%
rename from public/accountancy/bookkeeping/balance.php
rename to htdocs/accountancy/bookkeeping/balance.php
diff --git a/public/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php
similarity index 100%
rename from public/accountancy/bookkeeping/balancebymonth.php
rename to htdocs/accountancy/bookkeeping/balancebymonth.php
diff --git a/public/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
similarity index 100%
rename from public/accountancy/bookkeeping/card.php
rename to htdocs/accountancy/bookkeeping/card.php
diff --git a/public/accountancy/bookkeeping/index.html b/htdocs/accountancy/bookkeeping/index.html
similarity index 100%
rename from public/accountancy/bookkeeping/index.html
rename to htdocs/accountancy/bookkeeping/index.html
diff --git a/public/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
similarity index 100%
rename from public/accountancy/bookkeeping/list.php
rename to htdocs/accountancy/bookkeeping/list.php
diff --git a/public/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
similarity index 100%
rename from public/accountancy/bookkeeping/listbyaccount.php
rename to htdocs/accountancy/bookkeeping/listbyaccount.php
diff --git a/public/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
similarity index 100%
rename from public/accountancy/bookkeeping/listbyyear.php
rename to htdocs/accountancy/bookkeeping/listbyyear.php
diff --git a/public/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
similarity index 100%
rename from public/accountancy/class/accountancycategory.class.php
rename to htdocs/accountancy/class/accountancycategory.class.php
diff --git a/public/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
similarity index 100%
rename from public/accountancy/class/accountancyexport.class.php
rename to htdocs/accountancy/class/accountancyexport.class.php
diff --git a/public/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
similarity index 100%
rename from public/accountancy/class/accountancysystem.class.php
rename to htdocs/accountancy/class/accountancysystem.class.php
diff --git a/public/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
similarity index 100%
rename from public/accountancy/class/accountingaccount.class.php
rename to htdocs/accountancy/class/accountingaccount.class.php
diff --git a/public/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
similarity index 100%
rename from public/accountancy/class/bookkeeping.class.php
rename to htdocs/accountancy/class/bookkeeping.class.php
diff --git a/public/accountancy/class/html.formventilation.class.php b/htdocs/accountancy/class/html.formventilation.class.php
similarity index 100%
rename from public/accountancy/class/html.formventilation.class.php
rename to htdocs/accountancy/class/html.formventilation.class.php
diff --git a/public/accountancy/class/index.html b/htdocs/accountancy/class/index.html
similarity index 100%
rename from public/accountancy/class/index.html
rename to htdocs/accountancy/class/index.html
diff --git a/public/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
similarity index 100%
rename from public/accountancy/customer/card.php
rename to htdocs/accountancy/customer/card.php
diff --git a/public/accountancy/customer/index.html b/htdocs/accountancy/customer/index.html
similarity index 100%
rename from public/accountancy/customer/index.html
rename to htdocs/accountancy/customer/index.html
diff --git a/public/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
similarity index 100%
rename from public/accountancy/customer/index.php
rename to htdocs/accountancy/customer/index.php
diff --git a/public/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
similarity index 100%
rename from public/accountancy/customer/lines.php
rename to htdocs/accountancy/customer/lines.php
diff --git a/public/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
similarity index 100%
rename from public/accountancy/customer/list.php
rename to htdocs/accountancy/customer/list.php
diff --git a/public/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
similarity index 100%
rename from public/accountancy/expensereport/card.php
rename to htdocs/accountancy/expensereport/card.php
diff --git a/public/accountancy/expensereport/index.html b/htdocs/accountancy/expensereport/index.html
similarity index 100%
rename from public/accountancy/expensereport/index.html
rename to htdocs/accountancy/expensereport/index.html
diff --git a/public/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
similarity index 100%
rename from public/accountancy/expensereport/index.php
rename to htdocs/accountancy/expensereport/index.php
diff --git a/public/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
similarity index 100%
rename from public/accountancy/expensereport/lines.php
rename to htdocs/accountancy/expensereport/lines.php
diff --git a/public/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
similarity index 100%
rename from public/accountancy/expensereport/list.php
rename to htdocs/accountancy/expensereport/list.php
diff --git a/public/accountancy/index.html b/htdocs/accountancy/index.html
similarity index 100%
rename from public/accountancy/index.html
rename to htdocs/accountancy/index.html
diff --git a/public/accountancy/index.php b/htdocs/accountancy/index.php
similarity index 100%
rename from public/accountancy/index.php
rename to htdocs/accountancy/index.php
diff --git a/public/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
similarity index 100%
rename from public/accountancy/journal/bankjournal.php
rename to htdocs/accountancy/journal/bankjournal.php
diff --git a/public/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
similarity index 100%
rename from public/accountancy/journal/expensereportsjournal.php
rename to htdocs/accountancy/journal/expensereportsjournal.php
diff --git a/public/accountancy/journal/index.html b/htdocs/accountancy/journal/index.html
similarity index 100%
rename from public/accountancy/journal/index.html
rename to htdocs/accountancy/journal/index.html
diff --git a/public/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
similarity index 100%
rename from public/accountancy/journal/purchasesjournal.php
rename to htdocs/accountancy/journal/purchasesjournal.php
diff --git a/public/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
similarity index 100%
rename from public/accountancy/journal/sellsjournal.php
rename to htdocs/accountancy/journal/sellsjournal.php
diff --git a/public/accountancy/report/index.html b/htdocs/accountancy/report/index.html
similarity index 100%
rename from public/accountancy/report/index.html
rename to htdocs/accountancy/report/index.html
diff --git a/public/accountancy/report/result.php b/htdocs/accountancy/report/result.php
similarity index 100%
rename from public/accountancy/report/result.php
rename to htdocs/accountancy/report/result.php
diff --git a/public/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
similarity index 100%
rename from public/accountancy/supplier/card.php
rename to htdocs/accountancy/supplier/card.php
diff --git a/public/accountancy/supplier/index.html b/htdocs/accountancy/supplier/index.html
similarity index 100%
rename from public/accountancy/supplier/index.html
rename to htdocs/accountancy/supplier/index.html
diff --git a/public/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
similarity index 100%
rename from public/accountancy/supplier/index.php
rename to htdocs/accountancy/supplier/index.php
diff --git a/public/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
similarity index 100%
rename from public/accountancy/supplier/lines.php
rename to htdocs/accountancy/supplier/lines.php
diff --git a/public/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
similarity index 100%
rename from public/accountancy/supplier/list.php
rename to htdocs/accountancy/supplier/list.php
diff --git a/public/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
similarity index 100%
rename from public/accountancy/tpl/export_journal.tpl.php
rename to htdocs/accountancy/tpl/export_journal.tpl.php
diff --git a/public/accountancy/tpl/index.html b/htdocs/accountancy/tpl/index.html
similarity index 100%
rename from public/accountancy/tpl/index.html
rename to htdocs/accountancy/tpl/index.html
diff --git a/public/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
similarity index 100%
rename from public/adherents/admin/adherent.php
rename to htdocs/adherents/admin/adherent.php
diff --git a/public/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
similarity index 100%
rename from public/adherents/admin/adherent_extrafields.php
rename to htdocs/adherents/admin/adherent_extrafields.php
diff --git a/public/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php
similarity index 100%
rename from public/adherents/admin/adherent_type_extrafields.php
rename to htdocs/adherents/admin/adherent_type_extrafields.php
diff --git a/public/adherents/admin/index.html b/htdocs/adherents/admin/index.html
similarity index 100%
rename from public/adherents/admin/index.html
rename to htdocs/adherents/admin/index.html
diff --git a/public/adherents/admin/public.php b/htdocs/adherents/admin/public.php
similarity index 100%
rename from public/adherents/admin/public.php
rename to htdocs/adherents/admin/public.php
diff --git a/public/adherents/agenda.php b/htdocs/adherents/agenda.php
similarity index 100%
rename from public/adherents/agenda.php
rename to htdocs/adherents/agenda.php
diff --git a/public/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
similarity index 100%
rename from public/adherents/canvas/actions_adherentcard_common.class.php
rename to htdocs/adherents/canvas/actions_adherentcard_common.class.php
diff --git a/public/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
similarity index 100%
rename from public/adherents/canvas/default/actions_adherentcard_default.class.php
rename to htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
diff --git a/public/adherents/canvas/default/index.html b/htdocs/adherents/canvas/default/index.html
similarity index 100%
rename from public/adherents/canvas/default/index.html
rename to htdocs/adherents/canvas/default/index.html
diff --git a/public/adherents/canvas/default/tpl/adherentcard_create.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
similarity index 100%
rename from public/adherents/canvas/default/tpl/adherentcard_create.tpl.php
rename to htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
diff --git a/public/adherents/canvas/default/tpl/adherentcard_edit.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
similarity index 100%
rename from public/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
rename to htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
diff --git a/public/adherents/canvas/default/tpl/adherentcard_view.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
similarity index 100%
rename from public/adherents/canvas/default/tpl/adherentcard_view.tpl.php
rename to htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
diff --git a/public/adherents/canvas/default/tpl/index.html b/htdocs/adherents/canvas/default/tpl/index.html
similarity index 100%
rename from public/adherents/canvas/default/tpl/index.html
rename to htdocs/adherents/canvas/default/tpl/index.html
diff --git a/public/adherents/canvas/index.html b/htdocs/adherents/canvas/index.html
similarity index 100%
rename from public/adherents/canvas/index.html
rename to htdocs/adherents/canvas/index.html
diff --git a/public/adherents/card.php b/htdocs/adherents/card.php
similarity index 100%
rename from public/adherents/card.php
rename to htdocs/adherents/card.php
diff --git a/public/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
similarity index 100%
rename from public/adherents/cartes/carte.php
rename to htdocs/adherents/cartes/carte.php
diff --git a/public/adherents/cartes/index.html b/htdocs/adherents/cartes/index.html
similarity index 100%
rename from public/adherents/cartes/index.html
rename to htdocs/adherents/cartes/index.html
diff --git a/public/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
similarity index 100%
rename from public/adherents/class/adherent.class.php
rename to htdocs/adherents/class/adherent.class.php
diff --git a/public/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
similarity index 100%
rename from public/adherents/class/adherent_type.class.php
rename to htdocs/adherents/class/adherent_type.class.php
diff --git a/public/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
similarity index 100%
rename from public/adherents/class/adherentstats.class.php
rename to htdocs/adherents/class/adherentstats.class.php
diff --git a/public/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
similarity index 100%
rename from public/adherents/class/api_members.class.php
rename to htdocs/adherents/class/api_members.class.php
diff --git a/public/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
similarity index 100%
rename from public/adherents/class/api_subscriptions.class.php
rename to htdocs/adherents/class/api_subscriptions.class.php
diff --git a/public/adherents/class/index.html b/htdocs/adherents/class/index.html
similarity index 100%
rename from public/adherents/class/index.html
rename to htdocs/adherents/class/index.html
diff --git a/public/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
similarity index 100%
rename from public/adherents/class/subscription.class.php
rename to htdocs/adherents/class/subscription.class.php
diff --git a/public/adherents/document.php b/htdocs/adherents/document.php
similarity index 100%
rename from public/adherents/document.php
rename to htdocs/adherents/document.php
diff --git a/public/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php
similarity index 100%
rename from public/adherents/htpasswd.php
rename to htdocs/adherents/htpasswd.php
diff --git a/public/adherents/index.php b/htdocs/adherents/index.php
similarity index 100%
rename from public/adherents/index.php
rename to htdocs/adherents/index.php
diff --git a/public/adherents/ldap.php b/htdocs/adherents/ldap.php
similarity index 100%
rename from public/adherents/ldap.php
rename to htdocs/adherents/ldap.php
diff --git a/public/adherents/list.php b/htdocs/adherents/list.php
similarity index 100%
rename from public/adherents/list.php
rename to htdocs/adherents/list.php
diff --git a/public/adherents/note.php b/htdocs/adherents/note.php
similarity index 100%
rename from public/adherents/note.php
rename to htdocs/adherents/note.php
diff --git a/public/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
similarity index 100%
rename from public/adherents/stats/byproperties.php
rename to htdocs/adherents/stats/byproperties.php
diff --git a/public/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
similarity index 100%
rename from public/adherents/stats/geo.php
rename to htdocs/adherents/stats/geo.php
diff --git a/public/adherents/stats/index.html b/htdocs/adherents/stats/index.html
similarity index 100%
rename from public/adherents/stats/index.html
rename to htdocs/adherents/stats/index.html
diff --git a/public/adherents/stats/index.php b/htdocs/adherents/stats/index.php
similarity index 100%
rename from public/adherents/stats/index.php
rename to htdocs/adherents/stats/index.php
diff --git a/public/adherents/subscription.php b/htdocs/adherents/subscription.php
similarity index 100%
rename from public/adherents/subscription.php
rename to htdocs/adherents/subscription.php
diff --git a/public/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
similarity index 100%
rename from public/adherents/subscription/card.php
rename to htdocs/adherents/subscription/card.php
diff --git a/public/adherents/subscription/index.html b/htdocs/adherents/subscription/index.html
similarity index 100%
rename from public/adherents/subscription/index.html
rename to htdocs/adherents/subscription/index.html
diff --git a/public/adherents/subscription/info.php b/htdocs/adherents/subscription/info.php
similarity index 100%
rename from public/adherents/subscription/info.php
rename to htdocs/adherents/subscription/info.php
diff --git a/public/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
similarity index 100%
rename from public/adherents/subscription/list.php
rename to htdocs/adherents/subscription/list.php
diff --git a/public/adherents/tpl/index.html b/htdocs/adherents/tpl/index.html
similarity index 100%
rename from public/adherents/tpl/index.html
rename to htdocs/adherents/tpl/index.html
diff --git a/public/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from public/adherents/tpl/linkedobjectblock.tpl.php
rename to htdocs/adherents/tpl/linkedobjectblock.tpl.php
diff --git a/public/adherents/type.php b/htdocs/adherents/type.php
similarity index 100%
rename from public/adherents/type.php
rename to htdocs/adherents/type.php
diff --git a/public/admin/agenda.php b/htdocs/admin/agenda.php
similarity index 100%
rename from public/admin/agenda.php
rename to htdocs/admin/agenda.php
diff --git a/public/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php
similarity index 100%
rename from public/admin/agenda_extrafields.php
rename to htdocs/admin/agenda_extrafields.php
diff --git a/public/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
similarity index 100%
rename from public/admin/agenda_extsites.php
rename to htdocs/admin/agenda_extsites.php
diff --git a/public/admin/agenda_other.php b/htdocs/admin/agenda_other.php
similarity index 100%
rename from public/admin/agenda_other.php
rename to htdocs/admin/agenda_other.php
diff --git a/public/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
similarity index 100%
rename from public/admin/agenda_xcal.php
rename to htdocs/admin/agenda_xcal.php
diff --git a/public/admin/bank.php b/htdocs/admin/bank.php
similarity index 100%
rename from public/admin/bank.php
rename to htdocs/admin/bank.php
diff --git a/public/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php
similarity index 100%
rename from public/admin/bank_extrafields.php
rename to htdocs/admin/bank_extrafields.php
diff --git a/public/admin/barcode.php b/htdocs/admin/barcode.php
similarity index 100%
rename from public/admin/barcode.php
rename to htdocs/admin/barcode.php
diff --git a/public/admin/boxes.php b/htdocs/admin/boxes.php
similarity index 100%
rename from public/admin/boxes.php
rename to htdocs/admin/boxes.php
diff --git a/public/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
similarity index 100%
rename from public/admin/chequereceipts.php
rename to htdocs/admin/chequereceipts.php
diff --git a/public/admin/clicktodial.php b/htdocs/admin/clicktodial.php
similarity index 100%
rename from public/admin/clicktodial.php
rename to htdocs/admin/clicktodial.php
diff --git a/public/admin/commande.php b/htdocs/admin/commande.php
similarity index 100%
rename from public/admin/commande.php
rename to htdocs/admin/commande.php
diff --git a/public/admin/company.php b/htdocs/admin/company.php
similarity index 100%
rename from public/admin/company.php
rename to htdocs/admin/company.php
diff --git a/public/admin/compta.php b/htdocs/admin/compta.php
similarity index 100%
rename from public/admin/compta.php
rename to htdocs/admin/compta.php
diff --git a/public/admin/confexped.php b/htdocs/admin/confexped.php
similarity index 100%
rename from public/admin/confexped.php
rename to htdocs/admin/confexped.php
diff --git a/public/admin/const.php b/htdocs/admin/const.php
similarity index 100%
rename from public/admin/const.php
rename to htdocs/admin/const.php
diff --git a/public/admin/contract.php b/htdocs/admin/contract.php
similarity index 100%
rename from public/admin/contract.php
rename to htdocs/admin/contract.php
diff --git a/public/admin/delais.php b/htdocs/admin/delais.php
similarity index 100%
rename from public/admin/delais.php
rename to htdocs/admin/delais.php
diff --git a/public/admin/dict.php b/htdocs/admin/dict.php
similarity index 100%
rename from public/admin/dict.php
rename to htdocs/admin/dict.php
diff --git a/public/admin/ecm.php b/htdocs/admin/ecm.php
similarity index 100%
rename from public/admin/ecm.php
rename to htdocs/admin/ecm.php
diff --git a/public/admin/events.php b/htdocs/admin/events.php
similarity index 100%
rename from public/admin/events.php
rename to htdocs/admin/events.php
diff --git a/public/admin/expedition.php b/htdocs/admin/expedition.php
similarity index 100%
rename from public/admin/expedition.php
rename to htdocs/admin/expedition.php
diff --git a/public/admin/expedition_extrafields.php b/htdocs/admin/expedition_extrafields.php
similarity index 100%
rename from public/admin/expedition_extrafields.php
rename to htdocs/admin/expedition_extrafields.php
diff --git a/public/admin/expeditiondet_extrafields.php b/htdocs/admin/expeditiondet_extrafields.php
similarity index 100%
rename from public/admin/expeditiondet_extrafields.php
rename to htdocs/admin/expeditiondet_extrafields.php
diff --git a/public/admin/expensereport.php b/htdocs/admin/expensereport.php
similarity index 100%
rename from public/admin/expensereport.php
rename to htdocs/admin/expensereport.php
diff --git a/public/admin/expensereport_extrafields.php b/htdocs/admin/expensereport_extrafields.php
similarity index 100%
rename from public/admin/expensereport_extrafields.php
rename to htdocs/admin/expensereport_extrafields.php
diff --git a/public/admin/external_rss.php b/htdocs/admin/external_rss.php
similarity index 100%
rename from public/admin/external_rss.php
rename to htdocs/admin/external_rss.php
diff --git a/public/admin/facture.php b/htdocs/admin/facture.php
similarity index 100%
rename from public/admin/facture.php
rename to htdocs/admin/facture.php
diff --git a/public/admin/fckeditor.php b/htdocs/admin/fckeditor.php
similarity index 100%
rename from public/admin/fckeditor.php
rename to htdocs/admin/fckeditor.php
diff --git a/public/admin/fichinter.php b/htdocs/admin/fichinter.php
similarity index 100%
rename from public/admin/fichinter.php
rename to htdocs/admin/fichinter.php
diff --git a/public/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
similarity index 100%
rename from public/admin/geoipmaxmind.php
rename to htdocs/admin/geoipmaxmind.php
diff --git a/public/admin/ihm.php b/htdocs/admin/ihm.php
similarity index 100%
rename from public/admin/ihm.php
rename to htdocs/admin/ihm.php
diff --git a/public/admin/index.php b/htdocs/admin/index.php
similarity index 100%
rename from public/admin/index.php
rename to htdocs/admin/index.php
diff --git a/public/admin/ldap.php b/htdocs/admin/ldap.php
similarity index 100%
rename from public/admin/ldap.php
rename to htdocs/admin/ldap.php
diff --git a/public/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
similarity index 100%
rename from public/admin/ldap_contacts.php
rename to htdocs/admin/ldap_contacts.php
diff --git a/public/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
similarity index 100%
rename from public/admin/ldap_groups.php
rename to htdocs/admin/ldap_groups.php
diff --git a/public/admin/ldap_members.php b/htdocs/admin/ldap_members.php
similarity index 100%
rename from public/admin/ldap_members.php
rename to htdocs/admin/ldap_members.php
diff --git a/public/admin/ldap_users.php b/htdocs/admin/ldap_users.php
similarity index 100%
rename from public/admin/ldap_users.php
rename to htdocs/admin/ldap_users.php
diff --git a/public/admin/limits.php b/htdocs/admin/limits.php
similarity index 100%
rename from public/admin/limits.php
rename to htdocs/admin/limits.php
diff --git a/public/admin/livraison.php b/htdocs/admin/livraison.php
similarity index 100%
rename from public/admin/livraison.php
rename to htdocs/admin/livraison.php
diff --git a/public/admin/livraison_extrafields.php b/htdocs/admin/livraison_extrafields.php
similarity index 100%
rename from public/admin/livraison_extrafields.php
rename to htdocs/admin/livraison_extrafields.php
diff --git a/public/admin/livraisondet_extrafields.php b/htdocs/admin/livraisondet_extrafields.php
similarity index 100%
rename from public/admin/livraisondet_extrafields.php
rename to htdocs/admin/livraisondet_extrafields.php
diff --git a/public/admin/loan.php b/htdocs/admin/loan.php
similarity index 100%
rename from public/admin/loan.php
rename to htdocs/admin/loan.php
diff --git a/public/admin/mailing.php b/htdocs/admin/mailing.php
similarity index 100%
rename from public/admin/mailing.php
rename to htdocs/admin/mailing.php
diff --git a/public/admin/mailman.php b/htdocs/admin/mailman.php
similarity index 100%
rename from public/admin/mailman.php
rename to htdocs/admin/mailman.php
diff --git a/public/admin/mails.php b/htdocs/admin/mails.php
similarity index 100%
rename from public/admin/mails.php
rename to htdocs/admin/mails.php
diff --git a/public/admin/menus.php b/htdocs/admin/menus.php
similarity index 100%
rename from public/admin/menus.php
rename to htdocs/admin/menus.php
diff --git a/public/admin/menus/edit.php b/htdocs/admin/menus/edit.php
similarity index 100%
rename from public/admin/menus/edit.php
rename to htdocs/admin/menus/edit.php
diff --git a/public/admin/menus/index.php b/htdocs/admin/menus/index.php
similarity index 100%
rename from public/admin/menus/index.php
rename to htdocs/admin/menus/index.php
diff --git a/public/admin/menus/other.php b/htdocs/admin/menus/other.php
similarity index 100%
rename from public/admin/menus/other.php
rename to htdocs/admin/menus/other.php
diff --git a/public/admin/modules.php b/htdocs/admin/modules.php
similarity index 100%
rename from public/admin/modules.php
rename to htdocs/admin/modules.php
diff --git a/public/admin/multicurrency.php b/htdocs/admin/multicurrency.php
similarity index 100%
rename from public/admin/multicurrency.php
rename to htdocs/admin/multicurrency.php
diff --git a/public/admin/notification.php b/htdocs/admin/notification.php
similarity index 100%
rename from public/admin/notification.php
rename to htdocs/admin/notification.php
diff --git a/public/admin/oauth.php b/htdocs/admin/oauth.php
similarity index 100%
rename from public/admin/oauth.php
rename to htdocs/admin/oauth.php
diff --git a/public/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
similarity index 100%
rename from public/admin/oauthlogintokens.php
rename to htdocs/admin/oauthlogintokens.php
diff --git a/public/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php
similarity index 100%
rename from public/admin/order_extrafields.php
rename to htdocs/admin/order_extrafields.php
diff --git a/public/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php
similarity index 100%
rename from public/admin/orderdet_extrafields.php
rename to htdocs/admin/orderdet_extrafields.php
diff --git a/public/admin/payment.php b/htdocs/admin/payment.php
similarity index 100%
rename from public/admin/payment.php
rename to htdocs/admin/payment.php
diff --git a/public/admin/pdf.php b/htdocs/admin/pdf.php
similarity index 100%
rename from public/admin/pdf.php
rename to htdocs/admin/pdf.php
diff --git a/public/admin/perms.php b/htdocs/admin/perms.php
similarity index 100%
rename from public/admin/perms.php
rename to htdocs/admin/perms.php
diff --git a/public/admin/prelevement.php b/htdocs/admin/prelevement.php
similarity index 100%
rename from public/admin/prelevement.php
rename to htdocs/admin/prelevement.php
diff --git a/public/admin/propal.php b/htdocs/admin/propal.php
similarity index 100%
rename from public/admin/propal.php
rename to htdocs/admin/propal.php
diff --git a/public/admin/proxy.php b/htdocs/admin/proxy.php
similarity index 100%
rename from public/admin/proxy.php
rename to htdocs/admin/proxy.php
diff --git a/public/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
similarity index 100%
rename from public/admin/receiptprinter.php
rename to htdocs/admin/receiptprinter.php
diff --git a/public/admin/resource.php b/htdocs/admin/resource.php
similarity index 100%
rename from public/admin/resource.php
rename to htdocs/admin/resource.php
diff --git a/public/admin/resource_extrafields.php b/htdocs/admin/resource_extrafields.php
similarity index 100%
rename from public/admin/resource_extrafields.php
rename to htdocs/admin/resource_extrafields.php
diff --git a/public/admin/salaries.php b/htdocs/admin/salaries.php
similarity index 100%
rename from public/admin/salaries.php
rename to htdocs/admin/salaries.php
diff --git a/public/admin/security.php b/htdocs/admin/security.php
similarity index 100%
rename from public/admin/security.php
rename to htdocs/admin/security.php
diff --git a/public/admin/security_file.php b/htdocs/admin/security_file.php
similarity index 100%
rename from public/admin/security_file.php
rename to htdocs/admin/security_file.php
diff --git a/public/admin/security_other.php b/htdocs/admin/security_other.php
similarity index 100%
rename from public/admin/security_other.php
rename to htdocs/admin/security_other.php
diff --git a/public/admin/sms.php b/htdocs/admin/sms.php
similarity index 100%
rename from public/admin/sms.php
rename to htdocs/admin/sms.php
diff --git a/public/admin/spip.php b/htdocs/admin/spip.php
similarity index 100%
rename from public/admin/spip.php
rename to htdocs/admin/spip.php
diff --git a/public/admin/stock.php b/htdocs/admin/stock.php
similarity index 100%
rename from public/admin/stock.php
rename to htdocs/admin/stock.php
diff --git a/public/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
similarity index 100%
rename from public/admin/supplier_invoice.php
rename to htdocs/admin/supplier_invoice.php
diff --git a/public/admin/supplier_order.php b/htdocs/admin/supplier_order.php
similarity index 100%
rename from public/admin/supplier_order.php
rename to htdocs/admin/supplier_order.php
diff --git a/public/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
similarity index 100%
rename from public/admin/supplier_payment.php
rename to htdocs/admin/supplier_payment.php
diff --git a/public/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
similarity index 100%
rename from public/admin/supplier_proposal.php
rename to htdocs/admin/supplier_proposal.php
diff --git a/public/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php
similarity index 100%
rename from public/admin/supplierinvoice_extrafields.php
rename to htdocs/admin/supplierinvoice_extrafields.php
diff --git a/public/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php
similarity index 100%
rename from public/admin/supplierinvoicedet_extrafields.php
rename to htdocs/admin/supplierinvoicedet_extrafields.php
diff --git a/public/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php
similarity index 100%
rename from public/admin/supplierorder_extrafields.php
rename to htdocs/admin/supplierorder_extrafields.php
diff --git a/public/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php
similarity index 100%
rename from public/admin/supplierorderdet_extrafields.php
rename to htdocs/admin/supplierorderdet_extrafields.php
diff --git a/public/admin/syslog.php b/htdocs/admin/syslog.php
similarity index 100%
rename from public/admin/syslog.php
rename to htdocs/admin/syslog.php
diff --git a/public/admin/system/about.php b/htdocs/admin/system/about.php
similarity index 100%
rename from public/admin/system/about.php
rename to htdocs/admin/system/about.php
diff --git a/public/admin/system/browser.php b/htdocs/admin/system/browser.php
similarity index 100%
rename from public/admin/system/browser.php
rename to htdocs/admin/system/browser.php
diff --git a/public/admin/system/constall.php b/htdocs/admin/system/constall.php
similarity index 100%
rename from public/admin/system/constall.php
rename to htdocs/admin/system/constall.php
diff --git a/public/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
similarity index 100%
rename from public/admin/system/database-tables.php
rename to htdocs/admin/system/database-tables.php
diff --git a/public/admin/system/database.php b/htdocs/admin/system/database.php
similarity index 100%
rename from public/admin/system/database.php
rename to htdocs/admin/system/database.php
diff --git a/public/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
similarity index 100%
rename from public/admin/system/dbtable.php
rename to htdocs/admin/system/dbtable.php
diff --git a/public/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
similarity index 100%
rename from public/admin/system/dolibarr.php
rename to htdocs/admin/system/dolibarr.php
diff --git a/public/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
similarity index 100%
rename from public/admin/system/filecheck.php
rename to htdocs/admin/system/filecheck.php
diff --git a/public/admin/system/index.php b/htdocs/admin/system/index.php
similarity index 100%
rename from public/admin/system/index.php
rename to htdocs/admin/system/index.php
diff --git a/public/admin/system/modules.php b/htdocs/admin/system/modules.php
similarity index 100%
rename from public/admin/system/modules.php
rename to htdocs/admin/system/modules.php
diff --git a/public/admin/system/os.php b/htdocs/admin/system/os.php
similarity index 100%
rename from public/admin/system/os.php
rename to htdocs/admin/system/os.php
diff --git a/public/admin/system/perf.php b/htdocs/admin/system/perf.php
similarity index 100%
rename from public/admin/system/perf.php
rename to htdocs/admin/system/perf.php
diff --git a/public/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
similarity index 100%
rename from public/admin/system/phpinfo.php
rename to htdocs/admin/system/phpinfo.php
diff --git a/public/admin/system/web.php b/htdocs/admin/system/web.php
similarity index 100%
rename from public/admin/system/web.php
rename to htdocs/admin/system/web.php
diff --git a/public/admin/system/xcache.php b/htdocs/admin/system/xcache.php
similarity index 100%
rename from public/admin/system/xcache.php
rename to htdocs/admin/system/xcache.php
diff --git a/public/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
similarity index 100%
rename from public/admin/system/xdebug.php
rename to htdocs/admin/system/xdebug.php
diff --git a/public/admin/taxes.php b/htdocs/admin/taxes.php
similarity index 100%
rename from public/admin/taxes.php
rename to htdocs/admin/taxes.php
diff --git a/public/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
similarity index 100%
rename from public/admin/tools/dolibarr_export.php
rename to htdocs/admin/tools/dolibarr_export.php
diff --git a/public/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
similarity index 100%
rename from public/admin/tools/dolibarr_import.php
rename to htdocs/admin/tools/dolibarr_import.php
diff --git a/public/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php
similarity index 100%
rename from public/admin/tools/eaccelerator.php
rename to htdocs/admin/tools/eaccelerator.php
diff --git a/public/admin/tools/export.php b/htdocs/admin/tools/export.php
similarity index 100%
rename from public/admin/tools/export.php
rename to htdocs/admin/tools/export.php
diff --git a/public/admin/tools/index.php b/htdocs/admin/tools/index.php
similarity index 100%
rename from public/admin/tools/index.php
rename to htdocs/admin/tools/index.php
diff --git a/public/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
similarity index 100%
rename from public/admin/tools/listevents.php
rename to htdocs/admin/tools/listevents.php
diff --git a/public/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
similarity index 100%
rename from public/admin/tools/listsessions.php
rename to htdocs/admin/tools/listsessions.php
diff --git a/public/admin/tools/purge.php b/htdocs/admin/tools/purge.php
similarity index 100%
rename from public/admin/tools/purge.php
rename to htdocs/admin/tools/purge.php
diff --git a/public/admin/tools/update.php b/htdocs/admin/tools/update.php
similarity index 100%
rename from public/admin/tools/update.php
rename to htdocs/admin/tools/update.php
diff --git a/public/admin/translation.php b/htdocs/admin/translation.php
similarity index 100%
rename from public/admin/translation.php
rename to htdocs/admin/translation.php
diff --git a/public/admin/triggers.php b/htdocs/admin/triggers.php
similarity index 100%
rename from public/admin/triggers.php
rename to htdocs/admin/triggers.php
diff --git a/public/admin/user.php b/htdocs/admin/user.php
similarity index 100%
rename from public/admin/user.php
rename to htdocs/admin/user.php
diff --git a/public/admin/websites.php b/htdocs/admin/websites.php
similarity index 100%
rename from public/admin/websites.php
rename to htdocs/admin/websites.php
diff --git a/public/admin/workflow.php b/htdocs/admin/workflow.php
similarity index 100%
rename from public/admin/workflow.php
rename to htdocs/admin/workflow.php
diff --git a/public/api/README.md b/htdocs/api/README.md
similarity index 100%
rename from public/api/README.md
rename to htdocs/api/README.md
diff --git a/public/api/admin/explorer.php b/htdocs/api/admin/explorer.php
similarity index 100%
rename from public/api/admin/explorer.php
rename to htdocs/api/admin/explorer.php
diff --git a/public/api/admin/index.php b/htdocs/api/admin/index.php
similarity index 100%
rename from public/api/admin/index.php
rename to htdocs/api/admin/index.php
diff --git a/public/api/class/api.class.php b/htdocs/api/class/api.class.php
similarity index 100%
rename from public/api/class/api.class.php
rename to htdocs/api/class/api.class.php
diff --git a/public/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
similarity index 100%
rename from public/api/class/api_access.class.php
rename to htdocs/api/class/api_access.class.php
diff --git a/public/api/class/api_dictionnarycountries.class.php b/htdocs/api/class/api_dictionnarycountries.class.php
similarity index 100%
rename from public/api/class/api_dictionnarycountries.class.php
rename to htdocs/api/class/api_dictionnarycountries.class.php
diff --git a/public/api/class/api_dictionnarytowns.class.php b/htdocs/api/class/api_dictionnarytowns.class.php
similarity index 100%
rename from public/api/class/api_dictionnarytowns.class.php
rename to htdocs/api/class/api_dictionnarytowns.class.php
diff --git a/public/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
similarity index 100%
rename from public/api/class/api_login.class.php
rename to htdocs/api/class/api_login.class.php
diff --git a/public/api/class/api_status.class.php b/htdocs/api/class/api_status.class.php
similarity index 100%
rename from public/api/class/api_status.class.php
rename to htdocs/api/class/api_status.class.php
diff --git a/public/api/class/index.html b/htdocs/api/class/index.html
similarity index 100%
rename from public/api/class/index.html
rename to htdocs/api/class/index.html
diff --git a/public/api/index.php b/htdocs/api/index.php
similarity index 100%
rename from public/api/index.php
rename to htdocs/api/index.php
diff --git a/public/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php
similarity index 100%
rename from public/asterisk/cidlookup.php
rename to htdocs/asterisk/cidlookup.php
diff --git a/public/asterisk/index.html b/htdocs/asterisk/index.html
similarity index 100%
rename from public/asterisk/index.html
rename to htdocs/asterisk/index.html
diff --git a/public/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
similarity index 100%
rename from public/asterisk/wrapper.php
rename to htdocs/asterisk/wrapper.php
diff --git a/public/barcode/codeinit.php b/htdocs/barcode/codeinit.php
similarity index 100%
rename from public/barcode/codeinit.php
rename to htdocs/barcode/codeinit.php
diff --git a/public/barcode/index.html b/htdocs/barcode/index.html
similarity index 100%
rename from public/barcode/index.html
rename to htdocs/barcode/index.html
diff --git a/public/barcode/printsheet.php b/htdocs/barcode/printsheet.php
similarity index 100%
rename from public/barcode/printsheet.php
rename to htdocs/barcode/printsheet.php
diff --git a/public/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
similarity index 100%
rename from public/bookmarks/admin/bookmark.php
rename to htdocs/bookmarks/admin/bookmark.php
diff --git a/public/bookmarks/admin/index.html b/htdocs/bookmarks/admin/index.html
similarity index 100%
rename from public/bookmarks/admin/index.html
rename to htdocs/bookmarks/admin/index.html
diff --git a/public/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
similarity index 100%
rename from public/bookmarks/bookmarks.lib.php
rename to htdocs/bookmarks/bookmarks.lib.php
diff --git a/public/bookmarks/card.php b/htdocs/bookmarks/card.php
similarity index 100%
rename from public/bookmarks/card.php
rename to htdocs/bookmarks/card.php
diff --git a/public/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
similarity index 100%
rename from public/bookmarks/class/bookmark.class.php
rename to htdocs/bookmarks/class/bookmark.class.php
diff --git a/public/bookmarks/class/index.html b/htdocs/bookmarks/class/index.html
similarity index 100%
rename from public/bookmarks/class/index.html
rename to htdocs/bookmarks/class/index.html
diff --git a/public/bookmarks/index.html b/htdocs/bookmarks/index.html
similarity index 100%
rename from public/bookmarks/index.html
rename to htdocs/bookmarks/index.html
diff --git a/public/bookmarks/list.php b/htdocs/bookmarks/list.php
similarity index 100%
rename from public/bookmarks/list.php
rename to htdocs/bookmarks/list.php
diff --git a/public/cache.manifest b/htdocs/cache.manifest
similarity index 100%
rename from public/cache.manifest
rename to htdocs/cache.manifest
diff --git a/public/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
similarity index 100%
rename from public/cashdesk/admin/cashdesk.php
rename to htdocs/cashdesk/admin/cashdesk.php
diff --git a/public/cashdesk/admin/index.html b/htdocs/cashdesk/admin/index.html
similarity index 100%
rename from public/cashdesk/admin/index.html
rename to htdocs/cashdesk/admin/index.html
diff --git a/public/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php
similarity index 100%
rename from public/cashdesk/affContenu.php
rename to htdocs/cashdesk/affContenu.php
diff --git a/public/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php
similarity index 100%
rename from public/cashdesk/affIndex.php
rename to htdocs/cashdesk/affIndex.php
diff --git a/public/cashdesk/affPied.php b/htdocs/cashdesk/affPied.php
similarity index 100%
rename from public/cashdesk/affPied.php
rename to htdocs/cashdesk/affPied.php
diff --git a/public/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
similarity index 100%
rename from public/cashdesk/class/Auth.class.php
rename to htdocs/cashdesk/class/Auth.class.php
diff --git a/public/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
similarity index 100%
rename from public/cashdesk/class/Facturation.class.php
rename to htdocs/cashdesk/class/Facturation.class.php
diff --git a/public/cashdesk/class/index.html b/htdocs/cashdesk/class/index.html
similarity index 100%
rename from public/cashdesk/class/index.html
rename to htdocs/cashdesk/class/index.html
diff --git a/public/cashdesk/css/index.html b/htdocs/cashdesk/css/index.html
similarity index 100%
rename from public/cashdesk/css/index.html
rename to htdocs/cashdesk/css/index.html
diff --git a/public/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css
similarity index 100%
rename from public/cashdesk/css/style.css
rename to htdocs/cashdesk/css/style.css
diff --git a/public/cashdesk/deconnexion.php b/htdocs/cashdesk/deconnexion.php
similarity index 100%
rename from public/cashdesk/deconnexion.php
rename to htdocs/cashdesk/deconnexion.php
diff --git a/public/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
similarity index 100%
rename from public/cashdesk/facturation.php
rename to htdocs/cashdesk/facturation.php
diff --git a/public/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
similarity index 100%
rename from public/cashdesk/facturation_dhtml.php
rename to htdocs/cashdesk/facturation_dhtml.php
diff --git a/public/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
similarity index 100%
rename from public/cashdesk/facturation_verif.php
rename to htdocs/cashdesk/facturation_verif.php
diff --git a/public/cashdesk/img/basket_delete.png b/htdocs/cashdesk/img/basket_delete.png
similarity index 100%
rename from public/cashdesk/img/basket_delete.png
rename to htdocs/cashdesk/img/basket_delete.png
diff --git a/public/cashdesk/img/bg_conteneur_droite.png b/htdocs/cashdesk/img/bg_conteneur_droite.png
similarity index 100%
rename from public/cashdesk/img/bg_conteneur_droite.png
rename to htdocs/cashdesk/img/bg_conteneur_droite.png
diff --git a/public/cashdesk/img/bg_conteneur_gauche.png b/htdocs/cashdesk/img/bg_conteneur_gauche.png
similarity index 100%
rename from public/cashdesk/img/bg_conteneur_gauche.png
rename to htdocs/cashdesk/img/bg_conteneur_gauche.png
diff --git a/public/cashdesk/img/bg_entete.png b/htdocs/cashdesk/img/bg_entete.png
similarity index 100%
rename from public/cashdesk/img/bg_entete.png
rename to htdocs/cashdesk/img/bg_entete.png
diff --git a/public/cashdesk/img/bg_pied.png b/htdocs/cashdesk/img/bg_pied.png
similarity index 100%
rename from public/cashdesk/img/bg_pied.png
rename to htdocs/cashdesk/img/bg_pied.png
diff --git a/public/cashdesk/img/calendrier.png b/htdocs/cashdesk/img/calendrier.png
similarity index 100%
rename from public/cashdesk/img/calendrier.png
rename to htdocs/cashdesk/img/calendrier.png
diff --git a/public/cashdesk/img/decrypted.png b/htdocs/cashdesk/img/decrypted.png
similarity index 100%
rename from public/cashdesk/img/decrypted.png
rename to htdocs/cashdesk/img/decrypted.png
diff --git a/public/cashdesk/img/gescom.png b/htdocs/cashdesk/img/gescom.png
similarity index 100%
rename from public/cashdesk/img/gescom.png
rename to htdocs/cashdesk/img/gescom.png
diff --git a/public/cashdesk/img/index.html b/htdocs/cashdesk/img/index.html
similarity index 100%
rename from public/cashdesk/img/index.html
rename to htdocs/cashdesk/img/index.html
diff --git a/public/cashdesk/img/lock.png b/htdocs/cashdesk/img/lock.png
similarity index 100%
rename from public/cashdesk/img/lock.png
rename to htdocs/cashdesk/img/lock.png
diff --git a/public/cashdesk/img/login.png b/htdocs/cashdesk/img/login.png
similarity index 100%
rename from public/cashdesk/img/login.png
rename to htdocs/cashdesk/img/login.png
diff --git a/public/cashdesk/img/new.png b/htdocs/cashdesk/img/new.png
similarity index 100%
rename from public/cashdesk/img/new.png
rename to htdocs/cashdesk/img/new.png
diff --git a/public/cashdesk/include/environnement.php b/htdocs/cashdesk/include/environnement.php
similarity index 100%
rename from public/cashdesk/include/environnement.php
rename to htdocs/cashdesk/include/environnement.php
diff --git a/public/cashdesk/include/index.html b/htdocs/cashdesk/include/index.html
similarity index 100%
rename from public/cashdesk/include/index.html
rename to htdocs/cashdesk/include/index.html
diff --git a/public/cashdesk/include/keypad.php b/htdocs/cashdesk/include/keypad.php
similarity index 100%
rename from public/cashdesk/include/keypad.php
rename to htdocs/cashdesk/include/keypad.php
diff --git a/public/cashdesk/index.php b/htdocs/cashdesk/index.php
similarity index 100%
rename from public/cashdesk/index.php
rename to htdocs/cashdesk/index.php
diff --git a/public/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
similarity index 100%
rename from public/cashdesk/index_verif.php
rename to htdocs/cashdesk/index_verif.php
diff --git a/public/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js
similarity index 100%
rename from public/cashdesk/javascript/dhtml.js
rename to htdocs/cashdesk/javascript/dhtml.js
diff --git a/public/cashdesk/javascript/facturation1.js b/htdocs/cashdesk/javascript/facturation1.js
similarity index 100%
rename from public/cashdesk/javascript/facturation1.js
rename to htdocs/cashdesk/javascript/facturation1.js
diff --git a/public/cashdesk/javascript/index.html b/htdocs/cashdesk/javascript/index.html
similarity index 100%
rename from public/cashdesk/javascript/index.html
rename to htdocs/cashdesk/javascript/index.html
diff --git a/public/cashdesk/javascript/keypad.js b/htdocs/cashdesk/javascript/keypad.js
similarity index 100%
rename from public/cashdesk/javascript/keypad.js
rename to htdocs/cashdesk/javascript/keypad.js
diff --git a/public/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
similarity index 100%
rename from public/cashdesk/tpl/facturation1.tpl.php
rename to htdocs/cashdesk/tpl/facturation1.tpl.php
diff --git a/public/cashdesk/tpl/index.html b/htdocs/cashdesk/tpl/index.html
similarity index 100%
rename from public/cashdesk/tpl/index.html
rename to htdocs/cashdesk/tpl/index.html
diff --git a/public/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php
similarity index 100%
rename from public/cashdesk/tpl/liste_articles.tpl.php
rename to htdocs/cashdesk/tpl/liste_articles.tpl.php
diff --git a/public/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php
similarity index 100%
rename from public/cashdesk/tpl/menu.tpl.php
rename to htdocs/cashdesk/tpl/menu.tpl.php
diff --git a/public/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php
similarity index 100%
rename from public/cashdesk/tpl/ticket.tpl.php
rename to htdocs/cashdesk/tpl/ticket.tpl.php
diff --git a/public/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
similarity index 100%
rename from public/cashdesk/tpl/validation1.tpl.php
rename to htdocs/cashdesk/tpl/validation1.tpl.php
diff --git a/public/cashdesk/tpl/validation2.tpl.php b/htdocs/cashdesk/tpl/validation2.tpl.php
similarity index 100%
rename from public/cashdesk/tpl/validation2.tpl.php
rename to htdocs/cashdesk/tpl/validation2.tpl.php
diff --git a/public/cashdesk/validation.php b/htdocs/cashdesk/validation.php
similarity index 100%
rename from public/cashdesk/validation.php
rename to htdocs/cashdesk/validation.php
diff --git a/public/cashdesk/validation_ok.php b/htdocs/cashdesk/validation_ok.php
similarity index 100%
rename from public/cashdesk/validation_ok.php
rename to htdocs/cashdesk/validation_ok.php
diff --git a/public/cashdesk/validation_ticket.php b/htdocs/cashdesk/validation_ticket.php
similarity index 100%
rename from public/cashdesk/validation_ticket.php
rename to htdocs/cashdesk/validation_ticket.php
diff --git a/public/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
similarity index 100%
rename from public/cashdesk/validation_verif.php
rename to htdocs/cashdesk/validation_verif.php
diff --git a/public/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
similarity index 100%
rename from public/categories/admin/categorie.php
rename to htdocs/categories/admin/categorie.php
diff --git a/public/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php
similarity index 100%
rename from public/categories/admin/categorie_extrafields.php
rename to htdocs/categories/admin/categorie_extrafields.php
diff --git a/public/categories/admin/index.html b/htdocs/categories/admin/index.html
similarity index 100%
rename from public/categories/admin/index.html
rename to htdocs/categories/admin/index.html
diff --git a/public/categories/card.php b/htdocs/categories/card.php
similarity index 100%
rename from public/categories/card.php
rename to htdocs/categories/card.php
diff --git a/public/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
similarity index 100%
rename from public/categories/class/api_categories.class.php
rename to htdocs/categories/class/api_categories.class.php
diff --git a/public/categories/class/api_deprecated_category.class.php b/htdocs/categories/class/api_deprecated_category.class.php
similarity index 100%
rename from public/categories/class/api_deprecated_category.class.php
rename to htdocs/categories/class/api_deprecated_category.class.php
diff --git a/public/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
similarity index 100%
rename from public/categories/class/categorie.class.php
rename to htdocs/categories/class/categorie.class.php
diff --git a/public/categories/class/index.html b/htdocs/categories/class/index.html
similarity index 100%
rename from public/categories/class/index.html
rename to htdocs/categories/class/index.html
diff --git a/public/categories/edit.php b/htdocs/categories/edit.php
similarity index 100%
rename from public/categories/edit.php
rename to htdocs/categories/edit.php
diff --git a/public/categories/index.php b/htdocs/categories/index.php
similarity index 100%
rename from public/categories/index.php
rename to htdocs/categories/index.php
diff --git a/public/categories/photos.php b/htdocs/categories/photos.php
similarity index 100%
rename from public/categories/photos.php
rename to htdocs/categories/photos.php
diff --git a/public/categories/traduction.php b/htdocs/categories/traduction.php
similarity index 100%
rename from public/categories/traduction.php
rename to htdocs/categories/traduction.php
diff --git a/public/categories/viewcat.php b/htdocs/categories/viewcat.php
similarity index 100%
rename from public/categories/viewcat.php
rename to htdocs/categories/viewcat.php
diff --git a/public/comm/action/card.php b/htdocs/comm/action/card.php
similarity index 100%
rename from public/comm/action/card.php
rename to htdocs/comm/action/card.php
diff --git a/public/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
similarity index 100%
rename from public/comm/action/class/actioncomm.class.php
rename to htdocs/comm/action/class/actioncomm.class.php
diff --git a/public/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
similarity index 100%
rename from public/comm/action/class/api_agendaevents.class.php
rename to htdocs/comm/action/class/api_agendaevents.class.php
diff --git a/public/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
similarity index 100%
rename from public/comm/action/class/cactioncomm.class.php
rename to htdocs/comm/action/class/cactioncomm.class.php
diff --git a/public/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
similarity index 100%
rename from public/comm/action/class/ical.class.php
rename to htdocs/comm/action/class/ical.class.php
diff --git a/public/comm/action/class/index.html b/htdocs/comm/action/class/index.html
similarity index 100%
rename from public/comm/action/class/index.html
rename to htdocs/comm/action/class/index.html
diff --git a/public/comm/action/document.php b/htdocs/comm/action/document.php
similarity index 100%
rename from public/comm/action/document.php
rename to htdocs/comm/action/document.php
diff --git a/public/comm/action/index.php b/htdocs/comm/action/index.php
similarity index 100%
rename from public/comm/action/index.php
rename to htdocs/comm/action/index.php
diff --git a/public/comm/action/info.php b/htdocs/comm/action/info.php
similarity index 100%
rename from public/comm/action/info.php
rename to htdocs/comm/action/info.php
diff --git a/public/comm/action/listactions.php b/htdocs/comm/action/listactions.php
similarity index 100%
rename from public/comm/action/listactions.php
rename to htdocs/comm/action/listactions.php
diff --git a/public/comm/action/pertype.php b/htdocs/comm/action/pertype.php
similarity index 100%
rename from public/comm/action/pertype.php
rename to htdocs/comm/action/pertype.php
diff --git a/public/comm/action/peruser.php b/htdocs/comm/action/peruser.php
similarity index 100%
rename from public/comm/action/peruser.php
rename to htdocs/comm/action/peruser.php
diff --git a/public/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
similarity index 100%
rename from public/comm/action/rapport/index.php
rename to htdocs/comm/action/rapport/index.php
diff --git a/public/comm/address.php b/htdocs/comm/address.php
similarity index 100%
rename from public/comm/address.php
rename to htdocs/comm/address.php
diff --git a/public/comm/admin/index.html b/htdocs/comm/admin/index.html
similarity index 100%
rename from public/comm/admin/index.html
rename to htdocs/comm/admin/index.html
diff --git a/public/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
similarity index 100%
rename from public/comm/admin/propal_extrafields.php
rename to htdocs/comm/admin/propal_extrafields.php
diff --git a/public/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
similarity index 100%
rename from public/comm/admin/propaldet_extrafields.php
rename to htdocs/comm/admin/propaldet_extrafields.php
diff --git a/public/comm/card.php b/htdocs/comm/card.php
similarity index 100%
rename from public/comm/card.php
rename to htdocs/comm/card.php
diff --git a/public/comm/contact.php b/htdocs/comm/contact.php
similarity index 100%
rename from public/comm/contact.php
rename to htdocs/comm/contact.php
diff --git a/public/comm/index.php b/htdocs/comm/index.php
similarity index 100%
rename from public/comm/index.php
rename to htdocs/comm/index.php
diff --git a/public/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
similarity index 100%
rename from public/comm/mailing/advtargetemailing.php
rename to htdocs/comm/mailing/advtargetemailing.php
diff --git a/public/comm/mailing/card.php b/htdocs/comm/mailing/card.php
similarity index 100%
rename from public/comm/mailing/card.php
rename to htdocs/comm/mailing/card.php
diff --git a/public/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
similarity index 100%
rename from public/comm/mailing/cibles.php
rename to htdocs/comm/mailing/cibles.php
diff --git a/public/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
similarity index 100%
rename from public/comm/mailing/class/advtargetemailing.class.php
rename to htdocs/comm/mailing/class/advtargetemailing.class.php
diff --git a/public/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
similarity index 100%
rename from public/comm/mailing/class/html.formadvtargetemailing.class.php
rename to htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
diff --git a/public/comm/mailing/class/index.html b/htdocs/comm/mailing/class/index.html
similarity index 100%
rename from public/comm/mailing/class/index.html
rename to htdocs/comm/mailing/class/index.html
diff --git a/public/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
similarity index 100%
rename from public/comm/mailing/class/mailing.class.php
rename to htdocs/comm/mailing/class/mailing.class.php
diff --git a/public/comm/mailing/index.php b/htdocs/comm/mailing/index.php
similarity index 100%
rename from public/comm/mailing/index.php
rename to htdocs/comm/mailing/index.php
diff --git a/public/comm/mailing/info.php b/htdocs/comm/mailing/info.php
similarity index 100%
rename from public/comm/mailing/info.php
rename to htdocs/comm/mailing/info.php
diff --git a/public/comm/mailing/list.php b/htdocs/comm/mailing/list.php
similarity index 100%
rename from public/comm/mailing/list.php
rename to htdocs/comm/mailing/list.php
diff --git a/public/comm/multiprix.php b/htdocs/comm/multiprix.php
similarity index 100%
rename from public/comm/multiprix.php
rename to htdocs/comm/multiprix.php
diff --git a/public/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
similarity index 100%
rename from public/comm/propal/apercu.php
rename to htdocs/comm/propal/apercu.php
diff --git a/public/comm/propal/card.php b/htdocs/comm/propal/card.php
similarity index 100%
rename from public/comm/propal/card.php
rename to htdocs/comm/propal/card.php
diff --git a/public/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
similarity index 100%
rename from public/comm/propal/class/api_proposals.class.php
rename to htdocs/comm/propal/class/api_proposals.class.php
diff --git a/public/comm/propal/class/index.html b/htdocs/comm/propal/class/index.html
similarity index 100%
rename from public/comm/propal/class/index.html
rename to htdocs/comm/propal/class/index.html
diff --git a/public/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
similarity index 100%
rename from public/comm/propal/class/propal.class.php
rename to htdocs/comm/propal/class/propal.class.php
diff --git a/public/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
similarity index 100%
rename from public/comm/propal/class/propalestats.class.php
rename to htdocs/comm/propal/class/propalestats.class.php
diff --git a/public/comm/propal/contact.php b/htdocs/comm/propal/contact.php
similarity index 100%
rename from public/comm/propal/contact.php
rename to htdocs/comm/propal/contact.php
diff --git a/public/comm/propal/document.php b/htdocs/comm/propal/document.php
similarity index 100%
rename from public/comm/propal/document.php
rename to htdocs/comm/propal/document.php
diff --git a/public/comm/propal/index.php b/htdocs/comm/propal/index.php
similarity index 100%
rename from public/comm/propal/index.php
rename to htdocs/comm/propal/index.php
diff --git a/public/comm/propal/info.php b/htdocs/comm/propal/info.php
similarity index 100%
rename from public/comm/propal/info.php
rename to htdocs/comm/propal/info.php
diff --git a/public/comm/propal/list.php b/htdocs/comm/propal/list.php
similarity index 100%
rename from public/comm/propal/list.php
rename to htdocs/comm/propal/list.php
diff --git a/public/comm/propal/note.php b/htdocs/comm/propal/note.php
similarity index 100%
rename from public/comm/propal/note.php
rename to htdocs/comm/propal/note.php
diff --git a/public/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
similarity index 100%
rename from public/comm/propal/stats/index.php
rename to htdocs/comm/propal/stats/index.php
diff --git a/public/comm/propal/tpl/index.html b/htdocs/comm/propal/tpl/index.html
similarity index 100%
rename from public/comm/propal/tpl/index.html
rename to htdocs/comm/propal/tpl/index.html
diff --git a/public/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from public/comm/propal/tpl/linkedobjectblock.tpl.php
rename to htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
diff --git a/public/comm/prospect/index.php b/htdocs/comm/prospect/index.php
similarity index 100%
rename from public/comm/prospect/index.php
rename to htdocs/comm/prospect/index.php
diff --git a/public/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php
similarity index 100%
rename from public/comm/prospect/recap-prospect.php
rename to htdocs/comm/prospect/recap-prospect.php
diff --git a/public/comm/recap-client.php b/htdocs/comm/recap-client.php
similarity index 100%
rename from public/comm/recap-client.php
rename to htdocs/comm/recap-client.php
diff --git a/public/comm/remise.php b/htdocs/comm/remise.php
similarity index 100%
rename from public/comm/remise.php
rename to htdocs/comm/remise.php
diff --git a/public/comm/remx.php b/htdocs/comm/remx.php
similarity index 100%
rename from public/comm/remx.php
rename to htdocs/comm/remx.php
diff --git a/public/commande/apercu.php b/htdocs/commande/apercu.php
similarity index 100%
rename from public/commande/apercu.php
rename to htdocs/commande/apercu.php
diff --git a/public/commande/card.php b/htdocs/commande/card.php
similarity index 100%
rename from public/commande/card.php
rename to htdocs/commande/card.php
diff --git a/public/commande/class/api_deprecated_commande.class.php b/htdocs/commande/class/api_deprecated_commande.class.php
similarity index 100%
rename from public/commande/class/api_deprecated_commande.class.php
rename to htdocs/commande/class/api_deprecated_commande.class.php
diff --git a/public/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
similarity index 100%
rename from public/commande/class/api_orders.class.php
rename to htdocs/commande/class/api_orders.class.php
diff --git a/public/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
similarity index 100%
rename from public/commande/class/commande.class.php
rename to htdocs/commande/class/commande.class.php
diff --git a/public/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
similarity index 100%
rename from public/commande/class/commandestats.class.php
rename to htdocs/commande/class/commandestats.class.php
diff --git a/public/commande/class/index.html b/htdocs/commande/class/index.html
similarity index 100%
rename from public/commande/class/index.html
rename to htdocs/commande/class/index.html
diff --git a/public/commande/contact.php b/htdocs/commande/contact.php
similarity index 100%
rename from public/commande/contact.php
rename to htdocs/commande/contact.php
diff --git a/public/commande/customer.php b/htdocs/commande/customer.php
similarity index 100%
rename from public/commande/customer.php
rename to htdocs/commande/customer.php
diff --git a/public/commande/document.php b/htdocs/commande/document.php
similarity index 100%
rename from public/commande/document.php
rename to htdocs/commande/document.php
diff --git a/public/commande/index.php b/htdocs/commande/index.php
similarity index 100%
rename from public/commande/index.php
rename to htdocs/commande/index.php
diff --git a/public/commande/info.php b/htdocs/commande/info.php
similarity index 100%
rename from public/commande/info.php
rename to htdocs/commande/info.php
diff --git a/public/commande/list.php b/htdocs/commande/list.php
similarity index 100%
rename from public/commande/list.php
rename to htdocs/commande/list.php
diff --git a/public/commande/note.php b/htdocs/commande/note.php
similarity index 100%
rename from public/commande/note.php
rename to htdocs/commande/note.php
diff --git a/public/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
similarity index 100%
rename from public/commande/orderstoinvoice.php
rename to htdocs/commande/orderstoinvoice.php
diff --git a/public/commande/stats/index.php b/htdocs/commande/stats/index.php
similarity index 100%
rename from public/commande/stats/index.php
rename to htdocs/commande/stats/index.php
diff --git a/public/commande/tpl/index.html b/htdocs/commande/tpl/index.html
similarity index 100%
rename from public/commande/tpl/index.html
rename to htdocs/commande/tpl/index.html
diff --git a/public/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from public/commande/tpl/linkedobjectblock.tpl.php
rename to htdocs/commande/tpl/linkedobjectblock.tpl.php
diff --git a/public/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
similarity index 100%
rename from public/compta/ajaxpayment.php
rename to htdocs/compta/ajaxpayment.php
diff --git a/public/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
similarity index 100%
rename from public/compta/bank/annuel.php
rename to htdocs/compta/bank/annuel.php
diff --git a/public/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
similarity index 100%
rename from public/compta/bank/bankentries.php
rename to htdocs/compta/bank/bankentries.php
diff --git a/public/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
similarity index 100%
rename from public/compta/bank/bilan.php
rename to htdocs/compta/bank/bilan.php
diff --git a/public/compta/bank/budget.php b/htdocs/compta/bank/budget.php
similarity index 100%
rename from public/compta/bank/budget.php
rename to htdocs/compta/bank/budget.php
diff --git a/public/compta/bank/card.php b/htdocs/compta/bank/card.php
similarity index 100%
rename from public/compta/bank/card.php
rename to htdocs/compta/bank/card.php
diff --git a/public/compta/bank/categ.php b/htdocs/compta/bank/categ.php
similarity index 100%
rename from public/compta/bank/categ.php
rename to htdocs/compta/bank/categ.php
diff --git a/public/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
similarity index 100%
rename from public/compta/bank/class/account.class.php
rename to htdocs/compta/bank/class/account.class.php
diff --git a/public/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
similarity index 100%
rename from public/compta/bank/class/api_bankaccounts.class.php
rename to htdocs/compta/bank/class/api_bankaccounts.class.php
diff --git a/public/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
similarity index 100%
rename from public/compta/bank/class/bankcateg.class.php
rename to htdocs/compta/bank/class/bankcateg.class.php
diff --git a/public/compta/bank/class/index.html b/htdocs/compta/bank/class/index.html
similarity index 100%
rename from public/compta/bank/class/index.html
rename to htdocs/compta/bank/class/index.html
diff --git a/public/compta/bank/document.php b/htdocs/compta/bank/document.php
similarity index 100%
rename from public/compta/bank/document.php
rename to htdocs/compta/bank/document.php
diff --git a/public/compta/bank/graph.php b/htdocs/compta/bank/graph.php
similarity index 100%
rename from public/compta/bank/graph.php
rename to htdocs/compta/bank/graph.php
diff --git a/public/compta/bank/index.php b/htdocs/compta/bank/index.php
similarity index 100%
rename from public/compta/bank/index.php
rename to htdocs/compta/bank/index.php
diff --git a/public/compta/bank/info.php b/htdocs/compta/bank/info.php
similarity index 100%
rename from public/compta/bank/info.php
rename to htdocs/compta/bank/info.php
diff --git a/public/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
similarity index 100%
rename from public/compta/bank/ligne.php
rename to htdocs/compta/bank/ligne.php
diff --git a/public/compta/bank/releve.php b/htdocs/compta/bank/releve.php
similarity index 100%
rename from public/compta/bank/releve.php
rename to htdocs/compta/bank/releve.php
diff --git a/public/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
similarity index 100%
rename from public/compta/bank/transfer.php
rename to htdocs/compta/bank/transfer.php
diff --git a/public/compta/bank/treso.php b/htdocs/compta/bank/treso.php
similarity index 100%
rename from public/compta/bank/treso.php
rename to htdocs/compta/bank/treso.php
diff --git a/public/compta/charges/index.php b/htdocs/compta/charges/index.php
similarity index 100%
rename from public/compta/charges/index.php
rename to htdocs/compta/charges/index.php
diff --git a/public/compta/clients.php b/htdocs/compta/clients.php
similarity index 100%
rename from public/compta/clients.php
rename to htdocs/compta/clients.php
diff --git a/public/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
similarity index 100%
rename from public/compta/deplacement/card.php
rename to htdocs/compta/deplacement/card.php
diff --git a/public/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
similarity index 100%
rename from public/compta/deplacement/class/deplacement.class.php
rename to htdocs/compta/deplacement/class/deplacement.class.php
diff --git a/public/compta/deplacement/class/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php
similarity index 100%
rename from public/compta/deplacement/class/deplacementstats.class.php
rename to htdocs/compta/deplacement/class/deplacementstats.class.php
diff --git a/public/compta/deplacement/class/index.html b/htdocs/compta/deplacement/class/index.html
similarity index 100%
rename from public/compta/deplacement/class/index.html
rename to htdocs/compta/deplacement/class/index.html
diff --git a/public/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
similarity index 100%
rename from public/compta/deplacement/document.php
rename to htdocs/compta/deplacement/document.php
diff --git a/public/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
similarity index 100%
rename from public/compta/deplacement/index.php
rename to htdocs/compta/deplacement/index.php
diff --git a/public/compta/deplacement/info.php b/htdocs/compta/deplacement/info.php
similarity index 100%
rename from public/compta/deplacement/info.php
rename to htdocs/compta/deplacement/info.php
diff --git a/public/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
similarity index 100%
rename from public/compta/deplacement/list.php
rename to htdocs/compta/deplacement/list.php
diff --git a/public/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
similarity index 100%
rename from public/compta/deplacement/stats/index.php
rename to htdocs/compta/deplacement/stats/index.php
diff --git a/public/compta/facture.php b/htdocs/compta/facture.php
similarity index 100%
rename from public/compta/facture.php
rename to htdocs/compta/facture.php
diff --git a/public/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php
similarity index 100%
rename from public/compta/facture/admin/facture_cust_extrafields.php
rename to htdocs/compta/facture/admin/facture_cust_extrafields.php
diff --git a/public/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
similarity index 100%
rename from public/compta/facture/admin/facturedet_cust_extrafields.php
rename to htdocs/compta/facture/admin/facturedet_cust_extrafields.php
diff --git a/public/compta/facture/admin/index.html b/htdocs/compta/facture/admin/index.html
similarity index 100%
rename from public/compta/facture/admin/index.html
rename to htdocs/compta/facture/admin/index.html
diff --git a/public/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
similarity index 100%
rename from public/compta/facture/apercu.php
rename to htdocs/compta/facture/apercu.php
diff --git a/public/compta/facture/class/api_deprecated_invoice.class.php b/htdocs/compta/facture/class/api_deprecated_invoice.class.php
similarity index 100%
rename from public/compta/facture/class/api_deprecated_invoice.class.php
rename to htdocs/compta/facture/class/api_deprecated_invoice.class.php
diff --git a/public/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
similarity index 100%
rename from public/compta/facture/class/api_invoices.class.php
rename to htdocs/compta/facture/class/api_invoices.class.php
diff --git a/public/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
similarity index 100%
rename from public/compta/facture/class/facture-rec.class.php
rename to htdocs/compta/facture/class/facture-rec.class.php
diff --git a/public/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
similarity index 100%
rename from public/compta/facture/class/facture.class.php
rename to htdocs/compta/facture/class/facture.class.php
diff --git a/public/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
similarity index 100%
rename from public/compta/facture/class/facturestats.class.php
rename to htdocs/compta/facture/class/facturestats.class.php
diff --git a/public/compta/facture/class/index.html b/htdocs/compta/facture/class/index.html
similarity index 100%
rename from public/compta/facture/class/index.html
rename to htdocs/compta/facture/class/index.html
diff --git a/public/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
similarity index 100%
rename from public/compta/facture/class/paymentterm.class.php
rename to htdocs/compta/facture/class/paymentterm.class.php
diff --git a/public/compta/facture/contact.php b/htdocs/compta/facture/contact.php
similarity index 100%
rename from public/compta/facture/contact.php
rename to htdocs/compta/facture/contact.php
diff --git a/public/compta/facture/document.php b/htdocs/compta/facture/document.php
similarity index 100%
rename from public/compta/facture/document.php
rename to htdocs/compta/facture/document.php
diff --git a/public/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
similarity index 100%
rename from public/compta/facture/fiche-rec.php
rename to htdocs/compta/facture/fiche-rec.php
diff --git a/public/compta/facture/index.html b/htdocs/compta/facture/index.html
similarity index 100%
rename from public/compta/facture/index.html
rename to htdocs/compta/facture/index.html
diff --git a/public/compta/facture/info.php b/htdocs/compta/facture/info.php
similarity index 100%
rename from public/compta/facture/info.php
rename to htdocs/compta/facture/info.php
diff --git a/public/compta/facture/list.php b/htdocs/compta/facture/list.php
similarity index 100%
rename from public/compta/facture/list.php
rename to htdocs/compta/facture/list.php
diff --git a/public/compta/facture/note.php b/htdocs/compta/facture/note.php
similarity index 100%
rename from public/compta/facture/note.php
rename to htdocs/compta/facture/note.php
diff --git a/public/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
similarity index 100%
rename from public/compta/facture/prelevement.php
rename to htdocs/compta/facture/prelevement.php
diff --git a/public/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
similarity index 100%
rename from public/compta/facture/stats/index.php
rename to htdocs/compta/facture/stats/index.php
diff --git a/public/compta/facture/tpl/index.html b/htdocs/compta/facture/tpl/index.html
similarity index 100%
rename from public/compta/facture/tpl/index.html
rename to htdocs/compta/facture/tpl/index.html
diff --git a/public/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from public/compta/facture/tpl/linkedobjectblock.tpl.php
rename to htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
diff --git a/public/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
similarity index 100%
rename from public/compta/facture/tpl/linkedobjectblockForRec.tpl.php
rename to htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
diff --git a/public/compta/index.php b/htdocs/compta/index.php
similarity index 100%
rename from public/compta/index.php
rename to htdocs/compta/index.php
diff --git a/public/compta/journal/index.html b/htdocs/compta/journal/index.html
similarity index 100%
rename from public/compta/journal/index.html
rename to htdocs/compta/journal/index.html
diff --git a/public/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
similarity index 100%
rename from public/compta/journal/purchasesjournal.php
rename to htdocs/compta/journal/purchasesjournal.php
diff --git a/public/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
similarity index 100%
rename from public/compta/journal/sellsjournal.php
rename to htdocs/compta/journal/sellsjournal.php
diff --git a/public/compta/localtax/card.php b/htdocs/compta/localtax/card.php
similarity index 100%
rename from public/compta/localtax/card.php
rename to htdocs/compta/localtax/card.php
diff --git a/public/compta/localtax/class/index.html b/htdocs/compta/localtax/class/index.html
similarity index 100%
rename from public/compta/localtax/class/index.html
rename to htdocs/compta/localtax/class/index.html
diff --git a/public/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
similarity index 100%
rename from public/compta/localtax/class/localtax.class.php
rename to htdocs/compta/localtax/class/localtax.class.php
diff --git a/public/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
similarity index 100%
rename from public/compta/localtax/clients.php
rename to htdocs/compta/localtax/clients.php
diff --git a/public/compta/localtax/index.php b/htdocs/compta/localtax/index.php
similarity index 100%
rename from public/compta/localtax/index.php
rename to htdocs/compta/localtax/index.php
diff --git a/public/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
similarity index 100%
rename from public/compta/localtax/quadri_detail.php
rename to htdocs/compta/localtax/quadri_detail.php
diff --git a/public/compta/localtax/reglement.php b/htdocs/compta/localtax/reglement.php
similarity index 100%
rename from public/compta/localtax/reglement.php
rename to htdocs/compta/localtax/reglement.php
diff --git a/public/compta/paiement.php b/htdocs/compta/paiement.php
similarity index 100%
rename from public/compta/paiement.php
rename to htdocs/compta/paiement.php
diff --git a/public/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php
similarity index 100%
rename from public/compta/paiement/avalider.php
rename to htdocs/compta/paiement/avalider.php
diff --git a/public/compta/paiement/card.php b/htdocs/compta/paiement/card.php
similarity index 100%
rename from public/compta/paiement/card.php
rename to htdocs/compta/paiement/card.php
diff --git a/public/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
similarity index 100%
rename from public/compta/paiement/cheque/card.php
rename to htdocs/compta/paiement/cheque/card.php
diff --git a/public/compta/paiement/cheque/class/index.html b/htdocs/compta/paiement/cheque/class/index.html
similarity index 100%
rename from public/compta/paiement/cheque/class/index.html
rename to htdocs/compta/paiement/cheque/class/index.html
diff --git a/public/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
similarity index 100%
rename from public/compta/paiement/cheque/class/remisecheque.class.php
rename to htdocs/compta/paiement/cheque/class/remisecheque.class.php
diff --git a/public/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
similarity index 100%
rename from public/compta/paiement/cheque/index.php
rename to htdocs/compta/paiement/cheque/index.php
diff --git a/public/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
similarity index 100%
rename from public/compta/paiement/cheque/list.php
rename to htdocs/compta/paiement/cheque/list.php
diff --git a/public/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php
similarity index 100%
rename from public/compta/paiement/class/cpaiement.class.php
rename to htdocs/compta/paiement/class/cpaiement.class.php
diff --git a/public/compta/paiement/class/index.html b/htdocs/compta/paiement/class/index.html
similarity index 100%
rename from public/compta/paiement/class/index.html
rename to htdocs/compta/paiement/class/index.html
diff --git a/public/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
similarity index 100%
rename from public/compta/paiement/class/paiement.class.php
rename to htdocs/compta/paiement/class/paiement.class.php
diff --git a/public/compta/paiement/index.php b/htdocs/compta/paiement/index.php
similarity index 100%
rename from public/compta/paiement/index.php
rename to htdocs/compta/paiement/index.php
diff --git a/public/compta/paiement/info.php b/htdocs/compta/paiement/info.php
similarity index 100%
rename from public/compta/paiement/info.php
rename to htdocs/compta/paiement/info.php
diff --git a/public/compta/paiement/list.php b/htdocs/compta/paiement/list.php
similarity index 100%
rename from public/compta/paiement/list.php
rename to htdocs/compta/paiement/list.php
diff --git a/public/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
similarity index 100%
rename from public/compta/paiement/rapport.php
rename to htdocs/compta/paiement/rapport.php
diff --git a/public/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
similarity index 100%
rename from public/compta/paiement_charge.php
rename to htdocs/compta/paiement_charge.php
diff --git a/public/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
similarity index 100%
rename from public/compta/payment_sc/card.php
rename to htdocs/compta/payment_sc/card.php
diff --git a/public/compta/payment_sc/index.html b/htdocs/compta/payment_sc/index.html
similarity index 100%
rename from public/compta/payment_sc/index.html
rename to htdocs/compta/payment_sc/index.html
diff --git a/public/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
similarity index 100%
rename from public/compta/prelevement/bons.php
rename to htdocs/compta/prelevement/bons.php
diff --git a/public/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
similarity index 100%
rename from public/compta/prelevement/card.php
rename to htdocs/compta/prelevement/card.php
diff --git a/public/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
similarity index 100%
rename from public/compta/prelevement/class/bonprelevement.class.php
rename to htdocs/compta/prelevement/class/bonprelevement.class.php
diff --git a/public/compta/prelevement/class/index.html b/htdocs/compta/prelevement/class/index.html
similarity index 100%
rename from public/compta/prelevement/class/index.html
rename to htdocs/compta/prelevement/class/index.html
diff --git a/public/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
similarity index 100%
rename from public/compta/prelevement/class/ligneprelevement.class.php
rename to htdocs/compta/prelevement/class/ligneprelevement.class.php
diff --git a/public/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
similarity index 100%
rename from public/compta/prelevement/class/rejetprelevement.class.php
rename to htdocs/compta/prelevement/class/rejetprelevement.class.php
diff --git a/public/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
similarity index 100%
rename from public/compta/prelevement/create.php
rename to htdocs/compta/prelevement/create.php
diff --git a/public/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
similarity index 100%
rename from public/compta/prelevement/demandes.php
rename to htdocs/compta/prelevement/demandes.php
diff --git a/public/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
similarity index 100%
rename from public/compta/prelevement/factures.php
rename to htdocs/compta/prelevement/factures.php
diff --git a/public/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
similarity index 100%
rename from public/compta/prelevement/fiche-rejet.php
rename to htdocs/compta/prelevement/fiche-rejet.php
diff --git a/public/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
similarity index 100%
rename from public/compta/prelevement/fiche-stat.php
rename to htdocs/compta/prelevement/fiche-stat.php
diff --git a/public/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
similarity index 100%
rename from public/compta/prelevement/index.php
rename to htdocs/compta/prelevement/index.php
diff --git a/public/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
similarity index 100%
rename from public/compta/prelevement/ligne.php
rename to htdocs/compta/prelevement/ligne.php
diff --git a/public/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
similarity index 100%
rename from public/compta/prelevement/list.php
rename to htdocs/compta/prelevement/list.php
diff --git a/public/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
similarity index 100%
rename from public/compta/prelevement/rejets.php
rename to htdocs/compta/prelevement/rejets.php
diff --git a/public/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
similarity index 100%
rename from public/compta/prelevement/stats.php
rename to htdocs/compta/prelevement/stats.php
diff --git a/public/compta/recap-compta.php b/htdocs/compta/recap-compta.php
similarity index 100%
rename from public/compta/recap-compta.php
rename to htdocs/compta/recap-compta.php
diff --git a/public/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
similarity index 100%
rename from public/compta/resultat/clientfourn.php
rename to htdocs/compta/resultat/clientfourn.php
diff --git a/public/compta/resultat/index.php b/htdocs/compta/resultat/index.php
similarity index 100%
rename from public/compta/resultat/index.php
rename to htdocs/compta/resultat/index.php
diff --git a/public/compta/salaries/card.php b/htdocs/compta/salaries/card.php
similarity index 100%
rename from public/compta/salaries/card.php
rename to htdocs/compta/salaries/card.php
diff --git a/public/compta/salaries/class/index.html b/htdocs/compta/salaries/class/index.html
similarity index 100%
rename from public/compta/salaries/class/index.html
rename to htdocs/compta/salaries/class/index.html
diff --git a/public/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php
similarity index 100%
rename from public/compta/salaries/class/paymentsalary.class.php
rename to htdocs/compta/salaries/class/paymentsalary.class.php
diff --git a/public/compta/salaries/document.php b/htdocs/compta/salaries/document.php
similarity index 100%
rename from public/compta/salaries/document.php
rename to htdocs/compta/salaries/document.php
diff --git a/public/compta/salaries/index.php b/htdocs/compta/salaries/index.php
similarity index 100%
rename from public/compta/salaries/index.php
rename to htdocs/compta/salaries/index.php
diff --git a/public/compta/salaries/info.php b/htdocs/compta/salaries/info.php
similarity index 100%
rename from public/compta/salaries/info.php
rename to htdocs/compta/salaries/info.php
diff --git a/public/compta/sociales/card.php b/htdocs/compta/sociales/card.php
similarity index 100%
rename from public/compta/sociales/card.php
rename to htdocs/compta/sociales/card.php
diff --git a/public/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
similarity index 100%
rename from public/compta/sociales/class/cchargesociales.class.php
rename to htdocs/compta/sociales/class/cchargesociales.class.php
diff --git a/public/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
similarity index 100%
rename from public/compta/sociales/class/chargesociales.class.php
rename to htdocs/compta/sociales/class/chargesociales.class.php
diff --git a/public/compta/sociales/class/index.html b/htdocs/compta/sociales/class/index.html
similarity index 100%
rename from public/compta/sociales/class/index.html
rename to htdocs/compta/sociales/class/index.html
diff --git a/public/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
similarity index 100%
rename from public/compta/sociales/class/paymentsocialcontribution.class.php
rename to htdocs/compta/sociales/class/paymentsocialcontribution.class.php
diff --git a/public/compta/sociales/document.php b/htdocs/compta/sociales/document.php
similarity index 100%
rename from public/compta/sociales/document.php
rename to htdocs/compta/sociales/document.php
diff --git a/public/compta/sociales/index.php b/htdocs/compta/sociales/index.php
similarity index 100%
rename from public/compta/sociales/index.php
rename to htdocs/compta/sociales/index.php
diff --git a/public/compta/sociales/info.php b/htdocs/compta/sociales/info.php
similarity index 100%
rename from public/compta/sociales/info.php
rename to htdocs/compta/sociales/info.php
diff --git a/public/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
similarity index 100%
rename from public/compta/sociales/payments.php
rename to htdocs/compta/sociales/payments.php
diff --git a/public/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
similarity index 100%
rename from public/compta/stats/cabyprodserv.php
rename to htdocs/compta/stats/cabyprodserv.php
diff --git a/public/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
similarity index 100%
rename from public/compta/stats/cabyuser.php
rename to htdocs/compta/stats/cabyuser.php
diff --git a/public/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
similarity index 100%
rename from public/compta/stats/casoc.php
rename to htdocs/compta/stats/casoc.php
diff --git a/public/compta/stats/index.php b/htdocs/compta/stats/index.php
similarity index 100%
rename from public/compta/stats/index.php
rename to htdocs/compta/stats/index.php
diff --git a/public/compta/tva/card.php b/htdocs/compta/tva/card.php
similarity index 100%
rename from public/compta/tva/card.php
rename to htdocs/compta/tva/card.php
diff --git a/public/compta/tva/class/index.html b/htdocs/compta/tva/class/index.html
similarity index 100%
rename from public/compta/tva/class/index.html
rename to htdocs/compta/tva/class/index.html
diff --git a/public/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
similarity index 100%
rename from public/compta/tva/class/tva.class.php
rename to htdocs/compta/tva/class/tva.class.php
diff --git a/public/compta/tva/clients.php b/htdocs/compta/tva/clients.php
similarity index 100%
rename from public/compta/tva/clients.php
rename to htdocs/compta/tva/clients.php
diff --git a/public/compta/tva/index.php b/htdocs/compta/tva/index.php
similarity index 100%
rename from public/compta/tva/index.php
rename to htdocs/compta/tva/index.php
diff --git a/public/compta/tva/info.php b/htdocs/compta/tva/info.php
similarity index 100%
rename from public/compta/tva/info.php
rename to htdocs/compta/tva/info.php
diff --git a/public/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php
similarity index 100%
rename from public/compta/tva/quadri.php
rename to htdocs/compta/tva/quadri.php
diff --git a/public/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
similarity index 100%
rename from public/compta/tva/quadri_detail.php
rename to htdocs/compta/tva/quadri_detail.php
diff --git a/public/compta/tva/quarter_report.php b/htdocs/compta/tva/quarter_report.php
similarity index 100%
rename from public/compta/tva/quarter_report.php
rename to htdocs/compta/tva/quarter_report.php
diff --git a/public/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
similarity index 100%
rename from public/compta/tva/reglement.php
rename to htdocs/compta/tva/reglement.php
diff --git a/public/conf/.gitignore b/htdocs/conf/.gitignore
similarity index 100%
rename from public/conf/.gitignore
rename to htdocs/conf/.gitignore
diff --git a/public/conf/.htaccess b/htdocs/conf/.htaccess
similarity index 100%
rename from public/conf/.htaccess
rename to htdocs/conf/.htaccess
diff --git a/public/conf/conf.php.example b/htdocs/conf/conf.php.example
similarity index 100%
rename from public/conf/conf.php.example
rename to htdocs/conf/conf.php.example
diff --git a/public/conf/index.html b/htdocs/conf/index.html
similarity index 100%
rename from public/conf/index.html
rename to htdocs/conf/index.html
diff --git a/public/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
similarity index 100%
rename from public/contact/canvas/actions_contactcard_common.class.php
rename to htdocs/contact/canvas/actions_contactcard_common.class.php
diff --git a/public/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
similarity index 100%
rename from public/contact/canvas/default/actions_contactcard_default.class.php
rename to htdocs/contact/canvas/default/actions_contactcard_default.class.php
diff --git a/public/contact/canvas/default/index.html b/htdocs/contact/canvas/default/index.html
similarity index 100%
rename from public/contact/canvas/default/index.html
rename to htdocs/contact/canvas/default/index.html
diff --git a/public/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
similarity index 100%
rename from public/contact/canvas/default/tpl/contactcard_create.tpl.php
rename to htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
diff --git a/public/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
similarity index 100%
rename from public/contact/canvas/default/tpl/contactcard_edit.tpl.php
rename to htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
diff --git a/public/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
similarity index 100%
rename from public/contact/canvas/default/tpl/contactcard_view.tpl.php
rename to htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
diff --git a/public/contact/canvas/default/tpl/index.html b/htdocs/contact/canvas/default/tpl/index.html
similarity index 100%
rename from public/contact/canvas/default/tpl/index.html
rename to htdocs/contact/canvas/default/tpl/index.html
diff --git a/public/contact/canvas/index.html b/htdocs/contact/canvas/index.html
similarity index 100%
rename from public/contact/canvas/index.html
rename to htdocs/contact/canvas/index.html
diff --git a/public/contact/card.php b/htdocs/contact/card.php
similarity index 100%
rename from public/contact/card.php
rename to htdocs/contact/card.php
diff --git a/public/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
similarity index 100%
rename from public/contact/class/contact.class.php
rename to htdocs/contact/class/contact.class.php
diff --git a/public/contact/class/index.html b/htdocs/contact/class/index.html
similarity index 100%
rename from public/contact/class/index.html
rename to htdocs/contact/class/index.html
diff --git a/public/contact/document.php b/htdocs/contact/document.php
similarity index 100%
rename from public/contact/document.php
rename to htdocs/contact/document.php
diff --git a/public/contact/index.html b/htdocs/contact/index.html
similarity index 100%
rename from public/contact/index.html
rename to htdocs/contact/index.html
diff --git a/public/contact/info.php b/htdocs/contact/info.php
similarity index 100%
rename from public/contact/info.php
rename to htdocs/contact/info.php
diff --git a/public/contact/ldap.php b/htdocs/contact/ldap.php
similarity index 100%
rename from public/contact/ldap.php
rename to htdocs/contact/ldap.php
diff --git a/public/contact/list.php b/htdocs/contact/list.php
similarity index 100%
rename from public/contact/list.php
rename to htdocs/contact/list.php
diff --git a/public/contact/note.php b/htdocs/contact/note.php
similarity index 100%
rename from public/contact/note.php
rename to htdocs/contact/note.php
diff --git a/public/contact/perso.php b/htdocs/contact/perso.php
similarity index 100%
rename from public/contact/perso.php
rename to htdocs/contact/perso.php
diff --git a/public/contact/vcard.php b/htdocs/contact/vcard.php
similarity index 100%
rename from public/contact/vcard.php
rename to htdocs/contact/vcard.php
diff --git a/public/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
similarity index 100%
rename from public/contrat/admin/contract_extrafields.php
rename to htdocs/contrat/admin/contract_extrafields.php
diff --git a/public/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php
similarity index 100%
rename from public/contrat/admin/contractdet_extrafields.php
rename to htdocs/contrat/admin/contractdet_extrafields.php
diff --git a/public/contrat/admin/index.html b/htdocs/contrat/admin/index.html
similarity index 100%
rename from public/contrat/admin/index.html
rename to htdocs/contrat/admin/index.html
diff --git a/public/contrat/card.php b/htdocs/contrat/card.php
similarity index 100%
rename from public/contrat/card.php
rename to htdocs/contrat/card.php
diff --git a/public/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
similarity index 100%
rename from public/contrat/class/contrat.class.php
rename to htdocs/contrat/class/contrat.class.php
diff --git a/public/contrat/class/index.html b/htdocs/contrat/class/index.html
similarity index 100%
rename from public/contrat/class/index.html
rename to htdocs/contrat/class/index.html
diff --git a/public/contrat/contact.php b/htdocs/contrat/contact.php
similarity index 100%
rename from public/contrat/contact.php
rename to htdocs/contrat/contact.php
diff --git a/public/contrat/document.php b/htdocs/contrat/document.php
similarity index 100%
rename from public/contrat/document.php
rename to htdocs/contrat/document.php
diff --git a/public/contrat/index.php b/htdocs/contrat/index.php
similarity index 100%
rename from public/contrat/index.php
rename to htdocs/contrat/index.php
diff --git a/public/contrat/info.php b/htdocs/contrat/info.php
similarity index 100%
rename from public/contrat/info.php
rename to htdocs/contrat/info.php
diff --git a/public/contrat/list.php b/htdocs/contrat/list.php
similarity index 100%
rename from public/contrat/list.php
rename to htdocs/contrat/list.php
diff --git a/public/contrat/note.php b/htdocs/contrat/note.php
similarity index 100%
rename from public/contrat/note.php
rename to htdocs/contrat/note.php
diff --git a/public/contrat/services.php b/htdocs/contrat/services.php
similarity index 100%
rename from public/contrat/services.php
rename to htdocs/contrat/services.php
diff --git a/public/contrat/tpl/index.html b/htdocs/contrat/tpl/index.html
similarity index 100%
rename from public/contrat/tpl/index.html
rename to htdocs/contrat/tpl/index.html
diff --git a/public/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from public/contrat/tpl/linkedobjectblock.tpl.php
rename to htdocs/contrat/tpl/linkedobjectblock.tpl.php
diff --git a/public/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
similarity index 100%
rename from public/core/actions_builddoc.inc.php
rename to htdocs/core/actions_builddoc.inc.php
diff --git a/public/core/actions_changeselectedfields.inc.php b/htdocs/core/actions_changeselectedfields.inc.php
similarity index 100%
rename from public/core/actions_changeselectedfields.inc.php
rename to htdocs/core/actions_changeselectedfields.inc.php
diff --git a/public/core/actions_dellink.inc.php b/htdocs/core/actions_dellink.inc.php
similarity index 100%
rename from public/core/actions_dellink.inc.php
rename to htdocs/core/actions_dellink.inc.php
diff --git a/public/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
similarity index 100%
rename from public/core/actions_extrafields.inc.php
rename to htdocs/core/actions_extrafields.inc.php
diff --git a/public/core/actions_fetchobject.inc.php b/htdocs/core/actions_fetchobject.inc.php
similarity index 100%
rename from public/core/actions_fetchobject.inc.php
rename to htdocs/core/actions_fetchobject.inc.php
diff --git a/public/core/actions_lineupdown.inc.php b/htdocs/core/actions_lineupdown.inc.php
similarity index 100%
rename from public/core/actions_lineupdown.inc.php
rename to htdocs/core/actions_lineupdown.inc.php
diff --git a/public/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
similarity index 100%
rename from public/core/actions_linkedfiles.inc.php
rename to htdocs/core/actions_linkedfiles.inc.php
diff --git a/public/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
similarity index 100%
rename from public/core/actions_massactions.inc.php
rename to htdocs/core/actions_massactions.inc.php
diff --git a/public/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
similarity index 100%
rename from public/core/actions_printing.inc.php
rename to htdocs/core/actions_printing.inc.php
diff --git a/public/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
similarity index 100%
rename from public/core/actions_sendmails.inc.php
rename to htdocs/core/actions_sendmails.inc.php
diff --git a/public/core/actions_setnotes.inc.php b/htdocs/core/actions_setnotes.inc.php
similarity index 100%
rename from public/core/actions_setnotes.inc.php
rename to htdocs/core/actions_setnotes.inc.php
diff --git a/public/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
similarity index 100%
rename from public/core/ajax/ajaxdirpreview.php
rename to htdocs/core/ajax/ajaxdirpreview.php
diff --git a/public/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
similarity index 100%
rename from public/core/ajax/ajaxdirtree.php
rename to htdocs/core/ajax/ajaxdirtree.php
diff --git a/public/core/ajax/bankconciliate.php b/htdocs/core/ajax/bankconciliate.php
similarity index 100%
rename from public/core/ajax/bankconciliate.php
rename to htdocs/core/ajax/bankconciliate.php
diff --git a/public/core/ajax/box.php b/htdocs/core/ajax/box.php
similarity index 100%
rename from public/core/ajax/box.php
rename to htdocs/core/ajax/box.php
diff --git a/public/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php
similarity index 100%
rename from public/core/ajax/constantonoff.php
rename to htdocs/core/ajax/constantonoff.php
diff --git a/public/core/ajax/contacts.php b/htdocs/core/ajax/contacts.php
similarity index 100%
rename from public/core/ajax/contacts.php
rename to htdocs/core/ajax/contacts.php
diff --git a/public/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php
similarity index 100%
rename from public/core/ajax/extraparams.php
rename to htdocs/core/ajax/extraparams.php
diff --git a/public/core/ajax/fileupload.php b/htdocs/core/ajax/fileupload.php
similarity index 100%
rename from public/core/ajax/fileupload.php
rename to htdocs/core/ajax/fileupload.php
diff --git a/public/core/ajax/index.html b/htdocs/core/ajax/index.html
similarity index 100%
rename from public/core/ajax/index.html
rename to htdocs/core/ajax/index.html
diff --git a/public/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php
similarity index 100%
rename from public/core/ajax/loadinplace.php
rename to htdocs/core/ajax/loadinplace.php
diff --git a/public/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
similarity index 100%
rename from public/core/ajax/objectonoff.php
rename to htdocs/core/ajax/objectonoff.php
diff --git a/public/core/ajax/price.php b/htdocs/core/ajax/price.php
similarity index 100%
rename from public/core/ajax/price.php
rename to htdocs/core/ajax/price.php
diff --git a/public/core/ajax/row.php b/htdocs/core/ajax/row.php
similarity index 100%
rename from public/core/ajax/row.php
rename to htdocs/core/ajax/row.php
diff --git a/public/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
similarity index 100%
rename from public/core/ajax/saveinplace.php
rename to htdocs/core/ajax/saveinplace.php
diff --git a/public/core/ajax/security.php b/htdocs/core/ajax/security.php
similarity index 100%
rename from public/core/ajax/security.php
rename to htdocs/core/ajax/security.php
diff --git a/public/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
similarity index 100%
rename from public/core/ajax/selectsearchbox.php
rename to htdocs/core/ajax/selectsearchbox.php
diff --git a/public/core/ajax/vatrates.php b/htdocs/core/ajax/vatrates.php
similarity index 100%
rename from public/core/ajax/vatrates.php
rename to htdocs/core/ajax/vatrates.php
diff --git a/public/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
similarity index 100%
rename from public/core/ajax/ziptown.php
rename to htdocs/core/ajax/ziptown.php
diff --git a/public/core/antispamimage.php b/htdocs/core/antispamimage.php
similarity index 100%
rename from public/core/antispamimage.php
rename to htdocs/core/antispamimage.php
diff --git a/public/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
similarity index 100%
rename from public/core/boxes/box_actions.php
rename to htdocs/core/boxes/box_actions.php
diff --git a/public/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
similarity index 100%
rename from public/core/boxes/box_activity.php
rename to htdocs/core/boxes/box_activity.php
diff --git a/public/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
similarity index 100%
rename from public/core/boxes/box_bookmarks.php
rename to htdocs/core/boxes/box_bookmarks.php
diff --git a/public/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
similarity index 100%
rename from public/core/boxes/box_clients.php
rename to htdocs/core/boxes/box_clients.php
diff --git a/public/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
similarity index 100%
rename from public/core/boxes/box_commandes.php
rename to htdocs/core/boxes/box_commandes.php
diff --git a/public/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
similarity index 100%
rename from public/core/boxes/box_comptes.php
rename to htdocs/core/boxes/box_comptes.php
diff --git a/public/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
similarity index 100%
rename from public/core/boxes/box_contacts.php
rename to htdocs/core/boxes/box_contacts.php
diff --git a/public/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
similarity index 100%
rename from public/core/boxes/box_contracts.php
rename to htdocs/core/boxes/box_contracts.php
diff --git a/public/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
similarity index 100%
rename from public/core/boxes/box_external_rss.php
rename to htdocs/core/boxes/box_external_rss.php
diff --git a/public/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
similarity index 100%
rename from public/core/boxes/box_factures.php
rename to htdocs/core/boxes/box_factures.php
diff --git a/public/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
similarity index 100%
rename from public/core/boxes/box_factures_fourn.php
rename to htdocs/core/boxes/box_factures_fourn.php
diff --git a/public/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
similarity index 100%
rename from public/core/boxes/box_factures_fourn_imp.php
rename to htdocs/core/boxes/box_factures_fourn_imp.php
diff --git a/public/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
similarity index 100%
rename from public/core/boxes/box_factures_imp.php
rename to htdocs/core/boxes/box_factures_imp.php
diff --git a/public/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
similarity index 100%
rename from public/core/boxes/box_ficheinter.php
rename to htdocs/core/boxes/box_ficheinter.php
diff --git a/public/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
similarity index 100%
rename from public/core/boxes/box_fournisseurs.php
rename to htdocs/core/boxes/box_fournisseurs.php
diff --git a/public/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
similarity index 100%
rename from public/core/boxes/box_goodcustomers.php
rename to htdocs/core/boxes/box_goodcustomers.php
diff --git a/public/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
similarity index 100%
rename from public/core/boxes/box_graph_invoices_permonth.php
rename to htdocs/core/boxes/box_graph_invoices_permonth.php
diff --git a/public/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
similarity index 100%
rename from public/core/boxes/box_graph_invoices_supplier_permonth.php
rename to htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
diff --git a/public/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
similarity index 100%
rename from public/core/boxes/box_graph_orders_permonth.php
rename to htdocs/core/boxes/box_graph_orders_permonth.php
diff --git a/public/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
similarity index 100%
rename from public/core/boxes/box_graph_orders_supplier_permonth.php
rename to htdocs/core/boxes/box_graph_orders_supplier_permonth.php
diff --git a/public/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
similarity index 100%
rename from public/core/boxes/box_graph_product_distribution.php
rename to htdocs/core/boxes/box_graph_product_distribution.php
diff --git a/public/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
similarity index 100%
rename from public/core/boxes/box_graph_propales_permonth.php
rename to htdocs/core/boxes/box_graph_propales_permonth.php
diff --git a/public/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
similarity index 100%
rename from public/core/boxes/box_members.php
rename to htdocs/core/boxes/box_members.php
diff --git a/public/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
similarity index 100%
rename from public/core/boxes/box_produits.php
rename to htdocs/core/boxes/box_produits.php
diff --git a/public/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
similarity index 100%
rename from public/core/boxes/box_produits_alerte_stock.php
rename to htdocs/core/boxes/box_produits_alerte_stock.php
diff --git a/public/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
similarity index 100%
rename from public/core/boxes/box_project.php
rename to htdocs/core/boxes/box_project.php
diff --git a/public/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
similarity index 100%
rename from public/core/boxes/box_propales.php
rename to htdocs/core/boxes/box_propales.php
diff --git a/public/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
similarity index 100%
rename from public/core/boxes/box_prospect.php
rename to htdocs/core/boxes/box_prospect.php
diff --git a/public/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
similarity index 100%
rename from public/core/boxes/box_services_contracts.php
rename to htdocs/core/boxes/box_services_contracts.php
diff --git a/public/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
similarity index 100%
rename from public/core/boxes/box_services_expired.php
rename to htdocs/core/boxes/box_services_expired.php
diff --git a/public/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
similarity index 100%
rename from public/core/boxes/box_supplier_orders.php
rename to htdocs/core/boxes/box_supplier_orders.php
diff --git a/public/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
similarity index 100%
rename from public/core/boxes/box_task.php
rename to htdocs/core/boxes/box_task.php
diff --git a/public/core/boxes/index.html b/htdocs/core/boxes/index.html
similarity index 100%
rename from public/core/boxes/index.html
rename to htdocs/core/boxes/index.html
diff --git a/public/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
similarity index 100%
rename from public/core/boxes/modules_boxes.php
rename to htdocs/core/boxes/modules_boxes.php
diff --git a/public/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
similarity index 100%
rename from public/core/class/CMailFile.class.php
rename to htdocs/core/class/CMailFile.class.php
diff --git a/public/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
similarity index 100%
rename from public/core/class/CSMSFile.class.php
rename to htdocs/core/class/CSMSFile.class.php
diff --git a/public/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php
similarity index 100%
rename from public/core/class/antivir.class.php
rename to htdocs/core/class/antivir.class.php
diff --git a/public/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php
similarity index 100%
rename from public/core/class/canvas.class.php
rename to htdocs/core/class/canvas.class.php
diff --git a/public/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
similarity index 100%
rename from public/core/class/ccountry.class.php
rename to htdocs/core/class/ccountry.class.php
diff --git a/public/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
similarity index 100%
rename from public/core/class/commondocgenerator.class.php
rename to htdocs/core/class/commondocgenerator.class.php
diff --git a/public/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
similarity index 100%
rename from public/core/class/commoninvoice.class.php
rename to htdocs/core/class/commoninvoice.class.php
diff --git a/public/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
similarity index 100%
rename from public/core/class/commonobject.class.php
rename to htdocs/core/class/commonobject.class.php
diff --git a/public/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
similarity index 100%
rename from public/core/class/commonobjectline.class.php
rename to htdocs/core/class/commonobjectline.class.php
diff --git a/public/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php
similarity index 100%
rename from public/core/class/commonorder.class.php
rename to htdocs/core/class/commonorder.class.php
diff --git a/public/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
similarity index 100%
rename from public/core/class/commonstickergenerator.class.php
rename to htdocs/core/class/commonstickergenerator.class.php
diff --git a/public/core/class/conf.class.php b/htdocs/core/class/conf.class.php
similarity index 100%
rename from public/core/class/conf.class.php
rename to htdocs/core/class/conf.class.php
diff --git a/public/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php
similarity index 100%
rename from public/core/class/cookie.class.php
rename to htdocs/core/class/cookie.class.php
diff --git a/public/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
similarity index 100%
rename from public/core/class/cstate.class.php
rename to htdocs/core/class/cstate.class.php
diff --git a/public/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
similarity index 100%
rename from public/core/class/ctypent.class.php
rename to htdocs/core/class/ctypent.class.php
diff --git a/public/core/class/discount.class.php b/htdocs/core/class/discount.class.php
similarity index 100%
rename from public/core/class/discount.class.php
rename to htdocs/core/class/discount.class.php
diff --git a/public/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
similarity index 100%
rename from public/core/class/doleditor.class.php
rename to htdocs/core/class/doleditor.class.php
diff --git a/public/core/class/dolexception.class.php b/htdocs/core/class/dolexception.class.php
similarity index 100%
rename from public/core/class/dolexception.class.php
rename to htdocs/core/class/dolexception.class.php
diff --git a/public/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
similarity index 100%
rename from public/core/class/dolgeoip.class.php
rename to htdocs/core/class/dolgeoip.class.php
diff --git a/public/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
similarity index 100%
rename from public/core/class/dolgraph.class.php
rename to htdocs/core/class/dolgraph.class.php
diff --git a/public/core/class/dolprintipp.class.php b/htdocs/core/class/dolprintipp.class.php
similarity index 100%
rename from public/core/class/dolprintipp.class.php
rename to htdocs/core/class/dolprintipp.class.php
diff --git a/public/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
similarity index 100%
rename from public/core/class/dolreceiptprinter.class.php
rename to htdocs/core/class/dolreceiptprinter.class.php
diff --git a/public/core/class/events.class.php b/htdocs/core/class/events.class.php
similarity index 100%
rename from public/core/class/events.class.php
rename to htdocs/core/class/events.class.php
diff --git a/public/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
similarity index 100%
rename from public/core/class/extrafields.class.php
rename to htdocs/core/class/extrafields.class.php
diff --git a/public/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
similarity index 100%
rename from public/core/class/fileupload.class.php
rename to htdocs/core/class/fileupload.class.php
diff --git a/public/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
similarity index 100%
rename from public/core/class/fiscalyear.class.php
rename to htdocs/core/class/fiscalyear.class.php
diff --git a/public/core/class/genericobject.class.php b/htdocs/core/class/genericobject.class.php
similarity index 100%
rename from public/core/class/genericobject.class.php
rename to htdocs/core/class/genericobject.class.php
diff --git a/public/core/class/google.class.php b/htdocs/core/class/google.class.php
similarity index 100%
rename from public/core/class/google.class.php
rename to htdocs/core/class/google.class.php
diff --git a/public/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
similarity index 100%
rename from public/core/class/hookmanager.class.php
rename to htdocs/core/class/hookmanager.class.php
diff --git a/public/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
similarity index 100%
rename from public/core/class/html.form.class.php
rename to htdocs/core/class/html.form.class.php
diff --git a/public/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
similarity index 100%
rename from public/core/class/html.formaccounting.class.php
rename to htdocs/core/class/html.formaccounting.class.php
diff --git a/public/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
similarity index 100%
rename from public/core/class/html.formactions.class.php
rename to htdocs/core/class/html.formactions.class.php
diff --git a/public/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
similarity index 100%
rename from public/core/class/html.formadmin.class.php
rename to htdocs/core/class/html.formadmin.class.php
diff --git a/public/core/class/html.formbank.class.php b/htdocs/core/class/html.formbank.class.php
similarity index 100%
rename from public/core/class/html.formbank.class.php
rename to htdocs/core/class/html.formbank.class.php
diff --git a/public/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
similarity index 100%
rename from public/core/class/html.formbarcode.class.php
rename to htdocs/core/class/html.formbarcode.class.php
diff --git a/public/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
similarity index 100%
rename from public/core/class/html.formcompany.class.php
rename to htdocs/core/class/html.formcompany.class.php
diff --git a/public/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
similarity index 100%
rename from public/core/class/html.formcontract.class.php
rename to htdocs/core/class/html.formcontract.class.php
diff --git a/public/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php
similarity index 100%
rename from public/core/class/html.formcron.class.php
rename to htdocs/core/class/html.formcron.class.php
diff --git a/public/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
similarity index 100%
rename from public/core/class/html.formfile.class.php
rename to htdocs/core/class/html.formfile.class.php
diff --git a/public/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
similarity index 100%
rename from public/core/class/html.formintervention.class.php
rename to htdocs/core/class/html.formintervention.class.php
diff --git a/public/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
similarity index 100%
rename from public/core/class/html.formmail.class.php
rename to htdocs/core/class/html.formmail.class.php
diff --git a/public/core/class/html.formmailing.class.php b/htdocs/core/class/html.formmailing.class.php
similarity index 100%
rename from public/core/class/html.formmailing.class.php
rename to htdocs/core/class/html.formmailing.class.php
diff --git a/public/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
similarity index 100%
rename from public/core/class/html.formmargin.class.php
rename to htdocs/core/class/html.formmargin.class.php
diff --git a/public/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
similarity index 100%
rename from public/core/class/html.formorder.class.php
rename to htdocs/core/class/html.formorder.class.php
diff --git a/public/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
similarity index 100%
rename from public/core/class/html.formother.class.php
rename to htdocs/core/class/html.formother.class.php
diff --git a/public/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
similarity index 100%
rename from public/core/class/html.formprojet.class.php
rename to htdocs/core/class/html.formprojet.class.php
diff --git a/public/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
similarity index 100%
rename from public/core/class/html.formpropal.class.php
rename to htdocs/core/class/html.formpropal.class.php
diff --git a/public/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
similarity index 100%
rename from public/core/class/html.formsms.class.php
rename to htdocs/core/class/html.formsms.class.php
diff --git a/public/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php
similarity index 100%
rename from public/core/class/html.formsocialcontrib.class.php
rename to htdocs/core/class/html.formsocialcontrib.class.php
diff --git a/public/core/class/index.html b/htdocs/core/class/index.html
similarity index 100%
rename from public/core/class/index.html
rename to htdocs/core/class/index.html
diff --git a/public/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
similarity index 100%
rename from public/core/class/infobox.class.php
rename to htdocs/core/class/infobox.class.php
diff --git a/public/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
similarity index 100%
rename from public/core/class/interfaces.class.php
rename to htdocs/core/class/interfaces.class.php
diff --git a/public/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
similarity index 100%
rename from public/core/class/ldap.class.php
rename to htdocs/core/class/ldap.class.php
diff --git a/public/core/class/link.class.php b/htdocs/core/class/link.class.php
similarity index 100%
rename from public/core/class/link.class.php
rename to htdocs/core/class/link.class.php
diff --git a/public/core/class/menu.class.php b/htdocs/core/class/menu.class.php
similarity index 100%
rename from public/core/class/menu.class.php
rename to htdocs/core/class/menu.class.php
diff --git a/public/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
similarity index 100%
rename from public/core/class/menubase.class.php
rename to htdocs/core/class/menubase.class.php
diff --git a/public/core/class/notify.class.php b/htdocs/core/class/notify.class.php
similarity index 100%
rename from public/core/class/notify.class.php
rename to htdocs/core/class/notify.class.php
diff --git a/public/core/class/openid.class.php b/htdocs/core/class/openid.class.php
similarity index 100%
rename from public/core/class/openid.class.php
rename to htdocs/core/class/openid.class.php
diff --git a/public/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
similarity index 100%
rename from public/core/class/rssparser.class.php
rename to htdocs/core/class/rssparser.class.php
diff --git a/public/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
similarity index 100%
rename from public/core/class/smtps.class.php
rename to htdocs/core/class/smtps.class.php
diff --git a/public/core/class/stats.class.php b/htdocs/core/class/stats.class.php
similarity index 100%
rename from public/core/class/stats.class.php
rename to htdocs/core/class/stats.class.php
diff --git a/public/core/class/translate.class.php b/htdocs/core/class/translate.class.php
similarity index 100%
rename from public/core/class/translate.class.php
rename to htdocs/core/class/translate.class.php
diff --git a/public/core/class/utils.class.php b/htdocs/core/class/utils.class.php
similarity index 100%
rename from public/core/class/utils.class.php
rename to htdocs/core/class/utils.class.php
diff --git a/public/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
similarity index 100%
rename from public/core/class/vcard.class.php
rename to htdocs/core/class/vcard.class.php
diff --git a/public/core/class/workboardresponse.class.php b/htdocs/core/class/workboardresponse.class.php
similarity index 100%
rename from public/core/class/workboardresponse.class.php
rename to htdocs/core/class/workboardresponse.class.php
diff --git a/public/core/datepicker.php b/htdocs/core/datepicker.php
similarity index 100%
rename from public/core/datepicker.php
rename to htdocs/core/datepicker.php
diff --git a/public/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
similarity index 100%
rename from public/core/db/Database.interface.php
rename to htdocs/core/db/Database.interface.php
diff --git a/public/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
similarity index 100%
rename from public/core/db/DoliDB.class.php
rename to htdocs/core/db/DoliDB.class.php
diff --git a/public/core/db/index.html b/htdocs/core/db/index.html
similarity index 100%
rename from public/core/db/index.html
rename to htdocs/core/db/index.html
diff --git a/public/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php
similarity index 100%
rename from public/core/db/mssql.class.php
rename to htdocs/core/db/mssql.class.php
diff --git a/public/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
similarity index 100%
rename from public/core/db/mysqli.class.php
rename to htdocs/core/db/mysqli.class.php
diff --git a/public/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
similarity index 100%
rename from public/core/db/pgsql.class.php
rename to htdocs/core/db/pgsql.class.php
diff --git a/public/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
similarity index 100%
rename from public/core/db/sqlite3.class.php
rename to htdocs/core/db/sqlite3.class.php
diff --git a/public/core/doxygen.php b/htdocs/core/doxygen.php
similarity index 100%
rename from public/core/doxygen.php
rename to htdocs/core/doxygen.php
diff --git a/public/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
similarity index 100%
rename from public/core/extrafieldsinexport.inc.php
rename to htdocs/core/extrafieldsinexport.inc.php
diff --git a/public/core/filemanagerdol/browser/default/browser.css b/htdocs/core/filemanagerdol/browser/default/browser.css
similarity index 100%
rename from public/core/filemanagerdol/browser/default/browser.css
rename to htdocs/core/filemanagerdol/browser/default/browser.css
diff --git a/public/core/filemanagerdol/browser/default/browser.php b/htdocs/core/filemanagerdol/browser/default/browser.php
similarity index 100%
rename from public/core/filemanagerdol/browser/default/browser.php
rename to htdocs/core/filemanagerdol/browser/default/browser.php
diff --git a/public/core/filemanagerdol/browser/default/frmactualfolder.php b/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
similarity index 100%
rename from public/core/filemanagerdol/browser/default/frmactualfolder.php
rename to htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
diff --git a/public/core/filemanagerdol/browser/default/frmcreatefolder.php b/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
similarity index 100%
rename from public/core/filemanagerdol/browser/default/frmcreatefolder.php
rename to htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
diff --git a/public/core/filemanagerdol/browser/default/frmfolders.php b/htdocs/core/filemanagerdol/browser/default/frmfolders.php
similarity index 100%
rename from public/core/filemanagerdol/browser/default/frmfolders.php
rename to htdocs/core/filemanagerdol/browser/default/frmfolders.php
diff --git a/public/core/filemanagerdol/browser/default/frmresourceslist.php b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
similarity index 100%
rename from public/core/filemanagerdol/browser/default/frmresourceslist.php
rename to htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
diff --git a/public/core/filemanagerdol/browser/default/frmupload.php b/htdocs/core/filemanagerdol/browser/default/frmupload.php
similarity index 100%
rename from public/core/filemanagerdol/browser/default/frmupload.php
rename to htdocs/core/filemanagerdol/browser/default/frmupload.php
diff --git a/public/core/filemanagerdol/browser/default/images/Folder.gif b/htdocs/core/filemanagerdol/browser/default/images/Folder.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/Folder.gif
rename to htdocs/core/filemanagerdol/browser/default/images/Folder.gif
diff --git a/public/core/filemanagerdol/browser/default/images/FolderUp.gif b/htdocs/core/filemanagerdol/browser/default/images/FolderUp.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/FolderUp.gif
rename to htdocs/core/filemanagerdol/browser/default/images/FolderUp.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/ai.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/ai.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/ai.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/ai.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/avi.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/avi.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/avi.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/avi.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/bmp.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/bmp.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/bmp.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/bmp.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/cs.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/cs.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/cs.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/cs.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/dll.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/dll.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/dll.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/dll.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/doc.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/doc.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/doc.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/doc.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/exe.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/exe.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/exe.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/exe.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/fla.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/fla.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/fla.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/fla.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/gif.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/gif.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/gif.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/gif.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/htm.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/htm.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/htm.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/htm.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/html.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/html.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/html.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/html.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/index.html b/htdocs/core/filemanagerdol/browser/default/images/icons/32/index.html
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/index.html
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/index.html
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/jpg.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/jpg.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/jpg.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/jpg.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/js.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/js.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/js.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/js.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/mdb.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/mdb.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/mdb.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/mdb.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/mp3.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/mp3.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/mp3.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/mp3.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/pdf.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/pdf.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/pdf.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/pdf.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/png.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/png.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/png.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/png.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/ppt.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/ppt.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/ppt.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/ppt.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/rdp.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/rdp.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/rdp.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/rdp.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/swf.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/swf.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/swf.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/swf.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/swt.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/swt.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/swt.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/swt.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/txt.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/txt.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/txt.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/txt.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/vsd.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/vsd.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/vsd.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/vsd.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/xls.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/xls.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/xls.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/xls.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/xml.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/xml.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/xml.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/xml.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/32/zip.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/32/zip.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/32/zip.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/32/zip.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/ai.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/ai.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/ai.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/ai.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/avi.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/avi.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/avi.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/avi.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/bmp.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/bmp.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/bmp.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/bmp.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/cs.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/cs.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/cs.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/cs.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/default.icon.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/default.icon.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/default.icon.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/default.icon.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/dll.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/dll.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/dll.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/dll.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/doc.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/doc.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/doc.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/doc.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/exe.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/exe.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/exe.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/exe.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/fla.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/fla.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/fla.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/fla.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/gif.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/gif.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/gif.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/gif.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/htm.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/htm.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/htm.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/htm.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/html.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/html.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/html.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/html.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/index.html b/htdocs/core/filemanagerdol/browser/default/images/icons/index.html
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/index.html
rename to htdocs/core/filemanagerdol/browser/default/images/icons/index.html
diff --git a/public/core/filemanagerdol/browser/default/images/icons/jpg.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/jpg.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/jpg.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/jpg.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/js.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/js.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/js.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/js.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/mdb.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/mdb.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/mdb.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/mdb.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/mp3.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/mp3.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/mp3.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/mp3.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/pdf.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/pdf.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/pdf.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/pdf.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/png.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/png.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/png.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/png.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/ppt.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/ppt.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/ppt.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/ppt.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/rdp.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/rdp.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/rdp.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/rdp.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/swf.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/swf.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/swf.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/swf.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/swt.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/swt.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/swt.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/swt.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/txt.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/txt.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/txt.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/txt.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/vsd.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/vsd.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/vsd.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/vsd.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/xls.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/xls.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/xls.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/xls.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/xml.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/xml.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/xml.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/xml.gif
diff --git a/public/core/filemanagerdol/browser/default/images/icons/zip.gif b/htdocs/core/filemanagerdol/browser/default/images/icons/zip.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/icons/zip.gif
rename to htdocs/core/filemanagerdol/browser/default/images/icons/zip.gif
diff --git a/public/core/filemanagerdol/browser/default/images/index.html b/htdocs/core/filemanagerdol/browser/default/images/index.html
similarity index 100%
rename from public/core/filemanagerdol/browser/default/images/index.html
rename to htdocs/core/filemanagerdol/browser/default/images/index.html
diff --git a/public/core/filemanagerdol/browser/default/index.html b/htdocs/core/filemanagerdol/browser/default/index.html
similarity index 100%
rename from public/core/filemanagerdol/browser/default/index.html
rename to htdocs/core/filemanagerdol/browser/default/index.html
diff --git a/public/core/filemanagerdol/browser/default/js/common.js b/htdocs/core/filemanagerdol/browser/default/js/common.js
similarity index 100%
rename from public/core/filemanagerdol/browser/default/js/common.js
rename to htdocs/core/filemanagerdol/browser/default/js/common.js
diff --git a/public/core/filemanagerdol/browser/default/js/fckxml.js b/htdocs/core/filemanagerdol/browser/default/js/fckxml.js
similarity index 100%
rename from public/core/filemanagerdol/browser/default/js/fckxml.js
rename to htdocs/core/filemanagerdol/browser/default/js/fckxml.js
diff --git a/public/core/filemanagerdol/browser/default/js/index.html b/htdocs/core/filemanagerdol/browser/default/js/index.html
similarity index 100%
rename from public/core/filemanagerdol/browser/default/js/index.html
rename to htdocs/core/filemanagerdol/browser/default/js/index.html
diff --git a/public/core/filemanagerdol/browser/default/spacer.gif b/htdocs/core/filemanagerdol/browser/default/spacer.gif
similarity index 100%
rename from public/core/filemanagerdol/browser/default/spacer.gif
rename to htdocs/core/filemanagerdol/browser/default/spacer.gif
diff --git a/public/core/filemanagerdol/browser/index.html b/htdocs/core/filemanagerdol/browser/index.html
similarity index 100%
rename from public/core/filemanagerdol/browser/index.html
rename to htdocs/core/filemanagerdol/browser/index.html
diff --git a/public/core/filemanagerdol/connectors/index.html b/htdocs/core/filemanagerdol/connectors/index.html
similarity index 100%
rename from public/core/filemanagerdol/connectors/index.html
rename to htdocs/core/filemanagerdol/connectors/index.html
diff --git a/public/core/filemanagerdol/connectors/php/basexml.php b/htdocs/core/filemanagerdol/connectors/php/basexml.php
similarity index 100%
rename from public/core/filemanagerdol/connectors/php/basexml.php
rename to htdocs/core/filemanagerdol/connectors/php/basexml.php
diff --git a/public/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
similarity index 100%
rename from public/core/filemanagerdol/connectors/php/commands.php
rename to htdocs/core/filemanagerdol/connectors/php/commands.php
diff --git a/public/core/filemanagerdol/connectors/php/config.php b/htdocs/core/filemanagerdol/connectors/php/config.php
similarity index 100%
rename from public/core/filemanagerdol/connectors/php/config.php
rename to htdocs/core/filemanagerdol/connectors/php/config.php
diff --git a/public/core/filemanagerdol/connectors/php/connector.php b/htdocs/core/filemanagerdol/connectors/php/connector.php
similarity index 100%
rename from public/core/filemanagerdol/connectors/php/connector.php
rename to htdocs/core/filemanagerdol/connectors/php/connector.php
diff --git a/public/core/filemanagerdol/connectors/php/index.html b/htdocs/core/filemanagerdol/connectors/php/index.html
similarity index 100%
rename from public/core/filemanagerdol/connectors/php/index.html
rename to htdocs/core/filemanagerdol/connectors/php/index.html
diff --git a/public/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
similarity index 100%
rename from public/core/filemanagerdol/connectors/php/io.php
rename to htdocs/core/filemanagerdol/connectors/php/io.php
diff --git a/public/core/filemanagerdol/connectors/php/upload.php b/htdocs/core/filemanagerdol/connectors/php/upload.php
similarity index 100%
rename from public/core/filemanagerdol/connectors/php/upload.php
rename to htdocs/core/filemanagerdol/connectors/php/upload.php
diff --git a/public/core/filemanagerdol/connectors/php/util.php b/htdocs/core/filemanagerdol/connectors/php/util.php
similarity index 100%
rename from public/core/filemanagerdol/connectors/php/util.php
rename to htdocs/core/filemanagerdol/connectors/php/util.php
diff --git a/public/core/filemanagerdol/index.html b/htdocs/core/filemanagerdol/index.html
similarity index 100%
rename from public/core/filemanagerdol/index.html
rename to htdocs/core/filemanagerdol/index.html
diff --git a/public/core/get_menudiv.php b/htdocs/core/get_menudiv.php
similarity index 100%
rename from public/core/get_menudiv.php
rename to htdocs/core/get_menudiv.php
diff --git a/public/core/index.html b/htdocs/core/index.html
similarity index 100%
rename from public/core/index.html
rename to htdocs/core/index.html
diff --git a/public/core/js/blockUI.js b/htdocs/core/js/blockUI.js
similarity index 100%
rename from public/core/js/blockUI.js
rename to htdocs/core/js/blockUI.js
diff --git a/public/core/js/datepicker.js.php b/htdocs/core/js/datepicker.js.php
similarity index 100%
rename from public/core/js/datepicker.js.php
rename to htdocs/core/js/datepicker.js.php
diff --git a/public/core/js/dst.js b/htdocs/core/js/dst.js
similarity index 100%
rename from public/core/js/dst.js
rename to htdocs/core/js/dst.js
diff --git a/public/core/js/editinplace.js b/htdocs/core/js/editinplace.js
similarity index 100%
rename from public/core/js/editinplace.js
rename to htdocs/core/js/editinplace.js
diff --git a/public/core/js/index.html b/htdocs/core/js/index.html
similarity index 100%
rename from public/core/js/index.html
rename to htdocs/core/js/index.html
diff --git a/public/core/js/jnotify.js b/htdocs/core/js/jnotify.js
similarity index 100%
rename from public/core/js/jnotify.js
rename to htdocs/core/js/jnotify.js
diff --git a/public/core/js/lib_batch.js b/htdocs/core/js/lib_batch.js
similarity index 100%
rename from public/core/js/lib_batch.js
rename to htdocs/core/js/lib_batch.js
diff --git a/public/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
similarity index 100%
rename from public/core/js/lib_head.js.php
rename to htdocs/core/js/lib_head.js.php
diff --git a/public/core/js/lib_photosresize.js b/htdocs/core/js/lib_photosresize.js
similarity index 100%
rename from public/core/js/lib_photosresize.js
rename to htdocs/core/js/lib_photosresize.js
diff --git a/public/core/js/lib_rare.js b/htdocs/core/js/lib_rare.js
similarity index 100%
rename from public/core/js/lib_rare.js
rename to htdocs/core/js/lib_rare.js
diff --git a/public/core/js/select2_locale.js.php b/htdocs/core/js/select2_locale.js.php
similarity index 100%
rename from public/core/js/select2_locale.js.php
rename to htdocs/core/js/select2_locale.js.php
diff --git a/public/core/js/timepicker.js.php b/htdocs/core/js/timepicker.js.php
similarity index 100%
rename from public/core/js/timepicker.js.php
rename to htdocs/core/js/timepicker.js.php
diff --git a/public/core/js/timesheet.js b/htdocs/core/js/timesheet.js
similarity index 100%
rename from public/core/js/timesheet.js
rename to htdocs/core/js/timesheet.js
diff --git a/public/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
similarity index 100%
rename from public/core/lib/accounting.lib.php
rename to htdocs/core/lib/accounting.lib.php
diff --git a/public/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
similarity index 100%
rename from public/core/lib/admin.lib.php
rename to htdocs/core/lib/admin.lib.php
diff --git a/public/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
similarity index 100%
rename from public/core/lib/agenda.lib.php
rename to htdocs/core/lib/agenda.lib.php
diff --git a/public/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
similarity index 100%
rename from public/core/lib/ajax.lib.php
rename to htdocs/core/lib/ajax.lib.php
diff --git a/public/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
similarity index 100%
rename from public/core/lib/bank.lib.php
rename to htdocs/core/lib/bank.lib.php
diff --git a/public/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
similarity index 100%
rename from public/core/lib/barcode.lib.php
rename to htdocs/core/lib/barcode.lib.php
diff --git a/public/core/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php
similarity index 100%
rename from public/core/lib/categories.lib.php
rename to htdocs/core/lib/categories.lib.php
diff --git a/public/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
similarity index 100%
rename from public/core/lib/company.lib.php
rename to htdocs/core/lib/company.lib.php
diff --git a/public/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
similarity index 100%
rename from public/core/lib/contact.lib.php
rename to htdocs/core/lib/contact.lib.php
diff --git a/public/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
similarity index 100%
rename from public/core/lib/contract.lib.php
rename to htdocs/core/lib/contract.lib.php
diff --git a/public/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
similarity index 100%
rename from public/core/lib/cron.lib.php
rename to htdocs/core/lib/cron.lib.php
diff --git a/public/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
similarity index 100%
rename from public/core/lib/date.lib.php
rename to htdocs/core/lib/date.lib.php
diff --git a/public/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
similarity index 100%
rename from public/core/lib/doc.lib.php
rename to htdocs/core/lib/doc.lib.php
diff --git a/public/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
similarity index 100%
rename from public/core/lib/doleditor.lib.php
rename to htdocs/core/lib/doleditor.lib.php
diff --git a/public/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php
similarity index 100%
rename from public/core/lib/donation.lib.php
rename to htdocs/core/lib/donation.lib.php
diff --git a/public/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
similarity index 100%
rename from public/core/lib/ecm.lib.php
rename to htdocs/core/lib/ecm.lib.php
diff --git a/public/core/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php
similarity index 100%
rename from public/core/lib/emailing.lib.php
rename to htdocs/core/lib/emailing.lib.php
diff --git a/public/core/lib/expedition.lib.php b/htdocs/core/lib/expedition.lib.php
similarity index 100%
rename from public/core/lib/expedition.lib.php
rename to htdocs/core/lib/expedition.lib.php
diff --git a/public/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
similarity index 100%
rename from public/core/lib/expensereport.lib.php
rename to htdocs/core/lib/expensereport.lib.php
diff --git a/public/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
similarity index 100%
rename from public/core/lib/fichinter.lib.php
rename to htdocs/core/lib/fichinter.lib.php
diff --git a/public/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
similarity index 100%
rename from public/core/lib/files.lib.php
rename to htdocs/core/lib/files.lib.php
diff --git a/public/core/lib/fiscalyear.lib.php b/htdocs/core/lib/fiscalyear.lib.php
similarity index 100%
rename from public/core/lib/fiscalyear.lib.php
rename to htdocs/core/lib/fiscalyear.lib.php
diff --git a/public/core/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php
similarity index 100%
rename from public/core/lib/format_cards.lib.php
rename to htdocs/core/lib/format_cards.lib.php
diff --git a/public/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
similarity index 100%
rename from public/core/lib/fourn.lib.php
rename to htdocs/core/lib/fourn.lib.php
diff --git a/public/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
similarity index 100%
rename from public/core/lib/functions.lib.php
rename to htdocs/core/lib/functions.lib.php
diff --git a/public/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
similarity index 100%
rename from public/core/lib/functions2.lib.php
rename to htdocs/core/lib/functions2.lib.php
diff --git a/public/core/lib/functions_ch.lib.php b/htdocs/core/lib/functions_ch.lib.php
similarity index 100%
rename from public/core/lib/functions_ch.lib.php
rename to htdocs/core/lib/functions_ch.lib.php
diff --git a/public/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
similarity index 100%
rename from public/core/lib/functionsnumtoword.lib.php
rename to htdocs/core/lib/functionsnumtoword.lib.php
diff --git a/public/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
similarity index 100%
rename from public/core/lib/geturl.lib.php
rename to htdocs/core/lib/geturl.lib.php
diff --git a/public/core/lib/holiday.lib.php b/htdocs/core/lib/holiday.lib.php
similarity index 100%
rename from public/core/lib/holiday.lib.php
rename to htdocs/core/lib/holiday.lib.php
diff --git a/public/core/lib/hrm.lib.php b/htdocs/core/lib/hrm.lib.php
similarity index 100%
rename from public/core/lib/hrm.lib.php
rename to htdocs/core/lib/hrm.lib.php
diff --git a/public/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
similarity index 100%
rename from public/core/lib/images.lib.php
rename to htdocs/core/lib/images.lib.php
diff --git a/public/core/lib/import.lib.php b/htdocs/core/lib/import.lib.php
similarity index 100%
rename from public/core/lib/import.lib.php
rename to htdocs/core/lib/import.lib.php
diff --git a/public/core/lib/index.html b/htdocs/core/lib/index.html
similarity index 100%
rename from public/core/lib/index.html
rename to htdocs/core/lib/index.html
diff --git a/public/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
similarity index 100%
rename from public/core/lib/invoice.lib.php
rename to htdocs/core/lib/invoice.lib.php
diff --git a/public/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
similarity index 100%
rename from public/core/lib/invoice2.lib.php
rename to htdocs/core/lib/invoice2.lib.php
diff --git a/public/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
similarity index 100%
rename from public/core/lib/json.lib.php
rename to htdocs/core/lib/json.lib.php
diff --git a/public/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
similarity index 100%
rename from public/core/lib/ldap.lib.php
rename to htdocs/core/lib/ldap.lib.php
diff --git a/public/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php
similarity index 100%
rename from public/core/lib/loan.lib.php
rename to htdocs/core/lib/loan.lib.php
diff --git a/public/core/lib/mailmanspip.lib.php b/htdocs/core/lib/mailmanspip.lib.php
similarity index 100%
rename from public/core/lib/mailmanspip.lib.php
rename to htdocs/core/lib/mailmanspip.lib.php
diff --git a/public/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
similarity index 100%
rename from public/core/lib/member.lib.php
rename to htdocs/core/lib/member.lib.php
diff --git a/public/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
similarity index 100%
rename from public/core/lib/memory.lib.php
rename to htdocs/core/lib/memory.lib.php
diff --git a/public/core/lib/multicurrency.lib.php b/htdocs/core/lib/multicurrency.lib.php
similarity index 100%
rename from public/core/lib/multicurrency.lib.php
rename to htdocs/core/lib/multicurrency.lib.php
diff --git a/public/core/lib/oauth.lib.php b/htdocs/core/lib/oauth.lib.php
similarity index 100%
rename from public/core/lib/oauth.lib.php
rename to htdocs/core/lib/oauth.lib.php
diff --git a/public/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
similarity index 100%
rename from public/core/lib/order.lib.php
rename to htdocs/core/lib/order.lib.php
diff --git a/public/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
similarity index 100%
rename from public/core/lib/payments.lib.php
rename to htdocs/core/lib/payments.lib.php
diff --git a/public/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
similarity index 100%
rename from public/core/lib/pdf.lib.php
rename to htdocs/core/lib/pdf.lib.php
diff --git a/public/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
similarity index 100%
rename from public/core/lib/prelevement.lib.php
rename to htdocs/core/lib/prelevement.lib.php
diff --git a/public/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
similarity index 100%
rename from public/core/lib/price.lib.php
rename to htdocs/core/lib/price.lib.php
diff --git a/public/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
similarity index 100%
rename from public/core/lib/product.lib.php
rename to htdocs/core/lib/product.lib.php
diff --git a/public/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
similarity index 100%
rename from public/core/lib/project.lib.php
rename to htdocs/core/lib/project.lib.php
diff --git a/public/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
similarity index 100%
rename from public/core/lib/propal.lib.php
rename to htdocs/core/lib/propal.lib.php
diff --git a/public/core/lib/receiptprinter.lib.php b/htdocs/core/lib/receiptprinter.lib.php
similarity index 100%
rename from public/core/lib/receiptprinter.lib.php
rename to htdocs/core/lib/receiptprinter.lib.php
diff --git a/public/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
similarity index 100%
rename from public/core/lib/report.lib.php
rename to htdocs/core/lib/report.lib.php
diff --git a/public/core/lib/resource.lib.php b/htdocs/core/lib/resource.lib.php
similarity index 100%
rename from public/core/lib/resource.lib.php
rename to htdocs/core/lib/resource.lib.php
diff --git a/public/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php
similarity index 100%
rename from public/core/lib/salaries.lib.php
rename to htdocs/core/lib/salaries.lib.php
diff --git a/public/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
similarity index 100%
rename from public/core/lib/security.lib.php
rename to htdocs/core/lib/security.lib.php
diff --git a/public/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
similarity index 100%
rename from public/core/lib/security2.lib.php
rename to htdocs/core/lib/security2.lib.php
diff --git a/public/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
similarity index 100%
rename from public/core/lib/sendings.lib.php
rename to htdocs/core/lib/sendings.lib.php
diff --git a/public/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php
similarity index 100%
rename from public/core/lib/stock.lib.php
rename to htdocs/core/lib/stock.lib.php
diff --git a/public/core/lib/supplier_proposal.lib.php b/htdocs/core/lib/supplier_proposal.lib.php
similarity index 100%
rename from public/core/lib/supplier_proposal.lib.php
rename to htdocs/core/lib/supplier_proposal.lib.php
diff --git a/public/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
similarity index 100%
rename from public/core/lib/tax.lib.php
rename to htdocs/core/lib/tax.lib.php
diff --git a/public/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
similarity index 100%
rename from public/core/lib/treeview.lib.php
rename to htdocs/core/lib/treeview.lib.php
diff --git a/public/core/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php
similarity index 100%
rename from public/core/lib/trip.lib.php
rename to htdocs/core/lib/trip.lib.php
diff --git a/public/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
similarity index 100%
rename from public/core/lib/usergroups.lib.php
rename to htdocs/core/lib/usergroups.lib.php
diff --git a/public/core/lib/vat.lib.php b/htdocs/core/lib/vat.lib.php
similarity index 100%
rename from public/core/lib/vat.lib.php
rename to htdocs/core/lib/vat.lib.php
diff --git a/public/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php
similarity index 100%
rename from public/core/lib/ws.lib.php
rename to htdocs/core/lib/ws.lib.php
diff --git a/public/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
similarity index 100%
rename from public/core/lib/xcal.lib.php
rename to htdocs/core/lib/xcal.lib.php
diff --git a/public/core/login/README.txt b/htdocs/core/login/README.txt
similarity index 100%
rename from public/core/login/README.txt
rename to htdocs/core/login/README.txt
diff --git a/public/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
similarity index 100%
rename from public/core/login/functions_dolibarr.php
rename to htdocs/core/login/functions_dolibarr.php
diff --git a/public/core/login/functions_empty.php b/htdocs/core/login/functions_empty.php
similarity index 100%
rename from public/core/login/functions_empty.php
rename to htdocs/core/login/functions_empty.php
diff --git a/public/core/login/functions_forceuser.php b/htdocs/core/login/functions_forceuser.php
similarity index 100%
rename from public/core/login/functions_forceuser.php
rename to htdocs/core/login/functions_forceuser.php
diff --git a/public/core/login/functions_http.php b/htdocs/core/login/functions_http.php
similarity index 100%
rename from public/core/login/functions_http.php
rename to htdocs/core/login/functions_http.php
diff --git a/public/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
similarity index 100%
rename from public/core/login/functions_ldap.php
rename to htdocs/core/login/functions_ldap.php
diff --git a/public/core/login/functions_openid.php b/htdocs/core/login/functions_openid.php
similarity index 100%
rename from public/core/login/functions_openid.php
rename to htdocs/core/login/functions_openid.php
diff --git a/public/core/login/index.html b/htdocs/core/login/index.html
similarity index 100%
rename from public/core/login/index.html
rename to htdocs/core/login/index.html
diff --git a/public/core/menus/index.html b/htdocs/core/menus/index.html
similarity index 100%
rename from public/core/menus/index.html
rename to htdocs/core/menus/index.html
diff --git a/public/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
similarity index 100%
rename from public/core/menus/init_menu_auguria.sql
rename to htdocs/core/menus/init_menu_auguria.sql
diff --git a/public/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
similarity index 100%
rename from public/core/menus/standard/auguria.lib.php
rename to htdocs/core/menus/standard/auguria.lib.php
diff --git a/public/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
similarity index 100%
rename from public/core/menus/standard/auguria_menu.php
rename to htdocs/core/menus/standard/auguria_menu.php
diff --git a/public/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
similarity index 100%
rename from public/core/menus/standard/eldy.lib.php
rename to htdocs/core/menus/standard/eldy.lib.php
diff --git a/public/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
similarity index 100%
rename from public/core/menus/standard/eldy_menu.php
rename to htdocs/core/menus/standard/eldy_menu.php
diff --git a/public/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
similarity index 100%
rename from public/core/menus/standard/empty.php
rename to htdocs/core/menus/standard/empty.php
diff --git a/public/core/menus/standard/index.html b/htdocs/core/menus/standard/index.html
similarity index 100%
rename from public/core/menus/standard/index.html
rename to htdocs/core/menus/standard/index.html
diff --git a/public/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
similarity index 100%
rename from public/core/modules/DolibarrModules.class.php
rename to htdocs/core/modules/DolibarrModules.class.php
diff --git a/public/core/modules/action/index.html b/htdocs/core/modules/action/index.html
similarity index 100%
rename from public/core/modules/action/index.html
rename to htdocs/core/modules/action/index.html
diff --git a/public/core/modules/action/modules_action.php b/htdocs/core/modules/action/modules_action.php
similarity index 100%
rename from public/core/modules/action/modules_action.php
rename to htdocs/core/modules/action/modules_action.php
diff --git a/public/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
similarity index 100%
rename from public/core/modules/action/rapport.pdf.php
rename to htdocs/core/modules/action/rapport.pdf.php
diff --git a/public/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
similarity index 100%
rename from public/core/modules/bank/doc/pdf_ban.modules.php
rename to htdocs/core/modules/bank/doc/pdf_ban.modules.php
diff --git a/public/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
similarity index 100%
rename from public/core/modules/bank/doc/pdf_sepamandate.modules.php
rename to htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
diff --git a/public/core/modules/bank/modules_bank.php b/htdocs/core/modules/bank/modules_bank.php
similarity index 100%
rename from public/core/modules/bank/modules_bank.php
rename to htdocs/core/modules/bank/modules_bank.php
diff --git a/public/core/modules/barcode/doc/index.html b/htdocs/core/modules/barcode/doc/index.html
similarity index 100%
rename from public/core/modules/barcode/doc/index.html
rename to htdocs/core/modules/barcode/doc/index.html
diff --git a/public/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
similarity index 100%
rename from public/core/modules/barcode/doc/phpbarcode.modules.php
rename to htdocs/core/modules/barcode/doc/phpbarcode.modules.php
diff --git a/public/core/modules/barcode/doc/tcpdfbarcode.modules.php b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
similarity index 100%
rename from public/core/modules/barcode/doc/tcpdfbarcode.modules.php
rename to htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
diff --git a/public/core/modules/barcode/index.html b/htdocs/core/modules/barcode/index.html
similarity index 100%
rename from public/core/modules/barcode/index.html
rename to htdocs/core/modules/barcode/index.html
diff --git a/public/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
similarity index 100%
rename from public/core/modules/barcode/mod_barcode_product_standard.php
rename to htdocs/core/modules/barcode/mod_barcode_product_standard.php
diff --git a/public/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
similarity index 100%
rename from public/core/modules/barcode/modules_barcode.class.php
rename to htdocs/core/modules/barcode/modules_barcode.class.php
diff --git a/public/core/modules/cheque/doc/index.html b/htdocs/core/modules/cheque/doc/index.html
similarity index 100%
rename from public/core/modules/cheque/doc/index.html
rename to htdocs/core/modules/cheque/doc/index.html
diff --git a/public/core/modules/cheque/doc/pdf_blochet.class.php b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
similarity index 100%
rename from public/core/modules/cheque/doc/pdf_blochet.class.php
rename to htdocs/core/modules/cheque/doc/pdf_blochet.class.php
diff --git a/public/core/modules/cheque/index.html b/htdocs/core/modules/cheque/index.html
similarity index 100%
rename from public/core/modules/cheque/index.html
rename to htdocs/core/modules/cheque/index.html
diff --git a/public/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
similarity index 100%
rename from public/core/modules/cheque/mod_chequereceipt_mint.php
rename to htdocs/core/modules/cheque/mod_chequereceipt_mint.php
diff --git a/public/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
similarity index 100%
rename from public/core/modules/cheque/mod_chequereceipt_thyme.php
rename to htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
diff --git a/public/core/modules/cheque/modules_chequereceipts.php b/htdocs/core/modules/cheque/modules_chequereceipts.php
similarity index 100%
rename from public/core/modules/cheque/modules_chequereceipts.php
rename to htdocs/core/modules/cheque/modules_chequereceipts.php
diff --git a/public/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
similarity index 100%
rename from public/core/modules/commande/doc/doc_generic_order_odt.modules.php
rename to htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
diff --git a/public/core/modules/commande/doc/index.html b/htdocs/core/modules/commande/doc/index.html
similarity index 100%
rename from public/core/modules/commande/doc/index.html
rename to htdocs/core/modules/commande/doc/index.html
diff --git a/public/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
similarity index 100%
rename from public/core/modules/commande/doc/pdf_einstein.modules.php
rename to htdocs/core/modules/commande/doc/pdf_einstein.modules.php
diff --git a/public/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
similarity index 100%
rename from public/core/modules/commande/doc/pdf_proforma.modules.php
rename to htdocs/core/modules/commande/doc/pdf_proforma.modules.php
diff --git a/public/core/modules/commande/index.html b/htdocs/core/modules/commande/index.html
similarity index 100%
rename from public/core/modules/commande/index.html
rename to htdocs/core/modules/commande/index.html
diff --git a/public/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
similarity index 100%
rename from public/core/modules/commande/mod_commande_marbre.php
rename to htdocs/core/modules/commande/mod_commande_marbre.php
diff --git a/public/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
similarity index 100%
rename from public/core/modules/commande/mod_commande_saphir.php
rename to htdocs/core/modules/commande/mod_commande_saphir.php
diff --git a/public/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php
similarity index 100%
rename from public/core/modules/commande/modules_commande.php
rename to htdocs/core/modules/commande/modules_commande.php
diff --git a/public/core/modules/contract/doc/index.html b/htdocs/core/modules/contract/doc/index.html
similarity index 100%
rename from public/core/modules/contract/doc/index.html
rename to htdocs/core/modules/contract/doc/index.html
diff --git a/public/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
similarity index 100%
rename from public/core/modules/contract/doc/pdf_strato.modules.php
rename to htdocs/core/modules/contract/doc/pdf_strato.modules.php
diff --git a/public/core/modules/contract/index.html b/htdocs/core/modules/contract/index.html
similarity index 100%
rename from public/core/modules/contract/index.html
rename to htdocs/core/modules/contract/index.html
diff --git a/public/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php
similarity index 100%
rename from public/core/modules/contract/mod_contract_magre.php
rename to htdocs/core/modules/contract/mod_contract_magre.php
diff --git a/public/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php
similarity index 100%
rename from public/core/modules/contract/mod_contract_olive.php
rename to htdocs/core/modules/contract/mod_contract_olive.php
diff --git a/public/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
similarity index 100%
rename from public/core/modules/contract/mod_contract_serpis.php
rename to htdocs/core/modules/contract/mod_contract_serpis.php
diff --git a/public/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php
similarity index 100%
rename from public/core/modules/contract/modules_contract.php
rename to htdocs/core/modules/contract/modules_contract.php
diff --git a/public/core/modules/dons/html_cerfafr.html b/htdocs/core/modules/dons/html_cerfafr.html
similarity index 100%
rename from public/core/modules/dons/html_cerfafr.html
rename to htdocs/core/modules/dons/html_cerfafr.html
diff --git a/public/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
similarity index 100%
rename from public/core/modules/dons/html_cerfafr.modules.php
rename to htdocs/core/modules/dons/html_cerfafr.modules.php
diff --git a/public/core/modules/dons/index.html b/htdocs/core/modules/dons/index.html
similarity index 100%
rename from public/core/modules/dons/index.html
rename to htdocs/core/modules/dons/index.html
diff --git a/public/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php
similarity index 100%
rename from public/core/modules/dons/modules_don.php
rename to htdocs/core/modules/dons/modules_don.php
diff --git a/public/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
similarity index 100%
rename from public/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
rename to htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
diff --git a/public/core/modules/expedition/doc/index.html b/htdocs/core/modules/expedition/doc/index.html
similarity index 100%
rename from public/core/modules/expedition/doc/index.html
rename to htdocs/core/modules/expedition/doc/index.html
diff --git a/public/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
similarity index 100%
rename from public/core/modules/expedition/doc/pdf_merou.modules.php
rename to htdocs/core/modules/expedition/doc/pdf_merou.modules.php
diff --git a/public/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
similarity index 100%
rename from public/core/modules/expedition/doc/pdf_rouget.modules.php
rename to htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
diff --git a/public/core/modules/expedition/index.html b/htdocs/core/modules/expedition/index.html
similarity index 100%
rename from public/core/modules/expedition/index.html
rename to htdocs/core/modules/expedition/index.html
diff --git a/public/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php
similarity index 100%
rename from public/core/modules/expedition/mod_expedition_ribera.php
rename to htdocs/core/modules/expedition/mod_expedition_ribera.php
diff --git a/public/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
similarity index 100%
rename from public/core/modules/expedition/mod_expedition_safor.php
rename to htdocs/core/modules/expedition/mod_expedition_safor.php
diff --git a/public/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php
similarity index 100%
rename from public/core/modules/expedition/modules_expedition.php
rename to htdocs/core/modules/expedition/modules_expedition.php
diff --git a/public/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
similarity index 100%
rename from public/core/modules/expensereport/doc/pdf_standard.modules.php
rename to htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
diff --git a/public/core/modules/expensereport/modules_expensereport.php b/htdocs/core/modules/expensereport/modules_expensereport.php
similarity index 100%
rename from public/core/modules/expensereport/modules_expensereport.php
rename to htdocs/core/modules/expensereport/modules_expensereport.php
diff --git a/public/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
similarity index 100%
rename from public/core/modules/export/export_csv.modules.php
rename to htdocs/core/modules/export/export_csv.modules.php
diff --git a/public/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php
similarity index 100%
rename from public/core/modules/export/export_excel.modules.php
rename to htdocs/core/modules/export/export_excel.modules.php
diff --git a/public/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
similarity index 100%
rename from public/core/modules/export/export_excel2007.modules.php
rename to htdocs/core/modules/export/export_excel2007.modules.php
diff --git a/public/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php
similarity index 100%
rename from public/core/modules/export/export_tsv.modules.php
rename to htdocs/core/modules/export/export_tsv.modules.php
diff --git a/public/core/modules/export/index.html b/htdocs/core/modules/export/index.html
similarity index 100%
rename from public/core/modules/export/index.html
rename to htdocs/core/modules/export/index.html
diff --git a/public/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php
similarity index 100%
rename from public/core/modules/export/modules_export.php
rename to htdocs/core/modules/export/modules_export.php
diff --git a/public/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
similarity index 100%
rename from public/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
rename to htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
diff --git a/public/core/modules/facture/doc/index.html b/htdocs/core/modules/facture/doc/index.html
similarity index 100%
rename from public/core/modules/facture/doc/index.html
rename to htdocs/core/modules/facture/doc/index.html
diff --git a/public/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
similarity index 100%
rename from public/core/modules/facture/doc/pdf_crabe.modules.php
rename to htdocs/core/modules/facture/doc/pdf_crabe.modules.php
diff --git a/public/core/modules/facture/index.html b/htdocs/core/modules/facture/index.html
similarity index 100%
rename from public/core/modules/facture/index.html
rename to htdocs/core/modules/facture/index.html
diff --git a/public/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
similarity index 100%
rename from public/core/modules/facture/mod_facture_mars.php
rename to htdocs/core/modules/facture/mod_facture_mars.php
diff --git a/public/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
similarity index 100%
rename from public/core/modules/facture/mod_facture_mercure.php
rename to htdocs/core/modules/facture/mod_facture_mercure.php
diff --git a/public/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
similarity index 100%
rename from public/core/modules/facture/mod_facture_terre.php
rename to htdocs/core/modules/facture/mod_facture_terre.php
diff --git a/public/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
similarity index 100%
rename from public/core/modules/facture/modules_facture.php
rename to htdocs/core/modules/facture/modules_facture.php
diff --git a/public/core/modules/fichinter/doc/index.html b/htdocs/core/modules/fichinter/doc/index.html
similarity index 100%
rename from public/core/modules/fichinter/doc/index.html
rename to htdocs/core/modules/fichinter/doc/index.html
diff --git a/public/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
similarity index 100%
rename from public/core/modules/fichinter/doc/pdf_soleil.modules.php
rename to htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
diff --git a/public/core/modules/fichinter/index.html b/htdocs/core/modules/fichinter/index.html
similarity index 100%
rename from public/core/modules/fichinter/index.html
rename to htdocs/core/modules/fichinter/index.html
diff --git a/public/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php
similarity index 100%
rename from public/core/modules/fichinter/mod_arctic.php
rename to htdocs/core/modules/fichinter/mod_arctic.php
diff --git a/public/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
similarity index 100%
rename from public/core/modules/fichinter/mod_pacific.php
rename to htdocs/core/modules/fichinter/mod_pacific.php
diff --git a/public/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
similarity index 100%
rename from public/core/modules/fichinter/modules_fichinter.php
rename to htdocs/core/modules/fichinter/modules_fichinter.php
diff --git a/public/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
similarity index 100%
rename from public/core/modules/import/import_csv.modules.php
rename to htdocs/core/modules/import/import_csv.modules.php
diff --git a/public/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
similarity index 100%
rename from public/core/modules/import/import_xlsx.modules.php
rename to htdocs/core/modules/import/import_xlsx.modules.php
diff --git a/public/core/modules/import/index.html b/htdocs/core/modules/import/index.html
similarity index 100%
rename from public/core/modules/import/index.html
rename to htdocs/core/modules/import/index.html
diff --git a/public/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
similarity index 100%
rename from public/core/modules/import/modules_import.php
rename to htdocs/core/modules/import/modules_import.php
diff --git a/public/core/modules/index.html b/htdocs/core/modules/index.html
similarity index 100%
rename from public/core/modules/index.html
rename to htdocs/core/modules/index.html
diff --git a/public/core/modules/livraison/doc/index.html b/htdocs/core/modules/livraison/doc/index.html
similarity index 100%
rename from public/core/modules/livraison/doc/index.html
rename to htdocs/core/modules/livraison/doc/index.html
diff --git a/public/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
similarity index 100%
rename from public/core/modules/livraison/doc/pdf_typhon.modules.php
rename to htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
diff --git a/public/core/modules/livraison/index.html b/htdocs/core/modules/livraison/index.html
similarity index 100%
rename from public/core/modules/livraison/index.html
rename to htdocs/core/modules/livraison/index.html
diff --git a/public/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php
similarity index 100%
rename from public/core/modules/livraison/mod_livraison_jade.php
rename to htdocs/core/modules/livraison/mod_livraison_jade.php
diff --git a/public/core/modules/livraison/mod_livraison_saphir.php b/htdocs/core/modules/livraison/mod_livraison_saphir.php
similarity index 100%
rename from public/core/modules/livraison/mod_livraison_saphir.php
rename to htdocs/core/modules/livraison/mod_livraison_saphir.php
diff --git a/public/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php
similarity index 100%
rename from public/core/modules/livraison/modules_livraison.php
rename to htdocs/core/modules/livraison/modules_livraison.php
diff --git a/public/core/modules/mailings/README b/htdocs/core/modules/mailings/README
similarity index 100%
rename from public/core/modules/mailings/README
rename to htdocs/core/modules/mailings/README
diff --git a/public/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
similarity index 100%
rename from public/core/modules/mailings/advthirdparties.modules.php
rename to htdocs/core/modules/mailings/advthirdparties.modules.php
diff --git a/public/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
similarity index 100%
rename from public/core/modules/mailings/contacts1.modules.php
rename to htdocs/core/modules/mailings/contacts1.modules.php
diff --git a/public/core/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php
similarity index 100%
rename from public/core/modules/mailings/contacts2.modules.php
rename to htdocs/core/modules/mailings/contacts2.modules.php
diff --git a/public/core/modules/mailings/contacts3.modules.php b/htdocs/core/modules/mailings/contacts3.modules.php
similarity index 100%
rename from public/core/modules/mailings/contacts3.modules.php
rename to htdocs/core/modules/mailings/contacts3.modules.php
diff --git a/public/core/modules/mailings/contacts4.modules.php b/htdocs/core/modules/mailings/contacts4.modules.php
similarity index 100%
rename from public/core/modules/mailings/contacts4.modules.php
rename to htdocs/core/modules/mailings/contacts4.modules.php
diff --git a/public/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php
similarity index 100%
rename from public/core/modules/mailings/example.modules.php
rename to htdocs/core/modules/mailings/example.modules.php
diff --git a/public/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
similarity index 100%
rename from public/core/modules/mailings/fraise.modules.php
rename to htdocs/core/modules/mailings/fraise.modules.php
diff --git a/public/core/modules/mailings/framboise.modules.php b/htdocs/core/modules/mailings/framboise.modules.php
similarity index 100%
rename from public/core/modules/mailings/framboise.modules.php
rename to htdocs/core/modules/mailings/framboise.modules.php
diff --git a/public/core/modules/mailings/index.html b/htdocs/core/modules/mailings/index.html
similarity index 100%
rename from public/core/modules/mailings/index.html
rename to htdocs/core/modules/mailings/index.html
diff --git a/public/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
similarity index 100%
rename from public/core/modules/mailings/modules_mailings.php
rename to htdocs/core/modules/mailings/modules_mailings.php
diff --git a/public/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
similarity index 100%
rename from public/core/modules/mailings/pomme.modules.php
rename to htdocs/core/modules/mailings/pomme.modules.php
diff --git a/public/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
similarity index 100%
rename from public/core/modules/mailings/thirdparties.modules.php
rename to htdocs/core/modules/mailings/thirdparties.modules.php
diff --git a/public/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
similarity index 100%
rename from public/core/modules/mailings/thirdparties_services_expired.modules.php
rename to htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
diff --git a/public/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
similarity index 100%
rename from public/core/modules/mailings/xinputfile.modules.php
rename to htdocs/core/modules/mailings/xinputfile.modules.php
diff --git a/public/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php
similarity index 100%
rename from public/core/modules/mailings/xinputuser.modules.php
rename to htdocs/core/modules/mailings/xinputuser.modules.php
diff --git a/public/core/modules/member/doc/index.html b/htdocs/core/modules/member/doc/index.html
similarity index 100%
rename from public/core/modules/member/doc/index.html
rename to htdocs/core/modules/member/doc/index.html
diff --git a/public/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
similarity index 100%
rename from public/core/modules/member/doc/pdf_standard.class.php
rename to htdocs/core/modules/member/doc/pdf_standard.class.php
diff --git a/public/core/modules/member/index.html b/htdocs/core/modules/member/index.html
similarity index 100%
rename from public/core/modules/member/index.html
rename to htdocs/core/modules/member/index.html
diff --git a/public/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
similarity index 100%
rename from public/core/modules/member/modules_cards.php
rename to htdocs/core/modules/member/modules_cards.php
diff --git a/public/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
similarity index 100%
rename from public/core/modules/modAccounting.class.php
rename to htdocs/core/modules/modAccounting.class.php
diff --git a/public/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
similarity index 100%
rename from public/core/modules/modAdherent.class.php
rename to htdocs/core/modules/modAdherent.class.php
diff --git a/public/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
similarity index 100%
rename from public/core/modules/modAgenda.class.php
rename to htdocs/core/modules/modAgenda.class.php
diff --git a/public/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
similarity index 100%
rename from public/core/modules/modApi.class.php
rename to htdocs/core/modules/modApi.class.php
diff --git a/public/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
similarity index 100%
rename from public/core/modules/modBanque.class.php
rename to htdocs/core/modules/modBanque.class.php
diff --git a/public/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
similarity index 100%
rename from public/core/modules/modBarcode.class.php
rename to htdocs/core/modules/modBarcode.class.php
diff --git a/public/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php
similarity index 100%
rename from public/core/modules/modBookmark.class.php
rename to htdocs/core/modules/modBookmark.class.php
diff --git a/public/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
similarity index 100%
rename from public/core/modules/modCashDesk.class.php
rename to htdocs/core/modules/modCashDesk.class.php
diff --git a/public/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
similarity index 100%
rename from public/core/modules/modCategorie.class.php
rename to htdocs/core/modules/modCategorie.class.php
diff --git a/public/core/modules/modClickToDial.class.php b/htdocs/core/modules/modClickToDial.class.php
similarity index 100%
rename from public/core/modules/modClickToDial.class.php
rename to htdocs/core/modules/modClickToDial.class.php
diff --git a/public/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
similarity index 100%
rename from public/core/modules/modCommande.class.php
rename to htdocs/core/modules/modCommande.class.php
diff --git a/public/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
similarity index 100%
rename from public/core/modules/modComptabilite.class.php
rename to htdocs/core/modules/modComptabilite.class.php
diff --git a/public/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
similarity index 100%
rename from public/core/modules/modContrat.class.php
rename to htdocs/core/modules/modContrat.class.php
diff --git a/public/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
similarity index 100%
rename from public/core/modules/modCron.class.php
rename to htdocs/core/modules/modCron.class.php
diff --git a/public/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
similarity index 100%
rename from public/core/modules/modDeplacement.class.php
rename to htdocs/core/modules/modDeplacement.class.php
diff --git a/public/core/modules/modDocumentGeneration.class.php b/htdocs/core/modules/modDocumentGeneration.class.php
similarity index 100%
rename from public/core/modules/modDocumentGeneration.class.php
rename to htdocs/core/modules/modDocumentGeneration.class.php
diff --git a/public/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
similarity index 100%
rename from public/core/modules/modDon.class.php
rename to htdocs/core/modules/modDon.class.php
diff --git a/public/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php
similarity index 100%
rename from public/core/modules/modDynamicPrices.class.php
rename to htdocs/core/modules/modDynamicPrices.class.php
diff --git a/public/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
similarity index 100%
rename from public/core/modules/modECM.class.php
rename to htdocs/core/modules/modECM.class.php
diff --git a/public/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
similarity index 100%
rename from public/core/modules/modExpedition.class.php
rename to htdocs/core/modules/modExpedition.class.php
diff --git a/public/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
similarity index 100%
rename from public/core/modules/modExpenseReport.class.php
rename to htdocs/core/modules/modExpenseReport.class.php
diff --git a/public/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php
similarity index 100%
rename from public/core/modules/modExport.class.php
rename to htdocs/core/modules/modExport.class.php
diff --git a/public/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php
similarity index 100%
rename from public/core/modules/modExternalRss.class.php
rename to htdocs/core/modules/modExternalRss.class.php
diff --git a/public/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php
similarity index 100%
rename from public/core/modules/modExternalSite.class.php
rename to htdocs/core/modules/modExternalSite.class.php
diff --git a/public/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php
similarity index 100%
rename from public/core/modules/modFTP.class.php
rename to htdocs/core/modules/modFTP.class.php
diff --git a/public/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
similarity index 100%
rename from public/core/modules/modFacture.class.php
rename to htdocs/core/modules/modFacture.class.php
diff --git a/public/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
similarity index 100%
rename from public/core/modules/modFckeditor.class.php
rename to htdocs/core/modules/modFckeditor.class.php
diff --git a/public/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
similarity index 100%
rename from public/core/modules/modFicheinter.class.php
rename to htdocs/core/modules/modFicheinter.class.php
diff --git a/public/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
similarity index 100%
rename from public/core/modules/modFournisseur.class.php
rename to htdocs/core/modules/modFournisseur.class.php
diff --git a/public/core/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php
similarity index 100%
rename from public/core/modules/modGeoIPMaxmind.class.php
rename to htdocs/core/modules/modGeoIPMaxmind.class.php
diff --git a/public/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php
similarity index 100%
rename from public/core/modules/modGravatar.class.php
rename to htdocs/core/modules/modGravatar.class.php
diff --git a/public/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
similarity index 100%
rename from public/core/modules/modHRM.class.php
rename to htdocs/core/modules/modHRM.class.php
diff --git a/public/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
similarity index 100%
rename from public/core/modules/modHoliday.class.php
rename to htdocs/core/modules/modHoliday.class.php
diff --git a/public/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php
similarity index 100%
rename from public/core/modules/modImport.class.php
rename to htdocs/core/modules/modImport.class.php
diff --git a/public/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php
similarity index 100%
rename from public/core/modules/modIncoterm.class.php
rename to htdocs/core/modules/modIncoterm.class.php
diff --git a/public/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
similarity index 100%
rename from public/core/modules/modLabel.class.php
rename to htdocs/core/modules/modLabel.class.php
diff --git a/public/core/modules/modLdap.class.php b/htdocs/core/modules/modLdap.class.php
similarity index 100%
rename from public/core/modules/modLdap.class.php
rename to htdocs/core/modules/modLdap.class.php
diff --git a/public/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
similarity index 100%
rename from public/core/modules/modLoan.class.php
rename to htdocs/core/modules/modLoan.class.php
diff --git a/public/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
similarity index 100%
rename from public/core/modules/modMailing.class.php
rename to htdocs/core/modules/modMailing.class.php
diff --git a/public/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php
similarity index 100%
rename from public/core/modules/modMailmanSpip.class.php
rename to htdocs/core/modules/modMailmanSpip.class.php
diff --git a/public/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
similarity index 100%
rename from public/core/modules/modMargin.class.php
rename to htdocs/core/modules/modMargin.class.php
diff --git a/public/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
similarity index 100%
rename from public/core/modules/modMultiCurrency.class.php
rename to htdocs/core/modules/modMultiCurrency.class.php
diff --git a/public/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
similarity index 100%
rename from public/core/modules/modNotification.class.php
rename to htdocs/core/modules/modNotification.class.php
diff --git a/public/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
similarity index 100%
rename from public/core/modules/modOauth.class.php
rename to htdocs/core/modules/modOauth.class.php
diff --git a/public/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
similarity index 100%
rename from public/core/modules/modOpenSurvey.class.php
rename to htdocs/core/modules/modOpenSurvey.class.php
diff --git a/public/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
similarity index 100%
rename from public/core/modules/modPaybox.class.php
rename to htdocs/core/modules/modPaybox.class.php
diff --git a/public/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
similarity index 100%
rename from public/core/modules/modPaypal.class.php
rename to htdocs/core/modules/modPaypal.class.php
diff --git a/public/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
similarity index 100%
rename from public/core/modules/modPrelevement.class.php
rename to htdocs/core/modules/modPrelevement.class.php
diff --git a/public/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php
similarity index 100%
rename from public/core/modules/modPrinting.class.php
rename to htdocs/core/modules/modPrinting.class.php
diff --git a/public/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
similarity index 100%
rename from public/core/modules/modProduct.class.php
rename to htdocs/core/modules/modProduct.class.php
diff --git a/public/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
similarity index 100%
rename from public/core/modules/modProductBatch.class.php
rename to htdocs/core/modules/modProductBatch.class.php
diff --git a/public/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
similarity index 100%
rename from public/core/modules/modProjet.class.php
rename to htdocs/core/modules/modProjet.class.php
diff --git a/public/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
similarity index 100%
rename from public/core/modules/modPropale.class.php
rename to htdocs/core/modules/modPropale.class.php
diff --git a/public/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
similarity index 100%
rename from public/core/modules/modReceiptPrinter.class.php
rename to htdocs/core/modules/modReceiptPrinter.class.php
diff --git a/public/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
similarity index 100%
rename from public/core/modules/modResource.class.php
rename to htdocs/core/modules/modResource.class.php
diff --git a/public/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
similarity index 100%
rename from public/core/modules/modSalaries.class.php
rename to htdocs/core/modules/modSalaries.class.php
diff --git a/public/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
similarity index 100%
rename from public/core/modules/modService.class.php
rename to htdocs/core/modules/modService.class.php
diff --git a/public/core/modules/modSkype.class.php b/htdocs/core/modules/modSkype.class.php
similarity index 100%
rename from public/core/modules/modSkype.class.php
rename to htdocs/core/modules/modSkype.class.php
diff --git a/public/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
similarity index 100%
rename from public/core/modules/modSociete.class.php
rename to htdocs/core/modules/modSociete.class.php
diff --git a/public/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
similarity index 100%
rename from public/core/modules/modStock.class.php
rename to htdocs/core/modules/modStock.class.php
diff --git a/public/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
similarity index 100%
rename from public/core/modules/modSupplierProposal.class.php
rename to htdocs/core/modules/modSupplierProposal.class.php
diff --git a/public/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
similarity index 100%
rename from public/core/modules/modSyslog.class.php
rename to htdocs/core/modules/modSyslog.class.php
diff --git a/public/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
similarity index 100%
rename from public/core/modules/modTax.class.php
rename to htdocs/core/modules/modTax.class.php
diff --git a/public/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
similarity index 100%
rename from public/core/modules/modUser.class.php
rename to htdocs/core/modules/modUser.class.php
diff --git a/public/core/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php
similarity index 100%
rename from public/core/modules/modWebServices.class.php
rename to htdocs/core/modules/modWebServices.class.php
diff --git a/public/core/modules/modWebServicesClient.class.php b/htdocs/core/modules/modWebServicesClient.class.php
similarity index 100%
rename from public/core/modules/modWebServicesClient.class.php
rename to htdocs/core/modules/modWebServicesClient.class.php
diff --git a/public/core/modules/modWebsites.class.php b/htdocs/core/modules/modWebsites.class.php
similarity index 100%
rename from public/core/modules/modWebsites.class.php
rename to htdocs/core/modules/modWebsites.class.php
diff --git a/public/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
similarity index 100%
rename from public/core/modules/modWorkflow.class.php
rename to htdocs/core/modules/modWorkflow.class.php
diff --git a/public/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
similarity index 100%
rename from public/core/modules/oauth/google_oauthcallback.php
rename to htdocs/core/modules/oauth/google_oauthcallback.php
diff --git a/public/core/modules/oauth/index.html b/htdocs/core/modules/oauth/index.html
similarity index 100%
rename from public/core/modules/oauth/index.html
rename to htdocs/core/modules/oauth/index.html
diff --git a/public/core/modules/payment/mod_payment_ant.php b/htdocs/core/modules/payment/mod_payment_ant.php
similarity index 100%
rename from public/core/modules/payment/mod_payment_ant.php
rename to htdocs/core/modules/payment/mod_payment_ant.php
diff --git a/public/core/modules/payment/mod_payment_cicada.php b/htdocs/core/modules/payment/mod_payment_cicada.php
similarity index 100%
rename from public/core/modules/payment/mod_payment_cicada.php
rename to htdocs/core/modules/payment/mod_payment_cicada.php
diff --git a/public/core/modules/payment/modules_payment.php b/htdocs/core/modules/payment/modules_payment.php
similarity index 100%
rename from public/core/modules/payment/modules_payment.php
rename to htdocs/core/modules/payment/modules_payment.php
diff --git a/public/core/modules/printing/index.html b/htdocs/core/modules/printing/index.html
similarity index 100%
rename from public/core/modules/printing/index.html
rename to htdocs/core/modules/printing/index.html
diff --git a/public/core/modules/printing/modules_printing.php b/htdocs/core/modules/printing/modules_printing.php
similarity index 100%
rename from public/core/modules/printing/modules_printing.php
rename to htdocs/core/modules/printing/modules_printing.php
diff --git a/public/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
similarity index 100%
rename from public/core/modules/printing/printgcp.modules.php
rename to htdocs/core/modules/printing/printgcp.modules.php
diff --git a/public/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
similarity index 100%
rename from public/core/modules/printing/printipp.modules.php
rename to htdocs/core/modules/printing/printipp.modules.php
diff --git a/public/core/modules/printsheet/doc/index.html b/htdocs/core/modules/printsheet/doc/index.html
similarity index 100%
rename from public/core/modules/printsheet/doc/index.html
rename to htdocs/core/modules/printsheet/doc/index.html
diff --git a/public/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
similarity index 100%
rename from public/core/modules/printsheet/doc/pdf_standardlabel.class.php
rename to htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
diff --git a/public/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
similarity index 100%
rename from public/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
rename to htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
diff --git a/public/core/modules/printsheet/index.html b/htdocs/core/modules/printsheet/index.html
similarity index 100%
rename from public/core/modules/printsheet/index.html
rename to htdocs/core/modules/printsheet/index.html
diff --git a/public/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
similarity index 100%
rename from public/core/modules/printsheet/modules_labels.php
rename to htdocs/core/modules/printsheet/modules_labels.php
diff --git a/public/core/modules/product/index.html b/htdocs/core/modules/product/index.html
similarity index 100%
rename from public/core/modules/product/index.html
rename to htdocs/core/modules/product/index.html
diff --git a/public/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
similarity index 100%
rename from public/core/modules/product/mod_codeproduct_elephant.php
rename to htdocs/core/modules/product/mod_codeproduct_elephant.php
diff --git a/public/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
similarity index 100%
rename from public/core/modules/product/mod_codeproduct_leopard.php
rename to htdocs/core/modules/product/mod_codeproduct_leopard.php
diff --git a/public/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
similarity index 100%
rename from public/core/modules/product/modules_product.class.php
rename to htdocs/core/modules/product/modules_product.class.php
diff --git a/public/core/modules/product/modules_product.php b/htdocs/core/modules/product/modules_product.php
similarity index 100%
rename from public/core/modules/product/modules_product.php
rename to htdocs/core/modules/product/modules_product.php
diff --git a/public/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
similarity index 100%
rename from public/core/modules/project/doc/doc_generic_project_odt.modules.php
rename to htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
diff --git a/public/core/modules/project/doc/index.html b/htdocs/core/modules/project/doc/index.html
similarity index 100%
rename from public/core/modules/project/doc/index.html
rename to htdocs/core/modules/project/doc/index.html
diff --git a/public/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
similarity index 100%
rename from public/core/modules/project/doc/pdf_baleine.modules.php
rename to htdocs/core/modules/project/doc/pdf_baleine.modules.php
diff --git a/public/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
similarity index 100%
rename from public/core/modules/project/doc/pdf_beluga.modules.php
rename to htdocs/core/modules/project/doc/pdf_beluga.modules.php
diff --git a/public/core/modules/project/index.html b/htdocs/core/modules/project/index.html
similarity index 100%
rename from public/core/modules/project/index.html
rename to htdocs/core/modules/project/index.html
diff --git a/public/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
similarity index 100%
rename from public/core/modules/project/mod_project_simple.php
rename to htdocs/core/modules/project/mod_project_simple.php
diff --git a/public/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php
similarity index 100%
rename from public/core/modules/project/mod_project_universal.php
rename to htdocs/core/modules/project/mod_project_universal.php
diff --git a/public/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php
similarity index 100%
rename from public/core/modules/project/modules_project.php
rename to htdocs/core/modules/project/modules_project.php
diff --git a/public/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
similarity index 100%
rename from public/core/modules/project/task/doc/doc_generic_task_odt.modules.php
rename to htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
diff --git a/public/core/modules/project/task/doc/index.html b/htdocs/core/modules/project/task/doc/index.html
similarity index 100%
rename from public/core/modules/project/task/doc/index.html
rename to htdocs/core/modules/project/task/doc/index.html
diff --git a/public/core/modules/project/task/index.html b/htdocs/core/modules/project/task/index.html
similarity index 100%
rename from public/core/modules/project/task/index.html
rename to htdocs/core/modules/project/task/index.html
diff --git a/public/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php
similarity index 100%
rename from public/core/modules/project/task/mod_task_simple.php
rename to htdocs/core/modules/project/task/mod_task_simple.php
diff --git a/public/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php
similarity index 100%
rename from public/core/modules/project/task/mod_task_universal.php
rename to htdocs/core/modules/project/task/mod_task_universal.php
diff --git a/public/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php
similarity index 100%
rename from public/core/modules/project/task/modules_task.php
rename to htdocs/core/modules/project/task/modules_task.php
diff --git a/public/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
similarity index 100%
rename from public/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
rename to htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
diff --git a/public/core/modules/propale/doc/index.html b/htdocs/core/modules/propale/doc/index.html
similarity index 100%
rename from public/core/modules/propale/doc/index.html
rename to htdocs/core/modules/propale/doc/index.html
diff --git a/public/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
similarity index 100%
rename from public/core/modules/propale/doc/pdf_azur.modules.php
rename to htdocs/core/modules/propale/doc/pdf_azur.modules.php
diff --git a/public/core/modules/propale/index.html b/htdocs/core/modules/propale/index.html
similarity index 100%
rename from public/core/modules/propale/index.html
rename to htdocs/core/modules/propale/index.html
diff --git a/public/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
similarity index 100%
rename from public/core/modules/propale/mod_propale_marbre.php
rename to htdocs/core/modules/propale/mod_propale_marbre.php
diff --git a/public/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php
similarity index 100%
rename from public/core/modules/propale/mod_propale_saphir.php
rename to htdocs/core/modules/propale/mod_propale_saphir.php
diff --git a/public/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
similarity index 100%
rename from public/core/modules/propale/modules_propale.php
rename to htdocs/core/modules/propale/modules_propale.php
diff --git a/public/core/modules/rapport/index.html b/htdocs/core/modules/rapport/index.html
similarity index 100%
rename from public/core/modules/rapport/index.html
rename to htdocs/core/modules/rapport/index.html
diff --git a/public/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
similarity index 100%
rename from public/core/modules/rapport/pdf_paiement.class.php
rename to htdocs/core/modules/rapport/pdf_paiement.class.php
diff --git a/public/core/modules/security/generate/README b/htdocs/core/modules/security/generate/README
similarity index 100%
rename from public/core/modules/security/generate/README
rename to htdocs/core/modules/security/generate/README
diff --git a/public/core/modules/security/generate/index.html b/htdocs/core/modules/security/generate/index.html
similarity index 100%
rename from public/core/modules/security/generate/index.html
rename to htdocs/core/modules/security/generate/index.html
diff --git a/public/core/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
similarity index 100%
rename from public/core/modules/security/generate/modGeneratePassNone.class.php
rename to htdocs/core/modules/security/generate/modGeneratePassNone.class.php
diff --git a/public/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
similarity index 100%
rename from public/core/modules/security/generate/modGeneratePassPerso.class.php
rename to htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
diff --git a/public/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
similarity index 100%
rename from public/core/modules/security/generate/modGeneratePassStandard.class.php
rename to htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
diff --git a/public/core/modules/security/generate/modules_genpassword.php b/htdocs/core/modules/security/generate/modules_genpassword.php
similarity index 100%
rename from public/core/modules/security/generate/modules_genpassword.php
rename to htdocs/core/modules/security/generate/modules_genpassword.php
diff --git a/public/core/modules/security/index.html b/htdocs/core/modules/security/index.html
similarity index 100%
rename from public/core/modules/security/index.html
rename to htdocs/core/modules/security/index.html
diff --git a/public/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
similarity index 100%
rename from public/core/modules/societe/doc/doc_generic_odt.modules.php
rename to htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
diff --git a/public/core/modules/societe/doc/index.html b/htdocs/core/modules/societe/doc/index.html
similarity index 100%
rename from public/core/modules/societe/doc/index.html
rename to htdocs/core/modules/societe/doc/index.html
diff --git a/public/core/modules/societe/index.html b/htdocs/core/modules/societe/index.html
similarity index 100%
rename from public/core/modules/societe/index.html
rename to htdocs/core/modules/societe/index.html
diff --git a/public/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
similarity index 100%
rename from public/core/modules/societe/mod_codeclient_elephant.php
rename to htdocs/core/modules/societe/mod_codeclient_elephant.php
diff --git a/public/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
similarity index 100%
rename from public/core/modules/societe/mod_codeclient_leopard.php
rename to htdocs/core/modules/societe/mod_codeclient_leopard.php
diff --git a/public/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
similarity index 100%
rename from public/core/modules/societe/mod_codeclient_monkey.php
rename to htdocs/core/modules/societe/mod_codeclient_monkey.php
diff --git a/public/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
similarity index 100%
rename from public/core/modules/societe/mod_codecompta_aquarium.php
rename to htdocs/core/modules/societe/mod_codecompta_aquarium.php
diff --git a/public/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php
similarity index 100%
rename from public/core/modules/societe/mod_codecompta_panicum.php
rename to htdocs/core/modules/societe/mod_codecompta_panicum.php
diff --git a/public/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
similarity index 100%
rename from public/core/modules/societe/modules_societe.class.php
rename to htdocs/core/modules/societe/modules_societe.class.php
diff --git a/public/core/modules/supplier_invoice/index.html b/htdocs/core/modules/supplier_invoice/index.html
similarity index 100%
rename from public/core/modules/supplier_invoice/index.html
rename to htdocs/core/modules/supplier_invoice/index.html
diff --git a/public/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
similarity index 100%
rename from public/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
rename to htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
diff --git a/public/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
similarity index 100%
rename from public/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
rename to htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
diff --git a/public/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
similarity index 100%
rename from public/core/modules/supplier_invoice/modules_facturefournisseur.php
rename to htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
diff --git a/public/core/modules/supplier_invoice/pdf/index.html b/htdocs/core/modules/supplier_invoice/pdf/index.html
similarity index 100%
rename from public/core/modules/supplier_invoice/pdf/index.html
rename to htdocs/core/modules/supplier_invoice/pdf/index.html
diff --git a/public/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
similarity index 100%
rename from public/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
rename to htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
diff --git a/public/core/modules/supplier_order/index.html b/htdocs/core/modules/supplier_order/index.html
similarity index 100%
rename from public/core/modules/supplier_order/index.html
rename to htdocs/core/modules/supplier_order/index.html
diff --git a/public/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
similarity index 100%
rename from public/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
rename to htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
diff --git a/public/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
similarity index 100%
rename from public/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
rename to htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
diff --git a/public/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
similarity index 100%
rename from public/core/modules/supplier_order/modules_commandefournisseur.php
rename to htdocs/core/modules/supplier_order/modules_commandefournisseur.php
diff --git a/public/core/modules/supplier_order/pdf/index.html b/htdocs/core/modules/supplier_order/pdf/index.html
similarity index 100%
rename from public/core/modules/supplier_order/pdf/index.html
rename to htdocs/core/modules/supplier_order/pdf/index.html
diff --git a/public/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
similarity index 100%
rename from public/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
rename to htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
diff --git a/public/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
similarity index 100%
rename from public/core/modules/supplier_payment/mod_supplier_payment_brodator.php
rename to htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
diff --git a/public/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
similarity index 100%
rename from public/core/modules/supplier_payment/mod_supplier_payment_bronan.php
rename to htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
diff --git a/public/core/modules/supplier_payment/modules_supplier_payment.php b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
similarity index 100%
rename from public/core/modules/supplier_payment/modules_supplier_payment.php
rename to htdocs/core/modules/supplier_payment/modules_supplier_payment.php
diff --git a/public/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
similarity index 100%
rename from public/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
rename to htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
diff --git a/public/core/modules/supplier_proposal/doc/index.html b/htdocs/core/modules/supplier_proposal/doc/index.html
similarity index 100%
rename from public/core/modules/supplier_proposal/doc/index.html
rename to htdocs/core/modules/supplier_proposal/doc/index.html
diff --git a/public/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
similarity index 100%
rename from public/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
rename to htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
diff --git a/public/core/modules/supplier_proposal/index.html b/htdocs/core/modules/supplier_proposal/index.html
similarity index 100%
rename from public/core/modules/supplier_proposal/index.html
rename to htdocs/core/modules/supplier_proposal/index.html
diff --git a/public/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
similarity index 100%
rename from public/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
rename to htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
diff --git a/public/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
similarity index 100%
rename from public/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
rename to htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
diff --git a/public/core/modules/supplier_proposal/modules_supplier_proposal.php b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
similarity index 100%
rename from public/core/modules/supplier_proposal/modules_supplier_proposal.php
rename to htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
diff --git a/public/core/modules/syslog/index.html b/htdocs/core/modules/syslog/index.html
similarity index 100%
rename from public/core/modules/syslog/index.html
rename to htdocs/core/modules/syslog/index.html
diff --git a/public/core/modules/syslog/logHandler.php b/htdocs/core/modules/syslog/logHandler.php
similarity index 100%
rename from public/core/modules/syslog/logHandler.php
rename to htdocs/core/modules/syslog/logHandler.php
diff --git a/public/core/modules/syslog/logHandlerInterface.php b/htdocs/core/modules/syslog/logHandlerInterface.php
similarity index 100%
rename from public/core/modules/syslog/logHandlerInterface.php
rename to htdocs/core/modules/syslog/logHandlerInterface.php
diff --git a/public/core/modules/syslog/mod_syslog_chromephp.php b/htdocs/core/modules/syslog/mod_syslog_chromephp.php
similarity index 100%
rename from public/core/modules/syslog/mod_syslog_chromephp.php
rename to htdocs/core/modules/syslog/mod_syslog_chromephp.php
diff --git a/public/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
similarity index 100%
rename from public/core/modules/syslog/mod_syslog_file.php
rename to htdocs/core/modules/syslog/mod_syslog_file.php
diff --git a/public/core/modules/syslog/mod_syslog_firephp.php b/htdocs/core/modules/syslog/mod_syslog_firephp.php
similarity index 100%
rename from public/core/modules/syslog/mod_syslog_firephp.php
rename to htdocs/core/modules/syslog/mod_syslog_firephp.php
diff --git a/public/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php
similarity index 100%
rename from public/core/modules/syslog/mod_syslog_syslog.php
rename to htdocs/core/modules/syslog/mod_syslog_syslog.php
diff --git a/public/core/photos_resize.php b/htdocs/core/photos_resize.php
similarity index 100%
rename from public/core/photos_resize.php
rename to htdocs/core/photos_resize.php
diff --git a/public/core/search.php b/htdocs/core/search.php
similarity index 100%
rename from public/core/search.php
rename to htdocs/core/search.php
diff --git a/public/core/search_page.php b/htdocs/core/search_page.php
similarity index 100%
rename from public/core/search_page.php
rename to htdocs/core/search_page.php
diff --git a/public/core/tools.php b/htdocs/core/tools.php
similarity index 100%
rename from public/core/tools.php
rename to htdocs/core/tools.php
diff --git a/public/core/tpl/README b/htdocs/core/tpl/README
similarity index 100%
rename from public/core/tpl/README
rename to htdocs/core/tpl/README
diff --git a/public/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
similarity index 100%
rename from public/core/tpl/admin_extrafields_add.tpl.php
rename to htdocs/core/tpl/admin_extrafields_add.tpl.php
diff --git a/public/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
similarity index 100%
rename from public/core/tpl/admin_extrafields_edit.tpl.php
rename to htdocs/core/tpl/admin_extrafields_edit.tpl.php
diff --git a/public/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
similarity index 100%
rename from public/core/tpl/admin_extrafields_view.tpl.php
rename to htdocs/core/tpl/admin_extrafields_view.tpl.php
diff --git a/public/core/tpl/ajax/fileupload_main.tpl.php b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
similarity index 100%
rename from public/core/tpl/ajax/fileupload_main.tpl.php
rename to htdocs/core/tpl/ajax/fileupload_main.tpl.php
diff --git a/public/core/tpl/ajax/fileupload_view.tpl.php b/htdocs/core/tpl/ajax/fileupload_view.tpl.php
similarity index 100%
rename from public/core/tpl/ajax/fileupload_view.tpl.php
rename to htdocs/core/tpl/ajax/fileupload_view.tpl.php
diff --git a/public/core/tpl/ajax/index.html b/htdocs/core/tpl/ajax/index.html
similarity index 100%
rename from public/core/tpl/ajax/index.html
rename to htdocs/core/tpl/ajax/index.html
diff --git a/public/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
similarity index 100%
rename from public/core/tpl/ajaxrow.tpl.php
rename to htdocs/core/tpl/ajaxrow.tpl.php
diff --git a/public/core/tpl/bloc_showhide.tpl.php b/htdocs/core/tpl/bloc_showhide.tpl.php
similarity index 100%
rename from public/core/tpl/bloc_showhide.tpl.php
rename to htdocs/core/tpl/bloc_showhide.tpl.php
diff --git a/public/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
similarity index 100%
rename from public/core/tpl/contacts.tpl.php
rename to htdocs/core/tpl/contacts.tpl.php
diff --git a/public/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
similarity index 100%
rename from public/core/tpl/document_actions_post_headers.tpl.php
rename to htdocs/core/tpl/document_actions_post_headers.tpl.php
diff --git a/public/core/tpl/error.tpl.php b/htdocs/core/tpl/error.tpl.php
similarity index 100%
rename from public/core/tpl/error.tpl.php
rename to htdocs/core/tpl/error.tpl.php
diff --git a/public/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
similarity index 100%
rename from public/core/tpl/extrafields_view.tpl.php
rename to htdocs/core/tpl/extrafields_view.tpl.php
diff --git a/public/core/tpl/footer.tpl.php b/htdocs/core/tpl/footer.tpl.php
similarity index 100%
rename from public/core/tpl/footer.tpl.php
rename to htdocs/core/tpl/footer.tpl.php
diff --git a/public/core/tpl/header.tpl.php b/htdocs/core/tpl/header.tpl.php
similarity index 100%
rename from public/core/tpl/header.tpl.php
rename to htdocs/core/tpl/header.tpl.php
diff --git a/public/core/tpl/index.html b/htdocs/core/tpl/index.html
similarity index 100%
rename from public/core/tpl/index.html
rename to htdocs/core/tpl/index.html
diff --git a/public/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
similarity index 100%
rename from public/core/tpl/login.tpl.php
rename to htdocs/core/tpl/login.tpl.php
diff --git a/public/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
similarity index 100%
rename from public/core/tpl/notes.tpl.php
rename to htdocs/core/tpl/notes.tpl.php
diff --git a/public/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
similarity index 100%
rename from public/core/tpl/objectline_create.tpl.php
rename to htdocs/core/tpl/objectline_create.tpl.php
diff --git a/public/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
similarity index 100%
rename from public/core/tpl/objectline_edit.tpl.php
rename to htdocs/core/tpl/objectline_edit.tpl.php
diff --git a/public/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
similarity index 100%
rename from public/core/tpl/objectline_view.tpl.php
rename to htdocs/core/tpl/objectline_view.tpl.php
diff --git a/public/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php
similarity index 100%
rename from public/core/tpl/originproductline.tpl.php
rename to htdocs/core/tpl/originproductline.tpl.php
diff --git a/public/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
similarity index 100%
rename from public/core/tpl/passwordforgotten.tpl.php
rename to htdocs/core/tpl/passwordforgotten.tpl.php
diff --git a/public/core/tpl/resource_add.tpl.php b/htdocs/core/tpl/resource_add.tpl.php
similarity index 100%
rename from public/core/tpl/resource_add.tpl.php
rename to htdocs/core/tpl/resource_add.tpl.php
diff --git a/public/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
similarity index 100%
rename from public/core/tpl/resource_view.tpl.php
rename to htdocs/core/tpl/resource_view.tpl.php
diff --git a/public/core/triggers/README b/htdocs/core/triggers/README
similarity index 100%
rename from public/core/triggers/README
rename to htdocs/core/triggers/README
diff --git a/public/core/triggers/README-FR b/htdocs/core/triggers/README-FR
similarity index 100%
rename from public/core/triggers/README-FR
rename to htdocs/core/triggers/README-FR
diff --git a/public/core/triggers/dolibarrtriggers.class.php b/htdocs/core/triggers/dolibarrtriggers.class.php
similarity index 100%
rename from public/core/triggers/dolibarrtriggers.class.php
rename to htdocs/core/triggers/dolibarrtriggers.class.php
diff --git a/public/core/triggers/index.html b/htdocs/core/triggers/index.html
similarity index 100%
rename from public/core/triggers/index.html
rename to htdocs/core/triggers/index.html
diff --git a/public/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
similarity index 100%
rename from public/core/triggers/interface_20_all_Logevents.class.php
rename to htdocs/core/triggers/interface_20_all_Logevents.class.php
diff --git a/public/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
similarity index 100%
rename from public/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
rename to htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
diff --git a/public/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
similarity index 100%
rename from public/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
rename to htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
diff --git a/public/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
similarity index 100%
rename from public/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
rename to htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
diff --git a/public/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
similarity index 100%
rename from public/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
rename to htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
diff --git a/public/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
similarity index 100%
rename from public/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
rename to htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
diff --git a/public/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
similarity index 100%
rename from public/core/triggers/interface_50_modNotification_Notification.class.php
rename to htdocs/core/triggers/interface_50_modNotification_Notification.class.php
diff --git a/public/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
similarity index 100%
rename from public/core/triggers/interface_90_all_Demo.class.php-NORUN
rename to htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
diff --git a/public/cron/admin/cron.php b/htdocs/cron/admin/cron.php
similarity index 100%
rename from public/cron/admin/cron.php
rename to htdocs/cron/admin/cron.php
diff --git a/public/cron/admin/index.html b/htdocs/cron/admin/index.html
similarity index 100%
rename from public/cron/admin/index.html
rename to htdocs/cron/admin/index.html
diff --git a/public/cron/card.php b/htdocs/cron/card.php
similarity index 100%
rename from public/cron/card.php
rename to htdocs/cron/card.php
diff --git a/public/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
similarity index 100%
rename from public/cron/class/cronjob.class.php
rename to htdocs/cron/class/cronjob.class.php
diff --git a/public/cron/class/index.html b/htdocs/cron/class/index.html
similarity index 100%
rename from public/cron/class/index.html
rename to htdocs/cron/class/index.html
diff --git a/public/cron/index.html b/htdocs/cron/index.html
similarity index 100%
rename from public/cron/index.html
rename to htdocs/cron/index.html
diff --git a/public/cron/info.php b/htdocs/cron/info.php
similarity index 100%
rename from public/cron/info.php
rename to htdocs/cron/info.php
diff --git a/public/cron/list.php b/htdocs/cron/list.php
similarity index 100%
rename from public/cron/list.php
rename to htdocs/cron/list.php
diff --git a/public/custom/.gitignore b/htdocs/custom/.gitignore
similarity index 100%
rename from public/custom/.gitignore
rename to htdocs/custom/.gitignore
diff --git a/public/custom/README.md b/htdocs/custom/README.md
similarity index 100%
rename from public/custom/README.md
rename to htdocs/custom/README.md
diff --git a/public/custom/index.html b/htdocs/custom/index.html
similarity index 100%
rename from public/custom/index.html
rename to htdocs/custom/index.html
diff --git a/public/document.php b/htdocs/document.php
similarity index 100%
rename from public/document.php
rename to htdocs/document.php
diff --git a/public/don/admin/donation.php b/htdocs/don/admin/donation.php
similarity index 100%
rename from public/don/admin/donation.php
rename to htdocs/don/admin/donation.php
diff --git a/public/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php
similarity index 100%
rename from public/don/admin/donation_extrafields.php
rename to htdocs/don/admin/donation_extrafields.php
diff --git a/public/don/admin/index.html b/htdocs/don/admin/index.html
similarity index 100%
rename from public/don/admin/index.html
rename to htdocs/don/admin/index.html
diff --git a/public/don/card.php b/htdocs/don/card.php
similarity index 100%
rename from public/don/card.php
rename to htdocs/don/card.php
diff --git a/public/don/class/don.class.php b/htdocs/don/class/don.class.php
similarity index 100%
rename from public/don/class/don.class.php
rename to htdocs/don/class/don.class.php
diff --git a/public/don/class/donstats.class.php b/htdocs/don/class/donstats.class.php
similarity index 100%
rename from public/don/class/donstats.class.php
rename to htdocs/don/class/donstats.class.php
diff --git a/public/don/class/index.html b/htdocs/don/class/index.html
similarity index 100%
rename from public/don/class/index.html
rename to htdocs/don/class/index.html
diff --git a/public/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
similarity index 100%
rename from public/don/class/paymentdonation.class.php
rename to htdocs/don/class/paymentdonation.class.php
diff --git a/public/don/document.php b/htdocs/don/document.php
similarity index 100%
rename from public/don/document.php
rename to htdocs/don/document.php
diff --git a/public/don/index.html b/htdocs/don/index.html
similarity index 100%
rename from public/don/index.html
rename to htdocs/don/index.html
diff --git a/public/don/index.php b/htdocs/don/index.php
similarity index 100%
rename from public/don/index.php
rename to htdocs/don/index.php
diff --git a/public/don/info.php b/htdocs/don/info.php
similarity index 100%
rename from public/don/info.php
rename to htdocs/don/info.php
diff --git a/public/don/list.php b/htdocs/don/list.php
similarity index 100%
rename from public/don/list.php
rename to htdocs/don/list.php
diff --git a/public/don/note.php b/htdocs/don/note.php
similarity index 100%
rename from public/don/note.php
rename to htdocs/don/note.php
diff --git a/public/don/payment/card.php b/htdocs/don/payment/card.php
similarity index 100%
rename from public/don/payment/card.php
rename to htdocs/don/payment/card.php
diff --git a/public/don/payment/index.html b/htdocs/don/payment/index.html
similarity index 100%
rename from public/don/payment/index.html
rename to htdocs/don/payment/index.html
diff --git a/public/don/payment/payment.php b/htdocs/don/payment/payment.php
similarity index 100%
rename from public/don/payment/payment.php
rename to htdocs/don/payment/payment.php
diff --git a/public/don/stats/index.php b/htdocs/don/stats/index.php
similarity index 100%
rename from public/don/stats/index.php
rename to htdocs/don/stats/index.php
diff --git a/public/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php
similarity index 100%
rename from public/ecm/ajax/ecmdatabase.php
rename to htdocs/ecm/ajax/ecmdatabase.php
diff --git a/public/ecm/ajax/index.html b/htdocs/ecm/ajax/index.html
similarity index 100%
rename from public/ecm/ajax/index.html
rename to htdocs/ecm/ajax/index.html
diff --git a/public/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
similarity index 100%
rename from public/ecm/class/ecmdirectory.class.php
rename to htdocs/ecm/class/ecmdirectory.class.php
diff --git a/public/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
similarity index 100%
rename from public/ecm/class/htmlecm.form.class.php
rename to htdocs/ecm/class/htmlecm.form.class.php
diff --git a/public/ecm/class/index.html b/htdocs/ecm/class/index.html
similarity index 100%
rename from public/ecm/class/index.html
rename to htdocs/ecm/class/index.html
diff --git a/public/ecm/docdir.php b/htdocs/ecm/docdir.php
similarity index 100%
rename from public/ecm/docdir.php
rename to htdocs/ecm/docdir.php
diff --git a/public/ecm/docfile.php b/htdocs/ecm/docfile.php
similarity index 100%
rename from public/ecm/docfile.php
rename to htdocs/ecm/docfile.php
diff --git a/public/ecm/docmine.php b/htdocs/ecm/docmine.php
similarity index 100%
rename from public/ecm/docmine.php
rename to htdocs/ecm/docmine.php
diff --git a/public/ecm/docother.php b/htdocs/ecm/docother.php
similarity index 100%
rename from public/ecm/docother.php
rename to htdocs/ecm/docother.php
diff --git a/public/ecm/index.php b/htdocs/ecm/index.php
similarity index 100%
rename from public/ecm/index.php
rename to htdocs/ecm/index.php
diff --git a/public/ecm/index_auto.php b/htdocs/ecm/index_auto.php
similarity index 100%
rename from public/ecm/index_auto.php
rename to htdocs/ecm/index_auto.php
diff --git a/public/ecm/search.php b/htdocs/ecm/search.php
similarity index 100%
rename from public/ecm/search.php
rename to htdocs/ecm/search.php
diff --git a/public/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
similarity index 100%
rename from public/ecm/tpl/enablefiletreeajax.tpl.php
rename to htdocs/ecm/tpl/enablefiletreeajax.tpl.php
diff --git a/public/ecm/tpl/index.html b/htdocs/ecm/tpl/index.html
similarity index 100%
rename from public/ecm/tpl/index.html
rename to htdocs/ecm/tpl/index.html
diff --git a/public/expedition/card.php b/htdocs/expedition/card.php
similarity index 100%
rename from public/expedition/card.php
rename to htdocs/expedition/card.php
diff --git a/public/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
similarity index 100%
rename from public/expedition/class/expedition.class.php
rename to htdocs/expedition/class/expedition.class.php
diff --git a/public/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
similarity index 100%
rename from public/expedition/class/expeditionbatch.class.php
rename to htdocs/expedition/class/expeditionbatch.class.php
diff --git a/public/expedition/class/expeditionstats.class.php b/htdocs/expedition/class/expeditionstats.class.php
similarity index 100%
rename from public/expedition/class/expeditionstats.class.php
rename to htdocs/expedition/class/expeditionstats.class.php
diff --git a/public/expedition/class/index.html b/htdocs/expedition/class/index.html
similarity index 100%
rename from public/expedition/class/index.html
rename to htdocs/expedition/class/index.html
diff --git a/public/expedition/contact.php b/htdocs/expedition/contact.php
similarity index 100%
rename from public/expedition/contact.php
rename to htdocs/expedition/contact.php
diff --git a/public/expedition/index.php b/htdocs/expedition/index.php
similarity index 100%
rename from public/expedition/index.php
rename to htdocs/expedition/index.php
diff --git a/public/expedition/list.php b/htdocs/expedition/list.php
similarity index 100%
rename from public/expedition/list.php
rename to htdocs/expedition/list.php
diff --git a/public/expedition/note.php b/htdocs/expedition/note.php
similarity index 100%
rename from public/expedition/note.php
rename to htdocs/expedition/note.php
diff --git a/public/expedition/shipment.php b/htdocs/expedition/shipment.php
similarity index 100%
rename from public/expedition/shipment.php
rename to htdocs/expedition/shipment.php
diff --git a/public/expedition/stats/index.php b/htdocs/expedition/stats/index.php
similarity index 100%
rename from public/expedition/stats/index.php
rename to htdocs/expedition/stats/index.php
diff --git a/public/expedition/stats/month.php b/htdocs/expedition/stats/month.php
similarity index 100%
rename from public/expedition/stats/month.php
rename to htdocs/expedition/stats/month.php
diff --git a/public/expedition/tpl/index.html b/htdocs/expedition/tpl/index.html
similarity index 100%
rename from public/expedition/tpl/index.html
rename to htdocs/expedition/tpl/index.html
diff --git a/public/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from public/expedition/tpl/linkedobjectblock.tpl.php
rename to htdocs/expedition/tpl/linkedobjectblock.tpl.php
diff --git a/public/expensereport/ajax/ajaxprojet.php b/htdocs/expensereport/ajax/ajaxprojet.php
similarity index 100%
rename from public/expensereport/ajax/ajaxprojet.php
rename to htdocs/expensereport/ajax/ajaxprojet.php
diff --git a/public/expensereport/ajax/index.html b/htdocs/expensereport/ajax/index.html
similarity index 100%
rename from public/expensereport/ajax/index.html
rename to htdocs/expensereport/ajax/index.html
diff --git a/public/expensereport/card.php b/htdocs/expensereport/card.php
similarity index 100%
rename from public/expensereport/card.php
rename to htdocs/expensereport/card.php
diff --git a/public/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
similarity index 100%
rename from public/expensereport/class/api_expensereports.class.php
rename to htdocs/expensereport/class/api_expensereports.class.php
diff --git a/public/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
similarity index 100%
rename from public/expensereport/class/expensereport.class.php
rename to htdocs/expensereport/class/expensereport.class.php
diff --git a/public/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
similarity index 100%
rename from public/expensereport/class/expensereportstats.class.php
rename to htdocs/expensereport/class/expensereportstats.class.php
diff --git a/public/expensereport/class/index.html b/htdocs/expensereport/class/index.html
similarity index 100%
rename from public/expensereport/class/index.html
rename to htdocs/expensereport/class/index.html
diff --git a/public/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
similarity index 100%
rename from public/expensereport/class/paymentexpensereport.class.php
rename to htdocs/expensereport/class/paymentexpensereport.class.php
diff --git a/public/expensereport/document.php b/htdocs/expensereport/document.php
similarity index 100%
rename from public/expensereport/document.php
rename to htdocs/expensereport/document.php
diff --git a/public/expensereport/export_csv.php b/htdocs/expensereport/export_csv.php
similarity index 100%
rename from public/expensereport/export_csv.php
rename to htdocs/expensereport/export_csv.php
diff --git a/public/expensereport/index.html b/htdocs/expensereport/index.html
similarity index 100%
rename from public/expensereport/index.html
rename to htdocs/expensereport/index.html
diff --git a/public/expensereport/index.php b/htdocs/expensereport/index.php
similarity index 100%
rename from public/expensereport/index.php
rename to htdocs/expensereport/index.php
diff --git a/public/expensereport/info.php b/htdocs/expensereport/info.php
similarity index 100%
rename from public/expensereport/info.php
rename to htdocs/expensereport/info.php
diff --git a/public/expensereport/list.php b/htdocs/expensereport/list.php
similarity index 100%
rename from public/expensereport/list.php
rename to htdocs/expensereport/list.php
diff --git a/public/expensereport/note.php b/htdocs/expensereport/note.php
similarity index 100%
rename from public/expensereport/note.php
rename to htdocs/expensereport/note.php
diff --git a/public/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
similarity index 100%
rename from public/expensereport/payment/card.php
rename to htdocs/expensereport/payment/card.php
diff --git a/public/expensereport/payment/index.html b/htdocs/expensereport/payment/index.html
similarity index 100%
rename from public/expensereport/payment/index.html
rename to htdocs/expensereport/payment/index.html
diff --git a/public/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
similarity index 100%
rename from public/expensereport/payment/payment.php
rename to htdocs/expensereport/payment/payment.php
diff --git a/public/expensereport/stats/index.html b/htdocs/expensereport/stats/index.html
similarity index 100%
rename from public/expensereport/stats/index.html
rename to htdocs/expensereport/stats/index.html
diff --git a/public/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
similarity index 100%
rename from public/expensereport/stats/index.php
rename to htdocs/expensereport/stats/index.php
diff --git a/public/expensereport/synchro_compta.php b/htdocs/expensereport/synchro_compta.php
similarity index 100%
rename from public/expensereport/synchro_compta.php
rename to htdocs/expensereport/synchro_compta.php
diff --git a/public/expensereport/tpl/index.html b/htdocs/expensereport/tpl/index.html
similarity index 100%
rename from public/expensereport/tpl/index.html
rename to htdocs/expensereport/tpl/index.html
diff --git a/public/expensereport/tpl/linkedobjectblock.tpl.php b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from public/expensereport/tpl/linkedobjectblock.tpl.php
rename to htdocs/expensereport/tpl/linkedobjectblock.tpl.php
diff --git a/public/exports/class/export.class.php b/htdocs/exports/class/export.class.php
similarity index 100%
rename from public/exports/class/export.class.php
rename to htdocs/exports/class/export.class.php
diff --git a/public/exports/class/index.html b/htdocs/exports/class/index.html
similarity index 100%
rename from public/exports/class/index.html
rename to htdocs/exports/class/index.html
diff --git a/public/exports/export.php b/htdocs/exports/export.php
similarity index 100%
rename from public/exports/export.php
rename to htdocs/exports/export.php
diff --git a/public/exports/index.php b/htdocs/exports/index.php
similarity index 100%
rename from public/exports/index.php
rename to htdocs/exports/index.php
diff --git a/public/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
similarity index 100%
rename from public/externalsite/admin/externalsite.php
rename to htdocs/externalsite/admin/externalsite.php
diff --git a/public/externalsite/admin/index.html b/htdocs/externalsite/admin/index.html
similarity index 100%
rename from public/externalsite/admin/index.html
rename to htdocs/externalsite/admin/index.html
diff --git a/public/externalsite/frames.php b/htdocs/externalsite/frames.php
similarity index 100%
rename from public/externalsite/frames.php
rename to htdocs/externalsite/frames.php
diff --git a/public/externalsite/frametop.php b/htdocs/externalsite/frametop.php
similarity index 100%
rename from public/externalsite/frametop.php
rename to htdocs/externalsite/frametop.php
diff --git a/public/externalsite/index.html b/htdocs/externalsite/index.html
similarity index 100%
rename from public/externalsite/index.html
rename to htdocs/externalsite/index.html
diff --git a/public/favicon.ico b/htdocs/favicon.ico
similarity index 100%
rename from public/favicon.ico
rename to htdocs/favicon.ico
diff --git a/public/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
similarity index 100%
rename from public/fichinter/admin/fichinter_extrafields.php
rename to htdocs/fichinter/admin/fichinter_extrafields.php
diff --git a/public/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php
similarity index 100%
rename from public/fichinter/admin/fichinterdet_extrafields.php
rename to htdocs/fichinter/admin/fichinterdet_extrafields.php
diff --git a/public/fichinter/admin/index.html b/htdocs/fichinter/admin/index.html
similarity index 100%
rename from public/fichinter/admin/index.html
rename to htdocs/fichinter/admin/index.html
diff --git a/public/fichinter/apercu.php b/htdocs/fichinter/apercu.php
similarity index 100%
rename from public/fichinter/apercu.php
rename to htdocs/fichinter/apercu.php
diff --git a/public/fichinter/card.php b/htdocs/fichinter/card.php
similarity index 100%
rename from public/fichinter/card.php
rename to htdocs/fichinter/card.php
diff --git a/public/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
similarity index 100%
rename from public/fichinter/class/fichinter.class.php
rename to htdocs/fichinter/class/fichinter.class.php
diff --git a/public/fichinter/class/fichinterstats.class.php b/htdocs/fichinter/class/fichinterstats.class.php
similarity index 100%
rename from public/fichinter/class/fichinterstats.class.php
rename to htdocs/fichinter/class/fichinterstats.class.php
diff --git a/public/fichinter/class/index.html b/htdocs/fichinter/class/index.html
similarity index 100%
rename from public/fichinter/class/index.html
rename to htdocs/fichinter/class/index.html
diff --git a/public/fichinter/contact.php b/htdocs/fichinter/contact.php
similarity index 100%
rename from public/fichinter/contact.php
rename to htdocs/fichinter/contact.php
diff --git a/public/fichinter/document.php b/htdocs/fichinter/document.php
similarity index 100%
rename from public/fichinter/document.php
rename to htdocs/fichinter/document.php
diff --git a/public/fichinter/index.html b/htdocs/fichinter/index.html
similarity index 100%
rename from public/fichinter/index.html
rename to htdocs/fichinter/index.html
diff --git a/public/fichinter/index.php b/htdocs/fichinter/index.php
similarity index 100%
rename from public/fichinter/index.php
rename to htdocs/fichinter/index.php
diff --git a/public/fichinter/info.php b/htdocs/fichinter/info.php
similarity index 100%
rename from public/fichinter/info.php
rename to htdocs/fichinter/info.php
diff --git a/public/fichinter/list.php b/htdocs/fichinter/list.php
similarity index 100%
rename from public/fichinter/list.php
rename to htdocs/fichinter/list.php
diff --git a/public/fichinter/note.php b/htdocs/fichinter/note.php
similarity index 100%
rename from public/fichinter/note.php
rename to htdocs/fichinter/note.php
diff --git a/public/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
similarity index 100%
rename from public/fichinter/stats/index.php
rename to htdocs/fichinter/stats/index.php
diff --git a/public/fichinter/tpl/index.html b/htdocs/fichinter/tpl/index.html
similarity index 100%
rename from public/fichinter/tpl/index.html
rename to htdocs/fichinter/tpl/index.html
diff --git a/public/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from public/fichinter/tpl/linkedobjectblock.tpl.php
rename to htdocs/fichinter/tpl/linkedobjectblock.tpl.php
diff --git a/public/filefunc.inc.php b/htdocs/filefunc.inc.php
similarity index 100%
rename from public/filefunc.inc.php
rename to htdocs/filefunc.inc.php
diff --git a/public/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
similarity index 100%
rename from public/fourn/ajax/getSupplierPrices.php
rename to htdocs/fourn/ajax/getSupplierPrices.php
diff --git a/public/fourn/ajax/index.html b/htdocs/fourn/ajax/index.html
similarity index 100%
rename from public/fourn/ajax/index.html
rename to htdocs/fourn/ajax/index.html
diff --git a/public/fourn/card.php b/htdocs/fourn/card.php
similarity index 100%
rename from public/fourn/card.php
rename to htdocs/fourn/card.php
diff --git a/public/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
similarity index 100%
rename from public/fourn/class/api_supplier_invoices.class.php
rename to htdocs/fourn/class/api_supplier_invoices.class.php
diff --git a/public/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
similarity index 100%
rename from public/fourn/class/fournisseur.class.php
rename to htdocs/fourn/class/fournisseur.class.php
diff --git a/public/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
similarity index 100%
rename from public/fourn/class/fournisseur.commande.class.php
rename to htdocs/fourn/class/fournisseur.commande.class.php
diff --git a/public/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
similarity index 100%
rename from public/fourn/class/fournisseur.commande.dispatch.class.php
rename to htdocs/fourn/class/fournisseur.commande.dispatch.class.php
diff --git a/public/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
similarity index 100%
rename from public/fourn/class/fournisseur.facture.class.php
rename to htdocs/fourn/class/fournisseur.facture.class.php
diff --git a/public/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
similarity index 100%
rename from public/fourn/class/fournisseur.product.class.php
rename to htdocs/fourn/class/fournisseur.product.class.php
diff --git a/public/fourn/class/index.html b/htdocs/fourn/class/index.html
similarity index 100%
rename from public/fourn/class/index.html
rename to htdocs/fourn/class/index.html
diff --git a/public/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
similarity index 100%
rename from public/fourn/class/paiementfourn.class.php
rename to htdocs/fourn/class/paiementfourn.class.php
diff --git a/public/fourn/commande/card.php b/htdocs/fourn/commande/card.php
similarity index 100%
rename from public/fourn/commande/card.php
rename to htdocs/fourn/commande/card.php
diff --git a/public/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
similarity index 100%
rename from public/fourn/commande/contact.php
rename to htdocs/fourn/commande/contact.php
diff --git a/public/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
similarity index 100%
rename from public/fourn/commande/dispatch.php
rename to htdocs/fourn/commande/dispatch.php
diff --git a/public/fourn/commande/document.php b/htdocs/fourn/commande/document.php
similarity index 100%
rename from public/fourn/commande/document.php
rename to htdocs/fourn/commande/document.php
diff --git a/public/fourn/commande/index.php b/htdocs/fourn/commande/index.php
similarity index 100%
rename from public/fourn/commande/index.php
rename to htdocs/fourn/commande/index.php
diff --git a/public/fourn/commande/info.php b/htdocs/fourn/commande/info.php
similarity index 100%
rename from public/fourn/commande/info.php
rename to htdocs/fourn/commande/info.php
diff --git a/public/fourn/commande/list.php b/htdocs/fourn/commande/list.php
similarity index 100%
rename from public/fourn/commande/list.php
rename to htdocs/fourn/commande/list.php
diff --git a/public/fourn/commande/note.php b/htdocs/fourn/commande/note.php
similarity index 100%
rename from public/fourn/commande/note.php
rename to htdocs/fourn/commande/note.php
diff --git a/public/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
similarity index 100%
rename from public/fourn/commande/orderstoinvoice.php
rename to htdocs/fourn/commande/orderstoinvoice.php
diff --git a/public/fourn/commande/tpl/index.html b/htdocs/fourn/commande/tpl/index.html
similarity index 100%
rename from public/fourn/commande/tpl/index.html
rename to htdocs/fourn/commande/tpl/index.html
diff --git a/public/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from public/fourn/commande/tpl/linkedobjectblock.tpl.php
rename to htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
diff --git a/public/fourn/contact.php b/htdocs/fourn/contact.php
similarity index 100%
rename from public/fourn/contact.php
rename to htdocs/fourn/contact.php
diff --git a/public/fourn/facture/card.php b/htdocs/fourn/facture/card.php
similarity index 100%
rename from public/fourn/facture/card.php
rename to htdocs/fourn/facture/card.php
diff --git a/public/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
similarity index 100%
rename from public/fourn/facture/contact.php
rename to htdocs/fourn/facture/contact.php
diff --git a/public/fourn/facture/document.php b/htdocs/fourn/facture/document.php
similarity index 100%
rename from public/fourn/facture/document.php
rename to htdocs/fourn/facture/document.php
diff --git a/public/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
similarity index 100%
rename from public/fourn/facture/impayees.php
rename to htdocs/fourn/facture/impayees.php
diff --git a/public/fourn/facture/index.html b/htdocs/fourn/facture/index.html
similarity index 100%
rename from public/fourn/facture/index.html
rename to htdocs/fourn/facture/index.html
diff --git a/public/fourn/facture/info.php b/htdocs/fourn/facture/info.php
similarity index 100%
rename from public/fourn/facture/info.php
rename to htdocs/fourn/facture/info.php
diff --git a/public/fourn/facture/list.php b/htdocs/fourn/facture/list.php
similarity index 100%
rename from public/fourn/facture/list.php
rename to htdocs/fourn/facture/list.php
diff --git a/public/fourn/facture/note.php b/htdocs/fourn/facture/note.php
similarity index 100%
rename from public/fourn/facture/note.php
rename to htdocs/fourn/facture/note.php
diff --git a/public/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
similarity index 100%
rename from public/fourn/facture/paiement.php
rename to htdocs/fourn/facture/paiement.php
diff --git a/public/fourn/facture/tpl/index.html b/htdocs/fourn/facture/tpl/index.html
similarity index 100%
rename from public/fourn/facture/tpl/index.html
rename to htdocs/fourn/facture/tpl/index.html
diff --git a/public/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from public/fourn/facture/tpl/linkedobjectblock.tpl.php
rename to htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
diff --git a/public/fourn/index.php b/htdocs/fourn/index.php
similarity index 100%
rename from public/fourn/index.php
rename to htdocs/fourn/index.php
diff --git a/public/fourn/js/lib_dispatch.js b/htdocs/fourn/js/lib_dispatch.js
similarity index 100%
rename from public/fourn/js/lib_dispatch.js
rename to htdocs/fourn/js/lib_dispatch.js
diff --git a/public/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
similarity index 100%
rename from public/fourn/paiement/card.php
rename to htdocs/fourn/paiement/card.php
diff --git a/public/fourn/paiement/index.html b/htdocs/fourn/paiement/index.html
similarity index 100%
rename from public/fourn/paiement/index.html
rename to htdocs/fourn/paiement/index.html
diff --git a/public/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php
similarity index 100%
rename from public/fourn/paiement/info.php
rename to htdocs/fourn/paiement/info.php
diff --git a/public/fourn/product/list.php b/htdocs/fourn/product/list.php
similarity index 100%
rename from public/fourn/product/list.php
rename to htdocs/fourn/product/list.php
diff --git a/public/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
similarity index 100%
rename from public/fourn/recap-fourn.php
rename to htdocs/fourn/recap-fourn.php
diff --git a/public/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
similarity index 100%
rename from public/ftp/admin/ftpclient.php
rename to htdocs/ftp/admin/ftpclient.php
diff --git a/public/ftp/admin/index.html b/htdocs/ftp/admin/index.html
similarity index 100%
rename from public/ftp/admin/index.html
rename to htdocs/ftp/admin/index.html
diff --git a/public/ftp/index.php b/htdocs/ftp/index.php
similarity index 100%
rename from public/ftp/index.php
rename to htdocs/ftp/index.php
diff --git a/public/holiday/card.php b/htdocs/holiday/card.php
similarity index 100%
rename from public/holiday/card.php
rename to htdocs/holiday/card.php
diff --git a/public/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
similarity index 100%
rename from public/holiday/class/holiday.class.php
rename to htdocs/holiday/class/holiday.class.php
diff --git a/public/holiday/class/index.html b/htdocs/holiday/class/index.html
similarity index 100%
rename from public/holiday/class/index.html
rename to htdocs/holiday/class/index.html
diff --git a/public/holiday/common.inc.php b/htdocs/holiday/common.inc.php
similarity index 100%
rename from public/holiday/common.inc.php
rename to htdocs/holiday/common.inc.php
diff --git a/public/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
similarity index 100%
rename from public/holiday/define_holiday.php
rename to htdocs/holiday/define_holiday.php
diff --git a/public/holiday/document.php b/htdocs/holiday/document.php
similarity index 100%
rename from public/holiday/document.php
rename to htdocs/holiday/document.php
diff --git a/public/holiday/img/add.png b/htdocs/holiday/img/add.png
similarity index 100%
rename from public/holiday/img/add.png
rename to htdocs/holiday/img/add.png
diff --git a/public/holiday/img/conges.png b/htdocs/holiday/img/conges.png
similarity index 100%
rename from public/holiday/img/conges.png
rename to htdocs/holiday/img/conges.png
diff --git a/public/holiday/img/delete.png b/htdocs/holiday/img/delete.png
similarity index 100%
rename from public/holiday/img/delete.png
rename to htdocs/holiday/img/delete.png
diff --git a/public/holiday/img/edit.png b/htdocs/holiday/img/edit.png
similarity index 100%
rename from public/holiday/img/edit.png
rename to htdocs/holiday/img/edit.png
diff --git a/public/holiday/img/index.html b/htdocs/holiday/img/index.html
similarity index 100%
rename from public/holiday/img/index.html
rename to htdocs/holiday/img/index.html
diff --git a/public/holiday/index.html b/htdocs/holiday/index.html
similarity index 100%
rename from public/holiday/index.html
rename to htdocs/holiday/index.html
diff --git a/public/holiday/list.php b/htdocs/holiday/list.php
similarity index 100%
rename from public/holiday/list.php
rename to htdocs/holiday/list.php
diff --git a/public/holiday/view_log.php b/htdocs/holiday/view_log.php
similarity index 100%
rename from public/holiday/view_log.php
rename to htdocs/holiday/view_log.php
diff --git a/public/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
similarity index 100%
rename from public/hrm/admin/admin_establishment.php
rename to htdocs/hrm/admin/admin_establishment.php
diff --git a/public/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
similarity index 100%
rename from public/hrm/admin/admin_hrm.php
rename to htdocs/hrm/admin/admin_hrm.php
diff --git a/public/hrm/admin/index.html b/htdocs/hrm/admin/index.html
similarity index 100%
rename from public/hrm/admin/index.html
rename to htdocs/hrm/admin/index.html
diff --git a/public/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
similarity index 100%
rename from public/hrm/class/establishment.class.php
rename to htdocs/hrm/class/establishment.class.php
diff --git a/public/hrm/class/index.html b/htdocs/hrm/class/index.html
similarity index 100%
rename from public/hrm/class/index.html
rename to htdocs/hrm/class/index.html
diff --git a/public/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
similarity index 100%
rename from public/hrm/establishment/card.php
rename to htdocs/hrm/establishment/card.php
diff --git a/public/hrm/establishment/index.html b/htdocs/hrm/establishment/index.html
similarity index 100%
rename from public/hrm/establishment/index.html
rename to htdocs/hrm/establishment/index.html
diff --git a/public/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
similarity index 100%
rename from public/hrm/establishment/info.php
rename to htdocs/hrm/establishment/info.php
diff --git a/public/hrm/index.html b/htdocs/hrm/index.html
similarity index 100%
rename from public/hrm/index.html
rename to htdocs/hrm/index.html
diff --git a/public/hrm/index.php b/htdocs/hrm/index.php
similarity index 100%
rename from public/hrm/index.php
rename to htdocs/hrm/index.php
diff --git a/public/imports/class/import.class.php b/htdocs/imports/class/import.class.php
similarity index 100%
rename from public/imports/class/import.class.php
rename to htdocs/imports/class/import.class.php
diff --git a/public/imports/class/index.html b/htdocs/imports/class/index.html
similarity index 100%
rename from public/imports/class/index.html
rename to htdocs/imports/class/index.html
diff --git a/public/imports/emptyexample.php b/htdocs/imports/emptyexample.php
similarity index 100%
rename from public/imports/emptyexample.php
rename to htdocs/imports/emptyexample.php
diff --git a/public/imports/import.php b/htdocs/imports/import.php
similarity index 100%
rename from public/imports/import.php
rename to htdocs/imports/import.php
diff --git a/public/imports/index.php b/htdocs/imports/index.php
similarity index 100%
rename from public/imports/index.php
rename to htdocs/imports/index.php
diff --git a/public/includes/OAuth/Common/AutoLoader.php b/htdocs/includes/OAuth/Common/AutoLoader.php
similarity index 100%
rename from public/includes/OAuth/Common/AutoLoader.php
rename to htdocs/includes/OAuth/Common/AutoLoader.php
diff --git a/public/includes/OAuth/Common/Consumer/Credentials.php b/htdocs/includes/OAuth/Common/Consumer/Credentials.php
similarity index 100%
rename from public/includes/OAuth/Common/Consumer/Credentials.php
rename to htdocs/includes/OAuth/Common/Consumer/Credentials.php
diff --git a/public/includes/OAuth/Common/Consumer/CredentialsInterface.php b/htdocs/includes/OAuth/Common/Consumer/CredentialsInterface.php
similarity index 100%
rename from public/includes/OAuth/Common/Consumer/CredentialsInterface.php
rename to htdocs/includes/OAuth/Common/Consumer/CredentialsInterface.php
diff --git a/public/includes/OAuth/Common/Exception/Exception.php b/htdocs/includes/OAuth/Common/Exception/Exception.php
similarity index 100%
rename from public/includes/OAuth/Common/Exception/Exception.php
rename to htdocs/includes/OAuth/Common/Exception/Exception.php
diff --git a/public/includes/OAuth/Common/Http/Client/AbstractClient.php b/htdocs/includes/OAuth/Common/Http/Client/AbstractClient.php
similarity index 100%
rename from public/includes/OAuth/Common/Http/Client/AbstractClient.php
rename to htdocs/includes/OAuth/Common/Http/Client/AbstractClient.php
diff --git a/public/includes/OAuth/Common/Http/Client/ClientInterface.php b/htdocs/includes/OAuth/Common/Http/Client/ClientInterface.php
similarity index 100%
rename from public/includes/OAuth/Common/Http/Client/ClientInterface.php
rename to htdocs/includes/OAuth/Common/Http/Client/ClientInterface.php
diff --git a/public/includes/OAuth/Common/Http/Client/CurlClient.php b/htdocs/includes/OAuth/Common/Http/Client/CurlClient.php
similarity index 100%
rename from public/includes/OAuth/Common/Http/Client/CurlClient.php
rename to htdocs/includes/OAuth/Common/Http/Client/CurlClient.php
diff --git a/public/includes/OAuth/Common/Http/Client/StreamClient.php b/htdocs/includes/OAuth/Common/Http/Client/StreamClient.php
similarity index 100%
rename from public/includes/OAuth/Common/Http/Client/StreamClient.php
rename to htdocs/includes/OAuth/Common/Http/Client/StreamClient.php
diff --git a/public/includes/OAuth/Common/Http/Exception/TokenResponseException.php b/htdocs/includes/OAuth/Common/Http/Exception/TokenResponseException.php
similarity index 100%
rename from public/includes/OAuth/Common/Http/Exception/TokenResponseException.php
rename to htdocs/includes/OAuth/Common/Http/Exception/TokenResponseException.php
diff --git a/public/includes/OAuth/Common/Http/Uri/Uri.php b/htdocs/includes/OAuth/Common/Http/Uri/Uri.php
similarity index 100%
rename from public/includes/OAuth/Common/Http/Uri/Uri.php
rename to htdocs/includes/OAuth/Common/Http/Uri/Uri.php
diff --git a/public/includes/OAuth/Common/Http/Uri/UriFactory.php b/htdocs/includes/OAuth/Common/Http/Uri/UriFactory.php
similarity index 100%
rename from public/includes/OAuth/Common/Http/Uri/UriFactory.php
rename to htdocs/includes/OAuth/Common/Http/Uri/UriFactory.php
diff --git a/public/includes/OAuth/Common/Http/Uri/UriFactoryInterface.php b/htdocs/includes/OAuth/Common/Http/Uri/UriFactoryInterface.php
similarity index 100%
rename from public/includes/OAuth/Common/Http/Uri/UriFactoryInterface.php
rename to htdocs/includes/OAuth/Common/Http/Uri/UriFactoryInterface.php
diff --git a/public/includes/OAuth/Common/Http/Uri/UriInterface.php b/htdocs/includes/OAuth/Common/Http/Uri/UriInterface.php
similarity index 100%
rename from public/includes/OAuth/Common/Http/Uri/UriInterface.php
rename to htdocs/includes/OAuth/Common/Http/Uri/UriInterface.php
diff --git a/public/includes/OAuth/Common/Service/AbstractService.php b/htdocs/includes/OAuth/Common/Service/AbstractService.php
similarity index 100%
rename from public/includes/OAuth/Common/Service/AbstractService.php
rename to htdocs/includes/OAuth/Common/Service/AbstractService.php
diff --git a/public/includes/OAuth/Common/Service/ServiceInterface.php b/htdocs/includes/OAuth/Common/Service/ServiceInterface.php
similarity index 100%
rename from public/includes/OAuth/Common/Service/ServiceInterface.php
rename to htdocs/includes/OAuth/Common/Service/ServiceInterface.php
diff --git a/public/includes/OAuth/Common/Storage/DoliStorage.php b/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
similarity index 100%
rename from public/includes/OAuth/Common/Storage/DoliStorage.php
rename to htdocs/includes/OAuth/Common/Storage/DoliStorage.php
diff --git a/public/includes/OAuth/Common/Storage/Exception/AuthorizationStateNotFoundException.php b/htdocs/includes/OAuth/Common/Storage/Exception/AuthorizationStateNotFoundException.php
similarity index 100%
rename from public/includes/OAuth/Common/Storage/Exception/AuthorizationStateNotFoundException.php
rename to htdocs/includes/OAuth/Common/Storage/Exception/AuthorizationStateNotFoundException.php
diff --git a/public/includes/OAuth/Common/Storage/Exception/StorageException.php b/htdocs/includes/OAuth/Common/Storage/Exception/StorageException.php
similarity index 100%
rename from public/includes/OAuth/Common/Storage/Exception/StorageException.php
rename to htdocs/includes/OAuth/Common/Storage/Exception/StorageException.php
diff --git a/public/includes/OAuth/Common/Storage/Exception/TokenNotFoundException.php b/htdocs/includes/OAuth/Common/Storage/Exception/TokenNotFoundException.php
similarity index 100%
rename from public/includes/OAuth/Common/Storage/Exception/TokenNotFoundException.php
rename to htdocs/includes/OAuth/Common/Storage/Exception/TokenNotFoundException.php
diff --git a/public/includes/OAuth/Common/Storage/Memory.php b/htdocs/includes/OAuth/Common/Storage/Memory.php
similarity index 100%
rename from public/includes/OAuth/Common/Storage/Memory.php
rename to htdocs/includes/OAuth/Common/Storage/Memory.php
diff --git a/public/includes/OAuth/Common/Storage/Redis.php b/htdocs/includes/OAuth/Common/Storage/Redis.php
similarity index 100%
rename from public/includes/OAuth/Common/Storage/Redis.php
rename to htdocs/includes/OAuth/Common/Storage/Redis.php
diff --git a/public/includes/OAuth/Common/Storage/Session.php b/htdocs/includes/OAuth/Common/Storage/Session.php
similarity index 100%
rename from public/includes/OAuth/Common/Storage/Session.php
rename to htdocs/includes/OAuth/Common/Storage/Session.php
diff --git a/public/includes/OAuth/Common/Storage/SymfonySession.php b/htdocs/includes/OAuth/Common/Storage/SymfonySession.php
similarity index 100%
rename from public/includes/OAuth/Common/Storage/SymfonySession.php
rename to htdocs/includes/OAuth/Common/Storage/SymfonySession.php
diff --git a/public/includes/OAuth/Common/Storage/TokenStorageInterface.php b/htdocs/includes/OAuth/Common/Storage/TokenStorageInterface.php
similarity index 100%
rename from public/includes/OAuth/Common/Storage/TokenStorageInterface.php
rename to htdocs/includes/OAuth/Common/Storage/TokenStorageInterface.php
diff --git a/public/includes/OAuth/Common/Token/AbstractToken.php b/htdocs/includes/OAuth/Common/Token/AbstractToken.php
similarity index 100%
rename from public/includes/OAuth/Common/Token/AbstractToken.php
rename to htdocs/includes/OAuth/Common/Token/AbstractToken.php
diff --git a/public/includes/OAuth/Common/Token/Exception/ExpiredTokenException.php b/htdocs/includes/OAuth/Common/Token/Exception/ExpiredTokenException.php
similarity index 100%
rename from public/includes/OAuth/Common/Token/Exception/ExpiredTokenException.php
rename to htdocs/includes/OAuth/Common/Token/Exception/ExpiredTokenException.php
diff --git a/public/includes/OAuth/Common/Token/TokenInterface.php b/htdocs/includes/OAuth/Common/Token/TokenInterface.php
similarity index 100%
rename from public/includes/OAuth/Common/Token/TokenInterface.php
rename to htdocs/includes/OAuth/Common/Token/TokenInterface.php
diff --git a/public/includes/OAuth/OAuth1/Service/AbstractService.php b/htdocs/includes/OAuth/OAuth1/Service/AbstractService.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Service/AbstractService.php
rename to htdocs/includes/OAuth/OAuth1/Service/AbstractService.php
diff --git a/public/includes/OAuth/OAuth1/Service/BitBucket.php b/htdocs/includes/OAuth/OAuth1/Service/BitBucket.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Service/BitBucket.php
rename to htdocs/includes/OAuth/OAuth1/Service/BitBucket.php
diff --git a/public/includes/OAuth/OAuth1/Service/Etsy.php b/htdocs/includes/OAuth/OAuth1/Service/Etsy.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Service/Etsy.php
rename to htdocs/includes/OAuth/OAuth1/Service/Etsy.php
diff --git a/public/includes/OAuth/OAuth1/Service/FitBit.php b/htdocs/includes/OAuth/OAuth1/Service/FitBit.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Service/FitBit.php
rename to htdocs/includes/OAuth/OAuth1/Service/FitBit.php
diff --git a/public/includes/OAuth/OAuth1/Service/FiveHundredPx.php b/htdocs/includes/OAuth/OAuth1/Service/FiveHundredPx.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Service/FiveHundredPx.php
rename to htdocs/includes/OAuth/OAuth1/Service/FiveHundredPx.php
diff --git a/public/includes/OAuth/OAuth1/Service/Flickr.php b/htdocs/includes/OAuth/OAuth1/Service/Flickr.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Service/Flickr.php
rename to htdocs/includes/OAuth/OAuth1/Service/Flickr.php
diff --git a/public/includes/OAuth/OAuth1/Service/QuickBooks.php b/htdocs/includes/OAuth/OAuth1/Service/QuickBooks.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Service/QuickBooks.php
rename to htdocs/includes/OAuth/OAuth1/Service/QuickBooks.php
diff --git a/public/includes/OAuth/OAuth1/Service/Redmine.php b/htdocs/includes/OAuth/OAuth1/Service/Redmine.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Service/Redmine.php
rename to htdocs/includes/OAuth/OAuth1/Service/Redmine.php
diff --git a/public/includes/OAuth/OAuth1/Service/ScoopIt.php b/htdocs/includes/OAuth/OAuth1/Service/ScoopIt.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Service/ScoopIt.php
rename to htdocs/includes/OAuth/OAuth1/Service/ScoopIt.php
diff --git a/public/includes/OAuth/OAuth1/Service/ServiceInterface.php b/htdocs/includes/OAuth/OAuth1/Service/ServiceInterface.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Service/ServiceInterface.php
rename to htdocs/includes/OAuth/OAuth1/Service/ServiceInterface.php
diff --git a/public/includes/OAuth/OAuth1/Service/Tumblr.php b/htdocs/includes/OAuth/OAuth1/Service/Tumblr.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Service/Tumblr.php
rename to htdocs/includes/OAuth/OAuth1/Service/Tumblr.php
diff --git a/public/includes/OAuth/OAuth1/Service/Twitter.php b/htdocs/includes/OAuth/OAuth1/Service/Twitter.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Service/Twitter.php
rename to htdocs/includes/OAuth/OAuth1/Service/Twitter.php
diff --git a/public/includes/OAuth/OAuth1/Service/Xing.php b/htdocs/includes/OAuth/OAuth1/Service/Xing.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Service/Xing.php
rename to htdocs/includes/OAuth/OAuth1/Service/Xing.php
diff --git a/public/includes/OAuth/OAuth1/Service/Yahoo.php b/htdocs/includes/OAuth/OAuth1/Service/Yahoo.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Service/Yahoo.php
rename to htdocs/includes/OAuth/OAuth1/Service/Yahoo.php
diff --git a/public/includes/OAuth/OAuth1/Signature/Exception/UnsupportedHashAlgorithmException.php b/htdocs/includes/OAuth/OAuth1/Signature/Exception/UnsupportedHashAlgorithmException.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Signature/Exception/UnsupportedHashAlgorithmException.php
rename to htdocs/includes/OAuth/OAuth1/Signature/Exception/UnsupportedHashAlgorithmException.php
diff --git a/public/includes/OAuth/OAuth1/Signature/Signature.php b/htdocs/includes/OAuth/OAuth1/Signature/Signature.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Signature/Signature.php
rename to htdocs/includes/OAuth/OAuth1/Signature/Signature.php
diff --git a/public/includes/OAuth/OAuth1/Signature/SignatureInterface.php b/htdocs/includes/OAuth/OAuth1/Signature/SignatureInterface.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Signature/SignatureInterface.php
rename to htdocs/includes/OAuth/OAuth1/Signature/SignatureInterface.php
diff --git a/public/includes/OAuth/OAuth1/Token/StdOAuth1Token.php b/htdocs/includes/OAuth/OAuth1/Token/StdOAuth1Token.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Token/StdOAuth1Token.php
rename to htdocs/includes/OAuth/OAuth1/Token/StdOAuth1Token.php
diff --git a/public/includes/OAuth/OAuth1/Token/TokenInterface.php b/htdocs/includes/OAuth/OAuth1/Token/TokenInterface.php
similarity index 100%
rename from public/includes/OAuth/OAuth1/Token/TokenInterface.php
rename to htdocs/includes/OAuth/OAuth1/Token/TokenInterface.php
diff --git a/public/includes/OAuth/OAuth2/Service/AbstractService.php b/htdocs/includes/OAuth/OAuth2/Service/AbstractService.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/AbstractService.php
rename to htdocs/includes/OAuth/OAuth2/Service/AbstractService.php
diff --git a/public/includes/OAuth/OAuth2/Service/Amazon.php b/htdocs/includes/OAuth/OAuth2/Service/Amazon.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Amazon.php
rename to htdocs/includes/OAuth/OAuth2/Service/Amazon.php
diff --git a/public/includes/OAuth/OAuth2/Service/Bitly.php b/htdocs/includes/OAuth/OAuth2/Service/Bitly.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Bitly.php
rename to htdocs/includes/OAuth/OAuth2/Service/Bitly.php
diff --git a/public/includes/OAuth/OAuth2/Service/Bitrix24.php b/htdocs/includes/OAuth/OAuth2/Service/Bitrix24.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Bitrix24.php
rename to htdocs/includes/OAuth/OAuth2/Service/Bitrix24.php
diff --git a/public/includes/OAuth/OAuth2/Service/Box.php b/htdocs/includes/OAuth/OAuth2/Service/Box.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Box.php
rename to htdocs/includes/OAuth/OAuth2/Service/Box.php
diff --git a/public/includes/OAuth/OAuth2/Service/Buffer.php b/htdocs/includes/OAuth/OAuth2/Service/Buffer.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Buffer.php
rename to htdocs/includes/OAuth/OAuth2/Service/Buffer.php
diff --git a/public/includes/OAuth/OAuth2/Service/Dailymotion.php b/htdocs/includes/OAuth/OAuth2/Service/Dailymotion.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Dailymotion.php
rename to htdocs/includes/OAuth/OAuth2/Service/Dailymotion.php
diff --git a/public/includes/OAuth/OAuth2/Service/Delicious.php b/htdocs/includes/OAuth/OAuth2/Service/Delicious.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Delicious.php
rename to htdocs/includes/OAuth/OAuth2/Service/Delicious.php
diff --git a/public/includes/OAuth/OAuth2/Service/DeviantArt.php b/htdocs/includes/OAuth/OAuth2/Service/DeviantArt.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/DeviantArt.php
rename to htdocs/includes/OAuth/OAuth2/Service/DeviantArt.php
diff --git a/public/includes/OAuth/OAuth2/Service/Dropbox.php b/htdocs/includes/OAuth/OAuth2/Service/Dropbox.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Dropbox.php
rename to htdocs/includes/OAuth/OAuth2/Service/Dropbox.php
diff --git a/public/includes/OAuth/OAuth2/Service/EveOnline.php b/htdocs/includes/OAuth/OAuth2/Service/EveOnline.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/EveOnline.php
rename to htdocs/includes/OAuth/OAuth2/Service/EveOnline.php
diff --git a/public/includes/OAuth/OAuth2/Service/Exception/InvalidAccessTypeException.php b/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAccessTypeException.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Exception/InvalidAccessTypeException.php
rename to htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAccessTypeException.php
diff --git a/public/includes/OAuth/OAuth2/Service/Exception/InvalidAuthorizationStateException.php b/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAuthorizationStateException.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Exception/InvalidAuthorizationStateException.php
rename to htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAuthorizationStateException.php
diff --git a/public/includes/OAuth/OAuth2/Service/Exception/InvalidScopeException.php b/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidScopeException.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Exception/InvalidScopeException.php
rename to htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidScopeException.php
diff --git a/public/includes/OAuth/OAuth2/Service/Exception/MissingRefreshTokenException.php b/htdocs/includes/OAuth/OAuth2/Service/Exception/MissingRefreshTokenException.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Exception/MissingRefreshTokenException.php
rename to htdocs/includes/OAuth/OAuth2/Service/Exception/MissingRefreshTokenException.php
diff --git a/public/includes/OAuth/OAuth2/Service/Facebook.php b/htdocs/includes/OAuth/OAuth2/Service/Facebook.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Facebook.php
rename to htdocs/includes/OAuth/OAuth2/Service/Facebook.php
diff --git a/public/includes/OAuth/OAuth2/Service/Foursquare.php b/htdocs/includes/OAuth/OAuth2/Service/Foursquare.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Foursquare.php
rename to htdocs/includes/OAuth/OAuth2/Service/Foursquare.php
diff --git a/public/includes/OAuth/OAuth2/Service/GitHub.php b/htdocs/includes/OAuth/OAuth2/Service/GitHub.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/GitHub.php
rename to htdocs/includes/OAuth/OAuth2/Service/GitHub.php
diff --git a/public/includes/OAuth/OAuth2/Service/Google.php b/htdocs/includes/OAuth/OAuth2/Service/Google.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Google.php
rename to htdocs/includes/OAuth/OAuth2/Service/Google.php
diff --git a/public/includes/OAuth/OAuth2/Service/Harvest.php b/htdocs/includes/OAuth/OAuth2/Service/Harvest.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Harvest.php
rename to htdocs/includes/OAuth/OAuth2/Service/Harvest.php
diff --git a/public/includes/OAuth/OAuth2/Service/Heroku.php b/htdocs/includes/OAuth/OAuth2/Service/Heroku.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Heroku.php
rename to htdocs/includes/OAuth/OAuth2/Service/Heroku.php
diff --git a/public/includes/OAuth/OAuth2/Service/Hubic.php b/htdocs/includes/OAuth/OAuth2/Service/Hubic.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Hubic.php
rename to htdocs/includes/OAuth/OAuth2/Service/Hubic.php
diff --git a/public/includes/OAuth/OAuth2/Service/Instagram.php b/htdocs/includes/OAuth/OAuth2/Service/Instagram.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Instagram.php
rename to htdocs/includes/OAuth/OAuth2/Service/Instagram.php
diff --git a/public/includes/OAuth/OAuth2/Service/JawboneUP.php b/htdocs/includes/OAuth/OAuth2/Service/JawboneUP.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/JawboneUP.php
rename to htdocs/includes/OAuth/OAuth2/Service/JawboneUP.php
diff --git a/public/includes/OAuth/OAuth2/Service/Linkedin.php b/htdocs/includes/OAuth/OAuth2/Service/Linkedin.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Linkedin.php
rename to htdocs/includes/OAuth/OAuth2/Service/Linkedin.php
diff --git a/public/includes/OAuth/OAuth2/Service/Mailchimp.php b/htdocs/includes/OAuth/OAuth2/Service/Mailchimp.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Mailchimp.php
rename to htdocs/includes/OAuth/OAuth2/Service/Mailchimp.php
diff --git a/public/includes/OAuth/OAuth2/Service/Microsoft.php b/htdocs/includes/OAuth/OAuth2/Service/Microsoft.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Microsoft.php
rename to htdocs/includes/OAuth/OAuth2/Service/Microsoft.php
diff --git a/public/includes/OAuth/OAuth2/Service/Nest.php b/htdocs/includes/OAuth/OAuth2/Service/Nest.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Nest.php
rename to htdocs/includes/OAuth/OAuth2/Service/Nest.php
diff --git a/public/includes/OAuth/OAuth2/Service/Netatmo.php b/htdocs/includes/OAuth/OAuth2/Service/Netatmo.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Netatmo.php
rename to htdocs/includes/OAuth/OAuth2/Service/Netatmo.php
diff --git a/public/includes/OAuth/OAuth2/Service/ParrotFlowerPower.php b/htdocs/includes/OAuth/OAuth2/Service/ParrotFlowerPower.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/ParrotFlowerPower.php
rename to htdocs/includes/OAuth/OAuth2/Service/ParrotFlowerPower.php
diff --git a/public/includes/OAuth/OAuth2/Service/Paypal.php b/htdocs/includes/OAuth/OAuth2/Service/Paypal.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Paypal.php
rename to htdocs/includes/OAuth/OAuth2/Service/Paypal.php
diff --git a/public/includes/OAuth/OAuth2/Service/Pocket.php b/htdocs/includes/OAuth/OAuth2/Service/Pocket.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Pocket.php
rename to htdocs/includes/OAuth/OAuth2/Service/Pocket.php
diff --git a/public/includes/OAuth/OAuth2/Service/Reddit.php b/htdocs/includes/OAuth/OAuth2/Service/Reddit.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Reddit.php
rename to htdocs/includes/OAuth/OAuth2/Service/Reddit.php
diff --git a/public/includes/OAuth/OAuth2/Service/RunKeeper.php b/htdocs/includes/OAuth/OAuth2/Service/RunKeeper.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/RunKeeper.php
rename to htdocs/includes/OAuth/OAuth2/Service/RunKeeper.php
diff --git a/public/includes/OAuth/OAuth2/Service/Salesforce.php b/htdocs/includes/OAuth/OAuth2/Service/Salesforce.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Salesforce.php
rename to htdocs/includes/OAuth/OAuth2/Service/Salesforce.php
diff --git a/public/includes/OAuth/OAuth2/Service/ServiceInterface.php b/htdocs/includes/OAuth/OAuth2/Service/ServiceInterface.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/ServiceInterface.php
rename to htdocs/includes/OAuth/OAuth2/Service/ServiceInterface.php
diff --git a/public/includes/OAuth/OAuth2/Service/SoundCloud.php b/htdocs/includes/OAuth/OAuth2/Service/SoundCloud.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/SoundCloud.php
rename to htdocs/includes/OAuth/OAuth2/Service/SoundCloud.php
diff --git a/public/includes/OAuth/OAuth2/Service/Spotify.php b/htdocs/includes/OAuth/OAuth2/Service/Spotify.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Spotify.php
rename to htdocs/includes/OAuth/OAuth2/Service/Spotify.php
diff --git a/public/includes/OAuth/OAuth2/Service/Strava.php b/htdocs/includes/OAuth/OAuth2/Service/Strava.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Strava.php
rename to htdocs/includes/OAuth/OAuth2/Service/Strava.php
diff --git a/public/includes/OAuth/OAuth2/Service/Ustream.php b/htdocs/includes/OAuth/OAuth2/Service/Ustream.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Ustream.php
rename to htdocs/includes/OAuth/OAuth2/Service/Ustream.php
diff --git a/public/includes/OAuth/OAuth2/Service/Vimeo.php b/htdocs/includes/OAuth/OAuth2/Service/Vimeo.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Vimeo.php
rename to htdocs/includes/OAuth/OAuth2/Service/Vimeo.php
diff --git a/public/includes/OAuth/OAuth2/Service/Vkontakte.php b/htdocs/includes/OAuth/OAuth2/Service/Vkontakte.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Vkontakte.php
rename to htdocs/includes/OAuth/OAuth2/Service/Vkontakte.php
diff --git a/public/includes/OAuth/OAuth2/Service/Yahoo.php b/htdocs/includes/OAuth/OAuth2/Service/Yahoo.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Yahoo.php
rename to htdocs/includes/OAuth/OAuth2/Service/Yahoo.php
diff --git a/public/includes/OAuth/OAuth2/Service/Yammer.php b/htdocs/includes/OAuth/OAuth2/Service/Yammer.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Service/Yammer.php
rename to htdocs/includes/OAuth/OAuth2/Service/Yammer.php
diff --git a/public/includes/OAuth/OAuth2/Token/StdOAuth2Token.php b/htdocs/includes/OAuth/OAuth2/Token/StdOAuth2Token.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Token/StdOAuth2Token.php
rename to htdocs/includes/OAuth/OAuth2/Token/StdOAuth2Token.php
diff --git a/public/includes/OAuth/OAuth2/Token/TokenInterface.php b/htdocs/includes/OAuth/OAuth2/Token/TokenInterface.php
similarity index 100%
rename from public/includes/OAuth/OAuth2/Token/TokenInterface.php
rename to htdocs/includes/OAuth/OAuth2/Token/TokenInterface.php
diff --git a/public/includes/OAuth/ServiceFactory.php b/htdocs/includes/OAuth/ServiceFactory.php
similarity index 100%
rename from public/includes/OAuth/ServiceFactory.php
rename to htdocs/includes/OAuth/ServiceFactory.php
diff --git a/public/includes/OAuth/bootstrap.php b/htdocs/includes/OAuth/bootstrap.php
similarity index 100%
rename from public/includes/OAuth/bootstrap.php
rename to htdocs/includes/OAuth/bootstrap.php
diff --git a/public/includes/adodbtime/adodb-time.inc.php b/htdocs/includes/adodbtime/adodb-time.inc.php
similarity index 100%
rename from public/includes/adodbtime/adodb-time.inc.php
rename to htdocs/includes/adodbtime/adodb-time.inc.php
diff --git a/public/includes/adodbtime/index.html b/htdocs/includes/adodbtime/index.html
similarity index 100%
rename from public/includes/adodbtime/index.html
rename to htdocs/includes/adodbtime/index.html
diff --git a/public/includes/ccampbell/chromephp/ChromePhp.php b/htdocs/includes/ccampbell/chromephp/ChromePhp.php
similarity index 100%
rename from public/includes/ccampbell/chromephp/ChromePhp.php
rename to htdocs/includes/ccampbell/chromephp/ChromePhp.php
diff --git a/public/includes/ccampbell/chromephp/README.md b/htdocs/includes/ccampbell/chromephp/README.md
similarity index 100%
rename from public/includes/ccampbell/chromephp/README.md
rename to htdocs/includes/ccampbell/chromephp/README.md
diff --git a/public/includes/ccampbell/chromephp/composer.json b/htdocs/includes/ccampbell/chromephp/composer.json
similarity index 100%
rename from public/includes/ccampbell/chromephp/composer.json
rename to htdocs/includes/ccampbell/chromephp/composer.json
diff --git a/public/includes/ckeditor/ckeditor/CHANGES.md b/htdocs/includes/ckeditor/ckeditor/CHANGES.md
similarity index 100%
rename from public/includes/ckeditor/ckeditor/CHANGES.md
rename to htdocs/includes/ckeditor/ckeditor/CHANGES.md
diff --git a/public/includes/ckeditor/ckeditor/LICENSE.md b/htdocs/includes/ckeditor/ckeditor/LICENSE.md
similarity index 100%
rename from public/includes/ckeditor/ckeditor/LICENSE.md
rename to htdocs/includes/ckeditor/ckeditor/LICENSE.md
diff --git a/public/includes/ckeditor/ckeditor/README.md b/htdocs/includes/ckeditor/ckeditor/README.md
similarity index 100%
rename from public/includes/ckeditor/ckeditor/README.md
rename to htdocs/includes/ckeditor/ckeditor/README.md
diff --git a/public/includes/ckeditor/ckeditor/adapters/jquery.js b/htdocs/includes/ckeditor/ckeditor/adapters/jquery.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/adapters/jquery.js
rename to htdocs/includes/ckeditor/ckeditor/adapters/jquery.js
diff --git a/public/includes/ckeditor/ckeditor/bower.json b/htdocs/includes/ckeditor/ckeditor/bower.json
similarity index 100%
rename from public/includes/ckeditor/ckeditor/bower.json
rename to htdocs/includes/ckeditor/ckeditor/bower.json
diff --git a/public/includes/ckeditor/ckeditor/build-config.js b/htdocs/includes/ckeditor/ckeditor/build-config.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/build-config.js
rename to htdocs/includes/ckeditor/ckeditor/build-config.js
diff --git a/public/includes/ckeditor/ckeditor/ckeditor.js b/htdocs/includes/ckeditor/ckeditor/ckeditor.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/ckeditor.js
rename to htdocs/includes/ckeditor/ckeditor/ckeditor.js
diff --git a/public/includes/ckeditor/ckeditor/composer.json b/htdocs/includes/ckeditor/ckeditor/composer.json
similarity index 100%
rename from public/includes/ckeditor/ckeditor/composer.json
rename to htdocs/includes/ckeditor/ckeditor/composer.json
diff --git a/public/includes/ckeditor/ckeditor/config.js b/htdocs/includes/ckeditor/ckeditor/config.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/config.js
rename to htdocs/includes/ckeditor/ckeditor/config.js
diff --git a/public/includes/ckeditor/ckeditor/contents.css b/htdocs/includes/ckeditor/ckeditor/contents.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/contents.css
rename to htdocs/includes/ckeditor/ckeditor/contents.css
diff --git a/public/includes/ckeditor/ckeditor/lang/af.js b/htdocs/includes/ckeditor/ckeditor/lang/af.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/af.js
rename to htdocs/includes/ckeditor/ckeditor/lang/af.js
diff --git a/public/includes/ckeditor/ckeditor/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/lang/ar.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/ar.js
rename to htdocs/includes/ckeditor/ckeditor/lang/ar.js
diff --git a/public/includes/ckeditor/ckeditor/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/lang/bg.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/bg.js
rename to htdocs/includes/ckeditor/ckeditor/lang/bg.js
diff --git a/public/includes/ckeditor/ckeditor/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/lang/bn.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/bn.js
rename to htdocs/includes/ckeditor/ckeditor/lang/bn.js
diff --git a/public/includes/ckeditor/ckeditor/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/lang/bs.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/bs.js
rename to htdocs/includes/ckeditor/ckeditor/lang/bs.js
diff --git a/public/includes/ckeditor/ckeditor/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/lang/ca.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/ca.js
rename to htdocs/includes/ckeditor/ckeditor/lang/ca.js
diff --git a/public/includes/ckeditor/ckeditor/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/lang/cs.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/cs.js
rename to htdocs/includes/ckeditor/ckeditor/lang/cs.js
diff --git a/public/includes/ckeditor/ckeditor/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/lang/cy.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/cy.js
rename to htdocs/includes/ckeditor/ckeditor/lang/cy.js
diff --git a/public/includes/ckeditor/ckeditor/lang/da.js b/htdocs/includes/ckeditor/ckeditor/lang/da.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/da.js
rename to htdocs/includes/ckeditor/ckeditor/lang/da.js
diff --git a/public/includes/ckeditor/ckeditor/lang/de-ch.js b/htdocs/includes/ckeditor/ckeditor/lang/de-ch.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/de-ch.js
rename to htdocs/includes/ckeditor/ckeditor/lang/de-ch.js
diff --git a/public/includes/ckeditor/ckeditor/lang/de.js b/htdocs/includes/ckeditor/ckeditor/lang/de.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/de.js
rename to htdocs/includes/ckeditor/ckeditor/lang/de.js
diff --git a/public/includes/ckeditor/ckeditor/lang/el.js b/htdocs/includes/ckeditor/ckeditor/lang/el.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/el.js
rename to htdocs/includes/ckeditor/ckeditor/lang/el.js
diff --git a/public/includes/ckeditor/ckeditor/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/lang/en-au.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/en-au.js
rename to htdocs/includes/ckeditor/ckeditor/lang/en-au.js
diff --git a/public/includes/ckeditor/ckeditor/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/lang/en-ca.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/en-ca.js
rename to htdocs/includes/ckeditor/ckeditor/lang/en-ca.js
diff --git a/public/includes/ckeditor/ckeditor/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/lang/en-gb.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/en-gb.js
rename to htdocs/includes/ckeditor/ckeditor/lang/en-gb.js
diff --git a/public/includes/ckeditor/ckeditor/lang/en.js b/htdocs/includes/ckeditor/ckeditor/lang/en.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/en.js
rename to htdocs/includes/ckeditor/ckeditor/lang/en.js
diff --git a/public/includes/ckeditor/ckeditor/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/lang/eo.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/eo.js
rename to htdocs/includes/ckeditor/ckeditor/lang/eo.js
diff --git a/public/includes/ckeditor/ckeditor/lang/es.js b/htdocs/includes/ckeditor/ckeditor/lang/es.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/es.js
rename to htdocs/includes/ckeditor/ckeditor/lang/es.js
diff --git a/public/includes/ckeditor/ckeditor/lang/et.js b/htdocs/includes/ckeditor/ckeditor/lang/et.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/et.js
rename to htdocs/includes/ckeditor/ckeditor/lang/et.js
diff --git a/public/includes/ckeditor/ckeditor/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/lang/eu.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/eu.js
rename to htdocs/includes/ckeditor/ckeditor/lang/eu.js
diff --git a/public/includes/ckeditor/ckeditor/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/lang/fa.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/fa.js
rename to htdocs/includes/ckeditor/ckeditor/lang/fa.js
diff --git a/public/includes/ckeditor/ckeditor/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/lang/fi.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/fi.js
rename to htdocs/includes/ckeditor/ckeditor/lang/fi.js
diff --git a/public/includes/ckeditor/ckeditor/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/lang/fo.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/fo.js
rename to htdocs/includes/ckeditor/ckeditor/lang/fo.js
diff --git a/public/includes/ckeditor/ckeditor/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/lang/fr-ca.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/fr-ca.js
rename to htdocs/includes/ckeditor/ckeditor/lang/fr-ca.js
diff --git a/public/includes/ckeditor/ckeditor/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/lang/fr.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/fr.js
rename to htdocs/includes/ckeditor/ckeditor/lang/fr.js
diff --git a/public/includes/ckeditor/ckeditor/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/lang/gl.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/gl.js
rename to htdocs/includes/ckeditor/ckeditor/lang/gl.js
diff --git a/public/includes/ckeditor/ckeditor/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/lang/gu.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/gu.js
rename to htdocs/includes/ckeditor/ckeditor/lang/gu.js
diff --git a/public/includes/ckeditor/ckeditor/lang/he.js b/htdocs/includes/ckeditor/ckeditor/lang/he.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/he.js
rename to htdocs/includes/ckeditor/ckeditor/lang/he.js
diff --git a/public/includes/ckeditor/ckeditor/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/lang/hi.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/hi.js
rename to htdocs/includes/ckeditor/ckeditor/lang/hi.js
diff --git a/public/includes/ckeditor/ckeditor/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/lang/hr.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/hr.js
rename to htdocs/includes/ckeditor/ckeditor/lang/hr.js
diff --git a/public/includes/ckeditor/ckeditor/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/lang/hu.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/hu.js
rename to htdocs/includes/ckeditor/ckeditor/lang/hu.js
diff --git a/public/includes/ckeditor/ckeditor/lang/id.js b/htdocs/includes/ckeditor/ckeditor/lang/id.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/id.js
rename to htdocs/includes/ckeditor/ckeditor/lang/id.js
diff --git a/public/includes/ckeditor/ckeditor/lang/is.js b/htdocs/includes/ckeditor/ckeditor/lang/is.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/is.js
rename to htdocs/includes/ckeditor/ckeditor/lang/is.js
diff --git a/public/includes/ckeditor/ckeditor/lang/it.js b/htdocs/includes/ckeditor/ckeditor/lang/it.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/it.js
rename to htdocs/includes/ckeditor/ckeditor/lang/it.js
diff --git a/public/includes/ckeditor/ckeditor/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/lang/ja.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/ja.js
rename to htdocs/includes/ckeditor/ckeditor/lang/ja.js
diff --git a/public/includes/ckeditor/ckeditor/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/lang/ka.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/ka.js
rename to htdocs/includes/ckeditor/ckeditor/lang/ka.js
diff --git a/public/includes/ckeditor/ckeditor/lang/km.js b/htdocs/includes/ckeditor/ckeditor/lang/km.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/km.js
rename to htdocs/includes/ckeditor/ckeditor/lang/km.js
diff --git a/public/includes/ckeditor/ckeditor/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/lang/ko.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/ko.js
rename to htdocs/includes/ckeditor/ckeditor/lang/ko.js
diff --git a/public/includes/ckeditor/ckeditor/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/lang/ku.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/ku.js
rename to htdocs/includes/ckeditor/ckeditor/lang/ku.js
diff --git a/public/includes/ckeditor/ckeditor/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/lang/lt.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/lt.js
rename to htdocs/includes/ckeditor/ckeditor/lang/lt.js
diff --git a/public/includes/ckeditor/ckeditor/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/lang/lv.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/lv.js
rename to htdocs/includes/ckeditor/ckeditor/lang/lv.js
diff --git a/public/includes/ckeditor/ckeditor/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/lang/mk.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/mk.js
rename to htdocs/includes/ckeditor/ckeditor/lang/mk.js
diff --git a/public/includes/ckeditor/ckeditor/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/lang/mn.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/mn.js
rename to htdocs/includes/ckeditor/ckeditor/lang/mn.js
diff --git a/public/includes/ckeditor/ckeditor/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/lang/ms.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/ms.js
rename to htdocs/includes/ckeditor/ckeditor/lang/ms.js
diff --git a/public/includes/ckeditor/ckeditor/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/lang/nb.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/nb.js
rename to htdocs/includes/ckeditor/ckeditor/lang/nb.js
diff --git a/public/includes/ckeditor/ckeditor/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/lang/nl.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/nl.js
rename to htdocs/includes/ckeditor/ckeditor/lang/nl.js
diff --git a/public/includes/ckeditor/ckeditor/lang/no.js b/htdocs/includes/ckeditor/ckeditor/lang/no.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/no.js
rename to htdocs/includes/ckeditor/ckeditor/lang/no.js
diff --git a/public/includes/ckeditor/ckeditor/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/lang/pl.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/pl.js
rename to htdocs/includes/ckeditor/ckeditor/lang/pl.js
diff --git a/public/includes/ckeditor/ckeditor/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/lang/pt-br.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/pt-br.js
rename to htdocs/includes/ckeditor/ckeditor/lang/pt-br.js
diff --git a/public/includes/ckeditor/ckeditor/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/lang/pt.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/pt.js
rename to htdocs/includes/ckeditor/ckeditor/lang/pt.js
diff --git a/public/includes/ckeditor/ckeditor/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/lang/ro.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/ro.js
rename to htdocs/includes/ckeditor/ckeditor/lang/ro.js
diff --git a/public/includes/ckeditor/ckeditor/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/lang/ru.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/ru.js
rename to htdocs/includes/ckeditor/ckeditor/lang/ru.js
diff --git a/public/includes/ckeditor/ckeditor/lang/si.js b/htdocs/includes/ckeditor/ckeditor/lang/si.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/si.js
rename to htdocs/includes/ckeditor/ckeditor/lang/si.js
diff --git a/public/includes/ckeditor/ckeditor/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/lang/sk.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/sk.js
rename to htdocs/includes/ckeditor/ckeditor/lang/sk.js
diff --git a/public/includes/ckeditor/ckeditor/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/lang/sl.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/sl.js
rename to htdocs/includes/ckeditor/ckeditor/lang/sl.js
diff --git a/public/includes/ckeditor/ckeditor/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/lang/sq.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/sq.js
rename to htdocs/includes/ckeditor/ckeditor/lang/sq.js
diff --git a/public/includes/ckeditor/ckeditor/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/lang/sr-latn.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/sr-latn.js
rename to htdocs/includes/ckeditor/ckeditor/lang/sr-latn.js
diff --git a/public/includes/ckeditor/ckeditor/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/lang/sr.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/sr.js
rename to htdocs/includes/ckeditor/ckeditor/lang/sr.js
diff --git a/public/includes/ckeditor/ckeditor/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/lang/sv.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/sv.js
rename to htdocs/includes/ckeditor/ckeditor/lang/sv.js
diff --git a/public/includes/ckeditor/ckeditor/lang/th.js b/htdocs/includes/ckeditor/ckeditor/lang/th.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/th.js
rename to htdocs/includes/ckeditor/ckeditor/lang/th.js
diff --git a/public/includes/ckeditor/ckeditor/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/lang/tr.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/tr.js
rename to htdocs/includes/ckeditor/ckeditor/lang/tr.js
diff --git a/public/includes/ckeditor/ckeditor/lang/tt.js b/htdocs/includes/ckeditor/ckeditor/lang/tt.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/tt.js
rename to htdocs/includes/ckeditor/ckeditor/lang/tt.js
diff --git a/public/includes/ckeditor/ckeditor/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/lang/ug.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/ug.js
rename to htdocs/includes/ckeditor/ckeditor/lang/ug.js
diff --git a/public/includes/ckeditor/ckeditor/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/lang/uk.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/uk.js
rename to htdocs/includes/ckeditor/ckeditor/lang/uk.js
diff --git a/public/includes/ckeditor/ckeditor/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/lang/vi.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/vi.js
rename to htdocs/includes/ckeditor/ckeditor/lang/vi.js
diff --git a/public/includes/ckeditor/ckeditor/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/lang/zh-cn.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/zh-cn.js
rename to htdocs/includes/ckeditor/ckeditor/lang/zh-cn.js
diff --git a/public/includes/ckeditor/ckeditor/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/lang/zh.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/lang/zh.js
rename to htdocs/includes/ckeditor/ckeditor/lang/zh.js
diff --git a/public/includes/ckeditor/ckeditor/package.json b/htdocs/includes/ckeditor/ckeditor/package.json
similarity index 100%
rename from public/includes/ckeditor/ckeditor/package.json
rename to htdocs/includes/ckeditor/ckeditor/package.json
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js b/htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png b/htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/about/dialogs/logo_ckeditor.png b/htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/logo_ckeditor.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/about/dialogs/logo_ckeditor.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/logo_ckeditor.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js b/htdocs/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css b/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css
rename to htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css
diff --git a/public/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js b/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js b/htdocs/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/div/dialogs/div.js b/htdocs/includes/ckeditor/ckeditor/plugins/div/dialogs/div.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/div/dialogs/div.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/div/dialogs/div.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js b/htdocs/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/flash/dialogs/flash.js b/htdocs/includes/ckeditor/ckeditor/plugins/flash/dialogs/flash.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/flash/dialogs/flash.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/flash/dialogs/flash.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/flash/images/placeholder.png b/htdocs/includes/ckeditor/ckeditor/plugins/flash/images/placeholder.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/flash/images/placeholder.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/flash/images/placeholder.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/forms/images/hiddenfield.gif b/htdocs/includes/ckeditor/ckeditor/plugins/forms/images/hiddenfield.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/forms/images/hiddenfield.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/forms/images/hiddenfield.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/icons.png b/htdocs/includes/ckeditor/ckeditor/plugins/icons.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/icons.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/icons.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/icons_hidpi.png b/htdocs/includes/ckeditor/ckeditor/plugins/icons_hidpi.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/icons_hidpi.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/icons_hidpi.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js b/htdocs/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/iframe/images/placeholder.png b/htdocs/includes/ckeditor/ckeditor/plugins/iframe/images/placeholder.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/iframe/images/placeholder.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/iframe/images/placeholder.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js b/htdocs/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/image/images/noimage.png b/htdocs/includes/ckeditor/ckeditor/plugins/image/images/noimage.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/image/images/noimage.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/image/images/noimage.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js b/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js b/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/link/images/anchor.png b/htdocs/includes/ckeditor/ckeditor/plugins/link/images/anchor.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/link/images/anchor.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/link/images/anchor.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/link/images/hidpi/anchor.png b/htdocs/includes/ckeditor/ckeditor/plugins/link/images/hidpi/anchor.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/link/images/hidpi/anchor.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/link/images/hidpi/anchor.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js b/htdocs/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png b/htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon.png b/htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/magicline/images/icon-rtl.png b/htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/icon-rtl.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/magicline/images/icon-rtl.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/icon-rtl.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/magicline/images/icon.png b/htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/icon.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/magicline/images/icon.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/icon.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/pagebreak/images/pagebreak.gif b/htdocs/includes/ckeditor/ckeditor/plugins/pagebreak/images/pagebreak.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/pagebreak/images/pagebreak.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/pagebreak/images/pagebreak.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js b/htdocs/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/preview/preview.html b/htdocs/includes/ckeditor/ckeditor/plugins/preview/preview.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/preview/preview.html
rename to htdocs/includes/ckeditor/ckeditor/plugins/preview/preview.html
diff --git a/public/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md
rename to htdocs/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md
diff --git a/public/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md
rename to htdocs/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md
diff --git a/public/includes/ckeditor/ckeditor/plugins/scayt/README.md b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/README.md
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/scayt/README.md
rename to htdocs/includes/ckeditor/ckeditor/plugins/scayt/README.md
diff --git a/public/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/scayt/dialogs/toolbar.css b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/toolbar.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/scayt/dialogs/toolbar.css
rename to htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/toolbar.css
diff --git a/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_address.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_address.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_address.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_address.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_blockquote.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_blockquote.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_blockquote.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_blockquote.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_div.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_div.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_div.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_div.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h1.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h1.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h1.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h1.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h2.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h2.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h2.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h2.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h3.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h3.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h3.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h3.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h4.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h4.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h4.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h4.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h5.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h5.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h5.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h5.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h6.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h6.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h6.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h6.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_p.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_p.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_p.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_p.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_pre.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_pre.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/showblocks/images/block_pre.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_pre.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/devil_smile.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/embaressed_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/embaressed_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/embaressed_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/embaressed_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/heart.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/heart.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/heart.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/heart.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/heart.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/heart.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/heart.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/heart.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/sad_smile.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/tounge_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tounge_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/tounge_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tounge_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.png
rename to htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.png
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js b/htdocs/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js b/htdocs/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css b/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css
rename to htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css
diff --git a/public/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js b/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/templates/templates/default.js b/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/templates/templates/images/template1.gif b/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template1.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/templates/templates/images/template1.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template1.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/templates/templates/images/template2.gif b/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template2.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/templates/templates/images/template2.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template2.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/templates/templates/images/template3.gif b/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template3.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/templates/templates/images/template3.gif
rename to htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template3.gif
diff --git a/public/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md
rename to htdocs/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md
diff --git a/public/includes/ckeditor/ckeditor/plugins/wsc/README.md b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/README.md
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/wsc/README.md
rename to htdocs/includes/ckeditor/ckeditor/plugins/wsc/README.md
diff --git a/public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html
rename to htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html
diff --git a/public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmpFrameset.html b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
rename to htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
diff --git a/public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css
rename to htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css
diff --git a/public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js
diff --git a/public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc_ie.js b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc_ie.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc_ie.js
rename to htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc_ie.js
diff --git a/public/includes/ckeditor/ckeditor/samples/css/samples.css b/htdocs/includes/ckeditor/ckeditor/samples/css/samples.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/css/samples.css
rename to htdocs/includes/ckeditor/ckeditor/samples/css/samples.css
diff --git a/public/includes/ckeditor/ckeditor/samples/img/github-top.png b/htdocs/includes/ckeditor/ckeditor/samples/img/github-top.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/img/github-top.png
rename to htdocs/includes/ckeditor/ckeditor/samples/img/github-top.png
diff --git a/public/includes/ckeditor/ckeditor/samples/img/header-bg.png b/htdocs/includes/ckeditor/ckeditor/samples/img/header-bg.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/img/header-bg.png
rename to htdocs/includes/ckeditor/ckeditor/samples/img/header-bg.png
diff --git a/public/includes/ckeditor/ckeditor/samples/img/header-separator.png b/htdocs/includes/ckeditor/ckeditor/samples/img/header-separator.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/img/header-separator.png
rename to htdocs/includes/ckeditor/ckeditor/samples/img/header-separator.png
diff --git a/public/includes/ckeditor/ckeditor/samples/img/logo.png b/htdocs/includes/ckeditor/ckeditor/samples/img/logo.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/img/logo.png
rename to htdocs/includes/ckeditor/ckeditor/samples/img/logo.png
diff --git a/public/includes/ckeditor/ckeditor/samples/img/navigation-tip.png b/htdocs/includes/ckeditor/ckeditor/samples/img/navigation-tip.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/img/navigation-tip.png
rename to htdocs/includes/ckeditor/ckeditor/samples/img/navigation-tip.png
diff --git a/public/includes/ckeditor/ckeditor/samples/index.html b/htdocs/includes/ckeditor/ckeditor/samples/index.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/index.html
rename to htdocs/includes/ckeditor/ckeditor/samples/index.html
diff --git a/public/includes/ckeditor/ckeditor/samples/js/sample.js b/htdocs/includes/ckeditor/ckeditor/samples/js/sample.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/js/sample.js
rename to htdocs/includes/ckeditor/ckeditor/samples/js/sample.js
diff --git a/public/includes/ckeditor/ckeditor/samples/js/sf.js b/htdocs/includes/ckeditor/ckeditor/samples/js/sf.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/js/sf.js
rename to htdocs/includes/ckeditor/ckeditor/samples/js/sf.js
diff --git a/public/includes/ckeditor/ckeditor/samples/old/ajax.html b/htdocs/includes/ckeditor/ckeditor/samples/old/ajax.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/ajax.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/ajax.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/api.html b/htdocs/includes/ckeditor/ckeditor/samples/old/api.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/api.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/api.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/appendto.html b/htdocs/includes/ckeditor/ckeditor/samples/old/appendto.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/appendto.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/appendto.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/assets/inlineall/logo.png b/htdocs/includes/ckeditor/ckeditor/samples/old/assets/inlineall/logo.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/assets/inlineall/logo.png
rename to htdocs/includes/ckeditor/ckeditor/samples/old/assets/inlineall/logo.png
diff --git a/public/includes/ckeditor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css b/htdocs/includes/ckeditor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
rename to htdocs/includes/ckeditor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
diff --git a/public/includes/ckeditor/ckeditor/samples/old/assets/posteddata.php b/htdocs/includes/ckeditor/ckeditor/samples/old/assets/posteddata.php
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/assets/posteddata.php
rename to htdocs/includes/ckeditor/ckeditor/samples/old/assets/posteddata.php
diff --git a/public/includes/ckeditor/ckeditor/samples/old/assets/sample.jpg b/htdocs/includes/ckeditor/ckeditor/samples/old/assets/sample.jpg
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/assets/sample.jpg
rename to htdocs/includes/ckeditor/ckeditor/samples/old/assets/sample.jpg
diff --git a/public/includes/ckeditor/ckeditor/samples/old/assets/uilanguages/languages.js b/htdocs/includes/ckeditor/ckeditor/samples/old/assets/uilanguages/languages.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/assets/uilanguages/languages.js
rename to htdocs/includes/ckeditor/ckeditor/samples/old/assets/uilanguages/languages.js
diff --git a/public/includes/ckeditor/ckeditor/samples/old/datafiltering.html b/htdocs/includes/ckeditor/ckeditor/samples/old/datafiltering.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/datafiltering.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/datafiltering.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/dialog/assets/my_dialog.js b/htdocs/includes/ckeditor/ckeditor/samples/old/dialog/assets/my_dialog.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/dialog/assets/my_dialog.js
rename to htdocs/includes/ckeditor/ckeditor/samples/old/dialog/assets/my_dialog.js
diff --git a/public/includes/ckeditor/ckeditor/samples/old/dialog/dialog.html b/htdocs/includes/ckeditor/ckeditor/samples/old/dialog/dialog.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/dialog/dialog.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/dialog/dialog.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/divreplace.html b/htdocs/includes/ckeditor/ckeditor/samples/old/divreplace.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/divreplace.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/divreplace.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/enterkey/enterkey.html b/htdocs/includes/ckeditor/ckeditor/samples/old/enterkey/enterkey.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/enterkey/enterkey.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/enterkey/enterkey.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla b/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla
rename to htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla
diff --git a/public/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf b/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf
rename to htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf
diff --git a/public/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js b/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js
rename to htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js
diff --git a/public/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputforflash.html b/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputforflash.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputforflash.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputforflash.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputhtml.html b/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputhtml.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputhtml.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputhtml.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/index.html b/htdocs/includes/ckeditor/ckeditor/samples/old/index.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/index.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/index.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/inlineall.html b/htdocs/includes/ckeditor/ckeditor/samples/old/inlineall.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/inlineall.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/inlineall.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/inlinebycode.html b/htdocs/includes/ckeditor/ckeditor/samples/old/inlinebycode.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/inlinebycode.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/inlinebycode.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/inlinetextarea.html b/htdocs/includes/ckeditor/ckeditor/samples/old/inlinetextarea.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/inlinetextarea.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/inlinetextarea.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/jquery.html b/htdocs/includes/ckeditor/ckeditor/samples/old/jquery.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/jquery.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/jquery.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/magicline/magicline.html b/htdocs/includes/ckeditor/ckeditor/samples/old/magicline/magicline.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/magicline/magicline.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/magicline/magicline.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/readonly.html b/htdocs/includes/ckeditor/ckeditor/samples/old/readonly.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/readonly.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/readonly.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/replacebyclass.html b/htdocs/includes/ckeditor/ckeditor/samples/old/replacebyclass.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/replacebyclass.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/replacebyclass.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/replacebycode.html b/htdocs/includes/ckeditor/ckeditor/samples/old/replacebycode.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/replacebycode.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/replacebycode.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/sample.css b/htdocs/includes/ckeditor/ckeditor/samples/old/sample.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/sample.css
rename to htdocs/includes/ckeditor/ckeditor/samples/old/sample.css
diff --git a/public/includes/ckeditor/ckeditor/samples/old/sample.js b/htdocs/includes/ckeditor/ckeditor/samples/old/sample.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/sample.js
rename to htdocs/includes/ckeditor/ckeditor/samples/old/sample.js
diff --git a/public/includes/ckeditor/ckeditor/samples/old/sample_posteddata.php b/htdocs/includes/ckeditor/ckeditor/samples/old/sample_posteddata.php
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/sample_posteddata.php
rename to htdocs/includes/ckeditor/ckeditor/samples/old/sample_posteddata.php
diff --git a/public/includes/ckeditor/ckeditor/samples/old/tabindex.html b/htdocs/includes/ckeditor/ckeditor/samples/old/tabindex.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/tabindex.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/tabindex.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/toolbar/toolbar.html b/htdocs/includes/ckeditor/ckeditor/samples/old/toolbar/toolbar.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/toolbar/toolbar.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/toolbar/toolbar.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/uicolor.html b/htdocs/includes/ckeditor/ckeditor/samples/old/uicolor.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/uicolor.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/uicolor.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/uilanguages.html b/htdocs/includes/ckeditor/ckeditor/samples/old/uilanguages.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/uilanguages.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/uilanguages.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html b/htdocs/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html
diff --git a/public/includes/ckeditor/ckeditor/samples/old/xhtmlstyle.html b/htdocs/includes/ckeditor/ckeditor/samples/old/xhtmlstyle.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/old/xhtmlstyle.html
rename to htdocs/includes/ckeditor/ckeditor/samples/old/xhtmlstyle.html
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/css/fontello.css b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/css/fontello.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/css/fontello.css
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/css/fontello.css
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/config.json b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/config.json
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/config.json
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/config.json
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.eot b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.eot
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.eot
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.eot
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.svg b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.svg
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.svg
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.svg
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.ttf b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.woff b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.woff
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.woff
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.woff
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
diff --git a/public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
rename to htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/dialog.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/dialog.css
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/dialog.css
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/editor.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/editor.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/editor.css
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/editor.css
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/editor_ie.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/editor_ie.css
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie.css
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/icons.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/icons.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/icons.png
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/icons.png
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/icons_hidpi.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/icons_hidpi.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/icons_hidpi.png
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/icons_hidpi.png
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/images/arrow.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/arrow.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/images/arrow.png
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/images/arrow.png
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/images/close.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/close.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/images/close.png
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/images/close.png
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/close.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/close.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/close.png
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/close.png
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.png
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.png
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/images/lock-open.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/lock-open.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/images/lock-open.png
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/images/lock-open.png
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/images/lock.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/lock.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/images/lock.png
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/images/lock.png
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/images/refresh.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/refresh.png
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/images/refresh.png
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/images/refresh.png
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/images/spinner.gif b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/spinner.gif
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/images/spinner.gif
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/images/spinner.gif
diff --git a/public/includes/ckeditor/ckeditor/skins/moono/readme.md b/htdocs/includes/ckeditor/ckeditor/skins/moono/readme.md
similarity index 100%
rename from public/includes/ckeditor/ckeditor/skins/moono/readme.md
rename to htdocs/includes/ckeditor/ckeditor/skins/moono/readme.md
diff --git a/public/includes/ckeditor/ckeditor/styles.js b/htdocs/includes/ckeditor/ckeditor/styles.js
similarity index 100%
rename from public/includes/ckeditor/ckeditor/styles.js
rename to htdocs/includes/ckeditor/ckeditor/styles.js
diff --git a/public/includes/evalmath/README.md b/htdocs/includes/evalmath/README.md
similarity index 100%
rename from public/includes/evalmath/README.md
rename to htdocs/includes/evalmath/README.md
diff --git a/public/includes/evalmath/evalmath.class.php b/htdocs/includes/evalmath/evalmath.class.php
similarity index 100%
rename from public/includes/evalmath/evalmath.class.php
rename to htdocs/includes/evalmath/evalmath.class.php
diff --git a/public/includes/fonts/Aerial.ttf b/htdocs/includes/fonts/Aerial.ttf
similarity index 100%
rename from public/includes/fonts/Aerial.ttf
rename to htdocs/includes/fonts/Aerial.ttf
diff --git a/public/includes/fonts/AerialBd.ttf b/htdocs/includes/fonts/AerialBd.ttf
similarity index 100%
rename from public/includes/fonts/AerialBd.ttf
rename to htdocs/includes/fonts/AerialBd.ttf
diff --git a/public/includes/fonts/AerialBdIt.ttf b/htdocs/includes/fonts/AerialBdIt.ttf
similarity index 100%
rename from public/includes/fonts/AerialBdIt.ttf
rename to htdocs/includes/fonts/AerialBdIt.ttf
diff --git a/public/includes/fonts/AerialIt.ttf b/htdocs/includes/fonts/AerialIt.ttf
similarity index 100%
rename from public/includes/fonts/AerialIt.ttf
rename to htdocs/includes/fonts/AerialIt.ttf
diff --git a/public/includes/fonts/CHANGELOG.TXT b/htdocs/includes/fonts/CHANGELOG.TXT
similarity index 100%
rename from public/includes/fonts/CHANGELOG.TXT
rename to htdocs/includes/fonts/CHANGELOG.TXT
diff --git a/public/includes/fonts/COPYRIGHT.TXT b/htdocs/includes/fonts/COPYRIGHT.TXT
similarity index 100%
rename from public/includes/fonts/COPYRIGHT.TXT
rename to htdocs/includes/fonts/COPYRIGHT.TXT
diff --git a/public/includes/fpdfi/README.txt b/htdocs/includes/fpdfi/README.txt
similarity index 100%
rename from public/includes/fpdfi/README.txt
rename to htdocs/includes/fpdfi/README.txt
diff --git a/public/includes/fpdfi/filters/FilterASCII85.php b/htdocs/includes/fpdfi/filters/FilterASCII85.php
similarity index 100%
rename from public/includes/fpdfi/filters/FilterASCII85.php
rename to htdocs/includes/fpdfi/filters/FilterASCII85.php
diff --git a/public/includes/fpdfi/filters/FilterASCII85_FPDI.php b/htdocs/includes/fpdfi/filters/FilterASCII85_FPDI.php
similarity index 100%
rename from public/includes/fpdfi/filters/FilterASCII85_FPDI.php
rename to htdocs/includes/fpdfi/filters/FilterASCII85_FPDI.php
diff --git a/public/includes/fpdfi/filters/FilterASCIIHexDecode.php b/htdocs/includes/fpdfi/filters/FilterASCIIHexDecode.php
similarity index 100%
rename from public/includes/fpdfi/filters/FilterASCIIHexDecode.php
rename to htdocs/includes/fpdfi/filters/FilterASCIIHexDecode.php
diff --git a/public/includes/fpdfi/filters/FilterLZW.php b/htdocs/includes/fpdfi/filters/FilterLZW.php
similarity index 100%
rename from public/includes/fpdfi/filters/FilterLZW.php
rename to htdocs/includes/fpdfi/filters/FilterLZW.php
diff --git a/public/includes/fpdfi/filters/FilterLZW_FPDI.php b/htdocs/includes/fpdfi/filters/FilterLZW_FPDI.php
similarity index 100%
rename from public/includes/fpdfi/filters/FilterLZW_FPDI.php
rename to htdocs/includes/fpdfi/filters/FilterLZW_FPDI.php
diff --git a/public/includes/fpdfi/fpdf_tpl.php b/htdocs/includes/fpdfi/fpdf_tpl.php
similarity index 100%
rename from public/includes/fpdfi/fpdf_tpl.php
rename to htdocs/includes/fpdfi/fpdf_tpl.php
diff --git a/public/includes/fpdfi/fpdi.php b/htdocs/includes/fpdfi/fpdi.php
similarity index 100%
rename from public/includes/fpdfi/fpdi.php
rename to htdocs/includes/fpdfi/fpdi.php
diff --git a/public/includes/fpdfi/fpdi_bridge.php b/htdocs/includes/fpdfi/fpdi_bridge.php
similarity index 100%
rename from public/includes/fpdfi/fpdi_bridge.php
rename to htdocs/includes/fpdfi/fpdi_bridge.php
diff --git a/public/includes/fpdfi/fpdi_pdf_parser.php b/htdocs/includes/fpdfi/fpdi_pdf_parser.php
similarity index 100%
rename from public/includes/fpdfi/fpdi_pdf_parser.php
rename to htdocs/includes/fpdfi/fpdi_pdf_parser.php
diff --git a/public/includes/fpdfi/pdf_context.php b/htdocs/includes/fpdfi/pdf_context.php
similarity index 100%
rename from public/includes/fpdfi/pdf_context.php
rename to htdocs/includes/fpdfi/pdf_context.php
diff --git a/public/includes/fpdfi/pdf_parser.php b/htdocs/includes/fpdfi/pdf_parser.php
similarity index 100%
rename from public/includes/fpdfi/pdf_parser.php
rename to htdocs/includes/fpdfi/pdf_parser.php
diff --git a/public/includes/geoip/README.txt b/htdocs/includes/geoip/README.txt
similarity index 100%
rename from public/includes/geoip/README.txt
rename to htdocs/includes/geoip/README.txt
diff --git a/public/includes/geoip/geoip.inc b/htdocs/includes/geoip/geoip.inc
similarity index 100%
rename from public/includes/geoip/geoip.inc
rename to htdocs/includes/geoip/geoip.inc
diff --git a/public/includes/geoip/geoipcity.inc b/htdocs/includes/geoip/geoipcity.inc
similarity index 100%
rename from public/includes/geoip/geoipcity.inc
rename to htdocs/includes/geoip/geoipcity.inc
diff --git a/public/includes/geoip/geoipregionvars.php b/htdocs/includes/geoip/geoipregionvars.php
similarity index 100%
rename from public/includes/geoip/geoipregionvars.php
rename to htdocs/includes/geoip/geoipregionvars.php
diff --git a/public/includes/geoip/sample.php b/htdocs/includes/geoip/sample.php
similarity index 100%
rename from public/includes/geoip/sample.php
rename to htdocs/includes/geoip/sample.php
diff --git a/public/includes/geoip/sample_city.php b/htdocs/includes/geoip/sample_city.php
similarity index 100%
rename from public/includes/geoip/sample_city.php
rename to htdocs/includes/geoip/sample_city.php
diff --git a/public/includes/geoip/sample_distributed.php b/htdocs/includes/geoip/sample_distributed.php
similarity index 100%
rename from public/includes/geoip/sample_distributed.php
rename to htdocs/includes/geoip/sample_distributed.php
diff --git a/public/includes/geoip/sample_netspeed.php b/htdocs/includes/geoip/sample_netspeed.php
similarity index 100%
rename from public/includes/geoip/sample_netspeed.php
rename to htdocs/includes/geoip/sample_netspeed.php
diff --git a/public/includes/geoip/sample_org.php b/htdocs/includes/geoip/sample_org.php
similarity index 100%
rename from public/includes/geoip/sample_org.php
rename to htdocs/includes/geoip/sample_org.php
diff --git a/public/includes/geoip/sample_region.php b/htdocs/includes/geoip/sample_region.php
similarity index 100%
rename from public/includes/geoip/sample_region.php
rename to htdocs/includes/geoip/sample_region.php
diff --git a/public/includes/index.html b/htdocs/includes/index.html
similarity index 100%
rename from public/includes/index.html
rename to htdocs/includes/index.html
diff --git a/public/includes/jquery/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png b/htdocs/includes/jquery/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to htdocs/includes/jquery/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/public/includes/jquery/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png b/htdocs/includes/jquery/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png
rename to htdocs/includes/jquery/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png
diff --git a/public/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png b/htdocs/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
rename to htdocs/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
diff --git a/public/includes/jquery/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png b/htdocs/includes/jquery/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
rename to htdocs/includes/jquery/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
diff --git a/public/includes/jquery/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png b/htdocs/includes/jquery/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
rename to htdocs/includes/jquery/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/public/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/htdocs/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
rename to htdocs/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
diff --git a/public/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/htdocs/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
rename to htdocs/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
diff --git a/public/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/htdocs/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
rename to htdocs/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
diff --git a/public/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png b/htdocs/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png
rename to htdocs/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png
diff --git a/public/includes/jquery/css/redmond/images/ui-icons_2e83ff_256x240.png b/htdocs/includes/jquery/css/redmond/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-icons_2e83ff_256x240.png
rename to htdocs/includes/jquery/css/redmond/images/ui-icons_2e83ff_256x240.png
diff --git a/public/includes/jquery/css/redmond/images/ui-icons_469bdd_256x240.png b/htdocs/includes/jquery/css/redmond/images/ui-icons_469bdd_256x240.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-icons_469bdd_256x240.png
rename to htdocs/includes/jquery/css/redmond/images/ui-icons_469bdd_256x240.png
diff --git a/public/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png b/htdocs/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png
rename to htdocs/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png
diff --git a/public/includes/jquery/css/redmond/images/ui-icons_cd0a0a_256x240.png b/htdocs/includes/jquery/css/redmond/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-icons_cd0a0a_256x240.png
rename to htdocs/includes/jquery/css/redmond/images/ui-icons_cd0a0a_256x240.png
diff --git a/public/includes/jquery/css/redmond/images/ui-icons_d8e7f3_256x240.png b/htdocs/includes/jquery/css/redmond/images/ui-icons_d8e7f3_256x240.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-icons_d8e7f3_256x240.png
rename to htdocs/includes/jquery/css/redmond/images/ui-icons_d8e7f3_256x240.png
diff --git a/public/includes/jquery/css/redmond/images/ui-icons_f9bd01_256x240.png b/htdocs/includes/jquery/css/redmond/images/ui-icons_f9bd01_256x240.png
similarity index 100%
rename from public/includes/jquery/css/redmond/images/ui-icons_f9bd01_256x240.png
rename to htdocs/includes/jquery/css/redmond/images/ui-icons_f9bd01_256x240.png
diff --git a/public/includes/jquery/css/redmond/jquery-ui.css b/htdocs/includes/jquery/css/redmond/jquery-ui.css
similarity index 100%
rename from public/includes/jquery/css/redmond/jquery-ui.css
rename to htdocs/includes/jquery/css/redmond/jquery-ui.css
diff --git a/public/includes/jquery/css/redmond/jquery-ui.min.css b/htdocs/includes/jquery/css/redmond/jquery-ui.min.css
similarity index 100%
rename from public/includes/jquery/css/redmond/jquery-ui.min.css
rename to htdocs/includes/jquery/css/redmond/jquery-ui.min.css
diff --git a/public/includes/jquery/css/redmond/theme.css b/htdocs/includes/jquery/css/redmond/theme.css
similarity index 100%
rename from public/includes/jquery/css/redmond/theme.css
rename to htdocs/includes/jquery/css/redmond/theme.css
diff --git a/public/includes/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/htdocs/includes/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from public/includes/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to htdocs/includes/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/public/includes/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/htdocs/includes/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from public/includes/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
rename to htdocs/includes/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/public/includes/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from public/includes/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/public/includes/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from public/includes/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
rename to htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/public/includes/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from public/includes/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
rename to htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/public/includes/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from public/includes/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/public/includes/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from public/includes/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
rename to htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/public/includes/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/htdocs/includes/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from public/includes/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to htdocs/includes/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/public/includes/jquery/css/smoothness/images/ui-icons_222222_256x240.png b/htdocs/includes/jquery/css/smoothness/images/ui-icons_222222_256x240.png
similarity index 100%
rename from public/includes/jquery/css/smoothness/images/ui-icons_222222_256x240.png
rename to htdocs/includes/jquery/css/smoothness/images/ui-icons_222222_256x240.png
diff --git a/public/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png b/htdocs/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from public/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
rename to htdocs/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
diff --git a/public/includes/jquery/css/smoothness/images/ui-icons_454545_256x240.png b/htdocs/includes/jquery/css/smoothness/images/ui-icons_454545_256x240.png
similarity index 100%
rename from public/includes/jquery/css/smoothness/images/ui-icons_454545_256x240.png
rename to htdocs/includes/jquery/css/smoothness/images/ui-icons_454545_256x240.png
diff --git a/public/includes/jquery/css/smoothness/images/ui-icons_888888_256x240.png b/htdocs/includes/jquery/css/smoothness/images/ui-icons_888888_256x240.png
similarity index 100%
rename from public/includes/jquery/css/smoothness/images/ui-icons_888888_256x240.png
rename to htdocs/includes/jquery/css/smoothness/images/ui-icons_888888_256x240.png
diff --git a/public/includes/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png b/htdocs/includes/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from public/includes/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
rename to htdocs/includes/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
diff --git a/public/includes/jquery/css/smoothness/jquery-ui.css b/htdocs/includes/jquery/css/smoothness/jquery-ui.css
similarity index 100%
rename from public/includes/jquery/css/smoothness/jquery-ui.css
rename to htdocs/includes/jquery/css/smoothness/jquery-ui.css
diff --git a/public/includes/jquery/css/smoothness/jquery-ui.min.css b/htdocs/includes/jquery/css/smoothness/jquery-ui.min.css
similarity index 100%
rename from public/includes/jquery/css/smoothness/jquery-ui.min.css
rename to htdocs/includes/jquery/css/smoothness/jquery-ui.min.css
diff --git a/public/includes/jquery/css/smoothness/theme.css b/htdocs/includes/jquery/css/smoothness/theme.css
similarity index 100%
rename from public/includes/jquery/css/smoothness/theme.css
rename to htdocs/includes/jquery/css/smoothness/theme.css
diff --git a/public/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
rename to htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/public/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
rename to htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
diff --git a/public/includes/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
rename to htdocs/includes/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
diff --git a/public/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
rename to htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
diff --git a/public/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
rename to htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
diff --git a/public/includes/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
rename to htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/public/includes/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
rename to htdocs/includes/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
diff --git a/public/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
rename to htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
diff --git a/public/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
rename to htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
diff --git a/public/includes/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png
rename to htdocs/includes/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png
diff --git a/public/includes/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png
rename to htdocs/includes/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png
diff --git a/public/includes/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
rename to htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
diff --git a/public/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
rename to htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
diff --git a/public/includes/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png b/htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png
rename to htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png
diff --git a/public/includes/jquery/css/ui-lightness/jquery-ui.css b/htdocs/includes/jquery/css/ui-lightness/jquery-ui.css
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/jquery-ui.css
rename to htdocs/includes/jquery/css/ui-lightness/jquery-ui.css
diff --git a/public/includes/jquery/css/ui-lightness/jquery-ui.min.css b/htdocs/includes/jquery/css/ui-lightness/jquery-ui.min.css
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/jquery-ui.min.css
rename to htdocs/includes/jquery/css/ui-lightness/jquery-ui.min.css
diff --git a/public/includes/jquery/css/ui-lightness/theme.css b/htdocs/includes/jquery/css/ui-lightness/theme.css
similarity index 100%
rename from public/includes/jquery/css/ui-lightness/theme.css
rename to htdocs/includes/jquery/css/ui-lightness/theme.css
diff --git a/public/includes/jquery/js/jquery-ui.js b/htdocs/includes/jquery/js/jquery-ui.js
similarity index 100%
rename from public/includes/jquery/js/jquery-ui.js
rename to htdocs/includes/jquery/js/jquery-ui.js
diff --git a/public/includes/jquery/js/jquery-ui.min.js b/htdocs/includes/jquery/js/jquery-ui.min.js
similarity index 100%
rename from public/includes/jquery/js/jquery-ui.min.js
rename to htdocs/includes/jquery/js/jquery-ui.min.js
diff --git a/public/includes/jquery/js/jquery.js b/htdocs/includes/jquery/js/jquery.js
similarity index 100%
rename from public/includes/jquery/js/jquery.js
rename to htdocs/includes/jquery/js/jquery.js
diff --git a/public/includes/jquery/js/jquery.min.js b/htdocs/includes/jquery/js/jquery.min.js
similarity index 100%
rename from public/includes/jquery/js/jquery.min.js
rename to htdocs/includes/jquery/js/jquery.min.js
diff --git a/public/includes/jquery/plugins/blockUI/jquery.blockUI.js b/htdocs/includes/jquery/plugins/blockUI/jquery.blockUI.js
similarity index 100%
rename from public/includes/jquery/plugins/blockUI/jquery.blockUI.js
rename to htdocs/includes/jquery/plugins/blockUI/jquery.blockUI.js
diff --git a/public/includes/jquery/plugins/colorpicker/jquery.colorpicker.css b/htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.css
similarity index 100%
rename from public/includes/jquery/plugins/colorpicker/jquery.colorpicker.css
rename to htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.css
diff --git a/public/includes/jquery/plugins/colorpicker/jquery.colorpicker.js b/htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.js
similarity index 100%
rename from public/includes/jquery/plugins/colorpicker/jquery.colorpicker.js
rename to htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.js
diff --git a/public/includes/jquery/plugins/fileupload/README.md b/htdocs/includes/jquery/plugins/fileupload/README.md
similarity index 100%
rename from public/includes/jquery/plugins/fileupload/README.md
rename to htdocs/includes/jquery/plugins/fileupload/README.md
diff --git a/public/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css b/htdocs/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css
similarity index 100%
rename from public/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css
rename to htdocs/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css
diff --git a/public/includes/jquery/plugins/fileupload/img/loading.gif b/htdocs/includes/jquery/plugins/fileupload/img/loading.gif
similarity index 100%
rename from public/includes/jquery/plugins/fileupload/img/loading.gif
rename to htdocs/includes/jquery/plugins/fileupload/img/loading.gif
diff --git a/public/includes/jquery/plugins/fileupload/img/progressbar.gif b/htdocs/includes/jquery/plugins/fileupload/img/progressbar.gif
similarity index 100%
rename from public/includes/jquery/plugins/fileupload/img/progressbar.gif
rename to htdocs/includes/jquery/plugins/fileupload/img/progressbar.gif
diff --git a/public/includes/jquery/plugins/fileupload/js/cors/jquery.postmessage-transport.js b/htdocs/includes/jquery/plugins/fileupload/js/cors/jquery.postmessage-transport.js
similarity index 100%
rename from public/includes/jquery/plugins/fileupload/js/cors/jquery.postmessage-transport.js
rename to htdocs/includes/jquery/plugins/fileupload/js/cors/jquery.postmessage-transport.js
diff --git a/public/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport.js b/htdocs/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport.js
similarity index 100%
rename from public/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport.js
rename to htdocs/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport.js
diff --git a/public/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp.js b/htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp.js
similarity index 100%
rename from public/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp.js
rename to htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp.js
diff --git a/public/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui.js b/htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui.js
similarity index 100%
rename from public/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui.js
rename to htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui.js
diff --git a/public/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js b/htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
similarity index 100%
rename from public/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
rename to htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
diff --git a/public/includes/jquery/plugins/fileupload/js/jquery.fileupload.js b/htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload.js
similarity index 100%
rename from public/includes/jquery/plugins/fileupload/js/jquery.fileupload.js
rename to htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload.js
diff --git a/public/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js b/htdocs/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js
similarity index 100%
rename from public/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js
rename to htdocs/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js
diff --git a/public/includes/jquery/plugins/fileupload/js/locale.js b/htdocs/includes/jquery/plugins/fileupload/js/locale.js
similarity index 100%
rename from public/includes/jquery/plugins/fileupload/js/locale.js
rename to htdocs/includes/jquery/plugins/fileupload/js/locale.js
diff --git a/public/includes/jquery/plugins/fileupload/js/main.js b/htdocs/includes/jquery/plugins/fileupload/js/main.js
similarity index 100%
rename from public/includes/jquery/plugins/fileupload/js/main.js
rename to htdocs/includes/jquery/plugins/fileupload/js/main.js
diff --git a/public/includes/jquery/plugins/fileupload/js/vendor/jquery.ui.widget.js b/htdocs/includes/jquery/plugins/fileupload/js/vendor/jquery.ui.widget.js
similarity index 100%
rename from public/includes/jquery/plugins/fileupload/js/vendor/jquery.ui.widget.js
rename to htdocs/includes/jquery/plugins/fileupload/js/vendor/jquery.ui.widget.js
diff --git a/public/includes/jquery/plugins/flot/API.md b/htdocs/includes/jquery/plugins/flot/API.md
similarity index 100%
rename from public/includes/jquery/plugins/flot/API.md
rename to htdocs/includes/jquery/plugins/flot/API.md
diff --git a/public/includes/jquery/plugins/flot/CONTRIBUTING.md b/htdocs/includes/jquery/plugins/flot/CONTRIBUTING.md
similarity index 100%
rename from public/includes/jquery/plugins/flot/CONTRIBUTING.md
rename to htdocs/includes/jquery/plugins/flot/CONTRIBUTING.md
diff --git a/public/includes/jquery/plugins/flot/FAQ.md b/htdocs/includes/jquery/plugins/flot/FAQ.md
similarity index 100%
rename from public/includes/jquery/plugins/flot/FAQ.md
rename to htdocs/includes/jquery/plugins/flot/FAQ.md
diff --git a/public/includes/jquery/plugins/flot/LICENSE.txt b/htdocs/includes/jquery/plugins/flot/LICENSE.txt
similarity index 100%
rename from public/includes/jquery/plugins/flot/LICENSE.txt
rename to htdocs/includes/jquery/plugins/flot/LICENSE.txt
diff --git a/public/includes/jquery/plugins/flot/Makefile b/htdocs/includes/jquery/plugins/flot/Makefile
similarity index 100%
rename from public/includes/jquery/plugins/flot/Makefile
rename to htdocs/includes/jquery/plugins/flot/Makefile
diff --git a/public/includes/jquery/plugins/flot/NEWS.md b/htdocs/includes/jquery/plugins/flot/NEWS.md
similarity index 100%
rename from public/includes/jquery/plugins/flot/NEWS.md
rename to htdocs/includes/jquery/plugins/flot/NEWS.md
diff --git a/public/includes/jquery/plugins/flot/PLUGINS.md b/htdocs/includes/jquery/plugins/flot/PLUGINS.md
similarity index 100%
rename from public/includes/jquery/plugins/flot/PLUGINS.md
rename to htdocs/includes/jquery/plugins/flot/PLUGINS.md
diff --git a/public/includes/jquery/plugins/flot/README.md b/htdocs/includes/jquery/plugins/flot/README.md
similarity index 100%
rename from public/includes/jquery/plugins/flot/README.md
rename to htdocs/includes/jquery/plugins/flot/README.md
diff --git a/public/includes/jquery/plugins/flot/excanvas.js b/htdocs/includes/jquery/plugins/flot/excanvas.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/excanvas.js
rename to htdocs/includes/jquery/plugins/flot/excanvas.js
diff --git a/public/includes/jquery/plugins/flot/excanvas.min.js b/htdocs/includes/jquery/plugins/flot/excanvas.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/excanvas.min.js
rename to htdocs/includes/jquery/plugins/flot/excanvas.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.colorhelpers.js b/htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.colorhelpers.js
rename to htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.js
diff --git a/public/includes/jquery/plugins/flot/jquery.colorhelpers.min.js b/htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.colorhelpers.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.canvas.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.canvas.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.canvas.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.canvas.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.canvas.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.canvas.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.canvas.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.canvas.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.categories.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.categories.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.categories.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.categories.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.categories.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.categories.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.categories.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.categories.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.crosshair.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.crosshair.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.crosshair.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.crosshair.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.errorbars.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.errorbars.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.errorbars.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.errorbars.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.errorbars.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.errorbars.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.errorbars.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.errorbars.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.fillbetween.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.fillbetween.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.fillbetween.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.fillbetween.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.image.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.image.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.image.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.image.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.image.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.image.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.image.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.image.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.navigate.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.navigate.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.navigate.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.navigate.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.pie.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.pie.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.pie.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.pie.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.pie.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.pie.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.pie.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.pie.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.resize.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.resize.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.resize.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.resize.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.resize.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.resize.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.resize.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.resize.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.selection.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.selection.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.selection.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.selection.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.selection.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.selection.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.selection.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.selection.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.stack.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.stack.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.stack.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.stack.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.stack.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.stack.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.stack.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.stack.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.symbol.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.symbol.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.symbol.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.symbol.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.threshold.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.threshold.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.threshold.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.threshold.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.min.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.time.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.time.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.time.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.time.js
diff --git a/public/includes/jquery/plugins/flot/jquery.flot.time.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.time.min.js
similarity index 100%
rename from public/includes/jquery/plugins/flot/jquery.flot.time.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.time.min.js
diff --git a/public/includes/jquery/plugins/jcrop/css/Jcrop.gif b/htdocs/includes/jquery/plugins/jcrop/css/Jcrop.gif
similarity index 100%
rename from public/includes/jquery/plugins/jcrop/css/Jcrop.gif
rename to htdocs/includes/jquery/plugins/jcrop/css/Jcrop.gif
diff --git a/public/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css b/htdocs/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css
similarity index 100%
rename from public/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css
rename to htdocs/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css
diff --git a/public/includes/jquery/plugins/jcrop/index.html b/htdocs/includes/jquery/plugins/jcrop/index.html
similarity index 100%
rename from public/includes/jquery/plugins/jcrop/index.html
rename to htdocs/includes/jquery/plugins/jcrop/index.html
diff --git a/public/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js b/htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
similarity index 100%
rename from public/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
rename to htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
diff --git a/public/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js b/htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
similarity index 100%
rename from public/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
rename to htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
diff --git a/public/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js b/htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js
similarity index 100%
rename from public/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js
rename to htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js
diff --git a/public/includes/jquery/plugins/jeditable/jquery.jeditable.js b/htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.js
similarity index 100%
rename from public/includes/jquery/plugins/jeditable/jquery.jeditable.js
rename to htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.js
diff --git a/public/includes/jquery/plugins/jeditable/jquery.jeditable.min.js b/htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.min.js
similarity index 100%
rename from public/includes/jquery/plugins/jeditable/jquery.jeditable.min.js
rename to htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.min.js
diff --git a/public/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js b/htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js
similarity index 100%
rename from public/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js
rename to htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js
diff --git a/public/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js b/htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js
similarity index 100%
rename from public/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js
rename to htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js
diff --git a/public/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css b/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css
similarity index 100%
rename from public/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css
rename to htdocs/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css
diff --git a/public/includes/jquery/plugins/jnotify/jquery.jnotify.css b/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.css
similarity index 100%
rename from public/includes/jquery/plugins/jnotify/jquery.jnotify.css
rename to htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.css
diff --git a/public/includes/jquery/plugins/jnotify/jquery.jnotify.js b/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.js
similarity index 100%
rename from public/includes/jquery/plugins/jnotify/jquery.jnotify.js
rename to htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.js
diff --git a/public/includes/jquery/plugins/jnotify/jquery.jnotify.min.css b/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.min.css
similarity index 100%
rename from public/includes/jquery/plugins/jnotify/jquery.jnotify.min.css
rename to htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.min.css
diff --git a/public/includes/jquery/plugins/jnotify/jquery.jnotify.min.js b/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.min.js
similarity index 100%
rename from public/includes/jquery/plugins/jnotify/jquery.jnotify.min.js
rename to htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.min.js
diff --git a/public/includes/jquery/plugins/jpicker/ChangeLog.txt b/htdocs/includes/jquery/plugins/jpicker/ChangeLog.txt
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/ChangeLog.txt
rename to htdocs/includes/jquery/plugins/jpicker/ChangeLog.txt
diff --git a/public/includes/jquery/plugins/jpicker/Example.html b/htdocs/includes/jquery/plugins/jpicker/Example.html
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/Example.html
rename to htdocs/includes/jquery/plugins/jpicker/Example.html
diff --git a/public/includes/jquery/plugins/jpicker/ReadMe.txt b/htdocs/includes/jquery/plugins/jpicker/ReadMe.txt
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/ReadMe.txt
rename to htdocs/includes/jquery/plugins/jpicker/ReadMe.txt
diff --git a/public/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css b/htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css
rename to htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css
diff --git a/public/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css b/htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css
rename to htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css
diff --git a/public/includes/jquery/plugins/jpicker/images/AlphaBar.png b/htdocs/includes/jquery/plugins/jpicker/images/AlphaBar.png
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/images/AlphaBar.png
rename to htdocs/includes/jquery/plugins/jpicker/images/AlphaBar.png
diff --git a/public/includes/jquery/plugins/jpicker/images/Bars.png b/htdocs/includes/jquery/plugins/jpicker/images/Bars.png
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/images/Bars.png
rename to htdocs/includes/jquery/plugins/jpicker/images/Bars.png
diff --git a/public/includes/jquery/plugins/jpicker/images/Maps.png b/htdocs/includes/jquery/plugins/jpicker/images/Maps.png
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/images/Maps.png
rename to htdocs/includes/jquery/plugins/jpicker/images/Maps.png
diff --git a/public/includes/jquery/plugins/jpicker/images/NoColor.png b/htdocs/includes/jquery/plugins/jpicker/images/NoColor.png
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/images/NoColor.png
rename to htdocs/includes/jquery/plugins/jpicker/images/NoColor.png
diff --git a/public/includes/jquery/plugins/jpicker/images/bar-opacity.png b/htdocs/includes/jquery/plugins/jpicker/images/bar-opacity.png
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/images/bar-opacity.png
rename to htdocs/includes/jquery/plugins/jpicker/images/bar-opacity.png
diff --git a/public/includes/jquery/plugins/jpicker/images/map-opacity.png b/htdocs/includes/jquery/plugins/jpicker/images/map-opacity.png
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/images/map-opacity.png
rename to htdocs/includes/jquery/plugins/jpicker/images/map-opacity.png
diff --git a/public/includes/jquery/plugins/jpicker/images/mappoint.gif b/htdocs/includes/jquery/plugins/jpicker/images/mappoint.gif
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/images/mappoint.gif
rename to htdocs/includes/jquery/plugins/jpicker/images/mappoint.gif
diff --git a/public/includes/jquery/plugins/jpicker/images/picker.gif b/htdocs/includes/jquery/plugins/jpicker/images/picker.gif
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/images/picker.gif
rename to htdocs/includes/jquery/plugins/jpicker/images/picker.gif
diff --git a/public/includes/jquery/plugins/jpicker/images/preview-opacity.png b/htdocs/includes/jquery/plugins/jpicker/images/preview-opacity.png
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/images/preview-opacity.png
rename to htdocs/includes/jquery/plugins/jpicker/images/preview-opacity.png
diff --git a/public/includes/jquery/plugins/jpicker/images/rangearrows.gif b/htdocs/includes/jquery/plugins/jpicker/images/rangearrows.gif
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/images/rangearrows.gif
rename to htdocs/includes/jquery/plugins/jpicker/images/rangearrows.gif
diff --git a/public/includes/jquery/plugins/jpicker/jPicker.css b/htdocs/includes/jquery/plugins/jpicker/jPicker.css
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/jPicker.css
rename to htdocs/includes/jquery/plugins/jpicker/jPicker.css
diff --git a/public/includes/jquery/plugins/jpicker/jpicker-1.1.6.js b/htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.js
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/jpicker-1.1.6.js
rename to htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.js
diff --git a/public/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js b/htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js
similarity index 100%
rename from public/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js
rename to htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/application.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/application.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/application.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/application.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/code.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/code.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/code.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/code.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/css.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/css.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/css.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/css.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/db.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/db.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/db.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/db.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/directory.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/directory.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/directory.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/directory.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/doc.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/doc.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/doc.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/doc.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/file.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/file.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/file.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/file.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/film.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/film.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/film.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/film.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/flash.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/flash.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/flash.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/flash.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/folder_open.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/folder_open.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/folder_open.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/folder_open.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/html.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/html.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/html.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/html.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/java.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/java.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/java.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/java.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/linux.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/linux.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/linux.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/linux.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/music.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/music.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/music.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/music.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/pdf.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/pdf.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/pdf.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/pdf.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/php.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/php.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/php.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/php.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/picture.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/picture.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/picture.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/picture.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/ppt.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/ppt.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/ppt.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/ppt.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/psd.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/psd.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/psd.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/psd.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/ruby.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/ruby.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/ruby.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/ruby.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/script.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/script.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/script.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/script.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/spinner.gif b/htdocs/includes/jquery/plugins/jqueryFileTree/images/spinner.gif
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/spinner.gif
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/spinner.gif
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/txt.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/txt.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/txt.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/txt.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/xls.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/xls.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/xls.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/xls.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/images/zip.png b/htdocs/includes/jquery/plugins/jqueryFileTree/images/zip.png
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/images/zip.png
rename to htdocs/includes/jquery/plugins/jqueryFileTree/images/zip.png
diff --git a/public/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css b/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css
rename to htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css
diff --git a/public/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js b/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
similarity index 100%
rename from public/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
rename to htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
diff --git a/public/includes/jquery/plugins/jquerytreeview/changelog.md b/htdocs/includes/jquery/plugins/jquerytreeview/changelog.md
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/changelog.md
rename to htdocs/includes/jquery/plugins/jquerytreeview/changelog.md
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/ajax-loader.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/ajax-loader.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/ajax-loader.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/ajax-loader.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/file.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/file.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/file.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/file.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/folder-closed.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/folder-closed.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/folder-closed.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/folder-closed.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/folder.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/folder.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/folder.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/folder.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/minus.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/minus.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/minus.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/minus.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/plus.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/plus.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/plus.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/plus.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/treeview-black-line.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-black-line.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/treeview-black-line.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-black-line.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/treeview-black.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-black.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/treeview-black.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-black.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/treeview-default-line.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-default-line.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/treeview-default-line.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-default-line.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/treeview-default.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-default.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/treeview-default.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-default.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam-line.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam-line.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam-line.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam-line.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/treeview-gray-line.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-gray-line.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/treeview-gray-line.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-gray-line.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/treeview-gray.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-gray.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/treeview-gray.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-gray.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/treeview-red-line.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-red-line.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/treeview-red-line.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-red-line.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/images/treeview-red.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-red.gif
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/images/treeview-red.gif
rename to htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-red.gif
diff --git a/public/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js
rename to htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js
diff --git a/public/includes/jquery/plugins/jquerytreeview/jquery.treeview.css b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.css
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/jquery.treeview.css
rename to htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.css
diff --git a/public/includes/jquery/plugins/jquerytreeview/jquery.treeview.edit.js b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.edit.js
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/jquery.treeview.edit.js
rename to htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.edit.js
diff --git a/public/includes/jquery/plugins/jquerytreeview/jquery.treeview.js b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.js
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/jquery.treeview.js
rename to htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.js
diff --git a/public/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js
rename to htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js
diff --git a/public/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js b/htdocs/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js
rename to htdocs/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js
diff --git a/public/includes/jquery/plugins/jquerytreeview/readme.md b/htdocs/includes/jquery/plugins/jquerytreeview/readme.md
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/readme.md
rename to htdocs/includes/jquery/plugins/jquerytreeview/readme.md
diff --git a/public/includes/jquery/plugins/jquerytreeview/screenshot.png b/htdocs/includes/jquery/plugins/jquerytreeview/screenshot.png
similarity index 100%
rename from public/includes/jquery/plugins/jquerytreeview/screenshot.png
rename to htdocs/includes/jquery/plugins/jquerytreeview/screenshot.png
diff --git a/public/includes/jquery/plugins/layout/jquery.layout.js b/htdocs/includes/jquery/plugins/layout/jquery.layout.js
similarity index 100%
rename from public/includes/jquery/plugins/layout/jquery.layout.js
rename to htdocs/includes/jquery/plugins/layout/jquery.layout.js
diff --git a/public/includes/jquery/plugins/layout/jquery.layout.min.js b/htdocs/includes/jquery/plugins/layout/jquery.layout.min.js
similarity index 100%
rename from public/includes/jquery/plugins/layout/jquery.layout.min.js
rename to htdocs/includes/jquery/plugins/layout/jquery.layout.min.js
diff --git a/public/includes/jquery/plugins/mobile/images/ajax-loader.gif b/htdocs/includes/jquery/plugins/mobile/images/ajax-loader.gif
similarity index 100%
rename from public/includes/jquery/plugins/mobile/images/ajax-loader.gif
rename to htdocs/includes/jquery/plugins/mobile/images/ajax-loader.gif
diff --git a/public/includes/jquery/plugins/mobile/images/icons-18-black.png b/htdocs/includes/jquery/plugins/mobile/images/icons-18-black.png
similarity index 100%
rename from public/includes/jquery/plugins/mobile/images/icons-18-black.png
rename to htdocs/includes/jquery/plugins/mobile/images/icons-18-black.png
diff --git a/public/includes/jquery/plugins/mobile/images/icons-18-white.png b/htdocs/includes/jquery/plugins/mobile/images/icons-18-white.png
similarity index 100%
rename from public/includes/jquery/plugins/mobile/images/icons-18-white.png
rename to htdocs/includes/jquery/plugins/mobile/images/icons-18-white.png
diff --git a/public/includes/jquery/plugins/mobile/images/icons-36-black.png b/htdocs/includes/jquery/plugins/mobile/images/icons-36-black.png
similarity index 100%
rename from public/includes/jquery/plugins/mobile/images/icons-36-black.png
rename to htdocs/includes/jquery/plugins/mobile/images/icons-36-black.png
diff --git a/public/includes/jquery/plugins/mobile/images/icons-36-white.png b/htdocs/includes/jquery/plugins/mobile/images/icons-36-white.png
similarity index 100%
rename from public/includes/jquery/plugins/mobile/images/icons-36-white.png
rename to htdocs/includes/jquery/plugins/mobile/images/icons-36-white.png
diff --git a/public/includes/jquery/plugins/mobile/jquery.mobile-latest.css b/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.css
similarity index 100%
rename from public/includes/jquery/plugins/mobile/jquery.mobile-latest.css
rename to htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.css
diff --git a/public/includes/jquery/plugins/mobile/jquery.mobile-latest.js b/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.js
similarity index 100%
rename from public/includes/jquery/plugins/mobile/jquery.mobile-latest.js
rename to htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.js
diff --git a/public/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css b/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css
similarity index 100%
rename from public/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css
rename to htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css
diff --git a/public/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js b/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
similarity index 100%
rename from public/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
rename to htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
diff --git a/public/includes/jquery/plugins/multiselect/MIT-LICENSE.txt b/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt
similarity index 100%
rename from public/includes/jquery/plugins/multiselect/MIT-LICENSE.txt
rename to htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt
diff --git a/public/includes/jquery/plugins/multiselect/css/ui.multiselect.css b/htdocs/includes/jquery/plugins/multiselect/css/ui.multiselect.css
similarity index 100%
rename from public/includes/jquery/plugins/multiselect/css/ui.multiselect.css
rename to htdocs/includes/jquery/plugins/multiselect/css/ui.multiselect.css
diff --git a/public/includes/jquery/plugins/multiselect/js/ui.multiselect.js b/htdocs/includes/jquery/plugins/multiselect/js/ui.multiselect.js
similarity index 100%
rename from public/includes/jquery/plugins/multiselect/js/ui.multiselect.js
rename to htdocs/includes/jquery/plugins/multiselect/js/ui.multiselect.js
diff --git a/public/includes/jquery/plugins/select2/.gitignore b/htdocs/includes/jquery/plugins/select2/.gitignore
similarity index 100%
rename from public/includes/jquery/plugins/select2/.gitignore
rename to htdocs/includes/jquery/plugins/select2/.gitignore
diff --git a/public/includes/jquery/plugins/select2/CONTRIBUTING.md b/htdocs/includes/jquery/plugins/select2/CONTRIBUTING.md
similarity index 100%
rename from public/includes/jquery/plugins/select2/CONTRIBUTING.md
rename to htdocs/includes/jquery/plugins/select2/CONTRIBUTING.md
diff --git a/public/includes/jquery/plugins/select2/LICENSE b/htdocs/includes/jquery/plugins/select2/LICENSE
similarity index 100%
rename from public/includes/jquery/plugins/select2/LICENSE
rename to htdocs/includes/jquery/plugins/select2/LICENSE
diff --git a/public/includes/jquery/plugins/select2/README.md b/htdocs/includes/jquery/plugins/select2/README.md
similarity index 100%
rename from public/includes/jquery/plugins/select2/README.md
rename to htdocs/includes/jquery/plugins/select2/README.md
diff --git a/public/includes/jquery/plugins/select2/bower.json b/htdocs/includes/jquery/plugins/select2/bower.json
similarity index 100%
rename from public/includes/jquery/plugins/select2/bower.json
rename to htdocs/includes/jquery/plugins/select2/bower.json
diff --git a/public/includes/jquery/plugins/select2/component.json b/htdocs/includes/jquery/plugins/select2/component.json
similarity index 100%
rename from public/includes/jquery/plugins/select2/component.json
rename to htdocs/includes/jquery/plugins/select2/component.json
diff --git a/public/includes/jquery/plugins/select2/composer.json b/htdocs/includes/jquery/plugins/select2/composer.json
similarity index 100%
rename from public/includes/jquery/plugins/select2/composer.json
rename to htdocs/includes/jquery/plugins/select2/composer.json
diff --git a/public/includes/jquery/plugins/select2/package.json b/htdocs/includes/jquery/plugins/select2/package.json
similarity index 100%
rename from public/includes/jquery/plugins/select2/package.json
rename to htdocs/includes/jquery/plugins/select2/package.json
diff --git a/public/includes/jquery/plugins/select2/release.sh b/htdocs/includes/jquery/plugins/select2/release.sh
similarity index 100%
rename from public/includes/jquery/plugins/select2/release.sh
rename to htdocs/includes/jquery/plugins/select2/release.sh
diff --git a/public/includes/jquery/plugins/select2/select2-bootstrap.css b/htdocs/includes/jquery/plugins/select2/select2-bootstrap.css
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2-bootstrap.css
rename to htdocs/includes/jquery/plugins/select2/select2-bootstrap.css
diff --git a/public/includes/jquery/plugins/select2/select2-spinner.gif b/htdocs/includes/jquery/plugins/select2/select2-spinner.gif
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2-spinner.gif
rename to htdocs/includes/jquery/plugins/select2/select2-spinner.gif
diff --git a/public/includes/jquery/plugins/select2/select2.css b/htdocs/includes/jquery/plugins/select2/select2.css
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2.css
rename to htdocs/includes/jquery/plugins/select2/select2.css
diff --git a/public/includes/jquery/plugins/select2/select2.jquery.json b/htdocs/includes/jquery/plugins/select2/select2.jquery.json
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2.jquery.json
rename to htdocs/includes/jquery/plugins/select2/select2.jquery.json
diff --git a/public/includes/jquery/plugins/select2/select2.js b/htdocs/includes/jquery/plugins/select2/select2.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2.js
rename to htdocs/includes/jquery/plugins/select2/select2.js
diff --git a/public/includes/jquery/plugins/select2/select2.min.js b/htdocs/includes/jquery/plugins/select2/select2.min.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2.min.js
rename to htdocs/includes/jquery/plugins/select2/select2.min.js
diff --git a/public/includes/jquery/plugins/select2/select2.png b/htdocs/includes/jquery/plugins/select2/select2.png
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2.png
rename to htdocs/includes/jquery/plugins/select2/select2.png
diff --git a/public/includes/jquery/plugins/select2/select2_locale_ar.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ar.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_ar.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_ar.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_az.js b/htdocs/includes/jquery/plugins/select2/select2_locale_az.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_az.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_az.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_bg.js b/htdocs/includes/jquery/plugins/select2/select2_locale_bg.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_bg.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_bg.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_ca.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ca.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_ca.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_ca.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_cs.js b/htdocs/includes/jquery/plugins/select2/select2_locale_cs.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_cs.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_cs.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_da.js b/htdocs/includes/jquery/plugins/select2/select2_locale_da.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_da.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_da.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_de.js b/htdocs/includes/jquery/plugins/select2/select2_locale_de.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_de.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_de.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_el.js b/htdocs/includes/jquery/plugins/select2/select2_locale_el.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_el.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_el.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_en.js.template b/htdocs/includes/jquery/plugins/select2/select2_locale_en.js.template
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_en.js.template
rename to htdocs/includes/jquery/plugins/select2/select2_locale_en.js.template
diff --git a/public/includes/jquery/plugins/select2/select2_locale_es.js b/htdocs/includes/jquery/plugins/select2/select2_locale_es.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_es.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_es.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_et.js b/htdocs/includes/jquery/plugins/select2/select2_locale_et.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_et.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_et.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_eu.js b/htdocs/includes/jquery/plugins/select2/select2_locale_eu.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_eu.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_eu.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_fa.js b/htdocs/includes/jquery/plugins/select2/select2_locale_fa.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_fa.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_fa.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_fi.js b/htdocs/includes/jquery/plugins/select2/select2_locale_fi.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_fi.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_fi.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_fr.js b/htdocs/includes/jquery/plugins/select2/select2_locale_fr.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_fr.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_fr.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_gl.js b/htdocs/includes/jquery/plugins/select2/select2_locale_gl.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_gl.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_gl.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_he.js b/htdocs/includes/jquery/plugins/select2/select2_locale_he.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_he.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_he.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_hr.js b/htdocs/includes/jquery/plugins/select2/select2_locale_hr.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_hr.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_hr.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_hu.js b/htdocs/includes/jquery/plugins/select2/select2_locale_hu.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_hu.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_hu.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_id.js b/htdocs/includes/jquery/plugins/select2/select2_locale_id.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_id.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_id.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_is.js b/htdocs/includes/jquery/plugins/select2/select2_locale_is.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_is.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_is.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_it.js b/htdocs/includes/jquery/plugins/select2/select2_locale_it.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_it.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_it.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_ja.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ja.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_ja.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_ja.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_ka.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ka.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_ka.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_ka.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_ko.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ko.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_ko.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_ko.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_lt.js b/htdocs/includes/jquery/plugins/select2/select2_locale_lt.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_lt.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_lt.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_lv.js b/htdocs/includes/jquery/plugins/select2/select2_locale_lv.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_lv.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_lv.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_mk.js b/htdocs/includes/jquery/plugins/select2/select2_locale_mk.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_mk.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_mk.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_ms.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ms.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_ms.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_ms.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_nb.js b/htdocs/includes/jquery/plugins/select2/select2_locale_nb.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_nb.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_nb.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_nl.js b/htdocs/includes/jquery/plugins/select2/select2_locale_nl.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_nl.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_nl.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_pl.js b/htdocs/includes/jquery/plugins/select2/select2_locale_pl.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_pl.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_pl.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_pt-BR.js b/htdocs/includes/jquery/plugins/select2/select2_locale_pt-BR.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_pt-BR.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_pt-BR.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_pt-PT.js b/htdocs/includes/jquery/plugins/select2/select2_locale_pt-PT.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_pt-PT.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_pt-PT.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_ro.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ro.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_ro.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_ro.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_rs.js b/htdocs/includes/jquery/plugins/select2/select2_locale_rs.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_rs.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_rs.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_ru.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ru.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_ru.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_ru.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_sk.js b/htdocs/includes/jquery/plugins/select2/select2_locale_sk.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_sk.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_sk.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_sv.js b/htdocs/includes/jquery/plugins/select2/select2_locale_sv.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_sv.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_sv.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_th.js b/htdocs/includes/jquery/plugins/select2/select2_locale_th.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_th.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_th.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_tr.js b/htdocs/includes/jquery/plugins/select2/select2_locale_tr.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_tr.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_tr.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_ug-CN.js b/htdocs/includes/jquery/plugins/select2/select2_locale_ug-CN.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_ug-CN.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_ug-CN.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_uk.js b/htdocs/includes/jquery/plugins/select2/select2_locale_uk.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_uk.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_uk.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_vi.js b/htdocs/includes/jquery/plugins/select2/select2_locale_vi.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_vi.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_vi.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_zh-CN.js b/htdocs/includes/jquery/plugins/select2/select2_locale_zh-CN.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_zh-CN.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_zh-CN.js
diff --git a/public/includes/jquery/plugins/select2/select2_locale_zh-TW.js b/htdocs/includes/jquery/plugins/select2/select2_locale_zh-TW.js
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2_locale_zh-TW.js
rename to htdocs/includes/jquery/plugins/select2/select2_locale_zh-TW.js
diff --git a/public/includes/jquery/plugins/select2/select2x2.png b/htdocs/includes/jquery/plugins/select2/select2x2.png
similarity index 100%
rename from public/includes/jquery/plugins/select2/select2x2.png
rename to htdocs/includes/jquery/plugins/select2/select2x2.png
diff --git a/public/includes/jquery/plugins/tablednd/README.txt b/htdocs/includes/jquery/plugins/tablednd/README.txt
similarity index 100%
rename from public/includes/jquery/plugins/tablednd/README.txt
rename to htdocs/includes/jquery/plugins/tablednd/README.txt
diff --git a/public/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.js b/htdocs/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.js
similarity index 100%
rename from public/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.js
rename to htdocs/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.js
diff --git a/public/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js b/htdocs/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js
similarity index 100%
rename from public/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js
rename to htdocs/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js
diff --git a/public/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css b/htdocs/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css
similarity index 100%
rename from public/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css
rename to htdocs/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css
diff --git a/public/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js b/htdocs/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js
similarity index 100%
rename from public/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js
rename to htdocs/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js
diff --git a/public/includes/jquery/plugins/tiptip/jquery.tipTip.js b/htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.js
similarity index 100%
rename from public/includes/jquery/plugins/tiptip/jquery.tipTip.js
rename to htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.js
diff --git a/public/includes/jquery/plugins/tiptip/jquery.tipTip.min.js b/htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.min.js
similarity index 100%
rename from public/includes/jquery/plugins/tiptip/jquery.tipTip.min.js
rename to htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.min.js
diff --git a/public/includes/jquery/plugins/tiptip/tipTip.css b/htdocs/includes/jquery/plugins/tiptip/tipTip.css
similarity index 100%
rename from public/includes/jquery/plugins/tiptip/tipTip.css
rename to htdocs/includes/jquery/plugins/tiptip/tipTip.css
diff --git a/public/includes/jsgantt/index.htm b/htdocs/includes/jsgantt/index.htm
similarity index 100%
rename from public/includes/jsgantt/index.htm
rename to htdocs/includes/jsgantt/index.htm
diff --git a/public/includes/jsgantt/jsgantt.css b/htdocs/includes/jsgantt/jsgantt.css
similarity index 100%
rename from public/includes/jsgantt/jsgantt.css
rename to htdocs/includes/jsgantt/jsgantt.css
diff --git a/public/includes/jsgantt/jsgantt.js b/htdocs/includes/jsgantt/jsgantt.js
similarity index 100%
rename from public/includes/jsgantt/jsgantt.js
rename to htdocs/includes/jsgantt/jsgantt.js
diff --git a/public/includes/jsgantt/jsgantt.min.js b/htdocs/includes/jsgantt/jsgantt.min.js
similarity index 100%
rename from public/includes/jsgantt/jsgantt.min.js
rename to htdocs/includes/jsgantt/jsgantt.min.js
diff --git a/public/includes/jsgantt/jsgantt_Minutes.html b/htdocs/includes/jsgantt/jsgantt_Minutes.html
similarity index 100%
rename from public/includes/jsgantt/jsgantt_Minutes.html
rename to htdocs/includes/jsgantt/jsgantt_Minutes.html
diff --git a/public/includes/jsgantt/jsgantt_exExternalXML.html b/htdocs/includes/jsgantt/jsgantt_exExternalXML.html
similarity index 100%
rename from public/includes/jsgantt/jsgantt_exExternalXML.html
rename to htdocs/includes/jsgantt/jsgantt_exExternalXML.html
diff --git a/public/includes/jsgantt/project.xml b/htdocs/includes/jsgantt/project.xml
similarity index 100%
rename from public/includes/jsgantt/project.xml
rename to htdocs/includes/jsgantt/project.xml
diff --git a/public/includes/jstz/jstz.js b/htdocs/includes/jstz/jstz.js
similarity index 100%
rename from public/includes/jstz/jstz.js
rename to htdocs/includes/jstz/jstz.js
diff --git a/public/includes/jstz/jstz.min.js b/htdocs/includes/jstz/jstz.min.js
similarity index 100%
rename from public/includes/jstz/jstz.min.js
rename to htdocs/includes/jstz/jstz.min.js
diff --git a/public/includes/mike42/escpos-php/.gitignore b/htdocs/includes/mike42/escpos-php/.gitignore
similarity index 100%
rename from public/includes/mike42/escpos-php/.gitignore
rename to htdocs/includes/mike42/escpos-php/.gitignore
diff --git a/public/includes/mike42/escpos-php/Escpos.php b/htdocs/includes/mike42/escpos-php/Escpos.php
similarity index 100%
rename from public/includes/mike42/escpos-php/Escpos.php
rename to htdocs/includes/mike42/escpos-php/Escpos.php
diff --git a/public/includes/mike42/escpos-php/LICENSE.md b/htdocs/includes/mike42/escpos-php/LICENSE.md
similarity index 100%
rename from public/includes/mike42/escpos-php/LICENSE.md
rename to htdocs/includes/mike42/escpos-php/LICENSE.md
diff --git a/public/includes/mike42/escpos-php/README.md b/htdocs/includes/mike42/escpos-php/README.md
similarity index 100%
rename from public/includes/mike42/escpos-php/README.md
rename to htdocs/includes/mike42/escpos-php/README.md
diff --git a/public/includes/mike42/escpos-php/composer.json b/htdocs/includes/mike42/escpos-php/composer.json
similarity index 100%
rename from public/includes/mike42/escpos-php/composer.json
rename to htdocs/includes/mike42/escpos-php/composer.json
diff --git a/public/includes/mike42/escpos-php/composer.lock b/htdocs/includes/mike42/escpos-php/composer.lock
similarity index 100%
rename from public/includes/mike42/escpos-php/composer.lock
rename to htdocs/includes/mike42/escpos-php/composer.lock
diff --git a/public/includes/mike42/escpos-php/doc/Makefile b/htdocs/includes/mike42/escpos-php/doc/Makefile
similarity index 100%
rename from public/includes/mike42/escpos-php/doc/Makefile
rename to htdocs/includes/mike42/escpos-php/doc/Makefile
diff --git a/public/includes/mike42/escpos-php/doc/escpos.conf b/htdocs/includes/mike42/escpos-php/doc/escpos.conf
similarity index 100%
rename from public/includes/mike42/escpos-php/doc/escpos.conf
rename to htdocs/includes/mike42/escpos-php/doc/escpos.conf
diff --git a/public/includes/mike42/escpos-php/example/README.md b/htdocs/includes/mike42/escpos-php/example/README.md
similarity index 100%
rename from public/includes/mike42/escpos-php/example/README.md
rename to htdocs/includes/mike42/escpos-php/example/README.md
diff --git a/public/includes/mike42/escpos-php/example/barcode.php b/htdocs/includes/mike42/escpos-php/example/barcode.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/barcode.php
rename to htdocs/includes/mike42/escpos-php/example/barcode.php
diff --git a/public/includes/mike42/escpos-php/example/bit-image.php b/htdocs/includes/mike42/escpos-php/example/bit-image.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/bit-image.php
rename to htdocs/includes/mike42/escpos-php/example/bit-image.php
diff --git a/public/includes/mike42/escpos-php/example/character-encodings-with-images.php b/htdocs/includes/mike42/escpos-php/example/character-encodings-with-images.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/character-encodings-with-images.php
rename to htdocs/includes/mike42/escpos-php/example/character-encodings-with-images.php
diff --git a/public/includes/mike42/escpos-php/example/character-encodings.php b/htdocs/includes/mike42/escpos-php/example/character-encodings.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/character-encodings.php
rename to htdocs/includes/mike42/escpos-php/example/character-encodings.php
diff --git a/public/includes/mike42/escpos-php/example/character-tables.php b/htdocs/includes/mike42/escpos-php/example/character-tables.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/character-tables.php
rename to htdocs/includes/mike42/escpos-php/example/character-tables.php
diff --git a/public/includes/mike42/escpos-php/example/demo.php b/htdocs/includes/mike42/escpos-php/example/demo.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/demo.php
rename to htdocs/includes/mike42/escpos-php/example/demo.php
diff --git a/public/includes/mike42/escpos-php/example/graphics.php b/htdocs/includes/mike42/escpos-php/example/graphics.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/graphics.php
rename to htdocs/includes/mike42/escpos-php/example/graphics.php
diff --git a/public/includes/mike42/escpos-php/example/interface/README.md b/htdocs/includes/mike42/escpos-php/example/interface/README.md
similarity index 100%
rename from public/includes/mike42/escpos-php/example/interface/README.md
rename to htdocs/includes/mike42/escpos-php/example/interface/README.md
diff --git a/public/includes/mike42/escpos-php/example/interface/ethernet.php b/htdocs/includes/mike42/escpos-php/example/interface/ethernet.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/interface/ethernet.php
rename to htdocs/includes/mike42/escpos-php/example/interface/ethernet.php
diff --git a/public/includes/mike42/escpos-php/example/interface/linux-usb.php b/htdocs/includes/mike42/escpos-php/example/interface/linux-usb.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/interface/linux-usb.php
rename to htdocs/includes/mike42/escpos-php/example/interface/linux-usb.php
diff --git a/public/includes/mike42/escpos-php/example/interface/smb.php b/htdocs/includes/mike42/escpos-php/example/interface/smb.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/interface/smb.php
rename to htdocs/includes/mike42/escpos-php/example/interface/smb.php
diff --git a/public/includes/mike42/escpos-php/example/interface/windows-lpt.php b/htdocs/includes/mike42/escpos-php/example/interface/windows-lpt.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/interface/windows-lpt.php
rename to htdocs/includes/mike42/escpos-php/example/interface/windows-lpt.php
diff --git a/public/includes/mike42/escpos-php/example/interface/windows-usb.php b/htdocs/includes/mike42/escpos-php/example/interface/windows-usb.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/interface/windows-usb.php
rename to htdocs/includes/mike42/escpos-php/example/interface/windows-usb.php
diff --git a/public/includes/mike42/escpos-php/example/print-from-html.php b/htdocs/includes/mike42/escpos-php/example/print-from-html.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/print-from-html.php
rename to htdocs/includes/mike42/escpos-php/example/print-from-html.php
diff --git a/public/includes/mike42/escpos-php/example/print-from-pdf.php b/htdocs/includes/mike42/escpos-php/example/print-from-pdf.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/print-from-pdf.php
rename to htdocs/includes/mike42/escpos-php/example/print-from-pdf.php
diff --git a/public/includes/mike42/escpos-php/example/qr-code.php b/htdocs/includes/mike42/escpos-php/example/qr-code.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/qr-code.php
rename to htdocs/includes/mike42/escpos-php/example/qr-code.php
diff --git a/public/includes/mike42/escpos-php/example/receipt-with-logo.php b/htdocs/includes/mike42/escpos-php/example/receipt-with-logo.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/receipt-with-logo.php
rename to htdocs/includes/mike42/escpos-php/example/receipt-with-logo.php
diff --git a/public/includes/mike42/escpos-php/example/resources/character-encoding-test-strings.inc b/htdocs/includes/mike42/escpos-php/example/resources/character-encoding-test-strings.inc
similarity index 100%
rename from public/includes/mike42/escpos-php/example/resources/character-encoding-test-strings.inc
rename to htdocs/includes/mike42/escpos-php/example/resources/character-encoding-test-strings.inc
diff --git a/public/includes/mike42/escpos-php/example/resources/document.odt b/htdocs/includes/mike42/escpos-php/example/resources/document.odt
similarity index 100%
rename from public/includes/mike42/escpos-php/example/resources/document.odt
rename to htdocs/includes/mike42/escpos-php/example/resources/document.odt
diff --git a/public/includes/mike42/escpos-php/example/resources/document.pdf b/htdocs/includes/mike42/escpos-php/example/resources/document.pdf
similarity index 100%
rename from public/includes/mike42/escpos-php/example/resources/document.pdf
rename to htdocs/includes/mike42/escpos-php/example/resources/document.pdf
diff --git a/public/includes/mike42/escpos-php/example/resources/document.z b/htdocs/includes/mike42/escpos-php/example/resources/document.z
similarity index 100%
rename from public/includes/mike42/escpos-php/example/resources/document.z
rename to htdocs/includes/mike42/escpos-php/example/resources/document.z
diff --git a/public/includes/mike42/escpos-php/example/resources/escpos-php-small.png b/htdocs/includes/mike42/escpos-php/example/resources/escpos-php-small.png
similarity index 100%
rename from public/includes/mike42/escpos-php/example/resources/escpos-php-small.png
rename to htdocs/includes/mike42/escpos-php/example/resources/escpos-php-small.png
diff --git a/public/includes/mike42/escpos-php/example/resources/escpos-php.png b/htdocs/includes/mike42/escpos-php/example/resources/escpos-php.png
similarity index 100%
rename from public/includes/mike42/escpos-php/example/resources/escpos-php.png
rename to htdocs/includes/mike42/escpos-php/example/resources/escpos-php.png
diff --git a/public/includes/mike42/escpos-php/example/resources/tux.png b/htdocs/includes/mike42/escpos-php/example/resources/tux.png
similarity index 100%
rename from public/includes/mike42/escpos-php/example/resources/tux.png
rename to htdocs/includes/mike42/escpos-php/example/resources/tux.png
diff --git a/public/includes/mike42/escpos-php/example/specific/29-latvian-star-tup592.php b/htdocs/includes/mike42/escpos-php/example/specific/29-latvian-star-tup592.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/specific/29-latvian-star-tup592.php
rename to htdocs/includes/mike42/escpos-php/example/specific/29-latvian-star-tup592.php
diff --git a/public/includes/mike42/escpos-php/example/specific/32-german-tm-t20-ii-custom-command.php b/htdocs/includes/mike42/escpos-php/example/specific/32-german-tm-t20-ii-custom-command.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/specific/32-german-tm-t20-ii-custom-command.php
rename to htdocs/includes/mike42/escpos-php/example/specific/32-german-tm-t20-ii-custom-command.php
diff --git a/public/includes/mike42/escpos-php/example/specific/33-spanish-seypos-prp-300.php b/htdocs/includes/mike42/escpos-php/example/specific/33-spanish-seypos-prp-300.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/specific/33-spanish-seypos-prp-300.php
rename to htdocs/includes/mike42/escpos-php/example/specific/33-spanish-seypos-prp-300.php
diff --git a/public/includes/mike42/escpos-php/example/specific/39-currency-symbols.php b/htdocs/includes/mike42/escpos-php/example/specific/39-currency-symbols.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/specific/39-currency-symbols.php
rename to htdocs/includes/mike42/escpos-php/example/specific/39-currency-symbols.php
diff --git a/public/includes/mike42/escpos-php/example/specific/44-pound-symbol-star-tsp650.php b/htdocs/includes/mike42/escpos-php/example/specific/44-pound-symbol-star-tsp650.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/specific/44-pound-symbol-star-tsp650.php
rename to htdocs/includes/mike42/escpos-php/example/specific/44-pound-symbol-star-tsp650.php
diff --git a/public/includes/mike42/escpos-php/example/specific/50-P-822D-greek.php b/htdocs/includes/mike42/escpos-php/example/specific/50-P-822D-greek.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/specific/50-P-822D-greek.php
rename to htdocs/includes/mike42/escpos-php/example/specific/50-P-822D-greek.php
diff --git a/public/includes/mike42/escpos-php/example/specific/54-gfx-sidebyside.php b/htdocs/includes/mike42/escpos-php/example/specific/54-gfx-sidebyside.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/specific/54-gfx-sidebyside.php
rename to htdocs/includes/mike42/escpos-php/example/specific/54-gfx-sidebyside.php
diff --git a/public/includes/mike42/escpos-php/example/specific/6-arabic-epos-tep-220m.php b/htdocs/includes/mike42/escpos-php/example/specific/6-arabic-epos-tep-220m.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/specific/6-arabic-epos-tep-220m.php
rename to htdocs/includes/mike42/escpos-php/example/specific/6-arabic-epos-tep-220m.php
diff --git a/public/includes/mike42/escpos-php/example/specific/README.md b/htdocs/includes/mike42/escpos-php/example/specific/README.md
similarity index 100%
rename from public/includes/mike42/escpos-php/example/specific/README.md
rename to htdocs/includes/mike42/escpos-php/example/specific/README.md
diff --git a/public/includes/mike42/escpos-php/example/text-size.php b/htdocs/includes/mike42/escpos-php/example/text-size.php
similarity index 100%
rename from public/includes/mike42/escpos-php/example/text-size.php
rename to htdocs/includes/mike42/escpos-php/example/text-size.php
diff --git a/public/includes/mike42/escpos-php/src/AbstractCapabilityProfile.php b/htdocs/includes/mike42/escpos-php/src/AbstractCapabilityProfile.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/AbstractCapabilityProfile.php
rename to htdocs/includes/mike42/escpos-php/src/AbstractCapabilityProfile.php
diff --git a/public/includes/mike42/escpos-php/src/CodePage.php b/htdocs/includes/mike42/escpos-php/src/CodePage.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/CodePage.php
rename to htdocs/includes/mike42/escpos-php/src/CodePage.php
diff --git a/public/includes/mike42/escpos-php/src/DefaultCapabilityProfile.php b/htdocs/includes/mike42/escpos-php/src/DefaultCapabilityProfile.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/DefaultCapabilityProfile.php
rename to htdocs/includes/mike42/escpos-php/src/DefaultCapabilityProfile.php
diff --git a/public/includes/mike42/escpos-php/src/DummyPrintConnector.php b/htdocs/includes/mike42/escpos-php/src/DummyPrintConnector.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/DummyPrintConnector.php
rename to htdocs/includes/mike42/escpos-php/src/DummyPrintConnector.php
diff --git a/public/includes/mike42/escpos-php/src/EposTepCapabilityProfile.php b/htdocs/includes/mike42/escpos-php/src/EposTepCapabilityProfile.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/EposTepCapabilityProfile.php
rename to htdocs/includes/mike42/escpos-php/src/EposTepCapabilityProfile.php
diff --git a/public/includes/mike42/escpos-php/src/EscposImage.php b/htdocs/includes/mike42/escpos-php/src/EscposImage.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/EscposImage.php
rename to htdocs/includes/mike42/escpos-php/src/EscposImage.php
diff --git a/public/includes/mike42/escpos-php/src/EscposPrintBuffer.php b/htdocs/includes/mike42/escpos-php/src/EscposPrintBuffer.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/EscposPrintBuffer.php
rename to htdocs/includes/mike42/escpos-php/src/EscposPrintBuffer.php
diff --git a/public/includes/mike42/escpos-php/src/FilePrintConnector.php b/htdocs/includes/mike42/escpos-php/src/FilePrintConnector.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/FilePrintConnector.php
rename to htdocs/includes/mike42/escpos-php/src/FilePrintConnector.php
diff --git a/public/includes/mike42/escpos-php/src/ImagePrintBuffer.php b/htdocs/includes/mike42/escpos-php/src/ImagePrintBuffer.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/ImagePrintBuffer.php
rename to htdocs/includes/mike42/escpos-php/src/ImagePrintBuffer.php
diff --git a/public/includes/mike42/escpos-php/src/NetworkPrintConnector.php b/htdocs/includes/mike42/escpos-php/src/NetworkPrintConnector.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/NetworkPrintConnector.php
rename to htdocs/includes/mike42/escpos-php/src/NetworkPrintConnector.php
diff --git a/public/includes/mike42/escpos-php/src/P822DCapabilityProfile.php b/htdocs/includes/mike42/escpos-php/src/P822DCapabilityProfile.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/P822DCapabilityProfile.php
rename to htdocs/includes/mike42/escpos-php/src/P822DCapabilityProfile.php
diff --git a/public/includes/mike42/escpos-php/src/PrintBuffer.php b/htdocs/includes/mike42/escpos-php/src/PrintBuffer.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/PrintBuffer.php
rename to htdocs/includes/mike42/escpos-php/src/PrintBuffer.php
diff --git a/public/includes/mike42/escpos-php/src/PrintConnector.php b/htdocs/includes/mike42/escpos-php/src/PrintConnector.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/PrintConnector.php
rename to htdocs/includes/mike42/escpos-php/src/PrintConnector.php
diff --git a/public/includes/mike42/escpos-php/src/SimpleCapabilityProfile.php b/htdocs/includes/mike42/escpos-php/src/SimpleCapabilityProfile.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/SimpleCapabilityProfile.php
rename to htdocs/includes/mike42/escpos-php/src/SimpleCapabilityProfile.php
diff --git a/public/includes/mike42/escpos-php/src/StarCapabilityProfile.php b/htdocs/includes/mike42/escpos-php/src/StarCapabilityProfile.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/StarCapabilityProfile.php
rename to htdocs/includes/mike42/escpos-php/src/StarCapabilityProfile.php
diff --git a/public/includes/mike42/escpos-php/src/WindowsPrintConnector.php b/htdocs/includes/mike42/escpos-php/src/WindowsPrintConnector.php
similarity index 100%
rename from public/includes/mike42/escpos-php/src/WindowsPrintConnector.php
rename to htdocs/includes/mike42/escpos-php/src/WindowsPrintConnector.php
diff --git a/public/includes/mike42/escpos-php/src/cache/Characters-DefaultCapabilityProfile.ser.gz b/htdocs/includes/mike42/escpos-php/src/cache/Characters-DefaultCapabilityProfile.ser.gz
similarity index 100%
rename from public/includes/mike42/escpos-php/src/cache/Characters-DefaultCapabilityProfile.ser.gz
rename to htdocs/includes/mike42/escpos-php/src/cache/Characters-DefaultCapabilityProfile.ser.gz
diff --git a/public/includes/mike42/escpos-php/src/cache/Characters-SimpleCapabilityProfile.ser.gz b/htdocs/includes/mike42/escpos-php/src/cache/Characters-SimpleCapabilityProfile.ser.gz
similarity index 100%
rename from public/includes/mike42/escpos-php/src/cache/Characters-SimpleCapabilityProfile.ser.gz
rename to htdocs/includes/mike42/escpos-php/src/cache/Characters-SimpleCapabilityProfile.ser.gz
diff --git a/public/includes/mike42/escpos-php/src/cache/Characters-StarCapabilityProfile.ser.gz b/htdocs/includes/mike42/escpos-php/src/cache/Characters-StarCapabilityProfile.ser.gz
similarity index 100%
rename from public/includes/mike42/escpos-php/src/cache/Characters-StarCapabilityProfile.ser.gz
rename to htdocs/includes/mike42/escpos-php/src/cache/Characters-StarCapabilityProfile.ser.gz
diff --git a/public/includes/mike42/escpos-php/test/bootstrap.php b/htdocs/includes/mike42/escpos-php/test/bootstrap.php
similarity index 100%
rename from public/includes/mike42/escpos-php/test/bootstrap.php
rename to htdocs/includes/mike42/escpos-php/test/bootstrap.php
diff --git a/public/includes/mike42/escpos-php/test/integration/ExampleTest.php b/htdocs/includes/mike42/escpos-php/test/integration/ExampleTest.php
similarity index 100%
rename from public/includes/mike42/escpos-php/test/integration/ExampleTest.php
rename to htdocs/includes/mike42/escpos-php/test/integration/ExampleTest.php
diff --git a/public/includes/mike42/escpos-php/test/integration/resources/output/barcode.bin b/htdocs/includes/mike42/escpos-php/test/integration/resources/output/barcode.bin
similarity index 100%
rename from public/includes/mike42/escpos-php/test/integration/resources/output/barcode.bin
rename to htdocs/includes/mike42/escpos-php/test/integration/resources/output/barcode.bin
diff --git a/public/includes/mike42/escpos-php/test/integration/resources/output/bit-image.bin b/htdocs/includes/mike42/escpos-php/test/integration/resources/output/bit-image.bin
similarity index 100%
rename from public/includes/mike42/escpos-php/test/integration/resources/output/bit-image.bin
rename to htdocs/includes/mike42/escpos-php/test/integration/resources/output/bit-image.bin
diff --git a/public/includes/mike42/escpos-php/test/integration/resources/output/character-encodings.bin b/htdocs/includes/mike42/escpos-php/test/integration/resources/output/character-encodings.bin
similarity index 100%
rename from public/includes/mike42/escpos-php/test/integration/resources/output/character-encodings.bin
rename to htdocs/includes/mike42/escpos-php/test/integration/resources/output/character-encodings.bin
diff --git a/public/includes/mike42/escpos-php/test/integration/resources/output/character-tables.bin b/htdocs/includes/mike42/escpos-php/test/integration/resources/output/character-tables.bin
similarity index 100%
rename from public/includes/mike42/escpos-php/test/integration/resources/output/character-tables.bin
rename to htdocs/includes/mike42/escpos-php/test/integration/resources/output/character-tables.bin
diff --git a/public/includes/mike42/escpos-php/test/integration/resources/output/demo.bin b/htdocs/includes/mike42/escpos-php/test/integration/resources/output/demo.bin
similarity index 100%
rename from public/includes/mike42/escpos-php/test/integration/resources/output/demo.bin
rename to htdocs/includes/mike42/escpos-php/test/integration/resources/output/demo.bin
diff --git a/public/includes/mike42/escpos-php/test/integration/resources/output/graphics.bin b/htdocs/includes/mike42/escpos-php/test/integration/resources/output/graphics.bin
similarity index 100%
rename from public/includes/mike42/escpos-php/test/integration/resources/output/graphics.bin
rename to htdocs/includes/mike42/escpos-php/test/integration/resources/output/graphics.bin
diff --git a/public/includes/mike42/escpos-php/test/integration/resources/output/interface.bin b/htdocs/includes/mike42/escpos-php/test/integration/resources/output/interface.bin
similarity index 100%
rename from public/includes/mike42/escpos-php/test/integration/resources/output/interface.bin
rename to htdocs/includes/mike42/escpos-php/test/integration/resources/output/interface.bin
diff --git a/public/includes/mike42/escpos-php/test/integration/resources/output/print-from-pdf.bin.z b/htdocs/includes/mike42/escpos-php/test/integration/resources/output/print-from-pdf.bin.z
similarity index 100%
rename from public/includes/mike42/escpos-php/test/integration/resources/output/print-from-pdf.bin.z
rename to htdocs/includes/mike42/escpos-php/test/integration/resources/output/print-from-pdf.bin.z
diff --git a/public/includes/mike42/escpos-php/test/integration/resources/output/qr-code.bin b/htdocs/includes/mike42/escpos-php/test/integration/resources/output/qr-code.bin
similarity index 100%
rename from public/includes/mike42/escpos-php/test/integration/resources/output/qr-code.bin
rename to htdocs/includes/mike42/escpos-php/test/integration/resources/output/qr-code.bin
diff --git a/public/includes/mike42/escpos-php/test/integration/resources/output/receipt-with-logo.bin b/htdocs/includes/mike42/escpos-php/test/integration/resources/output/receipt-with-logo.bin
similarity index 100%
rename from public/includes/mike42/escpos-php/test/integration/resources/output/receipt-with-logo.bin
rename to htdocs/includes/mike42/escpos-php/test/integration/resources/output/receipt-with-logo.bin
diff --git a/public/includes/mike42/escpos-php/test/integration/resources/output/text-size.bin b/htdocs/includes/mike42/escpos-php/test/integration/resources/output/text-size.bin
similarity index 100%
rename from public/includes/mike42/escpos-php/test/integration/resources/output/text-size.bin
rename to htdocs/includes/mike42/escpos-php/test/integration/resources/output/text-size.bin
diff --git a/public/includes/mike42/escpos-php/test/phpunit.xml b/htdocs/includes/mike42/escpos-php/test/phpunit.xml
similarity index 100%
rename from public/includes/mike42/escpos-php/test/phpunit.xml
rename to htdocs/includes/mike42/escpos-php/test/phpunit.xml
diff --git a/public/includes/mike42/escpos-php/test/unit/AbstractCapabilityProfileTest.php b/htdocs/includes/mike42/escpos-php/test/unit/AbstractCapabilityProfileTest.php
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/AbstractCapabilityProfileTest.php
rename to htdocs/includes/mike42/escpos-php/test/unit/AbstractCapabilityProfileTest.php
diff --git a/public/includes/mike42/escpos-php/test/unit/EscposImageTest.php b/htdocs/includes/mike42/escpos-php/test/unit/EscposImageTest.php
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/EscposImageTest.php
rename to htdocs/includes/mike42/escpos-php/test/unit/EscposImageTest.php
diff --git a/public/includes/mike42/escpos-php/test/unit/EscposPrintBufferTest.php b/htdocs/includes/mike42/escpos-php/test/unit/EscposPrintBufferTest.php
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/EscposPrintBufferTest.php
rename to htdocs/includes/mike42/escpos-php/test/unit/EscposPrintBufferTest.php
diff --git a/public/includes/mike42/escpos-php/test/unit/EscposTest.php b/htdocs/includes/mike42/escpos-php/test/unit/EscposTest.php
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/EscposTest.php
rename to htdocs/includes/mike42/escpos-php/test/unit/EscposTest.php
diff --git a/public/includes/mike42/escpos-php/test/unit/WindowsPrintConnectorTest.php b/htdocs/includes/mike42/escpos-php/test/unit/WindowsPrintConnectorTest.php
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/WindowsPrintConnectorTest.php
rename to htdocs/includes/mike42/escpos-php/test/unit/WindowsPrintConnectorTest.php
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/black_transparent.gif b/htdocs/includes/mike42/escpos-php/test/unit/resources/black_transparent.gif
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/black_transparent.gif
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/black_transparent.gif
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/black_transparent.png b/htdocs/includes/mike42/escpos-php/test/unit/resources/black_transparent.png
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/black_transparent.png
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/black_transparent.png
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/black_white.bmp b/htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.bmp
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/black_white.bmp
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.bmp
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/black_white.gif b/htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.gif
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/black_white.gif
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.gif
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/black_white.jpg b/htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.jpg
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/black_white.jpg
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.jpg
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/black_white.png b/htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.png
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/black_white.png
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/black_white.png
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/canvas_black.bmp b/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.bmp
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/canvas_black.bmp
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.bmp
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/canvas_black.gif b/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.gif
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/canvas_black.gif
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.gif
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/canvas_black.jpg b/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.jpg
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/canvas_black.jpg
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.jpg
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/canvas_black.png b/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.png
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/canvas_black.png
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_black.png
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/canvas_white.bmp b/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.bmp
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/canvas_white.bmp
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.bmp
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/canvas_white.gif b/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.gif
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/canvas_white.gif
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.gif
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/canvas_white.jpg b/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.jpg
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/canvas_white.jpg
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.jpg
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/canvas_white.png b/htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.png
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/canvas_white.png
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/canvas_white.png
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/demo.php b/htdocs/includes/mike42/escpos-php/test/unit/resources/demo.php
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/demo.php
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/demo.php
diff --git a/public/includes/mike42/escpos-php/test/unit/resources/doc.pdf b/htdocs/includes/mike42/escpos-php/test/unit/resources/doc.pdf
similarity index 100%
rename from public/includes/mike42/escpos-php/test/unit/resources/doc.pdf
rename to htdocs/includes/mike42/escpos-php/test/unit/resources/doc.pdf
diff --git a/public/includes/mobiledetect/mobiledetectlib/.gitignore b/htdocs/includes/mobiledetect/mobiledetectlib/.gitignore
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/.gitignore
rename to htdocs/includes/mobiledetect/mobiledetectlib/.gitignore
diff --git a/public/includes/mobiledetect/mobiledetectlib/.php_cs b/htdocs/includes/mobiledetect/mobiledetectlib/.php_cs
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/.php_cs
rename to htdocs/includes/mobiledetect/mobiledetectlib/.php_cs
diff --git a/public/includes/mobiledetect/mobiledetectlib/.travis.yml b/htdocs/includes/mobiledetect/mobiledetectlib/.travis.yml
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/.travis.yml
rename to htdocs/includes/mobiledetect/mobiledetectlib/.travis.yml
diff --git a/public/includes/mobiledetect/mobiledetectlib/LICENSE.txt b/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/LICENSE.txt
rename to htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt
diff --git a/public/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json b/htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
rename to htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
diff --git a/public/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php b/htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/README.md b/htdocs/includes/mobiledetect/mobiledetectlib/README.md
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/README.md
rename to htdocs/includes/mobiledetect/mobiledetectlib/README.md
diff --git a/public/includes/mobiledetect/mobiledetectlib/composer.json b/htdocs/includes/mobiledetect/mobiledetectlib/composer.json
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/composer.json
rename to htdocs/includes/mobiledetect/mobiledetectlib/composer.json
diff --git a/public/includes/mobiledetect/mobiledetectlib/examples/demo.php b/htdocs/includes/mobiledetect/mobiledetectlib/examples/demo.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/examples/demo.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/examples/demo.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/examples/session_example.php b/htdocs/includes/mobiledetect/mobiledetectlib/examples/session_example.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/examples/session_example.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/examples/session_example.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/examples/test.php b/htdocs/includes/mobiledetect/mobiledetectlib/examples/test.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/examples/test.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/examples/test.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/export/exportToJSON.php b/htdocs/includes/mobiledetect/mobiledetectlib/export/exportToJSON.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/export/exportToJSON.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/export/exportToJSON.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php b/htdocs/includes/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/BasicsTest.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/BasicsTest.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/BasicsTest.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/BasicsTest.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/UA_List.inc.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/UA_List.inc.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/UA_List.inc.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/UA_List.inc.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/UA_List.pending.txt b/htdocs/includes/mobiledetect/mobiledetectlib/tests/UA_List.pending.txt
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/UA_List.pending.txt
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/UA_List.pending.txt
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/UserAgentTest.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/UserAgentTest.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/UserAgentTest.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/UserAgentTest.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/VendorsTest_tmp.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/VendorsTest_tmp.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/VendorsTest_tmp.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/VendorsTest_tmp.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/bootstrap.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/bootstrap.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/bootstrap.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/bootstrap.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/phpunit.xml b/htdocs/includes/mobiledetect/mobiledetectlib/tests/phpunit.xml
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/phpunit.xml
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/phpunit.xml
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Acer.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Acer.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Acer.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Acer.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Alcatel.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Alcatel.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Alcatel.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Alcatel.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Allview.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Allview.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Allview.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Allview.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Amazon.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Amazon.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Amazon.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Amazon.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Apple.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Apple.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Apple.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Apple.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Archos.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Archos.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Archos.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Archos.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Asus.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Asus.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Asus.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Asus.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Blackberry.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Blackberry.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Blackberry.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Blackberry.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Dell.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Dell.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Dell.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Dell.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Google.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Google.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Google.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Google.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HP.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HP.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HP.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HP.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HTC.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HTC.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HTC.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/HTC.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Huawei.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Huawei.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Huawei.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Huawei.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/LG.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/LG.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/LG.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/LG.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lava.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lava.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lava.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lava.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Leader.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Leader.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Leader.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Leader.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lenovo.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lenovo.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lenovo.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Lenovo.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Mi.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Mi.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Mi.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Mi.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Microsoft.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Microsoft.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Microsoft.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Microsoft.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Motorola.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Motorola.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Motorola.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Motorola.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Nokia.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Nokia.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Nokia.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Nokia.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Onda.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Onda.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Onda.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Onda.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Others.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Others.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Others.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Others.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Prestigio.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Prestigio.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Prestigio.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Prestigio.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Samsung.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Samsung.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Samsung.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Samsung.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Sony.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Sony.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Sony.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Sony.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/SpecialCases.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/SpecialCases.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/SpecialCases.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/SpecialCases.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Vodafone.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Vodafone.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Vodafone.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/Vodafone.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/ZTE.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/ZTE.php
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/ZTE.php
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/providers/vendors/ZTE.php
diff --git a/public/includes/mobiledetect/mobiledetectlib/tests/ualist.json b/htdocs/includes/mobiledetect/mobiledetectlib/tests/ualist.json
similarity index 100%
rename from public/includes/mobiledetect/mobiledetectlib/tests/ualist.json
rename to htdocs/includes/mobiledetect/mobiledetectlib/tests/ualist.json
diff --git a/public/includes/nusoap/lib/Mail/mime.php b/htdocs/includes/nusoap/lib/Mail/mime.php
similarity index 100%
rename from public/includes/nusoap/lib/Mail/mime.php
rename to htdocs/includes/nusoap/lib/Mail/mime.php
diff --git a/public/includes/nusoap/lib/Mail/mimePart.php b/htdocs/includes/nusoap/lib/Mail/mimePart.php
similarity index 100%
rename from public/includes/nusoap/lib/Mail/mimePart.php
rename to htdocs/includes/nusoap/lib/Mail/mimePart.php
diff --git a/public/includes/nusoap/lib/changelog b/htdocs/includes/nusoap/lib/changelog
similarity index 100%
rename from public/includes/nusoap/lib/changelog
rename to htdocs/includes/nusoap/lib/changelog
diff --git a/public/includes/nusoap/lib/class.nusoap_base.php b/htdocs/includes/nusoap/lib/class.nusoap_base.php
similarity index 100%
rename from public/includes/nusoap/lib/class.nusoap_base.php
rename to htdocs/includes/nusoap/lib/class.nusoap_base.php
diff --git a/public/includes/nusoap/lib/class.soap_fault.php b/htdocs/includes/nusoap/lib/class.soap_fault.php
similarity index 100%
rename from public/includes/nusoap/lib/class.soap_fault.php
rename to htdocs/includes/nusoap/lib/class.soap_fault.php
diff --git a/public/includes/nusoap/lib/class.soap_parser.php b/htdocs/includes/nusoap/lib/class.soap_parser.php
similarity index 100%
rename from public/includes/nusoap/lib/class.soap_parser.php
rename to htdocs/includes/nusoap/lib/class.soap_parser.php
diff --git a/public/includes/nusoap/lib/class.soap_server.php b/htdocs/includes/nusoap/lib/class.soap_server.php
similarity index 100%
rename from public/includes/nusoap/lib/class.soap_server.php
rename to htdocs/includes/nusoap/lib/class.soap_server.php
diff --git a/public/includes/nusoap/lib/class.soap_transport_http.php b/htdocs/includes/nusoap/lib/class.soap_transport_http.php
similarity index 100%
rename from public/includes/nusoap/lib/class.soap_transport_http.php
rename to htdocs/includes/nusoap/lib/class.soap_transport_http.php
diff --git a/public/includes/nusoap/lib/class.soap_val.php b/htdocs/includes/nusoap/lib/class.soap_val.php
similarity index 100%
rename from public/includes/nusoap/lib/class.soap_val.php
rename to htdocs/includes/nusoap/lib/class.soap_val.php
diff --git a/public/includes/nusoap/lib/class.soapclient.php b/htdocs/includes/nusoap/lib/class.soapclient.php
similarity index 100%
rename from public/includes/nusoap/lib/class.soapclient.php
rename to htdocs/includes/nusoap/lib/class.soapclient.php
diff --git a/public/includes/nusoap/lib/class.wsdl.php b/htdocs/includes/nusoap/lib/class.wsdl.php
similarity index 100%
rename from public/includes/nusoap/lib/class.wsdl.php
rename to htdocs/includes/nusoap/lib/class.wsdl.php
diff --git a/public/includes/nusoap/lib/class.wsdlcache.php b/htdocs/includes/nusoap/lib/class.wsdlcache.php
similarity index 100%
rename from public/includes/nusoap/lib/class.wsdlcache.php
rename to htdocs/includes/nusoap/lib/class.wsdlcache.php
diff --git a/public/includes/nusoap/lib/class.xmlschema.php b/htdocs/includes/nusoap/lib/class.xmlschema.php
similarity index 100%
rename from public/includes/nusoap/lib/class.xmlschema.php
rename to htdocs/includes/nusoap/lib/class.xmlschema.php
diff --git a/public/includes/nusoap/lib/nusoap.php b/htdocs/includes/nusoap/lib/nusoap.php
similarity index 100%
rename from public/includes/nusoap/lib/nusoap.php
rename to htdocs/includes/nusoap/lib/nusoap.php
diff --git a/public/includes/nusoap/lib/nusoapmime.php b/htdocs/includes/nusoap/lib/nusoapmime.php
similarity index 100%
rename from public/includes/nusoap/lib/nusoapmime.php
rename to htdocs/includes/nusoap/lib/nusoapmime.php
diff --git a/public/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
similarity index 100%
rename from public/includes/odtphp/Segment.php
rename to htdocs/includes/odtphp/Segment.php
diff --git a/public/includes/odtphp/SegmentIterator.php b/htdocs/includes/odtphp/SegmentIterator.php
similarity index 100%
rename from public/includes/odtphp/SegmentIterator.php
rename to htdocs/includes/odtphp/SegmentIterator.php
diff --git a/public/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
similarity index 100%
rename from public/includes/odtphp/odf.php
rename to htdocs/includes/odtphp/odf.php
diff --git a/public/includes/odtphp/zip/PclZipProxy.php b/htdocs/includes/odtphp/zip/PclZipProxy.php
similarity index 100%
rename from public/includes/odtphp/zip/PclZipProxy.php
rename to htdocs/includes/odtphp/zip/PclZipProxy.php
diff --git a/public/includes/odtphp/zip/PhpZipProxy.php b/htdocs/includes/odtphp/zip/PhpZipProxy.php
similarity index 100%
rename from public/includes/odtphp/zip/PhpZipProxy.php
rename to htdocs/includes/odtphp/zip/PhpZipProxy.php
diff --git a/public/includes/odtphp/zip/ZipInterface.php b/htdocs/includes/odtphp/zip/ZipInterface.php
similarity index 100%
rename from public/includes/odtphp/zip/ZipInterface.php
rename to htdocs/includes/odtphp/zip/ZipInterface.php
diff --git a/public/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt
similarity index 100%
rename from public/includes/odtphp/zip/pclzip/gnu-lgpl.txt
rename to htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt
diff --git a/public/includes/odtphp/zip/pclzip/pclzip.lib.php b/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php
similarity index 100%
rename from public/includes/odtphp/zip/pclzip/pclzip.lib.php
rename to htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php
diff --git a/public/includes/odtphp/zip/pclzip/readme.txt b/htdocs/includes/odtphp/zip/pclzip/readme.txt
similarity index 100%
rename from public/includes/odtphp/zip/pclzip/readme.txt
rename to htdocs/includes/odtphp/zip/pclzip/readme.txt
diff --git a/public/includes/php-iban/.gitignore b/htdocs/includes/php-iban/.gitignore
similarity index 100%
rename from public/includes/php-iban/.gitignore
rename to htdocs/includes/php-iban/.gitignore
diff --git a/public/includes/php-iban/LICENSE b/htdocs/includes/php-iban/LICENSE
similarity index 100%
rename from public/includes/php-iban/LICENSE
rename to htdocs/includes/php-iban/LICENSE
diff --git a/public/includes/php-iban/mistranscriptions.txt b/htdocs/includes/php-iban/mistranscriptions.txt
similarity index 100%
rename from public/includes/php-iban/mistranscriptions.txt
rename to htdocs/includes/php-iban/mistranscriptions.txt
diff --git a/public/includes/php-iban/oophp-iban.php b/htdocs/includes/php-iban/oophp-iban.php
similarity index 100%
rename from public/includes/php-iban/oophp-iban.php
rename to htdocs/includes/php-iban/oophp-iban.php
diff --git a/public/includes/php-iban/php-iban.php b/htdocs/includes/php-iban/php-iban.php
similarity index 100%
rename from public/includes/php-iban/php-iban.php
rename to htdocs/includes/php-iban/php-iban.php
diff --git a/public/includes/php-iban/registry.txt b/htdocs/includes/php-iban/registry.txt
similarity index 100%
rename from public/includes/php-iban/registry.txt
rename to htdocs/includes/php-iban/registry.txt
diff --git a/public/includes/phpoffice/phpexcel/.gitattributes b/htdocs/includes/phpoffice/phpexcel/.gitattributes
similarity index 100%
rename from public/includes/phpoffice/phpexcel/.gitattributes
rename to htdocs/includes/phpoffice/phpexcel/.gitattributes
diff --git a/public/includes/phpoffice/phpexcel/.gitignore b/htdocs/includes/phpoffice/phpexcel/.gitignore
similarity index 100%
rename from public/includes/phpoffice/phpexcel/.gitignore
rename to htdocs/includes/phpoffice/phpexcel/.gitignore
diff --git a/public/includes/phpoffice/phpexcel/.travis.yml b/htdocs/includes/phpoffice/phpexcel/.travis.yml
similarity index 100%
rename from public/includes/phpoffice/phpexcel/.travis.yml
rename to htdocs/includes/phpoffice/phpexcel/.travis.yml
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Autoloader.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Autoloader.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Autoloader.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Autoloader.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/APC.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/APC.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/APC.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/APC.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/ICache.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/ICache.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/ICache.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/ICache.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memory.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memory.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memory.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Memory.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorageFactory.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorageFactory.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorageFactory.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CachedObjectStorageFactory.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/Logger.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/Logger.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/Logger.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/CalcEngine/Logger.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Database.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Database.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Database.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Database.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/DateTime.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/DateTime.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/DateTime.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/DateTime.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Engineering.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Engineering.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Engineering.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Engineering.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Exception.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Exception.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Exception.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Exception.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/ExceptionHandler.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/ExceptionHandler.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/ExceptionHandler.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/ExceptionHandler.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Financial.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Financial.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Financial.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Financial.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaParser.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaParser.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaParser.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaParser.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaToken.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaToken.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaToken.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/FormulaToken.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Function.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Function.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Function.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Function.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Functions.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Functions.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Functions.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Functions.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Logical.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Logical.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Logical.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Logical.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/LookupRef.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/LookupRef.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/LookupRef.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/LookupRef.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/MathTrig.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/MathTrig.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/MathTrig.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/MathTrig.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Statistical.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Statistical.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Statistical.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Statistical.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/TextData.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/TextData.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/TextData.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/TextData.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Token/Stack.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Token/Stack.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Token/Stack.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/Token/Stack.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/functionlist.txt b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/functionlist.txt
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/functionlist.txt
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Calculation/functionlist.txt
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/AdvancedValueBinder.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/AdvancedValueBinder.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/AdvancedValueBinder.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/AdvancedValueBinder.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataType.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataType.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataType.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataType.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DefaultValueBinder.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DefaultValueBinder.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DefaultValueBinder.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/DefaultValueBinder.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/Hyperlink.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/Hyperlink.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/Hyperlink.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/Hyperlink.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/IValueBinder.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/IValueBinder.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/IValueBinder.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Cell/IValueBinder.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Axis.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Axis.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Axis.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Axis.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeries.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeries.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeries.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeries.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeriesValues.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeriesValues.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeriesValues.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/DataSeriesValues.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Exception.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Exception.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Exception.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Exception.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/GridLines.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/GridLines.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/GridLines.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/GridLines.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Layout.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Layout.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Layout.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Layout.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Legend.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Legend.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Legend.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Legend.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/PlotArea.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/PlotArea.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/PlotArea.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/PlotArea.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Properties.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Properties.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Properties.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Properties.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Title.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Title.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Title.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Chart/Title.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Comment.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Comment.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Comment.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Comment.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentProperties.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentProperties.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentProperties.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentProperties.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentSecurity.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentSecurity.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentSecurity.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/DocumentSecurity.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Exception.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Exception.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Exception.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Exception.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/HashTable.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/HashTable.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/HashTable.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/HashTable.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Helper/HTML.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Helper/HTML.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Helper/HTML.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Helper/HTML.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/IComparable.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IComparable.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/IComparable.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IComparable.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/NamedRange.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/NamedRange.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/NamedRange.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/NamedRange.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Abstract.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Abstract.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Abstract.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Abstract.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/CSV.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/CSV.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/CSV.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/CSV.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/DefaultReadFilter.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/DefaultReadFilter.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/DefaultReadFilter.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/DefaultReadFilter.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2003XML.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2003XML.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2003XML.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2003XML.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Chart.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Chart.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Chart.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Chart.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Theme.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Theme.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Theme.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007/Theme.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/Escher.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/Escher.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/Escher.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/Escher.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/MD5.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel5/RC4.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Exception.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Exception.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Exception.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Exception.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Gnumeric.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Gnumeric.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Gnumeric.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Gnumeric.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/HTML.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/HTML.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/HTML.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/HTML.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReadFilter.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReadFilter.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReadFilter.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReadFilter.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReader.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReader.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReader.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/IReader.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/OOCalc.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/OOCalc.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/OOCalc.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/OOCalc.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/SYLK.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/SYLK.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/SYLK.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/SYLK.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/ReferenceHelper.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/ReferenceHelper.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/ReferenceHelper.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/ReferenceHelper.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/ITextElement.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/ITextElement.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/ITextElement.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/ITextElement.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/Run.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/Run.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/Run.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/Run.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/TextElement.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/TextElement.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/TextElement.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/RichText/TextElement.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Settings.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Settings.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Settings.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Settings.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/CodePage.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/CodePage.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/CodePage.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/CodePage.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Date.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Date.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Date.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Date.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Drawing.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Drawing.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Drawing.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Drawing.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Excel5.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Excel5.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Excel5.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Excel5.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/File.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/File.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/File.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/File.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Font.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Font.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Font.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/Font.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/Matrix.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/Matrix.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/Matrix.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/Matrix.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/QRDecomposition.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Maths.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Maths.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Maths.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/JAMA/utils/Maths.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/ChainedBlockStream.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/ChainedBlockStream.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/ChainedBlockStream.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/ChainedBlockStream.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/File.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/File.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/File.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/File.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/readme.txt b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/readme.txt
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/readme.txt
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip/readme.txt
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PasswordHasher.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PasswordHasher.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PasswordHasher.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PasswordHasher.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/String.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/String.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/String.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/String.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/TimeZone.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/TimeZone.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/TimeZone.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/TimeZone.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/XMLWriter.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/XMLWriter.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/XMLWriter.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/XMLWriter.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipArchive.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipArchive.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipArchive.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipArchive.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipStreamWrapper.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipStreamWrapper.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipStreamWrapper.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/ZipStreamWrapper.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/bestFitClass.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/bestFitClass.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/bestFitClass.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/bestFitClass.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/exponentialBestFitClass.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/exponentialBestFitClass.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/exponentialBestFitClass.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/exponentialBestFitClass.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/linearBestFitClass.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/linearBestFitClass.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/linearBestFitClass.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/linearBestFitClass.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/logarithmicBestFitClass.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/logarithmicBestFitClass.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/logarithmicBestFitClass.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/logarithmicBestFitClass.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/polynomialBestFitClass.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/polynomialBestFitClass.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/polynomialBestFitClass.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/polynomialBestFitClass.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/powerBestFitClass.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/powerBestFitClass.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/powerBestFitClass.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/powerBestFitClass.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/trendClass.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/trendClass.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/trendClass.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/trend/trendClass.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Alignment.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Alignment.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Alignment.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Alignment.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Borders.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Borders.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Borders.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Borders.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Color.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Color.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Color.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Color.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Conditional.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Conditional.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Conditional.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Conditional.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Fill.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Fill.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Fill.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Fill.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Font.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Font.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Font.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Font.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/NumberFormat.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/NumberFormat.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/NumberFormat.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/NumberFormat.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Protection.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Protection.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Protection.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Protection.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Supervisor.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Supervisor.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Supervisor.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Supervisor.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/BaseDrawing.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/BaseDrawing.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/BaseDrawing.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/BaseDrawing.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/CellIterator.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/CellIterator.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/CellIterator.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/CellIterator.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Column.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Column.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Column.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Column.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnCellIterator.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnCellIterator.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnCellIterator.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnCellIterator.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnDimension.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnDimension.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnDimension.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnDimension.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnIterator.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnIterator.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnIterator.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/ColumnIterator.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing/Shadow.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing/Shadow.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing/Shadow.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Drawing/Shadow.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooter.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooter.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooter.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooter.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/MemoryDrawing.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/MemoryDrawing.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/MemoryDrawing.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/MemoryDrawing.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageMargins.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageMargins.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageMargins.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageMargins.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageSetup.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageSetup.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageSetup.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/PageSetup.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Protection.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Protection.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Protection.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Protection.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Row.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Row.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Row.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/Row.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowCellIterator.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowCellIterator.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowCellIterator.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowCellIterator.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowDimension.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowDimension.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowDimension.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowDimension.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowIterator.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowIterator.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowIterator.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/RowIterator.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/SheetView.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/SheetView.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/SheetView.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Worksheet/SheetView.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/WorksheetIterator.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/WorksheetIterator.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/WorksheetIterator.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/WorksheetIterator.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Abstract.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Abstract.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Abstract.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Abstract.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/CSV.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/CSV.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/CSV.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/CSV.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Comments.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Comments.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Comments.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Comments.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/DocProps.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/DocProps.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/DocProps.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/DocProps.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Drawing.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Drawing.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Drawing.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Drawing.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Rels.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Rels.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Rels.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Rels.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsRibbon.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsRibbon.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsRibbon.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsRibbon.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsVBA.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsVBA.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsVBA.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/RelsVBA.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/StringTable.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/StringTable.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/StringTable.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/StringTable.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Style.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Style.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Style.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Style.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Theme.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Theme.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Theme.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Theme.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Workbook.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Workbook.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Workbook.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Workbook.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Worksheet.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Worksheet.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Worksheet.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Worksheet.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/WriterPart.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/WriterPart.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/WriterPart.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/WriterPart.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Font.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Font.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Font.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Font.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Parser.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Parser.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Parser.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Parser.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Workbook.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Workbook.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Workbook.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Workbook.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Worksheet.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Worksheet.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Worksheet.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Worksheet.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Xf.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Exception.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Exception.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Exception.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Exception.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/HTML.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/HTML.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/HTML.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/HTML.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/IWriter.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/IWriter.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/IWriter.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/IWriter.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Cell/Comment.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Content.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Meta.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/MetaInf.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Mimetype.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Settings.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Styles.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/Thumbnails.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/OpenDocument/WriterPart.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/Core.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/Core.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/Core.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/Core.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/DomPDF.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/mPDF.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/PDF/tcPDF.php
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/bg/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/bg/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/bg/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/bg/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/functions
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
diff --git a/public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
similarity index 100%
rename from public/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
rename to htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
diff --git a/public/includes/phpoffice/phpexcel/changelog.txt b/htdocs/includes/phpoffice/phpexcel/changelog.txt
similarity index 100%
rename from public/includes/phpoffice/phpexcel/changelog.txt
rename to htdocs/includes/phpoffice/phpexcel/changelog.txt
diff --git a/public/includes/phpoffice/phpexcel/composer.json b/htdocs/includes/phpoffice/phpexcel/composer.json
similarity index 100%
rename from public/includes/phpoffice/phpexcel/composer.json
rename to htdocs/includes/phpoffice/phpexcel/composer.json
diff --git a/public/includes/phpoffice/phpexcel/install.txt b/htdocs/includes/phpoffice/phpexcel/install.txt
similarity index 100%
rename from public/includes/phpoffice/phpexcel/install.txt
rename to htdocs/includes/phpoffice/phpexcel/install.txt
diff --git a/public/includes/phpoffice/phpexcel/license.md b/htdocs/includes/phpoffice/phpexcel/license.md
similarity index 100%
rename from public/includes/phpoffice/phpexcel/license.md
rename to htdocs/includes/phpoffice/phpexcel/license.md
diff --git a/public/includes/printipp/BasicIPP.php b/htdocs/includes/printipp/BasicIPP.php
similarity index 100%
rename from public/includes/printipp/BasicIPP.php
rename to htdocs/includes/printipp/BasicIPP.php
diff --git a/public/includes/printipp/CupsPrintIPP.php b/htdocs/includes/printipp/CupsPrintIPP.php
similarity index 100%
rename from public/includes/printipp/CupsPrintIPP.php
rename to htdocs/includes/printipp/CupsPrintIPP.php
diff --git a/public/includes/printipp/ExtendedPrintIPP.php b/htdocs/includes/printipp/ExtendedPrintIPP.php
similarity index 100%
rename from public/includes/printipp/ExtendedPrintIPP.php
rename to htdocs/includes/printipp/ExtendedPrintIPP.php
diff --git a/public/includes/printipp/PrintIPP.php b/htdocs/includes/printipp/PrintIPP.php
similarity index 100%
rename from public/includes/printipp/PrintIPP.php
rename to htdocs/includes/printipp/PrintIPP.php
diff --git a/public/includes/printipp/http_class.php b/htdocs/includes/printipp/http_class.php
similarity index 100%
rename from public/includes/printipp/http_class.php
rename to htdocs/includes/printipp/http_class.php
diff --git a/public/includes/restler/framework/Luracast/Restler/ApcCache.php b/htdocs/includes/restler/framework/Luracast/Restler/ApcCache.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/ApcCache.php
rename to htdocs/includes/restler/framework/Luracast/Restler/ApcCache.php
diff --git a/public/includes/restler/framework/Luracast/Restler/AutoLoader.php b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/AutoLoader.php
rename to htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
diff --git a/public/includes/restler/framework/Luracast/Restler/CommentParser.php b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/CommentParser.php
rename to htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Compose.php b/htdocs/includes/restler/framework/Luracast/Restler/Compose.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Compose.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Compose.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Data/ApiMethodInfo.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Data/Arr.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Arr.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Data/Arr.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Data/Arr.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Data/Invalid.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Invalid.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Data/Invalid.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Data/Invalid.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Data/Object.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Object.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Data/Object.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Data/Object.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Data/Text.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Text.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Data/Text.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Data/Text.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Data/ValidationInfo.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Data/Validator.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/Validator.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Data/Validator.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Data/Validator.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Data/ValueObject.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/ValueObject.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Data/ValueObject.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Data/ValueObject.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Data/iValidate.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/iValidate.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Data/iValidate.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Data/iValidate.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Data/iValueObject.php b/htdocs/includes/restler/framework/Luracast/Restler/Data/iValueObject.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Data/iValueObject.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Data/iValueObject.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Defaults.php b/htdocs/includes/restler/framework/Luracast/Restler/Defaults.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Defaults.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Defaults.php
diff --git a/public/includes/restler/framework/Luracast/Restler/EventDispatcher.php b/htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/EventDispatcher.php
rename to htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Explorer.php b/htdocs/includes/restler/framework/Luracast/Restler/Explorer.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Explorer.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Explorer.php
diff --git a/public/includes/restler/framework/Luracast/Restler/ExplorerInfo.php b/htdocs/includes/restler/framework/Luracast/Restler/ExplorerInfo.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/ExplorerInfo.php
rename to htdocs/includes/restler/framework/Luracast/Restler/ExplorerInfo.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php b/htdocs/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Flash.php b/htdocs/includes/restler/framework/Luracast/Restler/Flash.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Flash.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Flash.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/AmfFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/DependentFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/DependentFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/DependentFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/DependentFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/DependentMultiFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/DependentMultiFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/DependentMultiFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/DependentMultiFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/Format.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/Format.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/Format.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/Format.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/HtmlFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/JsFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/JsFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/JsFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/JsFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/JsonFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/MultiFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/TsvFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/UrlEncodedFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/YamlFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Format/iFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/iFormat.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Format/iFormat.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Format/iFormat.php
diff --git a/public/includes/restler/framework/Luracast/Restler/HumanReadableCache.php b/htdocs/includes/restler/framework/Luracast/Restler/HumanReadableCache.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/HumanReadableCache.php
rename to htdocs/includes/restler/framework/Luracast/Restler/HumanReadableCache.php
diff --git a/public/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php b/htdocs/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php
rename to htdocs/includes/restler/framework/Luracast/Restler/InvalidAuthCredentials.php
diff --git a/public/includes/restler/framework/Luracast/Restler/MemcacheCache.php b/htdocs/includes/restler/framework/Luracast/Restler/MemcacheCache.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/MemcacheCache.php
rename to htdocs/includes/restler/framework/Luracast/Restler/MemcacheCache.php
diff --git a/public/includes/restler/framework/Luracast/Restler/PassThrough.php b/htdocs/includes/restler/framework/Luracast/Restler/PassThrough.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/PassThrough.php
rename to htdocs/includes/restler/framework/Luracast/Restler/PassThrough.php
diff --git a/public/includes/restler/framework/Luracast/Restler/README.md b/htdocs/includes/restler/framework/Luracast/Restler/README.md
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/README.md
rename to htdocs/includes/restler/framework/Luracast/Restler/README.md
diff --git a/public/includes/restler/framework/Luracast/Restler/Redirect.php b/htdocs/includes/restler/framework/Luracast/Restler/Redirect.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Redirect.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Redirect.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Resources.php b/htdocs/includes/restler/framework/Luracast/Restler/Resources.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Resources.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Resources.php
diff --git a/public/includes/restler/framework/Luracast/Restler/RestException.php b/htdocs/includes/restler/framework/Luracast/Restler/RestException.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/RestException.php
rename to htdocs/includes/restler/framework/Luracast/Restler/RestException.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Restler.php b/htdocs/includes/restler/framework/Luracast/Restler/Restler.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Restler.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Restler.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Routes.php b/htdocs/includes/restler/framework/Luracast/Restler/Routes.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Routes.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Routes.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Scope.php b/htdocs/includes/restler/framework/Luracast/Restler/Scope.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Scope.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Scope.php
diff --git a/public/includes/restler/framework/Luracast/Restler/UI/Emmet.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/UI/Emmet.php
rename to htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php
diff --git a/public/includes/restler/framework/Luracast/Restler/UI/FormStyles.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/FormStyles.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/UI/FormStyles.php
rename to htdocs/includes/restler/framework/Luracast/Restler/UI/FormStyles.php
diff --git a/public/includes/restler/framework/Luracast/Restler/UI/Forms.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Forms.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/UI/Forms.php
rename to htdocs/includes/restler/framework/Luracast/Restler/UI/Forms.php
diff --git a/public/includes/restler/framework/Luracast/Restler/UI/Nav.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/UI/Nav.php
rename to htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php
diff --git a/public/includes/restler/framework/Luracast/Restler/UI/Tags.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Tags.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/UI/Tags.php
rename to htdocs/includes/restler/framework/Luracast/Restler/UI/Tags.php
diff --git a/public/includes/restler/framework/Luracast/Restler/User.php b/htdocs/includes/restler/framework/Luracast/Restler/User.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/User.php
rename to htdocs/includes/restler/framework/Luracast/Restler/User.php
diff --git a/public/includes/restler/framework/Luracast/Restler/Util.php b/htdocs/includes/restler/framework/Luracast/Restler/Util.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/Util.php
rename to htdocs/includes/restler/framework/Luracast/Restler/Util.php
diff --git a/public/includes/restler/framework/Luracast/Restler/compatibility/iAuthenticate.php b/htdocs/includes/restler/framework/Luracast/Restler/compatibility/iAuthenticate.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/compatibility/iAuthenticate.php
rename to htdocs/includes/restler/framework/Luracast/Restler/compatibility/iAuthenticate.php
diff --git a/public/includes/restler/framework/Luracast/Restler/compatibility/restler1.php b/htdocs/includes/restler/framework/Luracast/Restler/compatibility/restler1.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/compatibility/restler1.php
rename to htdocs/includes/restler/framework/Luracast/Restler/compatibility/restler1.php
diff --git a/public/includes/restler/framework/Luracast/Restler/compatibility/restler2.php b/htdocs/includes/restler/framework/Luracast/Restler/compatibility/restler2.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/compatibility/restler2.php
rename to htdocs/includes/restler/framework/Luracast/Restler/compatibility/restler2.php
diff --git a/public/includes/restler/framework/Luracast/Restler/composer.json b/htdocs/includes/restler/framework/Luracast/Restler/composer.json
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/composer.json
rename to htdocs/includes/restler/framework/Luracast/Restler/composer.json
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/css/reset.css b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/reset.css
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/css/reset.css
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/css/reset.css
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/css/screen.css b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/images/explorer_icons.png b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/explorer_icons.png
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/images/explorer_icons.png
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/images/explorer_icons.png
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/images/throbber.gif b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/throbber.gif
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/images/throbber.gif
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/images/throbber.gif
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/index.html b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/index.html
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/backbone-min.js
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/handlebars-1.0.0.js
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/highlight.7.3.pack.js
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery-1.8.0.min.js
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.ba-bbq.min.js
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.slideto.min.js
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/jquery.wiggle.min.js
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred.bundle.js
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/shred/content.js
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/underscore-min.js
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/o2c.html b/htdocs/includes/restler/framework/Luracast/Restler/explorer/o2c.html
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/o2c.html
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/o2c.html
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
diff --git a/public/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
rename to htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
diff --git a/public/includes/restler/framework/Luracast/Restler/iAuthenticate.php b/htdocs/includes/restler/framework/Luracast/Restler/iAuthenticate.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/iAuthenticate.php
rename to htdocs/includes/restler/framework/Luracast/Restler/iAuthenticate.php
diff --git a/public/includes/restler/framework/Luracast/Restler/iCache.php b/htdocs/includes/restler/framework/Luracast/Restler/iCache.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/iCache.php
rename to htdocs/includes/restler/framework/Luracast/Restler/iCache.php
diff --git a/public/includes/restler/framework/Luracast/Restler/iCompose.php b/htdocs/includes/restler/framework/Luracast/Restler/iCompose.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/iCompose.php
rename to htdocs/includes/restler/framework/Luracast/Restler/iCompose.php
diff --git a/public/includes/restler/framework/Luracast/Restler/iFilter.php b/htdocs/includes/restler/framework/Luracast/Restler/iFilter.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/iFilter.php
rename to htdocs/includes/restler/framework/Luracast/Restler/iFilter.php
diff --git a/public/includes/restler/framework/Luracast/Restler/iIdentifyUser.php b/htdocs/includes/restler/framework/Luracast/Restler/iIdentifyUser.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/iIdentifyUser.php
rename to htdocs/includes/restler/framework/Luracast/Restler/iIdentifyUser.php
diff --git a/public/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php b/htdocs/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php
rename to htdocs/includes/restler/framework/Luracast/Restler/iProvideMultiVersionApi.php
diff --git a/public/includes/restler/framework/Luracast/Restler/iUseAuthentication.php b/htdocs/includes/restler/framework/Luracast/Restler/iUseAuthentication.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/iUseAuthentication.php
rename to htdocs/includes/restler/framework/Luracast/Restler/iUseAuthentication.php
diff --git a/public/includes/restler/framework/Luracast/Restler/views/debug.css b/htdocs/includes/restler/framework/Luracast/Restler/views/debug.css
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/views/debug.css
rename to htdocs/includes/restler/framework/Luracast/Restler/views/debug.css
diff --git a/public/includes/restler/framework/Luracast/Restler/views/debug.php b/htdocs/includes/restler/framework/Luracast/Restler/views/debug.php
similarity index 100%
rename from public/includes/restler/framework/Luracast/Restler/views/debug.php
rename to htdocs/includes/restler/framework/Luracast/Restler/views/debug.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift.php b/htdocs/includes/swiftmailer/lib/classes/Swift.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Attachment.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Attachment.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Attachment.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Attachment.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/CharacterReader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/CharacterReader.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/CharacterStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/CharacterStream.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/ConfigurableSpool.php b/htdocs/includes/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/DependencyException.php b/htdocs/includes/swiftmailer/lib/classes/Swift/DependencyException.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/DependencyException.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/DependencyException.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php b/htdocs/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Encoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Encoder.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Encoder.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Encoding.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoding.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Encoding.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Encoding.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/Event.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/Event.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/Event.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/Event.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/EventListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventListener.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/EventListener.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventListener.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/FileSpool.php b/htdocs/includes/swiftmailer/lib/classes/Swift/FileSpool.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/FileSpool.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/FileSpool.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/FileStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/FileStream.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/FileStream.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/FileStream.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Filterable.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Filterable.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Filterable.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Filterable.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Image.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Image.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Image.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Image.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/InputByteStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/InputByteStream.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/InputByteStream.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/InputByteStream.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/IoException.php b/htdocs/includes/swiftmailer/lib/classes/Swift/IoException.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/IoException.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/IoException.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/KeyCache.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/KeyCache.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/MailTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/MailTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/MailTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/MailTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mailer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mailer.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mailer.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/MemorySpool.php b/htdocs/includes/swiftmailer/lib/classes/Swift/MemorySpool.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/MemorySpool.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/MemorySpool.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Message.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Message.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Message.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Message.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/Grammar.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Grammar.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/Grammar.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Grammar.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/Header.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Header.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/Header.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Header.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/Message.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Message.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/Message.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Message.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/MimePart.php b/htdocs/includes/swiftmailer/lib/classes/Swift/MimePart.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/MimePart.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/MimePart.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/NullTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/NullTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/NullTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/NullTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/OutputByteStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/OutputByteStream.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/OutputByteStream.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/OutputByteStream.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/Logger.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Logger.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/Logger.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Logger.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Plugins/Timer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Timer.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Plugins/Timer.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Timer.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Preferences.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Preferences.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Preferences.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Preferences.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php b/htdocs/includes/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/RfcComplianceException.php b/htdocs/includes/swiftmailer/lib/classes/Swift/RfcComplianceException.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/RfcComplianceException.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/RfcComplianceException.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/SignedMessage.php b/htdocs/includes/swiftmailer/lib/classes/Swift/SignedMessage.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/SignedMessage.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/SignedMessage.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Signer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signer.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Signer.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Signer.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Spool.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Spool.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Spool.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Spool.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/StreamFilter.php b/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilter.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/StreamFilter.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilter.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php b/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php b/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/SwiftException.php b/htdocs/includes/swiftmailer/lib/classes/Swift/SwiftException.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/SwiftException.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/SwiftException.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/MailTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/TransportException.php b/htdocs/includes/swiftmailer/lib/classes/Swift/TransportException.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/TransportException.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/TransportException.php
diff --git a/public/includes/swiftmailer/lib/classes/Swift/Validate.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Validate.php
similarity index 100%
rename from public/includes/swiftmailer/lib/classes/Swift/Validate.php
rename to htdocs/includes/swiftmailer/lib/classes/Swift/Validate.php
diff --git a/public/includes/swiftmailer/lib/dependency_maps/cache_deps.php b/htdocs/includes/swiftmailer/lib/dependency_maps/cache_deps.php
similarity index 100%
rename from public/includes/swiftmailer/lib/dependency_maps/cache_deps.php
rename to htdocs/includes/swiftmailer/lib/dependency_maps/cache_deps.php
diff --git a/public/includes/swiftmailer/lib/dependency_maps/message_deps.php b/htdocs/includes/swiftmailer/lib/dependency_maps/message_deps.php
similarity index 100%
rename from public/includes/swiftmailer/lib/dependency_maps/message_deps.php
rename to htdocs/includes/swiftmailer/lib/dependency_maps/message_deps.php
diff --git a/public/includes/swiftmailer/lib/dependency_maps/mime_deps.php b/htdocs/includes/swiftmailer/lib/dependency_maps/mime_deps.php
similarity index 100%
rename from public/includes/swiftmailer/lib/dependency_maps/mime_deps.php
rename to htdocs/includes/swiftmailer/lib/dependency_maps/mime_deps.php
diff --git a/public/includes/swiftmailer/lib/dependency_maps/transport_deps.php b/htdocs/includes/swiftmailer/lib/dependency_maps/transport_deps.php
similarity index 100%
rename from public/includes/swiftmailer/lib/dependency_maps/transport_deps.php
rename to htdocs/includes/swiftmailer/lib/dependency_maps/transport_deps.php
diff --git a/public/includes/swiftmailer/lib/mime_types.php b/htdocs/includes/swiftmailer/lib/mime_types.php
similarity index 100%
rename from public/includes/swiftmailer/lib/mime_types.php
rename to htdocs/includes/swiftmailer/lib/mime_types.php
diff --git a/public/includes/swiftmailer/lib/preferences.php b/htdocs/includes/swiftmailer/lib/preferences.php
similarity index 100%
rename from public/includes/swiftmailer/lib/preferences.php
rename to htdocs/includes/swiftmailer/lib/preferences.php
diff --git a/public/includes/swiftmailer/lib/swift_init.php b/htdocs/includes/swiftmailer/lib/swift_init.php
similarity index 100%
rename from public/includes/swiftmailer/lib/swift_init.php
rename to htdocs/includes/swiftmailer/lib/swift_init.php
diff --git a/public/includes/swiftmailer/lib/swift_required.php b/htdocs/includes/swiftmailer/lib/swift_required.php
similarity index 100%
rename from public/includes/swiftmailer/lib/swift_required.php
rename to htdocs/includes/swiftmailer/lib/swift_required.php
diff --git a/public/includes/swiftmailer/lib/swift_required_pear.php b/htdocs/includes/swiftmailer/lib/swift_required_pear.php
similarity index 100%
rename from public/includes/swiftmailer/lib/swift_required_pear.php
rename to htdocs/includes/swiftmailer/lib/swift_required_pear.php
diff --git a/public/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php b/htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
similarity index 100%
rename from public/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
rename to htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
diff --git a/public/includes/tcpdi/fpdf_tpl.php b/htdocs/includes/tcpdi/fpdf_tpl.php
similarity index 100%
rename from public/includes/tcpdi/fpdf_tpl.php
rename to htdocs/includes/tcpdi/fpdf_tpl.php
diff --git a/public/includes/tcpdi/tcpdi.php b/htdocs/includes/tcpdi/tcpdi.php
similarity index 100%
rename from public/includes/tcpdi/tcpdi.php
rename to htdocs/includes/tcpdi/tcpdi.php
diff --git a/public/includes/tcpdi/tcpdi_parser.php b/htdocs/includes/tcpdi/tcpdi_parser.php
similarity index 100%
rename from public/includes/tcpdi/tcpdi_parser.php
rename to htdocs/includes/tcpdi/tcpdi_parser.php
diff --git a/public/includes/tecnickcom/tcpdf/CHANGELOG.TXT b/htdocs/includes/tecnickcom/tcpdf/CHANGELOG.TXT
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/CHANGELOG.TXT
rename to htdocs/includes/tecnickcom/tcpdf/CHANGELOG.TXT
diff --git a/public/includes/tecnickcom/tcpdf/LICENSE.TXT b/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/LICENSE.TXT
rename to htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT
diff --git a/public/includes/tecnickcom/tcpdf/README.TXT b/htdocs/includes/tecnickcom/tcpdf/README.TXT
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/README.TXT
rename to htdocs/includes/tecnickcom/tcpdf/README.TXT
diff --git a/public/includes/tecnickcom/tcpdf/composer.json b/htdocs/includes/tecnickcom/tcpdf/composer.json
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/composer.json
rename to htdocs/includes/tecnickcom/tcpdf/composer.json
diff --git a/public/includes/tecnickcom/tcpdf/config/tcpdf_config.php b/htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/config/tcpdf_config.php
rename to htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING b/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING
rename to htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING
diff --git a/public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog b/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog
rename to htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog
diff --git a/public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK b/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK
rename to htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK
diff --git a/public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/README b/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/README
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/README
rename to htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/README
diff --git a/public/includes/tecnickcom/tcpdf/fonts/aealarabiya.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/aealarabiya.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/aealarabiya.php b/htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/aealarabiya.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/aealarabiya.z b/htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/aealarabiya.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/aealarabiya.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/aefurat.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/aefurat.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/aefurat.php b/htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/aefurat.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/aefurat.z b/htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/aefurat.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/aefurat.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/cid0cs.php b/htdocs/includes/tecnickcom/tcpdf/fonts/cid0cs.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/cid0cs.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/cid0cs.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/cid0ct.php b/htdocs/includes/tecnickcom/tcpdf/fonts/cid0ct.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/cid0ct.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/cid0ct.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/cid0jp.php b/htdocs/includes/tecnickcom/tcpdf/fonts/cid0jp.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/cid0jp.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/cid0jp.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/cid0kr.php b/htdocs/includes/tecnickcom/tcpdf/fonts/cid0kr.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/cid0kr.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/cid0kr.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/courier.php b/htdocs/includes/tecnickcom/tcpdf/fonts/courier.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/courier.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/courier.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/courierb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/courierb.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/courierb.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/courierb.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/courierbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/courierbi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/courierbi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/courierbi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/courieri.php b/htdocs/includes/tecnickcom/tcpdf/fonts/courieri.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/courieri.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/courieri.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/README b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/README
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/README
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/README
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/README
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusans.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusans.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusans.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusans.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusans.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusans.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusans.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansb.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansb.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansb.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansbi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansbi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansbi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansbi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansbi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensed.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedb.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedbi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusanscondensedi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansextralight.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansmono.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansmono.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansmono.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansmono.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansmono.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansmono.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmono.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonob.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonobi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavusansmonoi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserif.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserif.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserif.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserif.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserif.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserif.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserif.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifb.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifb.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifb.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifb.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifb.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifbi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensed.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedb.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedbi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifcondensedi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/dejavuserifi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/dejavuserifi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/dejavuserifi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/AUTHORS b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/AUTHORS
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/AUTHORS
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/AUTHORS
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/COPYING b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/COPYING
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/COPYING
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/COPYING
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/CREDITS b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/CREDITS
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/CREDITS
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/CREDITS
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/ChangeLog b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/ChangeLog
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/ChangeLog
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/ChangeLog
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/INSTALL b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/INSTALL
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/INSTALL
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/INSTALL
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/README b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/README
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20100919/README
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20100919/README
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/AUTHORS b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/AUTHORS
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/AUTHORS
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/AUTHORS
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/CREDITS b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/CREDITS
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/CREDITS
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/CREDITS
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/INSTALL b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/INSTALL
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/INSTALL
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/INSTALL
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/README b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/README
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/README
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/README
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/USAGE b/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/USAGE
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freefont-20120503/USAGE
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/USAGE
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freemono.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemono.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freemono.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemono.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freemono.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freemono.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freemono.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemono.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freemono.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemono.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freemono.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemono.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freemonob.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freemonob.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freemonob.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freemonob.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freemonob.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freemonob.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonob.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freemonobi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freemonobi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freemonobi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freemonobi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freemonobi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freemonobi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonobi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freemonoi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freemonoi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freemonoi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freemonoi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freemonoi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freemonoi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freemonoi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freesans.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesans.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freesans.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesans.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freesans.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freesans.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freesans.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesans.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freesans.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesans.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freesans.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesans.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freesansb.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freesansb.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freesansb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freesansb.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freesansb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freesansb.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansb.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freesansbi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freesansbi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freesansbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freesansbi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freesansbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freesansbi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansbi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freesansi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freesansi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freesansi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freesansi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freesansi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freesansi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freesansi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freeserif.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freeserif.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freeserif.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freeserif.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freeserif.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freeserif.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserif.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freeserifb.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freeserifb.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freeserifb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freeserifb.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freeserifb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freeserifb.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifb.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freeserifbi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freeserifbi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freeserifbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freeserifbi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freeserifbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freeserifbi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifbi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freeserifi.ctg.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.ctg.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freeserifi.ctg.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.ctg.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freeserifi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freeserifi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/freeserifi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/freeserifi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/freeserifi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/helvetica.php b/htdocs/includes/tecnickcom/tcpdf/fonts/helvetica.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/helvetica.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/helvetica.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/helveticab.php b/htdocs/includes/tecnickcom/tcpdf/fonts/helveticab.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/helveticab.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/helveticab.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/helveticabi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/helveticabi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/helveticabi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/helveticabi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/helveticai.php b/htdocs/includes/tecnickcom/tcpdf/fonts/helveticai.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/helveticai.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/helveticai.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/hysmyeongjostdmedium.php b/htdocs/includes/tecnickcom/tcpdf/fonts/hysmyeongjostdmedium.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/hysmyeongjostdmedium.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/hysmyeongjostdmedium.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/kozgopromedium.php b/htdocs/includes/tecnickcom/tcpdf/fonts/kozgopromedium.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/kozgopromedium.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/kozgopromedium.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/kozminproregular.php b/htdocs/includes/tecnickcom/tcpdf/fonts/kozminproregular.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/kozminproregular.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/kozminproregular.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/msungstdlight.php b/htdocs/includes/tecnickcom/tcpdf/fonts/msungstdlight.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/msungstdlight.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/msungstdlight.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfacourier.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourier.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfacourier.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourier.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfacourier.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourier.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfacourier.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourier.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfacourierb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierb.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfacourierb.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierb.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfacourierb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierb.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfacourierb.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierb.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourierbi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfacourieri.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourieri.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfacourieri.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourieri.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfacourieri.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourieri.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfacourieri.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfacourieri.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelvetica.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticab.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticabi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfahelveticai.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfasymbol.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfasymbol.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfasymbol.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfasymbol.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfasymbol.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfasymbol.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfasymbol.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfasymbol.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfatimes.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimes.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfatimes.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimes.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfatimes.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimes.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfatimes.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimes.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfatimesb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesb.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfatimesb.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesb.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfatimesb.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesb.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfatimesb.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesb.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesbi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfatimesi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfatimesi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfatimesi.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesi.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfatimesi.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfatimesi.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.php b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.z b/htdocs/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.z
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.z
rename to htdocs/includes/tecnickcom/tcpdf/fonts/pdfazapfdingbats.z
diff --git a/public/includes/tecnickcom/tcpdf/fonts/stsongstdlight.php b/htdocs/includes/tecnickcom/tcpdf/fonts/stsongstdlight.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/stsongstdlight.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/stsongstdlight.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/symbol.php b/htdocs/includes/tecnickcom/tcpdf/fonts/symbol.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/symbol.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/symbol.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/times.php b/htdocs/includes/tecnickcom/tcpdf/fonts/times.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/times.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/times.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/timesb.php b/htdocs/includes/tecnickcom/tcpdf/fonts/timesb.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/timesb.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/timesb.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/timesbi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/timesbi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/timesbi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/timesbi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/timesi.php b/htdocs/includes/tecnickcom/tcpdf/fonts/timesi.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/timesi.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/timesi.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/uni2cid_ac15.php b/htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ac15.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/uni2cid_ac15.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ac15.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/uni2cid_ag15.php b/htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ag15.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/uni2cid_ag15.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ag15.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/uni2cid_aj16.php b/htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_aj16.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/uni2cid_aj16.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_aj16.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/uni2cid_ak12.php b/htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ak12.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/uni2cid_ak12.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/uni2cid_ak12.php
diff --git a/public/includes/tecnickcom/tcpdf/fonts/zapfdingbats.php b/htdocs/includes/tecnickcom/tcpdf/fonts/zapfdingbats.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/fonts/zapfdingbats.php
rename to htdocs/includes/tecnickcom/tcpdf/fonts/zapfdingbats.php
diff --git a/public/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php b/htdocs/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php
rename to htdocs/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php
diff --git a/public/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php b/htdocs/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php
rename to htdocs/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php
diff --git a/public/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php b/htdocs/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php
rename to htdocs/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php
diff --git a/public/includes/tecnickcom/tcpdf/include/sRGB.icc b/htdocs/includes/tecnickcom/tcpdf/include/sRGB.icc
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/include/sRGB.icc
rename to htdocs/includes/tecnickcom/tcpdf/include/sRGB.icc
diff --git a/public/includes/tecnickcom/tcpdf/include/tcpdf_colors.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_colors.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/include/tcpdf_colors.php
rename to htdocs/includes/tecnickcom/tcpdf/include/tcpdf_colors.php
diff --git a/public/includes/tecnickcom/tcpdf/include/tcpdf_filters.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_filters.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/include/tcpdf_filters.php
rename to htdocs/includes/tecnickcom/tcpdf/include/tcpdf_filters.php
diff --git a/public/includes/tecnickcom/tcpdf/include/tcpdf_font_data.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_font_data.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/include/tcpdf_font_data.php
rename to htdocs/includes/tecnickcom/tcpdf/include/tcpdf_font_data.php
diff --git a/public/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php
rename to htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php
diff --git a/public/includes/tecnickcom/tcpdf/include/tcpdf_images.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_images.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/include/tcpdf_images.php
rename to htdocs/includes/tecnickcom/tcpdf/include/tcpdf_images.php
diff --git a/public/includes/tecnickcom/tcpdf/include/tcpdf_static.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/include/tcpdf_static.php
rename to htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
diff --git a/public/includes/tecnickcom/tcpdf/tcpdf.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/tcpdf.php
rename to htdocs/includes/tecnickcom/tcpdf/tcpdf.php
diff --git a/public/includes/tecnickcom/tcpdf/tcpdf_autoconfig.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf_autoconfig.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/tcpdf_autoconfig.php
rename to htdocs/includes/tecnickcom/tcpdf/tcpdf_autoconfig.php
diff --git a/public/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
rename to htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
diff --git a/public/includes/tecnickcom/tcpdf/tcpdf_barcodes_2d.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_2d.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/tcpdf_barcodes_2d.php
rename to htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_2d.php
diff --git a/public/includes/tecnickcom/tcpdf/tcpdf_import.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf_import.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/tcpdf_import.php
rename to htdocs/includes/tecnickcom/tcpdf/tcpdf_import.php
diff --git a/public/includes/tecnickcom/tcpdf/tcpdf_parser.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf_parser.php
similarity index 100%
rename from public/includes/tecnickcom/tcpdf/tcpdf_parser.php
rename to htdocs/includes/tecnickcom/tcpdf/tcpdf_parser.php
diff --git a/public/index.php b/htdocs/index.php
similarity index 100%
rename from public/index.php
rename to htdocs/index.php
diff --git a/public/install/.gitignore b/htdocs/install/.gitignore
similarity index 100%
rename from public/install/.gitignore
rename to htdocs/install/.gitignore
diff --git a/public/install/check.php b/htdocs/install/check.php
similarity index 100%
rename from public/install/check.php
rename to htdocs/install/check.php
diff --git a/public/install/default.css b/htdocs/install/default.css
similarity index 100%
rename from public/install/default.css
rename to htdocs/install/default.css
diff --git a/public/install/doctemplates/README b/htdocs/install/doctemplates/README
similarity index 100%
rename from public/install/doctemplates/README
rename to htdocs/install/doctemplates/README
diff --git a/public/install/doctemplates/index.html b/htdocs/install/doctemplates/index.html
similarity index 100%
rename from public/install/doctemplates/index.html
rename to htdocs/install/doctemplates/index.html
diff --git a/public/install/doctemplates/invoices/index.html b/htdocs/install/doctemplates/invoices/index.html
similarity index 100%
rename from public/install/doctemplates/invoices/index.html
rename to htdocs/install/doctemplates/invoices/index.html
diff --git a/public/install/doctemplates/invoices/template_invoice.odt b/htdocs/install/doctemplates/invoices/template_invoice.odt
similarity index 100%
rename from public/install/doctemplates/invoices/template_invoice.odt
rename to htdocs/install/doctemplates/invoices/template_invoice.odt
diff --git a/public/install/doctemplates/orders/index.html b/htdocs/install/doctemplates/orders/index.html
similarity index 100%
rename from public/install/doctemplates/orders/index.html
rename to htdocs/install/doctemplates/orders/index.html
diff --git a/public/install/doctemplates/orders/template_order.odt b/htdocs/install/doctemplates/orders/template_order.odt
similarity index 100%
rename from public/install/doctemplates/orders/template_order.odt
rename to htdocs/install/doctemplates/orders/template_order.odt
diff --git a/public/install/doctemplates/projects/index.html b/htdocs/install/doctemplates/projects/index.html
similarity index 100%
rename from public/install/doctemplates/projects/index.html
rename to htdocs/install/doctemplates/projects/index.html
diff --git a/public/install/doctemplates/projects/template_project.odt b/htdocs/install/doctemplates/projects/template_project.odt
similarity index 100%
rename from public/install/doctemplates/projects/template_project.odt
rename to htdocs/install/doctemplates/projects/template_project.odt
diff --git a/public/install/doctemplates/proposals/index.html b/htdocs/install/doctemplates/proposals/index.html
similarity index 100%
rename from public/install/doctemplates/proposals/index.html
rename to htdocs/install/doctemplates/proposals/index.html
diff --git a/public/install/doctemplates/proposals/template_proposal.odt b/htdocs/install/doctemplates/proposals/template_proposal.odt
similarity index 100%
rename from public/install/doctemplates/proposals/template_proposal.odt
rename to htdocs/install/doctemplates/proposals/template_proposal.odt
diff --git a/public/install/doctemplates/shipment/index.html b/htdocs/install/doctemplates/shipment/index.html
similarity index 100%
rename from public/install/doctemplates/shipment/index.html
rename to htdocs/install/doctemplates/shipment/index.html
diff --git a/public/install/doctemplates/shipment/template_shipment.odt b/htdocs/install/doctemplates/shipment/template_shipment.odt
similarity index 100%
rename from public/install/doctemplates/shipment/template_shipment.odt
rename to htdocs/install/doctemplates/shipment/template_shipment.odt
diff --git a/public/install/doctemplates/supplier_proposal/index.html b/htdocs/install/doctemplates/supplier_proposal/index.html
similarity index 100%
rename from public/install/doctemplates/supplier_proposal/index.html
rename to htdocs/install/doctemplates/supplier_proposal/index.html
diff --git a/public/install/doctemplates/supplier_proposal/template_supplier_proposal.odt b/htdocs/install/doctemplates/supplier_proposal/template_supplier_proposal.odt
similarity index 100%
rename from public/install/doctemplates/supplier_proposal/template_supplier_proposal.odt
rename to htdocs/install/doctemplates/supplier_proposal/template_supplier_proposal.odt
diff --git a/public/install/doctemplates/tasks/index.html b/htdocs/install/doctemplates/tasks/index.html
similarity index 100%
rename from public/install/doctemplates/tasks/index.html
rename to htdocs/install/doctemplates/tasks/index.html
diff --git a/public/install/doctemplates/tasks/template_task_summary.odt b/htdocs/install/doctemplates/tasks/template_task_summary.odt
similarity index 100%
rename from public/install/doctemplates/tasks/template_task_summary.odt
rename to htdocs/install/doctemplates/tasks/template_task_summary.odt
diff --git a/public/install/doctemplates/thirdparties/index.html b/htdocs/install/doctemplates/thirdparties/index.html
similarity index 100%
rename from public/install/doctemplates/thirdparties/index.html
rename to htdocs/install/doctemplates/thirdparties/index.html
diff --git a/public/install/doctemplates/thirdparties/template_thirdparty.ods b/htdocs/install/doctemplates/thirdparties/template_thirdparty.ods
similarity index 100%
rename from public/install/doctemplates/thirdparties/template_thirdparty.ods
rename to htdocs/install/doctemplates/thirdparties/template_thirdparty.ods
diff --git a/public/install/doctemplates/thirdparties/template_thirdparty.odt b/htdocs/install/doctemplates/thirdparties/template_thirdparty.odt
similarity index 100%
rename from public/install/doctemplates/thirdparties/template_thirdparty.odt
rename to htdocs/install/doctemplates/thirdparties/template_thirdparty.odt
diff --git a/public/install/fileconf.php b/htdocs/install/fileconf.php
similarity index 100%
rename from public/install/fileconf.php
rename to htdocs/install/fileconf.php
diff --git a/public/install/inc.php b/htdocs/install/inc.php
similarity index 100%
rename from public/install/inc.php
rename to htdocs/install/inc.php
diff --git a/public/install/index.php b/htdocs/install/index.php
similarity index 100%
rename from public/install/index.php
rename to htdocs/install/index.php
diff --git a/public/install/install.forced.sample.php b/htdocs/install/install.forced.sample.php
similarity index 100%
rename from public/install/install.forced.sample.php
rename to htdocs/install/install.forced.sample.php
diff --git a/public/install/lib/index.html b/htdocs/install/lib/index.html
similarity index 100%
rename from public/install/lib/index.html
rename to htdocs/install/lib/index.html
diff --git a/public/install/lib/repair.lib.php b/htdocs/install/lib/repair.lib.php
similarity index 100%
rename from public/install/lib/repair.lib.php
rename to htdocs/install/lib/repair.lib.php
diff --git a/public/install/mssql/README b/htdocs/install/mssql/README
similarity index 100%
rename from public/install/mssql/README
rename to htdocs/install/mssql/README
diff --git a/public/install/mssql/functions/index.html b/htdocs/install/mssql/functions/index.html
similarity index 100%
rename from public/install/mssql/functions/index.html
rename to htdocs/install/mssql/functions/index.html
diff --git a/public/install/mssql/index.html b/htdocs/install/mssql/index.html
similarity index 100%
rename from public/install/mssql/index.html
rename to htdocs/install/mssql/index.html
diff --git a/public/install/mysql/README b/htdocs/install/mysql/README
similarity index 100%
rename from public/install/mysql/README
rename to htdocs/install/mysql/README
diff --git a/public/install/mysql/data/index.html b/htdocs/install/mysql/data/index.html
similarity index 100%
rename from public/install/mysql/data/index.html
rename to htdocs/install/mysql/data/index.html
diff --git a/public/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
similarity index 100%
rename from public/install/mysql/data/llx_00_c_country.sql
rename to htdocs/install/mysql/data/llx_00_c_country.sql
diff --git a/public/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
similarity index 100%
rename from public/install/mysql/data/llx_10_c_regions.sql
rename to htdocs/install/mysql/data/llx_10_c_regions.sql
diff --git a/public/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
similarity index 100%
rename from public/install/mysql/data/llx_20_c_departements.sql
rename to htdocs/install/mysql/data/llx_20_c_departements.sql
diff --git a/public/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql
similarity index 100%
rename from public/install/mysql/data/llx_accounting.sql
rename to htdocs/install/mysql/data/llx_accounting.sql
diff --git a/public/install/mysql/data/llx_accounting_category.sql b/htdocs/install/mysql/data/llx_accounting_category.sql
similarity index 100%
rename from public/install/mysql/data/llx_accounting_category.sql
rename to htdocs/install/mysql/data/llx_accounting_category.sql
diff --git a/public/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_action_trigger.sql
rename to htdocs/install/mysql/data/llx_c_action_trigger.sql
diff --git a/public/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_actioncomm.sql
rename to htdocs/install/mysql/data/llx_c_actioncomm.sql
diff --git a/public/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_availability.sql
rename to htdocs/install/mysql/data/llx_c_availability.sql
diff --git a/public/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_chargesociales.sql
rename to htdocs/install/mysql/data/llx_c_chargesociales.sql
diff --git a/public/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_civilite.sql
rename to htdocs/install/mysql/data/llx_c_civilite.sql
diff --git a/public/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_currencies.sql
rename to htdocs/install/mysql/data/llx_c_currencies.sql
diff --git a/public/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_ecotaxe.sql
rename to htdocs/install/mysql/data/llx_c_ecotaxe.sql
diff --git a/public/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_effectif.sql
rename to htdocs/install/mysql/data/llx_c_effectif.sql
diff --git a/public/install/mysql/data/llx_c_format_cards.sql b/htdocs/install/mysql/data/llx_c_format_cards.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_format_cards.sql
rename to htdocs/install/mysql/data/llx_c_format_cards.sql
diff --git a/public/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_forme_juridique.sql
rename to htdocs/install/mysql/data/llx_c_forme_juridique.sql
diff --git a/public/install/mysql/data/llx_c_holiday_type.sql b/htdocs/install/mysql/data/llx_c_holiday_type.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_holiday_type.sql
rename to htdocs/install/mysql/data/llx_c_holiday_type.sql
diff --git a/public/install/mysql/data/llx_c_hrm_department.sql b/htdocs/install/mysql/data/llx_c_hrm_department.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_hrm_department.sql
rename to htdocs/install/mysql/data/llx_c_hrm_department.sql
diff --git a/public/install/mysql/data/llx_c_hrm_function.sql b/htdocs/install/mysql/data/llx_c_hrm_function.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_hrm_function.sql
rename to htdocs/install/mysql/data/llx_c_hrm_function.sql
diff --git a/public/install/mysql/data/llx_c_incoterms.sql b/htdocs/install/mysql/data/llx_c_incoterms.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_incoterms.sql
rename to htdocs/install/mysql/data/llx_c_incoterms.sql
diff --git a/public/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_input_method.sql
rename to htdocs/install/mysql/data/llx_c_input_method.sql
diff --git a/public/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_input_reason.sql
rename to htdocs/install/mysql/data/llx_c_input_reason.sql
diff --git a/public/install/mysql/data/llx_c_lead_status.sql b/htdocs/install/mysql/data/llx_c_lead_status.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_lead_status.sql
rename to htdocs/install/mysql/data/llx_c_lead_status.sql
diff --git a/public/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_paiement.sql
rename to htdocs/install/mysql/data/llx_c_paiement.sql
diff --git a/public/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_paper_format.sql
rename to htdocs/install/mysql/data/llx_c_paper_format.sql
diff --git a/public/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_payment_term.sql
rename to htdocs/install/mysql/data/llx_c_payment_term.sql
diff --git a/public/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_propalst.sql
rename to htdocs/install/mysql/data/llx_c_propalst.sql
diff --git a/public/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_prospectlevel.sql
rename to htdocs/install/mysql/data/llx_c_prospectlevel.sql
diff --git a/public/install/mysql/data/llx_c_revenuestamp.sql b/htdocs/install/mysql/data/llx_c_revenuestamp.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_revenuestamp.sql
rename to htdocs/install/mysql/data/llx_c_revenuestamp.sql
diff --git a/public/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_shipment_mode.sql
rename to htdocs/install/mysql/data/llx_c_shipment_mode.sql
diff --git a/public/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_stcomm.sql
rename to htdocs/install/mysql/data/llx_c_stcomm.sql
diff --git a/public/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_tva.sql
rename to htdocs/install/mysql/data/llx_c_tva.sql
diff --git a/public/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_type_contact.sql
rename to htdocs/install/mysql/data/llx_c_type_contact.sql
diff --git a/public/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_type_fees.sql
rename to htdocs/install/mysql/data/llx_c_type_fees.sql
diff --git a/public/install/mysql/data/llx_c_type_resource.sql b/htdocs/install/mysql/data/llx_c_type_resource.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_type_resource.sql
rename to htdocs/install/mysql/data/llx_c_type_resource.sql
diff --git a/public/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_typent.sql
rename to htdocs/install/mysql/data/llx_c_typent.sql
diff --git a/public/install/mysql/data/llx_c_units.sql b/htdocs/install/mysql/data/llx_c_units.sql
similarity index 100%
rename from public/install/mysql/data/llx_c_units.sql
rename to htdocs/install/mysql/data/llx_c_units.sql
diff --git a/public/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
similarity index 100%
rename from public/install/mysql/data/llx_const.sql
rename to htdocs/install/mysql/data/llx_const.sql
diff --git a/public/install/mysql/data/llx_holiday_config.sql b/htdocs/install/mysql/data/llx_holiday_config.sql
similarity index 100%
rename from public/install/mysql/data/llx_holiday_config.sql
rename to htdocs/install/mysql/data/llx_holiday_config.sql
diff --git a/public/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql
similarity index 100%
rename from public/install/mysql/functions/functions.sql
rename to htdocs/install/mysql/functions/functions.sql
diff --git a/public/install/mysql/functions/index.html b/htdocs/install/mysql/functions/index.html
similarity index 100%
rename from public/install/mysql/functions/index.html
rename to htdocs/install/mysql/functions/index.html
diff --git a/public/install/mysql/index.html b/htdocs/install/mysql/index.html
similarity index 100%
rename from public/install/mysql/index.html
rename to htdocs/install/mysql/index.html
diff --git a/public/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
similarity index 100%
rename from public/install/mysql/migration/3.0.0-3.1.0.sql
rename to htdocs/install/mysql/migration/3.0.0-3.1.0.sql
diff --git a/public/install/mysql/migration/3.1.0-3.2.0.sql b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql
similarity index 100%
rename from public/install/mysql/migration/3.1.0-3.2.0.sql
rename to htdocs/install/mysql/migration/3.1.0-3.2.0.sql
diff --git a/public/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
similarity index 100%
rename from public/install/mysql/migration/3.2.0-3.3.0.sql
rename to htdocs/install/mysql/migration/3.2.0-3.3.0.sql
diff --git a/public/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
similarity index 100%
rename from public/install/mysql/migration/3.3.0-3.4.0.sql
rename to htdocs/install/mysql/migration/3.3.0-3.4.0.sql
diff --git a/public/install/mysql/migration/3.4.0-3.5.0.sql b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
similarity index 100%
rename from public/install/mysql/migration/3.4.0-3.5.0.sql
rename to htdocs/install/mysql/migration/3.4.0-3.5.0.sql
diff --git a/public/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
similarity index 100%
rename from public/install/mysql/migration/3.5.0-3.6.0.sql
rename to htdocs/install/mysql/migration/3.5.0-3.6.0.sql
diff --git a/public/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
similarity index 100%
rename from public/install/mysql/migration/3.6.0-3.7.0.sql
rename to htdocs/install/mysql/migration/3.6.0-3.7.0.sql
diff --git a/public/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
similarity index 100%
rename from public/install/mysql/migration/3.7.0-3.8.0.sql
rename to htdocs/install/mysql/migration/3.7.0-3.8.0.sql
diff --git a/public/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
similarity index 100%
rename from public/install/mysql/migration/3.8.0-3.9.0.sql
rename to htdocs/install/mysql/migration/3.8.0-3.9.0.sql
diff --git a/public/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
similarity index 100%
rename from public/install/mysql/migration/3.9.0-4.0.0.sql
rename to htdocs/install/mysql/migration/3.9.0-4.0.0.sql
diff --git a/public/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
similarity index 100%
rename from public/install/mysql/migration/4.0.0-5.0.0.sql
rename to htdocs/install/mysql/migration/4.0.0-5.0.0.sql
diff --git a/public/install/mysql/migration/index.html b/htdocs/install/mysql/migration/index.html
similarity index 100%
rename from public/install/mysql/migration/index.html
rename to htdocs/install/mysql/migration/index.html
diff --git a/public/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
similarity index 100%
rename from public/install/mysql/migration/repair.sql
rename to htdocs/install/mysql/migration/repair.sql
diff --git a/public/install/mysql/tables/index.html b/htdocs/install/mysql/tables/index.html
similarity index 100%
rename from public/install/mysql/tables/index.html
rename to htdocs/install/mysql/tables/index.html
diff --git a/public/install/mysql/tables/llx_accounting_account.key.sql b/htdocs/install/mysql/tables/llx_accounting_account.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_accounting_account.key.sql
rename to htdocs/install/mysql/tables/llx_accounting_account.key.sql
diff --git a/public/install/mysql/tables/llx_accounting_account.sql b/htdocs/install/mysql/tables/llx_accounting_account.sql
similarity index 100%
rename from public/install/mysql/tables/llx_accounting_account.sql
rename to htdocs/install/mysql/tables/llx_accounting_account.sql
diff --git a/public/install/mysql/tables/llx_accounting_bookkeeping.key.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_accounting_bookkeeping.key.sql
rename to htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql
diff --git a/public/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
similarity index 100%
rename from public/install/mysql/tables/llx_accounting_bookkeeping.sql
rename to htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
diff --git a/public/install/mysql/tables/llx_accounting_fiscalyear.sql b/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
similarity index 100%
rename from public/install/mysql/tables/llx_accounting_fiscalyear.sql
rename to htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
diff --git a/public/install/mysql/tables/llx_accounting_journal.key.sql b/htdocs/install/mysql/tables/llx_accounting_journal.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_accounting_journal.key.sql
rename to htdocs/install/mysql/tables/llx_accounting_journal.key.sql
diff --git a/public/install/mysql/tables/llx_accounting_journal.sql b/htdocs/install/mysql/tables/llx_accounting_journal.sql
similarity index 100%
rename from public/install/mysql/tables/llx_accounting_journal.sql
rename to htdocs/install/mysql/tables/llx_accounting_journal.sql
diff --git a/public/install/mysql/tables/llx_accounting_system.key.sql b/htdocs/install/mysql/tables/llx_accounting_system.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_accounting_system.key.sql
rename to htdocs/install/mysql/tables/llx_accounting_system.key.sql
diff --git a/public/install/mysql/tables/llx_accounting_system.sql b/htdocs/install/mysql/tables/llx_accounting_system.sql
similarity index 100%
rename from public/install/mysql/tables/llx_accounting_system.sql
rename to htdocs/install/mysql/tables/llx_accounting_system.sql
diff --git a/public/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_actioncomm.key.sql
rename to htdocs/install/mysql/tables/llx_actioncomm.key.sql
diff --git a/public/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
similarity index 100%
rename from public/install/mysql/tables/llx_actioncomm.sql
rename to htdocs/install/mysql/tables/llx_actioncomm.sql
diff --git a/public/install/mysql/tables/llx_actioncomm_extrafields.key.sql b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_actioncomm_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_actioncomm_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_actioncomm_extrafields.sql b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_actioncomm_extrafields.sql
rename to htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql
diff --git a/public/install/mysql/tables/llx_actioncomm_resources.key.sql b/htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_actioncomm_resources.key.sql
rename to htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql
diff --git a/public/install/mysql/tables/llx_actioncomm_resources.sql b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
similarity index 100%
rename from public/install/mysql/tables/llx_actioncomm_resources.sql
rename to htdocs/install/mysql/tables/llx_actioncomm_resources.sql
diff --git a/public/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_adherent.key.sql
rename to htdocs/install/mysql/tables/llx_adherent.key.sql
diff --git a/public/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
similarity index 100%
rename from public/install/mysql/tables/llx_adherent.sql
rename to htdocs/install/mysql/tables/llx_adherent.sql
diff --git a/public/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_adherent_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_adherent_extrafields.sql
rename to htdocs/install/mysql/tables/llx_adherent_extrafields.sql
diff --git a/public/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_adherent_type.key.sql
rename to htdocs/install/mysql/tables/llx_adherent_type.key.sql
diff --git a/public/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql
similarity index 100%
rename from public/install/mysql/tables/llx_adherent_type.sql
rename to htdocs/install/mysql/tables/llx_adherent_type.sql
diff --git a/public/install/mysql/tables/llx_adherent_type_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_type_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_adherent_type_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_adherent_type_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_adherent_type_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_adherent_type_extrafields.sql
rename to htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql
diff --git a/public/install/mysql/tables/llx_advtargetemailing.key.sql b/htdocs/install/mysql/tables/llx_advtargetemailing.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_advtargetemailing.key.sql
rename to htdocs/install/mysql/tables/llx_advtargetemailing.key.sql
diff --git a/public/install/mysql/tables/llx_advtargetemailing.sql b/htdocs/install/mysql/tables/llx_advtargetemailing.sql
similarity index 100%
rename from public/install/mysql/tables/llx_advtargetemailing.sql
rename to htdocs/install/mysql/tables/llx_advtargetemailing.sql
diff --git a/public/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bank.key.sql
rename to htdocs/install/mysql/tables/llx_bank.key.sql
diff --git a/public/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bank.sql
rename to htdocs/install/mysql/tables/llx_bank.sql
diff --git a/public/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bank_account.key.sql
rename to htdocs/install/mysql/tables/llx_bank_account.key.sql
diff --git a/public/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bank_account.sql
rename to htdocs/install/mysql/tables/llx_bank_account.sql
diff --git a/public/install/mysql/tables/llx_bank_account_extrafields.key.sql b/htdocs/install/mysql/tables/llx_bank_account_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bank_account_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_bank_account_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_bank_account_extrafields.sql b/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bank_account_extrafields.sql
rename to htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
diff --git a/public/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bank_categ.sql
rename to htdocs/install/mysql/tables/llx_bank_categ.sql
diff --git a/public/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bank_class.key.sql
rename to htdocs/install/mysql/tables/llx_bank_class.key.sql
diff --git a/public/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bank_class.sql
rename to htdocs/install/mysql/tables/llx_bank_class.sql
diff --git a/public/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bank_url.key.sql
rename to htdocs/install/mysql/tables/llx_bank_url.key.sql
diff --git a/public/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bank_url.sql
rename to htdocs/install/mysql/tables/llx_bank_url.sql
diff --git a/public/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bookmark.key.sql
rename to htdocs/install/mysql/tables/llx_bookmark.key.sql
diff --git a/public/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bookmark.sql
rename to htdocs/install/mysql/tables/llx_bookmark.sql
diff --git a/public/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bordereau_cheque.key.sql
rename to htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql
diff --git a/public/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
similarity index 100%
rename from public/install/mysql/tables/llx_bordereau_cheque.sql
rename to htdocs/install/mysql/tables/llx_bordereau_cheque.sql
diff --git a/public/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_boxes.key.sql
rename to htdocs/install/mysql/tables/llx_boxes.key.sql
diff --git a/public/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql
similarity index 100%
rename from public/install/mysql/tables/llx_boxes.sql
rename to htdocs/install/mysql/tables/llx_boxes.sql
diff --git a/public/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_boxes_def.key.sql
rename to htdocs/install/mysql/tables/llx_boxes_def.key.sql
diff --git a/public/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql
similarity index 100%
rename from public/install/mysql/tables/llx_boxes_def.sql
rename to htdocs/install/mysql/tables/llx_boxes_def.sql
diff --git a/public/install/mysql/tables/llx_budget.sql b/htdocs/install/mysql/tables/llx_budget.sql
similarity index 100%
rename from public/install/mysql/tables/llx_budget.sql
rename to htdocs/install/mysql/tables/llx_budget.sql
diff --git a/public/install/mysql/tables/llx_budget_lines.key.sql b/htdocs/install/mysql/tables/llx_budget_lines.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_budget_lines.key.sql
rename to htdocs/install/mysql/tables/llx_budget_lines.key.sql
diff --git a/public/install/mysql/tables/llx_budget_lines.sql b/htdocs/install/mysql/tables/llx_budget_lines.sql
similarity index 100%
rename from public/install/mysql/tables/llx_budget_lines.sql
rename to htdocs/install/mysql/tables/llx_budget_lines.sql
diff --git a/public/install/mysql/tables/llx_c_accounting_category.key.sql b/htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_accounting_category.key.sql
rename to htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
diff --git a/public/install/mysql/tables/llx_c_accounting_category.sql b/htdocs/install/mysql/tables/llx_c_accounting_category.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_accounting_category.sql
rename to htdocs/install/mysql/tables/llx_c_accounting_category.sql
diff --git a/public/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_action_trigger.key.sql
rename to htdocs/install/mysql/tables/llx_c_action_trigger.key.sql
diff --git a/public/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_action_trigger.sql
rename to htdocs/install/mysql/tables/llx_c_action_trigger.sql
diff --git a/public/install/mysql/tables/llx_c_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_actioncomm.key.sql
rename to htdocs/install/mysql/tables/llx_c_actioncomm.key.sql
diff --git a/public/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_actioncomm.sql
rename to htdocs/install/mysql/tables/llx_c_actioncomm.sql
diff --git a/public/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_availability.key.sql
rename to htdocs/install/mysql/tables/llx_c_availability.key.sql
diff --git a/public/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_availability.sql
rename to htdocs/install/mysql/tables/llx_c_availability.sql
diff --git a/public/install/mysql/tables/llx_c_barcode_type.key.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_barcode_type.key.sql
rename to htdocs/install/mysql/tables/llx_c_barcode_type.key.sql
diff --git a/public/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_barcode_type.sql
rename to htdocs/install/mysql/tables/llx_c_barcode_type.sql
diff --git a/public/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_chargesociales.sql
rename to htdocs/install/mysql/tables/llx_c_chargesociales.sql
diff --git a/public/install/mysql/tables/llx_c_civility.key.sql b/htdocs/install/mysql/tables/llx_c_civility.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_civility.key.sql
rename to htdocs/install/mysql/tables/llx_c_civility.key.sql
diff --git a/public/install/mysql/tables/llx_c_civility.sql b/htdocs/install/mysql/tables/llx_c_civility.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_civility.sql
rename to htdocs/install/mysql/tables/llx_c_civility.sql
diff --git a/public/install/mysql/tables/llx_c_country.key.sql b/htdocs/install/mysql/tables/llx_c_country.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_country.key.sql
rename to htdocs/install/mysql/tables/llx_c_country.key.sql
diff --git a/public/install/mysql/tables/llx_c_country.sql b/htdocs/install/mysql/tables/llx_c_country.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_country.sql
rename to htdocs/install/mysql/tables/llx_c_country.sql
diff --git a/public/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_currencies.key.sql
rename to htdocs/install/mysql/tables/llx_c_currencies.key.sql
diff --git a/public/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_currencies.sql
rename to htdocs/install/mysql/tables/llx_c_currencies.sql
diff --git a/public/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_departements.key.sql
rename to htdocs/install/mysql/tables/llx_c_departements.key.sql
diff --git a/public/install/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_departements.sql
rename to htdocs/install/mysql/tables/llx_c_departements.sql
diff --git a/public/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_ecotaxe.key.sql
rename to htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql
diff --git a/public/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_ecotaxe.sql
rename to htdocs/install/mysql/tables/llx_c_ecotaxe.sql
diff --git a/public/install/mysql/tables/llx_c_effectif.key.sql b/htdocs/install/mysql/tables/llx_c_effectif.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_effectif.key.sql
rename to htdocs/install/mysql/tables/llx_c_effectif.key.sql
diff --git a/public/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_effectif.sql
rename to htdocs/install/mysql/tables/llx_c_effectif.sql
diff --git a/public/install/mysql/tables/llx_c_email_templates.key.sql b/htdocs/install/mysql/tables/llx_c_email_templates.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_email_templates.key.sql
rename to htdocs/install/mysql/tables/llx_c_email_templates.key.sql
diff --git a/public/install/mysql/tables/llx_c_email_templates.sql b/htdocs/install/mysql/tables/llx_c_email_templates.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_email_templates.sql
rename to htdocs/install/mysql/tables/llx_c_email_templates.sql
diff --git a/public/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_field_list.sql
rename to htdocs/install/mysql/tables/llx_c_field_list.sql
diff --git a/public/install/mysql/tables/llx_c_format_cards.sql b/htdocs/install/mysql/tables/llx_c_format_cards.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_format_cards.sql
rename to htdocs/install/mysql/tables/llx_c_format_cards.sql
diff --git a/public/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_forme_juridique.key.sql
rename to htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql
diff --git a/public/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_forme_juridique.sql
rename to htdocs/install/mysql/tables/llx_c_forme_juridique.sql
diff --git a/public/install/mysql/tables/llx_c_holiday_types.key.sql b/htdocs/install/mysql/tables/llx_c_holiday_types.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_holiday_types.key.sql
rename to htdocs/install/mysql/tables/llx_c_holiday_types.key.sql
diff --git a/public/install/mysql/tables/llx_c_holiday_types.sql b/htdocs/install/mysql/tables/llx_c_holiday_types.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_holiday_types.sql
rename to htdocs/install/mysql/tables/llx_c_holiday_types.sql
diff --git a/public/install/mysql/tables/llx_c_hrm_department.sql b/htdocs/install/mysql/tables/llx_c_hrm_department.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_hrm_department.sql
rename to htdocs/install/mysql/tables/llx_c_hrm_department.sql
diff --git a/public/install/mysql/tables/llx_c_hrm_function.sql b/htdocs/install/mysql/tables/llx_c_hrm_function.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_hrm_function.sql
rename to htdocs/install/mysql/tables/llx_c_hrm_function.sql
diff --git a/public/install/mysql/tables/llx_c_incoterms.key.sql b/htdocs/install/mysql/tables/llx_c_incoterms.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_incoterms.key.sql
rename to htdocs/install/mysql/tables/llx_c_incoterms.key.sql
diff --git a/public/install/mysql/tables/llx_c_incoterms.sql b/htdocs/install/mysql/tables/llx_c_incoterms.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_incoterms.sql
rename to htdocs/install/mysql/tables/llx_c_incoterms.sql
diff --git a/public/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_input_method.key.sql
rename to htdocs/install/mysql/tables/llx_c_input_method.key.sql
diff --git a/public/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_input_method.sql
rename to htdocs/install/mysql/tables/llx_c_input_method.sql
diff --git a/public/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_input_reason.key.sql
rename to htdocs/install/mysql/tables/llx_c_input_reason.key.sql
diff --git a/public/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_input_reason.sql
rename to htdocs/install/mysql/tables/llx_c_input_reason.sql
diff --git a/public/install/mysql/tables/llx_c_lead_status.key.sql b/htdocs/install/mysql/tables/llx_c_lead_status.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_lead_status.key.sql
rename to htdocs/install/mysql/tables/llx_c_lead_status.key.sql
diff --git a/public/install/mysql/tables/llx_c_lead_status.sql b/htdocs/install/mysql/tables/llx_c_lead_status.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_lead_status.sql
rename to htdocs/install/mysql/tables/llx_c_lead_status.sql
diff --git a/public/install/mysql/tables/llx_c_paiement.key.sql b/htdocs/install/mysql/tables/llx_c_paiement.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_paiement.key.sql
rename to htdocs/install/mysql/tables/llx_c_paiement.key.sql
diff --git a/public/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_paiement.sql
rename to htdocs/install/mysql/tables/llx_c_paiement.sql
diff --git a/public/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_paper_format.sql
rename to htdocs/install/mysql/tables/llx_c_paper_format.sql
diff --git a/public/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_payment_term.sql
rename to htdocs/install/mysql/tables/llx_c_payment_term.sql
diff --git a/public/install/mysql/tables/llx_c_price_expression.sql b/htdocs/install/mysql/tables/llx_c_price_expression.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_price_expression.sql
rename to htdocs/install/mysql/tables/llx_c_price_expression.sql
diff --git a/public/install/mysql/tables/llx_c_price_global_variable.sql b/htdocs/install/mysql/tables/llx_c_price_global_variable.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_price_global_variable.sql
rename to htdocs/install/mysql/tables/llx_c_price_global_variable.sql
diff --git a/public/install/mysql/tables/llx_c_price_global_variable_updater.sql b/htdocs/install/mysql/tables/llx_c_price_global_variable_updater.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_price_global_variable_updater.sql
rename to htdocs/install/mysql/tables/llx_c_price_global_variable_updater.sql
diff --git a/public/install/mysql/tables/llx_c_propalst.key.sql b/htdocs/install/mysql/tables/llx_c_propalst.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_propalst.key.sql
rename to htdocs/install/mysql/tables/llx_c_propalst.key.sql
diff --git a/public/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_propalst.sql
rename to htdocs/install/mysql/tables/llx_c_propalst.sql
diff --git a/public/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_prospectlevel.sql
rename to htdocs/install/mysql/tables/llx_c_prospectlevel.sql
diff --git a/public/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_regions.key.sql
rename to htdocs/install/mysql/tables/llx_c_regions.key.sql
diff --git a/public/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_regions.sql
rename to htdocs/install/mysql/tables/llx_c_regions.sql
diff --git a/public/install/mysql/tables/llx_c_revenuestamp.sql b/htdocs/install/mysql/tables/llx_c_revenuestamp.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_revenuestamp.sql
rename to htdocs/install/mysql/tables/llx_c_revenuestamp.sql
diff --git a/public/install/mysql/tables/llx_c_shipment_mode.key.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_shipment_mode.key.sql
rename to htdocs/install/mysql/tables/llx_c_shipment_mode.key.sql
diff --git a/public/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_shipment_mode.sql
rename to htdocs/install/mysql/tables/llx_c_shipment_mode.sql
diff --git a/public/install/mysql/tables/llx_c_stcomm.key.sql b/htdocs/install/mysql/tables/llx_c_stcomm.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_stcomm.key.sql
rename to htdocs/install/mysql/tables/llx_c_stcomm.key.sql
diff --git a/public/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_stcomm.sql
rename to htdocs/install/mysql/tables/llx_c_stcomm.sql
diff --git a/public/install/mysql/tables/llx_c_tva.key.sql b/htdocs/install/mysql/tables/llx_c_tva.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_tva.key.sql
rename to htdocs/install/mysql/tables/llx_c_tva.key.sql
diff --git a/public/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_tva.sql
rename to htdocs/install/mysql/tables/llx_c_tva.sql
diff --git a/public/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_type_contact.key.sql
rename to htdocs/install/mysql/tables/llx_c_type_contact.key.sql
diff --git a/public/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_type_contact.sql
rename to htdocs/install/mysql/tables/llx_c_type_contact.sql
diff --git a/public/install/mysql/tables/llx_c_type_fees.key.sql b/htdocs/install/mysql/tables/llx_c_type_fees.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_type_fees.key.sql
rename to htdocs/install/mysql/tables/llx_c_type_fees.key.sql
diff --git a/public/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_type_fees.sql
rename to htdocs/install/mysql/tables/llx_c_type_fees.sql
diff --git a/public/install/mysql/tables/llx_c_type_resource.key.sql b/htdocs/install/mysql/tables/llx_c_type_resource.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_type_resource.key.sql
rename to htdocs/install/mysql/tables/llx_c_type_resource.key.sql
diff --git a/public/install/mysql/tables/llx_c_type_resource.sql b/htdocs/install/mysql/tables/llx_c_type_resource.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_type_resource.sql
rename to htdocs/install/mysql/tables/llx_c_type_resource.sql
diff --git a/public/install/mysql/tables/llx_c_typent.key.sql b/htdocs/install/mysql/tables/llx_c_typent.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_typent.key.sql
rename to htdocs/install/mysql/tables/llx_c_typent.key.sql
diff --git a/public/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_typent.sql
rename to htdocs/install/mysql/tables/llx_c_typent.sql
diff --git a/public/install/mysql/tables/llx_c_units.key.sql b/htdocs/install/mysql/tables/llx_c_units.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_units.key.sql
rename to htdocs/install/mysql/tables/llx_c_units.key.sql
diff --git a/public/install/mysql/tables/llx_c_units.sql b/htdocs/install/mysql/tables/llx_c_units.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_units.sql
rename to htdocs/install/mysql/tables/llx_c_units.sql
diff --git a/public/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_ziptown.key.sql
rename to htdocs/install/mysql/tables/llx_c_ziptown.key.sql
diff --git a/public/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql
similarity index 100%
rename from public/install/mysql/tables/llx_c_ziptown.sql
rename to htdocs/install/mysql/tables/llx_c_ziptown.sql
diff --git a/public/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie.key.sql
rename to htdocs/install/mysql/tables/llx_categorie.key.sql
diff --git a/public/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie.sql
rename to htdocs/install/mysql/tables/llx_categorie.sql
diff --git a/public/install/mysql/tables/llx_categorie_account.key.sql b/htdocs/install/mysql/tables/llx_categorie_account.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_account.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_account.key.sql
diff --git a/public/install/mysql/tables/llx_categorie_account.sql b/htdocs/install/mysql/tables/llx_categorie_account.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_account.sql
rename to htdocs/install/mysql/tables/llx_categorie_account.sql
diff --git a/public/install/mysql/tables/llx_categorie_contact.key.sql b/htdocs/install/mysql/tables/llx_categorie_contact.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_contact.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_contact.key.sql
diff --git a/public/install/mysql/tables/llx_categorie_contact.sql b/htdocs/install/mysql/tables/llx_categorie_contact.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_contact.sql
rename to htdocs/install/mysql/tables/llx_categorie_contact.sql
diff --git a/public/install/mysql/tables/llx_categorie_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_fournisseur.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_fournisseur.key.sql
diff --git a/public/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_fournisseur.sql
rename to htdocs/install/mysql/tables/llx_categorie_fournisseur.sql
diff --git a/public/install/mysql/tables/llx_categorie_lang.key.sql b/htdocs/install/mysql/tables/llx_categorie_lang.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_lang.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_lang.key.sql
diff --git a/public/install/mysql/tables/llx_categorie_lang.sql b/htdocs/install/mysql/tables/llx_categorie_lang.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_lang.sql
rename to htdocs/install/mysql/tables/llx_categorie_lang.sql
diff --git a/public/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_member.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_member.key.sql
diff --git a/public/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_member.sql
rename to htdocs/install/mysql/tables/llx_categorie_member.sql
diff --git a/public/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_product.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_product.key.sql
diff --git a/public/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_product.sql
rename to htdocs/install/mysql/tables/llx_categorie_product.sql
diff --git a/public/install/mysql/tables/llx_categorie_project.key.sql b/htdocs/install/mysql/tables/llx_categorie_project.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_project.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_project.key.sql
diff --git a/public/install/mysql/tables/llx_categorie_project.sql b/htdocs/install/mysql/tables/llx_categorie_project.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_project.sql
rename to htdocs/install/mysql/tables/llx_categorie_project.sql
diff --git a/public/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_societe.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_societe.key.sql
diff --git a/public/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_societe.sql
rename to htdocs/install/mysql/tables/llx_categorie_societe.sql
diff --git a/public/install/mysql/tables/llx_categorie_user.key.sql b/htdocs/install/mysql/tables/llx_categorie_user.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_user.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_user.key.sql
diff --git a/public/install/mysql/tables/llx_categorie_user.sql b/htdocs/install/mysql/tables/llx_categorie_user.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categorie_user.sql
rename to htdocs/install/mysql/tables/llx_categorie_user.sql
diff --git a/public/install/mysql/tables/llx_categories_extrafields.key.sql b/htdocs/install/mysql/tables/llx_categories_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categories_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_categories_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_categories_extrafields.sql b/htdocs/install/mysql/tables/llx_categories_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_categories_extrafields.sql
rename to htdocs/install/mysql/tables/llx_categories_extrafields.sql
diff --git a/public/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
similarity index 100%
rename from public/install/mysql/tables/llx_chargesociales.sql
rename to htdocs/install/mysql/tables/llx_chargesociales.sql
diff --git a/public/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande.key.sql
rename to htdocs/install/mysql/tables/llx_commande.key.sql
diff --git a/public/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande.sql
rename to htdocs/install/mysql/tables/llx_commande.sql
diff --git a/public/install/mysql/tables/llx_commande_extrafields.key.sql b/htdocs/install/mysql/tables/llx_commande_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_commande_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_commande_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande_extrafields.sql
rename to htdocs/install/mysql/tables/llx_commande_extrafields.sql
diff --git a/public/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande_fournisseur.key.sql
rename to htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql
diff --git a/public/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande_fournisseur.sql
rename to htdocs/install/mysql/tables/llx_commande_fournisseur.sql
diff --git a/public/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql
rename to htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql
diff --git a/public/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
rename to htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
diff --git a/public/install/mysql/tables/llx_commande_fournisseur_extrafields.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande_fournisseur_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_commande_fournisseur_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
rename to htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
diff --git a/public/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande_fournisseur_log.sql
rename to htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql
diff --git a/public/install/mysql/tables/llx_commande_fournisseurdet.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande_fournisseurdet.key.sql
rename to htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql
diff --git a/public/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande_fournisseurdet.sql
rename to htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
diff --git a/public/install/mysql/tables/llx_commande_fournisseurdet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande_fournisseurdet_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
rename to htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
diff --git a/public/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commandedet.key.sql
rename to htdocs/install/mysql/tables/llx_commandedet.key.sql
diff --git a/public/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commandedet.sql
rename to htdocs/install/mysql/tables/llx_commandedet.sql
diff --git a/public/install/mysql/tables/llx_commandedet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_commandedet_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commandedet_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_commandedet_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_commandedet_extrafields.sql b/htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_commandedet_extrafields.sql
rename to htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
diff --git a/public/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_const.key.sql
rename to htdocs/install/mysql/tables/llx_const.key.sql
diff --git a/public/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql
similarity index 100%
rename from public/install/mysql/tables/llx_const.sql
rename to htdocs/install/mysql/tables/llx_const.sql
diff --git a/public/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_contrat.key.sql
rename to htdocs/install/mysql/tables/llx_contrat.key.sql
diff --git a/public/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql
similarity index 100%
rename from public/install/mysql/tables/llx_contrat.sql
rename to htdocs/install/mysql/tables/llx_contrat.sql
diff --git a/public/install/mysql/tables/llx_contrat_extrafields.key.sql b/htdocs/install/mysql/tables/llx_contrat_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_contrat_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_contrat_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_contrat_extrafields.sql b/htdocs/install/mysql/tables/llx_contrat_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_contrat_extrafields.sql
rename to htdocs/install/mysql/tables/llx_contrat_extrafields.sql
diff --git a/public/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_contratdet.key.sql
rename to htdocs/install/mysql/tables/llx_contratdet.key.sql
diff --git a/public/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql
similarity index 100%
rename from public/install/mysql/tables/llx_contratdet.sql
rename to htdocs/install/mysql/tables/llx_contratdet.sql
diff --git a/public/install/mysql/tables/llx_contratdet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_contratdet_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_contratdet_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_contratdet_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_contratdet_extrafields.sql b/htdocs/install/mysql/tables/llx_contratdet_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_contratdet_extrafields.sql
rename to htdocs/install/mysql/tables/llx_contratdet_extrafields.sql
diff --git a/public/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_contratdet_log.key.sql
rename to htdocs/install/mysql/tables/llx_contratdet_log.key.sql
diff --git a/public/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql
similarity index 100%
rename from public/install/mysql/tables/llx_contratdet_log.sql
rename to htdocs/install/mysql/tables/llx_contratdet_log.sql
diff --git a/public/install/mysql/tables/llx_cronjob.key.sql b/htdocs/install/mysql/tables/llx_cronjob.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_cronjob.key.sql
rename to htdocs/install/mysql/tables/llx_cronjob.key.sql
diff --git a/public/install/mysql/tables/llx_cronjob.sql b/htdocs/install/mysql/tables/llx_cronjob.sql
similarity index 100%
rename from public/install/mysql/tables/llx_cronjob.sql
rename to htdocs/install/mysql/tables/llx_cronjob.sql
diff --git a/public/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql
similarity index 100%
rename from public/install/mysql/tables/llx_deplacement.sql
rename to htdocs/install/mysql/tables/llx_deplacement.sql
diff --git a/public/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_document_model.key.sql
rename to htdocs/install/mysql/tables/llx_document_model.key.sql
diff --git a/public/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql
similarity index 100%
rename from public/install/mysql/tables/llx_document_model.sql
rename to htdocs/install/mysql/tables/llx_document_model.sql
diff --git a/public/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql
similarity index 100%
rename from public/install/mysql/tables/llx_don.sql
rename to htdocs/install/mysql/tables/llx_don.sql
diff --git a/public/install/mysql/tables/llx_don_extrafields.key.sql b/htdocs/install/mysql/tables/llx_don_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_don_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_don_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_don_extrafields.sql b/htdocs/install/mysql/tables/llx_don_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_don_extrafields.sql
rename to htdocs/install/mysql/tables/llx_don_extrafields.sql
diff --git a/public/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_ecm_directories.key.sql
rename to htdocs/install/mysql/tables/llx_ecm_directories.key.sql
diff --git a/public/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql
similarity index 100%
rename from public/install/mysql/tables/llx_ecm_directories.sql
rename to htdocs/install/mysql/tables/llx_ecm_directories.sql
diff --git a/public/install/mysql/tables/llx_ecm_files.key.sql b/htdocs/install/mysql/tables/llx_ecm_files.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_ecm_files.key.sql
rename to htdocs/install/mysql/tables/llx_ecm_files.key.sql
diff --git a/public/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql
similarity index 100%
rename from public/install/mysql/tables/llx_ecm_files.sql
rename to htdocs/install/mysql/tables/llx_ecm_files.sql
diff --git a/public/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_element_contact.key.sql
rename to htdocs/install/mysql/tables/llx_element_contact.key.sql
diff --git a/public/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql
similarity index 100%
rename from public/install/mysql/tables/llx_element_contact.sql
rename to htdocs/install/mysql/tables/llx_element_contact.sql
diff --git a/public/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_element_element.key.sql
rename to htdocs/install/mysql/tables/llx_element_element.key.sql
diff --git a/public/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql
similarity index 100%
rename from public/install/mysql/tables/llx_element_element.sql
rename to htdocs/install/mysql/tables/llx_element_element.sql
diff --git a/public/install/mysql/tables/llx_element_resources.key.sql b/htdocs/install/mysql/tables/llx_element_resources.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_element_resources.key.sql
rename to htdocs/install/mysql/tables/llx_element_resources.key.sql
diff --git a/public/install/mysql/tables/llx_element_resources.sql b/htdocs/install/mysql/tables/llx_element_resources.sql
similarity index 100%
rename from public/install/mysql/tables/llx_element_resources.sql
rename to htdocs/install/mysql/tables/llx_element_resources.sql
diff --git a/public/install/mysql/tables/llx_element_tag.key.sql b/htdocs/install/mysql/tables/llx_element_tag.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_element_tag.key.sql
rename to htdocs/install/mysql/tables/llx_element_tag.key.sql
diff --git a/public/install/mysql/tables/llx_element_tag.sql b/htdocs/install/mysql/tables/llx_element_tag.sql
similarity index 100%
rename from public/install/mysql/tables/llx_element_tag.sql
rename to htdocs/install/mysql/tables/llx_element_tag.sql
diff --git a/public/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_entrepot.key.sql
rename to htdocs/install/mysql/tables/llx_entrepot.key.sql
diff --git a/public/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql
similarity index 100%
rename from public/install/mysql/tables/llx_entrepot.sql
rename to htdocs/install/mysql/tables/llx_entrepot.sql
diff --git a/public/install/mysql/tables/llx_establishment.sql b/htdocs/install/mysql/tables/llx_establishment.sql
similarity index 100%
rename from public/install/mysql/tables/llx_establishment.sql
rename to htdocs/install/mysql/tables/llx_establishment.sql
diff --git a/public/install/mysql/tables/llx_event_element.sql b/htdocs/install/mysql/tables/llx_event_element.sql
similarity index 100%
rename from public/install/mysql/tables/llx_event_element.sql
rename to htdocs/install/mysql/tables/llx_event_element.sql
diff --git a/public/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_events.key.sql
rename to htdocs/install/mysql/tables/llx_events.key.sql
diff --git a/public/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql
similarity index 100%
rename from public/install/mysql/tables/llx_events.sql
rename to htdocs/install/mysql/tables/llx_events.sql
diff --git a/public/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expedition.key.sql
rename to htdocs/install/mysql/tables/llx_expedition.key.sql
diff --git a/public/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expedition.sql
rename to htdocs/install/mysql/tables/llx_expedition.sql
diff --git a/public/install/mysql/tables/llx_expedition_extrafields.key.sql b/htdocs/install/mysql/tables/llx_expedition_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expedition_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_expedition_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_expedition_extrafields.sql b/htdocs/install/mysql/tables/llx_expedition_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expedition_extrafields.sql
rename to htdocs/install/mysql/tables/llx_expedition_extrafields.sql
diff --git a/public/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expeditiondet.key.sql
rename to htdocs/install/mysql/tables/llx_expeditiondet.key.sql
diff --git a/public/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expeditiondet.sql
rename to htdocs/install/mysql/tables/llx_expeditiondet.sql
diff --git a/public/install/mysql/tables/llx_expeditiondet_batch.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expeditiondet_batch.key.sql
rename to htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
diff --git a/public/install/mysql/tables/llx_expeditiondet_batch.sql b/htdocs/install/mysql/tables/llx_expeditiondet_batch.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expeditiondet_batch.sql
rename to htdocs/install/mysql/tables/llx_expeditiondet_batch.sql
diff --git a/public/install/mysql/tables/llx_expeditiondet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expeditiondet_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_expeditiondet_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_expeditiondet_extrafields.sql b/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expeditiondet_extrafields.sql
rename to htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql
diff --git a/public/install/mysql/tables/llx_expensereport.key.sql b/htdocs/install/mysql/tables/llx_expensereport.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expensereport.key.sql
rename to htdocs/install/mysql/tables/llx_expensereport.key.sql
diff --git a/public/install/mysql/tables/llx_expensereport.sql b/htdocs/install/mysql/tables/llx_expensereport.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expensereport.sql
rename to htdocs/install/mysql/tables/llx_expensereport.sql
diff --git a/public/install/mysql/tables/llx_expensereport_det.sql b/htdocs/install/mysql/tables/llx_expensereport_det.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expensereport_det.sql
rename to htdocs/install/mysql/tables/llx_expensereport_det.sql
diff --git a/public/install/mysql/tables/llx_expensereport_extrafields.key.sql b/htdocs/install/mysql/tables/llx_expensereport_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expensereport_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_expensereport_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_expensereport_extrafields.sql b/htdocs/install/mysql/tables/llx_expensereport_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_expensereport_extrafields.sql
rename to htdocs/install/mysql/tables/llx_expensereport_extrafields.sql
diff --git a/public/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql
similarity index 100%
rename from public/install/mysql/tables/llx_export_compta.sql
rename to htdocs/install/mysql/tables/llx_export_compta.sql
diff --git a/public/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_export_model.key.sql
rename to htdocs/install/mysql/tables/llx_export_model.key.sql
diff --git a/public/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql
similarity index 100%
rename from public/install/mysql/tables/llx_export_model.sql
rename to htdocs/install/mysql/tables/llx_export_model.sql
diff --git a/public/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_extrafields.sql
rename to htdocs/install/mysql/tables/llx_extrafields.sql
diff --git a/public/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facture.key.sql
rename to htdocs/install/mysql/tables/llx_facture.key.sql
diff --git a/public/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facture.sql
rename to htdocs/install/mysql/tables/llx_facture.sql
diff --git a/public/install/mysql/tables/llx_facture_extrafields.key.sql b/htdocs/install/mysql/tables/llx_facture_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facture_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_facture_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_facture_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facture_extrafields.sql
rename to htdocs/install/mysql/tables/llx_facture_extrafields.sql
diff --git a/public/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facture_fourn.key.sql
rename to htdocs/install/mysql/tables/llx_facture_fourn.key.sql
diff --git a/public/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facture_fourn.sql
rename to htdocs/install/mysql/tables/llx_facture_fourn.sql
diff --git a/public/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facture_fourn_det.key.sql
rename to htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql
diff --git a/public/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facture_fourn_det.sql
rename to htdocs/install/mysql/tables/llx_facture_fourn_det.sql
diff --git a/public/install/mysql/tables/llx_facture_fourn_det_extrafields.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facture_fourn_det_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_facture_fourn_det_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
rename to htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
diff --git a/public/install/mysql/tables/llx_facture_fourn_extrafields.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facture_fourn_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_facture_fourn_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_facture_fourn_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facture_fourn_extrafields.sql
rename to htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql
diff --git a/public/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facture_rec.key.sql
rename to htdocs/install/mysql/tables/llx_facture_rec.key.sql
diff --git a/public/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facture_rec.sql
rename to htdocs/install/mysql/tables/llx_facture_rec.sql
diff --git a/public/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facturedet.key.sql
rename to htdocs/install/mysql/tables/llx_facturedet.key.sql
diff --git a/public/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facturedet.sql
rename to htdocs/install/mysql/tables/llx_facturedet.sql
diff --git a/public/install/mysql/tables/llx_facturedet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_facturedet_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facturedet_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_facturedet_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_facturedet_extrafields.sql b/htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facturedet_extrafields.sql
rename to htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
diff --git a/public/install/mysql/tables/llx_facturedet_rec.key.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facturedet_rec.key.sql
rename to htdocs/install/mysql/tables/llx_facturedet_rec.key.sql
diff --git a/public/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql
similarity index 100%
rename from public/install/mysql/tables/llx_facturedet_rec.sql
rename to htdocs/install/mysql/tables/llx_facturedet_rec.sql
diff --git a/public/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_fichinter.key.sql
rename to htdocs/install/mysql/tables/llx_fichinter.key.sql
diff --git a/public/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql
similarity index 100%
rename from public/install/mysql/tables/llx_fichinter.sql
rename to htdocs/install/mysql/tables/llx_fichinter.sql
diff --git a/public/install/mysql/tables/llx_fichinter_extrafields.key.sql b/htdocs/install/mysql/tables/llx_fichinter_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_fichinter_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_fichinter_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_fichinter_extrafields.sql b/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_fichinter_extrafields.sql
rename to htdocs/install/mysql/tables/llx_fichinter_extrafields.sql
diff --git a/public/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_fichinterdet.key.sql
rename to htdocs/install/mysql/tables/llx_fichinterdet.key.sql
diff --git a/public/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql
similarity index 100%
rename from public/install/mysql/tables/llx_fichinterdet.sql
rename to htdocs/install/mysql/tables/llx_fichinterdet.sql
diff --git a/public/install/mysql/tables/llx_fichinterdet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_fichinterdet_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_fichinterdet_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_fichinterdet_extrafields.sql b/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_fichinterdet_extrafields.sql
rename to htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql
diff --git a/public/install/mysql/tables/llx_holiday.key.sql b/htdocs/install/mysql/tables/llx_holiday.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_holiday.key.sql
rename to htdocs/install/mysql/tables/llx_holiday.key.sql
diff --git a/public/install/mysql/tables/llx_holiday.sql b/htdocs/install/mysql/tables/llx_holiday.sql
similarity index 100%
rename from public/install/mysql/tables/llx_holiday.sql
rename to htdocs/install/mysql/tables/llx_holiday.sql
diff --git a/public/install/mysql/tables/llx_holiday_config.sql b/htdocs/install/mysql/tables/llx_holiday_config.sql
similarity index 100%
rename from public/install/mysql/tables/llx_holiday_config.sql
rename to htdocs/install/mysql/tables/llx_holiday_config.sql
diff --git a/public/install/mysql/tables/llx_holiday_logs.sql b/htdocs/install/mysql/tables/llx_holiday_logs.sql
similarity index 100%
rename from public/install/mysql/tables/llx_holiday_logs.sql
rename to htdocs/install/mysql/tables/llx_holiday_logs.sql
diff --git a/public/install/mysql/tables/llx_holiday_users.sql b/htdocs/install/mysql/tables/llx_holiday_users.sql
similarity index 100%
rename from public/install/mysql/tables/llx_holiday_users.sql
rename to htdocs/install/mysql/tables/llx_holiday_users.sql
diff --git a/public/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_import_model.key.sql
rename to htdocs/install/mysql/tables/llx_import_model.key.sql
diff --git a/public/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql
similarity index 100%
rename from public/install/mysql/tables/llx_import_model.sql
rename to htdocs/install/mysql/tables/llx_import_model.sql
diff --git a/public/install/mysql/tables/llx_links.key.sql b/htdocs/install/mysql/tables/llx_links.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_links.key.sql
rename to htdocs/install/mysql/tables/llx_links.key.sql
diff --git a/public/install/mysql/tables/llx_links.sql b/htdocs/install/mysql/tables/llx_links.sql
similarity index 100%
rename from public/install/mysql/tables/llx_links.sql
rename to htdocs/install/mysql/tables/llx_links.sql
diff --git a/public/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_livraison.key.sql
rename to htdocs/install/mysql/tables/llx_livraison.key.sql
diff --git a/public/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql
similarity index 100%
rename from public/install/mysql/tables/llx_livraison.sql
rename to htdocs/install/mysql/tables/llx_livraison.sql
diff --git a/public/install/mysql/tables/llx_livraison_extrafields.key.sql b/htdocs/install/mysql/tables/llx_livraison_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_livraison_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_livraison_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_livraison_extrafields.sql b/htdocs/install/mysql/tables/llx_livraison_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_livraison_extrafields.sql
rename to htdocs/install/mysql/tables/llx_livraison_extrafields.sql
diff --git a/public/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_livraisondet.key.sql
rename to htdocs/install/mysql/tables/llx_livraisondet.key.sql
diff --git a/public/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql
similarity index 100%
rename from public/install/mysql/tables/llx_livraisondet.sql
rename to htdocs/install/mysql/tables/llx_livraisondet.sql
diff --git a/public/install/mysql/tables/llx_livraisondet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_livraisondet_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_livraisondet_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_livraisondet_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_livraisondet_extrafields.sql b/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_livraisondet_extrafields.sql
rename to htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql
diff --git a/public/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql
similarity index 100%
rename from public/install/mysql/tables/llx_loan.sql
rename to htdocs/install/mysql/tables/llx_loan.sql
diff --git a/public/install/mysql/tables/llx_localtax.sql b/htdocs/install/mysql/tables/llx_localtax.sql
similarity index 100%
rename from public/install/mysql/tables/llx_localtax.sql
rename to htdocs/install/mysql/tables/llx_localtax.sql
diff --git a/public/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql
similarity index 100%
rename from public/install/mysql/tables/llx_mailing.sql
rename to htdocs/install/mysql/tables/llx_mailing.sql
diff --git a/public/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_mailing_cibles.key.sql
rename to htdocs/install/mysql/tables/llx_mailing_cibles.key.sql
diff --git a/public/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql
similarity index 100%
rename from public/install/mysql/tables/llx_mailing_cibles.sql
rename to htdocs/install/mysql/tables/llx_mailing_cibles.sql
diff --git a/public/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_menu.key.sql
rename to htdocs/install/mysql/tables/llx_menu.key.sql
diff --git a/public/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql
similarity index 100%
rename from public/install/mysql/tables/llx_menu.sql
rename to htdocs/install/mysql/tables/llx_menu.sql
diff --git a/public/install/mysql/tables/llx_multicurrency.sql b/htdocs/install/mysql/tables/llx_multicurrency.sql
similarity index 100%
rename from public/install/mysql/tables/llx_multicurrency.sql
rename to htdocs/install/mysql/tables/llx_multicurrency.sql
diff --git a/public/install/mysql/tables/llx_multicurrency_rate.sql b/htdocs/install/mysql/tables/llx_multicurrency_rate.sql
similarity index 100%
rename from public/install/mysql/tables/llx_multicurrency_rate.sql
rename to htdocs/install/mysql/tables/llx_multicurrency_rate.sql
diff --git a/public/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql
similarity index 100%
rename from public/install/mysql/tables/llx_notify.sql
rename to htdocs/install/mysql/tables/llx_notify.sql
diff --git a/public/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql
similarity index 100%
rename from public/install/mysql/tables/llx_notify_def.sql
rename to htdocs/install/mysql/tables/llx_notify_def.sql
diff --git a/public/install/mysql/tables/llx_oauth_state.sql b/htdocs/install/mysql/tables/llx_oauth_state.sql
similarity index 100%
rename from public/install/mysql/tables/llx_oauth_state.sql
rename to htdocs/install/mysql/tables/llx_oauth_state.sql
diff --git a/public/install/mysql/tables/llx_oauth_token.sql b/htdocs/install/mysql/tables/llx_oauth_token.sql
similarity index 100%
rename from public/install/mysql/tables/llx_oauth_token.sql
rename to htdocs/install/mysql/tables/llx_oauth_token.sql
diff --git a/public/install/mysql/tables/llx_opensurvey_comments.key.sql b/htdocs/install/mysql/tables/llx_opensurvey_comments.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_opensurvey_comments.key.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_comments.key.sql
diff --git a/public/install/mysql/tables/llx_opensurvey_comments.sql b/htdocs/install/mysql/tables/llx_opensurvey_comments.sql
similarity index 100%
rename from public/install/mysql/tables/llx_opensurvey_comments.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_comments.sql
diff --git a/public/install/mysql/tables/llx_opensurvey_formquestions.sql b/htdocs/install/mysql/tables/llx_opensurvey_formquestions.sql
similarity index 100%
rename from public/install/mysql/tables/llx_opensurvey_formquestions.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_formquestions.sql
diff --git a/public/install/mysql/tables/llx_opensurvey_sondage.key.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_opensurvey_sondage.key.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_sondage.key.sql
diff --git a/public/install/mysql/tables/llx_opensurvey_sondage.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
similarity index 100%
rename from public/install/mysql/tables/llx_opensurvey_sondage.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
diff --git a/public/install/mysql/tables/llx_opensurvey_user_formanswers.sql b/htdocs/install/mysql/tables/llx_opensurvey_user_formanswers.sql
similarity index 100%
rename from public/install/mysql/tables/llx_opensurvey_user_formanswers.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_user_formanswers.sql
diff --git a/public/install/mysql/tables/llx_opensurvey_user_studs.key.sql b/htdocs/install/mysql/tables/llx_opensurvey_user_studs.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_opensurvey_user_studs.key.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_user_studs.key.sql
diff --git a/public/install/mysql/tables/llx_opensurvey_user_studs.sql b/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
similarity index 100%
rename from public/install/mysql/tables/llx_opensurvey_user_studs.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
diff --git a/public/install/mysql/tables/llx_overwrite_trans.key.sql b/htdocs/install/mysql/tables/llx_overwrite_trans.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_overwrite_trans.key.sql
rename to htdocs/install/mysql/tables/llx_overwrite_trans.key.sql
diff --git a/public/install/mysql/tables/llx_overwrite_trans.sql b/htdocs/install/mysql/tables/llx_overwrite_trans.sql
similarity index 100%
rename from public/install/mysql/tables/llx_overwrite_trans.sql
rename to htdocs/install/mysql/tables/llx_overwrite_trans.sql
diff --git a/public/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql
similarity index 100%
rename from public/install/mysql/tables/llx_paiement.sql
rename to htdocs/install/mysql/tables/llx_paiement.sql
diff --git a/public/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_paiement_facture.key.sql
rename to htdocs/install/mysql/tables/llx_paiement_facture.key.sql
diff --git a/public/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql
similarity index 100%
rename from public/install/mysql/tables/llx_paiement_facture.sql
rename to htdocs/install/mysql/tables/llx_paiement_facture.sql
diff --git a/public/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql
similarity index 100%
rename from public/install/mysql/tables/llx_paiementcharge.sql
rename to htdocs/install/mysql/tables/llx_paiementcharge.sql
diff --git a/public/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql
similarity index 100%
rename from public/install/mysql/tables/llx_paiementfourn.sql
rename to htdocs/install/mysql/tables/llx_paiementfourn.sql
diff --git a/public/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql
rename to htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql
diff --git a/public/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql
similarity index 100%
rename from public/install/mysql/tables/llx_paiementfourn_facturefourn.sql
rename to htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql
diff --git a/public/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql
similarity index 100%
rename from public/install/mysql/tables/llx_payment_donation.sql
rename to htdocs/install/mysql/tables/llx_payment_donation.sql
diff --git a/public/install/mysql/tables/llx_payment_expensereport.sql b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
similarity index 100%
rename from public/install/mysql/tables/llx_payment_expensereport.sql
rename to htdocs/install/mysql/tables/llx_payment_expensereport.sql
diff --git a/public/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql
similarity index 100%
rename from public/install/mysql/tables/llx_payment_loan.sql
rename to htdocs/install/mysql/tables/llx_payment_loan.sql
diff --git a/public/install/mysql/tables/llx_payment_salary.key.sql b/htdocs/install/mysql/tables/llx_payment_salary.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_payment_salary.key.sql
rename to htdocs/install/mysql/tables/llx_payment_salary.key.sql
diff --git a/public/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql
similarity index 100%
rename from public/install/mysql/tables/llx_payment_salary.sql
rename to htdocs/install/mysql/tables/llx_payment_salary.sql
diff --git a/public/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_prelevement_bons.key.sql
rename to htdocs/install/mysql/tables/llx_prelevement_bons.key.sql
diff --git a/public/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
similarity index 100%
rename from public/install/mysql/tables/llx_prelevement_bons.sql
rename to htdocs/install/mysql/tables/llx_prelevement_bons.sql
diff --git a/public/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_prelevement_facture.key.sql
rename to htdocs/install/mysql/tables/llx_prelevement_facture.key.sql
diff --git a/public/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql
similarity index 100%
rename from public/install/mysql/tables/llx_prelevement_facture.sql
rename to htdocs/install/mysql/tables/llx_prelevement_facture.sql
diff --git a/public/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
similarity index 100%
rename from public/install/mysql/tables/llx_prelevement_facture_demande.sql
rename to htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
diff --git a/public/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_prelevement_lignes.key.sql
rename to htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql
diff --git a/public/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
similarity index 100%
rename from public/install/mysql/tables/llx_prelevement_lignes.sql
rename to htdocs/install/mysql/tables/llx_prelevement_lignes.sql
diff --git a/public/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql
similarity index 100%
rename from public/install/mysql/tables/llx_prelevement_rejet.sql
rename to htdocs/install/mysql/tables/llx_prelevement_rejet.sql
diff --git a/public/install/mysql/tables/llx_printing.sql b/htdocs/install/mysql/tables/llx_printing.sql
similarity index 100%
rename from public/install/mysql/tables/llx_printing.sql
rename to htdocs/install/mysql/tables/llx_printing.sql
diff --git a/public/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product.key.sql
rename to htdocs/install/mysql/tables/llx_product.key.sql
diff --git a/public/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product.sql
rename to htdocs/install/mysql/tables/llx_product.sql
diff --git a/public/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_association.key.sql
rename to htdocs/install/mysql/tables/llx_product_association.key.sql
diff --git a/public/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_association.sql
rename to htdocs/install/mysql/tables/llx_product_association.sql
diff --git a/public/install/mysql/tables/llx_product_batch.key.sql b/htdocs/install/mysql/tables/llx_product_batch.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_batch.key.sql
rename to htdocs/install/mysql/tables/llx_product_batch.key.sql
diff --git a/public/install/mysql/tables/llx_product_batch.sql b/htdocs/install/mysql/tables/llx_product_batch.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_batch.sql
rename to htdocs/install/mysql/tables/llx_product_batch.sql
diff --git a/public/install/mysql/tables/llx_product_customer_price.key.sql b/htdocs/install/mysql/tables/llx_product_customer_price.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_customer_price.key.sql
rename to htdocs/install/mysql/tables/llx_product_customer_price.key.sql
diff --git a/public/install/mysql/tables/llx_product_customer_price.sql b/htdocs/install/mysql/tables/llx_product_customer_price.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_customer_price.sql
rename to htdocs/install/mysql/tables/llx_product_customer_price.sql
diff --git a/public/install/mysql/tables/llx_product_customer_price_log.sql b/htdocs/install/mysql/tables/llx_product_customer_price_log.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_customer_price_log.sql
rename to htdocs/install/mysql/tables/llx_product_customer_price_log.sql
diff --git a/public/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_product_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_extrafields.sql
rename to htdocs/install/mysql/tables/llx_product_extrafields.sql
diff --git a/public/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_fournisseur_price.key.sql
rename to htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql
diff --git a/public/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_fournisseur_price.sql
rename to htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
diff --git a/public/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_fournisseur_price_log.sql
rename to htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql
diff --git a/public/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_lang.key.sql
rename to htdocs/install/mysql/tables/llx_product_lang.key.sql
diff --git a/public/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_lang.sql
rename to htdocs/install/mysql/tables/llx_product_lang.sql
diff --git a/public/install/mysql/tables/llx_product_lot.key.sql b/htdocs/install/mysql/tables/llx_product_lot.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_lot.key.sql
rename to htdocs/install/mysql/tables/llx_product_lot.key.sql
diff --git a/public/install/mysql/tables/llx_product_lot.sql b/htdocs/install/mysql/tables/llx_product_lot.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_lot.sql
rename to htdocs/install/mysql/tables/llx_product_lot.sql
diff --git a/public/install/mysql/tables/llx_product_lot_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_lot_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_lot_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_product_lot_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_product_lot_extrafields.sql b/htdocs/install/mysql/tables/llx_product_lot_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_lot_extrafields.sql
rename to htdocs/install/mysql/tables/llx_product_lot_extrafields.sql
diff --git a/public/install/mysql/tables/llx_product_price.key.sql b/htdocs/install/mysql/tables/llx_product_price.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_price.key.sql
rename to htdocs/install/mysql/tables/llx_product_price.key.sql
diff --git a/public/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_price.sql
rename to htdocs/install/mysql/tables/llx_product_price.sql
diff --git a/public/install/mysql/tables/llx_product_price_by_qty.key.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_price_by_qty.key.sql
rename to htdocs/install/mysql/tables/llx_product_price_by_qty.key.sql
diff --git a/public/install/mysql/tables/llx_product_price_by_qty.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_price_by_qty.sql
rename to htdocs/install/mysql/tables/llx_product_price_by_qty.sql
diff --git a/public/install/mysql/tables/llx_product_pricerules.key.sql b/htdocs/install/mysql/tables/llx_product_pricerules.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_pricerules.key.sql
rename to htdocs/install/mysql/tables/llx_product_pricerules.key.sql
diff --git a/public/install/mysql/tables/llx_product_pricerules.sql b/htdocs/install/mysql/tables/llx_product_pricerules.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_pricerules.sql
rename to htdocs/install/mysql/tables/llx_product_pricerules.sql
diff --git a/public/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_stock.key.sql
rename to htdocs/install/mysql/tables/llx_product_stock.key.sql
diff --git a/public/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_stock.sql
rename to htdocs/install/mysql/tables/llx_product_stock.sql
diff --git a/public/install/mysql/tables/llx_product_stock_entrepot.sql b/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
similarity index 100%
rename from public/install/mysql/tables/llx_product_stock_entrepot.sql
rename to htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
diff --git a/public/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_projet.key.sql
rename to htdocs/install/mysql/tables/llx_projet.key.sql
diff --git a/public/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql
similarity index 100%
rename from public/install/mysql/tables/llx_projet.sql
rename to htdocs/install/mysql/tables/llx_projet.sql
diff --git a/public/install/mysql/tables/llx_projet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_projet_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_projet_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_projet_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_projet_extrafields.sql b/htdocs/install/mysql/tables/llx_projet_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_projet_extrafields.sql
rename to htdocs/install/mysql/tables/llx_projet_extrafields.sql
diff --git a/public/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_projet_task.key.sql
rename to htdocs/install/mysql/tables/llx_projet_task.key.sql
diff --git a/public/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql
similarity index 100%
rename from public/install/mysql/tables/llx_projet_task.sql
rename to htdocs/install/mysql/tables/llx_projet_task.sql
diff --git a/public/install/mysql/tables/llx_projet_task_extrafields.key.sql b/htdocs/install/mysql/tables/llx_projet_task_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_projet_task_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_projet_task_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_projet_task_extrafields.sql b/htdocs/install/mysql/tables/llx_projet_task_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_projet_task_extrafields.sql
rename to htdocs/install/mysql/tables/llx_projet_task_extrafields.sql
diff --git a/public/install/mysql/tables/llx_projet_task_time.key.sql b/htdocs/install/mysql/tables/llx_projet_task_time.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_projet_task_time.key.sql
rename to htdocs/install/mysql/tables/llx_projet_task_time.key.sql
diff --git a/public/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql
similarity index 100%
rename from public/install/mysql/tables/llx_projet_task_time.sql
rename to htdocs/install/mysql/tables/llx_projet_task_time.sql
diff --git a/public/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_propal.key.sql
rename to htdocs/install/mysql/tables/llx_propal.key.sql
diff --git a/public/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql
similarity index 100%
rename from public/install/mysql/tables/llx_propal.sql
rename to htdocs/install/mysql/tables/llx_propal.sql
diff --git a/public/install/mysql/tables/llx_propal_extrafields.key.sql b/htdocs/install/mysql/tables/llx_propal_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_propal_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_propal_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_propal_extrafields.sql b/htdocs/install/mysql/tables/llx_propal_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_propal_extrafields.sql
rename to htdocs/install/mysql/tables/llx_propal_extrafields.sql
diff --git a/public/install/mysql/tables/llx_propal_merge_pdf_product.sql b/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
similarity index 100%
rename from public/install/mysql/tables/llx_propal_merge_pdf_product.sql
rename to htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
diff --git a/public/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_propaldet.key.sql
rename to htdocs/install/mysql/tables/llx_propaldet.key.sql
diff --git a/public/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql
similarity index 100%
rename from public/install/mysql/tables/llx_propaldet.sql
rename to htdocs/install/mysql/tables/llx_propaldet.sql
diff --git a/public/install/mysql/tables/llx_propaldet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_propaldet_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_propaldet_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_propaldet_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_propaldet_extrafields.sql b/htdocs/install/mysql/tables/llx_propaldet_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_propaldet_extrafields.sql
rename to htdocs/install/mysql/tables/llx_propaldet_extrafields.sql
diff --git a/public/install/mysql/tables/llx_resource.key.sql b/htdocs/install/mysql/tables/llx_resource.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_resource.key.sql
rename to htdocs/install/mysql/tables/llx_resource.key.sql
diff --git a/public/install/mysql/tables/llx_resource.sql b/htdocs/install/mysql/tables/llx_resource.sql
similarity index 100%
rename from public/install/mysql/tables/llx_resource.sql
rename to htdocs/install/mysql/tables/llx_resource.sql
diff --git a/public/install/mysql/tables/llx_resource_extrafields.key.sql b/htdocs/install/mysql/tables/llx_resource_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_resource_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_resource_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_resource_extrafields.sql b/htdocs/install/mysql/tables/llx_resource_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_resource_extrafields.sql
rename to htdocs/install/mysql/tables/llx_resource_extrafields.sql
diff --git a/public/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_rights_def.key.sql
rename to htdocs/install/mysql/tables/llx_rights_def.key.sql
diff --git a/public/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql
similarity index 100%
rename from public/install/mysql/tables/llx_rights_def.sql
rename to htdocs/install/mysql/tables/llx_rights_def.sql
diff --git a/public/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_societe.key.sql
rename to htdocs/install/mysql/tables/llx_societe.key.sql
diff --git a/public/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
similarity index 100%
rename from public/install/mysql/tables/llx_societe.sql
rename to htdocs/install/mysql/tables/llx_societe.sql
diff --git a/public/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql
similarity index 100%
rename from public/install/mysql/tables/llx_societe_address.sql
rename to htdocs/install/mysql/tables/llx_societe_address.sql
diff --git a/public/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_societe_commerciaux.key.sql
rename to htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql
diff --git a/public/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql
similarity index 100%
rename from public/install/mysql/tables/llx_societe_commerciaux.sql
rename to htdocs/install/mysql/tables/llx_societe_commerciaux.sql
diff --git a/public/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_societe_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_societe_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_societe_extrafields.sql
rename to htdocs/install/mysql/tables/llx_societe_extrafields.sql
diff --git a/public/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql
similarity index 100%
rename from public/install/mysql/tables/llx_societe_log.sql
rename to htdocs/install/mysql/tables/llx_societe_log.sql
diff --git a/public/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql
similarity index 100%
rename from public/install/mysql/tables/llx_societe_prices.sql
rename to htdocs/install/mysql/tables/llx_societe_prices.sql
diff --git a/public/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql
similarity index 100%
rename from public/install/mysql/tables/llx_societe_remise.sql
rename to htdocs/install/mysql/tables/llx_societe_remise.sql
diff --git a/public/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_societe_remise_except.key.sql
rename to htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
diff --git a/public/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
similarity index 100%
rename from public/install/mysql/tables/llx_societe_remise_except.sql
rename to htdocs/install/mysql/tables/llx_societe_remise_except.sql
diff --git a/public/install/mysql/tables/llx_societe_rib.key.sql b/htdocs/install/mysql/tables/llx_societe_rib.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_societe_rib.key.sql
rename to htdocs/install/mysql/tables/llx_societe_rib.key.sql
diff --git a/public/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql
similarity index 100%
rename from public/install/mysql/tables/llx_societe_rib.sql
rename to htdocs/install/mysql/tables/llx_societe_rib.sql
diff --git a/public/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_socpeople.key.sql
rename to htdocs/install/mysql/tables/llx_socpeople.key.sql
diff --git a/public/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql
similarity index 100%
rename from public/install/mysql/tables/llx_socpeople.sql
rename to htdocs/install/mysql/tables/llx_socpeople.sql
diff --git a/public/install/mysql/tables/llx_socpeople_extrafields.key.sql b/htdocs/install/mysql/tables/llx_socpeople_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_socpeople_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_socpeople_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_socpeople_extrafields.sql b/htdocs/install/mysql/tables/llx_socpeople_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_socpeople_extrafields.sql
rename to htdocs/install/mysql/tables/llx_socpeople_extrafields.sql
diff --git a/public/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_stock_mouvement.key.sql
rename to htdocs/install/mysql/tables/llx_stock_mouvement.key.sql
diff --git a/public/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
similarity index 100%
rename from public/install/mysql/tables/llx_stock_mouvement.sql
rename to htdocs/install/mysql/tables/llx_stock_mouvement.sql
diff --git a/public/install/mysql/tables/llx_subscription.key.sql b/htdocs/install/mysql/tables/llx_subscription.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_subscription.key.sql
rename to htdocs/install/mysql/tables/llx_subscription.key.sql
diff --git a/public/install/mysql/tables/llx_subscription.sql b/htdocs/install/mysql/tables/llx_subscription.sql
similarity index 100%
rename from public/install/mysql/tables/llx_subscription.sql
rename to htdocs/install/mysql/tables/llx_subscription.sql
diff --git a/public/install/mysql/tables/llx_supplier_proposal.sql b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
similarity index 100%
rename from public/install/mysql/tables/llx_supplier_proposal.sql
rename to htdocs/install/mysql/tables/llx_supplier_proposal.sql
diff --git a/public/install/mysql/tables/llx_supplier_proposal_extrafields.sql b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_supplier_proposal_extrafields.sql
rename to htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
diff --git a/public/install/mysql/tables/llx_supplier_proposaldet.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
similarity index 100%
rename from public/install/mysql/tables/llx_supplier_proposaldet.sql
rename to htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
diff --git a/public/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
rename to htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
diff --git a/public/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql
similarity index 100%
rename from public/install/mysql/tables/llx_tva.sql
rename to htdocs/install/mysql/tables/llx_tva.sql
diff --git a/public/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_user.key.sql
rename to htdocs/install/mysql/tables/llx_user.key.sql
diff --git a/public/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
similarity index 100%
rename from public/install/mysql/tables/llx_user.sql
rename to htdocs/install/mysql/tables/llx_user.sql
diff --git a/public/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql
similarity index 100%
rename from public/install/mysql/tables/llx_user_alert.sql
rename to htdocs/install/mysql/tables/llx_user_alert.sql
diff --git a/public/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql
similarity index 100%
rename from public/install/mysql/tables/llx_user_clicktodial.sql
rename to htdocs/install/mysql/tables/llx_user_clicktodial.sql
diff --git a/public/install/mysql/tables/llx_user_employment.key.sql b/htdocs/install/mysql/tables/llx_user_employment.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_user_employment.key.sql
rename to htdocs/install/mysql/tables/llx_user_employment.key.sql
diff --git a/public/install/mysql/tables/llx_user_employment.sql b/htdocs/install/mysql/tables/llx_user_employment.sql
similarity index 100%
rename from public/install/mysql/tables/llx_user_employment.sql
rename to htdocs/install/mysql/tables/llx_user_employment.sql
diff --git a/public/install/mysql/tables/llx_user_extrafields.key.sql b/htdocs/install/mysql/tables/llx_user_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_user_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_user_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_user_extrafields.sql b/htdocs/install/mysql/tables/llx_user_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_user_extrafields.sql
rename to htdocs/install/mysql/tables/llx_user_extrafields.sql
diff --git a/public/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_user_param.key.sql
rename to htdocs/install/mysql/tables/llx_user_param.key.sql
diff --git a/public/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql
similarity index 100%
rename from public/install/mysql/tables/llx_user_param.sql
rename to htdocs/install/mysql/tables/llx_user_param.sql
diff --git a/public/install/mysql/tables/llx_user_rib.sql b/htdocs/install/mysql/tables/llx_user_rib.sql
similarity index 100%
rename from public/install/mysql/tables/llx_user_rib.sql
rename to htdocs/install/mysql/tables/llx_user_rib.sql
diff --git a/public/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_user_rights.key.sql
rename to htdocs/install/mysql/tables/llx_user_rights.key.sql
diff --git a/public/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql
similarity index 100%
rename from public/install/mysql/tables/llx_user_rights.sql
rename to htdocs/install/mysql/tables/llx_user_rights.sql
diff --git a/public/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_usergroup.key.sql
rename to htdocs/install/mysql/tables/llx_usergroup.key.sql
diff --git a/public/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql
similarity index 100%
rename from public/install/mysql/tables/llx_usergroup.sql
rename to htdocs/install/mysql/tables/llx_usergroup.sql
diff --git a/public/install/mysql/tables/llx_usergroup_extrafields.key.sql b/htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_usergroup_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql
diff --git a/public/install/mysql/tables/llx_usergroup_extrafields.sql b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
similarity index 100%
rename from public/install/mysql/tables/llx_usergroup_extrafields.sql
rename to htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
diff --git a/public/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_usergroup_rights.key.sql
rename to htdocs/install/mysql/tables/llx_usergroup_rights.key.sql
diff --git a/public/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql
similarity index 100%
rename from public/install/mysql/tables/llx_usergroup_rights.sql
rename to htdocs/install/mysql/tables/llx_usergroup_rights.sql
diff --git a/public/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_usergroup_user.key.sql
rename to htdocs/install/mysql/tables/llx_usergroup_user.key.sql
diff --git a/public/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql
similarity index 100%
rename from public/install/mysql/tables/llx_usergroup_user.sql
rename to htdocs/install/mysql/tables/llx_usergroup_user.sql
diff --git a/public/install/mysql/tables/llx_website.key.sql b/htdocs/install/mysql/tables/llx_website.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_website.key.sql
rename to htdocs/install/mysql/tables/llx_website.key.sql
diff --git a/public/install/mysql/tables/llx_website.sql b/htdocs/install/mysql/tables/llx_website.sql
similarity index 100%
rename from public/install/mysql/tables/llx_website.sql
rename to htdocs/install/mysql/tables/llx_website.sql
diff --git a/public/install/mysql/tables/llx_website_pages.key.sql b/htdocs/install/mysql/tables/llx_website_pages.key.sql
similarity index 100%
rename from public/install/mysql/tables/llx_website_pages.key.sql
rename to htdocs/install/mysql/tables/llx_website_pages.key.sql
diff --git a/public/install/mysql/tables/llx_website_pages.sql b/htdocs/install/mysql/tables/llx_website_pages.sql
similarity index 100%
rename from public/install/mysql/tables/llx_website_pages.sql
rename to htdocs/install/mysql/tables/llx_website_pages.sql
diff --git a/public/install/pgsql/README b/htdocs/install/pgsql/README
similarity index 100%
rename from public/install/pgsql/README
rename to htdocs/install/pgsql/README
diff --git a/public/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
similarity index 100%
rename from public/install/pgsql/functions/functions.sql
rename to htdocs/install/pgsql/functions/functions.sql
diff --git a/public/install/pgsql/functions/index.html b/htdocs/install/pgsql/functions/index.html
similarity index 100%
rename from public/install/pgsql/functions/index.html
rename to htdocs/install/pgsql/functions/index.html
diff --git a/public/install/pgsql/index.html b/htdocs/install/pgsql/index.html
similarity index 100%
rename from public/install/pgsql/index.html
rename to htdocs/install/pgsql/index.html
diff --git a/public/install/phpinfo.php b/htdocs/install/phpinfo.php
similarity index 100%
rename from public/install/phpinfo.php
rename to htdocs/install/phpinfo.php
diff --git a/public/install/repair.php b/htdocs/install/repair.php
similarity index 100%
rename from public/install/repair.php
rename to htdocs/install/repair.php
diff --git a/public/install/robots.txt b/htdocs/install/robots.txt
similarity index 100%
rename from public/install/robots.txt
rename to htdocs/install/robots.txt
diff --git a/public/install/sqlite3/functions/functions.sql b/htdocs/install/sqlite3/functions/functions.sql
similarity index 100%
rename from public/install/sqlite3/functions/functions.sql
rename to htdocs/install/sqlite3/functions/functions.sql
diff --git a/public/install/sqlite3/index.html b/htdocs/install/sqlite3/index.html
similarity index 100%
rename from public/install/sqlite3/index.html
rename to htdocs/install/sqlite3/index.html
diff --git a/public/install/step1.php b/htdocs/install/step1.php
similarity index 100%
rename from public/install/step1.php
rename to htdocs/install/step1.php
diff --git a/public/install/step2.php b/htdocs/install/step2.php
similarity index 100%
rename from public/install/step2.php
rename to htdocs/install/step2.php
diff --git a/public/install/step4.php b/htdocs/install/step4.php
similarity index 100%
rename from public/install/step4.php
rename to htdocs/install/step4.php
diff --git a/public/install/step5.php b/htdocs/install/step5.php
similarity index 100%
rename from public/install/step5.php
rename to htdocs/install/step5.php
diff --git a/public/install/upgrade.php b/htdocs/install/upgrade.php
similarity index 100%
rename from public/install/upgrade.php
rename to htdocs/install/upgrade.php
diff --git a/public/install/upgrade2.php b/htdocs/install/upgrade2.php
similarity index 100%
rename from public/install/upgrade2.php
rename to htdocs/install/upgrade2.php
diff --git a/public/langs/HOWTO-Translation.txt b/htdocs/langs/HOWTO-Translation.txt
similarity index 100%
rename from public/langs/HOWTO-Translation.txt
rename to htdocs/langs/HOWTO-Translation.txt
diff --git a/public/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
similarity index 100%
rename from public/langs/ar_SA/accountancy.lang
rename to htdocs/langs/ar_SA/accountancy.lang
diff --git a/public/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
similarity index 100%
rename from public/langs/ar_SA/admin.lang
rename to htdocs/langs/ar_SA/admin.lang
diff --git a/public/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
similarity index 100%
rename from public/langs/ar_SA/agenda.lang
rename to htdocs/langs/ar_SA/agenda.lang
diff --git a/public/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
similarity index 100%
rename from public/langs/ar_SA/banks.lang
rename to htdocs/langs/ar_SA/banks.lang
diff --git a/public/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
similarity index 100%
rename from public/langs/ar_SA/bills.lang
rename to htdocs/langs/ar_SA/bills.lang
diff --git a/public/langs/ar_SA/bookmarks.lang b/htdocs/langs/ar_SA/bookmarks.lang
similarity index 100%
rename from public/langs/ar_SA/bookmarks.lang
rename to htdocs/langs/ar_SA/bookmarks.lang
diff --git a/public/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
similarity index 100%
rename from public/langs/ar_SA/boxes.lang
rename to htdocs/langs/ar_SA/boxes.lang
diff --git a/public/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
similarity index 100%
rename from public/langs/ar_SA/cashdesk.lang
rename to htdocs/langs/ar_SA/cashdesk.lang
diff --git a/public/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
similarity index 100%
rename from public/langs/ar_SA/categories.lang
rename to htdocs/langs/ar_SA/categories.lang
diff --git a/public/langs/ar_SA/commercial.lang b/htdocs/langs/ar_SA/commercial.lang
similarity index 100%
rename from public/langs/ar_SA/commercial.lang
rename to htdocs/langs/ar_SA/commercial.lang
diff --git a/public/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
similarity index 100%
rename from public/langs/ar_SA/companies.lang
rename to htdocs/langs/ar_SA/companies.lang
diff --git a/public/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
similarity index 100%
rename from public/langs/ar_SA/compta.lang
rename to htdocs/langs/ar_SA/compta.lang
diff --git a/public/langs/ar_SA/contracts.lang b/htdocs/langs/ar_SA/contracts.lang
similarity index 100%
rename from public/langs/ar_SA/contracts.lang
rename to htdocs/langs/ar_SA/contracts.lang
diff --git a/public/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
similarity index 100%
rename from public/langs/ar_SA/cron.lang
rename to htdocs/langs/ar_SA/cron.lang
diff --git a/public/langs/ar_SA/deliveries.lang b/htdocs/langs/ar_SA/deliveries.lang
similarity index 100%
rename from public/langs/ar_SA/deliveries.lang
rename to htdocs/langs/ar_SA/deliveries.lang
diff --git a/public/langs/ar_SA/dict.lang b/htdocs/langs/ar_SA/dict.lang
similarity index 100%
rename from public/langs/ar_SA/dict.lang
rename to htdocs/langs/ar_SA/dict.lang
diff --git a/public/langs/ar_SA/donations.lang b/htdocs/langs/ar_SA/donations.lang
similarity index 100%
rename from public/langs/ar_SA/donations.lang
rename to htdocs/langs/ar_SA/donations.lang
diff --git a/public/langs/ar_SA/ecm.lang b/htdocs/langs/ar_SA/ecm.lang
similarity index 100%
rename from public/langs/ar_SA/ecm.lang
rename to htdocs/langs/ar_SA/ecm.lang
diff --git a/public/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
similarity index 100%
rename from public/langs/ar_SA/errors.lang
rename to htdocs/langs/ar_SA/errors.lang
diff --git a/public/langs/ar_SA/exports.lang b/htdocs/langs/ar_SA/exports.lang
similarity index 100%
rename from public/langs/ar_SA/exports.lang
rename to htdocs/langs/ar_SA/exports.lang
diff --git a/public/langs/ar_SA/externalsite.lang b/htdocs/langs/ar_SA/externalsite.lang
similarity index 100%
rename from public/langs/ar_SA/externalsite.lang
rename to htdocs/langs/ar_SA/externalsite.lang
diff --git a/public/langs/ar_SA/ftp.lang b/htdocs/langs/ar_SA/ftp.lang
similarity index 100%
rename from public/langs/ar_SA/ftp.lang
rename to htdocs/langs/ar_SA/ftp.lang
diff --git a/public/langs/ar_SA/help.lang b/htdocs/langs/ar_SA/help.lang
similarity index 100%
rename from public/langs/ar_SA/help.lang
rename to htdocs/langs/ar_SA/help.lang
diff --git a/public/langs/ar_SA/holiday.lang b/htdocs/langs/ar_SA/holiday.lang
similarity index 100%
rename from public/langs/ar_SA/holiday.lang
rename to htdocs/langs/ar_SA/holiday.lang
diff --git a/public/langs/ar_SA/hrm.lang b/htdocs/langs/ar_SA/hrm.lang
similarity index 100%
rename from public/langs/ar_SA/hrm.lang
rename to htdocs/langs/ar_SA/hrm.lang
diff --git a/public/langs/ar_SA/incoterm.lang b/htdocs/langs/ar_SA/incoterm.lang
similarity index 100%
rename from public/langs/ar_SA/incoterm.lang
rename to htdocs/langs/ar_SA/incoterm.lang
diff --git a/public/langs/ar_SA/install.lang b/htdocs/langs/ar_SA/install.lang
similarity index 100%
rename from public/langs/ar_SA/install.lang
rename to htdocs/langs/ar_SA/install.lang
diff --git a/public/langs/ar_SA/interventions.lang b/htdocs/langs/ar_SA/interventions.lang
similarity index 100%
rename from public/langs/ar_SA/interventions.lang
rename to htdocs/langs/ar_SA/interventions.lang
diff --git a/public/langs/ar_SA/languages.lang b/htdocs/langs/ar_SA/languages.lang
similarity index 100%
rename from public/langs/ar_SA/languages.lang
rename to htdocs/langs/ar_SA/languages.lang
diff --git a/public/langs/ar_SA/ldap.lang b/htdocs/langs/ar_SA/ldap.lang
similarity index 100%
rename from public/langs/ar_SA/ldap.lang
rename to htdocs/langs/ar_SA/ldap.lang
diff --git a/public/langs/ar_SA/link.lang b/htdocs/langs/ar_SA/link.lang
similarity index 100%
rename from public/langs/ar_SA/link.lang
rename to htdocs/langs/ar_SA/link.lang
diff --git a/public/langs/ar_SA/loan.lang b/htdocs/langs/ar_SA/loan.lang
similarity index 100%
rename from public/langs/ar_SA/loan.lang
rename to htdocs/langs/ar_SA/loan.lang
diff --git a/public/langs/ar_SA/mailmanspip.lang b/htdocs/langs/ar_SA/mailmanspip.lang
similarity index 100%
rename from public/langs/ar_SA/mailmanspip.lang
rename to htdocs/langs/ar_SA/mailmanspip.lang
diff --git a/public/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
similarity index 100%
rename from public/langs/ar_SA/mails.lang
rename to htdocs/langs/ar_SA/mails.lang
diff --git a/public/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
similarity index 100%
rename from public/langs/ar_SA/main.lang
rename to htdocs/langs/ar_SA/main.lang
diff --git a/public/langs/ar_SA/margins.lang b/htdocs/langs/ar_SA/margins.lang
similarity index 100%
rename from public/langs/ar_SA/margins.lang
rename to htdocs/langs/ar_SA/margins.lang
diff --git a/public/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
similarity index 100%
rename from public/langs/ar_SA/members.lang
rename to htdocs/langs/ar_SA/members.lang
diff --git a/public/langs/ar_SA/oauth.lang b/htdocs/langs/ar_SA/oauth.lang
similarity index 100%
rename from public/langs/ar_SA/oauth.lang
rename to htdocs/langs/ar_SA/oauth.lang
diff --git a/public/langs/ar_SA/opensurvey.lang b/htdocs/langs/ar_SA/opensurvey.lang
similarity index 100%
rename from public/langs/ar_SA/opensurvey.lang
rename to htdocs/langs/ar_SA/opensurvey.lang
diff --git a/public/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang
similarity index 100%
rename from public/langs/ar_SA/orders.lang
rename to htdocs/langs/ar_SA/orders.lang
diff --git a/public/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
similarity index 100%
rename from public/langs/ar_SA/other.lang
rename to htdocs/langs/ar_SA/other.lang
diff --git a/public/langs/ar_SA/paybox.lang b/htdocs/langs/ar_SA/paybox.lang
similarity index 100%
rename from public/langs/ar_SA/paybox.lang
rename to htdocs/langs/ar_SA/paybox.lang
diff --git a/public/langs/ar_SA/paypal.lang b/htdocs/langs/ar_SA/paypal.lang
similarity index 100%
rename from public/langs/ar_SA/paypal.lang
rename to htdocs/langs/ar_SA/paypal.lang
diff --git a/public/langs/ar_SA/printing.lang b/htdocs/langs/ar_SA/printing.lang
similarity index 100%
rename from public/langs/ar_SA/printing.lang
rename to htdocs/langs/ar_SA/printing.lang
diff --git a/public/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang
similarity index 100%
rename from public/langs/ar_SA/productbatch.lang
rename to htdocs/langs/ar_SA/productbatch.lang
diff --git a/public/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
similarity index 100%
rename from public/langs/ar_SA/products.lang
rename to htdocs/langs/ar_SA/products.lang
diff --git a/public/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
similarity index 100%
rename from public/langs/ar_SA/projects.lang
rename to htdocs/langs/ar_SA/projects.lang
diff --git a/public/langs/ar_SA/propal.lang b/htdocs/langs/ar_SA/propal.lang
similarity index 100%
rename from public/langs/ar_SA/propal.lang
rename to htdocs/langs/ar_SA/propal.lang
diff --git a/public/langs/ar_SA/receiptprinter.lang b/htdocs/langs/ar_SA/receiptprinter.lang
similarity index 100%
rename from public/langs/ar_SA/receiptprinter.lang
rename to htdocs/langs/ar_SA/receiptprinter.lang
diff --git a/public/langs/ar_SA/resource.lang b/htdocs/langs/ar_SA/resource.lang
similarity index 100%
rename from public/langs/ar_SA/resource.lang
rename to htdocs/langs/ar_SA/resource.lang
diff --git a/public/langs/ar_SA/salaries.lang b/htdocs/langs/ar_SA/salaries.lang
similarity index 100%
rename from public/langs/ar_SA/salaries.lang
rename to htdocs/langs/ar_SA/salaries.lang
diff --git a/public/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang
similarity index 100%
rename from public/langs/ar_SA/sendings.lang
rename to htdocs/langs/ar_SA/sendings.lang
diff --git a/public/langs/ar_SA/sms.lang b/htdocs/langs/ar_SA/sms.lang
similarity index 100%
rename from public/langs/ar_SA/sms.lang
rename to htdocs/langs/ar_SA/sms.lang
diff --git a/public/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
similarity index 100%
rename from public/langs/ar_SA/stocks.lang
rename to htdocs/langs/ar_SA/stocks.lang
diff --git a/public/langs/ar_SA/supplier_proposal.lang b/htdocs/langs/ar_SA/supplier_proposal.lang
similarity index 100%
rename from public/langs/ar_SA/supplier_proposal.lang
rename to htdocs/langs/ar_SA/supplier_proposal.lang
diff --git a/public/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
similarity index 100%
rename from public/langs/ar_SA/suppliers.lang
rename to htdocs/langs/ar_SA/suppliers.lang
diff --git a/public/langs/ar_SA/trips.lang b/htdocs/langs/ar_SA/trips.lang
similarity index 100%
rename from public/langs/ar_SA/trips.lang
rename to htdocs/langs/ar_SA/trips.lang
diff --git a/public/langs/ar_SA/users.lang b/htdocs/langs/ar_SA/users.lang
similarity index 100%
rename from public/langs/ar_SA/users.lang
rename to htdocs/langs/ar_SA/users.lang
diff --git a/public/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
similarity index 100%
rename from public/langs/ar_SA/website.lang
rename to htdocs/langs/ar_SA/website.lang
diff --git a/public/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
similarity index 100%
rename from public/langs/ar_SA/withdrawals.lang
rename to htdocs/langs/ar_SA/withdrawals.lang
diff --git a/public/langs/ar_SA/workflow.lang b/htdocs/langs/ar_SA/workflow.lang
similarity index 100%
rename from public/langs/ar_SA/workflow.lang
rename to htdocs/langs/ar_SA/workflow.lang
diff --git a/public/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
similarity index 100%
rename from public/langs/bg_BG/accountancy.lang
rename to htdocs/langs/bg_BG/accountancy.lang
diff --git a/public/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
similarity index 100%
rename from public/langs/bg_BG/admin.lang
rename to htdocs/langs/bg_BG/admin.lang
diff --git a/public/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang
similarity index 100%
rename from public/langs/bg_BG/agenda.lang
rename to htdocs/langs/bg_BG/agenda.lang
diff --git a/public/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
similarity index 100%
rename from public/langs/bg_BG/banks.lang
rename to htdocs/langs/bg_BG/banks.lang
diff --git a/public/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
similarity index 100%
rename from public/langs/bg_BG/bills.lang
rename to htdocs/langs/bg_BG/bills.lang
diff --git a/public/langs/bg_BG/bookmarks.lang b/htdocs/langs/bg_BG/bookmarks.lang
similarity index 100%
rename from public/langs/bg_BG/bookmarks.lang
rename to htdocs/langs/bg_BG/bookmarks.lang
diff --git a/public/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang
similarity index 100%
rename from public/langs/bg_BG/boxes.lang
rename to htdocs/langs/bg_BG/boxes.lang
diff --git a/public/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
similarity index 100%
rename from public/langs/bg_BG/cashdesk.lang
rename to htdocs/langs/bg_BG/cashdesk.lang
diff --git a/public/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
similarity index 100%
rename from public/langs/bg_BG/categories.lang
rename to htdocs/langs/bg_BG/categories.lang
diff --git a/public/langs/bg_BG/commercial.lang b/htdocs/langs/bg_BG/commercial.lang
similarity index 100%
rename from public/langs/bg_BG/commercial.lang
rename to htdocs/langs/bg_BG/commercial.lang
diff --git a/public/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
similarity index 100%
rename from public/langs/bg_BG/companies.lang
rename to htdocs/langs/bg_BG/companies.lang
diff --git a/public/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
similarity index 100%
rename from public/langs/bg_BG/compta.lang
rename to htdocs/langs/bg_BG/compta.lang
diff --git a/public/langs/bg_BG/contracts.lang b/htdocs/langs/bg_BG/contracts.lang
similarity index 100%
rename from public/langs/bg_BG/contracts.lang
rename to htdocs/langs/bg_BG/contracts.lang
diff --git a/public/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
similarity index 100%
rename from public/langs/bg_BG/cron.lang
rename to htdocs/langs/bg_BG/cron.lang
diff --git a/public/langs/bg_BG/deliveries.lang b/htdocs/langs/bg_BG/deliveries.lang
similarity index 100%
rename from public/langs/bg_BG/deliveries.lang
rename to htdocs/langs/bg_BG/deliveries.lang
diff --git a/public/langs/bg_BG/dict.lang b/htdocs/langs/bg_BG/dict.lang
similarity index 100%
rename from public/langs/bg_BG/dict.lang
rename to htdocs/langs/bg_BG/dict.lang
diff --git a/public/langs/bg_BG/donations.lang b/htdocs/langs/bg_BG/donations.lang
similarity index 100%
rename from public/langs/bg_BG/donations.lang
rename to htdocs/langs/bg_BG/donations.lang
diff --git a/public/langs/bg_BG/ecm.lang b/htdocs/langs/bg_BG/ecm.lang
similarity index 100%
rename from public/langs/bg_BG/ecm.lang
rename to htdocs/langs/bg_BG/ecm.lang
diff --git a/public/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
similarity index 100%
rename from public/langs/bg_BG/errors.lang
rename to htdocs/langs/bg_BG/errors.lang
diff --git a/public/langs/bg_BG/exports.lang b/htdocs/langs/bg_BG/exports.lang
similarity index 100%
rename from public/langs/bg_BG/exports.lang
rename to htdocs/langs/bg_BG/exports.lang
diff --git a/public/langs/bg_BG/externalsite.lang b/htdocs/langs/bg_BG/externalsite.lang
similarity index 100%
rename from public/langs/bg_BG/externalsite.lang
rename to htdocs/langs/bg_BG/externalsite.lang
diff --git a/public/langs/bg_BG/ftp.lang b/htdocs/langs/bg_BG/ftp.lang
similarity index 100%
rename from public/langs/bg_BG/ftp.lang
rename to htdocs/langs/bg_BG/ftp.lang
diff --git a/public/langs/bg_BG/help.lang b/htdocs/langs/bg_BG/help.lang
similarity index 100%
rename from public/langs/bg_BG/help.lang
rename to htdocs/langs/bg_BG/help.lang
diff --git a/public/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang
similarity index 100%
rename from public/langs/bg_BG/holiday.lang
rename to htdocs/langs/bg_BG/holiday.lang
diff --git a/public/langs/bg_BG/hrm.lang b/htdocs/langs/bg_BG/hrm.lang
similarity index 100%
rename from public/langs/bg_BG/hrm.lang
rename to htdocs/langs/bg_BG/hrm.lang
diff --git a/public/langs/bg_BG/incoterm.lang b/htdocs/langs/bg_BG/incoterm.lang
similarity index 100%
rename from public/langs/bg_BG/incoterm.lang
rename to htdocs/langs/bg_BG/incoterm.lang
diff --git a/public/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang
similarity index 100%
rename from public/langs/bg_BG/install.lang
rename to htdocs/langs/bg_BG/install.lang
diff --git a/public/langs/bg_BG/interventions.lang b/htdocs/langs/bg_BG/interventions.lang
similarity index 100%
rename from public/langs/bg_BG/interventions.lang
rename to htdocs/langs/bg_BG/interventions.lang
diff --git a/public/langs/bg_BG/languages.lang b/htdocs/langs/bg_BG/languages.lang
similarity index 100%
rename from public/langs/bg_BG/languages.lang
rename to htdocs/langs/bg_BG/languages.lang
diff --git a/public/langs/bg_BG/ldap.lang b/htdocs/langs/bg_BG/ldap.lang
similarity index 100%
rename from public/langs/bg_BG/ldap.lang
rename to htdocs/langs/bg_BG/ldap.lang
diff --git a/public/langs/bg_BG/link.lang b/htdocs/langs/bg_BG/link.lang
similarity index 100%
rename from public/langs/bg_BG/link.lang
rename to htdocs/langs/bg_BG/link.lang
diff --git a/public/langs/bg_BG/loan.lang b/htdocs/langs/bg_BG/loan.lang
similarity index 100%
rename from public/langs/bg_BG/loan.lang
rename to htdocs/langs/bg_BG/loan.lang
diff --git a/public/langs/bg_BG/mailmanspip.lang b/htdocs/langs/bg_BG/mailmanspip.lang
similarity index 100%
rename from public/langs/bg_BG/mailmanspip.lang
rename to htdocs/langs/bg_BG/mailmanspip.lang
diff --git a/public/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
similarity index 100%
rename from public/langs/bg_BG/mails.lang
rename to htdocs/langs/bg_BG/mails.lang
diff --git a/public/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
similarity index 100%
rename from public/langs/bg_BG/main.lang
rename to htdocs/langs/bg_BG/main.lang
diff --git a/public/langs/bg_BG/margins.lang b/htdocs/langs/bg_BG/margins.lang
similarity index 100%
rename from public/langs/bg_BG/margins.lang
rename to htdocs/langs/bg_BG/margins.lang
diff --git a/public/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
similarity index 100%
rename from public/langs/bg_BG/members.lang
rename to htdocs/langs/bg_BG/members.lang
diff --git a/public/langs/bg_BG/oauth.lang b/htdocs/langs/bg_BG/oauth.lang
similarity index 100%
rename from public/langs/bg_BG/oauth.lang
rename to htdocs/langs/bg_BG/oauth.lang
diff --git a/public/langs/bg_BG/opensurvey.lang b/htdocs/langs/bg_BG/opensurvey.lang
similarity index 100%
rename from public/langs/bg_BG/opensurvey.lang
rename to htdocs/langs/bg_BG/opensurvey.lang
diff --git a/public/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang
similarity index 100%
rename from public/langs/bg_BG/orders.lang
rename to htdocs/langs/bg_BG/orders.lang
diff --git a/public/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
similarity index 100%
rename from public/langs/bg_BG/other.lang
rename to htdocs/langs/bg_BG/other.lang
diff --git a/public/langs/bg_BG/paybox.lang b/htdocs/langs/bg_BG/paybox.lang
similarity index 100%
rename from public/langs/bg_BG/paybox.lang
rename to htdocs/langs/bg_BG/paybox.lang
diff --git a/public/langs/bg_BG/paypal.lang b/htdocs/langs/bg_BG/paypal.lang
similarity index 100%
rename from public/langs/bg_BG/paypal.lang
rename to htdocs/langs/bg_BG/paypal.lang
diff --git a/public/langs/bg_BG/printing.lang b/htdocs/langs/bg_BG/printing.lang
similarity index 100%
rename from public/langs/bg_BG/printing.lang
rename to htdocs/langs/bg_BG/printing.lang
diff --git a/public/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang
similarity index 100%
rename from public/langs/bg_BG/productbatch.lang
rename to htdocs/langs/bg_BG/productbatch.lang
diff --git a/public/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
similarity index 100%
rename from public/langs/bg_BG/products.lang
rename to htdocs/langs/bg_BG/products.lang
diff --git a/public/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
similarity index 100%
rename from public/langs/bg_BG/projects.lang
rename to htdocs/langs/bg_BG/projects.lang
diff --git a/public/langs/bg_BG/propal.lang b/htdocs/langs/bg_BG/propal.lang
similarity index 100%
rename from public/langs/bg_BG/propal.lang
rename to htdocs/langs/bg_BG/propal.lang
diff --git a/public/langs/bg_BG/receiptprinter.lang b/htdocs/langs/bg_BG/receiptprinter.lang
similarity index 100%
rename from public/langs/bg_BG/receiptprinter.lang
rename to htdocs/langs/bg_BG/receiptprinter.lang
diff --git a/public/langs/bg_BG/resource.lang b/htdocs/langs/bg_BG/resource.lang
similarity index 100%
rename from public/langs/bg_BG/resource.lang
rename to htdocs/langs/bg_BG/resource.lang
diff --git a/public/langs/bg_BG/salaries.lang b/htdocs/langs/bg_BG/salaries.lang
similarity index 100%
rename from public/langs/bg_BG/salaries.lang
rename to htdocs/langs/bg_BG/salaries.lang
diff --git a/public/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang
similarity index 100%
rename from public/langs/bg_BG/sendings.lang
rename to htdocs/langs/bg_BG/sendings.lang
diff --git a/public/langs/bg_BG/sms.lang b/htdocs/langs/bg_BG/sms.lang
similarity index 100%
rename from public/langs/bg_BG/sms.lang
rename to htdocs/langs/bg_BG/sms.lang
diff --git a/public/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
similarity index 100%
rename from public/langs/bg_BG/stocks.lang
rename to htdocs/langs/bg_BG/stocks.lang
diff --git a/public/langs/bg_BG/supplier_proposal.lang b/htdocs/langs/bg_BG/supplier_proposal.lang
similarity index 100%
rename from public/langs/bg_BG/supplier_proposal.lang
rename to htdocs/langs/bg_BG/supplier_proposal.lang
diff --git a/public/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang
similarity index 100%
rename from public/langs/bg_BG/suppliers.lang
rename to htdocs/langs/bg_BG/suppliers.lang
diff --git a/public/langs/bg_BG/trips.lang b/htdocs/langs/bg_BG/trips.lang
similarity index 100%
rename from public/langs/bg_BG/trips.lang
rename to htdocs/langs/bg_BG/trips.lang
diff --git a/public/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
similarity index 100%
rename from public/langs/bg_BG/users.lang
rename to htdocs/langs/bg_BG/users.lang
diff --git a/public/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
similarity index 100%
rename from public/langs/bg_BG/website.lang
rename to htdocs/langs/bg_BG/website.lang
diff --git a/public/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
similarity index 100%
rename from public/langs/bg_BG/withdrawals.lang
rename to htdocs/langs/bg_BG/withdrawals.lang
diff --git a/public/langs/bg_BG/workflow.lang b/htdocs/langs/bg_BG/workflow.lang
similarity index 100%
rename from public/langs/bg_BG/workflow.lang
rename to htdocs/langs/bg_BG/workflow.lang
diff --git a/public/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
similarity index 100%
rename from public/langs/bn_BD/accountancy.lang
rename to htdocs/langs/bn_BD/accountancy.lang
diff --git a/public/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
similarity index 100%
rename from public/langs/bn_BD/admin.lang
rename to htdocs/langs/bn_BD/admin.lang
diff --git a/public/langs/bn_BD/agenda.lang b/htdocs/langs/bn_BD/agenda.lang
similarity index 100%
rename from public/langs/bn_BD/agenda.lang
rename to htdocs/langs/bn_BD/agenda.lang
diff --git a/public/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
similarity index 100%
rename from public/langs/bn_BD/banks.lang
rename to htdocs/langs/bn_BD/banks.lang
diff --git a/public/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
similarity index 100%
rename from public/langs/bn_BD/bills.lang
rename to htdocs/langs/bn_BD/bills.lang
diff --git a/public/langs/bn_BD/bookmarks.lang b/htdocs/langs/bn_BD/bookmarks.lang
similarity index 100%
rename from public/langs/bn_BD/bookmarks.lang
rename to htdocs/langs/bn_BD/bookmarks.lang
diff --git a/public/langs/bn_BD/boxes.lang b/htdocs/langs/bn_BD/boxes.lang
similarity index 100%
rename from public/langs/bn_BD/boxes.lang
rename to htdocs/langs/bn_BD/boxes.lang
diff --git a/public/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang
similarity index 100%
rename from public/langs/bn_BD/cashdesk.lang
rename to htdocs/langs/bn_BD/cashdesk.lang
diff --git a/public/langs/bn_BD/categories.lang b/htdocs/langs/bn_BD/categories.lang
similarity index 100%
rename from public/langs/bn_BD/categories.lang
rename to htdocs/langs/bn_BD/categories.lang
diff --git a/public/langs/bn_BD/commercial.lang b/htdocs/langs/bn_BD/commercial.lang
similarity index 100%
rename from public/langs/bn_BD/commercial.lang
rename to htdocs/langs/bn_BD/commercial.lang
diff --git a/public/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
similarity index 100%
rename from public/langs/bn_BD/companies.lang
rename to htdocs/langs/bn_BD/companies.lang
diff --git a/public/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
similarity index 100%
rename from public/langs/bn_BD/compta.lang
rename to htdocs/langs/bn_BD/compta.lang
diff --git a/public/langs/bn_BD/contracts.lang b/htdocs/langs/bn_BD/contracts.lang
similarity index 100%
rename from public/langs/bn_BD/contracts.lang
rename to htdocs/langs/bn_BD/contracts.lang
diff --git a/public/langs/bn_BD/cron.lang b/htdocs/langs/bn_BD/cron.lang
similarity index 100%
rename from public/langs/bn_BD/cron.lang
rename to htdocs/langs/bn_BD/cron.lang
diff --git a/public/langs/bn_BD/deliveries.lang b/htdocs/langs/bn_BD/deliveries.lang
similarity index 100%
rename from public/langs/bn_BD/deliveries.lang
rename to htdocs/langs/bn_BD/deliveries.lang
diff --git a/public/langs/bn_BD/dict.lang b/htdocs/langs/bn_BD/dict.lang
similarity index 100%
rename from public/langs/bn_BD/dict.lang
rename to htdocs/langs/bn_BD/dict.lang
diff --git a/public/langs/bn_BD/donations.lang b/htdocs/langs/bn_BD/donations.lang
similarity index 100%
rename from public/langs/bn_BD/donations.lang
rename to htdocs/langs/bn_BD/donations.lang
diff --git a/public/langs/bn_BD/ecm.lang b/htdocs/langs/bn_BD/ecm.lang
similarity index 100%
rename from public/langs/bn_BD/ecm.lang
rename to htdocs/langs/bn_BD/ecm.lang
diff --git a/public/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
similarity index 100%
rename from public/langs/bn_BD/errors.lang
rename to htdocs/langs/bn_BD/errors.lang
diff --git a/public/langs/bn_BD/exports.lang b/htdocs/langs/bn_BD/exports.lang
similarity index 100%
rename from public/langs/bn_BD/exports.lang
rename to htdocs/langs/bn_BD/exports.lang
diff --git a/public/langs/bn_BD/externalsite.lang b/htdocs/langs/bn_BD/externalsite.lang
similarity index 100%
rename from public/langs/bn_BD/externalsite.lang
rename to htdocs/langs/bn_BD/externalsite.lang
diff --git a/public/langs/bn_BD/ftp.lang b/htdocs/langs/bn_BD/ftp.lang
similarity index 100%
rename from public/langs/bn_BD/ftp.lang
rename to htdocs/langs/bn_BD/ftp.lang
diff --git a/public/langs/bn_BD/help.lang b/htdocs/langs/bn_BD/help.lang
similarity index 100%
rename from public/langs/bn_BD/help.lang
rename to htdocs/langs/bn_BD/help.lang
diff --git a/public/langs/bn_BD/holiday.lang b/htdocs/langs/bn_BD/holiday.lang
similarity index 100%
rename from public/langs/bn_BD/holiday.lang
rename to htdocs/langs/bn_BD/holiday.lang
diff --git a/public/langs/bn_BD/hrm.lang b/htdocs/langs/bn_BD/hrm.lang
similarity index 100%
rename from public/langs/bn_BD/hrm.lang
rename to htdocs/langs/bn_BD/hrm.lang
diff --git a/public/langs/bn_BD/incoterm.lang b/htdocs/langs/bn_BD/incoterm.lang
similarity index 100%
rename from public/langs/bn_BD/incoterm.lang
rename to htdocs/langs/bn_BD/incoterm.lang
diff --git a/public/langs/bn_BD/install.lang b/htdocs/langs/bn_BD/install.lang
similarity index 100%
rename from public/langs/bn_BD/install.lang
rename to htdocs/langs/bn_BD/install.lang
diff --git a/public/langs/bn_BD/interventions.lang b/htdocs/langs/bn_BD/interventions.lang
similarity index 100%
rename from public/langs/bn_BD/interventions.lang
rename to htdocs/langs/bn_BD/interventions.lang
diff --git a/public/langs/bn_BD/languages.lang b/htdocs/langs/bn_BD/languages.lang
similarity index 100%
rename from public/langs/bn_BD/languages.lang
rename to htdocs/langs/bn_BD/languages.lang
diff --git a/public/langs/bn_BD/ldap.lang b/htdocs/langs/bn_BD/ldap.lang
similarity index 100%
rename from public/langs/bn_BD/ldap.lang
rename to htdocs/langs/bn_BD/ldap.lang
diff --git a/public/langs/bn_BD/link.lang b/htdocs/langs/bn_BD/link.lang
similarity index 100%
rename from public/langs/bn_BD/link.lang
rename to htdocs/langs/bn_BD/link.lang
diff --git a/public/langs/bn_BD/loan.lang b/htdocs/langs/bn_BD/loan.lang
similarity index 100%
rename from public/langs/bn_BD/loan.lang
rename to htdocs/langs/bn_BD/loan.lang
diff --git a/public/langs/bn_BD/mailmanspip.lang b/htdocs/langs/bn_BD/mailmanspip.lang
similarity index 100%
rename from public/langs/bn_BD/mailmanspip.lang
rename to htdocs/langs/bn_BD/mailmanspip.lang
diff --git a/public/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
similarity index 100%
rename from public/langs/bn_BD/mails.lang
rename to htdocs/langs/bn_BD/mails.lang
diff --git a/public/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
similarity index 100%
rename from public/langs/bn_BD/main.lang
rename to htdocs/langs/bn_BD/main.lang
diff --git a/public/langs/bn_BD/margins.lang b/htdocs/langs/bn_BD/margins.lang
similarity index 100%
rename from public/langs/bn_BD/margins.lang
rename to htdocs/langs/bn_BD/margins.lang
diff --git a/public/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
similarity index 100%
rename from public/langs/bn_BD/members.lang
rename to htdocs/langs/bn_BD/members.lang
diff --git a/public/langs/bn_BD/oauth.lang b/htdocs/langs/bn_BD/oauth.lang
similarity index 100%
rename from public/langs/bn_BD/oauth.lang
rename to htdocs/langs/bn_BD/oauth.lang
diff --git a/public/langs/bn_BD/opensurvey.lang b/htdocs/langs/bn_BD/opensurvey.lang
similarity index 100%
rename from public/langs/bn_BD/opensurvey.lang
rename to htdocs/langs/bn_BD/opensurvey.lang
diff --git a/public/langs/bn_BD/orders.lang b/htdocs/langs/bn_BD/orders.lang
similarity index 100%
rename from public/langs/bn_BD/orders.lang
rename to htdocs/langs/bn_BD/orders.lang
diff --git a/public/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
similarity index 100%
rename from public/langs/bn_BD/other.lang
rename to htdocs/langs/bn_BD/other.lang
diff --git a/public/langs/bn_BD/paybox.lang b/htdocs/langs/bn_BD/paybox.lang
similarity index 100%
rename from public/langs/bn_BD/paybox.lang
rename to htdocs/langs/bn_BD/paybox.lang
diff --git a/public/langs/bn_BD/paypal.lang b/htdocs/langs/bn_BD/paypal.lang
similarity index 100%
rename from public/langs/bn_BD/paypal.lang
rename to htdocs/langs/bn_BD/paypal.lang
diff --git a/public/langs/bn_BD/printing.lang b/htdocs/langs/bn_BD/printing.lang
similarity index 100%
rename from public/langs/bn_BD/printing.lang
rename to htdocs/langs/bn_BD/printing.lang
diff --git a/public/langs/bn_BD/productbatch.lang b/htdocs/langs/bn_BD/productbatch.lang
similarity index 100%
rename from public/langs/bn_BD/productbatch.lang
rename to htdocs/langs/bn_BD/productbatch.lang
diff --git a/public/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
similarity index 100%
rename from public/langs/bn_BD/products.lang
rename to htdocs/langs/bn_BD/products.lang
diff --git a/public/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
similarity index 100%
rename from public/langs/bn_BD/projects.lang
rename to htdocs/langs/bn_BD/projects.lang
diff --git a/public/langs/bn_BD/propal.lang b/htdocs/langs/bn_BD/propal.lang
similarity index 100%
rename from public/langs/bn_BD/propal.lang
rename to htdocs/langs/bn_BD/propal.lang
diff --git a/public/langs/bn_BD/receiptprinter.lang b/htdocs/langs/bn_BD/receiptprinter.lang
similarity index 100%
rename from public/langs/bn_BD/receiptprinter.lang
rename to htdocs/langs/bn_BD/receiptprinter.lang
diff --git a/public/langs/bn_BD/resource.lang b/htdocs/langs/bn_BD/resource.lang
similarity index 100%
rename from public/langs/bn_BD/resource.lang
rename to htdocs/langs/bn_BD/resource.lang
diff --git a/public/langs/bn_BD/salaries.lang b/htdocs/langs/bn_BD/salaries.lang
similarity index 100%
rename from public/langs/bn_BD/salaries.lang
rename to htdocs/langs/bn_BD/salaries.lang
diff --git a/public/langs/bn_BD/sendings.lang b/htdocs/langs/bn_BD/sendings.lang
similarity index 100%
rename from public/langs/bn_BD/sendings.lang
rename to htdocs/langs/bn_BD/sendings.lang
diff --git a/public/langs/bn_BD/sms.lang b/htdocs/langs/bn_BD/sms.lang
similarity index 100%
rename from public/langs/bn_BD/sms.lang
rename to htdocs/langs/bn_BD/sms.lang
diff --git a/public/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
similarity index 100%
rename from public/langs/bn_BD/stocks.lang
rename to htdocs/langs/bn_BD/stocks.lang
diff --git a/public/langs/bn_BD/supplier_proposal.lang b/htdocs/langs/bn_BD/supplier_proposal.lang
similarity index 100%
rename from public/langs/bn_BD/supplier_proposal.lang
rename to htdocs/langs/bn_BD/supplier_proposal.lang
diff --git a/public/langs/bn_BD/suppliers.lang b/htdocs/langs/bn_BD/suppliers.lang
similarity index 100%
rename from public/langs/bn_BD/suppliers.lang
rename to htdocs/langs/bn_BD/suppliers.lang
diff --git a/public/langs/bn_BD/trips.lang b/htdocs/langs/bn_BD/trips.lang
similarity index 100%
rename from public/langs/bn_BD/trips.lang
rename to htdocs/langs/bn_BD/trips.lang
diff --git a/public/langs/bn_BD/users.lang b/htdocs/langs/bn_BD/users.lang
similarity index 100%
rename from public/langs/bn_BD/users.lang
rename to htdocs/langs/bn_BD/users.lang
diff --git a/public/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
similarity index 100%
rename from public/langs/bn_BD/website.lang
rename to htdocs/langs/bn_BD/website.lang
diff --git a/public/langs/bn_BD/withdrawals.lang b/htdocs/langs/bn_BD/withdrawals.lang
similarity index 100%
rename from public/langs/bn_BD/withdrawals.lang
rename to htdocs/langs/bn_BD/withdrawals.lang
diff --git a/public/langs/bn_BD/workflow.lang b/htdocs/langs/bn_BD/workflow.lang
similarity index 100%
rename from public/langs/bn_BD/workflow.lang
rename to htdocs/langs/bn_BD/workflow.lang
diff --git a/public/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
similarity index 100%
rename from public/langs/bs_BA/accountancy.lang
rename to htdocs/langs/bs_BA/accountancy.lang
diff --git a/public/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
similarity index 100%
rename from public/langs/bs_BA/admin.lang
rename to htdocs/langs/bs_BA/admin.lang
diff --git a/public/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang
similarity index 100%
rename from public/langs/bs_BA/agenda.lang
rename to htdocs/langs/bs_BA/agenda.lang
diff --git a/public/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
similarity index 100%
rename from public/langs/bs_BA/banks.lang
rename to htdocs/langs/bs_BA/banks.lang
diff --git a/public/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
similarity index 100%
rename from public/langs/bs_BA/bills.lang
rename to htdocs/langs/bs_BA/bills.lang
diff --git a/public/langs/bs_BA/bookmarks.lang b/htdocs/langs/bs_BA/bookmarks.lang
similarity index 100%
rename from public/langs/bs_BA/bookmarks.lang
rename to htdocs/langs/bs_BA/bookmarks.lang
diff --git a/public/langs/bs_BA/boxes.lang b/htdocs/langs/bs_BA/boxes.lang
similarity index 100%
rename from public/langs/bs_BA/boxes.lang
rename to htdocs/langs/bs_BA/boxes.lang
diff --git a/public/langs/bs_BA/cashdesk.lang b/htdocs/langs/bs_BA/cashdesk.lang
similarity index 100%
rename from public/langs/bs_BA/cashdesk.lang
rename to htdocs/langs/bs_BA/cashdesk.lang
diff --git a/public/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
similarity index 100%
rename from public/langs/bs_BA/categories.lang
rename to htdocs/langs/bs_BA/categories.lang
diff --git a/public/langs/bs_BA/commercial.lang b/htdocs/langs/bs_BA/commercial.lang
similarity index 100%
rename from public/langs/bs_BA/commercial.lang
rename to htdocs/langs/bs_BA/commercial.lang
diff --git a/public/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
similarity index 100%
rename from public/langs/bs_BA/companies.lang
rename to htdocs/langs/bs_BA/companies.lang
diff --git a/public/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
similarity index 100%
rename from public/langs/bs_BA/compta.lang
rename to htdocs/langs/bs_BA/compta.lang
diff --git a/public/langs/bs_BA/contracts.lang b/htdocs/langs/bs_BA/contracts.lang
similarity index 100%
rename from public/langs/bs_BA/contracts.lang
rename to htdocs/langs/bs_BA/contracts.lang
diff --git a/public/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
similarity index 100%
rename from public/langs/bs_BA/cron.lang
rename to htdocs/langs/bs_BA/cron.lang
diff --git a/public/langs/bs_BA/deliveries.lang b/htdocs/langs/bs_BA/deliveries.lang
similarity index 100%
rename from public/langs/bs_BA/deliveries.lang
rename to htdocs/langs/bs_BA/deliveries.lang
diff --git a/public/langs/bs_BA/dict.lang b/htdocs/langs/bs_BA/dict.lang
similarity index 100%
rename from public/langs/bs_BA/dict.lang
rename to htdocs/langs/bs_BA/dict.lang
diff --git a/public/langs/bs_BA/donations.lang b/htdocs/langs/bs_BA/donations.lang
similarity index 100%
rename from public/langs/bs_BA/donations.lang
rename to htdocs/langs/bs_BA/donations.lang
diff --git a/public/langs/bs_BA/ecm.lang b/htdocs/langs/bs_BA/ecm.lang
similarity index 100%
rename from public/langs/bs_BA/ecm.lang
rename to htdocs/langs/bs_BA/ecm.lang
diff --git a/public/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
similarity index 100%
rename from public/langs/bs_BA/errors.lang
rename to htdocs/langs/bs_BA/errors.lang
diff --git a/public/langs/bs_BA/exports.lang b/htdocs/langs/bs_BA/exports.lang
similarity index 100%
rename from public/langs/bs_BA/exports.lang
rename to htdocs/langs/bs_BA/exports.lang
diff --git a/public/langs/bs_BA/externalsite.lang b/htdocs/langs/bs_BA/externalsite.lang
similarity index 100%
rename from public/langs/bs_BA/externalsite.lang
rename to htdocs/langs/bs_BA/externalsite.lang
diff --git a/public/langs/bs_BA/ftp.lang b/htdocs/langs/bs_BA/ftp.lang
similarity index 100%
rename from public/langs/bs_BA/ftp.lang
rename to htdocs/langs/bs_BA/ftp.lang
diff --git a/public/langs/bs_BA/help.lang b/htdocs/langs/bs_BA/help.lang
similarity index 100%
rename from public/langs/bs_BA/help.lang
rename to htdocs/langs/bs_BA/help.lang
diff --git a/public/langs/bs_BA/holiday.lang b/htdocs/langs/bs_BA/holiday.lang
similarity index 100%
rename from public/langs/bs_BA/holiday.lang
rename to htdocs/langs/bs_BA/holiday.lang
diff --git a/public/langs/bs_BA/hrm.lang b/htdocs/langs/bs_BA/hrm.lang
similarity index 100%
rename from public/langs/bs_BA/hrm.lang
rename to htdocs/langs/bs_BA/hrm.lang
diff --git a/public/langs/bs_BA/incoterm.lang b/htdocs/langs/bs_BA/incoterm.lang
similarity index 100%
rename from public/langs/bs_BA/incoterm.lang
rename to htdocs/langs/bs_BA/incoterm.lang
diff --git a/public/langs/bs_BA/install.lang b/htdocs/langs/bs_BA/install.lang
similarity index 100%
rename from public/langs/bs_BA/install.lang
rename to htdocs/langs/bs_BA/install.lang
diff --git a/public/langs/bs_BA/interventions.lang b/htdocs/langs/bs_BA/interventions.lang
similarity index 100%
rename from public/langs/bs_BA/interventions.lang
rename to htdocs/langs/bs_BA/interventions.lang
diff --git a/public/langs/bs_BA/languages.lang b/htdocs/langs/bs_BA/languages.lang
similarity index 100%
rename from public/langs/bs_BA/languages.lang
rename to htdocs/langs/bs_BA/languages.lang
diff --git a/public/langs/bs_BA/ldap.lang b/htdocs/langs/bs_BA/ldap.lang
similarity index 100%
rename from public/langs/bs_BA/ldap.lang
rename to htdocs/langs/bs_BA/ldap.lang
diff --git a/public/langs/bs_BA/link.lang b/htdocs/langs/bs_BA/link.lang
similarity index 100%
rename from public/langs/bs_BA/link.lang
rename to htdocs/langs/bs_BA/link.lang
diff --git a/public/langs/bs_BA/loan.lang b/htdocs/langs/bs_BA/loan.lang
similarity index 100%
rename from public/langs/bs_BA/loan.lang
rename to htdocs/langs/bs_BA/loan.lang
diff --git a/public/langs/bs_BA/mailmanspip.lang b/htdocs/langs/bs_BA/mailmanspip.lang
similarity index 100%
rename from public/langs/bs_BA/mailmanspip.lang
rename to htdocs/langs/bs_BA/mailmanspip.lang
diff --git a/public/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
similarity index 100%
rename from public/langs/bs_BA/mails.lang
rename to htdocs/langs/bs_BA/mails.lang
diff --git a/public/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
similarity index 100%
rename from public/langs/bs_BA/main.lang
rename to htdocs/langs/bs_BA/main.lang
diff --git a/public/langs/bs_BA/margins.lang b/htdocs/langs/bs_BA/margins.lang
similarity index 100%
rename from public/langs/bs_BA/margins.lang
rename to htdocs/langs/bs_BA/margins.lang
diff --git a/public/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
similarity index 100%
rename from public/langs/bs_BA/members.lang
rename to htdocs/langs/bs_BA/members.lang
diff --git a/public/langs/bs_BA/oauth.lang b/htdocs/langs/bs_BA/oauth.lang
similarity index 100%
rename from public/langs/bs_BA/oauth.lang
rename to htdocs/langs/bs_BA/oauth.lang
diff --git a/public/langs/bs_BA/opensurvey.lang b/htdocs/langs/bs_BA/opensurvey.lang
similarity index 100%
rename from public/langs/bs_BA/opensurvey.lang
rename to htdocs/langs/bs_BA/opensurvey.lang
diff --git a/public/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang
similarity index 100%
rename from public/langs/bs_BA/orders.lang
rename to htdocs/langs/bs_BA/orders.lang
diff --git a/public/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
similarity index 100%
rename from public/langs/bs_BA/other.lang
rename to htdocs/langs/bs_BA/other.lang
diff --git a/public/langs/bs_BA/paybox.lang b/htdocs/langs/bs_BA/paybox.lang
similarity index 100%
rename from public/langs/bs_BA/paybox.lang
rename to htdocs/langs/bs_BA/paybox.lang
diff --git a/public/langs/bs_BA/paypal.lang b/htdocs/langs/bs_BA/paypal.lang
similarity index 100%
rename from public/langs/bs_BA/paypal.lang
rename to htdocs/langs/bs_BA/paypal.lang
diff --git a/public/langs/bs_BA/printing.lang b/htdocs/langs/bs_BA/printing.lang
similarity index 100%
rename from public/langs/bs_BA/printing.lang
rename to htdocs/langs/bs_BA/printing.lang
diff --git a/public/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang
similarity index 100%
rename from public/langs/bs_BA/productbatch.lang
rename to htdocs/langs/bs_BA/productbatch.lang
diff --git a/public/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
similarity index 100%
rename from public/langs/bs_BA/products.lang
rename to htdocs/langs/bs_BA/products.lang
diff --git a/public/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
similarity index 100%
rename from public/langs/bs_BA/projects.lang
rename to htdocs/langs/bs_BA/projects.lang
diff --git a/public/langs/bs_BA/propal.lang b/htdocs/langs/bs_BA/propal.lang
similarity index 100%
rename from public/langs/bs_BA/propal.lang
rename to htdocs/langs/bs_BA/propal.lang
diff --git a/public/langs/bs_BA/receiptprinter.lang b/htdocs/langs/bs_BA/receiptprinter.lang
similarity index 100%
rename from public/langs/bs_BA/receiptprinter.lang
rename to htdocs/langs/bs_BA/receiptprinter.lang
diff --git a/public/langs/bs_BA/resource.lang b/htdocs/langs/bs_BA/resource.lang
similarity index 100%
rename from public/langs/bs_BA/resource.lang
rename to htdocs/langs/bs_BA/resource.lang
diff --git a/public/langs/bs_BA/salaries.lang b/htdocs/langs/bs_BA/salaries.lang
similarity index 100%
rename from public/langs/bs_BA/salaries.lang
rename to htdocs/langs/bs_BA/salaries.lang
diff --git a/public/langs/bs_BA/sendings.lang b/htdocs/langs/bs_BA/sendings.lang
similarity index 100%
rename from public/langs/bs_BA/sendings.lang
rename to htdocs/langs/bs_BA/sendings.lang
diff --git a/public/langs/bs_BA/sms.lang b/htdocs/langs/bs_BA/sms.lang
similarity index 100%
rename from public/langs/bs_BA/sms.lang
rename to htdocs/langs/bs_BA/sms.lang
diff --git a/public/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
similarity index 100%
rename from public/langs/bs_BA/stocks.lang
rename to htdocs/langs/bs_BA/stocks.lang
diff --git a/public/langs/bs_BA/supplier_proposal.lang b/htdocs/langs/bs_BA/supplier_proposal.lang
similarity index 100%
rename from public/langs/bs_BA/supplier_proposal.lang
rename to htdocs/langs/bs_BA/supplier_proposal.lang
diff --git a/public/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang
similarity index 100%
rename from public/langs/bs_BA/suppliers.lang
rename to htdocs/langs/bs_BA/suppliers.lang
diff --git a/public/langs/bs_BA/trips.lang b/htdocs/langs/bs_BA/trips.lang
similarity index 100%
rename from public/langs/bs_BA/trips.lang
rename to htdocs/langs/bs_BA/trips.lang
diff --git a/public/langs/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang
similarity index 100%
rename from public/langs/bs_BA/users.lang
rename to htdocs/langs/bs_BA/users.lang
diff --git a/public/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
similarity index 100%
rename from public/langs/bs_BA/website.lang
rename to htdocs/langs/bs_BA/website.lang
diff --git a/public/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
similarity index 100%
rename from public/langs/bs_BA/withdrawals.lang
rename to htdocs/langs/bs_BA/withdrawals.lang
diff --git a/public/langs/bs_BA/workflow.lang b/htdocs/langs/bs_BA/workflow.lang
similarity index 100%
rename from public/langs/bs_BA/workflow.lang
rename to htdocs/langs/bs_BA/workflow.lang
diff --git a/public/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
similarity index 100%
rename from public/langs/ca_ES/accountancy.lang
rename to htdocs/langs/ca_ES/accountancy.lang
diff --git a/public/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
similarity index 100%
rename from public/langs/ca_ES/admin.lang
rename to htdocs/langs/ca_ES/admin.lang
diff --git a/public/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
similarity index 100%
rename from public/langs/ca_ES/agenda.lang
rename to htdocs/langs/ca_ES/agenda.lang
diff --git a/public/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
similarity index 100%
rename from public/langs/ca_ES/banks.lang
rename to htdocs/langs/ca_ES/banks.lang
diff --git a/public/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
similarity index 100%
rename from public/langs/ca_ES/bills.lang
rename to htdocs/langs/ca_ES/bills.lang
diff --git a/public/langs/ca_ES/bookmarks.lang b/htdocs/langs/ca_ES/bookmarks.lang
similarity index 100%
rename from public/langs/ca_ES/bookmarks.lang
rename to htdocs/langs/ca_ES/bookmarks.lang
diff --git a/public/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
similarity index 100%
rename from public/langs/ca_ES/boxes.lang
rename to htdocs/langs/ca_ES/boxes.lang
diff --git a/public/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
similarity index 100%
rename from public/langs/ca_ES/cashdesk.lang
rename to htdocs/langs/ca_ES/cashdesk.lang
diff --git a/public/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
similarity index 100%
rename from public/langs/ca_ES/categories.lang
rename to htdocs/langs/ca_ES/categories.lang
diff --git a/public/langs/ca_ES/commercial.lang b/htdocs/langs/ca_ES/commercial.lang
similarity index 100%
rename from public/langs/ca_ES/commercial.lang
rename to htdocs/langs/ca_ES/commercial.lang
diff --git a/public/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
similarity index 100%
rename from public/langs/ca_ES/companies.lang
rename to htdocs/langs/ca_ES/companies.lang
diff --git a/public/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
similarity index 100%
rename from public/langs/ca_ES/compta.lang
rename to htdocs/langs/ca_ES/compta.lang
diff --git a/public/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
similarity index 100%
rename from public/langs/ca_ES/contracts.lang
rename to htdocs/langs/ca_ES/contracts.lang
diff --git a/public/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
similarity index 100%
rename from public/langs/ca_ES/cron.lang
rename to htdocs/langs/ca_ES/cron.lang
diff --git a/public/langs/ca_ES/deliveries.lang b/htdocs/langs/ca_ES/deliveries.lang
similarity index 100%
rename from public/langs/ca_ES/deliveries.lang
rename to htdocs/langs/ca_ES/deliveries.lang
diff --git a/public/langs/ca_ES/dict.lang b/htdocs/langs/ca_ES/dict.lang
similarity index 100%
rename from public/langs/ca_ES/dict.lang
rename to htdocs/langs/ca_ES/dict.lang
diff --git a/public/langs/ca_ES/donations.lang b/htdocs/langs/ca_ES/donations.lang
similarity index 100%
rename from public/langs/ca_ES/donations.lang
rename to htdocs/langs/ca_ES/donations.lang
diff --git a/public/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
similarity index 100%
rename from public/langs/ca_ES/ecm.lang
rename to htdocs/langs/ca_ES/ecm.lang
diff --git a/public/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
similarity index 100%
rename from public/langs/ca_ES/errors.lang
rename to htdocs/langs/ca_ES/errors.lang
diff --git a/public/langs/ca_ES/exports.lang b/htdocs/langs/ca_ES/exports.lang
similarity index 100%
rename from public/langs/ca_ES/exports.lang
rename to htdocs/langs/ca_ES/exports.lang
diff --git a/public/langs/ca_ES/externalsite.lang b/htdocs/langs/ca_ES/externalsite.lang
similarity index 100%
rename from public/langs/ca_ES/externalsite.lang
rename to htdocs/langs/ca_ES/externalsite.lang
diff --git a/public/langs/ca_ES/ftp.lang b/htdocs/langs/ca_ES/ftp.lang
similarity index 100%
rename from public/langs/ca_ES/ftp.lang
rename to htdocs/langs/ca_ES/ftp.lang
diff --git a/public/langs/ca_ES/help.lang b/htdocs/langs/ca_ES/help.lang
similarity index 100%
rename from public/langs/ca_ES/help.lang
rename to htdocs/langs/ca_ES/help.lang
diff --git a/public/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
similarity index 100%
rename from public/langs/ca_ES/holiday.lang
rename to htdocs/langs/ca_ES/holiday.lang
diff --git a/public/langs/ca_ES/hrm.lang b/htdocs/langs/ca_ES/hrm.lang
similarity index 100%
rename from public/langs/ca_ES/hrm.lang
rename to htdocs/langs/ca_ES/hrm.lang
diff --git a/public/langs/ca_ES/incoterm.lang b/htdocs/langs/ca_ES/incoterm.lang
similarity index 100%
rename from public/langs/ca_ES/incoterm.lang
rename to htdocs/langs/ca_ES/incoterm.lang
diff --git a/public/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
similarity index 100%
rename from public/langs/ca_ES/install.lang
rename to htdocs/langs/ca_ES/install.lang
diff --git a/public/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang
similarity index 100%
rename from public/langs/ca_ES/interventions.lang
rename to htdocs/langs/ca_ES/interventions.lang
diff --git a/public/langs/ca_ES/languages.lang b/htdocs/langs/ca_ES/languages.lang
similarity index 100%
rename from public/langs/ca_ES/languages.lang
rename to htdocs/langs/ca_ES/languages.lang
diff --git a/public/langs/ca_ES/ldap.lang b/htdocs/langs/ca_ES/ldap.lang
similarity index 100%
rename from public/langs/ca_ES/ldap.lang
rename to htdocs/langs/ca_ES/ldap.lang
diff --git a/public/langs/ca_ES/link.lang b/htdocs/langs/ca_ES/link.lang
similarity index 100%
rename from public/langs/ca_ES/link.lang
rename to htdocs/langs/ca_ES/link.lang
diff --git a/public/langs/ca_ES/loan.lang b/htdocs/langs/ca_ES/loan.lang
similarity index 100%
rename from public/langs/ca_ES/loan.lang
rename to htdocs/langs/ca_ES/loan.lang
diff --git a/public/langs/ca_ES/mailmanspip.lang b/htdocs/langs/ca_ES/mailmanspip.lang
similarity index 100%
rename from public/langs/ca_ES/mailmanspip.lang
rename to htdocs/langs/ca_ES/mailmanspip.lang
diff --git a/public/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
similarity index 100%
rename from public/langs/ca_ES/mails.lang
rename to htdocs/langs/ca_ES/mails.lang
diff --git a/public/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
similarity index 100%
rename from public/langs/ca_ES/main.lang
rename to htdocs/langs/ca_ES/main.lang
diff --git a/public/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang
similarity index 100%
rename from public/langs/ca_ES/margins.lang
rename to htdocs/langs/ca_ES/margins.lang
diff --git a/public/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
similarity index 100%
rename from public/langs/ca_ES/members.lang
rename to htdocs/langs/ca_ES/members.lang
diff --git a/public/langs/ca_ES/oauth.lang b/htdocs/langs/ca_ES/oauth.lang
similarity index 100%
rename from public/langs/ca_ES/oauth.lang
rename to htdocs/langs/ca_ES/oauth.lang
diff --git a/public/langs/ca_ES/opensurvey.lang b/htdocs/langs/ca_ES/opensurvey.lang
similarity index 100%
rename from public/langs/ca_ES/opensurvey.lang
rename to htdocs/langs/ca_ES/opensurvey.lang
diff --git a/public/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
similarity index 100%
rename from public/langs/ca_ES/orders.lang
rename to htdocs/langs/ca_ES/orders.lang
diff --git a/public/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
similarity index 100%
rename from public/langs/ca_ES/other.lang
rename to htdocs/langs/ca_ES/other.lang
diff --git a/public/langs/ca_ES/paybox.lang b/htdocs/langs/ca_ES/paybox.lang
similarity index 100%
rename from public/langs/ca_ES/paybox.lang
rename to htdocs/langs/ca_ES/paybox.lang
diff --git a/public/langs/ca_ES/paypal.lang b/htdocs/langs/ca_ES/paypal.lang
similarity index 100%
rename from public/langs/ca_ES/paypal.lang
rename to htdocs/langs/ca_ES/paypal.lang
diff --git a/public/langs/ca_ES/printing.lang b/htdocs/langs/ca_ES/printing.lang
similarity index 100%
rename from public/langs/ca_ES/printing.lang
rename to htdocs/langs/ca_ES/printing.lang
diff --git a/public/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
similarity index 100%
rename from public/langs/ca_ES/productbatch.lang
rename to htdocs/langs/ca_ES/productbatch.lang
diff --git a/public/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
similarity index 100%
rename from public/langs/ca_ES/products.lang
rename to htdocs/langs/ca_ES/products.lang
diff --git a/public/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
similarity index 100%
rename from public/langs/ca_ES/projects.lang
rename to htdocs/langs/ca_ES/projects.lang
diff --git a/public/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang
similarity index 100%
rename from public/langs/ca_ES/propal.lang
rename to htdocs/langs/ca_ES/propal.lang
diff --git a/public/langs/ca_ES/receiptprinter.lang b/htdocs/langs/ca_ES/receiptprinter.lang
similarity index 100%
rename from public/langs/ca_ES/receiptprinter.lang
rename to htdocs/langs/ca_ES/receiptprinter.lang
diff --git a/public/langs/ca_ES/resource.lang b/htdocs/langs/ca_ES/resource.lang
similarity index 100%
rename from public/langs/ca_ES/resource.lang
rename to htdocs/langs/ca_ES/resource.lang
diff --git a/public/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
similarity index 100%
rename from public/langs/ca_ES/salaries.lang
rename to htdocs/langs/ca_ES/salaries.lang
diff --git a/public/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
similarity index 100%
rename from public/langs/ca_ES/sendings.lang
rename to htdocs/langs/ca_ES/sendings.lang
diff --git a/public/langs/ca_ES/sms.lang b/htdocs/langs/ca_ES/sms.lang
similarity index 100%
rename from public/langs/ca_ES/sms.lang
rename to htdocs/langs/ca_ES/sms.lang
diff --git a/public/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
similarity index 100%
rename from public/langs/ca_ES/stocks.lang
rename to htdocs/langs/ca_ES/stocks.lang
diff --git a/public/langs/ca_ES/supplier_proposal.lang b/htdocs/langs/ca_ES/supplier_proposal.lang
similarity index 100%
rename from public/langs/ca_ES/supplier_proposal.lang
rename to htdocs/langs/ca_ES/supplier_proposal.lang
diff --git a/public/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
similarity index 100%
rename from public/langs/ca_ES/suppliers.lang
rename to htdocs/langs/ca_ES/suppliers.lang
diff --git a/public/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
similarity index 100%
rename from public/langs/ca_ES/trips.lang
rename to htdocs/langs/ca_ES/trips.lang
diff --git a/public/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
similarity index 100%
rename from public/langs/ca_ES/users.lang
rename to htdocs/langs/ca_ES/users.lang
diff --git a/public/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
similarity index 100%
rename from public/langs/ca_ES/website.lang
rename to htdocs/langs/ca_ES/website.lang
diff --git a/public/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
similarity index 100%
rename from public/langs/ca_ES/withdrawals.lang
rename to htdocs/langs/ca_ES/withdrawals.lang
diff --git a/public/langs/ca_ES/workflow.lang b/htdocs/langs/ca_ES/workflow.lang
similarity index 100%
rename from public/langs/ca_ES/workflow.lang
rename to htdocs/langs/ca_ES/workflow.lang
diff --git a/public/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
similarity index 100%
rename from public/langs/cs_CZ/accountancy.lang
rename to htdocs/langs/cs_CZ/accountancy.lang
diff --git a/public/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
similarity index 100%
rename from public/langs/cs_CZ/admin.lang
rename to htdocs/langs/cs_CZ/admin.lang
diff --git a/public/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang
similarity index 100%
rename from public/langs/cs_CZ/agenda.lang
rename to htdocs/langs/cs_CZ/agenda.lang
diff --git a/public/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
similarity index 100%
rename from public/langs/cs_CZ/banks.lang
rename to htdocs/langs/cs_CZ/banks.lang
diff --git a/public/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
similarity index 100%
rename from public/langs/cs_CZ/bills.lang
rename to htdocs/langs/cs_CZ/bills.lang
diff --git a/public/langs/cs_CZ/bookmarks.lang b/htdocs/langs/cs_CZ/bookmarks.lang
similarity index 100%
rename from public/langs/cs_CZ/bookmarks.lang
rename to htdocs/langs/cs_CZ/bookmarks.lang
diff --git a/public/langs/cs_CZ/boxes.lang b/htdocs/langs/cs_CZ/boxes.lang
similarity index 100%
rename from public/langs/cs_CZ/boxes.lang
rename to htdocs/langs/cs_CZ/boxes.lang
diff --git a/public/langs/cs_CZ/cashdesk.lang b/htdocs/langs/cs_CZ/cashdesk.lang
similarity index 100%
rename from public/langs/cs_CZ/cashdesk.lang
rename to htdocs/langs/cs_CZ/cashdesk.lang
diff --git a/public/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang
similarity index 100%
rename from public/langs/cs_CZ/categories.lang
rename to htdocs/langs/cs_CZ/categories.lang
diff --git a/public/langs/cs_CZ/commercial.lang b/htdocs/langs/cs_CZ/commercial.lang
similarity index 100%
rename from public/langs/cs_CZ/commercial.lang
rename to htdocs/langs/cs_CZ/commercial.lang
diff --git a/public/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
similarity index 100%
rename from public/langs/cs_CZ/companies.lang
rename to htdocs/langs/cs_CZ/companies.lang
diff --git a/public/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
similarity index 100%
rename from public/langs/cs_CZ/compta.lang
rename to htdocs/langs/cs_CZ/compta.lang
diff --git a/public/langs/cs_CZ/contracts.lang b/htdocs/langs/cs_CZ/contracts.lang
similarity index 100%
rename from public/langs/cs_CZ/contracts.lang
rename to htdocs/langs/cs_CZ/contracts.lang
diff --git a/public/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
similarity index 100%
rename from public/langs/cs_CZ/cron.lang
rename to htdocs/langs/cs_CZ/cron.lang
diff --git a/public/langs/cs_CZ/deliveries.lang b/htdocs/langs/cs_CZ/deliveries.lang
similarity index 100%
rename from public/langs/cs_CZ/deliveries.lang
rename to htdocs/langs/cs_CZ/deliveries.lang
diff --git a/public/langs/cs_CZ/dict.lang b/htdocs/langs/cs_CZ/dict.lang
similarity index 100%
rename from public/langs/cs_CZ/dict.lang
rename to htdocs/langs/cs_CZ/dict.lang
diff --git a/public/langs/cs_CZ/donations.lang b/htdocs/langs/cs_CZ/donations.lang
similarity index 100%
rename from public/langs/cs_CZ/donations.lang
rename to htdocs/langs/cs_CZ/donations.lang
diff --git a/public/langs/cs_CZ/ecm.lang b/htdocs/langs/cs_CZ/ecm.lang
similarity index 100%
rename from public/langs/cs_CZ/ecm.lang
rename to htdocs/langs/cs_CZ/ecm.lang
diff --git a/public/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
similarity index 100%
rename from public/langs/cs_CZ/errors.lang
rename to htdocs/langs/cs_CZ/errors.lang
diff --git a/public/langs/cs_CZ/exports.lang b/htdocs/langs/cs_CZ/exports.lang
similarity index 100%
rename from public/langs/cs_CZ/exports.lang
rename to htdocs/langs/cs_CZ/exports.lang
diff --git a/public/langs/cs_CZ/externalsite.lang b/htdocs/langs/cs_CZ/externalsite.lang
similarity index 100%
rename from public/langs/cs_CZ/externalsite.lang
rename to htdocs/langs/cs_CZ/externalsite.lang
diff --git a/public/langs/cs_CZ/ftp.lang b/htdocs/langs/cs_CZ/ftp.lang
similarity index 100%
rename from public/langs/cs_CZ/ftp.lang
rename to htdocs/langs/cs_CZ/ftp.lang
diff --git a/public/langs/cs_CZ/help.lang b/htdocs/langs/cs_CZ/help.lang
similarity index 100%
rename from public/langs/cs_CZ/help.lang
rename to htdocs/langs/cs_CZ/help.lang
diff --git a/public/langs/cs_CZ/holiday.lang b/htdocs/langs/cs_CZ/holiday.lang
similarity index 100%
rename from public/langs/cs_CZ/holiday.lang
rename to htdocs/langs/cs_CZ/holiday.lang
diff --git a/public/langs/cs_CZ/hrm.lang b/htdocs/langs/cs_CZ/hrm.lang
similarity index 100%
rename from public/langs/cs_CZ/hrm.lang
rename to htdocs/langs/cs_CZ/hrm.lang
diff --git a/public/langs/cs_CZ/incoterm.lang b/htdocs/langs/cs_CZ/incoterm.lang
similarity index 100%
rename from public/langs/cs_CZ/incoterm.lang
rename to htdocs/langs/cs_CZ/incoterm.lang
diff --git a/public/langs/cs_CZ/install.lang b/htdocs/langs/cs_CZ/install.lang
similarity index 100%
rename from public/langs/cs_CZ/install.lang
rename to htdocs/langs/cs_CZ/install.lang
diff --git a/public/langs/cs_CZ/interventions.lang b/htdocs/langs/cs_CZ/interventions.lang
similarity index 100%
rename from public/langs/cs_CZ/interventions.lang
rename to htdocs/langs/cs_CZ/interventions.lang
diff --git a/public/langs/cs_CZ/languages.lang b/htdocs/langs/cs_CZ/languages.lang
similarity index 100%
rename from public/langs/cs_CZ/languages.lang
rename to htdocs/langs/cs_CZ/languages.lang
diff --git a/public/langs/cs_CZ/ldap.lang b/htdocs/langs/cs_CZ/ldap.lang
similarity index 100%
rename from public/langs/cs_CZ/ldap.lang
rename to htdocs/langs/cs_CZ/ldap.lang
diff --git a/public/langs/cs_CZ/link.lang b/htdocs/langs/cs_CZ/link.lang
similarity index 100%
rename from public/langs/cs_CZ/link.lang
rename to htdocs/langs/cs_CZ/link.lang
diff --git a/public/langs/cs_CZ/loan.lang b/htdocs/langs/cs_CZ/loan.lang
similarity index 100%
rename from public/langs/cs_CZ/loan.lang
rename to htdocs/langs/cs_CZ/loan.lang
diff --git a/public/langs/cs_CZ/mailmanspip.lang b/htdocs/langs/cs_CZ/mailmanspip.lang
similarity index 100%
rename from public/langs/cs_CZ/mailmanspip.lang
rename to htdocs/langs/cs_CZ/mailmanspip.lang
diff --git a/public/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
similarity index 100%
rename from public/langs/cs_CZ/mails.lang
rename to htdocs/langs/cs_CZ/mails.lang
diff --git a/public/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
similarity index 100%
rename from public/langs/cs_CZ/main.lang
rename to htdocs/langs/cs_CZ/main.lang
diff --git a/public/langs/cs_CZ/margins.lang b/htdocs/langs/cs_CZ/margins.lang
similarity index 100%
rename from public/langs/cs_CZ/margins.lang
rename to htdocs/langs/cs_CZ/margins.lang
diff --git a/public/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
similarity index 100%
rename from public/langs/cs_CZ/members.lang
rename to htdocs/langs/cs_CZ/members.lang
diff --git a/public/langs/cs_CZ/oauth.lang b/htdocs/langs/cs_CZ/oauth.lang
similarity index 100%
rename from public/langs/cs_CZ/oauth.lang
rename to htdocs/langs/cs_CZ/oauth.lang
diff --git a/public/langs/cs_CZ/opensurvey.lang b/htdocs/langs/cs_CZ/opensurvey.lang
similarity index 100%
rename from public/langs/cs_CZ/opensurvey.lang
rename to htdocs/langs/cs_CZ/opensurvey.lang
diff --git a/public/langs/cs_CZ/orders.lang b/htdocs/langs/cs_CZ/orders.lang
similarity index 100%
rename from public/langs/cs_CZ/orders.lang
rename to htdocs/langs/cs_CZ/orders.lang
diff --git a/public/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
similarity index 100%
rename from public/langs/cs_CZ/other.lang
rename to htdocs/langs/cs_CZ/other.lang
diff --git a/public/langs/cs_CZ/paybox.lang b/htdocs/langs/cs_CZ/paybox.lang
similarity index 100%
rename from public/langs/cs_CZ/paybox.lang
rename to htdocs/langs/cs_CZ/paybox.lang
diff --git a/public/langs/cs_CZ/paypal.lang b/htdocs/langs/cs_CZ/paypal.lang
similarity index 100%
rename from public/langs/cs_CZ/paypal.lang
rename to htdocs/langs/cs_CZ/paypal.lang
diff --git a/public/langs/cs_CZ/printing.lang b/htdocs/langs/cs_CZ/printing.lang
similarity index 100%
rename from public/langs/cs_CZ/printing.lang
rename to htdocs/langs/cs_CZ/printing.lang
diff --git a/public/langs/cs_CZ/productbatch.lang b/htdocs/langs/cs_CZ/productbatch.lang
similarity index 100%
rename from public/langs/cs_CZ/productbatch.lang
rename to htdocs/langs/cs_CZ/productbatch.lang
diff --git a/public/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
similarity index 100%
rename from public/langs/cs_CZ/products.lang
rename to htdocs/langs/cs_CZ/products.lang
diff --git a/public/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
similarity index 100%
rename from public/langs/cs_CZ/projects.lang
rename to htdocs/langs/cs_CZ/projects.lang
diff --git a/public/langs/cs_CZ/propal.lang b/htdocs/langs/cs_CZ/propal.lang
similarity index 100%
rename from public/langs/cs_CZ/propal.lang
rename to htdocs/langs/cs_CZ/propal.lang
diff --git a/public/langs/cs_CZ/receiptprinter.lang b/htdocs/langs/cs_CZ/receiptprinter.lang
similarity index 100%
rename from public/langs/cs_CZ/receiptprinter.lang
rename to htdocs/langs/cs_CZ/receiptprinter.lang
diff --git a/public/langs/cs_CZ/resource.lang b/htdocs/langs/cs_CZ/resource.lang
similarity index 100%
rename from public/langs/cs_CZ/resource.lang
rename to htdocs/langs/cs_CZ/resource.lang
diff --git a/public/langs/cs_CZ/salaries.lang b/htdocs/langs/cs_CZ/salaries.lang
similarity index 100%
rename from public/langs/cs_CZ/salaries.lang
rename to htdocs/langs/cs_CZ/salaries.lang
diff --git a/public/langs/cs_CZ/sendings.lang b/htdocs/langs/cs_CZ/sendings.lang
similarity index 100%
rename from public/langs/cs_CZ/sendings.lang
rename to htdocs/langs/cs_CZ/sendings.lang
diff --git a/public/langs/cs_CZ/sms.lang b/htdocs/langs/cs_CZ/sms.lang
similarity index 100%
rename from public/langs/cs_CZ/sms.lang
rename to htdocs/langs/cs_CZ/sms.lang
diff --git a/public/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
similarity index 100%
rename from public/langs/cs_CZ/stocks.lang
rename to htdocs/langs/cs_CZ/stocks.lang
diff --git a/public/langs/cs_CZ/supplier_proposal.lang b/htdocs/langs/cs_CZ/supplier_proposal.lang
similarity index 100%
rename from public/langs/cs_CZ/supplier_proposal.lang
rename to htdocs/langs/cs_CZ/supplier_proposal.lang
diff --git a/public/langs/cs_CZ/suppliers.lang b/htdocs/langs/cs_CZ/suppliers.lang
similarity index 100%
rename from public/langs/cs_CZ/suppliers.lang
rename to htdocs/langs/cs_CZ/suppliers.lang
diff --git a/public/langs/cs_CZ/trips.lang b/htdocs/langs/cs_CZ/trips.lang
similarity index 100%
rename from public/langs/cs_CZ/trips.lang
rename to htdocs/langs/cs_CZ/trips.lang
diff --git a/public/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
similarity index 100%
rename from public/langs/cs_CZ/users.lang
rename to htdocs/langs/cs_CZ/users.lang
diff --git a/public/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
similarity index 100%
rename from public/langs/cs_CZ/website.lang
rename to htdocs/langs/cs_CZ/website.lang
diff --git a/public/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
similarity index 100%
rename from public/langs/cs_CZ/withdrawals.lang
rename to htdocs/langs/cs_CZ/withdrawals.lang
diff --git a/public/langs/cs_CZ/workflow.lang b/htdocs/langs/cs_CZ/workflow.lang
similarity index 100%
rename from public/langs/cs_CZ/workflow.lang
rename to htdocs/langs/cs_CZ/workflow.lang
diff --git a/public/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
similarity index 100%
rename from public/langs/da_DK/accountancy.lang
rename to htdocs/langs/da_DK/accountancy.lang
diff --git a/public/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
similarity index 100%
rename from public/langs/da_DK/admin.lang
rename to htdocs/langs/da_DK/admin.lang
diff --git a/public/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang
similarity index 100%
rename from public/langs/da_DK/agenda.lang
rename to htdocs/langs/da_DK/agenda.lang
diff --git a/public/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
similarity index 100%
rename from public/langs/da_DK/banks.lang
rename to htdocs/langs/da_DK/banks.lang
diff --git a/public/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
similarity index 100%
rename from public/langs/da_DK/bills.lang
rename to htdocs/langs/da_DK/bills.lang
diff --git a/public/langs/da_DK/bookmarks.lang b/htdocs/langs/da_DK/bookmarks.lang
similarity index 100%
rename from public/langs/da_DK/bookmarks.lang
rename to htdocs/langs/da_DK/bookmarks.lang
diff --git a/public/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
similarity index 100%
rename from public/langs/da_DK/boxes.lang
rename to htdocs/langs/da_DK/boxes.lang
diff --git a/public/langs/da_DK/cashdesk.lang b/htdocs/langs/da_DK/cashdesk.lang
similarity index 100%
rename from public/langs/da_DK/cashdesk.lang
rename to htdocs/langs/da_DK/cashdesk.lang
diff --git a/public/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
similarity index 100%
rename from public/langs/da_DK/categories.lang
rename to htdocs/langs/da_DK/categories.lang
diff --git a/public/langs/da_DK/commercial.lang b/htdocs/langs/da_DK/commercial.lang
similarity index 100%
rename from public/langs/da_DK/commercial.lang
rename to htdocs/langs/da_DK/commercial.lang
diff --git a/public/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
similarity index 100%
rename from public/langs/da_DK/companies.lang
rename to htdocs/langs/da_DK/companies.lang
diff --git a/public/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
similarity index 100%
rename from public/langs/da_DK/compta.lang
rename to htdocs/langs/da_DK/compta.lang
diff --git a/public/langs/da_DK/contracts.lang b/htdocs/langs/da_DK/contracts.lang
similarity index 100%
rename from public/langs/da_DK/contracts.lang
rename to htdocs/langs/da_DK/contracts.lang
diff --git a/public/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang
similarity index 100%
rename from public/langs/da_DK/cron.lang
rename to htdocs/langs/da_DK/cron.lang
diff --git a/public/langs/da_DK/deliveries.lang b/htdocs/langs/da_DK/deliveries.lang
similarity index 100%
rename from public/langs/da_DK/deliveries.lang
rename to htdocs/langs/da_DK/deliveries.lang
diff --git a/public/langs/da_DK/dict.lang b/htdocs/langs/da_DK/dict.lang
similarity index 100%
rename from public/langs/da_DK/dict.lang
rename to htdocs/langs/da_DK/dict.lang
diff --git a/public/langs/da_DK/donations.lang b/htdocs/langs/da_DK/donations.lang
similarity index 100%
rename from public/langs/da_DK/donations.lang
rename to htdocs/langs/da_DK/donations.lang
diff --git a/public/langs/da_DK/ecm.lang b/htdocs/langs/da_DK/ecm.lang
similarity index 100%
rename from public/langs/da_DK/ecm.lang
rename to htdocs/langs/da_DK/ecm.lang
diff --git a/public/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
similarity index 100%
rename from public/langs/da_DK/errors.lang
rename to htdocs/langs/da_DK/errors.lang
diff --git a/public/langs/da_DK/exports.lang b/htdocs/langs/da_DK/exports.lang
similarity index 100%
rename from public/langs/da_DK/exports.lang
rename to htdocs/langs/da_DK/exports.lang
diff --git a/public/langs/da_DK/externalsite.lang b/htdocs/langs/da_DK/externalsite.lang
similarity index 100%
rename from public/langs/da_DK/externalsite.lang
rename to htdocs/langs/da_DK/externalsite.lang
diff --git a/public/langs/da_DK/ftp.lang b/htdocs/langs/da_DK/ftp.lang
similarity index 100%
rename from public/langs/da_DK/ftp.lang
rename to htdocs/langs/da_DK/ftp.lang
diff --git a/public/langs/da_DK/help.lang b/htdocs/langs/da_DK/help.lang
similarity index 100%
rename from public/langs/da_DK/help.lang
rename to htdocs/langs/da_DK/help.lang
diff --git a/public/langs/da_DK/holiday.lang b/htdocs/langs/da_DK/holiday.lang
similarity index 100%
rename from public/langs/da_DK/holiday.lang
rename to htdocs/langs/da_DK/holiday.lang
diff --git a/public/langs/da_DK/hrm.lang b/htdocs/langs/da_DK/hrm.lang
similarity index 100%
rename from public/langs/da_DK/hrm.lang
rename to htdocs/langs/da_DK/hrm.lang
diff --git a/public/langs/da_DK/incoterm.lang b/htdocs/langs/da_DK/incoterm.lang
similarity index 100%
rename from public/langs/da_DK/incoterm.lang
rename to htdocs/langs/da_DK/incoterm.lang
diff --git a/public/langs/da_DK/install.lang b/htdocs/langs/da_DK/install.lang
similarity index 100%
rename from public/langs/da_DK/install.lang
rename to htdocs/langs/da_DK/install.lang
diff --git a/public/langs/da_DK/interventions.lang b/htdocs/langs/da_DK/interventions.lang
similarity index 100%
rename from public/langs/da_DK/interventions.lang
rename to htdocs/langs/da_DK/interventions.lang
diff --git a/public/langs/da_DK/languages.lang b/htdocs/langs/da_DK/languages.lang
similarity index 100%
rename from public/langs/da_DK/languages.lang
rename to htdocs/langs/da_DK/languages.lang
diff --git a/public/langs/da_DK/ldap.lang b/htdocs/langs/da_DK/ldap.lang
similarity index 100%
rename from public/langs/da_DK/ldap.lang
rename to htdocs/langs/da_DK/ldap.lang
diff --git a/public/langs/da_DK/link.lang b/htdocs/langs/da_DK/link.lang
similarity index 100%
rename from public/langs/da_DK/link.lang
rename to htdocs/langs/da_DK/link.lang
diff --git a/public/langs/da_DK/loan.lang b/htdocs/langs/da_DK/loan.lang
similarity index 100%
rename from public/langs/da_DK/loan.lang
rename to htdocs/langs/da_DK/loan.lang
diff --git a/public/langs/da_DK/mailmanspip.lang b/htdocs/langs/da_DK/mailmanspip.lang
similarity index 100%
rename from public/langs/da_DK/mailmanspip.lang
rename to htdocs/langs/da_DK/mailmanspip.lang
diff --git a/public/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
similarity index 100%
rename from public/langs/da_DK/mails.lang
rename to htdocs/langs/da_DK/mails.lang
diff --git a/public/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
similarity index 100%
rename from public/langs/da_DK/main.lang
rename to htdocs/langs/da_DK/main.lang
diff --git a/public/langs/da_DK/margins.lang b/htdocs/langs/da_DK/margins.lang
similarity index 100%
rename from public/langs/da_DK/margins.lang
rename to htdocs/langs/da_DK/margins.lang
diff --git a/public/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
similarity index 100%
rename from public/langs/da_DK/members.lang
rename to htdocs/langs/da_DK/members.lang
diff --git a/public/langs/da_DK/oauth.lang b/htdocs/langs/da_DK/oauth.lang
similarity index 100%
rename from public/langs/da_DK/oauth.lang
rename to htdocs/langs/da_DK/oauth.lang
diff --git a/public/langs/da_DK/opensurvey.lang b/htdocs/langs/da_DK/opensurvey.lang
similarity index 100%
rename from public/langs/da_DK/opensurvey.lang
rename to htdocs/langs/da_DK/opensurvey.lang
diff --git a/public/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
similarity index 100%
rename from public/langs/da_DK/orders.lang
rename to htdocs/langs/da_DK/orders.lang
diff --git a/public/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
similarity index 100%
rename from public/langs/da_DK/other.lang
rename to htdocs/langs/da_DK/other.lang
diff --git a/public/langs/da_DK/paybox.lang b/htdocs/langs/da_DK/paybox.lang
similarity index 100%
rename from public/langs/da_DK/paybox.lang
rename to htdocs/langs/da_DK/paybox.lang
diff --git a/public/langs/da_DK/paypal.lang b/htdocs/langs/da_DK/paypal.lang
similarity index 100%
rename from public/langs/da_DK/paypal.lang
rename to htdocs/langs/da_DK/paypal.lang
diff --git a/public/langs/da_DK/printing.lang b/htdocs/langs/da_DK/printing.lang
similarity index 100%
rename from public/langs/da_DK/printing.lang
rename to htdocs/langs/da_DK/printing.lang
diff --git a/public/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang
similarity index 100%
rename from public/langs/da_DK/productbatch.lang
rename to htdocs/langs/da_DK/productbatch.lang
diff --git a/public/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
similarity index 100%
rename from public/langs/da_DK/products.lang
rename to htdocs/langs/da_DK/products.lang
diff --git a/public/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
similarity index 100%
rename from public/langs/da_DK/projects.lang
rename to htdocs/langs/da_DK/projects.lang
diff --git a/public/langs/da_DK/propal.lang b/htdocs/langs/da_DK/propal.lang
similarity index 100%
rename from public/langs/da_DK/propal.lang
rename to htdocs/langs/da_DK/propal.lang
diff --git a/public/langs/da_DK/receiptprinter.lang b/htdocs/langs/da_DK/receiptprinter.lang
similarity index 100%
rename from public/langs/da_DK/receiptprinter.lang
rename to htdocs/langs/da_DK/receiptprinter.lang
diff --git a/public/langs/da_DK/resource.lang b/htdocs/langs/da_DK/resource.lang
similarity index 100%
rename from public/langs/da_DK/resource.lang
rename to htdocs/langs/da_DK/resource.lang
diff --git a/public/langs/da_DK/salaries.lang b/htdocs/langs/da_DK/salaries.lang
similarity index 100%
rename from public/langs/da_DK/salaries.lang
rename to htdocs/langs/da_DK/salaries.lang
diff --git a/public/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang
similarity index 100%
rename from public/langs/da_DK/sendings.lang
rename to htdocs/langs/da_DK/sendings.lang
diff --git a/public/langs/da_DK/sms.lang b/htdocs/langs/da_DK/sms.lang
similarity index 100%
rename from public/langs/da_DK/sms.lang
rename to htdocs/langs/da_DK/sms.lang
diff --git a/public/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
similarity index 100%
rename from public/langs/da_DK/stocks.lang
rename to htdocs/langs/da_DK/stocks.lang
diff --git a/public/langs/da_DK/supplier_proposal.lang b/htdocs/langs/da_DK/supplier_proposal.lang
similarity index 100%
rename from public/langs/da_DK/supplier_proposal.lang
rename to htdocs/langs/da_DK/supplier_proposal.lang
diff --git a/public/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang
similarity index 100%
rename from public/langs/da_DK/suppliers.lang
rename to htdocs/langs/da_DK/suppliers.lang
diff --git a/public/langs/da_DK/trips.lang b/htdocs/langs/da_DK/trips.lang
similarity index 100%
rename from public/langs/da_DK/trips.lang
rename to htdocs/langs/da_DK/trips.lang
diff --git a/public/langs/da_DK/users.lang b/htdocs/langs/da_DK/users.lang
similarity index 100%
rename from public/langs/da_DK/users.lang
rename to htdocs/langs/da_DK/users.lang
diff --git a/public/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
similarity index 100%
rename from public/langs/da_DK/website.lang
rename to htdocs/langs/da_DK/website.lang
diff --git a/public/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
similarity index 100%
rename from public/langs/da_DK/withdrawals.lang
rename to htdocs/langs/da_DK/withdrawals.lang
diff --git a/public/langs/da_DK/workflow.lang b/htdocs/langs/da_DK/workflow.lang
similarity index 100%
rename from public/langs/da_DK/workflow.lang
rename to htdocs/langs/da_DK/workflow.lang
diff --git a/public/langs/de_AT/accountancy.lang b/htdocs/langs/de_AT/accountancy.lang
similarity index 100%
rename from public/langs/de_AT/accountancy.lang
rename to htdocs/langs/de_AT/accountancy.lang
diff --git a/public/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
similarity index 100%
rename from public/langs/de_AT/admin.lang
rename to htdocs/langs/de_AT/admin.lang
diff --git a/public/langs/de_AT/agenda.lang b/htdocs/langs/de_AT/agenda.lang
similarity index 100%
rename from public/langs/de_AT/agenda.lang
rename to htdocs/langs/de_AT/agenda.lang
diff --git a/public/langs/de_AT/banks.lang b/htdocs/langs/de_AT/banks.lang
similarity index 100%
rename from public/langs/de_AT/banks.lang
rename to htdocs/langs/de_AT/banks.lang
diff --git a/public/langs/de_AT/bills.lang b/htdocs/langs/de_AT/bills.lang
similarity index 100%
rename from public/langs/de_AT/bills.lang
rename to htdocs/langs/de_AT/bills.lang
diff --git a/public/langs/de_AT/bookmarks.lang b/htdocs/langs/de_AT/bookmarks.lang
similarity index 100%
rename from public/langs/de_AT/bookmarks.lang
rename to htdocs/langs/de_AT/bookmarks.lang
diff --git a/public/langs/de_AT/boxes.lang b/htdocs/langs/de_AT/boxes.lang
similarity index 100%
rename from public/langs/de_AT/boxes.lang
rename to htdocs/langs/de_AT/boxes.lang
diff --git a/public/langs/de_AT/cashdesk.lang b/htdocs/langs/de_AT/cashdesk.lang
similarity index 100%
rename from public/langs/de_AT/cashdesk.lang
rename to htdocs/langs/de_AT/cashdesk.lang
diff --git a/public/langs/de_AT/categories.lang b/htdocs/langs/de_AT/categories.lang
similarity index 100%
rename from public/langs/de_AT/categories.lang
rename to htdocs/langs/de_AT/categories.lang
diff --git a/public/langs/de_AT/commercial.lang b/htdocs/langs/de_AT/commercial.lang
similarity index 100%
rename from public/langs/de_AT/commercial.lang
rename to htdocs/langs/de_AT/commercial.lang
diff --git a/public/langs/de_AT/companies.lang b/htdocs/langs/de_AT/companies.lang
similarity index 100%
rename from public/langs/de_AT/companies.lang
rename to htdocs/langs/de_AT/companies.lang
diff --git a/public/langs/de_AT/compta.lang b/htdocs/langs/de_AT/compta.lang
similarity index 100%
rename from public/langs/de_AT/compta.lang
rename to htdocs/langs/de_AT/compta.lang
diff --git a/public/langs/de_AT/contracts.lang b/htdocs/langs/de_AT/contracts.lang
similarity index 100%
rename from public/langs/de_AT/contracts.lang
rename to htdocs/langs/de_AT/contracts.lang
diff --git a/public/langs/de_AT/cron.lang b/htdocs/langs/de_AT/cron.lang
similarity index 100%
rename from public/langs/de_AT/cron.lang
rename to htdocs/langs/de_AT/cron.lang
diff --git a/public/langs/de_AT/deliveries.lang b/htdocs/langs/de_AT/deliveries.lang
similarity index 100%
rename from public/langs/de_AT/deliveries.lang
rename to htdocs/langs/de_AT/deliveries.lang
diff --git a/public/langs/de_AT/dict.lang b/htdocs/langs/de_AT/dict.lang
similarity index 100%
rename from public/langs/de_AT/dict.lang
rename to htdocs/langs/de_AT/dict.lang
diff --git a/public/langs/de_AT/donations.lang b/htdocs/langs/de_AT/donations.lang
similarity index 100%
rename from public/langs/de_AT/donations.lang
rename to htdocs/langs/de_AT/donations.lang
diff --git a/public/langs/de_AT/ecm.lang b/htdocs/langs/de_AT/ecm.lang
similarity index 100%
rename from public/langs/de_AT/ecm.lang
rename to htdocs/langs/de_AT/ecm.lang
diff --git a/public/langs/de_AT/errors.lang b/htdocs/langs/de_AT/errors.lang
similarity index 100%
rename from public/langs/de_AT/errors.lang
rename to htdocs/langs/de_AT/errors.lang
diff --git a/public/langs/de_AT/exports.lang b/htdocs/langs/de_AT/exports.lang
similarity index 100%
rename from public/langs/de_AT/exports.lang
rename to htdocs/langs/de_AT/exports.lang
diff --git a/public/langs/de_AT/externalsite.lang b/htdocs/langs/de_AT/externalsite.lang
similarity index 100%
rename from public/langs/de_AT/externalsite.lang
rename to htdocs/langs/de_AT/externalsite.lang
diff --git a/public/langs/de_AT/ftp.lang b/htdocs/langs/de_AT/ftp.lang
similarity index 100%
rename from public/langs/de_AT/ftp.lang
rename to htdocs/langs/de_AT/ftp.lang
diff --git a/public/langs/de_AT/help.lang b/htdocs/langs/de_AT/help.lang
similarity index 100%
rename from public/langs/de_AT/help.lang
rename to htdocs/langs/de_AT/help.lang
diff --git a/public/langs/de_AT/holiday.lang b/htdocs/langs/de_AT/holiday.lang
similarity index 100%
rename from public/langs/de_AT/holiday.lang
rename to htdocs/langs/de_AT/holiday.lang
diff --git a/public/langs/de_AT/hrm.lang b/htdocs/langs/de_AT/hrm.lang
similarity index 100%
rename from public/langs/de_AT/hrm.lang
rename to htdocs/langs/de_AT/hrm.lang
diff --git a/public/langs/de_AT/incoterm.lang b/htdocs/langs/de_AT/incoterm.lang
similarity index 100%
rename from public/langs/de_AT/incoterm.lang
rename to htdocs/langs/de_AT/incoterm.lang
diff --git a/public/langs/de_AT/install.lang b/htdocs/langs/de_AT/install.lang
similarity index 100%
rename from public/langs/de_AT/install.lang
rename to htdocs/langs/de_AT/install.lang
diff --git a/public/langs/de_AT/interventions.lang b/htdocs/langs/de_AT/interventions.lang
similarity index 100%
rename from public/langs/de_AT/interventions.lang
rename to htdocs/langs/de_AT/interventions.lang
diff --git a/public/langs/de_AT/languages.lang b/htdocs/langs/de_AT/languages.lang
similarity index 100%
rename from public/langs/de_AT/languages.lang
rename to htdocs/langs/de_AT/languages.lang
diff --git a/public/langs/de_AT/ldap.lang b/htdocs/langs/de_AT/ldap.lang
similarity index 100%
rename from public/langs/de_AT/ldap.lang
rename to htdocs/langs/de_AT/ldap.lang
diff --git a/public/langs/de_AT/link.lang b/htdocs/langs/de_AT/link.lang
similarity index 100%
rename from public/langs/de_AT/link.lang
rename to htdocs/langs/de_AT/link.lang
diff --git a/public/langs/de_AT/loan.lang b/htdocs/langs/de_AT/loan.lang
similarity index 100%
rename from public/langs/de_AT/loan.lang
rename to htdocs/langs/de_AT/loan.lang
diff --git a/public/langs/de_AT/mailmanspip.lang b/htdocs/langs/de_AT/mailmanspip.lang
similarity index 100%
rename from public/langs/de_AT/mailmanspip.lang
rename to htdocs/langs/de_AT/mailmanspip.lang
diff --git a/public/langs/de_AT/mails.lang b/htdocs/langs/de_AT/mails.lang
similarity index 100%
rename from public/langs/de_AT/mails.lang
rename to htdocs/langs/de_AT/mails.lang
diff --git a/public/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang
similarity index 100%
rename from public/langs/de_AT/main.lang
rename to htdocs/langs/de_AT/main.lang
diff --git a/public/langs/de_AT/margins.lang b/htdocs/langs/de_AT/margins.lang
similarity index 100%
rename from public/langs/de_AT/margins.lang
rename to htdocs/langs/de_AT/margins.lang
diff --git a/public/langs/de_AT/members.lang b/htdocs/langs/de_AT/members.lang
similarity index 100%
rename from public/langs/de_AT/members.lang
rename to htdocs/langs/de_AT/members.lang
diff --git a/public/langs/de_AT/oauth.lang b/htdocs/langs/de_AT/oauth.lang
similarity index 100%
rename from public/langs/de_AT/oauth.lang
rename to htdocs/langs/de_AT/oauth.lang
diff --git a/public/langs/de_AT/opensurvey.lang b/htdocs/langs/de_AT/opensurvey.lang
similarity index 100%
rename from public/langs/de_AT/opensurvey.lang
rename to htdocs/langs/de_AT/opensurvey.lang
diff --git a/public/langs/de_AT/orders.lang b/htdocs/langs/de_AT/orders.lang
similarity index 100%
rename from public/langs/de_AT/orders.lang
rename to htdocs/langs/de_AT/orders.lang
diff --git a/public/langs/de_AT/other.lang b/htdocs/langs/de_AT/other.lang
similarity index 100%
rename from public/langs/de_AT/other.lang
rename to htdocs/langs/de_AT/other.lang
diff --git a/public/langs/de_AT/paybox.lang b/htdocs/langs/de_AT/paybox.lang
similarity index 100%
rename from public/langs/de_AT/paybox.lang
rename to htdocs/langs/de_AT/paybox.lang
diff --git a/public/langs/de_AT/paypal.lang b/htdocs/langs/de_AT/paypal.lang
similarity index 100%
rename from public/langs/de_AT/paypal.lang
rename to htdocs/langs/de_AT/paypal.lang
diff --git a/public/langs/de_AT/printing.lang b/htdocs/langs/de_AT/printing.lang
similarity index 100%
rename from public/langs/de_AT/printing.lang
rename to htdocs/langs/de_AT/printing.lang
diff --git a/public/langs/de_AT/productbatch.lang b/htdocs/langs/de_AT/productbatch.lang
similarity index 100%
rename from public/langs/de_AT/productbatch.lang
rename to htdocs/langs/de_AT/productbatch.lang
diff --git a/public/langs/de_AT/products.lang b/htdocs/langs/de_AT/products.lang
similarity index 100%
rename from public/langs/de_AT/products.lang
rename to htdocs/langs/de_AT/products.lang
diff --git a/public/langs/de_AT/projects.lang b/htdocs/langs/de_AT/projects.lang
similarity index 100%
rename from public/langs/de_AT/projects.lang
rename to htdocs/langs/de_AT/projects.lang
diff --git a/public/langs/de_AT/propal.lang b/htdocs/langs/de_AT/propal.lang
similarity index 100%
rename from public/langs/de_AT/propal.lang
rename to htdocs/langs/de_AT/propal.lang
diff --git a/public/langs/de_AT/receiptprinter.lang b/htdocs/langs/de_AT/receiptprinter.lang
similarity index 100%
rename from public/langs/de_AT/receiptprinter.lang
rename to htdocs/langs/de_AT/receiptprinter.lang
diff --git a/public/langs/de_AT/resource.lang b/htdocs/langs/de_AT/resource.lang
similarity index 100%
rename from public/langs/de_AT/resource.lang
rename to htdocs/langs/de_AT/resource.lang
diff --git a/public/langs/de_AT/salaries.lang b/htdocs/langs/de_AT/salaries.lang
similarity index 100%
rename from public/langs/de_AT/salaries.lang
rename to htdocs/langs/de_AT/salaries.lang
diff --git a/public/langs/de_AT/sendings.lang b/htdocs/langs/de_AT/sendings.lang
similarity index 100%
rename from public/langs/de_AT/sendings.lang
rename to htdocs/langs/de_AT/sendings.lang
diff --git a/public/langs/de_AT/sms.lang b/htdocs/langs/de_AT/sms.lang
similarity index 100%
rename from public/langs/de_AT/sms.lang
rename to htdocs/langs/de_AT/sms.lang
diff --git a/public/langs/de_AT/stocks.lang b/htdocs/langs/de_AT/stocks.lang
similarity index 100%
rename from public/langs/de_AT/stocks.lang
rename to htdocs/langs/de_AT/stocks.lang
diff --git a/public/langs/de_AT/supplier_proposal.lang b/htdocs/langs/de_AT/supplier_proposal.lang
similarity index 100%
rename from public/langs/de_AT/supplier_proposal.lang
rename to htdocs/langs/de_AT/supplier_proposal.lang
diff --git a/public/langs/de_AT/suppliers.lang b/htdocs/langs/de_AT/suppliers.lang
similarity index 100%
rename from public/langs/de_AT/suppliers.lang
rename to htdocs/langs/de_AT/suppliers.lang
diff --git a/public/langs/de_AT/trips.lang b/htdocs/langs/de_AT/trips.lang
similarity index 100%
rename from public/langs/de_AT/trips.lang
rename to htdocs/langs/de_AT/trips.lang
diff --git a/public/langs/de_AT/users.lang b/htdocs/langs/de_AT/users.lang
similarity index 100%
rename from public/langs/de_AT/users.lang
rename to htdocs/langs/de_AT/users.lang
diff --git a/public/langs/de_AT/website.lang b/htdocs/langs/de_AT/website.lang
similarity index 100%
rename from public/langs/de_AT/website.lang
rename to htdocs/langs/de_AT/website.lang
diff --git a/public/langs/de_AT/withdrawals.lang b/htdocs/langs/de_AT/withdrawals.lang
similarity index 100%
rename from public/langs/de_AT/withdrawals.lang
rename to htdocs/langs/de_AT/withdrawals.lang
diff --git a/public/langs/de_AT/workflow.lang b/htdocs/langs/de_AT/workflow.lang
similarity index 100%
rename from public/langs/de_AT/workflow.lang
rename to htdocs/langs/de_AT/workflow.lang
diff --git a/public/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
similarity index 100%
rename from public/langs/de_CH/accountancy.lang
rename to htdocs/langs/de_CH/accountancy.lang
diff --git a/public/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
similarity index 100%
rename from public/langs/de_CH/admin.lang
rename to htdocs/langs/de_CH/admin.lang
diff --git a/public/langs/de_CH/agenda.lang b/htdocs/langs/de_CH/agenda.lang
similarity index 100%
rename from public/langs/de_CH/agenda.lang
rename to htdocs/langs/de_CH/agenda.lang
diff --git a/public/langs/de_CH/banks.lang b/htdocs/langs/de_CH/banks.lang
similarity index 100%
rename from public/langs/de_CH/banks.lang
rename to htdocs/langs/de_CH/banks.lang
diff --git a/public/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang
similarity index 100%
rename from public/langs/de_CH/bills.lang
rename to htdocs/langs/de_CH/bills.lang
diff --git a/public/langs/de_CH/bookmarks.lang b/htdocs/langs/de_CH/bookmarks.lang
similarity index 100%
rename from public/langs/de_CH/bookmarks.lang
rename to htdocs/langs/de_CH/bookmarks.lang
diff --git a/public/langs/de_CH/boxes.lang b/htdocs/langs/de_CH/boxes.lang
similarity index 100%
rename from public/langs/de_CH/boxes.lang
rename to htdocs/langs/de_CH/boxes.lang
diff --git a/public/langs/de_CH/cashdesk.lang b/htdocs/langs/de_CH/cashdesk.lang
similarity index 100%
rename from public/langs/de_CH/cashdesk.lang
rename to htdocs/langs/de_CH/cashdesk.lang
diff --git a/public/langs/de_CH/categories.lang b/htdocs/langs/de_CH/categories.lang
similarity index 100%
rename from public/langs/de_CH/categories.lang
rename to htdocs/langs/de_CH/categories.lang
diff --git a/public/langs/de_CH/commercial.lang b/htdocs/langs/de_CH/commercial.lang
similarity index 100%
rename from public/langs/de_CH/commercial.lang
rename to htdocs/langs/de_CH/commercial.lang
diff --git a/public/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
similarity index 100%
rename from public/langs/de_CH/companies.lang
rename to htdocs/langs/de_CH/companies.lang
diff --git a/public/langs/de_CH/compta.lang b/htdocs/langs/de_CH/compta.lang
similarity index 100%
rename from public/langs/de_CH/compta.lang
rename to htdocs/langs/de_CH/compta.lang
diff --git a/public/langs/de_CH/contracts.lang b/htdocs/langs/de_CH/contracts.lang
similarity index 100%
rename from public/langs/de_CH/contracts.lang
rename to htdocs/langs/de_CH/contracts.lang
diff --git a/public/langs/de_CH/cron.lang b/htdocs/langs/de_CH/cron.lang
similarity index 100%
rename from public/langs/de_CH/cron.lang
rename to htdocs/langs/de_CH/cron.lang
diff --git a/public/langs/de_CH/deliveries.lang b/htdocs/langs/de_CH/deliveries.lang
similarity index 100%
rename from public/langs/de_CH/deliveries.lang
rename to htdocs/langs/de_CH/deliveries.lang
diff --git a/public/langs/de_CH/dict.lang b/htdocs/langs/de_CH/dict.lang
similarity index 100%
rename from public/langs/de_CH/dict.lang
rename to htdocs/langs/de_CH/dict.lang
diff --git a/public/langs/de_CH/donations.lang b/htdocs/langs/de_CH/donations.lang
similarity index 100%
rename from public/langs/de_CH/donations.lang
rename to htdocs/langs/de_CH/donations.lang
diff --git a/public/langs/de_CH/ecm.lang b/htdocs/langs/de_CH/ecm.lang
similarity index 100%
rename from public/langs/de_CH/ecm.lang
rename to htdocs/langs/de_CH/ecm.lang
diff --git a/public/langs/de_CH/errors.lang b/htdocs/langs/de_CH/errors.lang
similarity index 100%
rename from public/langs/de_CH/errors.lang
rename to htdocs/langs/de_CH/errors.lang
diff --git a/public/langs/de_CH/exports.lang b/htdocs/langs/de_CH/exports.lang
similarity index 100%
rename from public/langs/de_CH/exports.lang
rename to htdocs/langs/de_CH/exports.lang
diff --git a/public/langs/de_CH/externalsite.lang b/htdocs/langs/de_CH/externalsite.lang
similarity index 100%
rename from public/langs/de_CH/externalsite.lang
rename to htdocs/langs/de_CH/externalsite.lang
diff --git a/public/langs/de_CH/ftp.lang b/htdocs/langs/de_CH/ftp.lang
similarity index 100%
rename from public/langs/de_CH/ftp.lang
rename to htdocs/langs/de_CH/ftp.lang
diff --git a/public/langs/de_CH/help.lang b/htdocs/langs/de_CH/help.lang
similarity index 100%
rename from public/langs/de_CH/help.lang
rename to htdocs/langs/de_CH/help.lang
diff --git a/public/langs/de_CH/holiday.lang b/htdocs/langs/de_CH/holiday.lang
similarity index 100%
rename from public/langs/de_CH/holiday.lang
rename to htdocs/langs/de_CH/holiday.lang
diff --git a/public/langs/de_CH/hrm.lang b/htdocs/langs/de_CH/hrm.lang
similarity index 100%
rename from public/langs/de_CH/hrm.lang
rename to htdocs/langs/de_CH/hrm.lang
diff --git a/public/langs/de_CH/incoterm.lang b/htdocs/langs/de_CH/incoterm.lang
similarity index 100%
rename from public/langs/de_CH/incoterm.lang
rename to htdocs/langs/de_CH/incoterm.lang
diff --git a/public/langs/de_CH/install.lang b/htdocs/langs/de_CH/install.lang
similarity index 100%
rename from public/langs/de_CH/install.lang
rename to htdocs/langs/de_CH/install.lang
diff --git a/public/langs/de_CH/interventions.lang b/htdocs/langs/de_CH/interventions.lang
similarity index 100%
rename from public/langs/de_CH/interventions.lang
rename to htdocs/langs/de_CH/interventions.lang
diff --git a/public/langs/de_CH/languages.lang b/htdocs/langs/de_CH/languages.lang
similarity index 100%
rename from public/langs/de_CH/languages.lang
rename to htdocs/langs/de_CH/languages.lang
diff --git a/public/langs/de_CH/ldap.lang b/htdocs/langs/de_CH/ldap.lang
similarity index 100%
rename from public/langs/de_CH/ldap.lang
rename to htdocs/langs/de_CH/ldap.lang
diff --git a/public/langs/de_CH/link.lang b/htdocs/langs/de_CH/link.lang
similarity index 100%
rename from public/langs/de_CH/link.lang
rename to htdocs/langs/de_CH/link.lang
diff --git a/public/langs/de_CH/loan.lang b/htdocs/langs/de_CH/loan.lang
similarity index 100%
rename from public/langs/de_CH/loan.lang
rename to htdocs/langs/de_CH/loan.lang
diff --git a/public/langs/de_CH/mailmanspip.lang b/htdocs/langs/de_CH/mailmanspip.lang
similarity index 100%
rename from public/langs/de_CH/mailmanspip.lang
rename to htdocs/langs/de_CH/mailmanspip.lang
diff --git a/public/langs/de_CH/mails.lang b/htdocs/langs/de_CH/mails.lang
similarity index 100%
rename from public/langs/de_CH/mails.lang
rename to htdocs/langs/de_CH/mails.lang
diff --git a/public/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
similarity index 100%
rename from public/langs/de_CH/main.lang
rename to htdocs/langs/de_CH/main.lang
diff --git a/public/langs/de_CH/margins.lang b/htdocs/langs/de_CH/margins.lang
similarity index 100%
rename from public/langs/de_CH/margins.lang
rename to htdocs/langs/de_CH/margins.lang
diff --git a/public/langs/de_CH/members.lang b/htdocs/langs/de_CH/members.lang
similarity index 100%
rename from public/langs/de_CH/members.lang
rename to htdocs/langs/de_CH/members.lang
diff --git a/public/langs/de_CH/oauth.lang b/htdocs/langs/de_CH/oauth.lang
similarity index 100%
rename from public/langs/de_CH/oauth.lang
rename to htdocs/langs/de_CH/oauth.lang
diff --git a/public/langs/de_CH/opensurvey.lang b/htdocs/langs/de_CH/opensurvey.lang
similarity index 100%
rename from public/langs/de_CH/opensurvey.lang
rename to htdocs/langs/de_CH/opensurvey.lang
diff --git a/public/langs/de_CH/orders.lang b/htdocs/langs/de_CH/orders.lang
similarity index 100%
rename from public/langs/de_CH/orders.lang
rename to htdocs/langs/de_CH/orders.lang
diff --git a/public/langs/de_CH/other.lang b/htdocs/langs/de_CH/other.lang
similarity index 100%
rename from public/langs/de_CH/other.lang
rename to htdocs/langs/de_CH/other.lang
diff --git a/public/langs/de_CH/paybox.lang b/htdocs/langs/de_CH/paybox.lang
similarity index 100%
rename from public/langs/de_CH/paybox.lang
rename to htdocs/langs/de_CH/paybox.lang
diff --git a/public/langs/de_CH/paypal.lang b/htdocs/langs/de_CH/paypal.lang
similarity index 100%
rename from public/langs/de_CH/paypal.lang
rename to htdocs/langs/de_CH/paypal.lang
diff --git a/public/langs/de_CH/printing.lang b/htdocs/langs/de_CH/printing.lang
similarity index 100%
rename from public/langs/de_CH/printing.lang
rename to htdocs/langs/de_CH/printing.lang
diff --git a/public/langs/de_CH/productbatch.lang b/htdocs/langs/de_CH/productbatch.lang
similarity index 100%
rename from public/langs/de_CH/productbatch.lang
rename to htdocs/langs/de_CH/productbatch.lang
diff --git a/public/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
similarity index 100%
rename from public/langs/de_CH/products.lang
rename to htdocs/langs/de_CH/products.lang
diff --git a/public/langs/de_CH/projects.lang b/htdocs/langs/de_CH/projects.lang
similarity index 100%
rename from public/langs/de_CH/projects.lang
rename to htdocs/langs/de_CH/projects.lang
diff --git a/public/langs/de_CH/propal.lang b/htdocs/langs/de_CH/propal.lang
similarity index 100%
rename from public/langs/de_CH/propal.lang
rename to htdocs/langs/de_CH/propal.lang
diff --git a/public/langs/de_CH/receiptprinter.lang b/htdocs/langs/de_CH/receiptprinter.lang
similarity index 100%
rename from public/langs/de_CH/receiptprinter.lang
rename to htdocs/langs/de_CH/receiptprinter.lang
diff --git a/public/langs/de_CH/resource.lang b/htdocs/langs/de_CH/resource.lang
similarity index 100%
rename from public/langs/de_CH/resource.lang
rename to htdocs/langs/de_CH/resource.lang
diff --git a/public/langs/de_CH/salaries.lang b/htdocs/langs/de_CH/salaries.lang
similarity index 100%
rename from public/langs/de_CH/salaries.lang
rename to htdocs/langs/de_CH/salaries.lang
diff --git a/public/langs/de_CH/sendings.lang b/htdocs/langs/de_CH/sendings.lang
similarity index 100%
rename from public/langs/de_CH/sendings.lang
rename to htdocs/langs/de_CH/sendings.lang
diff --git a/public/langs/de_CH/sms.lang b/htdocs/langs/de_CH/sms.lang
similarity index 100%
rename from public/langs/de_CH/sms.lang
rename to htdocs/langs/de_CH/sms.lang
diff --git a/public/langs/de_CH/stocks.lang b/htdocs/langs/de_CH/stocks.lang
similarity index 100%
rename from public/langs/de_CH/stocks.lang
rename to htdocs/langs/de_CH/stocks.lang
diff --git a/public/langs/de_CH/supplier_proposal.lang b/htdocs/langs/de_CH/supplier_proposal.lang
similarity index 100%
rename from public/langs/de_CH/supplier_proposal.lang
rename to htdocs/langs/de_CH/supplier_proposal.lang
diff --git a/public/langs/de_CH/suppliers.lang b/htdocs/langs/de_CH/suppliers.lang
similarity index 100%
rename from public/langs/de_CH/suppliers.lang
rename to htdocs/langs/de_CH/suppliers.lang
diff --git a/public/langs/de_CH/trips.lang b/htdocs/langs/de_CH/trips.lang
similarity index 100%
rename from public/langs/de_CH/trips.lang
rename to htdocs/langs/de_CH/trips.lang
diff --git a/public/langs/de_CH/users.lang b/htdocs/langs/de_CH/users.lang
similarity index 100%
rename from public/langs/de_CH/users.lang
rename to htdocs/langs/de_CH/users.lang
diff --git a/public/langs/de_CH/website.lang b/htdocs/langs/de_CH/website.lang
similarity index 100%
rename from public/langs/de_CH/website.lang
rename to htdocs/langs/de_CH/website.lang
diff --git a/public/langs/de_CH/withdrawals.lang b/htdocs/langs/de_CH/withdrawals.lang
similarity index 100%
rename from public/langs/de_CH/withdrawals.lang
rename to htdocs/langs/de_CH/withdrawals.lang
diff --git a/public/langs/de_CH/workflow.lang b/htdocs/langs/de_CH/workflow.lang
similarity index 100%
rename from public/langs/de_CH/workflow.lang
rename to htdocs/langs/de_CH/workflow.lang
diff --git a/public/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
similarity index 100%
rename from public/langs/de_DE/accountancy.lang
rename to htdocs/langs/de_DE/accountancy.lang
diff --git a/public/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
similarity index 100%
rename from public/langs/de_DE/admin.lang
rename to htdocs/langs/de_DE/admin.lang
diff --git a/public/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
similarity index 100%
rename from public/langs/de_DE/agenda.lang
rename to htdocs/langs/de_DE/agenda.lang
diff --git a/public/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
similarity index 100%
rename from public/langs/de_DE/banks.lang
rename to htdocs/langs/de_DE/banks.lang
diff --git a/public/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
similarity index 100%
rename from public/langs/de_DE/bills.lang
rename to htdocs/langs/de_DE/bills.lang
diff --git a/public/langs/de_DE/bookmarks.lang b/htdocs/langs/de_DE/bookmarks.lang
similarity index 100%
rename from public/langs/de_DE/bookmarks.lang
rename to htdocs/langs/de_DE/bookmarks.lang
diff --git a/public/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
similarity index 100%
rename from public/langs/de_DE/boxes.lang
rename to htdocs/langs/de_DE/boxes.lang
diff --git a/public/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
similarity index 100%
rename from public/langs/de_DE/cashdesk.lang
rename to htdocs/langs/de_DE/cashdesk.lang
diff --git a/public/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
similarity index 100%
rename from public/langs/de_DE/categories.lang
rename to htdocs/langs/de_DE/categories.lang
diff --git a/public/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang
similarity index 100%
rename from public/langs/de_DE/commercial.lang
rename to htdocs/langs/de_DE/commercial.lang
diff --git a/public/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
similarity index 100%
rename from public/langs/de_DE/companies.lang
rename to htdocs/langs/de_DE/companies.lang
diff --git a/public/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
similarity index 100%
rename from public/langs/de_DE/compta.lang
rename to htdocs/langs/de_DE/compta.lang
diff --git a/public/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang
similarity index 100%
rename from public/langs/de_DE/contracts.lang
rename to htdocs/langs/de_DE/contracts.lang
diff --git a/public/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
similarity index 100%
rename from public/langs/de_DE/cron.lang
rename to htdocs/langs/de_DE/cron.lang
diff --git a/public/langs/de_DE/deliveries.lang b/htdocs/langs/de_DE/deliveries.lang
similarity index 100%
rename from public/langs/de_DE/deliveries.lang
rename to htdocs/langs/de_DE/deliveries.lang
diff --git a/public/langs/de_DE/dict.lang b/htdocs/langs/de_DE/dict.lang
similarity index 100%
rename from public/langs/de_DE/dict.lang
rename to htdocs/langs/de_DE/dict.lang
diff --git a/public/langs/de_DE/donations.lang b/htdocs/langs/de_DE/donations.lang
similarity index 100%
rename from public/langs/de_DE/donations.lang
rename to htdocs/langs/de_DE/donations.lang
diff --git a/public/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
similarity index 100%
rename from public/langs/de_DE/ecm.lang
rename to htdocs/langs/de_DE/ecm.lang
diff --git a/public/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
similarity index 100%
rename from public/langs/de_DE/errors.lang
rename to htdocs/langs/de_DE/errors.lang
diff --git a/public/langs/de_DE/exports.lang b/htdocs/langs/de_DE/exports.lang
similarity index 100%
rename from public/langs/de_DE/exports.lang
rename to htdocs/langs/de_DE/exports.lang
diff --git a/public/langs/de_DE/externalsite.lang b/htdocs/langs/de_DE/externalsite.lang
similarity index 100%
rename from public/langs/de_DE/externalsite.lang
rename to htdocs/langs/de_DE/externalsite.lang
diff --git a/public/langs/de_DE/ftp.lang b/htdocs/langs/de_DE/ftp.lang
similarity index 100%
rename from public/langs/de_DE/ftp.lang
rename to htdocs/langs/de_DE/ftp.lang
diff --git a/public/langs/de_DE/help.lang b/htdocs/langs/de_DE/help.lang
similarity index 100%
rename from public/langs/de_DE/help.lang
rename to htdocs/langs/de_DE/help.lang
diff --git a/public/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
similarity index 100%
rename from public/langs/de_DE/holiday.lang
rename to htdocs/langs/de_DE/holiday.lang
diff --git a/public/langs/de_DE/hrm.lang b/htdocs/langs/de_DE/hrm.lang
similarity index 100%
rename from public/langs/de_DE/hrm.lang
rename to htdocs/langs/de_DE/hrm.lang
diff --git a/public/langs/de_DE/incoterm.lang b/htdocs/langs/de_DE/incoterm.lang
similarity index 100%
rename from public/langs/de_DE/incoterm.lang
rename to htdocs/langs/de_DE/incoterm.lang
diff --git a/public/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
similarity index 100%
rename from public/langs/de_DE/install.lang
rename to htdocs/langs/de_DE/install.lang
diff --git a/public/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
similarity index 100%
rename from public/langs/de_DE/interventions.lang
rename to htdocs/langs/de_DE/interventions.lang
diff --git a/public/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang
similarity index 100%
rename from public/langs/de_DE/languages.lang
rename to htdocs/langs/de_DE/languages.lang
diff --git a/public/langs/de_DE/ldap.lang b/htdocs/langs/de_DE/ldap.lang
similarity index 100%
rename from public/langs/de_DE/ldap.lang
rename to htdocs/langs/de_DE/ldap.lang
diff --git a/public/langs/de_DE/link.lang b/htdocs/langs/de_DE/link.lang
similarity index 100%
rename from public/langs/de_DE/link.lang
rename to htdocs/langs/de_DE/link.lang
diff --git a/public/langs/de_DE/loan.lang b/htdocs/langs/de_DE/loan.lang
similarity index 100%
rename from public/langs/de_DE/loan.lang
rename to htdocs/langs/de_DE/loan.lang
diff --git a/public/langs/de_DE/mailmanspip.lang b/htdocs/langs/de_DE/mailmanspip.lang
similarity index 100%
rename from public/langs/de_DE/mailmanspip.lang
rename to htdocs/langs/de_DE/mailmanspip.lang
diff --git a/public/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
similarity index 100%
rename from public/langs/de_DE/mails.lang
rename to htdocs/langs/de_DE/mails.lang
diff --git a/public/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
similarity index 100%
rename from public/langs/de_DE/main.lang
rename to htdocs/langs/de_DE/main.lang
diff --git a/public/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang
similarity index 100%
rename from public/langs/de_DE/margins.lang
rename to htdocs/langs/de_DE/margins.lang
diff --git a/public/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
similarity index 100%
rename from public/langs/de_DE/members.lang
rename to htdocs/langs/de_DE/members.lang
diff --git a/public/langs/de_DE/oauth.lang b/htdocs/langs/de_DE/oauth.lang
similarity index 100%
rename from public/langs/de_DE/oauth.lang
rename to htdocs/langs/de_DE/oauth.lang
diff --git a/public/langs/de_DE/opensurvey.lang b/htdocs/langs/de_DE/opensurvey.lang
similarity index 100%
rename from public/langs/de_DE/opensurvey.lang
rename to htdocs/langs/de_DE/opensurvey.lang
diff --git a/public/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
similarity index 100%
rename from public/langs/de_DE/orders.lang
rename to htdocs/langs/de_DE/orders.lang
diff --git a/public/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
similarity index 100%
rename from public/langs/de_DE/other.lang
rename to htdocs/langs/de_DE/other.lang
diff --git a/public/langs/de_DE/paybox.lang b/htdocs/langs/de_DE/paybox.lang
similarity index 100%
rename from public/langs/de_DE/paybox.lang
rename to htdocs/langs/de_DE/paybox.lang
diff --git a/public/langs/de_DE/paypal.lang b/htdocs/langs/de_DE/paypal.lang
similarity index 100%
rename from public/langs/de_DE/paypal.lang
rename to htdocs/langs/de_DE/paypal.lang
diff --git a/public/langs/de_DE/printing.lang b/htdocs/langs/de_DE/printing.lang
similarity index 100%
rename from public/langs/de_DE/printing.lang
rename to htdocs/langs/de_DE/printing.lang
diff --git a/public/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang
similarity index 100%
rename from public/langs/de_DE/productbatch.lang
rename to htdocs/langs/de_DE/productbatch.lang
diff --git a/public/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
similarity index 100%
rename from public/langs/de_DE/products.lang
rename to htdocs/langs/de_DE/products.lang
diff --git a/public/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
similarity index 100%
rename from public/langs/de_DE/projects.lang
rename to htdocs/langs/de_DE/projects.lang
diff --git a/public/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang
similarity index 100%
rename from public/langs/de_DE/propal.lang
rename to htdocs/langs/de_DE/propal.lang
diff --git a/public/langs/de_DE/receiptprinter.lang b/htdocs/langs/de_DE/receiptprinter.lang
similarity index 100%
rename from public/langs/de_DE/receiptprinter.lang
rename to htdocs/langs/de_DE/receiptprinter.lang
diff --git a/public/langs/de_DE/resource.lang b/htdocs/langs/de_DE/resource.lang
similarity index 100%
rename from public/langs/de_DE/resource.lang
rename to htdocs/langs/de_DE/resource.lang
diff --git a/public/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang
similarity index 100%
rename from public/langs/de_DE/salaries.lang
rename to htdocs/langs/de_DE/salaries.lang
diff --git a/public/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
similarity index 100%
rename from public/langs/de_DE/sendings.lang
rename to htdocs/langs/de_DE/sendings.lang
diff --git a/public/langs/de_DE/sms.lang b/htdocs/langs/de_DE/sms.lang
similarity index 100%
rename from public/langs/de_DE/sms.lang
rename to htdocs/langs/de_DE/sms.lang
diff --git a/public/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
similarity index 100%
rename from public/langs/de_DE/stocks.lang
rename to htdocs/langs/de_DE/stocks.lang
diff --git a/public/langs/de_DE/supplier_proposal.lang b/htdocs/langs/de_DE/supplier_proposal.lang
similarity index 100%
rename from public/langs/de_DE/supplier_proposal.lang
rename to htdocs/langs/de_DE/supplier_proposal.lang
diff --git a/public/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
similarity index 100%
rename from public/langs/de_DE/suppliers.lang
rename to htdocs/langs/de_DE/suppliers.lang
diff --git a/public/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang
similarity index 100%
rename from public/langs/de_DE/trips.lang
rename to htdocs/langs/de_DE/trips.lang
diff --git a/public/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
similarity index 100%
rename from public/langs/de_DE/users.lang
rename to htdocs/langs/de_DE/users.lang
diff --git a/public/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
similarity index 100%
rename from public/langs/de_DE/website.lang
rename to htdocs/langs/de_DE/website.lang
diff --git a/public/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
similarity index 100%
rename from public/langs/de_DE/withdrawals.lang
rename to htdocs/langs/de_DE/withdrawals.lang
diff --git a/public/langs/de_DE/workflow.lang b/htdocs/langs/de_DE/workflow.lang
similarity index 100%
rename from public/langs/de_DE/workflow.lang
rename to htdocs/langs/de_DE/workflow.lang
diff --git a/public/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
similarity index 100%
rename from public/langs/el_GR/accountancy.lang
rename to htdocs/langs/el_GR/accountancy.lang
diff --git a/public/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
similarity index 100%
rename from public/langs/el_GR/admin.lang
rename to htdocs/langs/el_GR/admin.lang
diff --git a/public/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
similarity index 100%
rename from public/langs/el_GR/agenda.lang
rename to htdocs/langs/el_GR/agenda.lang
diff --git a/public/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
similarity index 100%
rename from public/langs/el_GR/banks.lang
rename to htdocs/langs/el_GR/banks.lang
diff --git a/public/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
similarity index 100%
rename from public/langs/el_GR/bills.lang
rename to htdocs/langs/el_GR/bills.lang
diff --git a/public/langs/el_GR/bookmarks.lang b/htdocs/langs/el_GR/bookmarks.lang
similarity index 100%
rename from public/langs/el_GR/bookmarks.lang
rename to htdocs/langs/el_GR/bookmarks.lang
diff --git a/public/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
similarity index 100%
rename from public/langs/el_GR/boxes.lang
rename to htdocs/langs/el_GR/boxes.lang
diff --git a/public/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
similarity index 100%
rename from public/langs/el_GR/cashdesk.lang
rename to htdocs/langs/el_GR/cashdesk.lang
diff --git a/public/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
similarity index 100%
rename from public/langs/el_GR/categories.lang
rename to htdocs/langs/el_GR/categories.lang
diff --git a/public/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
similarity index 100%
rename from public/langs/el_GR/commercial.lang
rename to htdocs/langs/el_GR/commercial.lang
diff --git a/public/langs/el_GR/commissions.lang b/htdocs/langs/el_GR/commissions.lang
similarity index 100%
rename from public/langs/el_GR/commissions.lang
rename to htdocs/langs/el_GR/commissions.lang
diff --git a/public/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
similarity index 100%
rename from public/langs/el_GR/companies.lang
rename to htdocs/langs/el_GR/companies.lang
diff --git a/public/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
similarity index 100%
rename from public/langs/el_GR/compta.lang
rename to htdocs/langs/el_GR/compta.lang
diff --git a/public/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang
similarity index 100%
rename from public/langs/el_GR/contracts.lang
rename to htdocs/langs/el_GR/contracts.lang
diff --git a/public/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
similarity index 100%
rename from public/langs/el_GR/cron.lang
rename to htdocs/langs/el_GR/cron.lang
diff --git a/public/langs/el_GR/deliveries.lang b/htdocs/langs/el_GR/deliveries.lang
similarity index 100%
rename from public/langs/el_GR/deliveries.lang
rename to htdocs/langs/el_GR/deliveries.lang
diff --git a/public/langs/el_GR/dict.lang b/htdocs/langs/el_GR/dict.lang
similarity index 100%
rename from public/langs/el_GR/dict.lang
rename to htdocs/langs/el_GR/dict.lang
diff --git a/public/langs/el_GR/donations.lang b/htdocs/langs/el_GR/donations.lang
similarity index 100%
rename from public/langs/el_GR/donations.lang
rename to htdocs/langs/el_GR/donations.lang
diff --git a/public/langs/el_GR/ecm.lang b/htdocs/langs/el_GR/ecm.lang
similarity index 100%
rename from public/langs/el_GR/ecm.lang
rename to htdocs/langs/el_GR/ecm.lang
diff --git a/public/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
similarity index 100%
rename from public/langs/el_GR/errors.lang
rename to htdocs/langs/el_GR/errors.lang
diff --git a/public/langs/el_GR/exports.lang b/htdocs/langs/el_GR/exports.lang
similarity index 100%
rename from public/langs/el_GR/exports.lang
rename to htdocs/langs/el_GR/exports.lang
diff --git a/public/langs/el_GR/externalsite.lang b/htdocs/langs/el_GR/externalsite.lang
similarity index 100%
rename from public/langs/el_GR/externalsite.lang
rename to htdocs/langs/el_GR/externalsite.lang
diff --git a/public/langs/el_GR/ftp.lang b/htdocs/langs/el_GR/ftp.lang
similarity index 100%
rename from public/langs/el_GR/ftp.lang
rename to htdocs/langs/el_GR/ftp.lang
diff --git a/public/langs/el_GR/help.lang b/htdocs/langs/el_GR/help.lang
similarity index 100%
rename from public/langs/el_GR/help.lang
rename to htdocs/langs/el_GR/help.lang
diff --git a/public/langs/el_GR/holiday.lang b/htdocs/langs/el_GR/holiday.lang
similarity index 100%
rename from public/langs/el_GR/holiday.lang
rename to htdocs/langs/el_GR/holiday.lang
diff --git a/public/langs/el_GR/hrm.lang b/htdocs/langs/el_GR/hrm.lang
similarity index 100%
rename from public/langs/el_GR/hrm.lang
rename to htdocs/langs/el_GR/hrm.lang
diff --git a/public/langs/el_GR/incoterm.lang b/htdocs/langs/el_GR/incoterm.lang
similarity index 100%
rename from public/langs/el_GR/incoterm.lang
rename to htdocs/langs/el_GR/incoterm.lang
diff --git a/public/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang
similarity index 100%
rename from public/langs/el_GR/install.lang
rename to htdocs/langs/el_GR/install.lang
diff --git a/public/langs/el_GR/interventions.lang b/htdocs/langs/el_GR/interventions.lang
similarity index 100%
rename from public/langs/el_GR/interventions.lang
rename to htdocs/langs/el_GR/interventions.lang
diff --git a/public/langs/el_GR/languages.lang b/htdocs/langs/el_GR/languages.lang
similarity index 100%
rename from public/langs/el_GR/languages.lang
rename to htdocs/langs/el_GR/languages.lang
diff --git a/public/langs/el_GR/ldap.lang b/htdocs/langs/el_GR/ldap.lang
similarity index 100%
rename from public/langs/el_GR/ldap.lang
rename to htdocs/langs/el_GR/ldap.lang
diff --git a/public/langs/el_GR/link.lang b/htdocs/langs/el_GR/link.lang
similarity index 100%
rename from public/langs/el_GR/link.lang
rename to htdocs/langs/el_GR/link.lang
diff --git a/public/langs/el_GR/loan.lang b/htdocs/langs/el_GR/loan.lang
similarity index 100%
rename from public/langs/el_GR/loan.lang
rename to htdocs/langs/el_GR/loan.lang
diff --git a/public/langs/el_GR/mailmanspip.lang b/htdocs/langs/el_GR/mailmanspip.lang
similarity index 100%
rename from public/langs/el_GR/mailmanspip.lang
rename to htdocs/langs/el_GR/mailmanspip.lang
diff --git a/public/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
similarity index 100%
rename from public/langs/el_GR/mails.lang
rename to htdocs/langs/el_GR/mails.lang
diff --git a/public/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
similarity index 100%
rename from public/langs/el_GR/main.lang
rename to htdocs/langs/el_GR/main.lang
diff --git a/public/langs/el_GR/margins.lang b/htdocs/langs/el_GR/margins.lang
similarity index 100%
rename from public/langs/el_GR/margins.lang
rename to htdocs/langs/el_GR/margins.lang
diff --git a/public/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
similarity index 100%
rename from public/langs/el_GR/members.lang
rename to htdocs/langs/el_GR/members.lang
diff --git a/public/langs/el_GR/oauth.lang b/htdocs/langs/el_GR/oauth.lang
similarity index 100%
rename from public/langs/el_GR/oauth.lang
rename to htdocs/langs/el_GR/oauth.lang
diff --git a/public/langs/el_GR/opensurvey.lang b/htdocs/langs/el_GR/opensurvey.lang
similarity index 100%
rename from public/langs/el_GR/opensurvey.lang
rename to htdocs/langs/el_GR/opensurvey.lang
diff --git a/public/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
similarity index 100%
rename from public/langs/el_GR/orders.lang
rename to htdocs/langs/el_GR/orders.lang
diff --git a/public/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
similarity index 100%
rename from public/langs/el_GR/other.lang
rename to htdocs/langs/el_GR/other.lang
diff --git a/public/langs/el_GR/paybox.lang b/htdocs/langs/el_GR/paybox.lang
similarity index 100%
rename from public/langs/el_GR/paybox.lang
rename to htdocs/langs/el_GR/paybox.lang
diff --git a/public/langs/el_GR/paypal.lang b/htdocs/langs/el_GR/paypal.lang
similarity index 100%
rename from public/langs/el_GR/paypal.lang
rename to htdocs/langs/el_GR/paypal.lang
diff --git a/public/langs/el_GR/printing.lang b/htdocs/langs/el_GR/printing.lang
similarity index 100%
rename from public/langs/el_GR/printing.lang
rename to htdocs/langs/el_GR/printing.lang
diff --git a/public/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
similarity index 100%
rename from public/langs/el_GR/productbatch.lang
rename to htdocs/langs/el_GR/productbatch.lang
diff --git a/public/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
similarity index 100%
rename from public/langs/el_GR/products.lang
rename to htdocs/langs/el_GR/products.lang
diff --git a/public/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
similarity index 100%
rename from public/langs/el_GR/projects.lang
rename to htdocs/langs/el_GR/projects.lang
diff --git a/public/langs/el_GR/propal.lang b/htdocs/langs/el_GR/propal.lang
similarity index 100%
rename from public/langs/el_GR/propal.lang
rename to htdocs/langs/el_GR/propal.lang
diff --git a/public/langs/el_GR/receiptprinter.lang b/htdocs/langs/el_GR/receiptprinter.lang
similarity index 100%
rename from public/langs/el_GR/receiptprinter.lang
rename to htdocs/langs/el_GR/receiptprinter.lang
diff --git a/public/langs/el_GR/resource.lang b/htdocs/langs/el_GR/resource.lang
similarity index 100%
rename from public/langs/el_GR/resource.lang
rename to htdocs/langs/el_GR/resource.lang
diff --git a/public/langs/el_GR/salaries.lang b/htdocs/langs/el_GR/salaries.lang
similarity index 100%
rename from public/langs/el_GR/salaries.lang
rename to htdocs/langs/el_GR/salaries.lang
diff --git a/public/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
similarity index 100%
rename from public/langs/el_GR/sendings.lang
rename to htdocs/langs/el_GR/sendings.lang
diff --git a/public/langs/el_GR/sms.lang b/htdocs/langs/el_GR/sms.lang
similarity index 100%
rename from public/langs/el_GR/sms.lang
rename to htdocs/langs/el_GR/sms.lang
diff --git a/public/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
similarity index 100%
rename from public/langs/el_GR/stocks.lang
rename to htdocs/langs/el_GR/stocks.lang
diff --git a/public/langs/el_GR/supplier_proposal.lang b/htdocs/langs/el_GR/supplier_proposal.lang
similarity index 100%
rename from public/langs/el_GR/supplier_proposal.lang
rename to htdocs/langs/el_GR/supplier_proposal.lang
diff --git a/public/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang
similarity index 100%
rename from public/langs/el_GR/suppliers.lang
rename to htdocs/langs/el_GR/suppliers.lang
diff --git a/public/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang
similarity index 100%
rename from public/langs/el_GR/trips.lang
rename to htdocs/langs/el_GR/trips.lang
diff --git a/public/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
similarity index 100%
rename from public/langs/el_GR/users.lang
rename to htdocs/langs/el_GR/users.lang
diff --git a/public/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
similarity index 100%
rename from public/langs/el_GR/website.lang
rename to htdocs/langs/el_GR/website.lang
diff --git a/public/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
similarity index 100%
rename from public/langs/el_GR/withdrawals.lang
rename to htdocs/langs/el_GR/withdrawals.lang
diff --git a/public/langs/el_GR/workflow.lang b/htdocs/langs/el_GR/workflow.lang
similarity index 100%
rename from public/langs/el_GR/workflow.lang
rename to htdocs/langs/el_GR/workflow.lang
diff --git a/public/langs/en_AU/accountancy.lang b/htdocs/langs/en_AU/accountancy.lang
similarity index 100%
rename from public/langs/en_AU/accountancy.lang
rename to htdocs/langs/en_AU/accountancy.lang
diff --git a/public/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
similarity index 100%
rename from public/langs/en_AU/admin.lang
rename to htdocs/langs/en_AU/admin.lang
diff --git a/public/langs/en_AU/agenda.lang b/htdocs/langs/en_AU/agenda.lang
similarity index 100%
rename from public/langs/en_AU/agenda.lang
rename to htdocs/langs/en_AU/agenda.lang
diff --git a/public/langs/en_AU/banks.lang b/htdocs/langs/en_AU/banks.lang
similarity index 100%
rename from public/langs/en_AU/banks.lang
rename to htdocs/langs/en_AU/banks.lang
diff --git a/public/langs/en_AU/bills.lang b/htdocs/langs/en_AU/bills.lang
similarity index 100%
rename from public/langs/en_AU/bills.lang
rename to htdocs/langs/en_AU/bills.lang
diff --git a/public/langs/en_AU/bookmarks.lang b/htdocs/langs/en_AU/bookmarks.lang
similarity index 100%
rename from public/langs/en_AU/bookmarks.lang
rename to htdocs/langs/en_AU/bookmarks.lang
diff --git a/public/langs/en_AU/boxes.lang b/htdocs/langs/en_AU/boxes.lang
similarity index 100%
rename from public/langs/en_AU/boxes.lang
rename to htdocs/langs/en_AU/boxes.lang
diff --git a/public/langs/en_AU/cashdesk.lang b/htdocs/langs/en_AU/cashdesk.lang
similarity index 100%
rename from public/langs/en_AU/cashdesk.lang
rename to htdocs/langs/en_AU/cashdesk.lang
diff --git a/public/langs/en_AU/categories.lang b/htdocs/langs/en_AU/categories.lang
similarity index 100%
rename from public/langs/en_AU/categories.lang
rename to htdocs/langs/en_AU/categories.lang
diff --git a/public/langs/en_AU/commercial.lang b/htdocs/langs/en_AU/commercial.lang
similarity index 100%
rename from public/langs/en_AU/commercial.lang
rename to htdocs/langs/en_AU/commercial.lang
diff --git a/public/langs/en_AU/companies.lang b/htdocs/langs/en_AU/companies.lang
similarity index 100%
rename from public/langs/en_AU/companies.lang
rename to htdocs/langs/en_AU/companies.lang
diff --git a/public/langs/en_AU/compta.lang b/htdocs/langs/en_AU/compta.lang
similarity index 100%
rename from public/langs/en_AU/compta.lang
rename to htdocs/langs/en_AU/compta.lang
diff --git a/public/langs/en_AU/contracts.lang b/htdocs/langs/en_AU/contracts.lang
similarity index 100%
rename from public/langs/en_AU/contracts.lang
rename to htdocs/langs/en_AU/contracts.lang
diff --git a/public/langs/en_AU/cron.lang b/htdocs/langs/en_AU/cron.lang
similarity index 100%
rename from public/langs/en_AU/cron.lang
rename to htdocs/langs/en_AU/cron.lang
diff --git a/public/langs/en_AU/deliveries.lang b/htdocs/langs/en_AU/deliveries.lang
similarity index 100%
rename from public/langs/en_AU/deliveries.lang
rename to htdocs/langs/en_AU/deliveries.lang
diff --git a/public/langs/en_AU/dict.lang b/htdocs/langs/en_AU/dict.lang
similarity index 100%
rename from public/langs/en_AU/dict.lang
rename to htdocs/langs/en_AU/dict.lang
diff --git a/public/langs/en_AU/donations.lang b/htdocs/langs/en_AU/donations.lang
similarity index 100%
rename from public/langs/en_AU/donations.lang
rename to htdocs/langs/en_AU/donations.lang
diff --git a/public/langs/en_AU/ecm.lang b/htdocs/langs/en_AU/ecm.lang
similarity index 100%
rename from public/langs/en_AU/ecm.lang
rename to htdocs/langs/en_AU/ecm.lang
diff --git a/public/langs/en_AU/errors.lang b/htdocs/langs/en_AU/errors.lang
similarity index 100%
rename from public/langs/en_AU/errors.lang
rename to htdocs/langs/en_AU/errors.lang
diff --git a/public/langs/en_AU/exports.lang b/htdocs/langs/en_AU/exports.lang
similarity index 100%
rename from public/langs/en_AU/exports.lang
rename to htdocs/langs/en_AU/exports.lang
diff --git a/public/langs/en_AU/externalsite.lang b/htdocs/langs/en_AU/externalsite.lang
similarity index 100%
rename from public/langs/en_AU/externalsite.lang
rename to htdocs/langs/en_AU/externalsite.lang
diff --git a/public/langs/en_AU/ftp.lang b/htdocs/langs/en_AU/ftp.lang
similarity index 100%
rename from public/langs/en_AU/ftp.lang
rename to htdocs/langs/en_AU/ftp.lang
diff --git a/public/langs/en_AU/help.lang b/htdocs/langs/en_AU/help.lang
similarity index 100%
rename from public/langs/en_AU/help.lang
rename to htdocs/langs/en_AU/help.lang
diff --git a/public/langs/en_AU/holiday.lang b/htdocs/langs/en_AU/holiday.lang
similarity index 100%
rename from public/langs/en_AU/holiday.lang
rename to htdocs/langs/en_AU/holiday.lang
diff --git a/public/langs/en_AU/hrm.lang b/htdocs/langs/en_AU/hrm.lang
similarity index 100%
rename from public/langs/en_AU/hrm.lang
rename to htdocs/langs/en_AU/hrm.lang
diff --git a/public/langs/en_AU/incoterm.lang b/htdocs/langs/en_AU/incoterm.lang
similarity index 100%
rename from public/langs/en_AU/incoterm.lang
rename to htdocs/langs/en_AU/incoterm.lang
diff --git a/public/langs/en_AU/install.lang b/htdocs/langs/en_AU/install.lang
similarity index 100%
rename from public/langs/en_AU/install.lang
rename to htdocs/langs/en_AU/install.lang
diff --git a/public/langs/en_AU/interventions.lang b/htdocs/langs/en_AU/interventions.lang
similarity index 100%
rename from public/langs/en_AU/interventions.lang
rename to htdocs/langs/en_AU/interventions.lang
diff --git a/public/langs/en_AU/languages.lang b/htdocs/langs/en_AU/languages.lang
similarity index 100%
rename from public/langs/en_AU/languages.lang
rename to htdocs/langs/en_AU/languages.lang
diff --git a/public/langs/en_AU/ldap.lang b/htdocs/langs/en_AU/ldap.lang
similarity index 100%
rename from public/langs/en_AU/ldap.lang
rename to htdocs/langs/en_AU/ldap.lang
diff --git a/public/langs/en_AU/link.lang b/htdocs/langs/en_AU/link.lang
similarity index 100%
rename from public/langs/en_AU/link.lang
rename to htdocs/langs/en_AU/link.lang
diff --git a/public/langs/en_AU/loan.lang b/htdocs/langs/en_AU/loan.lang
similarity index 100%
rename from public/langs/en_AU/loan.lang
rename to htdocs/langs/en_AU/loan.lang
diff --git a/public/langs/en_AU/mailmanspip.lang b/htdocs/langs/en_AU/mailmanspip.lang
similarity index 100%
rename from public/langs/en_AU/mailmanspip.lang
rename to htdocs/langs/en_AU/mailmanspip.lang
diff --git a/public/langs/en_AU/mails.lang b/htdocs/langs/en_AU/mails.lang
similarity index 100%
rename from public/langs/en_AU/mails.lang
rename to htdocs/langs/en_AU/mails.lang
diff --git a/public/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang
similarity index 100%
rename from public/langs/en_AU/main.lang
rename to htdocs/langs/en_AU/main.lang
diff --git a/public/langs/en_AU/margins.lang b/htdocs/langs/en_AU/margins.lang
similarity index 100%
rename from public/langs/en_AU/margins.lang
rename to htdocs/langs/en_AU/margins.lang
diff --git a/public/langs/en_AU/members.lang b/htdocs/langs/en_AU/members.lang
similarity index 100%
rename from public/langs/en_AU/members.lang
rename to htdocs/langs/en_AU/members.lang
diff --git a/public/langs/en_AU/oauth.lang b/htdocs/langs/en_AU/oauth.lang
similarity index 100%
rename from public/langs/en_AU/oauth.lang
rename to htdocs/langs/en_AU/oauth.lang
diff --git a/public/langs/en_AU/opensurvey.lang b/htdocs/langs/en_AU/opensurvey.lang
similarity index 100%
rename from public/langs/en_AU/opensurvey.lang
rename to htdocs/langs/en_AU/opensurvey.lang
diff --git a/public/langs/en_AU/orders.lang b/htdocs/langs/en_AU/orders.lang
similarity index 100%
rename from public/langs/en_AU/orders.lang
rename to htdocs/langs/en_AU/orders.lang
diff --git a/public/langs/en_AU/other.lang b/htdocs/langs/en_AU/other.lang
similarity index 100%
rename from public/langs/en_AU/other.lang
rename to htdocs/langs/en_AU/other.lang
diff --git a/public/langs/en_AU/paybox.lang b/htdocs/langs/en_AU/paybox.lang
similarity index 100%
rename from public/langs/en_AU/paybox.lang
rename to htdocs/langs/en_AU/paybox.lang
diff --git a/public/langs/en_AU/paypal.lang b/htdocs/langs/en_AU/paypal.lang
similarity index 100%
rename from public/langs/en_AU/paypal.lang
rename to htdocs/langs/en_AU/paypal.lang
diff --git a/public/langs/en_AU/printing.lang b/htdocs/langs/en_AU/printing.lang
similarity index 100%
rename from public/langs/en_AU/printing.lang
rename to htdocs/langs/en_AU/printing.lang
diff --git a/public/langs/en_AU/productbatch.lang b/htdocs/langs/en_AU/productbatch.lang
similarity index 100%
rename from public/langs/en_AU/productbatch.lang
rename to htdocs/langs/en_AU/productbatch.lang
diff --git a/public/langs/en_AU/products.lang b/htdocs/langs/en_AU/products.lang
similarity index 100%
rename from public/langs/en_AU/products.lang
rename to htdocs/langs/en_AU/products.lang
diff --git a/public/langs/en_AU/projects.lang b/htdocs/langs/en_AU/projects.lang
similarity index 100%
rename from public/langs/en_AU/projects.lang
rename to htdocs/langs/en_AU/projects.lang
diff --git a/public/langs/en_AU/propal.lang b/htdocs/langs/en_AU/propal.lang
similarity index 100%
rename from public/langs/en_AU/propal.lang
rename to htdocs/langs/en_AU/propal.lang
diff --git a/public/langs/en_AU/receiptprinter.lang b/htdocs/langs/en_AU/receiptprinter.lang
similarity index 100%
rename from public/langs/en_AU/receiptprinter.lang
rename to htdocs/langs/en_AU/receiptprinter.lang
diff --git a/public/langs/en_AU/resource.lang b/htdocs/langs/en_AU/resource.lang
similarity index 100%
rename from public/langs/en_AU/resource.lang
rename to htdocs/langs/en_AU/resource.lang
diff --git a/public/langs/en_AU/salaries.lang b/htdocs/langs/en_AU/salaries.lang
similarity index 100%
rename from public/langs/en_AU/salaries.lang
rename to htdocs/langs/en_AU/salaries.lang
diff --git a/public/langs/en_AU/sendings.lang b/htdocs/langs/en_AU/sendings.lang
similarity index 100%
rename from public/langs/en_AU/sendings.lang
rename to htdocs/langs/en_AU/sendings.lang
diff --git a/public/langs/en_AU/sms.lang b/htdocs/langs/en_AU/sms.lang
similarity index 100%
rename from public/langs/en_AU/sms.lang
rename to htdocs/langs/en_AU/sms.lang
diff --git a/public/langs/en_AU/stocks.lang b/htdocs/langs/en_AU/stocks.lang
similarity index 100%
rename from public/langs/en_AU/stocks.lang
rename to htdocs/langs/en_AU/stocks.lang
diff --git a/public/langs/en_AU/supplier_proposal.lang b/htdocs/langs/en_AU/supplier_proposal.lang
similarity index 100%
rename from public/langs/en_AU/supplier_proposal.lang
rename to htdocs/langs/en_AU/supplier_proposal.lang
diff --git a/public/langs/en_AU/suppliers.lang b/htdocs/langs/en_AU/suppliers.lang
similarity index 100%
rename from public/langs/en_AU/suppliers.lang
rename to htdocs/langs/en_AU/suppliers.lang
diff --git a/public/langs/en_AU/trips.lang b/htdocs/langs/en_AU/trips.lang
similarity index 100%
rename from public/langs/en_AU/trips.lang
rename to htdocs/langs/en_AU/trips.lang
diff --git a/public/langs/en_AU/users.lang b/htdocs/langs/en_AU/users.lang
similarity index 100%
rename from public/langs/en_AU/users.lang
rename to htdocs/langs/en_AU/users.lang
diff --git a/public/langs/en_AU/website.lang b/htdocs/langs/en_AU/website.lang
similarity index 100%
rename from public/langs/en_AU/website.lang
rename to htdocs/langs/en_AU/website.lang
diff --git a/public/langs/en_AU/withdrawals.lang b/htdocs/langs/en_AU/withdrawals.lang
similarity index 100%
rename from public/langs/en_AU/withdrawals.lang
rename to htdocs/langs/en_AU/withdrawals.lang
diff --git a/public/langs/en_AU/workflow.lang b/htdocs/langs/en_AU/workflow.lang
similarity index 100%
rename from public/langs/en_AU/workflow.lang
rename to htdocs/langs/en_AU/workflow.lang
diff --git a/public/langs/en_CA/accountancy.lang b/htdocs/langs/en_CA/accountancy.lang
similarity index 100%
rename from public/langs/en_CA/accountancy.lang
rename to htdocs/langs/en_CA/accountancy.lang
diff --git a/public/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
similarity index 100%
rename from public/langs/en_CA/admin.lang
rename to htdocs/langs/en_CA/admin.lang
diff --git a/public/langs/en_CA/agenda.lang b/htdocs/langs/en_CA/agenda.lang
similarity index 100%
rename from public/langs/en_CA/agenda.lang
rename to htdocs/langs/en_CA/agenda.lang
diff --git a/public/langs/en_CA/banks.lang b/htdocs/langs/en_CA/banks.lang
similarity index 100%
rename from public/langs/en_CA/banks.lang
rename to htdocs/langs/en_CA/banks.lang
diff --git a/public/langs/en_CA/bills.lang b/htdocs/langs/en_CA/bills.lang
similarity index 100%
rename from public/langs/en_CA/bills.lang
rename to htdocs/langs/en_CA/bills.lang
diff --git a/public/langs/en_CA/bookmarks.lang b/htdocs/langs/en_CA/bookmarks.lang
similarity index 100%
rename from public/langs/en_CA/bookmarks.lang
rename to htdocs/langs/en_CA/bookmarks.lang
diff --git a/public/langs/en_CA/boxes.lang b/htdocs/langs/en_CA/boxes.lang
similarity index 100%
rename from public/langs/en_CA/boxes.lang
rename to htdocs/langs/en_CA/boxes.lang
diff --git a/public/langs/en_CA/cashdesk.lang b/htdocs/langs/en_CA/cashdesk.lang
similarity index 100%
rename from public/langs/en_CA/cashdesk.lang
rename to htdocs/langs/en_CA/cashdesk.lang
diff --git a/public/langs/en_CA/categories.lang b/htdocs/langs/en_CA/categories.lang
similarity index 100%
rename from public/langs/en_CA/categories.lang
rename to htdocs/langs/en_CA/categories.lang
diff --git a/public/langs/en_CA/commercial.lang b/htdocs/langs/en_CA/commercial.lang
similarity index 100%
rename from public/langs/en_CA/commercial.lang
rename to htdocs/langs/en_CA/commercial.lang
diff --git a/public/langs/en_CA/companies.lang b/htdocs/langs/en_CA/companies.lang
similarity index 100%
rename from public/langs/en_CA/companies.lang
rename to htdocs/langs/en_CA/companies.lang
diff --git a/public/langs/en_CA/compta.lang b/htdocs/langs/en_CA/compta.lang
similarity index 100%
rename from public/langs/en_CA/compta.lang
rename to htdocs/langs/en_CA/compta.lang
diff --git a/public/langs/en_CA/contracts.lang b/htdocs/langs/en_CA/contracts.lang
similarity index 100%
rename from public/langs/en_CA/contracts.lang
rename to htdocs/langs/en_CA/contracts.lang
diff --git a/public/langs/en_CA/cron.lang b/htdocs/langs/en_CA/cron.lang
similarity index 100%
rename from public/langs/en_CA/cron.lang
rename to htdocs/langs/en_CA/cron.lang
diff --git a/public/langs/en_CA/deliveries.lang b/htdocs/langs/en_CA/deliveries.lang
similarity index 100%
rename from public/langs/en_CA/deliveries.lang
rename to htdocs/langs/en_CA/deliveries.lang
diff --git a/public/langs/en_CA/dict.lang b/htdocs/langs/en_CA/dict.lang
similarity index 100%
rename from public/langs/en_CA/dict.lang
rename to htdocs/langs/en_CA/dict.lang
diff --git a/public/langs/en_CA/donations.lang b/htdocs/langs/en_CA/donations.lang
similarity index 100%
rename from public/langs/en_CA/donations.lang
rename to htdocs/langs/en_CA/donations.lang
diff --git a/public/langs/en_CA/ecm.lang b/htdocs/langs/en_CA/ecm.lang
similarity index 100%
rename from public/langs/en_CA/ecm.lang
rename to htdocs/langs/en_CA/ecm.lang
diff --git a/public/langs/en_CA/errors.lang b/htdocs/langs/en_CA/errors.lang
similarity index 100%
rename from public/langs/en_CA/errors.lang
rename to htdocs/langs/en_CA/errors.lang
diff --git a/public/langs/en_CA/exports.lang b/htdocs/langs/en_CA/exports.lang
similarity index 100%
rename from public/langs/en_CA/exports.lang
rename to htdocs/langs/en_CA/exports.lang
diff --git a/public/langs/en_CA/externalsite.lang b/htdocs/langs/en_CA/externalsite.lang
similarity index 100%
rename from public/langs/en_CA/externalsite.lang
rename to htdocs/langs/en_CA/externalsite.lang
diff --git a/public/langs/en_CA/ftp.lang b/htdocs/langs/en_CA/ftp.lang
similarity index 100%
rename from public/langs/en_CA/ftp.lang
rename to htdocs/langs/en_CA/ftp.lang
diff --git a/public/langs/en_CA/help.lang b/htdocs/langs/en_CA/help.lang
similarity index 100%
rename from public/langs/en_CA/help.lang
rename to htdocs/langs/en_CA/help.lang
diff --git a/public/langs/en_CA/holiday.lang b/htdocs/langs/en_CA/holiday.lang
similarity index 100%
rename from public/langs/en_CA/holiday.lang
rename to htdocs/langs/en_CA/holiday.lang
diff --git a/public/langs/en_CA/hrm.lang b/htdocs/langs/en_CA/hrm.lang
similarity index 100%
rename from public/langs/en_CA/hrm.lang
rename to htdocs/langs/en_CA/hrm.lang
diff --git a/public/langs/en_CA/incoterm.lang b/htdocs/langs/en_CA/incoterm.lang
similarity index 100%
rename from public/langs/en_CA/incoterm.lang
rename to htdocs/langs/en_CA/incoterm.lang
diff --git a/public/langs/en_CA/install.lang b/htdocs/langs/en_CA/install.lang
similarity index 100%
rename from public/langs/en_CA/install.lang
rename to htdocs/langs/en_CA/install.lang
diff --git a/public/langs/en_CA/interventions.lang b/htdocs/langs/en_CA/interventions.lang
similarity index 100%
rename from public/langs/en_CA/interventions.lang
rename to htdocs/langs/en_CA/interventions.lang
diff --git a/public/langs/en_CA/languages.lang b/htdocs/langs/en_CA/languages.lang
similarity index 100%
rename from public/langs/en_CA/languages.lang
rename to htdocs/langs/en_CA/languages.lang
diff --git a/public/langs/en_CA/ldap.lang b/htdocs/langs/en_CA/ldap.lang
similarity index 100%
rename from public/langs/en_CA/ldap.lang
rename to htdocs/langs/en_CA/ldap.lang
diff --git a/public/langs/en_CA/link.lang b/htdocs/langs/en_CA/link.lang
similarity index 100%
rename from public/langs/en_CA/link.lang
rename to htdocs/langs/en_CA/link.lang
diff --git a/public/langs/en_CA/loan.lang b/htdocs/langs/en_CA/loan.lang
similarity index 100%
rename from public/langs/en_CA/loan.lang
rename to htdocs/langs/en_CA/loan.lang
diff --git a/public/langs/en_CA/mailmanspip.lang b/htdocs/langs/en_CA/mailmanspip.lang
similarity index 100%
rename from public/langs/en_CA/mailmanspip.lang
rename to htdocs/langs/en_CA/mailmanspip.lang
diff --git a/public/langs/en_CA/mails.lang b/htdocs/langs/en_CA/mails.lang
similarity index 100%
rename from public/langs/en_CA/mails.lang
rename to htdocs/langs/en_CA/mails.lang
diff --git a/public/langs/en_CA/main.lang b/htdocs/langs/en_CA/main.lang
similarity index 100%
rename from public/langs/en_CA/main.lang
rename to htdocs/langs/en_CA/main.lang
diff --git a/public/langs/en_CA/margins.lang b/htdocs/langs/en_CA/margins.lang
similarity index 100%
rename from public/langs/en_CA/margins.lang
rename to htdocs/langs/en_CA/margins.lang
diff --git a/public/langs/en_CA/members.lang b/htdocs/langs/en_CA/members.lang
similarity index 100%
rename from public/langs/en_CA/members.lang
rename to htdocs/langs/en_CA/members.lang
diff --git a/public/langs/en_CA/oauth.lang b/htdocs/langs/en_CA/oauth.lang
similarity index 100%
rename from public/langs/en_CA/oauth.lang
rename to htdocs/langs/en_CA/oauth.lang
diff --git a/public/langs/en_CA/opensurvey.lang b/htdocs/langs/en_CA/opensurvey.lang
similarity index 100%
rename from public/langs/en_CA/opensurvey.lang
rename to htdocs/langs/en_CA/opensurvey.lang
diff --git a/public/langs/en_CA/orders.lang b/htdocs/langs/en_CA/orders.lang
similarity index 100%
rename from public/langs/en_CA/orders.lang
rename to htdocs/langs/en_CA/orders.lang
diff --git a/public/langs/en_CA/other.lang b/htdocs/langs/en_CA/other.lang
similarity index 100%
rename from public/langs/en_CA/other.lang
rename to htdocs/langs/en_CA/other.lang
diff --git a/public/langs/en_CA/paybox.lang b/htdocs/langs/en_CA/paybox.lang
similarity index 100%
rename from public/langs/en_CA/paybox.lang
rename to htdocs/langs/en_CA/paybox.lang
diff --git a/public/langs/en_CA/paypal.lang b/htdocs/langs/en_CA/paypal.lang
similarity index 100%
rename from public/langs/en_CA/paypal.lang
rename to htdocs/langs/en_CA/paypal.lang
diff --git a/public/langs/en_CA/printing.lang b/htdocs/langs/en_CA/printing.lang
similarity index 100%
rename from public/langs/en_CA/printing.lang
rename to htdocs/langs/en_CA/printing.lang
diff --git a/public/langs/en_CA/productbatch.lang b/htdocs/langs/en_CA/productbatch.lang
similarity index 100%
rename from public/langs/en_CA/productbatch.lang
rename to htdocs/langs/en_CA/productbatch.lang
diff --git a/public/langs/en_CA/products.lang b/htdocs/langs/en_CA/products.lang
similarity index 100%
rename from public/langs/en_CA/products.lang
rename to htdocs/langs/en_CA/products.lang
diff --git a/public/langs/en_CA/projects.lang b/htdocs/langs/en_CA/projects.lang
similarity index 100%
rename from public/langs/en_CA/projects.lang
rename to htdocs/langs/en_CA/projects.lang
diff --git a/public/langs/en_CA/propal.lang b/htdocs/langs/en_CA/propal.lang
similarity index 100%
rename from public/langs/en_CA/propal.lang
rename to htdocs/langs/en_CA/propal.lang
diff --git a/public/langs/en_CA/receiptprinter.lang b/htdocs/langs/en_CA/receiptprinter.lang
similarity index 100%
rename from public/langs/en_CA/receiptprinter.lang
rename to htdocs/langs/en_CA/receiptprinter.lang
diff --git a/public/langs/en_CA/resource.lang b/htdocs/langs/en_CA/resource.lang
similarity index 100%
rename from public/langs/en_CA/resource.lang
rename to htdocs/langs/en_CA/resource.lang
diff --git a/public/langs/en_CA/salaries.lang b/htdocs/langs/en_CA/salaries.lang
similarity index 100%
rename from public/langs/en_CA/salaries.lang
rename to htdocs/langs/en_CA/salaries.lang
diff --git a/public/langs/en_CA/sendings.lang b/htdocs/langs/en_CA/sendings.lang
similarity index 100%
rename from public/langs/en_CA/sendings.lang
rename to htdocs/langs/en_CA/sendings.lang
diff --git a/public/langs/en_CA/sms.lang b/htdocs/langs/en_CA/sms.lang
similarity index 100%
rename from public/langs/en_CA/sms.lang
rename to htdocs/langs/en_CA/sms.lang
diff --git a/public/langs/en_CA/stocks.lang b/htdocs/langs/en_CA/stocks.lang
similarity index 100%
rename from public/langs/en_CA/stocks.lang
rename to htdocs/langs/en_CA/stocks.lang
diff --git a/public/langs/en_CA/supplier_proposal.lang b/htdocs/langs/en_CA/supplier_proposal.lang
similarity index 100%
rename from public/langs/en_CA/supplier_proposal.lang
rename to htdocs/langs/en_CA/supplier_proposal.lang
diff --git a/public/langs/en_CA/suppliers.lang b/htdocs/langs/en_CA/suppliers.lang
similarity index 100%
rename from public/langs/en_CA/suppliers.lang
rename to htdocs/langs/en_CA/suppliers.lang
diff --git a/public/langs/en_CA/trips.lang b/htdocs/langs/en_CA/trips.lang
similarity index 100%
rename from public/langs/en_CA/trips.lang
rename to htdocs/langs/en_CA/trips.lang
diff --git a/public/langs/en_CA/users.lang b/htdocs/langs/en_CA/users.lang
similarity index 100%
rename from public/langs/en_CA/users.lang
rename to htdocs/langs/en_CA/users.lang
diff --git a/public/langs/en_CA/website.lang b/htdocs/langs/en_CA/website.lang
similarity index 100%
rename from public/langs/en_CA/website.lang
rename to htdocs/langs/en_CA/website.lang
diff --git a/public/langs/en_CA/withdrawals.lang b/htdocs/langs/en_CA/withdrawals.lang
similarity index 100%
rename from public/langs/en_CA/withdrawals.lang
rename to htdocs/langs/en_CA/withdrawals.lang
diff --git a/public/langs/en_CA/workflow.lang b/htdocs/langs/en_CA/workflow.lang
similarity index 100%
rename from public/langs/en_CA/workflow.lang
rename to htdocs/langs/en_CA/workflow.lang
diff --git a/public/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
similarity index 100%
rename from public/langs/en_GB/accountancy.lang
rename to htdocs/langs/en_GB/accountancy.lang
diff --git a/public/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
similarity index 100%
rename from public/langs/en_GB/admin.lang
rename to htdocs/langs/en_GB/admin.lang
diff --git a/public/langs/en_GB/agenda.lang b/htdocs/langs/en_GB/agenda.lang
similarity index 100%
rename from public/langs/en_GB/agenda.lang
rename to htdocs/langs/en_GB/agenda.lang
diff --git a/public/langs/en_GB/banks.lang b/htdocs/langs/en_GB/banks.lang
similarity index 100%
rename from public/langs/en_GB/banks.lang
rename to htdocs/langs/en_GB/banks.lang
diff --git a/public/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang
similarity index 100%
rename from public/langs/en_GB/bills.lang
rename to htdocs/langs/en_GB/bills.lang
diff --git a/public/langs/en_GB/bookmarks.lang b/htdocs/langs/en_GB/bookmarks.lang
similarity index 100%
rename from public/langs/en_GB/bookmarks.lang
rename to htdocs/langs/en_GB/bookmarks.lang
diff --git a/public/langs/en_GB/boxes.lang b/htdocs/langs/en_GB/boxes.lang
similarity index 100%
rename from public/langs/en_GB/boxes.lang
rename to htdocs/langs/en_GB/boxes.lang
diff --git a/public/langs/en_GB/cashdesk.lang b/htdocs/langs/en_GB/cashdesk.lang
similarity index 100%
rename from public/langs/en_GB/cashdesk.lang
rename to htdocs/langs/en_GB/cashdesk.lang
diff --git a/public/langs/en_GB/categories.lang b/htdocs/langs/en_GB/categories.lang
similarity index 100%
rename from public/langs/en_GB/categories.lang
rename to htdocs/langs/en_GB/categories.lang
diff --git a/public/langs/en_GB/commercial.lang b/htdocs/langs/en_GB/commercial.lang
similarity index 100%
rename from public/langs/en_GB/commercial.lang
rename to htdocs/langs/en_GB/commercial.lang
diff --git a/public/langs/en_GB/companies.lang b/htdocs/langs/en_GB/companies.lang
similarity index 100%
rename from public/langs/en_GB/companies.lang
rename to htdocs/langs/en_GB/companies.lang
diff --git a/public/langs/en_GB/compta.lang b/htdocs/langs/en_GB/compta.lang
similarity index 100%
rename from public/langs/en_GB/compta.lang
rename to htdocs/langs/en_GB/compta.lang
diff --git a/public/langs/en_GB/contracts.lang b/htdocs/langs/en_GB/contracts.lang
similarity index 100%
rename from public/langs/en_GB/contracts.lang
rename to htdocs/langs/en_GB/contracts.lang
diff --git a/public/langs/en_GB/cron.lang b/htdocs/langs/en_GB/cron.lang
similarity index 100%
rename from public/langs/en_GB/cron.lang
rename to htdocs/langs/en_GB/cron.lang
diff --git a/public/langs/en_GB/deliveries.lang b/htdocs/langs/en_GB/deliveries.lang
similarity index 100%
rename from public/langs/en_GB/deliveries.lang
rename to htdocs/langs/en_GB/deliveries.lang
diff --git a/public/langs/en_GB/dict.lang b/htdocs/langs/en_GB/dict.lang
similarity index 100%
rename from public/langs/en_GB/dict.lang
rename to htdocs/langs/en_GB/dict.lang
diff --git a/public/langs/en_GB/donations.lang b/htdocs/langs/en_GB/donations.lang
similarity index 100%
rename from public/langs/en_GB/donations.lang
rename to htdocs/langs/en_GB/donations.lang
diff --git a/public/langs/en_GB/ecm.lang b/htdocs/langs/en_GB/ecm.lang
similarity index 100%
rename from public/langs/en_GB/ecm.lang
rename to htdocs/langs/en_GB/ecm.lang
diff --git a/public/langs/en_GB/errors.lang b/htdocs/langs/en_GB/errors.lang
similarity index 100%
rename from public/langs/en_GB/errors.lang
rename to htdocs/langs/en_GB/errors.lang
diff --git a/public/langs/en_GB/exports.lang b/htdocs/langs/en_GB/exports.lang
similarity index 100%
rename from public/langs/en_GB/exports.lang
rename to htdocs/langs/en_GB/exports.lang
diff --git a/public/langs/en_GB/externalsite.lang b/htdocs/langs/en_GB/externalsite.lang
similarity index 100%
rename from public/langs/en_GB/externalsite.lang
rename to htdocs/langs/en_GB/externalsite.lang
diff --git a/public/langs/en_GB/ftp.lang b/htdocs/langs/en_GB/ftp.lang
similarity index 100%
rename from public/langs/en_GB/ftp.lang
rename to htdocs/langs/en_GB/ftp.lang
diff --git a/public/langs/en_GB/help.lang b/htdocs/langs/en_GB/help.lang
similarity index 100%
rename from public/langs/en_GB/help.lang
rename to htdocs/langs/en_GB/help.lang
diff --git a/public/langs/en_GB/holiday.lang b/htdocs/langs/en_GB/holiday.lang
similarity index 100%
rename from public/langs/en_GB/holiday.lang
rename to htdocs/langs/en_GB/holiday.lang
diff --git a/public/langs/en_GB/hrm.lang b/htdocs/langs/en_GB/hrm.lang
similarity index 100%
rename from public/langs/en_GB/hrm.lang
rename to htdocs/langs/en_GB/hrm.lang
diff --git a/public/langs/en_GB/incoterm.lang b/htdocs/langs/en_GB/incoterm.lang
similarity index 100%
rename from public/langs/en_GB/incoterm.lang
rename to htdocs/langs/en_GB/incoterm.lang
diff --git a/public/langs/en_GB/install.lang b/htdocs/langs/en_GB/install.lang
similarity index 100%
rename from public/langs/en_GB/install.lang
rename to htdocs/langs/en_GB/install.lang
diff --git a/public/langs/en_GB/interventions.lang b/htdocs/langs/en_GB/interventions.lang
similarity index 100%
rename from public/langs/en_GB/interventions.lang
rename to htdocs/langs/en_GB/interventions.lang
diff --git a/public/langs/en_GB/languages.lang b/htdocs/langs/en_GB/languages.lang
similarity index 100%
rename from public/langs/en_GB/languages.lang
rename to htdocs/langs/en_GB/languages.lang
diff --git a/public/langs/en_GB/ldap.lang b/htdocs/langs/en_GB/ldap.lang
similarity index 100%
rename from public/langs/en_GB/ldap.lang
rename to htdocs/langs/en_GB/ldap.lang
diff --git a/public/langs/en_GB/link.lang b/htdocs/langs/en_GB/link.lang
similarity index 100%
rename from public/langs/en_GB/link.lang
rename to htdocs/langs/en_GB/link.lang
diff --git a/public/langs/en_GB/loan.lang b/htdocs/langs/en_GB/loan.lang
similarity index 100%
rename from public/langs/en_GB/loan.lang
rename to htdocs/langs/en_GB/loan.lang
diff --git a/public/langs/en_GB/mailmanspip.lang b/htdocs/langs/en_GB/mailmanspip.lang
similarity index 100%
rename from public/langs/en_GB/mailmanspip.lang
rename to htdocs/langs/en_GB/mailmanspip.lang
diff --git a/public/langs/en_GB/mails.lang b/htdocs/langs/en_GB/mails.lang
similarity index 100%
rename from public/langs/en_GB/mails.lang
rename to htdocs/langs/en_GB/mails.lang
diff --git a/public/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
similarity index 100%
rename from public/langs/en_GB/main.lang
rename to htdocs/langs/en_GB/main.lang
diff --git a/public/langs/en_GB/margins.lang b/htdocs/langs/en_GB/margins.lang
similarity index 100%
rename from public/langs/en_GB/margins.lang
rename to htdocs/langs/en_GB/margins.lang
diff --git a/public/langs/en_GB/members.lang b/htdocs/langs/en_GB/members.lang
similarity index 100%
rename from public/langs/en_GB/members.lang
rename to htdocs/langs/en_GB/members.lang
diff --git a/public/langs/en_GB/oauth.lang b/htdocs/langs/en_GB/oauth.lang
similarity index 100%
rename from public/langs/en_GB/oauth.lang
rename to htdocs/langs/en_GB/oauth.lang
diff --git a/public/langs/en_GB/opensurvey.lang b/htdocs/langs/en_GB/opensurvey.lang
similarity index 100%
rename from public/langs/en_GB/opensurvey.lang
rename to htdocs/langs/en_GB/opensurvey.lang
diff --git a/public/langs/en_GB/orders.lang b/htdocs/langs/en_GB/orders.lang
similarity index 100%
rename from public/langs/en_GB/orders.lang
rename to htdocs/langs/en_GB/orders.lang
diff --git a/public/langs/en_GB/other.lang b/htdocs/langs/en_GB/other.lang
similarity index 100%
rename from public/langs/en_GB/other.lang
rename to htdocs/langs/en_GB/other.lang
diff --git a/public/langs/en_GB/paybox.lang b/htdocs/langs/en_GB/paybox.lang
similarity index 100%
rename from public/langs/en_GB/paybox.lang
rename to htdocs/langs/en_GB/paybox.lang
diff --git a/public/langs/en_GB/paypal.lang b/htdocs/langs/en_GB/paypal.lang
similarity index 100%
rename from public/langs/en_GB/paypal.lang
rename to htdocs/langs/en_GB/paypal.lang
diff --git a/public/langs/en_GB/printing.lang b/htdocs/langs/en_GB/printing.lang
similarity index 100%
rename from public/langs/en_GB/printing.lang
rename to htdocs/langs/en_GB/printing.lang
diff --git a/public/langs/en_GB/productbatch.lang b/htdocs/langs/en_GB/productbatch.lang
similarity index 100%
rename from public/langs/en_GB/productbatch.lang
rename to htdocs/langs/en_GB/productbatch.lang
diff --git a/public/langs/en_GB/products.lang b/htdocs/langs/en_GB/products.lang
similarity index 100%
rename from public/langs/en_GB/products.lang
rename to htdocs/langs/en_GB/products.lang
diff --git a/public/langs/en_GB/projects.lang b/htdocs/langs/en_GB/projects.lang
similarity index 100%
rename from public/langs/en_GB/projects.lang
rename to htdocs/langs/en_GB/projects.lang
diff --git a/public/langs/en_GB/propal.lang b/htdocs/langs/en_GB/propal.lang
similarity index 100%
rename from public/langs/en_GB/propal.lang
rename to htdocs/langs/en_GB/propal.lang
diff --git a/public/langs/en_GB/receiptprinter.lang b/htdocs/langs/en_GB/receiptprinter.lang
similarity index 100%
rename from public/langs/en_GB/receiptprinter.lang
rename to htdocs/langs/en_GB/receiptprinter.lang
diff --git a/public/langs/en_GB/resource.lang b/htdocs/langs/en_GB/resource.lang
similarity index 100%
rename from public/langs/en_GB/resource.lang
rename to htdocs/langs/en_GB/resource.lang
diff --git a/public/langs/en_GB/salaries.lang b/htdocs/langs/en_GB/salaries.lang
similarity index 100%
rename from public/langs/en_GB/salaries.lang
rename to htdocs/langs/en_GB/salaries.lang
diff --git a/public/langs/en_GB/sendings.lang b/htdocs/langs/en_GB/sendings.lang
similarity index 100%
rename from public/langs/en_GB/sendings.lang
rename to htdocs/langs/en_GB/sendings.lang
diff --git a/public/langs/en_GB/sms.lang b/htdocs/langs/en_GB/sms.lang
similarity index 100%
rename from public/langs/en_GB/sms.lang
rename to htdocs/langs/en_GB/sms.lang
diff --git a/public/langs/en_GB/stocks.lang b/htdocs/langs/en_GB/stocks.lang
similarity index 100%
rename from public/langs/en_GB/stocks.lang
rename to htdocs/langs/en_GB/stocks.lang
diff --git a/public/langs/en_GB/supplier_proposal.lang b/htdocs/langs/en_GB/supplier_proposal.lang
similarity index 100%
rename from public/langs/en_GB/supplier_proposal.lang
rename to htdocs/langs/en_GB/supplier_proposal.lang
diff --git a/public/langs/en_GB/suppliers.lang b/htdocs/langs/en_GB/suppliers.lang
similarity index 100%
rename from public/langs/en_GB/suppliers.lang
rename to htdocs/langs/en_GB/suppliers.lang
diff --git a/public/langs/en_GB/trips.lang b/htdocs/langs/en_GB/trips.lang
similarity index 100%
rename from public/langs/en_GB/trips.lang
rename to htdocs/langs/en_GB/trips.lang
diff --git a/public/langs/en_GB/users.lang b/htdocs/langs/en_GB/users.lang
similarity index 100%
rename from public/langs/en_GB/users.lang
rename to htdocs/langs/en_GB/users.lang
diff --git a/public/langs/en_GB/website.lang b/htdocs/langs/en_GB/website.lang
similarity index 100%
rename from public/langs/en_GB/website.lang
rename to htdocs/langs/en_GB/website.lang
diff --git a/public/langs/en_GB/withdrawals.lang b/htdocs/langs/en_GB/withdrawals.lang
similarity index 100%
rename from public/langs/en_GB/withdrawals.lang
rename to htdocs/langs/en_GB/withdrawals.lang
diff --git a/public/langs/en_GB/workflow.lang b/htdocs/langs/en_GB/workflow.lang
similarity index 100%
rename from public/langs/en_GB/workflow.lang
rename to htdocs/langs/en_GB/workflow.lang
diff --git a/public/langs/en_IN/accountancy.lang b/htdocs/langs/en_IN/accountancy.lang
similarity index 100%
rename from public/langs/en_IN/accountancy.lang
rename to htdocs/langs/en_IN/accountancy.lang
diff --git a/public/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
similarity index 100%
rename from public/langs/en_IN/admin.lang
rename to htdocs/langs/en_IN/admin.lang
diff --git a/public/langs/en_IN/agenda.lang b/htdocs/langs/en_IN/agenda.lang
similarity index 100%
rename from public/langs/en_IN/agenda.lang
rename to htdocs/langs/en_IN/agenda.lang
diff --git a/public/langs/en_IN/banks.lang b/htdocs/langs/en_IN/banks.lang
similarity index 100%
rename from public/langs/en_IN/banks.lang
rename to htdocs/langs/en_IN/banks.lang
diff --git a/public/langs/en_IN/bills.lang b/htdocs/langs/en_IN/bills.lang
similarity index 100%
rename from public/langs/en_IN/bills.lang
rename to htdocs/langs/en_IN/bills.lang
diff --git a/public/langs/en_IN/bookmarks.lang b/htdocs/langs/en_IN/bookmarks.lang
similarity index 100%
rename from public/langs/en_IN/bookmarks.lang
rename to htdocs/langs/en_IN/bookmarks.lang
diff --git a/public/langs/en_IN/boxes.lang b/htdocs/langs/en_IN/boxes.lang
similarity index 100%
rename from public/langs/en_IN/boxes.lang
rename to htdocs/langs/en_IN/boxes.lang
diff --git a/public/langs/en_IN/cashdesk.lang b/htdocs/langs/en_IN/cashdesk.lang
similarity index 100%
rename from public/langs/en_IN/cashdesk.lang
rename to htdocs/langs/en_IN/cashdesk.lang
diff --git a/public/langs/en_IN/categories.lang b/htdocs/langs/en_IN/categories.lang
similarity index 100%
rename from public/langs/en_IN/categories.lang
rename to htdocs/langs/en_IN/categories.lang
diff --git a/public/langs/en_IN/commercial.lang b/htdocs/langs/en_IN/commercial.lang
similarity index 100%
rename from public/langs/en_IN/commercial.lang
rename to htdocs/langs/en_IN/commercial.lang
diff --git a/public/langs/en_IN/companies.lang b/htdocs/langs/en_IN/companies.lang
similarity index 100%
rename from public/langs/en_IN/companies.lang
rename to htdocs/langs/en_IN/companies.lang
diff --git a/public/langs/en_IN/compta.lang b/htdocs/langs/en_IN/compta.lang
similarity index 100%
rename from public/langs/en_IN/compta.lang
rename to htdocs/langs/en_IN/compta.lang
diff --git a/public/langs/en_IN/contracts.lang b/htdocs/langs/en_IN/contracts.lang
similarity index 100%
rename from public/langs/en_IN/contracts.lang
rename to htdocs/langs/en_IN/contracts.lang
diff --git a/public/langs/en_IN/cron.lang b/htdocs/langs/en_IN/cron.lang
similarity index 100%
rename from public/langs/en_IN/cron.lang
rename to htdocs/langs/en_IN/cron.lang
diff --git a/public/langs/en_IN/deliveries.lang b/htdocs/langs/en_IN/deliveries.lang
similarity index 100%
rename from public/langs/en_IN/deliveries.lang
rename to htdocs/langs/en_IN/deliveries.lang
diff --git a/public/langs/en_IN/dict.lang b/htdocs/langs/en_IN/dict.lang
similarity index 100%
rename from public/langs/en_IN/dict.lang
rename to htdocs/langs/en_IN/dict.lang
diff --git a/public/langs/en_IN/donations.lang b/htdocs/langs/en_IN/donations.lang
similarity index 100%
rename from public/langs/en_IN/donations.lang
rename to htdocs/langs/en_IN/donations.lang
diff --git a/public/langs/en_IN/ecm.lang b/htdocs/langs/en_IN/ecm.lang
similarity index 100%
rename from public/langs/en_IN/ecm.lang
rename to htdocs/langs/en_IN/ecm.lang
diff --git a/public/langs/en_IN/errors.lang b/htdocs/langs/en_IN/errors.lang
similarity index 100%
rename from public/langs/en_IN/errors.lang
rename to htdocs/langs/en_IN/errors.lang
diff --git a/public/langs/en_IN/exports.lang b/htdocs/langs/en_IN/exports.lang
similarity index 100%
rename from public/langs/en_IN/exports.lang
rename to htdocs/langs/en_IN/exports.lang
diff --git a/public/langs/en_IN/externalsite.lang b/htdocs/langs/en_IN/externalsite.lang
similarity index 100%
rename from public/langs/en_IN/externalsite.lang
rename to htdocs/langs/en_IN/externalsite.lang
diff --git a/public/langs/en_IN/ftp.lang b/htdocs/langs/en_IN/ftp.lang
similarity index 100%
rename from public/langs/en_IN/ftp.lang
rename to htdocs/langs/en_IN/ftp.lang
diff --git a/public/langs/en_IN/help.lang b/htdocs/langs/en_IN/help.lang
similarity index 100%
rename from public/langs/en_IN/help.lang
rename to htdocs/langs/en_IN/help.lang
diff --git a/public/langs/en_IN/holiday.lang b/htdocs/langs/en_IN/holiday.lang
similarity index 100%
rename from public/langs/en_IN/holiday.lang
rename to htdocs/langs/en_IN/holiday.lang
diff --git a/public/langs/en_IN/hrm.lang b/htdocs/langs/en_IN/hrm.lang
similarity index 100%
rename from public/langs/en_IN/hrm.lang
rename to htdocs/langs/en_IN/hrm.lang
diff --git a/public/langs/en_IN/incoterm.lang b/htdocs/langs/en_IN/incoterm.lang
similarity index 100%
rename from public/langs/en_IN/incoterm.lang
rename to htdocs/langs/en_IN/incoterm.lang
diff --git a/public/langs/en_IN/install.lang b/htdocs/langs/en_IN/install.lang
similarity index 100%
rename from public/langs/en_IN/install.lang
rename to htdocs/langs/en_IN/install.lang
diff --git a/public/langs/en_IN/interventions.lang b/htdocs/langs/en_IN/interventions.lang
similarity index 100%
rename from public/langs/en_IN/interventions.lang
rename to htdocs/langs/en_IN/interventions.lang
diff --git a/public/langs/en_IN/languages.lang b/htdocs/langs/en_IN/languages.lang
similarity index 100%
rename from public/langs/en_IN/languages.lang
rename to htdocs/langs/en_IN/languages.lang
diff --git a/public/langs/en_IN/ldap.lang b/htdocs/langs/en_IN/ldap.lang
similarity index 100%
rename from public/langs/en_IN/ldap.lang
rename to htdocs/langs/en_IN/ldap.lang
diff --git a/public/langs/en_IN/link.lang b/htdocs/langs/en_IN/link.lang
similarity index 100%
rename from public/langs/en_IN/link.lang
rename to htdocs/langs/en_IN/link.lang
diff --git a/public/langs/en_IN/loan.lang b/htdocs/langs/en_IN/loan.lang
similarity index 100%
rename from public/langs/en_IN/loan.lang
rename to htdocs/langs/en_IN/loan.lang
diff --git a/public/langs/en_IN/mailmanspip.lang b/htdocs/langs/en_IN/mailmanspip.lang
similarity index 100%
rename from public/langs/en_IN/mailmanspip.lang
rename to htdocs/langs/en_IN/mailmanspip.lang
diff --git a/public/langs/en_IN/mails.lang b/htdocs/langs/en_IN/mails.lang
similarity index 100%
rename from public/langs/en_IN/mails.lang
rename to htdocs/langs/en_IN/mails.lang
diff --git a/public/langs/en_IN/main.lang b/htdocs/langs/en_IN/main.lang
similarity index 100%
rename from public/langs/en_IN/main.lang
rename to htdocs/langs/en_IN/main.lang
diff --git a/public/langs/en_IN/margins.lang b/htdocs/langs/en_IN/margins.lang
similarity index 100%
rename from public/langs/en_IN/margins.lang
rename to htdocs/langs/en_IN/margins.lang
diff --git a/public/langs/en_IN/members.lang b/htdocs/langs/en_IN/members.lang
similarity index 100%
rename from public/langs/en_IN/members.lang
rename to htdocs/langs/en_IN/members.lang
diff --git a/public/langs/en_IN/oauth.lang b/htdocs/langs/en_IN/oauth.lang
similarity index 100%
rename from public/langs/en_IN/oauth.lang
rename to htdocs/langs/en_IN/oauth.lang
diff --git a/public/langs/en_IN/opensurvey.lang b/htdocs/langs/en_IN/opensurvey.lang
similarity index 100%
rename from public/langs/en_IN/opensurvey.lang
rename to htdocs/langs/en_IN/opensurvey.lang
diff --git a/public/langs/en_IN/orders.lang b/htdocs/langs/en_IN/orders.lang
similarity index 100%
rename from public/langs/en_IN/orders.lang
rename to htdocs/langs/en_IN/orders.lang
diff --git a/public/langs/en_IN/other.lang b/htdocs/langs/en_IN/other.lang
similarity index 100%
rename from public/langs/en_IN/other.lang
rename to htdocs/langs/en_IN/other.lang
diff --git a/public/langs/en_IN/paybox.lang b/htdocs/langs/en_IN/paybox.lang
similarity index 100%
rename from public/langs/en_IN/paybox.lang
rename to htdocs/langs/en_IN/paybox.lang
diff --git a/public/langs/en_IN/paypal.lang b/htdocs/langs/en_IN/paypal.lang
similarity index 100%
rename from public/langs/en_IN/paypal.lang
rename to htdocs/langs/en_IN/paypal.lang
diff --git a/public/langs/en_IN/printing.lang b/htdocs/langs/en_IN/printing.lang
similarity index 100%
rename from public/langs/en_IN/printing.lang
rename to htdocs/langs/en_IN/printing.lang
diff --git a/public/langs/en_IN/productbatch.lang b/htdocs/langs/en_IN/productbatch.lang
similarity index 100%
rename from public/langs/en_IN/productbatch.lang
rename to htdocs/langs/en_IN/productbatch.lang
diff --git a/public/langs/en_IN/products.lang b/htdocs/langs/en_IN/products.lang
similarity index 100%
rename from public/langs/en_IN/products.lang
rename to htdocs/langs/en_IN/products.lang
diff --git a/public/langs/en_IN/projects.lang b/htdocs/langs/en_IN/projects.lang
similarity index 100%
rename from public/langs/en_IN/projects.lang
rename to htdocs/langs/en_IN/projects.lang
diff --git a/public/langs/en_IN/propal.lang b/htdocs/langs/en_IN/propal.lang
similarity index 100%
rename from public/langs/en_IN/propal.lang
rename to htdocs/langs/en_IN/propal.lang
diff --git a/public/langs/en_IN/receiptprinter.lang b/htdocs/langs/en_IN/receiptprinter.lang
similarity index 100%
rename from public/langs/en_IN/receiptprinter.lang
rename to htdocs/langs/en_IN/receiptprinter.lang
diff --git a/public/langs/en_IN/resource.lang b/htdocs/langs/en_IN/resource.lang
similarity index 100%
rename from public/langs/en_IN/resource.lang
rename to htdocs/langs/en_IN/resource.lang
diff --git a/public/langs/en_IN/salaries.lang b/htdocs/langs/en_IN/salaries.lang
similarity index 100%
rename from public/langs/en_IN/salaries.lang
rename to htdocs/langs/en_IN/salaries.lang
diff --git a/public/langs/en_IN/sendings.lang b/htdocs/langs/en_IN/sendings.lang
similarity index 100%
rename from public/langs/en_IN/sendings.lang
rename to htdocs/langs/en_IN/sendings.lang
diff --git a/public/langs/en_IN/sms.lang b/htdocs/langs/en_IN/sms.lang
similarity index 100%
rename from public/langs/en_IN/sms.lang
rename to htdocs/langs/en_IN/sms.lang
diff --git a/public/langs/en_IN/stocks.lang b/htdocs/langs/en_IN/stocks.lang
similarity index 100%
rename from public/langs/en_IN/stocks.lang
rename to htdocs/langs/en_IN/stocks.lang
diff --git a/public/langs/en_IN/supplier_proposal.lang b/htdocs/langs/en_IN/supplier_proposal.lang
similarity index 100%
rename from public/langs/en_IN/supplier_proposal.lang
rename to htdocs/langs/en_IN/supplier_proposal.lang
diff --git a/public/langs/en_IN/suppliers.lang b/htdocs/langs/en_IN/suppliers.lang
similarity index 100%
rename from public/langs/en_IN/suppliers.lang
rename to htdocs/langs/en_IN/suppliers.lang
diff --git a/public/langs/en_IN/trips.lang b/htdocs/langs/en_IN/trips.lang
similarity index 100%
rename from public/langs/en_IN/trips.lang
rename to htdocs/langs/en_IN/trips.lang
diff --git a/public/langs/en_IN/users.lang b/htdocs/langs/en_IN/users.lang
similarity index 100%
rename from public/langs/en_IN/users.lang
rename to htdocs/langs/en_IN/users.lang
diff --git a/public/langs/en_IN/website.lang b/htdocs/langs/en_IN/website.lang
similarity index 100%
rename from public/langs/en_IN/website.lang
rename to htdocs/langs/en_IN/website.lang
diff --git a/public/langs/en_IN/withdrawals.lang b/htdocs/langs/en_IN/withdrawals.lang
similarity index 100%
rename from public/langs/en_IN/withdrawals.lang
rename to htdocs/langs/en_IN/withdrawals.lang
diff --git a/public/langs/en_IN/workflow.lang b/htdocs/langs/en_IN/workflow.lang
similarity index 100%
rename from public/langs/en_IN/workflow.lang
rename to htdocs/langs/en_IN/workflow.lang
diff --git a/public/langs/en_NZ/companies.lang b/htdocs/langs/en_NZ/companies.lang
similarity index 100%
rename from public/langs/en_NZ/companies.lang
rename to htdocs/langs/en_NZ/companies.lang
diff --git a/public/langs/en_NZ/compta.lang b/htdocs/langs/en_NZ/compta.lang
similarity index 100%
rename from public/langs/en_NZ/compta.lang
rename to htdocs/langs/en_NZ/compta.lang
diff --git a/public/langs/en_NZ/main.lang b/htdocs/langs/en_NZ/main.lang
similarity index 100%
rename from public/langs/en_NZ/main.lang
rename to htdocs/langs/en_NZ/main.lang
diff --git a/public/langs/en_SA/main.lang b/htdocs/langs/en_SA/main.lang
similarity index 100%
rename from public/langs/en_SA/main.lang
rename to htdocs/langs/en_SA/main.lang
diff --git a/public/langs/en_SA/propal.lang b/htdocs/langs/en_SA/propal.lang
similarity index 100%
rename from public/langs/en_SA/propal.lang
rename to htdocs/langs/en_SA/propal.lang
diff --git a/public/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
similarity index 100%
rename from public/langs/en_US/accountancy.lang
rename to htdocs/langs/en_US/accountancy.lang
diff --git a/public/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
similarity index 100%
rename from public/langs/en_US/admin.lang
rename to htdocs/langs/en_US/admin.lang
diff --git a/public/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
similarity index 100%
rename from public/langs/en_US/agenda.lang
rename to htdocs/langs/en_US/agenda.lang
diff --git a/public/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
similarity index 100%
rename from public/langs/en_US/banks.lang
rename to htdocs/langs/en_US/banks.lang
diff --git a/public/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
similarity index 100%
rename from public/langs/en_US/bills.lang
rename to htdocs/langs/en_US/bills.lang
diff --git a/public/langs/en_US/bookmarks.lang b/htdocs/langs/en_US/bookmarks.lang
similarity index 100%
rename from public/langs/en_US/bookmarks.lang
rename to htdocs/langs/en_US/bookmarks.lang
diff --git a/public/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
similarity index 100%
rename from public/langs/en_US/boxes.lang
rename to htdocs/langs/en_US/boxes.lang
diff --git a/public/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
similarity index 100%
rename from public/langs/en_US/cashdesk.lang
rename to htdocs/langs/en_US/cashdesk.lang
diff --git a/public/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
similarity index 100%
rename from public/langs/en_US/categories.lang
rename to htdocs/langs/en_US/categories.lang
diff --git a/public/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang
similarity index 100%
rename from public/langs/en_US/commercial.lang
rename to htdocs/langs/en_US/commercial.lang
diff --git a/public/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
similarity index 100%
rename from public/langs/en_US/companies.lang
rename to htdocs/langs/en_US/companies.lang
diff --git a/public/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
similarity index 100%
rename from public/langs/en_US/compta.lang
rename to htdocs/langs/en_US/compta.lang
diff --git a/public/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
similarity index 100%
rename from public/langs/en_US/contracts.lang
rename to htdocs/langs/en_US/contracts.lang
diff --git a/public/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
similarity index 100%
rename from public/langs/en_US/cron.lang
rename to htdocs/langs/en_US/cron.lang
diff --git a/public/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang
similarity index 100%
rename from public/langs/en_US/deliveries.lang
rename to htdocs/langs/en_US/deliveries.lang
diff --git a/public/langs/en_US/dict.lang b/htdocs/langs/en_US/dict.lang
similarity index 100%
rename from public/langs/en_US/dict.lang
rename to htdocs/langs/en_US/dict.lang
diff --git a/public/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang
similarity index 100%
rename from public/langs/en_US/donations.lang
rename to htdocs/langs/en_US/donations.lang
diff --git a/public/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
similarity index 100%
rename from public/langs/en_US/ecm.lang
rename to htdocs/langs/en_US/ecm.lang
diff --git a/public/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
similarity index 100%
rename from public/langs/en_US/errors.lang
rename to htdocs/langs/en_US/errors.lang
diff --git a/public/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
similarity index 100%
rename from public/langs/en_US/exports.lang
rename to htdocs/langs/en_US/exports.lang
diff --git a/public/langs/en_US/externalsite.lang b/htdocs/langs/en_US/externalsite.lang
similarity index 100%
rename from public/langs/en_US/externalsite.lang
rename to htdocs/langs/en_US/externalsite.lang
diff --git a/public/langs/en_US/ftp.lang b/htdocs/langs/en_US/ftp.lang
similarity index 100%
rename from public/langs/en_US/ftp.lang
rename to htdocs/langs/en_US/ftp.lang
diff --git a/public/langs/en_US/help.lang b/htdocs/langs/en_US/help.lang
similarity index 100%
rename from public/langs/en_US/help.lang
rename to htdocs/langs/en_US/help.lang
diff --git a/public/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
similarity index 100%
rename from public/langs/en_US/holiday.lang
rename to htdocs/langs/en_US/holiday.lang
diff --git a/public/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang
similarity index 100%
rename from public/langs/en_US/hrm.lang
rename to htdocs/langs/en_US/hrm.lang
diff --git a/public/langs/en_US/incoterm.lang b/htdocs/langs/en_US/incoterm.lang
similarity index 100%
rename from public/langs/en_US/incoterm.lang
rename to htdocs/langs/en_US/incoterm.lang
diff --git a/public/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
similarity index 100%
rename from public/langs/en_US/install.lang
rename to htdocs/langs/en_US/install.lang
diff --git a/public/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
similarity index 100%
rename from public/langs/en_US/interventions.lang
rename to htdocs/langs/en_US/interventions.lang
diff --git a/public/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
similarity index 100%
rename from public/langs/en_US/languages.lang
rename to htdocs/langs/en_US/languages.lang
diff --git a/public/langs/en_US/ldap.lang b/htdocs/langs/en_US/ldap.lang
similarity index 100%
rename from public/langs/en_US/ldap.lang
rename to htdocs/langs/en_US/ldap.lang
diff --git a/public/langs/en_US/link.lang b/htdocs/langs/en_US/link.lang
similarity index 100%
rename from public/langs/en_US/link.lang
rename to htdocs/langs/en_US/link.lang
diff --git a/public/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang
similarity index 100%
rename from public/langs/en_US/loan.lang
rename to htdocs/langs/en_US/loan.lang
diff --git a/public/langs/en_US/mailmanspip.lang b/htdocs/langs/en_US/mailmanspip.lang
similarity index 100%
rename from public/langs/en_US/mailmanspip.lang
rename to htdocs/langs/en_US/mailmanspip.lang
diff --git a/public/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
similarity index 100%
rename from public/langs/en_US/mails.lang
rename to htdocs/langs/en_US/mails.lang
diff --git a/public/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
similarity index 100%
rename from public/langs/en_US/main.lang
rename to htdocs/langs/en_US/main.lang
diff --git a/public/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang
similarity index 100%
rename from public/langs/en_US/margins.lang
rename to htdocs/langs/en_US/margins.lang
diff --git a/public/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
similarity index 100%
rename from public/langs/en_US/members.lang
rename to htdocs/langs/en_US/members.lang
diff --git a/public/langs/en_US/multicurrency.lang b/htdocs/langs/en_US/multicurrency.lang
similarity index 100%
rename from public/langs/en_US/multicurrency.lang
rename to htdocs/langs/en_US/multicurrency.lang
diff --git a/public/langs/en_US/oauth.lang b/htdocs/langs/en_US/oauth.lang
similarity index 100%
rename from public/langs/en_US/oauth.lang
rename to htdocs/langs/en_US/oauth.lang
diff --git a/public/langs/en_US/opensurvey.lang b/htdocs/langs/en_US/opensurvey.lang
similarity index 100%
rename from public/langs/en_US/opensurvey.lang
rename to htdocs/langs/en_US/opensurvey.lang
diff --git a/public/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
similarity index 100%
rename from public/langs/en_US/orders.lang
rename to htdocs/langs/en_US/orders.lang
diff --git a/public/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
similarity index 100%
rename from public/langs/en_US/other.lang
rename to htdocs/langs/en_US/other.lang
diff --git a/public/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang
similarity index 100%
rename from public/langs/en_US/paybox.lang
rename to htdocs/langs/en_US/paybox.lang
diff --git a/public/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang
similarity index 100%
rename from public/langs/en_US/paypal.lang
rename to htdocs/langs/en_US/paypal.lang
diff --git a/public/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang
similarity index 100%
rename from public/langs/en_US/printing.lang
rename to htdocs/langs/en_US/printing.lang
diff --git a/public/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
similarity index 100%
rename from public/langs/en_US/productbatch.lang
rename to htdocs/langs/en_US/productbatch.lang
diff --git a/public/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
similarity index 100%
rename from public/langs/en_US/products.lang
rename to htdocs/langs/en_US/products.lang
diff --git a/public/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
similarity index 100%
rename from public/langs/en_US/projects.lang
rename to htdocs/langs/en_US/projects.lang
diff --git a/public/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang
similarity index 100%
rename from public/langs/en_US/propal.lang
rename to htdocs/langs/en_US/propal.lang
diff --git a/public/langs/en_US/receiptprinter.lang b/htdocs/langs/en_US/receiptprinter.lang
similarity index 100%
rename from public/langs/en_US/receiptprinter.lang
rename to htdocs/langs/en_US/receiptprinter.lang
diff --git a/public/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang
similarity index 100%
rename from public/langs/en_US/resource.lang
rename to htdocs/langs/en_US/resource.lang
diff --git a/public/langs/en_US/salaries.lang b/htdocs/langs/en_US/salaries.lang
similarity index 100%
rename from public/langs/en_US/salaries.lang
rename to htdocs/langs/en_US/salaries.lang
diff --git a/public/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
similarity index 100%
rename from public/langs/en_US/sendings.lang
rename to htdocs/langs/en_US/sendings.lang
diff --git a/public/langs/en_US/sms.lang b/htdocs/langs/en_US/sms.lang
similarity index 100%
rename from public/langs/en_US/sms.lang
rename to htdocs/langs/en_US/sms.lang
diff --git a/public/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
similarity index 100%
rename from public/langs/en_US/stocks.lang
rename to htdocs/langs/en_US/stocks.lang
diff --git a/public/langs/en_US/supplier_proposal.lang b/htdocs/langs/en_US/supplier_proposal.lang
similarity index 100%
rename from public/langs/en_US/supplier_proposal.lang
rename to htdocs/langs/en_US/supplier_proposal.lang
diff --git a/public/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
similarity index 100%
rename from public/langs/en_US/suppliers.lang
rename to htdocs/langs/en_US/suppliers.lang
diff --git a/public/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
similarity index 100%
rename from public/langs/en_US/trips.lang
rename to htdocs/langs/en_US/trips.lang
diff --git a/public/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
similarity index 100%
rename from public/langs/en_US/users.lang
rename to htdocs/langs/en_US/users.lang
diff --git a/public/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
similarity index 100%
rename from public/langs/en_US/website.lang
rename to htdocs/langs/en_US/website.lang
diff --git a/public/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
similarity index 100%
rename from public/langs/en_US/withdrawals.lang
rename to htdocs/langs/en_US/withdrawals.lang
diff --git a/public/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
similarity index 100%
rename from public/langs/en_US/workflow.lang
rename to htdocs/langs/en_US/workflow.lang
diff --git a/public/langs/en_ZA/main.lang b/htdocs/langs/en_ZA/main.lang
similarity index 100%
rename from public/langs/en_ZA/main.lang
rename to htdocs/langs/en_ZA/main.lang
diff --git a/public/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang
similarity index 100%
rename from public/langs/es_AR/accountancy.lang
rename to htdocs/langs/es_AR/accountancy.lang
diff --git a/public/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
similarity index 100%
rename from public/langs/es_AR/admin.lang
rename to htdocs/langs/es_AR/admin.lang
diff --git a/public/langs/es_AR/agenda.lang b/htdocs/langs/es_AR/agenda.lang
similarity index 100%
rename from public/langs/es_AR/agenda.lang
rename to htdocs/langs/es_AR/agenda.lang
diff --git a/public/langs/es_AR/banks.lang b/htdocs/langs/es_AR/banks.lang
similarity index 100%
rename from public/langs/es_AR/banks.lang
rename to htdocs/langs/es_AR/banks.lang
diff --git a/public/langs/es_AR/bills.lang b/htdocs/langs/es_AR/bills.lang
similarity index 100%
rename from public/langs/es_AR/bills.lang
rename to htdocs/langs/es_AR/bills.lang
diff --git a/public/langs/es_AR/bookmarks.lang b/htdocs/langs/es_AR/bookmarks.lang
similarity index 100%
rename from public/langs/es_AR/bookmarks.lang
rename to htdocs/langs/es_AR/bookmarks.lang
diff --git a/public/langs/es_AR/boxes.lang b/htdocs/langs/es_AR/boxes.lang
similarity index 100%
rename from public/langs/es_AR/boxes.lang
rename to htdocs/langs/es_AR/boxes.lang
diff --git a/public/langs/es_AR/cashdesk.lang b/htdocs/langs/es_AR/cashdesk.lang
similarity index 100%
rename from public/langs/es_AR/cashdesk.lang
rename to htdocs/langs/es_AR/cashdesk.lang
diff --git a/public/langs/es_AR/categories.lang b/htdocs/langs/es_AR/categories.lang
similarity index 100%
rename from public/langs/es_AR/categories.lang
rename to htdocs/langs/es_AR/categories.lang
diff --git a/public/langs/es_AR/commercial.lang b/htdocs/langs/es_AR/commercial.lang
similarity index 100%
rename from public/langs/es_AR/commercial.lang
rename to htdocs/langs/es_AR/commercial.lang
diff --git a/public/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
similarity index 100%
rename from public/langs/es_AR/companies.lang
rename to htdocs/langs/es_AR/companies.lang
diff --git a/public/langs/es_AR/compta.lang b/htdocs/langs/es_AR/compta.lang
similarity index 100%
rename from public/langs/es_AR/compta.lang
rename to htdocs/langs/es_AR/compta.lang
diff --git a/public/langs/es_AR/contracts.lang b/htdocs/langs/es_AR/contracts.lang
similarity index 100%
rename from public/langs/es_AR/contracts.lang
rename to htdocs/langs/es_AR/contracts.lang
diff --git a/public/langs/es_AR/cron.lang b/htdocs/langs/es_AR/cron.lang
similarity index 100%
rename from public/langs/es_AR/cron.lang
rename to htdocs/langs/es_AR/cron.lang
diff --git a/public/langs/es_AR/deliveries.lang b/htdocs/langs/es_AR/deliveries.lang
similarity index 100%
rename from public/langs/es_AR/deliveries.lang
rename to htdocs/langs/es_AR/deliveries.lang
diff --git a/public/langs/es_AR/dict.lang b/htdocs/langs/es_AR/dict.lang
similarity index 100%
rename from public/langs/es_AR/dict.lang
rename to htdocs/langs/es_AR/dict.lang
diff --git a/public/langs/es_AR/donations.lang b/htdocs/langs/es_AR/donations.lang
similarity index 100%
rename from public/langs/es_AR/donations.lang
rename to htdocs/langs/es_AR/donations.lang
diff --git a/public/langs/es_AR/ecm.lang b/htdocs/langs/es_AR/ecm.lang
similarity index 100%
rename from public/langs/es_AR/ecm.lang
rename to htdocs/langs/es_AR/ecm.lang
diff --git a/public/langs/es_AR/errors.lang b/htdocs/langs/es_AR/errors.lang
similarity index 100%
rename from public/langs/es_AR/errors.lang
rename to htdocs/langs/es_AR/errors.lang
diff --git a/public/langs/es_AR/exports.lang b/htdocs/langs/es_AR/exports.lang
similarity index 100%
rename from public/langs/es_AR/exports.lang
rename to htdocs/langs/es_AR/exports.lang
diff --git a/public/langs/es_AR/externalsite.lang b/htdocs/langs/es_AR/externalsite.lang
similarity index 100%
rename from public/langs/es_AR/externalsite.lang
rename to htdocs/langs/es_AR/externalsite.lang
diff --git a/public/langs/es_AR/ftp.lang b/htdocs/langs/es_AR/ftp.lang
similarity index 100%
rename from public/langs/es_AR/ftp.lang
rename to htdocs/langs/es_AR/ftp.lang
diff --git a/public/langs/es_AR/help.lang b/htdocs/langs/es_AR/help.lang
similarity index 100%
rename from public/langs/es_AR/help.lang
rename to htdocs/langs/es_AR/help.lang
diff --git a/public/langs/es_AR/holiday.lang b/htdocs/langs/es_AR/holiday.lang
similarity index 100%
rename from public/langs/es_AR/holiday.lang
rename to htdocs/langs/es_AR/holiday.lang
diff --git a/public/langs/es_AR/hrm.lang b/htdocs/langs/es_AR/hrm.lang
similarity index 100%
rename from public/langs/es_AR/hrm.lang
rename to htdocs/langs/es_AR/hrm.lang
diff --git a/public/langs/es_AR/incoterm.lang b/htdocs/langs/es_AR/incoterm.lang
similarity index 100%
rename from public/langs/es_AR/incoterm.lang
rename to htdocs/langs/es_AR/incoterm.lang
diff --git a/public/langs/es_AR/install.lang b/htdocs/langs/es_AR/install.lang
similarity index 100%
rename from public/langs/es_AR/install.lang
rename to htdocs/langs/es_AR/install.lang
diff --git a/public/langs/es_AR/interventions.lang b/htdocs/langs/es_AR/interventions.lang
similarity index 100%
rename from public/langs/es_AR/interventions.lang
rename to htdocs/langs/es_AR/interventions.lang
diff --git a/public/langs/es_AR/languages.lang b/htdocs/langs/es_AR/languages.lang
similarity index 100%
rename from public/langs/es_AR/languages.lang
rename to htdocs/langs/es_AR/languages.lang
diff --git a/public/langs/es_AR/ldap.lang b/htdocs/langs/es_AR/ldap.lang
similarity index 100%
rename from public/langs/es_AR/ldap.lang
rename to htdocs/langs/es_AR/ldap.lang
diff --git a/public/langs/es_AR/link.lang b/htdocs/langs/es_AR/link.lang
similarity index 100%
rename from public/langs/es_AR/link.lang
rename to htdocs/langs/es_AR/link.lang
diff --git a/public/langs/es_AR/loan.lang b/htdocs/langs/es_AR/loan.lang
similarity index 100%
rename from public/langs/es_AR/loan.lang
rename to htdocs/langs/es_AR/loan.lang
diff --git a/public/langs/es_AR/mailmanspip.lang b/htdocs/langs/es_AR/mailmanspip.lang
similarity index 100%
rename from public/langs/es_AR/mailmanspip.lang
rename to htdocs/langs/es_AR/mailmanspip.lang
diff --git a/public/langs/es_AR/mails.lang b/htdocs/langs/es_AR/mails.lang
similarity index 100%
rename from public/langs/es_AR/mails.lang
rename to htdocs/langs/es_AR/mails.lang
diff --git a/public/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang
similarity index 100%
rename from public/langs/es_AR/main.lang
rename to htdocs/langs/es_AR/main.lang
diff --git a/public/langs/es_AR/margins.lang b/htdocs/langs/es_AR/margins.lang
similarity index 100%
rename from public/langs/es_AR/margins.lang
rename to htdocs/langs/es_AR/margins.lang
diff --git a/public/langs/es_AR/members.lang b/htdocs/langs/es_AR/members.lang
similarity index 100%
rename from public/langs/es_AR/members.lang
rename to htdocs/langs/es_AR/members.lang
diff --git a/public/langs/es_AR/oauth.lang b/htdocs/langs/es_AR/oauth.lang
similarity index 100%
rename from public/langs/es_AR/oauth.lang
rename to htdocs/langs/es_AR/oauth.lang
diff --git a/public/langs/es_AR/opensurvey.lang b/htdocs/langs/es_AR/opensurvey.lang
similarity index 100%
rename from public/langs/es_AR/opensurvey.lang
rename to htdocs/langs/es_AR/opensurvey.lang
diff --git a/public/langs/es_AR/orders.lang b/htdocs/langs/es_AR/orders.lang
similarity index 100%
rename from public/langs/es_AR/orders.lang
rename to htdocs/langs/es_AR/orders.lang
diff --git a/public/langs/es_AR/other.lang b/htdocs/langs/es_AR/other.lang
similarity index 100%
rename from public/langs/es_AR/other.lang
rename to htdocs/langs/es_AR/other.lang
diff --git a/public/langs/es_AR/paybox.lang b/htdocs/langs/es_AR/paybox.lang
similarity index 100%
rename from public/langs/es_AR/paybox.lang
rename to htdocs/langs/es_AR/paybox.lang
diff --git a/public/langs/es_AR/paypal.lang b/htdocs/langs/es_AR/paypal.lang
similarity index 100%
rename from public/langs/es_AR/paypal.lang
rename to htdocs/langs/es_AR/paypal.lang
diff --git a/public/langs/es_AR/printing.lang b/htdocs/langs/es_AR/printing.lang
similarity index 100%
rename from public/langs/es_AR/printing.lang
rename to htdocs/langs/es_AR/printing.lang
diff --git a/public/langs/es_AR/productbatch.lang b/htdocs/langs/es_AR/productbatch.lang
similarity index 100%
rename from public/langs/es_AR/productbatch.lang
rename to htdocs/langs/es_AR/productbatch.lang
diff --git a/public/langs/es_AR/products.lang b/htdocs/langs/es_AR/products.lang
similarity index 100%
rename from public/langs/es_AR/products.lang
rename to htdocs/langs/es_AR/products.lang
diff --git a/public/langs/es_AR/projects.lang b/htdocs/langs/es_AR/projects.lang
similarity index 100%
rename from public/langs/es_AR/projects.lang
rename to htdocs/langs/es_AR/projects.lang
diff --git a/public/langs/es_AR/propal.lang b/htdocs/langs/es_AR/propal.lang
similarity index 100%
rename from public/langs/es_AR/propal.lang
rename to htdocs/langs/es_AR/propal.lang
diff --git a/public/langs/es_AR/receiptprinter.lang b/htdocs/langs/es_AR/receiptprinter.lang
similarity index 100%
rename from public/langs/es_AR/receiptprinter.lang
rename to htdocs/langs/es_AR/receiptprinter.lang
diff --git a/public/langs/es_AR/resource.lang b/htdocs/langs/es_AR/resource.lang
similarity index 100%
rename from public/langs/es_AR/resource.lang
rename to htdocs/langs/es_AR/resource.lang
diff --git a/public/langs/es_AR/salaries.lang b/htdocs/langs/es_AR/salaries.lang
similarity index 100%
rename from public/langs/es_AR/salaries.lang
rename to htdocs/langs/es_AR/salaries.lang
diff --git a/public/langs/es_AR/sendings.lang b/htdocs/langs/es_AR/sendings.lang
similarity index 100%
rename from public/langs/es_AR/sendings.lang
rename to htdocs/langs/es_AR/sendings.lang
diff --git a/public/langs/es_AR/sms.lang b/htdocs/langs/es_AR/sms.lang
similarity index 100%
rename from public/langs/es_AR/sms.lang
rename to htdocs/langs/es_AR/sms.lang
diff --git a/public/langs/es_AR/stocks.lang b/htdocs/langs/es_AR/stocks.lang
similarity index 100%
rename from public/langs/es_AR/stocks.lang
rename to htdocs/langs/es_AR/stocks.lang
diff --git a/public/langs/es_AR/supplier_proposal.lang b/htdocs/langs/es_AR/supplier_proposal.lang
similarity index 100%
rename from public/langs/es_AR/supplier_proposal.lang
rename to htdocs/langs/es_AR/supplier_proposal.lang
diff --git a/public/langs/es_AR/suppliers.lang b/htdocs/langs/es_AR/suppliers.lang
similarity index 100%
rename from public/langs/es_AR/suppliers.lang
rename to htdocs/langs/es_AR/suppliers.lang
diff --git a/public/langs/es_AR/trips.lang b/htdocs/langs/es_AR/trips.lang
similarity index 100%
rename from public/langs/es_AR/trips.lang
rename to htdocs/langs/es_AR/trips.lang
diff --git a/public/langs/es_AR/users.lang b/htdocs/langs/es_AR/users.lang
similarity index 100%
rename from public/langs/es_AR/users.lang
rename to htdocs/langs/es_AR/users.lang
diff --git a/public/langs/es_AR/website.lang b/htdocs/langs/es_AR/website.lang
similarity index 100%
rename from public/langs/es_AR/website.lang
rename to htdocs/langs/es_AR/website.lang
diff --git a/public/langs/es_AR/withdrawals.lang b/htdocs/langs/es_AR/withdrawals.lang
similarity index 100%
rename from public/langs/es_AR/withdrawals.lang
rename to htdocs/langs/es_AR/withdrawals.lang
diff --git a/public/langs/es_AR/workflow.lang b/htdocs/langs/es_AR/workflow.lang
similarity index 100%
rename from public/langs/es_AR/workflow.lang
rename to htdocs/langs/es_AR/workflow.lang
diff --git a/public/langs/es_BO/accountancy.lang b/htdocs/langs/es_BO/accountancy.lang
similarity index 100%
rename from public/langs/es_BO/accountancy.lang
rename to htdocs/langs/es_BO/accountancy.lang
diff --git a/public/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
similarity index 100%
rename from public/langs/es_BO/admin.lang
rename to htdocs/langs/es_BO/admin.lang
diff --git a/public/langs/es_BO/agenda.lang b/htdocs/langs/es_BO/agenda.lang
similarity index 100%
rename from public/langs/es_BO/agenda.lang
rename to htdocs/langs/es_BO/agenda.lang
diff --git a/public/langs/es_BO/banks.lang b/htdocs/langs/es_BO/banks.lang
similarity index 100%
rename from public/langs/es_BO/banks.lang
rename to htdocs/langs/es_BO/banks.lang
diff --git a/public/langs/es_BO/bills.lang b/htdocs/langs/es_BO/bills.lang
similarity index 100%
rename from public/langs/es_BO/bills.lang
rename to htdocs/langs/es_BO/bills.lang
diff --git a/public/langs/es_BO/bookmarks.lang b/htdocs/langs/es_BO/bookmarks.lang
similarity index 100%
rename from public/langs/es_BO/bookmarks.lang
rename to htdocs/langs/es_BO/bookmarks.lang
diff --git a/public/langs/es_BO/boxes.lang b/htdocs/langs/es_BO/boxes.lang
similarity index 100%
rename from public/langs/es_BO/boxes.lang
rename to htdocs/langs/es_BO/boxes.lang
diff --git a/public/langs/es_BO/cashdesk.lang b/htdocs/langs/es_BO/cashdesk.lang
similarity index 100%
rename from public/langs/es_BO/cashdesk.lang
rename to htdocs/langs/es_BO/cashdesk.lang
diff --git a/public/langs/es_BO/categories.lang b/htdocs/langs/es_BO/categories.lang
similarity index 100%
rename from public/langs/es_BO/categories.lang
rename to htdocs/langs/es_BO/categories.lang
diff --git a/public/langs/es_BO/commercial.lang b/htdocs/langs/es_BO/commercial.lang
similarity index 100%
rename from public/langs/es_BO/commercial.lang
rename to htdocs/langs/es_BO/commercial.lang
diff --git a/public/langs/es_BO/companies.lang b/htdocs/langs/es_BO/companies.lang
similarity index 100%
rename from public/langs/es_BO/companies.lang
rename to htdocs/langs/es_BO/companies.lang
diff --git a/public/langs/es_BO/compta.lang b/htdocs/langs/es_BO/compta.lang
similarity index 100%
rename from public/langs/es_BO/compta.lang
rename to htdocs/langs/es_BO/compta.lang
diff --git a/public/langs/es_BO/contracts.lang b/htdocs/langs/es_BO/contracts.lang
similarity index 100%
rename from public/langs/es_BO/contracts.lang
rename to htdocs/langs/es_BO/contracts.lang
diff --git a/public/langs/es_BO/cron.lang b/htdocs/langs/es_BO/cron.lang
similarity index 100%
rename from public/langs/es_BO/cron.lang
rename to htdocs/langs/es_BO/cron.lang
diff --git a/public/langs/es_BO/deliveries.lang b/htdocs/langs/es_BO/deliveries.lang
similarity index 100%
rename from public/langs/es_BO/deliveries.lang
rename to htdocs/langs/es_BO/deliveries.lang
diff --git a/public/langs/es_BO/dict.lang b/htdocs/langs/es_BO/dict.lang
similarity index 100%
rename from public/langs/es_BO/dict.lang
rename to htdocs/langs/es_BO/dict.lang
diff --git a/public/langs/es_BO/donations.lang b/htdocs/langs/es_BO/donations.lang
similarity index 100%
rename from public/langs/es_BO/donations.lang
rename to htdocs/langs/es_BO/donations.lang
diff --git a/public/langs/es_BO/ecm.lang b/htdocs/langs/es_BO/ecm.lang
similarity index 100%
rename from public/langs/es_BO/ecm.lang
rename to htdocs/langs/es_BO/ecm.lang
diff --git a/public/langs/es_BO/errors.lang b/htdocs/langs/es_BO/errors.lang
similarity index 100%
rename from public/langs/es_BO/errors.lang
rename to htdocs/langs/es_BO/errors.lang
diff --git a/public/langs/es_BO/exports.lang b/htdocs/langs/es_BO/exports.lang
similarity index 100%
rename from public/langs/es_BO/exports.lang
rename to htdocs/langs/es_BO/exports.lang
diff --git a/public/langs/es_BO/externalsite.lang b/htdocs/langs/es_BO/externalsite.lang
similarity index 100%
rename from public/langs/es_BO/externalsite.lang
rename to htdocs/langs/es_BO/externalsite.lang
diff --git a/public/langs/es_BO/ftp.lang b/htdocs/langs/es_BO/ftp.lang
similarity index 100%
rename from public/langs/es_BO/ftp.lang
rename to htdocs/langs/es_BO/ftp.lang
diff --git a/public/langs/es_BO/help.lang b/htdocs/langs/es_BO/help.lang
similarity index 100%
rename from public/langs/es_BO/help.lang
rename to htdocs/langs/es_BO/help.lang
diff --git a/public/langs/es_BO/holiday.lang b/htdocs/langs/es_BO/holiday.lang
similarity index 100%
rename from public/langs/es_BO/holiday.lang
rename to htdocs/langs/es_BO/holiday.lang
diff --git a/public/langs/es_BO/hrm.lang b/htdocs/langs/es_BO/hrm.lang
similarity index 100%
rename from public/langs/es_BO/hrm.lang
rename to htdocs/langs/es_BO/hrm.lang
diff --git a/public/langs/es_BO/incoterm.lang b/htdocs/langs/es_BO/incoterm.lang
similarity index 100%
rename from public/langs/es_BO/incoterm.lang
rename to htdocs/langs/es_BO/incoterm.lang
diff --git a/public/langs/es_BO/install.lang b/htdocs/langs/es_BO/install.lang
similarity index 100%
rename from public/langs/es_BO/install.lang
rename to htdocs/langs/es_BO/install.lang
diff --git a/public/langs/es_BO/interventions.lang b/htdocs/langs/es_BO/interventions.lang
similarity index 100%
rename from public/langs/es_BO/interventions.lang
rename to htdocs/langs/es_BO/interventions.lang
diff --git a/public/langs/es_BO/languages.lang b/htdocs/langs/es_BO/languages.lang
similarity index 100%
rename from public/langs/es_BO/languages.lang
rename to htdocs/langs/es_BO/languages.lang
diff --git a/public/langs/es_BO/ldap.lang b/htdocs/langs/es_BO/ldap.lang
similarity index 100%
rename from public/langs/es_BO/ldap.lang
rename to htdocs/langs/es_BO/ldap.lang
diff --git a/public/langs/es_BO/link.lang b/htdocs/langs/es_BO/link.lang
similarity index 100%
rename from public/langs/es_BO/link.lang
rename to htdocs/langs/es_BO/link.lang
diff --git a/public/langs/es_BO/loan.lang b/htdocs/langs/es_BO/loan.lang
similarity index 100%
rename from public/langs/es_BO/loan.lang
rename to htdocs/langs/es_BO/loan.lang
diff --git a/public/langs/es_BO/mailmanspip.lang b/htdocs/langs/es_BO/mailmanspip.lang
similarity index 100%
rename from public/langs/es_BO/mailmanspip.lang
rename to htdocs/langs/es_BO/mailmanspip.lang
diff --git a/public/langs/es_BO/mails.lang b/htdocs/langs/es_BO/mails.lang
similarity index 100%
rename from public/langs/es_BO/mails.lang
rename to htdocs/langs/es_BO/mails.lang
diff --git a/public/langs/es_BO/main.lang b/htdocs/langs/es_BO/main.lang
similarity index 100%
rename from public/langs/es_BO/main.lang
rename to htdocs/langs/es_BO/main.lang
diff --git a/public/langs/es_BO/margins.lang b/htdocs/langs/es_BO/margins.lang
similarity index 100%
rename from public/langs/es_BO/margins.lang
rename to htdocs/langs/es_BO/margins.lang
diff --git a/public/langs/es_BO/members.lang b/htdocs/langs/es_BO/members.lang
similarity index 100%
rename from public/langs/es_BO/members.lang
rename to htdocs/langs/es_BO/members.lang
diff --git a/public/langs/es_BO/oauth.lang b/htdocs/langs/es_BO/oauth.lang
similarity index 100%
rename from public/langs/es_BO/oauth.lang
rename to htdocs/langs/es_BO/oauth.lang
diff --git a/public/langs/es_BO/opensurvey.lang b/htdocs/langs/es_BO/opensurvey.lang
similarity index 100%
rename from public/langs/es_BO/opensurvey.lang
rename to htdocs/langs/es_BO/opensurvey.lang
diff --git a/public/langs/es_BO/orders.lang b/htdocs/langs/es_BO/orders.lang
similarity index 100%
rename from public/langs/es_BO/orders.lang
rename to htdocs/langs/es_BO/orders.lang
diff --git a/public/langs/es_BO/other.lang b/htdocs/langs/es_BO/other.lang
similarity index 100%
rename from public/langs/es_BO/other.lang
rename to htdocs/langs/es_BO/other.lang
diff --git a/public/langs/es_BO/paybox.lang b/htdocs/langs/es_BO/paybox.lang
similarity index 100%
rename from public/langs/es_BO/paybox.lang
rename to htdocs/langs/es_BO/paybox.lang
diff --git a/public/langs/es_BO/paypal.lang b/htdocs/langs/es_BO/paypal.lang
similarity index 100%
rename from public/langs/es_BO/paypal.lang
rename to htdocs/langs/es_BO/paypal.lang
diff --git a/public/langs/es_BO/printing.lang b/htdocs/langs/es_BO/printing.lang
similarity index 100%
rename from public/langs/es_BO/printing.lang
rename to htdocs/langs/es_BO/printing.lang
diff --git a/public/langs/es_BO/productbatch.lang b/htdocs/langs/es_BO/productbatch.lang
similarity index 100%
rename from public/langs/es_BO/productbatch.lang
rename to htdocs/langs/es_BO/productbatch.lang
diff --git a/public/langs/es_BO/products.lang b/htdocs/langs/es_BO/products.lang
similarity index 100%
rename from public/langs/es_BO/products.lang
rename to htdocs/langs/es_BO/products.lang
diff --git a/public/langs/es_BO/projects.lang b/htdocs/langs/es_BO/projects.lang
similarity index 100%
rename from public/langs/es_BO/projects.lang
rename to htdocs/langs/es_BO/projects.lang
diff --git a/public/langs/es_BO/propal.lang b/htdocs/langs/es_BO/propal.lang
similarity index 100%
rename from public/langs/es_BO/propal.lang
rename to htdocs/langs/es_BO/propal.lang
diff --git a/public/langs/es_BO/receiptprinter.lang b/htdocs/langs/es_BO/receiptprinter.lang
similarity index 100%
rename from public/langs/es_BO/receiptprinter.lang
rename to htdocs/langs/es_BO/receiptprinter.lang
diff --git a/public/langs/es_BO/resource.lang b/htdocs/langs/es_BO/resource.lang
similarity index 100%
rename from public/langs/es_BO/resource.lang
rename to htdocs/langs/es_BO/resource.lang
diff --git a/public/langs/es_BO/salaries.lang b/htdocs/langs/es_BO/salaries.lang
similarity index 100%
rename from public/langs/es_BO/salaries.lang
rename to htdocs/langs/es_BO/salaries.lang
diff --git a/public/langs/es_BO/sendings.lang b/htdocs/langs/es_BO/sendings.lang
similarity index 100%
rename from public/langs/es_BO/sendings.lang
rename to htdocs/langs/es_BO/sendings.lang
diff --git a/public/langs/es_BO/sms.lang b/htdocs/langs/es_BO/sms.lang
similarity index 100%
rename from public/langs/es_BO/sms.lang
rename to htdocs/langs/es_BO/sms.lang
diff --git a/public/langs/es_BO/stocks.lang b/htdocs/langs/es_BO/stocks.lang
similarity index 100%
rename from public/langs/es_BO/stocks.lang
rename to htdocs/langs/es_BO/stocks.lang
diff --git a/public/langs/es_BO/supplier_proposal.lang b/htdocs/langs/es_BO/supplier_proposal.lang
similarity index 100%
rename from public/langs/es_BO/supplier_proposal.lang
rename to htdocs/langs/es_BO/supplier_proposal.lang
diff --git a/public/langs/es_BO/suppliers.lang b/htdocs/langs/es_BO/suppliers.lang
similarity index 100%
rename from public/langs/es_BO/suppliers.lang
rename to htdocs/langs/es_BO/suppliers.lang
diff --git a/public/langs/es_BO/trips.lang b/htdocs/langs/es_BO/trips.lang
similarity index 100%
rename from public/langs/es_BO/trips.lang
rename to htdocs/langs/es_BO/trips.lang
diff --git a/public/langs/es_BO/users.lang b/htdocs/langs/es_BO/users.lang
similarity index 100%
rename from public/langs/es_BO/users.lang
rename to htdocs/langs/es_BO/users.lang
diff --git a/public/langs/es_BO/website.lang b/htdocs/langs/es_BO/website.lang
similarity index 100%
rename from public/langs/es_BO/website.lang
rename to htdocs/langs/es_BO/website.lang
diff --git a/public/langs/es_BO/withdrawals.lang b/htdocs/langs/es_BO/withdrawals.lang
similarity index 100%
rename from public/langs/es_BO/withdrawals.lang
rename to htdocs/langs/es_BO/withdrawals.lang
diff --git a/public/langs/es_BO/workflow.lang b/htdocs/langs/es_BO/workflow.lang
similarity index 100%
rename from public/langs/es_BO/workflow.lang
rename to htdocs/langs/es_BO/workflow.lang
diff --git a/public/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
similarity index 100%
rename from public/langs/es_CL/accountancy.lang
rename to htdocs/langs/es_CL/accountancy.lang
diff --git a/public/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
similarity index 100%
rename from public/langs/es_CL/admin.lang
rename to htdocs/langs/es_CL/admin.lang
diff --git a/public/langs/es_CL/agenda.lang b/htdocs/langs/es_CL/agenda.lang
similarity index 100%
rename from public/langs/es_CL/agenda.lang
rename to htdocs/langs/es_CL/agenda.lang
diff --git a/public/langs/es_CL/banks.lang b/htdocs/langs/es_CL/banks.lang
similarity index 100%
rename from public/langs/es_CL/banks.lang
rename to htdocs/langs/es_CL/banks.lang
diff --git a/public/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang
similarity index 100%
rename from public/langs/es_CL/bills.lang
rename to htdocs/langs/es_CL/bills.lang
diff --git a/public/langs/es_CL/bookmarks.lang b/htdocs/langs/es_CL/bookmarks.lang
similarity index 100%
rename from public/langs/es_CL/bookmarks.lang
rename to htdocs/langs/es_CL/bookmarks.lang
diff --git a/public/langs/es_CL/boxes.lang b/htdocs/langs/es_CL/boxes.lang
similarity index 100%
rename from public/langs/es_CL/boxes.lang
rename to htdocs/langs/es_CL/boxes.lang
diff --git a/public/langs/es_CL/cashdesk.lang b/htdocs/langs/es_CL/cashdesk.lang
similarity index 100%
rename from public/langs/es_CL/cashdesk.lang
rename to htdocs/langs/es_CL/cashdesk.lang
diff --git a/public/langs/es_CL/categories.lang b/htdocs/langs/es_CL/categories.lang
similarity index 100%
rename from public/langs/es_CL/categories.lang
rename to htdocs/langs/es_CL/categories.lang
diff --git a/public/langs/es_CL/commercial.lang b/htdocs/langs/es_CL/commercial.lang
similarity index 100%
rename from public/langs/es_CL/commercial.lang
rename to htdocs/langs/es_CL/commercial.lang
diff --git a/public/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
similarity index 100%
rename from public/langs/es_CL/companies.lang
rename to htdocs/langs/es_CL/companies.lang
diff --git a/public/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang
similarity index 100%
rename from public/langs/es_CL/compta.lang
rename to htdocs/langs/es_CL/compta.lang
diff --git a/public/langs/es_CL/contracts.lang b/htdocs/langs/es_CL/contracts.lang
similarity index 100%
rename from public/langs/es_CL/contracts.lang
rename to htdocs/langs/es_CL/contracts.lang
diff --git a/public/langs/es_CL/cron.lang b/htdocs/langs/es_CL/cron.lang
similarity index 100%
rename from public/langs/es_CL/cron.lang
rename to htdocs/langs/es_CL/cron.lang
diff --git a/public/langs/es_CL/deliveries.lang b/htdocs/langs/es_CL/deliveries.lang
similarity index 100%
rename from public/langs/es_CL/deliveries.lang
rename to htdocs/langs/es_CL/deliveries.lang
diff --git a/public/langs/es_CL/dict.lang b/htdocs/langs/es_CL/dict.lang
similarity index 100%
rename from public/langs/es_CL/dict.lang
rename to htdocs/langs/es_CL/dict.lang
diff --git a/public/langs/es_CL/donations.lang b/htdocs/langs/es_CL/donations.lang
similarity index 100%
rename from public/langs/es_CL/donations.lang
rename to htdocs/langs/es_CL/donations.lang
diff --git a/public/langs/es_CL/ecm.lang b/htdocs/langs/es_CL/ecm.lang
similarity index 100%
rename from public/langs/es_CL/ecm.lang
rename to htdocs/langs/es_CL/ecm.lang
diff --git a/public/langs/es_CL/errors.lang b/htdocs/langs/es_CL/errors.lang
similarity index 100%
rename from public/langs/es_CL/errors.lang
rename to htdocs/langs/es_CL/errors.lang
diff --git a/public/langs/es_CL/exports.lang b/htdocs/langs/es_CL/exports.lang
similarity index 100%
rename from public/langs/es_CL/exports.lang
rename to htdocs/langs/es_CL/exports.lang
diff --git a/public/langs/es_CL/externalsite.lang b/htdocs/langs/es_CL/externalsite.lang
similarity index 100%
rename from public/langs/es_CL/externalsite.lang
rename to htdocs/langs/es_CL/externalsite.lang
diff --git a/public/langs/es_CL/ftp.lang b/htdocs/langs/es_CL/ftp.lang
similarity index 100%
rename from public/langs/es_CL/ftp.lang
rename to htdocs/langs/es_CL/ftp.lang
diff --git a/public/langs/es_CL/help.lang b/htdocs/langs/es_CL/help.lang
similarity index 100%
rename from public/langs/es_CL/help.lang
rename to htdocs/langs/es_CL/help.lang
diff --git a/public/langs/es_CL/holiday.lang b/htdocs/langs/es_CL/holiday.lang
similarity index 100%
rename from public/langs/es_CL/holiday.lang
rename to htdocs/langs/es_CL/holiday.lang
diff --git a/public/langs/es_CL/hrm.lang b/htdocs/langs/es_CL/hrm.lang
similarity index 100%
rename from public/langs/es_CL/hrm.lang
rename to htdocs/langs/es_CL/hrm.lang
diff --git a/public/langs/es_CL/incoterm.lang b/htdocs/langs/es_CL/incoterm.lang
similarity index 100%
rename from public/langs/es_CL/incoterm.lang
rename to htdocs/langs/es_CL/incoterm.lang
diff --git a/public/langs/es_CL/install.lang b/htdocs/langs/es_CL/install.lang
similarity index 100%
rename from public/langs/es_CL/install.lang
rename to htdocs/langs/es_CL/install.lang
diff --git a/public/langs/es_CL/interventions.lang b/htdocs/langs/es_CL/interventions.lang
similarity index 100%
rename from public/langs/es_CL/interventions.lang
rename to htdocs/langs/es_CL/interventions.lang
diff --git a/public/langs/es_CL/languages.lang b/htdocs/langs/es_CL/languages.lang
similarity index 100%
rename from public/langs/es_CL/languages.lang
rename to htdocs/langs/es_CL/languages.lang
diff --git a/public/langs/es_CL/ldap.lang b/htdocs/langs/es_CL/ldap.lang
similarity index 100%
rename from public/langs/es_CL/ldap.lang
rename to htdocs/langs/es_CL/ldap.lang
diff --git a/public/langs/es_CL/link.lang b/htdocs/langs/es_CL/link.lang
similarity index 100%
rename from public/langs/es_CL/link.lang
rename to htdocs/langs/es_CL/link.lang
diff --git a/public/langs/es_CL/loan.lang b/htdocs/langs/es_CL/loan.lang
similarity index 100%
rename from public/langs/es_CL/loan.lang
rename to htdocs/langs/es_CL/loan.lang
diff --git a/public/langs/es_CL/mailmanspip.lang b/htdocs/langs/es_CL/mailmanspip.lang
similarity index 100%
rename from public/langs/es_CL/mailmanspip.lang
rename to htdocs/langs/es_CL/mailmanspip.lang
diff --git a/public/langs/es_CL/mails.lang b/htdocs/langs/es_CL/mails.lang
similarity index 100%
rename from public/langs/es_CL/mails.lang
rename to htdocs/langs/es_CL/mails.lang
diff --git a/public/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
similarity index 100%
rename from public/langs/es_CL/main.lang
rename to htdocs/langs/es_CL/main.lang
diff --git a/public/langs/es_CL/margins.lang b/htdocs/langs/es_CL/margins.lang
similarity index 100%
rename from public/langs/es_CL/margins.lang
rename to htdocs/langs/es_CL/margins.lang
diff --git a/public/langs/es_CL/members.lang b/htdocs/langs/es_CL/members.lang
similarity index 100%
rename from public/langs/es_CL/members.lang
rename to htdocs/langs/es_CL/members.lang
diff --git a/public/langs/es_CL/oauth.lang b/htdocs/langs/es_CL/oauth.lang
similarity index 100%
rename from public/langs/es_CL/oauth.lang
rename to htdocs/langs/es_CL/oauth.lang
diff --git a/public/langs/es_CL/opensurvey.lang b/htdocs/langs/es_CL/opensurvey.lang
similarity index 100%
rename from public/langs/es_CL/opensurvey.lang
rename to htdocs/langs/es_CL/opensurvey.lang
diff --git a/public/langs/es_CL/orders.lang b/htdocs/langs/es_CL/orders.lang
similarity index 100%
rename from public/langs/es_CL/orders.lang
rename to htdocs/langs/es_CL/orders.lang
diff --git a/public/langs/es_CL/other.lang b/htdocs/langs/es_CL/other.lang
similarity index 100%
rename from public/langs/es_CL/other.lang
rename to htdocs/langs/es_CL/other.lang
diff --git a/public/langs/es_CL/paybox.lang b/htdocs/langs/es_CL/paybox.lang
similarity index 100%
rename from public/langs/es_CL/paybox.lang
rename to htdocs/langs/es_CL/paybox.lang
diff --git a/public/langs/es_CL/paypal.lang b/htdocs/langs/es_CL/paypal.lang
similarity index 100%
rename from public/langs/es_CL/paypal.lang
rename to htdocs/langs/es_CL/paypal.lang
diff --git a/public/langs/es_CL/printing.lang b/htdocs/langs/es_CL/printing.lang
similarity index 100%
rename from public/langs/es_CL/printing.lang
rename to htdocs/langs/es_CL/printing.lang
diff --git a/public/langs/es_CL/productbatch.lang b/htdocs/langs/es_CL/productbatch.lang
similarity index 100%
rename from public/langs/es_CL/productbatch.lang
rename to htdocs/langs/es_CL/productbatch.lang
diff --git a/public/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
similarity index 100%
rename from public/langs/es_CL/products.lang
rename to htdocs/langs/es_CL/products.lang
diff --git a/public/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
similarity index 100%
rename from public/langs/es_CL/projects.lang
rename to htdocs/langs/es_CL/projects.lang
diff --git a/public/langs/es_CL/propal.lang b/htdocs/langs/es_CL/propal.lang
similarity index 100%
rename from public/langs/es_CL/propal.lang
rename to htdocs/langs/es_CL/propal.lang
diff --git a/public/langs/es_CL/receiptprinter.lang b/htdocs/langs/es_CL/receiptprinter.lang
similarity index 100%
rename from public/langs/es_CL/receiptprinter.lang
rename to htdocs/langs/es_CL/receiptprinter.lang
diff --git a/public/langs/es_CL/resource.lang b/htdocs/langs/es_CL/resource.lang
similarity index 100%
rename from public/langs/es_CL/resource.lang
rename to htdocs/langs/es_CL/resource.lang
diff --git a/public/langs/es_CL/salaries.lang b/htdocs/langs/es_CL/salaries.lang
similarity index 100%
rename from public/langs/es_CL/salaries.lang
rename to htdocs/langs/es_CL/salaries.lang
diff --git a/public/langs/es_CL/sendings.lang b/htdocs/langs/es_CL/sendings.lang
similarity index 100%
rename from public/langs/es_CL/sendings.lang
rename to htdocs/langs/es_CL/sendings.lang
diff --git a/public/langs/es_CL/sms.lang b/htdocs/langs/es_CL/sms.lang
similarity index 100%
rename from public/langs/es_CL/sms.lang
rename to htdocs/langs/es_CL/sms.lang
diff --git a/public/langs/es_CL/stocks.lang b/htdocs/langs/es_CL/stocks.lang
similarity index 100%
rename from public/langs/es_CL/stocks.lang
rename to htdocs/langs/es_CL/stocks.lang
diff --git a/public/langs/es_CL/supplier_proposal.lang b/htdocs/langs/es_CL/supplier_proposal.lang
similarity index 100%
rename from public/langs/es_CL/supplier_proposal.lang
rename to htdocs/langs/es_CL/supplier_proposal.lang
diff --git a/public/langs/es_CL/suppliers.lang b/htdocs/langs/es_CL/suppliers.lang
similarity index 100%
rename from public/langs/es_CL/suppliers.lang
rename to htdocs/langs/es_CL/suppliers.lang
diff --git a/public/langs/es_CL/trips.lang b/htdocs/langs/es_CL/trips.lang
similarity index 100%
rename from public/langs/es_CL/trips.lang
rename to htdocs/langs/es_CL/trips.lang
diff --git a/public/langs/es_CL/users.lang b/htdocs/langs/es_CL/users.lang
similarity index 100%
rename from public/langs/es_CL/users.lang
rename to htdocs/langs/es_CL/users.lang
diff --git a/public/langs/es_CL/website.lang b/htdocs/langs/es_CL/website.lang
similarity index 100%
rename from public/langs/es_CL/website.lang
rename to htdocs/langs/es_CL/website.lang
diff --git a/public/langs/es_CL/withdrawals.lang b/htdocs/langs/es_CL/withdrawals.lang
similarity index 100%
rename from public/langs/es_CL/withdrawals.lang
rename to htdocs/langs/es_CL/withdrawals.lang
diff --git a/public/langs/es_CL/workflow.lang b/htdocs/langs/es_CL/workflow.lang
similarity index 100%
rename from public/langs/es_CL/workflow.lang
rename to htdocs/langs/es_CL/workflow.lang
diff --git a/public/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
similarity index 100%
rename from public/langs/es_CO/accountancy.lang
rename to htdocs/langs/es_CO/accountancy.lang
diff --git a/public/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
similarity index 100%
rename from public/langs/es_CO/admin.lang
rename to htdocs/langs/es_CO/admin.lang
diff --git a/public/langs/es_CO/agenda.lang b/htdocs/langs/es_CO/agenda.lang
similarity index 100%
rename from public/langs/es_CO/agenda.lang
rename to htdocs/langs/es_CO/agenda.lang
diff --git a/public/langs/es_CO/banks.lang b/htdocs/langs/es_CO/banks.lang
similarity index 100%
rename from public/langs/es_CO/banks.lang
rename to htdocs/langs/es_CO/banks.lang
diff --git a/public/langs/es_CO/bills.lang b/htdocs/langs/es_CO/bills.lang
similarity index 100%
rename from public/langs/es_CO/bills.lang
rename to htdocs/langs/es_CO/bills.lang
diff --git a/public/langs/es_CO/bookmarks.lang b/htdocs/langs/es_CO/bookmarks.lang
similarity index 100%
rename from public/langs/es_CO/bookmarks.lang
rename to htdocs/langs/es_CO/bookmarks.lang
diff --git a/public/langs/es_CO/boxes.lang b/htdocs/langs/es_CO/boxes.lang
similarity index 100%
rename from public/langs/es_CO/boxes.lang
rename to htdocs/langs/es_CO/boxes.lang
diff --git a/public/langs/es_CO/cashdesk.lang b/htdocs/langs/es_CO/cashdesk.lang
similarity index 100%
rename from public/langs/es_CO/cashdesk.lang
rename to htdocs/langs/es_CO/cashdesk.lang
diff --git a/public/langs/es_CO/categories.lang b/htdocs/langs/es_CO/categories.lang
similarity index 100%
rename from public/langs/es_CO/categories.lang
rename to htdocs/langs/es_CO/categories.lang
diff --git a/public/langs/es_CO/commercial.lang b/htdocs/langs/es_CO/commercial.lang
similarity index 100%
rename from public/langs/es_CO/commercial.lang
rename to htdocs/langs/es_CO/commercial.lang
diff --git a/public/langs/es_CO/companies.lang b/htdocs/langs/es_CO/companies.lang
similarity index 100%
rename from public/langs/es_CO/companies.lang
rename to htdocs/langs/es_CO/companies.lang
diff --git a/public/langs/es_CO/compta.lang b/htdocs/langs/es_CO/compta.lang
similarity index 100%
rename from public/langs/es_CO/compta.lang
rename to htdocs/langs/es_CO/compta.lang
diff --git a/public/langs/es_CO/contracts.lang b/htdocs/langs/es_CO/contracts.lang
similarity index 100%
rename from public/langs/es_CO/contracts.lang
rename to htdocs/langs/es_CO/contracts.lang
diff --git a/public/langs/es_CO/cron.lang b/htdocs/langs/es_CO/cron.lang
similarity index 100%
rename from public/langs/es_CO/cron.lang
rename to htdocs/langs/es_CO/cron.lang
diff --git a/public/langs/es_CO/deliveries.lang b/htdocs/langs/es_CO/deliveries.lang
similarity index 100%
rename from public/langs/es_CO/deliveries.lang
rename to htdocs/langs/es_CO/deliveries.lang
diff --git a/public/langs/es_CO/dict.lang b/htdocs/langs/es_CO/dict.lang
similarity index 100%
rename from public/langs/es_CO/dict.lang
rename to htdocs/langs/es_CO/dict.lang
diff --git a/public/langs/es_CO/donations.lang b/htdocs/langs/es_CO/donations.lang
similarity index 100%
rename from public/langs/es_CO/donations.lang
rename to htdocs/langs/es_CO/donations.lang
diff --git a/public/langs/es_CO/ecm.lang b/htdocs/langs/es_CO/ecm.lang
similarity index 100%
rename from public/langs/es_CO/ecm.lang
rename to htdocs/langs/es_CO/ecm.lang
diff --git a/public/langs/es_CO/errors.lang b/htdocs/langs/es_CO/errors.lang
similarity index 100%
rename from public/langs/es_CO/errors.lang
rename to htdocs/langs/es_CO/errors.lang
diff --git a/public/langs/es_CO/exports.lang b/htdocs/langs/es_CO/exports.lang
similarity index 100%
rename from public/langs/es_CO/exports.lang
rename to htdocs/langs/es_CO/exports.lang
diff --git a/public/langs/es_CO/externalsite.lang b/htdocs/langs/es_CO/externalsite.lang
similarity index 100%
rename from public/langs/es_CO/externalsite.lang
rename to htdocs/langs/es_CO/externalsite.lang
diff --git a/public/langs/es_CO/ftp.lang b/htdocs/langs/es_CO/ftp.lang
similarity index 100%
rename from public/langs/es_CO/ftp.lang
rename to htdocs/langs/es_CO/ftp.lang
diff --git a/public/langs/es_CO/help.lang b/htdocs/langs/es_CO/help.lang
similarity index 100%
rename from public/langs/es_CO/help.lang
rename to htdocs/langs/es_CO/help.lang
diff --git a/public/langs/es_CO/holiday.lang b/htdocs/langs/es_CO/holiday.lang
similarity index 100%
rename from public/langs/es_CO/holiday.lang
rename to htdocs/langs/es_CO/holiday.lang
diff --git a/public/langs/es_CO/hrm.lang b/htdocs/langs/es_CO/hrm.lang
similarity index 100%
rename from public/langs/es_CO/hrm.lang
rename to htdocs/langs/es_CO/hrm.lang
diff --git a/public/langs/es_CO/incoterm.lang b/htdocs/langs/es_CO/incoterm.lang
similarity index 100%
rename from public/langs/es_CO/incoterm.lang
rename to htdocs/langs/es_CO/incoterm.lang
diff --git a/public/langs/es_CO/install.lang b/htdocs/langs/es_CO/install.lang
similarity index 100%
rename from public/langs/es_CO/install.lang
rename to htdocs/langs/es_CO/install.lang
diff --git a/public/langs/es_CO/interventions.lang b/htdocs/langs/es_CO/interventions.lang
similarity index 100%
rename from public/langs/es_CO/interventions.lang
rename to htdocs/langs/es_CO/interventions.lang
diff --git a/public/langs/es_CO/languages.lang b/htdocs/langs/es_CO/languages.lang
similarity index 100%
rename from public/langs/es_CO/languages.lang
rename to htdocs/langs/es_CO/languages.lang
diff --git a/public/langs/es_CO/ldap.lang b/htdocs/langs/es_CO/ldap.lang
similarity index 100%
rename from public/langs/es_CO/ldap.lang
rename to htdocs/langs/es_CO/ldap.lang
diff --git a/public/langs/es_CO/link.lang b/htdocs/langs/es_CO/link.lang
similarity index 100%
rename from public/langs/es_CO/link.lang
rename to htdocs/langs/es_CO/link.lang
diff --git a/public/langs/es_CO/loan.lang b/htdocs/langs/es_CO/loan.lang
similarity index 100%
rename from public/langs/es_CO/loan.lang
rename to htdocs/langs/es_CO/loan.lang
diff --git a/public/langs/es_CO/mailmanspip.lang b/htdocs/langs/es_CO/mailmanspip.lang
similarity index 100%
rename from public/langs/es_CO/mailmanspip.lang
rename to htdocs/langs/es_CO/mailmanspip.lang
diff --git a/public/langs/es_CO/mails.lang b/htdocs/langs/es_CO/mails.lang
similarity index 100%
rename from public/langs/es_CO/mails.lang
rename to htdocs/langs/es_CO/mails.lang
diff --git a/public/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
similarity index 100%
rename from public/langs/es_CO/main.lang
rename to htdocs/langs/es_CO/main.lang
diff --git a/public/langs/es_CO/margins.lang b/htdocs/langs/es_CO/margins.lang
similarity index 100%
rename from public/langs/es_CO/margins.lang
rename to htdocs/langs/es_CO/margins.lang
diff --git a/public/langs/es_CO/members.lang b/htdocs/langs/es_CO/members.lang
similarity index 100%
rename from public/langs/es_CO/members.lang
rename to htdocs/langs/es_CO/members.lang
diff --git a/public/langs/es_CO/oauth.lang b/htdocs/langs/es_CO/oauth.lang
similarity index 100%
rename from public/langs/es_CO/oauth.lang
rename to htdocs/langs/es_CO/oauth.lang
diff --git a/public/langs/es_CO/opensurvey.lang b/htdocs/langs/es_CO/opensurvey.lang
similarity index 100%
rename from public/langs/es_CO/opensurvey.lang
rename to htdocs/langs/es_CO/opensurvey.lang
diff --git a/public/langs/es_CO/orders.lang b/htdocs/langs/es_CO/orders.lang
similarity index 100%
rename from public/langs/es_CO/orders.lang
rename to htdocs/langs/es_CO/orders.lang
diff --git a/public/langs/es_CO/other.lang b/htdocs/langs/es_CO/other.lang
similarity index 100%
rename from public/langs/es_CO/other.lang
rename to htdocs/langs/es_CO/other.lang
diff --git a/public/langs/es_CO/paybox.lang b/htdocs/langs/es_CO/paybox.lang
similarity index 100%
rename from public/langs/es_CO/paybox.lang
rename to htdocs/langs/es_CO/paybox.lang
diff --git a/public/langs/es_CO/paypal.lang b/htdocs/langs/es_CO/paypal.lang
similarity index 100%
rename from public/langs/es_CO/paypal.lang
rename to htdocs/langs/es_CO/paypal.lang
diff --git a/public/langs/es_CO/printing.lang b/htdocs/langs/es_CO/printing.lang
similarity index 100%
rename from public/langs/es_CO/printing.lang
rename to htdocs/langs/es_CO/printing.lang
diff --git a/public/langs/es_CO/productbatch.lang b/htdocs/langs/es_CO/productbatch.lang
similarity index 100%
rename from public/langs/es_CO/productbatch.lang
rename to htdocs/langs/es_CO/productbatch.lang
diff --git a/public/langs/es_CO/products.lang b/htdocs/langs/es_CO/products.lang
similarity index 100%
rename from public/langs/es_CO/products.lang
rename to htdocs/langs/es_CO/products.lang
diff --git a/public/langs/es_CO/projects.lang b/htdocs/langs/es_CO/projects.lang
similarity index 100%
rename from public/langs/es_CO/projects.lang
rename to htdocs/langs/es_CO/projects.lang
diff --git a/public/langs/es_CO/propal.lang b/htdocs/langs/es_CO/propal.lang
similarity index 100%
rename from public/langs/es_CO/propal.lang
rename to htdocs/langs/es_CO/propal.lang
diff --git a/public/langs/es_CO/receiptprinter.lang b/htdocs/langs/es_CO/receiptprinter.lang
similarity index 100%
rename from public/langs/es_CO/receiptprinter.lang
rename to htdocs/langs/es_CO/receiptprinter.lang
diff --git a/public/langs/es_CO/resource.lang b/htdocs/langs/es_CO/resource.lang
similarity index 100%
rename from public/langs/es_CO/resource.lang
rename to htdocs/langs/es_CO/resource.lang
diff --git a/public/langs/es_CO/salaries.lang b/htdocs/langs/es_CO/salaries.lang
similarity index 100%
rename from public/langs/es_CO/salaries.lang
rename to htdocs/langs/es_CO/salaries.lang
diff --git a/public/langs/es_CO/sendings.lang b/htdocs/langs/es_CO/sendings.lang
similarity index 100%
rename from public/langs/es_CO/sendings.lang
rename to htdocs/langs/es_CO/sendings.lang
diff --git a/public/langs/es_CO/sms.lang b/htdocs/langs/es_CO/sms.lang
similarity index 100%
rename from public/langs/es_CO/sms.lang
rename to htdocs/langs/es_CO/sms.lang
diff --git a/public/langs/es_CO/stocks.lang b/htdocs/langs/es_CO/stocks.lang
similarity index 100%
rename from public/langs/es_CO/stocks.lang
rename to htdocs/langs/es_CO/stocks.lang
diff --git a/public/langs/es_CO/supplier_proposal.lang b/htdocs/langs/es_CO/supplier_proposal.lang
similarity index 100%
rename from public/langs/es_CO/supplier_proposal.lang
rename to htdocs/langs/es_CO/supplier_proposal.lang
diff --git a/public/langs/es_CO/suppliers.lang b/htdocs/langs/es_CO/suppliers.lang
similarity index 100%
rename from public/langs/es_CO/suppliers.lang
rename to htdocs/langs/es_CO/suppliers.lang
diff --git a/public/langs/es_CO/trips.lang b/htdocs/langs/es_CO/trips.lang
similarity index 100%
rename from public/langs/es_CO/trips.lang
rename to htdocs/langs/es_CO/trips.lang
diff --git a/public/langs/es_CO/users.lang b/htdocs/langs/es_CO/users.lang
similarity index 100%
rename from public/langs/es_CO/users.lang
rename to htdocs/langs/es_CO/users.lang
diff --git a/public/langs/es_CO/website.lang b/htdocs/langs/es_CO/website.lang
similarity index 100%
rename from public/langs/es_CO/website.lang
rename to htdocs/langs/es_CO/website.lang
diff --git a/public/langs/es_CO/withdrawals.lang b/htdocs/langs/es_CO/withdrawals.lang
similarity index 100%
rename from public/langs/es_CO/withdrawals.lang
rename to htdocs/langs/es_CO/withdrawals.lang
diff --git a/public/langs/es_CO/workflow.lang b/htdocs/langs/es_CO/workflow.lang
similarity index 100%
rename from public/langs/es_CO/workflow.lang
rename to htdocs/langs/es_CO/workflow.lang
diff --git a/public/langs/es_DO/accountancy.lang b/htdocs/langs/es_DO/accountancy.lang
similarity index 100%
rename from public/langs/es_DO/accountancy.lang
rename to htdocs/langs/es_DO/accountancy.lang
diff --git a/public/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
similarity index 100%
rename from public/langs/es_DO/admin.lang
rename to htdocs/langs/es_DO/admin.lang
diff --git a/public/langs/es_DO/agenda.lang b/htdocs/langs/es_DO/agenda.lang
similarity index 100%
rename from public/langs/es_DO/agenda.lang
rename to htdocs/langs/es_DO/agenda.lang
diff --git a/public/langs/es_DO/banks.lang b/htdocs/langs/es_DO/banks.lang
similarity index 100%
rename from public/langs/es_DO/banks.lang
rename to htdocs/langs/es_DO/banks.lang
diff --git a/public/langs/es_DO/bills.lang b/htdocs/langs/es_DO/bills.lang
similarity index 100%
rename from public/langs/es_DO/bills.lang
rename to htdocs/langs/es_DO/bills.lang
diff --git a/public/langs/es_DO/bookmarks.lang b/htdocs/langs/es_DO/bookmarks.lang
similarity index 100%
rename from public/langs/es_DO/bookmarks.lang
rename to htdocs/langs/es_DO/bookmarks.lang
diff --git a/public/langs/es_DO/boxes.lang b/htdocs/langs/es_DO/boxes.lang
similarity index 100%
rename from public/langs/es_DO/boxes.lang
rename to htdocs/langs/es_DO/boxes.lang
diff --git a/public/langs/es_DO/cashdesk.lang b/htdocs/langs/es_DO/cashdesk.lang
similarity index 100%
rename from public/langs/es_DO/cashdesk.lang
rename to htdocs/langs/es_DO/cashdesk.lang
diff --git a/public/langs/es_DO/categories.lang b/htdocs/langs/es_DO/categories.lang
similarity index 100%
rename from public/langs/es_DO/categories.lang
rename to htdocs/langs/es_DO/categories.lang
diff --git a/public/langs/es_DO/commercial.lang b/htdocs/langs/es_DO/commercial.lang
similarity index 100%
rename from public/langs/es_DO/commercial.lang
rename to htdocs/langs/es_DO/commercial.lang
diff --git a/public/langs/es_DO/companies.lang b/htdocs/langs/es_DO/companies.lang
similarity index 100%
rename from public/langs/es_DO/companies.lang
rename to htdocs/langs/es_DO/companies.lang
diff --git a/public/langs/es_DO/compta.lang b/htdocs/langs/es_DO/compta.lang
similarity index 100%
rename from public/langs/es_DO/compta.lang
rename to htdocs/langs/es_DO/compta.lang
diff --git a/public/langs/es_DO/contracts.lang b/htdocs/langs/es_DO/contracts.lang
similarity index 100%
rename from public/langs/es_DO/contracts.lang
rename to htdocs/langs/es_DO/contracts.lang
diff --git a/public/langs/es_DO/cron.lang b/htdocs/langs/es_DO/cron.lang
similarity index 100%
rename from public/langs/es_DO/cron.lang
rename to htdocs/langs/es_DO/cron.lang
diff --git a/public/langs/es_DO/deliveries.lang b/htdocs/langs/es_DO/deliveries.lang
similarity index 100%
rename from public/langs/es_DO/deliveries.lang
rename to htdocs/langs/es_DO/deliveries.lang
diff --git a/public/langs/es_DO/dict.lang b/htdocs/langs/es_DO/dict.lang
similarity index 100%
rename from public/langs/es_DO/dict.lang
rename to htdocs/langs/es_DO/dict.lang
diff --git a/public/langs/es_DO/donations.lang b/htdocs/langs/es_DO/donations.lang
similarity index 100%
rename from public/langs/es_DO/donations.lang
rename to htdocs/langs/es_DO/donations.lang
diff --git a/public/langs/es_DO/ecm.lang b/htdocs/langs/es_DO/ecm.lang
similarity index 100%
rename from public/langs/es_DO/ecm.lang
rename to htdocs/langs/es_DO/ecm.lang
diff --git a/public/langs/es_DO/errors.lang b/htdocs/langs/es_DO/errors.lang
similarity index 100%
rename from public/langs/es_DO/errors.lang
rename to htdocs/langs/es_DO/errors.lang
diff --git a/public/langs/es_DO/exports.lang b/htdocs/langs/es_DO/exports.lang
similarity index 100%
rename from public/langs/es_DO/exports.lang
rename to htdocs/langs/es_DO/exports.lang
diff --git a/public/langs/es_DO/externalsite.lang b/htdocs/langs/es_DO/externalsite.lang
similarity index 100%
rename from public/langs/es_DO/externalsite.lang
rename to htdocs/langs/es_DO/externalsite.lang
diff --git a/public/langs/es_DO/ftp.lang b/htdocs/langs/es_DO/ftp.lang
similarity index 100%
rename from public/langs/es_DO/ftp.lang
rename to htdocs/langs/es_DO/ftp.lang
diff --git a/public/langs/es_DO/help.lang b/htdocs/langs/es_DO/help.lang
similarity index 100%
rename from public/langs/es_DO/help.lang
rename to htdocs/langs/es_DO/help.lang
diff --git a/public/langs/es_DO/holiday.lang b/htdocs/langs/es_DO/holiday.lang
similarity index 100%
rename from public/langs/es_DO/holiday.lang
rename to htdocs/langs/es_DO/holiday.lang
diff --git a/public/langs/es_DO/hrm.lang b/htdocs/langs/es_DO/hrm.lang
similarity index 100%
rename from public/langs/es_DO/hrm.lang
rename to htdocs/langs/es_DO/hrm.lang
diff --git a/public/langs/es_DO/incoterm.lang b/htdocs/langs/es_DO/incoterm.lang
similarity index 100%
rename from public/langs/es_DO/incoterm.lang
rename to htdocs/langs/es_DO/incoterm.lang
diff --git a/public/langs/es_DO/install.lang b/htdocs/langs/es_DO/install.lang
similarity index 100%
rename from public/langs/es_DO/install.lang
rename to htdocs/langs/es_DO/install.lang
diff --git a/public/langs/es_DO/interventions.lang b/htdocs/langs/es_DO/interventions.lang
similarity index 100%
rename from public/langs/es_DO/interventions.lang
rename to htdocs/langs/es_DO/interventions.lang
diff --git a/public/langs/es_DO/languages.lang b/htdocs/langs/es_DO/languages.lang
similarity index 100%
rename from public/langs/es_DO/languages.lang
rename to htdocs/langs/es_DO/languages.lang
diff --git a/public/langs/es_DO/ldap.lang b/htdocs/langs/es_DO/ldap.lang
similarity index 100%
rename from public/langs/es_DO/ldap.lang
rename to htdocs/langs/es_DO/ldap.lang
diff --git a/public/langs/es_DO/link.lang b/htdocs/langs/es_DO/link.lang
similarity index 100%
rename from public/langs/es_DO/link.lang
rename to htdocs/langs/es_DO/link.lang
diff --git a/public/langs/es_DO/loan.lang b/htdocs/langs/es_DO/loan.lang
similarity index 100%
rename from public/langs/es_DO/loan.lang
rename to htdocs/langs/es_DO/loan.lang
diff --git a/public/langs/es_DO/mailmanspip.lang b/htdocs/langs/es_DO/mailmanspip.lang
similarity index 100%
rename from public/langs/es_DO/mailmanspip.lang
rename to htdocs/langs/es_DO/mailmanspip.lang
diff --git a/public/langs/es_DO/mails.lang b/htdocs/langs/es_DO/mails.lang
similarity index 100%
rename from public/langs/es_DO/mails.lang
rename to htdocs/langs/es_DO/mails.lang
diff --git a/public/langs/es_DO/main.lang b/htdocs/langs/es_DO/main.lang
similarity index 100%
rename from public/langs/es_DO/main.lang
rename to htdocs/langs/es_DO/main.lang
diff --git a/public/langs/es_DO/margins.lang b/htdocs/langs/es_DO/margins.lang
similarity index 100%
rename from public/langs/es_DO/margins.lang
rename to htdocs/langs/es_DO/margins.lang
diff --git a/public/langs/es_DO/members.lang b/htdocs/langs/es_DO/members.lang
similarity index 100%
rename from public/langs/es_DO/members.lang
rename to htdocs/langs/es_DO/members.lang
diff --git a/public/langs/es_DO/oauth.lang b/htdocs/langs/es_DO/oauth.lang
similarity index 100%
rename from public/langs/es_DO/oauth.lang
rename to htdocs/langs/es_DO/oauth.lang
diff --git a/public/langs/es_DO/opensurvey.lang b/htdocs/langs/es_DO/opensurvey.lang
similarity index 100%
rename from public/langs/es_DO/opensurvey.lang
rename to htdocs/langs/es_DO/opensurvey.lang
diff --git a/public/langs/es_DO/orders.lang b/htdocs/langs/es_DO/orders.lang
similarity index 100%
rename from public/langs/es_DO/orders.lang
rename to htdocs/langs/es_DO/orders.lang
diff --git a/public/langs/es_DO/other.lang b/htdocs/langs/es_DO/other.lang
similarity index 100%
rename from public/langs/es_DO/other.lang
rename to htdocs/langs/es_DO/other.lang
diff --git a/public/langs/es_DO/paybox.lang b/htdocs/langs/es_DO/paybox.lang
similarity index 100%
rename from public/langs/es_DO/paybox.lang
rename to htdocs/langs/es_DO/paybox.lang
diff --git a/public/langs/es_DO/paypal.lang b/htdocs/langs/es_DO/paypal.lang
similarity index 100%
rename from public/langs/es_DO/paypal.lang
rename to htdocs/langs/es_DO/paypal.lang
diff --git a/public/langs/es_DO/printing.lang b/htdocs/langs/es_DO/printing.lang
similarity index 100%
rename from public/langs/es_DO/printing.lang
rename to htdocs/langs/es_DO/printing.lang
diff --git a/public/langs/es_DO/productbatch.lang b/htdocs/langs/es_DO/productbatch.lang
similarity index 100%
rename from public/langs/es_DO/productbatch.lang
rename to htdocs/langs/es_DO/productbatch.lang
diff --git a/public/langs/es_DO/products.lang b/htdocs/langs/es_DO/products.lang
similarity index 100%
rename from public/langs/es_DO/products.lang
rename to htdocs/langs/es_DO/products.lang
diff --git a/public/langs/es_DO/projects.lang b/htdocs/langs/es_DO/projects.lang
similarity index 100%
rename from public/langs/es_DO/projects.lang
rename to htdocs/langs/es_DO/projects.lang
diff --git a/public/langs/es_DO/propal.lang b/htdocs/langs/es_DO/propal.lang
similarity index 100%
rename from public/langs/es_DO/propal.lang
rename to htdocs/langs/es_DO/propal.lang
diff --git a/public/langs/es_DO/receiptprinter.lang b/htdocs/langs/es_DO/receiptprinter.lang
similarity index 100%
rename from public/langs/es_DO/receiptprinter.lang
rename to htdocs/langs/es_DO/receiptprinter.lang
diff --git a/public/langs/es_DO/resource.lang b/htdocs/langs/es_DO/resource.lang
similarity index 100%
rename from public/langs/es_DO/resource.lang
rename to htdocs/langs/es_DO/resource.lang
diff --git a/public/langs/es_DO/salaries.lang b/htdocs/langs/es_DO/salaries.lang
similarity index 100%
rename from public/langs/es_DO/salaries.lang
rename to htdocs/langs/es_DO/salaries.lang
diff --git a/public/langs/es_DO/sendings.lang b/htdocs/langs/es_DO/sendings.lang
similarity index 100%
rename from public/langs/es_DO/sendings.lang
rename to htdocs/langs/es_DO/sendings.lang
diff --git a/public/langs/es_DO/sms.lang b/htdocs/langs/es_DO/sms.lang
similarity index 100%
rename from public/langs/es_DO/sms.lang
rename to htdocs/langs/es_DO/sms.lang
diff --git a/public/langs/es_DO/stocks.lang b/htdocs/langs/es_DO/stocks.lang
similarity index 100%
rename from public/langs/es_DO/stocks.lang
rename to htdocs/langs/es_DO/stocks.lang
diff --git a/public/langs/es_DO/supplier_proposal.lang b/htdocs/langs/es_DO/supplier_proposal.lang
similarity index 100%
rename from public/langs/es_DO/supplier_proposal.lang
rename to htdocs/langs/es_DO/supplier_proposal.lang
diff --git a/public/langs/es_DO/suppliers.lang b/htdocs/langs/es_DO/suppliers.lang
similarity index 100%
rename from public/langs/es_DO/suppliers.lang
rename to htdocs/langs/es_DO/suppliers.lang
diff --git a/public/langs/es_DO/trips.lang b/htdocs/langs/es_DO/trips.lang
similarity index 100%
rename from public/langs/es_DO/trips.lang
rename to htdocs/langs/es_DO/trips.lang
diff --git a/public/langs/es_DO/users.lang b/htdocs/langs/es_DO/users.lang
similarity index 100%
rename from public/langs/es_DO/users.lang
rename to htdocs/langs/es_DO/users.lang
diff --git a/public/langs/es_DO/website.lang b/htdocs/langs/es_DO/website.lang
similarity index 100%
rename from public/langs/es_DO/website.lang
rename to htdocs/langs/es_DO/website.lang
diff --git a/public/langs/es_DO/withdrawals.lang b/htdocs/langs/es_DO/withdrawals.lang
similarity index 100%
rename from public/langs/es_DO/withdrawals.lang
rename to htdocs/langs/es_DO/withdrawals.lang
diff --git a/public/langs/es_DO/workflow.lang b/htdocs/langs/es_DO/workflow.lang
similarity index 100%
rename from public/langs/es_DO/workflow.lang
rename to htdocs/langs/es_DO/workflow.lang
diff --git a/public/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
similarity index 100%
rename from public/langs/es_EC/accountancy.lang
rename to htdocs/langs/es_EC/accountancy.lang
diff --git a/public/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
similarity index 100%
rename from public/langs/es_EC/admin.lang
rename to htdocs/langs/es_EC/admin.lang
diff --git a/public/langs/es_EC/agenda.lang b/htdocs/langs/es_EC/agenda.lang
similarity index 100%
rename from public/langs/es_EC/agenda.lang
rename to htdocs/langs/es_EC/agenda.lang
diff --git a/public/langs/es_EC/banks.lang b/htdocs/langs/es_EC/banks.lang
similarity index 100%
rename from public/langs/es_EC/banks.lang
rename to htdocs/langs/es_EC/banks.lang
diff --git a/public/langs/es_EC/bills.lang b/htdocs/langs/es_EC/bills.lang
similarity index 100%
rename from public/langs/es_EC/bills.lang
rename to htdocs/langs/es_EC/bills.lang
diff --git a/public/langs/es_EC/bookmarks.lang b/htdocs/langs/es_EC/bookmarks.lang
similarity index 100%
rename from public/langs/es_EC/bookmarks.lang
rename to htdocs/langs/es_EC/bookmarks.lang
diff --git a/public/langs/es_EC/boxes.lang b/htdocs/langs/es_EC/boxes.lang
similarity index 100%
rename from public/langs/es_EC/boxes.lang
rename to htdocs/langs/es_EC/boxes.lang
diff --git a/public/langs/es_EC/cashdesk.lang b/htdocs/langs/es_EC/cashdesk.lang
similarity index 100%
rename from public/langs/es_EC/cashdesk.lang
rename to htdocs/langs/es_EC/cashdesk.lang
diff --git a/public/langs/es_EC/categories.lang b/htdocs/langs/es_EC/categories.lang
similarity index 100%
rename from public/langs/es_EC/categories.lang
rename to htdocs/langs/es_EC/categories.lang
diff --git a/public/langs/es_EC/commercial.lang b/htdocs/langs/es_EC/commercial.lang
similarity index 100%
rename from public/langs/es_EC/commercial.lang
rename to htdocs/langs/es_EC/commercial.lang
diff --git a/public/langs/es_EC/companies.lang b/htdocs/langs/es_EC/companies.lang
similarity index 100%
rename from public/langs/es_EC/companies.lang
rename to htdocs/langs/es_EC/companies.lang
diff --git a/public/langs/es_EC/compta.lang b/htdocs/langs/es_EC/compta.lang
similarity index 100%
rename from public/langs/es_EC/compta.lang
rename to htdocs/langs/es_EC/compta.lang
diff --git a/public/langs/es_EC/contracts.lang b/htdocs/langs/es_EC/contracts.lang
similarity index 100%
rename from public/langs/es_EC/contracts.lang
rename to htdocs/langs/es_EC/contracts.lang
diff --git a/public/langs/es_EC/cron.lang b/htdocs/langs/es_EC/cron.lang
similarity index 100%
rename from public/langs/es_EC/cron.lang
rename to htdocs/langs/es_EC/cron.lang
diff --git a/public/langs/es_EC/deliveries.lang b/htdocs/langs/es_EC/deliveries.lang
similarity index 100%
rename from public/langs/es_EC/deliveries.lang
rename to htdocs/langs/es_EC/deliveries.lang
diff --git a/public/langs/es_EC/dict.lang b/htdocs/langs/es_EC/dict.lang
similarity index 100%
rename from public/langs/es_EC/dict.lang
rename to htdocs/langs/es_EC/dict.lang
diff --git a/public/langs/es_EC/donations.lang b/htdocs/langs/es_EC/donations.lang
similarity index 100%
rename from public/langs/es_EC/donations.lang
rename to htdocs/langs/es_EC/donations.lang
diff --git a/public/langs/es_EC/ecm.lang b/htdocs/langs/es_EC/ecm.lang
similarity index 100%
rename from public/langs/es_EC/ecm.lang
rename to htdocs/langs/es_EC/ecm.lang
diff --git a/public/langs/es_EC/errors.lang b/htdocs/langs/es_EC/errors.lang
similarity index 100%
rename from public/langs/es_EC/errors.lang
rename to htdocs/langs/es_EC/errors.lang
diff --git a/public/langs/es_EC/exports.lang b/htdocs/langs/es_EC/exports.lang
similarity index 100%
rename from public/langs/es_EC/exports.lang
rename to htdocs/langs/es_EC/exports.lang
diff --git a/public/langs/es_EC/externalsite.lang b/htdocs/langs/es_EC/externalsite.lang
similarity index 100%
rename from public/langs/es_EC/externalsite.lang
rename to htdocs/langs/es_EC/externalsite.lang
diff --git a/public/langs/es_EC/ftp.lang b/htdocs/langs/es_EC/ftp.lang
similarity index 100%
rename from public/langs/es_EC/ftp.lang
rename to htdocs/langs/es_EC/ftp.lang
diff --git a/public/langs/es_EC/help.lang b/htdocs/langs/es_EC/help.lang
similarity index 100%
rename from public/langs/es_EC/help.lang
rename to htdocs/langs/es_EC/help.lang
diff --git a/public/langs/es_EC/holiday.lang b/htdocs/langs/es_EC/holiday.lang
similarity index 100%
rename from public/langs/es_EC/holiday.lang
rename to htdocs/langs/es_EC/holiday.lang
diff --git a/public/langs/es_EC/hrm.lang b/htdocs/langs/es_EC/hrm.lang
similarity index 100%
rename from public/langs/es_EC/hrm.lang
rename to htdocs/langs/es_EC/hrm.lang
diff --git a/public/langs/es_EC/incoterm.lang b/htdocs/langs/es_EC/incoterm.lang
similarity index 100%
rename from public/langs/es_EC/incoterm.lang
rename to htdocs/langs/es_EC/incoterm.lang
diff --git a/public/langs/es_EC/install.lang b/htdocs/langs/es_EC/install.lang
similarity index 100%
rename from public/langs/es_EC/install.lang
rename to htdocs/langs/es_EC/install.lang
diff --git a/public/langs/es_EC/interventions.lang b/htdocs/langs/es_EC/interventions.lang
similarity index 100%
rename from public/langs/es_EC/interventions.lang
rename to htdocs/langs/es_EC/interventions.lang
diff --git a/public/langs/es_EC/languages.lang b/htdocs/langs/es_EC/languages.lang
similarity index 100%
rename from public/langs/es_EC/languages.lang
rename to htdocs/langs/es_EC/languages.lang
diff --git a/public/langs/es_EC/ldap.lang b/htdocs/langs/es_EC/ldap.lang
similarity index 100%
rename from public/langs/es_EC/ldap.lang
rename to htdocs/langs/es_EC/ldap.lang
diff --git a/public/langs/es_EC/link.lang b/htdocs/langs/es_EC/link.lang
similarity index 100%
rename from public/langs/es_EC/link.lang
rename to htdocs/langs/es_EC/link.lang
diff --git a/public/langs/es_EC/loan.lang b/htdocs/langs/es_EC/loan.lang
similarity index 100%
rename from public/langs/es_EC/loan.lang
rename to htdocs/langs/es_EC/loan.lang
diff --git a/public/langs/es_EC/mailmanspip.lang b/htdocs/langs/es_EC/mailmanspip.lang
similarity index 100%
rename from public/langs/es_EC/mailmanspip.lang
rename to htdocs/langs/es_EC/mailmanspip.lang
diff --git a/public/langs/es_EC/mails.lang b/htdocs/langs/es_EC/mails.lang
similarity index 100%
rename from public/langs/es_EC/mails.lang
rename to htdocs/langs/es_EC/mails.lang
diff --git a/public/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
similarity index 100%
rename from public/langs/es_EC/main.lang
rename to htdocs/langs/es_EC/main.lang
diff --git a/public/langs/es_EC/margins.lang b/htdocs/langs/es_EC/margins.lang
similarity index 100%
rename from public/langs/es_EC/margins.lang
rename to htdocs/langs/es_EC/margins.lang
diff --git a/public/langs/es_EC/members.lang b/htdocs/langs/es_EC/members.lang
similarity index 100%
rename from public/langs/es_EC/members.lang
rename to htdocs/langs/es_EC/members.lang
diff --git a/public/langs/es_EC/oauth.lang b/htdocs/langs/es_EC/oauth.lang
similarity index 100%
rename from public/langs/es_EC/oauth.lang
rename to htdocs/langs/es_EC/oauth.lang
diff --git a/public/langs/es_EC/opensurvey.lang b/htdocs/langs/es_EC/opensurvey.lang
similarity index 100%
rename from public/langs/es_EC/opensurvey.lang
rename to htdocs/langs/es_EC/opensurvey.lang
diff --git a/public/langs/es_EC/orders.lang b/htdocs/langs/es_EC/orders.lang
similarity index 100%
rename from public/langs/es_EC/orders.lang
rename to htdocs/langs/es_EC/orders.lang
diff --git a/public/langs/es_EC/other.lang b/htdocs/langs/es_EC/other.lang
similarity index 100%
rename from public/langs/es_EC/other.lang
rename to htdocs/langs/es_EC/other.lang
diff --git a/public/langs/es_EC/paybox.lang b/htdocs/langs/es_EC/paybox.lang
similarity index 100%
rename from public/langs/es_EC/paybox.lang
rename to htdocs/langs/es_EC/paybox.lang
diff --git a/public/langs/es_EC/paypal.lang b/htdocs/langs/es_EC/paypal.lang
similarity index 100%
rename from public/langs/es_EC/paypal.lang
rename to htdocs/langs/es_EC/paypal.lang
diff --git a/public/langs/es_EC/printing.lang b/htdocs/langs/es_EC/printing.lang
similarity index 100%
rename from public/langs/es_EC/printing.lang
rename to htdocs/langs/es_EC/printing.lang
diff --git a/public/langs/es_EC/productbatch.lang b/htdocs/langs/es_EC/productbatch.lang
similarity index 100%
rename from public/langs/es_EC/productbatch.lang
rename to htdocs/langs/es_EC/productbatch.lang
diff --git a/public/langs/es_EC/products.lang b/htdocs/langs/es_EC/products.lang
similarity index 100%
rename from public/langs/es_EC/products.lang
rename to htdocs/langs/es_EC/products.lang
diff --git a/public/langs/es_EC/projects.lang b/htdocs/langs/es_EC/projects.lang
similarity index 100%
rename from public/langs/es_EC/projects.lang
rename to htdocs/langs/es_EC/projects.lang
diff --git a/public/langs/es_EC/propal.lang b/htdocs/langs/es_EC/propal.lang
similarity index 100%
rename from public/langs/es_EC/propal.lang
rename to htdocs/langs/es_EC/propal.lang
diff --git a/public/langs/es_EC/receiptprinter.lang b/htdocs/langs/es_EC/receiptprinter.lang
similarity index 100%
rename from public/langs/es_EC/receiptprinter.lang
rename to htdocs/langs/es_EC/receiptprinter.lang
diff --git a/public/langs/es_EC/resource.lang b/htdocs/langs/es_EC/resource.lang
similarity index 100%
rename from public/langs/es_EC/resource.lang
rename to htdocs/langs/es_EC/resource.lang
diff --git a/public/langs/es_EC/salaries.lang b/htdocs/langs/es_EC/salaries.lang
similarity index 100%
rename from public/langs/es_EC/salaries.lang
rename to htdocs/langs/es_EC/salaries.lang
diff --git a/public/langs/es_EC/sendings.lang b/htdocs/langs/es_EC/sendings.lang
similarity index 100%
rename from public/langs/es_EC/sendings.lang
rename to htdocs/langs/es_EC/sendings.lang
diff --git a/public/langs/es_EC/sms.lang b/htdocs/langs/es_EC/sms.lang
similarity index 100%
rename from public/langs/es_EC/sms.lang
rename to htdocs/langs/es_EC/sms.lang
diff --git a/public/langs/es_EC/stocks.lang b/htdocs/langs/es_EC/stocks.lang
similarity index 100%
rename from public/langs/es_EC/stocks.lang
rename to htdocs/langs/es_EC/stocks.lang
diff --git a/public/langs/es_EC/supplier_proposal.lang b/htdocs/langs/es_EC/supplier_proposal.lang
similarity index 100%
rename from public/langs/es_EC/supplier_proposal.lang
rename to htdocs/langs/es_EC/supplier_proposal.lang
diff --git a/public/langs/es_EC/suppliers.lang b/htdocs/langs/es_EC/suppliers.lang
similarity index 100%
rename from public/langs/es_EC/suppliers.lang
rename to htdocs/langs/es_EC/suppliers.lang
diff --git a/public/langs/es_EC/trips.lang b/htdocs/langs/es_EC/trips.lang
similarity index 100%
rename from public/langs/es_EC/trips.lang
rename to htdocs/langs/es_EC/trips.lang
diff --git a/public/langs/es_EC/users.lang b/htdocs/langs/es_EC/users.lang
similarity index 100%
rename from public/langs/es_EC/users.lang
rename to htdocs/langs/es_EC/users.lang
diff --git a/public/langs/es_EC/website.lang b/htdocs/langs/es_EC/website.lang
similarity index 100%
rename from public/langs/es_EC/website.lang
rename to htdocs/langs/es_EC/website.lang
diff --git a/public/langs/es_EC/withdrawals.lang b/htdocs/langs/es_EC/withdrawals.lang
similarity index 100%
rename from public/langs/es_EC/withdrawals.lang
rename to htdocs/langs/es_EC/withdrawals.lang
diff --git a/public/langs/es_EC/workflow.lang b/htdocs/langs/es_EC/workflow.lang
similarity index 100%
rename from public/langs/es_EC/workflow.lang
rename to htdocs/langs/es_EC/workflow.lang
diff --git a/public/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
similarity index 100%
rename from public/langs/es_ES/accountancy.lang
rename to htdocs/langs/es_ES/accountancy.lang
diff --git a/public/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
similarity index 100%
rename from public/langs/es_ES/admin.lang
rename to htdocs/langs/es_ES/admin.lang
diff --git a/public/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
similarity index 100%
rename from public/langs/es_ES/agenda.lang
rename to htdocs/langs/es_ES/agenda.lang
diff --git a/public/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
similarity index 100%
rename from public/langs/es_ES/banks.lang
rename to htdocs/langs/es_ES/banks.lang
diff --git a/public/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
similarity index 100%
rename from public/langs/es_ES/bills.lang
rename to htdocs/langs/es_ES/bills.lang
diff --git a/public/langs/es_ES/bookmarks.lang b/htdocs/langs/es_ES/bookmarks.lang
similarity index 100%
rename from public/langs/es_ES/bookmarks.lang
rename to htdocs/langs/es_ES/bookmarks.lang
diff --git a/public/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
similarity index 100%
rename from public/langs/es_ES/boxes.lang
rename to htdocs/langs/es_ES/boxes.lang
diff --git a/public/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
similarity index 100%
rename from public/langs/es_ES/cashdesk.lang
rename to htdocs/langs/es_ES/cashdesk.lang
diff --git a/public/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
similarity index 100%
rename from public/langs/es_ES/categories.lang
rename to htdocs/langs/es_ES/categories.lang
diff --git a/public/langs/es_ES/commercial.lang b/htdocs/langs/es_ES/commercial.lang
similarity index 100%
rename from public/langs/es_ES/commercial.lang
rename to htdocs/langs/es_ES/commercial.lang
diff --git a/public/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
similarity index 100%
rename from public/langs/es_ES/companies.lang
rename to htdocs/langs/es_ES/companies.lang
diff --git a/public/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
similarity index 100%
rename from public/langs/es_ES/compta.lang
rename to htdocs/langs/es_ES/compta.lang
diff --git a/public/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
similarity index 100%
rename from public/langs/es_ES/contracts.lang
rename to htdocs/langs/es_ES/contracts.lang
diff --git a/public/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
similarity index 100%
rename from public/langs/es_ES/cron.lang
rename to htdocs/langs/es_ES/cron.lang
diff --git a/public/langs/es_ES/deliveries.lang b/htdocs/langs/es_ES/deliveries.lang
similarity index 100%
rename from public/langs/es_ES/deliveries.lang
rename to htdocs/langs/es_ES/deliveries.lang
diff --git a/public/langs/es_ES/dict.lang b/htdocs/langs/es_ES/dict.lang
similarity index 100%
rename from public/langs/es_ES/dict.lang
rename to htdocs/langs/es_ES/dict.lang
diff --git a/public/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang
similarity index 100%
rename from public/langs/es_ES/donations.lang
rename to htdocs/langs/es_ES/donations.lang
diff --git a/public/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang
similarity index 100%
rename from public/langs/es_ES/ecm.lang
rename to htdocs/langs/es_ES/ecm.lang
diff --git a/public/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
similarity index 100%
rename from public/langs/es_ES/errors.lang
rename to htdocs/langs/es_ES/errors.lang
diff --git a/public/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang
similarity index 100%
rename from public/langs/es_ES/exports.lang
rename to htdocs/langs/es_ES/exports.lang
diff --git a/public/langs/es_ES/externalsite.lang b/htdocs/langs/es_ES/externalsite.lang
similarity index 100%
rename from public/langs/es_ES/externalsite.lang
rename to htdocs/langs/es_ES/externalsite.lang
diff --git a/public/langs/es_ES/ftp.lang b/htdocs/langs/es_ES/ftp.lang
similarity index 100%
rename from public/langs/es_ES/ftp.lang
rename to htdocs/langs/es_ES/ftp.lang
diff --git a/public/langs/es_ES/help.lang b/htdocs/langs/es_ES/help.lang
similarity index 100%
rename from public/langs/es_ES/help.lang
rename to htdocs/langs/es_ES/help.lang
diff --git a/public/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
similarity index 100%
rename from public/langs/es_ES/holiday.lang
rename to htdocs/langs/es_ES/holiday.lang
diff --git a/public/langs/es_ES/hrm.lang b/htdocs/langs/es_ES/hrm.lang
similarity index 100%
rename from public/langs/es_ES/hrm.lang
rename to htdocs/langs/es_ES/hrm.lang
diff --git a/public/langs/es_ES/incoterm.lang b/htdocs/langs/es_ES/incoterm.lang
similarity index 100%
rename from public/langs/es_ES/incoterm.lang
rename to htdocs/langs/es_ES/incoterm.lang
diff --git a/public/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
similarity index 100%
rename from public/langs/es_ES/install.lang
rename to htdocs/langs/es_ES/install.lang
diff --git a/public/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang
similarity index 100%
rename from public/langs/es_ES/interventions.lang
rename to htdocs/langs/es_ES/interventions.lang
diff --git a/public/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang
similarity index 100%
rename from public/langs/es_ES/languages.lang
rename to htdocs/langs/es_ES/languages.lang
diff --git a/public/langs/es_ES/ldap.lang b/htdocs/langs/es_ES/ldap.lang
similarity index 100%
rename from public/langs/es_ES/ldap.lang
rename to htdocs/langs/es_ES/ldap.lang
diff --git a/public/langs/es_ES/link.lang b/htdocs/langs/es_ES/link.lang
similarity index 100%
rename from public/langs/es_ES/link.lang
rename to htdocs/langs/es_ES/link.lang
diff --git a/public/langs/es_ES/loan.lang b/htdocs/langs/es_ES/loan.lang
similarity index 100%
rename from public/langs/es_ES/loan.lang
rename to htdocs/langs/es_ES/loan.lang
diff --git a/public/langs/es_ES/mailmanspip.lang b/htdocs/langs/es_ES/mailmanspip.lang
similarity index 100%
rename from public/langs/es_ES/mailmanspip.lang
rename to htdocs/langs/es_ES/mailmanspip.lang
diff --git a/public/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
similarity index 100%
rename from public/langs/es_ES/mails.lang
rename to htdocs/langs/es_ES/mails.lang
diff --git a/public/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
similarity index 100%
rename from public/langs/es_ES/main.lang
rename to htdocs/langs/es_ES/main.lang
diff --git a/public/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang
similarity index 100%
rename from public/langs/es_ES/margins.lang
rename to htdocs/langs/es_ES/margins.lang
diff --git a/public/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
similarity index 100%
rename from public/langs/es_ES/members.lang
rename to htdocs/langs/es_ES/members.lang
diff --git a/public/langs/es_ES/oauth.lang b/htdocs/langs/es_ES/oauth.lang
similarity index 100%
rename from public/langs/es_ES/oauth.lang
rename to htdocs/langs/es_ES/oauth.lang
diff --git a/public/langs/es_ES/opensurvey.lang b/htdocs/langs/es_ES/opensurvey.lang
similarity index 100%
rename from public/langs/es_ES/opensurvey.lang
rename to htdocs/langs/es_ES/opensurvey.lang
diff --git a/public/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
similarity index 100%
rename from public/langs/es_ES/orders.lang
rename to htdocs/langs/es_ES/orders.lang
diff --git a/public/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
similarity index 100%
rename from public/langs/es_ES/other.lang
rename to htdocs/langs/es_ES/other.lang
diff --git a/public/langs/es_ES/paybox.lang b/htdocs/langs/es_ES/paybox.lang
similarity index 100%
rename from public/langs/es_ES/paybox.lang
rename to htdocs/langs/es_ES/paybox.lang
diff --git a/public/langs/es_ES/paypal.lang b/htdocs/langs/es_ES/paypal.lang
similarity index 100%
rename from public/langs/es_ES/paypal.lang
rename to htdocs/langs/es_ES/paypal.lang
diff --git a/public/langs/es_ES/printing.lang b/htdocs/langs/es_ES/printing.lang
similarity index 100%
rename from public/langs/es_ES/printing.lang
rename to htdocs/langs/es_ES/printing.lang
diff --git a/public/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
similarity index 100%
rename from public/langs/es_ES/productbatch.lang
rename to htdocs/langs/es_ES/productbatch.lang
diff --git a/public/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
similarity index 100%
rename from public/langs/es_ES/products.lang
rename to htdocs/langs/es_ES/products.lang
diff --git a/public/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
similarity index 100%
rename from public/langs/es_ES/projects.lang
rename to htdocs/langs/es_ES/projects.lang
diff --git a/public/langs/es_ES/propal.lang b/htdocs/langs/es_ES/propal.lang
similarity index 100%
rename from public/langs/es_ES/propal.lang
rename to htdocs/langs/es_ES/propal.lang
diff --git a/public/langs/es_ES/receiptprinter.lang b/htdocs/langs/es_ES/receiptprinter.lang
similarity index 100%
rename from public/langs/es_ES/receiptprinter.lang
rename to htdocs/langs/es_ES/receiptprinter.lang
diff --git a/public/langs/es_ES/resource.lang b/htdocs/langs/es_ES/resource.lang
similarity index 100%
rename from public/langs/es_ES/resource.lang
rename to htdocs/langs/es_ES/resource.lang
diff --git a/public/langs/es_ES/salaries.lang b/htdocs/langs/es_ES/salaries.lang
similarity index 100%
rename from public/langs/es_ES/salaries.lang
rename to htdocs/langs/es_ES/salaries.lang
diff --git a/public/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
similarity index 100%
rename from public/langs/es_ES/sendings.lang
rename to htdocs/langs/es_ES/sendings.lang
diff --git a/public/langs/es_ES/sms.lang b/htdocs/langs/es_ES/sms.lang
similarity index 100%
rename from public/langs/es_ES/sms.lang
rename to htdocs/langs/es_ES/sms.lang
diff --git a/public/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
similarity index 100%
rename from public/langs/es_ES/stocks.lang
rename to htdocs/langs/es_ES/stocks.lang
diff --git a/public/langs/es_ES/supplier_proposal.lang b/htdocs/langs/es_ES/supplier_proposal.lang
similarity index 100%
rename from public/langs/es_ES/supplier_proposal.lang
rename to htdocs/langs/es_ES/supplier_proposal.lang
diff --git a/public/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang
similarity index 100%
rename from public/langs/es_ES/suppliers.lang
rename to htdocs/langs/es_ES/suppliers.lang
diff --git a/public/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang
similarity index 100%
rename from public/langs/es_ES/trips.lang
rename to htdocs/langs/es_ES/trips.lang
diff --git a/public/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
similarity index 100%
rename from public/langs/es_ES/users.lang
rename to htdocs/langs/es_ES/users.lang
diff --git a/public/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
similarity index 100%
rename from public/langs/es_ES/website.lang
rename to htdocs/langs/es_ES/website.lang
diff --git a/public/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
similarity index 100%
rename from public/langs/es_ES/withdrawals.lang
rename to htdocs/langs/es_ES/withdrawals.lang
diff --git a/public/langs/es_ES/workflow.lang b/htdocs/langs/es_ES/workflow.lang
similarity index 100%
rename from public/langs/es_ES/workflow.lang
rename to htdocs/langs/es_ES/workflow.lang
diff --git a/public/langs/es_HN/admin.lang b/htdocs/langs/es_HN/admin.lang
similarity index 100%
rename from public/langs/es_HN/admin.lang
rename to htdocs/langs/es_HN/admin.lang
diff --git a/public/langs/es_HN/bills.lang b/htdocs/langs/es_HN/bills.lang
similarity index 100%
rename from public/langs/es_HN/bills.lang
rename to htdocs/langs/es_HN/bills.lang
diff --git a/public/langs/es_HN/companies.lang b/htdocs/langs/es_HN/companies.lang
similarity index 100%
rename from public/langs/es_HN/companies.lang
rename to htdocs/langs/es_HN/companies.lang
diff --git a/public/langs/es_HN/compta.lang b/htdocs/langs/es_HN/compta.lang
similarity index 100%
rename from public/langs/es_HN/compta.lang
rename to htdocs/langs/es_HN/compta.lang
diff --git a/public/langs/es_HN/main.lang b/htdocs/langs/es_HN/main.lang
similarity index 100%
rename from public/langs/es_HN/main.lang
rename to htdocs/langs/es_HN/main.lang
diff --git a/public/langs/es_HN/propal.lang b/htdocs/langs/es_HN/propal.lang
similarity index 100%
rename from public/langs/es_HN/propal.lang
rename to htdocs/langs/es_HN/propal.lang
diff --git a/public/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
similarity index 100%
rename from public/langs/es_MX/accountancy.lang
rename to htdocs/langs/es_MX/accountancy.lang
diff --git a/public/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
similarity index 100%
rename from public/langs/es_MX/admin.lang
rename to htdocs/langs/es_MX/admin.lang
diff --git a/public/langs/es_MX/agenda.lang b/htdocs/langs/es_MX/agenda.lang
similarity index 100%
rename from public/langs/es_MX/agenda.lang
rename to htdocs/langs/es_MX/agenda.lang
diff --git a/public/langs/es_MX/banks.lang b/htdocs/langs/es_MX/banks.lang
similarity index 100%
rename from public/langs/es_MX/banks.lang
rename to htdocs/langs/es_MX/banks.lang
diff --git a/public/langs/es_MX/bills.lang b/htdocs/langs/es_MX/bills.lang
similarity index 100%
rename from public/langs/es_MX/bills.lang
rename to htdocs/langs/es_MX/bills.lang
diff --git a/public/langs/es_MX/bookmarks.lang b/htdocs/langs/es_MX/bookmarks.lang
similarity index 100%
rename from public/langs/es_MX/bookmarks.lang
rename to htdocs/langs/es_MX/bookmarks.lang
diff --git a/public/langs/es_MX/boxes.lang b/htdocs/langs/es_MX/boxes.lang
similarity index 100%
rename from public/langs/es_MX/boxes.lang
rename to htdocs/langs/es_MX/boxes.lang
diff --git a/public/langs/es_MX/cashdesk.lang b/htdocs/langs/es_MX/cashdesk.lang
similarity index 100%
rename from public/langs/es_MX/cashdesk.lang
rename to htdocs/langs/es_MX/cashdesk.lang
diff --git a/public/langs/es_MX/categories.lang b/htdocs/langs/es_MX/categories.lang
similarity index 100%
rename from public/langs/es_MX/categories.lang
rename to htdocs/langs/es_MX/categories.lang
diff --git a/public/langs/es_MX/commercial.lang b/htdocs/langs/es_MX/commercial.lang
similarity index 100%
rename from public/langs/es_MX/commercial.lang
rename to htdocs/langs/es_MX/commercial.lang
diff --git a/public/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
similarity index 100%
rename from public/langs/es_MX/companies.lang
rename to htdocs/langs/es_MX/companies.lang
diff --git a/public/langs/es_MX/compta.lang b/htdocs/langs/es_MX/compta.lang
similarity index 100%
rename from public/langs/es_MX/compta.lang
rename to htdocs/langs/es_MX/compta.lang
diff --git a/public/langs/es_MX/contracts.lang b/htdocs/langs/es_MX/contracts.lang
similarity index 100%
rename from public/langs/es_MX/contracts.lang
rename to htdocs/langs/es_MX/contracts.lang
diff --git a/public/langs/es_MX/cron.lang b/htdocs/langs/es_MX/cron.lang
similarity index 100%
rename from public/langs/es_MX/cron.lang
rename to htdocs/langs/es_MX/cron.lang
diff --git a/public/langs/es_MX/deliveries.lang b/htdocs/langs/es_MX/deliveries.lang
similarity index 100%
rename from public/langs/es_MX/deliveries.lang
rename to htdocs/langs/es_MX/deliveries.lang
diff --git a/public/langs/es_MX/dict.lang b/htdocs/langs/es_MX/dict.lang
similarity index 100%
rename from public/langs/es_MX/dict.lang
rename to htdocs/langs/es_MX/dict.lang
diff --git a/public/langs/es_MX/donations.lang b/htdocs/langs/es_MX/donations.lang
similarity index 100%
rename from public/langs/es_MX/donations.lang
rename to htdocs/langs/es_MX/donations.lang
diff --git a/public/langs/es_MX/ecm.lang b/htdocs/langs/es_MX/ecm.lang
similarity index 100%
rename from public/langs/es_MX/ecm.lang
rename to htdocs/langs/es_MX/ecm.lang
diff --git a/public/langs/es_MX/errors.lang b/htdocs/langs/es_MX/errors.lang
similarity index 100%
rename from public/langs/es_MX/errors.lang
rename to htdocs/langs/es_MX/errors.lang
diff --git a/public/langs/es_MX/exports.lang b/htdocs/langs/es_MX/exports.lang
similarity index 100%
rename from public/langs/es_MX/exports.lang
rename to htdocs/langs/es_MX/exports.lang
diff --git a/public/langs/es_MX/externalsite.lang b/htdocs/langs/es_MX/externalsite.lang
similarity index 100%
rename from public/langs/es_MX/externalsite.lang
rename to htdocs/langs/es_MX/externalsite.lang
diff --git a/public/langs/es_MX/ftp.lang b/htdocs/langs/es_MX/ftp.lang
similarity index 100%
rename from public/langs/es_MX/ftp.lang
rename to htdocs/langs/es_MX/ftp.lang
diff --git a/public/langs/es_MX/help.lang b/htdocs/langs/es_MX/help.lang
similarity index 100%
rename from public/langs/es_MX/help.lang
rename to htdocs/langs/es_MX/help.lang
diff --git a/public/langs/es_MX/holiday.lang b/htdocs/langs/es_MX/holiday.lang
similarity index 100%
rename from public/langs/es_MX/holiday.lang
rename to htdocs/langs/es_MX/holiday.lang
diff --git a/public/langs/es_MX/hrm.lang b/htdocs/langs/es_MX/hrm.lang
similarity index 100%
rename from public/langs/es_MX/hrm.lang
rename to htdocs/langs/es_MX/hrm.lang
diff --git a/public/langs/es_MX/incoterm.lang b/htdocs/langs/es_MX/incoterm.lang
similarity index 100%
rename from public/langs/es_MX/incoterm.lang
rename to htdocs/langs/es_MX/incoterm.lang
diff --git a/public/langs/es_MX/install.lang b/htdocs/langs/es_MX/install.lang
similarity index 100%
rename from public/langs/es_MX/install.lang
rename to htdocs/langs/es_MX/install.lang
diff --git a/public/langs/es_MX/interventions.lang b/htdocs/langs/es_MX/interventions.lang
similarity index 100%
rename from public/langs/es_MX/interventions.lang
rename to htdocs/langs/es_MX/interventions.lang
diff --git a/public/langs/es_MX/languages.lang b/htdocs/langs/es_MX/languages.lang
similarity index 100%
rename from public/langs/es_MX/languages.lang
rename to htdocs/langs/es_MX/languages.lang
diff --git a/public/langs/es_MX/ldap.lang b/htdocs/langs/es_MX/ldap.lang
similarity index 100%
rename from public/langs/es_MX/ldap.lang
rename to htdocs/langs/es_MX/ldap.lang
diff --git a/public/langs/es_MX/link.lang b/htdocs/langs/es_MX/link.lang
similarity index 100%
rename from public/langs/es_MX/link.lang
rename to htdocs/langs/es_MX/link.lang
diff --git a/public/langs/es_MX/loan.lang b/htdocs/langs/es_MX/loan.lang
similarity index 100%
rename from public/langs/es_MX/loan.lang
rename to htdocs/langs/es_MX/loan.lang
diff --git a/public/langs/es_MX/mailmanspip.lang b/htdocs/langs/es_MX/mailmanspip.lang
similarity index 100%
rename from public/langs/es_MX/mailmanspip.lang
rename to htdocs/langs/es_MX/mailmanspip.lang
diff --git a/public/langs/es_MX/mails.lang b/htdocs/langs/es_MX/mails.lang
similarity index 100%
rename from public/langs/es_MX/mails.lang
rename to htdocs/langs/es_MX/mails.lang
diff --git a/public/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
similarity index 100%
rename from public/langs/es_MX/main.lang
rename to htdocs/langs/es_MX/main.lang
diff --git a/public/langs/es_MX/margins.lang b/htdocs/langs/es_MX/margins.lang
similarity index 100%
rename from public/langs/es_MX/margins.lang
rename to htdocs/langs/es_MX/margins.lang
diff --git a/public/langs/es_MX/members.lang b/htdocs/langs/es_MX/members.lang
similarity index 100%
rename from public/langs/es_MX/members.lang
rename to htdocs/langs/es_MX/members.lang
diff --git a/public/langs/es_MX/oauth.lang b/htdocs/langs/es_MX/oauth.lang
similarity index 100%
rename from public/langs/es_MX/oauth.lang
rename to htdocs/langs/es_MX/oauth.lang
diff --git a/public/langs/es_MX/opensurvey.lang b/htdocs/langs/es_MX/opensurvey.lang
similarity index 100%
rename from public/langs/es_MX/opensurvey.lang
rename to htdocs/langs/es_MX/opensurvey.lang
diff --git a/public/langs/es_MX/orders.lang b/htdocs/langs/es_MX/orders.lang
similarity index 100%
rename from public/langs/es_MX/orders.lang
rename to htdocs/langs/es_MX/orders.lang
diff --git a/public/langs/es_MX/other.lang b/htdocs/langs/es_MX/other.lang
similarity index 100%
rename from public/langs/es_MX/other.lang
rename to htdocs/langs/es_MX/other.lang
diff --git a/public/langs/es_MX/paybox.lang b/htdocs/langs/es_MX/paybox.lang
similarity index 100%
rename from public/langs/es_MX/paybox.lang
rename to htdocs/langs/es_MX/paybox.lang
diff --git a/public/langs/es_MX/paypal.lang b/htdocs/langs/es_MX/paypal.lang
similarity index 100%
rename from public/langs/es_MX/paypal.lang
rename to htdocs/langs/es_MX/paypal.lang
diff --git a/public/langs/es_MX/printing.lang b/htdocs/langs/es_MX/printing.lang
similarity index 100%
rename from public/langs/es_MX/printing.lang
rename to htdocs/langs/es_MX/printing.lang
diff --git a/public/langs/es_MX/productbatch.lang b/htdocs/langs/es_MX/productbatch.lang
similarity index 100%
rename from public/langs/es_MX/productbatch.lang
rename to htdocs/langs/es_MX/productbatch.lang
diff --git a/public/langs/es_MX/products.lang b/htdocs/langs/es_MX/products.lang
similarity index 100%
rename from public/langs/es_MX/products.lang
rename to htdocs/langs/es_MX/products.lang
diff --git a/public/langs/es_MX/projects.lang b/htdocs/langs/es_MX/projects.lang
similarity index 100%
rename from public/langs/es_MX/projects.lang
rename to htdocs/langs/es_MX/projects.lang
diff --git a/public/langs/es_MX/propal.lang b/htdocs/langs/es_MX/propal.lang
similarity index 100%
rename from public/langs/es_MX/propal.lang
rename to htdocs/langs/es_MX/propal.lang
diff --git a/public/langs/es_MX/receiptprinter.lang b/htdocs/langs/es_MX/receiptprinter.lang
similarity index 100%
rename from public/langs/es_MX/receiptprinter.lang
rename to htdocs/langs/es_MX/receiptprinter.lang
diff --git a/public/langs/es_MX/resource.lang b/htdocs/langs/es_MX/resource.lang
similarity index 100%
rename from public/langs/es_MX/resource.lang
rename to htdocs/langs/es_MX/resource.lang
diff --git a/public/langs/es_MX/salaries.lang b/htdocs/langs/es_MX/salaries.lang
similarity index 100%
rename from public/langs/es_MX/salaries.lang
rename to htdocs/langs/es_MX/salaries.lang
diff --git a/public/langs/es_MX/sendings.lang b/htdocs/langs/es_MX/sendings.lang
similarity index 100%
rename from public/langs/es_MX/sendings.lang
rename to htdocs/langs/es_MX/sendings.lang
diff --git a/public/langs/es_MX/sms.lang b/htdocs/langs/es_MX/sms.lang
similarity index 100%
rename from public/langs/es_MX/sms.lang
rename to htdocs/langs/es_MX/sms.lang
diff --git a/public/langs/es_MX/stocks.lang b/htdocs/langs/es_MX/stocks.lang
similarity index 100%
rename from public/langs/es_MX/stocks.lang
rename to htdocs/langs/es_MX/stocks.lang
diff --git a/public/langs/es_MX/supplier_proposal.lang b/htdocs/langs/es_MX/supplier_proposal.lang
similarity index 100%
rename from public/langs/es_MX/supplier_proposal.lang
rename to htdocs/langs/es_MX/supplier_proposal.lang
diff --git a/public/langs/es_MX/suppliers.lang b/htdocs/langs/es_MX/suppliers.lang
similarity index 100%
rename from public/langs/es_MX/suppliers.lang
rename to htdocs/langs/es_MX/suppliers.lang
diff --git a/public/langs/es_MX/trips.lang b/htdocs/langs/es_MX/trips.lang
similarity index 100%
rename from public/langs/es_MX/trips.lang
rename to htdocs/langs/es_MX/trips.lang
diff --git a/public/langs/es_MX/users.lang b/htdocs/langs/es_MX/users.lang
similarity index 100%
rename from public/langs/es_MX/users.lang
rename to htdocs/langs/es_MX/users.lang
diff --git a/public/langs/es_MX/website.lang b/htdocs/langs/es_MX/website.lang
similarity index 100%
rename from public/langs/es_MX/website.lang
rename to htdocs/langs/es_MX/website.lang
diff --git a/public/langs/es_MX/withdrawals.lang b/htdocs/langs/es_MX/withdrawals.lang
similarity index 100%
rename from public/langs/es_MX/withdrawals.lang
rename to htdocs/langs/es_MX/withdrawals.lang
diff --git a/public/langs/es_MX/workflow.lang b/htdocs/langs/es_MX/workflow.lang
similarity index 100%
rename from public/langs/es_MX/workflow.lang
rename to htdocs/langs/es_MX/workflow.lang
diff --git a/public/langs/es_PA/accountancy.lang b/htdocs/langs/es_PA/accountancy.lang
similarity index 100%
rename from public/langs/es_PA/accountancy.lang
rename to htdocs/langs/es_PA/accountancy.lang
diff --git a/public/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
similarity index 100%
rename from public/langs/es_PA/admin.lang
rename to htdocs/langs/es_PA/admin.lang
diff --git a/public/langs/es_PA/agenda.lang b/htdocs/langs/es_PA/agenda.lang
similarity index 100%
rename from public/langs/es_PA/agenda.lang
rename to htdocs/langs/es_PA/agenda.lang
diff --git a/public/langs/es_PA/banks.lang b/htdocs/langs/es_PA/banks.lang
similarity index 100%
rename from public/langs/es_PA/banks.lang
rename to htdocs/langs/es_PA/banks.lang
diff --git a/public/langs/es_PA/bills.lang b/htdocs/langs/es_PA/bills.lang
similarity index 100%
rename from public/langs/es_PA/bills.lang
rename to htdocs/langs/es_PA/bills.lang
diff --git a/public/langs/es_PA/bookmarks.lang b/htdocs/langs/es_PA/bookmarks.lang
similarity index 100%
rename from public/langs/es_PA/bookmarks.lang
rename to htdocs/langs/es_PA/bookmarks.lang
diff --git a/public/langs/es_PA/boxes.lang b/htdocs/langs/es_PA/boxes.lang
similarity index 100%
rename from public/langs/es_PA/boxes.lang
rename to htdocs/langs/es_PA/boxes.lang
diff --git a/public/langs/es_PA/cashdesk.lang b/htdocs/langs/es_PA/cashdesk.lang
similarity index 100%
rename from public/langs/es_PA/cashdesk.lang
rename to htdocs/langs/es_PA/cashdesk.lang
diff --git a/public/langs/es_PA/categories.lang b/htdocs/langs/es_PA/categories.lang
similarity index 100%
rename from public/langs/es_PA/categories.lang
rename to htdocs/langs/es_PA/categories.lang
diff --git a/public/langs/es_PA/commercial.lang b/htdocs/langs/es_PA/commercial.lang
similarity index 100%
rename from public/langs/es_PA/commercial.lang
rename to htdocs/langs/es_PA/commercial.lang
diff --git a/public/langs/es_PA/companies.lang b/htdocs/langs/es_PA/companies.lang
similarity index 100%
rename from public/langs/es_PA/companies.lang
rename to htdocs/langs/es_PA/companies.lang
diff --git a/public/langs/es_PA/compta.lang b/htdocs/langs/es_PA/compta.lang
similarity index 100%
rename from public/langs/es_PA/compta.lang
rename to htdocs/langs/es_PA/compta.lang
diff --git a/public/langs/es_PA/contracts.lang b/htdocs/langs/es_PA/contracts.lang
similarity index 100%
rename from public/langs/es_PA/contracts.lang
rename to htdocs/langs/es_PA/contracts.lang
diff --git a/public/langs/es_PA/cron.lang b/htdocs/langs/es_PA/cron.lang
similarity index 100%
rename from public/langs/es_PA/cron.lang
rename to htdocs/langs/es_PA/cron.lang
diff --git a/public/langs/es_PA/deliveries.lang b/htdocs/langs/es_PA/deliveries.lang
similarity index 100%
rename from public/langs/es_PA/deliveries.lang
rename to htdocs/langs/es_PA/deliveries.lang
diff --git a/public/langs/es_PA/dict.lang b/htdocs/langs/es_PA/dict.lang
similarity index 100%
rename from public/langs/es_PA/dict.lang
rename to htdocs/langs/es_PA/dict.lang
diff --git a/public/langs/es_PA/donations.lang b/htdocs/langs/es_PA/donations.lang
similarity index 100%
rename from public/langs/es_PA/donations.lang
rename to htdocs/langs/es_PA/donations.lang
diff --git a/public/langs/es_PA/ecm.lang b/htdocs/langs/es_PA/ecm.lang
similarity index 100%
rename from public/langs/es_PA/ecm.lang
rename to htdocs/langs/es_PA/ecm.lang
diff --git a/public/langs/es_PA/errors.lang b/htdocs/langs/es_PA/errors.lang
similarity index 100%
rename from public/langs/es_PA/errors.lang
rename to htdocs/langs/es_PA/errors.lang
diff --git a/public/langs/es_PA/exports.lang b/htdocs/langs/es_PA/exports.lang
similarity index 100%
rename from public/langs/es_PA/exports.lang
rename to htdocs/langs/es_PA/exports.lang
diff --git a/public/langs/es_PA/externalsite.lang b/htdocs/langs/es_PA/externalsite.lang
similarity index 100%
rename from public/langs/es_PA/externalsite.lang
rename to htdocs/langs/es_PA/externalsite.lang
diff --git a/public/langs/es_PA/ftp.lang b/htdocs/langs/es_PA/ftp.lang
similarity index 100%
rename from public/langs/es_PA/ftp.lang
rename to htdocs/langs/es_PA/ftp.lang
diff --git a/public/langs/es_PA/help.lang b/htdocs/langs/es_PA/help.lang
similarity index 100%
rename from public/langs/es_PA/help.lang
rename to htdocs/langs/es_PA/help.lang
diff --git a/public/langs/es_PA/holiday.lang b/htdocs/langs/es_PA/holiday.lang
similarity index 100%
rename from public/langs/es_PA/holiday.lang
rename to htdocs/langs/es_PA/holiday.lang
diff --git a/public/langs/es_PA/hrm.lang b/htdocs/langs/es_PA/hrm.lang
similarity index 100%
rename from public/langs/es_PA/hrm.lang
rename to htdocs/langs/es_PA/hrm.lang
diff --git a/public/langs/es_PA/incoterm.lang b/htdocs/langs/es_PA/incoterm.lang
similarity index 100%
rename from public/langs/es_PA/incoterm.lang
rename to htdocs/langs/es_PA/incoterm.lang
diff --git a/public/langs/es_PA/install.lang b/htdocs/langs/es_PA/install.lang
similarity index 100%
rename from public/langs/es_PA/install.lang
rename to htdocs/langs/es_PA/install.lang
diff --git a/public/langs/es_PA/interventions.lang b/htdocs/langs/es_PA/interventions.lang
similarity index 100%
rename from public/langs/es_PA/interventions.lang
rename to htdocs/langs/es_PA/interventions.lang
diff --git a/public/langs/es_PA/languages.lang b/htdocs/langs/es_PA/languages.lang
similarity index 100%
rename from public/langs/es_PA/languages.lang
rename to htdocs/langs/es_PA/languages.lang
diff --git a/public/langs/es_PA/ldap.lang b/htdocs/langs/es_PA/ldap.lang
similarity index 100%
rename from public/langs/es_PA/ldap.lang
rename to htdocs/langs/es_PA/ldap.lang
diff --git a/public/langs/es_PA/link.lang b/htdocs/langs/es_PA/link.lang
similarity index 100%
rename from public/langs/es_PA/link.lang
rename to htdocs/langs/es_PA/link.lang
diff --git a/public/langs/es_PA/loan.lang b/htdocs/langs/es_PA/loan.lang
similarity index 100%
rename from public/langs/es_PA/loan.lang
rename to htdocs/langs/es_PA/loan.lang
diff --git a/public/langs/es_PA/mailmanspip.lang b/htdocs/langs/es_PA/mailmanspip.lang
similarity index 100%
rename from public/langs/es_PA/mailmanspip.lang
rename to htdocs/langs/es_PA/mailmanspip.lang
diff --git a/public/langs/es_PA/mails.lang b/htdocs/langs/es_PA/mails.lang
similarity index 100%
rename from public/langs/es_PA/mails.lang
rename to htdocs/langs/es_PA/mails.lang
diff --git a/public/langs/es_PA/main.lang b/htdocs/langs/es_PA/main.lang
similarity index 100%
rename from public/langs/es_PA/main.lang
rename to htdocs/langs/es_PA/main.lang
diff --git a/public/langs/es_PA/margins.lang b/htdocs/langs/es_PA/margins.lang
similarity index 100%
rename from public/langs/es_PA/margins.lang
rename to htdocs/langs/es_PA/margins.lang
diff --git a/public/langs/es_PA/members.lang b/htdocs/langs/es_PA/members.lang
similarity index 100%
rename from public/langs/es_PA/members.lang
rename to htdocs/langs/es_PA/members.lang
diff --git a/public/langs/es_PA/oauth.lang b/htdocs/langs/es_PA/oauth.lang
similarity index 100%
rename from public/langs/es_PA/oauth.lang
rename to htdocs/langs/es_PA/oauth.lang
diff --git a/public/langs/es_PA/opensurvey.lang b/htdocs/langs/es_PA/opensurvey.lang
similarity index 100%
rename from public/langs/es_PA/opensurvey.lang
rename to htdocs/langs/es_PA/opensurvey.lang
diff --git a/public/langs/es_PA/orders.lang b/htdocs/langs/es_PA/orders.lang
similarity index 100%
rename from public/langs/es_PA/orders.lang
rename to htdocs/langs/es_PA/orders.lang
diff --git a/public/langs/es_PA/other.lang b/htdocs/langs/es_PA/other.lang
similarity index 100%
rename from public/langs/es_PA/other.lang
rename to htdocs/langs/es_PA/other.lang
diff --git a/public/langs/es_PA/paybox.lang b/htdocs/langs/es_PA/paybox.lang
similarity index 100%
rename from public/langs/es_PA/paybox.lang
rename to htdocs/langs/es_PA/paybox.lang
diff --git a/public/langs/es_PA/paypal.lang b/htdocs/langs/es_PA/paypal.lang
similarity index 100%
rename from public/langs/es_PA/paypal.lang
rename to htdocs/langs/es_PA/paypal.lang
diff --git a/public/langs/es_PA/printing.lang b/htdocs/langs/es_PA/printing.lang
similarity index 100%
rename from public/langs/es_PA/printing.lang
rename to htdocs/langs/es_PA/printing.lang
diff --git a/public/langs/es_PA/productbatch.lang b/htdocs/langs/es_PA/productbatch.lang
similarity index 100%
rename from public/langs/es_PA/productbatch.lang
rename to htdocs/langs/es_PA/productbatch.lang
diff --git a/public/langs/es_PA/products.lang b/htdocs/langs/es_PA/products.lang
similarity index 100%
rename from public/langs/es_PA/products.lang
rename to htdocs/langs/es_PA/products.lang
diff --git a/public/langs/es_PA/projects.lang b/htdocs/langs/es_PA/projects.lang
similarity index 100%
rename from public/langs/es_PA/projects.lang
rename to htdocs/langs/es_PA/projects.lang
diff --git a/public/langs/es_PA/propal.lang b/htdocs/langs/es_PA/propal.lang
similarity index 100%
rename from public/langs/es_PA/propal.lang
rename to htdocs/langs/es_PA/propal.lang
diff --git a/public/langs/es_PA/receiptprinter.lang b/htdocs/langs/es_PA/receiptprinter.lang
similarity index 100%
rename from public/langs/es_PA/receiptprinter.lang
rename to htdocs/langs/es_PA/receiptprinter.lang
diff --git a/public/langs/es_PA/resource.lang b/htdocs/langs/es_PA/resource.lang
similarity index 100%
rename from public/langs/es_PA/resource.lang
rename to htdocs/langs/es_PA/resource.lang
diff --git a/public/langs/es_PA/salaries.lang b/htdocs/langs/es_PA/salaries.lang
similarity index 100%
rename from public/langs/es_PA/salaries.lang
rename to htdocs/langs/es_PA/salaries.lang
diff --git a/public/langs/es_PA/sendings.lang b/htdocs/langs/es_PA/sendings.lang
similarity index 100%
rename from public/langs/es_PA/sendings.lang
rename to htdocs/langs/es_PA/sendings.lang
diff --git a/public/langs/es_PA/sms.lang b/htdocs/langs/es_PA/sms.lang
similarity index 100%
rename from public/langs/es_PA/sms.lang
rename to htdocs/langs/es_PA/sms.lang
diff --git a/public/langs/es_PA/stocks.lang b/htdocs/langs/es_PA/stocks.lang
similarity index 100%
rename from public/langs/es_PA/stocks.lang
rename to htdocs/langs/es_PA/stocks.lang
diff --git a/public/langs/es_PA/supplier_proposal.lang b/htdocs/langs/es_PA/supplier_proposal.lang
similarity index 100%
rename from public/langs/es_PA/supplier_proposal.lang
rename to htdocs/langs/es_PA/supplier_proposal.lang
diff --git a/public/langs/es_PA/suppliers.lang b/htdocs/langs/es_PA/suppliers.lang
similarity index 100%
rename from public/langs/es_PA/suppliers.lang
rename to htdocs/langs/es_PA/suppliers.lang
diff --git a/public/langs/es_PA/trips.lang b/htdocs/langs/es_PA/trips.lang
similarity index 100%
rename from public/langs/es_PA/trips.lang
rename to htdocs/langs/es_PA/trips.lang
diff --git a/public/langs/es_PA/users.lang b/htdocs/langs/es_PA/users.lang
similarity index 100%
rename from public/langs/es_PA/users.lang
rename to htdocs/langs/es_PA/users.lang
diff --git a/public/langs/es_PA/website.lang b/htdocs/langs/es_PA/website.lang
similarity index 100%
rename from public/langs/es_PA/website.lang
rename to htdocs/langs/es_PA/website.lang
diff --git a/public/langs/es_PA/withdrawals.lang b/htdocs/langs/es_PA/withdrawals.lang
similarity index 100%
rename from public/langs/es_PA/withdrawals.lang
rename to htdocs/langs/es_PA/withdrawals.lang
diff --git a/public/langs/es_PA/workflow.lang b/htdocs/langs/es_PA/workflow.lang
similarity index 100%
rename from public/langs/es_PA/workflow.lang
rename to htdocs/langs/es_PA/workflow.lang
diff --git a/public/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
similarity index 100%
rename from public/langs/es_PE/accountancy.lang
rename to htdocs/langs/es_PE/accountancy.lang
diff --git a/public/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
similarity index 100%
rename from public/langs/es_PE/admin.lang
rename to htdocs/langs/es_PE/admin.lang
diff --git a/public/langs/es_PE/agenda.lang b/htdocs/langs/es_PE/agenda.lang
similarity index 100%
rename from public/langs/es_PE/agenda.lang
rename to htdocs/langs/es_PE/agenda.lang
diff --git a/public/langs/es_PE/banks.lang b/htdocs/langs/es_PE/banks.lang
similarity index 100%
rename from public/langs/es_PE/banks.lang
rename to htdocs/langs/es_PE/banks.lang
diff --git a/public/langs/es_PE/bills.lang b/htdocs/langs/es_PE/bills.lang
similarity index 100%
rename from public/langs/es_PE/bills.lang
rename to htdocs/langs/es_PE/bills.lang
diff --git a/public/langs/es_PE/bookmarks.lang b/htdocs/langs/es_PE/bookmarks.lang
similarity index 100%
rename from public/langs/es_PE/bookmarks.lang
rename to htdocs/langs/es_PE/bookmarks.lang
diff --git a/public/langs/es_PE/boxes.lang b/htdocs/langs/es_PE/boxes.lang
similarity index 100%
rename from public/langs/es_PE/boxes.lang
rename to htdocs/langs/es_PE/boxes.lang
diff --git a/public/langs/es_PE/cashdesk.lang b/htdocs/langs/es_PE/cashdesk.lang
similarity index 100%
rename from public/langs/es_PE/cashdesk.lang
rename to htdocs/langs/es_PE/cashdesk.lang
diff --git a/public/langs/es_PE/categories.lang b/htdocs/langs/es_PE/categories.lang
similarity index 100%
rename from public/langs/es_PE/categories.lang
rename to htdocs/langs/es_PE/categories.lang
diff --git a/public/langs/es_PE/commercial.lang b/htdocs/langs/es_PE/commercial.lang
similarity index 100%
rename from public/langs/es_PE/commercial.lang
rename to htdocs/langs/es_PE/commercial.lang
diff --git a/public/langs/es_PE/companies.lang b/htdocs/langs/es_PE/companies.lang
similarity index 100%
rename from public/langs/es_PE/companies.lang
rename to htdocs/langs/es_PE/companies.lang
diff --git a/public/langs/es_PE/compta.lang b/htdocs/langs/es_PE/compta.lang
similarity index 100%
rename from public/langs/es_PE/compta.lang
rename to htdocs/langs/es_PE/compta.lang
diff --git a/public/langs/es_PE/contracts.lang b/htdocs/langs/es_PE/contracts.lang
similarity index 100%
rename from public/langs/es_PE/contracts.lang
rename to htdocs/langs/es_PE/contracts.lang
diff --git a/public/langs/es_PE/cron.lang b/htdocs/langs/es_PE/cron.lang
similarity index 100%
rename from public/langs/es_PE/cron.lang
rename to htdocs/langs/es_PE/cron.lang
diff --git a/public/langs/es_PE/deliveries.lang b/htdocs/langs/es_PE/deliveries.lang
similarity index 100%
rename from public/langs/es_PE/deliveries.lang
rename to htdocs/langs/es_PE/deliveries.lang
diff --git a/public/langs/es_PE/dict.lang b/htdocs/langs/es_PE/dict.lang
similarity index 100%
rename from public/langs/es_PE/dict.lang
rename to htdocs/langs/es_PE/dict.lang
diff --git a/public/langs/es_PE/donations.lang b/htdocs/langs/es_PE/donations.lang
similarity index 100%
rename from public/langs/es_PE/donations.lang
rename to htdocs/langs/es_PE/donations.lang
diff --git a/public/langs/es_PE/ecm.lang b/htdocs/langs/es_PE/ecm.lang
similarity index 100%
rename from public/langs/es_PE/ecm.lang
rename to htdocs/langs/es_PE/ecm.lang
diff --git a/public/langs/es_PE/errors.lang b/htdocs/langs/es_PE/errors.lang
similarity index 100%
rename from public/langs/es_PE/errors.lang
rename to htdocs/langs/es_PE/errors.lang
diff --git a/public/langs/es_PE/exports.lang b/htdocs/langs/es_PE/exports.lang
similarity index 100%
rename from public/langs/es_PE/exports.lang
rename to htdocs/langs/es_PE/exports.lang
diff --git a/public/langs/es_PE/externalsite.lang b/htdocs/langs/es_PE/externalsite.lang
similarity index 100%
rename from public/langs/es_PE/externalsite.lang
rename to htdocs/langs/es_PE/externalsite.lang
diff --git a/public/langs/es_PE/ftp.lang b/htdocs/langs/es_PE/ftp.lang
similarity index 100%
rename from public/langs/es_PE/ftp.lang
rename to htdocs/langs/es_PE/ftp.lang
diff --git a/public/langs/es_PE/help.lang b/htdocs/langs/es_PE/help.lang
similarity index 100%
rename from public/langs/es_PE/help.lang
rename to htdocs/langs/es_PE/help.lang
diff --git a/public/langs/es_PE/holiday.lang b/htdocs/langs/es_PE/holiday.lang
similarity index 100%
rename from public/langs/es_PE/holiday.lang
rename to htdocs/langs/es_PE/holiday.lang
diff --git a/public/langs/es_PE/hrm.lang b/htdocs/langs/es_PE/hrm.lang
similarity index 100%
rename from public/langs/es_PE/hrm.lang
rename to htdocs/langs/es_PE/hrm.lang
diff --git a/public/langs/es_PE/incoterm.lang b/htdocs/langs/es_PE/incoterm.lang
similarity index 100%
rename from public/langs/es_PE/incoterm.lang
rename to htdocs/langs/es_PE/incoterm.lang
diff --git a/public/langs/es_PE/install.lang b/htdocs/langs/es_PE/install.lang
similarity index 100%
rename from public/langs/es_PE/install.lang
rename to htdocs/langs/es_PE/install.lang
diff --git a/public/langs/es_PE/interventions.lang b/htdocs/langs/es_PE/interventions.lang
similarity index 100%
rename from public/langs/es_PE/interventions.lang
rename to htdocs/langs/es_PE/interventions.lang
diff --git a/public/langs/es_PE/languages.lang b/htdocs/langs/es_PE/languages.lang
similarity index 100%
rename from public/langs/es_PE/languages.lang
rename to htdocs/langs/es_PE/languages.lang
diff --git a/public/langs/es_PE/ldap.lang b/htdocs/langs/es_PE/ldap.lang
similarity index 100%
rename from public/langs/es_PE/ldap.lang
rename to htdocs/langs/es_PE/ldap.lang
diff --git a/public/langs/es_PE/link.lang b/htdocs/langs/es_PE/link.lang
similarity index 100%
rename from public/langs/es_PE/link.lang
rename to htdocs/langs/es_PE/link.lang
diff --git a/public/langs/es_PE/loan.lang b/htdocs/langs/es_PE/loan.lang
similarity index 100%
rename from public/langs/es_PE/loan.lang
rename to htdocs/langs/es_PE/loan.lang
diff --git a/public/langs/es_PE/mailmanspip.lang b/htdocs/langs/es_PE/mailmanspip.lang
similarity index 100%
rename from public/langs/es_PE/mailmanspip.lang
rename to htdocs/langs/es_PE/mailmanspip.lang
diff --git a/public/langs/es_PE/mails.lang b/htdocs/langs/es_PE/mails.lang
similarity index 100%
rename from public/langs/es_PE/mails.lang
rename to htdocs/langs/es_PE/mails.lang
diff --git a/public/langs/es_PE/main.lang b/htdocs/langs/es_PE/main.lang
similarity index 100%
rename from public/langs/es_PE/main.lang
rename to htdocs/langs/es_PE/main.lang
diff --git a/public/langs/es_PE/margins.lang b/htdocs/langs/es_PE/margins.lang
similarity index 100%
rename from public/langs/es_PE/margins.lang
rename to htdocs/langs/es_PE/margins.lang
diff --git a/public/langs/es_PE/members.lang b/htdocs/langs/es_PE/members.lang
similarity index 100%
rename from public/langs/es_PE/members.lang
rename to htdocs/langs/es_PE/members.lang
diff --git a/public/langs/es_PE/oauth.lang b/htdocs/langs/es_PE/oauth.lang
similarity index 100%
rename from public/langs/es_PE/oauth.lang
rename to htdocs/langs/es_PE/oauth.lang
diff --git a/public/langs/es_PE/opensurvey.lang b/htdocs/langs/es_PE/opensurvey.lang
similarity index 100%
rename from public/langs/es_PE/opensurvey.lang
rename to htdocs/langs/es_PE/opensurvey.lang
diff --git a/public/langs/es_PE/orders.lang b/htdocs/langs/es_PE/orders.lang
similarity index 100%
rename from public/langs/es_PE/orders.lang
rename to htdocs/langs/es_PE/orders.lang
diff --git a/public/langs/es_PE/other.lang b/htdocs/langs/es_PE/other.lang
similarity index 100%
rename from public/langs/es_PE/other.lang
rename to htdocs/langs/es_PE/other.lang
diff --git a/public/langs/es_PE/paybox.lang b/htdocs/langs/es_PE/paybox.lang
similarity index 100%
rename from public/langs/es_PE/paybox.lang
rename to htdocs/langs/es_PE/paybox.lang
diff --git a/public/langs/es_PE/paypal.lang b/htdocs/langs/es_PE/paypal.lang
similarity index 100%
rename from public/langs/es_PE/paypal.lang
rename to htdocs/langs/es_PE/paypal.lang
diff --git a/public/langs/es_PE/printing.lang b/htdocs/langs/es_PE/printing.lang
similarity index 100%
rename from public/langs/es_PE/printing.lang
rename to htdocs/langs/es_PE/printing.lang
diff --git a/public/langs/es_PE/productbatch.lang b/htdocs/langs/es_PE/productbatch.lang
similarity index 100%
rename from public/langs/es_PE/productbatch.lang
rename to htdocs/langs/es_PE/productbatch.lang
diff --git a/public/langs/es_PE/products.lang b/htdocs/langs/es_PE/products.lang
similarity index 100%
rename from public/langs/es_PE/products.lang
rename to htdocs/langs/es_PE/products.lang
diff --git a/public/langs/es_PE/projects.lang b/htdocs/langs/es_PE/projects.lang
similarity index 100%
rename from public/langs/es_PE/projects.lang
rename to htdocs/langs/es_PE/projects.lang
diff --git a/public/langs/es_PE/propal.lang b/htdocs/langs/es_PE/propal.lang
similarity index 100%
rename from public/langs/es_PE/propal.lang
rename to htdocs/langs/es_PE/propal.lang
diff --git a/public/langs/es_PE/receiptprinter.lang b/htdocs/langs/es_PE/receiptprinter.lang
similarity index 100%
rename from public/langs/es_PE/receiptprinter.lang
rename to htdocs/langs/es_PE/receiptprinter.lang
diff --git a/public/langs/es_PE/resource.lang b/htdocs/langs/es_PE/resource.lang
similarity index 100%
rename from public/langs/es_PE/resource.lang
rename to htdocs/langs/es_PE/resource.lang
diff --git a/public/langs/es_PE/salaries.lang b/htdocs/langs/es_PE/salaries.lang
similarity index 100%
rename from public/langs/es_PE/salaries.lang
rename to htdocs/langs/es_PE/salaries.lang
diff --git a/public/langs/es_PE/sendings.lang b/htdocs/langs/es_PE/sendings.lang
similarity index 100%
rename from public/langs/es_PE/sendings.lang
rename to htdocs/langs/es_PE/sendings.lang
diff --git a/public/langs/es_PE/sms.lang b/htdocs/langs/es_PE/sms.lang
similarity index 100%
rename from public/langs/es_PE/sms.lang
rename to htdocs/langs/es_PE/sms.lang
diff --git a/public/langs/es_PE/stocks.lang b/htdocs/langs/es_PE/stocks.lang
similarity index 100%
rename from public/langs/es_PE/stocks.lang
rename to htdocs/langs/es_PE/stocks.lang
diff --git a/public/langs/es_PE/supplier_proposal.lang b/htdocs/langs/es_PE/supplier_proposal.lang
similarity index 100%
rename from public/langs/es_PE/supplier_proposal.lang
rename to htdocs/langs/es_PE/supplier_proposal.lang
diff --git a/public/langs/es_PE/suppliers.lang b/htdocs/langs/es_PE/suppliers.lang
similarity index 100%
rename from public/langs/es_PE/suppliers.lang
rename to htdocs/langs/es_PE/suppliers.lang
diff --git a/public/langs/es_PE/trips.lang b/htdocs/langs/es_PE/trips.lang
similarity index 100%
rename from public/langs/es_PE/trips.lang
rename to htdocs/langs/es_PE/trips.lang
diff --git a/public/langs/es_PE/users.lang b/htdocs/langs/es_PE/users.lang
similarity index 100%
rename from public/langs/es_PE/users.lang
rename to htdocs/langs/es_PE/users.lang
diff --git a/public/langs/es_PE/website.lang b/htdocs/langs/es_PE/website.lang
similarity index 100%
rename from public/langs/es_PE/website.lang
rename to htdocs/langs/es_PE/website.lang
diff --git a/public/langs/es_PE/withdrawals.lang b/htdocs/langs/es_PE/withdrawals.lang
similarity index 100%
rename from public/langs/es_PE/withdrawals.lang
rename to htdocs/langs/es_PE/withdrawals.lang
diff --git a/public/langs/es_PE/workflow.lang b/htdocs/langs/es_PE/workflow.lang
similarity index 100%
rename from public/langs/es_PE/workflow.lang
rename to htdocs/langs/es_PE/workflow.lang
diff --git a/public/langs/es_PR/admin.lang b/htdocs/langs/es_PR/admin.lang
similarity index 100%
rename from public/langs/es_PR/admin.lang
rename to htdocs/langs/es_PR/admin.lang
diff --git a/public/langs/es_PR/bills.lang b/htdocs/langs/es_PR/bills.lang
similarity index 100%
rename from public/langs/es_PR/bills.lang
rename to htdocs/langs/es_PR/bills.lang
diff --git a/public/langs/es_PR/companies.lang b/htdocs/langs/es_PR/companies.lang
similarity index 100%
rename from public/langs/es_PR/companies.lang
rename to htdocs/langs/es_PR/companies.lang
diff --git a/public/langs/es_PR/compta.lang b/htdocs/langs/es_PR/compta.lang
similarity index 100%
rename from public/langs/es_PR/compta.lang
rename to htdocs/langs/es_PR/compta.lang
diff --git a/public/langs/es_PR/main.lang b/htdocs/langs/es_PR/main.lang
similarity index 100%
rename from public/langs/es_PR/main.lang
rename to htdocs/langs/es_PR/main.lang
diff --git a/public/langs/es_PR/propal.lang b/htdocs/langs/es_PR/propal.lang
similarity index 100%
rename from public/langs/es_PR/propal.lang
rename to htdocs/langs/es_PR/propal.lang
diff --git a/public/langs/es_PY/accountancy.lang b/htdocs/langs/es_PY/accountancy.lang
similarity index 100%
rename from public/langs/es_PY/accountancy.lang
rename to htdocs/langs/es_PY/accountancy.lang
diff --git a/public/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
similarity index 100%
rename from public/langs/es_PY/admin.lang
rename to htdocs/langs/es_PY/admin.lang
diff --git a/public/langs/es_PY/agenda.lang b/htdocs/langs/es_PY/agenda.lang
similarity index 100%
rename from public/langs/es_PY/agenda.lang
rename to htdocs/langs/es_PY/agenda.lang
diff --git a/public/langs/es_PY/banks.lang b/htdocs/langs/es_PY/banks.lang
similarity index 100%
rename from public/langs/es_PY/banks.lang
rename to htdocs/langs/es_PY/banks.lang
diff --git a/public/langs/es_PY/bills.lang b/htdocs/langs/es_PY/bills.lang
similarity index 100%
rename from public/langs/es_PY/bills.lang
rename to htdocs/langs/es_PY/bills.lang
diff --git a/public/langs/es_PY/bookmarks.lang b/htdocs/langs/es_PY/bookmarks.lang
similarity index 100%
rename from public/langs/es_PY/bookmarks.lang
rename to htdocs/langs/es_PY/bookmarks.lang
diff --git a/public/langs/es_PY/boxes.lang b/htdocs/langs/es_PY/boxes.lang
similarity index 100%
rename from public/langs/es_PY/boxes.lang
rename to htdocs/langs/es_PY/boxes.lang
diff --git a/public/langs/es_PY/cashdesk.lang b/htdocs/langs/es_PY/cashdesk.lang
similarity index 100%
rename from public/langs/es_PY/cashdesk.lang
rename to htdocs/langs/es_PY/cashdesk.lang
diff --git a/public/langs/es_PY/categories.lang b/htdocs/langs/es_PY/categories.lang
similarity index 100%
rename from public/langs/es_PY/categories.lang
rename to htdocs/langs/es_PY/categories.lang
diff --git a/public/langs/es_PY/commercial.lang b/htdocs/langs/es_PY/commercial.lang
similarity index 100%
rename from public/langs/es_PY/commercial.lang
rename to htdocs/langs/es_PY/commercial.lang
diff --git a/public/langs/es_PY/companies.lang b/htdocs/langs/es_PY/companies.lang
similarity index 100%
rename from public/langs/es_PY/companies.lang
rename to htdocs/langs/es_PY/companies.lang
diff --git a/public/langs/es_PY/compta.lang b/htdocs/langs/es_PY/compta.lang
similarity index 100%
rename from public/langs/es_PY/compta.lang
rename to htdocs/langs/es_PY/compta.lang
diff --git a/public/langs/es_PY/contracts.lang b/htdocs/langs/es_PY/contracts.lang
similarity index 100%
rename from public/langs/es_PY/contracts.lang
rename to htdocs/langs/es_PY/contracts.lang
diff --git a/public/langs/es_PY/cron.lang b/htdocs/langs/es_PY/cron.lang
similarity index 100%
rename from public/langs/es_PY/cron.lang
rename to htdocs/langs/es_PY/cron.lang
diff --git a/public/langs/es_PY/deliveries.lang b/htdocs/langs/es_PY/deliveries.lang
similarity index 100%
rename from public/langs/es_PY/deliveries.lang
rename to htdocs/langs/es_PY/deliveries.lang
diff --git a/public/langs/es_PY/dict.lang b/htdocs/langs/es_PY/dict.lang
similarity index 100%
rename from public/langs/es_PY/dict.lang
rename to htdocs/langs/es_PY/dict.lang
diff --git a/public/langs/es_PY/donations.lang b/htdocs/langs/es_PY/donations.lang
similarity index 100%
rename from public/langs/es_PY/donations.lang
rename to htdocs/langs/es_PY/donations.lang
diff --git a/public/langs/es_PY/ecm.lang b/htdocs/langs/es_PY/ecm.lang
similarity index 100%
rename from public/langs/es_PY/ecm.lang
rename to htdocs/langs/es_PY/ecm.lang
diff --git a/public/langs/es_PY/errors.lang b/htdocs/langs/es_PY/errors.lang
similarity index 100%
rename from public/langs/es_PY/errors.lang
rename to htdocs/langs/es_PY/errors.lang
diff --git a/public/langs/es_PY/exports.lang b/htdocs/langs/es_PY/exports.lang
similarity index 100%
rename from public/langs/es_PY/exports.lang
rename to htdocs/langs/es_PY/exports.lang
diff --git a/public/langs/es_PY/externalsite.lang b/htdocs/langs/es_PY/externalsite.lang
similarity index 100%
rename from public/langs/es_PY/externalsite.lang
rename to htdocs/langs/es_PY/externalsite.lang
diff --git a/public/langs/es_PY/ftp.lang b/htdocs/langs/es_PY/ftp.lang
similarity index 100%
rename from public/langs/es_PY/ftp.lang
rename to htdocs/langs/es_PY/ftp.lang
diff --git a/public/langs/es_PY/help.lang b/htdocs/langs/es_PY/help.lang
similarity index 100%
rename from public/langs/es_PY/help.lang
rename to htdocs/langs/es_PY/help.lang
diff --git a/public/langs/es_PY/holiday.lang b/htdocs/langs/es_PY/holiday.lang
similarity index 100%
rename from public/langs/es_PY/holiday.lang
rename to htdocs/langs/es_PY/holiday.lang
diff --git a/public/langs/es_PY/hrm.lang b/htdocs/langs/es_PY/hrm.lang
similarity index 100%
rename from public/langs/es_PY/hrm.lang
rename to htdocs/langs/es_PY/hrm.lang
diff --git a/public/langs/es_PY/incoterm.lang b/htdocs/langs/es_PY/incoterm.lang
similarity index 100%
rename from public/langs/es_PY/incoterm.lang
rename to htdocs/langs/es_PY/incoterm.lang
diff --git a/public/langs/es_PY/install.lang b/htdocs/langs/es_PY/install.lang
similarity index 100%
rename from public/langs/es_PY/install.lang
rename to htdocs/langs/es_PY/install.lang
diff --git a/public/langs/es_PY/interventions.lang b/htdocs/langs/es_PY/interventions.lang
similarity index 100%
rename from public/langs/es_PY/interventions.lang
rename to htdocs/langs/es_PY/interventions.lang
diff --git a/public/langs/es_PY/languages.lang b/htdocs/langs/es_PY/languages.lang
similarity index 100%
rename from public/langs/es_PY/languages.lang
rename to htdocs/langs/es_PY/languages.lang
diff --git a/public/langs/es_PY/ldap.lang b/htdocs/langs/es_PY/ldap.lang
similarity index 100%
rename from public/langs/es_PY/ldap.lang
rename to htdocs/langs/es_PY/ldap.lang
diff --git a/public/langs/es_PY/link.lang b/htdocs/langs/es_PY/link.lang
similarity index 100%
rename from public/langs/es_PY/link.lang
rename to htdocs/langs/es_PY/link.lang
diff --git a/public/langs/es_PY/loan.lang b/htdocs/langs/es_PY/loan.lang
similarity index 100%
rename from public/langs/es_PY/loan.lang
rename to htdocs/langs/es_PY/loan.lang
diff --git a/public/langs/es_PY/mailmanspip.lang b/htdocs/langs/es_PY/mailmanspip.lang
similarity index 100%
rename from public/langs/es_PY/mailmanspip.lang
rename to htdocs/langs/es_PY/mailmanspip.lang
diff --git a/public/langs/es_PY/mails.lang b/htdocs/langs/es_PY/mails.lang
similarity index 100%
rename from public/langs/es_PY/mails.lang
rename to htdocs/langs/es_PY/mails.lang
diff --git a/public/langs/es_PY/main.lang b/htdocs/langs/es_PY/main.lang
similarity index 100%
rename from public/langs/es_PY/main.lang
rename to htdocs/langs/es_PY/main.lang
diff --git a/public/langs/es_PY/margins.lang b/htdocs/langs/es_PY/margins.lang
similarity index 100%
rename from public/langs/es_PY/margins.lang
rename to htdocs/langs/es_PY/margins.lang
diff --git a/public/langs/es_PY/members.lang b/htdocs/langs/es_PY/members.lang
similarity index 100%
rename from public/langs/es_PY/members.lang
rename to htdocs/langs/es_PY/members.lang
diff --git a/public/langs/es_PY/oauth.lang b/htdocs/langs/es_PY/oauth.lang
similarity index 100%
rename from public/langs/es_PY/oauth.lang
rename to htdocs/langs/es_PY/oauth.lang
diff --git a/public/langs/es_PY/opensurvey.lang b/htdocs/langs/es_PY/opensurvey.lang
similarity index 100%
rename from public/langs/es_PY/opensurvey.lang
rename to htdocs/langs/es_PY/opensurvey.lang
diff --git a/public/langs/es_PY/orders.lang b/htdocs/langs/es_PY/orders.lang
similarity index 100%
rename from public/langs/es_PY/orders.lang
rename to htdocs/langs/es_PY/orders.lang
diff --git a/public/langs/es_PY/other.lang b/htdocs/langs/es_PY/other.lang
similarity index 100%
rename from public/langs/es_PY/other.lang
rename to htdocs/langs/es_PY/other.lang
diff --git a/public/langs/es_PY/paybox.lang b/htdocs/langs/es_PY/paybox.lang
similarity index 100%
rename from public/langs/es_PY/paybox.lang
rename to htdocs/langs/es_PY/paybox.lang
diff --git a/public/langs/es_PY/paypal.lang b/htdocs/langs/es_PY/paypal.lang
similarity index 100%
rename from public/langs/es_PY/paypal.lang
rename to htdocs/langs/es_PY/paypal.lang
diff --git a/public/langs/es_PY/printing.lang b/htdocs/langs/es_PY/printing.lang
similarity index 100%
rename from public/langs/es_PY/printing.lang
rename to htdocs/langs/es_PY/printing.lang
diff --git a/public/langs/es_PY/productbatch.lang b/htdocs/langs/es_PY/productbatch.lang
similarity index 100%
rename from public/langs/es_PY/productbatch.lang
rename to htdocs/langs/es_PY/productbatch.lang
diff --git a/public/langs/es_PY/products.lang b/htdocs/langs/es_PY/products.lang
similarity index 100%
rename from public/langs/es_PY/products.lang
rename to htdocs/langs/es_PY/products.lang
diff --git a/public/langs/es_PY/projects.lang b/htdocs/langs/es_PY/projects.lang
similarity index 100%
rename from public/langs/es_PY/projects.lang
rename to htdocs/langs/es_PY/projects.lang
diff --git a/public/langs/es_PY/propal.lang b/htdocs/langs/es_PY/propal.lang
similarity index 100%
rename from public/langs/es_PY/propal.lang
rename to htdocs/langs/es_PY/propal.lang
diff --git a/public/langs/es_PY/receiptprinter.lang b/htdocs/langs/es_PY/receiptprinter.lang
similarity index 100%
rename from public/langs/es_PY/receiptprinter.lang
rename to htdocs/langs/es_PY/receiptprinter.lang
diff --git a/public/langs/es_PY/resource.lang b/htdocs/langs/es_PY/resource.lang
similarity index 100%
rename from public/langs/es_PY/resource.lang
rename to htdocs/langs/es_PY/resource.lang
diff --git a/public/langs/es_PY/salaries.lang b/htdocs/langs/es_PY/salaries.lang
similarity index 100%
rename from public/langs/es_PY/salaries.lang
rename to htdocs/langs/es_PY/salaries.lang
diff --git a/public/langs/es_PY/sendings.lang b/htdocs/langs/es_PY/sendings.lang
similarity index 100%
rename from public/langs/es_PY/sendings.lang
rename to htdocs/langs/es_PY/sendings.lang
diff --git a/public/langs/es_PY/sms.lang b/htdocs/langs/es_PY/sms.lang
similarity index 100%
rename from public/langs/es_PY/sms.lang
rename to htdocs/langs/es_PY/sms.lang
diff --git a/public/langs/es_PY/stocks.lang b/htdocs/langs/es_PY/stocks.lang
similarity index 100%
rename from public/langs/es_PY/stocks.lang
rename to htdocs/langs/es_PY/stocks.lang
diff --git a/public/langs/es_PY/supplier_proposal.lang b/htdocs/langs/es_PY/supplier_proposal.lang
similarity index 100%
rename from public/langs/es_PY/supplier_proposal.lang
rename to htdocs/langs/es_PY/supplier_proposal.lang
diff --git a/public/langs/es_PY/suppliers.lang b/htdocs/langs/es_PY/suppliers.lang
similarity index 100%
rename from public/langs/es_PY/suppliers.lang
rename to htdocs/langs/es_PY/suppliers.lang
diff --git a/public/langs/es_PY/trips.lang b/htdocs/langs/es_PY/trips.lang
similarity index 100%
rename from public/langs/es_PY/trips.lang
rename to htdocs/langs/es_PY/trips.lang
diff --git a/public/langs/es_PY/users.lang b/htdocs/langs/es_PY/users.lang
similarity index 100%
rename from public/langs/es_PY/users.lang
rename to htdocs/langs/es_PY/users.lang
diff --git a/public/langs/es_PY/website.lang b/htdocs/langs/es_PY/website.lang
similarity index 100%
rename from public/langs/es_PY/website.lang
rename to htdocs/langs/es_PY/website.lang
diff --git a/public/langs/es_PY/withdrawals.lang b/htdocs/langs/es_PY/withdrawals.lang
similarity index 100%
rename from public/langs/es_PY/withdrawals.lang
rename to htdocs/langs/es_PY/withdrawals.lang
diff --git a/public/langs/es_PY/workflow.lang b/htdocs/langs/es_PY/workflow.lang
similarity index 100%
rename from public/langs/es_PY/workflow.lang
rename to htdocs/langs/es_PY/workflow.lang
diff --git a/public/langs/es_VE/accountancy.lang b/htdocs/langs/es_VE/accountancy.lang
similarity index 100%
rename from public/langs/es_VE/accountancy.lang
rename to htdocs/langs/es_VE/accountancy.lang
diff --git a/public/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
similarity index 100%
rename from public/langs/es_VE/admin.lang
rename to htdocs/langs/es_VE/admin.lang
diff --git a/public/langs/es_VE/agenda.lang b/htdocs/langs/es_VE/agenda.lang
similarity index 100%
rename from public/langs/es_VE/agenda.lang
rename to htdocs/langs/es_VE/agenda.lang
diff --git a/public/langs/es_VE/banks.lang b/htdocs/langs/es_VE/banks.lang
similarity index 100%
rename from public/langs/es_VE/banks.lang
rename to htdocs/langs/es_VE/banks.lang
diff --git a/public/langs/es_VE/bills.lang b/htdocs/langs/es_VE/bills.lang
similarity index 100%
rename from public/langs/es_VE/bills.lang
rename to htdocs/langs/es_VE/bills.lang
diff --git a/public/langs/es_VE/bookmarks.lang b/htdocs/langs/es_VE/bookmarks.lang
similarity index 100%
rename from public/langs/es_VE/bookmarks.lang
rename to htdocs/langs/es_VE/bookmarks.lang
diff --git a/public/langs/es_VE/boxes.lang b/htdocs/langs/es_VE/boxes.lang
similarity index 100%
rename from public/langs/es_VE/boxes.lang
rename to htdocs/langs/es_VE/boxes.lang
diff --git a/public/langs/es_VE/cashdesk.lang b/htdocs/langs/es_VE/cashdesk.lang
similarity index 100%
rename from public/langs/es_VE/cashdesk.lang
rename to htdocs/langs/es_VE/cashdesk.lang
diff --git a/public/langs/es_VE/categories.lang b/htdocs/langs/es_VE/categories.lang
similarity index 100%
rename from public/langs/es_VE/categories.lang
rename to htdocs/langs/es_VE/categories.lang
diff --git a/public/langs/es_VE/commercial.lang b/htdocs/langs/es_VE/commercial.lang
similarity index 100%
rename from public/langs/es_VE/commercial.lang
rename to htdocs/langs/es_VE/commercial.lang
diff --git a/public/langs/es_VE/companies.lang b/htdocs/langs/es_VE/companies.lang
similarity index 100%
rename from public/langs/es_VE/companies.lang
rename to htdocs/langs/es_VE/companies.lang
diff --git a/public/langs/es_VE/compta.lang b/htdocs/langs/es_VE/compta.lang
similarity index 100%
rename from public/langs/es_VE/compta.lang
rename to htdocs/langs/es_VE/compta.lang
diff --git a/public/langs/es_VE/contracts.lang b/htdocs/langs/es_VE/contracts.lang
similarity index 100%
rename from public/langs/es_VE/contracts.lang
rename to htdocs/langs/es_VE/contracts.lang
diff --git a/public/langs/es_VE/cron.lang b/htdocs/langs/es_VE/cron.lang
similarity index 100%
rename from public/langs/es_VE/cron.lang
rename to htdocs/langs/es_VE/cron.lang
diff --git a/public/langs/es_VE/deliveries.lang b/htdocs/langs/es_VE/deliveries.lang
similarity index 100%
rename from public/langs/es_VE/deliveries.lang
rename to htdocs/langs/es_VE/deliveries.lang
diff --git a/public/langs/es_VE/dict.lang b/htdocs/langs/es_VE/dict.lang
similarity index 100%
rename from public/langs/es_VE/dict.lang
rename to htdocs/langs/es_VE/dict.lang
diff --git a/public/langs/es_VE/donations.lang b/htdocs/langs/es_VE/donations.lang
similarity index 100%
rename from public/langs/es_VE/donations.lang
rename to htdocs/langs/es_VE/donations.lang
diff --git a/public/langs/es_VE/ecm.lang b/htdocs/langs/es_VE/ecm.lang
similarity index 100%
rename from public/langs/es_VE/ecm.lang
rename to htdocs/langs/es_VE/ecm.lang
diff --git a/public/langs/es_VE/errors.lang b/htdocs/langs/es_VE/errors.lang
similarity index 100%
rename from public/langs/es_VE/errors.lang
rename to htdocs/langs/es_VE/errors.lang
diff --git a/public/langs/es_VE/exports.lang b/htdocs/langs/es_VE/exports.lang
similarity index 100%
rename from public/langs/es_VE/exports.lang
rename to htdocs/langs/es_VE/exports.lang
diff --git a/public/langs/es_VE/externalsite.lang b/htdocs/langs/es_VE/externalsite.lang
similarity index 100%
rename from public/langs/es_VE/externalsite.lang
rename to htdocs/langs/es_VE/externalsite.lang
diff --git a/public/langs/es_VE/ftp.lang b/htdocs/langs/es_VE/ftp.lang
similarity index 100%
rename from public/langs/es_VE/ftp.lang
rename to htdocs/langs/es_VE/ftp.lang
diff --git a/public/langs/es_VE/help.lang b/htdocs/langs/es_VE/help.lang
similarity index 100%
rename from public/langs/es_VE/help.lang
rename to htdocs/langs/es_VE/help.lang
diff --git a/public/langs/es_VE/holiday.lang b/htdocs/langs/es_VE/holiday.lang
similarity index 100%
rename from public/langs/es_VE/holiday.lang
rename to htdocs/langs/es_VE/holiday.lang
diff --git a/public/langs/es_VE/hrm.lang b/htdocs/langs/es_VE/hrm.lang
similarity index 100%
rename from public/langs/es_VE/hrm.lang
rename to htdocs/langs/es_VE/hrm.lang
diff --git a/public/langs/es_VE/incoterm.lang b/htdocs/langs/es_VE/incoterm.lang
similarity index 100%
rename from public/langs/es_VE/incoterm.lang
rename to htdocs/langs/es_VE/incoterm.lang
diff --git a/public/langs/es_VE/install.lang b/htdocs/langs/es_VE/install.lang
similarity index 100%
rename from public/langs/es_VE/install.lang
rename to htdocs/langs/es_VE/install.lang
diff --git a/public/langs/es_VE/interventions.lang b/htdocs/langs/es_VE/interventions.lang
similarity index 100%
rename from public/langs/es_VE/interventions.lang
rename to htdocs/langs/es_VE/interventions.lang
diff --git a/public/langs/es_VE/languages.lang b/htdocs/langs/es_VE/languages.lang
similarity index 100%
rename from public/langs/es_VE/languages.lang
rename to htdocs/langs/es_VE/languages.lang
diff --git a/public/langs/es_VE/ldap.lang b/htdocs/langs/es_VE/ldap.lang
similarity index 100%
rename from public/langs/es_VE/ldap.lang
rename to htdocs/langs/es_VE/ldap.lang
diff --git a/public/langs/es_VE/link.lang b/htdocs/langs/es_VE/link.lang
similarity index 100%
rename from public/langs/es_VE/link.lang
rename to htdocs/langs/es_VE/link.lang
diff --git a/public/langs/es_VE/loan.lang b/htdocs/langs/es_VE/loan.lang
similarity index 100%
rename from public/langs/es_VE/loan.lang
rename to htdocs/langs/es_VE/loan.lang
diff --git a/public/langs/es_VE/mailmanspip.lang b/htdocs/langs/es_VE/mailmanspip.lang
similarity index 100%
rename from public/langs/es_VE/mailmanspip.lang
rename to htdocs/langs/es_VE/mailmanspip.lang
diff --git a/public/langs/es_VE/mails.lang b/htdocs/langs/es_VE/mails.lang
similarity index 100%
rename from public/langs/es_VE/mails.lang
rename to htdocs/langs/es_VE/mails.lang
diff --git a/public/langs/es_VE/main.lang b/htdocs/langs/es_VE/main.lang
similarity index 100%
rename from public/langs/es_VE/main.lang
rename to htdocs/langs/es_VE/main.lang
diff --git a/public/langs/es_VE/margins.lang b/htdocs/langs/es_VE/margins.lang
similarity index 100%
rename from public/langs/es_VE/margins.lang
rename to htdocs/langs/es_VE/margins.lang
diff --git a/public/langs/es_VE/members.lang b/htdocs/langs/es_VE/members.lang
similarity index 100%
rename from public/langs/es_VE/members.lang
rename to htdocs/langs/es_VE/members.lang
diff --git a/public/langs/es_VE/oauth.lang b/htdocs/langs/es_VE/oauth.lang
similarity index 100%
rename from public/langs/es_VE/oauth.lang
rename to htdocs/langs/es_VE/oauth.lang
diff --git a/public/langs/es_VE/opensurvey.lang b/htdocs/langs/es_VE/opensurvey.lang
similarity index 100%
rename from public/langs/es_VE/opensurvey.lang
rename to htdocs/langs/es_VE/opensurvey.lang
diff --git a/public/langs/es_VE/orders.lang b/htdocs/langs/es_VE/orders.lang
similarity index 100%
rename from public/langs/es_VE/orders.lang
rename to htdocs/langs/es_VE/orders.lang
diff --git a/public/langs/es_VE/other.lang b/htdocs/langs/es_VE/other.lang
similarity index 100%
rename from public/langs/es_VE/other.lang
rename to htdocs/langs/es_VE/other.lang
diff --git a/public/langs/es_VE/paybox.lang b/htdocs/langs/es_VE/paybox.lang
similarity index 100%
rename from public/langs/es_VE/paybox.lang
rename to htdocs/langs/es_VE/paybox.lang
diff --git a/public/langs/es_VE/paypal.lang b/htdocs/langs/es_VE/paypal.lang
similarity index 100%
rename from public/langs/es_VE/paypal.lang
rename to htdocs/langs/es_VE/paypal.lang
diff --git a/public/langs/es_VE/printing.lang b/htdocs/langs/es_VE/printing.lang
similarity index 100%
rename from public/langs/es_VE/printing.lang
rename to htdocs/langs/es_VE/printing.lang
diff --git a/public/langs/es_VE/productbatch.lang b/htdocs/langs/es_VE/productbatch.lang
similarity index 100%
rename from public/langs/es_VE/productbatch.lang
rename to htdocs/langs/es_VE/productbatch.lang
diff --git a/public/langs/es_VE/products.lang b/htdocs/langs/es_VE/products.lang
similarity index 100%
rename from public/langs/es_VE/products.lang
rename to htdocs/langs/es_VE/products.lang
diff --git a/public/langs/es_VE/projects.lang b/htdocs/langs/es_VE/projects.lang
similarity index 100%
rename from public/langs/es_VE/projects.lang
rename to htdocs/langs/es_VE/projects.lang
diff --git a/public/langs/es_VE/propal.lang b/htdocs/langs/es_VE/propal.lang
similarity index 100%
rename from public/langs/es_VE/propal.lang
rename to htdocs/langs/es_VE/propal.lang
diff --git a/public/langs/es_VE/receiptprinter.lang b/htdocs/langs/es_VE/receiptprinter.lang
similarity index 100%
rename from public/langs/es_VE/receiptprinter.lang
rename to htdocs/langs/es_VE/receiptprinter.lang
diff --git a/public/langs/es_VE/resource.lang b/htdocs/langs/es_VE/resource.lang
similarity index 100%
rename from public/langs/es_VE/resource.lang
rename to htdocs/langs/es_VE/resource.lang
diff --git a/public/langs/es_VE/salaries.lang b/htdocs/langs/es_VE/salaries.lang
similarity index 100%
rename from public/langs/es_VE/salaries.lang
rename to htdocs/langs/es_VE/salaries.lang
diff --git a/public/langs/es_VE/sendings.lang b/htdocs/langs/es_VE/sendings.lang
similarity index 100%
rename from public/langs/es_VE/sendings.lang
rename to htdocs/langs/es_VE/sendings.lang
diff --git a/public/langs/es_VE/sms.lang b/htdocs/langs/es_VE/sms.lang
similarity index 100%
rename from public/langs/es_VE/sms.lang
rename to htdocs/langs/es_VE/sms.lang
diff --git a/public/langs/es_VE/stocks.lang b/htdocs/langs/es_VE/stocks.lang
similarity index 100%
rename from public/langs/es_VE/stocks.lang
rename to htdocs/langs/es_VE/stocks.lang
diff --git a/public/langs/es_VE/supplier_proposal.lang b/htdocs/langs/es_VE/supplier_proposal.lang
similarity index 100%
rename from public/langs/es_VE/supplier_proposal.lang
rename to htdocs/langs/es_VE/supplier_proposal.lang
diff --git a/public/langs/es_VE/suppliers.lang b/htdocs/langs/es_VE/suppliers.lang
similarity index 100%
rename from public/langs/es_VE/suppliers.lang
rename to htdocs/langs/es_VE/suppliers.lang
diff --git a/public/langs/es_VE/trips.lang b/htdocs/langs/es_VE/trips.lang
similarity index 100%
rename from public/langs/es_VE/trips.lang
rename to htdocs/langs/es_VE/trips.lang
diff --git a/public/langs/es_VE/users.lang b/htdocs/langs/es_VE/users.lang
similarity index 100%
rename from public/langs/es_VE/users.lang
rename to htdocs/langs/es_VE/users.lang
diff --git a/public/langs/es_VE/website.lang b/htdocs/langs/es_VE/website.lang
similarity index 100%
rename from public/langs/es_VE/website.lang
rename to htdocs/langs/es_VE/website.lang
diff --git a/public/langs/es_VE/withdrawals.lang b/htdocs/langs/es_VE/withdrawals.lang
similarity index 100%
rename from public/langs/es_VE/withdrawals.lang
rename to htdocs/langs/es_VE/withdrawals.lang
diff --git a/public/langs/es_VE/workflow.lang b/htdocs/langs/es_VE/workflow.lang
similarity index 100%
rename from public/langs/es_VE/workflow.lang
rename to htdocs/langs/es_VE/workflow.lang
diff --git a/public/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
similarity index 100%
rename from public/langs/et_EE/accountancy.lang
rename to htdocs/langs/et_EE/accountancy.lang
diff --git a/public/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
similarity index 100%
rename from public/langs/et_EE/admin.lang
rename to htdocs/langs/et_EE/admin.lang
diff --git a/public/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang
similarity index 100%
rename from public/langs/et_EE/agenda.lang
rename to htdocs/langs/et_EE/agenda.lang
diff --git a/public/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
similarity index 100%
rename from public/langs/et_EE/banks.lang
rename to htdocs/langs/et_EE/banks.lang
diff --git a/public/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
similarity index 100%
rename from public/langs/et_EE/bills.lang
rename to htdocs/langs/et_EE/bills.lang
diff --git a/public/langs/et_EE/bookmarks.lang b/htdocs/langs/et_EE/bookmarks.lang
similarity index 100%
rename from public/langs/et_EE/bookmarks.lang
rename to htdocs/langs/et_EE/bookmarks.lang
diff --git a/public/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang
similarity index 100%
rename from public/langs/et_EE/boxes.lang
rename to htdocs/langs/et_EE/boxes.lang
diff --git a/public/langs/et_EE/cashdesk.lang b/htdocs/langs/et_EE/cashdesk.lang
similarity index 100%
rename from public/langs/et_EE/cashdesk.lang
rename to htdocs/langs/et_EE/cashdesk.lang
diff --git a/public/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang
similarity index 100%
rename from public/langs/et_EE/categories.lang
rename to htdocs/langs/et_EE/categories.lang
diff --git a/public/langs/et_EE/commercial.lang b/htdocs/langs/et_EE/commercial.lang
similarity index 100%
rename from public/langs/et_EE/commercial.lang
rename to htdocs/langs/et_EE/commercial.lang
diff --git a/public/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
similarity index 100%
rename from public/langs/et_EE/companies.lang
rename to htdocs/langs/et_EE/companies.lang
diff --git a/public/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
similarity index 100%
rename from public/langs/et_EE/compta.lang
rename to htdocs/langs/et_EE/compta.lang
diff --git a/public/langs/et_EE/contracts.lang b/htdocs/langs/et_EE/contracts.lang
similarity index 100%
rename from public/langs/et_EE/contracts.lang
rename to htdocs/langs/et_EE/contracts.lang
diff --git a/public/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
similarity index 100%
rename from public/langs/et_EE/cron.lang
rename to htdocs/langs/et_EE/cron.lang
diff --git a/public/langs/et_EE/deliveries.lang b/htdocs/langs/et_EE/deliveries.lang
similarity index 100%
rename from public/langs/et_EE/deliveries.lang
rename to htdocs/langs/et_EE/deliveries.lang
diff --git a/public/langs/et_EE/dict.lang b/htdocs/langs/et_EE/dict.lang
similarity index 100%
rename from public/langs/et_EE/dict.lang
rename to htdocs/langs/et_EE/dict.lang
diff --git a/public/langs/et_EE/donations.lang b/htdocs/langs/et_EE/donations.lang
similarity index 100%
rename from public/langs/et_EE/donations.lang
rename to htdocs/langs/et_EE/donations.lang
diff --git a/public/langs/et_EE/ecm.lang b/htdocs/langs/et_EE/ecm.lang
similarity index 100%
rename from public/langs/et_EE/ecm.lang
rename to htdocs/langs/et_EE/ecm.lang
diff --git a/public/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
similarity index 100%
rename from public/langs/et_EE/errors.lang
rename to htdocs/langs/et_EE/errors.lang
diff --git a/public/langs/et_EE/exports.lang b/htdocs/langs/et_EE/exports.lang
similarity index 100%
rename from public/langs/et_EE/exports.lang
rename to htdocs/langs/et_EE/exports.lang
diff --git a/public/langs/et_EE/externalsite.lang b/htdocs/langs/et_EE/externalsite.lang
similarity index 100%
rename from public/langs/et_EE/externalsite.lang
rename to htdocs/langs/et_EE/externalsite.lang
diff --git a/public/langs/et_EE/ftp.lang b/htdocs/langs/et_EE/ftp.lang
similarity index 100%
rename from public/langs/et_EE/ftp.lang
rename to htdocs/langs/et_EE/ftp.lang
diff --git a/public/langs/et_EE/help.lang b/htdocs/langs/et_EE/help.lang
similarity index 100%
rename from public/langs/et_EE/help.lang
rename to htdocs/langs/et_EE/help.lang
diff --git a/public/langs/et_EE/holiday.lang b/htdocs/langs/et_EE/holiday.lang
similarity index 100%
rename from public/langs/et_EE/holiday.lang
rename to htdocs/langs/et_EE/holiday.lang
diff --git a/public/langs/et_EE/hrm.lang b/htdocs/langs/et_EE/hrm.lang
similarity index 100%
rename from public/langs/et_EE/hrm.lang
rename to htdocs/langs/et_EE/hrm.lang
diff --git a/public/langs/et_EE/incoterm.lang b/htdocs/langs/et_EE/incoterm.lang
similarity index 100%
rename from public/langs/et_EE/incoterm.lang
rename to htdocs/langs/et_EE/incoterm.lang
diff --git a/public/langs/et_EE/install.lang b/htdocs/langs/et_EE/install.lang
similarity index 100%
rename from public/langs/et_EE/install.lang
rename to htdocs/langs/et_EE/install.lang
diff --git a/public/langs/et_EE/interventions.lang b/htdocs/langs/et_EE/interventions.lang
similarity index 100%
rename from public/langs/et_EE/interventions.lang
rename to htdocs/langs/et_EE/interventions.lang
diff --git a/public/langs/et_EE/languages.lang b/htdocs/langs/et_EE/languages.lang
similarity index 100%
rename from public/langs/et_EE/languages.lang
rename to htdocs/langs/et_EE/languages.lang
diff --git a/public/langs/et_EE/ldap.lang b/htdocs/langs/et_EE/ldap.lang
similarity index 100%
rename from public/langs/et_EE/ldap.lang
rename to htdocs/langs/et_EE/ldap.lang
diff --git a/public/langs/et_EE/link.lang b/htdocs/langs/et_EE/link.lang
similarity index 100%
rename from public/langs/et_EE/link.lang
rename to htdocs/langs/et_EE/link.lang
diff --git a/public/langs/et_EE/loan.lang b/htdocs/langs/et_EE/loan.lang
similarity index 100%
rename from public/langs/et_EE/loan.lang
rename to htdocs/langs/et_EE/loan.lang
diff --git a/public/langs/et_EE/mailmanspip.lang b/htdocs/langs/et_EE/mailmanspip.lang
similarity index 100%
rename from public/langs/et_EE/mailmanspip.lang
rename to htdocs/langs/et_EE/mailmanspip.lang
diff --git a/public/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
similarity index 100%
rename from public/langs/et_EE/mails.lang
rename to htdocs/langs/et_EE/mails.lang
diff --git a/public/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
similarity index 100%
rename from public/langs/et_EE/main.lang
rename to htdocs/langs/et_EE/main.lang
diff --git a/public/langs/et_EE/margins.lang b/htdocs/langs/et_EE/margins.lang
similarity index 100%
rename from public/langs/et_EE/margins.lang
rename to htdocs/langs/et_EE/margins.lang
diff --git a/public/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
similarity index 100%
rename from public/langs/et_EE/members.lang
rename to htdocs/langs/et_EE/members.lang
diff --git a/public/langs/et_EE/oauth.lang b/htdocs/langs/et_EE/oauth.lang
similarity index 100%
rename from public/langs/et_EE/oauth.lang
rename to htdocs/langs/et_EE/oauth.lang
diff --git a/public/langs/et_EE/opensurvey.lang b/htdocs/langs/et_EE/opensurvey.lang
similarity index 100%
rename from public/langs/et_EE/opensurvey.lang
rename to htdocs/langs/et_EE/opensurvey.lang
diff --git a/public/langs/et_EE/orders.lang b/htdocs/langs/et_EE/orders.lang
similarity index 100%
rename from public/langs/et_EE/orders.lang
rename to htdocs/langs/et_EE/orders.lang
diff --git a/public/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
similarity index 100%
rename from public/langs/et_EE/other.lang
rename to htdocs/langs/et_EE/other.lang
diff --git a/public/langs/et_EE/paybox.lang b/htdocs/langs/et_EE/paybox.lang
similarity index 100%
rename from public/langs/et_EE/paybox.lang
rename to htdocs/langs/et_EE/paybox.lang
diff --git a/public/langs/et_EE/paypal.lang b/htdocs/langs/et_EE/paypal.lang
similarity index 100%
rename from public/langs/et_EE/paypal.lang
rename to htdocs/langs/et_EE/paypal.lang
diff --git a/public/langs/et_EE/printing.lang b/htdocs/langs/et_EE/printing.lang
similarity index 100%
rename from public/langs/et_EE/printing.lang
rename to htdocs/langs/et_EE/printing.lang
diff --git a/public/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang
similarity index 100%
rename from public/langs/et_EE/productbatch.lang
rename to htdocs/langs/et_EE/productbatch.lang
diff --git a/public/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
similarity index 100%
rename from public/langs/et_EE/products.lang
rename to htdocs/langs/et_EE/products.lang
diff --git a/public/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
similarity index 100%
rename from public/langs/et_EE/projects.lang
rename to htdocs/langs/et_EE/projects.lang
diff --git a/public/langs/et_EE/propal.lang b/htdocs/langs/et_EE/propal.lang
similarity index 100%
rename from public/langs/et_EE/propal.lang
rename to htdocs/langs/et_EE/propal.lang
diff --git a/public/langs/et_EE/receiptprinter.lang b/htdocs/langs/et_EE/receiptprinter.lang
similarity index 100%
rename from public/langs/et_EE/receiptprinter.lang
rename to htdocs/langs/et_EE/receiptprinter.lang
diff --git a/public/langs/et_EE/resource.lang b/htdocs/langs/et_EE/resource.lang
similarity index 100%
rename from public/langs/et_EE/resource.lang
rename to htdocs/langs/et_EE/resource.lang
diff --git a/public/langs/et_EE/salaries.lang b/htdocs/langs/et_EE/salaries.lang
similarity index 100%
rename from public/langs/et_EE/salaries.lang
rename to htdocs/langs/et_EE/salaries.lang
diff --git a/public/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang
similarity index 100%
rename from public/langs/et_EE/sendings.lang
rename to htdocs/langs/et_EE/sendings.lang
diff --git a/public/langs/et_EE/sms.lang b/htdocs/langs/et_EE/sms.lang
similarity index 100%
rename from public/langs/et_EE/sms.lang
rename to htdocs/langs/et_EE/sms.lang
diff --git a/public/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
similarity index 100%
rename from public/langs/et_EE/stocks.lang
rename to htdocs/langs/et_EE/stocks.lang
diff --git a/public/langs/et_EE/supplier_proposal.lang b/htdocs/langs/et_EE/supplier_proposal.lang
similarity index 100%
rename from public/langs/et_EE/supplier_proposal.lang
rename to htdocs/langs/et_EE/supplier_proposal.lang
diff --git a/public/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
similarity index 100%
rename from public/langs/et_EE/suppliers.lang
rename to htdocs/langs/et_EE/suppliers.lang
diff --git a/public/langs/et_EE/trips.lang b/htdocs/langs/et_EE/trips.lang
similarity index 100%
rename from public/langs/et_EE/trips.lang
rename to htdocs/langs/et_EE/trips.lang
diff --git a/public/langs/et_EE/users.lang b/htdocs/langs/et_EE/users.lang
similarity index 100%
rename from public/langs/et_EE/users.lang
rename to htdocs/langs/et_EE/users.lang
diff --git a/public/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
similarity index 100%
rename from public/langs/et_EE/website.lang
rename to htdocs/langs/et_EE/website.lang
diff --git a/public/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
similarity index 100%
rename from public/langs/et_EE/withdrawals.lang
rename to htdocs/langs/et_EE/withdrawals.lang
diff --git a/public/langs/et_EE/workflow.lang b/htdocs/langs/et_EE/workflow.lang
similarity index 100%
rename from public/langs/et_EE/workflow.lang
rename to htdocs/langs/et_EE/workflow.lang
diff --git a/public/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
similarity index 100%
rename from public/langs/eu_ES/accountancy.lang
rename to htdocs/langs/eu_ES/accountancy.lang
diff --git a/public/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
similarity index 100%
rename from public/langs/eu_ES/admin.lang
rename to htdocs/langs/eu_ES/admin.lang
diff --git a/public/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang
similarity index 100%
rename from public/langs/eu_ES/agenda.lang
rename to htdocs/langs/eu_ES/agenda.lang
diff --git a/public/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
similarity index 100%
rename from public/langs/eu_ES/banks.lang
rename to htdocs/langs/eu_ES/banks.lang
diff --git a/public/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
similarity index 100%
rename from public/langs/eu_ES/bills.lang
rename to htdocs/langs/eu_ES/bills.lang
diff --git a/public/langs/eu_ES/bookmarks.lang b/htdocs/langs/eu_ES/bookmarks.lang
similarity index 100%
rename from public/langs/eu_ES/bookmarks.lang
rename to htdocs/langs/eu_ES/bookmarks.lang
diff --git a/public/langs/eu_ES/boxes.lang b/htdocs/langs/eu_ES/boxes.lang
similarity index 100%
rename from public/langs/eu_ES/boxes.lang
rename to htdocs/langs/eu_ES/boxes.lang
diff --git a/public/langs/eu_ES/cashdesk.lang b/htdocs/langs/eu_ES/cashdesk.lang
similarity index 100%
rename from public/langs/eu_ES/cashdesk.lang
rename to htdocs/langs/eu_ES/cashdesk.lang
diff --git a/public/langs/eu_ES/categories.lang b/htdocs/langs/eu_ES/categories.lang
similarity index 100%
rename from public/langs/eu_ES/categories.lang
rename to htdocs/langs/eu_ES/categories.lang
diff --git a/public/langs/eu_ES/commercial.lang b/htdocs/langs/eu_ES/commercial.lang
similarity index 100%
rename from public/langs/eu_ES/commercial.lang
rename to htdocs/langs/eu_ES/commercial.lang
diff --git a/public/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
similarity index 100%
rename from public/langs/eu_ES/companies.lang
rename to htdocs/langs/eu_ES/companies.lang
diff --git a/public/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
similarity index 100%
rename from public/langs/eu_ES/compta.lang
rename to htdocs/langs/eu_ES/compta.lang
diff --git a/public/langs/eu_ES/contracts.lang b/htdocs/langs/eu_ES/contracts.lang
similarity index 100%
rename from public/langs/eu_ES/contracts.lang
rename to htdocs/langs/eu_ES/contracts.lang
diff --git a/public/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
similarity index 100%
rename from public/langs/eu_ES/cron.lang
rename to htdocs/langs/eu_ES/cron.lang
diff --git a/public/langs/eu_ES/deliveries.lang b/htdocs/langs/eu_ES/deliveries.lang
similarity index 100%
rename from public/langs/eu_ES/deliveries.lang
rename to htdocs/langs/eu_ES/deliveries.lang
diff --git a/public/langs/eu_ES/dict.lang b/htdocs/langs/eu_ES/dict.lang
similarity index 100%
rename from public/langs/eu_ES/dict.lang
rename to htdocs/langs/eu_ES/dict.lang
diff --git a/public/langs/eu_ES/donations.lang b/htdocs/langs/eu_ES/donations.lang
similarity index 100%
rename from public/langs/eu_ES/donations.lang
rename to htdocs/langs/eu_ES/donations.lang
diff --git a/public/langs/eu_ES/ecm.lang b/htdocs/langs/eu_ES/ecm.lang
similarity index 100%
rename from public/langs/eu_ES/ecm.lang
rename to htdocs/langs/eu_ES/ecm.lang
diff --git a/public/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
similarity index 100%
rename from public/langs/eu_ES/errors.lang
rename to htdocs/langs/eu_ES/errors.lang
diff --git a/public/langs/eu_ES/expensereports.lang b/htdocs/langs/eu_ES/expensereports.lang
similarity index 100%
rename from public/langs/eu_ES/expensereports.lang
rename to htdocs/langs/eu_ES/expensereports.lang
diff --git a/public/langs/eu_ES/exports.lang b/htdocs/langs/eu_ES/exports.lang
similarity index 100%
rename from public/langs/eu_ES/exports.lang
rename to htdocs/langs/eu_ES/exports.lang
diff --git a/public/langs/eu_ES/externalsite.lang b/htdocs/langs/eu_ES/externalsite.lang
similarity index 100%
rename from public/langs/eu_ES/externalsite.lang
rename to htdocs/langs/eu_ES/externalsite.lang
diff --git a/public/langs/eu_ES/ftp.lang b/htdocs/langs/eu_ES/ftp.lang
similarity index 100%
rename from public/langs/eu_ES/ftp.lang
rename to htdocs/langs/eu_ES/ftp.lang
diff --git a/public/langs/eu_ES/help.lang b/htdocs/langs/eu_ES/help.lang
similarity index 100%
rename from public/langs/eu_ES/help.lang
rename to htdocs/langs/eu_ES/help.lang
diff --git a/public/langs/eu_ES/holiday.lang b/htdocs/langs/eu_ES/holiday.lang
similarity index 100%
rename from public/langs/eu_ES/holiday.lang
rename to htdocs/langs/eu_ES/holiday.lang
diff --git a/public/langs/eu_ES/hrm.lang b/htdocs/langs/eu_ES/hrm.lang
similarity index 100%
rename from public/langs/eu_ES/hrm.lang
rename to htdocs/langs/eu_ES/hrm.lang
diff --git a/public/langs/eu_ES/incoterm.lang b/htdocs/langs/eu_ES/incoterm.lang
similarity index 100%
rename from public/langs/eu_ES/incoterm.lang
rename to htdocs/langs/eu_ES/incoterm.lang
diff --git a/public/langs/eu_ES/install.lang b/htdocs/langs/eu_ES/install.lang
similarity index 100%
rename from public/langs/eu_ES/install.lang
rename to htdocs/langs/eu_ES/install.lang
diff --git a/public/langs/eu_ES/interventions.lang b/htdocs/langs/eu_ES/interventions.lang
similarity index 100%
rename from public/langs/eu_ES/interventions.lang
rename to htdocs/langs/eu_ES/interventions.lang
diff --git a/public/langs/eu_ES/languages.lang b/htdocs/langs/eu_ES/languages.lang
similarity index 100%
rename from public/langs/eu_ES/languages.lang
rename to htdocs/langs/eu_ES/languages.lang
diff --git a/public/langs/eu_ES/ldap.lang b/htdocs/langs/eu_ES/ldap.lang
similarity index 100%
rename from public/langs/eu_ES/ldap.lang
rename to htdocs/langs/eu_ES/ldap.lang
diff --git a/public/langs/eu_ES/link.lang b/htdocs/langs/eu_ES/link.lang
similarity index 100%
rename from public/langs/eu_ES/link.lang
rename to htdocs/langs/eu_ES/link.lang
diff --git a/public/langs/eu_ES/loan.lang b/htdocs/langs/eu_ES/loan.lang
similarity index 100%
rename from public/langs/eu_ES/loan.lang
rename to htdocs/langs/eu_ES/loan.lang
diff --git a/public/langs/eu_ES/mailmanspip.lang b/htdocs/langs/eu_ES/mailmanspip.lang
similarity index 100%
rename from public/langs/eu_ES/mailmanspip.lang
rename to htdocs/langs/eu_ES/mailmanspip.lang
diff --git a/public/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
similarity index 100%
rename from public/langs/eu_ES/mails.lang
rename to htdocs/langs/eu_ES/mails.lang
diff --git a/public/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
similarity index 100%
rename from public/langs/eu_ES/main.lang
rename to htdocs/langs/eu_ES/main.lang
diff --git a/public/langs/eu_ES/margins.lang b/htdocs/langs/eu_ES/margins.lang
similarity index 100%
rename from public/langs/eu_ES/margins.lang
rename to htdocs/langs/eu_ES/margins.lang
diff --git a/public/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
similarity index 100%
rename from public/langs/eu_ES/members.lang
rename to htdocs/langs/eu_ES/members.lang
diff --git a/public/langs/eu_ES/oauth.lang b/htdocs/langs/eu_ES/oauth.lang
similarity index 100%
rename from public/langs/eu_ES/oauth.lang
rename to htdocs/langs/eu_ES/oauth.lang
diff --git a/public/langs/eu_ES/opensurvey.lang b/htdocs/langs/eu_ES/opensurvey.lang
similarity index 100%
rename from public/langs/eu_ES/opensurvey.lang
rename to htdocs/langs/eu_ES/opensurvey.lang
diff --git a/public/langs/eu_ES/orders.lang b/htdocs/langs/eu_ES/orders.lang
similarity index 100%
rename from public/langs/eu_ES/orders.lang
rename to htdocs/langs/eu_ES/orders.lang
diff --git a/public/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
similarity index 100%
rename from public/langs/eu_ES/other.lang
rename to htdocs/langs/eu_ES/other.lang
diff --git a/public/langs/eu_ES/paybox.lang b/htdocs/langs/eu_ES/paybox.lang
similarity index 100%
rename from public/langs/eu_ES/paybox.lang
rename to htdocs/langs/eu_ES/paybox.lang
diff --git a/public/langs/eu_ES/paypal.lang b/htdocs/langs/eu_ES/paypal.lang
similarity index 100%
rename from public/langs/eu_ES/paypal.lang
rename to htdocs/langs/eu_ES/paypal.lang
diff --git a/public/langs/eu_ES/printing.lang b/htdocs/langs/eu_ES/printing.lang
similarity index 100%
rename from public/langs/eu_ES/printing.lang
rename to htdocs/langs/eu_ES/printing.lang
diff --git a/public/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang
similarity index 100%
rename from public/langs/eu_ES/productbatch.lang
rename to htdocs/langs/eu_ES/productbatch.lang
diff --git a/public/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
similarity index 100%
rename from public/langs/eu_ES/products.lang
rename to htdocs/langs/eu_ES/products.lang
diff --git a/public/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
similarity index 100%
rename from public/langs/eu_ES/projects.lang
rename to htdocs/langs/eu_ES/projects.lang
diff --git a/public/langs/eu_ES/propal.lang b/htdocs/langs/eu_ES/propal.lang
similarity index 100%
rename from public/langs/eu_ES/propal.lang
rename to htdocs/langs/eu_ES/propal.lang
diff --git a/public/langs/eu_ES/receiptprinter.lang b/htdocs/langs/eu_ES/receiptprinter.lang
similarity index 100%
rename from public/langs/eu_ES/receiptprinter.lang
rename to htdocs/langs/eu_ES/receiptprinter.lang
diff --git a/public/langs/eu_ES/resource.lang b/htdocs/langs/eu_ES/resource.lang
similarity index 100%
rename from public/langs/eu_ES/resource.lang
rename to htdocs/langs/eu_ES/resource.lang
diff --git a/public/langs/eu_ES/salaries.lang b/htdocs/langs/eu_ES/salaries.lang
similarity index 100%
rename from public/langs/eu_ES/salaries.lang
rename to htdocs/langs/eu_ES/salaries.lang
diff --git a/public/langs/eu_ES/sendings.lang b/htdocs/langs/eu_ES/sendings.lang
similarity index 100%
rename from public/langs/eu_ES/sendings.lang
rename to htdocs/langs/eu_ES/sendings.lang
diff --git a/public/langs/eu_ES/sms.lang b/htdocs/langs/eu_ES/sms.lang
similarity index 100%
rename from public/langs/eu_ES/sms.lang
rename to htdocs/langs/eu_ES/sms.lang
diff --git a/public/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
similarity index 100%
rename from public/langs/eu_ES/stocks.lang
rename to htdocs/langs/eu_ES/stocks.lang
diff --git a/public/langs/eu_ES/supplier_proposal.lang b/htdocs/langs/eu_ES/supplier_proposal.lang
similarity index 100%
rename from public/langs/eu_ES/supplier_proposal.lang
rename to htdocs/langs/eu_ES/supplier_proposal.lang
diff --git a/public/langs/eu_ES/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang
similarity index 100%
rename from public/langs/eu_ES/suppliers.lang
rename to htdocs/langs/eu_ES/suppliers.lang
diff --git a/public/langs/eu_ES/trips.lang b/htdocs/langs/eu_ES/trips.lang
similarity index 100%
rename from public/langs/eu_ES/trips.lang
rename to htdocs/langs/eu_ES/trips.lang
diff --git a/public/langs/eu_ES/users.lang b/htdocs/langs/eu_ES/users.lang
similarity index 100%
rename from public/langs/eu_ES/users.lang
rename to htdocs/langs/eu_ES/users.lang
diff --git a/public/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
similarity index 100%
rename from public/langs/eu_ES/website.lang
rename to htdocs/langs/eu_ES/website.lang
diff --git a/public/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
similarity index 100%
rename from public/langs/eu_ES/withdrawals.lang
rename to htdocs/langs/eu_ES/withdrawals.lang
diff --git a/public/langs/eu_ES/workflow.lang b/htdocs/langs/eu_ES/workflow.lang
similarity index 100%
rename from public/langs/eu_ES/workflow.lang
rename to htdocs/langs/eu_ES/workflow.lang
diff --git a/public/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
similarity index 100%
rename from public/langs/fa_IR/accountancy.lang
rename to htdocs/langs/fa_IR/accountancy.lang
diff --git a/public/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
similarity index 100%
rename from public/langs/fa_IR/admin.lang
rename to htdocs/langs/fa_IR/admin.lang
diff --git a/public/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang
similarity index 100%
rename from public/langs/fa_IR/agenda.lang
rename to htdocs/langs/fa_IR/agenda.lang
diff --git a/public/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
similarity index 100%
rename from public/langs/fa_IR/banks.lang
rename to htdocs/langs/fa_IR/banks.lang
diff --git a/public/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
similarity index 100%
rename from public/langs/fa_IR/bills.lang
rename to htdocs/langs/fa_IR/bills.lang
diff --git a/public/langs/fa_IR/bookmarks.lang b/htdocs/langs/fa_IR/bookmarks.lang
similarity index 100%
rename from public/langs/fa_IR/bookmarks.lang
rename to htdocs/langs/fa_IR/bookmarks.lang
diff --git a/public/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang
similarity index 100%
rename from public/langs/fa_IR/boxes.lang
rename to htdocs/langs/fa_IR/boxes.lang
diff --git a/public/langs/fa_IR/cashdesk.lang b/htdocs/langs/fa_IR/cashdesk.lang
similarity index 100%
rename from public/langs/fa_IR/cashdesk.lang
rename to htdocs/langs/fa_IR/cashdesk.lang
diff --git a/public/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang
similarity index 100%
rename from public/langs/fa_IR/categories.lang
rename to htdocs/langs/fa_IR/categories.lang
diff --git a/public/langs/fa_IR/commercial.lang b/htdocs/langs/fa_IR/commercial.lang
similarity index 100%
rename from public/langs/fa_IR/commercial.lang
rename to htdocs/langs/fa_IR/commercial.lang
diff --git a/public/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
similarity index 100%
rename from public/langs/fa_IR/companies.lang
rename to htdocs/langs/fa_IR/companies.lang
diff --git a/public/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
similarity index 100%
rename from public/langs/fa_IR/compta.lang
rename to htdocs/langs/fa_IR/compta.lang
diff --git a/public/langs/fa_IR/contracts.lang b/htdocs/langs/fa_IR/contracts.lang
similarity index 100%
rename from public/langs/fa_IR/contracts.lang
rename to htdocs/langs/fa_IR/contracts.lang
diff --git a/public/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
similarity index 100%
rename from public/langs/fa_IR/cron.lang
rename to htdocs/langs/fa_IR/cron.lang
diff --git a/public/langs/fa_IR/deliveries.lang b/htdocs/langs/fa_IR/deliveries.lang
similarity index 100%
rename from public/langs/fa_IR/deliveries.lang
rename to htdocs/langs/fa_IR/deliveries.lang
diff --git a/public/langs/fa_IR/dict.lang b/htdocs/langs/fa_IR/dict.lang
similarity index 100%
rename from public/langs/fa_IR/dict.lang
rename to htdocs/langs/fa_IR/dict.lang
diff --git a/public/langs/fa_IR/domains.lang b/htdocs/langs/fa_IR/domains.lang
similarity index 100%
rename from public/langs/fa_IR/domains.lang
rename to htdocs/langs/fa_IR/domains.lang
diff --git a/public/langs/fa_IR/donations.lang b/htdocs/langs/fa_IR/donations.lang
similarity index 100%
rename from public/langs/fa_IR/donations.lang
rename to htdocs/langs/fa_IR/donations.lang
diff --git a/public/langs/fa_IR/ecm.lang b/htdocs/langs/fa_IR/ecm.lang
similarity index 100%
rename from public/langs/fa_IR/ecm.lang
rename to htdocs/langs/fa_IR/ecm.lang
diff --git a/public/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
similarity index 100%
rename from public/langs/fa_IR/errors.lang
rename to htdocs/langs/fa_IR/errors.lang
diff --git a/public/langs/fa_IR/exports.lang b/htdocs/langs/fa_IR/exports.lang
similarity index 100%
rename from public/langs/fa_IR/exports.lang
rename to htdocs/langs/fa_IR/exports.lang
diff --git a/public/langs/fa_IR/externalsite.lang b/htdocs/langs/fa_IR/externalsite.lang
similarity index 100%
rename from public/langs/fa_IR/externalsite.lang
rename to htdocs/langs/fa_IR/externalsite.lang
diff --git a/public/langs/fa_IR/ftp.lang b/htdocs/langs/fa_IR/ftp.lang
similarity index 100%
rename from public/langs/fa_IR/ftp.lang
rename to htdocs/langs/fa_IR/ftp.lang
diff --git a/public/langs/fa_IR/help.lang b/htdocs/langs/fa_IR/help.lang
similarity index 100%
rename from public/langs/fa_IR/help.lang
rename to htdocs/langs/fa_IR/help.lang
diff --git a/public/langs/fa_IR/holiday.lang b/htdocs/langs/fa_IR/holiday.lang
similarity index 100%
rename from public/langs/fa_IR/holiday.lang
rename to htdocs/langs/fa_IR/holiday.lang
diff --git a/public/langs/fa_IR/hrm.lang b/htdocs/langs/fa_IR/hrm.lang
similarity index 100%
rename from public/langs/fa_IR/hrm.lang
rename to htdocs/langs/fa_IR/hrm.lang
diff --git a/public/langs/fa_IR/incoterm.lang b/htdocs/langs/fa_IR/incoterm.lang
similarity index 100%
rename from public/langs/fa_IR/incoterm.lang
rename to htdocs/langs/fa_IR/incoterm.lang
diff --git a/public/langs/fa_IR/install.lang b/htdocs/langs/fa_IR/install.lang
similarity index 100%
rename from public/langs/fa_IR/install.lang
rename to htdocs/langs/fa_IR/install.lang
diff --git a/public/langs/fa_IR/interventions.lang b/htdocs/langs/fa_IR/interventions.lang
similarity index 100%
rename from public/langs/fa_IR/interventions.lang
rename to htdocs/langs/fa_IR/interventions.lang
diff --git a/public/langs/fa_IR/languages.lang b/htdocs/langs/fa_IR/languages.lang
similarity index 100%
rename from public/langs/fa_IR/languages.lang
rename to htdocs/langs/fa_IR/languages.lang
diff --git a/public/langs/fa_IR/ldap.lang b/htdocs/langs/fa_IR/ldap.lang
similarity index 100%
rename from public/langs/fa_IR/ldap.lang
rename to htdocs/langs/fa_IR/ldap.lang
diff --git a/public/langs/fa_IR/link.lang b/htdocs/langs/fa_IR/link.lang
similarity index 100%
rename from public/langs/fa_IR/link.lang
rename to htdocs/langs/fa_IR/link.lang
diff --git a/public/langs/fa_IR/loan.lang b/htdocs/langs/fa_IR/loan.lang
similarity index 100%
rename from public/langs/fa_IR/loan.lang
rename to htdocs/langs/fa_IR/loan.lang
diff --git a/public/langs/fa_IR/mailmanspip.lang b/htdocs/langs/fa_IR/mailmanspip.lang
similarity index 100%
rename from public/langs/fa_IR/mailmanspip.lang
rename to htdocs/langs/fa_IR/mailmanspip.lang
diff --git a/public/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
similarity index 100%
rename from public/langs/fa_IR/mails.lang
rename to htdocs/langs/fa_IR/mails.lang
diff --git a/public/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
similarity index 100%
rename from public/langs/fa_IR/main.lang
rename to htdocs/langs/fa_IR/main.lang
diff --git a/public/langs/fa_IR/margins.lang b/htdocs/langs/fa_IR/margins.lang
similarity index 100%
rename from public/langs/fa_IR/margins.lang
rename to htdocs/langs/fa_IR/margins.lang
diff --git a/public/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
similarity index 100%
rename from public/langs/fa_IR/members.lang
rename to htdocs/langs/fa_IR/members.lang
diff --git a/public/langs/fa_IR/oauth.lang b/htdocs/langs/fa_IR/oauth.lang
similarity index 100%
rename from public/langs/fa_IR/oauth.lang
rename to htdocs/langs/fa_IR/oauth.lang
diff --git a/public/langs/fa_IR/opensurvey.lang b/htdocs/langs/fa_IR/opensurvey.lang
similarity index 100%
rename from public/langs/fa_IR/opensurvey.lang
rename to htdocs/langs/fa_IR/opensurvey.lang
diff --git a/public/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang
similarity index 100%
rename from public/langs/fa_IR/orders.lang
rename to htdocs/langs/fa_IR/orders.lang
diff --git a/public/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
similarity index 100%
rename from public/langs/fa_IR/other.lang
rename to htdocs/langs/fa_IR/other.lang
diff --git a/public/langs/fa_IR/paybox.lang b/htdocs/langs/fa_IR/paybox.lang
similarity index 100%
rename from public/langs/fa_IR/paybox.lang
rename to htdocs/langs/fa_IR/paybox.lang
diff --git a/public/langs/fa_IR/paypal.lang b/htdocs/langs/fa_IR/paypal.lang
similarity index 100%
rename from public/langs/fa_IR/paypal.lang
rename to htdocs/langs/fa_IR/paypal.lang
diff --git a/public/langs/fa_IR/printing.lang b/htdocs/langs/fa_IR/printing.lang
similarity index 100%
rename from public/langs/fa_IR/printing.lang
rename to htdocs/langs/fa_IR/printing.lang
diff --git a/public/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang
similarity index 100%
rename from public/langs/fa_IR/productbatch.lang
rename to htdocs/langs/fa_IR/productbatch.lang
diff --git a/public/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
similarity index 100%
rename from public/langs/fa_IR/products.lang
rename to htdocs/langs/fa_IR/products.lang
diff --git a/public/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
similarity index 100%
rename from public/langs/fa_IR/projects.lang
rename to htdocs/langs/fa_IR/projects.lang
diff --git a/public/langs/fa_IR/propal.lang b/htdocs/langs/fa_IR/propal.lang
similarity index 100%
rename from public/langs/fa_IR/propal.lang
rename to htdocs/langs/fa_IR/propal.lang
diff --git a/public/langs/fa_IR/receiptprinter.lang b/htdocs/langs/fa_IR/receiptprinter.lang
similarity index 100%
rename from public/langs/fa_IR/receiptprinter.lang
rename to htdocs/langs/fa_IR/receiptprinter.lang
diff --git a/public/langs/fa_IR/resource.lang b/htdocs/langs/fa_IR/resource.lang
similarity index 100%
rename from public/langs/fa_IR/resource.lang
rename to htdocs/langs/fa_IR/resource.lang
diff --git a/public/langs/fa_IR/salaries.lang b/htdocs/langs/fa_IR/salaries.lang
similarity index 100%
rename from public/langs/fa_IR/salaries.lang
rename to htdocs/langs/fa_IR/salaries.lang
diff --git a/public/langs/fa_IR/sendings.lang b/htdocs/langs/fa_IR/sendings.lang
similarity index 100%
rename from public/langs/fa_IR/sendings.lang
rename to htdocs/langs/fa_IR/sendings.lang
diff --git a/public/langs/fa_IR/sms.lang b/htdocs/langs/fa_IR/sms.lang
similarity index 100%
rename from public/langs/fa_IR/sms.lang
rename to htdocs/langs/fa_IR/sms.lang
diff --git a/public/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
similarity index 100%
rename from public/langs/fa_IR/stocks.lang
rename to htdocs/langs/fa_IR/stocks.lang
diff --git a/public/langs/fa_IR/supplier_proposal.lang b/htdocs/langs/fa_IR/supplier_proposal.lang
similarity index 100%
rename from public/langs/fa_IR/supplier_proposal.lang
rename to htdocs/langs/fa_IR/supplier_proposal.lang
diff --git a/public/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang
similarity index 100%
rename from public/langs/fa_IR/suppliers.lang
rename to htdocs/langs/fa_IR/suppliers.lang
diff --git a/public/langs/fa_IR/trips.lang b/htdocs/langs/fa_IR/trips.lang
similarity index 100%
rename from public/langs/fa_IR/trips.lang
rename to htdocs/langs/fa_IR/trips.lang
diff --git a/public/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
similarity index 100%
rename from public/langs/fa_IR/users.lang
rename to htdocs/langs/fa_IR/users.lang
diff --git a/public/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
similarity index 100%
rename from public/langs/fa_IR/website.lang
rename to htdocs/langs/fa_IR/website.lang
diff --git a/public/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
similarity index 100%
rename from public/langs/fa_IR/withdrawals.lang
rename to htdocs/langs/fa_IR/withdrawals.lang
diff --git a/public/langs/fa_IR/workflow.lang b/htdocs/langs/fa_IR/workflow.lang
similarity index 100%
rename from public/langs/fa_IR/workflow.lang
rename to htdocs/langs/fa_IR/workflow.lang
diff --git a/public/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
similarity index 100%
rename from public/langs/fi_FI/accountancy.lang
rename to htdocs/langs/fi_FI/accountancy.lang
diff --git a/public/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
similarity index 100%
rename from public/langs/fi_FI/admin.lang
rename to htdocs/langs/fi_FI/admin.lang
diff --git a/public/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang
similarity index 100%
rename from public/langs/fi_FI/agenda.lang
rename to htdocs/langs/fi_FI/agenda.lang
diff --git a/public/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
similarity index 100%
rename from public/langs/fi_FI/banks.lang
rename to htdocs/langs/fi_FI/banks.lang
diff --git a/public/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
similarity index 100%
rename from public/langs/fi_FI/bills.lang
rename to htdocs/langs/fi_FI/bills.lang
diff --git a/public/langs/fi_FI/bookmarks.lang b/htdocs/langs/fi_FI/bookmarks.lang
similarity index 100%
rename from public/langs/fi_FI/bookmarks.lang
rename to htdocs/langs/fi_FI/bookmarks.lang
diff --git a/public/langs/fi_FI/boxes.lang b/htdocs/langs/fi_FI/boxes.lang
similarity index 100%
rename from public/langs/fi_FI/boxes.lang
rename to htdocs/langs/fi_FI/boxes.lang
diff --git a/public/langs/fi_FI/cashdesk.lang b/htdocs/langs/fi_FI/cashdesk.lang
similarity index 100%
rename from public/langs/fi_FI/cashdesk.lang
rename to htdocs/langs/fi_FI/cashdesk.lang
diff --git a/public/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang
similarity index 100%
rename from public/langs/fi_FI/categories.lang
rename to htdocs/langs/fi_FI/categories.lang
diff --git a/public/langs/fi_FI/commercial.lang b/htdocs/langs/fi_FI/commercial.lang
similarity index 100%
rename from public/langs/fi_FI/commercial.lang
rename to htdocs/langs/fi_FI/commercial.lang
diff --git a/public/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
similarity index 100%
rename from public/langs/fi_FI/companies.lang
rename to htdocs/langs/fi_FI/companies.lang
diff --git a/public/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
similarity index 100%
rename from public/langs/fi_FI/compta.lang
rename to htdocs/langs/fi_FI/compta.lang
diff --git a/public/langs/fi_FI/contracts.lang b/htdocs/langs/fi_FI/contracts.lang
similarity index 100%
rename from public/langs/fi_FI/contracts.lang
rename to htdocs/langs/fi_FI/contracts.lang
diff --git a/public/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
similarity index 100%
rename from public/langs/fi_FI/cron.lang
rename to htdocs/langs/fi_FI/cron.lang
diff --git a/public/langs/fi_FI/deliveries.lang b/htdocs/langs/fi_FI/deliveries.lang
similarity index 100%
rename from public/langs/fi_FI/deliveries.lang
rename to htdocs/langs/fi_FI/deliveries.lang
diff --git a/public/langs/fi_FI/dict.lang b/htdocs/langs/fi_FI/dict.lang
similarity index 100%
rename from public/langs/fi_FI/dict.lang
rename to htdocs/langs/fi_FI/dict.lang
diff --git a/public/langs/fi_FI/donations.lang b/htdocs/langs/fi_FI/donations.lang
similarity index 100%
rename from public/langs/fi_FI/donations.lang
rename to htdocs/langs/fi_FI/donations.lang
diff --git a/public/langs/fi_FI/ecm.lang b/htdocs/langs/fi_FI/ecm.lang
similarity index 100%
rename from public/langs/fi_FI/ecm.lang
rename to htdocs/langs/fi_FI/ecm.lang
diff --git a/public/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
similarity index 100%
rename from public/langs/fi_FI/errors.lang
rename to htdocs/langs/fi_FI/errors.lang
diff --git a/public/langs/fi_FI/exports.lang b/htdocs/langs/fi_FI/exports.lang
similarity index 100%
rename from public/langs/fi_FI/exports.lang
rename to htdocs/langs/fi_FI/exports.lang
diff --git a/public/langs/fi_FI/externalsite.lang b/htdocs/langs/fi_FI/externalsite.lang
similarity index 100%
rename from public/langs/fi_FI/externalsite.lang
rename to htdocs/langs/fi_FI/externalsite.lang
diff --git a/public/langs/fi_FI/ftp.lang b/htdocs/langs/fi_FI/ftp.lang
similarity index 100%
rename from public/langs/fi_FI/ftp.lang
rename to htdocs/langs/fi_FI/ftp.lang
diff --git a/public/langs/fi_FI/help.lang b/htdocs/langs/fi_FI/help.lang
similarity index 100%
rename from public/langs/fi_FI/help.lang
rename to htdocs/langs/fi_FI/help.lang
diff --git a/public/langs/fi_FI/holiday.lang b/htdocs/langs/fi_FI/holiday.lang
similarity index 100%
rename from public/langs/fi_FI/holiday.lang
rename to htdocs/langs/fi_FI/holiday.lang
diff --git a/public/langs/fi_FI/hrm.lang b/htdocs/langs/fi_FI/hrm.lang
similarity index 100%
rename from public/langs/fi_FI/hrm.lang
rename to htdocs/langs/fi_FI/hrm.lang
diff --git a/public/langs/fi_FI/incoterm.lang b/htdocs/langs/fi_FI/incoterm.lang
similarity index 100%
rename from public/langs/fi_FI/incoterm.lang
rename to htdocs/langs/fi_FI/incoterm.lang
diff --git a/public/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
similarity index 100%
rename from public/langs/fi_FI/install.lang
rename to htdocs/langs/fi_FI/install.lang
diff --git a/public/langs/fi_FI/interventions.lang b/htdocs/langs/fi_FI/interventions.lang
similarity index 100%
rename from public/langs/fi_FI/interventions.lang
rename to htdocs/langs/fi_FI/interventions.lang
diff --git a/public/langs/fi_FI/languages.lang b/htdocs/langs/fi_FI/languages.lang
similarity index 100%
rename from public/langs/fi_FI/languages.lang
rename to htdocs/langs/fi_FI/languages.lang
diff --git a/public/langs/fi_FI/ldap.lang b/htdocs/langs/fi_FI/ldap.lang
similarity index 100%
rename from public/langs/fi_FI/ldap.lang
rename to htdocs/langs/fi_FI/ldap.lang
diff --git a/public/langs/fi_FI/link.lang b/htdocs/langs/fi_FI/link.lang
similarity index 100%
rename from public/langs/fi_FI/link.lang
rename to htdocs/langs/fi_FI/link.lang
diff --git a/public/langs/fi_FI/loan.lang b/htdocs/langs/fi_FI/loan.lang
similarity index 100%
rename from public/langs/fi_FI/loan.lang
rename to htdocs/langs/fi_FI/loan.lang
diff --git a/public/langs/fi_FI/mailmanspip.lang b/htdocs/langs/fi_FI/mailmanspip.lang
similarity index 100%
rename from public/langs/fi_FI/mailmanspip.lang
rename to htdocs/langs/fi_FI/mailmanspip.lang
diff --git a/public/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
similarity index 100%
rename from public/langs/fi_FI/mails.lang
rename to htdocs/langs/fi_FI/mails.lang
diff --git a/public/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
similarity index 100%
rename from public/langs/fi_FI/main.lang
rename to htdocs/langs/fi_FI/main.lang
diff --git a/public/langs/fi_FI/margins.lang b/htdocs/langs/fi_FI/margins.lang
similarity index 100%
rename from public/langs/fi_FI/margins.lang
rename to htdocs/langs/fi_FI/margins.lang
diff --git a/public/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
similarity index 100%
rename from public/langs/fi_FI/members.lang
rename to htdocs/langs/fi_FI/members.lang
diff --git a/public/langs/fi_FI/oauth.lang b/htdocs/langs/fi_FI/oauth.lang
similarity index 100%
rename from public/langs/fi_FI/oauth.lang
rename to htdocs/langs/fi_FI/oauth.lang
diff --git a/public/langs/fi_FI/opensurvey.lang b/htdocs/langs/fi_FI/opensurvey.lang
similarity index 100%
rename from public/langs/fi_FI/opensurvey.lang
rename to htdocs/langs/fi_FI/opensurvey.lang
diff --git a/public/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang
similarity index 100%
rename from public/langs/fi_FI/orders.lang
rename to htdocs/langs/fi_FI/orders.lang
diff --git a/public/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
similarity index 100%
rename from public/langs/fi_FI/other.lang
rename to htdocs/langs/fi_FI/other.lang
diff --git a/public/langs/fi_FI/paybox.lang b/htdocs/langs/fi_FI/paybox.lang
similarity index 100%
rename from public/langs/fi_FI/paybox.lang
rename to htdocs/langs/fi_FI/paybox.lang
diff --git a/public/langs/fi_FI/paypal.lang b/htdocs/langs/fi_FI/paypal.lang
similarity index 100%
rename from public/langs/fi_FI/paypal.lang
rename to htdocs/langs/fi_FI/paypal.lang
diff --git a/public/langs/fi_FI/printing.lang b/htdocs/langs/fi_FI/printing.lang
similarity index 100%
rename from public/langs/fi_FI/printing.lang
rename to htdocs/langs/fi_FI/printing.lang
diff --git a/public/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang
similarity index 100%
rename from public/langs/fi_FI/productbatch.lang
rename to htdocs/langs/fi_FI/productbatch.lang
diff --git a/public/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
similarity index 100%
rename from public/langs/fi_FI/products.lang
rename to htdocs/langs/fi_FI/products.lang
diff --git a/public/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
similarity index 100%
rename from public/langs/fi_FI/projects.lang
rename to htdocs/langs/fi_FI/projects.lang
diff --git a/public/langs/fi_FI/propal.lang b/htdocs/langs/fi_FI/propal.lang
similarity index 100%
rename from public/langs/fi_FI/propal.lang
rename to htdocs/langs/fi_FI/propal.lang
diff --git a/public/langs/fi_FI/receiptprinter.lang b/htdocs/langs/fi_FI/receiptprinter.lang
similarity index 100%
rename from public/langs/fi_FI/receiptprinter.lang
rename to htdocs/langs/fi_FI/receiptprinter.lang
diff --git a/public/langs/fi_FI/resource.lang b/htdocs/langs/fi_FI/resource.lang
similarity index 100%
rename from public/langs/fi_FI/resource.lang
rename to htdocs/langs/fi_FI/resource.lang
diff --git a/public/langs/fi_FI/salaries.lang b/htdocs/langs/fi_FI/salaries.lang
similarity index 100%
rename from public/langs/fi_FI/salaries.lang
rename to htdocs/langs/fi_FI/salaries.lang
diff --git a/public/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang
similarity index 100%
rename from public/langs/fi_FI/sendings.lang
rename to htdocs/langs/fi_FI/sendings.lang
diff --git a/public/langs/fi_FI/sms.lang b/htdocs/langs/fi_FI/sms.lang
similarity index 100%
rename from public/langs/fi_FI/sms.lang
rename to htdocs/langs/fi_FI/sms.lang
diff --git a/public/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
similarity index 100%
rename from public/langs/fi_FI/stocks.lang
rename to htdocs/langs/fi_FI/stocks.lang
diff --git a/public/langs/fi_FI/supplier_proposal.lang b/htdocs/langs/fi_FI/supplier_proposal.lang
similarity index 100%
rename from public/langs/fi_FI/supplier_proposal.lang
rename to htdocs/langs/fi_FI/supplier_proposal.lang
diff --git a/public/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang
similarity index 100%
rename from public/langs/fi_FI/suppliers.lang
rename to htdocs/langs/fi_FI/suppliers.lang
diff --git a/public/langs/fi_FI/trips.lang b/htdocs/langs/fi_FI/trips.lang
similarity index 100%
rename from public/langs/fi_FI/trips.lang
rename to htdocs/langs/fi_FI/trips.lang
diff --git a/public/langs/fi_FI/users.lang b/htdocs/langs/fi_FI/users.lang
similarity index 100%
rename from public/langs/fi_FI/users.lang
rename to htdocs/langs/fi_FI/users.lang
diff --git a/public/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
similarity index 100%
rename from public/langs/fi_FI/website.lang
rename to htdocs/langs/fi_FI/website.lang
diff --git a/public/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
similarity index 100%
rename from public/langs/fi_FI/withdrawals.lang
rename to htdocs/langs/fi_FI/withdrawals.lang
diff --git a/public/langs/fi_FI/workflow.lang b/htdocs/langs/fi_FI/workflow.lang
similarity index 100%
rename from public/langs/fi_FI/workflow.lang
rename to htdocs/langs/fi_FI/workflow.lang
diff --git a/public/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
similarity index 100%
rename from public/langs/fr_BE/accountancy.lang
rename to htdocs/langs/fr_BE/accountancy.lang
diff --git a/public/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
similarity index 100%
rename from public/langs/fr_BE/admin.lang
rename to htdocs/langs/fr_BE/admin.lang
diff --git a/public/langs/fr_BE/agenda.lang b/htdocs/langs/fr_BE/agenda.lang
similarity index 100%
rename from public/langs/fr_BE/agenda.lang
rename to htdocs/langs/fr_BE/agenda.lang
diff --git a/public/langs/fr_BE/banks.lang b/htdocs/langs/fr_BE/banks.lang
similarity index 100%
rename from public/langs/fr_BE/banks.lang
rename to htdocs/langs/fr_BE/banks.lang
diff --git a/public/langs/fr_BE/bills.lang b/htdocs/langs/fr_BE/bills.lang
similarity index 100%
rename from public/langs/fr_BE/bills.lang
rename to htdocs/langs/fr_BE/bills.lang
diff --git a/public/langs/fr_BE/bookmarks.lang b/htdocs/langs/fr_BE/bookmarks.lang
similarity index 100%
rename from public/langs/fr_BE/bookmarks.lang
rename to htdocs/langs/fr_BE/bookmarks.lang
diff --git a/public/langs/fr_BE/boxes.lang b/htdocs/langs/fr_BE/boxes.lang
similarity index 100%
rename from public/langs/fr_BE/boxes.lang
rename to htdocs/langs/fr_BE/boxes.lang
diff --git a/public/langs/fr_BE/cashdesk.lang b/htdocs/langs/fr_BE/cashdesk.lang
similarity index 100%
rename from public/langs/fr_BE/cashdesk.lang
rename to htdocs/langs/fr_BE/cashdesk.lang
diff --git a/public/langs/fr_BE/categories.lang b/htdocs/langs/fr_BE/categories.lang
similarity index 100%
rename from public/langs/fr_BE/categories.lang
rename to htdocs/langs/fr_BE/categories.lang
diff --git a/public/langs/fr_BE/commercial.lang b/htdocs/langs/fr_BE/commercial.lang
similarity index 100%
rename from public/langs/fr_BE/commercial.lang
rename to htdocs/langs/fr_BE/commercial.lang
diff --git a/public/langs/fr_BE/companies.lang b/htdocs/langs/fr_BE/companies.lang
similarity index 100%
rename from public/langs/fr_BE/companies.lang
rename to htdocs/langs/fr_BE/companies.lang
diff --git a/public/langs/fr_BE/compta.lang b/htdocs/langs/fr_BE/compta.lang
similarity index 100%
rename from public/langs/fr_BE/compta.lang
rename to htdocs/langs/fr_BE/compta.lang
diff --git a/public/langs/fr_BE/contracts.lang b/htdocs/langs/fr_BE/contracts.lang
similarity index 100%
rename from public/langs/fr_BE/contracts.lang
rename to htdocs/langs/fr_BE/contracts.lang
diff --git a/public/langs/fr_BE/cron.lang b/htdocs/langs/fr_BE/cron.lang
similarity index 100%
rename from public/langs/fr_BE/cron.lang
rename to htdocs/langs/fr_BE/cron.lang
diff --git a/public/langs/fr_BE/deliveries.lang b/htdocs/langs/fr_BE/deliveries.lang
similarity index 100%
rename from public/langs/fr_BE/deliveries.lang
rename to htdocs/langs/fr_BE/deliveries.lang
diff --git a/public/langs/fr_BE/dict.lang b/htdocs/langs/fr_BE/dict.lang
similarity index 100%
rename from public/langs/fr_BE/dict.lang
rename to htdocs/langs/fr_BE/dict.lang
diff --git a/public/langs/fr_BE/donations.lang b/htdocs/langs/fr_BE/donations.lang
similarity index 100%
rename from public/langs/fr_BE/donations.lang
rename to htdocs/langs/fr_BE/donations.lang
diff --git a/public/langs/fr_BE/ecm.lang b/htdocs/langs/fr_BE/ecm.lang
similarity index 100%
rename from public/langs/fr_BE/ecm.lang
rename to htdocs/langs/fr_BE/ecm.lang
diff --git a/public/langs/fr_BE/errors.lang b/htdocs/langs/fr_BE/errors.lang
similarity index 100%
rename from public/langs/fr_BE/errors.lang
rename to htdocs/langs/fr_BE/errors.lang
diff --git a/public/langs/fr_BE/exports.lang b/htdocs/langs/fr_BE/exports.lang
similarity index 100%
rename from public/langs/fr_BE/exports.lang
rename to htdocs/langs/fr_BE/exports.lang
diff --git a/public/langs/fr_BE/externalsite.lang b/htdocs/langs/fr_BE/externalsite.lang
similarity index 100%
rename from public/langs/fr_BE/externalsite.lang
rename to htdocs/langs/fr_BE/externalsite.lang
diff --git a/public/langs/fr_BE/ftp.lang b/htdocs/langs/fr_BE/ftp.lang
similarity index 100%
rename from public/langs/fr_BE/ftp.lang
rename to htdocs/langs/fr_BE/ftp.lang
diff --git a/public/langs/fr_BE/help.lang b/htdocs/langs/fr_BE/help.lang
similarity index 100%
rename from public/langs/fr_BE/help.lang
rename to htdocs/langs/fr_BE/help.lang
diff --git a/public/langs/fr_BE/holiday.lang b/htdocs/langs/fr_BE/holiday.lang
similarity index 100%
rename from public/langs/fr_BE/holiday.lang
rename to htdocs/langs/fr_BE/holiday.lang
diff --git a/public/langs/fr_BE/hrm.lang b/htdocs/langs/fr_BE/hrm.lang
similarity index 100%
rename from public/langs/fr_BE/hrm.lang
rename to htdocs/langs/fr_BE/hrm.lang
diff --git a/public/langs/fr_BE/incoterm.lang b/htdocs/langs/fr_BE/incoterm.lang
similarity index 100%
rename from public/langs/fr_BE/incoterm.lang
rename to htdocs/langs/fr_BE/incoterm.lang
diff --git a/public/langs/fr_BE/install.lang b/htdocs/langs/fr_BE/install.lang
similarity index 100%
rename from public/langs/fr_BE/install.lang
rename to htdocs/langs/fr_BE/install.lang
diff --git a/public/langs/fr_BE/interventions.lang b/htdocs/langs/fr_BE/interventions.lang
similarity index 100%
rename from public/langs/fr_BE/interventions.lang
rename to htdocs/langs/fr_BE/interventions.lang
diff --git a/public/langs/fr_BE/languages.lang b/htdocs/langs/fr_BE/languages.lang
similarity index 100%
rename from public/langs/fr_BE/languages.lang
rename to htdocs/langs/fr_BE/languages.lang
diff --git a/public/langs/fr_BE/ldap.lang b/htdocs/langs/fr_BE/ldap.lang
similarity index 100%
rename from public/langs/fr_BE/ldap.lang
rename to htdocs/langs/fr_BE/ldap.lang
diff --git a/public/langs/fr_BE/link.lang b/htdocs/langs/fr_BE/link.lang
similarity index 100%
rename from public/langs/fr_BE/link.lang
rename to htdocs/langs/fr_BE/link.lang
diff --git a/public/langs/fr_BE/loan.lang b/htdocs/langs/fr_BE/loan.lang
similarity index 100%
rename from public/langs/fr_BE/loan.lang
rename to htdocs/langs/fr_BE/loan.lang
diff --git a/public/langs/fr_BE/mailmanspip.lang b/htdocs/langs/fr_BE/mailmanspip.lang
similarity index 100%
rename from public/langs/fr_BE/mailmanspip.lang
rename to htdocs/langs/fr_BE/mailmanspip.lang
diff --git a/public/langs/fr_BE/mails.lang b/htdocs/langs/fr_BE/mails.lang
similarity index 100%
rename from public/langs/fr_BE/mails.lang
rename to htdocs/langs/fr_BE/mails.lang
diff --git a/public/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang
similarity index 100%
rename from public/langs/fr_BE/main.lang
rename to htdocs/langs/fr_BE/main.lang
diff --git a/public/langs/fr_BE/margins.lang b/htdocs/langs/fr_BE/margins.lang
similarity index 100%
rename from public/langs/fr_BE/margins.lang
rename to htdocs/langs/fr_BE/margins.lang
diff --git a/public/langs/fr_BE/members.lang b/htdocs/langs/fr_BE/members.lang
similarity index 100%
rename from public/langs/fr_BE/members.lang
rename to htdocs/langs/fr_BE/members.lang
diff --git a/public/langs/fr_BE/oauth.lang b/htdocs/langs/fr_BE/oauth.lang
similarity index 100%
rename from public/langs/fr_BE/oauth.lang
rename to htdocs/langs/fr_BE/oauth.lang
diff --git a/public/langs/fr_BE/opensurvey.lang b/htdocs/langs/fr_BE/opensurvey.lang
similarity index 100%
rename from public/langs/fr_BE/opensurvey.lang
rename to htdocs/langs/fr_BE/opensurvey.lang
diff --git a/public/langs/fr_BE/orders.lang b/htdocs/langs/fr_BE/orders.lang
similarity index 100%
rename from public/langs/fr_BE/orders.lang
rename to htdocs/langs/fr_BE/orders.lang
diff --git a/public/langs/fr_BE/other.lang b/htdocs/langs/fr_BE/other.lang
similarity index 100%
rename from public/langs/fr_BE/other.lang
rename to htdocs/langs/fr_BE/other.lang
diff --git a/public/langs/fr_BE/paybox.lang b/htdocs/langs/fr_BE/paybox.lang
similarity index 100%
rename from public/langs/fr_BE/paybox.lang
rename to htdocs/langs/fr_BE/paybox.lang
diff --git a/public/langs/fr_BE/paypal.lang b/htdocs/langs/fr_BE/paypal.lang
similarity index 100%
rename from public/langs/fr_BE/paypal.lang
rename to htdocs/langs/fr_BE/paypal.lang
diff --git a/public/langs/fr_BE/printing.lang b/htdocs/langs/fr_BE/printing.lang
similarity index 100%
rename from public/langs/fr_BE/printing.lang
rename to htdocs/langs/fr_BE/printing.lang
diff --git a/public/langs/fr_BE/productbatch.lang b/htdocs/langs/fr_BE/productbatch.lang
similarity index 100%
rename from public/langs/fr_BE/productbatch.lang
rename to htdocs/langs/fr_BE/productbatch.lang
diff --git a/public/langs/fr_BE/products.lang b/htdocs/langs/fr_BE/products.lang
similarity index 100%
rename from public/langs/fr_BE/products.lang
rename to htdocs/langs/fr_BE/products.lang
diff --git a/public/langs/fr_BE/projects.lang b/htdocs/langs/fr_BE/projects.lang
similarity index 100%
rename from public/langs/fr_BE/projects.lang
rename to htdocs/langs/fr_BE/projects.lang
diff --git a/public/langs/fr_BE/propal.lang b/htdocs/langs/fr_BE/propal.lang
similarity index 100%
rename from public/langs/fr_BE/propal.lang
rename to htdocs/langs/fr_BE/propal.lang
diff --git a/public/langs/fr_BE/receiptprinter.lang b/htdocs/langs/fr_BE/receiptprinter.lang
similarity index 100%
rename from public/langs/fr_BE/receiptprinter.lang
rename to htdocs/langs/fr_BE/receiptprinter.lang
diff --git a/public/langs/fr_BE/resource.lang b/htdocs/langs/fr_BE/resource.lang
similarity index 100%
rename from public/langs/fr_BE/resource.lang
rename to htdocs/langs/fr_BE/resource.lang
diff --git a/public/langs/fr_BE/salaries.lang b/htdocs/langs/fr_BE/salaries.lang
similarity index 100%
rename from public/langs/fr_BE/salaries.lang
rename to htdocs/langs/fr_BE/salaries.lang
diff --git a/public/langs/fr_BE/sendings.lang b/htdocs/langs/fr_BE/sendings.lang
similarity index 100%
rename from public/langs/fr_BE/sendings.lang
rename to htdocs/langs/fr_BE/sendings.lang
diff --git a/public/langs/fr_BE/sms.lang b/htdocs/langs/fr_BE/sms.lang
similarity index 100%
rename from public/langs/fr_BE/sms.lang
rename to htdocs/langs/fr_BE/sms.lang
diff --git a/public/langs/fr_BE/stocks.lang b/htdocs/langs/fr_BE/stocks.lang
similarity index 100%
rename from public/langs/fr_BE/stocks.lang
rename to htdocs/langs/fr_BE/stocks.lang
diff --git a/public/langs/fr_BE/supplier_proposal.lang b/htdocs/langs/fr_BE/supplier_proposal.lang
similarity index 100%
rename from public/langs/fr_BE/supplier_proposal.lang
rename to htdocs/langs/fr_BE/supplier_proposal.lang
diff --git a/public/langs/fr_BE/suppliers.lang b/htdocs/langs/fr_BE/suppliers.lang
similarity index 100%
rename from public/langs/fr_BE/suppliers.lang
rename to htdocs/langs/fr_BE/suppliers.lang
diff --git a/public/langs/fr_BE/trips.lang b/htdocs/langs/fr_BE/trips.lang
similarity index 100%
rename from public/langs/fr_BE/trips.lang
rename to htdocs/langs/fr_BE/trips.lang
diff --git a/public/langs/fr_BE/users.lang b/htdocs/langs/fr_BE/users.lang
similarity index 100%
rename from public/langs/fr_BE/users.lang
rename to htdocs/langs/fr_BE/users.lang
diff --git a/public/langs/fr_BE/website.lang b/htdocs/langs/fr_BE/website.lang
similarity index 100%
rename from public/langs/fr_BE/website.lang
rename to htdocs/langs/fr_BE/website.lang
diff --git a/public/langs/fr_BE/withdrawals.lang b/htdocs/langs/fr_BE/withdrawals.lang
similarity index 100%
rename from public/langs/fr_BE/withdrawals.lang
rename to htdocs/langs/fr_BE/withdrawals.lang
diff --git a/public/langs/fr_BE/workflow.lang b/htdocs/langs/fr_BE/workflow.lang
similarity index 100%
rename from public/langs/fr_BE/workflow.lang
rename to htdocs/langs/fr_BE/workflow.lang
diff --git a/public/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
similarity index 100%
rename from public/langs/fr_CA/accountancy.lang
rename to htdocs/langs/fr_CA/accountancy.lang
diff --git a/public/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
similarity index 100%
rename from public/langs/fr_CA/admin.lang
rename to htdocs/langs/fr_CA/admin.lang
diff --git a/public/langs/fr_CA/agenda.lang b/htdocs/langs/fr_CA/agenda.lang
similarity index 100%
rename from public/langs/fr_CA/agenda.lang
rename to htdocs/langs/fr_CA/agenda.lang
diff --git a/public/langs/fr_CA/banks.lang b/htdocs/langs/fr_CA/banks.lang
similarity index 100%
rename from public/langs/fr_CA/banks.lang
rename to htdocs/langs/fr_CA/banks.lang
diff --git a/public/langs/fr_CA/bills.lang b/htdocs/langs/fr_CA/bills.lang
similarity index 100%
rename from public/langs/fr_CA/bills.lang
rename to htdocs/langs/fr_CA/bills.lang
diff --git a/public/langs/fr_CA/bookmarks.lang b/htdocs/langs/fr_CA/bookmarks.lang
similarity index 100%
rename from public/langs/fr_CA/bookmarks.lang
rename to htdocs/langs/fr_CA/bookmarks.lang
diff --git a/public/langs/fr_CA/boxes.lang b/htdocs/langs/fr_CA/boxes.lang
similarity index 100%
rename from public/langs/fr_CA/boxes.lang
rename to htdocs/langs/fr_CA/boxes.lang
diff --git a/public/langs/fr_CA/cashdesk.lang b/htdocs/langs/fr_CA/cashdesk.lang
similarity index 100%
rename from public/langs/fr_CA/cashdesk.lang
rename to htdocs/langs/fr_CA/cashdesk.lang
diff --git a/public/langs/fr_CA/categories.lang b/htdocs/langs/fr_CA/categories.lang
similarity index 100%
rename from public/langs/fr_CA/categories.lang
rename to htdocs/langs/fr_CA/categories.lang
diff --git a/public/langs/fr_CA/commercial.lang b/htdocs/langs/fr_CA/commercial.lang
similarity index 100%
rename from public/langs/fr_CA/commercial.lang
rename to htdocs/langs/fr_CA/commercial.lang
diff --git a/public/langs/fr_CA/companies.lang b/htdocs/langs/fr_CA/companies.lang
similarity index 100%
rename from public/langs/fr_CA/companies.lang
rename to htdocs/langs/fr_CA/companies.lang
diff --git a/public/langs/fr_CA/compta.lang b/htdocs/langs/fr_CA/compta.lang
similarity index 100%
rename from public/langs/fr_CA/compta.lang
rename to htdocs/langs/fr_CA/compta.lang
diff --git a/public/langs/fr_CA/contracts.lang b/htdocs/langs/fr_CA/contracts.lang
similarity index 100%
rename from public/langs/fr_CA/contracts.lang
rename to htdocs/langs/fr_CA/contracts.lang
diff --git a/public/langs/fr_CA/cron.lang b/htdocs/langs/fr_CA/cron.lang
similarity index 100%
rename from public/langs/fr_CA/cron.lang
rename to htdocs/langs/fr_CA/cron.lang
diff --git a/public/langs/fr_CA/deliveries.lang b/htdocs/langs/fr_CA/deliveries.lang
similarity index 100%
rename from public/langs/fr_CA/deliveries.lang
rename to htdocs/langs/fr_CA/deliveries.lang
diff --git a/public/langs/fr_CA/dict.lang b/htdocs/langs/fr_CA/dict.lang
similarity index 100%
rename from public/langs/fr_CA/dict.lang
rename to htdocs/langs/fr_CA/dict.lang
diff --git a/public/langs/fr_CA/donations.lang b/htdocs/langs/fr_CA/donations.lang
similarity index 100%
rename from public/langs/fr_CA/donations.lang
rename to htdocs/langs/fr_CA/donations.lang
diff --git a/public/langs/fr_CA/ecm.lang b/htdocs/langs/fr_CA/ecm.lang
similarity index 100%
rename from public/langs/fr_CA/ecm.lang
rename to htdocs/langs/fr_CA/ecm.lang
diff --git a/public/langs/fr_CA/errors.lang b/htdocs/langs/fr_CA/errors.lang
similarity index 100%
rename from public/langs/fr_CA/errors.lang
rename to htdocs/langs/fr_CA/errors.lang
diff --git a/public/langs/fr_CA/exports.lang b/htdocs/langs/fr_CA/exports.lang
similarity index 100%
rename from public/langs/fr_CA/exports.lang
rename to htdocs/langs/fr_CA/exports.lang
diff --git a/public/langs/fr_CA/externalsite.lang b/htdocs/langs/fr_CA/externalsite.lang
similarity index 100%
rename from public/langs/fr_CA/externalsite.lang
rename to htdocs/langs/fr_CA/externalsite.lang
diff --git a/public/langs/fr_CA/ftp.lang b/htdocs/langs/fr_CA/ftp.lang
similarity index 100%
rename from public/langs/fr_CA/ftp.lang
rename to htdocs/langs/fr_CA/ftp.lang
diff --git a/public/langs/fr_CA/help.lang b/htdocs/langs/fr_CA/help.lang
similarity index 100%
rename from public/langs/fr_CA/help.lang
rename to htdocs/langs/fr_CA/help.lang
diff --git a/public/langs/fr_CA/holiday.lang b/htdocs/langs/fr_CA/holiday.lang
similarity index 100%
rename from public/langs/fr_CA/holiday.lang
rename to htdocs/langs/fr_CA/holiday.lang
diff --git a/public/langs/fr_CA/hrm.lang b/htdocs/langs/fr_CA/hrm.lang
similarity index 100%
rename from public/langs/fr_CA/hrm.lang
rename to htdocs/langs/fr_CA/hrm.lang
diff --git a/public/langs/fr_CA/incoterm.lang b/htdocs/langs/fr_CA/incoterm.lang
similarity index 100%
rename from public/langs/fr_CA/incoterm.lang
rename to htdocs/langs/fr_CA/incoterm.lang
diff --git a/public/langs/fr_CA/install.lang b/htdocs/langs/fr_CA/install.lang
similarity index 100%
rename from public/langs/fr_CA/install.lang
rename to htdocs/langs/fr_CA/install.lang
diff --git a/public/langs/fr_CA/interventions.lang b/htdocs/langs/fr_CA/interventions.lang
similarity index 100%
rename from public/langs/fr_CA/interventions.lang
rename to htdocs/langs/fr_CA/interventions.lang
diff --git a/public/langs/fr_CA/languages.lang b/htdocs/langs/fr_CA/languages.lang
similarity index 100%
rename from public/langs/fr_CA/languages.lang
rename to htdocs/langs/fr_CA/languages.lang
diff --git a/public/langs/fr_CA/ldap.lang b/htdocs/langs/fr_CA/ldap.lang
similarity index 100%
rename from public/langs/fr_CA/ldap.lang
rename to htdocs/langs/fr_CA/ldap.lang
diff --git a/public/langs/fr_CA/link.lang b/htdocs/langs/fr_CA/link.lang
similarity index 100%
rename from public/langs/fr_CA/link.lang
rename to htdocs/langs/fr_CA/link.lang
diff --git a/public/langs/fr_CA/loan.lang b/htdocs/langs/fr_CA/loan.lang
similarity index 100%
rename from public/langs/fr_CA/loan.lang
rename to htdocs/langs/fr_CA/loan.lang
diff --git a/public/langs/fr_CA/mailmanspip.lang b/htdocs/langs/fr_CA/mailmanspip.lang
similarity index 100%
rename from public/langs/fr_CA/mailmanspip.lang
rename to htdocs/langs/fr_CA/mailmanspip.lang
diff --git a/public/langs/fr_CA/mails.lang b/htdocs/langs/fr_CA/mails.lang
similarity index 100%
rename from public/langs/fr_CA/mails.lang
rename to htdocs/langs/fr_CA/mails.lang
diff --git a/public/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
similarity index 100%
rename from public/langs/fr_CA/main.lang
rename to htdocs/langs/fr_CA/main.lang
diff --git a/public/langs/fr_CA/margins.lang b/htdocs/langs/fr_CA/margins.lang
similarity index 100%
rename from public/langs/fr_CA/margins.lang
rename to htdocs/langs/fr_CA/margins.lang
diff --git a/public/langs/fr_CA/members.lang b/htdocs/langs/fr_CA/members.lang
similarity index 100%
rename from public/langs/fr_CA/members.lang
rename to htdocs/langs/fr_CA/members.lang
diff --git a/public/langs/fr_CA/oauth.lang b/htdocs/langs/fr_CA/oauth.lang
similarity index 100%
rename from public/langs/fr_CA/oauth.lang
rename to htdocs/langs/fr_CA/oauth.lang
diff --git a/public/langs/fr_CA/opensurvey.lang b/htdocs/langs/fr_CA/opensurvey.lang
similarity index 100%
rename from public/langs/fr_CA/opensurvey.lang
rename to htdocs/langs/fr_CA/opensurvey.lang
diff --git a/public/langs/fr_CA/orders.lang b/htdocs/langs/fr_CA/orders.lang
similarity index 100%
rename from public/langs/fr_CA/orders.lang
rename to htdocs/langs/fr_CA/orders.lang
diff --git a/public/langs/fr_CA/other.lang b/htdocs/langs/fr_CA/other.lang
similarity index 100%
rename from public/langs/fr_CA/other.lang
rename to htdocs/langs/fr_CA/other.lang
diff --git a/public/langs/fr_CA/paybox.lang b/htdocs/langs/fr_CA/paybox.lang
similarity index 100%
rename from public/langs/fr_CA/paybox.lang
rename to htdocs/langs/fr_CA/paybox.lang
diff --git a/public/langs/fr_CA/paypal.lang b/htdocs/langs/fr_CA/paypal.lang
similarity index 100%
rename from public/langs/fr_CA/paypal.lang
rename to htdocs/langs/fr_CA/paypal.lang
diff --git a/public/langs/fr_CA/printing.lang b/htdocs/langs/fr_CA/printing.lang
similarity index 100%
rename from public/langs/fr_CA/printing.lang
rename to htdocs/langs/fr_CA/printing.lang
diff --git a/public/langs/fr_CA/productbatch.lang b/htdocs/langs/fr_CA/productbatch.lang
similarity index 100%
rename from public/langs/fr_CA/productbatch.lang
rename to htdocs/langs/fr_CA/productbatch.lang
diff --git a/public/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang
similarity index 100%
rename from public/langs/fr_CA/products.lang
rename to htdocs/langs/fr_CA/products.lang
diff --git a/public/langs/fr_CA/projects.lang b/htdocs/langs/fr_CA/projects.lang
similarity index 100%
rename from public/langs/fr_CA/projects.lang
rename to htdocs/langs/fr_CA/projects.lang
diff --git a/public/langs/fr_CA/propal.lang b/htdocs/langs/fr_CA/propal.lang
similarity index 100%
rename from public/langs/fr_CA/propal.lang
rename to htdocs/langs/fr_CA/propal.lang
diff --git a/public/langs/fr_CA/receiptprinter.lang b/htdocs/langs/fr_CA/receiptprinter.lang
similarity index 100%
rename from public/langs/fr_CA/receiptprinter.lang
rename to htdocs/langs/fr_CA/receiptprinter.lang
diff --git a/public/langs/fr_CA/resource.lang b/htdocs/langs/fr_CA/resource.lang
similarity index 100%
rename from public/langs/fr_CA/resource.lang
rename to htdocs/langs/fr_CA/resource.lang
diff --git a/public/langs/fr_CA/salaries.lang b/htdocs/langs/fr_CA/salaries.lang
similarity index 100%
rename from public/langs/fr_CA/salaries.lang
rename to htdocs/langs/fr_CA/salaries.lang
diff --git a/public/langs/fr_CA/sendings.lang b/htdocs/langs/fr_CA/sendings.lang
similarity index 100%
rename from public/langs/fr_CA/sendings.lang
rename to htdocs/langs/fr_CA/sendings.lang
diff --git a/public/langs/fr_CA/sms.lang b/htdocs/langs/fr_CA/sms.lang
similarity index 100%
rename from public/langs/fr_CA/sms.lang
rename to htdocs/langs/fr_CA/sms.lang
diff --git a/public/langs/fr_CA/stocks.lang b/htdocs/langs/fr_CA/stocks.lang
similarity index 100%
rename from public/langs/fr_CA/stocks.lang
rename to htdocs/langs/fr_CA/stocks.lang
diff --git a/public/langs/fr_CA/supplier_proposal.lang b/htdocs/langs/fr_CA/supplier_proposal.lang
similarity index 100%
rename from public/langs/fr_CA/supplier_proposal.lang
rename to htdocs/langs/fr_CA/supplier_proposal.lang
diff --git a/public/langs/fr_CA/suppliers.lang b/htdocs/langs/fr_CA/suppliers.lang
similarity index 100%
rename from public/langs/fr_CA/suppliers.lang
rename to htdocs/langs/fr_CA/suppliers.lang
diff --git a/public/langs/fr_CA/trips.lang b/htdocs/langs/fr_CA/trips.lang
similarity index 100%
rename from public/langs/fr_CA/trips.lang
rename to htdocs/langs/fr_CA/trips.lang
diff --git a/public/langs/fr_CA/users.lang b/htdocs/langs/fr_CA/users.lang
similarity index 100%
rename from public/langs/fr_CA/users.lang
rename to htdocs/langs/fr_CA/users.lang
diff --git a/public/langs/fr_CA/website.lang b/htdocs/langs/fr_CA/website.lang
similarity index 100%
rename from public/langs/fr_CA/website.lang
rename to htdocs/langs/fr_CA/website.lang
diff --git a/public/langs/fr_CA/withdrawals.lang b/htdocs/langs/fr_CA/withdrawals.lang
similarity index 100%
rename from public/langs/fr_CA/withdrawals.lang
rename to htdocs/langs/fr_CA/withdrawals.lang
diff --git a/public/langs/fr_CA/workflow.lang b/htdocs/langs/fr_CA/workflow.lang
similarity index 100%
rename from public/langs/fr_CA/workflow.lang
rename to htdocs/langs/fr_CA/workflow.lang
diff --git a/public/langs/fr_CH/accountancy.lang b/htdocs/langs/fr_CH/accountancy.lang
similarity index 100%
rename from public/langs/fr_CH/accountancy.lang
rename to htdocs/langs/fr_CH/accountancy.lang
diff --git a/public/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
similarity index 100%
rename from public/langs/fr_CH/admin.lang
rename to htdocs/langs/fr_CH/admin.lang
diff --git a/public/langs/fr_CH/agenda.lang b/htdocs/langs/fr_CH/agenda.lang
similarity index 100%
rename from public/langs/fr_CH/agenda.lang
rename to htdocs/langs/fr_CH/agenda.lang
diff --git a/public/langs/fr_CH/banks.lang b/htdocs/langs/fr_CH/banks.lang
similarity index 100%
rename from public/langs/fr_CH/banks.lang
rename to htdocs/langs/fr_CH/banks.lang
diff --git a/public/langs/fr_CH/bills.lang b/htdocs/langs/fr_CH/bills.lang
similarity index 100%
rename from public/langs/fr_CH/bills.lang
rename to htdocs/langs/fr_CH/bills.lang
diff --git a/public/langs/fr_CH/bookmarks.lang b/htdocs/langs/fr_CH/bookmarks.lang
similarity index 100%
rename from public/langs/fr_CH/bookmarks.lang
rename to htdocs/langs/fr_CH/bookmarks.lang
diff --git a/public/langs/fr_CH/boxes.lang b/htdocs/langs/fr_CH/boxes.lang
similarity index 100%
rename from public/langs/fr_CH/boxes.lang
rename to htdocs/langs/fr_CH/boxes.lang
diff --git a/public/langs/fr_CH/cashdesk.lang b/htdocs/langs/fr_CH/cashdesk.lang
similarity index 100%
rename from public/langs/fr_CH/cashdesk.lang
rename to htdocs/langs/fr_CH/cashdesk.lang
diff --git a/public/langs/fr_CH/categories.lang b/htdocs/langs/fr_CH/categories.lang
similarity index 100%
rename from public/langs/fr_CH/categories.lang
rename to htdocs/langs/fr_CH/categories.lang
diff --git a/public/langs/fr_CH/commercial.lang b/htdocs/langs/fr_CH/commercial.lang
similarity index 100%
rename from public/langs/fr_CH/commercial.lang
rename to htdocs/langs/fr_CH/commercial.lang
diff --git a/public/langs/fr_CH/companies.lang b/htdocs/langs/fr_CH/companies.lang
similarity index 100%
rename from public/langs/fr_CH/companies.lang
rename to htdocs/langs/fr_CH/companies.lang
diff --git a/public/langs/fr_CH/compta.lang b/htdocs/langs/fr_CH/compta.lang
similarity index 100%
rename from public/langs/fr_CH/compta.lang
rename to htdocs/langs/fr_CH/compta.lang
diff --git a/public/langs/fr_CH/contracts.lang b/htdocs/langs/fr_CH/contracts.lang
similarity index 100%
rename from public/langs/fr_CH/contracts.lang
rename to htdocs/langs/fr_CH/contracts.lang
diff --git a/public/langs/fr_CH/cron.lang b/htdocs/langs/fr_CH/cron.lang
similarity index 100%
rename from public/langs/fr_CH/cron.lang
rename to htdocs/langs/fr_CH/cron.lang
diff --git a/public/langs/fr_CH/deliveries.lang b/htdocs/langs/fr_CH/deliveries.lang
similarity index 100%
rename from public/langs/fr_CH/deliveries.lang
rename to htdocs/langs/fr_CH/deliveries.lang
diff --git a/public/langs/fr_CH/dict.lang b/htdocs/langs/fr_CH/dict.lang
similarity index 100%
rename from public/langs/fr_CH/dict.lang
rename to htdocs/langs/fr_CH/dict.lang
diff --git a/public/langs/fr_CH/donations.lang b/htdocs/langs/fr_CH/donations.lang
similarity index 100%
rename from public/langs/fr_CH/donations.lang
rename to htdocs/langs/fr_CH/donations.lang
diff --git a/public/langs/fr_CH/ecm.lang b/htdocs/langs/fr_CH/ecm.lang
similarity index 100%
rename from public/langs/fr_CH/ecm.lang
rename to htdocs/langs/fr_CH/ecm.lang
diff --git a/public/langs/fr_CH/errors.lang b/htdocs/langs/fr_CH/errors.lang
similarity index 100%
rename from public/langs/fr_CH/errors.lang
rename to htdocs/langs/fr_CH/errors.lang
diff --git a/public/langs/fr_CH/exports.lang b/htdocs/langs/fr_CH/exports.lang
similarity index 100%
rename from public/langs/fr_CH/exports.lang
rename to htdocs/langs/fr_CH/exports.lang
diff --git a/public/langs/fr_CH/externalsite.lang b/htdocs/langs/fr_CH/externalsite.lang
similarity index 100%
rename from public/langs/fr_CH/externalsite.lang
rename to htdocs/langs/fr_CH/externalsite.lang
diff --git a/public/langs/fr_CH/ftp.lang b/htdocs/langs/fr_CH/ftp.lang
similarity index 100%
rename from public/langs/fr_CH/ftp.lang
rename to htdocs/langs/fr_CH/ftp.lang
diff --git a/public/langs/fr_CH/help.lang b/htdocs/langs/fr_CH/help.lang
similarity index 100%
rename from public/langs/fr_CH/help.lang
rename to htdocs/langs/fr_CH/help.lang
diff --git a/public/langs/fr_CH/holiday.lang b/htdocs/langs/fr_CH/holiday.lang
similarity index 100%
rename from public/langs/fr_CH/holiday.lang
rename to htdocs/langs/fr_CH/holiday.lang
diff --git a/public/langs/fr_CH/hrm.lang b/htdocs/langs/fr_CH/hrm.lang
similarity index 100%
rename from public/langs/fr_CH/hrm.lang
rename to htdocs/langs/fr_CH/hrm.lang
diff --git a/public/langs/fr_CH/incoterm.lang b/htdocs/langs/fr_CH/incoterm.lang
similarity index 100%
rename from public/langs/fr_CH/incoterm.lang
rename to htdocs/langs/fr_CH/incoterm.lang
diff --git a/public/langs/fr_CH/install.lang b/htdocs/langs/fr_CH/install.lang
similarity index 100%
rename from public/langs/fr_CH/install.lang
rename to htdocs/langs/fr_CH/install.lang
diff --git a/public/langs/fr_CH/interventions.lang b/htdocs/langs/fr_CH/interventions.lang
similarity index 100%
rename from public/langs/fr_CH/interventions.lang
rename to htdocs/langs/fr_CH/interventions.lang
diff --git a/public/langs/fr_CH/languages.lang b/htdocs/langs/fr_CH/languages.lang
similarity index 100%
rename from public/langs/fr_CH/languages.lang
rename to htdocs/langs/fr_CH/languages.lang
diff --git a/public/langs/fr_CH/ldap.lang b/htdocs/langs/fr_CH/ldap.lang
similarity index 100%
rename from public/langs/fr_CH/ldap.lang
rename to htdocs/langs/fr_CH/ldap.lang
diff --git a/public/langs/fr_CH/link.lang b/htdocs/langs/fr_CH/link.lang
similarity index 100%
rename from public/langs/fr_CH/link.lang
rename to htdocs/langs/fr_CH/link.lang
diff --git a/public/langs/fr_CH/loan.lang b/htdocs/langs/fr_CH/loan.lang
similarity index 100%
rename from public/langs/fr_CH/loan.lang
rename to htdocs/langs/fr_CH/loan.lang
diff --git a/public/langs/fr_CH/mailmanspip.lang b/htdocs/langs/fr_CH/mailmanspip.lang
similarity index 100%
rename from public/langs/fr_CH/mailmanspip.lang
rename to htdocs/langs/fr_CH/mailmanspip.lang
diff --git a/public/langs/fr_CH/mails.lang b/htdocs/langs/fr_CH/mails.lang
similarity index 100%
rename from public/langs/fr_CH/mails.lang
rename to htdocs/langs/fr_CH/mails.lang
diff --git a/public/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang
similarity index 100%
rename from public/langs/fr_CH/main.lang
rename to htdocs/langs/fr_CH/main.lang
diff --git a/public/langs/fr_CH/margins.lang b/htdocs/langs/fr_CH/margins.lang
similarity index 100%
rename from public/langs/fr_CH/margins.lang
rename to htdocs/langs/fr_CH/margins.lang
diff --git a/public/langs/fr_CH/members.lang b/htdocs/langs/fr_CH/members.lang
similarity index 100%
rename from public/langs/fr_CH/members.lang
rename to htdocs/langs/fr_CH/members.lang
diff --git a/public/langs/fr_CH/oauth.lang b/htdocs/langs/fr_CH/oauth.lang
similarity index 100%
rename from public/langs/fr_CH/oauth.lang
rename to htdocs/langs/fr_CH/oauth.lang
diff --git a/public/langs/fr_CH/opensurvey.lang b/htdocs/langs/fr_CH/opensurvey.lang
similarity index 100%
rename from public/langs/fr_CH/opensurvey.lang
rename to htdocs/langs/fr_CH/opensurvey.lang
diff --git a/public/langs/fr_CH/orders.lang b/htdocs/langs/fr_CH/orders.lang
similarity index 100%
rename from public/langs/fr_CH/orders.lang
rename to htdocs/langs/fr_CH/orders.lang
diff --git a/public/langs/fr_CH/other.lang b/htdocs/langs/fr_CH/other.lang
similarity index 100%
rename from public/langs/fr_CH/other.lang
rename to htdocs/langs/fr_CH/other.lang
diff --git a/public/langs/fr_CH/paybox.lang b/htdocs/langs/fr_CH/paybox.lang
similarity index 100%
rename from public/langs/fr_CH/paybox.lang
rename to htdocs/langs/fr_CH/paybox.lang
diff --git a/public/langs/fr_CH/paypal.lang b/htdocs/langs/fr_CH/paypal.lang
similarity index 100%
rename from public/langs/fr_CH/paypal.lang
rename to htdocs/langs/fr_CH/paypal.lang
diff --git a/public/langs/fr_CH/printing.lang b/htdocs/langs/fr_CH/printing.lang
similarity index 100%
rename from public/langs/fr_CH/printing.lang
rename to htdocs/langs/fr_CH/printing.lang
diff --git a/public/langs/fr_CH/productbatch.lang b/htdocs/langs/fr_CH/productbatch.lang
similarity index 100%
rename from public/langs/fr_CH/productbatch.lang
rename to htdocs/langs/fr_CH/productbatch.lang
diff --git a/public/langs/fr_CH/products.lang b/htdocs/langs/fr_CH/products.lang
similarity index 100%
rename from public/langs/fr_CH/products.lang
rename to htdocs/langs/fr_CH/products.lang
diff --git a/public/langs/fr_CH/projects.lang b/htdocs/langs/fr_CH/projects.lang
similarity index 100%
rename from public/langs/fr_CH/projects.lang
rename to htdocs/langs/fr_CH/projects.lang
diff --git a/public/langs/fr_CH/propal.lang b/htdocs/langs/fr_CH/propal.lang
similarity index 100%
rename from public/langs/fr_CH/propal.lang
rename to htdocs/langs/fr_CH/propal.lang
diff --git a/public/langs/fr_CH/receiptprinter.lang b/htdocs/langs/fr_CH/receiptprinter.lang
similarity index 100%
rename from public/langs/fr_CH/receiptprinter.lang
rename to htdocs/langs/fr_CH/receiptprinter.lang
diff --git a/public/langs/fr_CH/resource.lang b/htdocs/langs/fr_CH/resource.lang
similarity index 100%
rename from public/langs/fr_CH/resource.lang
rename to htdocs/langs/fr_CH/resource.lang
diff --git a/public/langs/fr_CH/salaries.lang b/htdocs/langs/fr_CH/salaries.lang
similarity index 100%
rename from public/langs/fr_CH/salaries.lang
rename to htdocs/langs/fr_CH/salaries.lang
diff --git a/public/langs/fr_CH/sendings.lang b/htdocs/langs/fr_CH/sendings.lang
similarity index 100%
rename from public/langs/fr_CH/sendings.lang
rename to htdocs/langs/fr_CH/sendings.lang
diff --git a/public/langs/fr_CH/sms.lang b/htdocs/langs/fr_CH/sms.lang
similarity index 100%
rename from public/langs/fr_CH/sms.lang
rename to htdocs/langs/fr_CH/sms.lang
diff --git a/public/langs/fr_CH/stocks.lang b/htdocs/langs/fr_CH/stocks.lang
similarity index 100%
rename from public/langs/fr_CH/stocks.lang
rename to htdocs/langs/fr_CH/stocks.lang
diff --git a/public/langs/fr_CH/supplier_proposal.lang b/htdocs/langs/fr_CH/supplier_proposal.lang
similarity index 100%
rename from public/langs/fr_CH/supplier_proposal.lang
rename to htdocs/langs/fr_CH/supplier_proposal.lang
diff --git a/public/langs/fr_CH/suppliers.lang b/htdocs/langs/fr_CH/suppliers.lang
similarity index 100%
rename from public/langs/fr_CH/suppliers.lang
rename to htdocs/langs/fr_CH/suppliers.lang
diff --git a/public/langs/fr_CH/trips.lang b/htdocs/langs/fr_CH/trips.lang
similarity index 100%
rename from public/langs/fr_CH/trips.lang
rename to htdocs/langs/fr_CH/trips.lang
diff --git a/public/langs/fr_CH/users.lang b/htdocs/langs/fr_CH/users.lang
similarity index 100%
rename from public/langs/fr_CH/users.lang
rename to htdocs/langs/fr_CH/users.lang
diff --git a/public/langs/fr_CH/website.lang b/htdocs/langs/fr_CH/website.lang
similarity index 100%
rename from public/langs/fr_CH/website.lang
rename to htdocs/langs/fr_CH/website.lang
diff --git a/public/langs/fr_CH/withdrawals.lang b/htdocs/langs/fr_CH/withdrawals.lang
similarity index 100%
rename from public/langs/fr_CH/withdrawals.lang
rename to htdocs/langs/fr_CH/withdrawals.lang
diff --git a/public/langs/fr_CH/workflow.lang b/htdocs/langs/fr_CH/workflow.lang
similarity index 100%
rename from public/langs/fr_CH/workflow.lang
rename to htdocs/langs/fr_CH/workflow.lang
diff --git a/public/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
similarity index 100%
rename from public/langs/fr_FR/accountancy.lang
rename to htdocs/langs/fr_FR/accountancy.lang
diff --git a/public/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
similarity index 100%
rename from public/langs/fr_FR/admin.lang
rename to htdocs/langs/fr_FR/admin.lang
diff --git a/public/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
similarity index 100%
rename from public/langs/fr_FR/agenda.lang
rename to htdocs/langs/fr_FR/agenda.lang
diff --git a/public/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
similarity index 100%
rename from public/langs/fr_FR/banks.lang
rename to htdocs/langs/fr_FR/banks.lang
diff --git a/public/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
similarity index 100%
rename from public/langs/fr_FR/bills.lang
rename to htdocs/langs/fr_FR/bills.lang
diff --git a/public/langs/fr_FR/bookmarks.lang b/htdocs/langs/fr_FR/bookmarks.lang
similarity index 100%
rename from public/langs/fr_FR/bookmarks.lang
rename to htdocs/langs/fr_FR/bookmarks.lang
diff --git a/public/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
similarity index 100%
rename from public/langs/fr_FR/boxes.lang
rename to htdocs/langs/fr_FR/boxes.lang
diff --git a/public/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
similarity index 100%
rename from public/langs/fr_FR/cashdesk.lang
rename to htdocs/langs/fr_FR/cashdesk.lang
diff --git a/public/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
similarity index 100%
rename from public/langs/fr_FR/categories.lang
rename to htdocs/langs/fr_FR/categories.lang
diff --git a/public/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang
similarity index 100%
rename from public/langs/fr_FR/commercial.lang
rename to htdocs/langs/fr_FR/commercial.lang
diff --git a/public/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
similarity index 100%
rename from public/langs/fr_FR/companies.lang
rename to htdocs/langs/fr_FR/companies.lang
diff --git a/public/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
similarity index 100%
rename from public/langs/fr_FR/compta.lang
rename to htdocs/langs/fr_FR/compta.lang
diff --git a/public/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang
similarity index 100%
rename from public/langs/fr_FR/contracts.lang
rename to htdocs/langs/fr_FR/contracts.lang
diff --git a/public/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
similarity index 100%
rename from public/langs/fr_FR/cron.lang
rename to htdocs/langs/fr_FR/cron.lang
diff --git a/public/langs/fr_FR/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang
similarity index 100%
rename from public/langs/fr_FR/deliveries.lang
rename to htdocs/langs/fr_FR/deliveries.lang
diff --git a/public/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang
similarity index 100%
rename from public/langs/fr_FR/dict.lang
rename to htdocs/langs/fr_FR/dict.lang
diff --git a/public/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang
similarity index 100%
rename from public/langs/fr_FR/donations.lang
rename to htdocs/langs/fr_FR/donations.lang
diff --git a/public/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang
similarity index 100%
rename from public/langs/fr_FR/ecm.lang
rename to htdocs/langs/fr_FR/ecm.lang
diff --git a/public/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
similarity index 100%
rename from public/langs/fr_FR/errors.lang
rename to htdocs/langs/fr_FR/errors.lang
diff --git a/public/langs/fr_FR/expensereports.lang b/htdocs/langs/fr_FR/expensereports.lang
similarity index 100%
rename from public/langs/fr_FR/expensereports.lang
rename to htdocs/langs/fr_FR/expensereports.lang
diff --git a/public/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
similarity index 100%
rename from public/langs/fr_FR/exports.lang
rename to htdocs/langs/fr_FR/exports.lang
diff --git a/public/langs/fr_FR/externalsite.lang b/htdocs/langs/fr_FR/externalsite.lang
similarity index 100%
rename from public/langs/fr_FR/externalsite.lang
rename to htdocs/langs/fr_FR/externalsite.lang
diff --git a/public/langs/fr_FR/ftp.lang b/htdocs/langs/fr_FR/ftp.lang
similarity index 100%
rename from public/langs/fr_FR/ftp.lang
rename to htdocs/langs/fr_FR/ftp.lang
diff --git a/public/langs/fr_FR/help.lang b/htdocs/langs/fr_FR/help.lang
similarity index 100%
rename from public/langs/fr_FR/help.lang
rename to htdocs/langs/fr_FR/help.lang
diff --git a/public/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
similarity index 100%
rename from public/langs/fr_FR/holiday.lang
rename to htdocs/langs/fr_FR/holiday.lang
diff --git a/public/langs/fr_FR/hrm.lang b/htdocs/langs/fr_FR/hrm.lang
similarity index 100%
rename from public/langs/fr_FR/hrm.lang
rename to htdocs/langs/fr_FR/hrm.lang
diff --git a/public/langs/fr_FR/incoterm.lang b/htdocs/langs/fr_FR/incoterm.lang
similarity index 100%
rename from public/langs/fr_FR/incoterm.lang
rename to htdocs/langs/fr_FR/incoterm.lang
diff --git a/public/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
similarity index 100%
rename from public/langs/fr_FR/install.lang
rename to htdocs/langs/fr_FR/install.lang
diff --git a/public/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang
similarity index 100%
rename from public/langs/fr_FR/interventions.lang
rename to htdocs/langs/fr_FR/interventions.lang
diff --git a/public/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang
similarity index 100%
rename from public/langs/fr_FR/languages.lang
rename to htdocs/langs/fr_FR/languages.lang
diff --git a/public/langs/fr_FR/ldap.lang b/htdocs/langs/fr_FR/ldap.lang
similarity index 100%
rename from public/langs/fr_FR/ldap.lang
rename to htdocs/langs/fr_FR/ldap.lang
diff --git a/public/langs/fr_FR/link.lang b/htdocs/langs/fr_FR/link.lang
similarity index 100%
rename from public/langs/fr_FR/link.lang
rename to htdocs/langs/fr_FR/link.lang
diff --git a/public/langs/fr_FR/loan.lang b/htdocs/langs/fr_FR/loan.lang
similarity index 100%
rename from public/langs/fr_FR/loan.lang
rename to htdocs/langs/fr_FR/loan.lang
diff --git a/public/langs/fr_FR/mailmanspip.lang b/htdocs/langs/fr_FR/mailmanspip.lang
similarity index 100%
rename from public/langs/fr_FR/mailmanspip.lang
rename to htdocs/langs/fr_FR/mailmanspip.lang
diff --git a/public/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
similarity index 100%
rename from public/langs/fr_FR/mails.lang
rename to htdocs/langs/fr_FR/mails.lang
diff --git a/public/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
similarity index 100%
rename from public/langs/fr_FR/main.lang
rename to htdocs/langs/fr_FR/main.lang
diff --git a/public/langs/fr_FR/margins.lang b/htdocs/langs/fr_FR/margins.lang
similarity index 100%
rename from public/langs/fr_FR/margins.lang
rename to htdocs/langs/fr_FR/margins.lang
diff --git a/public/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
similarity index 100%
rename from public/langs/fr_FR/members.lang
rename to htdocs/langs/fr_FR/members.lang
diff --git a/public/langs/fr_FR/oauth.lang b/htdocs/langs/fr_FR/oauth.lang
similarity index 100%
rename from public/langs/fr_FR/oauth.lang
rename to htdocs/langs/fr_FR/oauth.lang
diff --git a/public/langs/fr_FR/opensurvey.lang b/htdocs/langs/fr_FR/opensurvey.lang
similarity index 100%
rename from public/langs/fr_FR/opensurvey.lang
rename to htdocs/langs/fr_FR/opensurvey.lang
diff --git a/public/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
similarity index 100%
rename from public/langs/fr_FR/orders.lang
rename to htdocs/langs/fr_FR/orders.lang
diff --git a/public/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
similarity index 100%
rename from public/langs/fr_FR/other.lang
rename to htdocs/langs/fr_FR/other.lang
diff --git a/public/langs/fr_FR/paybox.lang b/htdocs/langs/fr_FR/paybox.lang
similarity index 100%
rename from public/langs/fr_FR/paybox.lang
rename to htdocs/langs/fr_FR/paybox.lang
diff --git a/public/langs/fr_FR/paypal.lang b/htdocs/langs/fr_FR/paypal.lang
similarity index 100%
rename from public/langs/fr_FR/paypal.lang
rename to htdocs/langs/fr_FR/paypal.lang
diff --git a/public/langs/fr_FR/printing.lang b/htdocs/langs/fr_FR/printing.lang
similarity index 100%
rename from public/langs/fr_FR/printing.lang
rename to htdocs/langs/fr_FR/printing.lang
diff --git a/public/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
similarity index 100%
rename from public/langs/fr_FR/productbatch.lang
rename to htdocs/langs/fr_FR/productbatch.lang
diff --git a/public/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
similarity index 100%
rename from public/langs/fr_FR/products.lang
rename to htdocs/langs/fr_FR/products.lang
diff --git a/public/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
similarity index 100%
rename from public/langs/fr_FR/projects.lang
rename to htdocs/langs/fr_FR/projects.lang
diff --git a/public/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang
similarity index 100%
rename from public/langs/fr_FR/propal.lang
rename to htdocs/langs/fr_FR/propal.lang
diff --git a/public/langs/fr_FR/receiptprinter.lang b/htdocs/langs/fr_FR/receiptprinter.lang
similarity index 100%
rename from public/langs/fr_FR/receiptprinter.lang
rename to htdocs/langs/fr_FR/receiptprinter.lang
diff --git a/public/langs/fr_FR/resource.lang b/htdocs/langs/fr_FR/resource.lang
similarity index 100%
rename from public/langs/fr_FR/resource.lang
rename to htdocs/langs/fr_FR/resource.lang
diff --git a/public/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
similarity index 100%
rename from public/langs/fr_FR/salaries.lang
rename to htdocs/langs/fr_FR/salaries.lang
diff --git a/public/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
similarity index 100%
rename from public/langs/fr_FR/sendings.lang
rename to htdocs/langs/fr_FR/sendings.lang
diff --git a/public/langs/fr_FR/sms.lang b/htdocs/langs/fr_FR/sms.lang
similarity index 100%
rename from public/langs/fr_FR/sms.lang
rename to htdocs/langs/fr_FR/sms.lang
diff --git a/public/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
similarity index 100%
rename from public/langs/fr_FR/stocks.lang
rename to htdocs/langs/fr_FR/stocks.lang
diff --git a/public/langs/fr_FR/supplier_proposal.lang b/htdocs/langs/fr_FR/supplier_proposal.lang
similarity index 100%
rename from public/langs/fr_FR/supplier_proposal.lang
rename to htdocs/langs/fr_FR/supplier_proposal.lang
diff --git a/public/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
similarity index 100%
rename from public/langs/fr_FR/suppliers.lang
rename to htdocs/langs/fr_FR/suppliers.lang
diff --git a/public/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang
similarity index 100%
rename from public/langs/fr_FR/trips.lang
rename to htdocs/langs/fr_FR/trips.lang
diff --git a/public/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
similarity index 100%
rename from public/langs/fr_FR/users.lang
rename to htdocs/langs/fr_FR/users.lang
diff --git a/public/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
similarity index 100%
rename from public/langs/fr_FR/website.lang
rename to htdocs/langs/fr_FR/website.lang
diff --git a/public/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
similarity index 100%
rename from public/langs/fr_FR/withdrawals.lang
rename to htdocs/langs/fr_FR/withdrawals.lang
diff --git a/public/langs/fr_FR/workflow.lang b/htdocs/langs/fr_FR/workflow.lang
similarity index 100%
rename from public/langs/fr_FR/workflow.lang
rename to htdocs/langs/fr_FR/workflow.lang
diff --git a/public/langs/fr_NC/admin.lang b/htdocs/langs/fr_NC/admin.lang
similarity index 100%
rename from public/langs/fr_NC/admin.lang
rename to htdocs/langs/fr_NC/admin.lang
diff --git a/public/langs/fr_NC/companies.lang b/htdocs/langs/fr_NC/companies.lang
similarity index 100%
rename from public/langs/fr_NC/companies.lang
rename to htdocs/langs/fr_NC/companies.lang
diff --git a/public/langs/fr_NC/compta.lang b/htdocs/langs/fr_NC/compta.lang
similarity index 100%
rename from public/langs/fr_NC/compta.lang
rename to htdocs/langs/fr_NC/compta.lang
diff --git a/public/langs/fr_NC/main.lang b/htdocs/langs/fr_NC/main.lang
similarity index 100%
rename from public/langs/fr_NC/main.lang
rename to htdocs/langs/fr_NC/main.lang
diff --git a/public/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
similarity index 100%
rename from public/langs/he_IL/accountancy.lang
rename to htdocs/langs/he_IL/accountancy.lang
diff --git a/public/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
similarity index 100%
rename from public/langs/he_IL/admin.lang
rename to htdocs/langs/he_IL/admin.lang
diff --git a/public/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang
similarity index 100%
rename from public/langs/he_IL/agenda.lang
rename to htdocs/langs/he_IL/agenda.lang
diff --git a/public/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
similarity index 100%
rename from public/langs/he_IL/banks.lang
rename to htdocs/langs/he_IL/banks.lang
diff --git a/public/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
similarity index 100%
rename from public/langs/he_IL/bills.lang
rename to htdocs/langs/he_IL/bills.lang
diff --git a/public/langs/he_IL/bookmarks.lang b/htdocs/langs/he_IL/bookmarks.lang
similarity index 100%
rename from public/langs/he_IL/bookmarks.lang
rename to htdocs/langs/he_IL/bookmarks.lang
diff --git a/public/langs/he_IL/boxes.lang b/htdocs/langs/he_IL/boxes.lang
similarity index 100%
rename from public/langs/he_IL/boxes.lang
rename to htdocs/langs/he_IL/boxes.lang
diff --git a/public/langs/he_IL/cashdesk.lang b/htdocs/langs/he_IL/cashdesk.lang
similarity index 100%
rename from public/langs/he_IL/cashdesk.lang
rename to htdocs/langs/he_IL/cashdesk.lang
diff --git a/public/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang
similarity index 100%
rename from public/langs/he_IL/categories.lang
rename to htdocs/langs/he_IL/categories.lang
diff --git a/public/langs/he_IL/commercial.lang b/htdocs/langs/he_IL/commercial.lang
similarity index 100%
rename from public/langs/he_IL/commercial.lang
rename to htdocs/langs/he_IL/commercial.lang
diff --git a/public/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
similarity index 100%
rename from public/langs/he_IL/companies.lang
rename to htdocs/langs/he_IL/companies.lang
diff --git a/public/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
similarity index 100%
rename from public/langs/he_IL/compta.lang
rename to htdocs/langs/he_IL/compta.lang
diff --git a/public/langs/he_IL/contracts.lang b/htdocs/langs/he_IL/contracts.lang
similarity index 100%
rename from public/langs/he_IL/contracts.lang
rename to htdocs/langs/he_IL/contracts.lang
diff --git a/public/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang
similarity index 100%
rename from public/langs/he_IL/cron.lang
rename to htdocs/langs/he_IL/cron.lang
diff --git a/public/langs/he_IL/deliveries.lang b/htdocs/langs/he_IL/deliveries.lang
similarity index 100%
rename from public/langs/he_IL/deliveries.lang
rename to htdocs/langs/he_IL/deliveries.lang
diff --git a/public/langs/he_IL/dict.lang b/htdocs/langs/he_IL/dict.lang
similarity index 100%
rename from public/langs/he_IL/dict.lang
rename to htdocs/langs/he_IL/dict.lang
diff --git a/public/langs/he_IL/donations.lang b/htdocs/langs/he_IL/donations.lang
similarity index 100%
rename from public/langs/he_IL/donations.lang
rename to htdocs/langs/he_IL/donations.lang
diff --git a/public/langs/he_IL/ecm.lang b/htdocs/langs/he_IL/ecm.lang
similarity index 100%
rename from public/langs/he_IL/ecm.lang
rename to htdocs/langs/he_IL/ecm.lang
diff --git a/public/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
similarity index 100%
rename from public/langs/he_IL/errors.lang
rename to htdocs/langs/he_IL/errors.lang
diff --git a/public/langs/he_IL/exports.lang b/htdocs/langs/he_IL/exports.lang
similarity index 100%
rename from public/langs/he_IL/exports.lang
rename to htdocs/langs/he_IL/exports.lang
diff --git a/public/langs/he_IL/externalsite.lang b/htdocs/langs/he_IL/externalsite.lang
similarity index 100%
rename from public/langs/he_IL/externalsite.lang
rename to htdocs/langs/he_IL/externalsite.lang
diff --git a/public/langs/he_IL/ftp.lang b/htdocs/langs/he_IL/ftp.lang
similarity index 100%
rename from public/langs/he_IL/ftp.lang
rename to htdocs/langs/he_IL/ftp.lang
diff --git a/public/langs/he_IL/help.lang b/htdocs/langs/he_IL/help.lang
similarity index 100%
rename from public/langs/he_IL/help.lang
rename to htdocs/langs/he_IL/help.lang
diff --git a/public/langs/he_IL/holiday.lang b/htdocs/langs/he_IL/holiday.lang
similarity index 100%
rename from public/langs/he_IL/holiday.lang
rename to htdocs/langs/he_IL/holiday.lang
diff --git a/public/langs/he_IL/hrm.lang b/htdocs/langs/he_IL/hrm.lang
similarity index 100%
rename from public/langs/he_IL/hrm.lang
rename to htdocs/langs/he_IL/hrm.lang
diff --git a/public/langs/he_IL/incoterm.lang b/htdocs/langs/he_IL/incoterm.lang
similarity index 100%
rename from public/langs/he_IL/incoterm.lang
rename to htdocs/langs/he_IL/incoterm.lang
diff --git a/public/langs/he_IL/install.lang b/htdocs/langs/he_IL/install.lang
similarity index 100%
rename from public/langs/he_IL/install.lang
rename to htdocs/langs/he_IL/install.lang
diff --git a/public/langs/he_IL/interventions.lang b/htdocs/langs/he_IL/interventions.lang
similarity index 100%
rename from public/langs/he_IL/interventions.lang
rename to htdocs/langs/he_IL/interventions.lang
diff --git a/public/langs/he_IL/languages.lang b/htdocs/langs/he_IL/languages.lang
similarity index 100%
rename from public/langs/he_IL/languages.lang
rename to htdocs/langs/he_IL/languages.lang
diff --git a/public/langs/he_IL/ldap.lang b/htdocs/langs/he_IL/ldap.lang
similarity index 100%
rename from public/langs/he_IL/ldap.lang
rename to htdocs/langs/he_IL/ldap.lang
diff --git a/public/langs/he_IL/link.lang b/htdocs/langs/he_IL/link.lang
similarity index 100%
rename from public/langs/he_IL/link.lang
rename to htdocs/langs/he_IL/link.lang
diff --git a/public/langs/he_IL/loan.lang b/htdocs/langs/he_IL/loan.lang
similarity index 100%
rename from public/langs/he_IL/loan.lang
rename to htdocs/langs/he_IL/loan.lang
diff --git a/public/langs/he_IL/mailmanspip.lang b/htdocs/langs/he_IL/mailmanspip.lang
similarity index 100%
rename from public/langs/he_IL/mailmanspip.lang
rename to htdocs/langs/he_IL/mailmanspip.lang
diff --git a/public/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
similarity index 100%
rename from public/langs/he_IL/mails.lang
rename to htdocs/langs/he_IL/mails.lang
diff --git a/public/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
similarity index 100%
rename from public/langs/he_IL/main.lang
rename to htdocs/langs/he_IL/main.lang
diff --git a/public/langs/he_IL/margins.lang b/htdocs/langs/he_IL/margins.lang
similarity index 100%
rename from public/langs/he_IL/margins.lang
rename to htdocs/langs/he_IL/margins.lang
diff --git a/public/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
similarity index 100%
rename from public/langs/he_IL/members.lang
rename to htdocs/langs/he_IL/members.lang
diff --git a/public/langs/he_IL/oauth.lang b/htdocs/langs/he_IL/oauth.lang
similarity index 100%
rename from public/langs/he_IL/oauth.lang
rename to htdocs/langs/he_IL/oauth.lang
diff --git a/public/langs/he_IL/opensurvey.lang b/htdocs/langs/he_IL/opensurvey.lang
similarity index 100%
rename from public/langs/he_IL/opensurvey.lang
rename to htdocs/langs/he_IL/opensurvey.lang
diff --git a/public/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang
similarity index 100%
rename from public/langs/he_IL/orders.lang
rename to htdocs/langs/he_IL/orders.lang
diff --git a/public/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
similarity index 100%
rename from public/langs/he_IL/other.lang
rename to htdocs/langs/he_IL/other.lang
diff --git a/public/langs/he_IL/paybox.lang b/htdocs/langs/he_IL/paybox.lang
similarity index 100%
rename from public/langs/he_IL/paybox.lang
rename to htdocs/langs/he_IL/paybox.lang
diff --git a/public/langs/he_IL/paypal.lang b/htdocs/langs/he_IL/paypal.lang
similarity index 100%
rename from public/langs/he_IL/paypal.lang
rename to htdocs/langs/he_IL/paypal.lang
diff --git a/public/langs/he_IL/printing.lang b/htdocs/langs/he_IL/printing.lang
similarity index 100%
rename from public/langs/he_IL/printing.lang
rename to htdocs/langs/he_IL/printing.lang
diff --git a/public/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang
similarity index 100%
rename from public/langs/he_IL/productbatch.lang
rename to htdocs/langs/he_IL/productbatch.lang
diff --git a/public/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
similarity index 100%
rename from public/langs/he_IL/products.lang
rename to htdocs/langs/he_IL/products.lang
diff --git a/public/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
similarity index 100%
rename from public/langs/he_IL/projects.lang
rename to htdocs/langs/he_IL/projects.lang
diff --git a/public/langs/he_IL/propal.lang b/htdocs/langs/he_IL/propal.lang
similarity index 100%
rename from public/langs/he_IL/propal.lang
rename to htdocs/langs/he_IL/propal.lang
diff --git a/public/langs/he_IL/receiptprinter.lang b/htdocs/langs/he_IL/receiptprinter.lang
similarity index 100%
rename from public/langs/he_IL/receiptprinter.lang
rename to htdocs/langs/he_IL/receiptprinter.lang
diff --git a/public/langs/he_IL/resource.lang b/htdocs/langs/he_IL/resource.lang
similarity index 100%
rename from public/langs/he_IL/resource.lang
rename to htdocs/langs/he_IL/resource.lang
diff --git a/public/langs/he_IL/salaries.lang b/htdocs/langs/he_IL/salaries.lang
similarity index 100%
rename from public/langs/he_IL/salaries.lang
rename to htdocs/langs/he_IL/salaries.lang
diff --git a/public/langs/he_IL/sendings.lang b/htdocs/langs/he_IL/sendings.lang
similarity index 100%
rename from public/langs/he_IL/sendings.lang
rename to htdocs/langs/he_IL/sendings.lang
diff --git a/public/langs/he_IL/sms.lang b/htdocs/langs/he_IL/sms.lang
similarity index 100%
rename from public/langs/he_IL/sms.lang
rename to htdocs/langs/he_IL/sms.lang
diff --git a/public/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
similarity index 100%
rename from public/langs/he_IL/stocks.lang
rename to htdocs/langs/he_IL/stocks.lang
diff --git a/public/langs/he_IL/supplier_proposal.lang b/htdocs/langs/he_IL/supplier_proposal.lang
similarity index 100%
rename from public/langs/he_IL/supplier_proposal.lang
rename to htdocs/langs/he_IL/supplier_proposal.lang
diff --git a/public/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang
similarity index 100%
rename from public/langs/he_IL/suppliers.lang
rename to htdocs/langs/he_IL/suppliers.lang
diff --git a/public/langs/he_IL/trips.lang b/htdocs/langs/he_IL/trips.lang
similarity index 100%
rename from public/langs/he_IL/trips.lang
rename to htdocs/langs/he_IL/trips.lang
diff --git a/public/langs/he_IL/users.lang b/htdocs/langs/he_IL/users.lang
similarity index 100%
rename from public/langs/he_IL/users.lang
rename to htdocs/langs/he_IL/users.lang
diff --git a/public/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
similarity index 100%
rename from public/langs/he_IL/website.lang
rename to htdocs/langs/he_IL/website.lang
diff --git a/public/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
similarity index 100%
rename from public/langs/he_IL/withdrawals.lang
rename to htdocs/langs/he_IL/withdrawals.lang
diff --git a/public/langs/he_IL/workflow.lang b/htdocs/langs/he_IL/workflow.lang
similarity index 100%
rename from public/langs/he_IL/workflow.lang
rename to htdocs/langs/he_IL/workflow.lang
diff --git a/public/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
similarity index 100%
rename from public/langs/hr_HR/accountancy.lang
rename to htdocs/langs/hr_HR/accountancy.lang
diff --git a/public/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
similarity index 100%
rename from public/langs/hr_HR/admin.lang
rename to htdocs/langs/hr_HR/admin.lang
diff --git a/public/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
similarity index 100%
rename from public/langs/hr_HR/agenda.lang
rename to htdocs/langs/hr_HR/agenda.lang
diff --git a/public/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
similarity index 100%
rename from public/langs/hr_HR/banks.lang
rename to htdocs/langs/hr_HR/banks.lang
diff --git a/public/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
similarity index 100%
rename from public/langs/hr_HR/bills.lang
rename to htdocs/langs/hr_HR/bills.lang
diff --git a/public/langs/hr_HR/bookmarks.lang b/htdocs/langs/hr_HR/bookmarks.lang
similarity index 100%
rename from public/langs/hr_HR/bookmarks.lang
rename to htdocs/langs/hr_HR/bookmarks.lang
diff --git a/public/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
similarity index 100%
rename from public/langs/hr_HR/boxes.lang
rename to htdocs/langs/hr_HR/boxes.lang
diff --git a/public/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
similarity index 100%
rename from public/langs/hr_HR/cashdesk.lang
rename to htdocs/langs/hr_HR/cashdesk.lang
diff --git a/public/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
similarity index 100%
rename from public/langs/hr_HR/categories.lang
rename to htdocs/langs/hr_HR/categories.lang
diff --git a/public/langs/hr_HR/commercial.lang b/htdocs/langs/hr_HR/commercial.lang
similarity index 100%
rename from public/langs/hr_HR/commercial.lang
rename to htdocs/langs/hr_HR/commercial.lang
diff --git a/public/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
similarity index 100%
rename from public/langs/hr_HR/companies.lang
rename to htdocs/langs/hr_HR/companies.lang
diff --git a/public/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
similarity index 100%
rename from public/langs/hr_HR/compta.lang
rename to htdocs/langs/hr_HR/compta.lang
diff --git a/public/langs/hr_HR/contracts.lang b/htdocs/langs/hr_HR/contracts.lang
similarity index 100%
rename from public/langs/hr_HR/contracts.lang
rename to htdocs/langs/hr_HR/contracts.lang
diff --git a/public/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
similarity index 100%
rename from public/langs/hr_HR/cron.lang
rename to htdocs/langs/hr_HR/cron.lang
diff --git a/public/langs/hr_HR/deliveries.lang b/htdocs/langs/hr_HR/deliveries.lang
similarity index 100%
rename from public/langs/hr_HR/deliveries.lang
rename to htdocs/langs/hr_HR/deliveries.lang
diff --git a/public/langs/hr_HR/dict.lang b/htdocs/langs/hr_HR/dict.lang
similarity index 100%
rename from public/langs/hr_HR/dict.lang
rename to htdocs/langs/hr_HR/dict.lang
diff --git a/public/langs/hr_HR/donations.lang b/htdocs/langs/hr_HR/donations.lang
similarity index 100%
rename from public/langs/hr_HR/donations.lang
rename to htdocs/langs/hr_HR/donations.lang
diff --git a/public/langs/hr_HR/ecm.lang b/htdocs/langs/hr_HR/ecm.lang
similarity index 100%
rename from public/langs/hr_HR/ecm.lang
rename to htdocs/langs/hr_HR/ecm.lang
diff --git a/public/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
similarity index 100%
rename from public/langs/hr_HR/errors.lang
rename to htdocs/langs/hr_HR/errors.lang
diff --git a/public/langs/hr_HR/exports.lang b/htdocs/langs/hr_HR/exports.lang
similarity index 100%
rename from public/langs/hr_HR/exports.lang
rename to htdocs/langs/hr_HR/exports.lang
diff --git a/public/langs/hr_HR/externalsite.lang b/htdocs/langs/hr_HR/externalsite.lang
similarity index 100%
rename from public/langs/hr_HR/externalsite.lang
rename to htdocs/langs/hr_HR/externalsite.lang
diff --git a/public/langs/hr_HR/ftp.lang b/htdocs/langs/hr_HR/ftp.lang
similarity index 100%
rename from public/langs/hr_HR/ftp.lang
rename to htdocs/langs/hr_HR/ftp.lang
diff --git a/public/langs/hr_HR/help.lang b/htdocs/langs/hr_HR/help.lang
similarity index 100%
rename from public/langs/hr_HR/help.lang
rename to htdocs/langs/hr_HR/help.lang
diff --git a/public/langs/hr_HR/holiday.lang b/htdocs/langs/hr_HR/holiday.lang
similarity index 100%
rename from public/langs/hr_HR/holiday.lang
rename to htdocs/langs/hr_HR/holiday.lang
diff --git a/public/langs/hr_HR/hrm.lang b/htdocs/langs/hr_HR/hrm.lang
similarity index 100%
rename from public/langs/hr_HR/hrm.lang
rename to htdocs/langs/hr_HR/hrm.lang
diff --git a/public/langs/hr_HR/incoterm.lang b/htdocs/langs/hr_HR/incoterm.lang
similarity index 100%
rename from public/langs/hr_HR/incoterm.lang
rename to htdocs/langs/hr_HR/incoterm.lang
diff --git a/public/langs/hr_HR/install.lang b/htdocs/langs/hr_HR/install.lang
similarity index 100%
rename from public/langs/hr_HR/install.lang
rename to htdocs/langs/hr_HR/install.lang
diff --git a/public/langs/hr_HR/interventions.lang b/htdocs/langs/hr_HR/interventions.lang
similarity index 100%
rename from public/langs/hr_HR/interventions.lang
rename to htdocs/langs/hr_HR/interventions.lang
diff --git a/public/langs/hr_HR/languages.lang b/htdocs/langs/hr_HR/languages.lang
similarity index 100%
rename from public/langs/hr_HR/languages.lang
rename to htdocs/langs/hr_HR/languages.lang
diff --git a/public/langs/hr_HR/ldap.lang b/htdocs/langs/hr_HR/ldap.lang
similarity index 100%
rename from public/langs/hr_HR/ldap.lang
rename to htdocs/langs/hr_HR/ldap.lang
diff --git a/public/langs/hr_HR/link.lang b/htdocs/langs/hr_HR/link.lang
similarity index 100%
rename from public/langs/hr_HR/link.lang
rename to htdocs/langs/hr_HR/link.lang
diff --git a/public/langs/hr_HR/loan.lang b/htdocs/langs/hr_HR/loan.lang
similarity index 100%
rename from public/langs/hr_HR/loan.lang
rename to htdocs/langs/hr_HR/loan.lang
diff --git a/public/langs/hr_HR/mailmanspip.lang b/htdocs/langs/hr_HR/mailmanspip.lang
similarity index 100%
rename from public/langs/hr_HR/mailmanspip.lang
rename to htdocs/langs/hr_HR/mailmanspip.lang
diff --git a/public/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
similarity index 100%
rename from public/langs/hr_HR/mails.lang
rename to htdocs/langs/hr_HR/mails.lang
diff --git a/public/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
similarity index 100%
rename from public/langs/hr_HR/main.lang
rename to htdocs/langs/hr_HR/main.lang
diff --git a/public/langs/hr_HR/margins.lang b/htdocs/langs/hr_HR/margins.lang
similarity index 100%
rename from public/langs/hr_HR/margins.lang
rename to htdocs/langs/hr_HR/margins.lang
diff --git a/public/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
similarity index 100%
rename from public/langs/hr_HR/members.lang
rename to htdocs/langs/hr_HR/members.lang
diff --git a/public/langs/hr_HR/oauth.lang b/htdocs/langs/hr_HR/oauth.lang
similarity index 100%
rename from public/langs/hr_HR/oauth.lang
rename to htdocs/langs/hr_HR/oauth.lang
diff --git a/public/langs/hr_HR/opensurvey.lang b/htdocs/langs/hr_HR/opensurvey.lang
similarity index 100%
rename from public/langs/hr_HR/opensurvey.lang
rename to htdocs/langs/hr_HR/opensurvey.lang
diff --git a/public/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
similarity index 100%
rename from public/langs/hr_HR/orders.lang
rename to htdocs/langs/hr_HR/orders.lang
diff --git a/public/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
similarity index 100%
rename from public/langs/hr_HR/other.lang
rename to htdocs/langs/hr_HR/other.lang
diff --git a/public/langs/hr_HR/paybox.lang b/htdocs/langs/hr_HR/paybox.lang
similarity index 100%
rename from public/langs/hr_HR/paybox.lang
rename to htdocs/langs/hr_HR/paybox.lang
diff --git a/public/langs/hr_HR/paypal.lang b/htdocs/langs/hr_HR/paypal.lang
similarity index 100%
rename from public/langs/hr_HR/paypal.lang
rename to htdocs/langs/hr_HR/paypal.lang
diff --git a/public/langs/hr_HR/printing.lang b/htdocs/langs/hr_HR/printing.lang
similarity index 100%
rename from public/langs/hr_HR/printing.lang
rename to htdocs/langs/hr_HR/printing.lang
diff --git a/public/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang
similarity index 100%
rename from public/langs/hr_HR/productbatch.lang
rename to htdocs/langs/hr_HR/productbatch.lang
diff --git a/public/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
similarity index 100%
rename from public/langs/hr_HR/products.lang
rename to htdocs/langs/hr_HR/products.lang
diff --git a/public/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
similarity index 100%
rename from public/langs/hr_HR/projects.lang
rename to htdocs/langs/hr_HR/projects.lang
diff --git a/public/langs/hr_HR/propal.lang b/htdocs/langs/hr_HR/propal.lang
similarity index 100%
rename from public/langs/hr_HR/propal.lang
rename to htdocs/langs/hr_HR/propal.lang
diff --git a/public/langs/hr_HR/receiptprinter.lang b/htdocs/langs/hr_HR/receiptprinter.lang
similarity index 100%
rename from public/langs/hr_HR/receiptprinter.lang
rename to htdocs/langs/hr_HR/receiptprinter.lang
diff --git a/public/langs/hr_HR/resource.lang b/htdocs/langs/hr_HR/resource.lang
similarity index 100%
rename from public/langs/hr_HR/resource.lang
rename to htdocs/langs/hr_HR/resource.lang
diff --git a/public/langs/hr_HR/salaries.lang b/htdocs/langs/hr_HR/salaries.lang
similarity index 100%
rename from public/langs/hr_HR/salaries.lang
rename to htdocs/langs/hr_HR/salaries.lang
diff --git a/public/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
similarity index 100%
rename from public/langs/hr_HR/sendings.lang
rename to htdocs/langs/hr_HR/sendings.lang
diff --git a/public/langs/hr_HR/sms.lang b/htdocs/langs/hr_HR/sms.lang
similarity index 100%
rename from public/langs/hr_HR/sms.lang
rename to htdocs/langs/hr_HR/sms.lang
diff --git a/public/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
similarity index 100%
rename from public/langs/hr_HR/stocks.lang
rename to htdocs/langs/hr_HR/stocks.lang
diff --git a/public/langs/hr_HR/supplier_proposal.lang b/htdocs/langs/hr_HR/supplier_proposal.lang
similarity index 100%
rename from public/langs/hr_HR/supplier_proposal.lang
rename to htdocs/langs/hr_HR/supplier_proposal.lang
diff --git a/public/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang
similarity index 100%
rename from public/langs/hr_HR/suppliers.lang
rename to htdocs/langs/hr_HR/suppliers.lang
diff --git a/public/langs/hr_HR/trips.lang b/htdocs/langs/hr_HR/trips.lang
similarity index 100%
rename from public/langs/hr_HR/trips.lang
rename to htdocs/langs/hr_HR/trips.lang
diff --git a/public/langs/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang
similarity index 100%
rename from public/langs/hr_HR/users.lang
rename to htdocs/langs/hr_HR/users.lang
diff --git a/public/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
similarity index 100%
rename from public/langs/hr_HR/website.lang
rename to htdocs/langs/hr_HR/website.lang
diff --git a/public/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
similarity index 100%
rename from public/langs/hr_HR/withdrawals.lang
rename to htdocs/langs/hr_HR/withdrawals.lang
diff --git a/public/langs/hr_HR/workflow.lang b/htdocs/langs/hr_HR/workflow.lang
similarity index 100%
rename from public/langs/hr_HR/workflow.lang
rename to htdocs/langs/hr_HR/workflow.lang
diff --git a/public/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
similarity index 100%
rename from public/langs/hu_HU/accountancy.lang
rename to htdocs/langs/hu_HU/accountancy.lang
diff --git a/public/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
similarity index 100%
rename from public/langs/hu_HU/admin.lang
rename to htdocs/langs/hu_HU/admin.lang
diff --git a/public/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang
similarity index 100%
rename from public/langs/hu_HU/agenda.lang
rename to htdocs/langs/hu_HU/agenda.lang
diff --git a/public/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
similarity index 100%
rename from public/langs/hu_HU/banks.lang
rename to htdocs/langs/hu_HU/banks.lang
diff --git a/public/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
similarity index 100%
rename from public/langs/hu_HU/bills.lang
rename to htdocs/langs/hu_HU/bills.lang
diff --git a/public/langs/hu_HU/bookmarks.lang b/htdocs/langs/hu_HU/bookmarks.lang
similarity index 100%
rename from public/langs/hu_HU/bookmarks.lang
rename to htdocs/langs/hu_HU/bookmarks.lang
diff --git a/public/langs/hu_HU/boxes.lang b/htdocs/langs/hu_HU/boxes.lang
similarity index 100%
rename from public/langs/hu_HU/boxes.lang
rename to htdocs/langs/hu_HU/boxes.lang
diff --git a/public/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
similarity index 100%
rename from public/langs/hu_HU/cashdesk.lang
rename to htdocs/langs/hu_HU/cashdesk.lang
diff --git a/public/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
similarity index 100%
rename from public/langs/hu_HU/categories.lang
rename to htdocs/langs/hu_HU/categories.lang
diff --git a/public/langs/hu_HU/commercial.lang b/htdocs/langs/hu_HU/commercial.lang
similarity index 100%
rename from public/langs/hu_HU/commercial.lang
rename to htdocs/langs/hu_HU/commercial.lang
diff --git a/public/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
similarity index 100%
rename from public/langs/hu_HU/companies.lang
rename to htdocs/langs/hu_HU/companies.lang
diff --git a/public/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
similarity index 100%
rename from public/langs/hu_HU/compta.lang
rename to htdocs/langs/hu_HU/compta.lang
diff --git a/public/langs/hu_HU/contracts.lang b/htdocs/langs/hu_HU/contracts.lang
similarity index 100%
rename from public/langs/hu_HU/contracts.lang
rename to htdocs/langs/hu_HU/contracts.lang
diff --git a/public/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang
similarity index 100%
rename from public/langs/hu_HU/cron.lang
rename to htdocs/langs/hu_HU/cron.lang
diff --git a/public/langs/hu_HU/deliveries.lang b/htdocs/langs/hu_HU/deliveries.lang
similarity index 100%
rename from public/langs/hu_HU/deliveries.lang
rename to htdocs/langs/hu_HU/deliveries.lang
diff --git a/public/langs/hu_HU/dict.lang b/htdocs/langs/hu_HU/dict.lang
similarity index 100%
rename from public/langs/hu_HU/dict.lang
rename to htdocs/langs/hu_HU/dict.lang
diff --git a/public/langs/hu_HU/donations.lang b/htdocs/langs/hu_HU/donations.lang
similarity index 100%
rename from public/langs/hu_HU/donations.lang
rename to htdocs/langs/hu_HU/donations.lang
diff --git a/public/langs/hu_HU/ecm.lang b/htdocs/langs/hu_HU/ecm.lang
similarity index 100%
rename from public/langs/hu_HU/ecm.lang
rename to htdocs/langs/hu_HU/ecm.lang
diff --git a/public/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
similarity index 100%
rename from public/langs/hu_HU/errors.lang
rename to htdocs/langs/hu_HU/errors.lang
diff --git a/public/langs/hu_HU/exports.lang b/htdocs/langs/hu_HU/exports.lang
similarity index 100%
rename from public/langs/hu_HU/exports.lang
rename to htdocs/langs/hu_HU/exports.lang
diff --git a/public/langs/hu_HU/externalsite.lang b/htdocs/langs/hu_HU/externalsite.lang
similarity index 100%
rename from public/langs/hu_HU/externalsite.lang
rename to htdocs/langs/hu_HU/externalsite.lang
diff --git a/public/langs/hu_HU/ftp.lang b/htdocs/langs/hu_HU/ftp.lang
similarity index 100%
rename from public/langs/hu_HU/ftp.lang
rename to htdocs/langs/hu_HU/ftp.lang
diff --git a/public/langs/hu_HU/help.lang b/htdocs/langs/hu_HU/help.lang
similarity index 100%
rename from public/langs/hu_HU/help.lang
rename to htdocs/langs/hu_HU/help.lang
diff --git a/public/langs/hu_HU/holiday.lang b/htdocs/langs/hu_HU/holiday.lang
similarity index 100%
rename from public/langs/hu_HU/holiday.lang
rename to htdocs/langs/hu_HU/holiday.lang
diff --git a/public/langs/hu_HU/hrm.lang b/htdocs/langs/hu_HU/hrm.lang
similarity index 100%
rename from public/langs/hu_HU/hrm.lang
rename to htdocs/langs/hu_HU/hrm.lang
diff --git a/public/langs/hu_HU/incoterm.lang b/htdocs/langs/hu_HU/incoterm.lang
similarity index 100%
rename from public/langs/hu_HU/incoterm.lang
rename to htdocs/langs/hu_HU/incoterm.lang
diff --git a/public/langs/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang
similarity index 100%
rename from public/langs/hu_HU/install.lang
rename to htdocs/langs/hu_HU/install.lang
diff --git a/public/langs/hu_HU/interventions.lang b/htdocs/langs/hu_HU/interventions.lang
similarity index 100%
rename from public/langs/hu_HU/interventions.lang
rename to htdocs/langs/hu_HU/interventions.lang
diff --git a/public/langs/hu_HU/languages.lang b/htdocs/langs/hu_HU/languages.lang
similarity index 100%
rename from public/langs/hu_HU/languages.lang
rename to htdocs/langs/hu_HU/languages.lang
diff --git a/public/langs/hu_HU/ldap.lang b/htdocs/langs/hu_HU/ldap.lang
similarity index 100%
rename from public/langs/hu_HU/ldap.lang
rename to htdocs/langs/hu_HU/ldap.lang
diff --git a/public/langs/hu_HU/link.lang b/htdocs/langs/hu_HU/link.lang
similarity index 100%
rename from public/langs/hu_HU/link.lang
rename to htdocs/langs/hu_HU/link.lang
diff --git a/public/langs/hu_HU/loan.lang b/htdocs/langs/hu_HU/loan.lang
similarity index 100%
rename from public/langs/hu_HU/loan.lang
rename to htdocs/langs/hu_HU/loan.lang
diff --git a/public/langs/hu_HU/mailmanspip.lang b/htdocs/langs/hu_HU/mailmanspip.lang
similarity index 100%
rename from public/langs/hu_HU/mailmanspip.lang
rename to htdocs/langs/hu_HU/mailmanspip.lang
diff --git a/public/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
similarity index 100%
rename from public/langs/hu_HU/mails.lang
rename to htdocs/langs/hu_HU/mails.lang
diff --git a/public/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
similarity index 100%
rename from public/langs/hu_HU/main.lang
rename to htdocs/langs/hu_HU/main.lang
diff --git a/public/langs/hu_HU/margins.lang b/htdocs/langs/hu_HU/margins.lang
similarity index 100%
rename from public/langs/hu_HU/margins.lang
rename to htdocs/langs/hu_HU/margins.lang
diff --git a/public/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
similarity index 100%
rename from public/langs/hu_HU/members.lang
rename to htdocs/langs/hu_HU/members.lang
diff --git a/public/langs/hu_HU/oauth.lang b/htdocs/langs/hu_HU/oauth.lang
similarity index 100%
rename from public/langs/hu_HU/oauth.lang
rename to htdocs/langs/hu_HU/oauth.lang
diff --git a/public/langs/hu_HU/opensurvey.lang b/htdocs/langs/hu_HU/opensurvey.lang
similarity index 100%
rename from public/langs/hu_HU/opensurvey.lang
rename to htdocs/langs/hu_HU/opensurvey.lang
diff --git a/public/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang
similarity index 100%
rename from public/langs/hu_HU/orders.lang
rename to htdocs/langs/hu_HU/orders.lang
diff --git a/public/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
similarity index 100%
rename from public/langs/hu_HU/other.lang
rename to htdocs/langs/hu_HU/other.lang
diff --git a/public/langs/hu_HU/paybox.lang b/htdocs/langs/hu_HU/paybox.lang
similarity index 100%
rename from public/langs/hu_HU/paybox.lang
rename to htdocs/langs/hu_HU/paybox.lang
diff --git a/public/langs/hu_HU/paypal.lang b/htdocs/langs/hu_HU/paypal.lang
similarity index 100%
rename from public/langs/hu_HU/paypal.lang
rename to htdocs/langs/hu_HU/paypal.lang
diff --git a/public/langs/hu_HU/printing.lang b/htdocs/langs/hu_HU/printing.lang
similarity index 100%
rename from public/langs/hu_HU/printing.lang
rename to htdocs/langs/hu_HU/printing.lang
diff --git a/public/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang
similarity index 100%
rename from public/langs/hu_HU/productbatch.lang
rename to htdocs/langs/hu_HU/productbatch.lang
diff --git a/public/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
similarity index 100%
rename from public/langs/hu_HU/products.lang
rename to htdocs/langs/hu_HU/products.lang
diff --git a/public/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
similarity index 100%
rename from public/langs/hu_HU/projects.lang
rename to htdocs/langs/hu_HU/projects.lang
diff --git a/public/langs/hu_HU/propal.lang b/htdocs/langs/hu_HU/propal.lang
similarity index 100%
rename from public/langs/hu_HU/propal.lang
rename to htdocs/langs/hu_HU/propal.lang
diff --git a/public/langs/hu_HU/receiptprinter.lang b/htdocs/langs/hu_HU/receiptprinter.lang
similarity index 100%
rename from public/langs/hu_HU/receiptprinter.lang
rename to htdocs/langs/hu_HU/receiptprinter.lang
diff --git a/public/langs/hu_HU/resource.lang b/htdocs/langs/hu_HU/resource.lang
similarity index 100%
rename from public/langs/hu_HU/resource.lang
rename to htdocs/langs/hu_HU/resource.lang
diff --git a/public/langs/hu_HU/salaries.lang b/htdocs/langs/hu_HU/salaries.lang
similarity index 100%
rename from public/langs/hu_HU/salaries.lang
rename to htdocs/langs/hu_HU/salaries.lang
diff --git a/public/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang
similarity index 100%
rename from public/langs/hu_HU/sendings.lang
rename to htdocs/langs/hu_HU/sendings.lang
diff --git a/public/langs/hu_HU/sms.lang b/htdocs/langs/hu_HU/sms.lang
similarity index 100%
rename from public/langs/hu_HU/sms.lang
rename to htdocs/langs/hu_HU/sms.lang
diff --git a/public/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
similarity index 100%
rename from public/langs/hu_HU/stocks.lang
rename to htdocs/langs/hu_HU/stocks.lang
diff --git a/public/langs/hu_HU/supplier_proposal.lang b/htdocs/langs/hu_HU/supplier_proposal.lang
similarity index 100%
rename from public/langs/hu_HU/supplier_proposal.lang
rename to htdocs/langs/hu_HU/supplier_proposal.lang
diff --git a/public/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang
similarity index 100%
rename from public/langs/hu_HU/suppliers.lang
rename to htdocs/langs/hu_HU/suppliers.lang
diff --git a/public/langs/hu_HU/trips.lang b/htdocs/langs/hu_HU/trips.lang
similarity index 100%
rename from public/langs/hu_HU/trips.lang
rename to htdocs/langs/hu_HU/trips.lang
diff --git a/public/langs/hu_HU/users.lang b/htdocs/langs/hu_HU/users.lang
similarity index 100%
rename from public/langs/hu_HU/users.lang
rename to htdocs/langs/hu_HU/users.lang
diff --git a/public/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
similarity index 100%
rename from public/langs/hu_HU/website.lang
rename to htdocs/langs/hu_HU/website.lang
diff --git a/public/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
similarity index 100%
rename from public/langs/hu_HU/withdrawals.lang
rename to htdocs/langs/hu_HU/withdrawals.lang
diff --git a/public/langs/hu_HU/workflow.lang b/htdocs/langs/hu_HU/workflow.lang
similarity index 100%
rename from public/langs/hu_HU/workflow.lang
rename to htdocs/langs/hu_HU/workflow.lang
diff --git a/public/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
similarity index 100%
rename from public/langs/id_ID/accountancy.lang
rename to htdocs/langs/id_ID/accountancy.lang
diff --git a/public/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
similarity index 100%
rename from public/langs/id_ID/admin.lang
rename to htdocs/langs/id_ID/admin.lang
diff --git a/public/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang
similarity index 100%
rename from public/langs/id_ID/agenda.lang
rename to htdocs/langs/id_ID/agenda.lang
diff --git a/public/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
similarity index 100%
rename from public/langs/id_ID/banks.lang
rename to htdocs/langs/id_ID/banks.lang
diff --git a/public/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
similarity index 100%
rename from public/langs/id_ID/bills.lang
rename to htdocs/langs/id_ID/bills.lang
diff --git a/public/langs/id_ID/bookmarks.lang b/htdocs/langs/id_ID/bookmarks.lang
similarity index 100%
rename from public/langs/id_ID/bookmarks.lang
rename to htdocs/langs/id_ID/bookmarks.lang
diff --git a/public/langs/id_ID/boxes.lang b/htdocs/langs/id_ID/boxes.lang
similarity index 100%
rename from public/langs/id_ID/boxes.lang
rename to htdocs/langs/id_ID/boxes.lang
diff --git a/public/langs/id_ID/cashdesk.lang b/htdocs/langs/id_ID/cashdesk.lang
similarity index 100%
rename from public/langs/id_ID/cashdesk.lang
rename to htdocs/langs/id_ID/cashdesk.lang
diff --git a/public/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang
similarity index 100%
rename from public/langs/id_ID/categories.lang
rename to htdocs/langs/id_ID/categories.lang
diff --git a/public/langs/id_ID/commercial.lang b/htdocs/langs/id_ID/commercial.lang
similarity index 100%
rename from public/langs/id_ID/commercial.lang
rename to htdocs/langs/id_ID/commercial.lang
diff --git a/public/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
similarity index 100%
rename from public/langs/id_ID/companies.lang
rename to htdocs/langs/id_ID/companies.lang
diff --git a/public/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
similarity index 100%
rename from public/langs/id_ID/compta.lang
rename to htdocs/langs/id_ID/compta.lang
diff --git a/public/langs/id_ID/contracts.lang b/htdocs/langs/id_ID/contracts.lang
similarity index 100%
rename from public/langs/id_ID/contracts.lang
rename to htdocs/langs/id_ID/contracts.lang
diff --git a/public/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
similarity index 100%
rename from public/langs/id_ID/cron.lang
rename to htdocs/langs/id_ID/cron.lang
diff --git a/public/langs/id_ID/deliveries.lang b/htdocs/langs/id_ID/deliveries.lang
similarity index 100%
rename from public/langs/id_ID/deliveries.lang
rename to htdocs/langs/id_ID/deliveries.lang
diff --git a/public/langs/id_ID/dict.lang b/htdocs/langs/id_ID/dict.lang
similarity index 100%
rename from public/langs/id_ID/dict.lang
rename to htdocs/langs/id_ID/dict.lang
diff --git a/public/langs/id_ID/donations.lang b/htdocs/langs/id_ID/donations.lang
similarity index 100%
rename from public/langs/id_ID/donations.lang
rename to htdocs/langs/id_ID/donations.lang
diff --git a/public/langs/id_ID/ecm.lang b/htdocs/langs/id_ID/ecm.lang
similarity index 100%
rename from public/langs/id_ID/ecm.lang
rename to htdocs/langs/id_ID/ecm.lang
diff --git a/public/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
similarity index 100%
rename from public/langs/id_ID/errors.lang
rename to htdocs/langs/id_ID/errors.lang
diff --git a/public/langs/id_ID/exports.lang b/htdocs/langs/id_ID/exports.lang
similarity index 100%
rename from public/langs/id_ID/exports.lang
rename to htdocs/langs/id_ID/exports.lang
diff --git a/public/langs/id_ID/externalsite.lang b/htdocs/langs/id_ID/externalsite.lang
similarity index 100%
rename from public/langs/id_ID/externalsite.lang
rename to htdocs/langs/id_ID/externalsite.lang
diff --git a/public/langs/id_ID/ftp.lang b/htdocs/langs/id_ID/ftp.lang
similarity index 100%
rename from public/langs/id_ID/ftp.lang
rename to htdocs/langs/id_ID/ftp.lang
diff --git a/public/langs/id_ID/help.lang b/htdocs/langs/id_ID/help.lang
similarity index 100%
rename from public/langs/id_ID/help.lang
rename to htdocs/langs/id_ID/help.lang
diff --git a/public/langs/id_ID/holiday.lang b/htdocs/langs/id_ID/holiday.lang
similarity index 100%
rename from public/langs/id_ID/holiday.lang
rename to htdocs/langs/id_ID/holiday.lang
diff --git a/public/langs/id_ID/hrm.lang b/htdocs/langs/id_ID/hrm.lang
similarity index 100%
rename from public/langs/id_ID/hrm.lang
rename to htdocs/langs/id_ID/hrm.lang
diff --git a/public/langs/id_ID/incoterm.lang b/htdocs/langs/id_ID/incoterm.lang
similarity index 100%
rename from public/langs/id_ID/incoterm.lang
rename to htdocs/langs/id_ID/incoterm.lang
diff --git a/public/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang
similarity index 100%
rename from public/langs/id_ID/install.lang
rename to htdocs/langs/id_ID/install.lang
diff --git a/public/langs/id_ID/interventions.lang b/htdocs/langs/id_ID/interventions.lang
similarity index 100%
rename from public/langs/id_ID/interventions.lang
rename to htdocs/langs/id_ID/interventions.lang
diff --git a/public/langs/id_ID/languages.lang b/htdocs/langs/id_ID/languages.lang
similarity index 100%
rename from public/langs/id_ID/languages.lang
rename to htdocs/langs/id_ID/languages.lang
diff --git a/public/langs/id_ID/ldap.lang b/htdocs/langs/id_ID/ldap.lang
similarity index 100%
rename from public/langs/id_ID/ldap.lang
rename to htdocs/langs/id_ID/ldap.lang
diff --git a/public/langs/id_ID/link.lang b/htdocs/langs/id_ID/link.lang
similarity index 100%
rename from public/langs/id_ID/link.lang
rename to htdocs/langs/id_ID/link.lang
diff --git a/public/langs/id_ID/loan.lang b/htdocs/langs/id_ID/loan.lang
similarity index 100%
rename from public/langs/id_ID/loan.lang
rename to htdocs/langs/id_ID/loan.lang
diff --git a/public/langs/id_ID/mailmanspip.lang b/htdocs/langs/id_ID/mailmanspip.lang
similarity index 100%
rename from public/langs/id_ID/mailmanspip.lang
rename to htdocs/langs/id_ID/mailmanspip.lang
diff --git a/public/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
similarity index 100%
rename from public/langs/id_ID/mails.lang
rename to htdocs/langs/id_ID/mails.lang
diff --git a/public/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
similarity index 100%
rename from public/langs/id_ID/main.lang
rename to htdocs/langs/id_ID/main.lang
diff --git a/public/langs/id_ID/margins.lang b/htdocs/langs/id_ID/margins.lang
similarity index 100%
rename from public/langs/id_ID/margins.lang
rename to htdocs/langs/id_ID/margins.lang
diff --git a/public/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
similarity index 100%
rename from public/langs/id_ID/members.lang
rename to htdocs/langs/id_ID/members.lang
diff --git a/public/langs/id_ID/oauth.lang b/htdocs/langs/id_ID/oauth.lang
similarity index 100%
rename from public/langs/id_ID/oauth.lang
rename to htdocs/langs/id_ID/oauth.lang
diff --git a/public/langs/id_ID/opensurvey.lang b/htdocs/langs/id_ID/opensurvey.lang
similarity index 100%
rename from public/langs/id_ID/opensurvey.lang
rename to htdocs/langs/id_ID/opensurvey.lang
diff --git a/public/langs/id_ID/orders.lang b/htdocs/langs/id_ID/orders.lang
similarity index 100%
rename from public/langs/id_ID/orders.lang
rename to htdocs/langs/id_ID/orders.lang
diff --git a/public/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
similarity index 100%
rename from public/langs/id_ID/other.lang
rename to htdocs/langs/id_ID/other.lang
diff --git a/public/langs/id_ID/paybox.lang b/htdocs/langs/id_ID/paybox.lang
similarity index 100%
rename from public/langs/id_ID/paybox.lang
rename to htdocs/langs/id_ID/paybox.lang
diff --git a/public/langs/id_ID/paypal.lang b/htdocs/langs/id_ID/paypal.lang
similarity index 100%
rename from public/langs/id_ID/paypal.lang
rename to htdocs/langs/id_ID/paypal.lang
diff --git a/public/langs/id_ID/printing.lang b/htdocs/langs/id_ID/printing.lang
similarity index 100%
rename from public/langs/id_ID/printing.lang
rename to htdocs/langs/id_ID/printing.lang
diff --git a/public/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang
similarity index 100%
rename from public/langs/id_ID/productbatch.lang
rename to htdocs/langs/id_ID/productbatch.lang
diff --git a/public/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
similarity index 100%
rename from public/langs/id_ID/products.lang
rename to htdocs/langs/id_ID/products.lang
diff --git a/public/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
similarity index 100%
rename from public/langs/id_ID/projects.lang
rename to htdocs/langs/id_ID/projects.lang
diff --git a/public/langs/id_ID/propal.lang b/htdocs/langs/id_ID/propal.lang
similarity index 100%
rename from public/langs/id_ID/propal.lang
rename to htdocs/langs/id_ID/propal.lang
diff --git a/public/langs/id_ID/receiptprinter.lang b/htdocs/langs/id_ID/receiptprinter.lang
similarity index 100%
rename from public/langs/id_ID/receiptprinter.lang
rename to htdocs/langs/id_ID/receiptprinter.lang
diff --git a/public/langs/id_ID/resource.lang b/htdocs/langs/id_ID/resource.lang
similarity index 100%
rename from public/langs/id_ID/resource.lang
rename to htdocs/langs/id_ID/resource.lang
diff --git a/public/langs/id_ID/salaries.lang b/htdocs/langs/id_ID/salaries.lang
similarity index 100%
rename from public/langs/id_ID/salaries.lang
rename to htdocs/langs/id_ID/salaries.lang
diff --git a/public/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang
similarity index 100%
rename from public/langs/id_ID/sendings.lang
rename to htdocs/langs/id_ID/sendings.lang
diff --git a/public/langs/id_ID/sms.lang b/htdocs/langs/id_ID/sms.lang
similarity index 100%
rename from public/langs/id_ID/sms.lang
rename to htdocs/langs/id_ID/sms.lang
diff --git a/public/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
similarity index 100%
rename from public/langs/id_ID/stocks.lang
rename to htdocs/langs/id_ID/stocks.lang
diff --git a/public/langs/id_ID/supplier_proposal.lang b/htdocs/langs/id_ID/supplier_proposal.lang
similarity index 100%
rename from public/langs/id_ID/supplier_proposal.lang
rename to htdocs/langs/id_ID/supplier_proposal.lang
diff --git a/public/langs/id_ID/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang
similarity index 100%
rename from public/langs/id_ID/suppliers.lang
rename to htdocs/langs/id_ID/suppliers.lang
diff --git a/public/langs/id_ID/trips.lang b/htdocs/langs/id_ID/trips.lang
similarity index 100%
rename from public/langs/id_ID/trips.lang
rename to htdocs/langs/id_ID/trips.lang
diff --git a/public/langs/id_ID/users.lang b/htdocs/langs/id_ID/users.lang
similarity index 100%
rename from public/langs/id_ID/users.lang
rename to htdocs/langs/id_ID/users.lang
diff --git a/public/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
similarity index 100%
rename from public/langs/id_ID/website.lang
rename to htdocs/langs/id_ID/website.lang
diff --git a/public/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
similarity index 100%
rename from public/langs/id_ID/withdrawals.lang
rename to htdocs/langs/id_ID/withdrawals.lang
diff --git a/public/langs/id_ID/workflow.lang b/htdocs/langs/id_ID/workflow.lang
similarity index 100%
rename from public/langs/id_ID/workflow.lang
rename to htdocs/langs/id_ID/workflow.lang
diff --git a/public/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
similarity index 100%
rename from public/langs/is_IS/accountancy.lang
rename to htdocs/langs/is_IS/accountancy.lang
diff --git a/public/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
similarity index 100%
rename from public/langs/is_IS/admin.lang
rename to htdocs/langs/is_IS/admin.lang
diff --git a/public/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang
similarity index 100%
rename from public/langs/is_IS/agenda.lang
rename to htdocs/langs/is_IS/agenda.lang
diff --git a/public/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
similarity index 100%
rename from public/langs/is_IS/banks.lang
rename to htdocs/langs/is_IS/banks.lang
diff --git a/public/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
similarity index 100%
rename from public/langs/is_IS/bills.lang
rename to htdocs/langs/is_IS/bills.lang
diff --git a/public/langs/is_IS/bookmarks.lang b/htdocs/langs/is_IS/bookmarks.lang
similarity index 100%
rename from public/langs/is_IS/bookmarks.lang
rename to htdocs/langs/is_IS/bookmarks.lang
diff --git a/public/langs/is_IS/boxes.lang b/htdocs/langs/is_IS/boxes.lang
similarity index 100%
rename from public/langs/is_IS/boxes.lang
rename to htdocs/langs/is_IS/boxes.lang
diff --git a/public/langs/is_IS/cashdesk.lang b/htdocs/langs/is_IS/cashdesk.lang
similarity index 100%
rename from public/langs/is_IS/cashdesk.lang
rename to htdocs/langs/is_IS/cashdesk.lang
diff --git a/public/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang
similarity index 100%
rename from public/langs/is_IS/categories.lang
rename to htdocs/langs/is_IS/categories.lang
diff --git a/public/langs/is_IS/commercial.lang b/htdocs/langs/is_IS/commercial.lang
similarity index 100%
rename from public/langs/is_IS/commercial.lang
rename to htdocs/langs/is_IS/commercial.lang
diff --git a/public/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
similarity index 100%
rename from public/langs/is_IS/companies.lang
rename to htdocs/langs/is_IS/companies.lang
diff --git a/public/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
similarity index 100%
rename from public/langs/is_IS/compta.lang
rename to htdocs/langs/is_IS/compta.lang
diff --git a/public/langs/is_IS/contracts.lang b/htdocs/langs/is_IS/contracts.lang
similarity index 100%
rename from public/langs/is_IS/contracts.lang
rename to htdocs/langs/is_IS/contracts.lang
diff --git a/public/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang
similarity index 100%
rename from public/langs/is_IS/cron.lang
rename to htdocs/langs/is_IS/cron.lang
diff --git a/public/langs/is_IS/deliveries.lang b/htdocs/langs/is_IS/deliveries.lang
similarity index 100%
rename from public/langs/is_IS/deliveries.lang
rename to htdocs/langs/is_IS/deliveries.lang
diff --git a/public/langs/is_IS/dict.lang b/htdocs/langs/is_IS/dict.lang
similarity index 100%
rename from public/langs/is_IS/dict.lang
rename to htdocs/langs/is_IS/dict.lang
diff --git a/public/langs/is_IS/donations.lang b/htdocs/langs/is_IS/donations.lang
similarity index 100%
rename from public/langs/is_IS/donations.lang
rename to htdocs/langs/is_IS/donations.lang
diff --git a/public/langs/is_IS/ecm.lang b/htdocs/langs/is_IS/ecm.lang
similarity index 100%
rename from public/langs/is_IS/ecm.lang
rename to htdocs/langs/is_IS/ecm.lang
diff --git a/public/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
similarity index 100%
rename from public/langs/is_IS/errors.lang
rename to htdocs/langs/is_IS/errors.lang
diff --git a/public/langs/is_IS/exports.lang b/htdocs/langs/is_IS/exports.lang
similarity index 100%
rename from public/langs/is_IS/exports.lang
rename to htdocs/langs/is_IS/exports.lang
diff --git a/public/langs/is_IS/externalsite.lang b/htdocs/langs/is_IS/externalsite.lang
similarity index 100%
rename from public/langs/is_IS/externalsite.lang
rename to htdocs/langs/is_IS/externalsite.lang
diff --git a/public/langs/is_IS/ftp.lang b/htdocs/langs/is_IS/ftp.lang
similarity index 100%
rename from public/langs/is_IS/ftp.lang
rename to htdocs/langs/is_IS/ftp.lang
diff --git a/public/langs/is_IS/help.lang b/htdocs/langs/is_IS/help.lang
similarity index 100%
rename from public/langs/is_IS/help.lang
rename to htdocs/langs/is_IS/help.lang
diff --git a/public/langs/is_IS/holiday.lang b/htdocs/langs/is_IS/holiday.lang
similarity index 100%
rename from public/langs/is_IS/holiday.lang
rename to htdocs/langs/is_IS/holiday.lang
diff --git a/public/langs/is_IS/hrm.lang b/htdocs/langs/is_IS/hrm.lang
similarity index 100%
rename from public/langs/is_IS/hrm.lang
rename to htdocs/langs/is_IS/hrm.lang
diff --git a/public/langs/is_IS/incoterm.lang b/htdocs/langs/is_IS/incoterm.lang
similarity index 100%
rename from public/langs/is_IS/incoterm.lang
rename to htdocs/langs/is_IS/incoterm.lang
diff --git a/public/langs/is_IS/install.lang b/htdocs/langs/is_IS/install.lang
similarity index 100%
rename from public/langs/is_IS/install.lang
rename to htdocs/langs/is_IS/install.lang
diff --git a/public/langs/is_IS/interventions.lang b/htdocs/langs/is_IS/interventions.lang
similarity index 100%
rename from public/langs/is_IS/interventions.lang
rename to htdocs/langs/is_IS/interventions.lang
diff --git a/public/langs/is_IS/languages.lang b/htdocs/langs/is_IS/languages.lang
similarity index 100%
rename from public/langs/is_IS/languages.lang
rename to htdocs/langs/is_IS/languages.lang
diff --git a/public/langs/is_IS/ldap.lang b/htdocs/langs/is_IS/ldap.lang
similarity index 100%
rename from public/langs/is_IS/ldap.lang
rename to htdocs/langs/is_IS/ldap.lang
diff --git a/public/langs/is_IS/link.lang b/htdocs/langs/is_IS/link.lang
similarity index 100%
rename from public/langs/is_IS/link.lang
rename to htdocs/langs/is_IS/link.lang
diff --git a/public/langs/is_IS/loan.lang b/htdocs/langs/is_IS/loan.lang
similarity index 100%
rename from public/langs/is_IS/loan.lang
rename to htdocs/langs/is_IS/loan.lang
diff --git a/public/langs/is_IS/mailmanspip.lang b/htdocs/langs/is_IS/mailmanspip.lang
similarity index 100%
rename from public/langs/is_IS/mailmanspip.lang
rename to htdocs/langs/is_IS/mailmanspip.lang
diff --git a/public/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
similarity index 100%
rename from public/langs/is_IS/mails.lang
rename to htdocs/langs/is_IS/mails.lang
diff --git a/public/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
similarity index 100%
rename from public/langs/is_IS/main.lang
rename to htdocs/langs/is_IS/main.lang
diff --git a/public/langs/is_IS/margins.lang b/htdocs/langs/is_IS/margins.lang
similarity index 100%
rename from public/langs/is_IS/margins.lang
rename to htdocs/langs/is_IS/margins.lang
diff --git a/public/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
similarity index 100%
rename from public/langs/is_IS/members.lang
rename to htdocs/langs/is_IS/members.lang
diff --git a/public/langs/is_IS/oauth.lang b/htdocs/langs/is_IS/oauth.lang
similarity index 100%
rename from public/langs/is_IS/oauth.lang
rename to htdocs/langs/is_IS/oauth.lang
diff --git a/public/langs/is_IS/opensurvey.lang b/htdocs/langs/is_IS/opensurvey.lang
similarity index 100%
rename from public/langs/is_IS/opensurvey.lang
rename to htdocs/langs/is_IS/opensurvey.lang
diff --git a/public/langs/is_IS/orders.lang b/htdocs/langs/is_IS/orders.lang
similarity index 100%
rename from public/langs/is_IS/orders.lang
rename to htdocs/langs/is_IS/orders.lang
diff --git a/public/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
similarity index 100%
rename from public/langs/is_IS/other.lang
rename to htdocs/langs/is_IS/other.lang
diff --git a/public/langs/is_IS/paybox.lang b/htdocs/langs/is_IS/paybox.lang
similarity index 100%
rename from public/langs/is_IS/paybox.lang
rename to htdocs/langs/is_IS/paybox.lang
diff --git a/public/langs/is_IS/paypal.lang b/htdocs/langs/is_IS/paypal.lang
similarity index 100%
rename from public/langs/is_IS/paypal.lang
rename to htdocs/langs/is_IS/paypal.lang
diff --git a/public/langs/is_IS/printing.lang b/htdocs/langs/is_IS/printing.lang
similarity index 100%
rename from public/langs/is_IS/printing.lang
rename to htdocs/langs/is_IS/printing.lang
diff --git a/public/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang
similarity index 100%
rename from public/langs/is_IS/productbatch.lang
rename to htdocs/langs/is_IS/productbatch.lang
diff --git a/public/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
similarity index 100%
rename from public/langs/is_IS/products.lang
rename to htdocs/langs/is_IS/products.lang
diff --git a/public/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
similarity index 100%
rename from public/langs/is_IS/projects.lang
rename to htdocs/langs/is_IS/projects.lang
diff --git a/public/langs/is_IS/propal.lang b/htdocs/langs/is_IS/propal.lang
similarity index 100%
rename from public/langs/is_IS/propal.lang
rename to htdocs/langs/is_IS/propal.lang
diff --git a/public/langs/is_IS/receiptprinter.lang b/htdocs/langs/is_IS/receiptprinter.lang
similarity index 100%
rename from public/langs/is_IS/receiptprinter.lang
rename to htdocs/langs/is_IS/receiptprinter.lang
diff --git a/public/langs/is_IS/resource.lang b/htdocs/langs/is_IS/resource.lang
similarity index 100%
rename from public/langs/is_IS/resource.lang
rename to htdocs/langs/is_IS/resource.lang
diff --git a/public/langs/is_IS/salaries.lang b/htdocs/langs/is_IS/salaries.lang
similarity index 100%
rename from public/langs/is_IS/salaries.lang
rename to htdocs/langs/is_IS/salaries.lang
diff --git a/public/langs/is_IS/sendings.lang b/htdocs/langs/is_IS/sendings.lang
similarity index 100%
rename from public/langs/is_IS/sendings.lang
rename to htdocs/langs/is_IS/sendings.lang
diff --git a/public/langs/is_IS/sms.lang b/htdocs/langs/is_IS/sms.lang
similarity index 100%
rename from public/langs/is_IS/sms.lang
rename to htdocs/langs/is_IS/sms.lang
diff --git a/public/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
similarity index 100%
rename from public/langs/is_IS/stocks.lang
rename to htdocs/langs/is_IS/stocks.lang
diff --git a/public/langs/is_IS/supplier_proposal.lang b/htdocs/langs/is_IS/supplier_proposal.lang
similarity index 100%
rename from public/langs/is_IS/supplier_proposal.lang
rename to htdocs/langs/is_IS/supplier_proposal.lang
diff --git a/public/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang
similarity index 100%
rename from public/langs/is_IS/suppliers.lang
rename to htdocs/langs/is_IS/suppliers.lang
diff --git a/public/langs/is_IS/trips.lang b/htdocs/langs/is_IS/trips.lang
similarity index 100%
rename from public/langs/is_IS/trips.lang
rename to htdocs/langs/is_IS/trips.lang
diff --git a/public/langs/is_IS/users.lang b/htdocs/langs/is_IS/users.lang
similarity index 100%
rename from public/langs/is_IS/users.lang
rename to htdocs/langs/is_IS/users.lang
diff --git a/public/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
similarity index 100%
rename from public/langs/is_IS/website.lang
rename to htdocs/langs/is_IS/website.lang
diff --git a/public/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
similarity index 100%
rename from public/langs/is_IS/withdrawals.lang
rename to htdocs/langs/is_IS/withdrawals.lang
diff --git a/public/langs/is_IS/workflow.lang b/htdocs/langs/is_IS/workflow.lang
similarity index 100%
rename from public/langs/is_IS/workflow.lang
rename to htdocs/langs/is_IS/workflow.lang
diff --git a/public/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
similarity index 100%
rename from public/langs/it_IT/accountancy.lang
rename to htdocs/langs/it_IT/accountancy.lang
diff --git a/public/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
similarity index 100%
rename from public/langs/it_IT/admin.lang
rename to htdocs/langs/it_IT/admin.lang
diff --git a/public/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
similarity index 100%
rename from public/langs/it_IT/agenda.lang
rename to htdocs/langs/it_IT/agenda.lang
diff --git a/public/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
similarity index 100%
rename from public/langs/it_IT/banks.lang
rename to htdocs/langs/it_IT/banks.lang
diff --git a/public/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
similarity index 100%
rename from public/langs/it_IT/bills.lang
rename to htdocs/langs/it_IT/bills.lang
diff --git a/public/langs/it_IT/bookmarks.lang b/htdocs/langs/it_IT/bookmarks.lang
similarity index 100%
rename from public/langs/it_IT/bookmarks.lang
rename to htdocs/langs/it_IT/bookmarks.lang
diff --git a/public/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
similarity index 100%
rename from public/langs/it_IT/boxes.lang
rename to htdocs/langs/it_IT/boxes.lang
diff --git a/public/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang
similarity index 100%
rename from public/langs/it_IT/cashdesk.lang
rename to htdocs/langs/it_IT/cashdesk.lang
diff --git a/public/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
similarity index 100%
rename from public/langs/it_IT/categories.lang
rename to htdocs/langs/it_IT/categories.lang
diff --git a/public/langs/it_IT/commercial.lang b/htdocs/langs/it_IT/commercial.lang
similarity index 100%
rename from public/langs/it_IT/commercial.lang
rename to htdocs/langs/it_IT/commercial.lang
diff --git a/public/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
similarity index 100%
rename from public/langs/it_IT/companies.lang
rename to htdocs/langs/it_IT/companies.lang
diff --git a/public/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
similarity index 100%
rename from public/langs/it_IT/compta.lang
rename to htdocs/langs/it_IT/compta.lang
diff --git a/public/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang
similarity index 100%
rename from public/langs/it_IT/contracts.lang
rename to htdocs/langs/it_IT/contracts.lang
diff --git a/public/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
similarity index 100%
rename from public/langs/it_IT/cron.lang
rename to htdocs/langs/it_IT/cron.lang
diff --git a/public/langs/it_IT/deliveries.lang b/htdocs/langs/it_IT/deliveries.lang
similarity index 100%
rename from public/langs/it_IT/deliveries.lang
rename to htdocs/langs/it_IT/deliveries.lang
diff --git a/public/langs/it_IT/dict.lang b/htdocs/langs/it_IT/dict.lang
similarity index 100%
rename from public/langs/it_IT/dict.lang
rename to htdocs/langs/it_IT/dict.lang
diff --git a/public/langs/it_IT/donations.lang b/htdocs/langs/it_IT/donations.lang
similarity index 100%
rename from public/langs/it_IT/donations.lang
rename to htdocs/langs/it_IT/donations.lang
diff --git a/public/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang
similarity index 100%
rename from public/langs/it_IT/ecm.lang
rename to htdocs/langs/it_IT/ecm.lang
diff --git a/public/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
similarity index 100%
rename from public/langs/it_IT/errors.lang
rename to htdocs/langs/it_IT/errors.lang
diff --git a/public/langs/it_IT/exports.lang b/htdocs/langs/it_IT/exports.lang
similarity index 100%
rename from public/langs/it_IT/exports.lang
rename to htdocs/langs/it_IT/exports.lang
diff --git a/public/langs/it_IT/externalsite.lang b/htdocs/langs/it_IT/externalsite.lang
similarity index 100%
rename from public/langs/it_IT/externalsite.lang
rename to htdocs/langs/it_IT/externalsite.lang
diff --git a/public/langs/it_IT/ftp.lang b/htdocs/langs/it_IT/ftp.lang
similarity index 100%
rename from public/langs/it_IT/ftp.lang
rename to htdocs/langs/it_IT/ftp.lang
diff --git a/public/langs/it_IT/google.lang b/htdocs/langs/it_IT/google.lang
similarity index 100%
rename from public/langs/it_IT/google.lang
rename to htdocs/langs/it_IT/google.lang
diff --git a/public/langs/it_IT/help.lang b/htdocs/langs/it_IT/help.lang
similarity index 100%
rename from public/langs/it_IT/help.lang
rename to htdocs/langs/it_IT/help.lang
diff --git a/public/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang
similarity index 100%
rename from public/langs/it_IT/holiday.lang
rename to htdocs/langs/it_IT/holiday.lang
diff --git a/public/langs/it_IT/hrm.lang b/htdocs/langs/it_IT/hrm.lang
similarity index 100%
rename from public/langs/it_IT/hrm.lang
rename to htdocs/langs/it_IT/hrm.lang
diff --git a/public/langs/it_IT/incoterm.lang b/htdocs/langs/it_IT/incoterm.lang
similarity index 100%
rename from public/langs/it_IT/incoterm.lang
rename to htdocs/langs/it_IT/incoterm.lang
diff --git a/public/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang
similarity index 100%
rename from public/langs/it_IT/install.lang
rename to htdocs/langs/it_IT/install.lang
diff --git a/public/langs/it_IT/interventions.lang b/htdocs/langs/it_IT/interventions.lang
similarity index 100%
rename from public/langs/it_IT/interventions.lang
rename to htdocs/langs/it_IT/interventions.lang
diff --git a/public/langs/it_IT/languages.lang b/htdocs/langs/it_IT/languages.lang
similarity index 100%
rename from public/langs/it_IT/languages.lang
rename to htdocs/langs/it_IT/languages.lang
diff --git a/public/langs/it_IT/ldap.lang b/htdocs/langs/it_IT/ldap.lang
similarity index 100%
rename from public/langs/it_IT/ldap.lang
rename to htdocs/langs/it_IT/ldap.lang
diff --git a/public/langs/it_IT/link.lang b/htdocs/langs/it_IT/link.lang
similarity index 100%
rename from public/langs/it_IT/link.lang
rename to htdocs/langs/it_IT/link.lang
diff --git a/public/langs/it_IT/loan.lang b/htdocs/langs/it_IT/loan.lang
similarity index 100%
rename from public/langs/it_IT/loan.lang
rename to htdocs/langs/it_IT/loan.lang
diff --git a/public/langs/it_IT/mailmanspip.lang b/htdocs/langs/it_IT/mailmanspip.lang
similarity index 100%
rename from public/langs/it_IT/mailmanspip.lang
rename to htdocs/langs/it_IT/mailmanspip.lang
diff --git a/public/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
similarity index 100%
rename from public/langs/it_IT/mails.lang
rename to htdocs/langs/it_IT/mails.lang
diff --git a/public/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
similarity index 100%
rename from public/langs/it_IT/main.lang
rename to htdocs/langs/it_IT/main.lang
diff --git a/public/langs/it_IT/margins.lang b/htdocs/langs/it_IT/margins.lang
similarity index 100%
rename from public/langs/it_IT/margins.lang
rename to htdocs/langs/it_IT/margins.lang
diff --git a/public/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
similarity index 100%
rename from public/langs/it_IT/members.lang
rename to htdocs/langs/it_IT/members.lang
diff --git a/public/langs/it_IT/oauth.lang b/htdocs/langs/it_IT/oauth.lang
similarity index 100%
rename from public/langs/it_IT/oauth.lang
rename to htdocs/langs/it_IT/oauth.lang
diff --git a/public/langs/it_IT/opensurvey.lang b/htdocs/langs/it_IT/opensurvey.lang
similarity index 100%
rename from public/langs/it_IT/opensurvey.lang
rename to htdocs/langs/it_IT/opensurvey.lang
diff --git a/public/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
similarity index 100%
rename from public/langs/it_IT/orders.lang
rename to htdocs/langs/it_IT/orders.lang
diff --git a/public/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
similarity index 100%
rename from public/langs/it_IT/other.lang
rename to htdocs/langs/it_IT/other.lang
diff --git a/public/langs/it_IT/paybox.lang b/htdocs/langs/it_IT/paybox.lang
similarity index 100%
rename from public/langs/it_IT/paybox.lang
rename to htdocs/langs/it_IT/paybox.lang
diff --git a/public/langs/it_IT/paypal.lang b/htdocs/langs/it_IT/paypal.lang
similarity index 100%
rename from public/langs/it_IT/paypal.lang
rename to htdocs/langs/it_IT/paypal.lang
diff --git a/public/langs/it_IT/printing.lang b/htdocs/langs/it_IT/printing.lang
similarity index 100%
rename from public/langs/it_IT/printing.lang
rename to htdocs/langs/it_IT/printing.lang
diff --git a/public/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang
similarity index 100%
rename from public/langs/it_IT/productbatch.lang
rename to htdocs/langs/it_IT/productbatch.lang
diff --git a/public/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
similarity index 100%
rename from public/langs/it_IT/products.lang
rename to htdocs/langs/it_IT/products.lang
diff --git a/public/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
similarity index 100%
rename from public/langs/it_IT/projects.lang
rename to htdocs/langs/it_IT/projects.lang
diff --git a/public/langs/it_IT/propal.lang b/htdocs/langs/it_IT/propal.lang
similarity index 100%
rename from public/langs/it_IT/propal.lang
rename to htdocs/langs/it_IT/propal.lang
diff --git a/public/langs/it_IT/receiptprinter.lang b/htdocs/langs/it_IT/receiptprinter.lang
similarity index 100%
rename from public/langs/it_IT/receiptprinter.lang
rename to htdocs/langs/it_IT/receiptprinter.lang
diff --git a/public/langs/it_IT/resource.lang b/htdocs/langs/it_IT/resource.lang
similarity index 100%
rename from public/langs/it_IT/resource.lang
rename to htdocs/langs/it_IT/resource.lang
diff --git a/public/langs/it_IT/salaries.lang b/htdocs/langs/it_IT/salaries.lang
similarity index 100%
rename from public/langs/it_IT/salaries.lang
rename to htdocs/langs/it_IT/salaries.lang
diff --git a/public/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang
similarity index 100%
rename from public/langs/it_IT/sendings.lang
rename to htdocs/langs/it_IT/sendings.lang
diff --git a/public/langs/it_IT/sms.lang b/htdocs/langs/it_IT/sms.lang
similarity index 100%
rename from public/langs/it_IT/sms.lang
rename to htdocs/langs/it_IT/sms.lang
diff --git a/public/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
similarity index 100%
rename from public/langs/it_IT/stocks.lang
rename to htdocs/langs/it_IT/stocks.lang
diff --git a/public/langs/it_IT/supplier_proposal.lang b/htdocs/langs/it_IT/supplier_proposal.lang
similarity index 100%
rename from public/langs/it_IT/supplier_proposal.lang
rename to htdocs/langs/it_IT/supplier_proposal.lang
diff --git a/public/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
similarity index 100%
rename from public/langs/it_IT/suppliers.lang
rename to htdocs/langs/it_IT/suppliers.lang
diff --git a/public/langs/it_IT/trips.lang b/htdocs/langs/it_IT/trips.lang
similarity index 100%
rename from public/langs/it_IT/trips.lang
rename to htdocs/langs/it_IT/trips.lang
diff --git a/public/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
similarity index 100%
rename from public/langs/it_IT/users.lang
rename to htdocs/langs/it_IT/users.lang
diff --git a/public/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
similarity index 100%
rename from public/langs/it_IT/website.lang
rename to htdocs/langs/it_IT/website.lang
diff --git a/public/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
similarity index 100%
rename from public/langs/it_IT/withdrawals.lang
rename to htdocs/langs/it_IT/withdrawals.lang
diff --git a/public/langs/it_IT/workflow.lang b/htdocs/langs/it_IT/workflow.lang
similarity index 100%
rename from public/langs/it_IT/workflow.lang
rename to htdocs/langs/it_IT/workflow.lang
diff --git a/public/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
similarity index 100%
rename from public/langs/ja_JP/accountancy.lang
rename to htdocs/langs/ja_JP/accountancy.lang
diff --git a/public/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
similarity index 100%
rename from public/langs/ja_JP/admin.lang
rename to htdocs/langs/ja_JP/admin.lang
diff --git a/public/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
similarity index 100%
rename from public/langs/ja_JP/agenda.lang
rename to htdocs/langs/ja_JP/agenda.lang
diff --git a/public/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
similarity index 100%
rename from public/langs/ja_JP/banks.lang
rename to htdocs/langs/ja_JP/banks.lang
diff --git a/public/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
similarity index 100%
rename from public/langs/ja_JP/bills.lang
rename to htdocs/langs/ja_JP/bills.lang
diff --git a/public/langs/ja_JP/bookmarks.lang b/htdocs/langs/ja_JP/bookmarks.lang
similarity index 100%
rename from public/langs/ja_JP/bookmarks.lang
rename to htdocs/langs/ja_JP/bookmarks.lang
diff --git a/public/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
similarity index 100%
rename from public/langs/ja_JP/boxes.lang
rename to htdocs/langs/ja_JP/boxes.lang
diff --git a/public/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
similarity index 100%
rename from public/langs/ja_JP/cashdesk.lang
rename to htdocs/langs/ja_JP/cashdesk.lang
diff --git a/public/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
similarity index 100%
rename from public/langs/ja_JP/categories.lang
rename to htdocs/langs/ja_JP/categories.lang
diff --git a/public/langs/ja_JP/commercial.lang b/htdocs/langs/ja_JP/commercial.lang
similarity index 100%
rename from public/langs/ja_JP/commercial.lang
rename to htdocs/langs/ja_JP/commercial.lang
diff --git a/public/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
similarity index 100%
rename from public/langs/ja_JP/companies.lang
rename to htdocs/langs/ja_JP/companies.lang
diff --git a/public/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
similarity index 100%
rename from public/langs/ja_JP/compta.lang
rename to htdocs/langs/ja_JP/compta.lang
diff --git a/public/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang
similarity index 100%
rename from public/langs/ja_JP/contracts.lang
rename to htdocs/langs/ja_JP/contracts.lang
diff --git a/public/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
similarity index 100%
rename from public/langs/ja_JP/cron.lang
rename to htdocs/langs/ja_JP/cron.lang
diff --git a/public/langs/ja_JP/deliveries.lang b/htdocs/langs/ja_JP/deliveries.lang
similarity index 100%
rename from public/langs/ja_JP/deliveries.lang
rename to htdocs/langs/ja_JP/deliveries.lang
diff --git a/public/langs/ja_JP/dict.lang b/htdocs/langs/ja_JP/dict.lang
similarity index 100%
rename from public/langs/ja_JP/dict.lang
rename to htdocs/langs/ja_JP/dict.lang
diff --git a/public/langs/ja_JP/donations.lang b/htdocs/langs/ja_JP/donations.lang
similarity index 100%
rename from public/langs/ja_JP/donations.lang
rename to htdocs/langs/ja_JP/donations.lang
diff --git a/public/langs/ja_JP/ecm.lang b/htdocs/langs/ja_JP/ecm.lang
similarity index 100%
rename from public/langs/ja_JP/ecm.lang
rename to htdocs/langs/ja_JP/ecm.lang
diff --git a/public/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
similarity index 100%
rename from public/langs/ja_JP/errors.lang
rename to htdocs/langs/ja_JP/errors.lang
diff --git a/public/langs/ja_JP/exports.lang b/htdocs/langs/ja_JP/exports.lang
similarity index 100%
rename from public/langs/ja_JP/exports.lang
rename to htdocs/langs/ja_JP/exports.lang
diff --git a/public/langs/ja_JP/externalsite.lang b/htdocs/langs/ja_JP/externalsite.lang
similarity index 100%
rename from public/langs/ja_JP/externalsite.lang
rename to htdocs/langs/ja_JP/externalsite.lang
diff --git a/public/langs/ja_JP/ftp.lang b/htdocs/langs/ja_JP/ftp.lang
similarity index 100%
rename from public/langs/ja_JP/ftp.lang
rename to htdocs/langs/ja_JP/ftp.lang
diff --git a/public/langs/ja_JP/help.lang b/htdocs/langs/ja_JP/help.lang
similarity index 100%
rename from public/langs/ja_JP/help.lang
rename to htdocs/langs/ja_JP/help.lang
diff --git a/public/langs/ja_JP/holiday.lang b/htdocs/langs/ja_JP/holiday.lang
similarity index 100%
rename from public/langs/ja_JP/holiday.lang
rename to htdocs/langs/ja_JP/holiday.lang
diff --git a/public/langs/ja_JP/hrm.lang b/htdocs/langs/ja_JP/hrm.lang
similarity index 100%
rename from public/langs/ja_JP/hrm.lang
rename to htdocs/langs/ja_JP/hrm.lang
diff --git a/public/langs/ja_JP/incoterm.lang b/htdocs/langs/ja_JP/incoterm.lang
similarity index 100%
rename from public/langs/ja_JP/incoterm.lang
rename to htdocs/langs/ja_JP/incoterm.lang
diff --git a/public/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
similarity index 100%
rename from public/langs/ja_JP/install.lang
rename to htdocs/langs/ja_JP/install.lang
diff --git a/public/langs/ja_JP/interventions.lang b/htdocs/langs/ja_JP/interventions.lang
similarity index 100%
rename from public/langs/ja_JP/interventions.lang
rename to htdocs/langs/ja_JP/interventions.lang
diff --git a/public/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang
similarity index 100%
rename from public/langs/ja_JP/languages.lang
rename to htdocs/langs/ja_JP/languages.lang
diff --git a/public/langs/ja_JP/ldap.lang b/htdocs/langs/ja_JP/ldap.lang
similarity index 100%
rename from public/langs/ja_JP/ldap.lang
rename to htdocs/langs/ja_JP/ldap.lang
diff --git a/public/langs/ja_JP/link.lang b/htdocs/langs/ja_JP/link.lang
similarity index 100%
rename from public/langs/ja_JP/link.lang
rename to htdocs/langs/ja_JP/link.lang
diff --git a/public/langs/ja_JP/loan.lang b/htdocs/langs/ja_JP/loan.lang
similarity index 100%
rename from public/langs/ja_JP/loan.lang
rename to htdocs/langs/ja_JP/loan.lang
diff --git a/public/langs/ja_JP/mailmanspip.lang b/htdocs/langs/ja_JP/mailmanspip.lang
similarity index 100%
rename from public/langs/ja_JP/mailmanspip.lang
rename to htdocs/langs/ja_JP/mailmanspip.lang
diff --git a/public/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
similarity index 100%
rename from public/langs/ja_JP/mails.lang
rename to htdocs/langs/ja_JP/mails.lang
diff --git a/public/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
similarity index 100%
rename from public/langs/ja_JP/main.lang
rename to htdocs/langs/ja_JP/main.lang
diff --git a/public/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang
similarity index 100%
rename from public/langs/ja_JP/margins.lang
rename to htdocs/langs/ja_JP/margins.lang
diff --git a/public/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
similarity index 100%
rename from public/langs/ja_JP/members.lang
rename to htdocs/langs/ja_JP/members.lang
diff --git a/public/langs/ja_JP/oauth.lang b/htdocs/langs/ja_JP/oauth.lang
similarity index 100%
rename from public/langs/ja_JP/oauth.lang
rename to htdocs/langs/ja_JP/oauth.lang
diff --git a/public/langs/ja_JP/opensurvey.lang b/htdocs/langs/ja_JP/opensurvey.lang
similarity index 100%
rename from public/langs/ja_JP/opensurvey.lang
rename to htdocs/langs/ja_JP/opensurvey.lang
diff --git a/public/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
similarity index 100%
rename from public/langs/ja_JP/orders.lang
rename to htdocs/langs/ja_JP/orders.lang
diff --git a/public/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
similarity index 100%
rename from public/langs/ja_JP/other.lang
rename to htdocs/langs/ja_JP/other.lang
diff --git a/public/langs/ja_JP/paybox.lang b/htdocs/langs/ja_JP/paybox.lang
similarity index 100%
rename from public/langs/ja_JP/paybox.lang
rename to htdocs/langs/ja_JP/paybox.lang
diff --git a/public/langs/ja_JP/paypal.lang b/htdocs/langs/ja_JP/paypal.lang
similarity index 100%
rename from public/langs/ja_JP/paypal.lang
rename to htdocs/langs/ja_JP/paypal.lang
diff --git a/public/langs/ja_JP/printing.lang b/htdocs/langs/ja_JP/printing.lang
similarity index 100%
rename from public/langs/ja_JP/printing.lang
rename to htdocs/langs/ja_JP/printing.lang
diff --git a/public/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang
similarity index 100%
rename from public/langs/ja_JP/productbatch.lang
rename to htdocs/langs/ja_JP/productbatch.lang
diff --git a/public/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
similarity index 100%
rename from public/langs/ja_JP/products.lang
rename to htdocs/langs/ja_JP/products.lang
diff --git a/public/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
similarity index 100%
rename from public/langs/ja_JP/projects.lang
rename to htdocs/langs/ja_JP/projects.lang
diff --git a/public/langs/ja_JP/propal.lang b/htdocs/langs/ja_JP/propal.lang
similarity index 100%
rename from public/langs/ja_JP/propal.lang
rename to htdocs/langs/ja_JP/propal.lang
diff --git a/public/langs/ja_JP/receiptprinter.lang b/htdocs/langs/ja_JP/receiptprinter.lang
similarity index 100%
rename from public/langs/ja_JP/receiptprinter.lang
rename to htdocs/langs/ja_JP/receiptprinter.lang
diff --git a/public/langs/ja_JP/resource.lang b/htdocs/langs/ja_JP/resource.lang
similarity index 100%
rename from public/langs/ja_JP/resource.lang
rename to htdocs/langs/ja_JP/resource.lang
diff --git a/public/langs/ja_JP/salaries.lang b/htdocs/langs/ja_JP/salaries.lang
similarity index 100%
rename from public/langs/ja_JP/salaries.lang
rename to htdocs/langs/ja_JP/salaries.lang
diff --git a/public/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
similarity index 100%
rename from public/langs/ja_JP/sendings.lang
rename to htdocs/langs/ja_JP/sendings.lang
diff --git a/public/langs/ja_JP/sms.lang b/htdocs/langs/ja_JP/sms.lang
similarity index 100%
rename from public/langs/ja_JP/sms.lang
rename to htdocs/langs/ja_JP/sms.lang
diff --git a/public/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
similarity index 100%
rename from public/langs/ja_JP/stocks.lang
rename to htdocs/langs/ja_JP/stocks.lang
diff --git a/public/langs/ja_JP/supplier_proposal.lang b/htdocs/langs/ja_JP/supplier_proposal.lang
similarity index 100%
rename from public/langs/ja_JP/supplier_proposal.lang
rename to htdocs/langs/ja_JP/supplier_proposal.lang
diff --git a/public/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
similarity index 100%
rename from public/langs/ja_JP/suppliers.lang
rename to htdocs/langs/ja_JP/suppliers.lang
diff --git a/public/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang
similarity index 100%
rename from public/langs/ja_JP/trips.lang
rename to htdocs/langs/ja_JP/trips.lang
diff --git a/public/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
similarity index 100%
rename from public/langs/ja_JP/users.lang
rename to htdocs/langs/ja_JP/users.lang
diff --git a/public/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
similarity index 100%
rename from public/langs/ja_JP/website.lang
rename to htdocs/langs/ja_JP/website.lang
diff --git a/public/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
similarity index 100%
rename from public/langs/ja_JP/withdrawals.lang
rename to htdocs/langs/ja_JP/withdrawals.lang
diff --git a/public/langs/ja_JP/workflow.lang b/htdocs/langs/ja_JP/workflow.lang
similarity index 100%
rename from public/langs/ja_JP/workflow.lang
rename to htdocs/langs/ja_JP/workflow.lang
diff --git a/public/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
similarity index 100%
rename from public/langs/ka_GE/accountancy.lang
rename to htdocs/langs/ka_GE/accountancy.lang
diff --git a/public/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
similarity index 100%
rename from public/langs/ka_GE/admin.lang
rename to htdocs/langs/ka_GE/admin.lang
diff --git a/public/langs/ka_GE/agenda.lang b/htdocs/langs/ka_GE/agenda.lang
similarity index 100%
rename from public/langs/ka_GE/agenda.lang
rename to htdocs/langs/ka_GE/agenda.lang
diff --git a/public/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
similarity index 100%
rename from public/langs/ka_GE/banks.lang
rename to htdocs/langs/ka_GE/banks.lang
diff --git a/public/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
similarity index 100%
rename from public/langs/ka_GE/bills.lang
rename to htdocs/langs/ka_GE/bills.lang
diff --git a/public/langs/ka_GE/bookmarks.lang b/htdocs/langs/ka_GE/bookmarks.lang
similarity index 100%
rename from public/langs/ka_GE/bookmarks.lang
rename to htdocs/langs/ka_GE/bookmarks.lang
diff --git a/public/langs/ka_GE/boxes.lang b/htdocs/langs/ka_GE/boxes.lang
similarity index 100%
rename from public/langs/ka_GE/boxes.lang
rename to htdocs/langs/ka_GE/boxes.lang
diff --git a/public/langs/ka_GE/cashdesk.lang b/htdocs/langs/ka_GE/cashdesk.lang
similarity index 100%
rename from public/langs/ka_GE/cashdesk.lang
rename to htdocs/langs/ka_GE/cashdesk.lang
diff --git a/public/langs/ka_GE/categories.lang b/htdocs/langs/ka_GE/categories.lang
similarity index 100%
rename from public/langs/ka_GE/categories.lang
rename to htdocs/langs/ka_GE/categories.lang
diff --git a/public/langs/ka_GE/commercial.lang b/htdocs/langs/ka_GE/commercial.lang
similarity index 100%
rename from public/langs/ka_GE/commercial.lang
rename to htdocs/langs/ka_GE/commercial.lang
diff --git a/public/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
similarity index 100%
rename from public/langs/ka_GE/companies.lang
rename to htdocs/langs/ka_GE/companies.lang
diff --git a/public/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
similarity index 100%
rename from public/langs/ka_GE/compta.lang
rename to htdocs/langs/ka_GE/compta.lang
diff --git a/public/langs/ka_GE/contracts.lang b/htdocs/langs/ka_GE/contracts.lang
similarity index 100%
rename from public/langs/ka_GE/contracts.lang
rename to htdocs/langs/ka_GE/contracts.lang
diff --git a/public/langs/ka_GE/cron.lang b/htdocs/langs/ka_GE/cron.lang
similarity index 100%
rename from public/langs/ka_GE/cron.lang
rename to htdocs/langs/ka_GE/cron.lang
diff --git a/public/langs/ka_GE/deliveries.lang b/htdocs/langs/ka_GE/deliveries.lang
similarity index 100%
rename from public/langs/ka_GE/deliveries.lang
rename to htdocs/langs/ka_GE/deliveries.lang
diff --git a/public/langs/ka_GE/dict.lang b/htdocs/langs/ka_GE/dict.lang
similarity index 100%
rename from public/langs/ka_GE/dict.lang
rename to htdocs/langs/ka_GE/dict.lang
diff --git a/public/langs/ka_GE/donations.lang b/htdocs/langs/ka_GE/donations.lang
similarity index 100%
rename from public/langs/ka_GE/donations.lang
rename to htdocs/langs/ka_GE/donations.lang
diff --git a/public/langs/ka_GE/ecm.lang b/htdocs/langs/ka_GE/ecm.lang
similarity index 100%
rename from public/langs/ka_GE/ecm.lang
rename to htdocs/langs/ka_GE/ecm.lang
diff --git a/public/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
similarity index 100%
rename from public/langs/ka_GE/errors.lang
rename to htdocs/langs/ka_GE/errors.lang
diff --git a/public/langs/ka_GE/exports.lang b/htdocs/langs/ka_GE/exports.lang
similarity index 100%
rename from public/langs/ka_GE/exports.lang
rename to htdocs/langs/ka_GE/exports.lang
diff --git a/public/langs/ka_GE/externalsite.lang b/htdocs/langs/ka_GE/externalsite.lang
similarity index 100%
rename from public/langs/ka_GE/externalsite.lang
rename to htdocs/langs/ka_GE/externalsite.lang
diff --git a/public/langs/ka_GE/ftp.lang b/htdocs/langs/ka_GE/ftp.lang
similarity index 100%
rename from public/langs/ka_GE/ftp.lang
rename to htdocs/langs/ka_GE/ftp.lang
diff --git a/public/langs/ka_GE/help.lang b/htdocs/langs/ka_GE/help.lang
similarity index 100%
rename from public/langs/ka_GE/help.lang
rename to htdocs/langs/ka_GE/help.lang
diff --git a/public/langs/ka_GE/holiday.lang b/htdocs/langs/ka_GE/holiday.lang
similarity index 100%
rename from public/langs/ka_GE/holiday.lang
rename to htdocs/langs/ka_GE/holiday.lang
diff --git a/public/langs/ka_GE/hrm.lang b/htdocs/langs/ka_GE/hrm.lang
similarity index 100%
rename from public/langs/ka_GE/hrm.lang
rename to htdocs/langs/ka_GE/hrm.lang
diff --git a/public/langs/ka_GE/incoterm.lang b/htdocs/langs/ka_GE/incoterm.lang
similarity index 100%
rename from public/langs/ka_GE/incoterm.lang
rename to htdocs/langs/ka_GE/incoterm.lang
diff --git a/public/langs/ka_GE/install.lang b/htdocs/langs/ka_GE/install.lang
similarity index 100%
rename from public/langs/ka_GE/install.lang
rename to htdocs/langs/ka_GE/install.lang
diff --git a/public/langs/ka_GE/interventions.lang b/htdocs/langs/ka_GE/interventions.lang
similarity index 100%
rename from public/langs/ka_GE/interventions.lang
rename to htdocs/langs/ka_GE/interventions.lang
diff --git a/public/langs/ka_GE/languages.lang b/htdocs/langs/ka_GE/languages.lang
similarity index 100%
rename from public/langs/ka_GE/languages.lang
rename to htdocs/langs/ka_GE/languages.lang
diff --git a/public/langs/ka_GE/ldap.lang b/htdocs/langs/ka_GE/ldap.lang
similarity index 100%
rename from public/langs/ka_GE/ldap.lang
rename to htdocs/langs/ka_GE/ldap.lang
diff --git a/public/langs/ka_GE/link.lang b/htdocs/langs/ka_GE/link.lang
similarity index 100%
rename from public/langs/ka_GE/link.lang
rename to htdocs/langs/ka_GE/link.lang
diff --git a/public/langs/ka_GE/loan.lang b/htdocs/langs/ka_GE/loan.lang
similarity index 100%
rename from public/langs/ka_GE/loan.lang
rename to htdocs/langs/ka_GE/loan.lang
diff --git a/public/langs/ka_GE/mailmanspip.lang b/htdocs/langs/ka_GE/mailmanspip.lang
similarity index 100%
rename from public/langs/ka_GE/mailmanspip.lang
rename to htdocs/langs/ka_GE/mailmanspip.lang
diff --git a/public/langs/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
similarity index 100%
rename from public/langs/ka_GE/mails.lang
rename to htdocs/langs/ka_GE/mails.lang
diff --git a/public/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
similarity index 100%
rename from public/langs/ka_GE/main.lang
rename to htdocs/langs/ka_GE/main.lang
diff --git a/public/langs/ka_GE/margins.lang b/htdocs/langs/ka_GE/margins.lang
similarity index 100%
rename from public/langs/ka_GE/margins.lang
rename to htdocs/langs/ka_GE/margins.lang
diff --git a/public/langs/ka_GE/members.lang b/htdocs/langs/ka_GE/members.lang
similarity index 100%
rename from public/langs/ka_GE/members.lang
rename to htdocs/langs/ka_GE/members.lang
diff --git a/public/langs/ka_GE/oauth.lang b/htdocs/langs/ka_GE/oauth.lang
similarity index 100%
rename from public/langs/ka_GE/oauth.lang
rename to htdocs/langs/ka_GE/oauth.lang
diff --git a/public/langs/ka_GE/opensurvey.lang b/htdocs/langs/ka_GE/opensurvey.lang
similarity index 100%
rename from public/langs/ka_GE/opensurvey.lang
rename to htdocs/langs/ka_GE/opensurvey.lang
diff --git a/public/langs/ka_GE/orders.lang b/htdocs/langs/ka_GE/orders.lang
similarity index 100%
rename from public/langs/ka_GE/orders.lang
rename to htdocs/langs/ka_GE/orders.lang
diff --git a/public/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
similarity index 100%
rename from public/langs/ka_GE/other.lang
rename to htdocs/langs/ka_GE/other.lang
diff --git a/public/langs/ka_GE/paybox.lang b/htdocs/langs/ka_GE/paybox.lang
similarity index 100%
rename from public/langs/ka_GE/paybox.lang
rename to htdocs/langs/ka_GE/paybox.lang
diff --git a/public/langs/ka_GE/paypal.lang b/htdocs/langs/ka_GE/paypal.lang
similarity index 100%
rename from public/langs/ka_GE/paypal.lang
rename to htdocs/langs/ka_GE/paypal.lang
diff --git a/public/langs/ka_GE/printing.lang b/htdocs/langs/ka_GE/printing.lang
similarity index 100%
rename from public/langs/ka_GE/printing.lang
rename to htdocs/langs/ka_GE/printing.lang
diff --git a/public/langs/ka_GE/productbatch.lang b/htdocs/langs/ka_GE/productbatch.lang
similarity index 100%
rename from public/langs/ka_GE/productbatch.lang
rename to htdocs/langs/ka_GE/productbatch.lang
diff --git a/public/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
similarity index 100%
rename from public/langs/ka_GE/products.lang
rename to htdocs/langs/ka_GE/products.lang
diff --git a/public/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
similarity index 100%
rename from public/langs/ka_GE/projects.lang
rename to htdocs/langs/ka_GE/projects.lang
diff --git a/public/langs/ka_GE/propal.lang b/htdocs/langs/ka_GE/propal.lang
similarity index 100%
rename from public/langs/ka_GE/propal.lang
rename to htdocs/langs/ka_GE/propal.lang
diff --git a/public/langs/ka_GE/receiptprinter.lang b/htdocs/langs/ka_GE/receiptprinter.lang
similarity index 100%
rename from public/langs/ka_GE/receiptprinter.lang
rename to htdocs/langs/ka_GE/receiptprinter.lang
diff --git a/public/langs/ka_GE/resource.lang b/htdocs/langs/ka_GE/resource.lang
similarity index 100%
rename from public/langs/ka_GE/resource.lang
rename to htdocs/langs/ka_GE/resource.lang
diff --git a/public/langs/ka_GE/salaries.lang b/htdocs/langs/ka_GE/salaries.lang
similarity index 100%
rename from public/langs/ka_GE/salaries.lang
rename to htdocs/langs/ka_GE/salaries.lang
diff --git a/public/langs/ka_GE/sendings.lang b/htdocs/langs/ka_GE/sendings.lang
similarity index 100%
rename from public/langs/ka_GE/sendings.lang
rename to htdocs/langs/ka_GE/sendings.lang
diff --git a/public/langs/ka_GE/sms.lang b/htdocs/langs/ka_GE/sms.lang
similarity index 100%
rename from public/langs/ka_GE/sms.lang
rename to htdocs/langs/ka_GE/sms.lang
diff --git a/public/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
similarity index 100%
rename from public/langs/ka_GE/stocks.lang
rename to htdocs/langs/ka_GE/stocks.lang
diff --git a/public/langs/ka_GE/supplier_proposal.lang b/htdocs/langs/ka_GE/supplier_proposal.lang
similarity index 100%
rename from public/langs/ka_GE/supplier_proposal.lang
rename to htdocs/langs/ka_GE/supplier_proposal.lang
diff --git a/public/langs/ka_GE/suppliers.lang b/htdocs/langs/ka_GE/suppliers.lang
similarity index 100%
rename from public/langs/ka_GE/suppliers.lang
rename to htdocs/langs/ka_GE/suppliers.lang
diff --git a/public/langs/ka_GE/trips.lang b/htdocs/langs/ka_GE/trips.lang
similarity index 100%
rename from public/langs/ka_GE/trips.lang
rename to htdocs/langs/ka_GE/trips.lang
diff --git a/public/langs/ka_GE/users.lang b/htdocs/langs/ka_GE/users.lang
similarity index 100%
rename from public/langs/ka_GE/users.lang
rename to htdocs/langs/ka_GE/users.lang
diff --git a/public/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
similarity index 100%
rename from public/langs/ka_GE/website.lang
rename to htdocs/langs/ka_GE/website.lang
diff --git a/public/langs/ka_GE/withdrawals.lang b/htdocs/langs/ka_GE/withdrawals.lang
similarity index 100%
rename from public/langs/ka_GE/withdrawals.lang
rename to htdocs/langs/ka_GE/withdrawals.lang
diff --git a/public/langs/ka_GE/workflow.lang b/htdocs/langs/ka_GE/workflow.lang
similarity index 100%
rename from public/langs/ka_GE/workflow.lang
rename to htdocs/langs/ka_GE/workflow.lang
diff --git a/public/langs/km_KH/accountancy.lang b/htdocs/langs/km_KH/accountancy.lang
similarity index 100%
rename from public/langs/km_KH/accountancy.lang
rename to htdocs/langs/km_KH/accountancy.lang
diff --git a/public/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
similarity index 100%
rename from public/langs/km_KH/admin.lang
rename to htdocs/langs/km_KH/admin.lang
diff --git a/public/langs/km_KH/agenda.lang b/htdocs/langs/km_KH/agenda.lang
similarity index 100%
rename from public/langs/km_KH/agenda.lang
rename to htdocs/langs/km_KH/agenda.lang
diff --git a/public/langs/km_KH/banks.lang b/htdocs/langs/km_KH/banks.lang
similarity index 100%
rename from public/langs/km_KH/banks.lang
rename to htdocs/langs/km_KH/banks.lang
diff --git a/public/langs/km_KH/bills.lang b/htdocs/langs/km_KH/bills.lang
similarity index 100%
rename from public/langs/km_KH/bills.lang
rename to htdocs/langs/km_KH/bills.lang
diff --git a/public/langs/km_KH/bookmarks.lang b/htdocs/langs/km_KH/bookmarks.lang
similarity index 100%
rename from public/langs/km_KH/bookmarks.lang
rename to htdocs/langs/km_KH/bookmarks.lang
diff --git a/public/langs/km_KH/boxes.lang b/htdocs/langs/km_KH/boxes.lang
similarity index 100%
rename from public/langs/km_KH/boxes.lang
rename to htdocs/langs/km_KH/boxes.lang
diff --git a/public/langs/km_KH/cashdesk.lang b/htdocs/langs/km_KH/cashdesk.lang
similarity index 100%
rename from public/langs/km_KH/cashdesk.lang
rename to htdocs/langs/km_KH/cashdesk.lang
diff --git a/public/langs/km_KH/categories.lang b/htdocs/langs/km_KH/categories.lang
similarity index 100%
rename from public/langs/km_KH/categories.lang
rename to htdocs/langs/km_KH/categories.lang
diff --git a/public/langs/km_KH/commercial.lang b/htdocs/langs/km_KH/commercial.lang
similarity index 100%
rename from public/langs/km_KH/commercial.lang
rename to htdocs/langs/km_KH/commercial.lang
diff --git a/public/langs/km_KH/companies.lang b/htdocs/langs/km_KH/companies.lang
similarity index 100%
rename from public/langs/km_KH/companies.lang
rename to htdocs/langs/km_KH/companies.lang
diff --git a/public/langs/km_KH/compta.lang b/htdocs/langs/km_KH/compta.lang
similarity index 100%
rename from public/langs/km_KH/compta.lang
rename to htdocs/langs/km_KH/compta.lang
diff --git a/public/langs/km_KH/contracts.lang b/htdocs/langs/km_KH/contracts.lang
similarity index 100%
rename from public/langs/km_KH/contracts.lang
rename to htdocs/langs/km_KH/contracts.lang
diff --git a/public/langs/km_KH/cron.lang b/htdocs/langs/km_KH/cron.lang
similarity index 100%
rename from public/langs/km_KH/cron.lang
rename to htdocs/langs/km_KH/cron.lang
diff --git a/public/langs/km_KH/deliveries.lang b/htdocs/langs/km_KH/deliveries.lang
similarity index 100%
rename from public/langs/km_KH/deliveries.lang
rename to htdocs/langs/km_KH/deliveries.lang
diff --git a/public/langs/km_KH/dict.lang b/htdocs/langs/km_KH/dict.lang
similarity index 100%
rename from public/langs/km_KH/dict.lang
rename to htdocs/langs/km_KH/dict.lang
diff --git a/public/langs/km_KH/donations.lang b/htdocs/langs/km_KH/donations.lang
similarity index 100%
rename from public/langs/km_KH/donations.lang
rename to htdocs/langs/km_KH/donations.lang
diff --git a/public/langs/km_KH/ecm.lang b/htdocs/langs/km_KH/ecm.lang
similarity index 100%
rename from public/langs/km_KH/ecm.lang
rename to htdocs/langs/km_KH/ecm.lang
diff --git a/public/langs/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
similarity index 100%
rename from public/langs/km_KH/errors.lang
rename to htdocs/langs/km_KH/errors.lang
diff --git a/public/langs/km_KH/exports.lang b/htdocs/langs/km_KH/exports.lang
similarity index 100%
rename from public/langs/km_KH/exports.lang
rename to htdocs/langs/km_KH/exports.lang
diff --git a/public/langs/km_KH/externalsite.lang b/htdocs/langs/km_KH/externalsite.lang
similarity index 100%
rename from public/langs/km_KH/externalsite.lang
rename to htdocs/langs/km_KH/externalsite.lang
diff --git a/public/langs/km_KH/ftp.lang b/htdocs/langs/km_KH/ftp.lang
similarity index 100%
rename from public/langs/km_KH/ftp.lang
rename to htdocs/langs/km_KH/ftp.lang
diff --git a/public/langs/km_KH/help.lang b/htdocs/langs/km_KH/help.lang
similarity index 100%
rename from public/langs/km_KH/help.lang
rename to htdocs/langs/km_KH/help.lang
diff --git a/public/langs/km_KH/holiday.lang b/htdocs/langs/km_KH/holiday.lang
similarity index 100%
rename from public/langs/km_KH/holiday.lang
rename to htdocs/langs/km_KH/holiday.lang
diff --git a/public/langs/km_KH/hrm.lang b/htdocs/langs/km_KH/hrm.lang
similarity index 100%
rename from public/langs/km_KH/hrm.lang
rename to htdocs/langs/km_KH/hrm.lang
diff --git a/public/langs/km_KH/incoterm.lang b/htdocs/langs/km_KH/incoterm.lang
similarity index 100%
rename from public/langs/km_KH/incoterm.lang
rename to htdocs/langs/km_KH/incoterm.lang
diff --git a/public/langs/km_KH/install.lang b/htdocs/langs/km_KH/install.lang
similarity index 100%
rename from public/langs/km_KH/install.lang
rename to htdocs/langs/km_KH/install.lang
diff --git a/public/langs/km_KH/interventions.lang b/htdocs/langs/km_KH/interventions.lang
similarity index 100%
rename from public/langs/km_KH/interventions.lang
rename to htdocs/langs/km_KH/interventions.lang
diff --git a/public/langs/km_KH/languages.lang b/htdocs/langs/km_KH/languages.lang
similarity index 100%
rename from public/langs/km_KH/languages.lang
rename to htdocs/langs/km_KH/languages.lang
diff --git a/public/langs/km_KH/ldap.lang b/htdocs/langs/km_KH/ldap.lang
similarity index 100%
rename from public/langs/km_KH/ldap.lang
rename to htdocs/langs/km_KH/ldap.lang
diff --git a/public/langs/km_KH/link.lang b/htdocs/langs/km_KH/link.lang
similarity index 100%
rename from public/langs/km_KH/link.lang
rename to htdocs/langs/km_KH/link.lang
diff --git a/public/langs/km_KH/loan.lang b/htdocs/langs/km_KH/loan.lang
similarity index 100%
rename from public/langs/km_KH/loan.lang
rename to htdocs/langs/km_KH/loan.lang
diff --git a/public/langs/km_KH/mailmanspip.lang b/htdocs/langs/km_KH/mailmanspip.lang
similarity index 100%
rename from public/langs/km_KH/mailmanspip.lang
rename to htdocs/langs/km_KH/mailmanspip.lang
diff --git a/public/langs/km_KH/mails.lang b/htdocs/langs/km_KH/mails.lang
similarity index 100%
rename from public/langs/km_KH/mails.lang
rename to htdocs/langs/km_KH/mails.lang
diff --git a/public/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
similarity index 100%
rename from public/langs/km_KH/main.lang
rename to htdocs/langs/km_KH/main.lang
diff --git a/public/langs/km_KH/margins.lang b/htdocs/langs/km_KH/margins.lang
similarity index 100%
rename from public/langs/km_KH/margins.lang
rename to htdocs/langs/km_KH/margins.lang
diff --git a/public/langs/km_KH/members.lang b/htdocs/langs/km_KH/members.lang
similarity index 100%
rename from public/langs/km_KH/members.lang
rename to htdocs/langs/km_KH/members.lang
diff --git a/public/langs/km_KH/oauth.lang b/htdocs/langs/km_KH/oauth.lang
similarity index 100%
rename from public/langs/km_KH/oauth.lang
rename to htdocs/langs/km_KH/oauth.lang
diff --git a/public/langs/km_KH/opensurvey.lang b/htdocs/langs/km_KH/opensurvey.lang
similarity index 100%
rename from public/langs/km_KH/opensurvey.lang
rename to htdocs/langs/km_KH/opensurvey.lang
diff --git a/public/langs/km_KH/orders.lang b/htdocs/langs/km_KH/orders.lang
similarity index 100%
rename from public/langs/km_KH/orders.lang
rename to htdocs/langs/km_KH/orders.lang
diff --git a/public/langs/km_KH/other.lang b/htdocs/langs/km_KH/other.lang
similarity index 100%
rename from public/langs/km_KH/other.lang
rename to htdocs/langs/km_KH/other.lang
diff --git a/public/langs/km_KH/paybox.lang b/htdocs/langs/km_KH/paybox.lang
similarity index 100%
rename from public/langs/km_KH/paybox.lang
rename to htdocs/langs/km_KH/paybox.lang
diff --git a/public/langs/km_KH/paypal.lang b/htdocs/langs/km_KH/paypal.lang
similarity index 100%
rename from public/langs/km_KH/paypal.lang
rename to htdocs/langs/km_KH/paypal.lang
diff --git a/public/langs/km_KH/printing.lang b/htdocs/langs/km_KH/printing.lang
similarity index 100%
rename from public/langs/km_KH/printing.lang
rename to htdocs/langs/km_KH/printing.lang
diff --git a/public/langs/km_KH/productbatch.lang b/htdocs/langs/km_KH/productbatch.lang
similarity index 100%
rename from public/langs/km_KH/productbatch.lang
rename to htdocs/langs/km_KH/productbatch.lang
diff --git a/public/langs/km_KH/products.lang b/htdocs/langs/km_KH/products.lang
similarity index 100%
rename from public/langs/km_KH/products.lang
rename to htdocs/langs/km_KH/products.lang
diff --git a/public/langs/km_KH/projects.lang b/htdocs/langs/km_KH/projects.lang
similarity index 100%
rename from public/langs/km_KH/projects.lang
rename to htdocs/langs/km_KH/projects.lang
diff --git a/public/langs/km_KH/propal.lang b/htdocs/langs/km_KH/propal.lang
similarity index 100%
rename from public/langs/km_KH/propal.lang
rename to htdocs/langs/km_KH/propal.lang
diff --git a/public/langs/km_KH/receiptprinter.lang b/htdocs/langs/km_KH/receiptprinter.lang
similarity index 100%
rename from public/langs/km_KH/receiptprinter.lang
rename to htdocs/langs/km_KH/receiptprinter.lang
diff --git a/public/langs/km_KH/resource.lang b/htdocs/langs/km_KH/resource.lang
similarity index 100%
rename from public/langs/km_KH/resource.lang
rename to htdocs/langs/km_KH/resource.lang
diff --git a/public/langs/km_KH/salaries.lang b/htdocs/langs/km_KH/salaries.lang
similarity index 100%
rename from public/langs/km_KH/salaries.lang
rename to htdocs/langs/km_KH/salaries.lang
diff --git a/public/langs/km_KH/sendings.lang b/htdocs/langs/km_KH/sendings.lang
similarity index 100%
rename from public/langs/km_KH/sendings.lang
rename to htdocs/langs/km_KH/sendings.lang
diff --git a/public/langs/km_KH/sms.lang b/htdocs/langs/km_KH/sms.lang
similarity index 100%
rename from public/langs/km_KH/sms.lang
rename to htdocs/langs/km_KH/sms.lang
diff --git a/public/langs/km_KH/stocks.lang b/htdocs/langs/km_KH/stocks.lang
similarity index 100%
rename from public/langs/km_KH/stocks.lang
rename to htdocs/langs/km_KH/stocks.lang
diff --git a/public/langs/km_KH/supplier_proposal.lang b/htdocs/langs/km_KH/supplier_proposal.lang
similarity index 100%
rename from public/langs/km_KH/supplier_proposal.lang
rename to htdocs/langs/km_KH/supplier_proposal.lang
diff --git a/public/langs/km_KH/suppliers.lang b/htdocs/langs/km_KH/suppliers.lang
similarity index 100%
rename from public/langs/km_KH/suppliers.lang
rename to htdocs/langs/km_KH/suppliers.lang
diff --git a/public/langs/km_KH/trips.lang b/htdocs/langs/km_KH/trips.lang
similarity index 100%
rename from public/langs/km_KH/trips.lang
rename to htdocs/langs/km_KH/trips.lang
diff --git a/public/langs/km_KH/users.lang b/htdocs/langs/km_KH/users.lang
similarity index 100%
rename from public/langs/km_KH/users.lang
rename to htdocs/langs/km_KH/users.lang
diff --git a/public/langs/km_KH/website.lang b/htdocs/langs/km_KH/website.lang
similarity index 100%
rename from public/langs/km_KH/website.lang
rename to htdocs/langs/km_KH/website.lang
diff --git a/public/langs/km_KH/withdrawals.lang b/htdocs/langs/km_KH/withdrawals.lang
similarity index 100%
rename from public/langs/km_KH/withdrawals.lang
rename to htdocs/langs/km_KH/withdrawals.lang
diff --git a/public/langs/km_KH/workflow.lang b/htdocs/langs/km_KH/workflow.lang
similarity index 100%
rename from public/langs/km_KH/workflow.lang
rename to htdocs/langs/km_KH/workflow.lang
diff --git a/public/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
similarity index 100%
rename from public/langs/kn_IN/accountancy.lang
rename to htdocs/langs/kn_IN/accountancy.lang
diff --git a/public/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
similarity index 100%
rename from public/langs/kn_IN/admin.lang
rename to htdocs/langs/kn_IN/admin.lang
diff --git a/public/langs/kn_IN/agenda.lang b/htdocs/langs/kn_IN/agenda.lang
similarity index 100%
rename from public/langs/kn_IN/agenda.lang
rename to htdocs/langs/kn_IN/agenda.lang
diff --git a/public/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
similarity index 100%
rename from public/langs/kn_IN/banks.lang
rename to htdocs/langs/kn_IN/banks.lang
diff --git a/public/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
similarity index 100%
rename from public/langs/kn_IN/bills.lang
rename to htdocs/langs/kn_IN/bills.lang
diff --git a/public/langs/kn_IN/bookmarks.lang b/htdocs/langs/kn_IN/bookmarks.lang
similarity index 100%
rename from public/langs/kn_IN/bookmarks.lang
rename to htdocs/langs/kn_IN/bookmarks.lang
diff --git a/public/langs/kn_IN/boxes.lang b/htdocs/langs/kn_IN/boxes.lang
similarity index 100%
rename from public/langs/kn_IN/boxes.lang
rename to htdocs/langs/kn_IN/boxes.lang
diff --git a/public/langs/kn_IN/cashdesk.lang b/htdocs/langs/kn_IN/cashdesk.lang
similarity index 100%
rename from public/langs/kn_IN/cashdesk.lang
rename to htdocs/langs/kn_IN/cashdesk.lang
diff --git a/public/langs/kn_IN/categories.lang b/htdocs/langs/kn_IN/categories.lang
similarity index 100%
rename from public/langs/kn_IN/categories.lang
rename to htdocs/langs/kn_IN/categories.lang
diff --git a/public/langs/kn_IN/commercial.lang b/htdocs/langs/kn_IN/commercial.lang
similarity index 100%
rename from public/langs/kn_IN/commercial.lang
rename to htdocs/langs/kn_IN/commercial.lang
diff --git a/public/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
similarity index 100%
rename from public/langs/kn_IN/companies.lang
rename to htdocs/langs/kn_IN/companies.lang
diff --git a/public/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
similarity index 100%
rename from public/langs/kn_IN/compta.lang
rename to htdocs/langs/kn_IN/compta.lang
diff --git a/public/langs/kn_IN/contracts.lang b/htdocs/langs/kn_IN/contracts.lang
similarity index 100%
rename from public/langs/kn_IN/contracts.lang
rename to htdocs/langs/kn_IN/contracts.lang
diff --git a/public/langs/kn_IN/cron.lang b/htdocs/langs/kn_IN/cron.lang
similarity index 100%
rename from public/langs/kn_IN/cron.lang
rename to htdocs/langs/kn_IN/cron.lang
diff --git a/public/langs/kn_IN/deliveries.lang b/htdocs/langs/kn_IN/deliveries.lang
similarity index 100%
rename from public/langs/kn_IN/deliveries.lang
rename to htdocs/langs/kn_IN/deliveries.lang
diff --git a/public/langs/kn_IN/dict.lang b/htdocs/langs/kn_IN/dict.lang
similarity index 100%
rename from public/langs/kn_IN/dict.lang
rename to htdocs/langs/kn_IN/dict.lang
diff --git a/public/langs/kn_IN/donations.lang b/htdocs/langs/kn_IN/donations.lang
similarity index 100%
rename from public/langs/kn_IN/donations.lang
rename to htdocs/langs/kn_IN/donations.lang
diff --git a/public/langs/kn_IN/ecm.lang b/htdocs/langs/kn_IN/ecm.lang
similarity index 100%
rename from public/langs/kn_IN/ecm.lang
rename to htdocs/langs/kn_IN/ecm.lang
diff --git a/public/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
similarity index 100%
rename from public/langs/kn_IN/errors.lang
rename to htdocs/langs/kn_IN/errors.lang
diff --git a/public/langs/kn_IN/exports.lang b/htdocs/langs/kn_IN/exports.lang
similarity index 100%
rename from public/langs/kn_IN/exports.lang
rename to htdocs/langs/kn_IN/exports.lang
diff --git a/public/langs/kn_IN/externalsite.lang b/htdocs/langs/kn_IN/externalsite.lang
similarity index 100%
rename from public/langs/kn_IN/externalsite.lang
rename to htdocs/langs/kn_IN/externalsite.lang
diff --git a/public/langs/kn_IN/ftp.lang b/htdocs/langs/kn_IN/ftp.lang
similarity index 100%
rename from public/langs/kn_IN/ftp.lang
rename to htdocs/langs/kn_IN/ftp.lang
diff --git a/public/langs/kn_IN/help.lang b/htdocs/langs/kn_IN/help.lang
similarity index 100%
rename from public/langs/kn_IN/help.lang
rename to htdocs/langs/kn_IN/help.lang
diff --git a/public/langs/kn_IN/holiday.lang b/htdocs/langs/kn_IN/holiday.lang
similarity index 100%
rename from public/langs/kn_IN/holiday.lang
rename to htdocs/langs/kn_IN/holiday.lang
diff --git a/public/langs/kn_IN/hrm.lang b/htdocs/langs/kn_IN/hrm.lang
similarity index 100%
rename from public/langs/kn_IN/hrm.lang
rename to htdocs/langs/kn_IN/hrm.lang
diff --git a/public/langs/kn_IN/incoterm.lang b/htdocs/langs/kn_IN/incoterm.lang
similarity index 100%
rename from public/langs/kn_IN/incoterm.lang
rename to htdocs/langs/kn_IN/incoterm.lang
diff --git a/public/langs/kn_IN/install.lang b/htdocs/langs/kn_IN/install.lang
similarity index 100%
rename from public/langs/kn_IN/install.lang
rename to htdocs/langs/kn_IN/install.lang
diff --git a/public/langs/kn_IN/interventions.lang b/htdocs/langs/kn_IN/interventions.lang
similarity index 100%
rename from public/langs/kn_IN/interventions.lang
rename to htdocs/langs/kn_IN/interventions.lang
diff --git a/public/langs/kn_IN/languages.lang b/htdocs/langs/kn_IN/languages.lang
similarity index 100%
rename from public/langs/kn_IN/languages.lang
rename to htdocs/langs/kn_IN/languages.lang
diff --git a/public/langs/kn_IN/ldap.lang b/htdocs/langs/kn_IN/ldap.lang
similarity index 100%
rename from public/langs/kn_IN/ldap.lang
rename to htdocs/langs/kn_IN/ldap.lang
diff --git a/public/langs/kn_IN/link.lang b/htdocs/langs/kn_IN/link.lang
similarity index 100%
rename from public/langs/kn_IN/link.lang
rename to htdocs/langs/kn_IN/link.lang
diff --git a/public/langs/kn_IN/loan.lang b/htdocs/langs/kn_IN/loan.lang
similarity index 100%
rename from public/langs/kn_IN/loan.lang
rename to htdocs/langs/kn_IN/loan.lang
diff --git a/public/langs/kn_IN/mailmanspip.lang b/htdocs/langs/kn_IN/mailmanspip.lang
similarity index 100%
rename from public/langs/kn_IN/mailmanspip.lang
rename to htdocs/langs/kn_IN/mailmanspip.lang
diff --git a/public/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
similarity index 100%
rename from public/langs/kn_IN/mails.lang
rename to htdocs/langs/kn_IN/mails.lang
diff --git a/public/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
similarity index 100%
rename from public/langs/kn_IN/main.lang
rename to htdocs/langs/kn_IN/main.lang
diff --git a/public/langs/kn_IN/margins.lang b/htdocs/langs/kn_IN/margins.lang
similarity index 100%
rename from public/langs/kn_IN/margins.lang
rename to htdocs/langs/kn_IN/margins.lang
diff --git a/public/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang
similarity index 100%
rename from public/langs/kn_IN/members.lang
rename to htdocs/langs/kn_IN/members.lang
diff --git a/public/langs/kn_IN/oauth.lang b/htdocs/langs/kn_IN/oauth.lang
similarity index 100%
rename from public/langs/kn_IN/oauth.lang
rename to htdocs/langs/kn_IN/oauth.lang
diff --git a/public/langs/kn_IN/opensurvey.lang b/htdocs/langs/kn_IN/opensurvey.lang
similarity index 100%
rename from public/langs/kn_IN/opensurvey.lang
rename to htdocs/langs/kn_IN/opensurvey.lang
diff --git a/public/langs/kn_IN/orders.lang b/htdocs/langs/kn_IN/orders.lang
similarity index 100%
rename from public/langs/kn_IN/orders.lang
rename to htdocs/langs/kn_IN/orders.lang
diff --git a/public/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
similarity index 100%
rename from public/langs/kn_IN/other.lang
rename to htdocs/langs/kn_IN/other.lang
diff --git a/public/langs/kn_IN/paybox.lang b/htdocs/langs/kn_IN/paybox.lang
similarity index 100%
rename from public/langs/kn_IN/paybox.lang
rename to htdocs/langs/kn_IN/paybox.lang
diff --git a/public/langs/kn_IN/paypal.lang b/htdocs/langs/kn_IN/paypal.lang
similarity index 100%
rename from public/langs/kn_IN/paypal.lang
rename to htdocs/langs/kn_IN/paypal.lang
diff --git a/public/langs/kn_IN/printing.lang b/htdocs/langs/kn_IN/printing.lang
similarity index 100%
rename from public/langs/kn_IN/printing.lang
rename to htdocs/langs/kn_IN/printing.lang
diff --git a/public/langs/kn_IN/productbatch.lang b/htdocs/langs/kn_IN/productbatch.lang
similarity index 100%
rename from public/langs/kn_IN/productbatch.lang
rename to htdocs/langs/kn_IN/productbatch.lang
diff --git a/public/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
similarity index 100%
rename from public/langs/kn_IN/products.lang
rename to htdocs/langs/kn_IN/products.lang
diff --git a/public/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
similarity index 100%
rename from public/langs/kn_IN/projects.lang
rename to htdocs/langs/kn_IN/projects.lang
diff --git a/public/langs/kn_IN/propal.lang b/htdocs/langs/kn_IN/propal.lang
similarity index 100%
rename from public/langs/kn_IN/propal.lang
rename to htdocs/langs/kn_IN/propal.lang
diff --git a/public/langs/kn_IN/receiptprinter.lang b/htdocs/langs/kn_IN/receiptprinter.lang
similarity index 100%
rename from public/langs/kn_IN/receiptprinter.lang
rename to htdocs/langs/kn_IN/receiptprinter.lang
diff --git a/public/langs/kn_IN/resource.lang b/htdocs/langs/kn_IN/resource.lang
similarity index 100%
rename from public/langs/kn_IN/resource.lang
rename to htdocs/langs/kn_IN/resource.lang
diff --git a/public/langs/kn_IN/salaries.lang b/htdocs/langs/kn_IN/salaries.lang
similarity index 100%
rename from public/langs/kn_IN/salaries.lang
rename to htdocs/langs/kn_IN/salaries.lang
diff --git a/public/langs/kn_IN/sendings.lang b/htdocs/langs/kn_IN/sendings.lang
similarity index 100%
rename from public/langs/kn_IN/sendings.lang
rename to htdocs/langs/kn_IN/sendings.lang
diff --git a/public/langs/kn_IN/sms.lang b/htdocs/langs/kn_IN/sms.lang
similarity index 100%
rename from public/langs/kn_IN/sms.lang
rename to htdocs/langs/kn_IN/sms.lang
diff --git a/public/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
similarity index 100%
rename from public/langs/kn_IN/stocks.lang
rename to htdocs/langs/kn_IN/stocks.lang
diff --git a/public/langs/kn_IN/supplier_proposal.lang b/htdocs/langs/kn_IN/supplier_proposal.lang
similarity index 100%
rename from public/langs/kn_IN/supplier_proposal.lang
rename to htdocs/langs/kn_IN/supplier_proposal.lang
diff --git a/public/langs/kn_IN/suppliers.lang b/htdocs/langs/kn_IN/suppliers.lang
similarity index 100%
rename from public/langs/kn_IN/suppliers.lang
rename to htdocs/langs/kn_IN/suppliers.lang
diff --git a/public/langs/kn_IN/trips.lang b/htdocs/langs/kn_IN/trips.lang
similarity index 100%
rename from public/langs/kn_IN/trips.lang
rename to htdocs/langs/kn_IN/trips.lang
diff --git a/public/langs/kn_IN/users.lang b/htdocs/langs/kn_IN/users.lang
similarity index 100%
rename from public/langs/kn_IN/users.lang
rename to htdocs/langs/kn_IN/users.lang
diff --git a/public/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
similarity index 100%
rename from public/langs/kn_IN/website.lang
rename to htdocs/langs/kn_IN/website.lang
diff --git a/public/langs/kn_IN/withdrawals.lang b/htdocs/langs/kn_IN/withdrawals.lang
similarity index 100%
rename from public/langs/kn_IN/withdrawals.lang
rename to htdocs/langs/kn_IN/withdrawals.lang
diff --git a/public/langs/kn_IN/workflow.lang b/htdocs/langs/kn_IN/workflow.lang
similarity index 100%
rename from public/langs/kn_IN/workflow.lang
rename to htdocs/langs/kn_IN/workflow.lang
diff --git a/public/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
similarity index 100%
rename from public/langs/ko_KR/accountancy.lang
rename to htdocs/langs/ko_KR/accountancy.lang
diff --git a/public/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
similarity index 100%
rename from public/langs/ko_KR/admin.lang
rename to htdocs/langs/ko_KR/admin.lang
diff --git a/public/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang
similarity index 100%
rename from public/langs/ko_KR/agenda.lang
rename to htdocs/langs/ko_KR/agenda.lang
diff --git a/public/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
similarity index 100%
rename from public/langs/ko_KR/banks.lang
rename to htdocs/langs/ko_KR/banks.lang
diff --git a/public/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
similarity index 100%
rename from public/langs/ko_KR/bills.lang
rename to htdocs/langs/ko_KR/bills.lang
diff --git a/public/langs/ko_KR/bookmarks.lang b/htdocs/langs/ko_KR/bookmarks.lang
similarity index 100%
rename from public/langs/ko_KR/bookmarks.lang
rename to htdocs/langs/ko_KR/bookmarks.lang
diff --git a/public/langs/ko_KR/boxes.lang b/htdocs/langs/ko_KR/boxes.lang
similarity index 100%
rename from public/langs/ko_KR/boxes.lang
rename to htdocs/langs/ko_KR/boxes.lang
diff --git a/public/langs/ko_KR/cashdesk.lang b/htdocs/langs/ko_KR/cashdesk.lang
similarity index 100%
rename from public/langs/ko_KR/cashdesk.lang
rename to htdocs/langs/ko_KR/cashdesk.lang
diff --git a/public/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang
similarity index 100%
rename from public/langs/ko_KR/categories.lang
rename to htdocs/langs/ko_KR/categories.lang
diff --git a/public/langs/ko_KR/commercial.lang b/htdocs/langs/ko_KR/commercial.lang
similarity index 100%
rename from public/langs/ko_KR/commercial.lang
rename to htdocs/langs/ko_KR/commercial.lang
diff --git a/public/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
similarity index 100%
rename from public/langs/ko_KR/companies.lang
rename to htdocs/langs/ko_KR/companies.lang
diff --git a/public/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
similarity index 100%
rename from public/langs/ko_KR/compta.lang
rename to htdocs/langs/ko_KR/compta.lang
diff --git a/public/langs/ko_KR/contracts.lang b/htdocs/langs/ko_KR/contracts.lang
similarity index 100%
rename from public/langs/ko_KR/contracts.lang
rename to htdocs/langs/ko_KR/contracts.lang
diff --git a/public/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang
similarity index 100%
rename from public/langs/ko_KR/cron.lang
rename to htdocs/langs/ko_KR/cron.lang
diff --git a/public/langs/ko_KR/deliveries.lang b/htdocs/langs/ko_KR/deliveries.lang
similarity index 100%
rename from public/langs/ko_KR/deliveries.lang
rename to htdocs/langs/ko_KR/deliveries.lang
diff --git a/public/langs/ko_KR/dict.lang b/htdocs/langs/ko_KR/dict.lang
similarity index 100%
rename from public/langs/ko_KR/dict.lang
rename to htdocs/langs/ko_KR/dict.lang
diff --git a/public/langs/ko_KR/donations.lang b/htdocs/langs/ko_KR/donations.lang
similarity index 100%
rename from public/langs/ko_KR/donations.lang
rename to htdocs/langs/ko_KR/donations.lang
diff --git a/public/langs/ko_KR/ecm.lang b/htdocs/langs/ko_KR/ecm.lang
similarity index 100%
rename from public/langs/ko_KR/ecm.lang
rename to htdocs/langs/ko_KR/ecm.lang
diff --git a/public/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
similarity index 100%
rename from public/langs/ko_KR/errors.lang
rename to htdocs/langs/ko_KR/errors.lang
diff --git a/public/langs/ko_KR/exports.lang b/htdocs/langs/ko_KR/exports.lang
similarity index 100%
rename from public/langs/ko_KR/exports.lang
rename to htdocs/langs/ko_KR/exports.lang
diff --git a/public/langs/ko_KR/externalsite.lang b/htdocs/langs/ko_KR/externalsite.lang
similarity index 100%
rename from public/langs/ko_KR/externalsite.lang
rename to htdocs/langs/ko_KR/externalsite.lang
diff --git a/public/langs/ko_KR/ftp.lang b/htdocs/langs/ko_KR/ftp.lang
similarity index 100%
rename from public/langs/ko_KR/ftp.lang
rename to htdocs/langs/ko_KR/ftp.lang
diff --git a/public/langs/ko_KR/help.lang b/htdocs/langs/ko_KR/help.lang
similarity index 100%
rename from public/langs/ko_KR/help.lang
rename to htdocs/langs/ko_KR/help.lang
diff --git a/public/langs/ko_KR/holiday.lang b/htdocs/langs/ko_KR/holiday.lang
similarity index 100%
rename from public/langs/ko_KR/holiday.lang
rename to htdocs/langs/ko_KR/holiday.lang
diff --git a/public/langs/ko_KR/hrm.lang b/htdocs/langs/ko_KR/hrm.lang
similarity index 100%
rename from public/langs/ko_KR/hrm.lang
rename to htdocs/langs/ko_KR/hrm.lang
diff --git a/public/langs/ko_KR/incoterm.lang b/htdocs/langs/ko_KR/incoterm.lang
similarity index 100%
rename from public/langs/ko_KR/incoterm.lang
rename to htdocs/langs/ko_KR/incoterm.lang
diff --git a/public/langs/ko_KR/install.lang b/htdocs/langs/ko_KR/install.lang
similarity index 100%
rename from public/langs/ko_KR/install.lang
rename to htdocs/langs/ko_KR/install.lang
diff --git a/public/langs/ko_KR/interventions.lang b/htdocs/langs/ko_KR/interventions.lang
similarity index 100%
rename from public/langs/ko_KR/interventions.lang
rename to htdocs/langs/ko_KR/interventions.lang
diff --git a/public/langs/ko_KR/languages.lang b/htdocs/langs/ko_KR/languages.lang
similarity index 100%
rename from public/langs/ko_KR/languages.lang
rename to htdocs/langs/ko_KR/languages.lang
diff --git a/public/langs/ko_KR/ldap.lang b/htdocs/langs/ko_KR/ldap.lang
similarity index 100%
rename from public/langs/ko_KR/ldap.lang
rename to htdocs/langs/ko_KR/ldap.lang
diff --git a/public/langs/ko_KR/link.lang b/htdocs/langs/ko_KR/link.lang
similarity index 100%
rename from public/langs/ko_KR/link.lang
rename to htdocs/langs/ko_KR/link.lang
diff --git a/public/langs/ko_KR/loan.lang b/htdocs/langs/ko_KR/loan.lang
similarity index 100%
rename from public/langs/ko_KR/loan.lang
rename to htdocs/langs/ko_KR/loan.lang
diff --git a/public/langs/ko_KR/mailmanspip.lang b/htdocs/langs/ko_KR/mailmanspip.lang
similarity index 100%
rename from public/langs/ko_KR/mailmanspip.lang
rename to htdocs/langs/ko_KR/mailmanspip.lang
diff --git a/public/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
similarity index 100%
rename from public/langs/ko_KR/mails.lang
rename to htdocs/langs/ko_KR/mails.lang
diff --git a/public/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
similarity index 100%
rename from public/langs/ko_KR/main.lang
rename to htdocs/langs/ko_KR/main.lang
diff --git a/public/langs/ko_KR/margins.lang b/htdocs/langs/ko_KR/margins.lang
similarity index 100%
rename from public/langs/ko_KR/margins.lang
rename to htdocs/langs/ko_KR/margins.lang
diff --git a/public/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
similarity index 100%
rename from public/langs/ko_KR/members.lang
rename to htdocs/langs/ko_KR/members.lang
diff --git a/public/langs/ko_KR/oauth.lang b/htdocs/langs/ko_KR/oauth.lang
similarity index 100%
rename from public/langs/ko_KR/oauth.lang
rename to htdocs/langs/ko_KR/oauth.lang
diff --git a/public/langs/ko_KR/opensurvey.lang b/htdocs/langs/ko_KR/opensurvey.lang
similarity index 100%
rename from public/langs/ko_KR/opensurvey.lang
rename to htdocs/langs/ko_KR/opensurvey.lang
diff --git a/public/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang
similarity index 100%
rename from public/langs/ko_KR/orders.lang
rename to htdocs/langs/ko_KR/orders.lang
diff --git a/public/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
similarity index 100%
rename from public/langs/ko_KR/other.lang
rename to htdocs/langs/ko_KR/other.lang
diff --git a/public/langs/ko_KR/paybox.lang b/htdocs/langs/ko_KR/paybox.lang
similarity index 100%
rename from public/langs/ko_KR/paybox.lang
rename to htdocs/langs/ko_KR/paybox.lang
diff --git a/public/langs/ko_KR/paypal.lang b/htdocs/langs/ko_KR/paypal.lang
similarity index 100%
rename from public/langs/ko_KR/paypal.lang
rename to htdocs/langs/ko_KR/paypal.lang
diff --git a/public/langs/ko_KR/printing.lang b/htdocs/langs/ko_KR/printing.lang
similarity index 100%
rename from public/langs/ko_KR/printing.lang
rename to htdocs/langs/ko_KR/printing.lang
diff --git a/public/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang
similarity index 100%
rename from public/langs/ko_KR/productbatch.lang
rename to htdocs/langs/ko_KR/productbatch.lang
diff --git a/public/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
similarity index 100%
rename from public/langs/ko_KR/products.lang
rename to htdocs/langs/ko_KR/products.lang
diff --git a/public/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
similarity index 100%
rename from public/langs/ko_KR/projects.lang
rename to htdocs/langs/ko_KR/projects.lang
diff --git a/public/langs/ko_KR/propal.lang b/htdocs/langs/ko_KR/propal.lang
similarity index 100%
rename from public/langs/ko_KR/propal.lang
rename to htdocs/langs/ko_KR/propal.lang
diff --git a/public/langs/ko_KR/receiptprinter.lang b/htdocs/langs/ko_KR/receiptprinter.lang
similarity index 100%
rename from public/langs/ko_KR/receiptprinter.lang
rename to htdocs/langs/ko_KR/receiptprinter.lang
diff --git a/public/langs/ko_KR/resource.lang b/htdocs/langs/ko_KR/resource.lang
similarity index 100%
rename from public/langs/ko_KR/resource.lang
rename to htdocs/langs/ko_KR/resource.lang
diff --git a/public/langs/ko_KR/salaries.lang b/htdocs/langs/ko_KR/salaries.lang
similarity index 100%
rename from public/langs/ko_KR/salaries.lang
rename to htdocs/langs/ko_KR/salaries.lang
diff --git a/public/langs/ko_KR/sendings.lang b/htdocs/langs/ko_KR/sendings.lang
similarity index 100%
rename from public/langs/ko_KR/sendings.lang
rename to htdocs/langs/ko_KR/sendings.lang
diff --git a/public/langs/ko_KR/sms.lang b/htdocs/langs/ko_KR/sms.lang
similarity index 100%
rename from public/langs/ko_KR/sms.lang
rename to htdocs/langs/ko_KR/sms.lang
diff --git a/public/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
similarity index 100%
rename from public/langs/ko_KR/stocks.lang
rename to htdocs/langs/ko_KR/stocks.lang
diff --git a/public/langs/ko_KR/supplier_proposal.lang b/htdocs/langs/ko_KR/supplier_proposal.lang
similarity index 100%
rename from public/langs/ko_KR/supplier_proposal.lang
rename to htdocs/langs/ko_KR/supplier_proposal.lang
diff --git a/public/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang
similarity index 100%
rename from public/langs/ko_KR/suppliers.lang
rename to htdocs/langs/ko_KR/suppliers.lang
diff --git a/public/langs/ko_KR/trips.lang b/htdocs/langs/ko_KR/trips.lang
similarity index 100%
rename from public/langs/ko_KR/trips.lang
rename to htdocs/langs/ko_KR/trips.lang
diff --git a/public/langs/ko_KR/users.lang b/htdocs/langs/ko_KR/users.lang
similarity index 100%
rename from public/langs/ko_KR/users.lang
rename to htdocs/langs/ko_KR/users.lang
diff --git a/public/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
similarity index 100%
rename from public/langs/ko_KR/website.lang
rename to htdocs/langs/ko_KR/website.lang
diff --git a/public/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
similarity index 100%
rename from public/langs/ko_KR/withdrawals.lang
rename to htdocs/langs/ko_KR/withdrawals.lang
diff --git a/public/langs/ko_KR/workflow.lang b/htdocs/langs/ko_KR/workflow.lang
similarity index 100%
rename from public/langs/ko_KR/workflow.lang
rename to htdocs/langs/ko_KR/workflow.lang
diff --git a/public/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
similarity index 100%
rename from public/langs/lo_LA/accountancy.lang
rename to htdocs/langs/lo_LA/accountancy.lang
diff --git a/public/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
similarity index 100%
rename from public/langs/lo_LA/admin.lang
rename to htdocs/langs/lo_LA/admin.lang
diff --git a/public/langs/lo_LA/agenda.lang b/htdocs/langs/lo_LA/agenda.lang
similarity index 100%
rename from public/langs/lo_LA/agenda.lang
rename to htdocs/langs/lo_LA/agenda.lang
diff --git a/public/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
similarity index 100%
rename from public/langs/lo_LA/banks.lang
rename to htdocs/langs/lo_LA/banks.lang
diff --git a/public/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
similarity index 100%
rename from public/langs/lo_LA/bills.lang
rename to htdocs/langs/lo_LA/bills.lang
diff --git a/public/langs/lo_LA/bookmarks.lang b/htdocs/langs/lo_LA/bookmarks.lang
similarity index 100%
rename from public/langs/lo_LA/bookmarks.lang
rename to htdocs/langs/lo_LA/bookmarks.lang
diff --git a/public/langs/lo_LA/boxes.lang b/htdocs/langs/lo_LA/boxes.lang
similarity index 100%
rename from public/langs/lo_LA/boxes.lang
rename to htdocs/langs/lo_LA/boxes.lang
diff --git a/public/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang
similarity index 100%
rename from public/langs/lo_LA/cashdesk.lang
rename to htdocs/langs/lo_LA/cashdesk.lang
diff --git a/public/langs/lo_LA/categories.lang b/htdocs/langs/lo_LA/categories.lang
similarity index 100%
rename from public/langs/lo_LA/categories.lang
rename to htdocs/langs/lo_LA/categories.lang
diff --git a/public/langs/lo_LA/commercial.lang b/htdocs/langs/lo_LA/commercial.lang
similarity index 100%
rename from public/langs/lo_LA/commercial.lang
rename to htdocs/langs/lo_LA/commercial.lang
diff --git a/public/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
similarity index 100%
rename from public/langs/lo_LA/companies.lang
rename to htdocs/langs/lo_LA/companies.lang
diff --git a/public/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
similarity index 100%
rename from public/langs/lo_LA/compta.lang
rename to htdocs/langs/lo_LA/compta.lang
diff --git a/public/langs/lo_LA/contracts.lang b/htdocs/langs/lo_LA/contracts.lang
similarity index 100%
rename from public/langs/lo_LA/contracts.lang
rename to htdocs/langs/lo_LA/contracts.lang
diff --git a/public/langs/lo_LA/cron.lang b/htdocs/langs/lo_LA/cron.lang
similarity index 100%
rename from public/langs/lo_LA/cron.lang
rename to htdocs/langs/lo_LA/cron.lang
diff --git a/public/langs/lo_LA/deliveries.lang b/htdocs/langs/lo_LA/deliveries.lang
similarity index 100%
rename from public/langs/lo_LA/deliveries.lang
rename to htdocs/langs/lo_LA/deliveries.lang
diff --git a/public/langs/lo_LA/dict.lang b/htdocs/langs/lo_LA/dict.lang
similarity index 100%
rename from public/langs/lo_LA/dict.lang
rename to htdocs/langs/lo_LA/dict.lang
diff --git a/public/langs/lo_LA/donations.lang b/htdocs/langs/lo_LA/donations.lang
similarity index 100%
rename from public/langs/lo_LA/donations.lang
rename to htdocs/langs/lo_LA/donations.lang
diff --git a/public/langs/lo_LA/ecm.lang b/htdocs/langs/lo_LA/ecm.lang
similarity index 100%
rename from public/langs/lo_LA/ecm.lang
rename to htdocs/langs/lo_LA/ecm.lang
diff --git a/public/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
similarity index 100%
rename from public/langs/lo_LA/errors.lang
rename to htdocs/langs/lo_LA/errors.lang
diff --git a/public/langs/lo_LA/exports.lang b/htdocs/langs/lo_LA/exports.lang
similarity index 100%
rename from public/langs/lo_LA/exports.lang
rename to htdocs/langs/lo_LA/exports.lang
diff --git a/public/langs/lo_LA/externalsite.lang b/htdocs/langs/lo_LA/externalsite.lang
similarity index 100%
rename from public/langs/lo_LA/externalsite.lang
rename to htdocs/langs/lo_LA/externalsite.lang
diff --git a/public/langs/lo_LA/ftp.lang b/htdocs/langs/lo_LA/ftp.lang
similarity index 100%
rename from public/langs/lo_LA/ftp.lang
rename to htdocs/langs/lo_LA/ftp.lang
diff --git a/public/langs/lo_LA/help.lang b/htdocs/langs/lo_LA/help.lang
similarity index 100%
rename from public/langs/lo_LA/help.lang
rename to htdocs/langs/lo_LA/help.lang
diff --git a/public/langs/lo_LA/holiday.lang b/htdocs/langs/lo_LA/holiday.lang
similarity index 100%
rename from public/langs/lo_LA/holiday.lang
rename to htdocs/langs/lo_LA/holiday.lang
diff --git a/public/langs/lo_LA/hrm.lang b/htdocs/langs/lo_LA/hrm.lang
similarity index 100%
rename from public/langs/lo_LA/hrm.lang
rename to htdocs/langs/lo_LA/hrm.lang
diff --git a/public/langs/lo_LA/incoterm.lang b/htdocs/langs/lo_LA/incoterm.lang
similarity index 100%
rename from public/langs/lo_LA/incoterm.lang
rename to htdocs/langs/lo_LA/incoterm.lang
diff --git a/public/langs/lo_LA/install.lang b/htdocs/langs/lo_LA/install.lang
similarity index 100%
rename from public/langs/lo_LA/install.lang
rename to htdocs/langs/lo_LA/install.lang
diff --git a/public/langs/lo_LA/interventions.lang b/htdocs/langs/lo_LA/interventions.lang
similarity index 100%
rename from public/langs/lo_LA/interventions.lang
rename to htdocs/langs/lo_LA/interventions.lang
diff --git a/public/langs/lo_LA/languages.lang b/htdocs/langs/lo_LA/languages.lang
similarity index 100%
rename from public/langs/lo_LA/languages.lang
rename to htdocs/langs/lo_LA/languages.lang
diff --git a/public/langs/lo_LA/ldap.lang b/htdocs/langs/lo_LA/ldap.lang
similarity index 100%
rename from public/langs/lo_LA/ldap.lang
rename to htdocs/langs/lo_LA/ldap.lang
diff --git a/public/langs/lo_LA/link.lang b/htdocs/langs/lo_LA/link.lang
similarity index 100%
rename from public/langs/lo_LA/link.lang
rename to htdocs/langs/lo_LA/link.lang
diff --git a/public/langs/lo_LA/loan.lang b/htdocs/langs/lo_LA/loan.lang
similarity index 100%
rename from public/langs/lo_LA/loan.lang
rename to htdocs/langs/lo_LA/loan.lang
diff --git a/public/langs/lo_LA/mailmanspip.lang b/htdocs/langs/lo_LA/mailmanspip.lang
similarity index 100%
rename from public/langs/lo_LA/mailmanspip.lang
rename to htdocs/langs/lo_LA/mailmanspip.lang
diff --git a/public/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
similarity index 100%
rename from public/langs/lo_LA/mails.lang
rename to htdocs/langs/lo_LA/mails.lang
diff --git a/public/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
similarity index 100%
rename from public/langs/lo_LA/main.lang
rename to htdocs/langs/lo_LA/main.lang
diff --git a/public/langs/lo_LA/margins.lang b/htdocs/langs/lo_LA/margins.lang
similarity index 100%
rename from public/langs/lo_LA/margins.lang
rename to htdocs/langs/lo_LA/margins.lang
diff --git a/public/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
similarity index 100%
rename from public/langs/lo_LA/members.lang
rename to htdocs/langs/lo_LA/members.lang
diff --git a/public/langs/lo_LA/oauth.lang b/htdocs/langs/lo_LA/oauth.lang
similarity index 100%
rename from public/langs/lo_LA/oauth.lang
rename to htdocs/langs/lo_LA/oauth.lang
diff --git a/public/langs/lo_LA/opensurvey.lang b/htdocs/langs/lo_LA/opensurvey.lang
similarity index 100%
rename from public/langs/lo_LA/opensurvey.lang
rename to htdocs/langs/lo_LA/opensurvey.lang
diff --git a/public/langs/lo_LA/orders.lang b/htdocs/langs/lo_LA/orders.lang
similarity index 100%
rename from public/langs/lo_LA/orders.lang
rename to htdocs/langs/lo_LA/orders.lang
diff --git a/public/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
similarity index 100%
rename from public/langs/lo_LA/other.lang
rename to htdocs/langs/lo_LA/other.lang
diff --git a/public/langs/lo_LA/paybox.lang b/htdocs/langs/lo_LA/paybox.lang
similarity index 100%
rename from public/langs/lo_LA/paybox.lang
rename to htdocs/langs/lo_LA/paybox.lang
diff --git a/public/langs/lo_LA/paypal.lang b/htdocs/langs/lo_LA/paypal.lang
similarity index 100%
rename from public/langs/lo_LA/paypal.lang
rename to htdocs/langs/lo_LA/paypal.lang
diff --git a/public/langs/lo_LA/printing.lang b/htdocs/langs/lo_LA/printing.lang
similarity index 100%
rename from public/langs/lo_LA/printing.lang
rename to htdocs/langs/lo_LA/printing.lang
diff --git a/public/langs/lo_LA/productbatch.lang b/htdocs/langs/lo_LA/productbatch.lang
similarity index 100%
rename from public/langs/lo_LA/productbatch.lang
rename to htdocs/langs/lo_LA/productbatch.lang
diff --git a/public/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
similarity index 100%
rename from public/langs/lo_LA/products.lang
rename to htdocs/langs/lo_LA/products.lang
diff --git a/public/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
similarity index 100%
rename from public/langs/lo_LA/projects.lang
rename to htdocs/langs/lo_LA/projects.lang
diff --git a/public/langs/lo_LA/propal.lang b/htdocs/langs/lo_LA/propal.lang
similarity index 100%
rename from public/langs/lo_LA/propal.lang
rename to htdocs/langs/lo_LA/propal.lang
diff --git a/public/langs/lo_LA/receiptprinter.lang b/htdocs/langs/lo_LA/receiptprinter.lang
similarity index 100%
rename from public/langs/lo_LA/receiptprinter.lang
rename to htdocs/langs/lo_LA/receiptprinter.lang
diff --git a/public/langs/lo_LA/resource.lang b/htdocs/langs/lo_LA/resource.lang
similarity index 100%
rename from public/langs/lo_LA/resource.lang
rename to htdocs/langs/lo_LA/resource.lang
diff --git a/public/langs/lo_LA/salaries.lang b/htdocs/langs/lo_LA/salaries.lang
similarity index 100%
rename from public/langs/lo_LA/salaries.lang
rename to htdocs/langs/lo_LA/salaries.lang
diff --git a/public/langs/lo_LA/sendings.lang b/htdocs/langs/lo_LA/sendings.lang
similarity index 100%
rename from public/langs/lo_LA/sendings.lang
rename to htdocs/langs/lo_LA/sendings.lang
diff --git a/public/langs/lo_LA/sms.lang b/htdocs/langs/lo_LA/sms.lang
similarity index 100%
rename from public/langs/lo_LA/sms.lang
rename to htdocs/langs/lo_LA/sms.lang
diff --git a/public/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
similarity index 100%
rename from public/langs/lo_LA/stocks.lang
rename to htdocs/langs/lo_LA/stocks.lang
diff --git a/public/langs/lo_LA/supplier_proposal.lang b/htdocs/langs/lo_LA/supplier_proposal.lang
similarity index 100%
rename from public/langs/lo_LA/supplier_proposal.lang
rename to htdocs/langs/lo_LA/supplier_proposal.lang
diff --git a/public/langs/lo_LA/suppliers.lang b/htdocs/langs/lo_LA/suppliers.lang
similarity index 100%
rename from public/langs/lo_LA/suppliers.lang
rename to htdocs/langs/lo_LA/suppliers.lang
diff --git a/public/langs/lo_LA/trips.lang b/htdocs/langs/lo_LA/trips.lang
similarity index 100%
rename from public/langs/lo_LA/trips.lang
rename to htdocs/langs/lo_LA/trips.lang
diff --git a/public/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
similarity index 100%
rename from public/langs/lo_LA/users.lang
rename to htdocs/langs/lo_LA/users.lang
diff --git a/public/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
similarity index 100%
rename from public/langs/lo_LA/website.lang
rename to htdocs/langs/lo_LA/website.lang
diff --git a/public/langs/lo_LA/withdrawals.lang b/htdocs/langs/lo_LA/withdrawals.lang
similarity index 100%
rename from public/langs/lo_LA/withdrawals.lang
rename to htdocs/langs/lo_LA/withdrawals.lang
diff --git a/public/langs/lo_LA/workflow.lang b/htdocs/langs/lo_LA/workflow.lang
similarity index 100%
rename from public/langs/lo_LA/workflow.lang
rename to htdocs/langs/lo_LA/workflow.lang
diff --git a/public/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
similarity index 100%
rename from public/langs/lt_LT/accountancy.lang
rename to htdocs/langs/lt_LT/accountancy.lang
diff --git a/public/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
similarity index 100%
rename from public/langs/lt_LT/admin.lang
rename to htdocs/langs/lt_LT/admin.lang
diff --git a/public/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang
similarity index 100%
rename from public/langs/lt_LT/agenda.lang
rename to htdocs/langs/lt_LT/agenda.lang
diff --git a/public/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
similarity index 100%
rename from public/langs/lt_LT/banks.lang
rename to htdocs/langs/lt_LT/banks.lang
diff --git a/public/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
similarity index 100%
rename from public/langs/lt_LT/bills.lang
rename to htdocs/langs/lt_LT/bills.lang
diff --git a/public/langs/lt_LT/bookmarks.lang b/htdocs/langs/lt_LT/bookmarks.lang
similarity index 100%
rename from public/langs/lt_LT/bookmarks.lang
rename to htdocs/langs/lt_LT/bookmarks.lang
diff --git a/public/langs/lt_LT/boxes.lang b/htdocs/langs/lt_LT/boxes.lang
similarity index 100%
rename from public/langs/lt_LT/boxes.lang
rename to htdocs/langs/lt_LT/boxes.lang
diff --git a/public/langs/lt_LT/cashdesk.lang b/htdocs/langs/lt_LT/cashdesk.lang
similarity index 100%
rename from public/langs/lt_LT/cashdesk.lang
rename to htdocs/langs/lt_LT/cashdesk.lang
diff --git a/public/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang
similarity index 100%
rename from public/langs/lt_LT/categories.lang
rename to htdocs/langs/lt_LT/categories.lang
diff --git a/public/langs/lt_LT/commercial.lang b/htdocs/langs/lt_LT/commercial.lang
similarity index 100%
rename from public/langs/lt_LT/commercial.lang
rename to htdocs/langs/lt_LT/commercial.lang
diff --git a/public/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
similarity index 100%
rename from public/langs/lt_LT/companies.lang
rename to htdocs/langs/lt_LT/companies.lang
diff --git a/public/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
similarity index 100%
rename from public/langs/lt_LT/compta.lang
rename to htdocs/langs/lt_LT/compta.lang
diff --git a/public/langs/lt_LT/contracts.lang b/htdocs/langs/lt_LT/contracts.lang
similarity index 100%
rename from public/langs/lt_LT/contracts.lang
rename to htdocs/langs/lt_LT/contracts.lang
diff --git a/public/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang
similarity index 100%
rename from public/langs/lt_LT/cron.lang
rename to htdocs/langs/lt_LT/cron.lang
diff --git a/public/langs/lt_LT/deliveries.lang b/htdocs/langs/lt_LT/deliveries.lang
similarity index 100%
rename from public/langs/lt_LT/deliveries.lang
rename to htdocs/langs/lt_LT/deliveries.lang
diff --git a/public/langs/lt_LT/dict.lang b/htdocs/langs/lt_LT/dict.lang
similarity index 100%
rename from public/langs/lt_LT/dict.lang
rename to htdocs/langs/lt_LT/dict.lang
diff --git a/public/langs/lt_LT/donations.lang b/htdocs/langs/lt_LT/donations.lang
similarity index 100%
rename from public/langs/lt_LT/donations.lang
rename to htdocs/langs/lt_LT/donations.lang
diff --git a/public/langs/lt_LT/ecm.lang b/htdocs/langs/lt_LT/ecm.lang
similarity index 100%
rename from public/langs/lt_LT/ecm.lang
rename to htdocs/langs/lt_LT/ecm.lang
diff --git a/public/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
similarity index 100%
rename from public/langs/lt_LT/errors.lang
rename to htdocs/langs/lt_LT/errors.lang
diff --git a/public/langs/lt_LT/exports.lang b/htdocs/langs/lt_LT/exports.lang
similarity index 100%
rename from public/langs/lt_LT/exports.lang
rename to htdocs/langs/lt_LT/exports.lang
diff --git a/public/langs/lt_LT/externalsite.lang b/htdocs/langs/lt_LT/externalsite.lang
similarity index 100%
rename from public/langs/lt_LT/externalsite.lang
rename to htdocs/langs/lt_LT/externalsite.lang
diff --git a/public/langs/lt_LT/ftp.lang b/htdocs/langs/lt_LT/ftp.lang
similarity index 100%
rename from public/langs/lt_LT/ftp.lang
rename to htdocs/langs/lt_LT/ftp.lang
diff --git a/public/langs/lt_LT/help.lang b/htdocs/langs/lt_LT/help.lang
similarity index 100%
rename from public/langs/lt_LT/help.lang
rename to htdocs/langs/lt_LT/help.lang
diff --git a/public/langs/lt_LT/holiday.lang b/htdocs/langs/lt_LT/holiday.lang
similarity index 100%
rename from public/langs/lt_LT/holiday.lang
rename to htdocs/langs/lt_LT/holiday.lang
diff --git a/public/langs/lt_LT/hrm.lang b/htdocs/langs/lt_LT/hrm.lang
similarity index 100%
rename from public/langs/lt_LT/hrm.lang
rename to htdocs/langs/lt_LT/hrm.lang
diff --git a/public/langs/lt_LT/incoterm.lang b/htdocs/langs/lt_LT/incoterm.lang
similarity index 100%
rename from public/langs/lt_LT/incoterm.lang
rename to htdocs/langs/lt_LT/incoterm.lang
diff --git a/public/langs/lt_LT/install.lang b/htdocs/langs/lt_LT/install.lang
similarity index 100%
rename from public/langs/lt_LT/install.lang
rename to htdocs/langs/lt_LT/install.lang
diff --git a/public/langs/lt_LT/interventions.lang b/htdocs/langs/lt_LT/interventions.lang
similarity index 100%
rename from public/langs/lt_LT/interventions.lang
rename to htdocs/langs/lt_LT/interventions.lang
diff --git a/public/langs/lt_LT/languages.lang b/htdocs/langs/lt_LT/languages.lang
similarity index 100%
rename from public/langs/lt_LT/languages.lang
rename to htdocs/langs/lt_LT/languages.lang
diff --git a/public/langs/lt_LT/ldap.lang b/htdocs/langs/lt_LT/ldap.lang
similarity index 100%
rename from public/langs/lt_LT/ldap.lang
rename to htdocs/langs/lt_LT/ldap.lang
diff --git a/public/langs/lt_LT/link.lang b/htdocs/langs/lt_LT/link.lang
similarity index 100%
rename from public/langs/lt_LT/link.lang
rename to htdocs/langs/lt_LT/link.lang
diff --git a/public/langs/lt_LT/loan.lang b/htdocs/langs/lt_LT/loan.lang
similarity index 100%
rename from public/langs/lt_LT/loan.lang
rename to htdocs/langs/lt_LT/loan.lang
diff --git a/public/langs/lt_LT/mailmanspip.lang b/htdocs/langs/lt_LT/mailmanspip.lang
similarity index 100%
rename from public/langs/lt_LT/mailmanspip.lang
rename to htdocs/langs/lt_LT/mailmanspip.lang
diff --git a/public/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
similarity index 100%
rename from public/langs/lt_LT/mails.lang
rename to htdocs/langs/lt_LT/mails.lang
diff --git a/public/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
similarity index 100%
rename from public/langs/lt_LT/main.lang
rename to htdocs/langs/lt_LT/main.lang
diff --git a/public/langs/lt_LT/margins.lang b/htdocs/langs/lt_LT/margins.lang
similarity index 100%
rename from public/langs/lt_LT/margins.lang
rename to htdocs/langs/lt_LT/margins.lang
diff --git a/public/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
similarity index 100%
rename from public/langs/lt_LT/members.lang
rename to htdocs/langs/lt_LT/members.lang
diff --git a/public/langs/lt_LT/oauth.lang b/htdocs/langs/lt_LT/oauth.lang
similarity index 100%
rename from public/langs/lt_LT/oauth.lang
rename to htdocs/langs/lt_LT/oauth.lang
diff --git a/public/langs/lt_LT/opensurvey.lang b/htdocs/langs/lt_LT/opensurvey.lang
similarity index 100%
rename from public/langs/lt_LT/opensurvey.lang
rename to htdocs/langs/lt_LT/opensurvey.lang
diff --git a/public/langs/lt_LT/orders.lang b/htdocs/langs/lt_LT/orders.lang
similarity index 100%
rename from public/langs/lt_LT/orders.lang
rename to htdocs/langs/lt_LT/orders.lang
diff --git a/public/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
similarity index 100%
rename from public/langs/lt_LT/other.lang
rename to htdocs/langs/lt_LT/other.lang
diff --git a/public/langs/lt_LT/paybox.lang b/htdocs/langs/lt_LT/paybox.lang
similarity index 100%
rename from public/langs/lt_LT/paybox.lang
rename to htdocs/langs/lt_LT/paybox.lang
diff --git a/public/langs/lt_LT/paypal.lang b/htdocs/langs/lt_LT/paypal.lang
similarity index 100%
rename from public/langs/lt_LT/paypal.lang
rename to htdocs/langs/lt_LT/paypal.lang
diff --git a/public/langs/lt_LT/printing.lang b/htdocs/langs/lt_LT/printing.lang
similarity index 100%
rename from public/langs/lt_LT/printing.lang
rename to htdocs/langs/lt_LT/printing.lang
diff --git a/public/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang
similarity index 100%
rename from public/langs/lt_LT/productbatch.lang
rename to htdocs/langs/lt_LT/productbatch.lang
diff --git a/public/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
similarity index 100%
rename from public/langs/lt_LT/products.lang
rename to htdocs/langs/lt_LT/products.lang
diff --git a/public/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
similarity index 100%
rename from public/langs/lt_LT/projects.lang
rename to htdocs/langs/lt_LT/projects.lang
diff --git a/public/langs/lt_LT/propal.lang b/htdocs/langs/lt_LT/propal.lang
similarity index 100%
rename from public/langs/lt_LT/propal.lang
rename to htdocs/langs/lt_LT/propal.lang
diff --git a/public/langs/lt_LT/receiptprinter.lang b/htdocs/langs/lt_LT/receiptprinter.lang
similarity index 100%
rename from public/langs/lt_LT/receiptprinter.lang
rename to htdocs/langs/lt_LT/receiptprinter.lang
diff --git a/public/langs/lt_LT/resource.lang b/htdocs/langs/lt_LT/resource.lang
similarity index 100%
rename from public/langs/lt_LT/resource.lang
rename to htdocs/langs/lt_LT/resource.lang
diff --git a/public/langs/lt_LT/salaries.lang b/htdocs/langs/lt_LT/salaries.lang
similarity index 100%
rename from public/langs/lt_LT/salaries.lang
rename to htdocs/langs/lt_LT/salaries.lang
diff --git a/public/langs/lt_LT/sendings.lang b/htdocs/langs/lt_LT/sendings.lang
similarity index 100%
rename from public/langs/lt_LT/sendings.lang
rename to htdocs/langs/lt_LT/sendings.lang
diff --git a/public/langs/lt_LT/sms.lang b/htdocs/langs/lt_LT/sms.lang
similarity index 100%
rename from public/langs/lt_LT/sms.lang
rename to htdocs/langs/lt_LT/sms.lang
diff --git a/public/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
similarity index 100%
rename from public/langs/lt_LT/stocks.lang
rename to htdocs/langs/lt_LT/stocks.lang
diff --git a/public/langs/lt_LT/supplier_proposal.lang b/htdocs/langs/lt_LT/supplier_proposal.lang
similarity index 100%
rename from public/langs/lt_LT/supplier_proposal.lang
rename to htdocs/langs/lt_LT/supplier_proposal.lang
diff --git a/public/langs/lt_LT/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang
similarity index 100%
rename from public/langs/lt_LT/suppliers.lang
rename to htdocs/langs/lt_LT/suppliers.lang
diff --git a/public/langs/lt_LT/trips.lang b/htdocs/langs/lt_LT/trips.lang
similarity index 100%
rename from public/langs/lt_LT/trips.lang
rename to htdocs/langs/lt_LT/trips.lang
diff --git a/public/langs/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang
similarity index 100%
rename from public/langs/lt_LT/users.lang
rename to htdocs/langs/lt_LT/users.lang
diff --git a/public/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
similarity index 100%
rename from public/langs/lt_LT/website.lang
rename to htdocs/langs/lt_LT/website.lang
diff --git a/public/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
similarity index 100%
rename from public/langs/lt_LT/withdrawals.lang
rename to htdocs/langs/lt_LT/withdrawals.lang
diff --git a/public/langs/lt_LT/workflow.lang b/htdocs/langs/lt_LT/workflow.lang
similarity index 100%
rename from public/langs/lt_LT/workflow.lang
rename to htdocs/langs/lt_LT/workflow.lang
diff --git a/public/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
similarity index 100%
rename from public/langs/lv_LV/accountancy.lang
rename to htdocs/langs/lv_LV/accountancy.lang
diff --git a/public/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
similarity index 100%
rename from public/langs/lv_LV/admin.lang
rename to htdocs/langs/lv_LV/admin.lang
diff --git a/public/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
similarity index 100%
rename from public/langs/lv_LV/agenda.lang
rename to htdocs/langs/lv_LV/agenda.lang
diff --git a/public/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
similarity index 100%
rename from public/langs/lv_LV/banks.lang
rename to htdocs/langs/lv_LV/banks.lang
diff --git a/public/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
similarity index 100%
rename from public/langs/lv_LV/bills.lang
rename to htdocs/langs/lv_LV/bills.lang
diff --git a/public/langs/lv_LV/bookmarks.lang b/htdocs/langs/lv_LV/bookmarks.lang
similarity index 100%
rename from public/langs/lv_LV/bookmarks.lang
rename to htdocs/langs/lv_LV/bookmarks.lang
diff --git a/public/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
similarity index 100%
rename from public/langs/lv_LV/boxes.lang
rename to htdocs/langs/lv_LV/boxes.lang
diff --git a/public/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
similarity index 100%
rename from public/langs/lv_LV/cashdesk.lang
rename to htdocs/langs/lv_LV/cashdesk.lang
diff --git a/public/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
similarity index 100%
rename from public/langs/lv_LV/categories.lang
rename to htdocs/langs/lv_LV/categories.lang
diff --git a/public/langs/lv_LV/commercial.lang b/htdocs/langs/lv_LV/commercial.lang
similarity index 100%
rename from public/langs/lv_LV/commercial.lang
rename to htdocs/langs/lv_LV/commercial.lang
diff --git a/public/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
similarity index 100%
rename from public/langs/lv_LV/companies.lang
rename to htdocs/langs/lv_LV/companies.lang
diff --git a/public/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
similarity index 100%
rename from public/langs/lv_LV/compta.lang
rename to htdocs/langs/lv_LV/compta.lang
diff --git a/public/langs/lv_LV/contracts.lang b/htdocs/langs/lv_LV/contracts.lang
similarity index 100%
rename from public/langs/lv_LV/contracts.lang
rename to htdocs/langs/lv_LV/contracts.lang
diff --git a/public/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
similarity index 100%
rename from public/langs/lv_LV/cron.lang
rename to htdocs/langs/lv_LV/cron.lang
diff --git a/public/langs/lv_LV/deliveries.lang b/htdocs/langs/lv_LV/deliveries.lang
similarity index 100%
rename from public/langs/lv_LV/deliveries.lang
rename to htdocs/langs/lv_LV/deliveries.lang
diff --git a/public/langs/lv_LV/dict.lang b/htdocs/langs/lv_LV/dict.lang
similarity index 100%
rename from public/langs/lv_LV/dict.lang
rename to htdocs/langs/lv_LV/dict.lang
diff --git a/public/langs/lv_LV/donations.lang b/htdocs/langs/lv_LV/donations.lang
similarity index 100%
rename from public/langs/lv_LV/donations.lang
rename to htdocs/langs/lv_LV/donations.lang
diff --git a/public/langs/lv_LV/ecm.lang b/htdocs/langs/lv_LV/ecm.lang
similarity index 100%
rename from public/langs/lv_LV/ecm.lang
rename to htdocs/langs/lv_LV/ecm.lang
diff --git a/public/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
similarity index 100%
rename from public/langs/lv_LV/errors.lang
rename to htdocs/langs/lv_LV/errors.lang
diff --git a/public/langs/lv_LV/exports.lang b/htdocs/langs/lv_LV/exports.lang
similarity index 100%
rename from public/langs/lv_LV/exports.lang
rename to htdocs/langs/lv_LV/exports.lang
diff --git a/public/langs/lv_LV/externalsite.lang b/htdocs/langs/lv_LV/externalsite.lang
similarity index 100%
rename from public/langs/lv_LV/externalsite.lang
rename to htdocs/langs/lv_LV/externalsite.lang
diff --git a/public/langs/lv_LV/ftp.lang b/htdocs/langs/lv_LV/ftp.lang
similarity index 100%
rename from public/langs/lv_LV/ftp.lang
rename to htdocs/langs/lv_LV/ftp.lang
diff --git a/public/langs/lv_LV/help.lang b/htdocs/langs/lv_LV/help.lang
similarity index 100%
rename from public/langs/lv_LV/help.lang
rename to htdocs/langs/lv_LV/help.lang
diff --git a/public/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang
similarity index 100%
rename from public/langs/lv_LV/holiday.lang
rename to htdocs/langs/lv_LV/holiday.lang
diff --git a/public/langs/lv_LV/hrm.lang b/htdocs/langs/lv_LV/hrm.lang
similarity index 100%
rename from public/langs/lv_LV/hrm.lang
rename to htdocs/langs/lv_LV/hrm.lang
diff --git a/public/langs/lv_LV/incoterm.lang b/htdocs/langs/lv_LV/incoterm.lang
similarity index 100%
rename from public/langs/lv_LV/incoterm.lang
rename to htdocs/langs/lv_LV/incoterm.lang
diff --git a/public/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
similarity index 100%
rename from public/langs/lv_LV/install.lang
rename to htdocs/langs/lv_LV/install.lang
diff --git a/public/langs/lv_LV/interventions.lang b/htdocs/langs/lv_LV/interventions.lang
similarity index 100%
rename from public/langs/lv_LV/interventions.lang
rename to htdocs/langs/lv_LV/interventions.lang
diff --git a/public/langs/lv_LV/languages.lang b/htdocs/langs/lv_LV/languages.lang
similarity index 100%
rename from public/langs/lv_LV/languages.lang
rename to htdocs/langs/lv_LV/languages.lang
diff --git a/public/langs/lv_LV/ldap.lang b/htdocs/langs/lv_LV/ldap.lang
similarity index 100%
rename from public/langs/lv_LV/ldap.lang
rename to htdocs/langs/lv_LV/ldap.lang
diff --git a/public/langs/lv_LV/link.lang b/htdocs/langs/lv_LV/link.lang
similarity index 100%
rename from public/langs/lv_LV/link.lang
rename to htdocs/langs/lv_LV/link.lang
diff --git a/public/langs/lv_LV/loan.lang b/htdocs/langs/lv_LV/loan.lang
similarity index 100%
rename from public/langs/lv_LV/loan.lang
rename to htdocs/langs/lv_LV/loan.lang
diff --git a/public/langs/lv_LV/mailmanspip.lang b/htdocs/langs/lv_LV/mailmanspip.lang
similarity index 100%
rename from public/langs/lv_LV/mailmanspip.lang
rename to htdocs/langs/lv_LV/mailmanspip.lang
diff --git a/public/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
similarity index 100%
rename from public/langs/lv_LV/mails.lang
rename to htdocs/langs/lv_LV/mails.lang
diff --git a/public/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
similarity index 100%
rename from public/langs/lv_LV/main.lang
rename to htdocs/langs/lv_LV/main.lang
diff --git a/public/langs/lv_LV/margins.lang b/htdocs/langs/lv_LV/margins.lang
similarity index 100%
rename from public/langs/lv_LV/margins.lang
rename to htdocs/langs/lv_LV/margins.lang
diff --git a/public/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
similarity index 100%
rename from public/langs/lv_LV/members.lang
rename to htdocs/langs/lv_LV/members.lang
diff --git a/public/langs/lv_LV/oauth.lang b/htdocs/langs/lv_LV/oauth.lang
similarity index 100%
rename from public/langs/lv_LV/oauth.lang
rename to htdocs/langs/lv_LV/oauth.lang
diff --git a/public/langs/lv_LV/opensurvey.lang b/htdocs/langs/lv_LV/opensurvey.lang
similarity index 100%
rename from public/langs/lv_LV/opensurvey.lang
rename to htdocs/langs/lv_LV/opensurvey.lang
diff --git a/public/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
similarity index 100%
rename from public/langs/lv_LV/orders.lang
rename to htdocs/langs/lv_LV/orders.lang
diff --git a/public/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
similarity index 100%
rename from public/langs/lv_LV/other.lang
rename to htdocs/langs/lv_LV/other.lang
diff --git a/public/langs/lv_LV/paybox.lang b/htdocs/langs/lv_LV/paybox.lang
similarity index 100%
rename from public/langs/lv_LV/paybox.lang
rename to htdocs/langs/lv_LV/paybox.lang
diff --git a/public/langs/lv_LV/paypal.lang b/htdocs/langs/lv_LV/paypal.lang
similarity index 100%
rename from public/langs/lv_LV/paypal.lang
rename to htdocs/langs/lv_LV/paypal.lang
diff --git a/public/langs/lv_LV/printing.lang b/htdocs/langs/lv_LV/printing.lang
similarity index 100%
rename from public/langs/lv_LV/printing.lang
rename to htdocs/langs/lv_LV/printing.lang
diff --git a/public/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang
similarity index 100%
rename from public/langs/lv_LV/productbatch.lang
rename to htdocs/langs/lv_LV/productbatch.lang
diff --git a/public/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
similarity index 100%
rename from public/langs/lv_LV/products.lang
rename to htdocs/langs/lv_LV/products.lang
diff --git a/public/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
similarity index 100%
rename from public/langs/lv_LV/projects.lang
rename to htdocs/langs/lv_LV/projects.lang
diff --git a/public/langs/lv_LV/propal.lang b/htdocs/langs/lv_LV/propal.lang
similarity index 100%
rename from public/langs/lv_LV/propal.lang
rename to htdocs/langs/lv_LV/propal.lang
diff --git a/public/langs/lv_LV/receiptprinter.lang b/htdocs/langs/lv_LV/receiptprinter.lang
similarity index 100%
rename from public/langs/lv_LV/receiptprinter.lang
rename to htdocs/langs/lv_LV/receiptprinter.lang
diff --git a/public/langs/lv_LV/resource.lang b/htdocs/langs/lv_LV/resource.lang
similarity index 100%
rename from public/langs/lv_LV/resource.lang
rename to htdocs/langs/lv_LV/resource.lang
diff --git a/public/langs/lv_LV/salaries.lang b/htdocs/langs/lv_LV/salaries.lang
similarity index 100%
rename from public/langs/lv_LV/salaries.lang
rename to htdocs/langs/lv_LV/salaries.lang
diff --git a/public/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
similarity index 100%
rename from public/langs/lv_LV/sendings.lang
rename to htdocs/langs/lv_LV/sendings.lang
diff --git a/public/langs/lv_LV/sms.lang b/htdocs/langs/lv_LV/sms.lang
similarity index 100%
rename from public/langs/lv_LV/sms.lang
rename to htdocs/langs/lv_LV/sms.lang
diff --git a/public/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
similarity index 100%
rename from public/langs/lv_LV/stocks.lang
rename to htdocs/langs/lv_LV/stocks.lang
diff --git a/public/langs/lv_LV/supplier_proposal.lang b/htdocs/langs/lv_LV/supplier_proposal.lang
similarity index 100%
rename from public/langs/lv_LV/supplier_proposal.lang
rename to htdocs/langs/lv_LV/supplier_proposal.lang
diff --git a/public/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
similarity index 100%
rename from public/langs/lv_LV/suppliers.lang
rename to htdocs/langs/lv_LV/suppliers.lang
diff --git a/public/langs/lv_LV/trips.lang b/htdocs/langs/lv_LV/trips.lang
similarity index 100%
rename from public/langs/lv_LV/trips.lang
rename to htdocs/langs/lv_LV/trips.lang
diff --git a/public/langs/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang
similarity index 100%
rename from public/langs/lv_LV/users.lang
rename to htdocs/langs/lv_LV/users.lang
diff --git a/public/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
similarity index 100%
rename from public/langs/lv_LV/website.lang
rename to htdocs/langs/lv_LV/website.lang
diff --git a/public/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
similarity index 100%
rename from public/langs/lv_LV/withdrawals.lang
rename to htdocs/langs/lv_LV/withdrawals.lang
diff --git a/public/langs/lv_LV/workflow.lang b/htdocs/langs/lv_LV/workflow.lang
similarity index 100%
rename from public/langs/lv_LV/workflow.lang
rename to htdocs/langs/lv_LV/workflow.lang
diff --git a/public/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
similarity index 100%
rename from public/langs/mk_MK/accountancy.lang
rename to htdocs/langs/mk_MK/accountancy.lang
diff --git a/public/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
similarity index 100%
rename from public/langs/mk_MK/admin.lang
rename to htdocs/langs/mk_MK/admin.lang
diff --git a/public/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang
similarity index 100%
rename from public/langs/mk_MK/agenda.lang
rename to htdocs/langs/mk_MK/agenda.lang
diff --git a/public/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
similarity index 100%
rename from public/langs/mk_MK/banks.lang
rename to htdocs/langs/mk_MK/banks.lang
diff --git a/public/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
similarity index 100%
rename from public/langs/mk_MK/bills.lang
rename to htdocs/langs/mk_MK/bills.lang
diff --git a/public/langs/mk_MK/bookmarks.lang b/htdocs/langs/mk_MK/bookmarks.lang
similarity index 100%
rename from public/langs/mk_MK/bookmarks.lang
rename to htdocs/langs/mk_MK/bookmarks.lang
diff --git a/public/langs/mk_MK/boxes.lang b/htdocs/langs/mk_MK/boxes.lang
similarity index 100%
rename from public/langs/mk_MK/boxes.lang
rename to htdocs/langs/mk_MK/boxes.lang
diff --git a/public/langs/mk_MK/cashdesk.lang b/htdocs/langs/mk_MK/cashdesk.lang
similarity index 100%
rename from public/langs/mk_MK/cashdesk.lang
rename to htdocs/langs/mk_MK/cashdesk.lang
diff --git a/public/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang
similarity index 100%
rename from public/langs/mk_MK/categories.lang
rename to htdocs/langs/mk_MK/categories.lang
diff --git a/public/langs/mk_MK/commercial.lang b/htdocs/langs/mk_MK/commercial.lang
similarity index 100%
rename from public/langs/mk_MK/commercial.lang
rename to htdocs/langs/mk_MK/commercial.lang
diff --git a/public/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
similarity index 100%
rename from public/langs/mk_MK/companies.lang
rename to htdocs/langs/mk_MK/companies.lang
diff --git a/public/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
similarity index 100%
rename from public/langs/mk_MK/compta.lang
rename to htdocs/langs/mk_MK/compta.lang
diff --git a/public/langs/mk_MK/contracts.lang b/htdocs/langs/mk_MK/contracts.lang
similarity index 100%
rename from public/langs/mk_MK/contracts.lang
rename to htdocs/langs/mk_MK/contracts.lang
diff --git a/public/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang
similarity index 100%
rename from public/langs/mk_MK/cron.lang
rename to htdocs/langs/mk_MK/cron.lang
diff --git a/public/langs/mk_MK/deliveries.lang b/htdocs/langs/mk_MK/deliveries.lang
similarity index 100%
rename from public/langs/mk_MK/deliveries.lang
rename to htdocs/langs/mk_MK/deliveries.lang
diff --git a/public/langs/mk_MK/dict.lang b/htdocs/langs/mk_MK/dict.lang
similarity index 100%
rename from public/langs/mk_MK/dict.lang
rename to htdocs/langs/mk_MK/dict.lang
diff --git a/public/langs/mk_MK/donations.lang b/htdocs/langs/mk_MK/donations.lang
similarity index 100%
rename from public/langs/mk_MK/donations.lang
rename to htdocs/langs/mk_MK/donations.lang
diff --git a/public/langs/mk_MK/ecm.lang b/htdocs/langs/mk_MK/ecm.lang
similarity index 100%
rename from public/langs/mk_MK/ecm.lang
rename to htdocs/langs/mk_MK/ecm.lang
diff --git a/public/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
similarity index 100%
rename from public/langs/mk_MK/errors.lang
rename to htdocs/langs/mk_MK/errors.lang
diff --git a/public/langs/mk_MK/exports.lang b/htdocs/langs/mk_MK/exports.lang
similarity index 100%
rename from public/langs/mk_MK/exports.lang
rename to htdocs/langs/mk_MK/exports.lang
diff --git a/public/langs/mk_MK/externalsite.lang b/htdocs/langs/mk_MK/externalsite.lang
similarity index 100%
rename from public/langs/mk_MK/externalsite.lang
rename to htdocs/langs/mk_MK/externalsite.lang
diff --git a/public/langs/mk_MK/ftp.lang b/htdocs/langs/mk_MK/ftp.lang
similarity index 100%
rename from public/langs/mk_MK/ftp.lang
rename to htdocs/langs/mk_MK/ftp.lang
diff --git a/public/langs/mk_MK/help.lang b/htdocs/langs/mk_MK/help.lang
similarity index 100%
rename from public/langs/mk_MK/help.lang
rename to htdocs/langs/mk_MK/help.lang
diff --git a/public/langs/mk_MK/holiday.lang b/htdocs/langs/mk_MK/holiday.lang
similarity index 100%
rename from public/langs/mk_MK/holiday.lang
rename to htdocs/langs/mk_MK/holiday.lang
diff --git a/public/langs/mk_MK/hrm.lang b/htdocs/langs/mk_MK/hrm.lang
similarity index 100%
rename from public/langs/mk_MK/hrm.lang
rename to htdocs/langs/mk_MK/hrm.lang
diff --git a/public/langs/mk_MK/incoterm.lang b/htdocs/langs/mk_MK/incoterm.lang
similarity index 100%
rename from public/langs/mk_MK/incoterm.lang
rename to htdocs/langs/mk_MK/incoterm.lang
diff --git a/public/langs/mk_MK/install.lang b/htdocs/langs/mk_MK/install.lang
similarity index 100%
rename from public/langs/mk_MK/install.lang
rename to htdocs/langs/mk_MK/install.lang
diff --git a/public/langs/mk_MK/interventions.lang b/htdocs/langs/mk_MK/interventions.lang
similarity index 100%
rename from public/langs/mk_MK/interventions.lang
rename to htdocs/langs/mk_MK/interventions.lang
diff --git a/public/langs/mk_MK/languages.lang b/htdocs/langs/mk_MK/languages.lang
similarity index 100%
rename from public/langs/mk_MK/languages.lang
rename to htdocs/langs/mk_MK/languages.lang
diff --git a/public/langs/mk_MK/ldap.lang b/htdocs/langs/mk_MK/ldap.lang
similarity index 100%
rename from public/langs/mk_MK/ldap.lang
rename to htdocs/langs/mk_MK/ldap.lang
diff --git a/public/langs/mk_MK/link.lang b/htdocs/langs/mk_MK/link.lang
similarity index 100%
rename from public/langs/mk_MK/link.lang
rename to htdocs/langs/mk_MK/link.lang
diff --git a/public/langs/mk_MK/loan.lang b/htdocs/langs/mk_MK/loan.lang
similarity index 100%
rename from public/langs/mk_MK/loan.lang
rename to htdocs/langs/mk_MK/loan.lang
diff --git a/public/langs/mk_MK/mailmanspip.lang b/htdocs/langs/mk_MK/mailmanspip.lang
similarity index 100%
rename from public/langs/mk_MK/mailmanspip.lang
rename to htdocs/langs/mk_MK/mailmanspip.lang
diff --git a/public/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
similarity index 100%
rename from public/langs/mk_MK/mails.lang
rename to htdocs/langs/mk_MK/mails.lang
diff --git a/public/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
similarity index 100%
rename from public/langs/mk_MK/main.lang
rename to htdocs/langs/mk_MK/main.lang
diff --git a/public/langs/mk_MK/margins.lang b/htdocs/langs/mk_MK/margins.lang
similarity index 100%
rename from public/langs/mk_MK/margins.lang
rename to htdocs/langs/mk_MK/margins.lang
diff --git a/public/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
similarity index 100%
rename from public/langs/mk_MK/members.lang
rename to htdocs/langs/mk_MK/members.lang
diff --git a/public/langs/mk_MK/oauth.lang b/htdocs/langs/mk_MK/oauth.lang
similarity index 100%
rename from public/langs/mk_MK/oauth.lang
rename to htdocs/langs/mk_MK/oauth.lang
diff --git a/public/langs/mk_MK/opensurvey.lang b/htdocs/langs/mk_MK/opensurvey.lang
similarity index 100%
rename from public/langs/mk_MK/opensurvey.lang
rename to htdocs/langs/mk_MK/opensurvey.lang
diff --git a/public/langs/mk_MK/orders.lang b/htdocs/langs/mk_MK/orders.lang
similarity index 100%
rename from public/langs/mk_MK/orders.lang
rename to htdocs/langs/mk_MK/orders.lang
diff --git a/public/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
similarity index 100%
rename from public/langs/mk_MK/other.lang
rename to htdocs/langs/mk_MK/other.lang
diff --git a/public/langs/mk_MK/paybox.lang b/htdocs/langs/mk_MK/paybox.lang
similarity index 100%
rename from public/langs/mk_MK/paybox.lang
rename to htdocs/langs/mk_MK/paybox.lang
diff --git a/public/langs/mk_MK/paypal.lang b/htdocs/langs/mk_MK/paypal.lang
similarity index 100%
rename from public/langs/mk_MK/paypal.lang
rename to htdocs/langs/mk_MK/paypal.lang
diff --git a/public/langs/mk_MK/printing.lang b/htdocs/langs/mk_MK/printing.lang
similarity index 100%
rename from public/langs/mk_MK/printing.lang
rename to htdocs/langs/mk_MK/printing.lang
diff --git a/public/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang
similarity index 100%
rename from public/langs/mk_MK/productbatch.lang
rename to htdocs/langs/mk_MK/productbatch.lang
diff --git a/public/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
similarity index 100%
rename from public/langs/mk_MK/products.lang
rename to htdocs/langs/mk_MK/products.lang
diff --git a/public/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
similarity index 100%
rename from public/langs/mk_MK/projects.lang
rename to htdocs/langs/mk_MK/projects.lang
diff --git a/public/langs/mk_MK/propal.lang b/htdocs/langs/mk_MK/propal.lang
similarity index 100%
rename from public/langs/mk_MK/propal.lang
rename to htdocs/langs/mk_MK/propal.lang
diff --git a/public/langs/mk_MK/receiptprinter.lang b/htdocs/langs/mk_MK/receiptprinter.lang
similarity index 100%
rename from public/langs/mk_MK/receiptprinter.lang
rename to htdocs/langs/mk_MK/receiptprinter.lang
diff --git a/public/langs/mk_MK/resource.lang b/htdocs/langs/mk_MK/resource.lang
similarity index 100%
rename from public/langs/mk_MK/resource.lang
rename to htdocs/langs/mk_MK/resource.lang
diff --git a/public/langs/mk_MK/salaries.lang b/htdocs/langs/mk_MK/salaries.lang
similarity index 100%
rename from public/langs/mk_MK/salaries.lang
rename to htdocs/langs/mk_MK/salaries.lang
diff --git a/public/langs/mk_MK/sendings.lang b/htdocs/langs/mk_MK/sendings.lang
similarity index 100%
rename from public/langs/mk_MK/sendings.lang
rename to htdocs/langs/mk_MK/sendings.lang
diff --git a/public/langs/mk_MK/sms.lang b/htdocs/langs/mk_MK/sms.lang
similarity index 100%
rename from public/langs/mk_MK/sms.lang
rename to htdocs/langs/mk_MK/sms.lang
diff --git a/public/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
similarity index 100%
rename from public/langs/mk_MK/stocks.lang
rename to htdocs/langs/mk_MK/stocks.lang
diff --git a/public/langs/mk_MK/supplier_proposal.lang b/htdocs/langs/mk_MK/supplier_proposal.lang
similarity index 100%
rename from public/langs/mk_MK/supplier_proposal.lang
rename to htdocs/langs/mk_MK/supplier_proposal.lang
diff --git a/public/langs/mk_MK/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang
similarity index 100%
rename from public/langs/mk_MK/suppliers.lang
rename to htdocs/langs/mk_MK/suppliers.lang
diff --git a/public/langs/mk_MK/trips.lang b/htdocs/langs/mk_MK/trips.lang
similarity index 100%
rename from public/langs/mk_MK/trips.lang
rename to htdocs/langs/mk_MK/trips.lang
diff --git a/public/langs/mk_MK/users.lang b/htdocs/langs/mk_MK/users.lang
similarity index 100%
rename from public/langs/mk_MK/users.lang
rename to htdocs/langs/mk_MK/users.lang
diff --git a/public/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
similarity index 100%
rename from public/langs/mk_MK/website.lang
rename to htdocs/langs/mk_MK/website.lang
diff --git a/public/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
similarity index 100%
rename from public/langs/mk_MK/withdrawals.lang
rename to htdocs/langs/mk_MK/withdrawals.lang
diff --git a/public/langs/mk_MK/workflow.lang b/htdocs/langs/mk_MK/workflow.lang
similarity index 100%
rename from public/langs/mk_MK/workflow.lang
rename to htdocs/langs/mk_MK/workflow.lang
diff --git a/public/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
similarity index 100%
rename from public/langs/mn_MN/accountancy.lang
rename to htdocs/langs/mn_MN/accountancy.lang
diff --git a/public/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
similarity index 100%
rename from public/langs/mn_MN/admin.lang
rename to htdocs/langs/mn_MN/admin.lang
diff --git a/public/langs/mn_MN/agenda.lang b/htdocs/langs/mn_MN/agenda.lang
similarity index 100%
rename from public/langs/mn_MN/agenda.lang
rename to htdocs/langs/mn_MN/agenda.lang
diff --git a/public/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang
similarity index 100%
rename from public/langs/mn_MN/banks.lang
rename to htdocs/langs/mn_MN/banks.lang
diff --git a/public/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang
similarity index 100%
rename from public/langs/mn_MN/bills.lang
rename to htdocs/langs/mn_MN/bills.lang
diff --git a/public/langs/mn_MN/bookmarks.lang b/htdocs/langs/mn_MN/bookmarks.lang
similarity index 100%
rename from public/langs/mn_MN/bookmarks.lang
rename to htdocs/langs/mn_MN/bookmarks.lang
diff --git a/public/langs/mn_MN/boxes.lang b/htdocs/langs/mn_MN/boxes.lang
similarity index 100%
rename from public/langs/mn_MN/boxes.lang
rename to htdocs/langs/mn_MN/boxes.lang
diff --git a/public/langs/mn_MN/cashdesk.lang b/htdocs/langs/mn_MN/cashdesk.lang
similarity index 100%
rename from public/langs/mn_MN/cashdesk.lang
rename to htdocs/langs/mn_MN/cashdesk.lang
diff --git a/public/langs/mn_MN/categories.lang b/htdocs/langs/mn_MN/categories.lang
similarity index 100%
rename from public/langs/mn_MN/categories.lang
rename to htdocs/langs/mn_MN/categories.lang
diff --git a/public/langs/mn_MN/commercial.lang b/htdocs/langs/mn_MN/commercial.lang
similarity index 100%
rename from public/langs/mn_MN/commercial.lang
rename to htdocs/langs/mn_MN/commercial.lang
diff --git a/public/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang
similarity index 100%
rename from public/langs/mn_MN/companies.lang
rename to htdocs/langs/mn_MN/companies.lang
diff --git a/public/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
similarity index 100%
rename from public/langs/mn_MN/compta.lang
rename to htdocs/langs/mn_MN/compta.lang
diff --git a/public/langs/mn_MN/contracts.lang b/htdocs/langs/mn_MN/contracts.lang
similarity index 100%
rename from public/langs/mn_MN/contracts.lang
rename to htdocs/langs/mn_MN/contracts.lang
diff --git a/public/langs/mn_MN/cron.lang b/htdocs/langs/mn_MN/cron.lang
similarity index 100%
rename from public/langs/mn_MN/cron.lang
rename to htdocs/langs/mn_MN/cron.lang
diff --git a/public/langs/mn_MN/deliveries.lang b/htdocs/langs/mn_MN/deliveries.lang
similarity index 100%
rename from public/langs/mn_MN/deliveries.lang
rename to htdocs/langs/mn_MN/deliveries.lang
diff --git a/public/langs/mn_MN/dict.lang b/htdocs/langs/mn_MN/dict.lang
similarity index 100%
rename from public/langs/mn_MN/dict.lang
rename to htdocs/langs/mn_MN/dict.lang
diff --git a/public/langs/mn_MN/donations.lang b/htdocs/langs/mn_MN/donations.lang
similarity index 100%
rename from public/langs/mn_MN/donations.lang
rename to htdocs/langs/mn_MN/donations.lang
diff --git a/public/langs/mn_MN/ecm.lang b/htdocs/langs/mn_MN/ecm.lang
similarity index 100%
rename from public/langs/mn_MN/ecm.lang
rename to htdocs/langs/mn_MN/ecm.lang
diff --git a/public/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
similarity index 100%
rename from public/langs/mn_MN/errors.lang
rename to htdocs/langs/mn_MN/errors.lang
diff --git a/public/langs/mn_MN/exports.lang b/htdocs/langs/mn_MN/exports.lang
similarity index 100%
rename from public/langs/mn_MN/exports.lang
rename to htdocs/langs/mn_MN/exports.lang
diff --git a/public/langs/mn_MN/externalsite.lang b/htdocs/langs/mn_MN/externalsite.lang
similarity index 100%
rename from public/langs/mn_MN/externalsite.lang
rename to htdocs/langs/mn_MN/externalsite.lang
diff --git a/public/langs/mn_MN/ftp.lang b/htdocs/langs/mn_MN/ftp.lang
similarity index 100%
rename from public/langs/mn_MN/ftp.lang
rename to htdocs/langs/mn_MN/ftp.lang
diff --git a/public/langs/mn_MN/help.lang b/htdocs/langs/mn_MN/help.lang
similarity index 100%
rename from public/langs/mn_MN/help.lang
rename to htdocs/langs/mn_MN/help.lang
diff --git a/public/langs/mn_MN/holiday.lang b/htdocs/langs/mn_MN/holiday.lang
similarity index 100%
rename from public/langs/mn_MN/holiday.lang
rename to htdocs/langs/mn_MN/holiday.lang
diff --git a/public/langs/mn_MN/hrm.lang b/htdocs/langs/mn_MN/hrm.lang
similarity index 100%
rename from public/langs/mn_MN/hrm.lang
rename to htdocs/langs/mn_MN/hrm.lang
diff --git a/public/langs/mn_MN/incoterm.lang b/htdocs/langs/mn_MN/incoterm.lang
similarity index 100%
rename from public/langs/mn_MN/incoterm.lang
rename to htdocs/langs/mn_MN/incoterm.lang
diff --git a/public/langs/mn_MN/install.lang b/htdocs/langs/mn_MN/install.lang
similarity index 100%
rename from public/langs/mn_MN/install.lang
rename to htdocs/langs/mn_MN/install.lang
diff --git a/public/langs/mn_MN/interventions.lang b/htdocs/langs/mn_MN/interventions.lang
similarity index 100%
rename from public/langs/mn_MN/interventions.lang
rename to htdocs/langs/mn_MN/interventions.lang
diff --git a/public/langs/mn_MN/languages.lang b/htdocs/langs/mn_MN/languages.lang
similarity index 100%
rename from public/langs/mn_MN/languages.lang
rename to htdocs/langs/mn_MN/languages.lang
diff --git a/public/langs/mn_MN/ldap.lang b/htdocs/langs/mn_MN/ldap.lang
similarity index 100%
rename from public/langs/mn_MN/ldap.lang
rename to htdocs/langs/mn_MN/ldap.lang
diff --git a/public/langs/mn_MN/link.lang b/htdocs/langs/mn_MN/link.lang
similarity index 100%
rename from public/langs/mn_MN/link.lang
rename to htdocs/langs/mn_MN/link.lang
diff --git a/public/langs/mn_MN/loan.lang b/htdocs/langs/mn_MN/loan.lang
similarity index 100%
rename from public/langs/mn_MN/loan.lang
rename to htdocs/langs/mn_MN/loan.lang
diff --git a/public/langs/mn_MN/mailmanspip.lang b/htdocs/langs/mn_MN/mailmanspip.lang
similarity index 100%
rename from public/langs/mn_MN/mailmanspip.lang
rename to htdocs/langs/mn_MN/mailmanspip.lang
diff --git a/public/langs/mn_MN/mails.lang b/htdocs/langs/mn_MN/mails.lang
similarity index 100%
rename from public/langs/mn_MN/mails.lang
rename to htdocs/langs/mn_MN/mails.lang
diff --git a/public/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
similarity index 100%
rename from public/langs/mn_MN/main.lang
rename to htdocs/langs/mn_MN/main.lang
diff --git a/public/langs/mn_MN/margins.lang b/htdocs/langs/mn_MN/margins.lang
similarity index 100%
rename from public/langs/mn_MN/margins.lang
rename to htdocs/langs/mn_MN/margins.lang
diff --git a/public/langs/mn_MN/members.lang b/htdocs/langs/mn_MN/members.lang
similarity index 100%
rename from public/langs/mn_MN/members.lang
rename to htdocs/langs/mn_MN/members.lang
diff --git a/public/langs/mn_MN/oauth.lang b/htdocs/langs/mn_MN/oauth.lang
similarity index 100%
rename from public/langs/mn_MN/oauth.lang
rename to htdocs/langs/mn_MN/oauth.lang
diff --git a/public/langs/mn_MN/opensurvey.lang b/htdocs/langs/mn_MN/opensurvey.lang
similarity index 100%
rename from public/langs/mn_MN/opensurvey.lang
rename to htdocs/langs/mn_MN/opensurvey.lang
diff --git a/public/langs/mn_MN/orders.lang b/htdocs/langs/mn_MN/orders.lang
similarity index 100%
rename from public/langs/mn_MN/orders.lang
rename to htdocs/langs/mn_MN/orders.lang
diff --git a/public/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
similarity index 100%
rename from public/langs/mn_MN/other.lang
rename to htdocs/langs/mn_MN/other.lang
diff --git a/public/langs/mn_MN/paybox.lang b/htdocs/langs/mn_MN/paybox.lang
similarity index 100%
rename from public/langs/mn_MN/paybox.lang
rename to htdocs/langs/mn_MN/paybox.lang
diff --git a/public/langs/mn_MN/paypal.lang b/htdocs/langs/mn_MN/paypal.lang
similarity index 100%
rename from public/langs/mn_MN/paypal.lang
rename to htdocs/langs/mn_MN/paypal.lang
diff --git a/public/langs/mn_MN/printing.lang b/htdocs/langs/mn_MN/printing.lang
similarity index 100%
rename from public/langs/mn_MN/printing.lang
rename to htdocs/langs/mn_MN/printing.lang
diff --git a/public/langs/mn_MN/productbatch.lang b/htdocs/langs/mn_MN/productbatch.lang
similarity index 100%
rename from public/langs/mn_MN/productbatch.lang
rename to htdocs/langs/mn_MN/productbatch.lang
diff --git a/public/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
similarity index 100%
rename from public/langs/mn_MN/products.lang
rename to htdocs/langs/mn_MN/products.lang
diff --git a/public/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
similarity index 100%
rename from public/langs/mn_MN/projects.lang
rename to htdocs/langs/mn_MN/projects.lang
diff --git a/public/langs/mn_MN/propal.lang b/htdocs/langs/mn_MN/propal.lang
similarity index 100%
rename from public/langs/mn_MN/propal.lang
rename to htdocs/langs/mn_MN/propal.lang
diff --git a/public/langs/mn_MN/receiptprinter.lang b/htdocs/langs/mn_MN/receiptprinter.lang
similarity index 100%
rename from public/langs/mn_MN/receiptprinter.lang
rename to htdocs/langs/mn_MN/receiptprinter.lang
diff --git a/public/langs/mn_MN/resource.lang b/htdocs/langs/mn_MN/resource.lang
similarity index 100%
rename from public/langs/mn_MN/resource.lang
rename to htdocs/langs/mn_MN/resource.lang
diff --git a/public/langs/mn_MN/salaries.lang b/htdocs/langs/mn_MN/salaries.lang
similarity index 100%
rename from public/langs/mn_MN/salaries.lang
rename to htdocs/langs/mn_MN/salaries.lang
diff --git a/public/langs/mn_MN/sendings.lang b/htdocs/langs/mn_MN/sendings.lang
similarity index 100%
rename from public/langs/mn_MN/sendings.lang
rename to htdocs/langs/mn_MN/sendings.lang
diff --git a/public/langs/mn_MN/sms.lang b/htdocs/langs/mn_MN/sms.lang
similarity index 100%
rename from public/langs/mn_MN/sms.lang
rename to htdocs/langs/mn_MN/sms.lang
diff --git a/public/langs/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
similarity index 100%
rename from public/langs/mn_MN/stocks.lang
rename to htdocs/langs/mn_MN/stocks.lang
diff --git a/public/langs/mn_MN/supplier_proposal.lang b/htdocs/langs/mn_MN/supplier_proposal.lang
similarity index 100%
rename from public/langs/mn_MN/supplier_proposal.lang
rename to htdocs/langs/mn_MN/supplier_proposal.lang
diff --git a/public/langs/mn_MN/suppliers.lang b/htdocs/langs/mn_MN/suppliers.lang
similarity index 100%
rename from public/langs/mn_MN/suppliers.lang
rename to htdocs/langs/mn_MN/suppliers.lang
diff --git a/public/langs/mn_MN/trips.lang b/htdocs/langs/mn_MN/trips.lang
similarity index 100%
rename from public/langs/mn_MN/trips.lang
rename to htdocs/langs/mn_MN/trips.lang
diff --git a/public/langs/mn_MN/users.lang b/htdocs/langs/mn_MN/users.lang
similarity index 100%
rename from public/langs/mn_MN/users.lang
rename to htdocs/langs/mn_MN/users.lang
diff --git a/public/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
similarity index 100%
rename from public/langs/mn_MN/website.lang
rename to htdocs/langs/mn_MN/website.lang
diff --git a/public/langs/mn_MN/withdrawals.lang b/htdocs/langs/mn_MN/withdrawals.lang
similarity index 100%
rename from public/langs/mn_MN/withdrawals.lang
rename to htdocs/langs/mn_MN/withdrawals.lang
diff --git a/public/langs/mn_MN/workflow.lang b/htdocs/langs/mn_MN/workflow.lang
similarity index 100%
rename from public/langs/mn_MN/workflow.lang
rename to htdocs/langs/mn_MN/workflow.lang
diff --git a/public/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
similarity index 100%
rename from public/langs/nb_NO/accountancy.lang
rename to htdocs/langs/nb_NO/accountancy.lang
diff --git a/public/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
similarity index 100%
rename from public/langs/nb_NO/admin.lang
rename to htdocs/langs/nb_NO/admin.lang
diff --git a/public/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
similarity index 100%
rename from public/langs/nb_NO/agenda.lang
rename to htdocs/langs/nb_NO/agenda.lang
diff --git a/public/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
similarity index 100%
rename from public/langs/nb_NO/banks.lang
rename to htdocs/langs/nb_NO/banks.lang
diff --git a/public/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
similarity index 100%
rename from public/langs/nb_NO/bills.lang
rename to htdocs/langs/nb_NO/bills.lang
diff --git a/public/langs/nb_NO/bookmarks.lang b/htdocs/langs/nb_NO/bookmarks.lang
similarity index 100%
rename from public/langs/nb_NO/bookmarks.lang
rename to htdocs/langs/nb_NO/bookmarks.lang
diff --git a/public/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
similarity index 100%
rename from public/langs/nb_NO/boxes.lang
rename to htdocs/langs/nb_NO/boxes.lang
diff --git a/public/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
similarity index 100%
rename from public/langs/nb_NO/cashdesk.lang
rename to htdocs/langs/nb_NO/cashdesk.lang
diff --git a/public/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
similarity index 100%
rename from public/langs/nb_NO/categories.lang
rename to htdocs/langs/nb_NO/categories.lang
diff --git a/public/langs/nb_NO/commercial.lang b/htdocs/langs/nb_NO/commercial.lang
similarity index 100%
rename from public/langs/nb_NO/commercial.lang
rename to htdocs/langs/nb_NO/commercial.lang
diff --git a/public/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
similarity index 100%
rename from public/langs/nb_NO/companies.lang
rename to htdocs/langs/nb_NO/companies.lang
diff --git a/public/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
similarity index 100%
rename from public/langs/nb_NO/compta.lang
rename to htdocs/langs/nb_NO/compta.lang
diff --git a/public/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang
similarity index 100%
rename from public/langs/nb_NO/contracts.lang
rename to htdocs/langs/nb_NO/contracts.lang
diff --git a/public/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
similarity index 100%
rename from public/langs/nb_NO/cron.lang
rename to htdocs/langs/nb_NO/cron.lang
diff --git a/public/langs/nb_NO/deliveries.lang b/htdocs/langs/nb_NO/deliveries.lang
similarity index 100%
rename from public/langs/nb_NO/deliveries.lang
rename to htdocs/langs/nb_NO/deliveries.lang
diff --git a/public/langs/nb_NO/dict.lang b/htdocs/langs/nb_NO/dict.lang
similarity index 100%
rename from public/langs/nb_NO/dict.lang
rename to htdocs/langs/nb_NO/dict.lang
diff --git a/public/langs/nb_NO/donations.lang b/htdocs/langs/nb_NO/donations.lang
similarity index 100%
rename from public/langs/nb_NO/donations.lang
rename to htdocs/langs/nb_NO/donations.lang
diff --git a/public/langs/nb_NO/ecm.lang b/htdocs/langs/nb_NO/ecm.lang
similarity index 100%
rename from public/langs/nb_NO/ecm.lang
rename to htdocs/langs/nb_NO/ecm.lang
diff --git a/public/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
similarity index 100%
rename from public/langs/nb_NO/errors.lang
rename to htdocs/langs/nb_NO/errors.lang
diff --git a/public/langs/nb_NO/exports.lang b/htdocs/langs/nb_NO/exports.lang
similarity index 100%
rename from public/langs/nb_NO/exports.lang
rename to htdocs/langs/nb_NO/exports.lang
diff --git a/public/langs/nb_NO/externalsite.lang b/htdocs/langs/nb_NO/externalsite.lang
similarity index 100%
rename from public/langs/nb_NO/externalsite.lang
rename to htdocs/langs/nb_NO/externalsite.lang
diff --git a/public/langs/nb_NO/ftp.lang b/htdocs/langs/nb_NO/ftp.lang
similarity index 100%
rename from public/langs/nb_NO/ftp.lang
rename to htdocs/langs/nb_NO/ftp.lang
diff --git a/public/langs/nb_NO/help.lang b/htdocs/langs/nb_NO/help.lang
similarity index 100%
rename from public/langs/nb_NO/help.lang
rename to htdocs/langs/nb_NO/help.lang
diff --git a/public/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang
similarity index 100%
rename from public/langs/nb_NO/holiday.lang
rename to htdocs/langs/nb_NO/holiday.lang
diff --git a/public/langs/nb_NO/hrm.lang b/htdocs/langs/nb_NO/hrm.lang
similarity index 100%
rename from public/langs/nb_NO/hrm.lang
rename to htdocs/langs/nb_NO/hrm.lang
diff --git a/public/langs/nb_NO/incoterm.lang b/htdocs/langs/nb_NO/incoterm.lang
similarity index 100%
rename from public/langs/nb_NO/incoterm.lang
rename to htdocs/langs/nb_NO/incoterm.lang
diff --git a/public/langs/nb_NO/install.lang b/htdocs/langs/nb_NO/install.lang
similarity index 100%
rename from public/langs/nb_NO/install.lang
rename to htdocs/langs/nb_NO/install.lang
diff --git a/public/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang
similarity index 100%
rename from public/langs/nb_NO/interventions.lang
rename to htdocs/langs/nb_NO/interventions.lang
diff --git a/public/langs/nb_NO/languages.lang b/htdocs/langs/nb_NO/languages.lang
similarity index 100%
rename from public/langs/nb_NO/languages.lang
rename to htdocs/langs/nb_NO/languages.lang
diff --git a/public/langs/nb_NO/ldap.lang b/htdocs/langs/nb_NO/ldap.lang
similarity index 100%
rename from public/langs/nb_NO/ldap.lang
rename to htdocs/langs/nb_NO/ldap.lang
diff --git a/public/langs/nb_NO/link.lang b/htdocs/langs/nb_NO/link.lang
similarity index 100%
rename from public/langs/nb_NO/link.lang
rename to htdocs/langs/nb_NO/link.lang
diff --git a/public/langs/nb_NO/loan.lang b/htdocs/langs/nb_NO/loan.lang
similarity index 100%
rename from public/langs/nb_NO/loan.lang
rename to htdocs/langs/nb_NO/loan.lang
diff --git a/public/langs/nb_NO/mailmanspip.lang b/htdocs/langs/nb_NO/mailmanspip.lang
similarity index 100%
rename from public/langs/nb_NO/mailmanspip.lang
rename to htdocs/langs/nb_NO/mailmanspip.lang
diff --git a/public/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
similarity index 100%
rename from public/langs/nb_NO/mails.lang
rename to htdocs/langs/nb_NO/mails.lang
diff --git a/public/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
similarity index 100%
rename from public/langs/nb_NO/main.lang
rename to htdocs/langs/nb_NO/main.lang
diff --git a/public/langs/nb_NO/margins.lang b/htdocs/langs/nb_NO/margins.lang
similarity index 100%
rename from public/langs/nb_NO/margins.lang
rename to htdocs/langs/nb_NO/margins.lang
diff --git a/public/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
similarity index 100%
rename from public/langs/nb_NO/members.lang
rename to htdocs/langs/nb_NO/members.lang
diff --git a/public/langs/nb_NO/oauth.lang b/htdocs/langs/nb_NO/oauth.lang
similarity index 100%
rename from public/langs/nb_NO/oauth.lang
rename to htdocs/langs/nb_NO/oauth.lang
diff --git a/public/langs/nb_NO/opensurvey.lang b/htdocs/langs/nb_NO/opensurvey.lang
similarity index 100%
rename from public/langs/nb_NO/opensurvey.lang
rename to htdocs/langs/nb_NO/opensurvey.lang
diff --git a/public/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
similarity index 100%
rename from public/langs/nb_NO/orders.lang
rename to htdocs/langs/nb_NO/orders.lang
diff --git a/public/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
similarity index 100%
rename from public/langs/nb_NO/other.lang
rename to htdocs/langs/nb_NO/other.lang
diff --git a/public/langs/nb_NO/paybox.lang b/htdocs/langs/nb_NO/paybox.lang
similarity index 100%
rename from public/langs/nb_NO/paybox.lang
rename to htdocs/langs/nb_NO/paybox.lang
diff --git a/public/langs/nb_NO/paypal.lang b/htdocs/langs/nb_NO/paypal.lang
similarity index 100%
rename from public/langs/nb_NO/paypal.lang
rename to htdocs/langs/nb_NO/paypal.lang
diff --git a/public/langs/nb_NO/printing.lang b/htdocs/langs/nb_NO/printing.lang
similarity index 100%
rename from public/langs/nb_NO/printing.lang
rename to htdocs/langs/nb_NO/printing.lang
diff --git a/public/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang
similarity index 100%
rename from public/langs/nb_NO/productbatch.lang
rename to htdocs/langs/nb_NO/productbatch.lang
diff --git a/public/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
similarity index 100%
rename from public/langs/nb_NO/products.lang
rename to htdocs/langs/nb_NO/products.lang
diff --git a/public/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
similarity index 100%
rename from public/langs/nb_NO/projects.lang
rename to htdocs/langs/nb_NO/projects.lang
diff --git a/public/langs/nb_NO/propal.lang b/htdocs/langs/nb_NO/propal.lang
similarity index 100%
rename from public/langs/nb_NO/propal.lang
rename to htdocs/langs/nb_NO/propal.lang
diff --git a/public/langs/nb_NO/receiptprinter.lang b/htdocs/langs/nb_NO/receiptprinter.lang
similarity index 100%
rename from public/langs/nb_NO/receiptprinter.lang
rename to htdocs/langs/nb_NO/receiptprinter.lang
diff --git a/public/langs/nb_NO/resource.lang b/htdocs/langs/nb_NO/resource.lang
similarity index 100%
rename from public/langs/nb_NO/resource.lang
rename to htdocs/langs/nb_NO/resource.lang
diff --git a/public/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang
similarity index 100%
rename from public/langs/nb_NO/salaries.lang
rename to htdocs/langs/nb_NO/salaries.lang
diff --git a/public/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
similarity index 100%
rename from public/langs/nb_NO/sendings.lang
rename to htdocs/langs/nb_NO/sendings.lang
diff --git a/public/langs/nb_NO/sms.lang b/htdocs/langs/nb_NO/sms.lang
similarity index 100%
rename from public/langs/nb_NO/sms.lang
rename to htdocs/langs/nb_NO/sms.lang
diff --git a/public/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
similarity index 100%
rename from public/langs/nb_NO/stocks.lang
rename to htdocs/langs/nb_NO/stocks.lang
diff --git a/public/langs/nb_NO/supplier_proposal.lang b/htdocs/langs/nb_NO/supplier_proposal.lang
similarity index 100%
rename from public/langs/nb_NO/supplier_proposal.lang
rename to htdocs/langs/nb_NO/supplier_proposal.lang
diff --git a/public/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
similarity index 100%
rename from public/langs/nb_NO/suppliers.lang
rename to htdocs/langs/nb_NO/suppliers.lang
diff --git a/public/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang
similarity index 100%
rename from public/langs/nb_NO/trips.lang
rename to htdocs/langs/nb_NO/trips.lang
diff --git a/public/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
similarity index 100%
rename from public/langs/nb_NO/users.lang
rename to htdocs/langs/nb_NO/users.lang
diff --git a/public/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
similarity index 100%
rename from public/langs/nb_NO/website.lang
rename to htdocs/langs/nb_NO/website.lang
diff --git a/public/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
similarity index 100%
rename from public/langs/nb_NO/withdrawals.lang
rename to htdocs/langs/nb_NO/withdrawals.lang
diff --git a/public/langs/nb_NO/workflow.lang b/htdocs/langs/nb_NO/workflow.lang
similarity index 100%
rename from public/langs/nb_NO/workflow.lang
rename to htdocs/langs/nb_NO/workflow.lang
diff --git a/public/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
similarity index 100%
rename from public/langs/nl_BE/accountancy.lang
rename to htdocs/langs/nl_BE/accountancy.lang
diff --git a/public/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
similarity index 100%
rename from public/langs/nl_BE/admin.lang
rename to htdocs/langs/nl_BE/admin.lang
diff --git a/public/langs/nl_BE/agenda.lang b/htdocs/langs/nl_BE/agenda.lang
similarity index 100%
rename from public/langs/nl_BE/agenda.lang
rename to htdocs/langs/nl_BE/agenda.lang
diff --git a/public/langs/nl_BE/banks.lang b/htdocs/langs/nl_BE/banks.lang
similarity index 100%
rename from public/langs/nl_BE/banks.lang
rename to htdocs/langs/nl_BE/banks.lang
diff --git a/public/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang
similarity index 100%
rename from public/langs/nl_BE/bills.lang
rename to htdocs/langs/nl_BE/bills.lang
diff --git a/public/langs/nl_BE/bookmarks.lang b/htdocs/langs/nl_BE/bookmarks.lang
similarity index 100%
rename from public/langs/nl_BE/bookmarks.lang
rename to htdocs/langs/nl_BE/bookmarks.lang
diff --git a/public/langs/nl_BE/boxes.lang b/htdocs/langs/nl_BE/boxes.lang
similarity index 100%
rename from public/langs/nl_BE/boxes.lang
rename to htdocs/langs/nl_BE/boxes.lang
diff --git a/public/langs/nl_BE/cashdesk.lang b/htdocs/langs/nl_BE/cashdesk.lang
similarity index 100%
rename from public/langs/nl_BE/cashdesk.lang
rename to htdocs/langs/nl_BE/cashdesk.lang
diff --git a/public/langs/nl_BE/categories.lang b/htdocs/langs/nl_BE/categories.lang
similarity index 100%
rename from public/langs/nl_BE/categories.lang
rename to htdocs/langs/nl_BE/categories.lang
diff --git a/public/langs/nl_BE/commercial.lang b/htdocs/langs/nl_BE/commercial.lang
similarity index 100%
rename from public/langs/nl_BE/commercial.lang
rename to htdocs/langs/nl_BE/commercial.lang
diff --git a/public/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang
similarity index 100%
rename from public/langs/nl_BE/companies.lang
rename to htdocs/langs/nl_BE/companies.lang
diff --git a/public/langs/nl_BE/compta.lang b/htdocs/langs/nl_BE/compta.lang
similarity index 100%
rename from public/langs/nl_BE/compta.lang
rename to htdocs/langs/nl_BE/compta.lang
diff --git a/public/langs/nl_BE/contracts.lang b/htdocs/langs/nl_BE/contracts.lang
similarity index 100%
rename from public/langs/nl_BE/contracts.lang
rename to htdocs/langs/nl_BE/contracts.lang
diff --git a/public/langs/nl_BE/cron.lang b/htdocs/langs/nl_BE/cron.lang
similarity index 100%
rename from public/langs/nl_BE/cron.lang
rename to htdocs/langs/nl_BE/cron.lang
diff --git a/public/langs/nl_BE/deliveries.lang b/htdocs/langs/nl_BE/deliveries.lang
similarity index 100%
rename from public/langs/nl_BE/deliveries.lang
rename to htdocs/langs/nl_BE/deliveries.lang
diff --git a/public/langs/nl_BE/dict.lang b/htdocs/langs/nl_BE/dict.lang
similarity index 100%
rename from public/langs/nl_BE/dict.lang
rename to htdocs/langs/nl_BE/dict.lang
diff --git a/public/langs/nl_BE/donations.lang b/htdocs/langs/nl_BE/donations.lang
similarity index 100%
rename from public/langs/nl_BE/donations.lang
rename to htdocs/langs/nl_BE/donations.lang
diff --git a/public/langs/nl_BE/ecm.lang b/htdocs/langs/nl_BE/ecm.lang
similarity index 100%
rename from public/langs/nl_BE/ecm.lang
rename to htdocs/langs/nl_BE/ecm.lang
diff --git a/public/langs/nl_BE/errors.lang b/htdocs/langs/nl_BE/errors.lang
similarity index 100%
rename from public/langs/nl_BE/errors.lang
rename to htdocs/langs/nl_BE/errors.lang
diff --git a/public/langs/nl_BE/exports.lang b/htdocs/langs/nl_BE/exports.lang
similarity index 100%
rename from public/langs/nl_BE/exports.lang
rename to htdocs/langs/nl_BE/exports.lang
diff --git a/public/langs/nl_BE/externalsite.lang b/htdocs/langs/nl_BE/externalsite.lang
similarity index 100%
rename from public/langs/nl_BE/externalsite.lang
rename to htdocs/langs/nl_BE/externalsite.lang
diff --git a/public/langs/nl_BE/ftp.lang b/htdocs/langs/nl_BE/ftp.lang
similarity index 100%
rename from public/langs/nl_BE/ftp.lang
rename to htdocs/langs/nl_BE/ftp.lang
diff --git a/public/langs/nl_BE/help.lang b/htdocs/langs/nl_BE/help.lang
similarity index 100%
rename from public/langs/nl_BE/help.lang
rename to htdocs/langs/nl_BE/help.lang
diff --git a/public/langs/nl_BE/holiday.lang b/htdocs/langs/nl_BE/holiday.lang
similarity index 100%
rename from public/langs/nl_BE/holiday.lang
rename to htdocs/langs/nl_BE/holiday.lang
diff --git a/public/langs/nl_BE/hrm.lang b/htdocs/langs/nl_BE/hrm.lang
similarity index 100%
rename from public/langs/nl_BE/hrm.lang
rename to htdocs/langs/nl_BE/hrm.lang
diff --git a/public/langs/nl_BE/incoterm.lang b/htdocs/langs/nl_BE/incoterm.lang
similarity index 100%
rename from public/langs/nl_BE/incoterm.lang
rename to htdocs/langs/nl_BE/incoterm.lang
diff --git a/public/langs/nl_BE/install.lang b/htdocs/langs/nl_BE/install.lang
similarity index 100%
rename from public/langs/nl_BE/install.lang
rename to htdocs/langs/nl_BE/install.lang
diff --git a/public/langs/nl_BE/interventions.lang b/htdocs/langs/nl_BE/interventions.lang
similarity index 100%
rename from public/langs/nl_BE/interventions.lang
rename to htdocs/langs/nl_BE/interventions.lang
diff --git a/public/langs/nl_BE/languages.lang b/htdocs/langs/nl_BE/languages.lang
similarity index 100%
rename from public/langs/nl_BE/languages.lang
rename to htdocs/langs/nl_BE/languages.lang
diff --git a/public/langs/nl_BE/ldap.lang b/htdocs/langs/nl_BE/ldap.lang
similarity index 100%
rename from public/langs/nl_BE/ldap.lang
rename to htdocs/langs/nl_BE/ldap.lang
diff --git a/public/langs/nl_BE/link.lang b/htdocs/langs/nl_BE/link.lang
similarity index 100%
rename from public/langs/nl_BE/link.lang
rename to htdocs/langs/nl_BE/link.lang
diff --git a/public/langs/nl_BE/loan.lang b/htdocs/langs/nl_BE/loan.lang
similarity index 100%
rename from public/langs/nl_BE/loan.lang
rename to htdocs/langs/nl_BE/loan.lang
diff --git a/public/langs/nl_BE/mailmanspip.lang b/htdocs/langs/nl_BE/mailmanspip.lang
similarity index 100%
rename from public/langs/nl_BE/mailmanspip.lang
rename to htdocs/langs/nl_BE/mailmanspip.lang
diff --git a/public/langs/nl_BE/mails.lang b/htdocs/langs/nl_BE/mails.lang
similarity index 100%
rename from public/langs/nl_BE/mails.lang
rename to htdocs/langs/nl_BE/mails.lang
diff --git a/public/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
similarity index 100%
rename from public/langs/nl_BE/main.lang
rename to htdocs/langs/nl_BE/main.lang
diff --git a/public/langs/nl_BE/margins.lang b/htdocs/langs/nl_BE/margins.lang
similarity index 100%
rename from public/langs/nl_BE/margins.lang
rename to htdocs/langs/nl_BE/margins.lang
diff --git a/public/langs/nl_BE/members.lang b/htdocs/langs/nl_BE/members.lang
similarity index 100%
rename from public/langs/nl_BE/members.lang
rename to htdocs/langs/nl_BE/members.lang
diff --git a/public/langs/nl_BE/oauth.lang b/htdocs/langs/nl_BE/oauth.lang
similarity index 100%
rename from public/langs/nl_BE/oauth.lang
rename to htdocs/langs/nl_BE/oauth.lang
diff --git a/public/langs/nl_BE/opensurvey.lang b/htdocs/langs/nl_BE/opensurvey.lang
similarity index 100%
rename from public/langs/nl_BE/opensurvey.lang
rename to htdocs/langs/nl_BE/opensurvey.lang
diff --git a/public/langs/nl_BE/orders.lang b/htdocs/langs/nl_BE/orders.lang
similarity index 100%
rename from public/langs/nl_BE/orders.lang
rename to htdocs/langs/nl_BE/orders.lang
diff --git a/public/langs/nl_BE/other.lang b/htdocs/langs/nl_BE/other.lang
similarity index 100%
rename from public/langs/nl_BE/other.lang
rename to htdocs/langs/nl_BE/other.lang
diff --git a/public/langs/nl_BE/paybox.lang b/htdocs/langs/nl_BE/paybox.lang
similarity index 100%
rename from public/langs/nl_BE/paybox.lang
rename to htdocs/langs/nl_BE/paybox.lang
diff --git a/public/langs/nl_BE/paypal.lang b/htdocs/langs/nl_BE/paypal.lang
similarity index 100%
rename from public/langs/nl_BE/paypal.lang
rename to htdocs/langs/nl_BE/paypal.lang
diff --git a/public/langs/nl_BE/printing.lang b/htdocs/langs/nl_BE/printing.lang
similarity index 100%
rename from public/langs/nl_BE/printing.lang
rename to htdocs/langs/nl_BE/printing.lang
diff --git a/public/langs/nl_BE/productbatch.lang b/htdocs/langs/nl_BE/productbatch.lang
similarity index 100%
rename from public/langs/nl_BE/productbatch.lang
rename to htdocs/langs/nl_BE/productbatch.lang
diff --git a/public/langs/nl_BE/products.lang b/htdocs/langs/nl_BE/products.lang
similarity index 100%
rename from public/langs/nl_BE/products.lang
rename to htdocs/langs/nl_BE/products.lang
diff --git a/public/langs/nl_BE/projects.lang b/htdocs/langs/nl_BE/projects.lang
similarity index 100%
rename from public/langs/nl_BE/projects.lang
rename to htdocs/langs/nl_BE/projects.lang
diff --git a/public/langs/nl_BE/propal.lang b/htdocs/langs/nl_BE/propal.lang
similarity index 100%
rename from public/langs/nl_BE/propal.lang
rename to htdocs/langs/nl_BE/propal.lang
diff --git a/public/langs/nl_BE/receiptprinter.lang b/htdocs/langs/nl_BE/receiptprinter.lang
similarity index 100%
rename from public/langs/nl_BE/receiptprinter.lang
rename to htdocs/langs/nl_BE/receiptprinter.lang
diff --git a/public/langs/nl_BE/resource.lang b/htdocs/langs/nl_BE/resource.lang
similarity index 100%
rename from public/langs/nl_BE/resource.lang
rename to htdocs/langs/nl_BE/resource.lang
diff --git a/public/langs/nl_BE/salaries.lang b/htdocs/langs/nl_BE/salaries.lang
similarity index 100%
rename from public/langs/nl_BE/salaries.lang
rename to htdocs/langs/nl_BE/salaries.lang
diff --git a/public/langs/nl_BE/sendings.lang b/htdocs/langs/nl_BE/sendings.lang
similarity index 100%
rename from public/langs/nl_BE/sendings.lang
rename to htdocs/langs/nl_BE/sendings.lang
diff --git a/public/langs/nl_BE/sms.lang b/htdocs/langs/nl_BE/sms.lang
similarity index 100%
rename from public/langs/nl_BE/sms.lang
rename to htdocs/langs/nl_BE/sms.lang
diff --git a/public/langs/nl_BE/stocks.lang b/htdocs/langs/nl_BE/stocks.lang
similarity index 100%
rename from public/langs/nl_BE/stocks.lang
rename to htdocs/langs/nl_BE/stocks.lang
diff --git a/public/langs/nl_BE/supplier_proposal.lang b/htdocs/langs/nl_BE/supplier_proposal.lang
similarity index 100%
rename from public/langs/nl_BE/supplier_proposal.lang
rename to htdocs/langs/nl_BE/supplier_proposal.lang
diff --git a/public/langs/nl_BE/suppliers.lang b/htdocs/langs/nl_BE/suppliers.lang
similarity index 100%
rename from public/langs/nl_BE/suppliers.lang
rename to htdocs/langs/nl_BE/suppliers.lang
diff --git a/public/langs/nl_BE/trips.lang b/htdocs/langs/nl_BE/trips.lang
similarity index 100%
rename from public/langs/nl_BE/trips.lang
rename to htdocs/langs/nl_BE/trips.lang
diff --git a/public/langs/nl_BE/users.lang b/htdocs/langs/nl_BE/users.lang
similarity index 100%
rename from public/langs/nl_BE/users.lang
rename to htdocs/langs/nl_BE/users.lang
diff --git a/public/langs/nl_BE/website.lang b/htdocs/langs/nl_BE/website.lang
similarity index 100%
rename from public/langs/nl_BE/website.lang
rename to htdocs/langs/nl_BE/website.lang
diff --git a/public/langs/nl_BE/withdrawals.lang b/htdocs/langs/nl_BE/withdrawals.lang
similarity index 100%
rename from public/langs/nl_BE/withdrawals.lang
rename to htdocs/langs/nl_BE/withdrawals.lang
diff --git a/public/langs/nl_BE/workflow.lang b/htdocs/langs/nl_BE/workflow.lang
similarity index 100%
rename from public/langs/nl_BE/workflow.lang
rename to htdocs/langs/nl_BE/workflow.lang
diff --git a/public/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
similarity index 100%
rename from public/langs/nl_NL/accountancy.lang
rename to htdocs/langs/nl_NL/accountancy.lang
diff --git a/public/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
similarity index 100%
rename from public/langs/nl_NL/admin.lang
rename to htdocs/langs/nl_NL/admin.lang
diff --git a/public/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
similarity index 100%
rename from public/langs/nl_NL/agenda.lang
rename to htdocs/langs/nl_NL/agenda.lang
diff --git a/public/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
similarity index 100%
rename from public/langs/nl_NL/banks.lang
rename to htdocs/langs/nl_NL/banks.lang
diff --git a/public/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
similarity index 100%
rename from public/langs/nl_NL/bills.lang
rename to htdocs/langs/nl_NL/bills.lang
diff --git a/public/langs/nl_NL/bookmarks.lang b/htdocs/langs/nl_NL/bookmarks.lang
similarity index 100%
rename from public/langs/nl_NL/bookmarks.lang
rename to htdocs/langs/nl_NL/bookmarks.lang
diff --git a/public/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang
similarity index 100%
rename from public/langs/nl_NL/boxes.lang
rename to htdocs/langs/nl_NL/boxes.lang
diff --git a/public/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
similarity index 100%
rename from public/langs/nl_NL/cashdesk.lang
rename to htdocs/langs/nl_NL/cashdesk.lang
diff --git a/public/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
similarity index 100%
rename from public/langs/nl_NL/categories.lang
rename to htdocs/langs/nl_NL/categories.lang
diff --git a/public/langs/nl_NL/commercial.lang b/htdocs/langs/nl_NL/commercial.lang
similarity index 100%
rename from public/langs/nl_NL/commercial.lang
rename to htdocs/langs/nl_NL/commercial.lang
diff --git a/public/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
similarity index 100%
rename from public/langs/nl_NL/companies.lang
rename to htdocs/langs/nl_NL/companies.lang
diff --git a/public/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
similarity index 100%
rename from public/langs/nl_NL/compta.lang
rename to htdocs/langs/nl_NL/compta.lang
diff --git a/public/langs/nl_NL/contracts.lang b/htdocs/langs/nl_NL/contracts.lang
similarity index 100%
rename from public/langs/nl_NL/contracts.lang
rename to htdocs/langs/nl_NL/contracts.lang
diff --git a/public/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
similarity index 100%
rename from public/langs/nl_NL/cron.lang
rename to htdocs/langs/nl_NL/cron.lang
diff --git a/public/langs/nl_NL/deliveries.lang b/htdocs/langs/nl_NL/deliveries.lang
similarity index 100%
rename from public/langs/nl_NL/deliveries.lang
rename to htdocs/langs/nl_NL/deliveries.lang
diff --git a/public/langs/nl_NL/dict.lang b/htdocs/langs/nl_NL/dict.lang
similarity index 100%
rename from public/langs/nl_NL/dict.lang
rename to htdocs/langs/nl_NL/dict.lang
diff --git a/public/langs/nl_NL/donations.lang b/htdocs/langs/nl_NL/donations.lang
similarity index 100%
rename from public/langs/nl_NL/donations.lang
rename to htdocs/langs/nl_NL/donations.lang
diff --git a/public/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang
similarity index 100%
rename from public/langs/nl_NL/ecm.lang
rename to htdocs/langs/nl_NL/ecm.lang
diff --git a/public/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
similarity index 100%
rename from public/langs/nl_NL/errors.lang
rename to htdocs/langs/nl_NL/errors.lang
diff --git a/public/langs/nl_NL/exports.lang b/htdocs/langs/nl_NL/exports.lang
similarity index 100%
rename from public/langs/nl_NL/exports.lang
rename to htdocs/langs/nl_NL/exports.lang
diff --git a/public/langs/nl_NL/externalsite.lang b/htdocs/langs/nl_NL/externalsite.lang
similarity index 100%
rename from public/langs/nl_NL/externalsite.lang
rename to htdocs/langs/nl_NL/externalsite.lang
diff --git a/public/langs/nl_NL/ftp.lang b/htdocs/langs/nl_NL/ftp.lang
similarity index 100%
rename from public/langs/nl_NL/ftp.lang
rename to htdocs/langs/nl_NL/ftp.lang
diff --git a/public/langs/nl_NL/help.lang b/htdocs/langs/nl_NL/help.lang
similarity index 100%
rename from public/langs/nl_NL/help.lang
rename to htdocs/langs/nl_NL/help.lang
diff --git a/public/langs/nl_NL/holiday.lang b/htdocs/langs/nl_NL/holiday.lang
similarity index 100%
rename from public/langs/nl_NL/holiday.lang
rename to htdocs/langs/nl_NL/holiday.lang
diff --git a/public/langs/nl_NL/hrm.lang b/htdocs/langs/nl_NL/hrm.lang
similarity index 100%
rename from public/langs/nl_NL/hrm.lang
rename to htdocs/langs/nl_NL/hrm.lang
diff --git a/public/langs/nl_NL/incoterm.lang b/htdocs/langs/nl_NL/incoterm.lang
similarity index 100%
rename from public/langs/nl_NL/incoterm.lang
rename to htdocs/langs/nl_NL/incoterm.lang
diff --git a/public/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang
similarity index 100%
rename from public/langs/nl_NL/install.lang
rename to htdocs/langs/nl_NL/install.lang
diff --git a/public/langs/nl_NL/interventions.lang b/htdocs/langs/nl_NL/interventions.lang
similarity index 100%
rename from public/langs/nl_NL/interventions.lang
rename to htdocs/langs/nl_NL/interventions.lang
diff --git a/public/langs/nl_NL/languages.lang b/htdocs/langs/nl_NL/languages.lang
similarity index 100%
rename from public/langs/nl_NL/languages.lang
rename to htdocs/langs/nl_NL/languages.lang
diff --git a/public/langs/nl_NL/ldap.lang b/htdocs/langs/nl_NL/ldap.lang
similarity index 100%
rename from public/langs/nl_NL/ldap.lang
rename to htdocs/langs/nl_NL/ldap.lang
diff --git a/public/langs/nl_NL/link.lang b/htdocs/langs/nl_NL/link.lang
similarity index 100%
rename from public/langs/nl_NL/link.lang
rename to htdocs/langs/nl_NL/link.lang
diff --git a/public/langs/nl_NL/loan.lang b/htdocs/langs/nl_NL/loan.lang
similarity index 100%
rename from public/langs/nl_NL/loan.lang
rename to htdocs/langs/nl_NL/loan.lang
diff --git a/public/langs/nl_NL/mailmanspip.lang b/htdocs/langs/nl_NL/mailmanspip.lang
similarity index 100%
rename from public/langs/nl_NL/mailmanspip.lang
rename to htdocs/langs/nl_NL/mailmanspip.lang
diff --git a/public/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
similarity index 100%
rename from public/langs/nl_NL/mails.lang
rename to htdocs/langs/nl_NL/mails.lang
diff --git a/public/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
similarity index 100%
rename from public/langs/nl_NL/main.lang
rename to htdocs/langs/nl_NL/main.lang
diff --git a/public/langs/nl_NL/margins.lang b/htdocs/langs/nl_NL/margins.lang
similarity index 100%
rename from public/langs/nl_NL/margins.lang
rename to htdocs/langs/nl_NL/margins.lang
diff --git a/public/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
similarity index 100%
rename from public/langs/nl_NL/members.lang
rename to htdocs/langs/nl_NL/members.lang
diff --git a/public/langs/nl_NL/oauth.lang b/htdocs/langs/nl_NL/oauth.lang
similarity index 100%
rename from public/langs/nl_NL/oauth.lang
rename to htdocs/langs/nl_NL/oauth.lang
diff --git a/public/langs/nl_NL/opensurvey.lang b/htdocs/langs/nl_NL/opensurvey.lang
similarity index 100%
rename from public/langs/nl_NL/opensurvey.lang
rename to htdocs/langs/nl_NL/opensurvey.lang
diff --git a/public/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
similarity index 100%
rename from public/langs/nl_NL/orders.lang
rename to htdocs/langs/nl_NL/orders.lang
diff --git a/public/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
similarity index 100%
rename from public/langs/nl_NL/other.lang
rename to htdocs/langs/nl_NL/other.lang
diff --git a/public/langs/nl_NL/paybox.lang b/htdocs/langs/nl_NL/paybox.lang
similarity index 100%
rename from public/langs/nl_NL/paybox.lang
rename to htdocs/langs/nl_NL/paybox.lang
diff --git a/public/langs/nl_NL/paypal.lang b/htdocs/langs/nl_NL/paypal.lang
similarity index 100%
rename from public/langs/nl_NL/paypal.lang
rename to htdocs/langs/nl_NL/paypal.lang
diff --git a/public/langs/nl_NL/printing.lang b/htdocs/langs/nl_NL/printing.lang
similarity index 100%
rename from public/langs/nl_NL/printing.lang
rename to htdocs/langs/nl_NL/printing.lang
diff --git a/public/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang
similarity index 100%
rename from public/langs/nl_NL/productbatch.lang
rename to htdocs/langs/nl_NL/productbatch.lang
diff --git a/public/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
similarity index 100%
rename from public/langs/nl_NL/products.lang
rename to htdocs/langs/nl_NL/products.lang
diff --git a/public/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
similarity index 100%
rename from public/langs/nl_NL/projects.lang
rename to htdocs/langs/nl_NL/projects.lang
diff --git a/public/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang
similarity index 100%
rename from public/langs/nl_NL/propal.lang
rename to htdocs/langs/nl_NL/propal.lang
diff --git a/public/langs/nl_NL/receiptprinter.lang b/htdocs/langs/nl_NL/receiptprinter.lang
similarity index 100%
rename from public/langs/nl_NL/receiptprinter.lang
rename to htdocs/langs/nl_NL/receiptprinter.lang
diff --git a/public/langs/nl_NL/resource.lang b/htdocs/langs/nl_NL/resource.lang
similarity index 100%
rename from public/langs/nl_NL/resource.lang
rename to htdocs/langs/nl_NL/resource.lang
diff --git a/public/langs/nl_NL/salaries.lang b/htdocs/langs/nl_NL/salaries.lang
similarity index 100%
rename from public/langs/nl_NL/salaries.lang
rename to htdocs/langs/nl_NL/salaries.lang
diff --git a/public/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
similarity index 100%
rename from public/langs/nl_NL/sendings.lang
rename to htdocs/langs/nl_NL/sendings.lang
diff --git a/public/langs/nl_NL/sms.lang b/htdocs/langs/nl_NL/sms.lang
similarity index 100%
rename from public/langs/nl_NL/sms.lang
rename to htdocs/langs/nl_NL/sms.lang
diff --git a/public/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
similarity index 100%
rename from public/langs/nl_NL/stocks.lang
rename to htdocs/langs/nl_NL/stocks.lang
diff --git a/public/langs/nl_NL/supplier_proposal.lang b/htdocs/langs/nl_NL/supplier_proposal.lang
similarity index 100%
rename from public/langs/nl_NL/supplier_proposal.lang
rename to htdocs/langs/nl_NL/supplier_proposal.lang
diff --git a/public/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
similarity index 100%
rename from public/langs/nl_NL/suppliers.lang
rename to htdocs/langs/nl_NL/suppliers.lang
diff --git a/public/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang
similarity index 100%
rename from public/langs/nl_NL/trips.lang
rename to htdocs/langs/nl_NL/trips.lang
diff --git a/public/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
similarity index 100%
rename from public/langs/nl_NL/users.lang
rename to htdocs/langs/nl_NL/users.lang
diff --git a/public/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
similarity index 100%
rename from public/langs/nl_NL/website.lang
rename to htdocs/langs/nl_NL/website.lang
diff --git a/public/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
similarity index 100%
rename from public/langs/nl_NL/withdrawals.lang
rename to htdocs/langs/nl_NL/withdrawals.lang
diff --git a/public/langs/nl_NL/workflow.lang b/htdocs/langs/nl_NL/workflow.lang
similarity index 100%
rename from public/langs/nl_NL/workflow.lang
rename to htdocs/langs/nl_NL/workflow.lang
diff --git a/public/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
similarity index 100%
rename from public/langs/pl_PL/accountancy.lang
rename to htdocs/langs/pl_PL/accountancy.lang
diff --git a/public/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
similarity index 100%
rename from public/langs/pl_PL/admin.lang
rename to htdocs/langs/pl_PL/admin.lang
diff --git a/public/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang
similarity index 100%
rename from public/langs/pl_PL/agenda.lang
rename to htdocs/langs/pl_PL/agenda.lang
diff --git a/public/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
similarity index 100%
rename from public/langs/pl_PL/banks.lang
rename to htdocs/langs/pl_PL/banks.lang
diff --git a/public/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
similarity index 100%
rename from public/langs/pl_PL/bills.lang
rename to htdocs/langs/pl_PL/bills.lang
diff --git a/public/langs/pl_PL/bookmarks.lang b/htdocs/langs/pl_PL/bookmarks.lang
similarity index 100%
rename from public/langs/pl_PL/bookmarks.lang
rename to htdocs/langs/pl_PL/bookmarks.lang
diff --git a/public/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
similarity index 100%
rename from public/langs/pl_PL/boxes.lang
rename to htdocs/langs/pl_PL/boxes.lang
diff --git a/public/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
similarity index 100%
rename from public/langs/pl_PL/cashdesk.lang
rename to htdocs/langs/pl_PL/cashdesk.lang
diff --git a/public/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
similarity index 100%
rename from public/langs/pl_PL/categories.lang
rename to htdocs/langs/pl_PL/categories.lang
diff --git a/public/langs/pl_PL/commercial.lang b/htdocs/langs/pl_PL/commercial.lang
similarity index 100%
rename from public/langs/pl_PL/commercial.lang
rename to htdocs/langs/pl_PL/commercial.lang
diff --git a/public/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
similarity index 100%
rename from public/langs/pl_PL/companies.lang
rename to htdocs/langs/pl_PL/companies.lang
diff --git a/public/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
similarity index 100%
rename from public/langs/pl_PL/compta.lang
rename to htdocs/langs/pl_PL/compta.lang
diff --git a/public/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang
similarity index 100%
rename from public/langs/pl_PL/contracts.lang
rename to htdocs/langs/pl_PL/contracts.lang
diff --git a/public/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang
similarity index 100%
rename from public/langs/pl_PL/cron.lang
rename to htdocs/langs/pl_PL/cron.lang
diff --git a/public/langs/pl_PL/deliveries.lang b/htdocs/langs/pl_PL/deliveries.lang
similarity index 100%
rename from public/langs/pl_PL/deliveries.lang
rename to htdocs/langs/pl_PL/deliveries.lang
diff --git a/public/langs/pl_PL/dict.lang b/htdocs/langs/pl_PL/dict.lang
similarity index 100%
rename from public/langs/pl_PL/dict.lang
rename to htdocs/langs/pl_PL/dict.lang
diff --git a/public/langs/pl_PL/donations.lang b/htdocs/langs/pl_PL/donations.lang
similarity index 100%
rename from public/langs/pl_PL/donations.lang
rename to htdocs/langs/pl_PL/donations.lang
diff --git a/public/langs/pl_PL/ecm.lang b/htdocs/langs/pl_PL/ecm.lang
similarity index 100%
rename from public/langs/pl_PL/ecm.lang
rename to htdocs/langs/pl_PL/ecm.lang
diff --git a/public/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
similarity index 100%
rename from public/langs/pl_PL/errors.lang
rename to htdocs/langs/pl_PL/errors.lang
diff --git a/public/langs/pl_PL/exports.lang b/htdocs/langs/pl_PL/exports.lang
similarity index 100%
rename from public/langs/pl_PL/exports.lang
rename to htdocs/langs/pl_PL/exports.lang
diff --git a/public/langs/pl_PL/externalsite.lang b/htdocs/langs/pl_PL/externalsite.lang
similarity index 100%
rename from public/langs/pl_PL/externalsite.lang
rename to htdocs/langs/pl_PL/externalsite.lang
diff --git a/public/langs/pl_PL/ftp.lang b/htdocs/langs/pl_PL/ftp.lang
similarity index 100%
rename from public/langs/pl_PL/ftp.lang
rename to htdocs/langs/pl_PL/ftp.lang
diff --git a/public/langs/pl_PL/help.lang b/htdocs/langs/pl_PL/help.lang
similarity index 100%
rename from public/langs/pl_PL/help.lang
rename to htdocs/langs/pl_PL/help.lang
diff --git a/public/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
similarity index 100%
rename from public/langs/pl_PL/holiday.lang
rename to htdocs/langs/pl_PL/holiday.lang
diff --git a/public/langs/pl_PL/hrm.lang b/htdocs/langs/pl_PL/hrm.lang
similarity index 100%
rename from public/langs/pl_PL/hrm.lang
rename to htdocs/langs/pl_PL/hrm.lang
diff --git a/public/langs/pl_PL/incoterm.lang b/htdocs/langs/pl_PL/incoterm.lang
similarity index 100%
rename from public/langs/pl_PL/incoterm.lang
rename to htdocs/langs/pl_PL/incoterm.lang
diff --git a/public/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang
similarity index 100%
rename from public/langs/pl_PL/install.lang
rename to htdocs/langs/pl_PL/install.lang
diff --git a/public/langs/pl_PL/interventions.lang b/htdocs/langs/pl_PL/interventions.lang
similarity index 100%
rename from public/langs/pl_PL/interventions.lang
rename to htdocs/langs/pl_PL/interventions.lang
diff --git a/public/langs/pl_PL/languages.lang b/htdocs/langs/pl_PL/languages.lang
similarity index 100%
rename from public/langs/pl_PL/languages.lang
rename to htdocs/langs/pl_PL/languages.lang
diff --git a/public/langs/pl_PL/ldap.lang b/htdocs/langs/pl_PL/ldap.lang
similarity index 100%
rename from public/langs/pl_PL/ldap.lang
rename to htdocs/langs/pl_PL/ldap.lang
diff --git a/public/langs/pl_PL/link.lang b/htdocs/langs/pl_PL/link.lang
similarity index 100%
rename from public/langs/pl_PL/link.lang
rename to htdocs/langs/pl_PL/link.lang
diff --git a/public/langs/pl_PL/loan.lang b/htdocs/langs/pl_PL/loan.lang
similarity index 100%
rename from public/langs/pl_PL/loan.lang
rename to htdocs/langs/pl_PL/loan.lang
diff --git a/public/langs/pl_PL/mailmanspip.lang b/htdocs/langs/pl_PL/mailmanspip.lang
similarity index 100%
rename from public/langs/pl_PL/mailmanspip.lang
rename to htdocs/langs/pl_PL/mailmanspip.lang
diff --git a/public/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
similarity index 100%
rename from public/langs/pl_PL/mails.lang
rename to htdocs/langs/pl_PL/mails.lang
diff --git a/public/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
similarity index 100%
rename from public/langs/pl_PL/main.lang
rename to htdocs/langs/pl_PL/main.lang
diff --git a/public/langs/pl_PL/margins.lang b/htdocs/langs/pl_PL/margins.lang
similarity index 100%
rename from public/langs/pl_PL/margins.lang
rename to htdocs/langs/pl_PL/margins.lang
diff --git a/public/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
similarity index 100%
rename from public/langs/pl_PL/members.lang
rename to htdocs/langs/pl_PL/members.lang
diff --git a/public/langs/pl_PL/oauth.lang b/htdocs/langs/pl_PL/oauth.lang
similarity index 100%
rename from public/langs/pl_PL/oauth.lang
rename to htdocs/langs/pl_PL/oauth.lang
diff --git a/public/langs/pl_PL/opensurvey.lang b/htdocs/langs/pl_PL/opensurvey.lang
similarity index 100%
rename from public/langs/pl_PL/opensurvey.lang
rename to htdocs/langs/pl_PL/opensurvey.lang
diff --git a/public/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang
similarity index 100%
rename from public/langs/pl_PL/orders.lang
rename to htdocs/langs/pl_PL/orders.lang
diff --git a/public/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
similarity index 100%
rename from public/langs/pl_PL/other.lang
rename to htdocs/langs/pl_PL/other.lang
diff --git a/public/langs/pl_PL/paybox.lang b/htdocs/langs/pl_PL/paybox.lang
similarity index 100%
rename from public/langs/pl_PL/paybox.lang
rename to htdocs/langs/pl_PL/paybox.lang
diff --git a/public/langs/pl_PL/paypal.lang b/htdocs/langs/pl_PL/paypal.lang
similarity index 100%
rename from public/langs/pl_PL/paypal.lang
rename to htdocs/langs/pl_PL/paypal.lang
diff --git a/public/langs/pl_PL/printing.lang b/htdocs/langs/pl_PL/printing.lang
similarity index 100%
rename from public/langs/pl_PL/printing.lang
rename to htdocs/langs/pl_PL/printing.lang
diff --git a/public/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang
similarity index 100%
rename from public/langs/pl_PL/productbatch.lang
rename to htdocs/langs/pl_PL/productbatch.lang
diff --git a/public/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
similarity index 100%
rename from public/langs/pl_PL/products.lang
rename to htdocs/langs/pl_PL/products.lang
diff --git a/public/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
similarity index 100%
rename from public/langs/pl_PL/projects.lang
rename to htdocs/langs/pl_PL/projects.lang
diff --git a/public/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang
similarity index 100%
rename from public/langs/pl_PL/propal.lang
rename to htdocs/langs/pl_PL/propal.lang
diff --git a/public/langs/pl_PL/receiptprinter.lang b/htdocs/langs/pl_PL/receiptprinter.lang
similarity index 100%
rename from public/langs/pl_PL/receiptprinter.lang
rename to htdocs/langs/pl_PL/receiptprinter.lang
diff --git a/public/langs/pl_PL/resource.lang b/htdocs/langs/pl_PL/resource.lang
similarity index 100%
rename from public/langs/pl_PL/resource.lang
rename to htdocs/langs/pl_PL/resource.lang
diff --git a/public/langs/pl_PL/salaries.lang b/htdocs/langs/pl_PL/salaries.lang
similarity index 100%
rename from public/langs/pl_PL/salaries.lang
rename to htdocs/langs/pl_PL/salaries.lang
diff --git a/public/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang
similarity index 100%
rename from public/langs/pl_PL/sendings.lang
rename to htdocs/langs/pl_PL/sendings.lang
diff --git a/public/langs/pl_PL/sms.lang b/htdocs/langs/pl_PL/sms.lang
similarity index 100%
rename from public/langs/pl_PL/sms.lang
rename to htdocs/langs/pl_PL/sms.lang
diff --git a/public/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
similarity index 100%
rename from public/langs/pl_PL/stocks.lang
rename to htdocs/langs/pl_PL/stocks.lang
diff --git a/public/langs/pl_PL/supplier_proposal.lang b/htdocs/langs/pl_PL/supplier_proposal.lang
similarity index 100%
rename from public/langs/pl_PL/supplier_proposal.lang
rename to htdocs/langs/pl_PL/supplier_proposal.lang
diff --git a/public/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang
similarity index 100%
rename from public/langs/pl_PL/suppliers.lang
rename to htdocs/langs/pl_PL/suppliers.lang
diff --git a/public/langs/pl_PL/trips.lang b/htdocs/langs/pl_PL/trips.lang
similarity index 100%
rename from public/langs/pl_PL/trips.lang
rename to htdocs/langs/pl_PL/trips.lang
diff --git a/public/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
similarity index 100%
rename from public/langs/pl_PL/users.lang
rename to htdocs/langs/pl_PL/users.lang
diff --git a/public/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
similarity index 100%
rename from public/langs/pl_PL/website.lang
rename to htdocs/langs/pl_PL/website.lang
diff --git a/public/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
similarity index 100%
rename from public/langs/pl_PL/withdrawals.lang
rename to htdocs/langs/pl_PL/withdrawals.lang
diff --git a/public/langs/pl_PL/workflow.lang b/htdocs/langs/pl_PL/workflow.lang
similarity index 100%
rename from public/langs/pl_PL/workflow.lang
rename to htdocs/langs/pl_PL/workflow.lang
diff --git a/public/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
similarity index 100%
rename from public/langs/pt_BR/accountancy.lang
rename to htdocs/langs/pt_BR/accountancy.lang
diff --git a/public/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
similarity index 100%
rename from public/langs/pt_BR/admin.lang
rename to htdocs/langs/pt_BR/admin.lang
diff --git a/public/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
similarity index 100%
rename from public/langs/pt_BR/agenda.lang
rename to htdocs/langs/pt_BR/agenda.lang
diff --git a/public/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
similarity index 100%
rename from public/langs/pt_BR/banks.lang
rename to htdocs/langs/pt_BR/banks.lang
diff --git a/public/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
similarity index 100%
rename from public/langs/pt_BR/bills.lang
rename to htdocs/langs/pt_BR/bills.lang
diff --git a/public/langs/pt_BR/bookmarks.lang b/htdocs/langs/pt_BR/bookmarks.lang
similarity index 100%
rename from public/langs/pt_BR/bookmarks.lang
rename to htdocs/langs/pt_BR/bookmarks.lang
diff --git a/public/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
similarity index 100%
rename from public/langs/pt_BR/boxes.lang
rename to htdocs/langs/pt_BR/boxes.lang
diff --git a/public/langs/pt_BR/cashdesk.lang b/htdocs/langs/pt_BR/cashdesk.lang
similarity index 100%
rename from public/langs/pt_BR/cashdesk.lang
rename to htdocs/langs/pt_BR/cashdesk.lang
diff --git a/public/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
similarity index 100%
rename from public/langs/pt_BR/categories.lang
rename to htdocs/langs/pt_BR/categories.lang
diff --git a/public/langs/pt_BR/commercial.lang b/htdocs/langs/pt_BR/commercial.lang
similarity index 100%
rename from public/langs/pt_BR/commercial.lang
rename to htdocs/langs/pt_BR/commercial.lang
diff --git a/public/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
similarity index 100%
rename from public/langs/pt_BR/companies.lang
rename to htdocs/langs/pt_BR/companies.lang
diff --git a/public/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
similarity index 100%
rename from public/langs/pt_BR/compta.lang
rename to htdocs/langs/pt_BR/compta.lang
diff --git a/public/langs/pt_BR/contracts.lang b/htdocs/langs/pt_BR/contracts.lang
similarity index 100%
rename from public/langs/pt_BR/contracts.lang
rename to htdocs/langs/pt_BR/contracts.lang
diff --git a/public/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
similarity index 100%
rename from public/langs/pt_BR/cron.lang
rename to htdocs/langs/pt_BR/cron.lang
diff --git a/public/langs/pt_BR/deliveries.lang b/htdocs/langs/pt_BR/deliveries.lang
similarity index 100%
rename from public/langs/pt_BR/deliveries.lang
rename to htdocs/langs/pt_BR/deliveries.lang
diff --git a/public/langs/pt_BR/dict.lang b/htdocs/langs/pt_BR/dict.lang
similarity index 100%
rename from public/langs/pt_BR/dict.lang
rename to htdocs/langs/pt_BR/dict.lang
diff --git a/public/langs/pt_BR/donations.lang b/htdocs/langs/pt_BR/donations.lang
similarity index 100%
rename from public/langs/pt_BR/donations.lang
rename to htdocs/langs/pt_BR/donations.lang
diff --git a/public/langs/pt_BR/ecm.lang b/htdocs/langs/pt_BR/ecm.lang
similarity index 100%
rename from public/langs/pt_BR/ecm.lang
rename to htdocs/langs/pt_BR/ecm.lang
diff --git a/public/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
similarity index 100%
rename from public/langs/pt_BR/errors.lang
rename to htdocs/langs/pt_BR/errors.lang
diff --git a/public/langs/pt_BR/exports.lang b/htdocs/langs/pt_BR/exports.lang
similarity index 100%
rename from public/langs/pt_BR/exports.lang
rename to htdocs/langs/pt_BR/exports.lang
diff --git a/public/langs/pt_BR/externalsite.lang b/htdocs/langs/pt_BR/externalsite.lang
similarity index 100%
rename from public/langs/pt_BR/externalsite.lang
rename to htdocs/langs/pt_BR/externalsite.lang
diff --git a/public/langs/pt_BR/ftp.lang b/htdocs/langs/pt_BR/ftp.lang
similarity index 100%
rename from public/langs/pt_BR/ftp.lang
rename to htdocs/langs/pt_BR/ftp.lang
diff --git a/public/langs/pt_BR/help.lang b/htdocs/langs/pt_BR/help.lang
similarity index 100%
rename from public/langs/pt_BR/help.lang
rename to htdocs/langs/pt_BR/help.lang
diff --git a/public/langs/pt_BR/holiday.lang b/htdocs/langs/pt_BR/holiday.lang
similarity index 100%
rename from public/langs/pt_BR/holiday.lang
rename to htdocs/langs/pt_BR/holiday.lang
diff --git a/public/langs/pt_BR/hrm.lang b/htdocs/langs/pt_BR/hrm.lang
similarity index 100%
rename from public/langs/pt_BR/hrm.lang
rename to htdocs/langs/pt_BR/hrm.lang
diff --git a/public/langs/pt_BR/incoterm.lang b/htdocs/langs/pt_BR/incoterm.lang
similarity index 100%
rename from public/langs/pt_BR/incoterm.lang
rename to htdocs/langs/pt_BR/incoterm.lang
diff --git a/public/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang
similarity index 100%
rename from public/langs/pt_BR/install.lang
rename to htdocs/langs/pt_BR/install.lang
diff --git a/public/langs/pt_BR/interventions.lang b/htdocs/langs/pt_BR/interventions.lang
similarity index 100%
rename from public/langs/pt_BR/interventions.lang
rename to htdocs/langs/pt_BR/interventions.lang
diff --git a/public/langs/pt_BR/languages.lang b/htdocs/langs/pt_BR/languages.lang
similarity index 100%
rename from public/langs/pt_BR/languages.lang
rename to htdocs/langs/pt_BR/languages.lang
diff --git a/public/langs/pt_BR/ldap.lang b/htdocs/langs/pt_BR/ldap.lang
similarity index 100%
rename from public/langs/pt_BR/ldap.lang
rename to htdocs/langs/pt_BR/ldap.lang
diff --git a/public/langs/pt_BR/link.lang b/htdocs/langs/pt_BR/link.lang
similarity index 100%
rename from public/langs/pt_BR/link.lang
rename to htdocs/langs/pt_BR/link.lang
diff --git a/public/langs/pt_BR/loan.lang b/htdocs/langs/pt_BR/loan.lang
similarity index 100%
rename from public/langs/pt_BR/loan.lang
rename to htdocs/langs/pt_BR/loan.lang
diff --git a/public/langs/pt_BR/mailmanspip.lang b/htdocs/langs/pt_BR/mailmanspip.lang
similarity index 100%
rename from public/langs/pt_BR/mailmanspip.lang
rename to htdocs/langs/pt_BR/mailmanspip.lang
diff --git a/public/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
similarity index 100%
rename from public/langs/pt_BR/mails.lang
rename to htdocs/langs/pt_BR/mails.lang
diff --git a/public/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
similarity index 100%
rename from public/langs/pt_BR/main.lang
rename to htdocs/langs/pt_BR/main.lang
diff --git a/public/langs/pt_BR/margins.lang b/htdocs/langs/pt_BR/margins.lang
similarity index 100%
rename from public/langs/pt_BR/margins.lang
rename to htdocs/langs/pt_BR/margins.lang
diff --git a/public/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang
similarity index 100%
rename from public/langs/pt_BR/members.lang
rename to htdocs/langs/pt_BR/members.lang
diff --git a/public/langs/pt_BR/oauth.lang b/htdocs/langs/pt_BR/oauth.lang
similarity index 100%
rename from public/langs/pt_BR/oauth.lang
rename to htdocs/langs/pt_BR/oauth.lang
diff --git a/public/langs/pt_BR/opensurvey.lang b/htdocs/langs/pt_BR/opensurvey.lang
similarity index 100%
rename from public/langs/pt_BR/opensurvey.lang
rename to htdocs/langs/pt_BR/opensurvey.lang
diff --git a/public/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
similarity index 100%
rename from public/langs/pt_BR/orders.lang
rename to htdocs/langs/pt_BR/orders.lang
diff --git a/public/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
similarity index 100%
rename from public/langs/pt_BR/other.lang
rename to htdocs/langs/pt_BR/other.lang
diff --git a/public/langs/pt_BR/paybox.lang b/htdocs/langs/pt_BR/paybox.lang
similarity index 100%
rename from public/langs/pt_BR/paybox.lang
rename to htdocs/langs/pt_BR/paybox.lang
diff --git a/public/langs/pt_BR/paypal.lang b/htdocs/langs/pt_BR/paypal.lang
similarity index 100%
rename from public/langs/pt_BR/paypal.lang
rename to htdocs/langs/pt_BR/paypal.lang
diff --git a/public/langs/pt_BR/printing.lang b/htdocs/langs/pt_BR/printing.lang
similarity index 100%
rename from public/langs/pt_BR/printing.lang
rename to htdocs/langs/pt_BR/printing.lang
diff --git a/public/langs/pt_BR/productbatch.lang b/htdocs/langs/pt_BR/productbatch.lang
similarity index 100%
rename from public/langs/pt_BR/productbatch.lang
rename to htdocs/langs/pt_BR/productbatch.lang
diff --git a/public/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
similarity index 100%
rename from public/langs/pt_BR/products.lang
rename to htdocs/langs/pt_BR/products.lang
diff --git a/public/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
similarity index 100%
rename from public/langs/pt_BR/projects.lang
rename to htdocs/langs/pt_BR/projects.lang
diff --git a/public/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang
similarity index 100%
rename from public/langs/pt_BR/propal.lang
rename to htdocs/langs/pt_BR/propal.lang
diff --git a/public/langs/pt_BR/receiptprinter.lang b/htdocs/langs/pt_BR/receiptprinter.lang
similarity index 100%
rename from public/langs/pt_BR/receiptprinter.lang
rename to htdocs/langs/pt_BR/receiptprinter.lang
diff --git a/public/langs/pt_BR/resource.lang b/htdocs/langs/pt_BR/resource.lang
similarity index 100%
rename from public/langs/pt_BR/resource.lang
rename to htdocs/langs/pt_BR/resource.lang
diff --git a/public/langs/pt_BR/salaries.lang b/htdocs/langs/pt_BR/salaries.lang
similarity index 100%
rename from public/langs/pt_BR/salaries.lang
rename to htdocs/langs/pt_BR/salaries.lang
diff --git a/public/langs/pt_BR/sendings.lang b/htdocs/langs/pt_BR/sendings.lang
similarity index 100%
rename from public/langs/pt_BR/sendings.lang
rename to htdocs/langs/pt_BR/sendings.lang
diff --git a/public/langs/pt_BR/sms.lang b/htdocs/langs/pt_BR/sms.lang
similarity index 100%
rename from public/langs/pt_BR/sms.lang
rename to htdocs/langs/pt_BR/sms.lang
diff --git a/public/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
similarity index 100%
rename from public/langs/pt_BR/stocks.lang
rename to htdocs/langs/pt_BR/stocks.lang
diff --git a/public/langs/pt_BR/supplier_proposal.lang b/htdocs/langs/pt_BR/supplier_proposal.lang
similarity index 100%
rename from public/langs/pt_BR/supplier_proposal.lang
rename to htdocs/langs/pt_BR/supplier_proposal.lang
diff --git a/public/langs/pt_BR/suppliers.lang b/htdocs/langs/pt_BR/suppliers.lang
similarity index 100%
rename from public/langs/pt_BR/suppliers.lang
rename to htdocs/langs/pt_BR/suppliers.lang
diff --git a/public/langs/pt_BR/trips.lang b/htdocs/langs/pt_BR/trips.lang
similarity index 100%
rename from public/langs/pt_BR/trips.lang
rename to htdocs/langs/pt_BR/trips.lang
diff --git a/public/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
similarity index 100%
rename from public/langs/pt_BR/users.lang
rename to htdocs/langs/pt_BR/users.lang
diff --git a/public/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang
similarity index 100%
rename from public/langs/pt_BR/website.lang
rename to htdocs/langs/pt_BR/website.lang
diff --git a/public/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
similarity index 100%
rename from public/langs/pt_BR/withdrawals.lang
rename to htdocs/langs/pt_BR/withdrawals.lang
diff --git a/public/langs/pt_BR/workflow.lang b/htdocs/langs/pt_BR/workflow.lang
similarity index 100%
rename from public/langs/pt_BR/workflow.lang
rename to htdocs/langs/pt_BR/workflow.lang
diff --git a/public/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
similarity index 100%
rename from public/langs/pt_PT/accountancy.lang
rename to htdocs/langs/pt_PT/accountancy.lang
diff --git a/public/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
similarity index 100%
rename from public/langs/pt_PT/admin.lang
rename to htdocs/langs/pt_PT/admin.lang
diff --git a/public/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
similarity index 100%
rename from public/langs/pt_PT/agenda.lang
rename to htdocs/langs/pt_PT/agenda.lang
diff --git a/public/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
similarity index 100%
rename from public/langs/pt_PT/banks.lang
rename to htdocs/langs/pt_PT/banks.lang
diff --git a/public/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
similarity index 100%
rename from public/langs/pt_PT/bills.lang
rename to htdocs/langs/pt_PT/bills.lang
diff --git a/public/langs/pt_PT/bookmarks.lang b/htdocs/langs/pt_PT/bookmarks.lang
similarity index 100%
rename from public/langs/pt_PT/bookmarks.lang
rename to htdocs/langs/pt_PT/bookmarks.lang
diff --git a/public/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
similarity index 100%
rename from public/langs/pt_PT/boxes.lang
rename to htdocs/langs/pt_PT/boxes.lang
diff --git a/public/langs/pt_PT/cashdesk.lang b/htdocs/langs/pt_PT/cashdesk.lang
similarity index 100%
rename from public/langs/pt_PT/cashdesk.lang
rename to htdocs/langs/pt_PT/cashdesk.lang
diff --git a/public/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
similarity index 100%
rename from public/langs/pt_PT/categories.lang
rename to htdocs/langs/pt_PT/categories.lang
diff --git a/public/langs/pt_PT/commercial.lang b/htdocs/langs/pt_PT/commercial.lang
similarity index 100%
rename from public/langs/pt_PT/commercial.lang
rename to htdocs/langs/pt_PT/commercial.lang
diff --git a/public/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
similarity index 100%
rename from public/langs/pt_PT/companies.lang
rename to htdocs/langs/pt_PT/companies.lang
diff --git a/public/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
similarity index 100%
rename from public/langs/pt_PT/compta.lang
rename to htdocs/langs/pt_PT/compta.lang
diff --git a/public/langs/pt_PT/contracts.lang b/htdocs/langs/pt_PT/contracts.lang
similarity index 100%
rename from public/langs/pt_PT/contracts.lang
rename to htdocs/langs/pt_PT/contracts.lang
diff --git a/public/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
similarity index 100%
rename from public/langs/pt_PT/cron.lang
rename to htdocs/langs/pt_PT/cron.lang
diff --git a/public/langs/pt_PT/deliveries.lang b/htdocs/langs/pt_PT/deliveries.lang
similarity index 100%
rename from public/langs/pt_PT/deliveries.lang
rename to htdocs/langs/pt_PT/deliveries.lang
diff --git a/public/langs/pt_PT/dict.lang b/htdocs/langs/pt_PT/dict.lang
similarity index 100%
rename from public/langs/pt_PT/dict.lang
rename to htdocs/langs/pt_PT/dict.lang
diff --git a/public/langs/pt_PT/donations.lang b/htdocs/langs/pt_PT/donations.lang
similarity index 100%
rename from public/langs/pt_PT/donations.lang
rename to htdocs/langs/pt_PT/donations.lang
diff --git a/public/langs/pt_PT/ecm.lang b/htdocs/langs/pt_PT/ecm.lang
similarity index 100%
rename from public/langs/pt_PT/ecm.lang
rename to htdocs/langs/pt_PT/ecm.lang
diff --git a/public/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
similarity index 100%
rename from public/langs/pt_PT/errors.lang
rename to htdocs/langs/pt_PT/errors.lang
diff --git a/public/langs/pt_PT/exports.lang b/htdocs/langs/pt_PT/exports.lang
similarity index 100%
rename from public/langs/pt_PT/exports.lang
rename to htdocs/langs/pt_PT/exports.lang
diff --git a/public/langs/pt_PT/externalsite.lang b/htdocs/langs/pt_PT/externalsite.lang
similarity index 100%
rename from public/langs/pt_PT/externalsite.lang
rename to htdocs/langs/pt_PT/externalsite.lang
diff --git a/public/langs/pt_PT/ftp.lang b/htdocs/langs/pt_PT/ftp.lang
similarity index 100%
rename from public/langs/pt_PT/ftp.lang
rename to htdocs/langs/pt_PT/ftp.lang
diff --git a/public/langs/pt_PT/help.lang b/htdocs/langs/pt_PT/help.lang
similarity index 100%
rename from public/langs/pt_PT/help.lang
rename to htdocs/langs/pt_PT/help.lang
diff --git a/public/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang
similarity index 100%
rename from public/langs/pt_PT/holiday.lang
rename to htdocs/langs/pt_PT/holiday.lang
diff --git a/public/langs/pt_PT/hrm.lang b/htdocs/langs/pt_PT/hrm.lang
similarity index 100%
rename from public/langs/pt_PT/hrm.lang
rename to htdocs/langs/pt_PT/hrm.lang
diff --git a/public/langs/pt_PT/incoterm.lang b/htdocs/langs/pt_PT/incoterm.lang
similarity index 100%
rename from public/langs/pt_PT/incoterm.lang
rename to htdocs/langs/pt_PT/incoterm.lang
diff --git a/public/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
similarity index 100%
rename from public/langs/pt_PT/install.lang
rename to htdocs/langs/pt_PT/install.lang
diff --git a/public/langs/pt_PT/interventions.lang b/htdocs/langs/pt_PT/interventions.lang
similarity index 100%
rename from public/langs/pt_PT/interventions.lang
rename to htdocs/langs/pt_PT/interventions.lang
diff --git a/public/langs/pt_PT/languages.lang b/htdocs/langs/pt_PT/languages.lang
similarity index 100%
rename from public/langs/pt_PT/languages.lang
rename to htdocs/langs/pt_PT/languages.lang
diff --git a/public/langs/pt_PT/ldap.lang b/htdocs/langs/pt_PT/ldap.lang
similarity index 100%
rename from public/langs/pt_PT/ldap.lang
rename to htdocs/langs/pt_PT/ldap.lang
diff --git a/public/langs/pt_PT/link.lang b/htdocs/langs/pt_PT/link.lang
similarity index 100%
rename from public/langs/pt_PT/link.lang
rename to htdocs/langs/pt_PT/link.lang
diff --git a/public/langs/pt_PT/loan.lang b/htdocs/langs/pt_PT/loan.lang
similarity index 100%
rename from public/langs/pt_PT/loan.lang
rename to htdocs/langs/pt_PT/loan.lang
diff --git a/public/langs/pt_PT/mailmanspip.lang b/htdocs/langs/pt_PT/mailmanspip.lang
similarity index 100%
rename from public/langs/pt_PT/mailmanspip.lang
rename to htdocs/langs/pt_PT/mailmanspip.lang
diff --git a/public/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
similarity index 100%
rename from public/langs/pt_PT/mails.lang
rename to htdocs/langs/pt_PT/mails.lang
diff --git a/public/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
similarity index 100%
rename from public/langs/pt_PT/main.lang
rename to htdocs/langs/pt_PT/main.lang
diff --git a/public/langs/pt_PT/margins.lang b/htdocs/langs/pt_PT/margins.lang
similarity index 100%
rename from public/langs/pt_PT/margins.lang
rename to htdocs/langs/pt_PT/margins.lang
diff --git a/public/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
similarity index 100%
rename from public/langs/pt_PT/members.lang
rename to htdocs/langs/pt_PT/members.lang
diff --git a/public/langs/pt_PT/oauth.lang b/htdocs/langs/pt_PT/oauth.lang
similarity index 100%
rename from public/langs/pt_PT/oauth.lang
rename to htdocs/langs/pt_PT/oauth.lang
diff --git a/public/langs/pt_PT/opensurvey.lang b/htdocs/langs/pt_PT/opensurvey.lang
similarity index 100%
rename from public/langs/pt_PT/opensurvey.lang
rename to htdocs/langs/pt_PT/opensurvey.lang
diff --git a/public/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
similarity index 100%
rename from public/langs/pt_PT/orders.lang
rename to htdocs/langs/pt_PT/orders.lang
diff --git a/public/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
similarity index 100%
rename from public/langs/pt_PT/other.lang
rename to htdocs/langs/pt_PT/other.lang
diff --git a/public/langs/pt_PT/paybox.lang b/htdocs/langs/pt_PT/paybox.lang
similarity index 100%
rename from public/langs/pt_PT/paybox.lang
rename to htdocs/langs/pt_PT/paybox.lang
diff --git a/public/langs/pt_PT/paypal.lang b/htdocs/langs/pt_PT/paypal.lang
similarity index 100%
rename from public/langs/pt_PT/paypal.lang
rename to htdocs/langs/pt_PT/paypal.lang
diff --git a/public/langs/pt_PT/printing.lang b/htdocs/langs/pt_PT/printing.lang
similarity index 100%
rename from public/langs/pt_PT/printing.lang
rename to htdocs/langs/pt_PT/printing.lang
diff --git a/public/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang
similarity index 100%
rename from public/langs/pt_PT/productbatch.lang
rename to htdocs/langs/pt_PT/productbatch.lang
diff --git a/public/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
similarity index 100%
rename from public/langs/pt_PT/products.lang
rename to htdocs/langs/pt_PT/products.lang
diff --git a/public/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
similarity index 100%
rename from public/langs/pt_PT/projects.lang
rename to htdocs/langs/pt_PT/projects.lang
diff --git a/public/langs/pt_PT/propal.lang b/htdocs/langs/pt_PT/propal.lang
similarity index 100%
rename from public/langs/pt_PT/propal.lang
rename to htdocs/langs/pt_PT/propal.lang
diff --git a/public/langs/pt_PT/receiptprinter.lang b/htdocs/langs/pt_PT/receiptprinter.lang
similarity index 100%
rename from public/langs/pt_PT/receiptprinter.lang
rename to htdocs/langs/pt_PT/receiptprinter.lang
diff --git a/public/langs/pt_PT/resource.lang b/htdocs/langs/pt_PT/resource.lang
similarity index 100%
rename from public/langs/pt_PT/resource.lang
rename to htdocs/langs/pt_PT/resource.lang
diff --git a/public/langs/pt_PT/salaries.lang b/htdocs/langs/pt_PT/salaries.lang
similarity index 100%
rename from public/langs/pt_PT/salaries.lang
rename to htdocs/langs/pt_PT/salaries.lang
diff --git a/public/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
similarity index 100%
rename from public/langs/pt_PT/sendings.lang
rename to htdocs/langs/pt_PT/sendings.lang
diff --git a/public/langs/pt_PT/sms.lang b/htdocs/langs/pt_PT/sms.lang
similarity index 100%
rename from public/langs/pt_PT/sms.lang
rename to htdocs/langs/pt_PT/sms.lang
diff --git a/public/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
similarity index 100%
rename from public/langs/pt_PT/stocks.lang
rename to htdocs/langs/pt_PT/stocks.lang
diff --git a/public/langs/pt_PT/supplier_proposal.lang b/htdocs/langs/pt_PT/supplier_proposal.lang
similarity index 100%
rename from public/langs/pt_PT/supplier_proposal.lang
rename to htdocs/langs/pt_PT/supplier_proposal.lang
diff --git a/public/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
similarity index 100%
rename from public/langs/pt_PT/suppliers.lang
rename to htdocs/langs/pt_PT/suppliers.lang
diff --git a/public/langs/pt_PT/trips.lang b/htdocs/langs/pt_PT/trips.lang
similarity index 100%
rename from public/langs/pt_PT/trips.lang
rename to htdocs/langs/pt_PT/trips.lang
diff --git a/public/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
similarity index 100%
rename from public/langs/pt_PT/users.lang
rename to htdocs/langs/pt_PT/users.lang
diff --git a/public/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
similarity index 100%
rename from public/langs/pt_PT/website.lang
rename to htdocs/langs/pt_PT/website.lang
diff --git a/public/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
similarity index 100%
rename from public/langs/pt_PT/withdrawals.lang
rename to htdocs/langs/pt_PT/withdrawals.lang
diff --git a/public/langs/pt_PT/workflow.lang b/htdocs/langs/pt_PT/workflow.lang
similarity index 100%
rename from public/langs/pt_PT/workflow.lang
rename to htdocs/langs/pt_PT/workflow.lang
diff --git a/public/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
similarity index 100%
rename from public/langs/ro_RO/accountancy.lang
rename to htdocs/langs/ro_RO/accountancy.lang
diff --git a/public/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
similarity index 100%
rename from public/langs/ro_RO/admin.lang
rename to htdocs/langs/ro_RO/admin.lang
diff --git a/public/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
similarity index 100%
rename from public/langs/ro_RO/agenda.lang
rename to htdocs/langs/ro_RO/agenda.lang
diff --git a/public/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
similarity index 100%
rename from public/langs/ro_RO/banks.lang
rename to htdocs/langs/ro_RO/banks.lang
diff --git a/public/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
similarity index 100%
rename from public/langs/ro_RO/bills.lang
rename to htdocs/langs/ro_RO/bills.lang
diff --git a/public/langs/ro_RO/bookmarks.lang b/htdocs/langs/ro_RO/bookmarks.lang
similarity index 100%
rename from public/langs/ro_RO/bookmarks.lang
rename to htdocs/langs/ro_RO/bookmarks.lang
diff --git a/public/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
similarity index 100%
rename from public/langs/ro_RO/boxes.lang
rename to htdocs/langs/ro_RO/boxes.lang
diff --git a/public/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
similarity index 100%
rename from public/langs/ro_RO/cashdesk.lang
rename to htdocs/langs/ro_RO/cashdesk.lang
diff --git a/public/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
similarity index 100%
rename from public/langs/ro_RO/categories.lang
rename to htdocs/langs/ro_RO/categories.lang
diff --git a/public/langs/ro_RO/commercial.lang b/htdocs/langs/ro_RO/commercial.lang
similarity index 100%
rename from public/langs/ro_RO/commercial.lang
rename to htdocs/langs/ro_RO/commercial.lang
diff --git a/public/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
similarity index 100%
rename from public/langs/ro_RO/companies.lang
rename to htdocs/langs/ro_RO/companies.lang
diff --git a/public/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
similarity index 100%
rename from public/langs/ro_RO/compta.lang
rename to htdocs/langs/ro_RO/compta.lang
diff --git a/public/langs/ro_RO/contracts.lang b/htdocs/langs/ro_RO/contracts.lang
similarity index 100%
rename from public/langs/ro_RO/contracts.lang
rename to htdocs/langs/ro_RO/contracts.lang
diff --git a/public/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
similarity index 100%
rename from public/langs/ro_RO/cron.lang
rename to htdocs/langs/ro_RO/cron.lang
diff --git a/public/langs/ro_RO/deliveries.lang b/htdocs/langs/ro_RO/deliveries.lang
similarity index 100%
rename from public/langs/ro_RO/deliveries.lang
rename to htdocs/langs/ro_RO/deliveries.lang
diff --git a/public/langs/ro_RO/dict.lang b/htdocs/langs/ro_RO/dict.lang
similarity index 100%
rename from public/langs/ro_RO/dict.lang
rename to htdocs/langs/ro_RO/dict.lang
diff --git a/public/langs/ro_RO/donations.lang b/htdocs/langs/ro_RO/donations.lang
similarity index 100%
rename from public/langs/ro_RO/donations.lang
rename to htdocs/langs/ro_RO/donations.lang
diff --git a/public/langs/ro_RO/ecm.lang b/htdocs/langs/ro_RO/ecm.lang
similarity index 100%
rename from public/langs/ro_RO/ecm.lang
rename to htdocs/langs/ro_RO/ecm.lang
diff --git a/public/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
similarity index 100%
rename from public/langs/ro_RO/errors.lang
rename to htdocs/langs/ro_RO/errors.lang
diff --git a/public/langs/ro_RO/exports.lang b/htdocs/langs/ro_RO/exports.lang
similarity index 100%
rename from public/langs/ro_RO/exports.lang
rename to htdocs/langs/ro_RO/exports.lang
diff --git a/public/langs/ro_RO/externalsite.lang b/htdocs/langs/ro_RO/externalsite.lang
similarity index 100%
rename from public/langs/ro_RO/externalsite.lang
rename to htdocs/langs/ro_RO/externalsite.lang
diff --git a/public/langs/ro_RO/ftp.lang b/htdocs/langs/ro_RO/ftp.lang
similarity index 100%
rename from public/langs/ro_RO/ftp.lang
rename to htdocs/langs/ro_RO/ftp.lang
diff --git a/public/langs/ro_RO/help.lang b/htdocs/langs/ro_RO/help.lang
similarity index 100%
rename from public/langs/ro_RO/help.lang
rename to htdocs/langs/ro_RO/help.lang
diff --git a/public/langs/ro_RO/holiday.lang b/htdocs/langs/ro_RO/holiday.lang
similarity index 100%
rename from public/langs/ro_RO/holiday.lang
rename to htdocs/langs/ro_RO/holiday.lang
diff --git a/public/langs/ro_RO/hrm.lang b/htdocs/langs/ro_RO/hrm.lang
similarity index 100%
rename from public/langs/ro_RO/hrm.lang
rename to htdocs/langs/ro_RO/hrm.lang
diff --git a/public/langs/ro_RO/incoterm.lang b/htdocs/langs/ro_RO/incoterm.lang
similarity index 100%
rename from public/langs/ro_RO/incoterm.lang
rename to htdocs/langs/ro_RO/incoterm.lang
diff --git a/public/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
similarity index 100%
rename from public/langs/ro_RO/install.lang
rename to htdocs/langs/ro_RO/install.lang
diff --git a/public/langs/ro_RO/interventions.lang b/htdocs/langs/ro_RO/interventions.lang
similarity index 100%
rename from public/langs/ro_RO/interventions.lang
rename to htdocs/langs/ro_RO/interventions.lang
diff --git a/public/langs/ro_RO/languages.lang b/htdocs/langs/ro_RO/languages.lang
similarity index 100%
rename from public/langs/ro_RO/languages.lang
rename to htdocs/langs/ro_RO/languages.lang
diff --git a/public/langs/ro_RO/ldap.lang b/htdocs/langs/ro_RO/ldap.lang
similarity index 100%
rename from public/langs/ro_RO/ldap.lang
rename to htdocs/langs/ro_RO/ldap.lang
diff --git a/public/langs/ro_RO/link.lang b/htdocs/langs/ro_RO/link.lang
similarity index 100%
rename from public/langs/ro_RO/link.lang
rename to htdocs/langs/ro_RO/link.lang
diff --git a/public/langs/ro_RO/loan.lang b/htdocs/langs/ro_RO/loan.lang
similarity index 100%
rename from public/langs/ro_RO/loan.lang
rename to htdocs/langs/ro_RO/loan.lang
diff --git a/public/langs/ro_RO/mailmanspip.lang b/htdocs/langs/ro_RO/mailmanspip.lang
similarity index 100%
rename from public/langs/ro_RO/mailmanspip.lang
rename to htdocs/langs/ro_RO/mailmanspip.lang
diff --git a/public/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
similarity index 100%
rename from public/langs/ro_RO/mails.lang
rename to htdocs/langs/ro_RO/mails.lang
diff --git a/public/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
similarity index 100%
rename from public/langs/ro_RO/main.lang
rename to htdocs/langs/ro_RO/main.lang
diff --git a/public/langs/ro_RO/margins.lang b/htdocs/langs/ro_RO/margins.lang
similarity index 100%
rename from public/langs/ro_RO/margins.lang
rename to htdocs/langs/ro_RO/margins.lang
diff --git a/public/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
similarity index 100%
rename from public/langs/ro_RO/members.lang
rename to htdocs/langs/ro_RO/members.lang
diff --git a/public/langs/ro_RO/oauth.lang b/htdocs/langs/ro_RO/oauth.lang
similarity index 100%
rename from public/langs/ro_RO/oauth.lang
rename to htdocs/langs/ro_RO/oauth.lang
diff --git a/public/langs/ro_RO/opensurvey.lang b/htdocs/langs/ro_RO/opensurvey.lang
similarity index 100%
rename from public/langs/ro_RO/opensurvey.lang
rename to htdocs/langs/ro_RO/opensurvey.lang
diff --git a/public/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
similarity index 100%
rename from public/langs/ro_RO/orders.lang
rename to htdocs/langs/ro_RO/orders.lang
diff --git a/public/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
similarity index 100%
rename from public/langs/ro_RO/other.lang
rename to htdocs/langs/ro_RO/other.lang
diff --git a/public/langs/ro_RO/paybox.lang b/htdocs/langs/ro_RO/paybox.lang
similarity index 100%
rename from public/langs/ro_RO/paybox.lang
rename to htdocs/langs/ro_RO/paybox.lang
diff --git a/public/langs/ro_RO/paypal.lang b/htdocs/langs/ro_RO/paypal.lang
similarity index 100%
rename from public/langs/ro_RO/paypal.lang
rename to htdocs/langs/ro_RO/paypal.lang
diff --git a/public/langs/ro_RO/printing.lang b/htdocs/langs/ro_RO/printing.lang
similarity index 100%
rename from public/langs/ro_RO/printing.lang
rename to htdocs/langs/ro_RO/printing.lang
diff --git a/public/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang
similarity index 100%
rename from public/langs/ro_RO/productbatch.lang
rename to htdocs/langs/ro_RO/productbatch.lang
diff --git a/public/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
similarity index 100%
rename from public/langs/ro_RO/products.lang
rename to htdocs/langs/ro_RO/products.lang
diff --git a/public/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
similarity index 100%
rename from public/langs/ro_RO/projects.lang
rename to htdocs/langs/ro_RO/projects.lang
diff --git a/public/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang
similarity index 100%
rename from public/langs/ro_RO/propal.lang
rename to htdocs/langs/ro_RO/propal.lang
diff --git a/public/langs/ro_RO/receiptprinter.lang b/htdocs/langs/ro_RO/receiptprinter.lang
similarity index 100%
rename from public/langs/ro_RO/receiptprinter.lang
rename to htdocs/langs/ro_RO/receiptprinter.lang
diff --git a/public/langs/ro_RO/resource.lang b/htdocs/langs/ro_RO/resource.lang
similarity index 100%
rename from public/langs/ro_RO/resource.lang
rename to htdocs/langs/ro_RO/resource.lang
diff --git a/public/langs/ro_RO/salaries.lang b/htdocs/langs/ro_RO/salaries.lang
similarity index 100%
rename from public/langs/ro_RO/salaries.lang
rename to htdocs/langs/ro_RO/salaries.lang
diff --git a/public/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang
similarity index 100%
rename from public/langs/ro_RO/sendings.lang
rename to htdocs/langs/ro_RO/sendings.lang
diff --git a/public/langs/ro_RO/sms.lang b/htdocs/langs/ro_RO/sms.lang
similarity index 100%
rename from public/langs/ro_RO/sms.lang
rename to htdocs/langs/ro_RO/sms.lang
diff --git a/public/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
similarity index 100%
rename from public/langs/ro_RO/stocks.lang
rename to htdocs/langs/ro_RO/stocks.lang
diff --git a/public/langs/ro_RO/supplier_proposal.lang b/htdocs/langs/ro_RO/supplier_proposal.lang
similarity index 100%
rename from public/langs/ro_RO/supplier_proposal.lang
rename to htdocs/langs/ro_RO/supplier_proposal.lang
diff --git a/public/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
similarity index 100%
rename from public/langs/ro_RO/suppliers.lang
rename to htdocs/langs/ro_RO/suppliers.lang
diff --git a/public/langs/ro_RO/trips.lang b/htdocs/langs/ro_RO/trips.lang
similarity index 100%
rename from public/langs/ro_RO/trips.lang
rename to htdocs/langs/ro_RO/trips.lang
diff --git a/public/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
similarity index 100%
rename from public/langs/ro_RO/users.lang
rename to htdocs/langs/ro_RO/users.lang
diff --git a/public/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
similarity index 100%
rename from public/langs/ro_RO/website.lang
rename to htdocs/langs/ro_RO/website.lang
diff --git a/public/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
similarity index 100%
rename from public/langs/ro_RO/withdrawals.lang
rename to htdocs/langs/ro_RO/withdrawals.lang
diff --git a/public/langs/ro_RO/workflow.lang b/htdocs/langs/ro_RO/workflow.lang
similarity index 100%
rename from public/langs/ro_RO/workflow.lang
rename to htdocs/langs/ro_RO/workflow.lang
diff --git a/public/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
similarity index 100%
rename from public/langs/ru_RU/accountancy.lang
rename to htdocs/langs/ru_RU/accountancy.lang
diff --git a/public/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
similarity index 100%
rename from public/langs/ru_RU/admin.lang
rename to htdocs/langs/ru_RU/admin.lang
diff --git a/public/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang
similarity index 100%
rename from public/langs/ru_RU/agenda.lang
rename to htdocs/langs/ru_RU/agenda.lang
diff --git a/public/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
similarity index 100%
rename from public/langs/ru_RU/banks.lang
rename to htdocs/langs/ru_RU/banks.lang
diff --git a/public/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
similarity index 100%
rename from public/langs/ru_RU/bills.lang
rename to htdocs/langs/ru_RU/bills.lang
diff --git a/public/langs/ru_RU/bookmarks.lang b/htdocs/langs/ru_RU/bookmarks.lang
similarity index 100%
rename from public/langs/ru_RU/bookmarks.lang
rename to htdocs/langs/ru_RU/bookmarks.lang
diff --git a/public/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
similarity index 100%
rename from public/langs/ru_RU/boxes.lang
rename to htdocs/langs/ru_RU/boxes.lang
diff --git a/public/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
similarity index 100%
rename from public/langs/ru_RU/cashdesk.lang
rename to htdocs/langs/ru_RU/cashdesk.lang
diff --git a/public/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
similarity index 100%
rename from public/langs/ru_RU/categories.lang
rename to htdocs/langs/ru_RU/categories.lang
diff --git a/public/langs/ru_RU/commercial.lang b/htdocs/langs/ru_RU/commercial.lang
similarity index 100%
rename from public/langs/ru_RU/commercial.lang
rename to htdocs/langs/ru_RU/commercial.lang
diff --git a/public/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
similarity index 100%
rename from public/langs/ru_RU/companies.lang
rename to htdocs/langs/ru_RU/companies.lang
diff --git a/public/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
similarity index 100%
rename from public/langs/ru_RU/compta.lang
rename to htdocs/langs/ru_RU/compta.lang
diff --git a/public/langs/ru_RU/contracts.lang b/htdocs/langs/ru_RU/contracts.lang
similarity index 100%
rename from public/langs/ru_RU/contracts.lang
rename to htdocs/langs/ru_RU/contracts.lang
diff --git a/public/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
similarity index 100%
rename from public/langs/ru_RU/cron.lang
rename to htdocs/langs/ru_RU/cron.lang
diff --git a/public/langs/ru_RU/deliveries.lang b/htdocs/langs/ru_RU/deliveries.lang
similarity index 100%
rename from public/langs/ru_RU/deliveries.lang
rename to htdocs/langs/ru_RU/deliveries.lang
diff --git a/public/langs/ru_RU/dict.lang b/htdocs/langs/ru_RU/dict.lang
similarity index 100%
rename from public/langs/ru_RU/dict.lang
rename to htdocs/langs/ru_RU/dict.lang
diff --git a/public/langs/ru_RU/donations.lang b/htdocs/langs/ru_RU/donations.lang
similarity index 100%
rename from public/langs/ru_RU/donations.lang
rename to htdocs/langs/ru_RU/donations.lang
diff --git a/public/langs/ru_RU/ecm.lang b/htdocs/langs/ru_RU/ecm.lang
similarity index 100%
rename from public/langs/ru_RU/ecm.lang
rename to htdocs/langs/ru_RU/ecm.lang
diff --git a/public/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
similarity index 100%
rename from public/langs/ru_RU/errors.lang
rename to htdocs/langs/ru_RU/errors.lang
diff --git a/public/langs/ru_RU/exports.lang b/htdocs/langs/ru_RU/exports.lang
similarity index 100%
rename from public/langs/ru_RU/exports.lang
rename to htdocs/langs/ru_RU/exports.lang
diff --git a/public/langs/ru_RU/externalsite.lang b/htdocs/langs/ru_RU/externalsite.lang
similarity index 100%
rename from public/langs/ru_RU/externalsite.lang
rename to htdocs/langs/ru_RU/externalsite.lang
diff --git a/public/langs/ru_RU/ftp.lang b/htdocs/langs/ru_RU/ftp.lang
similarity index 100%
rename from public/langs/ru_RU/ftp.lang
rename to htdocs/langs/ru_RU/ftp.lang
diff --git a/public/langs/ru_RU/help.lang b/htdocs/langs/ru_RU/help.lang
similarity index 100%
rename from public/langs/ru_RU/help.lang
rename to htdocs/langs/ru_RU/help.lang
diff --git a/public/langs/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang
similarity index 100%
rename from public/langs/ru_RU/holiday.lang
rename to htdocs/langs/ru_RU/holiday.lang
diff --git a/public/langs/ru_RU/hrm.lang b/htdocs/langs/ru_RU/hrm.lang
similarity index 100%
rename from public/langs/ru_RU/hrm.lang
rename to htdocs/langs/ru_RU/hrm.lang
diff --git a/public/langs/ru_RU/incoterm.lang b/htdocs/langs/ru_RU/incoterm.lang
similarity index 100%
rename from public/langs/ru_RU/incoterm.lang
rename to htdocs/langs/ru_RU/incoterm.lang
diff --git a/public/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
similarity index 100%
rename from public/langs/ru_RU/install.lang
rename to htdocs/langs/ru_RU/install.lang
diff --git a/public/langs/ru_RU/interventions.lang b/htdocs/langs/ru_RU/interventions.lang
similarity index 100%
rename from public/langs/ru_RU/interventions.lang
rename to htdocs/langs/ru_RU/interventions.lang
diff --git a/public/langs/ru_RU/languages.lang b/htdocs/langs/ru_RU/languages.lang
similarity index 100%
rename from public/langs/ru_RU/languages.lang
rename to htdocs/langs/ru_RU/languages.lang
diff --git a/public/langs/ru_RU/ldap.lang b/htdocs/langs/ru_RU/ldap.lang
similarity index 100%
rename from public/langs/ru_RU/ldap.lang
rename to htdocs/langs/ru_RU/ldap.lang
diff --git a/public/langs/ru_RU/link.lang b/htdocs/langs/ru_RU/link.lang
similarity index 100%
rename from public/langs/ru_RU/link.lang
rename to htdocs/langs/ru_RU/link.lang
diff --git a/public/langs/ru_RU/loan.lang b/htdocs/langs/ru_RU/loan.lang
similarity index 100%
rename from public/langs/ru_RU/loan.lang
rename to htdocs/langs/ru_RU/loan.lang
diff --git a/public/langs/ru_RU/mailmanspip.lang b/htdocs/langs/ru_RU/mailmanspip.lang
similarity index 100%
rename from public/langs/ru_RU/mailmanspip.lang
rename to htdocs/langs/ru_RU/mailmanspip.lang
diff --git a/public/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
similarity index 100%
rename from public/langs/ru_RU/mails.lang
rename to htdocs/langs/ru_RU/mails.lang
diff --git a/public/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
similarity index 100%
rename from public/langs/ru_RU/main.lang
rename to htdocs/langs/ru_RU/main.lang
diff --git a/public/langs/ru_RU/margins.lang b/htdocs/langs/ru_RU/margins.lang
similarity index 100%
rename from public/langs/ru_RU/margins.lang
rename to htdocs/langs/ru_RU/margins.lang
diff --git a/public/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
similarity index 100%
rename from public/langs/ru_RU/members.lang
rename to htdocs/langs/ru_RU/members.lang
diff --git a/public/langs/ru_RU/oauth.lang b/htdocs/langs/ru_RU/oauth.lang
similarity index 100%
rename from public/langs/ru_RU/oauth.lang
rename to htdocs/langs/ru_RU/oauth.lang
diff --git a/public/langs/ru_RU/opensurvey.lang b/htdocs/langs/ru_RU/opensurvey.lang
similarity index 100%
rename from public/langs/ru_RU/opensurvey.lang
rename to htdocs/langs/ru_RU/opensurvey.lang
diff --git a/public/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
similarity index 100%
rename from public/langs/ru_RU/orders.lang
rename to htdocs/langs/ru_RU/orders.lang
diff --git a/public/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
similarity index 100%
rename from public/langs/ru_RU/other.lang
rename to htdocs/langs/ru_RU/other.lang
diff --git a/public/langs/ru_RU/paybox.lang b/htdocs/langs/ru_RU/paybox.lang
similarity index 100%
rename from public/langs/ru_RU/paybox.lang
rename to htdocs/langs/ru_RU/paybox.lang
diff --git a/public/langs/ru_RU/paypal.lang b/htdocs/langs/ru_RU/paypal.lang
similarity index 100%
rename from public/langs/ru_RU/paypal.lang
rename to htdocs/langs/ru_RU/paypal.lang
diff --git a/public/langs/ru_RU/printing.lang b/htdocs/langs/ru_RU/printing.lang
similarity index 100%
rename from public/langs/ru_RU/printing.lang
rename to htdocs/langs/ru_RU/printing.lang
diff --git a/public/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang
similarity index 100%
rename from public/langs/ru_RU/productbatch.lang
rename to htdocs/langs/ru_RU/productbatch.lang
diff --git a/public/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
similarity index 100%
rename from public/langs/ru_RU/products.lang
rename to htdocs/langs/ru_RU/products.lang
diff --git a/public/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
similarity index 100%
rename from public/langs/ru_RU/projects.lang
rename to htdocs/langs/ru_RU/projects.lang
diff --git a/public/langs/ru_RU/propal.lang b/htdocs/langs/ru_RU/propal.lang
similarity index 100%
rename from public/langs/ru_RU/propal.lang
rename to htdocs/langs/ru_RU/propal.lang
diff --git a/public/langs/ru_RU/receiptprinter.lang b/htdocs/langs/ru_RU/receiptprinter.lang
similarity index 100%
rename from public/langs/ru_RU/receiptprinter.lang
rename to htdocs/langs/ru_RU/receiptprinter.lang
diff --git a/public/langs/ru_RU/resource.lang b/htdocs/langs/ru_RU/resource.lang
similarity index 100%
rename from public/langs/ru_RU/resource.lang
rename to htdocs/langs/ru_RU/resource.lang
diff --git a/public/langs/ru_RU/salaries.lang b/htdocs/langs/ru_RU/salaries.lang
similarity index 100%
rename from public/langs/ru_RU/salaries.lang
rename to htdocs/langs/ru_RU/salaries.lang
diff --git a/public/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang
similarity index 100%
rename from public/langs/ru_RU/sendings.lang
rename to htdocs/langs/ru_RU/sendings.lang
diff --git a/public/langs/ru_RU/sms.lang b/htdocs/langs/ru_RU/sms.lang
similarity index 100%
rename from public/langs/ru_RU/sms.lang
rename to htdocs/langs/ru_RU/sms.lang
diff --git a/public/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
similarity index 100%
rename from public/langs/ru_RU/stocks.lang
rename to htdocs/langs/ru_RU/stocks.lang
diff --git a/public/langs/ru_RU/supplier_proposal.lang b/htdocs/langs/ru_RU/supplier_proposal.lang
similarity index 100%
rename from public/langs/ru_RU/supplier_proposal.lang
rename to htdocs/langs/ru_RU/supplier_proposal.lang
diff --git a/public/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang
similarity index 100%
rename from public/langs/ru_RU/suppliers.lang
rename to htdocs/langs/ru_RU/suppliers.lang
diff --git a/public/langs/ru_RU/trips.lang b/htdocs/langs/ru_RU/trips.lang
similarity index 100%
rename from public/langs/ru_RU/trips.lang
rename to htdocs/langs/ru_RU/trips.lang
diff --git a/public/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
similarity index 100%
rename from public/langs/ru_RU/users.lang
rename to htdocs/langs/ru_RU/users.lang
diff --git a/public/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
similarity index 100%
rename from public/langs/ru_RU/website.lang
rename to htdocs/langs/ru_RU/website.lang
diff --git a/public/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
similarity index 100%
rename from public/langs/ru_RU/withdrawals.lang
rename to htdocs/langs/ru_RU/withdrawals.lang
diff --git a/public/langs/ru_RU/workflow.lang b/htdocs/langs/ru_RU/workflow.lang
similarity index 100%
rename from public/langs/ru_RU/workflow.lang
rename to htdocs/langs/ru_RU/workflow.lang
diff --git a/public/langs/ru_UA/banks.lang b/htdocs/langs/ru_UA/banks.lang
similarity index 100%
rename from public/langs/ru_UA/banks.lang
rename to htdocs/langs/ru_UA/banks.lang
diff --git a/public/langs/ru_UA/bookmarks.lang b/htdocs/langs/ru_UA/bookmarks.lang
similarity index 100%
rename from public/langs/ru_UA/bookmarks.lang
rename to htdocs/langs/ru_UA/bookmarks.lang
diff --git a/public/langs/ru_UA/compta.lang b/htdocs/langs/ru_UA/compta.lang
similarity index 100%
rename from public/langs/ru_UA/compta.lang
rename to htdocs/langs/ru_UA/compta.lang
diff --git a/public/langs/ru_UA/contracts.lang b/htdocs/langs/ru_UA/contracts.lang
similarity index 100%
rename from public/langs/ru_UA/contracts.lang
rename to htdocs/langs/ru_UA/contracts.lang
diff --git a/public/langs/ru_UA/dict.lang b/htdocs/langs/ru_UA/dict.lang
similarity index 100%
rename from public/langs/ru_UA/dict.lang
rename to htdocs/langs/ru_UA/dict.lang
diff --git a/public/langs/ru_UA/ecm.lang b/htdocs/langs/ru_UA/ecm.lang
similarity index 100%
rename from public/langs/ru_UA/ecm.lang
rename to htdocs/langs/ru_UA/ecm.lang
diff --git a/public/langs/ru_UA/errors.lang b/htdocs/langs/ru_UA/errors.lang
similarity index 100%
rename from public/langs/ru_UA/errors.lang
rename to htdocs/langs/ru_UA/errors.lang
diff --git a/public/langs/ru_UA/ftp.lang b/htdocs/langs/ru_UA/ftp.lang
similarity index 100%
rename from public/langs/ru_UA/ftp.lang
rename to htdocs/langs/ru_UA/ftp.lang
diff --git a/public/langs/ru_UA/install.lang b/htdocs/langs/ru_UA/install.lang
similarity index 100%
rename from public/langs/ru_UA/install.lang
rename to htdocs/langs/ru_UA/install.lang
diff --git a/public/langs/ru_UA/interventions.lang b/htdocs/langs/ru_UA/interventions.lang
similarity index 100%
rename from public/langs/ru_UA/interventions.lang
rename to htdocs/langs/ru_UA/interventions.lang
diff --git a/public/langs/ru_UA/mails.lang b/htdocs/langs/ru_UA/mails.lang
similarity index 100%
rename from public/langs/ru_UA/mails.lang
rename to htdocs/langs/ru_UA/mails.lang
diff --git a/public/langs/ru_UA/main.lang b/htdocs/langs/ru_UA/main.lang
similarity index 100%
rename from public/langs/ru_UA/main.lang
rename to htdocs/langs/ru_UA/main.lang
diff --git a/public/langs/ru_UA/other.lang b/htdocs/langs/ru_UA/other.lang
similarity index 100%
rename from public/langs/ru_UA/other.lang
rename to htdocs/langs/ru_UA/other.lang
diff --git a/public/langs/ru_UA/paybox.lang b/htdocs/langs/ru_UA/paybox.lang
similarity index 100%
rename from public/langs/ru_UA/paybox.lang
rename to htdocs/langs/ru_UA/paybox.lang
diff --git a/public/langs/ru_UA/paypal.lang b/htdocs/langs/ru_UA/paypal.lang
similarity index 100%
rename from public/langs/ru_UA/paypal.lang
rename to htdocs/langs/ru_UA/paypal.lang
diff --git a/public/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
similarity index 100%
rename from public/langs/sk_SK/accountancy.lang
rename to htdocs/langs/sk_SK/accountancy.lang
diff --git a/public/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
similarity index 100%
rename from public/langs/sk_SK/admin.lang
rename to htdocs/langs/sk_SK/admin.lang
diff --git a/public/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang
similarity index 100%
rename from public/langs/sk_SK/agenda.lang
rename to htdocs/langs/sk_SK/agenda.lang
diff --git a/public/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
similarity index 100%
rename from public/langs/sk_SK/banks.lang
rename to htdocs/langs/sk_SK/banks.lang
diff --git a/public/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
similarity index 100%
rename from public/langs/sk_SK/bills.lang
rename to htdocs/langs/sk_SK/bills.lang
diff --git a/public/langs/sk_SK/bookmarks.lang b/htdocs/langs/sk_SK/bookmarks.lang
similarity index 100%
rename from public/langs/sk_SK/bookmarks.lang
rename to htdocs/langs/sk_SK/bookmarks.lang
diff --git a/public/langs/sk_SK/boxes.lang b/htdocs/langs/sk_SK/boxes.lang
similarity index 100%
rename from public/langs/sk_SK/boxes.lang
rename to htdocs/langs/sk_SK/boxes.lang
diff --git a/public/langs/sk_SK/cashdesk.lang b/htdocs/langs/sk_SK/cashdesk.lang
similarity index 100%
rename from public/langs/sk_SK/cashdesk.lang
rename to htdocs/langs/sk_SK/cashdesk.lang
diff --git a/public/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
similarity index 100%
rename from public/langs/sk_SK/categories.lang
rename to htdocs/langs/sk_SK/categories.lang
diff --git a/public/langs/sk_SK/commercial.lang b/htdocs/langs/sk_SK/commercial.lang
similarity index 100%
rename from public/langs/sk_SK/commercial.lang
rename to htdocs/langs/sk_SK/commercial.lang
diff --git a/public/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
similarity index 100%
rename from public/langs/sk_SK/companies.lang
rename to htdocs/langs/sk_SK/companies.lang
diff --git a/public/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
similarity index 100%
rename from public/langs/sk_SK/compta.lang
rename to htdocs/langs/sk_SK/compta.lang
diff --git a/public/langs/sk_SK/contracts.lang b/htdocs/langs/sk_SK/contracts.lang
similarity index 100%
rename from public/langs/sk_SK/contracts.lang
rename to htdocs/langs/sk_SK/contracts.lang
diff --git a/public/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang
similarity index 100%
rename from public/langs/sk_SK/cron.lang
rename to htdocs/langs/sk_SK/cron.lang
diff --git a/public/langs/sk_SK/deliveries.lang b/htdocs/langs/sk_SK/deliveries.lang
similarity index 100%
rename from public/langs/sk_SK/deliveries.lang
rename to htdocs/langs/sk_SK/deliveries.lang
diff --git a/public/langs/sk_SK/dict.lang b/htdocs/langs/sk_SK/dict.lang
similarity index 100%
rename from public/langs/sk_SK/dict.lang
rename to htdocs/langs/sk_SK/dict.lang
diff --git a/public/langs/sk_SK/donations.lang b/htdocs/langs/sk_SK/donations.lang
similarity index 100%
rename from public/langs/sk_SK/donations.lang
rename to htdocs/langs/sk_SK/donations.lang
diff --git a/public/langs/sk_SK/ecm.lang b/htdocs/langs/sk_SK/ecm.lang
similarity index 100%
rename from public/langs/sk_SK/ecm.lang
rename to htdocs/langs/sk_SK/ecm.lang
diff --git a/public/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
similarity index 100%
rename from public/langs/sk_SK/errors.lang
rename to htdocs/langs/sk_SK/errors.lang
diff --git a/public/langs/sk_SK/exports.lang b/htdocs/langs/sk_SK/exports.lang
similarity index 100%
rename from public/langs/sk_SK/exports.lang
rename to htdocs/langs/sk_SK/exports.lang
diff --git a/public/langs/sk_SK/externalsite.lang b/htdocs/langs/sk_SK/externalsite.lang
similarity index 100%
rename from public/langs/sk_SK/externalsite.lang
rename to htdocs/langs/sk_SK/externalsite.lang
diff --git a/public/langs/sk_SK/ftp.lang b/htdocs/langs/sk_SK/ftp.lang
similarity index 100%
rename from public/langs/sk_SK/ftp.lang
rename to htdocs/langs/sk_SK/ftp.lang
diff --git a/public/langs/sk_SK/help.lang b/htdocs/langs/sk_SK/help.lang
similarity index 100%
rename from public/langs/sk_SK/help.lang
rename to htdocs/langs/sk_SK/help.lang
diff --git a/public/langs/sk_SK/holiday.lang b/htdocs/langs/sk_SK/holiday.lang
similarity index 100%
rename from public/langs/sk_SK/holiday.lang
rename to htdocs/langs/sk_SK/holiday.lang
diff --git a/public/langs/sk_SK/hrm.lang b/htdocs/langs/sk_SK/hrm.lang
similarity index 100%
rename from public/langs/sk_SK/hrm.lang
rename to htdocs/langs/sk_SK/hrm.lang
diff --git a/public/langs/sk_SK/incoterm.lang b/htdocs/langs/sk_SK/incoterm.lang
similarity index 100%
rename from public/langs/sk_SK/incoterm.lang
rename to htdocs/langs/sk_SK/incoterm.lang
diff --git a/public/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang
similarity index 100%
rename from public/langs/sk_SK/install.lang
rename to htdocs/langs/sk_SK/install.lang
diff --git a/public/langs/sk_SK/interventions.lang b/htdocs/langs/sk_SK/interventions.lang
similarity index 100%
rename from public/langs/sk_SK/interventions.lang
rename to htdocs/langs/sk_SK/interventions.lang
diff --git a/public/langs/sk_SK/languages.lang b/htdocs/langs/sk_SK/languages.lang
similarity index 100%
rename from public/langs/sk_SK/languages.lang
rename to htdocs/langs/sk_SK/languages.lang
diff --git a/public/langs/sk_SK/ldap.lang b/htdocs/langs/sk_SK/ldap.lang
similarity index 100%
rename from public/langs/sk_SK/ldap.lang
rename to htdocs/langs/sk_SK/ldap.lang
diff --git a/public/langs/sk_SK/link.lang b/htdocs/langs/sk_SK/link.lang
similarity index 100%
rename from public/langs/sk_SK/link.lang
rename to htdocs/langs/sk_SK/link.lang
diff --git a/public/langs/sk_SK/loan.lang b/htdocs/langs/sk_SK/loan.lang
similarity index 100%
rename from public/langs/sk_SK/loan.lang
rename to htdocs/langs/sk_SK/loan.lang
diff --git a/public/langs/sk_SK/mailmanspip.lang b/htdocs/langs/sk_SK/mailmanspip.lang
similarity index 100%
rename from public/langs/sk_SK/mailmanspip.lang
rename to htdocs/langs/sk_SK/mailmanspip.lang
diff --git a/public/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
similarity index 100%
rename from public/langs/sk_SK/mails.lang
rename to htdocs/langs/sk_SK/mails.lang
diff --git a/public/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
similarity index 100%
rename from public/langs/sk_SK/main.lang
rename to htdocs/langs/sk_SK/main.lang
diff --git a/public/langs/sk_SK/margins.lang b/htdocs/langs/sk_SK/margins.lang
similarity index 100%
rename from public/langs/sk_SK/margins.lang
rename to htdocs/langs/sk_SK/margins.lang
diff --git a/public/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
similarity index 100%
rename from public/langs/sk_SK/members.lang
rename to htdocs/langs/sk_SK/members.lang
diff --git a/public/langs/sk_SK/oauth.lang b/htdocs/langs/sk_SK/oauth.lang
similarity index 100%
rename from public/langs/sk_SK/oauth.lang
rename to htdocs/langs/sk_SK/oauth.lang
diff --git a/public/langs/sk_SK/opensurvey.lang b/htdocs/langs/sk_SK/opensurvey.lang
similarity index 100%
rename from public/langs/sk_SK/opensurvey.lang
rename to htdocs/langs/sk_SK/opensurvey.lang
diff --git a/public/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang
similarity index 100%
rename from public/langs/sk_SK/orders.lang
rename to htdocs/langs/sk_SK/orders.lang
diff --git a/public/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
similarity index 100%
rename from public/langs/sk_SK/other.lang
rename to htdocs/langs/sk_SK/other.lang
diff --git a/public/langs/sk_SK/paybox.lang b/htdocs/langs/sk_SK/paybox.lang
similarity index 100%
rename from public/langs/sk_SK/paybox.lang
rename to htdocs/langs/sk_SK/paybox.lang
diff --git a/public/langs/sk_SK/paypal.lang b/htdocs/langs/sk_SK/paypal.lang
similarity index 100%
rename from public/langs/sk_SK/paypal.lang
rename to htdocs/langs/sk_SK/paypal.lang
diff --git a/public/langs/sk_SK/printing.lang b/htdocs/langs/sk_SK/printing.lang
similarity index 100%
rename from public/langs/sk_SK/printing.lang
rename to htdocs/langs/sk_SK/printing.lang
diff --git a/public/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang
similarity index 100%
rename from public/langs/sk_SK/productbatch.lang
rename to htdocs/langs/sk_SK/productbatch.lang
diff --git a/public/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
similarity index 100%
rename from public/langs/sk_SK/products.lang
rename to htdocs/langs/sk_SK/products.lang
diff --git a/public/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
similarity index 100%
rename from public/langs/sk_SK/projects.lang
rename to htdocs/langs/sk_SK/projects.lang
diff --git a/public/langs/sk_SK/propal.lang b/htdocs/langs/sk_SK/propal.lang
similarity index 100%
rename from public/langs/sk_SK/propal.lang
rename to htdocs/langs/sk_SK/propal.lang
diff --git a/public/langs/sk_SK/receiptprinter.lang b/htdocs/langs/sk_SK/receiptprinter.lang
similarity index 100%
rename from public/langs/sk_SK/receiptprinter.lang
rename to htdocs/langs/sk_SK/receiptprinter.lang
diff --git a/public/langs/sk_SK/resource.lang b/htdocs/langs/sk_SK/resource.lang
similarity index 100%
rename from public/langs/sk_SK/resource.lang
rename to htdocs/langs/sk_SK/resource.lang
diff --git a/public/langs/sk_SK/salaries.lang b/htdocs/langs/sk_SK/salaries.lang
similarity index 100%
rename from public/langs/sk_SK/salaries.lang
rename to htdocs/langs/sk_SK/salaries.lang
diff --git a/public/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang
similarity index 100%
rename from public/langs/sk_SK/sendings.lang
rename to htdocs/langs/sk_SK/sendings.lang
diff --git a/public/langs/sk_SK/sms.lang b/htdocs/langs/sk_SK/sms.lang
similarity index 100%
rename from public/langs/sk_SK/sms.lang
rename to htdocs/langs/sk_SK/sms.lang
diff --git a/public/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
similarity index 100%
rename from public/langs/sk_SK/stocks.lang
rename to htdocs/langs/sk_SK/stocks.lang
diff --git a/public/langs/sk_SK/supplier_proposal.lang b/htdocs/langs/sk_SK/supplier_proposal.lang
similarity index 100%
rename from public/langs/sk_SK/supplier_proposal.lang
rename to htdocs/langs/sk_SK/supplier_proposal.lang
diff --git a/public/langs/sk_SK/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang
similarity index 100%
rename from public/langs/sk_SK/suppliers.lang
rename to htdocs/langs/sk_SK/suppliers.lang
diff --git a/public/langs/sk_SK/trips.lang b/htdocs/langs/sk_SK/trips.lang
similarity index 100%
rename from public/langs/sk_SK/trips.lang
rename to htdocs/langs/sk_SK/trips.lang
diff --git a/public/langs/sk_SK/users.lang b/htdocs/langs/sk_SK/users.lang
similarity index 100%
rename from public/langs/sk_SK/users.lang
rename to htdocs/langs/sk_SK/users.lang
diff --git a/public/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
similarity index 100%
rename from public/langs/sk_SK/website.lang
rename to htdocs/langs/sk_SK/website.lang
diff --git a/public/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
similarity index 100%
rename from public/langs/sk_SK/withdrawals.lang
rename to htdocs/langs/sk_SK/withdrawals.lang
diff --git a/public/langs/sk_SK/workflow.lang b/htdocs/langs/sk_SK/workflow.lang
similarity index 100%
rename from public/langs/sk_SK/workflow.lang
rename to htdocs/langs/sk_SK/workflow.lang
diff --git a/public/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
similarity index 100%
rename from public/langs/sl_SI/accountancy.lang
rename to htdocs/langs/sl_SI/accountancy.lang
diff --git a/public/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
similarity index 100%
rename from public/langs/sl_SI/admin.lang
rename to htdocs/langs/sl_SI/admin.lang
diff --git a/public/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang
similarity index 100%
rename from public/langs/sl_SI/agenda.lang
rename to htdocs/langs/sl_SI/agenda.lang
diff --git a/public/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
similarity index 100%
rename from public/langs/sl_SI/banks.lang
rename to htdocs/langs/sl_SI/banks.lang
diff --git a/public/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
similarity index 100%
rename from public/langs/sl_SI/bills.lang
rename to htdocs/langs/sl_SI/bills.lang
diff --git a/public/langs/sl_SI/bookmarks.lang b/htdocs/langs/sl_SI/bookmarks.lang
similarity index 100%
rename from public/langs/sl_SI/bookmarks.lang
rename to htdocs/langs/sl_SI/bookmarks.lang
diff --git a/public/langs/sl_SI/boxes.lang b/htdocs/langs/sl_SI/boxes.lang
similarity index 100%
rename from public/langs/sl_SI/boxes.lang
rename to htdocs/langs/sl_SI/boxes.lang
diff --git a/public/langs/sl_SI/cashdesk.lang b/htdocs/langs/sl_SI/cashdesk.lang
similarity index 100%
rename from public/langs/sl_SI/cashdesk.lang
rename to htdocs/langs/sl_SI/cashdesk.lang
diff --git a/public/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
similarity index 100%
rename from public/langs/sl_SI/categories.lang
rename to htdocs/langs/sl_SI/categories.lang
diff --git a/public/langs/sl_SI/commercial.lang b/htdocs/langs/sl_SI/commercial.lang
similarity index 100%
rename from public/langs/sl_SI/commercial.lang
rename to htdocs/langs/sl_SI/commercial.lang
diff --git a/public/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
similarity index 100%
rename from public/langs/sl_SI/companies.lang
rename to htdocs/langs/sl_SI/companies.lang
diff --git a/public/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
similarity index 100%
rename from public/langs/sl_SI/compta.lang
rename to htdocs/langs/sl_SI/compta.lang
diff --git a/public/langs/sl_SI/contracts.lang b/htdocs/langs/sl_SI/contracts.lang
similarity index 100%
rename from public/langs/sl_SI/contracts.lang
rename to htdocs/langs/sl_SI/contracts.lang
diff --git a/public/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang
similarity index 100%
rename from public/langs/sl_SI/cron.lang
rename to htdocs/langs/sl_SI/cron.lang
diff --git a/public/langs/sl_SI/deliveries.lang b/htdocs/langs/sl_SI/deliveries.lang
similarity index 100%
rename from public/langs/sl_SI/deliveries.lang
rename to htdocs/langs/sl_SI/deliveries.lang
diff --git a/public/langs/sl_SI/dict.lang b/htdocs/langs/sl_SI/dict.lang
similarity index 100%
rename from public/langs/sl_SI/dict.lang
rename to htdocs/langs/sl_SI/dict.lang
diff --git a/public/langs/sl_SI/donations.lang b/htdocs/langs/sl_SI/donations.lang
similarity index 100%
rename from public/langs/sl_SI/donations.lang
rename to htdocs/langs/sl_SI/donations.lang
diff --git a/public/langs/sl_SI/ecm.lang b/htdocs/langs/sl_SI/ecm.lang
similarity index 100%
rename from public/langs/sl_SI/ecm.lang
rename to htdocs/langs/sl_SI/ecm.lang
diff --git a/public/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
similarity index 100%
rename from public/langs/sl_SI/errors.lang
rename to htdocs/langs/sl_SI/errors.lang
diff --git a/public/langs/sl_SI/exports.lang b/htdocs/langs/sl_SI/exports.lang
similarity index 100%
rename from public/langs/sl_SI/exports.lang
rename to htdocs/langs/sl_SI/exports.lang
diff --git a/public/langs/sl_SI/externalsite.lang b/htdocs/langs/sl_SI/externalsite.lang
similarity index 100%
rename from public/langs/sl_SI/externalsite.lang
rename to htdocs/langs/sl_SI/externalsite.lang
diff --git a/public/langs/sl_SI/ftp.lang b/htdocs/langs/sl_SI/ftp.lang
similarity index 100%
rename from public/langs/sl_SI/ftp.lang
rename to htdocs/langs/sl_SI/ftp.lang
diff --git a/public/langs/sl_SI/help.lang b/htdocs/langs/sl_SI/help.lang
similarity index 100%
rename from public/langs/sl_SI/help.lang
rename to htdocs/langs/sl_SI/help.lang
diff --git a/public/langs/sl_SI/holiday.lang b/htdocs/langs/sl_SI/holiday.lang
similarity index 100%
rename from public/langs/sl_SI/holiday.lang
rename to htdocs/langs/sl_SI/holiday.lang
diff --git a/public/langs/sl_SI/hrm.lang b/htdocs/langs/sl_SI/hrm.lang
similarity index 100%
rename from public/langs/sl_SI/hrm.lang
rename to htdocs/langs/sl_SI/hrm.lang
diff --git a/public/langs/sl_SI/incoterm.lang b/htdocs/langs/sl_SI/incoterm.lang
similarity index 100%
rename from public/langs/sl_SI/incoterm.lang
rename to htdocs/langs/sl_SI/incoterm.lang
diff --git a/public/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang
similarity index 100%
rename from public/langs/sl_SI/install.lang
rename to htdocs/langs/sl_SI/install.lang
diff --git a/public/langs/sl_SI/interventions.lang b/htdocs/langs/sl_SI/interventions.lang
similarity index 100%
rename from public/langs/sl_SI/interventions.lang
rename to htdocs/langs/sl_SI/interventions.lang
diff --git a/public/langs/sl_SI/languages.lang b/htdocs/langs/sl_SI/languages.lang
similarity index 100%
rename from public/langs/sl_SI/languages.lang
rename to htdocs/langs/sl_SI/languages.lang
diff --git a/public/langs/sl_SI/ldap.lang b/htdocs/langs/sl_SI/ldap.lang
similarity index 100%
rename from public/langs/sl_SI/ldap.lang
rename to htdocs/langs/sl_SI/ldap.lang
diff --git a/public/langs/sl_SI/link.lang b/htdocs/langs/sl_SI/link.lang
similarity index 100%
rename from public/langs/sl_SI/link.lang
rename to htdocs/langs/sl_SI/link.lang
diff --git a/public/langs/sl_SI/loan.lang b/htdocs/langs/sl_SI/loan.lang
similarity index 100%
rename from public/langs/sl_SI/loan.lang
rename to htdocs/langs/sl_SI/loan.lang
diff --git a/public/langs/sl_SI/mailmanspip.lang b/htdocs/langs/sl_SI/mailmanspip.lang
similarity index 100%
rename from public/langs/sl_SI/mailmanspip.lang
rename to htdocs/langs/sl_SI/mailmanspip.lang
diff --git a/public/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
similarity index 100%
rename from public/langs/sl_SI/mails.lang
rename to htdocs/langs/sl_SI/mails.lang
diff --git a/public/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
similarity index 100%
rename from public/langs/sl_SI/main.lang
rename to htdocs/langs/sl_SI/main.lang
diff --git a/public/langs/sl_SI/margins.lang b/htdocs/langs/sl_SI/margins.lang
similarity index 100%
rename from public/langs/sl_SI/margins.lang
rename to htdocs/langs/sl_SI/margins.lang
diff --git a/public/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
similarity index 100%
rename from public/langs/sl_SI/members.lang
rename to htdocs/langs/sl_SI/members.lang
diff --git a/public/langs/sl_SI/oauth.lang b/htdocs/langs/sl_SI/oauth.lang
similarity index 100%
rename from public/langs/sl_SI/oauth.lang
rename to htdocs/langs/sl_SI/oauth.lang
diff --git a/public/langs/sl_SI/opensurvey.lang b/htdocs/langs/sl_SI/opensurvey.lang
similarity index 100%
rename from public/langs/sl_SI/opensurvey.lang
rename to htdocs/langs/sl_SI/opensurvey.lang
diff --git a/public/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
similarity index 100%
rename from public/langs/sl_SI/orders.lang
rename to htdocs/langs/sl_SI/orders.lang
diff --git a/public/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
similarity index 100%
rename from public/langs/sl_SI/other.lang
rename to htdocs/langs/sl_SI/other.lang
diff --git a/public/langs/sl_SI/paybox.lang b/htdocs/langs/sl_SI/paybox.lang
similarity index 100%
rename from public/langs/sl_SI/paybox.lang
rename to htdocs/langs/sl_SI/paybox.lang
diff --git a/public/langs/sl_SI/paypal.lang b/htdocs/langs/sl_SI/paypal.lang
similarity index 100%
rename from public/langs/sl_SI/paypal.lang
rename to htdocs/langs/sl_SI/paypal.lang
diff --git a/public/langs/sl_SI/printing.lang b/htdocs/langs/sl_SI/printing.lang
similarity index 100%
rename from public/langs/sl_SI/printing.lang
rename to htdocs/langs/sl_SI/printing.lang
diff --git a/public/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang
similarity index 100%
rename from public/langs/sl_SI/productbatch.lang
rename to htdocs/langs/sl_SI/productbatch.lang
diff --git a/public/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
similarity index 100%
rename from public/langs/sl_SI/products.lang
rename to htdocs/langs/sl_SI/products.lang
diff --git a/public/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
similarity index 100%
rename from public/langs/sl_SI/projects.lang
rename to htdocs/langs/sl_SI/projects.lang
diff --git a/public/langs/sl_SI/propal.lang b/htdocs/langs/sl_SI/propal.lang
similarity index 100%
rename from public/langs/sl_SI/propal.lang
rename to htdocs/langs/sl_SI/propal.lang
diff --git a/public/langs/sl_SI/receiptprinter.lang b/htdocs/langs/sl_SI/receiptprinter.lang
similarity index 100%
rename from public/langs/sl_SI/receiptprinter.lang
rename to htdocs/langs/sl_SI/receiptprinter.lang
diff --git a/public/langs/sl_SI/resource.lang b/htdocs/langs/sl_SI/resource.lang
similarity index 100%
rename from public/langs/sl_SI/resource.lang
rename to htdocs/langs/sl_SI/resource.lang
diff --git a/public/langs/sl_SI/salaries.lang b/htdocs/langs/sl_SI/salaries.lang
similarity index 100%
rename from public/langs/sl_SI/salaries.lang
rename to htdocs/langs/sl_SI/salaries.lang
diff --git a/public/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang
similarity index 100%
rename from public/langs/sl_SI/sendings.lang
rename to htdocs/langs/sl_SI/sendings.lang
diff --git a/public/langs/sl_SI/sms.lang b/htdocs/langs/sl_SI/sms.lang
similarity index 100%
rename from public/langs/sl_SI/sms.lang
rename to htdocs/langs/sl_SI/sms.lang
diff --git a/public/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
similarity index 100%
rename from public/langs/sl_SI/stocks.lang
rename to htdocs/langs/sl_SI/stocks.lang
diff --git a/public/langs/sl_SI/supplier_proposal.lang b/htdocs/langs/sl_SI/supplier_proposal.lang
similarity index 100%
rename from public/langs/sl_SI/supplier_proposal.lang
rename to htdocs/langs/sl_SI/supplier_proposal.lang
diff --git a/public/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang
similarity index 100%
rename from public/langs/sl_SI/suppliers.lang
rename to htdocs/langs/sl_SI/suppliers.lang
diff --git a/public/langs/sl_SI/trips.lang b/htdocs/langs/sl_SI/trips.lang
similarity index 100%
rename from public/langs/sl_SI/trips.lang
rename to htdocs/langs/sl_SI/trips.lang
diff --git a/public/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
similarity index 100%
rename from public/langs/sl_SI/users.lang
rename to htdocs/langs/sl_SI/users.lang
diff --git a/public/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
similarity index 100%
rename from public/langs/sl_SI/website.lang
rename to htdocs/langs/sl_SI/website.lang
diff --git a/public/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
similarity index 100%
rename from public/langs/sl_SI/withdrawals.lang
rename to htdocs/langs/sl_SI/withdrawals.lang
diff --git a/public/langs/sl_SI/workflow.lang b/htdocs/langs/sl_SI/workflow.lang
similarity index 100%
rename from public/langs/sl_SI/workflow.lang
rename to htdocs/langs/sl_SI/workflow.lang
diff --git a/public/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
similarity index 100%
rename from public/langs/sq_AL/accountancy.lang
rename to htdocs/langs/sq_AL/accountancy.lang
diff --git a/public/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
similarity index 100%
rename from public/langs/sq_AL/admin.lang
rename to htdocs/langs/sq_AL/admin.lang
diff --git a/public/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang
similarity index 100%
rename from public/langs/sq_AL/agenda.lang
rename to htdocs/langs/sq_AL/agenda.lang
diff --git a/public/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
similarity index 100%
rename from public/langs/sq_AL/banks.lang
rename to htdocs/langs/sq_AL/banks.lang
diff --git a/public/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
similarity index 100%
rename from public/langs/sq_AL/bills.lang
rename to htdocs/langs/sq_AL/bills.lang
diff --git a/public/langs/sq_AL/bookmarks.lang b/htdocs/langs/sq_AL/bookmarks.lang
similarity index 100%
rename from public/langs/sq_AL/bookmarks.lang
rename to htdocs/langs/sq_AL/bookmarks.lang
diff --git a/public/langs/sq_AL/boxes.lang b/htdocs/langs/sq_AL/boxes.lang
similarity index 100%
rename from public/langs/sq_AL/boxes.lang
rename to htdocs/langs/sq_AL/boxes.lang
diff --git a/public/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
similarity index 100%
rename from public/langs/sq_AL/cashdesk.lang
rename to htdocs/langs/sq_AL/cashdesk.lang
diff --git a/public/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
similarity index 100%
rename from public/langs/sq_AL/categories.lang
rename to htdocs/langs/sq_AL/categories.lang
diff --git a/public/langs/sq_AL/commercial.lang b/htdocs/langs/sq_AL/commercial.lang
similarity index 100%
rename from public/langs/sq_AL/commercial.lang
rename to htdocs/langs/sq_AL/commercial.lang
diff --git a/public/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
similarity index 100%
rename from public/langs/sq_AL/companies.lang
rename to htdocs/langs/sq_AL/companies.lang
diff --git a/public/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
similarity index 100%
rename from public/langs/sq_AL/compta.lang
rename to htdocs/langs/sq_AL/compta.lang
diff --git a/public/langs/sq_AL/contracts.lang b/htdocs/langs/sq_AL/contracts.lang
similarity index 100%
rename from public/langs/sq_AL/contracts.lang
rename to htdocs/langs/sq_AL/contracts.lang
diff --git a/public/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
similarity index 100%
rename from public/langs/sq_AL/cron.lang
rename to htdocs/langs/sq_AL/cron.lang
diff --git a/public/langs/sq_AL/deliveries.lang b/htdocs/langs/sq_AL/deliveries.lang
similarity index 100%
rename from public/langs/sq_AL/deliveries.lang
rename to htdocs/langs/sq_AL/deliveries.lang
diff --git a/public/langs/sq_AL/dict.lang b/htdocs/langs/sq_AL/dict.lang
similarity index 100%
rename from public/langs/sq_AL/dict.lang
rename to htdocs/langs/sq_AL/dict.lang
diff --git a/public/langs/sq_AL/donations.lang b/htdocs/langs/sq_AL/donations.lang
similarity index 100%
rename from public/langs/sq_AL/donations.lang
rename to htdocs/langs/sq_AL/donations.lang
diff --git a/public/langs/sq_AL/ecm.lang b/htdocs/langs/sq_AL/ecm.lang
similarity index 100%
rename from public/langs/sq_AL/ecm.lang
rename to htdocs/langs/sq_AL/ecm.lang
diff --git a/public/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
similarity index 100%
rename from public/langs/sq_AL/errors.lang
rename to htdocs/langs/sq_AL/errors.lang
diff --git a/public/langs/sq_AL/exports.lang b/htdocs/langs/sq_AL/exports.lang
similarity index 100%
rename from public/langs/sq_AL/exports.lang
rename to htdocs/langs/sq_AL/exports.lang
diff --git a/public/langs/sq_AL/externalsite.lang b/htdocs/langs/sq_AL/externalsite.lang
similarity index 100%
rename from public/langs/sq_AL/externalsite.lang
rename to htdocs/langs/sq_AL/externalsite.lang
diff --git a/public/langs/sq_AL/ftp.lang b/htdocs/langs/sq_AL/ftp.lang
similarity index 100%
rename from public/langs/sq_AL/ftp.lang
rename to htdocs/langs/sq_AL/ftp.lang
diff --git a/public/langs/sq_AL/help.lang b/htdocs/langs/sq_AL/help.lang
similarity index 100%
rename from public/langs/sq_AL/help.lang
rename to htdocs/langs/sq_AL/help.lang
diff --git a/public/langs/sq_AL/holiday.lang b/htdocs/langs/sq_AL/holiday.lang
similarity index 100%
rename from public/langs/sq_AL/holiday.lang
rename to htdocs/langs/sq_AL/holiday.lang
diff --git a/public/langs/sq_AL/hrm.lang b/htdocs/langs/sq_AL/hrm.lang
similarity index 100%
rename from public/langs/sq_AL/hrm.lang
rename to htdocs/langs/sq_AL/hrm.lang
diff --git a/public/langs/sq_AL/incoterm.lang b/htdocs/langs/sq_AL/incoterm.lang
similarity index 100%
rename from public/langs/sq_AL/incoterm.lang
rename to htdocs/langs/sq_AL/incoterm.lang
diff --git a/public/langs/sq_AL/install.lang b/htdocs/langs/sq_AL/install.lang
similarity index 100%
rename from public/langs/sq_AL/install.lang
rename to htdocs/langs/sq_AL/install.lang
diff --git a/public/langs/sq_AL/interventions.lang b/htdocs/langs/sq_AL/interventions.lang
similarity index 100%
rename from public/langs/sq_AL/interventions.lang
rename to htdocs/langs/sq_AL/interventions.lang
diff --git a/public/langs/sq_AL/languages.lang b/htdocs/langs/sq_AL/languages.lang
similarity index 100%
rename from public/langs/sq_AL/languages.lang
rename to htdocs/langs/sq_AL/languages.lang
diff --git a/public/langs/sq_AL/ldap.lang b/htdocs/langs/sq_AL/ldap.lang
similarity index 100%
rename from public/langs/sq_AL/ldap.lang
rename to htdocs/langs/sq_AL/ldap.lang
diff --git a/public/langs/sq_AL/link.lang b/htdocs/langs/sq_AL/link.lang
similarity index 100%
rename from public/langs/sq_AL/link.lang
rename to htdocs/langs/sq_AL/link.lang
diff --git a/public/langs/sq_AL/loan.lang b/htdocs/langs/sq_AL/loan.lang
similarity index 100%
rename from public/langs/sq_AL/loan.lang
rename to htdocs/langs/sq_AL/loan.lang
diff --git a/public/langs/sq_AL/mailmanspip.lang b/htdocs/langs/sq_AL/mailmanspip.lang
similarity index 100%
rename from public/langs/sq_AL/mailmanspip.lang
rename to htdocs/langs/sq_AL/mailmanspip.lang
diff --git a/public/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
similarity index 100%
rename from public/langs/sq_AL/mails.lang
rename to htdocs/langs/sq_AL/mails.lang
diff --git a/public/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
similarity index 100%
rename from public/langs/sq_AL/main.lang
rename to htdocs/langs/sq_AL/main.lang
diff --git a/public/langs/sq_AL/margins.lang b/htdocs/langs/sq_AL/margins.lang
similarity index 100%
rename from public/langs/sq_AL/margins.lang
rename to htdocs/langs/sq_AL/margins.lang
diff --git a/public/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
similarity index 100%
rename from public/langs/sq_AL/members.lang
rename to htdocs/langs/sq_AL/members.lang
diff --git a/public/langs/sq_AL/oauth.lang b/htdocs/langs/sq_AL/oauth.lang
similarity index 100%
rename from public/langs/sq_AL/oauth.lang
rename to htdocs/langs/sq_AL/oauth.lang
diff --git a/public/langs/sq_AL/opensurvey.lang b/htdocs/langs/sq_AL/opensurvey.lang
similarity index 100%
rename from public/langs/sq_AL/opensurvey.lang
rename to htdocs/langs/sq_AL/opensurvey.lang
diff --git a/public/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
similarity index 100%
rename from public/langs/sq_AL/orders.lang
rename to htdocs/langs/sq_AL/orders.lang
diff --git a/public/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
similarity index 100%
rename from public/langs/sq_AL/other.lang
rename to htdocs/langs/sq_AL/other.lang
diff --git a/public/langs/sq_AL/paybox.lang b/htdocs/langs/sq_AL/paybox.lang
similarity index 100%
rename from public/langs/sq_AL/paybox.lang
rename to htdocs/langs/sq_AL/paybox.lang
diff --git a/public/langs/sq_AL/paypal.lang b/htdocs/langs/sq_AL/paypal.lang
similarity index 100%
rename from public/langs/sq_AL/paypal.lang
rename to htdocs/langs/sq_AL/paypal.lang
diff --git a/public/langs/sq_AL/printing.lang b/htdocs/langs/sq_AL/printing.lang
similarity index 100%
rename from public/langs/sq_AL/printing.lang
rename to htdocs/langs/sq_AL/printing.lang
diff --git a/public/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang
similarity index 100%
rename from public/langs/sq_AL/productbatch.lang
rename to htdocs/langs/sq_AL/productbatch.lang
diff --git a/public/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
similarity index 100%
rename from public/langs/sq_AL/products.lang
rename to htdocs/langs/sq_AL/products.lang
diff --git a/public/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
similarity index 100%
rename from public/langs/sq_AL/projects.lang
rename to htdocs/langs/sq_AL/projects.lang
diff --git a/public/langs/sq_AL/propal.lang b/htdocs/langs/sq_AL/propal.lang
similarity index 100%
rename from public/langs/sq_AL/propal.lang
rename to htdocs/langs/sq_AL/propal.lang
diff --git a/public/langs/sq_AL/receiptprinter.lang b/htdocs/langs/sq_AL/receiptprinter.lang
similarity index 100%
rename from public/langs/sq_AL/receiptprinter.lang
rename to htdocs/langs/sq_AL/receiptprinter.lang
diff --git a/public/langs/sq_AL/resource.lang b/htdocs/langs/sq_AL/resource.lang
similarity index 100%
rename from public/langs/sq_AL/resource.lang
rename to htdocs/langs/sq_AL/resource.lang
diff --git a/public/langs/sq_AL/salaries.lang b/htdocs/langs/sq_AL/salaries.lang
similarity index 100%
rename from public/langs/sq_AL/salaries.lang
rename to htdocs/langs/sq_AL/salaries.lang
diff --git a/public/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang
similarity index 100%
rename from public/langs/sq_AL/sendings.lang
rename to htdocs/langs/sq_AL/sendings.lang
diff --git a/public/langs/sq_AL/sms.lang b/htdocs/langs/sq_AL/sms.lang
similarity index 100%
rename from public/langs/sq_AL/sms.lang
rename to htdocs/langs/sq_AL/sms.lang
diff --git a/public/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
similarity index 100%
rename from public/langs/sq_AL/stocks.lang
rename to htdocs/langs/sq_AL/stocks.lang
diff --git a/public/langs/sq_AL/supplier_proposal.lang b/htdocs/langs/sq_AL/supplier_proposal.lang
similarity index 100%
rename from public/langs/sq_AL/supplier_proposal.lang
rename to htdocs/langs/sq_AL/supplier_proposal.lang
diff --git a/public/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang
similarity index 100%
rename from public/langs/sq_AL/suppliers.lang
rename to htdocs/langs/sq_AL/suppliers.lang
diff --git a/public/langs/sq_AL/trips.lang b/htdocs/langs/sq_AL/trips.lang
similarity index 100%
rename from public/langs/sq_AL/trips.lang
rename to htdocs/langs/sq_AL/trips.lang
diff --git a/public/langs/sq_AL/users.lang b/htdocs/langs/sq_AL/users.lang
similarity index 100%
rename from public/langs/sq_AL/users.lang
rename to htdocs/langs/sq_AL/users.lang
diff --git a/public/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
similarity index 100%
rename from public/langs/sq_AL/website.lang
rename to htdocs/langs/sq_AL/website.lang
diff --git a/public/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
similarity index 100%
rename from public/langs/sq_AL/withdrawals.lang
rename to htdocs/langs/sq_AL/withdrawals.lang
diff --git a/public/langs/sq_AL/workflow.lang b/htdocs/langs/sq_AL/workflow.lang
similarity index 100%
rename from public/langs/sq_AL/workflow.lang
rename to htdocs/langs/sq_AL/workflow.lang
diff --git a/public/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
similarity index 100%
rename from public/langs/sr_RS/accountancy.lang
rename to htdocs/langs/sr_RS/accountancy.lang
diff --git a/public/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
similarity index 100%
rename from public/langs/sr_RS/admin.lang
rename to htdocs/langs/sr_RS/admin.lang
diff --git a/public/langs/sr_RS/agenda.lang b/htdocs/langs/sr_RS/agenda.lang
similarity index 100%
rename from public/langs/sr_RS/agenda.lang
rename to htdocs/langs/sr_RS/agenda.lang
diff --git a/public/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
similarity index 100%
rename from public/langs/sr_RS/banks.lang
rename to htdocs/langs/sr_RS/banks.lang
diff --git a/public/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
similarity index 100%
rename from public/langs/sr_RS/bills.lang
rename to htdocs/langs/sr_RS/bills.lang
diff --git a/public/langs/sr_RS/bookmarks.lang b/htdocs/langs/sr_RS/bookmarks.lang
similarity index 100%
rename from public/langs/sr_RS/bookmarks.lang
rename to htdocs/langs/sr_RS/bookmarks.lang
diff --git a/public/langs/sr_RS/boxes.lang b/htdocs/langs/sr_RS/boxes.lang
similarity index 100%
rename from public/langs/sr_RS/boxes.lang
rename to htdocs/langs/sr_RS/boxes.lang
diff --git a/public/langs/sr_RS/cashdesk.lang b/htdocs/langs/sr_RS/cashdesk.lang
similarity index 100%
rename from public/langs/sr_RS/cashdesk.lang
rename to htdocs/langs/sr_RS/cashdesk.lang
diff --git a/public/langs/sr_RS/categories.lang b/htdocs/langs/sr_RS/categories.lang
similarity index 100%
rename from public/langs/sr_RS/categories.lang
rename to htdocs/langs/sr_RS/categories.lang
diff --git a/public/langs/sr_RS/commercial.lang b/htdocs/langs/sr_RS/commercial.lang
similarity index 100%
rename from public/langs/sr_RS/commercial.lang
rename to htdocs/langs/sr_RS/commercial.lang
diff --git a/public/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
similarity index 100%
rename from public/langs/sr_RS/companies.lang
rename to htdocs/langs/sr_RS/companies.lang
diff --git a/public/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
similarity index 100%
rename from public/langs/sr_RS/compta.lang
rename to htdocs/langs/sr_RS/compta.lang
diff --git a/public/langs/sr_RS/contracts.lang b/htdocs/langs/sr_RS/contracts.lang
similarity index 100%
rename from public/langs/sr_RS/contracts.lang
rename to htdocs/langs/sr_RS/contracts.lang
diff --git a/public/langs/sr_RS/cron.lang b/htdocs/langs/sr_RS/cron.lang
similarity index 100%
rename from public/langs/sr_RS/cron.lang
rename to htdocs/langs/sr_RS/cron.lang
diff --git a/public/langs/sr_RS/deliveries.lang b/htdocs/langs/sr_RS/deliveries.lang
similarity index 100%
rename from public/langs/sr_RS/deliveries.lang
rename to htdocs/langs/sr_RS/deliveries.lang
diff --git a/public/langs/sr_RS/dict.lang b/htdocs/langs/sr_RS/dict.lang
similarity index 100%
rename from public/langs/sr_RS/dict.lang
rename to htdocs/langs/sr_RS/dict.lang
diff --git a/public/langs/sr_RS/donations.lang b/htdocs/langs/sr_RS/donations.lang
similarity index 100%
rename from public/langs/sr_RS/donations.lang
rename to htdocs/langs/sr_RS/donations.lang
diff --git a/public/langs/sr_RS/ecm.lang b/htdocs/langs/sr_RS/ecm.lang
similarity index 100%
rename from public/langs/sr_RS/ecm.lang
rename to htdocs/langs/sr_RS/ecm.lang
diff --git a/public/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
similarity index 100%
rename from public/langs/sr_RS/errors.lang
rename to htdocs/langs/sr_RS/errors.lang
diff --git a/public/langs/sr_RS/exports.lang b/htdocs/langs/sr_RS/exports.lang
similarity index 100%
rename from public/langs/sr_RS/exports.lang
rename to htdocs/langs/sr_RS/exports.lang
diff --git a/public/langs/sr_RS/externalsite.lang b/htdocs/langs/sr_RS/externalsite.lang
similarity index 100%
rename from public/langs/sr_RS/externalsite.lang
rename to htdocs/langs/sr_RS/externalsite.lang
diff --git a/public/langs/sr_RS/ftp.lang b/htdocs/langs/sr_RS/ftp.lang
similarity index 100%
rename from public/langs/sr_RS/ftp.lang
rename to htdocs/langs/sr_RS/ftp.lang
diff --git a/public/langs/sr_RS/help.lang b/htdocs/langs/sr_RS/help.lang
similarity index 100%
rename from public/langs/sr_RS/help.lang
rename to htdocs/langs/sr_RS/help.lang
diff --git a/public/langs/sr_RS/holiday.lang b/htdocs/langs/sr_RS/holiday.lang
similarity index 100%
rename from public/langs/sr_RS/holiday.lang
rename to htdocs/langs/sr_RS/holiday.lang
diff --git a/public/langs/sr_RS/incoterm.lang b/htdocs/langs/sr_RS/incoterm.lang
similarity index 100%
rename from public/langs/sr_RS/incoterm.lang
rename to htdocs/langs/sr_RS/incoterm.lang
diff --git a/public/langs/sr_RS/install.lang b/htdocs/langs/sr_RS/install.lang
similarity index 100%
rename from public/langs/sr_RS/install.lang
rename to htdocs/langs/sr_RS/install.lang
diff --git a/public/langs/sr_RS/interventions.lang b/htdocs/langs/sr_RS/interventions.lang
similarity index 100%
rename from public/langs/sr_RS/interventions.lang
rename to htdocs/langs/sr_RS/interventions.lang
diff --git a/public/langs/sr_RS/languages.lang b/htdocs/langs/sr_RS/languages.lang
similarity index 100%
rename from public/langs/sr_RS/languages.lang
rename to htdocs/langs/sr_RS/languages.lang
diff --git a/public/langs/sr_RS/ldap.lang b/htdocs/langs/sr_RS/ldap.lang
similarity index 100%
rename from public/langs/sr_RS/ldap.lang
rename to htdocs/langs/sr_RS/ldap.lang
diff --git a/public/langs/sr_RS/link.lang b/htdocs/langs/sr_RS/link.lang
similarity index 100%
rename from public/langs/sr_RS/link.lang
rename to htdocs/langs/sr_RS/link.lang
diff --git a/public/langs/sr_RS/loan.lang b/htdocs/langs/sr_RS/loan.lang
similarity index 100%
rename from public/langs/sr_RS/loan.lang
rename to htdocs/langs/sr_RS/loan.lang
diff --git a/public/langs/sr_RS/mailmanspip.lang b/htdocs/langs/sr_RS/mailmanspip.lang
similarity index 100%
rename from public/langs/sr_RS/mailmanspip.lang
rename to htdocs/langs/sr_RS/mailmanspip.lang
diff --git a/public/langs/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
similarity index 100%
rename from public/langs/sr_RS/mails.lang
rename to htdocs/langs/sr_RS/mails.lang
diff --git a/public/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
similarity index 100%
rename from public/langs/sr_RS/main.lang
rename to htdocs/langs/sr_RS/main.lang
diff --git a/public/langs/sr_RS/margins.lang b/htdocs/langs/sr_RS/margins.lang
similarity index 100%
rename from public/langs/sr_RS/margins.lang
rename to htdocs/langs/sr_RS/margins.lang
diff --git a/public/langs/sr_RS/members.lang b/htdocs/langs/sr_RS/members.lang
similarity index 100%
rename from public/langs/sr_RS/members.lang
rename to htdocs/langs/sr_RS/members.lang
diff --git a/public/langs/sr_RS/opensurvey.lang b/htdocs/langs/sr_RS/opensurvey.lang
similarity index 100%
rename from public/langs/sr_RS/opensurvey.lang
rename to htdocs/langs/sr_RS/opensurvey.lang
diff --git a/public/langs/sr_RS/orders.lang b/htdocs/langs/sr_RS/orders.lang
similarity index 100%
rename from public/langs/sr_RS/orders.lang
rename to htdocs/langs/sr_RS/orders.lang
diff --git a/public/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
similarity index 100%
rename from public/langs/sr_RS/other.lang
rename to htdocs/langs/sr_RS/other.lang
diff --git a/public/langs/sr_RS/paybox.lang b/htdocs/langs/sr_RS/paybox.lang
similarity index 100%
rename from public/langs/sr_RS/paybox.lang
rename to htdocs/langs/sr_RS/paybox.lang
diff --git a/public/langs/sr_RS/paypal.lang b/htdocs/langs/sr_RS/paypal.lang
similarity index 100%
rename from public/langs/sr_RS/paypal.lang
rename to htdocs/langs/sr_RS/paypal.lang
diff --git a/public/langs/sr_RS/printing.lang b/htdocs/langs/sr_RS/printing.lang
similarity index 100%
rename from public/langs/sr_RS/printing.lang
rename to htdocs/langs/sr_RS/printing.lang
diff --git a/public/langs/sr_RS/productbatch.lang b/htdocs/langs/sr_RS/productbatch.lang
similarity index 100%
rename from public/langs/sr_RS/productbatch.lang
rename to htdocs/langs/sr_RS/productbatch.lang
diff --git a/public/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
similarity index 100%
rename from public/langs/sr_RS/products.lang
rename to htdocs/langs/sr_RS/products.lang
diff --git a/public/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
similarity index 100%
rename from public/langs/sr_RS/projects.lang
rename to htdocs/langs/sr_RS/projects.lang
diff --git a/public/langs/sr_RS/propal.lang b/htdocs/langs/sr_RS/propal.lang
similarity index 100%
rename from public/langs/sr_RS/propal.lang
rename to htdocs/langs/sr_RS/propal.lang
diff --git a/public/langs/sr_RS/resource.lang b/htdocs/langs/sr_RS/resource.lang
similarity index 100%
rename from public/langs/sr_RS/resource.lang
rename to htdocs/langs/sr_RS/resource.lang
diff --git a/public/langs/sr_RS/salaries.lang b/htdocs/langs/sr_RS/salaries.lang
similarity index 100%
rename from public/langs/sr_RS/salaries.lang
rename to htdocs/langs/sr_RS/salaries.lang
diff --git a/public/langs/sr_RS/sendings.lang b/htdocs/langs/sr_RS/sendings.lang
similarity index 100%
rename from public/langs/sr_RS/sendings.lang
rename to htdocs/langs/sr_RS/sendings.lang
diff --git a/public/langs/sr_RS/sms.lang b/htdocs/langs/sr_RS/sms.lang
similarity index 100%
rename from public/langs/sr_RS/sms.lang
rename to htdocs/langs/sr_RS/sms.lang
diff --git a/public/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
similarity index 100%
rename from public/langs/sr_RS/stocks.lang
rename to htdocs/langs/sr_RS/stocks.lang
diff --git a/public/langs/sr_RS/suppliers.lang b/htdocs/langs/sr_RS/suppliers.lang
similarity index 100%
rename from public/langs/sr_RS/suppliers.lang
rename to htdocs/langs/sr_RS/suppliers.lang
diff --git a/public/langs/sr_RS/trips.lang b/htdocs/langs/sr_RS/trips.lang
similarity index 100%
rename from public/langs/sr_RS/trips.lang
rename to htdocs/langs/sr_RS/trips.lang
diff --git a/public/langs/sr_RS/users.lang b/htdocs/langs/sr_RS/users.lang
similarity index 100%
rename from public/langs/sr_RS/users.lang
rename to htdocs/langs/sr_RS/users.lang
diff --git a/public/langs/sr_RS/withdrawals.lang b/htdocs/langs/sr_RS/withdrawals.lang
similarity index 100%
rename from public/langs/sr_RS/withdrawals.lang
rename to htdocs/langs/sr_RS/withdrawals.lang
diff --git a/public/langs/sr_RS/workflow.lang b/htdocs/langs/sr_RS/workflow.lang
similarity index 100%
rename from public/langs/sr_RS/workflow.lang
rename to htdocs/langs/sr_RS/workflow.lang
diff --git a/public/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
similarity index 100%
rename from public/langs/sv_SE/accountancy.lang
rename to htdocs/langs/sv_SE/accountancy.lang
diff --git a/public/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
similarity index 100%
rename from public/langs/sv_SE/admin.lang
rename to htdocs/langs/sv_SE/admin.lang
diff --git a/public/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
similarity index 100%
rename from public/langs/sv_SE/agenda.lang
rename to htdocs/langs/sv_SE/agenda.lang
diff --git a/public/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
similarity index 100%
rename from public/langs/sv_SE/banks.lang
rename to htdocs/langs/sv_SE/banks.lang
diff --git a/public/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
similarity index 100%
rename from public/langs/sv_SE/bills.lang
rename to htdocs/langs/sv_SE/bills.lang
diff --git a/public/langs/sv_SE/bookmarks.lang b/htdocs/langs/sv_SE/bookmarks.lang
similarity index 100%
rename from public/langs/sv_SE/bookmarks.lang
rename to htdocs/langs/sv_SE/bookmarks.lang
diff --git a/public/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
similarity index 100%
rename from public/langs/sv_SE/boxes.lang
rename to htdocs/langs/sv_SE/boxes.lang
diff --git a/public/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
similarity index 100%
rename from public/langs/sv_SE/cashdesk.lang
rename to htdocs/langs/sv_SE/cashdesk.lang
diff --git a/public/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
similarity index 100%
rename from public/langs/sv_SE/categories.lang
rename to htdocs/langs/sv_SE/categories.lang
diff --git a/public/langs/sv_SE/commercial.lang b/htdocs/langs/sv_SE/commercial.lang
similarity index 100%
rename from public/langs/sv_SE/commercial.lang
rename to htdocs/langs/sv_SE/commercial.lang
diff --git a/public/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
similarity index 100%
rename from public/langs/sv_SE/companies.lang
rename to htdocs/langs/sv_SE/companies.lang
diff --git a/public/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
similarity index 100%
rename from public/langs/sv_SE/compta.lang
rename to htdocs/langs/sv_SE/compta.lang
diff --git a/public/langs/sv_SE/contracts.lang b/htdocs/langs/sv_SE/contracts.lang
similarity index 100%
rename from public/langs/sv_SE/contracts.lang
rename to htdocs/langs/sv_SE/contracts.lang
diff --git a/public/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
similarity index 100%
rename from public/langs/sv_SE/cron.lang
rename to htdocs/langs/sv_SE/cron.lang
diff --git a/public/langs/sv_SE/deliveries.lang b/htdocs/langs/sv_SE/deliveries.lang
similarity index 100%
rename from public/langs/sv_SE/deliveries.lang
rename to htdocs/langs/sv_SE/deliveries.lang
diff --git a/public/langs/sv_SE/dict.lang b/htdocs/langs/sv_SE/dict.lang
similarity index 100%
rename from public/langs/sv_SE/dict.lang
rename to htdocs/langs/sv_SE/dict.lang
diff --git a/public/langs/sv_SE/donations.lang b/htdocs/langs/sv_SE/donations.lang
similarity index 100%
rename from public/langs/sv_SE/donations.lang
rename to htdocs/langs/sv_SE/donations.lang
diff --git a/public/langs/sv_SE/ecm.lang b/htdocs/langs/sv_SE/ecm.lang
similarity index 100%
rename from public/langs/sv_SE/ecm.lang
rename to htdocs/langs/sv_SE/ecm.lang
diff --git a/public/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
similarity index 100%
rename from public/langs/sv_SE/errors.lang
rename to htdocs/langs/sv_SE/errors.lang
diff --git a/public/langs/sv_SE/exports.lang b/htdocs/langs/sv_SE/exports.lang
similarity index 100%
rename from public/langs/sv_SE/exports.lang
rename to htdocs/langs/sv_SE/exports.lang
diff --git a/public/langs/sv_SE/externalsite.lang b/htdocs/langs/sv_SE/externalsite.lang
similarity index 100%
rename from public/langs/sv_SE/externalsite.lang
rename to htdocs/langs/sv_SE/externalsite.lang
diff --git a/public/langs/sv_SE/ftp.lang b/htdocs/langs/sv_SE/ftp.lang
similarity index 100%
rename from public/langs/sv_SE/ftp.lang
rename to htdocs/langs/sv_SE/ftp.lang
diff --git a/public/langs/sv_SE/help.lang b/htdocs/langs/sv_SE/help.lang
similarity index 100%
rename from public/langs/sv_SE/help.lang
rename to htdocs/langs/sv_SE/help.lang
diff --git a/public/langs/sv_SE/holiday.lang b/htdocs/langs/sv_SE/holiday.lang
similarity index 100%
rename from public/langs/sv_SE/holiday.lang
rename to htdocs/langs/sv_SE/holiday.lang
diff --git a/public/langs/sv_SE/hrm.lang b/htdocs/langs/sv_SE/hrm.lang
similarity index 100%
rename from public/langs/sv_SE/hrm.lang
rename to htdocs/langs/sv_SE/hrm.lang
diff --git a/public/langs/sv_SE/incoterm.lang b/htdocs/langs/sv_SE/incoterm.lang
similarity index 100%
rename from public/langs/sv_SE/incoterm.lang
rename to htdocs/langs/sv_SE/incoterm.lang
diff --git a/public/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang
similarity index 100%
rename from public/langs/sv_SE/install.lang
rename to htdocs/langs/sv_SE/install.lang
diff --git a/public/langs/sv_SE/interventions.lang b/htdocs/langs/sv_SE/interventions.lang
similarity index 100%
rename from public/langs/sv_SE/interventions.lang
rename to htdocs/langs/sv_SE/interventions.lang
diff --git a/public/langs/sv_SE/languages.lang b/htdocs/langs/sv_SE/languages.lang
similarity index 100%
rename from public/langs/sv_SE/languages.lang
rename to htdocs/langs/sv_SE/languages.lang
diff --git a/public/langs/sv_SE/ldap.lang b/htdocs/langs/sv_SE/ldap.lang
similarity index 100%
rename from public/langs/sv_SE/ldap.lang
rename to htdocs/langs/sv_SE/ldap.lang
diff --git a/public/langs/sv_SE/link.lang b/htdocs/langs/sv_SE/link.lang
similarity index 100%
rename from public/langs/sv_SE/link.lang
rename to htdocs/langs/sv_SE/link.lang
diff --git a/public/langs/sv_SE/loan.lang b/htdocs/langs/sv_SE/loan.lang
similarity index 100%
rename from public/langs/sv_SE/loan.lang
rename to htdocs/langs/sv_SE/loan.lang
diff --git a/public/langs/sv_SE/mailmanspip.lang b/htdocs/langs/sv_SE/mailmanspip.lang
similarity index 100%
rename from public/langs/sv_SE/mailmanspip.lang
rename to htdocs/langs/sv_SE/mailmanspip.lang
diff --git a/public/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
similarity index 100%
rename from public/langs/sv_SE/mails.lang
rename to htdocs/langs/sv_SE/mails.lang
diff --git a/public/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
similarity index 100%
rename from public/langs/sv_SE/main.lang
rename to htdocs/langs/sv_SE/main.lang
diff --git a/public/langs/sv_SE/margins.lang b/htdocs/langs/sv_SE/margins.lang
similarity index 100%
rename from public/langs/sv_SE/margins.lang
rename to htdocs/langs/sv_SE/margins.lang
diff --git a/public/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
similarity index 100%
rename from public/langs/sv_SE/members.lang
rename to htdocs/langs/sv_SE/members.lang
diff --git a/public/langs/sv_SE/oauth.lang b/htdocs/langs/sv_SE/oauth.lang
similarity index 100%
rename from public/langs/sv_SE/oauth.lang
rename to htdocs/langs/sv_SE/oauth.lang
diff --git a/public/langs/sv_SE/opensurvey.lang b/htdocs/langs/sv_SE/opensurvey.lang
similarity index 100%
rename from public/langs/sv_SE/opensurvey.lang
rename to htdocs/langs/sv_SE/opensurvey.lang
diff --git a/public/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
similarity index 100%
rename from public/langs/sv_SE/orders.lang
rename to htdocs/langs/sv_SE/orders.lang
diff --git a/public/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
similarity index 100%
rename from public/langs/sv_SE/other.lang
rename to htdocs/langs/sv_SE/other.lang
diff --git a/public/langs/sv_SE/paybox.lang b/htdocs/langs/sv_SE/paybox.lang
similarity index 100%
rename from public/langs/sv_SE/paybox.lang
rename to htdocs/langs/sv_SE/paybox.lang
diff --git a/public/langs/sv_SE/paypal.lang b/htdocs/langs/sv_SE/paypal.lang
similarity index 100%
rename from public/langs/sv_SE/paypal.lang
rename to htdocs/langs/sv_SE/paypal.lang
diff --git a/public/langs/sv_SE/printing.lang b/htdocs/langs/sv_SE/printing.lang
similarity index 100%
rename from public/langs/sv_SE/printing.lang
rename to htdocs/langs/sv_SE/printing.lang
diff --git a/public/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang
similarity index 100%
rename from public/langs/sv_SE/productbatch.lang
rename to htdocs/langs/sv_SE/productbatch.lang
diff --git a/public/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
similarity index 100%
rename from public/langs/sv_SE/products.lang
rename to htdocs/langs/sv_SE/products.lang
diff --git a/public/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
similarity index 100%
rename from public/langs/sv_SE/projects.lang
rename to htdocs/langs/sv_SE/projects.lang
diff --git a/public/langs/sv_SE/propal.lang b/htdocs/langs/sv_SE/propal.lang
similarity index 100%
rename from public/langs/sv_SE/propal.lang
rename to htdocs/langs/sv_SE/propal.lang
diff --git a/public/langs/sv_SE/receiptprinter.lang b/htdocs/langs/sv_SE/receiptprinter.lang
similarity index 100%
rename from public/langs/sv_SE/receiptprinter.lang
rename to htdocs/langs/sv_SE/receiptprinter.lang
diff --git a/public/langs/sv_SE/resource.lang b/htdocs/langs/sv_SE/resource.lang
similarity index 100%
rename from public/langs/sv_SE/resource.lang
rename to htdocs/langs/sv_SE/resource.lang
diff --git a/public/langs/sv_SE/salaries.lang b/htdocs/langs/sv_SE/salaries.lang
similarity index 100%
rename from public/langs/sv_SE/salaries.lang
rename to htdocs/langs/sv_SE/salaries.lang
diff --git a/public/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
similarity index 100%
rename from public/langs/sv_SE/sendings.lang
rename to htdocs/langs/sv_SE/sendings.lang
diff --git a/public/langs/sv_SE/sms.lang b/htdocs/langs/sv_SE/sms.lang
similarity index 100%
rename from public/langs/sv_SE/sms.lang
rename to htdocs/langs/sv_SE/sms.lang
diff --git a/public/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
similarity index 100%
rename from public/langs/sv_SE/stocks.lang
rename to htdocs/langs/sv_SE/stocks.lang
diff --git a/public/langs/sv_SE/supplier_proposal.lang b/htdocs/langs/sv_SE/supplier_proposal.lang
similarity index 100%
rename from public/langs/sv_SE/supplier_proposal.lang
rename to htdocs/langs/sv_SE/supplier_proposal.lang
diff --git a/public/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang
similarity index 100%
rename from public/langs/sv_SE/suppliers.lang
rename to htdocs/langs/sv_SE/suppliers.lang
diff --git a/public/langs/sv_SE/trips.lang b/htdocs/langs/sv_SE/trips.lang
similarity index 100%
rename from public/langs/sv_SE/trips.lang
rename to htdocs/langs/sv_SE/trips.lang
diff --git a/public/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
similarity index 100%
rename from public/langs/sv_SE/users.lang
rename to htdocs/langs/sv_SE/users.lang
diff --git a/public/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
similarity index 100%
rename from public/langs/sv_SE/website.lang
rename to htdocs/langs/sv_SE/website.lang
diff --git a/public/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
similarity index 100%
rename from public/langs/sv_SE/withdrawals.lang
rename to htdocs/langs/sv_SE/withdrawals.lang
diff --git a/public/langs/sv_SE/workflow.lang b/htdocs/langs/sv_SE/workflow.lang
similarity index 100%
rename from public/langs/sv_SE/workflow.lang
rename to htdocs/langs/sv_SE/workflow.lang
diff --git a/public/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
similarity index 100%
rename from public/langs/sw_SW/accountancy.lang
rename to htdocs/langs/sw_SW/accountancy.lang
diff --git a/public/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
similarity index 100%
rename from public/langs/sw_SW/admin.lang
rename to htdocs/langs/sw_SW/admin.lang
diff --git a/public/langs/sw_SW/agenda.lang b/htdocs/langs/sw_SW/agenda.lang
similarity index 100%
rename from public/langs/sw_SW/agenda.lang
rename to htdocs/langs/sw_SW/agenda.lang
diff --git a/public/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
similarity index 100%
rename from public/langs/sw_SW/banks.lang
rename to htdocs/langs/sw_SW/banks.lang
diff --git a/public/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
similarity index 100%
rename from public/langs/sw_SW/bills.lang
rename to htdocs/langs/sw_SW/bills.lang
diff --git a/public/langs/sw_SW/bookmarks.lang b/htdocs/langs/sw_SW/bookmarks.lang
similarity index 100%
rename from public/langs/sw_SW/bookmarks.lang
rename to htdocs/langs/sw_SW/bookmarks.lang
diff --git a/public/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang
similarity index 100%
rename from public/langs/sw_SW/boxes.lang
rename to htdocs/langs/sw_SW/boxes.lang
diff --git a/public/langs/sw_SW/cashdesk.lang b/htdocs/langs/sw_SW/cashdesk.lang
similarity index 100%
rename from public/langs/sw_SW/cashdesk.lang
rename to htdocs/langs/sw_SW/cashdesk.lang
diff --git a/public/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang
similarity index 100%
rename from public/langs/sw_SW/categories.lang
rename to htdocs/langs/sw_SW/categories.lang
diff --git a/public/langs/sw_SW/commercial.lang b/htdocs/langs/sw_SW/commercial.lang
similarity index 100%
rename from public/langs/sw_SW/commercial.lang
rename to htdocs/langs/sw_SW/commercial.lang
diff --git a/public/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
similarity index 100%
rename from public/langs/sw_SW/companies.lang
rename to htdocs/langs/sw_SW/companies.lang
diff --git a/public/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
similarity index 100%
rename from public/langs/sw_SW/compta.lang
rename to htdocs/langs/sw_SW/compta.lang
diff --git a/public/langs/sw_SW/contracts.lang b/htdocs/langs/sw_SW/contracts.lang
similarity index 100%
rename from public/langs/sw_SW/contracts.lang
rename to htdocs/langs/sw_SW/contracts.lang
diff --git a/public/langs/sw_SW/cron.lang b/htdocs/langs/sw_SW/cron.lang
similarity index 100%
rename from public/langs/sw_SW/cron.lang
rename to htdocs/langs/sw_SW/cron.lang
diff --git a/public/langs/sw_SW/deliveries.lang b/htdocs/langs/sw_SW/deliveries.lang
similarity index 100%
rename from public/langs/sw_SW/deliveries.lang
rename to htdocs/langs/sw_SW/deliveries.lang
diff --git a/public/langs/sw_SW/dict.lang b/htdocs/langs/sw_SW/dict.lang
similarity index 100%
rename from public/langs/sw_SW/dict.lang
rename to htdocs/langs/sw_SW/dict.lang
diff --git a/public/langs/sw_SW/donations.lang b/htdocs/langs/sw_SW/donations.lang
similarity index 100%
rename from public/langs/sw_SW/donations.lang
rename to htdocs/langs/sw_SW/donations.lang
diff --git a/public/langs/sw_SW/ecm.lang b/htdocs/langs/sw_SW/ecm.lang
similarity index 100%
rename from public/langs/sw_SW/ecm.lang
rename to htdocs/langs/sw_SW/ecm.lang
diff --git a/public/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
similarity index 100%
rename from public/langs/sw_SW/errors.lang
rename to htdocs/langs/sw_SW/errors.lang
diff --git a/public/langs/sw_SW/exports.lang b/htdocs/langs/sw_SW/exports.lang
similarity index 100%
rename from public/langs/sw_SW/exports.lang
rename to htdocs/langs/sw_SW/exports.lang
diff --git a/public/langs/sw_SW/externalsite.lang b/htdocs/langs/sw_SW/externalsite.lang
similarity index 100%
rename from public/langs/sw_SW/externalsite.lang
rename to htdocs/langs/sw_SW/externalsite.lang
diff --git a/public/langs/sw_SW/ftp.lang b/htdocs/langs/sw_SW/ftp.lang
similarity index 100%
rename from public/langs/sw_SW/ftp.lang
rename to htdocs/langs/sw_SW/ftp.lang
diff --git a/public/langs/sw_SW/help.lang b/htdocs/langs/sw_SW/help.lang
similarity index 100%
rename from public/langs/sw_SW/help.lang
rename to htdocs/langs/sw_SW/help.lang
diff --git a/public/langs/sw_SW/holiday.lang b/htdocs/langs/sw_SW/holiday.lang
similarity index 100%
rename from public/langs/sw_SW/holiday.lang
rename to htdocs/langs/sw_SW/holiday.lang
diff --git a/public/langs/sw_SW/incoterm.lang b/htdocs/langs/sw_SW/incoterm.lang
similarity index 100%
rename from public/langs/sw_SW/incoterm.lang
rename to htdocs/langs/sw_SW/incoterm.lang
diff --git a/public/langs/sw_SW/install.lang b/htdocs/langs/sw_SW/install.lang
similarity index 100%
rename from public/langs/sw_SW/install.lang
rename to htdocs/langs/sw_SW/install.lang
diff --git a/public/langs/sw_SW/interventions.lang b/htdocs/langs/sw_SW/interventions.lang
similarity index 100%
rename from public/langs/sw_SW/interventions.lang
rename to htdocs/langs/sw_SW/interventions.lang
diff --git a/public/langs/sw_SW/languages.lang b/htdocs/langs/sw_SW/languages.lang
similarity index 100%
rename from public/langs/sw_SW/languages.lang
rename to htdocs/langs/sw_SW/languages.lang
diff --git a/public/langs/sw_SW/ldap.lang b/htdocs/langs/sw_SW/ldap.lang
similarity index 100%
rename from public/langs/sw_SW/ldap.lang
rename to htdocs/langs/sw_SW/ldap.lang
diff --git a/public/langs/sw_SW/link.lang b/htdocs/langs/sw_SW/link.lang
similarity index 100%
rename from public/langs/sw_SW/link.lang
rename to htdocs/langs/sw_SW/link.lang
diff --git a/public/langs/sw_SW/loan.lang b/htdocs/langs/sw_SW/loan.lang
similarity index 100%
rename from public/langs/sw_SW/loan.lang
rename to htdocs/langs/sw_SW/loan.lang
diff --git a/public/langs/sw_SW/mailmanspip.lang b/htdocs/langs/sw_SW/mailmanspip.lang
similarity index 100%
rename from public/langs/sw_SW/mailmanspip.lang
rename to htdocs/langs/sw_SW/mailmanspip.lang
diff --git a/public/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
similarity index 100%
rename from public/langs/sw_SW/mails.lang
rename to htdocs/langs/sw_SW/mails.lang
diff --git a/public/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
similarity index 100%
rename from public/langs/sw_SW/main.lang
rename to htdocs/langs/sw_SW/main.lang
diff --git a/public/langs/sw_SW/margins.lang b/htdocs/langs/sw_SW/margins.lang
similarity index 100%
rename from public/langs/sw_SW/margins.lang
rename to htdocs/langs/sw_SW/margins.lang
diff --git a/public/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
similarity index 100%
rename from public/langs/sw_SW/members.lang
rename to htdocs/langs/sw_SW/members.lang
diff --git a/public/langs/sw_SW/opensurvey.lang b/htdocs/langs/sw_SW/opensurvey.lang
similarity index 100%
rename from public/langs/sw_SW/opensurvey.lang
rename to htdocs/langs/sw_SW/opensurvey.lang
diff --git a/public/langs/sw_SW/orders.lang b/htdocs/langs/sw_SW/orders.lang
similarity index 100%
rename from public/langs/sw_SW/orders.lang
rename to htdocs/langs/sw_SW/orders.lang
diff --git a/public/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
similarity index 100%
rename from public/langs/sw_SW/other.lang
rename to htdocs/langs/sw_SW/other.lang
diff --git a/public/langs/sw_SW/paybox.lang b/htdocs/langs/sw_SW/paybox.lang
similarity index 100%
rename from public/langs/sw_SW/paybox.lang
rename to htdocs/langs/sw_SW/paybox.lang
diff --git a/public/langs/sw_SW/paypal.lang b/htdocs/langs/sw_SW/paypal.lang
similarity index 100%
rename from public/langs/sw_SW/paypal.lang
rename to htdocs/langs/sw_SW/paypal.lang
diff --git a/public/langs/sw_SW/printing.lang b/htdocs/langs/sw_SW/printing.lang
similarity index 100%
rename from public/langs/sw_SW/printing.lang
rename to htdocs/langs/sw_SW/printing.lang
diff --git a/public/langs/sw_SW/productbatch.lang b/htdocs/langs/sw_SW/productbatch.lang
similarity index 100%
rename from public/langs/sw_SW/productbatch.lang
rename to htdocs/langs/sw_SW/productbatch.lang
diff --git a/public/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
similarity index 100%
rename from public/langs/sw_SW/products.lang
rename to htdocs/langs/sw_SW/products.lang
diff --git a/public/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
similarity index 100%
rename from public/langs/sw_SW/projects.lang
rename to htdocs/langs/sw_SW/projects.lang
diff --git a/public/langs/sw_SW/propal.lang b/htdocs/langs/sw_SW/propal.lang
similarity index 100%
rename from public/langs/sw_SW/propal.lang
rename to htdocs/langs/sw_SW/propal.lang
diff --git a/public/langs/sw_SW/resource.lang b/htdocs/langs/sw_SW/resource.lang
similarity index 100%
rename from public/langs/sw_SW/resource.lang
rename to htdocs/langs/sw_SW/resource.lang
diff --git a/public/langs/sw_SW/salaries.lang b/htdocs/langs/sw_SW/salaries.lang
similarity index 100%
rename from public/langs/sw_SW/salaries.lang
rename to htdocs/langs/sw_SW/salaries.lang
diff --git a/public/langs/sw_SW/sendings.lang b/htdocs/langs/sw_SW/sendings.lang
similarity index 100%
rename from public/langs/sw_SW/sendings.lang
rename to htdocs/langs/sw_SW/sendings.lang
diff --git a/public/langs/sw_SW/sms.lang b/htdocs/langs/sw_SW/sms.lang
similarity index 100%
rename from public/langs/sw_SW/sms.lang
rename to htdocs/langs/sw_SW/sms.lang
diff --git a/public/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
similarity index 100%
rename from public/langs/sw_SW/stocks.lang
rename to htdocs/langs/sw_SW/stocks.lang
diff --git a/public/langs/sw_SW/suppliers.lang b/htdocs/langs/sw_SW/suppliers.lang
similarity index 100%
rename from public/langs/sw_SW/suppliers.lang
rename to htdocs/langs/sw_SW/suppliers.lang
diff --git a/public/langs/sw_SW/trips.lang b/htdocs/langs/sw_SW/trips.lang
similarity index 100%
rename from public/langs/sw_SW/trips.lang
rename to htdocs/langs/sw_SW/trips.lang
diff --git a/public/langs/sw_SW/users.lang b/htdocs/langs/sw_SW/users.lang
similarity index 100%
rename from public/langs/sw_SW/users.lang
rename to htdocs/langs/sw_SW/users.lang
diff --git a/public/langs/sw_SW/withdrawals.lang b/htdocs/langs/sw_SW/withdrawals.lang
similarity index 100%
rename from public/langs/sw_SW/withdrawals.lang
rename to htdocs/langs/sw_SW/withdrawals.lang
diff --git a/public/langs/sw_SW/workflow.lang b/htdocs/langs/sw_SW/workflow.lang
similarity index 100%
rename from public/langs/sw_SW/workflow.lang
rename to htdocs/langs/sw_SW/workflow.lang
diff --git a/public/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
similarity index 100%
rename from public/langs/th_TH/accountancy.lang
rename to htdocs/langs/th_TH/accountancy.lang
diff --git a/public/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
similarity index 100%
rename from public/langs/th_TH/admin.lang
rename to htdocs/langs/th_TH/admin.lang
diff --git a/public/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang
similarity index 100%
rename from public/langs/th_TH/agenda.lang
rename to htdocs/langs/th_TH/agenda.lang
diff --git a/public/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
similarity index 100%
rename from public/langs/th_TH/banks.lang
rename to htdocs/langs/th_TH/banks.lang
diff --git a/public/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
similarity index 100%
rename from public/langs/th_TH/bills.lang
rename to htdocs/langs/th_TH/bills.lang
diff --git a/public/langs/th_TH/bookmarks.lang b/htdocs/langs/th_TH/bookmarks.lang
similarity index 100%
rename from public/langs/th_TH/bookmarks.lang
rename to htdocs/langs/th_TH/bookmarks.lang
diff --git a/public/langs/th_TH/boxes.lang b/htdocs/langs/th_TH/boxes.lang
similarity index 100%
rename from public/langs/th_TH/boxes.lang
rename to htdocs/langs/th_TH/boxes.lang
diff --git a/public/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
similarity index 100%
rename from public/langs/th_TH/cashdesk.lang
rename to htdocs/langs/th_TH/cashdesk.lang
diff --git a/public/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
similarity index 100%
rename from public/langs/th_TH/categories.lang
rename to htdocs/langs/th_TH/categories.lang
diff --git a/public/langs/th_TH/commercial.lang b/htdocs/langs/th_TH/commercial.lang
similarity index 100%
rename from public/langs/th_TH/commercial.lang
rename to htdocs/langs/th_TH/commercial.lang
diff --git a/public/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
similarity index 100%
rename from public/langs/th_TH/companies.lang
rename to htdocs/langs/th_TH/companies.lang
diff --git a/public/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
similarity index 100%
rename from public/langs/th_TH/compta.lang
rename to htdocs/langs/th_TH/compta.lang
diff --git a/public/langs/th_TH/contracts.lang b/htdocs/langs/th_TH/contracts.lang
similarity index 100%
rename from public/langs/th_TH/contracts.lang
rename to htdocs/langs/th_TH/contracts.lang
diff --git a/public/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
similarity index 100%
rename from public/langs/th_TH/cron.lang
rename to htdocs/langs/th_TH/cron.lang
diff --git a/public/langs/th_TH/deliveries.lang b/htdocs/langs/th_TH/deliveries.lang
similarity index 100%
rename from public/langs/th_TH/deliveries.lang
rename to htdocs/langs/th_TH/deliveries.lang
diff --git a/public/langs/th_TH/dict.lang b/htdocs/langs/th_TH/dict.lang
similarity index 100%
rename from public/langs/th_TH/dict.lang
rename to htdocs/langs/th_TH/dict.lang
diff --git a/public/langs/th_TH/donations.lang b/htdocs/langs/th_TH/donations.lang
similarity index 100%
rename from public/langs/th_TH/donations.lang
rename to htdocs/langs/th_TH/donations.lang
diff --git a/public/langs/th_TH/ecm.lang b/htdocs/langs/th_TH/ecm.lang
similarity index 100%
rename from public/langs/th_TH/ecm.lang
rename to htdocs/langs/th_TH/ecm.lang
diff --git a/public/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
similarity index 100%
rename from public/langs/th_TH/errors.lang
rename to htdocs/langs/th_TH/errors.lang
diff --git a/public/langs/th_TH/exports.lang b/htdocs/langs/th_TH/exports.lang
similarity index 100%
rename from public/langs/th_TH/exports.lang
rename to htdocs/langs/th_TH/exports.lang
diff --git a/public/langs/th_TH/externalsite.lang b/htdocs/langs/th_TH/externalsite.lang
similarity index 100%
rename from public/langs/th_TH/externalsite.lang
rename to htdocs/langs/th_TH/externalsite.lang
diff --git a/public/langs/th_TH/ftp.lang b/htdocs/langs/th_TH/ftp.lang
similarity index 100%
rename from public/langs/th_TH/ftp.lang
rename to htdocs/langs/th_TH/ftp.lang
diff --git a/public/langs/th_TH/help.lang b/htdocs/langs/th_TH/help.lang
similarity index 100%
rename from public/langs/th_TH/help.lang
rename to htdocs/langs/th_TH/help.lang
diff --git a/public/langs/th_TH/holiday.lang b/htdocs/langs/th_TH/holiday.lang
similarity index 100%
rename from public/langs/th_TH/holiday.lang
rename to htdocs/langs/th_TH/holiday.lang
diff --git a/public/langs/th_TH/hrm.lang b/htdocs/langs/th_TH/hrm.lang
similarity index 100%
rename from public/langs/th_TH/hrm.lang
rename to htdocs/langs/th_TH/hrm.lang
diff --git a/public/langs/th_TH/incoterm.lang b/htdocs/langs/th_TH/incoterm.lang
similarity index 100%
rename from public/langs/th_TH/incoterm.lang
rename to htdocs/langs/th_TH/incoterm.lang
diff --git a/public/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang
similarity index 100%
rename from public/langs/th_TH/install.lang
rename to htdocs/langs/th_TH/install.lang
diff --git a/public/langs/th_TH/interventions.lang b/htdocs/langs/th_TH/interventions.lang
similarity index 100%
rename from public/langs/th_TH/interventions.lang
rename to htdocs/langs/th_TH/interventions.lang
diff --git a/public/langs/th_TH/languages.lang b/htdocs/langs/th_TH/languages.lang
similarity index 100%
rename from public/langs/th_TH/languages.lang
rename to htdocs/langs/th_TH/languages.lang
diff --git a/public/langs/th_TH/ldap.lang b/htdocs/langs/th_TH/ldap.lang
similarity index 100%
rename from public/langs/th_TH/ldap.lang
rename to htdocs/langs/th_TH/ldap.lang
diff --git a/public/langs/th_TH/link.lang b/htdocs/langs/th_TH/link.lang
similarity index 100%
rename from public/langs/th_TH/link.lang
rename to htdocs/langs/th_TH/link.lang
diff --git a/public/langs/th_TH/loan.lang b/htdocs/langs/th_TH/loan.lang
similarity index 100%
rename from public/langs/th_TH/loan.lang
rename to htdocs/langs/th_TH/loan.lang
diff --git a/public/langs/th_TH/mailmanspip.lang b/htdocs/langs/th_TH/mailmanspip.lang
similarity index 100%
rename from public/langs/th_TH/mailmanspip.lang
rename to htdocs/langs/th_TH/mailmanspip.lang
diff --git a/public/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
similarity index 100%
rename from public/langs/th_TH/mails.lang
rename to htdocs/langs/th_TH/mails.lang
diff --git a/public/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
similarity index 100%
rename from public/langs/th_TH/main.lang
rename to htdocs/langs/th_TH/main.lang
diff --git a/public/langs/th_TH/margins.lang b/htdocs/langs/th_TH/margins.lang
similarity index 100%
rename from public/langs/th_TH/margins.lang
rename to htdocs/langs/th_TH/margins.lang
diff --git a/public/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
similarity index 100%
rename from public/langs/th_TH/members.lang
rename to htdocs/langs/th_TH/members.lang
diff --git a/public/langs/th_TH/oauth.lang b/htdocs/langs/th_TH/oauth.lang
similarity index 100%
rename from public/langs/th_TH/oauth.lang
rename to htdocs/langs/th_TH/oauth.lang
diff --git a/public/langs/th_TH/opensurvey.lang b/htdocs/langs/th_TH/opensurvey.lang
similarity index 100%
rename from public/langs/th_TH/opensurvey.lang
rename to htdocs/langs/th_TH/opensurvey.lang
diff --git a/public/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang
similarity index 100%
rename from public/langs/th_TH/orders.lang
rename to htdocs/langs/th_TH/orders.lang
diff --git a/public/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
similarity index 100%
rename from public/langs/th_TH/other.lang
rename to htdocs/langs/th_TH/other.lang
diff --git a/public/langs/th_TH/paybox.lang b/htdocs/langs/th_TH/paybox.lang
similarity index 100%
rename from public/langs/th_TH/paybox.lang
rename to htdocs/langs/th_TH/paybox.lang
diff --git a/public/langs/th_TH/paypal.lang b/htdocs/langs/th_TH/paypal.lang
similarity index 100%
rename from public/langs/th_TH/paypal.lang
rename to htdocs/langs/th_TH/paypal.lang
diff --git a/public/langs/th_TH/printing.lang b/htdocs/langs/th_TH/printing.lang
similarity index 100%
rename from public/langs/th_TH/printing.lang
rename to htdocs/langs/th_TH/printing.lang
diff --git a/public/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang
similarity index 100%
rename from public/langs/th_TH/productbatch.lang
rename to htdocs/langs/th_TH/productbatch.lang
diff --git a/public/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
similarity index 100%
rename from public/langs/th_TH/products.lang
rename to htdocs/langs/th_TH/products.lang
diff --git a/public/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
similarity index 100%
rename from public/langs/th_TH/projects.lang
rename to htdocs/langs/th_TH/projects.lang
diff --git a/public/langs/th_TH/propal.lang b/htdocs/langs/th_TH/propal.lang
similarity index 100%
rename from public/langs/th_TH/propal.lang
rename to htdocs/langs/th_TH/propal.lang
diff --git a/public/langs/th_TH/receiptprinter.lang b/htdocs/langs/th_TH/receiptprinter.lang
similarity index 100%
rename from public/langs/th_TH/receiptprinter.lang
rename to htdocs/langs/th_TH/receiptprinter.lang
diff --git a/public/langs/th_TH/resource.lang b/htdocs/langs/th_TH/resource.lang
similarity index 100%
rename from public/langs/th_TH/resource.lang
rename to htdocs/langs/th_TH/resource.lang
diff --git a/public/langs/th_TH/salaries.lang b/htdocs/langs/th_TH/salaries.lang
similarity index 100%
rename from public/langs/th_TH/salaries.lang
rename to htdocs/langs/th_TH/salaries.lang
diff --git a/public/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang
similarity index 100%
rename from public/langs/th_TH/sendings.lang
rename to htdocs/langs/th_TH/sendings.lang
diff --git a/public/langs/th_TH/sms.lang b/htdocs/langs/th_TH/sms.lang
similarity index 100%
rename from public/langs/th_TH/sms.lang
rename to htdocs/langs/th_TH/sms.lang
diff --git a/public/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
similarity index 100%
rename from public/langs/th_TH/stocks.lang
rename to htdocs/langs/th_TH/stocks.lang
diff --git a/public/langs/th_TH/supplier_proposal.lang b/htdocs/langs/th_TH/supplier_proposal.lang
similarity index 100%
rename from public/langs/th_TH/supplier_proposal.lang
rename to htdocs/langs/th_TH/supplier_proposal.lang
diff --git a/public/langs/th_TH/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang
similarity index 100%
rename from public/langs/th_TH/suppliers.lang
rename to htdocs/langs/th_TH/suppliers.lang
diff --git a/public/langs/th_TH/trips.lang b/htdocs/langs/th_TH/trips.lang
similarity index 100%
rename from public/langs/th_TH/trips.lang
rename to htdocs/langs/th_TH/trips.lang
diff --git a/public/langs/th_TH/users.lang b/htdocs/langs/th_TH/users.lang
similarity index 100%
rename from public/langs/th_TH/users.lang
rename to htdocs/langs/th_TH/users.lang
diff --git a/public/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
similarity index 100%
rename from public/langs/th_TH/website.lang
rename to htdocs/langs/th_TH/website.lang
diff --git a/public/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
similarity index 100%
rename from public/langs/th_TH/withdrawals.lang
rename to htdocs/langs/th_TH/withdrawals.lang
diff --git a/public/langs/th_TH/workflow.lang b/htdocs/langs/th_TH/workflow.lang
similarity index 100%
rename from public/langs/th_TH/workflow.lang
rename to htdocs/langs/th_TH/workflow.lang
diff --git a/public/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
similarity index 100%
rename from public/langs/tr_TR/accountancy.lang
rename to htdocs/langs/tr_TR/accountancy.lang
diff --git a/public/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
similarity index 100%
rename from public/langs/tr_TR/admin.lang
rename to htdocs/langs/tr_TR/admin.lang
diff --git a/public/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
similarity index 100%
rename from public/langs/tr_TR/agenda.lang
rename to htdocs/langs/tr_TR/agenda.lang
diff --git a/public/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
similarity index 100%
rename from public/langs/tr_TR/banks.lang
rename to htdocs/langs/tr_TR/banks.lang
diff --git a/public/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
similarity index 100%
rename from public/langs/tr_TR/bills.lang
rename to htdocs/langs/tr_TR/bills.lang
diff --git a/public/langs/tr_TR/bookmarks.lang b/htdocs/langs/tr_TR/bookmarks.lang
similarity index 100%
rename from public/langs/tr_TR/bookmarks.lang
rename to htdocs/langs/tr_TR/bookmarks.lang
diff --git a/public/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
similarity index 100%
rename from public/langs/tr_TR/boxes.lang
rename to htdocs/langs/tr_TR/boxes.lang
diff --git a/public/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
similarity index 100%
rename from public/langs/tr_TR/cashdesk.lang
rename to htdocs/langs/tr_TR/cashdesk.lang
diff --git a/public/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
similarity index 100%
rename from public/langs/tr_TR/categories.lang
rename to htdocs/langs/tr_TR/categories.lang
diff --git a/public/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang
similarity index 100%
rename from public/langs/tr_TR/commercial.lang
rename to htdocs/langs/tr_TR/commercial.lang
diff --git a/public/langs/tr_TR/commissions.lang b/htdocs/langs/tr_TR/commissions.lang
similarity index 100%
rename from public/langs/tr_TR/commissions.lang
rename to htdocs/langs/tr_TR/commissions.lang
diff --git a/public/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
similarity index 100%
rename from public/langs/tr_TR/companies.lang
rename to htdocs/langs/tr_TR/companies.lang
diff --git a/public/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
similarity index 100%
rename from public/langs/tr_TR/compta.lang
rename to htdocs/langs/tr_TR/compta.lang
diff --git a/public/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang
similarity index 100%
rename from public/langs/tr_TR/contracts.lang
rename to htdocs/langs/tr_TR/contracts.lang
diff --git a/public/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
similarity index 100%
rename from public/langs/tr_TR/cron.lang
rename to htdocs/langs/tr_TR/cron.lang
diff --git a/public/langs/tr_TR/deliveries.lang b/htdocs/langs/tr_TR/deliveries.lang
similarity index 100%
rename from public/langs/tr_TR/deliveries.lang
rename to htdocs/langs/tr_TR/deliveries.lang
diff --git a/public/langs/tr_TR/dict.lang b/htdocs/langs/tr_TR/dict.lang
similarity index 100%
rename from public/langs/tr_TR/dict.lang
rename to htdocs/langs/tr_TR/dict.lang
diff --git a/public/langs/tr_TR/donations.lang b/htdocs/langs/tr_TR/donations.lang
similarity index 100%
rename from public/langs/tr_TR/donations.lang
rename to htdocs/langs/tr_TR/donations.lang
diff --git a/public/langs/tr_TR/ecm.lang b/htdocs/langs/tr_TR/ecm.lang
similarity index 100%
rename from public/langs/tr_TR/ecm.lang
rename to htdocs/langs/tr_TR/ecm.lang
diff --git a/public/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
similarity index 100%
rename from public/langs/tr_TR/errors.lang
rename to htdocs/langs/tr_TR/errors.lang
diff --git a/public/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang
similarity index 100%
rename from public/langs/tr_TR/exports.lang
rename to htdocs/langs/tr_TR/exports.lang
diff --git a/public/langs/tr_TR/externalsite.lang b/htdocs/langs/tr_TR/externalsite.lang
similarity index 100%
rename from public/langs/tr_TR/externalsite.lang
rename to htdocs/langs/tr_TR/externalsite.lang
diff --git a/public/langs/tr_TR/ftp.lang b/htdocs/langs/tr_TR/ftp.lang
similarity index 100%
rename from public/langs/tr_TR/ftp.lang
rename to htdocs/langs/tr_TR/ftp.lang
diff --git a/public/langs/tr_TR/help.lang b/htdocs/langs/tr_TR/help.lang
similarity index 100%
rename from public/langs/tr_TR/help.lang
rename to htdocs/langs/tr_TR/help.lang
diff --git a/public/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang
similarity index 100%
rename from public/langs/tr_TR/holiday.lang
rename to htdocs/langs/tr_TR/holiday.lang
diff --git a/public/langs/tr_TR/hrm.lang b/htdocs/langs/tr_TR/hrm.lang
similarity index 100%
rename from public/langs/tr_TR/hrm.lang
rename to htdocs/langs/tr_TR/hrm.lang
diff --git a/public/langs/tr_TR/incoterm.lang b/htdocs/langs/tr_TR/incoterm.lang
similarity index 100%
rename from public/langs/tr_TR/incoterm.lang
rename to htdocs/langs/tr_TR/incoterm.lang
diff --git a/public/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
similarity index 100%
rename from public/langs/tr_TR/install.lang
rename to htdocs/langs/tr_TR/install.lang
diff --git a/public/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang
similarity index 100%
rename from public/langs/tr_TR/interventions.lang
rename to htdocs/langs/tr_TR/interventions.lang
diff --git a/public/langs/tr_TR/languages.lang b/htdocs/langs/tr_TR/languages.lang
similarity index 100%
rename from public/langs/tr_TR/languages.lang
rename to htdocs/langs/tr_TR/languages.lang
diff --git a/public/langs/tr_TR/ldap.lang b/htdocs/langs/tr_TR/ldap.lang
similarity index 100%
rename from public/langs/tr_TR/ldap.lang
rename to htdocs/langs/tr_TR/ldap.lang
diff --git a/public/langs/tr_TR/link.lang b/htdocs/langs/tr_TR/link.lang
similarity index 100%
rename from public/langs/tr_TR/link.lang
rename to htdocs/langs/tr_TR/link.lang
diff --git a/public/langs/tr_TR/loan.lang b/htdocs/langs/tr_TR/loan.lang
similarity index 100%
rename from public/langs/tr_TR/loan.lang
rename to htdocs/langs/tr_TR/loan.lang
diff --git a/public/langs/tr_TR/mailmanspip.lang b/htdocs/langs/tr_TR/mailmanspip.lang
similarity index 100%
rename from public/langs/tr_TR/mailmanspip.lang
rename to htdocs/langs/tr_TR/mailmanspip.lang
diff --git a/public/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
similarity index 100%
rename from public/langs/tr_TR/mails.lang
rename to htdocs/langs/tr_TR/mails.lang
diff --git a/public/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
similarity index 100%
rename from public/langs/tr_TR/main.lang
rename to htdocs/langs/tr_TR/main.lang
diff --git a/public/langs/tr_TR/margins.lang b/htdocs/langs/tr_TR/margins.lang
similarity index 100%
rename from public/langs/tr_TR/margins.lang
rename to htdocs/langs/tr_TR/margins.lang
diff --git a/public/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
similarity index 100%
rename from public/langs/tr_TR/members.lang
rename to htdocs/langs/tr_TR/members.lang
diff --git a/public/langs/tr_TR/oauth.lang b/htdocs/langs/tr_TR/oauth.lang
similarity index 100%
rename from public/langs/tr_TR/oauth.lang
rename to htdocs/langs/tr_TR/oauth.lang
diff --git a/public/langs/tr_TR/opensurvey.lang b/htdocs/langs/tr_TR/opensurvey.lang
similarity index 100%
rename from public/langs/tr_TR/opensurvey.lang
rename to htdocs/langs/tr_TR/opensurvey.lang
diff --git a/public/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
similarity index 100%
rename from public/langs/tr_TR/orders.lang
rename to htdocs/langs/tr_TR/orders.lang
diff --git a/public/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
similarity index 100%
rename from public/langs/tr_TR/other.lang
rename to htdocs/langs/tr_TR/other.lang
diff --git a/public/langs/tr_TR/paybox.lang b/htdocs/langs/tr_TR/paybox.lang
similarity index 100%
rename from public/langs/tr_TR/paybox.lang
rename to htdocs/langs/tr_TR/paybox.lang
diff --git a/public/langs/tr_TR/paypal.lang b/htdocs/langs/tr_TR/paypal.lang
similarity index 100%
rename from public/langs/tr_TR/paypal.lang
rename to htdocs/langs/tr_TR/paypal.lang
diff --git a/public/langs/tr_TR/printing.lang b/htdocs/langs/tr_TR/printing.lang
similarity index 100%
rename from public/langs/tr_TR/printing.lang
rename to htdocs/langs/tr_TR/printing.lang
diff --git a/public/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang
similarity index 100%
rename from public/langs/tr_TR/productbatch.lang
rename to htdocs/langs/tr_TR/productbatch.lang
diff --git a/public/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
similarity index 100%
rename from public/langs/tr_TR/products.lang
rename to htdocs/langs/tr_TR/products.lang
diff --git a/public/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
similarity index 100%
rename from public/langs/tr_TR/projects.lang
rename to htdocs/langs/tr_TR/projects.lang
diff --git a/public/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
similarity index 100%
rename from public/langs/tr_TR/propal.lang
rename to htdocs/langs/tr_TR/propal.lang
diff --git a/public/langs/tr_TR/receiptprinter.lang b/htdocs/langs/tr_TR/receiptprinter.lang
similarity index 100%
rename from public/langs/tr_TR/receiptprinter.lang
rename to htdocs/langs/tr_TR/receiptprinter.lang
diff --git a/public/langs/tr_TR/resource.lang b/htdocs/langs/tr_TR/resource.lang
similarity index 100%
rename from public/langs/tr_TR/resource.lang
rename to htdocs/langs/tr_TR/resource.lang
diff --git a/public/langs/tr_TR/salaries.lang b/htdocs/langs/tr_TR/salaries.lang
similarity index 100%
rename from public/langs/tr_TR/salaries.lang
rename to htdocs/langs/tr_TR/salaries.lang
diff --git a/public/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
similarity index 100%
rename from public/langs/tr_TR/sendings.lang
rename to htdocs/langs/tr_TR/sendings.lang
diff --git a/public/langs/tr_TR/sms.lang b/htdocs/langs/tr_TR/sms.lang
similarity index 100%
rename from public/langs/tr_TR/sms.lang
rename to htdocs/langs/tr_TR/sms.lang
diff --git a/public/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
similarity index 100%
rename from public/langs/tr_TR/stocks.lang
rename to htdocs/langs/tr_TR/stocks.lang
diff --git a/public/langs/tr_TR/supplier_proposal.lang b/htdocs/langs/tr_TR/supplier_proposal.lang
similarity index 100%
rename from public/langs/tr_TR/supplier_proposal.lang
rename to htdocs/langs/tr_TR/supplier_proposal.lang
diff --git a/public/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
similarity index 100%
rename from public/langs/tr_TR/suppliers.lang
rename to htdocs/langs/tr_TR/suppliers.lang
diff --git a/public/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
similarity index 100%
rename from public/langs/tr_TR/trips.lang
rename to htdocs/langs/tr_TR/trips.lang
diff --git a/public/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
similarity index 100%
rename from public/langs/tr_TR/users.lang
rename to htdocs/langs/tr_TR/users.lang
diff --git a/public/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
similarity index 100%
rename from public/langs/tr_TR/website.lang
rename to htdocs/langs/tr_TR/website.lang
diff --git a/public/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
similarity index 100%
rename from public/langs/tr_TR/withdrawals.lang
rename to htdocs/langs/tr_TR/withdrawals.lang
diff --git a/public/langs/tr_TR/workflow.lang b/htdocs/langs/tr_TR/workflow.lang
similarity index 100%
rename from public/langs/tr_TR/workflow.lang
rename to htdocs/langs/tr_TR/workflow.lang
diff --git a/public/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
similarity index 100%
rename from public/langs/uk_UA/accountancy.lang
rename to htdocs/langs/uk_UA/accountancy.lang
diff --git a/public/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
similarity index 100%
rename from public/langs/uk_UA/admin.lang
rename to htdocs/langs/uk_UA/admin.lang
diff --git a/public/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang
similarity index 100%
rename from public/langs/uk_UA/agenda.lang
rename to htdocs/langs/uk_UA/agenda.lang
diff --git a/public/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
similarity index 100%
rename from public/langs/uk_UA/banks.lang
rename to htdocs/langs/uk_UA/banks.lang
diff --git a/public/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
similarity index 100%
rename from public/langs/uk_UA/bills.lang
rename to htdocs/langs/uk_UA/bills.lang
diff --git a/public/langs/uk_UA/bookmarks.lang b/htdocs/langs/uk_UA/bookmarks.lang
similarity index 100%
rename from public/langs/uk_UA/bookmarks.lang
rename to htdocs/langs/uk_UA/bookmarks.lang
diff --git a/public/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
similarity index 100%
rename from public/langs/uk_UA/boxes.lang
rename to htdocs/langs/uk_UA/boxes.lang
diff --git a/public/langs/uk_UA/cashdesk.lang b/htdocs/langs/uk_UA/cashdesk.lang
similarity index 100%
rename from public/langs/uk_UA/cashdesk.lang
rename to htdocs/langs/uk_UA/cashdesk.lang
diff --git a/public/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
similarity index 100%
rename from public/langs/uk_UA/categories.lang
rename to htdocs/langs/uk_UA/categories.lang
diff --git a/public/langs/uk_UA/commercial.lang b/htdocs/langs/uk_UA/commercial.lang
similarity index 100%
rename from public/langs/uk_UA/commercial.lang
rename to htdocs/langs/uk_UA/commercial.lang
diff --git a/public/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
similarity index 100%
rename from public/langs/uk_UA/companies.lang
rename to htdocs/langs/uk_UA/companies.lang
diff --git a/public/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
similarity index 100%
rename from public/langs/uk_UA/compta.lang
rename to htdocs/langs/uk_UA/compta.lang
diff --git a/public/langs/uk_UA/contracts.lang b/htdocs/langs/uk_UA/contracts.lang
similarity index 100%
rename from public/langs/uk_UA/contracts.lang
rename to htdocs/langs/uk_UA/contracts.lang
diff --git a/public/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
similarity index 100%
rename from public/langs/uk_UA/cron.lang
rename to htdocs/langs/uk_UA/cron.lang
diff --git a/public/langs/uk_UA/deliveries.lang b/htdocs/langs/uk_UA/deliveries.lang
similarity index 100%
rename from public/langs/uk_UA/deliveries.lang
rename to htdocs/langs/uk_UA/deliveries.lang
diff --git a/public/langs/uk_UA/dict.lang b/htdocs/langs/uk_UA/dict.lang
similarity index 100%
rename from public/langs/uk_UA/dict.lang
rename to htdocs/langs/uk_UA/dict.lang
diff --git a/public/langs/uk_UA/donations.lang b/htdocs/langs/uk_UA/donations.lang
similarity index 100%
rename from public/langs/uk_UA/donations.lang
rename to htdocs/langs/uk_UA/donations.lang
diff --git a/public/langs/uk_UA/ecm.lang b/htdocs/langs/uk_UA/ecm.lang
similarity index 100%
rename from public/langs/uk_UA/ecm.lang
rename to htdocs/langs/uk_UA/ecm.lang
diff --git a/public/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
similarity index 100%
rename from public/langs/uk_UA/errors.lang
rename to htdocs/langs/uk_UA/errors.lang
diff --git a/public/langs/uk_UA/exports.lang b/htdocs/langs/uk_UA/exports.lang
similarity index 100%
rename from public/langs/uk_UA/exports.lang
rename to htdocs/langs/uk_UA/exports.lang
diff --git a/public/langs/uk_UA/externalsite.lang b/htdocs/langs/uk_UA/externalsite.lang
similarity index 100%
rename from public/langs/uk_UA/externalsite.lang
rename to htdocs/langs/uk_UA/externalsite.lang
diff --git a/public/langs/uk_UA/ftp.lang b/htdocs/langs/uk_UA/ftp.lang
similarity index 100%
rename from public/langs/uk_UA/ftp.lang
rename to htdocs/langs/uk_UA/ftp.lang
diff --git a/public/langs/uk_UA/help.lang b/htdocs/langs/uk_UA/help.lang
similarity index 100%
rename from public/langs/uk_UA/help.lang
rename to htdocs/langs/uk_UA/help.lang
diff --git a/public/langs/uk_UA/holiday.lang b/htdocs/langs/uk_UA/holiday.lang
similarity index 100%
rename from public/langs/uk_UA/holiday.lang
rename to htdocs/langs/uk_UA/holiday.lang
diff --git a/public/langs/uk_UA/hrm.lang b/htdocs/langs/uk_UA/hrm.lang
similarity index 100%
rename from public/langs/uk_UA/hrm.lang
rename to htdocs/langs/uk_UA/hrm.lang
diff --git a/public/langs/uk_UA/incoterm.lang b/htdocs/langs/uk_UA/incoterm.lang
similarity index 100%
rename from public/langs/uk_UA/incoterm.lang
rename to htdocs/langs/uk_UA/incoterm.lang
diff --git a/public/langs/uk_UA/install.lang b/htdocs/langs/uk_UA/install.lang
similarity index 100%
rename from public/langs/uk_UA/install.lang
rename to htdocs/langs/uk_UA/install.lang
diff --git a/public/langs/uk_UA/interventions.lang b/htdocs/langs/uk_UA/interventions.lang
similarity index 100%
rename from public/langs/uk_UA/interventions.lang
rename to htdocs/langs/uk_UA/interventions.lang
diff --git a/public/langs/uk_UA/languages.lang b/htdocs/langs/uk_UA/languages.lang
similarity index 100%
rename from public/langs/uk_UA/languages.lang
rename to htdocs/langs/uk_UA/languages.lang
diff --git a/public/langs/uk_UA/ldap.lang b/htdocs/langs/uk_UA/ldap.lang
similarity index 100%
rename from public/langs/uk_UA/ldap.lang
rename to htdocs/langs/uk_UA/ldap.lang
diff --git a/public/langs/uk_UA/link.lang b/htdocs/langs/uk_UA/link.lang
similarity index 100%
rename from public/langs/uk_UA/link.lang
rename to htdocs/langs/uk_UA/link.lang
diff --git a/public/langs/uk_UA/loan.lang b/htdocs/langs/uk_UA/loan.lang
similarity index 100%
rename from public/langs/uk_UA/loan.lang
rename to htdocs/langs/uk_UA/loan.lang
diff --git a/public/langs/uk_UA/mailmanspip.lang b/htdocs/langs/uk_UA/mailmanspip.lang
similarity index 100%
rename from public/langs/uk_UA/mailmanspip.lang
rename to htdocs/langs/uk_UA/mailmanspip.lang
diff --git a/public/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
similarity index 100%
rename from public/langs/uk_UA/mails.lang
rename to htdocs/langs/uk_UA/mails.lang
diff --git a/public/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
similarity index 100%
rename from public/langs/uk_UA/main.lang
rename to htdocs/langs/uk_UA/main.lang
diff --git a/public/langs/uk_UA/margins.lang b/htdocs/langs/uk_UA/margins.lang
similarity index 100%
rename from public/langs/uk_UA/margins.lang
rename to htdocs/langs/uk_UA/margins.lang
diff --git a/public/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
similarity index 100%
rename from public/langs/uk_UA/members.lang
rename to htdocs/langs/uk_UA/members.lang
diff --git a/public/langs/uk_UA/oauth.lang b/htdocs/langs/uk_UA/oauth.lang
similarity index 100%
rename from public/langs/uk_UA/oauth.lang
rename to htdocs/langs/uk_UA/oauth.lang
diff --git a/public/langs/uk_UA/opensurvey.lang b/htdocs/langs/uk_UA/opensurvey.lang
similarity index 100%
rename from public/langs/uk_UA/opensurvey.lang
rename to htdocs/langs/uk_UA/opensurvey.lang
diff --git a/public/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
similarity index 100%
rename from public/langs/uk_UA/orders.lang
rename to htdocs/langs/uk_UA/orders.lang
diff --git a/public/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
similarity index 100%
rename from public/langs/uk_UA/other.lang
rename to htdocs/langs/uk_UA/other.lang
diff --git a/public/langs/uk_UA/paybox.lang b/htdocs/langs/uk_UA/paybox.lang
similarity index 100%
rename from public/langs/uk_UA/paybox.lang
rename to htdocs/langs/uk_UA/paybox.lang
diff --git a/public/langs/uk_UA/paypal.lang b/htdocs/langs/uk_UA/paypal.lang
similarity index 100%
rename from public/langs/uk_UA/paypal.lang
rename to htdocs/langs/uk_UA/paypal.lang
diff --git a/public/langs/uk_UA/printing.lang b/htdocs/langs/uk_UA/printing.lang
similarity index 100%
rename from public/langs/uk_UA/printing.lang
rename to htdocs/langs/uk_UA/printing.lang
diff --git a/public/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang
similarity index 100%
rename from public/langs/uk_UA/productbatch.lang
rename to htdocs/langs/uk_UA/productbatch.lang
diff --git a/public/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
similarity index 100%
rename from public/langs/uk_UA/products.lang
rename to htdocs/langs/uk_UA/products.lang
diff --git a/public/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
similarity index 100%
rename from public/langs/uk_UA/projects.lang
rename to htdocs/langs/uk_UA/projects.lang
diff --git a/public/langs/uk_UA/propal.lang b/htdocs/langs/uk_UA/propal.lang
similarity index 100%
rename from public/langs/uk_UA/propal.lang
rename to htdocs/langs/uk_UA/propal.lang
diff --git a/public/langs/uk_UA/receiptprinter.lang b/htdocs/langs/uk_UA/receiptprinter.lang
similarity index 100%
rename from public/langs/uk_UA/receiptprinter.lang
rename to htdocs/langs/uk_UA/receiptprinter.lang
diff --git a/public/langs/uk_UA/resource.lang b/htdocs/langs/uk_UA/resource.lang
similarity index 100%
rename from public/langs/uk_UA/resource.lang
rename to htdocs/langs/uk_UA/resource.lang
diff --git a/public/langs/uk_UA/salaries.lang b/htdocs/langs/uk_UA/salaries.lang
similarity index 100%
rename from public/langs/uk_UA/salaries.lang
rename to htdocs/langs/uk_UA/salaries.lang
diff --git a/public/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang
similarity index 100%
rename from public/langs/uk_UA/sendings.lang
rename to htdocs/langs/uk_UA/sendings.lang
diff --git a/public/langs/uk_UA/sms.lang b/htdocs/langs/uk_UA/sms.lang
similarity index 100%
rename from public/langs/uk_UA/sms.lang
rename to htdocs/langs/uk_UA/sms.lang
diff --git a/public/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
similarity index 100%
rename from public/langs/uk_UA/stocks.lang
rename to htdocs/langs/uk_UA/stocks.lang
diff --git a/public/langs/uk_UA/supplier_proposal.lang b/htdocs/langs/uk_UA/supplier_proposal.lang
similarity index 100%
rename from public/langs/uk_UA/supplier_proposal.lang
rename to htdocs/langs/uk_UA/supplier_proposal.lang
diff --git a/public/langs/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang
similarity index 100%
rename from public/langs/uk_UA/suppliers.lang
rename to htdocs/langs/uk_UA/suppliers.lang
diff --git a/public/langs/uk_UA/trips.lang b/htdocs/langs/uk_UA/trips.lang
similarity index 100%
rename from public/langs/uk_UA/trips.lang
rename to htdocs/langs/uk_UA/trips.lang
diff --git a/public/langs/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang
similarity index 100%
rename from public/langs/uk_UA/users.lang
rename to htdocs/langs/uk_UA/users.lang
diff --git a/public/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
similarity index 100%
rename from public/langs/uk_UA/website.lang
rename to htdocs/langs/uk_UA/website.lang
diff --git a/public/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
similarity index 100%
rename from public/langs/uk_UA/withdrawals.lang
rename to htdocs/langs/uk_UA/withdrawals.lang
diff --git a/public/langs/uk_UA/workflow.lang b/htdocs/langs/uk_UA/workflow.lang
similarity index 100%
rename from public/langs/uk_UA/workflow.lang
rename to htdocs/langs/uk_UA/workflow.lang
diff --git a/public/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
similarity index 100%
rename from public/langs/uz_UZ/accountancy.lang
rename to htdocs/langs/uz_UZ/accountancy.lang
diff --git a/public/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
similarity index 100%
rename from public/langs/uz_UZ/admin.lang
rename to htdocs/langs/uz_UZ/admin.lang
diff --git a/public/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
similarity index 100%
rename from public/langs/uz_UZ/agenda.lang
rename to htdocs/langs/uz_UZ/agenda.lang
diff --git a/public/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
similarity index 100%
rename from public/langs/uz_UZ/banks.lang
rename to htdocs/langs/uz_UZ/banks.lang
diff --git a/public/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
similarity index 100%
rename from public/langs/uz_UZ/bills.lang
rename to htdocs/langs/uz_UZ/bills.lang
diff --git a/public/langs/uz_UZ/bookmarks.lang b/htdocs/langs/uz_UZ/bookmarks.lang
similarity index 100%
rename from public/langs/uz_UZ/bookmarks.lang
rename to htdocs/langs/uz_UZ/bookmarks.lang
diff --git a/public/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
similarity index 100%
rename from public/langs/uz_UZ/boxes.lang
rename to htdocs/langs/uz_UZ/boxes.lang
diff --git a/public/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
similarity index 100%
rename from public/langs/uz_UZ/cashdesk.lang
rename to htdocs/langs/uz_UZ/cashdesk.lang
diff --git a/public/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
similarity index 100%
rename from public/langs/uz_UZ/categories.lang
rename to htdocs/langs/uz_UZ/categories.lang
diff --git a/public/langs/uz_UZ/commercial.lang b/htdocs/langs/uz_UZ/commercial.lang
similarity index 100%
rename from public/langs/uz_UZ/commercial.lang
rename to htdocs/langs/uz_UZ/commercial.lang
diff --git a/public/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
similarity index 100%
rename from public/langs/uz_UZ/companies.lang
rename to htdocs/langs/uz_UZ/companies.lang
diff --git a/public/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
similarity index 100%
rename from public/langs/uz_UZ/compta.lang
rename to htdocs/langs/uz_UZ/compta.lang
diff --git a/public/langs/uz_UZ/contracts.lang b/htdocs/langs/uz_UZ/contracts.lang
similarity index 100%
rename from public/langs/uz_UZ/contracts.lang
rename to htdocs/langs/uz_UZ/contracts.lang
diff --git a/public/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
similarity index 100%
rename from public/langs/uz_UZ/cron.lang
rename to htdocs/langs/uz_UZ/cron.lang
diff --git a/public/langs/uz_UZ/deliveries.lang b/htdocs/langs/uz_UZ/deliveries.lang
similarity index 100%
rename from public/langs/uz_UZ/deliveries.lang
rename to htdocs/langs/uz_UZ/deliveries.lang
diff --git a/public/langs/uz_UZ/dict.lang b/htdocs/langs/uz_UZ/dict.lang
similarity index 100%
rename from public/langs/uz_UZ/dict.lang
rename to htdocs/langs/uz_UZ/dict.lang
diff --git a/public/langs/uz_UZ/donations.lang b/htdocs/langs/uz_UZ/donations.lang
similarity index 100%
rename from public/langs/uz_UZ/donations.lang
rename to htdocs/langs/uz_UZ/donations.lang
diff --git a/public/langs/uz_UZ/ecm.lang b/htdocs/langs/uz_UZ/ecm.lang
similarity index 100%
rename from public/langs/uz_UZ/ecm.lang
rename to htdocs/langs/uz_UZ/ecm.lang
diff --git a/public/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
similarity index 100%
rename from public/langs/uz_UZ/errors.lang
rename to htdocs/langs/uz_UZ/errors.lang
diff --git a/public/langs/uz_UZ/exports.lang b/htdocs/langs/uz_UZ/exports.lang
similarity index 100%
rename from public/langs/uz_UZ/exports.lang
rename to htdocs/langs/uz_UZ/exports.lang
diff --git a/public/langs/uz_UZ/externalsite.lang b/htdocs/langs/uz_UZ/externalsite.lang
similarity index 100%
rename from public/langs/uz_UZ/externalsite.lang
rename to htdocs/langs/uz_UZ/externalsite.lang
diff --git a/public/langs/uz_UZ/ftp.lang b/htdocs/langs/uz_UZ/ftp.lang
similarity index 100%
rename from public/langs/uz_UZ/ftp.lang
rename to htdocs/langs/uz_UZ/ftp.lang
diff --git a/public/langs/uz_UZ/help.lang b/htdocs/langs/uz_UZ/help.lang
similarity index 100%
rename from public/langs/uz_UZ/help.lang
rename to htdocs/langs/uz_UZ/help.lang
diff --git a/public/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang
similarity index 100%
rename from public/langs/uz_UZ/holiday.lang
rename to htdocs/langs/uz_UZ/holiday.lang
diff --git a/public/langs/uz_UZ/incoterm.lang b/htdocs/langs/uz_UZ/incoterm.lang
similarity index 100%
rename from public/langs/uz_UZ/incoterm.lang
rename to htdocs/langs/uz_UZ/incoterm.lang
diff --git a/public/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang
similarity index 100%
rename from public/langs/uz_UZ/install.lang
rename to htdocs/langs/uz_UZ/install.lang
diff --git a/public/langs/uz_UZ/interventions.lang b/htdocs/langs/uz_UZ/interventions.lang
similarity index 100%
rename from public/langs/uz_UZ/interventions.lang
rename to htdocs/langs/uz_UZ/interventions.lang
diff --git a/public/langs/uz_UZ/languages.lang b/htdocs/langs/uz_UZ/languages.lang
similarity index 100%
rename from public/langs/uz_UZ/languages.lang
rename to htdocs/langs/uz_UZ/languages.lang
diff --git a/public/langs/uz_UZ/ldap.lang b/htdocs/langs/uz_UZ/ldap.lang
similarity index 100%
rename from public/langs/uz_UZ/ldap.lang
rename to htdocs/langs/uz_UZ/ldap.lang
diff --git a/public/langs/uz_UZ/link.lang b/htdocs/langs/uz_UZ/link.lang
similarity index 100%
rename from public/langs/uz_UZ/link.lang
rename to htdocs/langs/uz_UZ/link.lang
diff --git a/public/langs/uz_UZ/loan.lang b/htdocs/langs/uz_UZ/loan.lang
similarity index 100%
rename from public/langs/uz_UZ/loan.lang
rename to htdocs/langs/uz_UZ/loan.lang
diff --git a/public/langs/uz_UZ/mailmanspip.lang b/htdocs/langs/uz_UZ/mailmanspip.lang
similarity index 100%
rename from public/langs/uz_UZ/mailmanspip.lang
rename to htdocs/langs/uz_UZ/mailmanspip.lang
diff --git a/public/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
similarity index 100%
rename from public/langs/uz_UZ/mails.lang
rename to htdocs/langs/uz_UZ/mails.lang
diff --git a/public/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
similarity index 100%
rename from public/langs/uz_UZ/main.lang
rename to htdocs/langs/uz_UZ/main.lang
diff --git a/public/langs/uz_UZ/margins.lang b/htdocs/langs/uz_UZ/margins.lang
similarity index 100%
rename from public/langs/uz_UZ/margins.lang
rename to htdocs/langs/uz_UZ/margins.lang
diff --git a/public/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
similarity index 100%
rename from public/langs/uz_UZ/members.lang
rename to htdocs/langs/uz_UZ/members.lang
diff --git a/public/langs/uz_UZ/opensurvey.lang b/htdocs/langs/uz_UZ/opensurvey.lang
similarity index 100%
rename from public/langs/uz_UZ/opensurvey.lang
rename to htdocs/langs/uz_UZ/opensurvey.lang
diff --git a/public/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
similarity index 100%
rename from public/langs/uz_UZ/orders.lang
rename to htdocs/langs/uz_UZ/orders.lang
diff --git a/public/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
similarity index 100%
rename from public/langs/uz_UZ/other.lang
rename to htdocs/langs/uz_UZ/other.lang
diff --git a/public/langs/uz_UZ/paybox.lang b/htdocs/langs/uz_UZ/paybox.lang
similarity index 100%
rename from public/langs/uz_UZ/paybox.lang
rename to htdocs/langs/uz_UZ/paybox.lang
diff --git a/public/langs/uz_UZ/paypal.lang b/htdocs/langs/uz_UZ/paypal.lang
similarity index 100%
rename from public/langs/uz_UZ/paypal.lang
rename to htdocs/langs/uz_UZ/paypal.lang
diff --git a/public/langs/uz_UZ/printing.lang b/htdocs/langs/uz_UZ/printing.lang
similarity index 100%
rename from public/langs/uz_UZ/printing.lang
rename to htdocs/langs/uz_UZ/printing.lang
diff --git a/public/langs/uz_UZ/productbatch.lang b/htdocs/langs/uz_UZ/productbatch.lang
similarity index 100%
rename from public/langs/uz_UZ/productbatch.lang
rename to htdocs/langs/uz_UZ/productbatch.lang
diff --git a/public/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
similarity index 100%
rename from public/langs/uz_UZ/products.lang
rename to htdocs/langs/uz_UZ/products.lang
diff --git a/public/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
similarity index 100%
rename from public/langs/uz_UZ/projects.lang
rename to htdocs/langs/uz_UZ/projects.lang
diff --git a/public/langs/uz_UZ/propal.lang b/htdocs/langs/uz_UZ/propal.lang
similarity index 100%
rename from public/langs/uz_UZ/propal.lang
rename to htdocs/langs/uz_UZ/propal.lang
diff --git a/public/langs/uz_UZ/resource.lang b/htdocs/langs/uz_UZ/resource.lang
similarity index 100%
rename from public/langs/uz_UZ/resource.lang
rename to htdocs/langs/uz_UZ/resource.lang
diff --git a/public/langs/uz_UZ/salaries.lang b/htdocs/langs/uz_UZ/salaries.lang
similarity index 100%
rename from public/langs/uz_UZ/salaries.lang
rename to htdocs/langs/uz_UZ/salaries.lang
diff --git a/public/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
similarity index 100%
rename from public/langs/uz_UZ/sendings.lang
rename to htdocs/langs/uz_UZ/sendings.lang
diff --git a/public/langs/uz_UZ/sms.lang b/htdocs/langs/uz_UZ/sms.lang
similarity index 100%
rename from public/langs/uz_UZ/sms.lang
rename to htdocs/langs/uz_UZ/sms.lang
diff --git a/public/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
similarity index 100%
rename from public/langs/uz_UZ/stocks.lang
rename to htdocs/langs/uz_UZ/stocks.lang
diff --git a/public/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
similarity index 100%
rename from public/langs/uz_UZ/suppliers.lang
rename to htdocs/langs/uz_UZ/suppliers.lang
diff --git a/public/langs/uz_UZ/trips.lang b/htdocs/langs/uz_UZ/trips.lang
similarity index 100%
rename from public/langs/uz_UZ/trips.lang
rename to htdocs/langs/uz_UZ/trips.lang
diff --git a/public/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
similarity index 100%
rename from public/langs/uz_UZ/users.lang
rename to htdocs/langs/uz_UZ/users.lang
diff --git a/public/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
similarity index 100%
rename from public/langs/uz_UZ/withdrawals.lang
rename to htdocs/langs/uz_UZ/withdrawals.lang
diff --git a/public/langs/uz_UZ/workflow.lang b/htdocs/langs/uz_UZ/workflow.lang
similarity index 100%
rename from public/langs/uz_UZ/workflow.lang
rename to htdocs/langs/uz_UZ/workflow.lang
diff --git a/public/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
similarity index 100%
rename from public/langs/vi_VN/accountancy.lang
rename to htdocs/langs/vi_VN/accountancy.lang
diff --git a/public/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
similarity index 100%
rename from public/langs/vi_VN/admin.lang
rename to htdocs/langs/vi_VN/admin.lang
diff --git a/public/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang
similarity index 100%
rename from public/langs/vi_VN/agenda.lang
rename to htdocs/langs/vi_VN/agenda.lang
diff --git a/public/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
similarity index 100%
rename from public/langs/vi_VN/banks.lang
rename to htdocs/langs/vi_VN/banks.lang
diff --git a/public/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
similarity index 100%
rename from public/langs/vi_VN/bills.lang
rename to htdocs/langs/vi_VN/bills.lang
diff --git a/public/langs/vi_VN/bookmarks.lang b/htdocs/langs/vi_VN/bookmarks.lang
similarity index 100%
rename from public/langs/vi_VN/bookmarks.lang
rename to htdocs/langs/vi_VN/bookmarks.lang
diff --git a/public/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
similarity index 100%
rename from public/langs/vi_VN/boxes.lang
rename to htdocs/langs/vi_VN/boxes.lang
diff --git a/public/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
similarity index 100%
rename from public/langs/vi_VN/cashdesk.lang
rename to htdocs/langs/vi_VN/cashdesk.lang
diff --git a/public/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
similarity index 100%
rename from public/langs/vi_VN/categories.lang
rename to htdocs/langs/vi_VN/categories.lang
diff --git a/public/langs/vi_VN/commercial.lang b/htdocs/langs/vi_VN/commercial.lang
similarity index 100%
rename from public/langs/vi_VN/commercial.lang
rename to htdocs/langs/vi_VN/commercial.lang
diff --git a/public/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
similarity index 100%
rename from public/langs/vi_VN/companies.lang
rename to htdocs/langs/vi_VN/companies.lang
diff --git a/public/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
similarity index 100%
rename from public/langs/vi_VN/compta.lang
rename to htdocs/langs/vi_VN/compta.lang
diff --git a/public/langs/vi_VN/contracts.lang b/htdocs/langs/vi_VN/contracts.lang
similarity index 100%
rename from public/langs/vi_VN/contracts.lang
rename to htdocs/langs/vi_VN/contracts.lang
diff --git a/public/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
similarity index 100%
rename from public/langs/vi_VN/cron.lang
rename to htdocs/langs/vi_VN/cron.lang
diff --git a/public/langs/vi_VN/deliveries.lang b/htdocs/langs/vi_VN/deliveries.lang
similarity index 100%
rename from public/langs/vi_VN/deliveries.lang
rename to htdocs/langs/vi_VN/deliveries.lang
diff --git a/public/langs/vi_VN/dict.lang b/htdocs/langs/vi_VN/dict.lang
similarity index 100%
rename from public/langs/vi_VN/dict.lang
rename to htdocs/langs/vi_VN/dict.lang
diff --git a/public/langs/vi_VN/donations.lang b/htdocs/langs/vi_VN/donations.lang
similarity index 100%
rename from public/langs/vi_VN/donations.lang
rename to htdocs/langs/vi_VN/donations.lang
diff --git a/public/langs/vi_VN/ecm.lang b/htdocs/langs/vi_VN/ecm.lang
similarity index 100%
rename from public/langs/vi_VN/ecm.lang
rename to htdocs/langs/vi_VN/ecm.lang
diff --git a/public/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
similarity index 100%
rename from public/langs/vi_VN/errors.lang
rename to htdocs/langs/vi_VN/errors.lang
diff --git a/public/langs/vi_VN/exports.lang b/htdocs/langs/vi_VN/exports.lang
similarity index 100%
rename from public/langs/vi_VN/exports.lang
rename to htdocs/langs/vi_VN/exports.lang
diff --git a/public/langs/vi_VN/externalsite.lang b/htdocs/langs/vi_VN/externalsite.lang
similarity index 100%
rename from public/langs/vi_VN/externalsite.lang
rename to htdocs/langs/vi_VN/externalsite.lang
diff --git a/public/langs/vi_VN/ftp.lang b/htdocs/langs/vi_VN/ftp.lang
similarity index 100%
rename from public/langs/vi_VN/ftp.lang
rename to htdocs/langs/vi_VN/ftp.lang
diff --git a/public/langs/vi_VN/help.lang b/htdocs/langs/vi_VN/help.lang
similarity index 100%
rename from public/langs/vi_VN/help.lang
rename to htdocs/langs/vi_VN/help.lang
diff --git a/public/langs/vi_VN/holiday.lang b/htdocs/langs/vi_VN/holiday.lang
similarity index 100%
rename from public/langs/vi_VN/holiday.lang
rename to htdocs/langs/vi_VN/holiday.lang
diff --git a/public/langs/vi_VN/hrm.lang b/htdocs/langs/vi_VN/hrm.lang
similarity index 100%
rename from public/langs/vi_VN/hrm.lang
rename to htdocs/langs/vi_VN/hrm.lang
diff --git a/public/langs/vi_VN/incoterm.lang b/htdocs/langs/vi_VN/incoterm.lang
similarity index 100%
rename from public/langs/vi_VN/incoterm.lang
rename to htdocs/langs/vi_VN/incoterm.lang
diff --git a/public/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang
similarity index 100%
rename from public/langs/vi_VN/install.lang
rename to htdocs/langs/vi_VN/install.lang
diff --git a/public/langs/vi_VN/interventions.lang b/htdocs/langs/vi_VN/interventions.lang
similarity index 100%
rename from public/langs/vi_VN/interventions.lang
rename to htdocs/langs/vi_VN/interventions.lang
diff --git a/public/langs/vi_VN/languages.lang b/htdocs/langs/vi_VN/languages.lang
similarity index 100%
rename from public/langs/vi_VN/languages.lang
rename to htdocs/langs/vi_VN/languages.lang
diff --git a/public/langs/vi_VN/ldap.lang b/htdocs/langs/vi_VN/ldap.lang
similarity index 100%
rename from public/langs/vi_VN/ldap.lang
rename to htdocs/langs/vi_VN/ldap.lang
diff --git a/public/langs/vi_VN/link.lang b/htdocs/langs/vi_VN/link.lang
similarity index 100%
rename from public/langs/vi_VN/link.lang
rename to htdocs/langs/vi_VN/link.lang
diff --git a/public/langs/vi_VN/loan.lang b/htdocs/langs/vi_VN/loan.lang
similarity index 100%
rename from public/langs/vi_VN/loan.lang
rename to htdocs/langs/vi_VN/loan.lang
diff --git a/public/langs/vi_VN/mailmanspip.lang b/htdocs/langs/vi_VN/mailmanspip.lang
similarity index 100%
rename from public/langs/vi_VN/mailmanspip.lang
rename to htdocs/langs/vi_VN/mailmanspip.lang
diff --git a/public/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
similarity index 100%
rename from public/langs/vi_VN/mails.lang
rename to htdocs/langs/vi_VN/mails.lang
diff --git a/public/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
similarity index 100%
rename from public/langs/vi_VN/main.lang
rename to htdocs/langs/vi_VN/main.lang
diff --git a/public/langs/vi_VN/margins.lang b/htdocs/langs/vi_VN/margins.lang
similarity index 100%
rename from public/langs/vi_VN/margins.lang
rename to htdocs/langs/vi_VN/margins.lang
diff --git a/public/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
similarity index 100%
rename from public/langs/vi_VN/members.lang
rename to htdocs/langs/vi_VN/members.lang
diff --git a/public/langs/vi_VN/oauth.lang b/htdocs/langs/vi_VN/oauth.lang
similarity index 100%
rename from public/langs/vi_VN/oauth.lang
rename to htdocs/langs/vi_VN/oauth.lang
diff --git a/public/langs/vi_VN/opensurvey.lang b/htdocs/langs/vi_VN/opensurvey.lang
similarity index 100%
rename from public/langs/vi_VN/opensurvey.lang
rename to htdocs/langs/vi_VN/opensurvey.lang
diff --git a/public/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
similarity index 100%
rename from public/langs/vi_VN/orders.lang
rename to htdocs/langs/vi_VN/orders.lang
diff --git a/public/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
similarity index 100%
rename from public/langs/vi_VN/other.lang
rename to htdocs/langs/vi_VN/other.lang
diff --git a/public/langs/vi_VN/paybox.lang b/htdocs/langs/vi_VN/paybox.lang
similarity index 100%
rename from public/langs/vi_VN/paybox.lang
rename to htdocs/langs/vi_VN/paybox.lang
diff --git a/public/langs/vi_VN/paypal.lang b/htdocs/langs/vi_VN/paypal.lang
similarity index 100%
rename from public/langs/vi_VN/paypal.lang
rename to htdocs/langs/vi_VN/paypal.lang
diff --git a/public/langs/vi_VN/printing.lang b/htdocs/langs/vi_VN/printing.lang
similarity index 100%
rename from public/langs/vi_VN/printing.lang
rename to htdocs/langs/vi_VN/printing.lang
diff --git a/public/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang
similarity index 100%
rename from public/langs/vi_VN/productbatch.lang
rename to htdocs/langs/vi_VN/productbatch.lang
diff --git a/public/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
similarity index 100%
rename from public/langs/vi_VN/products.lang
rename to htdocs/langs/vi_VN/products.lang
diff --git a/public/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
similarity index 100%
rename from public/langs/vi_VN/projects.lang
rename to htdocs/langs/vi_VN/projects.lang
diff --git a/public/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang
similarity index 100%
rename from public/langs/vi_VN/propal.lang
rename to htdocs/langs/vi_VN/propal.lang
diff --git a/public/langs/vi_VN/receiptprinter.lang b/htdocs/langs/vi_VN/receiptprinter.lang
similarity index 100%
rename from public/langs/vi_VN/receiptprinter.lang
rename to htdocs/langs/vi_VN/receiptprinter.lang
diff --git a/public/langs/vi_VN/resource.lang b/htdocs/langs/vi_VN/resource.lang
similarity index 100%
rename from public/langs/vi_VN/resource.lang
rename to htdocs/langs/vi_VN/resource.lang
diff --git a/public/langs/vi_VN/salaries.lang b/htdocs/langs/vi_VN/salaries.lang
similarity index 100%
rename from public/langs/vi_VN/salaries.lang
rename to htdocs/langs/vi_VN/salaries.lang
diff --git a/public/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang
similarity index 100%
rename from public/langs/vi_VN/sendings.lang
rename to htdocs/langs/vi_VN/sendings.lang
diff --git a/public/langs/vi_VN/sms.lang b/htdocs/langs/vi_VN/sms.lang
similarity index 100%
rename from public/langs/vi_VN/sms.lang
rename to htdocs/langs/vi_VN/sms.lang
diff --git a/public/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
similarity index 100%
rename from public/langs/vi_VN/stocks.lang
rename to htdocs/langs/vi_VN/stocks.lang
diff --git a/public/langs/vi_VN/supplier_proposal.lang b/htdocs/langs/vi_VN/supplier_proposal.lang
similarity index 100%
rename from public/langs/vi_VN/supplier_proposal.lang
rename to htdocs/langs/vi_VN/supplier_proposal.lang
diff --git a/public/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang
similarity index 100%
rename from public/langs/vi_VN/suppliers.lang
rename to htdocs/langs/vi_VN/suppliers.lang
diff --git a/public/langs/vi_VN/trips.lang b/htdocs/langs/vi_VN/trips.lang
similarity index 100%
rename from public/langs/vi_VN/trips.lang
rename to htdocs/langs/vi_VN/trips.lang
diff --git a/public/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
similarity index 100%
rename from public/langs/vi_VN/users.lang
rename to htdocs/langs/vi_VN/users.lang
diff --git a/public/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
similarity index 100%
rename from public/langs/vi_VN/website.lang
rename to htdocs/langs/vi_VN/website.lang
diff --git a/public/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
similarity index 100%
rename from public/langs/vi_VN/withdrawals.lang
rename to htdocs/langs/vi_VN/withdrawals.lang
diff --git a/public/langs/vi_VN/workflow.lang b/htdocs/langs/vi_VN/workflow.lang
similarity index 100%
rename from public/langs/vi_VN/workflow.lang
rename to htdocs/langs/vi_VN/workflow.lang
diff --git a/public/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
similarity index 100%
rename from public/langs/zh_CN/accountancy.lang
rename to htdocs/langs/zh_CN/accountancy.lang
diff --git a/public/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
similarity index 100%
rename from public/langs/zh_CN/admin.lang
rename to htdocs/langs/zh_CN/admin.lang
diff --git a/public/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
similarity index 100%
rename from public/langs/zh_CN/agenda.lang
rename to htdocs/langs/zh_CN/agenda.lang
diff --git a/public/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
similarity index 100%
rename from public/langs/zh_CN/banks.lang
rename to htdocs/langs/zh_CN/banks.lang
diff --git a/public/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
similarity index 100%
rename from public/langs/zh_CN/bills.lang
rename to htdocs/langs/zh_CN/bills.lang
diff --git a/public/langs/zh_CN/bookmarks.lang b/htdocs/langs/zh_CN/bookmarks.lang
similarity index 100%
rename from public/langs/zh_CN/bookmarks.lang
rename to htdocs/langs/zh_CN/bookmarks.lang
diff --git a/public/langs/zh_CN/boxes.lang b/htdocs/langs/zh_CN/boxes.lang
similarity index 100%
rename from public/langs/zh_CN/boxes.lang
rename to htdocs/langs/zh_CN/boxes.lang
diff --git a/public/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
similarity index 100%
rename from public/langs/zh_CN/cashdesk.lang
rename to htdocs/langs/zh_CN/cashdesk.lang
diff --git a/public/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
similarity index 100%
rename from public/langs/zh_CN/categories.lang
rename to htdocs/langs/zh_CN/categories.lang
diff --git a/public/langs/zh_CN/commercial.lang b/htdocs/langs/zh_CN/commercial.lang
similarity index 100%
rename from public/langs/zh_CN/commercial.lang
rename to htdocs/langs/zh_CN/commercial.lang
diff --git a/public/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
similarity index 100%
rename from public/langs/zh_CN/companies.lang
rename to htdocs/langs/zh_CN/companies.lang
diff --git a/public/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
similarity index 100%
rename from public/langs/zh_CN/compta.lang
rename to htdocs/langs/zh_CN/compta.lang
diff --git a/public/langs/zh_CN/contracts.lang b/htdocs/langs/zh_CN/contracts.lang
similarity index 100%
rename from public/langs/zh_CN/contracts.lang
rename to htdocs/langs/zh_CN/contracts.lang
diff --git a/public/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
similarity index 100%
rename from public/langs/zh_CN/cron.lang
rename to htdocs/langs/zh_CN/cron.lang
diff --git a/public/langs/zh_CN/deliveries.lang b/htdocs/langs/zh_CN/deliveries.lang
similarity index 100%
rename from public/langs/zh_CN/deliveries.lang
rename to htdocs/langs/zh_CN/deliveries.lang
diff --git a/public/langs/zh_CN/dict.lang b/htdocs/langs/zh_CN/dict.lang
similarity index 100%
rename from public/langs/zh_CN/dict.lang
rename to htdocs/langs/zh_CN/dict.lang
diff --git a/public/langs/zh_CN/donations.lang b/htdocs/langs/zh_CN/donations.lang
similarity index 100%
rename from public/langs/zh_CN/donations.lang
rename to htdocs/langs/zh_CN/donations.lang
diff --git a/public/langs/zh_CN/ecm.lang b/htdocs/langs/zh_CN/ecm.lang
similarity index 100%
rename from public/langs/zh_CN/ecm.lang
rename to htdocs/langs/zh_CN/ecm.lang
diff --git a/public/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
similarity index 100%
rename from public/langs/zh_CN/errors.lang
rename to htdocs/langs/zh_CN/errors.lang
diff --git a/public/langs/zh_CN/exports.lang b/htdocs/langs/zh_CN/exports.lang
similarity index 100%
rename from public/langs/zh_CN/exports.lang
rename to htdocs/langs/zh_CN/exports.lang
diff --git a/public/langs/zh_CN/externalsite.lang b/htdocs/langs/zh_CN/externalsite.lang
similarity index 100%
rename from public/langs/zh_CN/externalsite.lang
rename to htdocs/langs/zh_CN/externalsite.lang
diff --git a/public/langs/zh_CN/ftp.lang b/htdocs/langs/zh_CN/ftp.lang
similarity index 100%
rename from public/langs/zh_CN/ftp.lang
rename to htdocs/langs/zh_CN/ftp.lang
diff --git a/public/langs/zh_CN/help.lang b/htdocs/langs/zh_CN/help.lang
similarity index 100%
rename from public/langs/zh_CN/help.lang
rename to htdocs/langs/zh_CN/help.lang
diff --git a/public/langs/zh_CN/holiday.lang b/htdocs/langs/zh_CN/holiday.lang
similarity index 100%
rename from public/langs/zh_CN/holiday.lang
rename to htdocs/langs/zh_CN/holiday.lang
diff --git a/public/langs/zh_CN/hrm.lang b/htdocs/langs/zh_CN/hrm.lang
similarity index 100%
rename from public/langs/zh_CN/hrm.lang
rename to htdocs/langs/zh_CN/hrm.lang
diff --git a/public/langs/zh_CN/incoterm.lang b/htdocs/langs/zh_CN/incoterm.lang
similarity index 100%
rename from public/langs/zh_CN/incoterm.lang
rename to htdocs/langs/zh_CN/incoterm.lang
diff --git a/public/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
similarity index 100%
rename from public/langs/zh_CN/install.lang
rename to htdocs/langs/zh_CN/install.lang
diff --git a/public/langs/zh_CN/interventions.lang b/htdocs/langs/zh_CN/interventions.lang
similarity index 100%
rename from public/langs/zh_CN/interventions.lang
rename to htdocs/langs/zh_CN/interventions.lang
diff --git a/public/langs/zh_CN/languages.lang b/htdocs/langs/zh_CN/languages.lang
similarity index 100%
rename from public/langs/zh_CN/languages.lang
rename to htdocs/langs/zh_CN/languages.lang
diff --git a/public/langs/zh_CN/ldap.lang b/htdocs/langs/zh_CN/ldap.lang
similarity index 100%
rename from public/langs/zh_CN/ldap.lang
rename to htdocs/langs/zh_CN/ldap.lang
diff --git a/public/langs/zh_CN/link.lang b/htdocs/langs/zh_CN/link.lang
similarity index 100%
rename from public/langs/zh_CN/link.lang
rename to htdocs/langs/zh_CN/link.lang
diff --git a/public/langs/zh_CN/loan.lang b/htdocs/langs/zh_CN/loan.lang
similarity index 100%
rename from public/langs/zh_CN/loan.lang
rename to htdocs/langs/zh_CN/loan.lang
diff --git a/public/langs/zh_CN/mailmanspip.lang b/htdocs/langs/zh_CN/mailmanspip.lang
similarity index 100%
rename from public/langs/zh_CN/mailmanspip.lang
rename to htdocs/langs/zh_CN/mailmanspip.lang
diff --git a/public/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
similarity index 100%
rename from public/langs/zh_CN/mails.lang
rename to htdocs/langs/zh_CN/mails.lang
diff --git a/public/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
similarity index 100%
rename from public/langs/zh_CN/main.lang
rename to htdocs/langs/zh_CN/main.lang
diff --git a/public/langs/zh_CN/margins.lang b/htdocs/langs/zh_CN/margins.lang
similarity index 100%
rename from public/langs/zh_CN/margins.lang
rename to htdocs/langs/zh_CN/margins.lang
diff --git a/public/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
similarity index 100%
rename from public/langs/zh_CN/members.lang
rename to htdocs/langs/zh_CN/members.lang
diff --git a/public/langs/zh_CN/oauth.lang b/htdocs/langs/zh_CN/oauth.lang
similarity index 100%
rename from public/langs/zh_CN/oauth.lang
rename to htdocs/langs/zh_CN/oauth.lang
diff --git a/public/langs/zh_CN/opensurvey.lang b/htdocs/langs/zh_CN/opensurvey.lang
similarity index 100%
rename from public/langs/zh_CN/opensurvey.lang
rename to htdocs/langs/zh_CN/opensurvey.lang
diff --git a/public/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang
similarity index 100%
rename from public/langs/zh_CN/orders.lang
rename to htdocs/langs/zh_CN/orders.lang
diff --git a/public/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
similarity index 100%
rename from public/langs/zh_CN/other.lang
rename to htdocs/langs/zh_CN/other.lang
diff --git a/public/langs/zh_CN/paybox.lang b/htdocs/langs/zh_CN/paybox.lang
similarity index 100%
rename from public/langs/zh_CN/paybox.lang
rename to htdocs/langs/zh_CN/paybox.lang
diff --git a/public/langs/zh_CN/paypal.lang b/htdocs/langs/zh_CN/paypal.lang
similarity index 100%
rename from public/langs/zh_CN/paypal.lang
rename to htdocs/langs/zh_CN/paypal.lang
diff --git a/public/langs/zh_CN/printing.lang b/htdocs/langs/zh_CN/printing.lang
similarity index 100%
rename from public/langs/zh_CN/printing.lang
rename to htdocs/langs/zh_CN/printing.lang
diff --git a/public/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang
similarity index 100%
rename from public/langs/zh_CN/productbatch.lang
rename to htdocs/langs/zh_CN/productbatch.lang
diff --git a/public/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
similarity index 100%
rename from public/langs/zh_CN/products.lang
rename to htdocs/langs/zh_CN/products.lang
diff --git a/public/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
similarity index 100%
rename from public/langs/zh_CN/projects.lang
rename to htdocs/langs/zh_CN/projects.lang
diff --git a/public/langs/zh_CN/propal.lang b/htdocs/langs/zh_CN/propal.lang
similarity index 100%
rename from public/langs/zh_CN/propal.lang
rename to htdocs/langs/zh_CN/propal.lang
diff --git a/public/langs/zh_CN/receiptprinter.lang b/htdocs/langs/zh_CN/receiptprinter.lang
similarity index 100%
rename from public/langs/zh_CN/receiptprinter.lang
rename to htdocs/langs/zh_CN/receiptprinter.lang
diff --git a/public/langs/zh_CN/resource.lang b/htdocs/langs/zh_CN/resource.lang
similarity index 100%
rename from public/langs/zh_CN/resource.lang
rename to htdocs/langs/zh_CN/resource.lang
diff --git a/public/langs/zh_CN/salaries.lang b/htdocs/langs/zh_CN/salaries.lang
similarity index 100%
rename from public/langs/zh_CN/salaries.lang
rename to htdocs/langs/zh_CN/salaries.lang
diff --git a/public/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang
similarity index 100%
rename from public/langs/zh_CN/sendings.lang
rename to htdocs/langs/zh_CN/sendings.lang
diff --git a/public/langs/zh_CN/sms.lang b/htdocs/langs/zh_CN/sms.lang
similarity index 100%
rename from public/langs/zh_CN/sms.lang
rename to htdocs/langs/zh_CN/sms.lang
diff --git a/public/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
similarity index 100%
rename from public/langs/zh_CN/stocks.lang
rename to htdocs/langs/zh_CN/stocks.lang
diff --git a/public/langs/zh_CN/supplier_proposal.lang b/htdocs/langs/zh_CN/supplier_proposal.lang
similarity index 100%
rename from public/langs/zh_CN/supplier_proposal.lang
rename to htdocs/langs/zh_CN/supplier_proposal.lang
diff --git a/public/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang
similarity index 100%
rename from public/langs/zh_CN/suppliers.lang
rename to htdocs/langs/zh_CN/suppliers.lang
diff --git a/public/langs/zh_CN/trips.lang b/htdocs/langs/zh_CN/trips.lang
similarity index 100%
rename from public/langs/zh_CN/trips.lang
rename to htdocs/langs/zh_CN/trips.lang
diff --git a/public/langs/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang
similarity index 100%
rename from public/langs/zh_CN/users.lang
rename to htdocs/langs/zh_CN/users.lang
diff --git a/public/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
similarity index 100%
rename from public/langs/zh_CN/website.lang
rename to htdocs/langs/zh_CN/website.lang
diff --git a/public/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
similarity index 100%
rename from public/langs/zh_CN/withdrawals.lang
rename to htdocs/langs/zh_CN/withdrawals.lang
diff --git a/public/langs/zh_CN/workflow.lang b/htdocs/langs/zh_CN/workflow.lang
similarity index 100%
rename from public/langs/zh_CN/workflow.lang
rename to htdocs/langs/zh_CN/workflow.lang
diff --git a/public/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
similarity index 100%
rename from public/langs/zh_TW/accountancy.lang
rename to htdocs/langs/zh_TW/accountancy.lang
diff --git a/public/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
similarity index 100%
rename from public/langs/zh_TW/admin.lang
rename to htdocs/langs/zh_TW/admin.lang
diff --git a/public/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
similarity index 100%
rename from public/langs/zh_TW/agenda.lang
rename to htdocs/langs/zh_TW/agenda.lang
diff --git a/public/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
similarity index 100%
rename from public/langs/zh_TW/banks.lang
rename to htdocs/langs/zh_TW/banks.lang
diff --git a/public/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
similarity index 100%
rename from public/langs/zh_TW/bills.lang
rename to htdocs/langs/zh_TW/bills.lang
diff --git a/public/langs/zh_TW/bookmarks.lang b/htdocs/langs/zh_TW/bookmarks.lang
similarity index 100%
rename from public/langs/zh_TW/bookmarks.lang
rename to htdocs/langs/zh_TW/bookmarks.lang
diff --git a/public/langs/zh_TW/boxes.lang b/htdocs/langs/zh_TW/boxes.lang
similarity index 100%
rename from public/langs/zh_TW/boxes.lang
rename to htdocs/langs/zh_TW/boxes.lang
diff --git a/public/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
similarity index 100%
rename from public/langs/zh_TW/cashdesk.lang
rename to htdocs/langs/zh_TW/cashdesk.lang
diff --git a/public/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
similarity index 100%
rename from public/langs/zh_TW/categories.lang
rename to htdocs/langs/zh_TW/categories.lang
diff --git a/public/langs/zh_TW/commercial.lang b/htdocs/langs/zh_TW/commercial.lang
similarity index 100%
rename from public/langs/zh_TW/commercial.lang
rename to htdocs/langs/zh_TW/commercial.lang
diff --git a/public/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
similarity index 100%
rename from public/langs/zh_TW/companies.lang
rename to htdocs/langs/zh_TW/companies.lang
diff --git a/public/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
similarity index 100%
rename from public/langs/zh_TW/compta.lang
rename to htdocs/langs/zh_TW/compta.lang
diff --git a/public/langs/zh_TW/contracts.lang b/htdocs/langs/zh_TW/contracts.lang
similarity index 100%
rename from public/langs/zh_TW/contracts.lang
rename to htdocs/langs/zh_TW/contracts.lang
diff --git a/public/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang
similarity index 100%
rename from public/langs/zh_TW/cron.lang
rename to htdocs/langs/zh_TW/cron.lang
diff --git a/public/langs/zh_TW/deliveries.lang b/htdocs/langs/zh_TW/deliveries.lang
similarity index 100%
rename from public/langs/zh_TW/deliveries.lang
rename to htdocs/langs/zh_TW/deliveries.lang
diff --git a/public/langs/zh_TW/dict.lang b/htdocs/langs/zh_TW/dict.lang
similarity index 100%
rename from public/langs/zh_TW/dict.lang
rename to htdocs/langs/zh_TW/dict.lang
diff --git a/public/langs/zh_TW/donations.lang b/htdocs/langs/zh_TW/donations.lang
similarity index 100%
rename from public/langs/zh_TW/donations.lang
rename to htdocs/langs/zh_TW/donations.lang
diff --git a/public/langs/zh_TW/ecm.lang b/htdocs/langs/zh_TW/ecm.lang
similarity index 100%
rename from public/langs/zh_TW/ecm.lang
rename to htdocs/langs/zh_TW/ecm.lang
diff --git a/public/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
similarity index 100%
rename from public/langs/zh_TW/errors.lang
rename to htdocs/langs/zh_TW/errors.lang
diff --git a/public/langs/zh_TW/exports.lang b/htdocs/langs/zh_TW/exports.lang
similarity index 100%
rename from public/langs/zh_TW/exports.lang
rename to htdocs/langs/zh_TW/exports.lang
diff --git a/public/langs/zh_TW/externalsite.lang b/htdocs/langs/zh_TW/externalsite.lang
similarity index 100%
rename from public/langs/zh_TW/externalsite.lang
rename to htdocs/langs/zh_TW/externalsite.lang
diff --git a/public/langs/zh_TW/ftp.lang b/htdocs/langs/zh_TW/ftp.lang
similarity index 100%
rename from public/langs/zh_TW/ftp.lang
rename to htdocs/langs/zh_TW/ftp.lang
diff --git a/public/langs/zh_TW/help.lang b/htdocs/langs/zh_TW/help.lang
similarity index 100%
rename from public/langs/zh_TW/help.lang
rename to htdocs/langs/zh_TW/help.lang
diff --git a/public/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
similarity index 100%
rename from public/langs/zh_TW/holiday.lang
rename to htdocs/langs/zh_TW/holiday.lang
diff --git a/public/langs/zh_TW/hrm.lang b/htdocs/langs/zh_TW/hrm.lang
similarity index 100%
rename from public/langs/zh_TW/hrm.lang
rename to htdocs/langs/zh_TW/hrm.lang
diff --git a/public/langs/zh_TW/incoterm.lang b/htdocs/langs/zh_TW/incoterm.lang
similarity index 100%
rename from public/langs/zh_TW/incoterm.lang
rename to htdocs/langs/zh_TW/incoterm.lang
diff --git a/public/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
similarity index 100%
rename from public/langs/zh_TW/install.lang
rename to htdocs/langs/zh_TW/install.lang
diff --git a/public/langs/zh_TW/interventions.lang b/htdocs/langs/zh_TW/interventions.lang
similarity index 100%
rename from public/langs/zh_TW/interventions.lang
rename to htdocs/langs/zh_TW/interventions.lang
diff --git a/public/langs/zh_TW/languages.lang b/htdocs/langs/zh_TW/languages.lang
similarity index 100%
rename from public/langs/zh_TW/languages.lang
rename to htdocs/langs/zh_TW/languages.lang
diff --git a/public/langs/zh_TW/ldap.lang b/htdocs/langs/zh_TW/ldap.lang
similarity index 100%
rename from public/langs/zh_TW/ldap.lang
rename to htdocs/langs/zh_TW/ldap.lang
diff --git a/public/langs/zh_TW/link.lang b/htdocs/langs/zh_TW/link.lang
similarity index 100%
rename from public/langs/zh_TW/link.lang
rename to htdocs/langs/zh_TW/link.lang
diff --git a/public/langs/zh_TW/loan.lang b/htdocs/langs/zh_TW/loan.lang
similarity index 100%
rename from public/langs/zh_TW/loan.lang
rename to htdocs/langs/zh_TW/loan.lang
diff --git a/public/langs/zh_TW/mailmanspip.lang b/htdocs/langs/zh_TW/mailmanspip.lang
similarity index 100%
rename from public/langs/zh_TW/mailmanspip.lang
rename to htdocs/langs/zh_TW/mailmanspip.lang
diff --git a/public/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
similarity index 100%
rename from public/langs/zh_TW/mails.lang
rename to htdocs/langs/zh_TW/mails.lang
diff --git a/public/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
similarity index 100%
rename from public/langs/zh_TW/main.lang
rename to htdocs/langs/zh_TW/main.lang
diff --git a/public/langs/zh_TW/margins.lang b/htdocs/langs/zh_TW/margins.lang
similarity index 100%
rename from public/langs/zh_TW/margins.lang
rename to htdocs/langs/zh_TW/margins.lang
diff --git a/public/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
similarity index 100%
rename from public/langs/zh_TW/members.lang
rename to htdocs/langs/zh_TW/members.lang
diff --git a/public/langs/zh_TW/oauth.lang b/htdocs/langs/zh_TW/oauth.lang
similarity index 100%
rename from public/langs/zh_TW/oauth.lang
rename to htdocs/langs/zh_TW/oauth.lang
diff --git a/public/langs/zh_TW/opensurvey.lang b/htdocs/langs/zh_TW/opensurvey.lang
similarity index 100%
rename from public/langs/zh_TW/opensurvey.lang
rename to htdocs/langs/zh_TW/opensurvey.lang
diff --git a/public/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
similarity index 100%
rename from public/langs/zh_TW/orders.lang
rename to htdocs/langs/zh_TW/orders.lang
diff --git a/public/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
similarity index 100%
rename from public/langs/zh_TW/other.lang
rename to htdocs/langs/zh_TW/other.lang
diff --git a/public/langs/zh_TW/paybox.lang b/htdocs/langs/zh_TW/paybox.lang
similarity index 100%
rename from public/langs/zh_TW/paybox.lang
rename to htdocs/langs/zh_TW/paybox.lang
diff --git a/public/langs/zh_TW/paypal.lang b/htdocs/langs/zh_TW/paypal.lang
similarity index 100%
rename from public/langs/zh_TW/paypal.lang
rename to htdocs/langs/zh_TW/paypal.lang
diff --git a/public/langs/zh_TW/printing.lang b/htdocs/langs/zh_TW/printing.lang
similarity index 100%
rename from public/langs/zh_TW/printing.lang
rename to htdocs/langs/zh_TW/printing.lang
diff --git a/public/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang
similarity index 100%
rename from public/langs/zh_TW/productbatch.lang
rename to htdocs/langs/zh_TW/productbatch.lang
diff --git a/public/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
similarity index 100%
rename from public/langs/zh_TW/products.lang
rename to htdocs/langs/zh_TW/products.lang
diff --git a/public/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
similarity index 100%
rename from public/langs/zh_TW/projects.lang
rename to htdocs/langs/zh_TW/projects.lang
diff --git a/public/langs/zh_TW/propal.lang b/htdocs/langs/zh_TW/propal.lang
similarity index 100%
rename from public/langs/zh_TW/propal.lang
rename to htdocs/langs/zh_TW/propal.lang
diff --git a/public/langs/zh_TW/receiptprinter.lang b/htdocs/langs/zh_TW/receiptprinter.lang
similarity index 100%
rename from public/langs/zh_TW/receiptprinter.lang
rename to htdocs/langs/zh_TW/receiptprinter.lang
diff --git a/public/langs/zh_TW/resource.lang b/htdocs/langs/zh_TW/resource.lang
similarity index 100%
rename from public/langs/zh_TW/resource.lang
rename to htdocs/langs/zh_TW/resource.lang
diff --git a/public/langs/zh_TW/salaries.lang b/htdocs/langs/zh_TW/salaries.lang
similarity index 100%
rename from public/langs/zh_TW/salaries.lang
rename to htdocs/langs/zh_TW/salaries.lang
diff --git a/public/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
similarity index 100%
rename from public/langs/zh_TW/sendings.lang
rename to htdocs/langs/zh_TW/sendings.lang
diff --git a/public/langs/zh_TW/sms.lang b/htdocs/langs/zh_TW/sms.lang
similarity index 100%
rename from public/langs/zh_TW/sms.lang
rename to htdocs/langs/zh_TW/sms.lang
diff --git a/public/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
similarity index 100%
rename from public/langs/zh_TW/stocks.lang
rename to htdocs/langs/zh_TW/stocks.lang
diff --git a/public/langs/zh_TW/supplier_proposal.lang b/htdocs/langs/zh_TW/supplier_proposal.lang
similarity index 100%
rename from public/langs/zh_TW/supplier_proposal.lang
rename to htdocs/langs/zh_TW/supplier_proposal.lang
diff --git a/public/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang
similarity index 100%
rename from public/langs/zh_TW/suppliers.lang
rename to htdocs/langs/zh_TW/suppliers.lang
diff --git a/public/langs/zh_TW/trips.lang b/htdocs/langs/zh_TW/trips.lang
similarity index 100%
rename from public/langs/zh_TW/trips.lang
rename to htdocs/langs/zh_TW/trips.lang
diff --git a/public/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
similarity index 100%
rename from public/langs/zh_TW/users.lang
rename to htdocs/langs/zh_TW/users.lang
diff --git a/public/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
similarity index 100%
rename from public/langs/zh_TW/website.lang
rename to htdocs/langs/zh_TW/website.lang
diff --git a/public/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
similarity index 100%
rename from public/langs/zh_TW/withdrawals.lang
rename to htdocs/langs/zh_TW/withdrawals.lang
diff --git a/public/langs/zh_TW/workflow.lang b/htdocs/langs/zh_TW/workflow.lang
similarity index 100%
rename from public/langs/zh_TW/workflow.lang
rename to htdocs/langs/zh_TW/workflow.lang
diff --git a/public/livraison/card.php b/htdocs/livraison/card.php
similarity index 100%
rename from public/livraison/card.php
rename to htdocs/livraison/card.php
diff --git a/public/livraison/class/index.html b/htdocs/livraison/class/index.html
similarity index 100%
rename from public/livraison/class/index.html
rename to htdocs/livraison/class/index.html
diff --git a/public/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
similarity index 100%
rename from public/livraison/class/livraison.class.php
rename to htdocs/livraison/class/livraison.class.php
diff --git a/public/livraison/index.html b/htdocs/livraison/index.html
similarity index 100%
rename from public/livraison/index.html
rename to htdocs/livraison/index.html
diff --git a/public/loan/calc.php b/htdocs/loan/calc.php
similarity index 100%
rename from public/loan/calc.php
rename to htdocs/loan/calc.php
diff --git a/public/loan/card.php b/htdocs/loan/card.php
similarity index 100%
rename from public/loan/card.php
rename to htdocs/loan/card.php
diff --git a/public/loan/class/index.html b/htdocs/loan/class/index.html
similarity index 100%
rename from public/loan/class/index.html
rename to htdocs/loan/class/index.html
diff --git a/public/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
similarity index 100%
rename from public/loan/class/loan.class.php
rename to htdocs/loan/class/loan.class.php
diff --git a/public/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
similarity index 100%
rename from public/loan/class/paymentloan.class.php
rename to htdocs/loan/class/paymentloan.class.php
diff --git a/public/loan/document.php b/htdocs/loan/document.php
similarity index 100%
rename from public/loan/document.php
rename to htdocs/loan/document.php
diff --git a/public/loan/index.html b/htdocs/loan/index.html
similarity index 100%
rename from public/loan/index.html
rename to htdocs/loan/index.html
diff --git a/public/loan/index.php b/htdocs/loan/index.php
similarity index 100%
rename from public/loan/index.php
rename to htdocs/loan/index.php
diff --git a/public/loan/info.php b/htdocs/loan/info.php
similarity index 100%
rename from public/loan/info.php
rename to htdocs/loan/info.php
diff --git a/public/loan/note.php b/htdocs/loan/note.php
similarity index 100%
rename from public/loan/note.php
rename to htdocs/loan/note.php
diff --git a/public/loan/payment/card.php b/htdocs/loan/payment/card.php
similarity index 100%
rename from public/loan/payment/card.php
rename to htdocs/loan/payment/card.php
diff --git a/public/loan/payment/index.html b/htdocs/loan/payment/index.html
similarity index 100%
rename from public/loan/payment/index.html
rename to htdocs/loan/payment/index.html
diff --git a/public/loan/payment/payment.php b/htdocs/loan/payment/payment.php
similarity index 100%
rename from public/loan/payment/payment.php
rename to htdocs/loan/payment/payment.php
diff --git a/public/mailmanspip/class/index.html b/htdocs/mailmanspip/class/index.html
similarity index 100%
rename from public/mailmanspip/class/index.html
rename to htdocs/mailmanspip/class/index.html
diff --git a/public/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
similarity index 100%
rename from public/mailmanspip/class/mailmanspip.class.php
rename to htdocs/mailmanspip/class/mailmanspip.class.php
diff --git a/public/mailmanspip/index.html b/htdocs/mailmanspip/index.html
similarity index 100%
rename from public/mailmanspip/index.html
rename to htdocs/mailmanspip/index.html
diff --git a/public/main.inc.php b/htdocs/main.inc.php
similarity index 100%
rename from public/main.inc.php
rename to htdocs/main.inc.php
diff --git a/public/margin/admin/index.html b/htdocs/margin/admin/index.html
similarity index 100%
rename from public/margin/admin/index.html
rename to htdocs/margin/admin/index.html
diff --git a/public/margin/admin/margin.php b/htdocs/margin/admin/margin.php
similarity index 100%
rename from public/margin/admin/margin.php
rename to htdocs/margin/admin/margin.php
diff --git a/public/margin/agentMargins.php b/htdocs/margin/agentMargins.php
similarity index 100%
rename from public/margin/agentMargins.php
rename to htdocs/margin/agentMargins.php
diff --git a/public/margin/checkMargins.php b/htdocs/margin/checkMargins.php
similarity index 100%
rename from public/margin/checkMargins.php
rename to htdocs/margin/checkMargins.php
diff --git a/public/margin/customerMargins.php b/htdocs/margin/customerMargins.php
similarity index 100%
rename from public/margin/customerMargins.php
rename to htdocs/margin/customerMargins.php
diff --git a/public/margin/index.php b/htdocs/margin/index.php
similarity index 100%
rename from public/margin/index.php
rename to htdocs/margin/index.php
diff --git a/public/margin/lib/index.html b/htdocs/margin/lib/index.html
similarity index 100%
rename from public/margin/lib/index.html
rename to htdocs/margin/lib/index.html
diff --git a/public/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php
similarity index 100%
rename from public/margin/lib/margins.lib.php
rename to htdocs/margin/lib/margins.lib.php
diff --git a/public/margin/productMargins.php b/htdocs/margin/productMargins.php
similarity index 100%
rename from public/margin/productMargins.php
rename to htdocs/margin/productMargins.php
diff --git a/public/margin/tabs/index.html b/htdocs/margin/tabs/index.html
similarity index 100%
rename from public/margin/tabs/index.html
rename to htdocs/margin/tabs/index.html
diff --git a/public/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
similarity index 100%
rename from public/margin/tabs/productMargins.php
rename to htdocs/margin/tabs/productMargins.php
diff --git a/public/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
similarity index 100%
rename from public/margin/tabs/thirdpartyMargins.php
rename to htdocs/margin/tabs/thirdpartyMargins.php
diff --git a/public/master.inc.php b/htdocs/master.inc.php
similarity index 100%
rename from public/master.inc.php
rename to htdocs/master.inc.php
diff --git a/public/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
similarity index 100%
rename from public/multicurrency/class/multicurrency.class.php
rename to htdocs/multicurrency/class/multicurrency.class.php
diff --git a/public/opensurvey/card.php b/htdocs/opensurvey/card.php
similarity index 100%
rename from public/opensurvey/card.php
rename to htdocs/opensurvey/card.php
diff --git a/public/opensurvey/class/index.html b/htdocs/opensurvey/class/index.html
similarity index 100%
rename from public/opensurvey/class/index.html
rename to htdocs/opensurvey/class/index.html
diff --git a/public/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
similarity index 100%
rename from public/opensurvey/class/opensurveysondage.class.php
rename to htdocs/opensurvey/class/opensurveysondage.class.php
diff --git a/public/opensurvey/css/index.html b/htdocs/opensurvey/css/index.html
similarity index 100%
rename from public/opensurvey/css/index.html
rename to htdocs/opensurvey/css/index.html
diff --git a/public/opensurvey/css/style.css b/htdocs/opensurvey/css/style.css
similarity index 100%
rename from public/opensurvey/css/style.css
rename to htdocs/opensurvey/css/style.css
diff --git a/public/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
similarity index 100%
rename from public/opensurvey/exportcsv.php
rename to htdocs/opensurvey/exportcsv.php
diff --git a/public/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
similarity index 100%
rename from public/opensurvey/fonctions.php
rename to htdocs/opensurvey/fonctions.php
diff --git a/public/opensurvey/img/accept-24.png b/htdocs/opensurvey/img/accept-24.png
similarity index 100%
rename from public/opensurvey/img/accept-24.png
rename to htdocs/opensurvey/img/accept-24.png
diff --git a/public/opensurvey/img/accept.png b/htdocs/opensurvey/img/accept.png
similarity index 100%
rename from public/opensurvey/img/accept.png
rename to htdocs/opensurvey/img/accept.png
diff --git a/public/opensurvey/img/add-16.png b/htdocs/opensurvey/img/add-16.png
similarity index 100%
rename from public/opensurvey/img/add-16.png
rename to htdocs/opensurvey/img/add-16.png
diff --git a/public/opensurvey/img/add-24.png b/htdocs/opensurvey/img/add-24.png
similarity index 100%
rename from public/opensurvey/img/add-24.png
rename to htdocs/opensurvey/img/add-24.png
diff --git a/public/opensurvey/img/calendar-32.png b/htdocs/opensurvey/img/calendar-32.png
similarity index 100%
rename from public/opensurvey/img/calendar-32.png
rename to htdocs/opensurvey/img/calendar-32.png
diff --git a/public/opensurvey/img/chart-32.png b/htdocs/opensurvey/img/chart-32.png
similarity index 100%
rename from public/opensurvey/img/chart-32.png
rename to htdocs/opensurvey/img/chart-32.png
diff --git a/public/opensurvey/img/date.png b/htdocs/opensurvey/img/date.png
similarity index 100%
rename from public/opensurvey/img/date.png
rename to htdocs/opensurvey/img/date.png
diff --git a/public/opensurvey/img/fforward.png b/htdocs/opensurvey/img/fforward.png
similarity index 100%
rename from public/opensurvey/img/fforward.png
rename to htdocs/opensurvey/img/fforward.png
diff --git a/public/opensurvey/img/index.html b/htdocs/opensurvey/img/index.html
similarity index 100%
rename from public/opensurvey/img/index.html
rename to htdocs/opensurvey/img/index.html
diff --git a/public/opensurvey/img/medaille.png b/htdocs/opensurvey/img/medaille.png
similarity index 100%
rename from public/opensurvey/img/medaille.png
rename to htdocs/opensurvey/img/medaille.png
diff --git a/public/opensurvey/img/next.png b/htdocs/opensurvey/img/next.png
similarity index 100%
rename from public/opensurvey/img/next.png
rename to htdocs/opensurvey/img/next.png
diff --git a/public/opensurvey/img/object_opensurvey.png b/htdocs/opensurvey/img/object_opensurvey.png
similarity index 100%
rename from public/opensurvey/img/object_opensurvey.png
rename to htdocs/opensurvey/img/object_opensurvey.png
diff --git a/public/opensurvey/img/opensurvey.png b/htdocs/opensurvey/img/opensurvey.png
similarity index 100%
rename from public/opensurvey/img/opensurvey.png
rename to htdocs/opensurvey/img/opensurvey.png
diff --git a/public/opensurvey/img/previous.png b/htdocs/opensurvey/img/previous.png
similarity index 100%
rename from public/opensurvey/img/previous.png
rename to htdocs/opensurvey/img/previous.png
diff --git a/public/opensurvey/img/rewind.png b/htdocs/opensurvey/img/rewind.png
similarity index 100%
rename from public/opensurvey/img/rewind.png
rename to htdocs/opensurvey/img/rewind.png
diff --git a/public/opensurvey/img/sondage2.png b/htdocs/opensurvey/img/sondage2.png
similarity index 100%
rename from public/opensurvey/img/sondage2.png
rename to htdocs/opensurvey/img/sondage2.png
diff --git a/public/opensurvey/index.php b/htdocs/opensurvey/index.php
similarity index 100%
rename from public/opensurvey/index.php
rename to htdocs/opensurvey/index.php
diff --git a/public/opensurvey/list.php b/htdocs/opensurvey/list.php
similarity index 100%
rename from public/opensurvey/list.php
rename to htdocs/opensurvey/list.php
diff --git a/public/opensurvey/results.php b/htdocs/opensurvey/results.php
similarity index 100%
rename from public/opensurvey/results.php
rename to htdocs/opensurvey/results.php
diff --git a/public/opensurvey/wizard/choix_autre.php b/htdocs/opensurvey/wizard/choix_autre.php
similarity index 100%
rename from public/opensurvey/wizard/choix_autre.php
rename to htdocs/opensurvey/wizard/choix_autre.php
diff --git a/public/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
similarity index 100%
rename from public/opensurvey/wizard/choix_date.php
rename to htdocs/opensurvey/wizard/choix_date.php
diff --git a/public/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
similarity index 100%
rename from public/opensurvey/wizard/create_survey.php
rename to htdocs/opensurvey/wizard/create_survey.php
diff --git a/public/opensurvey/wizard/index.php b/htdocs/opensurvey/wizard/index.php
similarity index 100%
rename from public/opensurvey/wizard/index.php
rename to htdocs/opensurvey/wizard/index.php
diff --git a/public/paybox/admin/index.html b/htdocs/paybox/admin/index.html
similarity index 100%
rename from public/paybox/admin/index.html
rename to htdocs/paybox/admin/index.html
diff --git a/public/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
similarity index 100%
rename from public/paybox/admin/paybox.php
rename to htdocs/paybox/admin/paybox.php
diff --git a/public/paybox/img/index.html b/htdocs/paybox/img/index.html
similarity index 100%
rename from public/paybox/img/index.html
rename to htdocs/paybox/img/index.html
diff --git a/public/paybox/img/object_paybox.png b/htdocs/paybox/img/object_paybox.png
similarity index 100%
rename from public/paybox/img/object_paybox.png
rename to htdocs/paybox/img/object_paybox.png
diff --git a/public/paybox/index.html b/htdocs/paybox/index.html
similarity index 100%
rename from public/paybox/index.html
rename to htdocs/paybox/index.html
diff --git a/public/paybox/lib/index.html b/htdocs/paybox/lib/index.html
similarity index 100%
rename from public/paybox/lib/index.html
rename to htdocs/paybox/lib/index.html
diff --git a/public/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
similarity index 100%
rename from public/paybox/lib/paybox.lib.php
rename to htdocs/paybox/lib/paybox.lib.php
diff --git a/public/paypal/admin/index.html b/htdocs/paypal/admin/index.html
similarity index 100%
rename from public/paypal/admin/index.html
rename to htdocs/paypal/admin/index.html
diff --git a/public/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
similarity index 100%
rename from public/paypal/admin/paypal.php
rename to htdocs/paypal/admin/paypal.php
diff --git a/public/paypal/img/index.html b/htdocs/paypal/img/index.html
similarity index 100%
rename from public/paypal/img/index.html
rename to htdocs/paypal/img/index.html
diff --git a/public/paypal/img/object_paypal.png b/htdocs/paypal/img/object_paypal.png
similarity index 100%
rename from public/paypal/img/object_paypal.png
rename to htdocs/paypal/img/object_paypal.png
diff --git a/public/paypal/index.html b/htdocs/paypal/index.html
similarity index 100%
rename from public/paypal/index.html
rename to htdocs/paypal/index.html
diff --git a/public/paypal/lib/index.html b/htdocs/paypal/lib/index.html
similarity index 100%
rename from public/paypal/lib/index.html
rename to htdocs/paypal/lib/index.html
diff --git a/public/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
similarity index 100%
rename from public/paypal/lib/paypal.lib.php
rename to htdocs/paypal/lib/paypal.lib.php
diff --git a/public/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php
similarity index 100%
rename from public/paypal/lib/paypalfunctions.lib.php
rename to htdocs/paypal/lib/paypalfunctions.lib.php
diff --git a/public/printing/admin/index.html b/htdocs/printing/admin/index.html
similarity index 100%
rename from public/printing/admin/index.html
rename to htdocs/printing/admin/index.html
diff --git a/public/printing/admin/printing.php b/htdocs/printing/admin/printing.php
similarity index 100%
rename from public/printing/admin/printing.php
rename to htdocs/printing/admin/printing.php
diff --git a/public/printing/index.php b/htdocs/printing/index.php
similarity index 100%
rename from public/printing/index.php
rename to htdocs/printing/index.php
diff --git a/public/printing/lib/index.html b/htdocs/printing/lib/index.html
similarity index 100%
rename from public/printing/lib/index.html
rename to htdocs/printing/lib/index.html
diff --git a/public/printing/lib/printing.lib.php b/htdocs/printing/lib/printing.lib.php
similarity index 100%
rename from public/printing/lib/printing.lib.php
rename to htdocs/printing/lib/printing.lib.php
diff --git a/public/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
similarity index 100%
rename from public/product/admin/dynamic_prices.php
rename to htdocs/product/admin/dynamic_prices.php
diff --git a/public/product/admin/index.html b/htdocs/product/admin/index.html
similarity index 100%
rename from public/product/admin/index.html
rename to htdocs/product/admin/index.html
diff --git a/public/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php
similarity index 100%
rename from public/product/admin/price_rules.php
rename to htdocs/product/admin/price_rules.php
diff --git a/public/product/admin/product.php b/htdocs/product/admin/product.php
similarity index 100%
rename from public/product/admin/product.php
rename to htdocs/product/admin/product.php
diff --git a/public/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php
similarity index 100%
rename from public/product/admin/product_extrafields.php
rename to htdocs/product/admin/product_extrafields.php
diff --git a/public/product/admin/product_lot_extrafields.php b/htdocs/product/admin/product_lot_extrafields.php
similarity index 100%
rename from public/product/admin/product_lot_extrafields.php
rename to htdocs/product/admin/product_lot_extrafields.php
diff --git a/public/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
similarity index 100%
rename from public/product/admin/product_tools.php
rename to htdocs/product/admin/product_tools.php
diff --git a/public/product/ajax/index.html b/htdocs/product/ajax/index.html
similarity index 100%
rename from public/product/ajax/index.html
rename to htdocs/product/ajax/index.html
diff --git a/public/product/ajax/products.php b/htdocs/product/ajax/products.php
similarity index 100%
rename from public/product/ajax/products.php
rename to htdocs/product/ajax/products.php
diff --git a/public/product/canvas/index.html b/htdocs/product/canvas/index.html
similarity index 100%
rename from public/product/canvas/index.html
rename to htdocs/product/canvas/index.html
diff --git a/public/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
similarity index 100%
rename from public/product/canvas/product/actions_card_product.class.php
rename to htdocs/product/canvas/product/actions_card_product.class.php
diff --git a/public/product/canvas/product/index.html b/htdocs/product/canvas/product/index.html
similarity index 100%
rename from public/product/canvas/product/index.html
rename to htdocs/product/canvas/product/index.html
diff --git a/public/product/canvas/product/tpl/card_create.tpl.php b/htdocs/product/canvas/product/tpl/card_create.tpl.php
similarity index 100%
rename from public/product/canvas/product/tpl/card_create.tpl.php
rename to htdocs/product/canvas/product/tpl/card_create.tpl.php
diff --git a/public/product/canvas/product/tpl/card_edit.tpl.php b/htdocs/product/canvas/product/tpl/card_edit.tpl.php
similarity index 100%
rename from public/product/canvas/product/tpl/card_edit.tpl.php
rename to htdocs/product/canvas/product/tpl/card_edit.tpl.php
diff --git a/public/product/canvas/product/tpl/card_view.tpl.php b/htdocs/product/canvas/product/tpl/card_view.tpl.php
similarity index 100%
rename from public/product/canvas/product/tpl/card_view.tpl.php
rename to htdocs/product/canvas/product/tpl/card_view.tpl.php
diff --git a/public/product/canvas/product/tpl/index.html b/htdocs/product/canvas/product/tpl/index.html
similarity index 100%
rename from public/product/canvas/product/tpl/index.html
rename to htdocs/product/canvas/product/tpl/index.html
diff --git a/public/product/canvas/product/tpl/list.tpl.php b/htdocs/product/canvas/product/tpl/list.tpl.php
similarity index 100%
rename from public/product/canvas/product/tpl/list.tpl.php
rename to htdocs/product/canvas/product/tpl/list.tpl.php
diff --git a/public/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
similarity index 100%
rename from public/product/canvas/service/actions_card_service.class.php
rename to htdocs/product/canvas/service/actions_card_service.class.php
diff --git a/public/product/canvas/service/index.html b/htdocs/product/canvas/service/index.html
similarity index 100%
rename from public/product/canvas/service/index.html
rename to htdocs/product/canvas/service/index.html
diff --git a/public/product/canvas/service/tpl/card_create.tpl.php b/htdocs/product/canvas/service/tpl/card_create.tpl.php
similarity index 100%
rename from public/product/canvas/service/tpl/card_create.tpl.php
rename to htdocs/product/canvas/service/tpl/card_create.tpl.php
diff --git a/public/product/canvas/service/tpl/card_edit.tpl.php b/htdocs/product/canvas/service/tpl/card_edit.tpl.php
similarity index 100%
rename from public/product/canvas/service/tpl/card_edit.tpl.php
rename to htdocs/product/canvas/service/tpl/card_edit.tpl.php
diff --git a/public/product/canvas/service/tpl/card_view.tpl.php b/htdocs/product/canvas/service/tpl/card_view.tpl.php
similarity index 100%
rename from public/product/canvas/service/tpl/card_view.tpl.php
rename to htdocs/product/canvas/service/tpl/card_view.tpl.php
diff --git a/public/product/canvas/service/tpl/index.html b/htdocs/product/canvas/service/tpl/index.html
similarity index 100%
rename from public/product/canvas/service/tpl/index.html
rename to htdocs/product/canvas/service/tpl/index.html
diff --git a/public/product/canvas/service/tpl/list.tpl.php b/htdocs/product/canvas/service/tpl/list.tpl.php
similarity index 100%
rename from public/product/canvas/service/tpl/list.tpl.php
rename to htdocs/product/canvas/service/tpl/list.tpl.php
diff --git a/public/product/card.php b/htdocs/product/card.php
similarity index 100%
rename from public/product/card.php
rename to htdocs/product/card.php
diff --git a/public/product/class/api_deprecated_product.class.php b/htdocs/product/class/api_deprecated_product.class.php
similarity index 100%
rename from public/product/class/api_deprecated_product.class.php
rename to htdocs/product/class/api_deprecated_product.class.php
diff --git a/public/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
similarity index 100%
rename from public/product/class/api_products.class.php
rename to htdocs/product/class/api_products.class.php
diff --git a/public/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
similarity index 100%
rename from public/product/class/html.formproduct.class.php
rename to htdocs/product/class/html.formproduct.class.php
diff --git a/public/product/class/index.html b/htdocs/product/class/index.html
similarity index 100%
rename from public/product/class/index.html
rename to htdocs/product/class/index.html
diff --git a/public/product/class/product.class.php b/htdocs/product/class/product.class.php
similarity index 100%
rename from public/product/class/product.class.php
rename to htdocs/product/class/product.class.php
diff --git a/public/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
similarity index 100%
rename from public/product/class/productbatch.class.php
rename to htdocs/product/class/productbatch.class.php
diff --git a/public/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
similarity index 100%
rename from public/product/class/productcustomerprice.class.php
rename to htdocs/product/class/productcustomerprice.class.php
diff --git a/public/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
similarity index 100%
rename from public/product/class/propalmergepdfproduct.class.php
rename to htdocs/product/class/propalmergepdfproduct.class.php
diff --git a/public/product/class/service.class.php b/htdocs/product/class/service.class.php
similarity index 100%
rename from public/product/class/service.class.php
rename to htdocs/product/class/service.class.php
diff --git a/public/product/composition/card.php b/htdocs/product/composition/card.php
similarity index 100%
rename from public/product/composition/card.php
rename to htdocs/product/composition/card.php
diff --git a/public/product/composition/index.html b/htdocs/product/composition/index.html
similarity index 100%
rename from public/product/composition/index.html
rename to htdocs/product/composition/index.html
diff --git a/public/product/document.php b/htdocs/product/document.php
similarity index 100%
rename from public/product/document.php
rename to htdocs/product/document.php
diff --git a/public/product/dynamic_price/class/price_expression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php
similarity index 100%
rename from public/product/dynamic_price/class/price_expression.class.php
rename to htdocs/product/dynamic_price/class/price_expression.class.php
diff --git a/public/product/dynamic_price/class/price_global_variable.class.php b/htdocs/product/dynamic_price/class/price_global_variable.class.php
similarity index 100%
rename from public/product/dynamic_price/class/price_global_variable.class.php
rename to htdocs/product/dynamic_price/class/price_global_variable.class.php
diff --git a/public/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
similarity index 100%
rename from public/product/dynamic_price/class/price_global_variable_updater.class.php
rename to htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
diff --git a/public/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
similarity index 100%
rename from public/product/dynamic_price/class/price_parser.class.php
rename to htdocs/product/dynamic_price/class/price_parser.class.php
diff --git a/public/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
similarity index 100%
rename from public/product/dynamic_price/editor.php
rename to htdocs/product/dynamic_price/editor.php
diff --git a/public/product/fournisseurs.php b/htdocs/product/fournisseurs.php
similarity index 100%
rename from public/product/fournisseurs.php
rename to htdocs/product/fournisseurs.php
diff --git a/public/product/index.php b/htdocs/product/index.php
similarity index 100%
rename from public/product/index.php
rename to htdocs/product/index.php
diff --git a/public/product/info.php b/htdocs/product/info.php
similarity index 100%
rename from public/product/info.php
rename to htdocs/product/info.php
diff --git a/public/product/list.php b/htdocs/product/list.php
similarity index 100%
rename from public/product/list.php
rename to htdocs/product/list.php
diff --git a/public/product/note.php b/htdocs/product/note.php
similarity index 100%
rename from public/product/note.php
rename to htdocs/product/note.php
diff --git a/public/product/popuprop.php b/htdocs/product/popuprop.php
similarity index 100%
rename from public/product/popuprop.php
rename to htdocs/product/popuprop.php
diff --git a/public/product/price.php b/htdocs/product/price.php
similarity index 100%
rename from public/product/price.php
rename to htdocs/product/price.php
diff --git a/public/product/reassort.php b/htdocs/product/reassort.php
similarity index 100%
rename from public/product/reassort.php
rename to htdocs/product/reassort.php
diff --git a/public/product/reassortlot.php b/htdocs/product/reassortlot.php
similarity index 100%
rename from public/product/reassortlot.php
rename to htdocs/product/reassortlot.php
diff --git a/public/product/stats/card.php b/htdocs/product/stats/card.php
similarity index 100%
rename from public/product/stats/card.php
rename to htdocs/product/stats/card.php
diff --git a/public/product/stats/commande.php b/htdocs/product/stats/commande.php
similarity index 100%
rename from public/product/stats/commande.php
rename to htdocs/product/stats/commande.php
diff --git a/public/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
similarity index 100%
rename from public/product/stats/commande_fournisseur.php
rename to htdocs/product/stats/commande_fournisseur.php
diff --git a/public/product/stats/contrat.php b/htdocs/product/stats/contrat.php
similarity index 100%
rename from public/product/stats/contrat.php
rename to htdocs/product/stats/contrat.php
diff --git a/public/product/stats/facture.php b/htdocs/product/stats/facture.php
similarity index 100%
rename from public/product/stats/facture.php
rename to htdocs/product/stats/facture.php
diff --git a/public/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
similarity index 100%
rename from public/product/stats/facture_fournisseur.php
rename to htdocs/product/stats/facture_fournisseur.php
diff --git a/public/product/stats/index.html b/htdocs/product/stats/index.html
similarity index 100%
rename from public/product/stats/index.html
rename to htdocs/product/stats/index.html
diff --git a/public/product/stats/propal.php b/htdocs/product/stats/propal.php
similarity index 100%
rename from public/product/stats/propal.php
rename to htdocs/product/stats/propal.php
diff --git a/public/product/stock/card.php b/htdocs/product/stock/card.php
similarity index 100%
rename from public/product/stock/card.php
rename to htdocs/product/stock/card.php
diff --git a/public/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
similarity index 100%
rename from public/product/stock/class/api_stockmovements.class.php
rename to htdocs/product/stock/class/api_stockmovements.class.php
diff --git a/public/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
similarity index 100%
rename from public/product/stock/class/api_warehouses.class.php
rename to htdocs/product/stock/class/api_warehouses.class.php
diff --git a/public/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
similarity index 100%
rename from public/product/stock/class/entrepot.class.php
rename to htdocs/product/stock/class/entrepot.class.php
diff --git a/public/product/stock/class/index.html b/htdocs/product/stock/class/index.html
similarity index 100%
rename from public/product/stock/class/index.html
rename to htdocs/product/stock/class/index.html
diff --git a/public/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
similarity index 100%
rename from public/product/stock/class/mouvementstock.class.php
rename to htdocs/product/stock/class/mouvementstock.class.php
diff --git a/public/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
similarity index 100%
rename from public/product/stock/class/productlot.class.php
rename to htdocs/product/stock/class/productlot.class.php
diff --git a/public/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
similarity index 100%
rename from public/product/stock/class/productstockentrepot.class.php
rename to htdocs/product/stock/class/productstockentrepot.class.php
diff --git a/public/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php
similarity index 100%
rename from public/product/stock/fiche-valo.php
rename to htdocs/product/stock/fiche-valo.php
diff --git a/public/product/stock/img/index.html b/htdocs/product/stock/img/index.html
similarity index 100%
rename from public/product/stock/img/index.html
rename to htdocs/product/stock/img/index.html
diff --git a/public/product/stock/img/no.png b/htdocs/product/stock/img/no.png
similarity index 100%
rename from public/product/stock/img/no.png
rename to htdocs/product/stock/img/no.png
diff --git a/public/product/stock/img/yes.png b/htdocs/product/stock/img/yes.png
similarity index 100%
rename from public/product/stock/img/yes.png
rename to htdocs/product/stock/img/yes.png
diff --git a/public/product/stock/index.php b/htdocs/product/stock/index.php
similarity index 100%
rename from public/product/stock/index.php
rename to htdocs/product/stock/index.php
diff --git a/public/product/stock/info.php b/htdocs/product/stock/info.php
similarity index 100%
rename from public/product/stock/info.php
rename to htdocs/product/stock/info.php
diff --git a/public/product/stock/lib/index.html b/htdocs/product/stock/lib/index.html
similarity index 100%
rename from public/product/stock/lib/index.html
rename to htdocs/product/stock/lib/index.html
diff --git a/public/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php
similarity index 100%
rename from public/product/stock/lib/replenishment.lib.php
rename to htdocs/product/stock/lib/replenishment.lib.php
diff --git a/public/product/stock/list.php b/htdocs/product/stock/list.php
similarity index 100%
rename from public/product/stock/list.php
rename to htdocs/product/stock/list.php
diff --git a/public/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
similarity index 100%
rename from public/product/stock/massstockmove.php
rename to htdocs/product/stock/massstockmove.php
diff --git a/public/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
similarity index 100%
rename from public/product/stock/mouvement.php
rename to htdocs/product/stock/mouvement.php
diff --git a/public/product/stock/product.php b/htdocs/product/stock/product.php
similarity index 100%
rename from public/product/stock/product.php
rename to htdocs/product/stock/product.php
diff --git a/public/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
similarity index 100%
rename from public/product/stock/productlot_card.php
rename to htdocs/product/stock/productlot_card.php
diff --git a/public/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
similarity index 100%
rename from public/product/stock/productlot_list.php
rename to htdocs/product/stock/productlot_list.php
diff --git a/public/product/stock/replenish.php b/htdocs/product/stock/replenish.php
similarity index 100%
rename from public/product/stock/replenish.php
rename to htdocs/product/stock/replenish.php
diff --git a/public/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
similarity index 100%
rename from public/product/stock/replenishorders.php
rename to htdocs/product/stock/replenishorders.php
diff --git a/public/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
similarity index 100%
rename from public/product/stock/tpl/stockcorrection.tpl.php
rename to htdocs/product/stock/tpl/stockcorrection.tpl.php
diff --git a/public/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
similarity index 100%
rename from public/product/stock/tpl/stocktransfer.tpl.php
rename to htdocs/product/stock/tpl/stocktransfer.tpl.php
diff --git a/public/product/stock/valo.php b/htdocs/product/stock/valo.php
similarity index 100%
rename from public/product/stock/valo.php
rename to htdocs/product/stock/valo.php
diff --git a/public/product/traduction.php b/htdocs/product/traduction.php
similarity index 100%
rename from public/product/traduction.php
rename to htdocs/product/traduction.php
diff --git a/public/projet/activity/index.php b/htdocs/projet/activity/index.php
similarity index 100%
rename from public/projet/activity/index.php
rename to htdocs/projet/activity/index.php
diff --git a/public/projet/activity/perday.php b/htdocs/projet/activity/perday.php
similarity index 100%
rename from public/projet/activity/perday.php
rename to htdocs/projet/activity/perday.php
diff --git a/public/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
similarity index 100%
rename from public/projet/activity/perweek.php
rename to htdocs/projet/activity/perweek.php
diff --git a/public/projet/admin/index.html b/htdocs/projet/admin/index.html
similarity index 100%
rename from public/projet/admin/index.html
rename to htdocs/projet/admin/index.html
diff --git a/public/projet/admin/project.php b/htdocs/projet/admin/project.php
similarity index 100%
rename from public/projet/admin/project.php
rename to htdocs/projet/admin/project.php
diff --git a/public/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php
similarity index 100%
rename from public/projet/admin/project_extrafields.php
rename to htdocs/projet/admin/project_extrafields.php
diff --git a/public/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php
similarity index 100%
rename from public/projet/admin/project_task_extrafields.php
rename to htdocs/projet/admin/project_task_extrafields.php
diff --git a/public/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
similarity index 100%
rename from public/projet/ajax/projects.php
rename to htdocs/projet/ajax/projects.php
diff --git a/public/projet/card.php b/htdocs/projet/card.php
similarity index 100%
rename from public/projet/card.php
rename to htdocs/projet/card.php
diff --git a/public/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
similarity index 100%
rename from public/projet/class/api_projects.class.php
rename to htdocs/projet/class/api_projects.class.php
diff --git a/public/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
similarity index 100%
rename from public/projet/class/api_tasks.class.php
rename to htdocs/projet/class/api_tasks.class.php
diff --git a/public/projet/class/index.html b/htdocs/projet/class/index.html
similarity index 100%
rename from public/projet/class/index.html
rename to htdocs/projet/class/index.html
diff --git a/public/projet/class/project.class.php b/htdocs/projet/class/project.class.php
similarity index 100%
rename from public/projet/class/project.class.php
rename to htdocs/projet/class/project.class.php
diff --git a/public/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
similarity index 100%
rename from public/projet/class/projectstats.class.php
rename to htdocs/projet/class/projectstats.class.php
diff --git a/public/projet/class/task.class.php b/htdocs/projet/class/task.class.php
similarity index 100%
rename from public/projet/class/task.class.php
rename to htdocs/projet/class/task.class.php
diff --git a/public/projet/contact.php b/htdocs/projet/contact.php
similarity index 100%
rename from public/projet/contact.php
rename to htdocs/projet/contact.php
diff --git a/public/projet/document.php b/htdocs/projet/document.php
similarity index 100%
rename from public/projet/document.php
rename to htdocs/projet/document.php
diff --git a/public/projet/element.php b/htdocs/projet/element.php
similarity index 100%
rename from public/projet/element.php
rename to htdocs/projet/element.php
diff --git a/public/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php
similarity index 100%
rename from public/projet/ganttchart.inc.php
rename to htdocs/projet/ganttchart.inc.php
diff --git a/public/projet/ganttview.php b/htdocs/projet/ganttview.php
similarity index 100%
rename from public/projet/ganttview.php
rename to htdocs/projet/ganttview.php
diff --git a/public/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
similarity index 100%
rename from public/projet/graph_opportunities.inc.php
rename to htdocs/projet/graph_opportunities.inc.php
diff --git a/public/projet/index.php b/htdocs/projet/index.php
similarity index 100%
rename from public/projet/index.php
rename to htdocs/projet/index.php
diff --git a/public/projet/info.php b/htdocs/projet/info.php
similarity index 100%
rename from public/projet/info.php
rename to htdocs/projet/info.php
diff --git a/public/projet/jsgantt_language.js.php b/htdocs/projet/jsgantt_language.js.php
similarity index 100%
rename from public/projet/jsgantt_language.js.php
rename to htdocs/projet/jsgantt_language.js.php
diff --git a/public/projet/list.php b/htdocs/projet/list.php
similarity index 100%
rename from public/projet/list.php
rename to htdocs/projet/list.php
diff --git a/public/projet/note.php b/htdocs/projet/note.php
similarity index 100%
rename from public/projet/note.php
rename to htdocs/projet/note.php
diff --git a/public/projet/stats/index.php b/htdocs/projet/stats/index.php
similarity index 100%
rename from public/projet/stats/index.php
rename to htdocs/projet/stats/index.php
diff --git a/public/projet/tasks.php b/htdocs/projet/tasks.php
similarity index 100%
rename from public/projet/tasks.php
rename to htdocs/projet/tasks.php
diff --git a/public/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
similarity index 100%
rename from public/projet/tasks/contact.php
rename to htdocs/projet/tasks/contact.php
diff --git a/public/projet/tasks/document.php b/htdocs/projet/tasks/document.php
similarity index 100%
rename from public/projet/tasks/document.php
rename to htdocs/projet/tasks/document.php
diff --git a/public/projet/tasks/list.php b/htdocs/projet/tasks/list.php
similarity index 100%
rename from public/projet/tasks/list.php
rename to htdocs/projet/tasks/list.php
diff --git a/public/projet/tasks/note.php b/htdocs/projet/tasks/note.php
similarity index 100%
rename from public/projet/tasks/note.php
rename to htdocs/projet/tasks/note.php
diff --git a/public/projet/tasks/task.php b/htdocs/projet/tasks/task.php
similarity index 100%
rename from public/projet/tasks/task.php
rename to htdocs/projet/tasks/task.php
diff --git a/public/projet/tasks/time.php b/htdocs/projet/tasks/time.php
similarity index 100%
rename from public/projet/tasks/time.php
rename to htdocs/projet/tasks/time.php
diff --git a/public/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
similarity index 100%
rename from public/public/agenda/agendaexport.php
rename to htdocs/public/agenda/agendaexport.php
diff --git a/public/public/agenda/index.php b/htdocs/public/agenda/index.php
similarity index 100%
rename from public/public/agenda/index.php
rename to htdocs/public/agenda/index.php
diff --git a/public/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php
similarity index 100%
rename from public/public/cron/cron_run_jobs.php
rename to htdocs/public/cron/cron_run_jobs.php
diff --git a/public/public/cron/index.html b/htdocs/public/cron/index.html
similarity index 100%
rename from public/public/cron/index.html
rename to htdocs/public/cron/index.html
diff --git a/public/public/demo/dolibarr_screenshot2.png b/htdocs/public/demo/dolibarr_screenshot2.png
similarity index 100%
rename from public/public/demo/dolibarr_screenshot2.png
rename to htdocs/public/demo/dolibarr_screenshot2.png
diff --git a/public/public/demo/dolibarr_screenshot6.png b/htdocs/public/demo/dolibarr_screenshot6.png
similarity index 100%
rename from public/public/demo/dolibarr_screenshot6.png
rename to htdocs/public/demo/dolibarr_screenshot6.png
diff --git a/public/public/demo/dolibarr_screenshot8.png b/htdocs/public/demo/dolibarr_screenshot8.png
similarity index 100%
rename from public/public/demo/dolibarr_screenshot8.png
rename to htdocs/public/demo/dolibarr_screenshot8.png
diff --git a/public/public/demo/dolibarr_screenshot9.png b/htdocs/public/demo/dolibarr_screenshot9.png
similarity index 100%
rename from public/public/demo/dolibarr_screenshot9.png
rename to htdocs/public/demo/dolibarr_screenshot9.png
diff --git a/public/public/demo/index.php b/htdocs/public/demo/index.php
similarity index 100%
rename from public/public/demo/index.php
rename to htdocs/public/demo/index.php
diff --git a/public/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
similarity index 100%
rename from public/public/donations/donateurs_code.php
rename to htdocs/public/donations/donateurs_code.php
diff --git a/public/public/donations/index.php b/htdocs/public/donations/index.php
similarity index 100%
rename from public/public/donations/index.php
rename to htdocs/public/donations/index.php
diff --git a/public/public/emailing/index.html b/htdocs/public/emailing/index.html
similarity index 100%
rename from public/public/emailing/index.html
rename to htdocs/public/emailing/index.html
diff --git a/public/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php
similarity index 100%
rename from public/public/emailing/mailing-read.php
rename to htdocs/public/emailing/mailing-read.php
diff --git a/public/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
similarity index 100%
rename from public/public/emailing/mailing-unsubscribe.php
rename to htdocs/public/emailing/mailing-unsubscribe.php
diff --git a/public/public/error-401.php b/htdocs/public/error-401.php
similarity index 100%
rename from public/public/error-401.php
rename to htdocs/public/error-401.php
diff --git a/public/public/error-404.php b/htdocs/public/error-404.php
similarity index 100%
rename from public/public/error-404.php
rename to htdocs/public/error-404.php
diff --git a/public/public/index.php b/htdocs/public/index.php
similarity index 100%
rename from public/public/index.php
rename to htdocs/public/index.php
diff --git a/public/public/members/index.php b/htdocs/public/members/index.php
similarity index 100%
rename from public/public/members/index.php
rename to htdocs/public/members/index.php
diff --git a/public/public/members/new.php b/htdocs/public/members/new.php
similarity index 100%
rename from public/public/members/new.php
rename to htdocs/public/members/new.php
diff --git a/public/public/members/public_card.php b/htdocs/public/members/public_card.php
similarity index 100%
rename from public/public/members/public_card.php
rename to htdocs/public/members/public_card.php
diff --git a/public/public/members/public_list.php b/htdocs/public/members/public_list.php
similarity index 100%
rename from public/public/members/public_list.php
rename to htdocs/public/members/public_list.php
diff --git a/public/public/notice.php b/htdocs/public/notice.php
similarity index 100%
rename from public/public/notice.php
rename to htdocs/public/notice.php
diff --git a/public/public/opensurvey/index.html b/htdocs/public/opensurvey/index.html
similarity index 100%
rename from public/public/opensurvey/index.html
rename to htdocs/public/opensurvey/index.html
diff --git a/public/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
similarity index 100%
rename from public/public/opensurvey/studs.php
rename to htdocs/public/opensurvey/studs.php
diff --git a/public/public/paybox/index.php b/htdocs/public/paybox/index.php
similarity index 100%
rename from public/public/paybox/index.php
rename to htdocs/public/paybox/index.php
diff --git a/public/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
similarity index 100%
rename from public/public/paybox/newpayment.php
rename to htdocs/public/paybox/newpayment.php
diff --git a/public/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
similarity index 100%
rename from public/public/paybox/paymentko.php
rename to htdocs/public/paybox/paymentko.php
diff --git a/public/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
similarity index 100%
rename from public/public/paybox/paymentok.php
rename to htdocs/public/paybox/paymentok.php
diff --git a/public/public/paypal/index.php b/htdocs/public/paypal/index.php
similarity index 100%
rename from public/public/paypal/index.php
rename to htdocs/public/paypal/index.php
diff --git a/public/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
similarity index 100%
rename from public/public/paypal/newpayment.php
rename to htdocs/public/paypal/newpayment.php
diff --git a/public/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
similarity index 100%
rename from public/public/paypal/paymentko.php
rename to htdocs/public/paypal/paymentko.php
diff --git a/public/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
similarity index 100%
rename from public/public/paypal/paymentok.php
rename to htdocs/public/paypal/paymentok.php
diff --git a/public/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
similarity index 100%
rename from public/public/test/test_arrays.php
rename to htdocs/public/test/test_arrays.php
diff --git a/public/public/test/test_forms.php b/htdocs/public/test/test_forms.php
similarity index 100%
rename from public/public/test/test_forms.php
rename to htdocs/public/test/test_forms.php
diff --git a/public/public/theme/common/index.php b/htdocs/public/theme/common/index.php
similarity index 100%
rename from public/public/theme/common/index.php
rename to htdocs/public/theme/common/index.php
diff --git a/public/public/theme/common/nophoto.png b/htdocs/public/theme/common/nophoto.png
similarity index 100%
rename from public/public/theme/common/nophoto.png
rename to htdocs/public/theme/common/nophoto.png
diff --git a/public/public/theme/common/user_anonymous.png b/htdocs/public/theme/common/user_anonymous.png
similarity index 100%
rename from public/public/theme/common/user_anonymous.png
rename to htdocs/public/theme/common/user_anonymous.png
diff --git a/public/public/theme/common/user_man.png b/htdocs/public/theme/common/user_man.png
similarity index 100%
rename from public/public/theme/common/user_man.png
rename to htdocs/public/theme/common/user_man.png
diff --git a/public/public/theme/common/user_woman.png b/htdocs/public/theme/common/user_woman.png
similarity index 100%
rename from public/public/theme/common/user_woman.png
rename to htdocs/public/theme/common/user_woman.png
diff --git a/public/public/theme/index.php b/htdocs/public/theme/index.php
similarity index 100%
rename from public/public/theme/index.php
rename to htdocs/public/theme/index.php
diff --git a/public/public/websites/index.php b/htdocs/public/websites/index.php
similarity index 100%
rename from public/public/websites/index.php
rename to htdocs/public/websites/index.php
diff --git a/public/public/websites/styles.css.php b/htdocs/public/websites/styles.css.php
similarity index 100%
rename from public/public/websites/styles.css.php
rename to htdocs/public/websites/styles.css.php
diff --git a/public/resource/add.php b/htdocs/resource/add.php
similarity index 100%
rename from public/resource/add.php
rename to htdocs/resource/add.php
diff --git a/public/resource/card.php b/htdocs/resource/card.php
similarity index 100%
rename from public/resource/card.php
rename to htdocs/resource/card.php
diff --git a/public/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
similarity index 100%
rename from public/resource/class/dolresource.class.php
rename to htdocs/resource/class/dolresource.class.php
diff --git a/public/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
similarity index 100%
rename from public/resource/class/html.formresource.class.php
rename to htdocs/resource/class/html.formresource.class.php
diff --git a/public/resource/class/index.html b/htdocs/resource/class/index.html
similarity index 100%
rename from public/resource/class/index.html
rename to htdocs/resource/class/index.html
diff --git a/public/resource/contact.php b/htdocs/resource/contact.php
similarity index 100%
rename from public/resource/contact.php
rename to htdocs/resource/contact.php
diff --git a/public/resource/document.php b/htdocs/resource/document.php
similarity index 100%
rename from public/resource/document.php
rename to htdocs/resource/document.php
diff --git a/public/resource/element_resource.php b/htdocs/resource/element_resource.php
similarity index 100%
rename from public/resource/element_resource.php
rename to htdocs/resource/element_resource.php
diff --git a/public/resource/index.html b/htdocs/resource/index.html
similarity index 100%
rename from public/resource/index.html
rename to htdocs/resource/index.html
diff --git a/public/resource/list.php b/htdocs/resource/list.php
similarity index 100%
rename from public/resource/list.php
rename to htdocs/resource/list.php
diff --git a/public/resource/note.php b/htdocs/resource/note.php
similarity index 100%
rename from public/resource/note.php
rename to htdocs/resource/note.php
diff --git a/public/robots.txt b/htdocs/robots.txt
similarity index 100%
rename from public/robots.txt
rename to htdocs/robots.txt
diff --git a/public/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
similarity index 100%
rename from public/societe/admin/contact_extrafields.php
rename to htdocs/societe/admin/contact_extrafields.php
diff --git a/public/societe/admin/societe.php b/htdocs/societe/admin/societe.php
similarity index 100%
rename from public/societe/admin/societe.php
rename to htdocs/societe/admin/societe.php
diff --git a/public/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
similarity index 100%
rename from public/societe/admin/societe_extrafields.php
rename to htdocs/societe/admin/societe_extrafields.php
diff --git a/public/societe/agenda.php b/htdocs/societe/agenda.php
similarity index 100%
rename from public/societe/agenda.php
rename to htdocs/societe/agenda.php
diff --git a/public/societe/ajax/company.php b/htdocs/societe/ajax/company.php
similarity index 100%
rename from public/societe/ajax/company.php
rename to htdocs/societe/ajax/company.php
diff --git a/public/societe/ajax/index.html b/htdocs/societe/ajax/index.html
similarity index 100%
rename from public/societe/ajax/index.html
rename to htdocs/societe/ajax/index.html
diff --git a/public/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
similarity index 100%
rename from public/societe/ajaxcompanies.php
rename to htdocs/societe/ajaxcompanies.php
diff --git a/public/societe/ajaxcountries.php b/htdocs/societe/ajaxcountries.php
similarity index 100%
rename from public/societe/ajaxcountries.php
rename to htdocs/societe/ajaxcountries.php
diff --git a/public/societe/canvas/README b/htdocs/societe/canvas/README
similarity index 100%
rename from public/societe/canvas/README
rename to htdocs/societe/canvas/README
diff --git a/public/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
similarity index 100%
rename from public/societe/canvas/actions_card_common.class.php
rename to htdocs/societe/canvas/actions_card_common.class.php
diff --git a/public/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
similarity index 100%
rename from public/societe/canvas/company/actions_card_company.class.php
rename to htdocs/societe/canvas/company/actions_card_company.class.php
diff --git a/public/societe/canvas/company/index.html b/htdocs/societe/canvas/company/index.html
similarity index 100%
rename from public/societe/canvas/company/index.html
rename to htdocs/societe/canvas/company/index.html
diff --git a/public/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
similarity index 100%
rename from public/societe/canvas/company/tpl/card_create.tpl.php
rename to htdocs/societe/canvas/company/tpl/card_create.tpl.php
diff --git a/public/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
similarity index 100%
rename from public/societe/canvas/company/tpl/card_edit.tpl.php
rename to htdocs/societe/canvas/company/tpl/card_edit.tpl.php
diff --git a/public/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
similarity index 100%
rename from public/societe/canvas/company/tpl/card_view.tpl.php
rename to htdocs/societe/canvas/company/tpl/card_view.tpl.php
diff --git a/public/societe/canvas/company/tpl/index.html b/htdocs/societe/canvas/company/tpl/index.html
similarity index 100%
rename from public/societe/canvas/company/tpl/index.html
rename to htdocs/societe/canvas/company/tpl/index.html
diff --git a/public/societe/canvas/index.html b/htdocs/societe/canvas/index.html
similarity index 100%
rename from public/societe/canvas/index.html
rename to htdocs/societe/canvas/index.html
diff --git a/public/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
similarity index 100%
rename from public/societe/canvas/individual/actions_card_individual.class.php
rename to htdocs/societe/canvas/individual/actions_card_individual.class.php
diff --git a/public/societe/canvas/individual/index.html b/htdocs/societe/canvas/individual/index.html
similarity index 100%
rename from public/societe/canvas/individual/index.html
rename to htdocs/societe/canvas/individual/index.html
diff --git a/public/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
similarity index 100%
rename from public/societe/canvas/individual/tpl/card_create.tpl.php
rename to htdocs/societe/canvas/individual/tpl/card_create.tpl.php
diff --git a/public/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
similarity index 100%
rename from public/societe/canvas/individual/tpl/card_edit.tpl.php
rename to htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
diff --git a/public/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
similarity index 100%
rename from public/societe/canvas/individual/tpl/card_view.tpl.php
rename to htdocs/societe/canvas/individual/tpl/card_view.tpl.php
diff --git a/public/societe/canvas/individual/tpl/index.html b/htdocs/societe/canvas/individual/tpl/index.html
similarity index 100%
rename from public/societe/canvas/individual/tpl/index.html
rename to htdocs/societe/canvas/individual/tpl/index.html
diff --git a/public/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
similarity index 100%
rename from public/societe/checkvat/checkVatPopup.php
rename to htdocs/societe/checkvat/checkVatPopup.php
diff --git a/public/societe/checkvat/checkVatService.xml b/htdocs/societe/checkvat/checkVatService.xml
similarity index 100%
rename from public/societe/checkvat/checkVatService.xml
rename to htdocs/societe/checkvat/checkVatService.xml
diff --git a/public/societe/checkvat/index.html b/htdocs/societe/checkvat/index.html
similarity index 100%
rename from public/societe/checkvat/index.html
rename to htdocs/societe/checkvat/index.html
diff --git a/public/societe/class/address.class.php b/htdocs/societe/class/address.class.php
similarity index 100%
rename from public/societe/class/address.class.php
rename to htdocs/societe/class/address.class.php
diff --git a/public/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
similarity index 100%
rename from public/societe/class/api_contacts.class.php
rename to htdocs/societe/class/api_contacts.class.php
diff --git a/public/societe/class/api_deprecated_contact.class.php b/htdocs/societe/class/api_deprecated_contact.class.php
similarity index 100%
rename from public/societe/class/api_deprecated_contact.class.php
rename to htdocs/societe/class/api_deprecated_contact.class.php
diff --git a/public/societe/class/api_deprecated_thirdparty.class.php b/htdocs/societe/class/api_deprecated_thirdparty.class.php
similarity index 100%
rename from public/societe/class/api_deprecated_thirdparty.class.php
rename to htdocs/societe/class/api_deprecated_thirdparty.class.php
diff --git a/public/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
similarity index 100%
rename from public/societe/class/api_thirdparties.class.php
rename to htdocs/societe/class/api_thirdparties.class.php
diff --git a/public/societe/class/client.class.php b/htdocs/societe/class/client.class.php
similarity index 100%
rename from public/societe/class/client.class.php
rename to htdocs/societe/class/client.class.php
diff --git a/public/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
similarity index 100%
rename from public/societe/class/companybankaccount.class.php
rename to htdocs/societe/class/companybankaccount.class.php
diff --git a/public/societe/class/index.html b/htdocs/societe/class/index.html
similarity index 100%
rename from public/societe/class/index.html
rename to htdocs/societe/class/index.html
diff --git a/public/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
similarity index 100%
rename from public/societe/class/societe.class.php
rename to htdocs/societe/class/societe.class.php
diff --git a/public/societe/commerciaux.php b/htdocs/societe/commerciaux.php
similarity index 100%
rename from public/societe/commerciaux.php
rename to htdocs/societe/commerciaux.php
diff --git a/public/societe/consumption.php b/htdocs/societe/consumption.php
similarity index 100%
rename from public/societe/consumption.php
rename to htdocs/societe/consumption.php
diff --git a/public/societe/document.php b/htdocs/societe/document.php
similarity index 100%
rename from public/societe/document.php
rename to htdocs/societe/document.php
diff --git a/public/societe/index.php b/htdocs/societe/index.php
similarity index 100%
rename from public/societe/index.php
rename to htdocs/societe/index.php
diff --git a/public/societe/list.php b/htdocs/societe/list.php
similarity index 100%
rename from public/societe/list.php
rename to htdocs/societe/list.php
diff --git a/public/societe/note.php b/htdocs/societe/note.php
similarity index 100%
rename from public/societe/note.php
rename to htdocs/societe/note.php
diff --git a/public/societe/notify/card.php b/htdocs/societe/notify/card.php
similarity index 100%
rename from public/societe/notify/card.php
rename to htdocs/societe/notify/card.php
diff --git a/public/societe/notify/index.php b/htdocs/societe/notify/index.php
similarity index 100%
rename from public/societe/notify/index.php
rename to htdocs/societe/notify/index.php
diff --git a/public/societe/price.php b/htdocs/societe/price.php
similarity index 100%
rename from public/societe/price.php
rename to htdocs/societe/price.php
diff --git a/public/societe/project.php b/htdocs/societe/project.php
similarity index 100%
rename from public/societe/project.php
rename to htdocs/societe/project.php
diff --git a/public/societe/rib.php b/htdocs/societe/rib.php
similarity index 100%
rename from public/societe/rib.php
rename to htdocs/societe/rib.php
diff --git a/public/societe/soc.php b/htdocs/societe/soc.php
similarity index 100%
rename from public/societe/soc.php
rename to htdocs/societe/soc.php
diff --git a/public/societe/societecontact.php b/htdocs/societe/societecontact.php
similarity index 100%
rename from public/societe/societecontact.php
rename to htdocs/societe/societecontact.php
diff --git a/public/societe/tpl/index.html b/htdocs/societe/tpl/index.html
similarity index 100%
rename from public/societe/tpl/index.html
rename to htdocs/societe/tpl/index.html
diff --git a/public/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
similarity index 100%
rename from public/societe/tpl/linesalesrepresentative.tpl.php
rename to htdocs/societe/tpl/linesalesrepresentative.tpl.php
diff --git a/public/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
similarity index 100%
rename from public/supplier_proposal/admin/supplier_proposal_extrafields.php
rename to htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
diff --git a/public/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
similarity index 100%
rename from public/supplier_proposal/admin/supplier_proposaldet_extrafields.php
rename to htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
diff --git a/public/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
similarity index 100%
rename from public/supplier_proposal/card.php
rename to htdocs/supplier_proposal/card.php
diff --git a/public/supplier_proposal/class/index.html b/htdocs/supplier_proposal/class/index.html
similarity index 100%
rename from public/supplier_proposal/class/index.html
rename to htdocs/supplier_proposal/class/index.html
diff --git a/public/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
similarity index 100%
rename from public/supplier_proposal/class/supplier_proposal.class.php
rename to htdocs/supplier_proposal/class/supplier_proposal.class.php
diff --git a/public/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
similarity index 100%
rename from public/supplier_proposal/document.php
rename to htdocs/supplier_proposal/document.php
diff --git a/public/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
similarity index 100%
rename from public/supplier_proposal/index.php
rename to htdocs/supplier_proposal/index.php
diff --git a/public/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
similarity index 100%
rename from public/supplier_proposal/info.php
rename to htdocs/supplier_proposal/info.php
diff --git a/public/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
similarity index 100%
rename from public/supplier_proposal/list.php
rename to htdocs/supplier_proposal/list.php
diff --git a/public/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
similarity index 100%
rename from public/supplier_proposal/note.php
rename to htdocs/supplier_proposal/note.php
diff --git a/public/supplier_proposal/tpl/index.html b/htdocs/supplier_proposal/tpl/index.html
similarity index 100%
rename from public/supplier_proposal/tpl/index.html
rename to htdocs/supplier_proposal/tpl/index.html
diff --git a/public/supplier_proposal/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
similarity index 100%
rename from public/supplier_proposal/tpl/linkedobjectblock.tpl.php
rename to htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
diff --git a/public/support/background.png b/htdocs/support/background.png
similarity index 100%
rename from public/support/background.png
rename to htdocs/support/background.png
diff --git a/public/support/default.css b/htdocs/support/default.css
similarity index 100%
rename from public/support/default.css
rename to htdocs/support/default.css
diff --git a/public/support/helpcenter.png b/htdocs/support/helpcenter.png
similarity index 100%
rename from public/support/helpcenter.png
rename to htdocs/support/helpcenter.png
diff --git a/public/support/inc.php b/htdocs/support/inc.php
similarity index 100%
rename from public/support/inc.php
rename to htdocs/support/inc.php
diff --git a/public/support/index.php b/htdocs/support/index.php
similarity index 100%
rename from public/support/index.php
rename to htdocs/support/index.php
diff --git a/public/support/internet.png b/htdocs/support/internet.png
similarity index 100%
rename from public/support/internet.png
rename to htdocs/support/internet.png
diff --git a/public/support/mail.png b/htdocs/support/mail.png
similarity index 100%
rename from public/support/mail.png
rename to htdocs/support/mail.png
diff --git a/public/support/online.php b/htdocs/support/online.php
similarity index 100%
rename from public/support/online.php
rename to htdocs/support/online.php
diff --git a/public/support/pagemaster.png b/htdocs/support/pagemaster.png
similarity index 100%
rename from public/support/pagemaster.png
rename to htdocs/support/pagemaster.png
diff --git a/public/support/redstar.png b/htdocs/support/redstar.png
similarity index 100%
rename from public/support/redstar.png
rename to htdocs/support/redstar.png
diff --git a/public/support/star.png b/htdocs/support/star.png
similarity index 100%
rename from public/support/star.png
rename to htdocs/support/star.png
diff --git a/public/support/who.png b/htdocs/support/who.png
similarity index 100%
rename from public/support/who.png
rename to htdocs/support/who.png
diff --git a/public/theme/.gitignore b/htdocs/theme/.gitignore
similarity index 100%
rename from public/theme/.gitignore
rename to htdocs/theme/.gitignore
diff --git a/public/theme/common/colorpicker.png b/htdocs/theme/common/colorpicker.png
similarity index 100%
rename from public/theme/common/colorpicker.png
rename to htdocs/theme/common/colorpicker.png
diff --git a/public/theme/common/devices/audio-card.png b/htdocs/theme/common/devices/audio-card.png
similarity index 100%
rename from public/theme/common/devices/audio-card.png
rename to htdocs/theme/common/devices/audio-card.png
diff --git a/public/theme/common/devices/audio-headset.png b/htdocs/theme/common/devices/audio-headset.png
similarity index 100%
rename from public/theme/common/devices/audio-headset.png
rename to htdocs/theme/common/devices/audio-headset.png
diff --git a/public/theme/common/devices/audio-input-line.png b/htdocs/theme/common/devices/audio-input-line.png
similarity index 100%
rename from public/theme/common/devices/audio-input-line.png
rename to htdocs/theme/common/devices/audio-input-line.png
diff --git a/public/theme/common/devices/audio-input-microphone.png b/htdocs/theme/common/devices/audio-input-microphone.png
similarity index 100%
rename from public/theme/common/devices/audio-input-microphone.png
rename to htdocs/theme/common/devices/audio-input-microphone.png
diff --git a/public/theme/common/devices/battery.png b/htdocs/theme/common/devices/battery.png
similarity index 100%
rename from public/theme/common/devices/battery.png
rename to htdocs/theme/common/devices/battery.png
diff --git a/public/theme/common/devices/camera-photo.png b/htdocs/theme/common/devices/camera-photo.png
similarity index 100%
rename from public/theme/common/devices/camera-photo.png
rename to htdocs/theme/common/devices/camera-photo.png
diff --git a/public/theme/common/devices/camera-web.png b/htdocs/theme/common/devices/camera-web.png
similarity index 100%
rename from public/theme/common/devices/camera-web.png
rename to htdocs/theme/common/devices/camera-web.png
diff --git a/public/theme/common/devices/computer-laptop.png b/htdocs/theme/common/devices/computer-laptop.png
similarity index 100%
rename from public/theme/common/devices/computer-laptop.png
rename to htdocs/theme/common/devices/computer-laptop.png
diff --git a/public/theme/common/devices/computer.png b/htdocs/theme/common/devices/computer.png
similarity index 100%
rename from public/theme/common/devices/computer.png
rename to htdocs/theme/common/devices/computer.png
diff --git a/public/theme/common/devices/cpu.png b/htdocs/theme/common/devices/cpu.png
similarity index 100%
rename from public/theme/common/devices/cpu.png
rename to htdocs/theme/common/devices/cpu.png
diff --git a/public/theme/common/devices/drive-harddisk.png b/htdocs/theme/common/devices/drive-harddisk.png
similarity index 100%
rename from public/theme/common/devices/drive-harddisk.png
rename to htdocs/theme/common/devices/drive-harddisk.png
diff --git a/public/theme/common/devices/drive-optical.png b/htdocs/theme/common/devices/drive-optical.png
similarity index 100%
rename from public/theme/common/devices/drive-optical.png
rename to htdocs/theme/common/devices/drive-optical.png
diff --git a/public/theme/common/devices/drive-removable-media-usb-pendrive.png b/htdocs/theme/common/devices/drive-removable-media-usb-pendrive.png
similarity index 100%
rename from public/theme/common/devices/drive-removable-media-usb-pendrive.png
rename to htdocs/theme/common/devices/drive-removable-media-usb-pendrive.png
diff --git a/public/theme/common/devices/drive-removable-media-usb.png b/htdocs/theme/common/devices/drive-removable-media-usb.png
similarity index 100%
rename from public/theme/common/devices/drive-removable-media-usb.png
rename to htdocs/theme/common/devices/drive-removable-media-usb.png
diff --git a/public/theme/common/devices/drive-removable-media.png b/htdocs/theme/common/devices/drive-removable-media.png
similarity index 100%
rename from public/theme/common/devices/drive-removable-media.png
rename to htdocs/theme/common/devices/drive-removable-media.png
diff --git a/public/theme/common/devices/index.html b/htdocs/theme/common/devices/index.html
similarity index 100%
rename from public/theme/common/devices/index.html
rename to htdocs/theme/common/devices/index.html
diff --git a/public/theme/common/devices/input-gaming.png b/htdocs/theme/common/devices/input-gaming.png
similarity index 100%
rename from public/theme/common/devices/input-gaming.png
rename to htdocs/theme/common/devices/input-gaming.png
diff --git a/public/theme/common/devices/input-keyboard.png b/htdocs/theme/common/devices/input-keyboard.png
similarity index 100%
rename from public/theme/common/devices/input-keyboard.png
rename to htdocs/theme/common/devices/input-keyboard.png
diff --git a/public/theme/common/devices/input-mouse.png b/htdocs/theme/common/devices/input-mouse.png
similarity index 100%
rename from public/theme/common/devices/input-mouse.png
rename to htdocs/theme/common/devices/input-mouse.png
diff --git a/public/theme/common/devices/input-tablet.png b/htdocs/theme/common/devices/input-tablet.png
similarity index 100%
rename from public/theme/common/devices/input-tablet.png
rename to htdocs/theme/common/devices/input-tablet.png
diff --git a/public/theme/common/devices/media-flash-memory-stick.png b/htdocs/theme/common/devices/media-flash-memory-stick.png
similarity index 100%
rename from public/theme/common/devices/media-flash-memory-stick.png
rename to htdocs/theme/common/devices/media-flash-memory-stick.png
diff --git a/public/theme/common/devices/media-flash-sd-mmc.png b/htdocs/theme/common/devices/media-flash-sd-mmc.png
similarity index 100%
rename from public/theme/common/devices/media-flash-sd-mmc.png
rename to htdocs/theme/common/devices/media-flash-sd-mmc.png
diff --git a/public/theme/common/devices/media-flash-smart-media.png b/htdocs/theme/common/devices/media-flash-smart-media.png
similarity index 100%
rename from public/theme/common/devices/media-flash-smart-media.png
rename to htdocs/theme/common/devices/media-flash-smart-media.png
diff --git a/public/theme/common/devices/media-flash.png b/htdocs/theme/common/devices/media-flash.png
similarity index 100%
rename from public/theme/common/devices/media-flash.png
rename to htdocs/theme/common/devices/media-flash.png
diff --git a/public/theme/common/devices/media-floppy.png b/htdocs/theme/common/devices/media-floppy.png
similarity index 100%
rename from public/theme/common/devices/media-floppy.png
rename to htdocs/theme/common/devices/media-floppy.png
diff --git a/public/theme/common/devices/media-optical-audio.png b/htdocs/theme/common/devices/media-optical-audio.png
similarity index 100%
rename from public/theme/common/devices/media-optical-audio.png
rename to htdocs/theme/common/devices/media-optical-audio.png
diff --git a/public/theme/common/devices/media-optical-blu-ray.png b/htdocs/theme/common/devices/media-optical-blu-ray.png
similarity index 100%
rename from public/theme/common/devices/media-optical-blu-ray.png
rename to htdocs/theme/common/devices/media-optical-blu-ray.png
diff --git a/public/theme/common/devices/media-optical-data.png b/htdocs/theme/common/devices/media-optical-data.png
similarity index 100%
rename from public/theme/common/devices/media-optical-data.png
rename to htdocs/theme/common/devices/media-optical-data.png
diff --git a/public/theme/common/devices/media-optical-dvd-video.png b/htdocs/theme/common/devices/media-optical-dvd-video.png
similarity index 100%
rename from public/theme/common/devices/media-optical-dvd-video.png
rename to htdocs/theme/common/devices/media-optical-dvd-video.png
diff --git a/public/theme/common/devices/media-optical-dvd.png b/htdocs/theme/common/devices/media-optical-dvd.png
similarity index 100%
rename from public/theme/common/devices/media-optical-dvd.png
rename to htdocs/theme/common/devices/media-optical-dvd.png
diff --git a/public/theme/common/devices/media-optical-mixed-cd.png b/htdocs/theme/common/devices/media-optical-mixed-cd.png
similarity index 100%
rename from public/theme/common/devices/media-optical-mixed-cd.png
rename to htdocs/theme/common/devices/media-optical-mixed-cd.png
diff --git a/public/theme/common/devices/media-optical-recordable.png b/htdocs/theme/common/devices/media-optical-recordable.png
similarity index 100%
rename from public/theme/common/devices/media-optical-recordable.png
rename to htdocs/theme/common/devices/media-optical-recordable.png
diff --git a/public/theme/common/devices/media-optical-video.png b/htdocs/theme/common/devices/media-optical-video.png
similarity index 100%
rename from public/theme/common/devices/media-optical-video.png
rename to htdocs/theme/common/devices/media-optical-video.png
diff --git a/public/theme/common/devices/media-optical.png b/htdocs/theme/common/devices/media-optical.png
similarity index 100%
rename from public/theme/common/devices/media-optical.png
rename to htdocs/theme/common/devices/media-optical.png
diff --git a/public/theme/common/devices/media-tape.png b/htdocs/theme/common/devices/media-tape.png
similarity index 100%
rename from public/theme/common/devices/media-tape.png
rename to htdocs/theme/common/devices/media-tape.png
diff --git a/public/theme/common/devices/modem.png b/htdocs/theme/common/devices/modem.png
similarity index 100%
rename from public/theme/common/devices/modem.png
rename to htdocs/theme/common/devices/modem.png
diff --git a/public/theme/common/devices/multimedia-player-apple-ipod.png b/htdocs/theme/common/devices/multimedia-player-apple-ipod.png
similarity index 100%
rename from public/theme/common/devices/multimedia-player-apple-ipod.png
rename to htdocs/theme/common/devices/multimedia-player-apple-ipod.png
diff --git a/public/theme/common/devices/multimedia-player.png b/htdocs/theme/common/devices/multimedia-player.png
similarity index 100%
rename from public/theme/common/devices/multimedia-player.png
rename to htdocs/theme/common/devices/multimedia-player.png
diff --git a/public/theme/common/devices/network-wired.png b/htdocs/theme/common/devices/network-wired.png
similarity index 100%
rename from public/theme/common/devices/network-wired.png
rename to htdocs/theme/common/devices/network-wired.png
diff --git a/public/theme/common/devices/network-wireless-connected-00.png b/htdocs/theme/common/devices/network-wireless-connected-00.png
similarity index 100%
rename from public/theme/common/devices/network-wireless-connected-00.png
rename to htdocs/theme/common/devices/network-wireless-connected-00.png
diff --git a/public/theme/common/devices/network-wireless-connected-100.png b/htdocs/theme/common/devices/network-wireless-connected-100.png
similarity index 100%
rename from public/theme/common/devices/network-wireless-connected-100.png
rename to htdocs/theme/common/devices/network-wireless-connected-100.png
diff --git a/public/theme/common/devices/network-wireless-connected-25.png b/htdocs/theme/common/devices/network-wireless-connected-25.png
similarity index 100%
rename from public/theme/common/devices/network-wireless-connected-25.png
rename to htdocs/theme/common/devices/network-wireless-connected-25.png
diff --git a/public/theme/common/devices/network-wireless-connected-50.png b/htdocs/theme/common/devices/network-wireless-connected-50.png
similarity index 100%
rename from public/theme/common/devices/network-wireless-connected-50.png
rename to htdocs/theme/common/devices/network-wireless-connected-50.png
diff --git a/public/theme/common/devices/network-wireless-connected-75.png b/htdocs/theme/common/devices/network-wireless-connected-75.png
similarity index 100%
rename from public/theme/common/devices/network-wireless-connected-75.png
rename to htdocs/theme/common/devices/network-wireless-connected-75.png
diff --git a/public/theme/common/devices/network-wireless-disconnected.png b/htdocs/theme/common/devices/network-wireless-disconnected.png
similarity index 100%
rename from public/theme/common/devices/network-wireless-disconnected.png
rename to htdocs/theme/common/devices/network-wireless-disconnected.png
diff --git a/public/theme/common/devices/network-wireless.png b/htdocs/theme/common/devices/network-wireless.png
similarity index 100%
rename from public/theme/common/devices/network-wireless.png
rename to htdocs/theme/common/devices/network-wireless.png
diff --git a/public/theme/common/devices/pda.png b/htdocs/theme/common/devices/pda.png
similarity index 100%
rename from public/theme/common/devices/pda.png
rename to htdocs/theme/common/devices/pda.png
diff --git a/public/theme/common/devices/phone-openmoko-freerunner.png b/htdocs/theme/common/devices/phone-openmoko-freerunner.png
similarity index 100%
rename from public/theme/common/devices/phone-openmoko-freerunner.png
rename to htdocs/theme/common/devices/phone-openmoko-freerunner.png
diff --git a/public/theme/common/devices/phone.png b/htdocs/theme/common/devices/phone.png
similarity index 100%
rename from public/theme/common/devices/phone.png
rename to htdocs/theme/common/devices/phone.png
diff --git a/public/theme/common/devices/printer-laser.png b/htdocs/theme/common/devices/printer-laser.png
similarity index 100%
rename from public/theme/common/devices/printer-laser.png
rename to htdocs/theme/common/devices/printer-laser.png
diff --git a/public/theme/common/devices/printer.png b/htdocs/theme/common/devices/printer.png
similarity index 100%
rename from public/theme/common/devices/printer.png
rename to htdocs/theme/common/devices/printer.png
diff --git a/public/theme/common/devices/scanner.png b/htdocs/theme/common/devices/scanner.png
similarity index 100%
rename from public/theme/common/devices/scanner.png
rename to htdocs/theme/common/devices/scanner.png
diff --git a/public/theme/common/devices/video-display.png b/htdocs/theme/common/devices/video-display.png
similarity index 100%
rename from public/theme/common/devices/video-display.png
rename to htdocs/theme/common/devices/video-display.png
diff --git a/public/theme/common/devices/video-projector.png b/htdocs/theme/common/devices/video-projector.png
similarity index 100%
rename from public/theme/common/devices/video-projector.png
rename to htdocs/theme/common/devices/video-projector.png
diff --git a/public/theme/common/devices/video-television.png b/htdocs/theme/common/devices/video-television.png
similarity index 100%
rename from public/theme/common/devices/video-television.png
rename to htdocs/theme/common/devices/video-television.png
diff --git a/public/theme/common/dolibarr_box.png b/htdocs/theme/common/dolibarr_box.png
similarity index 100%
rename from public/theme/common/dolibarr_box.png
rename to htdocs/theme/common/dolibarr_box.png
diff --git a/public/theme/common/dolibarr_logo_bw.png b/htdocs/theme/common/dolibarr_logo_bw.png
similarity index 100%
rename from public/theme/common/dolibarr_logo_bw.png
rename to htdocs/theme/common/dolibarr_logo_bw.png
diff --git a/public/theme/common/dolistore.jpg b/htdocs/theme/common/dolistore.jpg
similarity index 100%
rename from public/theme/common/dolistore.jpg
rename to htdocs/theme/common/dolistore.jpg
diff --git a/public/theme/common/emotes/face-angel.png b/htdocs/theme/common/emotes/face-angel.png
similarity index 100%
rename from public/theme/common/emotes/face-angel.png
rename to htdocs/theme/common/emotes/face-angel.png
diff --git a/public/theme/common/emotes/face-embarrassed.png b/htdocs/theme/common/emotes/face-embarrassed.png
similarity index 100%
rename from public/theme/common/emotes/face-embarrassed.png
rename to htdocs/theme/common/emotes/face-embarrassed.png
diff --git a/public/theme/common/emotes/face-kiss.png b/htdocs/theme/common/emotes/face-kiss.png
similarity index 100%
rename from public/theme/common/emotes/face-kiss.png
rename to htdocs/theme/common/emotes/face-kiss.png
diff --git a/public/theme/common/emotes/face-laugh.png b/htdocs/theme/common/emotes/face-laugh.png
similarity index 100%
rename from public/theme/common/emotes/face-laugh.png
rename to htdocs/theme/common/emotes/face-laugh.png
diff --git a/public/theme/common/emotes/face-plain.png b/htdocs/theme/common/emotes/face-plain.png
similarity index 100%
rename from public/theme/common/emotes/face-plain.png
rename to htdocs/theme/common/emotes/face-plain.png
diff --git a/public/theme/common/emotes/face-raspberry.png b/htdocs/theme/common/emotes/face-raspberry.png
similarity index 100%
rename from public/theme/common/emotes/face-raspberry.png
rename to htdocs/theme/common/emotes/face-raspberry.png
diff --git a/public/theme/common/emotes/face-sad.png b/htdocs/theme/common/emotes/face-sad.png
similarity index 100%
rename from public/theme/common/emotes/face-sad.png
rename to htdocs/theme/common/emotes/face-sad.png
diff --git a/public/theme/common/emotes/face-smile-big.png b/htdocs/theme/common/emotes/face-smile-big.png
similarity index 100%
rename from public/theme/common/emotes/face-smile-big.png
rename to htdocs/theme/common/emotes/face-smile-big.png
diff --git a/public/theme/common/emotes/face-smile.png b/htdocs/theme/common/emotes/face-smile.png
similarity index 100%
rename from public/theme/common/emotes/face-smile.png
rename to htdocs/theme/common/emotes/face-smile.png
diff --git a/public/theme/common/emotes/face-surprise.png b/htdocs/theme/common/emotes/face-surprise.png
similarity index 100%
rename from public/theme/common/emotes/face-surprise.png
rename to htdocs/theme/common/emotes/face-surprise.png
diff --git a/public/theme/common/emotes/face-uncertain.png b/htdocs/theme/common/emotes/face-uncertain.png
similarity index 100%
rename from public/theme/common/emotes/face-uncertain.png
rename to htdocs/theme/common/emotes/face-uncertain.png
diff --git a/public/theme/common/emotes/face-wink.png b/htdocs/theme/common/emotes/face-wink.png
similarity index 100%
rename from public/theme/common/emotes/face-wink.png
rename to htdocs/theme/common/emotes/face-wink.png
diff --git a/public/theme/common/emotes/index.html b/htdocs/theme/common/emotes/index.html
similarity index 100%
rename from public/theme/common/emotes/index.html
rename to htdocs/theme/common/emotes/index.html
diff --git a/public/theme/common/flags/ad.png b/htdocs/theme/common/flags/ad.png
similarity index 100%
rename from public/theme/common/flags/ad.png
rename to htdocs/theme/common/flags/ad.png
diff --git a/public/theme/common/flags/ae.png b/htdocs/theme/common/flags/ae.png
similarity index 100%
rename from public/theme/common/flags/ae.png
rename to htdocs/theme/common/flags/ae.png
diff --git a/public/theme/common/flags/af.png b/htdocs/theme/common/flags/af.png
similarity index 100%
rename from public/theme/common/flags/af.png
rename to htdocs/theme/common/flags/af.png
diff --git a/public/theme/common/flags/ag.png b/htdocs/theme/common/flags/ag.png
similarity index 100%
rename from public/theme/common/flags/ag.png
rename to htdocs/theme/common/flags/ag.png
diff --git a/public/theme/common/flags/ai.png b/htdocs/theme/common/flags/ai.png
similarity index 100%
rename from public/theme/common/flags/ai.png
rename to htdocs/theme/common/flags/ai.png
diff --git a/public/theme/common/flags/al.png b/htdocs/theme/common/flags/al.png
similarity index 100%
rename from public/theme/common/flags/al.png
rename to htdocs/theme/common/flags/al.png
diff --git a/public/theme/common/flags/am.png b/htdocs/theme/common/flags/am.png
similarity index 100%
rename from public/theme/common/flags/am.png
rename to htdocs/theme/common/flags/am.png
diff --git a/public/theme/common/flags/an.png b/htdocs/theme/common/flags/an.png
similarity index 100%
rename from public/theme/common/flags/an.png
rename to htdocs/theme/common/flags/an.png
diff --git a/public/theme/common/flags/ao.png b/htdocs/theme/common/flags/ao.png
similarity index 100%
rename from public/theme/common/flags/ao.png
rename to htdocs/theme/common/flags/ao.png
diff --git a/public/theme/common/flags/ar.png b/htdocs/theme/common/flags/ar.png
similarity index 100%
rename from public/theme/common/flags/ar.png
rename to htdocs/theme/common/flags/ar.png
diff --git a/public/theme/common/flags/as.png b/htdocs/theme/common/flags/as.png
similarity index 100%
rename from public/theme/common/flags/as.png
rename to htdocs/theme/common/flags/as.png
diff --git a/public/theme/common/flags/at.png b/htdocs/theme/common/flags/at.png
similarity index 100%
rename from public/theme/common/flags/at.png
rename to htdocs/theme/common/flags/at.png
diff --git a/public/theme/common/flags/au.png b/htdocs/theme/common/flags/au.png
similarity index 100%
rename from public/theme/common/flags/au.png
rename to htdocs/theme/common/flags/au.png
diff --git a/public/theme/common/flags/aw.png b/htdocs/theme/common/flags/aw.png
similarity index 100%
rename from public/theme/common/flags/aw.png
rename to htdocs/theme/common/flags/aw.png
diff --git a/public/theme/common/flags/ax.png b/htdocs/theme/common/flags/ax.png
similarity index 100%
rename from public/theme/common/flags/ax.png
rename to htdocs/theme/common/flags/ax.png
diff --git a/public/theme/common/flags/az.png b/htdocs/theme/common/flags/az.png
similarity index 100%
rename from public/theme/common/flags/az.png
rename to htdocs/theme/common/flags/az.png
diff --git a/public/theme/common/flags/ba.png b/htdocs/theme/common/flags/ba.png
similarity index 100%
rename from public/theme/common/flags/ba.png
rename to htdocs/theme/common/flags/ba.png
diff --git a/public/theme/common/flags/bb.png b/htdocs/theme/common/flags/bb.png
similarity index 100%
rename from public/theme/common/flags/bb.png
rename to htdocs/theme/common/flags/bb.png
diff --git a/public/theme/common/flags/bd.png b/htdocs/theme/common/flags/bd.png
similarity index 100%
rename from public/theme/common/flags/bd.png
rename to htdocs/theme/common/flags/bd.png
diff --git a/public/theme/common/flags/be.png b/htdocs/theme/common/flags/be.png
similarity index 100%
rename from public/theme/common/flags/be.png
rename to htdocs/theme/common/flags/be.png
diff --git a/public/theme/common/flags/bf.png b/htdocs/theme/common/flags/bf.png
similarity index 100%
rename from public/theme/common/flags/bf.png
rename to htdocs/theme/common/flags/bf.png
diff --git a/public/theme/common/flags/bg.png b/htdocs/theme/common/flags/bg.png
similarity index 100%
rename from public/theme/common/flags/bg.png
rename to htdocs/theme/common/flags/bg.png
diff --git a/public/theme/common/flags/bh.png b/htdocs/theme/common/flags/bh.png
similarity index 100%
rename from public/theme/common/flags/bh.png
rename to htdocs/theme/common/flags/bh.png
diff --git a/public/theme/common/flags/bi.png b/htdocs/theme/common/flags/bi.png
similarity index 100%
rename from public/theme/common/flags/bi.png
rename to htdocs/theme/common/flags/bi.png
diff --git a/public/theme/common/flags/bj.png b/htdocs/theme/common/flags/bj.png
similarity index 100%
rename from public/theme/common/flags/bj.png
rename to htdocs/theme/common/flags/bj.png
diff --git a/public/theme/common/flags/bm.png b/htdocs/theme/common/flags/bm.png
similarity index 100%
rename from public/theme/common/flags/bm.png
rename to htdocs/theme/common/flags/bm.png
diff --git a/public/theme/common/flags/bn.png b/htdocs/theme/common/flags/bn.png
similarity index 100%
rename from public/theme/common/flags/bn.png
rename to htdocs/theme/common/flags/bn.png
diff --git a/public/theme/common/flags/bo.png b/htdocs/theme/common/flags/bo.png
similarity index 100%
rename from public/theme/common/flags/bo.png
rename to htdocs/theme/common/flags/bo.png
diff --git a/public/theme/common/flags/br.png b/htdocs/theme/common/flags/br.png
similarity index 100%
rename from public/theme/common/flags/br.png
rename to htdocs/theme/common/flags/br.png
diff --git a/public/theme/common/flags/bs.png b/htdocs/theme/common/flags/bs.png
similarity index 100%
rename from public/theme/common/flags/bs.png
rename to htdocs/theme/common/flags/bs.png
diff --git a/public/theme/common/flags/bt.png b/htdocs/theme/common/flags/bt.png
similarity index 100%
rename from public/theme/common/flags/bt.png
rename to htdocs/theme/common/flags/bt.png
diff --git a/public/theme/common/flags/bv.png b/htdocs/theme/common/flags/bv.png
similarity index 100%
rename from public/theme/common/flags/bv.png
rename to htdocs/theme/common/flags/bv.png
diff --git a/public/theme/common/flags/bw.png b/htdocs/theme/common/flags/bw.png
similarity index 100%
rename from public/theme/common/flags/bw.png
rename to htdocs/theme/common/flags/bw.png
diff --git a/public/theme/common/flags/by.png b/htdocs/theme/common/flags/by.png
similarity index 100%
rename from public/theme/common/flags/by.png
rename to htdocs/theme/common/flags/by.png
diff --git a/public/theme/common/flags/bz.png b/htdocs/theme/common/flags/bz.png
similarity index 100%
rename from public/theme/common/flags/bz.png
rename to htdocs/theme/common/flags/bz.png
diff --git a/public/theme/common/flags/ca.png b/htdocs/theme/common/flags/ca.png
similarity index 100%
rename from public/theme/common/flags/ca.png
rename to htdocs/theme/common/flags/ca.png
diff --git a/public/theme/common/flags/catalonia.png b/htdocs/theme/common/flags/catalonia.png
similarity index 100%
rename from public/theme/common/flags/catalonia.png
rename to htdocs/theme/common/flags/catalonia.png
diff --git a/public/theme/common/flags/cc.png b/htdocs/theme/common/flags/cc.png
similarity index 100%
rename from public/theme/common/flags/cc.png
rename to htdocs/theme/common/flags/cc.png
diff --git a/public/theme/common/flags/cd.png b/htdocs/theme/common/flags/cd.png
similarity index 100%
rename from public/theme/common/flags/cd.png
rename to htdocs/theme/common/flags/cd.png
diff --git a/public/theme/common/flags/cf.png b/htdocs/theme/common/flags/cf.png
similarity index 100%
rename from public/theme/common/flags/cf.png
rename to htdocs/theme/common/flags/cf.png
diff --git a/public/theme/common/flags/cg.png b/htdocs/theme/common/flags/cg.png
similarity index 100%
rename from public/theme/common/flags/cg.png
rename to htdocs/theme/common/flags/cg.png
diff --git a/public/theme/common/flags/ch.png b/htdocs/theme/common/flags/ch.png
similarity index 100%
rename from public/theme/common/flags/ch.png
rename to htdocs/theme/common/flags/ch.png
diff --git a/public/theme/common/flags/ci.png b/htdocs/theme/common/flags/ci.png
similarity index 100%
rename from public/theme/common/flags/ci.png
rename to htdocs/theme/common/flags/ci.png
diff --git a/public/theme/common/flags/ck.png b/htdocs/theme/common/flags/ck.png
similarity index 100%
rename from public/theme/common/flags/ck.png
rename to htdocs/theme/common/flags/ck.png
diff --git a/public/theme/common/flags/cl.png b/htdocs/theme/common/flags/cl.png
similarity index 100%
rename from public/theme/common/flags/cl.png
rename to htdocs/theme/common/flags/cl.png
diff --git a/public/theme/common/flags/cm.png b/htdocs/theme/common/flags/cm.png
similarity index 100%
rename from public/theme/common/flags/cm.png
rename to htdocs/theme/common/flags/cm.png
diff --git a/public/theme/common/flags/cn.png b/htdocs/theme/common/flags/cn.png
similarity index 100%
rename from public/theme/common/flags/cn.png
rename to htdocs/theme/common/flags/cn.png
diff --git a/public/theme/common/flags/co.png b/htdocs/theme/common/flags/co.png
similarity index 100%
rename from public/theme/common/flags/co.png
rename to htdocs/theme/common/flags/co.png
diff --git a/public/theme/common/flags/cr.png b/htdocs/theme/common/flags/cr.png
similarity index 100%
rename from public/theme/common/flags/cr.png
rename to htdocs/theme/common/flags/cr.png
diff --git a/public/theme/common/flags/cs.png b/htdocs/theme/common/flags/cs.png
similarity index 100%
rename from public/theme/common/flags/cs.png
rename to htdocs/theme/common/flags/cs.png
diff --git a/public/theme/common/flags/cu.png b/htdocs/theme/common/flags/cu.png
similarity index 100%
rename from public/theme/common/flags/cu.png
rename to htdocs/theme/common/flags/cu.png
diff --git a/public/theme/common/flags/cv.png b/htdocs/theme/common/flags/cv.png
similarity index 100%
rename from public/theme/common/flags/cv.png
rename to htdocs/theme/common/flags/cv.png
diff --git a/public/theme/common/flags/cx.png b/htdocs/theme/common/flags/cx.png
similarity index 100%
rename from public/theme/common/flags/cx.png
rename to htdocs/theme/common/flags/cx.png
diff --git a/public/theme/common/flags/cy.png b/htdocs/theme/common/flags/cy.png
similarity index 100%
rename from public/theme/common/flags/cy.png
rename to htdocs/theme/common/flags/cy.png
diff --git a/public/theme/common/flags/cz.png b/htdocs/theme/common/flags/cz.png
similarity index 100%
rename from public/theme/common/flags/cz.png
rename to htdocs/theme/common/flags/cz.png
diff --git a/public/theme/common/flags/de.png b/htdocs/theme/common/flags/de.png
similarity index 100%
rename from public/theme/common/flags/de.png
rename to htdocs/theme/common/flags/de.png
diff --git a/public/theme/common/flags/dj.png b/htdocs/theme/common/flags/dj.png
similarity index 100%
rename from public/theme/common/flags/dj.png
rename to htdocs/theme/common/flags/dj.png
diff --git a/public/theme/common/flags/dk.png b/htdocs/theme/common/flags/dk.png
similarity index 100%
rename from public/theme/common/flags/dk.png
rename to htdocs/theme/common/flags/dk.png
diff --git a/public/theme/common/flags/dm.png b/htdocs/theme/common/flags/dm.png
similarity index 100%
rename from public/theme/common/flags/dm.png
rename to htdocs/theme/common/flags/dm.png
diff --git a/public/theme/common/flags/do.png b/htdocs/theme/common/flags/do.png
similarity index 100%
rename from public/theme/common/flags/do.png
rename to htdocs/theme/common/flags/do.png
diff --git a/public/theme/common/flags/dz.png b/htdocs/theme/common/flags/dz.png
similarity index 100%
rename from public/theme/common/flags/dz.png
rename to htdocs/theme/common/flags/dz.png
diff --git a/public/theme/common/flags/ec.png b/htdocs/theme/common/flags/ec.png
similarity index 100%
rename from public/theme/common/flags/ec.png
rename to htdocs/theme/common/flags/ec.png
diff --git a/public/theme/common/flags/ee.png b/htdocs/theme/common/flags/ee.png
similarity index 100%
rename from public/theme/common/flags/ee.png
rename to htdocs/theme/common/flags/ee.png
diff --git a/public/theme/common/flags/eg.png b/htdocs/theme/common/flags/eg.png
similarity index 100%
rename from public/theme/common/flags/eg.png
rename to htdocs/theme/common/flags/eg.png
diff --git a/public/theme/common/flags/eh.png b/htdocs/theme/common/flags/eh.png
similarity index 100%
rename from public/theme/common/flags/eh.png
rename to htdocs/theme/common/flags/eh.png
diff --git a/public/theme/common/flags/en.png b/htdocs/theme/common/flags/en.png
similarity index 100%
rename from public/theme/common/flags/en.png
rename to htdocs/theme/common/flags/en.png
diff --git a/public/theme/common/flags/england.png b/htdocs/theme/common/flags/england.png
similarity index 100%
rename from public/theme/common/flags/england.png
rename to htdocs/theme/common/flags/england.png
diff --git a/public/theme/common/flags/er.png b/htdocs/theme/common/flags/er.png
similarity index 100%
rename from public/theme/common/flags/er.png
rename to htdocs/theme/common/flags/er.png
diff --git a/public/theme/common/flags/es.png b/htdocs/theme/common/flags/es.png
similarity index 100%
rename from public/theme/common/flags/es.png
rename to htdocs/theme/common/flags/es.png
diff --git a/public/theme/common/flags/et.png b/htdocs/theme/common/flags/et.png
similarity index 100%
rename from public/theme/common/flags/et.png
rename to htdocs/theme/common/flags/et.png
diff --git a/public/theme/common/flags/eu.png b/htdocs/theme/common/flags/eu.png
similarity index 100%
rename from public/theme/common/flags/eu.png
rename to htdocs/theme/common/flags/eu.png
diff --git a/public/theme/common/flags/fam.png b/htdocs/theme/common/flags/fam.png
similarity index 100%
rename from public/theme/common/flags/fam.png
rename to htdocs/theme/common/flags/fam.png
diff --git a/public/theme/common/flags/fi.png b/htdocs/theme/common/flags/fi.png
similarity index 100%
rename from public/theme/common/flags/fi.png
rename to htdocs/theme/common/flags/fi.png
diff --git a/public/theme/common/flags/fj.png b/htdocs/theme/common/flags/fj.png
similarity index 100%
rename from public/theme/common/flags/fj.png
rename to htdocs/theme/common/flags/fj.png
diff --git a/public/theme/common/flags/fk.png b/htdocs/theme/common/flags/fk.png
similarity index 100%
rename from public/theme/common/flags/fk.png
rename to htdocs/theme/common/flags/fk.png
diff --git a/public/theme/common/flags/fm.png b/htdocs/theme/common/flags/fm.png
similarity index 100%
rename from public/theme/common/flags/fm.png
rename to htdocs/theme/common/flags/fm.png
diff --git a/public/theme/common/flags/fo.png b/htdocs/theme/common/flags/fo.png
similarity index 100%
rename from public/theme/common/flags/fo.png
rename to htdocs/theme/common/flags/fo.png
diff --git a/public/theme/common/flags/fr.png b/htdocs/theme/common/flags/fr.png
similarity index 100%
rename from public/theme/common/flags/fr.png
rename to htdocs/theme/common/flags/fr.png
diff --git a/public/theme/common/flags/ga.png b/htdocs/theme/common/flags/ga.png
similarity index 100%
rename from public/theme/common/flags/ga.png
rename to htdocs/theme/common/flags/ga.png
diff --git a/public/theme/common/flags/gb.png b/htdocs/theme/common/flags/gb.png
similarity index 100%
rename from public/theme/common/flags/gb.png
rename to htdocs/theme/common/flags/gb.png
diff --git a/public/theme/common/flags/gd.png b/htdocs/theme/common/flags/gd.png
similarity index 100%
rename from public/theme/common/flags/gd.png
rename to htdocs/theme/common/flags/gd.png
diff --git a/public/theme/common/flags/ge.png b/htdocs/theme/common/flags/ge.png
similarity index 100%
rename from public/theme/common/flags/ge.png
rename to htdocs/theme/common/flags/ge.png
diff --git a/public/theme/common/flags/gf.png b/htdocs/theme/common/flags/gf.png
similarity index 100%
rename from public/theme/common/flags/gf.png
rename to htdocs/theme/common/flags/gf.png
diff --git a/public/theme/common/flags/gg.png b/htdocs/theme/common/flags/gg.png
similarity index 100%
rename from public/theme/common/flags/gg.png
rename to htdocs/theme/common/flags/gg.png
diff --git a/public/theme/common/flags/gh.png b/htdocs/theme/common/flags/gh.png
similarity index 100%
rename from public/theme/common/flags/gh.png
rename to htdocs/theme/common/flags/gh.png
diff --git a/public/theme/common/flags/gi.png b/htdocs/theme/common/flags/gi.png
similarity index 100%
rename from public/theme/common/flags/gi.png
rename to htdocs/theme/common/flags/gi.png
diff --git a/public/theme/common/flags/gl.png b/htdocs/theme/common/flags/gl.png
similarity index 100%
rename from public/theme/common/flags/gl.png
rename to htdocs/theme/common/flags/gl.png
diff --git a/public/theme/common/flags/gm.png b/htdocs/theme/common/flags/gm.png
similarity index 100%
rename from public/theme/common/flags/gm.png
rename to htdocs/theme/common/flags/gm.png
diff --git a/public/theme/common/flags/gn.png b/htdocs/theme/common/flags/gn.png
similarity index 100%
rename from public/theme/common/flags/gn.png
rename to htdocs/theme/common/flags/gn.png
diff --git a/public/theme/common/flags/gp.png b/htdocs/theme/common/flags/gp.png
similarity index 100%
rename from public/theme/common/flags/gp.png
rename to htdocs/theme/common/flags/gp.png
diff --git a/public/theme/common/flags/gq.png b/htdocs/theme/common/flags/gq.png
similarity index 100%
rename from public/theme/common/flags/gq.png
rename to htdocs/theme/common/flags/gq.png
diff --git a/public/theme/common/flags/gr.png b/htdocs/theme/common/flags/gr.png
similarity index 100%
rename from public/theme/common/flags/gr.png
rename to htdocs/theme/common/flags/gr.png
diff --git a/public/theme/common/flags/gs.png b/htdocs/theme/common/flags/gs.png
similarity index 100%
rename from public/theme/common/flags/gs.png
rename to htdocs/theme/common/flags/gs.png
diff --git a/public/theme/common/flags/gt.png b/htdocs/theme/common/flags/gt.png
similarity index 100%
rename from public/theme/common/flags/gt.png
rename to htdocs/theme/common/flags/gt.png
diff --git a/public/theme/common/flags/gu.png b/htdocs/theme/common/flags/gu.png
similarity index 100%
rename from public/theme/common/flags/gu.png
rename to htdocs/theme/common/flags/gu.png
diff --git a/public/theme/common/flags/gw.png b/htdocs/theme/common/flags/gw.png
similarity index 100%
rename from public/theme/common/flags/gw.png
rename to htdocs/theme/common/flags/gw.png
diff --git a/public/theme/common/flags/gy.png b/htdocs/theme/common/flags/gy.png
similarity index 100%
rename from public/theme/common/flags/gy.png
rename to htdocs/theme/common/flags/gy.png
diff --git a/public/theme/common/flags/hk.png b/htdocs/theme/common/flags/hk.png
similarity index 100%
rename from public/theme/common/flags/hk.png
rename to htdocs/theme/common/flags/hk.png
diff --git a/public/theme/common/flags/hm.png b/htdocs/theme/common/flags/hm.png
similarity index 100%
rename from public/theme/common/flags/hm.png
rename to htdocs/theme/common/flags/hm.png
diff --git a/public/theme/common/flags/hn.png b/htdocs/theme/common/flags/hn.png
similarity index 100%
rename from public/theme/common/flags/hn.png
rename to htdocs/theme/common/flags/hn.png
diff --git a/public/theme/common/flags/hr.png b/htdocs/theme/common/flags/hr.png
similarity index 100%
rename from public/theme/common/flags/hr.png
rename to htdocs/theme/common/flags/hr.png
diff --git a/public/theme/common/flags/ht.png b/htdocs/theme/common/flags/ht.png
similarity index 100%
rename from public/theme/common/flags/ht.png
rename to htdocs/theme/common/flags/ht.png
diff --git a/public/theme/common/flags/hu.png b/htdocs/theme/common/flags/hu.png
similarity index 100%
rename from public/theme/common/flags/hu.png
rename to htdocs/theme/common/flags/hu.png
diff --git a/public/theme/common/flags/id.png b/htdocs/theme/common/flags/id.png
similarity index 100%
rename from public/theme/common/flags/id.png
rename to htdocs/theme/common/flags/id.png
diff --git a/public/theme/common/flags/ie.png b/htdocs/theme/common/flags/ie.png
similarity index 100%
rename from public/theme/common/flags/ie.png
rename to htdocs/theme/common/flags/ie.png
diff --git a/public/theme/common/flags/il.png b/htdocs/theme/common/flags/il.png
similarity index 100%
rename from public/theme/common/flags/il.png
rename to htdocs/theme/common/flags/il.png
diff --git a/public/theme/common/flags/in.png b/htdocs/theme/common/flags/in.png
similarity index 100%
rename from public/theme/common/flags/in.png
rename to htdocs/theme/common/flags/in.png
diff --git a/public/theme/common/flags/index.html b/htdocs/theme/common/flags/index.html
similarity index 100%
rename from public/theme/common/flags/index.html
rename to htdocs/theme/common/flags/index.html
diff --git a/public/theme/common/flags/int.png b/htdocs/theme/common/flags/int.png
similarity index 100%
rename from public/theme/common/flags/int.png
rename to htdocs/theme/common/flags/int.png
diff --git a/public/theme/common/flags/io.png b/htdocs/theme/common/flags/io.png
similarity index 100%
rename from public/theme/common/flags/io.png
rename to htdocs/theme/common/flags/io.png
diff --git a/public/theme/common/flags/iq.png b/htdocs/theme/common/flags/iq.png
similarity index 100%
rename from public/theme/common/flags/iq.png
rename to htdocs/theme/common/flags/iq.png
diff --git a/public/theme/common/flags/ir.png b/htdocs/theme/common/flags/ir.png
similarity index 100%
rename from public/theme/common/flags/ir.png
rename to htdocs/theme/common/flags/ir.png
diff --git a/public/theme/common/flags/is.png b/htdocs/theme/common/flags/is.png
similarity index 100%
rename from public/theme/common/flags/is.png
rename to htdocs/theme/common/flags/is.png
diff --git a/public/theme/common/flags/it.png b/htdocs/theme/common/flags/it.png
similarity index 100%
rename from public/theme/common/flags/it.png
rename to htdocs/theme/common/flags/it.png
diff --git a/public/theme/common/flags/jm.png b/htdocs/theme/common/flags/jm.png
similarity index 100%
rename from public/theme/common/flags/jm.png
rename to htdocs/theme/common/flags/jm.png
diff --git a/public/theme/common/flags/jo.png b/htdocs/theme/common/flags/jo.png
similarity index 100%
rename from public/theme/common/flags/jo.png
rename to htdocs/theme/common/flags/jo.png
diff --git a/public/theme/common/flags/jp.png b/htdocs/theme/common/flags/jp.png
similarity index 100%
rename from public/theme/common/flags/jp.png
rename to htdocs/theme/common/flags/jp.png
diff --git a/public/theme/common/flags/ke.png b/htdocs/theme/common/flags/ke.png
similarity index 100%
rename from public/theme/common/flags/ke.png
rename to htdocs/theme/common/flags/ke.png
diff --git a/public/theme/common/flags/kg.png b/htdocs/theme/common/flags/kg.png
similarity index 100%
rename from public/theme/common/flags/kg.png
rename to htdocs/theme/common/flags/kg.png
diff --git a/public/theme/common/flags/kh.png b/htdocs/theme/common/flags/kh.png
similarity index 100%
rename from public/theme/common/flags/kh.png
rename to htdocs/theme/common/flags/kh.png
diff --git a/public/theme/common/flags/ki.png b/htdocs/theme/common/flags/ki.png
similarity index 100%
rename from public/theme/common/flags/ki.png
rename to htdocs/theme/common/flags/ki.png
diff --git a/public/theme/common/flags/km.png b/htdocs/theme/common/flags/km.png
similarity index 100%
rename from public/theme/common/flags/km.png
rename to htdocs/theme/common/flags/km.png
diff --git a/public/theme/common/flags/kn.png b/htdocs/theme/common/flags/kn.png
similarity index 100%
rename from public/theme/common/flags/kn.png
rename to htdocs/theme/common/flags/kn.png
diff --git a/public/theme/common/flags/kp.png b/htdocs/theme/common/flags/kp.png
similarity index 100%
rename from public/theme/common/flags/kp.png
rename to htdocs/theme/common/flags/kp.png
diff --git a/public/theme/common/flags/kr.png b/htdocs/theme/common/flags/kr.png
similarity index 100%
rename from public/theme/common/flags/kr.png
rename to htdocs/theme/common/flags/kr.png
diff --git a/public/theme/common/flags/kw.png b/htdocs/theme/common/flags/kw.png
similarity index 100%
rename from public/theme/common/flags/kw.png
rename to htdocs/theme/common/flags/kw.png
diff --git a/public/theme/common/flags/ky.png b/htdocs/theme/common/flags/ky.png
similarity index 100%
rename from public/theme/common/flags/ky.png
rename to htdocs/theme/common/flags/ky.png
diff --git a/public/theme/common/flags/kz.png b/htdocs/theme/common/flags/kz.png
similarity index 100%
rename from public/theme/common/flags/kz.png
rename to htdocs/theme/common/flags/kz.png
diff --git a/public/theme/common/flags/la.png b/htdocs/theme/common/flags/la.png
similarity index 100%
rename from public/theme/common/flags/la.png
rename to htdocs/theme/common/flags/la.png
diff --git a/public/theme/common/flags/lb.png b/htdocs/theme/common/flags/lb.png
similarity index 100%
rename from public/theme/common/flags/lb.png
rename to htdocs/theme/common/flags/lb.png
diff --git a/public/theme/common/flags/lc.png b/htdocs/theme/common/flags/lc.png
similarity index 100%
rename from public/theme/common/flags/lc.png
rename to htdocs/theme/common/flags/lc.png
diff --git a/public/theme/common/flags/li.png b/htdocs/theme/common/flags/li.png
similarity index 100%
rename from public/theme/common/flags/li.png
rename to htdocs/theme/common/flags/li.png
diff --git a/public/theme/common/flags/lk.png b/htdocs/theme/common/flags/lk.png
similarity index 100%
rename from public/theme/common/flags/lk.png
rename to htdocs/theme/common/flags/lk.png
diff --git a/public/theme/common/flags/lr.png b/htdocs/theme/common/flags/lr.png
similarity index 100%
rename from public/theme/common/flags/lr.png
rename to htdocs/theme/common/flags/lr.png
diff --git a/public/theme/common/flags/ls.png b/htdocs/theme/common/flags/ls.png
similarity index 100%
rename from public/theme/common/flags/ls.png
rename to htdocs/theme/common/flags/ls.png
diff --git a/public/theme/common/flags/lt.png b/htdocs/theme/common/flags/lt.png
similarity index 100%
rename from public/theme/common/flags/lt.png
rename to htdocs/theme/common/flags/lt.png
diff --git a/public/theme/common/flags/lu.png b/htdocs/theme/common/flags/lu.png
similarity index 100%
rename from public/theme/common/flags/lu.png
rename to htdocs/theme/common/flags/lu.png
diff --git a/public/theme/common/flags/lv.png b/htdocs/theme/common/flags/lv.png
similarity index 100%
rename from public/theme/common/flags/lv.png
rename to htdocs/theme/common/flags/lv.png
diff --git a/public/theme/common/flags/ly.png b/htdocs/theme/common/flags/ly.png
similarity index 100%
rename from public/theme/common/flags/ly.png
rename to htdocs/theme/common/flags/ly.png
diff --git a/public/theme/common/flags/ma.png b/htdocs/theme/common/flags/ma.png
similarity index 100%
rename from public/theme/common/flags/ma.png
rename to htdocs/theme/common/flags/ma.png
diff --git a/public/theme/common/flags/mc.png b/htdocs/theme/common/flags/mc.png
similarity index 100%
rename from public/theme/common/flags/mc.png
rename to htdocs/theme/common/flags/mc.png
diff --git a/public/theme/common/flags/md.png b/htdocs/theme/common/flags/md.png
similarity index 100%
rename from public/theme/common/flags/md.png
rename to htdocs/theme/common/flags/md.png
diff --git a/public/theme/common/flags/me.png b/htdocs/theme/common/flags/me.png
similarity index 100%
rename from public/theme/common/flags/me.png
rename to htdocs/theme/common/flags/me.png
diff --git a/public/theme/common/flags/mg.png b/htdocs/theme/common/flags/mg.png
similarity index 100%
rename from public/theme/common/flags/mg.png
rename to htdocs/theme/common/flags/mg.png
diff --git a/public/theme/common/flags/mh.png b/htdocs/theme/common/flags/mh.png
similarity index 100%
rename from public/theme/common/flags/mh.png
rename to htdocs/theme/common/flags/mh.png
diff --git a/public/theme/common/flags/mk.png b/htdocs/theme/common/flags/mk.png
similarity index 100%
rename from public/theme/common/flags/mk.png
rename to htdocs/theme/common/flags/mk.png
diff --git a/public/theme/common/flags/ml.png b/htdocs/theme/common/flags/ml.png
similarity index 100%
rename from public/theme/common/flags/ml.png
rename to htdocs/theme/common/flags/ml.png
diff --git a/public/theme/common/flags/mm.png b/htdocs/theme/common/flags/mm.png
similarity index 100%
rename from public/theme/common/flags/mm.png
rename to htdocs/theme/common/flags/mm.png
diff --git a/public/theme/common/flags/mn.png b/htdocs/theme/common/flags/mn.png
similarity index 100%
rename from public/theme/common/flags/mn.png
rename to htdocs/theme/common/flags/mn.png
diff --git a/public/theme/common/flags/mo.png b/htdocs/theme/common/flags/mo.png
similarity index 100%
rename from public/theme/common/flags/mo.png
rename to htdocs/theme/common/flags/mo.png
diff --git a/public/theme/common/flags/mp.png b/htdocs/theme/common/flags/mp.png
similarity index 100%
rename from public/theme/common/flags/mp.png
rename to htdocs/theme/common/flags/mp.png
diff --git a/public/theme/common/flags/mq.png b/htdocs/theme/common/flags/mq.png
similarity index 100%
rename from public/theme/common/flags/mq.png
rename to htdocs/theme/common/flags/mq.png
diff --git a/public/theme/common/flags/mr.png b/htdocs/theme/common/flags/mr.png
similarity index 100%
rename from public/theme/common/flags/mr.png
rename to htdocs/theme/common/flags/mr.png
diff --git a/public/theme/common/flags/ms.png b/htdocs/theme/common/flags/ms.png
similarity index 100%
rename from public/theme/common/flags/ms.png
rename to htdocs/theme/common/flags/ms.png
diff --git a/public/theme/common/flags/mt.png b/htdocs/theme/common/flags/mt.png
similarity index 100%
rename from public/theme/common/flags/mt.png
rename to htdocs/theme/common/flags/mt.png
diff --git a/public/theme/common/flags/mu.png b/htdocs/theme/common/flags/mu.png
similarity index 100%
rename from public/theme/common/flags/mu.png
rename to htdocs/theme/common/flags/mu.png
diff --git a/public/theme/common/flags/mv.png b/htdocs/theme/common/flags/mv.png
similarity index 100%
rename from public/theme/common/flags/mv.png
rename to htdocs/theme/common/flags/mv.png
diff --git a/public/theme/common/flags/mw.png b/htdocs/theme/common/flags/mw.png
similarity index 100%
rename from public/theme/common/flags/mw.png
rename to htdocs/theme/common/flags/mw.png
diff --git a/public/theme/common/flags/mx.png b/htdocs/theme/common/flags/mx.png
similarity index 100%
rename from public/theme/common/flags/mx.png
rename to htdocs/theme/common/flags/mx.png
diff --git a/public/theme/common/flags/my.png b/htdocs/theme/common/flags/my.png
similarity index 100%
rename from public/theme/common/flags/my.png
rename to htdocs/theme/common/flags/my.png
diff --git a/public/theme/common/flags/mz.png b/htdocs/theme/common/flags/mz.png
similarity index 100%
rename from public/theme/common/flags/mz.png
rename to htdocs/theme/common/flags/mz.png
diff --git a/public/theme/common/flags/na.png b/htdocs/theme/common/flags/na.png
similarity index 100%
rename from public/theme/common/flags/na.png
rename to htdocs/theme/common/flags/na.png
diff --git a/public/theme/common/flags/nc.png b/htdocs/theme/common/flags/nc.png
similarity index 100%
rename from public/theme/common/flags/nc.png
rename to htdocs/theme/common/flags/nc.png
diff --git a/public/theme/common/flags/ne.png b/htdocs/theme/common/flags/ne.png
similarity index 100%
rename from public/theme/common/flags/ne.png
rename to htdocs/theme/common/flags/ne.png
diff --git a/public/theme/common/flags/nf.png b/htdocs/theme/common/flags/nf.png
similarity index 100%
rename from public/theme/common/flags/nf.png
rename to htdocs/theme/common/flags/nf.png
diff --git a/public/theme/common/flags/ng.png b/htdocs/theme/common/flags/ng.png
similarity index 100%
rename from public/theme/common/flags/ng.png
rename to htdocs/theme/common/flags/ng.png
diff --git a/public/theme/common/flags/ni.png b/htdocs/theme/common/flags/ni.png
similarity index 100%
rename from public/theme/common/flags/ni.png
rename to htdocs/theme/common/flags/ni.png
diff --git a/public/theme/common/flags/nl.png b/htdocs/theme/common/flags/nl.png
similarity index 100%
rename from public/theme/common/flags/nl.png
rename to htdocs/theme/common/flags/nl.png
diff --git a/public/theme/common/flags/no.png b/htdocs/theme/common/flags/no.png
similarity index 100%
rename from public/theme/common/flags/no.png
rename to htdocs/theme/common/flags/no.png
diff --git a/public/theme/common/flags/np.png b/htdocs/theme/common/flags/np.png
similarity index 100%
rename from public/theme/common/flags/np.png
rename to htdocs/theme/common/flags/np.png
diff --git a/public/theme/common/flags/nr.png b/htdocs/theme/common/flags/nr.png
similarity index 100%
rename from public/theme/common/flags/nr.png
rename to htdocs/theme/common/flags/nr.png
diff --git a/public/theme/common/flags/nu.png b/htdocs/theme/common/flags/nu.png
similarity index 100%
rename from public/theme/common/flags/nu.png
rename to htdocs/theme/common/flags/nu.png
diff --git a/public/theme/common/flags/nz.png b/htdocs/theme/common/flags/nz.png
similarity index 100%
rename from public/theme/common/flags/nz.png
rename to htdocs/theme/common/flags/nz.png
diff --git a/public/theme/common/flags/om.png b/htdocs/theme/common/flags/om.png
similarity index 100%
rename from public/theme/common/flags/om.png
rename to htdocs/theme/common/flags/om.png
diff --git a/public/theme/common/flags/pa.png b/htdocs/theme/common/flags/pa.png
similarity index 100%
rename from public/theme/common/flags/pa.png
rename to htdocs/theme/common/flags/pa.png
diff --git a/public/theme/common/flags/pe.png b/htdocs/theme/common/flags/pe.png
similarity index 100%
rename from public/theme/common/flags/pe.png
rename to htdocs/theme/common/flags/pe.png
diff --git a/public/theme/common/flags/pf.png b/htdocs/theme/common/flags/pf.png
similarity index 100%
rename from public/theme/common/flags/pf.png
rename to htdocs/theme/common/flags/pf.png
diff --git a/public/theme/common/flags/pg.png b/htdocs/theme/common/flags/pg.png
similarity index 100%
rename from public/theme/common/flags/pg.png
rename to htdocs/theme/common/flags/pg.png
diff --git a/public/theme/common/flags/ph.png b/htdocs/theme/common/flags/ph.png
similarity index 100%
rename from public/theme/common/flags/ph.png
rename to htdocs/theme/common/flags/ph.png
diff --git a/public/theme/common/flags/pk.png b/htdocs/theme/common/flags/pk.png
similarity index 100%
rename from public/theme/common/flags/pk.png
rename to htdocs/theme/common/flags/pk.png
diff --git a/public/theme/common/flags/pl.png b/htdocs/theme/common/flags/pl.png
similarity index 100%
rename from public/theme/common/flags/pl.png
rename to htdocs/theme/common/flags/pl.png
diff --git a/public/theme/common/flags/pm.png b/htdocs/theme/common/flags/pm.png
similarity index 100%
rename from public/theme/common/flags/pm.png
rename to htdocs/theme/common/flags/pm.png
diff --git a/public/theme/common/flags/pn.png b/htdocs/theme/common/flags/pn.png
similarity index 100%
rename from public/theme/common/flags/pn.png
rename to htdocs/theme/common/flags/pn.png
diff --git a/public/theme/common/flags/pr.png b/htdocs/theme/common/flags/pr.png
similarity index 100%
rename from public/theme/common/flags/pr.png
rename to htdocs/theme/common/flags/pr.png
diff --git a/public/theme/common/flags/ps.png b/htdocs/theme/common/flags/ps.png
similarity index 100%
rename from public/theme/common/flags/ps.png
rename to htdocs/theme/common/flags/ps.png
diff --git a/public/theme/common/flags/pt.png b/htdocs/theme/common/flags/pt.png
similarity index 100%
rename from public/theme/common/flags/pt.png
rename to htdocs/theme/common/flags/pt.png
diff --git a/public/theme/common/flags/pw.png b/htdocs/theme/common/flags/pw.png
similarity index 100%
rename from public/theme/common/flags/pw.png
rename to htdocs/theme/common/flags/pw.png
diff --git a/public/theme/common/flags/py.png b/htdocs/theme/common/flags/py.png
similarity index 100%
rename from public/theme/common/flags/py.png
rename to htdocs/theme/common/flags/py.png
diff --git a/public/theme/common/flags/qa.png b/htdocs/theme/common/flags/qa.png
similarity index 100%
rename from public/theme/common/flags/qa.png
rename to htdocs/theme/common/flags/qa.png
diff --git a/public/theme/common/flags/re.png b/htdocs/theme/common/flags/re.png
similarity index 100%
rename from public/theme/common/flags/re.png
rename to htdocs/theme/common/flags/re.png
diff --git a/public/theme/common/flags/ro.png b/htdocs/theme/common/flags/ro.png
similarity index 100%
rename from public/theme/common/flags/ro.png
rename to htdocs/theme/common/flags/ro.png
diff --git a/public/theme/common/flags/rs.png b/htdocs/theme/common/flags/rs.png
similarity index 100%
rename from public/theme/common/flags/rs.png
rename to htdocs/theme/common/flags/rs.png
diff --git a/public/theme/common/flags/ru.png b/htdocs/theme/common/flags/ru.png
similarity index 100%
rename from public/theme/common/flags/ru.png
rename to htdocs/theme/common/flags/ru.png
diff --git a/public/theme/common/flags/rw.png b/htdocs/theme/common/flags/rw.png
similarity index 100%
rename from public/theme/common/flags/rw.png
rename to htdocs/theme/common/flags/rw.png
diff --git a/public/theme/common/flags/sa.png b/htdocs/theme/common/flags/sa.png
similarity index 100%
rename from public/theme/common/flags/sa.png
rename to htdocs/theme/common/flags/sa.png
diff --git a/public/theme/common/flags/sb.png b/htdocs/theme/common/flags/sb.png
similarity index 100%
rename from public/theme/common/flags/sb.png
rename to htdocs/theme/common/flags/sb.png
diff --git a/public/theme/common/flags/sc.png b/htdocs/theme/common/flags/sc.png
similarity index 100%
rename from public/theme/common/flags/sc.png
rename to htdocs/theme/common/flags/sc.png
diff --git a/public/theme/common/flags/scotland.png b/htdocs/theme/common/flags/scotland.png
similarity index 100%
rename from public/theme/common/flags/scotland.png
rename to htdocs/theme/common/flags/scotland.png
diff --git a/public/theme/common/flags/sd.png b/htdocs/theme/common/flags/sd.png
similarity index 100%
rename from public/theme/common/flags/sd.png
rename to htdocs/theme/common/flags/sd.png
diff --git a/public/theme/common/flags/se.png b/htdocs/theme/common/flags/se.png
similarity index 100%
rename from public/theme/common/flags/se.png
rename to htdocs/theme/common/flags/se.png
diff --git a/public/theme/common/flags/sg.png b/htdocs/theme/common/flags/sg.png
similarity index 100%
rename from public/theme/common/flags/sg.png
rename to htdocs/theme/common/flags/sg.png
diff --git a/public/theme/common/flags/sh.png b/htdocs/theme/common/flags/sh.png
similarity index 100%
rename from public/theme/common/flags/sh.png
rename to htdocs/theme/common/flags/sh.png
diff --git a/public/theme/common/flags/si.png b/htdocs/theme/common/flags/si.png
similarity index 100%
rename from public/theme/common/flags/si.png
rename to htdocs/theme/common/flags/si.png
diff --git a/public/theme/common/flags/sj.png b/htdocs/theme/common/flags/sj.png
similarity index 100%
rename from public/theme/common/flags/sj.png
rename to htdocs/theme/common/flags/sj.png
diff --git a/public/theme/common/flags/sk.png b/htdocs/theme/common/flags/sk.png
similarity index 100%
rename from public/theme/common/flags/sk.png
rename to htdocs/theme/common/flags/sk.png
diff --git a/public/theme/common/flags/sl.png b/htdocs/theme/common/flags/sl.png
similarity index 100%
rename from public/theme/common/flags/sl.png
rename to htdocs/theme/common/flags/sl.png
diff --git a/public/theme/common/flags/sm.png b/htdocs/theme/common/flags/sm.png
similarity index 100%
rename from public/theme/common/flags/sm.png
rename to htdocs/theme/common/flags/sm.png
diff --git a/public/theme/common/flags/sn.png b/htdocs/theme/common/flags/sn.png
similarity index 100%
rename from public/theme/common/flags/sn.png
rename to htdocs/theme/common/flags/sn.png
diff --git a/public/theme/common/flags/so.png b/htdocs/theme/common/flags/so.png
similarity index 100%
rename from public/theme/common/flags/so.png
rename to htdocs/theme/common/flags/so.png
diff --git a/public/theme/common/flags/sr.png b/htdocs/theme/common/flags/sr.png
similarity index 100%
rename from public/theme/common/flags/sr.png
rename to htdocs/theme/common/flags/sr.png
diff --git a/public/theme/common/flags/st.png b/htdocs/theme/common/flags/st.png
similarity index 100%
rename from public/theme/common/flags/st.png
rename to htdocs/theme/common/flags/st.png
diff --git a/public/theme/common/flags/sv.png b/htdocs/theme/common/flags/sv.png
similarity index 100%
rename from public/theme/common/flags/sv.png
rename to htdocs/theme/common/flags/sv.png
diff --git a/public/theme/common/flags/sy.png b/htdocs/theme/common/flags/sy.png
similarity index 100%
rename from public/theme/common/flags/sy.png
rename to htdocs/theme/common/flags/sy.png
diff --git a/public/theme/common/flags/sz.png b/htdocs/theme/common/flags/sz.png
similarity index 100%
rename from public/theme/common/flags/sz.png
rename to htdocs/theme/common/flags/sz.png
diff --git a/public/theme/common/flags/tc.png b/htdocs/theme/common/flags/tc.png
similarity index 100%
rename from public/theme/common/flags/tc.png
rename to htdocs/theme/common/flags/tc.png
diff --git a/public/theme/common/flags/td.png b/htdocs/theme/common/flags/td.png
similarity index 100%
rename from public/theme/common/flags/td.png
rename to htdocs/theme/common/flags/td.png
diff --git a/public/theme/common/flags/tf.png b/htdocs/theme/common/flags/tf.png
similarity index 100%
rename from public/theme/common/flags/tf.png
rename to htdocs/theme/common/flags/tf.png
diff --git a/public/theme/common/flags/tg.png b/htdocs/theme/common/flags/tg.png
similarity index 100%
rename from public/theme/common/flags/tg.png
rename to htdocs/theme/common/flags/tg.png
diff --git a/public/theme/common/flags/th.png b/htdocs/theme/common/flags/th.png
similarity index 100%
rename from public/theme/common/flags/th.png
rename to htdocs/theme/common/flags/th.png
diff --git a/public/theme/common/flags/tj.png b/htdocs/theme/common/flags/tj.png
similarity index 100%
rename from public/theme/common/flags/tj.png
rename to htdocs/theme/common/flags/tj.png
diff --git a/public/theme/common/flags/tk.png b/htdocs/theme/common/flags/tk.png
similarity index 100%
rename from public/theme/common/flags/tk.png
rename to htdocs/theme/common/flags/tk.png
diff --git a/public/theme/common/flags/tl.png b/htdocs/theme/common/flags/tl.png
similarity index 100%
rename from public/theme/common/flags/tl.png
rename to htdocs/theme/common/flags/tl.png
diff --git a/public/theme/common/flags/tm.png b/htdocs/theme/common/flags/tm.png
similarity index 100%
rename from public/theme/common/flags/tm.png
rename to htdocs/theme/common/flags/tm.png
diff --git a/public/theme/common/flags/tn.png b/htdocs/theme/common/flags/tn.png
similarity index 100%
rename from public/theme/common/flags/tn.png
rename to htdocs/theme/common/flags/tn.png
diff --git a/public/theme/common/flags/to.png b/htdocs/theme/common/flags/to.png
similarity index 100%
rename from public/theme/common/flags/to.png
rename to htdocs/theme/common/flags/to.png
diff --git a/public/theme/common/flags/tr.png b/htdocs/theme/common/flags/tr.png
similarity index 100%
rename from public/theme/common/flags/tr.png
rename to htdocs/theme/common/flags/tr.png
diff --git a/public/theme/common/flags/trans.png b/htdocs/theme/common/flags/trans.png
similarity index 100%
rename from public/theme/common/flags/trans.png
rename to htdocs/theme/common/flags/trans.png
diff --git a/public/theme/common/flags/tt.png b/htdocs/theme/common/flags/tt.png
similarity index 100%
rename from public/theme/common/flags/tt.png
rename to htdocs/theme/common/flags/tt.png
diff --git a/public/theme/common/flags/tv.png b/htdocs/theme/common/flags/tv.png
similarity index 100%
rename from public/theme/common/flags/tv.png
rename to htdocs/theme/common/flags/tv.png
diff --git a/public/theme/common/flags/tw.png b/htdocs/theme/common/flags/tw.png
similarity index 100%
rename from public/theme/common/flags/tw.png
rename to htdocs/theme/common/flags/tw.png
diff --git a/public/theme/common/flags/tz.png b/htdocs/theme/common/flags/tz.png
similarity index 100%
rename from public/theme/common/flags/tz.png
rename to htdocs/theme/common/flags/tz.png
diff --git a/public/theme/common/flags/ua.png b/htdocs/theme/common/flags/ua.png
similarity index 100%
rename from public/theme/common/flags/ua.png
rename to htdocs/theme/common/flags/ua.png
diff --git a/public/theme/common/flags/ug.png b/htdocs/theme/common/flags/ug.png
similarity index 100%
rename from public/theme/common/flags/ug.png
rename to htdocs/theme/common/flags/ug.png
diff --git a/public/theme/common/flags/uk.png b/htdocs/theme/common/flags/uk.png
similarity index 100%
rename from public/theme/common/flags/uk.png
rename to htdocs/theme/common/flags/uk.png
diff --git a/public/theme/common/flags/um.png b/htdocs/theme/common/flags/um.png
similarity index 100%
rename from public/theme/common/flags/um.png
rename to htdocs/theme/common/flags/um.png
diff --git a/public/theme/common/flags/us.png b/htdocs/theme/common/flags/us.png
similarity index 100%
rename from public/theme/common/flags/us.png
rename to htdocs/theme/common/flags/us.png
diff --git a/public/theme/common/flags/uy.png b/htdocs/theme/common/flags/uy.png
similarity index 100%
rename from public/theme/common/flags/uy.png
rename to htdocs/theme/common/flags/uy.png
diff --git a/public/theme/common/flags/uz.png b/htdocs/theme/common/flags/uz.png
similarity index 100%
rename from public/theme/common/flags/uz.png
rename to htdocs/theme/common/flags/uz.png
diff --git a/public/theme/common/flags/va.png b/htdocs/theme/common/flags/va.png
similarity index 100%
rename from public/theme/common/flags/va.png
rename to htdocs/theme/common/flags/va.png
diff --git a/public/theme/common/flags/vc.png b/htdocs/theme/common/flags/vc.png
similarity index 100%
rename from public/theme/common/flags/vc.png
rename to htdocs/theme/common/flags/vc.png
diff --git a/public/theme/common/flags/ve.png b/htdocs/theme/common/flags/ve.png
similarity index 100%
rename from public/theme/common/flags/ve.png
rename to htdocs/theme/common/flags/ve.png
diff --git a/public/theme/common/flags/vg.png b/htdocs/theme/common/flags/vg.png
similarity index 100%
rename from public/theme/common/flags/vg.png
rename to htdocs/theme/common/flags/vg.png
diff --git a/public/theme/common/flags/vi.png b/htdocs/theme/common/flags/vi.png
similarity index 100%
rename from public/theme/common/flags/vi.png
rename to htdocs/theme/common/flags/vi.png
diff --git a/public/theme/common/flags/vn.png b/htdocs/theme/common/flags/vn.png
similarity index 100%
rename from public/theme/common/flags/vn.png
rename to htdocs/theme/common/flags/vn.png
diff --git a/public/theme/common/flags/vu.png b/htdocs/theme/common/flags/vu.png
similarity index 100%
rename from public/theme/common/flags/vu.png
rename to htdocs/theme/common/flags/vu.png
diff --git a/public/theme/common/flags/wales.png b/htdocs/theme/common/flags/wales.png
similarity index 100%
rename from public/theme/common/flags/wales.png
rename to htdocs/theme/common/flags/wales.png
diff --git a/public/theme/common/flags/wf.png b/htdocs/theme/common/flags/wf.png
similarity index 100%
rename from public/theme/common/flags/wf.png
rename to htdocs/theme/common/flags/wf.png
diff --git a/public/theme/common/flags/ws.png b/htdocs/theme/common/flags/ws.png
similarity index 100%
rename from public/theme/common/flags/ws.png
rename to htdocs/theme/common/flags/ws.png
diff --git a/public/theme/common/flags/ye.png b/htdocs/theme/common/flags/ye.png
similarity index 100%
rename from public/theme/common/flags/ye.png
rename to htdocs/theme/common/flags/ye.png
diff --git a/public/theme/common/flags/yt.png b/htdocs/theme/common/flags/yt.png
similarity index 100%
rename from public/theme/common/flags/yt.png
rename to htdocs/theme/common/flags/yt.png
diff --git a/public/theme/common/flags/za.png b/htdocs/theme/common/flags/za.png
similarity index 100%
rename from public/theme/common/flags/za.png
rename to htdocs/theme/common/flags/za.png
diff --git a/public/theme/common/flags/zm.png b/htdocs/theme/common/flags/zm.png
similarity index 100%
rename from public/theme/common/flags/zm.png
rename to htdocs/theme/common/flags/zm.png
diff --git a/public/theme/common/flags/zw.png b/htdocs/theme/common/flags/zw.png
similarity index 100%
rename from public/theme/common/flags/zw.png
rename to htdocs/theme/common/flags/zw.png
diff --git a/public/theme/common/folder-new.png b/htdocs/theme/common/folder-new.png
similarity index 100%
rename from public/theme/common/folder-new.png
rename to htdocs/theme/common/folder-new.png
diff --git a/public/theme/common/gmap.png b/htdocs/theme/common/gmap.png
similarity index 100%
rename from public/theme/common/gmap.png
rename to htdocs/theme/common/gmap.png
diff --git a/public/theme/common/help.png b/htdocs/theme/common/help.png
similarity index 100%
rename from public/theme/common/help.png
rename to htdocs/theme/common/help.png
diff --git a/public/theme/common/ical.gif b/htdocs/theme/common/ical.gif
similarity index 100%
rename from public/theme/common/ical.gif
rename to htdocs/theme/common/ical.gif
diff --git a/public/theme/common/index.html b/htdocs/theme/common/index.html
similarity index 100%
rename from public/theme/common/index.html
rename to htdocs/theme/common/index.html
diff --git a/public/theme/common/information.png b/htdocs/theme/common/information.png
similarity index 100%
rename from public/theme/common/information.png
rename to htdocs/theme/common/information.png
diff --git a/public/theme/common/logo_cerfa.png b/htdocs/theme/common/logo_cerfa.png
similarity index 100%
rename from public/theme/common/logo_cerfa.png
rename to htdocs/theme/common/logo_cerfa.png
diff --git a/public/theme/common/mime/archive.png b/htdocs/theme/common/mime/archive.png
similarity index 100%
rename from public/theme/common/mime/archive.png
rename to htdocs/theme/common/mime/archive.png
diff --git a/public/theme/common/mime/audio.png b/htdocs/theme/common/mime/audio.png
similarity index 100%
rename from public/theme/common/mime/audio.png
rename to htdocs/theme/common/mime/audio.png
diff --git a/public/theme/common/mime/css.png b/htdocs/theme/common/mime/css.png
similarity index 100%
rename from public/theme/common/mime/css.png
rename to htdocs/theme/common/mime/css.png
diff --git a/public/theme/common/mime/doc.png b/htdocs/theme/common/mime/doc.png
similarity index 100%
rename from public/theme/common/mime/doc.png
rename to htdocs/theme/common/mime/doc.png
diff --git a/public/theme/common/mime/dotnet.png b/htdocs/theme/common/mime/dotnet.png
similarity index 100%
rename from public/theme/common/mime/dotnet.png
rename to htdocs/theme/common/mime/dotnet.png
diff --git a/public/theme/common/mime/encrypt.png b/htdocs/theme/common/mime/encrypt.png
similarity index 100%
rename from public/theme/common/mime/encrypt.png
rename to htdocs/theme/common/mime/encrypt.png
diff --git a/public/theme/common/mime/error.png b/htdocs/theme/common/mime/error.png
similarity index 100%
rename from public/theme/common/mime/error.png
rename to htdocs/theme/common/mime/error.png
diff --git a/public/theme/common/mime/flash.png b/htdocs/theme/common/mime/flash.png
similarity index 100%
rename from public/theme/common/mime/flash.png
rename to htdocs/theme/common/mime/flash.png
diff --git a/public/theme/common/mime/glasses.png b/htdocs/theme/common/mime/glasses.png
similarity index 100%
rename from public/theme/common/mime/glasses.png
rename to htdocs/theme/common/mime/glasses.png
diff --git a/public/theme/common/mime/html.png b/htdocs/theme/common/mime/html.png
similarity index 100%
rename from public/theme/common/mime/html.png
rename to htdocs/theme/common/mime/html.png
diff --git a/public/theme/common/mime/image.png b/htdocs/theme/common/mime/image.png
similarity index 100%
rename from public/theme/common/mime/image.png
rename to htdocs/theme/common/mime/image.png
diff --git a/public/theme/common/mime/index.html b/htdocs/theme/common/mime/index.html
similarity index 100%
rename from public/theme/common/mime/index.html
rename to htdocs/theme/common/mime/index.html
diff --git a/public/theme/common/mime/jnlp.png b/htdocs/theme/common/mime/jnlp.png
similarity index 100%
rename from public/theme/common/mime/jnlp.png
rename to htdocs/theme/common/mime/jnlp.png
diff --git a/public/theme/common/mime/jscript.png b/htdocs/theme/common/mime/jscript.png
similarity index 100%
rename from public/theme/common/mime/jscript.png
rename to htdocs/theme/common/mime/jscript.png
diff --git a/public/theme/common/mime/library.png b/htdocs/theme/common/mime/library.png
similarity index 100%
rename from public/theme/common/mime/library.png
rename to htdocs/theme/common/mime/library.png
diff --git a/public/theme/common/mime/lit.png b/htdocs/theme/common/mime/lit.png
similarity index 100%
rename from public/theme/common/mime/lit.png
rename to htdocs/theme/common/mime/lit.png
diff --git a/public/theme/common/mime/mdb.png b/htdocs/theme/common/mime/mdb.png
similarity index 100%
rename from public/theme/common/mime/mdb.png
rename to htdocs/theme/common/mime/mdb.png
diff --git a/public/theme/common/mime/notavailable.png b/htdocs/theme/common/mime/notavailable.png
similarity index 100%
rename from public/theme/common/mime/notavailable.png
rename to htdocs/theme/common/mime/notavailable.png
diff --git a/public/theme/common/mime/ooffice.png b/htdocs/theme/common/mime/ooffice.png
similarity index 100%
rename from public/theme/common/mime/ooffice.png
rename to htdocs/theme/common/mime/ooffice.png
diff --git a/public/theme/common/mime/other.png b/htdocs/theme/common/mime/other.png
similarity index 100%
rename from public/theme/common/mime/other.png
rename to htdocs/theme/common/mime/other.png
diff --git a/public/theme/common/mime/page.png b/htdocs/theme/common/mime/page.png
similarity index 100%
rename from public/theme/common/mime/page.png
rename to htdocs/theme/common/mime/page.png
diff --git a/public/theme/common/mime/pdf.png b/htdocs/theme/common/mime/pdf.png
similarity index 100%
rename from public/theme/common/mime/pdf.png
rename to htdocs/theme/common/mime/pdf.png
diff --git a/public/theme/common/mime/php.png b/htdocs/theme/common/mime/php.png
similarity index 100%
rename from public/theme/common/mime/php.png
rename to htdocs/theme/common/mime/php.png
diff --git a/public/theme/common/mime/pl.png b/htdocs/theme/common/mime/pl.png
similarity index 100%
rename from public/theme/common/mime/pl.png
rename to htdocs/theme/common/mime/pl.png
diff --git a/public/theme/common/mime/ppt.png b/htdocs/theme/common/mime/ppt.png
similarity index 100%
rename from public/theme/common/mime/ppt.png
rename to htdocs/theme/common/mime/ppt.png
diff --git a/public/theme/common/mime/readme.txt b/htdocs/theme/common/mime/readme.txt
similarity index 100%
rename from public/theme/common/mime/readme.txt
rename to htdocs/theme/common/mime/readme.txt
diff --git a/public/theme/common/mime/rss.png b/htdocs/theme/common/mime/rss.png
similarity index 100%
rename from public/theme/common/mime/rss.png
rename to htdocs/theme/common/mime/rss.png
diff --git a/public/theme/common/mime/script.png b/htdocs/theme/common/mime/script.png
similarity index 100%
rename from public/theme/common/mime/script.png
rename to htdocs/theme/common/mime/script.png
diff --git a/public/theme/common/mime/svg.png b/htdocs/theme/common/mime/svg.png
similarity index 100%
rename from public/theme/common/mime/svg.png
rename to htdocs/theme/common/mime/svg.png
diff --git a/public/theme/common/mime/text.png b/htdocs/theme/common/mime/text.png
similarity index 100%
rename from public/theme/common/mime/text.png
rename to htdocs/theme/common/mime/text.png
diff --git a/public/theme/common/mime/ttf.png b/htdocs/theme/common/mime/ttf.png
similarity index 100%
rename from public/theme/common/mime/ttf.png
rename to htdocs/theme/common/mime/ttf.png
diff --git a/public/theme/common/mime/unknown.png b/htdocs/theme/common/mime/unknown.png
similarity index 100%
rename from public/theme/common/mime/unknown.png
rename to htdocs/theme/common/mime/unknown.png
diff --git a/public/theme/common/mime/video.png b/htdocs/theme/common/mime/video.png
similarity index 100%
rename from public/theme/common/mime/video.png
rename to htdocs/theme/common/mime/video.png
diff --git a/public/theme/common/mime/xls.png b/htdocs/theme/common/mime/xls.png
similarity index 100%
rename from public/theme/common/mime/xls.png
rename to htdocs/theme/common/mime/xls.png
diff --git a/public/theme/common/paypal.png b/htdocs/theme/common/paypal.png
similarity index 100%
rename from public/theme/common/paypal.png
rename to htdocs/theme/common/paypal.png
diff --git a/public/theme/common/redstar.png b/htdocs/theme/common/redstar.png
similarity index 100%
rename from public/theme/common/redstar.png
rename to htdocs/theme/common/redstar.png
diff --git a/public/theme/common/rss.gif b/htdocs/theme/common/rss.gif
similarity index 100%
rename from public/theme/common/rss.gif
rename to htdocs/theme/common/rss.gif
diff --git a/public/theme/common/skype_callbutton.png b/htdocs/theme/common/skype_callbutton.png
similarity index 100%
rename from public/theme/common/skype_callbutton.png
rename to htdocs/theme/common/skype_callbutton.png
diff --git a/public/theme/common/skype_chatbutton.png b/htdocs/theme/common/skype_chatbutton.png
similarity index 100%
rename from public/theme/common/skype_chatbutton.png
rename to htdocs/theme/common/skype_chatbutton.png
diff --git a/public/theme/common/star.png b/htdocs/theme/common/star.png
similarity index 100%
rename from public/theme/common/star.png
rename to htdocs/theme/common/star.png
diff --git a/public/theme/common/transform-crop-and-resize.png b/htdocs/theme/common/transform-crop-and-resize.png
similarity index 100%
rename from public/theme/common/transform-crop-and-resize.png
rename to htdocs/theme/common/transform-crop-and-resize.png
diff --git a/public/theme/common/transparent.png b/htdocs/theme/common/transparent.png
similarity index 100%
rename from public/theme/common/transparent.png
rename to htdocs/theme/common/transparent.png
diff --git a/public/theme/common/treemenu/base.gif b/htdocs/theme/common/treemenu/base.gif
similarity index 100%
rename from public/theme/common/treemenu/base.gif
rename to htdocs/theme/common/treemenu/base.gif
diff --git a/public/theme/common/treemenu/branch.gif b/htdocs/theme/common/treemenu/branch.gif
similarity index 100%
rename from public/theme/common/treemenu/branch.gif
rename to htdocs/theme/common/treemenu/branch.gif
diff --git a/public/theme/common/treemenu/branchbottom.gif b/htdocs/theme/common/treemenu/branchbottom.gif
similarity index 100%
rename from public/theme/common/treemenu/branchbottom.gif
rename to htdocs/theme/common/treemenu/branchbottom.gif
diff --git a/public/theme/common/treemenu/branchtop.gif b/htdocs/theme/common/treemenu/branchtop.gif
similarity index 100%
rename from public/theme/common/treemenu/branchtop.gif
rename to htdocs/theme/common/treemenu/branchtop.gif
diff --git a/public/theme/common/treemenu/folder-expanded.gif b/htdocs/theme/common/treemenu/folder-expanded.gif
similarity index 100%
rename from public/theme/common/treemenu/folder-expanded.gif
rename to htdocs/theme/common/treemenu/folder-expanded.gif
diff --git a/public/theme/common/treemenu/folder.gif b/htdocs/theme/common/treemenu/folder.gif
similarity index 100%
rename from public/theme/common/treemenu/folder.gif
rename to htdocs/theme/common/treemenu/folder.gif
diff --git a/public/theme/common/treemenu/folder2-expanded.png b/htdocs/theme/common/treemenu/folder2-expanded.png
similarity index 100%
rename from public/theme/common/treemenu/folder2-expanded.png
rename to htdocs/theme/common/treemenu/folder2-expanded.png
diff --git a/public/theme/common/treemenu/folder2.png b/htdocs/theme/common/treemenu/folder2.png
similarity index 100%
rename from public/theme/common/treemenu/folder2.png
rename to htdocs/theme/common/treemenu/folder2.png
diff --git a/public/theme/common/treemenu/imgfolder.gif b/htdocs/theme/common/treemenu/imgfolder.gif
similarity index 100%
rename from public/theme/common/treemenu/imgfolder.gif
rename to htdocs/theme/common/treemenu/imgfolder.gif
diff --git a/public/theme/common/treemenu/index.html b/htdocs/theme/common/treemenu/index.html
similarity index 100%
rename from public/theme/common/treemenu/index.html
rename to htdocs/theme/common/treemenu/index.html
diff --git a/public/theme/common/treemenu/line.gif b/htdocs/theme/common/treemenu/line.gif
similarity index 100%
rename from public/theme/common/treemenu/line.gif
rename to htdocs/theme/common/treemenu/line.gif
diff --git a/public/theme/common/treemenu/linebottom.gif b/htdocs/theme/common/treemenu/linebottom.gif
similarity index 100%
rename from public/theme/common/treemenu/linebottom.gif
rename to htdocs/theme/common/treemenu/linebottom.gif
diff --git a/public/theme/common/treemenu/minus.gif b/htdocs/theme/common/treemenu/minus.gif
similarity index 100%
rename from public/theme/common/treemenu/minus.gif
rename to htdocs/theme/common/treemenu/minus.gif
diff --git a/public/theme/common/treemenu/minusbottom.gif b/htdocs/theme/common/treemenu/minusbottom.gif
similarity index 100%
rename from public/theme/common/treemenu/minusbottom.gif
rename to htdocs/theme/common/treemenu/minusbottom.gif
diff --git a/public/theme/common/treemenu/minustop.gif b/htdocs/theme/common/treemenu/minustop.gif
similarity index 100%
rename from public/theme/common/treemenu/minustop.gif
rename to htdocs/theme/common/treemenu/minustop.gif
diff --git a/public/theme/common/treemenu/minustop2.gif b/htdocs/theme/common/treemenu/minustop2.gif
similarity index 100%
rename from public/theme/common/treemenu/minustop2.gif
rename to htdocs/theme/common/treemenu/minustop2.gif
diff --git a/public/theme/common/treemenu/minustop3.gif b/htdocs/theme/common/treemenu/minustop3.gif
similarity index 100%
rename from public/theme/common/treemenu/minustop3.gif
rename to htdocs/theme/common/treemenu/minustop3.gif
diff --git a/public/theme/common/treemenu/page.gif b/htdocs/theme/common/treemenu/page.gif
similarity index 100%
rename from public/theme/common/treemenu/page.gif
rename to htdocs/theme/common/treemenu/page.gif
diff --git a/public/theme/common/treemenu/plus.gif b/htdocs/theme/common/treemenu/plus.gif
similarity index 100%
rename from public/theme/common/treemenu/plus.gif
rename to htdocs/theme/common/treemenu/plus.gif
diff --git a/public/theme/common/treemenu/plusbottom.gif b/htdocs/theme/common/treemenu/plusbottom.gif
similarity index 100%
rename from public/theme/common/treemenu/plusbottom.gif
rename to htdocs/theme/common/treemenu/plusbottom.gif
diff --git a/public/theme/common/treemenu/plustop.gif b/htdocs/theme/common/treemenu/plustop.gif
similarity index 100%
rename from public/theme/common/treemenu/plustop.gif
rename to htdocs/theme/common/treemenu/plustop.gif
diff --git a/public/theme/common/treemenu/plustop2.gif b/htdocs/theme/common/treemenu/plustop2.gif
similarity index 100%
rename from public/theme/common/treemenu/plustop2.gif
rename to htdocs/theme/common/treemenu/plustop2.gif
diff --git a/public/theme/common/treemenu/plustop3.gif b/htdocs/theme/common/treemenu/plustop3.gif
similarity index 100%
rename from public/theme/common/treemenu/plustop3.gif
rename to htdocs/theme/common/treemenu/plustop3.gif
diff --git a/public/theme/common/treemenu/trash.gif b/htdocs/theme/common/treemenu/trash.gif
similarity index 100%
rename from public/theme/common/treemenu/trash.gif
rename to htdocs/theme/common/treemenu/trash.gif
diff --git a/public/theme/common/vcal.gif b/htdocs/theme/common/vcal.gif
similarity index 100%
rename from public/theme/common/vcal.gif
rename to htdocs/theme/common/vcal.gif
diff --git a/public/theme/common/view-refresh.png b/htdocs/theme/common/view-refresh.png
similarity index 100%
rename from public/theme/common/view-refresh.png
rename to htdocs/theme/common/view-refresh.png
diff --git a/public/theme/dolibarr.png b/htdocs/theme/dolibarr.png
similarity index 100%
rename from public/theme/dolibarr.png
rename to htdocs/theme/dolibarr.png
diff --git a/public/theme/dolibarr_logo.png b/htdocs/theme/dolibarr_logo.png
similarity index 100%
rename from public/theme/dolibarr_logo.png
rename to htdocs/theme/dolibarr_logo.png
diff --git a/public/theme/dolibarr_preferred_partner_int.png b/htdocs/theme/dolibarr_preferred_partner_int.png
similarity index 100%
rename from public/theme/dolibarr_preferred_partner_int.png
rename to htdocs/theme/dolibarr_preferred_partner_int.png
diff --git a/public/theme/doliforge_logo.png b/htdocs/theme/doliforge_logo.png
similarity index 100%
rename from public/theme/doliforge_logo.png
rename to htdocs/theme/doliforge_logo.png
diff --git a/public/theme/dolistore_logo.png b/htdocs/theme/dolistore_logo.png
similarity index 100%
rename from public/theme/dolistore_logo.png
rename to htdocs/theme/dolistore_logo.png
diff --git a/public/theme/eldy/.gitignore b/htdocs/theme/eldy/.gitignore
similarity index 100%
rename from public/theme/eldy/.gitignore
rename to htdocs/theme/eldy/.gitignore
diff --git a/public/theme/eldy/AUTHOR b/htdocs/theme/eldy/AUTHOR
similarity index 100%
rename from public/theme/eldy/AUTHOR
rename to htdocs/theme/eldy/AUTHOR
diff --git a/public/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js
similarity index 100%
rename from public/theme/eldy/ckeditor/config.js
rename to htdocs/theme/eldy/ckeditor/config.js
diff --git a/public/theme/eldy/ckeditor/index.html b/htdocs/theme/eldy/ckeditor/index.html
similarity index 100%
rename from public/theme/eldy/ckeditor/index.html
rename to htdocs/theme/eldy/ckeditor/index.html
diff --git a/public/theme/eldy/graph-color.php b/htdocs/theme/eldy/graph-color.php
similarity index 100%
rename from public/theme/eldy/graph-color.php
rename to htdocs/theme/eldy/graph-color.php
diff --git a/public/theme/eldy/img/1downarrow.png b/htdocs/theme/eldy/img/1downarrow.png
similarity index 100%
rename from public/theme/eldy/img/1downarrow.png
rename to htdocs/theme/eldy/img/1downarrow.png
diff --git a/public/theme/eldy/img/1downarrow_selected.png b/htdocs/theme/eldy/img/1downarrow_selected.png
similarity index 100%
rename from public/theme/eldy/img/1downarrow_selected.png
rename to htdocs/theme/eldy/img/1downarrow_selected.png
diff --git a/public/theme/eldy/img/1leftarrow.png b/htdocs/theme/eldy/img/1leftarrow.png
similarity index 100%
rename from public/theme/eldy/img/1leftarrow.png
rename to htdocs/theme/eldy/img/1leftarrow.png
diff --git a/public/theme/eldy/img/1leftarrow_selected.png b/htdocs/theme/eldy/img/1leftarrow_selected.png
similarity index 100%
rename from public/theme/eldy/img/1leftarrow_selected.png
rename to htdocs/theme/eldy/img/1leftarrow_selected.png
diff --git a/public/theme/eldy/img/1rightarrow.png b/htdocs/theme/eldy/img/1rightarrow.png
similarity index 100%
rename from public/theme/eldy/img/1rightarrow.png
rename to htdocs/theme/eldy/img/1rightarrow.png
diff --git a/public/theme/eldy/img/1rightarrow_selected.png b/htdocs/theme/eldy/img/1rightarrow_selected.png
similarity index 100%
rename from public/theme/eldy/img/1rightarrow_selected.png
rename to htdocs/theme/eldy/img/1rightarrow_selected.png
diff --git a/public/theme/eldy/img/1uparrow.png b/htdocs/theme/eldy/img/1uparrow.png
similarity index 100%
rename from public/theme/eldy/img/1uparrow.png
rename to htdocs/theme/eldy/img/1uparrow.png
diff --git a/public/theme/eldy/img/1uparrow_selected.png b/htdocs/theme/eldy/img/1uparrow_selected.png
similarity index 100%
rename from public/theme/eldy/img/1uparrow_selected.png
rename to htdocs/theme/eldy/img/1uparrow_selected.png
diff --git a/public/theme/eldy/img/addfile.png b/htdocs/theme/eldy/img/addfile.png
similarity index 100%
rename from public/theme/eldy/img/addfile.png
rename to htdocs/theme/eldy/img/addfile.png
diff --git a/public/theme/eldy/img/background.png b/htdocs/theme/eldy/img/background.png
similarity index 100%
rename from public/theme/eldy/img/background.png
rename to htdocs/theme/eldy/img/background.png
diff --git a/public/theme/eldy/img/bg-bas-rubrique.png b/htdocs/theme/eldy/img/bg-bas-rubrique.png
similarity index 100%
rename from public/theme/eldy/img/bg-bas-rubrique.png
rename to htdocs/theme/eldy/img/bg-bas-rubrique.png
diff --git a/public/theme/eldy/img/bg-rubrique.png b/htdocs/theme/eldy/img/bg-rubrique.png
similarity index 100%
rename from public/theme/eldy/img/bg-rubrique.png
rename to htdocs/theme/eldy/img/bg-rubrique.png
diff --git a/public/theme/eldy/img/bg-titre-rubrique.png b/htdocs/theme/eldy/img/bg-titre-rubrique.png
similarity index 100%
rename from public/theme/eldy/img/bg-titre-rubrique.png
rename to htdocs/theme/eldy/img/bg-titre-rubrique.png
diff --git a/public/theme/eldy/img/button_bg.png b/htdocs/theme/eldy/img/button_bg.png
similarity index 100%
rename from public/theme/eldy/img/button_bg.png
rename to htdocs/theme/eldy/img/button_bg.png
diff --git a/public/theme/eldy/img/button_edit.png b/htdocs/theme/eldy/img/button_edit.png
similarity index 100%
rename from public/theme/eldy/img/button_edit.png
rename to htdocs/theme/eldy/img/button_edit.png
diff --git a/public/theme/eldy/img/calc.png b/htdocs/theme/eldy/img/calc.png
similarity index 100%
rename from public/theme/eldy/img/calc.png
rename to htdocs/theme/eldy/img/calc.png
diff --git a/public/theme/eldy/img/calendar.png b/htdocs/theme/eldy/img/calendar.png
similarity index 100%
rename from public/theme/eldy/img/calendar.png
rename to htdocs/theme/eldy/img/calendar.png
diff --git a/public/theme/eldy/img/call.png b/htdocs/theme/eldy/img/call.png
similarity index 100%
rename from public/theme/eldy/img/call.png
rename to htdocs/theme/eldy/img/call.png
diff --git a/public/theme/eldy/img/call_out.png b/htdocs/theme/eldy/img/call_out.png
similarity index 100%
rename from public/theme/eldy/img/call_out.png
rename to htdocs/theme/eldy/img/call_out.png
diff --git a/public/theme/eldy/img/close.png b/htdocs/theme/eldy/img/close.png
similarity index 100%
rename from public/theme/eldy/img/close.png
rename to htdocs/theme/eldy/img/close.png
diff --git a/public/theme/eldy/img/close_title.png b/htdocs/theme/eldy/img/close_title.png
similarity index 100%
rename from public/theme/eldy/img/close_title.png
rename to htdocs/theme/eldy/img/close_title.png
diff --git a/public/theme/eldy/img/credit_card.png b/htdocs/theme/eldy/img/credit_card.png
similarity index 100%
rename from public/theme/eldy/img/credit_card.png
rename to htdocs/theme/eldy/img/credit_card.png
diff --git a/public/theme/eldy/img/delete.png b/htdocs/theme/eldy/img/delete.png
similarity index 100%
rename from public/theme/eldy/img/delete.png
rename to htdocs/theme/eldy/img/delete.png
diff --git a/public/theme/eldy/img/detail.png b/htdocs/theme/eldy/img/detail.png
similarity index 100%
rename from public/theme/eldy/img/detail.png
rename to htdocs/theme/eldy/img/detail.png
diff --git a/public/theme/eldy/img/disable.png b/htdocs/theme/eldy/img/disable.png
similarity index 100%
rename from public/theme/eldy/img/disable.png
rename to htdocs/theme/eldy/img/disable.png
diff --git a/public/theme/eldy/img/edit.png b/htdocs/theme/eldy/img/edit.png
similarity index 100%
rename from public/theme/eldy/img/edit.png
rename to htdocs/theme/eldy/img/edit.png
diff --git a/public/theme/eldy/img/edit_add.png b/htdocs/theme/eldy/img/edit_add.png
similarity index 100%
rename from public/theme/eldy/img/edit_add.png
rename to htdocs/theme/eldy/img/edit_add.png
diff --git a/public/theme/eldy/img/edit_remove.png b/htdocs/theme/eldy/img/edit_remove.png
similarity index 100%
rename from public/theme/eldy/img/edit_remove.png
rename to htdocs/theme/eldy/img/edit_remove.png
diff --git a/public/theme/eldy/img/editdelete.png b/htdocs/theme/eldy/img/editdelete.png
similarity index 100%
rename from public/theme/eldy/img/editdelete.png
rename to htdocs/theme/eldy/img/editdelete.png
diff --git a/public/theme/eldy/img/error.png b/htdocs/theme/eldy/img/error.png
similarity index 100%
rename from public/theme/eldy/img/error.png
rename to htdocs/theme/eldy/img/error.png
diff --git a/public/theme/eldy/img/external.png b/htdocs/theme/eldy/img/external.png
similarity index 100%
rename from public/theme/eldy/img/external.png
rename to htdocs/theme/eldy/img/external.png
diff --git a/public/theme/eldy/img/favicon.ico b/htdocs/theme/eldy/img/favicon.ico
similarity index 100%
rename from public/theme/eldy/img/favicon.ico
rename to htdocs/theme/eldy/img/favicon.ico
diff --git a/public/theme/eldy/img/file.png b/htdocs/theme/eldy/img/file.png
similarity index 100%
rename from public/theme/eldy/img/file.png
rename to htdocs/theme/eldy/img/file.png
diff --git a/public/theme/eldy/img/filenew.png b/htdocs/theme/eldy/img/filenew.png
similarity index 100%
rename from public/theme/eldy/img/filenew.png
rename to htdocs/theme/eldy/img/filenew.png
diff --git a/public/theme/eldy/img/filter.png b/htdocs/theme/eldy/img/filter.png
similarity index 100%
rename from public/theme/eldy/img/filter.png
rename to htdocs/theme/eldy/img/filter.png
diff --git a/public/theme/eldy/img/folder-open.png b/htdocs/theme/eldy/img/folder-open.png
similarity index 100%
rename from public/theme/eldy/img/folder-open.png
rename to htdocs/theme/eldy/img/folder-open.png
diff --git a/public/theme/eldy/img/folder.png b/htdocs/theme/eldy/img/folder.png
similarity index 100%
rename from public/theme/eldy/img/folder.png
rename to htdocs/theme/eldy/img/folder.png
diff --git a/public/theme/eldy/img/gradient.gif b/htdocs/theme/eldy/img/gradient.gif
similarity index 100%
rename from public/theme/eldy/img/gradient.gif
rename to htdocs/theme/eldy/img/gradient.gif
diff --git a/public/theme/eldy/img/grip.png b/htdocs/theme/eldy/img/grip.png
similarity index 100%
rename from public/theme/eldy/img/grip.png
rename to htdocs/theme/eldy/img/grip.png
diff --git a/public/theme/eldy/img/grip_title.png b/htdocs/theme/eldy/img/grip_title.png
similarity index 100%
rename from public/theme/eldy/img/grip_title.png
rename to htdocs/theme/eldy/img/grip_title.png
diff --git a/public/theme/eldy/img/headbg.jpg b/htdocs/theme/eldy/img/headbg.jpg
similarity index 100%
rename from public/theme/eldy/img/headbg.jpg
rename to htdocs/theme/eldy/img/headbg.jpg
diff --git a/public/theme/eldy/img/headbg2.jpg b/htdocs/theme/eldy/img/headbg2.jpg
similarity index 100%
rename from public/theme/eldy/img/headbg2.jpg
rename to htdocs/theme/eldy/img/headbg2.jpg
diff --git a/public/theme/eldy/img/help.png b/htdocs/theme/eldy/img/help.png
similarity index 100%
rename from public/theme/eldy/img/help.png
rename to htdocs/theme/eldy/img/help.png
diff --git a/public/theme/eldy/img/helpdoc.png b/htdocs/theme/eldy/img/helpdoc.png
similarity index 100%
rename from public/theme/eldy/img/helpdoc.png
rename to htdocs/theme/eldy/img/helpdoc.png
diff --git a/public/theme/eldy/img/helpdoc_top.png b/htdocs/theme/eldy/img/helpdoc_top.png
similarity index 100%
rename from public/theme/eldy/img/helpdoc_top.png
rename to htdocs/theme/eldy/img/helpdoc_top.png
diff --git a/public/theme/eldy/img/high.png b/htdocs/theme/eldy/img/high.png
similarity index 100%
rename from public/theme/eldy/img/high.png
rename to htdocs/theme/eldy/img/high.png
diff --git a/public/theme/eldy/img/history.png b/htdocs/theme/eldy/img/history.png
similarity index 100%
rename from public/theme/eldy/img/history.png
rename to htdocs/theme/eldy/img/history.png
diff --git a/public/theme/eldy/img/index.html b/htdocs/theme/eldy/img/index.html
similarity index 100%
rename from public/theme/eldy/img/index.html
rename to htdocs/theme/eldy/img/index.html
diff --git a/public/theme/eldy/img/info.png b/htdocs/theme/eldy/img/info.png
similarity index 100%
rename from public/theme/eldy/img/info.png
rename to htdocs/theme/eldy/img/info.png
diff --git a/public/theme/eldy/img/info_black.png b/htdocs/theme/eldy/img/info_black.png
similarity index 100%
rename from public/theme/eldy/img/info_black.png
rename to htdocs/theme/eldy/img/info_black.png
diff --git a/public/theme/eldy/img/list.png b/htdocs/theme/eldy/img/list.png
similarity index 100%
rename from public/theme/eldy/img/list.png
rename to htdocs/theme/eldy/img/list.png
diff --git a/public/theme/eldy/img/liste_titre.png b/htdocs/theme/eldy/img/liste_titre.png
similarity index 100%
rename from public/theme/eldy/img/liste_titre.png
rename to htdocs/theme/eldy/img/liste_titre.png
diff --git a/public/theme/eldy/img/liste_titre2.png b/htdocs/theme/eldy/img/liste_titre2.png
similarity index 100%
rename from public/theme/eldy/img/liste_titre2.png
rename to htdocs/theme/eldy/img/liste_titre2.png
diff --git a/public/theme/eldy/img/listlight.png b/htdocs/theme/eldy/img/listlight.png
similarity index 100%
rename from public/theme/eldy/img/listlight.png
rename to htdocs/theme/eldy/img/listlight.png
diff --git a/public/theme/eldy/img/lock.png b/htdocs/theme/eldy/img/lock.png
similarity index 100%
rename from public/theme/eldy/img/lock.png
rename to htdocs/theme/eldy/img/lock.png
diff --git a/public/theme/eldy/img/login_background.png b/htdocs/theme/eldy/img/login_background.png
similarity index 100%
rename from public/theme/eldy/img/login_background.png
rename to htdocs/theme/eldy/img/login_background.png
diff --git a/public/theme/eldy/img/logo_setup.svg b/htdocs/theme/eldy/img/logo_setup.svg
similarity index 100%
rename from public/theme/eldy/img/logo_setup.svg
rename to htdocs/theme/eldy/img/logo_setup.svg
diff --git a/public/theme/eldy/img/logout.png b/htdocs/theme/eldy/img/logout.png
similarity index 100%
rename from public/theme/eldy/img/logout.png
rename to htdocs/theme/eldy/img/logout.png
diff --git a/public/theme/eldy/img/logout_top.png b/htdocs/theme/eldy/img/logout_top.png
similarity index 100%
rename from public/theme/eldy/img/logout_top.png
rename to htdocs/theme/eldy/img/logout_top.png
diff --git a/public/theme/eldy/img/menus/README.md b/htdocs/theme/eldy/img/menus/README.md
similarity index 100%
rename from public/theme/eldy/img/menus/README.md
rename to htdocs/theme/eldy/img/menus/README.md
diff --git a/public/theme/eldy/img/menus/agenda.png b/htdocs/theme/eldy/img/menus/agenda.png
similarity index 100%
rename from public/theme/eldy/img/menus/agenda.png
rename to htdocs/theme/eldy/img/menus/agenda.png
diff --git a/public/theme/eldy/img/menus/agenda_over.png b/htdocs/theme/eldy/img/menus/agenda_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/agenda_over.png
rename to htdocs/theme/eldy/img/menus/agenda_over.png
diff --git a/public/theme/eldy/img/menus/bank.png b/htdocs/theme/eldy/img/menus/bank.png
similarity index 100%
rename from public/theme/eldy/img/menus/bank.png
rename to htdocs/theme/eldy/img/menus/bank.png
diff --git a/public/theme/eldy/img/menus/bank_over.png b/htdocs/theme/eldy/img/menus/bank_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/bank_over.png
rename to htdocs/theme/eldy/img/menus/bank_over.png
diff --git a/public/theme/eldy/img/menus/chart.png b/htdocs/theme/eldy/img/menus/chart.png
similarity index 100%
rename from public/theme/eldy/img/menus/chart.png
rename to htdocs/theme/eldy/img/menus/chart.png
diff --git a/public/theme/eldy/img/menus/commercial.png b/htdocs/theme/eldy/img/menus/commercial.png
similarity index 100%
rename from public/theme/eldy/img/menus/commercial.png
rename to htdocs/theme/eldy/img/menus/commercial.png
diff --git a/public/theme/eldy/img/menus/commercial_over.png b/htdocs/theme/eldy/img/menus/commercial_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/commercial_over.png
rename to htdocs/theme/eldy/img/menus/commercial_over.png
diff --git a/public/theme/eldy/img/menus/company.png b/htdocs/theme/eldy/img/menus/company.png
similarity index 100%
rename from public/theme/eldy/img/menus/company.png
rename to htdocs/theme/eldy/img/menus/company.png
diff --git a/public/theme/eldy/img/menus/company_over.png b/htdocs/theme/eldy/img/menus/company_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/company_over.png
rename to htdocs/theme/eldy/img/menus/company_over.png
diff --git a/public/theme/eldy/img/menus/ecm.png b/htdocs/theme/eldy/img/menus/ecm.png
similarity index 100%
rename from public/theme/eldy/img/menus/ecm.png
rename to htdocs/theme/eldy/img/menus/ecm.png
diff --git a/public/theme/eldy/img/menus/ecm_over.png b/htdocs/theme/eldy/img/menus/ecm_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/ecm_over.png
rename to htdocs/theme/eldy/img/menus/ecm_over.png
diff --git a/public/theme/eldy/img/menus/externalsite.png b/htdocs/theme/eldy/img/menus/externalsite.png
similarity index 100%
rename from public/theme/eldy/img/menus/externalsite.png
rename to htdocs/theme/eldy/img/menus/externalsite.png
diff --git a/public/theme/eldy/img/menus/externalsite_over.png b/htdocs/theme/eldy/img/menus/externalsite_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/externalsite_over.png
rename to htdocs/theme/eldy/img/menus/externalsite_over.png
diff --git a/public/theme/eldy/img/menus/ftp.png b/htdocs/theme/eldy/img/menus/ftp.png
similarity index 100%
rename from public/theme/eldy/img/menus/ftp.png
rename to htdocs/theme/eldy/img/menus/ftp.png
diff --git a/public/theme/eldy/img/menus/ftp_over.png b/htdocs/theme/eldy/img/menus/ftp_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/ftp_over.png
rename to htdocs/theme/eldy/img/menus/ftp_over.png
diff --git a/public/theme/eldy/img/menus/generic1.png b/htdocs/theme/eldy/img/menus/generic1.png
similarity index 100%
rename from public/theme/eldy/img/menus/generic1.png
rename to htdocs/theme/eldy/img/menus/generic1.png
diff --git a/public/theme/eldy/img/menus/generic1_over.png b/htdocs/theme/eldy/img/menus/generic1_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/generic1_over.png
rename to htdocs/theme/eldy/img/menus/generic1_over.png
diff --git a/public/theme/eldy/img/menus/generic2.png b/htdocs/theme/eldy/img/menus/generic2.png
similarity index 100%
rename from public/theme/eldy/img/menus/generic2.png
rename to htdocs/theme/eldy/img/menus/generic2.png
diff --git a/public/theme/eldy/img/menus/generic2_over.png b/htdocs/theme/eldy/img/menus/generic2_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/generic2_over.png
rename to htdocs/theme/eldy/img/menus/generic2_over.png
diff --git a/public/theme/eldy/img/menus/generic3.png b/htdocs/theme/eldy/img/menus/generic3.png
similarity index 100%
rename from public/theme/eldy/img/menus/generic3.png
rename to htdocs/theme/eldy/img/menus/generic3.png
diff --git a/public/theme/eldy/img/menus/generic3_over.png b/htdocs/theme/eldy/img/menus/generic3_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/generic3_over.png
rename to htdocs/theme/eldy/img/menus/generic3_over.png
diff --git a/public/theme/eldy/img/menus/generic4.png b/htdocs/theme/eldy/img/menus/generic4.png
similarity index 100%
rename from public/theme/eldy/img/menus/generic4.png
rename to htdocs/theme/eldy/img/menus/generic4.png
diff --git a/public/theme/eldy/img/menus/generic4_over.png b/htdocs/theme/eldy/img/menus/generic4_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/generic4_over.png
rename to htdocs/theme/eldy/img/menus/generic4_over.png
diff --git a/public/theme/eldy/img/menus/globe.png b/htdocs/theme/eldy/img/menus/globe.png
similarity index 100%
rename from public/theme/eldy/img/menus/globe.png
rename to htdocs/theme/eldy/img/menus/globe.png
diff --git a/public/theme/eldy/img/menus/globe_over.png b/htdocs/theme/eldy/img/menus/globe_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/globe_over.png
rename to htdocs/theme/eldy/img/menus/globe_over.png
diff --git a/public/theme/eldy/img/menus/holiday.png b/htdocs/theme/eldy/img/menus/holiday.png
similarity index 100%
rename from public/theme/eldy/img/menus/holiday.png
rename to htdocs/theme/eldy/img/menus/holiday.png
diff --git a/public/theme/eldy/img/menus/home.png b/htdocs/theme/eldy/img/menus/home.png
similarity index 100%
rename from public/theme/eldy/img/menus/home.png
rename to htdocs/theme/eldy/img/menus/home.png
diff --git a/public/theme/eldy/img/menus/home_over.png b/htdocs/theme/eldy/img/menus/home_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/home_over.png
rename to htdocs/theme/eldy/img/menus/home_over.png
diff --git a/public/theme/eldy/img/menus/index.html b/htdocs/theme/eldy/img/menus/index.html
similarity index 100%
rename from public/theme/eldy/img/menus/index.html
rename to htdocs/theme/eldy/img/menus/index.html
diff --git a/public/theme/eldy/img/menus/mail.png b/htdocs/theme/eldy/img/menus/mail.png
similarity index 100%
rename from public/theme/eldy/img/menus/mail.png
rename to htdocs/theme/eldy/img/menus/mail.png
diff --git a/public/theme/eldy/img/menus/mail_over.png b/htdocs/theme/eldy/img/menus/mail_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/mail_over.png
rename to htdocs/theme/eldy/img/menus/mail_over.png
diff --git a/public/theme/eldy/img/menus/members.png b/htdocs/theme/eldy/img/menus/members.png
similarity index 100%
rename from public/theme/eldy/img/menus/members.png
rename to htdocs/theme/eldy/img/menus/members.png
diff --git a/public/theme/eldy/img/menus/members_over.png b/htdocs/theme/eldy/img/menus/members_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/members_over.png
rename to htdocs/theme/eldy/img/menus/members_over.png
diff --git a/public/theme/eldy/img/menus/menu.png b/htdocs/theme/eldy/img/menus/menu.png
similarity index 100%
rename from public/theme/eldy/img/menus/menu.png
rename to htdocs/theme/eldy/img/menus/menu.png
diff --git a/public/theme/eldy/img/menus/money.png b/htdocs/theme/eldy/img/menus/money.png
similarity index 100%
rename from public/theme/eldy/img/menus/money.png
rename to htdocs/theme/eldy/img/menus/money.png
diff --git a/public/theme/eldy/img/menus/money_over.png b/htdocs/theme/eldy/img/menus/money_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/money_over.png
rename to htdocs/theme/eldy/img/menus/money_over.png
diff --git a/public/theme/eldy/img/menus/pointofsale.png b/htdocs/theme/eldy/img/menus/pointofsale.png
similarity index 100%
rename from public/theme/eldy/img/menus/pointofsale.png
rename to htdocs/theme/eldy/img/menus/pointofsale.png
diff --git a/public/theme/eldy/img/menus/pointofsale_over.png b/htdocs/theme/eldy/img/menus/pointofsale_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/pointofsale_over.png
rename to htdocs/theme/eldy/img/menus/pointofsale_over.png
diff --git a/public/theme/eldy/img/menus/products.png b/htdocs/theme/eldy/img/menus/products.png
similarity index 100%
rename from public/theme/eldy/img/menus/products.png
rename to htdocs/theme/eldy/img/menus/products.png
diff --git a/public/theme/eldy/img/menus/products_over.png b/htdocs/theme/eldy/img/menus/products_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/products_over.png
rename to htdocs/theme/eldy/img/menus/products_over.png
diff --git a/public/theme/eldy/img/menus/project.png b/htdocs/theme/eldy/img/menus/project.png
similarity index 100%
rename from public/theme/eldy/img/menus/project.png
rename to htdocs/theme/eldy/img/menus/project.png
diff --git a/public/theme/eldy/img/menus/project_over.png b/htdocs/theme/eldy/img/menus/project_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/project_over.png
rename to htdocs/theme/eldy/img/menus/project_over.png
diff --git a/public/theme/eldy/img/menus/shop.png b/htdocs/theme/eldy/img/menus/shop.png
similarity index 100%
rename from public/theme/eldy/img/menus/shop.png
rename to htdocs/theme/eldy/img/menus/shop.png
diff --git a/public/theme/eldy/img/menus/shop_over.png b/htdocs/theme/eldy/img/menus/shop_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/shop_over.png
rename to htdocs/theme/eldy/img/menus/shop_over.png
diff --git a/public/theme/eldy/img/menus/tools.png b/htdocs/theme/eldy/img/menus/tools.png
similarity index 100%
rename from public/theme/eldy/img/menus/tools.png
rename to htdocs/theme/eldy/img/menus/tools.png
diff --git a/public/theme/eldy/img/menus/tools_over.png b/htdocs/theme/eldy/img/menus/tools_over.png
similarity index 100%
rename from public/theme/eldy/img/menus/tools_over.png
rename to htdocs/theme/eldy/img/menus/tools_over.png
diff --git a/public/theme/eldy/img/menus_black/agenda.png b/htdocs/theme/eldy/img/menus_black/agenda.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/agenda.png
rename to htdocs/theme/eldy/img/menus_black/agenda.png
diff --git a/public/theme/eldy/img/menus_black/agenda_over.png b/htdocs/theme/eldy/img/menus_black/agenda_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/agenda_over.png
rename to htdocs/theme/eldy/img/menus_black/agenda_over.png
diff --git a/public/theme/eldy/img/menus_black/bank.png b/htdocs/theme/eldy/img/menus_black/bank.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/bank.png
rename to htdocs/theme/eldy/img/menus_black/bank.png
diff --git a/public/theme/eldy/img/menus_black/bank_over.png b/htdocs/theme/eldy/img/menus_black/bank_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/bank_over.png
rename to htdocs/theme/eldy/img/menus_black/bank_over.png
diff --git a/public/theme/eldy/img/menus_black/commercial.png b/htdocs/theme/eldy/img/menus_black/commercial.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/commercial.png
rename to htdocs/theme/eldy/img/menus_black/commercial.png
diff --git a/public/theme/eldy/img/menus_black/commercial_over.png b/htdocs/theme/eldy/img/menus_black/commercial_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/commercial_over.png
rename to htdocs/theme/eldy/img/menus_black/commercial_over.png
diff --git a/public/theme/eldy/img/menus_black/company.png b/htdocs/theme/eldy/img/menus_black/company.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/company.png
rename to htdocs/theme/eldy/img/menus_black/company.png
diff --git a/public/theme/eldy/img/menus_black/company_over.png b/htdocs/theme/eldy/img/menus_black/company_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/company_over.png
rename to htdocs/theme/eldy/img/menus_black/company_over.png
diff --git a/public/theme/eldy/img/menus_black/ecm.png b/htdocs/theme/eldy/img/menus_black/ecm.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/ecm.png
rename to htdocs/theme/eldy/img/menus_black/ecm.png
diff --git a/public/theme/eldy/img/menus_black/ecm_over.png b/htdocs/theme/eldy/img/menus_black/ecm_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/ecm_over.png
rename to htdocs/theme/eldy/img/menus_black/ecm_over.png
diff --git a/public/theme/eldy/img/menus_black/externalsite.png b/htdocs/theme/eldy/img/menus_black/externalsite.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/externalsite.png
rename to htdocs/theme/eldy/img/menus_black/externalsite.png
diff --git a/public/theme/eldy/img/menus_black/externalsite_over.png b/htdocs/theme/eldy/img/menus_black/externalsite_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/externalsite_over.png
rename to htdocs/theme/eldy/img/menus_black/externalsite_over.png
diff --git a/public/theme/eldy/img/menus_black/ftp.png b/htdocs/theme/eldy/img/menus_black/ftp.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/ftp.png
rename to htdocs/theme/eldy/img/menus_black/ftp.png
diff --git a/public/theme/eldy/img/menus_black/ftp_over.png b/htdocs/theme/eldy/img/menus_black/ftp_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/ftp_over.png
rename to htdocs/theme/eldy/img/menus_black/ftp_over.png
diff --git a/public/theme/eldy/img/menus_black/generic1.png b/htdocs/theme/eldy/img/menus_black/generic1.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/generic1.png
rename to htdocs/theme/eldy/img/menus_black/generic1.png
diff --git a/public/theme/eldy/img/menus_black/generic1_over.png b/htdocs/theme/eldy/img/menus_black/generic1_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/generic1_over.png
rename to htdocs/theme/eldy/img/menus_black/generic1_over.png
diff --git a/public/theme/eldy/img/menus_black/generic2.png b/htdocs/theme/eldy/img/menus_black/generic2.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/generic2.png
rename to htdocs/theme/eldy/img/menus_black/generic2.png
diff --git a/public/theme/eldy/img/menus_black/generic2_over.png b/htdocs/theme/eldy/img/menus_black/generic2_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/generic2_over.png
rename to htdocs/theme/eldy/img/menus_black/generic2_over.png
diff --git a/public/theme/eldy/img/menus_black/generic3.png b/htdocs/theme/eldy/img/menus_black/generic3.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/generic3.png
rename to htdocs/theme/eldy/img/menus_black/generic3.png
diff --git a/public/theme/eldy/img/menus_black/generic3_over.png b/htdocs/theme/eldy/img/menus_black/generic3_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/generic3_over.png
rename to htdocs/theme/eldy/img/menus_black/generic3_over.png
diff --git a/public/theme/eldy/img/menus_black/generic4.png b/htdocs/theme/eldy/img/menus_black/generic4.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/generic4.png
rename to htdocs/theme/eldy/img/menus_black/generic4.png
diff --git a/public/theme/eldy/img/menus_black/generic4_over.png b/htdocs/theme/eldy/img/menus_black/generic4_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/generic4_over.png
rename to htdocs/theme/eldy/img/menus_black/generic4_over.png
diff --git a/public/theme/eldy/img/menus_black/globe.png b/htdocs/theme/eldy/img/menus_black/globe.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/globe.png
rename to htdocs/theme/eldy/img/menus_black/globe.png
diff --git a/public/theme/eldy/img/menus_black/globe_over.png b/htdocs/theme/eldy/img/menus_black/globe_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/globe_over.png
rename to htdocs/theme/eldy/img/menus_black/globe_over.png
diff --git a/public/theme/eldy/img/menus_black/holiday.png b/htdocs/theme/eldy/img/menus_black/holiday.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/holiday.png
rename to htdocs/theme/eldy/img/menus_black/holiday.png
diff --git a/public/theme/eldy/img/menus_black/home.png b/htdocs/theme/eldy/img/menus_black/home.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/home.png
rename to htdocs/theme/eldy/img/menus_black/home.png
diff --git a/public/theme/eldy/img/menus_black/home_over.png b/htdocs/theme/eldy/img/menus_black/home_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/home_over.png
rename to htdocs/theme/eldy/img/menus_black/home_over.png
diff --git a/public/theme/eldy/img/menus_black/mail.png b/htdocs/theme/eldy/img/menus_black/mail.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/mail.png
rename to htdocs/theme/eldy/img/menus_black/mail.png
diff --git a/public/theme/eldy/img/menus_black/mail_over.png b/htdocs/theme/eldy/img/menus_black/mail_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/mail_over.png
rename to htdocs/theme/eldy/img/menus_black/mail_over.png
diff --git a/public/theme/eldy/img/menus_black/members.png b/htdocs/theme/eldy/img/menus_black/members.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/members.png
rename to htdocs/theme/eldy/img/menus_black/members.png
diff --git a/public/theme/eldy/img/menus_black/members_over.png b/htdocs/theme/eldy/img/menus_black/members_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/members_over.png
rename to htdocs/theme/eldy/img/menus_black/members_over.png
diff --git a/public/theme/eldy/img/menus_black/menu.png b/htdocs/theme/eldy/img/menus_black/menu.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/menu.png
rename to htdocs/theme/eldy/img/menus_black/menu.png
diff --git a/public/theme/eldy/img/menus_black/money.png b/htdocs/theme/eldy/img/menus_black/money.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/money.png
rename to htdocs/theme/eldy/img/menus_black/money.png
diff --git a/public/theme/eldy/img/menus_black/money_over.png b/htdocs/theme/eldy/img/menus_black/money_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/money_over.png
rename to htdocs/theme/eldy/img/menus_black/money_over.png
diff --git a/public/theme/eldy/img/menus_black/pointofsale.png b/htdocs/theme/eldy/img/menus_black/pointofsale.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/pointofsale.png
rename to htdocs/theme/eldy/img/menus_black/pointofsale.png
diff --git a/public/theme/eldy/img/menus_black/pointofsale_over.png b/htdocs/theme/eldy/img/menus_black/pointofsale_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/pointofsale_over.png
rename to htdocs/theme/eldy/img/menus_black/pointofsale_over.png
diff --git a/public/theme/eldy/img/menus_black/products.png b/htdocs/theme/eldy/img/menus_black/products.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/products.png
rename to htdocs/theme/eldy/img/menus_black/products.png
diff --git a/public/theme/eldy/img/menus_black/products_over.png b/htdocs/theme/eldy/img/menus_black/products_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/products_over.png
rename to htdocs/theme/eldy/img/menus_black/products_over.png
diff --git a/public/theme/eldy/img/menus_black/project.png b/htdocs/theme/eldy/img/menus_black/project.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/project.png
rename to htdocs/theme/eldy/img/menus_black/project.png
diff --git a/public/theme/eldy/img/menus_black/project_over.png b/htdocs/theme/eldy/img/menus_black/project_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/project_over.png
rename to htdocs/theme/eldy/img/menus_black/project_over.png
diff --git a/public/theme/eldy/img/menus_black/shop.png b/htdocs/theme/eldy/img/menus_black/shop.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/shop.png
rename to htdocs/theme/eldy/img/menus_black/shop.png
diff --git a/public/theme/eldy/img/menus_black/shop_over.png b/htdocs/theme/eldy/img/menus_black/shop_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/shop_over.png
rename to htdocs/theme/eldy/img/menus_black/shop_over.png
diff --git a/public/theme/eldy/img/menus_black/tools.png b/htdocs/theme/eldy/img/menus_black/tools.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/tools.png
rename to htdocs/theme/eldy/img/menus_black/tools.png
diff --git a/public/theme/eldy/img/menus_black/tools_over.png b/htdocs/theme/eldy/img/menus_black/tools_over.png
similarity index 100%
rename from public/theme/eldy/img/menus_black/tools_over.png
rename to htdocs/theme/eldy/img/menus_black/tools_over.png
diff --git a/public/theme/eldy/img/menutab-r.png b/htdocs/theme/eldy/img/menutab-r.png
similarity index 100%
rename from public/theme/eldy/img/menutab-r.png
rename to htdocs/theme/eldy/img/menutab-r.png
diff --git a/public/theme/eldy/img/nav-overlay.png b/htdocs/theme/eldy/img/nav-overlay.png
similarity index 100%
rename from public/theme/eldy/img/nav-overlay.png
rename to htdocs/theme/eldy/img/nav-overlay.png
diff --git a/public/theme/eldy/img/nav-overlay3.png b/htdocs/theme/eldy/img/nav-overlay3.png
similarity index 100%
rename from public/theme/eldy/img/nav-overlay3.png
rename to htdocs/theme/eldy/img/nav-overlay3.png
diff --git a/public/theme/eldy/img/next.png b/htdocs/theme/eldy/img/next.png
similarity index 100%
rename from public/theme/eldy/img/next.png
rename to htdocs/theme/eldy/img/next.png
diff --git a/public/theme/eldy/img/nographyet.svg b/htdocs/theme/eldy/img/nographyet.svg
similarity index 100%
rename from public/theme/eldy/img/nographyet.svg
rename to htdocs/theme/eldy/img/nographyet.svg
diff --git a/public/theme/eldy/img/object_account.png b/htdocs/theme/eldy/img/object_account.png
similarity index 100%
rename from public/theme/eldy/img/object_account.png
rename to htdocs/theme/eldy/img/object_account.png
diff --git a/public/theme/eldy/img/object_accounting.png b/htdocs/theme/eldy/img/object_accounting.png
similarity index 100%
rename from public/theme/eldy/img/object_accounting.png
rename to htdocs/theme/eldy/img/object_accounting.png
diff --git a/public/theme/eldy/img/object_action.png b/htdocs/theme/eldy/img/object_action.png
similarity index 100%
rename from public/theme/eldy/img/object_action.png
rename to htdocs/theme/eldy/img/object_action.png
diff --git a/public/theme/eldy/img/object_address.png b/htdocs/theme/eldy/img/object_address.png
similarity index 100%
rename from public/theme/eldy/img/object_address.png
rename to htdocs/theme/eldy/img/object_address.png
diff --git a/public/theme/eldy/img/object_barcode.png b/htdocs/theme/eldy/img/object_barcode.png
similarity index 100%
rename from public/theme/eldy/img/object_barcode.png
rename to htdocs/theme/eldy/img/object_barcode.png
diff --git a/public/theme/eldy/img/object_bill.png b/htdocs/theme/eldy/img/object_bill.png
similarity index 100%
rename from public/theme/eldy/img/object_bill.png
rename to htdocs/theme/eldy/img/object_bill.png
diff --git a/public/theme/eldy/img/object_billa.png b/htdocs/theme/eldy/img/object_billa.png
similarity index 100%
rename from public/theme/eldy/img/object_billa.png
rename to htdocs/theme/eldy/img/object_billa.png
diff --git a/public/theme/eldy/img/object_billd.png b/htdocs/theme/eldy/img/object_billd.png
similarity index 100%
rename from public/theme/eldy/img/object_billd.png
rename to htdocs/theme/eldy/img/object_billd.png
diff --git a/public/theme/eldy/img/object_billr.png b/htdocs/theme/eldy/img/object_billr.png
similarity index 100%
rename from public/theme/eldy/img/object_billr.png
rename to htdocs/theme/eldy/img/object_billr.png
diff --git a/public/theme/eldy/img/object_book.png b/htdocs/theme/eldy/img/object_book.png
similarity index 100%
rename from public/theme/eldy/img/object_book.png
rename to htdocs/theme/eldy/img/object_book.png
diff --git a/public/theme/eldy/img/object_bookmark.png b/htdocs/theme/eldy/img/object_bookmark.png
similarity index 100%
rename from public/theme/eldy/img/object_bookmark.png
rename to htdocs/theme/eldy/img/object_bookmark.png
diff --git a/public/theme/eldy/img/object_building.png b/htdocs/theme/eldy/img/object_building.png
similarity index 100%
rename from public/theme/eldy/img/object_building.png
rename to htdocs/theme/eldy/img/object_building.png
diff --git a/public/theme/eldy/img/object_calendar.png b/htdocs/theme/eldy/img/object_calendar.png
similarity index 100%
rename from public/theme/eldy/img/object_calendar.png
rename to htdocs/theme/eldy/img/object_calendar.png
diff --git a/public/theme/eldy/img/object_calendarday.png b/htdocs/theme/eldy/img/object_calendarday.png
similarity index 100%
rename from public/theme/eldy/img/object_calendarday.png
rename to htdocs/theme/eldy/img/object_calendarday.png
diff --git a/public/theme/eldy/img/object_calendargantt.png b/htdocs/theme/eldy/img/object_calendargantt.png
similarity index 100%
rename from public/theme/eldy/img/object_calendargantt.png
rename to htdocs/theme/eldy/img/object_calendargantt.png
diff --git a/public/theme/eldy/img/object_calendarpertype.png b/htdocs/theme/eldy/img/object_calendarpertype.png
similarity index 100%
rename from public/theme/eldy/img/object_calendarpertype.png
rename to htdocs/theme/eldy/img/object_calendarpertype.png
diff --git a/public/theme/eldy/img/object_calendarperuser.png b/htdocs/theme/eldy/img/object_calendarperuser.png
similarity index 100%
rename from public/theme/eldy/img/object_calendarperuser.png
rename to htdocs/theme/eldy/img/object_calendarperuser.png
diff --git a/public/theme/eldy/img/object_calendarweek.png b/htdocs/theme/eldy/img/object_calendarweek.png
similarity index 100%
rename from public/theme/eldy/img/object_calendarweek.png
rename to htdocs/theme/eldy/img/object_calendarweek.png
diff --git a/public/theme/eldy/img/object_category-expanded.png b/htdocs/theme/eldy/img/object_category-expanded.png
similarity index 100%
rename from public/theme/eldy/img/object_category-expanded.png
rename to htdocs/theme/eldy/img/object_category-expanded.png
diff --git a/public/theme/eldy/img/object_category.png b/htdocs/theme/eldy/img/object_category.png
similarity index 100%
rename from public/theme/eldy/img/object_category.png
rename to htdocs/theme/eldy/img/object_category.png
diff --git a/public/theme/eldy/img/object_commercial.png b/htdocs/theme/eldy/img/object_commercial.png
similarity index 100%
rename from public/theme/eldy/img/object_commercial.png
rename to htdocs/theme/eldy/img/object_commercial.png
diff --git a/public/theme/eldy/img/object_company.png b/htdocs/theme/eldy/img/object_company.png
similarity index 100%
rename from public/theme/eldy/img/object_company.png
rename to htdocs/theme/eldy/img/object_company.png
diff --git a/public/theme/eldy/img/object_contact.png b/htdocs/theme/eldy/img/object_contact.png
similarity index 100%
rename from public/theme/eldy/img/object_contact.png
rename to htdocs/theme/eldy/img/object_contact.png
diff --git a/public/theme/eldy/img/object_contract.png b/htdocs/theme/eldy/img/object_contract.png
similarity index 100%
rename from public/theme/eldy/img/object_contract.png
rename to htdocs/theme/eldy/img/object_contract.png
diff --git a/public/theme/eldy/img/object_cron.png b/htdocs/theme/eldy/img/object_cron.png
similarity index 100%
rename from public/theme/eldy/img/object_cron.png
rename to htdocs/theme/eldy/img/object_cron.png
diff --git a/public/theme/eldy/img/object_dir.png b/htdocs/theme/eldy/img/object_dir.png
similarity index 100%
rename from public/theme/eldy/img/object_dir.png
rename to htdocs/theme/eldy/img/object_dir.png
diff --git a/public/theme/eldy/img/object_email.png b/htdocs/theme/eldy/img/object_email.png
similarity index 100%
rename from public/theme/eldy/img/object_email.png
rename to htdocs/theme/eldy/img/object_email.png
diff --git a/public/theme/eldy/img/object_energy.png b/htdocs/theme/eldy/img/object_energy.png
similarity index 100%
rename from public/theme/eldy/img/object_energy.png
rename to htdocs/theme/eldy/img/object_energy.png
diff --git a/public/theme/eldy/img/object_generic.png b/htdocs/theme/eldy/img/object_generic.png
similarity index 100%
rename from public/theme/eldy/img/object_generic.png
rename to htdocs/theme/eldy/img/object_generic.png
diff --git a/public/theme/eldy/img/object_globe.png b/htdocs/theme/eldy/img/object_globe.png
similarity index 100%
rename from public/theme/eldy/img/object_globe.png
rename to htdocs/theme/eldy/img/object_globe.png
diff --git a/public/theme/eldy/img/object_gravatar.png b/htdocs/theme/eldy/img/object_gravatar.png
similarity index 100%
rename from public/theme/eldy/img/object_gravatar.png
rename to htdocs/theme/eldy/img/object_gravatar.png
diff --git a/public/theme/eldy/img/object_group.png b/htdocs/theme/eldy/img/object_group.png
similarity index 100%
rename from public/theme/eldy/img/object_group.png
rename to htdocs/theme/eldy/img/object_group.png
diff --git a/public/theme/eldy/img/object_holiday.png b/htdocs/theme/eldy/img/object_holiday.png
similarity index 100%
rename from public/theme/eldy/img/object_holiday.png
rename to htdocs/theme/eldy/img/object_holiday.png
diff --git a/public/theme/eldy/img/object_intervention.png b/htdocs/theme/eldy/img/object_intervention.png
similarity index 100%
rename from public/theme/eldy/img/object_intervention.png
rename to htdocs/theme/eldy/img/object_intervention.png
diff --git a/public/theme/eldy/img/object_invoice.png b/htdocs/theme/eldy/img/object_invoice.png
similarity index 100%
rename from public/theme/eldy/img/object_invoice.png
rename to htdocs/theme/eldy/img/object_invoice.png
diff --git a/public/theme/eldy/img/object_label.png b/htdocs/theme/eldy/img/object_label.png
similarity index 100%
rename from public/theme/eldy/img/object_label.png
rename to htdocs/theme/eldy/img/object_label.png
diff --git a/public/theme/eldy/img/object_list.png b/htdocs/theme/eldy/img/object_list.png
similarity index 100%
rename from public/theme/eldy/img/object_list.png
rename to htdocs/theme/eldy/img/object_list.png
diff --git a/public/theme/eldy/img/object_margin.png b/htdocs/theme/eldy/img/object_margin.png
similarity index 100%
rename from public/theme/eldy/img/object_margin.png
rename to htdocs/theme/eldy/img/object_margin.png
diff --git a/public/theme/eldy/img/object_multicurrency.png b/htdocs/theme/eldy/img/object_multicurrency.png
similarity index 100%
rename from public/theme/eldy/img/object_multicurrency.png
rename to htdocs/theme/eldy/img/object_multicurrency.png
diff --git a/public/theme/eldy/img/object_opensurvey.png b/htdocs/theme/eldy/img/object_opensurvey.png
similarity index 100%
rename from public/theme/eldy/img/object_opensurvey.png
rename to htdocs/theme/eldy/img/object_opensurvey.png
diff --git a/public/theme/eldy/img/object_order.png b/htdocs/theme/eldy/img/object_order.png
similarity index 100%
rename from public/theme/eldy/img/object_order.png
rename to htdocs/theme/eldy/img/object_order.png
diff --git a/public/theme/eldy/img/object_payment.png b/htdocs/theme/eldy/img/object_payment.png
similarity index 100%
rename from public/theme/eldy/img/object_payment.png
rename to htdocs/theme/eldy/img/object_payment.png
diff --git a/public/theme/eldy/img/object_phoning.png b/htdocs/theme/eldy/img/object_phoning.png
similarity index 100%
rename from public/theme/eldy/img/object_phoning.png
rename to htdocs/theme/eldy/img/object_phoning.png
diff --git a/public/theme/eldy/img/object_phoning_fax.png b/htdocs/theme/eldy/img/object_phoning_fax.png
similarity index 100%
rename from public/theme/eldy/img/object_phoning_fax.png
rename to htdocs/theme/eldy/img/object_phoning_fax.png
diff --git a/public/theme/eldy/img/object_printer.png b/htdocs/theme/eldy/img/object_printer.png
similarity index 100%
rename from public/theme/eldy/img/object_printer.png
rename to htdocs/theme/eldy/img/object_printer.png
diff --git a/public/theme/eldy/img/object_product.png b/htdocs/theme/eldy/img/object_product.png
similarity index 100%
rename from public/theme/eldy/img/object_product.png
rename to htdocs/theme/eldy/img/object_product.png
diff --git a/public/theme/eldy/img/object_project.png b/htdocs/theme/eldy/img/object_project.png
similarity index 100%
rename from public/theme/eldy/img/object_project.png
rename to htdocs/theme/eldy/img/object_project.png
diff --git a/public/theme/eldy/img/object_projectpub.png b/htdocs/theme/eldy/img/object_projectpub.png
similarity index 100%
rename from public/theme/eldy/img/object_projectpub.png
rename to htdocs/theme/eldy/img/object_projectpub.png
diff --git a/public/theme/eldy/img/object_projecttask.png b/htdocs/theme/eldy/img/object_projecttask.png
similarity index 100%
rename from public/theme/eldy/img/object_projecttask.png
rename to htdocs/theme/eldy/img/object_projecttask.png
diff --git a/public/theme/eldy/img/object_propal.png b/htdocs/theme/eldy/img/object_propal.png
similarity index 100%
rename from public/theme/eldy/img/object_propal.png
rename to htdocs/theme/eldy/img/object_propal.png
diff --git a/public/theme/eldy/img/object_reduc.png b/htdocs/theme/eldy/img/object_reduc.png
similarity index 100%
rename from public/theme/eldy/img/object_reduc.png
rename to htdocs/theme/eldy/img/object_reduc.png
diff --git a/public/theme/eldy/img/object_resource.png b/htdocs/theme/eldy/img/object_resource.png
similarity index 100%
rename from public/theme/eldy/img/object_resource.png
rename to htdocs/theme/eldy/img/object_resource.png
diff --git a/public/theme/eldy/img/object_rss.png b/htdocs/theme/eldy/img/object_rss.png
similarity index 100%
rename from public/theme/eldy/img/object_rss.png
rename to htdocs/theme/eldy/img/object_rss.png
diff --git a/public/theme/eldy/img/object_sending.png b/htdocs/theme/eldy/img/object_sending.png
similarity index 100%
rename from public/theme/eldy/img/object_sending.png
rename to htdocs/theme/eldy/img/object_sending.png
diff --git a/public/theme/eldy/img/object_service.png b/htdocs/theme/eldy/img/object_service.png
similarity index 100%
rename from public/theme/eldy/img/object_service.png
rename to htdocs/theme/eldy/img/object_service.png
diff --git a/public/theme/eldy/img/object_skype.png b/htdocs/theme/eldy/img/object_skype.png
similarity index 100%
rename from public/theme/eldy/img/object_skype.png
rename to htdocs/theme/eldy/img/object_skype.png
diff --git a/public/theme/eldy/img/object_stock.png b/htdocs/theme/eldy/img/object_stock.png
similarity index 100%
rename from public/theme/eldy/img/object_stock.png
rename to htdocs/theme/eldy/img/object_stock.png
diff --git a/public/theme/eldy/img/object_supplier_proposal.png b/htdocs/theme/eldy/img/object_supplier_proposal.png
similarity index 100%
rename from public/theme/eldy/img/object_supplier_proposal.png
rename to htdocs/theme/eldy/img/object_supplier_proposal.png
diff --git a/public/theme/eldy/img/object_task.png b/htdocs/theme/eldy/img/object_task.png
similarity index 100%
rename from public/theme/eldy/img/object_task.png
rename to htdocs/theme/eldy/img/object_task.png
diff --git a/public/theme/eldy/img/object_task_time.png b/htdocs/theme/eldy/img/object_task_time.png
similarity index 100%
rename from public/theme/eldy/img/object_task_time.png
rename to htdocs/theme/eldy/img/object_task_time.png
diff --git a/public/theme/eldy/img/object_tax.png b/htdocs/theme/eldy/img/object_tax.png
similarity index 100%
rename from public/theme/eldy/img/object_tax.png
rename to htdocs/theme/eldy/img/object_tax.png
diff --git a/public/theme/eldy/img/object_technic.png b/htdocs/theme/eldy/img/object_technic.png
similarity index 100%
rename from public/theme/eldy/img/object_technic.png
rename to htdocs/theme/eldy/img/object_technic.png
diff --git a/public/theme/eldy/img/object_trip.png b/htdocs/theme/eldy/img/object_trip.png
similarity index 100%
rename from public/theme/eldy/img/object_trip.png
rename to htdocs/theme/eldy/img/object_trip.png
diff --git a/public/theme/eldy/img/object_user.png b/htdocs/theme/eldy/img/object_user.png
similarity index 100%
rename from public/theme/eldy/img/object_user.png
rename to htdocs/theme/eldy/img/object_user.png
diff --git a/public/theme/eldy/img/off.png b/htdocs/theme/eldy/img/off.png
similarity index 100%
rename from public/theme/eldy/img/off.png
rename to htdocs/theme/eldy/img/off.png
diff --git a/public/theme/eldy/img/on.png b/htdocs/theme/eldy/img/on.png
similarity index 100%
rename from public/theme/eldy/img/on.png
rename to htdocs/theme/eldy/img/on.png
diff --git a/public/theme/eldy/img/pdf2.png b/htdocs/theme/eldy/img/pdf2.png
similarity index 100%
rename from public/theme/eldy/img/pdf2.png
rename to htdocs/theme/eldy/img/pdf2.png
diff --git a/public/theme/eldy/img/pdf3.png b/htdocs/theme/eldy/img/pdf3.png
similarity index 100%
rename from public/theme/eldy/img/pdf3.png
rename to htdocs/theme/eldy/img/pdf3.png
diff --git a/public/theme/eldy/img/play.png b/htdocs/theme/eldy/img/play.png
similarity index 100%
rename from public/theme/eldy/img/play.png
rename to htdocs/theme/eldy/img/play.png
diff --git a/public/theme/eldy/img/playdisabled.png b/htdocs/theme/eldy/img/playdisabled.png
similarity index 100%
rename from public/theme/eldy/img/playdisabled.png
rename to htdocs/theme/eldy/img/playdisabled.png
diff --git a/public/theme/eldy/img/preview.png b/htdocs/theme/eldy/img/preview.png
similarity index 100%
rename from public/theme/eldy/img/preview.png
rename to htdocs/theme/eldy/img/preview.png
diff --git a/public/theme/eldy/img/preview_ext.png b/htdocs/theme/eldy/img/preview_ext.png
similarity index 100%
rename from public/theme/eldy/img/preview_ext.png
rename to htdocs/theme/eldy/img/preview_ext.png
diff --git a/public/theme/eldy/img/previous.png b/htdocs/theme/eldy/img/previous.png
similarity index 100%
rename from public/theme/eldy/img/previous.png
rename to htdocs/theme/eldy/img/previous.png
diff --git a/public/theme/eldy/img/printer.png b/htdocs/theme/eldy/img/printer.png
similarity index 100%
rename from public/theme/eldy/img/printer.png
rename to htdocs/theme/eldy/img/printer.png
diff --git a/public/theme/eldy/img/printer_top.png b/htdocs/theme/eldy/img/printer_top.png
similarity index 100%
rename from public/theme/eldy/img/printer_top.png
rename to htdocs/theme/eldy/img/printer_top.png
diff --git a/public/theme/eldy/img/puce.png b/htdocs/theme/eldy/img/puce.png
similarity index 100%
rename from public/theme/eldy/img/puce.png
rename to htdocs/theme/eldy/img/puce.png
diff --git a/public/theme/eldy/img/recent.png b/htdocs/theme/eldy/img/recent.png
similarity index 100%
rename from public/theme/eldy/img/recent.png
rename to htdocs/theme/eldy/img/recent.png
diff --git a/public/theme/eldy/img/redstar.png b/htdocs/theme/eldy/img/redstar.png
similarity index 100%
rename from public/theme/eldy/img/redstar.png
rename to htdocs/theme/eldy/img/redstar.png
diff --git a/public/theme/eldy/img/refresh.png b/htdocs/theme/eldy/img/refresh.png
similarity index 100%
rename from public/theme/eldy/img/refresh.png
rename to htdocs/theme/eldy/img/refresh.png
diff --git a/public/theme/eldy/img/reload.png b/htdocs/theme/eldy/img/reload.png
similarity index 100%
rename from public/theme/eldy/img/reload.png
rename to htdocs/theme/eldy/img/reload.png
diff --git a/public/theme/eldy/img/rightarrow.png b/htdocs/theme/eldy/img/rightarrow.png
similarity index 100%
rename from public/theme/eldy/img/rightarrow.png
rename to htdocs/theme/eldy/img/rightarrow.png
diff --git a/public/theme/eldy/img/search.png b/htdocs/theme/eldy/img/search.png
similarity index 100%
rename from public/theme/eldy/img/search.png
rename to htdocs/theme/eldy/img/search.png
diff --git a/public/theme/eldy/img/searchclear.png b/htdocs/theme/eldy/img/searchclear.png
similarity index 100%
rename from public/theme/eldy/img/searchclear.png
rename to htdocs/theme/eldy/img/searchclear.png
diff --git a/public/theme/eldy/img/setup.png b/htdocs/theme/eldy/img/setup.png
similarity index 100%
rename from public/theme/eldy/img/setup.png
rename to htdocs/theme/eldy/img/setup.png
diff --git a/public/theme/eldy/img/sort_asc.png b/htdocs/theme/eldy/img/sort_asc.png
similarity index 100%
rename from public/theme/eldy/img/sort_asc.png
rename to htdocs/theme/eldy/img/sort_asc.png
diff --git a/public/theme/eldy/img/sort_asc_disabled.png b/htdocs/theme/eldy/img/sort_asc_disabled.png
similarity index 100%
rename from public/theme/eldy/img/sort_asc_disabled.png
rename to htdocs/theme/eldy/img/sort_asc_disabled.png
diff --git a/public/theme/eldy/img/sort_desc.png b/htdocs/theme/eldy/img/sort_desc.png
similarity index 100%
rename from public/theme/eldy/img/sort_desc.png
rename to htdocs/theme/eldy/img/sort_desc.png
diff --git a/public/theme/eldy/img/sort_desc_disabled.png b/htdocs/theme/eldy/img/sort_desc_disabled.png
similarity index 100%
rename from public/theme/eldy/img/sort_desc_disabled.png
rename to htdocs/theme/eldy/img/sort_desc_disabled.png
diff --git a/public/theme/eldy/img/split.png b/htdocs/theme/eldy/img/split.png
similarity index 100%
rename from public/theme/eldy/img/split.png
rename to htdocs/theme/eldy/img/split.png
diff --git a/public/theme/eldy/img/star.png b/htdocs/theme/eldy/img/star.png
similarity index 100%
rename from public/theme/eldy/img/star.png
rename to htdocs/theme/eldy/img/star.png
diff --git a/public/theme/eldy/img/stats.png b/htdocs/theme/eldy/img/stats.png
similarity index 100%
rename from public/theme/eldy/img/stats.png
rename to htdocs/theme/eldy/img/stats.png
diff --git a/public/theme/eldy/img/statut0.png b/htdocs/theme/eldy/img/statut0.png
similarity index 100%
rename from public/theme/eldy/img/statut0.png
rename to htdocs/theme/eldy/img/statut0.png
diff --git a/public/theme/eldy/img/statut0_40x40.png b/htdocs/theme/eldy/img/statut0_40x40.png
similarity index 100%
rename from public/theme/eldy/img/statut0_40x40.png
rename to htdocs/theme/eldy/img/statut0_40x40.png
diff --git a/public/theme/eldy/img/statut1.png b/htdocs/theme/eldy/img/statut1.png
similarity index 100%
rename from public/theme/eldy/img/statut1.png
rename to htdocs/theme/eldy/img/statut1.png
diff --git a/public/theme/eldy/img/statut1_40x40.png b/htdocs/theme/eldy/img/statut1_40x40.png
similarity index 100%
rename from public/theme/eldy/img/statut1_40x40.png
rename to htdocs/theme/eldy/img/statut1_40x40.png
diff --git a/public/theme/eldy/img/statut3.png b/htdocs/theme/eldy/img/statut3.png
similarity index 100%
rename from public/theme/eldy/img/statut3.png
rename to htdocs/theme/eldy/img/statut3.png
diff --git a/public/theme/eldy/img/statut3_40x40.png b/htdocs/theme/eldy/img/statut3_40x40.png
similarity index 100%
rename from public/theme/eldy/img/statut3_40x40.png
rename to htdocs/theme/eldy/img/statut3_40x40.png
diff --git a/public/theme/eldy/img/statut4.png b/htdocs/theme/eldy/img/statut4.png
similarity index 100%
rename from public/theme/eldy/img/statut4.png
rename to htdocs/theme/eldy/img/statut4.png
diff --git a/public/theme/eldy/img/statut4_40x40.png b/htdocs/theme/eldy/img/statut4_40x40.png
similarity index 100%
rename from public/theme/eldy/img/statut4_40x40.png
rename to htdocs/theme/eldy/img/statut4_40x40.png
diff --git a/public/theme/eldy/img/statut5.png b/htdocs/theme/eldy/img/statut5.png
similarity index 100%
rename from public/theme/eldy/img/statut5.png
rename to htdocs/theme/eldy/img/statut5.png
diff --git a/public/theme/eldy/img/statut5_40x40.png b/htdocs/theme/eldy/img/statut5_40x40.png
similarity index 100%
rename from public/theme/eldy/img/statut5_40x40.png
rename to htdocs/theme/eldy/img/statut5_40x40.png
diff --git a/public/theme/eldy/img/statut6.png b/htdocs/theme/eldy/img/statut6.png
similarity index 100%
rename from public/theme/eldy/img/statut6.png
rename to htdocs/theme/eldy/img/statut6.png
diff --git a/public/theme/eldy/img/statut6_40x40.png b/htdocs/theme/eldy/img/statut6_40x40.png
similarity index 100%
rename from public/theme/eldy/img/statut6_40x40.png
rename to htdocs/theme/eldy/img/statut6_40x40.png
diff --git a/public/theme/eldy/img/statut7.png b/htdocs/theme/eldy/img/statut7.png
similarity index 100%
rename from public/theme/eldy/img/statut7.png
rename to htdocs/theme/eldy/img/statut7.png
diff --git a/public/theme/eldy/img/statut7_40x40.png b/htdocs/theme/eldy/img/statut7_40x40.png
similarity index 100%
rename from public/theme/eldy/img/statut7_40x40.png
rename to htdocs/theme/eldy/img/statut7_40x40.png
diff --git a/public/theme/eldy/img/statut8.png b/htdocs/theme/eldy/img/statut8.png
similarity index 100%
rename from public/theme/eldy/img/statut8.png
rename to htdocs/theme/eldy/img/statut8.png
diff --git a/public/theme/eldy/img/statut8_40x40.png b/htdocs/theme/eldy/img/statut8_40x40.png
similarity index 100%
rename from public/theme/eldy/img/statut8_40x40.png
rename to htdocs/theme/eldy/img/statut8_40x40.png
diff --git a/public/theme/eldy/img/statut9.png b/htdocs/theme/eldy/img/statut9.png
similarity index 100%
rename from public/theme/eldy/img/statut9.png
rename to htdocs/theme/eldy/img/statut9.png
diff --git a/public/theme/eldy/img/statut9_40x40.png b/htdocs/theme/eldy/img/statut9_40x40.png
similarity index 100%
rename from public/theme/eldy/img/statut9_40x40.png
rename to htdocs/theme/eldy/img/statut9_40x40.png
diff --git a/public/theme/eldy/img/stcomm-1.png b/htdocs/theme/eldy/img/stcomm-1.png
similarity index 100%
rename from public/theme/eldy/img/stcomm-1.png
rename to htdocs/theme/eldy/img/stcomm-1.png
diff --git a/public/theme/eldy/img/stcomm0.png b/htdocs/theme/eldy/img/stcomm0.png
similarity index 100%
rename from public/theme/eldy/img/stcomm0.png
rename to htdocs/theme/eldy/img/stcomm0.png
diff --git a/public/theme/eldy/img/stcomm1.png b/htdocs/theme/eldy/img/stcomm1.png
similarity index 100%
rename from public/theme/eldy/img/stcomm1.png
rename to htdocs/theme/eldy/img/stcomm1.png
diff --git a/public/theme/eldy/img/stcomm2.png b/htdocs/theme/eldy/img/stcomm2.png
similarity index 100%
rename from public/theme/eldy/img/stcomm2.png
rename to htdocs/theme/eldy/img/stcomm2.png
diff --git a/public/theme/eldy/img/stcomm3.png b/htdocs/theme/eldy/img/stcomm3.png
similarity index 100%
rename from public/theme/eldy/img/stcomm3.png
rename to htdocs/theme/eldy/img/stcomm3.png
diff --git a/public/theme/eldy/img/stcomm4.png b/htdocs/theme/eldy/img/stcomm4.png
similarity index 100%
rename from public/theme/eldy/img/stcomm4.png
rename to htdocs/theme/eldy/img/stcomm4.png
diff --git a/public/theme/eldy/img/switch_off.png b/htdocs/theme/eldy/img/switch_off.png
similarity index 100%
rename from public/theme/eldy/img/switch_off.png
rename to htdocs/theme/eldy/img/switch_off.png
diff --git a/public/theme/eldy/img/switch_on.png b/htdocs/theme/eldy/img/switch_on.png
similarity index 100%
rename from public/theme/eldy/img/switch_on.png
rename to htdocs/theme/eldy/img/switch_on.png
diff --git a/public/theme/eldy/img/tab_background.png b/htdocs/theme/eldy/img/tab_background.png
similarity index 100%
rename from public/theme/eldy/img/tab_background.png
rename to htdocs/theme/eldy/img/tab_background.png
diff --git a/public/theme/eldy/img/tick.png b/htdocs/theme/eldy/img/tick.png
similarity index 100%
rename from public/theme/eldy/img/tick.png
rename to htdocs/theme/eldy/img/tick.png
diff --git a/public/theme/eldy/img/title.gif b/htdocs/theme/eldy/img/title.gif
similarity index 100%
rename from public/theme/eldy/img/title.gif
rename to htdocs/theme/eldy/img/title.gif
diff --git a/public/theme/eldy/img/title.png b/htdocs/theme/eldy/img/title.png
similarity index 100%
rename from public/theme/eldy/img/title.png
rename to htdocs/theme/eldy/img/title.png
diff --git a/public/theme/eldy/img/title_accountancy.png b/htdocs/theme/eldy/img/title_accountancy.png
similarity index 100%
rename from public/theme/eldy/img/title_accountancy.png
rename to htdocs/theme/eldy/img/title_accountancy.png
diff --git a/public/theme/eldy/img/title_agenda.png b/htdocs/theme/eldy/img/title_agenda.png
similarity index 100%
rename from public/theme/eldy/img/title_agenda.png
rename to htdocs/theme/eldy/img/title_agenda.png
diff --git a/public/theme/eldy/img/title_bank.png b/htdocs/theme/eldy/img/title_bank.png
similarity index 100%
rename from public/theme/eldy/img/title_bank.png
rename to htdocs/theme/eldy/img/title_bank.png
diff --git a/public/theme/eldy/img/title_commercial.png b/htdocs/theme/eldy/img/title_commercial.png
similarity index 100%
rename from public/theme/eldy/img/title_commercial.png
rename to htdocs/theme/eldy/img/title_commercial.png
diff --git a/public/theme/eldy/img/title_companies.png b/htdocs/theme/eldy/img/title_companies.png
similarity index 100%
rename from public/theme/eldy/img/title_companies.png
rename to htdocs/theme/eldy/img/title_companies.png
diff --git a/public/theme/eldy/img/title_generic.png b/htdocs/theme/eldy/img/title_generic.png
similarity index 100%
rename from public/theme/eldy/img/title_generic.png
rename to htdocs/theme/eldy/img/title_generic.png
diff --git a/public/theme/eldy/img/title_home.png b/htdocs/theme/eldy/img/title_home.png
similarity index 100%
rename from public/theme/eldy/img/title_home.png
rename to htdocs/theme/eldy/img/title_home.png
diff --git a/public/theme/eldy/img/title_hrm.png b/htdocs/theme/eldy/img/title_hrm.png
similarity index 100%
rename from public/theme/eldy/img/title_hrm.png
rename to htdocs/theme/eldy/img/title_hrm.png
diff --git a/public/theme/eldy/img/title_products.png b/htdocs/theme/eldy/img/title_products.png
similarity index 100%
rename from public/theme/eldy/img/title_products.png
rename to htdocs/theme/eldy/img/title_products.png
diff --git a/public/theme/eldy/img/title_project.png b/htdocs/theme/eldy/img/title_project.png
similarity index 100%
rename from public/theme/eldy/img/title_project.png
rename to htdocs/theme/eldy/img/title_project.png
diff --git a/public/theme/eldy/img/title_setup.png b/htdocs/theme/eldy/img/title_setup.png
similarity index 100%
rename from public/theme/eldy/img/title_setup.png
rename to htdocs/theme/eldy/img/title_setup.png
diff --git a/public/theme/eldy/img/tmenu.jpg b/htdocs/theme/eldy/img/tmenu.jpg
similarity index 100%
rename from public/theme/eldy/img/tmenu.jpg
rename to htdocs/theme/eldy/img/tmenu.jpg
diff --git a/public/theme/eldy/img/tmenu2.jpg b/htdocs/theme/eldy/img/tmenu2.jpg
similarity index 100%
rename from public/theme/eldy/img/tmenu2.jpg
rename to htdocs/theme/eldy/img/tmenu2.jpg
diff --git a/public/theme/eldy/img/tmenu3.jpg b/htdocs/theme/eldy/img/tmenu3.jpg
similarity index 100%
rename from public/theme/eldy/img/tmenu3.jpg
rename to htdocs/theme/eldy/img/tmenu3.jpg
diff --git a/public/theme/eldy/img/tmenu_inverse.jpg b/htdocs/theme/eldy/img/tmenu_inverse.jpg
similarity index 100%
rename from public/theme/eldy/img/tmenu_inverse.jpg
rename to htdocs/theme/eldy/img/tmenu_inverse.jpg
diff --git a/public/theme/eldy/img/unlock.png b/htdocs/theme/eldy/img/unlock.png
similarity index 100%
rename from public/theme/eldy/img/unlock.png
rename to htdocs/theme/eldy/img/unlock.png
diff --git a/public/theme/eldy/img/uparrow.png b/htdocs/theme/eldy/img/uparrow.png
similarity index 100%
rename from public/theme/eldy/img/uparrow.png
rename to htdocs/theme/eldy/img/uparrow.png
diff --git a/public/theme/eldy/img/upload.png b/htdocs/theme/eldy/img/upload.png
similarity index 100%
rename from public/theme/eldy/img/upload.png
rename to htdocs/theme/eldy/img/upload.png
diff --git a/public/theme/eldy/img/vcard.png b/htdocs/theme/eldy/img/vcard.png
similarity index 100%
rename from public/theme/eldy/img/vcard.png
rename to htdocs/theme/eldy/img/vcard.png
diff --git a/public/theme/eldy/img/view.png b/htdocs/theme/eldy/img/view.png
similarity index 100%
rename from public/theme/eldy/img/view.png
rename to htdocs/theme/eldy/img/view.png
diff --git a/public/theme/eldy/img/warning.png b/htdocs/theme/eldy/img/warning.png
similarity index 100%
rename from public/theme/eldy/img/warning.png
rename to htdocs/theme/eldy/img/warning.png
diff --git a/public/theme/eldy/img/weather/index.html b/htdocs/theme/eldy/img/weather/index.html
similarity index 100%
rename from public/theme/eldy/img/weather/index.html
rename to htdocs/theme/eldy/img/weather/index.html
diff --git a/public/theme/eldy/img/weather/weather-clear-night.png b/htdocs/theme/eldy/img/weather/weather-clear-night.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-clear-night.png
rename to htdocs/theme/eldy/img/weather/weather-clear-night.png
diff --git a/public/theme/eldy/img/weather/weather-clear.png b/htdocs/theme/eldy/img/weather/weather-clear.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-clear.png
rename to htdocs/theme/eldy/img/weather/weather-clear.png
diff --git a/public/theme/eldy/img/weather/weather-clouds-night.png b/htdocs/theme/eldy/img/weather/weather-clouds-night.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-clouds-night.png
rename to htdocs/theme/eldy/img/weather/weather-clouds-night.png
diff --git a/public/theme/eldy/img/weather/weather-clouds.png b/htdocs/theme/eldy/img/weather/weather-clouds.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-clouds.png
rename to htdocs/theme/eldy/img/weather/weather-clouds.png
diff --git a/public/theme/eldy/img/weather/weather-few-clouds-night.png b/htdocs/theme/eldy/img/weather/weather-few-clouds-night.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-few-clouds-night.png
rename to htdocs/theme/eldy/img/weather/weather-few-clouds-night.png
diff --git a/public/theme/eldy/img/weather/weather-few-clouds.png b/htdocs/theme/eldy/img/weather/weather-few-clouds.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-few-clouds.png
rename to htdocs/theme/eldy/img/weather/weather-few-clouds.png
diff --git a/public/theme/eldy/img/weather/weather-freezing-rain.png b/htdocs/theme/eldy/img/weather/weather-freezing-rain.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-freezing-rain.png
rename to htdocs/theme/eldy/img/weather/weather-freezing-rain.png
diff --git a/public/theme/eldy/img/weather/weather-hail.png b/htdocs/theme/eldy/img/weather/weather-hail.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-hail.png
rename to htdocs/theme/eldy/img/weather/weather-hail.png
diff --git a/public/theme/eldy/img/weather/weather-many-clouds.png b/htdocs/theme/eldy/img/weather/weather-many-clouds.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-many-clouds.png
rename to htdocs/theme/eldy/img/weather/weather-many-clouds.png
diff --git a/public/theme/eldy/img/weather/weather-mist.png b/htdocs/theme/eldy/img/weather/weather-mist.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-mist.png
rename to htdocs/theme/eldy/img/weather/weather-mist.png
diff --git a/public/theme/eldy/img/weather/weather-showers-day.png b/htdocs/theme/eldy/img/weather/weather-showers-day.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-showers-day.png
rename to htdocs/theme/eldy/img/weather/weather-showers-day.png
diff --git a/public/theme/eldy/img/weather/weather-showers-night.png b/htdocs/theme/eldy/img/weather/weather-showers-night.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-showers-night.png
rename to htdocs/theme/eldy/img/weather/weather-showers-night.png
diff --git a/public/theme/eldy/img/weather/weather-showers-scattered-day.png b/htdocs/theme/eldy/img/weather/weather-showers-scattered-day.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-showers-scattered-day.png
rename to htdocs/theme/eldy/img/weather/weather-showers-scattered-day.png
diff --git a/public/theme/eldy/img/weather/weather-showers-scattered-night.png b/htdocs/theme/eldy/img/weather/weather-showers-scattered-night.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-showers-scattered-night.png
rename to htdocs/theme/eldy/img/weather/weather-showers-scattered-night.png
diff --git a/public/theme/eldy/img/weather/weather-showers-scattered.png b/htdocs/theme/eldy/img/weather/weather-showers-scattered.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-showers-scattered.png
rename to htdocs/theme/eldy/img/weather/weather-showers-scattered.png
diff --git a/public/theme/eldy/img/weather/weather-showers.png b/htdocs/theme/eldy/img/weather/weather-showers.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-showers.png
rename to htdocs/theme/eldy/img/weather/weather-showers.png
diff --git a/public/theme/eldy/img/weather/weather-snow-rain.png b/htdocs/theme/eldy/img/weather/weather-snow-rain.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-snow-rain.png
rename to htdocs/theme/eldy/img/weather/weather-snow-rain.png
diff --git a/public/theme/eldy/img/weather/weather-snow-scattered-day.png b/htdocs/theme/eldy/img/weather/weather-snow-scattered-day.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-snow-scattered-day.png
rename to htdocs/theme/eldy/img/weather/weather-snow-scattered-day.png
diff --git a/public/theme/eldy/img/weather/weather-snow-scattered-night.png b/htdocs/theme/eldy/img/weather/weather-snow-scattered-night.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-snow-scattered-night.png
rename to htdocs/theme/eldy/img/weather/weather-snow-scattered-night.png
diff --git a/public/theme/eldy/img/weather/weather-snow-scattered.png b/htdocs/theme/eldy/img/weather/weather-snow-scattered.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-snow-scattered.png
rename to htdocs/theme/eldy/img/weather/weather-snow-scattered.png
diff --git a/public/theme/eldy/img/weather/weather-snow.png b/htdocs/theme/eldy/img/weather/weather-snow.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-snow.png
rename to htdocs/theme/eldy/img/weather/weather-snow.png
diff --git a/public/theme/eldy/img/weather/weather-storm-day.png b/htdocs/theme/eldy/img/weather/weather-storm-day.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-storm-day.png
rename to htdocs/theme/eldy/img/weather/weather-storm-day.png
diff --git a/public/theme/eldy/img/weather/weather-storm-night.png b/htdocs/theme/eldy/img/weather/weather-storm-night.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-storm-night.png
rename to htdocs/theme/eldy/img/weather/weather-storm-night.png
diff --git a/public/theme/eldy/img/weather/weather-storm.png b/htdocs/theme/eldy/img/weather/weather-storm.png
similarity index 100%
rename from public/theme/eldy/img/weather/weather-storm.png
rename to htdocs/theme/eldy/img/weather/weather-storm.png
diff --git a/public/theme/eldy/img/working.gif b/htdocs/theme/eldy/img/working.gif
similarity index 100%
rename from public/theme/eldy/img/working.gif
rename to htdocs/theme/eldy/img/working.gif
diff --git a/public/theme/eldy/img/working2.gif b/htdocs/theme/eldy/img/working2.gif
similarity index 100%
rename from public/theme/eldy/img/working2.gif
rename to htdocs/theme/eldy/img/working2.gif
diff --git a/public/theme/eldy/index.html b/htdocs/theme/eldy/index.html
similarity index 100%
rename from public/theme/eldy/index.html
rename to htdocs/theme/eldy/index.html
diff --git a/public/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
similarity index 100%
rename from public/theme/eldy/style.css.php
rename to htdocs/theme/eldy/style.css.php
diff --git a/public/theme/eldy/thumb.png b/htdocs/theme/eldy/thumb.png
similarity index 100%
rename from public/theme/eldy/thumb.png
rename to htdocs/theme/eldy/thumb.png
diff --git a/public/theme/eldy/tpl/README b/htdocs/theme/eldy/tpl/README
similarity index 100%
rename from public/theme/eldy/tpl/README
rename to htdocs/theme/eldy/tpl/README
diff --git a/public/theme/eldy/tpl/index.html b/htdocs/theme/eldy/tpl/index.html
similarity index 100%
rename from public/theme/eldy/tpl/index.html
rename to htdocs/theme/eldy/tpl/index.html
diff --git a/public/theme/index.html b/htdocs/theme/index.html
similarity index 100%
rename from public/theme/index.html
rename to htdocs/theme/index.html
diff --git a/public/theme/login_background.png b/htdocs/theme/login_background.png
similarity index 100%
rename from public/theme/login_background.png
rename to htdocs/theme/login_background.png
diff --git a/public/theme/login_logo.png b/htdocs/theme/login_logo.png
similarity index 100%
rename from public/theme/login_logo.png
rename to htdocs/theme/login_logo.png
diff --git a/public/theme/md/.gitignore b/htdocs/theme/md/.gitignore
similarity index 100%
rename from public/theme/md/.gitignore
rename to htdocs/theme/md/.gitignore
diff --git a/public/theme/md/AUTHOR b/htdocs/theme/md/AUTHOR
similarity index 100%
rename from public/theme/md/AUTHOR
rename to htdocs/theme/md/AUTHOR
diff --git a/public/theme/md/ckeditor/config.js b/htdocs/theme/md/ckeditor/config.js
similarity index 100%
rename from public/theme/md/ckeditor/config.js
rename to htdocs/theme/md/ckeditor/config.js
diff --git a/public/theme/md/ckeditor/index.html b/htdocs/theme/md/ckeditor/index.html
similarity index 100%
rename from public/theme/md/ckeditor/index.html
rename to htdocs/theme/md/ckeditor/index.html
diff --git a/public/theme/md/graph-color.php b/htdocs/theme/md/graph-color.php
similarity index 100%
rename from public/theme/md/graph-color.php
rename to htdocs/theme/md/graph-color.php
diff --git a/public/theme/md/img/1downarrow.png b/htdocs/theme/md/img/1downarrow.png
similarity index 100%
rename from public/theme/md/img/1downarrow.png
rename to htdocs/theme/md/img/1downarrow.png
diff --git a/public/theme/md/img/1downarrow_selected.png b/htdocs/theme/md/img/1downarrow_selected.png
similarity index 100%
rename from public/theme/md/img/1downarrow_selected.png
rename to htdocs/theme/md/img/1downarrow_selected.png
diff --git a/public/theme/md/img/1leftarrow.png b/htdocs/theme/md/img/1leftarrow.png
similarity index 100%
rename from public/theme/md/img/1leftarrow.png
rename to htdocs/theme/md/img/1leftarrow.png
diff --git a/public/theme/md/img/1leftarrow_selected.png b/htdocs/theme/md/img/1leftarrow_selected.png
similarity index 100%
rename from public/theme/md/img/1leftarrow_selected.png
rename to htdocs/theme/md/img/1leftarrow_selected.png
diff --git a/public/theme/md/img/1rightarrow.png b/htdocs/theme/md/img/1rightarrow.png
similarity index 100%
rename from public/theme/md/img/1rightarrow.png
rename to htdocs/theme/md/img/1rightarrow.png
diff --git a/public/theme/md/img/1rightarrow_selected.png b/htdocs/theme/md/img/1rightarrow_selected.png
similarity index 100%
rename from public/theme/md/img/1rightarrow_selected.png
rename to htdocs/theme/md/img/1rightarrow_selected.png
diff --git a/public/theme/md/img/1uparrow.png b/htdocs/theme/md/img/1uparrow.png
similarity index 100%
rename from public/theme/md/img/1uparrow.png
rename to htdocs/theme/md/img/1uparrow.png
diff --git a/public/theme/md/img/1uparrow_selected.png b/htdocs/theme/md/img/1uparrow_selected.png
similarity index 100%
rename from public/theme/md/img/1uparrow_selected.png
rename to htdocs/theme/md/img/1uparrow_selected.png
diff --git a/public/theme/md/img/addfile.png b/htdocs/theme/md/img/addfile.png
similarity index 100%
rename from public/theme/md/img/addfile.png
rename to htdocs/theme/md/img/addfile.png
diff --git a/public/theme/md/img/background.png b/htdocs/theme/md/img/background.png
similarity index 100%
rename from public/theme/md/img/background.png
rename to htdocs/theme/md/img/background.png
diff --git a/public/theme/md/img/bg-bas-rubrique.png b/htdocs/theme/md/img/bg-bas-rubrique.png
similarity index 100%
rename from public/theme/md/img/bg-bas-rubrique.png
rename to htdocs/theme/md/img/bg-bas-rubrique.png
diff --git a/public/theme/md/img/bg-rubrique.png b/htdocs/theme/md/img/bg-rubrique.png
similarity index 100%
rename from public/theme/md/img/bg-rubrique.png
rename to htdocs/theme/md/img/bg-rubrique.png
diff --git a/public/theme/md/img/bg-titre-rubrique.png b/htdocs/theme/md/img/bg-titre-rubrique.png
similarity index 100%
rename from public/theme/md/img/bg-titre-rubrique.png
rename to htdocs/theme/md/img/bg-titre-rubrique.png
diff --git a/public/theme/md/img/button_bg.png b/htdocs/theme/md/img/button_bg.png
similarity index 100%
rename from public/theme/md/img/button_bg.png
rename to htdocs/theme/md/img/button_bg.png
diff --git a/public/theme/md/img/button_edit.png b/htdocs/theme/md/img/button_edit.png
similarity index 100%
rename from public/theme/md/img/button_edit.png
rename to htdocs/theme/md/img/button_edit.png
diff --git a/public/theme/md/img/calc.png b/htdocs/theme/md/img/calc.png
similarity index 100%
rename from public/theme/md/img/calc.png
rename to htdocs/theme/md/img/calc.png
diff --git a/public/theme/md/img/calendar.png b/htdocs/theme/md/img/calendar.png
similarity index 100%
rename from public/theme/md/img/calendar.png
rename to htdocs/theme/md/img/calendar.png
diff --git a/public/theme/md/img/call.png b/htdocs/theme/md/img/call.png
similarity index 100%
rename from public/theme/md/img/call.png
rename to htdocs/theme/md/img/call.png
diff --git a/public/theme/md/img/call_out.png b/htdocs/theme/md/img/call_out.png
similarity index 100%
rename from public/theme/md/img/call_out.png
rename to htdocs/theme/md/img/call_out.png
diff --git a/public/theme/md/img/close.png b/htdocs/theme/md/img/close.png
similarity index 100%
rename from public/theme/md/img/close.png
rename to htdocs/theme/md/img/close.png
diff --git a/public/theme/md/img/close_title.png b/htdocs/theme/md/img/close_title.png
similarity index 100%
rename from public/theme/md/img/close_title.png
rename to htdocs/theme/md/img/close_title.png
diff --git a/public/theme/md/img/credit_card.png b/htdocs/theme/md/img/credit_card.png
similarity index 100%
rename from public/theme/md/img/credit_card.png
rename to htdocs/theme/md/img/credit_card.png
diff --git a/public/theme/md/img/delete.png b/htdocs/theme/md/img/delete.png
similarity index 100%
rename from public/theme/md/img/delete.png
rename to htdocs/theme/md/img/delete.png
diff --git a/public/theme/md/img/detail.png b/htdocs/theme/md/img/detail.png
similarity index 100%
rename from public/theme/md/img/detail.png
rename to htdocs/theme/md/img/detail.png
diff --git a/public/theme/md/img/disable.png b/htdocs/theme/md/img/disable.png
similarity index 100%
rename from public/theme/md/img/disable.png
rename to htdocs/theme/md/img/disable.png
diff --git a/public/theme/md/img/edit.png b/htdocs/theme/md/img/edit.png
similarity index 100%
rename from public/theme/md/img/edit.png
rename to htdocs/theme/md/img/edit.png
diff --git a/public/theme/md/img/edit_add.png b/htdocs/theme/md/img/edit_add.png
similarity index 100%
rename from public/theme/md/img/edit_add.png
rename to htdocs/theme/md/img/edit_add.png
diff --git a/public/theme/md/img/edit_remove.png b/htdocs/theme/md/img/edit_remove.png
similarity index 100%
rename from public/theme/md/img/edit_remove.png
rename to htdocs/theme/md/img/edit_remove.png
diff --git a/public/theme/md/img/editdelete.png b/htdocs/theme/md/img/editdelete.png
similarity index 100%
rename from public/theme/md/img/editdelete.png
rename to htdocs/theme/md/img/editdelete.png
diff --git a/public/theme/md/img/error.png b/htdocs/theme/md/img/error.png
similarity index 100%
rename from public/theme/md/img/error.png
rename to htdocs/theme/md/img/error.png
diff --git a/public/theme/md/img/external.png b/htdocs/theme/md/img/external.png
similarity index 100%
rename from public/theme/md/img/external.png
rename to htdocs/theme/md/img/external.png
diff --git a/public/theme/md/img/favicon.ico b/htdocs/theme/md/img/favicon.ico
similarity index 100%
rename from public/theme/md/img/favicon.ico
rename to htdocs/theme/md/img/favicon.ico
diff --git a/public/theme/md/img/file.png b/htdocs/theme/md/img/file.png
similarity index 100%
rename from public/theme/md/img/file.png
rename to htdocs/theme/md/img/file.png
diff --git a/public/theme/md/img/filenew.png b/htdocs/theme/md/img/filenew.png
similarity index 100%
rename from public/theme/md/img/filenew.png
rename to htdocs/theme/md/img/filenew.png
diff --git a/public/theme/md/img/filter.png b/htdocs/theme/md/img/filter.png
similarity index 100%
rename from public/theme/md/img/filter.png
rename to htdocs/theme/md/img/filter.png
diff --git a/public/theme/md/img/folder-open.png b/htdocs/theme/md/img/folder-open.png
similarity index 100%
rename from public/theme/md/img/folder-open.png
rename to htdocs/theme/md/img/folder-open.png
diff --git a/public/theme/md/img/folder.png b/htdocs/theme/md/img/folder.png
similarity index 100%
rename from public/theme/md/img/folder.png
rename to htdocs/theme/md/img/folder.png
diff --git a/public/theme/md/img/gradient.gif b/htdocs/theme/md/img/gradient.gif
similarity index 100%
rename from public/theme/md/img/gradient.gif
rename to htdocs/theme/md/img/gradient.gif
diff --git a/public/theme/md/img/grip.png b/htdocs/theme/md/img/grip.png
similarity index 100%
rename from public/theme/md/img/grip.png
rename to htdocs/theme/md/img/grip.png
diff --git a/public/theme/md/img/grip_title.png b/htdocs/theme/md/img/grip_title.png
similarity index 100%
rename from public/theme/md/img/grip_title.png
rename to htdocs/theme/md/img/grip_title.png
diff --git a/public/theme/md/img/headbg.jpg b/htdocs/theme/md/img/headbg.jpg
similarity index 100%
rename from public/theme/md/img/headbg.jpg
rename to htdocs/theme/md/img/headbg.jpg
diff --git a/public/theme/md/img/headbg2.jpg b/htdocs/theme/md/img/headbg2.jpg
similarity index 100%
rename from public/theme/md/img/headbg2.jpg
rename to htdocs/theme/md/img/headbg2.jpg
diff --git a/public/theme/md/img/help.png b/htdocs/theme/md/img/help.png
similarity index 100%
rename from public/theme/md/img/help.png
rename to htdocs/theme/md/img/help.png
diff --git a/public/theme/md/img/helpdoc.png b/htdocs/theme/md/img/helpdoc.png
similarity index 100%
rename from public/theme/md/img/helpdoc.png
rename to htdocs/theme/md/img/helpdoc.png
diff --git a/public/theme/md/img/helpdoc_top.png b/htdocs/theme/md/img/helpdoc_top.png
similarity index 100%
rename from public/theme/md/img/helpdoc_top.png
rename to htdocs/theme/md/img/helpdoc_top.png
diff --git a/public/theme/md/img/high.png b/htdocs/theme/md/img/high.png
similarity index 100%
rename from public/theme/md/img/high.png
rename to htdocs/theme/md/img/high.png
diff --git a/public/theme/md/img/history.png b/htdocs/theme/md/img/history.png
similarity index 100%
rename from public/theme/md/img/history.png
rename to htdocs/theme/md/img/history.png
diff --git a/public/theme/md/img/index.html b/htdocs/theme/md/img/index.html
similarity index 100%
rename from public/theme/md/img/index.html
rename to htdocs/theme/md/img/index.html
diff --git a/public/theme/md/img/info.png b/htdocs/theme/md/img/info.png
similarity index 100%
rename from public/theme/md/img/info.png
rename to htdocs/theme/md/img/info.png
diff --git a/public/theme/md/img/info_black.png b/htdocs/theme/md/img/info_black.png
similarity index 100%
rename from public/theme/md/img/info_black.png
rename to htdocs/theme/md/img/info_black.png
diff --git a/public/theme/md/img/list.png b/htdocs/theme/md/img/list.png
similarity index 100%
rename from public/theme/md/img/list.png
rename to htdocs/theme/md/img/list.png
diff --git a/public/theme/md/img/liste_titre.png b/htdocs/theme/md/img/liste_titre.png
similarity index 100%
rename from public/theme/md/img/liste_titre.png
rename to htdocs/theme/md/img/liste_titre.png
diff --git a/public/theme/md/img/liste_titre2.png b/htdocs/theme/md/img/liste_titre2.png
similarity index 100%
rename from public/theme/md/img/liste_titre2.png
rename to htdocs/theme/md/img/liste_titre2.png
diff --git a/public/theme/md/img/listlight.png b/htdocs/theme/md/img/listlight.png
similarity index 100%
rename from public/theme/md/img/listlight.png
rename to htdocs/theme/md/img/listlight.png
diff --git a/public/theme/md/img/lock.png b/htdocs/theme/md/img/lock.png
similarity index 100%
rename from public/theme/md/img/lock.png
rename to htdocs/theme/md/img/lock.png
diff --git a/public/theme/md/img/login_background.png b/htdocs/theme/md/img/login_background.png
similarity index 100%
rename from public/theme/md/img/login_background.png
rename to htdocs/theme/md/img/login_background.png
diff --git a/public/theme/md/img/logo_setup.svg b/htdocs/theme/md/img/logo_setup.svg
similarity index 100%
rename from public/theme/md/img/logo_setup.svg
rename to htdocs/theme/md/img/logo_setup.svg
diff --git a/public/theme/md/img/logout.png b/htdocs/theme/md/img/logout.png
similarity index 100%
rename from public/theme/md/img/logout.png
rename to htdocs/theme/md/img/logout.png
diff --git a/public/theme/md/img/logout_top.png b/htdocs/theme/md/img/logout_top.png
similarity index 100%
rename from public/theme/md/img/logout_top.png
rename to htdocs/theme/md/img/logout_top.png
diff --git a/public/theme/md/img/menu.png b/htdocs/theme/md/img/menu.png
similarity index 100%
rename from public/theme/md/img/menu.png
rename to htdocs/theme/md/img/menu.png
diff --git a/public/theme/md/img/menus/agenda.png b/htdocs/theme/md/img/menus/agenda.png
similarity index 100%
rename from public/theme/md/img/menus/agenda.png
rename to htdocs/theme/md/img/menus/agenda.png
diff --git a/public/theme/md/img/menus/bank.png b/htdocs/theme/md/img/menus/bank.png
similarity index 100%
rename from public/theme/md/img/menus/bank.png
rename to htdocs/theme/md/img/menus/bank.png
diff --git a/public/theme/md/img/menus/cart.png b/htdocs/theme/md/img/menus/cart.png
similarity index 100%
rename from public/theme/md/img/menus/cart.png
rename to htdocs/theme/md/img/menus/cart.png
diff --git a/public/theme/md/img/menus/chart.png b/htdocs/theme/md/img/menus/chart.png
similarity index 100%
rename from public/theme/md/img/menus/chart.png
rename to htdocs/theme/md/img/menus/chart.png
diff --git a/public/theme/md/img/menus/commercial.png b/htdocs/theme/md/img/menus/commercial.png
similarity index 100%
rename from public/theme/md/img/menus/commercial.png
rename to htdocs/theme/md/img/menus/commercial.png
diff --git a/public/theme/md/img/menus/company.png b/htdocs/theme/md/img/menus/company.png
similarity index 100%
rename from public/theme/md/img/menus/company.png
rename to htdocs/theme/md/img/menus/company.png
diff --git a/public/theme/md/img/menus/ecm.png b/htdocs/theme/md/img/menus/ecm.png
similarity index 100%
rename from public/theme/md/img/menus/ecm.png
rename to htdocs/theme/md/img/menus/ecm.png
diff --git a/public/theme/md/img/menus/externalsite.png b/htdocs/theme/md/img/menus/externalsite.png
similarity index 100%
rename from public/theme/md/img/menus/externalsite.png
rename to htdocs/theme/md/img/menus/externalsite.png
diff --git a/public/theme/md/img/menus/ftp.png b/htdocs/theme/md/img/menus/ftp.png
similarity index 100%
rename from public/theme/md/img/menus/ftp.png
rename to htdocs/theme/md/img/menus/ftp.png
diff --git a/public/theme/md/img/menus/generic1.png b/htdocs/theme/md/img/menus/generic1.png
similarity index 100%
rename from public/theme/md/img/menus/generic1.png
rename to htdocs/theme/md/img/menus/generic1.png
diff --git a/public/theme/md/img/menus/generic2.png b/htdocs/theme/md/img/menus/generic2.png
similarity index 100%
rename from public/theme/md/img/menus/generic2.png
rename to htdocs/theme/md/img/menus/generic2.png
diff --git a/public/theme/md/img/menus/generic3.png b/htdocs/theme/md/img/menus/generic3.png
similarity index 100%
rename from public/theme/md/img/menus/generic3.png
rename to htdocs/theme/md/img/menus/generic3.png
diff --git a/public/theme/md/img/menus/generic4.png b/htdocs/theme/md/img/menus/generic4.png
similarity index 100%
rename from public/theme/md/img/menus/generic4.png
rename to htdocs/theme/md/img/menus/generic4.png
diff --git a/public/theme/md/img/menus/globe.png b/htdocs/theme/md/img/menus/globe.png
similarity index 100%
rename from public/theme/md/img/menus/globe.png
rename to htdocs/theme/md/img/menus/globe.png
diff --git a/public/theme/md/img/menus/graph.png b/htdocs/theme/md/img/menus/graph.png
similarity index 100%
rename from public/theme/md/img/menus/graph.png
rename to htdocs/theme/md/img/menus/graph.png
diff --git a/public/theme/md/img/menus/holiday.png b/htdocs/theme/md/img/menus/holiday.png
similarity index 100%
rename from public/theme/md/img/menus/holiday.png
rename to htdocs/theme/md/img/menus/holiday.png
diff --git a/public/theme/md/img/menus/home.png b/htdocs/theme/md/img/menus/home.png
similarity index 100%
rename from public/theme/md/img/menus/home.png
rename to htdocs/theme/md/img/menus/home.png
diff --git a/public/theme/md/img/menus/index.html b/htdocs/theme/md/img/menus/index.html
similarity index 100%
rename from public/theme/md/img/menus/index.html
rename to htdocs/theme/md/img/menus/index.html
diff --git a/public/theme/md/img/menus/mail.png b/htdocs/theme/md/img/menus/mail.png
similarity index 100%
rename from public/theme/md/img/menus/mail.png
rename to htdocs/theme/md/img/menus/mail.png
diff --git a/public/theme/md/img/menus/members.png b/htdocs/theme/md/img/menus/members.png
similarity index 100%
rename from public/theme/md/img/menus/members.png
rename to htdocs/theme/md/img/menus/members.png
diff --git a/public/theme/md/img/menus/menu.png b/htdocs/theme/md/img/menus/menu.png
similarity index 100%
rename from public/theme/md/img/menus/menu.png
rename to htdocs/theme/md/img/menus/menu.png
diff --git a/public/theme/md/img/menus/money.png b/htdocs/theme/md/img/menus/money.png
similarity index 100%
rename from public/theme/md/img/menus/money.png
rename to htdocs/theme/md/img/menus/money.png
diff --git a/public/theme/md/img/menus/pointofsale.png b/htdocs/theme/md/img/menus/pointofsale.png
similarity index 100%
rename from public/theme/md/img/menus/pointofsale.png
rename to htdocs/theme/md/img/menus/pointofsale.png
diff --git a/public/theme/md/img/menus/products.png b/htdocs/theme/md/img/menus/products.png
similarity index 100%
rename from public/theme/md/img/menus/products.png
rename to htdocs/theme/md/img/menus/products.png
diff --git a/public/theme/md/img/menus/project.png b/htdocs/theme/md/img/menus/project.png
similarity index 100%
rename from public/theme/md/img/menus/project.png
rename to htdocs/theme/md/img/menus/project.png
diff --git a/public/theme/md/img/menus/shop.png b/htdocs/theme/md/img/menus/shop.png
similarity index 100%
rename from public/theme/md/img/menus/shop.png
rename to htdocs/theme/md/img/menus/shop.png
diff --git a/public/theme/md/img/menus/tools.png b/htdocs/theme/md/img/menus/tools.png
similarity index 100%
rename from public/theme/md/img/menus/tools.png
rename to htdocs/theme/md/img/menus/tools.png
diff --git a/public/theme/md/img/menutab-r.png b/htdocs/theme/md/img/menutab-r.png
similarity index 100%
rename from public/theme/md/img/menutab-r.png
rename to htdocs/theme/md/img/menutab-r.png
diff --git a/public/theme/md/img/nav-overlay.png b/htdocs/theme/md/img/nav-overlay.png
similarity index 100%
rename from public/theme/md/img/nav-overlay.png
rename to htdocs/theme/md/img/nav-overlay.png
diff --git a/public/theme/md/img/nav-overlay3.png b/htdocs/theme/md/img/nav-overlay3.png
similarity index 100%
rename from public/theme/md/img/nav-overlay3.png
rename to htdocs/theme/md/img/nav-overlay3.png
diff --git a/public/theme/md/img/next.png b/htdocs/theme/md/img/next.png
similarity index 100%
rename from public/theme/md/img/next.png
rename to htdocs/theme/md/img/next.png
diff --git a/public/theme/md/img/nographyet.svg b/htdocs/theme/md/img/nographyet.svg
similarity index 100%
rename from public/theme/md/img/nographyet.svg
rename to htdocs/theme/md/img/nographyet.svg
diff --git a/public/theme/md/img/object_account.png b/htdocs/theme/md/img/object_account.png
similarity index 100%
rename from public/theme/md/img/object_account.png
rename to htdocs/theme/md/img/object_account.png
diff --git a/public/theme/md/img/object_accounting.png b/htdocs/theme/md/img/object_accounting.png
similarity index 100%
rename from public/theme/md/img/object_accounting.png
rename to htdocs/theme/md/img/object_accounting.png
diff --git a/public/theme/md/img/object_action.png b/htdocs/theme/md/img/object_action.png
similarity index 100%
rename from public/theme/md/img/object_action.png
rename to htdocs/theme/md/img/object_action.png
diff --git a/public/theme/md/img/object_address.png b/htdocs/theme/md/img/object_address.png
similarity index 100%
rename from public/theme/md/img/object_address.png
rename to htdocs/theme/md/img/object_address.png
diff --git a/public/theme/md/img/object_barcode.png b/htdocs/theme/md/img/object_barcode.png
similarity index 100%
rename from public/theme/md/img/object_barcode.png
rename to htdocs/theme/md/img/object_barcode.png
diff --git a/public/theme/md/img/object_bill.png b/htdocs/theme/md/img/object_bill.png
similarity index 100%
rename from public/theme/md/img/object_bill.png
rename to htdocs/theme/md/img/object_bill.png
diff --git a/public/theme/md/img/object_billa.png b/htdocs/theme/md/img/object_billa.png
similarity index 100%
rename from public/theme/md/img/object_billa.png
rename to htdocs/theme/md/img/object_billa.png
diff --git a/public/theme/md/img/object_billd.png b/htdocs/theme/md/img/object_billd.png
similarity index 100%
rename from public/theme/md/img/object_billd.png
rename to htdocs/theme/md/img/object_billd.png
diff --git a/public/theme/md/img/object_billr.png b/htdocs/theme/md/img/object_billr.png
similarity index 100%
rename from public/theme/md/img/object_billr.png
rename to htdocs/theme/md/img/object_billr.png
diff --git a/public/theme/md/img/object_book.png b/htdocs/theme/md/img/object_book.png
similarity index 100%
rename from public/theme/md/img/object_book.png
rename to htdocs/theme/md/img/object_book.png
diff --git a/public/theme/md/img/object_bookmark.png b/htdocs/theme/md/img/object_bookmark.png
similarity index 100%
rename from public/theme/md/img/object_bookmark.png
rename to htdocs/theme/md/img/object_bookmark.png
diff --git a/public/theme/md/img/object_building.png b/htdocs/theme/md/img/object_building.png
similarity index 100%
rename from public/theme/md/img/object_building.png
rename to htdocs/theme/md/img/object_building.png
diff --git a/public/theme/md/img/object_calendar.png b/htdocs/theme/md/img/object_calendar.png
similarity index 100%
rename from public/theme/md/img/object_calendar.png
rename to htdocs/theme/md/img/object_calendar.png
diff --git a/public/theme/md/img/object_calendarday.png b/htdocs/theme/md/img/object_calendarday.png
similarity index 100%
rename from public/theme/md/img/object_calendarday.png
rename to htdocs/theme/md/img/object_calendarday.png
diff --git a/public/theme/md/img/object_calendargantt.png b/htdocs/theme/md/img/object_calendargantt.png
similarity index 100%
rename from public/theme/md/img/object_calendargantt.png
rename to htdocs/theme/md/img/object_calendargantt.png
diff --git a/public/theme/md/img/object_calendarpertype.png b/htdocs/theme/md/img/object_calendarpertype.png
similarity index 100%
rename from public/theme/md/img/object_calendarpertype.png
rename to htdocs/theme/md/img/object_calendarpertype.png
diff --git a/public/theme/md/img/object_calendarperuser.png b/htdocs/theme/md/img/object_calendarperuser.png
similarity index 100%
rename from public/theme/md/img/object_calendarperuser.png
rename to htdocs/theme/md/img/object_calendarperuser.png
diff --git a/public/theme/md/img/object_calendarweek.png b/htdocs/theme/md/img/object_calendarweek.png
similarity index 100%
rename from public/theme/md/img/object_calendarweek.png
rename to htdocs/theme/md/img/object_calendarweek.png
diff --git a/public/theme/md/img/object_category-expanded.png b/htdocs/theme/md/img/object_category-expanded.png
similarity index 100%
rename from public/theme/md/img/object_category-expanded.png
rename to htdocs/theme/md/img/object_category-expanded.png
diff --git a/public/theme/md/img/object_category.png b/htdocs/theme/md/img/object_category.png
similarity index 100%
rename from public/theme/md/img/object_category.png
rename to htdocs/theme/md/img/object_category.png
diff --git a/public/theme/md/img/object_commercial.png b/htdocs/theme/md/img/object_commercial.png
similarity index 100%
rename from public/theme/md/img/object_commercial.png
rename to htdocs/theme/md/img/object_commercial.png
diff --git a/public/theme/md/img/object_company.png b/htdocs/theme/md/img/object_company.png
similarity index 100%
rename from public/theme/md/img/object_company.png
rename to htdocs/theme/md/img/object_company.png
diff --git a/public/theme/md/img/object_contact.png b/htdocs/theme/md/img/object_contact.png
similarity index 100%
rename from public/theme/md/img/object_contact.png
rename to htdocs/theme/md/img/object_contact.png
diff --git a/public/theme/md/img/object_contract.png b/htdocs/theme/md/img/object_contract.png
similarity index 100%
rename from public/theme/md/img/object_contract.png
rename to htdocs/theme/md/img/object_contract.png
diff --git a/public/theme/md/img/object_cron.png b/htdocs/theme/md/img/object_cron.png
similarity index 100%
rename from public/theme/md/img/object_cron.png
rename to htdocs/theme/md/img/object_cron.png
diff --git a/public/theme/md/img/object_dir.png b/htdocs/theme/md/img/object_dir.png
similarity index 100%
rename from public/theme/md/img/object_dir.png
rename to htdocs/theme/md/img/object_dir.png
diff --git a/public/theme/md/img/object_email.png b/htdocs/theme/md/img/object_email.png
similarity index 100%
rename from public/theme/md/img/object_email.png
rename to htdocs/theme/md/img/object_email.png
diff --git a/public/theme/md/img/object_energy.png b/htdocs/theme/md/img/object_energy.png
similarity index 100%
rename from public/theme/md/img/object_energy.png
rename to htdocs/theme/md/img/object_energy.png
diff --git a/public/theme/md/img/object_generic.png b/htdocs/theme/md/img/object_generic.png
similarity index 100%
rename from public/theme/md/img/object_generic.png
rename to htdocs/theme/md/img/object_generic.png
diff --git a/public/theme/md/img/object_globe.png b/htdocs/theme/md/img/object_globe.png
similarity index 100%
rename from public/theme/md/img/object_globe.png
rename to htdocs/theme/md/img/object_globe.png
diff --git a/public/theme/md/img/object_gravatar.png b/htdocs/theme/md/img/object_gravatar.png
similarity index 100%
rename from public/theme/md/img/object_gravatar.png
rename to htdocs/theme/md/img/object_gravatar.png
diff --git a/public/theme/md/img/object_group.png b/htdocs/theme/md/img/object_group.png
similarity index 100%
rename from public/theme/md/img/object_group.png
rename to htdocs/theme/md/img/object_group.png
diff --git a/public/theme/md/img/object_holiday.png b/htdocs/theme/md/img/object_holiday.png
similarity index 100%
rename from public/theme/md/img/object_holiday.png
rename to htdocs/theme/md/img/object_holiday.png
diff --git a/public/theme/md/img/object_intervention.png b/htdocs/theme/md/img/object_intervention.png
similarity index 100%
rename from public/theme/md/img/object_intervention.png
rename to htdocs/theme/md/img/object_intervention.png
diff --git a/public/theme/md/img/object_invoice.png b/htdocs/theme/md/img/object_invoice.png
similarity index 100%
rename from public/theme/md/img/object_invoice.png
rename to htdocs/theme/md/img/object_invoice.png
diff --git a/public/theme/md/img/object_label.png b/htdocs/theme/md/img/object_label.png
similarity index 100%
rename from public/theme/md/img/object_label.png
rename to htdocs/theme/md/img/object_label.png
diff --git a/public/theme/md/img/object_list.png b/htdocs/theme/md/img/object_list.png
similarity index 100%
rename from public/theme/md/img/object_list.png
rename to htdocs/theme/md/img/object_list.png
diff --git a/public/theme/md/img/object_margin.png b/htdocs/theme/md/img/object_margin.png
similarity index 100%
rename from public/theme/md/img/object_margin.png
rename to htdocs/theme/md/img/object_margin.png
diff --git a/public/theme/md/img/object_opensurvey.png b/htdocs/theme/md/img/object_opensurvey.png
similarity index 100%
rename from public/theme/md/img/object_opensurvey.png
rename to htdocs/theme/md/img/object_opensurvey.png
diff --git a/public/theme/md/img/object_order.png b/htdocs/theme/md/img/object_order.png
similarity index 100%
rename from public/theme/md/img/object_order.png
rename to htdocs/theme/md/img/object_order.png
diff --git a/public/theme/md/img/object_payment.png b/htdocs/theme/md/img/object_payment.png
similarity index 100%
rename from public/theme/md/img/object_payment.png
rename to htdocs/theme/md/img/object_payment.png
diff --git a/public/theme/md/img/object_phoning.png b/htdocs/theme/md/img/object_phoning.png
similarity index 100%
rename from public/theme/md/img/object_phoning.png
rename to htdocs/theme/md/img/object_phoning.png
diff --git a/public/theme/md/img/object_phoning_fax.png b/htdocs/theme/md/img/object_phoning_fax.png
similarity index 100%
rename from public/theme/md/img/object_phoning_fax.png
rename to htdocs/theme/md/img/object_phoning_fax.png
diff --git a/public/theme/md/img/object_printer.png b/htdocs/theme/md/img/object_printer.png
similarity index 100%
rename from public/theme/md/img/object_printer.png
rename to htdocs/theme/md/img/object_printer.png
diff --git a/public/theme/md/img/object_product.png b/htdocs/theme/md/img/object_product.png
similarity index 100%
rename from public/theme/md/img/object_product.png
rename to htdocs/theme/md/img/object_product.png
diff --git a/public/theme/md/img/object_project.png b/htdocs/theme/md/img/object_project.png
similarity index 100%
rename from public/theme/md/img/object_project.png
rename to htdocs/theme/md/img/object_project.png
diff --git a/public/theme/md/img/object_projectpub.png b/htdocs/theme/md/img/object_projectpub.png
similarity index 100%
rename from public/theme/md/img/object_projectpub.png
rename to htdocs/theme/md/img/object_projectpub.png
diff --git a/public/theme/md/img/object_projecttask.png b/htdocs/theme/md/img/object_projecttask.png
similarity index 100%
rename from public/theme/md/img/object_projecttask.png
rename to htdocs/theme/md/img/object_projecttask.png
diff --git a/public/theme/md/img/object_propal.png b/htdocs/theme/md/img/object_propal.png
similarity index 100%
rename from public/theme/md/img/object_propal.png
rename to htdocs/theme/md/img/object_propal.png
diff --git a/public/theme/md/img/object_reduc.png b/htdocs/theme/md/img/object_reduc.png
similarity index 100%
rename from public/theme/md/img/object_reduc.png
rename to htdocs/theme/md/img/object_reduc.png
diff --git a/public/theme/md/img/object_resource.png b/htdocs/theme/md/img/object_resource.png
similarity index 100%
rename from public/theme/md/img/object_resource.png
rename to htdocs/theme/md/img/object_resource.png
diff --git a/public/theme/md/img/object_rss.png b/htdocs/theme/md/img/object_rss.png
similarity index 100%
rename from public/theme/md/img/object_rss.png
rename to htdocs/theme/md/img/object_rss.png
diff --git a/public/theme/md/img/object_sending.png b/htdocs/theme/md/img/object_sending.png
similarity index 100%
rename from public/theme/md/img/object_sending.png
rename to htdocs/theme/md/img/object_sending.png
diff --git a/public/theme/md/img/object_service.png b/htdocs/theme/md/img/object_service.png
similarity index 100%
rename from public/theme/md/img/object_service.png
rename to htdocs/theme/md/img/object_service.png
diff --git a/public/theme/md/img/object_skype.png b/htdocs/theme/md/img/object_skype.png
similarity index 100%
rename from public/theme/md/img/object_skype.png
rename to htdocs/theme/md/img/object_skype.png
diff --git a/public/theme/md/img/object_stock.png b/htdocs/theme/md/img/object_stock.png
similarity index 100%
rename from public/theme/md/img/object_stock.png
rename to htdocs/theme/md/img/object_stock.png
diff --git a/public/theme/md/img/object_supplier_proposal.png b/htdocs/theme/md/img/object_supplier_proposal.png
similarity index 100%
rename from public/theme/md/img/object_supplier_proposal.png
rename to htdocs/theme/md/img/object_supplier_proposal.png
diff --git a/public/theme/md/img/object_task.png b/htdocs/theme/md/img/object_task.png
similarity index 100%
rename from public/theme/md/img/object_task.png
rename to htdocs/theme/md/img/object_task.png
diff --git a/public/theme/md/img/object_task_time.png b/htdocs/theme/md/img/object_task_time.png
similarity index 100%
rename from public/theme/md/img/object_task_time.png
rename to htdocs/theme/md/img/object_task_time.png
diff --git a/public/theme/md/img/object_tax.png b/htdocs/theme/md/img/object_tax.png
similarity index 100%
rename from public/theme/md/img/object_tax.png
rename to htdocs/theme/md/img/object_tax.png
diff --git a/public/theme/md/img/object_technic.png b/htdocs/theme/md/img/object_technic.png
similarity index 100%
rename from public/theme/md/img/object_technic.png
rename to htdocs/theme/md/img/object_technic.png
diff --git a/public/theme/md/img/object_trip.png b/htdocs/theme/md/img/object_trip.png
similarity index 100%
rename from public/theme/md/img/object_trip.png
rename to htdocs/theme/md/img/object_trip.png
diff --git a/public/theme/md/img/object_user.png b/htdocs/theme/md/img/object_user.png
similarity index 100%
rename from public/theme/md/img/object_user.png
rename to htdocs/theme/md/img/object_user.png
diff --git a/public/theme/md/img/off.png b/htdocs/theme/md/img/off.png
similarity index 100%
rename from public/theme/md/img/off.png
rename to htdocs/theme/md/img/off.png
diff --git a/public/theme/md/img/on.png b/htdocs/theme/md/img/on.png
similarity index 100%
rename from public/theme/md/img/on.png
rename to htdocs/theme/md/img/on.png
diff --git a/public/theme/md/img/pdf2.png b/htdocs/theme/md/img/pdf2.png
similarity index 100%
rename from public/theme/md/img/pdf2.png
rename to htdocs/theme/md/img/pdf2.png
diff --git a/public/theme/md/img/pdf3.png b/htdocs/theme/md/img/pdf3.png
similarity index 100%
rename from public/theme/md/img/pdf3.png
rename to htdocs/theme/md/img/pdf3.png
diff --git a/public/theme/md/img/play.png b/htdocs/theme/md/img/play.png
similarity index 100%
rename from public/theme/md/img/play.png
rename to htdocs/theme/md/img/play.png
diff --git a/public/theme/md/img/playdisabled.png b/htdocs/theme/md/img/playdisabled.png
similarity index 100%
rename from public/theme/md/img/playdisabled.png
rename to htdocs/theme/md/img/playdisabled.png
diff --git a/public/theme/md/img/preview.png b/htdocs/theme/md/img/preview.png
similarity index 100%
rename from public/theme/md/img/preview.png
rename to htdocs/theme/md/img/preview.png
diff --git a/public/theme/md/img/preview_ext.png b/htdocs/theme/md/img/preview_ext.png
similarity index 100%
rename from public/theme/md/img/preview_ext.png
rename to htdocs/theme/md/img/preview_ext.png
diff --git a/public/theme/md/img/previous.png b/htdocs/theme/md/img/previous.png
similarity index 100%
rename from public/theme/md/img/previous.png
rename to htdocs/theme/md/img/previous.png
diff --git a/public/theme/md/img/printer.png b/htdocs/theme/md/img/printer.png
similarity index 100%
rename from public/theme/md/img/printer.png
rename to htdocs/theme/md/img/printer.png
diff --git a/public/theme/md/img/printer_top.png b/htdocs/theme/md/img/printer_top.png
similarity index 100%
rename from public/theme/md/img/printer_top.png
rename to htdocs/theme/md/img/printer_top.png
diff --git a/public/theme/md/img/puce.png b/htdocs/theme/md/img/puce.png
similarity index 100%
rename from public/theme/md/img/puce.png
rename to htdocs/theme/md/img/puce.png
diff --git a/public/theme/md/img/recent.png b/htdocs/theme/md/img/recent.png
similarity index 100%
rename from public/theme/md/img/recent.png
rename to htdocs/theme/md/img/recent.png
diff --git a/public/theme/md/img/redstar.png b/htdocs/theme/md/img/redstar.png
similarity index 100%
rename from public/theme/md/img/redstar.png
rename to htdocs/theme/md/img/redstar.png
diff --git a/public/theme/md/img/refresh.png b/htdocs/theme/md/img/refresh.png
similarity index 100%
rename from public/theme/md/img/refresh.png
rename to htdocs/theme/md/img/refresh.png
diff --git a/public/theme/md/img/reload.png b/htdocs/theme/md/img/reload.png
similarity index 100%
rename from public/theme/md/img/reload.png
rename to htdocs/theme/md/img/reload.png
diff --git a/public/theme/md/img/rightarrow.png b/htdocs/theme/md/img/rightarrow.png
similarity index 100%
rename from public/theme/md/img/rightarrow.png
rename to htdocs/theme/md/img/rightarrow.png
diff --git a/public/theme/md/img/search.png b/htdocs/theme/md/img/search.png
similarity index 100%
rename from public/theme/md/img/search.png
rename to htdocs/theme/md/img/search.png
diff --git a/public/theme/md/img/searchclear.png b/htdocs/theme/md/img/searchclear.png
similarity index 100%
rename from public/theme/md/img/searchclear.png
rename to htdocs/theme/md/img/searchclear.png
diff --git a/public/theme/md/img/setup.png b/htdocs/theme/md/img/setup.png
similarity index 100%
rename from public/theme/md/img/setup.png
rename to htdocs/theme/md/img/setup.png
diff --git a/public/theme/md/img/sort_asc.png b/htdocs/theme/md/img/sort_asc.png
similarity index 100%
rename from public/theme/md/img/sort_asc.png
rename to htdocs/theme/md/img/sort_asc.png
diff --git a/public/theme/md/img/sort_asc_disabled.png b/htdocs/theme/md/img/sort_asc_disabled.png
similarity index 100%
rename from public/theme/md/img/sort_asc_disabled.png
rename to htdocs/theme/md/img/sort_asc_disabled.png
diff --git a/public/theme/md/img/sort_desc.png b/htdocs/theme/md/img/sort_desc.png
similarity index 100%
rename from public/theme/md/img/sort_desc.png
rename to htdocs/theme/md/img/sort_desc.png
diff --git a/public/theme/md/img/sort_desc_disabled.png b/htdocs/theme/md/img/sort_desc_disabled.png
similarity index 100%
rename from public/theme/md/img/sort_desc_disabled.png
rename to htdocs/theme/md/img/sort_desc_disabled.png
diff --git a/public/theme/md/img/split.png b/htdocs/theme/md/img/split.png
similarity index 100%
rename from public/theme/md/img/split.png
rename to htdocs/theme/md/img/split.png
diff --git a/public/theme/md/img/star.png b/htdocs/theme/md/img/star.png
similarity index 100%
rename from public/theme/md/img/star.png
rename to htdocs/theme/md/img/star.png
diff --git a/public/theme/md/img/stats.png b/htdocs/theme/md/img/stats.png
similarity index 100%
rename from public/theme/md/img/stats.png
rename to htdocs/theme/md/img/stats.png
diff --git a/public/theme/md/img/statut0.png b/htdocs/theme/md/img/statut0.png
similarity index 100%
rename from public/theme/md/img/statut0.png
rename to htdocs/theme/md/img/statut0.png
diff --git a/public/theme/md/img/statut0_40x40.png b/htdocs/theme/md/img/statut0_40x40.png
similarity index 100%
rename from public/theme/md/img/statut0_40x40.png
rename to htdocs/theme/md/img/statut0_40x40.png
diff --git a/public/theme/md/img/statut1.png b/htdocs/theme/md/img/statut1.png
similarity index 100%
rename from public/theme/md/img/statut1.png
rename to htdocs/theme/md/img/statut1.png
diff --git a/public/theme/md/img/statut1_40x40.png b/htdocs/theme/md/img/statut1_40x40.png
similarity index 100%
rename from public/theme/md/img/statut1_40x40.png
rename to htdocs/theme/md/img/statut1_40x40.png
diff --git a/public/theme/md/img/statut3.png b/htdocs/theme/md/img/statut3.png
similarity index 100%
rename from public/theme/md/img/statut3.png
rename to htdocs/theme/md/img/statut3.png
diff --git a/public/theme/md/img/statut3_40x40.png b/htdocs/theme/md/img/statut3_40x40.png
similarity index 100%
rename from public/theme/md/img/statut3_40x40.png
rename to htdocs/theme/md/img/statut3_40x40.png
diff --git a/public/theme/md/img/statut4.png b/htdocs/theme/md/img/statut4.png
similarity index 100%
rename from public/theme/md/img/statut4.png
rename to htdocs/theme/md/img/statut4.png
diff --git a/public/theme/md/img/statut4_40x40.png b/htdocs/theme/md/img/statut4_40x40.png
similarity index 100%
rename from public/theme/md/img/statut4_40x40.png
rename to htdocs/theme/md/img/statut4_40x40.png
diff --git a/public/theme/md/img/statut5.png b/htdocs/theme/md/img/statut5.png
similarity index 100%
rename from public/theme/md/img/statut5.png
rename to htdocs/theme/md/img/statut5.png
diff --git a/public/theme/md/img/statut5_40x40.png b/htdocs/theme/md/img/statut5_40x40.png
similarity index 100%
rename from public/theme/md/img/statut5_40x40.png
rename to htdocs/theme/md/img/statut5_40x40.png
diff --git a/public/theme/md/img/statut6.png b/htdocs/theme/md/img/statut6.png
similarity index 100%
rename from public/theme/md/img/statut6.png
rename to htdocs/theme/md/img/statut6.png
diff --git a/public/theme/md/img/statut6_40x40.png b/htdocs/theme/md/img/statut6_40x40.png
similarity index 100%
rename from public/theme/md/img/statut6_40x40.png
rename to htdocs/theme/md/img/statut6_40x40.png
diff --git a/public/theme/md/img/statut7.png b/htdocs/theme/md/img/statut7.png
similarity index 100%
rename from public/theme/md/img/statut7.png
rename to htdocs/theme/md/img/statut7.png
diff --git a/public/theme/md/img/statut7_40x40.png b/htdocs/theme/md/img/statut7_40x40.png
similarity index 100%
rename from public/theme/md/img/statut7_40x40.png
rename to htdocs/theme/md/img/statut7_40x40.png
diff --git a/public/theme/md/img/statut8.png b/htdocs/theme/md/img/statut8.png
similarity index 100%
rename from public/theme/md/img/statut8.png
rename to htdocs/theme/md/img/statut8.png
diff --git a/public/theme/md/img/statut8_40x40.png b/htdocs/theme/md/img/statut8_40x40.png
similarity index 100%
rename from public/theme/md/img/statut8_40x40.png
rename to htdocs/theme/md/img/statut8_40x40.png
diff --git a/public/theme/md/img/statut9.png b/htdocs/theme/md/img/statut9.png
similarity index 100%
rename from public/theme/md/img/statut9.png
rename to htdocs/theme/md/img/statut9.png
diff --git a/public/theme/md/img/statut9_40x40.png b/htdocs/theme/md/img/statut9_40x40.png
similarity index 100%
rename from public/theme/md/img/statut9_40x40.png
rename to htdocs/theme/md/img/statut9_40x40.png
diff --git a/public/theme/md/img/stcomm-1.png b/htdocs/theme/md/img/stcomm-1.png
similarity index 100%
rename from public/theme/md/img/stcomm-1.png
rename to htdocs/theme/md/img/stcomm-1.png
diff --git a/public/theme/md/img/stcomm0.png b/htdocs/theme/md/img/stcomm0.png
similarity index 100%
rename from public/theme/md/img/stcomm0.png
rename to htdocs/theme/md/img/stcomm0.png
diff --git a/public/theme/md/img/stcomm1.png b/htdocs/theme/md/img/stcomm1.png
similarity index 100%
rename from public/theme/md/img/stcomm1.png
rename to htdocs/theme/md/img/stcomm1.png
diff --git a/public/theme/md/img/stcomm2.png b/htdocs/theme/md/img/stcomm2.png
similarity index 100%
rename from public/theme/md/img/stcomm2.png
rename to htdocs/theme/md/img/stcomm2.png
diff --git a/public/theme/md/img/stcomm3.png b/htdocs/theme/md/img/stcomm3.png
similarity index 100%
rename from public/theme/md/img/stcomm3.png
rename to htdocs/theme/md/img/stcomm3.png
diff --git a/public/theme/md/img/stcomm4.png b/htdocs/theme/md/img/stcomm4.png
similarity index 100%
rename from public/theme/md/img/stcomm4.png
rename to htdocs/theme/md/img/stcomm4.png
diff --git a/public/theme/md/img/switch_off.png b/htdocs/theme/md/img/switch_off.png
similarity index 100%
rename from public/theme/md/img/switch_off.png
rename to htdocs/theme/md/img/switch_off.png
diff --git a/public/theme/md/img/switch_off_old.png b/htdocs/theme/md/img/switch_off_old.png
similarity index 100%
rename from public/theme/md/img/switch_off_old.png
rename to htdocs/theme/md/img/switch_off_old.png
diff --git a/public/theme/md/img/switch_on.png b/htdocs/theme/md/img/switch_on.png
similarity index 100%
rename from public/theme/md/img/switch_on.png
rename to htdocs/theme/md/img/switch_on.png
diff --git a/public/theme/md/img/switch_on_old.png b/htdocs/theme/md/img/switch_on_old.png
similarity index 100%
rename from public/theme/md/img/switch_on_old.png
rename to htdocs/theme/md/img/switch_on_old.png
diff --git a/public/theme/md/img/tab_background.png b/htdocs/theme/md/img/tab_background.png
similarity index 100%
rename from public/theme/md/img/tab_background.png
rename to htdocs/theme/md/img/tab_background.png
diff --git a/public/theme/md/img/tick.png b/htdocs/theme/md/img/tick.png
similarity index 100%
rename from public/theme/md/img/tick.png
rename to htdocs/theme/md/img/tick.png
diff --git a/public/theme/md/img/title.gif b/htdocs/theme/md/img/title.gif
similarity index 100%
rename from public/theme/md/img/title.gif
rename to htdocs/theme/md/img/title.gif
diff --git a/public/theme/md/img/title.png b/htdocs/theme/md/img/title.png
similarity index 100%
rename from public/theme/md/img/title.png
rename to htdocs/theme/md/img/title.png
diff --git a/public/theme/md/img/title_accountancy.png b/htdocs/theme/md/img/title_accountancy.png
similarity index 100%
rename from public/theme/md/img/title_accountancy.png
rename to htdocs/theme/md/img/title_accountancy.png
diff --git a/public/theme/md/img/title_agenda.png b/htdocs/theme/md/img/title_agenda.png
similarity index 100%
rename from public/theme/md/img/title_agenda.png
rename to htdocs/theme/md/img/title_agenda.png
diff --git a/public/theme/md/img/title_bank.png b/htdocs/theme/md/img/title_bank.png
similarity index 100%
rename from public/theme/md/img/title_bank.png
rename to htdocs/theme/md/img/title_bank.png
diff --git a/public/theme/md/img/title_commercial.png b/htdocs/theme/md/img/title_commercial.png
similarity index 100%
rename from public/theme/md/img/title_commercial.png
rename to htdocs/theme/md/img/title_commercial.png
diff --git a/public/theme/md/img/title_companies.png b/htdocs/theme/md/img/title_companies.png
similarity index 100%
rename from public/theme/md/img/title_companies.png
rename to htdocs/theme/md/img/title_companies.png
diff --git a/public/theme/md/img/title_generic.png b/htdocs/theme/md/img/title_generic.png
similarity index 100%
rename from public/theme/md/img/title_generic.png
rename to htdocs/theme/md/img/title_generic.png
diff --git a/public/theme/md/img/title_home.png b/htdocs/theme/md/img/title_home.png
similarity index 100%
rename from public/theme/md/img/title_home.png
rename to htdocs/theme/md/img/title_home.png
diff --git a/public/theme/md/img/title_hrm.png b/htdocs/theme/md/img/title_hrm.png
similarity index 100%
rename from public/theme/md/img/title_hrm.png
rename to htdocs/theme/md/img/title_hrm.png
diff --git a/public/theme/md/img/title_products.png b/htdocs/theme/md/img/title_products.png
similarity index 100%
rename from public/theme/md/img/title_products.png
rename to htdocs/theme/md/img/title_products.png
diff --git a/public/theme/md/img/title_project.png b/htdocs/theme/md/img/title_project.png
similarity index 100%
rename from public/theme/md/img/title_project.png
rename to htdocs/theme/md/img/title_project.png
diff --git a/public/theme/md/img/title_setup.png b/htdocs/theme/md/img/title_setup.png
similarity index 100%
rename from public/theme/md/img/title_setup.png
rename to htdocs/theme/md/img/title_setup.png
diff --git a/public/theme/md/img/tmenu.jpg b/htdocs/theme/md/img/tmenu.jpg
similarity index 100%
rename from public/theme/md/img/tmenu.jpg
rename to htdocs/theme/md/img/tmenu.jpg
diff --git a/public/theme/md/img/tmenu2.jpg b/htdocs/theme/md/img/tmenu2.jpg
similarity index 100%
rename from public/theme/md/img/tmenu2.jpg
rename to htdocs/theme/md/img/tmenu2.jpg
diff --git a/public/theme/md/img/tmenu3.jpg b/htdocs/theme/md/img/tmenu3.jpg
similarity index 100%
rename from public/theme/md/img/tmenu3.jpg
rename to htdocs/theme/md/img/tmenu3.jpg
diff --git a/public/theme/md/img/tmenu_inverse.jpg b/htdocs/theme/md/img/tmenu_inverse.jpg
similarity index 100%
rename from public/theme/md/img/tmenu_inverse.jpg
rename to htdocs/theme/md/img/tmenu_inverse.jpg
diff --git a/public/theme/md/img/unlock.png b/htdocs/theme/md/img/unlock.png
similarity index 100%
rename from public/theme/md/img/unlock.png
rename to htdocs/theme/md/img/unlock.png
diff --git a/public/theme/md/img/uparrow.png b/htdocs/theme/md/img/uparrow.png
similarity index 100%
rename from public/theme/md/img/uparrow.png
rename to htdocs/theme/md/img/uparrow.png
diff --git a/public/theme/md/img/upload.png b/htdocs/theme/md/img/upload.png
similarity index 100%
rename from public/theme/md/img/upload.png
rename to htdocs/theme/md/img/upload.png
diff --git a/public/theme/md/img/vcard.png b/htdocs/theme/md/img/vcard.png
similarity index 100%
rename from public/theme/md/img/vcard.png
rename to htdocs/theme/md/img/vcard.png
diff --git a/public/theme/md/img/view.png b/htdocs/theme/md/img/view.png
similarity index 100%
rename from public/theme/md/img/view.png
rename to htdocs/theme/md/img/view.png
diff --git a/public/theme/md/img/warning.png b/htdocs/theme/md/img/warning.png
similarity index 100%
rename from public/theme/md/img/warning.png
rename to htdocs/theme/md/img/warning.png
diff --git a/public/theme/md/img/weather/index.html b/htdocs/theme/md/img/weather/index.html
similarity index 100%
rename from public/theme/md/img/weather/index.html
rename to htdocs/theme/md/img/weather/index.html
diff --git a/public/theme/md/img/weather/weather-clear-night.png b/htdocs/theme/md/img/weather/weather-clear-night.png
similarity index 100%
rename from public/theme/md/img/weather/weather-clear-night.png
rename to htdocs/theme/md/img/weather/weather-clear-night.png
diff --git a/public/theme/md/img/weather/weather-clear.png b/htdocs/theme/md/img/weather/weather-clear.png
similarity index 100%
rename from public/theme/md/img/weather/weather-clear.png
rename to htdocs/theme/md/img/weather/weather-clear.png
diff --git a/public/theme/md/img/weather/weather-clouds-night.png b/htdocs/theme/md/img/weather/weather-clouds-night.png
similarity index 100%
rename from public/theme/md/img/weather/weather-clouds-night.png
rename to htdocs/theme/md/img/weather/weather-clouds-night.png
diff --git a/public/theme/md/img/weather/weather-clouds.png b/htdocs/theme/md/img/weather/weather-clouds.png
similarity index 100%
rename from public/theme/md/img/weather/weather-clouds.png
rename to htdocs/theme/md/img/weather/weather-clouds.png
diff --git a/public/theme/md/img/weather/weather-few-clouds-night.png b/htdocs/theme/md/img/weather/weather-few-clouds-night.png
similarity index 100%
rename from public/theme/md/img/weather/weather-few-clouds-night.png
rename to htdocs/theme/md/img/weather/weather-few-clouds-night.png
diff --git a/public/theme/md/img/weather/weather-few-clouds.png b/htdocs/theme/md/img/weather/weather-few-clouds.png
similarity index 100%
rename from public/theme/md/img/weather/weather-few-clouds.png
rename to htdocs/theme/md/img/weather/weather-few-clouds.png
diff --git a/public/theme/md/img/weather/weather-freezing-rain.png b/htdocs/theme/md/img/weather/weather-freezing-rain.png
similarity index 100%
rename from public/theme/md/img/weather/weather-freezing-rain.png
rename to htdocs/theme/md/img/weather/weather-freezing-rain.png
diff --git a/public/theme/md/img/weather/weather-hail.png b/htdocs/theme/md/img/weather/weather-hail.png
similarity index 100%
rename from public/theme/md/img/weather/weather-hail.png
rename to htdocs/theme/md/img/weather/weather-hail.png
diff --git a/public/theme/md/img/weather/weather-many-clouds.png b/htdocs/theme/md/img/weather/weather-many-clouds.png
similarity index 100%
rename from public/theme/md/img/weather/weather-many-clouds.png
rename to htdocs/theme/md/img/weather/weather-many-clouds.png
diff --git a/public/theme/md/img/weather/weather-mist.png b/htdocs/theme/md/img/weather/weather-mist.png
similarity index 100%
rename from public/theme/md/img/weather/weather-mist.png
rename to htdocs/theme/md/img/weather/weather-mist.png
diff --git a/public/theme/md/img/weather/weather-showers-day.png b/htdocs/theme/md/img/weather/weather-showers-day.png
similarity index 100%
rename from public/theme/md/img/weather/weather-showers-day.png
rename to htdocs/theme/md/img/weather/weather-showers-day.png
diff --git a/public/theme/md/img/weather/weather-showers-night.png b/htdocs/theme/md/img/weather/weather-showers-night.png
similarity index 100%
rename from public/theme/md/img/weather/weather-showers-night.png
rename to htdocs/theme/md/img/weather/weather-showers-night.png
diff --git a/public/theme/md/img/weather/weather-showers-scattered-day.png b/htdocs/theme/md/img/weather/weather-showers-scattered-day.png
similarity index 100%
rename from public/theme/md/img/weather/weather-showers-scattered-day.png
rename to htdocs/theme/md/img/weather/weather-showers-scattered-day.png
diff --git a/public/theme/md/img/weather/weather-showers-scattered-night.png b/htdocs/theme/md/img/weather/weather-showers-scattered-night.png
similarity index 100%
rename from public/theme/md/img/weather/weather-showers-scattered-night.png
rename to htdocs/theme/md/img/weather/weather-showers-scattered-night.png
diff --git a/public/theme/md/img/weather/weather-showers-scattered.png b/htdocs/theme/md/img/weather/weather-showers-scattered.png
similarity index 100%
rename from public/theme/md/img/weather/weather-showers-scattered.png
rename to htdocs/theme/md/img/weather/weather-showers-scattered.png
diff --git a/public/theme/md/img/weather/weather-showers.png b/htdocs/theme/md/img/weather/weather-showers.png
similarity index 100%
rename from public/theme/md/img/weather/weather-showers.png
rename to htdocs/theme/md/img/weather/weather-showers.png
diff --git a/public/theme/md/img/weather/weather-snow-rain.png b/htdocs/theme/md/img/weather/weather-snow-rain.png
similarity index 100%
rename from public/theme/md/img/weather/weather-snow-rain.png
rename to htdocs/theme/md/img/weather/weather-snow-rain.png
diff --git a/public/theme/md/img/weather/weather-snow-scattered-day.png b/htdocs/theme/md/img/weather/weather-snow-scattered-day.png
similarity index 100%
rename from public/theme/md/img/weather/weather-snow-scattered-day.png
rename to htdocs/theme/md/img/weather/weather-snow-scattered-day.png
diff --git a/public/theme/md/img/weather/weather-snow-scattered-night.png b/htdocs/theme/md/img/weather/weather-snow-scattered-night.png
similarity index 100%
rename from public/theme/md/img/weather/weather-snow-scattered-night.png
rename to htdocs/theme/md/img/weather/weather-snow-scattered-night.png
diff --git a/public/theme/md/img/weather/weather-snow-scattered.png b/htdocs/theme/md/img/weather/weather-snow-scattered.png
similarity index 100%
rename from public/theme/md/img/weather/weather-snow-scattered.png
rename to htdocs/theme/md/img/weather/weather-snow-scattered.png
diff --git a/public/theme/md/img/weather/weather-snow.png b/htdocs/theme/md/img/weather/weather-snow.png
similarity index 100%
rename from public/theme/md/img/weather/weather-snow.png
rename to htdocs/theme/md/img/weather/weather-snow.png
diff --git a/public/theme/md/img/weather/weather-storm-day.png b/htdocs/theme/md/img/weather/weather-storm-day.png
similarity index 100%
rename from public/theme/md/img/weather/weather-storm-day.png
rename to htdocs/theme/md/img/weather/weather-storm-day.png
diff --git a/public/theme/md/img/weather/weather-storm-night.png b/htdocs/theme/md/img/weather/weather-storm-night.png
similarity index 100%
rename from public/theme/md/img/weather/weather-storm-night.png
rename to htdocs/theme/md/img/weather/weather-storm-night.png
diff --git a/public/theme/md/img/weather/weather-storm.png b/htdocs/theme/md/img/weather/weather-storm.png
similarity index 100%
rename from public/theme/md/img/weather/weather-storm.png
rename to htdocs/theme/md/img/weather/weather-storm.png
diff --git a/public/theme/md/img/working.gif b/htdocs/theme/md/img/working.gif
similarity index 100%
rename from public/theme/md/img/working.gif
rename to htdocs/theme/md/img/working.gif
diff --git a/public/theme/md/img/working2.gif b/htdocs/theme/md/img/working2.gif
similarity index 100%
rename from public/theme/md/img/working2.gif
rename to htdocs/theme/md/img/working2.gif
diff --git a/public/theme/md/index.html b/htdocs/theme/md/index.html
similarity index 100%
rename from public/theme/md/index.html
rename to htdocs/theme/md/index.html
diff --git a/public/theme/md/style.css.php b/htdocs/theme/md/style.css.php
similarity index 100%
rename from public/theme/md/style.css.php
rename to htdocs/theme/md/style.css.php
diff --git a/public/theme/md/thumb.png b/htdocs/theme/md/thumb.png
similarity index 100%
rename from public/theme/md/thumb.png
rename to htdocs/theme/md/thumb.png
diff --git a/public/theme/md/tpl/README b/htdocs/theme/md/tpl/README
similarity index 100%
rename from public/theme/md/tpl/README
rename to htdocs/theme/md/tpl/README
diff --git a/public/theme/md/tpl/index.html b/htdocs/theme/md/tpl/index.html
similarity index 100%
rename from public/theme/md/tpl/index.html
rename to htdocs/theme/md/tpl/index.html
diff --git a/public/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
similarity index 100%
rename from public/user/admin/group_extrafields.php
rename to htdocs/user/admin/group_extrafields.php
diff --git a/public/user/admin/index.html b/htdocs/user/admin/index.html
similarity index 100%
rename from public/user/admin/index.html
rename to htdocs/user/admin/index.html
diff --git a/public/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
similarity index 100%
rename from public/user/admin/user_extrafields.php
rename to htdocs/user/admin/user_extrafields.php
diff --git a/public/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
similarity index 100%
rename from public/user/agenda_extsites.php
rename to htdocs/user/agenda_extsites.php
diff --git a/public/user/bank.php b/htdocs/user/bank.php
similarity index 100%
rename from public/user/bank.php
rename to htdocs/user/bank.php
diff --git a/public/user/card.php b/htdocs/user/card.php
similarity index 100%
rename from public/user/card.php
rename to htdocs/user/card.php
diff --git a/public/user/class/api_deprecated_user.class.php b/htdocs/user/class/api_deprecated_user.class.php
similarity index 100%
rename from public/user/class/api_deprecated_user.class.php
rename to htdocs/user/class/api_deprecated_user.class.php
diff --git a/public/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
similarity index 100%
rename from public/user/class/api_users.class.php
rename to htdocs/user/class/api_users.class.php
diff --git a/public/user/class/index.html b/htdocs/user/class/index.html
similarity index 100%
rename from public/user/class/index.html
rename to htdocs/user/class/index.html
diff --git a/public/user/class/user.class.php b/htdocs/user/class/user.class.php
similarity index 100%
rename from public/user/class/user.class.php
rename to htdocs/user/class/user.class.php
diff --git a/public/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
similarity index 100%
rename from public/user/class/userbankaccount.class.php
rename to htdocs/user/class/userbankaccount.class.php
diff --git a/public/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
similarity index 100%
rename from public/user/class/usergroup.class.php
rename to htdocs/user/class/usergroup.class.php
diff --git a/public/user/clicktodial.php b/htdocs/user/clicktodial.php
similarity index 100%
rename from public/user/clicktodial.php
rename to htdocs/user/clicktodial.php
diff --git a/public/user/document.php b/htdocs/user/document.php
similarity index 100%
rename from public/user/document.php
rename to htdocs/user/document.php
diff --git a/public/user/group/card.php b/htdocs/user/group/card.php
similarity index 100%
rename from public/user/group/card.php
rename to htdocs/user/group/card.php
diff --git a/public/user/group/index.php b/htdocs/user/group/index.php
similarity index 100%
rename from public/user/group/index.php
rename to htdocs/user/group/index.php
diff --git a/public/user/group/ldap.php b/htdocs/user/group/ldap.php
similarity index 100%
rename from public/user/group/ldap.php
rename to htdocs/user/group/ldap.php
diff --git a/public/user/group/perms.php b/htdocs/user/group/perms.php
similarity index 100%
rename from public/user/group/perms.php
rename to htdocs/user/group/perms.php
diff --git a/public/user/hierarchy.php b/htdocs/user/hierarchy.php
similarity index 100%
rename from public/user/hierarchy.php
rename to htdocs/user/hierarchy.php
diff --git a/public/user/home.php b/htdocs/user/home.php
similarity index 100%
rename from public/user/home.php
rename to htdocs/user/home.php
diff --git a/public/user/index.php b/htdocs/user/index.php
similarity index 100%
rename from public/user/index.php
rename to htdocs/user/index.php
diff --git a/public/user/info.php b/htdocs/user/info.php
similarity index 100%
rename from public/user/info.php
rename to htdocs/user/info.php
diff --git a/public/user/ldap.php b/htdocs/user/ldap.php
similarity index 100%
rename from public/user/ldap.php
rename to htdocs/user/ldap.php
diff --git a/public/user/logout.php b/htdocs/user/logout.php
similarity index 100%
rename from public/user/logout.php
rename to htdocs/user/logout.php
diff --git a/public/user/note.php b/htdocs/user/note.php
similarity index 100%
rename from public/user/note.php
rename to htdocs/user/note.php
diff --git a/public/user/notify/card.php b/htdocs/user/notify/card.php
similarity index 100%
rename from public/user/notify/card.php
rename to htdocs/user/notify/card.php
diff --git a/public/user/param_ihm.php b/htdocs/user/param_ihm.php
similarity index 100%
rename from public/user/param_ihm.php
rename to htdocs/user/param_ihm.php
diff --git a/public/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
similarity index 100%
rename from public/user/passwordforgotten.php
rename to htdocs/user/passwordforgotten.php
diff --git a/public/user/perms.php b/htdocs/user/perms.php
similarity index 100%
rename from public/user/perms.php
rename to htdocs/user/perms.php
diff --git a/public/viewimage.php b/htdocs/viewimage.php
similarity index 100%
rename from public/viewimage.php
rename to htdocs/viewimage.php
diff --git a/public/webservices/README.md b/htdocs/webservices/README.md
similarity index 100%
rename from public/webservices/README.md
rename to htdocs/webservices/README.md
diff --git a/public/webservices/admin/index.php b/htdocs/webservices/admin/index.php
similarity index 100%
rename from public/webservices/admin/index.php
rename to htdocs/webservices/admin/index.php
diff --git a/public/webservices/demo_wsclient_actioncomm.php-NORUN b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
similarity index 100%
rename from public/webservices/demo_wsclient_actioncomm.php-NORUN
rename to htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
diff --git a/public/webservices/demo_wsclient_category.php-NORUN b/htdocs/webservices/demo_wsclient_category.php-NORUN
similarity index 100%
rename from public/webservices/demo_wsclient_category.php-NORUN
rename to htdocs/webservices/demo_wsclient_category.php-NORUN
diff --git a/public/webservices/demo_wsclient_invoice.php-NORUN b/htdocs/webservices/demo_wsclient_invoice.php-NORUN
similarity index 100%
rename from public/webservices/demo_wsclient_invoice.php-NORUN
rename to htdocs/webservices/demo_wsclient_invoice.php-NORUN
diff --git a/public/webservices/demo_wsclient_order.php-NORUN b/htdocs/webservices/demo_wsclient_order.php-NORUN
similarity index 100%
rename from public/webservices/demo_wsclient_order.php-NORUN
rename to htdocs/webservices/demo_wsclient_order.php-NORUN
diff --git a/public/webservices/demo_wsclient_other.php-NORUN b/htdocs/webservices/demo_wsclient_other.php-NORUN
similarity index 100%
rename from public/webservices/demo_wsclient_other.php-NORUN
rename to htdocs/webservices/demo_wsclient_other.php-NORUN
diff --git a/public/webservices/demo_wsclient_productorservice.php-NORUN b/htdocs/webservices/demo_wsclient_productorservice.php-NORUN
similarity index 100%
rename from public/webservices/demo_wsclient_productorservice.php-NORUN
rename to htdocs/webservices/demo_wsclient_productorservice.php-NORUN
diff --git a/public/webservices/demo_wsclient_project.php-NORUN b/htdocs/webservices/demo_wsclient_project.php-NORUN
similarity index 100%
rename from public/webservices/demo_wsclient_project.php-NORUN
rename to htdocs/webservices/demo_wsclient_project.php-NORUN
diff --git a/public/webservices/demo_wsclient_thirdparty.php-NORUN b/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
similarity index 100%
rename from public/webservices/demo_wsclient_thirdparty.php-NORUN
rename to htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
diff --git a/public/webservices/index.php b/htdocs/webservices/index.php
similarity index 100%
rename from public/webservices/index.php
rename to htdocs/webservices/index.php
diff --git a/public/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
similarity index 100%
rename from public/webservices/server_actioncomm.php
rename to htdocs/webservices/server_actioncomm.php
diff --git a/public/webservices/server_category.php b/htdocs/webservices/server_category.php
similarity index 100%
rename from public/webservices/server_category.php
rename to htdocs/webservices/server_category.php
diff --git a/public/webservices/server_contact.php b/htdocs/webservices/server_contact.php
similarity index 100%
rename from public/webservices/server_contact.php
rename to htdocs/webservices/server_contact.php
diff --git a/public/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
similarity index 100%
rename from public/webservices/server_invoice.php
rename to htdocs/webservices/server_invoice.php
diff --git a/public/webservices/server_order.php b/htdocs/webservices/server_order.php
similarity index 100%
rename from public/webservices/server_order.php
rename to htdocs/webservices/server_order.php
diff --git a/public/webservices/server_other.php b/htdocs/webservices/server_other.php
similarity index 100%
rename from public/webservices/server_other.php
rename to htdocs/webservices/server_other.php
diff --git a/public/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
similarity index 100%
rename from public/webservices/server_productorservice.php
rename to htdocs/webservices/server_productorservice.php
diff --git a/public/webservices/server_project.php b/htdocs/webservices/server_project.php
similarity index 100%
rename from public/webservices/server_project.php
rename to htdocs/webservices/server_project.php
diff --git a/public/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
similarity index 100%
rename from public/webservices/server_supplier_invoice.php
rename to htdocs/webservices/server_supplier_invoice.php
diff --git a/public/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
similarity index 100%
rename from public/webservices/server_thirdparty.php
rename to htdocs/webservices/server_thirdparty.php
diff --git a/public/webservices/server_user.php b/htdocs/webservices/server_user.php
similarity index 100%
rename from public/webservices/server_user.php
rename to htdocs/webservices/server_user.php
diff --git a/public/websites/class/website.class.php b/htdocs/websites/class/website.class.php
similarity index 100%
rename from public/websites/class/website.class.php
rename to htdocs/websites/class/website.class.php
diff --git a/public/websites/class/websitepage.class.php b/htdocs/websites/class/websitepage.class.php
similarity index 100%
rename from public/websites/class/websitepage.class.php
rename to htdocs/websites/class/websitepage.class.php
diff --git a/public/websites/frametop.php b/htdocs/websites/frametop.php
similarity index 100%
rename from public/websites/frametop.php
rename to htdocs/websites/frametop.php
diff --git a/public/websites/index.html b/htdocs/websites/index.html
similarity index 100%
rename from public/websites/index.html
rename to htdocs/websites/index.html
diff --git a/public/websites/index.php b/htdocs/websites/index.php
similarity index 100%
rename from public/websites/index.php
rename to htdocs/websites/index.php

From 08449a2d4f3efdd04f1b98785a70eaf25ad918b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Dec 2016 12:05:00 +0100
Subject: [PATCH 0077/1163] Prepare action tracking on products

---
 htdocs/install/mysql/data/llx_c_action_trigger.sql | 3 +++
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql     | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index b35d08036b3..c01e8d5ae20 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -76,6 +76,9 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',140);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_MODIFY','Project modified','Executed when a project is modified','project',141);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',142);
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 73d209b0cdc..56fdb70b809 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -28,3 +28,9 @@
 ALTER TABLE llx_ecm_files CHANGE COLUMN fullpath filepath varchar(750);
 ALTER TABLE llx_ecm_files ADD COLUMN position integer;
 ALTER TABLE llx_ecm_files CHANGE COLUMN keyword keyword varchar(750);
+
+
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30);
+

From ed0ffd6f5a16e34141751f11b5cb5f65e17b40a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Dec 2016 19:42:25 +0100
Subject: [PATCH 0078/1163] NEW Uploaded files are indexed into database

---
 htdocs/core/actions_linkedfiles.inc.php       |   6 +-
 htdocs/core/class/html.formfile.class.php     |  62 +++++++--
 htdocs/core/lib/files.lib.php                 | 118 ++++++++++++++----
 htdocs/core/photos_resize.php                 |  97 ++++++++++++--
 htdocs/core/tpl/ajaxrow.tpl.php               |   9 +-
 .../tpl/document_actions_post_headers.tpl.php |   6 +-
 htdocs/ecm/class/ecmfiles.class.php           |   7 +-
 htdocs/product/document.php                   |   2 +-
 8 files changed, 254 insertions(+), 53 deletions(-)

diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 672da011a79..d97ecbe716a 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -165,7 +165,11 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave'))
                     
                     setEventMessages($langs->trans("FileRenamed"), null);
                 }
-                else setEventMessages($langs->trans("ErrorFailToRenameFile", $filenamefrom, $filenameto), null, 'errors');
+                else 
+                {
+                    $langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.
+                    setEventMessages($langs->trans("ErrorFailToRenameFile", $filenamefrom, $filenameto), null, 'errors');
+                }
             }
         }
     }
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index b5c370bee07..a82024d86cf 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -875,12 +875,13 @@ class FormFile
      *  @param   string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this if you want to complete file data with database indexes.
      *  @param   string $sortfield          Sort field ('name', 'size', 'position', ...)
      *  @param   string $sortorder          Sort order ('ASC' or 'DESC')
+     *  @param   int    $disablemove        1=Disable move button, 0=Position move is possible.
      * 	@return	 int						<0 if KO, nb of files shown if OK
      */
-	function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='',$sortfield='',$sortorder='ASC')
+	function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='',$sortfield='',$sortorder='ASC', $disablemove=1)
 	{
 		global $user, $conf, $langs, $hookmanager;
-		global $bc;
+		global $bc,$bcdd;
 		global $sortfield, $sortorder, $maxheightmini;
 
 		// Define relative path used to store the file
@@ -955,17 +956,18 @@ class FormFile
 			    print '<input type="hidden" name="id" value="'.$object->id.'">';
 			    print '<input type="hidden" name="modulepart" value="'.$modulepart.'">';
 			}
-			print '<table width="100%" class="'.($useinecm?'liste noborderbottom':'liste').'">'."\n";
+			print '<table width="100%" id="tablelines" class="'.($useinecm?'liste noborderbottom':'liste').'">'."\n";
 			
-			print '<tr class="liste_titre">';
+			print '<tr class="liste_titre nodrag nodrop">';
 			print_liste_field_titre($langs->trans("Documents2"),$url,"name","",$param,'align="left"',$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("Size"),$url,"size","",$param,'align="right"',$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("Date"),$url,"date","",$param,'align="center"',$sortfield,$sortorder);
 			if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');
 			print_liste_field_titre('');
+			if (! $disablemove) print_liste_field_titre('');
 			print "</tr>\n";
 
-			// Get list of files stored into database for same directory
+			// Get list of files stored into database for same relative directory
 			if ($relativedir)
 			{
                 $filearrayindatabase = dol_dir_list_in_database($relativedir, '', null, 'name', SORT_ASC);
@@ -985,15 +987,21 @@ class FormFile
     			            $filearray[$key]['position']=$filearrayindatabase[$key2]['position'];
     			            $filearray[$key]['cover']=$filearrayindatabase[$key2]['cover'];
     			            $filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
+    			            $filearray[$key]['rowid']=$filearrayindatabase[$key2]['rowid'];
     			            $found=1;
     			            break;
     			        }
     			    }
     			    if (! $found)
     			    {
-    			        $filearray[$key]['position']=999999;     // File not indexed are at end. So if we add a file, it will not replace existing in position
+    			        $filearray[$key]['position']=999999;     // File not indexed are at end. So if we add a file, it will not replace an existing position
     			        $filearray[$key]['cover']=0;
     			        $filearray[$key]['acl']='';
+    			        $filearray[$key]['rowid']=0;
+    			        // TODO Add entry into database
+    			        
+    			        //...
+    			        
     			    }
     			}
     
@@ -1007,7 +1015,7 @@ class FormFile
 			$nboffiles=count($filearray);
 			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 				
-			$var=true;
+			$var=true; $i=0; $nboflines = 0; $lastrowid=0;
 			foreach($filearray as $key => $file)      // filearray must be only files here
 			{
 				if ($file['name'] != '.'
@@ -1016,12 +1024,14 @@ class FormFile
 				{
 					$var=!$var;
 					
-					$editline=0;
+					if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
 					
+					$editline=0;
+					$nboflines++;
 			        print '<!-- Line list_of_documents '.$key.' relativepath = '.$relativepath.' -->'."\n";
 			        // Do we have entry into database ?
 			        print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";
-					print '<tr '.$bc[$var].'>';
+					print '<tr id="row-'.($filearray[$key]['rowid']>0?$filearray[$key]['rowid']:'-AFTER'.$lastrowid.'POS'.($i+1)).'" '.$bcdd[$var].'>';
 					print '<td class="tdoverflow">';
 					
 					//print "XX".$file['name'];	//$file['name'] must be utf8
@@ -1125,6 +1135,24 @@ class FormFile
     						print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=delete&urlfile='.urlencode($filepath).$param).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
     					}
 					    print "</td>";
+
+					    if (empty($disablemove))
+					    {
+    					    if ($nboffiles > 1 && empty($conf->browser->phone)) { 
+    					    	print '<td align="center" class="linecolmove tdlineupdown">'; 
+    					    	if ($i > 0) {
+    					    		print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default',0,'imgupforline').'</a>';
+    					    	}
+    					        if ($i < $nboffiles-1) {
+    					    		print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default',0,'imgdownforline').'</a>';
+    				    		}
+    					    	print '</td>';
+    					    }
+    					    else {
+    					       	print '<td align="center"'.((empty($conf->browser->phone) && empty($disablemove)) ?' class="linecolmove tdlineupdown"':' class="linecolmove"').'>';
+    					       	print '</td>';
+    					    }
+					   }
 					}
 					else
 					{
@@ -1132,18 +1160,32 @@ class FormFile
 					    print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 					    print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 					    print '</td>';
+					    if (empty($disablemove)) print '<td class="right"></td>';
 					}
 					print "</tr>\n";
+					
+					$i++;
 				}
 			}
 			if ($nboffiles == 0)
 			{
-				print '<tr '.$bc[false].'><td colspan="'.(empty($useinecm)?'5':'5').'" class="opacitymedium">';
+			    $colspan=(empty($useinecm)?'5':'5');
+			    if (empty($disablemove)) $colspan++;
+				print '<tr '.$bc[false].'><td colspan="'.$colspan.'" class="opacitymedium">';
 				if (empty($textifempty)) print $langs->trans("NoFileFound");
 				else print $textifempty;
 				print '</td></tr>';
 			}
 			print "</table>";
+			
+			
+			if (! $editline && $nboflines > 1) { 
+				if (! empty($conf->use_javascript_ajax) && $permtoeditline) {
+				    $table_element_line = 'ecm_files';
+				    include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+				}
+			}				
+			
 			if (GETPOST('action') == 'editfile' && $permtoeditline)
 			{
 			    print '</form>';
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 059448b35dc..a4273644fdf 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -223,7 +223,7 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
 {
     global $conf, $db;
     
-    $sql=" SELECT label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m, acl, position";
+    $sql=" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m, acl, position";
     if ($mode) $sql.=", description";
     $sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
     $sql.=" WHERE filepath = '".$db->escape($path)."'";
@@ -243,6 +243,7 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
                 preg_match('/([^\/]+)\/[^\/]+$/',DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,$reg);
                 $level1name=(isset($reg[1])?$reg[1]:'');
                 $file_list[] = array(
+                    "rowid" => $obj->rowid,
     				"name" => $obj->filename,
     				"path" => DOL_DATA_ROOT.'/'.$obj->filepath,
                     "level1name" => $level1name,
@@ -574,11 +575,19 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
  */
 function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
 {
-    global $conf;
+    global $user, $db, $conf;
     $result=false;
 
     dol_syslog("files.lib.php::dol_move srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwritifexists=".$overwriteifexists);
+    $srcexists=dol_is_file($srcfile);
     $destexists=dol_is_file($destfile);
+
+    if (! $srcexists) 
+    {
+        dol_syslog("files.lib.php::dol_move srcfile does not exists. we ignore the move request.");
+        return false;
+    }
+    
     if ($overwriteifexists || ! $destexists)
     {
         $newpathofsrcfile=dol_osencode($srcfile);
@@ -589,13 +598,69 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
         {
         	if ($destexists)
         	{
-        		dol_syslog("files.lib.php::dol_move failed. We try to delete first and move after.", LOG_WARNING);
+        		dol_syslog("files.lib.php::dol_move Failed. We try to delete target first and move after.", LOG_WARNING);
         		// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
         		dol_delete_file($destfile);
         		$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
         	}
-        	else dol_syslog("files.lib.php::dol_move failed", LOG_WARNING);
+        	else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
         }
+
+        // Move ok
+        if ($result)
+        {
+            // Rename entry into ecm database
+            $rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
+            $rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
+            if (! preg_match('/(\/temp\/|\/thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+            {
+                $rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
+                $rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
+                //var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);
+
+                dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
+                include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+                $ecmfile=new EcmFiles($db);
+                $result = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
+                if ($result > 0)   // If found
+                {
+                    $filename = basename($rel_filetorenameafter);
+                    $rel_dir = dirname($rel_filetorenameafter);
+                    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+                    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+                    
+                    $ecmfile->filepath = $rel_dir;
+                    $ecmfile->filename = $filename;
+                    $result = $ecmfile->update($user);
+                }
+                elseif ($result == 0)   // If not found
+                {
+                    $filename = basename($rel_filetorenameafter);
+                    $rel_dir = dirname($rel_filetorenameafter);
+                    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+                    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+                    	
+                    $ecmfile->filepath = $rel_dir;
+                    $ecmfile->filename = $filename;
+                    $ecmfile->label = md5_file(dol_osencode($destfile));        // $destfile is a full path to file
+                    $ecmfile->fullpath_orig = $srcfile;
+                    $ecmfile->gen_or_uploaded = 'unknown';
+                    $ecmfile->description = '';    // indexed content
+                    $ecmfile->keyword = '';        // keyword content
+                    $result = $ecmfile->create($user);
+                    if ($result < 0)
+                    {
+                        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+                    }                    
+                    $result = $ecmfile->create($user);
+                }
+                elseif ($result < 0)
+                {
+                    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+                }
+            }        
+        }
+        
         if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
         $newmaskdec=octdec($newmask);
         // Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
@@ -826,7 +891,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 					    
 	                    // Delete entry into ecm database
     				    $rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
-    				    if (! preg_match('/\/temp\//', $rel_filetodelete))     // If not a tmp file
+    				    if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
     				    {
     				        $rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
     				        
@@ -846,7 +911,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 					}
 					else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 					// TODO Failure to remove can be because file was already removed or because of permission
-					// If error because of not exists, we must can return true but we should return false if this is a permission problem
+					// If error because of not exists, we must should return true and we should return false if this is a permission problem
 				}
 			}
 			else dol_syslog("No files to delete found", LOG_WARNING);
@@ -1095,7 +1160,7 @@ function dol_init_file_process($pathtoscan='', $trackid='')
  * All information used are in db, conf, langs, user and _FILES.
  * Note: This function can be used only into a HTML page context.
  *
- * @param	string	$upload_dir				Directory where to store uploaded file (note: also find in first part of dest_file)
+ * @param	string	$upload_dir				Directory where to store uploaded file (note: used to forge $destpath = $upload_dir + filename)
  * @param	int		$allowoverwrite			1=Allow overwrite existing file
  * @param	int		$donotupdatesession		1=Do no edit _SESSION variable
  * @param	string	$varfiles				_FILES var name
@@ -1150,6 +1215,21 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 					global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
 				
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+					
+					// Generate thumbs.
+					if (image_format_supported($destpath) == 1)
+					{
+					    // Create thumbs
+					    // We can't use $object->addThumbs here because there is no $object known
+					
+					    // Used on logon for example
+					    $imgThumbSmall = vignette($destpath, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
+					    // Create mini thumbs for image (Ratio is near 16/9)
+					    // Used on menu or for setup page for example
+					    $imgThumbMini = vignette($destpath, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
+					}
+					
+					// Update session
 					if (empty($donotupdatesession))
 					{
 						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -1157,19 +1237,22 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 						$formmail->trackid = $trackid;
 						$formmail->add_attached_files($destpath, $destfile, $TFile['type'][$i]);
 					}
-					else   // Update table of files 
+					
+					// Update table of files
+					if ($donotupdatesession) 
 					{
-					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
+					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
 					    if (! preg_match('/[\\/]temp[\\/]/', $rel_dir))     // If not a tmp file
 					    {
+					        $filename = basename($destfile);
 					        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 					        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
     					    
     					    include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
     					    $ecmfile=new EcmFiles($db);
-    					    $ecmfile->label = md5_file($destpath);
-    					    $ecmfile->filename = $destfile;
     					    $ecmfile->filepath = $rel_dir;
+    					    $ecmfile->filename = $filename;
+    					    $ecmfile->label = md5_file(dol_osencode($destpath));
     					    $ecmfile->fullpath_orig = $TFile['name'][$i];
     					    $ecmfile->gen_or_uploaded = 'uploaded';
     					    $ecmfile->description = '';    // indexed content
@@ -1181,18 +1264,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
                             }
 					    }
 					}
-					if (image_format_supported($destpath) == 1)
-					{
-						// Create thumbs
-						// We can't use $object->addThumbs here because there is no $object known
-						
-						// Used on logon for example
-						$imgThumbSmall = vignette($destpath, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
-						// Create mini thumbs for image (Ratio is near 16/9)
-						// Used on menu or for setup page for example
-						$imgThumbMini = vignette($destpath, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
-					}
-	
+
 					setEventMessages($langs->trans("FileTransferComplete"), null, 'mesgs');
 				}
 				else
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index ae73347edfa..5642300bd6c 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -134,11 +134,50 @@ if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POS
 {
 	$fullpath=$dir."/".$original_file;
 	$result=dol_imageResizeOrCrop($fullpath,0,$_POST['sizex'],$_POST['sizey']);
-
+	
 	if ($result == $fullpath)
 	{
 		$object->addThumbs($fullpath);
 
+		// Update/create database for file $fullpath
+		$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $fullpath);
+		$rel_filename = preg_replace('/^[\\/]/','',$rel_filename);
+		
+		include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+		$ecmfile=new EcmFiles($db);
+		$result = $ecmfile->fetch(0, '', $rel_filename);
+		if ($result > 0)   // If found
+		{
+		    $filename = basename($rel_filename);
+		    $rel_dir = dirname($rel_filename);
+		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+		
+		    $ecmfile->label = md5_file(dol_osencode($fullpath));
+		    $result = $ecmfile->update($user);
+		}
+		elseif ($result == 0)   // If not found
+		{
+		    $filename = basename($rel_filename);
+		    $rel_dir = dirname($rel_filename);
+		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+		     
+		    $ecmfile->filepath = $rel_dir;
+		    $ecmfile->filename = $filename;
+		    $ecmfile->label = md5_file(dol_osencode($fullpath));        // $fullpath is a full path to file
+		    $ecmfile->fullpath_orig = $fullpath;
+		    $ecmfile->gen_or_uploaded = 'unknown';
+		    $ecmfile->description = '';    // indexed content
+		    $ecmfile->keyword = '';        // keyword content
+		    $result = $ecmfile->create($user);
+		    if ($result < 0)
+		    {
+		        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+		    }
+		    $result = $ecmfile->create($user);
+		}
+		
 		if ($backtourl)
 		{
 			header("Location: ".$backtourl);
@@ -168,6 +207,45 @@ if ($action == 'confirm_crop')
 	{
 		$object->addThumbs($fullpath);
 
+		// Update/create database for file $fullpath
+		$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $fullpath);
+		$rel_filename = preg_replace('/^[\\/]/','',$rel_filename);
+		
+		include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+		$ecmfile=new EcmFiles($db);
+		$result = $ecmfile->fetch(0, '', $rel_filename);
+		if ($result > 0)   // If found
+		{
+		    $filename = basename($rel_filename);
+		    $rel_dir = dirname($rel_filename);
+		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+		
+		    $ecmfile->label = md5_file(dol_osencode($fullpath));
+		    $result = $ecmfile->update($user);
+		}
+		elseif ($result == 0)   // If not found
+		{
+		    $filename = basename($rel_filename);
+		    $rel_dir = dirname($rel_filename);
+		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+		     
+		    $ecmfile->filepath = $rel_dir;
+		    $ecmfile->filename = $filename;
+		    $ecmfile->label = md5_file(dol_osencode($fullpath));        // $fullpath is a full path to file
+		    $ecmfile->fullpath_orig = $fullpath;
+		    $ecmfile->gen_or_uploaded = 'unknown';
+		    $ecmfile->description = '';    // indexed content
+		    $ecmfile->keyword = '';        // keyword content
+		    $result = $ecmfile->create($user);
+		    if ($result < 0)
+		    {
+		        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+		    }
+		    $result = $ecmfile->create($user);
+		}
+		
 		if ($backtourl)
 		{
 			header("Location: ".$backtourl);
@@ -197,7 +275,7 @@ llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/p
 
 print load_fiche_titre($langs->trans("ImageEditor"));
 
-$infoarray=dol_getImageSize($dir."/".urldecode($_GET["file"]));
+$infoarray=dol_getImageSize($dir."/".GETPOST("file"));
 $height=$infoarray['height'];
 $width=$infoarray['width'];
 print $langs->trans("CurrentInformationOnImage").': ';
@@ -218,7 +296,8 @@ print '<legend>'.$langs->trans("Resize").'</legend>';
 print $langs->trans("ResizeDesc").'<br>';
 print $langs->trans("NewLength").': <input class="flat" name="sizex" size="10" type="text" > px  &nbsp; '.$langs->trans("or").' &nbsp; ';
 print $langs->trans("NewHeight").': <input class="flat" name="sizey" size="10" type="text" > px &nbsp; <br>';
-print '<input type="hidden" name="file" value="'.$_GET['file'].'" />';
+
+print '<input type="hidden" name="file" value="'.dol_escape_htmltag(GETPOST('file')).'" />';
 print '<input type="hidden" name="action" value="confirm_resize" />';
 print '<input type="hidden" name="product" value="'.$id.'" />';
 print '<input type="hidden" name="modulepart" value="'.$modulepart.'" />';
@@ -240,7 +319,7 @@ print '<br>'."\n";
 
 if (! empty($conf->use_javascript_ajax))
 {
-	$infoarray=dol_getImageSize($dir."/".urldecode($_GET["file"]));
+	$infoarray=dol_getImageSize($dir."/".GETPOST("file"));
 	$height=$infoarray['height'];
 	$width=$infoarray['width'];
 	$widthforcrop=$width; $refsizeforcrop='orig'; $ratioforcrop=1;
@@ -260,7 +339,7 @@ if (! empty($conf->use_javascript_ajax))
 	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$object->entity.'&file='.$original_file.'" alt="" id="cropbox" width="'.$widthforcrop.'px"/>';
 	print '</div>';
 	print '</div><br>';
-	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">
+	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">
 	      <div class="jc_coords">
 	         '.$langs->trans("NewSizeAfterCropping").':
 	         <label>X1 <input type="text" size="4" id="x" name="x" /></label>
@@ -271,13 +350,13 @@ if (! empty($conf->use_javascript_ajax))
 	         <label>H <input type="text" size="4" id="h" name="h" /></label>
 	      </div>
 
-	      <input type="hidden" id="file" name="file" value="'.urlencode($original_file).'" />
+	      <input type="hidden" id="file" name="file" value="'.dol_escape_htmltag($original_file).'" />
 	      <input type="hidden" id="action" name="action" value="confirm_crop" />
-	      <input type="hidden" id="product" name="product" value="'.$id.'" />
+	      <input type="hidden" id="product" name="product" value="'.dol_escape_htmltag($id).'" />
 	      <input type="hidden" id="refsizeforcrop" name="refsizeforcrop" value="'.$refsizeforcrop.'" />
 	      <input type="hidden" id="ratioforcrop" name="ratioforcrop" value="'.$ratioforcrop.'" />
-          <input type="hidden" name="modulepart" value="'.$modulepart.'" />
-	      <input type="hidden" name="id" value="'.$id.'" />
+          <input type="hidden" name="modulepart" value="'.dol_escape_htmltag($modulepart).'" />
+	      <input type="hidden" name="id" value="'.dol_escape_htmltag($id).'" />
 	      <br>
 	      <input type="submit" id="submitcrop" name="submitcrop" class="button" value="'.dol_escape_htmltag($langs->trans("Recenter")).'" />
 	      &nbsp;
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index 123fcef662c..c970631f907 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -17,16 +17,16 @@
  *
  * Javascript code to activate drag and drop on lines
  * You can use this if you want to be abale to drag and drop rows of a table.
- * You must add id="tablelines" on table level tag and have count($object->lines) or count($taskarray) > 0
+ * You must add id="tablelines" on table level tag and have ($nboflines or count($object->lines) or count($taskarray) > 0)
  */
 ?>
 
-<!-- BEGIN PHP TEMPLATE AJAXROW.TPL.PHP -->
+<!-- BEGIN PHP TEMPLATE AJAXROW.TPL.PHP - Script to enable drag and drop on tables -->
 <?php
 $id=$object->id;
 $fk_element=$object->fk_element;
-$table_element_line=$object->table_element_line;
-$nboflines=(isset($object->lines)?count($object->lines):(isset($tasksarray)?count($tasksarray):0));
+$table_element_line=(empty($table_element_line)?$object->table_element_line:$table_element_line);
+$nboflines=(isset($object->lines)?count($object->lines):(isset($tasksarray)?count($tasksarray):(empty($nboflines)?0:$nboflines)));
 $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 $tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
 
@@ -43,6 +43,7 @@ $(document).ready(function(){
     $("#<?php echo $tagidfortablednd; ?>").tableDnD({
 		onDrop: function(table, row) {
 			var reloadpage = "<?php echo $forcereloadpage; ?>";
+			console.log($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize());
 			var roworder = cleanSerialize($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize());
 			var table_element_line = "<?php echo $table_element_line; ?>";
 			var fk_element = "<?php echo $fk_element; ?>";
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index a28f46f58f2..c4e2dbc89f9 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -72,6 +72,9 @@ $formfile->form_attach_new_file(
 	$savingdocmask
 );
 
+$disablemove=1;
+if ($modulepart == 'produit') $disablemove=0;
+    
 // List of document
 $formfile->list_of_documents(
     $filearray,
@@ -90,7 +93,8 @@ $formfile->list_of_documents(
     $permtoedit,
     $upload_dir,
     $sortfield,
-    $sortorder
+    $sortorder,
+    $disablemove
 );
 
 print "<br>";
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 0e1885fa62f..ffe354fd5bf 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -55,7 +55,7 @@ class EcmFiles //extends CommonObject
 	public $keywords;
 	public $cover;
 	public $position;
-	public $gen_or_uploaded;
+	public $gen_or_uploaded;       // can be 'generated', 'uploaded', 'unknown'
 	public $extraparams;
 	public $date_c = '';
 	public $date_m = '';
@@ -474,7 +474,6 @@ class EcmFiles //extends CommonObject
 			 $this->acl = trim($this->acl);
 		}
 
-		
 
 		// Check parameters
 		// Put here code to add a control on parameters values
@@ -493,9 +492,9 @@ class EcmFiles //extends CommonObject
 		$sql .= ' gen_or_uploaded = '.(isset($this->gen_or_uploaded)?"'".$this->db->escape($this->gen_or_uploaded)."'":"null").',';
 		$sql .= ' extraparams = '.(isset($this->extraparams)?"'".$this->db->escape($this->extraparams)."'":"null").',';
 		$sql .= ' date_c = '.(! isset($this->date_c) || dol_strlen($this->date_c) != 0 ? "'".$this->db->idate($this->date_c)."'" : 'null').',';
-		$sql .= ' date_m = '.(! isset($this->date_m) || dol_strlen($this->date_m) != 0 ? "'".$this->db->idate($this->date_m)."'" : 'null').',';
+		//$sql .= ' date_m = '.(! isset($this->date_m) || dol_strlen($this->date_m) != 0 ? "'".$this->db->idate($this->date_m)."'" : 'null').','; // Field automatically updated
 		$sql .= ' fk_user_c = '.(isset($this->fk_user_c)?$this->fk_user_c:"null").',';
-		$sql .= ' fk_user_m = '.(isset($this->fk_user_m)?$this->fk_user_m:"null").',';
+		$sql .= ' fk_user_m = '.($this->fk_user_m > 0?$this->fk_user_m:$user->id).',';
 		$sql .= ' acl = '.(isset($this->acl)?"'".$this->db->escape($this->acl)."'":"null");
 		$sql .= ' WHERE rowid=' . $this->id;
 
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 2e241d9c156..07381787cb6 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -192,7 +192,7 @@ if ($object->id)
 
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
+	
 	// Construit liste des fichiers
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 

From 26098082d009f39a91959df869fbe87584ba3b4f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Dec 2016 22:14:27 +0100
Subject: [PATCH 0079/1163] NEW Uploaded files are indexed into database

---
 htdocs/core/class/html.formfile.class.php | 40 ++++++++++++++++++++---
 htdocs/core/lib/files.lib.php             |  1 -
 htdocs/core/tpl/ajaxrow.tpl.php           |  5 ++-
 htdocs/ecm/class/ecmfiles.class.php       |  3 +-
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index a82024d86cf..1e07f5c2b0a 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -997,11 +997,41 @@ class FormFile
     			        $filearray[$key]['position']=999999;     // File not indexed are at end. So if we add a file, it will not replace an existing position
     			        $filearray[$key]['cover']=0;
     			        $filearray[$key]['acl']='';
-    			        $filearray[$key]['rowid']=0;
-    			        // TODO Add entry into database
-    			        
-    			        //...
-    			        
+
+    			        $rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filearray[$key]['fullname']);
+    			        if (! preg_match('/(\/temp\/|\/thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+    			        {
+        			        dol_syslog("list_of_documents We found a file not indexed into database. We add it");
+        			        include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+        			        $ecmfile=new EcmFiles($this->db);
+        			        	
+        			        // Add entry into database
+        			        $filename = basename($rel_filename);
+        			        $rel_dir = dirname($rel_filename);
+        			        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+        			        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+        			         
+        			        $ecmfile->filepath = $rel_dir;
+        			        $ecmfile->filename = $filename;
+        			        $ecmfile->label = md5_file(dol_osencode($filearray[$key]['fullname']));        // $destfile is a full path to file
+        			        $ecmfile->fullpath_orig = $filearray[$key]['fullname'];
+        			        $ecmfile->gen_or_uploaded = 'unknown';
+        			        $ecmfile->description = '';    // indexed content
+        			        $ecmfile->keyword = '';        // keyword content
+        			        $result = $ecmfile->create($user);
+        			        if ($result < 0)
+        			        {
+        			            setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+        			        }
+    			            else
+    			            {
+    			                $filearray[$key]['rowid']=$result;
+    			            }
+    			        }
+    			        else
+    			        {
+    			            $filearray[$key]['rowid']=0;     // Should not happened
+    			        }
     			    }
     			}
     
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index a4273644fdf..8b338f8aea1 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -652,7 +652,6 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
                     {
                         setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
                     }                    
-                    $result = $ecmfile->create($user);
                 }
                 elseif ($result < 0)
                 {
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index c970631f907..d0a7b45efea 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -29,6 +29,7 @@ $table_element_line=(empty($table_element_line)?$object->table_element_line:$tab
 $nboflines=(isset($object->lines)?count($object->lines):(isset($tasksarray)?count($tasksarray):(empty($nboflines)?0:$nboflines)));
 $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 $tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
+$filepath=(empty($filepath)?'':$filepath);
 
 if (GETPOST('action') != 'editline' && $nboflines > 1) { ?>
 <script type="text/javascript">
@@ -48,12 +49,14 @@ $(document).ready(function(){
 			var table_element_line = "<?php echo $table_element_line; ?>";
 			var fk_element = "<?php echo $fk_element; ?>";
 			var element_id = "<?php echo $id; ?>";
+			var filepath = "<?php echo urlencode($filepath); ?>";
 			$.post("<?php echo DOL_URL_ROOT; ?>/core/ajax/row.php",
 					{
 						roworder: roworder,
 						table_element_line: table_element_line,
 						fk_element: fk_element,
-						element_id: element_id
+						element_id: element_id,
+						filepath: filepath
 					},
 					function() {
 						if (reloadpage == 1) {
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index ffe354fd5bf..1e371c9020a 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -203,7 +203,8 @@ class EcmFiles //extends CommonObject
 
 		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-
+            $this->position = $maxposition;
+            
 			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.

From 6544175cf291d500d8bac386b7bc2aa39cfdf79a Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 22 Dec 2016 16:50:45 +0100
Subject: [PATCH 0080/1163] prevent error with realpath
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

if some bad caracters are present in the name of file ( ° by exemple)
---
 htdocs/core/lib/images.lib.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 9cf745a0da0..201394612bc 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -78,6 +78,9 @@ function dol_getImageSize($file, $url = false)
 	if (!$url)
 	{
 		$fichier = realpath($file); 	// Chemin canonique absolu de l'image
+		// if problem with realpath
+		if ($fichier == false)
+			return $ret;		
 		$dir = dirname($file); 			// Chemin du dossier contenant l'image
 	}
 

From ac92e23b59f8bb18949af15596c24f43e4e7a1ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 22 Dec 2016 17:09:25 +0100
Subject: [PATCH 0081/1163] [Qual] Optimize language file loading

Using fscanf() and the proper format is about twice as fast as
using fgets() followed by explode() and trim().

This is a small optimization per se but since this code is
called often it yields about 33% rendering time improvement on
the homepage where about 50% of the time is spent on loading the
translation files.
---
 htdocs/core/class/translate.class.php | 45 ++++++++++++++-------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 6b596dc3aa5..0b1ed111eb7 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -257,32 +257,33 @@ class Translate
 					{
 						if ($usecachekey) $tabtranslatedomain=array();	// To save lang content in cache
 
-						while ($line = fgets($fp,4096))	// Ex: Need 225ms for all fgets on all lang file for Third party page. Same speed than file_get_contents
-						{
-							if ($line[0] != "\n" && $line[0] != " " && $line[0] != "#")
-							{
-								$tab=explode('=',$line,2);
-								$key=trim($tab[0]);
+						/**
+						 * Read each lines until a '=' (with any combination of spaces around it)
+						 * and split the rest until a line feed.
+						 * This is more efficient than fgets + explode + trim by a factor of ~2.
+						 */
+						while ($line = fscanf($fp, "%[^= ]%*[ =]%[^\n]")) {
+							if (isset($line[1])) {
+								list($key, $value) = $line;
 								//if ($domain == 'orders') print "Domain=$domain, found a string for $tab[0] with value $tab[1]. Currently in cache ".$this->tab_translate[$key]."<br>";
 								//if ($key == 'Order') print "Domain=$domain, found a string for key=$key=$tab[0] with value $tab[1]. Currently in cache ".$this->tab_translate[$key]."<br>";
-								if (empty($this->tab_translate[$key]) && isset($tab[1]))    // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)
-								{
-									$value=trim(preg_replace('/\\n/',"\n",$tab[1]));
-
-									if ($key == 'DIRECTION')	// This is to declare direction of language
-									{
-										if ($alt < 2 || empty($this->tab_translate[$key]))	// We load direction only for primary files or if not yet loaded
-										{
-                                            $this->tab_translate[$key]=$value;
-											if ($stopafterdirection) break;	// We do not save tab if we stop after DIRECTION
-											else if ($usecachekey) $tabtranslatedomain[$key]=$value;
+								if (empty($this->tab_translate[$key])) { // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)
+									$value = preg_replace('/\\n/', "\n", $value); // Parse and render carriage returns
+									if ($key == 'DIRECTION') { // This is to declare direction of language
+										if ($alt < 2 || empty($this->tab_translate[$key])) { // We load direction only for primary files or if not yet loaded
+											$this->tab_translate[$key] = $value;
+											if ($stopafterdirection) {
+												break; // We do not save tab if we stop after DIRECTION
+											} elseif ($usecachekey) {
+												$tabtranslatedomain[$key] = $value;
+											}
 										}
-									}
-									else
-									{
-										$this->tab_translate[$key]=$value;
+									} else {
+										$this->tab_translate[$key] = $value;
 										//if ($domain == 'orders') print "$tab[0] value $value<br>";
-										if ($usecachekey) $tabtranslatedomain[$key]=$value;	// To save lang content in cache
+										if ($usecachekey) {
+											$tabtranslatedomain[$key] = $value;
+										} // To save lang content in cache
 									}
 								}
 							}

From ed5ac9c6179d9851902cac4648c89c34f765c7aa Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 23 Dec 2016 07:11:35 +0100
Subject: [PATCH 0082/1163] Update images.lib.php

---
 htdocs/core/lib/images.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 201394612bc..2fe99bf779a 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -77,7 +77,7 @@ function dol_getImageSize($file, $url = false)
 	$fichier = $file;
 	if (!$url)
 	{
-		$fichier = realpath($file); 	// Chemin canonique absolu de l'image
+		$fichier = realpath(dol_osencode($file)); 	// Chemin canonique absolu de l'image
 		// if problem with realpath
 		if ($fichier == false)
 			return $ret;		

From 337897e0a131b21e6bbb36afbb9842f3a646036f Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 23 Dec 2016 15:01:49 +0100
Subject: [PATCH 0083/1163] NEW : Allow extrafields list select to be
 dependands on other standard list and not only other extrafields list

---
 htdocs/core/class/commonobject.class.php | 36 ++++++++++++------------
 htdocs/langs/en_US/admin.lang            |  6 ++--
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5e83f59ea36..7e59685b4b3 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -597,11 +597,11 @@ abstract class CommonObject
             dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT");
             return -3;
         }
-            
+
         $datecreate = dol_now();
 
         $this->db->begin();
-        
+
         // Insertion dans la base
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
         $sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
@@ -1230,19 +1230,19 @@ abstract class CommonObject
     function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $user='', $trigkey='')
     {
         global $user,$langs,$conf;
-        
+
         if (empty($table)) 	  $table=$this->table_element;
         if (empty($id))    	  $id=$this->id;
 		if (empty($format))   $format='text';
 		if (empty($id_field)) $id_field='rowid';
 
 		$error=0;
-		
+
         $this->db->begin();
 
         // Special case
         if ($table == 'product' && $field == 'note_private') $field='note';
-        
+
         $sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
         if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
         else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);
@@ -1517,7 +1517,7 @@ abstract class CommonObject
 						if($mode == 1) {
 							$line->subprice = 0;
 						}
-						
+
 						switch ($this->element) {
 							case 'propal':
 								$this->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
@@ -2153,7 +2153,7 @@ abstract class CommonObject
         // Special cas
         //var_dump($this->table_element);exit;
 		if ($this->table_element == 'product') $suffix='';
-            
+
     	$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
     	$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
     	$sql.= " WHERE rowid =". $this->id;
@@ -2163,7 +2163,7 @@ abstract class CommonObject
     	{
     		if ($suffix == '_public') $this->note_public = $note;
     		else if ($suffix == '_private') $this->note_private = $note;
-    		else 
+    		else
     		{
     		    $this->note = $note;      // deprecated
     		    $this->note_private = $note;
@@ -2412,7 +2412,7 @@ abstract class CommonObject
     	// Special case
     	if ($origin == 'order') $origin='commande';
     	if ($origin == 'invoice') $origin='facture';
-    	
+
         $this->db->begin();
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
@@ -2899,7 +2899,7 @@ abstract class CommonObject
     function isObjectUsed($id=0)
     {
         if (empty($id)) $id=$this->id;
-        
+
         // Check parameters
         if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)
         {
@@ -3341,9 +3341,9 @@ abstract class CommonObject
 				if ($conf->global->MARGIN_TYPE == "1")
 					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
 				else
-					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';	
+					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';
 			}
-			
+
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
 				print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
 			if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
@@ -3875,7 +3875,7 @@ abstract class CommonObject
 		if ($filefound)
 		{
 			global $db;  // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db
-		    
+
 			require_once $file;
 
 			$obj = new $classname($this->db);
@@ -3934,7 +3934,7 @@ abstract class CommonObject
 			// output format that does not support UTF8.
 			$sav_charset_output=$outputlangs->charset_output;
 
-			if (in_array(get_class($this), array('Adherent'))) 
+			if (in_array(get_class($this), array('Adherent')))
 			{
 			    $arrayofrecords = array();   // The write_file of templates of adherent class need this
 			    $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
@@ -4195,7 +4195,7 @@ abstract class CommonObject
             require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
             $extrafields = new ExtraFields($this->db);
             $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
-            
+
             //Eliminate copied source object extra_fields that do not exist in target object
             $new_array_options=array();
             foreach ($this->array_options as $key => $value) {
@@ -4244,7 +4244,7 @@ abstract class CommonObject
     						{
     							if (is_numeric($value)) $res=$object->fetch($value);
 								else $res=$object->fetch('',$value);
-								
+
     							if ($res > 0) $this->array_options[$key]=$object->id;
     							else
     							{
@@ -4503,7 +4503,7 @@ abstract class CommonObject
 				    jQuery(document).ready(function() {
 				    	function showOptions(child_list, parent_list)
 				    	{
-				    		var val = $("select[name=\"options_"+parent_list+"\"]").val();
+				    		var val = $("select[name="+parent_list+"]").val();
 				    		var parentVal = parent_list + ":" + val;
 							if(val > 0) {
 					    		$("select[name=\""+child_list+"\"] option[parent]").hide();
@@ -4518,7 +4518,7 @@ abstract class CommonObject
 								var parent = $(this).find("option[parent]:first").attr("parent");
 								var infos = parent.split(":");
 								var parent_list = infos[0];
-								$("select[name=\"options_"+parent_list+"\"]").change(function() {
+								$("select[name="+parent_list+"]").change(function() {
 									showOptions(child_list, parent_list);
 								});
 					    	});
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 82ff69fe88a..44f10c5cf36 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -373,11 +373,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter 
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>   

From 3557e4eb378ed3506ebc6dd74581d419bc4fcbf5 Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Fri, 23 Dec 2016 12:40:13 -0300
Subject: [PATCH 0084/1163] Var to public

---
 htdocs/user/class/usergroup.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 575fdadebe2..4f96f46f251 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -38,20 +38,20 @@ class UserGroup extends CommonObject
 	public $table_element='usergroup';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
-	var $entity;		// Entity of group
+	public $entity;		// Entity of group
 	/**
 	 * @deprecated
 	 * @see name
 	 */
-	var $nom;			// Name of group
-	var $globalgroup;	// Global group
-	var $datec;			// Creation date of group
-	var $datem;			// Modification date of group
-	var $members=array();	// Array of users
+	public $nom;			// Name of group
+	public $globalgroup;	// Global group
+	public $datec;			// Creation date of group
+	public $datem;			// Modification date of group
+	public $members=array();	// Array of users
 
 	private $_tab_loaded=array();		// Array of cache of already loaded permissions
 
-	var $oldcopy;		// To contains a clone of this when we need to save old properties of object
+	public $oldcopy;		// To contains a clone of this when we need to save old properties of object
 
 
 	/**

From 76999cf41ed42ba5fa8f8ab17cdbb1201c3c2754 Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Fri, 23 Dec 2016 12:44:07 -0300
Subject: [PATCH 0085/1163] Var to public

Improve code style
---
 htdocs/cashdesk/class/Facturation.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index 240b32e34db..579d244246b 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -37,7 +37,7 @@ class Facturation
      * int $prix		=> Prix HT du produit en cours
      * int $tva			=> 'rowid' du taux de tva dans llx_c_tva
      */
-    var $id;
+    public $id;
     protected $ref;
     protected $qte;
     protected $stock;

From 191f69ec799bfc0e151ecd5e511626f59f6ed972 Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Fri, 23 Dec 2016 14:06:11 -0300
Subject: [PATCH 0086/1163] var to public

Improve code style
---
 htdocs/product/class/service.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/product/class/service.class.php b/htdocs/product/class/service.class.php
index 2cd785527a5..cd3656c2142 100644
--- a/htdocs/product/class/service.class.php
+++ b/htdocs/product/class/service.class.php
@@ -29,14 +29,14 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
  */
 class Service extends CommonObject
 {
-	var $libelle;
-	var $price;
-	var $tms;
-	var $debut;
-	var $fin;
+	public $libelle;
+	public $price;
+	public $tms;
+	public $debut;
+	public $fin;
 
-	var $debut_epoch;
-	var $fin_epoch;
+	public $debut_epoch;
+	public $fin_epoch;
 
 	/**
 	*  Constructor

From e71f216f162cebb90f5f9d6b6d6dc440eaab9588 Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Fri, 23 Dec 2016 14:21:15 -0300
Subject: [PATCH 0087/1163] var to public

Improve code style
---
 htdocs/hrm/class/establishment.class.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 9ff2e2065cc..4438f3ea6ad 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -34,20 +34,20 @@ class Establishment extends CommonObject
 	public $fk_element = 'fk_establishment';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
-	var $id;
-	var $rowid;
+	public $id;
+	public $rowid;
 
-	var $name;
-	var $address;
-	var $zip;
-	var $town;
-	var $status;		// 0=open, 1=closed
-	var $entity;
+	public $name;
+	public $address;
+	public $zip;
+	public $town;
+	public $status;		// 0=open, 1=closed
+	public $entity;
 
-	var $country_id;
+	public $country_id;
 
-	var $statuts=array();
-	var $statuts_short=array();
+	public $statuts=array();
+	public $statuts_short=array();
 
 	/**
 	 * Constructor

From 1338237d7c1cf5573a9d888efdde281fa19920dd Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Tue, 27 Dec 2016 05:48:18 +0100
Subject: [PATCH 0088/1163] Expense report - Better presentation - return list
 order by date

---
 htdocs/expensereport/card.php                      | 3 ++-
 htdocs/expensereport/class/expensereport.class.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index ea75f7eeab6..c368f15ac4d 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2015-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015-2016 Alexandre Spangaro   <aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1806,6 +1806,7 @@ else
 				$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON fde.fk_c_type_fees=ctf.id';
 				$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pjt ON fde.fk_projet=pjt.rowid';
 				$sql.= ' WHERE fde.fk_expensereport = '.$object->id;
+				$sql.= ' ORDER BY fde.date ASC';
 
 				print '<div style="clear: both;">';
 
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 631d1ca548b..60308720231 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2011 Dimitri Mouillard   <dmouillard@teclib.com>
  * Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2015 Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015 Alexandre Spangaro  <aspangaro@zendsi.com>
  * Copyright (C) 2016 Ferran Marcet       <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -830,6 +830,7 @@ class ExpenseReport extends CommonObject
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON de.fk_c_type_fees = ctf.id';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON de.fk_projet = p.rowid';
         $sql.= ' WHERE de.'.$this->fk_element.' = '.$this->id;
+		$sql.= ' ORDER BY de.date ASC';
 
         dol_syslog('ExpenseReport::fetch_lines sql='.$sql, LOG_DEBUG);
         $resql = $this->db->query($sql);

From c21300f0fa267296aa2715870bd5a797c2ec3d03 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Tue, 27 Dec 2016 06:45:36 +0100
Subject: [PATCH 0089/1163] Expense report - Remove DEPLACEMENT_TO_CLEAN

---
 htdocs/expensereport/card.php | 144 ++++++++++++++++------------------
 htdocs/langs/en_US/trips.lang |   4 +-
 2 files changed, 72 insertions(+), 76 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index ea75f7eeab6..2a0d0bb5d9f 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -342,11 +342,11 @@ if (empty($reshook))
     			$filename=array(); $filedir=array(); $mimetype=array();
     
     			// SUBJECT
-    			$subject = $langs->trans("ExpenseReportWaitingForApproval");
+    			$subject = $langs->transnoentities("ExpenseReportWaitingForApproval");
     
     			// CONTENT
     			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
-    			$message = $langs->trans("ExpenseReportWaitingForApprovalMessage", $expediteur->getFullName($langs), get_date_range($object->date_debut,$object->date_fin,'',$langs), $link);
+    			$message = $langs->transnoentities("ExpenseReportWaitingForApprovalMessage", $expediteur->getFullName($langs), get_date_range($object->date_debut,$object->date_fin,'',$langs), $link);
     
     			// Rebuild pdf
     			/*
@@ -436,81 +436,75 @@ if (empty($reshook))
     
     	if ($result > 0)
     	{
-    		if (! empty($conf->global->DEPLACEMENT_TO_CLEAN))  // TODO Translate this so we can remove condition
-    		{
-    			// Send mail
+    		// Send mail
+
+   			// TO
+   			$destinataire = new User($db);
+   			$destinataire->fetch($object->fk_user_validator);
+   			$emailTo = $destinataire->email;
     
-    			// TO
-    			$destinataire = new User($db);
-    			$destinataire->fetch($object->fk_user_validator);
-    			$emailTo = $destinataire->email;
+   			if ($emailTo)
+   			{
+   				// FROM
+   				$expediteur = new User($db);
+   				$expediteur->fetch($object->fk_user_author);
+   				$emailFrom = $expediteur->email;
+
+    			// SUBJECT
+    			$subject = $langs->transnoentities("ExpenseReportWaitingForReApproval");
     
-    			if ($emailTo)
-    			{
-    				// FROM
-    				$expediteur = new User($db);
-    				$expediteur->fetch($object->fk_user_author);
-    				$emailFrom = $expediteur->email;
-    
-    				// SUBJECT
-    				$subject = "' ERP - Note de frais à re-approuver";
-    
-    				// CONTENT
-    				$dateRefusEx = explode(" ",$object->date_refuse);
-    
-    				$message = "Bonjour {$destinataire->firstname},\n\n";
-    				$message.= "Le {$dateRefusEx[0]} à {$dateRefusEx[1]} vous avez refusé d'approuver la note de frais \"{$object->ref}\". Vous aviez émis le motif suivant : {$object->detail_refuse}\n\n";
-    				$message.= "L'auteur vient de modifier la note de frais, veuillez trouver la nouvelle version en pièce jointe.\n";
-    				$message.= "- Déclarant : {$expediteur->firstname} {$expediteur->lastname}\n";
-    				$message.= "- Période : du {$object->date_debut} au {$object->date_fin}\n";
-    				$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-    				$message.= "Bien cordialement,\n' SI";
-    
-    				// Génération du pdf avant attachement
-    				$object->setDocModel($user,"");
-    				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-    
-    				if($resultPDF)
-    				{
-    					// ATTACHMENT
-    					$filename=array(); $filedir=array(); $mimetype=array();
-    					array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-    					array_push($filedir,$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref) . "/" . dol_sanitizeFileName($object->ref_number).".pdf");
-    					array_push($mimetype,"application/pdf");
-    
-    					// PREPARE SEND
-    					$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-    
-    					if (! $mailfile->error)
-    					{
-    						// SEND
-    						$result=$mailfile->sendfile();
-    						if ($result)
-    						{
-    							Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    							exit;
-    						}
-    						else
-    						{
-    							$mesg=$mailfile->error;
-    							setEventMessages($mesg, null, 'errors');
-    						}
-    						// END - Send mail
-    					}
-    					else
-    					{
-    						dol_print_error($db,$resultPDF);
-    						exit;
-    					}
-    				}
-    			}
-    		}
-    	}
-    	else
-    	{
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
-    }
+    			// CONTENT
+    			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+				$dateRefusEx = explode(" ",$object->date_refuse);
+    			$message = $langs->transnoentities("ExpenseReportWaitingForReApprovalMessage", $dateRefusEx[0], $object->detail_refuse, $expediteur->getFullName($langs), $langs), $link);
+
+   				// Rebuild pdf
+				/*
+				$object->setDocModel($user,"");
+				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+
+   				if($resultPDF)
+   				{
+   					// ATTACHMENT
+   					$filename=array(); $filedir=array(); $mimetype=array();
+   					array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+   					array_push($filedir,$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref) . "/" . dol_sanitizeFileName($object->ref_number).".pdf");
+   					array_push($mimetype,"application/pdf");
+				}
+				*/
+
+				// PREPARE SEND
+				$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+
+				if (! $mailfile->error)
+				{
+					// SEND
+					$result=$mailfile->sendfile();
+					if ($result)
+					{
+						Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+						exit;
+					}
+					else
+					{
+						$mesg=$mailfile->error;
+						setEventMessages($mesg, null, 'errors');
+					}
+					// END - Send mail
+				}
+				else
+				{
+					dol_print_error($db,$resultPDF);
+					exit;
+				}
+   			}
+   		}
+   	}
+   	else
+   	{
+   		setEventMessages($object->error, $object->errors, 'errors');
+   	}
+}
     
     // Approve
     if ($action == "confirm_approve" && GETPOST("confirm") == "yes" && $id > 0 && $user->rights->expensereport->approve)
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index 9cb992f6af3..735711a1e58 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -21,7 +21,9 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 ClassifyRefunded=Classify 'Refunded'
 ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation. 
 TripSociete=Information company

From 8a24f2fc91349c4a3039446d368dfe674bce7470 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Tue, 27 Dec 2016 08:14:05 +0100
Subject: [PATCH 0090/1163] Work in progress

---
 htdocs/expensereport/card.php | 528 +++++++++++++++++++---------------
 1 file changed, 296 insertions(+), 232 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 2a0d0bb5d9f..38c9817d27c 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -473,38 +473,53 @@ if (empty($reshook))
 				}
 				*/
 
-				// PREPARE SEND
-				$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-
-				if (! $mailfile->error)
-				{
-					// SEND
-					$result=$mailfile->sendfile();
-					if ($result)
-					{
-						Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-						exit;
-					}
-					else
-					{
-						$mesg=$mailfile->error;
-						setEventMessages($mesg, null, 'errors');
-					}
-					// END - Send mail
-				}
-				else
-				{
-					dol_print_error($db,$resultPDF);
-					exit;
-				}
-   			}
-   		}
-   	}
-   	else
-   	{
-   		setEventMessages($object->error, $object->errors, 'errors');
-   	}
-}
+    			// PREPARE SEND
+    			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+    
+    			if ($mailfile)
+    			{
+    				// SEND
+    				$result=$mailfile->sendfile();
+    				if ($result)
+    				{
+    					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+    					setEventMessages($mesg, null, 'mesgs');
+    					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+    					exit;
+    				}
+    				else
+    				{
+    					$langs->load("other");
+    					if ($mailfile->error)
+    					{
+    						$mesg='';
+    						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+    						$mesg.='<br>'.$mailfile->error;
+    						setEventMessages($mesg, null, 'errors');
+    					}
+    					else
+    					{
+    						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+    					}
+    				}
+    			}
+    			else
+    			{
+    				setEventMessages($mailfile->error,$mailfile->errors,'errors');
+    				$action='';
+    			}
+    		}
+    		else
+    		{
+    			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    			$action='';
+    		}
+    	}
+    	else
+    	{
+    		setEventMessages($object->error, $object->errors, 'errors');
+    	}
+    }
     
     // Approve
     if ($action == "confirm_approve" && GETPOST("confirm") == "yes" && $id > 0 && $user->rights->expensereport->approve)
@@ -536,73 +551,83 @@ if (empty($reshook))
     
     	if ($result > 0)
     	{
-    		if (! empty($conf->global->DEPLACEMENT_TO_CLEAN))  // TODO Translate this so we can remove condition
+    		// Send mail
+
+  			// TO
+   			$destinataire = new User($db);
+   			$destinataire->fetch($object->fk_user_author);
+   			$emailTo = $destinataire->email;
+
+   			// CC
+   			$emailCC = $conf->global->NDF_CC_EMAILS;
+
+			// FROM
+   			$expediteur = new User($db);
+   			$expediteur->fetch($object->fk_user_valid);
+   			$emailFrom = $expediteur->email;
+
+			// SUBJECT
+   			$subject = $langs->transnoentities("ExpenseReportApproval");
+
+   			// CONTENT
+   			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+   			$message = $langs->transnoentities("ExpenseReportApprovalMessage", $destinataire->getFullName($langs), $object->ref, $expediteur->getFullName($langs), '', $langs), $link);
+
+   			// Rebuilt pdf
+			/*
+    		$object->setDocModel($user,"");
+    		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+    
+    		if($resultPDF
+			{
+    			// ATTACHMENT
+    			$filename=array(); $filedir=array(); $mimetype=array();
+    			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+    			array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+    			array_push($mimetype,"application/pdf");
+			}
+			*/
+
+        		// PREPARE SEND
+    			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+    
+    			if ($mailfile)
+    			{
+    				// SEND
+    				$result=$mailfile->sendfile();
+    				if ($result)
+    				{
+    					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+    					setEventMessages($mesg, null, 'mesgs');
+    					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+    					exit;
+    				}
+    				else
+    				{
+    					$langs->load("other");
+    					if ($mailfile->error)
+    					{
+    						$mesg='';
+    						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+    						$mesg.='<br>'.$mailfile->error;
+    						setEventMessages($mesg, null, 'errors');
+    					}
+    					else
+    					{
+    						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+    					}
+    				}
+    			}
+    			else
+    			{
+    				setEventMessages($mailfile->error,$mailfile->errors,'errors');
+    				$action='';
+    			}
+    		}
+    		else
     		{
-    			// Send mail
-    
-    			// TO
-    			$destinataire = new User($db);
-    			$destinataire->fetch($object->fk_user_author);
-    			$emailTo = $destinataire->email;
-    
-    			// CC
-    			$emailCC = $conf->global->NDF_CC_EMAILS;
-    
-    			// FROM
-    			$expediteur = new User($db);
-    			$expediteur->fetch($object->fk_user_valid);
-    			$emailFrom = $expediteur->email;
-    
-    			// SUBJECT
-    			$subject = "' ERP - Note de frais validée";
-    
-    			// CONTENT
-    			$message = "Bonjour {$destinataire->firstname},\n\n";
-    			$message.= "Votre note de frais \"{$object->ref}\" vient d'être approuvé!\n";
-    			$message.= "- Approbateur : {$expediteur->firstname} {$expediteur->lastname}\n";
-    			$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-    			$message.= "Bien cordialement,\n' SI";
-    
-    			// Génération du pdf avant attachement
-    			$object->setDocModel($user,"");
-    			$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-    
-    			if($resultPDF):
-    				// ATTACHMENT
-    				$filename=array(); $filedir=array(); $mimetype=array();
-    				array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-    				array_push($filedir, $conf->expensereport->dir_output.
-    					"/".
-    					dol_sanitizeFileName($object->ref) .
-    					"/".
-    					dol_sanitizeFileName($object->ref).
-    					".pdf"
-    					);
-    				array_push($mimetype,"application/pdf");
-    
-    				// PREPARE SEND
-    				$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename,$emailCC);
-    
-    				if(!$mailfile->error):
-    
-    					// SEND
-    					$result=$mailfile->sendfile();
-    					if ($result):
-    						setEventMessages($langs->trans("MailSuccessfulySent",$emailFrom,$emailTo), null, 'mesgs');
-    						Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    						exit;
-    					else:
-    						setEventMessages($langs->trans("ErrorFailedToSendMail",$emailFrom,$emailTo), null, 'errors');
-    					endif;
-    
-    				else:
-    					setEventMessages($langs->trans("ErrorFailedToSendMail",$emailFrom,$emailTo), null, 'errors');
-    				endif;
-    				// END - Send mail
-    			else : // if ($resultPDF)
-    				dol_print_error($db,$resultPDF);
-    				exit;
-    			endif;
+    			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    			$action='';
     		}
     	}
     	else
@@ -640,57 +665,75 @@ if (empty($reshook))
     
     	if ($result > 0)
     	{
-    		if (! empty($conf->global->DEPLACEMENT_TO_CLEAN))  // TODO Translate this so we can remove condition
+    		// Send mail
+    
+    		// TO
+    		$destinataire = new User($db);
+    		$destinataire->fetch($object->fk_user_author);
+    		$emailTo = $destinataire->email;
+    
+    		// FROM
+    		$expediteur = new User($db);
+    		$expediteur->fetch($object->fk_user_refuse);
+    		$emailFrom = $expediteur->email;
+    
+    		// SUBJECT
+    		$subject = "' ERP - Note de frais refusée";
+    
+    		// CONTENT
+    		$message = "Bonjour {$destinataire->firstname},\n\n";
+    		$message.= "Votre note de frais \"{$object->ref}\" vient d'être refusée.\n";
+    		$message.= "- Refuseur : {$expediteur->firstname} {$expediteur->lastname}\n";
+    		$message.= "- Motif de refus : {$_POST['detail_refuse']}\n";
+    		$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
+    		$message.= "Bien cordialement,\n' SI";
+    
+    		// PREPARE SEND
+    		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+    
+    		if ($mailfile)
     		{
-    			// Send mail
-    
-    			// TO
-    			$destinataire = new User($db);
-    			$destinataire->fetch($object->fk_user_author);
-    			$emailTo = $destinataire->email;
-    
-    			// FROM
-    			$expediteur = new User($db);
-    			$expediteur->fetch($object->fk_user_refuse);
-    			$emailFrom = $expediteur->email;
-    
-    			// SUBJECT
-    			$subject = "' ERP - Note de frais refusée";
-    
-    			// CONTENT
-    			$message = "Bonjour {$destinataire->firstname},\n\n";
-    			$message.= "Votre note de frais \"{$object->ref}\" vient d'être refusée.\n";
-    			$message.= "- Refuseur : {$expediteur->firstname} {$expediteur->lastname}\n";
-    			$message.= "- Motif de refus : {$_POST['detail_refuse']}\n";
-    			$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-    			$message.= "Bien cordialement,\n' SI";
-    
-    			// PREPARE SEND
-    			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message);
-    
-    			if(!$mailfile->error)
+    			// SEND
+    			$result=$mailfile->sendfile();
+    			if ($result)
     			{
-    				// SEND
-    				$result=$mailfile->sendfile();
-    				if ($result)
+    				$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+    				setEventMessages($mesg, null, 'mesgs');
+    				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+    				exit;
+    			}
+    			else
+    			{
+    				$langs->load("other");
+    				if ($mailfile->error)
     				{
-    					setEventMessages($langs->trans("MailSuccessfulySent",$emailFrom,$emailTo), null, 'mesgs');
-    					Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    					exit;
+    					$mesg='';
+    					$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+    					$mesg.='<br>'.$mailfile->error;
+    					setEventMessages($mesg, null, 'errors');
     				}
     				else
     				{
-    					setEventMessages($langs->trans("ErrorFailedToSendMail",$emailFrom,$emailTo), null, 'errors');
+    					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
     				}
-    				// END - Send mail
     			}
     		}
+    		else
+    		{
+    			setEventMessages($mailfile->error,$mailfile->errors,'errors');
+    			$action='';
+    		}
     	}
     	else
     	{
-    		setEventMessages($object->error, $object->errors, 'errors');
+    		setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    		$action='';
     	}
     }
+    else
+    {
+    	setEventMessages($object->error, $object->errors, 'errors');
+    }
     
     //var_dump($user->id == $object->fk_user_validator);exit;
     if ($action == "confirm_cancel" && GETPOST('confirm')=="yes" && GETPOST('detail_cancel') && $id > 0 && $user->rights->expensereport->creer)
@@ -724,64 +767,74 @@ if (empty($reshook))
     
     		if ($result > 0)
     		{
-    			if (! empty($conf->global->DEPLACEMENT_TO_CLEAN))     // TODO Translate this so we can remove condition
+    			// Send mail
+    
+    			// TO
+    			$destinataire = new User($db);
+    			$destinataire->fetch($object->fk_user_author);
+    			$emailTo = $destinataire->email;
+    
+    			// FROM
+    			$expediteur = new User($db);
+    			$expediteur->fetch($object->fk_user_cancel);
+    			$emailFrom = $expediteur->email;
+    
+    			// SUBJECT
+    			$subject = "' ERP - Note de frais annulée";
+    
+    			// CONTENT
+    			$message = "Bonjour {$destinataire->firstname},\n\n";
+    			$message.= "Votre note de frais \"{$object->ref}\" vient d'être annulée.\n";
+    			$message.= "- Annuleur : {$expediteur->firstname} {$expediteur->lastname}\n";
+    			$message.= "- Motif d'annulation : {$_POST['detail_cancel']}\n";
+    			$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
+    			$message.= "Bien cordialement,\n' SI";
+    
+    			// PREPARE SEND
+    			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+    
+    			if ($mailfile)
     			{
-    				// Send mail
-    
-    				// TO
-    				$destinataire = new User($db);
-    				$destinataire->fetch($object->fk_user_author);
-    				$emailTo = $destinataire->email;
-    
-    				// FROM
-    				$expediteur = new User($db);
-    				$expediteur->fetch($object->fk_user_cancel);
-    				$emailFrom = $expediteur->email;
-    
-    				// SUBJECT
-    				$subject = "' ERP - Note de frais annulée";
-    
-    				// CONTENT
-    				$message = "Bonjour {$destinataire->firstname},\n\n";
-    				$message.= "Votre note de frais \"{$object->ref}\" vient d'être annulée.\n";
-    				$message.= "- Annuleur : {$expediteur->firstname} {$expediteur->lastname}\n";
-    				$message.= "- Motif d'annulation : {$_POST['detail_cancel']}\n";
-    				$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-    				$message.= "Bien cordialement,\n' SI";
-    
-    				// PREPARE SEND
-    				$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message);
-    
-    				if(!$mailfile->error)
+    				// SEND
+    				$result=$mailfile->sendfile();
+    				if ($result)
     				{
-    					// SEND
-    					$result=$mailfile->sendfile();
-    					if ($result)
-    					{
-    						header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    						exit;
-    					}
-    					else
-    					{
-    						$mesg="Impossible d'envoyer l'email.";
-    						setEventMessages($mesg, null, 'errors');
-    					}
-    					// END - Send mail
+    					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+    					setEventMessages($mesg, null, 'mesgs');
+    					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+    					exit;
     				}
     				else
     				{
-    					setEventMessages($mail->error, $mail->errors, 'errors');
+    					$langs->load("other");
+    					if ($mailfile->error)
+    					{
+    						$mesg='';
+    						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+    						$mesg.='<br>'.$mailfile->error;
+    						setEventMessages($mesg, null, 'errors');
+    					}
+    					else
+    					{
+    						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+    					}
     				}
     			}
+    			else
+    			{
+    				setEventMessages($mailfile->error,$mailfile->errors,'errors');
+    				$action='';
+    			}
     		}
     		else
     		{
-    			setEventMessages($object->error, $object->errors, 'errors');
+    			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    			$action='';
     		}
     	}
     	else
     	{
-    	    setEventMessages($langs->transnoentitiesnoconv("OnlyOwnerCanCancel"), '', 'errors');    // Should not happened
+    		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
     
@@ -858,68 +911,79 @@ if (empty($reshook))
     
     	if ($result > 0)
     	{
-    		if (! empty($conf->global->DEPLACEMENT_TO_CLEAN)) // TODO Translate this so we can remove condition
+    		// Send mail
+    
+    		// TO
+    		$destinataire = new User($db);
+    		$destinataire->fetch($object->fk_user_author);
+    		$emailTo = $destinataire->email;
+    
+    		// FROM
+    		$expediteur = new User($db);
+    		$expediteur->fetch($user->id);
+    		$emailFrom = $expediteur->email;
+    
+    		// SUBJECT
+    		$subject = "'ERP - Note de frais payée";
+    
+    		// CONTENT
+    		$message = "Bonjour {$destinataire->firstname},\n\n";
+    		$message.= "Votre note de frais \"{$object->ref}\" vient d'être payée.\n";
+    		$message.= "- Payeur : {$expediteur->firstname} {$expediteur->lastname}\n";
+    		$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
+    		$message.= "Bien cordialement,\n' SI";
+    
+    		// Generate pdf before attachment
+    		$object->setDocModel($user,"");
+    		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+    
+    		// PREPARE SEND
+    		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+    
+    		if ($mailfile)
     		{
-    			// Send mail
-    
-    			// TO
-    			$destinataire = new User($db);
-    			$destinataire->fetch($object->fk_user_author);
-    			$emailTo = $destinataire->email;
-    
-    			// FROM
-    			$expediteur = new User($db);
-    			$expediteur->fetch($user->id);
-    			$emailFrom = $expediteur->email;
-    
-    			// SUBJECT
-    			$subject = "'ERP - Note de frais payée";
-    
-    			// CONTENT
-    			$message = "Bonjour {$destinataire->firstname},\n\n";
-    			$message.= "Votre note de frais \"{$object->ref}\" vient d'être payée.\n";
-    			$message.= "- Payeur : {$expediteur->firstname} {$expediteur->lastname}\n";
-    			$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-    			$message.= "Bien cordialement,\n' SI";
-    
-    			// Generate pdf before attachment
-    			$object->setDocModel($user,"");
-    			$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-    
-    			// PREPARE SEND
-    			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message);
-    
-    			if(!$mailfile->error):
-    
     			// SEND
-    			$result=$mailfile->sendfile();
-    			if ($result):
-    
-    			// Retour
-    			if($result):
-    				Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+				$result=$mailfile->sendfile();
+    			if ($result)
+    			{
+    				$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+    				setEventMessages($mesg, null, 'mesgs');
+    				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     				exit;
-    			else:
-    				dol_print_error($db);
-    			endif;
-    
-    			else:
-    			dol_print_error($db,$acct->error);
-    			endif;
-    
-    			else:
-                    $mesg="Impossible d'envoyer l'email.";
-                    setEventMessages($mesg, null, 'errors');
-    			endif;
-    			// END - Send mail
+    			}
+    			else
+    			{
+					$langs->load("other");
+    				if ($mailfile->error)
+    				{
+    					$mesg='';
+    					$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+    					$mesg.='<br>'.$mailfile->error;
+    					setEventMessages($mesg, null, 'errors');
+    				}
+    				else
+    				{
+    					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+    				}
+    			}
+    		}
+    		else
+    		{
+    			setEventMessages($mailfile->error,$mailfile->errors,'errors');
+    			$action='';
     		}
     	}
     	else
     	{
-    		setEventMessages($object->error, $object->errors, 'errors');
+    		setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    		$action='';
     	}
     }
-    
+    else
+    {
+    	setEventMessages($object->error, $object->errors, 'errors');
+    }
+
     if ($action == "addline" && $user->rights->expensereport->creer)
     {
     	$error = 0;

From 4705a87548c590b7aae0b3bab6d0abf9c3c8ea5c Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Tue, 27 Dec 2016 14:48:14 +0100
Subject: [PATCH 0091/1163] Finish work

---
 htdocs/expensereport/card.php | 169 +++++++++++++++++++---------------
 htdocs/langs/en_US/trips.lang |   8 ++
 2 files changed, 105 insertions(+), 72 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 38c9817d27c..afc00b60225 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -456,7 +456,7 @@ if (empty($reshook))
     			// CONTENT
     			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
 				$dateRefusEx = explode(" ",$object->date_refuse);
-    			$message = $langs->transnoentities("ExpenseReportWaitingForReApprovalMessage", $dateRefusEx[0], $object->detail_refuse, $expediteur->getFullName($langs), $langs), $link);
+    			$message = $langs->transnoentities("ExpenseReportWaitingForReApprovalMessage", $dateRefusEx[0], $object->detail_refuse, $expediteur->getFullName($langs), $link);
 
    				// Rebuild pdf
 				/*
@@ -567,11 +567,11 @@ if (empty($reshook))
    			$emailFrom = $expediteur->email;
 
 			// SUBJECT
-   			$subject = $langs->transnoentities("ExpenseReportApproval");
+   			$subject = $langs->transnoentities("ExpenseReportApproved");
 
    			// CONTENT
    			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
-   			$message = $langs->transnoentities("ExpenseReportApprovalMessage", $destinataire->getFullName($langs), $object->ref, $expediteur->getFullName($langs), '', $langs), $link);
+   			$message = $langs->transnoentities("ExpenseReportApprovedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
 
    			// Rebuilt pdf
 			/*
@@ -588,53 +588,52 @@ if (empty($reshook))
 			}
 			*/
 
-        		// PREPARE SEND
-    			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-    
-    			if ($mailfile)
-    			{
-    				// SEND
-    				$result=$mailfile->sendfile();
-    				if ($result)
-    				{
-    					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
-    					setEventMessages($mesg, null, 'mesgs');
-    					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    					exit;
-    				}
-    				else
-    				{
-    					$langs->load("other");
-    					if ($mailfile->error)
-    					{
-    						$mesg='';
-    						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-    						$mesg.='<br>'.$mailfile->error;
-    						setEventMessages($mesg, null, 'errors');
-    					}
-    					else
-    					{
-    						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-    					}
-    				}
-    			}
-    			else
-    			{
-    				setEventMessages($mailfile->error,$mailfile->errors,'errors');
-    				$action='';
-    			}
-    		}
-    		else
-    		{
-    			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
-    			$action='';
-    		}
-    	}
-    	else
-    	{
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
-    }
+        	// PREPARE SEND
+    		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+
+   			if ($mailfile)
+   			{
+   				// SEND
+   				$result=$mailfile->sendfile();
+   				if ($result)
+   				{
+   					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+   					setEventMessages($mesg, null, 'mesgs');
+   					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+   					exit;
+   				}
+   				else
+   				{
+   					$langs->load("other");
+   					if ($mailfile->error)
+   					{
+   						$mesg='';
+   						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+   						$mesg.='<br>'.$mailfile->error;
+   						setEventMessages($mesg, null, 'errors');
+   					}
+   					else
+   					{
+   						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+   					}
+   				}
+   			}
+   			else
+   			{
+   				setEventMessages($mailfile->error,$mailfile->errors,'errors');
+   				$action='';
+   			}
+   		}
+   		else
+   		{
+   			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+   			$action='';
+   		}
+   	}
+   	else
+   	{
+   		setEventMessages($object->error, $object->errors, 'errors');
+   	}
     
     if ($action == "confirm_refuse" && GETPOST('confirm')=="yes" && $id > 0 && $user->rights->expensereport->approve)
     {
@@ -677,16 +676,27 @@ if (empty($reshook))
     		$expediteur->fetch($object->fk_user_refuse);
     		$emailFrom = $expediteur->email;
     
-    		// SUBJECT
-    		$subject = "' ERP - Note de frais refusée";
+			// SUBJECT
+   			$subject = $langs->transnoentities("ExpenseReportRefused");
+
+   			// CONTENT
+   			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+			$message = $langs->transnoentities("ExpenseReportRefusedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_refuse'], $link);
+
+   			// Rebuilt pdf
+			/*
+    		$object->setDocModel($user,"");
+    		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
     
-    		// CONTENT
-    		$message = "Bonjour {$destinataire->firstname},\n\n";
-    		$message.= "Votre note de frais \"{$object->ref}\" vient d'être refusée.\n";
-    		$message.= "- Refuseur : {$expediteur->firstname} {$expediteur->lastname}\n";
-    		$message.= "- Motif de refus : {$_POST['detail_refuse']}\n";
-    		$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-    		$message.= "Bien cordialement,\n' SI";
+    		if($resultPDF
+			{
+    			// ATTACHMENT
+    			$filename=array(); $filedir=array(); $mimetype=array();
+    			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+    			array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+    			array_push($mimetype,"application/pdf");
+			}
+			*/
     
     		// PREPARE SEND
     		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
@@ -779,17 +789,28 @@ if (empty($reshook))
     			$expediteur->fetch($object->fk_user_cancel);
     			$emailFrom = $expediteur->email;
     
-    			// SUBJECT
-    			$subject = "' ERP - Note de frais annulée";
-    
-    			// CONTENT
-    			$message = "Bonjour {$destinataire->firstname},\n\n";
-    			$message.= "Votre note de frais \"{$object->ref}\" vient d'être annulée.\n";
-    			$message.= "- Annuleur : {$expediteur->firstname} {$expediteur->lastname}\n";
-    			$message.= "- Motif d'annulation : {$_POST['detail_cancel']}\n";
-    			$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-    			$message.= "Bien cordialement,\n' SI";
-    
+				// SUBJECT
+				$subject = $langs->transnoentities("ExpenseReportCanceled");
+
+				// CONTENT
+				$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+				$message = $langs->transnoentities("ExpenseReportCanceledMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_cancel'], $link);
+
+				// Rebuilt pdf
+				/*
+				$object->setDocModel($user,"");
+				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+		
+				if($resultPDF
+				{
+					// ATTACHMENT
+					$filename=array(); $filedir=array(); $mimetype=array();
+					array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+					array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+					array_push($mimetype,"application/pdf");
+				}
+				*/
+
     			// PREPARE SEND
     			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
     
@@ -923,8 +944,12 @@ if (empty($reshook))
     		$expediteur->fetch($user->id);
     		$emailFrom = $expediteur->email;
     
-    		// SUBJECT
-    		$subject = "'ERP - Note de frais payée";
+			// SUBJECT
+			$subject = $langs->transnoentities("ExpenseReportPaid");
+
+			// CONTENT
+			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+			$message = $langs->transnoentities("ExpenseReportPaidMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
     
     		// CONTENT
     		$message = "Bonjour {$destinataire->firstname},\n\n";
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index 735711a1e58..ac650ab98c7 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -24,6 +24,14 @@ ExpenseReportWaitingForApproval=A new expense report has been submitted for appr
 ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
 ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
 ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportApproved=An expense report was approved
+ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportRefused=An expense report was refused
+ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportCanceled=An expense report was canceled
+ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportPaid=An expense report was paid
+ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation. 
 TripSociete=Information company

From 154425e2bcca8ca241ebf6d6ae7b53eeaa027803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 27 Dec 2016 16:13:39 +0100
Subject: [PATCH 0092/1163] Fixed PHP fatal error

---
 htdocs/product/class/product.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 418b66d4ac7..2f5540cbc8b 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -976,6 +976,7 @@ class Product extends CommonObject
 			if (!$error) {
 
 				require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination2ValuePair.class.php';
 
 				//If it is a parent product, then we remove the association with child products
 				$prodcomb = new ProductCombination($this->db);

From f1961b0207632da59619ef0cb0c1c3e295faaac1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2016 03:43:22 +0100
Subject: [PATCH 0093/1163] Work on sorting/indexing upload files

---
 htdocs/core/actions_linkedfiles.inc.php       |  4 +-
 htdocs/core/class/html.formfile.class.php     |  4 +-
 htdocs/core/lib/files.lib.php                 | 37 ++++++++++---------
 htdocs/core/photos_resize.php                 |  4 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  8 +++-
 .../mysql/tables/llx_ecm_files.key.sql        |  4 +-
 htdocs/install/mysql/tables/llx_ecm_files.sql |  2 +-
 7 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index d97ecbe716a..018baab0cc0 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -18,10 +18,12 @@
  * or see http://www.gnu.org/
  */
 
-
 // Variable $upload_dir must be defined when entering here
 // Variable $upload_dirold may also exists.
 
+//var_dump($upload_dir);
+//var_dump($upload_dirold);
+
 // Submit file/link
 if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 1e07f5c2b0a..78f5f3f5359 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1001,8 +1001,8 @@ class FormFile
     			        $rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filearray[$key]['fullname']);
     			        if (! preg_match('/(\/temp\/|\/thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
     			        {
-        			        dol_syslog("list_of_documents We found a file not indexed into database. We add it");
-        			        include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+        			        dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
+        			        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
         			        $ecmfile=new EcmFiles($this->db);
         			        	
         			        // Add entry into database
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 8b338f8aea1..245bfe7d310 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -244,6 +244,7 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
                 $level1name=(isset($reg[1])?$reg[1]:'');
                 $file_list[] = array(
                     "rowid" => $obj->rowid,
+                    "label" => $obj->label,         // md5
     				"name" => $obj->filename,
     				"path" => DOL_DATA_ROOT.'/'.$obj->filepath,
                     "level1name" => $level1name,
@@ -619,7 +620,7 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
                 //var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);
 
                 dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
-                include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+                include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
                 $ecmfile=new EcmFiles($db);
                 $result = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
                 if ($result > 0)   // If found
@@ -895,7 +896,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
     				        $rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
     				        
     				        dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
-        				    include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+        				    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
         				    $ecmfile=new EcmFiles($db);
         				    $result = $ecmfile->fetch(0, '', $rel_filetodelete);
         				    if ($result >= 0)
@@ -1190,42 +1191,43 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 			
 			for ($i = 0; $i < $nbfile; $i++)
 			{
-				// Define $destpath (path to file including filename) and $destfile (only filename)
-				$destpath=$upload_dir . "/" . $TFile['name'][$i];
+				// Define $destfull (path to file including filename) and $destfile (only filename)
+				$destfull=$upload_dir . "/" . $TFile['name'][$i];
 				$destfile=$TFile['name'][$i];
 	
 				$savingdocmask = dol_sanitizeFileName($savingdocmask);
 	
 				if ($savingdocmask)
 				{
-					$destpath=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
+					$destfull=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
 					$destfile=preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
 				}
 
 				// lowercase extension
-				$info = pathinfo($destpath);
-				$destpath = $info['dirname'].'/'.$info['filename'].'.'.strtolower($info['extension']);
+				$info = pathinfo($destfull);
+				$destfull = $info['dirname'].'/'.$info['filename'].'.'.strtolower($info['extension']);
 				$info = pathinfo($destfile);
 				$destfile = $info['filename'].'.'.strtolower($info['extension']);
 
-				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destpath, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
-				if (is_numeric($resupload) && $resupload > 0)
+				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
+				
+				if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'
 				{
 					global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
 				
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 					
 					// Generate thumbs.
-					if (image_format_supported($destpath) == 1)
+					if (image_format_supported($destfull) == 1)
 					{
 					    // Create thumbs
 					    // We can't use $object->addThumbs here because there is no $object known
 					
 					    // Used on logon for example
-					    $imgThumbSmall = vignette($destpath, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
+					    $imgThumbSmall = vignette($destfull, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
 					    // Create mini thumbs for image (Ratio is near 16/9)
 					    // Used on menu or for setup page for example
-					    $imgThumbMini = vignette($destpath, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
+					    $imgThumbMini = vignette($destfull, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
 					}
 					
 					// Update session
@@ -1234,24 +1236,25 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 						$formmail = new FormMail($db);
 						$formmail->trackid = $trackid;
-						$formmail->add_attached_files($destpath, $destfile, $TFile['type'][$i]);
+						$formmail->add_attached_files($destfull, $destfile, $TFile['type'][$i]);
 					}
 					
 					// Update table of files
 					if ($donotupdatesession) 
 					{
-					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
-					    if (! preg_match('/[\\/]temp[\\/]/', $rel_dir))     // If not a tmp file
+					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
+				    
+					    if (! preg_match('/[\\/]temp[\\/]/', $rel_dir))     // If not a tmp dir
 					    {
 					        $filename = basename($destfile);
 					        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 					        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
     					    
-    					    include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+    					    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
     					    $ecmfile=new EcmFiles($db);
     					    $ecmfile->filepath = $rel_dir;
     					    $ecmfile->filename = $filename;
-    					    $ecmfile->label = md5_file(dol_osencode($destpath));
+    					    $ecmfile->label = md5_file(dol_osencode($destfull));
     					    $ecmfile->fullpath_orig = $TFile['name'][$i];
     					    $ecmfile->gen_or_uploaded = 'uploaded';
     					    $ecmfile->description = '';    // indexed content
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 9936a495ceb..8fcd0d2b930 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -143,7 +143,7 @@ if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POS
 		$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $fullpath);
 		$rel_filename = preg_replace('/^[\\/]/','',$rel_filename);
 		
-		include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 		$ecmfile=new EcmFiles($db);
 		$result = $ecmfile->fetch(0, '', $rel_filename);
 		if ($result > 0)   // If found
@@ -211,7 +211,7 @@ if ($action == 'confirm_crop')
 		$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $fullpath);
 		$rel_filename = preg_replace('/^[\\/]/','',$rel_filename);
 		
-		include DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 		$ecmfile=new EcmFiles($db);
 		$result = $ecmfile->fetch(0, '', $rel_filename);
 		if ($result > 0)   // If found
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 56fdb70b809..7ba91298545 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -25,10 +25,16 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
-ALTER TABLE llx_ecm_files CHANGE COLUMN fullpath filepath varchar(750);
+ALTER TABLE llx_ecm_files CHANGE COLUMN fullpath filepath varchar(255);
+ALTER TABLE llx_ecm_files CHANGE COLUMN filepath filepath varchar(255);
 ALTER TABLE llx_ecm_files ADD COLUMN position integer;
 ALTER TABLE llx_ecm_files CHANGE COLUMN keyword keyword varchar(750);
 
+ALTER TABLE llx_ecm_files DROP INDEX uk_ecm_files;
+ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (filepath, filename, entity);
+
+ALTER TABLE llx_ecm_files ADD INDEX idx_ecm_files_label (label);
+
 
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30);
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.key.sql b/htdocs/install/mysql/tables/llx_ecm_files.key.sql
index 2b8b1348ba3..b2e686b714b 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files.key.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files.key.sql
@@ -17,7 +17,9 @@
 -- ============================================================================
 
 
-ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (label, entity);		-- label is a md5
+ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (filepath, filename, entity);
+ALTER TABLE llx_ecm_files ADD INDEX idx_ecm_files_label (label);
+
 --ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files_fullpath(fullpath); Disabled, mysql limits size of index
 
 
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql
index 45157cdf959..71654eabca1 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_ecm_files
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   label				varchar(64) NOT NULL,			-- label contains a md5
   entity			integer DEFAULT 1 NOT NULL,		-- multi company id
-  filepath    		varchar(750) NOT NULL,   	    -- relative to dolibarr document dir. Example module/def
+  filepath    		varchar(255) NOT NULL,   	    -- relative to dolibarr document dir. Example module/def
   filename          varchar(255) NOT NULL,			-- file name only without any directory
   fullpath_orig		varchar(750),	                -- full path of original filename, when file is uploaded from a local computer
   description		text,

From f46ce68d08be4cffeb5e862989059bebe4e93489 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Dec 2016 16:16:20 +0100
Subject: [PATCH 0094/1163] NEW Can sort thumbs visible on product card

---
 htdocs/core/class/commonobject.class.php  |   5 +-
 htdocs/core/class/html.formfile.class.php |  11 +-
 htdocs/core/lib/files.lib.php             |   4 +-
 htdocs/core/lib/images.lib.php            |   6 +-
 htdocs/product/class/product.class.php    | 287 +++++++++++++---------
 htdocs/product/document.php               |   2 +-
 6 files changed, 188 insertions(+), 127 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5e83f59ea36..98bf53743ba 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1929,7 +1929,10 @@ abstract class CommonObject
 	 */
 	function updateRangOfLine($rowid,$rang)
 	{
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET rang  = '.$rang;
+	    $fieldposition = 'rang';
+	    if ($this->table_element_line == 'ecm_files') $fieldposition = 'position';
+	    
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 		$sql.= ' WHERE rowid = '.$rowid;
 
 		dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 78f5f3f5359..cd56b4d0b59 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -984,17 +984,20 @@ class FormFile
     			    {
     			        if ($filearrayindatabase[$key2]['name'] == $filearray[$key]['name'])
     			        {
+    			            $filearray[$key]['position_name']=($filearrayindatabase[$key2]['position']?$filearrayindatabase[$key2]['position']:'0').'_'.$filearrayindatabase[$key2]['name'];
     			            $filearray[$key]['position']=$filearrayindatabase[$key2]['position'];
     			            $filearray[$key]['cover']=$filearrayindatabase[$key2]['cover'];
     			            $filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
     			            $filearray[$key]['rowid']=$filearrayindatabase[$key2]['rowid'];
+    			            $filearray[$key]['label']=$filearrayindatabase[$key2]['label'];
     			            $found=1;
     			            break;
     			        }
     			    }
-    			    if (! $found)
+    			    
+    			    if (! $found)    // This happen in transition towerd version 6, or if files were added manually into os dir.
     			    {
-    			        $filearray[$key]['position']=999999;     // File not indexed are at end. So if we add a file, it will not replace an existing position
+    			        $filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
     			        $filearray[$key]['cover']=0;
     			        $filearray[$key]['acl']='';
 
@@ -1035,6 +1038,10 @@ class FormFile
     			    }
     			}
     
+    			/*var_dump($filearray);
+    			var_dump($sortfield);
+    			var_dump($sortorder);*/
+    			 
     			if ($sortfield && $sortorder)
     			{
         			$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 245bfe7d310..d097cc484ba 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -88,7 +88,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 	}
 
 	// $reshook may contain returns stacked by other modules
-	// $reshook is always empty with an array for can not lose returns stacked with other modules
+	// $reshook is always empty with an array to not lose returns stacked with other modules
 	// $hookmanager->resArray may contain array stacked by other modules
 	if (! $nohook && ! empty($hookmanager->resArray)) // forced to use $hookmanager->resArray even if $hookmanager->resArray['nodes'] is empty
 	{
@@ -210,7 +210,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
  *  Scan a directory and return a list of files/directories.
  *  Content for string is UTF8 and dir separator is "/".
  *
- *  @param	string		$path        	Starting path from which to search
+ *  @param	string		$path        	Starting path from which to search. Example: 'produit/MYPROD'
  *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function
  *  @param	array|null	$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.'))
  *  @param	string		$sortcriteria	Sort criteria ("","fullname","name","date","size")
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 9cf745a0da0..00153a7849d 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -37,8 +37,10 @@ $quality = 80;
  */
 function image_format_supported($file)
 {
+    $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm';   // See also into product.class.php
+    
     // Case filename is not a format image
-    if (! preg_match('/(\.gif|\.jpg|\.jpeg|\.png|\.bmp)$/i',$file,$reg)) return -1;
+    if (! preg_match('/('.$regeximgext.')$/i',$file,$reg)) return -1;
 
     // Case filename is a format image but not supported by this PHP
     $imgfonction='';
@@ -47,6 +49,8 @@ function image_format_supported($file)
     if (strtolower($reg[1]) == '.jpg')  $imgfonction = 'imagecreatefromjpeg';
     if (strtolower($reg[1]) == '.jpeg') $imgfonction = 'imagecreatefromjpeg';
     if (strtolower($reg[1]) == '.bmp')  $imgfonction = 'imagecreatefromwbmp';
+    if (strtolower($reg[1]) == '.xpm')  $imgfonction = 'imagecreatefromxpm';
+    if (strtolower($reg[1]) == '.xbm')  $imgfonction = 'imagecreatefromxbm';
     if ($imgfonction)
     {
         if (! function_exists($imgfonction))
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index a61406c90d7..0fd2be8ba7f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -54,7 +54,7 @@ class Product extends CommonObject
 	 */
 	protected $table_ref_field = 'ref';
 
-	var $regeximgext='\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff';
+	var $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm'; // See also into images.lib.php
 
 	/*
 	 * @deprecated
@@ -3691,15 +3691,16 @@ class Product extends CommonObject
 	}
 
 	/**
-	 *  Affiche la premiere photo du produit
+	 *  Return if at least one photo is available
 	 *
-	 *  @param      string		$sdir       Repertoire a scanner
-	 *  @return     boolean     			true si photo dispo, false sinon
+	 *  @param      string		$sdir       Directory to scan
+	 *  @return     boolean     			True if at least one photo is available, False if not
 	 */
 	function is_photo_available($sdir)
 	{
-		include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
-
+	    include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
+	    include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
+	     
 		global $conf;
 
 		$dir = $sdir;
@@ -3717,7 +3718,7 @@ class Product extends CommonObject
 			    while (($file = readdir($handle)) !== false)
     			{
     				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in UTF8 in memory
-    				if (dol_is_file($dir.$file)) return true;
+    				if (dol_is_file($dir.$file) && image_format_supported($file) > 0) return true;
     			}
 			}
 		}
@@ -3729,7 +3730,7 @@ class Product extends CommonObject
 	 *  Show photos of a product (nbmax maximum), into several columns
 	 *	TODO Move this into html.formproduct.class.php
 	 *
-	 *  @param      string	$sdir        	Directory to scan
+	 *  @param      string	$sdir        	Directory to scan (full absolute path)
 	 *  @param      int		$size        	0=original size, 1='small' use thumbnail if possible
 	 *  @param      int		$nbmax       	Nombre maximum de photos (0=pas de max)
 	 *  @param      int		$nbbyrow     	Number of image per line or -1 to use div. Used only if size=1.
@@ -3747,140 +3748,186 @@ class Product extends CommonObject
 		include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
 		include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
 
+		$sortfield='position_name';
+		$sortorder='asc';
+		
 		$dir = $sdir . '/';
 		$pdir = '/';
+		$dir .= get_exdir(0,0,0,0,$this,'product').$this->ref.'/';
+		$pdir .= get_exdir(0,0,0,0,$this,'product').$this->ref.'/';
+
 		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 		{
-			$dir .= get_exdir($this->id,2,0,0,$this,'product') . $this->id ."/photos/";
-			$pdir .= get_exdir($this->id,2,0,0,$this,'product') . $this->id ."/photos/";
-		}
-		else
-		{
-			$dir .= get_exdir(0,0,0,0,$this,'product').$this->ref.'/';
-			$pdir .= get_exdir(0,0,0,0,$this,'product').$this->ref.'/';
+			$dirold .= get_exdir($this->id,2,0,0,$this,'product') . $this->id ."/photos/";
+			$pdirold .= get_exdir($this->id,2,0,0,$this,'product') . $this->id ."/photos/";
 		}
 
+		// Defined relative dir to DOL_DATA_ROOT
+		$relativedir = '';
+		if ($dir)
+		{
+		    $relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
+		    $relativedir = preg_replace('/^[\\/]/','',$relativedir);
+		    $relativedir = preg_replace('/[\\/]$/','',$relativedir);
+		}
+		
 		$dirthumb = $dir.'thumbs/';
 		$pdirthumb = $pdir.'thumbs/';
 
 		$return ='<!-- Photo -->'."\n";
 		$nbphoto=0;
 
-		$dir_osencoded=dol_osencode($dir);
-		if (file_exists($dir_osencoded))
+		$filearray=dol_dir_list($dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+		
+		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
 		{
-			$handle=opendir($dir_osencoded);
-            if (is_resource($handle))
+		    $filearrayold=dol_dir_list($dirold,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+		    $filearray=array_merge($filearray, $filearrayold);
+		}
+
+        $filearrayindatabase = dol_dir_list_in_database($relativedir, '', null, 'name', SORT_ASC);
+            
+        //var_dump($filearray);
+        //var_dump($filearrayindatabase);
+        
+        // Complete filearray with properties found into $filearrayindatabase
+        foreach($filearray as $key => $val)
+        {
+            $found=0;
+            // Search if it exists into $filearrayindatabase
+            foreach($filearrayindatabase as $key2 => $val2)
             {
-    			while (($file = readdir($handle)) !== false)
-    			{
-    				$photo='';
+                if ($filearrayindatabase[$key2]['name'] == $filearray[$key]['name'])
+                {
+                    $filearray[$key]['position_name']=($filearrayindatabase[$key2]['position']?$filearrayindatabase[$key2]['position']:'0').'_'.$filearrayindatabase[$key2]['name'];
+                    $filearray[$key]['position']=$filearrayindatabase[$key2]['position'];
+                    $filearray[$key]['cover']=$filearrayindatabase[$key2]['cover'];
+                    $filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
+                    $filearray[$key]['rowid']=$filearrayindatabase[$key2]['rowid'];
+                    $filearray[$key]['label']=$filearrayindatabase[$key2]['label'];
+                    $found=1;
+                    break;
+                }
+            }
+        }
+        
+        if (count($filearray))
+        {
+            if ($sortfield && $sortorder)
+            {
+                $filearray=dol_sort_array($filearray, $sortfield, $sortorder);
+            }
+            
+            foreach($filearray as $key => $val)
+            {
+				$photo='';
+                $file = $val['name'];
+                
+				//if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory
 
-    				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory
+				//if (dol_is_file($dir.$file) && image_format_supported($file) >= 0)
+				if (image_format_supported($file) >= 0)
+				{
+					$nbphoto++;
+					$photo = $file;
+					$viewfilename = $file;
 
-    				if (dol_is_file($dir.$file) && preg_match('/('.$this->regeximgext.')$/i', $dir.$file))
-    				{
-    					$nbphoto++;
-    					$photo = $file;
-    					$viewfilename = $file;
+					if ($size == 1 || $size == 'small') {   // Format vignette
 
-    					if ($size == 1 || $size == 'small') {   // Format vignette
+						// Find name of thumb file
+						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));
+						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';
+						
+						// Get filesize of original file
+						$imgarray=dol_getImageSize($dir.$photo);
 
-    						// Find name of thumb file
-    						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));
-    						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';
-    						
-    						// Get filesize of original file
-    						$imgarray=dol_getImageSize($dir.$photo);
+						if ($nbbyrow > 0)
+						{
+							if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
 
-    						if ($nbbyrow > 0)
-    						{
-    							if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
+							if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>';
+							$return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';
+						}
+						else if ($nbbyrow < 0) $return .= '<div class="inline-block">';
 
-    							if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>';
-    							$return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';
-    						}
-    						else if ($nbbyrow < 0) $return .= '<div class="inline-block">';
+						$return.= "\n";
+						
+						$relativefile=preg_replace('/^\//', '', $pdir.$photo);
+						if (empty($nolink)) 
+						{
+						    $urladvanced=getAdvancedPreviewUrl('product', $relativefile);
+						    if ($urladvanced) $return.='<a href="'.$urladvanced.'">';
+						    else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+						}
 
-    						$return.= "\n";
-    						
-    						$relativefile=preg_replace('/^\//', '', $pdir.$photo);
-    						if (empty($nolink)) 
-    						{
-    						    $urladvanced=getAdvancedPreviewUrl('product', $relativefile);
-    						    if ($urladvanced) $return.='<a href="'.$urladvanced.'">';
-    						    else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
-    						}
+						// Show image (width height=$maxHeight)
+						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
+						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;
+						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
+						
+						if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
+						{
+							$return.= '<!-- Show thumb -->';
+							$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
+						}
+						else {
+							$return.= '<!-- Show original file -->';
+							$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
+						}
 
-    						// Show image (width height=$maxHeight)
-    						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
-    						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;
-    						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
-    						
-    						if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
-    						{
-    							$return.= '<!-- Show thumb -->';
-    							$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
-    						}
-    						else {
-    							$return.= '<!-- Show original file -->';
-    							$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
-    						}
+						if (empty($nolink)) $return.= '</a>';
+						$return.="\n";
 
-    						if (empty($nolink)) $return.= '</a>';
-    						$return.="\n";
+						if ($showfilename) $return.= '<br>'.$viewfilename;
+						if ($showaction)
+						{
+							$return.= '<br>';
+							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
+							if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight))
+							{
+								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'&nbsp;&nbsp;</a>';
+							}
+							if ($user->rights->produit->creer || $user->rights->service->creer)
+							{
+								// Link to resize
+			               		$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'</a> &nbsp; ';
 
-    						if ($showfilename) $return.= '<br>'.$viewfilename;
-    						if ($showaction)
-    						{
-    							$return.= '<br>';
-    							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
-    							if ($photo_vignette && preg_match('/('.$this->regeximgext.')$/i', $photo) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight))
-    							{
-    								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'&nbsp;&nbsp;</a>';
-    							}
-    							if ($user->rights->produit->creer || $user->rights->service->creer)
-    							{
-    								// Link to resize
-    			               		$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'</a> &nbsp; ';
+			               		// Link to delete
+								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+								$return.= img_delete().'</a>';
+							}
+						}
+						$return.= "\n";
 
-    			               		// Link to delete
-    								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
-    								$return.= img_delete().'</a>';
-    							}
-    						}
-    						$return.= "\n";
+						if ($nbbyrow > 0)
+						{
+							$return.= '</td>';
+							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';
+						}
+						else if ($nbbyrow < 0) $return.='</div>';
+					}
 
-    						if ($nbbyrow > 0)
-    						{
-    							$return.= '</td>';
-    							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';
-    						}
-    						else if ($nbbyrow < 0) $return.='</div>';
-    					}
+					if (empty($size)) {     // Format origine
+						$return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
 
-    					if (empty($size)) {     // Format origine
-    						$return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
+						if ($showfilename) $return.= '<br>'.$viewfilename;
+						if ($showaction)
+						{
+							if ($user->rights->produit->creer || $user->rights->service->creer)
+							{
+								// Link to resize
+			               		$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'</a> &nbsp; ';
 
-    						if ($showfilename) $return.= '<br>'.$viewfilename;
-    						if ($showaction)
-    						{
-    							if ($user->rights->produit->creer || $user->rights->service->creer)
-    							{
-    								// Link to resize
-    			               		$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','',1).'</a> &nbsp; ';
+			               		// Link to delete
+			               		$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+								$return.= img_delete().'</a>';
+							}
+						}
+					}
 
-    			               		// Link to delete
-    			               		$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
-    								$return.= img_delete().'</a>';
-    							}
-    						}
-    					}
-
-    					// On continue ou on arrete de boucler ?
-    					if ($nbmax && $nbphoto >= $nbmax) break;
-    				}
-    			}
+					// On continue ou on arrete de boucler ?
+					if ($nbmax && $nbphoto >= $nbmax) break;
+				}
             }
 
 			if ($size==1 || $size=='small')
@@ -3897,8 +3944,6 @@ class Product extends CommonObject
 					if ($nbphoto) $return.= '</table>';
 				}
 			}
-
-			closedir($handle);
 		}
 
 		$this->nbphoto = $nbphoto;
@@ -3916,8 +3961,9 @@ class Product extends CommonObject
 	 */
 	function liste_photos($dir,$nbmax=0)
 	{
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
+	    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	    include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+	     
 		$nbphoto=0;
 		$tabobj=array();
 
@@ -3928,7 +3974,7 @@ class Product extends CommonObject
 			while (($file = readdir($handle)) !== false)
 			{
 				if (! utf8_check($file)) $file=utf8_encode($file);	// readdir returns ISO
-				if (dol_is_file($dir.$file) && preg_match('/('.$this->regeximgext.')$/i', $dir.$file))
+				if (dol_is_file($dir.$file) && image_format_supported($file) >= 0)
 				{
 					$nbphoto++;
 
@@ -3969,8 +4015,9 @@ class Product extends CommonObject
 	 */
 	function delete_photo($file)
 	{
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
+	    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	    require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+	     
         $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
 		$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
 		$filename = preg_replace('/'.preg_quote($dir,'/').'/i','',$file); // Nom du fichier
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 07381787cb6..ae2782cc4de 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -62,7 +62,7 @@ $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (! $sortfield) $sortfield="position_name";
 
 
 $object = new Product($db);

From 522fb4cf7a3bf50fdf2b38236bd77a6f1fb4430a Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Mon, 26 Dec 2016 05:18:40 +0100
Subject: [PATCH 0095/1163] Add email template for each line in object

---
 htdocs/admin/dict.php                         | 32 +++++++--
 htdocs/core/class/html.formmail.class.php     | 67 +++++++++++++++++--
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 +
 .../mysql/tables/llx_c_email_templates.sql    |  3 +-
 4 files changed, 90 insertions(+), 14 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 2ca1337736e..afde36018a5 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -188,7 +188,7 @@ $tabsql[21]= "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX
 $tabsql[22]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
 $tabsql[23]= "SELECT t.rowid as rowid, t.taux, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
 $tabsql[24]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
-$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template',1).")";
+$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template',1).")";
 $tabsql[26]= "SELECT rowid   as rowid, code, label, short_label, active FROM ".MAIN_DB_PREFIX."c_units";
 $tabsql[27]= "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_stcomm";
 $tabsql[28]= "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newbymonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
@@ -262,7 +262,7 @@ $tabfield[21]= "code,label";
 $tabfield[22]= "code,label";
 $tabfield[23]= "country_id,country,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[24]= "code,label";
-$tabfield[25]= "label,type_template,private,position,topic,content";
+$tabfield[25]= "label,type_template,private,position,topic,content_lines,content";
 $tabfield[26]= "code,label,short_label";
 $tabfield[27]= "code,libelle";
 $tabfield[28]= "code,label,affect,delay,newbymonth,country_id,country";
@@ -299,7 +299,7 @@ $tabfieldvalue[21]= "code,label";
 $tabfieldvalue[22]= "code,label";
 $tabfieldvalue[23]= "country,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[24]= "code,label";
-$tabfieldvalue[25]= "label,type_template,private,position,topic,content";
+$tabfieldvalue[25]= "label,type_template,private,position,topic,content_lines,content";
 $tabfieldvalue[26]= "code,label,short_label";
 $tabfieldvalue[27]= "code,libelle";
 $tabfieldvalue[28]= "code,label,affect,delay,newbymonth,country";
@@ -336,7 +336,7 @@ $tabfieldinsert[21]= "code,label";
 $tabfieldinsert[22]= "code,label";
 $tabfieldinsert[23]= "fk_pays,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[24]= "code,label";
-$tabfieldinsert[25]= "label,type_template,private,position,topic,content,entity";
+$tabfieldinsert[25]= "label,type_template,private,position,topic,content_lines,content,entity";
 $tabfieldinsert[26]= "code,label,short_label";
 $tabfieldinsert[27]= "code,libelle";
 $tabfieldinsert[28]= "code,label,affect,delay,newbymonth,fk_country";
@@ -449,7 +449,7 @@ $tabhelp[21] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[22] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[23] = array();
 $tabhelp[24] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[25] = array('topic'=>$langs->trans('SeeSubstitutionVars'),'content'=>$langs->trans('SeeSubstitutionVars'),'type_template'=>$langs->trans("TemplateForElement"),'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
+$tabhelp[25] = array('topic'=>$langs->trans('SeeSubstitutionVars'),'content'=>$langs->trans('SeeSubstitutionVars'),'content_lines'=>$langs->trans('SeeSubstitutionVars'),'type_template'=>$langs->trans("TemplateForElement"),'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[26] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[28] = array('affect'=>$langs->trans("FollowedByACounter"),'delay'=>$langs->trans("MinimumNoticePeriod"), 'newbymonth'=>$langs->trans("NbAddedAutomatically"));
@@ -1062,6 +1062,7 @@ if ($id)
 			if ($fieldlist[$field]=='custom_x')        { $valuetoshow=$langs->trans("CustomX"); }
 			if ($fieldlist[$field]=='custom_y')        { $valuetoshow=$langs->trans("CustomY"); }
 			if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); }
+			if ($fieldlist[$field]=='content_lines')   { $valuetoshow=$langs->trans("ContentLines"); }
 			if ($fieldlist[$field]=='percent')         { $valuetoshow=$langs->trans("Percentage"); }
 			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("Info"); }
 			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
@@ -1253,6 +1254,7 @@ if ($id)
 			if ($fieldlist[$field]=='custom_x')        { $valuetoshow=$langs->trans("CustomX"); }
 			if ($fieldlist[$field]=='custom_y')        { $valuetoshow=$langs->trans("CustomY"); }
 			if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); }
+			if ($fieldlist[$field]=='content_lines')   { $valuetoshow=$langs->trans("ContentLines"); }
 			if ($fieldlist[$field]=='percent')         { $valuetoshow=$langs->trans("Percentage"); }
 			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("Info"); }
 			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
@@ -1770,6 +1772,24 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 		elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
 			print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea></td>';
 		}
+		elseif (in_array($fieldlist[$field], array('content_lines')))
+		{
+			if ($tabname == MAIN_DB_PREFIX.'c_email_templates')
+			{
+				print '<td colspan="4"></td></tr><tr class="pair nohover"><td colspan="5">';		// To create an artificial CR for the current tr we are on
+			}
+			else print '<td>';
+			if ($context != 'hide')
+			{
+				//print '<input type="text" size="100" class="flat" value="'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
+				$okforextended=true;
+				if ($tabname == MAIN_DB_PREFIX.'c_email_templates' && empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended=false;
+				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 100, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_1, '90%');
+				print $doleditor->Create(1);
+			}
+			else print '&nbsp;';
+			print '</td>';
+		}
 		elseif (in_array($fieldlist[$field], array('content')))
 		{
 			if ($tabname == MAIN_DB_PREFIX.'c_email_templates')
@@ -1782,7 +1802,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 				//print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
 				$okforextended=true;
 				if ($tabname == MAIN_DB_PREFIX.'c_email_templates' && empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended=false;
-				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_5, '90%');
+				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_8, '90%');
 				print $doleditor->Create(1);
 			}
 			else print '&nbsp;';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 013b34699d7..10fb88bbe64 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -77,6 +77,7 @@ class FormMail extends Form
     var $withfckeditor;
 
     var $substit=array();
+    var $substit_lines=array();
     var $param=array();
 
     var $error;
@@ -712,6 +713,18 @@ class FormMail extends Form
         				$this->substit['__PERSONALIZED__']=str_replace('\n',"\n",$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url));
         			}
         		}
+                
+                //Add lines substitution key from each line
+                $lines = '';
+                $defaultlines = $arraydefaultmessage['content_lines'];
+                if (isset($defaultlines))
+                {
+                    foreach ($this->substit_lines as $substit_line)
+                    {
+                        $lines .= make_substitutions($defaultlines,$substit_line)."\n";
+                    }
+                }
+                $this->substit['__LINES__']=$lines;
 
 				$defaultmessage=str_replace('\n',"\n",$defaultmessage);
 
@@ -820,7 +833,7 @@ class FormMail extends Form
 	{
 		$ret=array();
 
-		$sql = "SELECT label, topic, content, lang";
+		$sql = "SELECT label, topic, content, content_lines, lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$db->escape($type_template)."'";
 		$sql.= " AND entity IN (".getEntity("c_email_templates").")";
@@ -840,6 +853,7 @@ class FormMail extends Form
 				$ret['label']=$obj->label;
 				$ret['topic']=$obj->topic;
 				$ret['content']=$obj->content;
+				$ret['content_lines']=$obj->content_lines;
 				$ret['lang']=$obj->lang;
 			}
 			else
@@ -859,6 +873,7 @@ class FormMail extends Form
 	        	$ret['label']='default';
 	        	$ret['topic']='';
 	        	$ret['content']=$defaultmessage;
+				$ret['content_lines']='';
 	        	$ret['lang']=$outputlangs->defaultlang;
 			}
 
@@ -922,7 +937,7 @@ class FormMail extends Form
 	{
 		$ret=array();
 
-		$sql = "SELECT rowid, label, topic, content, lang, position";
+		$sql = "SELECT rowid, label, topic, content, content_lines, lang, position";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
 		$sql.= " AND entity IN (".getEntity("c_email_templates").")";
@@ -944,6 +959,7 @@ class FormMail extends Form
 				$line->label=$obj->label;
 				$line->topic=$obj->topic;
 				$line->content=$obj->content;
+				$line->content_lines=$obj->content_lines;
 				$line->lang=$obj->lang;
 				$this->lines_model[]=$line;
 			}
@@ -962,7 +978,7 @@ class FormMail extends Form
 	/**
 	 * Set substit array from object
 	 * 
-	 * @param	Object	   $object		  Object to use
+	 * @param	CommonObject	   $object		  Object to use
 	 * @param   Translate  $outputlangs   Object lang 
 	 * @return	void
 	 */
@@ -970,11 +986,11 @@ class FormMail extends Form
 	{
 		global $user;
 		$this->substit['__REF__'] = $object->ref;
-		$this->substit['__REFCLIENT__'] = $object->ref_client;
-		$this->substit['__REFSUPPLIER__'] = $object->ref_supplier;
+		$this->substit['__REFCLIENT__'] = isset($object->ref_client) ? $object->ref_client : '';
+		$this->substit['__REFSUPPLIER__'] = isset($object->ref_supplier) ? $object->ref_supplier : '';
 
-		$this->substit['__DATE_YMD__'] = dol_print_date($object->date, 'day', 0, $outputlangs);
-		$this->substit['__DATE_DUE_YMD__'] = dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs);
+		$this->substit['__DATE_YMD__'] = isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : '';
+		$this->substit['__DATE_DUE_YMD__'] = isset($object->date_lim_reglement)? dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs) : '';
 		$this->substit['__AMOUNT__'] = price($object->total_ttc);
 		$this->substit['__AMOUNT_WO_TAX__'] = price($object->total_ht);
 		
@@ -988,6 +1004,42 @@ class FormMail extends Form
 		$this->substit['__SIGNATURE__'] = $user->signature;
 		$this->substit['__PERSONALIZED__'] = '';
 		$this->substit['__CONTACTCIVNAME__'] = '';	// Will be replace just before sending
+        
+        //Fill substit_lines with each object lines content
+        if (is_array($object->lines))
+        {
+            foreach ($object->lines as $line)
+            {
+                $substit_line = array(
+                    '__PRODUCT_REF__' => isset($line->product_ref) ? $line->product_ref : '',
+                    '__PRODUCT_LABEL__' => isset($line->product_label) ? $line->product_label : '',
+                    '__PRODUCT_DESCRIPTION__' => isset($line->product_desc) ? $line->product_desc : '',
+                    '__LABEL__' => isset($line->label) ? $line->label : '',
+                    '__DESCRIPTION__' => isset($line->desc) ? $line->desc : '',
+                    '__DATE_START_YMD__' => dol_print_date($line->date_start, 'day', 0, $outputlangs),
+                    '__DATE_END_YMD__' => dol_print_date($line->date_end, 'day', 0, $outputlangs),
+                    '__QUANTITY__' => $line->qty,
+                    '__SUBPRICE__' => price($line->subprice),
+                    '__AMOUNT__' => price($line->total_ttc),
+                    '__AMOUNT_WO_TAX__' => price($line->total_ht),
+                    //'__PRODUCT_EXTRAFIELD_FIELD__' Done dinamically
+                );
+
+                // Create dinamic tags for __PRODUCT_EXTRAFIELD_FIELD__
+                if (!empty($line->fk_product))
+                {
+                    $extrafields = new ExtraFields($this->db);
+                    $extralabels = $extrafields->fetch_name_optionals_label('product', true);
+                    $product = new Product($this->db);
+                    $product->fetch($line->fk_product, '', '', 1);
+                    $product->fetch_optionals($product->id, $extralabels);
+                    foreach ($extrafields->attribute_label as $key => $label) {
+                        $substit_line['__PRODUCT_EXTRAFIELD_' . strtoupper($key) . '__'] = $product->array_options['options_' . $key];
+                    }
+                }
+                $this->substit_lines[] = $substit_line;
+            }
+        }
 	}
 	
 	/**
@@ -1066,5 +1118,6 @@ class ModelMail
 	public $label;
 	public $topic;
 	public $content;
+	public $content_lines;
 	public $lang;
 }
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 7ba91298545..55eec47a1da 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -40,3 +40,5 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30);
 
+ALTER TABLE llx_c_email_templates ADD COLUMN content_lines text;
+
diff --git a/htdocs/install/mysql/tables/llx_c_email_templates.sql b/htdocs/install/mysql/tables/llx_c_email_templates.sql
index b4d2f9a96cb..6c97ea180a1 100644
--- a/htdocs/install/mysql/tables/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/tables/llx_c_email_templates.sql
@@ -32,5 +32,6 @@ create table llx_c_email_templates
   position        smallint,					      -- Position
   active          tinyint DEFAULT 1  NOT NULL,
   topic			  text,                           -- Predefined topic
-  content         text                            -- Predefined text
+  content         text,                           -- Predefined text
+  content_lines   text                            -- Predefined lines
 )ENGINE=innodb;

From 67c513a9c13adad05c7e977a60a39c6eaffe05b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2017 18:38:22 +0100
Subject: [PATCH 0096/1163] Prepare 6.0 dev

---
 htdocs/filefunc.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 2954b431708..7e9503d7bb2 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE','Dolibarr');
-if (! defined('DOL_VERSION')) define('DOL_VERSION','5.0.0-beta');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','6.0.0-alpha');
 
 if (! defined('EURO')) define('EURO',chr(128));
 

From f023d6485f4c44f1fd28c748cd2713bea681dfef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2017 18:39:55 +0100
Subject: [PATCH 0097/1163] Prepare 6.0 dev

---
 htdocs/install/check.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index adbe7759f4e..ad687d3c52d 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -411,7 +411,8 @@ else
 								array('from'=>'3.7.0', 'to'=>'3.8.0'),
 		                        array('from'=>'3.8.0', 'to'=>'3.9.0'),
 		                        array('from'=>'3.9.0', 'to'=>'4.0.0'),
-		                        array('from'=>'4.0.0', 'to'=>'5.0.0')
+		                        array('from'=>'4.0.0', 'to'=>'5.0.0'),
+		                        array('from'=>'5.0.0', 'to'=>'6.0.0')
 		);
 
 		$count=0;

From afe5c6b2964be680c49d767874503f78f6c61e58 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2017 18:44:11 +0100
Subject: [PATCH 0098/1163] Fix migration

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 7ba91298545..9da76ef8d3b 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -28,6 +28,7 @@
 ALTER TABLE llx_ecm_files CHANGE COLUMN fullpath filepath varchar(255);
 ALTER TABLE llx_ecm_files CHANGE COLUMN filepath filepath varchar(255);
 ALTER TABLE llx_ecm_files ADD COLUMN position integer;
+ALTER TABLE llx_ecm_files ADD COLUMN keyword varchar(750);
 ALTER TABLE llx_ecm_files CHANGE COLUMN keyword keyword varchar(750);
 
 ALTER TABLE llx_ecm_files DROP INDEX uk_ecm_files;

From 598e559563ff1a9dee47d28ed1856bd3fe8a74c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Jan 2017 19:30:12 +0100
Subject: [PATCH 0099/1163] Fix migration

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 9da76ef8d3b..f586add0837 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -30,6 +30,7 @@ ALTER TABLE llx_ecm_files CHANGE COLUMN filepath filepath varchar(255);
 ALTER TABLE llx_ecm_files ADD COLUMN position integer;
 ALTER TABLE llx_ecm_files ADD COLUMN keyword varchar(750);
 ALTER TABLE llx_ecm_files CHANGE COLUMN keyword keyword varchar(750);
+ALTER TABLE llx_ecm_files ADD COLUMN gen_or_uploaded varchar(12);
 
 ALTER TABLE llx_ecm_files DROP INDEX uk_ecm_files;
 ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (filepath, filename, entity);

From 7aad6683fad60ae70846a063fdf26c778db065d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2017 10:50:37 +0100
Subject: [PATCH 0100/1163] Add cast to remove scrutinizer warning

---
 htdocs/adherents/type.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index cab52dceccc..85b591f0fca 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -91,10 +91,10 @@ if ($action == 'add' && $user->rights->adherent->configurer)
 		$object = new AdherentType($db);
 
 		$object->libelle        = trim($label);
-		$object->subscription   = trim($subscription);
+		$object->subscription   = (int) trim($subscription);
 		$object->note           = trim($comment);
-		$object->mail_valid     = trim($mail_valid);
-		$object->vote           = trim($vote);
+		$object->mail_valid     = (boolean) trim($mail_valid);
+		$object->vote           = (boolean) trim($vote);
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
@@ -129,10 +129,10 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 		$object = new AdherentType($db);
 		$object->id             = $rowid;
 		$object->libelle        = trim($label);
-		$object->subscription   = trim($subscription);
+		$object->subscription   = (int) trim($subscription);
 		$object->note           = trim($comment);
-		$object->mail_valid     = trim($mail_valid);
-		$object->vote           = trim($vote);
+		$object->mail_valid     = (boolean) trim($mail_valid);
+		$object->vote           = (boolean) trim($vote);
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);

From 728dd3f7b31dbfca3fc7c03a7f821ddaae008107 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2017 11:06:24 +0100
Subject: [PATCH 0101/1163] Add field ref into ecm_files table.

---
 htdocs/ecm/class/ecmfiles.class.php               | 13 ++++++++-----
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql    |  1 +
 htdocs/install/mysql/tables/llx_ecm_files.key.sql |  4 ++--
 htdocs/install/mysql/tables/llx_ecm_files.sql     |  1 +
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 1e371c9020a..431e27dd38f 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -232,7 +232,7 @@ class EcmFiles //extends CommonObject
 	 * Load object in memory from the database
 	 *
 	 * @param  int    $id          Id object
-	 * @param  string $ref         Ref = md5 = label
+	 * @param  string $ref         Not used yet. Will contains a hash id from filename+filepath
 	 * @param  string $fullpath    Full path of file (relative path to document directory)
 	 * @return int                 <0 if KO, 0 if not found, >0 if OK
 	 */
@@ -242,6 +242,7 @@ class EcmFiles //extends CommonObject
 
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
+		$sql .= " t.ref,";
 		$sql .= " t.label,";
 		$sql .= " t.entity,";
 		$sql .= " t.filename,";
@@ -260,14 +261,15 @@ class EcmFiles //extends CommonObject
 		$sql .= " t.acl";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql.= ' WHERE 1 = 1';
+		/* Fetching this table depends on filepath+filename, it must not depends on entity
 		if (! empty($conf->multicompany->enabled)) {
 		    $sql .= " AND entity IN (" . getEntity("ecmfiles", 1) . ")";
-		}
+		}*/
 		if ($fullpath) {
 			$sql .= " AND t.filepath = '" . $this->db->escape(dirname($fullpath)) . "' AND t.filename = '".$this->db->escape(basename($fullpath))."'";
 		}
 		elseif (null !== $ref) {
-			$sql .= " AND t.label = '".$this->db->escape($ref)."'";
+			$sql .= " AND t.ref = '".$this->db->escape($ref)."'";
 		} else {
 			$sql .= ' AND t.rowid = ' . $id;
 		}
@@ -279,7 +281,7 @@ class EcmFiles //extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
-				
+				$this->ref = $obj->ref;
 				$this->label = $obj->label;
 				$this->entity = $obj->entity;
 				$this->filename = $obj->filename;
@@ -367,9 +369,10 @@ class EcmFiles //extends CommonObject
 			}
 		}
 		$sql.= ' WHERE 1 = 1';
+		/* Fetching this table depends on filepath+filename, it must not depends on entity
 		if (! empty($conf->multicompany->enabled)) {
 		    $sql .= " AND entity IN (" . getEntity("ecmfiles", 1) . ")";
-		}
+		}*/
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
 		}
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index f586add0837..bf10b925516 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -25,6 +25,7 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
+ALTER TABLE llx_ecm_files ADD COLUMN ref varchar(128) AFTER rowid;
 ALTER TABLE llx_ecm_files CHANGE COLUMN fullpath filepath varchar(255);
 ALTER TABLE llx_ecm_files CHANGE COLUMN filepath filepath varchar(255);
 ALTER TABLE llx_ecm_files ADD COLUMN position integer;
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.key.sql b/htdocs/install/mysql/tables/llx_ecm_files.key.sql
index b2e686b714b..a55debc9cd0 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files.key.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files.key.sql
@@ -1,5 +1,5 @@
 -- ============================================================================
--- Copyright (C) 2015	Laurent Destailleur	<eldy@users.sourceforge.net>
+-- Copyright (C) 2017	Laurent Destailleur	<eldy@users.sourceforge.net>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 -- ============================================================================
 
 
-ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (filepath, filename, entity);
+ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (filepath, filename);
 ALTER TABLE llx_ecm_files ADD INDEX idx_ecm_files_label (label);
 
 --ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files_fullpath(fullpath); Disabled, mysql limits size of index
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql
index 71654eabca1..dcc9dd40b9d 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files.sql
@@ -19,6 +19,7 @@
 CREATE TABLE llx_ecm_files
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
+  ref				varchar(128),					-- Not used yet. Will contains a hash id from filename+filepath
   label				varchar(64) NOT NULL,			-- label contains a md5
   entity			integer DEFAULT 1 NOT NULL,		-- multi company id
   filepath    		varchar(255) NOT NULL,   	    -- relative to dolibarr document dir. Example module/def

From febd23fe41a16440310f9ff80ef85d21f4067dd0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2017 11:22:03 +0100
Subject: [PATCH 0102/1163] Clean dead code

---
 dev/skeletons/skeleton_class.class.php        |   8 +-
 .../compta/paiement/class/cpaiement.class.php |  82 -------------
 .../sociales/class/cchargesociales.class.php  |  82 -------------
 htdocs/ecm/class/ecmfiles.class.php           |   2 +-
 .../fournisseur.commande.dispatch.class.php   |   2 +-
 .../mysql/tables/llx_website_pages.sql        |   1 -
 .../product/stock/class/productlot.class.php  | 115 ------------------
 .../class/productstockentrepot.class.php      |   2 +-
 htdocs/websites/class/website.class.php       |  53 +-------
 htdocs/websites/class/websitepage.class.php   |  36 ++----
 10 files changed, 20 insertions(+), 363 deletions(-)

diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php
index 1c9b8cb52bf..01b48c35f75 100644
--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -253,23 +253,19 @@ class Skeleton_Class extends CommonObject
 			$sql .= $this->db->order($sortfield,$sortorder);
 		}
 		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
+		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
 		}
 
-		//$this->lines = array();
-
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
 			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new Skeleton_ClassLine();
+				$line = new self($this->db);
 
 				$line->id = $obj->rowid;
 				$line->prop1 = $obj->field1;
 				$line->prop2 = $obj->field2;
-
-				//$this->lines[$line->id] = $line;
 				//...
 			}
 			$this->db->free($resql);
diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php
index 5428f4abdbf..d6031ae1685 100644
--- a/htdocs/compta/paiement/class/cpaiement.class.php
+++ b/htdocs/compta/paiement/class/cpaiement.class.php
@@ -39,10 +39,6 @@ class Cpaiement
 	 */
 	public $table_element = 'c_paiement';
 
-	/**
-	 * @var CpaiementLine[] Lines
-	 */
-	public $lines = array();
 
 	/**
 	 */
@@ -227,84 +223,6 @@ class Cpaiement
 		}
 	}
 
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.id,';
-		$sql .= " t.code,";
-		$sql .= " t.libelle,";
-		$sql .= " t.type,";
-		$sql .= " t.active,";
-		$sql .= " t.accountancy_code,";
-		$sql .= " t.module";
-
-		
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
-		}
-		
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
-		}
-		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
-		}
-		$this->lines = array();
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new CpaiementLine();
-
-				$line->id = $obj->id;
-				
-				$line->code = $obj->code;
-				$line->libelle = $obj->libelle;
-				$line->type = $obj->type;
-				$line->active = $obj->active;
-				$line->accountancy_code = $obj->accountancy_code;
-				$line->module = $obj->module;
-
-				
-
-				$this->lines[$line->id] = $line;
-			}
-			$this->db->free($resql);
-
-			return $num;
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
 	/**
 	 * Update object into database
 	 *
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index 538754e63b2..a44b820c8ea 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -43,11 +43,6 @@ class Cchargesociales
 	 */
 	public $table_element = 'c_chargesociales';
 
-	/**
-	 * @var CchargesocialesLine[] Lines
-	 */
-	public $lines = array();
-
 	/**
 	 */
 	
@@ -237,83 +232,6 @@ class Cchargesociales
 		}
 	}
 
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= " t.id,";
-		$sql .= " t.libelle,";
-		$sql .= " t.deductible,";
-		$sql .= " t.active,";
-		$sql .= " t.code,";
-		$sql .= " t.fk_pays,";
-		$sql .= " t.module,";
-		$sql .= " t.accountancy_code";
-
-		
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
-		}
-		
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
-		}
-		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
-		}
-		$this->lines = array();
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new CchargesocialesLine();
-
-				$line->id = $obj->id;
-				$line->libelle = $obj->libelle;
-				$line->deductible = $obj->deductible;
-				$line->active = $obj->active;
-				$line->code = $obj->code;
-				$line->fk_pays = $obj->fk_pays;
-				$line->module = $obj->module;
-				$line->accountancy_code = $obj->accountancy_code;
-
-				$this->lines[$line->id] = $line;
-			}
-			$this->db->free($resql);
-
-			return $num;
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
 	/**
 	 * Update object into database
 	 *
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 431e27dd38f..2089a5b3bb8 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -380,7 +380,7 @@ class EcmFiles //extends CommonObject
 			$sql .= $this->db->order($sortfield,$sortorder);
 		}
 		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
+            $sql .=  ' ' . $this->db->plimit($limit, $offset);
 		}
 
 		$this->lines = array();
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 0464a9fb51f..7fd56f81aac 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -596,7 +596,7 @@ class CommandeFournisseurDispatch extends CommonObject
 			$sql .= $this->db->order($sortfield,$sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
+			$sql .=  ' ' . $this->db->plimit($limit, $offset);
 		}
 		$this->lines = array();
 
diff --git a/htdocs/install/mysql/tables/llx_website_pages.sql b/htdocs/install/mysql/tables/llx_website_pages.sql
index f1ea66bb56a..982420dd507 100644
--- a/htdocs/install/mysql/tables/llx_website_pages.sql
+++ b/htdocs/install/mysql/tables/llx_website_pages.sql
@@ -28,6 +28,5 @@ CREATE TABLE llx_website_page
 	content		  mediumtext,		-- text is not enough in size
     status        integer,
     date_creation     datetime,
-    date_modification datetime,
 	tms           timestamp
 ) ENGINE=innodb;
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 6128f8dcf17..0d92afe96e0 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -256,92 +256,6 @@ class Productlot extends CommonObject
 		}
 	}
 
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-		
-		$sql .= " t.entity,";
-		$sql .= " t.fk_product,";
-		$sql .= " t.batch,";
-		$sql .= " t.eatby,";
-		$sql .= " t.sellby,";
-		$sql .= " t.datec,";
-		$sql .= " t.tms,";
-		$sql .= " t.fk_user_creat,";
-		$sql .= " t.fk_user_modif,";
-		$sql .= " t.import_key";
-
-		
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
-		}
-		
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
-		}
-		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
-		}
-		$this->lines = array();
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			while ($obj = $this->db->fetch_object($resql)) 
-			{
-				$line = new ProductlotLine();
-
-				$line->id = $obj->rowid;
-				
-				$line->entity = $obj->entity;
-				$line->fk_product = $obj->fk_product;
-				$line->batch = $obj->batch;
-				$line->eatby = $this->db->jdate($obj->eatby);
-				$line->sellby = $this->db->jdate($obj->sellby);
-				$line->datec = $this->db->jdate($obj->datec);
-				$line->tms = $this->db->jdate($obj->tms);
-				$line->fk_user_creat = $obj->fk_user_creat;
-				$line->fk_user_modif = $obj->fk_user_modif;
-				$line->import_key = $obj->import_key;
-
-				$this->lines[$line->id] = $line;
-			}
-			$this->db->free($resql);
-
-			return $num;
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
 	/**
 	 * Update object into database
 	 *
@@ -595,32 +509,3 @@ class Productlot extends CommonObject
 
 }
 
-/**
- * Class ProductlotLine
- */
-class ProductlotLine
-{
-	/**
-	 * @var int ID
-	 */
-	public $id;
-	/**
-	 * @var mixed Sample line property 1
-	 */
-	
-	public $entity;
-	public $fk_product;
-	public $batch;
-	public $eatby = '';
-	public $sellby = '';
-	public $datec = '';
-	public $tms = '';
-	public $fk_user_creat;
-	public $fk_user_modif;
-	public $import_key;
-
-	/**
-	 * @var mixed Sample line property 2
-	 */
-	
-}
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index 2f4af887e3e..048be66461f 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -273,7 +273,7 @@ class ProductStockEntrepot extends CommonObject
 		// "elseif" used instead of "if" because getting list with specified fk_product and specified fk_entrepot would be the same as doing a fetch
 		
 		if (!empty($sortfield)) $sql .= $this->db->order($sortfield,$sortorder);
-		if (!empty($limit)) $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
+		if (!empty($limit)) $sql .=  ' ' . $this->db->plimit($limit, $offset);
 		
 		$lines = array();
 
diff --git a/htdocs/websites/class/website.class.php b/htdocs/websites/class/website.class.php
index 2d5f13570b8..51a61d90112 100644
--- a/htdocs/websites/class/website.class.php
+++ b/htdocs/websites/class/website.class.php
@@ -286,7 +286,6 @@ class Website extends CommonObject
 
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
-		
 		$sql .= " t.entity,";
 		$sql .= " t.ref,";
 		$sql .= " t.description,";
@@ -296,7 +295,6 @@ class Website extends CommonObject
 		$sql .= " t.date_creation,";
 		$sql .= " t.date_modification,";
 		$sql .= " t.tms";
-		
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
 
 		// Manage filter
@@ -314,7 +312,7 @@ class Website extends CommonObject
 			$sql .= $this->db->order($sortfield,$sortorder);
 		}
 		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
+		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
 		}
 		$this->records = array();
 
@@ -323,7 +321,7 @@ class Website extends CommonObject
 			$num = $this->db->num_rows($resql);
 
 			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new WebsiteLine();
+				$line = new self($this->db);
 
 				$line->id = $obj->rowid;
 				
@@ -650,50 +648,3 @@ class Website extends CommonObject
 
 }
 
-/**
- * Class WebsiteLine
- */
-class WebsiteLine
-{
-	/**
-	 * @var int ID
-	 */
-	public $id;
-	/**
-	 * @var int
-	 */
-	public $entity;
-	/**
-	 * @var string
-	 */
-	public $ref;
-	/**
-	 * @var string
-	 */
-	public $description;
-	/**
-	 * @var int
-	 */
-	public $status;
-	/**
-	 * @var int
-	 */
-	public $fk_default_home;
-	/**
-	 * @var string
-	 */
-	public $virtualhost;
-	/**
-	 * @var mixed
-	 */
-	public $date_creation;
-	/**
-	 * @var mixed
-	 */
-	public $date_modification;
-	/**
-	 * @var mixed
-	 */
-	public $tms = '';
-	
-}
diff --git a/htdocs/websites/class/websitepage.class.php b/htdocs/websites/class/websitepage.class.php
index abd604bd3d9..883b6495c53 100644
--- a/htdocs/websites/class/websitepage.class.php
+++ b/htdocs/websites/class/websitepage.class.php
@@ -57,7 +57,6 @@ class WebsitePage extends CommonObject
 	public $status;
 	public $date_creation;
 	public $date_modification;
-	public $tms;
 
 	/**
 	 */
@@ -203,8 +202,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.content,";
 		$sql .= " t.status,";
 		$sql .= " t.date_creation,";
-		$sql .= " t.date_modification,";
-		$sql .= " t.tms";
+		$sql .= " t.tms as date_modification";
 
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		if (null !== $website_id) {
@@ -231,9 +229,6 @@ class WebsitePage extends CommonObject
 				$this->status = $obj->status;
 				$this->date_creation = $this->db->jdate($obj->date_creation);
 				$this->date_modification = $this->db->jdate($obj->date_modification);
-				$this->tms = $this->db->jdate($obj->tms);
-
-
 			}
 			$this->db->free($resql);
 
@@ -278,8 +273,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.content,";
 		$sql .= " t.status,";
 		$sql .= " t.date_creation,";
-		$sql .= " t.date_modification,";
-		$sql .= " t.tms";
+		$sql .= " t.tms as date_modification";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
 		$sql .= ' WHERE t.fk_website = '.$websiteid; 
 		// Manage filter
@@ -301,9 +295,8 @@ class WebsitePage extends CommonObject
 			$sql .= $this->db->order($sortfield,$sortorder);
 		}
 		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
+            $sql .=  ' ' . $this->db->plimit($limit, $offset);
 		}
-		$this->lines = array();
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -311,7 +304,7 @@ class WebsitePage extends CommonObject
 
 			while ($obj = $this->db->fetch_object($resql))
 			{
-				$record = new WebsitePage($this->db);
+				$record = new self($this->db);
 
 				$record->id = $obj->rowid;
 				$record->fk_website = $obj->fk_website;
@@ -323,7 +316,6 @@ class WebsitePage extends CommonObject
 				$record->status = $obj->status;
 				$record->date_creation = $this->db->jdate($obj->date_creation);
 				$record->date_modification = $this->db->jdate($obj->date_modification);
-				$record->tms = $this->db->jdate($obj->tms);
 				//var_dump($record->id);
 				$records[$record->id] = $record;
 			}
@@ -389,8 +381,7 @@ class WebsitePage extends CommonObject
 		$sql .= ' content = '.(isset($this->content)?"'".$this->db->escape($this->content)."'":"null").',';
 		$sql .= ' status = '.(isset($this->status)?$this->status:"null").',';
 		$sql .= ' date_creation = '.(! isset($this->date_creation) || dol_strlen($this->date_creation) != 0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').',';
-		$sql .= ' date_modification = '.(! isset($this->date_modification) || dol_strlen($this->date_modification) != 0 ? "'".$this->db->idate($this->date_modification)."'" : 'null').',';
-		$sql .= ' tms = '.(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : "'".$this->db->idate(dol_now())."'");
+		$sql .= ' tms = '.(dol_strlen($this->date_modification) != 0 ? "'".$this->db->idate($this->date_modification)."'" : "'".$this->db->idate(dol_now())."'");
 		$sql .= ' WHERE rowid=' . $this->id;
 
 		$this->db->begin();
@@ -633,18 +624,17 @@ class WebsitePage extends CommonObject
 	{
 		$this->id = 0;
 
+		$now=dol_now();
+		
 		$this->fk_website = '';
 		$this->pageurl = '';
-		$this->title = '';
-		$this->description = '';
-		$this->keywords = '';
-		$this->content = '';
+		$this->title = 'My Page';
+		$this->description = 'This is my page';
+		$this->keywords = 'keyword1, keyword2';
+		$this->content = '<html><body>This is a html content</body></html>';
 		$this->status = '';
-		$this->date_creation = '';
-		$this->date_modification = '';
-		$this->tms = '';
-
-
+		$this->date_creation = $now - (24 * 30 * 3600);
+		$this->date_modification = $now - (24 * 7 * 3600);
 	}
 
 }

From 27c056d377a58b68b6e3e890e9e24229e35f6afa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2017 11:30:27 +0100
Subject: [PATCH 0103/1163] Avoid duplicate function error

---
 htdocs/comm/action/pertype.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 2dd5d78d9b9..4f4ef6a580c 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -656,7 +656,7 @@ foreach ($typeofevents as $typeofevent)
 		if ($todayarray['mday']==$tmpday && $todayarray['mon']==$tmpmonth && $todayarray['year']==$tmpyear) $today=1;
 		if ($today) $style='cal_today_peruser';
 
-		show_day_events2($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
+		show_day_events_pertype($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
 
 		$i++;
 	}
@@ -756,7 +756,7 @@ $db->close();
  * @param	bool	$var			true or false for alternat style on tr/td
  * @return	void
  */
-function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false, $colorsbytype=array(), $var=false)
+function show_day_events_pertype($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false, $colorsbytype=array(), $var=false)
 {
 	global $db;
 	global $user, $conf, $langs, $hookmanager, $action;

From 4907f9581fe8dddc45d99d03e7cea279318ebd85 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Jan 2017 11:34:37 +0100
Subject: [PATCH 0104/1163] Fix warning

---
 htdocs/accountancy/class/html.formventilation.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/html.formventilation.class.php b/htdocs/accountancy/class/html.formventilation.class.php
index 376e5b00d56..e1a21d852ea 100644
--- a/htdocs/accountancy/class/html.formventilation.class.php
+++ b/htdocs/accountancy/class/html.formventilation.class.php
@@ -83,6 +83,8 @@ class FormVentilation extends Form
 
 		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
+		$out = '';
+		
     	$options = array();
 		if ($usecache && ! empty($this->options_cache[$usecache]))
 		{
@@ -109,7 +111,7 @@ class FormVentilation extends Form
     			return -1;
     		}
 
-    		$out = ajax_combobox($htmlname, $event);
+    		$out .= ajax_combobox($htmlname, $event);
 
     		$selected = 0;
     		while ($obj = $this->db->fetch_object($resql))

From c4f04338052a999453b1b2a68ee72f77422032bd Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 6 Jan 2017 14:47:57 +0100
Subject: [PATCH 0105/1163] fix date echance

---
 htdocs/fourn/facture/card.php | 52 ++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 8b7409f8bc5..40bc4289b4a 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -317,7 +317,15 @@ if (empty($reshook))
 	{
 	    $object->fetch($id);
 	    $object->date=dol_mktime(12,0,0,$_POST['datefmonth'],$_POST['datefday'],$_POST['datefyear']);
-	    if ($object->date_echeance && $object->date_echeance < $object->date) $object->date_echeance=$object->date;
+	    $date_echence_calc=$object->calculate_date_lim_reglement();
+	    if (!empty($object->date_echeance) &&  $object->date_echeance < $date_echence_calc)
+	    {
+	    	$object->date_echeance = $date_echence_calc;
+	    }
+	    if ($object->date_echeance && $object->date_echeance < $object->date)
+	    {
+	    	$object->date_echeance=$object->date;
+	    }
 	    $result=$object->update($user);
 	    if ($result < 0) dol_print_error($db,$object->error);
 	}
@@ -995,7 +1003,7 @@ if (empty($reshook))
 			}
 			$price_base_type = 'HT';
 			$pu_ht_devise = price2num($price_ht_devise, 'MU');
-			
+
 			$result=$object->addline($product_desc, $pu_ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $date_start, $date_end, 0, $tva_npr, $price_base_type, $type, -1, 0, $array_options, $fk_unit, 0, $pu_ht_devise);
 	    }
 
@@ -1494,7 +1502,7 @@ if ($action == 'create')
 	if ((empty($origin)) || ((($origin == 'propal') || ($origin == 'commande')) && (! empty($originid))))
 	{
 		// Deposit
-		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT)) 
+		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT))
 		{
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp='<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOST('type') == 3 ? ' checked' : '') . '> ';
@@ -1524,12 +1532,12 @@ if ($action == 'create')
 		}
 	}
     */
-	
+
 	/* Not yet supporter for supplier
 	if ($societe->id > 0)
 	{
 		// Replacement
-		if (empty($conf->global->INVOICE_DISABLE_REPLACEMENT)) 
+		if (empty($conf->global->INVOICE_DISABLE_REPLACEMENT))
 		{
 			print '<!-- replacement line -->';
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
@@ -1579,7 +1587,7 @@ if ($action == 'create')
     	    if ($societe->id > 0)
     		{
     		    // Credit note
-    			if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE)) 
+    			if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE))
     			{
     				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
     				$tmp='<input type="radio" id="radio_creditnote" name="type" value="2"' . (GETPOST('type') == 2 ? ' checked' : '');
@@ -1615,12 +1623,12 @@ if ($action == 'create')
     				$text .= '</select>';
     				$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc"), 1, 'help', '', 0, 3);
     				print $desc;
-    
+
     				print '<div id="credit_note_options" class="clearboth">';
     				print '&nbsp;&nbsp;&nbsp; <input data-role="none" type="checkbox" name="invoiceAvoirWithLines" id="invoiceAvoirWithLines" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true); $(\'#invoiceAvoirWithPaymentRestAmount\').removeAttr(\'checked\');   }" '.(GETPOST('invoiceAvoirWithLines','int')>0 ? 'checked':'').' /> <label for="invoiceAvoirWithLines">'.$langs->trans('invoiceAvoirWithLines')."</label>";
     				print '<br>&nbsp;&nbsp;&nbsp; <input data-role="none" type="checkbox" name="invoiceAvoirWithPaymentRestAmount" id="invoiceAvoirWithPaymentRestAmount" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true);  $(\'#invoiceAvoirWithLines\').removeAttr(\'checked\');   }" '.(GETPOST('invoiceAvoirWithPaymentRestAmount','int')>0 ? 'checked':'').' /> <label for="invoiceAvoirWithPaymentRestAmount">'.$langs->trans('invoiceAvoirWithPaymentRestAmount')."</label>";
     				print '</div>';
-    
+
     				print '</div></div>';
     			}
     		}
@@ -2008,7 +2016,7 @@ else
 
     	$object->totalpaye = $alreadypaid;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-    	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);	
+    	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
     	print '<div class="fichecenter">';
     	print '<div class="fichehalfleft">';
@@ -2152,7 +2160,7 @@ else
 				$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);
 			} else {
 				$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
-				if($object->statut == 0) {
+				if($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code != $conf->currency) {
 					print '<div class="inline-block"> &nbsp; &nbsp; &nbsp; &nbsp; ';
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=actualizemulticurrencyrate">'.$langs->trans("ActualizeCurrency").'</a>';
 					print '</div>';
@@ -2213,7 +2221,7 @@ else
             print '</tr>';
         }
 		*/
-		
+
 		// Incoterms
 		if (!empty($conf->incoterm->enabled))
 		{
@@ -2240,9 +2248,9 @@ else
     	// Other attributes
     	$cols = 2;
     	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-    
+
     	print '</table>';
-    	
+
     	print '</div>';
     	print '<div class="fichehalfright">';
     	print '<div class="ficheaddleft">';
@@ -2256,12 +2264,12 @@ else
     	    print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
     	    print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
     	    print '</tr>';
-    	
+
     	    // Multicurrency Amount VAT
     	    print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
     	    print '<td>' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
     	    print '</tr>';
-    	
+
     	    // Multicurrency Amount TTC
     	    print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
     	    print '<td>' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
@@ -2269,7 +2277,7 @@ else
     	}
 
     	// Amount
-    	print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).'</td></tr>';
+    	print '<tr><td class="titlefield">'.$langs->trans('AmountHT').'</td><td>'.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).'</td></tr>';
     	print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).'<div class="inline-block"> &nbsp; &nbsp; &nbsp; &nbsp; ';
     	if (GETPOST('calculationrule')) $calculationrule=GETPOST('calculationrule','alpha');
     	else $calculationrule=(empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)?'totalofround':'roundoftotal');
@@ -2299,7 +2307,7 @@ else
     	print '<tr><td>'.$langs->trans('AmountTTC').'</td><td colspan="3">'.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).'</td></tr>';
 
     	print '</table>';
- 
+
     	/*
     	 * List of payments
     	 */
@@ -2395,9 +2403,9 @@ else
     	    {
     	        print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans('AlreadyPaid').' :</td><td align="right">'.price($totalpaye).'</td><td></td></tr>';
     	        print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans("Billed").' :</td><td align="right">'.price($object->total_ttc).'</td><td></td></tr>';
-    	
+
     	        $resteapayer = $object->total_ttc - $totalpaye;
-    	
+
     	        print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans('RemainderToPay').' :</td>';
     	        print '<td align="right"'.($resteapayer?' class="amountremaintopay"':'').'>'.price($resteapayer).'</td><td></td></tr>';
     	    }
@@ -2506,7 +2514,7 @@ else
 			print ' :</td>';
 			print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':$cssforamountpaymentcomplete).'>' . price($resteapayeraffiche) . '</td>';
 			print '<td class="nowrap">&nbsp;</td></tr>';
-		} 
+		}
 		else // Credit note
 		{
 			// Total already paid back
@@ -2538,9 +2546,9 @@ else
         print '</div>';
         print '</div>';
         print '</div>';
-        
+
         print '<div class="clearboth"></div><br>';
-        
+
         if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
         {
         	$blocname = 'contacts';

From b813144edb102c4c9b13407836042eae220761dd Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Fri, 6 Jan 2017 16:44:09 +0100
Subject: [PATCH 0106/1163] NEW generation ODT

---
 htdocs/admin/user.php                         |  43 +++-
 .../core/class/commondocgenerator.class.php   |  16 ++
 htdocs/core/class/commonobject.class.php      |   1 +
 htdocs/core/class/html.formfile.class.php     |  29 ++-
 htdocs/core/lib/functions2.lib.php            |   1 -
 .../modules/product/modules_product.class.php |  37 ++++
 .../core/modules/user/modules_user.class.php  |  62 ++++++
 htdocs/product/admin/product.php              | 192 ++++++++++++++++++
 htdocs/product/card.php                       |  70 +++++++
 htdocs/product/class/product.class.php        |  35 ++++
 htdocs/user/card.php                          |  35 ++++
 11 files changed, 516 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/core/modules/user/modules_user.class.php

diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index f76762c8334..fcb062457a9 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -40,11 +40,48 @@ if (! $user->admin) accessforbidden();
 
 $extrafields = new ExtraFields($db);
 
+$type='user';
 
 /*
  * Action
  */
-if (preg_match('/set_(.*)/',$action,$reg))
+
+// Activate a model
+if ($action == 'set_default')
+{
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+	$res = true;
+}
+
+elseif ($action == 'del_default')
+{
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+        if ($conf->global->USER_ADDON_PDF_ODT == "$value") dolibarr_del_const($db, 'USER_ADDON_PDF_ODT',$conf->entity);
+	}
+	$res = true;
+}
+
+// Set default model
+elseif ($action == 'setdoc')
+{
+	if (dolibarr_set_const($db, "USER_ADDON_PDF_ODT",$value,'chaine',0,'',$conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->PRODUCT_ADDON_PDF_ODT = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+	$res = true;
+}
+elseif (preg_match('/set_(.*)/',$action,$reg))
 {
     $code=$reg[1];
     if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
@@ -58,7 +95,7 @@ if (preg_match('/set_(.*)/',$action,$reg))
     }
 }
 
-if (preg_match('/del_(.*)/',$action,$reg))
+elseif (preg_match('/del_(.*)/',$action,$reg))
 {
     $code=$reg[1];
     if (dolibarr_del_const($db, $code, $conf->entity) > 0)
@@ -72,7 +109,7 @@ if (preg_match('/del_(.*)/',$action,$reg))
     }
 }
 //Set hide closed customer into combox or select
-if ($action == 'sethideinactiveuser')
+elseif ($action == 'sethideinactiveuser')
 {
 	$status = GETPOST('status','alpha');
 
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 9b233ef6b74..51977bcb356 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -317,6 +317,22 @@ abstract class CommonDocGenerator
 
     	return $array_other;
     }
+	
+	
+
+	function get_substitutionarray_each_var_object(&$object,$outputlangs,$recursive=true) {
+		foreach($object as $key => $value) {
+			if(!is_array($value) && !is_object($value)) {
+	    	$array_other['object_'.$key] = $value;
+			}
+			if(is_array($value) && $recursive){
+				foreach($value as $key2 => $val) {
+					$array_other[$key][$key2] = $this->get_substitutionarray_each_var_object($val,$outputlangs,false);
+				}
+			}
+	    }
+		return $array_other;
+	}
 
 
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3279d372a0e..f8ab4f34467 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3589,6 +3589,7 @@ abstract class CommonObject
 			$modele=$tmp[0];
 			$srctemplatepath=$tmp[1];
 		}
+		
 
 		// Search template files
 		$file=''; $classname=''; $filefound=0;
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index a973c2622cc..ded716c1766 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -299,7 +299,7 @@ class FormFile
         $headershown=0;
         $showempty=0;
         $i=0;
-
+		
         $titletoshow=$langs->trans("Documents");
         if (! empty($title)) $titletoshow=$title;
 
@@ -402,6 +402,33 @@ class FormFile
                     $modellist=ModelePDFProjects::liste_modeles($this->db);
                 }
             }
+            elseif ($modulepart == 'product')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
+                    $modellist=ModelePDFProduct::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'user')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.php';
+                    $modellist=ModelePDFProduct::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'group')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_group.php';
+                    $modellist=ModelePDFProduct::liste_modeles($this->db);
+                }
+            }
             elseif ($modulepart == 'project_task')
             {
             	if (is_array($genallowed)) $modellist=$genallowed;
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 82449ac63cb..19279296ce9 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1444,7 +1444,6 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
 
                 $const=$obj->description;
                 $dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
-
                 $listoffiles=array();
 
                 // Now we add models found in directories scanned
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index e08ea074bbd..d7138af84a8 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -24,6 +24,43 @@
  *	    \class      ModeleProductCode
  *		\brief  	Parent class for product code generators
  */
+ 
+/**
+ *  \file       htdocs/core/modules/contract/modules_contract.php
+ *  \ingroup    contract
+ *  \brief      File with parent class for generating contracts to PDF and File of class to manage contract numbering
+ */
+
+ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+ 
+/**
+ *	Parent class to manage intervention document templates
+ */
+abstract class ModelePDFProduct extends CommonDocGenerator
+{
+	var $error='';
+
+
+	/**
+	 *	Return list of active generation modules
+	 *
+     *  @param	DoliDB	$db     			Database handler
+     *  @param  integer	$maxfilenamelength  Max length of value to show
+     *  @return	array						List of templates
+	 */
+	static function liste_modeles($db,$maxfilenamelength=0)
+	{
+		global $conf;
+
+		$type='product';
+		$liste=array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		return $liste;
+	}
+}
+
 abstract class ModeleProductCode
 {
     var $error='';
diff --git a/htdocs/core/modules/user/modules_user.class.php b/htdocs/core/modules/user/modules_user.class.php
new file mode 100644
index 00000000000..3e94ece9372
--- /dev/null
+++ b/htdocs/core/modules/user/modules_user.class.php
@@ -0,0 +1,62 @@
+<?php
+/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+
+/**
+ *	    \class      ModeleProductCode
+ *		\brief  	Parent class for product code generators
+ */
+ 
+/**
+ *  \file       htdocs/core/modules/contract/modules_contract.php
+ *  \ingroup    contract
+ *  \brief      File with parent class for generating contracts to PDF and File of class to manage contract numbering
+ */
+
+ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+ 
+/**
+ *	Parent class to manage intervention document templates
+ */
+abstract class ModelePDFUser extends CommonDocGenerator
+{
+	var $error='';
+
+
+	/**
+	 *	Return list of active generation modules
+	 *
+     *  @param	DoliDB	$db     			Database handler
+     *  @param  integer	$maxfilenamelength  Max length of value to show
+     *  @return	array						List of templates
+	 */
+	static function liste_modeles($db,$maxfilenamelength=0)
+	{
+		global $conf;
+
+		$type='user';
+		$liste=array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		return $liste;
+	}
+}
\ No newline at end of file
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 8a561c0e53e..10da8463058 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -43,6 +43,7 @@ if (! $user->admin || (empty($conf->product->enabled) && empty($conf->service->e
 
 $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');
+$type='product';
 
 // Pricing Rules
 $select_pricing_rules=array(
@@ -110,6 +111,42 @@ if ($action == 'setModuleOptions')
 	}
 }
 
+// Activate a model
+if ($action == 'set_default')
+{
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+	$res = true;
+}
+
+if ($action == 'del_default')
+{
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+        if ($conf->global->PRODUCT_ADDON_PDF_ODT == "$value") dolibarr_del_const($db, 'PRODUCT_ADDON_PDF_ODT',$conf->entity);
+	}
+	$res = true;
+}
+
+// Set default model
+if ($action == 'setdoc')
+{
+	if (dolibarr_set_const($db, "PRODUCT_ADDON_PDF_ODT",$value,'chaine',0,'',$conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->PRODUCT_ADDON_PDF_ODT = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+	$res = true;
+}
+
 if ($action == 'other' && GETPOST('value_PRODUIT_LIMIT_SIZE') >= 0)
 {
 	$res = dolibarr_set_const($db, "PRODUIT_LIMIT_SIZE", GETPOST('value_PRODUIT_LIMIT_SIZE'),'chaine',0,'',$conf->entity);
@@ -228,6 +265,8 @@ else if (empty($conf->service->enabled))
 
 llxHeader('',$title);
 
+$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($title,$linkback,'title_setup');
 
@@ -317,6 +356,159 @@ foreach ($dirproduct as $dirroot)
 }
 print '</table>';
 
+
+// Defini tableau def des modeles
+$def = array();
+$sql = "SELECT nom";
+$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql.= " WHERE type = '".$type."'";
+$sql.= " AND entity = ".$conf->entity;
+$resql=$db->query($sql);
+if ($resql)
+{
+	$i = 0;
+	$num_rows=$db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
+}
+else
+{
+	dol_print_error($db);
+}
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
+print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
+print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+$var=true;
+foreach ($dirmodels as $reldir)
+{
+    foreach (array('','/doc') as $valdir)
+    {
+    	$dir = dol_buildpath($reldir."core/modules/product".$valdir);
+        if (is_dir($dir))
+        {
+            $handle=opendir($dir);
+            if (is_resource($handle))
+            {
+                while (($file = readdir($handle))!==false)
+                {
+                    $filelist[]=$file;
+                }
+                closedir($handle);
+                arsort($filelist);
+
+                foreach($filelist as $file)
+                {
+                    if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
+                    {
+
+                    	if (file_exists($dir.'/'.$file))
+                    	{
+                    		$name = substr($file, 4, dol_strlen($file) -16);
+	                        $classname = substr($file, 0, dol_strlen($file) -12);
+
+	                        require_once $dir.'/'.$file;
+	                        $module = new $classname($db);
+
+	                        $modulequalified=1;
+	                        if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+
+	                        if ($modulequalified)
+	                        {
+	                            $var = !$var;
+	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print (empty($module->name)?$name:$module->name);
+	                            print "</td><td>\n";
+	                            if (method_exists($module,'info')) print $module->info($langs);
+	                            else print $module->description;
+	                            print '</td>';
+
+	                            // Active
+	                            if (in_array($name, $def))
+	                            {
+	                            	print '<td align="center">'."\n";
+	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&value='.$name.'">';
+	                            	print img_picto($langs->trans("Enabled"),'switch_on');
+	                            	print '</a>';
+	                            	print '</td>';
+	                            }
+	                            else
+	                            {
+	                                print '<td align="center">'."\n";
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+	                                print "</td>";
+	                            }
+
+	                            // Defaut
+	                            print '<td align="center">';
+	                            if ($conf->global->PRODUCT_ADDON_PDF == $name)
+	                            {
+	                                print img_picto($langs->trans("Default"),'on');
+	                            }
+	                            else
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+	                            }
+	                            print '</td>';
+
+	                           // Info
+		    					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+					    		$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+			                    if ($module->type == 'pdf')
+			                    {
+			                        $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+			                    }
+					    		$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					    		$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
+
+
+	                            print '<td align="center">';
+	                            print $form->textwithpicto('',$htmltooltip,1,0);
+	                            print '</td>';
+
+	                            // Preview
+	                            print '<td align="center">';
+	                            if ($module->type == 'pdf')
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'contract').'</a>';
+	                            }
+	                            else
+	                            {
+	                                print img_object($langs->trans("PreviewNotAvailable"),'generic');
+	                            }
+	                            print '</td>';
+
+	                            print "</tr>\n";
+	                        }
+                    	}
+                    }
+                }
+            }
+        }
+    }
+}
+
+print '</table>';
+print "<br>";
+
 /*
  * Other conf
  */
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 59ccdb79a1f..7a0ebca0ace 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -38,6 +38,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
@@ -517,6 +518,40 @@ if (empty($reshook))
             $action='';
         }
     }
+	if ($action == 'builddoc' && $user->rights->produit->creer) {
+		/*if (GETPOST('model')) {
+			$object->setDocModel($user, GETPOST('model'));
+		}*/
+	
+		// Define output language
+		$outputlangs = $langs;
+		if (! empty($conf->global->MAIN_MULTILANGS)) {
+			$outputlangs = new Translate("", $conf);
+			$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
+			$outputlangs->setDefaultLang($newlang);
+		}
+		$ret = $object->fetch($id); // Reload to get new records
+		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		if ($result <= 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+	        $action='';
+		}
+	}
+	
+	// Remove file in doc form
+	if ($action == 'remove_file' && $user->rights->contrat->creer) {
+		if ($object->id > 0) {
+			require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+	
+			$langs->load("other");
+			$upload_dir = $conf->contrat->dir_output;
+			$file = $upload_dir . '/' . GETPOST('file');
+			$ret = dol_delete_file($file, 0, 0, 0, $object);
+			if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+			else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+		}
+	}
 
 
     // Add product into object
@@ -770,6 +805,7 @@ else $title = $langs->trans('ProductServiceCard');
 llxHeader('', $title, $helpurl);
 
 $form = new Form($db);
+$formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
 
 
@@ -1829,5 +1865,39 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status)
 }
 
 
+print '<div class="fichecenter"><div class="fichehalfleft">';
+
+/*
+ * Documents generes
+*/
+$filename = dol_sanitizeFileName($object->ref);
+$filedir = $conf->produit->dir_output . "/" . dol_sanitizeFileName($object->ref);
+$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+$genallowed = $user->rights->produit->creer;
+$delallowed = $user->rights->produit->supprimer;
+
+$var = true;
+
+$somethingshown = $formfile->show_documents('product', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+
+// Linked object block
+$somethingshown = $form->showLinkedObjectBlock($object);
+
+// Show links to link elements
+$linktoelem = $form->showLinkToObjectBlock($object);
+if ($linktoelem) print '<br>'.$linktoelem;
+
+
+print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+// List of actions on element
+include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+$formactions = new FormActions($db);
+$somethingshown = $formactions->showactions($object, 'product', $socid);
+
+
+print '</div></div></div>';
+
+
 llxFooter();
 $db->close();
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 1d8d17d6c8f..2c4eb128413 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3191,6 +3191,41 @@ class Product extends CommonObject
 		return $result;
 	}
 
+
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 * 	@param	    string		$modele			Force model to use ('' to not force)
+	 * 	@param		Translate	$outputlangs	Object langs to use for output
+	 *  @param      int			$hidedetails    Hide details of lines
+	 *  @param      int			$hidedesc       Hide description
+	 *  @param      int			$hideref        Hide ref
+	 * 	@return     int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	{
+		global $conf,$user,$langs;
+
+		$langs->load("products");
+
+		// Positionne le modele sur le nom du modele a utiliser
+		if (! dol_strlen($modele))
+		{
+			if (! empty($conf->global->PRODUCT_ADDON_PDF))
+			{
+				$modele = $conf->global->PRODUCT_ADDON_PDF;
+			}
+			else
+			{
+				$modele = 'strato';
+			}
+		}
+
+		$modelpath = "core/modules/product/doc/";
+
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
+
 	/**
 	 *	Return label of status of object
 	 *
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index b0425b182e0..ce6ef3f992f 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -35,6 +35,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -589,6 +590,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 $formother=new FormOther($db);
 $formcompany = new FormCompany($db);
+$formfile = new FormFile($db);
 
 llxHeader('',$langs->trans("UserCard"));
 
@@ -2275,8 +2277,41 @@ else
             print '</form>';
         }
 
+        print '<div class="fichecenter"><div class="fichehalfleft">';
+        /*
+         * Documents generes
+        */
+        $filename = dol_sanitizeFileName($object->ref);
+        $filedir = $conf->user->dir_output . "/" . dol_sanitizeFileName($object->ref);
+        $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+        $genallowed = $user->rights->user->creer;
+        $delallowed = $user->rights->user->supprimer;
+
+        $var = true;
+
+        $somethingshown = $formfile->show_documents('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+
+		// Linked object block
+		$somethingshown = $form->showLinkedObjectBlock($object);
+
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object);
+		if ($linktoelem) print '<br>'.$linktoelem;
+
+
+        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, 'user', $socid);
+        
+        
+        print '</div></div></div>';
+
 		if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close;
     }
+    
 }
 
 if (! empty($conf->api->enabled) && ! empty($conf->use_javascript_ajax))

From 4c4aeba855ee7c22f5e43d4700104d9eb8ba7b5a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2017 17:54:47 +0100
Subject: [PATCH 0107/1163] Fix project on loans

---
 htdocs/core/class/html.formprojet.class.php | 5 ++++-
 htdocs/langs/en_US/loan.lang                | 1 +
 htdocs/loan/class/loan.class.php            | 6 +++---
 htdocs/loan/index.php                       | 2 +-
 htdocs/loan/payment/card.php                | 2 +-
 htdocs/projet/element.php                   | 8 ++++----
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index e98d0018e7a..20eb2dd35cb 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -458,13 +458,16 @@ class FormProjets
 		if ($table_element == 'projet_task') return '';		// Special cas of element we never link to a project (already always done)
 
 		$linkedtothirdparty=false;
-		if (! in_array($table_element, array('don','expensereport_det','expensereport'))) $linkedtothirdparty=true;
+		if (! in_array($table_element, array('don','expensereport_det','expensereport','loan'))) $linkedtothirdparty=true;
 
 		$sqlfilter='';
 		$projectkey="fk_projet";
 		//print $table_element;
 		switch ($table_element)
 		{
+			case "loan":
+				$sql = "SELECT t.rowid, t.label as ref";
+				break;
 			case "facture":
 				$sql = "SELECT t.rowid, t.facnumber as ref";
 				break;
diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang
index de0a6fd0295..b45a70dff72 100644
--- a/htdocs/langs/en_US/loan.lang
+++ b/htdocs/langs/en_US/loan.lang
@@ -43,6 +43,7 @@ LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly p
 GoToInterest=%s will go towards INTEREST
 GoToPrincipal=%s will go towards PRINCIPAL
 YouWillSpend=You will spend %s in year %s
+ListLoanAssociatedProject=List of loan associated with the project
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 0ed39ead170..bb51cf3b8f1 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -24,8 +24,8 @@
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
-/**     \class      Loan
- *		\brief      Class to manage loan
+/**
+ *      Loan
  */
 class Loan extends CommonObject
 {
@@ -404,7 +404,7 @@ class Loan extends CommonObject
      * 	@param	int		$maxlen			Label max length
      *	@return	string					Chaine with URL
      */
-    function getLinkUrl($withpicto=0,$maxlen=0)
+    function getNomUrl($withpicto=0,$maxlen=0)
     {
         global $langs;
 
diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index a03abce6350..289bd8dbee4 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -157,7 +157,7 @@ if ($resql)
 		print "<tr ".$bc[$var].">";
 
 		// Ref
-		print '<td>'.$loan_static->getLinkUrl(1, 42).'</td>';
+		print '<td>'.$loan_static->getNomUrl(1, 42).'</td>';
 
 		// Label
 		print '<td>'.dol_trunc($obj->label,42).'</td>';
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index c76b0565a3f..4a5faf4665f 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -231,7 +231,7 @@ if ($resql)
 			// Ref
 			print '<td>';
 			$loan->fetch($objp->id);
-			print $loan->getLinkUrl(1);
+			print $loan->getNomUrl(1);
 			print "</td>\n";
 			// Label
 			print '<td>'.$objp->label.'</td>';
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 74cb6afec8c..77a6464e563 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -47,7 +47,7 @@ if (! empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compt
 if (! empty($conf->expensereport->enabled)) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 if (! empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 if (! empty($conf->don->enabled))         require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-if (! empty($conf->loan->enabled))         require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+if (! empty($conf->loan->enabled))        require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 
 $langs->load("projects");
 $langs->load("companies");
@@ -377,14 +377,14 @@ $listofreferent=array(
 	'title'=>"ListLoanAssociatedProject",
 	'class'=>'Loan',
 	'margin'=>'add',
-	'table'=>'Loan',
+	'table'=>'loan',
 	'datefieldname'=>'datestart',
 	'disableamount'=>0,
     'urlnew'=>DOL_URL_ROOT.'/loan/card.php?action=create&projectid='.$id.'&socid='.$socid,
     'lang'=>'loan',
     'buttonnew'=>'AddLoan',
-    'testnew'=>$user->rights->loan->creer,
-    'test'=>$conf->loan->enabled && $user->rights->loan->lire),
+    'testnew'=>$user->rights->loan->write,
+    'test'=>$conf->loan->enabled && $user->rights->loan->read),
 'project_task'=>array(
 	'name'=>"TaskTimeValorised",
 	'title'=>"ListTaskTimeUserProject",

From 51b9802de40318908a310c5e06054475aa7925b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2017 20:42:35 +0100
Subject: [PATCH 0108/1163] NEW Hook to allow inserting custom product head
 #6001

---
 htdocs/core/class/commonobject.class.php | 154 ++++++++++++-----------
 1 file changed, 80 insertions(+), 74 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 98bf53743ba..89795e7df5d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3299,84 +3299,90 @@ abstract class CommonObject
 		$usemargins=0;
 		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) $usemargins=1;
 
-		print '<tr class="liste_titre nodrag nodrop">';
-
-		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
-
-		// Description
-		print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
-
-		if ($this->element == 'supplier_proposal')
-		{
-			print '<td class="linerefsupplier" align="right"><span id="title_fourn_ref">'.$langs->trans("SupplierProposalRefFourn").'</span></td>';
-		}
-
-		// VAT
-		print '<td class="linecolvat" align="right" width="80">'.$langs->trans('VAT').'</td>';
-
-		// Price HT
-		print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
-
-		// Multicurrency
-		if (!empty($conf->multicurrency->enabled)) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
-
-		if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
-
-		// Qty
-		print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';
-
-		if($conf->global->PRODUCT_USE_UNITS)
-		{
-			print '<td class="linecoluseunit" align="left">'.$langs->trans('Unit').'</td>';
-		}
-
-		// Reduction short
-		print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';
-
-		if ($this->situation_cycle_ref) {
-			print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';
-		}
-
-		if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
-		{
-			if (!empty($user->rights->margins->creer))
-			{
-				if ($conf->global->MARGIN_TYPE == "1")
-					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
-				else
-					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';	
-			}
-			
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
-				print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
-				print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';
-		}
-
-		// Total HT
-		print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';
-
-		// Multicurrency
-		if (!empty($conf->multicurrency->enabled)) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
-
-        if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
-
-		print '<td class="linecoledit"></td>';  // No width to allow autodim
-
-		print '<td class="linecoldelete" width="10"></td>';
-
-		print '<td class="linecolmove" width="10"></td>';
-
-		print "</tr>\n";
-
 		$num = count($this->lines);
-		$var = true;
-		$i	 = 0;
-
+		
 		//Line extrafield
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafieldsline = new ExtraFields($this->db);
 		$extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);
+		
+		$parameters = array('num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
+		$reshook = $hookmanager->executeHooks('printObjectLineTitle', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if (empty($reshook))
+		{
+    		print '<tr class="liste_titre nodrag nodrop">';
+    
+    		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
+    
+    		// Description
+    		print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
+    
+    		if ($this->element == 'supplier_proposal')
+    		{
+    			print '<td class="linerefsupplier" align="right"><span id="title_fourn_ref">'.$langs->trans("SupplierProposalRefFourn").'</span></td>';
+    		}
+    
+    		// VAT
+    		print '<td class="linecolvat" align="right" width="80">'.$langs->trans('VAT').'</td>';
+    
+    		// Price HT
+    		print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
+    
+    		// Multicurrency
+    		if (!empty($conf->multicurrency->enabled)) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
+    
+    		if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
+    
+    		// Qty
+    		print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';
+    
+    		if($conf->global->PRODUCT_USE_UNITS)
+    		{
+    			print '<td class="linecoluseunit" align="left">'.$langs->trans('Unit').'</td>';
+    		}
+    
+    		// Reduction short
+    		print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';
+    
+    		if ($this->situation_cycle_ref) {
+    			print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';
+    		}
+    
+    		if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
+    		{
+    			if (!empty($user->rights->margins->creer))
+    			{
+    				if ($conf->global->MARGIN_TYPE == "1")
+    					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
+    				else
+    					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';	
+    			}
+    			
+    			if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
+    				print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
+    			if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
+    				print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';
+    		}
+    
+    		// Total HT
+    		print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';
+    
+    		// Multicurrency
+    		if (!empty($conf->multicurrency->enabled)) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
+    
+            if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
+    
+    		print '<td class="linecoledit"></td>';  // No width to allow autodim
+    
+    		print '<td class="linecoldelete" width="10"></td>';
+    
+    		print '<td class="linecolmove" width="10"></td>';
+    
+    		print "</tr>\n";
+		}
+		
+		$var = true;
+		$i	 = 0;
 
 		foreach ($this->lines as $line)
 		{
@@ -3395,7 +3401,7 @@ abstract class CommonObject
 				}
 				else
 				{
-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
+					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);
                     $reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
 				}
 			}

From 1b3af1df0798ff22fb446279de062266707a40f2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2017 21:03:45 +0100
Subject: [PATCH 0109/1163] More space between text

---
 htdocs/theme/eldy/style.css.php | 2 ++
 htdocs/theme/md/style.css.php   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index d72d303aa32..a9f2b808de9 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -241,6 +241,7 @@ body {
 <?php } ?>
 	color: rgb(<?php echo $colortext; ?>);
 	font-size: <?php print $fontsize ?>px;
+	line-height: 130%;
 	font-family: <?php print $fontlist ?>;
     margin-top: 0;
     margin-bottom: 0;
@@ -594,6 +595,7 @@ div.myavailability {
 .div-table-responsive {
     overflow-x: auto;
     min-height: 0.01%;
+    line-height: 100%;
 }
 /* Style used for full page tables with field selector and no content after table (priority before previous for such tables) */ 
 div.fiche>form>div.div-table-responsive {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 409a902648e..eb46cb40b84 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -242,6 +242,7 @@ body {
 	color: rgb(<?php echo $colortext; ?>);
 	font-size: <?php print $fontsize ?>px;
 	font-family: <?php print $fontlist ?>;
+	line-height: 130%;
     margin-top: 0;
     margin-bottom: 0;
     margin-right: 0;
@@ -599,6 +600,7 @@ div.myavailability {
 .div-table-responsive {
     overflow-x: auto;
     min-height: 0.01%;
+    line-height: 100%;
 }
 /* Style used for full page tables with field selector and no content after table (priority before previous for such tables) */ 
 div.fiche>form>div.div-table-responsive {

From df9121d6fa3097987c56039188967a90192be07f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2017 21:33:13 +0100
Subject: [PATCH 0110/1163] FIX Accept spaces around the | criteria

---
 htdocs/core/lib/functions.lib.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ce043d7f16b..5ccf4f08d35 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5737,7 +5737,9 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
             else    // $mode=0
 			{
 				$textcrit = '';
-				$tmpcrits = explode('|',$crit);
+				$tmpcrit = preg_replace('/\s+|/','|',$tmpcrit);
+				$tmpcrit = preg_replace('/|\s+/','|',$tmpcrit);
+				$tmpcrits = explode('|',$tmpcrit);
 				$i3 = 0;
 				foreach($tmpcrits as $tmpcrit)
 				{

From 5446ff667af08dacb1f9153c23d949d82cf73c1a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2017 21:33:23 +0100
Subject: [PATCH 0111/1163] Fix translation

---
 htdocs/langs/en_US/main.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 185e1e49424..edd72899f3d 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -788,8 +788,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more characters<br /><br /><strong>SEARCH PARAMETERS:</strong><br /><i>[without spaces]</i><br /><br /><kbd><strong> |</strong></kbd>      <kbd> OR</kbd><br /><kbd><strong>*</strong></kbd>   <kbd>SEARCH ALL</kbd><br />
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>SEARCH OPERANDS:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd><br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd><br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd><br /><kbd><strong>$</strong></kbd><kbd> End with</kbd><br />
+Select2MoreCharacters=or more characters<br /><br /><strong>SEARCH OPERANDS:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd><br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd><br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd><br /><kbd><strong>$</strong></kbd><kbd> End with</kbd><br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties

From 163ee094ec2c082970e8f1aa199be1cba6b2d685 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Jan 2017 21:46:26 +0100
Subject: [PATCH 0112/1163] Revert "FIX Accept spaces around the | criteria"

This reverts commit df9121d6fa3097987c56039188967a90192be07f.
---
 htdocs/core/lib/functions.lib.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5ccf4f08d35..ce043d7f16b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5737,9 +5737,7 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
             else    // $mode=0
 			{
 				$textcrit = '';
-				$tmpcrit = preg_replace('/\s+|/','|',$tmpcrit);
-				$tmpcrit = preg_replace('/|\s+/','|',$tmpcrit);
-				$tmpcrits = explode('|',$tmpcrit);
+				$tmpcrits = explode('|',$crit);
 				$i3 = 0;
 				foreach($tmpcrits as $tmpcrit)
 				{

From 785b2d46b316f7e89a4233bce13a930deff3eee9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Jan 2017 01:00:47 +0100
Subject: [PATCH 0113/1163] FIX Accept spaces around the | criteria

---
 htdocs/core/lib/functions.lib.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ce043d7f16b..3cb4cc31093 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5677,7 +5677,7 @@ function dol_getmypid()
  *                             			If param $mode is 1, can contains an operator <, > or = like "<10" or ">=100.5 < 1000"
  *                             			If param $mode is 2, can contains a list of id separated by comma like "1,3,4"
  * @param	integer			$mode		0=value is list of keywords, 1=value is a numeric test (Example ">5.5 <10"), 2=value is a list of id separated with comma (Example '1,3,4')
- * @param	integer			$nofirstand	1=Do now output the first 'AND'
+ * @param	integer			$nofirstand	1=Do not output the first 'AND'
  * @return 	string 			$res 		The statement to append to the SQL query
  */
 function natural_search($fields, $value, $mode=0, $nofirstand=0)
@@ -5692,6 +5692,9 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
     {
     	$value=preg_replace('/([<>=]+)\s+([0-9'.preg_quote($langs->trans("DecimalSeparator"),'/').'\-])/','\1\2',$value);	// Clean string '< 10' into '<10' so we can the explode on space to get all tests to do
     }
+    
+    $value = preg_replace('/\s*\|\s*/','|', $value);
+    
     $crits = explode(' ', $value);
     $res = '';
     if (! is_array($fields)) $fields = array($fields);

From 8e615a83e5fe9f5ce594b89b61542a272c04a3c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Jan 2017 01:07:28 +0100
Subject: [PATCH 0114/1163] Better tooltip

---
 htdocs/langs/en_US/main.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index edd72899f3d..a4f396a43b8 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -788,8 +788,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more characters<br /><br /><strong>SEARCH OPERANDS:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd><br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd><br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd><br /><kbd><strong>$</strong></kbd><kbd> End with</kbd><br />
-Select2MoreCharacters=or more characters<br /><br /><strong>SEARCH OPERANDS:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd><br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd><br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd><br /><kbd><strong>$</strong></kbd><kbd> End with</kbd><br />
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties

From 3e77fed81515687943fea503cc3fb6a659a84b4d Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Sun, 8 Jan 2017 01:59:04 -0300
Subject: [PATCH 0115/1163] Fix missing ,

---
 htdocs/install/mysql/tables/llx_loan.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql
index 0fe0c677ecb..f55b793e5ec 100644
--- a/htdocs/install/mysql/tables/llx_loan.sql
+++ b/htdocs/install/mysql/tables/llx_loan.sql
@@ -48,6 +48,6 @@ create table llx_loan
   fk_projet						integer DEFAULT NULL,
   
   fk_user_author				integer DEFAULT NULL,
-  fk_user_modif					integer DEFAULT NULL
+  fk_user_modif					integer DEFAULT NULL, 
   active						tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;

From 2248429eda27289e0bdea5768132aa40d3e37e73 Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@gmail.com>
Date: Sun, 8 Jan 2017 04:57:47 -0300
Subject: [PATCH 0116/1163] Improve cashdesk code style. Ticket now have
 ticket.css file

---
 htdocs/cashdesk/css/ticket.css     |  61 ++++++++++++
 htdocs/cashdesk/tpl/ticket.tpl.php | 146 ++++++++++-------------------
 2 files changed, 111 insertions(+), 96 deletions(-)
 create mode 100644 htdocs/cashdesk/css/ticket.css

diff --git a/htdocs/cashdesk/css/ticket.css b/htdocs/cashdesk/css/ticket.css
new file mode 100644
index 00000000000..248e0f7b9b6
--- /dev/null
+++ b/htdocs/cashdesk/css/ticket.css
@@ -0,0 +1,61 @@
+/*
+ * TPV ticket.css
+ */
+body {
+    font-size: 1.5em;
+    position: relative;
+}
+
+.entete { /* 		position: relative; */
+
+}
+
+.address { /* 			float: left; */
+    font-size: 12px;
+}
+
+.date_heure {
+    position: absolute;
+    top: 0;
+    right: 0;
+    font-size: 16px;
+}
+
+.infos {
+    position: relative;
+}
+
+.liste_articles {
+    width: 100%;
+    border-bottom: 1px solid #000;
+    text-align: center;
+}
+
+.liste_articles tr.titres th {
+    border-bottom: 1px solid #000;
+}
+
+.liste_articles td.total {
+    text-align: right;
+}
+
+.totaux {
+    margin-top: 20px;
+    width: 30%;
+    float: right;
+    text-align: right;
+}
+
+.lien {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: none;
+}
+
+@media print {
+    .lien {
+            display: none;
+    }
+}
+
diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php
index 9ea8cb70943..78ce86f45f7 100644
--- a/htdocs/cashdesk/tpl/ticket.tpl.php
+++ b/htdocs/cashdesk/tpl/ticket.tpl.php
@@ -28,130 +28,84 @@ $object->fetch($facid);
 
 ?>
 <html>
-<head>
-<title><?php echo $langs->trans('PrintTicket') ?></title>
-
-<style type="text/css">
-body {
-	font-size: 1.5em;
-	position: relative;
-}
-
-.entete { /* 		position: relative; */
-
-}
-
-.address { /* 			float: left; */
-	font-size: 12px;
-}
-
-.date_heure {
-	position: absolute;
-	top: 0;
-	right: 0;
-	font-size: 16px;
-}
-
-.infos {
-	position: relative;
-}
-
-.liste_articles {
-	width: 100%;
-	border-bottom: 1px solid #000;
-	text-align: center;
-}
-
-.liste_articles tr.titres th {
-	border-bottom: 1px solid #000;
-}
-
-.liste_articles td.total {
-	text-align: right;
-}
-
-.totaux {
-	margin-top: 20px;
-	width: 30%;
-	float: right;
-	text-align: right;
-}
-
-.lien {
-	position: absolute;
-	top: 0;
-	left: 0;
-	display: none;
-}
-
-@media print {
-	.lien {
-		display: none;
-	}
-}
-</style>
-
+    <head>
+    <title><?php echo $langs->trans('PrintTicket') ?></title>
+    <link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT;?>/cashdesk/css/ticket.css">
 </head>
 
 <body>
 
 <div class="entete">
-<div class="logo"><?php print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small).'">'; ?>
-</div>
-<div class="infos">
-<p class="address"><?php echo $mysoc->name; ?><br>
-<?php print dol_nl2br(dol_format_address($mysoc)); ?><br>
-</p>
+    <div class="logo">
+        <?php print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small).'">'; ?>
+    </div>
+    <div class="infos">
+        <p class="address"><?php echo $mysoc->name; ?><br>
+        <?php print dol_nl2br(dol_format_address($mysoc)); ?><br>
+        </p>
 
-<p class="date_heure"><?php
-// Recuperation et affichage de la date et de l'heure
-$now = dol_now();
-print dol_print_date($now,'dayhourtext').'<br>';
-print $object->ref;
-?></p>
-</div>
+        <p class="date_heure"><?php
+        // Recuperation et affichage de la date et de l'heure
+        $now = dol_now();
+        print dol_print_date($now,'dayhourtext').'<br>';
+        print $object->ref;
+        ?></p>
+    </div>
 </div>
 
 <br>
 
 <table class="liste_articles">
+    <thead>
 	<tr class="titres">
-		<th><?php print $langs->trans("Code"); ?></th>
-		<th><?php print $langs->trans("Label"); ?></th>
-		<th><?php print $langs->trans("Qty"); ?></th>
-		<th><?php print $langs->trans("Discount").' (%)'; ?></th>
-		<th><?php print $langs->trans("TotalHT"); ?></th>
+            <th><?php print $langs->trans("Code"); ?></th>
+            <th><?php print $langs->trans("Label"); ?></th>
+            <th><?php print $langs->trans("Qty"); ?></th>
+            <th><?php print $langs->trans("Discount").' (%)'; ?></th>
+            <th><?php print $langs->trans("TotalHT"); ?></th>
 	</tr>
+    </thead>
+    <tbody>
+    <?php
 
-	<?php
-
-	$tab=array();
+    $tab=array();
     $tab = $_SESSION['poscart'];
 
     $tab_size=count($tab);
     for($i=0;$i < $tab_size;$i++)
     {
         $remise = $tab[$i]['remise'];
-        echo ('<tr><td>'.$tab[$i]['ref'].'</td><td>'.$tab[$i]['label'].'</td><td>'.$tab[$i]['qte'].'</td><td>'.$tab[$i]['remise_percent'].'</td><td class="total">'.price(price2num($tab[$i]['total_ht'],'MT'),0,$langs,0,0,-1,$conf->currency).'</td></tr>'."\n");
+    ?>
+    <tr>
+        <td><?php echo $tab[$i]['ref'];?></td>
+        <td><?php echo $tab[$i]['label'];?></td>
+        <td><?php echo $tab[$i]['qte'];?></td>
+        <td><?php echo $tab[$i]['remise_percent'];?></td>
+        <td class="total"><?php echo price(price2num($tab[$i]['total_ht'],'MT'),0,$langs,0,0,-1,$conf->currency);?></td>
+    </tr>
+    <?php
     }
-
-	?>
+    ?>
+    </tbody>
 </table>
 
 <table class="totaux">
-<?php
-echo '<tr><th class="nowrap">'.$langs->trans("TotalHT").'</th><td class="nowrap">'.price(price2num($obj_facturation->prixTotalHt(),'MT'),'',$langs,0,-1,-1,$conf->currency)."</td></tr>\n";
-echo '<tr><th class="nowrap">'.$langs->trans("TotalVAT").'</th><td class="nowrap">'.price(price2num($obj_facturation->montantTva(),'MT'),'',$langs,0,-1,-1,$conf->currency)."</td></tr>\n";
-echo '<tr><th class="nowrap">'.$langs->trans("TotalTTC").'</th><td class="nowrap">'.price(price2num($obj_facturation->prixTotalTtc(),'MT'),'',$langs,0,-1,-1,$conf->currency)."</td></tr>\n";
-?>
+<tr>
+    <th class="nowrap"><?php echo $langs->trans("TotalHT");?></th>
+    <td class="nowrap"><?php echo price(price2num($obj_facturation->prixTotalHt(),'MT'),'',$langs,0,-1,-1,$conf->currency)."\n";?></td>
+</tr>
+<tr>
+    <th class="nowrap"><?php echo $langs->trans("TotalVAT").'</th><td class="nowrap">'.price(price2num($obj_facturation->montantTva(),'MT'),'',$langs,0,-1,-1,$conf->currency)."\n";?></td>
+</tr>
+<tr>
+    <th class="nowrap"><?php echo ''.$langs->trans("TotalTTC").'</th><td class="nowrap">'.price(price2num($obj_facturation->prixTotalTtc(),'MT'),'',$langs,0,-1,-1,$conf->currency)."\n";?></td>
+</tr>
 </table>
 
 <script type="text/javascript">
-	window.print();
+    window.print();
 </script>
 
-<a class="lien" href="#"
-	onclick="javascript: window.close(); return(false);"><?php echo $langs->trans("Close"); ?></a>
-
+<a class="lien" href="#" onclick="javascript: window.close(); return(false);"><?php echo $langs->trans("Close"); ?></a>
 </body>
 </html>

From fd008f88b100bcfc6918d3ec2e23969e783503b8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Jan 2017 10:21:59 +0100
Subject: [PATCH 0117/1163] Add github tools

---
 dev/tools/github_authors_peryear.sh    |  8 ++++++++
 dev/tools/github_commits_perversion.sh | 15 +++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100755 dev/tools/github_authors_peryear.sh
 create mode 100755 dev/tools/github_commits_perversion.sh

diff --git a/dev/tools/github_authors_peryear.sh b/dev/tools/github_authors_peryear.sh
new file mode 100755
index 00000000000..99b28d4d417
--- /dev/null
+++ b/dev/tools/github_authors_peryear.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+FROM=2016-01-01
+TO=2016-12-31
+
+echo "git log --since $FROM --before $TO | grep ^Author | sort -u -f -i -b | wc -l"
+git log --since $FROM --before $TO | grep ^Author | sort -u -f -i -b | wc -l
+
diff --git a/dev/tools/github_commits_perversion.sh b/dev/tools/github_commits_perversion.sh
new file mode 100755
index 00000000000..40ddafee617
--- /dev/null
+++ b/dev/tools/github_commits_perversion.sh
@@ -0,0 +1,15 @@
+#/bin/bash
+Releases=("3.8" "3.9" "4.0" "5.0", "develop")
+Dates=("2010-01-01", "2011-01-01", "2012-01-01", "2013-01-01", "2014-01-01", "2015-01-01", "2016-07-01")
+let "counter = 1"
+
+for i in "${Releases[@]}"
+do
+  git shortlog -s -n  --after=${Dates[counter-1]} --before=${Dates[counter]}
+  echo -n "Total $i: " 
+  git log --pretty=oneline --after=${Dates[counter-1]} --before=${Dates[counter]} | wc -l
+  echo "=======================" 
+  echo
+  let "counter +=1"
+done
+

From 65b956b011b3f29e8d920fc90f8d043327fbbcdf Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Mon, 9 Jan 2017 10:33:33 +0100
Subject: [PATCH 0118/1163] NEW sql for inventory

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   | 37 +++++++++++++++++++
 .../mysql/tables/llx_inventory.key.sql        | 21 +++++++++++
 htdocs/install/mysql/tables/llx_inventory.sql | 31 ++++++++++++++++
 .../mysql/tables/llx_inventorydet.key.sql     | 22 +++++++++++
 .../install/mysql/tables/llx_inventorydet.sql | 36 ++++++++++++++++++
 5 files changed, 147 insertions(+)
 create mode 100644 htdocs/install/mysql/tables/llx_inventory.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_inventory.sql
 create mode 100644 htdocs/install/mysql/tables/llx_inventorydet.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_inventorydet.sql

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index e770a99de66..40707aaddfe 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -46,3 +46,40 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 
 ALTER TABLE llx_loan ADD COLUMN fk_projet integer DEFAULT NULL;
 
+-- NEW inventory module
+CREATE TABLE llx_inventory 
+( 
+rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+datec DATETIME DEFAULT NULL, 
+tms timestamp, 
+fk_warehouse integer DEFAULT 0, 
+entity integer DEFAULT 0, 
+status integer DEFAULT 0, 
+title varchar(255) NOT NULL, 
+date_inventory datetime DATETIME DEFAULT NULL
+) 
+ENGINE=InnoDB;
+
+CREATE TABLE llx_inventorydet 
+( 
+rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+datec DATETIME DEFAULT NULL, 
+tms timestamp, 
+fk_inventory integer DEFAULT 0, 
+fk_warehouse integer DEFAULT 0,
+fk_product integer DEFAULT 0,  
+entity integer DEFAULT 0, 
+qty_view double DEFAULT 0, 
+qty_stock double DEFAULT 0, 
+qty_regulated double DEFAULT 0, 
+pmp double DEFAULT 0, 
+pa double DEFAULT 0, 
+new_pmp double DEFAULT 0, 
+) 
+ENGINE=InnoDB;
+
+ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms);
+ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (date_cre);
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_tms (tms);
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (date_cre);
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_fk_inventory (fk_inventory);
diff --git a/htdocs/install/mysql/tables/llx_inventory.key.sql b/htdocs/install/mysql/tables/llx_inventory.key.sql
new file mode 100644
index 00000000000..6596e88d817
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_inventory.key.sql
@@ -0,0 +1,21 @@
+-- ===================================================================
+-- Copyright (C) 2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+-- Copyright (C) 2017	ATM Consulting		<support@atm-consulting.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms);
+ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (date_cre);
diff --git a/htdocs/install/mysql/tables/llx_inventory.sql b/htdocs/install/mysql/tables/llx_inventory.sql
new file mode 100644
index 00000000000..dc4b66f1be2
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_inventory.sql
@@ -0,0 +1,31 @@
+-- ===================================================================
+-- Copyright (C) 2012      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2017	ATM Consulting		<support@atm-consulting.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+CREATE TABLE llx_inventory 
+( 
+rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+datec DATETIME DEFAULT NULL, 
+tms timestamp, 
+fk_warehouse integer DEFAULT 0, 
+entity integer DEFAULT 0, 
+status integer DEFAULT 0, 
+title varchar(255) NOT NULL, 
+date_inventory datetime DATETIME DEFAULT NULL
+) 
+ENGINE=InnoDB;
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.key.sql b/htdocs/install/mysql/tables/llx_inventorydet.key.sql
new file mode 100644
index 00000000000..31c5884f60b
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_inventorydet.key.sql
@@ -0,0 +1,22 @@
+-- ===================================================================
+-- Copyright (C) 2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+-- Copyright (C) 2017	ATM Consulting		<support@atm-consulting.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_tms (tms);
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (date_cre);
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_fk_inventory (fk_inventory);
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.sql b/htdocs/install/mysql/tables/llx_inventorydet.sql
new file mode 100644
index 00000000000..c67ccd32a3f
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_inventorydet.sql
@@ -0,0 +1,36 @@
+-- ===================================================================
+-- Copyright (C) 2012      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2017	ATM Consulting		<support@atm-consulting.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+CREATE TABLE llx_inventorydet 
+( 
+rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+datec DATETIME DEFAULT NULL, 
+tms timestamp, 
+fk_inventory integer DEFAULT 0, 
+fk_warehouse integer DEFAULT 0,
+fk_product integer DEFAULT 0,  
+entity integer DEFAULT 0, 
+qty_view double DEFAULT 0, 
+qty_stock double DEFAULT 0, 
+qty_regulated double DEFAULT 0, 
+pmp double DEFAULT 0, 
+pa double DEFAULT 0, 
+new_pmp double DEFAULT 0, 
+) 
+ENGINE=InnoDB;

From 635abe58bea114ba37279d5bf1c4693e0c20797f Mon Sep 17 00:00:00 2001
From: IJ <jawaid_imran@hotmail.com>
Date: Mon, 9 Jan 2017 10:14:11 +0000
Subject: [PATCH 0119/1163] User-friendly tooltip

---
 htdocs/core/tpl/login.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index ae1118b4ce7..9204d691dbd 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -89,7 +89,7 @@ $(document).ready(function () {
 
 <div id="login_right">
 
-<table class="left centpercent" title="Login pass">
+<table class="left centpercent" title="Enter login details">
 <!-- Login -->
 <tr>
 <td class="nowrap center valignmiddle">

From 5c233a41b330e754d554297e5b2a5f06af7f55ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Jan 2017 23:54:31 +0100
Subject: [PATCH 0120/1163] NEW Add hook "formatNotificationMessage"

---
 htdocs/core/class/hookmanager.class.php |  5 +++--
 htdocs/core/class/notify.class.php      | 30 ++++++++++++++++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 739e635f85c..f705848743d 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -116,8 +116,8 @@ class HookManager
      * 	    @param		array	$parameters		Array of parameters
      * 		@param		Object	$object			Object to use hooks on
      * 	    @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
-     * 		@return		mixed					For 'addreplace hooks (doActions,formObjectOptions,pdf_xxx,...):  					Return 0 if we want to keep standard actions, >0 if we want to stop standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results and set into ->resArray.
-     * 											For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results and set into ->resArray.
+     * 		@return		mixed					For 'addreplace' hooks (doActions,formObjectOptions,pdf_xxx,...):  					Return 0 if we want to keep standard actions, >0 if we want to stop standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
+     * 											For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results bu hook and set into ->resArray for caller.
      *                                          All types can also return some values into an array ->results.
      * 											$this->error or this->errors are also defined by class called by this function if error.
      */
@@ -142,6 +142,7 @@ class HookManager
 				'formObjectOptions',
 				'formattachOptions',
 				'formBuilddocLineOptions',
+			    'formatNotificationMessage',
 			    'getFormMail',
 			    'getIdProfUrl',
 				'moveUploadedFile',
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index b4d713b7b7a..17e3b00b602 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -278,12 +278,20 @@ class Notify
      */
     function send($notifcode, $object)
     {
-        global $user,$conf,$langs,$mysoc,$dolibarr_main_url_root;
+        global $user,$conf,$langs,$mysoc;
+        global $hookmanager;
+        global $dolibarr_main_url_root;
 
 		if (! in_array($notifcode, $this->arrayofnotifsupported)) return 0;
 
 	    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		
+	    if (! is_object($hookmanager))
+	    {
+	        include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+	        $hookmanager=new HookManager($this->db);
+	    }
+	    $hookmanager->initHooks(array('notification'));
+	    
 	    dol_syslog(get_class($this)."::send notifcode=".$notifcode.", object=".$object->id);
 
     	$langs->load("other");
@@ -443,6 +451,14 @@ class Notify
 	                    $message.= $mesg;
 	                    if ($link) $message=dol_concatdesc($message,$urlwithroot.$link);
 
+	                    $parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$file, 'mimefile'=>$mimefile, 'filename'=>$filename);
+	                    $reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+	                    if (empty($reshook))
+	                    {
+	                        if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
+	                        if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+	                    }
+	                     
 	                    $mailfile = new CMailFile(
 	                        $subject,
 	                        $sendto,
@@ -637,7 +653,15 @@ class Notify
 
 		        if ($sendto)
 		        {
-		        	$mailfile = new CMailFile(
+       		        $parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$file, 'mimefile'=>$mimefile, 'filename'=>$filename);
+			        $reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			        if (empty($reshook))
+			        {
+		    	        if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
+		        	    if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+			        }
+		        
+		            $mailfile = new CMailFile(
 		        		$subject,
 		        		$sendto,
 		        		$replyto,

From 0f89fa2b11b4aade5d6fe418531c89e98338b235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Tue, 10 Jan 2017 11:44:21 +0100
Subject: [PATCH 0121/1163] [Qual] Add PHP 7.1 to Travis test matrix

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 718356e8075..1a6cae1e792 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ php:
 - '5.5'
 - '5.6'
 - '7.0'
+- '7.1'
 - nightly
 
 addons:
@@ -96,7 +97,7 @@ install:
   if [ "$TRAVIS_PHP_VERSION" = '5.3' ] || [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
     composer -n require phpunit/phpunit ^4
   fi
-  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
     composer -n require phpunit/phpunit ^5
   fi
   echo
@@ -136,7 +137,7 @@ before_script:
     echo 'extension = apc.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
     echo
     echo "Enabling Memcached for PHP <= 5.4"
-    #   Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0 and nightly!
+    #   Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0, 7.1 and nightly!
     echo 'extension = memcached.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
   fi
   phpenv rehash
@@ -208,7 +209,7 @@ before_script:
   echo "Setting up Apache + FPM"
   # enable php-fpm
   cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf.default ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf
-  if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
     # Copy the included pool
     cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.d/www.conf
   fi

From dcae6e644d7b42b2ebfabc5cf30093998e5548bf Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Wed, 11 Jan 2017 05:12:48 +0100
Subject: [PATCH 0122/1163] New : Loan - Add control and edit mode more
 complete

---
 htdocs/loan/card.php | 172 +++++++++++++++++++++++++++----------------
 1 file changed, 110 insertions(+), 62 deletions(-)

diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 6dd6b17ccff..eae1120e80c 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -90,17 +90,7 @@ if ($action == 'add' && $user->rights->loan->write)
 		$dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int'));
 		$capital 	= price2num(GETPOST('capital'));
 
-		if (! $datestart)
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateStart")), null, 'errors');
-			$action = 'create';
-		}
-		elseif (! $dateend)
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateEnd")), null, 'errors');
-			$action = 'create';
-		}
-		elseif (! $capital)
+		if (! $capital)
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
 			$action = 'create';
@@ -145,14 +135,32 @@ else if ($action == 'update' && $user->rights->loan->write)
 	if (! $cancel)
 	{
 		$result = $object->fetch($id);
+		$object->fetch($id);
 
-		if ($object->fetch($id))
+		$datestart	= dol_mktime(12, 0, 0, GETPOST('startmonth','int'), GETPOST('startday','int'), GETPOST('startyear','int'));
+		$dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int'));
+		$capital 	= price2num(GETPOST('capital'));
+
+		if (! $capital)
 		{
-			$object->datestart	= dol_mktime(12, 0, 0, GETPOST('startmonth','int'), GETPOST('startday','int'), GETPOST('startyear','int'));
-			$object->dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int'));
-			$object->capital	= price2num(GETPOST("capital"));
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
+			$action = 'edit';
+		}
+		else
+		{
+			$object->datestart	= $datestart;
+			$object->dateend	= $dateend;
+			$object->capital	= $capital;
 			$object->nbterm		= GETPOST("nbterm");
 			$object->rate		= GETPOST("rate");
+
+			$accountancy_account_capital	= GETPOST('accountancy_account_capital');
+			$accountancy_account_insurance	= GETPOST('accountancy_account_insurance');
+			$accountancy_account_interest	= GETPOST('accountancy_account_interest');
+
+			if ($accountancy_account_capital <= 0) { $object->account_capital = ''; } else { $object->account_capital = $accountancy_account_capital; }
+			if ($accountancy_account_insurance <= 0) { $object->account_insurance = ''; } else { $object->account_insurance = $accountancy_account_insurance; }
+			if ($accountancy_account_interest <= 0) { $object->account_interest = ''; } else { $object->account_interest = $accountancy_account_interest; }
 		}
 
         $result = $object->update($user);
@@ -234,21 +242,21 @@ if ($action == 'create')
 
 	// Date Start
 	print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>';
+    print '<td>'.$langs->trans("DateStart").'</td><td>';
     print $form->select_date($datestart?$datestart:-1,'start','','','','add',1,1,1);
     print '</td></tr>';
 
 	// Date End
 	print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("DateEnd").'</td><td>';
+    print '<td>'.$langs->trans("DateEnd").'</td><td>';
     print $form->select_date($dateend?$dateend:-1,'end','','','','add',1,1,1);
     print '</td></tr>';
 
 	// Number of terms
-	print '<tr><td class="fieldrequired">'.$langs->trans("Nbterms").'</td><td><input name="nbterm" size="5" value="' . GETPOST('nbterm') . '"></td></tr>';
+	print '<tr><td>'.$langs->trans("Nbterms").'</td><td><input name="nbterm" size="5" value="' . GETPOST('nbterm') . '"></td></tr>';
 
 	// Rate
-    print '<tr><td class="fieldrequired">'.$langs->trans("Rate").'</td><td><input name="rate" size="5" value="' . GETPOST("rate") . '"> %</td></tr>';
+    print '<tr><td>'.$langs->trans("Rate").'</td><td><input name="rate" size="5" value="' . GETPOST("rate") . '"> %</td></tr>';
 
     // Note Private
     print '<tr>';
@@ -272,19 +280,19 @@ if ($action == 'create')
 	if (! empty($conf->accounting->enabled))
 	{
 		// Accountancy_account_capital
-        print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
+        print '<tr><td class="titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
         print '<td>';
 		print $formaccountancy->select_account($object->accountancy_account_capital, 'accountancy_account_capital', 1, '', 0, 1);
         print '</td></tr>';
 
 		// Accountancy_account_insurance
-        print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("LoanAccountancyInsuranceCode").'</td>';
+        print '<tr><td>'.$langs->trans("LoanAccountancyInsuranceCode").'</td>';
         print '<td>';
 		print $formaccountancy->select_account($object->accountancy_account_insurance, 'accountancy_account_insurance', 1, '', 0, 1);
         print '</td></tr>';
 
 		// Accountancy_account_interest
-        print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("LoanAccountancyInterestCode").'</td>';
+        print '<tr><td>'.$langs->trans("LoanAccountancyInterestCode").'</td>';
         print '<td>';
 		print $formaccountancy->select_account($object->accountancy_account_interest, 'accountancy_account_interest', 1, '', 0, 1);
         print '</td></tr>';
@@ -292,17 +300,17 @@ if ($action == 'create')
 	else // For external software 
 	{
         // Accountancy_account_capital
-        print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
+        print '<tr><td class="titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
         print '<td><input name="accountancy_account_capital" size="16" value="'.$object->accountancy_account_capital.'">';
         print '</td></tr>';
 
 		// Accountancy_account_insurance
-        print '<tr><td class="fieldrequired">'.$langs->trans("LoanAccountancyInsuranceCode").'</td>';
+        print '<tr><td>'.$langs->trans("LoanAccountancyInsuranceCode").'</td>';
         print '<td><input name="accountancy_account_insurance" size="16" value="'.$object->accountancy_account_insurance.'">';
         print '</td></tr>';
 
 		// Accountancy_account_interest
-        print '<tr><td class="fieldrequired">'.$langs->trans("LoanAccountancyInterestCode").'</td>';
+        print '<tr><td>'.$langs->trans("LoanAccountancyInterestCode").'</td>';
         print '<td><input name="accountancy_account_interest" size="16" value="'.$object->accountancy_account_interest.'">';
         print '</td></tr>';
 	}
@@ -372,29 +380,10 @@ if ($id > 0)
 
 		print '<table class="border" width="100%">';
 
-		/*
-		// Ref
-		print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
-		print $form->showrefnav($object,'id');
-		print "</td></tr>";
-
-		// Label
-		if ($action == 'edit')
-		{
-			print '<tr><td>'.$langs->trans("Label").'</td><td>';
-			print '<input type="text" name="label" size="40" value="'.$object->label.'">';
-			print '</td></tr>';
-		}
-		else
-		{
-			print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
-		}
-		*/
-
 		// Capital
 		if ($action == 'edit')
 		{
-			print '<tr><td class="titlefield">'.$langs->trans("LoanCapital").'</td><td>';
+			print '<tr><td class="fieldrequired titlefield">'.$langs->trans("LoanCapital").'</td><td>';
 			print '<input name="capital" size="10" value="' . $object->capital . '"></td></tr>';
 			print '</td></tr>';
 		}
@@ -430,19 +419,53 @@ if ($id > 0)
 		print "</td></tr>";
 
 		// Nbterms
-		print '<tr><td>'.$langs->trans("Nbterms").'</td><td>'.$object->nbterm.'</td></tr>';
+		print '<tr><td class="titlefield">'.$langs->trans("Nbterms").'</td>';
+		print '<td>';
+		if ($action == 'edit')
+		{
+			print '<input name="nbterm" size="4" value="' . $object->nbterm . '">';
+		}
+		else
+		{
+			print $object->nbterm;
+		}
+		print '</td></tr>';
 
 		// Rate
-		print '<tr><td>'.$langs->trans("Rate").'</td><td>'.$object->rate.' %</td></tr>';
+		print '<tr><td class="titlefield">'.$langs->trans("Rate").'</td>';
+		print '<td>';
+		if ($action == 'edit')
+		{
+			print '<input name="rate" size="4" value="' . $object->rate . '">%';
+		}
+		else
+		{
+			print $object->rate . '%';
+		}
+		print '</td></tr>';
 
         // Accountancy account capital
 		print '<tr><td class="nowrap">';
         print $langs->trans("LoanAccountancyCapitalCode");
         print '</td><td>';
-		if (! empty($conf->accounting->enabled)) {
-			print length_accountg($object->account_capital);
-        } else {
-			print $object->account_capital;
+		if ($action == 'edit')
+		{
+			if (! empty($conf->accounting->enabled))
+			{
+				print $formaccountancy->select_account($object->account_capital, 'accountancy_account_capital', 1, '', 0, 1);
+			}
+			else
+			{
+				print '<input name="accountancy_account_capital" size="16" value="'.$object->account_capital.'">';
+			}
+		}
+		else
+		{
+			if (! empty($conf->accounting->enabled)) {
+				print length_accountg($object->account_capital);
+			} else {
+				print $object->account_capital;
+			}
 		}
 		print '</td></tr>';
 
@@ -450,10 +473,24 @@ if ($id > 0)
 		print '<tr><td class="nowrap">';
         print $langs->trans("LoanAccountancyInsuranceCode");
         print '</td><td>';
-		if (! empty($conf->accounting->enabled)) {
-			print length_accountg($object->account_insurance);
-        } else {
-			print $object->account_insurance;
+		if ($action == 'edit')
+		{
+			if (! empty($conf->accounting->enabled))
+			{
+				print $formaccountancy->select_account($object->account_insurance, 'accountancy_account_insurance', 1, '', 0, 1);
+			}
+			else
+			{
+				print '<input name="accountancy_account_insurance" size="16" value="'.$object->account_insurance.'">';
+			}
+		}
+		else
+		{
+			if (! empty($conf->accounting->enabled)) {
+				print length_accountg($object->account_insurance);
+			} else {
+				print $object->account_insurance;
+			}
 		}
 		print '</td></tr>';
 
@@ -461,16 +498,27 @@ if ($id > 0)
 		print '<tr><td class="nowrap">';
         print $langs->trans("LoanAccountancyInterestCode");
         print '</td><td>';
-		if (! empty($conf->accounting->enabled)) {
-			print length_accountg($object->account_interest);
-        } else {
-			print $object->account_interest;
+		if ($action == 'edit')
+		{
+			if (! empty($conf->accounting->enabled))
+			{
+				print $formaccountancy->select_account($object->account_interest, 'accountancy_account_interest', 1, '', 0, 1);
+			}
+			else
+			{
+				print '<input name="accountancy_account_interest" size="16" value="'.$object->account_interest.'">';
+			}
+		}
+		else
+		{
+			if (! empty($conf->accounting->enabled)) {
+				print length_accountg($object->account_interest);
+			} else {
+				print $object->account_interest;
+			}
 		}
 		print '</td></tr>';
 
-		// Status
-		// print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4, $totalpaye).'</td></tr>';
-
 		print '</table>';
 
 		print '</div>';

From 972a31ebe9f9728336597c13f14472ebf04a52ab Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 12 Jan 2017 16:03:07 +0100
Subject: [PATCH 0123/1163] Update images.lib.php

in fact $dir is not used in the function
---
 htdocs/core/lib/images.lib.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 2fe99bf779a..e3121745300 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -81,7 +81,6 @@ function dol_getImageSize($file, $url = false)
 		// if problem with realpath
 		if ($fichier == false)
 			return $ret;		
-		$dir = dirname($file); 			// Chemin du dossier contenant l'image
 	}
 
 	$infoImg = getimagesize($fichier); // Recuperation des infos de l'image

From 751aa2a2aa2264485c21e256409a4641d5aa9e6b Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Thu, 12 Jan 2017 12:11:45 -0300
Subject: [PATCH 0124/1163] Improve code style

---
 htdocs/product/class/product.class.php | 276 +++++++++++++++++--------
 1 file changed, 186 insertions(+), 90 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 0fd2be8ba7f..71f10b7ffa1 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -13,6 +13,7 @@
  * Copyright (C) 2014-2016	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2014		Ion agorria			    <ion@agorria.com>
  * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2017		Gustavo Novaro			
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,36 +55,61 @@ class Product extends CommonObject
 	 */
 	protected $table_ref_field = 'ref';
 
-	var $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm'; // See also into images.lib.php
+	public $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm'; // See also into images.lib.php
 
 	/*
 	 * @deprecated
 	 * @see label
 	 */
-	var $libelle;
+	public $libelle;
 	/**
 	 * Product label
 	 * @var string
 	 */
-	var $label;
-    /**
-     * Product descripion
-     * @var string
-     */
-	var $description;
+	public $label;
+    
+	/**
+     	* Product descripion
+     	* @var string
+     	*/
+	public $description;
 
 	/**
 	 * Check TYPE constants
 	 * @var int
 	 */
-	var $type = self::TYPE_PRODUCT;
-	//! Selling price
-	var $price;				// Price net
-	var $price_ttc;			// Price with tax
-	var $price_min;         // Minimum price net
-	var $price_min_ttc;     // Minimum price with tax
-	//! Base price ('TTC' for price including tax or 'HT' for net price)
-	var $price_base_type;
+	public $type = self::TYPE_PRODUCT;
+	
+	/**
+	 * Selling price
+	 * @var float
+	 */
+	public $price;			// Price net
+	
+	/**
+	 * Price with tax
+	 * @var float
+	 */
+	public $price_ttc;
+	
+	/**
+	 * Minimum price net
+	 * @var float
+	 */
+	public $price_min;
+	
+	/**
+	 * Minimum price with tax
+	 * @var float
+	 */
+	public $price_min_ttc;
+	
+	/*
+	 * Base price ('TTC' for price including tax or 'HT' for net price)
+	 * @var float
+	 */
+	public $price_base_type;
+	
 	//! Arrays for multiprices
 	public $multiprices=array();
 	public $multiprices_ttc=array();
@@ -92,49 +118,99 @@ class Product extends CommonObject
 	public $multiprices_min_ttc=array();
 	public $multiprices_tva_tx=array();
 	public $multiprices_recuperableonly=array();
-	//! Price by quantity arrays
-	var $price_by_qty;
-	var $prices_by_qty=array();
-	var $prices_by_qty_id=array();
-	var $prices_by_qty_list=array();
-	//! Default VAT code for product (link to code into llx_c_tva but without foreign keys)
-	var $default_vat_code;
-	//! Default VAT rate of product
-	var $tva_tx;
-	//! French VAT NPR (0 or 1)
-    var $tva_npr=0;
-	//! Other local taxes
-	var $localtax1_tx;
-	var $localtax2_tx;
-	var $localtax1_type;
-	var $localtax2_type;
 	
-	//! Stock real
-	var $stock_reel;
-	//! Stock virtual
-	var $stock_theorique;
-	//! Cost price
-	var $cost_price;
+	//! Price by quantity arrays
+	public $price_by_qty;
+	public $prices_by_qty=array();
+	public $prices_by_qty_id=array();
+	public $prices_by_qty_list=array();
+	
+	//! Default VAT code for product (link to code into llx_c_tva but without foreign keys)
+	public $default_vat_code;
+	
+	//! Default VAT rate of product
+	public $tva_tx;
+	
+	//! French VAT NPR (0 or 1)
+    	public $tva_npr=0;
+	
+	//! Other local taxes
+	public $localtax1_tx;
+	public $localtax2_tx;
+	public $localtax1_type;
+	public $localtax2_type;
+	
+	/**
+	 * Stock real
+	 * @var int
+	 */
+	public $stock_reel = 0;
+	
+	/**
+	 * Stock virtual
+	 * @var int
+	 */
+	public $stock_theorique;
+	
+	/**
+	 * Cost price
+	 * @var float
+	 */
+	public $cost_price;
+	
 	//! Average price value for product entry into stock (PMP)
-	var $pmp;
-    //! Stock alert
-	var $seuil_stock_alerte;
-	//! Ask for replenishment when $desiredstock < $stock_reel
+	public $pmp;
+	
+    	/**
+	 * Stock alert
+	 * @var int
+	 */
+	public $seuil_stock_alerte;
+	
+	/**
+	 * Ask for replenishment when $desiredstock < $stock_reel
+	 */
 	public $desiredstock;
-	//! Duree de validite du service
-	var $duration_value;
-	//! Unite de duree
-	var $duration_unit;
-	// Statut indique si le produit est en vente '1' ou non '0'
-	var $status;
-	// Status indicate whether the product is available for purchase '1' or not '0'
-	var $status_buy;
-	// Statut indique si le produit est un produit fini '1' ou une matiere premiere '0'
-	var $finished;
-	// We must manage lot/batch number, sell-by date and so on : '1':yes '0':no
-	var $status_batch;
+	
+	/*
+	 * Service expiration
+	 */
+	public $duration_value;
+	
+	/**
+	 * Exoiration unit
+	 */
+	public $duration_unit;
+	
+	/**
+	 * Status indicates whether the product is on sale '1' or not '0'
+	 * @var int
+	 */
+	public $status;
+	
+	/**
+	 * Status indicate whether the product is available for purchase '1' or not '0'
+	 * @var int
+	 */
+	public $status_buy;
+	
+	/**
+	 * Status indicates whether the product is a finished product '1' or a raw material '0'
+	 * @var int
+	 */
+	public $finished;
+	
+	/**
+	 * We must manage lot/batch number, sell-by date and so on : '1':yes '0':no
+	 * @var int
+	 */
+	public $status_batch;
 
-	var $customcode;       // Customs code
+	/**
+	 * Customs code
+	 * @var
+	 */
+	public $customcode;
 
 	/**
 	 * Product URL
@@ -143,56 +219,66 @@ class Product extends CommonObject
 	public $url;
 
 	//! Unites de mesure
-	var $weight;
-	var $weight_units;
-	var $length;
-	var $length_units;
-	var $surface;
-	var $surface_units;
-	var $volume;
-	var $volume_units;
+	public $weight;
+	public $weight_units;
+	public $length;
+	public $length_units;
+	public $surface;
+	public $surface_units;
+	public $volume;
+	public $volume_units;
 
-	var $accountancy_code_buy;
-	var $accountancy_code_sell;
+	public $accountancy_code_buy;
+	public $accountancy_code_sell;
 
-	//! barcode
-	var $barcode;               // value
+	/**
+	 * Main barcode
+	 * barcode value
+	 * @var 
+	 */
+	public $barcode;
+	
+	/**
+	 * Additional barcodes (Some products have different barcodes according to the country of origin of manufacture)
+	 * @var array
+	 */
+	public $barcodes_extra=array();
 
-	var $stats_propale=array();
-	var $stats_commande=array();
-	var $stats_contrat=array();
-	var $stats_facture=array();
-    var $stats_commande_fournisseur=array();
+	public $stats_propale=array();
+	public $stats_commande=array();
+	public $stats_contrat=array();
+	public $stats_facture=array();
+    	public $stats_commande_fournisseur=array();
 
-	var $multilangs=array();
+	public $multilangs=array();
 
 	//! Taille de l'image
-	var $imgWidth;
-	var $imgHeight;
+	public $imgWidth;
+	public $imgHeight;
 
-	var $date_creation;
-	var $date_modification;
+	public $date_creation;
+	public $date_modification;
 
 	//! Id du fournisseur
-	var $product_fourn_id;
+	public $product_fourn_id;
 
 	//! Product ID already linked to a reference supplier
-	var $product_id_already_linked;
+	public $product_id_already_linked;
 
-	var $nbphoto;
+	public $nbphoto;
 
 	//! Contains detail of stock of product into each warehouse
-	var $stock_warehouse=array();
+	public $stock_warehouse=array();
 
-	var $oldcopy;
+	public $oldcopy;
 
-    var $fk_price_expression;
+    	public $fk_price_expression;
 
 	/**
 	 * @deprecated
 	 * @see fourn_pu
 	 */
-	var $buyprice;
+	public $buyprice;
 	public $fourn_pu;
 
 	public $fourn_price_base_type;
@@ -201,7 +287,7 @@ class Product extends CommonObject
 	 * @deprecated
 	 * @see ref_supplier
 	 */
-	var $ref_fourn;
+	public $ref_fourn;
 	public $ref_supplier;
 
 	/**
@@ -290,7 +376,7 @@ class Product extends CommonObject
 	{
 		global $conf, $langs;
 
-        $error=0;
+        	$error=0;
 
 		// Clean parameters
 		$this->ref = dol_string_nospecial(trim($this->ref));
@@ -320,39 +406,48 @@ class Product extends CommonObject
 		$price_ttc=0;
 		$price_min_ht=0;
 		$price_min_ttc=0;
+		
+		//
 		if ($this->price_base_type == 'TTC' && $this->price_ttc > 0)
 		{
 			$price_ttc = price2num($this->price_ttc,'MU');
 			$price_ht = price2num($this->price_ttc / (1 + ($this->tva_tx / 100)),'MU');
 		}
+		
+		//
 		if ($this->price_base_type != 'TTC' && $this->price > 0)
 		{
 			$price_ht = price2num($this->price,'MU');
 			$price_ttc = price2num($this->price * (1 + ($this->tva_tx / 100)),'MU');
 		}
+		
+		//
 		if (($this->price_min_ttc > 0) && ($this->price_base_type == 'TTC'))
 		{
 			$price_min_ttc = price2num($this->price_min_ttc,'MU');
 			$price_min_ht = price2num($this->price_min_ttc / (1 + ($this->tva_tx / 100)),'MU');
 		}
+		
+		//
 		if (($this->price_min > 0) && ($this->price_base_type != 'TTC'))
 		{
 			$price_min_ht = price2num($this->price_min,'MU');
 			$price_min_ttc = price2num($this->price_min * (1 + ($this->tva_tx / 100)),'MU');
 		}
 
-    	$this->accountancy_code_buy = trim($this->accountancy_code_buy);
+    		$this->accountancy_code_buy = trim($this->accountancy_code_buy);
 		$this->accountancy_code_sell= trim($this->accountancy_code_sell);
 
-        // Barcode value
-        $this->barcode=trim($this->barcode);
+		// Barcode value
+		$this->barcode=trim($this->barcode);
 
-        // Check parameters
+	        // Check parameters
 		if (empty($this->label))
 		{
 			$this->error='ErrorMandatoryParametersNotProvided';
 			return -1;
 		}
+		
 		if (empty($this->ref))
 		{
 			// Load object modCodeProduct
@@ -371,6 +466,7 @@ class Product extends CommonObject
 				}
 				unset($modCodeProduct);
 			}
+			
 			if (empty($this->ref))
 			{
 				$this->error='ProductModuleNotSetupForAutoRef';

From c3e5e0dd3f030990692eab28023a4636a946491a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jan 2017 21:50:35 +0100
Subject: [PATCH 0125/1163] Update doc

---
 build/debian/README.howto | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index 1b64380cc26..afc2d391e1e 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -320,8 +320,8 @@ x.y.z+dfsgw
 Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit
 
 * Update/fix debian/* files used to build package.
-At least, add an entry into debian/changelog
-> dch -v x.y.z+dfsgw-v "My comment" will add entry.
+At least, add an entry into debian/changelog with command
+> dch -v x.y.z+dfsgw-1 "My comment"
 For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increased for each new import)
 Then check/modify changelog to replace "version" or "unstable" with "UNRELEASED".
 Then check/modify also the user/date signature:
@@ -332,7 +332,9 @@ Then check/modify also the user/date signature:
 To update dolibarr debian package when only files into debian has changed:
 
 * Change files and commit.
-* Add a tag debian/x.y.z+dfsgw-2 (increase the last 1 into 2, 3...)
+* Add a line into changelog for version debian/x.y.z+dfsgw-v (increase the last v into 2, 3...)
+> dch -v x.y.z+dfsgw-v "My comment"
+* git tag will be added when package is pushed.
 
 
 To update dolibarr debian package when only files not into debian has changed:

From 60143146105903d6fb564f1e73f361268e8f2315 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 13 Jan 2017 09:05:10 +0100
Subject: [PATCH 0126/1163] forgotten translation

translation lefted on last 5.RC version
---
 htdocs/langs/en_US/interventions.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
index 0de0d487925..9863471448b 100644
--- a/htdocs/langs/en_US/interventions.lang
+++ b/htdocs/langs/en_US/interventions.lang
@@ -41,6 +41,7 @@ InterventionDeletedInDolibarr=Intervention %s deleted
 InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
 LastModifiedInterventions=Latest %s modified interventions
+FichinterToProcess=Interventions to process
 ##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation

From 6cc3ef0c99912bce3956f08693916eac063bb866 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 13 Jan 2017 16:08:49 +0100
Subject: [PATCH 0127/1163] NEW: Events notifications in browser

---
 htdocs/admin/agenda_other.php             |  31 ++++-
 htdocs/comm/action/sound/notification.mp3 | Bin 0 -> 33430 bytes
 htdocs/core/ajax/check_events.php         |  70 ++++++++++++
 htdocs/core/js/agenda_notification.js.php | 133 ++++++++++++++++++++++
 htdocs/core/modules/modAgenda.class.php   |   4 +
 htdocs/langs/en_US/admin.lang             |   2 +
 htdocs/theme/eldy/img/bell.png            | Bin 0 -> 509 bytes
 7 files changed, 238 insertions(+), 2 deletions(-)
 create mode 100644 htdocs/comm/action/sound/notification.mp3
 create mode 100644 htdocs/core/ajax/check_events.php
 create mode 100644 htdocs/core/js/agenda_notification.js.php
 create mode 100644 htdocs/theme/eldy/img/bell.png

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 9406f8ecc5d..d421b296acb 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2008-2016	Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2011		Regis Houssin           <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2013  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2011-2017  Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2015		Jean-François Ferry	    <jfefe@aternatik.fr>
  * Copyright (C) 2016		Charlie Benke		    <charlie@patas-monkey.com>
  *
@@ -407,6 +407,34 @@ $tmplist=array('show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->tran
 print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW);
 print '</td></tr>'."\n";
 
+// AGENDA NOTIFICATION
+print '<tr '.$bc[$var].'>'."\n";
+print '<td>'.$langs->trans('AGENDA_NOTIFICATION').'</td>'."\n";
+print '<td align="center">&nbsp;</td>'."\n";
+print '<td align="right">'."\n";
+
+if (empty($conf->global->AGENDA_NOTIFICATION)) {
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_NOTIFICATION">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
+    print '</td></tr>'."\n";
+} else {
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_NOTIFICATION">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
+    print '</td></tr>'."\n";
+
+    print '<tr '.$bc[$var].'>'."\n";
+    print '<td>'.$langs->trans('AGENDA_NOTIFICATION_SOUND').'</td>'."\n";
+    print '<td align="center">&nbsp;</td>'."\n";
+    print '<td align="right">'."\n";
+
+
+    if (empty($conf->global->AGENDA_NOTIFICATION_SOUND)) {
+        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_NOTIFICATION_SOUND">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
+    } else {
+        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_NOTIFICATION_SOUND">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
+    }
+
+    print '</td></tr>'."\n";
+}
+
 print '</table>';
 
 dol_fiche_end();
@@ -415,7 +443,6 @@ print '<div class="center"><input class="button" type="submit" name="save" value
 
 print '</form>';
 
-
 print "<br>";
 
 llxFooter();
diff --git a/htdocs/comm/action/sound/notification.mp3 b/htdocs/comm/action/sound/notification.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..c58e664fd9eadefa6d3048518e4a0ca61f4c0342
GIT binary patch
literal 33430
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

literal 0
HcmV?d00001

diff --git a/htdocs/core/ajax/check_events.php b/htdocs/core/ajax/check_events.php
new file mode 100644
index 00000000000..ce52413ceab
--- /dev/null
+++ b/htdocs/core/ajax/check_events.php
@@ -0,0 +1,70 @@
+<?php
+/* Copyright (C) 2016	   Sergio Sanchis		<sergiosanchis@hotmail.com>
+ * Copyright (C) 2017	   Juanjo Menent		<jmenent@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+
+global $user, $db, $langs, $conf;
+
+$time = GETPOST('time');
+
+session_start();
+
+//TODO Configure how long the upgrade will take
+$time_update = 60;
+
+if (! empty($conf->global->AGENDA_NOTIFICATION)) {
+    if ($_SESSION['auto_check_events'] <= (int)$time) {
+        $_SESSION['auto_check_events'] = $time + $time_update;
+
+        $eventos = array();
+
+        $sql = 'SELECT id';
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'actioncomm a, ' . MAIN_DB_PREFIX . 'actioncomm_resources ar';
+        $sql .= ' WHERE datep BETWEEN ' . $db->idate($time + 1) . ' AND ' . $db->idate($time + $time_update);
+        $sql .= ' AND a.id = ar.fk_actioncomm';
+        $sql .= ' AND a.code <> "AC_OTH_AUTO"';
+        $sql .= ' AND ar.element_type = "user"';
+        $sql .= ' AND ar.fk_element = ' . $user->id;
+
+        $resql = $db->query($sql);
+
+        if ($resql) {
+
+            $actionmod = new ActionComm($db);
+
+            while ($obj = $db->fetch_object($resql)) {
+
+                $event = array();
+
+                $actionmod->fetch($obj->id);
+
+                $event['id'] = $actionmod->id;
+                $event['tipo'] = $langs->transnoentities('Action' . $actionmod->code);
+                $event['titulo'] = $actionmod->label;
+                $event['location'] = $actionmod->location;
+                $eventos[] = $event;
+                $actionmod->initAsSpecimen();
+
+            }
+        }
+
+        print json_encode($eventos);
+    }
+}
\ No newline at end of file
diff --git a/htdocs/core/js/agenda_notification.js.php b/htdocs/core/js/agenda_notification.js.php
new file mode 100644
index 00000000000..4e741a25092
--- /dev/null
+++ b/htdocs/core/js/agenda_notification.js.php
@@ -0,0 +1,133 @@
+<?php
+/* Copyright (C) 2016	   Sergio Sanchis		<sergiosanchis@hotmail.com>
+ * Copyright (C) 2017	   Juanjo Menent		<jmenent@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+*/
+if (!defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1');
+if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
+if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
+if (!defined('NOLOGIN')) define('NOLOGIN', 1);
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+
+session_cache_limiter(FALSE);
+
+require_once '../../main.inc.php';
+
+if(!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/index.php')){
+
+    global $langs, $conf;
+
+    $langs->load('agenda');
+
+    // Define javascript type
+    header('Content-type: text/javascript; charset=UTF-8');
+    header('Cache-Control: no-cache');
+
+    // Check notification permissions API HTML5
+    print 'if (Notification.permission !== "granted") {
+                    Notification.requestPermission()
+                }' . PHP_EOL;
+
+    session_start();
+    if (!isset($_SESSION['auto_check_events'])) {
+
+        // Round to eliminate the second part
+        $_SESSION['auto_check_events'] = floor(time() / 60) * 60;
+        print 'var time_session = ' . $_SESSION['auto_check_events'] . ';' . PHP_EOL;
+        print 'var now = ' . $_SESSION['auto_check_events'] . ';' . PHP_EOL;
+    } else {
+
+        print 'var time_session = ' . $_SESSION['auto_check_events'] . ';' . PHP_EOL;
+        print 'var now = ' . time() . ';' . PHP_EOL;
+    }
+
+    //TODO provisionally set to be checked every 60 seconds, the 1000 is because it needs to be in milliseconds
+    print 'var time_auto_update = 60;' . "\n";
+    ?>
+
+
+    if (now > (time_session + time_auto_update) || now == time_session) {
+
+        first_execution(); //firts run auto check
+    } else {
+
+        var time_first_execution = (time_auto_update - (now - time_session)) * 1000;
+
+        setTimeout(first_execution, time_first_execution); //firts run auto check
+    }
+
+
+    function first_execution() {
+        check_events();
+        setInterval(check_events, time_auto_update * 1000); //program time for run check events
+    }
+
+    function check_events() {
+
+        $.ajax("<?php print dol_buildpath('/core/ajax/check_events.php', 1); ?>", {
+            type: "post",   // Usually post o get
+            async: true,
+            data: {time: time_session},
+            success: function (result) {
+
+                var arr = JSON.parse(result);
+
+                if (arr.length > 0) {
+                    if (Notification.permission === "granted") {
+
+                        <?php
+                        if($conf->global->AGENDA_NOTIFICATION_SOUND){
+                            print 'var audio = new Audio(\''.dol_buildpath('/comm/action/sound/notification.mp3', 1).'\');';
+                        }
+                        ?>
+
+                        $.each(arr, function (index, value) {
+                            var body = value['tipo'] + ': ' + value['titulo'];
+                            if (value['location'] != null) {
+                                body += '\n <?php print $langs->transnoentities('Location')?>: ' + value['location'];
+                            }
+
+
+                            var title = "<?php print $langs->trans('Agenda') ?>";
+                            var extra = {
+                                icon: "<?php print dol_buildpath('/theme/eldy/img/bell.png', 1); ?>",
+                                body: body,
+                                tag: value['id']
+                            };
+
+                            // We release the notify
+                            var noti = new Notification(title, extra);
+                            <?php
+                            if($conf->global->AGENDA_NOTIFICATION_SOUND){
+                                print 'if(index==0)audio.play();'."\n";
+                            }
+                            ?>
+                            noti.onclick = function (event) {
+                                event.preventDefault(); // prevent the browser from focusing the Notification's tab
+                                window.focus();
+                                window.open("<?php print dol_buildpath('/comm/action/card.php?id=', 1); ?>" + value['id'], '_blank');
+                                noti.close();
+                            };
+                        });
+                    }
+                }
+            }
+        });
+        time_session += time_auto_update;
+    }
+<?php } ?>
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 2ba37ad3cbd..46c07d43194 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2009-2011 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Cedric Gross         <c.gross@kreiz-it.fr>
  * Copyright (C) 2015      Bahfir Abbes         <bafbes@gmail.com>
+ * Copyright (C) 2017      Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -73,6 +74,9 @@ class modAgenda extends DolibarrModules
 		$this->requiredby = array();
 		$this->langfiles = array("companies");
 
+		// Module parts
+        $this->module_parts = array('js' => array('/core/js/agenda_notification.js.php'));
+
 		// Constants
 		//-----------
 		$this->const = array();
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 00fb2e768ab..e906279da03 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1475,6 +1475,8 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_NOTIFICATION=Enable events notification
+AGENDA_NOTIFICATION_SOUND=Enable sound on notifications
 ##### ClickToDial #####
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
diff --git a/htdocs/theme/eldy/img/bell.png b/htdocs/theme/eldy/img/bell.png
new file mode 100644
index 0000000000000000000000000000000000000000..2397118a68a2d328e13a031a5c7c9265264e6d82
GIT binary patch
literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq0015U0018d1^@s6@N9ht00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB600EszL_t(Y$HkY+D@9Qhhd<XNq3d-A
z*cf2qQKXjF%vj1$%E&-TnJRyVAyb)3#%2<0B!&!3wj>#dJPMOd$nEaE@4oqsPV1b#
zzJBYhea>EGL`p;sfGjYms&Ap|Gm+2%U;-EbMq_eh0)d~G3*W=P?s=))2WG7Wz!=kS
zjF|!Eft-7!-WZbso~^YvzTmP#P*p`lx`A_#e6PT;s-6`EcJMLaFz^-5sp@tyj+=nn
z$j0wc)r;8XIwfAa!H!*rwg6WYr%_cs_I9kQ0E-l_)tFK*Cjj@xfO84J%|T!hsV0r;
zLmk&70$2SP7!hgp0=unLOF9jCf!$W>N(h#aQcorXkB5M#5`sHJz<mk99R<JDuCY3S
zOVX-IRqygTc8w*Z*IM3Ee>*d+mjFClsMI6C5v9>Iu;;4!!*Oc~p#VET+m~YzIRV;%
zMxQfS0^I@k6~GG65U}v!kJvj<7m(v6*rAAA1C_tRSs<&bkG^>-B1+Ye=Xdv1>e*@k
zkJx7D;8q?=wbpJKV{-01^#W`FOU9V5QO8Fg%VS}qc0ifB00000NkvXXu0mjf2It;_

literal 0
HcmV?d00001


From 3a40d5a4f1d77b8493de5301601354e39c6edef9 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 13 Jan 2017 16:13:01 +0100
Subject: [PATCH 0128/1163] NEW: Events notifications in browser

---
 htdocs/admin/agenda_other.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index d421b296acb..2835d17e2fe 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -408,6 +408,7 @@ print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_
 print '</td></tr>'."\n";
 
 // AGENDA NOTIFICATION
+$var=!$var;
 print '<tr '.$bc[$var].'>'."\n";
 print '<td>'.$langs->trans('AGENDA_NOTIFICATION').'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
@@ -419,13 +420,12 @@ if (empty($conf->global->AGENDA_NOTIFICATION)) {
 } else {
     print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_NOTIFICATION">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
     print '</td></tr>'."\n";
-
+	$var=!$var;
     print '<tr '.$bc[$var].'>'."\n";
     print '<td>'.$langs->trans('AGENDA_NOTIFICATION_SOUND').'</td>'."\n";
     print '<td align="center">&nbsp;</td>'."\n";
     print '<td align="right">'."\n";
 
-
     if (empty($conf->global->AGENDA_NOTIFICATION_SOUND)) {
         print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_NOTIFICATION_SOUND">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
     } else {

From d18c8e3a1453a417bc8c58de8407b81def5bb45f Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 14 Jan 2017 01:25:33 +0100
Subject: [PATCH 0129/1163] NEW: Event notifications in browser

---
 htdocs/core/js/agenda_notification.js.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/js/agenda_notification.js.php b/htdocs/core/js/agenda_notification.js.php
index 4e741a25092..3d2c80a9ab9 100644
--- a/htdocs/core/js/agenda_notification.js.php
+++ b/htdocs/core/js/agenda_notification.js.php
@@ -130,4 +130,4 @@ if(!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['HTT
         });
         time_session += time_auto_update;
     }
-<?php } ?>
+<?php }

From d5120ae7ccda7bc971cadc6e04d119154f49cf85 Mon Sep 17 00:00:00 2001
From: IJ <jawaid_imran@hotmail.com>
Date: Sun, 15 Jan 2017 11:04:32 +0000
Subject: [PATCH 0130/1163] Fix: Add Missing Translation String

When product batch module is disabled, the translation string is missing for dispatch line.
---
 htdocs/langs/en_US/stocks.lang | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index d5fa618b1e0..79842c7b7c7 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -141,4 +141,5 @@ OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a prod
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
 ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
-AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
\ No newline at end of file
+AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
+AddStockLocationLine=Decrease quantity then click to add another warehouse for this product

From 58c25a68a8b62f4f634cb6beedb86dd4a7eadd60 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sun, 15 Jan 2017 18:48:32 +0100
Subject: [PATCH 0131/1163] NEW: Event notifications in browser

---
 htdocs/core/ajax/check_events.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/ajax/check_events.php b/htdocs/core/ajax/check_events.php
index ce52413ceab..03787c92f52 100644
--- a/htdocs/core/ajax/check_events.php
+++ b/htdocs/core/ajax/check_events.php
@@ -30,7 +30,7 @@ session_start();
 $time_update = 60;
 
 if (! empty($conf->global->AGENDA_NOTIFICATION)) {
-    if ($_SESSION['auto_check_events'] <= (int)$time) {
+    if ($_SESSION['auto_check_events'] <= (int) $time) {
         $_SESSION['auto_check_events'] = $time + $time_update;
 
         $eventos = array();

From 7bccaff28abc8192df74434518974dca4daf6c1d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Jan 2017 23:32:14 +0100
Subject: [PATCH 0132/1163] Fix remove warnings

---
 htdocs/core/modules/modFournisseur.class.php | 12 ++---
 htdocs/core/modules/modSociete.class.php     |  8 +--
 htdocs/theme/eldy/style.css.php              | 52 +++++++++++++++++---
 3 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 017ffd1d121..269d4d04a17 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -371,7 +371,7 @@ class modFournisseur extends DolibarrModules
 		// End add extra fields line
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as project on (f.fk_projet = project.rowid)';
@@ -381,7 +381,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture_fourn';
 		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_invoice',1).')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 
 		$r++;
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
@@ -435,7 +435,7 @@ class modFournisseur extends DolibarrModules
 		// End add extra fields object
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as project on (f.fk_projet = project.rowid)';
@@ -444,7 +444,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn as p ON pf.fk_paiementfourn = p.rowid';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
         $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_invoice',1).')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 
 		// Order
 		$r++;
@@ -541,7 +541,7 @@ class modFournisseur extends DolibarrModules
 		// End add extra fields line
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande_fournisseur as f';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as project on (f.fk_projet = project.rowid)';
@@ -553,7 +553,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
 		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_order',1).')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 	}
 
 
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index af4da616ce9..d10e9747d91 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -281,9 +281,9 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as payterm ON s.cond_reglement = payterm.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as paymode ON s.mode_reglement = paymode.id';
 		$this->export_sql_end[$r] .=' WHERE s.entity IN ('.getEntity('societe', 1).')';
-		if(!$user->rights->societe->client->voir) {
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' ';
-			if ($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS) {
+			if (! empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) {
 				$subordinatesids = $user->getAllChildIds();
 				$this->export_sql_end[$r] .=count($subronidatesids)>0 ? ' OR (sc.fk_user IN ('.implode(',',$subronidatesids).')' : '';
 			}
@@ -318,9 +318,9 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON c.fk_pays = co.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = c.rowid';
 		$this->export_sql_end[$r] .=' WHERE c.entity IN ('.getEntity("societe", 1).')';
-		if(!$user->rights->societe->client->voir) {
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' ';
-			if ($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS) {
+			if (! empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) {
 				$subordinatesids = $user->getAllChildIds();
 				$this->export_sql_end[$r] .=count($subronidatesids)>0 ? ' OR (sc.fk_user IN ('.implode(',',$subronidatesids).')' : '';
 			}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a785afa9cfd..52dad786951 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -261,10 +261,22 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     background-color: #FFF;
 }
 
-input:focus, textarea:focus, button:focus, select:focus {
-    box-shadow: 0 0 4px #8091BF;
-    /* TODO Remove shadow on focus. Use instead border-bottom: 1px solid #aaa !important; To disable with select2 too. */
+textarea:focus, button:focus {
+    /* v6 box-shadow: 0 0 4px #8091BF; */
+	border: 1px solid #aaa !important;
 }
+input:focus, select:focus {
+    /* box-shadow: 0 0 4px #8091BF; */
+	border-bottom: 1px solid #666;
+}
+input.select2-input {
+	border-bottom: none ! important;
+}
+.select2-choice {
+	border: none;
+	border-bottom: 1px solid #aaa !important;
+}
+
 textarea.cke_source:focus
 {
 	box-shadow: none;
@@ -273,16 +285,32 @@ textarea.cke_source:focus
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
     font-size: <?php print $fontsize ?>px;
     font-family: <?php print $fontlist ?>;
+    
     border: 1px solid #C0C0C0;
+    /* v6 border: none;
+    border-bottom: 1px solid #C0C0C0;
+    outline: none !important;*/
     margin: 0px 0px 0px 0px;
 }
 
-input, textarea, select {
+input, select {
+	/* v6 border-bottom: solid 1px rgba(0,0,0,.2);*/
 	border-radius: 2px;
-	border:solid 1px rgba(0,0,0,.3);
+	border: solid 1px rgba(0,0,0,.3);
 	border-top:solid 1px rgba(0,0,0,.3);
 	border-bottom:solid 1px rgba(0,0,0,.2);
-	/* box-shadow: 1px 1px 1px rgba(0,0,0,.2) inset;*/
+
+	padding:4px;
+	margin-left:0px;
+	margin-bottom:1px;
+	margin-top:1px;
+	}
+textarea {
+	border-radius: 2px;
+	border: solid 1px rgba(0,0,0,.3);
+	border-top:solid 1px rgba(0,0,0,.3);
+	border-bottom:solid 1px rgba(0,0,0,.2);
+	
 	padding:4px;
 	margin-left:0px;
 	margin-bottom:1px;
@@ -4028,7 +4056,14 @@ div.dataTables_length select {
 	background: #FFFFFF !important;
 }
 
-.select2-choice,
+.select2-choice
+{
+	border: 1px solid #aaa;
+	/* v6 border-top: none !important;
+	border-left: none !important;
+	border-right: none !important;
+	border-bottom: 1px solid #aaa;*/
+}
 .select2-drop.select2-drop-above.select2-drop-active,
 .select2-container-active .select2-choice,
 .select2-container-active .select2-choices,
@@ -4037,6 +4072,7 @@ div.dataTables_length select {
 .select2-container-multi.select2-container-active .select2-choices
 {
 	border: 1px solid #aaa;
+	/* v6 */
 }
 .select2-disabled
 {
@@ -4057,7 +4093,7 @@ a span.select2-chosen
 	line-height: 24px;
 }
 .select2-choices .select2-search-choice {
-  border: 1px solid #aaa !important;
+    /* border: 1px solid #aaa !important; */
 }
 .select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit
 {

From d95ac3bbdd3b4b0f3a3d34ed507033cae2a16cb2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2017 00:16:20 +0100
Subject: [PATCH 0133/1163] Fix warning

---
 htdocs/core/modules/modSociete.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index d10e9747d91..6cf0a6c0278 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -313,7 +313,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'socpeople as c';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON c.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extrasoc ON s.rowid = extrasoc.fk_object';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON c.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON c.fk_pays = co.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = c.rowid';

From 94a180a7755640ffc94fd41f9970cd4c870ffa96 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2017 00:53:59 +0100
Subject: [PATCH 0134/1163] Fix POO best practice

---
 htdocs/compta/bank/class/account.class.php        | 2 +-
 htdocs/societe/class/companybankaccount.class.php | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 73dd2d4f199..0e9b25c39a8 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -662,7 +662,7 @@ class Account extends CommonObject
      *
      *    	@param	User	$user       Object user making action
      *      @param  int     $notrigger  1=Disable triggers
-     *		@return	int					<0 si ko, >0 si ok
+     *		@return	int					<0 if KO, >0 if OK
      */
     function update(User $user = null, $notrigger = 0)
     {
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index e5d5eb5cc8f..46927e7bc64 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -102,10 +102,11 @@ class CompanyBankAccount extends Account
     /**
      *	Update bank account
      *
-     *	@param	User	$user	Object user
-     *	@return	int				<=0 if KO, >0 if OK
+     *	@param	User	$user	     Object user
+     *  @param  int     $notrigger   1=Disable triggers
+     *	@return	int				     <=0 if KO, >0 if OK
      */
-    function update(User $user = null)
+    function update(User $user = null, $notrigger=0)
     {
     	global $conf;
 

From 6bfd534a36ebc274f2b0d2ee520c8571bdfd1068 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2017 01:21:33 +0100
Subject: [PATCH 0135/1163] NEW PHP 7.1 compatibility

---
 htdocs/core/class/commonobject.class.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index db3be3bc4ac..22718e534cc 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3020,9 +3020,16 @@ abstract class CommonObject
 
         foreach ($this->lines as $line)
         {
-
-            $totalOrdered+=$line->qty_asked;    // defined for shipment only
-            $totalToShip+=$line->qty_shipped;   // defined for shipment only
+            if (isset($line->qty_asked))   
+            {
+                if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''
+                $totalOrdered+=$line->qty_asked;    // defined for shipment only
+            }
+            if (isset($line->qty_shipped)) 
+            {
+                if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''
+                $totalToShip+=$line->qty_shipped;   // defined for shipment only
+            }
 
             // Define qty, weight, volume, weight_units, volume_units
             if ($this->element == 'shipping') $qty=$line->qty_shipped;     // for shipments
@@ -3037,8 +3044,11 @@ abstract class CommonObject
             if (! empty($weight_units)) $weightUnit = $weight_units;
             if (! empty($volume_units)) $volumeUnit = $volume_units;
 
+            if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''
+            if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''
+            
             //var_dump($line->volume_units);
-            if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit) > 50 means an exotic unit (like inch)
+            if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
             {
                 $trueWeightUnit=pow(10, $weightUnit);
                 $totalWeight += $weight * $qty * $trueWeightUnit;
@@ -3047,7 +3057,7 @@ abstract class CommonObject
             {
                 $totalWeight += $weight * $qty;   // This may be wrong if we mix different units
             }
-            if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit) > 50 means an exotic unit (like inch)
+            if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
             {
                 //print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
                 $trueVolumeUnit=pow(10, $volumeUnit);

From 6a79a80320524bcbb818a3d203f0507afca32c9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2017 08:50:17 +0100
Subject: [PATCH 0136/1163] Reenable php 7.1

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a9e47ccb9c6..4f32a1dea43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ php:
 - '5.5'
 - '5.6'
 - '7.0'
-#- '7.1'
+- '7.1'
 - nightly
 
 addons:

From f43b3ebda463a59a184779081f81e350470ebacb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2017 09:30:00 +0100
Subject: [PATCH 0137/1163] Fix holiday class

---
 htdocs/holiday/class/holiday.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 78bc1582a65..c51c99ff1ff 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -127,7 +127,8 @@ class Holiday extends CommonObject
         // Check parameters
         if (empty($this->fk_user) || ! is_numeric($this->fk_user) || $this->fk_user < 0) { $this->error="ErrorBadParameter"; return -1; }
         if (empty($this->fk_validator) || ! is_numeric($this->fk_validator) || $this->fk_validator < 0)  { $this->error="ErrorBadParameter"; return -1; }
-
+        if (empty($this->fk_type) || ! is_numeric($this->fk_type) || $this->fk_type < 0) { $this->error="ErrorBadParameter"; return -1; }
+        
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday(";
         $sql.= "fk_user,";
@@ -150,7 +151,7 @@ class Holiday extends CommonObject
         $sql.= " ".$this->halfday.",";
         $sql.= " '1',";
         $sql.= " '".$this->fk_validator."',";
-        $sql.= " '".$this->fk_type."',";
+        $sql.= " ".$this->fk_type.",";
         $sql.= " ".$user->id.",";
         $sql.= " ".$conf->entity;
         $sql.= ")";

From 1b1bab94ca27c7f49eff4b13a57cd75e80a40109 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2017 10:43:22 +0100
Subject: [PATCH 0138/1163] More complete commit for #6114

---
 htdocs/core/modules/modProduct.class.php |   6 +-
 htdocs/product/card.php                  | 104 +++++++++--------------
 htdocs/product/class/product.class.php   |  13 +--
 3 files changed, 48 insertions(+), 75 deletions(-)

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 330349b0842..195b59ed85d 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -151,7 +151,7 @@ class modProduct extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]="Products";	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r]=array(array("produit","export"));
-		$this->export_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref",'p.label'=>"Label",'p.description'=>"Description",'p.url'=>"PublicUrl",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.customcode'=>'CustomCode','p.price_base_type'=>"PriceBase",'p.price'=>"UnitPriceHT",'p.price_ttc'=>"UnitPriceTTC",'p.tva_tx'=>'VATRate','p.tosell'=>"OnSell",'p.tobuy'=>"OnBuy",'p.datec'=>'DateCreation','p.tms'=>'DateModification');
+		$this->export_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref",'p.label'=>"Label",'p.description'=>"Description",'p.url'=>"PublicUrl",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.width'=>"Width",'p.height'=>"Height",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.customcode'=>'CustomCode','p.price_base_type'=>"PriceBase",'p.price'=>"UnitPriceHT",'p.price_ttc'=>"UnitPriceTTC",'p.tva_tx'=>'VATRate','p.tosell'=>"OnSell",'p.tobuy'=>"OnBuy",'p.datec'=>'DateCreation','p.tms'=>'DateModification');
 		if ($mysoc->useNPR()) $this->export_fields_array[$r]['p.recuperableonly']='NPR';
 		if (! empty($conf->stock->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.stock'=>'Stock','p.seuil_stock_alerte'=>'StockLimit','p.desiredstock'=>'DesiredStock','p.pmp'=>'PMPValue'));
 		if (! empty($conf->barcode->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.barcode'=>'BarCode'));
@@ -159,13 +159,13 @@ class modProduct extends DolibarrModules
 		if (! empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.cost_price'=>'CostPrice'));
 		if (! empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('group_concat(cat.label)'=>'Categories'));
 		if (! empty($conf->global->MAIN_MULTILANGS)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel','l.description'=>'TranslatedDescription','l.note'=>'TranslatedNote'));
-		$this->export_TypeFields_array[$r]=array('p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.url'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",'p.note'=>"Text",'p.length'=>"Numeric",'p.surface'=>"Numeric",'p.volume'=>"Numeric",'p.weight'=>"Numeric",'p.customcode'=>'Text','p.price_base_type'=>"Text",'p.price'=>"Numeric",'p.price_ttc'=>"Numeric",'p.tva_tx'=>'Numeric','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",'p.datec'=>'Date','p.tms'=>'Date');
+		$this->export_TypeFields_array[$r]=array('p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.url'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",'p.note'=>"Text",'p.length'=>"Numeric",'p.width'=>"Numeric",'p.height'=>"Numeric",'p.surface'=>"Numeric",'p.volume'=>"Numeric",'p.weight'=>"Numeric",'p.customcode'=>'Text','p.price_base_type'=>"Text",'p.price'=>"Numeric",'p.price_ttc'=>"Numeric",'p.tva_tx'=>'Numeric','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",'p.datec'=>'Date','p.tms'=>'Date');
 		if (! empty($conf->stock->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('p.stock'=>'Numeric','p.seuil_stock_alerte'=>'Numeric','p.desiredstock'=>'Numeric','p.pmp'=>'Numeric','p.cost_price'=>'Numeric'));
 		if (! empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('p.barcode'=>'Text'));
 		if (! empty($conf->fournisseur->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('s.nom'=>'Text','pf.ref_fourn'=>'Text','pf.unitprice'=>'Numeric'));
 		if (! empty($conf->global->MAIN_MULTILANGS)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('l.lang'=>'Text', 'l.label'=>'Text','l.description'=>'Text','l.note'=>'Text'));
 		if (! empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array("group_concat(cat.label)"=>'Text'));
-		$this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",'p.label'=>"product",'p.description'=>"product",'p.url'=>"product",'p.accountancy_code_sell'=>'product','p.accountancy_code_sell'=>'product','p.note'=>"product",'p.length'=>"product",'p.surface'=>"product",'p.volume'=>"product",'p.weight'=>"product",'p.customcode'=>'product','p.price_base_type'=>"product",'p.price'=>"product",'p.price_ttc'=>"product",'p.tva_tx'=>"product",'p.tosell'=>"product",'p.tobuy'=>"product",'p.datec'=>"product",'p.tms'=>"product");
+		$this->export_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
 		if (! empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array("group_concat(cat.label)"=>'category'));
 		if (! empty($conf->stock->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.stock'=>'product','p.pmp'=>'product'));
 		if (! empty($conf->barcode->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.barcode'=>'product'));
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 19e79408e4e..5a7158cd190 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -284,10 +284,8 @@ if (empty($reshook))
             $object->length             	 = GETPOST('size');
             $object->length_units       	 = GETPOST('size_units');
             $object->width               	 = GETPOST('sizewidth');
-            $object->width_units         	 = GETPOST('sizewidth_units');
             $object->height             	 = GETPOST('sizeheight');
-            $object->height_units       	 = GETPOST('sizeheight_units');
-	    $object->surface            	 = GETPOST('surface');
+	        $object->surface            	 = GETPOST('surface');
             $object->surface_units      	 = GETPOST('surface_units');
             $object->volume             	 = GETPOST('volume');
             $object->volume_units       	 = GETPOST('volume_units');
@@ -385,9 +383,7 @@ if (empty($reshook))
                 $object->length                 = GETPOST('size');
                 $object->length_units           = GETPOST('size_units');
                 $object->width               	 = GETPOST('sizewidth');
-                $object->width_units         	 = GETPOST('sizewidth_units');
                 $object->height             	 = GETPOST('sizeheight');
-                $object->height_units       	 = GETPOST('sizeheight_units');
 
                 $object->surface                = GETPOST('surface');
                 $object->surface_units          = GETPOST('surface_units');
@@ -1021,21 +1017,12 @@ else
             // Length
             if (empty($conf->global->PRODUCT_DISABLE_SIZE))
             {
-                print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
-                print '<input name="size" size="4" value="'.GETPOST('size').'">';
+                print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';
+                print '<input name="size" size="4" value="'.GETPOST('size').'"> x ';
+                print '<input name="sizewidth" size="4" value="'.GETPOST('sizewidth').'"> x ';
+                print '<input name="sizeheight" size="4" value="'.GETPOST('sizeheight').'">';
                 print $formproduct->select_measuring_units("size_units","size");
                 print '</td></tr>';
-		    
-                print '<tr><td>'.$langs->trans("Width").'</td><td colspan="3">';
-                print '<input name="sizewidth" size="4" value="'.GETPOST('sizewidth').'">';
-                print $formproduct->select_measuring_units("sizewidth_units","size");
-                print '</td></tr>';
-
-                print '<tr><td>'.$langs->trans("Height").'</td><td colspan="3">';
-                print '<input name="sizeheight" size="4" value="'.GETPOST('sizeheight').'">';
-                print $formproduct->select_measuring_units("sizeheight_units","size");
-                print '</td></tr>';
-
             }
             if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
             {
@@ -1346,21 +1333,13 @@ else
                 print '</td></tr>';
                 if (empty($conf->global->PRODUCT_DISABLE_SIZE))
                 {
-			// Length
-			print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
-			print '<input name="size" size="5" value="'.$object->length.'"> ';
-			print $formproduct->select_measuring_units("size_units", "size", $object->length_units);
-			print '</td></tr>';
-
-			print '<tr><td>'.$langs->trans("Width").'</td><td colspan="3">';
-			print '<input name="sizewidth" size="5" value="'.$object->width.'"> ';
-			print $formproduct->select_measuring_units("sizewidth_units","size", $object->width_units);
-			print '</td></tr>';
-
-			print '<tr><td>'.$langs->trans("Height").'</td><td colspan="3">';
-			print '<input name="sizeheight" size="5" value="'.$object->height.'"> ';
-			print $formproduct->select_measuring_units("sizeheight_units","size", $object->height_units);
-			print '</td></tr>';
+        			// Length
+        			print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';
+        			print '<input name="size" size="5" value="'.$object->length.'">x';
+        			print '<input name="sizewidth" size="5" value="'.$object->width.'">x';
+        			print '<input name="sizeheight" size="5" value="'.$object->height.'"> ';
+        			print $formproduct->select_measuring_units("size_units", "size", $object->length_units);
+        			print '</td></tr>';
                 }
                 if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
                 {
@@ -1370,11 +1349,14 @@ else
                     print $formproduct->select_measuring_units("surface_units", "surface", $object->surface_units);
                     print '</td></tr>';
                 }
-                // Volume
-                print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
-                print '<input name="volume" size="5" value="'.$object->volume.'"> ';
-                print $formproduct->select_measuring_units("volume_units", "volume", $object->volume_units);
-                print '</td></tr>';
+                if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
+                {
+                    // Volume
+                    print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
+                    print '<input name="volume" size="5" value="'.$object->volume.'"> ';
+                    print $formproduct->select_measuring_units("volume_units", "volume", $object->volume_units);
+                    print '</td></tr>';
+                }
             }
         	// Units
 	        if($conf->global->PRODUCT_USE_UNITS)
@@ -1668,32 +1650,19 @@ else
                 if (empty($conf->global->PRODUCT_DISABLE_SIZE))
                 {
                     // Length
-                    print '<tr><td>'.$langs->trans("Length").'</td><td colspan="2">';
-                    if ($object->length != '')
+                    print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="2">';
+                    if ($object->length != '' || $object->width != '' || $object->height != '')
                     {
-                        print $object->length." ".measuring_units_string($object->length_units,"size");
+                        print $object->length;
+                        if ($object->width) print " x ".$object->width;
+                        if ($object->height) print " x ".$object->height;
+                        print ' '.measuring_units_string($object->length_units,"size");
                     }
                     else
                     {
                         print '&nbsp;';
                     }
                     print "</td></tr>\n";
-			
-                    print '<tr><td>'.$langs->trans("Width").'</td><td colspan="2">';
-                    if ($object->width != '') {
-                        print $object->width." ".measuring_units_string($object->width_units,"size");
-                    }
-                    else
-                        print '&nbsp;';
-		    print "</td></tr>\n";
-                    
-		    print '<tr><td>'.$langs->trans("Height").'</td><td colspan="2">';
-                    if ($object->height != '') {
-                        print $object->height." ".measuring_units_string($object->height_units,"size");
-                    }
-                    else
-                        print '&nbsp;';
-		    print "</td></tr>\n";
                 }
                 if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
                 {
@@ -1709,17 +1678,20 @@ else
                     }
                     print "</td></tr>\n";
                 }
-                // Volume
-                print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
-                if ($object->volume != '')
+                if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
                 {
-                    print $object->volume." ".measuring_units_string($object->volume_units,"volume");
+                    // Volume
+                    print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
+                    if ($object->volume != '')
+                    {
+                        print $object->volume." ".measuring_units_string($object->volume_units,"volume");
+                    }
+                    else
+                    {
+                        print '&nbsp;';
+                    }
+                    print "</td></tr>\n";
                 }
-                else
-                {
-                    print '&nbsp;';
-                }
-                print "</td></tr>\n";
             }
 
 			// Unit
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index f7e3881108a..27fb4a4c11c 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -640,15 +640,16 @@ class Product extends CommonObject
 		$this->width_units = trim($this->width_units);
 		$this->height = price2num($this->height);
 		$this->height_units = trim($this->height_units);
+		// set unit not defined
+		if (! $this->width_units && $this->length_units) $this->width_units = $this->length_units;    // Not used yet
+		if (! $this->height_units && $this->length_units) $this->height_units = $this->length_units;    // Not used yet
 		// Automated compute surface and volume if not filled
-		if (empty($this->surface) && !empty($this->length) && !empty($this->width) 
-		    && $this->length_units == $this->with_units  
-		) {
+		if (empty($this->surface) && !empty($this->length) && !empty($this->width) && $this->length_units == $this->width_units)
+		{
 			$this->surface = $this->length * $this->width;
 			$this->surface_units =  $this->width_units;
-			if (empty($this->volume) && !empty($this->height)
-			    && $this->length_units == $this->height_units  
-		   	) {
+			if (empty($this->volume) && !empty($this->height) && $this->length_units == $this->height_units)
+			{
 				$this->volume =  $this->surface * $this->height;
 				$this->volume_units = $this->height_units;
 			}

From fafe71ec52ec29fd3496ba1c554330b57f2eed4b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2017 10:55:33 +0100
Subject: [PATCH 0139/1163] Fix autocalculation of surface and volume.

---
 htdocs/product/class/product.class.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 27fb4a4c11c..1999a6f9c4a 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -641,18 +641,18 @@ class Product extends CommonObject
 		$this->height = price2num($this->height);
 		$this->height_units = trim($this->height_units);
 		// set unit not defined
-		if (! $this->width_units && $this->length_units) $this->width_units = $this->length_units;    // Not used yet
-		if (! $this->height_units && $this->length_units) $this->height_units = $this->length_units;    // Not used yet
+		if ($this->length_units) $this->width_units = $this->length_units;    // Not used yet
+		if ($this->length_units) $this->height_units = $this->length_units;    // Not used yet
 		// Automated compute surface and volume if not filled
 		if (empty($this->surface) && !empty($this->length) && !empty($this->width) && $this->length_units == $this->width_units)
 		{
 			$this->surface = $this->length * $this->width;
-			$this->surface_units =  $this->width_units;
-			if (empty($this->volume) && !empty($this->height) && $this->length_units == $this->height_units)
-			{
-				$this->volume =  $this->surface * $this->height;
-				$this->volume_units = $this->height_units;
-			}
+			$this->surface_units = $this->length_units + $this->width_units;
+		}
+		if (empty($this->volume) && !empty($this->surface_units) && !empty($this->height) && $this->length_units == $this->height_units)
+		{
+			$this->volume =  $this->surface * $this->height;
+			$this->volume_units = $this->surface_units + $this->height_units;
 		}
 		
 		$this->surface = price2num($this->surface);

From 9674bdef54e34e330dd134ca714a11863375bbc5 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Mon, 16 Jan 2017 13:40:57 +0100
Subject: [PATCH 0140/1163] Best directory for img

---
 htdocs/core/js/agenda_notification.js.php  |   2 +-
 htdocs/theme/{eldy/img => common}/bell.png | Bin
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename htdocs/theme/{eldy/img => common}/bell.png (100%)

diff --git a/htdocs/core/js/agenda_notification.js.php b/htdocs/core/js/agenda_notification.js.php
index 3d2c80a9ab9..ad4b8cf1bdf 100644
--- a/htdocs/core/js/agenda_notification.js.php
+++ b/htdocs/core/js/agenda_notification.js.php
@@ -105,7 +105,7 @@ if(!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['HTT
 
                             var title = "<?php print $langs->trans('Agenda') ?>";
                             var extra = {
-                                icon: "<?php print dol_buildpath('/theme/eldy/img/bell.png', 1); ?>",
+                                icon: "<?php print dol_buildpath('/theme/common/bell.png', 1); ?>",
                                 body: body,
                                 tag: value['id']
                             };
diff --git a/htdocs/theme/eldy/img/bell.png b/htdocs/theme/common/bell.png
similarity index 100%
rename from htdocs/theme/eldy/img/bell.png
rename to htdocs/theme/common/bell.png

From e701ea0b2fa3e35c0e5f9565046d2fb77df20f4d Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Mon, 16 Jan 2017 14:06:34 +0100
Subject: [PATCH 0141/1163] Add dictionnary mail for contract

---
 htdocs/admin/dict.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 2ca1337736e..6d8787b1677 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -557,6 +557,7 @@ if ($id == 25)
 	if ($conf->fournisseur->enabled) $elementList['order_supplier_send']=$langs->trans('MailToSendSupplierOrder');
 	if ($conf->fournisseur->enabled) $elementList['invoice_supplier_send']=$langs->trans('MailToSendSupplierInvoice');
 	if ($conf->societe->enabled) $elementList['thirdparty']=$langs->trans('MailToThirdparty');
+	if ($conf->contrat->enabled) $elementList['contract']=$langs->trans('MailToSendContract');
 
 	$parameters=array('elementList'=>$elementList);
 	$reshook=$hookmanager->executeHooks('emailElementlist',$parameters);    // Note that $action and $object may have been modified by some hooks

From c0a8752ef4fa9ffe1710046eaa463c3b912fd16a Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Mon, 16 Jan 2017 14:17:38 +0100
Subject: [PATCH 0142/1163] Update card.php

---
 htdocs/contrat/card.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 3128a7612f5..daae2aa8c36 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2111,13 +2111,13 @@ else
 					dol_print_error($db, $object->error, $object->errors);
 					exit();
 				}
-				$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+				$fileparams = dol_most_recent_file($conf->contrat->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
 				$file = $fileparams['fullname'];
 			}
 
 			print '<div class="clearboth"></div>';
 			print '<br>';
-			print load_fiche_titre($langs->trans('SendOrderByMail'));
+			print load_fiche_titre($langs->trans('SendContractByMail'));
 
 			dol_fiche_head('');
 
@@ -2145,9 +2145,9 @@ else
 			$formmail->withtocc = $liste;
 			$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
 			if (empty($object->ref_client)) {
-				$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
+				$formmail->withtopic = $outputlangs->trans('SendContractRef', '__CONTRACTREF__');
 			} else if (! empty($object->ref_client)) {
-				$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
+				$formmail->withtopic = $outputlangs->trans('SendContractRef', '__CONTRACTREF__ (__REFCLIENT__)');
 			}
 			$formmail->withfile = 2;
 			$formmail->withbody = 1;
@@ -2155,7 +2155,7 @@ else
 			$formmail->withcancel = 1;
 			// Tableau des substitutions
 			$formmail->setSubstitFromObject($object);
-			$formmail->substit ['__ORDERREF__'] = $object->ref;
+			$formmail->substit ['__CONTRACTREF__'] = $object->ref;
 
 			$custcontact = '';
 			$contactarr = array();
@@ -2165,7 +2165,7 @@ else
 			{
 				foreach ($contactarr as $contact)
 				{
-					if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
+					if ($contact['libelle'] == $langs->trans('TypeContact_contract_external_CUSTOMER')) {	// TODO Use code and not label
 						$contactstatic = new Contact($db);
 						$contactstatic->fetch($contact ['id']);
 						$custcontact = $contactstatic->getFullName($langs, 1);
@@ -2179,9 +2179,9 @@ else
 
 			// Tableau des parametres complementaires
 			$formmail->param['action'] = 'send';
-			$formmail->param['models'] = 'order_send';
+			$formmail->param['models'] = 'contract_send';
 			$formmail->param['models_id']=GETPOST('modelmailselected','int');
-			$formmail->param['orderid'] = $object->id;
+			$formmail->param['contractid'] = $object->id;
 			$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
 
 			// Init list of files

From 2525a6e3a4c07838a5a3f8898f83c2f45ba0f773 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 16 Jan 2017 17:24:50 +0100
Subject: [PATCH 0143/1163] update code for next php versions

---
 .../commande/doc/pdf_einstein.modules.php     | 56 +++++++++++++------
 1 file changed, 40 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 3f3b072de34..f58d7ab496d 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -40,23 +40,47 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_einstein extends ModelePDFCommandes
 {
-    var $db;
-    var $name;
-    var $description;
-    var $type;
+    /**
+     * @var DoliDb Database handler
+     */
+    public $db;
+	
+	/**
+     * @var string model name
+     */
+    public $name;
+	
+	/**
+     * @var string model description (short text)
+     */
+    public $description;
+	
+	/**
+     * @var string document type
+     */
+    public $type;
+	
+	/**
+     * @var array() Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.3 = array(5, 3)
+     */
+	public $phpmin = array(5, 2); 
+	
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
+	public $version = 'dolibarr';
 
-    var $phpmin = array(4,3,0); // Minimum version of PHP required by module
-    var $version = 'dolibarr';
+    public $page_largeur;
+    public $page_hauteur;
+    public $format;
+	public $marge_gauche;
+	public $marge_droite;
+	public $marge_haute;
+	public $marge_basse;
 
-    var $page_largeur;
-    var $page_hauteur;
-    var $format;
-	var $marge_gauche;
-	var	$marge_droite;
-	var	$marge_haute;
-	var	$marge_basse;
-
-    var $emetteur;	// Objet societe qui emet
+    public $emetteur;	// Objet societe qui emet
 
 
 	/**
@@ -64,7 +88,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function __construct($db)
+	public function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 

From 6dbb3efc894f0738a351e28627a4b5bb156752f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 16 Jan 2017 20:24:26 +0100
Subject: [PATCH 0144/1163] NEW #6280: Generate PDF after creating an invoice
 from a customer order

Close #6280
---
 htdocs/compta/facture.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 91267578197..36dce43f5f3 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1291,6 +1291,25 @@ if (empty($reshook))
 		if ($id > 0 && ! $error)
 		{
 			$db->commit();
+
+			// Define output language
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && count($object->lines))
+			{
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (! empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model=$object->modelpdf;
+				$ret = $object->fetch($id); // Reload to get new records
+
+				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+			}
+
 			header('Location: ' . $_SERVER["PHP_SELF"] . '?facid=' . $id);
 			exit();
 		}

From e0cbcadd98a0759e5c4d6bf9a71c2bb0b2253a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 16 Jan 2017 21:16:05 +0100
Subject: [PATCH 0145/1163] In case Model for document generation is not
 defined, the criteria to select the model is now:  1. Model for the object 
 2. Custom default module  3. Hardcoded default module

---
 htdocs/adherents/class/adherent.class.php     | 22 +++++++++----------
 htdocs/comm/propal/class/propal.class.php     | 16 ++++++--------
 htdocs/commande/class/commande.class.php      | 16 ++++++--------
 htdocs/compta/facture/class/facture.class.php | 20 +++++++----------
 htdocs/contrat/class/contrat.class.php        | 18 +++++++--------
 htdocs/expedition/class/expedition.class.php  | 16 ++++++--------
 .../class/expensereport.class.php             | 22 +++++++++----------
 .../class/fournisseur.commande.class.php      | 18 +++++++--------
 htdocs/livraison/class/livraison.class.php    | 16 ++++++--------
 htdocs/projet/class/project.class.php         | 16 ++++++--------
 htdocs/projet/class/task.class.php            | 16 ++++++--------
 .../class/supplier_proposal.class.php         | 18 +++++++--------
 12 files changed, 94 insertions(+), 120 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 945ed849f57..22510aed411 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1818,18 +1818,16 @@ class Adherent extends CommonObject
     
         $langs->load("orders");
     
-        // Positionne le modele sur le nom du modele a utiliser
-        if (! dol_strlen($modele))
-        {
-            if (! empty($conf->global->ADHERENT_ADDON_PDF))
-            {
-                $modele = $conf->global->ADHERENT_ADDON_PDF;
-            }
-            else
-            {
-                $modele = 'standard';
-            }
-        }
+	    if (! dol_strlen($modele)) {
+
+		    $modele = 'standard';
+
+		    if ($this->modelpdf) {
+			    $modele = $this->modelpdf;
+		    } elseif (! empty($conf->global->ADHERENT_ADDON_PDF)) {
+			    $modele = $conf->global->ADHERENT_ADDON_PDF;
+		    }
+	    }
     
         $modelpath = "core/modules/member/doc/";
     
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index f10d82fdbfa..cf42fe3c33f 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3434,17 +3434,15 @@ class Propal extends CommonObject
 
 		$langs->load("propale");
 
-		// Positionne le modele sur le nom du modele a utiliser
-		if (! dol_strlen($modele))
-		{
-			if (! empty($conf->global->PROPALE_ADDON_PDF))
-			{
+		if (! dol_strlen($modele)) {
+
+			$modele = 'azur';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->PROPALE_ADDON_PDF)) {
 				$modele = $conf->global->PROPALE_ADDON_PDF;
 			}
-			else
-			{
-				$modele = 'azur';
-			}
 		}
 
 		$modelpath = "core/modules/propale/doc/";
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 1f75e6caf74..1cd706c1863 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3641,17 +3641,15 @@ class Commande extends CommonOrder
 
 		$langs->load("orders");
 
-		// Positionne le modele sur le nom du modele a utiliser
-		if (! dol_strlen($modele))
-		{
-			if (! empty($conf->global->COMMANDE_ADDON_PDF))
-			{
+		if (! dol_strlen($modele)) {
+
+			$modele = 'einstein';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->COMMANDE_ADDON_PDF)) {
 				$modele = $conf->global->COMMANDE_ADDON_PDF;
 			}
-			else
-			{
-				$modele = 'einstein';
-			}
 		}
 
 		$modelpath = "core/modules/commande/doc/";
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 67f58ac9875..aef95d1b0a9 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3967,24 +3967,20 @@ class Facture extends CommonInvoice
 
 		$langs->load("bills");
 
-		// Positionne le modele sur le nom du modele a utiliser
-		if (! dol_strlen($modele))
-		{
-			if (! empty($conf->global->FACTURE_ADDON_PDF))
-			{
+		if (! dol_strlen($modele)) {
+
+			$modele = 'crabe';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->FACTURE_ADDON_PDF)) {
 				$modele = $conf->global->FACTURE_ADDON_PDF;
 			}
-			else
-			{
-				$modele = 'crabe';
-			}
 		}
 
 		$modelpath = "core/modules/facture/doc/";
 
-		$result=$this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-
-		return $result;
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
 	/**
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 202a3dc2a0d..a8ad3390db3 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2199,21 +2199,19 @@ class Contrat extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 	{
-		global $conf,$user,$langs;
+		global $conf,$langs;
 
 		$langs->load("contracts");
 
-		// Positionne le modele sur le nom du modele a utiliser
-		if (! dol_strlen($modele))
-		{
-			if (! empty($conf->global->CONTRACT_ADDON_PDF))
-			{
+		if (! dol_strlen($modele)) {
+
+			$modele = 'strato';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->CONTRACT_ADDON_PDF)) {
 				$modele = $conf->global->CONTRACT_ADDON_PDF;
 			}
-			else
-			{
-				$modele = 'strato';
-			}
 		}
 
 		$modelpath = "core/modules/contract/doc/";
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 971a2189854..99d81852734 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2162,17 +2162,15 @@ class Expedition extends CommonObject
 
 		$langs->load("sendings");
 
-		// Sets the model on the model name to use
-		if (! dol_strlen($modele))
-		{
-			if (! empty($conf->global->EXPEDITION_ADDON_PDF))
-			{
+		if (! dol_strlen($modele)) {
+
+			$modele = 'rouget';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->EXPEDITION_ADDON_PDF)) {
 				$modele = $conf->global->EXPEDITION_ADDON_PDF;
 			}
-			else
-			{
-				$modele = 'rouget';
-			}
 		}
 
 		$modelpath = "core/modules/expedition/doc/";
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 0a858cda257..d21e04cc37f 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1573,18 +1573,16 @@ class ExpenseReport extends CommonObject
 
         $langs->load("trips");
 
-        // Positionne le modele sur le nom du modele a utiliser
-        if (! dol_strlen($modele))
-        {
-            if (! empty($conf->global->EXPENSEREPORT_ADDON_PDF))
-            {
-                $modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
-            }
-            else
-            {
-                $modele = 'standard';
-            }
-        }
+	    if (! dol_strlen($modele)) {
+
+		    $modele = 'standard';
+
+		    if ($this->modelpdf) {
+			    $modele = $this->modelpdf;
+		    } elseif (! empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
+			    $modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
+		    }
+	    }
 
         $modelpath = "core/modules/expensereport/doc/";
 
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 15939384670..a4eda5ec81e 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2686,21 +2686,19 @@ class CommandeFournisseur extends CommonOrder
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 	{
-		global $conf, $user, $langs;
+		global $conf, $langs;
 
 		$langs->load("suppliers");
 
-		// Sets the model on the model name to use
-		if (! dol_strlen($modele))
-		{
-			if (! empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF))
-			{
+		if (! dol_strlen($modele)) {
+
+			$modele = 'muscadet';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)) {
 				$modele = $conf->global->COMMANDE_SUPPLIER_ADDON_PDF;
 			}
-			else
-			{
-				$modele = 'muscadet';
-			}
 		}
 
 		$modelpath = "core/modules/supplier_order/pdf/";
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 15421a8a367..3a18abf2cbb 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -1009,17 +1009,15 @@ class Livraison extends CommonObject
 
 		$langs->load("deliveries");
 
-		// Positionne modele sur le nom du modele de bon de livraison a utiliser
-		if (! dol_strlen($modele))
-		{
-			if (! empty($conf->global->LIVRAISON_ADDON_PDF))
-			{
+		if (! dol_strlen($modele)) {
+
+			$modele = 'typhon';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->LIVRAISON_ADDON_PDF)) {
 				$modele = $conf->global->LIVRAISON_ADDON_PDF;
 			}
-			else
-			{
-				$modele = 'typhon';
-			}
 		}
 
 		$modelpath = "core/modules/livraison/doc/";
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 460e698e432..65c4e6bc94c 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1569,17 +1569,15 @@ class Project extends CommonObject
 
 		$langs->load("projects");
 
-		// Positionne modele sur le nom du modele de projet a utiliser
-		if (! dol_strlen($modele))
-		{
-			if (! empty($conf->global->PROJECT_ADDON_PDF))
-			{
+		if (! dol_strlen($modele)) {
+
+			$modele = 'baleine';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->PROJECT_ADDON_PDF)) {
 				$modele = $conf->global->PROJECT_ADDON_PDF;
 			}
-			else
-			{
-				$modele='baleine';
-			}
 		}
 
 		$modelpath = "core/modules/project/doc/";
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index ec180704563..fe50be6e521 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1619,17 +1619,15 @@ class Task extends CommonObject
 
 		$langs->load("projects");
 
-		// Positionne modele sur le nom du modele de projet a utiliser
-		if (! dol_strlen($modele))
-		{
-			if (! empty($conf->global->PROJECT_TASK_ADDON_PDF))
-			{
+		if (! dol_strlen($modele)) {
+
+			$modele = 'nodefault';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->PROJECT_TASK_ADDON_PDF)) {
 				$modele = $conf->global->PROJECT_TASK_ADDON_PDF;
 			}
-			else
-			{
-				$modele='nodefault';
-			}
 		}
 
 		$modelpath = "core/modules/project/task/doc/";
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 53e7bf8ad34..5d2d5aad783 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2510,21 +2510,19 @@ class SupplierProposal extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 	{
-		global $conf,$user,$langs;
+		global $conf, $langs;
 
 		$langs->load("supplier_proposal");
 
-		// Positionne le modele sur le nom du modele a utiliser
-		if (! dol_strlen($modele))
-		{
-			if (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF))
-			{
+		if (! dol_strlen($modele)) {
+
+			$modele = 'aurore';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF)) {
 				$modele = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF;
 			}
-			else
-			{
-				$modele = 'aurore';
-			}
 		}
 
 		$modelpath = "core/modules/supplier_proposal/doc/";

From 0f6cb52376663f5104aa4ed821336375a4fb0074 Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Mon, 16 Jan 2017 17:40:13 -0300
Subject: [PATCH 0146/1163] Improve code style

Replace var for public and private.
---
 htdocs/core/class/html.formother.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 4ac3eb99c50..9cb402cfc89 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -37,8 +37,8 @@
  */
 class FormOther
 {
-    var $db;
-    var $error;
+    private $db;
+    public $error;
 
 
     /**

From 8225b060186bb7809e3fa7689c58610750896bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 16 Jan 2017 21:59:02 +0100
Subject: [PATCH 0147/1163] NEW Removed commande_pdf_create,
 contract_pdf_create,expedition_pdf_create, facture_pdf_create,
 delivery_order_pdf_create, task_pdf_create, project_pdf_create,
 propale_pdf_create, supplier_invoice_pdf_create, supplier_order_pdf_create,
 supplier_proposal_pdf_create deprecated functions

---
 .../modules/commande/modules_commande.php     | 24 +-----
 .../modules/contract/modules_contract.php     | 21 -----
 .../modules/expedition/modules_expedition.php | 21 -----
 .../core/modules/facture/modules_facture.php  | 23 ------
 .../modules/livraison/modules_livraison.php   | 21 -----
 .../core/modules/project/modules_project.php  | 23 ------
 .../modules/project/task/modules_task.php     | 24 ------
 .../core/modules/propale/modules_propale.php  | 23 ------
 .../modules/societe/modules_societe.class.php | 77 -------------------
 .../modules_facturefournisseur.php            | 19 -----
 .../modules_commandefournisseur.php           | 23 ------
 .../modules_supplier_proposal.php             | 23 ------
 12 files changed, 1 insertion(+), 321 deletions(-)

diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php
index 45623575ba4..aa6da728f56 100644
--- a/htdocs/core/modules/commande/modules_commande.php
+++ b/htdocs/core/modules/commande/modules_commande.php
@@ -146,26 +146,4 @@ abstract class ModeleNumRefCommandes
 		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
-}
-
-
-/**
- *  Create a document onto disk accordign to template module.
- *
- *  @param	    DoliDB		$db  			Database handler
- *  @param	    Commande		$object			Object order
- *  @param	    string		$modele			Force le modele a utiliser ('' to not force)
- *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
- *  @param      int			$hidedetails    Hide details of lines
- *  @param      int			$hidedesc       Hide description
- *  @param      int			$hideref        Hide ref
- *  @return     int         				0 if KO, 1 if OK
- *  @deprecated Use the new function generateDocument of Commande class
- *  @see Commande::generateDocument()
- */
-function commande_pdf_create(DoliDB $db, Commande $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
-{
-	dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
-
-	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-}
+}
\ No newline at end of file
diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php
index 1efeaef3466..47a882b7b56 100644
--- a/htdocs/core/modules/contract/modules_contract.php
+++ b/htdocs/core/modules/contract/modules_contract.php
@@ -143,24 +143,3 @@ class ModelNumRefContracts
 		return $langs->trans("NotAvailable");
 	}
 }
-
-/**
- *  Create a contract document on disk using template defined into CONTRACT_ADDON_PDF
- *
- *  @param	DoliDB		$db  			objet base de donnee
- *  @param	Contrat		$object			Object contract
- *  @param	string		$modele			force le modele a utiliser ('' par defaut)
- *  @param	Translate	$outputlangs	objet lang a utiliser pour traduction
- *  @param  int			$hidedetails    Hide details of lines
- *  @param  int			$hidedesc       Hide description
- *  @param  int			$hideref        Hide ref
- *  @return int         				0 if KO, 1 if OK
- * @deprecated Use the new function generateDocument of Contrat class
- * @see Contrat::generateDocument()
- */
-function contract_pdf_create(DoliDB $db, Contrat $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
-{
-	dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
-
-	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-}
diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php
index 335491c0f9d..f46fa33c5f1 100644
--- a/htdocs/core/modules/expedition/modules_expedition.php
+++ b/htdocs/core/modules/expedition/modules_expedition.php
@@ -141,24 +141,3 @@ abstract class ModelNumRefExpedition
 		return $langs->trans("NotAvailable");
 	}
 }
-
-/**
- * 	Create a document onto disk according to template module.
- *
- * 	@param		DoliDB		$db  			Objet base de donnee
- * 	@param		Expedition		$object			Object expedition
- * 	@param		string		$modele			Force le modele a utiliser ('' to not force)
- * 	@param		Translate	$outputlangs	Objet lang a utiliser pour traduction
- *  @param      int			$hidedetails    Hide details of lines
- *  @param      int			$hidedesc       Hide description
- *  @param      int			$hideref        Hide ref
- * 	@return 	int 						1 if OK -1 if KO
- * 	@deprecated Use the new function generateDocument of Expedition class
- * @see Expedition::generateDocument()
- */
-function expedition_pdf_create(DoliDB $db, Expedition $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
-{
-	dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
-
-	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-}
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index 23d55d0aa96..b5d9a2397cc 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -142,26 +142,3 @@ abstract class ModeleNumRefFactures
 		return $langs->trans("NotAvailable");
 	}
 }
-
-
-/**
- *  Create a document onto disk according to template module.
- *
- *	@param	DoliDB		$db  			Database handler
- *	@param  Facture		$object			Object invoice
- *	@param	string		$modele			Force template to use ('' to not force)
- *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction
- *  @param  int			$hidedetails    Hide details of lines
- *  @param  int			$hidedesc       Hide description
- *  @param  int			$hideref        Hide ref
- *	@return int        					<0 if KO, >0 if OK
- *  @deprecated Use the new function generateDocument of Facture class
- *  @see Facture::generateDocument()
- */
-function facture_pdf_create(DoliDB $db, Facture $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
-{
-	dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
-
-	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-}
-
diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php
index c3c762cbed1..a433f42930d 100644
--- a/htdocs/core/modules/livraison/modules_livraison.php
+++ b/htdocs/core/modules/livraison/modules_livraison.php
@@ -144,24 +144,3 @@ abstract class ModeleNumRefDeliveryOrder
 		return $langs->trans("NotAvailable");
 	}
 }
-
-
-
-/**
- *	Create object on disk
- *
- *	@param	DoliDB		$db  			objet base de donnee
- *	@param	Livraison		$object			object delivery
- *	@param	string		$modele			force le modele a utiliser ('' to not force)
- *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction
- *  @return int         				0 if KO, 1 if OK
- * @deprecated Use the new function generateDocument of Livraison class
- * @see Livraison::generateDocument()
- */
-function delivery_order_pdf_create(DoliDB $db, Livraison $object, $modele, $outputlangs='')
-{
-	dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
-
-	return $object->generateDocument($modele, $outputlangs);
-}
-
diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php
index acc1c2738f4..5f7ef3d5756 100644
--- a/htdocs/core/modules/project/modules_project.php
+++ b/htdocs/core/modules/project/modules_project.php
@@ -139,26 +139,3 @@ abstract class ModeleNumRefProjects
 		return $langs->trans("NotAvailable");
 	}
 }
-
-
-/**
- *  Create an intervention document on disk using template defined into PROJECT_ADDON_PDF
- *
- *  @param	DoliDB		$db  			objet base de donnee
- *  @param	Project		$object			Object fichinter
- *  @param	string		$modele			force le modele a utiliser ('' par defaut)
- *  @param	Translate	$outputlangs	objet lang a utiliser pour traduction
- *  @param  int			$hidedetails    Hide details of lines
- *  @param  int			$hidedesc       Hide description
- *  @param  int			$hideref        Hide ref
- *  @return int         				0 if KO, 1 if OK
- * @deprecated Use the new function generateDocument of Project class
- * @see Project::generateDocument()
- */
-function project_pdf_create(DoliDB $db, Project $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
-{
-	dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
-
-	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-}
-
diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php
index bea4d342e29..7d14ae12a3e 100644
--- a/htdocs/core/modules/project/task/modules_task.php
+++ b/htdocs/core/modules/project/task/modules_task.php
@@ -139,27 +139,3 @@ abstract class ModeleNumRefTask
 		return $langs->trans("NotAvailable");
 	}
 }
-
-
-/**
- *  Create an intervention document on disk using template defined into PROJECT_TASK_ADDON_PDF
- *
- *  @param	DoliDB		$db  			objet base de donnee
- *  @param	Task		$object			Object fichinter
- *  @param	string		$modele			force le modele a utiliser ('' par defaut)
- *  @param	Translate	$outputlangs	objet lang a utiliser pour traduction
- *  @param  int			$hidedetails    Hide details of lines
- *  @param  int			$hidedesc       Hide description
- *  @param  int			$hideref        Hide ref
- *  @param  HookManager	$hookmanager	Hook manager instance
- *  @return int         				0 if KO, 1 if OK
- * @deprecated Use the new function generateDocument of Task class
- * @see Task::generateDocument()
- */
-function task_pdf_create(DoliDB $db, Task $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
-{
-	dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
-
-	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
-}
-
diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
index 6c0be15f0df..c2d52923e4f 100644
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -143,26 +143,3 @@ abstract class ModeleNumRefPropales
 		return $langs->trans("NotAvailable");
 	}
 }
-
-
-/**
- *  Create a document onto disk according to template module.
- *
- * 	@param	    DoliDB		$db  			Database handler
- * 	@param	    Propal		$object			Object proposal
- * 	@param	    string		$modele			Force model to use ('' to not force)
- * 	@param		Translate	$outputlangs	Object langs to use for output
- *  @param      int			$hidedetails    Hide details of lines
- *  @param      int			$hidedesc       Hide description
- *  @param      int			$hideref        Hide ref
- * 	@return     int         				0 if KO, 1 if OK
- * @deprecated Use the new function generateDocument of Propal class
- * @see Propal::generateDocument()
- */
-function propale_pdf_create(DoliDB $db, Propal $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
-{
-	dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
-
-	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-}
-
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index 63208b1369c..0ed5eace2e2 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -384,80 +384,3 @@ function thirdparty_doc_create(DoliDB $db, Societe $object, $message, $modele, $
 
 	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }
-
-
-/**
- *	Create a document for third party
- *
- *	@param	DoliDB		$db  			Database handler
- *	@param  Societe		$object			Object of third party to use
- *	@param	string		$message		Message
- *	@param	string		$modele			Force model to use ('' to not force). model can be a model name or a template file.
- *	@param	Translate	$outputlangs	Object lang to use for translation
- *	@return int        					<0 if KO, >0 if OK
- */
-/*function thirdparty_doc_create($db, $object, $message, $modele, $outputlangs)
-{
-    global $conf,$langs,$user;
-    $langs->load("bills");
-	$error=0;
-
-    $dir = DOL_DOCUMENT_ROOT . "/core/modules/societe/doc";
-    $srctemplatepath='';
-
-    // Positionne modele sur le nom du modele a utiliser
-    if (! dol_strlen($modele))
-    {
-        if (! empty($conf->global->COMPANY_ADDON_PDF))
-        {
-            $modele = $conf->global->COMPANY_ADDON_PDF;
-        }
-        else
-        {
-            print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
-            return 0;
-        }
-    }
-
-    // If selected modele is a filename template (then $modele="modelname:filename")
-    $tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
-    {
-        $modele=$tmp[0];
-        $srctemplatepath=$tmp[1];
-    }
-
-    // Search template
-    $file = "doc_".$modele.".modules.php";
-    if (file_exists($dir.'/'.$file))
-    {
-        $classname = "doc_".$modele;
-        require_once $dir.'/'.$file;
-
-        $obj = new $classname($db);
-
-        // We save charset_output to restore it because write_file can change it if needed for
-        // output format that does not support UTF8.
-        $sav_charset_output=$outputlangs->charset_output;
-        if ($obj->write_file($object, $outputlangs, $srctemplatepath) > 0)
-        {
-            $outputlangs->charset_output=$sav_charset_output;
-
-            return 1;
-        }
-        else
-        {
-            $outputlangs->charset_output=$sav_charset_output;
-            dol_print_error($db,"thirdparty_doc_create Error: ".$obj->error);
-            return -1;
-        }
-
-    }
-    else
-    {
-        dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$dir.'/'.$file));
-        return -1;
-    }
-}
-*/
-
diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
index aebc7aa008a..7762d8ce6a5 100644
--- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
@@ -135,22 +135,3 @@ abstract class ModeleNumRefSuppliersInvoices
 		return $langs->trans("NotAvailable");
 	}
 }
-
-/**
- *	Create a document onto disk according to template model.
- *
- *	@param	    DoliDB		$db  			Database handler
- *	@param	    Object		$object			Object supplier invoice
- *	@param	    string		$modele			Force template to use ('' to not force)
- *	@param		Translate	$outputlangs	Object lang a utiliser pour traduction
- *  @param      int			$hidedetails    Hide details of lines
- *  @param      int			$hidedesc       Hide description
- *  @param      int			$hideref        Hide ref
- *  @return     int         				0 if KO, 1 if OK
- *
- */
-function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
-{
-	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-}
-
diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
index bd34ca86b20..4bd262d67fb 100644
--- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
@@ -137,26 +137,3 @@ abstract class ModeleNumRefSuppliersOrders
 		return $langs->trans("NotAvailable");
 	}
 }
-
-
-/**
- *  Create a document onto disk according to template model.
- *
- *  @param	    DoliDB		$db  			Database handler
- *  @param	    CommandeFournisseur		$object			Object supplier order
- *  @param	    string		$modele			Force template to use ('' to not force)
- *  @param		Translate	$outputlangs	Object lang to use for traduction
- *  @param      int			$hidedetails    Hide details of lines
- *  @param      int			$hidedesc       Hide description
- *  @param      int			$hideref        Hide ref
- *  @return     int          				0 if KO, 1 if OK
- * @deprecated Use the new function generateDocument of CommandeFournisseur class
- * @see CommandeFournisseur::generateDocument()
- */
-function supplier_order_pdf_create(DoliDB $db, CommandeFournisseur $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
-{
-	dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
-
-	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-}
-
diff --git a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
index 715dc294d91..b324a1b03a8 100644
--- a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
+++ b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
@@ -143,26 +143,3 @@ abstract class ModeleNumRefSupplierProposal
 		return $langs->trans("NotAvailable");
 	}
 }
-
-
-/**
- *  Create a document onto disk according to template module.
- *
- * 	@param	    DoliDB		$db  			Database handler
- * 	@param	    SupplierProposal		$object			Object supplier_proposal
- * 	@param	    string		$modele			Force model to use ('' to not force)
- * 	@param		Translate	$outputlangs	Object langs to use for output
- *  @param      int			$hidedetails    Hide details of lines
- *  @param      int			$hidedesc       Hide description
- *  @param      int			$hideref        Hide ref
- * 	@return     int         				0 if KO, 1 if OK
- * @deprecated Use the new function generateDocument of SupplierProposal class
- * @see SupplierProposal::generateDocument()
- */
-function supplier_proposal_pdf_create(DoliDB $db, SupplierProposal $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
-{
-	dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
-
-	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-}
-

From 819dc44533503046179eba1ab95e5742164bb0dd Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Tue, 17 Jan 2017 10:01:59 +0100
Subject: [PATCH 0148/1163] Fix: Show correct bank account order

---
 htdocs/societe/rib.php | 74 ++++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 8a6a9b87209..8d28f144c78 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Peter Fontaine       <contact@peterfontaine.fr>
  * Copyright (C) 2015-2016 Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2017      Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -94,13 +95,13 @@ if (empty($reshook))
     	if (! GETPOST('label'))
     	{
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-    		$action='update';
+    		$action='edit';
     		$error++;
     	}
     	if (! GETPOST('bank'))
     	{
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
-    		$action='update';
+    		$action='edit';
     		$error++;
     	}
     	if ($account->needIBAN() == 1)
@@ -108,13 +109,13 @@ if (empty($reshook))
     		if (! GETPOST('iban'))
     		{
     			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
-    			$action='update';
+    			$action='edit';
     			$error++;
     		}
     		if (! GETPOST('bic'))
     		{
     			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
-    			$action='update';
+    			$action='edit';
     			$error++;
     		}
     	}
@@ -809,41 +810,42 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
     print '<tr><td class="fieldrequired">'.$langs->trans("Bank").'</td>';
     print '<td><input size="30" type="text" name="bank" value="'.GETPOST('bank').'"></td></tr>';
 
-    // BBAN
-    if ($account->useDetailedBBAN() == 1)
-    {
-        print '<tr><td>'.$langs->trans("BankCode").'</td>';
-        print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.GETPOST('code_banque').'"></td>';
-        print '</tr>';
+    // Show fields of bank account
+    foreach ($account->getFieldsToShow(1) as $val) {
 
-        print '<tr><td>'.$langs->trans("DeskCode").'</td>';
-        print '<td><input size="8" type="text" class="flat" name="code_guichet" value="'.GETPOST('code_guichet').'"></td>';
+        $require=false;
+        if ($val == 'BankCode') {
+            $name = 'code_banque';
+            $size = 8;
+            $content = $account->code_banque;
+        } elseif ($val == 'DeskCode') {
+            $name = 'code_guichet';
+            $size = 8;
+            $content = $account->code_guichet;
+        } elseif ($val == 'BankAccountNumber') {
+            $name = 'number';
+            $size = 18;
+            $content = $account->number;
+        } elseif ($val == 'BankAccountNumberKey') {
+            $name = 'cle_rib';
+            $size = 3;
+            $content = $account->cle_rib;
+        } elseif ($val == 'IBAN') {
+            $name = 'iban';
+            $size = 30;
+            $content = $account->iban;
+            if ($account->needIBAN()) $require=true;
+        } elseif ($val == 'BIC') {
+            $name = 'bic';
+            $size = 12;
+            $content = $account->bic;
+            if ($account->needIBAN()) $require=true;
+        }
+
+        print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
+        print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.$content.'"></td>';
         print '</tr>';
     }
-    if ($account->useDetailedBBAN() == 2)
-    {
-        print '<tr><td>'.$langs->trans("BankCode").'</td>';
-        print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.GETPOST('code_banque').'"></td>';
-        print '</tr>';
-    }
-
-    print '<td>'.$langs->trans("BankAccountNumber").'</td>';
-    print '<td><input size="15" type="text" class="flat" name="number" value="'.GETPOST('number').'"></td>';
-    print '</tr>';
-
-    if ($account->useDetailedBBAN() == 1)
-    {
-        print '<td>'.$langs->trans("BankAccountNumberKey").'</td>';
-        print '<td><input size="3" type="text" class="flat" name="cle_rib" value="'.GETPOST('value').'"></td>';
-        print '</tr>';
-    }
-
-    // IBAN
-    print '<tr><td'.($account->needIBAN()?' class="fieldrequired" ':'').'>'.$langs->trans("IBAN").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="iban" value="'.GETPOST('iban').'"></td></tr>';
-
-    print '<tr><td'.($account->needIBAN()?' class="fieldrequired" ':'').'>'.$langs->trans("BIC").'</td>';
-    print '<td colspan="4"><input size="12" type="text" name="bic" value="'.GETPOST('bic').'"></td></tr>';
 
     print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
     print '<textarea name="domiciliation" rows="4" cols="40" maxlength="255">';

From caba4836b3b373afc8eae644439a35c236f71f9a Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Tue, 17 Jan 2017 10:13:13 +0100
Subject: [PATCH 0149/1163] Fix: Show correct bank account order

---
 htdocs/societe/rib.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 8d28f144c78..495a3c06518 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -817,33 +817,27 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
         if ($val == 'BankCode') {
             $name = 'code_banque';
             $size = 8;
-            $content = $account->code_banque;
         } elseif ($val == 'DeskCode') {
             $name = 'code_guichet';
             $size = 8;
-            $content = $account->code_guichet;
         } elseif ($val == 'BankAccountNumber') {
             $name = 'number';
             $size = 18;
-            $content = $account->number;
         } elseif ($val == 'BankAccountNumberKey') {
             $name = 'cle_rib';
             $size = 3;
-            $content = $account->cle_rib;
         } elseif ($val == 'IBAN') {
             $name = 'iban';
             $size = 30;
-            $content = $account->iban;
             if ($account->needIBAN()) $require=true;
         } elseif ($val == 'BIC') {
             $name = 'bic';
             $size = 12;
-            $content = $account->bic;
             if ($account->needIBAN()) $require=true;
         }
 
         print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
-        print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.$content.'"></td>';
+        print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.GETPOST($name).'"></td>';
         print '</tr>';
     }
 

From 160f8c3085873f9e0c504c63d2b7f91bf333ce47 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 17 Jan 2017 11:11:32 +0100
Subject: [PATCH 0150/1163] Add translation comparison doc

---
 dev/translation/erp_comparison_translation.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 dev/translation/erp_comparison_translation.txt

diff --git a/dev/translation/erp_comparison_translation.txt b/dev/translation/erp_comparison_translation.txt
new file mode 100644
index 00000000000..daa1bc79e92
--- /dev/null
+++ b/dev/translation/erp_comparison_translation.txt
@@ -0,0 +1,14 @@
+
+
+Term Dolibarr		SAP					Odoo							...
+----------------------------------------------------------------------------
+Thirdparty			Contact partner		Partner/Contact (company)
+Contact/address		Contact person		Partner/Contact (individual)
+
+Financial			??					Invoicing
+
+Income / Expense	??					Profit / Loss
+Balance									Net profit
+
+
+

From 73852beb4e2143ffd689c09847eb715e23af491e Mon Sep 17 00:00:00 2001
From: Benoit <benoit@fixit-cs.com>
Date: Tue, 17 Jan 2017 21:55:21 +0100
Subject: [PATCH 0151/1163] FIX contactid for shipping pdf

---
 htdocs/core/class/commonobject.class.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a82a4c9e537..d3b84d8cc65 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -942,18 +942,26 @@ abstract class CommonObject
 
         $result=array();
         $i=0;
+        //cas particulier pour les expeditions
+        if($this->element=='shipping' && $this->origin_id != 0) {
+            $id=$this->origin_id;
+            $element='commande';
+        } else {
+            $id=$this->id;
+            $element=$this->element;
+        }
 
         $sql = "SELECT ec.fk_socpeople";
         $sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
         if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,";
         if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
         $sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";
-        $sql.= " WHERE ec.element_id = ".$this->id;
+        $sql.= " WHERE ec.element_id = ".$id;
         $sql.= " AND ec.fk_socpeople = c.rowid";
         if ($source == 'internal') $sql.= " AND c.entity IN (0,".$conf->entity.")";
         if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe', 1).")";
         $sql.= " AND ec.fk_c_type_contact = tc.rowid";
-        $sql.= " AND tc.element = '".$this->element."'";
+        $sql.= " AND tc.element = '".$element."'";
         $sql.= " AND tc.source = '".$source."'";
         $sql.= " AND tc.code = '".$code."'";
         $sql.= " AND tc.active = 1";

From 49fc8129ac5753400747112107cc098adfc57988 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2017 01:37:12 +0100
Subject: [PATCH 0152/1163] NEW Can change customer from POS

---
 htdocs/cashdesk/affIndex.php            |  4 ++++
 htdocs/cashdesk/affPied.php             | 15 ++++++++++++++-
 htdocs/cashdesk/css/style.css           |  1 -
 htdocs/cashdesk/facturation_verif.php   | 14 +++++++++++++-
 htdocs/cashdesk/tpl/menu.tpl.php        | 14 +++++++++++---
 htdocs/cashdesk/tpl/validation1.tpl.php |  1 +
 htdocs/langs/en_US/cashdesk.lang        |  2 +-
 7 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php
index 9235748e37c..6b1d13f719f 100644
--- a/htdocs/cashdesk/affIndex.php
+++ b/htdocs/cashdesk/affIndex.php
@@ -34,6 +34,8 @@ if ( $_SESSION['uid'] <= 0 )
 	exit;
 }
 
+$langs->load("companies");
+$langs->load("compta");
 $langs->load("cashdesk");
 
 
@@ -41,6 +43,8 @@ $langs->load("cashdesk");
  * View
  */
 
+$form = new Form($db);
+
 //header("Content-type: text/html; charset=UTF-8");
 //header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
diff --git a/htdocs/cashdesk/affPied.php b/htdocs/cashdesk/affPied.php
index b97b9108de1..efe56ac2762 100644
--- a/htdocs/cashdesk/affPied.php
+++ b/htdocs/cashdesk/affPied.php
@@ -22,8 +22,21 @@
  */
 
 ?>
+<!-- affPied.php -->
 <div class="pied">
-<?php
+<?php 
+
+// Wrapper to show tooltips
+if (! empty($conf->use_javascript_ajax) && empty($conf->dol_no_mouse_hover))
+{
+	print "\n<!-- JS CODE TO ENABLE tipTip on all object with class classfortooltip -->\n";
+	print '<script type="text/javascript">
+    	jQuery(document).ready(function () {
+    		jQuery(".classfortooltip").tipTip({maxWidth: "'.dol_size(($conf->browser->layout == 'phone' ? 400 : 700),'width').'px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50});
+    	});
+    </script>' . "\n";
+}
+
 printCommonFooter('private');
 ?>
 </div>
diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css
index 97c0e95a982..ab8d660fcf1 100644
--- a/htdocs/cashdesk/css/style.css
+++ b/htdocs/cashdesk/css/style.css
@@ -19,7 +19,6 @@ body {
 	color: #333;
 	margin: 0;
 	padding: 0;
-	text-align: center;
 }
 
 p {
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index 95a129e88a5..d4bf53e01c5 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -28,11 +28,13 @@ require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
+$action = GETPOST('action','alpha');
+
 $obj_facturation = unserialize($_SESSION['serObjFacturation']);
 unset ($_SESSION['serObjFacturation']);
 
 
-switch ( $_GET['action'] )
+switch($action)
 {
 	default:
 		if ( $_POST['hdnSource'] != 'NULL' )
@@ -162,6 +164,16 @@ switch ( $_GET['action'] )
 
 		break;
 
+	case 'change_thirdparty':	// We have clicked on button "Modify" a thirdparty
+		$newthirdpartyid = GETPOST('CASHDESK_ID_THIRDPARTY','int');
+		if ($newthirdpartyid > 0)
+		{
+		    $_SESSION["CASHDESK_ID_THIRDPARTY"] = $newthirdpartyid;
+		}
+		
+		$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
+        break;	    
+	    
 	case 'ajout_article':	// We have clicked on button "Add product"
 
 		if (! empty($obj_facturation->id))	// A product was previously selected and stored in session, so we can add it
diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php
index 75347427bda..85de5ad9ab5 100644
--- a/htdocs/cashdesk/tpl/menu.tpl.php
+++ b/htdocs/cashdesk/tpl/menu.tpl.php
@@ -23,12 +23,12 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 
-if (!empty($_SESSION["CASHDESK_ID_THIRDPARTY"]))
+/*if (!empty($_SESSION["CASHDESK_ID_THIRDPARTY"]))
 {
 	$company=new Societe($db);
 	$company->fetch($_SESSION["CASHDESK_ID_THIRDPARTY"]);
 	$companyLink = $company->getNomUrl(1);
-}
+}*/
 if (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"]))
 {
 	$bankcash=new Account($db);
@@ -59,6 +59,7 @@ if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && ! empty($conf->stock->enabled)
 $langs->load("cashdesk");
 $langs->load("main");
 
+print "\n".'<!-- menu.tpl.php -->'."\n";
 print '<div class="menu_bloc">';
 print '<ul class="menu">';
 // Link to new sell
@@ -68,7 +69,13 @@ print '<li class="menu_choix2"><a href=".." target="backoffice"><span class="hid
 // Disconnect
 print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['firstname'].' '.$_SESSION['lastname'];
 print ' <a href="deconnexion.php">'.img_picto($langs->trans('Logout'), 'logout.png').'</a><br>';
-print $langs->trans("CashDeskThirdParty").': '.$companyLink.'<br>';
+print '<form id="frmThirdparty" class="formulaire1 inline-block" method="post" action="facturation_verif.php?action=change_thirdparty">';
+print $langs->trans("CashDeskThirdParty").': ';
+print $form->select_company($_SESSION["CASHDESK_ID_THIRDPARTY"], 'CASHDESK_ID_THIRDPARTY', 's.client IN (1,3)', '', 0, 0, null, 0, 'valignmiddle inline-block');
+print '<input class="button bouton_change_thirdparty inline-block valignmiddle" type="submit" id="bouton_change_thirdparty" value="'.$langs->trans("Modify").'">';
+//print $companyLink;
+print '<br>';
+print '</form>';
 /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'<br>';
 print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'<br>';
 print $langs->trans("CashDeskBankCheque").': '.$bankchequeLink.'<br>';*/
@@ -78,3 +85,4 @@ if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && ! empty($conf->stock->enabled)
 }
 print '</li></ul>';
 print '</div>';
+print "\n".'<!-- menu.tpl.php end -->'."\n";
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
index bb6bd92c8bd..bb3d63a9e58 100644
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ b/htdocs/cashdesk/tpl/validation1.tpl.php
@@ -18,6 +18,7 @@
 
 $langs->load("main");
 $langs->load("bills");
+$langs->load("banks");
 
 // Object $form must de defined
 
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 69db60c0cc3..1f51f375e89 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -25,7 +25,7 @@ Difference=Difference
 TotalTicket=Total ticket
 NoVAT=No VAT for this sale
 Change=Excess received
-BankToPay=Charge Account
+BankToPay=Account for payment
 ShowCompany=Show company
 ShowStock=Show warehouse
 DeleteArticle=Click to remove this article

From c6bd1a7d7d235756cf0f0977f4b1af216e272331 Mon Sep 17 00:00:00 2001
From: bgenere <bgenere@gmail.com>
Date: Wed, 18 Jan 2017 10:57:18 +0100
Subject: [PATCH 0153/1163] FIX issue on Task delete

Added a control on time spent so it is not possible to delete a task
where some time spent has already been tracked.
---
 htdocs/projet/class/task.class.php | 34 ++++++++++++++++++++++++++++++
 htdocs/projet/tasks/task.php       |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index ec180704563..2a6a1af6ac3 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -534,6 +534,40 @@ class Task extends CommonObject
             return -1;
         }
     }
+    
+	/**
+     *	Return nb of time spent
+     *
+     *	@return	int		<0 if KO, 0 if no children, >0 if OK
+     */
+    function hasTimeSpent()
+    {
+    	$error=0;
+        $ret=0;
+
+        $sql = "SELECT COUNT(*) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time";
+        $sql.= " WHERE fk_task=".$this->id;
+
+        dol_syslog(get_class($this)."::hasTimeSpent", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        else
+        {
+            $obj=$this->db->fetch_object($resql);
+            if ($obj) $ret=$obj->nb;
+            $this->db->free($resql);
+        }
+
+        if (! $error)
+        {
+            return $ret;
+        }
+        else
+        {
+            return -1;
+        }
+    }
 
 
     /**
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 3c6f9bb7e6e..63c6b6208c3 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -551,7 +551,7 @@ if ($id > 0 || ! empty($ref))
 				}
 	
 				// Delete
-				if ($user->rights->projet->supprimer && ! $object->hasChildren())
+				if ($user->rights->projet->supprimer && ! $object->hasChildren() && ! $object->hasTimeSpent())
 				{
 					print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;withproject='.$withproject.'">'.$langs->trans('Delete').'</a>';
 				}

From 227b616ca388392bf0ac62811802696c4ee42969 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Jan 2017 16:51:42 +0100
Subject: [PATCH 0154/1163] Fix bad default value

---
 htdocs/core/modules/cheque/modules_chequereceipts.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/cheque/modules_chequereceipts.php b/htdocs/core/modules/cheque/modules_chequereceipts.php
index 9e67e363e5a..bbf20761f5f 100644
--- a/htdocs/core/modules/cheque/modules_chequereceipts.php
+++ b/htdocs/core/modules/cheque/modules_chequereceipts.php
@@ -166,15 +166,15 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 	// Positionne modele sur le nom du modele a utiliser
 	if (! dol_strlen($modele))
 	{
-		if (! empty($conf->global->FACTURE_ADDON_PDF))
+		if (! empty($conf->global->CHEQUERECEIPT_ADDON_PDF))
 		{
-			$modele = $conf->global->FACTURE_ADDON_PDF;
+			$modele = $conf->global->CHEQUERECEIPT_ADDON_PDF;
 		}
 		else
 		{
 			//print $langs->trans("Error")." ".$langs->trans("Error_FACTURE_ADDON_PDF_NotDefined");
 			//return 0;
-			$modele = 'crabe';
+			$modele = 'blochet';
 		}
 	}
 

From 32653c1b941203691ad1ea1949665309a1ab0dd8 Mon Sep 17 00:00:00 2001
From: Speed <infinity.speed03@gmail.com>
Date: Wed, 18 Jan 2017 19:38:50 +0100
Subject: [PATCH 0155/1163] Updated script sync members from LDAP

Replace "Cotisation" class with its new name "Subscription"
---
 scripts/members/sync_members_ldap2dolibarr.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index 2319a10a0fd..e7adb80e733 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -38,7 +38,7 @@ require_once($path."../../htdocs/master.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
-require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");
+require_once(DOL_DOCUMENT_ROOT."/adherents/class/subscription.class.php");
 
 $langs->load("main");
 $langs->load("errors");
@@ -291,7 +291,7 @@ if ($result >= 0)
 			{
 				// Cree premiere cotisation et met a jour datefin dans adherent
 				//print "xx".$datefirst."\n";
-				$crowid=$member->cotisation($datefirst, $pricefirst, 0);
+				$crowid=$member->subscription($datefirst, $pricefirst, 0);
 			}
 
 			// Insert last subscription
@@ -299,7 +299,7 @@ if ($result >= 0)
 			{
 				// Cree derniere cotisation et met a jour datefin dans adherent
 				//print "yy".dol_print_date($datelast)."\n";
-				$crowid=$member->cotisation($datelast, $pricelast, 0);
+				$crowid=$member->subscription($datelast, $pricelast, 0);
 			}
 
 		}

From 9270b2c54cf1aced928acbf6d473524b17909419 Mon Sep 17 00:00:00 2001
From: Ion <ion@agorria.com>
Date: Fri, 20 Jan 2017 10:57:41 +0100
Subject: [PATCH 0156/1163] Add supplier order/invoice to elementproperties

---
 htdocs/core/lib/functions2.lib.php | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index bb34806965a..a13a9d9ee85 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1923,10 +1923,6 @@ function getElementProperties($element_type)
         $subelement = $regs[2];
     }
 
-    $classfile = strtolower($subelement);
-    $classname = ucfirst($subelement);
-    $classpath = $module.'/class';
-
     // For compat
     if($element_type == "action") {
         $classpath = 'comm/action/class';
@@ -1991,8 +1987,22 @@ function getElementProperties($element_type)
         $module='propal';
         $subelement='propaleligne';
     }
-    $classfile = strtolower($subelement);
-    $classname = ucfirst($subelement);
+    if ($element_type == 'order_supplier')  {
+        $classpath = 'fourn/class';
+        $module='fournisseur';
+        $subelement='commandefournisseur';
+        $classfile='fournisseur.commande';
+    }
+    if ($element_type == 'invoice_supplier')  {
+        $classpath = 'fourn/class';
+        $module='fournisseur';
+        $subelement='facturefournisseur';
+        $classfile='fournisseur.facture';
+    }
+
+    if (!isset($classfile)) $classfile = strtolower($subelement);
+    if (!isset($classname)) $classname = ucfirst($subelement);
+    if (!isset($classpath)) $classpath = $module.'/class';
 
     $element_properties = array(
         'module' => $module,

From 4d8df737f3d435dcef15ee426aed2c290d3b6090 Mon Sep 17 00:00:00 2001
From: Ion <ion@agorria.com>
Date: Fri, 20 Jan 2017 11:27:11 +0100
Subject: [PATCH 0157/1163] Fix #6161 supplier order to facture not working

---
 htdocs/fourn/facture/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index e1e96cddc9c..2d24bd2ab0f 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -64,7 +64,7 @@ $cancel		= GETPOST('cancel','alpha');
 $lineid		= GETPOST('lineid', 'int');
 $projectid	= GETPOST('projectid','int');
 $origin		= GETPOST('origin', 'alpha');
-$originid	= GETPOST('origin', 'int');
+$originid	= GETPOST('originid', 'int');
 
 //PDF
 $hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));

From 94249b792602f0765a9d491fdb18055e201611b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2017 14:02:51 +0100
Subject: [PATCH 0158/1163] NEW Add statistics on tabs

---
 htdocs/comm/card.php                   |  94 +++++++++---
 htdocs/langs/en_US/companies.lang      |   3 +
 htdocs/societe/class/societe.class.php | 197 ++++++++++++++++++++-----
 3 files changed, 236 insertions(+), 58 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index a639fea53ea..9ff928cfb01 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -508,33 +508,91 @@ if ($id > 0)
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 
+	$boxstat = '';
+	
 	// Nbre max d'elements des petites listes
 	$MAXLIST=$conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 	// Lien recap
-	$outstandingBills = $object->get_OutstandingBill();
-	$warn = '';
-	if ($object->outstanding_limit != '' && $object->outstanding_limit < $outstandingBills) 
+	$boxstat.='<div class="box">';
+	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable" width="100%">';
+	$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
+	
+	if ($conf->propal->enabled)
 	{
-		$warn = img_warning($langs->trans("OutstandingBillReached"));
+    	// Box proposals
+    	$tmp = $object->getOutstandingProposals();
+    	$outstandingOpened=$tmp['opened'];
+    	$outstandingTotal=$tmp['total_ht'];
+    	$outstandingTotalIncTax=$tmp['total_ttc'];
+	    $text=$langs->trans("OverAllProposals");
+    	$link='';
+    	$icon='bill';
+    	if ($link) $boxstat.='<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+    	$boxstat.='<div class="boxstats">';
+    	$boxstat.='<span class="boxstatstext">'.img_object("",$icon).' '.$text.'</span><br>';
+    	$boxstat.='<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
+    	$boxstat.='</div>';
+    	if ($link) $boxstat.='</a>';
+	}
+
+	if ($conf->commande->enabled)
+	{
+	    // Box proposals
+	    $tmp = $object->getOutstandingOrders();
+	    $outstandingOpened=$tmp['opened'];
+	    $outstandingTotal=$tmp['total_ht'];
+	    $outstandingTotalIncTax=$tmp['total_ttc'];
+	    $text=$langs->trans("OverAllOrders");
+	    $link='';
+	    $icon='bill';
+	    if ($link) $boxstat.='<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+	    $boxstat.='<div class="boxstats">';
+	    $boxstat.='<span class="boxstatstext">'.img_object("",$icon).' '.$text.'</span><br>';
+	    $boxstat.='<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
+	    $boxstat.='</div>';
+	    if ($link) $boxstat.='</a>';
 	}
 	
-	print '<table class="noborder" width="100%">';
-
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Summary").'</td>';
-	print '<td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id.'">'.$langs->trans("ShowCustomerPreview").'</a></td>';
-	print '</tr>';
+	if ($conf->facture->enabled)
+	{
+    	$text=$langs->trans("OverAllInvoices");
+    	$link='';
+    	$icon='bill';
+    	if ($link) $boxstat.='<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+    	$boxstat.='<div class="boxstats">';
+    	$boxstat.='<span class="boxstatstext">'.img_object("",$icon).' '.$text.'</span><br>';
+    	$boxstat.='<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
+    	$boxstat.='</div>';
+    	if ($link) $boxstat.='</a>';
+    	
+    	// Box outstanding bill
+    	$tmp = $object->getOutstandingBills();
+    	$outstandingOpened=$tmp['opened'];
+    	$outstandingTotal=$tmp['total_ht'];
+    	$outstandingTotalIncTax=$tmp['total_ttc'];
+    	$warn = '';
+    	if ($object->outstanding_limit != '' && $object->outstanding_limit < $outstandingOpened)
+    	{
+    	    $warn = img_warning($langs->trans("OutstandingBillReached"));
+    	}
+    	$text=$langs->trans("CurrentOutstandingBill");
+    	$link=DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id;
+    	$icon='bill';
+    	if ($link) $boxstat.='<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+    	$boxstat.='<div class="boxstats">';
+    	$boxstat.='<span class="boxstatstext">'.img_object("",$icon).' '.$text.'</span><br>';
+    	$boxstat.='<span class="boxstatsindicator'.($outstandingOpened>0?' amountremaintopay':'').'">'.price($outstandingOpened).$warn.'</span>';
+    	$boxstat.='</div>';
+    	if ($link) $boxstat.='</a>';
+	}
 	
-	// Outstanding bill
-	print '<tr class="impair">';
-	print '<td>'.$langs->trans("CurrentOutstandingBill").'</td>';
-	print '<td>'.price($outstandingBills).$warn.'</td>';
-	print '</tr>';
+	$boxstat.='</td></tr>';
+	$boxstat.='</table>';
+	$boxstat.='</div>';
 	
-	print '</table>';
-	print '<br>';
-
+    print $boxstat;
+    
 	$now=dol_now();
 
 	/*
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 553e4d884e8..85a6bba3955 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -78,6 +78,9 @@ VATIsNotUsed=VAT is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9248a07469c..5c5ca9da3f7 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3338,49 +3338,166 @@ class Societe extends CommonObject
         return $this->update($this->id, $user);
 	}
 
-    /**
-     *  Return amount of bill not paid
-     *
-     *  @return		int				Amount in debt for thirdparty
-     */
-    function get_OutstandingBill()
-    {
-		/* Accurate value of remain to pay is to sum remaintopay for each invoice
-		$paiement = $invoice->getSommePaiement();
-		$creditnotes=$invoice->getSumCreditNotesUsed();
-		$deposits=$invoice->getSumDepositsUsed();
-		$alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
-		$remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
-		*/
-		$sql  = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
-		$sql .= " AND paye = 0";
-		$sql .= " AND fk_statut <> 0";	// Not a draft
-		//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
-		$sql .= " AND fk_statut <> 3";		// Not abandonned
-		$sql .= " AND fk_statut <> 2";		// Not clasified as paid
+	/**
+	 *  Return amount of order not paid and total
+	 *
+	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
+	 */
+	function getOutstandingProposals()
+	{
+	    $sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX."propal as f";
+	    $sql .= " WHERE fk_soc = ". $this->id;
 
-		dol_syslog("get_OutstandingBill", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$outstandingBill = 0;
-			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			$facturestatic=new Facture($this->db);
-			while($obj=$this->db->fetch_object($resql)) {
-				$facturestatic->id=$obj->rowid;
-				$paiement = $facturestatic->getSommePaiement();
-				$creditnotes = $facturestatic->getSumCreditNotesUsed();
-				$deposits = $facturestatic->getSumDepositsUsed();
-
-				$outstandingBill+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
-   			}
-   			return $outstandingBill;
-		}
-		else
-			return 0;
+	    dol_syslog("getOutstandingProposals", LOG_DEBUG);
+	    $resql=$this->db->query($sql);
+	    if ($resql)
+	    {
+	        $outstandingOpened = 0;
+	        $outstandingTotal = 0;
+	        $outstandingTotalIncTax = 0;
+	        while($obj=$this->db->fetch_object($resql)) {
+	            $outstandingTotal+= $obj->total_ht;
+	            $outstandingTotalIncTax+= $obj->total_ttc;
+	            if ($obj->fk_statut != 0)    // Not a draft
+	            {
+	                $outstandingOpened+=$obj->total_ttc;
+	            }
+	        }
+	        return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);
+	    }
+	    else
+	        return array();
 	}
+	
+	/**
+	 *  Return amount of order not paid and total
+	 *
+	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
+	 */
+	function getOutstandingOrders()
+	{
+	    $sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX."commande as f";
+	    $sql .= " WHERE fk_soc = ". $this->id;
 
+	    dol_syslog("getOutstandingOrders", LOG_DEBUG);
+	    $resql=$this->db->query($sql);
+	    if ($resql)
+	    {
+	        $outstandingOpened = 0;
+	        $outstandingTotal = 0;
+	        $outstandingTotalIncTax = 0;
+	        while($obj=$this->db->fetch_object($resql)) {
+	            $outstandingTotal+= $obj->total_ht;
+	            $outstandingTotalIncTax+= $obj->total_ttc;
+	            if ($obj->fk_statut != 0)    // Not a draft
+	            {
+	                $outstandingOpened+=$obj->total_ttc;
+	            }
+	        }
+	        return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);
+	    }
+	    else
+	        return array();
+	}
+	
+	/**
+	 *  Return amount of bill not paid and total
+	 *
+	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
+	 */
+	function getOutstandingBills()
+	{
+	    /* Accurate value of remain to pay is to sum remaintopay for each invoice
+	     $paiement = $invoice->getSommePaiement();
+	     $creditnotes=$invoice->getSumCreditNotesUsed();
+	     $deposits=$invoice->getSumDepositsUsed();
+	     $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
+	     $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
+	     */
+	    $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX."facture as f";
+	    $sql .= " WHERE fk_soc = ". $this->id;
+
+	    dol_syslog("getOutstandingBills", LOG_DEBUG);
+	    $resql=$this->db->query($sql);
+	    if ($resql)
+	    {
+	        $outstandingOpened = 0;
+	        $outstandingTotal = 0;
+	        $outstandingTotalIncTax = 0;
+	        require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+	        $tmpobject=new Facture($this->db);
+	        while($obj=$this->db->fetch_object($resql)) {
+	            $tmpobject->id=$obj->rowid;
+	            if ($obj->fk_statut != 0                                           // Not a draft
+	                && ! ($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
+	                )                                                      
+	            {
+	                $outstandingTotal+= $obj->total_ht;
+	                $outstandingTotalIncTax+= $obj->total_ttc;
+	            }
+	            if ($obj->paye == 0
+	                && $obj->fk_statut != 0    // Not a draft
+	                && $obj->fk_statut != 3	   // Not abandonned
+	                && $obj->fk_statut != 2)   // Not classified as paid
+    	            //$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
+	            {
+    	            $paiement = $tmpobject->getSommePaiement();
+    	            $creditnotes = $tmpobject->getSumCreditNotesUsed();
+    	            $deposits = $tmpobject->getSumDepositsUsed();
+	                $outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
+	            }
+	        }
+	        return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);
+	    }
+	    else 
+	    {
+	        return array();
+	    }
+	}
+	
+	/**
+	 *  Return amount of bill not paid
+	 *
+	 *  @return		int				Amount in debt for thirdparty
+	 *  @deprecated
+	 */
+	function get_OutstandingBill()
+	{
+	    /* Accurate value of remain to pay is to sum remaintopay for each invoice
+	     $paiement = $invoice->getSommePaiement();
+	     $creditnotes=$invoice->getSumCreditNotesUsed();
+	     $deposits=$invoice->getSumDepositsUsed();
+	     $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
+	     $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
+	     */
+	    $sql  = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
+	    $sql .= " WHERE fk_soc = ". $this->id;
+	    $sql .= " AND paye = 0";
+	    $sql .= " AND fk_statut <> 0";	// Not a draft
+	    //$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
+	    $sql .= " AND fk_statut <> 3";		// Not abandonned
+	    $sql .= " AND fk_statut <> 2";		// Not clasified as paid
+	
+	    dol_syslog("get_OutstandingBill", LOG_DEBUG);
+	    $resql=$this->db->query($sql);
+	    if ($resql)
+	    {
+	        $outstandingAmount = 0;
+	        require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+	        $tmpobject=new Facture($this->db);
+	        while($obj=$this->db->fetch_object($resql)) {
+	            $tmpobject->id=$obj->rowid;
+	            $paiement = $tmpobject->getSommePaiement();
+	            $creditnotes = $tmpobject->getSumCreditNotesUsed();
+	            $deposits = $tmpobject->getSumDepositsUsed();
+	            $outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
+	        }
+	        return $outstandingAmount;
+	    }
+	    else
+	        return 0;
+	}
+	
 	/**
 	 * Return label of status customer is prospect/customer
 	 *

From 5b8ff63981a544eec2f81041adb9551cd2cef61d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2017 14:17:58 +0100
Subject: [PATCH 0159/1163] Fix bad value

---
 htdocs/comm/card.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index d28384bd748..bd559fb96a3 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -556,6 +556,11 @@ if ($id > 0)
 	
 	if ($conf->facture->enabled)
 	{
+    	$tmp = $object->getOutstandingBills();
+    	$outstandingOpened=$tmp['opened'];
+    	$outstandingTotal=$tmp['total_ht'];
+    	$outstandingTotalIncTax=$tmp['total_ttc'];
+	    
     	$text=$langs->trans("OverAllInvoices");
     	$link='';
     	$icon='bill';
@@ -567,10 +572,6 @@ if ($id > 0)
     	if ($link) $boxstat.='</a>';
     	
     	// Box outstanding bill
-    	$tmp = $object->getOutstandingBills();
-    	$outstandingOpened=$tmp['opened'];
-    	$outstandingTotal=$tmp['total_ht'];
-    	$outstandingTotalIncTax=$tmp['total_ttc'];
     	$warn = '';
     	if ($object->outstanding_limit != '' && $object->outstanding_limit < $outstandingOpened)
     	{

From e66aabea855a1ccff7bc040f5d4c24421d1fe951 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2017 14:35:18 +0100
Subject: [PATCH 0160/1163] Fix error in total of tasks

---
 htdocs/core/lib/date.lib.php | 2 +-
 htdocs/projet/tasks/list.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index cd897071551..202a598d8ae 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -171,7 +171,7 @@ function convertSecondToTime($iSecond, $format='all', $lengthOfDay=86400, $lengt
 
 	if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin')
 	{
-		if ($iSecond === 0) return '0';	// This is to avoid having 0 return a 12:00 AM for en_US
+		if ((int) $iSecond === 0) return '0';	// This is to avoid having 0 return a 12:00 AM for en_US
 
         $sTime='';
         $sDay=0;
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index e1da8444319..74f9b122f14 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -816,7 +816,7 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
         }
         elseif ($totalarray['totalplannedworkloadfield'] == $i) print '<td align="center">'.convertSecondToTime($totalarray['totalplannedworkload'],$plannedworkloadoutputformat).'</td>';
         elseif ($totalarray['totaldurationeffectivefield'] == $i) print '<td align="center">'.convertSecondToTime($totalarray['totaldurationeffective'],$timespentoutputformat).'</td>';
-        elseif ($totalarray['totalprogress_calculated'] == $i) print '<td align="center">'.($totalarray['totaldurationeffective'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').'</td>';
+        elseif ($totalarray['totalprogress_calculated'] == $i) print '<td align="center">'.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').'</td>';
         else print '<td></td>';
     }
     print '</tr>';

From a250ba5f56cdc481a817ec8414fb8147f3a9abf7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2017 17:52:52 +0100
Subject: [PATCH 0161/1163] Close #6307 #6306

---
 htdocs/core/lib/functions.lib.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 874722def2e..d59d186f5b2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -740,7 +740,10 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='
     		'ip' => false
     	);
 
-    	if (! empty($_SERVER["REMOTE_ADDR"])) $data['ip'] = $_SERVER['REMOTE_ADDR'];
+    	// This is when server run behind a reverse proxy
+    	if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].(empty($_SERVER["REMOTE_ADDR"])?'':'->'.$_SERVER['REMOTE_ADDR']);
+    	// This is when server run normally on a server
+    	else if (! empty($_SERVER["REMOTE_ADDR"])) $data['ip'] = $_SERVER['REMOTE_ADDR'];
     	// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
     	else if (! empty($_SERVER['SERVER_ADDR'])) $data['ip'] = $_SERVER['SERVER_ADDR'];
     	// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

From 809e3ce4d544ded2cd59fc1b5ba744f72304a970 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 20 Jan 2017 18:41:18 +0100
Subject: [PATCH 0162/1163] Debug browser notification

---
 htdocs/admin/agenda_other.php                 |  43 ++++---
 htdocs/core/ajax/check_events.php             |  70 -----------
 htdocs/core/ajax/check_notifications.php      |  80 ++++++++++++
 ...ication.js.php => lib_notification.js.php} | 115 +++++++++---------
 htdocs/core/modules/modAgenda.class.php       |   2 +-
 htdocs/langs/en_US/admin.lang                 |   4 +-
 htdocs/main.inc.php                           |  11 +-
 .../common}/sound/notification.mp3            | Bin
 .../common/sound/notification_agenda.wav      | Bin 0 -> 6564 bytes
 9 files changed, 176 insertions(+), 149 deletions(-)
 delete mode 100644 htdocs/core/ajax/check_events.php
 create mode 100644 htdocs/core/ajax/check_notifications.php
 rename htdocs/core/js/{agenda_notification.js.php => lib_notification.js.php} (56%)
 rename htdocs/{comm/action => theme/common}/sound/notification.mp3 (100%)
 create mode 100644 htdocs/theme/common/sound/notification_agenda.wav

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 2835d17e2fe..9bf3a4ddc16 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -408,31 +408,34 @@ print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_
 print '</td></tr>'."\n";
 
 // AGENDA NOTIFICATION
-$var=!$var;
-print '<tr '.$bc[$var].'>'."\n";
-print '<td>'.$langs->trans('AGENDA_NOTIFICATION').'</td>'."\n";
-print '<td align="center">&nbsp;</td>'."\n";
-print '<td align="right">'."\n";
-
-if (empty($conf->global->AGENDA_NOTIFICATION)) {
-    print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_NOTIFICATION">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
-    print '</td></tr>'."\n";
-} else {
-    print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_NOTIFICATION">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
-    print '</td></tr>'."\n";
-	$var=!$var;
+if ($conf->global->MAIN_FEATURES_LEVEL > 0)
+{
+    $var=!$var;
     print '<tr '.$bc[$var].'>'."\n";
-    print '<td>'.$langs->trans('AGENDA_NOTIFICATION_SOUND').'</td>'."\n";
+    print '<td>'.$langs->trans('AGENDA_NOTIFICATION').'</td>'."\n";
     print '<td align="center">&nbsp;</td>'."\n";
     print '<td align="right">'."\n";
-
-    if (empty($conf->global->AGENDA_NOTIFICATION_SOUND)) {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_NOTIFICATION_SOUND">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
+    
+    if (empty($conf->global->AGENDA_NOTIFICATION)) {
+        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_NOTIFICATION">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
+        print '</td></tr>'."\n";
     } else {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_NOTIFICATION_SOUND">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
+        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_NOTIFICATION">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
+        print '</td></tr>'."\n";
+    	$var=!$var;
+        print '<tr '.$bc[$var].'>'."\n";
+        print '<td>'.$langs->trans('AGENDA_NOTIFICATION_SOUND').'</td>'."\n";
+        print '<td align="center">&nbsp;</td>'."\n";
+        print '<td align="right">'."\n";
+    
+        if (empty($conf->global->AGENDA_NOTIFICATION_SOUND)) {
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_NOTIFICATION_SOUND">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
+        } else {
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_NOTIFICATION_SOUND">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
+        }
+    
+        print '</td></tr>'."\n";
     }
-
-    print '</td></tr>'."\n";
 }
 
 print '</table>';
diff --git a/htdocs/core/ajax/check_events.php b/htdocs/core/ajax/check_events.php
deleted file mode 100644
index 03787c92f52..00000000000
--- a/htdocs/core/ajax/check_events.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/* Copyright (C) 2016	   Sergio Sanchis		<sergiosanchis@hotmail.com>
- * Copyright (C) 2017	   Juanjo Menent		<jmenent@2byte.es>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-
-global $user, $db, $langs, $conf;
-
-$time = GETPOST('time');
-
-session_start();
-
-//TODO Configure how long the upgrade will take
-$time_update = 60;
-
-if (! empty($conf->global->AGENDA_NOTIFICATION)) {
-    if ($_SESSION['auto_check_events'] <= (int) $time) {
-        $_SESSION['auto_check_events'] = $time + $time_update;
-
-        $eventos = array();
-
-        $sql = 'SELECT id';
-        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'actioncomm a, ' . MAIN_DB_PREFIX . 'actioncomm_resources ar';
-        $sql .= ' WHERE datep BETWEEN ' . $db->idate($time + 1) . ' AND ' . $db->idate($time + $time_update);
-        $sql .= ' AND a.id = ar.fk_actioncomm';
-        $sql .= ' AND a.code <> "AC_OTH_AUTO"';
-        $sql .= ' AND ar.element_type = "user"';
-        $sql .= ' AND ar.fk_element = ' . $user->id;
-
-        $resql = $db->query($sql);
-
-        if ($resql) {
-
-            $actionmod = new ActionComm($db);
-
-            while ($obj = $db->fetch_object($resql)) {
-
-                $event = array();
-
-                $actionmod->fetch($obj->id);
-
-                $event['id'] = $actionmod->id;
-                $event['tipo'] = $langs->transnoentities('Action' . $actionmod->code);
-                $event['titulo'] = $actionmod->label;
-                $event['location'] = $actionmod->location;
-                $eventos[] = $event;
-                $actionmod->initAsSpecimen();
-
-            }
-        }
-
-        print json_encode($eventos);
-    }
-}
\ No newline at end of file
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
new file mode 100644
index 00000000000..af56cb23700
--- /dev/null
+++ b/htdocs/core/ajax/check_notifications.php
@@ -0,0 +1,80 @@
+<?php
+/* Copyright (C) 2016	   Sergio Sanchis		<sergiosanchis@hotmail.com>
+ * Copyright (C) 2017	   Juanjo Menent		<jmenent@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+
+global $user, $db, $langs, $conf;
+
+$time = GETPOST('time');
+//$time=dol_now();
+
+session_start();
+
+$time_update = (empty($conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)?'3':(int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY);
+
+$eventos = array();
+//$eventos[]=array('type'=>'agenda', 'id'=>1, 'tipo'=>'eee', 'location'=>'aaa');
+
+// TODO Remove test on session. Timer should be managed by a javascript timer
+if ($_SESSION['auto_check_events'] <= (int) $time) 
+{
+    $_SESSION['auto_check_events'] = $time + $time_update;
+
+    $sql = 'SELECT id';
+    $sql .= ' FROM ' . MAIN_DB_PREFIX . 'actioncomm a, ' . MAIN_DB_PREFIX . 'actioncomm_resources ar';
+    $sql .= ' WHERE a.id = ar.fk_actioncomm';
+    // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when.
+    // This need to extend period to be sure to not miss and save what we notified to avoid duplicate (save is not done yet).
+    $sql .= " AND datep BETWEEN '" . $db->idate($time + 1) . "' AND '" . $db->idate($time + $time_update) . "'";
+    $sql .= ' AND a.code <> "AC_OTH_AUTO"';
+    $sql .= ' AND ar.element_type = "user"';
+    $sql .= ' AND ar.fk_element = ' . $user->id;
+    $sql .= ' LIMIT 10';    // Avoid too many notification at once
+
+    $resql = $db->query($sql);
+    if ($resql) {
+
+        $actionmod = new ActionComm($db);
+
+        while ($obj = $db->fetch_object($resql)) {
+
+            $actionmod->fetch($obj->id);
+
+            $event = array();
+            $event['type'] = 'agenda';
+            $event['id'] = $actionmod->id;
+            $event['tipo'] = $langs->transnoentities('Action' . $actionmod->code);
+            $event['titulo'] = $actionmod->label;
+            $event['location'] = $actionmod->location;
+            
+            $eventos[] = $event;
+        }
+    }
+
+}
+
+print json_encode($eventos);
+
diff --git a/htdocs/core/js/agenda_notification.js.php b/htdocs/core/js/lib_notification.js.php
similarity index 56%
rename from htdocs/core/js/agenda_notification.js.php
rename to htdocs/core/js/lib_notification.js.php
index ad4b8cf1bdf..a870066c775 100644
--- a/htdocs/core/js/agenda_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -14,8 +14,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
-*/
+ * 
+ * Library javascript to enable Browser notifications
+ */
+
 if (!defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1');
 if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
 if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
@@ -24,110 +26,113 @@ if (!defined('NOLOGIN')) define('NOLOGIN', 1);
 if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
 if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
 
-session_cache_limiter(FALSE);
-
 require_once '../../main.inc.php';
 
-if(!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/index.php')){
-
+if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/index.php'))
+{
     global $langs, $conf;
 
-    $langs->load('agenda');
-
     // Define javascript type
     header('Content-type: text/javascript; charset=UTF-8');
+
+    // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when.
+    session_cache_limiter(FALSE);
     header('Cache-Control: no-cache');
-
-    // Check notification permissions API HTML5
-    print 'if (Notification.permission !== "granted") {
-                    Notification.requestPermission()
-                }' . PHP_EOL;
-
     session_start();
     if (!isset($_SESSION['auto_check_events'])) {
-
         // Round to eliminate the second part
         $_SESSION['auto_check_events'] = floor(time() / 60) * 60;
-        print 'var time_session = ' . $_SESSION['auto_check_events'] . ';' . PHP_EOL;
-        print 'var now = ' . $_SESSION['auto_check_events'] . ';' . PHP_EOL;
+        print 'var time_session = ' . $_SESSION['auto_check_events'] . ';'."\n";
+        print 'var now = ' . $_SESSION['auto_check_events'] . ';' . "\n";
     } else {
-
-        print 'var time_session = ' . $_SESSION['auto_check_events'] . ';' . PHP_EOL;
-        print 'var now = ' . time() . ';' . PHP_EOL;
+        print 'var time_session = ' . $_SESSION['auto_check_events'] . ';' . "\n";
+        print 'var now = ' . time() . ';' . "\n";
     }
-
-    //TODO provisionally set to be checked every 60 seconds, the 1000 is because it needs to be in milliseconds
-    print 'var time_auto_update = 60;' . "\n";
+    print 'var time_auto_update = '.(empty($conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)?'3':(int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY).';' . "\n";
     ?>
-
+	
+	/* Check if permission ok */
+	if (Notification.permission !== "granted") {
+        Notification.requestPermission()
+    }
 
     if (now > (time_session + time_auto_update) || now == time_session) {
 
         first_execution(); //firts run auto check
     } else {
 
-        var time_first_execution = (time_auto_update - (now - time_session)) * 1000;
+        var time_first_execution = (time_auto_update - (now - time_session)) * 1000;	//need milliseconds
 
-        setTimeout(first_execution, time_first_execution); //firts run auto check
+        setTimeout(first_execution, time_first_execution); //first run auto check
     }
 
 
     function first_execution() {
+    	console.log("Call first_execution");
         check_events();
         setInterval(check_events, time_auto_update * 1000); //program time for run check events
     }
 
     function check_events() {
-
-        $.ajax("<?php print dol_buildpath('/core/ajax/check_events.php', 1); ?>", {
-            type: "post",   // Usually post o get
-            async: true,
-            data: {time: time_session},
-            success: function (result) {
-
-                var arr = JSON.parse(result);
-
-                if (arr.length > 0) {
-                    if (Notification.permission === "granted") {
-
+    	if (Notification.permission === "granted")
+    	{
+    		console.log("Call check_events");
+            $.ajax("<?php print dol_buildpath('/core/ajax/check_notifications.php', 1); ?>", {
+                type: "post",   // Usually post o get
+                async: true,
+                data: {time: time_session},
+                success: function (result) {
+                    var arr = JSON.parse(result);
+                    if (arr.length > 0) {
                         <?php
-                        if($conf->global->AGENDA_NOTIFICATION_SOUND){
-                            print 'var audio = new Audio(\''.dol_buildpath('/comm/action/sound/notification.mp3', 1).'\');';
+                        if (! empty($conf->global->AGENDA_NOTIFICATION_SOUND)) {
+                            print 'var audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav'.'\');';
                         }
                         ?>
-
+    
                         $.each(arr, function (index, value) {
+                            var url="notdefined";
+                            var title="Not defined";
                             var body = value['tipo'] + ': ' + value['titulo'];
-                            if (value['location'] != null) {
+                            if (value['type'] == 'agenda' && value['location'] != null && value['location'] != '') {
                                 body += '\n <?php print $langs->transnoentities('Location')?>: ' + value['location'];
                             }
-
-
-                            var title = "<?php print $langs->trans('Agenda') ?>";
+    
+                            if (value['type'] == 'agenda')
+                            {
+                             	url = '<?php echo DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value['id'];
+                                title = '<?php print $langs->trans('Agenda') ?>';
+                            }
                             var extra = {
-                                icon: "<?php print dol_buildpath('/theme/common/bell.png', 1); ?>",
+                                icon: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
                                 body: body,
                                 tag: value['id']
                             };
-
+    
                             // We release the notify
                             var noti = new Notification(title, extra);
-                            <?php
-                            if($conf->global->AGENDA_NOTIFICATION_SOUND){
-                                print 'if(index==0)audio.play();'."\n";
+                            if (index==0 && audio) 
+                            {
+                            	audio.play();
                             }
-                            ?>
                             noti.onclick = function (event) {
+                                console.log("An event to notify on browser was received");
                                 event.preventDefault(); // prevent the browser from focusing the Notification's tab
                                 window.focus();
-                                window.open("<?php print dol_buildpath('/comm/action/card.php?id=', 1); ?>" + value['id'], '_blank');
+                                window.open(url, '_blank');
                                 noti.close();
                             };
                         });
                     }
                 }
-            }
-        });
+            });
+        }
+        else
+        {
+        	console.log("Cancel check_events. Useless because Notification.permission is "+Notification.permission);
+        }
+
         time_session += time_auto_update;
     }
-<?php }
+<?php 
+}
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 46c07d43194..fd48e66d007 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -75,7 +75,7 @@ class modAgenda extends DolibarrModules
 		$this->langfiles = array("companies");
 
 		// Module parts
-        $this->module_parts = array('js' => array('/core/js/agenda_notification.js.php'));
+        $this->module_parts = array();
 
 		// Constants
 		//-----------
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index fcb4df82669..f88736e93d1 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1475,8 +1475,8 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_NOTIFICATION=Enable events notification
-AGENDA_NOTIFICATION_SOUND=Enable sound on notifications
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
 ##### ClickToDial #####
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 8aba2e428f2..80c6b1b3dca 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1303,7 +1303,16 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 print '</script>'."\n";
                 print '<script type="text/javascript" src="'.$pathckeditor.$jsckeditor.($ext?'?'.$ext:'').'"></script>'."\n";
             }
-
+            
+            // Browser notifications
+            $enablebrowsernotif=false;
+            if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_NOTIFICATION) && ! empty($conf->global->AGENDA_NOTIFICATION_SOUND)) $enablebrowsernotif=true;
+            if ($enablebrowsernotif)
+            {
+                print '<!-- Includes JS of Dolibarr -->'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php?version='.urlencode(DOL_VERSION).($ext?'&amp;'.$ext:'').'"></script>'."\n";
+            }
+            
             // Global js function
             print '<!-- Includes JS of Dolibarr -->'."\n";
             print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?version='.urlencode(DOL_VERSION).($ext?'&amp;'.$ext:'').'"></script>'."\n";
diff --git a/htdocs/comm/action/sound/notification.mp3 b/htdocs/theme/common/sound/notification.mp3
similarity index 100%
rename from htdocs/comm/action/sound/notification.mp3
rename to htdocs/theme/common/sound/notification.mp3
diff --git a/htdocs/theme/common/sound/notification_agenda.wav b/htdocs/theme/common/sound/notification_agenda.wav
new file mode 100644
index 0000000000000000000000000000000000000000..09e203c30f13c24f9dfab1533a1bd66766c3d4f9
GIT binary patch
literal 6564
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
V;_pTN?-Mc8c}<xjv;WM@{13TR#99CV

literal 0
HcmV?d00001


From daf40ed573759ea8a98ad8e582665ec6b3e29f46 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 22 Jan 2017 23:35:32 +0100
Subject: [PATCH 0163/1163] NEW Direct open of card after a search if on record
 only found.

---
 htdocs/core/class/conf.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 81de34e012f..064beaa8226 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -492,6 +492,9 @@ class Conf
 		// By default, we use the zip town autofill
 		if (! isset($this->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) $this->global->MAIN_USE_ZIPTOWN_DICTIONNARY=1;
 
+		// By default, we open card if one found
+		if (! isset($this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) $this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE=1;
+		
 		// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"
 		if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent';	// '' means 'all'. Note that contact is added here as it should be a module later.
 

From 7622d3b2fbb8d977868ab44fd2c4f69bc8105a61 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 23 Jan 2017 10:23:24 +0100
Subject: [PATCH 0164/1163] Fix missing info admin picto. Fix colspan.

---
 htdocs/comm/card.php                         | 38 +++++++++++---------
 htdocs/core/class/html.formcompany.class.php |  4 +--
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index bd559fb96a3..b501ab7523b 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -484,24 +484,28 @@ if ($id > 0)
 	    print '</tr></table>';
 	    print '</td><td>';
 	    if ($action == 'editlevel')
+	    {
 	        $formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_prospectlevel,'prospect_level_id',1);
-	        else
-	            print $object->getLibProspLevel();
-	            print "</td>";
-	            print '</tr>';
-	
-	            // Status
-	            $object->loadCacheOfProspStatus();
-	            print '<tr><td>'.$langs->trans("StatusProsp").'</td><td colspan="3">'.$object->getLibProspCommStatut(4, $object->cacheprospectstatus[$object->stcomm_id]['label']);
-	            print ' &nbsp; &nbsp; ';
-	            print '<div class="floatright">';
-	            foreach($object->cacheprospectstatus as $key => $val)
-	            {
-	                $titlealt='default';
-	                if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label'];
-	                if ($object->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm">'.img_action($titlealt,$val['code']).'</a>';
-	            }
-	            print '</div></td></tr>';
+	    }
+	    else
+	    {
+	        print $object->getLibProspLevel();
+	    }
+        print "</td>";
+        print '</tr>';
+
+        // Status
+        $object->loadCacheOfProspStatus();
+        print '<tr><td>'.$langs->trans("StatusProsp").'</td><td>'.$object->getLibProspCommStatut(4, $object->cacheprospectstatus[$object->stcomm_id]['label']);
+        print ' &nbsp; &nbsp; ';
+        print '<div class="floatright">';
+        foreach($object->cacheprospectstatus as $key => $val)
+        {
+            $titlealt='default';
+            if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label'];
+            if ($object->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm">'.img_action($titlealt,$val['code']).'</a>';
+        }
+        print '</div></td></tr>';
 	   print "</table>";
 	}
 	
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 35fcfb4c25b..bcff0981a70 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -138,7 +138,7 @@ class FormCompany
 	 */
 	function form_prospect_level($page, $selected='', $htmlname='prospect_level_id', $empty=0)
 	{
-		global $langs;
+		global $user, $langs;
 
 		print '<form method="post" action="'.$page.'">';
 		print '<input type="hidden" name="action" value="setprospectlevel">';
@@ -171,7 +171,7 @@ class FormCompany
 			print Form::selectarray($htmlname, $options, $selected);
 		}
 		else dol_print_error($this->db);
-
+		if (! empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}

From 1878647d26ec38e8d53581da59abe18c475979cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 23 Jan 2017 20:54:52 +0100
Subject: [PATCH 0165/1163] NEW Add statistics on supplier tab.

---
 htdocs/comm/card.php                          |  4 +-
 htdocs/compta/facture/class/facture.class.php | 46 ----------
 htdocs/core/class/commoninvoice.class.php     | 60 +++++++++++++
 htdocs/fourn/card.php                         | 86 ++++++++++++++++++-
 htdocs/langs/en_US/companies.lang             |  1 +
 htdocs/societe/class/societe.class.php        | 39 +++++++--
 6 files changed, 177 insertions(+), 59 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index b501ab7523b..bfd90b6909b 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -579,7 +579,7 @@ if ($id > 0)
     	$warn = '';
     	if ($object->outstanding_limit != '' && $object->outstanding_limit < $outstandingOpened)
     	{
-    	    $warn = img_warning($langs->trans("OutstandingBillReached"));
+    	    $warn = ' '.img_warning($langs->trans("OutstandingBillReached"));
     	}
     	$text=$langs->trans("CurrentOutstandingBill");
     	$link=DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id;
@@ -587,7 +587,7 @@ if ($id > 0)
     	if ($link) $boxstat.='<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
     	$boxstat.='<div class="boxstats">';
     	$boxstat.='<span class="boxstatstext">'.img_object("",$icon).' '.$text.'</span><br>';
-    	$boxstat.='<span class="boxstatsindicator'.($outstandingOpened>0?' amountremaintopay':'').'">'.price($outstandingOpened).$warn.'</span>';
+    	$boxstat.='<span class="boxstatsindicator'.($outstandingOpened>0?' amountremaintopay':'').'">'.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
     	$boxstat.='</div>';
     	if ($link) $boxstat.='</a>';
 	}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index aef95d1b0a9..72e81fd252e 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3120,52 +3120,6 @@ class Facture extends CommonInvoice
 	}
 
 
-	/**
-	 *    	Return amount (with tax) of all credit notes and deposits invoices used by invoice
-	 *
-	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
-	 */
-	function getSumCreditNotesUsed($multicurrency=0)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-		$discountstatic=new DiscountAbsolute($this->db);
-		$result=$discountstatic->getSumCreditNotesUsed($this, $multicurrency);
-		if ($result >= 0)
-		{
-			return $result;
-		}
-		else
-		{
-			$this->error=$discountstatic->error;
-			return -1;
-		}
-	}
-
-	/**
-	 *    	Return amount (with tax) of all deposits invoices used by invoice
-	 *
-	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *		@return		int						<0 if KO, Sum of deposits amount otherwise
-	 */
-	function getSumDepositsUsed($multicurrency=0)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-		$discountstatic=new DiscountAbsolute($this->db);
-		$result=$discountstatic->getSumDepositsUsed($this, $multicurrency);
-		if ($result >= 0)
-		{
-			return $result;
-		}
-		else
-		{
-			$this->error=$discountstatic->error;
-			return -1;
-		}
-	}
-
 	/**
 	 *      Return next reference of customer invoice not already used (or last reference)
 	 *      according to numbering module defined into constant FACTURE_ADDON
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 05cf0b4c3cb..4822ad7d0d8 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -88,6 +88,7 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	const STATUS_ABANDONED = 3;
 
+	
 	/**
 	 * 	Return amount of payments already done
 	 *
@@ -124,6 +125,65 @@ abstract class CommonInvoice extends CommonObject
 		}
 	}
 
+	/**
+	 *    	Return amount (with tax) of all credit notes and deposits invoices used by invoice
+	 *
+	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+	 *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
+	 */
+	function getSumCreditNotesUsed($multicurrency=0)
+	{
+	    if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
+	    {
+	        // TODO
+	       return 0;     
+	    }
+	    
+	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+	
+	    $discountstatic=new DiscountAbsolute($this->db);
+	    $result=$discountstatic->getSumCreditNotesUsed($this, $multicurrency);
+	    if ($result >= 0)
+	    {
+	        return $result;
+	    }
+	    else
+	    {
+	        $this->error=$discountstatic->error;
+	        return -1;
+	    }
+	}
+	
+	/**
+	 *    	Return amount (with tax) of all deposits invoices used by invoice
+	 *
+	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+	 *		@return		int						<0 if KO, Sum of deposits amount otherwise
+	 */
+	function getSumDepositsUsed($multicurrency=0)
+	{
+		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
+	    {
+	        // TODO
+	       return 0;     
+	    }
+	    
+	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+	
+	    $discountstatic=new DiscountAbsolute($this->db);
+	    $result=$discountstatic->getSumDepositsUsed($this, $multicurrency);
+	    if ($result >= 0)
+	    {
+	        return $result;
+	    }
+	    else
+	    {
+	        $this->error=$discountstatic->error;
+	        return -1;
+	    }
+	}
+	
+	
 	/**
 	 *	Renvoie tableau des ids de facture avoir issus de la facture
 	 *
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 5faf915f329..6b94c29054d 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -277,12 +277,94 @@ if ($object->id > 0)
 
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-
+	$boxstat = '';
+	
+	// Nbre max d'elements des petites listes
+	$MAXLIST=$conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+	
+	// Lien recap
+	$boxstat.='<div class="box">';
+	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable" width="100%">';
+	$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
+	
+	if ($conf->supplier_proposal->enabled)
+	{
+	    // Box proposals
+	    $tmp = $object->getOutstandingProposals('supplier');
+	    $outstandingOpened=$tmp['opened'];
+	    $outstandingTotal=$tmp['total_ht'];
+	    $outstandingTotalIncTax=$tmp['total_ttc'];
+	    $text=$langs->trans("OverAllSupplierProposals");
+	    $link='';
+	    $icon='bill';
+	    if ($link) $boxstat.='<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+	    $boxstat.='<div class="boxstats">';
+	    $boxstat.='<span class="boxstatstext">'.img_object("",$icon).' '.$text.'</span><br>';
+	    $boxstat.='<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
+	    $boxstat.='</div>';
+	    if ($link) $boxstat.='</a>';
+	}
+	
+	if ($conf->fournisseur->enabled)
+	{
+	    // Box proposals
+	    $tmp = $object->getOutstandingOrders('supplier');
+	    $outstandingOpened=$tmp['opened'];
+	    $outstandingTotal=$tmp['total_ht'];
+	    $outstandingTotalIncTax=$tmp['total_ttc'];
+	    $text=$langs->trans("OverAllOrders");
+	    $link='';
+	    $icon='bill';
+	    if ($link) $boxstat.='<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+	    $boxstat.='<div class="boxstats">';
+	    $boxstat.='<span class="boxstatstext">'.img_object("",$icon).' '.$text.'</span><br>';
+	    $boxstat.='<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
+	    $boxstat.='</div>';
+	    if ($link) $boxstat.='</a>';
+	}
+	
+	if ($conf->fournisseur->enabled)
+	{
+	    $tmp = $object->getOutstandingBills('supplier');
+	    $outstandingOpened=$tmp['opened'];
+	    $outstandingTotal=$tmp['total_ht'];
+	    $outstandingTotalIncTax=$tmp['total_ttc'];
+	     
+	    $text=$langs->trans("OverAllInvoices");
+	    $link='';
+	    $icon='bill';
+	    if ($link) $boxstat.='<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+	    $boxstat.='<div class="boxstats">';
+	    $boxstat.='<span class="boxstatstext">'.img_object("",$icon).' '.$text.'</span><br>';
+	    $boxstat.='<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
+	    $boxstat.='</div>';
+	    if ($link) $boxstat.='</a>';
+	     
+	    // Box outstanding bill
+	    $text=$langs->trans("CurrentOutstandingBill");
+	    $link=DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$object->id;
+	    $icon='bill';
+	    if ($link) $boxstat.='<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+	    $boxstat.='<div class="boxstats">';
+	    $boxstat.='<span class="boxstatstext">'.img_object("",$icon).' '.$text.'</span><br>';
+	    $boxstat.='<span class="boxstatsindicator'.($outstandingOpened>0?' amountremaintopay':'').'">'.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
+	    $boxstat.='</div>';
+	    if ($link) $boxstat.='</a>';
+	}
+	
+	$boxstat.='</td></tr>';
+	$boxstat.='</table>';
+	$boxstat.='</div>';
+	
+	print $boxstat;
+	
+	
 	$var=true;
 
 	$MAXLIST=$conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 	// Lien recap
+	/*
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("Summary").'</td>';
@@ -290,7 +372,7 @@ if ($object->id > 0)
 	print '</tr>';
 	print '</table>';
 	print '<br>';
-
+    */
 
 	/*
 	 * List of products
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 838f538a273..bd6846bf694 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 5c5ca9da3f7..05678ddb821 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3341,11 +3341,15 @@ class Societe extends CommonObject
 	/**
 	 *  Return amount of order not paid and total
 	 *
-	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
+	 *  @param     string      $mode    'customer' or 'supplier'
+	 *  @return    array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingProposals()
+	function getOutstandingProposals($mode='customer')
 	{
-	    $sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX."propal as f";
+	    $table='propal';
+	    if ($mode == 'supplier') $table = 'supplier_proposal';
+	    
+	    $sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 	    $sql .= " WHERE fk_soc = ". $this->id;
 
 	    dol_syslog("getOutstandingProposals", LOG_DEBUG);
@@ -3372,11 +3376,15 @@ class Societe extends CommonObject
 	/**
 	 *  Return amount of order not paid and total
 	 *
+	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingOrders()
+	function getOutstandingOrders($mode='customer')
 	{
-	    $sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX."commande as f";
+	    $table='commande';
+	    if ($mode == 'supplier') $table = 'commande_fournisseur';
+	     
+	    $sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 	    $sql .= " WHERE fk_soc = ". $this->id;
 
 	    dol_syslog("getOutstandingOrders", LOG_DEBUG);
@@ -3403,10 +3411,14 @@ class Societe extends CommonObject
 	/**
 	 *  Return amount of bill not paid and total
 	 *
+	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingBills()
+	function getOutstandingBills($mode='customer')
 	{
+	    $table='facture';
+	    if ($mode == 'supplier') $table = 'facture_fourn';
+	     
 	    /* Accurate value of remain to pay is to sum remaintopay for each invoice
 	     $paiement = $invoice->getSommePaiement();
 	     $creditnotes=$invoice->getSumCreditNotesUsed();
@@ -3414,7 +3426,8 @@ class Societe extends CommonObject
 	     $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 	     $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 	     */
-	    $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX."facture as f";
+	    if ($mode == 'supplier') $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+	    else $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
 	    $sql .= " WHERE fk_soc = ". $this->id;
 
 	    dol_syslog("getOutstandingBills", LOG_DEBUG);
@@ -3424,8 +3437,16 @@ class Societe extends CommonObject
 	        $outstandingOpened = 0;
 	        $outstandingTotal = 0;
 	        $outstandingTotalIncTax = 0;
-	        require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-	        $tmpobject=new Facture($this->db);
+	        if ($mode == 'supplier')
+	        {
+	            require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+	            $tmpobject=new FactureFournisseur($this->db);
+	        }
+	        else
+	        {
+	           require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+	           $tmpobject=new Facture($this->db);
+	        }
 	        while($obj=$this->db->fetch_object($resql)) {
 	            $tmpobject->id=$obj->rowid;
 	            if ($obj->fk_statut != 0                                           // Not a draft

From 39a92df6473981f44a90740951f3a0f878fdcc29 Mon Sep 17 00:00:00 2001
From: Quentin Vial-Gouteyron <quentin@mail.atm-consulting.fr>
Date: Tue, 24 Jan 2017 11:50:07 +0100
Subject: [PATCH 0166/1163] Massive withdrawal request

---
 htdocs/compta/facture/list.php | 92 +++++++++++++++++++++++++++++++++-
 htdocs/langs/fr_FR/bills.lang  |  1 +
 2 files changed, 92 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 8807023784d..4dce7418159 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -460,7 +460,8 @@ if ($resql)
 
 	$arrayofmassactions=array(
 	    'presend'=>$langs->trans("SendByMail"),
-	    'builddoc'=>$langs->trans("PDFMerge")
+	    'builddoc'=>$langs->trans("PDFMerge"),
+		'withdrawrequest'=>$langs->trans("WithdrawRequest")
 	);
 	if ($user->rights->facture->supprimer) 
 	{
@@ -587,6 +588,95 @@ if ($resql)
         
         dol_fiche_end();
 	}
+
+	if ($massaction == 'withdrawrequest')
+	{
+		if (!$user->rights->prelevement->bons->creer)
+    	{
+   			$error++;
+			setEventMessages($langs->trans("NotEnoughPermissions"), $objecttmp->errors, 'errors');
+		}
+		else {		
+			
+			//Checking error
+			$error = 0;
+			
+			$listofbills=array();
+			foreach($arrayofselected as $toselectid)
+			{
+				$objecttmp=new Facture($db);
+				$result=$objecttmp->fetch($toselectid);
+				if ($result > 0) 
+				{
+					$totalpaye  = $objecttmp->getSommePaiement();
+					$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
+					$totaldeposits = $objecttmp->getSumDepositsUsed();
+					$objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits,'MT');
+					$listofbills[] = $objecttmp;
+					if($objecttmp->paye || $objecttmp->resteapayer==0){
+						$error++;
+						setEventMessages($objecttmp->ref.' '.$langs->trans("AlreadyPaid"), $objecttmp->errors, 'errors');
+					} else if($objecttmp->resteapayer<0){
+						$error++;
+						setEventMessages($objecttmp->ref.' '.$langs->trans("AmountMustBePositive"), $objecttmp->errors, 'errors');
+					}
+					if(!($objecttmp->statut > Facture::STATUS_DRAFT)){
+						$error++;
+						setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
+					}
+					
+					$rsql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
+					$rsql .= " , pfd.date_traite as date_traite";
+					$rsql .= " , pfd.amount";
+					$rsql .= " , u.rowid as user_id, u.lastname, u.firstname, u.login";
+					$rsql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+					$rsql .= " , ".MAIN_DB_PREFIX."user as u";
+					$rsql .= " WHERE fk_facture = ".$objecttmp->id;
+					$rsql .= " AND pfd.fk_user_demande = u.rowid";
+					$rsql .= " AND pfd.traite = 0";
+					$rsql .= " ORDER BY pfd.date_demande DESC";
+
+					$result_sql = $db->query($rsql);
+					if ($result_sql)
+					{
+						$numprlv = $db->num_rows($result_sql);
+					}
+			
+					if($numprlv>0){
+						$error++;
+						setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'errors');
+					}
+					
+				}
+			}
+		
+
+			//Massive withdraw request	
+			if(!empty($listofbills) && empty($error)){
+				
+				foreach($listofbills as $aBill)
+				{
+				
+					
+					$db->begin();
+    	   			$result = $aBill->demande_prelevement($user, $aBill->resteapayer);
+    	   			if ($result > 0)
+    	   			{
+    	   				$db->commit();
+    	       			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+   					 }
+    	   			else
+					{
+						
+		      			$db->rollback();
+		      			setEventMessages($aBill->error, $aBill->errors, 'errors');
+   			 		}	
+				
+				}
+			}	
+		}
+
+	}
 	
     if ($sall)
     {
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 5bb77a19245..bae477e8a09 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -489,3 +489,4 @@ DeleteRepeatableInvoice=Supprimer facture modèle
 ConfirmDeleteRepeatableInvoice=Est-ce votre sûr de vouloir supprimer la facture modèle ?
 CreateOneBillByThird=Créer une facture par tiers (sinon, une facture par commande)
 BillCreated=%s facture(s) créée(s)
+WithdrawRequest=Demande de prélèvement

From 6011c98515c241a1aacae7391e80383b5c2201d5 Mon Sep 17 00:00:00 2001
From: Quentin Vial-Gouteyron <quentin@mail.atm-consulting.fr>
Date: Tue, 24 Jan 2017 12:22:23 +0100
Subject: [PATCH 0167/1163] FIX payment method exception

---
 htdocs/compta/facture/list.php | 6 +++++-
 htdocs/langs/fr_FR/bills.lang  | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 4dce7418159..3757f9fec2a 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -646,6 +646,10 @@ if ($resql)
 						$error++;
 						setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'errors');
 					}
+					if($objecttmp->mode_reglement_id != 3){
+						$error++;
+						setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
+					}
 					
 				}
 			}
@@ -663,7 +667,7 @@ if ($resql)
     	   			if ($result > 0)
     	   			{
     	   				$db->commit();
-    	       			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+    	       			setEventMessages( $langs->trans("RecordSaved"), null, 'mesgs');
    					 }
     	   			else
 					{
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index bae477e8a09..e361fdb9f2b 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -490,3 +490,4 @@ ConfirmDeleteRepeatableInvoice=Est-ce votre sûr de vouloir supprimer la facture
 CreateOneBillByThird=Créer une facture par tiers (sinon, une facture par commande)
 BillCreated=%s facture(s) créée(s)
 WithdrawRequest=Demande de prélèvement
+BadPaymentMethod=Mauvais mode de paiement
\ No newline at end of file

From f591e2b1b14efe417b8e314d62e9ec75647a63e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 24 Jan 2017 14:29:05 +0100
Subject: [PATCH 0168/1163] FIX Combo list of VAT is wrong on POS

---
 htdocs/cashdesk/tpl/facturation1.tpl.php | 24 +++++++-----------------
 htdocs/core/class/html.form.class.php    | 22 +++++++++++++---------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index 208727a7644..8f74cf98626 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -125,23 +125,13 @@ $langs->load("cashdesk");
     			<td><input class="texte1_off maxwidth50onsmartphone" type="text" name="txtTotal" value="" disabled /></td><td></td>
                 <!-- Choix du taux de TVA -->
                 <td class="select_tva">
-                <?php //var_dump($tab_tva); ?>
-                <select name="selTva" onchange="javascript: modif();" >
-                    <?php
-                        $tva_tx = $obj_facturation->tva();  // Try to get a previously entered VAT rowid. First time, this will return empty.
-
-                        $tab_tva_size=count($tab_tva);      // $tab_tva contains list of possible vat array('rowid'=> , 'taux'=> ) 
-                        for ($i=0;$i < $tab_tva_size;$i++) 
-                        {
-                            if ($tva_tx == $tab_tva[$i]['rowid'])
-                                $selected = 'selected';
-                            else
-                                $selected = '';
-
-                            echo '<option '.$selected.' value="'.$tab_tva[$i]['rowid'].'">'.$tab_tva[$i]['taux'].'</option>'."\n               ";
-                        }
-                    ?>
-                </select>
+                <?php //var_dump($tab_tva); 
+					$tva_tx = $obj_facturation->tva();  // Try to get a previously entered VAT rowid. First time, this will return empty.
+					$buyer = new Societe($db);
+					if ($_SESSION["CASHDESK_ID_THIRDPARTY"] > 0) $buyer->fetch($_SESSION["CASHDESK_ID_THIRDPARTY"]);
+					
+					echo $form->load_tva('selTva', (isset($_POST["selTva"])?GETPOST("selTva",'alpha',2):-1), $mysoc, $buyer, 0, 0, '', false, -1);
+			    ?>
                 </td>
 			</tr>
 		</table>
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 22a397fb4e7..bc761b2d2b1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4257,7 +4257,7 @@ class Form
 
         dol_syslog(__METHOD__, LOG_DEBUG);
 
-        $sql  = "SELECT DISTINCT t.code, t.taux, t.recuperableonly";
+        $sql  = "SELECT DISTINCT t.rowid, t.code, t.taux, t.recuperableonly";
     	$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
     	$sql.= " WHERE t.fk_pays = c.rowid";
     	$sql.= " AND t.active > 0";
@@ -4273,6 +4273,7 @@ class Form
     			for ($i = 0; $i < $num; $i++)
     			{
     				$obj = $this->db->fetch_object($resql);
+    				$this->cache_vatrates[$i]['rowid']	= $obj->rowid;
     				$this->cache_vatrates[$i]['code']	= $obj->code;
     				$this->cache_vatrates[$i]['txtva']	= $obj->taux;
     				$this->cache_vatrates[$i]['libtva']	= $obj->taux.'%'.($obj->code?' ('.$obj->code.')':'');   // Label must contains only 0-9 , . % or *
@@ -4302,9 +4303,9 @@ class Form
      *  @param  float|string  $selectedrate       Force preselected vat rate. Can be '8.5' or '8.5 (NOO)' for example. Use '' for no forcing.
      *  @param  Societe	      $societe_vendeuse   Thirdparty seller
      *  @param  Societe	      $societe_acheteuse  Thirdparty buyer
-     *  @param  int		      $idprod             Id product
+     *  @param  int		      $idprod             Id product. O if unknown of NA.
      *  @param  int		      $info_bits          Miscellaneous information on line (1 for NPR)
-     *  @param  int		      $type               ''=Unknown, 0=Product, 1=Service (Used if idprod not defined)
+     *  @param  int|string    $type               ''=Unknown, 0=Product, 1=Service (Used if idprod not defined)
      *                  		                  Si vendeur non assujeti a TVA, TVA par defaut=0. Fin de regle.
      *                  					      Si le (pays vendeur = pays acheteur) alors la TVA par defaut=TVA du produit vendu. Fin de regle.
      *                  					      Si (vendeur et acheteur dans Communaute europeenne) et bien vendu = moyen de transports neuf (auto, bateau, avion), TVA par defaut=0 (La TVA doit etre paye par l'acheteur au centre d'impots de son pays et non au vendeur). Fin de regle.
@@ -4312,10 +4313,10 @@ class Form
 	 *                                            Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.
      *                  					      Sinon la TVA proposee par defaut=0. Fin de regle.
      *  @param	bool	     $options_only		  Return HTML options lines only (for ajax treatment)
-     *  @param  int          $addcode             Add code into key in select list
+     *  @param  int          $mode                1=Add code into key in select list
      *  @return	string
      */
-    function load_tva($htmlname='tauxtva', $selectedrate='', $societe_vendeuse='', $societe_acheteuse='', $idprod=0, $info_bits=0, $type='', $options_only=false, $addcode=0)
+    function load_tva($htmlname='tauxtva', $selectedrate='', $societe_vendeuse='', $societe_acheteuse='', $idprod=0, $info_bits=0, $type='', $options_only=false, $mode=0)
     {
         global $langs,$conf,$mysoc;
 
@@ -4427,10 +4428,13 @@ class Form
         		// Keep only 0 if seller is not subject to VAT
         		if ($disabled && $rate['txtva'] != 0) continue;
 
-        		$return.= '<option value="'.$rate['txtva'];
-        		$return.= $rate['nprtva'] ? '*': '';
-        		if ($addcode && $rate['code']) $return.=' ('.$rate['code'].')';
-        		$return.= '"';
+        		// Define key to use into select list
+        		$key = $rate['txtva'];
+        		$key.= $rate['nprtva'] ? '*': '';
+        		if ($mode > 0 && $rate['code']) $key.=' ('.$rate['code'].')';
+        		if ($mode < 0) $key = $rate['rowid'];
+        		
+        		$return.= '<option value="'.$key.'"';
         		if (! $selectedfound)
         		{
             		if ($defaultcode) // If defaultcode is defined, we used it in priority to select combo option instead of using rate+npr flag

From d076ffe73b0bd87cb9172712cb31f39d0338bd1d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 24 Jan 2017 15:03:33 +0100
Subject: [PATCH 0169/1163] Use correct thirdparty for numbering module

---
 htdocs/cashdesk/validation_verif.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index afe73820568..5775a3c9388 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -47,15 +47,25 @@ switch ($action)
 
 
 	case 'valide_achat':
-
+        
+	    $thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
+	    
 		$company=new Societe($db);
-		$company->fetch($conf->global->CASHDESK_ID_THIRDPARTY);
+		$company->fetch($thirdpartyid);
 
 		$invoice=new Facture($db);
 		$invoice->date=dol_now();
 		$invoice->type= Facture::TYPE_STANDARD;
+		
+		// TODO
+		// To use a specific numbering module for POS, reset $conf->global->FACTURE_ADDON and other vars here
+		// and restore after values just after
+		
 		$num=$invoice->getNextNumRef($company);
 
+		// TODO Restore save values
+		
+		
 		$obj_facturation->numInvoice($num);
 
 		$obj_facturation->getSetPaymentMode($_POST['hdnChoix']);

From 94b42021bd3a43e2ad1d5cfda105ab2e5d70cbc9 Mon Sep 17 00:00:00 2001
From: Quentin Vial-Gouteyron <quentin@mail.atm-consulting.fr>
Date: Tue, 24 Jan 2017 15:15:31 +0100
Subject: [PATCH 0170/1163] fix payment method

---
 htdocs/compta/facture/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 3757f9fec2a..dcb0deeb2dd 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -646,7 +646,7 @@ if ($resql)
 						$error++;
 						setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'errors');
 					}
-					if($objecttmp->mode_reglement_id != 3){
+					if(!empty($objecttmp->mode_reglement_id ) && $objecttmp->mode_reglement_id != 3){
 						$error++;
 						setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
 					}

From 06d9f99d05e4120a2cf5efa4b5773bf221bd0fed Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Wed, 25 Jan 2017 11:01:35 +0100
Subject: [PATCH 0171/1163] fix travis

---
 htdocs/bookmarks/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index b89dbf291b7..0924f7d8a9b 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -220,7 +220,7 @@ if ($id > 0 && ! preg_match('/^add/i',$action))
 	$linkback = '<a href="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans("BackToList").'</a>';
 	
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '' , '', 0, '', '', 0);
-
+	
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 

From e73a132ed963679fd405a1770df0b6e18f8f33ed Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Wed, 25 Jan 2017 16:24:12 +0100
Subject: [PATCH 0172/1163] PHP7 warning error on $page not affected

---
 htdocs/product/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 4f1f97cef8a..8b8d2cb18b1 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -65,7 +65,7 @@ $optioncss = GETPOST('optioncss','alpha');
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
 if ($page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;

From 3c86507ce6f72ffebb6c664ffe7bce1d5b9726ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Jan 2017 00:51:22 +0100
Subject: [PATCH 0173/1163] FIX #6328

---
 htdocs/core/class/commonobject.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index dd84561d230..7aa8249f1b7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2151,6 +2151,8 @@ abstract class CommonObject
      */
     function update_note($note,$suffix='')
     {
+        global $user;
+        
     	if (! $this->table_element)
     	{
     		dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);
@@ -2167,6 +2169,7 @@ abstract class CommonObject
             
     	$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
     	$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
+    	$sql.= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))?"fk_user_mod":"fk_user_modif")." = ".$user->id;
     	$sql.= " WHERE rowid =". $this->id;
 
     	dol_syslog(get_class($this)."::update_note", LOG_DEBUG);

From 9f1959ffc86e2123c5ae7c25a5610ef1f62701d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Jan 2017 01:21:20 +0100
Subject: [PATCH 0174/1163] Fix MVC Actions must be done before output

---
 htdocs/compta/facture/list.php      | 196 +++++++++++++++-------------
 htdocs/langs/en_US/withdrawals.lang |   1 +
 2 files changed, 103 insertions(+), 94 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index dcb0deeb2dd..01620bc3c40 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -229,6 +229,103 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
+if ($massaction == 'withdrawrequest')
+{
+    $langs->load("withdrawals");
+    
+    if (!$user->rights->prelevement->bons->creer)
+    {
+        $error++;
+        setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+    }
+    else 
+    {
+        //Checking error
+        $error = 0;
+        	
+	    $arrayofselected=is_array($toselect)?$toselect:array();
+        $listofbills=array();
+        foreach($arrayofselected as $toselectid)
+        {
+            $objecttmp=new Facture($db);
+            $result=$objecttmp->fetch($toselectid);
+            if ($result > 0)
+            {
+                $totalpaye  = $objecttmp->getSommePaiement();
+                $totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
+                $totaldeposits = $objecttmp->getSumDepositsUsed();
+                $objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits,'MT');
+                $listofbills[] = $objecttmp;
+                if($objecttmp->paye || $objecttmp->resteapayer==0){
+                    $error++;
+                    setEventMessages($objecttmp->ref.' '.$langs->trans("AlreadyPaid"), $objecttmp->errors, 'errors');
+                } else if($objecttmp->resteapayer<0){
+                    $error++;
+                    setEventMessages($objecttmp->ref.' '.$langs->trans("AmountMustBePositive"), $objecttmp->errors, 'errors');
+                }
+                if(!($objecttmp->statut > Facture::STATUS_DRAFT)){
+                    $error++;
+                    setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
+                }
+                	
+                $rsql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
+                $rsql .= " , pfd.date_traite as date_traite";
+                $rsql .= " , pfd.amount";
+                $rsql .= " , u.rowid as user_id, u.lastname, u.firstname, u.login";
+                $rsql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+                $rsql .= " , ".MAIN_DB_PREFIX."user as u";
+                $rsql .= " WHERE fk_facture = ".$objecttmp->id;
+                $rsql .= " AND pfd.fk_user_demande = u.rowid";
+                $rsql .= " AND pfd.traite = 0";
+                $rsql .= " ORDER BY pfd.date_demande DESC";
+
+                $result_sql = $db->query($rsql);
+                if ($result_sql)
+                {
+                    $numprlv = $db->num_rows($result_sql);
+                }
+                	
+                if($numprlv>0){
+                    $error++;
+                    setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'errors');
+                }
+                if(!empty($objecttmp->mode_reglement_id ) && $objecttmp->mode_reglement_id != 3){
+                    $error++;
+                    setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
+                }
+                	
+            }
+        }
+
+        //Massive withdraw request
+        if(!empty($listofbills) && empty($error))
+        {
+            $nbwithdrawrequestok=0;
+            foreach($listofbills as $aBill)
+            {
+                $db->begin();
+                $result = $aBill->demande_prelevement($user, $aBill->resteapayer);
+                if ($result > 0)
+                {
+                    $db->commit();
+                    $nbwithdrawrequestok++;
+                }
+                else
+                {
+
+                    $db->rollback();
+                    setEventMessages($aBill->error, $aBill->errors, 'errors');
+                }
+            }
+            if ($nbwithdrawrequestok > 0)
+            {
+                setEventMessages($langs->trans("WithdrawRequestsDone", $nbwithdrawrequestok), null, 'mesgs');
+            }   
+        }
+    }
+
+}
+
     
 
 /*
@@ -461,8 +558,12 @@ if ($resql)
 	$arrayofmassactions=array(
 	    'presend'=>$langs->trans("SendByMail"),
 	    'builddoc'=>$langs->trans("PDFMerge"),
-		'withdrawrequest'=>$langs->trans("WithdrawRequest")
 	);
+	if ($conf->prelevement->enabled)
+	{
+	   $langs->load("withdrawals");
+	   $arrayofmassactions['withdrawrequest']=$langs->trans("MakeWithdrawRequest");
+	}
 	if ($user->rights->facture->supprimer) 
 	{
 	    //if (! empty($conf->global->STOCK_CALCULATE_ON_BILL) || empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED))
@@ -589,99 +690,6 @@ if ($resql)
         dol_fiche_end();
 	}
 
-	if ($massaction == 'withdrawrequest')
-	{
-		if (!$user->rights->prelevement->bons->creer)
-    	{
-   			$error++;
-			setEventMessages($langs->trans("NotEnoughPermissions"), $objecttmp->errors, 'errors');
-		}
-		else {		
-			
-			//Checking error
-			$error = 0;
-			
-			$listofbills=array();
-			foreach($arrayofselected as $toselectid)
-			{
-				$objecttmp=new Facture($db);
-				$result=$objecttmp->fetch($toselectid);
-				if ($result > 0) 
-				{
-					$totalpaye  = $objecttmp->getSommePaiement();
-					$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
-					$totaldeposits = $objecttmp->getSumDepositsUsed();
-					$objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits,'MT');
-					$listofbills[] = $objecttmp;
-					if($objecttmp->paye || $objecttmp->resteapayer==0){
-						$error++;
-						setEventMessages($objecttmp->ref.' '.$langs->trans("AlreadyPaid"), $objecttmp->errors, 'errors');
-					} else if($objecttmp->resteapayer<0){
-						$error++;
-						setEventMessages($objecttmp->ref.' '.$langs->trans("AmountMustBePositive"), $objecttmp->errors, 'errors');
-					}
-					if(!($objecttmp->statut > Facture::STATUS_DRAFT)){
-						$error++;
-						setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
-					}
-					
-					$rsql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
-					$rsql .= " , pfd.date_traite as date_traite";
-					$rsql .= " , pfd.amount";
-					$rsql .= " , u.rowid as user_id, u.lastname, u.firstname, u.login";
-					$rsql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-					$rsql .= " , ".MAIN_DB_PREFIX."user as u";
-					$rsql .= " WHERE fk_facture = ".$objecttmp->id;
-					$rsql .= " AND pfd.fk_user_demande = u.rowid";
-					$rsql .= " AND pfd.traite = 0";
-					$rsql .= " ORDER BY pfd.date_demande DESC";
-
-					$result_sql = $db->query($rsql);
-					if ($result_sql)
-					{
-						$numprlv = $db->num_rows($result_sql);
-					}
-			
-					if($numprlv>0){
-						$error++;
-						setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'errors');
-					}
-					if(!empty($objecttmp->mode_reglement_id ) && $objecttmp->mode_reglement_id != 3){
-						$error++;
-						setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
-					}
-					
-				}
-			}
-		
-
-			//Massive withdraw request	
-			if(!empty($listofbills) && empty($error)){
-				
-				foreach($listofbills as $aBill)
-				{
-				
-					
-					$db->begin();
-    	   			$result = $aBill->demande_prelevement($user, $aBill->resteapayer);
-    	   			if ($result > 0)
-    	   			{
-    	   				$db->commit();
-    	       			setEventMessages( $langs->trans("RecordSaved"), null, 'mesgs');
-   					 }
-    	   			else
-					{
-						
-		      			$db->rollback();
-		      			setEventMessages($aBill->error, $aBill->errors, 'errors');
-   			 		}	
-				
-				}
-			}	
-		}
-
-	}
-	
     if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index a0706fe11a9..3d16cce28e5 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited

From fcfea4e6d147a7193783d71b81cd7c6d74c87b7b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Jan 2017 13:26:31 +0100
Subject: [PATCH 0175/1163] Add missing field fk_user_modif

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 2 ++
 htdocs/install/mysql/tables/llx_holiday.sql    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 268979efba0..2da08cfbdb0 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -47,3 +47,5 @@ ALTER TABLE llx_c_email_templates ADD COLUMN content_lines text;
 
 ALTER TABLE llx_loan ADD COLUMN fk_projet integer DEFAULT NULL;
 
+ALTER TABLE llx_holiday ADD COLUMN fk_user_modif integer;
+
diff --git a/htdocs/install/mysql/tables/llx_holiday.sql b/htdocs/install/mysql/tables/llx_holiday.sql
index 0af8b35b041..2a981444df3 100644
--- a/htdocs/install/mysql/tables/llx_holiday.sql
+++ b/htdocs/install/mysql/tables/llx_holiday.sql
@@ -22,6 +22,7 @@ rowid          integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
 entity         integer DEFAULT 1 NOT NULL,		-- Multi company id
 fk_user        integer NOT NULL,
 fk_user_create integer,
+fk_user_modif  integer,
 fk_type        integer NOT NULL,
 date_create    DATETIME NOT NULL,
 description    VARCHAR( 255 ) NOT NULL,

From 10bacda8209e088425502c1b902f1ff047c1a939 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Jan 2017 13:56:16 +0100
Subject: [PATCH 0176/1163] Prepare migration 5-6

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4f32a1dea43..bf34c86bd58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -292,6 +292,9 @@ script:
   php upgrade.php 4.0.0 5.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade400500.log
   php upgrade2.php 4.0.0 5.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade400500-2.log
   php step5.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-3.log
+  php upgrade.php 5.0.0 6.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade500600.log
+  php upgrade2.php 5.0.0 6.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade500600-2.log
+  php step5.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-3.log
   cd -
   set +e
   echo

From 055a00a33804fd0f41f4f2c7655a72031c482407 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 27 Jan 2017 15:18:12 +0100
Subject: [PATCH 0177/1163] fix travis

---
 htdocs/core/class/commonobject.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 36999f12dc7..4a84ac6a829 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2151,6 +2151,8 @@ abstract class CommonObject
      */
     function update_note($note,$suffix='')
     {
+        global $user;
+        
     	if (! $this->table_element)
     	{
     		dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);
@@ -2167,6 +2169,7 @@ abstract class CommonObject
             
     	$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
     	$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
+    	$sql.= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))?"fk_user_mod":"fk_user_modif")." = ".$user->id;
     	$sql.= " WHERE rowid =". $this->id;
 
     	dol_syslog(get_class($this)."::update_note", LOG_DEBUG);

From 56d75c552d5e25634effcd8b2ca12b1ed7631136 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sun, 29 Jan 2017 13:04:06 +0100
Subject: [PATCH 0178/1163] New movement stock can be linked to project

---
 htdocs/product/class/product.class.php        | 16 +++++++++--
 .../stock/class/mouvementstock.class.php      | 27 +++++++++++++++++++
 htdocs/product/stock/mouvement.php            | 23 ++++++++++++++--
 htdocs/product/stock/product.php              | 24 ++++++++++++++---
 .../product/stock/tpl/stockcorrection.tpl.php |  9 ++++++-
 5 files changed, 91 insertions(+), 8 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 34faaddfe4e..71213bd923e 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3518,20 +3518,26 @@ class Product extends CommonObject
 	 * 	@param		string	$label			Label of stock movement
 	 * 	@param		double	$price			Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed.
 	 *  @param		string	$inventorycode	Inventory code
+	 *  @param  	string	$origin_element Origin element type
+	 *  @param  	int		$origin_id      Origin id of element
 	 * 	@return     int     				<0 if KO, >0 if OK
 	 */
-	function correct_stock($user, $id_entrepot, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
+	function correct_stock($user, $id_entrepot, $nbpiece, $movement, $label='', $price=0, $inventorycode='', $origin_element='', $origin_id=null)
 	{
 		if ($id_entrepot)
 		{
 			$this->db->begin();
 
 			require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
+			
+			// If remove stock then save it the actual PMP as price (the new calculation of PMP is triggered only with $movement = 0 || 3 )
+			if ($movement == 1) $price = $this->pmp;
 
 			$op[0] = "+".trim($nbpiece);
 			$op[1] = "-".trim($nbpiece);
 
 			$movementstock=new MouvementStock($this->db);
+			$movementstock->setOrigin($origin_element, $origin_id);
 			$result=$movementstock->_create($user,$this->id,$id_entrepot,$op[$movement],$movement,$price,$label,$inventorycode);
 
 			if ($result >= 0)
@@ -3563,9 +3569,11 @@ class Product extends CommonObject
 	 * 	@param		date	$dluo			sell-by date
 	 * 	@param		string	$lot			Lot number
 	 *  @param		string	$inventorycode	Inventory code
+	 *  @param  	string	$origin_element Origin element type
+	 *  @param  	int		$origin_id      Origin id of element
 	 * 	@return     int     				<0 if KO, >0 if OK
 	 */
-	function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label='', $price=0, $dlc='', $dluo='',$lot='', $inventorycode='')
+	function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label='', $price=0, $dlc='', $dluo='',$lot='', $inventorycode='', $origin_element='', $origin_id=null)
 	{
 		if ($id_entrepot)
 		{
@@ -3573,10 +3581,14 @@ class Product extends CommonObject
 
 			require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
 
+			// If remove stock then save it the actual PMP as price (the new calculation of PMP is triggered only with $movement = 0 || 3 )
+			if ($movement == 1) $price = $this->pmp;
+			
 			$op[0] = "+".trim($nbpiece);
 			$op[1] = "-".trim($nbpiece);
 
 			$movementstock=new MouvementStock($this->db);
+			$movementstock->setOrigin($origin_element, $origin_id);
 			$result=$movementstock->_create($user,$this->id,$id_entrepot,$op[$movement],$movement,$price,$label,$inventorycode,'',$dlc,$dluo,$lot);
 
 			if ($result >= 0)
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index dee344b6a5b..6a09dde054c 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -893,6 +893,33 @@ class MouvementStock extends CommonObject
 
 		return '';
 	}
+	
+	/**
+	 * Set attribute origin to object
+	 * 
+	 * @param	string	$origin_element
+	 * @param	int		$origin_id
+	 * 
+	 * @return	void
+	 */
+	function setOrigin($origin_element, $origin_id)
+	{
+		if (!empty($origin_element) && $origin_id > 0)
+		{
+			$origin='';
+			if ($origin_element == 'project')
+			{
+				if (!class_exists('Project')) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+				$origin = new Project($this->db);
+			}
+
+			if (!empty($origin))
+			{
+				$this->origin = $origin;
+				$this->origin->id = $origin_id;
+			}
+		}
+	}
 
 
 	/**
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 8e6775e2e6e..f5d9cbab8e2 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -34,6 +34,11 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+if (! empty($conf->projet->enabled))
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+}
 
 $langs->load("products");
 $langs->load("stocks");
@@ -156,6 +161,15 @@ if ($action == "correct_stock")
 
 	if (! $error)
     {
+		$origin_element = '';
+		$origin_id = null;
+		
+		if (GETPOST('projectid', 'int'))
+		{
+			$origin_element = 'project';
+			$origin_id = GETPOST('projectid', 'int');
+		}
+		
         if ($product->hasbatch())
         {
         	$batch=GETPOST('batch_number');
@@ -173,7 +187,9 @@ if ($action == "correct_stock")
 	            GETPOST("label",'san_alpha'),
 	            GETPOST('unitprice'),
 	        	$eatby,$sellby,$batch,
-	        	GETPOST('inventorycode')
+	        	GETPOST('inventorycode'),
+	        	$origin_element,
+	        	$origin_id
 	        );		// We do not change value of stock for a correction
         }
         else
@@ -185,7 +201,9 @@ if ($action == "correct_stock")
 	            GETPOST("mouvement"),
 	            GETPOST("label",'san_alpha'),
 	            GETPOST('unitprice'),
-	        	GETPOST('inventorycode')
+	        	GETPOST('inventorycode'),
+	        	$origin_element,
+	        	$origin_id
 	        );		// We do not change value of stock for a correction
         }
 
@@ -392,6 +410,7 @@ $userstatic=new User($db);
 $form=new Form($db);
 $formother=new FormOther($db);
 $formproduct=new FormProduct($db);
+if (!empty($conf->projet->enabled)) $formproject=new FormProjets($db);
 
 $sql = "SELECT p.rowid, p.ref as product_ref, p.label as produit, p.fk_product_type as type, p.entity,";
 $sql.= " e.label as stock, e.rowid as entrepot_id, e.lieu,";
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 6bcf98e96c1..158440c5855 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -37,6 +37,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productstockentrepot.class.php';
 if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+if (! empty($conf->projet->enabled))
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+}
 
 $langs->load("products");
 $langs->load("orders");
@@ -220,6 +225,15 @@ if ($action == "correct_stock" && ! $cancel)
 		$priceunit=price2num(GETPOST("unitprice"));
 		if (is_numeric(GETPOST("nbpiece")) && $id)
 		{
+			$origin_element = '';
+			$origin_id = null;
+
+			if (GETPOST('projectid', 'int'))
+			{
+				$origin_element = 'project';
+				$origin_id = GETPOST('projectid', 'int');
+			}
+		
 			if (empty($object)) {
 				$object = new Product($db);
 				$result=$object->fetch($id);
@@ -236,7 +250,9 @@ if ($action == "correct_stock" && ! $cancel)
 					$d_eatby,
 					$d_sellby,
 					$batchnumber,
-					GETPOST('inventorycode')
+					GETPOST('inventorycode'),
+					$origin_element,
+					$origin_id
 				);		// We do not change value of stock for a correction
 			}
 			else
@@ -248,7 +264,9 @@ if ($action == "correct_stock" && ! $cancel)
 		    		GETPOST("mouvement"),
 		    		GETPOST("label"),
 		    		$priceunit,
-					GETPOST('inventorycode')
+					GETPOST('inventorycode'),
+					$origin_element,
+					$origin_id
 				);		// We do not change value of stock for a correction
 			}
 
@@ -490,7 +508,7 @@ if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
 
 $form = new Form($db);
 $formproduct=new FormProduct($db);
-
+if (! empty($conf->projet->enabled)) $formproject=new FormProjets($db);
 
 if ($id > 0 || $ref)
 {
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index ac37566457f..d08cf334671 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -77,7 +77,14 @@
 		// Purchase price
 		print '<tr>';
 		print '<td width="20%" colspan="2">'.$langs->trans("UnitPurchaseValue").'</td>';
-		print '<td colspan="4"><input class="flat" name="unitprice" id="unitprice" size="10" value="'.GETPOST("unitprice").'"></td>';
+		print '<td colspan="'.(!empty($conf->projet->enabled) ? '2' : '4').'"><input class="flat" name="unitprice" id="unitprice" size="10" value="'.GETPOST("unitprice").'"></td>';
+		if (! empty($conf->projet->enabled))
+		{
+			print '<td>'.$langs->trans('Project').'</td>';
+			print '<td>';
+			$formproject->select_projects();
+			print '</td>';	
+		}
 		print '</tr>';
 
 		// Serial / Eat-by date

From ccad6d6ddee596a9aa58ac38083eece4edb664ea Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sun, 29 Jan 2017 13:36:33 +0100
Subject: [PATCH 0179/1163] New show on project "overview" tab the informations
 about movements stock

---
 htdocs/core/class/html.formprojet.class.php   |  8 +-
 htdocs/langs/en_US/stocks.lang                |  2 +
 .../stock/class/mouvementstock.class.php      | 86 +++++++++++++++++++
 htdocs/product/stock/mouvement.php            | 10 ++-
 htdocs/projet/class/project.class.php         |  4 +
 htdocs/projet/element.php                     | 29 ++++++-
 6 files changed, 132 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 0129f1c1382..064c8bd1d8d 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -460,7 +460,7 @@ class FormProjets
 		if ($table_element == 'projet_task') return '';		// Special cas of element we never link to a project (already always done)
 
 		$linkedtothirdparty=false;
-		if (! in_array($table_element, array('don','expensereport_det','expensereport','loan'))) $linkedtothirdparty=true;
+		if (! in_array($table_element, array('don','expensereport_det','expensereport','loan','stock_mouvement'))) $linkedtothirdparty=true;
 
 		$sqlfilter='';
 		$projectkey="fk_projet";
@@ -499,6 +499,10 @@ class FormProjets
 			case "fichinter":
 			    $sql = "SELECT t.rowid, t.ref";
 			    break;
+			case 'stock_mouvement':
+				$sql = 'SELECT t.rowid, t.label as ref';
+				$projectkey='fk_origin';
+				break;
 			default:
 				$sql = "SELECT t.rowid, t.ref";
 				break;
@@ -512,7 +516,7 @@ class FormProjets
 		    if (is_numeric($socid)) $sql.= " AND t.fk_soc=".$socid;
 		    else $sql.= " AND t.fk_soc IN (".$socid.")";
 		}
-		if (! in_array($table_element, array('expensereport_det'))) $sql.= ' AND t.entity IN ('.getEntity('project',1).')';
+		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) $sql.= ' AND t.entity IN ('.getEntity('project',1).')';
 		if ($linkedtothirdparty) $sql.=" AND s.rowid = t.fk_soc";
 		if ($sqlfilter) $sql.= " AND ".$sqlfilter;
 		$sql.= " ORDER BY ref DESC";
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index f7a77db4821..cfced089c3a 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -22,6 +22,8 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Location
 LocationSummary=Short name location
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 6a09dde054c..53ab3163566 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -938,4 +938,90 @@ class MouvementStock extends CommonObject
 
         // There is no specific properties. All data into insert are provided as method parameter.
     }
+	
+	/**
+	 *  Return a link (with optionaly the picto)
+	 * 	Use this->id,this->lastname, this->firstname
+	 *
+	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *	@param	string	$option				On what the link point to
+	 *  @param	integer	$notooltip			1=Disable tooltip
+	 *  @param	int		$maxlen				Max length of visible user name
+	 *  @param  string  $morecss            Add more css on link
+	 *	@return	string						String with URL
+	 */
+	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
+	{
+		global $langs, $conf, $db;
+
+		$result = '';
+		$companylink = '';
+
+		$label = '<u>' . $langs->trans("Movement") . ' '.$this->id.'</u>';
+		$label.= '<div width="100%">';
+		$label.= '<b>' . $langs->trans('Label') . ':</b> ' . $this->label;
+		$label.= '<br /><b>' . $langs->trans('Qty') . ':</b> ' .$this->qty;
+		$label.= '</div>';
+
+		$link = '<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?id='.$this->warehouse_id.'&msid='.$this->id.'"';
+		$link.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
+		$link.= '>';
+		$linkend='</a>';
+
+		if ($withpicto)
+		{
+			$result.=($link.img_object(($notooltip?'':$label), 'stock', ($notooltip?'':'class="classfortooltip"')).$linkend);
+			if ($withpicto != 2) $result.=' ';
+		}
+		$result.= $link . $this->id . $linkend;
+		return $result;
+	}
+	
+	/**
+	 *  Return label statut
+	 *
+	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return	string 			       Label of status
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($mode);
+	}
+	
+	/**
+	 *  Renvoi le libelle d'un status donne
+	 *
+	 *  @param	int		$status        	Id status
+	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return string 			       	Label of status
+	 */
+	function LibStatut($mode=0)
+	{
+		global $langs;
+
+		if ($mode == 0)
+		{
+			return $langs->trans('StatusNotApplicable');
+		}
+		if ($mode == 1)
+		{
+			return $langs->trans('StatusNotApplicable');
+		}
+		if ($mode == 2)
+		{
+			return img_picto($langs->trans('StatusNotApplicable'),'statut9').' '.$langs->trans('StatusNotApplicable');
+		}
+		if ($mode == 3)
+		{
+			return img_picto($langs->trans('StatusNotApplicable'),'statut9');
+		}
+		if ($mode == 4)
+		{
+			return img_picto($langs->trans('StatusNotApplicable'),'statut9').' '.$langs->trans('StatusNotApplicable');
+		}
+		if ($mode == 5)
+		{
+			return $langs->trans('StatusNotApplicable').' '.img_picto($langs->trans('StatusNotApplicable'),'statut9');
+		}
+	}
 }
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index f5d9cbab8e2..a5daa87a510 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -48,6 +48,7 @@ if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
 $result=restrictedArea($user,'stock');
 
 $id=GETPOST('id','int');
+$msid=GETPOST('msid','int');
 $product_id=GETPOST("product_id");
 $action=GETPOST('action');
 $cancel=GETPOST('cancel');
@@ -431,6 +432,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON m.fk_user_author = u.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON m.batch = pl.batch AND m.fk_product = pl.fk_product";
 $sql.= " WHERE m.fk_product = p.rowid";
+if ($msid > 0) $sql .= " AND m.rowid = ".$msid;
 $sql.= " AND m.fk_entrepot = e.rowid";
 $sql.= " AND e.entity IN (".getEntity('stock', 1).")";
 if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql.= " AND p.fk_product_type = 0";
@@ -511,8 +513,12 @@ if ($resql)
 	
     $i = 0;
     $help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-    $texte = $langs->trans("ListOfStockMovements");
-    if ($id) $texte.=' ('.$langs->trans("ForThisWarehouse").')';
+    if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
+	else
+	{
+		$texte = $langs->trans("ListOfStockMovements");
+		if ($id) $texte.=' ('.$langs->trans("ForThisWarehouse").')';
+	}
     llxHeader("",$texte,$help_url);
 
     /*
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 65c4e6bc94c..c7afb489634 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -496,6 +496,10 @@ class Project extends CommonObject
 		{
 			$sql = "SELECT DISTINCT pt.rowid, ptt.fk_user FROM " . MAIN_DB_PREFIX . "projet_task as pt, " . MAIN_DB_PREFIX . "projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet=" . $this->id;
 		}
+		elseif ($type == 'stock_mouvement')
+		{
+			$sql = 'SELECT ms.rowid, ms.fk_user_author as fk_user FROM ' . MAIN_DB_PREFIX . 'stock_mouvement as ms WHERE ms.origintype = "project" AND ms.fk_origin = ' . $this->id . ' AND ms.type_mouvement = 1';
+		}
         else
 		{
             $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $tablename." WHERE fk_projet=" . $this->id;
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 908acd89b3f..2853b9031da 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -48,6 +48,7 @@ if (! empty($conf->expensereport->enabled)) require_once DOL_DOCUMENT_ROOT.'/exp
 if (! empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 if (! empty($conf->don->enabled))         require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 if (! empty($conf->loan->enabled))        require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+if (! empty($conf->stock->enabled))	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 $langs->load("projects");
 $langs->load("companies");
@@ -397,6 +398,15 @@ $listofreferent=array(
     'buttonnew'=>'AddTimeSpent',
     'testnew'=>$user->rights->projet->creer,
     'test'=>($conf->projet->enabled && $user->rights->projet->lire && empty($conf->global->PROJECT_HIDE_TASKS))),
+'stock_mouvement'=>array(
+	'name'=>"MouvementStockAssociated",
+	'title'=>"ListMouvementStockProject",
+	'class'=>'MouvementStock',
+	'margin'=>'minus',
+	'table'=>'stock_mouvement',
+	'datefieldname'=>'datem',
+	'disableamount'=>0,
+	'test'=>$conf->stock->enabled && $user->rights->stock->mouvement->lire),
 /* No need for this, available on dedicated tab "Agenda/Events"
 'agenda'=>array(
 	'name'=>"Agenda",
@@ -483,6 +493,7 @@ $langs->load("bills");
 $langs->load("orders");
 $langs->load("proposals");
 $langs->load("margins");
+if (!empty($conf->stock->enabled)) $langs->load('stocks');
 
 print load_fiche_titre($langs->trans("Profit"), '', 'title_accountancy');
 
@@ -529,6 +540,7 @@ foreach ($listofreferent as $key => $value)
                 // Special cases
 				if ($tablename != 'expensereport_det' && method_exists($element, 'fetch_thirdparty')) $element->fetch_thirdparty();
 				if ($tablename == 'don') $total_ht_by_line=$element->amount;
+				elseif ($tablename == 'stock_mouvement') $total_ht_by_line=$element->price*abs($element->qty);
 				elseif ($tablename == 'projet_task')
 				{
 					if ($idofelementuser)
@@ -553,6 +565,7 @@ foreach ($listofreferent as $key => $value)
 				if ($qualifiedfortotal) $total_ht = $total_ht + $total_ht_by_line;
 
 				if ($tablename == 'don') $total_ttc_by_line=$element->amount;
+				elseif ($tablename == 'stock_mouvement') $total_ttc_by_line=$element->price*abs($element->qty);
 				elseif ($tablename == 'projet_task')
 				{
 					$defaultvat = get_default_tva($mysoc, $mysoc);
@@ -601,6 +614,9 @@ foreach ($listofreferent as $key => $value)
 				case 'Contrat':
 					$newclassname = 'Contract';
 					break;
+				case 'MouvementStock':
+					$newclassname = 'StockMovement';
+					break;
 				default:
 					$newclassname = $classname;
 			}
@@ -717,7 +733,7 @@ foreach ($listofreferent as $key => $value)
 		// Thirdparty or user
 		print '<td>';
 		if (in_array($tablename, array('projet_task')) && $key == 'project_task') print '';		// if $key == 'project_task', we don't want details per user
-		elseif (in_array($tablename, array('expensereport_det','don','projet_task'))) print $langs->trans("User");
+		elseif (in_array($tablename, array('expensereport_det','don','projet_task','stock_mouvement'))) print $langs->trans("User");
 		else print $langs->trans("ThirdParty");
 		print '</td>';
 		// Amount HT
@@ -800,7 +816,7 @@ foreach ($listofreferent as $key => $value)
 				print "<tr ".$bc[$var].">";
 				// Remove link
 				print '<td style="width: 24px">';
-				if ($tablename != 'projet_task')
+				if ($tablename != 'projet_task' && $tablename != 'stock_mouvement')
 				{
 					print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $projectid . '&action=unlink&tablename=' . $tablename . '&elementselect=' . $element->id . '">' . img_picto($langs->trans('Unlink'), 'editdelete') . '</a>';
 				}
@@ -848,6 +864,7 @@ foreach ($listofreferent as $key => $value)
 				// Date or TimeSpent
 				$date=''; $total_time_by_line = null;
 				if ($tablename == 'expensereport_det') $date = $element->date;      // No draft status on lines
+				elseif ($tablename == 'stock_mouvement') $date = $element->datem;
 				elseif (! empty($element->status) || ! empty($element->statut) || ! empty($element->fk_status))
 				{
 				    if ($tablename=='don') $date = $element->datedon;
@@ -889,7 +906,7 @@ foreach ($listofreferent as $key => $value)
                 	$tmpuser->fetch($expensereport->fk_user_author);
                 	print $tmpuser->getNomUrl(1,'',48);
                 }
-				else if ($tablename == 'don')
+				else if ($tablename == 'don' || $tablename == 'stock_mouvement')
                 {
                 	if ($element->fk_user_author > 0)
                 	{
@@ -911,6 +928,7 @@ foreach ($listofreferent as $key => $value)
 				    $total_ht_by_line=null;
 				    $othermessage='';
 					if ($tablename == 'don') $total_ht_by_line=$element->amount;
+					elseif ($tablename == 'stock_mouvement') $total_ht_by_line=$element->price*abs($element->qty);
 					elseif (in_array($tablename, array('projet_task')))
 					{
 					    if (! empty($conf->salaries->enabled))
@@ -950,6 +968,7 @@ foreach ($listofreferent as $key => $value)
 				{
 				    $total_ttc_by_line=null;
 					if ($tablename == 'don') $total_ttc_by_line=$element->amount;
+					elseif ($tablename == 'stock_mouvement') $total_ttc_by_line=$element->price*abs($element->qty);
 					elseif ($tablename == 'projet_task')
 					{
 					    if (! empty($conf->salaries->enabled))
@@ -998,6 +1017,10 @@ foreach ($listofreferent as $key => $value)
 						print $element->progress.' %';
 					}
 				}
+				else if ($tablename == 'stock_mouvement')
+				{
+					print $element->getLibStatut(3);
+				}
 				else
 				{
 					print $element->getLibStatut(5);

From 58d77a14af7118a7ae9060c34c52488de668367e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 29 Jan 2017 23:05:20 +0100
Subject: [PATCH 0180/1163] FIX #4758 PHP warning when installing to PostgreSQL
 with incorrect credentials

Closes #4758
---
 htdocs/core/db/pgsql.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 3b9ad9ac3e4..89f2a66bdea 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -412,8 +412,8 @@ class DoliDBPgsql extends DoliDB
 		{
 			$this->database_name = $name;
 			pg_set_error_verbosity($this->db, PGSQL_ERRORS_VERBOSE);	// Set verbosity to max
+			pg_query($this->db, "set datestyle = 'ISO, YMD';");
 		}
-		pg_query($this->db, "set datestyle = 'ISO, YMD';");
 
 		return $this->db;
 	}

From 8e9a9637a0ccaf3a7b9117b6f9529018b3c008b0 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Mon, 30 Jan 2017 21:52:52 +0100
Subject: [PATCH 0181/1163] Fix travis

---
 htdocs/product/stock/class/mouvementstock.class.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 53ab3163566..e6631d4b716 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -897,8 +897,8 @@ class MouvementStock extends CommonObject
 	/**
 	 * Set attribute origin to object
 	 * 
-	 * @param	string	$origin_element
-	 * @param	int		$origin_id
+	 * @param	string	$origin_element	type of element
+	 * @param	int		$origin_id		id of element
 	 * 
 	 * @return	void
 	 */
@@ -991,7 +991,6 @@ class MouvementStock extends CommonObject
 	/**
 	 *  Renvoi le libelle d'un status donne
 	 *
-	 *  @param	int		$status        	Id status
 	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return string 			       	Label of status
 	 */

From e1e2c49d93b77017473638ec1ff478b33ce9d91b Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Tue, 31 Jan 2017 06:08:40 +0100
Subject: [PATCH 0182/1163] NEW : [FP17] Accountancy - Add select field in list
 of accounts

---
 htdocs/accountancy/admin/account.php | 216 ++++++++++++++++++---------
 1 file changed, 142 insertions(+), 74 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index e82522df26f..a7ad5d14e90 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2016      Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -41,6 +41,7 @@ $action = GETPOST('action');
 $cancel = GETPOST('cancel');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
+
 $search_account = GETPOST("search_account");
 $search_label = GETPOST("search_label");
 $search_accountparent = GETPOST("search_accountparent");
@@ -68,6 +69,15 @@ if (! $sortfield)
 if (! $sortorder)
 	$sortorder = "ASC";
 
+$arrayfields=array(
+    'aa.account_number'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
+    'aa.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	'aa.account_parent'=>array('label'=>$langs->trans("Accountparent"), 'checked'=>0),
+    'aa.pcg_type'=>array('label'=>$langs->trans("Pcgtype"), 'checked'=>0),
+    'aa.pcg_subtype'=>array('label'=>$langs->trans("Pcgsubtype"), 'checked'=>0),
+	'aa.active'=>array('label'=>$langs->trans("Activated"), 'checked'=>1)
+);
+
 $accounting = new AccountingAccount($db);
 
 
@@ -95,6 +105,7 @@ if (empty($reshook))
     	$search_accountparent = "";
     	$search_pcgtype = "";
     	$search_pcgsubtype = "";
+		$search_array_options=array();
     }
     
     if (GETPOST('change_chart'))
@@ -135,6 +146,7 @@ if (empty($reshook))
 /*
  * View
  */
+$form=new Form($db);
 
 llxHeader('', $langs->trans("ListAccounts"));
 
@@ -145,8 +157,6 @@ if ($action == 'delete') {
 
 $pcgver = $conf->global->CHARTOFACCOUNTS;
 
-
-
 $sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.pcg_subtype, aa.account_number, aa.account_parent , aa.label, aa.active, ";
 $sql .= " a2.rowid as rowid2, a2.label as label2, a2.account_number as account_number2";
 $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
@@ -154,21 +164,12 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_vers
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON aa.account_parent = a2.rowid";
 $sql .= " WHERE asy.rowid = " . $pcgver;
 
-if (strlen(trim($search_account))) {
-	$sql .= natural_search("aa.account_number", $search_account);
-}
-if (strlen(trim($search_label))) {
-	$sql .= natural_search("aa.label", $search_label);
-}
-if (strlen(trim($search_accountparent))) {
-	$sql .= natural_search("aa.account_parent", $search_accountparent);
-}
-if (strlen(trim($search_pcgtype))) {
-	$sql .= natural_search("aa.pcg_type", $search_pcgtype);
-}
-if (strlen(trim($search_pcgsubtype))) {
-	$sql .= natural_search("aa.pcg_subtype", $search_pcgsubtype);
-}
+if (strlen(trim($search_account)))			$sql .= natural_search("aa.account_number", $search_account);
+if (strlen(trim($search_label)))			$sql .= natural_search("aa.label", $search_label);
+if (strlen(trim($search_accountparent)))	$sql .= natural_search("aa.account_parent", $search_accountparent);
+if (strlen(trim($search_pcgtype)))			$sql .= natural_search("aa.pcg_type", $search_pcgtype);
+if (strlen(trim($search_pcgsubtype)))		$sql .= natural_search("aa.pcg_subtype", $search_pcgsubtype);
+
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
@@ -184,18 +185,19 @@ $sql .= $db->plimit($limit + 1, $offset);
 dol_syslog('accountancy/admin/account.php:: $sql=' . $sql);
 $resql = $db->query($sql);
 
-if ($resql) {
-    
+if ($resql)
+{
 	$num = $db->num_rows($resql);
-	
+
     $params='';
-	if ($search_account != "") $params.= '&amp;search_account='.urlencode($search_account);
-	if ($search_label != "") $params.= '&amp;search_label='.urlencode($search_label);
-	if ($search_accountparent != "") $params.= '&amp;search_accountparent='.urlencode($search_accountparent);
-	if ($search_pcgtype != "") $params.= '&amp;search_pcgtype='.urlencode($search_pcgtype);
-	if ($search_pcgsubtype != "") $params.= '&amp;search_pcgsubtype='.urlencode($search_pcgsubtype);
-    if ($optioncss != '') $param.='&optioncss='.$optioncss;
-	
+	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+	if ($search_account) $params.= '&amp;search_account='.urlencode($search_account);
+	if ($search_label) $params.= '&amp;search_label='.urlencode($search_label);
+	if ($search_accountparent) $params.= '&amp;search_accountparent='.urlencode($search_accountparent);
+	if ($search_pcgtype) $params.= '&amp;search_pcgtype='.urlencode($search_pcgtype);
+	if ($search_pcgsubtype) $params.= '&amp;search_pcgsubtype='.urlencode($search_pcgsubtype);
+    if ($optioncss) $param.='&optioncss='.$optioncss;
+
 	print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy');
 	
 	print '<form method="GET" action="' . $_SERVER["PHP_SELF"] . '">';
@@ -207,7 +209,7 @@ if ($resql) {
     $sql = "SELECT rowid, pcg_version, label, active";
     $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_system";
     $sql .= " WHERE active = 1";
-    dol_syslog('accountancy/admin/index.php:: $sql=' . $sql);
+    dol_syslog('accountancy/admin/account.php:: $sql=' . $sql);
     $resqlchart = $db->query($sql);
     $var = true;
     if ($resqlchart) {
@@ -228,34 +230,53 @@ if ($resql) {
     print '<input type="submit" class="button" name="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
     print '<br>';    
     print "<br>\n";
+
+	print '</form>';
 	
+	$i = 0;
+    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+    print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+
 	print '<a class="butAction" href="./card.php?action=create">' . $langs->trans("Addanaccount") . '</a>';
 	print '<a class="butAction" href="./categories.php">' . $langs->trans("ApplyMassCategories") . '</a>';
 	// print '<a class="butAction" href="./importaccounts.php">' . $langs->trans("ImportAccount") . '</a>';
 	// print '<a class="butAction" href="./productaccount.php">' . $langs->trans("CheckProductAccountancyCode") . '</a>';
 	print '<br><br>';
 	
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("AccountNumber"), $_SERVER["PHP_SELF"], "aa.account_number", "", $params, "", $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "aa.label", "", $params, "", $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Accountparent"), $_SERVER["PHP_SELF"], "aa.account_parent", "", $params, "", $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Pcgtype"), $_SERVER["PHP_SELF"], "aa.pcg_type", "", $params, "", $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Pcgsubtype"), $_SERVER["PHP_SELF"], "aa.pcg_subtype", "", $params, "", $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Activated"), $_SERVER["PHP_SELF"], "aa.active", "", $params, "", $sortfield, $sortorder);
-	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $params, "", 'width="60" align="center"', $sortfield, $sortorder);
-	print '</tr>';
+	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
 	
+    print '<div class="div-table-responsive">';
+    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
 	print '<tr class="liste_titre">';
-	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_account" value="' . $search_account . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="' . $search_label . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_accountparent" value="' . $search_accountparent . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="' . $search_pcgtype . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgsubtype" value="' . $search_pcgsubtype . '"></td>';
-	print '<td class="liste_titre">&nbsp;</td>';
+
+	if (! empty($arrayfields['aa.account_number']['checked']))	print_liste_field_titre($arrayfields['aa.account_number']['label'], $_SERVER["PHP_SELF"],"aa.account_number","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['aa.label']['checked']))			print_liste_field_titre($arrayfields['aa.label']['label'], $_SERVER["PHP_SELF"],"aa.label","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['aa.account_parent']['checked']))	print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"],"aa.account_parent", "", $param,'align="left"',$sortfield,$sortorder);
+	if (! empty($arrayfields['aa.pcg_type']['checked']))		print_liste_field_titre($arrayfields['aa.pcg_type']['label'],$_SERVER["PHP_SELF"],'aa.pcg_type','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['aa.pcg_subtype']['checked']))		print_liste_field_titre($arrayfields['aa.pcg_subtype']['label'],$_SERVER["PHP_SELF"],'aa.pcg_subtype','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['aa.active']['checked']))			print_liste_field_titre($arrayfields['aa.active']['label'],$_SERVER["PHP_SELF"],'aa.active','',$param,'',$sortfield,$sortorder);
+
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print "</tr>\n";
+
+	// Line for search fields
+	print '<tr class="liste_titre">';
+	if (! empty($arrayfields['aa.account_number']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_account" value="' . $search_account . '"></td>';
+	if (! empty($arrayfields['aa.label']['checked']))			print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="' . $search_label . '"></td>';
+	if (! empty($arrayfields['aa.account_parent']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_accountparent" value="' . $search_accountparent . '"></td>';
+	if (! empty($arrayfields['aa.pcg_type']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="' . $search_pcgtype . '"></td>';
+	if (! empty($arrayfields['aa.pcg_subtype']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgsubtype" value="' . $search_pcgsubtype . '"></td>';
+	if (! empty($arrayfields['aa.active']['checked']))			print '<td class="liste_titre">&nbsp;</td>';
 	print '<td align="right" colspan="2" class="liste_titre">';
-	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-	print $searchpitco;
+	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	print $searchpicto;
 	print '</td>';
 	print '</tr>';
 	
@@ -263,8 +284,7 @@ if ($resql) {
 	
 	$accountstatic = new AccountingAccount($db);
 	$accountparent = new AccountingAccount($db);
-	
-	$i = 0;
+
 	while ( $i < min($num, $limit) ) 
 	{
 		$obj = $db->fetch_object($resql);
@@ -274,35 +294,81 @@ if ($resql) {
 		$accountstatic->account_number = $obj->account_number;
 		
 		print '<tr ' . $bc[$var] . '>';
-		print '<td>' . $accountstatic->getNomUrl(1) . '</td>';
-		print '<td>' . $obj->label . '</td>';
 
-		if (! empty($obj->account_parent))
-        {
-			$accountparent->id = $obj->rowid2;
-			$accountparent->label = $obj->label2;
-			$accountparent->account_number = $obj->account_number2;
-		
-			print '<td>' . $accountparent->getNomUrl(1) . '</td>';
-		}
-		else
+		// Account number
+		if (! empty($arrayfields['aa.account_number']['checked']))
 		{
-			print '<td>&nbsp;</td>';
+			print "<td>";
+			print $accountstatic->getNomUrl(1);
+			print "</td>\n";
+			if (! $i) $totalarray['nbfield']++;
 		}
-		print '<td>' . $obj->pcg_type . '</td>';
-		print '<td>' . $obj->pcg_subtype . '</td>';
-		print '<td>';
-		if (empty($obj->active)) {
-			print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=enable">';
-			print img_picto($langs->trans("Disabled"), 'switch_off');
-			print '</a>';
-		} else {
-			print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=disable">';
-			print img_picto($langs->trans("Activated"), 'switch_on');
-			print '</a>';
+
+		// Account label
+		if (! empty($arrayfields['aa.label']['checked']))
+		{
+			print "<td>";
+			print $obj->label;
+			print "</td>\n";
+			if (! $i) $totalarray['nbfield']++;
 		}
-		print '</td>';
-		
+
+		// Account parent
+		if (! empty($arrayfields['aa.account_parent']['checked']))
+		{
+			if (! empty($obj->account_parent))
+			{
+				$accountparent->id = $obj->rowid2;
+				$accountparent->label = $obj->label2;
+				$accountparent->account_number = $obj->account_number2;
+			
+				print "<td>";
+				print $accountparent->getNomUrl(1);
+				print "</td>\n";
+				if (! $i) $totalarray['nbfield']++;
+			}
+			else
+			{
+				print '<td>&nbsp;</td>';
+				if (! $i) $totalarray['nbfield']++;
+			}
+		}
+
+		// Chart of accounts type
+		if (! empty($arrayfields['aa.pcg_type']['checked']))
+		{
+			print "<td>";
+			print $obj->pcg_type;
+			print "</td>\n";
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Chart of accounts subtype
+		if (! empty($arrayfields['aa.pcg_subtype']['checked']))
+		{
+			print "<td>";
+			print $obj->pcg_subtype;
+			print "</td>\n";
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Activated or not
+		if (! empty($arrayfields['aa.active']['checked']))
+		{
+			print '<td>';
+			if (empty($obj->active)) {
+				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=enable">';
+				print img_picto($langs->trans("Disabled"), 'switch_off');
+				print '</a>';
+			} else {
+				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=disable">';
+				print img_picto($langs->trans("Activated"), 'switch_on');
+				print '</a>';
+			}
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+
 		// Action
 		print '<td align="center">';
 		if ($user->admin) {
@@ -315,6 +381,7 @@ if ($resql) {
 			print '</a>';
 		}
 		print '</td>' . "\n";
+		if (! $i) $totalarray['nbfield']++;
 		
 		print "</tr>\n";
 		$var = ! $var;
@@ -322,6 +389,7 @@ if ($resql) {
 	}
 	
 	print "</table>";
+	print "</div>";
 	print '</form>';
 } else {
 	dol_print_error($db);

From 399aea179f08131379535525a712e880ed72d6d4 Mon Sep 17 00:00:00 2001
From: philippe-opendsi <p.scoffoni@open-dsi.fr>
Date: Tue, 31 Jan 2017 10:15:04 +0100
Subject: [PATCH 0183/1163] New : Option to reload supplier order and invoice
 to retrieve payment terms & type Add RELOAD_PAGE_ON_SUPPLIER_CHANGE

---
 htdocs/fourn/commande/card.php | 13 +++++++++++++
 htdocs/fourn/facture/card.php  | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index d54a477aeee..d1100326f42 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1445,6 +1445,19 @@ if ($action=='create')
 	else
 	{
 		print $form->select_company((empty($socid)?'':$socid), 'socid', 's.fournisseur = 1', 'SelectThirdParty');
+        // reload page to retrieve customer informations
+        if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
+        {
+            print '<script type="text/javascript">
+			$(document).ready(function() {
+				$("#socid").change(function() {
+					var socid = $(this).val();
+					// reload page
+					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid;
+				});
+			});
+			</script>';
+        }
 	}
 	print '</td>';
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index d756bc2b72a..1fce3965c6b 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1446,6 +1446,19 @@ if ($action == 'create')
     else
     {
         print $form->select_company($societe->id, 'socid', 's.fournisseur = 1', 'SelectThirdParty');
+        // reload page to retrieve supplier informations
+        if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
+        {
+            print '<script type="text/javascript">
+			$(document).ready(function() {
+				$("#socid").change(function() {
+					var socid = $(this).val();
+					// reload page
+					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid;
+				});
+			});
+			</script>';
+        }
     }
     print '</td></tr>';
 

From e73c60b526b45e92e56a5633a8efefc6c2d1dc05 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 31 Jan 2017 12:20:45 +0100
Subject: [PATCH 0184/1163] New htmlid can be use instead of htmlname for
 select projects

---
 htdocs/core/class/html.formprojet.class.php | 12 +++++++-----
 htdocs/core/lib/ajax.lib.php                | 16 +++++++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 0129f1c1382..d81be84d044 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -60,9 +60,10 @@ class FormProjets
 	 *  @param  int     $nooutput       No print output. Return it only.
 	 *  @param  int     $forceaddid     Force to add project id in list, event if not qualified
 	 *  @param  string  $morecss        More css
+	 *	@param  int     $htmlid         Html id to use instead of htmlname
 	 *	@return string           		Return html content
 	 */
-	function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlength=16, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode = 0, $filterkey = '', $nooutput=0, $forceaddid=0, $morecss='')
+	function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlength=16, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode = 0, $filterkey = '', $nooutput=0, $forceaddid=0, $morecss='', $htmlid='')
 	{
 		global $langs,$conf,$form;
 
@@ -90,7 +91,7 @@ class FormProjets
 		}
 		else
 		{
-			$out.=$this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1);
+			$out.=$this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid);
 			if ($discard_closed) 
 			{
 			    if (class_exists('Form'))
@@ -125,9 +126,10 @@ class FormProjets
 	 * @param  string  $filterkey          Key to filter
 	 * @param  int     $nooutput           No print output. Return it only.
 	 * @param  int     $forceaddid         Force to add project id in list, event if not qualified
+	 * @param  int     $htmlid             Html id to use instead of htmlname
 	 * @return int         			       Nb of project if OK, <0 if KO
 	 */
-	function select_projects_list($socid=-1, $selected='', $htmlname='projectid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode=0, $filterkey = '', $nooutput=0, $forceaddid=0)
+	function select_projects_list($socid=-1, $selected='', $htmlname='projectid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode=0, $filterkey = '', $nooutput=0, $forceaddid=0, $htmlid='')
 	{
 		global $user,$conf,$langs;
 
@@ -173,14 +175,14 @@ class FormProjets
 			if (! empty($conf->use_javascript_ajax))
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-	           	$comboenhancement = ajax_combobox($htmlname, array(), 0, $forcefocus);
+	           	$comboenhancement = ajax_combobox($htmlname, array(), 0, $forcefocus,'resolve',$htmlid);
             	$out.=$comboenhancement;
             	$nodatarole=($comboenhancement?' data-role="none"':'');
             	$minmax='minwidth100 maxwidth300';
 			}
 
 			if (empty($option_only)) {
-				$out.= '<select class="flat'.($minmax?' '.$minmax:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
+				$out.= '<select class="flat'.($minmax?' '.$minmax:'').'"'.($disabled?' disabled="disabled"':'').' id="'.(empty($htmlid?$htmlname:$htmlid)).'" name="'.$htmlname.'"'.$nodatarole.'>';
 			}
 			if (!empty($show_empty)) {
 				$out.= '<option value="0">&nbsp;</option>';
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 0193a33b305..d593e279178 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -357,12 +357,14 @@ function ajax_dialog($title,$message,$w=350,$h=150)
  * @param  	int		$minLengthToAutocomplete	Minimum length of input string to start autocomplete
  * @param	int		$forcefocus					Force focus on field
  * @param	string	$widthTypeOfAutocomplete	'resolve' or 'off'
+ * @param	int		$htmlid						Html id to use instead of htmlname
  * @return	string								Return html string to convert a select field into a combo, or '' if feature has been disabled for some reason.
  */
-function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $forcefocus=0, $widthTypeOfAutocomplete='resolve')
+function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $forcefocus=0, $widthTypeOfAutocomplete='resolve',$htmlid='')
 {
 	global $conf;
 
+	if (empty($htmlid)) $htmlid = $htmlname;
 	if (! empty($conf->browser->phone)) return '';	// select2 disabled for smartphones with standard browser (does not works, popup appears outside screen)
 	if (! empty($conf->dol_use_jmobile)) return '';	// select2 works with jmobile but it breaks the autosize feature of jmobile.
 	if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
@@ -371,10 +373,10 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
 	if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0;
 
     $tmpplugin='select2';
-    $msg='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+    $msg='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlid.' -->
           <script type="text/javascript">
         	$(document).ready(function () {
-        		$(\''.(preg_match('/^\./',$htmlname)?$htmlname:'#'.$htmlname).'\').'.$tmpplugin.'({
+        		$(\''.(preg_match('/^\./',$htmlid)?$htmlid:'#'.$htmlid).'\').'.$tmpplugin.'({
         		    dir: \'ltr\',
         			width: \''.$widthTypeOfAutocomplete.'\',		/* off or resolve */
 					minimumInputLength: '.$minLengthToAutocomplete.'
@@ -385,17 +387,17 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
 	if (count($events))
 	{
 		$msg.= '
-			jQuery("#'.$htmlname.'").change(function () {
+			jQuery("#'.$htmlid.'").change(function () {
 				var obj = '.json_encode($events).';
 		   		$.each(obj, function(key,values) {
 	    			if (values.method.length) {
-	    				runJsCodeForEvent'.$htmlname.'(values);
+	    				runJsCodeForEvent'.$htmlid.'(values);
 	    			}
 				});
 			});
 
-			function runJsCodeForEvent'.$htmlname.'(obj) {
-				var id = $("#'.$htmlname.'").val();
+			function runJsCodeForEvent'.$htmlid.'(obj) {
+				var id = $("#'.$htmlid.'").val();
 				var method = obj.method;
 				var url = obj.url;
 				var htmlname = obj.htmlname;

From 4cec071af5f13d09f71baf8f7f9d779b30c2e289 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 31 Jan 2017 14:00:53 +0100
Subject: [PATCH 0185/1163] Add tms field

---
 dev/resources/iso-normes/sample_FEC_file.txt        | 13 +++++++++++++
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql      |  3 +++
 .../install/mysql/tables/llx_projet_task_time.sql   |  4 +++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 dev/resources/iso-normes/sample_FEC_file.txt

diff --git a/dev/resources/iso-normes/sample_FEC_file.txt b/dev/resources/iso-normes/sample_FEC_file.txt
new file mode 100644
index 00000000000..5ca795af5c2
--- /dev/null
+++ b/dev/resources/iso-normes/sample_FEC_file.txt
@@ -0,0 +1,13 @@
+JOURNALCODE	JOURNALLIB	ECRITURENUM	ECRITUREDATE	COMPTENUM	COMPTELIB	COMPAUXNUM	COMPAUXLIB	PIECEREF	PIECEDATE	ECRITURELIB	DEBIT	CREDIT	ECRITURELET	DATELET	VALIDDATE	MONTANTDEVISE	IDEVISE
+Banque	Banque	17293	20170109	401PPRO	PUBLI-PROV			L08	20170109	PPRO domiciliation 1TR	       187,20	         0,00			20170109		
+Banque	Banque	17293	20170109	5121CRA	CR AGRICOLE			L08	20170109	PPRO domiciliation 1TR	         0,00	       187,20			20170109		
+Banque	Banque	17295	20170109	401ORPA	ORANGE PARIS			Report	20170109	ORPA adsl par 12	        96,00	         0,00			20170109		
+Banque	Banque	17295	20170109	5121CRA	CR AGRICOLE			Report	20170109	ORPA adsl par 12	         0,00	        96,00			20170109		
+Banque	Banque	17302	20170105	401ORVI	ORANGE VEBRON INTERNET			Report	20170105	ORVI adsl veb 12	        26,00	         0,00			20170109		
+Banque	Banque	17302	20170105	5121CRA	CR AGRICOLE			Report	20170105	ORVI adsl veb 12	         0,00	        26,00			20170109		
+Fournisseurs	Fournisseurs	17305	20170119	401ZDAV	SANDRA DAVILA			A01	20170119	ZDAV courtage s/ ventes	         0,00	       508,00			20170119		
+Fournisseurs	Fournisseurs	17305	20170119	622200	Courtages s/ ventes			A01	20170119	ZDAV courtage s/ ventes	       508,00	         0,00			20170119		
+Banque	Banque	17306	20170119	5121CRA	CR AGRICOLE			A01	20170119	ZDAV courtage s/ ventes	         0,00	       508,00			20170119		
+Banque	Banque	17306	20170119	401ZDAV	SANDRA DAVILA			A01	20170119	ZDAV courtage s/ ventes	       508,00	         0,00			20170119		
+Banque	Banque	17307	20170119	401ZDAV	SANDRA DAVILA			A01	20170119	ZDAV courtage s/ ventes	       508,00	         0,00			20170131		
+Banque	Banque	17307	20170119	5121CRA	CR AGRICOLE			A01	20170119	ZDAV courtage s/ ventes	         0,00	       508,00			20170131		
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 2da08cfbdb0..11c95dc19e1 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -49,3 +49,6 @@ ALTER TABLE llx_loan ADD COLUMN fk_projet integer DEFAULT NULL;
 
 ALTER TABLE llx_holiday ADD COLUMN fk_user_modif integer;
 
+ALTER TABLE llx_projet_task_time ADD COLUMN datec date;
+ALTER TABLE llx_projet_task_time ADD COLUMN tms timestamp;
+
diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql
index c0b250b6dfc..897364a90e1 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_time.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql
@@ -29,5 +29,7 @@ create table llx_projet_task_time
   invoice_id       integer DEFAULT NULL,				-- If we need to invoice each line of timespent, we can save invoice id here
   invoice_line_id  integer DEFAULT NULL,                -- If we need to invoice each line of timespent, we can save invoice line id here
   import_key	   varchar(14),					-- Import key
-  note             text
+  datec            date,						-- Date creation time
+  tms              timestamp,					-- Date update time
+  note             text							-- A comment
 )ENGINE=innodb;

From aea6a8f9ec26edd24fd59e4022e313ae341917ce Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 31 Jan 2017 14:03:54 +0100
Subject: [PATCH 0186/1163] Fix (

---
 htdocs/core/class/html.formprojet.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index d81be84d044..d8283a4da57 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -182,7 +182,7 @@ class FormProjets
 			}
 
 			if (empty($option_only)) {
-				$out.= '<select class="flat'.($minmax?' '.$minmax:'').'"'.($disabled?' disabled="disabled"':'').' id="'.(empty($htmlid?$htmlname:$htmlid)).'" name="'.$htmlname.'"'.$nodatarole.'>';
+				$out.= '<select class="flat'.($minmax?' '.$minmax:'').'"'.($disabled?' disabled="disabled"':'').' id="'.(empty($htmlid)?$htmlname:$htmlid).'" name="'.$htmlname.'"'.$nodatarole.'>';
 			}
 			if (!empty($show_empty)) {
 				$out.= '<option value="0">&nbsp;</option>';

From 218e49298a77eb0899599f0ad1cdf1c63d348c0b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 31 Jan 2017 14:07:23 +0100
Subject: [PATCH 0187/1163] Uniformize field names

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql         |  5 +++++
 .../install/mysql/tables/llx_product_price_by_qty.sql  |  6 +++++-
 htdocs/install/pgsql/functions/functions.sql           | 10 ++++++----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 11c95dc19e1..c2532124293 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -52,3 +52,8 @@ ALTER TABLE llx_holiday ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_projet_task_time ADD COLUMN datec date;
 ALTER TABLE llx_projet_task_time ADD COLUMN tms timestamp;
 
+ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_user_creat integer;
+ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_user_modif integer;
+ALTER TABLE llx_product_price_by_qty ADD COLUMN tms timestamp;
+ALTER TABLE llx_product_price_by_qty ADD COLUMN import_key integer;
+
diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
index e86d77fe982..e801f682d5c 100644
--- a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
+++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
@@ -28,5 +28,9 @@ create table llx_product_price_by_qty
   quantity			double DEFAULT NULL,
   remise_percent	double NOT NULL DEFAULT 0,
   remise			double NOT NULL DEFAULT 0,
-  unitprice			double(24,8) DEFAULT 0
+  unitprice			double(24,8) DEFAULT 0,
+  fk_user_creat 	integer,
+  fk_user_modif 	integer,
+  tms				timestamp,
+  import_key    	integer
 )ENGINE=innodb;
diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index b54dbbbb00f..9d3b3c8dbe6 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -52,7 +52,7 @@ CREATE OR REPLACE FUNCTION dol_util_rebuild_sequences() RETURNS integer as $body
 CREATE OR REPLACE FUNCTION dol_util_triggerall(DoEnable boolean) RETURNS integer AS $BODY$ DECLARE mytables RECORD; BEGIN FOR mytables IN SELECT relname FROM pg_class WHERE relhastriggers IS TRUE AND relkind = 'r' AND NOT relname LIKE 'pg_%' LOOP IF DoEnable THEN EXECUTE 'ALTER TABLE ' || mytables.relname || ' ENABLE TRIGGER ALL'; ELSE  EXECUTE 'ALTER TABLE ' || mytables.relname || ' DISABLE TRIGGER ALL'; END IF; END LOOP; RETURN 1; END; $BODY$ LANGUAGE plpgsql;
 
 
--- Add triggers for timestamp fields
+-- Add triggers for timestamp fields named tms
 CREATE OR REPLACE FUNCTION update_modified_column_tms()	RETURNS TRIGGER AS $$ BEGIN NEW.tms = now(); RETURN NEW; END; $$ LANGUAGE plpgsql;
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_accounting_account FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_accounting_fiscalyear FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
@@ -134,6 +134,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet FOR EACH ROW
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet_task FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet_task_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet_task_time FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal_merge_pdf_product FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
@@ -156,9 +157,10 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user FOR EACH ROW EX
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_usergroup FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_usergroup_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_product_price_by_qty FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 
+
+-- Add triggers for timestamp fields named date_m
 CREATE OR REPLACE FUNCTION update_modified_column_date_m()	RETURNS TRIGGER AS $$ BEGIN NEW.date_m = now(); RETURN NEW; END; $$ LANGUAGE plpgsql;
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_ecm_directories FOR EACH ROW EXECUTE PROCEDURE update_modified_column_date_m();
-
-CREATE OR REPLACE FUNCTION update_modified_column_date_price()	RETURNS TRIGGER AS $$ BEGIN NEW.date_price = now(); RETURN NEW; END; $$ LANGUAGE plpgsql;
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_product_price_by_qty FOR EACH ROW EXECUTE PROCEDURE update_modified_column_date_price();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_ecm_files FOR EACH ROW EXECUTE PROCEDURE update_modified_column_date_m();

From 373f918543866a7cc4839227567b4897e97ab3c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 31 Jan 2017 16:14:56 +0100
Subject: [PATCH 0188/1163] Fix css

---
 htdocs/theme/eldy/style.css.php | 2 +-
 htdocs/theme/md/style.css.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index fba3002b0bb..d9ed0f7960c 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1425,7 +1425,7 @@ form#login {
 }
 .login_table_title {
 	max-width: 530px;
-	color: #888888;
+	color: #888888 !important;
 	text-shadow: 1px 1px 1px #FFF;
 }
 .login_table label {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c4e6c406ec9..79f60800564 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1434,7 +1434,7 @@ form#login {
 }
 .login_table_title {
 	max-width: 530px;
-	color: #888888;
+	color: #888888 !important;
 	text-shadow: 1px 1px 1px #FFF;
 }
 .login_table label {

From d84e50d15c824ae19066f58ff665cedaeec89311 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Tue, 31 Jan 2017 23:11:16 +0100
Subject: [PATCH 0189/1163] get remisepercent of product if select list

when we use the select list of product instead of free search we don't fill the remise
---
 htdocs/fourn/class/fournisseur.commande.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index a4eda5ec81e..f656e7a41e7 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1408,6 +1408,11 @@ class CommandeFournisseur extends CommonOrder
                         {
                             $pu           = $prod->fourn_pu;       // Unit price supplier price set by get_buyprice
                             $ref_supplier = $prod->ref_supplier;   // Ref supplier price set by get_buyprice
+			    // is remise percent not keyed but present for the product we add it
+                            if ($remise_percent == 0 && $prod->remise_percent !=0)
+                            	$remise_percent =$prod->remise_percent;
+
+				
                         }
                         if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
                         {

From 772d862766a4832792c63a2e6a2b0a7caf0ea351 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Tue, 31 Jan 2017 23:13:58 +0100
Subject: [PATCH 0190/1163] Update product.class.php

---
 htdocs/product/class/product.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 34faaddfe4e..32ffbeead05 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1470,7 +1470,7 @@ class Product extends CommonObject
 		$result = 0;
 
 		// We do a first seach with a select by searching with couple prodfournprice and qty only (later we will search on triplet qty/product_id/fourn_ref)
-		$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity,";
+		$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.remise_percent,";
 		$sql.= " pfp.fk_product, pfp.ref_fourn, pfp.fk_soc, pfp.tva_tx, pfp.fk_supplier_price_expression";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
 		$sql.= " WHERE pfp.rowid = ".$prodfournprice;
@@ -1504,6 +1504,7 @@ class Product extends CommonObject
 				$this->fourn_price_base_type = 'HT';                // Price base type
 				$this->ref_fourn = $obj->ref_fourn;                 // deprecated
 				$this->ref_supplier = $obj->ref_fourn;              // Ref supplier
+				$this->remise_percent = $obj->remise_percent;       // remise percent if present and not typed
 				$this->vatrate_supplier = $obj->tva_tx;             // Vat ref supplier
 				$result=$obj->fk_product;
 				return $result;
@@ -1549,6 +1550,7 @@ class Product extends CommonObject
 						$this->fourn_price_base_type = 'HT';                // Price base type for a virtual supplier
 						$this->ref_fourn = $obj->ref_supplier;              // deprecated
 						$this->ref_supplier = $obj->ref_supplier;           // Ref supplier
+						$this->remise_percent = $obj->remise_percent;       // remise percent if present and not typed
 						$this->vatrate_supplier = $obj->tva_tx;             // Vat ref supplier
 						$result=$obj->fk_product;
 						return $result;

From 2ce4ba99fe4893c535c41d72c98aad9128fc2b0c Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Wed, 1 Feb 2017 06:54:01 +0100
Subject: [PATCH 0191/1163] Fix : [FP17] Correct some fix on category
 accounting account page

---
 htdocs/accountancy/admin/categories.php       | 82 +++++++++----------
 .../class/accountancycategory.class.php       |  9 +-
 htdocs/langs/en_US/accountancy.lang           |  2 +
 3 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 12d9a707cbd..d052b4312a7 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2016	   Jamal Elbaz		<jamelbaz@gmail.pro>
+/* Copyright (C) 2016		Jamal Elbaz			<jamelbaz@gmail.pro>
+ * Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,24 +17,24 @@
  */
 
 /**
- * \file htdocs/accountancy/admin/categories.php
+ * \file	htdocs/accountancy/admin/categories.php
  * \ingroup Advanced accountancy
- * \brief Page to assign mass categories to accounts
+ * \brief	Page to assign mass categories to accounts
  */
 require '../../main.inc.php';
-
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancycategory.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $error = 0;
 
-// Langs
 $langs->load("bills");
 $langs->load("accountancy");
 
 $mesg = '';
+$id = GETPOST('id', 'int');
+$rowid = GETPOST('rowid', 'int');
+$cancel = GETPOST('cancel');
 $action = GETPOST('action');
 $cat_id = GETPOST('account_category');
 $selectcpt = GETPOST('cpt_bk', 'array');
@@ -43,36 +44,31 @@ if ($cat_id == 0) {
 	$cat_id = null;
 }
 
-$id = GETPOST('id', 'int');
-$rowid = GETPOST('rowid', 'int');
-$cancel = GETPOST('cancel');
-
 // Security check
-if (! $user->admin)
-	accessforbidden();
+if (! $user->admin) accessforbidden();
 
-$AccCat = new AccountancyCategory($db);
+$accountingcategory = new AccountancyCategory($db);
 
 // si ajout de comptes
 if (! empty($selectcpt)) {
 	$cpts = array ();
-	foreach ( $selectcpt as $selectedOption ) {
-		if (! array_key_exists($selectedOption, $cpts))
-			$cpts[$selectedOption] = "'" . $selectedOption . "'";
+	foreach ( $selectcpt as $selectedoption ) {
+		if (! array_key_exists($selectedoption, $cpts))
+			$cpts[$selectedoption] = "'" . $selectedoption . "'";
 	}
 
-	$return= $AccCat->updateAccAcc($cat_id, $cpts);
+	$return= $accountingcategory->updateAccAcc($cat_id, $cpts);
 
 	if ($return<0) {
-		setEventMessages($langs->trans('errors'), $AccCat->errors, 'errors');
+		setEventMessages($langs->trans('errors'), $accountingcategory->errors, 'errors');
 	} else {
 		setEventMessages($langs->trans('Saved'), null, 'mesgs');
 	}
 }
 if ($action == 'delete') {
 	if ($cpt_id) {
-		if ($AccCat->deleteCptCat($cpt_id)) {
-			setEventMessages($langs->trans('Deleted'), null, 'mesgs');
+		if ($accountingcategory->deleteCptCat($cpt_id)) {
+			setEventMessages($langs->trans('CategoryDeleted'), null, 'mesgs');
 		} else {
 			setEventMessages($langs->trans('errors'), null, 'errors');
 		}
@@ -83,12 +79,11 @@ if ($action == 'delete') {
 /*
  * View
  */
+$form = new Form($db);
+$formaccounting = new FormAccounting($db);
 
 llxheader('', $langs->trans('AccountAccounting'));
 
-$formaccounting = new FormAccounting($db);
-$form = new Form($db);
-
 print load_fiche_titre($langs->trans('Categories'));
 
 print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
@@ -102,22 +97,23 @@ print '<table class="border" width="100%">';
 print '<tr><td>' . $langs->trans("AccountingCategory") . '</td>';
 print '<td>';
 $formaccounting->select_accounting_category($cat_id, 'account_category', 1);
-print '<input class="button" type="submit" value="' . $langs->trans("Display") . '">';
+print '<input class="button" type="submit" value="' . $langs->trans("Show") . '">';
 print '</td></tr>';
 
 if (! empty($cat_id)) {
-	$return = $AccCat->getCptBK($cat_id);
+	$return = $accountingcategory->getCptBK($cat_id);
 	if ($return < 0) {
-		setEventMessages(null, $AccCat->errors, 'errors');
+		setEventMessages(null, $accountingcategory->errors, 'errors');
 	}
-	print '<tr><td>' . $langs->trans("AddCompteFromBK") . '</td>';
+	print '<tr><td>' . $langs->trans("AddAccountFromBookKeepingWithNoCategories") . '</td>';
 	print '<td>';
-	if (is_array($AccCat->lines_cptbk) && count($AccCat->lines_cptbk) > 0) {
+	if (is_array($accountingcategory->lines_cptbk) && count($accountingcategory->lines_cptbk) > 0) {
 		print '<select size="' . count($obj) . '" name="cpt_bk[]" multiple>';
-		foreach ( $AccCat->lines_cptbk as $cpt ) {
+		foreach ( $accountingcategory->lines_cptbk as $cpt ) {
 			print '<option value="' . length_accountg($cpt->numero_compte) . '">' . length_accountg($cpt->numero_compte) . ' (' . $cpt->label_compte . ' ' . $cpt->doc_ref . ')</option>';
 		}
-		print '</select> - <input class="button" type="submit" id="" class="action-delete" value="' . $langs->trans("add") . '"> ';
+		print '</select>';
+		print '<input class="button" type="submit" id="" class="action-delete" value="' . $langs->trans("Add") . '"> ';
 	}
 	print '</td></tr>';
 }
@@ -131,26 +127,30 @@ print '</form>';
 
 if ($action == 'display' || $action == 'delete') {
 
-	print '<table class="noborder" width="100%">';
-
-	print '<tr class="liste_titre"><th class="liste_titre">' . $langs->trans("Numerocompte") . '</th><th class="liste_titre">' . $langs->trans("Description") . '</th><th class="liste_titre" width="60" align="center">Action</th></tr>';
+    print "<table class='noborder' width='100%'>\n";
+    print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("AccountAccounting")."</td>";
+	print '<td colspan="2">'.$langs->trans("Label")."</td>";
+	print "</tr>\n";
 
 	if (! empty($cat_id)) {
-		$return = $AccCat->display($cat_id);
+		$return = $accountingcategory->display($cat_id);
 		if ($return < 0) {
-			setEventMessages(null, $AccCat->errors, 'errors');
+			setEventMessages(null, $accountingcategory->errors, 'errors');
 		}
-		$j = 1;
-		if (is_array($AccCat->lines_display) && count($AccCat->lines_display) > 0) {
-			foreach ( $AccCat->lines_display as $cpt ) {
+
+		if (is_array($accountingcategory->lines_display) && count($accountingcategory->lines_display) > 0) {
+			foreach ( $accountingcategory->lines_display as $cpt ) {
 				$var = ! $var;
 				print '<tr' . $bc[$var] . '>';
 				print '<td>' . length_accountg($cpt->account_number) . '</td>';
 				print '<td>' . $cpt->label . '</td>';
-				print $form->formconfirm($_SERVER["PHP_SELF"] . "?account_category=$cat_id&cptid=" . $cpt->rowid, $langs->trans("DeleteCptCategory"), $langs->trans("ConfirmDeleteCptCategory"), "delete", '', 0, "action-delete" . $j);
-				print '<td><input class="button" type="button" id="action-delete' . $j . '" value="' . $langs->trans("Delete") . '"></td>';
+				print '<td align="right">';
+				print "<a href= '".$_SERVER['PHP_SELF']."?action=delete&account_category=" . $cat_id . "&cptid=" . $cpt->rowid."'>";
+				print img_delete($langs->trans("DeleteFromCat")).' ';
+				print $langs->trans("DeleteFromCat")."</a>";
+				print "</td>";
 				print "</tr>\n";
-				$j ++;
 			}
 		}
 	}
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 40290bd845b..b2564c342e5 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2016		Jamal Elbaz			<jamelbaz@gmail.pro>
- * Copyright (C) 2016 		Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2016-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,9 +17,9 @@
  */
 
 /**
- * \file htdocs/accountancy/class/accountancycategory.class.php
+ * \file	htdocs/accountancy/class/accountancycategory.class.php
  * \ingroup Advanced accountancy
- * \brief File of class to manage categories of an accounting category_type
+ * \brief	File of class to manage categories of an accounting category_type
  */
 
 // Class
@@ -72,7 +72,6 @@ class AccountancyCategory
 					$this->lines_display[] = $obj;
 				}
 			}
-
 			return $num;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
@@ -84,7 +83,7 @@ class AccountancyCategory
 	}
 
 	/**
-	 * Function to select accountiing category of an accounting account present in chart of accounts
+	 * Function to select accounting category of an accounting account present in chart of accounts
 	 *
 	 * @param int $id Id category
 	 *
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index dcefae7aecb..5ee68e605cd 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports

From d945a0de927b396708a97950759ce19d2d9bfaf7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Feb 2017 14:59:51 +0100
Subject: [PATCH 0192/1163] NEW Uniformize behaviour: Action to make order is
 an action button.

---
 htdocs/fourn/commande/card.php | 197 +++++++++++++++++----------------
 1 file changed, 104 insertions(+), 93 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index d54a477aeee..50b481f4b14 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2613,6 +2613,18 @@ elseif (! empty($object->id))
 					}
 				}
 
+				if ($object->statut == 2)
+				{
+				    if ($user->rights->fournisseur->commande->commander)
+				    {
+				        print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=makeorder#makeorder">'.$langs->trans("MakeOrder").'</a></div>';
+				    }
+				    else
+				    {
+				        print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans("MakeOrder").'</a></div>';
+				    }
+				}
+				
 				// Create bill
 				if (! empty($conf->facture->enabled))
 				{
@@ -2664,103 +2676,102 @@ elseif (! empty($object->id))
 		}
 
 
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-
-		/*
-		 * Documents generes
-		 */
-		$comfournref = dol_sanitizeFileName($object->ref);
-		$file =	$conf->fournisseur->dir_output . '/commande/' . $comfournref .	'/'	. $comfournref . '.pdf';
-		$relativepath =	$comfournref.'/'.$comfournref.'.pdf';
-		$filedir = $conf->fournisseur->dir_output	. '/commande/' .	$comfournref;
-		$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
-		$genallowed=$user->rights->fournisseur->commande->creer;
-		$delallowed=$user->rights->fournisseur->commande->supprimer;
-
-		print $formfile->showdocuments('commande_fournisseur',$comfournref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,0,0,'','','',$object->thirdparty->default_lang);
-		$somethingshown=$formfile->numoffiles;
-
-		// Show links to link elements
-		$linktoelem = $form->showLinkToObjectBlock($object, null, array('supplier_order','order_supplier'));
-		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
-		if ($user->rights->fournisseur->commande->commander && $object->statut == 2)
+		if ($user->rights->fournisseur->commande->commander && $object->statut == 2 && $action == 'makeorder')
 		{
-			// Set status to ordered (action=commande)
-			print '<!-- form to record supplier order -->'."\n";
-			print '<form name="commande" action="card.php?id='.$object->id.'&amp;action=commande" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden"	name="action" value="commande">';
-			print load_fiche_titre($langs->trans("ToOrder"),'','');
-			print '<table class="noborder" width="100%">';
-			//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>';
-			print '<tr><td>'.$langs->trans("OrderDate").'</td><td>';
-			$date_com = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-			print $form->select_date($date_com,'',1,1,'',"commande",1,0,1);
-			print '</td></tr>';
-
-			print '<tr><td>'.$langs->trans("OrderMode").'</td><td>';
-			$formorder->selectInputMethod(GETPOST('methodecommande'), "methodecommande", 1);
-			print '</td></tr>';
-
-			print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment" value="'.GETPOST('comment').'"></td></tr>';
-			print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("ToOrder").'"></td></tr>';
-			print '</table>';
-			print '</form>';
-			print "<br>";
+		    // Set status to ordered (action=commande)
+		    print '<!-- form to record supplier order -->'."\n";
+		    print '<form name="commande" id="makeorder" action="card.php?id='.$object->id.'&amp;action=commande" method="post">';
+		    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		    print '<input type="hidden"	name="action" value="commande">';
+		    print load_fiche_titre($langs->trans("ToOrder"),'','');
+		    print '<table class="noborder" width="100%">';
+		    //print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>';
+		    print '<tr><td>'.$langs->trans("OrderDate").'</td><td>';
+		    $date_com = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+		    print $form->select_date($date_com,'',1,1,'',"commande",1,0,1);
+		    print '</td></tr>';
+		
+		    print '<tr><td>'.$langs->trans("OrderMode").'</td><td>';
+		    $formorder->selectInputMethod(GETPOST('methodecommande'), "methodecommande", 1);
+		    print '</td></tr>';
+		
+		    print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment" value="'.GETPOST('comment').'"></td></tr>';
+		    print '<tr><td align="center" colspan="2">';
+		    print '<input type="submit" name="makeorder" class="button" value="'.$langs->trans("ToOrder").'">';
+		    print ' &nbsp; &nbsp; ';
+		    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+		    print '</td></tr>';
+		    print '</table>';
+		    print '</form>';
+		    print "<br>";
 		}
-
-		if ($user->rights->fournisseur->commande->receptionner	&& ($object->statut == 3 || $object->statut == 4))
+		
+		
+		if ($action != 'makeorder')
 		{
-			// Set status to received (action=livraison)
-			print '<!-- form to record supplier order received -->'."\n";
-			print '<form action="card.php?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden"	name="action" value="livraison">';
-			print load_fiche_titre($langs->trans("Receive"),'','');
-			
-			print '<table class="noborder" width="100%">';
-			//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
-			print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
-			print $form->select_date('','',1,1,'',"commande",1,0,1);
-			print "</td></tr>\n";
-
-			print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";
-			$liv = array();
-			$liv[''] = '&nbsp;';
-			$liv['tot']	= $langs->trans("CompleteOrNoMoreReceptionExpected");
-			$liv['par']	= $langs->trans("PartialWoman");
-			$liv['nev']	= $langs->trans("NeverReceived");
-			$liv['can']	= $langs->trans("Canceled");
-
-			print $form->selectarray("type",$liv);
-
-			print '</td></tr>';
-			print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
-			print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Receive").'"></td></tr>';
-			print "</table>\n";
-			print "</form>\n";
-			print "<br>";
+    		print '<div class="fichecenter"><div class="fichehalfleft">';
+    
+    		/*
+    		 * Documents generes
+    		 */
+    		$comfournref = dol_sanitizeFileName($object->ref);
+    		$file =	$conf->fournisseur->dir_output . '/commande/' . $comfournref .	'/'	. $comfournref . '.pdf';
+    		$relativepath =	$comfournref.'/'.$comfournref.'.pdf';
+    		$filedir = $conf->fournisseur->dir_output	. '/commande/' .	$comfournref;
+    		$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
+    		$genallowed=$user->rights->fournisseur->commande->creer;
+    		$delallowed=$user->rights->fournisseur->commande->supprimer;
+    
+    		print $formfile->showdocuments('commande_fournisseur',$comfournref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,0,0,'','','',$object->thirdparty->default_lang);
+    		$somethingshown=$formfile->numoffiles;
+    
+    		// Show links to link elements
+    		$linktoelem = $form->showLinkToObjectBlock($object, null, array('supplier_order','order_supplier'));
+    		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+    
+    		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+    
+    
+    		if ($user->rights->fournisseur->commande->receptionner	&& ($object->statut == 3 || $object->statut == 4))
+    		{
+    			// Set status to received (action=livraison)
+    			print '<!-- form to record supplier order received -->'."\n";
+    			print '<form action="card.php?id='.$object->id.'" method="post">';
+    			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    			print '<input type="hidden"	name="action" value="livraison">';
+    			print load_fiche_titre($langs->trans("Receive"),'','');
+    			
+    			print '<table class="noborder" width="100%">';
+    			//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
+    			print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
+    			print $form->select_date('','',1,1,'',"commande",1,0,1);
+    			print "</td></tr>\n";
+    
+    			print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";
+    			$liv = array();
+    			$liv[''] = '&nbsp;';
+    			$liv['tot']	= $langs->trans("CompleteOrNoMoreReceptionExpected");
+    			$liv['par']	= $langs->trans("PartialWoman");
+    			$liv['nev']	= $langs->trans("NeverReceived");
+    			$liv['can']	= $langs->trans("Canceled");
+    
+    			print $form->selectarray("type",$liv);
+    
+    			print '</td></tr>';
+    			print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
+    			print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Receive").'"></td></tr>';
+    			print "</table>\n";
+    			print "</form>\n";
+    			print "<br>";
+    		}
+    
+            // List of actions on element
+    		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+            $formactions=new FormActions($db);
+            $somethingshown=$formactions->showactions($object,'order_supplier',$socid,0,'listaction'.($genallowed?'largetitle':''));
+    
+    		print '</div></div></div>';
 		}
-
-        // List of actions on element
-        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-        $formactions=new FormActions($db);
-        $somethingshown=$formactions->showactions($object,'order_supplier',$socid,0,'listaction'.($genallowed?'largetitle':''));
-
-
-		// List of actions on element
-		/* Hidden because" available into "Log" tab
-		print '<br>';
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-		$formactions=new FormActions($db);
-		$somethingshown=$formactions->showactions($object,'order_supplier',$socid);
-		*/
-
-		print '</div></div></div>';
 	}
 
 	print '</td></tr></table>';

From f2fdee0ed2048e38ccab5bdbffc5f572259c2e27 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 2 Feb 2017 11:42:38 +0100
Subject: [PATCH 0193/1163] New add trigger for expensereport object

---
 .../class/expensereport.class.php             | 259 ++++++++++++++++--
 1 file changed, 233 insertions(+), 26 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 484499ac016..ec257725369 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -118,14 +118,16 @@ class ExpenseReport extends CommonObject
      * Create object in database
      *
      * @param   User    $user   User that create
+	 * @param   int     $notrigger   Disable triggers
      * @return  int             <0 if KO, >0 if OK
      */
-    function create($user)
+    function create($user, $notrigger=0)
     {
         global $conf;
 
         $now = dol_now();
-
+		$error = 0;
+		
         $fuserid = $this->fk_user_author;
         if (empty($fuserid)) $fuserid = $user->id;
         
@@ -200,8 +202,28 @@ class ExpenseReport extends CommonObject
                 $result=$this->update_price();
                 if ($result > 0)
                 {
-                    $this->db->commit();
-                    return $this->id;
+					
+					if (!$notrigger)
+					{
+						// Call trigger
+						$result=$this->call_trigger('EXPENSE_REPORT_CREATE',$user);
+
+						if ($result < 0) {
+							$error++;
+						}
+						// End call triggers
+					}
+
+					if (empty($error))
+					{
+						$this->db->commit();
+						return $this->id;
+					}
+					else
+					{
+						$this->db->rollback();
+						return -4;
+					}
                 }
                 else
                 {
@@ -301,12 +323,16 @@ class ExpenseReport extends CommonObject
      * update
      *
      * @param   User    $user       User making change
+	 * @param   int     $notrigger  Disable triggers
      * @return  int                 <0 if KO, >0 if OK
      */
-    function update($user)
+    function update($user, $notrigger = 0)
     {
         global $langs;
 
+		$error = 0;
+		$this->db->begin();
+		
         $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
         $sql.= " total_ht = ".$this->total_ht;
         $sql.= " , total_ttc = ".$this->total_ttc;
@@ -328,10 +354,32 @@ class ExpenseReport extends CommonObject
         $result = $this->db->query($sql);
         if ($result)
         {
-            return 1;
+            if (!$notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('EXPENSE_REPORT_UPDATE',$user);
+
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+
+			if (empty($error))
+			{
+				$this->db->commit();
+				return 1;
+			}
+			else
+			{
+				$this->db->rollback();
+				$this->error=$this->db->error();
+				return -2;
+			}
         }
         else
         {
+			$this->db->rollback();
             $this->error=$this->db->error();
             return -1;
         }
@@ -446,10 +494,14 @@ class ExpenseReport extends CommonObject
      *
      *    @param    int     $id                 Id of expense report
      *    @param    user    $fuser              User making change
+	 *    @param    int     $notrigger          Disable triggers
      *    @return   int                         <0 if KO, >0 if OK
      */
-    function set_paid($id, $fuser)
+    function set_paid($id, $fuser, $notrigger = 0)
     {
+		$error = 0;
+		$this->db->begin();
+		
         $sql = "UPDATE ".MAIN_DB_PREFIX."expensereport";
         $sql.= " SET fk_statut = 6, paid=1";
         $sql.= " WHERE rowid = ".$id." AND fk_statut = 5";
@@ -460,15 +512,38 @@ class ExpenseReport extends CommonObject
         {
             if ($this->db->affected_rows($resql))
             {
-                return 1;
+				if (!$notrigger)
+				{
+					// Call trigger
+					$result=$this->call_trigger('EXPENSE_REPORT_PAID',$fuser);
+
+					if ($result < 0) {
+						$error++;
+					}
+					// End call triggers
+				}
+				
+				if (empty($error))
+				{
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					$this->error=$this->db->error();
+					return -2;
+				}
             }
             else
             {
+				$this->db->commit();
                 return 0;
             }
         }
         else
         {
+			$this->db->rollback();
             dol_print_error($this->db);
             return -1;
         }
@@ -927,12 +1002,14 @@ class ExpenseReport extends CommonObject
      * Set to status validate
      *
      * @param   User    $fuser      User
+	 * @param   int     $notrigger  Disable triggers
      * @return  int                 <0 if KO, >0 if OK
      */
-    function setValidate($fuser)
+    function setValidate($fuser, $notrigger=0)
     {
         global $conf,$langs;
 
+		$error = 0;
         $this->oldref = $this->ref;
         $expld_car = (empty($conf->global->NDF_EXPLODE_CHAR))?"-":$conf->global->NDF_EXPLODE_CHAR;
 
@@ -990,7 +1067,8 @@ class ExpenseReport extends CommonObject
         if ($this->fk_statut != 2)
         {
         	$now = dol_now();
-
+			$this->db->begin();
+			
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
             $sql.= " SET ref = '".$this->ref."', fk_statut = 2, fk_user_valid = ".$fuser->id.", date_valid='".$this->db->idate($now)."'";
             if ($update_number_int) {
@@ -1001,10 +1079,32 @@ class ExpenseReport extends CommonObject
             $resql=$this->db->query($sql);
             if ($resql)
             {
-                return 1;
+				if (!$notrigger)
+				{
+					// Call trigger
+					$result=$this->call_trigger('EXPENSE_REPORT_VALIDATE',$fuser);
+
+					if ($result < 0) {
+						$error++;
+					}
+					// End call triggers
+				}
+				
+				if (empty($error))
+				{
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					$this->error=$this->db->error();
+					return -2;
+				}
             }
             else
             {
+				$this->db->rollback();
                 $this->error=$this->db->lasterror();
                 return -1;
             }
@@ -1064,26 +1164,52 @@ class ExpenseReport extends CommonObject
      * Set status to approved
      *
      * @param   User    $fuser      User
+	 * @param   int     $notrigger  Disable triggers
      * @return  int                 <0 if KO, >0 if OK
      */
-    function setApproved($fuser)
+    function setApproved($fuser, $notrigger=0)
     {
         $now=dol_now();
-
+		$error = 0;
+		
         // date approval
         $this->date_approve = $this->db->idate($now);
         if ($this->fk_statut != 5)
         {
+			$this->db->begin();
+			
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
             $sql.= " SET ref = '".$this->ref."', fk_statut = 5, fk_user_approve = ".$fuser->id.",";
             $sql.= " date_approve='".$this->date_approve."'";
             $sql.= ' WHERE rowid = '.$this->id;
             if ($this->db->query($sql))
             {
-                return 1;
+                if (!$notrigger)
+				{
+					// Call trigger
+					$result=$this->call_trigger('EXPENSE_REPORT_APPROVE',$fuser);
+
+					if ($result < 0) {
+						$error++;
+					}
+					// End call triggers
+				}
+				
+				if (empty($error))
+				{
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					$this->error=$this->db->error();
+					return -2;
+				}
             }
             else
             {
+				$this->db->rollback();
                 $this->error=$this->db->lasterror();
                 return -1;
             }
@@ -1099,11 +1225,13 @@ class ExpenseReport extends CommonObject
      *
      * @param User      $fuser      User
      * @param Details   $details    Details
+	 * @param int       $notrigger  Disable triggers
      */
-    function setDeny($fuser,$details)
+    function setDeny($fuser,$details,$notrigger=0)
     {
         $now = dol_now();
-
+		$error = 0;
+		
         // date de refus
         if ($this->fk_statut != 99)
         {
@@ -1119,10 +1247,33 @@ class ExpenseReport extends CommonObject
                 $this->fk_user_refuse = $fuser->id;
                 $this->detail_refuse = $details;
                 $this->date_refuse = $now;
-                return 1;
+                
+				if (!$notrigger)
+				{
+					// Call trigger
+					$result=$this->call_trigger('EXPENSE_REPORT_DENY',$fuser);
+
+					if ($result < 0) {
+						$error++;
+					}
+					// End call triggers
+				}
+				
+				if (empty($error))
+				{
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					$this->error=$this->db->error();
+					return -2;
+				}
             }
             else
             {
+				$this->db->rollback();
                 $this->error=$this->db->lasterror();
                 return -1;
             }
@@ -1137,24 +1288,54 @@ class ExpenseReport extends CommonObject
      * set_unpaid
      *
      * @param   User    $fuser      User
+	 * @param   int     $notrigger  Disable triggers
      * @return  int                 <0 if KO, >0 if OK
      */
-    function set_unpaid($fuser)
+    function set_unpaid($fuser, $notrigger = 0)
     {
+		$error = 0;
+		
         if ($this->fk_c_deplacement_statuts != 5)
         {
+			$this->db->begin();
+			
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
             $sql.= " SET fk_statut = 5";
             $sql.= ' WHERE rowid = '.$this->id;
 
             dol_syslog(get_class($this)."::set_unpaid sql=".$sql, LOG_DEBUG);
 
-            if ($this->db->query($sql)):
-            return 1;
-            else:
-            $this->error=$this->db->error();
-            return -1;
-            endif;
+			if ($this->db->query($sql))
+			{
+				if (!$notrigger)
+				{
+					// Call trigger
+					$result=$this->call_trigger('EXPENSE_REPORT_UNPAID',$fuser);
+
+					if ($result < 0) {
+						$error++;
+					}
+					// End call triggers
+				}
+				
+				if (empty($error))
+				{
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					$this->error=$this->db->error();
+					return -2;
+				}
+			}
+			else
+			{
+				$this->db->rollback();
+				$this->error=$this->db->error();
+				return -1;
+			}
         }
         else
         {
@@ -1167,13 +1348,17 @@ class ExpenseReport extends CommonObject
      *
      * @param   User    $fuser      User
      * @param   string  $detail     Detail
+	 * @param   int     $notrigger  Disable triggers
      * @return  int                 <0 if KO, >0 if OK
      */
-    function set_cancel($fuser,$detail)
+    function set_cancel($fuser,$detail, $notrigger=0)
     {
+		$error = 0;
         $this->date_cancel = $this->db->idate(gmmktime());
         if ($this->fk_statut != 4)
         {
+			$this->db->begin();
+			
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
             $sql.= " SET fk_statut = 4, fk_user_cancel = ".$fuser->id;
             $sql.= ", date_cancel='".$this->date_cancel."'";
@@ -1184,10 +1369,32 @@ class ExpenseReport extends CommonObject
 
             if ($this->db->query($sql))
             {
-                return 1;
+				if (!$notrigger)
+				{
+					// Call trigger
+					$result=$this->call_trigger('EXPENSE_REPORT_CANCEL',$fuser);
+
+					if ($result < 0) {
+						$error++;
+					}
+					// End call triggers
+				}
+				
+				if (empty($error))
+				{
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->db->rollback();
+					$this->error=$this->db->error();
+					return -2;
+				}
             }
             else
             {
+				$this->db->rollback();
                 $this->error=$this->db->error();
                 return -1;
             }

From ac20a1a8742946a83fedb6807a7244f42da52753 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Thu, 2 Feb 2017 20:47:45 +0100
Subject: [PATCH 0194/1163] Fix remove param htmlid in ajax_combobox

---
 htdocs/core/class/html.formprojet.class.php |  6 ++++--
 htdocs/core/lib/ajax.lib.php                | 18 ++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index d8283a4da57..90c987298f5 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -135,6 +135,8 @@ class FormProjets
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
+		if (empty($htmlid)) $htmlid = $htmlname;
+		
 		$out='';
         $outarray=array();
         
@@ -175,14 +177,14 @@ class FormProjets
 			if (! empty($conf->use_javascript_ajax))
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-	           	$comboenhancement = ajax_combobox($htmlname, array(), 0, $forcefocus,'resolve',$htmlid);
+	           	$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
             	$out.=$comboenhancement;
             	$nodatarole=($comboenhancement?' data-role="none"':'');
             	$minmax='minwidth100 maxwidth300';
 			}
 
 			if (empty($option_only)) {
-				$out.= '<select class="flat'.($minmax?' '.$minmax:'').'"'.($disabled?' disabled="disabled"':'').' id="'.(empty($htmlid)?$htmlname:$htmlid).'" name="'.$htmlname.'"'.$nodatarole.'>';
+				$out.= '<select class="flat'.($minmax?' '.$minmax:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlid.'" name="'.$htmlname.'"'.$nodatarole.'>';
 			}
 			if (!empty($show_empty)) {
 				$out.= '<option value="0">&nbsp;</option>';
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index d593e279178..68e3f079361 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -357,14 +357,12 @@ function ajax_dialog($title,$message,$w=350,$h=150)
  * @param  	int		$minLengthToAutocomplete	Minimum length of input string to start autocomplete
  * @param	int		$forcefocus					Force focus on field
  * @param	string	$widthTypeOfAutocomplete	'resolve' or 'off'
- * @param	int		$htmlid						Html id to use instead of htmlname
  * @return	string								Return html string to convert a select field into a combo, or '' if feature has been disabled for some reason.
  */
-function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $forcefocus=0, $widthTypeOfAutocomplete='resolve',$htmlid='')
+function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $forcefocus=0, $widthTypeOfAutocomplete='resolve')
 {
 	global $conf;
-
-	if (empty($htmlid)) $htmlid = $htmlname;
+	
 	if (! empty($conf->browser->phone)) return '';	// select2 disabled for smartphones with standard browser (does not works, popup appears outside screen)
 	if (! empty($conf->dol_use_jmobile)) return '';	// select2 works with jmobile but it breaks the autosize feature of jmobile.
 	if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
@@ -373,10 +371,10 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
 	if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0;
 
     $tmpplugin='select2';
-    $msg='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlid.' -->
+    $msg='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
           <script type="text/javascript">
         	$(document).ready(function () {
-        		$(\''.(preg_match('/^\./',$htmlid)?$htmlid:'#'.$htmlid).'\').'.$tmpplugin.'({
+        		$(\''.(preg_match('/^\./',$htmlname)?$htmlname:'#'.$htmlname).'\').'.$tmpplugin.'({
         		    dir: \'ltr\',
         			width: \''.$widthTypeOfAutocomplete.'\',		/* off or resolve */
 					minimumInputLength: '.$minLengthToAutocomplete.'
@@ -387,17 +385,17 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
 	if (count($events))
 	{
 		$msg.= '
-			jQuery("#'.$htmlid.'").change(function () {
+			jQuery("#'.$htmlname.'").change(function () {
 				var obj = '.json_encode($events).';
 		   		$.each(obj, function(key,values) {
 	    			if (values.method.length) {
-	    				runJsCodeForEvent'.$htmlid.'(values);
+	    				runJsCodeForEvent'.$htmlname.'(values);
 	    			}
 				});
 			});
 
-			function runJsCodeForEvent'.$htmlid.'(obj) {
-				var id = $("#'.$htmlid.'").val();
+			function runJsCodeForEvent'.$htmlname.'(obj) {
+				var id = $("#'.$htmlname.'").val();
 				var method = obj.method;
 				var url = obj.url;
 				var htmlname = obj.htmlname;

From f815d1bed3fffda1def1acd26201283e7d28ed34 Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Thu, 2 Feb 2017 17:30:06 -0300
Subject: [PATCH 0195/1163] Code style

---
 htdocs/core/class/html.formfile.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index e1e647e3117..16aa9332232 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -34,11 +34,11 @@
  */
 class FormFile
 {
-    var $db;
-    var $error;
-
-    var $numoffiles;
-	var $infofiles;			// Used to return informations by function getDocumentsLink
+    private $db;
+    private $numoffiles;
+    
+    public $error;   
+    public $infofiles;			// Used to return informations by function getDocumentsLink
 
 
     /**
@@ -548,7 +548,7 @@ class FormFile
             if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
 
             if ($conf->browser->layout == 'phone') $urlsource.='#'.$forname.'_form';   // So we switch to form after a generation
-            if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
+            if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
             $out.= '<input type="hidden" name="action" value="builddoc">';
             $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             

From b4c97e22790e4154297ebe18fef9cd7f185dc3f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Feb 2017 23:14:51 +0100
Subject: [PATCH 0196/1163] Update pad files

---
 build/pad/pad_dolibarr.xml | 30 +++++++++++++++---------------
 build/pad/pad_doliwamp.xml | 20 ++++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/build/pad/pad_dolibarr.xml b/build/pad/pad_dolibarr.xml
index 0920a19311d..999b8db5142 100644
--- a/build/pad/pad_dolibarr.xml
+++ b/build/pad/pad_dolibarr.xml
@@ -7,20 +7,20 @@
 	</MASTER_PAD_VERSION_INFO>
 	<Company_Info>
 		<Company_Name>Dolibarr team</Company_Name>
-		<Address_1>11 rue raymond Queneau</Address_1>
+		<Address_1>20 rue camponac</Address_1>
 		<Address_2 />
-		<City_Town>Rueil Malmaison</City_Town>
+		<City_Town>Pessac</City_Town>
 		<State_Province />
-		<Zip_Postal_Code>92500</Zip_Postal_Code>
+		<Zip_Postal_Code>33600</Zip_Postal_Code>
 		<Country>FRANCE</Country>
-		<Company_WebSite_URL>http://www.dolibarr.org</Company_WebSite_URL>
+		<Company_WebSite_URL>https://www.dolibarr.org</Company_WebSite_URL>
 		<Contact_Info>
 			<Author_First_Name>Dolibarr team</Author_First_Name>
 			<Author_Last_Name>Dolibarr team</Author_Last_Name>
-			<Author_Email>dolibarr-dev@nongnu.org</Author_Email>
+			<Author_Email>contact@dolibarr.org</Author_Email>
 			<Contact_First_Name>Dolibarr team</Contact_First_Name>
 			<Contact_Last_Name>Dolibarr team</Contact_Last_Name>
-			<Contact_Email>dolibarr-dev@nongnu.org</Contact_Email>
+			<Contact_Email>contact@dolibarr.org</Contact_Email>
 		</Contact_Info>
 		<Support_Info>
 			<Sales_Email>dolibarr-dev@nongnu.org</Sales_Email>
@@ -34,10 +34,10 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>3.5</Program_Version>
-		<Program_Release_Month>01</Program_Release_Month>
+		<Program_Version>5.0</Program_Version>
+		<Program_Release_Month>02</Program_Release_Month>
 		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2014</Program_Release_Year>
+		<Program_Release_Year>2017</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
@@ -101,14 +101,14 @@ Dolibarr intègre en effet sa propre architecture (design patterns) permettant 
 	</Program_Descriptions>
 	<Web_Info>
 		<Application_URLs>
-			<Application_Info_URL>http://www.dolibarr.org</Application_Info_URL>
-			<Application_Order_URL>http://www.dolibarr.org</Application_Order_URL>
-			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
-			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
-			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_dolibarr.xml</Application_XML_File_URL>
+			<Application_Info_URL>https://www.dolibarr.org</Application_Info_URL>
+			<Application_Order_URL>https://www.dolibarr.org</Application_Order_URL>
+			<Application_Screenshot_URL>https://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>https://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_XML_File_URL>https://www.dolibarr.org/files/pad_dolibarr.xml</Application_XML_File_URL>
 		</Application_URLs>
 		<Download_URLs>
-			<Primary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Primary_Download_URL>
+			<Primary_Download_URL>https://www.dolibarr.org/files/dolibarr.tgz</Primary_Download_URL>
 			<Secondary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Secondary_Download_URL>
 			<Additional_Download_URL_1 />
 			<Additional_Download_URL_2 />
diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml
index 8abf126d5f7..158327977d2 100644
--- a/build/pad/pad_doliwamp.xml
+++ b/build/pad/pad_doliwamp.xml
@@ -7,11 +7,11 @@
 	</MASTER_PAD_VERSION_INFO>
 	<Company_Info>
 		<Company_Name>NLTechno</Company_Name>
-		<Address_1>11 Rue raymond Queneau</Address_1>
+		<Address_1>20 Rue Camponac</Address_1>
 		<Address_2 />
-		<City_Town>Rueil Malmaison</City_Town>
+		<City_Town>Pessac</City_Town>
 		<State_Province />
-		<Zip_Postal_Code>92500</Zip_Postal_Code>
+		<Zip_Postal_Code>33600</Zip_Postal_Code>
 		<Country>FRANCE</Country>
 		<Company_WebSite_URL>http://www.nltechno.com</Company_WebSite_URL>
 		<Contact_Info>
@@ -34,10 +34,10 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>3.5</Program_Version>
-		<Program_Release_Month>01</Program_Release_Month>
+		<Program_Version>5.0</Program_Version>
+		<Program_Release_Month>02</Program_Release_Month>
 		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2014</Program_Release_Year>
+		<Program_Release_Year>2017</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
@@ -96,12 +96,12 @@ DoliWamp is the auto-installer for Windows users with no technical knowledge to
 		<Application_URLs>
 			<Application_Info_URL>http://www.nltechno.com/doliwamp/</Application_Info_URL>
 			<Application_Order_URL>http://www.nltechno.com/doliwamp/</Application_Order_URL>
-			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
-			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
-			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_doliwamp.xml</Application_XML_File_URL>
+			<Application_Screenshot_URL>https://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>https://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_XML_File_URL>https://www.dolibarr.org/files/pad_doliwamp.xml</Application_XML_File_URL>
 		</Application_URLs>
 		<Download_URLs>
-			<Primary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Primary_Download_URL>
+			<Primary_Download_URL>https://www.dolibarr.org/files/doliwamp.exe</Primary_Download_URL>
 			<Secondary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Secondary_Download_URL>
 			<Additional_Download_URL_1 />
 			<Additional_Download_URL_2 />

From bdca134e994c6291fcdefa0e5f81b93b3e8c1af2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Feb 2017 23:49:17 +0100
Subject: [PATCH 0197/1163] NEW Change to allow a specific numbering rule for
 invoice with POS module.

---
 htdocs/cashdesk/validation_verif.php          | 23 +++++++++++++++----
 .../core/modules/facture/mod_facture_mars.php | 12 ++++++++++
 .../modules/facture/mod_facture_terre.php     | 12 ++++++++++
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index 5775a3c9388..3328fa52886 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -57,14 +57,29 @@ switch ($action)
 		$invoice->date=dol_now();
 		$invoice->type= Facture::TYPE_STANDARD;
 		
-		// TODO
 		// To use a specific numbering module for POS, reset $conf->global->FACTURE_ADDON and other vars here
-		// and restore after values just after
+		// and restore values just after
+		$sav_FACTURE_ADDON='';
+		if (! empty($conf->global->POS_ADDON))
+		{
+			$sav_FACTURE_ADDON = $conf->global->FACTURE_ADDON;
+			$conf->global->FACTURE_ADDON = $conf->global->POS_ADDON;
+
+			// To force prefix only for POS with terre module
+			if (! empty($conf->global->POS_NUMBERING_TERRE_FORCE_PREFIX)) $conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX = $conf->global->POS_NUMBERING_TERRE_FORCE_PREFIX;
+			// To force prefix only for POS with mars module
+			if (! empty($conf->global->POS_NUMBERING_MARS_FORCE_PREFIX)) $conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX = $conf->global->POS_NUMBERING_MARS_FORCE_PREFIX;
+			// To force rule only for POS with mercure
+			//...
+		}
 		
 		$num=$invoice->getNextNumRef($company);
 
-		// TODO Restore save values
-		
+		// Restore save values
+		if (! empty($sav_FACTURE_ADDON))
+		{
+			$conf->global->FACTURE_ADDON = $sav_FACTURE_ADDON;
+		}
 		
 		$obj_facturation->numInvoice($num);
 
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index e477e086fe0..578ed1a16ff 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -37,6 +37,18 @@ class mod_facture_mars extends ModeleNumRefFactures
 	var $prefixcreditnote='AV';
 	var $error='';
 
+	
+	/**
+	 * Constructor
+	 */
+	function __construct()
+	{
+		if (! empty($conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX))
+		{
+			$this->prefixinvoice = $conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX;
+		}
+	}
+	
 	/**
 	 *  Renvoi la description du modele de numerotation
 	 *
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index 31d8eac736b..c0497f5fb5c 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -35,6 +35,18 @@ class mod_facture_terre extends ModeleNumRefFactures
 	var $prefixdeposit='AC';
 	var $error='';
 
+	
+	/**
+	 * Constructor
+	 */
+	function __construct()
+	{
+		if (! empty($conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX))
+		{
+			$this->prefixinvoice = $conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX;
+		}
+	}
+	
 	/**
 	 *  Renvoi la description du modele de numerotation
 	 *

From dccddf5c7ec0745a2c777fa1587e1651692cfa4e Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 3 Feb 2017 09:25:26 +0100
Subject: [PATCH 0198/1163] NEW : change render extrafields checkbox list for
 multiselectarray

---
 htdocs/core/class/extrafields.class.php | 74 ++++++++++---------------
 1 file changed, 30 insertions(+), 44 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 1211c334617..b14f7c65ed9 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -993,23 +993,12 @@ class ExtraFields
 		}
 		elseif ($type == 'checkbox')
 		{
-			$out='';
+			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+			$form = new Form($db);
+			
 			$value_arr=explode(',',$value);
+			$out=$form->multiselectarray($keysuffix.'options_'.$key.$keyprefix, $param['options'], $value_arr, '', 0, '', 0, '100%');
 
-			foreach ($param['options'] as $keyopt=>$val )
-			{
-
-				$out.='<input class="flat" type="checkbox" name="'.$keysuffix.'options_'.$key.$keyprefix.'[]" '.($moreparam?$moreparam:'');
-				$out.=' value="'.$keyopt.'"';
-
-				if ((is_array($value_arr)) && in_array($keyopt,$value_arr)) {
-					$out.= 'checked';
-				}else {
-					$out.='';
-				}
-
-				$out.='/>'.$val.'<br>';
-			}
 		}
 		elseif ($type == 'radio')
 		{
@@ -1100,6 +1089,9 @@ class ExtraFields
 				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
+					
+					$data=array();
+					
 					while ( $i < $num ) {
 						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
@@ -1125,12 +1117,9 @@ class ExtraFields
 									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
 								}
 							}
-							$out .= '<input class="flat" type="checkbox" name="'.$keysuffix.'options_' . $key . $keyprefix . '[]" ' . ($moreparam ? $moreparam : '');
-							$out .= ' value="' . $obj->rowid . '"';
-
-							$out .= 'checked';
-
-							$out .= '/>' . $labeltoshow . '<br>';
+							
+							$data[$obj->rowid]=$labeltoshow;
+							
 						} else {
 							if (! $notrans) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
@@ -1144,32 +1133,25 @@ class ExtraFields
 								$labeltoshow = '(not defined)';
 
 							if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-								$out .= '<input class="flat" type="checkbox" name="'.$keysuffix.'options_' . $key . $keyprefix . '[]" ' . ($moreparam ? $moreparam : '');
-								$out .= ' value="' . $obj->rowid . '"';
-
-								$out .= 'checked';
-								$out .= '';
-
-								$out .= '/>' . $labeltoshow . '<br>';
+								$data[$obj->rowid]=$labeltoshow;
 							}
 
 							if (! empty($InfoFieldList[3])) {
 								$parent = $parentName . ':' . $obj->{$parentField};
 							}
 
-							$out .= '<input class="flat" type="checkbox" name="'.$keysuffix.'options_' . $key . $keyprefix . '[]" ' . ($moreparam ? $moreparam : '');
-							$out .= ' value="' . $obj->rowid . '"';
-
-							$out .= ((is_array($value_arr) && in_array($obj->rowid, $value_arr)) ? ' checked ' : '');
-							;
-							$out .= '';
-
-							$out .= '/>' . $labeltoshow . '<br>';
+							$data[$obj->rowid]=$labeltoshow;
 						}
-
+						
 						$i ++;
 					}
 					$this->db->free($resql);
+					
+					require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+					$form = new Form($db);
+					
+					$out=$form->multiselectarray($keysuffix.'options_'.$key.$keyprefix, $data, $value_arr, '', 0, '', 0, '100%');
+					
 				} else {
 					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
 				}
@@ -1380,9 +1362,10 @@ class ExtraFields
 			if (is_array($value_arr))
 			{
 				foreach ($value_arr as $keyval=>$valueval) {
-					$value.=$params['options'][$valueval].'<br>';
+					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$params['options'][$valueval].'</li>';
 				}
 			}
+			$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 		}
 		elseif ($type == 'chkbxlst')
 		{
@@ -1417,7 +1400,7 @@ class ExtraFields
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$value = ''; // value was used, so now we reste it to use it to build final output
-
+				$toprint=array();
 				while ( $obj = $this->db->fetch_object($resql) ) {
 
 					// Several field into label (eq table:code|libelle:rowid)
@@ -1430,9 +1413,9 @@ class ExtraFields
 									$translabel = $langs->trans($obj->$field_toshow);
 								}
 								if ($translabel != $field_toshow) {
-									$value .= dol_trunc($translabel, 18) . '<BR>';
+									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 								} else {
-									$value .= $obj->$field_toshow . '<BR>';
+									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
 								}
 							}
 						} else {
@@ -1441,15 +1424,18 @@ class ExtraFields
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 							}
 							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$value .= dol_trunc($translabel, 18) . '<BR>';
+								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 							} else {
-								$value .= $obj->{$InfoFieldList[1]} . '<BR>';
+								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
 							}
 						}
 					}
 				}
-			} else
+				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+				
+			} else {
 				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
+			}
 		}
 		elseif ($type == 'link')
 		{

From 3f236b1ebff6b14b89e2b5af0f5ebb818bc4ba41 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 3 Feb 2017 12:14:29 +0100
Subject: [PATCH 0199/1163] FIX : $resaction not used in all case

Please integrate on next 5.0
---
 htdocs/core/class/hookmanager.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index cc221393a42..2456005428e 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -231,15 +231,15 @@ class HookManager
                     	if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
 
                     	//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
-                    	$result = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+                    	$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
 
                     	if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
                     	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
                     	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string. we must use $actionclassinstance->resprints to return a string
-                    	if (! is_array($result) && ! is_numeric($result))
+                    	if (! is_array($resaction) && ! is_numeric($resaction))
                     	{
                     		dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
-                    		if (empty($actionclassinstance->resprints)) { $this->resPrint.=$result; $result=0; }
+                    		if (empty($actionclassinstance->resprints)) { $this->resPrint.=$resaction; $resaction=0; }
                     	}
                     }
 

From bc43a052f47cc6525e72c366c49143ced6dd4342 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Feb 2017 12:16:13 +0100
Subject: [PATCH 0200/1163] Default usage to send token is header.

---
 .../framework/Luracast/Restler/explorer/index.html       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
index a433b80056b..214e6f6261c 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>Api Explorer</title>
-  <!-- <link href='https://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
+  <!-- DOL_LDR_CHANGE <link href='https://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
   <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">-->
   <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
@@ -53,12 +53,15 @@
 
     $('#input_apiKey').change(function() {
       var key = $('#input_apiKey')[0].value;
-      log("key: " + key);
+
       if(key && key.trim() != "") {
+        /* DOL_LDR_CHANGE */
         log("added key " + key);
-        
+
+        /* Disabled for security reason. We keep only param in header
         window.authorizations.add("key", new ApiKeyAuthorization("DOLAPIKEY", key, "query"));
         console.log("param api_key added with value "+key);
+        */
         
         window.authorizations.add("key2", new ApiKeyAuthorization("DOLAPIKEY", key, "header"));
         console.log("header DOLAPIKEY added with value "+key);

From bd812a0befff56ed7269d059abe21e9c61c50dee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Feb 2017 14:48:16 +0100
Subject: [PATCH 0201/1163] NEW new demo entry page

---
 htdocs/langs/en_US/other.lang                 |   7 +-
 htdocs/public/demo/demo-profile-all.jpg       | Bin 0 -> 4847 bytes
 .../public/demo/demo-profile-foundation.jpg   | Bin 0 -> 5223 bytes
 htdocs/public/demo/demo-profile-product.jpg   | Bin 0 -> 4647 bytes
 htdocs/public/demo/demo-profile-service.jpg   | Bin 0 -> 5368 bytes
 htdocs/public/demo/dolibarr_demo_ban.jpg      | Bin 0 -> 183967 bytes
 htdocs/public/demo/index.php                  | 165 +++++++++++-------
 htdocs/theme/eldy/style.css.php               |  35 +++-
 8 files changed, 133 insertions(+), 74 deletions(-)
 create mode 100644 htdocs/public/demo/demo-profile-all.jpg
 create mode 100644 htdocs/public/demo/demo-profile-foundation.jpg
 create mode 100644 htdocs/public/demo/demo-profile-product.jpg
 create mode 100644 htdocs/public/demo/demo-profile-service.jpg
 create mode 100644 htdocs/public/demo/dolibarr_demo_ban.jpg

diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 253560454ec..cecfe1e71e6 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -70,12 +70,13 @@ PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/public/demo/demo-profile-all.jpg b/htdocs/public/demo/demo-profile-all.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6d7ee37a863050bf22f1423ebbb283af8b2fc5e6
GIT binary patch
literal 4847
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

literal 0
HcmV?d00001

diff --git a/htdocs/public/demo/demo-profile-foundation.jpg b/htdocs/public/demo/demo-profile-foundation.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4574643090a6e4f0936253159939ce47b1a7cb73
GIT binary patch
literal 5223
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
Hw#WYqJ;YqS

literal 0
HcmV?d00001

diff --git a/htdocs/public/demo/demo-profile-product.jpg b/htdocs/public/demo/demo-profile-product.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a7c4afb93bb24329c8559ce16883e06666594797
GIT binary patch
literal 4647
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

literal 0
HcmV?d00001

diff --git a/htdocs/public/demo/demo-profile-service.jpg b/htdocs/public/demo/demo-profile-service.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1fffacafaf93ca7f0ecb430ed3e78c073bd62a9f
GIT binary patch
literal 5368
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
E0hV&76#xJL

literal 0
HcmV?d00001

diff --git a/htdocs/public/demo/dolibarr_demo_ban.jpg b/htdocs/public/demo/dolibarr_demo_ban.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f3059fcc2e46ba361135641e5b431c748587224d
GIT binary patch
literal 183967
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
MDhnxvid&!m*}w@%zW@LL

literal 0
HcmV?d00001

diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 4c7c8cbebc8..a83ef87b65b 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -54,6 +54,13 @@ $alwaysuncheckedmodules=array();
 $alwayshiddencheckedmodules=array();
 $alwayshiddenuncheckedmodules=array();
 
+$url=DOL_URL_ROOT.'/index.php?';
+$url.=($url?'&':'').($conf->dol_hide_topmenu?'dol_hide_topmenu='.$conf->dol_hide_topmenu:'');
+$url.=($url?'&':'').($conf->dol_hide_leftmenu?'dol_hide_leftmenu='.$conf->dol_hide_leftmenu:'');
+$url.=($url?'&':'').($conf->dol_optimize_smallscreen?'dol_optimize_smallscreen='.$conf->dol_optimize_smallscreen:'');
+$url.=($url?'&':'').($conf->dol_no_mouse_hover?'dol_no_mouse_hover='.$conf->dol_no_mouse_hover:'');
+$url.=($url?'&':'').($conf->dol_use_jmobile?'dol_use_jmobile='.$conf->dol_use_jmobile:'');
+
 $tmpaction = 'view';
 $parameters=array();
 $object=new stdClass();
@@ -64,22 +71,38 @@ if (empty($reshook))
 	$demoprofiles=array(
 		array('default'=>'1', 'key'=>'profdemoservonly','label'=>'DemoCompanyServiceOnly',
 		'disablemodules'=>'adherent,barcode,cashdesk,don,expedition,externalsite,incoterm,mailmanspip,margin,prelevement,product,productbatch,stock',
-		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot8.png'),
+		//'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot8.png',
+		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-service.jpg',
+		'url'=>$url
+		),
 		array('default'=>'-1','key'=>'profdemoshopwithdesk','label'=>'DemoCompanyShopWithCashDesk',
 		'disablemodules'=>'adherent,don,externalsite,ficheinter,incoterm,mailmanspip,prelevement,product,productbatch,stock',
-		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png'),
+		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png',
+		'url'=>$url
+		),
 		array('default'=>'0', 'key'=>'profdemoprodstock','label'=>'DemoCompanyProductAndStocks',
 		'disablemodules'=>'adherent,contrat,don,externalsite,ficheinter,mailmanspip,prelevement,service',
-		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png'),
-		array('default'=>'0', 'key'=>'profdemoall','label'=>'DemoCompanyAll',
-		'disablemodules'=>'adherent,don,externalsite,mailmanspip',
-		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'),
+		//'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png',
+		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-product.jpg',
+		'url'=>$url
+		),
 		array('default'=>'-1', 'key'=>'profdemofun','label'=>'DemoFundation',
 		'disablemodules'=>'banque,barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,ficheinter,incoterm,mailmanspip,margin,prelevement,product,productbatch,projet,propal,propale,service,societe,stock,tax',
-		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png'),
+		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png',
+		'url'=>$url
+		),
 		array('default'=>'0', 'key'=>'profdemofun2','label'=>'DemoFundation2',
 		'disablemodules'=>'barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,ficheinter,incoterm,mailmanspip,margin,prelevement,product,productbatch,projet,propal,propale,service,societe,stock,tax',
-		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png')
+		//'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png',
+		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-foundation.jpg',
+		'url'=>$url
+		),
+	    // All demo profile
+	    array('default'=>'0', 'key'=>'profdemoall','label'=>'ChooseYourDemoProfilMore',
+		'disablemodules'=>'adherent,don,externalsite,mailmanspip',
+	    //'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'
+		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-all.jpg'
+	    )
 	);
 
 	// Visible
@@ -209,14 +232,8 @@ if (GETPOST("action") == 'gotodemo')
     // Do redirect to login page
 	if ($disablestring)
 	{
-		$url='';
-		$url.=($url?'&':'').($conf->dol_hide_topmenu?'dol_hide_topmenu='.$conf->dol_hide_topmenu:'');
-		$url.=($url?'&':'').($conf->dol_hide_leftmenu?'dol_hide_leftmenu='.$conf->dol_hide_leftmenu:'');
-		$url.=($url?'&':'').($conf->dol_optimize_smallscreen?'dol_optimize_smallscreen='.$conf->dol_optimize_smallscreen:'');
-		$url.=($url?'&':'').($conf->dol_no_mouse_hover?'dol_no_mouse_hover='.$conf->dol_no_mouse_hover:'');
-		$url.=($url?'&':'').($conf->dol_use_jmobile?'dol_use_jmobile='.$conf->dol_use_jmobile:'');
 		if (GETPOST('urlfrom')) $url.=($url?'&':'').'urlfrom='.urlencode(GETPOST('urlfrom','alpha'));
-		$url=DOL_URL_ROOT.'/index.php?'.($url?$url.'&':'').'disablemodules='.$disablestring;
+		$url.=($url?'&':'').'disablemodules='.$disablestring;
 		header("Location: ".$url);
 		exit;
 	}
@@ -231,18 +248,16 @@ $head='';
 $head.='<meta name="keywords" content="demo,online,demonstration,example,test,erp,crm,demos,web">'."\n";
 $head.='<meta name="description" content="Dolibarr ERP and CRM demo. You can test here several profiles for Dolibarr ERP and CRM demonstration.">'."\n";
 $head.='<style type="text/css">'."\n";
-$head.='.body { font: 12px arial,verdana,helvetica !important; }'."\n";
 $head.='.CTable {
 padding: 6px;
-font: 12px arial,verdana,helvetica;
 font-weight: normal;
 color: #444444 !important;
 
 margin: 8px 0px 8px 2px;
 
-border: 1px solid #bbb;
+/*border: 1px solid #bbb;
 border-radius: 8px;
--moz-border-radius: 8px;
+-moz-border-radius: 8px;*/
 
 background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,255) 100%);
 
@@ -251,7 +266,13 @@ background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,25
     margin-top: 6px;
     -webkit-column-count: 4; /* Chrome, Safari, Opera */
     -moz-column-count: 4; /* Firefox */
-    column-count: 4;
+    column-count: 3;
+    text-align: left;
+}
+.demomaxoveflow {
+    max-width: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 @media only screen and (max-width: 840px)
 {
@@ -259,6 +280,7 @@ background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,25
 		-webkit-column-count: 3; /* Chrome, Safari, Opera */
 	    -moz-column-count: 3; /* Firefox */
 	    column-count: 3;
+        text-align: left;
 	}
 }
 @media only screen and (max-width: 640px)
@@ -267,6 +289,7 @@ background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,25
 		-webkit-column-count: 2; /* Chrome, Safari, Opera */
 	    -moz-column-count: 2; /* Firefox */
 	    column-count: 2;
+        text-align: left;
 	}
 }
 @media only screen and (max-width: 420px)
@@ -275,6 +298,7 @@ background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,25
 		-webkit-column-count: 1; /* Chrome, Safari, Opera */
 	    -moz-column-count: 1; /* Firefox */
 	    column-count: 1;
+        text-align: left;
 	}
 }
 </style>
@@ -309,20 +333,23 @@ llxHeaderVierge($langs->trans("DolibarrDemo"), $head);
 
 print "\n";
 
-print '<table style="font-size:14px;" class="centpercent" summary="Main table for Dolibarr demos">';
-
-print '<tr><td>';
-print '<div class="center"><a alt="Official portal of your ERP CRM application" targe="_blank" href="https://www.dolibarr.org"><img class="demologo" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" alt="Dolibarr logo"></a></div><br>';
-print '<br>';
+print '<div class="demoban demobackground">';
+print '<div class="right" style="padding-right: 30px; padding-top: 30px;">';
+print '<a alt="Official portal of your ERP CRM application" targe="_blank" href="https://www.dolibarr.org"><img class="demologo" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" alt="Dolibarr logo"></a>';
+print '</div>';
+print '</div>';
 
+print '<div class="demobantext" style="max-width: 1024px;">';
+print '<div style="font-size: 20px; padding: 40px;">';
 print '<div style="text-align: justify;">'.$langs->trans("DemoDesc").'</div><br>';
-print '<br>';
 print '<font color="#555577"><b>'.$langs->trans("ChooseYourDemoProfil").'</b></font>';
+print '</div>';
+print '</div>';
 
-print '</td></tr>';
-print '<tr><td>';
 
-//print '<table width="100%" summary="List of Dolibarr demos" class="notopnoleft">'."\n";
+print '<div class="clearboth"></div>';
+print '<div class="demobanbox">';
+
 $i=0;
 foreach ($demoprofiles as $profilearray)
 {
@@ -339,11 +366,12 @@ foreach ($demoprofiles as $profilearray)
 		//print $urlfrom;
 		if (! empty($profilearray['url'])) $urlwithmod=$profilearray['url'];
 
-		//if ($i % $NBOFCOLS == 0) print '<tr>';
-		//print '<tr>';
-		//print '<td>'."\n";
-
-		print '<form method="POST" name="form'.$profilearray['key'].'" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+		if (empty($profilearray['url']))
+		{
+		    print '<div class="clearboth"></div>';
+		}
+		
+		print '<form method="POST" class="valigntop inline-block" name="form'.$profilearray['key'].'" action="'.$_SERVER["PHP_SELF"].'#a1'.$profilearray['key'].'">'."\n";
 		print '<input type="hidden" name="action" value="gotodemo">'."\n";
         print '<input type="hidden" name="urlfrom" value="'.dol_escape_htmltag($urlfrom).'">'."\n";
         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
@@ -354,20 +382,35 @@ foreach ($demoprofiles as $profilearray)
         print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
         print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
 
-        print '<table summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" style="font-size:14px;" class="centpercent CTable CTableRow'.($i%2==0?'1':'0').'">'."\n";
-		// Title
-        print '<tr>';
-		print '<td width="130" id="a1'.$profilearray['key'].'" class="'.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'"><a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'"><img class="demothumb" src="'.$profilearray['icon'].'" alt="Demo '.$profilearray['label'].'"></a></td>';
-		print '<td id="a2'.$profilearray['key'].'" class="'.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'"><a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">'.$langs->trans($profilearray['label']).'</a></td>';
-		print '</tr>'."\n";
+        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 400px">'."\n";
+        print '<div id="a1'.$profilearray['key'].'" class="'.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
+
+		print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">';
+
+		print '<div style="padding: 10px;">';
+        
+		print '<img class="demothumb" src="'.$profilearray['icon'].'" alt="Demo '.$profilearray['label'].'">';
+		
+		print '<div class="clearboth"></div>';
+	
+		print '<div style=""><div class="demothumbtext">';
+
+    	print $langs->trans($profilearray['label']);
+
+    	print '</div></div>';
+    	
+    	print '</div>';
+    	print '</a>';
+    	 
+    	
         // Modules
         if (empty($profilearray['url']))
         {
-    		print '<tr id="tr1'.$profilearray['key'].'" class="moduleline">';
-    		print '<td colspan="2">';
+    		print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="font-size:14px; line-height: 110%;">';
+    		
     		print $langs->trans("ThisIsListOfModules").'<br>';
     		print '<div class="csscolumns">';
-    		//print '<table width="100%">';
+    		
     		$listofdisabledmodules=explode(',',$profilearray['disablemodules']);
     		$j=0;
     		$nbcolsmod=empty($conf->dol_optimize_smallscreen)?4:3;
@@ -393,44 +436,36 @@ foreach ($demoprofiles as $profilearray)
                 {
                     $modulo=($j % $nbcolsmod);
         		    //if ($modulo == 0) print '<tr>';
-                    //print '<td>';
                     print '<!-- id='.$val->numero.' -->';
+                    print '<div class="nowrap">';
                     print '<input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"';
                     if (in_array($modulekeyname,$alwaysuncheckedmodules)) print ' disabled';
                     if (! in_array($modulekeyname,$alwaysuncheckedmodules)  && (! in_array($modulekeyname,$listofdisabledmodules) || in_array($modulekeyname,$alwayscheckedmodules))) print ' checked';
-                    print '> '.$val->getName().'<br>';
-                    //print '</td>';
+                    print '> <div class="inline-block demomaxoveflow">'.$val->getName().'</div><br>';
+                    print '</div>';
                     //if ($modulo == ($nbcolsmod - 1)) print '</tr>';
                     $j++;
                 }
     		}
-    		//print '</table>';
-    		print '</div></td>';
-    		print '</tr>'."\n";
 
-		    print '<tr id="tr2'.$profilearray['key'].'" class="moduleline"><td colspan="2" align="center"><input type="submit" value=" &nbsp; &nbsp; '.$langs->trans("Start").' &nbsp; &nbsp; " class="button"></td></tr>';
+    		print '</div>';
+
+		    print '<div class="center">';
+		    print '<input type="submit" value=" &nbsp; &nbsp; '.$langs->trans("Start").' &nbsp; &nbsp; " class="button">';
+		    print '</div>';
+    	
+		    print '</div>';
         }
-		print '</table>';
+
+        print '</div></div>';
 		print '</form>'."\n";
 
-		//print '</td>';
-		//if ($i % $NBOFCOLS == ($NBOFCOLS-1)) print '</tr>'."\n";
-		//print '</tr>'."\n";
 		$i++;
 	}
 }
-//print '</table>';
 
-print '</td>';
-print '</tr>';
+print '</div>';
 
-// Description
-print '<tr><td>';
-
-
-print '</td></tr>';
-
-print '</table>';
 
 // TODO Replace this with a hook
 // Google Adsense (need Google module)
@@ -477,7 +512,7 @@ function llxHeaderVierge($title, $head = "")
 
     top_htmlhead($head,$title);
 
-    print '<body class="demobody demobackground"><div style="padding: 20px;" class="demobackgrounddiv">'."\n";
+    print '<body class="demobody"><div class="demobackgrounddiv">'."\n";
 }
 
 /**
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 34536323ec6..c42ea93cfce 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -4549,20 +4549,36 @@ border-top-right-radius: 6px;
 
 
 /* For demo pages */
+.demobody {
+	line-height: 130%;
+	font-size: 150%;
+	text-align: center;
+}
+.demobantext {
+	max-width: 1024px;
+	text-align: center;
+	display: inline-block;
+}
+.demobanbox {
+    font-size: 90%;
+}
 img.demothumb {
-    box-shadow: 2px 2px 8px #BBB;
+    /* box-shadow: 2px 2px 8px #BBB; */
     margin-right: 20px;
     margin-left: 10px;
+    width: 110px;
 }
-
 .demobackground {
-    /*
-    background-image: url(/dolibarr_5.0/htdocs/theme/image-demo.jpg);
+    background-image: url(<?php echo DOL_URL_ROOT.'/public/demo/dolibarr_demo_ban.jpg' ?>);
     background-size: cover;
     object-fit: contain;
-    */
+    height: 140px;
+    background-position-y: bottom;
+}
+div#tr1profdemoall {
+    margin-left: -40px;
+    margin-right: -40px;
 }
-
 
 
 /* ============================================================================== */
@@ -4601,12 +4617,19 @@ img.demothumb {
 		width: <?php print dol_size(350,'width'); ?>px;
 	}
 
+    .demobody {
+    	line-height: 150% !important;
+        font-size: 100% !important;
+    }
     img.demothumb {
         box-shadow: 1px 1px 4px #BBB;
         margin-right: 6px;
         margin-left: 4px;
         width: 80px;
     }
+    .demobanbox {
+        font-size: 100%;
+    }
 
     div.tabBar {
         padding-left: 0px;

From a0251a262a3fa3ecf68360d72e52450b8b0c2d73 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Feb 2017 15:34:09 +0100
Subject: [PATCH 0202/1163] The demo has its own CSS file.

---
 htdocs/public/demo/demo.css     | 113 ++++++++++++++++++++++++++++++++
 htdocs/public/demo/index.php    |  58 +---------------
 htdocs/theme/eldy/style.css.php |  51 --------------
 htdocs/theme/md/style.css.php   |  20 ------
 4 files changed, 115 insertions(+), 127 deletions(-)
 create mode 100644 htdocs/public/demo/demo.css

diff --git a/htdocs/public/demo/demo.css b/htdocs/public/demo/demo.css
new file mode 100644
index 00000000000..486096ccdfa
--- /dev/null
+++ b/htdocs/public/demo/demo.css
@@ -0,0 +1,113 @@
+
+/* ============================================================================== */
+/*  Demo                                                                          */
+/* ============================================================================== */
+
+
+.CTable {
+	padding: 6px;
+	font-weight: normal;
+	color: #444444 !important;
+	
+	margin: 8px 0px 8px 2px;
+	
+	/*border: 1px solid #bbb;
+	border-radius: 8px;
+	-moz-border-radius: 8px;*/
+	
+	background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,255) 100%);
+}
+.csscolumns {
+    margin-top: 6px;
+    -webkit-column-count: 4; /* Chrome, Safari, Opera */
+    -moz-column-count: 4; /* Firefox */
+    column-count: 3;
+    text-align: left;
+}
+.demomaxoveflow {
+    max-width: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+@media only screen and (max-width: 840px)
+{
+	.csscolumns {
+		-webkit-column-count: 3; /* Chrome, Safari, Opera */
+	    -moz-column-count: 3; /* Firefox */
+	    column-count: 3;
+        text-align: left;
+	}
+}
+@media only screen and (max-width: 640px)
+{
+	.csscolumns {
+		-webkit-column-count: 2; /* Chrome, Safari, Opera */
+	    -moz-column-count: 2; /* Firefox */
+	    column-count: 2;
+        text-align: left;
+	}
+}
+@media only screen and (max-width: 420px)
+{
+	.csscolumns {
+		-webkit-column-count: 1; /* Chrome, Safari, Opera */
+	    -moz-column-count: 1; /* Firefox */
+	    column-count: 1;
+        text-align: left;
+	}
+}
+
+
+/* For demo pages */
+.demobody {
+	line-height: 130%;
+	font-size: 150%;
+	text-align: center;
+}
+.demobantext {
+	max-width: 1024px;
+	text-align: center;
+	display: inline-block;
+}
+.demobanbox {
+    font-size: 90%;
+}
+img.demothumb {
+    /* box-shadow: 2px 2px 8px #BBB; */
+    margin-right: 20px;
+    margin-left: 10px;
+    width: 110px;
+}
+.demobackground {
+    background-image: url('dolibarr_demo_ban.jpg');
+    background-size: cover;
+    object-fit: contain;
+    height: 140px;
+    background-position-y: bottom;
+}
+div#tr1profdemoall {
+    margin-left: -40px;
+    margin-right: -40px;
+}
+
+
+@media only screen and (max-width: 767px)
+{
+    .demobody {
+    	line-height: 150% !important;
+        font-size: 100% !important;
+    }
+    img.demothumb {
+        box-shadow: 1px 1px 4px #BBB;
+        margin-right: 6px;
+        margin-left: 4px;
+        width: 80px;
+    }
+    .demobanbox {
+        font-size: 100%;
+    }
+    div#tr1profdemoall {
+        margin-left: 0px;
+        margin-right: 0px;
+    }
+}
\ No newline at end of file
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index a83ef87b65b..800639be251 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -247,62 +247,8 @@ if (GETPOST("action") == 'gotodemo')
 $head='';
 $head.='<meta name="keywords" content="demo,online,demonstration,example,test,erp,crm,demos,web">'."\n";
 $head.='<meta name="description" content="Dolibarr ERP and CRM demo. You can test here several profiles for Dolibarr ERP and CRM demonstration.">'."\n";
-$head.='<style type="text/css">'."\n";
-$head.='.CTable {
-padding: 6px;
-font-weight: normal;
-color: #444444 !important;
-
-margin: 8px 0px 8px 2px;
-
-/*border: 1px solid #bbb;
-border-radius: 8px;
--moz-border-radius: 8px;*/
-
-background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,255) 100%);
-
-}
-.csscolumns {
-    margin-top: 6px;
-    -webkit-column-count: 4; /* Chrome, Safari, Opera */
-    -moz-column-count: 4; /* Firefox */
-    column-count: 3;
-    text-align: left;
-}
-.demomaxoveflow {
-    max-width: 100px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-@media only screen and (max-width: 840px)
-{
-	.csscolumns {
-		-webkit-column-count: 3; /* Chrome, Safari, Opera */
-	    -moz-column-count: 3; /* Firefox */
-	    column-count: 3;
-        text-align: left;
-	}
-}
-@media only screen and (max-width: 640px)
-{
-	.csscolumns {
-		-webkit-column-count: 2; /* Chrome, Safari, Opera */
-	    -moz-column-count: 2; /* Firefox */
-	    column-count: 2;
-        text-align: left;
-	}
-}
-@media only screen and (max-width: 420px)
-{
-	.csscolumns {
-		-webkit-column-count: 1; /* Chrome, Safari, Opera */
-	    -moz-column-count: 1; /* Firefox */
-	    column-count: 1;
-        text-align: left;
-	}
-}
-</style>
 
+$head.='
 <script type="text/javascript">
 var openedId="";
 jQuery(document).ready(function () {
@@ -510,7 +456,7 @@ function llxHeaderVierge($title, $head = "")
 
     top_httphead();
 
-    top_htmlhead($head,$title);
+    top_htmlhead($head,$title,0,0,array(),array('public/demo/demo.css'));
 
     print '<body class="demobody"><div class="demobackgrounddiv">'."\n";
 }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c42ea93cfce..354013e7ea3 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -4543,43 +4543,6 @@ border-top-right-radius: 6px;
 }
 
 
-/* ============================================================================== */
-/*  Demo                                                                          */
-/* ============================================================================== */
-
-
-/* For demo pages */
-.demobody {
-	line-height: 130%;
-	font-size: 150%;
-	text-align: center;
-}
-.demobantext {
-	max-width: 1024px;
-	text-align: center;
-	display: inline-block;
-}
-.demobanbox {
-    font-size: 90%;
-}
-img.demothumb {
-    /* box-shadow: 2px 2px 8px #BBB; */
-    margin-right: 20px;
-    margin-left: 10px;
-    width: 110px;
-}
-.demobackground {
-    background-image: url(<?php echo DOL_URL_ROOT.'/public/demo/dolibarr_demo_ban.jpg' ?>);
-    background-size: cover;
-    object-fit: contain;
-    height: 140px;
-    background-position-y: bottom;
-}
-div#tr1profdemoall {
-    margin-left: -40px;
-    margin-right: -40px;
-}
-
 
 /* ============================================================================== */
 /*  Public                                                                        */
@@ -4617,20 +4580,6 @@ div#tr1profdemoall {
 		width: <?php print dol_size(350,'width'); ?>px;
 	}
 
-    .demobody {
-    	line-height: 150% !important;
-        font-size: 100% !important;
-    }
-    img.demothumb {
-        box-shadow: 1px 1px 4px #BBB;
-        margin-right: 6px;
-        margin-left: 4px;
-        width: 80px;
-    }
-    .demobanbox {
-        font-size: 100%;
-    }
-
     div.tabBar {
         padding-left: 0px;
         padding-right: 0px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index f1f783f448f..473ea8e243b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4445,19 +4445,6 @@ border-top-right-radius: 6px;
 
 
 
-/* ============================================================================== */
-/*  Demo                                                                          */
-/* ============================================================================== */
-
-img.demothumb {
-    box-shadow: 2px 2px 8px #888;
-	margin-bottom: 4px;
-    margin-right: 20px;
-    margin-left: 10px;
-}
-
-
-
 /* ============================================================================== */
 /*  Public                                                                        */
 /* ============================================================================== */
@@ -4505,13 +4492,6 @@ img.demothumb {
 		width: <?php print dol_size(350,'width'); ?>px;
 	}
 
-    img.demothumb {
-        box-shadow: 1px 1px 4px #BBB;
-        margin-right: 6px;
-        margin-left: 4px;
-        width: 80px;
-    }
-
     div.tabBar {
         padding-left: 0px;
         padding-right: 0px;

From 1dd62c7dafc9d72fd2745bf77881926d5830ec4e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Feb 2017 16:01:06 +0100
Subject: [PATCH 0203/1163] New demo page

---
 htdocs/public/demo/demo.css  | 27 +++++++++++++++++++++------
 htdocs/public/demo/index.php | 15 +++++++--------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/htdocs/public/demo/demo.css b/htdocs/public/demo/demo.css
index 486096ccdfa..dd1f7aad7b7 100644
--- a/htdocs/public/demo/demo.css
+++ b/htdocs/public/demo/demo.css
@@ -3,7 +3,21 @@
 /*  Demo                                                                          */
 /* ============================================================================== */
 
-
+a:hover {
+	text-decoration: none;
+}
+.demobox {
+	border: 1px solid #bbb;
+	border-radius: 8px;
+	-moz-border-radius: 8px;
+	min-height: 210px;
+}
+.demobox:hover {
+	border: 1px solid #bbb;
+	border-radius: 8px;
+	-moz-border-radius: 8px;
+	box-shadow: 2px 2px 8px #BBB; 
+}
 .CTable {
 	padding: 6px;
 	font-weight: normal;
@@ -18,7 +32,9 @@
 	background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,255) 100%);
 }
 .csscolumns {
+    margin-left: 8px;
     margin-top: 6px;
+    margin-bottom: 5px;
     -webkit-column-count: 4; /* Chrome, Safari, Opera */
     -moz-column-count: 4; /* Firefox */
     column-count: 3;
@@ -85,10 +101,6 @@ img.demothumb {
     height: 140px;
     background-position-y: bottom;
 }
-div#tr1profdemoall {
-    margin-left: -40px;
-    margin-right: -40px;
-}
 
 
 @media only screen and (max-width: 767px)
@@ -97,8 +109,11 @@ div#tr1profdemoall {
     	line-height: 150% !important;
         font-size: 100% !important;
     }
+    .demobox {
+		min-height: 170px !important;
+	}
     img.demothumb {
-        box-shadow: 1px 1px 4px #BBB;
+        /* box-shadow: 1px 1px 4px #BBB; */
         margin-right: 6px;
         margin-left: 4px;
         width: 80px;
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 800639be251..dbee00af33a 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -328,22 +328,21 @@ foreach ($demoprofiles as $profilearray)
         print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
         print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
 
-        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 400px">'."\n";
-        print '<div id="a1'.$profilearray['key'].'" class="'.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
+        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 400px;">'."\n";
 
-		print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">';
+        
+        print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
 
+        print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">';
 		print '<div style="padding: 10px;">';
         
 		print '<img class="demothumb" src="'.$profilearray['icon'].'" alt="Demo '.$profilearray['label'].'">';
 		
 		print '<div class="clearboth"></div>';
 	
-		print '<div style=""><div class="demothumbtext">';
-
+		print '<div class="demothumbtext">';
     	print $langs->trans($profilearray['label']);
-
-    	print '</div></div>';
+    	print '</div>';
     	
     	print '</div>';
     	print '</a>';
@@ -352,7 +351,7 @@ foreach ($demoprofiles as $profilearray)
         // Modules
         if (empty($profilearray['url']))
         {
-    		print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="font-size:14px; line-height: 110%;">';
+    		print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="font-size:14px; line-height: 110%; padding-bottom: 8px">';
     		
     		print $langs->trans("ThisIsListOfModules").'<br>';
     		print '<div class="csscolumns">';

From ffedf1fd5709a666a601daf527eae5e806a8ea2f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Feb 2017 16:01:06 +0100
Subject: [PATCH 0204/1163] New demo page

---
 htdocs/public/demo/demo.css  | 27 +++++++++++++++++++++------
 htdocs/public/demo/index.php | 17 ++++++++---------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/htdocs/public/demo/demo.css b/htdocs/public/demo/demo.css
index 486096ccdfa..dd1f7aad7b7 100644
--- a/htdocs/public/demo/demo.css
+++ b/htdocs/public/demo/demo.css
@@ -3,7 +3,21 @@
 /*  Demo                                                                          */
 /* ============================================================================== */
 
-
+a:hover {
+	text-decoration: none;
+}
+.demobox {
+	border: 1px solid #bbb;
+	border-radius: 8px;
+	-moz-border-radius: 8px;
+	min-height: 210px;
+}
+.demobox:hover {
+	border: 1px solid #bbb;
+	border-radius: 8px;
+	-moz-border-radius: 8px;
+	box-shadow: 2px 2px 8px #BBB; 
+}
 .CTable {
 	padding: 6px;
 	font-weight: normal;
@@ -18,7 +32,9 @@
 	background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,255) 100%);
 }
 .csscolumns {
+    margin-left: 8px;
     margin-top: 6px;
+    margin-bottom: 5px;
     -webkit-column-count: 4; /* Chrome, Safari, Opera */
     -moz-column-count: 4; /* Firefox */
     column-count: 3;
@@ -85,10 +101,6 @@ img.demothumb {
     height: 140px;
     background-position-y: bottom;
 }
-div#tr1profdemoall {
-    margin-left: -40px;
-    margin-right: -40px;
-}
 
 
 @media only screen and (max-width: 767px)
@@ -97,8 +109,11 @@ div#tr1profdemoall {
     	line-height: 150% !important;
         font-size: 100% !important;
     }
+    .demobox {
+		min-height: 170px !important;
+	}
     img.demothumb {
-        box-shadow: 1px 1px 4px #BBB;
+        /* box-shadow: 1px 1px 4px #BBB; */
         margin-right: 6px;
         margin-left: 4px;
         width: 80px;
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 800639be251..bcca53e9245 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -254,7 +254,7 @@ var openedId="";
 jQuery(document).ready(function () {
 jQuery("tr.moduleline").hide();
 // Enable this to allow personalized setup
-jQuery(".modulelineshow").attr("href","#");
+jQuery(".modulelineshow").attr("href","#a1profdemoall");
 jQuery(".cursorpointer").css("cursor","pointer");
 jQuery(".modulelineshow").click(function() {
 var idstring=$(this).attr("id");
@@ -328,22 +328,21 @@ foreach ($demoprofiles as $profilearray)
         print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
         print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
 
-        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 400px">'."\n";
-        print '<div id="a1'.$profilearray['key'].'" class="'.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
+        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 400px;">'."\n";
 
-		print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">';
+        
+        print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
 
+        print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">';
 		print '<div style="padding: 10px;">';
         
 		print '<img class="demothumb" src="'.$profilearray['icon'].'" alt="Demo '.$profilearray['label'].'">';
 		
 		print '<div class="clearboth"></div>';
 	
-		print '<div style=""><div class="demothumbtext">';
-
+		print '<div class="demothumbtext">';
     	print $langs->trans($profilearray['label']);
-
-    	print '</div></div>';
+    	print '</div>';
     	
     	print '</div>';
     	print '</a>';
@@ -352,7 +351,7 @@ foreach ($demoprofiles as $profilearray)
         // Modules
         if (empty($profilearray['url']))
         {
-    		print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="font-size:14px; line-height: 110%;">';
+    		print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="font-size:14px; line-height: 110%; padding-bottom: 8px">';
     		
     		print $langs->trans("ThisIsListOfModules").'<br>';
     		print '<div class="csscolumns">';

From 6d3e43ddafed67b76b888ed2d89e96d2d05602a2 Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Fri, 3 Feb 2017 16:34:14 +0100
Subject: [PATCH 0205/1163] NEW Report page and menu for suppliers paiements

---
 htdocs/core/menus/standard/eldy.lib.php       |   2 +
 .../rapport/pdf_paiement_fourn.class.php      | 425 ++++++++++++++++++
 htdocs/langs/en_US/compta.lang                |   1 +
 htdocs/langs/fr_FR/compta.lang                |   1 +
 4 files changed, 429 insertions(+)
 create mode 100644 htdocs/core/modules/rapport/pdf_paiement_fourn.class.php

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 9967c752481..07c349c3535 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -836,6 +836,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				}
 
 				$newmenu->add("/fourn/facture/paiement.php", $langs->trans("Payments"),1,$user->rights->fournisseur->facture->lire);
+				
+				$newmenu->add("/fourn/facture/rapport.php",$langs->trans("Reportings"),2,$user->rights->fournisseur->facture->lire);
 
 				$newmenu->add("/compta/facture/stats/index.php?mode=supplier", $langs->trans("Statistics"),1,$user->rights->fournisseur->facture->lire);
 			}
diff --git a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
new file mode 100644
index 00000000000..4b4549d4b50
--- /dev/null
+++ b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
@@ -0,0 +1,425 @@
+<?php
+/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2015		Charles-Fr BENKE  	 <charles.fr@benke.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *	\file       htdocs/core/modules/rapport/pdf_paiement.class.php
+ *	\ingroup    banque
+ *	\brief      File to build payment reports
+ */
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+
+/**
+ *	Classe permettant de generer les rapports de paiement
+ */
+class pdf_paiement_fourn
+{
+	/**
+     *  Constructor
+     *
+     *  @param      DoliDb		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		global $langs,$conf;
+		$langs->load("bills");
+		$langs->load("compta");
+
+		$this->db = $db;
+		$this->description = $langs->transnoentities("ListOfCustomerPayments");
+
+		// Dimension page pour format A4
+		$this->type = 'pdf';
+		$formatarray=pdf_getFormat();
+		$this->page_largeur = $formatarray['width'];
+		$this->page_hauteur = $formatarray['height'];
+		$this->format = array($this->page_largeur,$this->page_hauteur);
+		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+
+		$this->tab_top = 30;
+
+		$this->line_height = 5;
+		$this->line_per_page = 40;
+		$this->tab_height = $this->page_hauteur - $this->marge_haute - $this->marge_basse - $this->tab_top - 5;	// must be > $this->line_height * $this->line_per_page and < $this->page_hauteur - $this->marge_haute - $this->marge_basse - $this->tab_top - 5;
+
+		$this->posxdate=$this->marge_gauche+2;
+		$this->posxpaymenttype=42;
+		$this->posxinvoice=82;
+		$this->posxbankaccount=110;
+		$this->posxinvoiceamount=132;
+		$this->posxpaymentamount=162;
+		if ($this->page_largeur < 210) // To work with US executive format
+		{
+			$this->line_per_page = 35;
+			$this->posxpaymenttype-=10;
+			$this->posxinvoice-=0;
+			$this->posxinvoiceamount-=10;
+			$this->posxpaymentamount-=20;
+		}
+
+	}
+
+
+	/**
+	 *	Fonction generant la rapport sur le disque
+	 *
+	 *	@param	string	$_dir			repertoire
+	 *	@param	int		$month			mois du rapport
+	 *	@param	int		$year			annee du rapport
+	 *	@param	string	$outputlangs	Lang output object
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	function write_file($_dir, $month, $year, $outputlangs)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+		global $conf, $hookmanager, $langs, $user;
+
+		$socid=0;
+		if ($user->societe_id) $socid=$user->societe_id;
+
+		if (! is_object($outputlangs)) $outputlangs=$langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+
+		$this->month=$month;
+		$this->year=$year;
+
+		$dir=$_dir.'/'.$year;
+
+		if (! is_dir($dir))
+		{
+			$result=dol_mkdir($dir);
+			if ($result < 0)
+			{
+				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				return -1;
+			}
+		}
+
+		$month = sprintf("%02d",$month);
+		$year = sprintf("%04d",$year);
+		$file = $dir . "/payments-".$year."-".$month.".pdf";
+
+		// Add pdfgeneration hook
+		if (! is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('pdfgeneration'));
+		$parameters=array('file'=>$file,'outputlangs'=>$outputlangs);
+		global $action;
+		$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        $pdf=pdf_getInstance($this->format);
+        $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
+
+        if (class_exists('TCPDF'))
+        {
+            $pdf->setPrintHeader(false);
+            $pdf->setPrintFooter(false);
+        }
+        $pdf->SetFont(pdf_getPDFFont($outputlangs));
+
+        $num=0;
+        $lines=array();
+
+		// count number of lines of payment
+		$sql = "SELECT p.rowid as prowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
+		$sql.= " WHERE p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year,$month))."' AND '".$this->db->idate(dol_get_last_day($year,$month))."'";
+		$sql.= " AND p.entity = " . $conf->entity;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$numpaiement = $this->db->num_rows($result);
+		}
+
+		// number of bill
+		$sql = "SELECT p.datep as dp, f.ref";
+		//$sql .= ", c.libelle as paiement_type, p.num_paiement";
+		$sql.= ", c.code as paiement_code, p.num_paiement";
+		$sql.= ", p.amount as paiement_amount, f.total_ttc as facture_amount";
+		$sql.= ", pf.amount as pf_amount";
+		if (! empty($conf->banque->enabled))
+			$sql.= ", ba.ref as bankaccount";
+		$sql.= ", p.rowid as prowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn as p, ".MAIN_DB_PREFIX."facture_fourn as f,";
+		$sql.= " ".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf,";
+		if (! empty($conf->banque->enabled))
+			$sql.= " ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba,";
+		$sql.= " ".MAIN_DB_PREFIX."societe as s";
+		if (! $user->rights->societe->client->voir && ! $socid)
+		{
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql.= " WHERE f.fk_soc = s.rowid AND pf.fk_facturefourn = f.rowid AND pf.fk_paiementfourn = p.rowid";
+		if (! empty($conf->banque->enabled))
+			$sql.= " AND p.fk_bank = b.rowid AND b.fk_account = ba.rowid ";
+		$sql.= " AND f.entity = ".$conf->entity;
+		$sql.= " AND p.fk_paiement = c.id ";
+		$sql.= " AND p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year,$month))."' AND '".$this->db->idate(dol_get_last_day($year,$month))."'";
+		if (! $user->rights->societe->client->voir && ! $socid)
+		{
+			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+		}
+		if (! empty($socid)) $sql .= " AND s.rowid = ".$socid;
+		$sql.= " ORDER BY p.datep ASC, pf.fk_paiementfourn ASC";
+
+		dol_syslog(get_class($this)."::write_file", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			$var=True;
+
+			while ($i < $num)
+			{
+				$objp = $this->db->fetch_object($result);
+				$var=!$var;
+
+				$lines[$i][0] = $objp->ref;
+				$lines[$i][1] = dol_print_date($this->db->jdate($objp->dp),"day",false,$outputlangs,true);
+				$lines[$i][2] = $langs->transnoentities("PaymentTypeShort".$objp->paiement_code);
+				$lines[$i][3] = $objp->num_paiement;
+				$lines[$i][4] = price($objp->paiement_amount);
+				$lines[$i][5] = price($objp->facture_amount);
+				$lines[$i][6] = price($objp->pf_amount);
+				$lines[$i][7] = $objp->prowid;
+				$lines[$i][8] = $objp->bankaccount;
+				$i++;
+			}
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+
+		$pages = intval(($num + $numpaiement) / $this->line_per_page);
+
+		if ((($num + $numpaiement) % $this->line_per_page)>0)
+		{
+			$pages++;
+		}
+
+		if ($pages == 0)
+		{
+			// force to build at least one page if report has no line
+			$pages = 1;
+		}
+
+		$pdf->Open();
+		$pagenb=0;
+		$pdf->SetDrawColor(128,128,128);
+
+		$pdf->SetTitle($outputlangs->transnoentities("Payments"));
+		$pdf->SetSubject($outputlangs->transnoentities("Payments"));
+		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+		//$pdf->SetKeyWords();
+		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+		$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+		$pdf->SetAutoPageBreak(1,0);
+
+		// New page
+		$pdf->AddPage();
+		$pagenb++;
+		$this->_pagehead($pdf, $pagenb, 1, $outputlangs);
+		$pdf->SetFont('','', 9);
+		$pdf->MultiCell(0, 3, '');		// Set interline to 3
+		$pdf->SetTextColor(0,0,0);
+
+
+		$this->Body($pdf, 1, $lines, $outputlangs);
+
+		if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+
+		$pdf->Close();
+
+		$pdf->Output($file,'F');
+
+		// Add pdfgeneration hook
+		if (! is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('pdfgeneration'));
+		$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+		global $action;
+		$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+		if (! empty($conf->global->MAIN_UMASK))
+			@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+		return 1;
+	}
+
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param  int			$page	     	Object to show
+	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @return	void
+	 */
+	function _pagehead(&$pdf, $page, $showaddress, $outputlangs)
+	{
+		global $langs;
+
+		// Do not add the BACKGROUND as this is a report
+		//pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		$title=$conf->global->MAIN_INFO_SOCIETE_NOM;
+		$title.=' - '.$outputlangs->transnoentities("ListOfSupplierPayments");
+		$title.=' - '.dol_print_date(dol_mktime(0,0,0,$this->month,1,$this->year),"%B %Y",false,$outputlangs,true);
+		$pdf->SetFont('','B',$default_font_size + 1);
+		$pdf->SetXY($this->marge_gauche,10);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->marge_gauche, 2, $title, 0, 'C');
+
+		$pdf->SetFont('','',$default_font_size);
+
+        $pdf->SetXY($this->posxdate, 16);
+		$pdf->MultiCell(80, 2, $outputlangs->transnoentities("DateBuild")." : ".dol_print_date(time(),"day",false,$outputlangs,true), 0, 'L');
+
+        $pdf->SetXY($this->posxdate+100, 16);
+		$pdf->MultiCell(80, 2, $outputlangs->transnoentities("Page")." : ".$page, 0, 'R');
+
+
+		// Title line
+        $pdf->SetXY($this->posxdate, $this->tab_top+2);
+		$pdf->MultiCell($this->posxpaymenttype - $this->posxdate, 2, 'Date');
+
+		$pdf->line($this->posxpaymenttype - 1, $this->tab_top, $this->posxpaymenttype - 1, $this->tab_top + $this->tab_height + 10);
+        $pdf->SetXY($this->posxpaymenttype, $this->tab_top+2);
+		$pdf->MultiCell($this->posxinvoice - $this->posxpaymenttype, 2, $outputlangs->transnoentities("PaymentMode"), 0, 'L');
+
+		$pdf->line($this->posxinvoice - 1, $this->tab_top, $this->posxinvoice - 1, $this->tab_top + $this->tab_height + 10);
+        $pdf->SetXY($this->posxinvoice, $this->tab_top+2);
+		$pdf->MultiCell($this->posxbankaccount - $this->posxinvoice, 2, $outputlangs->transnoentities("Invoice"), 0, 'L');
+
+		$pdf->line($this->posxbankaccount - 1, $this->tab_top, $this->posxbankaccount - 1, $this->tab_top + $this->tab_height + 10);
+        $pdf->SetXY($this->posxbankaccount, $this->tab_top+2);
+		$pdf->MultiCell($this->posxinvoiceamount - $this->posxbankaccount, 2, $outputlangs->transnoentities("Account"), 0, 'L');
+
+
+		$pdf->line($this->posxinvoiceamount - 1, $this->tab_top, $this->posxinvoiceamount - 1, $this->tab_top + $this->tab_height + 10);
+        $pdf->SetXY($this->posxinvoiceamount, $this->tab_top+2);
+		$pdf->MultiCell($this->posxpaymentamount - $this->posxinvoiceamount - 1, 2, $outputlangs->transnoentities("AmountInvoice"), 0, 'R');
+
+		$pdf->line($this->posxpaymentamount - 1, $this->tab_top, $this->posxpaymentamount - 1, $this->tab_top + $this->tab_height + 10);
+        $pdf->SetXY($this->posxpaymentamount, $this->tab_top+2);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount - 1, 2, $outputlangs->transnoentities("AmountPayment"), 0, 'R');
+
+		$pdf->line($this->marge_gauche, $this->tab_top + 10, $this->page_largeur - $this->marge_droite, $this->tab_top + 10);
+
+		$pdf->Rect($this->marge_gauche, $this->tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $this->tab_height + 10);
+	}
+
+
+	/**
+	 *	Output body
+	 *
+	 *	@param	PDF			$pdf			PDF object
+	 *	@param	string		$page			Page
+	 *	@param	array		$lines			Array of lines
+	 *	@param	Translate	$outputlangs	Object langs
+	 *	@return	void
+	 */
+	function Body(&$pdf, $page, $lines, $outputlangs)
+	{
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		$pdf->SetFont('','', $default_font_size - 1);
+		$oldprowid = 0;
+		$pdf->SetFillColor(220,220,220);
+		$yp = 0;
+		$numlines=count($lines);
+		for ($j = 0 ; $j < $numlines ; $j++)
+		{
+			$i = $j;
+			if ($yp > $this->tab_height -5)
+			{
+				$page++;
+				$pdf->AddPage();
+				$this->_pagehead($pdf, $page, 0, $outputlangs);
+				$pdf->SetFont('','', $default_font_size - 1);
+				$yp = 0;
+			}
+			if ($oldprowid <> $lines[$j][7])
+			{
+				if ($yp > $this->tab_height -10)
+				{
+					$page++;
+					$pdf->AddPage();
+					$this->_pagehead($pdf, $page, 0, $outputlangs);
+					$pdf->SetFont('','', $default_font_size - 1);
+					$yp = 0;
+				}
+
+				$pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
+				$pdf->MultiCell($this->posxpaymenttype - $this->posxdate + 1, $this->line_height, $lines[$j][1], 0, 'L', 1);
+
+				$pdf->SetXY($this->posxpaymenttype, $this->tab_top + 10 + $yp);
+				$pdf->MultiCell($this->posxinvoiceamount - $this->posxpaymenttype, $this->line_height, $lines[$j][2].' '.$lines[$j][3], 0, 'L', 1);
+
+				$pdf->SetXY($this->posxinvoiceamount, $this->tab_top + 10 + $yp);
+				$pdf->MultiCell($this->posxpaymentamount- $this->posxinvoiceamount, $this->line_height, '', 0, 'R', 1);
+
+				$pdf->SetXY($this->posxpaymentamount, $this->tab_top + 10 + $yp);
+				$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $lines[$j][4], 0, 'R', 1);
+				$yp = $yp + 5;
+			}
+
+			// Invoice number
+			$pdf->SetXY($this->posxinvoice, $this->tab_top + 10 + $yp);
+			$pdf->MultiCell($this->posxinvoiceamount - $this->posxbankaccount, $this->line_height, $lines[$j][0], 0, 'L', 0);
+
+			// BankAccount
+			$pdf->SetXY($this->posxbankaccount, $this->tab_top + 10 + $yp);
+			$pdf->MultiCell($this->posxbankaccount - $this->posxdate, $this->line_height, $lines[$j][8], 0, 'L', 0);
+
+			// Invoice amount
+			$pdf->SetXY($this->posxinvoiceamount, $this->tab_top + 10 + $yp);
+			$pdf->MultiCell($this->posxpaymentamount- $this->posxinvoiceamount - 1, $this->line_height, $lines[$j][5], 0, 'R', 0);
+
+			// Payment amount
+			$pdf->SetXY($this->posxpaymentamount, $this->tab_top + 10 + $yp);
+			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $lines[$j][6], 0, 'R', 0);
+			$yp = $yp + 5;
+
+			if ($oldprowid <> $lines[$j][7])
+			{
+				$oldprowid = $lines[$j][7];
+			}
+		}
+	}
+}
+
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 1afd69b73e0..a26d6319562 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index e00b8382beb..b72af130b92 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Paiement de charges fiscales/sociales
 PaymentVat=Règlement TVA
 ListPayment=Liste des règlements
 ListOfCustomerPayments=Liste des règlements clients
+ListOfSupplierPayments=Liste des règlements fournisseurs
 DateStartPeriod=Date de début
 DateEndPeriod=Date de fin
 newLT1Payment=Nouveau paiement de taxe 2

From 7f6ab748c5d040475d5aa0953822f7fd1ef2e585 Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Fri, 3 Feb 2017 16:42:06 +0100
Subject: [PATCH 0206/1163] NEW add rapport file for supplier paiement

---
 .../rapport/pdf_paiement_fourn.class.php      |   6 +-
 htdocs/fourn/facture/rapport.php              | 171 ++++++++++++++++++
 2 files changed, 173 insertions(+), 4 deletions(-)
 create mode 100644 htdocs/fourn/facture/rapport.php

diff --git a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
index 4b4549d4b50..68b444b8e51 100644
--- a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
@@ -1,7 +1,5 @@
 <?php
-/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2015		Charles-Fr BENKE  	 <charles.fr@benke.fr>
+/* Copyright (C) 2017		ATM-Consulting  	 <support@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/core/modules/rapport/pdf_paiement.class.php
+ *	\file       htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
  *	\ingroup    banque
  *	\brief      File to build payment reports
  */
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
new file mode 100644
index 00000000000..e685421af19
--- /dev/null
+++ b/htdocs/fourn/facture/rapport.php
@@ -0,0 +1,171 @@
+<?php
+/* Copyright (C) 2017		ATM-Consulting  	 <support@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/fourn/facture/rapport.php
+ *	\ingroup    fourn
+ *	\brief      Payment reports page
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/rapport/pdf_paiement_fourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+
+// Security check
+$socid='';
+if (! empty($user->societe_id)) $socid=$user->societe_id;
+$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
+
+$action=GETPOST('action');
+
+$socid=0;
+if ($user->societe_id > 0)
+{
+    $action = '';
+    $socid = $user->societe_id;
+}
+
+$dir = $conf->fournisseur->facture->dir_output.'/payments';
+if (! $user->rights->societe->client->voir || $socid) $dir.='/private/'.$user->id;	// If user has no permission to see all, output dir is specific to user
+
+$year = $_GET["year"];
+if (! $year) { $year=date("Y"); }
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'builddoc')
+{
+    $rap = new pdf_paiement_fourn($db);
+
+    $outputlangs = $langs;
+    if (GETPOST('lang_id'))
+    {
+        $outputlangs = new Translate("",$conf);
+        $outputlangs->setDefaultLang(GETPOST('lang_id'));
+    }
+
+    // We save charset_output to restore it because write_file can change it if needed for
+    // output format that does not support UTF8.
+    $sav_charset_output=$outputlangs->charset_output;
+    if ($rap->write_file($dir, $_POST["remonth"], $_POST["reyear"], $outputlangs) > 0)
+    {
+        $outputlangs->charset_output=$sav_charset_output;
+    }
+    else
+    {
+        $outputlangs->charset_output=$sav_charset_output;
+        dol_print_error($db,$obj->error);
+    }
+
+    $year = $_POST["reyear"];
+}
+
+
+/*
+ * View
+ */
+
+$formother=new FormOther($db);
+
+llxHeader();
+
+$titre=($year?$langs->trans("PaymentsReportsForYear",$year):$langs->trans("PaymentsReports"));
+print load_fiche_titre($titre,'','title_accountancy.png');
+
+// Formulaire de generation
+print '<form method="post" action="rapport.php?year='.$year.'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="builddoc">';
+$cmonth = GETPOST("remonth")?GETPOST("remonth"):date("n", time());
+$syear = GETPOST("reyear")?GETPOST("reyear"):date("Y", time());
+
+print $formother->select_month($cmonth,'remonth');
+
+print $formother->select_year($syear,'reyear');
+
+print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
+print '</form>';
+print '<br>';
+
+clearstatcache();
+
+// Show link on other years
+$linkforyear=array();
+$found=0;
+if (is_dir($dir))
+{
+    $handle=opendir($dir);
+    if (is_resource($handle))
+    {
+        while (($file = readdir($handle))!==false)
+        {
+            if (is_dir($dir.'/'.$file) && ! preg_match('/^\./',$file) && is_numeric($file))
+            {
+                $found=1;
+                $linkforyear[]=$file;
+            }
+        }
+    }
+}
+asort($linkforyear);
+foreach($linkforyear as $cursoryear)
+{
+    print '<a href="rapport.php?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
+}
+
+if ($year)
+{
+    if (is_dir($dir.'/'.$year))
+    {
+        $handle=opendir($dir.'/'.$year);
+
+        if ($found) print '<br>';
+        print '<br>';
+        print '<table width="100%" class="noborder">';
+        print '<tr class="liste_titre">';
+        print '<td>'.$langs->trans("Reporting").'</td>';
+        print '<td align="right">'.$langs->trans("Size").'</td>';
+        print '<td align="right">'.$langs->trans("Date").'</td>';
+        print '</tr>';
+        $var=true;
+        if (is_resource($handle))
+        {
+            while (($file = readdir($handle))!==false)
+            {
+                if (preg_match('/^payment/i',$file))
+                {
+                    $var=!$var;
+                    $tfile = $dir . '/'.$year.'/'.$file;
+                    $relativepath = $year.'/'.$file;
+                    print "<tr ".$bc[$var].">".'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_fournisseur&amp;file=payments/'.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
+                    print '<td align="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
+                    print '<td align="right">'.dol_print_date(dol_filemtime($tfile),"dayhour").'</td></tr>';
+                }
+            }
+            closedir($handle);
+        }
+        print '</table>';
+    }
+}
+
+llxFooter();
+
+$db->close();

From a94a951a8948557379ea4fe9a5d7307d32117516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 3 Feb 2017 19:38:33 +0100
Subject: [PATCH 0207/1163] Little improvements to admin pages where a
 FREE_TEXT or a watermark constant was set

---
 htdocs/admin/commande.php          |   8 +-
 htdocs/admin/contract.php          |   8 +-
 htdocs/admin/facture.php           |  10 +-
 htdocs/admin/fichinter.php         |   8 +-
 htdocs/admin/propal.php            |   8 +-
 htdocs/admin/supplier_order.php    |   4 +-
 htdocs/admin/supplier_proposal.php |   8 +-
 htdocs/don/admin/donation.php      | 289 +++++++++++++++--------------
 8 files changed, 172 insertions(+), 171 deletions(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index c2f8cf2d4d6..23773e722c4 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -569,8 +569,8 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_ORDER_FREE_TEXT">';
-print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("FreeLegalTextOnOrders").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
 $variablename='ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -592,8 +592,8 @@ $var=!$var;
 print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_COMMANDE_DRAFT_WATERMARK\">";
-print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("WatermarkOnDraftOrders").'<br>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("WatermarkOnDraftOrders").'</td><td>';
 print '<input size="50" class="flat" type="text" name="COMMANDE_DRAFT_WATERMARK" value="'.$conf->global->COMMANDE_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index acfe7de156f..98b83f61b8e 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -503,8 +503,8 @@ print "</tr>\n";
 $var=true;
 
 $var=! $var;
-print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("FreeLegalTextOnContracts").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("FreeLegalTextOnContracts").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
 $variablename='CONTRACT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -520,8 +520,8 @@ print '</td></tr>'."\n";
 
 //Use draft Watermark
 $var=!$var;
-print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("WatermarkOnDraftContractCards").'<br>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("WatermarkOnDraftContractCards").'</td><td>';
 print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 21ddabc1b65..6488ed5499b 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -737,8 +737,8 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_INVOICE_FREE_TEXT" />';
-print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("FreeLegalTextOnInvoices").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("FreeLegalTextOnInvoices").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
 $variablename='INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -759,9 +759,9 @@ $var=!$var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_FACTURE_DRAFT_WATERMARK" />';
-print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("WatermarkOnDraftBill").'<br>';
-print '<input size="50" class="flat" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.$conf->global->FACTURE_DRAFT_WATERMARK.'" />';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("WatermarkOnDraftBill").'</td>';
+print '<td><input size="50" class="flat" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.$conf->global->FACTURE_DRAFT_WATERMARK.'" />';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
 print "</td></tr>\n";
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index a67407b818c..509426f9969 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -538,8 +538,8 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_FICHINTER_FREE_TEXT">';
-print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("FreeLegalTextOnInterventions").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("FreeLegalTextOnInterventions").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
 $variablename='FICHINTER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -561,8 +561,8 @@ $var=!$var;
 print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_FICHINTER_DRAFT_WATERMARK\">";
-print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("WatermarkOnDraftInterventionCards").'<br>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("WatermarkOnDraftInterventionCards").'</td><td>';
 print '<input size="50" class="flat" type="text" name="FICHINTER_DRAFT_WATERMARK" value="'.$conf->global->FICHINTER_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 57c5560a185..86b52f9852d 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -576,8 +576,8 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_PROPOSAL_FREE_TEXT">';
-print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("FreeLegalTextOnProposal").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("FreeLegalTextOnProposal").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
 $variablename='PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -598,8 +598,8 @@ $var=!$var;
 print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_PROPALE_DRAFT_WATERMARK\">";
-print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("WatermarkOnDraftProposal").'<br>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("WatermarkOnDraftProposal").'</td><td>';
 print '<input size="50" class="flat" type="text" name="PROPALE_DRAFT_WATERMARK" value="'.$conf->global->PROPALE_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 5c288b9e78a..b117795efa1 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -536,8 +536,8 @@ else
 }
 */
 
-print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("FreeLegalTextOnOrders").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
 $variablename='SUPPLIER_ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 069c90ead8a..8bd034bef48 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -527,8 +527,8 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_SUPPLIER_PROPOSAL_FREE_TEXT">';
-print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("FreeLegalTextOnSupplierProposal").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("FreeLegalTextOnSupplierProposal").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
 $variablename='SUPPLIER_PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -549,8 +549,8 @@ $var=!$var;
 print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK\">";
-print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("WatermarkOnDraftSupplierProposal").'<br>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("WatermarkOnDraftSupplierProposal").'</td><td>';
 print '<input size="50" class="flat" type="text" name="SUPPLIER_PROPOSAL_DRAFT_WATERMARK" value="'.$conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index b6043539c0d..29dc50bf7e1 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -209,15 +209,149 @@ $head = donation_admin_prepare_head();
 
 dol_fiche_head($head, 'general', $langs->trans("Donations"), 0, 'payment');
 
-/*
- *  Params
- */
-print load_fiche_titre($langs->trans("Options"));
+
+// Document templates
+print load_fiche_titre($langs->trans("DonationsModels"), '', '');
+
+// Defined the template definition table
+$type='donation';
+$def = array();
+$sql = "SELECT nom";
+$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql.= " WHERE type = '".$type."'";
+$resql=$db->query($sql);
+if ($resql)
+{
+	$i = 0;
+	$num_rows=$db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
+}
+else
+{
+	dol_print_error($db);
+}
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print '<td colspan="3">'.$langs->trans("Parameters").'</td>';
-//print '<td width="80">&nbsp;</td>';
+print '<td>'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
+print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+$handle=opendir($dir);
+
+$var=True;
+if (is_resource($handle))
+{
+	while (($file = readdir($handle))!==false)
+	{
+		if (preg_match('/\.modules\.php$/i',$file))
+		{
+			$var = !$var;
+			$name = substr($file, 0, dol_strlen($file) -12);
+			$classname = substr($file, 0, dol_strlen($file) -12);
+
+			require_once $dir.'/'.$file;
+			$module=new $classname($db);
+
+			// Show modules according to features level
+			if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+			if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+			if ($module->isEnabled())
+			{
+				print '<tr '.$bc[$var].'><td width=\"100\">';
+				echo $module->name;
+				print '</td>';
+				print '<td>';
+				print $module->description;
+				print '</td>';
+
+				// Active
+				if (in_array($name, $def))
+				{
+					if ($conf->global->DON_ADDON_MODEL == $name)
+					{
+						print "<td align=\"center\">\n";
+						print img_picto($langs->trans("Enabled"),'switch_on');
+						print '</td>';
+					}
+					else
+					{
+						print "<td align=\"center\">\n";
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+						print '</td>';
+					}
+				}
+				else
+				{
+					print "<td align=\"center\">\n";
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+					print "</td>";
+				}
+
+				// Default
+				if ($conf->global->DON_ADDON_MODEL == "$name")
+				{
+					print "<td align=\"center\">";
+					print img_picto($langs->trans("Default"),'on');
+					print '</td>';
+				}
+				else
+				{
+					print "<td align=\"center\">";
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+					print '</td>';
+				}
+
+				// Info
+				$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+				$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+				if ($module->type == 'pdf')
+				{
+					$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+				}
+				$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+				$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+				$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
+				print '<td align="center">';
+				print $form->textwithpicto('',$htmltooltip,-1,0);
+				print '</td>';
+
+				// Preview
+				print '<td align="center">';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'" target="specimen">'.img_object($langs->trans("Preview"),'generic').'</a>';
+				print '</td>';
+
+				print "</tr>\n";
+			}
+		}
+	}
+	closedir($handle);
+}
+
+print '</table><br>';
+
+/*
+ *  Params
+ */
+print load_fiche_titre($langs->trans("Options"), '', '');
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameters").'</td>';
+print '<td width="60" align="center">'.$langs->trans("Value")."</td>\n";
+print '<td></td>';
 print "</tr>\n";
 $var=true;
 
@@ -228,7 +362,7 @@ print '<input type="hidden" name="action" value="set_DONATION_ACCOUNTINGACCOUNT"
 $var=! $var;
 print '<tr '.$bc[$var].'>';
 
-print '<td width="50%">';
+print '<td>';
 $label = $langs->trans("AccountAccounting");
 print '<label for="DONATION_ACCOUNTINGACCOUNT">' . $label . '</label></td>';
 print '<td>';
@@ -250,9 +384,9 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_DONATION_MESSAGE" />';
 
 $var=! $var;
-print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("FreeTextOnDonations").'<br>';
-print '<textarea name="DONATION_MESSAGE" class="flat" cols="120">'.$conf->global->DONATION_MESSAGE.'</textarea>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("FreeTextOnDonations").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
+print '<textarea name="DONATION_MESSAGE" class="flat" cols="80">'.$conf->global->DONATION_MESSAGE.'</textarea>';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
 print "</td></tr>\n";
@@ -266,7 +400,7 @@ print '</form>';
 if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 {
 	print '<br>';
-	print load_fiche_titre($langs->trans("FrenchOptions"));
+	print load_fiche_titre($langs->trans("FrenchOptions"), '', '');
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
@@ -317,139 +451,6 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 	print "</table>\n";
 }
 
-// Document templates
-print '<br>';
-print load_fiche_titre($langs->trans("DonationsModels"));
-
-// Defined the template definition table
-$type='donation';
-$def = array();
-$sql = "SELECT nom";
-$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql.= " WHERE type = '".$type."'";
-$resql=$db->query($sql);
-if ($resql)
-{
-    $i = 0;
-    $num_rows=$db->num_rows($resql);
-    while ($i < $num_rows)
-    {
-        $array = $db->fetch_array($resql);
-        array_push($def, $array[0]);
-        $i++;
-    }
-}
-else
-{
-    dol_print_error($db);
-}
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Name").'</td>';
-print '<td>'.$langs->trans("Description").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
-print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
-print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
-print "</tr>\n";
-
-clearstatcache();
-
-$handle=opendir($dir);
-
-$var=True;
-if (is_resource($handle))
-{
-    while (($file = readdir($handle))!==false)
-    {
-        if (preg_match('/\.modules\.php$/i',$file))
-        {
-            $var = !$var;
-            $name = substr($file, 0, dol_strlen($file) -12);
-            $classname = substr($file, 0, dol_strlen($file) -12);
-
-            require_once $dir.'/'.$file;
-            $module=new $classname($db);
-
-            // Show modules according to features level
-            if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-            if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
-
-            if ($module->isEnabled())
-            {
-                print '<tr '.$bc[$var].'><td width=\"100\">';
-                echo $module->name;
-                print '</td>';
-                print '<td>';
-                print $module->description;
-                print '</td>';
-
-                // Active
-                if (in_array($name, $def))
-                {
-                    if ($conf->global->DON_ADDON_MODEL == $name)
-                    {
-						print "<td align=\"center\">\n";
-                    	print img_picto($langs->trans("Enabled"),'switch_on');
-						print '</td>';
-					}
-                    else
-                    {
-                        print "<td align=\"center\">\n";
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
-						print '</td>';
-					}
-                }
-                else
-                {
-                    print "<td align=\"center\">\n";
-                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-                    print "</td>";
-                }
-
-                // Default
-                if ($conf->global->DON_ADDON_MODEL == "$name")
-                {
-					print "<td align=\"center\">";
-					print img_picto($langs->trans("Default"),'on');
-					print '</td>';
-                }
-                else
-                {
-                    print "<td align=\"center\">";
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-					print '</td>';
-				}                
-
-                // Info
-                $htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
-                $htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
-                if ($module->type == 'pdf')
-                {
-                    $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-                }
-                $htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-                $htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
-                $htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
-                print '<td align="center">';
-                print $form->textwithpicto('',$htmltooltip,-1,0);
-                print '</td>';
-
-				// Preview
-				print '<td align="center">';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'" target="specimen">'.img_object($langs->trans("Preview"),'generic').'</a>';
-				print '</td>';
-
-                print "</tr>\n";
-            }
-        }
-    }
-    closedir($handle);
-}
-
-print '</table>';
-
 llxFooter();
 
 $db->close();

From 2dfced366ea0c7dc038ecf36312437b0c6db082a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 3 Feb 2017 20:11:06 +0100
Subject: [PATCH 0208/1163] NEW #2763 Go to document block after clicking in
 Generate document button

Close #2763
---
 htdocs/comm/propal/card.php          |  2 +-
 htdocs/commande/card.php             | 54 +++-------------------------
 htdocs/core/actions_builddoc.inc.php |  3 ++
 htdocs/fichinter/card.php            | 48 +++----------------------
 4 files changed, 14 insertions(+), 93 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 9b416fd1457..8455f7f8920 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2398,7 +2398,7 @@ if ($action == 'create')
 	if ($action != 'presend')
 	{
 		print '<div class="fichecenter"><div class="fichehalfleft">';
-
+		print '<a name="builddoc"></a>'; // ancre
 		/*
 		 * Documents generes
 		 */
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 26d4d4822e2..f7917b13839 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1187,54 +1187,10 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'builddoc') // In get or post
-	{
-		// Save last template used to generate document
-		if (GETPOST('model'))
-			$object->setDocModel($user, GETPOST('model', 'alpha'));
-		    if (GETPOST('fk_bank')) { // this field may come from an external module
-            $object->fk_bank = GETPOST('fk_bank');
-        } else {
-            $object->fk_bank = $object->fk_account;
-        }
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-		if (! empty($newlang)) {
-			$outputlangs = new Translate("", $conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-		if ($result <= 0)
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-	        $action='';
-		}
-	}
-
-	// Remove file in doc form
-	if ($action == 'remove_file')
-	{
-		if ($object->id > 0)
-		{
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-
-			$langs->load("other");
-			$upload_dir = $conf->commande->dir_output;
-			$file = $upload_dir . '/' . GETPOST('file');
-			$ret = dol_delete_file($file, 0, 0, 0, $object);
-			if ($ret)
-				setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
-			else
-				setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
-			$action = '';
-		}
-	}
+	// Actions to build doc
+	$upload_dir = $conf->commande->dir_output;
+	$permissioncreate = $user->rights->commande->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'update_extras')
 	{
@@ -2606,7 +2562,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		if ($action != 'presend')
 		{
 			print '<div class="fichecenter"><div class="fichehalfleft">';
-
+			print '<a name="builddoc"></a>'; // ancre
 			// Documents
 			$comref = dol_sanitizeFileName($object->ref);
 			$file = $conf->commande->dir_output . '/' . $comref . '/' . $comref . '.pdf';
diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index 5984283b996..dc91cbd0404 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -91,6 +91,9 @@ if ($action == 'builddoc' && $permissioncreate)
         else
         {
             setEventMessages($langs->trans("FileGenerated"), null);
+
+            header('Location: '.$_SERVER['REQUEST_URI'].'#builddoc');
+            die;
         }
     }
 }
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 4ed3ecb7cef..39075022422 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -438,49 +438,6 @@ if (empty($reshook))
 		}
 	}
 
-	/*
-	 * Build doc
-	 */
-	else if ($action == 'builddoc' && $user->rights->ficheinter->creer)	// En get ou en post
-	{
-		$object->fetch_lines();
-
-		// Save last template used to generate document
-		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang='';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
-		if (! empty($newlang))
-		{
-			$outputlangs = new Translate("",$conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-		$result=fichinter_create($db, $object, GETPOST('model','alpha'), $outputlangs);
-		if ($result <= 0)
-		{
-			dol_print_error($db,$result);
-			exit;
-		}
-	}
-
-	// Remove file in doc form
-	else if ($action == 'remove_file')
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$object->fetch_thirdparty();
-
-		$langs->load("other");
-		$upload_dir = $conf->ficheinter->dir_output;
-		$file = $upload_dir . '/' . GETPOST('file');
-		$ret=dol_delete_file($file,0,0,0,$object);
-		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-	}
-
 	// Set into a project
 	else if ($action == 'classin' && $user->rights->ficheinter->creer)
 	{
@@ -797,6 +754,11 @@ if (empty($reshook))
 		if ($error) $action = 'edit_extras';
 	}
 
+	// Actions to build doc
+	$upload_dir = $conf->ficheinter->dir_output;
+	$upload_dir = $conf->ficheinter->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheinter->creer)
 	{
 		if ($action == 'addcontact')

From 62a0c5be733ca5b5528406bd3449fa9f91bda058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 3 Feb 2017 20:12:26 +0100
Subject: [PATCH 0209/1163] Little correction

---
 htdocs/fichinter/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 39075022422..5e1b536cf40 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -756,7 +756,7 @@ if (empty($reshook))
 
 	// Actions to build doc
 	$upload_dir = $conf->ficheinter->dir_output;
-	$upload_dir = $conf->ficheinter->dir_output;
+	$permissioncreate = $user->rights->ficheinter->creer;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheinter->creer)

From f75bd1ac44d880f465f806084b7acfc56de4e573 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 4 Feb 2017 11:02:10 +0100
Subject: [PATCH 0210/1163] Doxygen for javascript functions file.

---
 htdocs/core/js/lib_head.js.php | 92 +++++++++++++++++++++-------------
 1 file changed, 57 insertions(+), 35 deletions(-)

diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index bfcfd74811a..3093fc6afe2 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -565,28 +565,6 @@ function urlencode(s) {
 }
 
 
-/*
- * ================================================================= 
- * Purpose: Show a popup HTML page. 
- * Input:   url,title 
- * Author:  Laurent Destailleur 
- * Licence: GPL 
- * ==================================================================
- */
-function newpopup(url,title) {
-	var argv = newpopup.arguments;
-	var argc = newpopup.arguments.length;
-	tmp=url;
-	var l = (argc > 2) ? argv[2] : 600;
-	var h = (argc > 3) ? argv[3] : 400;
-	var left = (screen.width - l)/2;
-	var top = (screen.height - h)/2;
-	var wfeatures = "directories=0,menubar=0,status=0,resizable=0,scrollbars=1,toolbar=0,width=" + l +",height=" + h + ",left=" + left + ",top=" + top;
-	fen=window.open(tmp,title,wfeatures);
-	return false;
-}
-
-
 /*
  * ================================================================= 
  * Purpose:
@@ -656,7 +634,13 @@ function hideMessage(fieldId,message) {
 
 
 /*
- * Used by button to set on/off 
+ * Used by button to set on/off
+ *
+ * @param	string	url			Url
+ * @param	string	code		Code
+ * @param	string	intput		Input
+ * @param	int		entity		Entity
+ * @param	int		strict		Strict
  */
 function setConstant(url, code, input, entity, strict) {
 	$.get( url, {
@@ -714,7 +698,13 @@ function setConstant(url, code, input, entity, strict) {
 }
 
 /*
- * Used by button to set on/off  
+ * Used by button to set on/off
+ *
+ * @param	string	url			Url
+ * @param	string	code		Code
+ * @param	string	intput		Input
+ * @param	int		entity		Entity
+ * @param	int		strict		Strict
  */
 function delConstant(url, code, input, entity, strict) {
 	$.get( url, {
@@ -768,7 +758,17 @@ function delConstant(url, code, input, entity, strict) {
 }
 
 /*
- * Used by button to set on/off  
+ * Used by button to set on/off
+ *
+ * @param	string	action		Action
+ * @param	string	url			Url
+ * @param	string	code		Code
+ * @param	string	intput		Input
+ * @param	string	box			Box
+ * @param	int		entity		Entity
+ * @param	int		yesButton	yesButton
+ * @param	int		noButton	noButton
+ * @param	int		strict		Strict
  */
 function confirmConstantAction(action, url, code, input, box, entity, yesButton, noButton, strict) {
 	var boxConfirm = box;
@@ -931,7 +931,7 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
 })( jQuery );
 
 
-/*
+/**
  * Function to output a dialog bog for copy/paste
  * 
  * @param	string	text	Text to put into copy/paste area
@@ -949,16 +949,38 @@ function copyToClipboard(text,text2)
 }
 
 
-/*
- * Function show document preview
+/**
+ * Show a popup HTML page. Use the "window.open" function.
+ * 
+ * @param	string	url		Url
+ * @param	string	title  	Title of popup
+ * @return	boolean			False
+ * @see document_preview
+ */
+function newpopup(url,title) {
+	var argv = newpopup.arguments;
+	var argc = newpopup.arguments.length;
+	tmp=url;
+	var l = (argc > 2) ? argv[2] : 600;
+	var h = (argc > 3) ? argv[3] : 400;
+	var left = (screen.width - l)/2;
+	var top = (screen.height - h)/2;
+	var wfeatures = "directories=0,menubar=0,status=0,resizable=0,scrollbars=1,toolbar=0,width=" + l +",height=" + h + ",left=" + left + ",top=" + top;
+	fen=window.open(tmp,title,wfeatures);
+	return false;
+}
+
+/**
+ * Function show document preview. Use the "dialog" function.
  *
- * @params string file File path
- * @params string type mime file
- * @params string title
+ * @param 	string file 		File path
+ * @param 	string type 		Mime file type
+ * @param 	string title		Title of popup
+ * @return	void
+ * @see newpopup
  */
 function document_preview(file, type, title)
 {
-	console.log("document_preview A click was done");
 	var ValidImageTypes = ["image/gif", "image/jpeg", "image/png"];
 	console.log("document_preview A click was done. file="+file+", type="+type);
 	
@@ -1026,6 +1048,7 @@ function getParameterByName(name, valueifnotfound)
     return results === null ? valueifnotfound : decodeURIComponent(results[1].replace(/\+/g, " "));
 }
 
+
 // Code in the public domain from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/round
 (function() {
 	/**
@@ -1082,8 +1105,8 @@ function dolroundjs(number, decimals) { return +(Math.round(number + "e+" + deci
 /**
  * Function similar to PHP price2num()
  *
- * @param {number|string} amount    The amount to convert/clean
- * @returns {string}                The amount in universal numeric format (Example: '99.99999')
+ * @param  {number|string} amount    The amount to convert/clean
+ * @return {string}                  The amount in universal numeric format (Example: '99.99999')
  * @todo Implement rounding parameter
  */
 function price2numjs(amount) {
@@ -1128,6 +1151,5 @@ function price2numjs(amount) {
 	console.log("res="+res)
 	return res;
 }
-
     
 

From 64501545533152989c9aad8ef624b5c478f7aba8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 4 Feb 2017 11:21:49 +0100
Subject: [PATCH 0211/1163] Removed useless table-tr-td

---
 htdocs/ecm/index.php            | 25 +++++++++----------------
 htdocs/ecm/index_auto.php       | 24 +++++++++---------------
 htdocs/theme/eldy/style.css.php |  4 ++++
 htdocs/theme/md/style.css.php   |  4 ++++
 4 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 18157ee60ba..1e852f55791 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -380,7 +380,7 @@ $moreheadjs=empty($conf->use_javascript_ajax)?"":"
         ,   north__paneSelector:    \"#ecm-layout-north\"
         ,   west__paneSelector:     \"#ecm-layout-west\"
         ,   resizable: true
-        ,   north__size:        36
+        ,   north__size:        37     /* 2 are removed by js */
         ,   north__resizable:   false
         ,   north__closable:    false
         ,   west__size:         340
@@ -509,24 +509,17 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
 
 
 	// Root of manual section
-	print '<tr><td>';
-	print '<table class="nobordernopadding"><tr class="nobordernopadding">';
-	print '<td align="left" width="24px">';
-	print img_picto_common('','treemenu/base.gif');
-	print '</td><td align="left">';
+	print '<tr class="ecmroot">';
+	print '<td class="ecmroot">';
+	print img_picto_common('','treemenu/base.gif','class="inline-block valignmiddle"');
 	$txt=$langs->trans("ECMRoot").' ('.$langs->trans("ECMSectionsManual").')';
 	print $form->textwithpicto($txt, $htmltooltip, 1, 'info');
 	print '</td>';
-	print '</tr></table></td>';
-	print '<td align="right">';
-	print '</td>';
-	print '<td align="right">&nbsp;</td>';
-	//print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docdir.php?action=create">'.img_edit_add().'</a></td>';
-	print '<td align="right">&nbsp;</td>';
-	print '<td align="right">&nbsp;</td>';
-	print '<td align="center">';
-	//print $form->textwithpicto('',$htmltooltip,1,"info");
-	print '</td>';
+	print '<td class="ecmroot"></td>';
+	print '<td class="ecmroot">&nbsp;</td>';
+	print '<td class="ecmroot">&nbsp;</td>';
+	print '<td class="ecmroot">&nbsp;</td>';
+	print '<td class="ecmroot"></td>';
 	print '</tr>';
 
     if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 5119c66194a..b90f306fa2f 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -373,7 +373,7 @@ $moreheadjs=empty($conf->use_javascript_ajax)?"":"
         ,   north__paneSelector:    \"#ecm-layout-north\"
         ,   west__paneSelector:     \"#ecm-layout-west\"
         ,   resizable: true
-        ,   north__size:        36
+        ,   north__size:        37      /* 2 are removed by js */
         ,   north__resizable:   false
         ,   north__closable:    false
         ,   west__size:         340
@@ -495,23 +495,17 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
 		$htmltooltip=$langs->trans("ECMAreaDesc2");
 
 		// Root title line (Automatic section)
-		print '<tr>';
-		print '<td>';
-		print '<table class="nobordernopadding"><tr class="nobordernopadding">';
-		print '<td align="left" width="24">';
-		print img_picto_common('','treemenu/base.gif');
-		print '</td><td align="left">';
+		print '<tr class="ecmroot">';
+		print '<td class="ecmroot">';
+		print img_picto_common('','treemenu/base.gif','class="inline-block valignmiddle"');
 		$txt=$langs->trans("ECMRoot").' ('.$langs->trans("ECMSectionsAuto").')';
 		print $form->textwithpicto($txt, $htmltooltip, 1, 0);
 		print '</td>';
-		print '</tr></table>';
-		print '</td>';
-		print '<td align="right">&nbsp;</td>';
-		print '<td align="right">&nbsp;</td>';
-		print '<td align="right">&nbsp;</td>';
-		print '<td align="right">&nbsp;</td>';
-		print '<td align="center">';
-		print '</td>';
+		print '<td class="ecmroot">&nbsp;</td>';
+		print '<td class="ecmroot">&nbsp;</td>';
+		print '<td class="ecmroot">&nbsp;</td>';
+		print '<td class="ecmroot">&nbsp;</td>';
+		print '<td class="ecmroot"></td>';
 		print '</tr>';
 
 		$sectionauto=dol_sort_array($sectionauto,'label','ASC',true,false);
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 354013e7ea3..1bb11a910d7 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1772,6 +1772,10 @@ td.photo {
 /* Toolbar for ECM or Filemanager                                                 */
 /* ============================================================================== */
 
+td.ecmroot {
+    padding-bottom: 0 !important;
+}
+
 .largebutton {
     background-image: -o-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
     background-image: -moz-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 473ea8e243b..9b640669cd4 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1752,6 +1752,10 @@ td.photo {
 /* Toolbar for ECM or Filemanager                                                 */
 /* ============================================================================== */
 
+td.ecmroot {
+    padding-bottom: 0 !important;
+}
+
 .largebutton {
     background-image: -o-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
     background-image: -moz-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;

From f9c510f4fb5f15e2e9b0ed723e1d23c659ffe5ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 4 Feb 2017 11:34:29 +0100
Subject: [PATCH 0212/1163] More complete translation

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 2cb646dd9fa..202618b7b43 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -418,7 +418,7 @@ WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to
 
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Third parties
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial

From a673afe601615213c161a5291364f083b2ba4ee5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 4 Feb 2017 14:16:17 +0100
Subject: [PATCH 0213/1163] NEW Description of feature of a module into a
 dedicated popup

---
 htdocs/admin/modulehelp.php           | 522 ++++++++++++++++++++++++++
 htdocs/admin/modules.php              | 350 ++++++++---------
 htdocs/core/class/html.form.class.php |   4 +-
 htdocs/core/js/lib_head.js.php        |   4 +-
 htdocs/main.inc.php                   |  20 +-
 5 files changed, 714 insertions(+), 186 deletions(-)
 create mode 100644 htdocs/admin/modulehelp.php

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
new file mode 100644
index 00000000000..eca82b5abbd
--- /dev/null
+++ b/htdocs/admin/modulehelp.php
@@ -0,0 +1,522 @@
+<?php
+/* Copyright (C) 2003-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2003       Jean-Louis Bergamo      <jlb@j1b.org>
+ * Copyright (C) 2004-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2011       Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/admin/modules.php
+ *  \brief      Page to activate/disable all modules
+ */
+
+//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
+//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
+//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+
+$langs->load("errors");
+$langs->load("admin");
+
+$mode=GETPOST('mode', 'alpha')?GETPOST('mode', 'alpha'):0;
+$action=GETPOST('action','alpha');
+$id = GETPOST('id', 'int');
+
+if (! $user->admin)
+	accessforbidden();
+
+
+
+/*
+ * Actions
+ */
+
+// Nothing
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
+llxHeader('',$langs->trans("Setup"),$help_url);
+
+print '<!-- Force style container -->'."\n".'<style>
+.id-container {
+    width: 100%;
+} 
+</style>';
+
+$arrayofnatures=array('core'=>$langs->transnoentitiesnoconv("Core"), 'external'=>$langs->transnoentitiesnoconv("External").' - '.$langs->trans("AllPublishers"));
+
+// Search modules dirs
+$modulesdir = dolGetModulesDirs();
+
+
+$filename = array();
+$modules = array();
+$orders = array();
+$categ = array();
+$dirmod = array();
+$i = 0;	// is a sequencer of modules found
+$j = 0;	// j is module number. Automatically affected if module number not defined.
+$modNameLoaded=array();
+
+foreach ($modulesdir as $dir)
+{
+	// Load modules attributes in arrays (name, numero, orders) from dir directory
+	//print $dir."\n<br>";
+	dol_syslog("Scan directory ".$dir." for module descriptor files (modXXX.class.php)");
+	$handle=@opendir($dir);
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle))!==false)
+		{
+			//print "$i ".$file."\n<br>";
+		    if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod'  && substr($file, dol_strlen($file) - 10) == '.class.php')
+		    {
+		        $modName = substr($file, 0, dol_strlen($file) - 10);
+
+		        if ($modName)
+		        {
+		        	if (! empty($modNameLoaded[$modName]))
+		        	{
+		        		$mesg="Error: Module ".$modName." was found twice: Into ".$modNameLoaded[$modName]." and ".$dir.". You probably have an old file on your disk.<br>";
+		        		setEventMessages($mesg, null, 'warnings');
+		        		dol_syslog($mesg, LOG_ERR);
+						continue;
+		        	}
+
+		            try
+		            {
+		                $res=include_once $dir.$file;
+		                if (class_exists($modName))
+						{
+							try {
+				                $objMod = new $modName($db);
+								$modNameLoaded[$modName]=$dir;
+
+    		    		        if (! $objMod->numero > 0 && $modName != 'modUser')
+    		            		{
+    		         		    	dol_syslog('The module descriptor '.$modName.' must have a numero property', LOG_ERR);
+    		            		}
+								$j = $objMod->numero;
+
+    							$modulequalified=1;
+
+		    					// We discard modules according to features level (PS: if module is activated we always show it)
+		    					$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
+		    					if ($objMod->version == 'development'  && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) $modulequalified=0;
+		    					if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) $modulequalified=0;
+								if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0))) $modulequalified=0;
+
+		    					// We discard modules according to property disabled
+		    					if (! empty($objMod->hidden)) $modulequalified=0;
+
+		    					if ($modulequalified > 0)
+		    					{
+		    					    $publisher=dol_escape_htmltag($objMod->getPublisher());
+		    					    $external=($objMod->isCoreOrExternalModule() == 'external');
+		    					    if ($external)
+		    					    {
+		    					        if ($publisher)
+		    					        {
+		    					            $arrayofnatures['external_'.$publisher]=$langs->trans("External").' - '.$publisher;
+		    					        }
+		    					        else
+		    					        {
+		    					            $arrayofnatures['external_']=$langs->trans("External").' - '.$langs->trans("UnknownPublishers");
+		    					        }
+		    					    }
+		    					    ksort($arrayofnatures);
+		    					}
+
+		    					// Define array $categ with categ with at least one qualified module
+		    					if ($modulequalified > 0)
+		    					{
+		    						$modules[$i] = $objMod;
+		    			            $filename[$i]= $modName;
+
+		    			            $special = $objMod->special;
+
+		    			            // Gives the possibility to the module, to provide his own family info and position of this family
+		    			            if (is_array($objMod->familyinfo) && !empty($objMod->familyinfo)) {
+		    			            	$familyinfo = array_merge($familyinfo, $objMod->familyinfo);
+		    			            	$familykey = key($objMod->familyinfo);
+		    			            } else {
+		    			            	$familykey = $objMod->family;
+		    			            }
+
+		    			            $moduleposition = ($objMod->module_position?$objMod->module_position:'500');
+		    			            if ($moduleposition == 500 && ($objMod->isCoreOrExternalModule() == 'external'))
+		    			            {
+		    			                $moduleposition = 800;
+		    			            }
+
+		    			            if ($special == 1) $familykey='interface';
+
+		    			            $orders[$i]  = $familyinfo[$familykey]['position']."_".$familykey."_".$moduleposition."_".$j;   // Sort by family, then by module position then number
+		    						$dirmod[$i]  = $dir;
+		    						//print $i.'-'.$dirmod[$i].'<br>';
+		    			            // Set categ[$i]
+		    						$specialstring = isset($specialtostring[$special])?$specialtostring[$special]:'unknown';
+		    			            if ($objMod->version == 'development' || $objMod->version == 'experimental') $specialstring='expdev';
+		    						if (isset($categ[$specialstring])) $categ[$specialstring]++;					// Array of all different modules categories
+		    			            else $categ[$specialstring]=1;
+		    						$j++;
+		    			            $i++;
+		    					}
+		    					else dol_syslog("Module ".get_class($objMod)." not qualified");
+							}
+		            		catch(Exception $e)
+		            		{
+		            		     dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
+		            		}
+						}
+		            	else
+						{
+							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
+						}
+					}
+		            catch(Exception $e)
+		            {
+		                 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
+		            }
+		        }
+		    }
+		}
+		closedir($handle);
+	}
+	else
+	{
+		dol_syslog("htdocs/admin/modulehelp.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
+	}
+}
+
+asort($orders);
+//var_dump($orders);
+//var_dump($categ);
+//var_dump($modules);
+
+
+
+$h = 0;
+
+$categidx='desc';    // Main
+$head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$id.'&mode=desc';
+$head[$h][1] = $langs->trans("Description");
+$head[$h][2] = 'desc';
+$h++;
+
+/*$categidx='feature';
+$head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$id.'&mode=feature';
+$head[$h][1] = $langs->trans("Features");
+$head[$h][2] = 'feature';
+$h++;*/
+
+
+$i=0;
+foreach($orders as $tmpkey => $tmpvalue)
+{
+    $objMod  = $modules[$tmpkey];
+    if ($objMod->numero == $id)
+    {
+        $key = $i;
+        break;
+    }
+    $i++;
+}
+$value = $orders[$key];
+
+
+print '<div class="centpercent">';
+
+
+print load_fiche_titre($objMod->getDesc(),$moreinfo,'object_'.$objMod->picto);
+print '<br>';
+
+dol_fiche_head($head, $mode, $title);
+
+
+
+$tab=explode('_',$value);
+$familyposition=$tab[0]; $familykey=$tab[1]; $module_position=$tab[2]; $numero=$tab[3];
+
+$modName = $filename[$key];
+$objMod  = $modules[$key];
+$dirofmodule = $dirmod[$key];
+
+$special = $objMod->special;
+
+if (! $objMod->getName())
+{
+	dol_syslog("Error for module ".$key." - Property name of module looks empty", LOG_WARNING);
+	continue;
+}
+
+$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
+
+// Check filters
+$modulename=$objMod->getName();
+$moduledesc=$objMod->getDesc();
+$moduledesclong=$objMod->getDescLong();
+$moduleauthor=$objMod->getPublisher();
+
+// We discard showing according to filters
+if ($search_keyword)
+{
+    $qualified=0;
+    if (preg_match('/'.preg_quote($search_keyword).'/i', $modulename)
+        || preg_match('/'.preg_quote($search_keyword).'/i', $moduledesc)
+        || preg_match('/'.preg_quote($search_keyword).'/i', $moduledesclong)
+        || preg_match('/'.preg_quote($search_keyword).'/i', $moduleauthor)
+        ) $qualified=1;
+    if (! $qualified) continue;
+}
+if ($search_status)
+{
+    if ($search_status == 'active' && empty($conf->global->$const_name)) continue;
+    if ($search_status == 'disabled' && ! empty($conf->global->$const_name)) continue;
+}
+if ($search_nature)
+{
+    if (preg_match('/^external/',$search_nature) && $objMod->isCoreOrExternalModule() != 'external') continue;
+    if (preg_match('/^external_(.*)$/',$search_nature, $reg))
+    {
+        //print $reg[1].'-'.dol_escape_htmltag($objMod->getPublisher());
+        $publisher=dol_escape_htmltag($objMod->getPublisher());
+        if ($reg[1] && dol_escape_htmltag($reg[1]) != $publisher) continue;
+        if (! $reg[1] && ! empty($publisher)) continue;
+    }
+    if ($search_nature == 'core' && $objMod->isCoreOrExternalModule() == 'external') continue;
+}
+if ($search_version)
+{
+    if (($objMod->version == 'development' || $objMod->version == 'experimental' || preg_match('/deprecated/', $objMod->version)) && $search_version == 'stable') continue;
+    if ($objMod->version != 'development'  && ($search_version == 'development')) continue;
+    if ($objMod->version != 'experimental' && ($search_version == 'experimental')) continue;
+    if (! preg_match('/deprecated/', $objMod->version) && ($search_version == 'deprecated')) continue;
+}
+
+// Load all lang files of module
+if (isset($objMod->langfiles) && is_array($objMod->langfiles))
+{
+	foreach($objMod->langfiles as $domain)
+	{
+		$langs->load($domain);
+	}
+}
+
+$var=!$var;
+
+
+// Version (with picto warning or not)
+$version=$objMod->getVersion(0);
+$versiontrans='';
+if (preg_match('/development/i', $version))  $versiontrans.=img_warning($langs->trans("Development"), 'style="float: left"');
+if (preg_match('/experimental/i', $version)) $versiontrans.=img_warning($langs->trans("Experimental"), 'style="float: left"');
+if (preg_match('/deprecated/i', $version))   $versiontrans.=img_warning($langs->trans("Deprecated"), 'style="float: left"');
+$versiontrans.=$objMod->getVersion(1);
+
+// Define imginfo
+$imginfo="info";
+if ($objMod->isCoreOrExternalModule() == 'external')
+{
+    $imginfo="info_black";
+}
+
+// Define text of description of module
+$text='';
+
+if ($objMod->getDescLong()) $text.=$objMod->getDesc().'<br>';
+
+$text.='<br><strong>'.$langs->trans("Version").':</strong> '.$version;
+
+$textexternal='';
+if ($objMod->isCoreOrExternalModule() == 'external')
+{
+    $textexternal.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("ExternalModule",$dirofmodule);
+    if ($objMod->editor_name != 'dolibarr') $textexternal.='<br><strong>'.$langs->trans("Publisher").':</strong> '.(empty($objMod->editor_name)?$langs->trans("Unknown"):$objMod->editor_name);
+    if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i',$objMod->editor_url)) $textexternal.='<br><strong>'.$langs->trans("Url").':</strong> '.$objMod->editor_url;
+    $text.=$textexternal;
+    $text.='<br>';
+}
+else
+{
+    $text.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("Core").'<br>';
+}
+$text.='<br><strong>'.$langs->trans("LastActivationDate").':</strong> ';
+if (! empty($conf->global->$const_name)) $text.=dol_print_date($objMod->getLastActivationDate(), 'dayhour');
+else $text.=$langs->trans("Disabled");
+$text.='<br>';
+
+$text.='<br><strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
+if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
+{
+    $i=0;
+    foreach($objMod->tabs as $val)
+    {
+        $tmp=explode(':',$val,3);
+        $text.=($i?', ':'').$tmp[0].':'.$tmp[1];
+        $i++;
+    }
+}
+else $text.=$langs->trans("No");
+
+$text.='<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
+if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
+{
+    $i=0;
+    foreach($objMod->dictionaries['tablib'] as $val)
+    {
+        $text.=($i?', ':'').$val;
+        $i++;
+    }
+}
+else $text.=$langs->trans("No");
+
+$text.='<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
+if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
+{
+    $i=0;
+    foreach($objMod->boxes as $val)
+    {
+        $text.=($i?', ':'').($val['file']?$val['file']:$val[0]);
+        $i++;
+    }
+}
+else $text.=$langs->trans("No");
+
+$text.='<br><strong>'.$langs->trans("AddModels").':</strong> ';
+if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
+{
+    $text.=$langs->trans("Yes");
+}
+else $text.=$langs->trans("No");
+
+$text.='<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
+if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
+{
+    $text.=$langs->trans("Yes");
+}
+else $text.=$langs->trans("No");
+
+$text.='<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
+if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
+{
+    $i=0;
+    foreach($objMod->cronjobs as $val)
+    {
+        $text.=($i?', ':'').($val['label']);
+        $i++;
+    }
+}
+else $text.=$langs->trans("No");
+
+$text.='<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
+if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
+{
+    $text.=$langs->trans("Yes");
+}
+else $text.=$langs->trans("No");
+
+$text.='<br><strong>'.$langs->trans("AddHooks").':</strong> ';
+if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
+{
+    $i=0;
+    foreach($objMod->module_parts['hooks'] as $val)
+    {
+        $text.=($i?', ':'').($val);
+        $i++;
+    }
+}
+else $text.=$langs->trans("No");
+
+$text.='<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
+if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
+{
+    $i=0;
+    foreach($objMod->rights as $val)
+    {
+        $text.=($i?', ':'').($val[1]);
+        $i++;
+    }
+}
+else $text.=$langs->trans("No");
+
+$text.='<br><strong>'.$langs->trans("AddMenus").':</strong> ';
+if (isset($objMod->menu) && ! empty($objMod->menu)) // objMod can be an array or just an int 1
+{
+    $text.=$langs->trans("Yes");
+}
+else $text.=$langs->trans("No");
+
+$text.='<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
+if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
+{
+    $i=0;
+    foreach($objMod->export_label as $val)
+    {
+        $text.=($i?', ':'').($val);
+        $i++;
+    }
+}
+else $text.=$langs->trans("No");
+
+$text.='<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
+if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
+{
+    $i=0;
+    foreach($objMod->import_label as $val)
+    {
+        $text.=($i?', ':'').($val);
+        $i++;
+    }
+}
+else $text.=$langs->trans("No");
+
+$text.='<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
+$text.=$langs->trans("DetectionNotPossible");
+
+print $text;
+        
+
+
+dol_fiche_end();
+
+print '</div>';
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index ad33b4ce619..b61e5a4a86e 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2003       Jean-Louis Bergamo      <jlb@j1b.org>
- * Copyright (C) 2004-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
  * Copyright (C) 2011       Juanjo Menent           <jmenent@2byte.es>
@@ -313,7 +313,7 @@ if ($mode != 'marketplace')
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
     dol_fiche_head($head, $mode, '');
-    
+
     $moreforfilter = '';
     $moreforfilter.='<div class="divsearchfield">';
     $moreforfilter.= $langs->trans('Keyword') . ': <input type="text" name="search_keyword" value="'.dol_escape_htmltag($search_keyword).'">';
@@ -354,7 +354,6 @@ if ($mode != 'marketplace')
     //dol_fiche_end();
     
     print '<div class="clearboth"></div><br>';
-    //print '<br><br><br><br>';
 
     $moreforfilter='';
     
@@ -440,8 +439,6 @@ if ($mode != 'marketplace')
         }
 
         // Print a separator if we change family
-        //print "<tr><td>xx".$oldfamily."-".$familykey."-".$atleastoneforfamily."<br></td><tr>";
-        //if ($oldfamily && $familykey!=$oldfamily && $atleastoneforfamily) {
         if ($familykey!=$oldfamily)
         {
             print '<tr class="liste_titre">'."\n";
@@ -452,7 +449,6 @@ if ($mode != 'marketplace')
     		print '<td colspan="2" align="right">'.$langs->trans("SetupShort").'</td>'."\n";
             print "</tr>\n";
             $atleastoneforfamily=0;
-            //print "<tr><td>yy".$oldfamily."-".$familykey."-".$atleastoneforfamily."<br></td><tr>";
         }
 
         $atleastoneforfamily++;
@@ -465,6 +461,178 @@ if ($mode != 'marketplace')
 
         $var=!$var;
 
+        
+        // Version (with picto warning or not)
+        $version=$objMod->getVersion(0);
+        $versiontrans='';
+        if (preg_match('/development/i', $version))  $versiontrans.=img_warning($langs->trans("Development"), 'style="float: left"');
+        if (preg_match('/experimental/i', $version)) $versiontrans.=img_warning($langs->trans("Experimental"), 'style="float: left"');
+        if (preg_match('/deprecated/i', $version))   $versiontrans.=img_warning($langs->trans("Deprecated"), 'style="float: left"');
+        $versiontrans.=$objMod->getVersion(1);
+        
+        // Define imginfo
+        $imginfo="info";
+        if ($objMod->isCoreOrExternalModule() == 'external')
+        {
+            $imginfo="info_black";
+        }
+        
+        // Define text of description of module
+        /*
+        $text='';
+        
+        if ($objMod->getDescLong()) $text.='<div class="titre">'.$objMod->getDesc().'</div><br>'.$objMod->getDescLong().'<br>';
+        else $text.='<div class="titre">'.$objMod->getDesc().'</div><br>';
+        
+        $text.='<br><strong>'.$langs->trans("Version").':</strong> '.$version;
+        
+        $textexternal='';
+        if ($objMod->isCoreOrExternalModule() == 'external')
+        {
+            $textexternal.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("ExternalModule",$dirofmodule);
+            if ($objMod->editor_name != 'dolibarr') $textexternal.='<br><strong>'.$langs->trans("Publisher").':</strong> '.(empty($objMod->editor_name)?$langs->trans("Unknown"):$objMod->editor_name);
+            if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i',$objMod->editor_url)) $textexternal.='<br><strong>'.$langs->trans("Url").':</strong> '.$objMod->editor_url;
+            $text.=$textexternal;
+            $text.='<br>';
+        }
+        else
+        {
+            $text.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("Core").'<br>';
+        }
+        $text.='<br><strong>'.$langs->trans("LastActivationDate").':</strong> ';
+        if (! empty($conf->global->$const_name)) $text.=dol_print_date($objMod->getLastActivationDate(), 'dayhour');
+        else $text.=$langs->trans("Disabled");
+        $text.='<br>';
+        
+        $text.='<br><strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
+        if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
+        {
+            $i=0;
+            foreach($objMod->tabs as $val)
+            {
+                $tmp=explode(':',$val,3);
+                $text.=($i?', ':'').$tmp[0].':'.$tmp[1];
+                $i++;
+            }
+        }
+        else $text.=$langs->trans("No");
+        
+        $text.='<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
+        if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
+        {
+            $i=0;
+            foreach($objMod->dictionaries['tablib'] as $val)
+            {
+                $text.=($i?', ':'').$val;
+                $i++;
+            }
+        }
+        else $text.=$langs->trans("No");
+        
+        $text.='<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
+        if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
+        {
+            $i=0;
+            foreach($objMod->boxes as $val)
+            {
+                $text.=($i?', ':'').($val['file']?$val['file']:$val[0]);
+                $i++;
+            }
+        }
+        else $text.=$langs->trans("No");
+        
+        $text.='<br><strong>'.$langs->trans("AddModels").':</strong> ';
+        if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
+        {
+            $text.=$langs->trans("Yes");
+        }
+        else $text.=$langs->trans("No");
+        
+        $text.='<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
+        if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
+        {
+            $text.=$langs->trans("Yes");
+        }
+        else $text.=$langs->trans("No");
+        
+        $text.='<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
+        if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
+        {
+            $i=0;
+            foreach($objMod->cronjobs as $val)
+            {
+                $text.=($i?', ':'').($val['label']);
+                $i++;
+            }
+        }
+        else $text.=$langs->trans("No");
+        
+        $text.='<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
+        if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
+        {
+            $text.=$langs->trans("Yes");
+        }
+        else $text.=$langs->trans("No");
+        
+        $text.='<br><strong>'.$langs->trans("AddHooks").':</strong> ';
+        if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
+        {
+            $i=0;
+            foreach($objMod->module_parts['hooks'] as $val)
+            {
+                $text.=($i?', ':'').($val);
+                $i++;
+            }
+        }
+        else $text.=$langs->trans("No");
+        
+        $text.='<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
+        if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
+        {
+            $i=0;
+            foreach($objMod->rights as $val)
+            {
+                $text.=($i?', ':'').($val[1]);
+                $i++;
+            }
+        }
+        else $text.=$langs->trans("No");
+        
+        $text.='<br><strong>'.$langs->trans("AddMenus").':</strong> ';
+        if (isset($objMod->menu) && ! empty($objMod->menu)) // objMod can be an array or just an int 1
+        {
+            $text.=$langs->trans("Yes");
+        }
+        else $text.=$langs->trans("No");
+        
+        $text.='<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
+        if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
+        {
+            $i=0;
+            foreach($objMod->export_label as $val)
+            {
+                $text.=($i?', ':'').($val);
+                $i++;
+            }
+        }
+        else $text.=$langs->trans("No");
+        
+        $text.='<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
+        if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
+        {
+            $i=0;
+            foreach($objMod->import_label as $val)
+            {
+                $text.=($i?', ':'').($val);
+                $i++;
+            }
+        }
+        else $text.=$langs->trans("No");
+        
+        $text.='<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
+        $text.=$langs->trans("DetectionNotPossible");
+        */
+        
         //print "\n<!-- Module ".$objMod->numero." ".$objMod->getName()." found into ".$dirmod[$key]." -->\n";
         print '<tr '.$bc[$var].">\n";
 
@@ -495,177 +663,15 @@ if ($mode != 'marketplace')
 
         // Help
         print '<td align="center" valign="top" class="nowrap" style="width: 82px;">';
-        $text='';
-
-        if ($objMod->getDescLong()) $text.='<div class="titre">'.$objMod->getDesc().'</div><br>'.$objMod->getDescLong().'<br>';
-        else $text.='<div class="titre">'.$objMod->getDesc().'</div><br>';
-
-        $textexternal='';
-        $imginfo="info";
-        if ($objMod->isCoreOrExternalModule() == 'external')
-        {
- 	    $imginfo="info_black";
-            $textexternal.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("ExternalModule",$dirofmodule);
-            if ($objMod->editor_name != 'dolibarr') $textexternal.='<br><strong>'.$langs->trans("Publisher").':</strong> '.(empty($objMod->editor_name)?$langs->trans("Unknown"):$objMod->editor_name);
-            if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i',$objMod->editor_url)) $textexternal.='<br><strong>'.$langs->trans("Url").':</strong> '.$objMod->editor_url;
-            $text.=$textexternal;
-            $text.='<br>';
-        }
-        else
-        {
-            $text.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("Core").'<br>';
-        }
-        $text.='<br><strong>'.$langs->trans("LastActivationDate").':</strong> ';
-        if (! empty($conf->global->$const_name)) $text.=dol_print_date($objMod->getLastActivationDate(), 'dayhour');
-        else $text.=$langs->trans("Disabled");
-        $text.='<br>';
-
-        $text.='<br><strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
-        if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
-        {
-            $i=0;
-            foreach($objMod->tabs as $val)
-            {
-                $tmp=explode(':',$val,3);
-                $text.=($i?', ':'').$tmp[0].':'.$tmp[1];
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-
-        $text.='<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
-        if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
-        {
-            $i=0;
-            foreach($objMod->dictionaries['tablib'] as $val)
-            {
-                $text.=($i?', ':'').$val;
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-
-        $text.='<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
-        if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
-        {
-            $i=0;
-            foreach($objMod->boxes as $val)
-            {
-                $text.=($i?', ':'').($val['file']?$val['file']:$val[0]);
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-
-        $text.='<br><strong>'.$langs->trans("AddModels").':</strong> ';
-        if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
-        {
-            $text.=$langs->trans("Yes");
-        }
-        else $text.=$langs->trans("No");
-
-        $text.='<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
-        if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
-        {
-            $text.=$langs->trans("Yes");
-        }
-        else $text.=$langs->trans("No");
-
-        $text.='<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
-        if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
-        {
-            $i=0;
-            foreach($objMod->cronjobs as $val)
-            {
-                $text.=($i?', ':'').($val['label']);
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-
-        $text.='<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
-        if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
-        {
-            $text.=$langs->trans("Yes");
-        }
-        else $text.=$langs->trans("No");
-
-        $text.='<br><strong>'.$langs->trans("AddHooks").':</strong> ';
-        if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
-        {
-            $i=0;
-            foreach($objMod->module_parts['hooks'] as $val)
-            {
-                $text.=($i?', ':'').($val);
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-
-        $text.='<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
-        if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
-        {
-            $i=0;
-            foreach($objMod->rights as $val)
-            {
-                $text.=($i?', ':'').($val[1]);
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-
-        $text.='<br><strong>'.$langs->trans("AddMenus").':</strong> ';
-        if (isset($objMod->menu) && ! empty($objMod->menu)) // objMod can be an array or just an int 1
-        {
-            $text.=$langs->trans("Yes");
-        }
-        else $text.=$langs->trans("No");
-
-        $text.='<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
-        if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
-        {
-            $i=0;
-            foreach($objMod->export_label as $val)
-            {
-                $text.=($i?', ':'').($val);
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-
-        $text.='<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
-        if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
-        {
-            $i=0;
-            foreach($objMod->import_label as $val)
-            {
-                $text.=($i?', ':'').($val);
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-
-        $text.='<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
-        $text.=$langs->trans("DetectionNotPossible");
-
-
-        print $form->textwithpicto('', $text, 1, $imginfo, 'minheight20');
-
+        
+        //print $form->textwithpicto('', $text, 1, $imginfo, 'minheight20', 0, 2, 1);
+        print '<a href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$objMod->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'</a>';
+        
         print '</td>';
 
         // Version
         print '<td align="center" valign="top" class="nowrap">';
-
-        // Picto warning
-        $version=$objMod->getVersion(0);
-        $versiontrans=$objMod->getVersion(1);
-        if (preg_match('/development/i', $version))  print img_warning($langs->trans("Development"), 'style="float: left"');
-        if (preg_match('/experimental/i', $version)) print img_warning($langs->trans("Experimental"), 'style="float: left"');
-        if (preg_match('/deprecated/i', $version))   print img_warning($langs->trans("Deprecated"), 'style="float: left"');
-
-
         print $versiontrans;
-
         print "</td>\n";
 
         // Activate/Disable and Setup (2 columns)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6cf24b2e38f..5041a303461 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -464,8 +464,8 @@ class Form
      *	@param	string	$text				Text to show
      *	@param  string	$htmltext	     	Content of tooltip
      *	@param	int		$direction			1=Icon is after text, -1=Icon is before text, 0=no icon
-     * 	@param	string	$type				Type of picto (info, help, warning, superadmin...) OR image filepath (mypicto@mymodule)
-     *  @param  string	$extracss           Add a CSS style to td tags
+     * 	@param	string	$type				Type of picto ('info', 'help', 'warning', 'superadmin', 'mypicto@mymodule', ...) or image filepath
+     *  @param  string	$extracss           Add a CSS style to td, div or span tag
      *  @param  int		$noencodehtmltext   Do not encode into html entity the htmltext
      *  @param	int		$notabs				0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
      * 	@return	string						HTML code of text, picto, tooltip
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 3093fc6afe2..8909f446812 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -973,8 +973,8 @@ function newpopup(url,title) {
 /**
  * Function show document preview. Use the "dialog" function.
  *
- * @param 	string file 		File path
- * @param 	string type 		Mime file type
+ * @param 	string file 		Url
+ * @param 	string type 		Mime file type ("image/jpeg", "application/pdf", "text/html")
  * @param 	string title		Title of popup
  * @return	void
  * @see newpopup
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 960ea1ab232..b5e1122acfb 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1402,15 +1402,15 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
     /*
      * Top menu
      */
-    print "\n".'<!-- Start top horizontal -->'."\n";
-
-    if (empty($conf->dol_hide_topmenu))
+    if (empty($conf->dol_hide_topmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
     {
-    	print '<div class="side-nav-vert"><div id="id-top">';
+        print "\n".'<!-- Start top horizontal -->'."\n";
+        
+        print '<div class="side-nav-vert"><div id="id-top">';
 
 	    // Show menu entries
     	print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT)?'':'invert').'" class="tmenu">'."\n";
-	    $menumanager->atarget=$target;
+    	$menumanager->atarget=$target;
 	    $menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks));      // This contains a \n
 	    print "</div>\n";
 
@@ -1539,12 +1539,12 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 		print '</div></div>';
 
 	    //unset($form);
+	
+		print '<div style="clear: both;"></div>';
+        print "<!-- End top horizontal menu -->\n\n";
     }
 
-	print '<div style="clear: both;"></div>';
-    print "<!-- End top horizontal menu -->\n\n";
-
-    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<div id="id-container">';
+    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
 }
 
 
@@ -1572,7 +1572,7 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
 
     if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
 
-    if (empty($conf->dol_hide_leftmenu))
+    if (empty($conf->dol_hide_leftmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
     {
 	    // Instantiate hooks of thirdparty module
 	    $hookmanager->initHooks(array('searchform','leftblock'));

From 9220a638b509ca0bdd5398ab80eab3222d50fec4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Feb 2017 13:37:23 +0100
Subject: [PATCH 0214/1163] NEW Filechecker can include custom dir and report
 added files.

---
 build/generate_filelist_xml.php   |  43 +++++--
 htdocs/admin/system/filecheck.php | 184 +++++++++++++++++++++---------
 htdocs/core/lib/files.lib.php     |   8 +-
 htdocs/langs/en_US/admin.lang     |   5 +-
 4 files changed, 173 insertions(+), 67 deletions(-)

diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index 07e87dd86bb..01809439bf1 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -42,35 +42,55 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 if (empty($argv[1])) 
 {
-    print "Usage: ".$script_file." release=x.y.z\n";
+    print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
     exit -1;
 }
 parse_str($argv[1]);
+if (! empty($argv[2])) parse_str($argv[2]);
 
-if ($release != DOL_VERSION)
+if (empty($includecustom)) 
 {
-    print 'Error: release is not version declared into filefunc.in.php.'."\n";
-    exit -1;
+    $includecustom=0;
+    
+    if (DOL_VERSION != $release)
+    {
+        print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parmater.'."\n";
+        print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
+        exit -1;
+    }
 }
+else
+{
+    if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
+    {
+        print 'Error: When parameter "includecustom" is not set, version declared into ('.DOL_VERSION.') must be used with a suffix into "release" parmater (ex: '.DOL_VERSION.'-mydistrib).'."\n";
+        print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
+        exit -1;
+    }
+}
+
+print "Version: ".$release."\n";
+print "Include custom: ".$includecustom."\n";
 
 //$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
 $outputdir=dirname(__FILE__).'/../htdocs/install';
-print 'Delete current files '.$outputdir.'/filelist*.xml'."\n";
-dol_delete_file($outputdir.'/filelist*.xml',0,1,1);
+print 'Delete current files '.$outputdir.'/filelist-'.$release.'.xml'."\n";
+dol_delete_file($outputdir.'/filelist-'.$release.'.xml',0,1,1);
 
 $outputfile=$outputdir.'/filelist-'.$release.'.xml';
 $fp = fopen($outputfile,'w');
 fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
 fputs($fp, '<checksum_list version="'.$release.'">'."\n");
 
-fputs($fp, '<dolibarr_htdocs_dir>'."\n");
+fputs($fp, '<dolibarr_htdocs_dir includecustom="'.$includecustom.'">'."\n");
 
 $checksumconcat=array();
 
+// TODO Replace RecursiveDirectoryIterator with dol_dir_list
 $dir_iterator1 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../htdocs/');
 $iterator1 = new RecursiveIteratorIterator($dir_iterator1);
-// need to ignore document custom etc
-$files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install|nltechno))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
+// Need to ignore document custom etc. Note: this also ignore natively symbolic links.
+$files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom?'':'custom\/|').'documents\/|conf\/|install\/))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
 $dir='';
 $needtoclose=0;
 foreach ($files as $file) {
@@ -102,10 +122,11 @@ $checksumconcat=array();
 
 fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n");
 
+// TODO Replace RecursiveDirectoryIterator with dol_dir_list
 $dir_iterator2 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../scripts/');
 $iterator2 = new RecursiveIteratorIterator($dir_iterator2);
-// need to ignore document custom etc
-$files = new RegexIterator($iterator2, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install|nltechno))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
+// Need to ignore document custom etc. Note: this also ignore natively symbolic links.
+$files = new RegexIterator($iterator2, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
 $dir='';
 $needtoclose=0;
 foreach ($files as $file) {
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index c0ff5d75819..7536c6df793 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -90,19 +90,22 @@ print $langs->trans("MakeIntegrityAnalysisFrom").':<br>';
 print '<!-- for a local check target=local&xmlshortfile=... -->'."\n";
 if (dol_is_file($xmlfile))
 {
-    print '<input type="radio" name="target" value="local"'.((! GETPOST('target') || GETPOST('target') == 'local') ? 'checked="checked"':'').'"> '.$langs->trans("LocalSignature").' = '.$xmlshortfile.'<br>';
+    print '<input type="radio" name="target" value="local"'.((! GETPOST('target') || GETPOST('target') == 'local') ? 'checked="checked"':'').'"> '.$langs->trans("LocalSignature").' = ';
+    print '<input name="xmlshortfile" class="flat minwidth200" value="'.dol_escape_htmltag($xmlshortfile).'">';
+    print '<br>';
 }
 else
 {
-    print '<input type="radio" name="target" value="local"> '.$langs->trans("LocalSignature").' = '.$xmlshortfile;
-    if (! GETPOST('xmlshortfile')) print ' <span class="warning">('.$langs->trans("AvailableOnlyOnPackagedVersions").')</span>';
+    print '<input type="radio" name="target" value="local"> '.$langs->trans("LocalSignature").' = ';
+    print '<input name="xmlshortfile" class="flat minwidth200" value="'.dol_escape_htmltag($xmlshortfile).'">';
+    print ' <span class="warning">('.$langs->trans("AvailableOnlyOnPackagedVersions").')</span>';
     print '<br>';
 }
 print '<!-- for a remote target=remote&xmlremote=... -->'."\n";
 if ($enableremotecheck)
 {
     print '<input type="radio" name="target" value="remote"'.(GETPOST('target') == 'remote' ? 'checked="checked"':'').'> '.$langs->trans("RemoteSignature").' = ';
-    print '<input name="xmlremote" class="flat quatrevingtpercent" value="'.$xmlremote.'"><br>';
+    print '<input name="xmlremote" class="flat quatrevingtpercent" value="'.dol_escape_htmltag($xmlremote).'"><br>';
 }
 else
 {
@@ -150,21 +153,41 @@ if (GETPOST('target') == 'remote')
 if ($xml)
 {
     $checksumconcat = array();
-
+    $file_list = array();
+    $out = '';
+    
     // Scan htdocs
     if (is_object($xml->dolibarr_htdocs_dir[0]))
     {
-        $file_list = array();
-        $ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat);		// Fill array $file_list
-    
-        print_fiche_titre($langs->trans("FilesMissing"));
+        //var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
+        $includecustom=(empty($xml->dolibarr_htdocs_dir[0]['includecustom'])?0:$xml->dolibarr_htdocs_dir[0]['includecustom']);
+
+        // Defined qualified files (must be same than into generate_filelist_xml.php)
+        $regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
+        $regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install)$';  // Exclude dirs
+        $scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
+
+        // Fill file_list with files in signature, new files, modified files
+        $ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat, $scanfiles);		// Fill array $file_list
+        // Complete with list of new files
+        foreach ($scanfiles as $keyfile => $valfile)
+        {
+            $tmprelativefilename=preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT,'/').'/','', $valfile['fullname']);
+            if (! in_array($tmprelativefilename, $file_list['insignature']))
+            {
+                $md5newfile=@md5_file($valfile['fullname']);    // Can fails if we don't have permission to open/read file
+                $file_list['added'][]=array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
+            }
+        }
         
-        print '<table class="noborder">';
-        print '<tr class="liste_titre">';
-        print '<td>#</td>';
-        print '<td>' . $langs->trans("Filename") . '</td>';
-        print '<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
-        print '</tr>'."\n";
+        $out.=load_fiche_titre($langs->trans("FilesMissing"));
+        
+        $out.='<table class="noborder">';
+        $out.='<tr class="liste_titre">';
+        $out.='<td>#</td>';
+        $out.='<td>' . $langs->trans("Filename") . '</td>';
+        $out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
+        $out.='</tr>'."\n";
         $var = true;
         $tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
         if (is_array($tmpfilelist) && count($tmpfilelist))
@@ -174,32 +197,32 @@ if ($xml)
 	        {
 	            $i++;
 	            $var = !$var;
-	            print '<tr ' . $bc[$var] . '>';
-	            print '<td>'.$i.'</td>' . "\n";
-	            print '<td>'.$file['filename'].'</td>' . "\n";
-	            print '<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
-	            print "</tr>\n";
+	            $out.='<tr ' . $bc[$var] . '>';
+	            $out.='<td>'.$i.'</td>' . "\n";
+	            $out.='<td>'.$file['filename'].'</td>' . "\n";
+	            $out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
+	            $out.="</tr>\n";
 	        }
         }
         else 
         {
-            print '<tr ' . $bc[false] . '><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+            $out.='<tr ' . $bc[false] . '><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }            
-        print '</table>';
+        $out.='</table>';
 
-        print '<br>';
+        $out.='<br>';
 
-        print_fiche_titre($langs->trans("FilesUpdated"));
+        $out.=load_fiche_titre($langs->trans("FilesModified"));
         
-        print '<table class="noborder">';
-        print '<tr class="liste_titre">';
-        print '<td>#</td>';
-        print '<td>' . $langs->trans("Filename") . '</td>';
-        print '<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
-        print '<td align="center">' . $langs->trans("CurrentChecksum") . '</td>';
-        print '<td align="right">' . $langs->trans("Size") . '</td>';
-        print '<td align="right">' . $langs->trans("DateModification") . '</td>';
-        print '</tr>'."\n";
+        $out.='<table class="noborder">';
+        $out.='<tr class="liste_titre">';
+        $out.='<td>#</td>';
+        $out.='<td>' . $langs->trans("Filename") . '</td>';
+        $out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
+        $out.='<td align="center">' . $langs->trans("CurrentChecksum") . '</td>';
+        $out.='<td align="right">' . $langs->trans("Size") . '</td>';
+        $out.='<td align="right">' . $langs->trans("DateModification") . '</td>';
+        $out.='</tr>'."\n";
         $var = true;
         $tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
         if (is_array($tmpfilelist2) && count($tmpfilelist2))
@@ -209,30 +232,70 @@ if ($xml)
 	        {
 	            $i++;
 	            $var = !$var;
-	            print '<tr ' . $bc[$var] . '>';
-	            print '<td>'.$i.'</td>' . "\n";
-	            print '<td>'.$file['filename'].'</td>' . "\n";
-	            print '<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
-	            print '<td align="center">'.$file['md5'].'</td>' . "\n";
-	            print '<td align="right">'.dol_print_size(dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename'])).'</td>' . "\n";
-	            print '<td align="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').'</td>' . "\n";
-	            print "</tr>\n";
+	            $out.='<tr ' . $bc[$var] . '>';
+	            $out.='<td>'.$i.'</td>' . "\n";
+	            $out.='<td>'.$file['filename'].'</td>' . "\n";
+	            $out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
+	            $out.='<td align="center">'.$file['md5'].'</td>' . "\n";
+	            $out.='<td align="right">'.dol_print_size(dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename'])).'</td>' . "\n";
+	            $out.='<td align="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').'</td>' . "\n";
+	            $out.="</tr>\n";
 	        }
         }
         else 
         {
-            print '<tr ' . $bc[false] . '><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+            $out.='<tr ' . $bc[false] . '><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
-        print '</table>';
+        $out.='</table>';
         
-        if (empty($tmpfilelist) && empty($tmpfilelist2))
+        $out.='<br>';
+        
+        $out.=load_fiche_titre($langs->trans("FilesAdded"));
+        
+        $out.='<table class="noborder">';
+        $out.='<tr class="liste_titre">';
+        $out.='<td>#</td>';
+        $out.='<td>' . $langs->trans("Filename") . '</td>';
+        $out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
+        $out.='<td align="center">' . $langs->trans("CurrentChecksum") . '</td>';
+        $out.='<td align="right">' . $langs->trans("Size") . '</td>';
+        $out.='<td align="right">' . $langs->trans("DateModification") . '</td>';
+        $out.='</tr>'."\n";
+        $var = true;
+        $tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
+        if (is_array($tmpfilelist3) && count($tmpfilelist3))
+        {
+            $i = 0;
+            foreach ($tmpfilelist3 as $file)
+            {
+                $i++;
+                $var = !$var;
+                $out.='<tr ' . $bc[$var] . '>';
+                $out.='<td>'.$i.'</td>' . "\n";
+                $out.='<td>'.$file['filename'].'</td>' . "\n";
+                $out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
+                $out.='<td align="center">'.$file['md5'].'</td>' . "\n";
+                $out.='<td align="right">'.dol_print_size(dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename'])).'</td>' . "\n";
+                $out.='<td align="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').'</td>' . "\n";
+                $out.="</tr>\n";
+            }
+        }
+        else
+        {
+            $out.='<tr ' . $bc[false] . '><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+        }
+        $out.='</table>';
+        
+     
+        // Show warning
+        if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
         {
             setEventMessage($langs->trans("FileIntegrityIsStrictlyConformedWithReference"));
         }
         else
         {
             setEventMessage($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), 'warnings');
-        }
+        }        
     }
     else
     {
@@ -253,13 +316,30 @@ if ($xml)
     asort($checksumconcat); // Sort list of checksum        
     //var_dump($checksumconcat);
     $checksumget = md5(join(',',$checksumconcat));
-    $checksumtoget = $xml->dolibarr_htdocs_dir_checksum;
-
-    print '<br>';
+    $checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
 
+    /*var_dump(count($file_list['added']));
+    var_dump($checksumget);
+    var_dump($checksumtoget);
+    var_dump($checksumget == $checksumtoget);*/
     print_fiche_titre($langs->trans("GlobalChecksum")).'<br>';
     print $langs->trans("ExpectedChecksum").' = '. ($checksumtoget ? $checksumtoget : $langs->trans("Unknown")) .'<br>';
-    print $langs->trans("CurrentChecksum").' = '.$checksumget;
+    print $langs->trans("CurrentChecksum").' = ';
+    if ($checksumget == $checksumtoget)
+    {
+        if (count($file_list['added'])) print $checksumget.' - <span class="warning">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
+        else print '<span class="ok">'.$checksumget.'</span>';
+    }
+    else
+    {
+        print '<span class="error">'.$checksumget.'</span>';
+    }
+    
+    print '<br>';
+    print '<br>';
+    
+    // Output detail
+    print $out;
 }
 
 
@@ -287,10 +367,11 @@ function getFilesUpdated(&$file_list, SimpleXMLElement $dir, $path = '', $pathre
 {
     $exclude = 'install';
 
-    foreach ($dir->md5file as $file)
+    foreach ($dir->md5file as $file)    // $file is a simpleXMLElement
     {
         $filename = $path.$file['name'];
-
+        $file_list['insignature'][] = $filename;
+        
         //if (preg_match('#'.$exclude.'#', $filename)) continue;
 
         if (!file_exists($pathref.'/'.$filename))
@@ -309,3 +390,4 @@ function getFilesUpdated(&$file_list, SimpleXMLElement $dir, $path = '', $pathre
 
     return $file_list;
 }
+
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index c1aadd3df6d..1f7974775b5 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -44,8 +44,8 @@ function dol_basename($pathfile)
  *  @param	string		$path        	Starting path from which to search. This is a full path.
  *  @param	string		$types        	Can be "directories", "files", or "all"
  *  @param	int			$recursive		Determines whether subdirectories are searched
- *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function
- *  @param	array		$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.'))
+ *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function. Filter is checked into basename only.
+ *  @param	array		$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.')). Exclude is checked into fullpath.
  *  @param	string		$sortcriteria	Sort criteria ("","fullname","name","date","size")
  *  @param	string		$sortorder		Sort order (SORT_ASC, SORT_DESC)
  *	@param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only
@@ -104,7 +104,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 			$filesize='';
 			$file_list = array();
 
-			while (false !== ($file = readdir($dir)))
+			while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
 			{
 				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in utf8 in memory
 
@@ -137,7 +137,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 							if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
 							if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
 
-							if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
+							if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into all $path, only into $file part
 							{
 								preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
 								$level1name=(isset($reg[1])?$reg[1]:'');
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 202618b7b43..defcafa7b65 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -11,13 +11,16 @@ VersionRecommanded=Recommended
 FileCheck=Files integrity checker
 FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
 AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package 
 XmlNotFound=Xml Integrity File of application not found

From 8f52a34e71cc836120a8f137404fd19313e9023d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Feb 2017 20:37:42 +0100
Subject: [PATCH 0215/1163] Report of supplier payment is name
 "supplier_payments"

---
 htdocs/compta/paiement/rapport.php                       | 2 +-
 htdocs/core/modules/rapport/pdf_paiement_fourn.class.php | 2 +-
 htdocs/fourn/facture/rapport.php                         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index b8bcf030729..27f34bef269 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -128,7 +128,7 @@ if (is_dir($dir))
 asort($linkforyear);
 foreach($linkforyear as $cursoryear)
 {
-    print '<a href="rapport.php?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
+    print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
 }
 
 if ($year)
diff --git a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
index 68b444b8e51..1d9f2333300 100644
--- a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
@@ -118,7 +118,7 @@ class pdf_paiement_fourn
 
 		$month = sprintf("%02d",$month);
 		$year = sprintf("%04d",$year);
-		$file = $dir . "/payments-".$year."-".$month.".pdf";
+		$file = $dir . "/supplier_payments-".$year."-".$month.".pdf";
 
 		// Add pdfgeneration hook
 		if (! is_object($hookmanager))
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index e685421af19..b0b0436af1b 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -128,7 +128,7 @@ if (is_dir($dir))
 asort($linkforyear);
 foreach($linkforyear as $cursoryear)
 {
-    print '<a href="rapport.php?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
+    print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
 }
 
 if ($year)
@@ -150,7 +150,7 @@ if ($year)
         {
             while (($file = readdir($handle))!==false)
             {
-                if (preg_match('/^payment/i',$file))
+                if (preg_match('/^supplier_payment/i',$file))
                 {
                     $var=!$var;
                     $tfile = $dir . '/'.$year.'/'.$file;

From aa1c14e5088f9a8e90620aed6cb01f4d5eddc7cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Feb 2017 20:43:44 +0100
Subject: [PATCH 0216/1163] Remove change of PMP when we should not

---
 htdocs/product/class/product.class.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 71213bd923e..1b5efff1bfa 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3530,9 +3530,6 @@ class Product extends CommonObject
 
 			require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
 			
-			// If remove stock then save it the actual PMP as price (the new calculation of PMP is triggered only with $movement = 0 || 3 )
-			if ($movement == 1) $price = $this->pmp;
-
 			$op[0] = "+".trim($nbpiece);
 			$op[1] = "-".trim($nbpiece);
 
@@ -3581,9 +3578,6 @@ class Product extends CommonObject
 
 			require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
 
-			// If remove stock then save it the actual PMP as price (the new calculation of PMP is triggered only with $movement = 0 || 3 )
-			if ($movement == 1) $price = $this->pmp;
-			
 			$op[0] = "+".trim($nbpiece);
 			$op[1] = "-".trim($nbpiece);
 

From e58743ea5bdfb8c78535d5c96b134e165d87073f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 7 Feb 2017 01:13:04 +0100
Subject: [PATCH 0217/1163] Fix regression: Textarea to enter data was crushed.

---
 htdocs/admin/commande.php          | 4 ++--
 htdocs/admin/contract.php          | 4 ++--
 htdocs/admin/facture.php           | 4 ++--
 htdocs/admin/fichinter.php         | 4 ++--
 htdocs/admin/propal.php            | 4 ++--
 htdocs/admin/supplier_invoice.php  | 2 +-
 htdocs/admin/supplier_order.php    | 4 ++--
 htdocs/admin/supplier_proposal.php | 4 ++--
 htdocs/don/admin/donation.php      | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 23773e722c4..a9041f5272b 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -569,8 +569,8 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_ORDER_FREE_TEXT">';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
+print '<tr '.$bc[$var].'><td colspan="2">';
+print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 $variablename='ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 98b83f61b8e..487203c9f4d 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -503,8 +503,8 @@ print "</tr>\n";
 $var=true;
 
 $var=! $var;
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("FreeLegalTextOnContracts").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
+print '<tr '.$bc[$var].'><td colspan="2">';
+print $langs->trans("FreeLegalTextOnContracts").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 $variablename='CONTRACT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 6488ed5499b..42000e7176d 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -737,8 +737,8 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_INVOICE_FREE_TEXT" />';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("FreeLegalTextOnInvoices").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
+print '<tr '.$bc[$var].'><td colspan="2">';
+print $langs->trans("FreeLegalTextOnInvoices").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 $variablename='INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 509426f9969..8d31db0d3af 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -538,8 +538,8 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_FICHINTER_FREE_TEXT">';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("FreeLegalTextOnInterventions").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
+print '<tr '.$bc[$var].'><td colspan="2">';
+print $langs->trans("FreeLegalTextOnInterventions").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 $variablename='FICHINTER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 86b52f9852d..c6ccb4f639c 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -576,8 +576,8 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_PROPOSAL_FREE_TEXT">';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("FreeLegalTextOnProposal").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
+print '<tr '.$bc[$var].'><td colspan="2">';
+print $langs->trans("FreeLegalTextOnProposal").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 $variablename='PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 540cd4a4b98..7510bfe37ef 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -472,7 +472,7 @@ print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
 print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("FreeLegalTextOnInvoices").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print $langs->trans("FreeLegalTextOnInvoices").' '.img_info($langs->trans("AddCRIfTooLong")).'</br>';
 $variablename='SUPPLIER_INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index b117795efa1..1ac6ae86989 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -536,8 +536,8 @@ else
 }
 */
 
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
+print '<tr '.$bc[$var].'><td colspan="2">';
+print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 $variablename='SUPPLIER_ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 8bd034bef48..7963aa7fabc 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -527,8 +527,8 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_SUPPLIER_PROPOSAL_FREE_TEXT">';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("FreeLegalTextOnSupplierProposal").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
+print '<tr '.$bc[$var].'><td colspan="2">';
+print $langs->trans("FreeLegalTextOnSupplierProposal").' '.img_info($langs->trans("AddCRIfTooLong")).'</br>';
 $variablename='SUPPLIER_PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 29dc50bf7e1..ecc651c1f16 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -384,8 +384,8 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_DONATION_MESSAGE" />';
 
 $var=! $var;
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("FreeTextOnDonations").' '.img_info($langs->trans("AddCRIfTooLong")).'</td><td>';
+print '<tr '.$bc[$var].'><td colspan="2">';
+print $langs->trans("FreeTextOnDonations").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 print '<textarea name="DONATION_MESSAGE" class="flat" cols="80">'.$conf->global->DONATION_MESSAGE.'</textarea>';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';

From 0f421dc2b4c0df9ca6f2fd12052f87570101fdd5 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 7 Feb 2017 11:09:18 +0100
Subject: [PATCH 0218/1163] New global conf MAIN_DEPOSIT_MULTI_TVA to manage
 multi tva on deposit

---
 htdocs/compta/facture.php | 133 ++++++++++++++++++++++++--------------
 1 file changed, 85 insertions(+), 48 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 54c8bf1bac1..80296fecc82 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1020,61 +1020,98 @@ if (empty($reshook))
 							$typeamount = GETPOST('typedeposit', 'alpha');
 							$valuedeposit = GETPOST('valuedeposit', 'int');
 
-							if ($typeamount == 'amount')
+							$amountdeposit = array();
+							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA))
 							{
-								$amountdeposit = $valuedeposit;
+								if ($typeamount == 'amount') $amount = $valuedeposit;
+								else $amount = $srcobject->total_ttc * ($valuedeposit / 100);
+								
+								$TTotalByTva = array();
+								foreach ($srcobject->lines as &$line)
+								{
+									$TTotalByTva[$line->tva_tx] += $line->total_ttc ;
+								}
+								
+								$amount_to_diff = 0;
+								foreach ($TTotalByTva as $tva => &$total)
+								{
+									$coef = $total / $srcobject->total_ttc; // Calc coef
+									$am = $amount * $coef;
+									$amount_ttc_diff += $am;
+									$amountdeposit[$tva] += $am / (1 + $tva / 100); // Convert into HT for the addline
+								}
 							}
 							else
 							{
-								$amountdeposit = 0;
-
-								if ($result > 0)
+								if ($typeamount == 'amount')
 								{
-									$totalamount = 0;
-									$lines = $srcobject->lines;
-									$numlines=count($lines);
-									for ($i=0; $i<$numlines; $i++)
-									{
-										$qualified=1;
-										if (empty($lines[$i]->qty)) $qualified=0;	// We discard qty=0, it is an option
-										if (! empty($lines[$i]->special_code)) $qualified=0;	// We discard special_code (frais port, ecotaxe, option, ...)
-										if ($qualified) $totalamount += $lines[$i]->total_ht;
-									}
-
-									if ($totalamount != 0) {
-										$amountdeposit = ($totalamount * $valuedeposit) / 100;
-									}
-								} else {
-									setEventMessages($srcobject->error, $srcobject->errors, 'errors');
-									$error ++;
+									$amountdeposit[] = $valuedeposit;
 								}
-							}
+								else
+								{
+									if ($result > 0)
+									{
+										$totalamount = 0;
+										$lines = $srcobject->lines;
+										$numlines=count($lines);
+										for ($i=0; $i<$numlines; $i++)
+										{
+											$qualified=1;
+											if (empty($lines[$i]->qty)) $qualified=0;	// We discard qty=0, it is an option
+											if (! empty($lines[$i]->special_code)) $qualified=0;	// We discard special_code (frais port, ecotaxe, option, ...)
+											if ($qualified) $totalamount += $lines[$i]->total_ht;
+										}
 
-							$result = $object->addline(
-									$langs->trans('Deposit'),
-									$amountdeposit,		 	// subprice
-									1, 						// quantity
-									$lines[$i]->tva_tx,     // vat rate
-							        0,                      // localtax1_tx
-									0, 						// localtax2_tx
-									(empty($conf->global->INVOICE_PRODUCTID_DEPOSIT)?0:$conf->global->INVOICE_PRODUCTID_DEPOSIT), 	// fk_product
-									0, 						// remise_percent
-									0, 						// date_start
-									0, 						// date_end
-									0, $lines[$i]->info_bits, // info_bits
-									0, 						// info_bits
-									'HT',
-									0,
-									0, 						// product_type
-									1,
-									$lines[$i]->special_code,
-									$object->origin,
-									0,
-									0,
-									0,
-									0,
-									$langs->trans('Deposit')
-								);
+										if ($totalamount != 0) {
+											$amountdeposit[] = ($totalamount * $valuedeposit) / 100;
+										}
+									} else {
+										setEventMessages($srcobject->error, $srcobject->errors, 'errors');
+										$error ++;
+									}
+								}
+								
+								$amount_ttc_diff = $amountdeposit[0];
+							}
+							
+							foreach ($amountdeposit as $tva => $amount)
+							{
+								$result = $object->addline(
+										$langs->trans('Deposit'),
+										$amount,		 	// subprice
+										1, 						// quantity
+										$tva,     // vat rate
+										0,                      // localtax1_tx
+										0, 						// localtax2_tx
+										(empty($conf->global->INVOICE_PRODUCTID_DEPOSIT)?0:$conf->global->INVOICE_PRODUCTID_DEPOSIT), 	// fk_product
+										0, 						// remise_percent
+										0, 						// date_start
+										0, 						// date_end
+										0, $lines[$i]->info_bits, // info_bits
+										0, 						// info_bits
+										'HT',
+										0,
+										0, 						// product_type
+										1,
+										$lines[$i]->special_code,
+										$object->origin,
+										0,
+										0,
+										0,
+										0,
+										$langs->trans('Deposit')
+									);
+							}
+							
+							$diff = $object->total_ttc - $amount_ttc_diff;
+							
+							if ($diff != 0)
+							{
+								$object->fetch_lines();
+								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx);
+								$object->updateline($object->lines[0]->id, $object->lines[0]->desc, $subprice_diff, $object->lines[0]->qty, $object->lines[0]->remise_percent, $object->lines[0]->date_start, $object->lines[0]->date_end, $object->lines[0]->tva_tx, 0, 0, 'HT', $object->lines[0]->info_bits, $object->lines[0]->product_type, 0, 0, 0, $object->lines[0]->pa_ht, $object->lines[0]->label, 0, array(), 100);
+							}
+							
 						}
 						else
 						{

From 6b20bad847130e1cace7abfcbb461ca14985438a Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 7 Feb 2017 11:14:27 +0100
Subject: [PATCH 0219/1163] add fixme

---
 htdocs/compta/facture.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 80296fecc82..f431b1bf344 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1059,7 +1059,7 @@ if (empty($reshook))
 											$qualified=1;
 											if (empty($lines[$i]->qty)) $qualified=0;	// We discard qty=0, it is an option
 											if (! empty($lines[$i]->special_code)) $qualified=0;	// We discard special_code (frais port, ecotaxe, option, ...)
-											if ($qualified) $totalamount += $lines[$i]->total_ht;
+											if ($qualified) $totalamount += $lines[$i]->total_ht; // Fixme : is it not for the customer ? Shouldn't we take total_ttc ?
 										}
 
 										if ($totalamount != 0) {

From 9a141f85560d078c648fd1a6f7498c2c2a4d634e Mon Sep 17 00:00:00 2001
From: Paris Liakos <rootatwc@gmail.com>
Date: Tue, 7 Feb 2017 20:55:40 +0200
Subject: [PATCH 0220/1163] Wrong trigger when setting supplier invoice back to
 draft

---
 .../fourn/class/fournisseur.facture.class.php | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 6c0d493373c..5602f573e90 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -46,7 +46,7 @@ class FactureFournisseur extends CommonInvoice
     public $fk_element='fk_facture_fourn';
     protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto='bill';
-    
+
     /**
      * {@inheritdoc}
      */
@@ -320,12 +320,12 @@ class FactureFournisseur extends CommonInvoice
                 {
                     $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
                     $sql .= ' VALUES ('.$this->id.')';
-    
+
                     $resql_insert=$this->db->query($sql);
                     if ($resql_insert)
                     {
                         $idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
-    
+
                         $this->updateline(
                             $idligne,
                             $this->lines[$i]->description,
@@ -354,19 +354,19 @@ class FactureFournisseur extends CommonInvoice
 			    foreach ($this->lines as $i => $val)
 			    {
                 	$line = $this->lines[$i];
-                	
+
                 	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 				    //if (! is_object($line)) $line=json_decode(json_encode($line), FALSE);  // convert recursively array into object.
                 	if (! is_object($line)) $line = (object) $line;
-			        
+
                 	$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
 			        $sql .= ' VALUES ('.$this->id.')';
-			    
+
 			        $resql_insert=$this->db->query($sql);
 			        if ($resql_insert)
 			        {
 			            $idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
-			    
+
 			            $this->updateline(
 			                $idligne,
 			                $line->description,
@@ -387,9 +387,9 @@ class FactureFournisseur extends CommonInvoice
 			            $this->db->rollback();
 			            return -5;
 			        }
-			    }			    
+			    }
 			}
-			
+
             // Update total price
             $result=$this->update_price();
             if ($result > 0)
@@ -413,7 +413,7 @@ class FactureFournisseur extends CommonInvoice
 					}
 				}
 				else if ($reshook < 0) $error++;
-				
+
 				if (! $error)
 				{
                     // Call trigger
@@ -421,7 +421,7 @@ class FactureFournisseur extends CommonInvoice
                     if ($result < 0) $error++;
                     // End call triggers
 				}
-				
+
                 if (! $error)
                 {
                     $this->db->commit();
@@ -587,7 +587,7 @@ class FactureFournisseur extends CommonInvoice
 				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
-				
+
                 $this->extraparams			= (array) json_decode($obj->extraparams, true);
 
                 $this->socid  = $obj->socid;
@@ -671,8 +671,8 @@ class FactureFournisseur extends CommonInvoice
                     $line->subprice			= $obj->pu_ht;
                     $line->pu_ht			= $obj->pu_ht;
                     $line->pu_ttc			= $obj->pu_ttc;
-                    
-                    $line->vat_src_code     = $obj->vat_src_code; 
+
+                    $line->vat_src_code     = $obj->vat_src_code;
                     $line->tva_tx			= $obj->tva_tx;
                     $line->localtax1_tx		= $obj->localtax1_tx;
                     $line->localtax2_tx		= $obj->localtax2_tx;
@@ -700,7 +700,7 @@ class FactureFournisseur extends CommonInvoice
 					$line->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
 					$line->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 					$line->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
-				
+
 	                $this->lines[$i] = $line;
 
                     $i++;
@@ -1260,7 +1260,7 @@ class FactureFournisseur extends CommonInvoice
             if (! $error && empty($notrigger))
             {
                 // Call trigger
-                $result=$this->call_trigger('BILL_SUPPLIER_VALIDATE',$user);
+                $result=$this->call_trigger('BILL_SUPPLIER_UNVALIDATE',$user);
                 if ($result < 0) $error++;
                 // End call triggers
             }
@@ -1332,7 +1332,7 @@ class FactureFournisseur extends CommonInvoice
         if (empty($txlocaltax2)) $txlocaltax2=0;
 
         $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
-        	
+
         // Clean vat code
         $vat_src_code='';
         if (preg_match('/\((.*)\)/', $txtva, $reg))
@@ -1340,7 +1340,7 @@ class FactureFournisseur extends CommonInvoice
             $vat_src_code = $reg[1];
             $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
         }
-        
+
         $remise_percent=price2num($remise_percent);
         $qty=price2num($qty);
         $pu=price2num($pu);
@@ -1374,7 +1374,7 @@ class FactureFournisseur extends CommonInvoice
         //$this->line->label=$label;	// deprecated
         $this->line->desc=$desc;
         $this->line->qty=            ($this->type==self::TYPE_CREDIT_NOTE?abs($qty):$qty);	// For credit note, quantity is always positive and unit price negative
-        
+
         $this->line->vat_src_code=$vat_src_code;
         $this->line->tva_tx=$txtva;
         $this->line->localtax1_tx=$txlocaltax1;
@@ -1503,7 +1503,7 @@ class FactureFournisseur extends CommonInvoice
             $vat_src_code = $reg[1];
             $vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate);    // Remove code into vatrate.
         }
-        
+
         $tabprice = calcul_price_total($qty, $pu, $remise_percent, $vatrate, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
         $total_ht  = $tabprice[0];
         $total_tva = $tabprice[1];
@@ -1513,13 +1513,13 @@ class FactureFournisseur extends CommonInvoice
         $pu_ttc = $tabprice[5];
         $total_localtax1 = $tabprice[9];
         $total_localtax2 = $tabprice[10];
-		
+
 		// MultiCurrency
 		$multicurrency_total_ht  = $tabprice[16];
         $multicurrency_total_tva = $tabprice[17];
         $multicurrency_total_ttc = $tabprice[18];
 		$pu_ht_devise = $tabprice[19];
-			
+
         if (empty($info_bits)) $info_bits=0;
 
         if ($idproduct)
@@ -1545,7 +1545,7 @@ class FactureFournisseur extends CommonInvoice
 	    $line->pu_ttc = $pu_ttc;
 	    $line->qty = $qty;
 	    $line->remise_percent = $remise_percent;
-        
+
 	    $line->vat_src_code=$vat_src_code;
 	    $line->tva_tx = $vatrate;
 	    $line->localtax1_tx = $txlocaltax1;
@@ -1871,7 +1871,7 @@ class FactureFournisseur extends CommonInvoice
             $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose.=' class="classfortooltip"';
         }
-        
+
         $linkstart = '<a href="'.$url.'"';
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
@@ -2179,10 +2179,10 @@ class FactureFournisseur extends CommonInvoice
 			}
 			else
 			{
-				$modele = '';       // No default value. For supplier invoice, we allow to disable all PDF generation 
+				$modele = '';       // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
 		}
-		
+
 		if (empty($modele))
 		{
 		    return 0;
@@ -2266,7 +2266,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	public $product_ref;
 
 	/**
-	 * Supplier reference of price when we added the line. May have been changed after line was added. 
+	 * Supplier reference of price when we added the line. May have been changed after line was added.
 	 * TODO Rename field ref to ref_supplier into table llx_facture_fourn_det and llx_commande_fournisseurdet and update fields into updateline
 	 * @var string
 	 */
@@ -2555,13 +2555,13 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql.= ", product_type = ".$this->product_type;
 		$sql.= ", info_bits = ".$this->info_bits;
 		$sql.= ", fk_unit = ".$fk_unit;
-		
+
 		// Multicurrency
 		$sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
         $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
         $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
         $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
-        
+
 		$sql.= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -2675,7 +2675,7 @@ class SupplierInvoiceLine extends CommonObjectLine
         $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
         $sql.= " '".$this->db->escape($this->desc)."',";
         $sql.= " ".price2num($this->qty).",";
-        
+
         $sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->vat_src_code."'").",";
         $sql.= " ".price2num($this->tva_tx).",";
         $sql.= " ".price2num($this->localtax1_tx).",";
@@ -2745,7 +2745,7 @@ class SupplierInvoiceLine extends CommonObjectLine
             $this->db->rollback();
             return -2;
         }
-    } 
+    }
             /**
      *  Mise a jour de l'objet ligne de commande en base
      *

From e4fc52497e118ea792cacba84593721e32ff8a91 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 8 Feb 2017 06:18:56 +0100
Subject: [PATCH 0221/1163] New : [FP17] Accountancy - Add export of charts of
 accounts

---
 htdocs/core/modules/modAccounting.class.php | 19 ++++++++++++++++++-
 htdocs/langs/en_US/accountancy.lang         |  1 +
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index e9c7fb309ad..92e63d8bf7c 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -72,7 +72,7 @@ class modAccounting extends DolibarrModules
 		$this->conflictwith = array("modComptabilite"); // List of modules are in conflict with this module
 		$this->phpmin = array(5, 3); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 9); // Minimum version of Dolibarr required by module
-		$this->langfiles = array("accountancy");
+		$this->langfiles = array("accountancy","compta");
 
 		// Constants
 		$this->const = array();
@@ -288,6 +288,23 @@ class modAccounting extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		
+		// Exports
+        //--------
+        $r=0;
+
+        $r++;
+        $this->export_code[$r]=$this->rights_class.'_'.$r;
+        $this->export_label[$r]='Chartofaccounts';
+        $this->export_icon[$r]='accounting';
+		$this->export_permission[$r]=array(array("accounting","chartofaccount"));
+        $this->export_fields_array[$r]=array('ac.rowid'=>'ChartofaccountsId','ac.pcg_version'=>'Chartofaccounts','aa.rowid'=>'Id','aa.account_number'=>"AccountAccounting",'aa.label'=>"Label",'aa.account_parent'=>"Accountparent",'aa.pcg_type'=>"Pcgtype",'aa.pcg_subtype'=>'Pcgsubtype','aa.active'=>'Status');
+        $this->export_TypeFields_array[$r]=array('ac.rowid'=>'List:accounting_system:pcg_version','aa.account_number'=>"Text",'aa.label'=>"Text",'aa.pcg_type'=>'Text','aa.pcg_subtype'=>'Text','aa.active'=>'Status');
+        $this->export_entities_array[$r]=array('ac.rowid'=>"accounting",'ac.pcg_version'=>"accounting",'aa.rowid'=>'accounting','aa.account_number'=>"accounting",'aa.label'=>"accounting",'aa.accountparent'=>"accounting",'aa.pcg_type'=>"accounting",'aa.pcgsubtype'=>"accounting",'aa_active'=>"accounting");
+
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'accounting_account as aa, '.MAIN_DB_PREFIX.'accounting_system as ac';
+        $this->export_sql_end[$r] .=' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting', 1).') ';
 
 	}
 }
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 5ee68e605cd..b56efc312e7 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -211,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy

From 4126dcff03557703e1356f41aaf5ff808a286b56 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 8 Feb 2017 06:51:42 +0100
Subject: [PATCH 0222/1163] [FP17] Accountancy - Prepare fiscal year for a
 better complete accountancy. For the moment, remove function to update status
 and delete a fiscal year. Need controls and a specific function to block
 lines in the book keeping if the fiscal year is closed.

---
 htdocs/accountancy/admin/fiscalyear.php      |  2 +-
 htdocs/accountancy/admin/fiscalyear_card.php | 11 +++++++----
 htdocs/core/class/fiscalyear.class.php       |  4 ++--
 htdocs/langs/en_US/main.lang                 |  1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 817905f7b56..4b2b57ee7db 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index 2c22d8f191a..7a8ab0673a7 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2014-2016  Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2014-2016  Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -176,13 +176,15 @@ if ($action == 'create')
 	print $form->select_date(($date_end ? $date_end : - 1), 'fiscalyearend');
 	print '</td></tr>';
 
+	/*
 	// Statut
 	print '<tr>';
 	print '<td class="fieldrequired">' . $langs->trans("Status") . '</td>';
 	print '<td class="valeur">';
 	print $form->selectarray('statut', $statut2label, GETPOST('statut'));
 	print '</td></tr>';
-
+	*/
+	
 	print '</table>';
 
 	dol_fiche_end();
@@ -232,7 +234,8 @@ if ($action == 'create')
 
 			// Statut
 			print '<tr><td>' . $langs->trans("Statut") . '</td><td>';
-			print $form->selectarray('statut', $statut2label, $object->statut);
+			// print $form->selectarray('statut', $statut2label, $object->statut);
+			print $object->getLibStatut(4);
 			print '</td></tr>';
 
 			print '</table>';
@@ -304,7 +307,7 @@ if ($action == 'create')
 
     			print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&id=' . $id . '">' . $langs->trans('Modify') . '</a>';
     
-    			print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
+    			// print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
 			
     			print '</div>';
 			}
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index ef990d8edf3..912c1e34879 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2014		Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2014-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -89,7 +89,7 @@ class Fiscalyear extends CommonObject
 		$sql.= " '".$this->label."'";
 		$sql.= ", '".$this->db->idate($this->date_start)."'";
 		$sql.= ", ".($this->date_end ? "'".$this->db->idate($this->date_end)."'":"null");
-		$sql.= ", ".$this->statut;
+		$sql.= ", 0";
 		$sql.= ", ".$conf->entity;
 		$sql.= ", '".$this->db->idate($now)."'";
 		$sql.= ", ". $user->id;
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 1c9c74471ca..37725835e4a 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -756,6 +756,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday

From 7fcf598c78a47474c6163b7cc4c60ae3d34e8cb9 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Wed, 8 Feb 2017 08:52:58 +0100
Subject: [PATCH 0223/1163] Fix travis

---
 htdocs/admin/modulehelp.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index eca82b5abbd..e701d4ead03 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -281,7 +281,6 @@ $special = $objMod->special;
 if (! $objMod->getName())
 {
 	dol_syslog("Error for module ".$key." - Property name of module looks empty", LOG_WARNING);
-	continue;
 }
 
 $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));

From 49e6192e6222133e03592d9bec95ea6b8057839f Mon Sep 17 00:00:00 2001
From: De Coninck Laurent <laurent@adlogix.eu>
Date: Wed, 8 Feb 2017 09:23:15 +0100
Subject: [PATCH 0224/1163] fix the type width column and the nextY

---
 .../doc/pdf_standard.modules.php              | 61 +++++++++++--------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index abc40f23005..5db7e065b43 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -307,28 +307,29 @@ class pdf_standard extends ModeleExpenseReport
 
 					$pdf->SetFont('','', $default_font_size - 1);
 					
-					// Accountancy piece
-					$pdf->SetXY($this->posxpiece, $curY);
-					$pdf->writeHTMLCell($this->posxcomment-$this->posxpiece-0.8, 4, $this->posxpiece-1, $curY, $piece_comptable, 0, 1);
-					
-					// Comments
-					$pdf->SetXY($this->posxcomment, $curY);
-					$pdf->writeHTMLCell($this->posxdate-$this->posxcomment-0.8, 4, $this->posxcomment-1, $curY, $object->lines[$i]->comments, 0, 1);
+                    // Accountancy piece
+                    $pdf->SetXY($this->posxpiece, $curY);
+                    $pdf->writeHTMLCell($this->posxcomment-$this->posxpiece-0.8, 4, $this->posxpiece-1, $curY, $piece_comptable, 0, 1);
 
-					//nexY
-					$nexY = $pdf->GetY();
-					$pageposafter=$pdf->getPage();
-					$pdf->setPage($pageposbefore);
-					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+                    // Comments
+                    $pdf->SetXY($this->posxcomment, $curY );
+                    $pdf->writeHTMLCell($this->posxdate-$this->posxcomment-0.8, 4, $this->posxcomment-1, $curY, $object->lines[$i]->comments, 0, 1);
 
-					// Date
+                    // Date
 					$pdf->SetXY($this->posxdate -1, $curY);
 					$pdf->MultiCell($this->posxtype-$this->posxdate-0.8, 4, dol_print_date($object->lines[$i]->date,"day",false,$outputlangs), 0, 'C');
 
 					// Type
 					$pdf->SetXY($this->posxtype -1, $curY);
-					$pdf->MultiCell($this->posxprojet-$this->posxtype-0.8, 4, dol_trunc($outputlangs->transnoentities($object->lines[$i]->type_fees_code), 12), 0, 'C');
+					$nextColumnPosX = $this->posxup;
+                    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+                        $nextColumnPosX = $this->posxtva;
+                    }
+                    if (!empty($conf->projet->enabled)) {
+                        $nextColumnPosX = $this->posxprojet;
+                    }
+
+					$pdf->MultiCell($nextColumnPosX-$this->posxtype-0.8, 4, dol_trunc($outputlangs->transnoentities($object->lines[$i]->type_fees_code), 12), 0, 'C');
 
                     // Project
 					if (! empty($conf->projet->enabled)) 
@@ -358,20 +359,30 @@ class pdf_standard extends ModeleExpenseReport
 					$pdf->SetXY($this->postotalttc-1, $curY);
 					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalttc, 4, price($object->lines[$i]->total_ttc), 0, 'R');
 
-					// Cherche nombre de lignes a venir pour savoir si place suffisante
+                    //nexY
+                    $nexY = $pdf->GetY();
+                    $pageposafter=$pdf->getPage();
+                    $pdf->setPage($pageposbefore);
+                    $pdf->setTopMargin($this->marge_haute);
+                    $pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+
+                    $nblineFollowComment = 1;
+                    // Cherche nombre de lignes a venir pour savoir si place suffisante
 					if ($i < ($nblignes - 1))	// If it's not last line
 					{
-						//on recupere la description du produit suivant
-						$follow_comment = $object->lines[$i+1]->comments;
+					    //Fetch current description to know on which line the next one should be placed
+						$follow_comment = $object->lines[$i]->comments;
+						$follow_type = $object->lines[$i]->type_fees_code;
+
 						//on compte le nombre de ligne afin de verifier la place disponible (largeur de ligne 52 caracteres)
-						$nblineFollowComment = dol_nboflines_bis($follow_comment,52,$outputlangs->charset_output)*4;
-					}
-					else	// If it's last line
-					{
-						$nblineFollowComment = 0;
+						$nbLineCommentNeed = dol_nboflines_bis($follow_comment,52,$outputlangs->charset_output);
+						$nbLineTypeNeed = dol_nboflines_bis($follow_type,4,$outputlangs->charset_output);
+
+						//Which one need more lines
+                        $nblineFollowComment = ($nbLineCommentNeed > $nbLineTypeNeed) ? $nbLineCommentNeed : $nbLineTypeNeed;
 					}
 
-					$nexY+=4;    // Passe espace entre les lignes
+                    $nexY+=$nblineFollowComment*($pdf->getFontSize()+1);    // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)
@@ -426,7 +437,7 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->SetFont('','', 10);
 				
             	// Show total area box
-				$posy=$bottomlasttab+5;//$nexY+95;
+				$posy=$bottomlasttab+5;
 				$pdf->SetXY(100, $posy);
 				$pdf->MultiCell(60, 5, $outputlangs->transnoentities("TotalHT"), 1, 'L');
 				$pdf->SetXY(160, $posy);

From e1a6e6e4ab89e4f8669d2cf41b76e8800884ffdb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 8 Feb 2017 12:37:38 +0100
Subject: [PATCH 0225/1163] Rename "attributes" into "variants" to avoid
 confusion with extrafields

---
 htdocs/comm/propal/card.php                   |  6 +-
 htdocs/commande/card.php                      |  6 +-
 htdocs/compta/facture.php                     |  6 +-
 htdocs/core/class/html.form.class.php         |  4 +-
 htdocs/core/lib/product.lib.php               |  6 +-
 ...ibutes.class.php => modVariants.class.php} | 20 +++----
 htdocs/core/tpl/objectline_create.tpl.php     |  2 +-
 htdocs/fourn/commande/card.php                |  6 +-
 htdocs/fourn/facture/card.php                 |  6 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   | 41 +++++++++++++
 .../mysql/tables/llx_product_price_by_qty.sql |  1 -
 htdocs/langs/en_US/products.lang              | 39 +++++++------
 htdocs/product/card.php                       |  2 +-
 htdocs/product/class/product.class.php        |  8 +--
 htdocs/product/list.php                       | 10 ++--
 .../{attributes => variants}/admin/admin.php  |  0
 .../{attributes => variants}/admin/index.html |  0
 .../ajax/getCombinations.php                  |  2 +-
 .../ajax/get_attribute_values.php             |  4 +-
 .../{attributes => variants}/ajax/index.html  |  0
 .../ajax/orderAttribute.php                   |  2 +-
 htdocs/{attributes => variants}/card.php      | 25 +++++---
 .../class/ProductAttribute.class.php          | 37 ++++++------
 .../class/ProductAttributeValue.class.php     |  4 +-
 .../class/ProductCombination.class.php        | 29 +++++-----
 .../ProductCombination2ValuePair.class.php    |  4 +-
 .../{attributes => variants}/class/index.html |  0
 .../{attributes => variants}/combinations.php | 58 +++++++++----------
 htdocs/{attributes => variants}/create.php    |  2 +-
 .../{attributes => variants}/create_val.php   |  2 +-
 htdocs/{attributes => variants}/generator.php | 25 ++++----
 htdocs/{attributes => variants}/index.html    |  0
 .../{attributes => variants}/lib/index.html   |  0
 .../lib/product_variants.lib.php}             |  0
 htdocs/{attributes => variants}/list.php      | 25 +++++---
 35 files changed, 223 insertions(+), 159 deletions(-)
 rename htdocs/core/modules/{modAttributes.class.php => modVariants.class.php} (90%)
 rename htdocs/{attributes => variants}/admin/admin.php (100%)
 rename htdocs/{attributes => variants}/admin/index.html (100%)
 rename htdocs/{attributes => variants}/ajax/getCombinations.php (94%)
 rename htdocs/{attributes => variants}/ajax/get_attribute_values.php (90%)
 rename htdocs/{attributes => variants}/ajax/index.html (100%)
 rename htdocs/{attributes => variants}/ajax/orderAttribute.php (95%)
 rename htdocs/{attributes => variants}/card.php (89%)
 rename htdocs/{attributes => variants}/class/ProductAttribute.class.php (89%)
 rename htdocs/{attributes => variants}/class/ProductAttributeValue.class.php (97%)
 rename htdocs/{attributes => variants}/class/ProductCombination.class.php (93%)
 rename htdocs/{attributes => variants}/class/ProductCombination2ValuePair.class.php (95%)
 rename htdocs/{attributes => variants}/class/index.html (100%)
 rename htdocs/{attributes => variants}/combinations.php (89%)
 rename htdocs/{attributes => variants}/create.php (96%)
 rename htdocs/{attributes => variants}/create_val.php (97%)
 rename htdocs/{attributes => variants}/generator.php (93%)
 rename htdocs/{attributes => variants}/index.html (100%)
 rename htdocs/{attributes => variants}/lib/index.html (100%)
 rename htdocs/{attributes/lib/product_attributes.lib.php => variants/lib/product_variants.lib.php} (100%)
 rename htdocs/{attributes => variants}/list.php (93%)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 56a8f02e7e5..6139d54c799 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -51,8 +51,8 @@ if (! empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 }
 
-if (!empty($conf->attributes->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+if (!empty($conf->variants->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
 
 $langs->load('companies');
@@ -729,7 +729,7 @@ if (empty($reshook))
 			$error ++;
 		}
 
-		if (!$error && !empty($conf->attributes->enabled) && $prod_entry_mode != 'free') {
+		if (!$error && !empty($conf->variants->enabled) && $prod_entry_mode != 'free') {
 			if ($combinations = GETPOST('combinations', 'array')) {
 				//Check if there is a product with the given combination
 				$prodcomb = new ProductCombination($db);
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 4f049a1fe4e..497dd6292f2 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -51,8 +51,8 @@ if (! empty($conf->projet->enabled)) {
 }
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 
-if (!empty($conf->attributes->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+if (!empty($conf->variants->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
 
 $langs->load('orders');
@@ -693,7 +693,7 @@ if (empty($reshook))
 			$error++;
 		}
 
-		if (!$error && !empty($conf->attributes->enabled) && $prod_entry_mode != 'free') {
+		if (!$error && !empty($conf->variants->enabled) && $prod_entry_mode != 'free') {
 			if ($combinations = GETPOST('combinations', 'array')) {
 				//Check if there is a product with the given combination
 				$prodcomb = new ProductCombination($db);
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index f0ddace3e2e..b457c3f1187 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -56,8 +56,8 @@ if (! empty($conf->projet->enabled)) {
 }
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 
-if (!empty($conf->attributes->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+if (!empty($conf->variants->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
 
 $langs->load('bills');
@@ -1428,7 +1428,7 @@ if (empty($reshook))
 			$error ++;
 		}
 
-		if (!$error && !empty($conf->attributes->enabled) && $prod_entry_mode != 'free') {
+		if (!$error && !empty($conf->variants->enabled) && $prod_entry_mode != 'free') {
 			if ($combinations = GETPOST('combinations', 'array')) {
 				//Check if there is a product with the given combination
 				$prodcomb = new ProductCombination($db);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cec7aa2aede..5637d52ace7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1673,7 +1673,7 @@ class Form
             }
             print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 
-			if (!empty($conf->attributes->enabled)) {
+			if (!empty($conf->variants->enabled)) {
 				?>
 				<script>
 
@@ -1695,7 +1695,7 @@ class Form
 								return;
 							}
 
-							jQuery.getJSON("<?php echo dol_buildpath('/attributes/ajax/getCombinations.php', 2) ?>", {
+							jQuery.getJSON("<?php echo dol_buildpath('/variants/ajax/getCombinations.php', 2) ?>", {
 								id: jQuery(this).val()
 							}, function (data) {
 								jQuery('div#attributes_box').empty();
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 6f76221b037..d65f9120c09 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -94,16 +94,16 @@ function product_prepare_head($object)
 	$head[$h][2] = 'referers';
 	$h++;
 
-	if (!empty($conf->attributes->enabled) && $object->isProduct()) {
+	if (!empty($conf->variants->enabled) && $object->isProduct()) {
 
 		global $db;
 
-		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 
 		$prodcomb = new ProductCombination($db);
 
 		if ($prodcomb->fetchByFkProductChild($object->id) == -1) {
-			$head[$h][0] = DOL_URL_ROOT."/attributes/combinations.php?id=".$object->id;
+			$head[$h][0] = DOL_URL_ROOT."/variants/combinations.php?id=".$object->id;
 			$head[$h][1] = $langs->trans('ProductCombinations');
 			$head[$h][2] = 'combinations';
 		}
diff --git a/htdocs/core/modules/modAttributes.class.php b/htdocs/core/modules/modVariants.class.php
similarity index 90%
rename from htdocs/core/modules/modAttributes.class.php
rename to htdocs/core/modules/modVariants.class.php
index a21ae756bf2..892d0903826 100644
--- a/htdocs/core/modules/modAttributes.class.php
+++ b/htdocs/core/modules/modVariants.class.php
@@ -20,7 +20,7 @@
  */
 
 /**
- * 	\defgroup   produit     Module product attributes
+ * 	\defgroup   produit     Module product variants
  *  \brief      Module to manage product combinations based on product attributes
  *  \file       htdocs/core/modules/modAttributes.class.php
  *  \ingroup    produit
@@ -30,9 +30,9 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *  Description and activation class for module Product attributes
+ *  Description and activation class for module Product variants
  */
-class modAttributes extends DolibarrModules
+class modVariants extends DolibarrModules
 {
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
@@ -49,7 +49,7 @@ class modAttributes extends DolibarrModules
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
 		$this->numero = 610;
 		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'attributes';
+		$this->rights_class = 'variants';
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
@@ -57,9 +57,9 @@ class modAttributes extends DolibarrModules
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i','',get_class($this));
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = 'Allows creating product combinations based on product attributes';
+		$this->description = 'Allows creating products variant based on new attributes';
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
+		$this->version = 'experimental';
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
@@ -78,7 +78,7 @@ class modAttributes extends DolibarrModules
 
 		// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
 		$this->config_page_url = array(
-			'admin.php@attributes'
+			'admin.php@variants'
 		);
 
 		// Dependencies
@@ -97,7 +97,7 @@ class modAttributes extends DolibarrModules
 
 		// Array to add new pages in new tabs
 		$this->tabs = array(
-//			'product:+combinations:Combinaciones:products:1:/attributes/combinations.php?id=__ID__'
+//			'product:+combinations:Combinaciones:products:1:/variants/combinations.php?id=__ID__'
 		);
 
 		// Dictionaries
@@ -120,10 +120,10 @@ class modAttributes extends DolibarrModules
 			array(
 				'fk_menu' => 'fk_mainmenu=products,fk_leftmenu=product',
 				'type' => 'left',
-				'titre' => $langs->trans('Attributes'),
+				'titre' => 'VariantAttributes',
 				'mainmenu' => 'products',
 				'leftmenu' => 'product',
-				'url' => '/attributes/list.php',
+				'url' => '/variants/list.php',
 				'langs' => 'products',
 				'position' => 100,
 				'enabled' => '$conf->product->enabled',
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 335c61b00fb..a649cb05447 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -240,7 +240,7 @@ else {
 
 	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) {
 
-		if (!empty($conf->attributes->enabled)) {
+		if (!empty($conf->variants->enabled)) {
 			echo '<div id="attributes_box"></div>';
 		}
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 35f4f788af7..2a7744a97b7 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -50,8 +50,8 @@ if (!empty($conf->projet->enabled)) {
 }
 require_once NUSOAP_PATH.'/nusoap.php';     // Include SOAP
 
-if (!empty($conf->attributes->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+if (!empty($conf->variants->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
 
 $langs->load('admin');
@@ -343,7 +343,7 @@ if (empty($reshook))
 	        $error++;
 	    }
 
-		if (!$error && !empty($conf->attributes->enabled) && $prod_entry_mode != 'free') {
+		if (!$error && !empty($conf->variants->enabled) && $prod_entry_mode != 'free') {
 			if ($combinations = GETPOST('combinations', 'array')) {
 				//Check if there is a product with the given combination
 				$prodcomb = new ProductCombination($db);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 8897e7bddee..f325ab23a70 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -46,8 +46,8 @@ if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
-if (!empty($conf->attributes->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+if (!empty($conf->variants->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
 
 
@@ -941,7 +941,7 @@ if (empty($reshook))
 	        $error++;
 	    }
 
-		if (!$error && !empty($conf->attributes->enabled) && $prod_entry_mode != 'free') {
+		if (!$error && !empty($conf->variants->enabled) && $prod_entry_mode != 'free') {
 			if ($combinations = GETPOST('combinations', 'array')) {
 				//Check if there is a product with the given combination
 				$prodcomb = new ProductCombination($db);
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index c2532124293..aa755daa09a 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -54,6 +54,47 @@ ALTER TABLE llx_projet_task_time ADD COLUMN tms timestamp;
 
 ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_user_creat integer;
 ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_user_modif integer;
+ALTER TABLE llx_product_price_by_qty DROP COLUMN date_price;
 ALTER TABLE llx_product_price_by_qty ADD COLUMN tms timestamp;
 ALTER TABLE llx_product_price_by_qty ADD COLUMN import_key integer;
 
+
+
+CREATE TABLE llx_product_attribute
+(
+  rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  ref VARCHAR(255) NOT NULL,
+  label VARCHAR(255) NOT NULL,
+  rang INT DEFAULT 0 NOT NULL,
+  entity INT DEFAULT 1 NOT NULL
+);
+ALTER TABLE llx_product_attribute ADD CONSTRAINT unique_ref UNIQUE (ref);
+
+CREATE TABLE llx_product_attribute_value
+(
+  rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  fk_product_attribute INT NOT NULL,
+  ref VARCHAR(255) DEFAULT NULL,
+  value VARCHAR(255) DEFAULT NULL,
+  entity INT DEFAULT 1 NOT NULL
+);
+ALTER TABLE llx_product_attribute_value ADD CONSTRAINT unique_ref UNIQUE (fk_product_attribute,ref);
+
+CREATE TABLE llx_product_attribute_combination2val
+(
+  rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  fk_prod_combination INT NOT NULL,
+  fk_prod_attr INT NOT NULL,
+  fk_prod_attr_val INT NOT NULL
+);
+CREATE TABLE llx_product_attribute_combination
+(
+  rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  fk_product_parent INT NOT NULL,
+  fk_product_child INT NOT NULL,
+  variation_price FLOAT NOT NULL,
+  variation_price_percentage INT NULL,
+  variation_weight FLOAT NOT NULL,
+  entity INT DEFAULT 1 NOT NULL
+);
+
diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
index e801f682d5c..8543f1720b2 100644
--- a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
+++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
@@ -23,7 +23,6 @@ create table llx_product_price_by_qty
 (
   rowid				integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
   fk_product_price	integer NOT NULL,
-  date_price		timestamp NOT NULL,
   price				double(24,8) DEFAULT 0,
   quantity			double DEFAULT NULL,
   remise_percent	double NOT NULL DEFAULT 0,
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 6d93a24b36f..457354813e8 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -142,7 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
-CloneCombinationsProduct=Clone product combinations
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -262,36 +262,37 @@ ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
 SubProduct=Sub product
 
 #Attributes
-ProductAttributes=Product attributes
-ProductAttributeName=Attribute %s
-ProductAttribute=Attribute
+VariantAttributes=Variant attributes
+ProductAttributes=Variant attributes for products
+ProductAttributeName=Variant attribute %s
+ProductAttribute=Variant attribute
 ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
 ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
-ProductCombinationDeleteDialog=Are you sure want to delete the combination of the product "%s"?
-ProductCombinationAlreadyUsed=There was an error while deleting the combination. Please check it is not being used in any object
-ProductCombinations=Combinations
-HideProductCombinations=Hide derived products from combinations in the product selector
-ProductCombination=Combination
-NewProductCombination=New combination
-EditProductCombination=Editing combination
-ProductCombinationGenerator=Combinations generator
+ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
 ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
-ProductCombinationGeneratorWarning=If you continue, before generating new combinations, all previous ones will be DELETED. Already existing ones will be updated with the new values
-TooMuchCombinationsWarning=Generating lots of combinations may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
-DoNotRemovePreviousCombinations=Do not remove previous combinations
+ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
+TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
+DoNotRemovePreviousCombinations=Do not remove previous variants
 UsePercentageVariations=Use percentage variations
 PercentageVariation=Percentage variation
-ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product combinations
+ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
 NbProducts=No. of products
 ParentProduct=Parent product
 HideChildProducts=Hide child products
-ConfirmCloneProductCombinations=Would you like to copy all the product combinations to the product with the given reference?
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the product with the given reference?
 CloneDestinationReference=Destination product reference
-ErrorCopyProductCombinations=There was an error while copying the product combinations
+ErrorCopyProductCombinations=There was an error while copying the product variants
 ErrorDestinationProductNotFound=Destination product not found
-ErrorProductCombinationNotFound=Product combination not found
\ No newline at end of file
+ErrorProductCombinationNotFound=Product variant not found
\ No newline at end of file
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 6b7d3e9477c..633f0bbcbd5 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1604,7 +1604,7 @@ else
             print '</td></tr>';
 
             //Parent product.
-            if (!empty($conf->attributes->enabled) && $object->isProduct()) {
+            if (!empty($conf->variants->enabled) && $object->isProduct()) {
 
                 $combination = new ProductCombination($db);
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index dd606decb88..c9e6bab9922 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -960,9 +960,9 @@ class Product extends CommonObject
 
 				if (! $error)
 				{
-					if ($conf->attributes->enabled) {
+					if ($conf->variants->enabled) {
 
-						require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+						require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 
 						$comb = new ProductCombination($this->db);
 
@@ -1094,8 +1094,8 @@ class Product extends CommonObject
 
 			if (!$error) {
 
-				require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
-				require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination2ValuePair.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
 
 				//If it is a parent product, then we remove the association with child products
 				$prodcomb = new ProductCombination($this->db);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 758acd90c09..be489bd19bd 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -249,7 +249,7 @@ else
     $sql.= ' p.datec as date_creation, p.tms as date_update,';
     //$sql.= ' pfp.ref_fourn as ref_supplier, ';
     $sql.= ' MIN(pfp.unitprice) as minsellprice';
-	if (!empty($conf->attributes->enabled) && $search_hidechildproducts && ($type === 0)) {
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
 		$sql .= ', pac.rowid prod_comb_id';
 	}
 	// Add fields from extrafields
@@ -264,7 +264,7 @@ else
    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
 	// multilang
 	if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang = '".$langs->getDefaultLang() ."'";
-	if (!empty($conf->attributes->enabled) && $search_hidechildproducts && ($type === 0)) {
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
 	}
 
@@ -292,7 +292,7 @@ else
     if ($search_accountancy_code_sell)   $sql.= natural_search('p.accountancy_code_buy', $search_accountancy_code_buy);
     // Add where from extra fields
 
-	if (!empty($conf->attributes->enabled) && $search_hidechildproducts && ($type === 0)) {
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
 		$sql .= " AND pac.rowid IS NULL";
 	}
 
@@ -316,7 +316,7 @@ else
     $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
     $sql.= " p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
     $sql.= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy';
-	if (!empty($conf->attributes->enabled) && $search_hidechildproducts && ($type === 0)) {
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
 		$sql .= ', pac.rowid';
 	}
 	// Add fields from extrafields
@@ -451,7 +451,7 @@ else
     		}
 
 			//Show/hide child products. Hidden by default
-			if (!empty($conf->attributes->enabled) && $type === 0) {
+			if (!empty($conf->variants->enabled) && $type === 0) {
 				$moreforfilter.='<div class="divsearchfield">';
 				$moreforfilter.= '<input type="checkbox" id="search_hidechildproducts" name="search_hidechildproducts" value="on"'.($search_hidechildproducts ? 'checked="checked"' : '').'>';
 				$moreforfilter.= ' <label for="search_hidechildproducts">'.$langs->trans('HideChildProducts').'</label>';
diff --git a/htdocs/attributes/admin/admin.php b/htdocs/variants/admin/admin.php
similarity index 100%
rename from htdocs/attributes/admin/admin.php
rename to htdocs/variants/admin/admin.php
diff --git a/htdocs/attributes/admin/index.html b/htdocs/variants/admin/index.html
similarity index 100%
rename from htdocs/attributes/admin/index.html
rename to htdocs/variants/admin/index.html
diff --git a/htdocs/attributes/ajax/getCombinations.php b/htdocs/variants/ajax/getCombinations.php
similarity index 94%
rename from htdocs/attributes/ajax/getCombinations.php
rename to htdocs/variants/ajax/getCombinations.php
index 5ed3e959ea3..ce2a59c386f 100644
--- a/htdocs/attributes/ajax/getCombinations.php
+++ b/htdocs/variants/ajax/getCombinations.php
@@ -24,7 +24,7 @@ define('NOREQUIRESOC','1');
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 
 header('Content-Type: application/json');
 
diff --git a/htdocs/attributes/ajax/get_attribute_values.php b/htdocs/variants/ajax/get_attribute_values.php
similarity index 90%
rename from htdocs/attributes/ajax/get_attribute_values.php
rename to htdocs/variants/ajax/get_attribute_values.php
index a08126d997a..b3e602bd0f5 100644
--- a/htdocs/attributes/ajax/get_attribute_values.php
+++ b/htdocs/variants/ajax/get_attribute_values.php
@@ -24,8 +24,8 @@ define('NOREQUIRESOC','1');
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttribute.class.php';
-require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttributeValue.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
 
 header('Content-Type: application/json');
 
diff --git a/htdocs/attributes/ajax/index.html b/htdocs/variants/ajax/index.html
similarity index 100%
rename from htdocs/attributes/ajax/index.html
rename to htdocs/variants/ajax/index.html
diff --git a/htdocs/attributes/ajax/orderAttribute.php b/htdocs/variants/ajax/orderAttribute.php
similarity index 95%
rename from htdocs/attributes/ajax/orderAttribute.php
rename to htdocs/variants/ajax/orderAttribute.php
index 6c7eecc9453..95bad6a427d 100644
--- a/htdocs/attributes/ajax/orderAttribute.php
+++ b/htdocs/variants/ajax/orderAttribute.php
@@ -46,7 +46,7 @@ if (isset($_POST['roworder'])) {
 		}
 	}
 
-	require DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttribute.class.php';
+	require DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 
 	ProductAttribute::bulkUpdateOrder($db, $newrowordertab);
 }
diff --git a/htdocs/attributes/card.php b/htdocs/variants/card.php
similarity index 89%
rename from htdocs/attributes/card.php
rename to htdocs/variants/card.php
index 3339a169c89..b49c5092acf 100644
--- a/htdocs/attributes/card.php
+++ b/htdocs/variants/card.php
@@ -26,6 +26,7 @@ $action = GETPOST('action');
 $label = GETPOST('label');
 $ref = GETPOST('ref');
 $confirm = GETPOST('confirm');
+$cancel = GETPOST('cancel');
 
 $prodattr = new ProductAttribute($db);
 $prodattrval = new ProductAttributeValue($db);
@@ -35,6 +36,12 @@ if ($prodattr->fetch($id) < 1) {
 	die;
 }
 
+/*
+ * Actions
+ */
+
+if ($cancel) $action='';
+
 if ($_POST) {
 
 	if ($action == 'edit') {
@@ -46,7 +53,7 @@ if ($_POST) {
 			setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
 		} else {
 			setEventMessage($langs->trans('RecordSaved'));
-			header('Location: '.dol_buildpath('/attributes/card.php?id='.$id, 2));
+			header('Location: '.dol_buildpath('/variants/card.php?id='.$id, 2));
 			die;
 		}
 	} elseif ($action == 'edit_value') {
@@ -63,7 +70,7 @@ if ($_POST) {
 			}
 		}
 
-		header('Location: '.dol_buildpath('/attributes/card.php?id='.$prodattr->id, 2));
+		header('Location: '.dol_buildpath('/variants/card.php?id='.$prodattr->id, 2));
 		die;
 	}
 
@@ -79,11 +86,11 @@ if ($confirm == 'yes') {
 		if ($res < 1 || ($prodattr->delete() < 1)) {
 			$db->rollback();
 			setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
-			header('Location: '.dol_buildpath('/attributes/card.php?id='.$prodattr->id, 2));
+			header('Location: '.dol_buildpath('/variants/card.php?id='.$prodattr->id, 2));
 		} else {
 			$db->commit();
 			setEventMessage($langs->trans('RecordSaved'));
-			header('Location: '.dol_buildpath('/attributes/list.php', 2));
+			header('Location: '.dol_buildpath('/variants/list.php', 2));
 		}
 
 		die;
@@ -97,7 +104,7 @@ if ($confirm == 'yes') {
 				setEventMessage($langs->trans('RecordSaved'));
 			}
 
-			header('Location: '.dol_buildpath('/attributes/card.php?id='.$prodattr->id, 2));
+			header('Location: '.dol_buildpath('/variants/card.php?id='.$prodattr->id, 2));
 			die;
 		}
 	}
@@ -150,7 +157,8 @@ if ($action == 'edit') { ?>
 	<div style="text-align: center;">
 		<div class="inline-block divButAction">
 			<input type="submit" class="button" value="<?php echo $langs->trans('Save') ?>">
-			<a href="card.php?id=<?php echo $prodattr->id ?>" class="butAction"><?php echo $langs->trans('Cancel') ?></a>
+			&nbsp; &nbsp;
+			<input type="submit" class="button" name="cancel" value="<?php echo $langs->trans('Cancel') ?>">
 		</div>
 	</div></form>
 <?php } else {
@@ -212,7 +220,8 @@ if ($action == 'edit') { ?>
 				<td><input type="text" name="value" value="<?php echo $attrval->value ?>"></td>
 				<td style="text-align: right">
 					<input type="submit" value="<?php echo $langs->trans('Save') ?>" class="button">
-					<a href="card.php?id=<?php echo $prodattr->id ?>" class="butAction"><?php echo $langs->trans('Cancel') ?></a>
+					&nbsp; &nbsp; 
+					<input type="submit" name="cancel" value="<?php echo $langs->trans('Cancel') ?>" class="button">
 				</td>
 			<?php else: ?>
 				<td><?php echo dol_htmlentities($attrval->ref) ?></td>
@@ -242,4 +251,4 @@ if ($action == 'edit') { ?>
 	<?php
 }
 
-llxFooter();
\ No newline at end of file
+llxFooter();
diff --git a/htdocs/attributes/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
similarity index 89%
rename from htdocs/attributes/class/ProductAttribute.class.php
rename to htdocs/variants/class/ProductAttribute.class.php
index f563b03cd7e..e9027444e5c 100644
--- a/htdocs/attributes/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -73,7 +73,7 @@ class ProductAttribute
 			return -1;
 		}
 
-		require_once __DIR__.'/../lib/product_attributes.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/lib/product_variants.lib.php';
 
 		$sql = "SELECT rowid, ref, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $id." AND entity IN (".getProductEntities($this->db).")";
 
@@ -94,31 +94,34 @@ class ProductAttribute
 	}
 
 	/**
-	 * Returns an array of all product attributes
+	 * Returns an array of all product variants
 	 *
 	 * @return ProductAttribute[]
 	 */
 	public function fetchAll()
 	{
-		require_once __DIR__.'/../lib/product_attributes.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/lib/product_variants.lib.php';
 
 		$return = array();
 
 		$sql = 'SELECT rowid, ref, label, rang FROM '.MAIN_DB_PREFIX."product_attribute WHERE entity IN (".getProductEntities($this->db).')';
 		$sql .= $this->db->order('rang', 'asc');
 		$query = $this->db->query($sql);
-
-		while ($result = $this->db->fetch_object($query)) {
-
-			$tmp = new ProductAttribute($this->db);
-			$tmp->id = $result->rowid;
-			$tmp->ref = $result->ref;
-			$tmp->label = $result->label;
-			$tmp->rang = $result->rang;
-
-			$return[] = $tmp;
+		if ($query)
+		{
+    		while ($result = $this->db->fetch_object($query)) {
+    
+    			$tmp = new ProductAttribute($this->db);
+    			$tmp->id = $result->rowid;
+    			$tmp->ref = $result->ref;
+    			$tmp->label = $result->label;
+    			$tmp->rang = $result->rang;
+    
+    			$return[] = $tmp;
+    		}
 		}
-
+		else dol_print_error($this->db);
+		
 		return $return;
 	}
 
@@ -187,7 +190,7 @@ class ProductAttribute
 	 */
 	public function countChildProducts()
 	{
-		require_once __DIR__.'/../lib/product_attributes.lib.php';
+		require_once __DIR__.'/../lib/product_variants.lib.php';
 
 		$sql = "SELECT COUNT(*) count FROM ".MAIN_DB_PREFIX."product_attribute_combination2val pac2v
 		LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac2v.fk_prod_combination = pac.rowid WHERE pac2v.fk_prod_attr = ".(int) $this->id." AND pac.entity IN (".getProductEntities($this->db).")";
@@ -200,7 +203,7 @@ class ProductAttribute
 	}
 
 	/**
-	 * Reorders the order of the attributes.
+	 * Reorders the order of the variants.
 	 * This is an internal function used by moveLine function
 	 *
 	 * @return int <0 KO >0 OK
@@ -294,7 +297,7 @@ class ProductAttribute
 	}
 
 	/**
-	 * Updates the order of all attributes. Used by AJAX page for drag&drop
+	 * Updates the order of all variants. Used by AJAX page for drag&drop
 	 *
 	 * @param DoliDB $db Database handler
 	 * @param array $order Array with row id ordered in ascendent mode
diff --git a/htdocs/attributes/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
similarity index 97%
rename from htdocs/attributes/class/ProductAttributeValue.class.php
rename to htdocs/variants/class/ProductAttributeValue.class.php
index 41d1818ee63..e11f612c26a 100644
--- a/htdocs/attributes/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -68,7 +68,7 @@ class ProductAttributeValue
 	 */
 	public function fetch($valueid)
 	{
-		require_once __DIR__.'/../lib/product_attributes.lib.php';
+		require_once __DIR__.'/../lib/product_variants.lib.php';
 
 		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $valueid." AND entity IN (".getProductEntities($this->db).")";
 
@@ -101,7 +101,7 @@ class ProductAttributeValue
 	 */
 	public function fetchAllByProductAttribute($prodattr_id, $only_used = false)
 	{
-		require_once __DIR__.'/../lib/product_attributes.lib.php';
+		require_once __DIR__.'/../lib/product_variants.lib.php';
 
 		$return = array();
 
diff --git a/htdocs/attributes/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
similarity index 93%
rename from htdocs/attributes/class/ProductCombination.class.php
rename to htdocs/variants/class/ProductCombination.class.php
index d5d7b6e81af..240fda0e911 100644
--- a/htdocs/attributes/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -86,7 +86,7 @@ class ProductCombination
 	 */
 	public function fetch($rowid)
 	{
-		require_once __DIR__.'/../lib/product_attributes.lib.php';
+		require_once __DIR__.'/../lib/product_variants.lib.php';
 
 		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE rowid = ".(int) $rowid." AND entity IN (".getProductEntities($this->db).")";
 
@@ -120,7 +120,7 @@ class ProductCombination
 	 */
 	public function fetchByFkProductChild($fk_child)
 	{
-		require_once __DIR__.'/../lib/product_attributes.lib.php';
+		require_once __DIR__.'/../lib/product_variants.lib.php';
 
 		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".(int) $fk_child." AND entity IN (".getProductEntities($this->db).")";
 
@@ -154,7 +154,7 @@ class ProductCombination
 	 */
 	public function fetchAllByFkProductParent($fk_product_parent)
 	{
-		require_once __DIR__.'/../lib/product_attributes.lib.php';
+		require_once __DIR__.'/../lib/product_variants.lib.php';
 
 		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getProductEntities($this->db).")";
 
@@ -361,7 +361,7 @@ class ProductCombination
 	 */
 	public function fetchByProductCombination2ValuePairs($prodid, array $features)
 	{
-		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination2ValuePair.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
 
 		$actual_comp = array();
 
@@ -399,10 +399,10 @@ class ProductCombination
 	 */
 	public function getUniqueAttributesAndValuesByFkProductParent($productid)
 	{
-		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttribute.class.php';
-		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttributeValue.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
 
-		$attributes = array();
+		$variants = array();
 
 		//Attributes
 		$sql = "SELECT DISTINCT fk_prod_attr, a.rang
@@ -432,10 +432,10 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 				$tmp->values[] = $val;
 			}
 
-			$attributes[] = $tmp;
+			$variants[] = $tmp;
 		}
 
-		return $attributes;
+		return $variants;
 	}
 
 	/**
@@ -459,12 +459,12 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 	 * @param bool|float $forced_weightvar If the weight variation is forced
 	 * @return int <0 KO, >0 OK
 	 */
-	public static function createProductCombination(Product $product, array $combinations, array $variations, $price_var_percent = false, $forced_pricevar = false, $forced_weightvar = false)
+	public function createProductCombination(Product $product, array $combinations, array $variations, $price_var_percent = false, $forced_pricevar = false, $forced_weightvar = false)
 	{
 		global $db, $user;
 
-		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttribute.class.php';
-		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttributeValue.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
 
 		$db->begin();
 
@@ -552,6 +552,8 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 
 			//In case the error is not related with an already existing product
 			if ($newproduct->error != 'ErrorProductAlreadyExists') {
+			    $this->error[] = $newproduct->error;
+			    $this->errors = $newproduct->errors;
 				$db->rollback();
 				return -1;
 			}
@@ -572,6 +574,7 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 					$res = $newproduct->create($user);
 
 					if ($newproduct->error != 'ErrorProductAlreadyExists') {
+					    $this->errors[] = $newproduct->error;
 						break;
 					}
 
@@ -607,7 +610,7 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 	 */
 	public function copyAll($origProductId, Product $destProduct)
 	{
-		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination2ValuePair.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
 
 		//To prevent a loop
 		if ($origProductId == $destProduct->id) {
diff --git a/htdocs/attributes/class/ProductCombination2ValuePair.class.php b/htdocs/variants/class/ProductCombination2ValuePair.class.php
similarity index 95%
rename from htdocs/attributes/class/ProductCombination2ValuePair.class.php
rename to htdocs/variants/class/ProductCombination2ValuePair.class.php
index 01bd0952d2d..874cedb101a 100644
--- a/htdocs/attributes/class/ProductCombination2ValuePair.class.php
+++ b/htdocs/variants/class/ProductCombination2ValuePair.class.php
@@ -64,8 +64,8 @@ class ProductCombination2ValuePair
 	 */
 	public function __toString()
 	{
-		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttributeValue.class.php';
-		require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttribute.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 
 		$prodattr = new ProductAttribute($this->db);
 		$prodattrval = new ProductAttributeValue($this->db);
diff --git a/htdocs/attributes/class/index.html b/htdocs/variants/class/index.html
similarity index 100%
rename from htdocs/attributes/class/index.html
rename to htdocs/variants/class/index.html
diff --git a/htdocs/attributes/combinations.php b/htdocs/variants/combinations.php
similarity index 89%
rename from htdocs/attributes/combinations.php
rename to htdocs/variants/combinations.php
index b8a758c2341..5cce16c4029 100644
--- a/htdocs/attributes/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -19,10 +19,10 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttribute.class.php';
-require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttributeValue.class.php';
-require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
-require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination2ValuePair.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
 
 $langs->load("products");
 $langs->load("other");
@@ -102,7 +102,7 @@ if ($_POST) {
 				if (ProductCombination::createProductCombination($product, $sanit_features, array(), $price_impact_percent, $price_impact, $weight_impact)) {
 					$db->commit();
 					setEventMessage($langs->trans('RecordSaved'));
-					header('Location: '.dol_buildpath('/attributes/combinations.php?id='.$id, 2));
+					header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2));
 					die;
 				} else {
 					setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
@@ -180,7 +180,7 @@ if ($_POST) {
 
 		if ($prodcomb->update() > 0) {
 			setEventMessage($langs->trans('RecordSaved'));
-			header('Location: '.dol_buildpath('/attributes/combinations.php?id='.$id, 2));
+			header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2));
 			die;
 		} else {
 			setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
@@ -199,7 +199,7 @@ if ($action === 'confirm_deletecombination') {
 		if ($prodcomb->delete() > 0 && $prodstatic->fetch($prodcomb->fk_product_child) > 0 && $prodstatic->delete() > 0) {
 			$db->commit();
 			setEventMessage($langs->trans('RecordSaved'));
-			header('Location: '.dol_buildpath('/attributes/combinations.php?id='.$product->id, 2));
+			header('Location: '.dol_buildpath('/variants/combinations.php?id='.$product->id, 2));
 			die;
 		}
 
@@ -229,7 +229,7 @@ if ($action === 'confirm_deletecombination') {
 		//To prevent from copying to the same product
 		if ($prodstatic->ref != $product->ref) {
 			if ($prodcomb->copyAll($product->id, $prodstatic) > 0) {
-				header('Location: '.dol_buildpath('/attributes/combinations.php?id='.$prodstatic->id, 2));
+				header('Location: '.dol_buildpath('/variants/combinations.php?id='.$prodstatic->id, 2));
 				die;
 			} else {
 				setEventMessage($langs->trans('ErrorCopyProductCombinations'), 'errors');
@@ -313,8 +313,8 @@ if (! empty($id) || ! empty($ref)) {
 
 		<script>
 
-			attributes_available = <?php echo json_encode($prodattr_alljson) ?>;
-			attributes_selected = {
+			variants_available = <?php echo json_encode($prodattr_alljson) ?>;
+			variants_selected = {
 				index: [],
 				info: []
 			};
@@ -322,9 +322,9 @@ if (! empty($id) || ! empty($ref)) {
 			<?php foreach ($productCombination2ValuePairs1 as $pc2v):
 			$prodattr_val->fetch($pc2v->fk_prod_attr_val);
 			?>
-			attributes_selected.index.push(<?php echo $pc2v->fk_prod_attr ?>);
-			attributes_selected.info[<?php echo $pc2v->fk_prod_attr ?>] = {
-				attribute: attributes_available[<?php echo $pc2v->fk_prod_attr ?>],
+			variants_selected.index.push(<?php echo $pc2v->fk_prod_attr ?>);
+			variants_selected.info[<?php echo $pc2v->fk_prod_attr ?>] = {
+				attribute: variants_available[<?php echo $pc2v->fk_prod_attr ?>],
 				value: {
 					id: <?php echo $pc2v->fk_prod_attr_val ?>,
 					label: '<?php echo $prodattr_val->value ?>'
@@ -335,8 +335,8 @@ if (! empty($id) || ! empty($ref)) {
 			restoreAttributes = function() {
 				jQuery("select[name=attribute]").empty().append('<option value=""></option>');
 
-				jQuery.each(attributes_available, function (key, val) {
-					if (jQuery.inArray(val.id, attributes_selected.index) == -1) {
+				jQuery.each(variants_available, function (key, val) {
+					if (jQuery.inArray(val.id, variants_selected.index) == -1) {
 						jQuery("select[name=attribute]").append('<option value="' + val.id + '">' + val.label + '</option>');
 					}
 				});
@@ -348,8 +348,8 @@ if (! empty($id) || ! empty($ref)) {
 				select.empty();
 				jQuery("form#combinationform input[type=hidden]").detach();
 
-				jQuery.each(attributes_selected.index, function (key, val) {
-					var attr_info = attributes_selected.info[val];
+				jQuery.each(variants_selected.index, function (key, val) {
+					var attr_info = variants_selected.info[val];
 
 					var opt_key = val + ':' + attr_info.value.id;
 					var opt_label = attr_info.attribute.label + ': ' + attr_info.value.label;
@@ -374,7 +374,7 @@ if (! empty($id) || ! empty($ref)) {
 
 					select.empty().append('<option value="">Loading...</option>');
 
-					jQuery.getJSON("<?php echo dol_buildpath('/attributes/ajax/get_attribute_values.php', 2) ?>", {
+					jQuery.getJSON("<?php echo dol_buildpath('/variants/ajax/get_attribute_values.php', 2) ?>", {
 						id: jQuery(this).val()
 					}, function(data) {
 						if (data.error) {
@@ -400,13 +400,13 @@ if (! empty($id) || ! empty($ref)) {
 
 					var selectedattr_val = parseInt(selectedattr.val());
 
-					if (jQuery.inArray(selectedattr_val, attributes_selected.index) != -1) {
+					if (jQuery.inArray(selectedattr_val, variants_selected.index) != -1) {
 						return;
 					}
 
-					attributes_selected.index.push(selectedattr_val);
-					attributes_selected.info[selectedattr_val] = {
-						attribute: attributes_available[selectedattr_val],
+					variants_selected.index.push(selectedattr_val);
+					variants_selected.info[selectedattr_val] = {
+						attribute: variants_available[selectedattr_val],
 						value: {
 							id: selectedvalu.val(),
 							label: selectedvalu.html()
@@ -422,11 +422,11 @@ if (! empty($id) || ! empty($ref)) {
 				jQuery("#delfeature").click(function() {
 					jQuery("#features option:selected").each(function (key, val) {
 						var explode = jQuery(val).val().split(':');
-						var indexOf = attributes_selected.index.indexOf(parseInt(explode[0]));
+						var indexOf = variants_selected.index.indexOf(parseInt(explode[0]));
 
 						if (indexOf != -1) {
-							attributes_selected.index.splice(indexOf, 1);
-							jQuery(attributes_selected.info[parseInt(explode[0])]).detach();
+							variants_selected.index.splice(indexOf, 1);
+							jQuery(variants_selected.info[parseInt(explode[0])]).detach();
 						}
 
 						jQuery(val).detach();
@@ -505,7 +505,7 @@ if (! empty($id) || ! empty($ref)) {
 				print $form->formconfirm(
 					"combinations.php?id=".$id."&valueid=".$valueid,
 					$langs->trans('Delete'),
-					$langs->trans('ProductCombinationDeleteDialog', $prodstatic->getNomUrl(1)),
+					$langs->trans('ProductCombinationDeleteDialog', $prodstatic->ref),
 					"confirm_deletecombination",
 					'',
 					0,
@@ -568,7 +568,7 @@ if (! empty($id) || ! empty($ref)) {
 			<option value="delete"><?php echo $langs->trans('Delete') ?></option>
 		</select>
 		<input type="hidden" name="action" value="bulk_actions">
-		<input type="submit" value="Aplicar" class="button">
+		<input type="submit" value="<?php echo $langs->trans("Apply") ?>" class="button">
 		<br>
 		<br>
 		<?php endif; ?>
@@ -612,8 +612,8 @@ if (! empty($id) || ! empty($ref)) {
 				<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 0) ?></td>
 				<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 1) ?></td>
 				<td style="text-align: right">
-					<a href="<?php echo dol_buildpath('/attributes/combinations.php?id='.$id.'&action=edit&valueid='.$currcomb->id, 2) ?>"><?php echo img_edit() ?></a>
-					<a href="<?php echo dol_buildpath('/attributes/combinations.php?id='.$id.'&action=delete&valueid='.$currcomb->id, 2) ?>"><?php echo img_delete() ?></a>
+					<a href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=edit&valueid='.$currcomb->id, 2) ?>"><?php echo img_edit() ?></a>
+					<a href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=delete&valueid='.$currcomb->id, 2) ?>"><?php echo img_delete() ?></a>
 				</td>
 			</tr>
 			<?php $var = !$var; endforeach ?>
diff --git a/htdocs/attributes/create.php b/htdocs/variants/create.php
similarity index 96%
rename from htdocs/attributes/create.php
rename to htdocs/variants/create.php
index 5b68ed28907..0cd68cb4d02 100644
--- a/htdocs/attributes/create.php
+++ b/htdocs/variants/create.php
@@ -34,7 +34,7 @@ if ($_POST) {
 
 		if ($prodattr->create()) {
 			setEventMessage($langs->trans('RecordSaved'));
-			header('Location: '.dol_buildpath('/attributes/list.php', 2));
+			header('Location: '.dol_buildpath('/variants/list.php', 2));
 		} else {
 			setEventMessage($langs->trans('ErrorRecordAlreadyExists'), 'errors');
 		}
diff --git a/htdocs/attributes/create_val.php b/htdocs/variants/create_val.php
similarity index 97%
rename from htdocs/attributes/create_val.php
rename to htdocs/variants/create_val.php
index b25e24fa64a..e95e9c1f89b 100644
--- a/htdocs/attributes/create_val.php
+++ b/htdocs/variants/create_val.php
@@ -44,7 +44,7 @@ if ($_POST) {
 
 		if ($prodattrval->create() > 0) {
 			setEventMessage($langs->trans('RecordSaved'));
-			header('Location: '.dol_buildpath('/attributes/card.php?id='.$prodattr->id, 2));
+			header('Location: '.dol_buildpath('/variants/card.php?id='.$prodattr->id, 2));
 			die;
 		} else {
 			setEventMessage($langs->trans('ErrorCreatingProductAttributeValue'), 'errors');
diff --git a/htdocs/attributes/generator.php b/htdocs/variants/generator.php
similarity index 93%
rename from htdocs/attributes/generator.php
rename to htdocs/variants/generator.php
index 37f2175cc49..e8dcfca85c7 100644
--- a/htdocs/attributes/generator.php
+++ b/htdocs/variants/generator.php
@@ -19,10 +19,10 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttribute.class.php';
-require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductAttributeValue.class.php';
-require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination.class.php';
-require_once DOL_DOCUMENT_ROOT.'/attributes/class/ProductCombination2ValuePair.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
 
 $langs->load("products");
 $langs->load('other');
@@ -103,22 +103,21 @@ if ($_POST) {
 
 			$res = 1;
 
-			foreach (cartesianArray($adapted_values) as $currcomb) {
-
-				$res = ProductCombination::createProductCombination($product, $currcomb, $sanitized_values, $price_var_percent);
-
+			foreach (cartesianArray($adapted_values) as $currcomb) 
+			{
+				$res = $combination->createProductCombination($product, $currcomb, $sanitized_values, $price_var_percent);
 				if ($res < 0) {
-					break;
+				    $error++;
+				    setEventMessages($combination->error, $combination->errors, 'errors');
+				    break;
 				}
 			}
 
 			if ($res > 0) {
 				$db->commit();
 				setEventMessage($langs->trans('RecordSaved'));
-				header('Location: '.dol_buildpath('/attributes/combinations.php?id='.$id, 2));
-				die;
-			} else {
-				setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
+				header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2));
+				exit;
 			}
 		} else {
 			setEventMessage($langs->trans('ErrorDeletingGeneratedProducts'), 'errors');
diff --git a/htdocs/attributes/index.html b/htdocs/variants/index.html
similarity index 100%
rename from htdocs/attributes/index.html
rename to htdocs/variants/index.html
diff --git a/htdocs/attributes/lib/index.html b/htdocs/variants/lib/index.html
similarity index 100%
rename from htdocs/attributes/lib/index.html
rename to htdocs/variants/lib/index.html
diff --git a/htdocs/attributes/lib/product_attributes.lib.php b/htdocs/variants/lib/product_variants.lib.php
similarity index 100%
rename from htdocs/attributes/lib/product_attributes.lib.php
rename to htdocs/variants/lib/product_variants.lib.php
diff --git a/htdocs/attributes/list.php b/htdocs/variants/list.php
similarity index 93%
rename from htdocs/attributes/list.php
rename to htdocs/variants/list.php
index 3c4cf945524..896641a45fe 100644
--- a/htdocs/attributes/list.php
+++ b/htdocs/variants/list.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,12 +16,18 @@
  */
 
 require '../main.inc.php';
-require 'class/ProductAttribute.class.php';
+require DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 
 $rowid = GETPOST('rowid');
 $action = GETPOST('action');
 $object = new ProductAttribute($db);
 
+
+
+/*
+ * Actions
+ */
+
 if ($action == 'up') {
 	$object->fetch($rowid);
 	$object->moveUp();
@@ -37,12 +42,18 @@ if ($action == 'up') {
 	die;
 }
 
+
+
+/*
+ * View
+ */
+
 $langs->load('products');
 
 $var = false;
 $title = $langs->trans($langs->trans('ProductAttributes'));
 
-$attributes = $object->fetchAll();
+$variants = $object->fetchAll();
 
 llxHeader('', $title);
 
@@ -71,7 +82,7 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 					console.log('drop');
 					var reloadpage = "<?php echo $forcereloadpage; ?>";
 					var roworder = cleanSerialize($("#tablelines").tableDnDSerialize());
-					$.post("<?php echo DOL_URL_ROOT; ?>/attributes/ajax/orderAttribute.php",
+					$.post("<?php echo DOL_URL_ROOT; ?>/variants/ajax/orderAttribute.php",
 						{
 							roworder: roworder
 						},
@@ -101,7 +112,7 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 			<th class="liste_titre"><?php print $langs->trans('NbProducts') ?></th>
 			<th class="liste_titre" colspan="2"></th>
 		</tr>
-		<?php foreach ($attributes as $key => $attribute): ?>
+		<?php foreach ($variants as $key => $attribute): ?>
 		<tr id="row-<?php echo $attribute->id ?>" <?php echo $bcdd[$var] ?>>
 			<td><a href="card.php?id=<?php echo $attribute->id ?>"><?php echo dol_htmlentities($attribute->ref) ?></a></td>
 			<td><a href="card.php?id=<?php echo $attribute->id ?>"><?php echo dol_htmlentities($attribute->label) ?></a></td>
@@ -115,7 +126,7 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 				<a class="lineupdown"
 				   href="<?php echo $_SERVER['PHP_SELF'] ?>?action=up&amp;rowid=<?php echo $attribute->id ?>"><?php echo img_up('default', 0, 'imgupforline'); ?></a>
 				<?php endif ?>
-				<?php if ($key < count($attributes)-1): ?>
+				<?php if ($key < count($variants)-1): ?>
 				<a class="lineupdown"
 				   href="<?php echo $_SERVER['PHP_SELF'] ?>?action=down&amp;rowid=<?php echo $attribute->id ?>"><?php echo img_down('default', 0, 'imgdownforline'); ?></a>
 				<?php endif ?>
@@ -128,8 +139,6 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 
 	</table>
 
-	<br>
-
 	<div class="tabsAction">
 		<div class="inline-block divButAction">
 		<a href="create.php" class="butAction"><?php echo $langs->trans('Create') ?></a>

From ae3ace7e943537ba04e3ceea0cbc9c1c6e142969 Mon Sep 17 00:00:00 2001
From: Andreas Pachler <apachler@paan-systems.com>
Date: Wed, 8 Feb 2017 12:46:42 +0100
Subject: [PATCH 0226/1163] added additional payment terms often needed in
 Austria

---
 htdocs/install/mysql/data/llx_c_payment_term.sql |  6 ++++++
 htdocs/install/mysql/migration/4.0.0-5.0.0.sql   |  8 +++++++-
 htdocs/langs/de_DE/bills.lang                    |  8 ++++++++
 htdocs/langs/en_US/bills.lang                    |  8 ++++++++
 htdocs/langs/fr_FR/bills.lang                    | 10 +++++++++-
 5 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql
index 783bf1e0daf..86a5078a4ef 100644
--- a/htdocs/install/mysql/data/llx_c_payment_term.sql
+++ b/htdocs/install/mysql/data/llx_c_payment_term.sql
@@ -35,3 +35,9 @@ insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_
 insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (6,'PT_ORDER',    6,1, 'A réception de commande','A réception de commande',0,1);
 insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (7,'PT_DELIVERY', 7,1, 'Livraison','Règlement à la livraison',0,1);
 insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (8,'PT_5050',     8,1, '50 et 50','Règlement 50% à la commande, 50% à la livraison',0,1);
+
+-- add additional payment terms often needed in Austria
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9,'10D',         2,1, '30 jours','Réglement à 10 jours',0,10);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 10 jours fin de mois',1,10);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D',         2,1, '30 jours','Réglement à 14 jours',0,14);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 14 jours fin de mois',1,14);
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index 16a9b566bf5..b8441ac4190 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -286,4 +286,10 @@ CREATE TABLE llx_product_attribute_value
   value VARCHAR(255) DEFAULT NULL,
   entity INT DEFAULT 1 NOT NULL
 );
-ALTER TABLE llx_product_attribute_value ADD CONSTRAINT unique_ref UNIQUE (fk_product_attribute,ref);
\ No newline at end of file
+ALTER TABLE llx_product_attribute_value ADD CONSTRAINT unique_ref UNIQUE (fk_product_attribute,ref);
+
+-- add additional payment terms often needed in Austria
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9,'10D',         2,1, '30 jours','Réglement à 10 jours',0,10);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 10 jours fin de mois',1,10);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D',         2,1, '30 jours','Réglement à 14 jours',0,14);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 14 jours fin de mois',1,14);
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 261da362f7a..00d5052330c 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -351,6 +351,14 @@ PaymentConditionShortPT_ORDER=Bestellung
 PaymentConditionPT_ORDER=Bei Bestellung
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% im Voraus, 50%% bei Lieferung
+PaymentConditionShort10D=10 Tage
+PaymentCondition10D=10 Tage netto
+PaymentConditionShort10DENDMONTH=10 Tage ab Monatsende
+PaymentCondition10DENDMONTH=Innerhalb von 10 Tagen, nach Monatsende
+PaymentConditionShort14D=14 Tage
+PaymentCondition14D=14 Tage netto
+PaymentConditionShort14DENDMONTH=14 Tage ab Monatsende
+PaymentCondition14DENDMONTH=Innerhalb von 14 Tagen, nach Monatsende
 FixAmount=Fester Betrag
 VarAmount=Variabler Betrag (%% tot.)
 # PaymentType
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 837d09a79b3..1cd65446b90 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -355,6 +355,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+PaymentConditionShort10D=10 days
+PaymentCondition10D=10 days
+PaymentConditionShort10DENDMONTH=10 days of month-end
+PaymentCondition10DENDMONTH=Within 10 days following the end of the month
+PaymentConditionShort14D=14 days
+PaymentCondition14D=14 days
+PaymentConditionShort14DENDMONTH=14 days of month-end
+PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 7f58225576a..f0473d737fa 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -351,6 +351,14 @@ PaymentConditionShortPT_ORDER=A commande
 PaymentConditionPT_ORDER=À réception de commande
 PaymentConditionShortPT_5050=50/50
 PaymentConditionPT_5050=Règlement 50%% d'avance, 50%% à la livraison
+PaymentConditionShort10D=10 jours
+PaymentCondition10D=Règlement à 10 jours
+PaymentConditionShort10DENDMONTH=10 jours fin de mois
+PaymentCondition10DENDMONTH=Règlement à 10 jours fin de mois
+PaymentConditionShort14D=14 jours
+PaymentCondition14D=Règlement à 14 jours
+PaymentConditionShort14DENDMONTH=14 jours fin de mois
+PaymentCondition14DENDMONTH=Règlement à 14 jours fin de mois
 FixAmount=Montant Fixe
 VarAmount=Montant variable (%% tot.)
 # PaymentType
@@ -492,4 +500,4 @@ ConfirmDeleteRepeatableInvoice=Est-ce votre sûr de vouloir supprimer la facture
 CreateOneBillByThird=Créer une facture par tiers (sinon, une facture par commande)
 BillCreated=%s facture(s) créée(s)
 WithdrawRequest=Demande de prélèvement
-BadPaymentMethod=Mauvais mode de paiement
\ No newline at end of file
+BadPaymentMethod=Mauvais mode de paiement

From d5b10a18b79ca4c816581b7b9e65e2e66025580f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 8 Feb 2017 12:52:31 +0100
Subject: [PATCH 0227/1163] Debug module variant

---
 htdocs/core/actions_builddoc.inc.php          |  2 +-
 htdocs/core/class/html.formfile.class.php     |  4 +-
 htdocs/public/opensurvey/studs.php            |  4 +-
 htdocs/variants/ajax/getCombinations.php      |  2 +-
 htdocs/variants/ajax/get_attribute_values.php |  6 +-
 htdocs/variants/card.php                      | 10 +-
 htdocs/variants/combinations.php              | 97 +++++++++----------
 htdocs/variants/create_val.php                |  4 +-
 htdocs/variants/generator.php                 |  2 +-
 htdocs/variants/list.php                      |  4 +-
 10 files changed, 64 insertions(+), 71 deletions(-)

diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index dc91cbd0404..adbc17a4161 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -93,7 +93,7 @@ if ($action == 'builddoc' && $permissioncreate)
             setEventMessages($langs->trans("FileGenerated"), null);
 
             header('Location: '.$_SERVER['REQUEST_URI'].'#builddoc');
-            die;
+            exit;
         }
     }
 }
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 16aa9332232..83e913f9718 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -35,9 +35,9 @@
 class FormFile
 {
     private $db;
-    private $numoffiles;
     
-    public $error;   
+    public $error;
+    public $numoffiles;
     public $infofiles;			// Used to return informations by function getDocumentsLink
 
 
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 6f242a00544..070c739e85c 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -248,7 +248,7 @@ if (empty($object->ref))     // For survey, id is a hex string
     llxFooterSurvey();
 
     $db->close();
-    exit;
+    exit();
 }
 
 // Define format of choices
@@ -287,7 +287,7 @@ if (!$canbemodified) {
 	llxFooterSurvey();
 
 	$db->close();
-	die;
+	exit;
 }
 
 print '<form name="formulaire" action="studs.php?sondage='.$numsondage.'"'.'#bas" method="POST">'."\n";
diff --git a/htdocs/variants/ajax/getCombinations.php b/htdocs/variants/ajax/getCombinations.php
index ce2a59c386f..8b7baaee27e 100644
--- a/htdocs/variants/ajax/getCombinations.php
+++ b/htdocs/variants/ajax/getCombinations.php
@@ -34,7 +34,7 @@ if (!$id) {
 	print json_encode(array(
 		'error' => 'ID not set'
 	));
-	die;
+	exit();
 }
 
 $product = new Product($db);
diff --git a/htdocs/variants/ajax/get_attribute_values.php b/htdocs/variants/ajax/get_attribute_values.php
index b3e602bd0f5..6f3571c1856 100644
--- a/htdocs/variants/ajax/get_attribute_values.php
+++ b/htdocs/variants/ajax/get_attribute_values.php
@@ -35,7 +35,7 @@ if (!$id) {
 	print json_encode(array(
 		'error' => 'ID not set'
 	));
-	die;
+	exit();
 }
 
 $prodattr = new ProductAttribute($db);
@@ -44,7 +44,7 @@ if ($prodattr->fetch($id) < 0) {
 	print json_encode(array(
 		'error' => 'Attribute not found'
 	));
-	die;
+	exit();
 }
 
 $prodattrval = new ProductAttributeValue($db);
@@ -55,7 +55,7 @@ if ($res == -1) {
 	print json_encode(array(
 		'error' => 'Internal error'
 	));
-	die;
+	exit();
 }
 
 print json_encode($res);
\ No newline at end of file
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index b49c5092acf..a80b6b982e3 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -33,7 +33,7 @@ $prodattrval = new ProductAttributeValue($db);
 
 if ($prodattr->fetch($id) < 1) {
 	dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
-	die;
+	exit();
 }
 
 /*
@@ -54,7 +54,7 @@ if ($_POST) {
 		} else {
 			setEventMessage($langs->trans('RecordSaved'));
 			header('Location: '.dol_buildpath('/variants/card.php?id='.$id, 2));
-			die;
+			exit();
 		}
 	} elseif ($action == 'edit_value') {
 
@@ -71,7 +71,7 @@ if ($_POST) {
 		}
 
 		header('Location: '.dol_buildpath('/variants/card.php?id='.$prodattr->id, 2));
-		die;
+		exit();
 	}
 
 }
@@ -93,7 +93,7 @@ if ($confirm == 'yes') {
 			header('Location: '.dol_buildpath('/variants/list.php', 2));
 		}
 
-		die;
+		exit();
 	} elseif ($action == 'confirm_deletevalue') {
 
 		if ($prodattrval->fetch($valueid) > 0) {
@@ -105,7 +105,7 @@ if ($confirm == 'yes') {
 			}
 
 			header('Location: '.dol_buildpath('/variants/card.php?id='.$prodattr->id, 2));
-			die;
+			exit();
 		}
 	}
 }
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 5cce16c4029..477108f9998 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -46,15 +46,22 @@ $prodstatic = new Product($db);
 $prodattr = new ProductAttribute($db);
 $prodattr_val = new ProductAttributeValue($db);
 
-$product = new Product($db);
-
-$product->fetch($id);
-
-if (!$product->isProduct()) {
-	header('Location: '.dol_buildpath('/product/card.php?id='.$product->id, 2));
-	die;
+$object = new Product($db);
+if ($id > 0 || $ref)
+{
+    $object->fetch($id, $ref);
 }
 
+/*
+ * Actions
+ */
+
+if (! $object->isProduct()) {
+	header('Location: '.dol_buildpath('/product/card.php?id='.$object->id, 2));
+	exit();
+}
+
+
 $prodcomb = new ProductCombination($db);
 $prodcomb2val = new ProductCombination2ValuePair($db);
 
@@ -103,7 +110,7 @@ if ($_POST) {
 					$db->commit();
 					setEventMessage($langs->trans('RecordSaved'));
 					header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2));
-					die;
+					exit();
 				} else {
 					setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
 				}
@@ -171,7 +178,7 @@ if ($_POST) {
 
 		if ($prodcomb->fetch($valueid) < 0) {
 			dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
-			die;
+			exit();
 		}
 
 		$prodcomb->variation_price_percentage = $price_impact_percent;
@@ -181,14 +188,14 @@ if ($_POST) {
 		if ($prodcomb->update() > 0) {
 			setEventMessage($langs->trans('RecordSaved'));
 			header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2));
-			die;
+			exit();
 		} else {
 			setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
 		}
 	}
 }
 
-$productCombinations = $prodcomb->fetchAllByFkProductParent($id);
+$productCombinations = $prodcomb->fetchAllByFkProductParent($object->id);
 
 if ($action === 'confirm_deletecombination') {
 
@@ -199,8 +206,8 @@ if ($action === 'confirm_deletecombination') {
 		if ($prodcomb->delete() > 0 && $prodstatic->fetch($prodcomb->fk_product_child) > 0 && $prodstatic->delete() > 0) {
 			$db->commit();
 			setEventMessage($langs->trans('RecordSaved'));
-			header('Location: '.dol_buildpath('/variants/combinations.php?id='.$product->id, 2));
-			die;
+			header('Location: '.dol_buildpath('/variants/combinations.php?id='.$object->id, 2));
+			exit();
 		}
 
 		$db->rollback();
@@ -211,7 +218,7 @@ if ($action === 'confirm_deletecombination') {
 
 	if ($prodcomb->fetch($valueid) < 0) {
 		dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
-		die;
+		exit();
 	}
 
 	$weight_impact = $prodcomb->variation_weight;
@@ -227,10 +234,10 @@ if ($action === 'confirm_deletecombination') {
 	if ($prodstatic->fetch('', $dest_product) > 0) {
 
 		//To prevent from copying to the same product
-		if ($prodstatic->ref != $product->ref) {
-			if ($prodcomb->copyAll($product->id, $prodstatic) > 0) {
+		if ($prodstatic->ref != $object->ref) {
+			if ($prodcomb->copyAll($object->id, $prodstatic) > 0) {
 				header('Location: '.dol_buildpath('/variants/combinations.php?id='.$prodstatic->id, 2));
-				die;
+				exit();
 			} else {
 				setEventMessage($langs->trans('ErrorCopyProductCombinations'), 'errors');
 			}
@@ -242,47 +249,31 @@ if ($action === 'confirm_deletecombination') {
 
 }
 
+
+
 /*
  *	View
  */
 
 if (! empty($id) || ! empty($ref)) {
-	$object = new Product($db);
-	$result = $object->fetch($id, $ref);
 
 	llxHeader("", "", $langs->trans("CardProduct".$object->type));
 
-	if ($result) {
-		$head = product_prepare_head($object);
-		$titre = $langs->trans("CardProduct".$object->type);
-		$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
-
-		dol_fiche_head($head, 'combinations', $titre, 0, $picto);
-
-		print '<table class="border" width="100%">';
-
-		// Reference
-		print '<tr>';
-		print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
-		print $form->showrefnav($object, 'id', '', 0);
-		print '</td>';
-		print '</tr>';
-
-		// Label
-		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
-
-		// Status (to sell)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
-		print $object->getLibStatut(2, 0);
-		print '</td></tr>';
-
-		// Status (to buy)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td>';
-		print $object->getLibStatut(2, 1);
-		print '</td></tr>';
-
-		print '</table>';
-
+	if ($result) 
+	{
+	    $showbarcode=empty($conf->barcode->enabled)?0:1;
+	    if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+	    
+	    $head=product_prepare_head($object);
+	    $titre=$langs->trans("CardProduct".$object->type);
+	    $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
+	    dol_fiche_head($head, 'combinations', $titre, 0, $picto);
+	    
+	    $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
+	    $object->next_prev_filter=" fk_product_type = ".$object->type;
+	    
+	    dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1);
+	     
 		dol_fiche_end();
 	}
 
@@ -535,7 +526,9 @@ if (! empty($id) || ! empty($ref)) {
 
 		$comb2val = new ProductCombination2ValuePair($db);
 
-		if ($productCombinations): ?>
+		if ($productCombinations) 
+		{
+		?>
 
 			<script type="text/javascript">
 				jQuery(document).ready(function() {
@@ -571,7 +564,7 @@ if (! empty($id) || ! empty($ref)) {
 		<input type="submit" value="<?php echo $langs->trans("Apply") ?>" class="button">
 		<br>
 		<br>
-		<?php endif; ?>
+		<?php } ?>
 
 		<table class="liste">
 			<tr class="liste_titre">
diff --git a/htdocs/variants/create_val.php b/htdocs/variants/create_val.php
index e95e9c1f89b..a5ee085cf40 100644
--- a/htdocs/variants/create_val.php
+++ b/htdocs/variants/create_val.php
@@ -29,7 +29,7 @@ $prodattrval = new ProductAttributeValue($db);
 
 if ($prodattr->fetch($id) < 1) {
 	dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
-	die;
+	exit();
 }
 
 if ($_POST) {
@@ -45,7 +45,7 @@ if ($_POST) {
 		if ($prodattrval->create() > 0) {
 			setEventMessage($langs->trans('RecordSaved'));
 			header('Location: '.dol_buildpath('/variants/card.php?id='.$prodattr->id, 2));
-			die;
+			exit();
 		} else {
 			setEventMessage($langs->trans('ErrorCreatingProductAttributeValue'), 'errors');
 		}
diff --git a/htdocs/variants/generator.php b/htdocs/variants/generator.php
index e8dcfca85c7..b709f240551 100644
--- a/htdocs/variants/generator.php
+++ b/htdocs/variants/generator.php
@@ -44,7 +44,7 @@ $product->fetch($id);
 
 if (!$product->isProduct()) {
 	header('Location: '.dol_buildpath('/product/card.php?id='.$product->id, 2));
-	die;
+	exit();
 }
 
 /**
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 896641a45fe..6a6d02178e8 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -33,13 +33,13 @@ if ($action == 'up') {
 	$object->moveUp();
 
 	header('Location: '.$_SERVER['PHP_SELF']);
-	die;
+	exit();
 } elseif ($action == 'down') {
 	$object->fetch($rowid);
 	$object->moveDown();
 
 	header('Location: '.$_SERVER['PHP_SELF']);
-	die;
+	exit();
 }
 
 

From c45b40075d39ab6366abcba93191a5c814118007 Mon Sep 17 00:00:00 2001
From: Andreas Pachler <apachler@paan-systems.com>
Date: Wed, 8 Feb 2017 12:55:03 +0100
Subject: [PATCH 0228/1163] fixed typos

---
 htdocs/install/mysql/data/llx_c_payment_term.sql | 8 ++++----
 htdocs/install/mysql/migration/4.0.0-5.0.0.sql   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql
index 86a5078a4ef..c7fd08a62d6 100644
--- a/htdocs/install/mysql/data/llx_c_payment_term.sql
+++ b/htdocs/install/mysql/data/llx_c_payment_term.sql
@@ -37,7 +37,7 @@ insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_
 insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (8,'PT_5050',     8,1, '50 et 50','Règlement 50% à la commande, 50% à la livraison',0,1);
 
 -- add additional payment terms often needed in Austria
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9,'10D',         2,1, '30 jours','Réglement à 10 jours',0,10);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 10 jours fin de mois',1,10);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D',         2,1, '30 jours','Réglement à 14 jours',0,14);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 14 jours fin de mois',1,14);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9,'10D',         9,1, '10 jours','Réglement à 10 jours',0,10);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 10,1, '10 jours fin de mois','Réglement à 10 jours fin de mois',1,10);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D',         11,1, '14 jours','Réglement à 14 jours',0,14);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 12,1, '14 jours fin de mois','Réglement à 14 jours fin de mois',1,14);
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index b8441ac4190..29832ee6765 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -289,7 +289,7 @@ CREATE TABLE llx_product_attribute_value
 ALTER TABLE llx_product_attribute_value ADD CONSTRAINT unique_ref UNIQUE (fk_product_attribute,ref);
 
 -- add additional payment terms often needed in Austria
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9,'10D',         2,1, '30 jours','Réglement à 10 jours',0,10);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 10 jours fin de mois',1,10);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D',         2,1, '30 jours','Réglement à 14 jours',0,14);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 14 jours fin de mois',1,14);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9,'10D',         9,1, '10 jours','Réglement à 10 jours',0,10);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 10,1, '10 jours fin de mois','Réglement à 10 jours fin de mois',1,10);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D',         11,1, '14 jours','Réglement à 14 jours',0,14);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 12,1, '14 jours fin de mois','Réglement à 14 jours fin de mois',1,14);

From 6fef6ac2fb724e4f3c66f66753cbf875e064e30c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 8 Feb 2017 14:07:54 +0100
Subject: [PATCH 0229/1163] Optimize code and performance of module variant

---
 htdocs/core/lib/product.lib.php               |  5 ++-
 htdocs/langs/en_US/products.lang              |  3 +-
 htdocs/variants/card.php                      |  6 ++++
 .../variants/class/ProductAttribute.class.php | 28 ++++++++++------
 .../class/ProductAttributeValue.class.php     |  6 +---
 .../class/ProductCombination.class.php        | 32 +++++++++++++------
 htdocs/variants/combinations.php              |  1 +
 htdocs/variants/lib/product_variants.lib.php  | 31 ------------------
 htdocs/variants/list.php                      |  8 +++--
 9 files changed, 61 insertions(+), 59 deletions(-)
 delete mode 100644 htdocs/variants/lib/product_variants.lib.php

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index d65f9120c09..aaf3ae0bb9d 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -102,10 +102,13 @@ function product_prepare_head($object)
 
 		$prodcomb = new ProductCombination($db);
 
-		if ($prodcomb->fetchByFkProductChild($object->id) == -1) {
+		if ($prodcomb->fetchByFkProductChild($object->id) == -1) 
+		{
 			$head[$h][0] = DOL_URL_ROOT."/variants/combinations.php?id=".$object->id;
 			$head[$h][1] = $langs->trans('ProductCombinations');
 			$head[$h][2] = 'combinations';
+			$nbVariant = $prodcomb->countNbOfCombinationForFkProductParent($object->id);
+            if ($nbVariant > 0) $head[$h][1].= ' <span class="badge">'.$nbVariant.'</span>';
 		}
 
 		$h++;
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 457354813e8..9897facb0bb 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -288,7 +288,8 @@ DoNotRemovePreviousCombinations=Do not remove previous variants
 UsePercentageVariations=Use percentage variations
 PercentageVariation=Percentage variation
 ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
-NbProducts=No. of products
+NbOfDifferentValues=Nb of different values
+NbProducts=Nb. of products
 ParentProduct=Parent product
 HideChildProducts=Hide child products
 ConfirmCloneProductCombinations=Would you like to copy all the product variant to the product with the given reference?
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index a80b6b982e3..ae921114d6b 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -36,6 +36,7 @@ if ($prodattr->fetch($id) < 1) {
 	exit();
 }
 
+
 /*
  * Actions
  */
@@ -110,6 +111,11 @@ if ($confirm == 'yes') {
 	}
 }
 
+
+/*
+ * View
+ */
+
 $langs->load('products');
 
 $title = $langs->trans('ProductAttributeName', dol_htmlentities($prodattr->label));
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index e9027444e5c..bbfc655a0bd 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -73,9 +73,7 @@ class ProductAttribute
 			return -1;
 		}
 
-		require_once DOL_DOCUMENT_ROOT.'/variants/lib/product_variants.lib.php';
-
-		$sql = "SELECT rowid, ref, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $id." AND entity IN (".getProductEntities($this->db).")";
+		$sql = "SELECT rowid, ref, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product', 1).")";
 
 		$query = $this->db->query($sql);
 
@@ -100,11 +98,9 @@ class ProductAttribute
 	 */
 	public function fetchAll()
 	{
-		require_once DOL_DOCUMENT_ROOT.'/variants/lib/product_variants.lib.php';
-
 		$return = array();
 
-		$sql = 'SELECT rowid, ref, label, rang FROM '.MAIN_DB_PREFIX."product_attribute WHERE entity IN (".getProductEntities($this->db).')';
+		$sql = 'SELECT rowid, ref, label, rang FROM '.MAIN_DB_PREFIX."product_attribute WHERE entity IN (".getEntity('product', 1).')';
 		$sql .= $this->db->order('rang', 'asc');
 		$query = $this->db->query($sql);
 		if ($query)
@@ -183,6 +179,21 @@ class ProductAttribute
 		return -1;
 	}
 
+	/**
+	 * Returns the number of values for this attribute
+	 *
+	 * @return int
+	 */
+	public function countChildValues()
+	{
+		$sql = "SELECT COUNT(*) count FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE fk_product_attribute = ".(int) $this->id;
+
+		$query = $this->db->query($sql);
+		$result = $this->db->fetch_object($query);
+
+		return $result->count;
+	}
+	
 	/**
 	 * Returns the number of products that are using this attribute
 	 *
@@ -190,10 +201,8 @@ class ProductAttribute
 	 */
 	public function countChildProducts()
 	{
-		require_once __DIR__.'/../lib/product_variants.lib.php';
-
 		$sql = "SELECT COUNT(*) count FROM ".MAIN_DB_PREFIX."product_attribute_combination2val pac2v
-		LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac2v.fk_prod_combination = pac.rowid WHERE pac2v.fk_prod_attr = ".(int) $this->id." AND pac.entity IN (".getProductEntities($this->db).")";
+		LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac2v.fk_prod_combination = pac.rowid WHERE pac2v.fk_prod_attr = ".(int) $this->id." AND pac.entity IN (".getEntity('product', 1).")";
 
 		$query = $this->db->query($sql);
 
@@ -202,6 +211,7 @@ class ProductAttribute
 		return $result->count;
 	}
 
+	
 	/**
 	 * Reorders the order of the variants.
 	 * This is an internal function used by moveLine function
diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index e11f612c26a..399137dca18 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -68,9 +68,7 @@ class ProductAttributeValue
 	 */
 	public function fetch($valueid)
 	{
-		require_once __DIR__.'/../lib/product_variants.lib.php';
-
-		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $valueid." AND entity IN (".getProductEntities($this->db).")";
+		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $valueid." AND entity IN (".getEntity('product', 1).")";
 
 		$query = $this->db->query($sql);
 
@@ -101,8 +99,6 @@ class ProductAttributeValue
 	 */
 	public function fetchAllByProductAttribute($prodattr_id, $only_used = false)
 	{
-		require_once __DIR__.'/../lib/product_variants.lib.php';
-
 		$return = array();
 
 		$sql = 'SELECT ';
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 240fda0e911..155d92af532 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -86,9 +86,7 @@ class ProductCombination
 	 */
 	public function fetch($rowid)
 	{
-		require_once __DIR__.'/../lib/product_variants.lib.php';
-
-		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE rowid = ".(int) $rowid." AND entity IN (".getProductEntities($this->db).")";
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE rowid = ".(int) $rowid." AND entity IN (".getEntity('product', 1).")";
 
 		$query = $this->db->query($sql);
 
@@ -120,9 +118,7 @@ class ProductCombination
 	 */
 	public function fetchByFkProductChild($fk_child)
 	{
-		require_once __DIR__.'/../lib/product_variants.lib.php';
-
-		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".(int) $fk_child." AND entity IN (".getProductEntities($this->db).")";
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".(int) $fk_child." AND entity IN (".getEntity('product', 1).")";
 
 		$query = $this->db->query($sql);
 
@@ -154,9 +150,7 @@ class ProductCombination
 	 */
 	public function fetchAllByFkProductParent($fk_product_parent)
 	{
-		require_once __DIR__.'/../lib/product_variants.lib.php';
-
-		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getProductEntities($this->db).")";
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product', 1).")";
 
 		$query = $this->db->query($sql);
 
@@ -182,6 +176,26 @@ class ProductCombination
 		return $return;
 	}
 
+	/**
+	 * Retrieves all product combinations by the product parent row id
+	 *
+	 * @param  int     $fk_product_parent  Id of parent product
+	 * @return int                         Nb of record
+	 */
+	public function countNbOfCombinationForFkProductParent($fk_product_parent)
+	{
+	    $nb = 0;
+	    $sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product', 1).")";
+	
+	    $resql = $this->db->query($sql);
+	    if ($resql) {
+	        $obj = $this->db->fetch_object($resql);
+	        if ($obj) $nb = $obj->nb;
+	    }
+
+	    return $nb;
+	}
+	
 	/**
 	 * Creates a product attribute combination
 	 *
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 477108f9998..dc1edd01ef0 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -52,6 +52,7 @@ if ($id > 0 || $ref)
     $object->fetch($id, $ref);
 }
 
+
 /*
  * Actions
  */
diff --git a/htdocs/variants/lib/product_variants.lib.php b/htdocs/variants/lib/product_variants.lib.php
deleted file mode 100644
index 9ced646cb01..00000000000
--- a/htdocs/variants/lib/product_variants.lib.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * Returns the entity of the products.
- * @param DoliDB $db Database handler
- * @return mixed
- */
-function getProductEntities(DoliDB $db)
-{
-	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-	$product = new Product($db);
-
-	return getEntity($product->element, 1);
-}
\ No newline at end of file
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 6a6d02178e8..7b8855c1c4e 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -18,7 +18,7 @@
 require '../main.inc.php';
 require DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 
-$rowid = GETPOST('rowid');
+$id = GETPOST('id');
 $action = GETPOST('action');
 $object = new ProductAttribute($db);
 
@@ -109,14 +109,16 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 		<tr class="liste_titre nodrag nodrop">
 			<th class="liste_titre"><?php print $langs->trans('Ref') ?></th>
 			<th class="liste_titre"><?php print $langs->trans('Label') ?></th>
-			<th class="liste_titre"><?php print $langs->trans('NbProducts') ?></th>
+			<th class="liste_titre" align="right"><?php print $langs->trans('NbOfDifferentValues') ?></th>
+			<th class="liste_titre" align="right"><?php print $langs->trans('NbProducts') ?></th>
 			<th class="liste_titre" colspan="2"></th>
 		</tr>
 		<?php foreach ($variants as $key => $attribute): ?>
 		<tr id="row-<?php echo $attribute->id ?>" <?php echo $bcdd[$var] ?>>
 			<td><a href="card.php?id=<?php echo $attribute->id ?>"><?php echo dol_htmlentities($attribute->ref) ?></a></td>
 			<td><a href="card.php?id=<?php echo $attribute->id ?>"><?php echo dol_htmlentities($attribute->label) ?></a></td>
-			<td><?php echo $attribute->countChildProducts() ?></td>
+			<td align="right"><?php echo $attribute->countChildValues() ?></td>
+			<td align="right"><?php echo $attribute->countChildProducts() ?></td>
 			<td style="text-align: right">
 				<a href="card.php?id=<?php echo $attribute->id ?>&action=edit"><?php echo img_edit() ?></a>
 				<a href="card.php?id=<?php echo $attribute->id ?>&action=delete"><?php echo img_delete() ?></a>

From 072fa9987bf24cf837c89595af39d4e4b4352d3c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 8 Feb 2017 16:47:27 +0100
Subject: [PATCH 0230/1163] Update 4.0.0-5.0.0.sql

---
 htdocs/install/mysql/migration/4.0.0-5.0.0.sql | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index 29832ee6765..456d5942549 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -287,9 +287,3 @@ CREATE TABLE llx_product_attribute_value
   entity INT DEFAULT 1 NOT NULL
 );
 ALTER TABLE llx_product_attribute_value ADD CONSTRAINT unique_ref UNIQUE (fk_product_attribute,ref);
-
--- add additional payment terms often needed in Austria
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9,'10D',         9,1, '10 jours','Réglement à 10 jours',0,10);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 10,1, '10 jours fin de mois','Réglement à 10 jours fin de mois',1,10);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D',         11,1, '14 jours','Réglement à 14 jours',0,14);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 12,1, '14 jours fin de mois','Réglement à 14 jours fin de mois',1,14);

From 22b85b3aba8ea01773b51fe9002cbd14c1fb5a83 Mon Sep 17 00:00:00 2001
From: Ion <ion@agorria.com>
Date: Wed, 8 Feb 2017 17:30:51 +0100
Subject: [PATCH 0231/1163] Show delay in syslog

---
 htdocs/core/modules/syslog/mod_syslog_file.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index b1060677c6f..1e8d2b3a91c 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -8,6 +8,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/syslog/logHandler.php';
 class mod_syslog_file extends LogHandler implements LogHandlerInterface
 {
 	var $code = 'file';
+	var $lastTime = 0;
 
 	/**
 	 * 	Return name of logger
@@ -145,9 +146,16 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				LOG_INFO => 'INFO',
 				LOG_DEBUG => 'DEBUG'
 			);
-
-			$message = dol_print_date(time(),"%Y-%m-%d %H:%M:%S")." ".sprintf("%-7s", $logLevels[$content['level']])." ".sprintf("%-15s", $content['ip'])." ".($this->ident>0?str_pad('',$this->ident,' '):'').$content['message'];
-
+			
+			$delay = "";
+			if (!empty($conf->global->MAIN_SYSLOG_SHOW_DELAY))
+			{
+				$now = microtime(true);
+				$delay = " ".sprintf("%05.3f", $this->lastTime != 0 ? $now - $this->lastTime : 0);
+				$this->lastTime = $now;
+			}
+			
+			$message = dol_print_date(time(),"%Y-%m-%d %H:%M:%S").$delay." ".sprintf("%-7s", $logLevels[$content['level']])." ".sprintf("%-15s", $content['ip'])." ".($this->ident>0?str_pad('',$this->ident,' '):'').$content['message'];
 			fwrite($filefd, $message."\n");
 			fclose($filefd);
 			@chmod($logfile, octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));

From a042c30b285be5d431d7ca41ba1e0c51b7a97323 Mon Sep 17 00:00:00 2001
From: De Coninck Laurent <laurent@adlogix.eu>
Date: Wed, 8 Feb 2017 19:00:48 +0100
Subject: [PATCH 0232/1163] fix nex line

---
 .../doc/pdf_standard.modules.php              | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 5db7e065b43..56204fda6bb 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -284,7 +284,7 @@ class pdf_standard extends ModeleExpenseReport
 				}
 
 				$iniY = $tab_top + 7;
-				$curY = $tab_top + 7;
+				$initialY = $tab_top + 7;
 				$nexY = $tab_top + 7;
 
 				// Loop on each lines
@@ -292,34 +292,31 @@ class pdf_standard extends ModeleExpenseReport
 				{
 					$piece_comptable = $i +1;
 
-					$curY = $nexY;
 					$pdf->SetFont('','', $default_font_size - 2);   // Into loop to work with multipage
 					$pdf->SetTextColor(0,0,0);
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
 					$pageposbefore=$pdf->getPage();
-
-					// Description of product line
-					$curX = $this->posxcomment-1;
-
-					$showpricebeforepagebreak=1;
+                    $curY = $nexY;
 
 					$pdf->SetFont('','', $default_font_size - 1);
 					
                     // Accountancy piece
                     $pdf->SetXY($this->posxpiece, $curY);
                     $pdf->writeHTMLCell($this->posxcomment-$this->posxpiece-0.8, 4, $this->posxpiece-1, $curY, $piece_comptable, 0, 1);
+                    $curY = ($pdf->PageNo() > $pageposbefore) ? $pdf->GetY()-4 : $curY;
 
                     // Comments
                     $pdf->SetXY($this->posxcomment, $curY );
                     $pdf->writeHTMLCell($this->posxdate-$this->posxcomment-0.8, 4, $this->posxcomment-1, $curY, $object->lines[$i]->comments, 0, 1);
+                    $curY = ($pdf->PageNo() > $pageposbefore) ? $pdf->GetY()-4 : $curY;
 
                     // Date
 					$pdf->SetXY($this->posxdate -1, $curY);
 					$pdf->MultiCell($this->posxtype-$this->posxdate-0.8, 4, dol_print_date($object->lines[$i]->date,"day",false,$outputlangs), 0, 'C');
 
-					// Type
+                    // Type
 					$pdf->SetXY($this->posxtype -1, $curY);
 					$nextColumnPosX = $this->posxup;
                     if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
@@ -345,17 +342,17 @@ class pdf_standard extends ModeleExpenseReport
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxtva, $curY);
 						$pdf->MultiCell($this->posxup-$this->posxtva-0.8, 4,$vat_rate, 0, 'C');
-					}
+                    }
 
 					// Unit price
 					$pdf->SetXY($this->posxup, $curY);
 					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 4,price($object->lines[$i]->value_unit), 0, 'R');
 
-					// Quantity
+                    // Quantity
 					$pdf->SetXY($this->posxqty, $curY);
 					$pdf->MultiCell($this->postotalttc-$this->posxqty-0.8, 4,$object->lines[$i]->qty, 0, 'R');
 
-					// Total with all taxes
+                    // Total with all taxes
 					$pdf->SetXY($this->postotalttc-1, $curY);
 					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalttc, 4, price($object->lines[$i]->total_ttc), 0, 'R');
 
@@ -378,11 +375,10 @@ class pdf_standard extends ModeleExpenseReport
 						$nbLineCommentNeed = dol_nboflines_bis($follow_comment,52,$outputlangs->charset_output);
 						$nbLineTypeNeed = dol_nboflines_bis($follow_type,4,$outputlangs->charset_output);
 
-						//Which one need more lines
-                        $nblineFollowComment = ($nbLineCommentNeed > $nbLineTypeNeed) ? $nbLineCommentNeed : $nbLineTypeNeed;
+                        $nblineFollowComment = max($nbLineCommentNeed, $nbLineTypeNeed);
 					}
 
-                    $nexY+=$nblineFollowComment*($pdf->getFontSize()+1);    // Passe espace entre les lignes
+                    $nexY+=$nblineFollowComment*($pdf->getFontSize()*1.3);    // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)

From 439bda053d360d1f11e214b18502b202f7bd4a31 Mon Sep 17 00:00:00 2001
From: De Coninck Laurent <laurent@adlogix.eu>
Date: Wed, 8 Feb 2017 19:18:16 +0100
Subject: [PATCH 0233/1163] fix correct url for expense report note in expense
 report list

---
 htdocs/expensereport/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index cb54414fe35..13b95311dee 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -543,7 +543,7 @@ if ($resql)
     			if (!empty($obj->note_private) || !empty($obj->note_public))
     			{
     			    print ' <span class="note">';
-    			    print '<a href="'.DOL_URL_ROOT.'/commande/note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
+    			    print '<a href="'.DOL_URL_ROOT.'/expensereport/note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
     			    print '</span>';
     			}
     			print '</td>';

From 8d00297509fe40ef09071a93dfd7fccbc7d3e8da Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Wed, 8 Feb 2017 16:11:31 -0300
Subject: [PATCH 0234/1163] Move php values to js call

Not inside js declaration
---
 htdocs/cashdesk/tpl/validation2.tpl.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/cashdesk/tpl/validation2.tpl.php b/htdocs/cashdesk/tpl/validation2.tpl.php
index 844522f55e0..8f24e2069aa 100644
--- a/htdocs/cashdesk/tpl/validation2.tpl.php
+++ b/htdocs/cashdesk/tpl/validation2.tpl.php
@@ -29,15 +29,15 @@ $langs->load("bills");
 
 <script type="text/javascript">
 
-	function popupTicket()
+	function popupTicket(id,name)
 	{
 		largeur = 600;
 		hauteur = 500;
 		opt = 'width='+largeur+', height='+hauteur+', left='+(screen.width - largeur)/2+', top='+(screen.height-hauteur)/2+'';
-		window.open('validation_ticket.php?facid=<?php echo GETPOST('facid','int'); ?>', '<?php echo $langs->trans('PrintTicket') ?>', opt);
+		window.open('validation_ticket.php?facid='+id,name, opt);
 	}
 
-	popupTicket();
+	popupTicket(<?php echo GETPOST('facid','int'); ?>,'<?php echo $langs->trans('PrintTicket') ?>');
 
 </script>
 

From 5a7c20e897a47acdd3417c84c87ef1e7f5a8cd8b Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Wed, 8 Feb 2017 17:13:54 -0300
Subject: [PATCH 0235/1163] Code style

var to public
---
 htdocs/contact/class/contact.class.php | 68 +++++++++++++-------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 3b4fa942f81..40051753252 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -41,61 +41,61 @@ class Contact extends CommonObject
 	public $table_element='socpeople';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
-	var $civility_id;      // In fact we store civility_code
-	var $civility_code;
-	var $address;
-	var $zip;
-	var $town;
+	public $civility_id;      // In fact we store civility_code
+	public $civility_code;
+	public $address;
+	public $zip;
+	public $town;
 
 	/**
 	 * @deprecated
 	 * @see state_id
 	 */
-	var $fk_departement;
+	public $fk_departement;
 	/**
 	 * @deprecated
 	 * @see state_code
 	 */
-	var $departement_code;
+	public $departement_code;
 	/**
 	 * @deprecated
 	 * @see state
 	 */
-	var $departement;
-	var $state_id;	        	// Id of department
-	var $state_code;		    // Code of department
-	var $state;			        // Label of department
+	public $departement;
+	public $state_id;	        	// Id of department
+	public $state_code;		    // Code of department
+	public $state;			        // Label of department
 
-    var $poste;                 // Position
+    	public $poste;                 // Position
 
-	var $socid;					// fk_soc
-	var $statut;				// 0=inactif, 1=actif
+	public $socid;					// fk_soc
+	public $statut;				// 0=inactif, 1=actif
 
-	var $code;
-	var $email;
-	var $skype;
-    var $photo;
-    var $jabberid;
-	var $phone_pro;
-	var $phone_perso;
-	var $phone_mobile;
-    var $fax;
+	public $code;
+	public $email;
+	public $skype;
+	public $photo;
+    	public $jabberid;
+	public $phone_pro;
+	public $phone_perso;
+	public $phone_mobile;
+    	public $fax;
 
-    var $priv;
+    	public $priv;
 
-	var $birthday;
-	var $default_lang;
-    var $no_email;				// 1=Don't send e-mail to this contact, 0=do
+	public $birthday;
+	public $default_lang;
+    	public $no_email;				// 1=Don't send e-mail to this contact, 0=do
 
-	var $ref_facturation;       // Nb de reference facture pour lequel il est contact
-	var $ref_contrat;           // Nb de reference contrat pour lequel il est contact
-	var $ref_commande;          // Nb de reference commande pour lequel il est contact
-	var $ref_propal;            // Nb de reference propal pour lequel il est contact
+	public $ref_facturation;       // Reference number of invoice for which it is contact
+	public $ref_contrat;           // Nb de reference contrat pour lequel il est contact
+	public $ref_commande;          // Nb de reference commande pour lequel il est contact
+	public $ref_propal;            // Nb de reference propal pour lequel il est contact
 
-	var $user_id;
-	var $user_login;
+	public $user_id;
+	public $user_login;
 
-	var $oldcopy;				// To contains a clone of this when we need to save old properties of object
+	public $oldcopy;				// To contains a clone of this when we need to save old properties of object
 
 
 	/**

From e053308c6fc5ae9da3a2aca9eba7f7fec06880b7 Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Wed, 8 Feb 2017 17:24:11 -0300
Subject: [PATCH 0236/1163] Code style

var to public
---
 htdocs/societe/class/address.class.php | 58 +++++++++++++-------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php
index d8a1687cf9d..a3a20dfbd3d 100644
--- a/htdocs/societe/class/address.class.php
+++ b/htdocs/societe/class/address.class.php
@@ -31,21 +31,21 @@
  */
 class Address
 {
-	var $db;
+	private $db;
 
-	var $id;
-	var $type;
-	var $label;
-	var $socid;
-	var $name;
-	var $address;
-	var $zip;
-	var $town;
-	var $country_id;
-	var $country_code;
-	var $phone;
-	var $fax;
-	var $note;
+	public $id;
+	public $type;
+	public $label;
+	public $socid;
+	public $name;
+	public $address;
+	public $zip;
+	public $town;
+	public $country_id;
+	public $country_code;
+	public $phone;
+	public $fax;
+	public $note;
 
 	/**
 	 * Adresses liees a la societe
@@ -495,21 +495,21 @@ class Address
  */
 class AddressLine
 {
-
-	var $id;
-	var $date_creation;
-	var $date_modification;
-	var $label;
-	var $name;
-	var $address;
-	var $zip;
-	var $town;
-	var $country_id;
-	var $country_code;
-	var $country;
-	var $phone;
-	var $fax;
-	var $note;
+	private $db;
+	public $id;
+	public $date_creation;
+	public $date_modification;
+	public $label;
+	public $name;
+	public $address;
+	public $zip;
+	public $town;
+	public $country_id;
+	public $country_code;
+	public $country;
+	public $phone;
+	public $fax;
+	public $note;
 
 
 	/**

From a8c5661cb70f5f3314274e94f5f16f977336e5fe Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Wed, 8 Feb 2017 17:36:04 -0300
Subject: [PATCH 0237/1163] Code style

Set public and private
---
 htdocs/cashdesk/class/Auth.class.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
index 33bbd094050..0de4254cf29 100644
--- a/htdocs/cashdesk/class/Auth.class.php
+++ b/htdocs/cashdesk/class/Auth.class.php
@@ -22,14 +22,14 @@
  */
 class Auth
 {
-	var $db;
+	private $db;
 
-	var $login;
-	var $passwd;
+	private $login;
+	private $passwd;
 
-	var $reponse;
+	private $reponse;
 
-	var $sqlQuery;
+	public $sqlQuery;
 
 	/**
 	 * Enter description here ...
@@ -37,7 +37,7 @@ class Auth
 	 * @param	DoliDB	$db			Database handler
 	 * @return	void
 	 */
-	function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
 		$this->reponse(null);
@@ -49,7 +49,7 @@ class Auth
 	 * @param 	string	$aLogin		Login
 	 * @return	void
 	 */
-	function login($aLogin)
+	public function login($aLogin)
 	{
 		$this->login = $aLogin;
 	}
@@ -71,7 +71,7 @@ class Auth
 	 * @param 	string 	$aReponse	Response
 	 * @return	void
 	 */
-	function reponse($aReponse)
+	public function reponse($aReponse)
 	{
 		$this->reponse = $aReponse;
 	}
@@ -83,7 +83,7 @@ class Auth
 	 * @param	string	$aPasswd	Password
 	 * @return	int					0 or 1
 	 */
-	function verif($aLogin, $aPasswd)
+	public function verif($aLogin, $aPasswd)
 	{
 		global $conf,$langs;
 		global $dolibarr_main_authentication,$dolibarr_auto_user;

From 2418754d71811bcec2d0abf3fc79fd8d69c43ddd Mon Sep 17 00:00:00 2001
From: Ion <ion@agorria.com>
Date: Wed, 8 Feb 2017 23:27:58 +0100
Subject: [PATCH 0238/1163] Fill oldline in supplier order updateline

---
 htdocs/fourn/class/fournisseur.commande.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index f656e7a41e7..053e5b314d6 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2346,8 +2346,11 @@ class CommandeFournisseur extends CommonOrder
 
             $subprice = price2num($pu_ht,'MU');
 
+            //Fetch current line from the database and then clone the object and set it in $oldline property
             $this->line=new CommandeFournisseurLigne($this->db);
             $this->line->fetch($rowid);
+            $oldline = clone $this->line;
+            $this->line->oldline = $oldline;
 
             $this->line->context = $this->context;
 

From f8a6d60fe53b2966ed4707a2c741931fdde79095 Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Wed, 8 Feb 2017 20:24:20 -0300
Subject: [PATCH 0239/1163] $db attibute now be protected.

---
 htdocs/cashdesk/class/Auth.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
index 0de4254cf29..5e431514d1c 100644
--- a/htdocs/cashdesk/class/Auth.class.php
+++ b/htdocs/cashdesk/class/Auth.class.php
@@ -22,7 +22,7 @@
  */
 class Auth
 {
-	private $db;
+	protected $db;
 
 	private $login;
 	private $passwd;

From febe95cd2eaa45a044c354f6a9590637d77db15a Mon Sep 17 00:00:00 2001
From: Gustavo Novaro <gnovaro@users.noreply.github.com>
Date: Wed, 8 Feb 2017 20:27:14 -0300
Subject: [PATCH 0240/1163] $db attributte now be protected

---
 htdocs/societe/class/address.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php
index a3a20dfbd3d..43e46008910 100644
--- a/htdocs/societe/class/address.class.php
+++ b/htdocs/societe/class/address.class.php
@@ -31,7 +31,7 @@
  */
 class Address
 {
-	private $db;
+	protected $db;
 
 	public $id;
 	public $type;
@@ -495,7 +495,7 @@ class Address
  */
 class AddressLine
 {
-	private $db;
+	protected $db;
 	public $id;
 	public $date_creation;
 	public $date_modification;

From fbe0b13706522db47429339204a17f4487d6775f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 9 Feb 2017 01:07:54 +0100
Subject: [PATCH 0241/1163] Add parameter to set the url to use for the file
 integrity checker

---
 htdocs/admin/system/filecheck.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 7536c6df793..3a78fb6e9ea 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -73,11 +73,15 @@ print '<br>';
 // Modified or missing files
 $file_list = array('missing' => array(), 'updated' => array());
 
-// File to analyze
-//$xmlfile = DOL_DOCUMENT_ROOT.'/install/filelist-'.DOL_VERSION.'.xml';
+// Local file to compare to
 $xmlshortfile = GETPOST('xmlshortfile')?GETPOST('xmlshortfile'):'/install/filelist-'.DOL_VERSION.'.xml';
 $xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
-$xmlremote = GETPOST('xmlremote')?GETPOST('xmlremote'):'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
+// Remote file to compare to
+$xmlremote = GETPOST('xmlremote');
+if (empty($xmlremote) && ! empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
+$param='MAIN_FILECHECK_URL_'.DOL_VERSION;
+if (empty($xmlremote) && ! empty($conf->global->$param)) $xmlremote = $conf->global->$param;
+if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
 
 
 // Test if remote test is ok

From 56d7fe1bf6481d28f32287a9fa4a95c859a87979 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 9 Feb 2017 10:23:44 +0100
Subject: [PATCH 0242/1163] Pad files with https

---
 build/pad/pad_dolibarr_s.xml | 232 +++++++++++++++++++++++++++++++++++
 build/pad/pad_doliwamp.xml   |   8 +-
 build/pad/pad_doliwamp_s.xml | 225 +++++++++++++++++++++++++++++++++
 3 files changed, 461 insertions(+), 4 deletions(-)
 create mode 100644 build/pad/pad_dolibarr_s.xml
 create mode 100644 build/pad/pad_doliwamp_s.xml

diff --git a/build/pad/pad_dolibarr_s.xml b/build/pad/pad_dolibarr_s.xml
new file mode 100644
index 00000000000..8effe4b771a
--- /dev/null
+++ b/build/pad/pad_dolibarr_s.xml
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<XML_DIZ_INFO>
+	<MASTER_PAD_VERSION_INFO>
+		<MASTER_PAD_VERSION>3.11</MASTER_PAD_VERSION>
+		<MASTER_PAD_EDITOR>PADGen 3.1.1.47 http://www.padgen.org</MASTER_PAD_EDITOR>
+		<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://pad.asp-software.org</MASTER_PAD_INFO>
+	</MASTER_PAD_VERSION_INFO>
+	<Company_Info>
+		<Company_Name>Dolibarr team</Company_Name>
+		<Address_1>20 rue camponac</Address_1>
+		<Address_2 />
+		<City_Town>Pessac</City_Town>
+		<State_Province />
+		<Zip_Postal_Code>33600</Zip_Postal_Code>
+		<Country>FRANCE</Country>
+		<Company_WebSite_URL>https://www.dolibarr.org</Company_WebSite_URL>
+		<Contact_Info>
+			<Author_First_Name>Dolibarr team</Author_First_Name>
+			<Author_Last_Name>Dolibarr team</Author_Last_Name>
+			<Author_Email>contact@dolibarr.org</Author_Email>
+			<Contact_First_Name>Dolibarr team</Contact_First_Name>
+			<Contact_Last_Name>Dolibarr team</Contact_Last_Name>
+			<Contact_Email>contact@dolibarr.org</Contact_Email>
+		</Contact_Info>
+		<Support_Info>
+			<Sales_Email>dolibarr-dev@nongnu.org</Sales_Email>
+			<Support_Email>dolibarr-dev@nongnu.org</Support_Email>
+			<General_Email>dolibarr-dev@nongnu.org</General_Email>
+			<Sales_Phone />
+			<Support_Phone />
+			<General_Phone />
+			<Fax_Phone />
+		</Support_Info>
+	</Company_Info>
+	<Program_Info>
+		<Program_Name>Dolibarr</Program_Name>
+		<Program_Version>5.0</Program_Version>
+		<Program_Release_Month>02</Program_Release_Month>
+		<Program_Release_Day>01</Program_Release_Day>
+		<Program_Release_Year>2017</Program_Release_Year>
+		<Program_Cost_Dollars />
+		<Program_Cost_Other_Code />
+		<Program_Cost_Other />
+		<Program_Type>Freeware</Program_Type>
+		<Program_Release_Status>Major Update</Program_Release_Status>
+		<Program_Install_Support>No Install Support</Program_Install_Support>
+		<Program_OS_Support>Linux,Mac OS X,Mac Other,Unix,Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
+		<Program_Language>English,Arabic,Catalan,Chinese,Danish,Dutch,Finnish,French,German,Greek,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
+		<Program_Change_Info>Increase performances, Setup process is easier, Reduce number of clicks required to use software</Program_Change_Info>
+		<Program_Specific_Category>Business</Program_Specific_Category>
+		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
+		<Program_System_Requirements>None</Program_System_Requirements>
+		<File_Info>
+			<File_Size_Bytes>18037439</File_Size_Bytes>
+			<File_Size_K>18037</File_Size_K>
+			<File_Size_MB>18.03</File_Size_MB>
+		</File_Info>
+		<Expire_Info>
+			<Has_Expire_Info>N</Has_Expire_Info>
+			<Expire_Count />
+			<Expire_Based_On>Days</Expire_Based_On>
+			<Expire_Other_Info />
+			<Expire_Month />
+			<Expire_Day />
+			<Expire_Year />
+		</Expire_Info>
+	</Program_Info>
+	<Program_Descriptions>
+		<English>
+			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
+			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
+			<Char_Desc_80>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity</Char_Desc_80>
+			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to manage.</Char_Desc_250>
+			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
+Simple to install
+Simple to use
+Simple to develop 
+Note that Dolibarr is also available with an auto-installer for Windows or Ubuntu users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. This version is called DoliWamp (for Windows) or DoliBuntu (for Ubuntu/Debian).</Char_Desc_2000>
+		</English>
+		<French>
+			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
+			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
+			<Char_Desc_80>Dolibarr ERP &amp; CRM, le gestionnaire simple pour gérer votre activité</Char_Desc_80>
+			<Char_Desc_250>Dolibarr ERP &amp; CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
+			<Char_Desc_450>Dolibarr ERP &amp; CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP).</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr ERP &amp; CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP). Dolibarr vient compléter les offres déjà nombreuses de logiciels de cette catégorie (comme OpenBravo, OpenERP, SugarCRM, Neogia, Compiere, etc.) mais se démarque par le fait qu'ici tout est fait pour offrir de la simplicité (règle des 3 S):
+Simple pour l'installation (avec au choix des installeurs clé en main pour ceux qui ignorent comment installer un serveur Web, ou une installation manuelle)
+Simple pour l'utilisation (fonctions modulaires pour ne pas surcharger les menus, informations claires à la saisie)
+Simple pour le développement (pas de frameworks lourds). 
+Dolibarr intègre en effet sa propre architecture (design patterns) permettant à tout développeur d'être tout de suite opérationnel sans connaissances particulières autre que le PHP. </Char_Desc_2000>
+		</French>
+		<Italian>
+			<Keywords>erp, crm, gestionale, medie imprese, fondazioni</Keywords>
+			<Char_Desc_45>Gestionale open source e gratuito</Char_Desc_45>
+			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
+			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
+			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
+		</Italian>
+	</Program_Descriptions>
+	<Web_Info>
+		<Application_URLs>
+			<Application_Info_URL>https://www.dolibarr.org</Application_Info_URL>
+			<Application_Order_URL>https://www.dolibarr.org</Application_Order_URL>
+			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_XML_File_URL>https://www.dolibarr.org/files/pad_dolibarr.xml</Application_XML_File_URL>
+		</Application_URLs>
+		<Download_URLs>
+			<Primary_Download_URL>https://www.dolibarr.org/files/dolibarr.zip</Primary_Download_URL>
+			<Secondary_Download_URL>http://www.dolibarr.org/files/dolibarr.zip</Secondary_Download_URL>
+			<Additional_Download_URL_1 />
+			<Additional_Download_URL_2 />
+		</Download_URLs>
+	</Web_Info>
+	<Permissions>
+		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
+		<EULA>GNU GPL</EULA>
+	</Permissions>
+	<Affiliates>
+		<Affiliates_FORM>Y</Affiliates_FORM>
+		<Affiliates_VERSION>1.4</Affiliates_VERSION>
+		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
+		<Affiliates_Information_Page />
+		<Affiliates_Avangate_Order_Page />
+		<Affiliates_Avangate_Vendor_ID />
+		<Affiliates_Avangate_Product_ID />
+		<Affiliates_Avangate_Maximum_Commission_Rate />
+		<Affiliates_BMTMicro_Order_Page />
+		<Affiliates_BMTMicro_Vendor_ID />
+		<Affiliates_BMTMicro_Product_ID />
+		<Affiliates_BMTMicro_Maximum_Commission_Rate />
+		<Affiliates_Cleverbridge_Order_Page />
+		<Affiliates_Cleverbridge_Vendor_ID />
+		<Affiliates_Cleverbridge_Product_ID />
+		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
+		<Affiliates_clixGalore_Order_Page />
+		<Affiliates_clixGalore_Vendor_ID />
+		<Affiliates_clixGalore_Product_ID />
+		<Affiliates_clixGalore_Maximum_Commission_Rate />
+		<Affiliates_CommissionJunction_Order_Page />
+		<Affiliates_CommissionJunction_Vendor_ID />
+		<Affiliates_CommissionJunction_Product_ID />
+		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
+		<Affiliates_DigiBuy_Order_Page />
+		<Affiliates_DigiBuy_Vendor_ID />
+		<Affiliates_DigiBuy_Product_ID />
+		<Affiliates_DigiBuy_Maximum_Commission_Rate />
+		<Affiliates_DigitalCandle_Order_Page />
+		<Affiliates_DigitalCandle_Vendor_ID />
+		<Affiliates_DigitalCandle_Product_ID />
+		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
+		<Affiliates_Emetrix_Order_Page />
+		<Affiliates_Emetrix_Vendor_ID />
+		<Affiliates_Emetrix_Product_ID />
+		<Affiliates_Emetrix_Maximum_Commission_Rate />
+		<Affiliates_eSellerate_Order_Page />
+		<Affiliates_eSellerate_Vendor_ID />
+		<Affiliates_eSellerate_Product_ID />
+		<Affiliates_eSellerate_Maximum_Commission_Rate />
+		<Affiliates_Kagi_Order_Page />
+		<Affiliates_Kagi_Vendor_ID />
+		<Affiliates_Kagi_Product_ID />
+		<Affiliates_Kagi_Maximum_Commission_Rate />
+		<Affiliates_LinkShare_Order_Page />
+		<Affiliates_LinkShare_Vendor_ID />
+		<Affiliates_LinkShare_Product_ID />
+		<Affiliates_LinkShare_Maximum_Commission_Rate />
+		<Affiliates_NorthStarSol_Order_Page />
+		<Affiliates_NorthStarSol_Vendor_ID />
+		<Affiliates_NorthStarSol_Product_ID />
+		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
+		<Affiliates_OneNetworkDirect_Order_Page />
+		<Affiliates_OneNetworkDirect_Vendor_ID />
+		<Affiliates_OneNetworkDirect_Product_ID />
+		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
+		<Affiliates_Order1_Order_Page />
+		<Affiliates_Order1_Vendor_ID />
+		<Affiliates_Order1_Product_ID />
+		<Affiliates_Order1_Maximum_Commission_Rate />
+		<Affiliates_Osolis_Order_Page />
+		<Affiliates_Osolis_Vendor_ID />
+		<Affiliates_Osolis_Product_ID />
+		<Affiliates_Osolis_Maximum_Commission_Rate />
+		<Affiliates_Plimus_Order_Page />
+		<Affiliates_Plimus_Vendor_ID />
+		<Affiliates_Plimus_Product_ID />
+		<Affiliates_Plimus_Maximum_Commission_Rate />
+		<Affiliates_Regnet_Order_Page />
+		<Affiliates_Regnet_Vendor_ID />
+		<Affiliates_Regnet_Product_ID />
+		<Affiliates_Regnet_Maximum_Commission_Rate />
+		<Affiliates_Regnow_Order_Page />
+		<Affiliates_Regnow_Vendor_ID />
+		<Affiliates_Regnow_Product_ID />
+		<Affiliates_Regnow_Maximum_Commission_Rate />
+		<Affiliates_Regsoft_Order_Page />
+		<Affiliates_Regsoft_Vendor_ID />
+		<Affiliates_Regsoft_Product_ID />
+		<Affiliates_Regsoft_Maximum_Commission_Rate />
+		<Affiliates_ShareIt_Order_Page />
+		<Affiliates_ShareIt_Vendor_ID />
+		<Affiliates_ShareIt_Product_ID />
+		<Affiliates_ShareIt_Maximum_Commission_Rate />
+		<Affiliates_Shareasale_Order_Page />
+		<Affiliates_Shareasale_Vendor_ID />
+		<Affiliates_Shareasale_Product_ID />
+		<Affiliates_Shareasale_Maximum_Commission_Rate />
+		<Affiliates_SWReg_Order_Page />
+		<Affiliates_SWReg_Vendor_ID />
+		<Affiliates_SWReg_Product_ID />
+		<Affiliates_SWReg_Maximum_Commission_Rate />
+		<Affiliates_V-Share_Order_Page />
+		<Affiliates_V-Share_Vendor_ID />
+		<Affiliates_V-Share_Product_ID />
+		<Affiliates_V-Share_Maximum_Commission_Rate />
+		<Affiliates_VFree_Order_Page />
+		<Affiliates_VFree_Vendor_ID />
+		<Affiliates_VFree_Product_ID />
+		<Affiliates_VFree_Maximum_Commission_Rate />
+		<Affiliates_Yaskifo_Order_Page />
+		<Affiliates_Yaskifo_Vendor_ID />
+		<Affiliates_Yaskifo_Product_ID />
+		<Affiliates_Yaskifo_Maximum_Commission_Rate />
+	</Affiliates>
+	<ASP>
+		<ASP_FORM>Y</ASP_FORM>
+		<ASP_Member>N</ASP_Member>
+		<ASP_Member_Number />
+	</ASP>
+</XML_DIZ_INFO>
diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml
index 158327977d2..4f7981a4314 100644
--- a/build/pad/pad_doliwamp.xml
+++ b/build/pad/pad_doliwamp.xml
@@ -13,7 +13,7 @@
 		<State_Province />
 		<Zip_Postal_Code>33600</Zip_Postal_Code>
 		<Country>FRANCE</Country>
-		<Company_WebSite_URL>http://www.nltechno.com</Company_WebSite_URL>
+		<Company_WebSite_URL>https://www.dolibarr.org</Company_WebSite_URL>
 		<Contact_Info>
 			<Author_First_Name>NLTechno</Author_First_Name>
 			<Author_Last_Name>NLTechno</Author_Last_Name>
@@ -53,7 +53,7 @@
 		<File_Info>
 			<File_Size_Bytes>26048004</File_Size_Bytes>
 			<File_Size_K>25437</File_Size_K>
-			<File_Size_MB>24.84</File_Size_MB>
+			<File_Size_MB>45.84</File_Size_MB>
 		</File_Info>
 		<Expire_Info>
 			<Has_Expire_Info>N</Has_Expire_Info>
@@ -96,8 +96,8 @@ DoliWamp is the auto-installer for Windows users with no technical knowledge to
 		<Application_URLs>
 			<Application_Info_URL>http://www.nltechno.com/doliwamp/</Application_Info_URL>
 			<Application_Order_URL>http://www.nltechno.com/doliwamp/</Application_Order_URL>
-			<Application_Screenshot_URL>https://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
-			<Application_Icon_URL>https://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
 			<Application_XML_File_URL>https://www.dolibarr.org/files/pad_doliwamp.xml</Application_XML_File_URL>
 		</Application_URLs>
 		<Download_URLs>
diff --git a/build/pad/pad_doliwamp_s.xml b/build/pad/pad_doliwamp_s.xml
new file mode 100644
index 00000000000..06eaec3af98
--- /dev/null
+++ b/build/pad/pad_doliwamp_s.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<XML_DIZ_INFO>
+	<MASTER_PAD_VERSION_INFO>
+		<MASTER_PAD_VERSION>3.11</MASTER_PAD_VERSION>
+		<MASTER_PAD_EDITOR>PADGen 3.1.1.47 http://www.padgen.org</MASTER_PAD_EDITOR>
+		<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://pad.asp-software.org</MASTER_PAD_INFO>
+	</MASTER_PAD_VERSION_INFO>
+	<Company_Info>
+		<Company_Name>NLTechno</Company_Name>
+		<Address_1>20 Rue Camponac</Address_1>
+		<Address_2 />
+		<City_Town>Pessac</City_Town>
+		<State_Province />
+		<Zip_Postal_Code>33600</Zip_Postal_Code>
+		<Country>FRANCE</Country>
+		<Company_WebSite_URL>https://www.dolibarr.org</Company_WebSite_URL>
+		<Contact_Info>
+			<Author_First_Name>NLTechno</Author_First_Name>
+			<Author_Last_Name>NLTechno</Author_Last_Name>
+			<Author_Email>contact@nltechno.com</Author_Email>
+			<Contact_First_Name>NLTechno</Contact_First_Name>
+			<Contact_Last_Name>NLTechno</Contact_Last_Name>
+			<Contact_Email>contact@nltechno.com</Contact_Email>
+		</Contact_Info>
+		<Support_Info>
+			<Sales_Email>support@nltechno.com</Sales_Email>
+			<Support_Email>support@nltechno.com</Support_Email>
+			<General_Email>support@nltechno.com</General_Email>
+			<Sales_Phone />
+			<Support_Phone />
+			<General_Phone />
+			<Fax_Phone />
+		</Support_Info>
+	</Company_Info>
+	<Program_Info>
+		<Program_Name>DoliWamp</Program_Name>
+		<Program_Version>5.0</Program_Version>
+		<Program_Release_Month>02</Program_Release_Month>
+		<Program_Release_Day>01</Program_Release_Day>
+		<Program_Release_Year>2017</Program_Release_Year>
+		<Program_Cost_Dollars />
+		<Program_Cost_Other_Code />
+		<Program_Cost_Other />
+		<Program_Type>Freeware</Program_Type>
+		<Program_Release_Status>Major Update</Program_Release_Status>
+		<Program_Install_Support>Install and Uninstall</Program_Install_Support>
+		<Program_OS_Support>Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
+		<Program_Language>English,Arabic,Catalan,Chinese,Dutch,Finnish,French,German,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
+		<Program_Change_Info>Increase performances, Setup process is easier, Reduce number of clicks required to use software</Program_Change_Info>
+		<Program_Specific_Category>Business</Program_Specific_Category>
+		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
+		<Program_System_Requirements>None</Program_System_Requirements>
+		<File_Info>
+			<File_Size_Bytes>26048004</File_Size_Bytes>
+			<File_Size_K>25437</File_Size_K>
+			<File_Size_MB>45.84</File_Size_MB>
+		</File_Info>
+		<Expire_Info>
+			<Has_Expire_Info>N</Has_Expire_Info>
+			<Expire_Count />
+			<Expire_Based_On>Days</Expire_Based_On>
+			<Expire_Other_Info />
+			<Expire_Month />
+			<Expire_Day />
+			<Expire_Year />
+		</Expire_Info>
+	</Program_Info>
+	<Program_Descriptions>
+		<English>
+			<Keywords>doliwamp, dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management</Keywords>
+			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM for Windows</Char_Desc_45>
+			<Char_Desc_80>DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation</Char_Desc_80>
+			<Char_Desc_250>DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs.</Char_Desc_250>
+			<Char_Desc_450>DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations.</Char_Desc_450>
+			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
+DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.</Char_Desc_2000>
+		</English>
+		<French>
+			<Keywords>doliwamp, dolibarr, erp, crm, factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations, entreprises, PME, TPE</Keywords>
+			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM pour Windows</Char_Desc_45>
+			<Char_Desc_80>DoliWamp, la distribution de Dolibarr pour gérer votre entreprise ou association</Char_Desc_80>
+			<Char_Desc_250>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
+			<Char_Desc_450>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_450>
+			<Char_Desc_2000>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_2000>
+		</French>
+		<Italian>
+			<Keywords>doliwamp, dolibarr, erp, crm, gestionale, medie imprese, fondazioni</Keywords>
+			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM per Windows</Char_Desc_45>
+			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
+			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
+			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
+		</Italian>
+	</Program_Descriptions>
+	<Web_Info>
+		<Application_URLs>
+			<Application_Info_URL>http://www.nltechno.com/doliwamp/</Application_Info_URL>
+			<Application_Order_URL>http://www.nltechno.com/doliwamp/</Application_Order_URL>
+			<Application_Screenshot_URL>https://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>https://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_XML_File_URL>https://www.dolibarr.org/files/pad_doliwamp.xml</Application_XML_File_URL>
+		</Application_URLs>
+		<Download_URLs>
+			<Primary_Download_URL>https://www.dolibarr.org/files/doliwamp.exe</Primary_Download_URL>
+			<Secondary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Secondary_Download_URL>
+			<Additional_Download_URL_1 />
+			<Additional_Download_URL_2 />
+		</Download_URLs>
+	</Web_Info>
+	<Permissions>
+		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
+		<EULA>GNU GPL</EULA>
+	</Permissions>
+	<Affiliates>
+		<Affiliates_FORM>Y</Affiliates_FORM>
+		<Affiliates_VERSION>1.4</Affiliates_VERSION>
+		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
+		<Affiliates_Information_Page />
+		<Affiliates_Avangate_Order_Page />
+		<Affiliates_Avangate_Vendor_ID />
+		<Affiliates_Avangate_Product_ID />
+		<Affiliates_Avangate_Maximum_Commission_Rate />
+		<Affiliates_BMTMicro_Order_Page />
+		<Affiliates_BMTMicro_Vendor_ID />
+		<Affiliates_BMTMicro_Product_ID />
+		<Affiliates_BMTMicro_Maximum_Commission_Rate />
+		<Affiliates_Cleverbridge_Order_Page />
+		<Affiliates_Cleverbridge_Vendor_ID />
+		<Affiliates_Cleverbridge_Product_ID />
+		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
+		<Affiliates_clixGalore_Order_Page />
+		<Affiliates_clixGalore_Vendor_ID />
+		<Affiliates_clixGalore_Product_ID />
+		<Affiliates_clixGalore_Maximum_Commission_Rate />
+		<Affiliates_CommissionJunction_Order_Page />
+		<Affiliates_CommissionJunction_Vendor_ID />
+		<Affiliates_CommissionJunction_Product_ID />
+		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
+		<Affiliates_DigiBuy_Order_Page />
+		<Affiliates_DigiBuy_Vendor_ID />
+		<Affiliates_DigiBuy_Product_ID />
+		<Affiliates_DigiBuy_Maximum_Commission_Rate />
+		<Affiliates_DigitalCandle_Order_Page />
+		<Affiliates_DigitalCandle_Vendor_ID />
+		<Affiliates_DigitalCandle_Product_ID />
+		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
+		<Affiliates_Emetrix_Order_Page />
+		<Affiliates_Emetrix_Vendor_ID />
+		<Affiliates_Emetrix_Product_ID />
+		<Affiliates_Emetrix_Maximum_Commission_Rate />
+		<Affiliates_eSellerate_Order_Page />
+		<Affiliates_eSellerate_Vendor_ID />
+		<Affiliates_eSellerate_Product_ID />
+		<Affiliates_eSellerate_Maximum_Commission_Rate />
+		<Affiliates_Kagi_Order_Page />
+		<Affiliates_Kagi_Vendor_ID />
+		<Affiliates_Kagi_Product_ID />
+		<Affiliates_Kagi_Maximum_Commission_Rate />
+		<Affiliates_LinkShare_Order_Page />
+		<Affiliates_LinkShare_Vendor_ID />
+		<Affiliates_LinkShare_Product_ID />
+		<Affiliates_LinkShare_Maximum_Commission_Rate />
+		<Affiliates_NorthStarSol_Order_Page />
+		<Affiliates_NorthStarSol_Vendor_ID />
+		<Affiliates_NorthStarSol_Product_ID />
+		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
+		<Affiliates_OneNetworkDirect_Order_Page />
+		<Affiliates_OneNetworkDirect_Vendor_ID />
+		<Affiliates_OneNetworkDirect_Product_ID />
+		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
+		<Affiliates_Order1_Order_Page />
+		<Affiliates_Order1_Vendor_ID />
+		<Affiliates_Order1_Product_ID />
+		<Affiliates_Order1_Maximum_Commission_Rate />
+		<Affiliates_Osolis_Order_Page />
+		<Affiliates_Osolis_Vendor_ID />
+		<Affiliates_Osolis_Product_ID />
+		<Affiliates_Osolis_Maximum_Commission_Rate />
+		<Affiliates_Plimus_Order_Page />
+		<Affiliates_Plimus_Vendor_ID />
+		<Affiliates_Plimus_Product_ID />
+		<Affiliates_Plimus_Maximum_Commission_Rate />
+		<Affiliates_Regnet_Order_Page />
+		<Affiliates_Regnet_Vendor_ID />
+		<Affiliates_Regnet_Product_ID />
+		<Affiliates_Regnet_Maximum_Commission_Rate />
+		<Affiliates_Regnow_Order_Page />
+		<Affiliates_Regnow_Vendor_ID />
+		<Affiliates_Regnow_Product_ID />
+		<Affiliates_Regnow_Maximum_Commission_Rate />
+		<Affiliates_Regsoft_Order_Page />
+		<Affiliates_Regsoft_Vendor_ID />
+		<Affiliates_Regsoft_Product_ID />
+		<Affiliates_Regsoft_Maximum_Commission_Rate />
+		<Affiliates_ShareIt_Order_Page />
+		<Affiliates_ShareIt_Vendor_ID />
+		<Affiliates_ShareIt_Product_ID />
+		<Affiliates_ShareIt_Maximum_Commission_Rate />
+		<Affiliates_Shareasale_Order_Page />
+		<Affiliates_Shareasale_Vendor_ID />
+		<Affiliates_Shareasale_Product_ID />
+		<Affiliates_Shareasale_Maximum_Commission_Rate />
+		<Affiliates_SWReg_Order_Page />
+		<Affiliates_SWReg_Vendor_ID />
+		<Affiliates_SWReg_Product_ID />
+		<Affiliates_SWReg_Maximum_Commission_Rate />
+		<Affiliates_V-Share_Order_Page />
+		<Affiliates_V-Share_Vendor_ID />
+		<Affiliates_V-Share_Product_ID />
+		<Affiliates_V-Share_Maximum_Commission_Rate />
+		<Affiliates_VFree_Order_Page />
+		<Affiliates_VFree_Vendor_ID />
+		<Affiliates_VFree_Product_ID />
+		<Affiliates_VFree_Maximum_Commission_Rate />
+		<Affiliates_Yaskifo_Order_Page />
+		<Affiliates_Yaskifo_Vendor_ID />
+		<Affiliates_Yaskifo_Product_ID />
+		<Affiliates_Yaskifo_Maximum_Commission_Rate />
+	</Affiliates>
+	<ASP>
+		<ASP_FORM>Y</ASP_FORM>
+		<ASP_Member>N</ASP_Member>
+		<ASP_Member_Number />
+	</ASP>
+</XML_DIZ_INFO>

From 6f3f0a826f8bb96ed13012ddaed043010703dc23 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 9 Feb 2017 11:24:01 +0100
Subject: [PATCH 0243/1163] Fix pad files

---
 build/pad/{pad_dolibarr_s.xml => pad_dolibarr_nos.xml} | 0
 build/pad/pad_doliwamp.xml                             | 4 ++--
 build/pad/{pad_doliwamp_s.xml => pad_doliwamp_nos.xml} | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename build/pad/{pad_dolibarr_s.xml => pad_dolibarr_nos.xml} (100%)
 rename build/pad/{pad_doliwamp_s.xml => pad_doliwamp_nos.xml} (98%)

diff --git a/build/pad/pad_dolibarr_s.xml b/build/pad/pad_dolibarr_nos.xml
similarity index 100%
rename from build/pad/pad_dolibarr_s.xml
rename to build/pad/pad_dolibarr_nos.xml
diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml
index 4f7981a4314..06eaec3af98 100644
--- a/build/pad/pad_doliwamp.xml
+++ b/build/pad/pad_doliwamp.xml
@@ -96,8 +96,8 @@ DoliWamp is the auto-installer for Windows users with no technical knowledge to
 		<Application_URLs>
 			<Application_Info_URL>http://www.nltechno.com/doliwamp/</Application_Info_URL>
 			<Application_Order_URL>http://www.nltechno.com/doliwamp/</Application_Order_URL>
-			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
-			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_Screenshot_URL>https://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>https://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
 			<Application_XML_File_URL>https://www.dolibarr.org/files/pad_doliwamp.xml</Application_XML_File_URL>
 		</Application_URLs>
 		<Download_URLs>
diff --git a/build/pad/pad_doliwamp_s.xml b/build/pad/pad_doliwamp_nos.xml
similarity index 98%
rename from build/pad/pad_doliwamp_s.xml
rename to build/pad/pad_doliwamp_nos.xml
index 06eaec3af98..4f7981a4314 100644
--- a/build/pad/pad_doliwamp_s.xml
+++ b/build/pad/pad_doliwamp_nos.xml
@@ -96,8 +96,8 @@ DoliWamp is the auto-installer for Windows users with no technical knowledge to
 		<Application_URLs>
 			<Application_Info_URL>http://www.nltechno.com/doliwamp/</Application_Info_URL>
 			<Application_Order_URL>http://www.nltechno.com/doliwamp/</Application_Order_URL>
-			<Application_Screenshot_URL>https://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
-			<Application_Icon_URL>https://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
 			<Application_XML_File_URL>https://www.dolibarr.org/files/pad_doliwamp.xml</Application_XML_File_URL>
 		</Application_URLs>
 		<Download_URLs>

From 488d68113d02452af35344592d50264749c38b70 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 9 Feb 2017 12:56:39 +0100
Subject: [PATCH 0244/1163] Add total in the file integrity checker

---
 htdocs/admin/system/filecheck.php | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 3a78fb6e9ea..6499f16f76c 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -184,6 +184,7 @@ if ($xml)
             }
         }
         
+        // Files missings
         $out.=load_fiche_titre($langs->trans("FilesMissing"));
         
         $out.='<table class="noborder">';
@@ -216,8 +217,10 @@ if ($xml)
 
         $out.='<br>';
 
+        // Files modified
         $out.=load_fiche_titre($langs->trans("FilesModified"));
         
+        $totalsize=0;
         $out.='<table class="noborder">';
         $out.='<tr class="liste_titre">';
         $out.='<td>#</td>';
@@ -241,10 +244,20 @@ if ($xml)
 	            $out.='<td>'.$file['filename'].'</td>' . "\n";
 	            $out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
 	            $out.='<td align="center">'.$file['md5'].'</td>' . "\n";
-	            $out.='<td align="right">'.dol_print_size(dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename'])).'</td>' . "\n";
+	            $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
+	            $totalsize += $size;
+	            $out.='<td align="right">'.dol_print_size($size).'</td>' . "\n";
 	            $out.='<td align="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').'</td>' . "\n";
 	            $out.="</tr>\n";
 	        }
+            $out.='<tr class="liste_total">';
+            $out.='<td></td>' . "\n";
+            $out.='<td>'.$langs->trans("Total").'</td>' . "\n";
+            $out.='<td align="center"></td>' . "\n";
+            $out.='<td align="center"></td>' . "\n";
+            $out.='<td align="right">'.dol_print_size($totalsize).'</td>' . "\n";
+            $out.='<td align="right"></td>' . "\n";
+            $out.="</tr>\n";
         }
         else 
         {
@@ -254,8 +267,10 @@ if ($xml)
         
         $out.='<br>';
         
+        // Files added
         $out.=load_fiche_titre($langs->trans("FilesAdded"));
         
+        $totalsize = 0;
         $out.='<table class="noborder">';
         $out.='<tr class="liste_titre">';
         $out.='<td>#</td>';
@@ -279,10 +294,20 @@ if ($xml)
                 $out.='<td>'.$file['filename'].'</td>' . "\n";
                 $out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
                 $out.='<td align="center">'.$file['md5'].'</td>' . "\n";
-                $out.='<td align="right">'.dol_print_size(dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename'])).'</td>' . "\n";
+                $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
+                $totalsize += $size;
+                $out.='<td align="right">'.dol_print_size($size).'</td>' . "\n";
                 $out.='<td align="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').'</td>' . "\n";
                 $out.="</tr>\n";
             }
+            $out.='<tr class="liste_total">';
+            $out.='<td></td>' . "\n";
+            $out.='<td>'.$langs->trans("Total").'</td>' . "\n";
+            $out.='<td align="center"></td>' . "\n";
+            $out.='<td align="center"></td>' . "\n";
+            $out.='<td align="right">'.dol_print_size($totalsize).'</td>' . "\n";
+            $out.='<td align="right"></td>' . "\n";
+            $out.="</tr>\n";
         }
         else
         {

From fa527ff4eb436003a4bb5a4764f14807f12183b4 Mon Sep 17 00:00:00 2001
From: De Coninck Laurent <laurent@adlogix.eu>
Date: Thu, 9 Feb 2017 13:10:32 +0100
Subject: [PATCH 0245/1163] fix the card page generator

---
 dev/skeletons/build_class_from_table.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php
index d9e30b23501..0e5a6d82a82 100755
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -636,7 +636,8 @@ foreach ($skeletonfiles as $skeletonfile => $outfile)
     {
     	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
     	{
-    	    $varprop.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td><input class=\"flat\" type=\"text\" name=\"".$prop['field']."\" value=\"'.\$object->".$prop['field'].".'\"></td></tr>';\n";
+            $baseString = 'print "<tr><td class=\"fieldrequired\">".\$langs->trans("Field%s")."</td><td><input class=\"flat\" type=\"text\" name=\"%s\" value=\"".$object->%s."\"></td></tr>";';
+            $varprop.= sprintf("\t ".$baseString." \n", $prop['field'], $prop['field'], $prop['field']);
     	}
     }
     $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_EDIT/', $varprop, $targetcontent);
@@ -648,7 +649,7 @@ foreach ($skeletonfiles as $skeletonfile => $outfile)
     {
     	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
     	{
-    	    $varprop.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td>\$object->".$prop['field']."</td></tr>';\n";
+    	    $varprop.=sprintf("\t print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field%s\").'</td><td>'.\$object->%s.'</td></tr>';\n",$prop['field'],$prop['field']);
     	}
     }
     $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_VIEW/', $varprop, $targetcontent);

From 7dddba3e39423636c0ed605e4c8caad1a9d33d99 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 9 Feb 2017 14:42:15 +0100
Subject: [PATCH 0246/1163] Add octicons

---
 htdocs/theme/common/octicons/.gitignore       |    4 +
 htdocs/theme/common/octicons/.npmignore       |    5 +
 htdocs/theme/common/octicons/.travis.yml      |    3 +
 htdocs/theme/common/octicons/CHANGELOG.md     |  363 +++++
 htdocs/theme/common/octicons/Gruntfile.js     |  137 ++
 htdocs/theme/common/octicons/LICENSE          |   21 +
 htdocs/theme/common/octicons/README.md        |  194 +++
 htdocs/theme/common/octicons/index.js         |   67 +
 htdocs/theme/common/octicons/lib/data.json    | 1174 +++++++++++++++++
 .../octicons/lib/octicons-master.sketch       |  Bin 0 -> 1957888 bytes
 htdocs/theme/common/octicons/lib/octicons.css |    5 +
 .../theme/common/octicons/lib/svg/alert.svg   |   12 +
 .../common/octicons/lib/svg/arrow-down.svg    |   12 +
 .../common/octicons/lib/svg/arrow-left.svg    |   12 +
 .../common/octicons/lib/svg/arrow-right.svg   |   12 +
 .../octicons/lib/svg/arrow-small-down.svg     |   12 +
 .../octicons/lib/svg/arrow-small-left.svg     |   12 +
 .../octicons/lib/svg/arrow-small-right.svg    |   12 +
 .../octicons/lib/svg/arrow-small-up.svg       |   12 +
 .../common/octicons/lib/svg/arrow-up.svg      |   12 +
 .../theme/common/octicons/lib/svg/beaker.svg  |   12 +
 htdocs/theme/common/octicons/lib/svg/bell.svg |   12 +
 htdocs/theme/common/octicons/lib/svg/bold.svg |   12 +
 htdocs/theme/common/octicons/lib/svg/book.svg |   12 +
 .../common/octicons/lib/svg/bookmark.svg      |   12 +
 .../common/octicons/lib/svg/briefcase.svg     |   12 +
 .../common/octicons/lib/svg/broadcast.svg     |   12 +
 .../theme/common/octicons/lib/svg/browser.svg |   12 +
 htdocs/theme/common/octicons/lib/svg/bug.svg  |   12 +
 .../common/octicons/lib/svg/calendar.svg      |   12 +
 .../theme/common/octicons/lib/svg/check.svg   |   12 +
 .../common/octicons/lib/svg/checklist.svg     |   12 +
 .../common/octicons/lib/svg/chevron-down.svg  |   12 +
 .../common/octicons/lib/svg/chevron-left.svg  |   12 +
 .../common/octicons/lib/svg/chevron-right.svg |   12 +
 .../common/octicons/lib/svg/chevron-up.svg    |   12 +
 .../common/octicons/lib/svg/circle-slash.svg  |   12 +
 .../common/octicons/lib/svg/circuit-board.svg |   12 +
 .../theme/common/octicons/lib/svg/clippy.svg  |   12 +
 .../theme/common/octicons/lib/svg/clock.svg   |   12 +
 .../octicons/lib/svg/cloud-download.svg       |   12 +
 .../common/octicons/lib/svg/cloud-upload.svg  |   12 +
 htdocs/theme/common/octicons/lib/svg/code.svg |   12 +
 .../octicons/lib/svg/comment-discussion.svg   |   12 +
 .../theme/common/octicons/lib/svg/comment.svg |   12 +
 .../common/octicons/lib/svg/credit-card.svg   |   12 +
 htdocs/theme/common/octicons/lib/svg/dash.svg |   12 +
 .../common/octicons/lib/svg/dashboard.svg     |   12 +
 .../common/octicons/lib/svg/database.svg      |   12 +
 .../octicons/lib/svg/desktop-download.svg     |   12 +
 .../octicons/lib/svg/device-camera-video.svg  |   12 +
 .../common/octicons/lib/svg/device-camera.svg |   12 +
 .../octicons/lib/svg/device-desktop.svg       |   12 +
 .../common/octicons/lib/svg/device-mobile.svg |   12 +
 .../common/octicons/lib/svg/diff-added.svg    |   12 +
 .../common/octicons/lib/svg/diff-ignored.svg  |   12 +
 .../common/octicons/lib/svg/diff-modified.svg |   12 +
 .../common/octicons/lib/svg/diff-removed.svg  |   12 +
 .../common/octicons/lib/svg/diff-renamed.svg  |   12 +
 htdocs/theme/common/octicons/lib/svg/diff.svg |   12 +
 .../common/octicons/lib/svg/ellipses.svg      |   12 +
 .../common/octicons/lib/svg/ellipsis.svg      |    3 +
 htdocs/theme/common/octicons/lib/svg/eye.svg  |   12 +
 .../common/octicons/lib/svg/file-binary.svg   |   12 +
 .../common/octicons/lib/svg/file-code.svg     |   12 +
 .../octicons/lib/svg/file-directory.svg       |   12 +
 .../common/octicons/lib/svg/file-media.svg    |   12 +
 .../common/octicons/lib/svg/file-pdf.svg      |   12 +
 .../octicons/lib/svg/file-submodule.svg       |   12 +
 .../lib/svg/file-symlink-directory.svg        |   12 +
 .../octicons/lib/svg/file-symlink-file.svg    |   12 +
 .../common/octicons/lib/svg/file-text.svg     |    3 +
 .../common/octicons/lib/svg/file-zip.svg      |   12 +
 htdocs/theme/common/octicons/lib/svg/file.svg |   12 +
 .../theme/common/octicons/lib/svg/flame.svg   |   12 +
 htdocs/theme/common/octicons/lib/svg/fold.svg |   12 +
 htdocs/theme/common/octicons/lib/svg/gear.svg |   12 +
 htdocs/theme/common/octicons/lib/svg/gift.svg |   12 +
 .../common/octicons/lib/svg/gist-secret.svg   |   12 +
 htdocs/theme/common/octicons/lib/svg/gist.svg |   12 +
 .../common/octicons/lib/svg/git-branch.svg    |   12 +
 .../common/octicons/lib/svg/git-commit.svg    |   12 +
 .../common/octicons/lib/svg/git-compare.svg   |   12 +
 .../common/octicons/lib/svg/git-merge.svg     |   12 +
 .../octicons/lib/svg/git-pull-request.svg     |   12 +
 .../theme/common/octicons/lib/svg/globe.svg   |   12 +
 .../theme/common/octicons/lib/svg/grabber.svg |   12 +
 .../theme/common/octicons/lib/svg/graph.svg   |   12 +
 .../theme/common/octicons/lib/svg/heart.svg   |   12 +
 .../theme/common/octicons/lib/svg/history.svg |   12 +
 htdocs/theme/common/octicons/lib/svg/home.svg |   12 +
 .../octicons/lib/svg/horizontal-rule.svg      |   12 +
 .../theme/common/octicons/lib/svg/hubot.svg   |   12 +
 .../theme/common/octicons/lib/svg/inbox.svg   |   12 +
 htdocs/theme/common/octicons/lib/svg/info.svg |   12 +
 .../common/octicons/lib/svg/issue-closed.svg  |   12 +
 .../common/octicons/lib/svg/issue-opened.svg  |   12 +
 .../octicons/lib/svg/issue-reopened.svg       |   12 +
 .../theme/common/octicons/lib/svg/italic.svg  |   12 +
 .../theme/common/octicons/lib/svg/jersey.svg  |   12 +
 htdocs/theme/common/octicons/lib/svg/key.svg  |   12 +
 .../common/octicons/lib/svg/keyboard.svg      |   12 +
 htdocs/theme/common/octicons/lib/svg/law.svg  |   12 +
 .../common/octicons/lib/svg/light-bulb.svg    |   12 +
 .../common/octicons/lib/svg/link-external.svg |   12 +
 htdocs/theme/common/octicons/lib/svg/link.svg |   12 +
 .../common/octicons/lib/svg/list-ordered.svg  |   12 +
 .../octicons/lib/svg/list-unordered.svg       |   12 +
 .../common/octicons/lib/svg/location.svg      |   12 +
 htdocs/theme/common/octicons/lib/svg/lock.svg |   12 +
 .../common/octicons/lib/svg/logo-gist.svg     |   12 +
 .../common/octicons/lib/svg/logo-github.svg   |   12 +
 .../common/octicons/lib/svg/mail-read.svg     |   12 +
 .../common/octicons/lib/svg/mail-reply.svg    |   12 +
 htdocs/theme/common/octicons/lib/svg/mail.svg |   12 +
 .../common/octicons/lib/svg/mark-github.svg   |   12 +
 .../common/octicons/lib/svg/markdown.svg      |   12 +
 .../common/octicons/lib/svg/megaphone.svg     |   12 +
 .../theme/common/octicons/lib/svg/mention.svg |   12 +
 .../common/octicons/lib/svg/milestone.svg     |   12 +
 .../theme/common/octicons/lib/svg/mirror.svg  |   12 +
 .../common/octicons/lib/svg/mortar-board.svg  |   12 +
 htdocs/theme/common/octicons/lib/svg/mute.svg |   12 +
 .../common/octicons/lib/svg/no-newline.svg    |   12 +
 htdocs/theme/common/octicons/lib/svg/note.svg |   12 +
 .../common/octicons/lib/svg/octoface.svg      |   12 +
 .../common/octicons/lib/svg/organization.svg  |   12 +
 .../theme/common/octicons/lib/svg/package.svg |   12 +
 .../common/octicons/lib/svg/paintcan.svg      |   12 +
 .../theme/common/octicons/lib/svg/pencil.svg  |   12 +
 .../theme/common/octicons/lib/svg/person.svg  |   12 +
 htdocs/theme/common/octicons/lib/svg/pin.svg  |   12 +
 htdocs/theme/common/octicons/lib/svg/plug.svg |   12 +
 .../common/octicons/lib/svg/plus-small.svg    |   12 +
 htdocs/theme/common/octicons/lib/svg/plus.svg |   12 +
 .../common/octicons/lib/svg/primitive-dot.svg |   12 +
 .../octicons/lib/svg/primitive-square.svg     |   12 +
 .../theme/common/octicons/lib/svg/project.svg |   12 +
 .../theme/common/octicons/lib/svg/pulse.svg   |   12 +
 .../common/octicons/lib/svg/question.svg      |   12 +
 .../theme/common/octicons/lib/svg/quote.svg   |   12 +
 .../common/octicons/lib/svg/radio-tower.svg   |   12 +
 .../theme/common/octicons/lib/svg/reply.svg   |   12 +
 .../common/octicons/lib/svg/repo-clone.svg    |   12 +
 .../octicons/lib/svg/repo-force-push.svg      |   12 +
 .../common/octicons/lib/svg/repo-forked.svg   |   12 +
 .../common/octicons/lib/svg/repo-pull.svg     |   12 +
 .../common/octicons/lib/svg/repo-push.svg     |   12 +
 htdocs/theme/common/octicons/lib/svg/repo.svg |   12 +
 .../theme/common/octicons/lib/svg/rocket.svg  |   12 +
 htdocs/theme/common/octicons/lib/svg/rss.svg  |   12 +
 htdocs/theme/common/octicons/lib/svg/ruby.svg |   12 +
 .../common/octicons/lib/svg/screen-full.svg   |   12 +
 .../common/octicons/lib/svg/screen-normal.svg |   12 +
 .../theme/common/octicons/lib/svg/search.svg  |   12 +
 .../theme/common/octicons/lib/svg/server.svg  |   12 +
 .../common/octicons/lib/svg/settings.svg      |   12 +
 .../theme/common/octicons/lib/svg/shield.svg  |   12 +
 .../theme/common/octicons/lib/svg/sign-in.svg |   12 +
 .../common/octicons/lib/svg/sign-out.svg      |   12 +
 .../theme/common/octicons/lib/svg/smiley.svg  |   12 +
 .../common/octicons/lib/svg/squirrel.svg      |   12 +
 htdocs/theme/common/octicons/lib/svg/star.svg |   12 +
 htdocs/theme/common/octicons/lib/svg/stop.svg |   12 +
 htdocs/theme/common/octicons/lib/svg/sync.svg |   12 +
 htdocs/theme/common/octicons/lib/svg/tag.svg  |   12 +
 .../common/octicons/lib/svg/tasklist.svg      |   12 +
 .../common/octicons/lib/svg/telescope.svg     |   12 +
 .../common/octicons/lib/svg/terminal.svg      |   12 +
 .../common/octicons/lib/svg/text-size.svg     |   12 +
 .../common/octicons/lib/svg/three-bars.svg    |   12 +
 .../common/octicons/lib/svg/thumbsdown.svg    |   12 +
 .../common/octicons/lib/svg/thumbsup.svg      |   12 +
 .../theme/common/octicons/lib/svg/tools.svg   |   12 +
 .../common/octicons/lib/svg/trashcan.svg      |   12 +
 .../common/octicons/lib/svg/triangle-down.svg |   12 +
 .../common/octicons/lib/svg/triangle-left.svg |   12 +
 .../octicons/lib/svg/triangle-right.svg       |   12 +
 .../common/octicons/lib/svg/triangle-up.svg   |   12 +
 .../theme/common/octicons/lib/svg/unfold.svg  |   12 +
 .../theme/common/octicons/lib/svg/unmute.svg  |   12 +
 .../common/octicons/lib/svg/unverified.svg    |   12 +
 .../common/octicons/lib/svg/verified.svg      |   12 +
 .../common/octicons/lib/svg/versions.svg      |   12 +
 .../theme/common/octicons/lib/svg/watch.svg   |   12 +
 htdocs/theme/common/octicons/lib/svg/x.svg    |   12 +
 htdocs/theme/common/octicons/lib/svg/zap.svg  |   12 +
 htdocs/theme/common/octicons/package.json     |   39 +
 188 files changed, 4106 insertions(+)
 create mode 100644 htdocs/theme/common/octicons/.gitignore
 create mode 100644 htdocs/theme/common/octicons/.npmignore
 create mode 100644 htdocs/theme/common/octicons/.travis.yml
 create mode 100644 htdocs/theme/common/octicons/CHANGELOG.md
 create mode 100644 htdocs/theme/common/octicons/Gruntfile.js
 create mode 100644 htdocs/theme/common/octicons/LICENSE
 create mode 100644 htdocs/theme/common/octicons/README.md
 create mode 100644 htdocs/theme/common/octicons/index.js
 create mode 100644 htdocs/theme/common/octicons/lib/data.json
 create mode 100644 htdocs/theme/common/octicons/lib/octicons-master.sketch
 create mode 100644 htdocs/theme/common/octicons/lib/octicons.css
 create mode 100644 htdocs/theme/common/octicons/lib/svg/alert.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/arrow-down.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/arrow-left.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/arrow-right.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/arrow-small-down.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/arrow-small-left.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/arrow-small-right.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/arrow-small-up.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/arrow-up.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/beaker.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/bell.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/bold.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/book.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/bookmark.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/briefcase.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/broadcast.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/browser.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/bug.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/calendar.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/check.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/checklist.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/chevron-down.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/chevron-left.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/chevron-right.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/chevron-up.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/circle-slash.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/circuit-board.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/clippy.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/clock.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/cloud-download.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/cloud-upload.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/code.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/comment-discussion.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/comment.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/credit-card.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/dash.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/dashboard.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/database.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/desktop-download.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/device-camera-video.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/device-camera.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/device-desktop.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/device-mobile.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/diff-added.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/diff-ignored.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/diff-modified.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/diff-removed.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/diff-renamed.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/diff.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/ellipses.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/ellipsis.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/eye.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/file-binary.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/file-code.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/file-directory.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/file-media.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/file-pdf.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/file-submodule.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/file-symlink-directory.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/file-symlink-file.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/file-text.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/file-zip.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/file.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/flame.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/fold.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/gear.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/gift.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/gist-secret.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/gist.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/git-branch.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/git-commit.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/git-compare.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/git-merge.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/git-pull-request.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/globe.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/grabber.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/graph.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/heart.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/history.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/home.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/horizontal-rule.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/hubot.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/inbox.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/info.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/issue-closed.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/issue-opened.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/issue-reopened.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/italic.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/jersey.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/key.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/keyboard.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/law.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/light-bulb.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/link-external.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/link.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/list-ordered.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/list-unordered.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/location.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/lock.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/logo-gist.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/logo-github.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/mail-read.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/mail-reply.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/mail.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/mark-github.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/markdown.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/megaphone.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/mention.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/milestone.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/mirror.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/mortar-board.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/mute.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/no-newline.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/note.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/octoface.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/organization.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/package.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/paintcan.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/pencil.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/person.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/pin.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/plug.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/plus-small.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/plus.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/primitive-dot.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/primitive-square.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/project.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/pulse.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/question.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/quote.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/radio-tower.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/reply.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/repo-clone.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/repo-force-push.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/repo-forked.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/repo-pull.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/repo-push.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/repo.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/rocket.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/rss.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/ruby.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/screen-full.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/screen-normal.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/search.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/server.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/settings.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/shield.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/sign-in.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/sign-out.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/smiley.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/squirrel.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/star.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/stop.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/sync.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/tag.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/tasklist.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/telescope.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/terminal.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/text-size.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/three-bars.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/thumbsdown.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/thumbsup.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/tools.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/trashcan.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/triangle-down.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/triangle-left.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/triangle-right.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/triangle-up.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/unfold.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/unmute.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/unverified.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/verified.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/versions.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/watch.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/x.svg
 create mode 100644 htdocs/theme/common/octicons/lib/svg/zap.svg
 create mode 100644 htdocs/theme/common/octicons/package.json

diff --git a/htdocs/theme/common/octicons/.gitignore b/htdocs/theme/common/octicons/.gitignore
new file mode 100644
index 00000000000..b0e34801fac
--- /dev/null
+++ b/htdocs/theme/common/octicons/.gitignore
@@ -0,0 +1,4 @@
+node_modules
+.DS_Store
+build
+*.log
diff --git a/htdocs/theme/common/octicons/.npmignore b/htdocs/theme/common/octicons/.npmignore
new file mode 100644
index 00000000000..f50769fa751
--- /dev/null
+++ b/htdocs/theme/common/octicons/.npmignore
@@ -0,0 +1,5 @@
+.github
+.travis.yml
+Gruntfile.js
+lib
+test
diff --git a/htdocs/theme/common/octicons/.travis.yml b/htdocs/theme/common/octicons/.travis.yml
new file mode 100644
index 00000000000..435bc15d7af
--- /dev/null
+++ b/htdocs/theme/common/octicons/.travis.yml
@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+  - '5'
diff --git a/htdocs/theme/common/octicons/CHANGELOG.md b/htdocs/theme/common/octicons/CHANGELOG.md
new file mode 100644
index 00000000000..2085dcb0169
--- /dev/null
+++ b/htdocs/theme/common/octicons/CHANGELOG.md
@@ -0,0 +1,363 @@
+### HEAD
+
+### 5.0.1
+
+Fixes:
+
+- projects icon renders as a block, using `fill-rule` fixes it
+
+### 5.0.0
+
+Adds:
+
+- `project`
+- `note`
+- `screen-full`
+- `screen-normal`
+- More node.js api endpoints for accessing icons https://github.com/primer/octicons/pull/120
+- Creating a spritesheet demo https://github.com/primer/octicons/pull/121
+
+Removes:
+
+- Deprecating support for the webfont https://github.com/primer/octicons/pull/117
+- Stop checking `/build/` directory into repository https://github.com/primer/octicons/pull/118
+- Removing sass as a dependency https://github.com/primer/octicons/pull/119
+
+### 4.4.0
+
+Adds:
+
+- svg.json file that is accessible from node require
+
+### 4.3.0
+
+Fixes:
+
+- Vertical alignment on `italic`
+
+Modifies:
+
+- `person`
+- `organization`
+
+### 4.2.1
+
+Fixes:
+
+- Removing inline sourcemap from `min` versions of css.
+
+### 4.2.0
+
+Adds:
+
+- Keywords.json file that has an index of all octicons with alias names
+
+### 4.1.1 (June 16, 2016)
+
+Fixes:
+
+- Putting the `$octicons-font-path` back in the scss file.
+
+### 4.1.0 (June 6, 2016)
+
+Adds:
+
+- Installation docs https://github.com/primer/octicons/pull/94
+- `grabber`
+- `plus-small`
+
+Modifies:
+
+- `smiley`
+
+Refines:
+
+- Renames `mail-reply` to `reply` and refines its shape.
+
+Fixes:
+
+- Revert license back to SPDX standard
+
+### 4.0.0 (June 6, 2016)
+
+Adds:
+
+- Whole new grunt build system including svg sprite sheet.
+- adding css min https://github.com/primer/octicons/pull/60
+- adding woff2 format https://github.com/primer/octicons/issues/3
+- creates spritesheet of svg files https://github.com/primer/octicons/issues/88
+
+Removes:
+
+- Bower support
+
+Fixes:
+
+- all svg icons include viewBox https://github.com/primer/octicons/issues/87
+- license in package.json https://github.com/primer/octicons/issues/85
+
+### 3.5.0 (February 12, 2016)
+
+Adds:
+
+- `unverified`
+
+Refines:
+
+- `verified`
+
+### 3.4.1 (January 24, 2016)
+
+This includes various SVG viewport refinements.
+
+Refines:
+
+- `thumbs-down`
+- `logo-github`
+
+### 3.4.0 (January 22, 2016)
+
+Adds:
+
+- `verified`
+- `smiley`
+
+Removes:
+
+- `color-mode`
+
+Refines:
+
+- `primitive-dot`
+- `horizontal-rule`
+- `triangle-down`
+- `triangle-up`
+- `triangle-left`
+- `triangle-right`
+- `globe`
+- `flame`
+- `comment-discussion`
+
+### 3.3.0 (November 12, 2015)
+
+Adds:
+
+- `logo-gist`
+
+Resizes all our SVG to be 16x16 instead of 1024x1024
+
+### 3.2.0 (November 6, 2015)
+
+Adds:
+
+- `bold`
+- `text-size`
+- `italic`
+- `tasklist`
+
+It also normalizes some styling in:
+
+- `list-unordered`
+- `list-ordered`
+- `quote`
+- `mention`
+- `bookmark`
+- `threebars`
+
+Removes
+
+- `screen-normal`
+- `screen-full`
+
+
+### 3.1.0 (August 13, 2015)
+
+Adds
+
+- `shield`
+
+This thickens stroke widths slightly on the following icons:
+
+- `circle-slash`
+- `clock`
+- `cloud-upload`
+- `cloud-download`
+- `dashboard`
+- `info`
+- `issue-closed`
+- `issue`
+- `issue-reopened`
+- `history`
+- `question`
+- `search`
+
+Fills `comment-discussion`
+
+Thickens `x` to match `checkmark`
+
+### 3.0.1 (August 10, 2015)
+
+Some files were missing in `3.0.0`
+
+### 3.0.0 (August 10, 2015)
+
+Removes
+
+- `microscope`
+- `beer`
+- `split`
+- `puzzle`
+- `steps`
+- `podium`
+- `timer`
+- all `alignment` icons
+- all `move` icons
+- all `playback` icons
+- all `jump` icons
+
+Adds
+
+- `beaker`
+- `bell`
+- `desktop-download`
+- `watch`
+
+Line-weight changes, sizing normalization, and new drawings
+
+- `circle-slash`
+- `lock`
+- `cloud-upload`
+- `cloud-download`
+- `plus`
+- `✕`
+- `broadcast`
+- `lock`
+- all `repo` icons
+- organization
+- person
+- all `chevrons` & `triangles`
+- all `diff` icons
+- `clippy`
+- all `issue` and circular icons
+- `rss`
+- `ruby`
+- `cancel`
+- `settings`
+- `mirror`
+- `external-link`
+- `history`
+- `gear`
+- `settings`
+- `info`
+- `history`
+- `package`
+- `gist-secret`
+- `rocket`
+- `law`
+- `telescope`
+- `search`
+- `tag`
+- `normal-screen`
+- `iphone`
+- `no-new-line`
+- `desktop`
+- all `git` icons
+- `circuit-board`
+- `heart`
+- `home`
+- `briefcase`
+- `wiki`
+- `bookmark`
+- `briefcase`
+- `calendar`
+- `color-mode`
+- `comment`
+- `discussions`
+- `credit-card`
+- `dashboard`
+- `camera`
+- `video`
+- `bug`
+- `desktop`
+- `ellipses`
+- `eye`
+- all `files` & `folders`
+- `fold`
+- `unfold`
+- `gift`
+- `graph`
+- `hubot`
+- `inbox`
+- `jersey`
+- `keyboard`
+- `light-bulb`
+- `link`
+- `location`
+- `mail`
+- `mail-read`
+- `marker`
+- `plug`
+- `mute`
+- `pencil`
+- `push-pin`
+- `fullscreen`
+- `unfullscreen`
+- `server`
+- `sign-in`
+- `sign-out`
+- `tag`
+- `terminal`
+- `thumbs-up`
+- `thumbs-down`
+- `trash`
+- `unmute`
+- `versions`
+- `gist`
+- `key`
+- `megaphone`
+- `checklist`
+
+## 2.4.1 (June 2, 2015)
+
+- Add the scss file I forgot to include
+
+## 2.4.0 (June 2, 2015)
+
+- Add `octicons.scss`
+- Revert path changes to `sprockets-octicons.scss`, as they broke octicons in sprockets.
+
+## 2.3.0 (May 28, 2015)
+
+- Add a path variable to `sprockets-octicons.scss` to be consistent with octicons.less`
+
+## 2.2.3 (May 21, 2015)
+
+- Use SPDX license identifiers in package.json
+
+## 2.2.2 (April 1, 2015)
+
+Fixes file icons for
+
+- `file-binary`
+- `file-code`
+- `file-media`
+- `file-pdf`
+- `file-symlink-file`
+- `file-text`
+- `file-zip`
+
+## 2.2.1 (March 30, 2015)
+
+- Fix vector artifact and smooth curves in `mark-github`
+
+## 2.2.0 (Feb 18, 2015)
+
+- Add two new icons: `thumbsup` and `thumbsdown`
+
+## 2.0.1 (June 16, 2014)
+
+- Add mention of github.com/logos to the license
+
+## 2.0.0 (June 16, 2014)
+
+- Hello world
diff --git a/htdocs/theme/common/octicons/Gruntfile.js b/htdocs/theme/common/octicons/Gruntfile.js
new file mode 100644
index 00000000000..48e0c300427
--- /dev/null
+++ b/htdocs/theme/common/octicons/Gruntfile.js
@@ -0,0 +1,137 @@
+var fs = require("fs")
+var path = require("path")
+
+module.exports = function(grunt) {
+
+  grunt.initConfig({
+
+    pkg: grunt.file.readJSON('package.json'),
+
+    cssnano: {
+      options: {},
+      dist: {
+        files: {
+          'build/octicons.min.css': 'build/octicons.css'
+        }
+      }
+    },
+
+    svgmin: {
+      dist: {
+        options: {
+          plugins: [
+            {removeTitle: true},
+            {removeStyleElement: true},
+            {removeAttrs: { attrs: ['id', 'class', 'data-name', 'fill'] }},
+            {removeEmptyContainers: true},
+            {sortAttrs: true},
+            {removeUselessDefs: true},
+            {removeEmptyText: true},
+            {removeEditorsNSData: true},
+            {removeEmptyAttrs: true},
+            {removeHiddenElems: true}
+          ]
+        },
+        files: [{
+          expand: true,
+          cwd: 'lib/svg',
+          src: ['*.svg'],
+          dest: 'build/svg'
+        }]
+      }
+    },
+
+    svgstore: {
+      options: {
+        includeTitleElement: false,
+        inheritviewbox: true,
+        includedemo: function(arg) {
+          var octicons = require("./index.js")
+
+          var icons = function() {
+            var result = []
+            Object.keys(octicons).forEach(function(key){
+              result.push("<div style=\"width: 10%;min-width: 100px;flex: 0 0 auto;box-sizing:border-box;padding:1em;text-align:center;\">" + octicons[key].toSVGUse({ height: 32 }) + "<div>" + key + "</div></div>")
+            })
+            return result.join("\n")
+          }
+
+          return `
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Octicons Spritesheet test</title>
+    <link rel="stylesheet" href="./octicons.css" media="screen" title="no title">
+    <style>
+      body {
+        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+        color: #222;
+        font-size: 15px;
+      }
+    </style>
+  </head>
+  <body>
+    ${arg.svg}
+    <div style="font-size: 2.2em;padding-left: 20px;">Octicons SVG Spritesheet demo</div>
+    <div style="font-size: 1.2em;margin: 1em 0;padding-left: 20px;">All the icons rendered below use the svg spriteheet located in the <code>/build/</code> directory.</div>
+    <div style="flex: 0 1 auto;display:flex;flex-wrap: wrap;    flex-direction: row;">
+      ${icons()}
+    </div>
+  </body>
+</html>
+`
+        }
+      },
+      default: {
+        files: {
+          "build/sprite.octicons.svg": ['build/svg/*.svg']
+        }
+      },
+    },
+
+    clean: {
+      build: [
+        'build/*'
+      ]
+    },
+
+    copy: {
+      css: {
+        src: "lib/octicons.css",
+        dest: "build/octicons.css"
+      }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadNpmTasks('grunt-svgstore');
+  grunt.loadNpmTasks('grunt-svgmin');
+  grunt.loadNpmTasks('grunt-cssnano');
+
+  // build tasks
+  grunt.registerTask('css',  ['copy', 'cssnano']);
+  grunt.registerTask('svg', ['clean', 'svgmin']);
+
+  // default task, build /dist/
+  grunt.registerTask('default', [ 'svg', 'css', 'json:svg', 'svgstore']);
+
+  grunt.registerTask('json:svg', 'add svg string to data.json build', function() {
+    var files = fs.readdirSync("./build/svg/")
+    var data = JSON.parse(fs.readFileSync("./lib/data.json"))
+
+    files.forEach(function(file) {
+      var svg = fs.readFileSync(path.resolve("./build/svg", file))
+      var key = path.basename(file, ".svg")
+      if (data[key]) {
+        var raw = svg.toString()
+        data[key].path = /<path.+\/>/g.exec(raw)[0]
+        data[key].height = /height="(\d+)"/g.exec(raw)[1]
+        data[key].width = /width="(\d+)"/g.exec(raw)[1]
+      }
+    })
+
+    fs.writeFileSync("build/data.json", JSON.stringify(data));
+  })
+};
diff --git a/htdocs/theme/common/octicons/LICENSE b/htdocs/theme/common/octicons/LICENSE
new file mode 100644
index 00000000000..4cf2020ce77
--- /dev/null
+++ b/htdocs/theme/common/octicons/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2012-2016 GitHub, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/htdocs/theme/common/octicons/README.md b/htdocs/theme/common/octicons/README.md
new file mode 100644
index 00000000000..84edd84dce5
--- /dev/null
+++ b/htdocs/theme/common/octicons/README.md
@@ -0,0 +1,194 @@
+# GitHub Octicons
+
+[![NPM version](https://img.shields.io/npm/v/octicons.svg)](https://www.npmjs.org/package/octicons)
+[![Build Status](https://travis-ci.org/primer/octicons.svg?branch=master)](https://travis-ci.org/primer/octicons)
+
+> Octicons are a scalable set of icons handcrafted with <3 by GitHub.
+
+## Install
+
+**NOTE:** The compiled files are located in `/build/`. This directory is located in the published npm package. Which means you can access it when you `npm install octicons`. You can also build this directory by following the [building octicons directions](#building-octicons). The files in the `/lib/` directory are the raw source files and are not compiled or optimized.
+
+#### NPM
+
+This repository is distributed with [npm][npm]. After [installing npm][install-npm], you can install `octicons` with this command.
+
+```
+$ npm install --save octicons
+```
+
+## Usage
+
+For all the usages, we recommend using the CSS located in `./build/octicons.css`. This is some simple CSS to normalize the icons and inherit colors.
+
+### Spritesheet
+
+With a [SVG sprite icon system](https://css-tricks.com/svg-sprites-use-better-icon-fonts/) you can include the sprite sheet located `./build/sprite.octicons.svg` after you [build the icons](#building-octicons) or from the npm package. There is a demo of how to use the spritesheet in the build directory also.
+
+### Node
+
+After installing `npm install octicons` you can access the icons like this.
+
+```js
+var octicons = require("octicons")
+octicons.alert
+// { keywords: [ 'warning', 'triangle', 'exclamation', 'point' ],
+//   path: '<path d="M8.865 1.52c-.18-.31-.51-.5-.87-.5s-.69.19-.87.5L.275 13.5c-.18.31-.18.69 0 1 .19.31.52.5.87.5h13.7c.36 0 .69-.19.86-.5.17-.31.18-.69.01-1L8.865 1.52zM8.995 13h-2v-2h2v2zm0-3h-2V6h2v4z"/>',
+//   height: '16',
+//   width: '16',
+//   symbol: 'alert',
+//   options:
+//    { version: '1.1',
+//      width: '16',
+//      height: '16',
+//      viewBox: '0 0 16 16',
+//      class: 'octicon octicon-alert',
+//      'aria-hidden': 'true' },
+//   toSVG: [Function] }
+```
+
+There will be a key for every icon, with `keywords` and `svg`.
+
+#### `octicons.alert.symbol`
+
+Returns the string of the symbol name
+
+```js
+octicons.x.symbol
+// "x"
+```
+
+#### `octicons.person.path`
+
+Path returns the string representation of the path of the icon.
+
+```js
+octicons.x.path
+// <path d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"></path>
+```
+
+#### `octicons.issue.options`
+
+This is a json object of all the `options` that will be added to the output tag.
+
+```js
+octicons.x.options
+// { version: '1.1', width: '12', height: '16', viewBox: '0 0 12 16', class: 'octicon octicon-x', 'aria-hidden': 'true' }
+```
+
+#### `octicons.alert.width`
+
+Width is the icon's true width. Based on the svg view box width. _Note, this doesn't change if you scale it up with size options, it only is the natural width of the icon_
+
+#### `octicons.alert.height`
+
+Height is the icon's true height. Based on the svg view box height. _Note, this doesn't change if you scale it up with size options, it only is the natural height of the icon_
+
+#### `keywords`
+
+Returns an array of keywords for the icon. The data [comes from the octicons repository](https://github.com/primer/octicons/blob/master/lib/data.json). Consider contributing more aliases for the icons.
+
+```js
+octicons.x.keywords
+// ["remove", "close", "delete"]
+```
+
+#### `octicons.alert.toSVG()`
+
+Returns a string of the svg tag
+
+```js
+octicons.x.toSVG()
+// <svg version="1.1" width="12" height="16" viewBox="0 0 12 16" class="octicon octicon-x" aria-hidden="true"><path d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"/></svg>
+```
+
+The `.toSVG()` method accepts an optional `options` object. This is used to add CSS classnames, a11y options, and sizing.
+
+##### class
+
+Add more CSS classes to the `<svg>` tag.
+
+```js
+octicons.x.toSVG({ "class": "close" })
+// <svg version="1.1" width="12" height="16" viewBox="0 0 12 16" class="octicon octicon-x close" aria-hidden="true"><path d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"/></svg>
+```
+
+##### aria-label
+
+Add accessibility `aria-label` to the icon.
+
+```js
+octicons.x.toSVG({ "aria-label": "Close the window" })
+// <svg version="1.1" width="12" height="16" viewBox="0 0 12 16" class="octicon octicon-x" aria-label="Close the window" role="img"><path d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"/></svg>
+```
+
+##### width & height
+
+Size the SVG icon larger using `width` & `height` independently or together.
+
+```js
+octicons.x.toSVG({ "width": 45 })
+// <svg version="1.1" width="45" height="60" viewBox="0 0 12 16" class="octicon octicon-x" aria-hidden="true"><path d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"/></svg>
+```
+
+#### `octicons.alert.toSVGUse()`
+
+Returns a string of the svg tag with the `<use>` tag, for use with the spritesheet located in the /build/ directory.
+
+```js
+octicons.x.toSVGUse()
+// <svg version="1.1" width="12" height="16" viewBox="0 0 12 16" class="octicon octicon-x" aria-hidden="true"><use xlink:href="#x" /></svg>
+```
+
+### Ruby
+
+If your environment is Ruby on Rails, we have a [octicons_helper](https://github.com/primer/octicons_helper) gem available that renders SVG in your page. The octicons_helper uses the [octicons_gem](https://github.com/primer/octicons_gem) to do the computing and reading of the SVG files.
+
+### Jekyll
+
+For jekyll, there's a [jekyll-octicons](https://github.com/primer/jekyll-octicons) plugin available. This works exactly like the octicons_helper.
+
+## Changing, adding, or deleting icons
+
+1. Open the [Sketch document][sketch-document] in `/lib/`. Each icon exists as an artboard within our master Sketch document. If you’re adding an icon, duplicate one of the artboards and add your shapes to it. Be sure to give your artboard a name that makes sense.
+2. Once you’re happy with your icon set, choose File > Export…
+3. Choose all the artboards you’d like to export and then press “Export”
+4. Export to `/lib/svg/`
+
+You’ll next need to build your Octicons.
+
+## Building Octicons
+
+All the files you need will be in the `/build/` directory already, but if you’ve made changes to the `/lib/` directory and need to regenerate, follow these steps:
+
+1. Open the Octicons directory in Terminal
+2. `npm install` to install all dependencies for the project.
+3. Run the command `npm run build`. This will run the grunt task to build the SVGs, placing them in the `/build/` directory.
+
+## Publishing
+
+If you have access to publish this repository, these are the steps to publishing. If you need access, contact [#design-systems](https://github.slack.com/archives/design-systems).
+
+1. Update the [CHANGELOG.md](./CHANGELOG.md) with relevant version number and any updates made to the repository.
+2. `npm version <newversion>` Run [npm version](https://docs.npmjs.com/cli/version) inputing the relevant version type. The versioning is [semver](http://semver.org/), so version appropriately based on what has changed.
+3. `npm publish` This will publish the new version to npmjs.org
+4. `git push && git push --tags` Push all these changes to origin.
+
+## License
+
+(c) 2012-2016 GitHub, Inc.
+
+When using the GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos).
+
+_SVG License:_ [SIL OFL 1.1](http://scripts.sil.org/OFL)  
+Applies to all SVG files
+
+_Code License:_ [MIT](./LICENSE)  
+Applies to all other files
+
+[primer]: https://github.com/primer/primer
+[docs]: http://primercss.io/
+[npm]: https://www.npmjs.com/
+[install-npm]: https://docs.npmjs.com/getting-started/installing-node
+[sass]: http://sass-lang.com/
+[sketch-document]: https://github.com/primer/octicons/blob/master/lib/octicons-master.sketch
diff --git a/htdocs/theme/common/octicons/index.js b/htdocs/theme/common/octicons/index.js
new file mode 100644
index 00000000000..186af5cb46c
--- /dev/null
+++ b/htdocs/theme/common/octicons/index.js
@@ -0,0 +1,67 @@
+var data = require('./build/data.json')
+
+Object.keys(data).forEach(function(key) {
+
+  // Returns a string representation of html attributes
+  var htmlAttributes = function(icon, options) {
+    var attributes = []
+    var attrObj = Object.assign({}, data[key].options, options)
+
+    // If the user passed in options
+    if (options) {
+
+      // If any of the width or height is passed in
+      if(options["width"] || options["height"]) {
+        attrObj["width"] = options["width"] ? options["width"] : (parseInt(options["height"]) * data[key].options["width"] / data[key].options["height"])
+        attrObj["height"] = options["height"] ? options["height"] : (parseInt(options["width"]) * data[key].options["height"] / data[key].options["width"])
+      }
+
+      // If the user passed in class
+      if (options["class"]) {
+        attrObj["class"] = "octicon octicon-" + key + " " + options["class"]
+        attrObj["class"].trim()
+      }
+
+      // If the user passed in aria-label
+      if (options["aria-label"]) {
+        attrObj["aria-label"] = options["aria-label"]
+        attrObj["role"] = "img"
+
+        // Un-hide the icon
+        delete attrObj["aria-hidden"]
+      }
+    }
+
+    Object.keys(attrObj).forEach(function(option) {
+      attributes.push(option + "=\"" + attrObj[option] + "\"")
+    })
+
+    return attributes.join(" ").trim()
+  }
+
+  // Set the symbol for easy access
+  data[key].symbol = key
+
+  // Set all the default options
+  data[key].options = {
+    "version": "1.1",
+    "width": data[key].width,
+    "height": data[key].height,
+    "viewBox": "0 0 " + data[key].width + " " + data[key].height,
+    "class": "octicon octicon-" + key,
+    "aria-hidden": "true"
+  }
+
+  // Function to return an SVG object
+  data[key].toSVG = function(options) {
+    return "<svg " + htmlAttributes(data[key], options) + ">" + data[key].path + "</svg>"
+  }
+
+  // Function to return an SVG object with a use, assuming you use the svg sprite
+  data[key].toSVGUse = function(options) {
+    return "<svg " + htmlAttributes(data[key], options) + "><use xlink:href=\"#" + key + "\" /></svg>"
+  }
+})
+
+// Import data into exports
+module.exports = data
diff --git a/htdocs/theme/common/octicons/lib/data.json b/htdocs/theme/common/octicons/lib/data.json
new file mode 100644
index 00000000000..af6b94aa6b1
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/data.json
@@ -0,0 +1,1174 @@
+{
+  "alert": {
+    "keywords": [
+      "warning",
+      "triangle",
+      "exclamation",
+      "point"
+    ]
+  },
+  "arrow-down": {
+    "keywords": [
+      "point",
+      "direction"
+    ]
+  },
+  "arrow-left": {
+    "keywords": [
+      "point",
+      "direction"
+    ]
+  },
+  "arrow-right": {
+    "keywords": [
+      "point",
+      "direction"
+    ]
+  },
+  "arrow-small-down": {
+    "keywords": [
+      "point",
+      "direction"
+    ]
+  },
+  "arrow-small-left": {
+    "keywords": [
+      "point",
+      "direction",
+      "little",
+      "tiny"
+    ]
+  },
+  "arrow-small-right": {
+    "keywords": [
+      "point",
+      "direction",
+      "little",
+      "tiny"
+    ]
+  },
+  "arrow-small-up": {
+    "keywords": [
+      "point",
+      "direction",
+      "little",
+      "tiny"
+    ]
+  },
+  "arrow-up": {
+    "keywords": [
+      "point",
+      "direction"
+    ]
+  },
+  "beaker": {
+    "keywords": [
+      "experiment",
+      "labs",
+      "experimental",
+      "feature",
+      "test",
+      "science",
+      "education",
+      "study",
+      "development",
+      "testing"
+    ]
+  },
+  "bell": {
+    "keywords": [
+      "notification"
+    ]
+  },
+  "bold": {
+    "keywords": [
+      "bold"
+    ]
+  },
+  "book": {
+    "keywords": [
+      "book",
+      "journal",
+      "wiki",
+      "readme"
+    ]
+  },
+  "bookmark": {
+    "keywords": [
+      "tabbard"
+    ]
+  },
+  "briefcase": {
+    "keywords": [
+      "suitcase",
+      "business"
+    ]
+  },
+  "broadcast": {
+    "keywords": [
+      "rss",
+      "radio",
+      "signal"
+    ]
+  },
+  "browser": {
+    "keywords": [
+      "window",
+      "web"
+    ]
+  },
+  "bug": {
+    "keywords": [
+      "insect"
+    ]
+  },
+  "calendar": {
+    "keywords": [
+      "time",
+      "day",
+      "month",
+      "year"
+    ]
+  },
+  "check": {
+    "keywords": [
+      "mark",
+      "yes",
+      "confirm",
+      "accept",
+      "ok",
+      "success"
+    ]
+  },
+  "checklist": {
+    "keywords": [
+      "todo"
+    ]
+  },
+  "chevron-down": {
+    "keywords": [
+      "triangle",
+      "arrow"
+    ]
+  },
+  "chevron-left": {
+    "keywords": [
+      "triangle",
+      "arrow"
+    ]
+  },
+  "chevron-right": {
+    "keywords": [
+      "triangle",
+      "arrow"
+    ]
+  },
+  "chevron-up": {
+    "keywords": [
+      "triangle",
+      "arrow"
+    ]
+  },
+  "circle-slash": {
+    "keywords": [
+      "no",
+      "deny",
+      "fail",
+      "failure",
+      "error",
+      "bad"
+    ]
+  },
+  "circuit-board": {
+    "keywords": [
+      "developer",
+      "hardware",
+      "electricity"
+    ]
+  },
+  "clippy": {
+    "keywords": [
+      "copy",
+      "paste",
+      "save",
+      "capture"
+    ]
+  },
+  "clock": {
+    "keywords": [
+      "time",
+      "hour",
+      "minute",
+      "second"
+    ]
+  },
+  "cloud-download": {
+    "keywords": [
+      "save",
+      "install",
+      "get"
+    ]
+  },
+  "cloud-upload": {
+    "keywords": [
+      "put",
+      "export"
+    ]
+  },
+  "code": {
+    "keywords": [
+      "brackets"
+    ]
+  },
+  "comment": {
+    "keywords": [
+      "speak",
+      "bubble"
+    ]
+  },
+  "comment-discussion": {
+    "keywords": [
+      "converse",
+      "talk"
+    ]
+  },
+  "credit-card": {
+    "keywords": [
+      "money",
+      "billing",
+      "payments",
+      "transactions"
+    ]
+  },
+  "dash": {
+    "keywords": [
+      "hyphen",
+      "range"
+    ]
+  },
+  "dashboard": {
+    "keywords": [
+      "speed",
+      "dial"
+    ]
+  },
+  "database": {
+    "keywords": [
+      "disks",
+      "data"
+    ]
+  },
+  "desktop-download": {
+    "keywords": [
+      "clone",
+      "download"
+    ]
+  },
+  "device-camera": {
+    "keywords": [
+      "photo",
+      "picture",
+      "image",
+      "snapshot"
+    ]
+  },
+  "device-camera-video": {
+    "keywords": [
+      "watch",
+      "view",
+      "media",
+      "stream"
+    ]
+  },
+  "device-desktop": {
+    "keywords": [
+      "computer",
+      "monitor"
+    ]
+  },
+  "device-mobile": {
+    "keywords": [
+      "phone",
+      "iphone",
+      "cellphone"
+    ]
+  },
+  "diff": {
+    "keywords": [
+      "difference",
+      "changes",
+      "compare"
+    ]
+  },
+  "diff-added": {
+    "keywords": [
+      "new",
+      "addition"
+    ]
+  },
+  "diff-ignored": {
+    "keywords": [
+      "slash"
+    ]
+  },
+  "diff-modified": {
+    "keywords": [
+      "dot",
+      "changed",
+      "updated"
+    ]
+  },
+  "diff-removed": {
+    "keywords": [
+      "deleted",
+      "subtracted",
+      "dash"
+    ]
+  },
+  "diff-renamed": {
+    "keywords": [
+      "moved",
+      "arrow"
+    ]
+  },
+  "ellipses": {
+    "keywords": [
+      "dot",
+      "more"
+    ]
+  },
+  "ellipsis": {
+    "keywords": [
+      "read",
+      "more",
+      "hidden",
+      "expand"
+    ]
+  },
+  "eye": {
+    "keywords": [
+      "look",
+      "watch",
+      "see"
+    ]
+  },
+  "file": {
+    "keywords": [
+      "file"
+    ]
+  },
+  "file-binary": {
+    "keywords": [
+      "image",
+      "video",
+      "word",
+      "powerpoint",
+      "excel"
+    ]
+  },
+  "file-code": {
+    "keywords": [
+      "text",
+      "javascript",
+      "html",
+      "css",
+      "php",
+      "ruby",
+      "coffeescript",
+      "sass",
+      "scss"
+    ]
+  },
+  "file-directory": {
+    "keywords": [
+      "folder"
+    ]
+  },
+  "file-media": {
+    "keywords": [
+      "image",
+      "video",
+      "audio"
+    ]
+  },
+  "file-pdf": {
+    "keywords": [
+      "adobe"
+    ]
+  },
+  "file-submodule": {
+    "keywords": [
+      "folder"
+    ]
+  },
+  "file-symlink-directory": {
+    "keywords": [
+      "folder",
+      "subfolder",
+      "link",
+      "alias"
+    ]
+  },
+  "file-symlink-file": {
+    "keywords": [
+      "link",
+      "alias"
+    ]
+  },
+  "file-text": {
+    "keywords": [
+      "document"
+    ]
+  },
+  "file-zip": {
+    "keywords": [
+      "compress",
+      "archive"
+    ]
+  },
+  "flame": {
+    "keywords": [
+      "fire",
+      "hot",
+      "burn",
+      "trending"
+    ]
+  },
+  "fold": {
+    "keywords": [
+      "unfold",
+      "hide",
+      "collapse"
+    ]
+  },
+  "gear": {
+    "keywords": [
+      "settings"
+    ]
+  },
+  "gift": {
+    "keywords": [
+      "package",
+      "present",
+      "skill",
+      "craft",
+      "freebie"
+    ]
+  },
+  "gist": {
+    "keywords": [
+      "gist",
+      "github"
+    ]
+  },
+  "gist-secret": {
+    "keywords": [
+      "gist",
+      "secret",
+      "private"
+    ]
+  },
+  "git-branch": {
+    "keywords": [
+      "branch",
+      "git"
+    ]
+  },
+  "git-commit": {
+    "keywords": [
+      "save"
+    ]
+  },
+  "git-compare": {
+    "keywords": [
+      "difference",
+      "changes"
+    ]
+  },
+  "git-merge": {
+    "keywords": [
+      "join"
+    ]
+  },
+  "git-pull-request": {
+    "keywords": [
+      "review"
+    ]
+  },
+  "globe": {
+    "keywords": [
+      "world"
+    ]
+  },
+  "grabber": {
+    "keywords": [
+      "mover",
+      "drap",
+      "drop"
+    ]
+  },
+  "graph": {
+    "keywords": [
+      "trend",
+      "stats",
+      "statistics"
+    ]
+  },
+  "heart": {
+    "keywords": [
+      "love"
+    ]
+  },
+  "history": {
+    "keywords": [
+      "time",
+      "past",
+      "revert",
+      "back"
+    ]
+  },
+  "home": {
+    "keywords": [
+      "welcome",
+      "index",
+      "house",
+      "building"
+    ]
+  },
+  "horizontal-rule": {
+    "keywords": [
+      "hr"
+    ]
+  },
+  "hubot": {
+    "keywords": [
+      "robot"
+    ]
+  },
+  "inbox": {
+    "keywords": [
+      "mail",
+      "todo",
+      "new",
+      "messages"
+    ]
+  },
+  "info": {
+    "keywords": [
+      "help"
+    ]
+  },
+  "issue-closed": {
+    "keywords": [
+      "done",
+      "complete"
+    ]
+  },
+  "issue-opened": {
+    "keywords": [
+      "new"
+    ]
+  },
+  "issue-reopened": {
+    "keywords": [
+      "regression"
+    ]
+  },
+  "italic": {
+    "keywords": [
+      "font",
+      "italic",
+      "style"
+    ]
+  },
+  "jersey": {
+    "keywords": [
+      "team",
+      "game",
+      "basketball"
+    ]
+  },
+  "key": {
+    "keywords": [
+      "key",
+      "lock",
+      "secure",
+      "safe"
+    ]
+  },
+  "keyboard": {
+    "keywords": [
+      "type",
+      "keys",
+      "write",
+      "shortcuts"
+    ]
+  },
+  "law": {
+    "keywords": [
+      "legal",
+      "bill"
+    ]
+  },
+  "light-bulb": {
+    "keywords": [
+      "idea"
+    ]
+  },
+  "link": {
+    "keywords": [
+      "connect",
+      "hyperlink"
+    ]
+  },
+  "link-external": {
+    "keywords": [
+      "out",
+      "see",
+      "more",
+      "go",
+      "to"
+    ]
+  },
+  "list-ordered": {
+    "keywords": [
+      "numbers",
+      "tasks",
+      "todo",
+      "items"
+    ]
+  },
+  "list-unordered": {
+    "keywords": [
+      "bullet",
+      "point",
+      "tasks",
+      "todo",
+      "items"
+    ]
+  },
+  "location": {
+    "keywords": [
+      "here",
+      "marker"
+    ]
+  },
+  "lock": {
+    "keywords": [
+      "secure",
+      "safe",
+      "protected"
+    ]
+  },
+  "logo-gist": {
+    "keywords": [
+      "logo",
+      "gist"
+    ]
+  },
+  "logo-github": {
+    "keywords": [
+      "brand"
+    ]
+  },
+  "mail": {
+    "keywords": [
+      "email",
+      "unread"
+    ]
+  },
+  "mail-read": {
+    "keywords": [
+      "email",
+      "open"
+    ]
+  },
+  "mail-reply": {
+    "keywords": [
+      "email"
+    ]
+  },
+  "mark-github": {
+    "keywords": [
+      "octocat"
+    ]
+  },
+  "markdown": {
+    "keywords": [
+      "markup",
+      "style"
+    ]
+  },
+  "megaphone": {
+    "keywords": [
+      "bullhorn",
+      "loud",
+      "shout",
+      "broadcast"
+    ]
+  },
+  "mention": {
+    "keywords": [
+      "at",
+      "ping"
+    ]
+  },
+  "milestone": {
+    "keywords": [
+      "marker"
+    ]
+  },
+  "mirror": {
+    "keywords": [
+      "reflect"
+    ]
+  },
+  "mortar-board": {
+    "keywords": [
+      "education",
+      "learn",
+      "teach"
+    ]
+  },
+  "mute": {
+    "keywords": [
+      "quiet",
+      "sound",
+      "audio",
+      "turn",
+      "off"
+    ]
+  },
+  "no-newline": {
+    "keywords": [
+      "return"
+    ]
+  },
+  "note": {
+    "keywords": [
+      "card",
+      "paper",
+      "ticket"
+    ]
+  },
+  "octoface": {
+    "keywords": [
+      "octocat"
+    ]
+  },
+  "organization": {
+    "keywords": [
+      "people",
+      "group",
+      "team"
+    ]
+  },
+  "package": {
+    "keywords": [
+      "box",
+      "ship"
+    ]
+  },
+  "paintcan": {
+    "keywords": [
+      "style",
+      "theme",
+      "art",
+      "color"
+    ]
+  },
+  "pencil": {
+    "keywords": [
+      "edit",
+      "change",
+      "update",
+      "write"
+    ]
+  },
+  "person": {
+    "keywords": [
+      "people",
+      "man",
+      "woman",
+      "human"
+    ]
+  },
+  "pin": {
+    "keywords": [
+      "people",
+      "save",
+      "star",
+      "bookmark"
+    ]
+  },
+  "plug": {
+    "keywords": [
+      "hook",
+      "webhook"
+    ]
+  },
+  "plus": {
+    "keywords": [
+      "add",
+      "new",
+      "more"
+    ]
+  },
+  "plus-small": {
+    "keywords": [
+      "add",
+      "new",
+      "more",
+      "small"
+    ]
+  },
+  "primitive-dot": {
+    "keywords": [
+      "circle"
+    ]
+  },
+  "primitive-square": {
+    "keywords": [
+      "box"
+    ]
+  },
+  "project": {
+    "keywords": [
+      "board",
+      "kanban",
+      "columns",
+      "scrum"
+    ]
+  },
+  "pulse": {
+    "keywords": [
+      "graph",
+      "trend",
+      "line"
+    ]
+  },
+  "question": {
+    "keywords": [
+      "help",
+      "explain"
+    ]
+  },
+  "quote": {
+    "keywords": [
+      "quotation"
+    ]
+  },
+  "radio-tower": {
+    "keywords": [
+      "broadcast"
+    ]
+  },
+  "reply": {
+    "keywords": [
+      "reply all",
+      "back"
+    ]
+  },
+  "repo": {
+    "keywords": [
+      "book",
+      "journal"
+    ]
+  },
+  "repo-clone": {
+    "keywords": [
+      "book",
+      "journal"
+    ]
+  },
+  "repo-force-push": {
+    "keywords": [
+      "book",
+      "journal",
+      "put"
+    ]
+  },
+  "repo-forked": {
+    "keywords": [
+      "book",
+      "journal",
+      "copy"
+    ]
+  },
+  "repo-pull": {
+    "keywords": [
+      "book",
+      "journal",
+      "get"
+    ]
+  },
+  "repo-push": {
+    "keywords": [
+      "book",
+      "journal",
+      "put"
+    ]
+  },
+  "rocket": {
+    "keywords": [
+      "staff",
+      "stafftools",
+      "blast",
+      "off",
+      "space"
+    ]
+  },
+  "rss": {
+    "keywords": [
+      "broadcast",
+      "feed"
+    ]
+  },
+  "ruby": {
+    "keywords": [
+      "code"
+    ]
+  },
+  "screen-full": {
+    "keywords": [
+      "fullscreen",
+      "expand"
+    ]
+  },
+  "screen-normal": {
+    "keywords": [
+      "fullscreen",
+      "expand",
+      "exit"
+    ]
+  },
+  "search": {
+    "keywords": [
+      "magnifying",
+      "glass"
+    ]
+  },
+  "server": {
+    "keywords": [
+      "computers",
+      "racks",
+      "ops"
+    ]
+  },
+  "settings": {
+    "keywords": [
+      "sliders",
+      "filters"
+    ]
+  },
+  "shield": {
+    "keywords": [
+      "protect",
+      "shield",
+      "lock"
+    ]
+  },
+  "sign-in": {
+    "keywords": [
+      "door",
+      "arrow",
+      "direction",
+      "enter"
+    ]
+  },
+  "sign-out": {
+    "keywords": [
+      "door",
+      "arrow",
+      "direction",
+      "leave"
+    ]
+  },
+  "smiley": {
+    "keywords": [
+      "emoji",
+      "smile",
+      "mood",
+      "emotion"
+    ]
+  },
+  "squirrel": {
+    "keywords": [
+      "ship",
+      "shipit"
+    ]
+  },
+  "star": {
+    "keywords": [
+      "save",
+      "remember",
+      "like"
+    ]
+  },
+  "stop": {
+    "keywords": [
+      "block",
+      "spam"
+    ]
+  },
+  "sync": {
+    "keywords": [
+      "cycle",
+      "refresh",
+      "loop"
+    ]
+  },
+  "tag": {
+    "keywords": [
+      "release"
+    ]
+  },
+  "tasklist": {
+    "keywords": [
+      "todo"
+    ]
+  },
+  "telescope": {
+    "keywords": [
+      "science",
+      "space",
+      "look",
+      "view",
+      "explore"
+    ]
+  },
+  "terminal": {
+    "keywords": [
+      "code",
+      "ops",
+      "shell"
+    ]
+  },
+  "text-size": {
+    "keywords": [
+      "font",
+      "size",
+      "text"
+    ]
+  },
+  "three-bars": {
+    "keywords": [
+      "hamburger"
+    ]
+  },
+  "thumbsdown": {
+    "keywords": [
+      "thumb",
+      "thumbsdown",
+      "rejected"
+    ]
+  },
+  "thumbsup": {
+    "keywords": [
+      "thumb",
+      "thumbsup",
+      "prop",
+      "ship"
+    ]
+  },
+  "tools": {
+    "keywords": [
+      "screwdriver",
+      "wrench",
+      "settings"
+    ]
+  },
+  "trashcan": {
+    "keywords": [
+      "garbage",
+      "rubbish",
+      "recycle",
+      "delete"
+    ]
+  },
+  "triangle-down": {
+    "keywords": [
+      "arrow",
+      "point",
+      "direction"
+    ]
+  },
+  "triangle-left": {
+    "keywords": [
+      "arrow",
+      "point",
+      "direction"
+    ]
+  },
+  "triangle-right": {
+    "keywords": [
+      "arrow",
+      "point",
+      "direction"
+    ]
+  },
+  "triangle-up": {
+    "keywords": [
+      "arrow",
+      "point",
+      "direction"
+    ]
+  },
+  "unfold": {
+    "keywords": [
+      "expand",
+      "open",
+      "reveal"
+    ]
+  },
+  "unmute": {
+    "keywords": [
+      "loud",
+      "volume",
+      "audio",
+      "sound",
+      "play"
+    ]
+  },
+  "unverified": {
+    "keywords": [
+      "insecure",
+      "untrusted"
+    ]
+  },
+  "verified": {
+    "keywords": [
+      "trusted",
+      "secure",
+      "trustworthy"
+    ]
+  },
+  "versions": {
+    "keywords": [
+      "history"
+    ]
+  },
+  "watch": {
+    "keywords": [
+      "wait",
+      "hourglass"
+    ]
+  },
+  "x": {
+    "keywords": [
+      "remove",
+      "close",
+      "delete"
+    ]
+  },
+  "zap": {
+    "keywords": [
+      "electricity",
+      "lightning",
+      "props",
+      "like",
+      "star",
+      "save"
+    ]
+  }
+}
diff --git a/htdocs/theme/common/octicons/lib/octicons-master.sketch b/htdocs/theme/common/octicons/lib/octicons-master.sketch
new file mode 100644
index 0000000000000000000000000000000000000000..85a3f1d431d4afa5fdc9c45e4ef9e1e2975d6487
GIT binary patch
literal 1957888
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%0DoOjP4)U5o(M`Ik`I9XyRQAa<N
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%0DkOv40s%P
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%0DNKE~{M+F{3e4h50CcAVFa^S+9?
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/common/octicons/lib/octicons.css b/htdocs/theme/common/octicons/lib/octicons.css
new file mode 100644
index 00000000000..31d97867a12
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/octicons.css
@@ -0,0 +1,5 @@
+.octicon {
+  display: inline-block;
+  vertical-align: text-top;
+  fill: currentColor;
+}
diff --git a/htdocs/theme/common/octicons/lib/svg/alert.svg b/htdocs/theme/common/octicons/lib/svg/alert.svg
new file mode 100644
index 00000000000..3a75a6a4702
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/alert.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>alert</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="alert" fill="#000000">
+            <path d="M8.865,1.51999998 C8.685,1.20999998 8.355,1.01999998 7.995,1.01999998 C7.635,1.01999998 7.305,1.20999998 7.125,1.51999998 L0.275000001,13.5 C0.0950000006,13.81 0.0950000006,14.19 0.275000001,14.5 C0.465000001,14.81 0.795000001,15 1.145,15 L14.845,15 C15.205,15 15.535,14.81 15.705,14.5 C15.875,14.19 15.885,13.81 15.715,13.5 L8.865,1.51999998 Z M8.995,13 L6.995,13 L6.995,11 L8.995,11 L8.995,13 L8.995,13 Z M8.995,9.99999998 L6.995,9.99999998 L6.995,5.99999998 L8.995,5.99999998 L8.995,9.99999998 L8.995,9.99999998 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-down.svg b/htdocs/theme/common/octicons/lib/svg/arrow-down.svg
new file mode 100644
index 00000000000..49a04c4b48d
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/arrow-down.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>arrow-down</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="arrow-down" fill="#000000">
+            <polygon id="Shape" points="7 7 7 3 3 3 3 7 0 7 5 13 10 7"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-left.svg b/htdocs/theme/common/octicons/lib/svg/arrow-left.svg
new file mode 100644
index 00000000000..b6153c0eff2
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/arrow-left.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>arrow-left</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="arrow-left" fill="#000000">
+            <polygon id="Shape" points="6 3 0 8 6 13 6 10 10 10 10 6 6 6"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-right.svg b/htdocs/theme/common/octicons/lib/svg/arrow-right.svg
new file mode 100644
index 00000000000..5d7f96ac2d8
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/arrow-right.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>arrow-right</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="arrow-right" fill="#000000">
+            <polygon id="Shape" points="10 8 4 3 4 6 0 6 0 10 4 10 4 13"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-small-down.svg b/htdocs/theme/common/octicons/lib/svg/arrow-small-down.svg
new file mode 100644
index 00000000000..bcb668d9c2c
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/arrow-small-down.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="6px" height="16px" viewBox="0 0 6 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>arrow-small-down</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="arrow-small-down" fill="#000000">
+            <polygon id="Shape" points="4 7 4 5 2 5 2 7 0 7 3 11 6 7"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-small-left.svg b/htdocs/theme/common/octicons/lib/svg/arrow-small-left.svg
new file mode 100644
index 00000000000..a98f8a13e03
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/arrow-small-left.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="6px" height="16px" viewBox="0 0 6 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>arrow-small-left</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="arrow-small-left" fill="#000000">
+            <polygon id="Shape" points="4 7 4 5 0 8 4 11 4 9 6 9 6 7"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-small-right.svg b/htdocs/theme/common/octicons/lib/svg/arrow-small-right.svg
new file mode 100644
index 00000000000..ac121726607
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/arrow-small-right.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="6px" height="16px" viewBox="0 0 6 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>arrow-small-right</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="arrow-small-right" fill="#000000">
+            <polygon id="Shape" points="6 8 2 5 2 7 0 7 0 9 2 9 2 11"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-small-up.svg b/htdocs/theme/common/octicons/lib/svg/arrow-small-up.svg
new file mode 100644
index 00000000000..9bd85161df4
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/arrow-small-up.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="6px" height="16px" viewBox="0 0 6 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>arrow-small-up</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="arrow-small-up" fill="#000000">
+            <polygon id="Shape" points="3 5 0 9 2 9 2 11 4 11 4 9 6 9"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/arrow-up.svg b/htdocs/theme/common/octicons/lib/svg/arrow-up.svg
new file mode 100644
index 00000000000..a015f862bb2
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/arrow-up.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>arrow-up</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="arrow-up" fill="#000000">
+            <polygon id="Shape" points="5 3 0 9 3 9 3 13 7 13 7 9 10 9"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/beaker.svg b/htdocs/theme/common/octicons/lib/svg/beaker.svg
new file mode 100644
index 00000000000..48aa51a85a2
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/beaker.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>beaker</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="beaker" fill="#000000">
+            <path d="M14.3797254,14.59 L10.9997254,7 L10.9997254,3 L11.9997254,3 L11.9997254,2 L2.99972539,2 L2.99972539,3 L3.99972539,3 L3.99972539,7 L0.62972539,14.59 C0.32972539,15.25 0.81972539,16 1.53972539,16 L13.4797254,16 C14.1997254,16 14.6797254,15.25 14.3897254,14.59 L14.3797254,14.59 Z M3.74972539,10 L4.99972539,7 L4.99972539,3 L9.99972539,3 L9.99972539,7 L11.2497254,10 L3.74972539,10 L3.74972539,10 Z M7.99972539,8 L8.99972539,8 L8.99972539,9 L7.99972539,9 L7.99972539,8 L7.99972539,8 Z M6.99972539,7 L5.99972539,7 L5.99972539,6 L6.99972539,6 L6.99972539,7 L6.99972539,7 Z M6.99972539,4 L7.99972539,4 L7.99972539,5 L6.99972539,5 L6.99972539,4 L6.99972539,4 Z M6.99972539,1 L5.99972539,1 L5.99972539,0 L6.99972539,0 L6.99972539,1 L6.99972539,1 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/bell.svg b/htdocs/theme/common/octicons/lib/svg/bell.svg
new file mode 100644
index 00000000000..70607e932e7
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/bell.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>bell</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="bell" fill="#000000">
+            <path d="M14,12 L14,13 L0,13 L0,12 L0.73,11.42 C1.5,10.65 1.54,8.87 1.92,7 C2.69,3.23 6,2 6,2 C6,1.45 6.45,1 7,1 C7.55,1 8,1.45 8,2 C8,2 11.39,3.23 12.16,7 C12.54,8.88 12.58,10.66 13.35,11.42 L14.01,12 L14,12 Z M7,16 C8.11,16 9,15.11 9,14 L5,14 C5,15.11 5.89,16 7,16 L7,16 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/bold.svg b/htdocs/theme/common/octicons/lib/svg/bold.svg
new file mode 100644
index 00000000000..a63af7ac7a1
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/bold.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>bold</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="bold" fill="#000000">
+            <path d="M1,2 L4.83,2 C7.31,2 9.13,2.75 9.13,4.95 C9.13,6.09 8.5,7.18 7.46,7.56 L7.46,7.62 C8.79,7.92 9.76,8.85 9.76,10.48 C9.76,12.87 7.79,14 5.15,14 L1,14 L1,2 L1,2 Z M4.66,6.95 C6.33,6.95 7.04,6.29 7.04,5.26 C7.04,4.09 6.26,3.65 4.7,3.65 L3.13,3.65 L3.13,6.95 L4.66,6.95 L4.66,6.95 Z M4.93,12.34 C6.7,12.34 7.68,11.7 7.68,10.36 C7.68,9.09 6.73,8.55 4.93,8.55 L3.13,8.55 L3.13,12.35 L4.93,12.35 L4.93,12.34 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/book.svg b/htdocs/theme/common/octicons/lib/svg/book.svg
new file mode 100644
index 00000000000..76026481ccb
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/book.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>book</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="book" fill="#000000">
+            <path d="M3,5 L7,5 L7,6 L3,6 L3,5 L3,5 Z M3,8 L7,8 L7,7 L3,7 L3,8 L3,8 Z M3,10 L7,10 L7,9 L3,9 L3,10 L3,10 Z M14,5 L10,5 L10,6 L14,6 L14,5 L14,5 Z M14,7 L10,7 L10,8 L14,8 L14,7 L14,7 Z M14,9 L10,9 L10,10 L14,10 L14,9 L14,9 Z M16,3 L16,12 C16,12.55 15.55,13 15,13 L9.5,13 L8.5,14 L7.5,13 L2,13 C1.45,13 1,12.55 1,12 L1,3 C1,2.45 1.45,2 2,2 L7.5,2 L8.5,3 L9.5,2 L15,2 C15.55,2 16,2.45 16,3 L16,3 Z M8,3.5 L7.5,3 L2,3 L2,12 L8,12 L8,3.5 L8,3.5 Z M15,3 L9.5,3 L9,3.5 L9,12 L15,12 L15,3 L15,3 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/bookmark.svg b/htdocs/theme/common/octicons/lib/svg/bookmark.svg
new file mode 100644
index 00000000000..24fe161ed0d
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/bookmark.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>bookmark</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="bookmark" fill="#000000">
+            <path d="M9,0 L1,0 C0.27,0 0,0.27 0,1 L0,16 L5,12.91 L10,16 L10,1 C10,0.27 9.73,0 9,0 L9,0 Z M8.22,4.25 L6.36,5.61 L7.08,7.77 C7.14,7.99 7.06,8.05 6.88,7.94 L5,6.6 L3.12,7.94 C2.93,8.05 2.87,7.99 2.92,7.77 L3.64,5.61 L1.78,4.25 C1.61,4.09 1.64,4.02 1.87,4.02 L4.17,3.99 L4.87,1.83 L5.12,1.83 L5.82,3.99 L8.12,4.02 C8.35,4.02 8.39,4.1 8.21,4.25 L8.22,4.25 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/briefcase.svg b/htdocs/theme/common/octicons/lib/svg/briefcase.svg
new file mode 100644
index 00000000000..ae56b711b3c
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/briefcase.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>briefcase</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="briefcase" fill="#000000">
+            <path d="M9,4 L9,3 C9,2.45 8.55,2 8,2 L6,2 C5.45,2 5,2.45 5,3 L5,4 L1,4 C0.45,4 0,4.45 0,5 L0,13 C0,13.55 0.45,14 1,14 L13,14 C13.55,14 14,13.55 14,13 L14,5 C14,4.45 13.55,4 13,4 L9,4 L9,4 Z M6,3 L8,3 L8,4 L6,4 L6,3 L6,3 Z M13,9 L8,9 L8,10 L6,10 L6,9 L1,9 L1,5 L2,5 L2,8 L12,8 L12,5 L13,5 L13,9 L13,9 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/broadcast.svg b/htdocs/theme/common/octicons/lib/svg/broadcast.svg
new file mode 100644
index 00000000000..491048fb87a
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/broadcast.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>broadcast</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="broadcast" fill="#000000">
+            <path d="M9,9 L8,9 C8.55,9 9,8.55 9,8 L9,7 C9,6.45 8.55,6 8,6 L7,6 C6.45,6 6,6.45 6,7 L6,8 C6,8.55 6.45,9 7,9 L6,9 C5.45,9 5,9.45 5,10 L5,12 L6,12 L6,15 C6,15.55 6.45,16 7,16 L8,16 C8.55,16 9,15.55 9,15 L9,12 L10,12 L10,10 C10,9.45 9.55,9 9,9 L9,9 Z M7,7 L8,7 L8,8 L7,8 L7,7 L7,7 Z M9,11 L8,11 L8,15 L7,15 L7,11 L6,11 L6,10 L9,10 L9,11 L9,11 Z M11.09,7.5 C11.09,5.52 9.48,3.91 7.5,3.91 C5.52,3.91 3.91,5.52 3.91,7.5 C3.91,7.78 3.94,8.05 4,8.31 L4,10.29 C3.39,9.52 3,8.56 3,7.49 C3,5.01 5.02,2.99 7.5,2.99 C9.98,2.99 12,5.01 12,7.49 C12,8.55 11.61,9.52 11,10.29 L11,8.31 C11.06,8.04 11.09,7.78 11.09,7.5 L11.09,7.5 Z M15,7.5 C15,10.38 13.37,12.88 11,14.13 L11,13.08 C12.86,11.92 14.09,9.86 14.09,7.5 C14.09,3.86 11.14,0.91 7.5,0.91 C3.86,0.91 0.91,3.86 0.91,7.5 C0.91,9.86 2.14,11.92 4,13.08 L4,14.13 C1.63,12.88 0,10.38 0,7.5 C0,3.36 3.36,0 7.5,0 C11.64,0 15,3.36 15,7.5 L15,7.5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/browser.svg b/htdocs/theme/common/octicons/lib/svg/browser.svg
new file mode 100644
index 00000000000..5c9251d0f91
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/browser.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>browser</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="browser" fill="#000000">
+            <path d="M5,3 L6,3 L6,4 L5,4 L5,3 L5,3 Z M3,3 L4,3 L4,4 L3,4 L3,3 L3,3 Z M1,3 L2,3 L2,4 L1,4 L1,3 L1,3 Z M13,13 L1,13 L1,5 L13,5 L13,13 L13,13 Z M13,4 L7,4 L7,3 L13,3 L13,4 L13,4 Z M14,3 C14,2.45 13.55,2 13,2 L1,2 C0.45,2 0,2.45 0,3 L0,13 C0,13.55 0.45,14 1,14 L13,14 C13.55,14 14,13.55 14,13 L14,3 L14,3 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/bug.svg b/htdocs/theme/common/octicons/lib/svg/bug.svg
new file mode 100644
index 00000000000..8f515ad1b98
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/bug.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>bug</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="bug" fill="#000000">
+            <path d="M11,10 L14,10 L14,9 L11,9 L11,8 L14.17,6.97 L13.83,6.03 L11,7 L11,6 C11,5.45 10.55,5 9.99999998,5 L9.99999998,4 C9.99999998,3.52 9.63999998,3.12 9.16999998,3.03 L10.2,2 L12,2 L12,1 L9.79999998,1 L7.79999998,3 L7.20999998,3 L5.19999998,1 L2.99999998,1 L2.99999998,2 L4.79999998,2 L5.82999998,3.03 C5.35999998,3.12 4.99999998,3.51 4.99999998,4 L4.99999998,5 C4.44999998,5 3.99999998,5.45 3.99999998,6 L3.99999998,7 L1.16999998,6.03 L0.829999983,6.97 L3.99999998,8 L3.99999998,9 L0.999999983,9 L0.999999983,10 L3.99999998,10 L3.99999998,11 L0.829999983,12.03 L1.16999998,12.97 L3.99999998,12 L3.99999998,13 C3.99999998,13.55 4.44999998,14 4.99999998,14 L5.99999998,14 L6.99999998,13 L6.99999998,6 L7.99999998,6 L7.99999998,13 L8.99999998,14 L9.99999998,14 C10.55,14 11,13.55 11,13 L11,12 L13.83,12.97 L14.17,12.03 L11,11 L11,10 L11,10 Z M8.99999998,5 L5.99999998,5 L5.99999998,4 L8.99999998,4 L8.99999998,5 L8.99999998,5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/calendar.svg b/htdocs/theme/common/octicons/lib/svg/calendar.svg
new file mode 100644
index 00000000000..47755281156
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/calendar.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>calendar</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="calendar" fill="#000000">
+            <path d="M13,2 L12,2 L12,3.5 C12,3.78 11.78,4 11.5,4 L9.5,4 C9.22,4 9,3.78 9,3.5 L9,2 L6,2 L6,3.5 C6,3.78 5.78,4 5.5,4 L3.5,4 C3.22,4 3,3.78 3,3.5 L3,2 L2,2 C1.45,2 1,2.45 1,3 L1,14 C1,14.55 1.45,15 2,15 L13,15 C13.55,15 14,14.55 14,14 L14,3 C14,2.45 13.55,2 13,2 L13,2 Z M13,14 L2,14 L2,5 L13,5 L13,14 L13,14 Z M5,3 L4,3 L4,1 L5,1 L5,3 L5,3 Z M11,3 L10,3 L10,1 L11,1 L11,3 L11,3 Z M6,7 L5,7 L5,6 L6,6 L6,7 L6,7 Z M8,7 L7,7 L7,6 L8,6 L8,7 L8,7 Z M10,7 L9,7 L9,6 L10,6 L10,7 L10,7 Z M12,7 L11,7 L11,6 L12,6 L12,7 L12,7 Z M4,9 L3,9 L3,8 L4,8 L4,9 L4,9 Z M6,9 L5,9 L5,8 L6,8 L6,9 L6,9 Z M8,9 L7,9 L7,8 L8,8 L8,9 L8,9 Z M10,9 L9,9 L9,8 L10,8 L10,9 L10,9 Z M12,9 L11,9 L11,8 L12,8 L12,9 L12,9 Z M4,11 L3,11 L3,10 L4,10 L4,11 L4,11 Z M6,11 L5,11 L5,10 L6,10 L6,11 L6,11 Z M8,11 L7,11 L7,10 L8,10 L8,11 L8,11 Z M10,11 L9,11 L9,10 L10,10 L10,11 L10,11 Z M12,11 L11,11 L11,10 L12,10 L12,11 L12,11 Z M4,13 L3,13 L3,12 L4,12 L4,13 L4,13 Z M6,13 L5,13 L5,12 L6,12 L6,13 L6,13 Z M8,13 L7,13 L7,12 L8,12 L8,13 L8,13 Z M10,13 L9,13 L9,12 L10,12 L10,13 L10,13 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/check.svg b/htdocs/theme/common/octicons/lib/svg/check.svg
new file mode 100644
index 00000000000..fffa457ac33
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/check.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>check</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="check" fill="#000000">
+            <polygon id="Shape" points="12 5 4 13 0 9 1.5 7.5 4 10 10.5 3.5"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/checklist.svg b/htdocs/theme/common/octicons/lib/svg/checklist.svg
new file mode 100644
index 00000000000..2ba6b100be0
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/checklist.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>checklist</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="checklist" fill="#000000">
+            <path d="M16,8.5 L10,14.5 L7,11.5 L8.5,10 L10,11.5 L14.5,7 L16,8.5 L16,8.5 Z M5.7,12.2 L6.5,13 L2,13 C1.45,13 1,12.55 1,12 L1,3 C1,2.45 1.45,2 2,2 L9,2 C9.55,2 10,2.45 10,3 L10,9.5 L9.2,8.7 C8.81,8.31 8.17,8.31 7.78,8.7 L5.7,10.8 C5.31,11.19 5.31,11.82 5.7,12.21 L5.7,12.2 Z M4,4 L9,4 L9,3 L4,3 L4,4 L4,4 Z M4,6 L9,6 L9,5 L4,5 L4,6 L4,6 Z M4,8 L7,8 L7,7 L4,7 L4,8 L4,8 Z M3,9 L2,9 L2,10 L3,10 L3,9 L3,9 Z M3,7 L2,7 L2,8 L3,8 L3,7 L3,7 Z M3,5 L2,5 L2,6 L3,6 L3,5 L3,5 Z M3,3 L2,3 L2,4 L3,4 L3,3 L3,3 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/chevron-down.svg b/htdocs/theme/common/octicons/lib/svg/chevron-down.svg
new file mode 100644
index 00000000000..a77c7eae8c0
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/chevron-down.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>chevron-down</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="chevron-down" fill="#000000">
+            <polygon id="Shape" points="5 11 0 6 1.5 4.5 5 8.25 8.5 4.5 10 6"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/chevron-left.svg b/htdocs/theme/common/octicons/lib/svg/chevron-left.svg
new file mode 100644
index 00000000000..d09f2f39e97
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/chevron-left.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="8px" height="16px" viewBox="0 0 8 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>chevron-left</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="chevron-left" fill="#000000">
+            <polygon id="Shape" points="5.5 3 7 4.5 3.25 8 7 11.5 5.5 13 0.5 8"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/chevron-right.svg b/htdocs/theme/common/octicons/lib/svg/chevron-right.svg
new file mode 100644
index 00000000000..aaaa6f036f3
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/chevron-right.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="8px" height="16px" viewBox="0 0 8 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>chevron-right</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="chevron-right" fill="#000000">
+            <polygon id="Shape" points="7.5 8 2.5 13 1 11.5 4.75 8 1 4.5 2.5 3"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/chevron-up.svg b/htdocs/theme/common/octicons/lib/svg/chevron-up.svg
new file mode 100644
index 00000000000..4bd14a27c5d
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/chevron-up.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>chevron-up</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="chevron-up" fill="#000000">
+            <polygon id="Shape" points="10 10 8.5 11.5 5 7.75 1.5 11.5 0 10 5 5"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/circle-slash.svg b/htdocs/theme/common/octicons/lib/svg/circle-slash.svg
new file mode 100644
index 00000000000..f0f5143a802
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/circle-slash.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>circle-slash</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="circle-slash" fill="#000000">
+            <path d="M7,1 C3.14,1 0,4.14 0,8 C0,11.86 3.14,15 7,15 C10.86,15 14,11.86 14,8 C14,4.14 10.86,1 7,1 L7,1 Z M7,2.3 C8.3,2.3 9.5,2.74 10.47,3.47 L2.47,11.47 C1.74,10.5 1.3,9.3 1.3,8 C1.3,4.86 3.86,2.3 7,2.3 L7,2.3 Z M7,13.71 C5.7,13.71 4.5,13.27 3.53,12.54 L11.53,4.54 C12.26,5.51 12.7,6.71 12.7,8.01 C12.7,11.15 10.14,13.71 7,13.71 L7,13.71 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/circuit-board.svg b/htdocs/theme/common/octicons/lib/svg/circuit-board.svg
new file mode 100644
index 00000000000..5c4e07e59b1
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/circuit-board.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>circuit-board</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="circuit-board" fill="#000000">
+            <path d="M3,5 C3,4.45 3.45,4 4,4 C4.55,4 5,4.45 5,5 C5,5.55 4.55,6 4,6 C3.45,6 3,5.55 3,5 L3,5 Z M11,5 C11,4.45 10.55,4 10,4 C9.45,4 9,4.45 9,5 C9,5.55 9.45,6 10,6 C10.55,6 11,5.55 11,5 L11,5 Z M11,11 C11,10.45 10.55,10 10,10 C9.45,10 9,10.45 9,11 C9,11.55 9.45,12 10,12 C10.55,12 11,11.55 11,11 L11,11 Z M13,1 L5,1 L5,3.17 C5.36,3.36 5.64,3.64 5.83,4 L8.17,4 C8.59,3.22 9.5,2.72 10.51,2.95 C11.26,3.14 11.87,3.75 12.04,4.5 C12.35,5.88 11.32,7.09 9.99,7.09 C9.19,7.09 8.51,6.65 8.16,6 L5.83,6 C5.41,6.8 4.5,7.28 3.49,7.03 C2.76,6.86 2.15,6.25 1.97,5.51 C1.72,4.49 2.2,3.59 3,3.17 L3,1 L1,1 C0.45,1 0,1.45 0,2 L0,14 C0,14.55 0.45,15 1,15 L6,10 L8.17,10 C8.59,9.22 9.5,8.72 10.51,8.95 C11.26,9.14 11.87,9.75 12.04,10.5 C12.35,11.88 11.32,13.09 9.99,13.09 C9.19,13.09 8.51,12.65 8.16,12 L6.99,12 L4,15 L13,15 C13.55,15 14,14.55 14,14 L14,2 C14,1.45 13.55,1 13,1 L13,1 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/clippy.svg b/htdocs/theme/common/octicons/lib/svg/clippy.svg
new file mode 100644
index 00000000000..4001b75a296
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/clippy.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>clippy</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="clippy" fill="#000000">
+            <path d="M2,13 L6,13 L6,14 L2,14 L2,13 L2,13 Z M7,7 L2,7 L2,8 L7,8 L7,7 L7,7 Z M9,10 L9,8 L6,11 L9,14 L9,12 L14,12 L14,10 L9,10 L9,10 Z M4.5,9 L2,9 L2,10 L4.5,10 L4.5,9 L4.5,9 Z M2,12 L4.5,12 L4.5,11 L2,11 L2,12 L2,12 Z M11,13 L12,13 L12,15 C11.98,15.28 11.89,15.52 11.7,15.7 C11.51,15.88 11.28,15.98 11,16 L1,16 C0.45,16 0,15.55 0,15 L0,4 C0,3.45 0.45,3 1,3 L4,3 C4,1.89 4.89,1 6,1 C7.11,1 8,1.89 8,3 L11,3 C11.55,3 12,3.45 12,4 L12,9 L11,9 L11,6 L1,6 L1,15 L11,15 L11,13 L11,13 Z M2,5 L10,5 C10,4.45 9.55,4 9,4 L8,4 C7.45,4 7,3.55 7,3 C7,2.45 6.55,2 6,2 C5.45,2 5,2.45 5,3 C5,3.55 4.55,4 4,4 L3,4 C2.45,4 2,4.45 2,5 L2,5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/clock.svg b/htdocs/theme/common/octicons/lib/svg/clock.svg
new file mode 100644
index 00000000000..fb25a9ac451
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/clock.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>clock</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="clock" fill="#000000">
+            <path d="M8,8 L11,8 L11,10 L7,10 C6.45,10 6,9.55 6,9 L6,4 L8,4 L8,8 L8,8 Z M7,2.3 C10.14,2.3 12.7,4.86 12.7,8 C12.7,11.14 10.14,13.7 7,13.7 C3.86,13.7 1.3,11.14 1.3,8 C1.3,4.86 3.86,2.3 7,2.3 L7,2.3 Z M7,1 C3.14,1 0,4.14 0,8 C0,11.86 3.14,15 7,15 C10.86,15 14,11.86 14,8 C14,4.14 10.86,1 7,1 L7,1 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/cloud-download.svg b/htdocs/theme/common/octicons/lib/svg/cloud-download.svg
new file mode 100644
index 00000000000..0cd213d57c4
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/cloud-download.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>cloud-download</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="cloud-download" fill="#000000">
+            <path d="M9,12 L11,12 L8,15 L5,12 L7,12 L7,7 L9,7 L9,12 L9,12 Z M12,4 C12,3.56 11.09,1 7.5,1 C5.08,1 3,2.92 3,5 C1.02,5 0,6.52 0,8 C0,9.53 1,11 3,11 L6,11 L6,9.7 L3,9.7 C1.38,9.7 1.3,8.28 1.3,8 C1.3,7.83 1.35,6.3 3,6.3 L4.3,6.3 L4.3,5 C4.3,3.61 5.86,2.3 7.5,2.3 C10.05,2.3 10.63,3.85 10.7,4.1 L10.7,5.3 L12,5.3 C12.81,5.3 14.7,5.52 14.7,7.5 C14.7,9.59 12.45,9.7 12,9.7 L10,9.7 L10,11 L12,11 C14.08,11 16,9.84 16,7.5 C16,5.06 14.08,4 12,4 L12,4 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/cloud-upload.svg b/htdocs/theme/common/octicons/lib/svg/cloud-upload.svg
new file mode 100644
index 00000000000..b8c24ce596d
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/cloud-upload.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>cloud-upload</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="cloud-upload" fill="#000000">
+            <path d="M7,9 L5,9 L8,6 L11,9 L9,9 L9,14 L7,14 L7,9 L7,9 Z M12,5 C12,4.56 11.09,2 7.5,2 C5.08,2 3,3.92 3,6 C1.02,6 0,7.52 0,9 C0,10.53 1,12 3,12 L6,12 L6,10.7 L3,10.7 C1.38,10.7 1.3,9.28 1.3,9 C1.3,8.83 1.35,7.3 3,7.3 L4.3,7.3 L4.3,6 C4.3,4.61 5.86,3.3 7.5,3.3 C10.05,3.3 10.63,4.85 10.7,5.1 L10.7,6.3 L12,6.3 C12.81,6.3 14.7,6.52 14.7,8.5 C14.7,10.59 12.45,10.7 12,10.7 L10,10.7 L10,12 L12,12 C14.08,12 16,10.84 16,8.5 C16,6.06 14.08,5 12,5 L12,5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/code.svg b/htdocs/theme/common/octicons/lib/svg/code.svg
new file mode 100644
index 00000000000..a297c9ba1d6
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/code.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>code</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="code" fill="#000000">
+            <path d="M9.5,3 L8,4.5 L11.5,8 L8,11.5 L9.5,13 L14,8 L9.5,3 L9.5,3 Z M4.5,3 L0,8 L4.5,13 L6,11.5 L2.5,8 L6,4.5 L4.5,3 L4.5,3 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/comment-discussion.svg b/htdocs/theme/common/octicons/lib/svg/comment-discussion.svg
new file mode 100644
index 00000000000..85243149efe
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/comment-discussion.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>comment-discussion</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="comment-discussion" fill="#000000">
+            <path d="M15,1 L6,1 C5.45,1 5,1.45 5,2 L5,4 L1,4 C0.45,4 0,4.45 0,5 L0,11 C0,11.55 0.45,12 1,12 L2,12 L2,15 L5,12 L9,12 C9.55,12 10,11.55 10,11 L10,9 L11,9 L14,12 L14,9 L15,9 C15.55,9 16,8.55 16,8 L16,2 C16,1.45 15.55,1 15,1 L15,1 Z M9,11 L4.5,11 L3,12.5 L3,11 L1,11 L1,5 L5,5 L5,8 C5,8.55 5.45,9 6,9 L9,9 L9,11 L9,11 Z M15,8 L13,8 L13,9.5 L11.5,8 L6,8 L6,2 L15,2 L15,8 L15,8 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/comment.svg b/htdocs/theme/common/octicons/lib/svg/comment.svg
new file mode 100644
index 00000000000..55279771463
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/comment.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>comment</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="comment" fill="#000000">
+            <path d="M14,1 L2,1 C1.45,1 1,1.45 1,2 L1,10 C1,10.55 1.45,11 2,11 L4,11 L4,14.5 L7.5,11 L14,11 C14.55,11 15,10.55 15,10 L15,2 C15,1.45 14.55,1 14,1 L14,1 Z M14,10 L7,10 L5,12 L5,10 L2,10 L2,2 L14,2 L14,10 L14,10 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/credit-card.svg b/htdocs/theme/common/octicons/lib/svg/credit-card.svg
new file mode 100644
index 00000000000..c801be4b18a
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/credit-card.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>credit-card</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="credit-card" fill="#000000">
+            <path d="M12,9 L2,9 L2,8 L12,8 L12,9 L12,9 Z M16,3 L16,12 C16,12.55 15.55,13 15,13 L1,13 C0.45,13 0,12.55 0,12 L0,3 C0,2.45 0.45,2 1,2 L15,2 C15.55,2 16,2.45 16,3 L16,3 Z M15,6 L1,6 L1,12 L15,12 L15,6 L15,6 Z M15,3 L1,3 L1,4 L15,4 L15,3 L15,3 Z M6,10 L2,10 L2,11 L6,11 L6,10 L6,10 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/dash.svg b/htdocs/theme/common/octicons/lib/svg/dash.svg
new file mode 100644
index 00000000000..6c000a991b0
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/dash.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="8px" height="16px" viewBox="0 0 8 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>dash</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="dash" fill="#000000">
+            <polygon id="Shape" points="0 7 0 9 8 9 8 7"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/dashboard.svg b/htdocs/theme/common/octicons/lib/svg/dashboard.svg
new file mode 100644
index 00000000000..7c37b3a6637
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/dashboard.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>dashboard</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="dashboard" fill="#000000">
+            <path d="M9,5 L8,5 L8,4 L9,4 L9,5 L9,5 Z M13,8 L12,8 L12,9 L13,9 L13,8 L13,8 Z M6,5 L5,5 L5,6 L6,6 L6,5 L6,5 Z M5,8 L4,8 L4,9 L5,9 L5,8 L5,8 Z M16,2.5 L15.5,2 L9,7 C8.94,6.98 8,7 8,7 C7.45,7 7,7.45 7,8 L7,9 C7,9.55 7.45,10 8,10 L9,10 C9.55,10 10,9.55 10,9 L10,8.08 L16,2.5 L16,2.5 Z M14.41,6.59 C14.6,7.2 14.71,7.84 14.71,8.5 C14.71,11.92 11.93,14.7 8.51,14.7 C5.09,14.7 2.3,11.92 2.3,8.5 C2.3,5.08 5.08,2.3 8.5,2.3 C9.7,2.3 10.81,2.64 11.77,3.24 L12.71,2.3 C11.52,1.49 10.07,1 8.51,1 C4.36,1 1,4.36 1,8.5 C1,12.64 4.36,16 8.5,16 C12.64,16 16,12.64 16,8.5 C16,7.47 15.8,6.48 15.41,5.59 L14.41,6.59 L14.41,6.59 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/database.svg b/htdocs/theme/common/octicons/lib/svg/database.svg
new file mode 100644
index 00000000000..f1b798a970c
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/database.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>database</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="database" fill="#000000">
+            <path d="M6,15 C2.69,15 0,14.1 0,13 L0,11 C0,10.83 0.09,10.66 0.21,10.5 C0.88,11.36 3.21,12 6,12 C8.79,12 11.12,11.36 11.79,10.5 C11.92,10.66 12,10.83 12,11 L12,13 C12,14.1 9.31,15 6,15 L6,15 Z M6,11 C2.69,11 0,10.1 0,9 L0,7 C0,6.89 0.04,6.79 0.09,6.69 L0.09,6.69 C0.12,6.63 0.16,6.56 0.21,6.5 C0.88,7.36 3.21,8 6,8 C8.79,8 11.12,7.36 11.79,6.5 C11.84,6.56 11.88,6.63 11.91,6.69 L11.91,6.69 C11.96,6.79 12,6.9 12,7 L12,9 C12,10.1 9.31,11 6,11 L6,11 Z M6,7 C2.69,7 0,6.1 0,5 L0,4 L0,3 C0,1.9 2.69,1 6,1 C9.31,1 12,1.9 12,3 L12,4 L12,5 C12,6.1 9.31,7 6,7 L6,7 Z M6,2 C3.79,2 2,2.45 2,3 C2,3.55 3.79,4 6,4 C8.21,4 10,3.55 10,3 C10,2.45 8.21,2 6,2 L6,2 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/desktop-download.svg b/htdocs/theme/common/octicons/lib/svg/desktop-download.svg
new file mode 100644
index 00000000000..6c9d08d97e0
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/desktop-download.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>desktop-download</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="desktop-download" fill="#000000">
+            <path d="M4,6 L7,6 L7,0 L9,0 L9,6 L12,6 L8,10 L4,6 L4,6 Z M15,2 L11,2 L11,3 L15,3 L15,11 L1,11 L1,3 L5,3 L5,2 L1,2 C0.45,2 0,2.45 0,3 L0,12 C0,12.55 0.45,13 1,13 L6.34,13 C6.09,13.61 5.48,14.39 4,15 L12,15 C10.52,14.39 9.91,13.61 9.66,13 L15,13 C15.55,13 16,12.55 16,12 L16,3 C16,2.45 15.55,2 15,2 L15,2 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/device-camera-video.svg b/htdocs/theme/common/octicons/lib/svg/device-camera-video.svg
new file mode 100644
index 00000000000..e8e8167a812
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/device-camera-video.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>device-camera-video</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="device-camera-video" fill="#000000">
+            <path d="M15.2,2.09 L10,5.72 L10,3 C10,2.45 9.55,2 9,2 L1,2 C0.45,2 0,2.45 0,3 L0,12 C0,12.55 0.45,13 1,13 L9,13 C9.55,13 10,12.55 10,12 L10,9.28 L15.2,12.91 C15.53,13.14 16,12.91 16,12.5 L16,2.5 C16,2.09 15.53,1.86 15.2,2.09 L15.2,2.09 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/device-camera.svg b/htdocs/theme/common/octicons/lib/svg/device-camera.svg
new file mode 100644
index 00000000000..f0fa4bc7cfd
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/device-camera.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>device-camera</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="device-camera" fill="#000000">
+            <path d="M15,3 L7,3 C7,2.45 6.55,2 6,2 L2,2 C1.45,2 1,2.45 1,3 C0.45,3 0,3.45 0,4 L0,13 C0,13.55 0.45,14 1,14 L15,14 C15.55,14 16,13.55 16,13 L16,4 C16,3.45 15.55,3 15,3 L15,3 Z M6,5 L2,5 L2,4 L6,4 L6,5 L6,5 Z M10.5,12 C8.56,12 7,10.44 7,8.5 C7,6.56 8.56,5 10.5,5 C12.44,5 14,6.56 14,8.5 C14,10.44 12.44,12 10.5,12 L10.5,12 Z M13,8.5 C13,9.88 11.87,11 10.5,11 C9.13,11 8,9.87 8,8.5 C8,7.13 9.13,6 10.5,6 C11.87,6 13,7.13 13,8.5 L13,8.5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/device-desktop.svg b/htdocs/theme/common/octicons/lib/svg/device-desktop.svg
new file mode 100644
index 00000000000..d2cae7ae900
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/device-desktop.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>device-desktop</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="device-desktop" fill="#000000">
+            <path d="M15,2 L1,2 C0.45,2 0,2.45 0,3 L0,12 C0,12.55 0.45,13 1,13 L6.34,13 C6.09,13.61 5.48,14.39 4,15 L12,15 C10.52,14.39 9.91,13.61 9.66,13 L15,13 C15.55,13 16,12.55 16,12 L16,3 C16,2.45 15.55,2 15,2 L15,2 Z M15,11 L1,11 L1,3 L15,3 L15,11 L15,11 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/device-mobile.svg b/htdocs/theme/common/octicons/lib/svg/device-mobile.svg
new file mode 100644
index 00000000000..549767577c0
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/device-mobile.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>device-mobile</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="device-mobile" fill="#000000">
+            <path d="M9,0 L1,0 C0.45,0 0,0.45 0,1 L0,15 C0,15.55 0.45,16 1,16 L9,16 C9.55,16 10,15.55 10,15 L10,1 C10,0.45 9.55,0 9,0 L9,0 Z M5,15.3 C4.28,15.3 3.7,14.72 3.7,14 C3.7,13.28 4.28,12.7 5,12.7 C5.72,12.7 6.3,13.28 6.3,14 C6.3,14.72 5.72,15.3 5,15.3 L5,15.3 Z M9,12 L1,12 L1,2 L9,2 L9,12 L9,12 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/diff-added.svg b/htdocs/theme/common/octicons/lib/svg/diff-added.svg
new file mode 100644
index 00000000000..0b1cd1779c3
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/diff-added.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>diff-added</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="diff-added" fill="#000000">
+            <path d="M13,1 L1,1 C0.45,1 0,1.45 0,2 L0,14 C0,14.55 0.45,15 1,15 L13,15 C13.55,15 14,14.55 14,14 L14,2 C14,1.45 13.55,1 13,1 L13,1 Z M13,14 L1,14 L1,2 L13,2 L13,14 L13,14 Z M6,9 L3,9 L3,7 L6,7 L6,4 L8,4 L8,7 L11,7 L11,9 L8,9 L8,12 L6,12 L6,9 L6,9 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/diff-ignored.svg b/htdocs/theme/common/octicons/lib/svg/diff-ignored.svg
new file mode 100644
index 00000000000..bd11f983b1e
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/diff-ignored.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>diff-ignored</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="diff-ignored" fill="#000000">
+            <path d="M13,1 L1,1 C0.45,1 0,1.45 0,2 L0,14 C0,14.55 0.45,15 1,15 L13,15 C13.55,15 14,14.55 14,14 L14,2 C14,1.45 13.55,1 13,1 L13,1 Z M13,14 L1,14 L1,2 L13,2 L13,14 L13,14 Z M4.5,12 L3,12 L3,10.5 L9.5,4 L11,4 L11,5.5 L4.5,12 L4.5,12 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/diff-modified.svg b/htdocs/theme/common/octicons/lib/svg/diff-modified.svg
new file mode 100644
index 00000000000..03929da650f
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/diff-modified.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>diff-modified</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="diff-modified" fill="#000000">
+            <path d="M13,1 L1,1 C0.45,1 0,1.45 0,2 L0,14 C0,14.55 0.45,15 1,15 L13,15 C13.55,15 14,14.55 14,14 L14,2 C14,1.45 13.55,1 13,1 L13,1 Z M13,14 L1,14 L1,2 L13,2 L13,14 L13,14 Z M4,8 C4,6.34 5.34,5 7,5 C8.66,5 10,6.34 10,8 C10,9.66 8.66,11 7,11 C5.34,11 4,9.66 4,8 L4,8 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/diff-removed.svg b/htdocs/theme/common/octicons/lib/svg/diff-removed.svg
new file mode 100644
index 00000000000..b5c25a3ccc6
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/diff-removed.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>diff-removed</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="diff-removed" fill="#000000">
+            <path d="M13,1 L1,1 C0.45,1 0,1.45 0,2 L0,14 C0,14.55 0.45,15 1,15 L13,15 C13.55,15 14,14.55 14,14 L14,2 C14,1.45 13.55,1 13,1 L13,1 Z M13,14 L1,14 L1,2 L13,2 L13,14 L13,14 Z M11,9 L3,9 L3,7 L11,7 L11,9 L11,9 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/diff-renamed.svg b/htdocs/theme/common/octicons/lib/svg/diff-renamed.svg
new file mode 100644
index 00000000000..3f385f1fab8
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/diff-renamed.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>diff-renamed</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="diff-renamed" fill="#000000">
+            <path d="M6,9 L3,9 L3,7 L6,7 L6,4 L11,8 L6,12 L6,9 L6,9 Z M14,2 L14,14 C14,14.55 13.55,15 13,15 L1,15 C0.45,15 0,14.55 0,14 L0,2 C0,1.45 0.45,1 1,1 L13,1 C13.55,1 14,1.45 14,2 L14,2 Z M13,2 L1,2 L1,14 L13,14 L13,2 L13,2 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/diff.svg b/htdocs/theme/common/octicons/lib/svg/diff.svg
new file mode 100644
index 00000000000..0ea237dfbd7
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/diff.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="13px" height="16px" viewBox="0 0 13 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>diff</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="diff" fill="#000000">
+            <path d="M6,7 L8,7 L8,8 L6,8 L6,10 L5,10 L5,8 L3,8 L3,7 L5,7 L5,5 L6,5 L6,7 L6,7 Z M3,13 L8,13 L8,12 L3,12 L3,13 L3,13 Z M7.5,2 L11,5.5 L11,15 C11,15.55 10.55,16 10,16 L1,16 C0.45,16 0,15.55 0,15 L0,3 C0,2.45 0.45,2 1,2 L7.5,2 L7.5,2 Z M10,6 L7,3 L1,3 L1,15 L10,15 L10,6 L10,6 Z M8.5,0 L3,0 L3,1 L8,1 L12,5 L12,13 L13,13 L13,4.5 L8.5,0 L8.5,0 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/ellipses.svg b/htdocs/theme/common/octicons/lib/svg/ellipses.svg
new file mode 100644
index 00000000000..cba76eb46dd
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/ellipses.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>ellipses</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="ellipses" fill="#000000">
+            <path d="M11,5 L1,5 C0.45,5 0,5.45 0,6 L0,10 C0,10.55 0.45,11 1,11 L11,11 C11.55,11 12,10.55 12,10 L12,6 C12,5.45 11.55,5 11,5 L11,5 Z M4,9 L2,9 L2,7 L4,7 L4,9 L4,9 Z M7,9 L5,9 L5,7 L7,7 L7,9 L7,9 Z M10,9 L8,9 L8,7 L10,7 L10,9 L10,9 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/ellipsis.svg b/htdocs/theme/common/octicons/lib/svg/ellipsis.svg
new file mode 100644
index 00000000000..60acf955383
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/ellipsis.svg
@@ -0,0 +1,3 @@
+<svg height="16" width="12" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 16">
+  <path d="M11 5H1c-0.55 0-1 0.45-1 1v4c0 0.55 0.45 1 1 1h10c0.55 0 1-0.45 1-1V6c0-0.55-0.45-1-1-1zM4 9H2V7h2v2z m3 0H5V7h2v2z m3 0H8V7h2v2z" />
+</svg>
diff --git a/htdocs/theme/common/octicons/lib/svg/eye.svg b/htdocs/theme/common/octicons/lib/svg/eye.svg
new file mode 100644
index 00000000000..f2021488709
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/eye.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>eye</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="eye" fill="#000000">
+            <path d="M8.06,2 C3,2 0,8 0,8 C0,8 3,14 8.06,14 C13,14 16,8 16,8 C16,8 13,2 8.06,2 L8.06,2 Z M8,12 C5.8,12 4,10.22 4,8 C4,5.8 5.8,4 8,4 C10.22,4 12,5.8 12,8 C12,10.22 10.22,12 8,12 L8,12 Z M10,8 C10,9.11 9.11,10 8,10 C6.89,10 6,9.11 6,8 C6,6.89 6.89,6 8,6 C9.11,6 10,6.89 10,8 L10,8 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-binary.svg b/htdocs/theme/common/octicons/lib/svg/file-binary.svg
new file mode 100644
index 00000000000..8efbe8f5d2b
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/file-binary.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>file-binary</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="file-binary" fill="#000000">
+            <path d="M4,12 L5,12 L5,13 L2,13 L2,12 L3,12 L3,10 L2,10 L2,9 L4,9 L4,12 L4,12 Z M12,4.5 L12,14 C12,14.55 11.55,15 11,15 L1,15 C0.45,15 0,14.55 0,14 L0,2 C0,1.45 0.45,1 1,1 L8.5,1 L12,4.5 L12,4.5 Z M11,5 L8,2 L1,2 L1,14 L11,14 L11,5 L11,5 Z M8,4 L6,4 L6,5 L7,5 L7,7 L6,7 L6,8 L9,8 L9,7 L8,7 L8,4 L8,4 Z M2,4 L5,4 L5,8 L2,8 L2,4 L2,4 Z M3,7 L4,7 L4,5 L3,5 L3,7 L3,7 Z M6,9 L9,9 L9,13 L6,13 L6,9 L6,9 Z M7,12 L8,12 L8,10 L7,10 L7,12 L7,12 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-code.svg b/htdocs/theme/common/octicons/lib/svg/file-code.svg
new file mode 100644
index 00000000000..3bc2b299a42
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/file-code.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>file-code</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="file-code" fill="#000000">
+            <path d="M8.5,1 L1,1 C0.45,1 0,1.45 0,2 L0,14 C0,14.55 0.45,15 1,15 L11,15 C11.55,15 12,14.55 12,14 L12,4.5 L8.5,1 L8.5,1 Z M11,14 L1,14 L1,2 L8,2 L11,5 L11,14 L11,14 Z M5,6.98 L3.5,8.5 L5,10 L4.5,11 L2,8.5 L4.5,6 L5,6.98 L5,6.98 Z M7.5,6 L10,8.5 L7.5,11 L7,10.02 L8.5,8.5 L7,7 L7.5,6 L7.5,6 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-directory.svg b/htdocs/theme/common/octicons/lib/svg/file-directory.svg
new file mode 100644
index 00000000000..3b0ea6d66cb
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/file-directory.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>file-directory</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="file-directory" fill="#000000">
+            <path d="M13,4 L7,4 L7,3 C7,2.34 6.69,2 6,2 L1,2 C0.45,2 0,2.45 0,3 L0,13 C0,13.55 0.45,14 1,14 L13,14 C13.55,14 14,13.55 14,13 L14,5 C14,4.45 13.55,4 13,4 L13,4 Z M6,4 L1,4 L1,3 L6,3 L6,4 L6,4 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-media.svg b/htdocs/theme/common/octicons/lib/svg/file-media.svg
new file mode 100644
index 00000000000..db00315d134
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/file-media.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>file-media</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="file-media" fill="#000000">
+            <path d="M6,5 L8,5 L8,7 L6,7 L6,5 L6,5 Z M12,4.5 L12,14 C12,14.55 11.55,15 11,15 L1,15 C0.45,15 0,14.55 0,14 L0,2 C0,1.45 0.45,1 1,1 L8.5,1 L12,4.5 L12,4.5 Z M11,5 L8,2 L1,2 L1,13 L4,8 L6,12 L8,10 L11,13 L11,5 L11,5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-pdf.svg b/htdocs/theme/common/octicons/lib/svg/file-pdf.svg
new file mode 100644
index 00000000000..dcd774e9bc4
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/file-pdf.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>file-pdf</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="file-pdf" fill="#010101">
+            <path d="M8.5,1 L1,1 C0.44771525,1 0,1.44771525 0,2 L0,14 C0,14.5522847 0.44771525,15 1,15 L11,15 C11.5522847,15 12,14.5522847 12,14 L12,4.5 L8.5,1 Z M1,2 L5,2 C4.88021121,2.03682695 4.77292941,2.10604101 4.69,2.2 C4.57596619,2.33544491 4.49698141,2.4968486 4.46,2.67 C4.34406753,3.15093672 4.3136037,3.64851254 4.37,4.14 C4.42970074,4.74889969 4.54348307,5.35127671 4.71,5.94 C4.39913981,6.85020329 4.02832805,7.73881526 3.6,8.6 C3.1,9.6 2.8,10.26 2.69,10.44 C2.45490116,10.527838 2.22458325,10.6279762 2,10.74 C1.63797844,10.9047863 1.30126564,11.1202825 1,11.38 L1,2 L1,2 Z M5.42,6.8 C5.65615226,7.57227694 6.05511596,8.28495569 6.59,8.89 C6.8651023,9.12723152 7.18463148,9.30739159 7.53,9.42 C6.89,9.51 6.3,9.62 5.72,9.75 C5.10224214,9.89929979 4.49707287,10.0965649 3.91,10.34 C3.32292713,10.5834351 4.13,9.9 4.52,9.09 C4.8853939,8.349364 5.18973729,7.58014443 5.43,6.79 L5.43,6.79 L5.42,6.8 Z M11,14 L1.5,14 C1.44352149,14.0065306 1.38647851,14.0065306 1.33,14 C1.60061185,13.9042665 1.84896383,13.7545749 2.06,13.56 C2.76700578,12.8583965 3.36677981,12.0564515 3.84,11.18 C4.15,11.05 4.42,10.95 4.65,10.87 L5.07,10.73 C5.52,10.6 6.01,10.5 6.51,10.4 C7.01,10.3 7.51,10.24 7.99,10.2 C8.43725403,10.4162545 8.9023067,10.5935768 9.38,10.73 C9.78288787,10.8407498 10.1943157,10.9176835 10.61,10.96 L10.99,10.96 L10.99,14 L10.99,14 L11,14 Z M11,9.14 C10.7958695,9.02690387 10.5816018,8.93316173 10.36,8.86 C10.113806,8.8009088 9.86279363,8.76409365 9.61,8.75 C9.19880419,8.75303183 8.78812424,8.77974272 8.38,8.83 C8.0073597,8.68541471 7.66736947,8.46782096 7.38,8.19 C6.78281632,7.51840635 6.34221217,6.72258646 6.09,5.86 C6.20098287,5.19851127 6.26779732,4.53036675 6.29,3.86 C6.30923951,3.61037016 6.30923951,3.35962984 6.29,3.11 C6.35921678,2.80151577 6.28575056,2.47826438 6.09,2.23 C5.92718989,2.07232702 5.70638123,1.9890713 5.48,2 L8,2 L11,5 L11,9.13 L11,9.13 L11,9.14 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-submodule.svg b/htdocs/theme/common/octicons/lib/svg/file-submodule.svg
new file mode 100644
index 00000000000..aa782e68dff
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/file-submodule.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>file-submodule</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="file-submodule" fill="#000000">
+            <path d="M10,7 L4,7 L4,14 L13,14 C13.55,14 14,13.55 14,13 L14,8 L10,8 L10,7 L10,7 Z M9,9 L5,9 L5,8 L9,8 L9,9 L9,9 Z M13,4 L7,4 L7,3 C7,2.34 6.69,2 6,2 L1,2 C0.45,2 0,2.45 0,3 L0,13 C0,13.55 0.45,14 1,14 L3,14 L3,7 C3,6.45 3.45,6 4,6 L10,6 C10.55,6 11,6.45 11,7 L14,7 L14,5 C14,4.45 13.55,4 13,4 L13,4 Z M6,4 L1,4 L1,3 L6,3 L6,4 L6,4 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-symlink-directory.svg b/htdocs/theme/common/octicons/lib/svg/file-symlink-directory.svg
new file mode 100644
index 00000000000..5d689bec548
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/file-symlink-directory.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>file-symlink-directory</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="file-symlink-directory" fill="#000000">
+            <path d="M13,4 L7,4 L7,3 C7,2.34 6.69,2 6,2 L1,2 C0.45,2 0,2.45 0,3 L0,13 C0,13.55 0.45,14 1,14 L13,14 C13.55,14 14,13.55 14,13 L14,5 C14,4.45 13.55,4 13,4 L13,4 Z M1,3 L6,3 L6,4 L1,4 L1,3 L1,3 Z M7,12 L7,10 C6.02,9.98 5.16,10.22 4.45,10.7 C3.74,11.18 3.26,11.95 3,13 C3.02,11.36 3.39,10.12 4.13,9.27 C4.86,8.43 5.82,8 7.01,8 L7.01,6 L11.01,9 L7.01,12 L7,12 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-symlink-file.svg b/htdocs/theme/common/octicons/lib/svg/file-symlink-file.svg
new file mode 100644
index 00000000000..710224295de
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/file-symlink-file.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>file-symlink-file</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="file-symlink-file" fill="#000000">
+            <path d="M8.5,1 L1,1 C0.45,1 0,1.45 0,2 L0,14 C0,14.55 0.45,15 1,15 L11,15 C11.55,15 12,14.55 12,14 L12,4.5 L8.5,1 L8.5,1 Z M11,14 L1,14 L1,2 L8,2 L11,5 L11,14 L11,14 Z M6,4.5 L10,7.5 L6,10.5 L6,8.5 C5.02,8.48 4.16,8.72 3.45,9.2 C2.74,9.68 2.26,10.45 2,11.5 C2.02,9.86 2.39,8.62 3.13,7.77 C3.86,6.93 4.82,6.5 6.01,6.5 L6.01,4.5 L6,4.5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file-text.svg b/htdocs/theme/common/octicons/lib/svg/file-text.svg
new file mode 100644
index 00000000000..874cf5b9100
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/file-text.svg
@@ -0,0 +1,3 @@
+<svg height="16" width="12" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 16">
+  <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z" />
+</svg>
diff --git a/htdocs/theme/common/octicons/lib/svg/file-zip.svg b/htdocs/theme/common/octicons/lib/svg/file-zip.svg
new file mode 100644
index 00000000000..c0d0f282fb5
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/file-zip.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>file-zip</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="file-zip" fill="#010101">
+            <path d="M8.5,1 L1,1 C0.44771525,1 0,1.44771525 0,2 L0,14 C0,14.5522847 0.44771525,15 1,15 L11,15 C11.5522847,15 12,14.5522847 12,14 L12,4.5 L8.5,1 Z M11,14 L1,14 L1,2 L4,2 L4,3 L5,3 L5,2 L8,2 L11,5 L11,14 L11,14 Z M5,4 L5,3 L6,3 L6,4 L5,4 L5,4 Z M4,4 L5,4 L5,5 L4,5 L4,4 L4,4 Z M5,6 L5,5 L6,5 L6,6 L5,6 L5,6 Z M4,6 L5,6 L5,7 L4,7 L4,6 L4,6 Z M5,8 L5,7 L6,7 L6,8 L5,8 L5,8 Z M4,9.28 C3.38491093,9.63510459 3.00428692,10.2897779 3,11 L3,12 L7,12 L7,11 C7,9.8954305 6.1045695,9 5,9 L5,8 L4,8 L4,9.28 L4,9.28 Z M6,10 L6,11 L4,11 L4,10 L6,10 L6,10 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/file.svg b/htdocs/theme/common/octicons/lib/svg/file.svg
new file mode 100644
index 00000000000..a704f0c7118
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/file.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>file</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="file" fill="#000000">
+            <path d="M6,5 L2,5 L2,4 L6,4 L6,5 L6,5 Z M2,8 L9,8 L9,7 L2,7 L2,8 L2,8 Z M2,10 L9,10 L9,9 L2,9 L2,10 L2,10 Z M2,12 L9,12 L9,11 L2,11 L2,12 L2,12 Z M12,4.5 L12,14 C12,14.55 11.55,15 11,15 L1,15 C0.45,15 0,14.55 0,14 L0,2 C0,1.45 0.45,1 1,1 L8.5,1 L12,4.5 L12,4.5 Z M11,5 L8,2 L1,2 L1,14 L11,14 L11,5 L11,5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/flame.svg b/htdocs/theme/common/octicons/lib/svg/flame.svg
new file mode 100644
index 00000000000..a9b69abaafc
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/flame.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>flame</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="flame" fill="#000000">
+            <path d="M5.05,0.31 C5.86,2.48 5.46,3.69 4.53,4.62 C3.55,5.67 1.98,6.45 0.9,7.98 C-0.55,10.03 -0.8,14.51 4.43,15.68 C2.23,14.52 1.76,11.16 4.13,9.07 C3.52,11.1 4.66,12.4 6.07,11.93 C7.46,11.46 8.37,12.46 8.34,13.6 C8.32,14.38 8.03,15.04 7.21,15.41 C10.63,14.82 11.99,11.99 11.99,9.85 C11.99,7.01 9.46,6.63 10.74,4.24 C9.22,4.37 8.71,5.37 8.85,6.99 C8.94,8.07 7.83,8.79 6.99,8.32 C6.32,7.91 6.33,7.13 6.93,6.54 C8.18,5.31 8.68,2.45 5.05,0.32 L5.03,0.3 L5.05,0.31 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/fold.svg b/htdocs/theme/common/octicons/lib/svg/fold.svg
new file mode 100644
index 00000000000..5446d76a46e
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/fold.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>fold</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="fold" fill="#000000">
+            <path d="M7,9 L10,12 L8,12 L8,15 L6,15 L6,12 L4,12 L7,9 L7,9 Z M10,3 L8,3 L8,0 L6,0 L6,3 L4,3 L7,6 L10,3 L10,3 Z M14,5 C14,4.45 13.55,4 13,4 L10.5,4 L9.5,5 L12.5,5 L10.5,7 L3.5,7 L1.5,5 L4.5,5 L3.5,4 L1,4 C0.45,4 0,4.45 0,5 L2.5,7.5 L0,10 C0,10.55 0.45,11 1,11 L3.5,11 L4.5,10 L1.5,10 L3.5,8 L10.5,8 L12.5,10 L9.5,10 L10.5,11 L13,11 C13.55,11 14,10.55 14,10 L11.5,7.5 L14,5 L14,5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/gear.svg b/htdocs/theme/common/octicons/lib/svg/gear.svg
new file mode 100644
index 00000000000..2fdf75deec1
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/gear.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>gear</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="gear" fill="#000000">
+            <path d="M14,8.77 L14,7.17 L12.06,6.53 L11.61,5.44 L12.49,3.6 L11.36,2.47 L9.55,3.38 L8.46,2.93 L7.77,1.01 L6.17,1.01 L5.54,2.95 L4.43,3.4 L2.59,2.52 L1.46,3.65 L2.37,5.46 L1.92,6.55 L0,7.23 L0,8.82 L1.94,9.46 L2.39,10.55 L1.51,12.39 L2.64,13.52 L4.45,12.61 L5.54,13.06 L6.23,14.98 L7.82,14.98 L8.45,13.04 L9.56,12.59 L11.4,13.47 L12.53,12.34 L11.61,10.53 L12.08,9.44 L14,8.75 L14,8.77 Z M7,11 C5.34,11 4,9.66 4,8 C4,6.34 5.34,5 7,5 C8.66,5 10,6.34 10,8 C10,9.66 8.66,11 7,11 L7,11 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/gift.svg b/htdocs/theme/common/octicons/lib/svg/gift.svg
new file mode 100644
index 00000000000..1cb9cff4535
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/gift.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>gift</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="gift" fill="#000000">
+            <path d="M13,4 L11.62,4 C11.81,3.67 11.95,3.33 11.98,3.09 C12.04,2.42 11.87,1.87 11.46,1.48 C11.1,1.1 10.65,1 10.1,1 L9.99,1 C9.46,1.02 8.88,1.25 8.46,1.58 C8.04,1.91 7.73,2.3 7.49,2.78 C7.26,2.3 6.94,1.9 6.52,1.58 C6.1,1.26 5.52,1 4.99,1 L4.96,1 C4.4,1 3.9,1.09 3.52,1.48 C3.11,1.87 2.94,2.42 3,3.09 C3.03,3.32 3.17,3.67 3.36,4 L1.98,4 C1.43,4 0.98,4.45 0.98,5 L0.98,8 L1.98,8 L1.98,13 C1.98,13.55 2.43,14 2.98,14 L11.98,14 C12.53,14 12.98,13.55 12.98,13 L12.98,8 L13.98,8 L13.98,5 C13.98,4.45 13.53,4 12.98,4 L13,4 Z M8.22,3.12 C8.39,2.76 8.64,2.45 8.97,2.2 C9.27,1.97 9.69,1.81 10.02,1.79 L10.11,1.79 C10.56,1.79 10.77,1.9 10.91,2.04 C11.05,2.18 11.24,2.43 11.21,2.99 C11.16,3.18 10.96,3.6 10.71,3.99 L7.81,3.99 L8.22,3.11 L8.22,3.12 Z M4.09,2.04 C4.22,1.91 4.4,1.79 5,1.79 C5.31,1.79 5.72,1.96 6.03,2.2 C6.36,2.45 6.61,2.75 6.78,3.12 L7.2,4 L4.3,4 C4.05,3.61 3.85,3.19 3.8,3 C3.77,2.44 3.96,2.19 4.1,2.05 L4.09,2.04 Z M7,12.99 L3,12.99 L3,8 L7,8 L7,13 L7,12.99 Z M7,6.99 L2,6.99 L2,5 L7,5 L7,7 L7,6.99 Z M12,12.99 L8,12.99 L8,8 L12,8 L12,13 L12,12.99 Z M13,6.99 L8,6.99 L8,5 L13,5 L13,7 L13,6.99 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/gist-secret.svg b/htdocs/theme/common/octicons/lib/svg/gist-secret.svg
new file mode 100644
index 00000000000..e427060c776
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/gist-secret.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>gist-secret</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="gist-secret" fill="#000000">
+            <path d="M8,10.5 L9,14 L5,14 L6,10.5 L5.25,9 L8.75,9 L8,10.5 L8,10.5 Z M10,6 L4,6 L2,7 L12,7 L10,6 L10,6 Z M9,2 L7,3 L5,2 L4,5 L10,5 L9,2 L9,2 Z M13.03,9.75 L10,9 L11,11 L9,14 L12.22,14 C12.67,14 13.08,13.69 13.19,13.25 L13.75,10.97 C13.89,10.44 13.56,9.89 13.03,9.75 L13.03,9.75 Z M4,9 L0.97,9.75 C0.44,9.89 0.11,10.44 0.25,10.97 L0.81,13.25 C0.92,13.69 1.33,14 1.78,14 L5,14 L3,11 L4,9 L4,9 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/gist.svg b/htdocs/theme/common/octicons/lib/svg/gist.svg
new file mode 100644
index 00000000000..ff79f169b27
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/gist.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>gist</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="gist" fill="#000000">
+            <path d="M7.5,5 L10,7.5 L7.5,10 L6.75,9.25 L8.5,7.5 L6.75,5.75 L7.5,5 L7.5,5 Z M4.5,5 L2,7.5 L4.5,10 L5.25,9.25 L3.5,7.5 L5.25,5.75 L4.5,5 L4.5,5 Z M0,13 L0,2 C0,1.45 0.45,1 1,1 L11,1 C11.55,1 12,1.45 12,2 L12,13 C12,13.55 11.55,14 11,14 L1,14 C0.45,14 0,13.55 0,13 L0,13 Z M1,13 L11,13 L11,2 L1,2 L1,13 L1,13 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/git-branch.svg b/htdocs/theme/common/octicons/lib/svg/git-branch.svg
new file mode 100644
index 00000000000..0d2e53fd28f
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/git-branch.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>git-branch</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="git-branch" fill="#000000">
+            <path d="M10,5 C10,3.89 9.11,3 8,3 C6.89,3 6,3.89 6,5 C6,5.73 6.41,6.38 7,6.72 L7,7.02 C6.98,7.54 6.77,8 6.37,8.4 C5.97,8.8 5.51,9.01 4.99,9.03 C4.16,9.05 3.51,9.19 2.99,9.48 L2.99,4.72 C3.58,4.38 3.99,3.74 3.99,3 C3.99,1.89 3.1,1 1.99,1 C0.88,1 0,1.89 0,3 C0,3.73 0.41,4.38 1,4.72 L1,11.28 C0.41,11.63 0,12.27 0,13 C0,14.11 0.89,15 2,15 C3.11,15 4,14.11 4,13 C4,12.47 3.8,12 3.47,11.64 C3.56,11.58 3.95,11.23 4.06,11.17 C4.31,11.06 4.62,11 5,11 C6.05,10.95 6.95,10.55 7.75,9.75 C8.55,8.95 8.95,7.77 9,6.73 L8.98,6.73 C9.59,6.37 10,5.73 10,5 L10,5 Z M2,1.8 C2.66,1.8 3.2,2.35 3.2,3 C3.2,3.65 2.65,4.2 2,4.2 C1.35,4.2 0.8,3.65 0.8,3 C0.8,2.35 1.35,1.8 2,1.8 L2,1.8 Z M2,14.21 C1.34,14.21 0.8,13.66 0.8,13.01 C0.8,12.36 1.35,11.81 2,11.81 C2.65,11.81 3.2,12.36 3.2,13.01 C3.2,13.66 2.65,14.21 2,14.21 L2,14.21 Z M8,6.21 C7.34,6.21 6.8,5.66 6.8,5.01 C6.8,4.36 7.35,3.81 8,3.81 C8.65,3.81 9.2,4.36 9.2,5.01 C9.2,5.66 8.65,6.21 8,6.21 L8,6.21 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/git-commit.svg b/htdocs/theme/common/octicons/lib/svg/git-commit.svg
new file mode 100644
index 00000000000..0ee7457f455
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/git-commit.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>git-commit</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="git-commit" fill="#000000">
+            <path d="M10.86,7 C10.41,5.28 8.86,4 7,4 C5.14,4 3.59,5.28 3.14,7 L0,7 L0,9 L3.14,9 C3.59,10.72 5.14,12 7,12 C8.86,12 10.41,10.72 10.86,9 L14,9 L14,7 L10.86,7 L10.86,7 Z M7,10.2 C5.78,10.2 4.8,9.22 4.8,8 C4.8,6.78 5.78,5.8 7,5.8 C8.22,5.8 9.2,6.78 9.2,8 C9.2,9.22 8.22,10.2 7,10.2 L7,10.2 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/git-compare.svg b/htdocs/theme/common/octicons/lib/svg/git-compare.svg
new file mode 100644
index 00000000000..6f7481f8293
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/git-compare.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>git-compare</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="git-compare" fill="#000000">
+            <path d="M5,12 L4,12 C3.73,11.98 3.52,11.89 3.31,11.69 C3.1,11.49 3.01,11.27 3,11 L3,4.72 C3.59,4.38 4,3.74 4,3 C4,1.89 3.11,1 2,1 C0.89,1 0,1.89 0,3 C0,3.73 0.41,4.38 1,4.72 L1,11 C1.03,11.78 1.34,12.47 1.94,13.06 C2.54,13.65 3.22,13.97 4,14 L5,14 L5,16 L8,13 L5,10 L5,12 L5,12 Z M2,1.8 C2.66,1.8 3.2,2.35 3.2,3 C3.2,3.65 2.65,4.2 2,4.2 C1.35,4.2 0.8,3.65 0.8,3 C0.8,2.35 1.35,1.8 2,1.8 L2,1.8 Z M13,11.28 L13,5 C12.97,4.22 12.66,3.53 12.06,2.94 C11.46,2.35 10.78,2.03 10,2 L9,2 L9,0 L6,3 L9,6 L9,4 L10,4 C10.27,4.02 10.48,4.11 10.69,4.31 C10.9,4.51 10.99,4.73 11,5 L11,11.28 C10.41,11.62 10,12.26 10,13 C10,14.11 10.89,15 12,15 C13.11,15 14,14.11 14,13 C14,12.27 13.59,11.62 13,11.28 L13,11.28 Z M12,14.2 C11.34,14.2 10.8,13.65 10.8,13 C10.8,12.35 11.35,11.8 12,11.8 C12.65,11.8 13.2,12.35 13.2,13 C13.2,13.65 12.65,14.2 12,14.2 L12,14.2 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/git-merge.svg b/htdocs/theme/common/octicons/lib/svg/git-merge.svg
new file mode 100644
index 00000000000..d0f41029b10
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/git-merge.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>git-merge</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="git-merge" fill="#000000">
+            <path d="M10,7 C9.27,7 8.62,7.41 8.27,8.02 L8.27,8 C7.22,7.98 6,7.64 5.14,6.98 C4.39,6.4 3.64,5.37 3.25,4.54 C3.7,4.18 4,3.62 4,2.99 C4,1.88 3.11,0.99 2,0.99 C0.89,0.99 0,1.89 0,3 C0,3.73 0.41,4.38 1,4.72 L1,11.28 C0.41,11.63 0,12.27 0,13 C0,14.11 0.89,15 2,15 C3.11,15 4,14.11 4,13 C4,12.27 3.59,11.62 3,11.28 L3,7.67 C3.67,8.37 4.44,8.94 5.3,9.36 C6.16,9.78 7.33,9.99 8.27,10 L8.27,9.98 C8.63,10.59 9.27,11 10,11 C11.11,11 12,10.11 12,9 C12,7.89 11.11,7 10,7 L10,7 Z M3.2,13 C3.2,13.66 2.65,14.2 2,14.2 C1.35,14.2 0.8,13.65 0.8,13 C0.8,12.35 1.35,11.8 2,11.8 C2.65,11.8 3.2,12.35 3.2,13 L3.2,13 Z M2,4.2 C1.34,4.2 0.8,3.65 0.8,3 C0.8,2.35 1.35,1.8 2,1.8 C2.65,1.8 3.2,2.35 3.2,3 C3.2,3.65 2.65,4.2 2,4.2 L2,4.2 Z M10,10.2 C9.34,10.2 8.8,9.65 8.8,9 C8.8,8.35 9.35,7.8 10,7.8 C10.65,7.8 11.2,8.35 11.2,9 C11.2,9.65 10.65,10.2 10,10.2 L10,10.2 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/git-pull-request.svg b/htdocs/theme/common/octicons/lib/svg/git-pull-request.svg
new file mode 100644
index 00000000000..492dda2ff46
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/git-pull-request.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>git-pull-request</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="git-pull-request" fill="#000000">
+            <path d="M11,11.28 L11,5 C10.97,4.22 10.66,3.53 10.06,2.94 C9.46,2.35 8.78,2.03 8,2 L7,2 L7,0 L4,3 L7,6 L7,4 L8,4 C8.27,4.02 8.48,4.11 8.69,4.31 C8.9,4.51 8.99,4.73 9,5 L9,11.28 C8.41,11.62 8,12.26 8,13 C8,14.11 8.89,15 10,15 C11.11,15 12,14.11 12,13 C12,12.27 11.59,11.62 11,11.28 L11,11.28 Z M10,14.2 C9.34,14.2 8.8,13.65 8.8,13 C8.8,12.35 9.35,11.8 10,11.8 C10.65,11.8 11.2,12.35 11.2,13 C11.2,13.65 10.65,14.2 10,14.2 L10,14.2 Z M4,3 C4,1.89 3.11,1 2,1 C0.89,1 0,1.89 0,3 C0,3.73 0.41,4.38 1,4.72 L1,11.28 C0.41,11.62 0,12.26 0,13 C0,14.11 0.89,15 2,15 C3.11,15 4,14.11 4,13 C4,12.27 3.59,11.62 3,11.28 L3,4.72 C3.59,4.38 4,3.74 4,3 L4,3 Z M3.2,13 C3.2,13.66 2.65,14.2 2,14.2 C1.35,14.2 0.8,13.65 0.8,13 C0.8,12.35 1.35,11.8 2,11.8 C2.65,11.8 3.2,12.35 3.2,13 L3.2,13 Z M2,4.2 C1.34,4.2 0.8,3.65 0.8,3 C0.8,2.35 1.35,1.8 2,1.8 C2.65,1.8 3.2,2.35 3.2,3 C3.2,3.65 2.65,4.2 2,4.2 L2,4.2 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/globe.svg b/htdocs/theme/common/octicons/lib/svg/globe.svg
new file mode 100644
index 00000000000..8e9d0196ff2
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/globe.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>globe</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="globe" fill="#000000">
+            <path d="M7,1 C3.14,1 0,4.14 0,8 C0,11.86 3.14,15 7,15 C7.48,15 7.94,14.95 8.38,14.86 C8.21,14.78 8.18,14.13 8.36,13.77 C8.55,13.36 9.17,12.32 8.56,11.97 C7.95,11.62 8.12,11.47 7.75,11.06 C7.38,10.65 7.53,10.59 7.5,10.48 C7.42,10.14 7.86,9.59 7.89,9.54 C7.91,9.48 7.91,9.27 7.89,9.21 C7.89,9.13 7.62,8.99 7.55,8.98 C7.49,8.98 7.44,9.09 7.35,9.11 C7.26,9.13 6.85,8.86 6.76,8.78 C6.67,8.7 6.62,8.55 6.49,8.44 C6.36,8.31 6.35,8.41 6.16,8.33 C5.97,8.25 5.36,8.02 4.88,7.85 C4.4,7.66 4.36,7.38 4.36,7.19 C4.34,6.99 4.06,6.72 3.94,6.52 C3.8,6.32 3.78,6.05 3.74,6.11 C3.7,6.17 3.99,6.89 3.94,6.92 C3.89,6.94 3.78,6.72 3.64,6.54 C3.5,6.35 3.78,6.45 3.34,5.59 C2.9,4.73 3.48,4.29 3.51,3.84 C3.54,3.39 3.89,4.01 3.7,3.71 C3.51,3.41 3.7,2.82 3.56,2.6 C3.43,2.38 2.68,2.85 2.68,2.85 C2.7,2.63 3.37,2.27 3.84,1.93 C4.31,1.59 4.62,1.87 5,1.98 C5.39,2.11 5.41,2.07 5.28,1.93 C5.15,1.8 5.34,1.76 5.64,1.8 C5.92,1.85 6.02,2.21 6.47,2.16 C6.94,2.13 6.52,2.25 6.58,2.38 C6.64,2.51 6.52,2.49 6.2,2.68 C5.9,2.88 6.22,2.9 6.75,3.29 C7.28,3.68 7.13,3.04 7.06,2.74 C6.99,2.44 7.45,2.68 7.45,2.68 C7.78,2.9 7.72,2.7 7.95,2.76 C8.18,2.82 8.86,3.4 8.86,3.4 C8.03,3.84 8.55,3.88 8.69,3.99 C8.83,4.1 8.41,4.29 8.41,4.29 C8.24,4.12 8.22,4.31 8.11,4.37 C8,4.43 8.09,4.59 8.09,4.59 C7.53,4.68 7.65,5.28 7.67,5.42 C7.67,5.56 7.29,5.78 7.2,6 C7.11,6.2 7.45,6.64 7.26,6.66 C7.07,6.69 6.92,6 5.95,6.25 C5.65,6.33 5.01,6.66 5.36,7.33 C5.72,8.02 6.28,7.14 6.47,7.24 C6.66,7.34 6.41,7.77 6.45,7.79 C6.49,7.81 6.98,7.81 7.01,8.4 C7.04,8.99 7.78,8.93 7.93,8.95 C8.1,8.95 8.63,8.51 8.7,8.5 C8.76,8.47 9.08,8.22 9.73,8.59 C10.39,8.95 10.71,8.9 10.93,9.06 C11.15,9.22 11.01,9.53 11.21,9.64 C11.41,9.75 12.27,9.61 12.49,9.95 C12.71,10.29 11.61,12.04 11.27,12.23 C10.93,12.42 10.79,12.87 10.43,13.15 C10.07,13.43 9.62,13.79 9.16,14.06 C8.75,14.29 8.69,14.72 8.5,14.86 C11.64,14.16 13.98,11.36 13.98,8.02 C13.98,4.16 10.84,1.02 6.98,1.02 L7,1 Z M8.64,7.56 C8.55,7.59 8.36,7.78 7.86,7.48 C7.38,7.18 7.05,7.25 7,7.2 C7,7.2 6.95,7.09 7.17,7.06 C7.61,7.01 8.15,7.47 8.28,7.47 C8.41,7.47 8.47,7.34 8.69,7.42 C8.91,7.5 8.74,7.55 8.64,7.56 L8.64,7.56 Z M6.34,1.7 C6.29,1.67 6.37,1.62 6.43,1.56 C6.46,1.53 6.45,1.45 6.48,1.42 C6.59,1.31 7.09,1.17 7,1.45 C6.89,1.72 6.42,1.75 6.34,1.7 L6.34,1.7 Z M7.57,2.59 C7.38,2.57 6.99,2.54 7.05,2.45 C7.35,2.17 6.96,2.07 6.71,2.07 C6.46,2.05 6.37,1.91 6.49,1.88 C6.61,1.85 7.1,1.9 7.19,1.96 C7.27,2.02 7.71,2.21 7.74,2.34 C7.76,2.47 7.74,2.59 7.57,2.59 L7.57,2.59 Z M9.04,2.54 C8.9,2.63 8.21,2.13 8.09,2.02 C7.53,1.54 7.2,1.71 7.09,1.61 C6.98,1.51 7.01,1.42 7.2,1.27 C7.39,1.12 7.89,1.33 8.2,1.36 C8.5,1.39 8.86,1.63 8.86,1.91 C8.88,2.16 9.19,2.41 9.05,2.54 L9.04,2.54 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/grabber.svg b/htdocs/theme/common/octicons/lib/svg/grabber.svg
new file mode 100644
index 00000000000..cd3b15112ca
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/grabber.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="8px" height="16px" viewBox="0 0 8 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>grabber</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="grabber" fill="#000000">
+            <path d="M8,4 L8,5 L0,5 L0,4 L8,4 L8,4 Z M0,8 L8,8 L8,7 L0,7 L0,8 L0,8 Z M0,11 L8,11 L8,10 L0,10 L0,11 L0,11 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/graph.svg b/htdocs/theme/common/octicons/lib/svg/graph.svg
new file mode 100644
index 00000000000..f72a1875263
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/graph.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>graph</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="graph" fill="#000000">
+            <path d="M16,14 L16,15 L0,15 L0,0 L1,0 L1,14 L16,14 L16,14 Z M5,13 L3,13 L3,8 L5,8 L5,13 L5,13 Z M9,13 L7,13 L7,3 L9,3 L9,13 L9,13 Z M13,13 L11,13 L11,6 L13,6 L13,13 L13,13 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/heart.svg b/htdocs/theme/common/octicons/lib/svg/heart.svg
new file mode 100644
index 00000000000..688a14d9a5e
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/heart.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>heart</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="heart" fill="#000000">
+            <path d="M11.2,3 C10.68,2.37 9.95,2.05 9,2 C8.03,2 7.31,2.42 6.8,3 C6.29,3.58 6.02,3.92 6,4 C5.98,3.92 5.72,3.58 5.2,3 C4.68,2.42 4.03,2 3,2 C2.05,2.05 1.31,2.38 0.8,3 C0.28,3.61 0.02,4.28 0,5 C0,5.52 0.09,6.52 0.67,7.67 C1.25,8.82 3.01,10.61 6,13 C8.98,10.61 10.77,8.83 11.34,7.67 C11.91,6.51 12,5.5 12,5 C11.98,4.28 11.72,3.61 11.2,2.98 L11.2,3 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/history.svg b/htdocs/theme/common/octicons/lib/svg/history.svg
new file mode 100644
index 00000000000..77010ba5c6c
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/history.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>history</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="history" fill="#000000">
+            <path d="M8,13 L6,13 L6,6 L11,6 L11,8 L8,8 L8,13 L8,13 Z M7,1 C4.81,1 2.87,2.02 1.59,3.59 L0,2 L0,6 L4,6 L2.5,4.5 C3.55,3.17 5.17,2.3 7,2.3 C10.14,2.3 12.7,4.86 12.7,8 C12.7,11.14 10.14,13.7 7,13.7 C3.86,13.7 1.3,11.14 1.3,8 C1.3,7.66 1.33,7.33 1.39,7 L0.08,7 C0.03,7.33 0,7.66 0,8 C0,11.86 3.14,15 7,15 C10.86,15 14,11.86 14,8 C14,4.14 10.86,1 7,1 L7,1 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/home.svg b/htdocs/theme/common/octicons/lib/svg/home.svg
new file mode 100644
index 00000000000..d2862e50f48
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/home.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>home</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="home" fill="#000000">
+            <path d="M16,9 L13,6 L13,2 L11,2 L11,4 L8,1 L0,9 L2,9 L3,14 C3,14.55 3.45,15 4,15 L12,15 C12.55,15 13,14.55 13,14 L14,9 L16,9 L16,9 Z M12,14 L9,14 L9,10 L7,10 L7,14 L4,14 L2.81,7.69 L8,2.5 L13.19,7.69 L12,14 L12,14 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/horizontal-rule.svg b/htdocs/theme/common/octicons/lib/svg/horizontal-rule.svg
new file mode 100644
index 00000000000..cf444e7b3d2
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/horizontal-rule.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>horizontal-rule</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="horizontal-rule" fill="#000000">
+            <path d="M1,7 L3,7 L3,9 L4,9 L4,3 L3,3 L3,6 L1,6 L1,3 L0,3 L0,9 L1,9 L1,7 L1,7 Z M10,9 L10,7 L9,7 L9,9 L10,9 L10,9 Z M10,6 L10,4 L9,4 L9,6 L10,6 L10,6 Z M7,6 L7,4 L9,4 L9,3 L6,3 L6,9 L7,9 L7,7 L9,7 L9,6 L7,6 L7,6 Z M0,13 L10,13 L10,11 L0,11 L0,13 L0,13 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/hubot.svg b/htdocs/theme/common/octicons/lib/svg/hubot.svg
new file mode 100644
index 00000000000..d2fb9ad052b
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/hubot.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>hubot</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="hubot" fill="#000000">
+            <path d="M3,6 C2.45,6 2,6.45 2,7 L2,9 C2,9.55 2.45,10 3,10 L11,10 C11.55,10 12,9.55 12,9 L12,7 C12,6.45 11.55,6 11,6 L3,6 L3,6 Z M11,7.75 L9.75,9 L8.25,9 L7,7.75 L5.75,9 L4.25,9 L3,7.75 L3,7 L3.75,7 L5,8.25 L6.25,7 L7.75,7 L9,8.25 L10.25,7 L11,7 L11,7.75 L11,7.75 Z M5,11 L9,11 L9,12 L5,12 L5,11 L5,11 Z M7,2 C3.14,2 0,4.91 0,8.5 L0,13 C0,13.55 0.45,14 1,14 L13,14 C13.55,14 14,13.55 14,13 L14,8.5 C14,4.91 10.86,2 7,2 L7,2 Z M13,13 L1,13 L1,8.5 C1,5.41 3.64,2.91 7,2.91 C10.36,2.91 13,5.41 13,8.5 L13,13 L13,13 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/inbox.svg b/htdocs/theme/common/octicons/lib/svg/inbox.svg
new file mode 100644
index 00000000000..1b288f2570f
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/inbox.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>inbox</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="inbox" fill="#000000">
+            <path d="M14,9 L12.87,1.86 C12.79,1.38 12.37,1 11.87,1 L2.13,1 C1.63,1 1.21,1.38 1.13,1.86 L0,9 L0,14 C0,14.55 0.45,15 1,15 L13,15 C13.55,15 14,14.55 14,14 L14,9 L14,9 Z M10.72,9.55 L10.28,10.44 C10.11,10.78 9.76,11 9.37,11 L4.61,11 C4.23,11 3.89,10.78 3.72,10.45 L3.28,9.54 C3.11,9.21 2.76,8.99 2.39,8.99 L1,8.99 L2,1.99 L12,1.99 L13,8.99 L11.62,8.99 C11.23,8.99 10.89,9.21 10.71,9.54 L10.72,9.55 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/info.svg b/htdocs/theme/common/octicons/lib/svg/info.svg
new file mode 100644
index 00000000000..7c6de3ebd66
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/info.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>info</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="info" fill="#000000">
+            <path d="M6.3,5.69 C6.11,5.5 6.02,5.27 6.02,4.99 C6.02,4.71 6.11,4.47 6.3,4.29 C6.49,4.11 6.72,4.01 7,4.01 C7.28,4.01 7.52,4.1 7.7,4.29 C7.88,4.48 7.98,4.71 7.98,4.99 C7.98,5.27 7.89,5.51 7.7,5.69 C7.51,5.87 7.28,5.99 7,5.99 C6.72,5.99 6.48,5.88 6.3,5.69 L6.3,5.69 Z M8,7.99 C7.98,7.74 7.89,7.51 7.69,7.3 C7.49,7.11 7.27,7 7,6.99 L6,6.99 C5.73,7.01 5.52,7.12 5.31,7.3 C5.11,7.5 5.01,7.74 5,7.99 L6,7.99 L6,10.99 C6.02,11.26 6.11,11.49 6.31,11.68 C6.51,11.88 6.73,11.99 7,11.99 L8,11.99 C8.27,11.99 8.48,11.88 8.69,11.68 C8.89,11.49 8.99,11.26 9,10.99 L8,10.99 L8,7.98 L8,7.99 Z M7,2.3 C3.86,2.3 1.3,4.84 1.3,7.98 C1.3,11.12 3.86,13.68 7,13.68 C10.14,13.68 12.7,11.13 12.7,7.98 C12.7,4.83 10.14,2.29 7,2.29 L7,2.3 Z M7,0.98 C10.86,0.98 14,4.12 14,7.98 C14,11.84 10.86,14.98 7,14.98 C3.14,14.98 0,11.86 0,7.98 C0,4.1 3.14,0.98 7,0.98 L7,0.98 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/issue-closed.svg b/htdocs/theme/common/octicons/lib/svg/issue-closed.svg
new file mode 100644
index 00000000000..f06480bb847
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/issue-closed.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>issue-closed</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="issue-closed" fill="#000000">
+            <path d="M7,10 L9,10 L9,12 L7,12 L7,10 L7,10 Z M9,4 L7,4 L7,9 L9,9 L9,4 L9,4 Z M10.5,5.5 L9.5,6.5 L12,9 L16,4.5 L15,3.5 L12,7 L10.5,5.5 L10.5,5.5 Z M8,13.7 C4.86,13.7 2.3,11.14 2.3,8 C2.3,4.86 4.86,2.3 8,2.3 C9.83,2.3 11.45,3.18 12.5,4.5 L13.42,3.58 C12.14,2 10.19,1 8,1 C4.14,1 1,4.14 1,8 C1,11.86 4.14,15 8,15 C11.86,15 15,11.86 15,8 L13.48,9.52 C12.82,11.93 10.62,13.71 8,13.71 L8,13.7 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/issue-opened.svg b/htdocs/theme/common/octicons/lib/svg/issue-opened.svg
new file mode 100644
index 00000000000..d8ba7c46c35
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/issue-opened.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>issue-opened</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="issue-opened" fill="#000000">
+            <path d="M7,2.3 C10.14,2.3 12.7,4.86 12.7,8 C12.7,11.14 10.14,13.7 7,13.7 C3.86,13.7 1.3,11.14 1.3,8 C1.3,4.86 3.86,2.3 7,2.3 L7,2.3 Z M7,1 C3.14,1 0,4.14 0,8 C0,11.86 3.14,15 7,15 C10.86,15 14,11.86 14,8 C14,4.14 10.86,1 7,1 L7,1 Z M8,4 L6,4 L6,9 L8,9 L8,4 L8,4 Z M8,10 L6,10 L6,12 L8,12 L8,10 L8,10 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/issue-reopened.svg b/htdocs/theme/common/octicons/lib/svg/issue-reopened.svg
new file mode 100644
index 00000000000..1d5eab6bdba
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/issue-reopened.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>issue-reopened</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="issue-reopened" fill="#000000">
+            <path d="M8,9 L6,9 L6,4 L8,4 L8,9 L8,9 Z M6,12 L8,12 L8,10 L6,10 L6,12 L6,12 Z M12.33,10 L10,10 L11.5,11.5 C10.45,12.83 8.83,13.7 7,13.7 C3.86,13.7 1.3,11.14 1.3,8 C1.3,7.66 1.33,7.33 1.39,7 L0.08,7 C0.03,7.33 0,7.66 0,8 C0,11.86 3.14,15 7,15 C9.19,15 11.13,13.98 12.41,12.41 L14,14 L14,10 L12.33,10 L12.33,10 Z M1.67,6 L4,6 L2.5,4.5 C3.55,3.17 5.17,2.3 7,2.3 C10.14,2.3 12.7,4.86 12.7,8 C12.7,8.34 12.67,8.67 12.61,9 L13.92,9 C13.97,8.67 14,8.34 14,8 C14,4.14 10.86,1 7,1 C4.81,1 2.87,2.02 1.59,3.59 L0,2 L0,6 L1.67,6 L1.67,6 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/italic.svg b/htdocs/theme/common/octicons/lib/svg/italic.svg
new file mode 100644
index 00000000000..d488293cbe0
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/italic.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="6px" height="16px" viewBox="0 0 6 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>italic</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="italic" fill="#000000">
+            <path d="M2.81,5 L4.79,5 L3,14 L1,14 L2.81,5 L2.81,5 Z M3.17,2.3 C3.17,1.6 3.75,1 4.5,1 C5.06,1 5.63,1.38 5.63,2.03 C5.63,2.78 5.04,3.33 4.3,3.33 C3.72,3.33 3.17,2.95 3.17,2.3 L3.17,2.3 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/jersey.svg b/htdocs/theme/common/octicons/lib/svg/jersey.svg
new file mode 100644
index 00000000000..56e85ee4cd8
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/jersey.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>jersey</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="jersey" fill="#000000">
+            <path d="M4.5,6 L4,6.5 L4,11.5 L4.5,12 L6.5,12 L7,11.5 L7,6.5 L6.5,6 L4.5,6 L4.5,6 Z M6,11 L5,11 L5,7 L6,7 L6,11 L6,11 Z M12.27,3.75 C12.05,2.37 11.96,1.12 12,0 L9.02,0 C9.02,0.27 8.89,0.48 8.63,0.69 C8.38,0.89 8,0.99 7.5,0.99 C7,0.99 6.62,0.9 6.37,0.69 C6.14,0.49 6.01,0.27 6.01,0 L3,0 C3.05,1.13 2.97,2.38 2.75,3.75 C2.55,5.13 1.95,5.88 1,6 L1,15 C1.02,15.27 1.11,15.48 1.31,15.69 C1.51,15.9 1.73,15.99 2,16 L13,16 C13.27,15.98 13.48,15.89 13.69,15.69 C13.9,15.49 13.99,15.27 14,15 L14,6 C13.05,5.87 12.47,5.12 12.25,3.75 L12.27,3.75 Z M13,15 L2,15 L2,7 C2.89,6.5 3.48,5.75 3.72,4.75 C3.96,3.75 4.03,2.5 4,1 L5,1 C4.98,1.78 5.16,2.47 5.52,3.06 C5.88,3.64 6.54,3.95 7.52,4 C8.5,3.98 9.16,3.67 9.52,3.06 C9.88,2.47 10.02,1.78 10,1 L11,1 C11.02,2.42 11.13,3.55 11.33,4.38 C11.53,5.19 12.02,6.38 13,7.01 L13,15.01 L13,15 Z M8.5,6 L8,6.5 L8,11.5 L8.5,12 L10.5,12 L11,11.5 L11,6.5 L10.5,6 L8.5,6 L8.5,6 Z M10,11 L9,11 L9,7 L10,7 L10,11 L10,11 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/key.svg b/htdocs/theme/common/octicons/lib/svg/key.svg
new file mode 100644
index 00000000000..bc3b52382af
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/key.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>key</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="key" fill="#000000">
+            <path d="M12.83,2.17 C12.08,1.42 11.14,1.03 10,1 C8.87,1.03 7.92,1.42 7.17,2.17 C6.42,2.92 6.04,3.86 6.01,5 C6.01,5.3 6.04,5.59 6.1,5.89 L0,12 L0,13 L1,14 L3,14 L4,13 L4,12 L5,12 L5,11 L6,11 L6,10 L8,10 L9.09,8.89 C9.39,8.97 9.68,9 10,9 C11.14,8.97 12.08,8.58 12.83,7.83 C13.58,7.08 13.97,6.14 14,5 C13.97,3.86 13.58,2.92 12.83,2.17 L12.83,2.17 Z M11,5.38 C10.23,5.38 9.62,4.77 9.62,4 C9.62,3.23 10.23,2.62 11,2.62 C11.77,2.62 12.38,3.23 12.38,4 C12.38,4.77 11.77,5.38 11,5.38 L11,5.38 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/keyboard.svg b/htdocs/theme/common/octicons/lib/svg/keyboard.svg
new file mode 100644
index 00000000000..77aa0f5fe04
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/keyboard.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>keyboard</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="keyboard" fill="#000000">
+            <path d="M10,5 L9,5 L9,4 L10,4 L10,5 L10,5 Z M3,6 L2,6 L2,7 L3,7 L3,6 L3,6 Z M8,4 L7,4 L7,5 L8,5 L8,4 L8,4 Z M4,4 L2,4 L2,5 L4,5 L4,4 L4,4 Z M12,11 L14,11 L14,10 L12,10 L12,11 L12,11 Z M8,7 L9,7 L9,6 L8,6 L8,7 L8,7 Z M4,10 L2,10 L2,11 L4,11 L4,10 L4,10 Z M12,4 L11,4 L11,5 L12,5 L12,4 L12,4 Z M14,4 L13,4 L13,5 L14,5 L14,4 L14,4 Z M12,9 L14,9 L14,6 L12,6 L12,9 L12,9 Z M16,3 L16,12 C16,12.55 15.55,13 15,13 L1,13 C0.45,13 0,12.55 0,12 L0,3 C0,2.45 0.45,2 1,2 L15,2 C15.55,2 16,2.45 16,3 L16,3 Z M15,3 L1,3 L1,12 L15,12 L15,3 L15,3 Z M6,7 L7,7 L7,6 L6,6 L6,7 L6,7 Z M6,4 L5,4 L5,5 L6,5 L6,4 L6,4 Z M4,7 L5,7 L5,6 L4,6 L4,7 L4,7 Z M5,11 L11,11 L11,10 L5,10 L5,11 L5,11 Z M10,7 L11,7 L11,6 L10,6 L10,7 L10,7 Z M3,8 L2,8 L2,9 L3,9 L3,8 L3,8 Z M8,8 L8,9 L9,9 L9,8 L8,8 L8,8 Z M6,8 L6,9 L7,9 L7,8 L6,8 L6,8 Z M5,8 L4,8 L4,9 L5,9 L5,8 L5,8 Z M10,9 L11,9 L11,8 L10,8 L10,9 L10,9 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/law.svg b/htdocs/theme/common/octicons/lib/svg/law.svg
new file mode 100644
index 00000000000..0b144363d9a
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/law.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>law</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="law" fill="#000000">
+            <path d="M7,4 C6.17,4 5.5,3.33 5.5,2.5 C5.5,1.67 6.17,1 7,1 C7.83,1 8.5,1.67 8.5,2.5 C8.5,3.33 7.83,4 7,4 L7,4 Z M14,10 C14,11.11 13.11,12 12,12 L11,12 C9.89,12 9,11.11 9,10 L11,6 L10,6 C9.45,6 9,5.55 9,5 L8,5 L8,13 C8.42,13 9,13.45 9,14 L10,14 C10.42,14 11,14.45 11,15 L3,15 C3,14.45 3.58,14 4,14 L5,14 C5,13.45 5.58,13 6,13 L6.03,13 L6,5 L5,5 C5,5.55 4.55,6 4,6 L3,6 L5,10 C5,11.11 4.11,12 3,12 L2,12 C0.89,12 0,11.11 0,10 L2,6 L1,6 L1,5 L4,5 C4,4.45 4.45,4 5,4 L9,4 C9.55,4 10,4.45 10,5 L13,5 L13,6 L12,6 L14,10 L14,10 Z M2.5,7 L1,10 L4,10 L2.5,7 L2.5,7 Z M13,10 L11.5,7 L10,10 L13,10 L13,10 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/light-bulb.svg b/htdocs/theme/common/octicons/lib/svg/light-bulb.svg
new file mode 100644
index 00000000000..364cb691527
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/light-bulb.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>light-bulb</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="light-bulb" fill="#000000">
+            <path d="M6.5,0 C3.48,0 1,2.19 1,5 C1,5.92 1.55,7.25 2,8 C3.34,10.25 3.78,10.78 4,12 L4,13 L9,13 L9,12 C9.22,10.78 9.66,10.25 11,8 C11.45,7.25 12,5.92 12,5 C12,2.19 9.52,0 6.5,0 L6.5,0 Z M10.14,7.48 C9.89,7.92 9.67,8.28 9.47,8.59 C8.61,10 8.22,10.65 8.02,11.82 C8,11.87 8,11.93 8,11.99 L5,11.99 C5,11.93 5,11.86 4.98,11.82 C4.78,10.65 4.39,9.99 3.53,8.59 C3.33,8.28 3.11,7.92 2.86,7.48 C2.44,6.78 2,5.65 2,5 C2,2.8 4.02,1 6.5,1 C7.72,1 8.86,1.42 9.72,2.19 C10.55,2.94 11,3.94 11,5 C11,5.66 10.56,6.78 10.14,7.48 L10.14,7.48 Z M4,14 L9,14 C8.77,15.14 7.7,16 6.5,16 C5.3,16 4.23,15.14 4,14 L4,14 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/link-external.svg b/htdocs/theme/common/octicons/lib/svg/link-external.svg
new file mode 100644
index 00000000000..e4d0aecb71a
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/link-external.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>link-external</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="link-external" fill="#000000">
+            <path d="M11,10 L12,10 L12,13 C12,13.55 11.55,14 11,14 L1,14 C0.45,14 0,13.55 0,13 L0,3 C0,2.45 0.45,2 1,2 L4,2 L4,3 L1,3 L1,13 L11,13 L11,10 L11,10 Z M6,2 L8.25,4.25 L5,7.5 L6.5,9 L9.75,5.75 L12,8 L12,2 L6,2 L6,2 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/link.svg b/htdocs/theme/common/octicons/lib/svg/link.svg
new file mode 100644
index 00000000000..b28cf283854
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/link.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>link</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="link" fill="#000000">
+            <path d="M4,9 L5,9 L5,10 L4,10 C2.5,10 1,8.31 1,6.5 C1,4.69 2.55,3 4,3 L8,3 C9.45,3 11,4.69 11,6.5 C11,7.91 10.09,9.22 9,9.75 L9,8.59 C9.58,8.14 10,7.32 10,6.5 C10,5.22 8.98,4 8,4 L4,4 C3.02,4 2,5.22 2,6.5 C2,7.78 3,9 4,9 L4,9 Z M13,6 L12,6 L12,7 L13,7 C14,7 15,8.22 15,9.5 C15,10.78 13.98,12 13,12 L9,12 C8.02,12 7,10.78 7,9.5 C7,8.67 7.42,7.86 8,7.41 L8,6.25 C6.91,6.78 6,8.09 6,9.5 C6,11.31 7.55,13 9,13 L13,13 C14.45,13 16,11.31 16,9.5 C16,7.69 14.5,6 13,6 L13,6 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/list-ordered.svg b/htdocs/theme/common/octicons/lib/svg/list-ordered.svg
new file mode 100644
index 00000000000..16f458cbfe6
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/list-ordered.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>list-ordered</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="list-ordered" fill="#000000">
+            <path d="M12,13 C12,13.59 12,14 11.41,14 L4.59,14 C4,14 4,13.59 4,13 C4,12.41 4,12 4.59,12 L11.4,12 C11.99,12 11.99,12.41 11.99,13 L12,13 Z M4.59,4 L11.4,4 C11.99,4 11.99,3.59 11.99,3 C11.99,2.41 11.99,2 11.4,2 L4.59,2 C4,2 4,2.41 4,3 C4,3.59 4,4 4.59,4 L4.59,4 Z M11.4,7 L4.59,7 C4,7 4,7.41 4,8 C4,8.59 4,9 4.59,9 L11.4,9 C11.99,9 11.99,8.59 11.99,8 C11.99,7.41 11.99,7 11.4,7 L11.4,7 Z M2,1 L1.28,1 C0.98,1.19 0.7,1.25 0.25,1.34 L0.25,2 L1,2 L1,4.14 L0.16,4.14 L0.16,5 L3,5 L3,4.14 L2,4.14 L2,1 L2,1 Z M2.25,9.13 C2.08,9.13 1.8,9.16 1.59,9.19 C2.12,8.63 2.73,7.94 2.73,7.3 C2.71,6.52 2.17,6 1.37,6 C0.78,6 0.4,6.2 -0.01,6.64 L0.57,7.22 C0.76,7.03 0.95,6.84 1.21,6.84 C1.49,6.84 1.69,7 1.69,7.36 C1.69,7.89 0.92,8.56 -0.01,9.42 L-0.01,10 L2.99,10 L2.9,9.12 L2.24,9.12 L2.25,9.13 Z M2.17,12.91 L2.17,12.88 C2.61,12.69 2.81,12.41 2.81,12.02 C2.81,11.32 2.25,10.91 1.37,10.91 C0.89,10.91 0.48,11.1 0.09,11.43 L0.64,12.07 C0.89,11.87 1.08,11.76 1.33,11.76 C1.6,11.76 1.75,11.89 1.75,12.12 C1.75,12.39 1.55,12.56 0.89,12.56 L0.89,13.31 C1.72,13.31 1.87,13.48 1.87,13.78 C1.87,14.03 1.64,14.16 1.29,14.16 C1.01,14.16 0.73,14.02 0.48,13.78 L-2.22044605e-16,14.44 C0.3,14.8 0.77,15 1.41,15 C2.24,15 2.94,14.59 2.94,13.84 C2.94,13.34 2.63,13.03 2.17,12.9 L2.17,12.91 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/list-unordered.svg b/htdocs/theme/common/octicons/lib/svg/list-unordered.svg
new file mode 100644
index 00000000000..e0fce86f0b1
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/list-unordered.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>list-unordered</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="list-unordered" fill="#000000">
+            <path d="M2,13 C2,13.59 2,14 1.41,14 L0.59,14 C0,14 0,13.59 0,13 C0,12.41 0,12 0.59,12 L1.4,12 C1.99,12 1.99,12.41 1.99,13 L2,13 Z M4.59,4 L11.4,4 C11.99,4 11.99,3.59 11.99,3 C11.99,2.41 11.99,2 11.4,2 L4.59,2 C4,2 4,2.41 4,3 C4,3.59 4,4 4.59,4 L4.59,4 Z M1.41,7 L0.59,7 C0,7 0,7.41 0,8 C0,8.59 0,9 0.59,9 L1.4,9 C1.99,9 1.99,8.59 1.99,8 C1.99,7.41 1.99,7 1.4,7 L1.41,7 Z M1.41,2 L0.59,2 C0,2 0,2.41 0,3 C0,3.59 0,4 0.59,4 L1.4,4 C1.99,4 1.99,3.59 1.99,3 C1.99,2.41 1.99,2 1.4,2 L1.41,2 Z M11.41,7 L4.59,7 C4,7 4,7.41 4,8 C4,8.59 4,9 4.59,9 L11.4,9 C11.99,9 11.99,8.59 11.99,8 C11.99,7.41 11.99,7 11.4,7 L11.41,7 Z M11.41,12 L4.59,12 C4,12 4,12.41 4,13 C4,13.59 4,14 4.59,14 L11.4,14 C11.99,14 11.99,13.59 11.99,13 C11.99,12.41 11.99,12 11.4,12 L11.41,12 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/location.svg b/htdocs/theme/common/octicons/lib/svg/location.svg
new file mode 100644
index 00000000000..2bb33c679b6
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/location.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>location</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="location" fill="#000000">
+            <path d="M6,0 C2.69,0 0,2.5 0,5.5 C0,10.02 6,16 6,16 C6,16 12,10.02 12,5.5 C12,2.5 9.31,0 6,0 L6,0 Z M6,14.55 C4.14,12.52 1,8.44 1,5.5 C1,3.02 3.25,1 6,1 C7.34,1 8.61,1.48 9.56,2.36 C10.48,3.22 11,4.33 11,5.5 C11,8.44 7.86,12.52 6,14.55 L6,14.55 Z M8,5.5 C8,6.61 7.11,7.5 6,7.5 C4.89,7.5 4,6.61 4,5.5 C4,4.39 4.89,3.5 6,3.5 C7.11,3.5 8,4.39 8,5.5 L8,5.5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/lock.svg b/htdocs/theme/common/octicons/lib/svg/lock.svg
new file mode 100644
index 00000000000..3e81d98ee0d
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/lock.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>lock</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="lock" fill="#000000">
+            <path d="M4,13 L3,13 L3,12 L4,12 L4,13 L4,13 Z M12,7 L12,14 C12,14.55 11.55,15 11,15 L1,15 C0.45,15 0,14.55 0,14 L0,7 C0,6.45 0.45,6 1,6 L2,6 L2,4 C2,1.8 3.8,0 6,0 C8.2,0 10,1.8 10,4 L10,6 L11,6 C11.55,6 12,6.45 12,7 L12,7 Z M3.8,6 L8.21,6 L8.21,4 C8.21,2.78 7.23,1.8 6.01,1.8 C4.79,1.8 3.81,2.78 3.81,4 L3.81,6 L3.8,6 Z M11,7 L2,7 L2,14 L11,14 L11,7 L11,7 Z M4,8 L3,8 L3,9 L4,9 L4,8 L4,8 Z M4,10 L3,10 L3,11 L4,11 L4,10 L4,10 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/logo-gist.svg b/htdocs/theme/common/octicons/lib/svg/logo-gist.svg
new file mode 100644
index 00000000000..c95f58fc0cc
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/logo-gist.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="25px" height="16px" viewBox="0 0 25 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>logo-gist</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="logo-gist" fill="#000000">
+            <path d="M4.7,8.73 L7.15,8.73 L7.15,12.75 C6.6,13.02 5.51,13.09 4.62,13.09 C2.06,13.09 1.15,10.89 1.15,8.04 C1.15,5.19 2.06,2.98 4.63,2.98 C5.91,2.98 6.69,3.21 7.91,3.71 L7.91,2.66 C7.27,2.33 6.25,2 4.63,2 C1.13,2 0,4.69 0,8.03 C0,11.37 1.11,14.06 4.63,14.06 C6.27,14.06 7.44,13.79 8.22,13.42 L8.22,7.73 L4.7,7.73 L4.7,8.73 L4.7,8.73 Z M11.09,12.45 L11.09,6.06 L10.04,6.06 L10.04,12.34 C10.04,13.59 10.62,14.06 11.76,14.06 L11.76,13.17 C11.28,13.17 11.09,13.01 11.09,12.47 L11.09,12.45 L11.09,12.45 Z M11.34,3.73 C11.34,3.29 11.01,2.95 10.56,2.95 C10.11,2.95 9.79,3.29 9.79,3.73 C9.79,4.17 10.12,4.51 10.56,4.51 C11,4.51 11.34,4.17 11.34,3.73 L11.34,3.73 Z M15.68,9.42 C14.18,9.29 13.9,8.94 13.9,8.25 C13.9,7.48 14.23,6.91 15.78,6.91 C16.83,6.91 17.44,7.07 18.05,7.27 L18.05,6.33 C17.36,6.03 16.53,5.94 15.8,5.94 C13.6,5.94 12.88,7.14 12.88,8.25 C12.88,9.33 13.35,10.13 15.61,10.33 C17.16,10.46 17.38,10.96 17.38,11.67 C17.38,12.4 16.94,13.09 15.32,13.09 C14.21,13.09 13.46,12.9 12.99,12.73 L12.99,13.67 C13.49,13.87 14.57,14.06 15.32,14.06 C17.7,14.06 18.46,12.86 18.46,11.65 C18.46,10.37 17.93,9.62 15.71,9.42 L15.69,9.42 L15.68,9.42 Z M24.26,6.95 L24.26,6.09 L21.84,6.09 L21.84,3.59 L20.76,3.9 L20.76,6.01 L19.2,6.45 L19.2,6.93 L20.76,6.93 L20.76,11.93 C20.76,13.46 21.95,14.06 23.26,14.06 C23.45,14.06 23.78,14.04 23.95,14.01 L23.95,13.12 C23.76,13.15 23.54,13.15 23.34,13.15 C22.37,13.15 21.84,12.76 21.84,11.81 L21.84,6.94 L24.26,6.94 L24.26,6.96 L24.26,6.95 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/logo-github.svg b/htdocs/theme/common/octicons/lib/svg/logo-github.svg
new file mode 100644
index 00000000000..bb6c20a7b01
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/logo-github.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="45px" height="16px" viewBox="0 0 45 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>logo-github</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="logo-github" fill="#000000">
+            <path d="M18.53,12.0301 L18.51,12.0301 C18.519,12.0301 18.525,12.0391 18.534,12.0411 C18.535,12.0411 18.539,12.0401 18.54,12.0401 L18.53,12.0301 Z M18.534,12.0411 C18.441,12.0421 18.207,12.0901 17.96,12.0901 C17.18,12.0901 16.91,11.7301 16.91,11.2601 L16.91,8.1301 L18.5,8.1301 C18.59,8.1301 18.66,8.0501 18.66,7.9401 L18.66,6.2401 C18.66,6.1501 18.58,6.0701 18.5,6.0701 L16.91,6.0701 L16.91,3.9601 C16.91,3.8801 16.86,3.8301 16.77,3.8301 L14.61,3.8301 C14.52,3.8301 14.47,3.8801 14.47,3.9601 L14.47,6.1301 C14.47,6.1301 13.38,6.4001 13.31,6.4101 C13.23,6.4301 13.18,6.5001 13.18,6.5801 L13.18,7.9401 C13.18,8.0501 13.26,8.1301 13.35,8.1301 L14.46,8.1301 L14.46,11.4101 C14.46,13.8501 16.16,14.1001 17.32,14.1001 C17.85,14.1001 18.49,13.9301 18.59,13.8801 C18.65,13.8601 18.68,13.7901 18.68,13.7201 L18.68,12.2201 C18.68,12.1211 18.612,12.0551 18.534,12.0411 L18.534,12.0411 Z M42.23,9.8401 C42.23,8.0301 41.5,7.7901 40.73,7.8701 C40.13,7.9101 39.65,8.2101 39.65,8.2101 L39.65,11.7301 C39.65,11.7301 40.14,12.0701 40.87,12.0901 C41.9,12.1201 42.23,11.7501 42.23,9.8401 L42.23,9.8401 Z M44.66,9.6801 C44.66,13.1101 43.55,14.0901 41.61,14.0901 C39.97,14.0901 39.09,13.2601 39.09,13.2601 C39.09,13.2601 39.05,13.7201 39,13.7801 C38.97,13.8401 38.92,13.8601 38.86,13.8601 L37.38,13.8601 C37.28,13.8601 37.19,13.7801 37.19,13.6901 L37.21,2.5801 C37.21,2.4901 37.29,2.4101 37.38,2.4101 L39.51,2.4101 C39.6,2.4101 39.68,2.4901 39.68,2.5801 L39.68,6.3501 C39.68,6.3501 40.5,5.8201 41.7,5.8201 L41.69,5.8001 C42.89,5.8001 44.66,6.2501 44.66,9.6801 L44.66,9.6801 Z M35.94,6.0701 L35.93,6.0701 L33.84,6.0701 C33.73,6.0701 33.67,6.1501 33.67,6.2601 L33.67,11.7001 C33.67,11.7001 33.12,12.0901 32.37,12.0901 C31.62,12.0901 31.4,11.7501 31.4,11.0001 L31.4,6.2501 C31.4,6.1601 31.32,6.0801 31.23,6.0801 L29.09,6.0801 C29,6.0801 28.92,6.1601 28.92,6.2501 L28.92,11.3601 C28.92,13.5601 30.15,14.1101 31.84,14.1101 C33.23,14.1101 34.36,13.3401 34.36,13.3401 C34.36,13.3401 34.41,13.7301 34.44,13.7901 C34.46,13.8401 34.53,13.8801 34.6,13.8801 L35.94,13.8801 C36.05,13.8801 36.11,13.8001 36.11,13.7101 L36.13,6.2401 C36.13,6.1501 36.05,6.0701 35.94,6.0701 L35.94,6.0701 Z M12.24,6.0601 L10.11,6.0601 C10.02,6.0601 9.94,6.1501 9.94,6.2601 L9.94,13.6001 C9.94,13.8001 10.07,13.8701 10.24,13.8701 L12.16,13.8701 C12.36,13.8701 12.41,13.7801 12.41,13.6001 L12.41,6.2401 L12.41,6.2301 C12.41,6.1401 12.33,6.0601 12.24,6.0601 L12.24,6.0601 Z M11.19,2.6801 C10.42,2.6801 9.81,3.2901 9.81,4.0601 C9.81,4.8301 10.42,5.4401 11.19,5.4401 C11.94,5.4401 12.55,4.8301 12.55,4.0601 C12.55,3.2901 11.94,2.6801 11.19,2.6801 L11.19,2.6801 Z M27.68,2.4301 L25.57,2.4301 C25.48,2.4301 25.4,2.5101 25.4,2.6001 L25.4,6.6901 L22.09,6.6901 L22.09,2.6001 C22.09,2.5101 22.01,2.4301 21.92,2.4301 L19.79,2.4301 C19.7,2.4301 19.62,2.5101 19.62,2.6001 L19.62,13.7101 C19.62,13.8001 19.71,13.8801 19.79,13.8801 L21.92,13.8801 C22.01,13.8801 22.09,13.8001 22.09,13.7101 L22.09,8.9601 L25.4,8.9601 L25.38,13.7101 C25.38,13.8001 25.46,13.8801 25.55,13.8801 L27.68,13.8801 C27.77,13.8801 27.85,13.8001 27.85,13.7101 L27.85,2.6001 C27.85,2.5101 27.77,2.4301 27.68,2.4301 L27.68,2.4301 Z M8.81,7.3501 L8.81,13.0901 C8.81,13.1301 8.8,13.2001 8.75,13.2201 C8.75,13.2201 7.5,14.1101 5.44,14.1101 C2.95,14.1101 0,13.3301 0,8.1901 C0,3.0501 2.58,1.9901 5.1,2.0001 C7.28,2.0001 8.16,2.4901 8.3,2.5801 C8.34,2.6301 8.36,2.6701 8.36,2.7201 L7.94,4.5001 C7.94,4.5901 7.85,4.7001 7.74,4.6701 C7.38,4.5601 6.84,4.3401 5.57,4.3401 C4.1,4.3401 2.52,4.7601 2.52,8.0701 C2.52,11.3801 4.02,11.7701 5.1,11.7701 C6.02,11.7701 6.35,11.6601 6.35,11.6601 L6.35,9.3601 L4.88,9.3601 C4.77,9.3601 4.69,9.2801 4.69,9.1901 L4.69,7.3501 C4.69,7.2601 4.77,7.1801 4.88,7.1801 L8.62,7.1801 C8.73,7.1801 8.81,7.2601 8.81,7.3501 L8.81,7.3501 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mail-read.svg b/htdocs/theme/common/octicons/lib/svg/mail-read.svg
new file mode 100644
index 00000000000..9a6ee16730d
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/mail-read.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>mail-read</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="mail-read" fill="#000000">
+            <path d="M6,5 L4,5 L4,4 L6,4 L6,5 L6,5 Z M9,6 L4,6 L4,7 L9,7 L9,6 L9,6 Z M14,5.52 L14,14 C14,14.55 13.55,15 13,15 L1,15 C0.45,15 0,14.55 0,14 L0,5.52 C0,5.19 0.16,4.89 0.42,4.71 L2,3.58 L2,3 C2,2.45 2.45,2 3,2 L4.2,2 L7,0 L9.8,2 L11,2 C11.55,2 12,2.45 12,3 L12,3.58 L13.58,4.71 C13.85,4.9 14,5.19 14,5.52 L14,5.52 Z M3,7.5 L7,10 L11,7.5 L11,3 L3,3 L3,7.5 L3,7.5 Z M1,13.5 L5.5,10.5 L1,7.5 L1,13.5 L1,13.5 Z M12,14 L7,11 L2,14 L12,14 L12,14 Z M13,7.5 L8.5,10.5 L13,13.5 L13,7.5 L13,7.5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mail-reply.svg b/htdocs/theme/common/octicons/lib/svg/mail-reply.svg
new file mode 100644
index 00000000000..03c8212f636
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/mail-reply.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.1 (28215) - http://www.bohemiancoding.com/sketch -->
+    <title>mail-reply</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="mail-reply" fill="#000000">
+            <path d="M6,2.5 L0,7 L6,11.5 L6,8.5 C7.73,8.5 11.14,9.45 12,12.88 C12,8.33 8.94,5.83 6,5.5 L6,2.5 L6,2.5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mail.svg b/htdocs/theme/common/octicons/lib/svg/mail.svg
new file mode 100644
index 00000000000..1ff97533bb5
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/mail.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>mail</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="mail" fill="#000000">
+            <path d="M0,4 L0,12 C0,12.55 0.45,13 1,13 L13,13 C13.55,13 14,12.55 14,12 L14,4 C14,3.45 13.55,3 13,3 L1,3 C0.45,3 0,3.45 0,4 L0,4 Z M13,4 L7,9 L1,4 L13,4 L13,4 Z M1,5.5 L5,8.5 L1,11.5 L1,5.5 L1,5.5 Z M2,12 L5.5,9 L7,10.5 L8.5,9 L12,12 L2,12 L2,12 Z M13,11.5 L9,8.5 L13,5.5 L13,11.5 L13,11.5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mark-github.svg b/htdocs/theme/common/octicons/lib/svg/mark-github.svg
new file mode 100644
index 00000000000..2bda9afa081
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/mark-github.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>mark-github</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="mark-github" fill="#000000">
+            <path d="M8,0 C3.58,0 0,3.58 0,8 C0,11.54 2.29,14.53 5.47,15.59 C5.87,15.66 6.02,15.42 6.02,15.21 C6.02,15.02 6.01,14.39 6.01,13.72 C4,14.09 3.48,13.23 3.32,12.78 C3.23,12.55 2.84,11.84 2.5,11.65 C2.22,11.5 1.82,11.13 2.49,11.12 C3.12,11.11 3.57,11.7 3.72,11.94 C4.44,13.15 5.59,12.81 6.05,12.6 C6.12,12.08 6.33,11.73 6.56,11.53 C4.78,11.33 2.92,10.64 2.92,7.58 C2.92,6.71 3.23,5.99 3.74,5.43 C3.66,5.23 3.38,4.41 3.82,3.31 C3.82,3.31 4.49,3.1 6.02,4.13 C6.66,3.95 7.34,3.86 8.02,3.86 C8.7,3.86 9.38,3.95 10.02,4.13 C11.55,3.09 12.22,3.31 12.22,3.31 C12.66,4.41 12.38,5.23 12.3,5.43 C12.81,5.99 13.12,6.7 13.12,7.58 C13.12,10.65 11.25,11.33 9.47,11.53 C9.76,11.78 10.01,12.26 10.01,13.01 C10.01,14.08 10,14.94 10,15.21 C10,15.42 10.15,15.67 10.55,15.59 C13.71,14.53 16,11.53 16,8 C16,3.58 12.42,0 8,0 L8,0 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/markdown.svg b/htdocs/theme/common/octicons/lib/svg/markdown.svg
new file mode 100644
index 00000000000..fb33c140c80
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/markdown.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>markdown</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="markdown" fill="#000000">
+            <path d="M14.85,3 L1.15,3 C0.52,3 0,3.52 0,4.15 L0,11.84 C0,12.48 0.52,13 1.15,13 L14.84,13 C15.48,13 15.99,12.48 15.99,11.85 L15.99,4.15 C16,3.52 15.48,3 14.85,3 L14.85,3 Z M9,11 L7,11 L7,8 L5.5,9.92 L4,8 L4,11 L2,11 L2,5 L4,5 L5.5,7 L7,5 L9,5 L9,11 L9,11 Z M11.99,11.5 L9.5,8 L11,8 L11,5 L13,5 L13,8 L14.5,8 L11.99,11.5 L11.99,11.5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/megaphone.svg b/htdocs/theme/common/octicons/lib/svg/megaphone.svg
new file mode 100644
index 00000000000..e8f10228767
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/megaphone.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>megaphone</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="megaphone" fill="#000000">
+            <path d="M10,1 C9.83,1 9.64,1.05 9.48,1.14 C8.04,2.02 4.5,4.58 3,5 C1.62,5 0,5.67 0,7.5 C0,9.33 1.63,10 3,10 C3.3,10.08 3.64,10.23 4,10.41 L4,15 L6,15 L6,11.55 C7.34,12.41 8.69,13.38 9.48,13.86 C9.64,13.95 9.82,14 10,14 C10.52,14 11,13.58 11,13 L11,2 C11,1.42 10.52,1 10,1 L10,1 Z M10,13 C9.62,12.77 9.11,12.42 8.5,12 C8.34,11.89 8.17,11.78 8,11.66 L8,3.31 C8.16,3.2 8.31,3.11 8.47,3 C9.08,2.59 9.63,2.23 10,2 L10,13 L10,13 Z M12,7 L16,7 L16,8 L12,8 L12,7 L12,7 Z M12,9 L16,11 L16,12 L12,10 L12,9 L12,9 Z M16,3 L16,4 L12,6 L12,5 L16,3 L16,3 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mention.svg b/htdocs/theme/common/octicons/lib/svg/mention.svg
new file mode 100644
index 00000000000..f82be86a72a
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/mention.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>mention</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="mention" fill="#000000">
+            <path d="M6.58,15 C7.83,15 9.1,14.69 10.14,14.06 L9.72,13.12 C8.88,13.64 7.83,13.95 6.69,13.95 C3.46,13.95 1.05,11.87 1.05,8.23 C1.05,3.86 4.28,1.05 7.63,1.05 C11.08,1.05 12.85,3.24 12.85,6.25 C12.85,8.64 11.51,10.11 10.35,10.11 C9.3,10.11 8.99,9.38 9.3,7.92 L10.03,4.17 L8.98,4.17 L8.87,4.89 C8.46,4.26 7.93,4.06 7.31,4.06 C5.12,4.06 3.65,6.45 3.65,8.44 C3.65,10.11 4.59,11.05 5.95,11.05 C6.79,11.05 7.62,10.52 8.25,9.8 C8.36,10.74 9.19,11.25 10.23,11.25 C11.9,11.25 14,9.58 14,6.25 C14,2.61 11.59,0 7.83,0 C3.66,0 0,3.33 0,8.33 C0,12.71 2.92,15 6.58,15 L6.58,15 Z M6.27,10 C5.54,10 4.91,9.48 4.91,8.33 C4.91,6.88 5.85,5.11 7.32,5.11 C7.84,5.11 8.16,5.31 8.57,5.94 L8.05,8.96 C7.42,9.69 6.8,10.01 6.27,10.01 L6.27,10 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/milestone.svg b/htdocs/theme/common/octicons/lib/svg/milestone.svg
new file mode 100644
index 00000000000..829bba95ef5
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/milestone.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>milestone</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="milestone" fill="#000000">
+            <path d="M8,2 L6,2 L6,0 L8,0 L8,2 L8,2 Z M12,7 L2,7 C1.45,7 1,6.55 1,6 L1,4 C1,3.45 1.45,3 2,3 L12,3 L14,5 L12,7 L12,7 Z M8,4 L6,4 L6,6 L8,6 L8,4 L8,4 Z M6,16 L8,16 L8,8 L6,8 L6,16 L6,16 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mirror.svg b/htdocs/theme/common/octicons/lib/svg/mirror.svg
new file mode 100644
index 00000000000..39055e601eb
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/mirror.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>mirror</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="mirror" fill="#000000">
+            <path d="M15.5,4.7 L8.5,0 L1.5,4.7 C1.2,4.89 1,5.15 1,5.5 L1,16 L8.5,12 L16,16 L16,5.5 C16,5.16 15.8,4.89 15.5,4.7 L15.5,4.7 Z M15,14.5 L9,11.25 L9,10 L8,10 L8,11.25 L2,14.5 L2,5.5 L8,1.5 L8,6 L9,6 L9,1.5 L15,5.5 L15,14.5 L15,14.5 Z M6,7 L11,7 L11,5 L14,8 L11,11 L11,9 L6,9 L6,11 L3,8 L6,5 L6,7 L6,7 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mortar-board.svg b/htdocs/theme/common/octicons/lib/svg/mortar-board.svg
new file mode 100644
index 00000000000..ee3b5f8b9a3
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/mortar-board.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>mortar-board</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="mortar-board" fill="#000000">
+            <path d="M7.83,9.19 L4,8 C8.8817842e-16,1.33226763e-15 4,9.5 4,10.5 C4,11.5 5.8,12 8,12 C10.2,12 12,11.5 12,10.5 L12,8 L8.17,9.19 C8.06,9.22 7.94,9.22 7.81,9.19 L7.83,9.19 L7.83,9.19 Z M8.11,2.8 C8.05,2.78 7.97,2.78 7.91,2.8 L0.27,5.18 C-0.06,5.29 -0.06,5.74 0.27,5.85 L2,6.4 L2,8.17 C1.7,8.34 1.5,8.67 1.5,9.03 C1.5,9.22 1.55,9.39 1.64,9.53 C1.56,9.67 1.5,9.84 1.5,10.03 L1.5,12.61 C1.5,13.16 3.5,13.16 3.5,12.61 L3.5,10.03 C3.5,9.84 3.45,9.67 3.36,9.53 C3.44,9.39 3.5,9.22 3.5,9.03 C3.5,8.65 3.3,8.34 3,8.17 L3,6.72 L7.89,8.25 C7.95,8.27 8.03,8.27 8.09,8.25 L15.73,5.87 C16.06,5.76 16.06,5.31 15.73,5.2 L8.1,2.81 L8.11,2.8 Z M8.02,6 C7.47,6 7.02,5.78 7.02,5.5 C7.02,5.22 7.47,5 8.02,5 C8.57,5 9.02,5.22 9.02,5.5 C9.02,5.78 8.57,6 8.02,6 L8.02,6 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/mute.svg b/htdocs/theme/common/octicons/lib/svg/mute.svg
new file mode 100644
index 00000000000..f29643f227d
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/mute.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>mute</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="mute" fill="#000000">
+            <path d="M8,2.81 L8,13.19 C8,13.86 7.19,14.19 6.72,13.72 L3,10 L1,10 C0.45,10 0,9.55 0,9 L0,7 C0,6.45 0.45,6 1,6 L3,6 L6.72,2.28 C7.19,1.81 8,2.14 8,2.81 L8,2.81 Z M15.53,6.03 L14.47,4.97 L12.5,6.94 L10.53,4.97 L9.47,6.03 L11.44,8 L9.47,9.97 L10.53,11.03 L12.5,9.06 L14.47,11.03 L15.53,9.97 L13.56,8 L15.53,6.03 L15.53,6.03 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/no-newline.svg b/htdocs/theme/common/octicons/lib/svg/no-newline.svg
new file mode 100644
index 00000000000..fae7c4fe789
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/no-newline.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>no-newline</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="no-newline" fill="#000000">
+            <path d="M16,5 L16,8 C16,8.55 15.55,9 15,9 L12,9 L12,11 L9,8 L12,5 L12,7 L14,7 L14,5 L16,5 L16,5 Z M8,8 C8,10.2 6.2,12 4,12 C1.8,12 0,10.2 0,8 C0,5.8 1.8,4 4,4 C6.2,4 8,5.8 8,8 L8,8 Z M1.5,9.66 L5.66,5.5 C5.18,5.19 4.61,5 4,5 C2.34,5 1,6.34 1,8 C1,8.61 1.19,9.17 1.5,9.66 L1.5,9.66 Z M7,8 C7,7.39 6.81,6.83 6.5,6.34 L2.34,10.5 C2.82,10.81 3.39,11 4,11 C5.66,11 7,9.66 7,8 L7,8 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/note.svg b/htdocs/theme/common/octicons/lib/svg/note.svg
new file mode 100644
index 00000000000..49c1a3892b3
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/note.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>note</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="note" fill="#000000">
+            <path d="M3,10 L7,10 L7,9 L3,9 L3,10 L3,10 Z M3,8 L9,8 L9,7 L3,7 L3,8 L3,8 Z M3,6 L11,6 L11,5 L3,5 L3,6 L3,6 Z M13,12 L1,12 L1,3 L13,3 L13,12 L13,12 Z M1,2 C0.45,2 0,2.45 0,3 L0,12 C0,12.55 0.45,13 1,13 L13,13 C13.55,13 14,12.55 14,12 L14,3 C14,2.45 13.55,2 13,2 L1,2 L1,2 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/octoface.svg b/htdocs/theme/common/octicons/lib/svg/octoface.svg
new file mode 100644
index 00000000000..87aadac2360
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/octoface.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>octoface</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="octoface" fill="#000000">
+            <path d="M14.7,5.34 C14.83,5.02 15.25,3.75 14.57,2.03 C14.57,2.03 13.52,1.7 11.13,3.33 C10.13,3.05 9.06,3.01 8,3.01 C6.94,3.01 5.87,3.05 4.87,3.33 C2.48,1.69 1.43,2.03 1.43,2.03 C0.75,3.75 1.17,5.02 1.3,5.34 C0.49,6.21 0,7.33 0,8.69 C0,13.84 3.33,15 7.98,15 C12.63,15 16,13.84 16,8.69 C16,7.33 15.51,6.21 14.7,5.34 L14.7,5.34 Z M8,14.02 C4.7,14.02 2.02,13.87 2.02,10.67 C2.02,9.91 2.4,9.19 3.04,8.6 C4.11,7.62 5.94,8.14 8,8.14 C10.07,8.14 11.88,7.62 12.96,8.6 C13.61,9.19 13.98,9.9 13.98,10.67 C13.98,13.86 11.3,14.02 8,14.02 L8,14.02 Z M5.49,9.01 C4.83,9.01 4.29,9.81 4.29,10.79 C4.29,11.77 4.83,12.58 5.49,12.58 C6.15,12.58 6.69,11.78 6.69,10.79 C6.69,9.8 6.15,9.01 5.49,9.01 L5.49,9.01 Z M10.51,9.01 C9.85,9.01 9.31,9.8 9.31,10.79 C9.31,11.78 9.85,12.58 10.51,12.58 C11.17,12.58 11.71,11.78 11.71,10.79 C11.71,9.8 11.18,9.01 10.51,9.01 L10.51,9.01 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/organization.svg b/htdocs/theme/common/octicons/lib/svg/organization.svg
new file mode 100644
index 00000000000..51cb253acfa
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/organization.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>organization</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="organization" fill="#221F20">
+            <path d="M16,12.999 C16,13.438 15.55,13.999 15,13.999 L7.995,13.999 C7.456,13.999 7.001,13.552 7,13 L1,13 C0.46,13 0,12.439 0,12 C0,9.366 3,8 3,8 C3,8 3.229,7.591 3,7 C2.159,6.379 1.942,6.41 2,4 C2.058,1.581 3.367,1 4.5,1 C5.633,1 6.942,1.58 7,4 C7.058,6.41 6.841,6.379 6,7 C5.771,7.59 6,8 6,8 C6,8 7.549,8.711 8.42,10.088 C9.196,9.369 10,8.999 10,8.999 C10,8.999 10.229,8.59 10,7.999 C9.159,7.379 8.942,7.409 9,4.999 C9.058,2.58 10.367,1.999 11.5,1.999 C12.633,1.999 13.937,2.58 13.995,4.999 C14.054,7.409 13.837,7.379 12.995,7.999 C12.766,8.589 12.995,8.999 12.995,8.999 C12.995,8.999 16,10.365 16,12.999" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/package.svg b/htdocs/theme/common/octicons/lib/svg/package.svg
new file mode 100644
index 00000000000..cb41bcf6a03
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/package.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>package</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="package" fill="#000000">
+            <path d="M1,4.27 L1,11.74 C1,12.19 1.3,12.58 1.75,12.71 L8.25,14.44 C8.41,14.49 8.59,14.49 8.75,14.44 L15.25,12.71 C15.7,12.58 16,12.19 16,11.74 L16,4.27 C16,3.82 15.7,3.43 15.25,3.3 L8.75,1.56 C8.59,1.53 8.41,1.53 8.25,1.56 L1.75,3.3 C1.3,3.43 1,3.82 1,4.27 L1,4.27 Z M8,13.36 L2,11.77 L2,5 L8,6.61 L8,13.36 L8,13.36 Z M2,4 L4.5,3.33 L11,5.06 L8.5,5.73 L2,4 L2,4 Z M15,11.77 L9,13.36 L9,6.61 L11,6.06 L11,8.5 L13,7.97 L13,5.53 L15,5 L15,11.77 L15,11.77 Z M13,4.53 L6.5,2.8 L8.5,2.27 L15,4 L13,4.53 L13,4.53 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/paintcan.svg b/htdocs/theme/common/octicons/lib/svg/paintcan.svg
new file mode 100644
index 00000000000..387195bff62
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/paintcan.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>paintcan</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="paintcan" fill="#000000">
+            <path d="M6,0 C2.69,0 0,2.69 0,6 L0,7 C0,7.55 0.45,8 1,8 L1,13 C1,14.1 3.24,15 6,15 C8.76,15 11,14.1 11,13 L11,8 C11.55,8 12,7.55 12,7 L12,6 C12,2.69 9.31,0 6,0 L6,0 Z M9,10 L9,10.5 C9,10.78 8.78,11 8.5,11 C8.22,11 8,10.78 8,10.5 L8,10 C8,9.72 7.78,9.5 7.5,9.5 C7.22,9.5 7,9.72 7,10 L7,12.5 C7,12.78 6.78,13 6.5,13 C6.22,13 6,12.78 6,12.5 L6,10.5 C6,10.22 5.78,10 5.5,10 C5.22,10 5,10.22 5,10.5 L5,11 C5,11.55 4.55,12 4,12 C3.45,12 3,11.55 3,11 L3,10 C2.45,10 2,9.55 2,9 L2,7.2 C2.91,7.69 4.36,8 6,8 C7.64,8 9.09,7.69 10,7.2 L10,9 C10,9.55 9.55,10 9,10 L9,10 Z M6,7 C4.32,7 2.88,6.59 2.29,6 C2.88,5.41 4.32,5 6,5 C7.68,5 9.12,5.41 9.71,6 C9.12,6.59 7.68,7 6,7 L6,7 Z M6,4 C3.24,4 1,4.89 1,6 L1,6 C1,3.24 3.24,1 6,1 C8.76,1 11,3.24 11,6 C11,4.9 8.76,4 6,4 L6,4 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/pencil.svg b/htdocs/theme/common/octicons/lib/svg/pencil.svg
new file mode 100644
index 00000000000..354df31f3f2
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/pencil.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>pencil</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="pencil" fill="#000000">
+            <path d="M0,12 L0,15 L3,15 L11,7 L8,4 L0,12 L0,12 Z M3,14 L1,14 L1,12 L2,12 L2,13 L3,13 L3,14 L3,14 Z M13.3,4.7 L12,6 L9,3 L10.3,1.7 C10.69,1.31 11.32,1.31 11.71,1.7 L13.3,3.29 C13.69,3.68 13.69,4.31 13.3,4.7 L13.3,4.7 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/person.svg b/htdocs/theme/common/octicons/lib/svg/person.svg
new file mode 100644
index 00000000000..a26225e1c4a
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/person.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>person</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="person" fill="#000000">
+            <path d="M12,14.002 C12,14.553 11.553,15 11.002,15 L1.001,15 C0.448,15 0,14.552 0,13.999 L0,13 C0,10.367 4,9 4,9 C4,9 4.229,8.591 4,8 C3.159,7.38 3.056,6.41 3,4 C3.173,1.587 4.867,1 6,1 C7.133,1 8.827,1.586 9,4 C8.944,6.41 8.841,7.38 8,8 C7.771,8.59 8,9 8,9 C8,9 12,10.367 12,13 L12,14.002 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/pin.svg b/htdocs/theme/common/octicons/lib/svg/pin.svg
new file mode 100644
index 00000000000..d08cb652dd1
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/pin.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>pin</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="pin" fill="#000000">
+            <path d="M10,1.2 L10,2 L10.5,3 L6,6 L2.2,6 C1.76,6 1.53,6.53 1.86,6.86 L5,10 L1,15 L6,11 L9.14,14.14 C9.47,14.47 10,14.23 10,13.8 L10,10 L13,5.5 L14,6 L14.8,6 C15.24,6 15.47,5.47 15.14,5.14 L10.86,0.86 C10.53,0.53 10,0.77 10,1.2 L10,1.2 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/plug.svg b/htdocs/theme/common/octicons/lib/svg/plug.svg
new file mode 100644
index 00000000000..8f4ee9f46ba
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/plug.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>plug</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="plug" fill="#000000">
+            <path d="M14,6 L14,5 L10,5 L10,3 L8,3 L8,4 L6,4 C4.97,4 4.23,4.81 4,6 L3,7 C1.34,7 0,8.34 0,10 L0,12 L1,12 L1,10 C1,8.89 1.89,8 3,8 L4,9 C4.25,10.16 4.98,11 6,11 L8,11 L8,12 L10,12 L10,10 L14,10 L14,9 L10,9 L10,6 L14,6 L14,6 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/plus-small.svg b/htdocs/theme/common/octicons/lib/svg/plus-small.svg
new file mode 100644
index 00000000000..ccb9d2d6256
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/plus-small.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="7px" height="16px" viewBox="0 0 7 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>plus-small</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="plus-small" fill="#000000">
+            <path d="M4,7 L4,4 L3,4 L3,7 L0,7 L0,8 L3,8 L3,11 L4,11 L4,8 L7,8 L7,7 L4,7 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/plus.svg b/htdocs/theme/common/octicons/lib/svg/plus.svg
new file mode 100644
index 00000000000..3882ee5a1c7
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/plus.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>plus</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="plus" fill="#000000">
+            <polygon id="Shape" points="12 9 7 9 7 14 5 14 5 9 0 9 0 7 5 7 5 2 7 2 7 7 12 7"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/primitive-dot.svg b/htdocs/theme/common/octicons/lib/svg/primitive-dot.svg
new file mode 100644
index 00000000000..b9a2f416c28
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/primitive-dot.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="8px" height="16px" viewBox="0 0 8 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>primitive-dot</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="primitive-dot" fill="#000000">
+            <path d="M0,8 C0,5.8 1.8,4 4,4 C6.2,4 8,5.8 8,8 C8,10.2 6.2,12 4,12 C1.8,12 0,10.2 0,8 L0,8 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/primitive-square.svg b/htdocs/theme/common/octicons/lib/svg/primitive-square.svg
new file mode 100644
index 00000000000..361b7c383ac
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/primitive-square.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="8px" height="16px" viewBox="0 0 8 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>primitive-square</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="primitive-square" fill="#000000">
+            <polygon id="Shape" points="8 12 0 12 0 4 8 4"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/project.svg b/htdocs/theme/common/octicons/lib/svg/project.svg
new file mode 100644
index 00000000000..606672f3f52
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/project.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15px" height="16px" viewBox="0 0 15 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>project</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="project" fill="#000000">
+            <path d="M10,12 L13,12 L13,2 L10,2 L10,12 L10,12 Z M6,10 L9,10 L9,2 L6,2 L6,10 L6,10 Z M2,14 L5,14 L5,2 L2,2 L2,14 L2,14 Z M1,15 L14,15 L14,1 L1,1 L1,15 L1,15 Z M14,0 L1,0 C0.448,0 0,0.448 0,1 L0,15 C0,15.552 0.448,16 1,16 L14,16 C14.552,16 15,15.552 15,15 L15,1 C15,0.448 14.552,0 14,0 L14,0 L14,0 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/pulse.svg b/htdocs/theme/common/octicons/lib/svg/pulse.svg
new file mode 100644
index 00000000000..a17f9c00d3a
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/pulse.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>pulse</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="pulse" fill="#000000">
+            <polygon id="Shape" points="11.5 8 8.8 5.4 6.6 8.5 5.5 1.6 2.38 8 0 8 0 10 3.6 10 4.5 8.2 5.4 13.6 9 8.5 10.6 10 14 10 14 8"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/question.svg b/htdocs/theme/common/octicons/lib/svg/question.svg
new file mode 100644
index 00000000000..554fc5bf02c
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/question.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>question</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="question" fill="#000000">
+            <path d="M6,10 L8,10 L8,12 L6,12 L6,10 L6,10 Z M10,6.5 C10,8.64 8,9 8,9 L6,9 C6,8.45 6.45,8 7,8 L7.5,8 C7.78,8 8,7.78 8,7.5 L8,6.5 C8,6.22 7.78,6 7.5,6 L6.5,6 C6.22,6 6,6.22 6,6.5 L6,7 L4,7 C4,5.5 5.5,4 7,4 C8.5,4 10,5 10,6.5 L10,6.5 Z M7,2.3 C10.14,2.3 12.7,4.86 12.7,8 C12.7,11.14 10.14,13.7 7,13.7 C3.86,13.7 1.3,11.14 1.3,8 C1.3,4.86 3.86,2.3 7,2.3 L7,2.3 Z M7,1 C3.14,1 0,4.14 0,8 C0,11.86 3.14,15 7,15 C10.86,15 14,11.86 14,8 C14,4.14 10.86,1 7,1 L7,1 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/quote.svg b/htdocs/theme/common/octicons/lib/svg/quote.svg
new file mode 100644
index 00000000000..882882f0fbd
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/quote.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>quote</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="quote" fill="#000000">
+            <path d="M6.16,3.50000004 C3.73,5.06000004 2.55,6.67000004 2.55,9.36000004 C2.71,9.31000004 2.85,9.31000004 2.99,9.31000004 C4.26,9.31000004 5.49,10.17 5.49,11.72 C5.49,13.33 4.46,14.33 2.99,14.33 C1.09,14.33 0,12.81 0,10.08 C0,6.28000004 1.75,3.55000004 5.02,1.66000004 L6.16,3.50000004 L6.16,3.50000004 Z M13.16,3.50000004 C10.73,5.06000004 9.55,6.67000004 9.55,9.36000004 C9.71,9.31000004 9.85,9.31000004 9.99,9.31000004 C11.26,9.31000004 12.49,10.17 12.49,11.72 C12.49,13.33 11.46,14.33 9.99,14.33 C8.1,14.33 7.01,12.81 7.01,10.08 C7.01,6.28000004 8.76,3.55000004 12.03,1.66000004 L13.17,3.50000004 L13.16,3.50000004 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/radio-tower.svg b/htdocs/theme/common/octicons/lib/svg/radio-tower.svg
new file mode 100644
index 00000000000..6f27ab3d9ce
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/radio-tower.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>radio-tower</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="radio-tower" fill="#000000">
+            <path d="M4.79,6.11 C5.04,5.86 5.04,5.44 4.79,5.19 C4.47,4.86 4.31,4.43 4.31,4 C4.31,3.57 4.47,3.14 4.79,2.81 C5.04,2.55 5.04,2.14 4.79,1.89 C4.67,1.76 4.5,1.7 4.34,1.7 C4.18,1.7 4.01,1.76 3.89,1.89 C3.32,2.47 3.04,3.24 3.04,4 C3.04,4.76 3.33,5.53 3.89,6.11 C4.14,6.36 4.55,6.36 4.79,6.11 L4.79,6.11 Z M2.33,0.52 C2.2,0.39 2.04,0.33 1.87,0.33 C1.71,0.33 1.54,0.39 1.41,0.52 C0.48,1.48 0.01,2.74 0.01,3.99 C0.01,5.25 0.48,6.51 1.41,7.47 C1.66,7.73 2.07,7.73 2.32,7.47 C2.57,7.21 2.57,6.79 2.32,6.53 C1.64,5.83 1.3,4.91 1.3,3.99 C1.3,3.07 1.64,2.15 2.32,1.45 C2.58,1.2 2.58,0.78 2.33,0.52 L2.33,0.52 Z M8.02,5.62 C8.92,5.62 9.64,4.89 9.64,4 C9.64,3.1 8.91,2.38 8.02,2.38 C7.12,2.38 6.4,3.11 6.4,4 C6.39,4.89 7.12,5.62 8.02,5.62 L8.02,5.62 Z M14.59,0.53 C14.34,0.27 13.93,0.27 13.68,0.53 C13.43,0.79 13.43,1.21 13.68,1.47 C14.36,2.17 14.7,3.09 14.7,4.01 C14.7,4.93 14.36,5.84 13.68,6.55 C13.43,6.81 13.43,7.23 13.68,7.49 C13.81,7.62 13.97,7.68 14.14,7.68 C14.3,7.68 14.47,7.62 14.6,7.49 C15.53,6.53 16,5.27 16,4.01 C15.99,2.75 15.52,1.49 14.59,0.53 L14.59,0.53 Z M8.02,6.92 L8.02,6.92 C7.61,6.92 7.19,6.82 6.82,6.62 L3.67,14.99 L5.16,14.99 L6.02,13.99 L10.02,13.99 L10.86,14.99 L12.35,14.99 L9.21,6.62 C8.83,6.82 8.43,6.92 8.02,6.92 L8.02,6.92 Z M8.01,7.4 L9.02,11 L7.02,11 L8.01,7.4 L8.01,7.4 Z M6.02,12.99 L7.02,11.99 L9.02,11.99 L10.02,12.99 L6.02,12.99 L6.02,12.99 Z M11.21,1.89 C10.96,2.14 10.96,2.56 11.21,2.81 C11.53,3.14 11.69,3.57 11.69,4 C11.69,4.43 11.53,4.86 11.21,5.19 C10.96,5.45 10.96,5.86 11.21,6.11 C11.33,6.24 11.5,6.3 11.66,6.3 C11.82,6.3 11.98,6.24 12.11,6.11 C12.68,5.53 12.96,4.76 12.96,4 C12.96,3.24 12.68,2.47 12.11,1.89 C11.86,1.64 11.45,1.64 11.21,1.89 L11.21,1.89 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/reply.svg b/htdocs/theme/common/octicons/lib/svg/reply.svg
new file mode 100644
index 00000000000..7dbde79bfa5
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/reply.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>reply</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="reply" fill="#000000">
+            <path d="M6,3.5 C9.92,3.94 14,6.625 14,13.5 C11.688,8.438 9.25,7.5 6,7.5 L6,11 L0.5,5.5 L6,0 L6,3.5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/repo-clone.svg b/htdocs/theme/common/octicons/lib/svg/repo-clone.svg
new file mode 100644
index 00000000000..8fb3ea1688d
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/repo-clone.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>repo-clone</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="repo-clone" fill="#000000">
+            <path d="M15,0 L9,0 L9,7 C9,7.55 9.45,8 10,8 L11,8 L11,9 L12,9 L12,8 L15,8 C15.55,8 16,7.55 16,7 L16,1 C16,0.45 15.55,0 15,0 L15,0 Z M11,7 L10,7 L10,6 L11,6 L11,7 L11,7 Z M15,7 L12,7 L12,6 L15,6 L15,7 L15,7 Z M15,5 L11,5 L11,1 L15,1 L15,5 L15,5 Z M4,5 L3,5 L3,4 L4,4 L4,5 L4,5 Z M4,3 L3,3 L3,2 L4,2 L4,3 L4,3 Z M2,1 L8,1 L8,0 L1,0 C0.45,0 0,0.45 0,1 L0,13 C0,13.55 0.45,14 1,14 L3,14 L3,16 L4.5,14.5 L6,16 L6,14 L11,14 C11.55,14 12,13.55 12,13 L12,10 L2,10 L2,1 L2,1 Z M11,11 L11,13 L6,13 L6,12 L3,12 L3,13 L1,13 L1,11 L11,11 L11,11 Z M3,8 L4,8 L4,9 L3,9 L3,8 L3,8 Z M4,7 L3,7 L3,6 L4,6 L4,7 L4,7 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/repo-force-push.svg b/htdocs/theme/common/octicons/lib/svg/repo-force-push.svg
new file mode 100644
index 00000000000..a9cb1d62609
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/repo-force-push.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>repo-force-push</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="repo-force-push" fill="#000000">
+            <path d="M10,9 L8,9 L8,16 L6,16 L6,9 L4,9 L6.25,6 L4,6 L7,2 L10,6 L7.75,6 L10,9 L10,9 Z M11,0 L1,0 C0.45,0 0,0.45 0,1 L0,13 C0,13.55 0.45,14 1,14 L5,14 L5,13 L1,13 L1,11 L5,11 L5,10 L2,10 L2,1 L11,1 L11,10 L9,10 L9,11 L11,11 L11,13 L9,13 L9,14 L11,14 C11.55,14 12,13.55 12,13 L12,1 C12,0.45 11.55,0 11,0 L11,0 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/repo-forked.svg b/htdocs/theme/common/octicons/lib/svg/repo-forked.svg
new file mode 100644
index 00000000000..b1db2556a49
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/repo-forked.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>repo-forked</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="repo-forked" fill="#000000">
+            <path d="M8,1 C6.89,1 6,1.89 6,3 C6,3.73 6.41,4.38 7,4.72 L7,6 L5,8 L3,6 L3,4.72 C3.59,4.38 4,3.74 4,3 C4,1.89 3.11,1 2,1 C0.89,1 0,1.89 0,3 C0,3.73 0.41,4.38 1,4.72 L1,6.5 L4,9.5 L4,11.28 C3.41,11.62 3,12.26 3,13 C3,14.11 3.89,15 5,15 C6.11,15 7,14.11 7,13 C7,12.27 6.59,11.62 6,11.28 L6,9.5 L9,6.5 L9,4.72 C9.59,4.38 10,3.74 10,3 C10,1.89 9.11,1 8,1 L8,1 Z M2,4.2 C1.34,4.2 0.8,3.65 0.8,3 C0.8,2.35 1.35,1.8 2,1.8 C2.65,1.8 3.2,2.35 3.2,3 C3.2,3.65 2.65,4.2 2,4.2 L2,4.2 Z M5,14.2 C4.34,14.2 3.8,13.65 3.8,13 C3.8,12.35 4.35,11.8 5,11.8 C5.65,11.8 6.2,12.35 6.2,13 C6.2,13.65 5.65,14.2 5,14.2 L5,14.2 Z M8,4.2 C7.34,4.2 6.8,3.65 6.8,3 C6.8,2.35 7.35,1.8 8,1.8 C8.65,1.8 9.2,2.35 9.2,3 C9.2,3.65 8.65,4.2 8,4.2 L8,4.2 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/repo-pull.svg b/htdocs/theme/common/octicons/lib/svg/repo-pull.svg
new file mode 100644
index 00000000000..9ca11006c80
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/repo-pull.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>repo-pull</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="repo-pull" fill="#000000">
+            <path d="M13,8 L13,6 L7,6 L7,4 L13,4 L13,2 L16,5 L13,8 L13,8 Z M4,2 L3,2 L3,3 L4,3 L4,2 L4,2 Z M11,7 L12,7 L12,13 C12,13.55 11.55,14 11,14 L6,14 L6,16 L4.5,14.5 L3,16 L3,14 L1,14 C0.45,14 0,13.55 0,13 L0,1 C0,0.45 0.45,0 1,0 L11,0 C11.55,0 12,0.45 12,1 L12,3 L11,3 L11,1 L2,1 L2,10 L11,10 L11,7 L11,7 Z M11,11 L1,11 L1,13 L3,13 L3,12 L6,12 L6,13 L11,13 L11,11 L11,11 Z M4,6 L3,6 L3,7 L4,7 L4,6 L4,6 Z M4,4 L3,4 L3,5 L4,5 L4,4 L4,4 Z M3,9 L4,9 L4,8 L3,8 L3,9 L3,9 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/repo-push.svg b/htdocs/theme/common/octicons/lib/svg/repo-push.svg
new file mode 100644
index 00000000000..be7433ce792
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/repo-push.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>repo-push</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="repo-push" fill="#000000">
+            <path d="M4,3 L3,3 L3,2 L4,2 L4,3 L4,3 Z M3,5 L4,5 L4,4 L3,4 L3,5 L3,5 Z M7,5 L4,9 L6,9 L6,16 L8,16 L8,9 L10,9 L7,5 L7,5 Z M11,0 L1,0 C0.45,0 0,0.45 0,1 L0,13 C0,13.55 0.45,14 1,14 L5,14 L5,13 L1,13 L1,11 L5,11 L5,10 L2,10 L2,1 L11.02,1 L11,10 L9,10 L9,11 L11,11 L11,13 L9,13 L9,14 L11,14 C11.55,14 12,13.55 12,13 L12,1 C12,0.45 11.55,0 11,0 L11,0 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/repo.svg b/htdocs/theme/common/octicons/lib/svg/repo.svg
new file mode 100644
index 00000000000..613f72d52f3
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/repo.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>repo</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="repo" fill="#000000">
+            <path d="M4,9 L3,9 L3,8 L4,8 L4,9 L4,9 Z M4,6 L3,6 L3,7 L4,7 L4,6 L4,6 Z M4,4 L3,4 L3,5 L4,5 L4,4 L4,4 Z M4,2 L3,2 L3,3 L4,3 L4,2 L4,2 Z M12,1 L12,13 C12,13.55 11.55,14 11,14 L6,14 L6,16 L4.5,14.5 L3,16 L3,14 L1,14 C0.45,14 0,13.55 0,13 L0,1 C0,0.45 0.45,0 1,0 L11,0 C11.55,0 12,0.45 12,1 L12,1 Z M11,11 L1,11 L1,13 L3,13 L3,12 L6,12 L6,13 L11,13 L11,11 L11,11 Z M11,1 L2,1 L2,10 L11,10 L11,1 L11,1 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/rocket.svg b/htdocs/theme/common/octicons/lib/svg/rocket.svg
new file mode 100644
index 00000000000..1f227b7dae8
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/rocket.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>rocket</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="rocket" fill="#000000">
+            <path d="M12.17,3.83 C11.9,3.56 11.7,3.28 11.54,2.95 C11.38,2.64 11.27,2.29 11.2,1.93 C10.62,2.26 10.04,2.63 9.47,3.06 C8.89,3.5 8.33,4 7.78,4.54 C7.08,5.24 6.45,6.35 6,6.99 L3,6.99 L0,10 L3,10 L5,8 C4.66,8.77 3.98,10.98 4,11 L5,12 C5.02,12.02 7.23,11.36 8,11 L6,13 L6,16 L9,13 L9,10 C9.64,9.55 10.75,8.91 11.45,8.22 C12,7.67 12.5,7.09 12.92,6.52 C13.36,5.94 13.73,5.36 14.06,4.8 C13.7,4.72 13.36,4.61 13.03,4.46 C12.72,4.3 12.44,4.1 12.17,3.83 M16,0 C16,0 15.91,0.38 15.7,1.06 C15.5,1.76 15.15,2.64 14.64,3.72 C13.94,3.64 13.37,3.39 12.98,3 C12.59,2.61 12.35,2.06 12.28,1.36 C13.36,0.84 14.23,0.48 14.92,0.28 C15.62,0.08 16,0 16,0" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/rss.svg b/htdocs/theme/common/octicons/lib/svg/rss.svg
new file mode 100644
index 00000000000..6d82aaf8c20
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/rss.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>rss</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="rss" fill="#000000">
+            <path d="M2,13 L0,13 L0,11 C1.11,11 2,11.89 2,13 L2,13 Z M0,3 L0,4 C4.97,4 9,8.03 9,13 L10,13 C10,7.48 5.52,3 0,3 L0,3 Z M0,7 L0,8 C2.75,8 5,10.25 5,13 L6,13 C6,9.69 3.31,7 0,7 L0,7 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/ruby.svg b/htdocs/theme/common/octicons/lib/svg/ruby.svg
new file mode 100644
index 00000000000..fff3baf760c
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/ruby.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>ruby</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="ruby" fill="#000000">
+            <path d="M13,6 L8,11 L8,4 L11,4 L13,6 L13,6 Z M16,6 L8,14 L0,6 L4,2 L12,2 L16,6 L16,6 Z M8,12.5 L14.5,6 L11.5,3 L4.5,3 L1.5,6 L8,12.5 L8,12.5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/screen-full.svg b/htdocs/theme/common/octicons/lib/svg/screen-full.svg
new file mode 100644
index 00000000000..302ef1725d4
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/screen-full.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>screen-full</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="screen-full" fill="#000000">
+            <path d="M13,10 L14,10 L14,13 C14,13.546875 13.546875,14 13,14 L10,14 L10,13 L13,13 L13,10 L13,10 L13,10 Z M1,10 L0,10 L0,13 C0,13.546875 0.453125,14 1,14 L4,14 L4,13 L1,13 L1,10 L1,10 L1,10 Z M1,3 L4,3 L4,2 L1,2 C0.453125,2 0,2.453125 0,3 L0,6 L1,6 L1,3 L1,3 L1,3 Z M2,4 L12,4 L12,12 L2,12 L2,4 L2,4 L2,4 Z M4,10 L10,10 L10,6 L4,6 L4,10 L4,10 L4,10 Z M10,2 L10,3 L13,3 L13,6 L14,6 L14,3 C14,2.453125 13.546875,2 13,2 L10,2 L10,2 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/screen-normal.svg b/htdocs/theme/common/octicons/lib/svg/screen-normal.svg
new file mode 100644
index 00000000000..e144fc5a04d
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/screen-normal.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>screen-normal</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="screen-normal" fill="#000000">
+            <path d="M2,4 L0,4 L0,3 L2,3 L2,1 L3,1 L3,3 C3,3.546875 2.546875,4 2,4 L2,4 L2,4 Z M2,12 L0,12 L0,13 L2,13 L2,15 L3,15 L3,13 C3,12.453125 2.546875,12 2,12 L2,12 L2,12 Z M11,10 C11,10.546875 10.546875,11 10,11 L4,11 C3.453125,11 3,10.546875 3,10 L3,6 C3,5.453125 3.453125,5 4,5 L10,5 C10.546875,5 11,5.453125 11,6 L11,10 L11,10 L11,10 Z M9,7 L5,7 L5,9 L9,9 L9,7 L9,7 L9,7 Z M11,13 L11,15 L12,15 L12,13 L14,13 L14,12 L12,12 C11.453125,12 11,12.453125 11,13 L11,13 L11,13 Z M12,3 L12,1 L11,1 L11,3 C11,3.546875 11.453125,4 12,4 L14,4 L14,3 L12,3 L12,3 L12,3 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/search.svg b/htdocs/theme/common/octicons/lib/svg/search.svg
new file mode 100644
index 00000000000..547eb505ef6
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/search.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>search</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="search" fill="#000000">
+            <path d="M15.7,13.3 L11.89,9.47 C12.59,8.49 13,7.3 13,6 C13,2.69 10.31,0 7,0 C3.69,0 1,2.69 1,6 C1,9.31 3.69,12 7,12 C8.3,12 9.48,11.59 10.47,10.89 L14.3,14.7 C14.49,14.9 14.75,15 15,15 C15.25,15 15.52,14.91 15.7,14.7 C16.09,14.31 16.09,13.68 15.7,13.29 L15.7,13.3 Z M7,10.7 C4.41,10.7 2.3,8.59 2.3,6 C2.3,3.41 4.41,1.3 7,1.3 C9.59,1.3 11.7,3.41 11.7,6 C11.7,8.59 9.59,10.7 7,10.7 L7,10.7 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/server.svg b/htdocs/theme/common/octicons/lib/svg/server.svg
new file mode 100644
index 00000000000..3f439fd5a7c
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/server.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>server</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="server" fill="#000000">
+            <path d="M11,6 L1,6 C0.45,6 0,6.45 0,7 L0,9 C0,9.55 0.45,10 1,10 L11,10 C11.55,10 12,9.55 12,9 L12,7 C12,6.45 11.55,6 11,6 L11,6 Z M2,9 L1,9 L1,7 L2,7 L2,9 L2,9 Z M4,9 L3,9 L3,7 L4,7 L4,9 L4,9 Z M6,9 L5,9 L5,7 L6,7 L6,9 L6,9 Z M8,9 L7,9 L7,7 L8,7 L8,9 L8,9 Z M11,1 L1,1 C0.45,1 0,1.45 0,2 L0,4 C0,4.55 0.45,5 1,5 L11,5 C11.55,5 12,4.55 12,4 L12,2 C12,1.45 11.55,1 11,1 L11,1 Z M2,4 L1,4 L1,2 L2,2 L2,4 L2,4 Z M4,4 L3,4 L3,2 L4,2 L4,4 L4,4 Z M6,4 L5,4 L5,2 L6,2 L6,4 L6,4 Z M8,4 L7,4 L7,2 L8,2 L8,4 L8,4 Z M11,3 L10,3 L10,2 L11,2 L11,3 L11,3 Z M11,11 L1,11 C0.45,11 0,11.45 0,12 L0,14 C0,14.55 0.45,15 1,15 L11,15 C11.55,15 12,14.55 12,14 L12,12 C12,11.45 11.55,11 11,11 L11,11 Z M2,14 L1,14 L1,12 L2,12 L2,14 L2,14 Z M4,14 L3,14 L3,12 L4,12 L4,14 L4,14 Z M6,14 L5,14 L5,12 L6,12 L6,14 L6,14 Z M8,14 L7,14 L7,12 L8,12 L8,14 L8,14 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/settings.svg b/htdocs/theme/common/octicons/lib/svg/settings.svg
new file mode 100644
index 00000000000..70f860c411e
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/settings.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>settings</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="settings" fill="#000000">
+            <path d="M4,7 L3,7 L3,2 L4,2 L4,7 L4,7 Z M3,14 L4,14 L4,11 L3,11 L3,14 L3,14 Z M8,14 L9,14 L9,8 L8,8 L8,14 L8,14 Z M13,14 L14,14 L14,12 L13,12 L13,14 L13,14 Z M14,2 L13,2 L13,8 L14,8 L14,2 L14,2 Z M9,2 L8,2 L8,4 L9,4 L9,2 L9,2 Z M5,8 L2,8 C1.45,8 1,8.45 1,9 C1,9.55 1.45,10 2,10 L5,10 C5.55,10 6,9.55 6,9 C6,8.45 5.55,8 5,8 L5,8 Z M10,5 L7,5 C6.45,5 6,5.45 6,6 C6,6.55 6.45,7 7,7 L10,7 C10.55,7 11,6.55 11,6 C11,5.45 10.55,5 10,5 L10,5 Z M15,9 L12,9 C11.45,9 11,9.45 11,10 C11,10.55 11.45,11 12,11 L15,11 C15.55,11 16,10.55 16,10 C16,9.45 15.55,9 15,9 L15,9 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/shield.svg b/htdocs/theme/common/octicons/lib/svg/shield.svg
new file mode 100644
index 00000000000..f83a8d0c549
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/shield.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>shield</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="shield" fill="#000000">
+            <path d="M7,0 L0,2 L0,8.02 C0,12.69 5.31,16 7,16 C8.69,16 14,12.69 14,8.02 L14,2 L7,0 L7,0 Z M5,11 L6.14,8.2 C6.19,7.97 6.08,7.73 5.89,7.61 C5.33,7.25 5,6.66 5,6 C5,4.91 5.89,4 6.98,4 C8.06,4 9,4.91 9,6 C9,6.66 8.67,7.25 8.11,7.61 C7.92,7.74 7.81,7.97 7.86,8.2 L9,11 L5,11 L5,11 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/sign-in.svg b/htdocs/theme/common/octicons/lib/svg/sign-in.svg
new file mode 100644
index 00000000000..99bc42b6ccc
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/sign-in.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>sign-in</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="sign-in" fill="#000000">
+            <path d="M7,6.75 L7,12 L11,12 L11,8 L12,8 L12,12 C12,12.55 11.55,13 11,13 L7,13 L7,16 L1.55,13.28 C1.22,13.11 1,12.76 1,12.37 L1,1 C1,0.45 1.45,0 2,0 L11,0 C11.55,0 12,0.45 12,1 L12,4 L11,4 L11,1 L3,1 L7,3 L7,5.25 L10,3 L10,5 L14,5 L14,7 L10,7 L10,9 L7,6.75 L7,6.75 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/sign-out.svg b/htdocs/theme/common/octicons/lib/svg/sign-out.svg
new file mode 100644
index 00000000000..dca0faa5cb9
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/sign-out.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>sign-out</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="sign-out" fill="#000000">
+            <path d="M12,9 L12,7 L8,7 L8,5 L12,5 L12,3 L16,6 L12,9 L12,9 Z M10,12 L6,12 L6,3 L2,1 L10,1 L10,4 L11,4 L11,1 C11,0.45 10.55,0 10,0 L1,0 C0.45,0 0,0.45 0,1 L0,12.38 C0,12.77 0.22,13.11 0.55,13.29 L6,16.01 L6,13 L10,13 C10.55,13 11,12.55 11,12 L11,8 L10,8 L10,12 L10,12 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/smiley.svg b/htdocs/theme/common/octicons/lib/svg/smiley.svg
new file mode 100644
index 00000000000..6041ee91f61
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/smiley.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>smiley</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="smiley" fill="#000000">
+            <path d="M8,0 C3.58,0 0,3.58 0,8 C0,12.42 3.58,16 8,16 C12.42,16 16,12.42 16,8 C16,3.58 12.42,0 8,0 L8,0 Z M12.81,12.81 C12.18,13.44 11.45,13.92 10.64,14.26 C9.81,14.62 8.92,14.79 8,14.79 C7.08,14.79 6.19,14.62 5.36,14.26 C4.55,13.92 3.81,13.43 3.19,12.81 C2.57,12.19 2.08,11.45 1.74,10.64 C1.38,9.81 1.21,8.92 1.21,8 C1.21,7.08 1.38,6.19 1.74,5.36 C2.08,4.55 2.57,3.81 3.19,3.19 C3.81,2.57 4.55,2.08 5.36,1.74 C6.19,1.38 7.08,1.21 8,1.21 C8.92,1.21 9.81,1.38 10.64,1.74 C11.45,2.08 12.19,2.57 12.81,3.19 C13.43,3.81 13.92,4.55 14.26,5.36 C14.62,6.19 14.79,7.08 14.79,8 C14.79,8.92 14.62,9.81 14.26,10.64 C13.92,11.45 13.43,12.19 12.81,12.81 L12.81,12.81 Z M4,6.8 L4,6.21 C4,5.55 4.53,5.02 5.2,5.02 L5.79,5.02 C6.45,5.02 6.98,5.55 6.98,6.21 L6.98,6.8 C6.98,7.47 6.45,8 5.79,8 L5.2,8 C4.53,8 4,7.47 4,6.8 L4,6.8 Z M9,6.8 L9,6.21 C9,5.55 9.53,5.02 10.2,5.02 L10.79,5.02 C11.45,5.02 11.98,5.55 11.98,6.21 L11.98,6.8 C11.98,7.47 11.45,8 10.79,8 L10.2,8 C9.53,8 9,7.47 9,6.8 L9,6.8 Z M13,10 C12.28,11.88 10.09,13 8,13 C5.91,13 3.72,11.87 3,10 C2.86,9.61 3.23,9 3.66,9 L12.25,9 C12.66,9 13.14,9.61 13,10 L13,10 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/squirrel.svg b/htdocs/theme/common/octicons/lib/svg/squirrel.svg
new file mode 100644
index 00000000000..0cff65843f9
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/squirrel.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>squirrel</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="squirrel" fill="#000000">
+            <path d="M12,1 C9.79,1 8,2.31 8,3.92 C8,5.86 8.5,6.95 8,10 C8,5.5 5.23,3.66 4,3.66 C4.05,3.16 3.52,3 3.52,3 C3.52,3 3.3,3.11 3.22,3.34 C2.95,3.03 2.66,3.07 2.66,3.07 L2.53,3.65 C2.53,3.65 0.7,4.29 0.68,6.87 C0.88,7.2 2.21,7.47 3.15,7.3 C4.04,7.35 3.82,8.09 3.62,8.29 C2.78,9.13 2,8 1,8 C0,8 0,9 1,9 C2,9 2,10 4,10 C0.91,11.2 4,14 4,14 L3,14 C2,14 2,15 2,15 L8,15 C11,15 13,14 13,11.53 C13,10.68 12.57,9.74 12,9 C10.89,7.54 12.23,6.32 13,7 C13.77,7.68 16,8 16,5 C16,2.79 14.21,1 12,1 L12,1 Z M2.5,6 C2.22,6 2,5.78 2,5.5 C2,5.22 2.22,5 2.5,5 C2.78,5 3,5.22 3,5.5 C3,5.78 2.78,6 2.5,6 L2.5,6 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/star.svg b/htdocs/theme/common/octicons/lib/svg/star.svg
new file mode 100644
index 00000000000..9d8ca6a7fc0
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/star.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>star</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="star" fill="#000000">
+            <polygon id="Shape" points="14 6 9.1 5.36 7 1 4.9 5.36 0 6 3.6 9.26 2.67 14 7 11.67 11.33 14 10.4 9.26"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/stop.svg b/htdocs/theme/common/octicons/lib/svg/stop.svg
new file mode 100644
index 00000000000..bc74f95f8d7
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/stop.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>stop</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="stop" fill="#000000">
+            <path d="M10,1 L4,1 L0,5 L0,11 L4,15 L10,15 L14,11 L14,5 L10,1 L10,1 Z M13,10.5 L9.5,14 L4.5,14 L1,10.5 L1,5.5 L4.5,2 L9.5,2 L13,5.5 L13,10.5 L13,10.5 Z M6,4 L8,4 L8,9 L6,9 L6,4 L6,4 Z M6,10 L8,10 L8,12 L6,12 L6,10 L6,10 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/sync.svg b/htdocs/theme/common/octicons/lib/svg/sync.svg
new file mode 100644
index 00000000000..59b5f3c4000
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/sync.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>sync</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="sync" fill="#000000">
+            <path d="M10.24,7.4 C10.43,8.68 10.04,10.02 9.04,11 C7.57,12.45 5.3,12.63 3.63,11.54 L4.8,10.4 L0.5,9.8 L1.1,14 L2.41,12.74 C4.77,14.48 8.11,14.31 10.25,12.2 C11.49,10.97 12.06,9.35 11.99,7.74 L10.24,7.4 L10.24,7.4 Z M2.96,5 C4.43,3.55 6.7,3.37 8.37,4.46 L7.2,5.6 L11.5,6.2 L10.9,2 L9.59,3.26 C7.23,1.52 3.89,1.69 1.74,3.8 C0.5,5.03 -0.06,6.65 0.01,8.26 L1.76,8.61 C1.57,7.33 1.96,5.98 2.96,5 L2.96,5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/tag.svg b/htdocs/theme/common/octicons/lib/svg/tag.svg
new file mode 100644
index 00000000000..1b425c8a69d
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/tag.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>tag</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="tag" fill="#000000">
+            <path d="M7.73,1.73 C7.26,1.26 6.62,1 5.96,1 L3.5,1 C2.13,1 1,2.13 1,3.5 L1,5.97 C1,6.63 1.27,7.27 1.73,7.74 L7.79,13.8 C8.18,14.19 8.81,14.19 9.2,13.8 L13.79,9.21 C14.18,8.82 14.18,8.19 13.79,7.8 L7.73,1.73 L7.73,1.73 Z M2.38,7.09 C2.07,6.79 1.91,6.39 1.91,5.96 L1.91,3.5 C1.91,2.62 2.63,1.91 3.5,1.91 L5.97,1.91 C6.39,1.91 6.8,2.07 7.1,2.38 L13.24,8.51 L8.51,13.24 L2.38,7.09 L2.38,7.09 Z M3.01,3 L5.01,3 L5.01,5 L3,5 L3,3 L3.01,3 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/tasklist.svg b/htdocs/theme/common/octicons/lib/svg/tasklist.svg
new file mode 100644
index 00000000000..e9291f70a26
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/tasklist.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>tasklist</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="tasklist" fill="#000000">
+            <path d="M15.41,9 L7.59,9 C7,9 7,8.59 7,8 C7,7.41 7,7 7.59,7 L15.4,7 C15.99,7 15.99,7.41 15.99,8 C15.99,8.59 15.99,9 15.4,9 L15.41,9 Z M9.59,4 C9,4 9,3.59 9,3 C9,2.41 9,2 9.59,2 L15.4,2 C15.99,2 15.99,2.41 15.99,3 C15.99,3.59 15.99,4 15.4,4 L9.59,4 L9.59,4 Z M0,3.91 L1.41,2.61 L3,4.2 L7.09,0 L8.5,1.41 L3,6.91 L0,3.91 L0,3.91 Z M7.59,12 L15.4,12 C15.99,12 15.99,12.41 15.99,13 C15.99,13.59 15.99,14 15.4,14 L7.59,14 C7,14 7,13.59 7,13 C7,12.41 7,12 7.59,12 L7.59,12 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/telescope.svg b/htdocs/theme/common/octicons/lib/svg/telescope.svg
new file mode 100644
index 00000000000..961891fcf90
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/telescope.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>telescope</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="telescope" fill="#000000">
+            <path d="M8,9 L11,15 L10,15 L8,11 L8,16 L7,16 L7,10 L5,15 L4,15 L6,10 L8,9 L8,9 Z M7,0 L6,0 L6,1 L7,1 L7,0 L7,0 Z M5,3 L4,3 L4,4 L5,4 L5,3 L5,3 Z M2,1 L1,1 L1,2 L2,2 L2,1 L2,1 Z M0.63,9 C0.41,9.16 0.35,9.44 0.47,9.67 L1.02,10.59 C1.15,10.82 1.43,10.9 1.66,10.79 L3.05,10.13 L1.89,8.13 L0.62,8.99 L0.63,9 Z M8.52,3.61 L2.72,7.56 L3.95,9.7 L10.28,6.67 L8.51,3.61 L8.52,3.61 Z M12.74,4.89 L11.27,2.37 C11.13,2.12 10.8,2.04 10.55,2.2 L9.35,3.03 L11.19,6.23 L12.52,5.59 C12.79,5.46 12.88,5.15 12.74,4.89 L12.74,4.89 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/terminal.svg b/htdocs/theme/common/octicons/lib/svg/terminal.svg
new file mode 100644
index 00000000000..9980e86827f
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/terminal.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>terminal</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="terminal" fill="#000000">
+            <path d="M7,10 L11,10 L11,11 L7,11 L7,10 L7,10 Z M4,11 L7,8 L4,5 L3.25,5.75 L5.5,8 L3.25,10.25 L4,11 L4,11 Z M14,3 L14,13 C14,13.55 13.55,14 13,14 L1,14 C0.45,14 0,13.55 0,13 L0,3 C0,2.45 0.45,2 1,2 L13,2 C13.55,2 14,2.45 14,3 L14,3 Z M13,3 L1,3 L1,13 L13,13 L13,3 L13,3 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/text-size.svg b/htdocs/theme/common/octicons/lib/svg/text-size.svg
new file mode 100644
index 00000000000..9c40dd04ab3
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/text-size.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="16px" viewBox="0 0 18 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>text-size</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="text-size" fill="#000000">
+            <path d="M13.62,9.08 L12.1,3.66 L12.04,3.66 L10.54,9.08 L13.62,9.08 Z M5.7,10.13 C5.7,10.13 4.68,6.52 4.53,6.02 L4.45,6.02 L3.32,10.13 L5.7,10.13 Z M17.31,14 L15.06,14 L14.11,10.75 L10.04,10.75 L9.09,14 L6.84,14 L6.15,11.67 L2.87,11.67 L2.17,14 L0,14 L3.3,4.41 L5.8,4.41 L7.97,10.75 L10.86,2 L13.38,2 L17.32,14 L17.31,14 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/three-bars.svg b/htdocs/theme/common/octicons/lib/svg/three-bars.svg
new file mode 100644
index 00000000000..585dfeee331
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/three-bars.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>three-bars</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="three-bars" fill="#000000">
+            <path d="M11.41,9 L0.59,9 C0,9 0,8.59 0,8 C0,7.41 0,7 0.59,7 L11.4,7 C11.99,7 11.99,7.41 11.99,8 C11.99,8.59 11.99,9 11.4,9 L11.41,9 Z M11.41,5 L0.59,5 C0,5 0,4.59 0,4 C0,3.41 0,3 0.59,3 L11.4,3 C11.99,3 11.99,3.41 11.99,4 C11.99,4.59 11.99,5 11.4,5 L11.41,5 Z M0.59,11 L11.4,11 C11.99,11 11.99,11.41 11.99,12 C11.99,12.59 11.99,13 11.4,13 L0.59,13 C0,13 0,12.59 0,12 C0,11.41 0,11 0.59,11 L0.59,11 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/thumbsdown.svg b/htdocs/theme/common/octicons/lib/svg/thumbsdown.svg
new file mode 100644
index 00000000000..e0e642d9455
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/thumbsdown.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>thumbsdown</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="thumbsdown" fill="#000000">
+            <path d="M15.98,7.83 L15.01,1.88 C14.84,0.5 13.13,0 12,0 L5.69,0 C5.49,0 5.31,0.05 5.16,0.14 L3.72,1 L2,1 C0.94,1 0,1.94 0,3 L0,7 C0,8.06 0.94,9.02 2,9 L4,9 C4.91,9 5.39,9.45 6.39,10.55 C7.3,11.55 7.27,12.35 7.02,13.82 C6.94,14.32 7.08,14.82 7.44,15.24 C7.83,15.71 8.42,16.01 9,16.01 C10.83,16.01 12,12.29 12,10.99 L11.98,10.01 L12,10.01 L14.02,10.01 C15.18,10.01 15.97,9.21 16,8.04 C16,7.98 16.02,7.91 15.98,7.84 L15.98,7.83 Z M14.01,9.02 L12.02,9.02 C11.32,9.02 10.99,9.3 10.99,9.99 L11.02,11.02 C11.02,12.29 9.85,15.02 9.02,15.02 C8.52,15.02 7.94,14.52 8.02,14.02 C8.27,12.44 8.36,11.24 7.13,9.88 C6.11,8.75 5.36,8 4,8 L4,2 L5.67,1 L12,1 C12.73,1 13.95,1.31 14,2 L14.02,2.02 L15.02,8.02 C14.99,8.66 14.64,9.02 14.02,9.02 L14.01,9.02 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/thumbsup.svg b/htdocs/theme/common/octicons/lib/svg/thumbsup.svg
new file mode 100644
index 00000000000..a9bc8529976
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/thumbsup.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>thumbsup</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="thumbsup" fill="#000000">
+            <path d="M14,14 C13.95,14.69 12.73,15 12,15 L5.67,15 L4,14 L4,8 C5.36,8 6.11,7.25 7.13,6.12 C8.36,4.76 8.27,3.56 8.01,1.99 C7.93,1.49 8.51,0.99 9.01,0.99 C9.84,0.99 11.01,3.72 11.01,4.99 L10.99,6.02 C10.99,6.71 11.32,6.99 12.01,6.99 L14.01,6.99 C14.64,6.99 14.99,7.35 15.01,7.99 L14.01,13.99 L14,14 Z M14,6 L12,6 L11.98,6 L12,5.02 C12,3.72 10.83,0 9,0 C8.42,0 7.83,0.3 7.44,0.77 C7.08,1.18 6.94,1.68 7.02,2.18 C7.27,3.66 7.3,4.46 6.39,5.46 C5.39,6.55 4.91,7.01 4,7.01 L2,7.01 C0.94,7 0,7.94 0,9 L0,13 C0,14.06 0.94,15 2,15 L3.72,15 L5.16,15.86 C5.32,15.95 5.49,16 5.68,16 L12.01,16 C13.14,16 14.85,15.5 15.01,14.12 L15.99,8.17 C16.01,8.09 16.01,8.03 16.01,7.97 C15.98,6.8 15.17,6 14.01,6 L14,6 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/tools.svg b/htdocs/theme/common/octicons/lib/svg/tools.svg
new file mode 100644
index 00000000000..52aafd2555e
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/tools.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>tools</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="tools" fill="#000000">
+            <path d="M4.48,7.27 C4.74,7.53 5.76,8.6 5.76,8.6 L6.32,8.02 L5.44,7.11 L7.13,5.31 C7.13,5.31 6.37,4.57 6.7,4.86 C7.02,3.67 6.73,2.35 5.83,1.42 C4.93,0.5 3.66,0.2 2.52,0.51 L4.45,2.51 L3.94,4.47 L2.05,4.99 L0.12,2.99 C-0.19,4.17 0.1,5.48 1,6.4 C1.94,7.38 3.29,7.66 4.48,7.27 L4.48,7.27 Z M10.92,9.21 L8.59,11.51 L12.43,15.49 C12.74,15.82 13.16,15.98 13.57,15.98 C13.98,15.98 14.39,15.82 14.71,15.49 C15.34,14.84 15.34,13.79 14.71,13.14 L10.92,9.21 L10.92,9.21 Z M16,2.53 L13.55,0 L6.33,7.46 L7.21,8.37 L2.9,12.83 L1.91,13.36 L0.52,15.63 L0.87,16 L3.07,14.56 L3.58,13.54 L7.9,9.08 L8.78,9.99 L16,2.53 L16,2.53 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/trashcan.svg b/htdocs/theme/common/octicons/lib/svg/trashcan.svg
new file mode 100644
index 00000000000..4a4ad77d458
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/trashcan.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>trashcan</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="trashcan" fill="#000000">
+            <path d="M11,2 L9,2 C9,1.45 8.55,1 8,1 L5,1 C4.45,1 4,1.45 4,2 L2,2 C1.45,2 1,2.45 1,3 L1,4 C1,4.55 1.45,5 2,5 L2,14 C2,14.55 2.45,15 3,15 L10,15 C10.55,15 11,14.55 11,14 L11,5 C11.55,5 12,4.55 12,4 L12,3 C12,2.45 11.55,2 11,2 L11,2 Z M10,14 L3,14 L3,5 L4,5 L4,13 L5,13 L5,5 L6,5 L6,13 L7,13 L7,5 L8,5 L8,13 L9,13 L9,5 L10,5 L10,14 L10,14 Z M11,4 L2,4 L2,3 L11,3 L11,4 L11,4 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/triangle-down.svg b/htdocs/theme/common/octicons/lib/svg/triangle-down.svg
new file mode 100644
index 00000000000..dba0fc4ac70
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/triangle-down.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>triangle-down</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="triangle-down" fill="#000000">
+            <polygon id="Shape" points="0 5 6 11 12 5"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/triangle-left.svg b/htdocs/theme/common/octicons/lib/svg/triangle-left.svg
new file mode 100644
index 00000000000..7011b15bbe2
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/triangle-left.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="6px" height="16px" viewBox="0 0 6 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>triangle-left</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="triangle-left" fill="#000000">
+            <polygon id="Shape" points="6 2 0 8 6 14"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/triangle-right.svg b/htdocs/theme/common/octicons/lib/svg/triangle-right.svg
new file mode 100644
index 00000000000..8abb5e92e25
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/triangle-right.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="6px" height="16px" viewBox="0 0 6 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>triangle-right</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="triangle-right" fill="#000000">
+            <polygon id="Shape" points="0 14 6 8 0 2"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/triangle-up.svg b/htdocs/theme/common/octicons/lib/svg/triangle-up.svg
new file mode 100644
index 00000000000..e6488cf35f3
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/triangle-up.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>triangle-up</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="triangle-up" fill="#000000">
+            <polygon id="Shape" points="12 11 6 5 0 11"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/unfold.svg b/htdocs/theme/common/octicons/lib/svg/unfold.svg
new file mode 100644
index 00000000000..3f40744b9d9
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/unfold.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>unfold</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="unfold" fill="#000000">
+            <path d="M11.5,7.5 L14,10 C14,10.55 13.55,11 13,11 L9,11 L9,10 L12.5,10 L10.5,8 L3.5,8 L1.5,10 L5,10 L5,11 L1,11 C0.45,11 0,10.55 0,10 L2.5,7.5 L0,5 C0,4.45 0.45,4 1,4 L5,4 L5,5 L1.5,5 L3.5,7 L10.5,7 L12.5,5 L9,5 L9,4 L13,4 C13.55,4 14,4.45 14,5 L11.5,7.5 L11.5,7.5 Z M6,6 L8,6 L8,3 L10,3 L7,0 L4,3 L6,3 L6,6 L6,6 Z M8,9 L6,9 L6,12 L4,12 L7,15 L10,12 L8,12 L8,9 L8,9 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/unmute.svg b/htdocs/theme/common/octicons/lib/svg/unmute.svg
new file mode 100644
index 00000000000..71a5624a738
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/unmute.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>unmute</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="unmute" fill="#000000">
+            <path d="M12,8.02 C12,9.11 11.55,10.11 10.83,10.85 L10.16,10.18 C10.71,9.62 11.05,8.87 11.05,8.02 C11.05,7.17 10.71,6.41 10.16,5.86 L10.83,5.19 C11.55,5.91 12,6.91 12,8.02 L12,8.02 Z M7.72,2.28 L4,6 L2,6 C1.45,6 1,6.45 1,7 L1,9 C1,9.55 1.45,10 2,10 L4,10 L7.72,13.72 C8.19,14.19 9,13.86 9,13.19 L9,2.81 C9,2.14 8.19,1.81 7.72,2.28 L7.72,2.28 Z M13.66,2.36 L12.99,3.03 C14.27,4.31 15.05,6.06 15.05,8.01 C15.05,9.95 14.27,11.71 12.99,12.99 L13.66,13.66 C15.11,12.21 16,10.21 16,8 C16,5.78 15.11,3.78 13.66,2.34 L13.66,2.36 Z M12.25,3.77 L11.56,4.44 C12.48,5.36 13.04,6.63 13.04,8.02 C13.04,9.41 12.48,10.68 11.56,11.58 L12.25,12.25 C13.33,11.17 14,9.67 14,8.02 C14,6.37 13.33,4.86 12.25,3.77 L12.25,3.77 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/unverified.svg b/htdocs/theme/common/octicons/lib/svg/unverified.svg
new file mode 100644
index 00000000000..c91b44e5f4a
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/unverified.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>unverified</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="unverified" fill="#000000">
+            <path d="M15.67,7.06 L14.59,5.72 C14.42,5.5 14.31,5.24 14.28,4.95 L14.09,3.25 C14.01,2.55 13.46,2 12.76,1.92 L11.06,1.73 C10.76,1.7 10.5,1.57 10.28,1.4 L8.94,0.32 C8.39,-0.12 7.61,-0.12 7.06,0.32 L5.72,1.4 C5.5,1.57 5.24,1.68 4.95,1.71 L3.25,1.9 C2.55,1.98 2,2.53 1.92,3.23 L1.73,4.93 C1.7,5.23 1.57,5.49 1.4,5.71 L0.32,7.05 C-0.12,7.6 -0.12,8.38 0.32,8.93 L1.4,10.27 C1.57,10.49 1.68,10.75 1.71,11.04 L1.9,12.74 C1.98,13.44 2.53,13.99 3.23,14.07 L4.93,14.26 C5.23,14.29 5.49,14.42 5.71,14.59 L7.05,15.67 C7.6,16.11 8.38,16.11 8.93,15.67 L10.27,14.59 C10.49,14.42 10.75,14.31 11.04,14.28 L12.74,14.09 C13.44,14.01 13.99,13.46 14.07,12.76 L14.26,11.06 C14.29,10.76 14.42,10.5 14.59,10.28 L15.67,8.94 C16.11,8.39 16.11,7.61 15.67,7.06 L15.67,7.06 Z M9,11.5 C9,11.78 8.78,12 8.5,12 L7.5,12 C7.23,12 7,11.78 7,11.5 L7,10.5 C7,10.22 7.23,10 7.5,10 L8.5,10 C8.78,10 9,10.22 9,10.5 L9,11.5 L9,11.5 Z M10.56,6.61 C10.5,6.78 10.39,6.94 10.26,7.08 C10.13,7.24 10.12,7.27 9.93,7.46 C9.77,7.63 9.62,7.76 9.41,7.91 C9.3,8 9.21,8.1 9.13,8.18 C9.05,8.26 8.99,8.35 8.94,8.45 C8.89,8.55 8.86,8.64 8.83,8.75 C8.8,8.86 8.8,8.88 8.8,9 L7.13,9 C7.13,8.78 7.13,8.69 7.16,8.52 C7.19,8.33 7.24,8.16 7.3,8 C7.36,7.86 7.44,7.72 7.55,7.58 C7.66,7.45 7.78,7.33 7.96,7.2 C8.23,7.01 8.32,6.9 8.44,6.68 C8.56,6.46 8.64,6.3 8.64,6.09 C8.64,5.82 8.58,5.64 8.44,5.51 C8.31,5.38 8.13,5.32 7.86,5.32 C7.77,5.32 7.67,5.34 7.56,5.37 C7.45,5.4 7.39,5.46 7.31,5.53 C7.23,5.6 7.17,5.64 7.11,5.73 C7.05,5.82 7.02,5.87 7.02,6.01 L5.02,6.01 C5.02,5.63 5.15,5.45 5.29,5.18 C5.45,4.91 5.65,4.68 5.9,4.51 C6.15,4.34 6.45,4.21 6.78,4.13 C7.11,4.05 7.48,4 7.87,4 C8.31,4 8.7,4.05 9.04,4.13 C9.38,4.22 9.67,4.35 9.92,4.52 C10.15,4.69 10.33,4.9 10.47,5.15 C10.6,5.4 10.66,5.7 10.66,6.03 C10.66,6.25 10.66,6.45 10.58,6.62 L10.56,6.61 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/verified.svg b/htdocs/theme/common/octicons/lib/svg/verified.svg
new file mode 100644
index 00000000000..c0c0a7223e5
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/verified.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>verified</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="verified" fill="#000000">
+            <path d="M15.67,7.06 L14.59,5.72 C14.42,5.5 14.31,5.24 14.28,4.95 L14.09,3.25 C14.01,2.55 13.46,2 12.76,1.92 L11.06,1.73 C10.76,1.7 10.5,1.57 10.28,1.4 L8.94,0.32 C8.39,-0.12 7.61,-0.12 7.06,0.32 L5.72,1.4 C5.5,1.57 5.24,1.68 4.95,1.71 L3.25,1.9 C2.55,1.98 2,2.53 1.92,3.23 L1.73,4.93 C1.7,5.23 1.57,5.49 1.4,5.71 L0.32,7.05 C-0.12,7.6 -0.12,8.38 0.32,8.93 L1.4,10.27 C1.57,10.49 1.68,10.75 1.71,11.04 L1.9,12.74 C1.98,13.44 2.53,13.99 3.23,14.07 L4.93,14.26 C5.23,14.29 5.49,14.42 5.71,14.59 L7.05,15.67 C7.6,16.11 8.38,16.11 8.93,15.67 L10.27,14.59 C10.49,14.42 10.75,14.31 11.04,14.28 L12.74,14.09 C13.44,14.01 13.99,13.46 14.07,12.76 L14.26,11.06 C14.29,10.76 14.42,10.5 14.59,10.28 L15.67,8.94 C16.11,8.39 16.11,7.61 15.67,7.06 L15.67,7.06 Z M6.5,12 L3,8.5 L4.5,7 L6.5,9 L11.5,4 L13,5.55 L6.5,12 L6.5,12 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/versions.svg b/htdocs/theme/common/octicons/lib/svg/versions.svg
new file mode 100644
index 00000000000..62b9c199811
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/versions.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>versions</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="versions" fill="#000000">
+            <path d="M13,3 L7,3 C6.45,3 6,3.45 6,4 L6,12 C6,12.55 6.45,13 7,13 L13,13 C13.55,13 14,12.55 14,12 L14,4 C14,3.45 13.55,3 13,3 L13,3 Z M12,11 L8,11 L8,5 L12,5 L12,11 L12,11 Z M4,4 L5,4 L5,5 L4,5 L4,11 L5,11 L5,12 L4,12 C3.45,12 3,11.55 3,11 L3,5 C3,4.45 3.45,4 4,4 L4,4 Z M1,5 L2,5 L2,6 L1,6 L1,10 L2,10 L2,11 L1,11 C0.45,11 0,10.55 0,10 L0,6 C0,5.45 0.45,5 1,5 L1,5 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/watch.svg b/htdocs/theme/common/octicons/lib/svg/watch.svg
new file mode 100644
index 00000000000..705f441ae5f
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/watch.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>watch</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="watch" fill="#000000">
+            <path d="M6,8 L8,8 L8,9 L5,9 L5,5 L6,5 L6,8 L6,8 Z M12,8 C12,10.22 10.8,12.16 9,13.19 L9,15 C9,15.55 8.55,16 8,16 L4,16 C3.45,16 3,15.55 3,15 L3,13.19 C1.2,12.16 0,10.22 0,8 C0,5.78 1.2,3.84 3,2.81 L3,1 C3,0.45 3.45,0 4,0 L8,0 C8.55,0 9,0.45 9,1 L9,2.81 C10.8,3.84 12,5.78 12,8 L12,8 Z M11,8 C11,5.23 8.77,3 6,3 C3.23,3 1,5.23 1,8 C1,10.77 3.23,13 6,13 C8.77,13 11,10.77 11,8 L11,8 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/x.svg b/htdocs/theme/common/octicons/lib/svg/x.svg
new file mode 100644
index 00000000000..51466da25a4
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/x.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>x</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="x" fill="#000000">
+            <polygon id="Shape" points="7.48 8 11.23 11.75 9.75 13.23 6 9.48 2.25 13.23 0.77 11.75 4.52 8 0.77 4.25 2.25 2.77 6 6.52 9.75 2.77 11.23 4.25"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/lib/svg/zap.svg b/htdocs/theme/common/octicons/lib/svg/zap.svg
new file mode 100644
index 00000000000..95641465029
--- /dev/null
+++ b/htdocs/theme/common/octicons/lib/svg/zap.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="16px" viewBox="0 0 10 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>zap</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Octicons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="zap" fill="#000000">
+            <polygon id="Shape" points="10 7 6 7 9 0 0 9 4 9 1 16"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/theme/common/octicons/package.json b/htdocs/theme/common/octicons/package.json
new file mode 100644
index 00000000000..61def286fac
--- /dev/null
+++ b/htdocs/theme/common/octicons/package.json
@@ -0,0 +1,39 @@
+{
+  "version": "5.0.1",
+  "name": "octicons",
+  "description": "A scalable set of icons handcrafted with <3 by GitHub.",
+  "homepage": "https://octicons.github.com",
+  "author": "GitHub Inc.",
+  "license": "(OFL-1.1 OR MIT)",
+  "style": "build/octicons.css",
+  "main": "index.js",
+  "files": [
+    "index.js",
+    "build"
+  ],
+  "repository": "https://github.com/primer/octicons.git",
+  "bugs": {
+    "url": "https://github.com/primer/octicons/issues"
+  },
+  "scripts": {
+    "build": "grunt",
+    "prepublish": "npm run build",
+    "test": "npm run build && ava --verbose \"test/**/*.js\""
+  },
+  "devDependencies": {
+    "autoprefixer": "^6.3.6",
+    "ava": "^0.16.0",
+    "grunt": "^1.0.1",
+    "grunt-contrib-clean": "^1.0.0",
+    "grunt-contrib-copy": "^1.0.0",
+    "grunt-cssnano": "^2.1.0",
+    "grunt-svgmin": "^4.0.0",
+    "grunt-svgstore": "^1.0.0"
+  },
+  "keywords": [
+    "GitHub",
+    "icons",
+    "svg",
+    "octicons"
+  ]
+}

From 579d3505998ce3a651d3d7647ff7c5c9442b14f9 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 9 Feb 2017 17:41:06 +0100
Subject: [PATCH 0247/1163] Fix keep the standard behaviour

---
 htdocs/compta/facture.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index f431b1bf344..d4ce37ce408 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1063,7 +1063,9 @@ if (empty($reshook))
 										}
 
 										if ($totalamount != 0) {
-											$amountdeposit[] = ($totalamount * $valuedeposit) / 100;
+											$amountdeposit[$lines[$i]->tva] = ($totalamount * $valuedeposit) / 100;
+										} else {
+											$amountdeposit[] = 0;
 										}
 									} else {
 										setEventMessages($srcobject->error, $srcobject->errors, 'errors');

From 2184eabe2f1e8657b6cc23e3be5f7fb2bb60710f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 9 Feb 2017 22:02:37 +0100
Subject: [PATCH 0248/1163] Fix english

---
 build/pad/pad_dolibarr.xml     | 4 ++--
 build/pad/pad_dolibarr_nos.xml | 4 ++--
 build/pad/pad_doliwamp.xml     | 2 +-
 build/pad/pad_doliwamp_nos.xml | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/pad/pad_dolibarr.xml b/build/pad/pad_dolibarr.xml
index 999b8db5142..77318eeb2d2 100644
--- a/build/pad/pad_dolibarr.xml
+++ b/build/pad/pad_dolibarr.xml
@@ -71,8 +71,8 @@
 			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
 			<Char_Desc_80>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity</Char_Desc_80>
 			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to manage.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
+			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software package built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, Odoo, Neogia, Compiere, etc) because everything was made to be more simple:
 Simple to install
 Simple to use
 Simple to develop 
diff --git a/build/pad/pad_dolibarr_nos.xml b/build/pad/pad_dolibarr_nos.xml
index 8effe4b771a..6d81793de79 100644
--- a/build/pad/pad_dolibarr_nos.xml
+++ b/build/pad/pad_dolibarr_nos.xml
@@ -71,8 +71,8 @@
 			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
 			<Char_Desc_80>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity</Char_Desc_80>
 			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to manage.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
+			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software package built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
 Simple to install
 Simple to use
 Simple to develop 
diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml
index 06eaec3af98..842d746dbcc 100644
--- a/build/pad/pad_doliwamp.xml
+++ b/build/pad/pad_doliwamp.xml
@@ -72,7 +72,7 @@
 			<Char_Desc_80>DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation</Char_Desc_80>
 			<Char_Desc_250>DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs.</Char_Desc_250>
 			<Char_Desc_450>DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations.</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
+			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
 DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.</Char_Desc_2000>
 		</English>
 		<French>
diff --git a/build/pad/pad_doliwamp_nos.xml b/build/pad/pad_doliwamp_nos.xml
index 4f7981a4314..61c739daff0 100644
--- a/build/pad/pad_doliwamp_nos.xml
+++ b/build/pad/pad_doliwamp_nos.xml
@@ -72,7 +72,7 @@
 			<Char_Desc_80>DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation</Char_Desc_80>
 			<Char_Desc_250>DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs.</Char_Desc_250>
 			<Char_Desc_450>DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations.</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
+			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
 DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.</Char_Desc_2000>
 		</English>
 		<French>

From 4fb4bc6f6cf51332a5776acfe9ce87e689ad51b6 Mon Sep 17 00:00:00 2001
From: De Coninck Laurent <laurent@adlogix.eu>
Date: Fri, 10 Feb 2017 10:20:32 +0100
Subject: [PATCH 0249/1163] [FIX] Dictionnaries without rowid

It's possible to create a dictionnary without the key rowid.
But in that case it's impossible to enable/disable the value because the dictionnary fonctionality uses always rowid even another primary key is defined.

By this fix, the id property uses is the primary key defined on the dictionnary creation.
---
 htdocs/admin/dict.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 09ee313e487..2bb0bbe15dc 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1537,7 +1537,8 @@ if ($id)
                     $canbemodified=$iserasable;
                     if ($obj->code == 'RECEP') $canbemodified=1;
 
-                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
+                    $rowidcol=$tabrowid[$id];
+                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->{$rowidcol})?$obj->{$rowidcol}:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
                     if ($param) $url .= '&'.$param;
                     $url.='&';
 

From 44ab6ad9b7af0c6fa327dd846f1c90ca5b899d9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 10 Feb 2017 17:05:45 +0100
Subject: [PATCH 0250/1163] NEW Can control constants values into file
 integrity checker

---
 build/generate_filelist_xml.php   | 65 ++++++++++++++++++++++---------
 htdocs/admin/system/filecheck.php | 46 ++++++++++++++++++++++
 htdocs/langs/en_US/admin.lang     |  1 +
 htdocs/langs/en_US/main.lang      |  2 +
 4 files changed, 95 insertions(+), 19 deletions(-)

diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index 01809439bf1..36ea0e9542b 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -1,6 +1,6 @@
 #!/usr/bin/env php
 <?php
-/* Copyright (C) 2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2015-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,21 +40,33 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
  * Main
  */
 
+$includeconstants=array();
+
 if (empty($argv[1])) 
 {
-    print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
+    print "Usage:   ".$script_file." release=x.y.z[-...] [includecustom=1] [includeconstant=MY_CONF_NAME:value]\n";
+    print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=MAILING_NO_USING_PHPMAIL:1\n";
     exit -1;
 }
-parse_str($argv[1]);
-if (! empty($argv[2])) parse_str($argv[2]);
+$i=0;
+while ($i < $argc)
+{
+    if (! empty($argv[$i])) parse_str($argv[$i]);
+    if (preg_match('/includeconstant=/',$argv[$i]))
+    {
+        $tmp=explode(':', $includeconstant);
+        if (count($tmp) == 2) $includeconstants[$tmp[0]] = $tmp[1];
+    }
+    $i++;
+}
 
-if (empty($includecustom)) 
+if (empty($includecustom))
 {
     $includecustom=0;
-    
+
     if (DOL_VERSION != $release)
     {
-        print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parmater.'."\n";
+        print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$release.')'."\n";
         print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
         exit -1;
     }
@@ -69,22 +81,37 @@ else
     }
 }
 
-print "Version: ".$release."\n";
-print "Include custom: ".$includecustom."\n";
+print "Release          : ".$release."\n";
+print "Include custom   : ".$includecustom."\n";
+print "Include constants: ";
+foreach ($includeconstants as $constname => $constvalue)
+{
+    print $constname.'='.$constvalue." ";
+}
+print "\n";
 
 //$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
 $outputdir=dirname(__FILE__).'/../htdocs/install';
 print 'Delete current files '.$outputdir.'/filelist-'.$release.'.xml'."\n";
 dol_delete_file($outputdir.'/filelist-'.$release.'.xml',0,1,1);
 
+$checksumconcat=array();
+
 $outputfile=$outputdir.'/filelist-'.$release.'.xml';
 $fp = fopen($outputfile,'w');
 fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
 fputs($fp, '<checksum_list version="'.$release.'">'."\n");
 
-fputs($fp, '<dolibarr_htdocs_dir includecustom="'.$includecustom.'">'."\n");
+fputs($fp, '<dolibarr_constants>'."\n");
+foreach($includeconstants as $constname => $constvalue)
+{
+    $valueforchecksum=(empty($constvalue)?'0':$constvalue);
+    $checksumconcat[]=$valueforchecksum;
+    fputs($fp, '    <constant name="'.$constname.'" value="'.$valueforchecksum.'">'.$valueforchecksum.'</constant>'."\n");
+}
+fputs($fp, '</dolibarr_constants>'."\n");
 
-$checksumconcat=array();
+fputs($fp, '<dolibarr_htdocs_dir includecustom="'.$includecustom.'">'."\n");
 
 // TODO Replace RecursiveDirectoryIterator with dol_dir_list
 $dir_iterator1 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../htdocs/');
@@ -97,18 +124,18 @@ foreach ($files as $file) {
     $newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
     if ($newdir!=$dir) {
         if ($needtoclose)
-            fputs($fp, '</dir>'."\n");
-        fputs($fp, '<dir name="'.$newdir.'" >'."\n");
+            fputs($fp, '  </dir>'."\n");
+        fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
         $dir = $newdir;
         $needtoclose=1;
     }
     if (filetype($file)=="file") {
         $md5=md5_file($file);
         $checksumconcat[]=$md5;
-        fputs($fp, '<md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
+        fputs($fp, '    <md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
     }
 }
-fputs($fp, '</dir>'."\n");
+fputs($fp, '  </dir>'."\n");
 fputs($fp, '</dolibarr_htdocs_dir>'."\n");
 
 asort($checksumconcat); // Sort list of checksum
@@ -133,18 +160,18 @@ foreach ($files as $file) {
     $newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
     if ($newdir!=$dir) {
         if ($needtoclose)
-            fputs($fp, '</dir>'."\n");
-        fputs($fp, '<dir name="'.$newdir.'" >'."\n");
+            fputs($fp, '  </dir>'."\n");
+        fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
         $dir = $newdir;
         $needtoclose=1;
     }
     if (filetype($file)=="file") {
         $md5=md5_file($file);
         $checksumconcat[]=$md5;
-        fputs($fp, '<md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
+        fputs($fp, '    <md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
     }
 }
-fputs($fp, '</dir>'."\n");
+fputs($fp, '  </dir>'."\n");
 fputs($fp, '</dolibarr_script_dir>'."\n");
 
 asort($checksumconcat); // Sort list of checksum
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 6499f16f76c..498e1ec54f0 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -160,6 +160,52 @@ if ($xml)
     $file_list = array();
     $out = '';
     
+    // Forced constants
+    if (is_object($xml->dolibarr_constants[0]))
+    {
+        $out.=load_fiche_titre($langs->trans("ForcedConstants"));
+        
+        $out.='<table class="noborder">';
+        $out.='<tr class="liste_titre">';
+        $out.='<td>#</td>';
+        $out.='<td>' . $langs->trans("Constant") . '</td>';
+        $out.='<td align="center">' . $langs->trans("ExpectedValue") . '</td>';
+        $out.='<td align="center">' . $langs->trans("Value") . '</td>';
+        $out.='</tr>'."\n";
+        $var = true;
+
+        $i = 0;
+        foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
+        {
+            $constname=$constant['name'];
+            $constvalue=(string) $constant;
+            $constvalue = (empty($constvalue)?'0':$constvalue);
+            // Value found                
+            $value='';
+            if ($constname && $conf->global->$constname != '') $value=$conf->global->$constname;
+            $valueforchecksum=(empty($value)?'0':$value);
+            
+            $checksumconcat[]=$valueforchecksum;
+            
+            $i++;
+            $var = !$var;
+            $out.='<tr ' . $bc[$var] . '>';
+            $out.='<td>'.$i.'</td>' . "\n";
+            $out.='<td>'.$constname.'</td>' . "\n";
+            $out.='<td align="center">'.$constvalue.'</td>' . "\n";
+            $out.='<td align="center">'.$valueforchecksum.'</td>' . "\n";
+            $out.="</tr>\n";
+        }
+
+        if ($i==0)
+        {
+            $out.='<tr ' . $bc[false] . '><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+        }
+        $out.='</table>';
+        
+        $out.='<br>';
+    }
+    
     // Scan htdocs
     if (is_object($xml->dolibarr_htdocs_dir[0]))
     {
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 2597a995043..987f02fe314 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1611,6 +1611,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 603aff0000f..106b0a9f240 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -599,6 +599,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current Value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received

From 97eebe164cc83f1fe6bd93e53d9e521c37736e9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 10 Feb 2017 17:09:56 +0100
Subject: [PATCH 0251/1163] Better translation

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 987f02fe314..2783ea52594 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -9,7 +9,7 @@ VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
 FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
 FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.

From 4230b075c2ffdc17dd816b67e0f3dd8b5966a7b3 Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Fri, 10 Feb 2017 17:28:00 +0100
Subject: [PATCH 0252/1163] INIT pdf supplier payment

---
 htdocs/admin/supplier_payment.php             |  252 +++-
 htdocs/core/class/html.formactions.class.php  |    1 +
 htdocs/core/class/html.formfile.class.php     |    9 +
 htdocs/core/lib/functions.lib.php             |    2 +-
 .../modules_supplier_payment.php              |   31 +
 .../modules/supplier_payment/pdf/index.html   |    0
 .../supplier_payment/pdf/pdf_cow.modules.php  | 1160 +++++++++++++++++
 htdocs/fourn/paiement/card.php                |   30 +
 8 files changed, 1480 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/core/modules/supplier_payment/pdf/index.html
 create mode 100644 htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php

diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index b5732d1f1c9..5cd1877ddb4 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -40,6 +40,7 @@ $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');
 $label = GETPOST('label','alpha');
 $scandir = GETPOST('scandir','alpha');
+$type='supplier_payment';
 
 
 /*
@@ -62,13 +63,114 @@ if ($action == 'updateMask')
     {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-    if ($action == 'setmod')
+}else  if ($action == 'setmod')
 {
     dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON",$value,'chaine',0,'',$conf->entity);
 }
 
+// define constants for models generator that need parameters
+else if ($action == 'setModuleOptions')
+{
+    $post_size=count($_POST);
+    for($i=0;$i < $post_size;$i++)
+    {
+        if (array_key_exists('param'.$i,$_POST))
+        {
+            $param=GETPOST("param".$i,'alpha');
+            $value=GETPOST("value".$i,'alpha');
+            if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+        }
+    }
+	if (! $res > 0) $error++;
+
+ 	if (! $error)
+    {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
+    }
+}
+
+// Activate a model
+else if ($action == 'set')
+{
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+}
+
+else if ($action == 'del')
+{
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+        if ($conf->global->FACTURE_ADDON_PDF == "$value") dolibarr_del_const($db, 'SUPPLIER_PAYMENT_ADDON_PDF',$conf->entity);
+	}
+}
+
+// Set default model
+else if ($action == 'setdoc')
+{
+	if (dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->FACTURE_ADDON_PDF = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+}
+
+else if ($action == 'specimen')
+{
+    $modele=GETPOST('module','alpha');
+
+    $facture = new Facture($db);
+    $facture->initAsSpecimen();
+
+	// Search template files
+	$file=''; $classname=''; $filefound=0;
+	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+	foreach($dirmodels as $reldir)
+	{
+	    $file=dol_buildpath($reldir."core/modules/supplier_payment/pdf/pdf_".$modele.".modules.php",0);
+    	if (file_exists($file))
+    	{
+    		$filefound=1;
+    		$classname = "pdf_".$modele;
+    		break;
+    	}
+    }
+
+    if ($filefound)
+    {
+    	require_once $file;
+
+    	$module = new $classname($db);
+
+    	if ($module->write_file($facture,$langs) > 0)
+    	{
+    		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_payment&file=SPECIMEN.pdf");
+    		return;
+    	}
+    	else
+    	{
+    		setEventMessages($module->error, $module->errors, 'errors');
+    		dol_syslog($module->error, LOG_ERR);
+    	}
+    }
+    else
+    {
+    	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+    	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+    }
+}
+
 /*
  * View
  */
@@ -96,6 +198,35 @@ if (empty($conf->global->SUPPLIER_PAYMENT_ADDON)) $conf->global->SUPPLIER_PAYMEN
     
 print load_fiche_titre($langs->trans("PaymentsNumberingModule"), '', '');
 
+/*
+ *  Document templates generators
+ */
+print '<br>';
+print load_fiche_titre($langs->trans("BillsPDFModules"),'','');
+
+// Load array def with activated templates
+$def = array();
+$sql = "SELECT nom";
+$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql.= " WHERE type = '".$type."'";
+$sql.= " AND entity = ".$conf->entity;
+$resql=$db->query($sql);
+if ($resql)
+{
+    $i = 0;
+    $num_rows=$db->num_rows($resql);
+    while ($i < $num_rows)
+    {
+        $array = $db->fetch_array($resql);
+        array_push($def, $array[0]);
+        $i++;
+    }
+}
+else
+{
+    dol_print_error($db);
+}
+
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
@@ -140,7 +271,7 @@ foreach ($dirmodels as $reldir)
                         require_once $dir.$filebis;
 
                         $module = new $classname($db);
-
+						
                         // Show modules according to features level
                         if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
                         if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
@@ -217,6 +348,119 @@ foreach ($dirmodels as $reldir)
 
 print '</table>';
 
+
+print '<table class="noborder" width="100%">'."\n";
+print '<tr class="liste_titre">'."\n";
+print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
+print '<td>'.$langs->trans("Description").'</td>'."\n";
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>'."\n";
+print '<td align="center" width="60">'.$langs->trans("Default").'</td>'."\n";
+print '<td align="center" width="40">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="40">'.$langs->trans("Preview").'</td>';
+print '</tr>'."\n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir)
+{
+	$dir = dol_buildpath($reldir."core/modules/supplier_payment/pdf/");
+
+    if (is_dir($dir))
+    {
+        $var=true;
+
+        $handle=opendir($dir);
+
+
+        if (is_resource($handle))
+        {
+            while (($file = readdir($handle))!==false)
+            {
+                if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))            	
+                {
+                    $name = substr($file, 4, dol_strlen($file) -16);
+                    $classname = substr($file, 0, dol_strlen($file) -12);
+
+	                require_once $dir.'/'.$file;
+	                $module = new $classname($db, new PaiementFourn($db));
+
+                    $var=!$var;
+                    print "<tr ".$bc[$var].">\n";
+                    print "<td>";
+	                print (empty($module->name)?$name:$module->name);
+	                print "</td>\n";
+                    print "<td>\n";
+                    require_once $dir.$file;
+                    $module = new $classname($db,$specimenthirdparty);
+                    if (method_exists($module,'info')) print $module->info($langs);
+	                else print $module->description;
+
+                    print "</td>\n";
+
+                    // Active
+                    if (in_array($name, $def))
+                    {
+                        print '<td align="center">'."\n";
+                        //if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF != "$name")
+                        //{
+                            // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
+                            print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">';
+                            print img_picto($langs->trans("Enabled"),'switch_on');
+                            print '</a>';
+                        /*}
+                        else
+                        {
+                            print img_picto($langs->trans("Enabled"),'switch_on');
+                        }*/
+                        print "</td>";
+                    }
+                    else
+                    {
+                        print '<td align="center">'."\n";
+                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+                        print "</td>";
+                    }
+
+                    // Default
+                    print '<td align="center">';
+                    if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF == "$name")
+                    {
+                        //print img_picto($langs->trans("Default"),'on');
+                        // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
+                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+                    }
+                    else
+                    {
+                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+                    }
+                    print '</td>';
+
+                    // Info
+                    $htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+                    $htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+                    $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+                    $htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+                    $htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+                    $htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
+                    $htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
+                    print '<td align="center">';
+                    print $form->textwithpicto('',$htmltooltip,1,0);
+                    print '</td>';
+                    print '<td align="center">';
+                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"),'order').'</a>';
+                    print '</td>';
+
+                    print "</tr>\n";
+                }
+            }
+
+            closedir($handle);
+        }
+    }
+}
+
+print '</table><br>';
+
 dol_fiche_end();
 
 
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 0b5e9ebb358..b44f854087c 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -172,6 +172,7 @@ class FormActions
         	if ($typeelement == 'invoice')   $title=$langs->trans('ActionsOnBill');
         	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
         	elseif ($typeelement == 'propal')    $title=$langs->trans('ActionsOnPropal');
+        	elseif ($typeelement == 'supplier_payment')    $title=$langs->trans('ActionsOnSupplierPayment');
         	elseif ($typeelement == 'supplier_proposal')    $title=$langs->trans('ActionsOnSupplierProposal');
         	elseif ($typeelement == 'order')     $title=$langs->trans('ActionsOnOrder');
         	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 83e913f9718..28cc49653b4 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -466,6 +466,15 @@ class FormFile
                     $modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db);
                 }
             }
+			else if ($modulepart == 'supplier_payment')
+			{
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
+                    $modellist=ModelePDFSuppliersPayments::liste_modeles($this->db);
+                }
+			}
             else if ($modulepart == 'remisecheque')
             {
                 if (is_array($genallowed)) $modellist=$genallowed;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f0ed512e940..f429f817f47 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4318,7 +4318,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
 
 	$path = '';
 
-	$arrayforoldpath=array('cheque','user','category','holiday','shipment','supplier_invoice','invoice_supplier','mailing');
+	$arrayforoldpath=array('cheque','user','category','holiday','shipment','supplier_invoice','invoice_supplier','mailing','supplier_payment');
 	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';
 	if (! empty($level) && in_array($modulepart, $arrayforoldpath))
 	{
diff --git a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
index c9023a9fc65..d8586777d30 100644
--- a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
+++ b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
@@ -16,6 +16,37 @@
  * or see http://www.gnu.org/
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+/**
+ *	Parent class for supplier invoices models
+ */
+abstract class ModelePDFSuppliersPayments extends CommonDocGenerator
+{
+	var $error='';
+
+
+	/**
+	 *  Return list of active generation models
+	 *
+     *  @param	DoliDB	$db     			Database handler
+     *  @param  integer	$maxfilenamelength  Max length of value to show
+     *  @return	array						List of numbers
+	 */
+	static function liste_modeles($db,$maxfilenamelength=0)
+	{
+		global $conf;
+
+		$type='supplier_payment';
+		$liste=array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$liste=getListOfModels($db,$type,$maxfilenamelength);
+
+		return $liste;
+	}
+
+}
+
 /**
  *  \class      ModeleNumRefPayments
  *  \brief      Payment numbering references mother class
diff --git a/htdocs/core/modules/supplier_payment/pdf/index.html b/htdocs/core/modules/supplier_payment/pdf/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php b/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
new file mode 100644
index 00000000000..a7b9da6ded8
--- /dev/null
+++ b/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
@@ -0,0 +1,1160 @@
+<?php
+/* Copyright (C) 2010-2011      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2014 		Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2015           Marcos García        <marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *	\file       htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+ *	\ingroup    fournisseur
+ *	\brief      Class file to generate the supplier invoices with the canelle model
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+
+/**
+ *	Class to generate the supplier invoices with the canelle model
+ */
+class pdf_cow extends ModelePDFSuppliersPayments
+{
+    var $db;
+    var $name;
+    var $description;
+    var $type;
+
+    var $phpmin = array(4,3,0); // Minimum version of PHP required by module
+    var $version = 'dolibarr';
+
+    var $page_largeur;
+    var $page_hauteur;
+    var $format;
+	var $marge_gauche;
+	var	$marge_droite;
+	var	$marge_haute;
+	var	$marge_basse;
+
+	var $emetteur;	// Objet societe qui emet
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param	DoliDB		$db     	Database handler
+	 */
+	function __construct($db)
+	{
+		global $conf,$langs,$mysoc;
+
+		$langs->load("main");
+		$langs->load("bills");
+
+		$this->db = $db;
+		$this->name = "cow";
+		$this->description = $langs->trans('SuppliersPaymentModel');
+
+		// Dimension page pour format A4
+		$this->type = 'pdf';
+		$formatarray=pdf_getFormat();
+		$this->page_largeur = $formatarray['width'];
+		$this->page_hauteur = $formatarray['height'];
+		$this->format = array($this->page_largeur,$this->page_hauteur);
+		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+
+		$this->option_logo = 1;                    // Affiche logo
+		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
+		$this->option_modereg = 1;                 // Affiche mode reglement
+		$this->option_condreg = 1;                 // Affiche conditions reglement
+		$this->option_codeproduitservice = 1;      // Affiche code produit-service
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
+
+		$this->franchise=!$mysoc->tva_assuj;
+
+        // Defini position des colonnes
+		$this->posxdesc=$this->marge_gauche+1;
+		$this->posxtva=112;
+		$this->posxup=126;
+		$this->posxqty=145;
+		$this->posxdiscount=162;
+		$this->postotalht=174;
+
+		if($conf->global->PRODUCT_USE_UNITS) {
+			$this->posxtva=99;
+			$this->posxup=114;
+			$this->posxqty=130;
+			$this->posxunit=147;
+		}
+		//if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
+		$this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
+		if ($this->page_largeur < 210) // To work with US executive format
+		{
+			$this->posxpicture-=20;
+			$this->posxtva-=20;
+			$this->posxup-=20;
+			$this->posxqty-=20;
+			$this->posxunit-=20;
+			$this->posxdiscount-=20;
+			$this->postotalht-=20;
+		}
+
+		$this->tva=array();
+        $this->localtax1=array();
+        $this->localtax2=array();
+		$this->atleastoneratenotnull=0;
+		$this->atleastonediscount=0;
+	}
+
+
+	/**
+     *  Function to build pdf onto disk
+     *
+     *  @param		FactureFournisseur	$object				Id of object to generate
+     *  @param		Translate			$outputlangs		Lang output object
+     *  @param		string				$srctemplatepath	Full path of source filename for generator using a template file
+     *  @param		int					$hidedetails		Do not show line details
+     *  @param		int					$hidedesc			Do not show desc
+     *  @param		int					$hideref			Do not show ref
+     *  @return		int										1=OK, 0=KO
+	 */
+	function write_file($object, $outputlangs='', $srctemplatepath='', $hidedetails=0, $hidedesc=0, $hideref=0)
+	{
+		global $user,$langs,$conf,$mysoc,$hookmanager;
+
+		// Get source company
+		if (! is_object($object->thirdparty)) $object->fetch_thirdparty();
+		if (! is_object($object->thirdparty)) $object->thirdparty=$mysoc;	// If fetch_thirdparty fails, object has no socid (specimen)
+		$this->emetteur=$object->thirdparty;
+		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
+
+		if (! is_object($outputlangs)) $outputlangs=$langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+
+		$outputlangs->load("main");
+		$outputlangs->load("dict");
+		$outputlangs->load("companies");
+		$outputlangs->load("bills");
+		$outputlangs->load("products");
+
+		if ($conf->fournisseur->dir_output.'/facture')
+		{
+			$object->fetch_thirdparty();
+
+			$deja_regle = $object->getSommePaiement();
+            //$amount_credit_notes_included = $object->getSumCreditNotesUsed();
+            //$amount_deposits_included = $object->getSumDepositsUsed();
+
+			// Definition of $dir and $file
+			if ($object->specimen)
+			{
+				$dir = $conf->fournisseur->payment->dir_output;
+				$file = $dir . "/SPECIMEN.pdf";
+			}
+			else
+			{
+				$objectref = dol_sanitizeFileName($object->ref);
+				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
+                $dir = $conf->fournisseur->payment->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'supplier_payment').$objectref;
+				$file = $dir . "/" . $objectref . ".pdf";
+				if (! empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir . "/" . $objectref . ($objectrefsupplier?"_".$objectrefsupplier:"").".pdf";
+			}
+
+			if (! file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					return 0;
+				}
+
+			}
+
+			if (file_exists($dir))
+			{
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+				$nblignes = count($object->lines);
+
+                $pdf=pdf_getInstance($this->format);
+                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
+                $heightforinfotot = 50;	// Height reserved to output the info and total part
+		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
+	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+                $pdf->SetAutoPageBreak(1,0);
+
+                if (class_exists('TCPDF'))
+                {
+                    $pdf->setPrintHeader(false);
+                    $pdf->setPrintFooter(false);
+                }
+                $pdf->SetFont(pdf_getPDFFont($outputlangs));
+                // Set path to the background PDF File
+                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                {
+                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+                    $tplidx = $pdf->importPage(1);
+                }
+
+				$pdf->Open();
+				$pagenb=0;
+				$pdf->SetDrawColor(128,128,128);
+
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("Invoice"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+
+			    // Positionne $this->atleastonediscount si on a au moins une remise
+                for ($i = 0 ; $i < $nblignes ; $i++)
+                {
+                    if ($object->lines[$i]->remise_percent)
+                    {
+                        $this->atleastonediscount++;
+                    }
+                }
+				if (empty($this->atleastonediscount) && empty($conf->global->PRODUCT_USE_UNITS))
+				{
+					$this->posxpicture+=($this->postotalht - $this->posxdiscount);
+					$this->posxtva+=($this->postotalht - $this->posxdiscount);
+					$this->posxup+=($this->postotalht - $this->posxdiscount);
+					$this->posxqty+=($this->postotalht - $this->posxdiscount);
+					$this->posxdiscount+=($this->postotalht - $this->posxdiscount);
+					//$this->postotalht;
+				}
+
+                // New page
+				$pdf->AddPage();
+				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				$pagenb++;
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
+				$pdf->SetFont('','', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, '');		// Set interline to 3
+				$pdf->SetTextColor(0,0,0);
+
+				$tab_top = 90;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+				$tab_height = 130;
+				$tab_height_newpage = 150;
+
+				// Incoterm
+				$height_incoterms = 0;
+				if ($conf->incoterm->enabled)
+				{
+					$desc_incoterms = $object->getIncotermsForPDF();
+					if ($desc_incoterms)
+					{
+						$tab_top = 88;
+
+						$pdf->SetFont('','', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
+						$nexY = $pdf->GetY();
+						$height_incoterms=$nexY-$tab_top;
+
+						// Rect prend une longueur en 3eme param
+						$pdf->SetDrawColor(192,192,192);
+						$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
+
+						$tab_top = $nexY+6;
+						$height_incoterms += 4;
+					}
+				}
+
+				// Affiche notes
+				if (! empty($object->note_public))
+				{
+					$tab_top = 88 + $height_incoterms;
+
+					$pdf->SetFont('','', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($object->note_public), 0, 1);
+					$nexY = $pdf->GetY();
+					$height_note=$nexY-$tab_top;
+
+					// Rect prend une longueur en 3eme param
+					$pdf->SetDrawColor(192,192,192);
+					$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $nexY+6;
+				}
+				else
+				{
+					$height_note=0;
+				}
+
+				$iniY = $tab_top + 7;
+				$curY = $tab_top + 7;
+				$nexY = $tab_top + 7;
+
+				// Loop on each lines
+				for ($i = 0 ; $i < $nblignes ; $i++)
+				{
+					$curY = $nexY;
+					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+					$pdf->SetTextColor(0,0,0);
+
+					$pdf->setTopMargin($tab_top_newpage);
+					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
+					$pageposbefore=$pdf->getPage();
+
+					// Description of product line
+					$curX = $this->posxdesc-1;
+					$showpricebeforepagebreak=1;
+
+					$pdf->startTransaction();
+					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,1);
+					$pageposafter=$pdf->getPage();
+					if ($pageposafter > $pageposbefore)	// There is a pagebreak
+					{
+						$pdf->rollbackTransaction(true);
+						$pageposafter=$pageposbefore;
+						//print $pageposafter.'-'.$pageposbefore;exit;
+						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,1);
+						$posyafter=$pdf->GetY();
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+						{
+							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+							{
+								$pdf->AddPage('','',true);
+								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								$pdf->setPage($pageposafter+1);
+							}
+						}
+						else
+						{
+							// We found a page break
+							$showpricebeforepagebreak=0;
+						}
+					}
+					else	// No pagebreak
+					{
+						$pdf->commitTransaction();
+					}
+
+					$nexY = $pdf->GetY();
+                    $pageposafter=$pdf->getPage();
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+
+					// We suppose that a too long description is moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+					}
+
+					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
+
+					// VAT Rate
+                    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+                    {
+    					$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
+                        $pdf->SetXY($this->posxtva, $curY);
+	       				$pdf->MultiCell($this->posxup-$this->posxtva-1, 3, $vat_rate, 0, 'R');
+                    }
+
+					// Unit price before discount
+					$pdf->SetXY($this->posxup, $curY);
+					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, price($object->lines[$i]->pu_ht), 0, 'R', 0);
+
+					// Unit price before discount
+					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
+					$pdf->SetXY($this->posxup, $curY);
+					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
+
+					// Quantity
+					$pdf->SetXY($this->posxqty, $curY);
+					// Enough for 6 chars
+					if($conf->global->PRODUCT_USE_UNITS)
+					{
+						$pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R');
+					}
+					else
+					{
+						$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R');
+					}
+
+					// Unit
+					if($conf->global->PRODUCT_USE_UNITS)
+					{
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$pdf->SetXY($this->posxunit, $curY);
+						$pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L');
+					}
+
+					// Discount on line
+					$pdf->SetXY($this->posxdiscount, $curY);
+					if ($object->lines[$i]->remise_percent)
+					{
+						$pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 3, $object->lines[$i]->remise_percent."%", 0, 'R');
+					}
+
+					// Total HT line
+                    $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs);
+                    $pdf->SetXY($this->postotalht, $curY);
+                    $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+
+					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+					$tvaligne=$object->lines[$i]->total_tva;
+
+					$localtax1ligne=$object->lines[$i]->total_localtax1;
+					$localtax2ligne=$object->lines[$i]->total_localtax2;
+
+					if (! empty($object->remise_percent)) $tvaligne-=($tvaligne*$object->remise_percent)/100;
+
+					$vatrate=(string) $object->lines[$i]->tva_tx;
+					$localtax1rate=(string) $object->lines[$i]->localtax1_tx;
+					$localtax2rate=(string) $object->lines[$i]->localtax2_tx;
+
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
+					if (empty($this->tva[$vatrate])) $this->tva[$vatrate]=0;
+					if (empty($this->localtax1[$localtax1rate])) $this->localtax1[$localtax1rate]=0;
+					if (empty($this->localtax2[$localtax2rate])) $this->localtax2[$localtax2rate]=0;
+					$this->tva[$vatrate] += $tvaligne;
+					$this->localtax1[$localtax1rate]+=$localtax1ligne;
+					$this->localtax2[$localtax2rate]+=$localtax2ligne;
+
+					// Add line
+					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					{
+						$pdf->setPage($pageposafter);
+						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
+					$nexY+=2;    // Passe espace entre les lignes
+
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter)
+					{
+						$pdf->setPage($pagenb);
+						if ($pagenb == 1)
+						{
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+						}
+						else
+						{
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+						}
+						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$pagenb++;
+						$pdf->setPage($pagenb);
+						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+					{
+						if ($pagenb == 1)
+						{
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+						}
+						else
+						{
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+						}
+						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						// New page
+						$pdf->AddPage();
+						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						$pagenb++;
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+				}
+
+				// Show square
+				if ($pagenb == 1)
+				{
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+				else
+				{
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+
+				// Affiche zone totaux
+				$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+
+				$amount_credit_notes_included=0;
+				$amount_deposits_included=0;
+
+				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included)
+				{
+					$posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
+				}
+
+				// Pied de page
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+
+				$pdf->Close();
+
+				$pdf->Output($file,'F');
+
+				// Add pdfgeneration hook
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				if (! empty($conf->global->MAIN_UMASK))
+				@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				return 1;   // Pas d'erreur
+			}
+			else
+			{
+				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error=$langs->trans("ErrorConstantNotDefined","SUPPLIER_OUTPUTDIR");
+			return 0;
+		}
+	}
+
+	/**
+	 *	Show total to pay
+	 *
+	 *	@param	PDF			$pdf           Object PDF
+	 *	@param  Facture		$object         Object invoice
+	 *	@param  int			$deja_regle     Montant deja regle
+	 *	@param	int			$posy			Position depart
+	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@return int							Position pour suite
+	 */
+	function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	{
+		global $conf,$mysoc;
+
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        $tab2_top = $posy;
+		$tab2_hl = 4;
+		$pdf->SetFont('','', $default_font_size - 1);
+
+		$pdf->SetXY($this->marge_gauche, $tab2_top + 0);
+		// If France, show VAT mention if not applicable
+		if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
+		{
+			$pdf->MultiCell(100, $tab2_hl, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+		}
+
+		// Tableau total
+		$col1x = 120; $col2x = 170;
+		if ($this->page_largeur < 210) // To work with US executive format
+		{
+			$col2x-=20;
+		}
+		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
+
+		$index=0;
+
+		// Total HT
+		$pdf->SetFillColor(255,255,255);
+		$pdf->SetXY($col1x, $tab2_top + 0);
+		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		$pdf->SetXY($col2x, $tab2_top + 0);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + $object->remise), 0, 'R', 1);
+
+		// Show VAT by rates and total
+		$pdf->SetFillColor(248,248,248);
+
+		foreach( $this->tva as $tvakey => $tvaval )
+		{
+			if ($tvakey > 0)    // On affiche pas taux 0
+			{
+				$this->atleastoneratenotnull++;
+
+				$index++;
+				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+				$tvacompl='';
+
+				if (preg_match('/\*/',$tvakey))
+				{
+					$tvakey=str_replace('*','',$tvakey);
+					$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+				}
+
+				$totalvat =$outputlangs->transnoentities("TotalVAT").' ';
+				$totalvat.=vatrate($tvakey,1).$tvacompl;
+				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+			}
+		}
+		if (! $this->atleastoneratenotnull) // If no vat at all
+		{
+			$index++;
+			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalVAT"), 0, 'L', 1);
+			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', 1);
+
+			// Total LocalTax1
+			if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on' && $object->total_localtax1>0)
+			{
+				$index++;
+				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code), 0, 'L', 1);
+				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), 0, 'R', 1);
+			}
+
+			// Total LocalTax2
+			if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on' && $object->total_localtax2>0)
+			{
+				$index++;
+				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code), 0, 'L', 1);
+				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), 0, 'R', 1);
+			}
+		}
+		else
+		{
+			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+			//{
+				//Local tax 1
+				foreach( $this->localtax1 as $tvakey => $tvaval )
+				{
+					if ($tvakey != 0)    // On affiche pas taux 0
+					{
+						//$this->atleastoneratenotnull++;
+
+						$index++;
+						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+						$tvacompl='';
+						if (preg_match('/\*/',$tvakey))
+						{
+							$tvakey=str_replace('*','',$tvakey);
+							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+						}
+						$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
+						$totalvat.= vatrate(abs($tvakey),1).$tvacompl;
+						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+					}
+				}
+			//}
+
+			//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+			//{
+				//Local tax 2
+				foreach( $this->localtax2 as $tvakey => $tvaval )
+				{
+					if ($tvakey != 0)    // On affiche pas taux 0
+					{
+						//$this->atleastoneratenotnull++;
+
+						$index++;
+						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+						$tvacompl='';
+						if (preg_match('/\*/',$tvakey))
+						{
+							$tvakey=str_replace('*','',$tvakey);
+							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+						}
+						$totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
+						$totalvat.= vatrate(abs($tvakey),1).$tvacompl;
+						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+					}
+				}
+			//}
+		}
+
+		$useborder=0;
+
+		$index++;
+		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->SetFillColor(224,224,224);
+		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+
+		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1);
+
+		if ($deja_regle > 0)
+		{
+			$index++;
+
+			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+
+			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', 0);
+
+			$index++;
+			$pdf->SetTextColor(0,0,60);
+			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+
+			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle), $useborder, 'R', 1);
+			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->SetTextColor(0,0,0);
+		}
+
+		$index++;
+		return ($tab2_top + ($tab2_hl * $index));
+	}
+
+	/**
+	 *   Show table for lines
+	 *
+	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		string		$tab_top		Top position of table
+	 *   @param		string		$tab_height		Height of table (rectangle)
+	 *   @param		int			$nexY			Y (not used)
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @param		int			$hidetop		Hide top bar of array
+	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @return	void
+	 */
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	{
+		global $conf;
+
+		// Force to disable hidetop and hidebottom
+		$hidebottom=0;
+		if ($hidetop) $hidetop=-1;
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        // Amount in (at tab_top - 1)
+		$pdf->SetTextColor(0,0,0);
+		$pdf->SetFont('','',$default_font_size - 2);
+
+		if (empty($hidetop))
+		{
+			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
+			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
+			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+
+			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+		}
+
+		$pdf->SetDrawColor(128,128,128);
+		$pdf->SetFont('','', $default_font_size - 1);
+
+		// Output Rect
+		$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
+
+		if (empty($hidetop))
+		{
+			$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
+
+			$pdf->SetXY($this->posxdesc-1, $tab_top+1);
+			$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
+		}
+
+        if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+        {
+    		$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+			if (empty($hidetop))
+			{
+    			$pdf->SetXY($this->posxtva-3, $tab_top+1);
+    			$pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
+			}
+        }
+
+		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxup-1, $tab_top+1);
+			$pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
+		}
+
+		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxqty-1, $tab_top+1);
+			if($conf->global->PRODUCT_USE_UNITS)
+			{
+				$pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+			}
+			else
+			{
+				$pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+			}
+		}
+
+		if($conf->global->PRODUCT_USE_UNITS) {
+			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
+			if (empty($hidetop)) {
+				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
+				$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '',
+					'C');
+			}
+		}
+
+		$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			if ($this->atleastonediscount)
+			{
+				$pdf->SetXY($this->posxdiscount-1, $tab_top+1);
+				$pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
+			}
+		}
+
+		if ($this->atleastonediscount)
+		{
+			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+		}
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->postotalht-1, $tab_top+1);
+			$pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHTShort"),'','C');
+		}
+
+	}
+
+	/**
+	 *  Show payments table
+	 *
+	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param  FactureFournisseur		$object     	Object invoice
+	 *	@param	int			$posy			Position y in PDF
+	 *	@param	Translate	$outputlangs	Object langs for output
+	 *	@return int							<0 if KO, >0 if OK
+	 */
+	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+	{
+		$tab3_posx = 120;
+		$tab3_top = $posy + 8;
+		$tab3_width = 80;
+		$tab3_height = 4;
+		if ($this->page_largeur < 210) // To work with US executive format
+		{
+			$tab3_posx -= 20;
+		}
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		$pdf->SetFont('','', $default_font_size - 3);
+		$pdf->SetXY($tab3_posx, $tab3_top - 4);
+		$pdf->MultiCell(60, 3, $outputlangs->transnoentities("PaymentsAlreadyDone"), 0, 'L', 0);
+
+		$pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width, $tab3_top);
+
+		$pdf->SetFont('','', $default_font_size - 4);
+		$pdf->SetXY($tab3_posx, $tab3_top);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
+		$pdf->SetXY($tab3_posx+21, $tab3_top);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
+		$pdf->SetXY($tab3_posx+40, $tab3_top);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
+		$pdf->SetXY($tab3_posx+58, $tab3_top);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
+
+		$pdf->line($tab3_posx, $tab3_top-1+$tab3_height, $tab3_posx+$tab3_width, $tab3_top-1+$tab3_height);
+
+		$y=0;
+
+		$pdf->SetFont('','', $default_font_size - 4);
+
+		// Loop on each payment
+		$sql = "SELECT p.datep as date, p.fk_paiement as type, p.num_paiement as num, pf.amount as amount,";
+		$sql.= " cp.code";
+		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf, ".MAIN_DB_PREFIX."paiementfourn as p";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
+		$sql.= " WHERE pf.fk_paiementfourn = p.rowid and pf.fk_facturefourn = ".$object->id;
+		$sql.= " ORDER BY p.datep";
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+		    $num = $this->db->num_rows($resql);
+			$i=0;
+			while ($i < $num) {
+			    $y+=3;
+				$row = $this->db->fetch_object($resql);
+
+				$pdf->SetXY($tab3_posx, $tab3_top+$y);
+				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0);
+				$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
+				$pdf->MultiCell(20, 3, price($row->amount), 0, 'L', 0);
+				$pdf->SetXY($tab3_posx+40, $tab3_top+$y);
+				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->code);
+
+				$pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
+				$pdf->SetXY($tab3_posx+58, $tab3_top+$y);
+				$pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
+
+				$pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
+
+				$i++;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			return -1;
+		}
+
+	}
+
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param  FactureFournisseur		$object     	Object to show
+	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @return	void
+	 */
+	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	{
+		global $langs,$conf,$mysoc;
+
+		$outputlangs->load("main");
+		$outputlangs->load("bills");
+		$outputlangs->load("orders");
+		$outputlangs->load("companies");
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		// Do not add the BACKGROUND as this is for suppliers
+		//pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+
+		$pdf->SetTextColor(0,0,60);
+		$pdf->SetFont('','B', $default_font_size + 3);
+
+		$posy=$this->marge_haute;
+		$posx=$this->page_largeur-$this->marge_droite-100;
+
+		$pdf->SetXY($this->marge_gauche,$posy);
+
+		// Logo
+		/*
+		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+		if ($mysoc->logo)
+		{
+			if (is_readable($logo))
+			{
+			    $height=pdf_getHeightForLogo($logo);
+			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+			}
+			else
+			{
+				$pdf->SetTextColor(200,0,0);
+				$pdf->SetFont('','B', $default_font_size - 2);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
+			}
+		}
+		else
+		{*/
+			$text=$this->emetteur->name;
+			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+		//}
+
+		$pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("SupplierInvoice")." ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$posy+=1;
+
+		if ($object->ref_supplier)
+		{
+    		$posy+=4;
+			$pdf->SetFont('','B', $default_font_size);
+    		$pdf->SetXY($posx,$posy);
+			$pdf->SetTextColor(0,0,60);
+    		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefSupplier")." : " . $object->ref_supplier, '', 'R');
+			$posy+=1;
+		}
+
+		$pdf->SetFont('','', $default_font_size - 1);
+
+		if (! empty($conf->global->PDF_SHOW_PROJECT))
+		{
+			$object->fetch_projet();
+			if (! empty($object->project->ref))
+			{
+        		$posy+=4;
+				$pdf->SetXY($posx,$posy);
+        		$langs->load("projects");
+				$pdf->SetTextColor(0,0,60);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->ref)?'':$object->projet->ref), '', 'R');
+			}
+		}
+
+		if ($object->date)
+		{
+			$posy+=4;
+			$pdf->SetXY($posx,$posy);
+			$pdf->SetTextColor(0,0,60);
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,"day",false,$outputlangs,true), '', 'R');
+		}
+		else
+		{
+			$posy+=4;
+			$pdf->SetXY($posx,$posy);
+			$pdf->SetTextColor(255,0,0);
+			$pdf->MultiCell(100, 4, strtolower($outputlangs->transnoentities("OrderToProcess")), '', 'R');
+		}
+
+		if ($object->thirdparty->code_fournisseur)
+		{
+			$posy+=4;
+			$pdf->SetXY($posx,$posy);
+			$pdf->SetTextColor(0,0,60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("SupplierCode")." : " . $outputlangs->transnoentities($object->thirdparty->code_fournisseur), '', 'R');
+		}
+
+		$posy+=1;
+		$pdf->SetTextColor(0,0,60);
+
+		// Show list of linked objects
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+
+		if ($showaddress)
+		{
+			// Sender properties
+			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
+
+			// Show sender
+			$posy=42;
+			$posx=$this->marge_gauche;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			$hautcadre=40;
+
+			// Show sender frame
+			$pdf->SetTextColor(0,0,0);
+			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetXY($posx,$posy-5);
+			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->SetXY($posx,$posy);
+			$pdf->SetFillColor(230,230,230);
+			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+			$pdf->SetTextColor(0,0,60);
+
+			// Show sender name
+			$pdf->SetXY($posx+2,$posy+3);
+			$pdf->SetFont('','B', $default_font_size);
+			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$posy=$pdf->getY();
+
+			// Show sender information
+			$pdf->SetXY($posx+2,$posy);
+			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+
+
+
+			// If BILLING contact defined on invoice, we use it
+			$usecontact=false;
+			$arrayidcontact=$object->getIdContact('internal','BILLING');
+			if (count($arrayidcontact) > 0)
+			{
+				$usecontact=true;
+				$result=$object->fetch_contact($arrayidcontact[0]);
+			}
+
+			//Recipient name
+			// On peut utiliser le nom de la societe du contact
+			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+				$thirdparty = $object->contact;
+			} else {
+				$thirdparty = $mysoc;
+			}
+
+			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
+
+			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,((!empty($object->contact))?$object->contact:null),$usecontact,'target',$object);
+
+			// Show recipient
+			$widthrecbox=100;
+			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
+			$posy=42;
+			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+
+			// Show recipient frame
+			$pdf->SetTextColor(0,0,0);
+			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetXY($posx+2,$posy-5);
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":",0,'L');
+			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+
+			// Show recipient name
+			$pdf->SetXY($posx+2,$posy+3);
+			$pdf->SetFont('','B', $default_font_size);
+			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+
+			$posy = $pdf->getY();
+
+			// Show recipient information
+			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->SetXY($posx+2,$posy);
+			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+		}
+	}
+
+	/**
+	 *   	Show footer of page. Need this->emetteur object
+     *
+	 *   	@param	PDF			$pdf     			PDF
+	 * 		@param	FactureFournisseur		$object				Object to show
+	 *      @param	Translate	$outputlangs		Object lang for output
+	 *      @param	int			$hidefreetext		1=Hide free text
+	 *      @return	int								Return height of bottom margin including footer text
+	 */
+	function _pagefoot(&$pdf, $object, $outputlangs,$hidefreetext=0)
+	{
+		global $conf;
+		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+	}
+
+}
+
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 3b93eb85cc9..16e5dd1892e 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -26,6 +26,7 @@
  */
 
 require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
@@ -143,6 +144,7 @@ llxHeader();
 $result=$object->fetch($id);
 
 $form = new Form($db);
+$formfile = new FormFile($db);
 
 $head = payment_supplier_prepare_head($object);
 
@@ -344,6 +346,34 @@ if ($result > 0)
 		}
 	}
 	print '</div>';
+	
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+
+	/*
+     * Documents generes
+     */
+    $ref=dol_sanitizeFileName($object->ref);
+    $subdir = get_exdir($object->id,2,0,0,$object,'supplier_payment').$ref;
+    $filedir = $conf->fournisseur->paiement->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'supplier_payment').$ref;
+    $urlsource=$_SERVER['PHP_SELF'].'?id='.$object->id;
+    $genallowed=$user->rights->fournisseur->facture->creer;
+    $delallowed=$user->rights->fournisseur->facture->supprimer;
+    $modelpdf=(! empty($object->modelpdf)?$object->modelpdf:(empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF)?'':$conf->global->SUPPLIER_PAYMENT_ADDON_PDF));
+
+    print $formfile->showdocuments('supplier_payment',$subdir,$filedir,$urlsource,$genallowed,$delallowed,$modelpdf,1,0,0,40,0,'','','',$societe->default_lang);
+    $somethingshown=$formfile->numoffiles;
+
+	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+    //print '</td><td valign="top" width="50%">';
+    //print '<br>';
+
+    // List of actions on element
+    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+    $formactions=new FormActions($db);
+    $somethingshown=$formactions->showactions($object,'supplier_payment',$socid,0,'listaction'.($genallowed?'largetitle':''));
+
+	print '</div></div></div>';
+    //print '</td></tr></table>';
 
 }
 else

From f5569ee890e6e01580969639b24c7b2641ff8566 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 11 Feb 2017 13:50:30 +0100
Subject: [PATCH 0253/1163] Add tasktime_task_duration_sec tag in odt
 substitution

---
 .../core/modules/project/doc/doc_generic_project_odt.modules.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 2a236e6d62c..06b188496a5 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -274,6 +274,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		return array(
 		'tasktime_rowid'=>$tasktime['rowid'],
 		'tasktime_task_date'=>dol_print_date($tasktime['task_date'],'day'),
+		'tasktime_task_duration_sec'=>$tasktime['task_duration'],
 		'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'],'all'),
 		'tasktime_note'=>$tasktime['note'],
 		'tasktime_fk_user'=>$tasktime['fk_user'],

From 3fa19f84e31c7bd8b787425624feadc58ced87cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 11 Feb 2017 15:40:25 +0100
Subject: [PATCH 0254/1163] FIX the dolCopyDir fails if target dir does not
 exists.

---
 htdocs/core/lib/files.lib.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 1f7974775b5..6bce1a443c5 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -515,13 +515,23 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
 
 	$result=0;
 
-	dol_syslog("files.lib.php::dolCopyr srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
+	dol_syslog("files.lib.php::dolCopyDir srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
 	if (empty($srcfile) || empty($destfile)) return -1;
 
 	$destexists=dol_is_dir($destfile);
 	if (! $overwriteifexists && $destexists) return 0;
-
+    
+    if (! $destexists)
+    {
+        // We must set mask just before creating dir, becaause it can be set differently by dol_copy
+        umask(0);
+        $dirmaskdec=octdec($newmask);
+        if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+        $dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
+        dol_mkdir($destfile."/".$file, '', decoct($dirmaskdec));
+    }
+    
 	$srcfile=dol_osencode($srcfile);
 	$destfile=dol_osencode($destfile);
 
@@ -538,6 +548,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
                 {
                     if (!is_dir($destfile."/".$file))
                     {
+                        // We must set mask just before creating dir, becaause it can be set differently by dol_copy
                     	umask(0);
 						$dirmaskdec=octdec($newmask);
 						if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);

From f34e0b1bdb1deebdfb85dc57970c9fc9794f68ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 11 Feb 2017 15:41:01 +0100
Subject: [PATCH 0255/1163] NEW Can deploy an external module from the module
 setup area.

---
 htdocs/admin/modules.php       | 405 +++++++++++++++++++--------------
 htdocs/admin/tools/update.php  | 252 +++-----------------
 htdocs/langs/en_US/admin.lang  |  22 +-
 htdocs/langs/en_US/errors.lang |   3 +-
 4 files changed, 279 insertions(+), 403 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index b61e5a4a86e..e34861450eb 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -29,12 +29,15 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 $langs->load("errors");
 $langs->load("admin");
 
-$mode=GETPOST('mode', 'alpha')?GETPOST('mode', 'alpha'):0;
+$mode=GETPOST('mode', 'alpha');
+if (empty($mode)) $mode='common';
 $action=GETPOST('action','alpha');
 $value=GETPOST('value', 'alpha');
 $page_y=GETPOST('page_y','int');
@@ -69,13 +72,14 @@ if ($search_status)  $param.='&search_status='.urlencode($search_status);
 if ($search_nature)  $param.='&search_nature='.urlencode($search_nature);
 if ($search_version) $param.='&search_version='.urlencode($search_version);
 
+$dirins=DOL_DOCUMENT_ROOT.'/custom';
+$urldolibarrmodules='https://www.dolistore.com/';
 
 
 /*
  * Actions
  */
 
-
 if (GETPOST('buttonreset'))
 {
     $search_keyword='';
@@ -84,6 +88,103 @@ if (GETPOST('buttonreset'))
     $search_version='';
 }
 
+if ($action=='install')
+{
+    $error=0;
+
+    // $original_file should match format module_modulename-x.y[.z].zip
+    $original_file=basename($_FILES["fileinstall"]["name"]);
+    $newfile=$conf->admin->dir_temp.'/'.$original_file.'/'.$original_file;
+
+    if (! $original_file)
+    {
+        $langs->load("Error");
+        setEventMessages($langs->trans("ErrorModuleFileRequired"), null, 'warnings');
+        $error++;
+    }
+    else
+    {
+        if (! preg_match('/\.zip/i',$original_file))
+        {
+            $langs->load("errors");
+            setEventMessages($langs->trans("ErrorFileMustBeADolibarrPackage",$original_file), null, 'errors');
+            $error++;
+        }
+    }
+
+    if (! $error)
+    {
+        if ($original_file)
+        {
+            @dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$original_file);
+            dol_mkdir($conf->admin->dir_temp.'/'.$original_file);
+        }
+
+        $tmpdir=preg_replace('/\.zip$/','',$original_file).'.dir';
+        if ($tmpdir)
+        {
+            @dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$tmpdir);
+            dol_mkdir($conf->admin->dir_temp.'/'.$tmpdir);
+        }
+
+        $result=dol_move_uploaded_file($_FILES['fileinstall']['tmp_name'],$newfile,1,0,$_FILES['fileinstall']['error']);
+        if ($result > 0)
+        {
+            $result=dol_uncompress($newfile,$conf->admin->dir_temp.'/'.$tmpdir);
+
+            if (! empty($result['error']))
+            {
+                $langs->load("errors");
+                setEventMessages($langs->trans($result['error'],$original_file), null, 'errors');
+                $error++;
+            }
+            else
+            {
+                // Now we move the dir of the module
+                $modulename=preg_replace('/module_/', '', $original_file);
+                $modulename=preg_replace('/\-[\d]+\.[\d]+.*$/', '', $modulename);
+                // Search dir $modulename
+                $modulenamedir=$conf->admin->dir_temp.'/'.$tmpdir.'/'.$modulename;
+                //var_dump($modulenamedir);
+                if (! dol_is_dir($modulenamedir))
+                {
+                    $modulenamedir=$conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulename;
+                    //var_dump($modulenamedir);
+                    if (! dol_is_dir($modulenamedir))
+                    {
+                        setEventMessages($langs->trans("ErrorModuleFileSeemsToHaveAWrongFormat"), null, 'errors');
+                        $error++;
+                    }
+                }
+
+                if (! $error)
+                {
+                    //var_dump($dirins);
+                    @dol_delete_dir_recursive($dirins.'/'.$modulename);
+                    dol_syslog("Uncompress of module file is a success. We copy it from ".$modulenamedir." into target dir ".$dirins.'/'.$modulename);
+                    $result=dolCopyDir($modulenamedir, $dirins.'/'.$modulename, '0444', 1);
+                    if ($result <= 0)
+                    {
+                        dol_syslog('Failed to call dolCopyDir result='.$result." with param ".$modulenamedir." and ".$dirins.'/'.$modulename, LOG_WARNING);
+                        $langs->load("errors");
+                        setEventMessages($langs->trans("ErrorFailToCopyDir", $modulenamedir, $dirins.'/'.$modulename), null, 'errors');
+                        $error++;
+                    }
+                }
+            }
+        }
+        else
+        {
+            $error++;
+        }
+    }
+
+    if (! $error)
+    {
+        setEventMessages($langs->trans("SetupIsReadyForUse", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->transnoentitiesnoconv("Home").' - '.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Modules")), null, 'warnings');
+    }
+}
+
 if ($action == 'set' && $user->admin)
 {
     $resarray = activateModule($value);
@@ -115,6 +216,13 @@ if ($action == 'reset' && $user->admin)
  * View
  */
 
+// Set dir where external modules are installed
+if (! dol_is_dir($dirins))
+{
+    dol_mkdir($dirins);
+}
+$dirins_ok=(dol_is_dir($dirins));
+
 $form = new Form($db);
 
 $help_url='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
@@ -277,33 +385,35 @@ if ($nbofactivatedmodules <= 1) $moreinfo .= ' '.img_warning($langs->trans("YouM
 print load_fiche_titre($langs->trans("ModulesSetup"),$moreinfo,'title_setup');
 
 // Start to show page
-if (empty($mode)) $mode='common';
-if ($mode==='common')      print $langs->trans("ModulesDesc")."<br>\n";
-if ($mode==='marketplace') print $langs->trans("ModulesMarketPlaceDesc")."<br>\n";
-if ($mode==='expdev')      print $langs->trans("ModuleFamilyExperimental")."<br>\n";
+if ($mode=='common')      print $langs->trans("ModulesDesc")."<br>\n";
+if ($mode=='marketplace') print $langs->trans("ModulesMarketPlaceDesc")."<br>\n";
+if ($mode=='deploy')      print $langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br>\n";
 
 
 $h = 0;
 
-$categidx='common';    // Main
-$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$categidx;
+$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=common";
 $head[$h][1] = $langs->trans("AvailableModules");
 $head[$h][2] = 'common';
 $h++;
 
-$categidx='marketplace';
-$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$categidx;
+$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=marketplace";
 $head[$h][1] = $langs->trans("ModulesMarketPlaces");
 $head[$h][2] = 'marketplace';
 $h++;
 
+$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=deploy";
+$head[$h][1] = $langs->trans("AddExtensionThemeModuleOrOther");
+$head[$h][2] = 'deploy';
+$h++;
+
 
 print "<br>\n";
 
 
 $var=true;
 
-if ($mode != 'marketplace')
+if ($mode == 'common')
 {
     
     print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -351,7 +461,6 @@ if ($mode != 'marketplace')
         //print '</div>';
     }
     
-    //dol_fiche_end();
     
     print '<div class="clearboth"></div><br>';
 
@@ -477,163 +586,6 @@ if ($mode != 'marketplace')
             $imginfo="info_black";
         }
         
-        // Define text of description of module
-        /*
-        $text='';
-        
-        if ($objMod->getDescLong()) $text.='<div class="titre">'.$objMod->getDesc().'</div><br>'.$objMod->getDescLong().'<br>';
-        else $text.='<div class="titre">'.$objMod->getDesc().'</div><br>';
-        
-        $text.='<br><strong>'.$langs->trans("Version").':</strong> '.$version;
-        
-        $textexternal='';
-        if ($objMod->isCoreOrExternalModule() == 'external')
-        {
-            $textexternal.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("ExternalModule",$dirofmodule);
-            if ($objMod->editor_name != 'dolibarr') $textexternal.='<br><strong>'.$langs->trans("Publisher").':</strong> '.(empty($objMod->editor_name)?$langs->trans("Unknown"):$objMod->editor_name);
-            if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i',$objMod->editor_url)) $textexternal.='<br><strong>'.$langs->trans("Url").':</strong> '.$objMod->editor_url;
-            $text.=$textexternal;
-            $text.='<br>';
-        }
-        else
-        {
-            $text.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("Core").'<br>';
-        }
-        $text.='<br><strong>'.$langs->trans("LastActivationDate").':</strong> ';
-        if (! empty($conf->global->$const_name)) $text.=dol_print_date($objMod->getLastActivationDate(), 'dayhour');
-        else $text.=$langs->trans("Disabled");
-        $text.='<br>';
-        
-        $text.='<br><strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
-        if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
-        {
-            $i=0;
-            foreach($objMod->tabs as $val)
-            {
-                $tmp=explode(':',$val,3);
-                $text.=($i?', ':'').$tmp[0].':'.$tmp[1];
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-        
-        $text.='<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
-        if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
-        {
-            $i=0;
-            foreach($objMod->dictionaries['tablib'] as $val)
-            {
-                $text.=($i?', ':'').$val;
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-        
-        $text.='<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
-        if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
-        {
-            $i=0;
-            foreach($objMod->boxes as $val)
-            {
-                $text.=($i?', ':'').($val['file']?$val['file']:$val[0]);
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-        
-        $text.='<br><strong>'.$langs->trans("AddModels").':</strong> ';
-        if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
-        {
-            $text.=$langs->trans("Yes");
-        }
-        else $text.=$langs->trans("No");
-        
-        $text.='<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
-        if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
-        {
-            $text.=$langs->trans("Yes");
-        }
-        else $text.=$langs->trans("No");
-        
-        $text.='<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
-        if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
-        {
-            $i=0;
-            foreach($objMod->cronjobs as $val)
-            {
-                $text.=($i?', ':'').($val['label']);
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-        
-        $text.='<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
-        if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
-        {
-            $text.=$langs->trans("Yes");
-        }
-        else $text.=$langs->trans("No");
-        
-        $text.='<br><strong>'.$langs->trans("AddHooks").':</strong> ';
-        if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
-        {
-            $i=0;
-            foreach($objMod->module_parts['hooks'] as $val)
-            {
-                $text.=($i?', ':'').($val);
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-        
-        $text.='<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
-        if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
-        {
-            $i=0;
-            foreach($objMod->rights as $val)
-            {
-                $text.=($i?', ':'').($val[1]);
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-        
-        $text.='<br><strong>'.$langs->trans("AddMenus").':</strong> ';
-        if (isset($objMod->menu) && ! empty($objMod->menu)) // objMod can be an array or just an int 1
-        {
-            $text.=$langs->trans("Yes");
-        }
-        else $text.=$langs->trans("No");
-        
-        $text.='<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
-        if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
-        {
-            $i=0;
-            foreach($objMod->export_label as $val)
-            {
-                $text.=($i?', ':'').($val);
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-        
-        $text.='<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
-        if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
-        {
-            $i=0;
-            foreach($objMod->import_label as $val)
-            {
-                $text.=($i?', ':'').($val);
-                $i++;
-            }
-        }
-        else $text.=$langs->trans("No");
-        
-        $text.='<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
-        $text.=$langs->trans("DetectionNotPossible");
-        */
-        
-        //print "\n<!-- Module ".$objMod->numero." ".$objMod->getName()." found into ".$dirmod[$key]." -->\n";
         print '<tr '.$bc[$var].">\n";
 
         // Picto
@@ -768,8 +720,11 @@ if ($mode != 'marketplace')
     }
     print "</table>\n";
     print '</div>';
+    
+    dol_fiche_end();
 }
-else
+
+if ($mode == 'marketplace')
 {
     dol_fiche_head($head, $mode, '');
     
@@ -799,13 +754,115 @@ else
 
     print "</table>\n";
 
-    //dol_fiche_end();
+    dol_fiche_end();
+}
+
+
+// Install external module
+   
+if ($mode == 'deploy')
+{
+    dol_fiche_head($head, $mode, '');
+
+    
+    $allowonlineinstall=true;
+    $allowfromweb=1;
+    if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) $allowonlineinstall=false;
+    
+    $fullurl='<a href="'.$urldolibarrmodules.'" target="_blank">'.$urldolibarrmodules.'</a>';
+    $message='';
+    if (! empty($allowonlineinstall))
+    {
+        if (! in_array('/custom',explode(',',$dolibarr_main_url_root_alt)))
+        {
+            $message=info_admin($langs->trans("ConfFileMuseContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
+            $allowfromweb=-1;
+        }
+        else
+        {
+            if ($dirins_ok)
+            {
+                if (! is_writable(dol_osencode($dirins)))
+                {
+                    $langs->load("errors");
+                    $message=info_admin($langs->trans("ErrorFailedToWriteInDir",$dirins));
+                    $allowfromweb=0;
+                }
+            }
+            else
+            {
+    
+                $message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
+                $allowfromweb=0;
+            }
+        }
+    }
+    else
+    {
+        $message=info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile",$dolibarrdataroot.'/installmodules.lock'));
+        $allowfromweb=0;
+    }
+    
+    if ($allowfromweb < 1)
+    {
+    	print $langs->trans("SomethingMakeInstallFromWebNotPossible");
+    	print $message;
+    	//print $langs->trans("SomethingMakeInstallFromWebNotPossible2");
+    	print '<br>';
+    }
+    
+    
+    if ($allowfromweb >= 0)
+    {
+    	if ($allowfromweb == 1) 
+    	{
+    	    //print $langs->trans("ThisIsProcessToFollow").'<br>';
+    	}
+    	else 
+    	{
+    	    print $langs->trans("ThisIsAlternativeProcessToFollow").'<br>';
+        	print '<b>'.$langs->trans("StepNb",1).'</b>: ';
+        	print $langs->trans("FindPackageFromWebSite",$fullurl).'<br>';
+        	print '<b>'.$langs->trans("StepNb",2).'</b>: ';
+        	print $langs->trans("DownloadPackageFromWebSite",$fullurl).'<br>';
+        	print '<b>'.$langs->trans("StepNb",3).'</b>: ';
+    	}
+    
+    	if ($allowfromweb == 1)
+    	{
+    		print $langs->trans("UnpackPackageInModulesRoot",$dirins).'<br>';
+    		print '<form enctype="multipart/form-data" method="POST" class="noborder" action="'.$_SERVER["PHP_SELF"].'" name="forminstall">';
+    		print '<input type="hidden" name="action" value="install">';
+    		print '<input type="hidden" name="mode" value="deploy">';
+    		print $langs->trans("YouCanSubmitFile").' <input type="file" name="fileinstall"> ';
+    		print '<input type="submit" name="send" value="'.dol_escape_htmltag($langs->trans("Send")).'" class="button">';
+    		print '</form>';
+    	}
+    	else
+    	{
+    		print $langs->trans("UnpackPackageInModulesRoot",$dirins).'<br>';
+    		print '<b>'.$langs->trans("StepNb",4).'</b>: ';
+    		print $langs->trans("SetupIsReadyForUse").'<br>';
+    	}
+    }
+    
+    
+    if (! empty($result['return']))
+    {
+    	print '<br>';
+    
+    	foreach($result['return'] as $value)
+    	{
+    		echo $value.'<br>';
+    	}
+    }
+
+    dol_fiche_end();
 }
 
-dol_fiche_end();
 
 // Show warning about external users
-if ($mode != 'marketplace') print info_admin(showModulesExludedForExternal($modules))."\n";
+if ($mode == 'common') print info_admin(showModulesExludedForExternal($modules))."\n";
 
 
 llxFooter();
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 912016b498c..d8b17ab989b 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
  *
@@ -23,9 +23,9 @@
  */
 
 require '../../main.inc.php';
-include_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-include_once DOL_DOCUMENT_ROOT . '/core/lib/geturl.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/geturl.lib.php';
 
 $langs->load("admin");
 $langs->load("other");
@@ -40,111 +40,23 @@ if (GETPOST('msg','alpha')) {
 
 
 $urldolibarr='https://www.dolibarr.org/downloads/';
-$urldolibarrmodules='https://www.dolistore.com/';
-$urldolibarrthemes='https://www.dolistore.com/';
 $dolibarrroot=preg_replace('/([\\/]+)$/i','',DOL_DOCUMENT_ROOT);
 $dolibarrroot=preg_replace('/([^\\/]+)$/i','',$dolibarrroot);
 $dolibarrdataroot=preg_replace('/([\\/]+)$/i','',DOL_DATA_ROOT);
 
-$dirins=DOL_DOCUMENT_ROOT.'/custom';
+$sfurl = '';
+$version='0.0';
 
 
 /*
  *	Actions
  */
 
-if ($action=='install')
+if ($action == 'getlastversion')
 {
-	$error=0;
-
-	// $original_file should match format module_modulename-x.y[.z].zip
-	$original_file=basename($_FILES["fileinstall"]["name"]);
-	$newfile=$conf->admin->dir_temp.'/'.$original_file.'/'.$original_file;
-
-	if (! $original_file)
-	{
-		$langs->load("Error");
-		setEventMessages($langs->trans("ErrorFileRequired"), null, 'warnings');
-		$error++;
-	}
-	else
-	{
-		if (! preg_match('/\.zip/i',$original_file))
-		{
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorFileMustBeADolibarrPackage",$original_file), null, 'errors');
-			$error++;
-		}
-	}
-
-	if (! $error)
-	{
-		if ($original_file)
-		{
-			@dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$original_file);
-			dol_mkdir($conf->admin->dir_temp.'/'.$original_file);
-		}
-
-		$tmpdir=preg_replace('/\.zip$/','',$original_file).'.dir';
-		if ($tmpdir)
-		{
-			@dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$tmpdir);
-			dol_mkdir($conf->admin->dir_temp.'/'.$tmpdir);
-		}
-
-		$result=dol_move_uploaded_file($_FILES['fileinstall']['tmp_name'],$newfile,1,0,$_FILES['fileinstall']['error']);
-		if ($result > 0)
-		{
-			$result=dol_uncompress($newfile,$conf->admin->dir_temp.'/'.$tmpdir);
-
-			if (! empty($result['error']))
-			{
-				$langs->load("errors");
-				setEventMessages($langs->trans($result['error'],$original_file), null, 'errors');
-				$error++;
-			}
-			else
-			{
-				// Now we move the dir of the module
-				$modulename=preg_replace('/module_/', '', $original_file);
-				$modulename=preg_replace('/\-[\d]+\.[\d]+.*$/', '', $modulename);
-				// Search dir $modulename
-				$modulenamedir=$conf->admin->dir_temp.'/'.$tmpdir.'/'.$modulename;
-				//var_dump($modulenamedir);
-				if (! dol_is_dir($modulenamedir))
-				{
-					$modulenamedir=$conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulename;
-					//var_dump($modulenamedir);
-					if (! dol_is_dir($modulenamedir))
-					{
-						setEventMessages($langs->trans("ErrorModuleFileSeemsToHaveAWrongFormat"), null, 'errors');
-						$error++;
-					}
-				}
-
-				if (! $error)
-				{
-					//var_dump($dirins);
-					@dol_delete_dir_recursive($dirins.'/'.$modulename);
-					$result=dolCopyDir($modulenamedir, $dirins.'/'.$modulename, '0444', 1);
-					if ($result <= 0)
-					{
-						setEventMessages($langs->trans("ErrorFailedToCopy"), null, 'errors');
-						$error++;
-					}
-				}
-			}
-		}
-		else
-		{
-			$error++;
-		}
-	}
-
-	if (! $error)
-	{
-		setEventMessages($langs->trans("SetupIsReadyForUse", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->transnoentitiesnoconv("Home").' - '.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Modules")), null, 'warnings');
-	}
+    $result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
+    //var_dump($result['content']);
+    $sfurl = simplexml_load_string($result['content']);
 }
 
 
@@ -152,15 +64,6 @@ if ($action=='install')
  * View
  */
 
-
-
-// Set dir where external modules are installed
-if (! dol_is_dir($dirins))
-{
-	dol_mkdir($dirins);
-}
-$dirins_ok=(dol_is_dir($dirins));
-
 $wikihelp='EN:Installation_-_Upgrade|FR:Installation_-_Mise_à_jour|ES:Instalación_-_Actualización';
 llxHeader('',$langs->trans("Upgrade"),$wikihelp);
 
@@ -172,36 +75,40 @@ if (function_exists('curl_init'))
 {
     $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
     
-    $result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
-    //var_dump($result['content']);
-    $sfurl = simplexml_load_string($result['content']);
-    if ($sfurl)
+    if ($action == 'getlastversion')
     {
-        $i=0;
-        $version='0.0';
-        while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
+        if ($sfurl)
         {
-            $title=$sfurl->channel[0]->item[$i]->title;
-            if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
+            $i=0;
+            while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
             {
-                $newversion=$reg[1];
-                $newversionarray=explode('.',$newversion);
-                $versionarray=explode('.',$version);
-                //var_dump($newversionarray);var_dump($versionarray);
-                if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion;
+                $title=$sfurl->channel[0]->item[$i]->title;
+                if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
+                {
+                    $newversion=$reg[1];
+                    $newversionarray=explode('.',$newversion);
+                    $versionarray=explode('.',$version);
+                    //var_dump($newversionarray);var_dump($versionarray);
+                    if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion;
+                }
+                $i++;
             }
-            $i++;
+            
+            // Show version
+        	print $langs->trans("LastStableVersion").' : <b>'. (($version != '0.0')?$version:$langs->trans("Unknown")) .'</b><br>';
+        }
+        else
+        {
+            print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>';
         }
-        
-        // Show version
-    	print $langs->trans("LastStableVersion").' : <b>'. (($version != '0.0')?$version:$langs->trans("Unknown")) .'</b><br>';
     }
     else
     {
-        print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>';
+        print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">' .$langs->trans("Check").'</a><br>';
     }
 }
 
+print '<br>';
 print '<br>';
 
 // Upgrade
@@ -225,106 +132,15 @@ print '<br>';
 print '<br>';
 
 
-// Install external module
-
-$allowonlineinstall=true;
-$allowfromweb=1;
-if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) $allowonlineinstall=false;
-
-$fullurl='<a href="'.$urldolibarrmodules.'" target="_blank">'.$urldolibarrmodules.'</a>';
-$message='';
-if (! empty($allowonlineinstall))
-{
-	if (! in_array('/custom',explode(',',$dolibarr_main_url_root_alt)))
-	{
-		$message=info_admin($langs->trans("ConfFileMuseContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
-		$allowfromweb=-1;
-	}
-	else
-	{
-		if ($dirins_ok)
-		{
-			if (! is_writable(dol_osencode($dirins)))
-			{
-				$langs->load("errors");
-				$message=info_admin($langs->trans("ErrorFailedToWriteInDir",$dirins));
-				$allowfromweb=0;
-			}
-		}
-		else
-		{
-
-			$message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
-			$allowfromweb=0;
-		}
-	}
-}
-else
-{
-	$message=info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile",$dolibarrdataroot.'/installmodules.lock'));
-	$allowfromweb=0;
-}
-
-
 
 
 
 print $langs->trans("AddExtensionThemeModuleOrOther").'<br>';
 print '<hr>';
 
-if ($allowfromweb < 1)
-{
-	print $langs->trans("SomethingMakeInstallFromWebNotPossible");
-	print $message;
-	//print $langs->trans("SomethingMakeInstallFromWebNotPossible2");
-	print '<br>';
-}
+print $langs->trans("GoModuleSetupArea", DOL_URL_ROOT.'/admin/modules.php?mode=deploy', $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Modules"));
 
 
-if ($allowfromweb >= 0)
-{
-	if ($allowfromweb == 1) 
-	{
-	    //print $langs->trans("ThisIsProcessToFollow").'<br>';
-	}
-	else 
-	{
-	    print $langs->trans("ThisIsAlternativeProcessToFollow").'<br>';
-    	print '<b>'.$langs->trans("StepNb",1).'</b>: ';
-    	print $langs->trans("FindPackageFromWebSite",$fullurl).'<br>';
-    	print '<b>'.$langs->trans("StepNb",2).'</b>: ';
-    	print $langs->trans("DownloadPackageFromWebSite",$fullurl).'<br>';
-    	print '<b>'.$langs->trans("StepNb",3).'</b>: ';
-	}
-
-	if ($allowfromweb == 1)
-	{
-		print $langs->trans("UnpackPackageInModulesRoot",$dirins).'<br>';
-		print '<form enctype="multipart/form-data" method="POST" class="noborder" action="'.$_SERVER["PHP_SELF"].'" name="forminstall">';
-		print '<input type="hidden" name="action" value="install">';
-		print $langs->trans("YouCanSubmitFile").' <input type="file" name="fileinstall"> ';
-		print '<input type="submit" name="send" value="'.dol_escape_htmltag($langs->trans("Send")).'" class="button">';
-		print '</form>';
-	}
-	else
-	{
-		print $langs->trans("UnpackPackageInModulesRoot",$dirins).'<br>';
-		print '<b>'.$langs->trans("StepNb",4).'</b>: ';
-		print $langs->trans("SetupIsReadyForUse").'<br>';
-	}
-}
-
-
-if (! empty($result['return']))
-{
-	print '<br>';
-
-	foreach($result['return'] as $value)
-	{
-		echo $value.'<br>';
-	}
-}
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6ee9a1854f4..36d8772dccb 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -191,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -283,16 +285,16 @@ MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package files into Dolibarr server directory dedicated to Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=Unpack package files into Dolibarr server directory dedicated to modules: <b>%s</b>
-oiSetupIsReadyForUse=Module deployement is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
@@ -895,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -1582,7 +1584,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do. 
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong> 
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong> 
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index edbf603e8fc..e493bc67524 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
 ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
 ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base

From 05c9f57fd466c8f5a4b0c232f2a9718bdf26e2e3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 12 Feb 2017 18:13:49 +0100
Subject: [PATCH 0256/1163] Move edition of emails templates out of
 dictionaries so we would be able to have templates per user (not reserved to
 admin).

---
 htdocs/admin/dict.php                     | 121 +--
 htdocs/admin/mails.php                    |  39 +-
 htdocs/admin/mails_templates.php          | 869 ++++++++++++++++++++++
 htdocs/admin/modulehelp.php               | 271 +++----
 htdocs/core/class/html.formmail.class.php |  34 +-
 htdocs/langs/en_US/admin.lang             |   1 +
 htdocs/langs/en_US/mails.lang             |   3 +
 7 files changed, 1081 insertions(+), 257 deletions(-)
 create mode 100644 htdocs/admin/mails_templates.php

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 09ee313e487..b272105fe16 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -86,7 +86,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,33,34,0,6,0,29,0,7,17,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,25,0,26,0,32,0);
+$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,33,34,0,6,0,29,0,7,17,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,26,0,32,0);
 
 // Name of SQL tables of dictionaries
 $tabname=array();
@@ -114,7 +114,7 @@ $tabname[21]= MAIN_DB_PREFIX."c_availability";
 $tabname[22]= MAIN_DB_PREFIX."c_input_reason";
 $tabname[23]= MAIN_DB_PREFIX."c_revenuestamp";
 $tabname[24]= MAIN_DB_PREFIX."c_type_resource";
-$tabname[25]= MAIN_DB_PREFIX."c_email_templates";
+//$tabname[25]= MAIN_DB_PREFIX."c_email_templates";
 $tabname[26]= MAIN_DB_PREFIX."c_units";
 $tabname[27]= MAIN_DB_PREFIX."c_stcomm";
 $tabname[28]= MAIN_DB_PREFIX."c_holiday_types";
@@ -151,7 +151,7 @@ $tablib[21]= "DictionaryAvailability";
 $tablib[22]= "DictionarySource";
 $tablib[23]= "DictionaryRevenueStamp";
 $tablib[24]= "DictionaryResourceType";
-$tablib[25]= "DictionaryEMailTemplates";
+//$tablib[25]= "DictionaryEMailTemplates";
 $tablib[26]= "DictionaryUnits";
 $tablib[27]= "DictionaryProspectStatus";
 $tablib[28]= "DictionaryHolidayTypes";
@@ -188,7 +188,7 @@ $tabsql[21]= "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX
 $tabsql[22]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
 $tabsql[23]= "SELECT t.rowid as rowid, t.taux, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
 $tabsql[24]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
-$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template',1).")";
+//$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template',1).")";
 $tabsql[26]= "SELECT rowid   as rowid, code, label, short_label, active FROM ".MAIN_DB_PREFIX."c_units";
 $tabsql[27]= "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_stcomm";
 $tabsql[28]= "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newbymonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
@@ -225,7 +225,7 @@ $tabsqlsort[21]="code ASC, label ASC";
 $tabsqlsort[22]="code ASC, label ASC";
 $tabsqlsort[23]="country ASC, taux ASC";
 $tabsqlsort[24]="code ASC,label ASC";
-$tabsqlsort[25]="label ASC";
+//$tabsqlsort[25]="label ASC";
 $tabsqlsort[26]="code ASC";
 $tabsqlsort[27]="code ASC";
 $tabsqlsort[28]="country ASC, code ASC";
@@ -262,7 +262,7 @@ $tabfield[21]= "code,label";
 $tabfield[22]= "code,label";
 $tabfield[23]= "country_id,country,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[24]= "code,label";
-$tabfield[25]= "label,type_template,private,position,topic,content_lines,content";
+//$tabfield[25]= "label,type_template,private,position,topic,content_lines,content";
 $tabfield[26]= "code,label,short_label";
 $tabfield[27]= "code,libelle";
 $tabfield[28]= "code,label,affect,delay,newbymonth,country_id,country";
@@ -299,7 +299,7 @@ $tabfieldvalue[21]= "code,label";
 $tabfieldvalue[22]= "code,label";
 $tabfieldvalue[23]= "country,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[24]= "code,label";
-$tabfieldvalue[25]= "label,type_template,private,position,topic,content_lines,content";
+//$tabfieldvalue[25]= "label,type_template,private,position,topic,content_lines,content";
 $tabfieldvalue[26]= "code,label,short_label";
 $tabfieldvalue[27]= "code,libelle";
 $tabfieldvalue[28]= "code,label,affect,delay,newbymonth,country";
@@ -336,7 +336,7 @@ $tabfieldinsert[21]= "code,label";
 $tabfieldinsert[22]= "code,label";
 $tabfieldinsert[23]= "fk_pays,taux,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[24]= "code,label";
-$tabfieldinsert[25]= "label,type_template,private,position,topic,content_lines,content,entity";
+//$tabfieldinsert[25]= "label,type_template,private,position,topic,content_lines,content,entity";
 $tabfieldinsert[26]= "code,label,short_label";
 $tabfieldinsert[27]= "code,libelle";
 $tabfieldinsert[28]= "code,label,affect,delay,newbymonth,fk_country";
@@ -375,7 +375,7 @@ $tabrowid[21]= "rowid";
 $tabrowid[22]= "rowid";
 $tabrowid[23]= "";
 $tabrowid[24]= "";
-$tabrowid[25]= "";
+//$tabrowid[25]= "";
 $tabrowid[26]= "";
 $tabrowid[27]= "id";
 $tabrowid[28]= "";
@@ -412,7 +412,7 @@ $tabcond[21]= ! empty($conf->propal->enabled);
 $tabcond[22]= (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled));
 $tabcond[23]= true;
 $tabcond[24]= ! empty($conf->resource->enabled);
-$tabcond[25]= true; // && ! empty($conf->global->MAIN_EMAIL_EDIT_TEMPLATE_FROM_DIC);
+//$tabcond[25]= true; // && ! empty($conf->global->MAIN_EMAIL_EDIT_TEMPLATE_FROM_DIC);
 $tabcond[26]= ! empty($conf->product->enabled);
 $tabcond[27]= ! empty($conf->societe->enabled);
 $tabcond[28]= ! empty($conf->holiday->enabled);
@@ -449,7 +449,7 @@ $tabhelp[21] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[22] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[23] = array();
 $tabhelp[24] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[25] = array('topic'=>$langs->trans('SeeSubstitutionVars'),'content'=>$langs->trans('SeeSubstitutionVars'),'content_lines'=>$langs->trans('SeeSubstitutionVars'),'type_template'=>$langs->trans("TemplateForElement"),'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
+//$tabhelp[25] = array('topic'=>$langs->trans('SeeSubstitutionVars'),'content'=>$langs->trans('SeeSubstitutionVars'),'content_lines'=>$langs->trans('SeeSubstitutionVars'),'type_template'=>$langs->trans("TemplateForElement"),'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[26] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[28] = array('affect'=>$langs->trans("FollowedByACounter"),'delay'=>$langs->trans("MinimumNoticePeriod"), 'newbymonth'=>$langs->trans("NbAddedAutomatically"));
@@ -486,7 +486,7 @@ $tabfieldcheck[21] = array();
 $tabfieldcheck[22] = array();
 $tabfieldcheck[23] = array();
 $tabfieldcheck[24] = array();
-$tabfieldcheck[25] = array();
+//$tabfieldcheck[25] = array();
 $tabfieldcheck[26] = array();
 $tabfieldcheck[27] = array();
 $tabfieldcheck[28] = array();
@@ -544,29 +544,6 @@ if ($id == 11)
 			'external' => $langs->trans('External')
 	);
 }
-if ($id == 25)
-{
-	// We save list of template email Dolibarr can manage. This list can found by a grep into code on "->param['models']"
-	$elementList = array();
-	if ($conf->propal->enabled) $elementList['propal_send']=$langs->trans('MailToSendProposal');
-	if ($conf->commande->enabled) $elementList['order_send']=$langs->trans('MailToSendOrder');
-	if ($conf->facture->enabled) $elementList['facture_send']=$langs->trans('MailToSendInvoice');
-	if ($conf->expedition->enabled) $elementList['shipping_send']=$langs->trans('MailToSendShipment');
-	if ($conf->ficheinter->enabled) $elementList['fichinter_send']=$langs->trans('MailToSendIntervention');
-	if ($conf->supplier_proposal->enabled) $elementList['supplier_proposal_send']=$langs->trans('MailToSendSupplierRequestForQuotation');
-	if ($conf->fournisseur->enabled) $elementList['order_supplier_send']=$langs->trans('MailToSendSupplierOrder');
-	if ($conf->fournisseur->enabled) $elementList['invoice_supplier_send']=$langs->trans('MailToSendSupplierInvoice');
-	if ($conf->societe->enabled) $elementList['thirdparty']=$langs->trans('MailToThirdparty');
-	if ($conf->contrat->enabled) $elementList['contract']=$langs->trans('MailToSendContract');
-
-	$parameters=array('elementList'=>$elementList);
-	$reshook=$hookmanager->executeHooks('emailElementlist',$parameters);    // Note that $action and $object may have been modified by some hooks
-	if ($reshook == 0) {
-		foreach ($hookmanager->resArray as $item => $value) {
-			$elementList[$item] = $value;
-		}
-	}
-}
 
 // Define localtax_typeList (used for dictionary "llx_c_tva")
 $localtax_typeList = array();
@@ -1048,7 +1025,6 @@ if ($id)
             if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
             if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
 	        if ($fieldlist[$field]=='short_label')     { $valuetoshow=$langs->trans("ShortLabel"); }
-            if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
 			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
 			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
@@ -1062,8 +1038,6 @@ if ($id)
 			if ($fieldlist[$field]=='font_size')       { $valuetoshow=$langs->trans("FontSize"); }
 			if ($fieldlist[$field]=='custom_x')        { $valuetoshow=$langs->trans("CustomX"); }
 			if ($fieldlist[$field]=='custom_y')        { $valuetoshow=$langs->trans("CustomY"); }
-			if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); }
-			if ($fieldlist[$field]=='content_lines')   { $valuetoshow=$langs->trans("ContentLines"); }
 			if ($fieldlist[$field]=='percent')         { $valuetoshow=$langs->trans("Percentage"); }
 			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("Info"); }
 			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
@@ -1117,35 +1091,18 @@ if ($id)
 
         if (empty($reshook))
         {
-        	if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates' && $action == 'edit')
-        	{
-				fieldList($fieldlist,$obj,$tabname[$id],'hide');
-        	}
-        	else
-        	{
-        		fieldList($fieldlist,$obj,$tabname[$id],'add');
-        	}
+       		fieldList($fieldlist,$obj,$tabname[$id],'add');
         }
 
         if ($id == 4) print '<td></td>';
         print '<td colspan="3" align="right">';
-        if ($tabname[$id] != MAIN_DB_PREFIX.'c_email_templates' || $action != 'edit')
+        if ($action != 'edit')
         {
         	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
         }
         print '</td>';
         print "</tr>";
 
-        if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates')
-        {
-        	print '<tr><td colspan="8">* '.$langs->trans("AvailableVariables").": ";
-        	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-        	$formmail=new FormMail($db);
-        	$tmp=$formmail->getAvailableSubstitKey('form');
-        	print implode(', ', $tmp);
-        	print '</td></tr>';
-        }
-
         $colspan=count($fieldlist)+3;
         if ($id == 4) $colspan++;
 
@@ -1240,7 +1197,6 @@ if ($id)
             if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
             if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
             if ($fieldlist[$field]=='short_label')     { $valuetoshow=$langs->trans("ShortLabel"); }
-        	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
 			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
 			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
@@ -1254,8 +1210,6 @@ if ($id)
 			if ($fieldlist[$field]=='font_size')       { $valuetoshow=$langs->trans("FontSize"); }
 			if ($fieldlist[$field]=='custom_x')        { $valuetoshow=$langs->trans("CustomX"); }
 			if ($fieldlist[$field]=='custom_y')        { $valuetoshow=$langs->trans("CustomY"); }
-			if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); }
-			if ($fieldlist[$field]=='content_lines')   { $valuetoshow=$langs->trans("ContentLines"); }
 			if ($fieldlist[$field]=='percent')         { $valuetoshow=$langs->trans("Percentage"); }
 			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("Info"); }
 			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
@@ -1354,10 +1308,6 @@ if ($id)
                             $showfield=1;
                         	$align="left";
                             $valuetoshow=$obj->{$fieldlist[$field]};
-                            if ($value == 'type_template')
-                            {
-                                $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
-                            }
                             if ($value == 'element')
                             {
                                 $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
@@ -1726,13 +1676,6 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'lang');
 			print '</td>';
 		}
-		// Le type de template
-		elseif ($fieldlist[$field] == 'type_template')
-		{
-			print '<td>';
-			print $form->selectarray('type_template', $elementList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
-			print '</td>';
-		}
 		// Le type de l'element (pour les type de contact)
 		elseif ($fieldlist[$field] == 'element')
 		{
@@ -1773,42 +1716,6 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 		elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
 			print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea></td>';
 		}
-		elseif (in_array($fieldlist[$field], array('content_lines')))
-		{
-			if ($tabname == MAIN_DB_PREFIX.'c_email_templates')
-			{
-				print '<td colspan="4"></td></tr><tr class="pair nohover"><td colspan="5">';		// To create an artificial CR for the current tr we are on
-			}
-			else print '<td>';
-			if ($context != 'hide')
-			{
-				//print '<input type="text" size="100" class="flat" value="'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
-				$okforextended=true;
-				if ($tabname == MAIN_DB_PREFIX.'c_email_templates' && empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended=false;
-				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 100, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_1, '90%');
-				print $doleditor->Create(1);
-			}
-			else print '&nbsp;';
-			print '</td>';
-		}
-		elseif (in_array($fieldlist[$field], array('content')))
-		{
-			if ($tabname == MAIN_DB_PREFIX.'c_email_templates')
-			{
-				print '<td colspan="4"></td></tr><tr class="pair nohover"><td colspan="5">';		// To create an artificial CR for the current tr we are on
-			}
-			else print '<td>';
-			if ($context != 'hide')
-			{
-				//print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
-				$okforextended=true;
-				if ($tabname == MAIN_DB_PREFIX.'c_email_templates' && empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended=false;
-				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_8, '90%');
-				print $doleditor->Create(1);
-			}
-			else print '&nbsp;';
-			print '</td>';
-		}
 		elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i',$fieldlist[$field])) {
 			print '<td><input type="text" class="flat minwidth75" value="'.price((! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'')).'" name="'.$fieldlist[$field].'"></td>';
 		}
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index ed290060370..e0e23f75d18 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -114,17 +114,24 @@ $server=! empty($conf->global->MAIN_MAIL_SMTP_SERVER)?$conf->global->MAIN_MAIL_S
 if (! $server) $server='127.0.0.1';
 
 
-/*
- * View
- */
-
 $wikihelp='EN:Setup EMails|FR:Paramétrage EMails|ES:Configuración EMails';
 llxHeader('',$langs->trans("Setup"),$wikihelp);
 
 print load_fiche_titre($langs->trans("EMailsSetup"),'','title_setup');
 
-print $langs->trans("EMailsDesc")."<br>\n";
-print "<br>\n";
+
+$h = 0;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/mails.php";
+$head[$h][1] = $langs->trans("OutGoingEmailSetup");
+$head[$h][2] = 'common';
+$h++;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/mails_templates.php";
+$head[$h][1] = $langs->trans("DictionaryEMailTemplates");
+$head[$h][2] = 'templates';
+$h++;
+
 
 // List of sending methods
 $listofmethods=array();
@@ -221,6 +228,12 @@ if ($action == 'edit')
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="update">';
 
+	dol_fiche_head($head, 'common', '');
+	
+	print $langs->trans("EMailsDesc")."<br>\n";
+	print "<br>\n";
+	
+	
 	clearstatcache();
 	$var=true;
 
@@ -428,6 +441,8 @@ if ($action == 'edit')
 
     print '</table>';
 
+    dol_fiche_end();
+    
     print '<br><div class="center">';
     print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
     print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
@@ -438,6 +453,12 @@ if ($action == 'edit')
 }
 else
 {
+    dol_fiche_head($head, 'common', '');
+    
+    print $langs->trans("EMailsDesc")."<br>\n";
+    print "<br>\n";
+    
+    
 	$var=true;
 
 	print '<table class="noborder" width="100%">';
@@ -570,10 +591,12 @@ else
 		print '&nbsp;';
 	}
 	print '</td></tr>';
-
     
 	print '</table>';
 
+	dol_fiche_end();
+	
+	
     if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
     {
         print '<br>';
@@ -619,7 +642,7 @@ else
 	print '</div>';
 
 
-	if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
+	if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && ! in_array($action, array('testconnect', 'test', 'testhtml')))
 	{
         $text = $langs->trans("WarningPHPMail");
 	    print info_admin($text);
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
new file mode 100644
index 00000000000..78dd7aeba76
--- /dev/null
+++ b/htdocs/admin/mails_templates.php
@@ -0,0 +1,869 @@
+<?php
+/* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2016  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2011-2015  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011       Remy Younes             <ryounes@gmail.com>
+ * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@ltairis.fr>
+ * Copyright (C) 2011-2016  Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/admin/dict.php
+ *		\ingroup    setup
+ *		\brief      Page to administer data tables
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+
+$langs->load("errors");
+$langs->load("admin");
+$langs->load("main");
+$langs->load("mails");
+
+$action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
+$confirm=GETPOST('confirm','alpha');
+$id=GETPOST('id','int');
+$rowid=GETPOST('rowid','alpha');
+
+$allowed=$user->admin;
+if (! $allowed) accessforbidden();
+
+$acts[0] = "activate";
+$acts[1] = "disable";
+$actl[0] = img_picto($langs->trans("Disabled"),'switch_off');
+$actl[1] = img_picto($langs->trans("Activated"),'switch_on');
+
+$listoffset=GETPOST('listoffset');
+$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000;
+$active = 1;
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0 ; }
+$offset = $listlimit * $page ;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('emailtemplates'));
+
+// Name of SQL tables of dictionaries
+$tabname=array();
+$tabname[25]= MAIN_DB_PREFIX."c_email_templates";
+
+// Requests to extract data
+$tabsql=array();
+$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template',1).")";
+
+// Criteria to sort dictionaries
+$tabsqlsort=array();
+$tabsqlsort[25]="label ASC";
+
+// Nom des champs en resultat de select pour affichage du dictionnaire
+$tabfield=array();
+$tabfield[25]= "label,type_template,private,position,topic,content";
+if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfield[25].=',content_lines';
+
+// Nom des champs d'edition pour modification d'un enregistrement
+$tabfieldvalue=array();
+$tabfieldvalue[25]= "label,type_template,private,position,topic,content";
+if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfield[25].=',content_lines';
+
+// Nom des champs dans la table pour insertion d'un enregistrement
+$tabfieldinsert=array();
+$tabfieldinsert[25]= "label,type_template,private,position,topic,content";
+if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfield[25].=',content_lines';
+$tabfieldinsert[25].=',entity';     // Must be at end because not into other arrays
+
+// Nom du rowid si le champ n'est pas de type autoincrement
+// Example: "" if id field is "rowid" and has autoincrement on
+//          "nameoffield" if id field is not "rowid" or has not autoincrement on
+$tabrowid=array();
+$tabrowid[25]= "";
+
+// Condition to show dictionary in setup page
+$tabcond=array();
+$tabcond[25]= true;
+
+// List of help for fields
+// Set MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES to allow edit of template for lines
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+$formmail=new FormMail($db);
+if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
+{
+    $tmp=$formmail->getAvailableSubstitKey('form');
+    $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
+    $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
+}
+else
+{
+    $tmp=$formmail->getAvailableSubstitKey('formwithlines');
+    $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
+    $tmp=$formmail->getAvailableSubstitKey('formforlines');
+    $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
+}
+
+
+$tabhelp=array();
+$tabhelp[25] = array('topic'=>$helpsubstit,'content'=>$helpsubstit,'content_lines'=>$helpsubstitforlines,'type_template'=>$langs->trans("TemplateForElement"),'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
+
+// List of check for fields (NOT USED YET)
+$tabfieldcheck=array();
+$tabfieldcheck[25] = array();
+
+
+// Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
+$elementList = array();
+$sourceList=array();
+
+// We save list of template email Dolibarr can manage. This list can found by a grep into code on "->param['models']"
+$elementList = array();
+if ($conf->propal->enabled) $elementList['propal_send']=$langs->trans('MailToSendProposal');
+if ($conf->commande->enabled) $elementList['order_send']=$langs->trans('MailToSendOrder');
+if ($conf->facture->enabled) $elementList['facture_send']=$langs->trans('MailToSendInvoice');
+if ($conf->expedition->enabled) $elementList['shipping_send']=$langs->trans('MailToSendShipment');
+if ($conf->ficheinter->enabled) $elementList['fichinter_send']=$langs->trans('MailToSendIntervention');
+if ($conf->supplier_proposal->enabled) $elementList['supplier_proposal_send']=$langs->trans('MailToSendSupplierRequestForQuotation');
+if ($conf->fournisseur->enabled) $elementList['order_supplier_send']=$langs->trans('MailToSendSupplierOrder');
+if ($conf->fournisseur->enabled) $elementList['invoice_supplier_send']=$langs->trans('MailToSendSupplierInvoice');
+if ($conf->societe->enabled) $elementList['thirdparty']=$langs->trans('MailToThirdparty');
+if ($conf->contrat->enabled) $elementList['contract']=$langs->trans('MailToSendContract');
+
+$parameters=array('elementList'=>$elementList);
+$reshook=$hookmanager->executeHooks('emailElementlist',$parameters);    // Note that $action and $object may have been modified by some hooks
+if ($reshook == 0) {
+	foreach ($hookmanager->resArray as $item => $value) {
+		$elementList[$item] = $value;
+	}
+}
+
+$id = 25;
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
+{
+    //$search_country_id = '';    
+}
+
+// Actions add or modify an entry into a dictionary
+if (GETPOST('actionadd') || GETPOST('actionmodify'))
+{
+    $listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
+    $listfieldinsert=explode(',',$tabfieldinsert[$id]);
+    $listfieldmodify=explode(',',$tabfieldinsert[$id]);
+    $listfieldvalue=explode(',',$tabfieldvalue[$id]);
+
+    // Check that all fields are filled
+    $ok=1;
+    foreach ($listfield as $f => $value)
+    {
+        if ($value == 'content') continue;
+        if ($value == 'content_lines') continue;
+        if ($value == 'content') $value='content-'.$rowid;
+        if ($value == 'content_lines') $value='content_lines-'.$rowid;
+
+        if (! isset($_POST[$value]) || $_POST[$value]=='')
+        {
+            $ok=0;
+            $fieldnamekey=$listfield[$f];
+            // We take translate key of field
+            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
+            if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
+            if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+            if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
+            if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
+
+            setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+        }
+    }
+
+    // Si verif ok et action add, on ajoute la ligne
+    if ($ok && GETPOST('actionadd'))
+    {
+        if ($tabrowid[$id])
+        {
+            // Recupere id libre pour insertion
+            $newid=0;
+            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $obj = $db->fetch_object($result);
+                $newid=($obj->newid + 1);
+
+            } else {
+                dol_print_error($db);
+            }
+        }
+
+        // Add new entry
+        $sql = "INSERT INTO ".$tabname[$id]." (";
+        // List of fields
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+        	$sql.= $tabrowid[$id].",";
+        $sql.= $tabfieldinsert[$id];
+        $sql.=",active)";
+        $sql.= " VALUES(";
+
+        // List of values
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+        	$sql.= $newid.",";
+        $i=0;
+        foreach ($listfieldinsert as $f => $value)
+        {
+            //var_dump($i.' - '.$listfieldvalue[$i].' - '.$_POST[$listfieldvalue[$i]].' - '.$value);
+            if ($value == 'entity') {
+            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+            }
+            if ($i) $sql.=",";
+            if ($value == 'private' && ! is_numeric($_POST[$listfieldvalue[$i]])) $_POST[$listfieldvalue[$i]]='0';
+            if ($value == 'position' && ! is_numeric($_POST[$listfieldvalue[$i]])) $_POST[$listfieldvalue[$i]]='1';
+            if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";  // For vat, we want/accept code = ''
+            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+            $i++;
+        }
+        $sql.=",1)";
+
+        dol_syslog("actionadd", LOG_DEBUG);
+        $result = $db->query($sql);
+        if ($result)	// Add is ok
+        {
+            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+        	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
+        }
+        else
+        {
+            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+            }
+            else {
+                dol_print_error($db);
+            }
+        }
+    }
+
+    // Si verif ok et action modify, on modifie la ligne
+    if ($ok && GETPOST('actionmodify'))
+    {
+        if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+        else { $rowidcol="rowid"; }
+
+        // Modify entry
+        $sql = "UPDATE ".$tabname[$id]." SET ";
+        // Modifie valeur des champs
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldmodify))
+        {
+            $sql.= $tabrowid[$id]."=";
+            $sql.= "'".$db->escape($rowid)."', ";
+        }
+        $i = 0;
+        foreach ($listfieldmodify as $field)
+        {
+            if ($value == 'content') $_POST['content']=$_POST['content-'.$rowid];
+            if ($value == 'content_lines') $_POST['content_lines']=$_POST['content_lines-'.$rowid];
+            if ($field == 'entity') {
+            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+            }
+            if ($i) $sql.=",";
+            $sql.= $field."=";
+            if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";  // For vat, we want/accept code = ''
+            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+            $i++;
+        }
+        $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
+
+        dol_syslog("actionmodify", LOG_DEBUG);
+        //print $sql;
+        $resql = $db->query($sql);
+        if (! $resql)
+        {
+            setEventMessages($db->error(), null, 'errors');
+        }
+    }
+}
+
+if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
+
+    dol_syslog("delete", LOG_DEBUG);
+    $result = $db->query($sql);
+    if (! $result)
+    {
+        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+        {
+            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+    }
+}
+
+// activate
+if ($action == $acts[0])
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$_GET["code"]."'";
+    }
+
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
+}
+
+// disable
+if ($action == $acts[1])
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$_GET["code"]."'";
+    }
+
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formadmin=new FormAdmin($db);
+
+llxHeader();
+
+$titre=$langs->trans("EMailsSetup");
+$linkback='';
+$titlepicto='title_setup';
+
+print load_fiche_titre($titre,$linkback,$titlepicto);
+
+$h = 0;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/mails.php";
+$head[$h][1] = $langs->trans("OutGoingEmailSetup");
+$head[$h][2] = 'common';
+$h++;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/mails_templates.php";
+$head[$h][1] = $langs->trans("DictionaryEMailTemplates");
+$head[$h][2] = 'templates';
+$h++;
+
+
+dol_fiche_head($head, 'templates', '');
+
+// Confirmation de la suppression de la ligne
+if ($action == 'delete')
+{
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$_GET["code"].'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
+}
+//var_dump($elementList);
+
+// Complete requete recherche valeurs avec critere de tri
+$sql=$tabsql[$id];
+
+if ($search_country_id > 0)
+{
+    if (preg_match('/ WHERE /',$sql)) $sql.= " AND ";
+    else $sql.=" WHERE ";
+    $sql.= " c.rowid = ".$search_country_id;
+}
+
+if ($sortfield)
+{
+    // If sort order is "country", we use country_code instead
+	if ($sortfield == 'country') $sortfield='country_code';
+    $sql.= " ORDER BY ".$sortfield;
+    if ($sortorder)
+    {
+        $sql.=" ".strtoupper($sortorder);
+    }
+    $sql.=", ";
+    // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
+    $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
+    $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
+}
+else {
+    $sql.=" ORDER BY ";
+}
+$sql.=$tabsqlsort[$id];
+$sql.=$db->plimit($listlimit+1,$offset);
+//print $sql;
+
+$fieldlist=explode(',',$tabfield[$id]);
+
+print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
+
+print '<table class="noborder" width="100%">';
+
+// Form to add a new line
+$alabelisused=0;
+$var=false;
+
+$fieldlist=explode(',',$tabfield[$id]);
+
+if ($action != 'edit')
+{
+    // Line for title
+    print '<tr class="liste_titre">';
+    foreach ($fieldlist as $field => $value)
+    {
+        // Determine le nom du champ par rapport aux noms possibles
+        // dans les dictionnaires de donnees
+        $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
+        $valuetoshow=$langs->trans($valuetoshow);   // try to translate
+        $align="left";
+        if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
+        if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
+        if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+        if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
+        if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
+    	if ($fieldlist[$field]=='content')         { $valuetoshow=''; }
+    	if ($fieldlist[$field]=='content_lines')   { $valuetoshow=''; }
+    		
+        if ($valuetoshow != '')
+        {
+            print '<td align="'.$align.'">';
+        	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
+        	else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
+        	else print $valuetoshow;
+            print '</td>';
+         }
+         if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
+    }
+    
+    print '<td colspan="3">';
+    print '<input type="hidden" name="id" value="'.$id.'">';
+    print '</td>';
+    print '</tr>';
+    
+    // Line to enter new values
+    print "<tr ".$bcnd[$var].">";
+    
+    $obj = new stdClass();
+    // If data was already input, we define them in obj to populate input fields.
+    if (GETPOST('actionadd'))
+    {
+        foreach ($fieldlist as $key=>$val)
+        {
+            if (GETPOST($val) != '')
+            	$obj->$val=GETPOST($val);
+        }
+    }
+    
+    $tmpaction = 'create';
+    $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+    $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+    $error=$hookmanager->error; $errors=$hookmanager->errors;
+    
+    if (empty($reshook))
+    {
+    	if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates' && $action == 'edit')
+    	{
+    		fieldList($fieldlist,$obj,$tabname[$id],'hide');
+    	}
+    	else
+    	{
+    		fieldList($fieldlist,$obj,$tabname[$id],'add');
+    	}
+    }
+    
+    print '<td align="right" colspan="3">';
+    print '</td>';
+    print "</tr>";
+    
+    $fieldsforcontent = array('content');
+    if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
+    {
+        $fieldsforcontent = array('content', 'content_lines');
+    }
+    foreach ($fieldsforcontent as $tmpfieldlist)
+    {
+        print '<tr class="impair nodrag nodrop nohover"><td colspan="5">';
+        if ($tmpfieldlist == 'content')
+        {
+            print '<strong>'.$form->textwithpicto($langs->trans("Content"),$tabhelp[$id][$tmpfieldlist]).'</strong><br>';
+        }
+        if ($context != 'hide')
+        {
+            //print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
+            $okforextended=true;
+            if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended=false;
+            $doleditor = new DolEditor($tmpfieldlist, (! empty($obj->{$tmpfieldlist})?$obj->{$tmpfieldlist}:''), '', 120, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
+            print $doleditor->Create(1);
+        }
+        else print '&nbsp;';
+        print '</td>';
+        if ($tmpfieldlist == 'content') 
+        {
+            print '<td align="center" colspan="3" rowspan="'.(count($fieldsforcontent)).'">';
+            if ($action != 'edit')
+            {
+                print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+            }
+            print '</td>';
+        }
+        //else print '<td></td>';
+        print '</tr>';
+    }
+    
+    
+    
+    $colspan=count($fieldlist)+1;
+    print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
+}    
+
+
+// List of available record in database
+dol_syslog("htdocs/admin/dict", LOG_DEBUG);
+$resql=$db->query($sql);
+if ($resql)
+{
+    $num = $db->num_rows($resql);
+    $i = 0;
+    $var=true;
+
+    $param = '&id='.$id;
+    $paramwithsearch = $param;
+    if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
+    if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
+    if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
+    
+    // There is several pages
+    if ($num > $listlimit)
+    {
+        print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
+        print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
+        print '</td></tr>';
+    }
+
+    // Title of lines
+    print '<tr class="liste_titre'.($action != 'edit' ? ' liste_titre_add' : '').'">';
+    foreach ($fieldlist as $field => $value)
+    {
+        // Determine le nom du champ par rapport aux noms possibles
+        // dans les dictionnaires de donnees
+        $showfield=1;							  	// By defaut
+        $align="left";
+        $sortable=1;
+        $valuetoshow='';
+        /*
+        $tmparray=getLabelOfField($fieldlist[$field]);
+        $showfield=$tmp['showfield'];
+        $valuetoshow=$tmp['valuetoshow'];
+        $align=$tmp['align'];
+        $sortable=$tmp['sortable'];
+		*/
+        $valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
+        $valuetoshow=$langs->trans($valuetoshow);   // try to translate
+        if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
+        if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
+        if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
+    	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
+		if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); $showfield=0;}
+		if ($fieldlist[$field]=='content_lines')   { $valuetoshow=$langs->trans("ContentLines"); $showfield=0; }
+
+        // Affiche nom du champ
+        if ($showfield)
+        {
+            if (! empty($tabhelp[$id][$value])) $valuetoshow = $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
+            print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
+        }
+    }
+
+    print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
+    print getTitleFieldOfList('');
+    print getTitleFieldOfList('');
+    print '</tr>';
+
+    // Title line with search boxes
+    print '<tr class="liste_titre">';
+    $filterfound=0;
+    foreach ($fieldlist as $field => $value)
+    {
+        if (! in_array($field, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
+    }
+    print '<td class="liste_titre"></td>';
+    print '<td class="liste_titre"></td>';
+    print '<td class="liste_titre"></td>';
+    print '</tr>';
+        
+    if ($num)
+    {
+        // Lines with values
+        while ($i < $num)
+        {
+            $var = ! $var;
+
+            $obj = $db->fetch_object($resql);
+            //print_r($obj);
+            print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
+            if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
+            {
+                $tmpaction='edit';
+                $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                $reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+                $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+                // Show fields
+                if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
+
+                print '<td colspan="3" align="center">';
+                print '<input type="hidden" name="page" value="'.$page.'">';
+                print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+                print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+                print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
+                print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+                print '</td>';
+                
+                $fieldsforcontent = array('content');
+                if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
+                {
+                    $fieldsforcontent = array('content', 'content_lines');
+                }
+                foreach ($fieldsforcontent as $tmpfieldlist)
+                {
+                    $showfield = 1;
+                    $align = "left";
+                    $valuetoshow = $obj->{$tmpfieldlist};
+                
+                    $class = 'tddict';
+                    // Show value for field
+                    if ($showfield) {
+                
+                        print '</tr><tr '.$bc[$var].' nohover tr-'.$tmpfieldlist.'-'.($i+1).' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
+                        $okforextended = true;
+                        if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
+                            $okforextended = false;
+                            $doleditor = new DolEditor($tmpfieldlist.'-'.($i+1), (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
+                            print $doleditor->Create(1);
+                            print '</td>';
+                            print '<td></td><td></td><td></td>';
+                
+                    }
+                }                
+            }
+            else
+            {
+              	$tmpaction = 'view';
+                $parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                $reshook=$hookmanager->executeHooks('viewDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+
+                $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+                if (empty($reshook))
+                {
+                    foreach ($fieldlist as $field => $value)
+                    {
+                        if (in_array($fieldlist[$field], array('content','content_lines'))) continue;
+                        $showfield=1;
+                    	$align="left";
+                        $valuetoshow=$obj->{$fieldlist[$field]};
+                        if ($value == 'type_template')
+                        {
+                            $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
+                        }
+
+                        $class='tddict';
+						// Show value for field
+						if ($showfield)
+						{
+                            print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
+						}
+                    }
+                }
+
+                // Can an entry be erased or disabled ?
+                $iserasable=1;$canbedisabled=1;$canbemodified=1;	// true by default
+                $canbemodified=$iserasable;
+
+                $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
+                if ($param) $url .= '&'.$param;
+                $url.='&';
+
+                // Active
+                print '<td align="center" class="nowrap">';
+                if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+                else
+             	{
+             		if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
+             		else if (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
+              		else if (isset($obj->type) && in_array($obj->type, array('system')) && ! empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
+                	else print $langs->trans("AlwaysActive");
+                }
+                print "</td>";
+
+                // Modify link
+                if ($canbemodified) print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
+                else print '<td>&nbsp;</td>';
+
+                // Delete link
+                if ($iserasable)
+                {
+                    print '<td align="center">';
+                    if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
+                    //else print '<a href="#">'.img_delete().'</a>';    // Some dictionnary can be edited by other profile than admin
+                    print '</td>';
+                }
+                else print '<td>&nbsp;</td>';
+
+                /*
+                $fieldsforcontent = array('content');
+                if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
+                {
+                    $fieldsforcontent = array('content', 'content_lines');
+                }
+                foreach ($fieldsforcontent as $tmpfieldlist) 
+                {
+                    $showfield = 1;
+                    $align = "left";
+                    $valuetoshow = $obj->{$tmpfieldlist};
+                    
+                    $class = 'tddict';
+                    // Show value for field
+                    if ($showfield) {
+                        
+                        print '</tr><tr '.$bc[$var].' nohover tr-'.$tmpfieldlist.'-'.$i.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
+                        $okforextended = true;
+                        if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
+                            $okforextended = false;
+                        $doleditor = new DolEditor($tmpfieldlist.'-'.$i, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%', 1);
+                        print $doleditor->Create(1);
+                        print '</td>';
+                        print '<td></td><td></td><td></td>';
+                        
+                    }
+                }*/
+            }
+            print "</tr>\n";
+            
+            
+            $i++;
+        }
+    }
+}
+else {
+    dol_print_error($db);
+}
+
+print '</table>';
+
+print '</form>';
+
+
+dol_fiche_end();
+
+llxFooter();
+$db->close();
+
+
+/**
+ *	Show fields in insert/edit mode
+ *
+ * 	@param		array	$fieldlist		Array of fields
+ * 	@param		Object	$obj			If we show a particular record, obj is filled with record fields
+ *  @param		string	$tabname		Name of SQL table
+ *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
+ *	@return		void
+ */
+function fieldList($fieldlist, $obj='', $tabname='', $context='')
+{
+	global $conf,$langs,$db;
+	global $form;
+	global $region_id;
+	global $elementList,$sourceList,$localtax_typeList;
+	global $bc;
+
+	$formadmin = new FormAdmin($db);
+	$formcompany = new FormCompany($db);
+	if (! empty($conf->accounting->enabled)) $formaccountancy = new FormVentilation($db);
+
+	foreach ($fieldlist as $field => $value)
+	{
+		if ($fieldlist[$field] == 'lang')
+		{
+			print '<td>';
+			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'lang');
+			print '</td>';
+		}
+		// Le type de template
+		elseif ($fieldlist[$field] == 'type_template')
+		{
+			print '<td>';
+			print $form->selectarray('type_template', $elementList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			print '</td>';
+		}
+		elseif (in_array($fieldlist[$field], array('content','content_lines'))) continue;
+		else
+		{
+			print '<td>';
+			$size=''; $class='';
+			if ($fieldlist[$field]=='code') $class='maxwidth100';
+			if ($fieldlist[$field]=='private') $class='maxwidth50';
+			if ($fieldlist[$field]=='position') $class='maxwidth50';
+			if ($fieldlist[$field]=='libelle') $class='quatrevingtpercent';
+			if ($fieldlist[$field]=='topic') $class='quatrevingtpercent';
+			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $size='size="2" ';
+			print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="'.(isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
+			print '</td>';
+		}
+	}
+}
+
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index e701d4ead03..6e93bbcda54 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -46,9 +46,10 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
 $langs->load("errors");
 $langs->load("admin");
 
-$mode=GETPOST('mode', 'alpha')?GETPOST('mode', 'alpha'):0;
+$mode=GETPOST('mode', 'alpha');
 $action=GETPOST('action','alpha');
 $id = GETPOST('id', 'int');
+if (empty($mode)) $mode='desc';
 
 if (! $user->admin)
 	accessforbidden();
@@ -232,17 +233,15 @@ asort($orders);
 
 $h = 0;
 
-$categidx='desc';    // Main
 $head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$id.'&mode=desc';
 $head[$h][1] = $langs->trans("Description");
 $head[$h][2] = 'desc';
 $h++;
 
-/*$categidx='feature';
 $head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$id.'&mode=feature';
 $head[$h][1] = $langs->trans("Features");
 $head[$h][2] = 'feature';
-$h++;*/
+$h++;
 
 
 $i=0;
@@ -356,159 +355,165 @@ if ($objMod->isCoreOrExternalModule() == 'external')
 
 // Define text of description of module
 $text='';
-
-if ($objMod->getDescLong()) $text.=$objMod->getDesc().'<br>';
-
-$text.='<br><strong>'.$langs->trans("Version").':</strong> '.$version;
-
-$textexternal='';
-if ($objMod->isCoreOrExternalModule() == 'external')
+   
+if ($mode == 'desc')
 {
-    $textexternal.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("ExternalModule",$dirofmodule);
-    if ($objMod->editor_name != 'dolibarr') $textexternal.='<br><strong>'.$langs->trans("Publisher").':</strong> '.(empty($objMod->editor_name)?$langs->trans("Unknown"):$objMod->editor_name);
-    if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i',$objMod->editor_url)) $textexternal.='<br><strong>'.$langs->trans("Url").':</strong> '.$objMod->editor_url;
-    $text.=$textexternal;
+    $text.='<strong>'.$langs->trans("Version").':</strong> '.$version;
+    
+    $textexternal='';
+    if ($objMod->isCoreOrExternalModule() == 'external')
+    {
+        $textexternal.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("ExternalModule",$dirofmodule);
+        if ($objMod->editor_name != 'dolibarr') $textexternal.='<br><strong>'.$langs->trans("Publisher").':</strong> '.(empty($objMod->editor_name)?$langs->trans("Unknown"):$objMod->editor_name);
+        if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i',$objMod->editor_url)) $textexternal.='<br><strong>'.$langs->trans("Url").':</strong> '.$objMod->editor_url;
+        $text.=$textexternal;
+        $text.='<br>';
+    }
+    else
+    {
+        $text.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("Core").'<br>';
+    }
+    $text.='<br><strong>'.$langs->trans("LastActivationDate").':</strong> ';
+    if (! empty($conf->global->$const_name)) $text.=dol_print_date($objMod->getLastActivationDate(), 'dayhour');
+    else $text.=$langs->trans("Disabled");
     $text.='<br>';
-}
-else
-{
-    $text.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("Core").'<br>';
-}
-$text.='<br><strong>'.$langs->trans("LastActivationDate").':</strong> ';
-if (! empty($conf->global->$const_name)) $text.=dol_print_date($objMod->getLastActivationDate(), 'dayhour');
-else $text.=$langs->trans("Disabled");
-$text.='<br>';
 
-$text.='<br><strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
-if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
+    if ($objMod->getDescLong()) $text.=$objMod->getDesc().'<br>';
+}
+
+if ($mode == 'feature')
 {
-    $i=0;
-    foreach($objMod->tabs as $val)
+    $text.='<strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
+    if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
     {
-        $tmp=explode(':',$val,3);
-        $text.=($i?', ':'').$tmp[0].':'.$tmp[1];
-        $i++;
+        $i=0;
+        foreach($objMod->tabs as $val)
+        {
+            $tmp=explode(':',$val,3);
+            $text.=($i?', ':'').$tmp[0].':'.$tmp[1];
+            $i++;
+        }
     }
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
-if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
-{
-    $i=0;
-    foreach($objMod->dictionaries['tablib'] as $val)
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
+    if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
     {
-        $text.=($i?', ':'').$val;
-        $i++;
+        $i=0;
+        foreach($objMod->dictionaries['tablib'] as $val)
+        {
+            $text.=($i?', ':'').$val;
+            $i++;
+        }
     }
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
-if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
-{
-    $i=0;
-    foreach($objMod->boxes as $val)
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
+    if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
     {
-        $text.=($i?', ':'').($val['file']?$val['file']:$val[0]);
-        $i++;
+        $i=0;
+        foreach($objMod->boxes as $val)
+        {
+            $text.=($i?', ':'').($val['file']?$val['file']:$val[0]);
+            $i++;
+        }
     }
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddModels").':</strong> ';
-if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
-{
-    $text.=$langs->trans("Yes");
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
-if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
-{
-    $text.=$langs->trans("Yes");
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
-if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
-{
-    $i=0;
-    foreach($objMod->cronjobs as $val)
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddModels").':</strong> ';
+    if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
     {
-        $text.=($i?', ':'').($val['label']);
-        $i++;
+        $text.=$langs->trans("Yes");
     }
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
-if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
-{
-    $text.=$langs->trans("Yes");
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddHooks").':</strong> ';
-if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
-{
-    $i=0;
-    foreach($objMod->module_parts['hooks'] as $val)
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
+    if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
     {
-        $text.=($i?', ':'').($val);
-        $i++;
+        $text.=$langs->trans("Yes");
     }
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
-if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
-{
-    $i=0;
-    foreach($objMod->rights as $val)
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
+    if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
     {
-        $text.=($i?', ':'').($val[1]);
-        $i++;
+        $i=0;
+        foreach($objMod->cronjobs as $val)
+        {
+            $text.=($i?', ':'').($val['label']);
+            $i++;
+        }
     }
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddMenus").':</strong> ';
-if (isset($objMod->menu) && ! empty($objMod->menu)) // objMod can be an array or just an int 1
-{
-    $text.=$langs->trans("Yes");
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
-if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
-{
-    $i=0;
-    foreach($objMod->export_label as $val)
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
+    if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
     {
-        $text.=($i?', ':'').($val);
-        $i++;
+        $text.=$langs->trans("Yes");
     }
-}
-else $text.=$langs->trans("No");
-
-$text.='<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
-if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
-{
-    $i=0;
-    foreach($objMod->import_label as $val)
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddHooks").':</strong> ';
+    if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
     {
-        $text.=($i?', ':'').($val);
-        $i++;
+        $i=0;
+        foreach($objMod->module_parts['hooks'] as $val)
+        {
+            $text.=($i?', ':'').($val);
+            $i++;
+        }
     }
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
+    if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
+    {
+        $i=0;
+        foreach($objMod->rights as $val)
+        {
+            $text.=($i?', ':'').($val[1]);
+            $i++;
+        }
+    }
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddMenus").':</strong> ';
+    if (isset($objMod->menu) && ! empty($objMod->menu)) // objMod can be an array or just an int 1
+    {
+        $text.=$langs->trans("Yes");
+    }
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
+    if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
+    {
+        $i=0;
+        foreach($objMod->export_label as $val)
+        {
+            $text.=($i?', ':'').($val);
+            $i++;
+        }
+    }
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
+    if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
+    {
+        $i=0;
+        foreach($objMod->import_label as $val)
+        {
+            $text.=($i?', ':'').($val);
+            $i++;
+        }
+    }
+    else $text.=$langs->trans("No");
+    
+    $text.='<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
+    $text.=$langs->trans("DetectionNotPossible");
 }
-else $text.=$langs->trans("No");
 
-$text.='<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
-$text.=$langs->trans("DetectionNotPossible");
 
 print $text;
-        
 
 
 dol_fiche_end();
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 10fb88bbe64..a85b8157732 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -984,7 +984,7 @@ class FormMail extends Form
 	 */
 	function setSubstitFromObject($object, $outputlangs=null)
 	{
-		global $user;
+		global $conf, $user;
 		$this->substit['__REF__'] = $object->ref;
 		$this->substit['__REFCLIENT__'] = isset($object->ref_client) ? $object->ref_client : '';
 		$this->substit['__REFSUPPLIER__'] = isset($object->ref_supplier) ? $object->ref_supplier : '';
@@ -993,6 +993,7 @@ class FormMail extends Form
 		$this->substit['__DATE_DUE_YMD__'] = isset($object->date_lim_reglement)? dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs) : '';
 		$this->substit['__AMOUNT__'] = price($object->total_ttc);
 		$this->substit['__AMOUNT_WO_TAX__'] = price($object->total_ht);
+		$this->substit['__AMOUNT_VAT__'] = price($object->total_tva);
 		
 		$this->substit['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
 		$this->substit['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty)?$object->thirdparty->name:'');
@@ -1005,6 +1006,7 @@ class FormMail extends Form
 		$this->substit['__PERSONALIZED__'] = '';
 		$this->substit['__CONTACTCIVNAME__'] = '';	// Will be replace just before sending
         
+		
         //Fill substit_lines with each object lines content
         if (is_array($object->lines))
         {
@@ -1022,10 +1024,10 @@ class FormMail extends Form
                     '__SUBPRICE__' => price($line->subprice),
                     '__AMOUNT__' => price($line->total_ttc),
                     '__AMOUNT_WO_TAX__' => price($line->total_ht),
-                    //'__PRODUCT_EXTRAFIELD_FIELD__' Done dinamically
+                    //'__PRODUCT_EXTRAFIELD_FIELD__' Done dinamically just after
                 );
 
-                // Create dinamic tags for __PRODUCT_EXTRAFIELD_FIELD__
+                // Create dynamic tags for __PRODUCT_EXTRAFIELD_FIELD__
                 if (!empty($line->fk_product))
                 {
                     $extrafields = new ExtraFields($this->db);
@@ -1045,7 +1047,7 @@ class FormMail extends Form
 	/**
 	 * Set substit array from object
 	 * 
-	 * @param	string	$mode		'form' or 'emailing'
+	 * @param	string	$mode		'form', 'formwithlines', 'formforlines' or 'emailing'
 	 * @return	void
 	 */
 	function getAvailableSubstitKey($mode='form')
@@ -1054,18 +1056,32 @@ class FormMail extends Form
 		
 		$vars=array();
 		
-		if ($mode == 'form')
+		if ($mode == 'form' || $mode == 'formwithlines' || $mode == 'formforlines')
 		{
 			$vars=array(
 				'__REF__', 
 				'__REFCLIENT__', 
-				'__THIRDPARTY_NAME__', 
-				'__PROJECT_REF__', 
-				'__PROJECT_NAME__',
+				'__REFSUPPLIER__', 
+			    '__THIRDPARTY_ID__', 
+			    '__THIRDPARTY_NAME__', 
+			    '__PROJECT_ID__', 
+			    '__PROJECT_REF__', 
+			    '__PROJECT_NAME__',
 				'__CONTACTCIVNAME__',
-				'__PERSONALIZED__',			// Paypal link will be added here in form mode
+				'__AMOUNT__', 
+				'__AMOUNT_WO_TAX__', 
+				'__AMOUNT_VAT__', 
+			    '__PERSONALIZED__',			// Paypal link will be added here in form mode
 				'__SIGNATURE__', 
 			);
+			if ($mode == 'formwithlines')
+			{
+			    $vars[] = '__LINES__';      // Will be set by the get_form function
+			}
+			if ($mode == 'formforlines')
+			{
+			    $vars[] = '__QUANTITY__';   // Will be set by the get_form function
+			}
 		}
 		if ($mode == 'emailing')
 		{
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 36d8772dccb..18c0373e993 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1623,6 +1623,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 897085ec423..93c3e584ff6 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -150,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+

From 5233b8c87ff7ca53ca31b7446b73f41d7ce6c7f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 12 Feb 2017 18:38:24 +0100
Subject: [PATCH 0257/1163] Fix support for option
 MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES

---
 htdocs/admin/mails_templates.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 78dd7aeba76..150f288e45d 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -94,12 +94,12 @@ if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfield[25]
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue=array();
 $tabfieldvalue[25]= "label,type_template,private,position,topic,content";
-if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfield[25].=',content_lines';
+if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfieldvalue[25].=',content_lines';
 
 // Nom des champs dans la table pour insertion d'un enregistrement
 $tabfieldinsert=array();
 $tabfieldinsert[25]= "label,type_template,private,position,topic,content";
-if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfield[25].=',content_lines';
+if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfieldinsert[25].=',content_lines';
 $tabfieldinsert[25].=',entity';     // Must be at end because not into other arrays
 
 // Nom du rowid si le champ n'est pas de type autoincrement
@@ -290,8 +290,8 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         $i = 0;
         foreach ($listfieldmodify as $field)
         {
-            if ($value == 'content') $_POST['content']=$_POST['content-'.$rowid];
-            if ($value == 'content_lines') $_POST['content_lines']=$_POST['content_lines-'.$rowid];
+            if ($field == 'content') $_POST['content']=$_POST['content-'.$rowid];
+            if ($field == 'content_lines') $_POST['content_lines']=$_POST['content_lines-'.$rowid];
             if ($field == 'entity') {
             	$_POST[$listfieldvalue[$i]] = $conf->entity;
             }
@@ -537,10 +537,9 @@ if ($action != 'edit')
     foreach ($fieldsforcontent as $tmpfieldlist)
     {
         print '<tr class="impair nodrag nodrop nohover"><td colspan="5">';
-        if ($tmpfieldlist == 'content')
-        {
-            print '<strong>'.$form->textwithpicto($langs->trans("Content"),$tabhelp[$id][$tmpfieldlist]).'</strong><br>';
-        }
+        if ($tmpfieldlist == 'content') print '<strong>'.$form->textwithpicto($langs->trans("Content"),$tabhelp[$id][$tmpfieldlist]).'</strong><br>';
+        if ($tmpfieldlist == 'content_lines') print '<strong>'.$form->textwithpicto($langs->trans("ContentForLines"),$tabhelp[$id][$tmpfieldlist]).'</strong><br>';
+    
         if ($context != 'hide')
         {
             //print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
@@ -640,7 +639,7 @@ if ($resql)
     {
         if (! in_array($field, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
     }
-    print '<td class="liste_titre"></td>';
+    if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';
     print '<td class="liste_titre"></td>';
     print '<td class="liste_titre"></td>';
     print '</tr>';
@@ -688,11 +687,11 @@ if ($resql)
                     // Show value for field
                     if ($showfield) {
                 
-                        print '</tr><tr '.$bc[$var].' nohover tr-'.$tmpfieldlist.'-'.($i+1).' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
+                        print '</tr><tr '.$bc[$var].' nohover tr-'.$tmpfieldlist.'-'.$rowid.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
                         $okforextended = true;
                         if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
                             $okforextended = false;
-                            $doleditor = new DolEditor($tmpfieldlist.'-'.($i+1), (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
+                            $doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
                             print $doleditor->Create(1);
                             print '</td>';
                             print '<td></td><td></td><td></td>';

From a8c5ba2983dadd12325ea7f4d2bb30700e539c8c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 12 Feb 2017 20:40:20 +0100
Subject: [PATCH 0258/1163] Fix php7 error

---
 htdocs/admin/modulehelp.php | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 6e93bbcda54..9ff7a4478ff 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -290,42 +290,6 @@ $moduledesc=$objMod->getDesc();
 $moduledesclong=$objMod->getDescLong();
 $moduleauthor=$objMod->getPublisher();
 
-// We discard showing according to filters
-if ($search_keyword)
-{
-    $qualified=0;
-    if (preg_match('/'.preg_quote($search_keyword).'/i', $modulename)
-        || preg_match('/'.preg_quote($search_keyword).'/i', $moduledesc)
-        || preg_match('/'.preg_quote($search_keyword).'/i', $moduledesclong)
-        || preg_match('/'.preg_quote($search_keyword).'/i', $moduleauthor)
-        ) $qualified=1;
-    if (! $qualified) continue;
-}
-if ($search_status)
-{
-    if ($search_status == 'active' && empty($conf->global->$const_name)) continue;
-    if ($search_status == 'disabled' && ! empty($conf->global->$const_name)) continue;
-}
-if ($search_nature)
-{
-    if (preg_match('/^external/',$search_nature) && $objMod->isCoreOrExternalModule() != 'external') continue;
-    if (preg_match('/^external_(.*)$/',$search_nature, $reg))
-    {
-        //print $reg[1].'-'.dol_escape_htmltag($objMod->getPublisher());
-        $publisher=dol_escape_htmltag($objMod->getPublisher());
-        if ($reg[1] && dol_escape_htmltag($reg[1]) != $publisher) continue;
-        if (! $reg[1] && ! empty($publisher)) continue;
-    }
-    if ($search_nature == 'core' && $objMod->isCoreOrExternalModule() == 'external') continue;
-}
-if ($search_version)
-{
-    if (($objMod->version == 'development' || $objMod->version == 'experimental' || preg_match('/deprecated/', $objMod->version)) && $search_version == 'stable') continue;
-    if ($objMod->version != 'development'  && ($search_version == 'development')) continue;
-    if ($objMod->version != 'experimental' && ($search_version == 'experimental')) continue;
-    if (! preg_match('/deprecated/', $objMod->version) && ($search_version == 'deprecated')) continue;
-}
-
 // Load all lang files of module
 if (isset($objMod->langfiles) && is_array($objMod->langfiles))
 {

From 4a19c14034ff512dd8311df1e98fca0331c7a7d2 Mon Sep 17 00:00:00 2001
From: a-schild <andre@schild.ws>
Date: Mon, 13 Feb 2017 09:33:01 +0100
Subject: [PATCH 0259/1163] Use correct numeric format for all soldes

---
 htdocs/accountancy/bookkeeping/balance.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 15345a99b72..bb7d049f08e 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -255,9 +255,9 @@ else {
         
         print '<td>' . length_accountg($line->numero_compte) . '</td>';
         print '<td>' . $description . '</td>';
-        print '<td align="right">' . number_format($line->debit, 2, ',', ' ') . '</td>';
-        print '<td align="right">' . number_format($line->credit, 2, ',', ' ') . '</td>';
-        print '<td align="right">' . number_format($line->credit - $line->debit, 2, ',', ' ') . '</td>';
+        print '<td align="right">' . price($line->debit, 2, ',', ' ') . '</td>';
+        print '<td align="right">' . price($line->credit, 2, ',', ' ') . '</td>';
+        print '<td align="right">' . price($line->credit - $line->debit, 2, ',', ' ') . '</td>';
         print '<td align="center">' . $link;
         print '</td>';
         print "</tr>\n";

From 89c80a45c285a52d6c1303a2203b281e8aeee5a6 Mon Sep 17 00:00:00 2001
From: a-schild <andre@schild.ws>
Date: Mon, 13 Feb 2017 09:34:35 +0100
Subject: [PATCH 0260/1163] Use correct numeric format for all soldes

---
 htdocs/accountancy/bookkeeping/balance.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index bb7d049f08e..53eaaba7c9c 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -255,9 +255,9 @@ else {
         
         print '<td>' . length_accountg($line->numero_compte) . '</td>';
         print '<td>' . $description . '</td>';
-        print '<td align="right">' . price($line->debit, 2, ',', ' ') . '</td>';
-        print '<td align="right">' . price($line->credit, 2, ',', ' ') . '</td>';
-        print '<td align="right">' . price($line->credit - $line->debit, 2, ',', ' ') . '</td>';
+        print '<td align="right">' . price($line->debit) . '</td>';
+        print '<td align="right">' . price($line->credit) . '</td>';
+        print '<td align="right">' . price($line->credit - $line->debit) . '</td>';
         print '<td align="center">' . $link;
         print '</td>';
         print "</tr>\n";

From 5de0d81dff43a8fbb76e4b3a66819314adca5c32 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 13 Feb 2017 10:59:33 +0100
Subject: [PATCH 0261/1163] Can force option according to country

---
 build/generate_filelist_xml.php | 37 +++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index 36ea0e9542b..ff580fad58c 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -44,8 +44,8 @@ $includeconstants=array();
 
 if (empty($argv[1])) 
 {
-    print "Usage:   ".$script_file." release=x.y.z[-...] [includecustom=1] [includeconstant=MY_CONF_NAME:value]\n";
-    print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=MAILING_NO_USING_PHPMAIL:1\n";
+    print "Usage:   ".$script_file." release=x.y.z[-...] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+    print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=FR:INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n";
     exit -1;
 }
 $i=0;
@@ -54,8 +54,13 @@ while ($i < $argc)
     if (! empty($argv[$i])) parse_str($argv[$i]);
     if (preg_match('/includeconstant=/',$argv[$i]))
     {
-        $tmp=explode(':', $includeconstant);
-        if (count($tmp) == 2) $includeconstants[$tmp[0]] = $tmp[1];
+        $tmp=explode(':', $includeconstant, 3);
+        if (count($tmp) != 3) 
+        {
+            print "Error: Bad parameter includeconstant ".$includeconstant."\n";
+            exit -1;
+        }
+        $includeconstants[$tmp[0]][$tmp[1]] = $tmp[2];
     }
     $i++;
 }
@@ -84,9 +89,12 @@ else
 print "Release          : ".$release."\n";
 print "Include custom   : ".$includecustom."\n";
 print "Include constants: ";
-foreach ($includeconstants as $constname => $constvalue)
+foreach ($includeconstants as $countrycode => $tmp)
 {
-    print $constname.'='.$constvalue." ";
+    foreach($tmp as $constname => $constvalue)
+    {
+        print $constname.'='.$constvalue." ";
+    }
 }
 print "\n";
 
@@ -100,16 +108,19 @@ $checksumconcat=array();
 $outputfile=$outputdir.'/filelist-'.$release.'.xml';
 $fp = fopen($outputfile,'w');
 fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
-fputs($fp, '<checksum_list version="'.$release.'">'."\n");
+fputs($fp, '<checksum_list version="'.$release.'" date="'.dol_print_date(dol_now(), 'dayhourrfc').'" generator="'.$script_file.'">'."\n");
 
-fputs($fp, '<dolibarr_constants>'."\n");
-foreach($includeconstants as $constname => $constvalue)
+foreach ($includeconstants as $countrycode => $tmp)
 {
-    $valueforchecksum=(empty($constvalue)?'0':$constvalue);
-    $checksumconcat[]=$valueforchecksum;
-    fputs($fp, '    <constant name="'.$constname.'" value="'.$valueforchecksum.'">'.$valueforchecksum.'</constant>'."\n");
+    fputs($fp, '<dolibarr_constants country="'.$countrycode.'">'."\n");
+    foreach($tmp as $constname => $constvalue)
+    {
+        $valueforchecksum=(empty($constvalue)?'0':$constvalue);
+        $checksumconcat[]=$valueforchecksum;
+        fputs($fp, '    <constant name="'.$constname.'">'.$valueforchecksum.'</constant>'."\n");
+    }
+    fputs($fp, '</dolibarr_constants>'."\n");
 }
-fputs($fp, '</dolibarr_constants>'."\n");
 
 fputs($fp, '<dolibarr_htdocs_dir includecustom="'.$includecustom.'">'."\n");
 

From 977c18513da7181b1737324b17d6084503ec77a5 Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Tue, 14 Feb 2017 12:00:56 +0100
Subject: [PATCH 0262/1163] FIX pdf supplier payment work

---
 htdocs/admin/supplier_payment.php             |  6 +--
 htdocs/core/class/conf.class.php              |  3 ++
 htdocs/core/lib/files.lib.php                 | 10 +++++
 .../supplier_payment/pdf/pdf_cow.modules.php  | 12 +++---
 htdocs/fourn/class/paiementfourn.class.php    | 43 +++++++++++++++++++
 htdocs/fourn/paiement/card.php                | 36 ++++++++++++++--
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 +
 .../mysql/tables/llx_paiementfourn.sql        |  3 +-
 8 files changed, 101 insertions(+), 14 deletions(-)

diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 5cd1877ddb4..933ee22a062 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -130,8 +130,8 @@ else if ($action == 'specimen')
 {
     $modele=GETPOST('module','alpha');
 
-    $facture = new Facture($db);
-    $facture->initAsSpecimen();
+    $paiementFourn = new PaiementFourn($db);
+    $paiementFourn->initAsSpecimen();
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
@@ -153,7 +153,7 @@ else if ($action == 'specimen')
 
     	$module = new $classname($db);
 
-    	if ($module->write_file($facture,$langs) > 0)
+    	if ($module->write_file($paiementFourn,$langs) > 0)
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_payment&file=SPECIMEN.pdf");
     		return;
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 064beaa8226..82146bfe4b4 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -345,6 +345,9 @@ class Conf
 			$this->fournisseur->facture=new stdClass();
 			$this->fournisseur->facture->dir_output =$rootfordata."/fournisseur/facture";
 			$this->fournisseur->facture->dir_temp   =$rootfordata."/fournisseur/facture/temp";
+			$this->fournisseur->payment=new stdClass();
+			$this->fournisseur->payment->dir_output =$rootfordata."/fournisseur/payment";
+			$this->fournisseur->payment->dir_temp   =$rootfordata."/fournisseur/payment/temp";
 
 			// To prepare split of module fournisseur into fournisseur + supplier_order + supplier_invoice
 			if (! empty($this->fournisseur->enabled) && empty($this->global->MAIN_USE_NEW_SUPPLIERMOD))  // By default, if module supplier is on, we set new properties
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 1f7974775b5..d48b7d9d1f3 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1874,6 +1874,16 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
+	// Wrapping pour les rapport de paiements
+	else if ($modulepart == 'supplier_payment')
+	{
+		if ($fuser->rights->fournisseur->facture->lire || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->fournisseur->payment->dir_output.'/'.$original_file;
+		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."paiementfournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+	}
 
 	// Wrapping pour les rapport de paiements
 	else if ($modulepart == 'facture_paiement')
diff --git a/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php b/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
index a7b9da6ded8..9f87b9870e4 100644
--- a/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
+++ b/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
@@ -24,7 +24,7 @@
  *	\brief      Class file to generate the supplier invoices with the canelle model
  */
 
-require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -157,13 +157,11 @@ class pdf_cow extends ModelePDFSuppliersPayments
 		$outputlangs->load("bills");
 		$outputlangs->load("products");
 
-		if ($conf->fournisseur->dir_output.'/facture')
+		if ($conf->fournisseur->payment->dir_output)
 		{
 			$object->fetch_thirdparty();
-
-			$deja_regle = $object->getSommePaiement();
-            //$amount_credit_notes_included = $object->getSumCreditNotesUsed();
-            //$amount_deposits_included = $object->getSumDepositsUsed();
+			
+			$total = $object->montant;
 
 			// Definition of $dir and $file
 			if ($object->specimen)
@@ -175,7 +173,7 @@ class pdf_cow extends ModelePDFSuppliersPayments
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
-                $dir = $conf->fournisseur->payment->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'supplier_payment').$objectref;
+                $dir = $conf->fournisseur->payment->dir_output.'/'.$objectref;
 				$file = $dir . "/" . $objectref . ".pdf";
 				if (! empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir . "/" . $objectref . ($objectrefsupplier?"_".$objectrefsupplier:"").".pdf";
 			}
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 738c0eb716f..5d8279b1c54 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -660,6 +660,49 @@ class PaiementFourn extends Paiement
 		}
 	}
 
+	/**
+	 *	Create a document onto disk according to template model.
+	 *
+	 *	@param	    string		$modele			Force template to use ('' to not force)
+	 *	@param		Translate	$outputlangs	Object lang a utiliser pour traduction
+	 *  @param      int			$hidedetails    Hide details of lines
+	 *  @param      int			$hidedesc       Hide description
+	 *  @param      int			$hideref        Hide ref
+	 *  @return     int         				<0 if KO, 0 if nothing done, >0 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	{
+		global $conf, $user, $langs;
+
+		$langs->load("suppliers");
+
+		// Set the model on the model name to use
+		if (empty($modele))
+		{
+			if (! empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF))
+			{
+				$modele = $conf->global->SUPPLIER_PAYMENT_ADDON_PDF;
+			}
+			else
+			{
+				$modele = '';       // No default value. For supplier invoice, we allow to disable all PDF generation
+			}
+		}
+
+		if (empty($modele))
+		{
+		    return 0;
+		}
+		else
+		{
+            $modelpath = "core/modules/supplier_payment/pdf/";
+
+            return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		}
+	}
+
+
+
 	/**
 	 * 	get the right way of payment
 	 * 
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 16e5dd1892e..9cb44a92bb8 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -43,6 +43,11 @@ $confirm	= GETPOST('confirm','alpha');
 
 $object = new PaiementFourn($db);
 
+// PDF
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
+
 /*
  * Actions
  */
@@ -134,6 +139,32 @@ if ($action == 'setdatep' && ! empty($_POST['datepday']))
 	}
 }
 
+// Build document
+if ($action == 'builddoc')
+{
+	// Save modele used
+    $object->fetch($id);
+    $object->fetch_thirdparty();
+
+	// Save last template used to generate document
+	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+
+    $outputlangs = $langs;
+    $newlang=GETPOST('lang_id','alpha');
+    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
+    if (! empty($newlang))
+    {
+        $outputlangs = new Translate("",$conf);
+        $outputlangs->setDefaultLang($newlang);
+    }
+	$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    if ($result	< 0)
+    {
+		setEventMessages($object->error, $object->errors, 'errors');
+	    $action='';
+    }
+}
+
 
 /*
  * View
@@ -353,14 +384,13 @@ if ($result > 0)
      * Documents generes
      */
     $ref=dol_sanitizeFileName($object->ref);
-    $subdir = get_exdir($object->id,2,0,0,$object,'supplier_payment').$ref;
-    $filedir = $conf->fournisseur->paiement->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'supplier_payment').$ref;
+    $filedir = $conf->fournisseur->payment->dir_output.'/'.dol_sanitizeFileName($object->ref);
     $urlsource=$_SERVER['PHP_SELF'].'?id='.$object->id;
     $genallowed=$user->rights->fournisseur->facture->creer;
     $delallowed=$user->rights->fournisseur->facture->supprimer;
     $modelpdf=(! empty($object->modelpdf)?$object->modelpdf:(empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF)?'':$conf->global->SUPPLIER_PAYMENT_ADDON_PDF));
 
-    print $formfile->showdocuments('supplier_payment',$subdir,$filedir,$urlsource,$genallowed,$delallowed,$modelpdf,1,0,0,40,0,'','','',$societe->default_lang);
+    print $formfile->showdocuments('supplier_payment',$ref,$filedir,$urlsource,$genallowed,$delallowed,$modelpdf,1,0,0,40,0,'','','',$societe->default_lang);
     $somethingshown=$formfile->numoffiles;
 
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index aa755daa09a..e7803281e67 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -98,3 +98,5 @@ CREATE TABLE llx_product_attribute_combination
   entity INT DEFAULT 1 NOT NULL
 );
 
+ALTER TABLE llx_paiementfourn ADD COLUMN model_pdf varchar(255);
+
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql
index aba54627a09..0e9b1885c97 100644
--- a/htdocs/install/mysql/tables/llx_paiementfourn.sql
+++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql
@@ -32,5 +32,6 @@ create table llx_paiementfourn
   num_paiement      varchar(50),       -- numero de paiement (cheque)
   note              text,
   fk_bank           integer NOT NULL,
-  statut			smallint NOT NULL DEFAULT 0
+  statut			smallint NOT NULL DEFAULT 0,
+  model_pdf         varchar(255)
 )ENGINE=innodb;

From eb70d6eea122b09d8869b576a74f2f0a136ff8c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 14 Feb 2017 18:04:12 +0100
Subject: [PATCH 0263/1163] Debug of feature for browser notifications

---
 htdocs/core/ajax/check_notifications.php | 64 +++++++++++++++++-------
 htdocs/core/class/conf.class.php         |  2 +
 htdocs/core/js/lib_notification.js.php   | 49 +++++++++---------
 htdocs/main.inc.php                      |  2 +-
 htdocs/user/class/user.class.php         |  3 --
 5 files changed, 73 insertions(+), 47 deletions(-)

diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index af56cb23700..4db67aef939 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -24,31 +24,57 @@ if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 global $user, $db, $langs, $conf;
 
-$time = GETPOST('time');
+$time = (int) GETPOST('time');    // Use the time parameter that is always increased by time_update, even if call is late
 //$time=dol_now();
 
-session_start();
 
-$time_update = (empty($conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)?'3':(int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY);
+$eventfound = array();
+//Uncomment this to force a test
+//$eventfound[]=array('type'=>'agenda', 'id'=>1, 'tipo'=>'eee', 'location'=>'aaa');
 
-$eventos = array();
-//$eventos[]=array('type'=>'agenda', 'id'=>1, 'tipo'=>'eee', 'location'=>'aaa');
+//dol_syslog('time='.$time.' $_SESSION[auto_ck_events_not_before]='.$_SESSION['auto_check_events_not_before']);
 
-// TODO Remove test on session. Timer should be managed by a javascript timer
-if ($_SESSION['auto_check_events'] <= (int) $time) 
+// TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when several tabs are opened.
+if ($time >= $_SESSION['auto_check_events_not_before']) 
 {
-    $_SESSION['auto_check_events'] = $time + $time_update;
-
+    $time_update = (int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY;   // Always defined
+    if (! empty($_SESSION['auto_check_events_not_before'])) 
+    {
+        // We start scan from the not before so if two tabs were opend at differents seconds and we close one (so the js timer),
+        // then we are not losing periods 
+        $starttime = $_SESSION['auto_check_events_not_before'];
+        // Protection to avoid too long sessions
+        if ($starttime < ($time - (int) $conf->global->MAIN_SESSION_TIMEOUT)) 
+        {
+            dol_syslog("We ask to check browser notification on a too large period. We fix this with current date.");
+            $starttime = $time;
+        }
+    }
+    else 
+    {
+        $starttime = $time;
+    }
+    
+    $_SESSION['auto_check_events_not_before'] = $time + $time_update;
+    
+    // Force save of session change we did. 
+    // WARNING: Any change in sessions after that will not be saved !
+    session_write_close();
+    
+    require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+	
+    
+    dol_syslog('NEW $_SESSION[auto_check_events_not_before]='.$_SESSION['auto_check_events_not_before']);
+    
     $sql = 'SELECT id';
     $sql .= ' FROM ' . MAIN_DB_PREFIX . 'actioncomm a, ' . MAIN_DB_PREFIX . 'actioncomm_resources ar';
     $sql .= ' WHERE a.id = ar.fk_actioncomm';
-    // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when.
-    // This need to extend period to be sure to not miss and save what we notified to avoid duplicate (save is not done yet).
-    $sql .= " AND datep BETWEEN '" . $db->idate($time + 1) . "' AND '" . $db->idate($time + $time_update) . "'";
+    // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when several tabs are opened.
+    // This need to extend period to be sure to not miss and save in session what we notified to avoid duplicate (save is not done yet).
+    $sql .= " AND datep BETWEEN '" . $db->idate($starttime) . "' AND '" . $db->idate($time + $time_update - 1) . "'";
     $sql .= ' AND a.code <> "AC_OTH_AUTO"';
     $sql .= ' AND ar.element_type = "user"';
     $sql .= ' AND ar.fk_element = ' . $user->id;
@@ -59,8 +85,10 @@ if ($_SESSION['auto_check_events'] <= (int) $time)
 
         $actionmod = new ActionComm($db);
 
-        while ($obj = $db->fetch_object($resql)) {
-
+        while ($obj = $db->fetch_object($resql)) 
+        {
+            $langs->load("agenda");
+            
             $actionmod->fetch($obj->id);
 
             $event = array();
@@ -68,13 +96,13 @@ if ($_SESSION['auto_check_events'] <= (int) $time)
             $event['id'] = $actionmod->id;
             $event['tipo'] = $langs->transnoentities('Action' . $actionmod->code);
             $event['titulo'] = $actionmod->label;
-            $event['location'] = $actionmod->location;
+            $event['location'] = $langs->transnoentities('Location').': '.$actionmod->location;
             
-            $eventos[] = $event;
+            $eventfound[] = $event;
         }
     }
 
 }
 
-print json_encode($eventos);
+print json_encode($eventfound);
 
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 064beaa8226..bb63e4c3560 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -420,6 +420,8 @@ class Conf
 		if (empty($this->global->MAIN_MONNAIE)) $this->global->MAIN_MONNAIE='EUR';
 		$this->currency=$this->global->MAIN_MONNAIE;
 
+		if (empty($conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30;   // Less than 1 minutes to be sure
+		
 		// conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)
         if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE='RECETTES-DEPENSES';  // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
 
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index a870066c775..af8e0492cdc 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -35,20 +35,23 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['HT
     // Define javascript type
     header('Content-type: text/javascript; charset=UTF-8');
 
+    $nowtime = time();
+    //$nowtimeprevious = floor($nowtime / 60) * 60;   // auto_check_events_not_before is rounded to previous minute
+
     // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when.
     session_cache_limiter(FALSE);
     header('Cache-Control: no-cache');
     session_start();
-    if (!isset($_SESSION['auto_check_events'])) {
-        // Round to eliminate the second part
-        $_SESSION['auto_check_events'] = floor(time() / 60) * 60;
-        print 'var time_session = ' . $_SESSION['auto_check_events'] . ';'."\n";
-        print 'var now = ' . $_SESSION['auto_check_events'] . ';' . "\n";
-    } else {
-        print 'var time_session = ' . $_SESSION['auto_check_events'] . ';' . "\n";
-        print 'var now = ' . time() . ';' . "\n";
+    if (! isset($_SESSION['auto_check_events_not_before'])) 
+    {
+        print 'console.log("_SESSION[auto_check_events_not_before] is not set");'."\n";
+        // Round to eliminate the seconds
+        $_SESSION['auto_check_events_not_before'] = $nowtime;   // auto_check_events_not_before is rounded to previous minute
     }
-    print 'var time_auto_update = '.(empty($conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)?'3':(int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY).';' . "\n";
+    print 'var nowtime = ' . $nowtime . ';' . "\n";
+    print 'var auto_check_events_not_before = '.$_SESSION['auto_check_events_not_before']. ';'."\n";
+    print 'var time_js_next_test = Math.max(nowtime, auto_check_events_not_before);'."\n";
+    print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY;   // Always defined
     ?>
 	
 	/* Check if permission ok */
@@ -56,31 +59,27 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['HT
         Notification.requestPermission()
     }
 
-    if (now > (time_session + time_auto_update) || now == time_session) {
-
-        first_execution(); //firts run auto check
-    } else {
-
-        var time_first_execution = (time_auto_update - (now - time_session)) * 1000;	//need milliseconds
-
-        setTimeout(first_execution, time_first_execution); //first run auto check
-    }
+	/* Launch timer */
+   	// We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
+    var time_first_execution = (time_auto_update - (nowtime - time_js_next_test)) * 1000;	//need milliseconds
+    console.log("Launch browser notif check: setTimeout to wait time_first_execution="+time_first_execution+" before first check - nowtime = "+nowtime+" auto_check_events_not_before = "+auto_check_events_not_before+" time_js_next_test = "+time_js_next_test+" time_auto_update="+time_auto_update);
+    setTimeout(first_execution, time_first_execution); //first run auto check
 
 
     function first_execution() {
-    	console.log("Call first_execution");
-        check_events();
-        setInterval(check_events, time_auto_update * 1000); //program time for run check events
+    	console.log("Call first_execution time_auto_update (MAIN_BROWSER_NOTIFICATION_FREQUENCY) = "+time_auto_update);
+        check_events();	//one check before launching timer to launch other checks
+        setInterval(check_events, time_auto_update * 1000); //program time to run next check events
     }
 
     function check_events() {
     	if (Notification.permission === "granted")
     	{
-    		console.log("Call check_events");
+    		console.log("Call check_events time_js_next_test="+time_js_next_test);
             $.ajax("<?php print dol_buildpath('/core/ajax/check_notifications.php', 1); ?>", {
                 type: "post",   // Usually post o get
                 async: true,
-                data: {time: time_session},
+                data: {time: time_js_next_test},
                 success: function (result) {
                     var arr = JSON.parse(result);
                     if (arr.length > 0) {
@@ -95,7 +94,7 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['HT
                             var title="Not defined";
                             var body = value['tipo'] + ': ' + value['titulo'];
                             if (value['type'] == 'agenda' && value['location'] != null && value['location'] != '') {
-                                body += '\n <?php print $langs->transnoentities('Location')?>: ' + value['location'];
+                                body += '\n' + value['location'];
                             }
     
                             if (value['type'] == 'agenda')
@@ -132,7 +131,7 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['HT
         	console.log("Cancel check_events. Useless because Notification.permission is "+Notification.permission);
         }
 
-        time_session += time_auto_update;
+        time_js_next_test += time_auto_update;
     }
 <?php 
 }
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index b5e1122acfb..b53f8d12ccf 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1307,7 +1307,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             
             // Browser notifications
             $enablebrowsernotif=false;
-            if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_NOTIFICATION) && ! empty($conf->global->AGENDA_NOTIFICATION_SOUND)) $enablebrowsernotif=true;
+            if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_NOTIFICATION)) $enablebrowsernotif=true;
             if ($enablebrowsernotif)
             {
                 print '<!-- Includes JS of Dolibarr -->'."\n";
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 8281ef244d1..f087fc3db9b 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -235,7 +235,6 @@ class User extends CommonObject
 			$sql.= " AND u.rowid = ".$id;
 		}
 
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -618,7 +617,6 @@ class User extends CommonObject
 		$sql.= " AND r.perms IS NOT NULL";
 		if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'";
 
-		dol_syslog(get_class($this).'::getrights', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -670,7 +668,6 @@ class User extends CommonObject
 		$sql.= " AND r.perms IS NOT NULL";
 		if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'";
 
-		dol_syslog(get_class($this).'::getrights', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{

From a12a094172256eb9b704e01490516684452fa4da Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Wed, 15 Feb 2017 01:11:25 +0100
Subject: [PATCH 0264/1163] $usemargins not used on global

because it's defined on the tpl file (line 42)
---
 htdocs/core/tpl/objectline_view.tpl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 891694670f4..1971532433a 100755
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -36,7 +36,7 @@
  * $type, $text, $description, $line
  */
 
-global $forceall, $senderissupplier, $inputalsopricewithtax, $usemargins, $outputalsopricetotalwithtax;
+global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax;
 
 $usemargins=0;
 if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
@@ -46,7 +46,7 @@ if (empty($forceall)) $forceall=0;
 if (empty($senderissupplier)) $senderissupplier=0;
 if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
 if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax=0;
-if (empty($usemargins)) $usemargins=0;
+
 ?>
 <?php $coldisplay=0; ?>
 <!-- BEGIN PHP TEMPLATE objectline_view.tpl.php -->

From 692dd0b5dbb9fbb5c51215b5443a84c39d70fd3a Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Wed, 15 Feb 2017 01:22:20 +0100
Subject: [PATCH 0265/1163] contact email not display on tooltip

field not initialised
---
 htdocs/contact/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 3fbd4fa462d..6091171dfe6 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -659,6 +659,7 @@ while ($i < min($num,$limit))
 	$contactstatic->id=$obj->cidp;
 	$contactstatic->statut=$obj->statut;
 	$contactstatic->poste=$obj->poste;
+	$contactstatic->email=$obj->email;
 	$contactstatic->phone_pro=$obj->phone_pro;
 	$contactstatic->phone_perso=$obj->phone_perso;
 	$contactstatic->phone_mobile=$obj->phone_mobile;

From 5ec01b3175625c9623c6b00353e738ff44c1cbea Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Wed, 15 Feb 2017 11:41:09 +0100
Subject: [PATCH 0266/1163] NEW : Can send email to multiple destinaries from
 mailform

---
 htdocs/core/actions_sendmails.inc.php     | 86 ++++++++++++++++-------
 htdocs/core/class/html.formmail.class.php |  4 +-
 htdocs/societe/class/societe.class.php    |  2 +-
 3 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 28799231fdd..aad57a90894 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -160,24 +160,33 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 
 	if ($result > 0)
 	{
+		$receiver=$_POST['receiver'];
+		$sendto_array=array();
+		
 		if (trim($_POST['sendto']))
 		{
 			// Recipient is provided into free text
 			$sendto = trim($_POST['sendto']);
-			$sendtoid = 0;
+			$sendtoid = array();
 		}
-		elseif ($_POST['receiver'] != '-1')
+		elseif (count($receiver)>0)
 		{
-			// Recipient was provided from combo list
-			if ($_POST['receiver'] == 'thirdparty') // Id of third party
-			{
-				$sendto = $thirdparty->name.' <'.$thirdparty->email.'>';
-				$sendtoid = 0;
+			foreach($receiver as $key=>$val) {
+				// Recipient was provided from combo list
+				if ($val == 'thirdparty') // Id of third party
+				{
+					$sendto_array[] = $thirdparty->name.' <'.$thirdparty->email.'>';
+					$sendtoid = array();
+				}
+				else	// Id du contact
+				{
+					$sendto_array[] = $thirdparty->contact_get_property((int) $val,'email');
+					$sendtoid[] = $val;
+				}
 			}
-			else	// Id du contact
-			{
-				$sendto = $thirdparty->contact_get_property((int) $_POST['receiver'],'email');
-				$sendtoid = $_POST['receiver'];
+			
+			if (count($sendto_array)>0) {
+				$sendto=implode(',',$sendto_array);
 			}
 		}
 		if (trim($_POST['sendtocc']))
@@ -339,22 +348,45 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					// Initialisation of datas
 					if (is_object($object))
 					{
-    					$object->socid			= $sendtosocid;	// To link to a company
-    					$object->sendtoid		= $sendtoid;	// To link to a contact/address
-    					$object->actiontypecode	= $actiontypecode;
-    					$object->actionmsg		= $actionmsg;  // Long text
-    					$object->actionmsg2		= $actionmsg2; // Short text
-    					$object->trackid        = $trackid;
-    					$object->fk_element		= $object->id;
-    					$object->elementtype	= $object->element;
-    
-    					// Call of triggers
-    					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    					$interface=new Interfaces($db);
-    					$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
-    					if ($result < 0) {
-    						$error++; $errors=$interface->errors;
-    					}
+						//multiple contact sends
+						if (count($sendtoid) >0) {
+							foreach($sendtoid as $val_id) {
+		    					$object->socid			= $sendtosocid;	// To link to a company
+		    					$object->sendtoid		= $val_id;	// To link to a contact/address
+		    					$object->actiontypecode	= $actiontypecode;
+		    					$object->actionmsg		= $actionmsg;  // Long text
+		    					$object->actionmsg2		= $actionmsg2; // Short text
+		    					$object->trackid        = $trackid;
+		    					$object->fk_element		= $object->id;
+		    					$object->elementtype	= $object->element;
+		    
+		    					// Call of triggers
+		    					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+		    					$interface=new Interfaces($db);
+		    					$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
+		    					if ($result < 0) {
+		    						$error++; $errors=$interface->errors;
+		    					}
+							}
+						} else {
+							//Thirdparty send
+							$object->socid			= $sendtosocid;	// To link to a company
+							$object->sendtoid		= 0;	// To link to a contact/address
+							$object->actiontypecode	= $actiontypecode;
+							$object->actionmsg		= $actionmsg;  // Long text
+							$object->actionmsg2		= $actionmsg2; // Short text
+							$object->trackid        = $trackid;
+							$object->fk_element		= $object->id;
+							$object->elementtype	= $object->element;
+							
+							// Call of triggers
+							include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+							$interface=new Interfaces($db);
+							$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
+							if ($result < 0) {
+								$error++; $errors=$interface->errors;
+							}
+						}
     					// End call of triggers
 					}
 					
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index a85b8157732..f344e3ca9b1 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -521,7 +521,7 @@ class FormMail extends Form
         			if (! empty($this->withto) && is_array($this->withto))
         			{
         				if (! empty($this->withtofree)) $out.= " ".$langs->trans("or")." ";
-        				$out.= $form->selectarray("receiver", $this->withto, GETPOST("receiver"), 1, 0, 0, '', 0, 0, 0, '', '', 0, '', $disablebademails);
+        				$out.= $form->multiselectarray("receiver", $this->withto, GETPOST("receiver"), null, null, null,null, "90%");
         			}
         			if (isset($this->withtosocid) && $this->withtosocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
         			{
@@ -533,7 +533,7 @@ class FormMail extends Form
         					$liste[$key]=$value;
         				}
         				if ($this->withtofree) $out.= " ".$langs->trans("or")." ";
-        				$out.= $form->selectarray("receiver", $liste, GETPOST("receiver"), 1, 0, 0, '', 0, 0, 0, '', '', 0, '', $disablebademails);
+        				$out.= $form->multiselectarray("receiver", $liste, GETPOST("receiver"));
         			}
         		}
         		$out.= "</td></tr>\n";
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 86fb2d88a1e..656a886c13c 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2026,7 +2026,7 @@ class Societe extends CommonObject
         if ($this->email && $addthirdparty)
         {
             if (empty($this->name)) $this->name=$this->nom;
-            $contact_emails['thirdparty']=$langs->trans("ThirdParty").': '.dol_trunc($this->name,16)." &lt;".$this->email."&gt;";
+            $contact_emails['thirdparty']=$langs->trans("ThirdParty").': '.dol_trunc($this->name,16)." (".$this->email.")";
         }
         return $contact_emails;
     }

From a98e5b7290232e412975845f836650762e308289 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Wed, 15 Feb 2017 11:46:36 +0100
Subject: [PATCH 0267/1163] fix syntax

---
 htdocs/core/class/html.formmail.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index f344e3ca9b1..69cda9eb3af 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -533,7 +533,7 @@ class FormMail extends Form
         					$liste[$key]=$value;
         				}
         				if ($this->withtofree) $out.= " ".$langs->trans("or")." ";
-        				$out.= $form->multiselectarray("receiver", $liste, GETPOST("receiver"));
+        				$out.= $form->multiselectarray("receiver", $liste, GETPOST("receiver"), null, null, null,null, "90%");
         			}
         		}
         		$out.= "</td></tr>\n";

From 380333070151cd2918aa7a954cf4b58f53877fde Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 15 Feb 2017 18:09:45 +0100
Subject: [PATCH 0268/1163] NEW Add option PROJECT_THIRDPARTY_REQUIRED

---
 htdocs/projet/card.php                | 12 ++++++++++--
 htdocs/projet/class/project.class.php |  8 +++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 6221e4c2b87..91f57056ec3 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -507,7 +507,11 @@ if ($action == 'create' && $user->rights->projet->creer)
     // Thirdparty
     if ($conf->societe->enabled)
     {
-        print '<tr><td>'.$langs->trans("ThirdParty").'</td><td class="maxwidthonsmartphone">';
+        print '<tr><td>';
+        print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED)?'':'<span class="fieldrequired">');
+        print $langs->trans("ThirdParty");
+        print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED)?'':'</span>');
+        print '</td><td class="maxwidthonsmartphone">';
         $filteronlist='';
         if (! empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist=$conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
        	$text=$form->select_thirdparty_list(GETPOST('socid','int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), '', 0, 0, 'minwidth300');
@@ -719,7 +723,11 @@ elseif ($object->id > 0)
         // Thirdparty
         if ($conf->societe->enabled)
         {
-            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
+            print '<tr><td>';
+            print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED)?'':'<span class="fieldrequired">');
+            print $langs->trans("ThirdParty");
+            print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED)?'':'</span>');
+            print '</td><td>';
     	    $filteronlist='';
     	    if (! empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist=$conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
             $text=$form->select_thirdparty_list($object->thirdparty->id, 'socid', $filteronlist, 'None', 1, 0, array(), '', 0, 0, 'minwidth300');
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index edd4c6eed12..1afac184b64 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -139,7 +139,13 @@ class Project extends CommonObject
             dol_syslog(get_class($this)."::create error -1 ref null", LOG_ERR);
             return -1;
         }
-
+        if (! empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) && ! $this->socid > 0)
+        {
+            $this->error = 'ErrorFieldsRequired';
+            dol_syslog(get_class($this)."::create error -1 ref null", LOG_ERR);
+            return -1;
+        }
+        
         $this->db->begin();
 
         $sql = "INSERT INTO " . MAIN_DB_PREFIX . "projet (";

From c06aedc54da2dadd3d01e8dd3c5200ea847ed8c3 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 15 Feb 2017 20:55:52 +0100
Subject: [PATCH 0269/1163] [FP17] : Add data in llx_accountancy_journal

---
 htdocs/install/mysql/data/llx_accounting.sql           | 8 +++++++-
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql         | 6 ++++++
 htdocs/install/mysql/tables/llx_accounting_journal.sql | 4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql
index 149d7fea394..dc7aeb27bef 100644
--- a/htdocs/install/mysql/data/llx_accounting.sql
+++ b/htdocs/install/mysql/data/llx_accounting.sql
@@ -5,7 +5,7 @@
 -- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
 -- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
 -- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
--- Copyright (C) 2011-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+-- Copyright (C) 2011-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -29,7 +29,13 @@
 
 delete from llx_accounting_account;
 delete from llx_accounting_system;
+delete from llx_accounting_journal;
 
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Journal des ventes', 1, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Journal des achats', 2, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Journal de banque', 3, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 4, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Journal des à-nouveaux', 9, 1);
 --
 -- Descriptif des plans comptables FR PCG99-ABREGE
 --
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index aa755daa09a..0d47261503c 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -98,3 +98,9 @@ CREATE TABLE llx_product_attribute_combination
   entity INT DEFAULT 1 NOT NULL
 );
 
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Journal des ventes', 1, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Journal des achats', 2, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Journal de banque', 3, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 4, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Journal des à-nouveaux', 9, 1);
+
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.sql b/htdocs/install/mysql/tables/llx_accounting_journal.sql
index bc514f0ed9b..f3ee2a2e010 100644
--- a/htdocs/install/mysql/tables/llx_accounting_journal.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_journal.sql
@@ -1,5 +1,5 @@
 -- ============================================================================
--- Copyright (C) 2016	 Alexandre Spangaro	 <aspangaro.dolibarr@gmail.com>
+-- Copyright (C) 2016-2017	Alexandre Spangaro	 <aspangaro@zendsi.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -22,6 +22,6 @@ create table llx_accounting_journal
   rowid             integer AUTO_INCREMENT PRIMARY KEY,
   code       		varchar(32) NOT NULL,
   label             varchar(128) NOT NULL,
-  nature			smallint DEFAULT 0 NOT NULL,			-- type of journals (Sale / purchase / bank / various operations)
+  nature			smallint DEFAULT 0 NOT NULL,			-- type of journals (1:Sale / 2:purchase / 3:bank / 4:various operations / 9: has-new)
   active            smallint DEFAULT 0
 )ENGINE=innodb;

From a1ba4aa9419e1998997de6ef1de559104009e4bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 16 Feb 2017 02:27:07 +0100
Subject: [PATCH 0270/1163] NEW: No external check of version without explicit
 click in about page.

---
 htdocs/admin/system/about.php | 89 +++++++++++++++++++++--------------
 htdocs/admin/tools/update.php |  4 +-
 2 files changed, 57 insertions(+), 36 deletions(-)

diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index 32532f61f50..e9e2e0f1749 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -26,14 +26,35 @@
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
 $langs->load("admin");
 $langs->load("help");
 $langs->load("members");
+$langs->load("other");
 
 $youuselaststable = 0;
 
+$action=GETPOST('action','alpha');
+
+if (! $user->admin) accessforbidden();
+
+$sfurl = '';
+$version='0.0';
+
+
+/*
+ *	Actions
+ */
+
+if ($action == 'getlastversion')
+{
+    $result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
+    //var_dump($result['content']);
+    $sfurl = simplexml_load_string($result['content']);
+}
+
 
 /*
  * View
@@ -50,51 +71,49 @@ print '<div style="padding-left: 30px;">'.img_picto_common('', 'dolibarr_box.png
 
 print '<div class="fichecenter"><div class="fichehalfleft">';
 
-print $langs->trans("Version").' / '.$langs->trans("DolibarrLicense").':';
-print '<ul>';
-print '<li><strong>'.DOL_VERSION.'</strong>';
+print $langs->trans("CurrentVersion").' : <strong>'.DOL_VERSION.'</strong><br>';
 
-$result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
-//var_dump($result['content']);
-$sfurl = simplexml_load_string($result['content']);
-if ($sfurl)
+if (function_exists('curl_init'))
 {
-    $i=0;
-    $version='0.0';
-    while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
+    $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
+    
+    if ($action == 'getlastversion')
     {
-        $title=$sfurl->channel[0]->item[$i]->title;
-        if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
+        if ($sfurl)
         {
-            $newversion=$reg[1];
-            $newversionarray=explode('.',$newversion);
-            $versionarray=explode('.',$version);
-            //var_dump($newversionarray);var_dump($versionarray);
-            if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion;
+                    while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
+            {
+                $title=$sfurl->channel[0]->item[$i]->title;
+                if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
+                {
+                    $newversion=$reg[1];
+                    $newversionarray=explode('.',$newversion);
+                    $versionarray=explode('.',$version);
+                    //var_dump($newversionarray);var_dump($versionarray);
+                    if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion;
+                }
+                $i++;
+            }
+            
+            // Show version
+        	print $langs->trans("LastStableVersion").' : <b>'. (($version != '0.0')?$version:$langs->trans("Unknown")) .'</b><br>';
+        }
+        else
+        {
+            print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>';
         }
-        $i++;
     }
-
-    // Show version
-    if ($version != '0.0') 
+    else
     {
-        print ' ('.$langs->trans("LastStableVersion").': <b>'.$version.'</b>';
-    	if (DOL_VERSION == $version)
-    	{
-    	    $youuselaststable=1;
-            print $langs->trans("YouUseLastStableVersion");  
-    	}
-    	print ')';
+        print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">' .$langs->trans("Check").'</a><br>';
     }
 }
-else
-{
-    print ' ('.$langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b>)<br>';
-}
-print ' / <a href="http://www.gnu.org/copyleft/gpl.html">GNU-GPL v3+</a></li>';
+print '<br>';
 
-
-print '</ul>';
+print $langs->trans("DolibarrLicense").' : ';
+print '<ul><li>';
+print '<a href="http://www.gnu.org/copyleft/gpl.html">GNU-GPL v3+</a></li>';
+print '</li></ul>';
 
 //print "<br>\n";
 
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index d8b17ab989b..d0802d6b473 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -69,7 +69,9 @@ llxHeader('',$langs->trans("Upgrade"),$wikihelp);
 
 print load_fiche_titre($langs->trans("Upgrade"),'','title_setup');
 
-print $langs->trans("CurrentVersion").' : <b>'.DOL_VERSION.'</b><br>';
+print '<br>';
+
+print $langs->trans("CurrentVersion").' : <strong>'.DOL_VERSION.'</strong><br>';
 
 if (function_exists('curl_init'))
 {

From afa5ef291393887f256587d58e1f1237c8591204 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 17 Feb 2017 00:19:28 +0100
Subject: [PATCH 0271/1163] NEW Introduce fields that can be computed during
 export in export profiles.

---
 htdocs/core/class/commoninvoice.class.php | 76 ++++++++++++++---------
 htdocs/core/class/discount.class.php      | 21 ++++---
 htdocs/core/modules/modFacture.class.php  | 16 ++---
 htdocs/exports/class/export.class.php     | 29 ++++++++-
 htdocs/exports/export.php                 | 20 +++++-
 htdocs/langs/en_US/bills.lang             |  1 +
 6 files changed, 111 insertions(+), 52 deletions(-)

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 4822ad7d0d8..2a6270e11dc 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -89,6 +89,22 @@ abstract class CommonInvoice extends CommonObject
 	const STATUS_ABANDONED = 3;
 
 	
+	/**
+	 * 	Return remain amount to pay.
+	 *  Property ->id and ->total_ttc must be set.
+	 *
+	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+	 *	@return		int						Remain of amount to pay
+	 */
+	function getRemainToPay($multicurrency=0)
+	{
+	    $alreadypaid=0;
+	    $alreadypaid+=$this->getSommePaiement($multicurrency);
+	    $alreadypaid+=$this->getSumDepositsUsed($multicurrency);
+	    $alreadypaid+=$this->getSumCreditNotesUsed($multicurrency);
+    	return $this->total_ttc - $alreadypaid;
+	}
+
 	/**
 	 * 	Return amount of payments already done
 	 *
@@ -124,38 +140,10 @@ abstract class CommonInvoice extends CommonObject
 			return -1;
 		}
 	}
-
-	/**
-	 *    	Return amount (with tax) of all credit notes and deposits invoices used by invoice
-	 *
-	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
-	 */
-	function getSumCreditNotesUsed($multicurrency=0)
-	{
-	    if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-	    {
-	        // TODO
-	       return 0;     
-	    }
-	    
-	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-	
-	    $discountstatic=new DiscountAbsolute($this->db);
-	    $result=$discountstatic->getSumCreditNotesUsed($this, $multicurrency);
-	    if ($result >= 0)
-	    {
-	        return $result;
-	    }
-	    else
-	    {
-	        $this->error=$discountstatic->error;
-	        return -1;
-	    }
-	}
 	
 	/**
-	 *    	Return amount (with tax) of all deposits invoices used by invoice
+	 *    	Return amount (with tax) of all deposits invoices used by invoice.
+     *      Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
 	 *
 	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
 	 *		@return		int						<0 if KO, Sum of deposits amount otherwise
@@ -182,7 +170,35 @@ abstract class CommonInvoice extends CommonObject
 	        return -1;
 	    }
 	}
+
+	/**
+	 *    	Return amount (with tax) of all credit notes and deposits invoices used by invoice
+	 *
+	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+	 *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
+	 */
+	function getSumCreditNotesUsed($multicurrency=0)
+	{
+	    if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
+	    {
+	        // TODO
+	        return 0;
+	    }
+	     
+	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 	
+	    $discountstatic=new DiscountAbsolute($this->db);
+	    $result=$discountstatic->getSumCreditNotesUsed($this, $multicurrency);
+	    if ($result >= 0)
+	    {
+	        return $result;
+	    }
+	    else
+	    {
+	        $this->error=$discountstatic->error;
+	        return -1;
+	    }
+	}
 	
 	/**
 	 *	Renvoie tableau des ids de facture avoir issus de la facture
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 5ea11cba680..f426f800d29 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -374,20 +374,21 @@ class DiscountAbsolute
 
 
     /**
-     *  Return amount (with tax) of all credit notes and deposits invoices used by invoice
+     *  Return amount (with tax) of all deposits invoices used by invoice as a payment.
+     *  Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
      *
      *	@param		Facture		$invoice		Object invoice
-	 *	@param		int			$multicurrency	Return multicurrency_amount instead of amount
+	 *  @param 		int 		$multicurrency 	Return multicurrency_amount instead of amount
      *	@return		int							<0 if KO, Sum of credit notes and deposits amount otherwise
      */
-    function getSumCreditNotesUsed($invoice, $multicurrency=0)
+    function getSumDepositsUsed($invoice, $multicurrency=0)
     {
         $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
         $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-        $sql.= ' AND f.type = 2';
+        $sql.= ' AND f.type = 3';
 
-        dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
+        dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -402,20 +403,20 @@ class DiscountAbsolute
     }
 
     /**
-     *  Return amount (with tax) of all deposits invoices used by invoice
+     *  Return amount (with tax) of all credit notes and deposits invoices used by invoice as a payment
      *
      *	@param		Facture		$invoice		Object invoice
-	 *  @param 		int 		$multicurrency 	Return multicurrency_amount instead of amount
+	 *	@param		int			$multicurrency	Return multicurrency_amount instead of amount
      *	@return		int							<0 if KO, Sum of credit notes and deposits amount otherwise
      */
-    function getSumDepositsUsed($invoice, $multicurrency=0)
+    function getSumCreditNotesUsed($invoice, $multicurrency=0)
     {
         $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
         $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-        $sql.= ' AND f.type = 3';
+        $sql.= ' AND f.type = 2';
 
-        dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
+        dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 0c323181ba2..4bc8590d5b4 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -205,11 +205,11 @@ class modFacture extends DolibarrModules
 		$this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_icon[$r]='invoice';
 		$this->export_permission[$r]=array(array("facture","facture","export","other"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.type'=>"Type",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.date_lim_reglement'=>"DateDue",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.rest'=>'Rest','f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_private'=>"NotePrivate",'f.note_public'=>"NotePublic",'f.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','f.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.subprice'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalVAT",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.special_code'=>'SpecialCode','fd.product_type'=>"TypeOfLineServiceOrProduct",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.accountancy_code_sell'=>'ProductAccountancySellCode');
-		$this->export_TypeFields_array[$r]=array('s.rowid'=>'Numeric','s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.rowid'=>'Numeric','f.facnumber'=>"Text",'f.type'=>"Numeric",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.rest'=>"NumericCompute",'f.paye'=>"Boolean",'f.fk_statut'=>'Numeric','f.note_private'=>"Text",'f.note_public'=>"Text",'f.fk_user_author'=>'Numeric','uc.login'=>'Text','f.fk_user_valid'=>'Numeric','uv.login'=>'Text','pj.ref'=>'Text','fd.rowid'=>'Numeric','fd.label'=>'Text','fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text');
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.type'=>"Type",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.date_lim_reglement'=>"DateDue",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'none.rest'=>'Rest','f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_private'=>"NotePrivate",'f.note_public'=>"NotePublic",'f.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','f.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.subprice'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalVAT",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.special_code'=>'SpecialCode','fd.product_type'=>"TypeOfLineServiceOrProduct",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.accountancy_code_sell'=>'ProductAccountancySellCode');
+		$this->export_TypeFields_array[$r]=array('s.rowid'=>'Numeric','s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.rowid'=>'Numeric','f.facnumber'=>"Text",'f.type'=>"Numeric",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'none.rest'=>"NumericCompute",'f.paye'=>"Boolean",'f.fk_statut'=>'Numeric','f.note_private'=>"Text",'f.note_public'=>"Text",'f.fk_user_author'=>'Numeric','uc.login'=>'Text','f.fk_user_valid'=>'Numeric','uv.login'=>'Text','pj.ref'=>'Text','fd.rowid'=>'Numeric','fd.label'=>'Text','fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text');
 		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company', 'pj.ref'=>'project', 'fd.rowid'=>'invoice_line','fd.label'=>"invoice_line",'fd.description'=>"invoice_line",'fd.subprice'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.special_code'=>'invoice_line','fd.product_type'=>'invoice_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product','p.accountancy_code_sell'=>'product','f.fk_user_author'=>'user','uc.login'=>'user','f.fk_user_valid'=>'user','uv.login'=>'user');
-		$this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		$this->export_special_array[$r]=array('f.rest'=>'INVOICEREMAINTOPAY');
+		$this->export_special_array[$r]=array('none.rest'=>'getRemainToPay');
+		$this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid', 'product'=>'fd.rowid', 'none.rest'=>array('f.rowid','f.total_ttc')); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		$keyforselect='facture'; $keyforelement='invoice'; $keyforaliasextra='extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$keyforselect='facturedet'; $keyforelement='invoice_line'; $keyforaliasextra='extra2';
@@ -238,11 +238,11 @@ class modFacture extends DolibarrModules
 		$this->export_label[$r]='CustomersInvoicesAndPayments';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_icon[$r]='invoice';
 		$this->export_permission[$r]=array(array("facture","facture","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.type'=>"Type",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.date_lim_reglement'=>"DateDue",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.rest'=>'Rest','f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_private'=>"NotePrivate",'f.note_public'=>"NotePublic",'f.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','f.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','pj.ref'=>'ProjectRef','p.rowid'=>'PaymentId','p.ref'=>'PaymentRef','p.amount'=>'AmountPayment','pf.amount'=>'AmountPaymentDistributedOnInvoice','p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber','pt.code'=>'IdPaymentMode','pt.libelle'=>'LabelPaymentMode','p.note'=>'PaymentNote','p.fk_bank'=>'IdTransaction','ba.ref'=>'AccountRef');
-		$this->export_TypeFields_array[$r]=array('s.rowid'=>'Numeric','s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.rowid'=>"Numeric",'f.facnumber'=>"Text",'f.type'=>"Numeric",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.rest'=>'NumericCompute','f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'pj.ref'=>'Text','p.amount'=>'Numeric','pf.amount'=>'Numeric','p.rowid'=>'Numeric','p.ref'=>'Text','p.datep'=>'Date','p.num_paiement'=>'Numeric','p.fk_bank'=>'Numeric','p.note'=>'Text','pt.code'=>'Text','pt.libelle'=>'text','ba.ref'=>'Text');
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.type'=>"Type",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.date_lim_reglement'=>"DateDue",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'none.rest'=>'Rest','f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_private'=>"NotePrivate",'f.note_public'=>"NotePublic",'f.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','f.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','pj.ref'=>'ProjectRef','p.rowid'=>'PaymentId','p.ref'=>'PaymentRef','p.amount'=>'AmountPayment','pf.amount'=>'AmountPaymentDistributedOnInvoice','p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber','pt.code'=>'CodePaymentMode','pt.libelle'=>'LabelPaymentMode','p.note'=>'PaymentNote','p.fk_bank'=>'IdTransaction','ba.ref'=>'AccountRef');
+		$this->export_TypeFields_array[$r]=array('s.rowid'=>'Numeric','s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.rowid'=>"Numeric",'f.facnumber'=>"Text",'f.type'=>"Numeric",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'none.rest'=>'NumericCompute','f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'f.fk_user_author'=>'Numeric','uc.login'=>'Text','f.fk_user_valid'=>'Numeric','uv.login'=>'Text','pj.ref'=>'Text','p.amount'=>'Numeric','pf.amount'=>'Numeric','p.rowid'=>'Numeric','p.ref'=>'Text','p.datep'=>'Date','p.num_paiement'=>'Numeric','p.fk_bank'=>'Numeric','p.note'=>'Text','pt.code'=>'Text','pt.libelle'=>'text','ba.ref'=>'Text');
 		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company','pj.ref'=>'project','p.rowid'=>'payment','p.ref'=>'payment','p.amount'=>'payment','pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment','pt.code'=>'payment','pt.libelle'=>'payment','p.note'=>'payment','f.fk_user_author'=>'user','uc.login'=>'user','f.fk_user_valid'=>'user','uv.login'=>'user','p.fk_bank'=>'account','ba.ref'=>'account');
-		$this->export_dependencies_array[$r]=array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		$this->export_special_array[$r]=array('f.rest'=>'INVOICEREMAINTOPAY');
+		$this->export_special_array[$r]=array('none.rest'=>'getRemainToPay');
+		$this->export_dependencies_array[$r]=array('payment'=>'p.rowid', 'none.rest'=>array('f.rowid','f.total_ttc')); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		$keyforselect='facture'; $keyforelement='invoice'; $keyforaliasextra='extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 1d0c5cfb13e..858ad163cbb 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -220,7 +220,7 @@ class Export
 		foreach ($this->array_export_fields[$indice] as $key => $value)
 		{
 			if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
-
+            if (preg_match('/^none\./', $key)) continue;                    // A field that must not appears into SQL
 			if ($i > 0) $sql.=', ';
 			else $i++;
 
@@ -607,12 +607,37 @@ class Export
 								if ($objp->$alias < 0) $objp->$alias='';
 							}
 							// Operation ZEROIFNEG
-							if ($this->array_export_special[$indice][$key]=='ZEROIFNEG')
+							elseif ($this->array_export_special[$indice][$key]=='ZEROIFNEG')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias=str_replace(array('.', '-','(',')'),'_',$key);
 								if ($objp->$alias < 0) $objp->$alias='0';
 							}
+							// Operation INVOICEREMAINTOPAY
+							elseif ($this->array_export_special[$indice][$key]=='getRemainToPay')
+							{
+								//$alias=$this->array_export_alias[$indice][$key];
+								$alias=str_replace(array('.', '-','(',')'),'_',$key);
+								$remaintopay='';
+								if ($objp->f_rowid > 0)
+								{
+								    global $tmpobjforcomputecall;
+								    if (! is_object($tmpobjforcomputecall)) 
+								    {
+								        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+								        $tmpobjforcomputecall=new Facture($this->db);
+								    }
+								    $tmpobjforcomputecall->id = $objp->f_rowid;
+								    $tmpobjforcomputecall->total_ttc = $objp->f_total_ttc;
+								    $remaintopay=$tmpobjforcomputecall->getRemainToPay();
+								}								
+								$objp->$alias=$remaintopay;
+							}
+							else
+							{
+							    $this->error='Operation '.$this->array_export_special[$indice][$key].' not supported.';
+							    return -1;
+							}
 						}
 					}
 					// end of special operation processing
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 12f78e01ce9..24b9ef3728e 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -147,7 +147,7 @@ $usefilters=1;
  * Actions
  */
 
-if ($action=='selectfield')
+if ($action=='selectfield')     // Selection of field at step 2
 {
 	$fieldsarray=$objexport->array_export_fields[0];
 	$fieldsentitiesarray=$objexport->array_export_entities[0];
@@ -168,12 +168,28 @@ if ($action=='selectfield')
         $warnings=array();
 
         $array_selected[$field]=count($array_selected)+1;    // We tag the key $field as "selected"
-        // We check if there is a dependency
+        // We check if there is a dependency to activate 
+        /*var_dump($field);
+        var_dump($fieldsentitiesarray[$field]);
+        var_dump($fieldsdependenciesarray);*/
+        $listofdependencies=array();
         if (! empty($fieldsentitiesarray[$field]) && ! empty($fieldsdependenciesarray[$fieldsentitiesarray[$field]]))
         {
+            // We found a dependency on the type of field
             $tmp=$fieldsdependenciesarray[$fieldsentitiesarray[$field]]; // $fieldsdependenciesarray=array('element'=>'fd.rowid') or array('element'=>array('fd.rowid','ab.rowid'))
             if (is_array($tmp)) $listofdependencies=$tmp;
             else $listofdependencies=array($tmp);
+        }
+        else if (! empty($field) && ! empty($fieldsdependenciesarray[$field]))
+        {
+            // We found a dependency on a dedicated field
+            $tmp=$fieldsdependenciesarray[$field]; // $fieldsdependenciesarray=array('fd.fieldx'=>'fd.rowid') or array('fd.fieldx'=>array('fd.rowid','ab.rowid'))
+            if (is_array($tmp)) $listofdependencies=$tmp;
+            else $listofdependencies=array($tmp);
+        }
+        
+        if (count($listofdependencies))
+        {
             foreach($listofdependencies as $fieldid)
             {
                 if (empty($array_selected[$fieldid]))
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index d11b5122f59..b4896302b76 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -78,6 +78,7 @@ PaymentMode=Payment type
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
 PaymentTerm=Payment term

From ec962f13fac0ea85c6297051e810c99e0308b679 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 17 Feb 2017 00:59:00 +0100
Subject: [PATCH 0272/1163] CSS enhancement

---
 htdocs/theme/eldy/style.css.php | 8 +++++++-
 htdocs/theme/md/style.css.php   | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 5f1d55b8350..8a20b7f4868 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -568,6 +568,12 @@ div.myavailability {
 .selectlimit, .marginrightonly {
 	margin-right: 10px !important;
 }
+.selectlimit, .selectlimit:focus {
+    border-left: none !important;
+    border-top: none !important;
+    border-right: none !important;
+    outline: none;
+}
 .strikefordisabled {
 	text-decoration: line-through;
 }
@@ -2873,7 +2879,7 @@ tr.liste_titre_topborder td {
 .liste_titre td a.notasortlink:hover {
 	background: transparent;
 }
-tr.liste_titre td.liste_titre, form.liste_titre div.tagtd {				/* For last line of table headers only */
+tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd {				/* For last line of table headers only */
     border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 099e17bc772..cb3680508df 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -546,6 +546,12 @@ div.myavailability {
 .selectlimit, .marginrightonly {
 	margin-right: 10px !important;
 }
+.selectlimit, .selectlimit:focus {
+    border-left: none !important;
+    border-top: none !important;
+    border-right: none !important;
+    outline: none;
+}
 .strikefordisabled {
 	text-decoration: line-through;
 }
@@ -2751,7 +2757,7 @@ tr.liste_titre_topborder td {
 .liste_titre td a.notasortlink:hover {
 	background: transparent;
 }
-tr.liste_titre td.liste_titre {		/* For last line of table headers only */
+tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel {		/* For last line of table headers only */
     border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
 }
 

From 90770a1f232d9731923eb8a1b26dd033c4dbbd12 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 17 Feb 2017 10:47:29 +0100
Subject: [PATCH 0273/1163] Accounting code not display on tooltip

---
 htdocs/societe/list.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 4a0be451c45..cc5ab706fb0 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -904,8 +904,12 @@ while ($i < min($num, $limit))
 	$companystatic->fournisseur=$obj->fournisseur;
 	$companystatic->code_client=$obj->code_client;
 	$companystatic->code_fournisseur=$obj->code_fournisseur;
-    $companystatic->fk_prospectlevel=$obj->fk_prospectlevel;
-    $companystatic->name_alias=$obj->name_alias;
+
+	$companystatic->code_compta_client=$obj->code_compta;
+	$companystatic->code_compta_fournisseur=$obj->code_compta_fournisseur;
+
+    	$companystatic->fk_prospectlevel=$obj->fk_prospectlevel;
+    	$companystatic->name_alias=$obj->name_alias;
 
 	print "<tr ".$bc[$var].">";
 	if (! empty($arrayfields['s.nom']['checked']))

From b94312162ebb1acb9600fc0ca47c626d98272580 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 17 Feb 2017 12:05:24 +0100
Subject: [PATCH 0274/1163] on list, preview tooltip is not displayed correctly

it's a problem of alignment, the tooltip is cut by the left part on list (ex : comm/propal/list.php)
think we can do better
---
 htdocs/core/class/html.formfile.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 83e913f9718..6c8a1170a90 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -803,7 +803,7 @@ class FormFile
     	{
     	    $out='<dl class="dropdown inline-block">
     			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight').'</a></dt>
-    			<dd><div class="multichoicedoc"><ul class="ulselectedfields" style="display: none;">';
+    			<dd><div class="multichoicedoc" style="position:absolute;left:100px;" ><ul class="ulselectedfields" style="display: none;">';
     	    $tmpout='';
 
     		// Loop on each file found

From e4ede5aef3509e72d2478847667b7736c55ddf7a Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 17 Feb 2017 12:32:06 +0100
Subject: [PATCH 0275/1163] "Preview" not translated

---
 htdocs/core/lib/functions.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f4a85ee1a00..0bb26f522c7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5828,7 +5828,7 @@ function getImageFileNameForSize($file, $extName, $extImgTarget='')
  */
 function getAdvancedPreviewUrl($modulepart, $relativepath)
 {
-    global $conf;
+    global $conf, $langs;
 
     if (empty($conf->use_javascript_ajax)) return '';
 
@@ -5837,7 +5837,7 @@ function getAdvancedPreviewUrl($modulepart, $relativepath)
     //$mime_preview[]='archive';
     $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);
 
-    if ($num_mime !== false) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&amp;attachment=0&amp;file='.$relativepath).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js('Preview').'\')';
+    if ($num_mime !== false) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&amp;attachment=0&amp;file='.$relativepath).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
     else return '';
 }
 

From fc0abe659a77bf32e9a6542e4ce9b33eb0eb9d5c Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Fri, 17 Feb 2017 16:39:36 +0100
Subject: [PATCH 0276/1163] NEW PDF with numbertoword

---
 htdocs/core/lib/functionsnumtoword.lib.php    | 115 +++-
 .../supplier_payment/pdf/pdf_cow.modules.php  | 648 ++++--------------
 htdocs/langs/fr_FR/main.lang                  |  37 +
 3 files changed, 286 insertions(+), 514 deletions(-)

diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index 0eff5075594..2e51567da7c 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -21,9 +21,121 @@
  *	\brief			A set of functions for Dolibarr
  *					This file contains all frequently used functions.
  */
+ 
+ 
+/**
+ * Function to return number in text.
+ * 
+ * @deprecated
+ * @param	float 	$numero			Number to convert
+ * @param	Lang	$langs			Language
+ * @param	string	$numorcurrency	'number' or 'amount'
+ * @return 	string  				Text of the number or -1 in case TOO LONG (more than 1000000000000.99)
+ */
+function dol_convertToWord($num = false, $langs, $currency=false, $centimes=false)
+{
+	global $conf;
+	
+    $num = str_replace(array(',', ' '), '' , trim($num));
+    if(! $num) {
+        return false;
+    }
+	if($centimes && strlen($num) == 1) {
+		$num = $num*10;
+	}
+	$TNum = explode('.',$num);
+    $num = (int) $TNum[0];
+    $words = array();
+    $list1 = array(
+    	'', 
+    	$langs->transnoentitiesnoconv('one'), 
+    	$langs->transnoentitiesnoconv('two'), 
+    	$langs->transnoentitiesnoconv('three'), 
+    	$langs->transnoentitiesnoconv('four'), 
+    	$langs->transnoentitiesnoconv('five'), 
+    	$langs->transnoentitiesnoconv('six'), 
+    	$langs->transnoentitiesnoconv('seven'), 
+    	$langs->transnoentitiesnoconv('eight'), 
+    	$langs->transnoentitiesnoconv('nine'), 
+    	$langs->transnoentitiesnoconv('ten'), 
+    	$langs->transnoentitiesnoconv('eleven'),
+        $langs->transnoentitiesnoconv('twelve'), 
+        $langs->transnoentitiesnoconv('thirteen'), 
+        $langs->transnoentitiesnoconv('fourteen'), 
+        $langs->transnoentitiesnoconv('fifteen'), 
+        $langs->transnoentitiesnoconv('sixteen'), 
+        $langs->transnoentitiesnoconv('seventeen'), 
+        $langs->transnoentitiesnoconv('eighteen'), 
+        $langs->transnoentitiesnoconv('nineteen')
+    );
+    $list2 = array(
+    	'', 
+	    $langs->transnoentitiesnoconv('ten'), 
+	    $langs->transnoentitiesnoconv('twenty'), 
+	    $langs->transnoentitiesnoconv('thirty'), 
+	    $langs->transnoentitiesnoconv('forty'), 
+	    $langs->transnoentitiesnoconv('fifty'), 
+	    $langs->transnoentitiesnoconv('sixty'), 
+	    $langs->transnoentitiesnoconv('seventy'), 
+	    $langs->transnoentitiesnoconv('eighty'), 
+	    $langs->transnoentitiesnoconv('ninety'), 
+	    $langs->transnoentitiesnoconv('hundred')
+	);
+    $list3 = array(
+    	'', 
+    	$langs->transnoentitiesnoconv('thousand'), 
+    	$langs->transnoentitiesnoconv('million'), 
+    	$langs->transnoentitiesnoconv('billion'), 
+    	$langs->transnoentitiesnoconv('trillion'), 
+    	$langs->transnoentitiesnoconv('quadrillion')
+    );
+    $num_length = strlen($num);
+    $levels = (int) (($num_length + 2) / 3);
+    $max_length = $levels * 3;
+    $num = substr('00' . $num, -$max_length);
+    $num_levels = str_split($num, 3);
+    for ($i = 0; $i < count($num_levels); $i++) {
+        $levels--;
+        $hundreds = (int) ($num_levels[$i] / 100);
+        $hundreds = ($hundreds ? ' ' . $list1[$hundreds] . ' '.$langs->transnoentities('hundred') . ( $hundreds == 1 ? '' : 's' ) . ' ': '');
+        $tens = (int) ($num_levels[$i] % 100);
+        $singles = '';
+        if ( $tens < 20 ) {
+            $tens = ($tens ? ' ' . $list1[$tens] . ' ' : '' );
+        } else {
+            $tens = (int)($tens / 10);
+            $tens = ' ' . $list2[$tens] . ' ';
+            $singles = (int) ($num_levels[$i] % 10);
+            $singles = ' ' . $list1[$singles] . ' ';
+        }
+        $words[] = $hundreds . $tens . $singles . ( ( $levels && ( int ) ( $num_levels[$i] ) ) ? ' ' . $list3[$levels] . ' ' : '' );
+    } //end for loop
+    $commas = count($words);
+    if ($commas > 1) {
+        $commas = $commas - 1;
+    }
+	$concatWords = implode(' ', $words);
+	// Delete multi whitespaces
+	$concatWords = trim(preg_replace('/[ ]+/', ' ', $concatWords));
+	
+	if(!empty($currency)) {
+		$concatWords .= ' '.$currency;
+	}
+	
+	// If we need to write cents call again this function for cents
+	if(!empty($TNum[1])) {
+		if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('and');
+		$concatWords .= ' '.dol_convertToWord($TNum[1], $langs, $currency, true);
+		if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('centimes');
+	}
+    return $concatWords;
+}
+ 
+ 
 /**
  * Function to return number or amount in text.
- *
+ * 
+ * @deprecated
  * @param	float 	$numero			Number to convert
  * @param	Lang	$langs			Language
  * @param	string	$numorcurrency	'number' or 'amount'
@@ -45,6 +157,7 @@ function dolNumberToWord($numero, $langs, $numorcurrency='number')
 			break;
 		}
 	}
+	var_dump($langs);
 	/*In dolibarr 3.6.2 (my current version) doesn't have $langs->default and
 	in case exist why ask $lang like a parameter?*/
 	if (((is_object($langs) && $langs->default == 'es_MX') || (! is_object($langs) && $langs == 'es_MX')) && $numorcurrency == 'currency')
diff --git a/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php b/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
index 9f87b9870e4..5e570a6cfe9 100644
--- a/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
+++ b/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
@@ -26,9 +26,11 @@
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functionsnumtoword.lib.php';
 
 
 /**
@@ -92,30 +94,23 @@ class pdf_cow extends ModelePDFSuppliersPayments
 		$this->franchise=!$mysoc->tva_assuj;
 
         // Defini position des colonnes
-		$this->posxdesc=$this->marge_gauche+1;
-		$this->posxtva=112;
-		$this->posxup=126;
-		$this->posxqty=145;
-		$this->posxdiscount=162;
-		$this->postotalht=174;
-
-		if($conf->global->PRODUCT_USE_UNITS) {
-			$this->posxtva=99;
-			$this->posxup=114;
-			$this->posxqty=130;
-			$this->posxunit=147;
-		}
+		$this->posxdate=$this->marge_gauche+1;
+		$this->posxreffacturefourn=30;
+		$this->posxreffacture=65;
+		$this->posxtype=100;
+		$this->posxtotalht=80;
+		$this->posxtva=90;
+		$this->posxtotalttc=180;
+		
 		//if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
-		$this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
-			$this->posxpicture-=20;
+			$this->posxreffacturefourn-=20;
+			$this->posxreffacture-=20;
+			$this->posxtype-=20;
+			$this->posxtotalht-=20;
 			$this->posxtva-=20;
-			$this->posxup-=20;
-			$this->posxqty-=20;
-			$this->posxunit-=20;
-			$this->posxdiscount-=20;
-			$this->postotalht-=20;
+			$this->posxtotalttc-=20;
 		}
 
 		$this->tva=array();
@@ -129,7 +124,7 @@ class pdf_cow extends ModelePDFSuppliersPayments
 	/**
      *  Function to build pdf onto disk
      *
-     *  @param		FactureFournisseur	$object				Id of object to generate
+     *  @param		PaiementFourn		$object				Id of object to generate
      *  @param		Translate			$outputlangs		Lang output object
      *  @param		string				$srctemplatepath	Full path of source filename for generator using a template file
      *  @param		int					$hidedetails		Do not show line details
@@ -156,10 +151,31 @@ class pdf_cow extends ModelePDFSuppliersPayments
 		$outputlangs->load("companies");
 		$outputlangs->load("bills");
 		$outputlangs->load("products");
+		$outputlangs->load("suppliers");
+		$object->factures = array();
 
 		if ($conf->fournisseur->payment->dir_output)
 		{
 			$object->fetch_thirdparty();
+			/**
+			 *	Supplier invoice list
+			 */
+			$sql = 'SELECT f.rowid, f.ref, f.datef, f.ref_supplier, f.total_ht, f.total_tva, f.total_ttc, pf.amount, f.rowid as facid, f.paye';
+			$sql .= ', f.fk_statut, s.nom as name, s.rowid as socid';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s';
+			$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid';
+			$sql .= ' AND pf.fk_paiementfourn = '.$object->id;
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				if ($this->db->num_rows($resql) > 0)
+				{
+					while($objp = $this->db->fetch_object($resql)) {
+						$objp->type = $outputlangs->trans('SupplierInvoice');
+						$object->lines[] = $objp;
+					}
+				}
+			}
 			
 			$total = $object->montant;
 
@@ -185,7 +201,6 @@ class pdf_cow extends ModelePDFSuppliersPayments
 					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 					return 0;
 				}
-
 			}
 
 			if (file_exists($dir))
@@ -236,23 +251,6 @@ class pdf_cow extends ModelePDFSuppliersPayments
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
-			    // Positionne $this->atleastonediscount si on a au moins une remise
-                for ($i = 0 ; $i < $nblignes ; $i++)
-                {
-                    if ($object->lines[$i]->remise_percent)
-                    {
-                        $this->atleastonediscount++;
-                    }
-                }
-				if (empty($this->atleastonediscount) && empty($conf->global->PRODUCT_USE_UNITS))
-				{
-					$this->posxpicture+=($this->postotalht - $this->posxdiscount);
-					$this->posxtva+=($this->postotalht - $this->posxdiscount);
-					$this->posxup+=($this->postotalht - $this->posxdiscount);
-					$this->posxqty+=($this->postotalht - $this->posxdiscount);
-					$this->posxdiscount+=($this->postotalht - $this->posxdiscount);
-					//$this->postotalht;
-				}
 
                 // New page
 				$pdf->AddPage();
@@ -270,48 +268,8 @@ class pdf_cow extends ModelePDFSuppliersPayments
 
 				// Incoterm
 				$height_incoterms = 0;
-				if ($conf->incoterm->enabled)
-				{
-					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
-						$tab_top = 88;
-
-						$pdf->SetFont('','', $default_font_size - 1);
-						$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
-						$nexY = $pdf->GetY();
-						$height_incoterms=$nexY-$tab_top;
-
-						// Rect prend une longueur en 3eme param
-						$pdf->SetDrawColor(192,192,192);
-						$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
-
-						$tab_top = $nexY+6;
-						$height_incoterms += 4;
-					}
-				}
-
-				// Affiche notes
-				if (! empty($object->note_public))
-				{
-					$tab_top = 88 + $height_incoterms;
-
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($object->note_public), 0, 1);
-					$nexY = $pdf->GetY();
-					$height_note=$nexY-$tab_top;
-
-					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
-
-					$tab_height = $tab_height - $height_note;
-					$tab_top = $nexY+6;
-				}
-				else
-				{
-					$height_note=0;
-				}
+				
+				$height_note=0;
 
 				$iniY = $tab_top + 7;
 				$curY = $tab_top + 7;
@@ -329,11 +287,12 @@ class pdf_cow extends ModelePDFSuppliersPayments
 					$pageposbefore=$pdf->getPage();
 
 					// Description of product line
-					$curX = $this->posxdesc-1;
+					$curX = $this->posxdate-1;
 					$showpricebeforepagebreak=1;
 
 					$pdf->startTransaction();
-					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,1);
+					//pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,1);
+					$pdf->writeHTMLCell($this->posxtva-$curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J',true);
 					$pageposafter=$pdf->getPage();
 					if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					{
@@ -341,7 +300,8 @@ class pdf_cow extends ModelePDFSuppliersPayments
 						$pageposafter=$pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,1);
+						//pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,1);
+						$pdf->writeHTMLCell($this->posxtva-$curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J',true);
 						$posyafter=$pdf->GetY();
 						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
 						{
@@ -376,75 +336,31 @@ class pdf_cow extends ModelePDFSuppliersPayments
 					}
 
 					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
+					
+					// ref fourn
+					$pdf->SetXY($this->posxreffacturefourn, $curY);
+					$pdf->MultiCell($this->posxreffacturefourn-$this->posxup-0.8, 3, $object->lines[$i]->ref_supplier, 0, 'L', 0);
+					
+					// ref facture fourn
+					$pdf->SetXY($this->posxreffacture, $curY);
+					$pdf->MultiCell($this->posxreffacture-$this->posxup-0.8, 3, $object->lines[$i]->ref, 0, 'L', 0);
+					
+					// type
+					$pdf->SetXY($this->posxtype, $curY);
+					$pdf->MultiCell($this->posxtype-$this->posxup-0.8, 3, $object->lines[$i]->type, 0, 'L', 0);
 
-					// VAT Rate
-                    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-                    {
-    					$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
-                        $pdf->SetXY($this->posxtva, $curY);
-	       				$pdf->MultiCell($this->posxup-$this->posxtva-1, 3, $vat_rate, 0, 'R');
-                    }
-
-					// Unit price before discount
-					$pdf->SetXY($this->posxup, $curY);
-					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, price($object->lines[$i]->pu_ht), 0, 'R', 0);
-
-					// Unit price before discount
-					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
-					$pdf->SetXY($this->posxup, $curY);
-					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
-
-					// Quantity
-					$pdf->SetXY($this->posxqty, $curY);
-					// Enough for 6 chars
-					if($conf->global->PRODUCT_USE_UNITS)
-					{
-						$pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R');
-					}
-					else
-					{
-						$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R');
-					}
-
-					// Unit
-					if($conf->global->PRODUCT_USE_UNITS)
-					{
-						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
-						$pdf->SetXY($this->posxunit, $curY);
-						$pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L');
-					}
-
-					// Discount on line
-					$pdf->SetXY($this->posxdiscount, $curY);
-					if ($object->lines[$i]->remise_percent)
-					{
-						$pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 3, $object->lines[$i]->remise_percent."%", 0, 'R');
-					}
-
-					// Total HT line
-                    $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs);
-                    $pdf->SetXY($this->postotalht, $curY);
-                    $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
-
-					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					$tvaligne=$object->lines[$i]->total_tva;
-
-					$localtax1ligne=$object->lines[$i]->total_localtax1;
-					$localtax2ligne=$object->lines[$i]->total_localtax2;
-
-					if (! empty($object->remise_percent)) $tvaligne-=($tvaligne*$object->remise_percent)/100;
-
-					$vatrate=(string) $object->lines[$i]->tva_tx;
-					$localtax1rate=(string) $object->lines[$i]->localtax1_tx;
-					$localtax2rate=(string) $object->lines[$i]->localtax2_tx;
-
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (empty($this->tva[$vatrate])) $this->tva[$vatrate]=0;
-					if (empty($this->localtax1[$localtax1rate])) $this->localtax1[$localtax1rate]=0;
-					if (empty($this->localtax2[$localtax2rate])) $this->localtax2[$localtax2rate]=0;
-					$this->tva[$vatrate] += $tvaligne;
-					$this->localtax1[$localtax1rate]+=$localtax1ligne;
-					$this->localtax2[$localtax2rate]+=$localtax2ligne;
+					// Total ht
+					$pdf->SetXY($this->posxtotalht, $curY);
+					$pdf->MultiCell($this->posxtotalht-$this->posxup-0.8, 3, price($object->lines[$i]->total_ht), 0, 'R', 0);
+					
+					// Total tva
+					$pdf->SetXY($this->posxtva, $curY);
+					$pdf->MultiCell($this->posxtva-$this->posxup-0.8, 3, price($object->lines[$i]->total_tva), 0, 'R', 0);
+					
+					// Total TTC line
+                    $pdf->SetXY($this->posxtotalttc, $curY);
+                    $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxtotalttc, 3, price($object->lines[$i]->total_ttc), 0, 'R', 0);
+					
 
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
@@ -507,16 +423,11 @@ class pdf_cow extends ModelePDFSuppliersPayments
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
+				// Affiche zone cheèque
+				$posy=$this->_tableau_cheque($pdf, $object, $bottomlasttab, $outputlangs);
+				
 				// Affiche zone totaux
-				$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
-
-				$amount_credit_notes_included=0;
-				$amount_deposits_included=0;
-
-				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included)
-				{
-					$posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
-				}
+				//$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
@@ -553,198 +464,62 @@ class pdf_cow extends ModelePDFSuppliersPayments
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	PDF			$pdf           Object PDF
-	 *	@param  Facture		$object         Object invoice
-	 *	@param  int			$deja_regle     Montant deja regle
-	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
-	 *	@return int							Position pour suite
+	 *	@param	PDF				$pdf			Object PDF
+	 *	@param  PaiementFourn	$object         Object PaiementFourn
+	 *	@param	int				$posy			Position depart
+	 *	@param	Translate		$outputlangs	Objet langs
+	 *	@return int								Position pour suite
 	 */
-	function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	function _tableau_cheque(&$pdf, $object, $posy, $outputlangs)
 	{
 		global $conf,$mysoc;
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-        $tab2_top = $posy;
-		$tab2_hl = 4;
 		$pdf->SetFont('','', $default_font_size - 1);
-
-		$pdf->SetXY($this->marge_gauche, $tab2_top + 0);
-		// If France, show VAT mention if not applicable
-		if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
-		{
-			$pdf->MultiCell(100, $tab2_hl, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
-		}
-
-		// Tableau total
-		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$col2x-=20;
-		}
-		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
-
-		$index=0;
-
-		// Total HT
 		$pdf->SetFillColor(255,255,255);
-		$pdf->SetXY($col1x, $tab2_top + 0);
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
-		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + $object->remise), 0, 'R', 1);
-
-		// Show VAT by rates and total
-		$pdf->SetFillColor(248,248,248);
-
-		foreach( $this->tva as $tvakey => $tvaval )
-		{
-			if ($tvakey > 0)    // On affiche pas taux 0
-			{
-				$this->atleastoneratenotnull++;
-
-				$index++;
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-				$tvacompl='';
-
-				if (preg_match('/\*/',$tvakey))
-				{
-					$tvakey=str_replace('*','',$tvakey);
-					$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-				}
-
-				$totalvat =$outputlangs->transnoentities("TotalVAT").' ';
-				$totalvat.=vatrate($tvakey,1).$tvacompl;
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
-			}
-		}
-		if (! $this->atleastoneratenotnull) // If no vat at all
-		{
-			$index++;
-			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalVAT"), 0, 'L', 1);
-			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', 1);
-
-			// Total LocalTax1
-			if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on' && $object->total_localtax1>0)
-			{
-				$index++;
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code), 0, 'L', 1);
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), 0, 'R', 1);
-			}
-
-			// Total LocalTax2
-			if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on' && $object->total_localtax2>0)
-			{
-				$index++;
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code), 0, 'L', 1);
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), 0, 'R', 1);
-			}
-		}
-		else
-		{
-			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
-			//{
-				//Local tax 1
-				foreach( $this->localtax1 as $tvakey => $tvaval )
-				{
-					if ($tvakey != 0)    // On affiche pas taux 0
-					{
-						//$this->atleastoneratenotnull++;
-
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-						$tvacompl='';
-						if (preg_match('/\*/',$tvakey))
-						{
-							$tvakey=str_replace('*','',$tvakey);
-							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-						}
-						$totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' ';
-						$totalvat.= vatrate(abs($tvakey),1).$tvacompl;
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
-					}
-				}
-			//}
-
-			//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
-			//{
-				//Local tax 2
-				foreach( $this->localtax2 as $tvakey => $tvaval )
-				{
-					if ($tvakey != 0)    // On affiche pas taux 0
-					{
-						//$this->atleastoneratenotnull++;
-
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-						$tvacompl='';
-						if (preg_match('/\*/',$tvakey))
-						{
-							$tvakey=str_replace('*','',$tvakey);
-							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-						}
-						$totalvat = $outputlangs->transcountrynoentities("TotalLT2",$mysoc->country_code).' ';
-						$totalvat.= vatrate(abs($tvakey),1).$tvacompl;
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
-					}
-				}
-			//}
-		}
-
-		$useborder=0;
-
-		$index++;
-		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFillColor(224,224,224);
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
-
-		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1);
-
-		if ($deja_regle > 0)
-		{
-			$index++;
-
-			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
-
-			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', 0);
-
-			$index++;
-			$pdf->SetTextColor(0,0,60);
-			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
-
-			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle), $useborder, 'R', 1);
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetTextColor(0,0,0);
-		}
-
-		$index++;
-		return ($tab2_top + ($tab2_hl * $index));
+		
+		// N° payment
+		$pdf->SetXY($this->marge_gauche, $posy);
+		$pdf->MultiCell(30, 4, 'N° '.$outputlangs->transnoentities("Payment"), 0, 'L', 1);
+		
+		// Ref payment
+		$pdf->SetXY($this->marge_gauche + 30, $posy);
+		$pdf->MultiCell(50, 4, $object->ref, 0, 'L', 1);
+		
+		// Total payments
+		$pdf->SetXY($this->page_largeur - $this->marge_droite - 50, $posy);
+		$pdf->MultiCell(50, 4, price($object->montant), 0, 'R', 1);
+		$posy += 20;
+		
+		// translate amount
+		$currency = $conf->currency;
+		$translateinletter = strtoupper(dol_convertToWord($object->montant, $outputlangs ,$currency));
+		$pdf->SetXY($this->marge_gauche + 50, $posy);
+		$pdf->MultiCell(90, 8, $translateinletter, 0, 'L', 1);
+		$posy += 8;
+		
+		// To
+		$pdf->SetXY($this->marge_gauche + 50, $posy);
+		$pdf->MultiCell(150, 4, $object->thirdparty->nom, 0, 'L', 1);
+		
+		$pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy);
+		$pdf->MultiCell(35, 4, str_pad(price($object->montant). ' '.$currency,18,'*',STR_PAD_LEFT), 0, 'R', 1);
+		$posy += 10;
+		
+		
+		// City
+		$pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy);
+		$pdf->MultiCell(150, 4, $mysoc->town, 0, 'L', 1);
+		$posy += 4;
+		
+		// Date
+		$pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy);
+		$pdf->MultiCell(150, 4, date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y"), 0, 'L', 1);
+		
 	}
 
+
 	/**
 	 *   Show table for lines
 	 *
@@ -759,7 +534,7 @@ class pdf_cow extends ModelePDFSuppliersPayments
 	 */
 	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
 	{
-		global $conf;
+		global $conf,$mysoc;
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom=0;
@@ -771,175 +546,23 @@ class pdf_cow extends ModelePDFSuppliersPayments
 		$pdf->SetTextColor(0,0,0);
 		$pdf->SetFont('','',$default_font_size - 2);
 
-		if (empty($hidetop))
-		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
-			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
-			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+		$titre = strtoupper($mysoc->town).', le '.date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y");
+		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3) - 60, $tab_top-6);
+		$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+		
+		$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
+		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top);
+		$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
-			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
-		}
 
 		$pdf->SetDrawColor(128,128,128);
 		$pdf->SetFont('','', $default_font_size - 1);
 
 		// Output Rect
-		$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
-
-		if (empty($hidetop))
-		{
-			$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
-
-			$pdf->SetXY($this->posxdesc-1, $tab_top+1);
-			$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
-		}
-
-        if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-        {
-    		$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
-    			$pdf->SetXY($this->posxtva-3, $tab_top+1);
-    			$pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
-			}
-        }
-
-		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			$pdf->SetXY($this->posxup-1, $tab_top+1);
-			$pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
-		}
-
-		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			$pdf->SetXY($this->posxqty-1, $tab_top+1);
-			if($conf->global->PRODUCT_USE_UNITS)
-			{
-				$pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
-			}
-			else
-			{
-				$pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
-			}
-		}
-
-		if($conf->global->PRODUCT_USE_UNITS) {
-			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
-			if (empty($hidetop)) {
-				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
-				$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '',
-					'C');
-			}
-		}
-
-		$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			if ($this->atleastonediscount)
-			{
-				$pdf->SetXY($this->posxdiscount-1, $tab_top+1);
-				$pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
-			}
-		}
-
-		if ($this->atleastonediscount)
-		{
-			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-		}
-		if (empty($hidetop))
-		{
-			$pdf->SetXY($this->postotalht-1, $tab_top+1);
-			$pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHTShort"),'','C');
-		}
+		//$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
 
 	}
 
-	/**
-	 *  Show payments table
-	 *
-	 *  @param	PDF			$pdf     		Object PDF
-	 *  @param  FactureFournisseur		$object     	Object invoice
-	 *	@param	int			$posy			Position y in PDF
-	 *	@param	Translate	$outputlangs	Object langs for output
-	 *	@return int							<0 if KO, >0 if OK
-	 */
-	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
-	{
-		$tab3_posx = 120;
-		$tab3_top = $posy + 8;
-		$tab3_width = 80;
-		$tab3_height = 4;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$tab3_posx -= 20;
-		}
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		$pdf->SetFont('','', $default_font_size - 3);
-		$pdf->SetXY($tab3_posx, $tab3_top - 4);
-		$pdf->MultiCell(60, 3, $outputlangs->transnoentities("PaymentsAlreadyDone"), 0, 'L', 0);
-
-		$pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width, $tab3_top);
-
-		$pdf->SetFont('','', $default_font_size - 4);
-		$pdf->SetXY($tab3_posx, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+21, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+40, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+58, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
-
-		$pdf->line($tab3_posx, $tab3_top-1+$tab3_height, $tab3_posx+$tab3_width, $tab3_top-1+$tab3_height);
-
-		$y=0;
-
-		$pdf->SetFont('','', $default_font_size - 4);
-
-		// Loop on each payment
-		$sql = "SELECT p.datep as date, p.fk_paiement as type, p.num_paiement as num, pf.amount as amount,";
-		$sql.= " cp.code";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf, ".MAIN_DB_PREFIX."paiementfourn as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
-		$sql.= " WHERE pf.fk_paiementfourn = p.rowid and pf.fk_facturefourn = ".$object->id;
-		$sql.= " ORDER BY p.datep";
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-		    $num = $this->db->num_rows($resql);
-			$i=0;
-			while ($i < $num) {
-			    $y+=3;
-				$row = $this->db->fetch_object($resql);
-
-				$pdf->SetXY($tab3_posx, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, price($row->amount), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+40, $tab3_top+$y);
-				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->code);
-
-				$pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+58, $tab3_top+$y);
-				$pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
-
-				$pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
-
-				$i++;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-
-	}
 
 	/**
 	 *  Show top header of page.
@@ -972,7 +595,6 @@ class pdf_cow extends ModelePDFSuppliersPayments
 		$pdf->SetXY($this->marge_gauche,$posy);
 
 		// Logo
-		/*
 		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 		if ($mysoc->logo)
 		{
@@ -990,11 +612,11 @@ class pdf_cow extends ModelePDFSuppliersPayments
 			}
 		}
 		else
-		{*/
+		{
 			$text=$this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
-		//}
-
+		}
+/*
 		$pdf->SetFont('','B', $default_font_size + 3);
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
@@ -1054,7 +676,7 @@ class pdf_cow extends ModelePDFSuppliersPayments
 
 		// Show list of linked objects
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
-
+*/
 		if ($showaddress)
 		{
 			// Sender properties
@@ -1065,7 +687,7 @@ class pdf_cow extends ModelePDFSuppliersPayments
 			$posx=$this->marge_gauche;
 			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
 			$hautcadre=40;
-
+/*
 			// Show sender frame
 			$pdf->SetTextColor(0,0,0);
 			$pdf->SetFont('','', $default_font_size - 2);
@@ -1087,7 +709,7 @@ class pdf_cow extends ModelePDFSuppliersPayments
 			$pdf->SetFont('','', $default_font_size - 1);
 			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
-
+*/
 
 			// If BILLING contact defined on invoice, we use it
 			$usecontact=false;
@@ -1111,7 +733,7 @@ class pdf_cow extends ModelePDFSuppliersPayments
 			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,((!empty($object->contact))?$object->contact:null),$usecontact,'target',$object);
 
 			// Show recipient
-			$widthrecbox=100;
+			$widthrecbox=90;
 			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
 			$posy=42;
 			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
@@ -1121,7 +743,7 @@ class pdf_cow extends ModelePDFSuppliersPayments
 			$pdf->SetTextColor(0,0,0);
 			$pdf->SetFont('','', $default_font_size - 2);
 			$pdf->SetXY($posx+2,$posy-5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":",0,'L');
+			$pdf->MultiCell($widthrecbox, 5, "",0,'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 96ac5a4d01b..f65a5dd126c 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -812,3 +812,40 @@ SearchIntoContracts=Contrats
 SearchIntoCustomerShipments=Expéditions clients
 SearchIntoExpenseReports=Notes de frais
 SearchIntoLeaves=Congés
+
+#Numbers translate
+centimes=centimes
+one=un
+two=deux
+three=trois
+four=quatre
+five=cinq
+six=six
+seven=sept
+eight=huit
+nine=neuf
+ten=dix
+eleven=onze
+twelve=douze
+thirteen=treize
+fourteen=quatorze
+fifteen=quinze
+sixteen=seize
+seventeen=dix-sept
+eighteen=dix-huit
+nineteen=dix-neuf
+twenty=vingt
+thirty=trente
+forty=quarante
+fifty=cinquante
+sixty=soixante
+seventy=soixante-dix
+eighty=quatre-vingt
+ninety=quatre-vingt-dix
+hundred=cent
+hundreds=cents
+thousand=mille
+million=million
+billion=milliard
+trillion=billion
+quadrillion=quadrillion
\ No newline at end of file

From 951ea51285615a84f6dc61a1e9ba35077fd19774 Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Fri, 17 Feb 2017 16:44:57 +0100
Subject: [PATCH 0277/1163] FIX translate model admin

---
 htdocs/langs/fr_FR/suppliers.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index c7bc56acdbf..94c22ec47c8 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Ne pas commander
 NotTheGoodQualitySupplier=Mauvaise qualité
 ReputationForThisProduct=Réputation
 BuyerName=Nom de l'acheteur
+SuppliersPaymentModel=Model liste des factures réglées par ce paiement
\ No newline at end of file

From fd111cb1c6d361cfeb7f171837330a1637150de2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 17 Feb 2017 17:11:14 +0100
Subject: [PATCH 0278/1163] NEW tooltip can be on hover or on click with
 textwithpicto function.

---
 htdocs/comm/mailing/card.php          |  9 +++++--
 htdocs/core/class/html.form.class.php | 38 ++++++++++++++++++++-------
 htdocs/core/lib/functions.lib.php     |  4 +--
 htdocs/langs/en_US/admin.lang         | 10 +++----
 htdocs/main.inc.php                   | 11 +++++++-
 5 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index b7f2a002105..dba13b84cb6 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -697,9 +697,14 @@ if ($action == 'create')
 		$htmltext.=$key.' = '.$langs->trans($val).'<br>';
 	}
 	$htmltext.='</i>';
-			
+
+	
+	$availablelink=$form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'availvar');
+	//print '<a href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$objMod->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'</a>';
+	
+	
 	// Print mail form
-	print load_fiche_titre($langs->trans("NewMailing"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext), 'title_generic');
+	print load_fiche_titre($langs->trans("NewMailing"), $availablelink, 'title_generic');
 
 	dol_fiche_head();
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5637d52ace7..d5b50b9afe7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -404,11 +404,12 @@ class Form
      *	@param	int			$notabs				0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
      *	@param	string		$incbefore			Include code before the text
      *	@param	int			$noencodehtmltext	Do not encode into html entity the htmltext
+     *  @param  int         $tooltiptrigger     ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
      *	@return	string							Code html du tooltip (texte+picto)
      *	@see	Use function textwithpicto if you can.
      *  TODO Move this as static as soon as everybody use textwithpicto or @Form::textwithtooltip
      */
-    function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 2, $incbefore = '', $noencodehtmltext = 0)
+    function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 2, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger='')
     {
         global $conf;
 
@@ -427,12 +428,30 @@ class Form
         if ($direction < 0) { $extracss=($extracss?$extracss.' ':'').'inline-block'; $extrastyle='padding: 0px; padding-left: 3px !important;'; }
         if ($direction > 0) { $extracss=($extracss?$extracss.' ':'').'inline-block'; $extrastyle='padding: 0px; padding-right: 3px !important;'; }
 
+        $classfortooltip='classfortooltip';
+        
+        $s='';$textfordialog='';
+        
         $htmltext=str_replace('"',"&quot;",$htmltext);
-        if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on img tag to store tooltip
+        if ($tooltiptrigger != '') 
+        {
+            $classfortooltip='classfortooltiponclick';
+            $textfordialog.='<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';
+        }
+        if ($tooltipon == 2 || $tooltipon == 3) 
+        {
+            $paramfortooltipimg=' class="'.$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'"';
+            if ($tooltiptrigger == '') $paramfortooltipimg.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on img tag to store tooltip
+            else $paramfortooltipimg.=' dolid="'.$tooltiptrigger.'"';
+        }
         else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
-        if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
+        if ($tooltipon == 1 || $tooltipon == 3) 
+        {
+            $paramfortooltiptd=' class="'.$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" ';
+            if ($tooltiptrigger == '') $paramfortooltiptd.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
+            else $paramfortooltiptd.=' dolid="'.$tooltiptrigger.'"';
+        }
         else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
-        $s="";
         if (empty($notabs)) $s.='<table class="nobordernopadding" summary=""><tr style="height: auto;">';
         elseif ($notabs == 2) $s.='<div class="inline-block">';
         // Define value if value is before
@@ -441,7 +460,7 @@ class Form
             if ($tag == 'td') {
                 $s .= ' valign="top" width="14"';
             }
-            $s.= '>'.$img.'</'.$tag.'>';
+            $s.= '>'.$textfordialog.$img.'</'.$tag.'>';
         }
         // Use another method to help avoid having a space in value in order to use this value with jquery
         // Define label
@@ -450,7 +469,7 @@ class Form
         if ($direction > 0) {
             $s.='<'.$tag.$paramfortooltipimg;
             if ($tag == 'td') $s .= ' valign="middle" width="14"';
-            $s.= '>'.$img.'</'.$tag.'>';
+            $s.= '>'.$textfordialog.$img.'</'.$tag.'>';
         }
         if (empty($notabs)) $s.='</tr></table>';
 		elseif ($notabs == 2) $s.='</div>';
@@ -468,9 +487,10 @@ class Form
      *  @param  string	$extracss           Add a CSS style to td, div or span tag
      *  @param  int		$noencodehtmltext   Do not encode into html entity the htmltext
      *  @param	int		$notabs				0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
+     *  @param  int     $tooltiptrigger     ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
      * 	@return	string						HTML code of text, picto, tooltip
      */
-    function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 2)
+    function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 2, $tooltiptrigger='')
     {
         global $conf;
 
@@ -498,13 +518,13 @@ class Form
         }
 
         if ($type == 'info') $img = img_help(0, $alt);
-        elseif ($type == 'help') $img = img_help(1, $alt);
+        elseif ($type == 'help') $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
         elseif ($type == 'superadmin') $img = img_picto($alt, 'redstar');
         elseif ($type == 'admin') $img = img_picto($alt, 'star');
         elseif ($type == 'warning') $img = img_warning($alt);
 		else $img = img_picto($alt, $type);
 
-        return $this->textwithtooltip($text, $htmltext, 2, $direction, $img, $extracss, $notabs, '', $noencodehtmltext);
+        return $this->textwithtooltip($text, $htmltext, 2, $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger);
     }
 
     /**
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f4a85ee1a00..b5bf9cb67a4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2566,7 +2566,7 @@ function img_printer($titlealt = "default", $other='')
 /**
  *	Show help logo with cursor "?"
  *
- * 	@param	int              	$usehelpcursor		Use help cursor
+ * 	@param	int              	$usehelpcursor		1=Use help cursor, 2=Use click pointer cursor, 0=No specific cursor
  * 	@param	int|string	        $usealttitle		Text to use as alt title
  * 	@return string            	           			Return tag img
  */
@@ -2580,7 +2580,7 @@ function img_help($usehelpcursor = 1, $usealttitle = 1)
 		else $usealttitle = $langs->trans('Info');
 	}
 
-	return img_picto($usealttitle, 'info.png', ($usehelpcursor ? 'style="vertical-align: middle; cursor: help"' : 'style="vertical-align: middle;"'));
+	return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;'.($usehelpcursor == 1 ? ' cursor: help': ($usehelpcursor == 2 ? ' cursor: pointer':'')).'"');
 }
 
 /**
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 18c0373e993..a7f7f860eeb 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -421,7 +421,7 @@ ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The cod
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.  
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account). 
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -1171,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1483,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2d225458119..a47a19ee860 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1926,7 +1926,16 @@ if (! function_exists("llxFooter"))
     		print '<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery(".classfortooltip").tipTip({maxWidth: "'.dol_size(($conf->browser->layout == 'phone' ? 400 : 700),'width').'px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50});
-            	});
+            		jQuery(".classfortooltiponclicktext").dialog({ width: 500, autoOpen: false });
+            		jQuery(".classfortooltiponclick").click(function () {
+            		    console.log("We click on tooltip for element with dolid="+$(this).attr(\'dolid\'));
+            		    if ($(this).attr(\'dolid\'))
+            		    {
+                            obj=$("#idfortooltiponclick_"+$(this).attr(\'dolid\'));
+            		        obj.dialog("open");
+            		    }
+            		});
+                });
             </script>' . "\n";
         }
         

From 26b8112d4ef23024d5f61a3d3b526bb665ee9b83 Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Mon, 20 Feb 2017 09:22:57 +0100
Subject: [PATCH 0279/1163] FIX travis check

---
 htdocs/core/lib/functionsnumtoword.lib.php           | 12 +++++++-----
 .../modules/supplier_payment/pdf/pdf_cow.modules.php |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index 2e51567da7c..156a046db5a 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -29,14 +29,15 @@
  * @deprecated
  * @param	float 	$numero			Number to convert
  * @param	Lang	$langs			Language
- * @param	string	$numorcurrency	'number' or 'amount'
- * @return 	string  				Text of the number or -1 in case TOO LONG (more than 1000000000000.99)
+ * @param	boolean	$currency		0=number to translate | 1=currency to translate
+ * @param	boolean	$centimes		0=no centimes | 1=centimes to translate
+ * @return 	string  				Text of the number
  */
-function dol_convertToWord($num = false, $langs, $currency=false, $centimes=false)
+function dol_convertToWord($num=0, $langs, $currency=false, $centimes=false)
 {
 	global $conf;
 	
-    $num = str_replace(array(',', ' '), '' , trim($num));
+    $num = str_replace(array(',', ' '), '', trim($num));
     if(! $num) {
         return false;
     }
@@ -89,6 +90,7 @@ function dol_convertToWord($num = false, $langs, $currency=false, $centimes=fals
     	$langs->transnoentitiesnoconv('trillion'), 
     	$langs->transnoentitiesnoconv('quadrillion')
     );
+	
     $num_length = strlen($num);
     $levels = (int) (($num_length + 2) / 3);
     $max_length = $levels * 3;
@@ -103,7 +105,7 @@ function dol_convertToWord($num = false, $langs, $currency=false, $centimes=fals
         if ( $tens < 20 ) {
             $tens = ($tens ? ' ' . $list1[$tens] . ' ' : '' );
         } else {
-            $tens = (int)($tens / 10);
+            $tens = (int) ($tens / 10);
             $tens = ' ' . $list2[$tens] . ' ';
             $singles = (int) ($num_levels[$i] % 10);
             $singles = ' ' . $list1[$singles] . ' ';
diff --git a/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php b/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
index 5e570a6cfe9..83c0d38b0ce 100644
--- a/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
+++ b/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
@@ -494,7 +494,7 @@ class pdf_cow extends ModelePDFSuppliersPayments
 		
 		// translate amount
 		$currency = $conf->currency;
-		$translateinletter = strtoupper(dol_convertToWord($object->montant, $outputlangs ,$currency));
+		$translateinletter = strtoupper(dol_convertToWord($object->montant,$outputlangs,$currency));
 		$pdf->SetXY($this->marge_gauche + 50, $posy);
 		$pdf->MultiCell(90, 8, $translateinletter, 0, 'L', 1);
 		$posy += 8;

From 842859c394cef345ab2f876fb9462711d5ac0756 Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Mon, 20 Feb 2017 10:16:28 +0100
Subject: [PATCH 0280/1163] FIX travis bis

---
 htdocs/core/lib/functionsnumtoword.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index 156a046db5a..7df62774ca6 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -26,14 +26,14 @@
 /**
  * Function to return number in text.
  * 
- * @deprecated
- * @param	float 	$numero			Number to convert
+ * 
+ * @param	float 	$num			Number to convert
  * @param	Lang	$langs			Language
  * @param	boolean	$currency		0=number to translate | 1=currency to translate
  * @param	boolean	$centimes		0=no centimes | 1=centimes to translate
  * @return 	string  				Text of the number
  */
-function dol_convertToWord($num=0, $langs, $currency=false, $centimes=false)
+function dol_convertToWord($num, $langs, $currency=false, $centimes=false)
 {
 	global $conf;
 	

From 07d6bbf8354f92417b7d440a57691a90bf73b6cd Mon Sep 17 00:00:00 2001
From: Alexis ALGOUD <alexis@atm-consulting.fr>
Date: Mon, 20 Feb 2017 15:53:43 +0100
Subject: [PATCH 0281/1163] change for tms

---
 htdocs/core/class/coreobject.class.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 2022844d6fe..aa4d96dbbaa 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -33,8 +33,6 @@ class CoreObject extends CommonObject {
 	
 	public $no_update_tms = false;
 	
-	public $date_0 = '1001-01-01 00:00:00'; //TODO there is a solution for this ?
-	
 	public $error = '';
 	/*
 	 *  @var Array $_fields Fields to synchronize with Database
@@ -53,8 +51,8 @@ class CoreObject extends CommonObject {
 	protected function init() {
 		
 		$this->id = 0;
-		$this->datec = time();
-		$this->tms = time();
+		$this->datec = 0;
+		$this->tms = 0;
 		
 		if(!empty($this->__fields)) {
 			foreach ($this->__fields as $field=>$info) {
@@ -156,7 +154,7 @@ class CoreObject extends CommonObject {
 	
 			if($this->is_date($info)){
 				if(empty($this->{$field})){
-					$query[$field] = $this->date_0;
+					$query[$field] = NULL;
 				}
 				else{
 					$query[$field] = $this->db->idate($this->{$field});
@@ -197,7 +195,7 @@ class CoreObject extends CommonObject {
 
 		foreach ($this->__fields as $field=>$info) {
 			if($this->is_date($info)){
-				if($obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00')$this->{$field} = 0;
+				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00')$this->{$field} = 0;
 				else $this->{$field} = strtotime($obj->{$field});
 			}
 			elseif($this->is_array($info)){
@@ -346,7 +344,6 @@ class CoreObject extends CommonObject {
 			
 			$query = $this->set_save_query();
 			$query['rowid']=$this->id;
-			if(empty($this->no_update_tms))$query['tms'] = date('Y-m-d H:i:s');
 				
 			$res = $this->db->update($this->table_element,$query,array('rowid'));
 			
@@ -375,7 +372,6 @@ class CoreObject extends CommonObject {
 		$query = array();
 		$query = $this->set_save_query();
 		$query['datec'] = date("Y-m-d H:i:s",$this->datec);
-		if(empty($this->no_update_tms))$query['tms'] = date('Y-m-d H:i:s');
 		
 		$res = $this->db->insert($this->table_element,$query);
 	
@@ -426,7 +422,6 @@ class CoreObject extends CommonObject {
 	}
 	public function get_date($field,$format='') {
 		if(empty($this->{$field})) return '';
-		elseif($this->{$field}<=strtotime('1000-01-01 00:00:00')) return '';
 		else {
 			
 			return dol_print_date($this->{$field}, $format);

From 4a97864d2356b21657e31009c5da658383b29c64 Mon Sep 17 00:00:00 2001
From: Alexis ALGOUD <alexis@atm-consulting.fr>
Date: Mon, 20 Feb 2017 15:54:02 +0100
Subject: [PATCH 0282/1163] change for tms

---
 htdocs/core/class/coreobject.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index aa4d96dbbaa..312120c59bf 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -31,8 +31,6 @@ class CoreObject extends CommonObject {
 	
 	public $withChild = true;
 	
-	public $no_update_tms = false;
-	
 	public $error = '';
 	/*
 	 *  @var Array $_fields Fields to synchronize with Database

From 1401e9267b5ec5a9554e2cb08f1d22b15847c9d3 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Tue, 21 Feb 2017 07:09:58 +0100
Subject: [PATCH 0283/1163] [FP17] Modify menu for multijournal

---
 htdocs/core/menus/standard/eldy.lib.php | 32 +++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index e16e6601940..5f2a5f5def6 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -993,6 +993,37 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				{
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('',$langs->trans("Journalization"),1,$user->rights->accounting->comptarapport->lire);
 
+					// Multi journal
+					$sql = "SELECT rowid, code, label, nature";
+					$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+					// $sql.= " WHERE entity = ".$conf->entity;
+					$sql.= " ORDER BY code";
+
+					$resql = $db->query($sql);
+					if ($resql)
+					{
+						$numr = $db->num_rows($resql);
+						$i = 0;
+
+						if ($numr > 0)
+						while ($i < $numr)
+						{
+							$objp = $db->fetch_object($resql);
+
+							if ($objp->nature == 1) $nature="sells";
+							if ($objp->nature == 2) $nature="purchases";
+							if ($objp->nature == 3) $nature="bank";
+							if ($objp->nature == 4) $nature="various";
+							if ($objp->nature == 9) $nature="hasnew";
+
+							if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
+							$i++;
+						}
+					}
+					else dol_print_error($db);
+					$db->free($resql);
+
+					/*
 					$sql = "SELECT rowid, label, accountancy_journal";
 					$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
 					$sql.= " WHERE entity = ".$conf->entity;
@@ -1020,6 +1051,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/journal/sellsjournal.php?mainmenu=accountancy&amp;leftmenu=accountancy_journal",$langs->trans("SellsJournal"),2,$user->rights->accounting->comptarapport->lire);
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&amp;leftmenu=accountancy_journal",$langs->trans("PurchasesJournal"),2,$user->rights->accounting->comptarapport->lire);
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&amp;leftmenu=accountancy_journal",$langs->trans("ExpenseReportsJournal"),2,$user->rights->accounting->comptarapport->lire);
+					*/
 				}
 
 				// General Ledger

From 992f292a05ac368ab7cabc819bb67e7c58105f72 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2017 10:59:49 +0100
Subject: [PATCH 0284/1163] Translation

---
 htdocs/langs/en_US/main.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 56aa0fb9dcb..705355c16b4 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -796,7 +796,7 @@ Select2NotFound=No result found
 Select2Enter=Enter
 Select2MoreCharacter=or more character
 Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties

From 7ab600781dd68a275b49679320e544df97730c56 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2017 11:57:52 +0100
Subject: [PATCH 0285/1163] NEW Move login information on home page into a
 widget

---
 htdocs/adherents/stats/byproperties.php |   2 +-
 htdocs/core/boxes/box_lastlogin.php     | 113 ++++++++++++++++++++++++
 htdocs/core/modules/modUser.class.php   |   4 +-
 htdocs/index.php                        |   6 +-
 htdocs/install/upgrade2.php             |  15 ++++
 htdocs/langs/en_US/boxes.lang           |   1 +
 htdocs/langs/en_US/members.lang         |   1 +
 7 files changed, 137 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/core/boxes/box_lastlogin.php

diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 6b7c1c003a9..c717d20be84 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -120,7 +120,7 @@ print '<table class="liste" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Nature").'</td>';
 print '<td align="right">'.$langs->trans("NbOfMembers").'</td>';
-print '<td align="center">'.$langs->trans("LastMemberDate").'</td>';
+print '<td align="center">'.$langs->trans("LatestSubscriptionDate").'</td>';
 print '</tr>';
 
 if (! $foundphy) $data[]=array('label'=>'phy','nb'=>'0','lastdate'=>'');
diff --git a/htdocs/core/boxes/box_lastlogin.php b/htdocs/core/boxes/box_lastlogin.php
new file mode 100644
index 00000000000..7211877a593
--- /dev/null
+++ b/htdocs/core/boxes/box_lastlogin.php
@@ -0,0 +1,113 @@
+<?php
+/* Copyright (C) 2012      Charles-François BENKE <charles.fr@benke.fr>
+ * Copyright (C) 2005-2017 Laurent Destailleur    <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2015 Frederic France        <frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/core/boxes/box_lastlogin.php
+ *  \ingroup    core
+ *  \brief      Module to show box of bills, orders & propal of the current year
+ */
+
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
+
+/**
+ * Class to manage the box of last login
+ */
+class box_lastlogin extends ModeleBoxes
+{
+    var $boxcode="lastlogin";
+    var $boximg="object_user";
+    var $boxlabel='BoxLoginInformation';
+    var $depends = array("user");
+
+    var $db;
+    var $param;
+    var $enabled = 1;
+
+    var $info_box_head = array();
+    var $info_box_contents = array();
+
+
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $conf;
+
+        $this->db=$db;
+    }
+
+    /**
+     *  Charge les donnees en memoire pour affichage ulterieur
+     *
+     *  @param  int     $max        Maximum number of records to load
+     *  @return void
+     */
+    function loadBox($max=5)
+    {
+        global $conf, $user, $langs, $db;
+
+        $textHead = $langs->trans("BoxLoginInformation");
+        $this->info_box_head = array(
+            'text' => $textHead,
+            'limit'=> dol_strlen($textHead),
+        );
+        
+        $line=0;
+        $this->info_box_contents[$line][0] = array(
+            'td' => '',
+            'text' => $langs->trans("User"),
+        );
+        $this->info_box_contents[$line][1] = array(
+            'td' => '',
+            'text' => $user->getNomUrl(1),
+            'asis' => 1
+        );
+        
+        $line=1;
+        $this->info_box_contents[$line][0] = array(
+            'td' => '',
+            'text' => $langs->trans("PreviousConnexion"),
+        );
+        if ($user->datepreviouslogin) $tmp= dol_print_date($user->datepreviouslogin,"dayhour",'tzuser');
+        else $tmp= $langs->trans("Unknown");
+        $this->info_box_contents[$line][1] = array(
+            'td' => '',
+            'text' => $tmp,
+        );
+        
+    }
+
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *	@return	void
+	 */
+    function showBox($head = null, $contents = null, $nooutput=0)
+    {
+		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
+}
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index f481cdffb8e..f4e9b0d7356 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -74,7 +74,9 @@ class modUser extends DolibarrModules
 		$this->const = array();
 
 		// Boxes
-		$this->boxes = array();
+		$this->boxes = array(
+		    0=>array('file'=>'box_lastlogin.php','enabledbydefaulton'=>'Home'),
+		);
 
 		// Permissions
 		$this->rights = array();
diff --git a/htdocs/index.php b/htdocs/index.php
index 233f94ea22c..4e2fac98fa5 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -113,6 +113,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 /*
  * Informations area
  */
+/* Was moved into a widget
 $boxinfo='';
 $boxinfo.= '<div class="box">';
 $boxinfo.= '<table summary="'.dol_escape_htmltag($langs->trans("LoginInformation")).'" class="noborder boxtable" width="100%">';
@@ -127,8 +128,7 @@ $boxinfo.= '</td>';
 $boxinfo.= "</tr>\n";
 $boxinfo.= "</table>\n";
 $boxinfo.= '</div>';
-//print $boxinfo;
-
+*/
 
 /*
  * Dashboard Dolibarr states (statistics)
@@ -593,7 +593,7 @@ $boxlist.='<tr><td class="notopnoleftnoright">'."\n";
 
 $boxlist.='<div class="fichehalfleft">';
 
-$boxlist.=$boxinfo;
+//$boxlist.=$boxinfo;
 $boxlist.=$boxstat;
 $boxlist.=$resultboxes['boxlista'];
 
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 09aa85d48c3..c9391256f66 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -431,6 +431,21 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
             migrate_reload_menu($db,$langs,$conf,$versionto);
         }
         
+        // Scripts for last version
+        $afterversionarray=explode('.','5.0.9');
+        $beforeversionarray=explode('.','6.0.9');
+        if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
+        {
+            // Reload modules (this must be always and only into last targeted version)
+            $listofmodule=array(
+                'MAIN_MODULE_USER'=>'newboxdefonly',
+            );
+            migrate_reload_modules($db,$langs,$conf,$listofmodule);
+        
+            // Reload menus (this must be always and only into last targeted version)
+            migrate_reload_menu($db,$langs,$conf,$versionto);
+        }
+        
         // Can force activation of some module during migration with third paramater = MAIN_MODULE_XXX,MAIN_MODULE_YYY,...
         if ($enablemodules)
         {
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 38b03b4268d..0e6c5019cac 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Login information
 BoxLastRssInfos=Rss information
 BoxLastProducts=Latest %s products/services
 BoxProductsAlertStock=Stock alerts for products
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 21feb74c829..d306d6e4998 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -150,6 +150,7 @@ MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
+LatestSubscriptionDate=Latest subscription date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval

From 19e60f03b942a3a2edc9e91196c8874a0e2936b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2017 14:17:44 +0100
Subject: [PATCH 0286/1163] Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable
 useless search forms

---
 htdocs/adherents/index.php         |  49 +++++++-------
 htdocs/comm/index.php              | 100 +++++++++++++++--------------
 htdocs/comm/mailing/index.php      |  29 +++++----
 htdocs/comm/propal/index.php       |  22 +++----
 htdocs/commande/index.php          |  22 ++++---
 htdocs/compta/index.php            |  73 +++++++++++----------
 htdocs/contrat/index.php           |  30 +++++----
 htdocs/don/index.php               |  46 +++++++------
 htdocs/expedition/index.php        |  18 +++---
 htdocs/fichinter/index.php         |  22 ++++---
 htdocs/fourn/commande/index.php    |  22 +++----
 htdocs/hrm/index.php               |  68 ++++++++++----------
 htdocs/product/index.php           |  52 +++++++--------
 htdocs/product/stock/index.php     |  23 +++----
 htdocs/projet/activity/index.php   |  56 ++++++++--------
 htdocs/projet/index.php            |  48 +++++++-------
 htdocs/societe/index.php           |  60 ++++++++---------
 htdocs/supplier_proposal/index.php |  22 ++++---
 18 files changed, 403 insertions(+), 359 deletions(-)

diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index af259296c37..ef20c2e96c0 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -125,34 +125,37 @@ if ($result)
 //print '<tr><td width="30%" class="notopnoleft" valign="top">';
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-// Search contact/address
-if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
-{
-	$listofsearchfields['search_member']=array('text'=>'Member');
-}
 
-if (count($listofsearchfields))
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
+    // Search contact/address
+    if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
+    {
+    	$listofsearchfields['search_member']=array('text'=>'Member');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
 
-
 /*
  * Statistics
  */
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 4e99b7072fc..c967f303648 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -77,57 +77,59 @@ print load_fiche_titre($langs->trans("CommercialArea"),'','title_commercial.png'
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-// Search proposal
-if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$listofsearchfields['search_proposal']=array('text'=>'Proposal');
+    // Search proposal
+    if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
+    {
+    	$listofsearchfields['search_proposal']=array('text'=>'Proposal');
+    }
+    // Search customer order
+    if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+    {
+    	$listofsearchfields['search_customer_order']=array('text'=>'CustomerOrder');
+    }
+    // Search supplier proposal
+    if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
+    {
+        $listofsearchfields['search_supplier_proposal']=array('text'=>'SupplierProposalShort');
+    }
+    // Search supplier order
+    if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
+    {
+    	$listofsearchfields['search_supplier_order']=array('text'=>'SupplierOrder');
+    }
+    // Search intervention
+    if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire)
+    {
+    	$listofsearchfields['search_intervention']=array('text'=>'Intervention');
+    }
+    // Search contract
+    if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
+    {
+        $listofsearchfields['search_contract']=array('text'=>'Contract');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+    		if ($i == 0) print '<td class="noborderbottom" rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button "></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
-// Search customer order
-if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
-{
-	$listofsearchfields['search_customer_order']=array('text'=>'CustomerOrder');
-}
-// Search supplier proposal
-if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
-{
-    $listofsearchfields['search_supplier_proposal']=array('text'=>'SupplierProposalShort');
-}
-// Search supplier order
-if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
-{
-	$listofsearchfields['search_supplier_order']=array('text'=>'SupplierOrder');
-}
-// Search intervention
-if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire)
-{
-	$listofsearchfields['search_intervention']=array('text'=>'Intervention');
-}
-// Search contract
-if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
-{
-    $listofsearchfields['search_contract']=array('text'=>'Contract');
-}
-
-if (count($listofsearchfields))
-{
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td class="noborderbottom" rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button "></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
-}
-
 
 
 /*
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index ba8c2481411..0ea109960e7 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -49,19 +49,22 @@ print load_fiche_titre($langs->trans("MailingArea"));
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-// Recherche emails
-$var=false;
-print '<form method="post" action="'.DOL_URL_ROOT.'/comm/mailing/list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAMailing").'</td></tr>';
-print '<tr '.$bc[$var].'><td class="nowrap">';
-print $langs->trans("Ref").':</td><td><input type="text" class="flat inputsearch" name="sref"></td>';
-print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print '<tr '.$bc[$var].'><td class="nowrap">';
-print $langs->trans("Other").':</td><td><input type="text" class="flat inputsearch" name="sall"></td>';
-
-print "</table></form><br>\n";
+//if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+//{
+    // Recherche emails
+    $var=false;
+    print '<form method="post" action="'.DOL_URL_ROOT.'/comm/mailing/list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAMailing").'</td></tr>';
+    print '<tr '.$bc[$var].'><td class="nowrap">';
+    print $langs->trans("Ref").':</td><td><input type="text" class="flat inputsearch" name="sref"></td>';
+    print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print '<tr '.$bc[$var].'><td class="nowrap">';
+    print $langs->trans("Other").':</td><td><input type="text" class="flat inputsearch" name="sall"></td>';
+    
+    print "</table></form><br>\n";
+//}
 
 
 // Affiche stats de tous les modules de destinataires mailings
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 4b03cb48429..82d57f721da 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -59,17 +59,17 @@ print load_fiche_titre($langs->trans("ProspectionArea"));
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-/*
- * Search form
- */
-$var=false;
-print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal/list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("Proposal").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print "</table></form><br>\n";
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    $var=false;
+    print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal/list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("Proposal").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print "</table></form><br>\n";
+}
 
 
 /*
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 5731535697e..24e07b5ab07 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -62,16 +62,18 @@ print load_fiche_titre($langs->trans("OrdersArea"));
 //print '<tr><td valign="top" width="30%" class="notopnoleft">';
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-
-// Search customer orders
-$var=false;
-print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("CustomerOrder").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print "</table></form><br>\n";
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    // Search customer orders
+    $var=false;
+    print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("CustomerOrder").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print "</table></form><br>\n";
+}
 
 
 /*
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index add2a4cfcb1..44d9aa4d3c1 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -61,6 +61,8 @@ if ($user->societe_id > 0)
 	$socid = $user->societe_id;
 }
 
+$max=3;
+
 
 /*
  * Actions
@@ -88,44 +90,45 @@ print load_fiche_titre($langs->trans("AccountancyTreasuryArea"),'','title_accoun
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-$max=3;
-
-
-// Search customer invoices
-if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$listofsearchfields['search_invoice']=array('text'=>'CustomerInvoice');
-}
-// Search supplier invoices
-if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
-{
-	$listofsearchfields['search_supplier_invoice']=array('text'=>'SupplierInvoice');
-}
-if (! empty($conf->don->enabled) && $user->rights->don->lire)
-{
-	$langs->load("donations");
-	$listofsearchfields['search_donation']=array('text'=>'Donation');
+    // Search customer invoices
+    if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+    {
+    	$listofsearchfields['search_invoice']=array('text'=>'CustomerInvoice');
+    }
+    // Search supplier invoices
+    if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
+    {
+    	$listofsearchfields['search_supplier_invoice']=array('text'=>'SupplierInvoice');
+    }
+    if (! empty($conf->don->enabled) && $user->rights->don->lire)
+    {
+    	$langs->load("donations");
+    	$listofsearchfields['search_donation']=array('text'=>'Donation');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
-if (count($listofsearchfields))
-{
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
-}
 
 /**
  * Draft customers invoices
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 2a2d2d35891..b1d99c60d20 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -72,21 +72,25 @@ print load_fiche_titre($langs->trans("ContractsArea"),'','title_commercial.png')
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-// Search contract
-if (! empty($conf->contrat->enabled))
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$var=false;
-	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover" width="100%">';
-	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-	print '<tr '.$bc[$var].'>';
-	print '<td class="nowrap">'.$langs->trans("Contract").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
-	print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print "</table></form>\n";
-	print "<br>";
+    // Search contract
+    if (! empty($conf->contrat->enabled))
+    {
+    	$var=false;
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover" width="100%">';
+    	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    	print '<tr '.$bc[$var].'>';
+    	print '<td class="nowrap">'.$langs->trans("Contract").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
+    	print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    	print "</table></form>\n";
+    	print "<br>";
+    }
 }
 
+
 /*
  * Statistics
  */
@@ -251,7 +255,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 
 			$i = 0;
 			//$tot_ttc = 0;
-			while ($i < $num && $i < 20)
+			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
 				print '<tr '.$bc[$var].'><td class="nowrap">';
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index 5e4b2966051..daf82d85bbc 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -81,30 +81,34 @@ print load_fiche_titre($langs->trans("DonationsArea"));
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-if (! empty($conf->don->enabled) && $user->rights->don->lire)
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$listofsearchfields['search_donation']=array('text'=>'Donation');
+    if (! empty($conf->don->enabled) && $user->rights->don->lire)
+    {
+    	$listofsearchfields['search_donation']=array('text'=>'Donation');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
-if (count($listofsearchfields))
-{
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
-}
 
 print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre">';
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 33aae04c5ab..e9bfa8a484c 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -47,14 +47,16 @@ print load_fiche_titre($langs->trans("SendingsArea"));
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-$var=false;
-print '<form method="post" action="list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("Shipment").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print "</table></form><br>\n";
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    print '<form method="post" action="list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("Shipment").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print "</table></form><br>\n";
+}
 
 /*
  * Shipments to validate
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 54392795f13..f1592b1e13b 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -59,16 +59,18 @@ print load_fiche_titre($langs->trans("InterventionsArea"));
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-
-// Search ficheinter
-$var=false;
-print '<table class="noborder nohover" width="100%">';
-print '<form method="post" action="'.DOL_URL_ROOT.'/fichinter/list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("Intervention").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print "</form></table><br>\n";
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    // Search ficheinter
+    $var=false;
+    print '<table class="noborder nohover" width="100%">';
+    print '<form method="post" action="'.DOL_URL_ROOT.'/fichinter/list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("Intervention").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print "</form></table><br>\n";
+}
 
 
 /*
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index fe702b5838b..8ad4b9f4857 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -53,17 +53,17 @@ print load_fiche_titre($langs->trans("SuppliersOrdersArea"));
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-/*
- * Search form
- */
-$var=false;
-print '<form method="post" action="list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("SupplierOrder").':</td><td><input type="text" class="flat" name="search_all" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print "</table></form><br>\n";
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    $var=false;
+    print '<form method="post" action="list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("SupplierOrder").':</td><td><input type="text" class="flat" name="search_all" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print "</table></form><br>\n";
+}
 
 
 /*
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 30d0c911ba1..e8038497e2c 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -77,40 +77,42 @@ print load_fiche_titre($langs->trans("HRMArea"),'', 'title_hrm.png');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-
-if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$langs->load("holiday");
-    $listofsearchfields['search_holiday']=array('text'=>'TitreRequestCP');
-}
-if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
-{
-	$langs->load("trips");
-    $listofsearchfields['search_deplacement']=array('text'=>'ExpenseReport');
-}
-if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
-{
-	$langs->load("trips");
-    $listofsearchfields['search_expensereport']=array('text'=>'ExpenseReport');
-}
-if (count($listofsearchfields))
-{
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
+    if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
+    {
+    	$langs->load("holiday");
+        $listofsearchfields['search_holiday']=array('text'=>'TitreRequestCP');
+    }
+    if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
+    {
+    	$langs->load("trips");
+        $listofsearchfields['search_deplacement']=array('text'=>'ExpenseReport');
+    }
+    if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
+    {
+    	$langs->load("trips");
+        $listofsearchfields['search_expensereport']=array('text'=>'ExpenseReport');
+    }
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
 
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 74a974804ff..84991a76db2 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -77,35 +77,35 @@ print load_fiche_titre($transAreaType,$linkback,'title_products.png');
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-/*
- * Search Area of product/service
- */
- 
-// Search contract
-if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && ($user->rights->produit->lire || $user->rights->service->lire))
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$listofsearchfields['search_product']=array('text'=>'ProductOrService');
+    // Search contract
+    if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && ($user->rights->produit->lire || $user->rights->service->lire))
+    {
+    	$listofsearchfields['search_product']=array('text'=>'ProductOrService');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
-if (count($listofsearchfields))
-{
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
-}
 
 /*
  * Number of products and/or services
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 5f075370df6..7349b48d1c9 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -48,17 +48,18 @@ print load_fiche_titre($langs->trans("StocksArea"));
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-/*
- * Zone recherche entrepot
- */
-print '<form method="post" action="'.DOL_URL_ROOT.'/product/stock/list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
-print "<tr class=\"liste_titre\">";
-print '<td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print "<tr ".$bc[false]."><td>";
-print $langs->trans("Warehouse").':</td><td><input class="flat" type="text" size="18" name="sall"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print "</table></form><br>";
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    print '<form method="post" action="'.DOL_URL_ROOT.'/product/stock/list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print "<tr class=\"liste_titre\">";
+    print '<td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print "<tr ".$bc[false]."><td>";
+    print $langs->trans("Warehouse").':</td><td><input class="flat" type="text" size="18" name="sall"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print "</table></form><br>";
+}
+
 
 $sql = "SELECT e.label, e.rowid, e.statut";
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index adf6efbc95c..4586c8d52a6 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -74,33 +74,36 @@ else
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-// Search project
-if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$listofsearchfields['search_task']=array('text'=>'Task');
+    // Search project
+    if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+    {
+    	$listofsearchfields['search_task']=array('text'=>'Task');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
-if (count($listofsearchfields))
-{
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
-}
-
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 /* Affichage de la liste des projets d'aujourd'hui */
 print '<table class="noborder" width="100%">';
@@ -156,8 +159,11 @@ print "</tr>\n";
 print "</table>";
 
 
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+
 /* Affichage de la liste des projets d'hier */
-print '<br><table class="noborder" width="100%">';
+print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans('ActivityOnProjectYesterday').'</td>';
 print '<td align="right">'.$langs->trans("Time").'</td>';
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index c91bfe1f980..f3690eee61e 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -98,30 +98,34 @@ else dol_print_error($db);
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-// Search project
-if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
-{
-	$listofsearchfields['search_project']=array('text'=>'Project');
-}
 
-if (count($listofsearchfields))
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
+    // Search project
+    if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+    {
+    	$listofsearchfields['search_project']=array('text'=>'Project');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
 
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 333ee590f2d..5fa0fd37210 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -57,36 +57,38 @@ print load_fiche_titre($transAreaType,$linkback,'title_companies.png');
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-
-// Search thirdparty
-if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$listofsearchfields['search_thirdparty']=array('text'=>'ThirdParty');
-}
-// Search contact/address
-if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
-{
-	$listofsearchfields['search_contact']=array('text'=>'Contact');
-}
-
-if (count($listofsearchfields))
-{
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Search").'</th></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
+    // Search thirdparty
+    if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+    {
+    	$listofsearchfields['search_thirdparty']=array('text'=>'ThirdParty');
+    }
+    // Search contact/address
+    if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+    {
+    	$listofsearchfields['search_contact']=array('text'=>'Contact');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Search").'</th></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
 
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 9e07aaf5d96..eec34a02987 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -60,15 +60,19 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 /*
  * Search form
  */
-$var=false;
-print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("SupplierProposal").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print '</tr>';
-print "</table></form><br>\n";
+
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    $var=false;
+    print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("SupplierProposal").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print '</tr>';
+    print "</table></form><br>\n";
+}
 
 
 /*

From c8de64892459b2ecb6cf2f2e62e146b39b690486 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Tue, 21 Feb 2017 19:07:57 +0100
Subject: [PATCH 0287/1163] fix unit trad

---
 htdocs/core/class/html.form.class.php |  4 ++--
 htdocs/langs/en_US/products.lang      | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d5b50b9afe7..7cc473e9670 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3266,11 +3266,11 @@ class Form
             {
                 if ($selected == $res->rowid)
                 {
-                    $return.='<option value="'.$res->rowid.'" selected>'.$langs->trans($res->label).'</option>';
+                    $return.='<option value="'.$res->rowid.'" selected>'.($langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label).'</option>';
                 }
                 else
                 {
-                    $return.='<option value="'.$res->rowid.'">'.$langs->trans($res->label).'</option>';
+                    $return.='<option value="'.$res->rowid.'">'.($langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label).'</option>';
                 }
             }
             $return.='</select>';
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 9897facb0bb..b38b714ddfb 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -175,6 +175,18 @@ m2=m²
 m3=m³
 liter=liter
 l=L
+unitP=Piece
+unitSET=Set
+unitS=Second
+unitH=Hour
+unitD=Day
+unitKG=Kilogram
+unitG=Gram
+unitM=Meter
+unitLM=Linear meter
+unitM2=Square meter
+unitM3=Cubic meter
+unitL=Liter
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 CurrentProductPrice=Current price

From 1681445427e05609e763d46629cb55618edeb6be Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2017 00:08:25 +0100
Subject: [PATCH 0288/1163] Remove useless line

---
 htdocs/core/class/html.form.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d5b50b9afe7..e017c298089 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6025,7 +6025,7 @@ class Form
                 if ($object->photo) $ret.="<br>\n";
                 $ret.='<table class="nobordernopadding centpercent">';
                 if ($object->photo) $ret.='<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
-                $ret.='<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
+                //$ret.='<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
                 $ret.='<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput"></td></tr>';
                 $ret.='</table>';
             }

From d5bb208957af1986817def4084529287e9acd184 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2017 02:19:50 +0100
Subject: [PATCH 0289/1163] Clean admin menu entries

---
 htdocs/admin/system/about.php           | 46 +++------------------
 htdocs/admin/system/dolibarr.php        | 55 +++++++++++++++++++++----
 htdocs/admin/tools/index.php            |  4 +-
 htdocs/core/menus/init_menu_auguria.sql |  3 +-
 htdocs/core/menus/standard/eldy.lib.php |  6 +--
 htdocs/langs/en_US/admin.lang           |  4 +-
 htdocs/support/index.php                | 20 ++++-----
 7 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index e9e2e0f1749..bb6e2372b47 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -63,7 +63,7 @@ if ($action == 'getlastversion')
 llxHeader();
 
 
-print load_fiche_titre("Dolibarr",'','title_setup');
+print load_fiche_titre($langs->trans("ExternalResources"),'','title_setup');
 
 print '<div style="padding-left: 30px;">'.img_picto_common('', 'dolibarr_box.png','height="120"').'</div>';
 
@@ -71,45 +71,6 @@ print '<div style="padding-left: 30px;">'.img_picto_common('', 'dolibarr_box.png
 
 print '<div class="fichecenter"><div class="fichehalfleft">';
 
-print $langs->trans("CurrentVersion").' : <strong>'.DOL_VERSION.'</strong><br>';
-
-if (function_exists('curl_init'))
-{
-    $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
-    
-    if ($action == 'getlastversion')
-    {
-        if ($sfurl)
-        {
-                    while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
-            {
-                $title=$sfurl->channel[0]->item[$i]->title;
-                if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
-                {
-                    $newversion=$reg[1];
-                    $newversionarray=explode('.',$newversion);
-                    $versionarray=explode('.',$version);
-                    //var_dump($newversionarray);var_dump($versionarray);
-                    if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion;
-                }
-                $i++;
-            }
-            
-            // Show version
-        	print $langs->trans("LastStableVersion").' : <b>'. (($version != '0.0')?$version:$langs->trans("Unknown")) .'</b><br>';
-        }
-        else
-        {
-            print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>';
-        }
-    }
-    else
-    {
-        print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">' .$langs->trans("Check").'</a><br>';
-    }
-}
-print '<br>';
-
 print $langs->trans("DolibarrLicense").' : ';
 print '<ul><li>';
 print '<a href="http://www.gnu.org/copyleft/gpl.html">GNU-GPL v3+</a></li>';
@@ -201,6 +162,11 @@ $url='https://wiki.dolibarr.org/index.php/Subscribe';
 if (preg_match('/^fr_/i',$langs->getDefaultLang())) $url='https://wiki.dolibarr.org/index.php/Adh%C3%A9rer';
 if (preg_match('/^es_/i',$langs->getDefaultLang())) $url='https://wiki.dolibarr.org/index.php/Subscribirse';
 print '<li><a href="'.$url.'" target="_blank" rel="external">'.$langs->trans("SubscribeToFoundation").'</a></li>';
+print '</ul>';
+
+print $langs->trans("SocialNetworks").':';
+
+print '<ul>';
 
 print '<li><a href="https://facebook.com/dolibarr" target="_blank" rel="external">FaceBook</a></li>';
 print '<li><a href="https://twitter.com/dolibarr" target="_blank" rel="external">Twitter</a></li>';
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index d7bd421770c..baabd8f630d 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -52,23 +52,60 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
 $var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastUpgrade").'</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionProgram").'</td><td>'.DOL_VERSION;
+print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").')</td><td>'.DOL_VERSION;
 // If current version differs from last upgrade
 if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
 {
-	// Compare version with last install database version (upgrades never occured)
-	if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_INSTALL));
+    // Compare version with last install database version (upgrades never occured)
+    if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_INSTALL));
 }
 else
 {
-	// Compare version with last upgrade database version
-	if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE));
+    // Compare version with last upgrade database version
+    if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE));
 }
+
+if (function_exists('curl_init'))
+{
+    $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
+    print ' &nbsp; &nbsp; - &nbsp; &nbsp; ';
+    if ($action == 'getlastversion')
+    {
+        if ($sfurl)
+        {
+            while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
+            {
+                $title=$sfurl->channel[0]->item[$i]->title;
+                if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
+                {
+                    $newversion=$reg[1];
+                    $newversionarray=explode('.',$newversion);
+                    $versionarray=explode('.',$version);
+                    //var_dump($newversionarray);var_dump($versionarray);
+                    if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion;
+                }
+                $i++;
+            }
+
+            // Show version
+            print $langs->trans("LastStableVersion").' : <b>'. (($version != '0.0')?$version:$langs->trans("Unknown")) .'</b><br>';
+        }
+        else
+        {
+            print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>';
+        }
+    }
+    else
+    {
+        print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">' .$langs->trans("Check").'</a><br>';
+    }
+}
+
 print '</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
 print '</table>';
 print '</div>';
 print '<br>';
diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php
index 8da041d05da..6f773c5b35e 100644
--- a/htdocs/admin/tools/index.php
+++ b/htdocs/admin/tools/index.php
@@ -37,8 +37,8 @@ if (! $user->admin)
 
 $form = new Form($db);
 
-$title=$langs->trans("SystemToolsArea");
-if (GETPOST('leftmenu') == 'admintools') $title=$langs->trans("ModulesSystemTools");
+$title=$langs->trans("AdminTools");
+//if (GETPOST('leftmenu') == 'admintools') $title=$langs->trans("ModulesSystemTools");
 
 llxHeader('', $title);
 
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 61fc86f72f7..e52583c48f0 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -57,8 +57,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 307__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listevents.php?leftmenu=admintools', 'Audit', 1, 'admin', '', '', 2, 10, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 308__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listsessions.php?leftmenu=admintools', 'Sessions', 1, 'admin', '', '', 2, 11, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 309__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/purge.php?leftmenu=admintools', 'Purge', 1, 'admin', '', '', 2, 12, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 310__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/support/index.php?leftmenu=admintools', 'HelpCenter', 1, 'help', '', '_blank', 2, 13, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 311__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/about.php?leftmenu=admintools', 'About', 1, 'admin', '', '', 2, 14, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 311__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/about.php?leftmenu=admintools', 'ExternalResources', 1, 'admin', '', '', 2, 14, __ENTITY__);
 
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 320__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools', 'ProductVatMassChange', 1, 'products', '', '', 2, 0, __ENTITY__);
 -- Home - Menu users and groups
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 47432c979c5..228c6447a22 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -565,21 +565,19 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add('/admin/system/database.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoDatabase'), 1);
 				if (function_exists('eaccelerator_info')) $newmenu->add("/admin/tools/eaccelerator.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("EAccelerator"),1);
 				//$newmenu->add("/admin/system/perf.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoPerf"),1);
-				$newmenu->add("/admin/tools/purge.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Purge"),1);
 				$newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Backup"),1);
 				$newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Restore"),1);
 				$newmenu->add("/admin/tools/update.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("MenuUpgrade"),1);
+				$newmenu->add("/admin/tools/purge.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Purge"),1);
 				$newmenu->add("/admin/tools/listevents.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Audit"),1);
 				$newmenu->add("/admin/tools/listsessions.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Sessions"),1);
-				$newmenu->add('/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('About'), 1);
+				$newmenu->add('/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('ExternalResources'), 1);
 
 				if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 				{
 					$langs->load("products");
 				    $newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
 				}
-
-				$newmenu->add("/support/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("HelpCenter"),1,1,'targethelp');
 			}
 
 			$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users');
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index aeb6e22dce2..4776dffc835 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -224,7 +224,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
diff --git a/htdocs/support/index.php b/htdocs/support/index.php
index a895cf5cb1e..0e27107ef54 100644
--- a/htdocs/support/index.php
+++ b/htdocs/support/index.php
@@ -44,7 +44,7 @@ $langs->load("help");
 
 pHeader($langs->trans("DolibarrHelpCenter"), $_SERVER["PHP_SELF"]);
 
-print $langs->trans("HelpCenterDesc1")."<br>\n";
+print '<br>'.$langs->trans("HelpCenterDesc1")."<br>\n";
 print $langs->trans("HelpCenterDesc2")."<br>\n";
 
 print '<br>';
@@ -62,13 +62,13 @@ $style1='color: #333344; font-size: 16px; font-weight: bold';
 $style2='color: #5D4455; font-weight: bold;';
 
 print "\n";
-print '<div style="width: 100%"><div class="inline-block">';
+print '<div style="width: 100%; text-align: center"><div class="inline-block">';
 print "\n";
 
 // Forum/wiki support
 print '<table class="login tablesupport" width="100%">';
 print '<tr class="title" valign="top">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
 
 print '<table summary="who"><tr><td>'.img_picto('','who.png','',1).'</td><td>';
 
@@ -82,7 +82,7 @@ print '</td>';
 print '</tr>';
 
 print '<tr>';
-print '<td align="center" valign="top">';
+print '<td align="center" valign="middle">';
 
 print '<table class="nocellnopadd">';
 print '<tr><td align="center">';
@@ -112,7 +112,7 @@ print '</div><div class="inline-block">';
 // Official support
 print '<table class="login" width="100%">';
 print '<tr class="title">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
 
 print '<table summary="community"><tr><td>'.img_picto('','internet.png','',1).'</td><td>';
 print '<font style="'.$style1.'">'.$langs->trans("OfficialSupport").'</font>';
@@ -124,7 +124,7 @@ print '</td></tr></table>';
 
 print '</td>';
 print '</tr><tr>';
-print '<td align="center" valign="top">';
+print '<td align="center" valign="middle">';
 print '<table class="nocellnopadd">';
 print '<tr><td align="center">';
 
@@ -148,7 +148,7 @@ print '</div><div class="inline-block">';
 // Online support
 print '<table class="login" width="100%">';
 print '<tr class="title">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
 
 print '<table summary="community"><tr><td>'.img_picto('','internet.png','',1).'</td><td>';
 
@@ -161,7 +161,7 @@ print '</td></tr></table>';
 
 print '</td>';
 print '</tr><tr>';
-print '<td align="center" valign="top">';
+print '<td align="center" valign="middle">';
 print '<table class="nocellnopadd">';
 print '<tr><td align="center">';
 print '<br>'.$langs->trans("ToSeeListOfAvailableRessources").'<br>';
@@ -181,7 +181,7 @@ print '</div><div class="inline-block">';
 // EMail support
 print '<table class="login tablesupport" width="100%">';
 print '<tr class="title" valign="top">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
 
 print '<table summary="mail"><tr><td>'.img_picto('','mail.png','',1).'</td><td>';
 
@@ -214,7 +214,7 @@ print '</div><div class="inline-block">';
 // Other support
 print '<table class="login tablesupport" width="100%">';
 print '<tr class="title">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
 
 print '<table summary="special"><tr><td>'.img_picto('','pagemaster.png','',1).'</td><td>';
 

From 86c399db70f87abf5a05de863e8323b51eb0179c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2017 02:32:35 +0100
Subject: [PATCH 0290/1163] Clean admin menu entries

---
 htdocs/admin/system/about.php    | 48 +++++++++++++++-----------------
 htdocs/admin/system/dolibarr.php | 21 ++++++++++++++
 2 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index bb6e2372b47..61780d51386 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -26,16 +26,13 @@
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $langs->load("admin");
 $langs->load("help");
 $langs->load("members");
 $langs->load("other");
 
-$youuselaststable = 0;
-
 $action=GETPOST('action','alpha');
 
 if (! $user->admin) accessforbidden();
@@ -48,12 +45,7 @@ $version='0.0';
  *	Actions
  */
 
-if ($action == 'getlastversion')
-{
-    $result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
-    //var_dump($result['content']);
-    $sfurl = simplexml_load_string($result['content']);
-}
+// None
 
 
 /*
@@ -196,25 +188,29 @@ print '</div>';
 print '<div class="clearboth"></div>';
 
 
-if ($youuselaststable)
+$showpromotemessage=1;
+if ($showpromotemessage)
 {
-    print '<br>';
-    print '<br>';
-    
     $tmp=versiondolibarrarray();
-    if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0))
+    if (is_numeric($tmp[2]))    // Not alpha, beta or rc
     {
-        print $langs->trans("TitleExampleForMajorRelease").':<br>';
-        print '<textarea style="width:80%; min-height: 60px">';
-        print $langs->trans("ExampleOfNewsMessageForMajorRelease", DOL_VERSION, DOL_VERSION);
-        print '</textarea>';
-    }
-    else
-    {
-        print $langs->trans("TitleExampleForMaintenanceRelease").':<br>';
-        print '<textarea style="width:80%; min-height: 60px">';
-        print $langs->trans("ExampleOfNewsMessageForMaintenanceRelease", DOL_VERSION, DOL_VERSION);
-        print '</textarea>';
+        print '<br>';
+        print '<br>';
+        
+        if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0))
+        {
+            print $langs->trans("TitleExampleForMajorRelease").':<br>';
+            print '<textarea style="width:80%; min-height: 60px">';
+            print $langs->trans("ExampleOfNewsMessageForMajorRelease", DOL_VERSION, DOL_VERSION);
+            print '</textarea>';
+        }
+        else
+        {
+            print $langs->trans("TitleExampleForMaintenanceRelease").':<br>';
+            print '<textarea style="width:80%; min-height: 60px">';
+            print $langs->trans("ExampleOfNewsMessageForMaintenanceRelease", DOL_VERSION, DOL_VERSION);
+            print '</textarea>';
+        }
     }
 }
 
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index baabd8f630d..6a5384da69a 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -25,15 +25,36 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $langs->load("admin");
 $langs->load("install");
 $langs->load("other");
 
+$action=GETPOST('action','alpha');
+
 if (! $user->admin)
 	accessforbidden();
 
+$sfurl = '';
+$version='0.0';
 
+
+
+/*
+ *	Actions
+ */
+
+if ($action == 'getlastversion')
+{
+    $result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
+    //var_dump($result['content']);
+    $sfurl = simplexml_load_string($result['content']);
+}
+
+	
 /*
  * View
  */

From 942b58efaf3d0091b33d1a12d7e1d7b9880e6deb Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 22 Feb 2017 06:33:52 +0100
Subject: [PATCH 0291/1163] New : Integration of Stripe

---
 .tx/config                                    |   6 +
 build/rpm/dolibarr_fedora.spec                |   1 +
 build/rpm/dolibarr_generic.spec               |   1 +
 build/rpm/dolibarr_mandriva.spec              |   1 +
 build/rpm/dolibarr_opensuse.spec              |   1 +
 htdocs/adherents/admin/public.php             |   5 +-
 htdocs/adherents/subscription.php             |   7 +
 htdocs/compta/facture.php                     |   6 +
 htdocs/core/modules/modStripe.class.php       | 103 ++
 ...face_20_modStripe_StripeWorkflow.class.php | 113 ++
 .../interface_90_all_Demo.class.php-NORUN     |   1 +
 htdocs/langs/en_US/stripe.lang                |  40 +
 htdocs/public/demo/index.php                  |   2 +-
 htdocs/public/members/new.php                 |  16 +-
 htdocs/public/paybox/paymentko.php            |   1 +
 htdocs/public/paybox/paymentok.php            |   1 +
 htdocs/public/paypal/newpayment.php           |   1 +
 htdocs/public/paypal/paymentko.php            |   1 +
 htdocs/public/paypal/paymentok.php            |   1 +
 htdocs/public/stripe/index.php                |  28 +
 htdocs/public/stripe/newpayment.php           | 977 ++++++++++++++++++
 htdocs/public/stripe/paymentko.php            | 115 +++
 htdocs/public/stripe/paymentok.php            | 172 +++
 htdocs/stripe/admin/index.html                |   0
 htdocs/stripe/admin/stripe.php                | 225 ++++
 htdocs/stripe/img/index.html                  |   0
 htdocs/stripe/img/object_stripe.png           | Bin 0 -> 819 bytes
 htdocs/stripe/index.html                      |   0
 htdocs/stripe/lib/index.html                  |   0
 htdocs/stripe/lib/stripe.lib.php              | 445 ++++++++
 htdocs/theme/eldy/style.css.php               |   2 +-
 htdocs/theme/md/style.css.php                 |   2 +-
 32 files changed, 2267 insertions(+), 7 deletions(-)
 create mode 100644 htdocs/core/modules/modStripe.class.php
 create mode 100644 htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php
 create mode 100644 htdocs/langs/en_US/stripe.lang
 create mode 100644 htdocs/public/stripe/index.php
 create mode 100644 htdocs/public/stripe/newpayment.php
 create mode 100644 htdocs/public/stripe/paymentko.php
 create mode 100644 htdocs/public/stripe/paymentok.php
 create mode 100644 htdocs/stripe/admin/index.html
 create mode 100644 htdocs/stripe/admin/stripe.php
 create mode 100644 htdocs/stripe/img/index.html
 create mode 100644 htdocs/stripe/img/object_stripe.png
 create mode 100644 htdocs/stripe/index.html
 create mode 100644 htdocs/stripe/lib/index.html
 create mode 100644 htdocs/stripe/lib/stripe.lib.php

diff --git a/.tx/config b/.tx/config
index 010227f6e61..ae2741c9852 100644
--- a/.tx/config
+++ b/.tx/config
@@ -326,6 +326,12 @@ source_file = htdocs/langs/en_US/stocks.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.stripe]
+file_filter = htdocs/langs/<lang>/stripe.lang
+source_file = htdocs/langs/en_US/stripe.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.suppliers]
 file_filter = htdocs/langs/<lang>/suppliers.lang
 source_file = htdocs/langs/en_US/suppliers.lang
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index e65e6bc3b7d..c0119e54e9e 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -202,6 +202,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 655ef87f925..54ff3b6cac8 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -282,6 +282,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 55fb7183734..7237de58a70 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -199,6 +199,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index f7e29927ebb..9e12a96e054 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -210,6 +210,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index a23c1f40def..488b1bc542b 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -179,7 +179,7 @@ print '</td><td align="right">';
 print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT",(! empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)?$conf->global->MEMBER_NEWFORM_EDITAMOUNT:0),1);
 print "</td></tr>\n";
 
-if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
+if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled))
 {
 	// Jump to an online payment page
 	$var=! $var;
@@ -189,11 +189,12 @@ if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
 	$listofval=array();
 	if (! empty($conf->paybox->enabled)) $listofval['paybox']='Paybox';
 	if (! empty($conf->paypal->enabled)) $listofval['paypal']='PayPal';
+	if (! empty($conf->stripe->enabled)) $listofval['stripe']='Stripe';
 	print $form->selectarray("MEMBER_NEWFORM_PAYONLINE",$listofval,(! empty($conf->global->MEMBER_NEWFORM_PAYONLINE)?$conf->global->MEMBER_NEWFORM_PAYONLINE:''),1);
 	print "</td></tr>\n";
 }
 
-if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
+if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled))
 {
     // Jump to an online payment page
     $var=! $var;
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 0c9c8467f1f..ba33c1c73b6 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -871,6 +871,13 @@ if ($rowid > 0)
             print showPaypalPaymentUrl('membersubscription',$object->ref);
         }
 
+        // Link for stripe payment
+        if (! empty($conf->stripe->enabled))
+        {
+            include_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
+            print showStripePaymentUrl('membersubscription',$object->ref);
+        }
+
     }
 
     /*
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 29cbe624fca..34ce3226c7e 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -4207,6 +4207,12 @@ else if ($id > 0 || ! empty($ref))
 			print showPaypalPaymentUrl('invoice', $object->ref);
 		}
 
+		// Link for stripe payment
+		if (! empty($conf->stripe->enabled) && $object->statut != 0) {
+			include_once DOL_DOCUMENT_ROOT . '/stripe/lib/stripe.lib.php';
+			print showStripePaymentUrl('invoice', $object->ref);
+		}
+
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 		// List of actions on element
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
new file mode 100644
index 00000000000..11dd6ee68e4
--- /dev/null
+++ b/htdocs/core/modules/modStripe.class.php
@@ -0,0 +1,103 @@
+<?php
+/* Copyright (C) 2003		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2016		Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	\defgroup   stripe     Module stripe
+ * 	\brief      Add integration with Stripe online payment system.
+ *  \file       htdocs/core/modules/modStripe.class.php
+ *  \ingroup    stripe
+ *  \brief      Description and activation file for module Stripe
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ * 	Description and activation class for module Paybox
+ */
+class modStripe extends DolibarrModules
+{
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+
+        // Id for module (must be unique).
+        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+        $this->numero = 50300;
+        // Key text used to identify module (for permissions, menus, etc...)
+        $this->rights_class = 'stripe';
+
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
+        $this->family = "other";
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+        $this->description = "Module to offer an online payment page by credit card with Stripe";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Where to store the module in setup page (0=common,1=interface,2=other)
+        $this->special = 1;
+        // Name of image file used for this module.
+        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+        // If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
+        $this->picto='stripe@stripe';
+
+        // Data directories to create when module is enabled.
+        $this->dirs = array('/stripe/temp');
+
+        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
+        $this->config_page_url = array("stripe.php@stripe");
+
+        // Dependencies
+        $this->depends = array();		// List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of modules id to disable if this one is disabled
+        $this->phpmin = array(4,1);					// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(2,6);	// Minimum version of Dolibarr required by module
+        $this->langfiles = array("stripe");
+
+        // Constants
+        $this->const = array();			// List of particular constants to add when module is enabled
+
+        // New pages on tabs
+        $this->tabs = array();
+
+        // Boxes
+        $this->boxes = array();			// List of boxes
+        $r=0;
+
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $r=0;
+
+        // Main menu entries
+        $this->menus = array();			// List of menus to add
+        $r=0;
+
+        // Exports
+        $r=1;
+    }
+}
+
diff --git a/htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php b/htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php
new file mode 100644
index 00000000000..4fbf29c7b07
--- /dev/null
+++ b/htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php
@@ -0,0 +1,113 @@
+<?php
+/* Copyright (C) 2011-2012	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
+ * Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       /htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php
+ *      \ingroup    stripe
+ *      \brief      Trigger file for stripe workflow
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+
+
+/**
+ *  Class of triggers for stripe module
+ */
+class InterfaceStripeWorkflow extends DolibarrTriggers
+{
+	public $picto = 'stripe@stripe';
+	public $family = 'stripe';
+	public $description = "Triggers of this module allows to manage stripe workflow";
+	public $version = self::VERSION_DOLIBARR;
+
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+	 *
+	 * @param string		$action		Event action code
+	 * @param Object		$object     Object
+	 * @param User			$user       Object user
+	 * @param Translate		$langs      Object langs
+	 * @param conf			$conf       Object conf
+	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+    {
+        // Mettre ici le code a executer en reaction de l'action
+        // Les donnees de l'action sont stockees dans $object
+
+        if ($action == 'STRIPE_PAYMENT_OK')
+        {
+        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". source=".$object->source." ref=".$object->ref);
+
+        	if (! empty($object->source))
+        	{
+        		if ($object->source == 'membersubscription')
+        		{
+        			//require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherents.class.php';
+
+        			// TODO add subscription treatment
+        		}
+        		else
+        		{
+        			require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+
+        			$soc = new Societe($this->db);
+
+        			// Parse element/subelement (ex: project_task)
+        			$element = $path = $filename = $object->source;
+        			if (preg_match('/^([^_]+)_([^_]+)/i',$object->source,$regs))
+        			{
+        				$element = $path = $regs[1];
+        				$filename = $regs[2];
+        			}
+        			// For compatibility
+        			if ($element == 'order') {
+        				$path = $filename = 'commande';
+        			}
+        			if ($element == 'invoice') {
+        				$path = 'compta/facture'; $filename = 'facture';
+        			}
+
+        			dol_include_once('/'.$path.'/class/'.$filename.'.class.php');
+
+        			$classname = ucfirst($filename);
+        			$obj = new $classname($this->db);
+
+        			$ret = $obj->fetch('',$object->ref);
+        			if ($ret < 0) return -1;
+
+        			// Add payer id
+        			$soc->setValueFrom('ref_int', $object->payerID, 'societe', $obj->socid);
+
+        			// Add transaction id
+        			$obj->setValueFrom('ref_int',$object->resArray["TRANSACTIONID"]);
+        		}
+        	}
+        	else
+        	{
+        		// TODO add free tag treatment
+        	}
+
+        }
+
+		return 0;
+    }
+
+}
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
index 717ef6585f5..5a36bf1069a 100644
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
@@ -209,6 +209,7 @@ class InterfaceDemo extends DolibarrTriggers
 		    // Online  
 		    case 'PAYMENT_PAYBOX_OK':
 		    case 'PAYMENT_PAYPAL_OK':
+			case 'PAYMENT_STRIPE_OK':
 		    
 			// Donation
 		    case 'DON_CREATE':
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
new file mode 100644
index 00000000000..f19b4e44a52
--- /dev/null
+++ b/htdocs/langs/en_US/stripe.lang
@@ -0,0 +1,40 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Stripe module setup
+StripeDesc=This module offer pages to allow payment on <a href="http://www.stripe.com" target="_blank">Stripe</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeOrCBDoPayment=Pay with credit card or Stripe
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome on our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+StripeDoPayment=Go on payment
+YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe. 
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+MessageOK=Message on validated payment return page
+MessageKO=Message on canceled payment return page
+NewStripePaymentReceived=New Stripe payment received
+NewStripePaymentFailed=New Stripe payment tried but failed
+STRIPE_TEST_SECRET_KEY=Secret test key
+STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
+STRIPE_LIVE_SECRET_KEY=Secret live key
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
\ No newline at end of file
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index bcca53e9245..3c3353e5eb6 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -107,7 +107,7 @@ if (empty($reshook))
 
 	// Visible
 	$alwayscheckedmodules=array('barcode','bookmark','categorie','externalrss','fckeditor','geoipmaxmind','gravatar','memcached','syslog','user','webservices');  // Technical module we always want
-	$alwaysuncheckedmodules=array('dynamicprices','loan','multicurrency','paybox','paypal','google','printing','scanner','workflow');  // Module we never want
+	$alwaysuncheckedmodules=array('dynamicprices','loan','multicurrency','paybox','paypal','stripe','google','printing','scanner','workflow');  // Module we never want
 	// Not visible
 	$alwayshiddencheckedmodules=array('accounting','api','barcode','bookmark','clicktodial','comptabilite','cron','document','domain','externalrss','externalsite','fckeditor','geoipmaxmind','gravatar','label','ldap',
 									'mailmanspip','notification','oauth','syslog','user','webservices',
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index b101e656f67..104dec7ca09 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -27,7 +27,7 @@
  *  Note that you can add following constant to change behaviour of page
  *  MEMBER_NEWFORM_AMOUNT               Default amount for auto-subscribe form
  *  MEMBER_NEWFORM_EDITAMOUNT           Amount can be edited
- *  MEMBER_NEWFORM_PAYONLINE            Suggest payment with paypal of paybox
+ *  MEMBER_NEWFORM_PAYONLINE            Suggest payment with paypal, paybox or stripe
  *  MEMBER_NEWFORM_DOLIBARRTURNOVER     Show field turnover (specific for dolibarr foundation)
  *  MEMBER_URL_REDIRECT_SUBSCRIPTION    Url to redirect once subscribe submitted
  *  MEMBER_NEWFORM_FORCETYPE            Force type of member
@@ -314,6 +314,18 @@ if ($action == 'add')
                     	$urlback.='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $adh->ref, 2);
                     }
                     
+                }
+				else if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe')
+                {
+                    $urlback=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
+                    if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
+                    if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
+					/*
+                    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
+                    {
+                    	$urlback.='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $adh->ref, 2);
+                    }
+					*/
                 }
                 else
                 {
@@ -579,7 +591,7 @@ if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT)
     {
         $amount=GETPOST('amount')?GETPOST('amount'):$conf->global->MEMBER_NEWFORM_AMOUNT;
     }
-    // $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal' or 'paybox'
+    // $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
     print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">';
     if (! empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT))
     {
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index 09de4525b39..77c8e982a09 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -46,6 +46,7 @@ $langs->load("bills");
 $langs->load("companies");
 $langs->load("paybox");
 $langs->load("paypal");
+$langs->load("stripe");
 
 
 
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 9c3030a86ba..1d5c178f05f 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -46,6 +46,7 @@ $langs->load("bills");
 $langs->load("companies");
 $langs->load("paybox");
 $langs->load("paypal");
+$langs->load("stripe");
 
 /*$source=GETPOST('source');
 $ref=GETPOST('ref');
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index b5d105d6cf6..02e1e6ec8ad 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -53,6 +53,7 @@ $langs->load("companies");
 $langs->load("errors");
 $langs->load("paybox");
 $langs->load("paypal");
+$langs->load("stripe");
 
 // Input are:
 // type ('invoice','order','contractline'),
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index 4bad572ed8b..d7724a8fd6c 100644
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -50,6 +50,7 @@ $langs->load("bills");
 $langs->load("companies");
 $langs->load("paybox");
 $langs->load("paypal");
+$langs->load("stripe");
 
 $PAYPALTOKEN=GETPOST('TOKEN');
 if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index 90f13aa6f17..1913ab05879 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -50,6 +50,7 @@ $langs->load("bills");
 $langs->load("companies");
 $langs->load("paybox");
 $langs->load("paypal");
+$langs->load("stripe");
 
 // Clean parameters
 $PAYPAL_API_USER="";
diff --git a/htdocs/public/stripe/index.php b/htdocs/public/stripe/index.php
new file mode 100644
index 00000000000..0b7ad1c82e4
--- /dev/null
+++ b/htdocs/public/stripe/index.php
@@ -0,0 +1,28 @@
+<?php
+/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/paybox/index.php
+ *		\ingroup    core
+ *		\brief      A redirect page to an error
+ *		\author	    Laurent Destailleur
+ */
+
+require '../../master.inc.php';
+
+header("Location: ".DOL_URL_ROOT.'/public/error-404.php');
+
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
new file mode 100644
index 00000000000..33499fe7098
--- /dev/null
+++ b/htdocs/public/stripe/newpayment.php
@@ -0,0 +1,977 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For test: https://stripe.com/docs
+ */
+
+/**
+ *     	\file       htdocs/public/stripe/newpayment.php
+ *		\ingroup    stripe
+ *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
+// require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripefunctions.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+// Security check
+if (empty($conf->stripe->enabled)) accessforbidden('',0,0,1);
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("errors");
+$langs->load("paybox");
+$langs->load("paypal");
+$langs->load("stripe");
+
+// Input are:
+// type ('invoice','order','contractline'),
+// id (object id),
+// amount (required if id is empty),
+// tag (a free text, required if type is empty)
+// currency (iso code)
+
+$suffix=GETPOST("suffix",'alpha');
+$amount=price2num(GETPOST("amount"));
+if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
+else $currency=GETPOST("currency",'alpha');
+
+if (! GETPOST("action"))
+{
+    if (! GETPOST("amount") && ! GETPOST("source"))
+    {
+    	dol_print_error('',$langs->trans('ErrorBadParameters')." - amount or source");
+    	exit;
+    }
+    if (is_numeric($amount) && ! GETPOST("tag") && ! GETPOST("source"))
+    {
+    	dol_print_error('',$langs->trans('ErrorBadParameters')." - tag or source");
+    	exit;
+    }
+    if (GETPOST("source") && ! GETPOST("ref"))
+    {
+    	dol_print_error('',$langs->trans('ErrorBadParameters')." - ref");
+    	exit;
+    }
+}
+
+// Define $urlwithroot
+//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
+
+$urlok=$urlwithroot.'/public/stripe/paymentok.php?';
+$urlko=$urlwithroot.'/public/stripe/paymentko.php?';
+
+// Complete urls for post treatment
+$SOURCE=GETPOST("source",'alpha');
+$ref=$REF=GETPOST('ref','alpha');
+$TAG=GETPOST("tag",'alpha');
+$FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
+$SECUREKEY=GETPOST("securekey");	        // Secure key
+
+if (! empty($SOURCE))
+{
+    $urlok.='source='.urlencode($SOURCE).'&';
+    $urlko.='source='.urlencode($SOURCE).'&';
+}
+if (! empty($REF))
+{
+    $urlok.='ref='.urlencode($REF).'&';
+    $urlko.='ref='.urlencode($REF).'&';
+}
+if (! empty($TAG))
+{
+    $urlok.='tag='.urlencode($TAG).'&';
+    $urlko.='tag='.urlencode($TAG).'&';
+}
+if (! empty($FULLTAG))
+{
+    $urlok.='fulltag='.urlencode($FULLTAG).'&';
+    $urlko.='fulltag='.urlencode($FULLTAG).'&';
+}
+if (! empty($SECUREKEY))
+{
+    $urlok.='securekey='.urlencode($SECUREKEY).'&';
+    $urlko.='securekey='.urlencode($SECUREKEY).'&';
+}
+if (! empty($entity))
+{
+	$urlok.='entity='.urlencode($entity).'&';
+	$urlko.='entity='.urlencode($entity).'&';
+}
+$urlok=preg_replace('/&$/','',$urlok);  // Remove last &
+$urlko=preg_replace('/&$/','',$urlko);  // Remove last &
+
+// Check parameters
+$PAYPAL_API_OK="";
+if ($urlok) $PAYPAL_API_OK=$urlok;
+$PAYPAL_API_KO="";
+if ($urlko) $PAYPAL_API_KO=$urlko;
+/*
+if (empty($PAYPAL_API_USER))
+{
+    dol_print_error('',"Paypal setup param PAYPAL_API_USER not defined");
+    return -1;
+}
+if (empty($PAYPAL_API_PASSWORD))
+{
+    dol_print_error('',"Paypal setup param PAYPAL_API_PASSWORD not defined");
+    return -1;
+}
+if (empty($PAYPAL_API_SIGNATURE))
+{
+    dol_print_error('',"Paypal setup param PAYPAL_API_SIGNATURE not defined");
+    return -1;
+}
+*/
+
+// Check security token
+$valid=true;
+if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+{
+    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
+    {
+	    if ($SOURCE && $REF) $token = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $SOURCE . $REF, 2);    // Use the source in the hash to avoid duplicates if the references are identical
+	    else $token = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+    }
+    else
+    {
+        $token = $conf->global->PAYPAL_SECURITY_TOKEN;
+    }
+	if ($SECUREKEY != $token) $valid=false;
+
+	if (! $valid)
+	{
+    	print '<div class="error">Bad value for key.</div>';
+	    //print 'SECUREKEY='.$SECUREKEY.' token='.$token.' valid='.$valid;
+    	exit;
+	}
+}
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST("action") == 'dopayment')
+{
+	$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
+    $PAYPAL_PAYMENT_TYPE='Sale';
+
+    $shipToName=GETPOST("shipToName");
+    $shipToStreet=GETPOST("shipToStreet");
+    $shipToCity=GETPOST("shipToCity");
+    $shipToState=GETPOST("shipToState");
+    $shipToCountryCode=GETPOST("shipToCountryCode");
+    $shipToZip=GETPOST("shipToZip");
+    $shipToStreet2=GETPOST("shipToStreet2");
+    $phoneNum=GETPOST("phoneNum");
+    $email=GETPOST("email");
+    $desc=GETPOST("desc");
+
+	$mesg='';
+	if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))   $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
+	//elseif (empty($EMAIL))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
+	//elseif (! isValidEMail($EMAIL)) $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
+	elseif (empty($FULLTAG))        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
+
+    //var_dump($_POST);
+	if (empty($mesg))
+	{
+		dol_syslog("newpayment.php call paypal api and do redirect", LOG_DEBUG);
+
+		// Other
+		$PAYPAL_API_DEVISE="USD";
+		//if ($currency == 'EUR') $PAYPAL_API_DEVISE="EUR";
+		//if ($currency == 'USD') $PAYPAL_API_DEVISE="USD";
+        if (! empty($currency)) $PAYPAL_API_DEVISE=$currency;
+
+	    dol_syslog("Submit Paypal form", LOG_DEBUG);
+	    dol_syslog("PAYPAL_API_USER: $PAYPAL_API_USER", LOG_DEBUG);
+	    //dol_syslog("PAYPAL_API_PASSWORD: $PAYPAL_API_PASSWORD", LOG_DEBUG);  // No password into log files
+	    dol_syslog("PAYPAL_API_SIGNATURE: $PAYPAL_API_SIGNATURE", LOG_DEBUG);
+	    dol_syslog("PAYPAL_API_SANDBOX: $PAYPAL_API_SANDBOX", LOG_DEBUG);
+	    dol_syslog("PAYPAL_API_OK: $PAYPAL_API_OK", LOG_DEBUG);
+	    dol_syslog("PAYPAL_API_KO: $PAYPAL_API_KO", LOG_DEBUG);
+	    dol_syslog("PAYPAL_API_PRICE: $PAYPAL_API_PRICE", LOG_DEBUG);
+	    dol_syslog("PAYPAL_API_DEVISE: $PAYPAL_API_DEVISE", LOG_DEBUG);
+        dol_syslog("shipToName: $shipToName", LOG_DEBUG);
+        dol_syslog("shipToStreet: $shipToStreet", LOG_DEBUG);
+        dol_syslog("shipToCity: $shipToCity", LOG_DEBUG);
+        dol_syslog("shipToState: $shipToState", LOG_DEBUG);
+        dol_syslog("shipToCountryCode: $shipToCountryCode", LOG_DEBUG);
+        dol_syslog("shipToZip: $shipToZip", LOG_DEBUG);
+        dol_syslog("shipToStreet2: $shipToStreet2", LOG_DEBUG);
+        dol_syslog("phoneNum: $phoneNum", LOG_DEBUG);
+        dol_syslog("email: $email", LOG_DEBUG);
+        dol_syslog("desc: $desc", LOG_DEBUG);
+
+        dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG);	// If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO
+	    //$_SESSION["PaymentType"]=$PAYPAL_PAYMENT_TYPE;
+	    //$_SESSION["currencyCodeType"]=$PAYPAL_API_DEVISE;
+	    //$_SESSION["Payment_Amount"]=$PAYPAL_API_PRICE;
+
+	    // A redirect is added if API call successfull
+        print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
+
+		exit;
+	}
+}
+
+
+
+/*
+ * View
+ */
+
+llxHeaderStripe($langs->trans("PaymentForm"));
+
+if (! empty($PAYPAL_API_SANDBOX))
+{
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
+}
+
+// Common variables
+$creditor=$mysoc->name;
+$paramcreditor='PAYPAL_CREDITOR_'.$suffix;
+if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
+else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR;
+
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+print '<input type="hidden" name="action" value="dopayment">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
+print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print "\n";
+print '<!-- Form to send a Paypal payment -->'."\n";
+print '<!-- PAYPAL_API_SANDBOX = '.$conf->global->PAYPAL_API_SANDBOX.' -->'."\n";
+print '<!-- PAYPAL_API_INTEGRAL_OR_PAYPALONLY = '.$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY.' -->'."\n";
+print '<!-- creditor = '.$creditor.' -->'."\n";
+print '<!-- urlok = '.$urlok.' -->'."\n";
+print '<!-- urlko = '.$urlko.' -->'."\n";
+print "\n";
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
+// Show logo (search order: logo defined by PAYBOX_LOGO_suffix, then PAYBOX_LOGO, then small company logo, large company logo, theme logo, common logo)
+$width=0;
+// Define logo and logosmall
+$logosmall=$mysoc->logo_small;
+$logo=$mysoc->logo;
+$paramlogo='PAYBOX_LOGO_'.$suffix;
+if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
+else if (! empty($conf->global->PAYBOX_LOGO)) $logosmall=$conf->global->PAYBOX_LOGO;
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo='';
+if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
+{
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('thumbs/'.$logosmall);
+}
+elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+{
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode($logo);
+	$width=96;
+}
+// Output html code for logo
+if ($urllogo)
+{
+	print '<tr>';
+	print '<td align="center"><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
+	if ($width) print ' width="'.$width.'"';
+	print '></td>';
+	print '</tr>'."\n";
+}
+
+// Output introduction text
+$text='';
+if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
+{
+    $langs->load("members");
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+}
+if (empty($text))
+{
+    $text.='<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnPaymentPage").'</strong><br></td></tr>'."\n";
+    $text.='<tr><td class="textpublicpayment"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+}
+print $text;
+
+// Output payment summary form
+print '<tr><td align="center">';
+print '<table with="100%" id="tablepublicpayment">';
+print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
+
+$found=false;
+$error=0;
+$var=false;
+
+// Free payment
+if (! GETPOST("source") && $valid)
+{
+	$found=true;
+	$tag=GETPOST("tag");
+	$fulltag=$tag;
+
+	// Creditor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Amount
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // We do not add fields shipToName, shipToStreet, shipToCity, shipToState, shipToCountryCode, shipToZip, shipToStreet2, phoneNum
+    // as they don't exists (buyer is unknown, tag is free).
+}
+
+
+// Payment on customer order
+if (GETPOST("source") == 'order' && $valid)
+{
+	$found=true;
+	$langs->load("orders");
+
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
+	$order=new Commande($db);
+	$result=$order->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$order->error;
+		$error++;
+	}
+	else
+	{
+		$result=$order->fetch_thirdparty($order->socid);
+	}
+
+	$amount=$order->total_ttc;
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
+	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	// Creditor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
+
+	// Object
+	$var=!$var;
+	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$order->ref.'">';
+	print '</td></tr>'."\n";
+
+	// Amount
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+	// Shipping address
+	$shipToName=$order->thirdparty->name;
+    $shipToStreet=$order->thirdparty->address;
+    $shipToCity=$order->thirdparty->town;
+    $shipToState=$order->thirdparty->state_code;
+    $shipToCountryCode=$order->thirdparty->country_code;
+    $shipToZip=$order->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$order->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$order->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Order").' '.$order->ref.'">'."\n";
+}
+
+
+// Payment on customer invoice
+if (GETPOST("source") == 'invoice' && $valid)
+{
+	$found=true;
+	$langs->load("bills");
+
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+	$invoice=new Facture($db);
+	$result=$invoice->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$invoice->error;
+		$error++;
+	}
+	else
+	{
+		$result=$invoice->fetch_thirdparty($invoice->socid);
+	}
+
+	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
+	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	// Creditor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
+
+	// Object
+	$var=!$var;
+	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$invoice->ref.'">';
+	print '</td></tr>'."\n";
+
+	// Amount
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$invoice->thirdparty->name;
+    $shipToStreet=$invoice->thirdparty->address;
+    $shipToCity=$invoice->thirdparty->town;
+    $shipToState=$invoice->thirdparty->state_code;
+    $shipToCountryCode=$invoice->thirdparty->country_code;
+    $shipToZip=$invoice->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$invoice->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$invoice->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Invoice").' '.$invoice->ref.'">'."\n";
+}
+
+// Payment on contract line
+if (GETPOST("source") == 'contractline' && $valid)
+{
+	$found=true;
+	$langs->load("contracts");
+
+	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+
+	$contractline=new ContratLigne($db);
+	$result=$contractline->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$contractline->error;
+		$error++;
+	}
+	else
+	{
+		if ($contractline->fk_contrat > 0)
+		{
+			$contract=new Contrat($db);
+			$result=$contract->fetch($contractline->fk_contrat);
+			if ($result > 0)
+			{
+				$result=$contract->fetch_thirdparty($contract->socid);
+			}
+			else
+			{
+				$mesg=$contract->error;
+				$error++;
+			}
+		}
+		else
+		{
+			$mesg='ErrorRecordNotFound';
+			$error++;
+		}
+	}
+
+	$amount=$contractline->total_ttc;
+	if ($contractline->fk_product)
+	{
+		$product=new Product($db);
+		$result=$product->fetch($contractline->fk_product);
+
+		// We define price for product (TODO Put this in a method in product class)
+		if (! empty($conf->global->PRODUIT_MULTIPRICES))
+		{
+			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
+			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
+			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
+		}
+		else
+		{
+			$pu_ht = $product->price;
+			$pu_ttc = $product->price_ttc;
+			$price_base_type = $product->price_base_type;
+		}
+
+		$amount=$pu_ttc;
+		if (empty($amount))
+		{
+			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+			exit;
+		}
+	}
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+	//$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	$qty=1;
+	if (GETPOST('qty')) $qty=GETPOST('qty');
+
+	// Creditor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
+
+	// Debitor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
+
+	// Object
+	$var=!$var;
+	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
+	if ($contractline->fk_product)
+	{
+		$text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
+	}
+	if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
+	//if ($contractline->date_fin_validite) {
+	//	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
+	//	$text.=dol_print_date($contractline->date_fin_validite);
+	//}
+	if ($contractline->date_fin_validite)
+	{
+		$text.='<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
+	}
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$contractline->ref.'">';
+	print '</td></tr>'."\n";
+
+	// Quantity
+	$var=!$var;
+	$label=$langs->trans("Quantity");
+	$qty=1;
+	$duration='';
+	if ($contractline->fk_product)
+	{
+		if ($product->isService() && $product->duration_value > 0)
+		{
+			$label=$langs->trans("Duration");
+
+			// TODO Put this in a global method
+			if ($product->duration_value > 1)
+			{
+				$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
+			}
+			else
+			{
+				$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
+			}
+			$duration=$product->duration_value.' '.$dur[$product->duration_unit];
+		}
+	}
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$label.'</td>';
+	print '<td class="CTableRow'.($var?'1':'2').'"><b>'.($duration?$duration:$qty).'</b>';
+	print '<input type="hidden" name="newqty" value="'.dol_escape_htmltag($qty).'">';
+	print '</b></td></tr>'."\n";
+
+	// Amount
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$contract->thirdparty->name;
+    $shipToStreet=$contract->thirdparty->address;
+    $shipToCity=$contract->thirdparty->town;
+    $shipToState=$contract->thirdparty->state_code;
+    $shipToCountryCode=$contract->thirdparty->country_code;
+    $shipToZip=$contract->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$contract->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$contract->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Contract").' '.$contract->ref.'">'."\n";
+}
+
+// Payment on member subscription
+if (GETPOST("source") == 'membersubscription' && $valid)
+{
+	$found=true;
+	$langs->load("members");
+
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
+
+	$member=new Adherent($db);
+	$result=$member->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$member->error;
+		$error++;
+	}
+	else
+	{
+		$subscription=new Subscription($db);
+	}
+
+	$amount=$subscription->total_ttc;
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	// Creditor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
+	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
+	else print $member->getFullName($langs);
+	print '</b>';
+
+	// Object
+	$var=!$var;
+	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$member->ref.'">';
+	print '</td></tr>'."\n";
+
+	if ($member->last_subscription_date || $member->last_subscription_amount)
+	{
+		// Last subscription date
+		$var=!$var;
+		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
+		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
+		print '</td></tr>'."\n";
+
+		// Last subscription amount
+		$var=!$var;
+		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
+		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
+		print '</td></tr>'."\n";
+
+		if (empty($amount) && ! GETPOST('newamount')) $_GET['newamount']=$member->last_subscription_amount;
+	}
+
+	// Amount
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount))
+	{
+		print ' ('.$langs->trans("ToComplete");
+		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		print ')';
+	}
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+	    $valtoshow=GETPOST("newamount",'int');
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
+	}
+	else {
+	    $valtoshow=$amount;
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    print '<b>'.price($valtoshow).'</b>';
+        print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
+		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	$var=!$var;
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$member->getFullName($langs);
+    $shipToStreet=$member->address;
+    $shipToCity=$member->town;
+    $shipToState=$member->state_code;
+    $shipToCountryCode=$member->country_code;
+    $shipToZip=$member->zip;
+    $shipToStreet2='';
+    $phoneNum=$member->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$member->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("PaymentSubscription").'">'."\n";
+}
+
+
+
+
+if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
+
+if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
+
+print '</table>'."\n";
+print "\n";
+
+if ($found && ! $error)	// We are in a management option and no error
+{
+	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+
+	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
+	{
+		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("StripeOrCBDoPayment").'">';
+	}
+	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'stripeonly')
+	{
+		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("StripeDoPayment").'">';
+	}
+}
+else
+{
+	dol_print_error_email('ERRORNEWPAYMENTPAYPAL');
+}
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
+
+
+html_print_stripe_footer($mysoc,$langs);
+
+llxFooterStripe();
+
+$db->close();
diff --git a/htdocs/public/stripe/paymentko.php b/htdocs/public/stripe/paymentko.php
new file mode 100644
index 00000000000..09de4525b39
--- /dev/null
+++ b/htdocs/public/stripe/paymentko.php
@@ -0,0 +1,115 @@
+<?php
+/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/paybox/paymentko.php
+ *		\ingroup    paybox
+ *		\brief      File to show page after a failed payment
+ *		\author	    Laurent Destailleur
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+// Security check
+if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("paybox");
+$langs->load("paypal");
+
+
+
+
+/*
+ * Actions
+ */
+
+
+
+
+
+/*
+ * View
+ */
+
+dol_syslog("Callback url when a PayBox payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paybox');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
+
+
+// Send an email
+if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
+{
+	$sendto=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
+	$from=$conf->global->MAILING_EMAIL_FROM;
+
+	$urlback=$_SERVER["REQUEST_URI"];
+	$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentFailed");
+	$content=$langs->transnoentitiesnoconv("NewPayboxPaymentFailed")."\n".$fulltag;
+	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+	$mailfile = new CMailFile($topic, $sendto, $from, $content);
+
+	$result=$mailfile->sendfile();
+	if ($result)
+	{
+		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
+	}
+	else
+	{
+		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
+	}
+}
+
+
+llxHeaderPayBox($langs->trans("PaymentForm"));
+
+
+// Show message
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div id="dolpaymentdiv" align="center">'."\n";
+
+print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>\n";
+
+if (! empty($conf->global->PAYBOX_MESSAGE_KO)) print $conf->global->PAYBOX_MESSAGE_KO;
+
+print "\n</div>\n";
+
+
+html_print_paybox_footer($mysoc,$langs);
+
+
+llxFooterPayBox();
+
+$db->close();
diff --git a/htdocs/public/stripe/paymentok.php b/htdocs/public/stripe/paymentok.php
new file mode 100644
index 00000000000..9c3030a86ba
--- /dev/null
+++ b/htdocs/public/stripe/paymentok.php
@@ -0,0 +1,172 @@
+<?php
+/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/paybox/paymentok.php
+ *		\ingroup    paybox
+ *		\brief      File to show page after a successful payment
+ *		\author	    Laurent Destailleur
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+// Security check
+if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("paybox");
+$langs->load("paypal");
+
+/*$source=GETPOST('source');
+$ref=GETPOST('ref');
+$PAYBOXTOKEN=GETPOST('TOKEN');
+if (empty($PAYBOXTOKEN)) $PAYBOXTOKEN=GETPOST('token');
+$PAYBOXPAYERID=GETPOST('PAYERID');
+if (empty($PAYBOXPAYERID)) $PAYBOXPAYERID=GETPOST('PayerID');
+*/
+$PAYBOXFULLTAG=GETPOST('FULLTAG');
+if (empty($PAYBOXFULLTAG)) $PAYBOXFULLTAG=GETPOST('fulltag');
+
+
+/*
+ * Actions
+ */
+
+
+
+
+
+/*
+ * View
+ */
+
+dol_syslog("Callback url when a PayBox payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paybox');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
+
+llxHeaderPayBox($langs->trans("PaymentForm"));
+
+
+// Show message
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div id="dolpaymentdiv" align="center">'."\n";
+
+// Get on url call
+/*
+$token              = $PAYBOXTOKEN;
+*/
+$fulltag            = $PAYBOXFULLTAG;
+/*$payerID            = $PAYBOXPAYERID;
+// Set by newpayment.php
+$paymentType        = $_SESSION['PaymentType'];
+$currencyCodeType   = $_SESSION['currencyCodeType'];
+$FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+// From env
+$ipaddress          = $_SESSION['ipaddress'];
+
+dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
+*/
+
+
+print $langs->trans("YourPaymentHasBeenRecorded")."<br><br>\n";
+
+if (! empty($conf->global->PAYBOX_MESSAGE_OK)) print $conf->global->PAYBOX_MESSAGE_OK;
+
+// Appel des triggers
+include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+$interface=new Interfaces($db);
+$result=$interface->run_triggers('PAYBOX_PAYMENT_OK',$object,$user,$langs,$conf);
+if ($result < 0) { $error++; $errors=$interface->errors; }
+// Fin appel triggers
+
+
+// Send an email
+if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
+{
+	$sendto=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
+	$from=$conf->global->MAILING_EMAIL_FROM;
+	// Define $urlwithroot
+	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+	$urlback=$_SERVER["REQUEST_URI"];
+	$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentReceived");
+	$tmptag=dolExplodeIntoArray($fulltag,'.','=');
+	$content="";
+	if (! empty($tmptag['MEM']))
+	{
+		$langs->load("members");
+		$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
+		$content.=$langs->trans("PaymentSubscription")."<br>\n";
+		$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
+		$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
+	}
+	else
+	{
+		$content.=$langs->transnoentitiesnoconv("NewPayboxPaymentReceived")."<br>\n";
+	}
+	$content.="<br>\n";
+	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
+	$content.="tag=".$fulltag."<br>\n";
+
+	$ishtml=dol_textishtml($content);	// May contain urls
+
+	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+	$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+
+	// Send an email
+	$result=$mailfile->sendfile();
+	if ($result)
+	{
+		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
+	}
+	else
+	{
+		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
+	}
+}
+
+
+
+print "\n</div>\n";
+
+html_print_paybox_footer($mysoc,$langs);
+
+
+llxFooterPayBox();
+
+$db->close();
diff --git a/htdocs/stripe/admin/index.html b/htdocs/stripe/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
new file mode 100644
index 00000000000..481f6634227
--- /dev/null
+++ b/htdocs/stripe/admin/stripe.php
@@ -0,0 +1,225 @@
+<?php
+/* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file       htdocs/stripe/admin/stripe.php
+ * \ingroup    stripe
+ * \brief      Page to setup stripe module
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+
+$servicename='Stripe';
+
+$langs->load("admin");
+$langs->load("other");
+$langs->load("stripe");
+
+if (!$user->admin)
+  accessforbidden();
+  
+$action = GETPOST('action','alpha');
+
+
+if ($action == 'setvalue' && $user->admin)
+{
+	$db->begin();
+
+    $result=dolibarr_set_const($db, "STRIPE_API_SANDBOX",GETPOST('STRIPE_API_SANDBOX','alpha'),'chaine',0,'',$conf->entity);
+    if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY",GETPOST('STRIPE_TEST_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_TEST_PUBLISHABLE_KEY",GETPOST('STRIPE_TEST_PUBLISHABLE_KEY','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY",GETPOST('STRIPE_LIVE_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_LIVE_PUBLISHABLE_KEY",GETPOST('STRIPE_LIVE_PUBLISHABLE_KEY','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
+    $result=dolibarr_set_const($db, "STRIPE_CREDITOR",GETPOST('STRIPE_CREDITOR','alpha'),'chaine',0,'',$conf->entity);
+    if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_CSS_URL",GETPOST('STRIPE_CSS_URL','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
+    $result=dolibarr_set_const($db, "STRIPE_MESSAGE_OK",GETPOST('STRIPE_MESSAGE_OK','alpha'),'chaine',0,'',$conf->entity);
+    if (! $result > 0) $error++;
+    $result=dolibarr_set_const($db, "STRIPE_MESSAGE_KO",GETPOST('STRIPE_MESSAGE_KO','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
+	
+    if (! $error)
+  	{
+  		$db->commit();
+	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+  	}
+  	else
+  	{
+  		$db->rollback();
+		dol_print_error($db);
+    }
+}
+
+
+/*
+ *	View
+ */
+
+$SECRET_TEST_KEY="sk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test secret key
+if (empty($conf->global->STRIPE_TEST_SECRET_KEY)) $conf->global->STRIPE_TEST_SECRET_KEY = $SECRET_TEST_KEY;
+$PUBLISHABLE_TEST_KEY="pk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test publishable key
+if (empty($conf->global->STRIPE_TEST_PUBLISHABLE_KEY)) $conf->global->STRIPE_TEST_PUBLISHABLE_KEY = $PUBLISHABLE_TEST_KEY;
+
+$SECRET_LIVE_KEY="sk_live_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe live secret key
+if (empty($conf->global->STRIPE_LIVE_SECRET_KEY)) $conf->global->STRIPE_LIVE_SECRET_KEY = $SECRET_LIVE_KEY;
+$PUBLISHABLE_LIVE_KEY="pk_live_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe live publishable key
+if (empty($conf->global->STRIPE_LIVE_PUBLISHABLE_KEY)) $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY = $PUBLISHABLE_LIVE_KEY;
+
+llxHeader('',$langs->trans("StripeSetup"));
+
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ModuleSetup").' Stripe',$linkback);
+print '<br>';
+
+$head=stripeadmin_prepare_head();
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="setvalue">';
+
+dol_fiche_head($head, 'stripeaccount', '');
+
+print $langs->trans("StripeDesc")."<br>\n";
+
+print '<br>';
+
+$var=true;
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("AccountParameter").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td class="fieldrequired">';
+print $langs->trans("STRIPE_API_SANDBOX").'</td><td>';
+print $form->selectyesno("STRIPE_API_SANDBOX",$conf->global->STRIPE_API_SANDBOX,1);
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
+print '<input size="32" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
+print '<br>'.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
+print '<input size="32" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
+print '<br>'.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
+print '<input size="32" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
+print '<br>'.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
+print '<input size="32" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
+print '<br>'.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+print '</td></tr>';
+
+$var=true;
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("UsageParameter").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("VendorName").'</td><td>';
+print '<input size="64" type="text" name="STRIPE_CREDITOR" value="'.$conf->global->STRIPE_CREDITOR.'">';
+print '<br>'.$langs->trans("Example").': '.$mysoc->name;
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
+print '<input size="64" type="text" name="STRIPE_CSS_URL" value="'.$conf->global->STRIPE_CSS_URL.'">';
+print '<br>'.$langs->trans("Example").': http://mysite/mycss.css';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("MessageOK").'</td><td>';
+$doleditor=new DolEditor('STRIPE_MESSAGE_OK',$conf->global->STRIPE_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_2,60);
+$doleditor->Create();
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("MessageKO").'</td><td>';
+$doleditor=new DolEditor('STRIPE_MESSAGE_KO',$conf->global->STRIPE_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_2,60);
+$doleditor->Create();
+print '</td></tr>';
+
+print '</table>';
+
+dol_fiche_end();
+
+print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+
+print '</form>';
+
+print '<br><br>';
+
+print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
+print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
+print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount=<i>9.99</i>&tag=<i>your_free_tag</i></b>'."<br>\n";
+if (! empty($conf->commande->enabled))
+{
+	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder",$servicename).':<br>';
+	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref=<i>order_ref</i></b>'."<br>\n";
+}
+if (! empty($conf->facture->enabled))
+{
+	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice",$servicename).':<br>';
+	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref=<i>invoice_ref</i></b>'."<br>\n";
+}
+if (! empty($conf->contrat->enabled))
+{
+	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine",$servicename).':<br>';
+	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref=<i>contractline_ref</i></b>'."<br>\n";
+}
+if (! empty($conf->adherent->enabled))
+{
+	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription",$servicename).':<br>';
+	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref=<i>member_ref</i></b>'."<br>\n";
+}
+
+print "<br>";
+print info_admin($langs->trans("YouCanAddTagOnUrl"));
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/stripe/img/index.html b/htdocs/stripe/img/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/stripe/img/object_stripe.png b/htdocs/stripe/img/object_stripe.png
new file mode 100644
index 0000000000000000000000000000000000000000..287bd24910cb0fc86f886d02789f29b993bad530
GIT binary patch
literal 819
zcmV-31I+x1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006O%
z3;baP00009a7bBm000ie000ie0hKEb8vp<RFLXs%bVG7wVRUJ4ZXi@?ZDjy$WpXYc
zF)<)!>2`81ATls8IUq4NIxsmpFgGA8FflMNTjFhO00007bV*G`2iXD;69^O^U!ddw
z00M_eL_t(IPfb%#NK`=_{$}2L`}XbI#Y*sBfuXLJQs|+mbEhCG$e>Q)sY3?|JV=3r
zhax(3=~@s$cInbJItE!FL?o7(MUj}TmTjx<zJ1g8o3}3;_?X={^Zoh#W=4JbuwowF
zS;YKo8C7FoTm?59LTL>+8d^I5p&UgdzdheUcQK3M;T)V+b@tl3*XuCg;3mUOj+e2U
zwd2~^!rh)@rLp?c;M;Nxy)ah+d=Dn@;pB4g0=lOp!u2Uak~o9^C6#iSj#&I^pe~$z
zZfsma*{F=ym&cj&?dT~oB2$&ib-bP3z`gq=t}DA&glvh4leoChL`!>sv8!F^+ZS50
zjC|g~!2>z&ON_)lfdVBcKuEJB$)Te=k;!n8WBSE!Je(@w>9cjLl%fWyQA$I^CfNSy
z!flXcWU?A_^ILfQ<QHz-UP)rpRbWVtML?5i-EAojreFTS=4NaKh6Y1SPIO>wv=yCu
zeJfyS7UeW*Ay6%_B1;q{E1>aXwT|mIm+)$)f+(_wi=M6wE?;a$bBkx)qpU*gQ_M?C
zNI~@=^zgkD<L-ksj886O=FO%R@iPj81HL86WfQ<n6IcN`MvcQq3YfUkhEpe+Fwh@x
zEjbAp5lEzf?E$~X<Y?PKBE1|+DRi`XIDRaTk#kKL>Syg78(Ri53(-IKB!LKsGm#2?
zUaH~!$0};Ir2eRGFuPd8t*J8BC;~4PkRAZ)(&!gcV>BC8ggDEh#0=Q&O4M+(L?J0u
zn;4&$3p;rEx_Z2A@_*4}b0y|Y<6Cg^d?(GkiF-nrVjk$^ygQ5TcCHVf&Z4*1;}ez=
xl0Jw_8nqA>;D-U6fJV|l@gnx;>KNIzfxiXLt)E)oqyhi{002ovPDHLkV1kvqX=wle

literal 0
HcmV?d00001

diff --git a/htdocs/stripe/index.html b/htdocs/stripe/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/stripe/lib/index.html b/htdocs/stripe/lib/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
new file mode 100644
index 00000000000..d2d138cc8b3
--- /dev/null
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -0,0 +1,445 @@
+<?php
+/* Copyright (C) 2017      Alexandre Spangaro   <aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file			htdocs/stripe/lib/stripe.lib.php
+ *	\ingroup		stripe
+ *  \brief			Library for common stripe functions
+ */
+
+
+
+/**
+ * Show header
+ *
+ * @param 	string	$title		Title of page
+ * @param 	string	$head		Head string to add int head section
+ * @return	void
+ */
+function llxHeaderStripe($title, $head = "")
+{
+	global $user, $conf, $langs;
+
+	header("Content-type: text/html; charset=".$conf->file->character_set_client);
+
+	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
+	//print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd>';
+	print "\n";
+	print "<html>\n";
+	print "<head>\n";
+	print '<meta name="robots" content="noindex,nofollow">'."\n";
+	print '<meta name="keywords" content="dolibarr,payment,online">'."\n";
+	print '<meta name="description" content="Welcome on Dolibarr online payment form">'."\n";
+	print "<title>".$title."</title>\n";
+	if ($head) print $head."\n";
+	if (! empty($conf->global->STRIPE_CSS_URL)) print '<link rel="stylesheet" type="text/css" href="'.$conf->global->STRIPE_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+	else
+	{
+		print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.$conf->css.'?lang='.$langs->defaultlang.'">'."\n";
+		print '<style type="text/css">';
+		print '.CTableRow1      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #e6E6eE; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
+		print '.CTableRow2      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #FFFFFF; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
+		print '</style>';
+	}
+	print "</head>\n";
+	print '<body style="margin: 20px;">'."\n";
+}
+
+/**
+ * Show footer
+ *
+ * @return	void
+ */
+function llxFooterStripe()
+{
+	print "</body>\n";
+	print "</html>\n";
+}
+
+/**
+ *  Define head array for tabs of stripe tools setup pages
+ *
+ *  @return			Array of head
+ */
+function stripeadmin_prepare_head()
+{
+	global $langs, $conf;
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT."/stripe/admin/stripe.php";
+	$head[$h][1] = $langs->trans("Stripe");
+	$head[$h][2] = 'stripeaccount';
+	$h++;
+
+	$object=new stdClass();
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin');
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin','remove');
+
+    return $head;
+}
+
+
+
+/**
+ * Return string with full Url
+ *
+ * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
+ * @param	string	$ref		Ref of object
+ * @return	string				Url string
+ */
+function showStripePaymentUrl($type,$ref)
+{
+	global $conf, $langs;
+
+	$langs->load("paypal");
+    $langs->load("paybox");
+	$langs->load("stripe");
+    $servicename='Stripe';
+    $out='<br><br>';
+    $out.=img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
+    $url=getStripePaymentUrl(0,$type,$ref);
+    $out.='<input type="text" id="stripeurl" class="quatrevingtpercent" value="'.$url.'"><br>';
+    return $out;
+}
+
+/**
+ * Return string with full Url
+ *
+ * @param   int		$mode		0=True url, 1=Url formated with colors
+ * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
+ * @param	string	$ref		Ref of object
+ * @param	int		$amount		Amount
+ * @param	string	$freetag	Free tag
+ * @return	string				Url string
+ */
+function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_free_tag')
+{
+	global $conf;
+
+	$ref=str_replace(' ','',$ref);
+	
+    if ($type == 'free')
+    {
+	    $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
+	    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+	    {
+	    	if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+	    	else $out.='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+	    }
+    }
+    if ($type == 'order')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='order_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+	    $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+        {
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+    if ($type == 'invoice')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='invoice_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+	    $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+        {
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+    if ($type == 'contractline')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='contractline_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+	    $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+        {
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+    if ($type == 'membersubscription')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='member_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+	    $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+        {
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+
+    // For multicompany
+    $out.="&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+
+    return $out;
+}
+
+
+/**
+ * Create a redirect form to paybox form
+ *
+ * @param	int   	$PRICE		Price
+ * @param   string	$CURRENCY	Currency
+ * @param   string	$EMAIL		EMail
+ * @param   string	$urlok		Url to go back if payment is OK
+ * @param   string	$urlko		Url to go back if payment is KO
+ * @param   string	$TAG		Tag
+ * @return  int              	1 if OK, -1 if ERROR
+ */
+function print_stripe_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
+{
+	global $conf, $langs, $db;
+
+	dol_syslog("Stripe.lib::print_paybox_redirect", LOG_DEBUG);
+
+	// Clean parameters
+	$PBX_IDENTIFIANT="2";	// Identifiant pour v2 test
+	if (! empty($conf->global->PAYBOX_PBX_IDENTIFIANT)) $PBX_IDENTIFIANT=$conf->global->PAYBOX_PBX_IDENTIFIANT;
+	$IBS_SITE="1999888";    // Site test
+	if (! empty($conf->global->PAYBOX_IBS_SITE)) $IBS_SITE=$conf->global->PAYBOX_IBS_SITE;
+	$IBS_RANG="99";         // Rang test
+	if (! empty($conf->global->PAYBOX_IBS_RANG)) $IBS_RANG=$conf->global->PAYBOX_IBS_RANG;
+	$IBS_DEVISE="840";		// Currency (Dollar US by default)
+	if ($CURRENCY == 'EUR') $IBS_DEVISE="978";
+	if ($CURRENCY == 'USD') $IBS_DEVISE="840";
+
+	$URLPAYBOX="";
+	if ($conf->global->PAYBOX_CGI_URL_V1) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL_V1;
+	if ($conf->global->PAYBOX_CGI_URL_V2) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL_V2;
+
+	if (empty($IBS_DEVISE))
+	{
+		dol_print_error('',"Paybox setup param PAYBOX_IBS_DEVISE not defined");
+		return -1;
+	}
+	if (empty($URLPAYBOX))
+	{
+		dol_print_error('',"Paybox setup param PAYBOX_CGI_URL_V1 and PAYBOX_CGI_URL_V2 undefined");
+		return -1;
+	}
+	if (empty($IBS_SITE))
+	{
+		dol_print_error('',"Paybox setup param PAYBOX_IBS_SITE not defined");
+		return -1;
+	}
+	if (empty($IBS_RANG))
+	{
+		dol_print_error('',"Paybox setup param PAYBOX_IBS_RANG not defined");
+		return -1;
+	}
+
+	// Definition des parametres vente produit pour paybox
+    $IBS_CMD=$TAG;
+    $IBS_TOTAL=$PRICE*100;     	// En centimes
+    $IBS_MODE=1;            	// Mode formulaire
+    $IBS_PORTEUR=$EMAIL;
+	$IBS_RETOUR="montant:M;ref:R;auto:A;trans:T";   // Format des parametres du get de validation en reponse (url a definir sous paybox)
+    $IBS_TXT=' ';	// Use a space
+    $IBS_BOUTPI=$langs->trans("Wait");
+    //$IBS_BOUTPI='';
+    $IBS_EFFECTUE=$urlok;
+    $IBS_ANNULE=$urlko;
+    $IBS_REFUSE=$urlko;
+    $IBS_BKGD="#FFFFFF";
+    $IBS_WAIT="2000";
+	$IBS_LANG="GBR"; 	// By default GBR=english (FRA, GBR, ESP, ITA et DEU...)
+	if (preg_match('/^FR/i',$langs->defaultlang)) $IBS_LANG="FRA";
+	if (preg_match('/^ES/i',$langs->defaultlang)) $IBS_LANG="ESP";
+	if (preg_match('/^IT/i',$langs->defaultlang)) $IBS_LANG="ITA";
+	if (preg_match('/^DE/i',$langs->defaultlang)) $IBS_LANG="DEU";
+	if (preg_match('/^NL/i',$langs->defaultlang)) $IBS_LANG="NLD";
+	if (preg_match('/^SE/i',$langs->defaultlang)) $IBS_LANG="SWE";
+	$IBS_OUTPUT='E';
+	$PBX_SOURCE='HTML';
+	$PBX_TYPEPAIEMENT='CARTE';
+
+    dol_syslog("Soumission Paybox", LOG_DEBUG);
+    dol_syslog("IBS_MODE: $IBS_MODE", LOG_DEBUG);
+    dol_syslog("IBS_SITE: $IBS_SITE", LOG_DEBUG);
+    dol_syslog("IBS_RANG: $IBS_RANG", LOG_DEBUG);
+    dol_syslog("IBS_TOTAL: $IBS_TOTAL", LOG_DEBUG);
+    dol_syslog("IBS_DEVISE: $IBS_DEVISE", LOG_DEBUG);
+    dol_syslog("IBS_CMD: $IBS_CMD", LOG_DEBUG);
+    dol_syslog("IBS_PORTEUR: $IBS_PORTEUR", LOG_DEBUG);
+    dol_syslog("IBS_RETOUR: $IBS_RETOUR", LOG_DEBUG);
+    dol_syslog("IBS_EFFECTUE: $IBS_EFFECTUE", LOG_DEBUG);
+    dol_syslog("IBS_ANNULE: $IBS_ANNULE", LOG_DEBUG);
+    dol_syslog("IBS_REFUSE: $IBS_REFUSE", LOG_DEBUG);
+    dol_syslog("IBS_BKGD: $IBS_BKGD", LOG_DEBUG);
+    dol_syslog("IBS_WAIT: $IBS_WAIT", LOG_DEBUG);
+    dol_syslog("IBS_LANG: $IBS_LANG", LOG_DEBUG);
+    dol_syslog("IBS_OUTPUT: $IBS_OUTPUT", LOG_DEBUG);
+    dol_syslog("PBX_IDENTIFIANT: $PBX_IDENTIFIANT", LOG_DEBUG);
+    dol_syslog("PBX_SOURCE: $PBX_SOURCE", LOG_DEBUG);
+    dol_syslog("PBX_TYPEPAIEMENT: $PBX_TYPEPAIEMENT", LOG_DEBUG);
+
+    header("Content-type: text/html; charset=".$conf->file->character_set_client);
+
+    print '<html>'."\n";
+    print '<head>'."\n";
+    print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=".$conf->file->character_set_client."\">\n";
+    print '</head>'."\n";
+    print '<body>'."\n";
+    print "\n";
+
+    // Formulaire pour module Paybox
+    print '<form action="'.$URLPAYBOX.'" NAME="Submit" method="POST">'."\n";
+
+    // For Paybox V2 (PBX_xxx)
+    print '<!-- Param for Paybox v2 -->'."\n";
+    print '<input type="hidden" name="PBX_IDENTIFIANT" value="'.$PBX_IDENTIFIANT.'">'."\n";
+    print '<input type="hidden" name="PBX_MODE" value="'.$IBS_MODE.'">'."\n";
+    print '<input type="hidden" name="PBX_SITE" value="'.$IBS_SITE.'">'."\n";
+    print '<input type="hidden" name="PBX_RANG" value="'.$IBS_RANG.'">'."\n";
+    print '<input type="hidden" name="PBX_TOTAL" value="'.$IBS_TOTAL.'">'."\n";
+    print '<input type="hidden" name="PBX_DEVISE" value="'.$IBS_DEVISE.'">'."\n";
+    print '<input type="hidden" name="PBX_CMD" value="'.$IBS_CMD.'">'."\n";
+    print '<input type="hidden" name="PBX_PORTEUR" value="'.$IBS_PORTEUR.'">'."\n";
+    print '<input type="hidden" name="PBX_RETOUR" value="'.$IBS_RETOUR.'">'."\n";
+    print '<input type="hidden" name="PBX_EFFECTUE" value="'.$IBS_EFFECTUE.'">'."\n";
+    print '<input type="hidden" name="PBX_ANNULE" value="'.$IBS_ANNULE.'">'."\n";
+    print '<input type="hidden" name="PBX_REFUSE" value="'.$IBS_REFUSE.'">'."\n";
+    print '<input type="hidden" name="PBX_TXT" value="'.$IBS_TXT.'">'."\n";
+    print '<input type="hidden" name="PBX_BKGD" value="'.$IBS_BKGD.'">'."\n";
+    print '<input type="hidden" name="PBX_WAIT" value="'.$IBS_WAIT.'">'."\n";
+    print '<input type="hidden" name="PBX_LANGUE" value="'.$IBS_LANG.'">'."\n";
+    print '<input type="hidden" name="PBX_OUTPUT" value="'.$IBS_OUTPUT.'">'."\n";
+    print '<input type="hidden" name="PBX_SOURCE" value="'.$PBX_SOURCE.'">'."\n";
+    print '<input type="hidden" name="PBX_TYPEPAIEMENT" value="'.$PBX_TYPEPAIEMENT.'">'."\n";
+
+    print '</form>'."\n";
+
+
+    print "\n";
+    print '<script type="text/javascript" language="javascript">'."\n";
+    print '	document.Submit.submit();'."\n";
+    print '</script>'."\n";
+    print "\n";
+    print '</body></html>'."\n";
+    print "\n";
+
+	return;
+}
+
+
+/**
+ * Show footer of company in HTML pages
+ *
+ * @param   Societe		$fromcompany	Third party
+ * @param   Translate	$langs			Output language
+ * @return	void
+ */
+function html_print_stripe_footer($fromcompany,$langs)
+{
+	global $conf;
+
+	// Juridical status
+	$line1="";
+	if ($fromcompany->forme_juridique_code)
+	{
+		$line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
+	}
+	// Capital
+	if ($fromcompany->capital)
+	{
+		$line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
+	}
+	// Prof Id 1
+	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
+	{
+		$field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
+	}
+	// Prof Id 2
+	if ($fromcompany->idprof2)
+	{
+		$field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
+	}
+
+	// Second line of company infos
+	$line2="";
+	// Prof Id 3
+	if ($fromcompany->idprof3)
+	{
+		$field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
+	}
+	// Prof Id 4
+	if ($fromcompany->idprof4)
+	{
+		$field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
+	}
+	// IntraCommunautary VAT
+	if ($fromcompany->tva_intra != '')
+	{
+		$line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
+	}
+
+	print '<br><br><hr>'."\n";
+	print '<div class="center"><font style="font-size: 10px;">'."\n";
+	print $fromcompany->name.'<br>';
+	print $line1.'<br>';
+	print $line2;
+	print '</font></div>'."\n";
+}
+
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c8b18c81987..ef9a08524b3 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1361,7 +1361,7 @@ $mainmenuusedarray=array_unique(explode(',',$mainmenuused));
 
 $generic=1;
 // Put here list of menu entries when the div.mainmenu.menuentry was previously defined
-$divalreadydefined=array('home','companies','products','commercial','externalsite','accountancy','project','tools','members','agenda','ftp','holiday','hrm','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices','websites');
+$divalreadydefined=array('home','companies','products','commercial','externalsite','accountancy','project','tools','members','agenda','ftp','holiday','hrm','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','stripe','webservices','websites');
 // Put here list of menu entries we are sure we don't want
 $divnotrequired=array('multicurrency','salaries','margin','opensurvey','paybox','expensereport','incoterm','prelevement','propal','workflow','notification','supplier_proposal','cron','product','productbatch','expedition');
 foreach($mainmenuusedarray as $val)
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index ad4ec25df1d..144df2d12f8 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1371,7 +1371,7 @@ $mainmenuusedarray=array_unique(explode(',',$mainmenuused));
 
 $generic=1;
 // Put here list of menu entries when the div.mainmenu.menuentry was previously defined
-$divalreadydefined=array('home','companies','products','commercial','externalsite','accountancy','project','tools','members','agenda','ftp','holiday','hrm','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices','websites');
+$divalreadydefined=array('home','companies','products','commercial','externalsite','accountancy','project','tools','members','agenda','ftp','holiday','hrm','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','stripe','webservices','websites');
 // Put here list of menu entries we are sure we don't want
 $divnotrequired=array('multicurrency','salaries','margin','opensurvey','paybox','expensereport','incoterm','prelevement','propal','workflow','notification','supplier_proposal','cron','product','productbatch','expedition');
 foreach($mainmenuusedarray as $val)

From 299551f85126f21acb3b91b7d769894c3a57932a Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Wed, 22 Feb 2017 15:59:10 +0100
Subject: [PATCH 0292/1163] inverted value between FRST & RECUR

---
 htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 396e89afb56..915883cbdaa 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -326,14 +326,14 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				$pdf->Rect(80, $posY, 5, 5);
 				$pdf->SetXY(80, $posY);
-				if ($object->frstrecur == 'FRST') $pdf->MultiCell(5, 3, 'X', 0, 'L');
+				if ($object->frstrecur == 'RECUR') $pdf->MultiCell(5, 3, 'X', 0, 'L');
 				$pdf->SetXY(86, $posY);
 				$txt = $langs->transnoentitiesnoconv("ModeRECUR").'  '.$langs->transnoentitiesnoconv("or");
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				$posY+=6;
 				$pdf->Rect(80, $posY, 5, 5);
 				$pdf->SetXY(80, $posY);
-				if ($object->frstrecur == 'RECUR') $pdf->MultiCell(5, 3, 'X', 0, 'L');
+				if ($object->frstrecur == 'FRST') $pdf->MultiCell(5, 3, 'X', 0, 'L');
 				$pdf->SetXY(86, $posY);
 				$txt = $langs->transnoentitiesnoconv("ModeFRST");
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');

From 55070ab9078ad87c67678d32418b6a64b9c4044a Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Wed, 22 Feb 2017 16:51:30 +0100
Subject: [PATCH 0293/1163] Add selectform for frst recur option (better usage)

---
 htdocs/societe/rib.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index f77813951c8..06c16a2efe6 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -769,13 +769,14 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 
     	// RUM
     	print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
-	    print '<td colspan="4"><input size="30" type="text" name="rum" value="'.dol_escape_htmltag($account->rum).'"></td></tr>';
+	print '<td colspan="4"><input size="30" type="text" name="rum" value="'.dol_escape_htmltag($account->rum).'"></td></tr>';
 
-	    // FRSTRECUR
-	    print '<tr><td>'.$langs->trans("WithdrawMode").'</td>';
-	    print '<td colspan="4"><input size="30" type="text" name="frstrecur" value="'.dol_escape_htmltag(GETPOST('frstrecur')?GETPOST('frstrecur'):$account->frstrecur).'"></td></tr>';
+	print '<td colspan="4">';
+	$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
+	print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur')?GETPOST('frstrecur'):$account->frstrecur), 0);
+	print '</td></tr>';
 
-	    print '</table>';
+	print '</table>';
     }
 
     print '</div>';
@@ -859,19 +860,21 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 
     if ($conf->prelevement->enabled)
     {
-		print '<br>';
+	print '<br>';
 
     	print '<table class="border" width="100%">';
 
     	// RUM
     	print '<tr><td class="titlefieldcreate">'.$langs->trans("RUM").'</td>';
-	    print '<td>'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
+	print '<td>'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
 
-	    // FRSTRECUR
-	    print '<tr><td>'.$langs->trans("WithdrawMode").'</td>';
-	    print '<td><input size="30" type="text" name="frstrecur" value="'.(isset($_POST['frstrecur'])?GETPOST('frstrecur'):'FRST').'"></td></tr>';
+	print '<td>';
+	$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
+	print $form->selectarray("frstrecur", $tblArraychoice, (isset($_POST['frstrecur'])?GETPOST('frstrecur'):'FRST'), 0);
+	print '</td></tr>';
 
-	    print '</table>';
+
+	print '</table>';
     }
 
     print '</div>';

From 92d9eb3c5dabfc2b5ca0b4886aa1e75b38d6191f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2017 17:46:54 +0100
Subject: [PATCH 0294/1163] Several fix for a better management of #6424

---
 htdocs/comm/action/card.php                   |  99 ++++++++++----
 htdocs/comm/action/document.php               | 102 ++++----------
 htdocs/comm/action/info.php                   |  28 +++-
 htdocs/core/actions_sendmails.inc.php         | 127 +++++++++---------
 htdocs/core/class/commonobject.class.php      |  15 ++-
 htdocs/core/class/html.formmail.class.php     |  33 ++++-
 ...terface_50_modAgenda_ActionsAuto.class.php |  13 +-
 htdocs/langs/en_US/main.lang                  |   1 +
 htdocs/resource/element_resource.php          |  28 +++-
 htdocs/societe/class/societe.class.php        |   3 +-
 htdocs/societe/soc.php                        |   2 +-
 11 files changed, 268 insertions(+), 183 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index b4a9f8b5395..fef43b70cc8 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -146,6 +146,14 @@ if (GETPOST('addassignedtouser') || GETPOST('updateassignedtouser'))
 	$listUserAssignedUpdated = true;
 }
 
+// Link to a project
+if ($action == 'classin' && ($user->rights->agenda->allactions->create ||
+    (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)))
+{
+    $object->fetch($id);
+    $object->setProject(GETPOST('projectid'));
+}
+
 // Action clone object
 if ($action == 'confirm_clone' && $confirm == 'yes')
 {
@@ -577,6 +585,8 @@ if ($action == 'mupdate')
  * View
  */
 
+$formproject=new FormProjets($db);
+
 $help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
 llxHeader('',$langs->trans("Agenda"),$help_url);
 
@@ -744,7 +754,7 @@ if ($action == 'create')
 	print '<br><br>';
 	print '<table class="border" width="100%">';
 
-	// Societe, contact
+	// Related company
 	print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ActionOnCompany").'</td><td>';
 	if (GETPOST('socid','int') > 0)
 	{
@@ -755,7 +765,6 @@ if ($action == 'create')
 	}
 	else
 	{
-
 		$events=array();
 		$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php?showempty=1',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 		//For external user force the company to user company
@@ -768,6 +777,7 @@ if ($action == 'create')
 	}
 	print '</td></tr>';
 
+	// Related contact
 	print '<tr><td class="nowrap">'.$langs->trans("ActionOnContact").'</td><td>';
 	$form->select_contacts(GETPOST('socid','int'), GETPOST('contactid'), 'contactid', 1, '', '', 0, 'minwidth200');
 	print '</td></tr>';
@@ -1090,10 +1100,10 @@ if ($id > 0)
 		
 		print '<table class="border" width="100%">';
 
-		// Thirdparty - Contact
 		if ($conf->societe->enabled)
 		{
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("ActionOnCompany").'</td>';
+		    // Related company
+		    print '<tr><td class="titlefieldcreate">'.$langs->trans("ActionOnCompany").'</td>';
 			print '<td>';
 			print '<div class="maxwidth200onsmartphone">';
 			$events=array();     // 'method'=parameter action of url, 'url'=url to call that return new list of contacts
@@ -1104,8 +1114,8 @@ if ($id > 0)
 			print '</div>';
 			print '</td></tr>';
 
-			// Contact
-			print '<tr><td>'.$langs->trans("Contact").'</td><td>';
+			// related contact
+			print '<tr><td>'.$langs->trans("ActionOnContact").'</td><td>';
 			print '<div class="maxwidth200onsmartphone">';
 			$form->select_contacts($object->socid, $object->contactid, 'contactid', 1, '', '', 0, 'minwidth200');
 			print '</div>';
@@ -1199,27 +1209,61 @@ if ($id > 0)
 		$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewDay").'</a>';
 		$linkback.=$out;
 		
-		dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '');
+		
+		$morehtmlref='<div class="refidno">';
+		// Thirdparty
+		//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+		// Project
+		if (! empty($conf->projet->enabled))
+		{
+		    $langs->load("projects");
+		    //$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+		    $morehtmlref.=$langs->trans('Project') . ' ';
+    		if ($user->rights->agenda->allactions->create ||
+	       	    (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
+		    {
+		        if ($action != 'classify')
+		            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		            if ($action == 'classify') {
+		                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+		                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+		                $morehtmlref.='<input type="hidden" name="action" value="classin">';
+		                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+		                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+		                $morehtmlref.='</form>';
+		            } else {
+		                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+		            }
+		    } else {
+		        if (! empty($object->fk_project)) {
+		            $proj = new Project($db);
+		            $proj->fetch($object->fk_project);
+		            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+		            $morehtmlref.=$proj->ref;
+		            $morehtmlref.='</a>';
+		            if ($proj->title) $morehtmlref.=' - '.$proj->title;
+		        } else {
+		            $morehtmlref.='';
+		        }
+		    }
+		}
+		$morehtmlref.='</div>';
+		
+		
+		dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref);
 		
 		print '<div class="underbanner clearboth"></div>';
 		
 		// Affichage fiche action en mode visu
 		print '<table class="border" width="100%">';
 
-		// Ref
-		/*print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
-		print $form->showrefnav($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '');
-		print '</td></tr>';*/
-
 		// Type
 		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 		{
 			print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td colspan="3">'.$object->type.'</td></tr>';
 		}
 
-		// Title
-		//print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.dol_htmlentities($object->label).'</td></tr>';
-
         // Full day event
         print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent, 3).'</td></tr>';
 
@@ -1241,11 +1285,6 @@ if ($id > 0)
 		if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
 		print '</td></tr>';
 
-		// Status
-		/*print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">';
-		print $object->getLibStatut(4);
-		print '</td></tr>';*/
-
         // Location
 	    if (empty($conf->global->AGENDA_DISABLE_LOCATION))
     	{
@@ -1302,14 +1341,14 @@ if ($id > 0)
 
 		print '</table>';
 
-		print '<br><br>';
+		print '<br>';
 
 		print '<table class="border" width="100%">';
 
-		// Third party - Contact
 		if ($conf->societe->enabled)
 		{
-			print '<tr><td class="titlefield">'.$langs->trans("ActionOnCompany").'</td><td>'.($object->thirdparty->id?$object->thirdparty->getNomUrl(1):$langs->trans("None"));
+		    // Related company
+		    print '<tr><td class="titlefield">'.$langs->trans("ActionOnCompany").'</td><td colspan="3">'.($object->thirdparty->id?$object->thirdparty->getNomUrl(1):('<span class="opacitymedium">'.$langs->trans("None").'</span>'));
 			if (is_object($object->thirdparty) && $object->thirdparty->id > 0 && $object->type_code == 'AC_TEL')
 			{
 				if ($object->thirdparty->fetch($object->thirdparty->id))
@@ -1317,9 +1356,11 @@ if ($id > 0)
 					print "<br>".dol_print_phone($object->thirdparty->phone);
 				}
 			}
-			print '</td>';
-			print '<td>'.$langs->trans("Contact").'</td>';
-			print '<td>';
+			print '</td></tr>';
+			
+			// Related contact
+			print '<tr><td>'.$langs->trans("ActionOnContact").'</td>';
+			print '<td colspan="3">';
 			if ($object->contactid > 0)
 			{
 				print $object->contact->getNomUrl(1);
@@ -1333,12 +1374,13 @@ if ($id > 0)
 			}
 			else
 			{
-				print $langs->trans("None");
+				print '<span class="opacitymedium">'.$langs->trans("NoneOrSeveral").'</span>';
 			}
 			print '</td></tr>';
 		}
 
 		// Project
+		/*
 		if (! empty($conf->projet->enabled))
 		{
 			print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
@@ -1350,7 +1392,8 @@ if ($id > 0)
 			}
 			print '</td></tr>';
 		}
-
+        */
+		
 		// Priority
 		print '<tr><td class="nowrap" class="titlefield">'.$langs->trans("Priority").'</td><td colspan="3">';
 		print ($object->priority?$object->priority:'');
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 4691673a831..241843623c2 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -140,27 +140,41 @@ if ($object->id > 0)
 	
 	$linkback.=$out;
 
-	dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '');
+	$morehtmlref='<div class="refidno">';
+	// Thirdparty
+	//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+	    $langs->load("projects");
+	    //$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	    $morehtmlref.=$langs->trans('Project') . ': ';
+	    if (! empty($object->fk_project)) {
+	        $proj = new Project($db);
+	        $proj->fetch($object->fk_project);
+	        $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+	        $morehtmlref.=$proj->ref;
+	        $morehtmlref.='</a>';
+	        if ($proj->title) $morehtmlref.=' - '.$proj->title;
+	    } else {
+	        $morehtmlref.='';
+	    }
+	}
+	$morehtmlref.='</div>';
+	
+	dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref);
 	
 	print '<div class="underbanner clearboth"></div>';
 	
 	// Affichage fiche action en mode visu
 	print '<table class="border" width="100%">';
 
-	// Ref
-	/*print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
-	print $form->showrefnav($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '');
-	print '</td></tr>';*/
-
 	// Type
 	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	{
 		print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td colspan="3">'.$object->type.'</td></tr>';
 	}
 
-	// Title
-	//print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$object->label.'</td></tr>';
-
 	// Full day event
 	print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent, 3).'</td></tr>';
 
@@ -179,11 +193,6 @@ if ($object->id > 0)
 	if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
 	print '</td></tr>';
 
-	// Status
-	/*print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="2">';
-	print $object->getLibStatut(4);
-	print '</td></tr>';*/
-
 	// Location
 	if (empty($conf->global->AGENDA_DISABLE_LOCATION))
 	{
@@ -227,71 +236,8 @@ if ($object->id > 0)
 
 	print '</table>';
 	
-	print '<br><br>';
-	
-	print '<table class="border" width="100%">';
 
-
-	// Third party - Contact
-	print '<tr><td class="titlefield">'.$langs->trans("ActionOnCompany").'</td><td>'.($object->thirdparty->id?$object->thirdparty->getNomUrl(1):$langs->trans("None"));
-	if (is_object($object->thirdparty) && $object->thirdparty->id > 0 && $object->type_code == 'AC_TEL')
-	{
-		if ($object->thirdparty->fetch($object->thirdparty->id))
-		{
-			print "<br>".dol_print_phone($object->thirdparty->phone);
-		}
-	}
-	print '</td>';
-	print '<td>'.$langs->trans("Contact").'</td>';
-	print '<td>';
-	if ($object->contact->id > 0)
-	{
-		print $object->contact->getNomUrl(1);
-		if ($object->contact->id && $object->type_code == 'AC_TEL')
-		{
-			if ($object->contact->fetch($object->contact->id))
-			{
-				print "<br>".dol_print_phone($object->contact->phone_pro);
-			}
-		}
-	}
-	else
-	{
-		print $langs->trans("None");
-	}
-
-	print '</td></tr>';
-
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-		print '<tr><td class="tdtop">'.$langs->trans("Project").'</td><td colspan="3">';
-		if ($object->fk_project)
-		{
-			$project=new Project($db);
-			$project->fetch($object->fk_project);
-			print $project->getNomUrl(1);
-		}
-		print '</td></tr>';
-	}
-
-	// Priority
-	print '<tr><td class="nowrap">'.$langs->trans("Priority").'</td><td colspan="3">';
-	print ($object->priority?$object->priority:'');
-	print '</td></tr>';
-
-	// Other attributes
-	$parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$object->id);
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
-	{
-		print $object->showOptionals($extrafields,'edit');
-	}
-
-
-	print '</table>';
-
-	print '<br><br>';
+	print '<br>';
 
 	print '<table class="border" width="100%">';
 
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index d1338142173..2ad3f424b12 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -28,6 +28,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+if (! empty($conf->projet->enabled)) {
+    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+}
 
 $langs->load("commercial");
 
@@ -74,7 +78,29 @@ $out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.do
 
 $linkback.=$out;
 
-dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '');
+$morehtmlref='<div class="refidno">';
+// Thirdparty
+//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+// Project
+if (! empty($conf->projet->enabled))
+{
+    $langs->load("projects");
+    //$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+    $morehtmlref.=$langs->trans('Project') . ': ';
+    if (! empty($object->fk_project)) {
+        $proj = new Project($db);
+        $proj->fetch($object->fk_project);
+        $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+        $morehtmlref.=$proj->ref;
+        $morehtmlref.='</a>';
+        if ($proj->title) $morehtmlref.=' - '.$proj->title;
+    } else {
+        $morehtmlref.='';
+    }
+}
+$morehtmlref.='</div>';
+
+dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref);
 
 print '<div class="underbanner clearboth"></div>';
 
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index aad57a90894..f403f526d46 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -112,7 +112,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 	{
     	$result=$object->fetch($id);
     
-    	$sendtosocid=0;
+    	$sendtosocid=0;    // Thirdparty on object
     	if (method_exists($object,"fetch_thirdparty") && $object->element != 'societe')
     	{
     		$result=$object->fetch_thirdparty();
@@ -123,7 +123,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
     	{
     		$thirdparty=$object;
     		if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
-    		elseif($conf->dolimail->enabled)
+    		elseif (! empty($conf->dolimail->enabled))
     		{
     			$dolimail = new Dolimail($db);
     			$possibleaccounts=$dolimail->get_societe_by_email($_POST['sendto'],"1");
@@ -160,52 +160,72 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 
 	if ($result > 0)
 	{
+		$sendto='';
+		$sendtocc='';
+		$sendtobcc='';
+		$sendtoid = array();
+
+		// Define $sendto
 		$receiver=$_POST['receiver'];
-		$sendto_array=array();
-		
+		if (! is_array($receiver))
+		{
+		    if ($receiver == '-1') $receiver=array();
+		    else $receiver=array($receiver);
+		}
+		$tmparray=array();
 		if (trim($_POST['sendto']))
 		{
-			// Recipient is provided into free text
-			$sendto = trim($_POST['sendto']);
-			$sendtoid = array();
+			// Recipients are provided into free text
+			$tmparray[] = trim($_POST['sendto']);
 		}
-		elseif (count($receiver)>0)
+		if (count($receiver)>0)
 		{
-			foreach($receiver as $key=>$val) {
+			foreach($receiver as $key=>$val) 
+			{
 				// Recipient was provided from combo list
 				if ($val == 'thirdparty') // Id of third party
 				{
-					$sendto_array[] = $thirdparty->name.' <'.$thirdparty->email.'>';
-					$sendtoid = array();
+					$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
 				}
 				else	// Id du contact
 				{
-					$sendto_array[] = $thirdparty->contact_get_property((int) $val,'email');
+					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
 					$sendtoid[] = $val;
 				}
 			}
-			
-			if (count($sendto_array)>0) {
-				$sendto=implode(',',$sendto_array);
-			}
 		}
+		$sendto=implode(',',$tmparray);
+		
+		// Define $sendtocc
+		$receivercc=$_POST['receivercc'];
+		if (! is_array($receivercc))
+		{
+		    if ($receivercc == '-1') $receivercc=array();
+		    else $receivercc=array($receivercc);
+		}
+		$tmparray=array();
 		if (trim($_POST['sendtocc']))
 		{
-			$sendtocc = trim($_POST['sendtocc']);
+			$tmparray[] = trim($_POST['sendtocc']);
 		}
-		elseif ($_POST['receivercc'] != '-1')
+		if (count($receivercc) > 0)
 		{
-			// Recipient was provided from combo list
-			if ($_POST['receivercc'] == 'thirdparty')	// Id of third party
+			foreach($receivercc as $key=>$val) 
 			{
-				$sendtocc = $thirdparty->name.' <'.$thirdparty->email.'>';
-			}
-			else	// Id du contact
-			{
-				$sendtocc = $thirdparty->contact_get_property((int) $_POST['receivercc'],'email');
+				// Recipient was provided from combo list
+				if ($val == 'thirdparty') // Id of third party
+				{
+					$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
+				}
+				else	// Id du contact
+				{
+					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
+				}
 			}
 		}
-
+		$sendtocc=implode(',',$tmparray);
+		
 		if (dol_strlen($sendto))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
@@ -233,6 +253,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 
             $replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
 			$message = $_POST['message'];
+			
 			$sendtobcc= GETPOST('sendtoccc');
 			if ($mode == 'emailfromproposal') $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
 			if ($mode == 'emailfromorder')    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
@@ -348,46 +369,22 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					// Initialisation of datas
 					if (is_object($object))
 					{
-						//multiple contact sends
-						if (count($sendtoid) >0) {
-							foreach($sendtoid as $val_id) {
-		    					$object->socid			= $sendtosocid;	// To link to a company
-		    					$object->sendtoid		= $val_id;	// To link to a contact/address
-		    					$object->actiontypecode	= $actiontypecode;
-		    					$object->actionmsg		= $actionmsg;  // Long text
-		    					$object->actionmsg2		= $actionmsg2; // Short text
-		    					$object->trackid        = $trackid;
-		    					$object->fk_element		= $object->id;
-		    					$object->elementtype	= $object->element;
+					    $object->socid			= $sendtosocid;	// To link to a company
+					    $object->sendtoid		= $sendtoid;	// To link to contacts/addresses. This is an array.
+					    $object->actiontypecode	= $actiontypecode;
+					    $object->actionmsg		= $actionmsg;  // Long text
+					    $object->actionmsg2		= $actionmsg2; // Short text
+					    $object->trackid        = $trackid;
+					    $object->fk_element		= $object->id;
+					    $object->elementtype	= $object->element;
 		    
-		    					// Call of triggers
-		    					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		    					$interface=new Interfaces($db);
-		    					$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
-		    					if ($result < 0) {
-		    						$error++; $errors=$interface->errors;
-		    					}
-							}
-						} else {
-							//Thirdparty send
-							$object->socid			= $sendtosocid;	// To link to a company
-							$object->sendtoid		= 0;	// To link to a contact/address
-							$object->actiontypecode	= $actiontypecode;
-							$object->actionmsg		= $actionmsg;  // Long text
-							$object->actionmsg2		= $actionmsg2; // Short text
-							$object->trackid        = $trackid;
-							$object->fk_element		= $object->id;
-							$object->elementtype	= $object->element;
-							
-							// Call of triggers
-							include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-							$interface=new Interfaces($db);
-							$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
-							if ($result < 0) {
-								$error++; $errors=$interface->errors;
-							}
-						}
-    					// End call of triggers
+					    // Call of triggers
+					    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+					    $interface=new Interfaces($db);
+					    $result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
+					    if ($result < 0) {
+					    	$error++; $errors=$interface->errors;
+					    }					    
 					}
 					
 					if ($error)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 8bfda274d80..d6a1588acbe 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1395,9 +1395,18 @@ abstract class CommonObject
         }
 
         $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        if ($projectid) $sql.= ' SET fk_projet = '.$projectid;
-        else $sql.= ' SET fk_projet = NULL';
-        $sql.= ' WHERE rowid = '.$this->id;
+        if ($this->table_element == 'actioncomm') 
+        {
+            if ($projectid) $sql.= ' SET fk_project = '.$projectid;
+            else $sql.= ' SET fk_project = NULL';
+            $sql.= ' WHERE id = '.$this->id; 
+        }
+        else 
+        {
+            if ($projectid) $sql.= ' SET fk_projet = '.$projectid;
+            else $sql.= ' SET fk_projet = NULL';
+            $sql.= ' WHERE rowid = '.$this->id;
+        }
 
         dol_syslog(get_class($this)."::setProject", LOG_DEBUG);
         if ($this->db->query($sql))
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index acb7572ff7e..bdae838f61e 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -521,10 +521,17 @@ class FormMail extends Form
         			if (! empty($this->withto) && is_array($this->withto))
         			{
         				if (! empty($this->withtofree)) $out.= " ".$langs->trans("or")." ";
-        				$out.= $form->multiselectarray("receiver", $this->withto, GETPOST("receiver"), null, null, null,null, "90%");
+        			    // multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+        				$tmparray = $this->withto;
+        				foreach($tmparray as $key => $val)
+        				{
+        				    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+        				}
+        				$out.= $form->multiselectarray("receiver", $tmparray, GETPOST("receiver"), null, null, null,null, "90%");
         			}
         			if (isset($this->withtosocid) && $this->withtosocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
         			{
+        			    dol_syslog("get_form was called with a deprecated way: ->withtosocid must not be defined, only ->withto", LOG_WARNING);
         				$liste=array();
         				$soc=new Societe($this->db);
         				$soc->fetch($this->withtosocid);
@@ -533,6 +540,12 @@ class FormMail extends Form
         					$liste[$key]=$value;
         				}
         				if ($this->withtofree) $out.= " ".$langs->trans("or")." ";
+        			    // multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+        				$tmparray = $liste;
+        				foreach($tmparray as $key => $val)
+        				{
+        				    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+        				}
         				$out.= $form->multiselectarray("receiver", $liste, GETPOST("receiver"), null, null, null,null, "90%");
         			}
         		}
@@ -555,7 +568,14 @@ class FormMail extends Form
         			if (! empty($this->withtocc) && is_array($this->withtocc))
         			{
         				$out.= " ".$langs->trans("or")." ";
-        				$out.= $form->selectarray("receivercc", $this->withtocc, GETPOST("receivercc"), 1, 0, 0, '', 0, 0, 0, '', '', 0, '', $disablebademails);
+        				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+        				$tmparray = $this->withtocc;
+        				foreach($tmparray as $key => $val)
+        				{
+        				    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+        				}
+        				//$out.= $form->selectarray("receivercc", $this->withtocc, GETPOST("receivercc"), 1, 0, 0, '', 0, 0, 0, '', '', 0, '', $disablebademails);
+        				$out.= $form->multiselectarray("receivercc", $tmparray, GETPOST("receivercc"), null, null, null,null, "90%");
         			}
         		}
         		$out.= "</td></tr>\n";
@@ -577,7 +597,14 @@ class FormMail extends Form
         			if (! empty($this->withtoccc) && is_array($this->withtoccc))
         			{
         				$out.= " ".$langs->trans("or")." ";
-        				$out.= $form->selectarray("receiverccc", $this->withtoccc, GETPOST("receiverccc"), 1);
+        				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+        				$tmparray = $this->withtoccc;
+        				foreach($tmparray as $key => $val)
+        				{
+        				    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+        				}
+        				//$out.= $form->selectarray("receiverccc", $this->withtoccc, GETPOST("receiverccc"), 1);
+        				$out.= $form->multiselectarray("receiverccc", $tmparray, GETPOST("receiverccc"), null, null, null,null, "90%");
         			}
         		}
 
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index bce6cd02eee..a2501867b56 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -47,7 +47,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 	 *      $object->actiontypecode (translation action code: AC_OTH, ...)
 	 *      $object->actionmsg (note, long text)
 	 *      $object->actionmsg2 (label, short text)
-	 *      $object->sendtoid (id of contact)
+	 *      $object->sendtoid (id of contact or array of ids)
 	 *      $object->socid
 	 *      $object->fk_project
 	 *      $object->fk_element
@@ -819,7 +819,16 @@ class InterfaceActionsAuto extends DolibarrTriggers
         require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 		$contactforaction=new Contact($this->db);
         $societeforaction=new Societe($this->db);
-        if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
+        // Set contactforaction if there is only 1 contact.
+        if (is_array($object->sendtoid))
+        {
+            if (count($object->sendtoid) == 1) $contactforaction->fetch(reset($object->sendtoid));
+        }
+        else
+        {
+            if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
+        }
+        // Set societeforaction.
         if ($object->socid > 0)    $societeforaction->fetch($object->socid);
 
 		// Insertion action
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 705355c16b4..1452e078bed 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -453,6 +453,7 @@ NextStep=Next step
 Datas=Data
 None=None
 NoneF=None
+NoneOrSeveral=None or several
 Late=Late
 LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
 Photo=Picture
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 14475c58203..a09e9d3db39 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -31,6 +31,10 @@ if (! $res) die("Include of main fails");
 require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+if (! empty($conf->projet->enabled)) {
+    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+}
 
 // Load traductions files requiredby by page
 $langs->load("resource");
@@ -212,7 +216,29 @@ else
 
 			$linkback.=$out;
 
-			dol_banner_tab($act, 'element_id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '', '&element='.$element, 0, '', '');
+			$morehtmlref='<div class="refidno">';
+			// Thirdparty
+			//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+			// Project
+			if (! empty($conf->projet->enabled))
+			{
+			    $langs->load("projects");
+			    //$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+			    $morehtmlref.=$langs->trans('Project') . ': ';
+		        if (! empty($act->fk_project)) {
+		            $proj = new Project($db);
+		            $proj->fetch($act->fk_project);
+		            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $act->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+		            $morehtmlref.=$proj->ref;
+		            $morehtmlref.='</a>';
+		            if ($proj->title) $morehtmlref.=' - '.$proj->title;
+		        } else {
+		            $morehtmlref.='';
+		        }
+			}
+			$morehtmlref.='</div>';
+			
+			dol_banner_tab($act, 'element_id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref, '&element='.$element, 0, '', '');
 
 			print '<div class="underbanner clearboth"></div>';
 
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 656a886c13c..5aac6fdec85 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2026,8 +2026,9 @@ class Societe extends CommonObject
         if ($this->email && $addthirdparty)
         {
             if (empty($this->name)) $this->name=$this->nom;
-            $contact_emails['thirdparty']=$langs->trans("ThirdParty").': '.dol_trunc($this->name,16)." (".$this->email.")";
+            $contact_emails['thirdparty']=$langs->trans("ThirdParty").': '.dol_trunc($this->name,16)." &lt;".$this->email."&gt;";
         }
+        //var_dump($contact_emails)
         return $contact_emails;
     }
 
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 3da099390ac..79a8d9cae94 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -2447,7 +2447,7 @@ else
 			$liste=array();
 			foreach ($object->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value;
 			$formmail->withto=GETPOST('sendto')?GETPOST('sendto'):$liste;
-			$formmail->withtofree=0;
+			$formmail->withtofree=1;
 			$formmail->withtocc=$liste;
 			$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
 			$formmail->withfile=2;

From bab4f5c185fd6e43a1a15f01e9695421dc91c5df Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2017 18:00:34 +0100
Subject: [PATCH 0295/1163] Removed useless library FPDFI.

---
 COPYRIGHT                                     |   1 -
 htdocs/includes/fpdfi/README.txt              |   4 -
 .../includes/fpdfi/filters/FilterASCII85.php  | 114 ---
 .../fpdfi/filters/FilterASCII85_FPDI.php      |  33 -
 .../fpdfi/filters/FilterASCIIHexDecode.php    |  52 -
 htdocs/includes/fpdfi/filters/FilterLZW.php   | 173 ----
 .../includes/fpdfi/filters/FilterLZW_FPDI.php |  33 -
 htdocs/includes/fpdfi/fpdf_tpl.php            | 555 -----------
 htdocs/includes/fpdfi/fpdi.php                | 695 -------------
 htdocs/includes/fpdfi/fpdi_bridge.php         | 215 ----
 htdocs/includes/fpdfi/fpdi_pdf_parser.php     | 354 -------
 htdocs/includes/fpdfi/pdf_context.php         | 153 ---
 htdocs/includes/fpdfi/pdf_parser.php          | 920 ------------------
 13 files changed, 3302 deletions(-)
 delete mode 100644 htdocs/includes/fpdfi/README.txt
 delete mode 100644 htdocs/includes/fpdfi/filters/FilterASCII85.php
 delete mode 100644 htdocs/includes/fpdfi/filters/FilterASCII85_FPDI.php
 delete mode 100644 htdocs/includes/fpdfi/filters/FilterASCIIHexDecode.php
 delete mode 100644 htdocs/includes/fpdfi/filters/FilterLZW.php
 delete mode 100644 htdocs/includes/fpdfi/filters/FilterLZW_FPDI.php
 delete mode 100644 htdocs/includes/fpdfi/fpdf_tpl.php
 delete mode 100644 htdocs/includes/fpdfi/fpdi.php
 delete mode 100644 htdocs/includes/fpdfi/fpdi_bridge.php
 delete mode 100644 htdocs/includes/fpdfi/fpdi_pdf_parser.php
 delete mode 100644 htdocs/includes/fpdfi/pdf_context.php
 delete mode 100644 htdocs/includes/fpdfi/pdf_parser.php

diff --git a/COPYRIGHT b/COPYRIGHT
index 4fbff121147..97964dc0d50 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -17,7 +17,6 @@ ChromePHP              4.1.0         Apache Software License 2.0 Yes
 CKEditor               4.5.8         LGPL-2.1+                   Yes             Editor WYSIWYG
 EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation
 Escpos-php                           MIT License                 Yes             Thermal receipt printer library, for use with ESC/POS compatible printers
-FPDI                   1.5.2         Apache Software License 2.0 Yes             PDF templates management
 GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
 Mobiledetect           2.8.17        MIT License                 Yes             Detect mobile devices browsers
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
diff --git a/htdocs/includes/fpdfi/README.txt b/htdocs/includes/fpdfi/README.txt
deleted file mode 100644
index c36c83b25be..00000000000
--- a/htdocs/includes/fpdfi/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory contains all FPDFI librairies:
-- FPDI
-- FPDI_TPL
-Found on http://www.setasign.de/products/pdf-php-solutions/fpdi/
diff --git a/htdocs/includes/fpdfi/filters/FilterASCII85.php b/htdocs/includes/fpdfi/filters/FilterASCII85.php
deleted file mode 100644
index 59bc845f3c9..00000000000
--- a/htdocs/includes/fpdfi/filters/FilterASCII85.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-//
-//  FPDI - Version 1.5.2
-//
-//    Copyright 2004-2014 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-/**
- * Class FilterASCII85
- */
-class FilterASCII85
-{
-    /**
-     * Decode ASCII85 encoded string
-     *
-     * @param string $in
-     * @return string
-     * @throws Exception
-     */
-    public function decode($in)
-    {
-        $ord = array(
-            '~' => ord('~'),
-            'z' => ord('z'),
-            'u' => ord('u'),
-            'z' => ord('z'),
-            '!' => ord('!')
-        );
-
-        $out = '';
-        $state = 0;
-        $chn = null;
-
-        $l = strlen($in);
-
-        for ($k = 0; $k < $l; ++$k) {
-            $ch = ord($in[$k]) & 0xff;
-
-            if ($ch == $ord['~']) {
-                break;
-            }
-            if (preg_match('/^\s$/',chr($ch))) {
-                continue;
-            }
-            if ($ch == $ord['z'] && $state == 0) {
-                $out .= chr(0) . chr(0) . chr(0) . chr(0);
-                continue;
-            }
-            if ($ch < $ord['!'] || $ch > $ord['u']) {
-                throw new Exception('Illegal character in ASCII85Decode.');
-            }
-
-            $chn[$state++] = $ch - $ord['!'];
-
-            if ($state == 5) {
-                $state = 0;
-                $r = 0;
-                for ($j = 0; $j < 5; ++$j)
-                    $r = $r * 85 + $chn[$j];
-                $out .= chr($r >> 24);
-                $out .= chr($r >> 16);
-                $out .= chr($r >> 8);
-                $out .= chr($r);
-            }
-        }
-        $r = 0;
-
-        if ($state == 1) {
-            throw new Exception('Illegal length in ASCII85Decode.');
-        }
-
-        if ($state == 2) {
-            $r = $chn[0] * 85 * 85 * 85 * 85 + ($chn[1]+1) * 85 * 85 * 85;
-            $out .= chr($r >> 24);
-
-        } else if ($state == 3) {
-            $r = $chn[0] * 85 * 85 * 85 * 85 + $chn[1] * 85 * 85 * 85  + ($chn[2]+1) * 85 * 85;
-            $out .= chr($r >> 24);
-            $out .= chr($r >> 16);
-
-        } else if ($state == 4) {
-            $r = $chn[0] * 85 * 85 * 85 * 85 + $chn[1] * 85 * 85 * 85  + $chn[2] * 85 * 85  + ($chn[3]+1) * 85 ;
-            $out .= chr($r >> 24);
-            $out .= chr($r >> 16);
-            $out .= chr($r >> 8);
-        }
-
-        return $out;
-    }
-
-    /**
-     * NOT IMPLEMENTED
-     *
-     * @param string $in
-     * @return string
-     * @throws LogicException
-     */
-    public function encode($in)
-    {
-        throw new LogicException("ASCII85 encoding not implemented.");
-    }
-}
\ No newline at end of file
diff --git a/htdocs/includes/fpdfi/filters/FilterASCII85_FPDI.php b/htdocs/includes/fpdfi/filters/FilterASCII85_FPDI.php
deleted file mode 100644
index d672d584f70..00000000000
--- a/htdocs/includes/fpdfi/filters/FilterASCII85_FPDI.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-//
-//  FPDI - Version 1.4.2
-//
-//    Copyright 2004-2011 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-require_once('FilterASCII85.php');
-
-class FilterASCII85_FPDI extends FilterASCII85 {
-
-    var $fpdi;
-    
-    function FilterASCII85_FPDI(&$fpdi) {
-        $this->fpdi =& $fpdi;
-    }
-
-    function error($msg) {
-        $this->fpdi->error($msg);
-    }
-}
\ No newline at end of file
diff --git a/htdocs/includes/fpdfi/filters/FilterASCIIHexDecode.php b/htdocs/includes/fpdfi/filters/FilterASCIIHexDecode.php
deleted file mode 100644
index 4040302d32c..00000000000
--- a/htdocs/includes/fpdfi/filters/FilterASCIIHexDecode.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-//
-//  FPDI - Version 1.5.2
-//
-//    Copyright 2004-2014 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-/**
- * Class FilterASCIIHexDecode
- */
-class FilterASCIIHexDecode
-{
-    /**
-     * Converts an ASCII hexadecimal encoded string into it's binary representation.
-     *
-     * @param string $data The input string
-     * @return string
-     */
-    public function decode($data)
-    {
-        $data = preg_replace('/[^0-9A-Fa-f]/', '', rtrim($data, '>'));
-        if ((strlen($data) % 2) == 1) {
-            $data .= '0';
-        }
-
-        return pack('H*', $data);
-    }
-
-    /**
-     * Converts a string into ASCII hexadecimal representation.
-     *
-     * @param string $data The input string
-     * @param boolean $leaveEOD
-     * @return string
-     */
-    public function encode($data, $leaveEOD = false)
-    {
-        return current(unpack('H*', $data)) . ($leaveEOD ? '' : '>');
-    }
-}
\ No newline at end of file
diff --git a/htdocs/includes/fpdfi/filters/FilterLZW.php b/htdocs/includes/fpdfi/filters/FilterLZW.php
deleted file mode 100644
index b4dfbe82be2..00000000000
--- a/htdocs/includes/fpdfi/filters/FilterLZW.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-//
-//  FPDI - Version 1.5.2
-//
-//    Copyright 2004-2014 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-/**
- * Class FilterLZW
- */
-class FilterLZW
-{
-    protected $_sTable = array();
-    protected $_data = null;
-    protected $_dataLength = 0;
-    protected $_tIdx;
-    protected $_bitsToGet = 9;
-    protected $_bytePointer;
-    protected $_bitPointer;
-    protected $_nextData = 0;
-    protected $_nextBits = 0;
-    protected $_andTable = array(511, 1023, 2047, 4095);
-
-    /**
-     * Decodes LZW compressed data.
-     *
-     * @param string $data The compressed data.
-     * @throws Exception
-     * @return string
-     */
-    public function decode($data)
-    {
-        if ($data[0] == 0x00 && $data[1] == 0x01) {
-            throw new Exception('LZW flavour not supported.');
-        }
-
-        $this->_initsTable();
-
-        $this->_data = $data;
-        $this->_dataLength = strlen($data);
-
-        // Initialize pointers
-        $this->_bytePointer = 0;
-        $this->_bitPointer = 0;
-
-        $this->_nextData = 0;
-        $this->_nextBits = 0;
-
-        $oldCode = 0;
-
-        $unCompData = '';
-
-        while (($code = $this->_getNextCode()) != 257) {
-            if ($code == 256) {
-                $this->_initsTable();
-                $code = $this->_getNextCode();
-
-                if ($code == 257) {
-                    break;
-                }
-
-                if (!isset($this->_sTable[$code])) {
-                    throw new Exception('Error while decompression LZW compressed data.');
-                }
-
-                $unCompData .= $this->_sTable[$code];
-                $oldCode = $code;
-
-            } else {
-
-                if ($code < $this->_tIdx) {
-                    $string = $this->_sTable[$code];
-                    $unCompData .= $string;
-
-                    $this->_addStringToTable($this->_sTable[$oldCode], $string[0]);
-                    $oldCode = $code;
-                } else {
-                    $string = $this->_sTable[$oldCode];
-                    $string = $string . $string[0];
-                    $unCompData .= $string;
-
-                    $this->_addStringToTable($string);
-                    $oldCode = $code;
-                }
-            }
-        }
-
-        return $unCompData;
-    }
-
-
-    /**
-     * Initialize the string table.
-     */
-    protected function _initsTable()
-    {
-        $this->_sTable = array();
-
-        for ($i = 0; $i < 256; $i++)
-            $this->_sTable[$i] = chr($i);
-
-        $this->_tIdx = 258;
-        $this->_bitsToGet = 9;
-    }
-
-    /**
-     * Add a new string to the string table.
-     */
-    protected function _addStringToTable($oldString, $newString = '')
-    {
-        $string = $oldString . $newString;
-
-        // Add this new String to the table
-        $this->_sTable[$this->_tIdx++] = $string;
-
-        if ($this->_tIdx == 511) {
-            $this->_bitsToGet = 10;
-        } else if ($this->_tIdx == 1023) {
-            $this->_bitsToGet = 11;
-        } else if ($this->_tIdx == 2047) {
-            $this->_bitsToGet = 12;
-        }
-    }
-
-    /**
-     * Returns the next 9, 10, 11 or 12 bits
-     *
-     * @return int
-     */
-    protected function _getNextCode()
-    {
-        if ($this->_bytePointer == $this->_dataLength) {
-            return 257;
-        }
-
-        $this->_nextData = ($this->_nextData << 8) | (ord($this->_data[$this->_bytePointer++]) & 0xff);
-        $this->_nextBits += 8;
-
-        if ($this->_nextBits < $this->_bitsToGet) {
-            $this->_nextData = ($this->_nextData << 8) | (ord($this->_data[$this->_bytePointer++]) & 0xff);
-            $this->_nextBits += 8;
-        }
-
-        $code = ($this->_nextData >> ($this->_nextBits - $this->_bitsToGet)) & $this->_andTable[$this->_bitsToGet-9];
-        $this->_nextBits -= $this->_bitsToGet;
-
-        return $code;
-    }
-
-    /**
-     * NOT IMPLEMENTED
-     *
-     * @param string $in
-     * @return string
-     * @throws LogicException
-     */
-    public function encode($in)
-    {
-        throw new LogicException("LZW encoding not implemented.");
-    }
-}
\ No newline at end of file
diff --git a/htdocs/includes/fpdfi/filters/FilterLZW_FPDI.php b/htdocs/includes/fpdfi/filters/FilterLZW_FPDI.php
deleted file mode 100644
index 13ff1eb8e82..00000000000
--- a/htdocs/includes/fpdfi/filters/FilterLZW_FPDI.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-//
-//  FPDI - Version 1.4.2
-//
-//    Copyright 2004-2011 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-require_once('FilterLZW.php');
-
-class FilterLZW_FPDI extends FilterLZW {
-
-    var $fpdi;
-
-    function FilterLZW_FPDI(&$fpdi) {
-        $this->fpdi =& $fpdi;
-    }
-    
-    function error($msg) {
-        $this->fpdi->error($msg);
-    }
-}
\ No newline at end of file
diff --git a/htdocs/includes/fpdfi/fpdf_tpl.php b/htdocs/includes/fpdfi/fpdf_tpl.php
deleted file mode 100644
index 5da77aff0e0..00000000000
--- a/htdocs/includes/fpdfi/fpdf_tpl.php
+++ /dev/null
@@ -1,555 +0,0 @@
-<?php
-//
-//  FPDI - Version 1.5.2
-//
-//    Copyright 2004-2014 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-require_once('fpdi_bridge.php');
-
-/**
- * Class FPDF_TPL
- */
-class FPDF_TPL extends fpdi_bridge
-{
-    /**
-     * Array of template data
-     *
-     * @var array
-     */
-    protected $_tpls = array();
-
-    /**
-     * Current Template-Id
-     *
-     * @var int
-     */
-    public $tpl = 0;
-
-    /**
-     * "In Template"-Flag
-     *
-     * @var boolean
-     */
-    protected $_inTpl = false;
-
-    /**
-     * Name prefix of templates used in Resources dictionary
-     *
-     * @var string A String defining the Prefix used as Template-Object-Names. Have to begin with an /
-     */
-    public $tplPrefix = "/TPL";
-
-    /**
-     * Resources used by templates and pages
-     *
-     * @var array
-     */
-    protected  $_res = array();
-
-    /**
-     * Last used template data
-     *
-     * @var array
-     */
-    public $lastUsedTemplateData = array();
-
-    /**
-     * Start a template.
-     *
-     * This method starts a template. You can give own coordinates to build an own sized
-     * template. Pay attention, that the margins are adapted to the new template size.
-     * If you want to write outside the template, for example to build a clipped template,
-     * you have to set the margins and "cursor"-position manual after beginTemplate()-call.
-     *
-     * If no parameter is given, the template uses the current page-size.
-     * The method returns an id of the current template. This id is used later for using this template.
-     * Warning: A created template is saved in the resulting PDF at all events. Also if you don't use it after creation!
-     *
-     * @param int $x The x-coordinate given in user-unit
-     * @param int $y The y-coordinate given in user-unit
-     * @param int $w The width given in user-unit
-     * @param int $h The height given in user-unit
-     * @return int The id of new created template
-     * @throws LogicException
-     */
-    public function beginTemplate($x = null, $y = null, $w = null, $h = null)
-    {
-        if (is_subclass_of($this, 'TCPDF')) {
-            throw new LogicException('This method is only usable with FPDF. Use TCPDF methods startTemplate() instead.');
-        }
-
-        if ($this->page <= 0) {
-            throw new LogicException("You have to add at least a page first!");
-        }
-
-        if ($x == null)
-            $x = 0;
-        if ($y == null)
-            $y = 0;
-        if ($w == null)
-            $w = $this->w;
-        if ($h == null)
-            $h = $this->h;
-
-        // Save settings
-        $this->tpl++;
-        $tpl =& $this->_tpls[$this->tpl];
-        $tpl = array(
-            'o_x' => $this->x,
-            'o_y' => $this->y,
-            'o_AutoPageBreak' => $this->AutoPageBreak,
-            'o_bMargin' => $this->bMargin,
-            'o_tMargin' => $this->tMargin,
-            'o_lMargin' => $this->lMargin,
-            'o_rMargin' => $this->rMargin,
-            'o_h' => $this->h,
-            'o_w' => $this->w,
-            'o_FontFamily' => $this->FontFamily,
-            'o_FontStyle' => $this->FontStyle,
-            'o_FontSizePt' => $this->FontSizePt,
-            'o_FontSize' => $this->FontSize,
-            'buffer' => '',
-            'x' => $x,
-            'y' => $y,
-            'w' => $w,
-            'h' => $h
-        );
-
-        $this->SetAutoPageBreak(false);
-
-        // Define own high and width to calculate correct positions
-        $this->h = $h;
-        $this->w = $w;
-
-        $this->_inTpl = true;
-        $this->SetXY($x + $this->lMargin, $y + $this->tMargin);
-        $this->SetRightMargin($this->w - $w + $this->rMargin);
-
-        if ($this->CurrentFont) {
-            $fontKey = $this->FontFamily . $this->FontStyle;
-            if ($fontKey) {
-                $this->_res['tpl'][$this->tpl]['fonts'][$fontKey] =& $this->fonts[$fontKey];
-                $this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
-            }
-        }
-
-        return $this->tpl;
-    }
-
-    /**
-     * End template.
-     *
-     * This method ends a template and reset initiated variables collected in {@link beginTemplate()}.
-     *
-     * @return int|boolean If a template is opened, the id is returned. If not a false is returned.
-     */
-    public function endTemplate()
-    {
-        if (is_subclass_of($this, 'TCPDF')) {
-            $args = func_get_args();
-            return call_user_func_array(array($this, 'TCPDF::endTemplate'), $args);
-        }
-
-        if ($this->_inTpl) {
-            $this->_inTpl = false;
-            $tpl = $this->_tpls[$this->tpl];
-            $this->SetXY($tpl['o_x'], $tpl['o_y']);
-            $this->tMargin = $tpl['o_tMargin'];
-            $this->lMargin = $tpl['o_lMargin'];
-            $this->rMargin = $tpl['o_rMargin'];
-            $this->h = $tpl['o_h'];
-            $this->w = $tpl['o_w'];
-            $this->SetAutoPageBreak($tpl['o_AutoPageBreak'], $tpl['o_bMargin']);
-
-            $this->FontFamily = $tpl['o_FontFamily'];
-            $this->FontStyle = $tpl['o_FontStyle'];
-            $this->FontSizePt = $tpl['o_FontSizePt'];
-            $this->FontSize = $tpl['o_FontSize'];
-
-            $fontKey = $this->FontFamily . $this->FontStyle;
-            if ($fontKey)
-                $this->CurrentFont =& $this->fonts[$fontKey];
-
-            return $this->tpl;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Use a template in current page or other template.
-     *
-     * You can use a template in a page or in another template.
-     * You can give the used template a new size.
-     * All parameters are optional. The width or height is calculated automatically
-     * if one is given. If no parameter is given the origin size as defined in
-     * {@link beginTemplate()} method is used.
-     *
-     * The calculated or used width and height are returned as an array.
-     *
-     * @param int $tplIdx A valid template-id
-     * @param int $x The x-position
-     * @param int $y The y-position
-     * @param int $w The new width of the template
-     * @param int $h The new height of the template
-     * @return array The height and width of the template (array('w' => ..., 'h' => ...))
-     * @throws LogicException|InvalidArgumentException
-     */
-    public function useTemplate($tplIdx, $x = null, $y = null, $w = 0, $h = 0)
-    {
-        if ($this->page <= 0) {
-            throw new LogicException('You have to add at least a page first!');
-        }
-
-        if (!isset($this->_tpls[$tplIdx])) {
-            throw new InvalidArgumentException('Template does not exist!');
-        }
-
-        if ($this->_inTpl) {
-            $this->_res['tpl'][$this->tpl]['tpls'][$tplIdx] =& $this->_tpls[$tplIdx];
-        }
-
-        $tpl = $this->_tpls[$tplIdx];
-        $_w = $tpl['w'];
-        $_h = $tpl['h'];
-
-        if ($x == null) {
-            $x = 0;
-        }
-
-        if ($y == null) {
-            $y = 0;
-        }
-
-        $x += $tpl['x'];
-        $y += $tpl['y'];
-
-        $wh = $this->getTemplateSize($tplIdx, $w, $h);
-        $w = $wh['w'];
-        $h = $wh['h'];
-
-        $tplData = array(
-            'x' => $this->x,
-            'y' => $this->y,
-            'w' => $w,
-            'h' => $h,
-            'scaleX' => ($w / $_w),
-            'scaleY' => ($h / $_h),
-            'tx' => $x,
-            'ty' =>  ($this->h - $y - $h),
-            'lty' => ($this->h - $y - $h) - ($this->h - $_h) * ($h / $_h)
-        );
-
-        $this->_out(sprintf('q %.4F 0 0 %.4F %.4F %.4F cm',
-                $tplData['scaleX'], $tplData['scaleY'], $tplData['tx'] * $this->k, $tplData['ty'] * $this->k)
-        ); // Translate
-        $this->_out(sprintf('%s%d Do Q', $this->tplPrefix, $tplIdx));
-
-        $this->lastUsedTemplateData = $tplData;
-
-        return array('w' => $w, 'h' => $h);
-    }
-
-    /**
-     * Get the calculated size of a template.
-     *
-     * If one size is given, this method calculates the other one.
-     *
-     * @param int $tplIdx A valid template-id
-     * @param int $w The width of the template
-     * @param int $h The height of the template
-     * @return array The height and width of the template (array('w' => ..., 'h' => ...))
-     */
-    public function getTemplateSize($tplIdx, $w = 0, $h = 0)
-    {
-        if (!isset($this->_tpls[$tplIdx]))
-            return false;
-
-        $tpl = $this->_tpls[$tplIdx];
-        $_w = $tpl['w'];
-        $_h = $tpl['h'];
-
-        if ($w == 0 && $h == 0) {
-            $w = $_w;
-            $h = $_h;
-        }
-
-        if ($w == 0)
-            $w = $h * $_w / $_h;
-        if($h == 0)
-            $h = $w * $_h / $_w;
-
-        return array("w" => $w, "h" => $h);
-    }
-
-    /**
-     * Sets the font used to print character strings.
-     *
-     * See FPDF/TCPDF documentation.
-     *
-     * @see http://fpdf.org/en/doc/setfont.htm
-     * @see http://www.tcpdf.org/doc/code/classTCPDF.html#afd56e360c43553830d543323e81bc045
-     */
-    public function SetFont($family, $style = '', $size = null, $fontfile = '', $subset = 'default', $out = true)
-    {
-        if (is_subclass_of($this, 'TCPDF')) {
-            $args = func_get_args();
-            return call_user_func_array(array($this, 'TCPDF::SetFont'), $args);
-        }
-
-        parent::SetFont($family, $style, $size);
-
-        $fontkey = $this->FontFamily . $this->FontStyle;
-
-        if ($this->_inTpl) {
-            $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] =& $this->fonts[$fontkey];
-        } else {
-            $this->_res['page'][$this->page]['fonts'][$fontkey] =& $this->fonts[$fontkey];
-        }
-    }
-
-    /**
-     * Puts an image.
-     *
-     * See FPDF/TCPDF documentation.
-     *
-     * @see http://fpdf.org/en/doc/image.htm
-     * @see http://www.tcpdf.org/doc/code/classTCPDF.html#a714c2bee7d6b39d4d6d304540c761352
-     */
-    public function Image(
-        $file, $x = '', $y = '', $w = 0, $h = 0, $type = '', $link = '', $align = '', $resize = false,
-        $dpi = 300, $palign = '', $ismask = false, $imgmask = false, $border = 0, $fitbox = false,
-        $hidden = false, $fitonpage = false, $alt = false, $altimgs = array()
-    )
-    {
-        if (is_subclass_of($this, 'TCPDF')) {
-            $args = func_get_args();
-            return call_user_func_array(array($this, 'TCPDF::Image'), $args);
-        }
-
-        $ret = parent::Image($file, $x, $y, $w, $h, $type, $link);
-        if ($this->_inTpl) {
-            $this->_res['tpl'][$this->tpl]['images'][$file] =& $this->images[$file];
-        } else {
-            $this->_res['page'][$this->page]['images'][$file] =& $this->images[$file];
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Adds a new page to the document.
-     *
-     * See FPDF/TCPDF documentation.
-     *
-     * This method cannot be used if you'd started a template.
-     *
-     * @see http://fpdf.org/en/doc/addpage.htm
-     * @see http://www.tcpdf.org/doc/code/classTCPDF.html#a5171e20b366b74523709d84c349c1ced
-     */
-    public function AddPage($orientation = '', $format = '', $keepmargins = false, $tocpage = false)
-    {
-        if (is_subclass_of($this, 'TCPDF')) {
-            $args = func_get_args();
-            return call_user_func_array(array($this, 'TCPDF::AddPage'), $args);
-        }
-
-        if ($this->_inTpl) {
-            throw new LogicException('Adding pages in templates is not possible!');
-        }
-
-        parent::AddPage($orientation, $format);
-    }
-
-    /**
-     * Puts a link on a rectangular area of the page.
-     *
-     * Overwritten because adding links in a template will not work.
-     *
-     * @see http://fpdf.org/en/doc/link.htm
-     * @see http://www.tcpdf.org/doc/code/classTCPDF.html#ab87bf1826384fbfe30eb499d42f1d994
-     */
-    public function Link($x, $y, $w, $h, $link, $spaces = 0)
-    {
-        if (is_subclass_of($this, 'TCPDF')) {
-            $args = func_get_args();
-            return call_user_func_array(array($this, 'TCPDF::Link'), $args);
-        }
-
-        if ($this->_inTpl) {
-            throw new LogicException('Using links in templates is not posible!');
-        }
-
-        parent::Link($x, $y, $w, $h, $link);
-    }
-
-    /**
-     * Creates a new internal link and returns its identifier.
-     *
-     * Overwritten because adding links in a template will not work.
-     *
-     * @see http://fpdf.org/en/doc/addlink.htm
-     * @see http://www.tcpdf.org/doc/code/classTCPDF.html#a749522038ed7786c3e1701435dcb891e
-     */
-    public function AddLink()
-    {
-        if (is_subclass_of($this, 'TCPDF')) {
-            $args = func_get_args();
-            return call_user_func_array(array($this, 'TCPDF::AddLink'), $args);
-        }
-
-        if ($this->_inTpl) {
-            throw new LogicException('Adding links in templates is not possible!');
-        }
-
-        return parent::AddLink();
-    }
-
-    /**
-     * Defines the page and position a link points to.
-     *
-     * Overwritten because adding links in a template will not work.
-     *
-     * @see http://fpdf.org/en/doc/setlink.htm
-     * @see http://www.tcpdf.org/doc/code/classTCPDF.html#ace5be60e7857953ea5e2b89cb90df0ae
-     */
-    public function SetLink($link, $y = 0, $page = -1)
-    {
-        if (is_subclass_of($this, 'TCPDF')) {
-            $args = func_get_args();
-            return call_user_func_array(array($this, 'TCPDF::SetLink'), $args);
-        }
-
-        if ($this->_inTpl) {
-            throw new LogicException('Setting links in templates is not possible!');
-        }
-
-        parent::SetLink($link, $y, $page);
-    }
-
-    /**
-     * Writes the form XObjects to the PDF document.
-     */
-    protected function _putformxobjects()
-    {
-        $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
-        reset($this->_tpls);
-
-        foreach($this->_tpls AS $tplIdx => $tpl) {
-            $this->_newobj();
-            $this->_tpls[$tplIdx]['n'] = $this->n;
-            $this->_out('<<'.$filter.'/Type /XObject');
-            $this->_out('/Subtype /Form');
-            $this->_out('/FormType 1');
-            $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]',
-                // llx
-                $tpl['x'] * $this->k,
-                // lly
-                -$tpl['y'] * $this->k,
-                // urx
-                ($tpl['w'] + $tpl['x']) * $this->k,
-                // ury
-                ($tpl['h'] - $tpl['y']) * $this->k
-            ));
-
-            if ($tpl['x'] != 0 || $tpl['y'] != 0) {
-                $this->_out(sprintf('/Matrix [1 0 0 1 %.5F %.5F]',
-                    -$tpl['x'] * $this->k * 2, $tpl['y'] * $this->k * 2
-                ));
-            }
-
-            $this->_out('/Resources ');
-            $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
-
-            if (isset($this->_res['tpl'][$tplIdx])) {
-                $res = $this->_res['tpl'][$tplIdx];
-                if (isset($res['fonts']) && count($res['fonts'])) {
-                    $this->_out('/Font <<');
-
-                    foreach($res['fonts'] as $font) {
-                        $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
-                    }
-
-                    $this->_out('>>');
-                }
-
-                if(isset($res['images']) || isset($res['tpls'])) {
-                    $this->_out('/XObject <<');
-
-                    if (isset($res['images'])) {
-                        foreach($res['images'] as $image)
-                            $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
-                    }
-
-                    if (isset($res['tpls'])) {
-                        foreach($res['tpls'] as $i => $_tpl)
-                            $this->_out($this->tplPrefix . $i . ' ' . $_tpl['n'] . ' 0 R');
-                    }
-
-                    $this->_out('>>');
-                }
-            }
-
-            $this->_out('>>');
-
-            $buffer = ($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
-            $this->_out('/Length ' . strlen($buffer) . ' >>');
-            $this->_putstream($buffer);
-            $this->_out('endobj');
-        }
-    }
-
-    /**
-     * Output images.
-     *
-     * Overwritten to add {@link _putformxobjects()} after _putimages().
-     */
-    public function _putimages()
-    {
-        parent::_putimages();
-        $this->_putformxobjects();
-    }
-
-    /**
-     * Writes the references of XObject resources to the document.
-     *
-     * Overwritten to add the the templates to the XObject resource dictionary.
-     */
-    public function _putxobjectdict()
-    {
-        parent::_putxobjectdict();
-
-        foreach($this->_tpls as $tplIdx => $tpl) {
-            $this->_out(sprintf('%s%d %d 0 R', $this->tplPrefix, $tplIdx, $tpl['n']));
-        }
-    }
-
-    /**
-     * Writes bytes to the resulting document.
-     *
-     * Overwritten to delegate the data to the template buffer.
-     *
-     * @param string $s
-     */
-    public function _out($s)
-    {
-        if ($this->state == 2 && $this->_inTpl) {
-            $this->_tpls[$this->tpl]['buffer'] .= $s . "\n";
-        } else {
-            parent::_out($s);
-        }
-    }
-}
diff --git a/htdocs/includes/fpdfi/fpdi.php b/htdocs/includes/fpdfi/fpdi.php
deleted file mode 100644
index 957c50531e6..00000000000
--- a/htdocs/includes/fpdfi/fpdi.php
+++ /dev/null
@@ -1,695 +0,0 @@
-<?php
-//
-//  FPDI - Version 1.5.2
-//
-//    Copyright 2004-2014 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-require_once('fpdf_tpl.php');
-
-/**
- * Class FPDI
- */
-class FPDI extends FPDF_TPL
-{
-    /**
-     * FPDI version
-     *
-     * @string
-     */
-    const VERSION = '1.5.2';
-
-    /**
-     * Actual filename
-     *
-     * @var string
-     */
-    public $currentFilename;
-
-    /**
-     * Parser-Objects
-     *
-     * @var fpdi_pdf_parser[]
-     */
-    public $parsers = array();
-    
-    /**
-     * Current parser
-     *
-     * @var fpdi_pdf_parser
-     */
-    public $currentParser;
-
-    /**
-     * The name of the last imported page box
-     *
-     * @var string
-     */
-    public $lastUsedPageBox;
-
-    /**
-     * Object stack
-     *
-     * @var array
-     */
-    protected $_objStack;
-    
-    /**
-     * Done object stack
-     *
-     * @var array
-     */
-    protected $_doneObjStack;
-
-    /**
-     * Current Object Id.
-     *
-     * @var integer
-     */
-    protected $_currentObjId;
-    
-    /**
-     * Cache for imported pages/template ids
-     *
-     * @var array
-     */
-    protected $_importedPages = array();
-    
-    /**
-     * Set a source-file.
-     *
-     * Depending on the PDF version of the used document the PDF version of the resulting document will
-     * be adjusted to the higher version.
-     *
-     * @param string $filename A valid path to the PDF document from which pages should be imported from
-     * @return int The number of pages in the document
-     */
-    public function setSourceFile($filename)
-    {
-        $_filename = realpath($filename);
-        if (false !== $_filename)
-            $filename = $_filename;
-
-        $this->currentFilename = $filename;
-        
-        if (!isset($this->parsers[$filename])) {
-            $this->parsers[$filename] = $this->_getPdfParser($filename);
-            $this->setPdfVersion(
-                max($this->getPdfVersion(), $this->parsers[$filename]->getPdfVersion())
-            );
-        }
-
-        $this->currentParser =& $this->parsers[$filename];
-        
-        return $this->parsers[$filename]->getPageCount();
-    }
-    
-    /**
-     * Returns a PDF parser object
-     *
-     * @param string $filename
-     * @return fpdi_pdf_parser
-     */
-    protected function _getPdfParser($filename)
-    {
-        require_once('fpdi_pdf_parser.php');
-    	return new fpdi_pdf_parser($filename);
-    }
-    
-    /**
-     * Get the current PDF version.
-     *
-     * @return string
-     */
-    public function getPdfVersion()
-    {
-		return $this->PDFVersion;
-	}
-    
-    /**
-     * Set the PDF version.
-     *
-     * @param string $version
-     */
-    public function setPdfVersion($version = '1.3')
-    {
-        $this->PDFVersion = sprintf('%.1F', $version);
-    }
-	
-    /**
-     * Import a page.
-     *
-     * The second parameter defines the bounding box that should be used to transform the page into a
-     * form XObject.
-     *
-     * Following values are available: MediaBox, CropBox, BleedBox, TrimBox, ArtBox.
-     * If a box is not especially defined its default box will be used:
-     *
-     * <ul>
-     *   <li>CropBox: Default -> MediaBox</li>
-     *   <li>BleedBox: Default -> CropBox</li>
-     *   <li>TrimBox: Default -> CropBox</li>
-     *   <li>ArtBox: Default -> CropBox</li>
-     * </ul>
-     *
-     * It is possible to get the used page box by the {@link getLastUsedPageBox()} method.
-     *
-     * @param int $pageNo The page number
-     * @param string $boxName The boundary box to use when transforming the page into a form XObject
-     * @param boolean $groupXObject Define the form XObject as a group XObject to support transparency (if used)
-     * @return int An id of the imported page/template to use with e.g. fpdf_tpl::useTemplate()
-     * @throws LogicException|InvalidArgumentException
-     * @see getLastUsedPageBox()
-     */
-    public function importPage($pageNo, $boxName = 'CropBox', $groupXObject = true)
-    {
-        if ($this->_inTpl) {
-            throw new LogicException('Please import the desired pages before creating a new template.');
-        }
-        
-        $fn = $this->currentFilename;
-        $boxName = '/' . ltrim($boxName, '/');
-
-        // check if page already imported
-        $pageKey = $fn . '-' . ((int)$pageNo) . $boxName;
-        if (isset($this->_importedPages[$pageKey])) {
-            return $this->_importedPages[$pageKey];
-        }
-        
-        $parser = $this->parsers[$fn];
-        $parser->setPageNo($pageNo);
-
-        if (!in_array($boxName, $parser->availableBoxes)) {
-            throw new InvalidArgumentException(sprintf('Unknown box: %s', $boxName));
-        }
-            
-        $pageBoxes = $parser->getPageBoxes($pageNo, $this->k);
-        
-        /**
-         * MediaBox
-         * CropBox: Default -> MediaBox
-         * BleedBox: Default -> CropBox
-         * TrimBox: Default -> CropBox
-         * ArtBox: Default -> CropBox
-         */
-        if (!isset($pageBoxes[$boxName]) && ($boxName == '/BleedBox' || $boxName == '/TrimBox' || $boxName == '/ArtBox'))
-            $boxName = '/CropBox';
-        if (!isset($pageBoxes[$boxName]) && $boxName == '/CropBox')
-            $boxName = '/MediaBox';
-        
-        if (!isset($pageBoxes[$boxName]))
-            return false;
-            
-        $this->lastUsedPageBox = $boxName;
-        
-        $box = $pageBoxes[$boxName];
-        
-        $this->tpl++;
-        $this->_tpls[$this->tpl] = array();
-        $tpl =& $this->_tpls[$this->tpl];
-        $tpl['parser'] = $parser;
-        $tpl['resources'] = $parser->getPageResources();
-        $tpl['buffer'] = $parser->getContent();
-        $tpl['box'] = $box;
-        $tpl['groupXObject'] = $groupXObject;
-        if ($groupXObject) {
-            $this->setPdfVersion(max($this->getPdfVersion(), 1.4));
-        }
-
-        // To build an array that can be used by PDF_TPL::useTemplate()
-        $this->_tpls[$this->tpl] = array_merge($this->_tpls[$this->tpl], $box);
-        
-        // An imported page will start at 0,0 all the time. Translation will be set in _putformxobjects()
-        $tpl['x'] = 0;
-        $tpl['y'] = 0;
-        
-        // handle rotated pages
-        $rotation = $parser->getPageRotation($pageNo);
-        $tpl['_rotationAngle'] = 0;
-        if (isset($rotation[1]) && ($angle = $rotation[1] % 360) != 0) {
-        	$steps = $angle / 90;
-                
-            $_w = $tpl['w'];
-            $_h = $tpl['h'];
-            $tpl['w'] = $steps % 2 == 0 ? $_w : $_h;
-            $tpl['h'] = $steps % 2 == 0 ? $_h : $_w;
-            
-            if ($angle < 0)
-            	$angle += 360;
-            
-        	$tpl['_rotationAngle'] = $angle * -1;
-        }
-        
-        $this->_importedPages[$pageKey] = $this->tpl;
-        
-        return $this->tpl;
-    }
-    
-    /**
-     * Returns the last used page boundary box.
-     *
-     * @return string The used boundary box: MediaBox, CropBox, BleedBox, TrimBox or ArtBox
-     */
-    public function getLastUsedPageBox()
-    {
-        return $this->lastUsedPageBox;
-    }
-
-    /**
-     * Use a template or imported page in current page or other template.
-     *
-     * You can use a template in a page or in another template.
-     * You can give the used template a new size. All parameters are optional.
-     * The width or height is calculated automatically if one is given. If no
-     * parameter is given the origin size as defined in beginTemplate() or of
-     * the imported page is used.
-     *
-     * The calculated or used width and height are returned as an array.
-     *
-     * @param int $tplIdx A valid template-id
-     * @param int $x The x-position
-     * @param int $y The y-position
-     * @param int $w The new width of the template
-     * @param int $h The new height of the template
-     * @param boolean $adjustPageSize If set to true the current page will be resized to fit the dimensions
-     *                                of the template
-     *
-     * @return array The height and width of the template (array('w' => ..., 'h' => ...))
-     * @throws LogicException|InvalidArgumentException
-     */
-    public function useTemplate($tplIdx, $x = null, $y = null, $w = 0, $h = 0, $adjustPageSize = false)
-    {
-        if ($adjustPageSize == true && is_null($x) && is_null($y)) {
-            $size = $this->getTemplateSize($tplIdx, $w, $h);
-            $orientation = $size['w'] > $size['h'] ? 'L' : 'P';
-            $size = array($size['w'], $size['h']);
-            
-            if (is_subclass_of($this, 'TCPDF')) {
-            	$this->setPageFormat($size, $orientation);
-            } else {
-            	$size = $this->_getpagesize($size);
-            	
-            	if($orientation != $this->CurOrientation ||
-                    $size[0] != $this->CurPageSize[0] ||
-                    $size[1] != $this->CurPageSize[1]
-                ) {
-					// New size or orientation
-					if ($orientation=='P') {
-						$this->w = $size[0];
-						$this->h = $size[1];
-					} else {
-						$this->w = $size[1];
-						$this->h = $size[0];
-					}
-					$this->wPt = $this->w * $this->k;
-					$this->hPt = $this->h * $this->k;
-					$this->PageBreakTrigger = $this->h - $this->bMargin;
-					$this->CurOrientation = $orientation;
-					$this->CurPageSize = $size;
-					$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
-				}
-            } 
-        }
-        
-        $this->_out('q 0 J 1 w 0 j 0 G 0 g'); // reset standard values
-        $size = parent::useTemplate($tplIdx, $x, $y, $w, $h);
-        $this->_out('Q');
-        
-        return $size;
-    }
-    
-    /**
-     * Copy all imported objects to the resulting document.
-     */
-    protected function _putimportedobjects()
-    {
-        foreach($this->parsers AS $filename => $p) {
-            $this->currentParser =& $p;
-            if (!isset($this->_objStack[$filename]) || !is_array($this->_objStack[$filename])) {
-                continue;
-            }
-            while(($n = key($this->_objStack[$filename])) !== null) {
-                try {
-                    $nObj = $this->currentParser->resolveObject($this->_objStack[$filename][$n][1]);
-                } catch (Exception $e) {
-                    $nObj = array(pdf_parser::TYPE_OBJECT, pdf_parser::TYPE_NULL);
-                }
-
-                $this->_newobj($this->_objStack[$filename][$n][0]);
-
-                if ($nObj[0] == pdf_parser::TYPE_STREAM) {
-                    $this->_writeValue($nObj);
-                } else {
-                    $this->_writeValue($nObj[1]);
-                }
-
-                $this->_out("\nendobj");
-                $this->_objStack[$filename][$n] = null; // free memory
-                unset($this->_objStack[$filename][$n]);
-                reset($this->_objStack[$filename]);
-            }
-        }
-    }
-
-    /**
-     * Writes the form XObjects to the PDF document.
-     */
-    protected function _putformxobjects()
-    {
-        $filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
-	    reset($this->_tpls);
-        foreach($this->_tpls AS $tplIdx => $tpl) {
-            $this->_newobj();
-    		$currentN = $this->n; // TCPDF/Protection: rem current "n"
-    		
-    		$this->_tpls[$tplIdx]['n'] = $this->n;
-    		$this->_out('<<' . $filter . '/Type /XObject');
-            $this->_out('/Subtype /Form');
-            $this->_out('/FormType 1');
-            
-            $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]', 
-                (isset($tpl['box']['llx']) ? $tpl['box']['llx'] : $tpl['x']) * $this->k,
-                (isset($tpl['box']['lly']) ? $tpl['box']['lly'] : -$tpl['y']) * $this->k,
-                (isset($tpl['box']['urx']) ? $tpl['box']['urx'] : $tpl['w'] + $tpl['x']) * $this->k,
-                (isset($tpl['box']['ury']) ? $tpl['box']['ury'] : $tpl['h'] - $tpl['y']) * $this->k
-            ));
-            
-            $c = 1;
-            $s = 0;
-            $tx = 0;
-            $ty = 0;
-            
-            if (isset($tpl['box'])) {
-                $tx = -$tpl['box']['llx'];
-                $ty = -$tpl['box']['lly']; 
-                
-                if ($tpl['_rotationAngle'] <> 0) {
-                    $angle = $tpl['_rotationAngle'] * M_PI/180;
-                    $c = cos($angle);
-                    $s = sin($angle);
-                    
-                    switch($tpl['_rotationAngle']) {
-                        case -90:
-                           $tx = -$tpl['box']['lly'];
-                           $ty = $tpl['box']['urx'];
-                           break;
-                        case -180:
-                            $tx = $tpl['box']['urx'];
-                            $ty = $tpl['box']['ury'];
-                            break;
-                        case -270:
-                        	$tx = $tpl['box']['ury'];
-                            $ty = -$tpl['box']['llx'];
-                            break;
-                    }
-                }
-            } else if ($tpl['x'] != 0 || $tpl['y'] != 0) {
-                $tx = -$tpl['x'] * 2;
-                $ty = $tpl['y'] * 2;
-            }
-            
-            $tx *= $this->k;
-            $ty *= $this->k;
-            
-            if ($c != 1 || $s != 0 || $tx != 0 || $ty != 0) {
-                $this->_out(sprintf('/Matrix [%.5F %.5F %.5F %.5F %.5F %.5F]',
-                    $c, $s, -$s, $c, $tx, $ty
-                ));
-            }
-            
-            $this->_out('/Resources ');
-
-            if (isset($tpl['resources'])) {
-                $this->currentParser = $tpl['parser'];
-                $this->_writeValue($tpl['resources']); // "n" will be changed
-            } else {
-
-                $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
-                if (isset($this->_res['tpl'][$tplIdx])) {
-                    $res = $this->_res['tpl'][$tplIdx];
-
-                    if (isset($res['fonts']) && count($res['fonts'])) {
-                        $this->_out('/Font <<');
-                        foreach ($res['fonts'] as $font)
-                            $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
-                        $this->_out('>>');
-                    }
-                    if (isset($res['images']) && count($res['images']) ||
-                       isset($res['tpls']) && count($res['tpls']))
-                    {
-                        $this->_out('/XObject <<');
-                        if (isset($res['images'])) {
-                            foreach ($res['images'] as $image)
-                                $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
-                        }
-                        if (isset($res['tpls'])) {
-                            foreach ($res['tpls'] as $i => $_tpl)
-                                $this->_out($this->tplPrefix . $i . ' ' . $_tpl['n'] . ' 0 R');
-                        }
-                        $this->_out('>>');
-                    }
-                    $this->_out('>>');
-                }
-            }
-
-            if (isset($tpl['groupXObject']) && $tpl['groupXObject']) {
-                $this->_out('/Group <</Type/Group/S/Transparency>>');
-            }
-
-            $newN = $this->n; // TCPDF: rem new "n"
-            $this->n = $currentN; // TCPDF: reset to current "n"
-
-            $buffer = ($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
-
-            if (is_subclass_of($this, 'TCPDF')) {
-            	$buffer = $this->_getrawstream($buffer);
-            	$this->_out('/Length ' . strlen($buffer) . ' >>');
-            	$this->_out("stream\n" . $buffer . "\nendstream");
-            } else {
-	            $this->_out('/Length ' . strlen($buffer) . ' >>');
-	    		$this->_putstream($buffer);
-            }
-    		$this->_out('endobj');
-    		$this->n = $newN; // TCPDF: reset to new "n"
-        }
-        
-        $this->_putimportedobjects();
-    }
-
-    /**
-     * Creates and optionally write the object definition to the document.
-     *
-     * Rewritten to handle existing own defined objects
-     *
-     * @param bool $objId
-     * @param bool $onlyNewObj
-     * @return bool|int
-     */
-    public function _newobj($objId = false, $onlyNewObj = false)
-    {
-        if (!$objId) {
-            $objId = ++$this->n;
-        }
-
-        //Begin a new object
-        if (!$onlyNewObj) {
-            $this->offsets[$objId] = is_subclass_of($this, 'TCPDF') ? $this->bufferlen : strlen($this->buffer);
-            $this->_out($objId . ' 0 obj');
-            $this->_currentObjId = $objId; // for later use with encryption
-        }
-        
-        return $objId;
-    }
-
-    /**
-     * Writes a PDF value to the resulting document.
-     *
-     * Needed to rebuild the source document
-     *
-     * @param mixed $value A PDF-Value. Structure of values see cases in this method
-     */
-    protected function _writeValue(&$value)
-    {
-        if (is_subclass_of($this, 'TCPDF')) {
-            parent::_prepareValue($value);
-        }
-        
-        switch ($value[0]) {
-
-    		case pdf_parser::TYPE_TOKEN:
-                $this->_straightOut($value[1] . ' ');
-    			break;
-		    case pdf_parser::TYPE_NUMERIC:
-    		case pdf_parser::TYPE_REAL:
-                if (is_float($value[1]) && $value[1] != 0) {
-    			    $this->_straightOut(rtrim(rtrim(sprintf('%F', $value[1]), '0'), '.') . ' ');
-    			} else {
-        			$this->_straightOut($value[1] . ' ');
-    			}
-    			break;
-    			
-    		case pdf_parser::TYPE_ARRAY:
-
-    			// An array. Output the proper
-    			// structure and move on.
-
-    			$this->_straightOut('[');
-                for ($i = 0; $i < count($value[1]); $i++) {
-    				$this->_writeValue($value[1][$i]);
-    			}
-
-    			$this->_out(']');
-    			break;
-
-    		case pdf_parser::TYPE_DICTIONARY:
-
-    			// A dictionary.
-    			$this->_straightOut('<<');
-
-    			reset ($value[1]);
-
-    			while (list($k, $v) = each($value[1])) {
-    				$this->_straightOut($k . ' ');
-    				$this->_writeValue($v);
-    			}
-
-    			$this->_straightOut('>>');
-    			break;
-
-    		case pdf_parser::TYPE_OBJREF:
-
-    			// An indirect object reference
-    			// Fill the object stack if needed
-    			$cpfn =& $this->currentParser->filename;
-    			if (!isset($this->_doneObjStack[$cpfn][$value[1]])) {
-    			    $this->_newobj(false, true);
-    			    $this->_objStack[$cpfn][$value[1]] = array($this->n, $value);
-                    $this->_doneObjStack[$cpfn][$value[1]] = array($this->n, $value);
-                }
-                $objId = $this->_doneObjStack[$cpfn][$value[1]][0];
-
-    			$this->_out($objId . ' 0 R');
-    			break;
-
-    		case pdf_parser::TYPE_STRING:
-
-    			// A string.
-                $this->_straightOut('(' . $value[1] . ')');
-
-    			break;
-
-    		case pdf_parser::TYPE_STREAM:
-
-    			// A stream. First, output the
-    			// stream dictionary, then the
-    			// stream data itself.
-                $this->_writeValue($value[1]);
-    			$this->_out('stream');
-    			$this->_out($value[2][1]);
-    			$this->_straightOut("endstream");
-    			break;
-    			
-            case pdf_parser::TYPE_HEX:
-                $this->_straightOut('<' . $value[1] . '>');
-                break;
-
-            case pdf_parser::TYPE_BOOLEAN:
-    		    $this->_straightOut($value[1] ? 'true ' : 'false ');
-    		    break;
-            
-    		case pdf_parser::TYPE_NULL:
-                // The null object.
-
-    			$this->_straightOut('null ');
-    			break;
-    	}
-    }
-    
-    
-    /**
-     * Modified _out() method so not each call will add a newline to the output.
-     */
-    protected function _straightOut($s)
-    {
-        if (!is_subclass_of($this, 'TCPDF')) {
-            if ($this->state == 2) {
-        		$this->pages[$this->page] .= $s;
-            } else {
-        		$this->buffer .= $s;
-            }
-
-        } else {
-            if ($this->state == 2) {
-				if ($this->inxobj) {
-					// we are inside an XObject template
-					$this->xobjects[$this->xobjid]['outdata'] .= $s;
-				} else if ((!$this->InFooter) AND isset($this->footerlen[$this->page]) AND ($this->footerlen[$this->page] > 0)) {
-					// puts data before page footer
-					$pagebuff = $this->getPageBuffer($this->page);
-					$page = substr($pagebuff, 0, -$this->footerlen[$this->page]);
-					$footer = substr($pagebuff, -$this->footerlen[$this->page]);
-					$this->setPageBuffer($this->page, $page . $s . $footer);
-					// update footer position
-					$this->footerpos[$this->page] += strlen($s);
-				} else {
-					// set page data
-					$this->setPageBuffer($this->page, $s, true);
-				}
-			} else if ($this->state > 0) {
-				// set general data
-				$this->setBuffer($s);
-			}
-        }
-    }
-
-    /**
-     * Ends the document
-     *
-     * Overwritten to close opened parsers
-     */
-    public function _enddoc()
-    {
-        parent::_enddoc();
-        $this->_closeParsers();
-    }
-    
-    /**
-     * Close all files opened by parsers.
-     *
-     * @return boolean
-     */
-    protected function _closeParsers()
-    {
-        if ($this->state > 2) {
-          	$this->cleanUp();
-            return true;
-        }
-
-        return false;
-    }
-    
-    /**
-     * Removes cycled references and closes the file handles of the parser objects.
-     */
-    public function cleanUp()
-    {
-        while (($parser = array_pop($this->parsers)) !== null) {
-            /**
-             * @var fpdi_pdf_parser $parser
-             */
-            $parser->closeFile();
-        }
-    }
-}
\ No newline at end of file
diff --git a/htdocs/includes/fpdfi/fpdi_bridge.php b/htdocs/includes/fpdfi/fpdi_bridge.php
deleted file mode 100644
index f89822d9510..00000000000
--- a/htdocs/includes/fpdfi/fpdi_bridge.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-//
-//  FPDI - Version 1.5.2
-//
-//    Copyright 2004-2014 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-/**
- * This file is used as a bridge between TCPDF or FPDF
- * It will dynamically create the class extending the available
- * class FPDF or TCPDF.
- *
- * This way it is possible to use FPDI for both FPDF and TCPDF with one FPDI version.
- */
-
-if (!class_exists('TCPDF', false)) {
-    /**
-     * Class fpdi_bridge
-     */
-    class fpdi_bridge extends FPDF
-    {
-        // empty body
-    }
-
-} else {
-
-    /**
-     * Class fpdi_bridge
-     */
-    class fpdi_bridge extends TCPDF
-    {
-        /**
-         * Array of Tpl-Data
-         *
-         * @var array
-         */
-        protected $_tpls = array();
-
-        /**
-         * Name-prefix of Templates used in Resources-Dictionary
-         *
-         * @var string A String defining the Prefix used as Template-Object-Names. Have to begin with an /
-         */
-        public $tplPrefix = "/TPL";
-
-        /**
-         * Current Object Id.
-         *
-         * @var integer
-         */
-        protected $_currentObjId;
-
-        /**
-         * Return XObjects Dictionary.
-         *
-         * Overwritten to add additional XObjects to the resources dictionary of TCPDF
-         *
-         * @return string
-         */
-        protected function _getxobjectdict()
-        {
-            $out = parent::_getxobjectdict();
-            foreach ($this->_tpls as $tplIdx => $tpl) {
-                $out .= sprintf('%s%d %d 0 R', $this->tplPrefix, $tplIdx, $tpl['n']);
-            }
-
-            return $out;
-        }
-
-        /**
-         * Writes a PDF value to the resulting document.
-         *
-         * Prepares the value for encryption of imported data by FPDI
-         *
-         * @param array $value
-         */
-        protected function _prepareValue(&$value)
-        {
-            switch ($value[0]) {
-                case pdf_parser::TYPE_STRING:
-                    if ($this->encrypted) {
-                        $value[1] = $this->_unescape($value[1]);
-                        $value[1] = $this->_encrypt_data($this->_currentObjId, $value[1]);
-                        $value[1] = TCPDF_STATIC::_escape($value[1]);
-                    }
-                    break;
-
-                case pdf_parser::TYPE_STREAM:
-                    if ($this->encrypted) {
-                        $value[2][1] = $this->_encrypt_data($this->_currentObjId, $value[2][1]);
-                        $value[1][1]['/Length'] = array(
-                            pdf_parser::TYPE_NUMERIC,
-                            strlen($value[2][1])
-                        );
-                    }
-                    break;
-
-                case pdf_parser::TYPE_HEX:
-                    if ($this->encrypted) {
-                        $value[1] = $this->hex2str($value[1]);
-                        $value[1] = $this->_encrypt_data($this->_currentObjId, $value[1]);
-
-                        // remake hexstring of encrypted string
-                        $value[1] = $this->str2hex($value[1]);
-                    }
-                    break;
-            }
-        }
-
-        /**
-         * Un-escapes a PDF string
-         *
-         * @param string $s
-         * @return string
-         */
-        protected function _unescape($s)
-        {
-            $out = '';
-            for ($count = 0, $n = strlen($s); $count < $n; $count++) {
-                if ($s[$count] != '\\' || $count == $n-1) {
-                    $out .= $s[$count];
-                } else {
-                    switch ($s[++$count]) {
-                        case ')':
-                        case '(':
-                        case '\\':
-                            $out .= $s[$count];
-                            break;
-                        case 'f':
-                            $out .= chr(0x0C);
-                            break;
-                        case 'b':
-                            $out .= chr(0x08);
-                            break;
-                        case 't':
-                            $out .= chr(0x09);
-                            break;
-                        case 'r':
-                            $out .= chr(0x0D);
-                            break;
-                        case 'n':
-                            $out .= chr(0x0A);
-                            break;
-                        case "\r":
-                            if ($count != $n-1 && $s[$count+1] == "\n")
-                                $count++;
-                            break;
-                        case "\n":
-                            break;
-                        default:
-                            // Octal-Values
-                            if (ord($s[$count]) >= ord('0') &&
-                                ord($s[$count]) <= ord('9')) {
-                                $oct = ''. $s[$count];
-
-                                if (ord($s[$count+1]) >= ord('0') &&
-                                    ord($s[$count+1]) <= ord('9')) {
-                                    $oct .= $s[++$count];
-
-                                    if (ord($s[$count+1]) >= ord('0') &&
-                                        ord($s[$count+1]) <= ord('9')) {
-                                        $oct .= $s[++$count];
-                                    }
-                                }
-
-                                $out .= chr(octdec($oct));
-                            } else {
-                                $out .= $s[$count];
-                            }
-                    }
-                }
-            }
-            return $out;
-        }
-
-        /**
-         * Hexadecimal to string
-         *
-         * @param string $data
-         * @return string
-         */
-        public function hex2str($data)
-        {
-            $data = preg_replace('/[^0-9A-Fa-f]/', '', rtrim($data, '>'));
-            if ((strlen($data) % 2) == 1) {
-                $data .= '0';
-            }
-
-            return pack('H*', $data);
-        }
-
-        /**
-         * String to hexadecimal
-         *
-         * @param string $str
-         * @return string
-         */
-        public function str2hex($str)
-        {
-            return current(unpack('H*', $str));
-        }
-    }
-}
\ No newline at end of file
diff --git a/htdocs/includes/fpdfi/fpdi_pdf_parser.php b/htdocs/includes/fpdfi/fpdi_pdf_parser.php
deleted file mode 100644
index 9e76341b0cd..00000000000
--- a/htdocs/includes/fpdfi/fpdi_pdf_parser.php
+++ /dev/null
@@ -1,354 +0,0 @@
-<?php
-//
-//  FPDI - Version 1.5.2
-//
-//    Copyright 2004-2014 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-require_once('pdf_parser.php');
-
-/**
- * Class fpdi_pdf_parser
- */
-class fpdi_pdf_parser extends pdf_parser
-{
-    /**
-     * Pages
-     *
-     * Index begins at 0
-     *
-     * @var array
-     */
-    protected $_pages;
-    
-    /**
-     * Page count
-     *
-     * @var integer
-     */
-    protected $_pageCount;
-    
-    /**
-     * Current page number
-     *
-     * @var integer
-     */
-    public $pageNo;
-    
-    /**
-     * PDF version of imported document
-     *
-     * @var string
-     */
-    public $_pdfVersion;
-    
-    /**
-     * Available BoxTypes
-     *
-     * @var array
-     */
-    public $availableBoxes = array('/MediaBox', '/CropBox', '/BleedBox', '/TrimBox', '/ArtBox');
-        
-    /**
-     * The constructor.
-     *
-     * @param string $filename The source filename
-     */
-    public function __construct($filename)
-    {
-        parent::__construct($filename);
-
-        // resolve Pages-Dictonary
-        $pages = $this->resolveObject($this->_root[1][1]['/Pages']);
-
-        // Read pages
-        $this->_readPages($pages, $this->_pages);
-        
-        // count pages;
-        $this->_pageCount = count($this->_pages);
-    }
-    
-    /**
-     * Get page count from source file.
-     *
-     * @return int
-     */
-    public function getPageCount()
-    {
-        return $this->_pageCount;
-    }
-
-    /**
-     * Set the page number.
-     *
-     * @param int $pageNo Page number to use
-     * @throws InvalidArgumentException
-     */
-    public function setPageNo($pageNo)
-    {
-        $pageNo = ((int) $pageNo) - 1;
-
-        if ($pageNo < 0 || $pageNo >= $this->getPageCount()) {
-            throw new InvalidArgumentException('Invalid page number!');
-        }
-
-        $this->pageNo = $pageNo;
-    }
-    
-    /**
-     * Get page-resources from current page
-     *
-     * @return array|boolean
-     */
-    public function getPageResources()
-    {
-        return $this->_getPageResources($this->_pages[$this->pageNo]);
-    }
-    
-    /**
-     * Get page-resources from a /Page dictionary.
-     *
-     * @param array $obj Array of pdf-data
-     * @return array|boolean
-     */
-    protected function _getPageResources($obj)
-    {
-    	$obj = $this->resolveObject($obj);
-
-        // If the current object has a resources
-    	// dictionary associated with it, we use
-    	// it. Otherwise, we move back to its
-    	// parent object.
-        if (isset($obj[1][1]['/Resources'])) {
-    		$res = $this->resolveObject($obj[1][1]['/Resources']);
-    		if ($res[0] == pdf_parser::TYPE_OBJECT)
-                return $res[1];
-            return $res;
-    	}
-
-        if (!isset($obj[1][1]['/Parent'])) {
-            return false;
-        }
-
-        $res = $this->_getPageResources($obj[1][1]['/Parent']);
-        if ($res[0] == pdf_parser::TYPE_OBJECT)
-            return $res[1];
-        return $res;
-    }
-
-    /**
-     * Get content of current page.
-     *
-     * If /Contents is an array, the streams are concatenated
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        $buffer = '';
-        
-        if (isset($this->_pages[$this->pageNo][1][1]['/Contents'])) {
-            $contents = $this->_getPageContent($this->_pages[$this->pageNo][1][1]['/Contents']);
-            foreach ($contents AS $tmpContent) {
-                $buffer .= $this->_unFilterStream($tmpContent) . ' ';
-            }
-        }
-        
-        return $buffer;
-    }
-
-    /**
-     * Resolve all content objects.
-     *
-     * @param array $contentRef
-     * @return array
-     */
-    protected function _getPageContent($contentRef)
-    {
-        $contents = array();
-        
-        if ($contentRef[0] == pdf_parser::TYPE_OBJREF) {
-            $content = $this->resolveObject($contentRef);
-            if ($content[1][0] == pdf_parser::TYPE_ARRAY) {
-                $contents = $this->_getPageContent($content[1]);
-            } else {
-                $contents[] = $content;
-            }
-        } else if ($contentRef[0] == pdf_parser::TYPE_ARRAY) {
-            foreach ($contentRef[1] AS $tmp_content_ref) {
-                $contents = array_merge($contents, $this->_getPageContent($tmp_content_ref));
-            }
-        }
-
-        return $contents;
-    }
-
-    /**
-     * Get a boundary box from a page
-     *
-     * Array format is same as used by FPDF_TPL.
-     *
-     * @param array $page a /Page dictionary
-     * @param string $boxIndex Type of box {see {@link $availableBoxes})
-     * @param float Scale factor from user space units to points
-     *
-     * @return array|boolean
-     */
-    protected function _getPageBox($page, $boxIndex, $k)
-    {
-        $page = $this->resolveObject($page);
-        $box = null;
-        if (isset($page[1][1][$boxIndex])) {
-            $box = $page[1][1][$boxIndex];
-        }
-        
-        if (!is_null($box) && $box[0] == pdf_parser::TYPE_OBJREF) {
-            $tmp_box = $this->resolveObject($box);
-            $box = $tmp_box[1];
-        }
-            
-        if (!is_null($box) && $box[0] == pdf_parser::TYPE_ARRAY) {
-            $b = $box[1];
-            return array(
-                'x' => $b[0][1] / $k,
-                'y' => $b[1][1] / $k,
-                'w' => abs($b[0][1] - $b[2][1]) / $k,
-                'h' => abs($b[1][1] - $b[3][1]) / $k,
-                'llx' => min($b[0][1], $b[2][1]) / $k,
-                'lly' => min($b[1][1], $b[3][1]) / $k,
-                'urx' => max($b[0][1], $b[2][1]) / $k,
-                'ury' => max($b[1][1], $b[3][1]) / $k,
-            );
-        } else if (!isset($page[1][1]['/Parent'])) {
-            return false;
-        } else {
-            return $this->_getPageBox($this->resolveObject($page[1][1]['/Parent']), $boxIndex, $k);
-        }
-    }
-
-    /**
-     * Get all page boundary boxes by page number
-     * 
-     * @param int $pageNo The page number
-     * @param float $k Scale factor from user space units to points
-     * @return array
-     * @throws InvalidArgumentException
-     */
-    public function getPageBoxes($pageNo, $k)
-    {
-        if (!isset($this->_pages[$pageNo - 1])) {
-            throw new InvalidArgumentException('Page ' . $pageNo . ' does not exists.');
-        }
-
-        return $this->_getPageBoxes($this->_pages[$pageNo - 1], $k);
-    }
-    
-    /**
-     * Get all boxes from /Page dictionary
-     *
-     * @param array $page A /Page dictionary
-     * @param float $k Scale factor from user space units to points
-     * @return array
-     */
-    protected function _getPageBoxes($page, $k)
-    {
-        $boxes = array();
-
-        foreach($this->availableBoxes AS $box) {
-            if ($_box = $this->_getPageBox($page, $box, $k)) {
-                $boxes[$box] = $_box;
-            }
-        }
-
-        return $boxes;
-    }
-
-    /**
-     * Get the page rotation by page number
-     *
-     * @param integer $pageNo
-     * @throws InvalidArgumentException
-     * @return array
-     */
-    public function getPageRotation($pageNo)
-    {
-        if (!isset($this->_pages[$pageNo - 1])) {
-            throw new InvalidArgumentException('Page ' . $pageNo . ' does not exists.');
-        }
-
-        return $this->_getPageRotation($this->_pages[$pageNo - 1]);
-    }
-
-    /**
-     * Get the rotation value of a page
-     *
-     * @param array $obj A /Page dictionary
-     * @return array|bool
-     */
-    protected function _getPageRotation($obj)
-    {
-    	$obj = $this->resolveObject($obj);
-    	if (isset($obj[1][1]['/Rotate'])) {
-    		$res = $this->resolveObject($obj[1][1]['/Rotate']);
-    		if ($res[0] == pdf_parser::TYPE_OBJECT)
-                return $res[1];
-            return $res;
-    	}
-
-        if (!isset($obj[1][1]['/Parent'])) {
-            return false;
-        }
-
-        $res = $this->_getPageRotation($obj[1][1]['/Parent']);
-        if ($res[0] == pdf_parser::TYPE_OBJECT)
-            return $res[1];
-
-        return $res;
-    }
-
-    /**
-     * Read all pages
-     *
-     * @param array $pages /Pages dictionary
-     * @param array $result The result array
-     * @throws Exception
-     */
-    protected function _readPages(&$pages, &$result)
-    {
-        // Get the kids dictionary
-    	$_kids = $this->resolveObject($pages[1][1]['/Kids']);
-
-        if (!is_array($_kids)) {
-            throw new Exception('Cannot find /Kids in current /Page-Dictionary');
-        }
-
-        if ($_kids[0] === self::TYPE_OBJECT) {
-            $_kids =  $_kids[1];
-        }
-
-        $kids = $_kids[1];
-
-        foreach ($kids as $v) {
-    		$pg = $this->resolveObject($v);
-            if ($pg[1][1]['/Type'][1] === '/Pages') {
-                // If one of the kids is an embedded
-    			// /Pages array, resolve it as well.
-                $this->_readPages($pg, $result);
-    		} else {
-    			$result[] = $pg;
-    		}
-    	}
-    }
-}
\ No newline at end of file
diff --git a/htdocs/includes/fpdfi/pdf_context.php b/htdocs/includes/fpdfi/pdf_context.php
deleted file mode 100644
index 88f3aedefff..00000000000
--- a/htdocs/includes/fpdfi/pdf_context.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-//
-//  FPDI - Version 1.5.2
-//
-//    Copyright 2004-2014 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-/**
- * Class pdf_context
- */
-class pdf_context
-{
-    /**
-     * Mode
-     *
-     * @var integer 0 = file | 1 = string
-     */
-    protected $_mode = 0;
-
-    /**
-     * @var resource|string
-     */
-    public $file;
-
-    /**
-     * @var string
-     */
-    public $buffer;
-
-    /**
-     * @var integer
-     */
-    public $offset;
-
-    /**
-     * @var integer
-     */
-    public $length;
-
-    /**
-     * @var array
-     */
-    public $stack;
-
-    /**
-     * The constructor
-     *
-     * @param resource $f
-     */
-    public function __construct(&$f)
-    {
-        $this->file =& $f;
-        if (is_string($this->file))
-            $this->_mode = 1;
-
-        $this->reset();
-    }
-
-    /**
-     * Get the position in the file stream
-     *
-     * @return int
-     */
-    public function getPos()
-    {
-        if ($this->_mode == 0) {
-            return ftell($this->file);
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * Reset the position in the file stream.
-     *
-     * Optionally move the file pointer to a new location and reset the buffered data.
-     *
-     * @param null $pos
-     * @param int $l
-     */
-    public function reset($pos = null, $l = 100)
-    {
-        if ($this->_mode == 0) {
-            if (!is_null($pos)) {
-                fseek ($this->file, $pos);
-            }
-
-            $this->buffer = $l > 0 ? fread($this->file, $l) : '';
-            $this->length = strlen($this->buffer);
-            if ($this->length < $l)
-                $this->increaseLength($l - $this->length);
-        } else {
-            $this->buffer = $this->file;
-            $this->length = strlen($this->buffer);
-        }
-        $this->offset = 0;
-        $this->stack = array();
-    }
-
-    /**
-     * Make sure that there is at least one character beyond the current offset in the buffer.
-     *
-     * To prevent the tokenizer from attempting to access data that does not exist.
-     *
-     * @return bool
-     */
-    public function ensureContent()
-    {
-        if ($this->offset >= $this->length - 1) {
-            return $this->increaseLength();
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Forcefully read more data into the buffer
-     *
-     * @param int $l
-     * @return bool
-     */
-    public function increaseLength($l = 100)
-    {
-        if ($this->_mode == 0 && feof($this->file)) {
-            return false;
-        } else if ($this->_mode == 0) {
-            $totalLength = $this->length + $l;
-            do {
-                $toRead = $totalLength - $this->length;
-                if ($toRead < 1)
-                    break;
-
-                $this->buffer .= fread($this->file, $toRead);
-            } while ((($this->length = strlen($this->buffer)) != $totalLength) && !feof($this->file));
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/htdocs/includes/fpdfi/pdf_parser.php b/htdocs/includes/fpdfi/pdf_parser.php
deleted file mode 100644
index 53c0372c8bd..00000000000
--- a/htdocs/includes/fpdfi/pdf_parser.php
+++ /dev/null
@@ -1,920 +0,0 @@
-<?php
-//
-//  FPDI - Version 1.5.2
-//
-//    Copyright 2004-2014 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-/**
- * Class pdf_parser
- */
-class pdf_parser
-{
-    /**
-     * Type constant
-     *
-     * @var integer
-     */
-    const TYPE_NULL = 0;
-
-    /**
-     * Type constant
-     *
-     * @var integer
-     */
-    const TYPE_NUMERIC = 1;
-
-    /**
-     * Type constant
-     *
-     * @var integer
-     */
-    const TYPE_TOKEN = 2;
-
-    /**
-     * Type constant
-     *
-     * @var integer
-     */
-    const TYPE_HEX = 3;
-
-    /**
-     * Type constant
-     *
-     * @var integer
-     */
-    const TYPE_STRING = 4;
-
-    /**
-     * Type constant
-     *
-     * @var integer
-     */
-    const TYPE_DICTIONARY = 5;
-
-    /**
-     * Type constant
-     *
-     * @var integer
-     */
-    const TYPE_ARRAY = 6;
-
-    /**
-     * Type constant
-     *
-     * @var integer
-     */
-    const TYPE_OBJDEC = 7;
-
-    /**
-     * Type constant
-     *
-     * @var integer
-     */
-    const TYPE_OBJREF = 8;
-
-    /**
-     * Type constant
-     *
-     * @var integer
-     */
-    const TYPE_OBJECT = 9;
-
-    /**
-     * Type constant
-     *
-     * @var integer
-     */
-    const TYPE_STREAM = 10;
-
-    /**
-     * Type constant
-     *
-     * @var integer
-     */
-    const TYPE_BOOLEAN = 11;
-
-    /**
-     * Type constant
-     *
-     * @var integer
-     */
-    const TYPE_REAL = 12;
-
-    /**
-     * Define the amount of byte in which the initial keyword of a PDF document should be searched.
-     *
-     * @var int
-     */
-    static public $searchForStartxrefLength = 5500;
-
-    /**
-     * Filename
-     *
-     * @var string
-     */
-    public $filename;
-
-    /**
-     * File resource
-     *
-     * @var resource
-     */
-    protected $_f;
-
-    /**
-     * PDF Context
-     *
-     * @var pdf_context
-     */
-    protected $_c;
-
-    /**
-     * xref-Data
-     *
-     * @var array
-     */
-    protected $_xref;
-
-    /**
-     * Data of the Root object
-     *
-     * @var array
-     */
-    protected $_root;
-
-    /**
-     * PDF version of the loaded document
-     *
-     * @var string
-     */
-    protected $_pdfVersion;
-
-    /**
-     * For reading encrypted documents and xref/object streams are in use
-     *
-     * @var boolean
-     */
-    protected $_readPlain = true;
-
-    /**
-     * The current read object
-     *
-     * @var array
-     */
-    protected $_currentObj;
-
-    /**
-     * Constructor
-     *
-     * @param string $filename Source filename
-     * @throws InvalidArgumentException
-     */
-    public function __construct($filename)
-    {
-        $this->filename = $filename;
-
-        $this->_f = @fopen($this->filename, 'rb');
-
-        if (!$this->_f) {
-            throw new InvalidArgumentException(sprintf('Cannot open %s !', $filename));
-        }
-
-        $this->getPdfVersion();
-
-        require_once('pdf_context.php');
-        $this->_c = new pdf_context($this->_f);
-
-        // Read xref-Data
-        $this->_xref = array();
-        try {
-	        $this->_readXref($this->_xref, $this->_findXref());
-        }
-        catch(Exception $e)
-        {
-        	print $e->getMessage();
-        	exit;
-        }
-
-        // Check for Encryption
-        $this->getEncryption();
-
-        // Read root
-        $this->_readRoot();
-    }
-
-    /**
-     * Destructor
-     */
-    public function __destruct()
-    {
-        $this->closeFile();
-    }
-
-    /**
-     * Close the opened file
-     */
-    public function closeFile()
-    {
-        if (isset($this->_f) && is_resource($this->_f)) {
-            fclose($this->_f);
-            unset($this->_f);
-        }
-    }
-
-    /**
-     * Check Trailer for Encryption
-     *
-     * @throws Exception
-     */
-    public function getEncryption()
-    {
-        if (isset($this->_xref['trailer'][1]['/Encrypt'])) {
-            throw new Exception('File is encrypted!');
-        }
-    }
-
-    /**
-     * Get PDF-Version
-     *
-     * @return string
-     */
-    public function getPdfVersion()
-    {
-        if ($this->_pdfVersion === null) {
-            fseek($this->_f, 0);
-            preg_match('/\d\.\d/', fread($this->_f, 16), $m);
-            if (isset($m[0]))
-                $this->_pdfVersion = $m[0];
-        }
-
-        return $this->_pdfVersion;
-    }
-
-    /**
-     * Read the /Root dictionary
-     */
-    protected function _readRoot()
-    {
-        if ($this->_xref['trailer'][1]['/Root'][0] != self::TYPE_OBJREF) {
-            throw new Exception('Wrong Type of Root-Element! Must be an indirect reference');
-        }
-
-        $this->_root = $this->resolveObject($this->_xref['trailer'][1]['/Root']);
-    }
-
-    /**
-     * Find the xref table
-     *
-     * @return integer
-     * @throws Exception
-     */
-    protected function _findXref()
-    {
-        $toRead = self::$searchForStartxrefLength;
-
-        $stat = fseek($this->_f, -$toRead, SEEK_END);
-        if ($stat === -1) {
-            fseek($this->_f, 0);
-        }
-
-        $data = fread($this->_f, $toRead);
-
-        $keywordPos = strpos(strrev($data), strrev('startxref'));
-        if (false === $keywordPos) {
-            $keywordPos = strpos(strrev($data), strrev('startref'));
-        }
-
-        if (false === $keywordPos) {
-            throw new Exception('Unable to find "startxref" keyword.');
-        }
-
-        $pos = strlen($data) - $keywordPos;
-        $data = substr($data, $pos);
-
-        if (!preg_match('/\s*(\d+).*$/s', $data, $matches)) {
-            throw new Exception('Unable to find pointer to xref table.');
-        }
-
-        return (int) $matches[1];
-    }
-
-    /**
-     * Read the xref table
-     *
-     * @param array $result Array of xref table entries
-     * @param integer $offset of xref table
-     * @return boolean
-     * @throws Exception
-     */
-    protected function _readXref(&$result, $offset)
-    {
-        $tempPos = $offset - min(20, $offset);
-        fseek($this->_f, $tempPos); // set some bytes backwards to fetch corrupted docs
-
-        $data = fread($this->_f, 100);
-
-        $xrefPos = strrpos($data, 'xref');
-
-        if ($xrefPos === false) {
-            $this->_c->reset($offset);
-            $xrefStreamObjDec = $this->_readValue($this->_c);
-
-            if (is_array($xrefStreamObjDec) && isset($xrefStreamObjDec[0]) && $xrefStreamObjDec[0] == self::TYPE_OBJDEC) {
-                throw new Exception(
-                    sprintf(
-                        'This document (%s) probably uses a compression technique which is not supported by the ' .
-                        'free parser shipped with FPDI. (See https://www.setasign.com/fpdi-pdf-parser for more details)',
-                        $this->filename
-                    )
-                );
-            } else {
-                throw new Exception('Unable to find xref table.');
-            }
-        }
-
-        if (!isset($result['xrefLocation'])) {
-            $result['xrefLocation'] = $tempPos + $xrefPos;
-            $result['maxObject'] = 0;
-        }
-
-        $cycles = -1;
-        $bytesPerCycle = 100;
-
-        fseek($this->_f, $tempPos = $tempPos + $xrefPos + 4); // set the handle directly after the "xref"-keyword
-        $data = fread($this->_f, $bytesPerCycle);
-
-        while (($trailerPos = strpos($data, 'trailer', max($bytesPerCycle * $cycles++, 0))) === false && !feof($this->_f)) {
-            $data .= fread($this->_f, $bytesPerCycle);
-        }
-
-        if ($trailerPos === false) {
-            throw new Exception('Trailer keyword not found after xref table');
-        }
-
-        $data = ltrim(substr($data, 0, $trailerPos));
-
-        // get Line-Ending
-        preg_match_all("/(\r\n|\n|\r)/", substr($data, 0, 100), $m); // check the first 100 bytes for line breaks
-
-        $differentLineEndings = count(array_unique($m[0]));
-        if ($differentLineEndings > 1) {
-            $lines = preg_split("/(\r\n|\n|\r)/", $data, -1, PREG_SPLIT_NO_EMPTY);
-        } else {
-            $lines = explode($m[0][0], $data);
-        }
-
-        $data = $differentLineEndings = $m = null;
-        unset($data, $differentLineEndings, $m);
-
-        $linesCount = count($lines);
-
-        $start = 1;
-
-        for ($i = 0; $i < $linesCount; $i++) {
-            $line = trim($lines[$i]);
-            if ($line) {
-                $pieces = explode(' ', $line);
-                $c = count($pieces);
-                switch($c) {
-                    case 2:
-                        $start = (int)$pieces[0];
-                        $end   = $start + (int)$pieces[1];
-                        if ($end > $result['maxObject'])
-                            $result['maxObject'] = $end;
-                        break;
-                    case 3:
-                        if (!isset($result['xref'][$start]))
-                            $result['xref'][$start] = array();
-
-                        if (!array_key_exists($gen = (int) $pieces[1], $result['xref'][$start])) {
-                            $result['xref'][$start][$gen] = $pieces[2] == 'n' ? (int) $pieces[0] : null;
-                        }
-                        $start++;
-                        break;
-                    default:
-                        throw new Exception('Unexpected data in xref table');
-                }
-            }
-        }
-
-        $lines = $pieces = $line = $start = $end = $gen = null;
-        unset($lines, $pieces, $line, $start, $end, $gen);
-
-        $this->_c->reset($tempPos + $trailerPos + 7);
-        $trailer = $this->_readValue($this->_c);
-
-        if (!isset($result['trailer'])) {
-            $result['trailer'] = $trailer;
-        }
-
-        if (isset($trailer[1]['/Prev'])) {
-            $this->_readXref($result, $trailer[1]['/Prev'][1]);
-        }
-
-        $trailer = null;
-        unset($trailer);
-
-        return true;
-    }
-
-    /**
-     * Reads a PDF value
-     *
-     * @param pdf_context $c
-     * @param string $token A token
-     * @return mixed
-     */
-    protected function _readValue(&$c, $token = null)
-    {
-        if (is_null($token)) {
-            $token = $this->_readToken($c);
-        }
-
-        if ($token === false) {
-            return false;
-        }
-
-        switch ($token) {
-            case '<':
-                // This is a hex string.
-                // Read the value, then the terminator
-
-                $pos = $c->offset;
-
-                while(1) {
-
-                    $match = strpos ($c->buffer, '>', $pos);
-
-                    // If you can't find it, try
-                    // reading more data from the stream
-
-                    if ($match === false) {
-                        if (!$c->increaseLength()) {
-                            return false;
-                        } else {
-                            continue;
-                        }
-                    }
-
-                    $result = substr ($c->buffer, $c->offset, $match - $c->offset);
-                    $c->offset = $match + 1;
-
-                    return array (self::TYPE_HEX, $result);
-                }
-                break;
-
-            case '<<':
-                // This is a dictionary.
-
-                $result = array();
-
-                // Recurse into this function until we reach
-                // the end of the dictionary.
-                while (($key = $this->_readToken($c)) !== '>>') {
-                    if ($key === false) {
-                        return false;
-                    }
-
-                    if (($value =   $this->_readValue($c)) === false) {
-                        return false;
-                    }
-
-                    // Catch missing value
-                    if ($value[0] == self::TYPE_TOKEN && $value[1] == '>>') {
-                        $result[$key] = array(self::TYPE_NULL);
-                        break;
-                    }
-
-                    $result[$key] = $value;
-                }
-
-                return array (self::TYPE_DICTIONARY, $result);
-
-            case '[':
-                // This is an array.
-
-                $result = array();
-
-                // Recurse into this function until we reach
-                // the end of the array.
-                while (($token = $this->_readToken($c)) !== ']') {
-                    if ($token === false) {
-                        return false;
-                    }
-
-                    if (($value = $this->_readValue($c, $token)) === false) {
-                        return false;
-                    }
-
-                    $result[] = $value;
-                }
-
-                return array (self::TYPE_ARRAY, $result);
-
-            case '(':
-                // This is a string
-                $pos = $c->offset;
-
-                $openBrackets = 1;
-                do {
-                    for (; $openBrackets != 0 && $pos < $c->length; $pos++) {
-                        switch (ord($c->buffer[$pos])) {
-                            case 0x28: // '('
-                                $openBrackets++;
-                                break;
-                            case 0x29: // ')'
-                                $openBrackets--;
-                                break;
-                            case 0x5C: // backslash
-                                $pos++;
-                        }
-                    }
-                } while($openBrackets != 0 && $c->increaseLength());
-
-                $result = substr($c->buffer, $c->offset, $pos - $c->offset - 1);
-                $c->offset = $pos;
-
-                return array (self::TYPE_STRING, $result);
-
-            case 'stream':
-                $tempPos = $c->getPos() - strlen($c->buffer);
-                $tempOffset = $c->offset;
-
-                $c->reset($startPos = $tempPos + $tempOffset);
-
-                $e = 0; // ensure line breaks in front of the stream
-                if ($c->buffer[0] == chr(10) || $c->buffer[0] == chr(13))
-                    $e++;
-                if ($c->buffer[1] == chr(10) && $c->buffer[0] != chr(10))
-                    $e++;
-
-                if ($this->_currentObj[1][1]['/Length'][0] == self::TYPE_OBJREF) {
-                    $tmpLength = $this->resolveObject($this->_currentObj[1][1]['/Length']);
-                    $length = $tmpLength[1][1];
-                } else {
-                    $length = $this->_currentObj[1][1]['/Length'][1];
-                }
-
-                if ($length > 0) {
-                    $c->reset($startPos + $e, $length);
-                    $v = $c->buffer;
-                } else {
-                    $v = '';
-                }
-
-                $c->reset($startPos + $e + $length);
-                $endstream = $this->_readToken($c);
-
-                if ($endstream != 'endstream') {
-                    $c->reset($startPos + $e + $length + 9); // 9 = strlen("endstream")
-                    // We don't throw an error here because the next
-                    // round trip will start at a new offset
-                }
-
-                return array(self::TYPE_STREAM, $v);
-
-            default	:
-                if (is_numeric($token)) {
-                    // A numeric token. Make sure that
-                    // it is not part of something else.
-                    if (($tok2 = $this->_readToken($c)) !== false) {
-                        if (is_numeric($tok2)) {
-
-                            // Two numeric tokens in a row.
-                            // In this case, we're probably in
-                            // front of either an object reference
-                            // or an object specification.
-                            // Determine the case and return the data
-                            if (($tok3 = $this->_readToken($c)) !== false) {
-                                switch ($tok3) {
-                                    case 'obj':
-                                        return array(self::TYPE_OBJDEC, (int)$token, (int)$tok2);
-                                    case 'R':
-                                        return array(self::TYPE_OBJREF, (int)$token, (int)$tok2);
-                                }
-                                // If we get to this point, that numeric value up
-                                // there was just a numeric value. Push the extra
-                                // tokens back into the stack and return the value.
-                                array_push($c->stack, $tok3);
-                            }
-                        }
-
-                        array_push($c->stack, $tok2);
-                    }
-
-                    if ($token === (string)((int)$token))
-                        return array(self::TYPE_NUMERIC, (int)$token);
-                    else
-                        return array(self::TYPE_REAL, (float)$token);
-                } else if ($token == 'true' || $token == 'false') {
-                    return array(self::TYPE_BOOLEAN, $token == 'true');
-                } else if ($token == 'null') {
-                   return array(self::TYPE_NULL);
-                } else {
-                    // Just a token. Return it.
-                    return array(self::TYPE_TOKEN, $token);
-                }
-         }
-    }
-
-    /**
-     * Resolve an object
-     *
-     * @param array $objSpec The object-data
-     * @return array|boolean
-     * @throws Exception
-     */
-    public function resolveObject($objSpec)
-    {
-        $c = $this->_c;
-
-        // Exit if we get invalid data
-        if (!is_array($objSpec)) {
-            return false;
-        }
-
-        if ($objSpec[0] == self::TYPE_OBJREF) {
-
-            // This is a reference, resolve it
-            if (isset($this->_xref['xref'][$objSpec[1]][$objSpec[2]])) {
-
-                // Save current file position
-                // This is needed if you want to resolve
-                // references while you're reading another object
-                // (e.g.: if you need to determine the length
-                // of a stream)
-
-                $oldPos = $c->getPos();
-
-                // Reposition the file pointer and
-                // load the object header.
-
-                $c->reset($this->_xref['xref'][$objSpec[1]][$objSpec[2]]);
-
-                $header = $this->_readValue($c);
-
-                if ($header[0] != self::TYPE_OBJDEC || $header[1] != $objSpec[1] || $header[2] != $objSpec[2]) {
-                    $toSearchFor = $objSpec[1] . ' ' . $objSpec[2] . ' obj';
-                    if (preg_match('/' . $toSearchFor . '/', $c->buffer)) {
-                        $c->offset = strpos($c->buffer, $toSearchFor) + strlen($toSearchFor);
-                        // reset stack
-                        $c->stack = array();
-                    } else {
-                        throw new Exception(
-                            sprintf("Unable to find object (%s, %s) at expected location.", $objSpec[1], $objSpec[2])
-                        );
-                    }
-                }
-
-                // If we're being asked to store all the information
-                // about the object, we add the object ID and generation
-                // number for later use
-                $result = array (
-                    self::TYPE_OBJECT,
-                    'obj' => $objSpec[1],
-                    'gen' => $objSpec[2]
-                );
-
-                $this->_currentObj =& $result;
-
-                // Now simply read the object data until
-                // we encounter an end-of-object marker
-                while (true) {
-                    $value = $this->_readValue($c);
-                    if ($value === false || count($result) > 4) {
-                        // in this case the parser couldn't find an "endobj" so we break here
-                        break;
-                    }
-
-                    if ($value[0] == self::TYPE_TOKEN && $value[1] === 'endobj') {
-                        break;
-                    }
-
-                    $result[] = $value;
-                }
-
-                $c->reset($oldPos);
-
-                if (isset($result[2][0]) && $result[2][0] == self::TYPE_STREAM) {
-                    $result[0] = self::TYPE_STREAM;
-                }
-
-            } else {
-                throw new Exception(
-                    sprintf("Unable to find object (%s, %s) at expected location.", $objSpec[1], $objSpec[2])
-                );
-            }
-
-            return $result;
-        } else {
-            return $objSpec;
-        }
-    }
-
-    /**
-     * Reads a token from the context
-     *
-     * @param pdf_context $c
-     * @return mixed
-     */
-    protected function _readToken($c)
-    {
-        // If there is a token available
-        // on the stack, pop it out and
-        // return it.
-
-        if (count($c->stack)) {
-            return array_pop($c->stack);
-        }
-
-        // Strip away any whitespace
-
-        do {
-            if (!$c->ensureContent()) {
-                return false;
-            }
-            $c->offset += strspn($c->buffer, "\x20\x0A\x0C\x0D\x09\x00", $c->offset);
-        } while ($c->offset >= $c->length - 1);
-
-        // Get the first character in the stream
-
-        $char = $c->buffer[$c->offset++];
-
-        switch ($char) {
-
-            case '[':
-            case ']':
-            case '(':
-            case ')':
-
-                // This is either an array or literal string
-                // delimiter, Return it
-
-                return $char;
-
-            case '<':
-            case '>':
-
-                // This could either be a hex string or
-                // dictionary delimiter. Determine the
-                // appropriate case and return the token
-
-                if ($c->buffer[$c->offset] == $char) {
-                    if (!$c->ensureContent()) {
-                        return false;
-                    }
-                    $c->offset++;
-                    return $char . $char;
-                } else {
-                    return $char;
-                }
-
-            case '%':
-
-                // This is a comment - jump over it!
-
-                $pos = $c->offset;
-                while(1) {
-                    $match = preg_match("/(\r\n|\r|\n)/", $c->buffer, $m, PREG_OFFSET_CAPTURE, $pos);
-                    if ($match === 0) {
-                        if (!$c->increaseLength()) {
-                            return false;
-                        } else {
-                            continue;
-                        }
-                    }
-
-                    $c->offset = $m[0][1] + strlen($m[0][0]);
-
-                    return $this->_readToken($c);
-                }
-
-            default:
-
-                // This is "another" type of token (probably
-                // a dictionary entry or a numeric value)
-                // Find the end and return it.
-
-                if (!$c->ensureContent()) {
-                    return false;
-                }
-
-                while(1) {
-
-                    // Determine the length of the token
-
-                    $pos = strcspn($c->buffer, "\x20%[]<>()/\x0A\x0C\x0D\x09\x00", $c->offset);
-
-                    if ($c->offset + $pos <= $c->length - 1) {
-                        break;
-                    } else {
-                        // If the script reaches this point,
-                        // the token may span beyond the end
-                        // of the current buffer. Therefore,
-                        // we increase the size of the buffer
-                        // and try again--just to be safe.
-
-                        $c->increaseLength();
-                    }
-                }
-
-                $result = substr($c->buffer, $c->offset - 1, $pos + 1);
-
-                $c->offset += $pos;
-
-                return $result;
-        }
-    }
-
-    /**
-     * Un-filter a stream object
-     *
-     * @param array $obj
-     * @return string
-     * @throws Exception
-     */
-    protected function _unFilterStream($obj)
-    {
-        $filters = array();
-
-        if (isset($obj[1][1]['/Filter'])) {
-            $filter = $obj[1][1]['/Filter'];
-
-            if ($filter[0] == pdf_parser::TYPE_OBJREF) {
-                $tmpFilter = $this->resolveObject($filter);
-                $filter = $tmpFilter[1];
-            }
-
-            if ($filter[0] == pdf_parser::TYPE_TOKEN) {
-                $filters[] = $filter;
-            } else if ($filter[0] == pdf_parser::TYPE_ARRAY) {
-                $filters = $filter[1];
-            }
-        }
-
-        $stream = $obj[2][1];
-
-        foreach ($filters AS $filter) {
-            switch ($filter[1]) {
-                case '/FlateDecode':
-                case '/Fl':
-                    if (function_exists('gzuncompress')) {
-                        $oStream = $stream;
-                        $stream = (strlen($stream) > 0) ? @gzuncompress($stream) : '';
-                    } else {
-                        throw new Exception(
-                            sprintf('To handle %s filter, please compile php with zlib support.', $filter[1])
-                        );
-                    }
-
-                    if ($stream === false) {
-                        $tries = 0;
-                        while ($tries < 8 && ($stream === false || strlen($stream) < strlen($oStream))) {
-                            $oStream = substr($oStream, 1);
-                            $stream = @gzinflate($oStream);
-                            $tries++;
-                        }
-
-                        if ($stream === false) {
-                            throw new Exception('Error while decompressing stream.');
-                        }
-                    }
-                    break;
-                case '/LZWDecode':
-                    require_once('filters/FilterLZW.php');
-                    $decoder = new FilterLZW();
-                    $stream = $decoder->decode($stream);
-                    break;
-                case '/ASCII85Decode':
-                    require_once('filters/FilterASCII85.php');
-                    $decoder = new FilterASCII85();
-                    $stream = $decoder->decode($stream);
-                    break;
-                case '/ASCIIHexDecode':
-                    require_once('filters/FilterASCIIHexDecode.php');
-                    $decoder = new FilterASCIIHexDecode();
-                    $stream = $decoder->decode($stream);
-                    break;
-                case null:
-                    break;
-                default:
-                    throw new Exception(sprintf('Unsupported Filter: %s', $filter[1]));
-            }
-        }
-
-        return $stream;
-    }
-}
\ No newline at end of file

From 64721d73b6ef59c04e97d090437c0344b5725d9b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2017 19:36:57 +0100
Subject: [PATCH 0296/1163] Remove not so usefull plugin jquery layout (prepare
 js upgrades)

---
 COPYRIGHT                                     |    1 -
 htdocs/core/ajax/ajaxdirtree.php              |    2 +-
 htdocs/ecm/index.php                          |   58 +-
 htdocs/ecm/index_auto.php                     |   52 +-
 .../jquery/plugins/layout/jquery.layout.js    | 5132 -----------------
 .../plugins/layout/jquery.layout.min.js       |  127 -
 htdocs/main.inc.php                           |    5 -
 htdocs/theme/eldy/style.css.php               |  235 +-
 htdocs/theme/md/style.css.php                 |  231 +-
 9 files changed, 67 insertions(+), 5776 deletions(-)
 delete mode 100644 htdocs/includes/jquery/plugins/layout/jquery.layout.js
 delete mode 100644 htdocs/includes/jquery/plugins/layout/jquery.layout.min.js

diff --git a/COPYRIGHT b/COPYRIGHT
index 97964dc0d50..ca4c6cae52e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -45,7 +45,6 @@ jQuery jNotify         1.1.00        Apache Software License 2.0 Yes
 jQuery jPicker         1.1.6         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
 jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
 jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for color picker with not defined list of colors
-jQuery Layout          1.4.3         GPL and MIT License         Yes             JS library plugin Layout
 jQuery Mobile          1.3.0         GPL and MIT License         Yes             JS library for smartphone (not used)
 jQuery TableDnD        0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 8b9102a799f..14b05c75905 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -176,7 +176,7 @@ if (file_exists($fullpathselecteddir))
     				print '</td>';
 
     				// Edit link
-    				print '<td align="right" width="18"><a href="'.DOL_URL_ROOT.'/ecm/docmine.php?section='.$val['id'].'&relativedir='.urlencode($val['fullrelativename']).'">'.img_view($langs->trans("Edit").' - '.$langs->trans("View")).'</a></td>';
+    				print '<td align="right" width="18"><a href="'.DOL_URL_ROOT.'/ecm/docmine.php?section='.$val['id'].'&relativedir='.urlencode($val['fullrelativename']).'">'.img_view($langs->trans("Edit").' - '.$langs->trans("View"), 0, 'class="valignmiddle"').'</a></td>';
 
     				// Add link
     				//print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docdir.php?action=create&amp;catParent='.$val['id'].'">'.img_edit_add().'</a></td>';
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 1e852f55791..971d20ae2b2 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -357,50 +357,7 @@ $maxheightwin=(isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheig
 
 $morejs=array();
 if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $morejs=array("/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js");
-$moreheadcss="
-<!-- dol_screenheight=".$_SESSION["dol_screenheight"]." -->
-<style type=\"text/css\">
-    #containerlayout {
-        height:     ".$maxheightwin."px;
-        margin:     0 auto;
-        width:      100%;
-        min-width:  700px;
-        _width:     700px; /* min-width for IE6 */
-    }
-</style>";
-$moreheadjs=empty($conf->use_javascript_ajax)?"":"
-<script type=\"text/javascript\">
-    jQuery(document).ready(function () {
-        jQuery('#containerlayout').layout({
-        	name: \"ecmlayout\"
-        ,   paneClass:    \"ecm-layout-pane\"
-        ,   resizerClass: \"ecm-layout-resizer\"
-        ,   togglerClass: \"ecm-layout-toggler\"
-        ,   center__paneSelector:   \"#ecm-layout-center\"
-        ,   north__paneSelector:    \"#ecm-layout-north\"
-        ,   west__paneSelector:     \"#ecm-layout-west\"
-        ,   resizable: true
-        ,   north__size:        37     /* 2 are removed by js */
-        ,   north__resizable:   false
-        ,   north__closable:    false
-        ,   west__size:         340
-        ,   west__minSize:      280
-        ,   west__slidable:     true
-        ,   west__resizable:    true
-        ,   west__togglerLength_closed: '100%'
-        ,   useStateCookie:     true
-            });
 
-        jQuery('#ecm-layout-center').layout({
-            center__paneSelector:   \".ecm-in-layout-center\"
-        ,   south__paneSelector:    \".ecm-in-layout-south\"
-        ,   resizable: false
-        ,   south__minSize:      32
-        ,   south__resizable:   false
-        ,   south__closable:    false
-            });
-    });
-</script>";
 
 llxHeader($moreheadcss.$moreheadjs,$langs->trans("ECMArea"),'','','','',$morejs,'',0,0);
 
@@ -422,16 +379,6 @@ if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
 	if (! empty($conf->projet->enabled))      { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"),     'desc'=>$langs->trans("ECMDocsByProjects")); }
 }
 
-//print load_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"));
-
-/*
-print '<div class="hideonsmartphone">';
-print $langs->trans("ECMAreaDesc")."<br>";
-print $langs->trans("ECMAreaDesc2")."<br>";
-print "<br>\n";
-print '</div>';
-*/
-
 // Confirm remove file (for non javascript users)
 if ($action == 'delete' && empty($conf->use_javascript_ajax))
 {
@@ -439,8 +386,9 @@ if ($action == 'delete' && empty($conf->use_javascript_ajax))
 
 }
 
-if (! empty($conf->use_javascript_ajax)) $classviewhide='hidden';
-else $classviewhide='visible';
+//if (! empty($conf->use_javascript_ajax)) $classviewhide='hidden';
+//else $classviewhide='visible';
+$classviewhide='inline-block';
 
 
 $head = ecm_prepare_dasboard_head('');
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index b90f306fa2f..9208ec46644 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -350,46 +350,7 @@ $maxheightwin=(isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheig
 
 $morejs=array();
 if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $morejs=array("/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js");
-$moreheadcss="
-<!-- dol_screenheight=".$_SESSION["dol_screenheight"]." -->
-<style type=\"text/css\">
-    #containerlayout {
-        height:     ".$maxheightwin."px;
-        margin:     0 auto;
-        width:      100%;
-        min-width:  700px;
-        _width:     700px; /* min-width for IE6 */
-    }
-</style>";
-$moreheadjs=empty($conf->use_javascript_ajax)?"":"
-<script type=\"text/javascript\">
-    jQuery(document).ready(function () {
-        jQuery('#containerlayout').layout({
-        	name: \"ecmlayout\"
-        ,   paneClass:    \"ecm-layout-pane\"
-        ,   resizerClass: \"ecm-layout-resizer\"
-        ,   togglerClass: \"ecm-layout-toggler\"
-        ,   center__paneSelector:   \"#ecm-layout-center\"
-        ,   north__paneSelector:    \"#ecm-layout-north\"
-        ,   west__paneSelector:     \"#ecm-layout-west\"
-        ,   resizable: true
-        ,   north__size:        37      /* 2 are removed by js */
-        ,   north__resizable:   false
-        ,   north__closable:    false
-        ,   west__size:         340
-        ,   west__minSize:      280
-        ,   west__slidable:     true
-        ,   west__resizable:    true
-        ,   west__togglerLength_closed: '100%'
-        ,   useStateCookie:     true
-            });
 
-        jQuery('#ecm-layout-center').layout({
-            center__paneSelector:   \".ecm-in-layout-center\"
-        ,   resizable: false
-            });
-    });
-</script>";
 
 llxHeader($moreheadcss.$moreheadjs,$langs->trans("ECMArea"),'','','','',$morejs,'',0,0);
 
@@ -422,14 +383,6 @@ $helptext1.=$langs->trans("ECMAreaDesc2");
 $helptext2.=$langs->trans("ECMAreaDesc");
 $helptext2.=$langs->trans("ECMAreaDesc2");
 
-/*
-print '<div class="hideonsmartphone">';
-print $langs->trans("ECMAreaDesc")."<br>";
-print $langs->trans("ECMAreaDesc2")."<br>";
-print "<br>\n";
-print '</div>';
-*/
-
 // Confirm remove file (for non javascript users)
 if ($action == 'delete' && empty($conf->use_javascript_ajax))
 {
@@ -437,8 +390,9 @@ if ($action == 'delete' && empty($conf->use_javascript_ajax))
 
 }
 
-if (! empty($conf->use_javascript_ajax)) $classviewhide='hidden';
-else $classviewhide='visible';
+//if (! empty($conf->use_javascript_ajax)) $classviewhide='hidden';
+//else $classviewhide='visible';
+$classviewhide='inline-block';
 
 
 $head = ecm_prepare_dasboard_head('');
diff --git a/htdocs/includes/jquery/plugins/layout/jquery.layout.js b/htdocs/includes/jquery/plugins/layout/jquery.layout.js
deleted file mode 100644
index 759be09cf69..00000000000
--- a/htdocs/includes/jquery/plugins/layout/jquery.layout.js
+++ /dev/null
@@ -1,5132 +0,0 @@
-/**
- * @preserve
- * jquery.layout 1.4.3
- * $Date: 2014-08-30 08:00:00 (Sat, 30 Aug 2014) $
- * $Rev: 1.0403 $
- *
- * Copyright (c) 2014 Kevin Dalman (http://jquery-dev.com)
- * Based on work by Fabrizio Balliano (http://www.fabrizioballiano.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * SEE: http://layout.jquery-dev.com/LICENSE.txt
- *
- * Changelog: http://layout.jquery-dev.com/changelog.cfm
- *
- * Docs: http://layout.jquery-dev.com/documentation.html
- * Tips: http://layout.jquery-dev.com/tips.html
- * Help: http://groups.google.com/group/jquery-ui-layout
- */
-
-/* JavaDoc Info: http://code.google.com/closure/compiler/docs/js-for-compiler.html
- * {!Object}	non-nullable type (never NULL)
- * {?string}	nullable type (sometimes NULL) - default for {Object}
- * {number=}	optional parameter
- * {*}			ALL types
- */
-/*	TODO for jQ 2.0 
- *	change .andSelf() to .addBack()
- *	check $.fn.disableSelection - this is in jQuery UI 1.9.x
- */
-
-// NOTE: For best readability, view with a fixed-width font and tabs equal to 4-chars
-
-;(function ($) {
-
-// alias Math methods - used a lot!
-var	min		= Math.min
-,	max		= Math.max
-,	round	= Math.floor
-
-,	isStr	=  function (v) { return $.type(v) === "string"; }
-
-	/**
-	 * @param {!Object}			Instance
-	 * @param {Array.<string>}	a_fn
-	 */
-,	runPluginCallbacks = function (Instance, a_fn) {
-		if ($.isArray(a_fn))
-			for (var i=0, c=a_fn.length; i<c; i++) {
-				var fn = a_fn[i];
-				try {
-					if (isStr(fn)) // 'name' of a function
-						fn = eval(fn);
-					if ($.isFunction(fn))
-						g(fn)( Instance );
-				} catch (ex) {}
-			}
-		function g (f) { return f; }; // compiler hack
-	}
-;
-
-/*
- *	GENERIC $.layout METHODS - used by all layouts
- */
-$.layout = {
-
-	version:	"1.4.3"
-,	revision:	1.0403 // eg: 1.4.1 final = 1.0401 - major(n+).minor(nn)+patch(nn+)
-
-	// $.layout.browser REPLACES $.browser
-,	browser:	{} // set below
-
-	// *PREDEFINED* EFFECTS & DEFAULTS 
-	// MUST list effect here - OR MUST set an fxSettings option (can be an empty hash: {})
-,	effects: {
-
-	//	Pane Open/Close Animations
-		slide: {
-			all:	{ duration:  "fast"	} // eg: duration: 1000, easing: "easeOutBounce"
-		,	north:	{ direction: "up"	}
-		,	south:	{ direction: "down"	}
-		,	east:	{ direction: "right"}
-		,	west:	{ direction: "left"	}
-		}
-	,	drop: {
-			all:	{ duration:  "slow"	}
-		,	north:	{ direction: "up"	}
-		,	south:	{ direction: "down"	}
-		,	east:	{ direction: "right"}
-		,	west:	{ direction: "left"	}
-		}
-	,	scale: {
-			all:	{ duration:	"fast"	}
-		}
-	//	these are not recommended, but can be used
-	,	blind:		{}
-	,	clip:		{}
-	,	explode:	{}
-	,	fade:		{}
-	,	fold:		{}
-	,	puff:		{}
-
-	//	Pane Resize Animations
-	,	size: {
-			all:	{ easing:	"swing"	}
-		}
-	}
-
-	// INTERNAL CONFIG DATA - DO NOT CHANGE THIS!
-,	config: {
-		optionRootKeys:	"effects,panes,north,south,west,east,center".split(",")
-	,	allPanes:		"north,south,west,east,center".split(",")
-	,	borderPanes:	"north,south,west,east".split(",")
-	,	oppositeEdge: {
-			north:	"south"
-		,	south:	"north"
-		,	east: 	"west"
-		,	west: 	"east"
-		}
-	//	offscreen data
-	,	offscreenCSS:	{ left: "-99999px", right: "auto" } // used by hide/close if useOffscreenClose=true
-	,	offscreenReset:	"offscreenReset" // key used for data
-	//	CSS used in multiple places
-	,	hidden:		{ visibility: "hidden" }
-	,	visible:	{ visibility: "visible" }
-	//	layout element settings
-	,	resizers: {
-			cssReq: {
-				position: 	"absolute"
-			,	padding: 	0
-			,	margin: 	0
-			,	fontSize:	"1px"
-			,	textAlign:	"left"	// to counter-act "center" alignment!
-			,	overflow: 	"hidden" // prevent toggler-button from overflowing
-			//	SEE $.layout.defaults.zIndexes.resizer_normal
-			}
-		,	cssDemo: { // DEMO CSS - applied if: options.PANE.applyDemoStyles=true
-				background: "#DDD"
-			,	border:		"none"
-			}
-		}
-	,	togglers: {
-			cssReq: {
-				position: 	"absolute"
-			,	display: 	"block"
-			,	padding: 	0
-			,	margin: 	0
-			,	overflow:	"hidden"
-			,	textAlign:	"center"
-			,	fontSize:	"1px"
-			,	cursor: 	"pointer"
-			,	zIndex: 	1
-			}
-		,	cssDemo: { // DEMO CSS - applied if: options.PANE.applyDemoStyles=true
-				background: "#AAA"
-			}
-		}
-	,	content: {
-			cssReq: {
-				position:	"relative" /* contain floated or positioned elements */
-			}
-		,	cssDemo: { // DEMO CSS - applied if: options.PANE.applyDemoStyles=true
-				overflow:	"auto"
-			,	padding:	"10px"
-			}
-		,	cssDemoPane: { // DEMO CSS - REMOVE scrolling from 'pane' when it has a content-div
-				overflow:	"hidden"
-			,	padding:	0
-			}
-		}
-	,	panes: { // defaults for ALL panes - overridden by 'per-pane settings' below
-			cssReq: {
-				position: 	"absolute"
-			,	margin:		0
-			//	$.layout.defaults.zIndexes.pane_normal
-			}
-		,	cssDemo: { // DEMO CSS - applied if: options.PANE.applyDemoStyles=true
-				padding:	"10px"
-			,	background:	"#FFF"
-			,	border:		"1px solid #BBB"
-			,	overflow:	"auto"
-			}
-		}
-	,	north: {
-			side:			"top"
-		,	sizeType:		"Height"
-		,	dir:			"horz"
-		,	cssReq: {
-				top: 		0
-			,	bottom: 	"auto"
-			,	left: 		0
-			,	right: 		0
-			,	width: 		"auto"
-			//	height: 	DYNAMIC
-			}
-		}
-	,	south: {
-			side:			"bottom"
-		,	sizeType:		"Height"
-		,	dir:			"horz"
-		,	cssReq: {
-				top: 		"auto"
-			,	bottom: 	0
-			,	left: 		0
-			,	right: 		0
-			,	width: 		"auto"
-			//	height: 	DYNAMIC
-			}
-		}
-	,	east: {
-			side:			"right"
-		,	sizeType:		"Width"
-		,	dir:			"vert"
-		,	cssReq: {
-				left: 		"auto"
-			,	right: 		0
-			,	top: 		"auto" // DYNAMIC
-			,	bottom: 	"auto" // DYNAMIC
-			,	height: 	"auto"
-			//	width: 		DYNAMIC
-			}
-		}
-	,	west: {
-			side:			"left"
-		,	sizeType:		"Width"
-		,	dir:			"vert"
-		,	cssReq: {
-				left: 		0
-			,	right: 		"auto"
-			,	top: 		"auto" // DYNAMIC
-			,	bottom: 	"auto" // DYNAMIC
-			,	height: 	"auto"
-			//	width: 		DYNAMIC
-			}
-		}
-	,	center: {
-			dir:			"center"
-		,	cssReq: {
-				left: 		"auto" // DYNAMIC
-			,	right: 		"auto" // DYNAMIC
-			,	top: 		"auto" // DYNAMIC
-			,	bottom: 	"auto" // DYNAMIC
-			,	height: 	"auto"
-			,	width: 		"auto"
-			}
-		}
-	}
-
-	// CALLBACK FUNCTION NAMESPACE - used to store reusable callback functions
-,	callbacks: {}
-
-,	getParentPaneElem: function (el) {
-		// must pass either a container or pane element
-		var $el = $(el)
-		,	layout = $el.data("layout") || $el.data("parentLayout");
-		if (layout) {
-			var $cont = layout.container;
-			// see if this container is directly-nested inside an outer-pane
-			if ($cont.data("layoutPane")) return $cont;
-			var $pane = $cont.closest("."+ $.layout.defaults.panes.paneClass);
-			// if a pane was found, return it
-			if ($pane.data("layoutPane")) return $pane;
-		}
-		return null;
-	}
-
-,	getParentPaneInstance: function (el) {
-		// must pass either a container or pane element
-		var $pane = $.layout.getParentPaneElem(el);
-		return $pane ? $pane.data("layoutPane") : null;
-	}
-
-,	getParentLayoutInstance: function (el) {
-		// must pass either a container or pane element
-		var $pane = $.layout.getParentPaneElem(el);
-		return $pane ? $pane.data("parentLayout") : null;
-	}
-
-,	getEventObject: function (evt) {
-		return typeof evt === "object" && evt.stopPropagation ? evt : null;
-	}
-,	parsePaneName: function (evt_or_pane) {
-		var evt = $.layout.getEventObject( evt_or_pane )
-		,	pane = evt_or_pane;
-		if (evt) {
-			// ALWAYS stop propagation of events triggered in Layout!
-			evt.stopPropagation();
-			pane = $(this).data("layoutEdge");
-		}
-		if (pane && !/^(west|east|north|south|center)$/.test(pane)) {
-			$.layout.msg('LAYOUT ERROR - Invalid pane-name: "'+ pane +'"');
-			pane = "error";
-		}
-		return pane;
-	}
-
-
-	// LAYOUT-PLUGIN REGISTRATION
-	// more plugins can added beyond this default list
-,	plugins: {
-		draggable:		!!$.fn.draggable // resizing
-	,	effects: {
-			core:		!!$.effects		// animimations (specific effects tested by initOptions)
-		,	slide:		$.effects && ($.effects.slide || ($.effects.effect && $.effects.effect.slide)) // default effect
-		}
-	}
-
-//	arrays of plugin or other methods to be triggered for events in *each layout* - will be passed 'Instance'
-,	onCreate:	[]	// runs when layout is just starting to be created - right after options are set
-,	onLoad:		[]	// runs after layout container and global events init, but before initPanes is called
-,	onReady:	[]	// runs after initialization *completes* - ie, after initPanes completes successfully
-,	onDestroy:	[]	// runs after layout is destroyed
-,	onUnload:	[]	// runs after layout is destroyed OR when page unloads
-,	afterOpen:	[]	// runs after setAsOpen() completes
-,	afterClose:	[]	// runs after setAsClosed() completes
-
-	/*
-	 *	GENERIC UTILITY METHODS
-	 */
-
-	// calculate and return the scrollbar width, as an integer
-,	scrollbarWidth:		function () { return window.scrollbarWidth  || $.layout.getScrollbarSize('width'); }
-,	scrollbarHeight:	function () { return window.scrollbarHeight || $.layout.getScrollbarSize('height'); }
-,	getScrollbarSize:	function (dim) {
-		var $c	= $('<div style="position: absolute; top: -10000px; left: -10000px; width: 100px; height: 100px; border: 0; overflow: scroll;"></div>').appendTo("body")
-		,	d	= { width: $c.outerWidth - $c[0].clientWidth, height: 100 - $c[0].clientHeight };
-		$c.remove();
-		window.scrollbarWidth	= d.width;
-		window.scrollbarHeight	= d.height;
-		return dim.match(/^(width|height)$/) ? d[dim] : d;
-	}
-
-
-,	disableTextSelection: function () {
-		var $d	= $(document)
-		,	s	= 'textSelectionDisabled'
-		,	x	= 'textSelectionInitialized'
-		;
-		if ($.fn.disableSelection) {
-			if (!$d.data(x)) // document hasn't been initialized yet
-				$d.on('mouseup', $.layout.enableTextSelection ).data(x, true);
-			if (!$d.data(s))
-				$d.disableSelection().data(s, true);
-		}
-	}
-,	enableTextSelection: function () {
-		var $d	= $(document)
-		,	s	= 'textSelectionDisabled';
-		if ($.fn.enableSelection && $d.data(s))
-			$d.enableSelection().data(s, false);
-	}
-
-
-	/**
-	 * Returns hash container 'display' and 'visibility'
-	 *
-	 * @see	$.swap() - swaps CSS, runs callback, resets CSS
-	 * @param  {!Object}		$E				jQuery element
-	 * @param  {boolean=}	[force=false]	Run even if display != none
-	 * @return {!Object}						Returns current style props, if applicable
-	 */
-,	showInvisibly: function ($E, force) {
-		if ($E && $E.length && (force || $E.css("display") === "none")) { // only if not *already hidden*
-			var s = $E[0].style
-				// save ONLY the 'style' props because that is what we must restore
-			,	CSS = { display: s.display || '', visibility: s.visibility || '' };
-			// show element 'invisibly' so can be measured
-			$E.css({ display: "block", visibility: "hidden" });
-			return CSS;
-		}
-		return {};
-	}
-
-	/**
-	 * Returns data for setting size of an element (container or a pane).
-	 *
-	 * @see  _create(), onWindowResize() for container, plus others for pane
-	 * @return JSON  Returns a hash of all dimensions: top, bottom, left, right, outerWidth, innerHeight, etc
-	 */
-,	getElementDimensions: function ($E, inset) {
-		var
-		//	dimensions hash - start with current data IF passed
-			d	= { css: {}, inset: {} }
-		,	x	= d.css			// CSS hash
-		,	i	= { bottom: 0 }	// TEMP insets (bottom = complier hack)
-		,	N	= $.layout.cssNum
-		,	R	= Math.round
-		,	off = $E.offset()
-		,	b, p, ei			// TEMP border, padding
-		;
-		d.offsetLeft = off.left;
-		d.offsetTop  = off.top;
-
-		if (!inset) inset = {}; // simplify logic below
-
-		$.each("Left,Right,Top,Bottom".split(","), function (idx, e) { // e = edge
-			b = x["border" + e] = $.layout.borderWidth($E, e);
-			p = x["padding"+ e] = $.layout.cssNum($E, "padding"+e);
-			ei = e.toLowerCase();
-			d.inset[ei] = inset[ei] >= 0 ? inset[ei] : p; // any missing insetX value = paddingX
-			i[ei] = d.inset[ei] + b; // total offset of content from outer side
-		});
-
-		x.width		= R($E.width());
-		x.height	= R($E.height());
-		x.top		= N($E,"top",true);
-		x.bottom	= N($E,"bottom",true);
-		x.left		= N($E,"left",true);
-		x.right		= N($E,"right",true);
-
-		d.outerWidth	= R($E.outerWidth());
-		d.outerHeight	= R($E.outerHeight());
-		// calc the TRUE inner-dimensions, even in quirks-mode!
-		d.innerWidth	= max(0, d.outerWidth  - i.left - i.right);
-		d.innerHeight	= max(0, d.outerHeight - i.top  - i.bottom);
-		// layoutWidth/Height is used in calcs for manual resizing
-		// layoutW/H only differs from innerW/H when in quirks-mode - then is like outerW/H
-		d.layoutWidth	= R($E.innerWidth());
-		d.layoutHeight	= R($E.innerHeight());
-
-		//if ($E.prop('tagName') === 'BODY') { debugData( d, $E.prop('tagName') ); } // DEBUG
-
-		//d.visible	= $E.is(":visible");// && x.width > 0 && x.height > 0;
-
-		return d;
-	}
-
-,	getElementStyles: function ($E, list) {
-		var
-			CSS	= {}
-		,	style	= $E[0].style
-		,	props	= list.split(",")
-		,	sides	= "Top,Bottom,Left,Right".split(",")
-		,	attrs	= "Color,Style,Width".split(",")
-		,	p, s, a, i, j, k
-		;
-		for (i=0; i < props.length; i++) {
-			p = props[i];
-			if (p.match(/(border|padding|margin)$/))
-				for (j=0; j < 4; j++) {
-					s = sides[j];
-					if (p === "border")
-						for (k=0; k < 3; k++) {
-							a = attrs[k];
-							CSS[p+s+a] = style[p+s+a];
-						}
-					else
-						CSS[p+s] = style[p+s];
-				}
-			else
-				CSS[p] = style[p];
-		};
-		return CSS
-	}
-
-	/**
-	 * Return the innerWidth for the current browser/doctype
-	 *
-	 * @see  initPanes(), sizeMidPanes(), initHandles(), sizeHandles()
-	 * @param  {Array.<Object>}	$E  Must pass a jQuery object - first element is processed
-	 * @param  {number=}			outerWidth (optional) Can pass a width, allowing calculations BEFORE element is resized
-	 * @return {number}			Returns the innerWidth of the elem by subtracting padding and borders
-	 */
-,	cssWidth: function ($E, outerWidth) {
-		// a 'calculated' outerHeight can be passed so borders and/or padding are removed if needed
-		if (outerWidth <= 0) return 0;
-
-		var lb	= $.layout.browser
-		,	bs	= !lb.boxModel ? "border-box" : lb.boxSizing ? $E.css("boxSizing") : "content-box"
-		,	b	= $.layout.borderWidth
-		,	n	= $.layout.cssNum
-		,	W	= outerWidth
-		;
-		// strip border and/or padding from outerWidth to get CSS Width
-		if (bs !== "border-box")
-			W -= (b($E, "Left") + b($E, "Right"));
-		if (bs === "content-box")
-			W -= (n($E, "paddingLeft") + n($E, "paddingRight"));
-		return max(0,W);
-	}
-
-	/**
-	 * Return the innerHeight for the current browser/doctype
-	 *
-	 * @see  initPanes(), sizeMidPanes(), initHandles(), sizeHandles()
-	 * @param  {Array.<Object>}	$E  Must pass a jQuery object - first element is processed
-	 * @param  {number=}			outerHeight  (optional) Can pass a width, allowing calculations BEFORE element is resized
-	 * @return {number}			Returns the innerHeight of the elem by subtracting padding and borders
-	 */
-,	cssHeight: function ($E, outerHeight) {
-		// a 'calculated' outerHeight can be passed so borders and/or padding are removed if needed
-		if (outerHeight <= 0) return 0;
-
-		var lb	= $.layout.browser
-		,	bs	= !lb.boxModel ? "border-box" : lb.boxSizing ? $E.css("boxSizing") : "content-box"
-		,	b	= $.layout.borderWidth
-		,	n	= $.layout.cssNum
-		,	H	= outerHeight
-		;
-		// strip border and/or padding from outerHeight to get CSS Height
-		if (bs !== "border-box")
-			H -= (b($E, "Top") + b($E, "Bottom"));
-		if (bs === "content-box")
-			H -= (n($E, "paddingTop") + n($E, "paddingBottom"));
-		return max(0,H);
-	}
-
-	/**
-	 * Returns the 'current CSS numeric value' for a CSS property - 0 if property does not exist
-	 *
-	 * @see  Called by many methods
-	 * @param {Array.<Object>}	$E					Must pass a jQuery object - first element is processed
-	 * @param {string}			prop				The name of the CSS property, eg: top, width, etc.
-	 * @param {boolean=}			[allowAuto=false]	true = return 'auto' if that is value; false = return 0
-	 * @return {(string|number)}						Usually used to get an integer value for position (top, left) or size (height, width)
-	 */
-,	cssNum: function ($E, prop, allowAuto) {
-		if (!$E.jquery) $E = $($E);
-		var CSS = $.layout.showInvisibly($E)
-		,	p	= $.css($E[0], prop, true)
-		,	v	= allowAuto && p=="auto" ? p : Math.round(parseFloat(p) || 0);
-		$E.css( CSS ); // RESET
-		return v;
-	}
-
-,	borderWidth: function (el, side) {
-		if (el.jquery) el = el[0];
-		var b = "border"+ side.substr(0,1).toUpperCase() + side.substr(1); // left => Left
-		return $.css(el, b+"Style", true) === "none" ? 0 : Math.round(parseFloat($.css(el, b+"Width", true)) || 0);
-	}
-
-	/**
-	 * Mouse-tracking utility - FUTURE REFERENCE
-	 *
-	 * init: if (!window.mouse) {
-	 *			window.mouse = { x: 0, y: 0 };
-	 *			$(document).mousemove( $.layout.trackMouse );
-	 *		}
-	 *
-	 * @param {Object}		evt
-	 *
-,	trackMouse: function (evt) {
-		window.mouse = { x: evt.clientX, y: evt.clientY };
-	}
-	*/
-
-	/**
-	 * SUBROUTINE for preventPrematureSlideClose option
-	 *
-	 * @param {Object}		evt
-	 * @param {Object=}		el
-	 */
-,	isMouseOverElem: function (evt, el) {
-		var
-			$E	= $(el || this)
-		,	d	= $E.offset()
-		,	T	= d.top
-		,	L	= d.left
-		,	R	= L + $E.outerWidth()
-		,	B	= T + $E.outerHeight()
-		,	x	= evt.pageX	// evt.clientX ?
-		,	y	= evt.pageY	// evt.clientY ?
-		;
-		// if X & Y are < 0, probably means is over an open SELECT
-		return ($.layout.browser.msie && x < 0 && y < 0) || ((x >= L && x <= R) && (y >= T && y <= B));
-	}
-
-	/**
-	 * Message/Logging Utility
-	 *
-	 * @example $.layout.msg("My message");				// log text
-	 * @example $.layout.msg("My message", true);		// alert text
-	 * @example $.layout.msg({ foo: "bar" }, "Title");	// log hash-data, with custom title
-	 * @example $.layout.msg({ foo: "bar" }, true, "Title", { sort: false }); -OR-
-	 * @example $.layout.msg({ foo: "bar" }, "Title", { sort: false, display: true }); // alert hash-data
-	 *
-	 * @param {(Object|string)}			info			String message OR Hash/Array
-	 * @param {(Boolean|string|Object)=}	[popup=false]	True means alert-box - can be skipped
-	 * @param {(Object|string)=}			[debugTitle=""]	Title for Hash data - can be skipped
-	 * @param {Object=}					[debugOpts]		Extra options for debug output
-	 */
-,	msg: function (info, popup, debugTitle, debugOpts) {
-		if ($.isPlainObject(info) && window.debugData) {
-			if (typeof popup === "string") {
-				debugOpts	= debugTitle;
-				debugTitle	= popup;
-			}
-			else if (typeof debugTitle === "object") {
-				debugOpts	= debugTitle;
-				debugTitle	= null;
-			}
-			var t = debugTitle || "log( <object> )"
-			,	o = $.extend({ sort: false, returnHTML: false, display: false }, debugOpts);
-			if (popup === true || o.display)
-				debugData( info, t, o );
-			else if (window.console)
-				console.log(debugData( info, t, o ));
-		}
-		else if (popup)
-			alert(info);
-		else if (window.console)
-			console.log(info);
-		else {
-			var id	= "#layoutLogger"
-			,	$l = $(id);
-			if (!$l.length)
-				$l = createLog();
-			$l.children("ul").append('<li style="padding: 4px 10px; margin: 0; border-top: 1px solid #CCC;">'+ info.replace(/\</g,"&lt;").replace(/\>/g,"&gt;") +'</li>');
-		}
-
-		function createLog () {
-			var pos = $.support.fixedPosition ? 'fixed' : 'absolute'
-			,	$e = $('<div id="layoutLogger" style="position: '+ pos +'; top: 5px; z-index: 999999; max-width: 25%; overflow: hidden; border: 1px solid #000; border-radius: 5px; background: #FBFBFB; box-shadow: 0 2px 10px rgba(0,0,0,0.3);">'
-				+	'<div style="font-size: 13px; font-weight: bold; padding: 5px 10px; background: #F6F6F6; border-radius: 5px 5px 0 0; cursor: move;">'
-				+	'<span style="float: right; padding-left: 7px; cursor: pointer;" title="Remove Console" onclick="$(this).closest(\'#layoutLogger\').remove()">X</span>Layout console.log</div>'
-				+	'<ul style="font-size: 13px; font-weight: none; list-style: none; margin: 0; padding: 0 0 2px;"></ul>'
-				+ '</div>'
-				).appendTo("body");
-			$e.css('left', $(window).width() - $e.outerWidth() - 5)
-			if ($.ui.draggable) $e.draggable({ handle: ':first-child' });
-			return $e;
-		};
-	}
-
-};
-
-
-/*
- *	$.layout.browser REPLACES removed $.browser, with extra data
- *	Parsing code here adapted from jQuery 1.8 $.browse
- */
-(function(){
-	var u = navigator.userAgent.toLowerCase()
-	,	m = /(chrome)[ \/]([\w.]+)/.exec( u )
-		||	/(webkit)[ \/]([\w.]+)/.exec( u )
-		||	/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( u )
-		||	/(msie) ([\w.]+)/.exec( u )
-		||	u.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( u )
-		||	[]
-	,	b = m[1] || ""
-	,	v = m[2] || 0
-	,	ie = b === "msie"
-	,	cm = document.compatMode
-	,	$s = $.support
-	,	bs = $s.boxSizing !== undefined ? $s.boxSizing : $s.boxSizingReliable
-	,	bm = !ie || !cm || cm === "CSS1Compat" || $s.boxModel || false
-	,	lb = $.layout.browser = {
-			version:	v
-		,	safari:		b === "webkit"	// webkit (NOT chrome) = safari
-		,	webkit:		b === "chrome"	// chrome = webkit
-		,	msie:		ie
-		,	isIE6:		ie && v == 6
-			// ONLY IE reverts to old box-model - Note that compatMode was deprecated as of IE8
-		,	boxModel:	bm
-		,	boxSizing:	!!(typeof bs === "function" ? bs() : bs)
-		};
-	;
-	if (b) lb[b] = true; // set CURRENT browser
-	/*	OLD versions of jQuery only set $.support.boxModel after page is loaded
-	 *	so if this is IE, use support.boxModel to test for quirks-mode (ONLY IE changes boxModel) */
-	if (!bm && !cm) $(function(){ lb.boxModel = $s.boxModel; });
-})();
-
-
-// DEFAULT OPTIONS
-$.layout.defaults = {
-/*
- *	LAYOUT & LAYOUT-CONTAINER OPTIONS
- *	- none of these options are applicable to individual panes
- */
-	name:						""			// Not required, but useful for buttons and used for the state-cookie
-,	containerClass:				"ui-layout-container" // layout-container element
-,	inset:						null		// custom container-inset values (override padding)
-,	scrollToBookmarkOnLoad:		true		// after creating a layout, scroll to bookmark in URL (.../page.htm#myBookmark)
-,	resizeWithWindow:			true		// bind thisLayout.resizeAll() to the window.resize event
-,	resizeWithWindowDelay:		200			// delay calling resizeAll because makes window resizing very jerky
-,	resizeWithWindowMaxDelay:	0			// 0 = none - force resize every XX ms while window is being resized
-,	maskPanesEarly:				false		// true = create pane-masks on resizer.mouseDown instead of waiting for resizer.dragstart
-,	onresizeall_start:			null		// CALLBACK when resizeAll() STARTS	- NOT pane-specific
-,	onresizeall_end:			null		// CALLBACK when resizeAll() ENDS	- NOT pane-specific
-,	onload_start:				null		// CALLBACK when Layout inits - after options initialized, but before elements
-,	onload_end:					null		// CALLBACK when Layout inits - after EVERYTHING has been initialized
-,	onunload_start:				null		// CALLBACK when Layout is destroyed OR onWindowUnload
-,	onunload_end:				null		// CALLBACK when Layout is destroyed OR onWindowUnload
-,	initPanes:					true		// false = DO NOT initialize the panes onLoad - will init later
-,	showErrorMessages:			true		// enables fatal error messages to warn developers of common errors
-,	showDebugMessages:			false		// display console-and-alert debug msgs - IF this Layout version _has_ debugging code!
-//	Changing this zIndex value will cause other zIndex values to automatically change
-,	zIndex:						null		// the PANE zIndex - resizers and masks will be +1
-//	DO NOT CHANGE the zIndex values below unless you clearly understand their relationships
-,	zIndexes: {								// set _default_ z-index values here...
-		pane_normal:			0			// normal z-index for panes
-	,	content_mask:			1			// applied to overlays used to mask content INSIDE panes during resizing
-	,	resizer_normal:			2			// normal z-index for resizer-bars
-	,	pane_sliding:			100			// applied to *BOTH* the pane and its resizer when a pane is 'slid open'
-	,	pane_animate:			1000		// applied to the pane when being animated - not applied to the resizer
-	,	resizer_drag:			10000		// applied to the CLONED resizer-bar when being 'dragged'
-	}
-,	errors: {
-		pane:					"pane"		// description of "layout pane element" - used only in error messages
-	,	selector:				"selector"	// description of "jQuery-selector" - used only in error messages
-	,	addButtonError:			"Error Adding Button\nInvalid "
-	,	containerMissing:		"UI Layout Initialization Error\nThe specified layout-container does not exist."
-	,	centerPaneMissing:		"UI Layout Initialization Error\nThe center-pane element does not exist.\nThe center-pane is a required element."
-	,	noContainerHeight:		"UI Layout Initialization Warning\nThe layout-container \"CONTAINER\" has no height.\nTherefore the layout is 0-height and hence 'invisible'!"
-	,	callbackError:			"UI Layout Callback Error\nThe EVENT callback is not a valid function."
-	}
-/*
- *	PANE DEFAULT SETTINGS
- *	- settings under the 'panes' key become the default settings for *all panes*
- *	- ALL pane-options can also be set specifically for each panes, which will override these 'default values'
- */
-,	panes: { // default options for 'all panes' - will be overridden by 'per-pane settings'
-		applyDemoStyles: 		false		// NOTE: renamed from applyDefaultStyles for clarity
-	,	closable:				true		// pane can open & close
-	,	resizable:				true		// when open, pane can be resized 
-	,	slidable:				true		// when closed, pane can 'slide open' over other panes - closes on mouse-out
-	,	initClosed:				false		// true = init pane as 'closed'
-	,	initHidden: 			false 		// true = init pane as 'hidden' - no resizer-bar/spacing
-	//	SELECTORS
-	//,	paneSelector:			""			// MUST be pane-specific - jQuery selector for pane
-	,	contentSelector:		".ui-layout-content" // INNER div/element to auto-size so only it scrolls, not the entire pane!
-	,	contentIgnoreSelector:	".ui-layout-ignore"	// element(s) to 'ignore' when measuring 'content'
-	,	findNestedContent:		false		// true = $P.find(contentSelector), false = $P.children(contentSelector)
-	//	GENERIC ROOT-CLASSES - for auto-generated classNames
-	,	paneClass:				"ui-layout-pane"	// Layout Pane
-	,	resizerClass:			"ui-layout-resizer"	// Resizer Bar
-	,	togglerClass:			"ui-layout-toggler"	// Toggler Button
-	,	buttonClass:			"ui-layout-button"	// CUSTOM Buttons	- eg: '[ui-layout-button]-toggle/-open/-close/-pin'
-	//	ELEMENT SIZE & SPACING
-	//,	size:					100			// MUST be pane-specific -initial size of pane
-	,	minSize:				0			// when manually resizing a pane
-	,	maxSize:				0			// ditto, 0 = no limit
-	,	spacing_open:			6			// space between pane and adjacent panes - when pane is 'open'
-	,	spacing_closed:			6			// ditto - when pane is 'closed'
-	,	togglerLength_open:		50			// Length = WIDTH of toggler button on north/south sides - HEIGHT on east/west sides
-	,	togglerLength_closed: 	50			// 100% OR -1 means 'full height/width of resizer bar' - 0 means 'hidden'
-	,	togglerAlign_open:		"center"	// top/left, bottom/right, center, OR...
-	,	togglerAlign_closed:	"center"	// 1 => nn = offset from top/left, -1 => -nn == offset from bottom/right
-	,	togglerContent_open:	""			// text or HTML to put INSIDE the toggler
-	,	togglerContent_closed:	""			// ditto
-	//	RESIZING OPTIONS
-	,	resizerDblClickToggle:	true		// 
-	,	autoResize:				true		// IF size is 'auto' or a percentage, then recalc 'pixel size' whenever the layout resizes
-	,	autoReopen:				true		// IF a pane was auto-closed due to noRoom, reopen it when there is room? False = leave it closed
-	,	resizerDragOpacity:		1			// option for ui.draggable
-	//,	resizerCursor:			""			// MUST be pane-specific - cursor when over resizer-bar
-	,	maskContents:			false		// true = add DIV-mask over-or-inside this pane so can 'drag' over IFRAMES
-	,	maskObjects:			false		// true = add IFRAME-mask over-or-inside this pane to cover objects/applets - content-mask will overlay this mask
-	,	maskZindex:				null		// will override zIndexes.content_mask if specified - not applicable to iframe-panes
-	,	resizingGrid:			false		// grid size that the resizers will snap-to during resizing, eg: [20,20]
-	,	livePaneResizing:		false		// true = LIVE Resizing as resizer is dragged
-	,	liveContentResizing:	false		// true = re-measure header/footer heights as resizer is dragged
-	,	liveResizingTolerance:	1			// how many px change before pane resizes, to control performance
-	//	SLIDING OPTIONS
-	,	sliderCursor:			"pointer"	// cursor when resizer-bar will trigger 'sliding'
-	,	slideTrigger_open:		"click"		// click, dblclick, mouseenter
-	,	slideTrigger_close:		"mouseleave"// click, mouseleave
-	,	slideDelay_open:		300			// applies only for mouseenter event - 0 = instant open
-	,	slideDelay_close:		300			// applies only for mouseleave event (300ms is the minimum!)
-	,	hideTogglerOnSlide:		false		// when pane is slid-open, should the toggler show?
-	,	preventQuickSlideClose:	$.layout.browser.webkit // Chrome triggers slideClosed as it is opening
-	,	preventPrematureSlideClose: false	// handle incorrect mouseleave trigger, like when over a SELECT-list in IE
-	//	PANE-SPECIFIC TIPS & MESSAGES
-	,	tips: {
-			Open:				"Open"		// eg: "Open Pane"
-		,	Close:				"Close"
-		,	Resize:				"Resize"
-		,	Slide:				"Slide Open"
-		,	Pin:				"Pin"
-		,	Unpin:				"Un-Pin"
-		,	noRoomToOpen:		"Not enough room to show this panel."	// alert if user tries to open a pane that cannot
-		,	minSizeWarning:		"Panel has reached its minimum size"	// displays in browser statusbar
-		,	maxSizeWarning:		"Panel has reached its maximum size"	// ditto
-		}
-	//	HOT-KEYS & MISC
-	,	showOverflowOnHover:	false		// will bind allowOverflow() utility to pane.onMouseOver
-	,	enableCursorHotkey:		true		// enabled 'cursor' hotkeys
-	//,	customHotkey:			""			// MUST be pane-specific - EITHER a charCode OR a character
-	,	customHotkeyModifier:	"SHIFT"		// either 'SHIFT', 'CTRL' or 'CTRL+SHIFT' - NOT 'ALT'
-	//	PANE ANIMATION
-	//	NOTE: fxSss_open, fxSss_close & fxSss_size options (eg: fxName_open) are auto-generated if not passed
-	,	fxName:					"slide" 	// ('none' or blank), slide, drop, scale -- only relevant to 'open' & 'close', NOT 'size'
-	,	fxSpeed:				null		// slow, normal, fast, 200, nnn - if passed, will OVERRIDE fxSettings.duration
-	,	fxSettings:				{}			// can be passed, eg: { easing: "easeOutBounce", duration: 1500 }
-	,	fxOpacityFix:			true		// tries to fix opacity in IE to restore anti-aliasing after animation
-	,	animatePaneSizing:		false		// true = animate resizing after dragging resizer-bar OR sizePane() is called
-	/*  NOTE: Action-specific FX options are auto-generated from the options above if not specifically set:
-		fxName_open:			"slide"		// 'Open' pane animation
-		fnName_close:			"slide"		// 'Close' pane animation
-		fxName_size:			"slide"		// 'Size' pane animation - when animatePaneSizing = true
-		fxSpeed_open:			null
-		fxSpeed_close:			null
-		fxSpeed_size:			null
-		fxSettings_open:		{}
-		fxSettings_close:		{}
-		fxSettings_size:		{}
-	*/
-	//	CHILD/NESTED LAYOUTS
-	,	children:				null		// Layout-options for nested/child layout - even {} is valid as options
-	,	containerSelector:		''			// if child is NOT 'directly nested', a selector to find it/them (can have more than one child layout!)
-	,	initChildren:			true		// true = child layout will be created as soon as _this_ layout completes initialization
-	,	destroyChildren:		true		// true = destroy child-layout if this pane is destroyed
-	,	resizeChildren:			true		// true = trigger child-layout.resizeAll() when this pane is resized
-	//	EVENT TRIGGERING
-	,	triggerEventsOnLoad:	false		// true = trigger onopen OR onclose callbacks when layout initializes
-	,	triggerEventsDuringLiveResize: true	// true = trigger onresize callback REPEATEDLY if livePaneResizing==true
-	//	PANE CALLBACKS
-	,	onshow_start:			null		// CALLBACK when pane STARTS to Show	- BEFORE onopen/onhide_start
-	,	onshow_end:				null		// CALLBACK when pane ENDS being Shown	- AFTER  onopen/onhide_end
-	,	onhide_start:			null		// CALLBACK when pane STARTS to Close	- BEFORE onclose_start
-	,	onhide_end:				null		// CALLBACK when pane ENDS being Closed	- AFTER  onclose_end
-	,	onopen_start:			null		// CALLBACK when pane STARTS to Open
-	,	onopen_end:				null		// CALLBACK when pane ENDS being Opened
-	,	onclose_start:			null		// CALLBACK when pane STARTS to Close
-	,	onclose_end:			null		// CALLBACK when pane ENDS being Closed
-	,	onresize_start:			null		// CALLBACK when pane STARTS being Resized ***FOR ANY REASON***
-	,	onresize_end:			null		// CALLBACK when pane ENDS being Resized ***FOR ANY REASON***
-	,	onsizecontent_start:	null		// CALLBACK when sizing of content-element STARTS
-	,	onsizecontent_end:		null		// CALLBACK when sizing of content-element ENDS
-	,	onswap_start:			null		// CALLBACK when pane STARTS to Swap
-	,	onswap_end:				null		// CALLBACK when pane ENDS being Swapped
-	,	ondrag_start:			null		// CALLBACK when pane STARTS being ***MANUALLY*** Resized
-	,	ondrag_end:				null		// CALLBACK when pane ENDS being ***MANUALLY*** Resized
-	}
-/*
- *	PANE-SPECIFIC SETTINGS
- *	- options listed below MUST be specified per-pane - they CANNOT be set under 'panes'
- *	- all options under the 'panes' key can also be set specifically for any pane
- *	- most options under the 'panes' key apply only to 'border-panes' - NOT the the center-pane
- */
-,	north: {
-		paneSelector:			".ui-layout-north"
-	,	size:					"auto"		// eg: "auto", "30%", .30, 200
-	,	resizerCursor:			"n-resize"	// custom = url(myCursor.cur)
-	,	customHotkey:			""			// EITHER a charCode (43) OR a character ("o")
-	}
-,	south: {
-		paneSelector:			".ui-layout-south"
-	,	size:					"auto"
-	,	resizerCursor:			"s-resize"
-	,	customHotkey:			""
-	}
-,	east: {
-		paneSelector:			".ui-layout-east"
-	,	size:					200
-	,	resizerCursor:			"e-resize"
-	,	customHotkey:			""
-	}
-,	west: {
-		paneSelector:			".ui-layout-west"
-	,	size:					200
-	,	resizerCursor:			"w-resize"
-	,	customHotkey:			""
-	}
-,	center: {
-		paneSelector:			".ui-layout-center"
-	,	minWidth:				0
-	,	minHeight:				0
-	}
-};
-
-$.layout.optionsMap = {
-	// layout/global options - NOT pane-options
-	layout: ("name,instanceKey,stateManagement,effects,inset,zIndexes,errors,"
-	+	"zIndex,scrollToBookmarkOnLoad,showErrorMessages,maskPanesEarly,"
-	+	"outset,resizeWithWindow,resizeWithWindowDelay,resizeWithWindowMaxDelay,"
-	+	"onresizeall,onresizeall_start,onresizeall_end,onload,onload_start,onload_end,onunload,onunload_start,onunload_end").split(",")
-//	borderPanes: [ ALL options that are NOT specified as 'layout' ]
-	// default.panes options that apply to the center-pane (most options apply _only_ to border-panes)
-,	center: ("paneClass,contentSelector,contentIgnoreSelector,findNestedContent,applyDemoStyles,triggerEventsOnLoad,"
-	+	"showOverflowOnHover,maskContents,maskObjects,liveContentResizing,"
-	+	"containerSelector,children,initChildren,resizeChildren,destroyChildren,"
-	+	"onresize,onresize_start,onresize_end,onsizecontent,onsizecontent_start,onsizecontent_end").split(",")
-	// options that MUST be specifically set 'per-pane' - CANNOT set in the panes (defaults) key
-,	noDefault: ("paneSelector,resizerCursor,customHotkey").split(",")
-};
-
-/**
- * Processes options passed in converts flat-format data into subkey (JSON) format
- * In flat-format, subkeys are _currently_ separated with 2 underscores, like north__optName
- * Plugins may also call this method so they can transform their own data
- *
- * @param  {!Object}	hash			Data/options passed by user - may be a single level or nested levels
- * @param  {boolean=}	[addKeys=false]	Should the primary layout.options keys be added if they do not exist?
- * @return {Object}						Returns hash of minWidth & minHeight
- */
-$.layout.transformData = function (hash, addKeys) {
-	var	json = addKeys ? { panes: {}, center: {} } : {} // init return object
-	,	branch, optKey, keys, key, val, i, c;
-
-	if (typeof hash !== "object") return json; // no options passed
-
-	// convert all 'flat-keys' to 'sub-key' format
-	for (optKey in hash) {
-		branch	= json;
-		val		= hash[ optKey ];
-		keys	= optKey.split("__"); // eg: west__size or north__fxSettings__duration
-		c		= keys.length - 1;
-		// convert underscore-delimited to subkeys
-		for (i=0; i <= c; i++) {
-			key = keys[i];
-			if (i === c) {	// last key = value
-				if ($.isPlainObject( val ))
-					branch[key] = $.layout.transformData( val ); // RECURSE
-				else
-					branch[key] = val;
-			}
-			else {
-				if (!branch[key])
-					branch[key] = {}; // create the subkey
-				// recurse to sub-key for next loop - if not done
-				branch = branch[key];
-			}
-		}
-	}
-	return json;
-};
-
-// INTERNAL CONFIG DATA - DO NOT CHANGE THIS!
-$.layout.backwardCompatibility = {
-	// data used by renameOldOptions()
-	map: {
-	//	OLD Option Name:			NEW Option Name
-		applyDefaultStyles:			"applyDemoStyles"
-	//	CHILD/NESTED LAYOUTS
-	,	childOptions:				"children"
-	,	initChildLayout:			"initChildren"
-	,	destroyChildLayout:			"destroyChildren"
-	,	resizeChildLayout:			"resizeChildren"
-	,	resizeNestedLayout:			"resizeChildren"
-	//	MISC Options
-	,	resizeWhileDragging:		"livePaneResizing"
-	,	resizeContentWhileDragging:	"liveContentResizing"
-	,	triggerEventsWhileDragging:	"triggerEventsDuringLiveResize"
-	,	maskIframesOnResize:		"maskContents"
-	//	STATE MANAGEMENT
-	,	useStateCookie:				"stateManagement.enabled"
-	,	"cookie.autoLoad":			"stateManagement.autoLoad"
-	,	"cookie.autoSave":			"stateManagement.autoSave"
-	,	"cookie.keys":				"stateManagement.stateKeys"
-	,	"cookie.name":				"stateManagement.cookie.name"
-	,	"cookie.domain":			"stateManagement.cookie.domain"
-	,	"cookie.path":				"stateManagement.cookie.path"
-	,	"cookie.expires":			"stateManagement.cookie.expires"
-	,	"cookie.secure":			"stateManagement.cookie.secure"
-	//	OLD Language options
-	,	noRoomToOpenTip:			"tips.noRoomToOpen"
-	,	togglerTip_open:			"tips.Close"	// open   = Close
-	,	togglerTip_closed:			"tips.Open"		// closed = Open
-	,	resizerTip:					"tips.Resize"
-	,	sliderTip:					"tips.Slide"
-	}
-
-/**
-* @param {Object}	opts
-*/
-,	renameOptions: function (opts) {
-		var map = $.layout.backwardCompatibility.map
-		,	oldData, newData, value
-		;
-		for (var itemPath in map) {
-			oldData	= getBranch( itemPath );
-			value	= oldData.branch[ oldData.key ];
-			if (value !== undefined) {
-				newData = getBranch( map[itemPath], true );
-				newData.branch[ newData.key ] = value;
-				delete oldData.branch[ oldData.key ];
-			}
-		}
-
-		/**
-		 * @param {string}	path
-		 * @param {boolean=}	[create=false]	Create path if does not exist
-		 */
-		function getBranch (path, create) {
-			var a = path.split(".") // split keys into array
-			,	c = a.length - 1
-			,	D = { branch: opts, key: a[c] } // init branch at top & set key (last item)
-			,	i = 0, k, undef;
-			for (; i<c; i++) { // skip the last key (data)
-				k = a[i];
-				if (D.branch[ k ] == undefined) { // child-key does not exist
-					if (create) {
-						D.branch = D.branch[ k ] = {}; // create child-branch
-					}
-					else // can't go any farther
-						D.branch = {}; // branch is undefined
-				}
-				else
-					D.branch = D.branch[ k ]; // get child-branch
-			}
-			return D;
-		};
-	}
-
-/**
-* @param {Object}	opts
-*/
-,	renameAllOptions: function (opts) {
-		var ren = $.layout.backwardCompatibility.renameOptions;
-		// rename root (layout) options
-		ren( opts );
-		// rename 'defaults' to 'panes'
-		if (opts.defaults) {
-			if (typeof opts.panes !== "object")
-				opts.panes = {};
-			$.extend(true, opts.panes, opts.defaults);
-			delete opts.defaults;
-		}
-		// rename options in the the options.panes key
-		if (opts.panes) ren( opts.panes );
-		// rename options inside *each pane key*, eg: options.west
-		$.each($.layout.config.allPanes, function (i, pane) {
-			if (opts[pane]) ren( opts[pane] );
-		});	
-		return opts;
-	}
-};
-
-
-
-
-/*	============================================================
- *	BEGIN WIDGET: $( selector ).layout( {options} );
- *	============================================================
- */
-$.fn.layout = function (opts) {
-	var
-
-	// local aliases to global data
-	browser	= $.layout.browser
-,	_c		= $.layout.config
-
-	// local aliases to utlity methods
-,	cssW	= $.layout.cssWidth
-,	cssH	= $.layout.cssHeight
-,	elDims	= $.layout.getElementDimensions
-,	styles	= $.layout.getElementStyles
-,	evtObj	= $.layout.getEventObject
-,	evtPane	= $.layout.parsePaneName
-
-/**
- * options - populated by initOptions()
- */
-,	options = $.extend(true, {}, $.layout.defaults)
-,	effects	= options.effects = $.extend(true, {}, $.layout.effects)
-
-/**
- * layout-state object
- */
-,	state = {
-		// generate unique ID to use for event.namespace so can unbind only events added by 'this layout'
-		id:				"layout"+ $.now()	// code uses alias: sID
-	,	initialized:	false
-	,	paneResizing:	false
-	,	panesSliding:	{}
-	,	container:	{ 	// list all keys referenced in code to avoid compiler error msgs
-			innerWidth:		0
-		,	innerHeight:	0
-		,	outerWidth:		0
-		,	outerHeight:	0
-		,	layoutWidth:	0
-		,	layoutHeight:	0
-		}
-	,	north:		{ childIdx: 0 }
-	,	south:		{ childIdx: 0 }
-	,	east:		{ childIdx: 0 }
-	,	west:		{ childIdx: 0 }
-	,	center:		{ childIdx: 0 }
-	}
-
-/**
- * parent/child-layout pointers
- */
-//,	hasParentLayout	= false	- exists ONLY inside Instance so can be set externally
-,	children = {
-		north:		null
-	,	south:		null
-	,	east:		null
-	,	west:		null
-	,	center:		null
-	}
-
-/*
- * ###########################
- *  INTERNAL HELPER FUNCTIONS
- * ###########################
- */
-
-	/**
-	 * Manages all internal timers
-	 */
-,	timer = {
-		data:	{}
-	,	set:	function (s, fn, ms) { timer.clear(s); timer.data[s] = setTimeout(fn, ms); }
-	,	clear:	function (s) { var t=timer.data; if (t[s]) {clearTimeout(t[s]); delete t[s];} }
-	}
-
-	/**
-	 * Alert or console.log a message - IF option is enabled.
-	 *
-	 * @param {(string|!Object)}	msg				Message (or debug-data) to display
-	 * @param {boolean=}			[popup=false]	True by default, means 'alert', false means use console.log
-	 * @param {boolean=}			[debug=false]	True means is a widget debugging message
-	 */
-,	_log = function (msg, popup, debug) {
-		var o = options;
-		if ((o.showErrorMessages && !debug) || (debug && o.showDebugMessages))
-			$.layout.msg( o.name +' / '+ msg, (popup !== false) );
-		return false;
-	}
-
-	/**
-	 * Executes a Callback function after a trigger event, like resize, open or close
-	 *
-	 * @param {string}				evtName					Name of the layout callback, eg "onresize_start"
-	 * @param {(string|boolean)=}	[pane=""]				This is passed only so we can pass the 'pane object' to the callback
-	 * @param {(string|boolean)=}	[skipBoundEvents=false]	True = do not run events bound to the elements - only the callbacks set in options
-	 */
-,	_runCallbacks = function (evtName, pane, skipBoundEvents) {
-		var	hasPane	= pane && isStr(pane)
-		,	s		= hasPane ? state[pane] : state
-		,	o		= hasPane ? options[pane] : options
-		,	lName	= options.name
-			// names like onopen and onopen_end separate are interchangeable in options...
-		,	lng		= evtName + (evtName.match(/_/) ? "" : "_end")
-		,	shrt	= lng.match(/_end$/) ? lng.substr(0, lng.length - 4) : ""
-		,	fn		= o[lng] || o[shrt]
-		,	retVal	= "NC" // NC = No Callback
-		,	args	= []
-		,	$P		= hasPane ? $Ps[pane] : 0
-		;
-		if (hasPane && !$P) // a pane is specified, but does not exist!
-			return retVal;
-		if ( !hasPane && $.type(pane) === "boolean" ) {
-			skipBoundEvents = pane; // allow pane param to be skipped for Layout callback
-			pane = "";
-		}
-
-		// first trigger the callback set in the options
-		if (fn) {
-			try {
-				// convert function name (string) to function object
-				if (isStr( fn )) {
-					if (fn.match(/,/)) {
-						// function name cannot contain a comma, 
-						// so must be a function name AND a parameter to pass
-						args = fn.split(",")
-						,	fn = eval(args[0]);
-					}
-					else // just the name of an external function?
-						fn = eval(fn);
-				}
-				// execute the callback, if exists
-				if ($.isFunction( fn )) {
-					if (args.length)
-						retVal = g(fn)(args[1]); // pass the argument parsed from 'list'
-					else if ( hasPane )
-						// pass data: pane-name, pane-element, pane-state, pane-options, and layout-name
-						retVal = g(fn)( pane, $Ps[pane], s, o, lName );
-					else // must be a layout/container callback - pass suitable info
-						retVal = g(fn)( Instance, s, o, lName );
-				}
-			}
-			catch (ex) {
-				_log( options.errors.callbackError.replace(/EVENT/, $.trim((pane || "") +" "+ lng)), false );
-				if ($.type(ex) === "string" && string.length)
-					_log("Exception:  "+ ex, false );
-			}
-		}
-
-		// trigger additional events bound directly to the pane
-		if (!skipBoundEvents && retVal !== false) {
-			if ( hasPane ) { // PANE events can be bound to each pane-elements
-				o	= options[pane];
-				s	= state[pane];
-				$P.triggerHandler("layoutpane"+ lng, [ pane, $P, s, o, lName ]);
-				if (shrt)
-					$P.triggerHandler("layoutpane"+ shrt, [ pane, $P, s, o, lName ]);
-			}
-			else { // LAYOUT events can be bound to the container-element
-				$N.triggerHandler("layout"+ lng, [ Instance, s, o, lName ]);
-				if (shrt)
-					$N.triggerHandler("layout"+ shrt, [ Instance, s, o, lName ]);
-			}
-		}
-
-		// ALWAYS resizeChildren after an onresize_end event - even during initialization
-		// IGNORE onsizecontent_end event because causes child-layouts to resize TWICE
-		if (hasPane && evtName === "onresize_end") // BAD: || evtName === "onsizecontent_end"
-			resizeChildren(pane+"", true); // compiler hack -force string
-
-		return retVal;
-
-		function g (f) { return f; }; // compiler hack
-	}
-
-
-	/**
-	 * cure iframe display issues in IE & other browsers
-	 */
-,	_fixIframe = function (pane) {
-		if (browser.mozilla) return; // skip FireFox - it auto-refreshes iframes onShow
-		var $P = $Ps[pane];
-		// if the 'pane' is an iframe, do it
-		if (state[pane].tagName === "IFRAME")
-			$P.css(_c.hidden).css(_c.visible); 
-		else // ditto for any iframes INSIDE the pane
-			$P.find('IFRAME').css(_c.hidden).css(_c.visible);
-	}
-
-	/**
-	 * @param  {string}		pane		Can accept ONLY a 'pane' (east, west, etc)
-	 * @param  {number=}		outerSize	(optional) Can pass a width, allowing calculations BEFORE element is resized
-	 * @return {number}		Returns the innerHeight/Width of el by subtracting padding and borders
-	 */
-,	cssSize = function (pane, outerSize) {
-		var fn = _c[pane].dir=="horz" ? cssH : cssW;
-		return fn($Ps[pane], outerSize);
-	}
-
-	/**
-	 * @param  {string}		pane		Can accept ONLY a 'pane' (east, west, etc)
-	 * @return {Object}		Returns hash of minWidth & minHeight
-	 */
-,	cssMinDims = function (pane) {
-		// minWidth/Height means CSS width/height = 1px
-		var	$P	= $Ps[pane]
-		,	dir	= _c[pane].dir
-		,	d	= {
-				minWidth:	1001 - cssW($P, 1000)
-			,	minHeight:	1001 - cssH($P, 1000)
-			}
-		;
-		if (dir === "horz") d.minSize = d.minHeight;
-		if (dir === "vert") d.minSize = d.minWidth;
-		return d;
-	}
-
-	// TODO: see if these methods can be made more useful...
-	// TODO: *maybe* return cssW/H from these so caller can use this info
-
-	/**
-	 * @param {(string|!Object)}		el
-	 * @param {number=}				outerWidth
-	 * @param {boolean=}				[autoHide=false]
-	 */
-,	setOuterWidth = function (el, outerWidth, autoHide) {
-		var $E = el, w;
-		if (isStr(el)) $E = $Ps[el]; // west
-		else if (!el.jquery) $E = $(el);
-		w = cssW($E, outerWidth);
-		$E.css({ width: w });
-		if (w > 0) {
-			if (autoHide && $E.data('autoHidden') && $E.innerHeight() > 0) {
-				$E.show().data('autoHidden', false);
-				if (!browser.mozilla) // FireFox refreshes iframes - IE does not
-					// make hidden, then visible to 'refresh' display after animation
-					$E.css(_c.hidden).css(_c.visible);
-			}
-		}
-		else if (autoHide && !$E.data('autoHidden'))
-			$E.hide().data('autoHidden', true);
-	}
-
-	/**
-	 * @param {(string|!Object)}		el
-	 * @param {number=}				outerHeight
-	 * @param {boolean=}				[autoHide=false]
-	 */
-,	setOuterHeight = function (el, outerHeight, autoHide) {
-		var $E = el, h;
-		if (isStr(el)) $E = $Ps[el]; // west
-		else if (!el.jquery) $E = $(el);
-		h = cssH($E, outerHeight);
-		$E.css({ height: h, visibility: "visible" }); // may have been 'hidden' by sizeContent
-		if (h > 0 && $E.innerWidth() > 0) {
-			if (autoHide && $E.data('autoHidden')) {
-				$E.show().data('autoHidden', false);
-				if (!browser.mozilla) // FireFox refreshes iframes - IE does not
-					$E.css(_c.hidden).css(_c.visible);
-			}
-		}
-		else if (autoHide && !$E.data('autoHidden'))
-			$E.hide().data('autoHidden', true);
-	}
-
-
-	/**
-	 * Converts any 'size' params to a pixel/integer size, if not already
-	 * If 'auto' or a decimal/percentage is passed as 'size', a pixel-size is calculated
-	 *
-	/**
-	 * @param  {string}				pane
-	 * @param  {(string|number)=}	size
-	 * @param  {string=}				[dir]
-	 * @return {number}
-	 */
-,	_parseSize = function (pane, size, dir) {
-		if (!dir) dir = _c[pane].dir;
-
-		if (isStr(size) && size.match(/%/))
-			size = (size === '100%') ? -1 : parseInt(size, 10) / 100; // convert % to decimal
-
-		if (size === 0)
-			return 0;
-		else if (size >= 1)
-			return parseInt(size, 10);
-
-		var o = options, avail = 0;
-		if (dir=="horz") // north or south or center.minHeight
-			avail = sC.innerHeight - ($Ps.north ? o.north.spacing_open : 0) - ($Ps.south ? o.south.spacing_open : 0);
-		else if (dir=="vert") // east or west or center.minWidth
-			avail = sC.innerWidth - ($Ps.west ? o.west.spacing_open : 0) - ($Ps.east ? o.east.spacing_open : 0);
-
-		if (size === -1) // -1 == 100%
-			return avail;
-		else if (size > 0) // percentage, eg: .25
-			return round(avail * size);
-		else if (pane=="center")
-			return 0;
-		else { // size < 0 || size=='auto' || size==Missing || size==Invalid
-			// auto-size the pane
-			var	dim	= (dir === "horz" ? "height" : "width")
-			,	$P	= $Ps[pane]
-			,	$C	= dim === 'height' ? $Cs[pane] : false
-			,	vis	= $.layout.showInvisibly($P) // show pane invisibly if hidden
-			,	szP	= $P.css(dim) // SAVE current pane size
-			,	szC	= $C ? $C.css(dim) : 0 // SAVE current content size
-			;
-			$P.css(dim, "auto");
-			if ($C) $C.css(dim, "auto");
-			size = (dim === "height") ? $P.outerHeight() : $P.outerWidth(); // MEASURE
-			$P.css(dim, szP).css(vis); // RESET size & visibility
-			if ($C) $C.css(dim, szC);
-			return size;
-		}
-	}
-
-	/**
-	 * Calculates current 'size' (outer-width or outer-height) of a border-pane - optionally with 'pane-spacing' added
-	 *
-	 * @param  {(string|!Object)}	pane
-	 * @param  {boolean=}			[inclSpace=false]
-	 * @return {number}				Returns EITHER Width for east/west panes OR Height for north/south panes
-	 */
-,	getPaneSize = function (pane, inclSpace) {
-		var 
-			$P	= $Ps[pane]
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	oSp	= (inclSpace ? o.spacing_open : 0)
-		,	cSp	= (inclSpace ? o.spacing_closed : 0)
-		;
-		if (!$P || s.isHidden)
-			return 0;
-		else if (s.isClosed || (s.isSliding && inclSpace))
-			return cSp;
-		else if (_c[pane].dir === "horz")
-			return $P.outerHeight() + oSp;
-		else // dir === "vert"
-			return $P.outerWidth() + oSp;
-	}
-
-	/**
-	 * Calculate min/max pane dimensions and limits for resizing
-	 *
-	 * @param  {string}		pane
-	 * @param  {boolean=}	[slide=false]
-	 */
-,	setSizeLimits = function (pane, slide) {
-		if (!isInitialized()) return;
-		var 
-			o				= options[pane]
-		,	s				= state[pane]
-		,	c				= _c[pane]
-		,	dir				= c.dir
-		,	type			= c.sizeType.toLowerCase()
-		,	isSliding		= (slide != undefined ? slide : s.isSliding) // only open() passes 'slide' param
-		,	$P				= $Ps[pane]
-		,	paneSpacing		= o.spacing_open
-		//	measure the pane on the *opposite side* from this pane
-		,	altPane			= _c.oppositeEdge[pane]
-		,	altS			= state[altPane]
-		,	$altP			= $Ps[altPane]
-		,	altPaneSize		= (!$altP || altS.isVisible===false || altS.isSliding ? 0 : (dir=="horz" ? $altP.outerHeight() : $altP.outerWidth()))
-		,	altPaneSpacing	= ((!$altP || altS.isHidden ? 0 : options[altPane][ altS.isClosed !== false ? "spacing_closed" : "spacing_open" ]) || 0)
-		//	limitSize prevents this pane from 'overlapping' opposite pane
-		,	containerSize	= (dir=="horz" ? sC.innerHeight : sC.innerWidth)
-		,	minCenterDims	= cssMinDims("center")
-		,	minCenterSize	= dir=="horz" ? max(options.center.minHeight, minCenterDims.minHeight) : max(options.center.minWidth, minCenterDims.minWidth)
-		//	if pane is 'sliding', then ignore center and alt-pane sizes - because 'overlays' them
-		,	limitSize		= (containerSize - paneSpacing - (isSliding ? 0 : (_parseSize("center", minCenterSize, dir) + altPaneSize + altPaneSpacing)))
-		,	minSize			= s.minSize = max( _parseSize(pane, o.minSize), cssMinDims(pane).minSize )
-		,	maxSize			= s.maxSize = min( (o.maxSize ? _parseSize(pane, o.maxSize) : 100000), limitSize )
-		,	r				= s.resizerPosition = {} // used to set resizing limits
-		,	top				= sC.inset.top
-		,	left			= sC.inset.left
-		,	W				= sC.innerWidth
-		,	H				= sC.innerHeight
-		,	rW				= o.spacing_open // subtract resizer-width to get top/left position for south/east
-		;
-		switch (pane) {
-			case "north":	r.min = top + minSize;
-							r.max = top + maxSize;
-							break;
-			case "west":	r.min = left + minSize;
-							r.max = left + maxSize;
-							break;
-			case "south":	r.min = top + H - maxSize - rW;
-							r.max = top + H - minSize - rW;
-							break;
-			case "east":	r.min = left + W - maxSize - rW;
-							r.max = left + W - minSize - rW;
-							break;
-		};
-	}
-
-	/**
-	 * Returns data for setting the size/position of center pane. Also used to set Height for east/west panes
-	 *
-	 * @return JSON  Returns a hash of all dimensions: top, bottom, left, right, (outer) width and (outer) height
-	 */
-,	calcNewCenterPaneDims = function () {
-		var d = {
-			top:	getPaneSize("north", true) // true = include 'spacing' value for pane
-		,	bottom:	getPaneSize("south", true)
-		,	left:	getPaneSize("west", true)
-		,	right:	getPaneSize("east", true)
-		,	width:	0
-		,	height:	0
-		};
-
-		// NOTE: sC = state.container
-		// calc center-pane outer dimensions
-		d.width		= sC.innerWidth - d.left - d.right;  // outerWidth
-		d.height	= sC.innerHeight - d.bottom - d.top; // outerHeight
-		// add the 'container border/padding' to get final positions relative to the container
-		d.top		+= sC.inset.top;
-		d.bottom	+= sC.inset.bottom;
-		d.left		+= sC.inset.left;
-		d.right		+= sC.inset.right;
-
-		return d;
-	}
-
-
-	/**
-	 * @param {!Object}		el
-	 * @param {boolean=}		[allStates=false]
-	 */
-,	getHoverClasses = function (el, allStates) {
-		var
-			$El		= $(el)
-		,	type	= $El.data("layoutRole")
-		,	pane	= $El.data("layoutEdge")
-		,	o		= options[pane]
-		,	root	= o[type +"Class"]
-		,	_pane	= "-"+ pane // eg: "-west"
-		,	_open	= "-open"
-		,	_closed	= "-closed"
-		,	_slide	= "-sliding"
-		,	_hover	= "-hover " // NOTE the trailing space
-		,	_state	= $El.hasClass(root+_closed) ? _closed : _open
-		,	_alt	= _state === _closed ? _open : _closed
-		,	classes = (root+_hover) + (root+_pane+_hover) + (root+_state+_hover) + (root+_pane+_state+_hover)
-		;
-		if (allStates) // when 'removing' classes, also remove alternate-state classes
-			classes += (root+_alt+_hover) + (root+_pane+_alt+_hover);
-
-		if (type=="resizer" && $El.hasClass(root+_slide))
-			classes += (root+_slide+_hover) + (root+_pane+_slide+_hover);
-
-		return $.trim(classes);
-	}
-,	addHover	= function (evt, el) {
-		var $E = $(el || this);
-		if (evt && $E.data("layoutRole") === "toggler")
-			evt.stopPropagation(); // prevent triggering 'slide' on Resizer-bar
-		$E.addClass( getHoverClasses($E) );
-	}
-,	removeHover	= function (evt, el) {
-		var $E = $(el || this);
-		$E.removeClass( getHoverClasses($E, true) );
-	}
-
-,	onResizerEnter	= function (evt) { // ALSO called by toggler.mouseenter
-		var pane	= $(this).data("layoutEdge")
-		,	s		= state[pane]
-		,	$d		= $(document)
-		;
-		// ignore closed-panes and mouse moving back & forth over resizer!
-		// also ignore if ANY pane is currently resizing
-		if ( s.isResizing || state.paneResizing ) return;
-
-		if (options.maskPanesEarly)
-			showMasks( pane, { resizing: true });
-	}
-,	onResizerLeave	= function (evt, el) {
-		var	e		= el || this // el is only passed when called by the timer
-		,	pane	= $(e).data("layoutEdge")
-		,	name	= pane +"ResizerLeave"
-		,	$d		= $(document)
-		;
-		timer.clear(pane+"_openSlider"); // cancel slideOpen timer, if set
-		timer.clear(name); // cancel enableSelection timer - may re/set below
-		// this method calls itself on a timer because it needs to allow
-		// enough time for dragging to kick-in and set the isResizing flag
-		// dragging has a 100ms delay set, so this delay must be >100
-		if (!el) // 1st call - mouseleave event
-			timer.set(name, function(){ onResizerLeave(evt, e); }, 200);
-		// if user is resizing, dragStop will reset everything, so skip it here
-		else if (options.maskPanesEarly && !state.paneResizing) // 2nd call - by timer
-			hideMasks();
-	}
-
-/*
- * ###########################
- *   INITIALIZATION METHODS
- * ###########################
- */
-
-	/**
-	 * Initialize the layout - called automatically whenever an instance of layout is created
-	 *
-	 * @see  none - triggered onInit
-	 * @return  mixed	true = fully initialized | false = panes not initialized (yet) | 'cancel' = abort
-	 */
-,	_create = function () {
-		// initialize config/options
-		initOptions();
-		var o = options
-		,	s = state;
-
-		// TEMP state so isInitialized returns true during init process
-		s.creatingLayout = true;
-
-		// init plugins for this layout, if there are any (eg: stateManagement)
-		runPluginCallbacks( Instance, $.layout.onCreate );
-
-		// options & state have been initialized, so now run beforeLoad callback
-		// onload will CANCEL layout creation if it returns false
-		if (false === _runCallbacks("onload_start"))
-			return 'cancel';
-
-		// initialize the container element
-		_initContainer();
-
-		// bind hotkey function - keyDown - if required
-		initHotkeys();
-
-		// bind window.onunload
-		$(window).bind("unload."+ sID, unload);
-
-		// init plugins for this layout, if there are any (eg: customButtons)
-		runPluginCallbacks( Instance, $.layout.onLoad );
-
-		// if layout elements are hidden, then layout WILL NOT complete initialization!
-		// initLayoutElements will set initialized=true and run the onload callback IF successful
-		if (o.initPanes) _initLayoutElements();
-
-		delete s.creatingLayout;
-
-		return state.initialized;
-	}
-
-	/**
-	 * Initialize the layout IF not already
-	 *
-	 * @see  All methods in Instance run this test
-	 * @return  boolean	true = layoutElements have been initialized | false = panes are not initialized (yet)
-	 */
-,	isInitialized = function () {
-		if (state.initialized || state.creatingLayout) return true;	// already initialized
-		else return _initLayoutElements();	// try to init panes NOW
-	}
-
-	/**
-	 * Initialize the layout - called automatically whenever an instance of layout is created
-	 *
-	 * @see  _create() & isInitialized
-	 * @param {boolean=}		[retry=false]	// indicates this is a 2nd try
-	 * @return  An object pointer to the instance created
-	 */
-,	_initLayoutElements = function (retry) {
-		// initialize config/options
-		var o = options;
-		// CANNOT init panes inside a hidden container!
-		if (!$N.is(":visible")) {
-			// handle Chrome bug where popup window 'has no height'
-			// if layout is BODY element, try again in 50ms
-			// SEE: http://layout.jquery-dev.com/samples/test_popup_window.html
-			if ( !retry && browser.webkit && $N[0].tagName === "BODY" )
-				setTimeout(function(){ _initLayoutElements(true); }, 50);
-			return false;
-		}
-
-		// a center pane is required, so make sure it exists
-		if (!getPane("center").length) {
-			return _log( o.errors.centerPaneMissing );
-		}
-
-		// TEMP state so isInitialized returns true during init process
-		state.creatingLayout = true;
-
-		// update Container dims
-		$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT include insetX values
-
-		// initialize all layout elements
-		initPanes();	// size & position panes - calls initHandles() - which calls initResizable()
-
-		if (o.scrollToBookmarkOnLoad) {
-			var l = self.location;
-			if (l.hash) l.replace( l.hash ); // scrollTo Bookmark
-		}
-
-		// check to see if this layout 'nested' inside a pane
-		if (Instance.hasParentLayout)
-			o.resizeWithWindow = false;
-		// bind resizeAll() for 'this layout instance' to window.resize event
-		else if (o.resizeWithWindow)
-			$(window).bind("resize."+ sID, windowResize);
-
-		delete state.creatingLayout;
-		state.initialized = true;
-
-		// init plugins for this layout, if there are any
-		runPluginCallbacks( Instance, $.layout.onReady );
-
-		// now run the onload callback, if exists
-		_runCallbacks("onload_end");
-
-		return true; // elements initialized successfully
-	}
-
-	/**
-	 * Initialize nested layouts for a specific pane - can optionally pass layout-options
-	 *
-	 * @param {(string|Object)}	evt_or_pane	The pane being opened, ie: north, south, east, or west
-	 * @param {Object=}			[opts]		Layout-options - if passed, will OVERRRIDE options[pane].children
-	 * @return  An object pointer to the layout instance created - or null
-	 */
-,	createChildren = function (evt_or_pane, opts) {
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$P	= $Ps[pane]
-		;
-		if (!$P) return;
-		var	$C	= $Cs[pane]
-		,	s	= state[pane]
-		,	o	= options[pane]
-		,	sm	= options.stateManagement || {}
-		,	cos = opts ? (o.children = opts) : o.children
-		;
-		if ( $.isPlainObject( cos ) )
-			cos = [ cos ]; // convert a hash to a 1-elem array
-		else if (!cos || !$.isArray( cos ))
-			return;
-
-		$.each( cos, function (idx, co) {
-			if ( !$.isPlainObject( co ) ) return;
-
-			// determine which element is supposed to be the 'child container'
-			// if pane has a 'containerSelector' OR a 'content-div', use those instead of the pane
-			var $containers = co.containerSelector ? $P.find( co.containerSelector ) : ($C || $P);
-
-			$containers.each(function(){
-				var $cont	= $(this)
-				,	child	= $cont.data("layout") //	see if a child-layout ALREADY exists on this element
-				;
-				// if no layout exists, but children are set, try to create the layout now
-				if (!child) {
-					// TODO: see about moving this to the stateManagement plugin, as a method
-					// set a unique child-instance key for this layout, if not already set
-					setInstanceKey({ container: $cont, options: co }, s );
-					// If THIS layout has a hash in stateManagement.autoLoad,
-					// then see if it also contains state-data for this child-layout
-					// If so, copy the stateData to child.options.stateManagement.autoLoad
-					if ( sm.includeChildren && state.stateData[pane] ) {
-						//	THIS layout's state was cached when its state was loaded
-						var	paneChildren = state.stateData[pane].children || {}
-						,	childState	= paneChildren[ co.instanceKey ]
-						,	co_sm		= co.stateManagement || (co.stateManagement = { autoLoad: true })
-						;
-						// COPY the stateData into the autoLoad key
-						if ( co_sm.autoLoad === true && childState ) {
-							co_sm.autoSave			= false; // disable autoSave because saving handled by parent-layout
-							co_sm.includeChildren	= true;  // cascade option - FOR NOW
-							co_sm.autoLoad = $.extend(true, {}, childState); // COPY the state-hash
-						}
-					}
-
-					// create the layout
-					child = $cont.layout( co );
-
-					// if successful, update data
-					if (child) {
-						// add the child and update all layout-pointers
-						// MAY have already been done by child-layout calling parent.refreshChildren()
-						refreshChildren( pane, child );
-					}
-				}
-			});
-		});
-	}
-
-,	setInstanceKey = function (child, parentPaneState) {
-		// create a named key for use in state and instance branches
-		var	$c	= child.container
-		,	o	= child.options
-		,	sm	= o.stateManagement
-		,	key	= o.instanceKey || $c.data("layoutInstanceKey")
-		;
-		if (!key) key = (sm && sm.cookie ? sm.cookie.name : '') || o.name; // look for a name/key
-		if (!key) key = "layout"+ (++parentPaneState.childIdx);	// if no name/key found, generate one
-		else key = key.replace(/[^\w-]/gi, '_').replace(/_{2,}/g, '_');	 // ensure is valid as a hash key
-		o.instanceKey = key;
-		$c.data("layoutInstanceKey", key); // useful if layout is destroyed and then recreated
-		return key;
-	}
-
-	/**
-	 * @param {string}		pane		The pane being opened, ie: north, south, east, or west
-	 * @param {Object=}		newChild	New child-layout Instance to add to this pane
-	 */
-,	refreshChildren = function (pane, newChild) {
-		var	$P	= $Ps[pane]
-		,	pC	= children[pane]
-		,	s	= state[pane]
-		,	o
-		;
-		// check for destroy()ed layouts and update the child pointers & arrays
-		if ($.isPlainObject( pC )) {
-			$.each( pC, function (key, child) {
-				if (child.destroyed) delete pC[key]
-			});
-			// if no more children, remove the children hash
-			if ($.isEmptyObject( pC ))
-				pC = children[pane] = null; // clear children hash
-		}
-
-		// see if there is a directly-nested layout inside this pane
-		// if there is, then there can be only ONE child-layout, so check that...
-		if (!newChild && !pC) {
-			newChild = $P.data("layout");
-		}
-
-		// if a newChild instance was passed, add it to children[pane]
-		if (newChild) {
-			// update child.state
-			newChild.hasParentLayout = true; // set parent-flag in child
-			// instanceKey is a key-name used in both state and children
-			o = newChild.options;
-			// set a unique child-instance key for this layout, if not already set
-			setInstanceKey( newChild, s );
-			// add pointer to pane.children hash
-			if (!pC) pC = children[pane] = {}; // create an empty children hash
-			pC[ o.instanceKey ] = newChild.container.data("layout"); // add childLayout instance
-		}
-
-		// ALWAYS refresh the pane.children alias, even if null
-		Instance[pane].children = children[pane];
-
-		// if newChild was NOT passed - see if there is a child layout NOW
-		if (!newChild) {
-			createChildren(pane); // MAY create a child and re-call this method
-		}
-	}
-
-,	windowResize = function () {
-		var	o = options
-		,	delay = Number(o.resizeWithWindowDelay);
-		if (delay < 10) delay = 100; // MUST have a delay!
-		// resizing uses a delay-loop because the resize event fires repeatly - except in FF, but delay anyway
-		timer.clear("winResize"); // if already running
-		timer.set("winResize", function(){
-			timer.clear("winResize");
-			timer.clear("winResizeRepeater");
-			var dims = elDims( $N, o.inset );
-			// only trigger resizeAll() if container has changed size
-			if (dims.innerWidth !== sC.innerWidth || dims.innerHeight !== sC.innerHeight)
-				resizeAll();
-		}, delay);
-		// ALSO set fixed-delay timer, if not already running
-		if (!timer.data["winResizeRepeater"]) setWindowResizeRepeater();
-	}
-
-,	setWindowResizeRepeater = function () {
-		var delay = Number(options.resizeWithWindowMaxDelay);
-		if (delay > 0)
-			timer.set("winResizeRepeater", function(){ setWindowResizeRepeater(); resizeAll(); }, delay);
-	}
-
-,	unload = function () {
-		var o = options;
-
-		_runCallbacks("onunload_start");
-
-		// trigger plugin callabacks for this layout (eg: stateManagement)
-		runPluginCallbacks( Instance, $.layout.onUnload );
-
-		_runCallbacks("onunload_end");
-	}
-
-	/**
-	 * Validate and initialize container CSS and events
-	 *
-	 * @see  _create()
-	 */
-,	_initContainer = function () {
-		var
-			N		= $N[0]	
-		,	$H		= $("html")
-		,	tag		= sC.tagName = N.tagName
-		,	id		= sC.id = N.id
-		,	cls		= sC.className = N.className
-		,	o		= options
-		,	name	= o.name
-		,	props	= "position,margin,padding,border"
-		,	css		= "layoutCSS"
-		,	CSS		= {}
-		,	hid		= "hidden" // used A LOT!
-		//	see if this container is a 'pane' inside an outer-layout
-		,	parent	= $N.data("parentLayout")	// parent-layout Instance
-		,	pane	= $N.data("layoutEdge")		// pane-name in parent-layout
-		,	isChild	= parent && pane
-		,	num		= $.layout.cssNum
-		,	$parent, n
-		;
-		// sC = state.container
-		sC.selector = $N.selector.split(".slice")[0];
-		sC.ref		= (o.name ? o.name +' layout / ' : '') + tag + (id ? "#"+id : cls ? '.['+cls+']' : ''); // used in messages
-		sC.isBody	= (tag === "BODY");
-
-		// try to find a parent-layout
-		if (!isChild && !sC.isBody) {
-			$parent = $N.closest("."+ $.layout.defaults.panes.paneClass);
-			parent	= $parent.data("parentLayout");
-			pane	= $parent.data("layoutEdge");
-			isChild	= parent && pane;
-		}
-
-		$N	.data({
-				layout: Instance
-			,	layoutContainer: sID // FLAG to indicate this is a layout-container - contains unique internal ID
-			})
-			.addClass(o.containerClass)
-		;
-		var layoutMethods = {
-			destroy:	''
-		,	initPanes:	''
-		,	resizeAll:	'resizeAll'
-		,	resize:		'resizeAll'
-		};
-		// loop hash and bind all methods - include layoutID namespacing
-		for (name in layoutMethods) {
-			$N.bind("layout"+ name.toLowerCase() +"."+ sID, Instance[ layoutMethods[name] || name ]);
-		}
-
-		// if this container is another layout's 'pane', then set child/parent pointers
-		if (isChild) {
-			// update parent flag
-			Instance.hasParentLayout = true;
-			// set pointers to THIS child-layout (Instance) in parent-layout
-			parent.refreshChildren( pane, Instance );
-		}
-
-		// SAVE original container CSS for use in destroy()
-		if (!$N.data(css)) {
-			// handle props like overflow different for BODY & HTML - has 'system default' values
-			if (sC.isBody) {
-				// SAVE <BODY> CSS
-				$N.data(css, $.extend( styles($N, props), {
-					height:		$N.css("height")
-				,	overflow:	$N.css("overflow")
-				,	overflowX:	$N.css("overflowX")
-				,	overflowY:	$N.css("overflowY")
-				}));
-				// ALSO SAVE <HTML> CSS
-				$H.data(css, $.extend( styles($H, 'padding'), {
-					height:		"auto" // FF would return a fixed px-size!
-				,	overflow:	$H.css("overflow")
-				,	overflowX:	$H.css("overflowX")
-				,	overflowY:	$H.css("overflowY")
-				}));
-			}
-			else // handle props normally for non-body elements
-				$N.data(css, styles($N, props+",top,bottom,left,right,width,height,overflow,overflowX,overflowY") );
-		}
-
-		try {
-			// common container CSS
-			CSS = {
-				overflow:	hid
-			,	overflowX:	hid
-			,	overflowY:	hid
-			};
-			$N.css( CSS );
-
-			if (o.inset && !$.isPlainObject(o.inset)) {
-				// can specify a single number for equal outset all-around
-				n = parseInt(o.inset, 10) || 0
-				o.inset = {
-					top:	n
-				,	bottom:	n
-				,	left:	n
-				,	right:	n
-				};
-			}
-
-			// format html & body if this is a full page layout
-			if (sC.isBody) {
-				// if HTML has padding, use this as an outer-spacing around BODY
-				if (!o.outset) {
-					// use padding from parent-elem (HTML) as outset
-					o.outset = {
-						top:	num($H, "paddingTop")
-					,	bottom:	num($H, "paddingBottom")
-					,	left:	num($H, "paddingLeft")
-					,	right:	num($H, "paddingRight")
-					};
-				}
-				else if (!$.isPlainObject(o.outset)) {
-					// can specify a single number for equal outset all-around
-					n = parseInt(o.outset, 10) || 0
-					o.outset = {
-						top:	n
-					,	bottom:	n
-					,	left:	n
-					,	right:	n
-					};
-				}
-				// HTML
-				$H.css( CSS ).css({
-					height:		"100%"
-				,	border:		"none"	// no border or padding allowed when using height = 100%
-				,	padding:	0		// ditto
-				,	margin:		0
-				});
-				// BODY
-				if (browser.isIE6) {
-					// IE6 CANNOT use the trick of setting absolute positioning on all 4 sides - must have 'height'
-					$N.css({
-						width:		"100%"
-					,	height:		"100%"
-					,	border:		"none"	// no border or padding allowed when using height = 100%
-					,	padding:	0		// ditto
-					,	margin:		0
-					,	position:	"relative"
-					});
-					// convert body padding to an inset option - the border cannot be measured in IE6!
-					if (!o.inset) o.inset = elDims( $N ).inset;
-				}
-				else { // use absolute positioning for BODY to allow borders & padding without overflow
-					$N.css({
-						width:		"auto"
-					,	height:		"auto"
-					,	margin:		0
-					,	position:	"absolute"	// allows for border and padding on BODY
-					});
-					// apply edge-positioning created above
-					$N.css( o.outset );
-				}
-				// set current layout-container dimensions
-				$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT include insetX values
-			}
-			else {
-				// container MUST have 'position'
-				var	p = $N.css("position");
-				if (!p || !p.match(/(fixed|absolute|relative)/))
-					$N.css("position","relative");
-
-				// set current layout-container dimensions
-				if ( $N.is(":visible") ) {
-					$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT change insetX (padding) values
-					if (sC.innerHeight < 1) // container has no 'height' - warn developer
-						_log( o.errors.noContainerHeight.replace(/CONTAINER/, sC.ref) );
-				}
-			}
-
-			// if container has min-width/height, then enable scrollbar(s)
-			if ( num($N, "minWidth")  ) $N.parent().css("overflowX","auto");
-			if ( num($N, "minHeight") ) $N.parent().css("overflowY","auto");
-
-		} catch (ex) {}
-	}
-
-	/**
-	 * Bind layout hotkeys - if options enabled
-	 *
-	 * @see  _create() and addPane()
-	 * @param {string=}	[panes=""]	The edge(s) to process
-	 */
-,	initHotkeys = function (panes) {
-		panes = panes ? panes.split(",") : _c.borderPanes;
-		// bind keyDown to capture hotkeys, if option enabled for ANY pane
-		$.each(panes, function (i, pane) {
-			var o = options[pane];
-			if (o.enableCursorHotkey || o.customHotkey) {
-				$(document).bind("keydown."+ sID, keyDown); // only need to bind this ONCE
-				return false; // BREAK - binding was done
-			}
-		});
-	}
-
-	/**
-	 * Build final OPTIONS data
-	 *
-	 * @see  _create()
-	 */
-,	initOptions = function () {
-		var data, d, pane, key, val, i, c, o;
-
-		// reprocess user's layout-options to have correct options sub-key structure
-		opts = $.layout.transformData( opts, true ); // panes = default subkey
-
-		// auto-rename old options for backward compatibility
-		opts = $.layout.backwardCompatibility.renameAllOptions( opts );
-
-		// if user-options has 'panes' key (pane-defaults), clean it...
-		if (!$.isEmptyObject(opts.panes)) {
-			// REMOVE any pane-defaults that MUST be set per-pane
-			data = $.layout.optionsMap.noDefault;
-			for (i=0, c=data.length; i<c; i++) {
-				key = data[i];
-				delete opts.panes[key]; // OK if does not exist
-			}
-			// REMOVE any layout-options specified under opts.panes
-			data = $.layout.optionsMap.layout;
-			for (i=0, c=data.length; i<c; i++) {
-				key = data[i];
-				delete opts.panes[key]; // OK if does not exist
-			}
-		}
-
-		// MOVE any NON-layout-options from opts-root to opts.panes
-		data = $.layout.optionsMap.layout;
-		var rootKeys = $.layout.config.optionRootKeys;
-		for (key in opts) {
-			val = opts[key];
-			if ($.inArray(key, rootKeys) < 0 && $.inArray(key, data) < 0) {
-				if (!opts.panes[key])
-					opts.panes[key] = $.isPlainObject(val) ? $.extend(true, {}, val) : val;
-				delete opts[key]
-			}
-		}
-
-		// START by updating ALL options from opts
-		$.extend(true, options, opts);
-
-		// CREATE final options (and config) for EACH pane
-		$.each(_c.allPanes, function (i, pane) {
-
-			// apply 'pane-defaults' to CONFIG.[PANE]
-			_c[pane] = $.extend(true, {}, _c.panes, _c[pane]);
-
-			d = options.panes;
-			o = options[pane];
-
-			// center-pane uses SOME keys in defaults.panes branch
-			if (pane === 'center') {
-				// ONLY copy keys from opts.panes listed in: $.layout.optionsMap.center
-				data = $.layout.optionsMap.center;		// list of 'center-pane keys'
-				for (i=0, c=data.length; i<c; i++) {	// loop the list...
-					key = data[i];
-					// only need to use pane-default if pane-specific value not set
-					if (!opts.center[key] && (opts.panes[key] || !o[key]))
-						o[key] = d[key]; // pane-default
-				}
-			}
-			else {
-				// border-panes use ALL keys in defaults.panes branch
-				o = options[pane] = $.extend(true, {}, d, o); // re-apply pane-specific opts AFTER pane-defaults
-				createFxOptions( pane );
-				// ensure all border-pane-specific base-classes exist
-				if (!o.resizerClass)	o.resizerClass	= "ui-layout-resizer";
-				if (!o.togglerClass)	o.togglerClass	= "ui-layout-toggler";
-			}
-			// ensure we have base pane-class (ALL panes)
-			if (!o.paneClass) o.paneClass = "ui-layout-pane";
-		});
-
-		// update options.zIndexes if a zIndex-option specified
-		var zo	= opts.zIndex
-		,	z	= options.zIndexes;
-		if (zo > 0) {
-			z.pane_normal		= zo;
-			z.content_mask		= max(zo+1, z.content_mask);	// MIN = +1
-			z.resizer_normal	= max(zo+2, z.resizer_normal);	// MIN = +2
-		}
-
-		// DELETE 'panes' key now that we are done - values were copied to EACH pane
-		delete options.panes;
-
-
-		function createFxOptions ( pane ) {
-			var	o = options[pane]
-			,	d = options.panes;
-			// ensure fxSettings key to avoid errors
-			if (!o.fxSettings) o.fxSettings = {};
-			if (!d.fxSettings) d.fxSettings = {};
-
-			$.each(["_open","_close","_size"], function (i,n) { 
-				var
-					sName		= "fxName"+ n
-				,	sSpeed		= "fxSpeed"+ n
-				,	sSettings	= "fxSettings"+ n
-					// recalculate fxName according to specificity rules
-				,	fxName = o[sName] =
-						o[sName]	// options.west.fxName_open
-					||	d[sName]	// options.panes.fxName_open
-					||	o.fxName	// options.west.fxName
-					||	d.fxName	// options.panes.fxName
-					||	"none"		// MEANS $.layout.defaults.panes.fxName == "" || false || null || 0
-				,	fxExists	= $.effects && ($.effects[fxName] || ($.effects.effect && $.effects.effect[fxName]))
-				;
-				// validate fxName to ensure is valid effect - MUST have effect-config data in options.effects
-				if (fxName === "none" || !options.effects[fxName] || !fxExists)
-					fxName = o[sName] = "none"; // effect not loaded OR unrecognized fxName
-
-				// set vars for effects subkeys to simplify logic
-				var	fx		= options.effects[fxName] || {}	// effects.slide
-				,	fx_all	= fx.all	|| null				// effects.slide.all
-				,	fx_pane	= fx[pane]	|| null				// effects.slide.west
-				;
-				// create fxSpeed[_open|_close|_size]
-				o[sSpeed] =
-					o[sSpeed]				// options.west.fxSpeed_open
-				||	d[sSpeed]				// options.west.fxSpeed_open
-				||	o.fxSpeed				// options.west.fxSpeed
-				||	d.fxSpeed				// options.panes.fxSpeed
-				||	null					// DEFAULT - let fxSetting.duration control speed
-				;
-				// create fxSettings[_open|_close|_size]
-				o[sSettings] = $.extend(
-					true
-				,	{}
-				,	fx_all					// effects.slide.all
-				,	fx_pane					// effects.slide.west
-				,	d.fxSettings			// options.panes.fxSettings
-				,	o.fxSettings			// options.west.fxSettings
-				,	d[sSettings]			// options.panes.fxSettings_open
-				,	o[sSettings]			// options.west.fxSettings_open
-				);
-			});
-
-			// DONE creating action-specific-settings for this pane,
-			// so DELETE generic options - are no longer meaningful
-			delete o.fxName;
-			delete o.fxSpeed;
-			delete o.fxSettings;
-		}
-	}
-
-	/**
-	 * Initialize module objects, styling, size and position for all panes
-	 *
-	 * @see  _initElements()
-	 * @param {string}	pane		The pane to process
-	 */
-,	getPane = function (pane) {
-		var sel = options[pane].paneSelector
-		if (sel.substr(0,1)==="#") // ID selector
-			// NOTE: elements selected 'by ID' DO NOT have to be 'children'
-			return $N.find(sel).eq(0);
-		else { // class or other selector
-			var $P = $N.children(sel).eq(0);
-			// look for the pane nested inside a 'form' element
-			return $P.length ? $P : $N.children("form:first").children(sel).eq(0);
-		}
-	}
-
-	/**
-	 * @param {Object=}		evt
-	 */
-,	initPanes = function (evt) {
-		// stopPropagation if called by trigger("layoutinitpanes") - use evtPane utility 
-		evtPane(evt);
-
-		// NOTE: do north & south FIRST so we can measure their height - do center LAST
-		$.each(_c.allPanes, function (idx, pane) {
-			addPane( pane, true );
-		});
-
-		// init the pane-handles NOW in case we have to hide or close the pane below
-		initHandles();
-
-		// now that all panes have been initialized and initially-sized,
-		// make sure there is really enough space available for each pane
-		$.each(_c.borderPanes, function (i, pane) {
-			if ($Ps[pane] && state[pane].isVisible) { // pane is OPEN
-				setSizeLimits(pane);
-				makePaneFit(pane); // pane may be Closed, Hidden or Resized by makePaneFit()
-			}
-		});
-		// size center-pane AGAIN in case we 'closed' a border-pane in loop above
-		sizeMidPanes("center");
-
-		//	Chrome/Webkit sometimes fires callbacks BEFORE it completes resizing!
-		//	Before RC30.3, there was a 10ms delay here, but that caused layout 
-		//	to load asynchrously, which is BAD, so try skipping delay for now
-
-		// process pane contents and callbacks, and init/resize child-layout if exists
-		$.each(_c.allPanes, function (idx, pane) {
-			afterInitPane(pane);
-		});
-	}
-
-	/**
-	 * Add a pane to the layout - subroutine of initPanes()
-	 *
-	 * @see  initPanes()
-	 * @param {string}	pane			The pane to process
-	 * @param {boolean=}	[force=false]	Size content after init
-	 */
-,	addPane = function (pane, force) {
-		if ( !force && !isInitialized() ) return;
-		var
-			o		= options[pane]
-		,	s		= state[pane]
-		,	c		= _c[pane]
-		,	dir		= c.dir
-		,	fx		= s.fx
-		,	spacing	= o.spacing_open || 0
-		,	isCenter = (pane === "center")
-		,	CSS		= {}
-		,	$P		= $Ps[pane]
-		,	size, minSize, maxSize, child
-		;
-		// if pane-pointer already exists, remove the old one first
-		if ($P)
-			removePane( pane, false, true, false );
-		else
-			$Cs[pane] = false; // init
-
-		$P = $Ps[pane] = getPane(pane);
-		if (!$P.length) {
-			$Ps[pane] = false; // logic
-			return;
-		}
-
-		// SAVE original Pane CSS
-		if (!$P.data("layoutCSS")) {
-			var props = "position,top,left,bottom,right,width,height,overflow,zIndex,display,backgroundColor,padding,margin,border";
-			$P.data("layoutCSS", styles($P, props));
-		}
-
-		// create alias for pane data in Instance - initHandles will add more
-		Instance[pane] = {
-			name:		pane
-		,	pane:		$Ps[pane]
-		,	content:	$Cs[pane]
-		,	options:	options[pane]
-		,	state:		state[pane]
-		,	children:	children[pane]
-		};
-
-		// add classes, attributes & events
-		$P	.data({
-				parentLayout:	Instance		// pointer to Layout Instance
-			,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-			,	layoutEdge:		pane
-			,	layoutRole:		"pane"
-			})
-			.css(c.cssReq).css("zIndex", options.zIndexes.pane_normal)
-			.css(o.applyDemoStyles ? c.cssDemo : {}) // demo styles
-			.addClass( o.paneClass +" "+ o.paneClass+"-"+pane ) // default = "ui-layout-pane ui-layout-pane-west" - may be a dupe of 'paneSelector'
-			.bind("mouseenter."+ sID, addHover )
-			.bind("mouseleave."+ sID, removeHover )
-			;
-		var paneMethods = {
-				hide:				''
-			,	show:				''
-			,	toggle:				''
-			,	close:				''
-			,	open:				''
-			,	slideOpen:			''
-			,	slideClose:			''
-			,	slideToggle:		''
-			,	size:				'sizePane'
-			,	sizePane:			'sizePane'
-			,	sizeContent:		''
-			,	sizeHandles:		''
-			,	enableClosable:		''
-			,	disableClosable:	''
-			,	enableSlideable:	''
-			,	disableSlideable:	''
-			,	enableResizable:	''
-			,	disableResizable:	''
-			,	swapPanes:			'swapPanes'
-			,	swap:				'swapPanes'
-			,	move:				'swapPanes'
-			,	removePane:			'removePane'
-			,	remove:				'removePane'
-			,	createChildren:		''
-			,	resizeChildren:		''
-			,	resizeAll:			'resizeAll'
-			,	resizeLayout:		'resizeAll'
-			}
-		,	name;
-		// loop hash and bind all methods - include layoutID namespacing
-		for (name in paneMethods) {
-			$P.bind("layoutpane"+ name.toLowerCase() +"."+ sID, Instance[ paneMethods[name] || name ]);
-		}
-
-		// see if this pane has a 'scrolling-content element'
-		initContent(pane, false); // false = do NOT sizeContent() - called later
-
-		if (!isCenter) {
-			// call _parseSize AFTER applying pane classes & styles - but before making visible (if hidden)
-			// if o.size is auto or not valid, then MEASURE the pane and use that as its 'size'
-			size	= s.size = _parseSize(pane, o.size);
-			minSize	= _parseSize(pane,o.minSize) || 1;
-			maxSize	= _parseSize(pane,o.maxSize) || 100000;
-			if (size > 0) size = max(min(size, maxSize), minSize);
-			s.autoResize = o.autoResize; // used with percentage sizes
-
-			// state for border-panes
-			s.isClosed  = false; // true = pane is closed
-			s.isSliding = false; // true = pane is currently open by 'sliding' over adjacent panes
-			s.isResizing= false; // true = pane is in process of being resized
-			s.isHidden	= false; // true = pane is hidden - no spacing, resizer or toggler is visible!
-
-			// array for 'pin buttons' whose classNames are auto-updated on pane-open/-close
-			if (!s.pins) s.pins = [];
-		}
-		//	states common to ALL panes
-		s.tagName	= $P[0].tagName;
-		s.edge		= pane;		// useful if pane is (or about to be) 'swapped' - easy find out where it is (or is going)
-		s.noRoom	= false;	// true = pane 'automatically' hidden due to insufficient room - will unhide automatically
-		s.isVisible	= true;		// false = pane is invisible - closed OR hidden - simplify logic
-
-		// init pane positioning
-		setPanePosition( pane );
-
-		// if pane is not visible, 
-		if (dir === "horz") // north or south pane
-			CSS.height = cssH($P, size);
-		else if (dir === "vert") // east or west pane
-			CSS.width = cssW($P, size);
-		//else if (isCenter) {}
-
-		$P.css(CSS); // apply size -- top, bottom & height will be set by sizeMidPanes
-		if (dir != "horz") sizeMidPanes(pane, true); // true = skipCallback
-
-		// if manually adding a pane AFTER layout initialization, then...
-		if (state.initialized) {
-			initHandles( pane );
-			initHotkeys( pane );
-		}
-
-		// close or hide the pane if specified in settings
-		if (o.initClosed && o.closable && !o.initHidden)
-			close(pane, true, true); // true, true = force, noAnimation
-		else if (o.initHidden || o.initClosed)
-			hide(pane); // will be completely invisible - no resizer or spacing
-		else if (!s.noRoom)
-			// make the pane visible - in case was initially hidden
-			$P.css("display","block");
-		// ELSE setAsOpen() - called later by initHandles()
-
-		// RESET visibility now - pane will appear IF display:block
-		$P.css("visibility","visible");
-
-		// check option for auto-handling of pop-ups & drop-downs
-		if (o.showOverflowOnHover)
-			$P.hover( allowOverflow, resetOverflow );
-
-		// if manually adding a pane AFTER layout initialization, then...
-		if (state.initialized) {
-			afterInitPane( pane );
-		}
-	}
-
-,	afterInitPane = function (pane) {
-		var	$P	= $Ps[pane]
-		,	s	= state[pane]
-		,	o	= options[pane]
-		;
-		if (!$P) return;
-
-		// see if there is a directly-nested layout inside this pane
-		if ($P.data("layout"))
-			refreshChildren( pane, $P.data("layout") );
-
-		// process pane contents and callbacks, and init/resize child-layout if exists
-		if (s.isVisible) { // pane is OPEN
-			if (state.initialized) // this pane was added AFTER layout was created
-				resizeAll(); // will also sizeContent
-			else
-				sizeContent(pane);
-
-			if (o.triggerEventsOnLoad)
-				_runCallbacks("onresize_end", pane);
-			else // automatic if onresize called, otherwise call it specifically
-				// resize child - IF inner-layout already exists (created before this layout)
-				resizeChildren(pane, true); // a previously existing childLayout
-		}
-
-		// init childLayouts - even if pane is not visible
-		if (o.initChildren && o.children)
-			createChildren(pane);
-	}
-
-	/**
-	 * @param {string=}	panes		The pane(s) to process
-	 */
-,	setPanePosition = function (panes) {
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		// create toggler DIVs for each pane, and set object pointers for them, eg: $R.north = north toggler DIV
-		$.each(panes, function (i, pane) {
-			var $P	= $Ps[pane]
-			,	$R	= $Rs[pane]
-			,	o	= options[pane]
-			,	s	= state[pane]
-			,	side =  _c[pane].side
-			,	CSS	= {}
-			;
-			if (!$P) return; // pane does not exist - skip
-
-			// set css-position to account for container borders & padding
-			switch (pane) {
-				case "north": 	CSS.top 	= sC.inset.top;
-								CSS.left 	= sC.inset.left;
-								CSS.right	= sC.inset.right;
-								break;
-				case "south": 	CSS.bottom	= sC.inset.bottom;
-								CSS.left 	= sC.inset.left;
-								CSS.right 	= sC.inset.right;
-								break;
-				case "west": 	CSS.left 	= sC.inset.left; // top, bottom & height set by sizeMidPanes()
-								break;
-				case "east": 	CSS.right 	= sC.inset.right; // ditto
-								break;
-				case "center":	// top, left, width & height set by sizeMidPanes()
-			}
-			// apply position
-			$P.css(CSS); 
-
-			// update resizer position
-			if ($R && s.isClosed)
-				$R.css(side, sC.inset[side]);
-			else if ($R && !s.isHidden)
-				$R.css(side, sC.inset[side] + getPaneSize(pane));
-		});
-	}
-
-	/**
-	 * Initialize module objects, styling, size and position for all resize bars and toggler buttons
-	 *
-	 * @see  _create()
-	 * @param {string=}	[panes=""]	The edge(s) to process
-	 */
-,	initHandles = function (panes) {
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		// create toggler DIVs for each pane, and set object pointers for them, eg: $R.north = north toggler DIV
-		$.each(panes, function (i, pane) {
-			var $P		= $Ps[pane];
-			$Rs[pane]	= false; // INIT
-			$Ts[pane]	= false;
-			if (!$P) return; // pane does not exist - skip
-
-			var	o		= options[pane]
-			,	s		= state[pane]
-			,	c		= _c[pane]
-			,	paneId	= o.paneSelector.substr(0,1) === "#" ? o.paneSelector.substr(1) : ""
-			,	rClass	= o.resizerClass
-			,	tClass	= o.togglerClass
-			,	spacing	= (s.isVisible ? o.spacing_open : o.spacing_closed)
-			,	_pane	= "-"+ pane // used for classNames
-			,	_state	= (s.isVisible ? "-open" : "-closed") // used for classNames
-			,	I		= Instance[pane]
-				// INIT RESIZER BAR
-			,	$R		= I.resizer = $Rs[pane] = $("<div></div>")
-				// INIT TOGGLER BUTTON
-			,	$T		= I.toggler = (o.closable ? $Ts[pane] = $("<div></div>") : false)
-			;
-
-			//if (s.isVisible && o.resizable) ... handled by initResizable
-			if (!s.isVisible && o.slidable)
-				$R.attr("title", o.tips.Slide).css("cursor", o.sliderCursor);
-
-			$R	// if paneSelector is an ID, then create a matching ID for the resizer, eg: "#paneLeft" => "paneLeft-resizer"
-				.attr("id", paneId ? paneId +"-resizer" : "" )
-				.data({
-					parentLayout:	Instance
-				,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-				,	layoutEdge:		pane
-				,	layoutRole:		"resizer"
-				})
-				.css(_c.resizers.cssReq).css("zIndex", options.zIndexes.resizer_normal)
-				.css(o.applyDemoStyles ? _c.resizers.cssDemo : {}) // add demo styles
-				.addClass(rClass +" "+ rClass+_pane)
-				.hover(addHover, removeHover) // ALWAYS add hover-classes, even if resizing is not enabled - handle with CSS instead
-				.hover(onResizerEnter, onResizerLeave) // ALWAYS NEED resizer.mouseleave to balance toggler.mouseenter
-				.mousedown($.layout.disableTextSelection)	// prevent text-selection OUTSIDE resizer
-				.mouseup($.layout.enableTextSelection)		// not really necessary, but just in case
-				.appendTo($N) // append DIV to container
-			;
-			if ($.fn.disableSelection)
-				$R.disableSelection(); // prevent text-selection INSIDE resizer
-			if (o.resizerDblClickToggle)
-				$R.bind("dblclick."+ sID, toggle );
-
-			if ($T) {
-				$T	// if paneSelector is an ID, then create a matching ID for the resizer, eg: "#paneLeft" => "#paneLeft-toggler"
-					.attr("id", paneId ? paneId +"-toggler" : "" )
-					.data({
-						parentLayout:	Instance
-					,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-					,	layoutEdge:		pane
-					,	layoutRole:		"toggler"
-					})
-					.css(_c.togglers.cssReq) // add base/required styles
-					.css(o.applyDemoStyles ? _c.togglers.cssDemo : {}) // add demo styles
-					.addClass(tClass +" "+ tClass+_pane)
-					.hover(addHover, removeHover) // ALWAYS add hover-classes, even if toggling is not enabled - handle with CSS instead
-					.bind("mouseenter", onResizerEnter) // NEED toggler.mouseenter because mouseenter MAY NOT fire on resizer
-					.appendTo($R) // append SPAN to resizer DIV
-				;
-				// ADD INNER-SPANS TO TOGGLER
-				if (o.togglerContent_open) // ui-layout-open
-					$("<span>"+ o.togglerContent_open +"</span>")
-						.data({
-							layoutEdge:		pane
-						,	layoutRole:		"togglerContent"
-						})
-						.data("layoutRole", "togglerContent")
-						.data("layoutEdge", pane)
-						.addClass("content content-open")
-						.css("display","none")
-						.appendTo( $T )
-						//.hover( addHover, removeHover ) // use ui-layout-toggler-west-hover .content-open instead!
-					;
-				if (o.togglerContent_closed) // ui-layout-closed
-					$("<span>"+ o.togglerContent_closed +"</span>")
-						.data({
-							layoutEdge:		pane
-						,	layoutRole:		"togglerContent"
-						})
-						.addClass("content content-closed")
-						.css("display","none")
-						.appendTo( $T )
-						//.hover( addHover, removeHover ) // use ui-layout-toggler-west-hover .content-closed instead!
-					;
-				// ADD TOGGLER.click/.hover
-				enableClosable(pane);
-			}
-
-			// add Draggable events
-			initResizable(pane);
-
-			// ADD CLASSNAMES & SLIDE-BINDINGS - eg: class="resizer resizer-west resizer-open"
-			if (s.isVisible)
-				setAsOpen(pane);	// onOpen will be called, but NOT onResize
-			else {
-				setAsClosed(pane);	// onClose will be called
-				bindStartSlidingEvents(pane, true); // will enable events IF option is set
-			}
-
-		});
-
-		// SET ALL HANDLE DIMENSIONS
-		sizeHandles();
-	}
-
-
-	/**
-	 * Initialize scrolling ui-layout-content div - if exists
-	 *
-	 * @see  initPane() - or externally after an Ajax injection
-	 * @param {string}	pane			The pane to process
-	 * @param {boolean=}	[resize=true]	Size content after init
-	 */
-,	initContent = function (pane, resize) {
-		if (!isInitialized()) return;
-		var 
-			o	= options[pane]
-		,	sel	= o.contentSelector
-		,	I	= Instance[pane]
-		,	$P	= $Ps[pane]
-		,	$C
-		;
-		if (sel) $C = I.content = $Cs[pane] = (o.findNestedContent)
-			? $P.find(sel).eq(0) // match 1-element only
-			: $P.children(sel).eq(0)
-		;
-		if ($C && $C.length) {
-			$C.data("layoutRole", "content");
-			// SAVE original Content CSS
-			if (!$C.data("layoutCSS"))
-				$C.data("layoutCSS", styles($C, "height"));
-			$C.css( _c.content.cssReq );
-			if (o.applyDemoStyles) {
-				$C.css( _c.content.cssDemo ); // add padding & overflow: auto to content-div
-				$P.css( _c.content.cssDemoPane ); // REMOVE padding/scrolling from pane
-			}
-			// ensure no vertical scrollbar on pane - will mess up measurements
-			if ($P.css("overflowX").match(/(scroll|auto)/)) {
-				$P.css("overflow", "hidden");
-			}
-			state[pane].content = {}; // init content state
-			if (resize !== false) sizeContent(pane);
-			// sizeContent() is called AFTER init of all elements
-		}
-		else
-			I.content = $Cs[pane] = false;
-	}
-
-
-	/**
-	 * Add resize-bars to all panes that specify it in options
-	 * -dependancy: $.fn.resizable - will skip if not found
-	 *
-	 * @see  _create()
-	 * @param {string=}	[panes=""]	The edge(s) to process
-	 */
-,	initResizable = function (panes) {
-		var	draggingAvailable = $.layout.plugins.draggable
-		,	side // set in start()
-		;
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		$.each(panes, function (idx, pane) {
-			var o = options[pane];
-			if (!draggingAvailable || !$Ps[pane] || !o.resizable) {
-				o.resizable = false;
-				return true; // skip to next
-			}
-
-			var s		= state[pane]
-			,	z		= options.zIndexes
-			,	c		= _c[pane]
-			,	side	= c.dir=="horz" ? "top" : "left"
-			,	$P 		= $Ps[pane]
-			,	$R		= $Rs[pane]
-			,	base	= o.resizerClass
-			,	lastPos	= 0 // used when live-resizing
-			,	r, live // set in start because may change
-			//	'drag' classes are applied to the ORIGINAL resizer-bar while dragging is in process
-			,	resizerClass		= base+"-drag"				// resizer-drag
-			,	resizerPaneClass	= base+"-"+pane+"-drag"		// resizer-north-drag
-			//	'helper' class is applied to the CLONED resizer-bar while it is being dragged
-			,	helperClass			= base+"-dragging"			// resizer-dragging
-			,	helperPaneClass		= base+"-"+pane+"-dragging" // resizer-north-dragging
-			,	helperLimitClass	= base+"-dragging-limit"	// resizer-drag
-			,	helperPaneLimitClass = base+"-"+pane+"-dragging-limit"	// resizer-north-drag
-			,	helperClassesSet	= false 					// logic var
-			;
-
-			if (!s.isClosed)
-				$R.attr("title", o.tips.Resize)
-				  .css("cursor", o.resizerCursor); // n-resize, s-resize, etc
-
-			$R.draggable({
-				containment:	$N[0] // limit resizing to layout container
-			,	axis:			(c.dir=="horz" ? "y" : "x") // limit resizing to horz or vert axis
-			,	delay:			0
-			,	distance:		1
-			,	grid:			o.resizingGrid
-			//	basic format for helper - style it using class: .ui-draggable-dragging
-			,	helper:			"clone"
-			,	opacity:		o.resizerDragOpacity
-			,	addClasses:		false // avoid ui-state-disabled class when disabled
-			//,	iframeFix:		o.draggableIframeFix // TODO: consider using when bug is fixed
-			,	zIndex:			z.resizer_drag
-
-			,	start: function (e, ui) {
-					// REFRESH options & state pointers in case we used swapPanes
-					o = options[pane];
-					s = state[pane];
-					// re-read options
-					live = o.livePaneResizing;
-
-					// ondrag_start callback - will CANCEL hide if returns false
-					// TODO: dragging CANNOT be cancelled like this, so see if there is a way?
-					if (false === _runCallbacks("ondrag_start", pane)) return false;
-
-					s.isResizing		= true; // prevent pane from closing while resizing
-					state.paneResizing	= pane; // easy to see if ANY pane is resizing
-					timer.clear(pane+"_closeSlider"); // just in case already triggered
-
-					// SET RESIZER LIMITS - used in drag()
-					setSizeLimits(pane); // update pane/resizer state
-					r = s.resizerPosition;
-					lastPos = ui.position[ side ]
-
-					$R.addClass( resizerClass +" "+ resizerPaneClass ); // add drag classes
-					helperClassesSet = false; // reset logic var - see drag()
-
-					// MASK PANES CONTAINING IFRAMES, APPLETS OR OTHER TROUBLESOME ELEMENTS
-					showMasks( pane, { resizing: true });
-				}
-
-			,	drag: function (e, ui) {
-					if (!helperClassesSet) { // can only add classes after clone has been added to the DOM
-						//$(".ui-draggable-dragging")
-						ui.helper
-							.addClass( helperClass +" "+ helperPaneClass ) // add helper classes
-							.css({ right: "auto", bottom: "auto" })	// fix dir="rtl" issue
-							.children().css("visibility","hidden")	// hide toggler inside dragged resizer-bar
-						;
-						helperClassesSet = true;
-						// draggable bug!? RE-SET zIndex to prevent E/W resize-bar showing through N/S pane!
-						if (s.isSliding) $Ps[pane].css("zIndex", z.pane_sliding);
-					}
-					// CONTAIN RESIZER-BAR TO RESIZING LIMITS
-					var limit = 0;
-					if (ui.position[side] < r.min) {
-						ui.position[side] = r.min;
-						limit = -1;
-					}
-					else if (ui.position[side] > r.max) {
-						ui.position[side] = r.max;
-						limit = 1;
-					}
-					// ADD/REMOVE dragging-limit CLASS
-					if (limit) {
-						ui.helper.addClass( helperLimitClass +" "+ helperPaneLimitClass ); // at dragging-limit
-						window.defaultStatus = (limit>0 && pane.match(/(north|west)/)) || (limit<0 && pane.match(/(south|east)/)) ? o.tips.maxSizeWarning : o.tips.minSizeWarning;
-					}
-					else {
-						ui.helper.removeClass( helperLimitClass +" "+ helperPaneLimitClass ); // not at dragging-limit
-						window.defaultStatus = "";
-					}
-					// DYNAMICALLY RESIZE PANES IF OPTION ENABLED
-					// won't trigger unless resizer has actually moved!
-					if (live && Math.abs(ui.position[side] - lastPos) >= o.liveResizingTolerance) {
-						lastPos = ui.position[side];
-						resizePanes(e, ui, pane)
-					}
-				}
-
-			,	stop: function (e, ui) {
-					$('body').enableSelection(); // RE-ENABLE TEXT SELECTION
-					window.defaultStatus = ""; // clear 'resizing limit' message from statusbar
-					$R.removeClass( resizerClass +" "+ resizerPaneClass ); // remove drag classes from Resizer
-					s.isResizing		= false;
-					state.paneResizing	= false; // easy to see if ANY pane is resizing
-					resizePanes(e, ui, pane, true); // true = resizingDone
-				}
-
-			});
-		});
-
-		/**
-		 * resizePanes
-		 *
-		 * Sub-routine called from stop() - and drag() if livePaneResizing
-		 *
-		 * @param {!Object}		evt
-		 * @param {!Object}		ui
-		 * @param {string}		pane
-		 * @param {boolean=}		[resizingDone=false]
-		 */
-		var resizePanes = function (evt, ui, pane, resizingDone) {
-			var	dragPos	= ui.position
-			,	c		= _c[pane]
-			,	o		= options[pane]
-			,	s		= state[pane]
-			,	resizerPos
-			;
-			switch (pane) {
-				case "north":	resizerPos = dragPos.top; break;
-				case "west":	resizerPos = dragPos.left; break;
-				case "south":	resizerPos = sC.layoutHeight - dragPos.top  - o.spacing_open; break;
-				case "east":	resizerPos = sC.layoutWidth  - dragPos.left - o.spacing_open; break;
-			};
-			// remove container margin from resizer position to get the pane size
-			var newSize = resizerPos - sC.inset[c.side];
-
-			// Disable OR Resize Mask(s) created in drag.start
-			if (!resizingDone) {
-				// ensure we meet liveResizingTolerance criteria
-				if (Math.abs(newSize - s.size) < o.liveResizingTolerance)
-					return; // SKIP resize this time
-				// resize the pane
-				manualSizePane(pane, newSize, false, true); // true = noAnimation
-				sizeMasks(); // resize all visible masks
-			}
-			else { // resizingDone
-				// ondrag_end callback
-				if (false !== _runCallbacks("ondrag_end", pane))
-					manualSizePane(pane, newSize, false, true); // true = noAnimation
-				hideMasks(true); // true = force hiding all masks even if one is 'sliding'
-				if (s.isSliding) // RE-SHOW 'object-masks' so objects won't show through sliding pane
-					showMasks( pane, { resizing: true });
-			}
-		};
-	}
-
-	/**
-	 *	sizeMask
-	 *
-	 *	Needed to overlay a DIV over an IFRAME-pane because mask CANNOT be *inside* the pane
-	 *	Called when mask created, and during livePaneResizing
-	 */
-,	sizeMask = function () {
-		var $M		= $(this)
-		,	pane	= $M.data("layoutMask") // eg: "west"
-		,	s		= state[pane]
-		;
-		// only masks over an IFRAME-pane need manual resizing
-		if (s.tagName == "IFRAME" && s.isVisible) // no need to mask closed/hidden panes
-			$M.css({
-				top:	s.offsetTop
-			,	left:	s.offsetLeft
-			,	width:	s.outerWidth
-			,	height:	s.outerHeight
-			});
-		/* ALT Method...
-		var $P = $Ps[pane];
-		$M.css( $P.position() ).css({ width: $P[0].offsetWidth, height: $P[0].offsetHeight });
-		*/
-	}
-,	sizeMasks = function () {
-		$Ms.each( sizeMask ); // resize all 'visible' masks
-	}
-
-	/**
-	 * @param {string}	pane		The pane being resized, animated or isSliding
-	 * @param {Object=}	[args]		(optional) Options: which masks to apply, and to which panes
-	 */
-,	showMasks = function (pane, args) {
-		var	c		= _c[pane]
-		,	panes	=  ["center"]
-		,	z		= options.zIndexes
-		,	a		= $.extend({
-						objectsOnly:	false
-					,	animation:		false
-					,	resizing:		true
-					,	sliding:		state[pane].isSliding
-					},	args )
-		,	o, s
-		;
-		if (a.resizing)
-			panes.push( pane );
-		if (a.sliding)
-			panes.push( _c.oppositeEdge[pane] ); // ADD the oppositeEdge-pane
-
-		if (c.dir === "horz") {
-			panes.push("west");
-			panes.push("east");
-		}
-
-		$.each(panes, function(i,p){
-			s = state[p];
-			o = options[p];
-			if (s.isVisible && ( o.maskObjects || (!a.objectsOnly && o.maskContents) )) {
-				getMasks(p).each(function(){
-					sizeMask.call(this);
-					this.style.zIndex = s.isSliding ? z.pane_sliding+1 : z.pane_normal+1
-					this.style.display = "block";
-				});
-			}
-		});
-	}
-
-	/**
-	 * @param {boolean=}	force		Hide masks even if a pane is sliding
-	 */
-,	hideMasks = function (force) {
-		// ensure no pane is resizing - could be a timing issue
-		if (force || !state.paneResizing) {
-			$Ms.hide(); // hide ALL masks
-		}
-		// if ANY pane is sliding, then DO NOT remove masks from panes with maskObjects enabled
-		else if (!force && !$.isEmptyObject( state.panesSliding )) {
-			var	i = $Ms.length - 1
-			,	p, $M;
-			for (; i >= 0; i--) {
-				$M	= $Ms.eq(i);
-				p	= $M.data("layoutMask");
-				if (!options[p].maskObjects) {
-					$M.hide();
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param {string}	pane
-	 */
-,	getMasks = function (pane) {
-		var $Masks	= $([])
-		,	$M, i = 0, c = $Ms.length
-		;
-		for (; i<c; i++) {
-			$M = $Ms.eq(i);
-			if ($M.data("layoutMask") === pane)
-				$Masks = $Masks.add( $M );
-		}
-		if ($Masks.length)
-			return $Masks;
-		else
-			return createMasks(pane);
-	}
-
-	/**
-	 * createMasks
-	 *
-	 * Generates both DIV (ALWAYS used) and IFRAME (optional) elements as masks
-	 * An IFRAME mask is created *under* the DIV when maskObjects=true, because a DIV cannot mask an applet
-	 *
-	 * @param {string}	pane
-	 */
-,	createMasks = function (pane) {
-		var
-			$P	= $Ps[pane]
-		,	s	= state[pane]
-		,	o	= options[pane]
-		,	z	= options.zIndexes
-		,	isIframe, el, $M, css, i
-		;
-		if (!o.maskContents && !o.maskObjects) return $([]);
-		// if o.maskObjects=true, then loop TWICE to create BOTH kinds of mask, else only create a DIV
-		for (i=0; i < (o.maskObjects ? 2 : 1); i++) {
-			isIframe = o.maskObjects && i==0;
-			el = document.createElement( isIframe ? "iframe" : "div" );
-			$M = $(el).data("layoutMask", pane); // add data to relate mask to pane
-			el.className = "ui-layout-mask ui-layout-mask-"+ pane; // for user styling
-			css = el.style;
-			// Both DIVs and IFRAMES
-			css.background	= "#FFF";
-			css.position	= "absolute";
-			css.display		= "block";
-			if (isIframe) { // IFRAME-only props
-				el.src		= "about:blank";
-				el.frameborder = 0;
-				css.border	= 0;
-				css.opacity	= 0;
-				css.filter	= "Alpha(Opacity='0')";
-				//el.allowTransparency = true; - for IE, but breaks masking ability!
-			}
-			else { // DIV-only props
-				css.opacity	= 0.001;
-				css.filter	= "Alpha(Opacity='1')";
-			}
-			// if pane IS an IFRAME, then must mask the pane itself
-			if (s.tagName == "IFRAME") {
-				// NOTE sizing done by a subroutine so can be called during live-resizing
-				css.zIndex	= z.pane_normal+1; // 1-higher than pane
-				$N.append( el ); // append to LAYOUT CONTAINER
-			}
-			// otherwise put masks *inside the pane* to mask its contents
-			else {
-				$M.addClass("ui-layout-mask-inside-pane");
-				css.zIndex	= o.maskZindex || z.content_mask; // usually 1, but customizable
-				css.top		= 0;
-				css.left	= 0;
-				css.width	= "100%";
-				css.height	= "100%";
-				$P.append( el ); // append INSIDE pane element
-			}
-			// add Mask to cached array so can be resized & reused
-			$Ms = $Ms.add( el );
-		}
-		return $Ms;
-	}
-
-
-	/**
-	 * Destroy this layout and reset all elements
-	 *
-	 * @param {boolean=}	[destroyChildren=false]		Destory Child-Layouts first?
-	 */
-,	destroy = function (evt_or_destroyChildren, destroyChildren) {
-		// UNBIND layout events and remove global object
-		$(window).unbind("."+ sID);		// resize & unload
-		$(document).unbind("."+ sID);	// keyDown (hotkeys)
-
-		if (typeof evt_or_destroyChildren === "object")
-			// stopPropagation if called by trigger("layoutdestroy") - use evtPane utility 
-			evtPane(evt_or_destroyChildren);
-		else // no event, so transfer 1st param to destroyChildren param
-			destroyChildren = evt_or_destroyChildren;
-
-		// need to look for parent layout BEFORE we remove the container data, else skips a level
-		//var parentPane = Instance.hasParentLayout ? $.layout.getParentPaneInstance( $N ) : null;
-
-		// reset layout-container
-		$N	.clearQueue()
-			.removeData("layout")
-			.removeData("layoutContainer")
-			.removeClass(options.containerClass)
-			.unbind("."+ sID) // remove ALL Layout events
-		;
-
-		// remove all mask elements that have been created
-		$Ms.remove();
-
-		// loop all panes to remove layout classes, attributes and bindings
-		$.each(_c.allPanes, function (i, pane) {
-			removePane( pane, false, true, destroyChildren ); // true = skipResize
-		});
-
-		// do NOT reset container CSS if is a 'pane' (or 'content') in an outer-layout - ie, THIS layout is 'nested'
-		var css = "layoutCSS";
-		if ($N.data(css) && !$N.data("layoutRole")) // RESET CSS
-			$N.css( $N.data(css) ).removeData(css);
-
-		// for full-page layouts, also reset the <HTML> CSS
-		if (sC.tagName === "BODY" && ($N = $("html")).data(css)) // RESET <HTML> CSS
-			$N.css( $N.data(css) ).removeData(css);
-
-		// trigger plugins for this layout, if there are any
-		runPluginCallbacks( Instance, $.layout.onDestroy );
-
-		// trigger state-management and onunload callback
-		unload();
-
-		// clear the Instance of everything except for container & options (so could recreate)
-		// RE-CREATE: myLayout = myLayout.container.layout( myLayout.options );
-		for (var n in Instance)
-			if (!n.match(/^(container|options)$/)) delete Instance[ n ];
-		// add a 'destroyed' flag to make it easy to check
-		Instance.destroyed = true;
-
-		// if this is a child layout, CLEAR the child-pointer in the parent
-		/* for now the pointer REMAINS, but with only container, options and destroyed keys
-		if (parentPane) {
-			var layout	= parentPane.pane.data("parentLayout")
-			,	key		= layout.options.instanceKey || 'error';
-			// THIS SYNTAX MAY BE WRONG!
-			parentPane.children[key] = layout.children[ parentPane.name ].children[key] = null;
-		}
-		*/
-
-		return Instance; // for coding convenience
-	}
-
-	/**
-	 * Remove a pane from the layout - subroutine of destroy()
-	 *
-	 * @see  destroy()
-	 * @param {(string|Object)}	evt_or_pane			The pane to process
-	 * @param {boolean=}			[remove=false]		Remove the DOM element?
-	 * @param {boolean=}			[skipResize=false]	Skip calling resizeAll()?
-	 * @param {boolean=}			[destroyChild=true]	Destroy Child-layouts? If not passed, obeys options setting
-	 */
-,	removePane = function (evt_or_pane, remove, skipResize, destroyChild) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$P	= $Ps[pane]
-		,	$C	= $Cs[pane]
-		,	$R	= $Rs[pane]
-		,	$T	= $Ts[pane]
-		;
-		// NOTE: elements can still exist even after remove()
-		//		so check for missing data(), which is cleared by removed()
-		if ($P && $.isEmptyObject( $P.data() )) $P = false;
-		if ($C && $.isEmptyObject( $C.data() )) $C = false;
-		if ($R && $.isEmptyObject( $R.data() )) $R = false;
-		if ($T && $.isEmptyObject( $T.data() )) $T = false;
-
-		if ($P) $P.stop(true, true);
-
-		var	o	= options[pane]
-		,	s	= state[pane]
-		,	d	= "layout"
-		,	css	= "layoutCSS"
-		,	pC	= children[pane]
-		,	hasChildren	= $.isPlainObject( pC ) && !$.isEmptyObject( pC )
-		,	destroy		= destroyChild !== undefined ? destroyChild : o.destroyChildren
-		;
-		// FIRST destroy the child-layout(s)
-		if (hasChildren && destroy) {
-			$.each( pC, function (key, child) {
-				if (!child.destroyed)
-					child.destroy(true);// tell child-layout to destroy ALL its child-layouts too
-				if (child.destroyed)	// destroy was successful
-					delete pC[key];
-			});
-			// if no more children, remove the children hash
-			if ($.isEmptyObject( pC )) {
-				pC = children[pane] = null; // clear children hash
-				hasChildren = false;
-			}
-		}
-
-		// Note: can't 'remove' a pane element with non-destroyed children
-		if ($P && remove && !hasChildren)
-			$P.remove(); // remove the pane-element and everything inside it
-		else if ($P && $P[0]) {
-			//	create list of ALL pane-classes that need to be removed
-			var	root	= o.paneClass // default="ui-layout-pane"
-			,	pRoot	= root +"-"+ pane // eg: "ui-layout-pane-west"
-			,	_open	= "-open"
-			,	_sliding= "-sliding"
-			,	_closed	= "-closed"
-			,	classes	= [	root, root+_open, root+_closed, root+_sliding,		// generic classes
-							pRoot, pRoot+_open, pRoot+_closed, pRoot+_sliding ]	// pane-specific classes
-			;
-			$.merge(classes, getHoverClasses($P, true)); // ADD hover-classes
-			// remove all Layout classes from pane-element
-			$P	.removeClass( classes.join(" ") ) // remove ALL pane-classes
-				.removeData("parentLayout")
-				.removeData("layoutPane")
-				.removeData("layoutRole")
-				.removeData("layoutEdge")
-				.removeData("autoHidden")	// in case set
-				.unbind("."+ sID) // remove ALL Layout events
-				// TODO: remove these extra unbind commands when jQuery is fixed
-				//.unbind("mouseenter"+ sID)
-				//.unbind("mouseleave"+ sID)
-			;
-			// do NOT reset CSS if this pane/content is STILL the container of a nested layout!
-			// the nested layout will reset its 'container' CSS when/if it is destroyed
-			if (hasChildren && $C) {
-				// a content-div may not have a specific width, so give it one to contain the Layout
-				$C.width( $C.width() );
-				$.each( pC, function (key, child) {
-					child.resizeAll(); // resize the Layout
-				});
-			}
-			else if ($C)
-				$C.css( $C.data(css) ).removeData(css).removeData("layoutRole");
-			// remove pane AFTER content in case there was a nested layout
-			if (!$P.data(d))
-				$P.css( $P.data(css) ).removeData(css);
-		}
-
-		// REMOVE pane resizer and toggler elements
-		if ($T) $T.remove();
-		if ($R) $R.remove();
-
-		// CLEAR all pointers and state data
-		Instance[pane] = $Ps[pane] = $Cs[pane] = $Rs[pane] = $Ts[pane] = false;
-		s = { removed: true };
-
-		if (!skipResize)
-			resizeAll();
-	}
-
-
-/*
- * ###########################
- *	   ACTION METHODS
- * ###########################
- */
-
-	/**
-	 * @param {string}	pane
-	 */
-,	_hidePane = function (pane) {
-		var $P	= $Ps[pane]
-		,	o	= options[pane]
-		,	s	= $P[0].style
-		;
-		if (o.useOffscreenClose) {
-			if (!$P.data(_c.offscreenReset))
-				$P.data(_c.offscreenReset, { left: s.left, right: s.right });
-			$P.css( _c.offscreenCSS );
-		}
-		else
-			$P.hide().removeData(_c.offscreenReset);
-	}
-
-	/**
-	 * @param {string}	pane
-	 */
-,	_showPane = function (pane) {
-		var $P	= $Ps[pane]
-		,	o	= options[pane]
-		,	off	= _c.offscreenCSS
-		,	old	= $P.data(_c.offscreenReset)
-		,	s	= $P[0].style
-		;
-		$P	.show() // ALWAYS show, just in case
-			.removeData(_c.offscreenReset);
-		if (o.useOffscreenClose && old) {
-			if (s.left == off.left)
-				s.left = old.left;
-			if (s.right == off.right)
-				s.right = old.right;
-		}
-	}
-
-
-	/**
-	 * Completely 'hides' a pane, including its spacing - as if it does not exist
-	 * The pane is not actually 'removed' from the source, so can use 'show' to un-hide it
-	 *
-	 * @param {(string|Object)}	evt_or_pane			The pane being hidden, ie: north, south, east, or west
-	 * @param {boolean=}			[noAnimation=false]	
-	 */
-,	hide = function (evt_or_pane, noAnimation) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		;
-		if (pane === "center" || !$P || s.isHidden) return; // pane does not exist OR is already hidden
-
-		// onhide_start callback - will CANCEL hide if returns false
-		if (state.initialized && false === _runCallbacks("onhide_start", pane)) return;
-
-		s.isSliding = false; // just in case
-		delete state.panesSliding[pane];
-
-		// now hide the elements
-		if ($R) $R.hide(); // hide resizer-bar
-		if (!state.initialized || s.isClosed) {
-			s.isClosed = true; // to trigger open-animation on show()
-			s.isHidden  = true;
-			s.isVisible = false;
-			if (!state.initialized)
-				_hidePane(pane); // no animation when loading page
-			sizeMidPanes(_c[pane].dir === "horz" ? "" : "center");
-			if (state.initialized || o.triggerEventsOnLoad)
-				_runCallbacks("onhide_end", pane);
-		}
-		else {
-			s.isHiding = true; // used by onclose
-			close(pane, false, noAnimation); // adjust all panes to fit
-		}
-	}
-
-	/**
-	 * Show a hidden pane - show as 'closed' by default unless openPane = true
-	 *
-	 * @param {(string|Object)}	evt_or_pane			The pane being opened, ie: north, south, east, or west
-	 * @param {boolean=}			[openPane=false]
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[noAlert=false]
-	 */
-,	show = function (evt_or_pane, openPane, noAnimation, noAlert) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		;
-		if (pane === "center" || !$P || !s.isHidden) return; // pane does not exist OR is not hidden
-
-		// onshow_start callback - will CANCEL show if returns false
-		if (false === _runCallbacks("onshow_start", pane)) return;
-
-		s.isShowing = true; // used by onopen/onclose
-		//s.isHidden  = false; - will be set by open/close - if not cancelled
-		s.isSliding = false; // just in case
-		delete state.panesSliding[pane];
-
-		// now show the elements
-		//if ($R) $R.show(); - will be shown by open/close
-		if (openPane === false)
-			close(pane, true); // true = force
-		else
-			open(pane, false, noAnimation, noAlert); // adjust all panes to fit
-	}
-
-
-	/**
-	 * Toggles a pane open/closed by calling either open or close
-	 *
-	 * @param {(string|Object)}	evt_or_pane		The pane being toggled, ie: north, south, east, or west
-	 * @param {boolean=}			[slide=false]
-	 */
-,	toggle = function (evt_or_pane, slide) {
-		if (!isInitialized()) return;
-		var	evt		= evtObj(evt_or_pane)
-		,	pane	= evtPane.call(this, evt_or_pane)
-		,	s		= state[pane]
-		;
-		if (evt) // called from to $R.dblclick OR triggerPaneEvent
-			evt.stopImmediatePropagation();
-		if (s.isHidden)
-			show(pane); // will call 'open' after unhiding it
-		else if (s.isClosed)
-			open(pane, !!slide);
-		else
-			close(pane);
-	}
-
-
-	/**
-	 * Utility method used during init or other auto-processes
-	 *
-	 * @param {string}	pane   The pane being closed
-	 * @param {boolean=}	[setHandles=false]
-	 */
-,	_closePane = function (pane, setHandles) {
-		var
-			$P	= $Ps[pane]
-		,	s	= state[pane]
-		;
-		_hidePane(pane);
-		s.isClosed = true;
-		s.isVisible = false;
-		if (setHandles) setAsClosed(pane);
-	}
-
-	/**
-	 * Close the specified pane (animation optional), and resize all other panes as needed
-	 *
-	 * @param {(string|Object)}	evt_or_pane			The pane being closed, ie: north, south, east, or west
-	 * @param {boolean=}			[force=false]
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[skipCallback=false]
-	 */
-,	close = function (evt_or_pane, force, noAnimation, skipCallback) {
-		var	pane = evtPane.call(this, evt_or_pane);
-		if (pane === "center") return; // validate
-		// if pane has been initialized, but NOT the complete layout, close pane instantly
-		if (!state.initialized && $Ps[pane]) {
-			_closePane(pane, true); // INIT pane as closed
-			return;
-		}
-		if (!isInitialized()) return;
-
-		var
-			$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		,	$T	= $Ts[pane]
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	c	= _c[pane]
-		,	doFX, isShowing, isHiding, wasSliding;
-
-		// QUEUE in case another action/animation is in progress
-		$N.queue(function( queueNext ){
-
-			if ( !$P
-			||	(!o.closable && !s.isShowing && !s.isHiding)	// invalid request // (!o.resizable && !o.closable) ???
-			||	(!force && s.isClosed && !s.isShowing)			// already closed
-			) return queueNext();
-
-			// onclose_start callback - will CANCEL hide if returns false
-			// SKIP if just 'showing' a hidden pane as 'closed'
-			var abort = !s.isShowing && false === _runCallbacks("onclose_start", pane);
-
-			// transfer logic vars to temp vars
-			isShowing	= s.isShowing;
-			isHiding	= s.isHiding;
-			wasSliding	= s.isSliding;
-			// now clear the logic vars (REQUIRED before aborting)
-			delete s.isShowing;
-			delete s.isHiding;
-
-			if (abort) return queueNext();
-
-			doFX		= !noAnimation && !s.isClosed && (o.fxName_close != "none");
-			s.isMoving	= true;
-			s.isClosed	= true;
-			s.isVisible	= false;
-			// update isHidden BEFORE sizing panes
-			if (isHiding) s.isHidden = true;
-			else if (isShowing) s.isHidden = false;
-
-			if (s.isSliding) // pane is being closed, so UNBIND trigger events
-				bindStopSlidingEvents(pane, false); // will set isSliding=false
-			else // resize panes adjacent to this one
-				sizeMidPanes(_c[pane].dir === "horz" ? "" : "center", false); // false = NOT skipCallback
-
-			// if this pane has a resizer bar, move it NOW - before animation
-			setAsClosed(pane);
-
-			// CLOSE THE PANE
-			if (doFX) { // animate the close
-				lockPaneForFX(pane, true);	// need to set left/top so animation will work
-				$P.hide( o.fxName_close, o.fxSettings_close, o.fxSpeed_close, function () {
-					lockPaneForFX(pane, false); // undo
-					if (s.isClosed) close_2();
-					queueNext();
-				});
-			}
-			else { // hide the pane without animation
-				_hidePane(pane);
-				close_2();
-				queueNext();
-			};
-		});
-
-		// SUBROUTINE
-		function close_2 () {
-			s.isMoving	= false;
-			bindStartSlidingEvents(pane, true); // will enable if o.slidable = true
-
-			// if opposite-pane was autoClosed, see if it can be autoOpened now
-			var altPane = _c.oppositeEdge[pane];
-			if (state[ altPane ].noRoom) {
-				setSizeLimits( altPane );
-				makePaneFit( altPane );
-			}
-
-			if (!skipCallback && (state.initialized || o.triggerEventsOnLoad)) {
-				// onclose callback - UNLESS just 'showing' a hidden pane as 'closed'
-				if (!isShowing)	_runCallbacks("onclose_end", pane);
-				// onhide OR onshow callback
-				if (isShowing)	_runCallbacks("onshow_end", pane);
-				if (isHiding)	_runCallbacks("onhide_end", pane);
-			}
-		}
-	}
-
-	/**
-	 * @param {string}	pane	The pane just closed, ie: north, south, east, or west
-	 */
-,	setAsClosed = function (pane) {
-		if (!$Rs[pane]) return; // handles not initialized yet!
-		var
-			$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	$T		= $Ts[pane]
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	side	= _c[pane].side
-		,	rClass	= o.resizerClass
-		,	tClass	= o.togglerClass
-		,	_pane	= "-"+ pane // used for classNames
-		,	_open	= "-open"
-		,	_sliding= "-sliding"
-		,	_closed	= "-closed"
-		;
-		$R
-			.css(side, sC.inset[side]) // move the resizer
-			.removeClass( rClass+_open +" "+ rClass+_pane+_open )
-			.removeClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
-			.addClass( rClass+_closed +" "+ rClass+_pane+_closed )
-		;
-		// handle already-hidden panes in case called by swap() or a similar method 
-		if (s.isHidden) $R.hide(); // hide resizer-bar 
-
-		// DISABLE 'resizing' when closed - do this BEFORE bindStartSlidingEvents?
-		if (o.resizable && $.layout.plugins.draggable)
-			$R
-				.draggable("disable")
-				.removeClass("ui-state-disabled") // do NOT apply disabled styling - not suitable here
-				.css("cursor", "default")
-				.attr("title","")
-			;
-
-		// if pane has a toggler button, adjust that too
-		if ($T) {
-			$T
-				.removeClass( tClass+_open +" "+ tClass+_pane+_open )
-				.addClass( tClass+_closed +" "+ tClass+_pane+_closed )
-				.attr("title", o.tips.Open) // may be blank
-			;
-			// toggler-content - if exists
-			$T.children(".content-open").hide();
-			$T.children(".content-closed").css("display","block");
-		}
-
-		// sync any 'pin buttons'
-		syncPinBtns(pane, false);
-
-		if (state.initialized) {
-			// resize 'length' and position togglers for adjacent panes
-			sizeHandles();
-		}
-	}
-
-	/**
-	 * Open the specified pane (animation optional), and resize all other panes as needed
-	 *
-	 * @param {(string|Object)}	evt_or_pane			The pane being opened, ie: north, south, east, or west
-	 * @param {boolean=}			[slide=false]
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[noAlert=false]
-	 */
-,	open = function (evt_or_pane, slide, noAnimation, noAlert) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		,	$T	= $Ts[pane]
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	c	= _c[pane]
-		,	doFX, isShowing
-		;
-		if (pane === "center") return; // validate
-		// QUEUE in case another action/animation is in progress
-		$N.queue(function( queueNext ){
-
-			if ( !$P
-			||	(!o.resizable && !o.closable && !s.isShowing)	// invalid request
-			||	(s.isVisible && !s.isSliding)					// already open
-			) return queueNext();
-
-			// pane can ALSO be unhidden by just calling show(), so handle this scenario
-			if (s.isHidden && !s.isShowing) {
-				queueNext(); // call before show() because it needs the queue free
-				show(pane, true);
-				return;
-			}
-
-			if (s.autoResize && s.size != o.size) // resize pane to original size set in options
-				sizePane(pane, o.size, true, true, true); // true=skipCallback/noAnimation/forceResize
-			else
-				// make sure there is enough space available to open the pane
-				setSizeLimits(pane, slide);
-
-			// onopen_start callback - will CANCEL open if returns false
-			var cbReturn = _runCallbacks("onopen_start", pane);
-
-			if (cbReturn === "abort")
-				return queueNext();
-
-			// update pane-state again in case options were changed in onopen_start
-			if (cbReturn !== "NC") // NC = "No Callback"
-				setSizeLimits(pane, slide);
-
-			if (s.minSize > s.maxSize) { // INSUFFICIENT ROOM FOR PANE TO OPEN!
-				syncPinBtns(pane, false); // make sure pin-buttons are reset
-				if (!noAlert && o.tips.noRoomToOpen)
-					alert(o.tips.noRoomToOpen);
-				return queueNext(); // ABORT
-			}
-
-			if (slide) // START Sliding - will set isSliding=true
-				bindStopSlidingEvents(pane, true); // BIND trigger events to close sliding-pane
-			else if (s.isSliding) // PIN PANE (stop sliding) - open pane 'normally' instead
-				bindStopSlidingEvents(pane, false); // UNBIND trigger events - will set isSliding=false
-			else if (o.slidable)
-				bindStartSlidingEvents(pane, false); // UNBIND trigger events
-
-			s.noRoom = false; // will be reset by makePaneFit if 'noRoom'
-			makePaneFit(pane);
-
-			// transfer logic var to temp var
-			isShowing = s.isShowing;
-			// now clear the logic var
-			delete s.isShowing;
-
-			doFX		= !noAnimation && s.isClosed && (o.fxName_open != "none");
-			s.isMoving	= true;
-			s.isVisible	= true;
-			s.isClosed	= false;
-			// update isHidden BEFORE sizing panes - WHY??? Old?
-			if (isShowing) s.isHidden = false;
-
-			if (doFX) { // ANIMATE
-				// mask adjacent panes with objects
-				lockPaneForFX(pane, true);	// need to set left/top so animation will work
-					$P.show( o.fxName_open, o.fxSettings_open, o.fxSpeed_open, function() {
-					lockPaneForFX(pane, false); // undo
-					if (s.isVisible) open_2(); // continue
-					queueNext();
-				});
-			}
-			else { // no animation
-				_showPane(pane);// just show pane and...
-				open_2();		// continue
-				queueNext();
-			};
-		});
-
-		// SUBROUTINE
-		function open_2 () {
-			s.isMoving	= false;
-
-			// cure iframe display issues
-			_fixIframe(pane);
-
-			// NOTE: if isSliding, then other panes are NOT 'resized'
-			if (!s.isSliding) { // resize all panes adjacent to this one
-				sizeMidPanes(_c[pane].dir=="vert" ? "center" : "", false); // false = NOT skipCallback
-			}
-
-			// set classes, position handles and execute callbacks...
-			setAsOpen(pane);
-		};
-	
-	}
-
-	/**
-	 * @param {string}	pane		The pane just opened, ie: north, south, east, or west
-	 * @param {boolean=}	[skipCallback=false]
-	 */
-,	setAsOpen = function (pane, skipCallback) {
-		var 
-			$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	$T		= $Ts[pane]
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	side	= _c[pane].side
-		,	rClass	= o.resizerClass
-		,	tClass	= o.togglerClass
-		,	_pane	= "-"+ pane // used for classNames
-		,	_open	= "-open"
-		,	_closed	= "-closed"
-		,	_sliding= "-sliding"
-		;
-		$R
-			.css(side, sC.inset[side] + getPaneSize(pane)) // move the resizer
-			.removeClass( rClass+_closed +" "+ rClass+_pane+_closed )
-			.addClass( rClass+_open +" "+ rClass+_pane+_open )
-		;
-		if (s.isSliding)
-			$R.addClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
-		else // in case 'was sliding'
-			$R.removeClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
-
-		removeHover( 0, $R ); // remove hover classes
-		if (o.resizable && $.layout.plugins.draggable)
-			$R	.draggable("enable")
-				.css("cursor", o.resizerCursor)
-				.attr("title", o.tips.Resize);
-		else if (!s.isSliding)
-			$R.css("cursor", "default"); // n-resize, s-resize, etc
-
-		// if pane also has a toggler button, adjust that too
-		if ($T) {
-			$T	.removeClass( tClass+_closed +" "+ tClass+_pane+_closed )
-				.addClass( tClass+_open +" "+ tClass+_pane+_open )
-				.attr("title", o.tips.Close); // may be blank
-			removeHover( 0, $T ); // remove hover classes
-			// toggler-content - if exists
-			$T.children(".content-closed").hide();
-			$T.children(".content-open").css("display","block");
-		}
-
-		// sync any 'pin buttons'
-		syncPinBtns(pane, !s.isSliding);
-
-		// update pane-state dimensions - BEFORE resizing content
-		$.extend(s, elDims($P));
-
-		if (state.initialized) {
-			// resize resizer & toggler sizes for all panes
-			sizeHandles();
-			// resize content every time pane opens - to be sure
-			sizeContent(pane, true); // true = remeasure headers/footers, even if 'pane.isMoving'
-		}
-
-		if (!skipCallback && (state.initialized || o.triggerEventsOnLoad) && $P.is(":visible")) {
-			// onopen callback
-			_runCallbacks("onopen_end", pane);
-			// onshow callback - TODO: should this be here?
-			if (s.isShowing) _runCallbacks("onshow_end", pane);
-
-			// ALSO call onresize because layout-size *may* have changed while pane was closed
-			if (state.initialized)
-				_runCallbacks("onresize_end", pane);
-		}
-
-		// TODO: Somehow sizePane("north") is being called after this point???
-	}
-
-
-	/**
-	 * slideOpen / slideClose / slideToggle
-	 *
-	 * Pass-though methods for sliding
-	 */
-,	slideOpen = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	evt		= evtObj(evt_or_pane)
-		,	pane	= evtPane.call(this, evt_or_pane)
-		,	s		= state[pane]
-		,	delay	= options[pane].slideDelay_open
-		;
-		if (pane === "center") return; // validate
-		// prevent event from triggering on NEW resizer binding created below
-		if (evt) evt.stopImmediatePropagation();
-
-		if (s.isClosed && evt && evt.type === "mouseenter" && delay > 0)
-			// trigger = mouseenter - use a delay
-			timer.set(pane+"_openSlider", open_NOW, delay);
-		else
-			open_NOW(); // will unbind events if is already open
-
-		/**
-		 * SUBROUTINE for timed open
-		 */
-		function open_NOW () {
-			if (!s.isClosed) // skip if no longer closed!
-				bindStopSlidingEvents(pane, true); // BIND trigger events to close sliding-pane
-			else if (!s.isMoving)
-				open(pane, true); // true = slide - open() will handle binding
-		};
-	}
-
-,	slideClose = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	evt		= evtObj(evt_or_pane)
-		,	pane	= evtPane.call(this, evt_or_pane)
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	delay	= s.isMoving ? 1000 : 300 // MINIMUM delay - option may override
-		;
-		if (pane === "center") return; // validate
-		if (s.isClosed || s.isResizing)
-			return; // skip if already closed OR in process of resizing
-		else if (o.slideTrigger_close === "click")
-			close_NOW(); // close immediately onClick
-		else if (o.preventQuickSlideClose && s.isMoving)
-			return; // handle Chrome quick-close on slide-open
-		else if (o.preventPrematureSlideClose && evt && $.layout.isMouseOverElem(evt, $Ps[pane]))
-			return; // handle incorrect mouseleave trigger, like when over a SELECT-list in IE
-		else if (evt) // trigger = mouseleave - use a delay
-			// 1 sec delay if 'opening', else .3 sec
-			timer.set(pane+"_closeSlider", close_NOW, max(o.slideDelay_close, delay));
-		else // called programically
-			close_NOW();
-
-		/**
-		 * SUBROUTINE for timed close
-		 */
-		function close_NOW () {
-			if (s.isClosed) // skip 'close' if already closed!
-				bindStopSlidingEvents(pane, false); // UNBIND trigger events - TODO: is this needed here?
-			else if (!s.isMoving)
-				close(pane); // close will handle unbinding
-		};
-	}
-
-	/**
-	 * @param {(string|Object)}	evt_or_pane		The pane being opened, ie: north, south, east, or west
-	 */
-,	slideToggle = function (evt_or_pane) {
-		var pane = evtPane.call(this, evt_or_pane);
-		toggle(pane, true);
-	}
-
-
-	/**
-	 * Must set left/top on East/South panes so animation will work properly
-	 *
-	 * @param {string}	pane	The pane to lock, 'east' or 'south' - any other is ignored!
-	 * @param {boolean}	doLock  true = set left/top, false = remove
-	 */
-,	lockPaneForFX = function (pane, doLock) {
-		var $P	= $Ps[pane]
-		,	s	= state[pane]
-		,	o	= options[pane]
-		,	z	= options.zIndexes
-		;
-		if (doLock) {
-			showMasks( pane, { animation: true, objectsOnly: true });
-			$P.css({ zIndex: z.pane_animate }); // overlay all elements during animation
-			if (pane=="south")
-				$P.css({ top: sC.inset.top + sC.innerHeight - $P.outerHeight() });
-			else if (pane=="east")
-				$P.css({ left: sC.inset.left + sC.innerWidth - $P.outerWidth() });
-		}
-		else { // animation DONE - RESET CSS
-			hideMasks();
-			$P.css({ zIndex: (s.isSliding ? z.pane_sliding : z.pane_normal) });
-			if (pane=="south")
-				$P.css({ top: "auto" });
-			// if pane is positioned 'off-screen', then DO NOT screw with it!
-			else if (pane=="east" && !$P.css("left").match(/\-99999/))
-				$P.css({ left: "auto" });
-			// fix anti-aliasing in IE - only needed for animations that change opacity
-			if (browser.msie && o.fxOpacityFix && o.fxName_open != "slide" && $P.css("filter") && $P.css("opacity") == 1)
-				$P[0].style.removeAttribute('filter');
-		}
-	}
-
-
-	/**
-	 * Toggle sliding functionality of a specific pane on/off by adding removing 'slide open' trigger
-	 *
-	 * @see  open(), close()
-	 * @param {string}	pane	The pane to enable/disable, 'north', 'south', etc.
-	 * @param {boolean}	enable	Enable or Disable sliding?
-	 */
-,	bindStartSlidingEvents = function (pane, enable) {
-		var o		= options[pane]
-		,	$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	evtName	= o.slideTrigger_open.toLowerCase()
-		;
-		if (!$R || (enable && !o.slidable)) return;
-
-		// make sure we have a valid event
-		if (evtName.match(/mouseover/))
-			evtName = o.slideTrigger_open = "mouseenter";
-		else if (!evtName.match(/(click|dblclick|mouseenter)/)) 
-			evtName = o.slideTrigger_open = "click";
-
-		// must remove double-click-toggle when using dblclick-slide
-		if (o.resizerDblClickToggle && evtName.match(/click/)) {
-			$R[enable ? "unbind" : "bind"]('dblclick.'+ sID, toggle)
-		}
-
-		$R
-			// add or remove event
-			[enable ? "bind" : "unbind"](evtName +'.'+ sID, slideOpen)
-			// set the appropriate cursor & title/tip
-			.css("cursor", enable ? o.sliderCursor : "default")
-			.attr("title", enable ? o.tips.Slide : "")
-		;
-	}
-
-	/**
-	 * Add or remove 'mouseleave' events to 'slide close' when pane is 'sliding' open or closed
-	 * Also increases zIndex when pane is sliding open
-	 * See bindStartSlidingEvents for code to control 'slide open'
-	 *
-	 * @see  slideOpen(), slideClose()
-	 * @param {string}	pane	The pane to process, 'north', 'south', etc.
-	 * @param {boolean}	enable	Enable or Disable events?
-	 */
-,	bindStopSlidingEvents = function (pane, enable) {
-		var	o		= options[pane]
-		,	s		= state[pane]
-		,	c		= _c[pane]
-		,	z		= options.zIndexes
-		,	evtName	= o.slideTrigger_close.toLowerCase()
-		,	action	= (enable ? "bind" : "unbind")
-		,	$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		;
-		timer.clear(pane+"_closeSlider"); // just in case
-
-		if (enable) {
-			s.isSliding = true;
-			state.panesSliding[pane] = true;
-			// remove 'slideOpen' event from resizer
-			// ALSO will raise the zIndex of the pane & resizer
-			bindStartSlidingEvents(pane, false);
-		}
-		else {
-			s.isSliding = false;
-			delete state.panesSliding[pane];
-		}
-
-		// RE/SET zIndex - increases when pane is sliding-open, resets to normal when not
-		$P.css("zIndex", enable ? z.pane_sliding : z.pane_normal);
-		$R.css("zIndex", enable ? z.pane_sliding+2 : z.resizer_normal); // NOTE: mask = pane_sliding+1
-
-		// make sure we have a valid event
-		if (!evtName.match(/(click|mouseleave)/))
-			evtName = o.slideTrigger_close = "mouseleave"; // also catches 'mouseout'
-
-		// add/remove slide triggers
-		$R[action](evtName, slideClose); // base event on resize
-		// need extra events for mouseleave
-		if (evtName === "mouseleave") {
-			// also close on pane.mouseleave
-			$P[action]("mouseleave."+ sID, slideClose);
-			// cancel timer when mouse moves between 'pane' and 'resizer'
-			$R[action]("mouseenter."+ sID, cancelMouseOut);
-			$P[action]("mouseenter."+ sID, cancelMouseOut);
-		}
-
-		if (!enable)
-			timer.clear(pane+"_closeSlider");
-		else if (evtName === "click" && !o.resizable) {
-			// IF pane is not resizable (which already has a cursor and tip) 
-			// then set the a cursor & title/tip on resizer when sliding
-			$R.css("cursor", enable ? o.sliderCursor : "default");
-			$R.attr("title", enable ? o.tips.Close : ""); // use Toggler-tip, eg: "Close Pane"
-		}
-
-		// SUBROUTINE for mouseleave timer clearing
-		function cancelMouseOut (evt) {
-			timer.clear(pane+"_closeSlider");
-			evt.stopPropagation();
-		}
-	}
-
-
-	/**
-	 * Hides/closes a pane if there is insufficient room - reverses this when there is room again
-	 * MUST have already called setSizeLimits() before calling this method
-	 *
-	 * @param {string}	pane					The pane being resized
-	 * @param {boolean=}	[isOpening=false]		Called from onOpen?
-	 * @param {boolean=}	[skipCallback=false]	Should the onresize callback be run?
-	 * @param {boolean=}	[force=false]
-	 */
-,	makePaneFit = function (pane, isOpening, skipCallback, force) {
-		var	o	= options[pane]
-		,	s	= state[pane]
-		,	c	= _c[pane]
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		,	isSidePane 	= c.dir==="vert"
-		,	hasRoom		= false
-		;
-		// special handling for center & east/west panes
-		if (pane === "center" || (isSidePane && s.noVerticalRoom)) {
-			// see if there is enough room to display the pane
-			// ERROR: hasRoom = s.minHeight <= s.maxHeight && (isSidePane || s.minWidth <= s.maxWidth);
-			hasRoom = (s.maxHeight >= 0);
-			if (hasRoom && s.noRoom) { // previously hidden due to noRoom, so show now
-				_showPane(pane);
-				if ($R) $R.show();
-				s.isVisible = true;
-				s.noRoom = false;
-				if (isSidePane) s.noVerticalRoom = false;
-				_fixIframe(pane);
-			}
-			else if (!hasRoom && !s.noRoom) { // not currently hidden, so hide now
-				_hidePane(pane);
-				if ($R) $R.hide();
-				s.isVisible = false;
-				s.noRoom = true;
-			}
-		}
-
-		// see if there is enough room to fit the border-pane
-		if (pane === "center") {
-			// ignore center in this block
-		}
-		else if (s.minSize <= s.maxSize) { // pane CAN fit
-			hasRoom = true;
-			if (s.size > s.maxSize) // pane is too big - shrink it
-				sizePane(pane, s.maxSize, skipCallback, true, force); // true = noAnimation
-			else if (s.size < s.minSize) // pane is too small - enlarge it
-				sizePane(pane, s.minSize, skipCallback, true, force); // true = noAnimation
-			// need s.isVisible because new pseudoClose method keeps pane visible, but off-screen
-			else if ($R && s.isVisible && $P.is(":visible")) {
-				// make sure resizer-bar is positioned correctly
-				// handles situation where nested layout was 'hidden' when initialized
-				var	pos = s.size + sC.inset[c.side];
-				if ($.layout.cssNum( $R, c.side ) != pos) $R.css( c.side, pos );
-			}
-
-			// if was previously hidden due to noRoom, then RESET because NOW there is room
-			if (s.noRoom) {
-				// s.noRoom state will be set by open or show
-				if (s.wasOpen && o.closable) {
-					if (o.autoReopen)
-						open(pane, false, true, true); // true = noAnimation, true = noAlert
-					else // leave the pane closed, so just update state
-						s.noRoom = false;
-				}
-				else
-					show(pane, s.wasOpen, true, true); // true = noAnimation, true = noAlert
-			}
-		}
-		else { // !hasRoom - pane CANNOT fit
-			if (!s.noRoom) { // pane not set as noRoom yet, so hide or close it now...
-				s.noRoom = true; // update state
-				s.wasOpen = !s.isClosed && !s.isSliding;
-				if (s.isClosed){} // SKIP
-				else if (o.closable) // 'close' if possible
-					close(pane, true, true); // true = force, true = noAnimation
-				else // 'hide' pane if cannot just be closed
-					hide(pane, true); // true = noAnimation
-			}
-		}
-	}
-
-
-	/**
-	 * manualSizePane is an exposed flow-through method allowing extra code when pane is 'manually resized'
-	 *
-	 * @param {(string|Object)}	evt_or_pane				The pane being resized
-	 * @param {number}			size					The *desired* new size for this pane - will be validated
-	 * @param {boolean=}			[skipCallback=false]	Should the onresize callback be run?
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[force=false]			Force resizing even if does not seem necessary
-	 */
-,	manualSizePane = function (evt_or_pane, size, skipCallback, noAnimation, force) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	o	= options[pane]
-		,	s	= state[pane]
-		//	if resizing callbacks have been delayed and resizing is now DONE, force resizing to complete...
-		,	forceResize = force || (o.livePaneResizing && !s.isResizing)
-		;
-		if (pane === "center") return; // validate
-		// ANY call to manualSizePane disables autoResize - ie, percentage sizing
-		s.autoResize = false;
-		// flow-through...
-		sizePane(pane, size, skipCallback, noAnimation, forceResize); // will animate resize if option enabled
-	}
-
-	/**
-	 * sizePane is called only by internal methods whenever a pane needs to be resized
-	 *
-	 * @param {(string|Object)}	evt_or_pane				The pane being resized
-	 * @param {number}			size					The *desired* new size for this pane - will be validated
-	 * @param {boolean=}			[skipCallback=false]	Should the onresize callback be run?
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[force=false]			Force resizing even if does not seem necessary
-	 */
-,	sizePane = function (evt_or_pane, size, skipCallback, noAnimation, force) {
-		if (!isInitialized()) return;
-		var	pane	= evtPane.call(this, evt_or_pane) // probably NEVER called from event?
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	side	= _c[pane].side
-		,	dimName	= _c[pane].sizeType.toLowerCase()
-		,	skipResizeWhileDragging = s.isResizing && !o.triggerEventsDuringLiveResize
-		,	doFX	= noAnimation !== true && o.animatePaneSizing
-		,	oldSize, newSize
-		;
-		if (pane === "center") return; // validate
-		// QUEUE in case another action/animation is in progress
-		$N.queue(function( queueNext ){
-			// calculate 'current' min/max sizes
-			setSizeLimits(pane); // update pane-state
-			oldSize = s.size;
-			size = _parseSize(pane, size); // handle percentages & auto
-			size = max(size, _parseSize(pane, o.minSize));
-			size = min(size, s.maxSize);
-			if (size < s.minSize) { // not enough room for pane!
-				queueNext(); // call before makePaneFit() because it needs the queue free
-				makePaneFit(pane, false, skipCallback);	// will hide or close pane
-				return;
-			}
-
-			// IF newSize is same as oldSize, then nothing to do - abort
-			if (!force && size === oldSize)
-				return queueNext();
-
-			s.newSize = size;
-
-			// onresize_start callback CANNOT cancel resizing because this would break the layout!
-			if (!skipCallback && state.initialized && s.isVisible)
-				_runCallbacks("onresize_start", pane);
-
-			// resize the pane, and make sure its visible
-			newSize = cssSize(pane, size);
-
-			if (doFX && $P.is(":visible")) { // ANIMATE
-				var fx		= $.layout.effects.size[pane] || $.layout.effects.size.all
-				,	easing	= o.fxSettings_size.easing || fx.easing
-				,	z		= options.zIndexes
-				,	props	= {};
-				props[ dimName ] = newSize +'px';
-				s.isMoving = true;
-				// overlay all elements during animation
-				$P.css({ zIndex: z.pane_animate })
-				  .show().animate( props, o.fxSpeed_size, easing, function(){
-					// reset zIndex after animation
-					$P.css({ zIndex: (s.isSliding ? z.pane_sliding : z.pane_normal) });
-					s.isMoving = false;
-					delete s.newSize;
-					sizePane_2(); // continue
-					queueNext();
-				});
-			}
-			else { // no animation
-				$P.css( dimName, newSize );	// resize pane
-				delete s.newSize;
-				// if pane is visible, then 
-				if ($P.is(":visible"))
-					sizePane_2(); // continue
-				else {
-					// pane is NOT VISIBLE, so just update state data...
-					// when pane is *next opened*, it will have the new size
-					s.size = size;				// update state.size
-					//$.extend(s, elDims($P));	// update state dimensions - CANNOT do this when not visible!				}
-				}
-				queueNext();
-			};
-
-		});
-
-		// SUBROUTINE
-		function sizePane_2 () {
-			/*	Panes are sometimes not sized precisely in some browsers!?
-			 *	This code will resize the pane up to 3 times to nudge the pane to the correct size
-			 */
-			var	actual	= dimName==='width' ? $P.outerWidth() : $P.outerHeight()
-			,	tries	= [{
-						   	pane:		pane
-						,	count:		1
-						,	target:		size
-						,	actual:		actual
-						,	correct:	(size === actual)
-						,	attempt:	size
-						,	cssSize:	newSize
-						}]
-			,	lastTry = tries[0]
-			,	thisTry	= {}
-			,	msg		= 'Inaccurate size after resizing the '+ pane +'-pane.'
-			;
-			while ( !lastTry.correct ) {
-				thisTry = { pane: pane, count: lastTry.count+1, target: size };
-
-				if (lastTry.actual > size)
-					thisTry.attempt = max(0, lastTry.attempt - (lastTry.actual - size));
-				else // lastTry.actual < size
-					thisTry.attempt = max(0, lastTry.attempt + (size - lastTry.actual));
-
-				thisTry.cssSize = cssSize(pane, thisTry.attempt);
-				$P.css( dimName, thisTry.cssSize );
-
-				thisTry.actual	= dimName=='width' ? $P.outerWidth() : $P.outerHeight();
-				thisTry.correct	= (size === thisTry.actual);
-
-				// log attempts and alert the user of this *non-fatal error* (if showDebugMessages)
-				if ( tries.length === 1) {
-					_log(msg, false, true);
-					_log(lastTry, false, true);
-				}
-				_log(thisTry, false, true);
-				// after 4 tries, is as close as its gonna get!
-				if (tries.length > 3) break;
-
-				tries.push( thisTry );
-				lastTry = tries[ tries.length - 1 ];
-			}
-			// END TESTING CODE
-
-			// update pane-state dimensions
-			s.size	= size;
-			$.extend(s, elDims($P));
-
-			if (s.isVisible && $P.is(":visible")) {
-				// reposition the resizer-bar
-				if ($R) $R.css( side, size + sC.inset[side] );
-				// resize the content-div
-				sizeContent(pane);
-			}
-
-			if (!skipCallback && !skipResizeWhileDragging && state.initialized && s.isVisible)
-				_runCallbacks("onresize_end", pane);
-
-			// resize all the adjacent panes, and adjust their toggler buttons
-			// when skipCallback passed, it means the controlling method will handle 'other panes'
-			if (!skipCallback) {
-				// also no callback if live-resize is in progress and NOT triggerEventsDuringLiveResize
-				if (!s.isSliding) sizeMidPanes(_c[pane].dir=="horz" ? "" : "center", skipResizeWhileDragging, force);
-				sizeHandles();
-			}
-
-			// if opposite-pane was autoClosed, see if it can be autoOpened now
-			var altPane = _c.oppositeEdge[pane];
-			if (size < oldSize && state[ altPane ].noRoom) {
-				setSizeLimits( altPane );
-				makePaneFit( altPane, false, skipCallback );
-			}
-
-			// DEBUG - ALERT user/developer so they know there was a sizing problem
-			if (tries.length > 1)
-				_log(msg +'\nSee the Error Console for details.', true, true);
-		}
-	}
-
-	/**
-	 * @see  initPanes(), sizePane(), 	resizeAll(), open(), close(), hide()
-	 * @param {(Array.<string>|string)}	panes					The pane(s) being resized, comma-delmited string
-	 * @param {boolean=}					[skipCallback=false]	Should the onresize callback be run?
-	 * @param {boolean=}					[force=false]
-	 */
-,	sizeMidPanes = function (panes, skipCallback, force) {
-		panes = (panes ? panes : "east,west,center").split(",");
-
-		$.each(panes, function (i, pane) {
-			if (!$Ps[pane]) return; // NO PANE - skip
-			var 
-				o		= options[pane]
-			,	s		= state[pane]
-			,	$P		= $Ps[pane]
-			,	$R		= $Rs[pane]
-			,	isCenter= (pane=="center")
-			,	hasRoom	= true
-			,	CSS		= {}
-			//	if pane is not visible, show it invisibly NOW rather than for *each call* in this script
-			,	visCSS	= $.layout.showInvisibly($P)
-
-			,	newCenter	= calcNewCenterPaneDims()
-			;
-
-			// update pane-state dimensions
-			$.extend(s, elDims($P));
-
-			if (pane === "center") {
-				if (!force && s.isVisible && newCenter.width === s.outerWidth && newCenter.height === s.outerHeight) {
-					$P.css(visCSS);
-					return true; // SKIP - pane already the correct size
-				}
-				// set state for makePaneFit() logic
-				$.extend(s, cssMinDims(pane), {
-					maxWidth:	newCenter.width
-				,	maxHeight:	newCenter.height
-				});
-				CSS = newCenter;
-				s.newWidth	= CSS.width;
-				s.newHeight	= CSS.height;
-				// convert OUTER width/height to CSS width/height 
-				CSS.width	= cssW($P, CSS.width);
-				// NEW - allow pane to extend 'below' visible area rather than hide it
-				CSS.height	= cssH($P, CSS.height);
-				hasRoom		= CSS.width >= 0 && CSS.height >= 0; // height >= 0 = ALWAYS TRUE NOW
-
-				// during layout init, try to shrink east/west panes to make room for center
-				if (!state.initialized && o.minWidth > newCenter.width) {
-					var
-						reqPx	= o.minWidth - s.outerWidth
-					,	minE	= options.east.minSize || 0
-					,	minW	= options.west.minSize || 0
-					,	sizeE	= state.east.size
-					,	sizeW	= state.west.size
-					,	newE	= sizeE
-					,	newW	= sizeW
-					;
-					if (reqPx > 0 && state.east.isVisible && sizeE > minE) {
-						newE = max( sizeE-minE, sizeE-reqPx );
-						reqPx -= sizeE-newE;
-					}
-					if (reqPx > 0 && state.west.isVisible && sizeW > minW) {
-						newW = max( sizeW-minW, sizeW-reqPx );
-						reqPx -= sizeW-newW;
-					}
-					// IF we found enough extra space, then resize the border panes as calculated
-					if (reqPx === 0) {
-						if (sizeE && sizeE != minE)
-							sizePane('east', newE, true, true, force); // true = skipCallback/noAnimation - initPanes will handle when done
-						if (sizeW && sizeW != minW)
-							sizePane('west', newW, true, true, force); // true = skipCallback/noAnimation
-						// now start over!
-						sizeMidPanes('center', skipCallback, force);
-						$P.css(visCSS);
-						return; // abort this loop
-					}
-				}
-			}
-			else { // for east and west, set only the height, which is same as center height
-				// set state.min/maxWidth/Height for makePaneFit() logic
-				if (s.isVisible && !s.noVerticalRoom)
-					$.extend(s, elDims($P), cssMinDims(pane))
-				if (!force && !s.noVerticalRoom && newCenter.height === s.outerHeight) {
-					$P.css(visCSS);
-					return true; // SKIP - pane already the correct size
-				}
-				// east/west have same top, bottom & height as center
-				CSS.top		= newCenter.top;
-				CSS.bottom	= newCenter.bottom;
-				s.newSize	= newCenter.height
-				// NEW - allow pane to extend 'below' visible area rather than hide it
-				CSS.height	= cssH($P, newCenter.height);
-				s.maxHeight	= CSS.height;
-				hasRoom		= (s.maxHeight >= 0); // ALWAYS TRUE NOW
-				if (!hasRoom) s.noVerticalRoom = true; // makePaneFit() logic
-			}
-
-			if (hasRoom) {
-				// resizeAll passes skipCallback because it triggers callbacks after ALL panes are resized
-				if (!skipCallback && state.initialized)
-					_runCallbacks("onresize_start", pane);
-
-				$P.css(CSS); // apply the CSS to pane
-				if (pane !== "center")
-					sizeHandles(pane); // also update resizer length
-				if (s.noRoom && !s.isClosed && !s.isHidden)
-					makePaneFit(pane); // will re-open/show auto-closed/hidden pane
-				if (s.isVisible) {
-					$.extend(s, elDims($P)); // update pane dimensions
-					if (state.initialized) sizeContent(pane); // also resize the contents, if exists
-				}
-			}
-			else if (!s.noRoom && s.isVisible) // no room for pane
-				makePaneFit(pane); // will hide or close pane
-
-			// reset visibility, if necessary
-			$P.css(visCSS);
-
-			delete s.newSize;
-			delete s.newWidth;
-			delete s.newHeight;
-
-			if (!s.isVisible)
-				return true; // DONE - next pane
-
-			/*
-			 * Extra CSS for IE6 or IE7 in Quirks-mode - add 'width' to NORTH/SOUTH panes
-			 * Normally these panes have only 'left' & 'right' positions so pane auto-sizes
-			 * ALSO required when pane is an IFRAME because will NOT default to 'full width'
-			 *	TODO: Can I use width:100% for a north/south iframe?
-			 *	TODO: Sounds like a job for $P.outerWidth( sC.innerWidth ) SETTER METHOD
-			 */
-			if (pane === "center") { // finished processing midPanes
-				var fix = browser.isIE6 || !browser.boxModel;
-				if ($Ps.north && (fix || state.north.tagName=="IFRAME")) 
-					$Ps.north.css("width", cssW($Ps.north, sC.innerWidth));
-				if ($Ps.south && (fix || state.south.tagName=="IFRAME"))
-					$Ps.south.css("width", cssW($Ps.south, sC.innerWidth));
-			}
-
-			// resizeAll passes skipCallback because it triggers callbacks after ALL panes are resized
-			if (!skipCallback && state.initialized)
-				_runCallbacks("onresize_end", pane);
-		});
-	}
-
-
-	/**
-	 * @see  window.onresize(), callbacks or custom code
-	 * @param {(Object|boolean)=}	evt_or_refresh	If 'true', then also reset pane-positioning
-	 */
-,	resizeAll = function (evt_or_refresh) {
-		var	oldW	= sC.innerWidth
-		,	oldH	= sC.innerHeight
-		;
-		// stopPropagation if called by trigger("layoutdestroy") - use evtPane utility 
-		evtPane(evt_or_refresh);
-
-		// cannot size layout when 'container' is hidden or collapsed
-		if (!$N.is(":visible")) return;
-
-		if (!state.initialized) {
-			_initLayoutElements();
-			return; // no need to resize since we just initialized!
-		}
-
-		if (evt_or_refresh === true && $.isPlainObject(options.outset)) {
-			// update container CSS in case outset option has changed
-			$N.css( options.outset );
-		}
-		// UPDATE container dimensions
-		$.extend(sC, elDims( $N, options.inset ));
-		if (!sC.outerHeight) return;
-
-		// if 'true' passed, refresh pane & handle positioning too
-		if (evt_or_refresh === true) {
-			setPanePosition();
-		}
-
-		// onresizeall_start will CANCEL resizing if returns false
-		// state.container has already been set, so user can access this info for calcuations
-		if (false === _runCallbacks("onresizeall_start")) return false;
-
-		var	// see if container is now 'smaller' than before
-			shrunkH	= (sC.innerHeight < oldH)
-		,	shrunkW	= (sC.innerWidth < oldW)
-		,	$P, o, s
-		;
-		// NOTE special order for sizing: S-N-E-W
-		$.each(["south","north","east","west"], function (i, pane) {
-			if (!$Ps[pane]) return; // no pane - SKIP
-			o = options[pane];
-			s = state[pane];
-			if (s.autoResize && s.size != o.size) // resize pane to original size set in options
-				sizePane(pane, o.size, true, true, true); // true=skipCallback/noAnimation/forceResize
-			else {
-				setSizeLimits(pane);
-				makePaneFit(pane, false, true, true); // true=skipCallback/forceResize
-			}
-		});
-
-		sizeMidPanes("", true, true); // true=skipCallback/forceResize
-		sizeHandles(); // reposition the toggler elements
-
-		// trigger all individual pane callbacks AFTER layout has finished resizing
-		$.each(_c.allPanes, function (i, pane) {
-			$P = $Ps[pane];
-			if (!$P) return; // SKIP
-			if (state[pane].isVisible) // undefined for non-existent panes
-				_runCallbacks("onresize_end", pane); // callback - if exists
-		});
-
-		_runCallbacks("onresizeall_end");
-		//_triggerLayoutEvent(pane, 'resizeall');
-	}
-
-	/**
-	 * Whenever a pane resizes or opens that has a nested layout, trigger resizeAll
-	 *
-	 * @param {(string|Object)}	evt_or_pane		The pane just resized or opened
-	 */
-,	resizeChildren = function (evt_or_pane, skipRefresh) {
-		var	pane = evtPane.call(this, evt_or_pane);
-
-		if (!options[pane].resizeChildren) return;
-
-		// ensure the pane-children are up-to-date
-		if (!skipRefresh) refreshChildren( pane );
-		var pC = children[pane];
-		if ($.isPlainObject( pC )) {
-			// resize one or more children
-			$.each( pC, function (key, child) {
-				if (!child.destroyed) child.resizeAll();
-			});
-		}
-	}
-
-	/**
-	 * IF pane has a content-div, then resize all elements inside pane to fit pane-height
-	 *
-	 * @param {(string|Object)}	evt_or_panes		The pane(s) being resized
-	 * @param {boolean=}			[remeasure=false]	Should the content (header/footer) be remeasured?
-	 */
-,	sizeContent = function (evt_or_panes, remeasure) {
-		if (!isInitialized()) return;
-
-		var panes = evtPane.call(this, evt_or_panes);
-		panes = panes ? panes.split(",") : _c.allPanes;
-
-		$.each(panes, function (idx, pane) {
-			var
-				$P	= $Ps[pane]
-			,	$C	= $Cs[pane]
-			,	o	= options[pane]
-			,	s	= state[pane]
-			,	m	= s.content // m = measurements
-			;
-			if (!$P || !$C || !$P.is(":visible")) return true; // NOT VISIBLE - skip
-
-			// if content-element was REMOVED, update OR remove the pointer
-			if (!$C.length) {
-				initContent(pane, false);	// false = do NOT sizeContent() - already there!
-				if (!$C) return;			// no replacement element found - pointer have been removed
-			}
-
-			// onsizecontent_start will CANCEL resizing if returns false
-			if (false === _runCallbacks("onsizecontent_start", pane)) return;
-
-			// skip re-measuring offsets if live-resizing
-			if ((!s.isMoving && !s.isResizing) || o.liveContentResizing || remeasure || m.top == undefined) {
-				_measure();
-				// if any footers are below pane-bottom, they may not measure correctly,
-				// so allow pane overflow and re-measure
-				if (m.hiddenFooters > 0 && $P.css("overflow") === "hidden") {
-					$P.css("overflow", "visible");
-					_measure(); // remeasure while overflowing
-					$P.css("overflow", "hidden");
-				}
-			}
-			// NOTE: spaceAbove/Below *includes* the pane paddingTop/Bottom, but not pane.borders
-			var newH = s.innerHeight - (m.spaceAbove - s.css.paddingTop) - (m.spaceBelow - s.css.paddingBottom);
-
-			if (!$C.is(":visible") || m.height != newH) {
-				// size the Content element to fit new pane-size - will autoHide if not enough room
-				setOuterHeight($C, newH, true); // true=autoHide
-				m.height = newH; // save new height
-			};
-
-			if (state.initialized)
-				_runCallbacks("onsizecontent_end", pane);
-
-			function _below ($E) {
-				return max(s.css.paddingBottom, (parseInt($E.css("marginBottom"), 10) || 0));
-			};
-
-			function _measure () {
-				var
-					ignore	= options[pane].contentIgnoreSelector
-				,	$Fs		= $C.nextAll().not(".ui-layout-mask").not(ignore || ":lt(0)") // not :lt(0) = ALL
-				,	$Fs_vis	= $Fs.filter(':visible')
-				,	$F		= $Fs_vis.filter(':last')
-				;
-				m = {
-					top:			$C[0].offsetTop
-				,	height:			$C.outerHeight()
-				,	numFooters:		$Fs.length
-				,	hiddenFooters:	$Fs.length - $Fs_vis.length
-				,	spaceBelow:		0 // correct if no content footer ($E)
-				}
-					m.spaceAbove	= m.top; // just for state - not used in calc
-					m.bottom		= m.top + m.height;
-				if ($F.length)
-					//spaceBelow = (LastFooter.top + LastFooter.height) [footerBottom] - Content.bottom + max(LastFooter.marginBottom, pane.paddingBotom)
-					m.spaceBelow = ($F[0].offsetTop + $F.outerHeight()) - m.bottom + _below($F);
-				else // no footer - check marginBottom on Content element itself
-					m.spaceBelow = _below($C);
-			};
-		});
-	}
-
-
-	/**
-	 * Called every time a pane is opened, closed, or resized to slide the togglers to 'center' and adjust their length if necessary
-	 *
-	 * @see  initHandles(), open(), close(), resizeAll()
-	 * @param {(string|Object)=}		evt_or_panes	The pane(s) being resized
-	 */
-,	sizeHandles = function (evt_or_panes) {
-		var panes = evtPane.call(this, evt_or_panes)
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		$.each(panes, function (i, pane) {
-			var 
-				o	= options[pane]
-			,	s	= state[pane]
-			,	$P	= $Ps[pane]
-			,	$R	= $Rs[pane]
-			,	$T	= $Ts[pane]
-			,	$TC
-			;
-			if (!$P || !$R) return;
-
-			var
-				dir			= _c[pane].dir
-			,	_state		= (s.isClosed ? "_closed" : "_open")
-			,	spacing		= o["spacing"+ _state]
-			,	togAlign	= o["togglerAlign"+ _state]
-			,	togLen		= o["togglerLength"+ _state]
-			,	paneLen
-			,	left
-			,	offset
-			,	CSS = {}
-			;
-
-			if (spacing === 0) {
-				$R.hide();
-				return;
-			}
-			else if (!s.noRoom && !s.isHidden) // skip if resizer was hidden for any reason
-				$R.show(); // in case was previously hidden
-
-			// Resizer Bar is ALWAYS same width/height of pane it is attached to
-			if (dir === "horz") { // north/south
-				//paneLen = $P.outerWidth(); // s.outerWidth || 
-				paneLen = sC.innerWidth; // handle offscreen-panes
-				s.resizerLength = paneLen;
-				left = $.layout.cssNum($P, "left")
-				$R.css({
-					width:	cssW($R, paneLen) // account for borders & padding
-				,	height:	cssH($R, spacing) // ditto
-				,	left:	left > -9999 ? left : sC.inset.left // handle offscreen-panes
-				});
-			}
-			else { // east/west
-				paneLen = $P.outerHeight(); // s.outerHeight || 
-				s.resizerLength = paneLen;
-				$R.css({
-					height:	cssH($R, paneLen) // account for borders & padding
-				,	width:	cssW($R, spacing) // ditto
-				,	top:	sC.inset.top + getPaneSize("north", true) // TODO: what if no North pane?
-				//,	top:	$.layout.cssNum($Ps["center"], "top")
-				});
-			}
-
-			// remove hover classes
-			removeHover( o, $R );
-
-			if ($T) {
-				if (togLen === 0 || (s.isSliding && o.hideTogglerOnSlide)) {
-					$T.hide(); // always HIDE the toggler when 'sliding'
-					return;
-				}
-				else
-					$T.show(); // in case was previously hidden
-
-				if (!(togLen > 0) || togLen === "100%" || togLen > paneLen) {
-					togLen = paneLen;
-					offset = 0;
-				}
-				else { // calculate 'offset' based on options.PANE.togglerAlign_open/closed
-					if (isStr(togAlign)) {
-						switch (togAlign) {
-							case "top":
-							case "left":	offset = 0;
-											break;
-							case "bottom":
-							case "right":	offset = paneLen - togLen;
-											break;
-							case "middle":
-							case "center":
-							default:		offset = round((paneLen - togLen) / 2); // 'default' catches typos
-						}
-					}
-					else { // togAlign = number
-						var x = parseInt(togAlign, 10); //
-						if (togAlign >= 0) offset = x;
-						else offset = paneLen - togLen + x; // NOTE: x is negative!
-					}
-				}
-
-				if (dir === "horz") { // north/south
-					var width = cssW($T, togLen);
-					$T.css({
-						width:	width  // account for borders & padding
-					,	height:	cssH($T, spacing) // ditto
-					,	left:	offset // TODO: VERIFY that toggler  positions correctly for ALL values
-					,	top:	0
-					});
-					// CENTER the toggler content SPAN
-					$T.children(".content").each(function(){
-						$TC = $(this);
-						$TC.css("marginLeft", round((width-$TC.outerWidth())/2)); // could be negative
-					});
-				}
-				else { // east/west
-					var height = cssH($T, togLen);
-					$T.css({
-						height:	height // account for borders & padding
-					,	width:	cssW($T, spacing) // ditto
-					,	top:	offset // POSITION the toggler
-					,	left:	0
-					});
-					// CENTER the toggler content SPAN
-					$T.children(".content").each(function(){
-						$TC = $(this);
-						$TC.css("marginTop", round((height-$TC.outerHeight())/2)); // could be negative
-					});
-				}
-
-				// remove ALL hover classes
-				removeHover( 0, $T );
-			}
-
-			// DONE measuring and sizing this resizer/toggler, so can be 'hidden' now
-			if (!state.initialized && (o.initHidden || s.isHidden)) {
-				$R.hide();
-				if ($T) $T.hide();
-			}
-		});
-	}
-
-
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	enableClosable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$T	= $Ts[pane]
-		,	o	= options[pane]
-		;
-		if (!$T) return;
-		o.closable = true;
-		$T	.bind("click."+ sID, function(evt){ evt.stopPropagation(); toggle(pane); })
-			.css("visibility", "visible")
-			.css("cursor", "pointer")
-			.attr("title", state[pane].isClosed ? o.tips.Open : o.tips.Close) // may be blank
-			.show();
-	}
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 * @param {boolean=}			[hide=false]
-	 */
-,	disableClosable = function (evt_or_pane, hide) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$T	= $Ts[pane]
-		;
-		if (!$T) return;
-		options[pane].closable = false;
-		// is closable is disable, then pane MUST be open!
-		if (state[pane].isClosed) open(pane, false, true);
-		$T	.unbind("."+ sID)
-			.css("visibility", hide ? "hidden" : "visible") // instead of hide(), which creates logic issues
-			.css("cursor", "default")
-			.attr("title", "");
-	}
-
-
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	enableSlidable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		;
-		if (!$R || !$R.data('draggable')) return;
-		options[pane].slidable = true; 
-		if (state[pane].isClosed)
-			bindStartSlidingEvents(pane, true);
-	}
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	disableSlidable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		;
-		if (!$R) return;
-		options[pane].slidable = false; 
-		if (state[pane].isSliding)
-			close(pane, false, true);
-		else {
-			bindStartSlidingEvents(pane, false);
-			$R	.css("cursor", "default")
-				.attr("title", "");
-			removeHover(null, $R[0]); // in case currently hovered
-		}
-	}
-
-
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	enableResizable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		,	o	= options[pane]
-		;
-		if (!$R || !$R.data('draggable')) return;
-		o.resizable = true; 
-		$R.draggable("enable");
-		if (!state[pane].isClosed)
-			$R	.css("cursor", o.resizerCursor)
-			 	.attr("title", o.tips.Resize);
-	}
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	disableResizable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		;
-		if (!$R || !$R.data('draggable')) return;
-		options[pane].resizable = false; 
-		$R	.draggable("disable")
-			.css("cursor", "default")
-			.attr("title", "");
-		removeHover(null, $R[0]); // in case currently hovered
-	}
-
-
-	/**
-	 * Move a pane from source-side (eg, west) to target-side (eg, east)
-	 * If pane exists on target-side, move that to source-side, ie, 'swap' the panes
-	 *
-	 * @param {(string|Object)}	evt_or_pane1	The pane/edge being swapped
-	 * @param {string}			pane2			ditto
-	 */
-,	swapPanes = function (evt_or_pane1, pane2) {
-		if (!isInitialized()) return;
-		var pane1 = evtPane.call(this, evt_or_pane1);
-		// change state.edge NOW so callbacks can know where pane is headed...
-		state[pane1].edge = pane2;
-		state[pane2].edge = pane1;
-		// run these even if NOT state.initialized
-		if (false === _runCallbacks("onswap_start", pane1)
-		 ||	false === _runCallbacks("onswap_start", pane2)
-		) {
-			state[pane1].edge = pane1; // reset
-			state[pane2].edge = pane2;
-			return;
-		}
-
-		var
-			oPane1	= copy( pane1 )
-		,	oPane2	= copy( pane2 )
-		,	sizes	= {}
-		;
-		sizes[pane1] = oPane1 ? oPane1.state.size : 0;
-		sizes[pane2] = oPane2 ? oPane2.state.size : 0;
-
-		// clear pointers & state
-		$Ps[pane1] = false; 
-		$Ps[pane2] = false;
-		state[pane1] = {};
-		state[pane2] = {};
-		
-		// ALWAYS remove the resizer & toggler elements
-		if ($Ts[pane1]) $Ts[pane1].remove();
-		if ($Ts[pane2]) $Ts[pane2].remove();
-		if ($Rs[pane1]) $Rs[pane1].remove();
-		if ($Rs[pane2]) $Rs[pane2].remove();
-		$Rs[pane1] = $Rs[pane2] = $Ts[pane1] = $Ts[pane2] = false;
-
-		// transfer element pointers and data to NEW Layout keys
-		move( oPane1, pane2 );
-		move( oPane2, pane1 );
-
-		// cleanup objects
-		oPane1 = oPane2 = sizes = null;
-
-		// make panes 'visible' again
-		if ($Ps[pane1]) $Ps[pane1].css(_c.visible);
-		if ($Ps[pane2]) $Ps[pane2].css(_c.visible);
-
-		// fix any size discrepancies caused by swap
-		resizeAll();
-
-		// run these even if NOT state.initialized
-		_runCallbacks("onswap_end", pane1);
-		_runCallbacks("onswap_end", pane2);
-
-		return;
-
-		function copy (n) { // n = pane
-			var
-				$P	= $Ps[n]
-			,	$C	= $Cs[n]
-			;
-			return !$P ? false : {
-				pane:		n
-			,	P:			$P ? $P[0] : false
-			,	C:			$C ? $C[0] : false
-			,	state:		$.extend(true, {}, state[n])
-			,	options:	$.extend(true, {}, options[n])
-			}
-		};
-
-		function move (oPane, pane) {
-			if (!oPane) return;
-			var
-				P		= oPane.P
-			,	C		= oPane.C
-			,	oldPane = oPane.pane
-			,	c		= _c[pane]
-			//	save pane-options that should be retained
-			,	s		= $.extend(true, {}, state[pane])
-			,	o		= options[pane]
-			//	RETAIN side-specific FX Settings - more below
-			,	fx		= { resizerCursor: o.resizerCursor }
-			,	re, size, pos
-			;
-			$.each("fxName,fxSpeed,fxSettings".split(","), function (i, k) {
-				fx[k +"_open"]  = o[k +"_open"];
-				fx[k +"_close"] = o[k +"_close"];
-				fx[k +"_size"]  = o[k +"_size"];
-			});
-
-			// update object pointers and attributes
-			$Ps[pane] = $(P)
-				.data({
-					layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-				,	layoutEdge:		pane
-				})
-				.css(_c.hidden)
-				.css(c.cssReq)
-			;
-			$Cs[pane] = C ? $(C) : false;
-
-			// set options and state
-			options[pane]	= $.extend(true, {}, oPane.options, fx);
-			state[pane]		= $.extend(true, {}, oPane.state);
-
-			// change classNames on the pane, eg: ui-layout-pane-east ==> ui-layout-pane-west
-			re = new RegExp(o.paneClass +"-"+ oldPane, "g");
-			P.className = P.className.replace(re, o.paneClass +"-"+ pane);
-
-			// ALWAYS regenerate the resizer & toggler elements
-			initHandles(pane); // create the required resizer & toggler
-
-			// if moving to different orientation, then keep 'target' pane size
-			if (c.dir != _c[oldPane].dir) {
-				size = sizes[pane] || 0;
-				setSizeLimits(pane); // update pane-state
-				size = max(size, state[pane].minSize);
-				// use manualSizePane to disable autoResize - not useful after panes are swapped
-				manualSizePane(pane, size, true, true); // true/true = skipCallback/noAnimation
-			}
-			else // move the resizer here
-				$Rs[pane].css(c.side, sC.inset[c.side] + (state[pane].isVisible ? getPaneSize(pane) : 0));
-
-
-			// ADD CLASSNAMES & SLIDE-BINDINGS
-			if (oPane.state.isVisible && !s.isVisible)
-				setAsOpen(pane, true); // true = skipCallback
-			else {
-				setAsClosed(pane);
-				bindStartSlidingEvents(pane, true); // will enable events IF option is set
-			}
-
-			// DESTROY the object
-			oPane = null;
-		};
-	}
-
-
-	/**
-	 * INTERNAL method to sync pin-buttons when pane is opened or closed
-	 * Unpinned means the pane is 'sliding' - ie, over-top of the adjacent panes
-	 *
-	 * @see  open(), setAsOpen(), setAsClosed()
-	 * @param {string}	pane   These are the params returned to callbacks by layout()
-	 * @param {boolean}	doPin  True means set the pin 'down', False means 'up'
-	 */
-,	syncPinBtns = function (pane, doPin) {
-		if ($.layout.plugins.buttons)
-			$.each(state[pane].pins, function (i, selector) {
-				$.layout.buttons.setPinState(Instance, $(selector), pane, doPin);
-			});
-	}
-
-;	// END var DECLARATIONS
-
-	/**
-	 * Capture keys when enableCursorHotkey - toggle pane if hotkey pressed
-	 *
-	 * @see  document.keydown()
-	 */
-	function keyDown (evt) {
-		if (!evt) return true;
-		var code = evt.keyCode;
-		if (code < 33) return true; // ignore special keys: ENTER, TAB, etc
-
-		var
-			PANE = {
-				38: "north" // Up Cursor	- $.ui.keyCode.UP
-			,	40: "south" // Down Cursor	- $.ui.keyCode.DOWN
-			,	37: "west"  // Left Cursor	- $.ui.keyCode.LEFT
-			,	39: "east"  // Right Cursor	- $.ui.keyCode.RIGHT
-			}
-		,	ALT		= evt.altKey // no worky!
-		,	SHIFT	= evt.shiftKey
-		,	CTRL	= evt.ctrlKey
-		,	CURSOR	= (CTRL && code >= 37 && code <= 40)
-		,	o, k, m, pane
-		;
-
-		if (CURSOR && options[PANE[code]].enableCursorHotkey) // valid cursor-hotkey
-			pane = PANE[code];
-		else if (CTRL || SHIFT) // check to see if this matches a custom-hotkey
-			$.each(_c.borderPanes, function (i, p) { // loop each pane to check its hotkey
-				o = options[p];
-				k = o.customHotkey;
-				m = o.customHotkeyModifier; // if missing or invalid, treated as "CTRL+SHIFT"
-				if ((SHIFT && m=="SHIFT") || (CTRL && m=="CTRL") || (CTRL && SHIFT)) { // Modifier matches
-					if (k && code === (isNaN(k) || k <= 9 ? k.toUpperCase().charCodeAt(0) : k)) { // Key matches
-						pane = p;
-						return false; // BREAK
-					}
-				}
-			});
-
-		// validate pane
-		if (!pane || !$Ps[pane] || !options[pane].closable || state[pane].isHidden)
-			return true;
-
-		toggle(pane);
-
-		evt.stopPropagation();
-		evt.returnValue = false; // CANCEL key
-		return false;
-	};
-
-
-/*
- * ######################################
- *	UTILITY METHODS
- *	called externally or by initButtons
- * ######################################
- */
-
-	/**
-	 * Change/reset a pane overflow setting & zIndex to allow popups/drop-downs to work
-	 *
-	 * @param {Object=}   [el]	(optional) Can also be 'bound' to a click, mouseOver, or other event
-	 */
-	function allowOverflow (el) {
-		if (!isInitialized()) return;
-		if (this && this.tagName) el = this; // BOUND to element
-		var $P;
-		if (isStr(el))
-			$P = $Ps[el];
-		else if ($(el).data("layoutRole"))
-			$P = $(el);
-		else
-			$(el).parents().each(function(){
-				if ($(this).data("layoutRole")) {
-					$P = $(this);
-					return false; // BREAK
-				}
-			});
-		if (!$P || !$P.length) return; // INVALID
-
-		var
-			pane	= $P.data("layoutEdge")
-		,	s		= state[pane]
-		;
-
-		// if pane is already raised, then reset it before doing it again!
-		// this would happen if allowOverflow is attached to BOTH the pane and an element 
-		if (s.cssSaved)
-			resetOverflow(pane); // reset previous CSS before continuing
-
-		// if pane is raised by sliding or resizing, or its closed, then abort
-		if (s.isSliding || s.isResizing || s.isClosed) {
-			s.cssSaved = false;
-			return;
-		}
-
-		var
-			newCSS	= { zIndex: (options.zIndexes.resizer_normal + 1) }
-		,	curCSS	= {}
-		,	of		= $P.css("overflow")
-		,	ofX		= $P.css("overflowX")
-		,	ofY		= $P.css("overflowY")
-		;
-		// determine which, if any, overflow settings need to be changed
-		if (of != "visible") {
-			curCSS.overflow = of;
-			newCSS.overflow = "visible";
-		}
-		if (ofX && !ofX.match(/(visible|auto)/)) {
-			curCSS.overflowX = ofX;
-			newCSS.overflowX = "visible";
-		}
-		if (ofY && !ofY.match(/(visible|auto)/)) {
-			curCSS.overflowY = ofX;
-			newCSS.overflowY = "visible";
-		}
-
-		// save the current overflow settings - even if blank!
-		s.cssSaved = curCSS;
-
-		// apply new CSS to raise zIndex and, if necessary, make overflow 'visible'
-		$P.css( newCSS );
-
-		// make sure the zIndex of all other panes is normal
-		$.each(_c.allPanes, function(i, p) {
-			if (p != pane) resetOverflow(p);
-		});
-
-	};
-	/**
-	 * @param {Object=}   [el]	(optional) Can also be 'bound' to a click, mouseOver, or other event
-	 */
-	function resetOverflow (el) {
-		if (!isInitialized()) return;
-		if (this && this.tagName) el = this; // BOUND to element
-		var $P;
-		if (isStr(el))
-			$P = $Ps[el];
-		else if ($(el).data("layoutRole"))
-			$P = $(el);
-		else
-			$(el).parents().each(function(){
-				if ($(this).data("layoutRole")) {
-					$P = $(this);
-					return false; // BREAK
-				}
-			});
-		if (!$P || !$P.length) return; // INVALID
-
-		var
-			pane	= $P.data("layoutEdge")
-		,	s		= state[pane]
-		,	CSS		= s.cssSaved || {}
-		;
-		// reset the zIndex
-		if (!s.isSliding && !s.isResizing)
-			$P.css("zIndex", options.zIndexes.pane_normal);
-
-		// reset Overflow - if necessary
-		$P.css( CSS );
-
-		// clear var
-		s.cssSaved = false;
-	};
-
-/*
- * #####################
- * CREATE/RETURN LAYOUT
- * #####################
- */
-
-	// validate that container exists
-	var $N = $(this).eq(0); // FIRST matching Container element
-	if (!$N.length) {
-		return _log( options.errors.containerMissing );
-	};
-
-	// Users retrieve Instance of a layout with: $N.layout() OR $N.data("layout")
-	// return the Instance-pointer if layout has already been initialized
-	if ($N.data("layoutContainer") && $N.data("layout"))
-		return $N.data("layout"); // cached pointer
-
-	// init global vars
-	var 
-		$Ps	= {}	// Panes x5		- set in initPanes()
-	,	$Cs	= {}	// Content x5	- set in initPanes()
-	,	$Rs	= {}	// Resizers x4	- set in initHandles()
-	,	$Ts	= {}	// Togglers x4	- set in initHandles()
-	,	$Ms	= $([])	// Masks - up to 2 masks per pane (IFRAME + DIV)
-	//	aliases for code brevity
-	,	sC	= state.container // alias for easy access to 'container dimensions'
-	,	sID	= state.id // alias for unique layout ID/namespace - eg: "layout435"
-	;
-
-	// create Instance object to expose data & option Properties, and primary action Methods
-	var Instance = {
-	//	layout data
-		options:			options			// property - options hash
-	,	state:				state			// property - dimensions hash
-	//	object pointers
-	,	container:			$N				// property - object pointers for layout container
-	,	panes:				$Ps				// property - object pointers for ALL Panes: panes.north, panes.center
-	,	contents:			$Cs				// property - object pointers for ALL Content: contents.north, contents.center
-	,	resizers:			$Rs				// property - object pointers for ALL Resizers, eg: resizers.north
-	,	togglers:			$Ts				// property - object pointers for ALL Togglers, eg: togglers.north
-	//	border-pane open/close
-	,	hide:				hide			// method - ditto
-	,	show:				show			// method - ditto
-	,	toggle:				toggle			// method - pass a 'pane' ("north", "west", etc)
-	,	open:				open			// method - ditto
-	,	close:				close			// method - ditto
-	,	slideOpen:			slideOpen		// method - ditto
-	,	slideClose:			slideClose		// method - ditto
-	,	slideToggle:		slideToggle		// method - ditto
-	//	pane actions
-	,	setSizeLimits:		setSizeLimits	// method - pass a 'pane' - update state min/max data
-	,	_sizePane:			sizePane		// method -intended for user by plugins only!
-	,	sizePane:			manualSizePane	// method - pass a 'pane' AND an 'outer-size' in pixels or percent, or 'auto'
-	,	sizeContent:		sizeContent		// method - pass a 'pane'
-	,	swapPanes:			swapPanes		// method - pass TWO 'panes' - will swap them
-	,	showMasks:			showMasks		// method - pass a 'pane' OR list of panes - default = all panes with mask option set
-	,	hideMasks:			hideMasks		// method - ditto'
-	//	pane element methods
-	,	initContent:		initContent		// method - ditto
-	,	addPane:			addPane			// method - pass a 'pane'
-	,	removePane:			removePane		// method - pass a 'pane' to remove from layout, add 'true' to delete the pane-elem
-	,	createChildren:		createChildren	// method - pass a 'pane' and (optional) layout-options (OVERRIDES options[pane].children
-	,	refreshChildren:	refreshChildren	// method - pass a 'pane' and a layout-instance
-	//	special pane option setting
-	,	enableClosable:		enableClosable	// method - pass a 'pane'
-	,	disableClosable:	disableClosable	// method - ditto
-	,	enableSlidable:		enableSlidable	// method - ditto
-	,	disableSlidable:	disableSlidable	// method - ditto
-	,	enableResizable:	enableResizable	// method - ditto
-	,	disableResizable:	disableResizable// method - ditto
-	//	utility methods for panes
-	,	allowOverflow:		allowOverflow	// utility - pass calling element (this)
-	,	resetOverflow:		resetOverflow	// utility - ditto
-	//	layout control
-	,	destroy:			destroy			// method - no parameters
-	,	initPanes:			isInitialized	// method - no parameters
-	,	resizeAll:			resizeAll		// method - no parameters
-	//	callback triggering
-	,	runCallbacks:		_runCallbacks	// method - pass evtName & pane (if a pane-event), eg: trigger("onopen", "west")
-	//	alias collections of options, state and children - created in addPane and extended elsewhere
-	,	hasParentLayout:	false			// set by initContainer()
-	,	children:			children		// pointers to child-layouts, eg: Instance.children.west.layoutName
-	,	north:				false			// alias group: { name: pane, pane: $Ps[pane], options: options[pane], state: state[pane], children: children[pane] }
-	,	south:				false			// ditto
-	,	west:				false			// ditto
-	,	east:				false			// ditto
-	,	center:				false			// ditto
-	};
-
-	// create the border layout NOW
-	if (_create() === 'cancel') // onload_start callback returned false to CANCEL layout creation
-		return null;
-	else // true OR false -- if layout-elements did NOT init (hidden or do not exist), can auto-init later
-		return Instance; // return the Instance object
-
-}
-
-
-})( jQuery );
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/layout/jquery.layout.min.js b/htdocs/includes/jquery/plugins/layout/jquery.layout.min.js
deleted file mode 100644
index 41056ffc53e..00000000000
--- a/htdocs/includes/jquery/plugins/layout/jquery.layout.min.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-
- jquery.layout 1.4.3
- $Date: 2014-08-30 08:00:00 (Sat, 30 Aug 2014) $
- $Rev: 1.0403 $
-
- Copyright (c) 2014 Kevin Dalman (http://jquery-dev.com)
- Based on work by Fabrizio Balliano (http://www.fabrizioballiano.net)
-
- Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
-
- SEE: http://layout.jquery-dev.com/LICENSE.txt
-
- Changelog: http://layout.jquery-dev.com/changelog.cfm
-
- Docs: http://layout.jquery-dev.com/documentation.html
- Tips: http://layout.jquery-dev.com/tips.html
- Help: http://groups.google.com/group/jquery-ui-layout
-*/
-(function(d){var ua=Math.min,E=Math.max,ka=Math.floor,U=function(e){return"string"===d.type(e)},ha=function(e,t){if(d.isArray(t))for(var m=0,q=t.length;m<q;m++){var x=t[m];try{U(x)&&(x=eval(x)),d.isFunction(x)&&x(e)}catch(n){}}};d.layout={version:"1.4.3",revision:1.0403,browser:{},effects:{slide:{all:{duration:"fast"},north:{direction:"up"},south:{direction:"down"},east:{direction:"right"},west:{direction:"left"}},drop:{all:{duration:"slow"},north:{direction:"up"},south:{direction:"down"},east:{direction:"right"},
-west:{direction:"left"}},scale:{all:{duration:"fast"}},blind:{},clip:{},explode:{},fade:{},fold:{},puff:{},size:{all:{easing:"swing"}}},config:{optionRootKeys:"effects panes north south west east center".split(" "),allPanes:["north","south","west","east","center"],borderPanes:["north","south","west","east"],oppositeEdge:{north:"south",south:"north",east:"west",west:"east"},offscreenCSS:{left:"-99999px",right:"auto"},offscreenReset:"offscreenReset",hidden:{visibility:"hidden"},visible:{visibility:"visible"},
-resizers:{cssReq:{position:"absolute",padding:0,margin:0,fontSize:"1px",textAlign:"left",overflow:"hidden"},cssDemo:{background:"#DDD",border:"none"}},togglers:{cssReq:{position:"absolute",display:"block",padding:0,margin:0,overflow:"hidden",textAlign:"center",fontSize:"1px",cursor:"pointer",zIndex:1},cssDemo:{background:"#AAA"}},content:{cssReq:{position:"relative"},cssDemo:{overflow:"auto",padding:"10px"},cssDemoPane:{overflow:"hidden",padding:0}},panes:{cssReq:{position:"absolute",margin:0},cssDemo:{padding:"10px",
-background:"#FFF",border:"1px solid #BBB",overflow:"auto"}},north:{side:"top",sizeType:"Height",dir:"horz",cssReq:{top:0,bottom:"auto",left:0,right:0,width:"auto"}},south:{side:"bottom",sizeType:"Height",dir:"horz",cssReq:{top:"auto",bottom:0,left:0,right:0,width:"auto"}},east:{side:"right",sizeType:"Width",dir:"vert",cssReq:{left:"auto",right:0,top:"auto",bottom:"auto",height:"auto"}},west:{side:"left",sizeType:"Width",dir:"vert",cssReq:{left:0,right:"auto",top:"auto",bottom:"auto",height:"auto"}},
-center:{dir:"center",cssReq:{left:"auto",right:"auto",top:"auto",bottom:"auto",height:"auto",width:"auto"}}},callbacks:{},getParentPaneElem:function(e){e=d(e);if(e=e.data("layout")||e.data("parentLayout")){e=e.container;if(e.data("layoutPane"))return e;e=e.closest("."+d.layout.defaults.panes.paneClass);if(e.data("layoutPane"))return e}return null},getParentPaneInstance:function(e){return(e=d.layout.getParentPaneElem(e))?e.data("layoutPane"):null},getParentLayoutInstance:function(e){return(e=d.layout.getParentPaneElem(e))?
-e.data("parentLayout"):null},getEventObject:function(d){return"object"===typeof d&&d.stopPropagation?d:null},parsePaneName:function(e){var t=d.layout.getEventObject(e);t&&(t.stopPropagation(),e=d(this).data("layoutEdge"));e&&!/^(west|east|north|south|center)$/.test(e)&&(d.layout.msg('LAYOUT ERROR - Invalid pane-name: "'+e+'"'),e="error");return e},plugins:{draggable:!!d.fn.draggable,effects:{core:!!d.effects,slide:d.effects&&(d.effects.slide||d.effects.effect&&d.effects.effect.slide)}},onCreate:[],
-onLoad:[],onReady:[],onDestroy:[],onUnload:[],afterOpen:[],afterClose:[],scrollbarWidth:function(){return window.scrollbarWidth||d.layout.getScrollbarSize("width")},scrollbarHeight:function(){return window.scrollbarHeight||d.layout.getScrollbarSize("height")},getScrollbarSize:function(e){var t=d('<div style="position: absolute; top: -10000px; left: -10000px; width: 100px; height: 100px; border: 0; overflow: scroll;"></div>').appendTo("body"),m={width:t.outerWidth-t[0].clientWidth,height:100-t[0].clientHeight};
-t.remove();window.scrollbarWidth=m.width;window.scrollbarHeight=m.height;return e.match(/^(width|height)$/)?m[e]:m},disableTextSelection:function(){var e=d(document);d.fn.disableSelection&&(e.data("textSelectionInitialized")||e.on("mouseup",d.layout.enableTextSelection).data("textSelectionInitialized",!0),e.data("textSelectionDisabled")||e.disableSelection().data("textSelectionDisabled",!0))},enableTextSelection:function(){var e=d(document);d.fn.enableSelection&&e.data("textSelectionDisabled")&&e.enableSelection().data("textSelectionDisabled",
-!1)},showInvisibly:function(d,t){if(d&&d.length&&(t||"none"===d.css("display"))){var m=d[0].style,m={display:m.display||"",visibility:m.visibility||""};d.css({display:"block",visibility:"hidden"});return m}return{}},getElementDimensions:function(e,t){var m={css:{},inset:{}},q=m.css,x={bottom:0},n=d.layout.cssNum,z=Math.round,C=e.offset(),F,L,N;m.offsetLeft=C.left;m.offsetTop=C.top;t||(t={});d.each(["Left","Right","Top","Bottom"],function(n,r){F=q["border"+r]=d.layout.borderWidth(e,r);L=q["padding"+
-r]=d.layout.cssNum(e,"padding"+r);N=r.toLowerCase();m.inset[N]=0<=t[N]?t[N]:L;x[N]=m.inset[N]+F});q.width=z(e.width());q.height=z(e.height());q.top=n(e,"top",!0);q.bottom=n(e,"bottom",!0);q.left=n(e,"left",!0);q.right=n(e,"right",!0);m.outerWidth=z(e.outerWidth());m.outerHeight=z(e.outerHeight());m.innerWidth=E(0,m.outerWidth-x.left-x.right);m.innerHeight=E(0,m.outerHeight-x.top-x.bottom);m.layoutWidth=z(e.innerWidth());m.layoutHeight=z(e.innerHeight());return m},getElementStyles:function(d,t){var m=
-{},q=d[0].style,x=t.split(","),n=["Top","Bottom","Left","Right"],z=["Color","Style","Width"],C,F,L,E,A,r;for(E=0;E<x.length;E++)if(C=x[E],C.match(/(border|padding|margin)$/))for(A=0;4>A;A++)if(F=n[A],"border"===C)for(r=0;3>r;r++)L=z[r],m[C+F+L]=q[C+F+L];else m[C+F]=q[C+F];else m[C]=q[C];return m},cssWidth:function(e,t){if(0>=t)return 0;var m=d.layout.browser,m=m.boxModel?m.boxSizing?e.css("boxSizing"):"content-box":"border-box",q=d.layout.borderWidth,x=d.layout.cssNum,n=t;"border-box"!==m&&(n-=q(e,
-"Left")+q(e,"Right"));"content-box"===m&&(n-=x(e,"paddingLeft")+x(e,"paddingRight"));return E(0,n)},cssHeight:function(e,t){if(0>=t)return 0;var m=d.layout.browser,m=m.boxModel?m.boxSizing?e.css("boxSizing"):"content-box":"border-box",q=d.layout.borderWidth,x=d.layout.cssNum,n=t;"border-box"!==m&&(n-=q(e,"Top")+q(e,"Bottom"));"content-box"===m&&(n-=x(e,"paddingTop")+x(e,"paddingBottom"));return E(0,n)},cssNum:function(e,t,m){e.jquery||(e=d(e));var q=d.layout.showInvisibly(e);t=d.css(e[0],t,!0);m=
-m&&"auto"==t?t:Math.round(parseFloat(t)||0);e.css(q);return m},borderWidth:function(e,t){e.jquery&&(e=e[0]);var m="border"+t.substr(0,1).toUpperCase()+t.substr(1);return"none"===d.css(e,m+"Style",!0)?0:Math.round(parseFloat(d.css(e,m+"Width",!0))||0)},isMouseOverElem:function(e,t){var m=d(t||this),q=m.offset(),x=q.top,q=q.left,n=q+m.outerWidth(),m=x+m.outerHeight(),z=e.pageX,C=e.pageY;return d.layout.browser.msie&&0>z&&0>C||z>=q&&z<=n&&C>=x&&C<=m},msg:function(e,t,m,q){d.isPlainObject(e)&&window.debugData?
-("string"===typeof t?(q=m,m=t):"object"===typeof m&&(q=m,m=null),m=m||"log( <object> )",q=d.extend({sort:!1,returnHTML:!1,display:!1},q),!0===t||q.display?debugData(e,m,q):window.console&&console.log(debugData(e,m,q))):t?alert(e):window.console?console.log(e):(t=d("#layoutLogger"),t.length||(t=d('<div id="layoutLogger" style="position: '+(d.support.fixedPosition?"fixed":"absolute")+'; top: 5px; z-index: 999999; max-width: 25%; overflow: hidden; border: 1px solid #000; border-radius: 5px; background: #FBFBFB; box-shadow: 0 2px 10px rgba(0,0,0,0.3);"><div style="font-size: 13px; font-weight: bold; padding: 5px 10px; background: #F6F6F6; border-radius: 5px 5px 0 0; cursor: move;"><span style="float: right; padding-left: 7px; cursor: pointer;" title="Remove Console" onclick="$(this).closest(\'#layoutLogger\').remove()">X</span>Layout console.log</div><ul style="font-size: 13px; font-weight: none; list-style: none; margin: 0; padding: 0 0 2px;"></ul></div>').appendTo("body"),
-t.css("left",d(window).width()-t.outerWidth()-5),d.ui.draggable&&t.draggable({handle:":first-child"})),t.children("ul").append('<li style="padding: 4px 10px; margin: 0; border-top: 1px solid #CCC;">'+e.replace(/\</g,"&lt;").replace(/\>/g,"&gt;")+"</li>"))}};(function(){var e=navigator.userAgent.toLowerCase(),t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||0>e.indexOf("compatible")&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||
-[],e=t[1]||"",t=t[2]||0,m="msie"===e,q=document.compatMode,x=d.support,n=void 0!==x.boxSizing?x.boxSizing:x.boxSizingReliable,z=!m||!q||"CSS1Compat"===q||x.boxModel||!1,C=d.layout.browser={version:t,safari:"webkit"===e,webkit:"chrome"===e,msie:m,isIE6:m&&6==t,boxModel:z,boxSizing:!("function"===typeof n?!n():!n)};e&&(C[e]=!0);z||q||d(function(){C.boxModel=x.boxModel})})();d.layout.defaults={name:"",containerClass:"ui-layout-container",inset:null,scrollToBookmarkOnLoad:!0,resizeWithWindow:!0,resizeWithWindowDelay:200,
-resizeWithWindowMaxDelay:0,maskPanesEarly:!1,onresizeall_start:null,onresizeall_end:null,onload_start:null,onload_end:null,onunload_start:null,onunload_end:null,initPanes:!0,showErrorMessages:!0,showDebugMessages:!1,zIndex:null,zIndexes:{pane_normal:0,content_mask:1,resizer_normal:2,pane_sliding:100,pane_animate:1E3,resizer_drag:1E4},errors:{pane:"pane",selector:"selector",addButtonError:"Error Adding Button\nInvalid ",containerMissing:"UI Layout Initialization Error\nThe specified layout-container does not exist.",
-centerPaneMissing:"UI Layout Initialization Error\nThe center-pane element does not exist.\nThe center-pane is a required element.",noContainerHeight:"UI Layout Initialization Warning\nThe layout-container \"CONTAINER\" has no height.\nTherefore the layout is 0-height and hence 'invisible'!",callbackError:"UI Layout Callback Error\nThe EVENT callback is not a valid function."},panes:{applyDemoStyles:!1,closable:!0,resizable:!0,slidable:!0,initClosed:!1,initHidden:!1,contentSelector:".ui-layout-content",
-contentIgnoreSelector:".ui-layout-ignore",findNestedContent:!1,paneClass:"ui-layout-pane",resizerClass:"ui-layout-resizer",togglerClass:"ui-layout-toggler",buttonClass:"ui-layout-button",minSize:0,maxSize:0,spacing_open:6,spacing_closed:6,togglerLength_open:50,togglerLength_closed:50,togglerAlign_open:"center",togglerAlign_closed:"center",togglerContent_open:"",togglerContent_closed:"",resizerDblClickToggle:!0,autoResize:!0,autoReopen:!0,resizerDragOpacity:1,maskContents:!1,maskObjects:!1,maskZindex:null,
-resizingGrid:!1,livePaneResizing:!1,liveContentResizing:!1,liveResizingTolerance:1,sliderCursor:"pointer",slideTrigger_open:"click",slideTrigger_close:"mouseleave",slideDelay_open:300,slideDelay_close:300,hideTogglerOnSlide:!1,preventQuickSlideClose:d.layout.browser.webkit,preventPrematureSlideClose:!1,tips:{Open:"Open",Close:"Close",Resize:"Resize",Slide:"Slide Open",Pin:"Pin",Unpin:"Un-Pin",noRoomToOpen:"Not enough room to show this panel.",minSizeWarning:"Panel has reached its minimum size",maxSizeWarning:"Panel has reached its maximum size"},
-showOverflowOnHover:!1,enableCursorHotkey:!0,customHotkeyModifier:"SHIFT",fxName:"slide",fxSpeed:null,fxSettings:{},fxOpacityFix:!0,animatePaneSizing:!1,children:null,containerSelector:"",initChildren:!0,destroyChildren:!0,resizeChildren:!0,triggerEventsOnLoad:!1,triggerEventsDuringLiveResize:!0,onshow_start:null,onshow_end:null,onhide_start:null,onhide_end:null,onopen_start:null,onopen_end:null,onclose_start:null,onclose_end:null,onresize_start:null,onresize_end:null,onsizecontent_start:null,onsizecontent_end:null,
-onswap_start:null,onswap_end:null,ondrag_start:null,ondrag_end:null},north:{paneSelector:".ui-layout-north",size:"auto",resizerCursor:"n-resize",customHotkey:""},south:{paneSelector:".ui-layout-south",size:"auto",resizerCursor:"s-resize",customHotkey:""},east:{paneSelector:".ui-layout-east",size:200,resizerCursor:"e-resize",customHotkey:""},west:{paneSelector:".ui-layout-west",size:200,resizerCursor:"w-resize",customHotkey:""},center:{paneSelector:".ui-layout-center",minWidth:0,minHeight:0}};d.layout.optionsMap=
-{layout:"name instanceKey stateManagement effects inset zIndexes errors zIndex scrollToBookmarkOnLoad showErrorMessages maskPanesEarly outset resizeWithWindow resizeWithWindowDelay resizeWithWindowMaxDelay onresizeall onresizeall_start onresizeall_end onload onload_start onload_end onunload onunload_start onunload_end".split(" "),center:"paneClass contentSelector contentIgnoreSelector findNestedContent applyDemoStyles triggerEventsOnLoad showOverflowOnHover maskContents maskObjects liveContentResizing containerSelector children initChildren resizeChildren destroyChildren onresize onresize_start onresize_end onsizecontent onsizecontent_start onsizecontent_end".split(" "),
-noDefault:["paneSelector","resizerCursor","customHotkey"]};d.layout.transformData=function(e,t){var m=t?{panes:{},center:{}}:{},q,x,n,z,C,F,E;if("object"!==typeof e)return m;for(x in e)for(q=m,C=e[x],n=x.split("__"),E=n.length-1,F=0;F<=E;F++)z=n[F],F===E?d.isPlainObject(C)?q[z]=d.layout.transformData(C):q[z]=C:(q[z]||(q[z]={}),q=q[z]);return m};d.layout.backwardCompatibility={map:{applyDefaultStyles:"applyDemoStyles",childOptions:"children",initChildLayout:"initChildren",destroyChildLayout:"destroyChildren",
-resizeChildLayout:"resizeChildren",resizeNestedLayout:"resizeChildren",resizeWhileDragging:"livePaneResizing",resizeContentWhileDragging:"liveContentResizing",triggerEventsWhileDragging:"triggerEventsDuringLiveResize",maskIframesOnResize:"maskContents",useStateCookie:"stateManagement.enabled","cookie.autoLoad":"stateManagement.autoLoad","cookie.autoSave":"stateManagement.autoSave","cookie.keys":"stateManagement.stateKeys","cookie.name":"stateManagement.cookie.name","cookie.domain":"stateManagement.cookie.domain",
-"cookie.path":"stateManagement.cookie.path","cookie.expires":"stateManagement.cookie.expires","cookie.secure":"stateManagement.cookie.secure",noRoomToOpenTip:"tips.noRoomToOpen",togglerTip_open:"tips.Close",togglerTip_closed:"tips.Open",resizerTip:"tips.Resize",sliderTip:"tips.Slide"},renameOptions:function(e){function t(d,n){for(var m=d.split("."),t=m.length-1,q={branch:e,key:m[t]},r=0,p;r<t;r++)p=m[r],q.branch=void 0==q.branch[p]?n?q.branch[p]={}:{}:q.branch[p];return q}var m=d.layout.backwardCompatibility.map,
-q,x,n,z;for(z in m)q=t(z),n=q.branch[q.key],void 0!==n&&(x=t(m[z],!0),x.branch[x.key]=n,delete q.branch[q.key])},renameAllOptions:function(e){var t=d.layout.backwardCompatibility.renameOptions;t(e);e.defaults&&("object"!==typeof e.panes&&(e.panes={}),d.extend(!0,e.panes,e.defaults),delete e.defaults);e.panes&&t(e.panes);d.each(d.layout.config.allPanes,function(d,q){e[q]&&t(e[q])});return e}};d.fn.layout=function(e){function t(a){if(!a)return!0;var b=a.keyCode;if(33>b)return!0;var c={38:"north",40:"south",
-37:"west",39:"east"},g=a.shiftKey,f=a.ctrlKey,u,h,l,k;f&&37<=b&&40>=b&&r[c[b]].enableCursorHotkey?k=c[b]:(f||g)&&d.each(n.borderPanes,function(a,c){u=r[c];h=u.customHotkey;l=u.customHotkeyModifier;if((g&&"SHIFT"==l||f&&"CTRL"==l||f&&g)&&h&&b===(isNaN(h)||9>=h?h.toUpperCase().charCodeAt(0):h))return k=c,!1});if(!k||!w[k]||!r[k].closable||p[k].isHidden)return!0;ca(k);a.stopPropagation();return a.returnValue=!1}function m(a){if(H()){this&&this.tagName&&(a=this);var b;U(a)?b=w[a]:d(a).data("layoutRole")?
-b=d(a):d(a).parents().each(function(){if(d(this).data("layoutRole"))return b=d(this),!1});if(b&&b.length){var c=b.data("layoutEdge");a=p[c];a.cssSaved&&q(c);if(a.isSliding||a.isResizing||a.isClosed)a.cssSaved=!1;else{var g={zIndex:r.zIndexes.resizer_normal+1},f={},u=b.css("overflow"),h=b.css("overflowX"),l=b.css("overflowY");"visible"!=u&&(f.overflow=u,g.overflow="visible");h&&!h.match(/(visible|auto)/)&&(f.overflowX=h,g.overflowX="visible");l&&!l.match(/(visible|auto)/)&&(f.overflowY=h,g.overflowY=
-"visible");a.cssSaved=f;b.css(g);d.each(n.allPanes,function(a,b){b!=c&&q(b)})}}}}function q(a){if(H()){this&&this.tagName&&(a=this);var b;U(a)?b=w[a]:d(a).data("layoutRole")?b=d(a):d(a).parents().each(function(){if(d(this).data("layoutRole"))return b=d(this),!1});if(b&&b.length){a=b.data("layoutEdge");a=p[a];var c=a.cssSaved||{};a.isSliding||a.isResizing||b.css("zIndex",r.zIndexes.pane_normal);b.css(c);a.cssSaved=!1}}}var x=d.layout.browser,n=d.layout.config,z=d.layout.cssWidth,C=d.layout.cssHeight,
-F=d.layout.getElementDimensions,L=d.layout.getElementStyles,N=d.layout.getEventObject,A=d.layout.parsePaneName,r=d.extend(!0,{},d.layout.defaults);r.effects=d.extend(!0,{},d.layout.effects);var p={id:"layout"+d.now(),initialized:!1,paneResizing:!1,panesSliding:{},container:{innerWidth:0,innerHeight:0,outerWidth:0,outerHeight:0,layoutWidth:0,layoutHeight:0},north:{childIdx:0},south:{childIdx:0},east:{childIdx:0},west:{childIdx:0},center:{childIdx:0}},R={north:null,south:null,east:null,west:null,center:null},
-J={data:{},set:function(a,b,c){J.clear(a);J.data[a]=setTimeout(b,c)},clear:function(a){var b=J.data;b[a]&&(clearTimeout(b[a]),delete b[a])}},S=function(a,b,c){var g=r;(g.showErrorMessages&&!c||c&&g.showDebugMessages)&&d.layout.msg(g.name+" / "+a,!1!==b);return!1},D=function(a,b,c){var g=b&&U(b),f=g?p[b]:p,u=g?r[b]:r,h=r.name,l=a+(a.match(/_/)?"":"_end"),k=l.match(/_end$/)?l.substr(0,l.length-4):"",s=u[l]||u[k],e="NC",n=[],m=g?w[b]:0;if(g&&!m)return e;g||"boolean"!==d.type(b)||(c=b,b="");if(s)try{U(s)&&
-(s.match(/,/)?(n=s.split(","),s=eval(n[0])):s=eval(s)),d.isFunction(s)&&(e=n.length?s(n[1]):g?s(b,w[b],f,u,h):s(B,f,u,h))}catch(t){S(r.errors.callbackError.replace(/EVENT/,d.trim((b||"")+" "+l)),!1),"string"===d.type(t)&&string.length&&S("Exception:  "+t,!1)}c||!1===e||(g?(u=r[b],f=p[b],m.triggerHandler("layoutpane"+l,[b,m,f,u,h]),k&&m.triggerHandler("layoutpane"+k,[b,m,f,u,h])):(v.triggerHandler("layout"+l,[B,f,u,h]),k&&v.triggerHandler("layout"+k,[B,f,u,h])));g&&"onresize_end"===a&&Fa(b+"",!0);
-return e},Ga=function(a){if(!x.mozilla){var b=w[a];"IFRAME"===p[a].tagName?b.css(n.hidden).css(n.visible):b.find("IFRAME").css(n.hidden).css(n.visible)}},la=function(a){var b=w[a];a=n[a].dir;b={minWidth:1001-z(b,1E3),minHeight:1001-C(b,1E3)};"horz"===a&&(b.minSize=b.minHeight);"vert"===a&&(b.minSize=b.minWidth);return b},Va=function(a,b,c){var g=a;U(a)?g=w[a]:a.jquery||(g=d(a));a=C(g,b);g.css({height:a,visibility:"visible"});0<a&&0<g.innerWidth()?c&&g.data("autoHidden")&&(g.show().data("autoHidden",
-!1),x.mozilla||g.css(n.hidden).css(n.visible)):c&&!g.data("autoHidden")&&g.hide().data("autoHidden",!0)},V=function(a,b,c){c||(c=n[a].dir);U(b)&&b.match(/%/)&&(b="100%"===b?-1:parseInt(b,10)/100);if(0===b)return 0;if(1<=b)return parseInt(b,10);var g=r,f=0;"horz"==c?f=y.innerHeight-(w.north?g.north.spacing_open:0)-(w.south?g.south.spacing_open:0):"vert"==c&&(f=y.innerWidth-(w.west?g.west.spacing_open:0)-(w.east?g.east.spacing_open:0));if(-1===b)return f;if(0<b)return ka(f*b);if("center"==a)return 0;
-c="horz"===c?"height":"width";g=w[a];a="height"===c?M[a]:!1;var f=d.layout.showInvisibly(g),u=g.css(c),h=a?a.css(c):0;g.css(c,"auto");a&&a.css(c,"auto");b="height"===c?g.outerHeight():g.outerWidth();g.css(c,u).css(f);a&&a.css(c,h);return b},W=function(a,b){var c=w[a],g=r[a],f=p[a],d=b?g.spacing_open:0,g=b?g.spacing_closed:0;return!c||f.isHidden?0:f.isClosed||f.isSliding&&b?g:"horz"===n[a].dir?c.outerHeight()+d:c.outerWidth()+d},P=function(a,b){if(H()){var c=r[a],g=p[a],f=n[a],d=f.dir;f.sizeType.toLowerCase();
-var f=void 0!=b?b:g.isSliding,h=c.spacing_open,l=n.oppositeEdge[a],k=p[l],s=w[l],e=!s||!1===k.isVisible||k.isSliding?0:"horz"==d?s.outerHeight():s.outerWidth(),l=(!s||k.isHidden?0:r[l][!1!==k.isClosed?"spacing_closed":"spacing_open"])||0,k="horz"==d?y.innerHeight:y.innerWidth,s=la("center"),s="horz"==d?E(r.center.minHeight,s.minHeight):E(r.center.minWidth,s.minWidth),f=k-h-(f?0:V("center",s,d)+e+l),d=g.minSize=E(V(a,c.minSize),la(a).minSize),f=g.maxSize=ua(c.maxSize?V(a,c.maxSize):1E5,f),g=g.resizerPosition=
-{},h=y.inset.top,e=y.inset.left,l=y.innerWidth,k=y.innerHeight,c=c.spacing_open;switch(a){case "north":g.min=h+d;g.max=h+f;break;case "west":g.min=e+d;g.max=e+f;break;case "south":g.min=h+k-f-c;g.max=h+k-d-c;break;case "east":g.min=e+l-f-c,g.max=e+l-d-c}}},va=function(a,b){var c=d(a),g=c.data("layoutRole"),f=c.data("layoutEdge"),u=r[f][g+"Class"],f="-"+f,h=c.hasClass(u+"-closed")?"-closed":"-open",l="-closed"===h?"-open":"-closed",h=u+"-hover "+(u+f+"-hover ")+(u+h+"-hover ")+(u+f+h+"-hover ");b&&
-(h+=u+l+"-hover "+(u+f+l+"-hover "));"resizer"==g&&c.hasClass(u+"-sliding")&&(h+=u+"-sliding-hover "+(u+f+"-sliding-hover "));return d.trim(h)},wa=function(a,b){var c=d(b||this);a&&"toggler"===c.data("layoutRole")&&a.stopPropagation();c.addClass(va(c))},T=function(a,b){var c=d(b||this);c.removeClass(va(c,!0))},Ha=function(a){a=d(this).data("layoutEdge");var b=p[a];d(document);b.isResizing||p.paneResizing||r.maskPanesEarly&&ia(a,{resizing:!0})},Ia=function(a,b){var c=b||this,g=d(c).data("layoutEdge"),
-f=g+"ResizerLeave";d(document);J.clear(g+"_openSlider");J.clear(f);b?r.maskPanesEarly&&!p.paneResizing&&ma():J.set(f,function(){Ia(a,c)},200)},H=function(){return p.initialized||p.creatingLayout?!0:na()},na=function(a){var b=r;if(!v.is(":visible"))return!a&&x.webkit&&"BODY"===v[0].tagName&&setTimeout(function(){na(!0)},50),!1;if(!Ja("center").length)return S(b.errors.centerPaneMissing);p.creatingLayout=!0;d.extend(y,F(v,b.inset));Wa();b.scrollToBookmarkOnLoad&&(a=self.location,a.hash&&a.replace(a.hash));
-B.hasParentLayout?b.resizeWithWindow=!1:b.resizeWithWindow&&d(window).bind("resize."+I,Xa);delete p.creatingLayout;p.initialized=!0;ha(B,d.layout.onReady);D("onload_end");return!0},xa=function(a,b){var c=A.call(this,a),g=w[c];if(g){var f=M[c],u=p[c],h=r[c],l=r.stateManagement||{},h=b?h.children=b:h.children;if(d.isPlainObject(h))h=[h];else if(!h||!d.isArray(h))return;d.each(h,function(a,b){d.isPlainObject(b)&&(b.containerSelector?g.find(b.containerSelector):f||g).each(function(){var a=d(this),f=a.data("layout");
-if(!f){Ka({container:a,options:b},u);if(l.includeChildren&&p.stateData[c]){var f=(p.stateData[c].children||{})[b.instanceKey],g=b.stateManagement||(b.stateManagement={autoLoad:!0});!0===g.autoLoad&&f&&(g.autoSave=!1,g.includeChildren=!0,g.autoLoad=d.extend(!0,{},f))}(f=a.layout(b))&&oa(c,f)}})})}},Ka=function(a,b){var c=a.container,g=a.options,f=g.stateManagement,d=g.instanceKey||c.data("layoutInstanceKey");d||(d=(f&&f.cookie?f.cookie.name:"")||g.name);d=d?d.replace(/[^\w-]/gi,"_").replace(/_{2,}/g,
-"_"):"layout"+ ++b.childIdx;g.instanceKey=d;c.data("layoutInstanceKey",d);return d},oa=function(a,b){var c=w[a],g=R[a],f=p[a];d.isPlainObject(g)&&(d.each(g,function(a,b){b.destroyed&&delete g[a]}),d.isEmptyObject(g)&&(g=R[a]=null));b||g||(b=c.data("layout"));b&&(b.hasParentLayout=!0,c=b.options,Ka(b,f),g||(g=R[a]={}),g[c.instanceKey]=b.container.data("layout"));B[a].children=R[a];b||xa(a)},Xa=function(){var a=r,b=Number(a.resizeWithWindowDelay);10>b&&(b=100);J.clear("winResize");J.set("winResize",
-function(){J.clear("winResize");J.clear("winResizeRepeater");var b=F(v,a.inset);b.innerWidth===y.innerWidth&&b.innerHeight===y.innerHeight||da()},b);J.data.winResizeRepeater||La()},La=function(){var a=Number(r.resizeWithWindowMaxDelay);0<a&&J.set("winResizeRepeater",function(){La();da()},a)},Ma=function(){D("onunload_start");ha(B,d.layout.onUnload);D("onunload_end")},Na=function(a){a=a?a.split(","):n.borderPanes;d.each(a,function(a,c){var g=r[c];if(g.enableCursorHotkey||g.customHotkey)return d(document).bind("keydown."+
-I,t),!1})},Ya=function(){function a(a){var b=r[a],c=r.panes;b.fxSettings||(b.fxSettings={});c.fxSettings||(c.fxSettings={});d.each(["_open","_close","_size"],function(f,g){var h="fxName"+g,u="fxSpeed"+g,l="fxSettings"+g,e=b[h]=b[h]||c[h]||b.fxName||c.fxName||"none",p=d.effects&&(d.effects[e]||d.effects.effect&&d.effects.effect[e]);"none"!==e&&r.effects[e]&&p||(e=b[h]="none");e=r.effects[e]||{};h=e.all||null;e=e[a]||null;b[u]=b[u]||c[u]||b.fxSpeed||c.fxSpeed||null;b[l]=d.extend(!0,{},h,e,c.fxSettings,
-b.fxSettings,c[l],b[l])});delete b.fxName;delete b.fxSpeed;delete b.fxSettings}var b,c,g,f,u,h;e=d.layout.transformData(e,!0);e=d.layout.backwardCompatibility.renameAllOptions(e);if(!d.isEmptyObject(e.panes)){b=d.layout.optionsMap.noDefault;f=0;for(u=b.length;f<u;f++)g=b[f],delete e.panes[g];b=d.layout.optionsMap.layout;f=0;for(u=b.length;f<u;f++)g=b[f],delete e.panes[g]}b=d.layout.optionsMap.layout;var l=d.layout.config.optionRootKeys;for(g in e)f=e[g],0>d.inArray(g,l)&&0>d.inArray(g,b)&&(e.panes[g]||
-(e.panes[g]=d.isPlainObject(f)?d.extend(!0,{},f):f),delete e[g]);d.extend(!0,r,e);d.each(n.allPanes,function(f,l){n[l]=d.extend(!0,{},n.panes,n[l]);c=r.panes;h=r[l];if("center"===l)for(b=d.layout.optionsMap.center,f=0,u=b.length;f<u;f++)g=b[f],e.center[g]||!e.panes[g]&&h[g]||(h[g]=c[g]);else h=r[l]=d.extend(!0,{},c,h),a(l),h.resizerClass||(h.resizerClass="ui-layout-resizer"),h.togglerClass||(h.togglerClass="ui-layout-toggler");h.paneClass||(h.paneClass="ui-layout-pane")});f=e.zIndex;l=r.zIndexes;
-0<f&&(l.pane_normal=f,l.content_mask=E(f+1,l.content_mask),l.resizer_normal=E(f+2,l.resizer_normal));delete r.panes},Ja=function(a){a=r[a].paneSelector;if("#"===a.substr(0,1))return v.find(a).eq(0);var b=v.children(a).eq(0);return b.length?b:v.children("form:first").children(a).eq(0)},Wa=function(a){A(a);d.each(n.allPanes,function(a,c){Oa(c,!0)});ya();d.each(n.borderPanes,function(a,c){w[c]&&p[c].isVisible&&(P(c),X(c))});Y("center");d.each(n.allPanes,function(a,c){Pa(c)})},Oa=function(a,b){if(b||
-H()){var c=r[a],g=p[a],f=n[a],d=f.dir,h="center"===a,l={},k=w[a],e,ba;k?za(a,!1,!0,!1):M[a]=!1;k=w[a]=Ja(a);if(k.length){k.data("layoutCSS")||k.data("layoutCSS",L(k,"position,top,left,bottom,right,width,height,overflow,zIndex,display,backgroundColor,padding,margin,border"));B[a]={name:a,pane:w[a],content:M[a],options:r[a],state:p[a],children:R[a]};k.data({parentLayout:B,layoutPane:B[a],layoutEdge:a,layoutRole:"pane"}).css(f.cssReq).css("zIndex",r.zIndexes.pane_normal).css(c.applyDemoStyles?f.cssDemo:
-{}).addClass(c.paneClass+" "+c.paneClass+"-"+a).bind("mouseenter."+I,wa).bind("mouseleave."+I,T);f={hide:"",show:"",toggle:"",close:"",open:"",slideOpen:"",slideClose:"",slideToggle:"",size:"sizePane",sizePane:"sizePane",sizeContent:"",sizeHandles:"",enableClosable:"",disableClosable:"",enableSlideable:"",disableSlideable:"",enableResizable:"",disableResizable:"",swapPanes:"swapPanes",swap:"swapPanes",move:"swapPanes",removePane:"removePane",remove:"removePane",createChildren:"",resizeChildren:"",
-resizeAll:"resizeAll",resizeLayout:"resizeAll"};for(ba in f)k.bind("layoutpane"+ba.toLowerCase()+"."+I,B[f[ba]||ba]);Aa(a,!1);h||(e=g.size=V(a,c.size),h=V(a,c.minSize)||1,ba=V(a,c.maxSize)||1E5,0<e&&(e=E(ua(e,ba),h)),g.autoResize=c.autoResize,g.isClosed=!1,g.isSliding=!1,g.isResizing=!1,g.isHidden=!1,g.pins||(g.pins=[]));g.tagName=k[0].tagName;g.edge=a;g.noRoom=!1;g.isVisible=!0;Qa(a);"horz"===d?l.height=C(k,e):"vert"===d&&(l.width=z(k,e));k.css(l);"horz"!=d&&Y(a,!0);p.initialized&&(ya(a),Na(a));
-c.initClosed&&c.closable&&!c.initHidden?Z(a,!0,!0):c.initHidden||c.initClosed?Ba(a):g.noRoom||k.css("display","block");k.css("visibility","visible");c.showOverflowOnHover&&k.hover(m,q);p.initialized&&Pa(a)}else w[a]=!1}},Pa=function(a){var b=w[a],c=p[a],g=r[a];b&&(b.data("layout")&&oa(a,b.data("layout")),c.isVisible&&(p.initialized?da():ea(a),g.triggerEventsOnLoad?D("onresize_end",a):Fa(a,!0)),g.initChildren&&g.children&&xa(a))},Qa=function(a){a=a?a.split(","):n.borderPanes;d.each(a,function(a,c){var g=
-w[c],f=G[c],d=p[c],h=n[c].side,l={};if(g){switch(c){case "north":l.top=y.inset.top;l.left=y.inset.left;l.right=y.inset.right;break;case "south":l.bottom=y.inset.bottom;l.left=y.inset.left;l.right=y.inset.right;break;case "west":l.left=y.inset.left;break;case "east":l.right=y.inset.right}g.css(l);f&&d.isClosed?f.css(h,y.inset[h]):f&&!d.isHidden&&f.css(h,y.inset[h]+W(c))}})},ya=function(a){a=a?a.split(","):n.borderPanes;d.each(a,function(a,c){var g=w[c];G[c]=!1;K[c]=!1;if(g){var g=r[c],f=p[c],u="#"===
-g.paneSelector.substr(0,1)?g.paneSelector.substr(1):"",h=g.resizerClass,l=g.togglerClass,k="-"+c,e=B[c],m=e.resizer=G[c]=d("<div></div>"),e=e.toggler=g.closable?K[c]=d("<div></div>"):!1;!f.isVisible&&g.slidable&&m.attr("title",g.tips.Slide).css("cursor",g.sliderCursor);m.attr("id",u?u+"-resizer":"").data({parentLayout:B,layoutPane:B[c],layoutEdge:c,layoutRole:"resizer"}).css(n.resizers.cssReq).css("zIndex",r.zIndexes.resizer_normal).css(g.applyDemoStyles?n.resizers.cssDemo:{}).addClass(h+" "+h+k).hover(wa,
-T).hover(Ha,Ia).mousedown(d.layout.disableTextSelection).mouseup(d.layout.enableTextSelection).appendTo(v);d.fn.disableSelection&&m.disableSelection();g.resizerDblClickToggle&&m.bind("dblclick."+I,ca);e&&(e.attr("id",u?u+"-toggler":"").data({parentLayout:B,layoutPane:B[c],layoutEdge:c,layoutRole:"toggler"}).css(n.togglers.cssReq).css(g.applyDemoStyles?n.togglers.cssDemo:{}).addClass(l+" "+l+k).hover(wa,T).bind("mouseenter",Ha).appendTo(m),g.togglerContent_open&&d("<span>"+g.togglerContent_open+"</span>").data({layoutEdge:c,
-layoutRole:"togglerContent"}).data("layoutRole","togglerContent").data("layoutEdge",c).addClass("content content-open").css("display","none").appendTo(e),g.togglerContent_closed&&d("<span>"+g.togglerContent_closed+"</span>").data({layoutEdge:c,layoutRole:"togglerContent"}).addClass("content content-closed").css("display","none").appendTo(e),Ra(c));Za(c);f.isVisible?Ca(c):(pa(c),aa(c,!0))}});fa()},Aa=function(a,b){if(H()){var c=r[a],g=c.contentSelector,f=B[a],d=w[a],h;g&&(h=f.content=M[a]=c.findNestedContent?
-d.find(g).eq(0):d.children(g).eq(0));h&&h.length?(h.data("layoutRole","content"),h.data("layoutCSS")||h.data("layoutCSS",L(h,"height")),h.css(n.content.cssReq),c.applyDemoStyles&&(h.css(n.content.cssDemo),d.css(n.content.cssDemoPane)),d.css("overflowX").match(/(scroll|auto)/)&&d.css("overflow","hidden"),p[a].content={},!1!==b&&ea(a)):f.content=M[a]=!1}},Za=function(a){var b=d.layout.plugins.draggable;a=a?a.split(","):n.borderPanes;d.each(a,function(a,f){var u=r[f];if(!b||!w[f]||!u.resizable)return u.resizable=
-!1,!0;var h=p[f],e=r.zIndexes,k=n[f],s="horz"==k.dir?"top":"left",m=G[f],O=u.resizerClass,t=0,q,y,x=O+"-drag",z=O+"-"+f+"-drag",C=O+"-dragging",B=O+"-"+f+"-dragging",A=O+"-dragging-limit",E=O+"-"+f+"-dragging-limit",F=!1;h.isClosed||m.attr("title",u.tips.Resize).css("cursor",u.resizerCursor);m.draggable({containment:v[0],axis:"horz"==k.dir?"y":"x",delay:0,distance:1,grid:u.resizingGrid,helper:"clone",opacity:u.resizerDragOpacity,addClasses:!1,zIndex:e.resizer_drag,start:function(a,b){u=r[f];h=p[f];
-y=u.livePaneResizing;if(!1===D("ondrag_start",f))return!1;h.isResizing=!0;p.paneResizing=f;J.clear(f+"_closeSlider");P(f);q=h.resizerPosition;t=b.position[s];m.addClass(x+" "+z);F=!1;ia(f,{resizing:!0})},drag:function(a,b){F||(b.helper.addClass(C+" "+B).css({right:"auto",bottom:"auto"}).children().css("visibility","hidden"),F=!0,h.isSliding&&w[f].css("zIndex",e.pane_sliding));var g=0;b.position[s]<q.min?(b.position[s]=q.min,g=-1):b.position[s]>q.max&&(b.position[s]=q.max,g=1);g?(b.helper.addClass(A+
-" "+E),window.defaultStatus=0<g&&f.match(/(north|west)/)||0>g&&f.match(/(south|east)/)?u.tips.maxSizeWarning:u.tips.minSizeWarning):(b.helper.removeClass(A+" "+E),window.defaultStatus="");y&&Math.abs(b.position[s]-t)>=u.liveResizingTolerance&&(t=b.position[s],c(a,b,f))},stop:function(a,b){d("body").enableSelection();window.defaultStatus="";m.removeClass(x+" "+z);h.isResizing=!1;p.paneResizing=!1;c(a,b,f,!0)}})});var c=function(a,b,c,d){var e=b.position,k=n[c];a=r[c];b=p[c];var s;switch(c){case "north":s=
-e.top;break;case "west":s=e.left;break;case "south":s=y.layoutHeight-e.top-a.spacing_open;break;case "east":s=y.layoutWidth-e.left-a.spacing_open}s-=y.inset[k.side];d?(!1!==D("ondrag_end",c)&&qa(c,s,!1,!0),ma(!0),b.isSliding&&ia(c,{resizing:!0})):Math.abs(s-b.size)<a.liveResizingTolerance||(qa(c,s,!1,!0),Q.each(Sa))}},Sa=function(){var a=d(this),b=a.data("layoutMask"),b=p[b];"IFRAME"==b.tagName&&b.isVisible&&a.css({top:b.offsetTop,left:b.offsetLeft,width:b.outerWidth,height:b.outerHeight})},ia=function(a,
-b){var c=n[a],g=["center"],f=r.zIndexes,u=d.extend({objectsOnly:!1,animation:!1,resizing:!0,sliding:p[a].isSliding},b),h,e;u.resizing&&g.push(a);u.sliding&&g.push(n.oppositeEdge[a]);"horz"===c.dir&&(g.push("west"),g.push("east"));d.each(g,function(a,b){e=p[b];h=r[b];e.isVisible&&(h.maskObjects||!u.objectsOnly&&h.maskContents)&&$a(b).each(function(){Sa.call(this);this.style.zIndex=e.isSliding?f.pane_sliding+1:f.pane_normal+1;this.style.display="block"})})},ma=function(a){if(a||!p.paneResizing)Q.hide();
-else if(!a&&!d.isEmptyObject(p.panesSliding)){a=Q.length-1;for(var b,c;0<=a;a--)c=Q.eq(a),b=c.data("layoutMask"),r[b].maskObjects||c.hide()}},$a=function(a){for(var b=d([]),c,g=0,f=Q.length;g<f;g++)c=Q.eq(g),c.data("layoutMask")===a&&(b=b.add(c));if(b.length)return b;b=w[a];c=p[a];var g=r[a],f=r.zIndexes,u,h,e,k,s;if(g.maskContents||g.maskObjects){for(s=0;s<(g.maskObjects?2:1);s++)u=g.maskObjects&&0==s,h=document.createElement(u?"iframe":"div"),e=d(h).data("layoutMask",a),h.className="ui-layout-mask ui-layout-mask-"+
-a,k=h.style,k.background="#FFF",k.position="absolute",k.display="block",u?(h.src="about:blank",h.frameborder=0,k.border=0,k.opacity=0,k.filter="Alpha(Opacity='0')"):(k.opacity=.001,k.filter="Alpha(Opacity='1')"),"IFRAME"==c.tagName?(k.zIndex=f.pane_normal+1,v.append(h)):(e.addClass("ui-layout-mask-inside-pane"),k.zIndex=g.maskZindex||f.content_mask,k.top=0,k.left=0,k.width="100%",k.height="100%",b.append(h)),Q=Q.add(h);a=Q}else a=d([]);return a},za=function(a,b,c,g){if(H()){a=A.call(this,a);var f=
-w[a],u=M[a],h=G[a],e=K[a];f&&d.isEmptyObject(f.data())&&(f=!1);u&&d.isEmptyObject(u.data())&&(u=!1);h&&d.isEmptyObject(h.data())&&(h=!1);e&&d.isEmptyObject(e.data())&&(e=!1);f&&f.stop(!0,!0);var k=r[a],s=R[a],p=d.isPlainObject(s)&&!d.isEmptyObject(s);g=void 0!==g?g:k.destroyChildren;p&&g&&(d.each(s,function(a,b){b.destroyed||b.destroy(!0);b.destroyed&&delete s[a]}),d.isEmptyObject(s)&&(s=R[a]=null,p=!1));f&&b&&!p?f.remove():f&&f[0]&&(b=k.paneClass,g=b+"-"+a,b=[b,b+"-open",b+"-closed",b+"-sliding",
-g,g+"-open",g+"-closed",g+"-sliding"],d.merge(b,va(f,!0)),f.removeClass(b.join(" ")).removeData("parentLayout").removeData("layoutPane").removeData("layoutRole").removeData("layoutEdge").removeData("autoHidden").unbind("."+I),p&&u?(u.width(u.width()),d.each(s,function(a,b){b.resizeAll()})):u&&u.css(u.data("layoutCSS")).removeData("layoutCSS").removeData("layoutRole"),f.data("layout")||f.css(f.data("layoutCSS")).removeData("layoutCSS"));e&&e.remove();h&&h.remove();B[a]=w[a]=M[a]=G[a]=K[a]=!1;c||da()}},
-ra=function(a){var b=w[a],c=b[0].style;r[a].useOffscreenClose?(b.data(n.offscreenReset)||b.data(n.offscreenReset,{left:c.left,right:c.right}),b.css(n.offscreenCSS)):b.hide().removeData(n.offscreenReset)},Ta=function(a){var b=w[a];a=r[a];var c=n.offscreenCSS,g=b.data(n.offscreenReset),f=b[0].style;b.show().removeData(n.offscreenReset);a.useOffscreenClose&&g&&(f.left==c.left&&(f.left=g.left),f.right==c.right&&(f.right=g.right))},Ba=function(a,b){if(H()){var c=A.call(this,a),g=r[c],f=p[c],d=w[c],h=G[c];
-"center"===c||!d||f.isHidden||p.initialized&&!1===D("onhide_start",c)||(f.isSliding=!1,delete p.panesSliding[c],h&&h.hide(),!p.initialized||f.isClosed?(f.isClosed=!0,f.isHidden=!0,f.isVisible=!1,p.initialized||ra(c),Y("horz"===n[c].dir?"":"center"),(p.initialized||g.triggerEventsOnLoad)&&D("onhide_end",c)):(f.isHiding=!0,Z(c,!1,b)))}},sa=function(a,b,c,g){if(H()){a=A.call(this,a);var f=p[a],d=w[a];"center"!==a&&d&&f.isHidden&&!1!==D("onshow_start",a)&&(f.isShowing=!0,f.isSliding=!1,delete p.panesSliding[a],
-!1===b?Z(a,!0):ga(a,!1,c,g))}},ca=function(a,b){if(H()){var c=N(a),g=A.call(this,a),f=p[g];c&&c.stopImmediatePropagation();f.isHidden?sa(g):f.isClosed?ga(g,!!b):Z(g)}},ab=function(a,b){var c=p[a];ra(a);c.isClosed=!0;c.isVisible=!1;b&&pa(a)},Z=function(a,b,c,g){function f(){k.isMoving=!1;aa(d,!0);var a=n.oppositeEdge[d];p[a].noRoom&&(P(a),X(a));g||!p.initialized&&!e.triggerEventsOnLoad||(m||D("onclose_end",d),m&&D("onshow_end",d),O&&D("onhide_end",d))}var d=A.call(this,a);if("center"!==d)if(!p.initialized&&
-w[d])ab(d,!0);else if(H()){var h=w[d],e=r[d],k=p[d],s,m,O;v.queue(function(a){if(!h||!e.closable&&!k.isShowing&&!k.isHiding||!b&&k.isClosed&&!k.isShowing)return a();var g=!k.isShowing&&!1===D("onclose_start",d);m=k.isShowing;O=k.isHiding;delete k.isShowing;delete k.isHiding;if(g)return a();s=!c&&!k.isClosed&&"none"!=e.fxName_close;k.isMoving=!0;k.isClosed=!0;k.isVisible=!1;O?k.isHidden=!0:m&&(k.isHidden=!1);k.isSliding?ja(d,!1):Y("horz"===n[d].dir?"":"center",!1);pa(d);s?(ta(d,!0),h.hide(e.fxName_close,
-e.fxSettings_close,e.fxSpeed_close,function(){ta(d,!1);k.isClosed&&f();a()})):(ra(d),f(),a())})}},pa=function(a){if(G[a]){var b=G[a],c=K[a],g=r[a],f=p[a],e=n[a].side,h=g.resizerClass,l=g.togglerClass,k="-"+a;b.css(e,y.inset[e]).removeClass(h+"-open "+h+k+"-open").removeClass(h+"-sliding "+h+k+"-sliding").addClass(h+"-closed "+h+k+"-closed");f.isHidden&&b.hide();g.resizable&&d.layout.plugins.draggable&&b.draggable("disable").removeClass("ui-state-disabled").css("cursor","default").attr("title","");
-c&&(c.removeClass(l+"-open "+l+k+"-open").addClass(l+"-closed "+l+k+"-closed").attr("title",g.tips.Open),c.children(".content-open").hide(),c.children(".content-closed").css("display","block"));Da(a,!1);p.initialized&&fa()}},ga=function(a,b,c,d){function f(){k.isMoving=!1;Ga(e);k.isSliding||Y("vert"==n[e].dir?"center":"",!1);Ca(e)}if(H()){var e=A.call(this,a),h=w[e],l=r[e],k=p[e],s,m;"center"!==e&&v.queue(function(a){if(!h||!l.resizable&&!l.closable&&!k.isShowing||k.isVisible&&!k.isSliding)return a();
-if(k.isHidden&&!k.isShowing)a(),sa(e,!0);else{k.autoResize&&k.size!=l.size?$(e,l.size,!0,!0,!0):P(e,b);var p=D("onopen_start",e);if("abort"===p)return a();"NC"!==p&&P(e,b);if(k.minSize>k.maxSize)return Da(e,!1),!d&&l.tips.noRoomToOpen&&alert(l.tips.noRoomToOpen),a();b?ja(e,!0):k.isSliding?ja(e,!1):l.slidable&&aa(e,!1);k.noRoom=!1;X(e);m=k.isShowing;delete k.isShowing;s=!c&&k.isClosed&&"none"!=l.fxName_open;k.isMoving=!0;k.isVisible=!0;k.isClosed=!1;m&&(k.isHidden=!1);s?(ta(e,!0),h.show(l.fxName_open,
-l.fxSettings_open,l.fxSpeed_open,function(){ta(e,!1);k.isVisible&&f();a()})):(Ta(e),f(),a())}})}},Ca=function(a,b){var c=w[a],g=G[a],f=K[a],e=r[a],h=p[a],l=n[a].side,k=e.resizerClass,s=e.togglerClass,m="-"+a;g.css(l,y.inset[l]+W(a)).removeClass(k+"-closed "+k+m+"-closed").addClass(k+"-open "+k+m+"-open");h.isSliding?g.addClass(k+"-sliding "+k+m+"-sliding"):g.removeClass(k+"-sliding "+k+m+"-sliding");T(0,g);e.resizable&&d.layout.plugins.draggable?g.draggable("enable").css("cursor",e.resizerCursor).attr("title",
-e.tips.Resize):h.isSliding||g.css("cursor","default");f&&(f.removeClass(s+"-closed "+s+m+"-closed").addClass(s+"-open "+s+m+"-open").attr("title",e.tips.Close),T(0,f),f.children(".content-closed").hide(),f.children(".content-open").css("display","block"));Da(a,!h.isSliding);d.extend(h,F(c));p.initialized&&(fa(),ea(a,!0));!b&&(p.initialized||e.triggerEventsOnLoad)&&c.is(":visible")&&(D("onopen_end",a),h.isShowing&&D("onshow_end",a),p.initialized&&D("onresize_end",a))},Ua=function(a){function b(){f.isClosed?
-f.isMoving||ga(d,!0):ja(d,!0)}if(H()){var c=N(a),d=A.call(this,a),f=p[d];a=r[d].slideDelay_open;"center"!==d&&(c&&c.stopImmediatePropagation(),f.isClosed&&c&&"mouseenter"===c.type&&0<a?J.set(d+"_openSlider",b,a):b())}},Ea=function(a){function b(){f.isClosed?ja(g,!1):f.isMoving||Z(g)}if(H()){var c=N(a),g=A.call(this,a);a=r[g];var f=p[g],e=f.isMoving?1E3:300;"center"===g||f.isClosed||f.isResizing||("click"===a.slideTrigger_close?b():a.preventQuickSlideClose&&f.isMoving||a.preventPrematureSlideClose&&
-c&&d.layout.isMouseOverElem(c,w[g])||(c?J.set(g+"_closeSlider",b,E(a.slideDelay_close,e)):b()))}},ta=function(a,b){var c=w[a],d=p[a],f=r[a],e=r.zIndexes;b?(ia(a,{animation:!0,objectsOnly:!0}),c.css({zIndex:e.pane_animate}),"south"==a?c.css({top:y.inset.top+y.innerHeight-c.outerHeight()}):"east"==a&&c.css({left:y.inset.left+y.innerWidth-c.outerWidth()})):(ma(),c.css({zIndex:d.isSliding?e.pane_sliding:e.pane_normal}),"south"==a?c.css({top:"auto"}):"east"!=a||c.css("left").match(/\-99999/)||c.css({left:"auto"}),
-x.msie&&f.fxOpacityFix&&"slide"!=f.fxName_open&&c.css("filter")&&1==c.css("opacity")&&c[0].style.removeAttribute("filter"))},aa=function(a,b){var c=r[a],d=G[a],f=c.slideTrigger_open.toLowerCase();if(d&&(!b||c.slidable)){f.match(/mouseover/)?f=c.slideTrigger_open="mouseenter":f.match(/(click|dblclick|mouseenter)/)||(f=c.slideTrigger_open="click");if(c.resizerDblClickToggle&&f.match(/click/))d[b?"unbind":"bind"]("dblclick."+I,ca);d[b?"bind":"unbind"](f+"."+I,Ua).css("cursor",b?c.sliderCursor:"default").attr("title",
-b?c.tips.Slide:"")}},ja=function(a,b){function c(b){J.clear(a+"_closeSlider");b.stopPropagation()}var d=r[a],f=p[a],e=r.zIndexes,h=d.slideTrigger_close.toLowerCase(),l=b?"bind":"unbind",k=w[a],s=G[a];J.clear(a+"_closeSlider");b?(f.isSliding=!0,p.panesSliding[a]=!0,aa(a,!1)):(f.isSliding=!1,delete p.panesSliding[a]);k.css("zIndex",b?e.pane_sliding:e.pane_normal);s.css("zIndex",b?e.pane_sliding+2:e.resizer_normal);h.match(/(click|mouseleave)/)||(h=d.slideTrigger_close="mouseleave");s[l](h,Ea);"mouseleave"===
-h&&(k[l]("mouseleave."+I,Ea),s[l]("mouseenter."+I,c),k[l]("mouseenter."+I,c));b?"click"!==h||d.resizable||(s.css("cursor",b?d.sliderCursor:"default"),s.attr("title",b?d.tips.Close:"")):J.clear(a+"_closeSlider")},X=function(a,b,c,g){b=r[a];var f=p[a],e=n[a],h=w[a],l=G[a],k="vert"===e.dir,s=!1;if("center"===a||k&&f.noVerticalRoom)(s=0<=f.maxHeight)&&f.noRoom?(Ta(a),l&&l.show(),f.isVisible=!0,f.noRoom=!1,k&&(f.noVerticalRoom=!1),Ga(a)):s||f.noRoom||(ra(a),l&&l.hide(),f.isVisible=!1,f.noRoom=!0);"center"!==
-a&&(f.minSize<=f.maxSize?(f.size>f.maxSize?$(a,f.maxSize,c,!0,g):f.size<f.minSize?$(a,f.minSize,c,!0,g):l&&f.isVisible&&h.is(":visible")&&(c=f.size+y.inset[e.side],d.layout.cssNum(l,e.side)!=c&&l.css(e.side,c)),f.noRoom&&(f.wasOpen&&b.closable?b.autoReopen?ga(a,!1,!0,!0):f.noRoom=!1:sa(a,f.wasOpen,!0,!0))):f.noRoom||(f.noRoom=!0,f.wasOpen=!f.isClosed&&!f.isSliding,f.isClosed||(b.closable?Z(a,!0,!0):Ba(a,!0))))},qa=function(a,b,c,d,f){if(H()){a=A.call(this,a);var e=r[a],h=p[a];f=f||e.livePaneResizing&&
-!h.isResizing;"center"!==a&&(h.autoResize=!1,$(a,b,c,d,f))}},$=function(a,b,c,g,f){function e(){for(var a="width"===q?s.outerWidth():s.outerHeight(),a=[{pane:h,count:1,target:b,actual:a,correct:b===a,attempt:b,cssSize:J}],g=a[0],l={},u="Inaccurate size after resizing the "+h+"-pane.";!g.correct;){l={pane:h,count:g.count+1,target:b};l.attempt=g.actual>b?E(0,g.attempt-(g.actual-b)):E(0,g.attempt+(b-g.actual));l.cssSize=("horz"==n[h].dir?C:z)(w[h],l.attempt);s.css(q,l.cssSize);l.actual="width"==q?s.outerWidth():
-s.outerHeight();l.correct=b===l.actual;1===a.length&&(S(u,!1,!0),S(g,!1,!0));S(l,!1,!0);if(3<a.length)break;a.push(l);g=a[a.length-1]}k.size=b;d.extend(k,F(s));k.isVisible&&s.is(":visible")&&(m&&m.css(t,b+y.inset[t]),ea(h));!c&&!x&&p.initialized&&k.isVisible&&D("onresize_end",h);c||(k.isSliding||Y("horz"==n[h].dir?"":"center",x,f),fa());g=n.oppositeEdge[h];b<I&&p[g].noRoom&&(P(g),X(g,!1,c));1<a.length&&S(u+"\nSee the Error Console for details.",!0,!0)}if(H()){var h=A.call(this,a),l=r[h],k=p[h],s=
-w[h],m=G[h],t=n[h].side,q=n[h].sizeType.toLowerCase(),x=k.isResizing&&!l.triggerEventsDuringLiveResize,B=!0!==g&&l.animatePaneSizing,I,J;"center"!==h&&v.queue(function(a){P(h);I=k.size;b=V(h,b);b=E(b,V(h,l.minSize));b=ua(b,k.maxSize);if(b<k.minSize)a(),X(h,!1,c);else{if(!f&&b===I)return a();k.newSize=b;!c&&p.initialized&&k.isVisible&&D("onresize_start",h);J=("horz"==n[h].dir?C:z)(w[h],b);if(B&&s.is(":visible")){var g=d.layout.effects.size[h]||d.layout.effects.size.all,g=l.fxSettings_size.easing||
-g.easing,m=r.zIndexes,t={};t[q]=J+"px";k.isMoving=!0;s.css({zIndex:m.pane_animate}).show().animate(t,l.fxSpeed_size,g,function(){s.css({zIndex:k.isSliding?m.pane_sliding:m.pane_normal});k.isMoving=!1;delete k.newSize;e();a()})}else s.css(q,J),delete k.newSize,s.is(":visible")?e():k.size=b,a()}})}},Y=function(a,b,c){a=(a?a:"east,west,center").split(",");d.each(a,function(a,f){if(w[f]){var e=r[f],h=p[f],l=w[f],k=!0,s={},m=d.layout.showInvisibly(l),n={top:W("north",!0),bottom:W("south",!0),left:W("west",
-!0),right:W("east",!0),width:0,height:0};n.width=y.innerWidth-n.left-n.right;n.height=y.innerHeight-n.bottom-n.top;n.top+=y.inset.top;n.bottom+=y.inset.bottom;n.left+=y.inset.left;n.right+=y.inset.right;d.extend(h,F(l));if("center"===f){if(!c&&h.isVisible&&n.width===h.outerWidth&&n.height===h.outerHeight)return l.css(m),!0;d.extend(h,la(f),{maxWidth:n.width,maxHeight:n.height});s=n;h.newWidth=s.width;h.newHeight=s.height;s.width=z(l,s.width);s.height=C(l,s.height);k=0<=s.width&&0<=s.height;if(!p.initialized&&
-e.minWidth>n.width){var e=e.minWidth-h.outerWidth,n=r.east.minSize||0,t=r.west.minSize||0,q=p.east.size,v=p.west.size,B=q,A=v;0<e&&p.east.isVisible&&q>n&&(B=E(q-n,q-e),e-=q-B);0<e&&p.west.isVisible&&v>t&&(A=E(v-t,v-e),e-=v-A);if(0===e){q&&q!=n&&$("east",B,!0,!0,c);v&&v!=t&&$("west",A,!0,!0,c);Y("center",b,c);l.css(m);return}}}else{h.isVisible&&!h.noVerticalRoom&&d.extend(h,F(l),la(f));if(!c&&!h.noVerticalRoom&&n.height===h.outerHeight)return l.css(m),!0;s.top=n.top;s.bottom=n.bottom;h.newSize=n.height;
-s.height=C(l,n.height);h.maxHeight=s.height;k=0<=h.maxHeight;k||(h.noVerticalRoom=!0)}k?(!b&&p.initialized&&D("onresize_start",f),l.css(s),"center"!==f&&fa(f),!h.noRoom||h.isClosed||h.isHidden||X(f),h.isVisible&&(d.extend(h,F(l)),p.initialized&&ea(f))):!h.noRoom&&h.isVisible&&X(f);l.css(m);delete h.newSize;delete h.newWidth;delete h.newHeight;if(!h.isVisible)return!0;"center"===f&&(h=x.isIE6||!x.boxModel,w.north&&(h||"IFRAME"==p.north.tagName)&&w.north.css("width",z(w.north,y.innerWidth)),w.south&&
-(h||"IFRAME"==p.south.tagName)&&w.south.css("width",z(w.south,y.innerWidth)));!b&&p.initialized&&D("onresize_end",f)}})},da=function(a){A(a);if(v.is(":visible"))if(p.initialized){if(!0===a&&d.isPlainObject(r.outset)&&v.css(r.outset),d.extend(y,F(v,r.inset)),y.outerHeight){!0===a&&Qa();if(!1===D("onresizeall_start"))return!1;var b,c,g;d.each(["south","north","east","west"],function(a,b){w[b]&&(c=r[b],g=p[b],g.autoResize&&g.size!=c.size?$(b,c.size,!0,!0,!0):(P(b),X(b,!1,!0,!0)))});Y("",!0,!0);fa();
-d.each(n.allPanes,function(a,c){(b=w[c])&&p[c].isVisible&&D("onresize_end",c)});D("onresizeall_end")}}else na()},Fa=function(a,b){var c=A.call(this,a);r[c].resizeChildren&&(b||oa(c),c=R[c],d.isPlainObject(c)&&d.each(c,function(a,b){b.destroyed||b.resizeAll()}))},ea=function(a,b){if(H()){var c=A.call(this,a),c=c?c.split(","):n.allPanes;d.each(c,function(a,c){function d(a){return E(m.css.paddingBottom,parseInt(a.css("marginBottom"),10)||0)}function e(){var a=r[c].contentIgnoreSelector,a=k.nextAll().not(".ui-layout-mask").not(a||
-":lt(0)"),b=a.filter(":visible"),g=b.filter(":last");q={top:k[0].offsetTop,height:k.outerHeight(),numFooters:a.length,hiddenFooters:a.length-b.length,spaceBelow:0};q.spaceAbove=q.top;q.bottom=q.top+q.height;q.spaceBelow=g.length?g[0].offsetTop+g.outerHeight()-q.bottom+d(g):d(k)}var l=w[c],k=M[c],n=r[c],m=p[c],q=m.content;if(!l||!k||!l.is(":visible"))return!0;if(!k.length&&(Aa(c,!1),!k))return;if(!1!==D("onsizecontent_start",c)){if(!m.isMoving&&!m.isResizing||n.liveContentResizing||b||void 0==q.top)e(),
-0<q.hiddenFooters&&"hidden"===l.css("overflow")&&(l.css("overflow","visible"),e(),l.css("overflow","hidden"));l=m.innerHeight-(q.spaceAbove-m.css.paddingTop)-(q.spaceBelow-m.css.paddingBottom);k.is(":visible")&&q.height==l||(Va(k,l,!0),q.height=l);p.initialized&&D("onsizecontent_end",c)}})}},fa=function(a){a=(a=A.call(this,a))?a.split(","):n.borderPanes;d.each(a,function(a,c){var g=r[c],f=p[c],e=w[c],h=G[c],l=K[c],k;if(e&&h){var m=n[c].dir,q=f.isClosed?"_closed":"_open",t=g["spacing"+q],v=g["togglerAlign"+
-q],q=g["togglerLength"+q],x;if(0===t)h.hide();else{f.noRoom||f.isHidden||h.show();"horz"===m?(x=y.innerWidth,f.resizerLength=x,e=d.layout.cssNum(e,"left"),h.css({width:z(h,x),height:C(h,t),left:-9999<e?e:y.inset.left})):(x=e.outerHeight(),f.resizerLength=x,h.css({height:C(h,x),width:z(h,t),top:y.inset.top+W("north",!0)}));T(g,h);if(l){if(0===q||f.isSliding&&g.hideTogglerOnSlide){l.hide();return}l.show();if(!(0<q)||"100%"===q||q>x)q=x,v=0;else if(U(v))switch(v){case "top":case "left":v=0;break;case "bottom":case "right":v=
-x-q;break;default:v=ka((x-q)/2)}else e=parseInt(v,10),v=0<=v?e:x-q+e;if("horz"===m){var B=z(l,q);l.css({width:B,height:C(l,t),left:v,top:0});l.children(".content").each(function(){k=d(this);k.css("marginLeft",ka((B-k.outerWidth())/2))})}else{var A=C(l,q);l.css({height:A,width:z(l,t),top:v,left:0});l.children(".content").each(function(){k=d(this);k.css("marginTop",ka((A-k.outerHeight())/2))})}T(0,l)}p.initialized||!g.initHidden&&!f.isHidden||(h.hide(),l&&l.hide())}}})},Ra=function(a){if(H()){var b=
-A.call(this,a);a=K[b];var c=r[b];a&&(c.closable=!0,a.bind("click."+I,function(a){a.stopPropagation();ca(b)}).css("visibility","visible").css("cursor","pointer").attr("title",p[b].isClosed?c.tips.Open:c.tips.Close).show())}},Da=function(a,b){d.layout.plugins.buttons&&d.each(p[a].pins,function(c,g){d.layout.buttons.setPinState(B,d(g),a,b)})},v=d(this).eq(0);if(!v.length)return S(r.errors.containerMissing);if(v.data("layoutContainer")&&v.data("layout"))return v.data("layout");var w={},M={},G={},K={},
-Q=d([]),y=p.container,I=p.id,B={options:r,state:p,container:v,panes:w,contents:M,resizers:G,togglers:K,hide:Ba,show:sa,toggle:ca,open:ga,close:Z,slideOpen:Ua,slideClose:Ea,slideToggle:function(a){a=A.call(this,a);ca(a,!0)},setSizeLimits:P,_sizePane:$,sizePane:qa,sizeContent:ea,swapPanes:function(a,b){function c(a){var b=w[a],c=M[a];return b?{pane:a,P:b?b[0]:!1,C:c?c[0]:!1,state:d.extend(!0,{},p[a]),options:d.extend(!0,{},r[a])}:!1}function g(a,b){if(a){var c=a.P,f=a.C,e=a.pane,g=n[b],h=d.extend(!0,
-{},p[b]),m=r[b],q={resizerCursor:m.resizerCursor};d.each(["fxName","fxSpeed","fxSettings"],function(a,b){q[b+"_open"]=m[b+"_open"];q[b+"_close"]=m[b+"_close"];q[b+"_size"]=m[b+"_size"]});w[b]=d(c).data({layoutPane:B[b],layoutEdge:b}).css(n.hidden).css(g.cssReq);M[b]=f?d(f):!1;r[b]=d.extend(!0,{},a.options,q);p[b]=d.extend(!0,{},a.state);c.className=c.className.replace(new RegExp(m.paneClass+"-"+e,"g"),m.paneClass+"-"+b);ya(b);g.dir!=n[e].dir?(c=l[b]||0,P(b),c=E(c,p[b].minSize),qa(b,c,!0,!0)):G[b].css(g.side,
-y.inset[g.side]+(p[b].isVisible?W(b):0));a.state.isVisible&&!h.isVisible?Ca(b,!0):(pa(b),aa(b,!0));a=null}}if(H()){var f=A.call(this,a);p[f].edge=b;p[b].edge=f;if(!1===D("onswap_start",f)||!1===D("onswap_start",b))p[f].edge=f,p[b].edge=b;else{var e=c(f),h=c(b),l={};l[f]=e?e.state.size:0;l[b]=h?h.state.size:0;w[f]=!1;w[b]=!1;p[f]={};p[b]={};K[f]&&K[f].remove();K[b]&&K[b].remove();G[f]&&G[f].remove();G[b]&&G[b].remove();G[f]=G[b]=K[f]=K[b]=!1;g(e,b);g(h,f);e=h=l=null;w[f]&&w[f].css(n.visible);w[b]&&
-w[b].css(n.visible);da();D("onswap_end",f);D("onswap_end",b)}}},showMasks:ia,hideMasks:ma,initContent:Aa,addPane:Oa,removePane:za,createChildren:xa,refreshChildren:oa,enableClosable:Ra,disableClosable:function(a,b){if(H()){var c=A.call(this,a),d=K[c];d&&(r[c].closable=!1,p[c].isClosed&&ga(c,!1,!0),d.unbind("."+I).css("visibility",b?"hidden":"visible").css("cursor","default").attr("title",""))}},enableSlidable:function(a){if(H()){a=A.call(this,a);var b=G[a];b&&b.data("draggable")&&(r[a].slidable=!0,
-p[a].isClosed&&aa(a,!0))}},disableSlidable:function(a){if(H()){a=A.call(this,a);var b=G[a];b&&(r[a].slidable=!1,p[a].isSliding?Z(a,!1,!0):(aa(a,!1),b.css("cursor","default").attr("title",""),T(null,b[0])))}},enableResizable:function(a){if(H()){a=A.call(this,a);var b=G[a],c=r[a];b&&b.data("draggable")&&(c.resizable=!0,b.draggable("enable"),p[a].isClosed||b.css("cursor",c.resizerCursor).attr("title",c.tips.Resize))}},disableResizable:function(a){if(H()){a=A.call(this,a);var b=G[a];b&&b.data("draggable")&&
-(r[a].resizable=!1,b.draggable("disable").css("cursor","default").attr("title",""),T(null,b[0]))}},allowOverflow:m,resetOverflow:q,destroy:function(a,b){d(window).unbind("."+I);d(document).unbind("."+I);"object"===typeof a?A(a):b=a;v.clearQueue().removeData("layout").removeData("layoutContainer").removeClass(r.containerClass).unbind("."+I);Q.remove();d.each(n.allPanes,function(a,c){za(c,!1,!0,b)});v.data("layoutCSS")&&!v.data("layoutRole")&&v.css(v.data("layoutCSS")).removeData("layoutCSS");"BODY"===
-y.tagName&&(v=d("html")).data("layoutCSS")&&v.css(v.data("layoutCSS")).removeData("layoutCSS");ha(B,d.layout.onDestroy);Ma();for(var c in B)c.match(/^(container|options)$/)||delete B[c];B.destroyed=!0;return B},initPanes:H,resizeAll:da,runCallbacks:D,hasParentLayout:!1,children:R,north:!1,south:!1,west:!1,east:!1,center:!1};return"cancel"===function(){Ya();var a=r,b=p;b.creatingLayout=!0;ha(B,d.layout.onCreate);if(!1===D("onload_start"))return"cancel";var c=v[0],e=d("html"),f=y.tagName=c.tagName,
-m=y.id=c.id,h=y.className=c.className,c=r,l=c.name,k={},n=v.data("parentLayout"),q=v.data("layoutEdge"),t=n&&q,w=d.layout.cssNum,z;y.selector=v.selector.split(".slice")[0];y.ref=(c.name?c.name+" layout / ":"")+f+(m?"#"+m:h?".["+h+"]":"");y.isBody="BODY"===f;t||y.isBody||(f=v.closest("."+d.layout.defaults.panes.paneClass),n=f.data("parentLayout"),q=f.data("layoutEdge"),t=n&&q);v.data({layout:B,layoutContainer:I}).addClass(c.containerClass);f={destroy:"",initPanes:"",resizeAll:"resizeAll",resize:"resizeAll"};
-for(l in f)v.bind("layout"+l.toLowerCase()+"."+I,B[f[l]||l]);t&&(B.hasParentLayout=!0,n.refreshChildren(q,B));v.data("layoutCSS")||(y.isBody?(v.data("layoutCSS",d.extend(L(v,"position,margin,padding,border"),{height:v.css("height"),overflow:v.css("overflow"),overflowX:v.css("overflowX"),overflowY:v.css("overflowY")})),e.data("layoutCSS",d.extend(L(e,"padding"),{height:"auto",overflow:e.css("overflow"),overflowX:e.css("overflowX"),overflowY:e.css("overflowY")}))):v.data("layoutCSS",L(v,"position,margin,padding,border,top,bottom,left,right,width,height,overflow,overflowX,overflowY")));
-try{k={overflow:"hidden",overflowX:"hidden",overflowY:"hidden"};v.css(k);c.inset&&!d.isPlainObject(c.inset)&&(z=parseInt(c.inset,10)||0,c.inset={top:z,bottom:z,left:z,right:z});if(y.isBody)c.outset?d.isPlainObject(c.outset)||(z=parseInt(c.outset,10)||0,c.outset={top:z,bottom:z,left:z,right:z}):c.outset={top:w(e,"paddingTop"),bottom:w(e,"paddingBottom"),left:w(e,"paddingLeft"),right:w(e,"paddingRight")},e.css(k).css({height:"100%",border:"none",padding:0,margin:0}),x.isIE6?(v.css({width:"100%",height:"100%",
-border:"none",padding:0,margin:0,position:"relative"}),c.inset||(c.inset=F(v).inset)):(v.css({width:"auto",height:"auto",margin:0,position:"absolute"}),v.css(c.outset)),d.extend(y,F(v,c.inset));else{var A=v.css("position");A&&A.match(/(fixed|absolute|relative)/)||v.css("position","relative");v.is(":visible")&&(d.extend(y,F(v,c.inset)),1>y.innerHeight&&S(c.errors.noContainerHeight.replace(/CONTAINER/,y.ref)))}w(v,"minWidth")&&v.parent().css("overflowX","auto");w(v,"minHeight")&&v.parent().css("overflowY",
-"auto")}catch(C){}Na();d(window).bind("unload."+I,Ma);ha(B,d.layout.onLoad);a.initPanes&&na();delete b.creatingLayout;return p.initialized}()?null:B}})(jQuery);
\ No newline at end of file
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2ec76cf412f..eafaac26c6a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1151,11 +1151,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/jquery.tipTip.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            // jQuery Layout (still used by ECM module)
-            if (defined('REQUIRE_JQUERY_LAYOUT'))
-            {
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/layout/jquery.layout.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            }
             // jQuery jnotify
             if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
             {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 8fae97bb91d..7d519eb633a 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1783,24 +1783,26 @@ td.ecmroot {
 }
 
 .largebutton {
-    background-image: -o-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
+    /*background-image: -o-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
     background-image: -moz-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
     background-image: -webkit-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
     background-image: -ms-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
     background-image: linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
-
+	
     background: #FFF;
     background-repeat: repeat-x !important;
-	border: 1px solid #CCC !important;
+    */
+	border-top: 1px solid #CCC !important;
 
-    -moz-border-radius: 4px 4px 4px 4px !important;
+    /*-moz-border-radius: 4px 4px 4px 4px !important;
 	-webkit-border-radius: 4px 4px 4px 4px !important;
 	border-radius: 4px 4px 4px 4px !important;
     -moz-box-shadow: 2px 2px 4px #DDD;
     -webkit-box-shadow: 2px 2px 4px #DDD;
     box-shadow: 2px 2px 4px #DDD;
-
-    padding: 0 4px 0 4px !important;
+	*/
+	
+    padding: 10px 4px 14px 4px !important;
     min-height: 32px;
 }
 
@@ -1816,197 +1818,7 @@ img.toolbarbutton {
     height: 30px;
 }
 
-/* ============================================================================== */
-/* Panes for ECM or Filemanager                                                   */
-/* ============================================================================== */
 
-#containerlayout .layout-with-no-border {
-    border: 0 !important;
-    border-width: 0 !important;
-}
-
-#containerlayout .layout-padding {
-    padding: 2px !important;
-}
-
-/*
- *  PANES and CONTENT-DIVs
- */
-#containerlayout .ui-layout-pane { /* all 'panes' */
-    background: #FFF;
-    border:     1px solid #BBB;
-    /* DO NOT add scrolling (or padding) to 'panes' that have a content-div,
-       otherwise you may get double-scrollbars - on the pane AND on the content-div
-    */
-    padding:    0px;
-    overflow:   auto;
-}
-/* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */
-#containerlayout .ui-layout-content {
-	padding:    10px;
-	position:   relative; /* contain floated or positioned elements */
-	overflow:   auto; /* add scrolling to content-div */
-}
-
-
-/*
- *  RESIZER-BARS
- */
-.ui-layout-resizer  { /* all 'resizer-bars' */
-	width: <?php echo (empty($conf->dol_optimize_smallscreen)?'8':'24'); ?>px !important;
-}
-.ui-layout-resizer-hover    {   /* affects both open and closed states */
-}
-/* NOTE: It looks best when 'hover' and 'dragging' are set to the same color,
-    otherwise color shifts while dragging when bar can't keep up with mouse */
-/*.ui-layout-resizer-open-hover ,*/ /* hover-color to 'resize' */
-.ui-layout-resizer-dragging {   /* resizer beging 'dragging' */
-    background: #DDD;
-    width: <?php echo (empty($conf->dol_optimize_smallscreen)?'8':'24'); ?>px;
-}
-.ui-layout-resizer-dragging {   /* CLONED resizer being dragged */
-    border-left:  1px solid #BBB;
-    border-right: 1px solid #BBB;
-}
-/* NOTE: Add a 'dragging-limit' color to provide visual feedback when resizer hits min/max size limits */
-.ui-layout-resizer-dragging-limit { /* CLONED resizer at min or max size-limit */
-    background: #E1A4A4; /* red */
-}
-.ui-layout-resizer-closed {
-    background-color: #DDDDDD;
-}
-.ui-layout-resizer-closed:hover {
-    background-color: #EEDDDD;
-}
-.ui-layout-resizer-sliding {    /* resizer when pane is 'slid open' */
-    opacity: .10; /* show only a slight shadow */
-    filter:  alpha(opacity=10);
-}
-.ui-layout-resizer-sliding-hover {  /* sliding resizer - hover */
-    opacity: 1.00; /* on-hover, show the resizer-bar normally */
-    filter:  alpha(opacity=100);
-}
-/* sliding resizer - add 'outside-border' to resizer on-hover */
-/* this sample illustrates how to target specific panes and states */
-/*.ui-layout-resizer-north-sliding-hover  { border-bottom-width:  1px; }
-.ui-layout-resizer-south-sliding-hover  { border-top-width:     1px; }
-.ui-layout-resizer-west-sliding-hover   { border-right-width:   1px; }
-.ui-layout-resizer-east-sliding-hover   { border-left-width:    1px; }
-*/
-
-/*
- *  TOGGLER-BUTTONS
- */
-.ui-layout-toggler {
-    <?php if (empty($conf->dol_optimize_smallscreen)) { ?>
-    border-top: 1px solid #AAA; /* match pane-border */
-    border-right: 1px solid #AAA; /* match pane-border */
-    border-bottom: 1px solid #AAA; /* match pane-border */
-    background-color: #DDD;
-    top: 5px !important;
-	<?php } else { ?>
-	diplay: none;
-	<?php } ?>
-}
-.ui-layout-toggler-open {
-	height: 54px !important;
-	width: <?php echo (empty($conf->dol_optimize_smallscreen)?'7':'22'); ?>px !important;
-    -moz-border-radius:0px 10px 10px 0px;
-	-webkit-border-radius:0px 10px 10px 0px;
-	border-radius:0px 10px 10px 0px;
-}
-.ui-layout-toggler-closed {
-	height: <?php echo (empty($conf->dol_optimize_smallscreen)?'54':'2'); ?>px !important;
-	width: <?php echo (empty($conf->dol_optimize_smallscreen)?'7':'22'); ?>px !important;
-    -moz-border-radius:0px 10px 10px 0px;
-	-webkit-border-radius:0px 10px 10px 0px;
-	border-radius:0px 10px 10px 0px;
-}
-.ui-layout-toggler .content {	/* style the text we put INSIDE the togglers */
-    color:          #666;
-    font-size:      12px;
-    font-weight:    bold;
-    width:          100%;
-    padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */
-}
-
-/* hide the toggler-button when the pane is 'slid open' */
-.ui-layout-resizer-sliding .ui-layout-toggler {
-    display: none;
-}
-
-.ui-layout-north {
-	height: <?php print (empty($conf->dol_optimize_smallscreen)?'54':'21'); ?>px !important;
-}
-
-
-/* ECM */
-
-#containerlayout .ecm-layout-pane { /* all 'panes' */
-    background: #FFF;
-    border:     1px solid #BBB;
-    /* DO NOT add scrolling (or padding) to 'panes' that have a content-div,
-       otherwise you may get double-scrollbars - on the pane AND on the content-div
-    */
-    padding:    0px;
-    overflow:   auto;
-}
-/* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */
-#containerlayout .ecm-layout-content {
-	padding:    10px;
-	position:   relative; /* contain floated or positioned elements */
-	overflow:   auto; /* add scrolling to content-div */
-}
-
-.ecm-layout-toggler {
-    border-top: 1px solid #AAA; /* match pane-border */
-    border-right: 1px solid #AAA; /* match pane-border */
-    border-bottom: 1px solid #AAA; /* match pane-border */
-    background-color: #CCC;
-    }
-.ecm-layout-toggler-open {
-	height: 48px !important;
-	width: 6px !important;
-    -moz-border-radius:0px 10px 10px 0px;
-	-webkit-border-radius:0px 10px 10px 0px;
-	border-radius:0px 10px 10px 0px;
-}
-.ecm-layout-toggler-closed {
-	height: 48px !important;
-	width: 6px !important;
-}
-
-.ecm-layout-toggler .content {	/* style the text we put INSIDE the togglers */
-    color:          #666;
-    font-size:      12px;
-    font-weight:    bold;
-    width:          100%;
-    padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */
-}
-#ecm-layout-west-resizer {
-	width: 6px !important;
-}
-
-.ecm-layout-resizer  { /* all 'resizer-bars' */
-    border:         1px solid #BBB;
-    border-width:   0;
-    }
-.ecm-layout-resizer-closed {
-}
-
-.ecm-in-layout-center {
-    border-left: 1px !important;
-    border-right: 0px !important;
-    border-top: 0px !important;
-}
-
-.ecm-in-layout-south {
-    border-top: 0px !important;
-    border-left: 0px !important;
-    border-right: 0px !important;
-    border-bottom: 0px !important;
-    padding: 4px 0 4px 4px !important;
-}
 
 
 
@@ -3871,10 +3683,6 @@ ul.filedirelem li {
     border: solid 1px #DDDDDD;
 }
 
-.ui-layout-north {
-
-}
-
 ul.ecmjqft {
 	line-height: 16px;
 	padding: 0px;
@@ -3892,13 +3700,12 @@ ul.ecmjqft li {
 }
 
 ul.ecmjqft a {
-	line-height: 16px;
+	line-height: 24px;
 	vertical-align: middle;
 	color: #333;
 	padding: 0px 0px;
 	font-weight:normal;
 	display: inline-block !important;
-/*	float: left;*/
 }
 ul.ecmjqft a:active {
 	font-weight: bold !important;
@@ -3910,11 +3717,20 @@ div.ecmjqft {
 	vertical-align: middle;
 	display: inline-block !important;
 	text-align: right;
-	position:absolute;
+	float: right;
 	right:4px;
+	clear: both;
+}
+div#ecm-layout-west {
+    width: 380px;
+    vertical-align: top;
+}
+div#ecm-layout-center {
+    width: calc(100% - 390px);
+    vertical-align: top;
+    float: right;
 }
 
-/* Core Styles */
 .ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2.png',1); ?>) left top no-repeat; }
 .ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png',1); ?>) left top no-repeat; }
 .ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/'.$theme.'/img/working.gif',1); ?>) left top no-repeat; }
@@ -4601,6 +4417,17 @@ border-top-right-radius: 6px;
     }
 }
 
+@media only screen and (max-width: 1024px)
+{
+	div#ecm-layout-west {
+		width: 100%;
+		clear: both;
+	}
+	div#ecm-layout-center {
+		width: 100%;
+	}
+}
+
 /* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */
 /* rule to reduce top menu - 1st reduction */
 @media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 6.9, 0) + 20; ?>px)
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3ce7c107939..ff95b7781d9 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1763,7 +1763,7 @@ td.ecmroot {
 }
 
 .largebutton {
-    background-image: -o-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
+    /*background-image: -o-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
     background-image: -moz-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
     background-image: -webkit-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
     background-image: -ms-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
@@ -1771,16 +1771,17 @@ td.ecmroot {
 
     background: #FFF;
     background-repeat: repeat-x !important;
-	border: 1px solid #CCC !important;
+    */
+	border-top: 1px solid #CCC !important;
 
-    -moz-border-radius: 2px 2px 2px 2px !important;
+    /*-moz-border-radius: 2px 2px 2px 2px !important;
 	-webkit-border-radius: 2px 2px 2px 2px !important;
 	border-radius: 2px 2px 2px 2px !important;
     -moz-box-shadow: 2px 2px 4px #f4f4f4;
     -webkit-box-shadow: 2px 2px 4px #f4f4f4;
-    box-shadow: 2px 2px 4px #f4f4f4;
+    box-shadow: 2px 2px 4px #f4f4f4;*/
 
-    padding: 0 4px 0 4px !important;
+    padding: 10px 4px 14px 4px !important;
     min-height: 32px;
 }
 
@@ -1796,198 +1797,6 @@ img.toolbarbutton {
     height: 30px;
 }
 
-/* ============================================================================== */
-/* Panes for ECM or Filemanager                                                   */
-/* ============================================================================== */
-
-#containerlayout .layout-with-no-border {
-    border: 0 !important;
-    border-width: 0 !important;
-}
-
-#containerlayout .layout-padding {
-    padding: 2px !important;
-}
-
-/*
- *  PANES and CONTENT-DIVs
- */
-#containerlayout .ui-layout-pane { /* all 'panes' */
-    background: #FFF;
-    border:     1px solid #BBB;
-    /* DO NOT add scrolling (or padding) to 'panes' that have a content-div,
-       otherwise you may get double-scrollbars - on the pane AND on the content-div
-    */
-    padding:    0px;
-    overflow:   auto;
-}
-/* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */
-#containerlayout .ui-layout-content {
-	padding:    10px;
-	position:   relative; /* contain floated or positioned elements */
-	overflow:   auto; /* add scrolling to content-div */
-}
-
-
-/*
- *  RESIZER-BARS
- */
-.ui-layout-resizer  { /* all 'resizer-bars' */
-	width: <?php echo (empty($conf->dol_optimize_smallscreen)?'8':'24'); ?>px !important;
-}
-.ui-layout-resizer-hover    {   /* affects both open and closed states */
-}
-/* NOTE: It looks best when 'hover' and 'dragging' are set to the same color,
-    otherwise color shifts while dragging when bar can't keep up with mouse */
-/*.ui-layout-resizer-open-hover ,*/ /* hover-color to 'resize' */
-.ui-layout-resizer-dragging {   /* resizer beging 'dragging' */
-    background: #f4f4f4;
-    width: <?php echo (empty($conf->dol_optimize_smallscreen)?'8':'24'); ?>px;
-}
-.ui-layout-resizer-dragging {   /* CLONED resizer being dragged */
-    border-left:  1px solid #BBB;
-    border-right: 1px solid #BBB;
-}
-/* NOTE: Add a 'dragging-limit' color to provide visual feedback when resizer hits min/max size limits */
-.ui-layout-resizer-dragging-limit { /* CLONED resizer at min or max size-limit */
-    background: #E1A4A4; /* red */
-}
-.ui-layout-resizer-closed {
-    background-color: #f4f4f4;
-}
-.ui-layout-resizer-closed:hover {
-    background-color: #EEDDDD;
-}
-.ui-layout-resizer-sliding {    /* resizer when pane is 'slid open' */
-    opacity: .10; /* show only a slight shadow */
-    filter:  alpha(opacity=10);
-}
-.ui-layout-resizer-sliding-hover {  /* sliding resizer - hover */
-    opacity: 1.00; /* on-hover, show the resizer-bar normally */
-    filter:  alpha(opacity=100);
-}
-/* sliding resizer - add 'outside-border' to resizer on-hover */
-/* this sample illustrates how to target specific panes and states */
-/*.ui-layout-resizer-north-sliding-hover  { border-bottom-width:  1px; }
-.ui-layout-resizer-south-sliding-hover  { border-top-width:     1px; }
-.ui-layout-resizer-west-sliding-hover   { border-right-width:   1px; }
-.ui-layout-resizer-east-sliding-hover   { border-left-width:    1px; }
-*/
-
-/*
- *  TOGGLER-BUTTONS
- */
-.ui-layout-toggler {
-    <?php if (empty($conf->dol_optimize_smallscreen)) { ?>
-    border-top: 1px solid #AAA; /* match pane-border */
-    border-right: 1px solid #AAA; /* match pane-border */
-    border-bottom: 1px solid #AAA; /* match pane-border */
-    background-color: #f4f4f4;
-    top: 5px !important;
-	<?php } else { ?>
-	diplay: none;
-	<?php } ?>
-}
-.ui-layout-toggler-open {
-	height: 54px !important;
-	width: <?php echo (empty($conf->dol_optimize_smallscreen)?'7':'22'); ?>px !important;
-    -moz-border-radius:0px 10px 10px 0px;
-	-webkit-border-radius:0px 10px 10px 0px;
-	border-radius:0px 10px 10px 0px;
-}
-.ui-layout-toggler-closed {
-	height: <?php echo (empty($conf->dol_optimize_smallscreen)?'54':'2'); ?>px !important;
-	width: <?php echo (empty($conf->dol_optimize_smallscreen)?'7':'22'); ?>px !important;
-    -moz-border-radius:0px 10px 10px 0px;
-	-webkit-border-radius:0px 10px 10px 0px;
-	border-radius:0px 10px 10px 0px;
-}
-.ui-layout-toggler .content {	/* style the text we put INSIDE the togglers */
-    color:          #666;
-    font-size:      12px;
-    font-weight:    bold;
-    width:          100%;
-    padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */
-}
-
-/* hide the toggler-button when the pane is 'slid open' */
-.ui-layout-resizer-sliding .ui-layout-toggler {
-    display: none;
-}
-
-.ui-layout-north {
-	height: <?php print (empty($conf->dol_optimize_smallscreen)?'54':'21'); ?>px !important;
-}
-
-
-/* ECM */
-
-#containerlayout .ecm-layout-pane { /* all 'panes' */
-    background: #FFF;
-    border:     1px solid #BBB;
-    /* DO NOT add scrolling (or padding) to 'panes' that have a content-div,
-       otherwise you may get double-scrollbars - on the pane AND on the content-div
-    */
-    padding:    0px;
-    overflow:   auto;
-}
-/* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */
-#containerlayout .ecm-layout-content {
-	padding:    10px;
-	position:   relative; /* contain floated or positioned elements */
-	overflow:   auto; /* add scrolling to content-div */
-}
-
-.ecm-layout-toggler {
-    border-top: 1px solid #AAA; /* match pane-border */
-    border-right: 1px solid #AAA; /* match pane-border */
-    border-bottom: 1px solid #AAA; /* match pane-border */
-    background-color: #CCC;
-    }
-.ecm-layout-toggler-open {
-	height: 48px !important;
-	width: 6px !important;
-    -moz-border-radius:0px 10px 10px 0px;
-	-webkit-border-radius:0px 10px 10px 0px;
-	border-radius:0px 10px 10px 0px;
-}
-.ecm-layout-toggler-closed {
-	height: 48px !important;
-	width: 6px !important;
-}
-
-.ecm-layout-toggler .content {	/* style the text we put INSIDE the togglers */
-    color:          #666;
-    font-size:      12px;
-    font-weight:    bold;
-    width:          100%;
-    padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */
-}
-#ecm-layout-west-resizer {
-	width: 6px !important;
-}
-
-.ecm-layout-resizer  { /* all 'resizer-bars' */
-    border:         1px solid #BBB;
-    border-width:   0;
-    }
-.ecm-layout-resizer-closed {
-}
-
-.ecm-in-layout-center {
-    border-left: 1px !important;
-    border-right: 0px !important;
-    border-top: 0px !important;
-}
-
-.ecm-in-layout-south {
-    border-top: 0px !important;
-    border-left: 0px !important;
-    border-right: 0px !important;
-    border-bottom: 0px !important;
-    padding: 4px 0 4px 4px !important;
-}
-
 
 
 /* ============================================================================== */
@@ -3745,7 +3554,6 @@ div.scroll2 {
 .ecmfiletree {
 	width: 99%;
 	height: 99%;
-	background: #FFF;
 	padding-left: 2px;
 	font-weight: normal;
 }
@@ -3802,13 +3610,12 @@ ul.ecmjqft li {
 }
 
 ul.ecmjqft a {
-	line-height: 16px;
+	line-height: 24px;
 	vertical-align: middle;
 	color: #333;
 	padding: 0px 0px;
 	font-weight:normal;
 	display: inline-block !important;
-/*	float: left;*/
 }
 ul.ecmjqft a:active {
 	font-weight: bold !important;
@@ -3816,15 +3623,25 @@ ul.ecmjqft a:active {
 ul.ecmjqft a:hover {
     text-decoration: underline;
 }
+
 div.ecmjqft {
 	vertical-align: middle;
 	display: inline-block !important;
 	text-align: right;
-	position:absolute;
+	float: right;
 	right:4px;
+	clear: both;
+}
+div#ecm-layout-west {
+    width: 380px;
+    vertical-align: top;
+}
+div#ecm-layout-center {
+    width: calc(100% - 390px);
+    vertical-align: top;
+    float: right;
 }
 
-/* Core Styles */
 .ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2.png',1); ?>) left top no-repeat; }
 .ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png',1); ?>) left top no-repeat; }
 .ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/'.$theme.'/img/working.gif',1); ?>) left top no-repeat; }
@@ -4514,6 +4331,16 @@ border-top-right-radius: 6px;
 
 }
 
+@media only screen and (max-width: 1024px)
+{
+	div#ecm-layout-west {
+		width: 100%;
+		clear: both;
+	}
+	div#ecm-layout-center {
+		width: 100%;
+	}
+}
 
 /* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */
 /* disableimages = <?php echo $disableimages; ?> */

From b66ba6c57cd89f1f7ae60ed245c3114c4ebcd709 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2017 19:48:15 +0100
Subject: [PATCH 0297/1163] Fix warning

---
 htdocs/core/lib/files.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 2b1cfa88709..78686656ff8 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -910,7 +910,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
         				    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
         				    $ecmfile=new EcmFiles($db);
         				    $result = $ecmfile->fetch(0, '', $rel_filetodelete);
-        				    if ($result >= 0)
+        				    if ($result >= 0 && $ecmfile->id > 0)
         				    {
         				        $result = $ecmfile->delete($user);
         				    }

From 1e45e64a9a111ed80ab392ea426e35f5a3705402 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2017 20:35:42 +0100
Subject: [PATCH 0298/1163] Files sent from ECM module are also indexed in
 database.

---
 htdocs/core/lib/files.lib.php | 7 ++++++-
 htdocs/ecm/index.php          | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 78686656ff8..c5016d9150a 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1178,12 +1178,14 @@ function dol_init_file_process($pathtoscan='', $trackid='')
  * @param	string	$savingdocmask			Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
  * @param	string	$link					Link to add (to add a link instead of a file)
  * @param   string  $trackid                Track id (used to prefix name of session vars to avoid conflict)
- * @return	void
+ * @return	int                             <=0 if KO, >0 if OK
  */
 function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesession=0, $varfiles='addedfile', $savingdocmask='', $link=null, $trackid='')
 {
 	global $db,$user,$conf,$langs;
 
+	$res = 0;
+	
 	if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
 	{
 		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
@@ -1278,6 +1280,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 					    }
 					}
 
+					$res = 1;
 					setEventMessages($langs->trans("FileTransferComplete"), null, 'mesgs');
 				}
 				else
@@ -1320,6 +1323,8 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
 	}
+	
+	return $res;
 }
 
 
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 971d20ae2b2..1b2a57c714d 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -106,11 +106,16 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 		else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 		}
-
 	}
 
 	if (! $error)
 	{
+	    $res = dol_add_file_process($upload_dir, 0, 1, 'userfile', '', '', '');
+	    if ($res > 0)
+	    {
+	       $result=$ecmdir->changeNbOfFiles('+');
+	    }
+	    /*
 		if (dol_mkdir($upload_dir) >= 0)
 		{
 			$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0, 0, $_FILES['userfile']['error']);
@@ -139,7 +144,7 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors');
-		}
+		}*/
 	}
 }
 

From d7e1a6e4f08cc4645d193a126e2ffb58f73bd1eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2017 21:18:34 +0100
Subject: [PATCH 0299/1163] Fix no timer for browser notification if on login
 page

---
 htdocs/core/js/lib_notification.js.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index af8e0492cdc..d0ec2444afd 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -49,11 +49,12 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['HT
         $_SESSION['auto_check_events_not_before'] = $nowtime;   // auto_check_events_not_before is rounded to previous minute
     }
     print 'var nowtime = ' . $nowtime . ';' . "\n";
+    print 'var login = \'' . $_SESSION['dol_login'] . '\';' . "\n";
     print 'var auto_check_events_not_before = '.$_SESSION['auto_check_events_not_before']. ';'."\n";
     print 'var time_js_next_test = Math.max(nowtime, auto_check_events_not_before);'."\n";
-    print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY;   // Always defined
+    print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n";   // Always defined
     ?>
-	
+
 	/* Check if permission ok */
 	if (Notification.permission !== "granted") {
         Notification.requestPermission()
@@ -62,8 +63,10 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['HT
 	/* Launch timer */
    	// We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
     var time_first_execution = (time_auto_update - (nowtime - time_js_next_test)) * 1000;	//need milliseconds
-    console.log("Launch browser notif check: setTimeout to wait time_first_execution="+time_first_execution+" before first check - nowtime = "+nowtime+" auto_check_events_not_before = "+auto_check_events_not_before+" time_js_next_test = "+time_js_next_test+" time_auto_update="+time_auto_update);
-    setTimeout(first_execution, time_first_execution); //first run auto check
+    if (login != '') { 
+    	console.log("Launch browser notif check: setTimeout to wait time_first_execution="+time_first_execution+" before first check - nowtime = "+nowtime+" auto_check_events_not_before = "+auto_check_events_not_before+" time_js_next_test = "+time_js_next_test+" time_auto_update="+time_auto_update);
+    	setTimeout(first_execution, time_first_execution); 
+    } //first run auto check
 
 
     function first_execution() {

From fbecb1b2d84efb44cf412d4ae3683fe73ce9fd82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2017 00:45:27 +0100
Subject: [PATCH 0300/1163] Work on removal of jmobile

---
 COPYRIGHT                                     |     1 -
 htdocs/core/get_menudiv.php                   |    95 +
 htdocs/core/js/lib_notification.js.php        |     3 +-
 .../plugins/mobile/images/ajax-loader.gif     |   Bin 7825 -> 0 bytes
 .../plugins/mobile/images/icons-18-black.png  |   Bin 1968 -> 0 bytes
 .../plugins/mobile/images/icons-18-white.png  |   Bin 1988 -> 0 bytes
 .../plugins/mobile/images/icons-36-black.png  |   Bin 3859 -> 0 bytes
 .../plugins/mobile/images/icons-36-white.png  |   Bin 3861 -> 0 bytes
 .../plugins/mobile/jquery.mobile-latest.css   |  3357 -----
 .../plugins/mobile/jquery.mobile-latest.js    | 11092 ----------------
 .../mobile/jquery.mobile-latest.min.css       |     2 -
 .../mobile/jquery.mobile-latest.min.js        |     2 -
 htdocs/main.inc.php                           |    98 +-
 htdocs/theme/eldy/style.css.php               |     2 +-
 htdocs/theme/md/style.css.php                 |     2 +-
 15 files changed, 128 insertions(+), 14526 deletions(-)
 delete mode 100644 htdocs/includes/jquery/plugins/mobile/images/ajax-loader.gif
 delete mode 100644 htdocs/includes/jquery/plugins/mobile/images/icons-18-black.png
 delete mode 100644 htdocs/includes/jquery/plugins/mobile/images/icons-18-white.png
 delete mode 100644 htdocs/includes/jquery/plugins/mobile/images/icons-36-black.png
 delete mode 100644 htdocs/includes/jquery/plugins/mobile/images/icons-36-white.png
 delete mode 100644 htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.css
 delete mode 100644 htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.js
 delete mode 100644 htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css
 delete mode 100644 htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js

diff --git a/COPYRIGHT b/COPYRIGHT
index ca4c6cae52e..16943279f23 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -45,7 +45,6 @@ jQuery jNotify         1.1.00        Apache Software License 2.0 Yes
 jQuery jPicker         1.1.6         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
 jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
 jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for color picker with not defined list of colors
-jQuery Mobile          1.3.0         GPL and MIT License         Yes             JS library for smartphone (not used)
 jQuery TableDnD        0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
 jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index 655e10afd67..d71ded6aec7 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -33,6 +33,18 @@ if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
+if (! defined('DISABLE_JQUERY_TABLEDND'))   define('DISABLE_JQUERY_TABLEDND',1);
+if (! defined('DISABLE_JQUERY_TIPTIP'))     define('DISABLE_JQUERY_TIPTIP',1);
+if (! defined('DISABLE_JQUERY_JNOTIFY'))    define('DISABLE_JQUERY_JNOTIFY',1);
+if (! defined('DISABLE_JQUERY_FLOT'))       define('DISABLE_JQUERY_FLOT',1);
+if (! defined('DISABLE_JQUERY_JEDITABLE'))  define('DISABLE_JQUERY_JEDITABLE',1);
+if (! defined('DISABLE_JQUERY_JEDITABLE'))  define('DISABLE_JQUERY_JEDITABLE',1);
+if (! defined('DISABLE_CKEDITOR'))          define('DISABLE_CKEDITOR',1);
+if (! defined('DISABLE_CKEDITOR'))          define('DISABLE_CKEDITOR',1);
+if (! defined('DISABLE_BROWSER_NOTIF'))     define('DISABLE_BROWSER_NOTIF',1);
+if (! defined('DISABLE_DATE_PICKER'))       define('DISABLE_DATE_PICKER',1);
+if (! defined('DISABLE_SELECT2'))           define('DISABLE_SELECT2',1);
+
 require_once '../main.inc.php';
 
 if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL by the main.inc.php
@@ -55,6 +67,89 @@ top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
 
 print '<body>'."\n";
 
+// Javascript to make menu active like Jmobile did.
+print '
+<style>
+    /*Lets hide the non active LIs by default*/
+    body {
+        font-size: 16px;
+    }
+    body ul {
+        margin: 0;
+        padding-left: 0;
+    }
+    body ul li {
+        list-style: none;
+    }
+    body ul ul {
+        display: none;
+    }
+
+    a.alilevel0 {
+        background-image: url(\''.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/next.png\') !important;
+        background-repeat: no-repeat !important;
+        background-position-x: 10px;
+        background-position-y: 16px;
+        padding: 1em 15px 1em 40px;
+    }
+    li.lilevel1 {
+        padding: 1em 15px 0.5em 20px;
+        border-top: 1px solid #ccc;
+        margin-right: 20px;
+        border-right: 0px ! important;
+    }
+    li.lilevel1 a {
+        padding-bottom: 5px;
+    }
+    li.lilevel1 a, li.lilevel1 {
+        color: #000;
+        cursor: pointer;
+        display: block;
+    }
+    li.lilevel2 a {
+        padding: 0 15px 0.5em 40px;
+        color: #000;
+        cursor: pointer;
+        display: block;
+    }
+    li.lilevel3 a {
+        padding: 0.2em 15px 8px 60px;
+        color: #000;
+        cursor: pointer;
+        display: block;
+    }
+    li.lilevel3:last-child {
+        padding-bottom: 10px;
+    }            
+    a.alilevel0, li.lilevel1 a {
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        display: block;
+    }
+</style>
+    
+<script type="text/javascript">
+/*jQuery time*/
+$(document).ready(function(){
+    $("body ul").click(function(){
+        console.log("We click on body ul");
+
+        $(this).siblings().find("li ul").slideUp(0);
+        //slide up all the link lists
+        $(this).find("li ul").slideToggle(200);
+
+        target = $(this);
+        $(\'html, body\').animate({
+          scrollTop: target.offset().top
+        }, 300);
+            
+    })
+});
+</script>
+';
+    
+
 if (empty($user->societe_id))	// If internal user or not defined
 {
 	$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index d0ec2444afd..af4452dfb39 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -28,7 +28,8 @@ if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
 
 require_once '../../main.inc.php';
 
-if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/index.php'))
+if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/index.php'
+    || preg_match('/getmenu_div\.php/', $_SERVER['HTTP_REFERER'])))
 {
     global $langs, $conf;
 
diff --git a/htdocs/includes/jquery/plugins/mobile/images/ajax-loader.gif b/htdocs/includes/jquery/plugins/mobile/images/ajax-loader.gif
deleted file mode 100644
index fd1a189c21fed1c7ba00c4bb4fad407bd6d1e5f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7825
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
LHfkt@K(PD|Q{O_Y

diff --git a/htdocs/includes/jquery/plugins/mobile/images/icons-18-black.png b/htdocs/includes/jquery/plugins/mobile/images/icons-18-black.png
deleted file mode 100644
index 791646384bf6cf9cf0720c78cfbdc8ffb6d94e7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1968
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
F{{sZoU`7A{

diff --git a/htdocs/includes/jquery/plugins/mobile/images/icons-18-white.png b/htdocs/includes/jquery/plugins/mobile/images/icons-18-white.png
deleted file mode 100644
index 3419b81f6a8896807e1e6af0f14c8415fbe39da6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1988
zcmZ8ieK^zWAO6lJFDb?_VcNW<j+pgk4p(LlhLG9`N2IJ!(V3dJyhPZ^ln~z(y&!on
zk)P#<MUi#U%UO=sWlV(OFe}OL>A226zx%qL=ea-kb3gazdA|RA*`5cSHYsmWh9GE@
zi!=2g1R(<fS64)WS^0o_8w4SIJlzgCf^uzb&CJY<L?V&NWHmK4P-3xI3WY+W(Ewiu
z9*+k^QBm<<;r~}~5JZ6-FatAif)J3ou7G5qgA&YO3z*kEetv#nODGhAcEAbr%F4?1
z?oz1~>;leUFhWB^y}i9t{sABWz`x!R<NyK;v9Yl{9uJtu$HxT%0VpLB36seL1c*QZ
zY2Za5A0)#tyq*Ihfd}Xy2Z#W`0FHnXv<7zrX~3`!a8F<WoWtQXH8p`#z|+{+2$Dfs
zSy>tQD4-GO3!Jz03g3g*hDRPe;0+Oe01XC-dYHf<%<{QIEVw)!d=M%aB=lht0sRA1
z5}JT!Q3?O7z|93U%wkXvqe=W9$I&FXoX<@!AL7F0FmRT`d@duMHH7At4-sGzfy5&4
z`2^#_dS?iduW+H-ABs9U(|?lLe+2XLBh$FCHTNf13PoM+wEBa69h0^N4K5AK!?6}?
zCt4DG{I?$0ZMVg>$DC9z?Bd?CezP_H(}sdV=8hkDnK{eMpy>^Tf3H5y)y;>spTBzb
zHAl2dBwJL;C7(Ug#{U*hPZ2o>DUB+fbykiU))93*u6&lc6f$VioLppWv{QI6_|h(X
zSNq2Fk_Sfm_uAiIb-)Q}X?%=a5aJKrBlKfCA7R$EcX#4(b*U@DeO?JB17FUW`qdQO
z(OC*%YE>;e2|mZTOu9934XeBz)g#r=Li4+CJ(uO3y{!`y?g-m7OEKoI3K1$b?$@9!
z)jXBrf<$w-Xvpm@4Px&IQPSHs3gL-ztq;FH!XqJ^!I1<RDr&FazFGqOq-Y}gM#<ze
z-rKLZNu}}^js;O;=6FlQ9S1r2n-(Y;PY;6{xI^v@;TvaKt%k`R7mwMV5^MW??RCrJ
z5c9e&K~k>|Vo4mTR<of^L7c3kj%9~r?%+_GW!Wtp3cZCw+VYOJTs$eA<1Byc`FrNc
zQ8I;NfBdTb^9X}oR>=}X8YW)_N||0U6mDdCMfB+~kIkNNgaWR^U#@GKq&$*lzRX3)
zjw*`AsnBA^D3Y|v<!%tfw!(cdmQ&uZ;xT{m++JHKCmlMbSXmUDJk7#f_{xz-`h^uw
zq^f$!_DHnxUXy&gWLgs9l&KwjOf|mjj9o~Qhv9yEy5x%4>BmN>UgB7FI=Qs&wu()n
z1tu}#J5IkYsL8okkc?QK)*5SjKnwag8yo&>TF~qmK_gFRj;N(WOMMH!ZoZiv7PiX$
zuKJwo0S$KQhMBtZ^63qwSz<}x*u?4Dh6W$2cLOaYPhEnGw`jzXapt=%ui1B&-u)sz
zATKlCY?AZET^z}GIJ4jExFl%7SsIAdfU;CDu&k+Nn-S@$Ash0URQd(~f-GkG2~!d)
zBdIxd26d=*qfft^R=rq#&{~v$h$8D%nq&KXD)x4cyzKOge#EFa!64UGT^^ZL_jOLw
z&JPSP7h5VQ|0O^y^jKIB^YZ7MY}mxBUABxuuAE)ST;BYu&>pGLuBl};Ip;7&GI(>)
z5$pXbqJx-qt7xk9{Gy@T^rCrpf3c2W*UfXT3Kx)us(&X1U!;(BvZ^jNJ<V{J4O-)i
zk@HYqx%xMK(aPICo{8!8zHiFyZUG`*<IR#@4Lb-AM-fD&SiF7)($f*QEAKz5N$+#b
z_E;Krv}pRbs;WE<dN+G}Mb0pQA>bw1);2ZI)DRb5U+8&^dy^q4MaJ&mcu9Nezc=);
ztS46xsJMW3EwQV}mQ&VCoXB?jI;xyKh+5HFNbF=If{$Xhjk2*374cX4lC+o#+S<PL
zt$M9lh*qgxORf39?D)w2xt`iE?S@mSwj4%%<?!W?uG^l$0iXKax6c<e_c;14Ds5;?
zn*H1xzuCleWP83OtW{c44_mdLxNO*Egg_<yiC!s^?NNgetltv5<KJsooTyG;)$&6A
zHYry+$Z}x@?$ph{r?yoC-I0mfDwb!knEo$*4XL68*7y$HtF<wRi#mB^G1&k9W4O9G
zZE2ntU=8gX8yUMc^Cr`hVHL@qcz)kF0(Fk+oZ%UrD9WFpzGWL}Gjr5>IP&`G4>#`K
z5>aM_j`;ACt;h90F!SP$m?nB{oyWWnUDw*36#DLzprl*+i)489<J@5LZ0b-9=M|%R
zfNL}TIj<}y^2K{Oi-h|5De9jOpHHBY?$PLO9YtqD>mzN3PG#OI(Rm$mXw<EH_*1B^
z({%riLsRn|zRY`qpB;Ldb90?`b4z_LoT)Uby@C5H_(K^V?r!k6`Mp@SGSF1B0DDWf
zJ-T^uir5U%>G3faivnnySuMkH(KQ7Lo@UYC`)BAC=a<4=`ftG%RgAjxOV5he`dUcj
Wp+wY%7)$WSfLt68P^&3{m;MJcl$Lk^

diff --git a/htdocs/includes/jquery/plugins/mobile/images/icons-36-black.png b/htdocs/includes/jquery/plugins/mobile/images/icons-36-black.png
deleted file mode 100644
index 043bfcd521163a123843f15ac2fba220eab51d05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3859
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
RByhiioUyPquf`JM{|B@y8s-21

diff --git a/htdocs/includes/jquery/plugins/mobile/images/icons-36-white.png b/htdocs/includes/jquery/plugins/mobile/images/icons-36-white.png
deleted file mode 100644
index 12455c907a4f40205e89e0ff841cde2be105cf50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3861
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

diff --git a/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.css b/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.css
deleted file mode 100644
index 439ff9f20fd..00000000000
--- a/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.css
+++ /dev/null
@@ -1,3357 +0,0 @@
-/*
-* jQuery Mobile Git Build: SHA1: caa77b258660731d663844fe7867aa2c3a107ab1 <> Date: Wed Feb 20 15:03:27 2013 -0500
-* http://jquerymobile.com
-*
-* Copyright 2010, 2013 jQuery Foundation, Inc. and other contributors
-* Released under the MIT license.
-* http://jquery.org/license
-*
-*/
-
-
-/* Swatches */
-/* A
------------------------------------------------------------------------------------------------------------*/
-.ui-bar-a {
-	border: 1px solid 		#333 /*{a-bar-border}*/;
-	background: 			#111 /*{a-bar-background-color}*/;
-	color: 					#fff /*{a-bar-color}*/;
-	font-weight: bold;
-	text-shadow: 0 /*{a-bar-shadow-x}*/ -1px /*{a-bar-shadow-y}*/ 0 /*{a-bar-shadow-radius}*/ #000 /*{a-bar-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #3c3c3c /*{a-bar-background-start}*/), to( #111 /*{a-bar-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #3c3c3c /*{a-bar-background-start}*/, #111 /*{a-bar-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #3c3c3c /*{a-bar-background-start}*/, #111 /*{a-bar-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #3c3c3c /*{a-bar-background-start}*/, #111 /*{a-bar-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #3c3c3c /*{a-bar-background-start}*/, #111 /*{a-bar-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #3c3c3c /*{a-bar-background-start}*/, #111 /*{a-bar-background-end}*/);
-}
-.ui-bar-a,
-.ui-bar-a input,
-.ui-bar-a select,
-.ui-bar-a textarea,
-.ui-bar-a button {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-}
-.ui-bar-a .ui-link-inherit {
-	color: #fff /*{a-bar-color}*/;
-}
-.ui-bar-a a.ui-link {
-	color: #7cc4e7 /*{a-bar-link-color}*/;
-	font-weight: bold;
-}
-.ui-bar-a a.ui-link:visited {
-    color: #2489ce /*{a-bar-link-visited}*/;
-}
-.ui-bar-a a.ui-link:hover {
-	color: #2489ce /*{a-bar-link-hover}*/;
-}
-.ui-bar-a a.ui-link:active {
-	color: #2489ce /*{a-bar-link-active}*/;
-}
-.ui-body-a,
-.ui-overlay-a {
-	border: 1px solid 		#444 /*{a-body-border}*/;
-	background: 			#222 /*{a-body-background-color}*/;
-	color: 					#fff /*{a-body-color}*/;
-	text-shadow: 0 /*{a-body-shadow-x}*/ 1px /*{a-body-shadow-y}*/ 0 /*{a-body-shadow-radius}*/ #111 /*{a-body-shadow-color}*/;
-	font-weight: normal;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #444 /*{a-body-background-start}*/), to( #222 /*{a-body-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #444 /*{a-body-background-start}*/, #222 /*{a-body-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #444 /*{a-body-background-start}*/, #222 /*{a-body-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #444 /*{a-body-background-start}*/, #222 /*{a-body-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #444 /*{a-body-background-start}*/, #222 /*{a-body-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #444 /*{a-body-background-start}*/, #222 /*{a-body-background-end}*/);	
-}
-.ui-overlay-a {
-	background-image: none;
-	border-width: 0;
-}
-.ui-body-a,
-.ui-body-a input,
-.ui-body-a select,
-.ui-body-a textarea,
-.ui-body-a button {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-}
-.ui-body-a .ui-link-inherit {
-	color: 	#fff /*{a-body-color}*/;
-}
-.ui-body-a .ui-link {
-	color: #2489ce /*{a-body-link-color}*/;
-	font-weight: bold;
-}
-.ui-body-a .ui-link:visited {
-    color: #2489ce /*{a-body-link-visited}*/;
-}
-.ui-body-a .ui-link:hover {
-	color: #2489ce /*{a-body-link-hover}*/;
-}
-.ui-body-a .ui-link:active {
-	color: #2489ce /*{a-body-link-active}*/;
-}
-.ui-btn-up-a {
-	border: 1px solid 		#111 /*{a-bup-border}*/;
-	background: 			#333 /*{a-bup-background-color}*/;
-	font-weight: bold;
-	color: 					#fff /*{a-bup-color}*/;
-	text-shadow: 0 /*{a-bup-shadow-x}*/ 1px /*{a-bup-shadow-y}*/ 0 /*{a-bup-shadow-radius}*/ #111 /*{a-bup-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #444 /*{a-bup-background-start}*/), to( #2d2d2d /*{a-bup-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #444 /*{a-bup-background-start}*/, #2d2d2d /*{a-bup-background-end}*/);
-}
-.ui-btn-up-a:visited,
-.ui-btn-up-a a.ui-link-inherit {
-	color: 					#fff /*{a-bup-color}*/;
-}
-.ui-btn-hover-a {
-	border: 1px solid 		#000 /*{a-bhover-border}*/;
-	background: 			#444 /*{a-bhover-background-color}*/;
-	font-weight: bold;
-	color: 					#fff /*{a-bhover-color}*/;
-	text-shadow: 0 /*{a-bhover-shadow-x}*/ 1px /*{a-bhover-shadow-y}*/ 0 /*{a-bhover-shadow-radius}*/ #111 /*{a-bhover-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #555 /*{a-bhover-background-start}*/), to( #383838 /*{a-bhover-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #555 /*{a-bhover-background-start}*/, #383838 /*{a-bhover-background-end}*/);
-}
-.ui-btn-hover-a:visited,
-.ui-btn-hover-a:hover,
-.ui-btn-hover-a a.ui-link-inherit {
-	color: 					#fff /*{a-bhover-color}*/;
-}
-.ui-btn-down-a {
-	border: 1px solid 		#000 /*{a-bdown-border}*/;
-	background: 			#222 /*{a-bdown-background-color}*/;
-	font-weight: bold;
-	color: 					#fff /*{a-bdown-color}*/;
-	text-shadow: 0 /*{a-bdown-shadow-x}*/ 1px /*{a-bdown-shadow-y}*/ 0 /*{a-bdown-shadow-radius}*/ #111 /*{a-bdown-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #202020 /*{a-bdown-background-start}*/), to( #2c2c2c /*{a-bdown-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #202020 /*{a-bdown-background-start}*/, #2c2c2c /*{a-bdown-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #202020 /*{a-bdown-background-start}*/, #2c2c2c /*{a-bdown-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #202020 /*{a-bdown-background-start}*/, #2c2c2c /*{a-bdown-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #202020 /*{a-bdown-background-start}*/, #2c2c2c /*{a-bdown-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #202020 /*{a-bdown-background-start}*/, #2c2c2c /*{a-bdown-background-end}*/);
-}
-.ui-btn-down-a:visited,
-.ui-btn-down-a:hover,
-.ui-btn-down-a a.ui-link-inherit {
-	color: 					#fff /*{a-bdown-color}*/;
-}
-.ui-btn-up-a,
-.ui-btn-hover-a,
-.ui-btn-down-a {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-	text-decoration: none;
-}
-/* B
------------------------------------------------------------------------------------------------------------*/
-.ui-bar-b {
-	border: 1px solid 		#456f9a /*{b-bar-border}*/;
-	background: 			#5e87b0 /*{b-bar-background-color}*/;
-	color: 					#fff /*{b-bar-color}*/;
-	font-weight: bold;
-	text-shadow: 0 /*{b-bar-shadow-x}*/ 1px /*{b-bar-shadow-y}*/ 0 /*{b-bar-shadow-radius}*/ #3e6790 /*{b-bar-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #6facd5 /*{b-bar-background-start}*/), to( #497bae /*{b-bar-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #6facd5 /*{b-bar-background-start}*/, #497bae /*{b-bar-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #6facd5 /*{b-bar-background-start}*/, #497bae /*{b-bar-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #6facd5 /*{b-bar-background-start}*/, #497bae /*{b-bar-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #6facd5 /*{b-bar-background-start}*/, #497bae /*{b-bar-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #6facd5 /*{b-bar-background-start}*/, #497bae /*{b-bar-background-end}*/);
-}
-.ui-bar-b,
-.ui-bar-b input,
-.ui-bar-b select,
-.ui-bar-b textarea,
-.ui-bar-b button {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-}
-.ui-bar-b .ui-link-inherit {
-	color: 	#fff /*{b-bar-color}*/;
-}
-.ui-bar-b a.ui-link {
-	color: #ddf0f8 /*{b-bar-link-color}*/;
-	font-weight: bold;
-}
-.ui-bar-b a.ui-link:visited {
-    color: #ddf0f8 /*{b-bar-link-visited}*/;
-}
-.ui-bar-b a.ui-link:hover {
-	color: #ddf0f8 /*{b-bar-link-hover}*/;
-}
-.ui-bar-b a.ui-link:active {
-	color: #ddf0f8 /*{b-bar-link-active}*/;
-}
-.ui-body-b,
-.ui-overlay-b {
-	border: 1px solid 		#999 /*{b-body-border}*/;
-	background: 			#f3f3f3 /*{b-body-background-color}*/;
-	color: 					#222 /*{b-body-color}*/;
-	text-shadow: 0 /*{b-body-shadow-x}*/ 1px /*{b-body-shadow-y}*/ 0 /*{b-body-shadow-radius}*/ #fff /*{b-body-shadow-color}*/;
-	font-weight: normal;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #ddd /*{b-body-background-start}*/), to( #ccc /*{b-body-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #ddd /*{b-body-background-start}*/, #ccc /*{b-body-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #ddd /*{b-body-background-start}*/, #ccc /*{b-body-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #ddd /*{b-body-background-start}*/, #ccc /*{b-body-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #ddd /*{b-body-background-start}*/, #ccc /*{b-body-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #ddd /*{b-body-background-start}*/, #ccc /*{b-body-background-end}*/);
-}
-.ui-overlay-b {
-	background-image: none;
-	border-width: 0;
-}
-.ui-body-b,
-.ui-body-b input,
-.ui-body-b select,
-.ui-body-b textarea,
-.ui-body-b button {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-}
-.ui-body-b .ui-link-inherit {
-	color: 	#333 /*{b-body-color}*/;
-}
-.ui-body-b .ui-link {
-	color: #2489ce /*{b-body-link-color}*/;
-	font-weight: bold;
-}
-.ui-body-b .ui-link:visited {
-    color: #2489ce /*{b-body-link-visited}*/;
-}
-.ui-body-b .ui-link:hover {
-	color: #2489ce /*{b-body-link-hover}*/;
-}
-.ui-body-b .ui-link:active {
-	color: #2489ce /*{b-body-link-active}*/;
-}
-.ui-btn-up-b {
-	border: 1px solid 		#044062 /*{b-bup-border}*/;
-	background: 			#396b9e /*{b-bup-background-color}*/;
-	font-weight: bold;
-	color: 					#fff /*{b-bup-color}*/;
-	text-shadow: 0 /*{b-bup-shadow-x}*/ 1px /*{b-bup-shadow-y}*/ 0 /*{b-bup-shadow-radius}*/ #194b7e /*{b-bup-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #5f9cc5 /*{b-bup-background-start}*/), to( #396b9e /*{b-bup-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #5f9cc5 /*{b-bup-background-start}*/, #396b9e /*{b-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #5f9cc5 /*{b-bup-background-start}*/, #396b9e /*{b-bup-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #5f9cc5 /*{b-bup-background-start}*/, #396b9e /*{b-bup-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #5f9cc5 /*{b-bup-background-start}*/, #396b9e /*{b-bup-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #5f9cc5 /*{b-bup-background-start}*/, #396b9e /*{b-bup-background-end}*/);
-}
-.ui-btn-up-b:visited,
-.ui-btn-up-b a.ui-link-inherit {
-	color: 					#fff /*{b-bup-color}*/;
-}
-.ui-btn-hover-b {
-	border: 1px solid 		#00415e /*{b-bhover-border}*/;
-	background: 			#4b88b6 /*{b-bhover-background-color}*/;
-	font-weight: bold;
-	color: 					#fff /*{b-bhover-color}*/;
-	text-shadow: 0 /*{b-bhover-shadow-x}*/ 1px /*{b-bhover-shadow-y}*/ 0 /*{b-bhover-shadow-radius}*/ #194b7e /*{b-bhover-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #6facd5 /*{b-bhover-background-start}*/), to( #4272a4 /*{b-bhover-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #6facd5 /*{b-bhover-background-start}*/, #4272a4 /*{b-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #6facd5 /*{b-bhover-background-start}*/, #4272a4 /*{b-bhover-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #6facd5 /*{b-bhover-background-start}*/, #4272a4 /*{b-bhover-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #6facd5 /*{b-bhover-background-start}*/, #4272a4 /*{b-bhover-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #6facd5 /*{b-bhover-background-start}*/, #4272a4 /*{b-bhover-background-end}*/);
-}
-.ui-btn-hover-b:visited,
-.ui-btn-hover-b:hover,
-.ui-btn-hover-b a.ui-link-inherit {
-	color: 					#fff /*{b-bhover-color}*/;
-}
-.ui-btn-down-b {
-	border: 1px solid 		#225377 /*{b-bdown-border}*/;
-	background: 			#4e89c5 /*{b-bdown-background-color}*/;
-	font-weight: bold;
-	color: 					#fff /*{b-bdown-color}*/;
-	text-shadow: 0 /*{b-bdown-shadow-x}*/ 1px /*{b-bdown-shadow-y}*/ 0 /*{b-bdown-shadow-radius}*/ #194b7e /*{b-bdown-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #295b8e /*{b-bdown-background-start}*/), to( #3e79b5 /*{b-bdown-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #295b8e /*{b-bdown-background-start}*/, #3e79b5 /*{b-bdown-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #295b8e /*{b-bdown-background-start}*/, #3e79b5 /*{b-bdown-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #295b8e /*{b-bdown-background-start}*/, #3e79b5 /*{b-bdown-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #295b8e /*{b-bdown-background-start}*/, #3e79b5 /*{b-bdown-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #295b8e /*{b-bdown-background-start}*/, #3e79b5 /*{b-bdown-background-end}*/);
-}
-.ui-btn-down-b:visited,
-.ui-btn-down-b:hover,
-.ui-btn-down-b a.ui-link-inherit {
-	color: 					#fff /*{b-bdown-color}*/;
-}
-.ui-btn-up-b,
-.ui-btn-hover-b,
-.ui-btn-down-b {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-	text-decoration: none;
-}
-/* C
------------------------------------------------------------------------------------------------------------*/
-.ui-bar-c {
-	border: 1px solid 		#b3b3b3 /*{c-bar-border}*/;
-	background: 			#eee /*{c-bar-background-color}*/;
-	color: 					#3e3e3e /*{c-bar-color}*/;
-	font-weight: bold;
-	text-shadow: 0 /*{c-bar-shadow-x}*/ 1px /*{c-bar-shadow-y}*/ 0 /*{c-bar-shadow-radius}*/ 	#fff /*{c-bar-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #f0f0f0 /*{c-bar-background-start}*/), to( #ddd /*{c-bar-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #f0f0f0 /*{c-bar-background-start}*/, #ddd /*{c-bar-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #f0f0f0 /*{c-bar-background-start}*/, #ddd /*{c-bar-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #f0f0f0 /*{c-bar-background-start}*/, #ddd /*{c-bar-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #f0f0f0 /*{c-bar-background-start}*/, #ddd /*{c-bar-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #f0f0f0 /*{c-bar-background-start}*/, #ddd /*{c-bar-background-end}*/);
-}
-.ui-bar-c .ui-link-inherit {
-	color: 	#3e3e3e /*{c-bar-color}*/;
-}
-.ui-bar-c a.ui-link {
-	color: #7cc4e7 /*{c-bar-link-color}*/;
-	font-weight: bold;
-}
-.ui-bar-c a.ui-link:visited {
-    color: #2489ce /*{c-bar-link-visited}*/;
-}
-.ui-bar-c a.ui-link:hover {
-	color: #2489ce /*{c-bar-link-hover}*/;
-}
-.ui-bar-c a.ui-link:active {
-	color: #2489ce /*{c-bar-link-active}*/;
-}
-.ui-bar-c,
-.ui-bar-c input,
-.ui-bar-c select,
-.ui-bar-c textarea,
-.ui-bar-c button {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-}
-.ui-body-c,
-.ui-overlay-c {
-	border: 1px solid 		#aaa /*{c-body-border}*/;
-	color: 					#333 /*{c-body-color}*/;
-	text-shadow: 0 /*{c-body-shadow-x}*/ 1px /*{c-body-shadow-y}*/ 0 /*{c-body-shadow-radius}*/ #fff /*{c-body-shadow-color}*/;
-	background: 			#f9f9f9 /*{c-body-background-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #f9f9f9 /*{c-body-background-start}*/), to( #eee /*{c-body-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eee /*{c-body-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eee /*{c-body-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eee /*{c-body-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eee /*{c-body-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #f9f9f9 /*{c-body-background-start}*/, #eee /*{c-body-background-end}*/);
-}
-.ui-overlay-c {
-	background-image: none;
-	border-width: 0;
-}
-.ui-body-c,
-.ui-body-c input,
-.ui-body-c select,
-.ui-body-c textarea,
-.ui-body-c button {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-}
-.ui-body-c .ui-link-inherit {
-	color: 	#333 /*{c-body-color}*/;
-}
-.ui-body-c .ui-link {
-	color: #2489ce /*{c-body-link-color}*/;
-	font-weight: bold;
-}
-.ui-body-c .ui-link:visited {
-    color: #2489ce /*{c-body-link-visited}*/;
-}
-.ui-body-c .ui-link:hover {
-	color: #2489ce /*{c-body-link-hover}*/;
-}
-.ui-body-c .ui-link:active {
-	color: #2489ce /*{c-body-link-active}*/;
-}
-.ui-btn-up-c {
-	border: 1px solid 		#ccc /*{c-bup-border}*/;
-	background: 			#eee /*{c-bup-background-color}*/;
-	font-weight: bold;
-	color: 					#222 /*{c-bup-color}*/;
-	text-shadow: 0 /*{c-bup-shadow-x}*/ 1px /*{c-bup-shadow-y}*/ 0 /*{c-bup-shadow-radius}*/ #fff /*{c-bup-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #fff /*{c-bup-background-start}*/), to( #f1f1f1 /*{c-bup-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #fff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #fff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #fff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #fff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #fff /*{c-bup-background-start}*/, #f1f1f1 /*{c-bup-background-end}*/);
-}
-.ui-btn-up-c:visited,
-.ui-btn-up-c a.ui-link-inherit {
-	color: 					#2f3e46 /*{c-bup-color}*/;
-}
-.ui-btn-hover-c {
-	border: 1px solid 		#bbb /*{c-bhover-border}*/;
-	background: 			#dfdfdf /*{c-bhover-background-color}*/;
-	font-weight: bold;
-	color: 					#222 /*{c-bhover-color}*/;
-	text-shadow: 0 /*{c-bhover-shadow-x}*/ 1px /*{c-bhover-shadow-y}*/ 0 /*{c-bhover-shadow-radius}*/ #fff /*{c-bhover-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #f6f6f6 /*{c-bhover-background-start}*/), to( #e0e0e0 /*{c-bhover-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #f6f6f6 /*{c-bhover-background-start}*/, #e0e0e0 /*{c-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #f6f6f6 /*{c-bhover-background-start}*/, #e0e0e0 /*{c-bhover-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #f6f6f6 /*{c-bhover-background-start}*/, #e0e0e0 /*{c-bhover-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #f6f6f6 /*{c-bhover-background-start}*/, #e0e0e0 /*{c-bhover-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #f6f6f6 /*{c-bhover-background-start}*/, #e0e0e0 /*{c-bhover-background-end}*/);
-}
-.ui-btn-hover-c:visited,
-.ui-btn-hover-c:hover,
-.ui-btn-hover-c a.ui-link-inherit {
-	color: 					#2f3e46 /*{c-bhover-color}*/;
-}
-.ui-btn-down-c {
-	border: 1px solid 		#bbb /*{c-bdown-border}*/;
-	background: 			#d6d6d6 /*{c-bdown-background-color}*/;
-	font-weight: bold;
-	color: 					#222 /*{c-bdown-color}*/;
-	text-shadow: 0 /*{c-bdown-shadow-x}*/ 1px /*{c-bdown-shadow-y}*/ 0 /*{c-bdown-shadow-radius}*/ #fff /*{c-bdown-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #d0d0d0 /*{c-bdown-background-start}*/), to( #dfdfdf /*{c-bdown-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #d0d0d0 /*{c-bdown-background-start}*/, #dfdfdf /*{c-bdown-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #d0d0d0 /*{c-bdown-background-start}*/, #dfdfdf /*{c-bdown-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #d0d0d0 /*{c-bdown-background-start}*/, #dfdfdf /*{c-bdown-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #d0d0d0 /*{c-bdown-background-start}*/, #dfdfdf /*{c-bdown-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #d0d0d0 /*{c-bdown-background-start}*/, #dfdfdf /*{c-bdown-background-end}*/);
-}
-.ui-btn-down-c:visited,
-.ui-btn-down-c:hover,
-.ui-btn-down-c a.ui-link-inherit {
-	color: 					#2f3e46 /*{c-bdown-color}*/;
-}
-.ui-btn-up-c,
-.ui-btn-hover-c,
-.ui-btn-down-c {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-	text-decoration: none;
-}
-/* D
------------------------------------------------------------------------------------------------------------*/
-.ui-bar-d {
-	border: 1px solid 		#bbb /*{d-bar-border}*/;
-	background: 			#bbb /*{d-bar-background-color}*/;
-	color: 					#333 /*{d-bar-color}*/;
-	font-weight: bold;
-	text-shadow: 0 /*{d-bar-shadow-x}*/ 1px /*{d-bar-shadow-y}*/ 0 /*{d-bar-shadow-radius}*/ #eee /*{d-bar-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #ddd /*{d-bar-background-start}*/), to( #bbb /*{d-bar-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #ddd /*{d-bar-background-start}*/, #bbb /*{d-bar-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #ddd /*{d-bar-background-start}*/, #bbb /*{d-bar-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #ddd /*{d-bar-background-start}*/, #bbb /*{d-bar-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #ddd /*{d-bar-background-start}*/, #bbb /*{d-bar-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #ddd /*{d-bar-background-start}*/, #bbb /*{d-bar-background-end}*/);
-}
-.ui-bar-d,
-.ui-bar-d input,
-.ui-bar-d select,
-.ui-bar-d textarea,
-.ui-bar-d button {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-}
-.ui-bar-d .ui-link-inherit {
-	color: 	#333 /*{d-bar-color}*/;
-}
-.ui-bar-d a.ui-link {
-	color: #2489ce /*{d-bar-link-color}*/;
-	font-weight: bold;
-}
-.ui-bar-d a.ui-link:visited {
-    color: #2489ce /*{d-bar-link-visited}*/;
-}
-.ui-bar-d a.ui-link:hover {
-	color: #2489ce /*{d-bar-link-hover}*/;
-}
-.ui-bar-d a.ui-link:active {
-	color: #2489ce /*{d-bar-link-active}*/;
-}
-.ui-body-d,
-.ui-overlay-d {
-	border: 1px solid 		#bbb /*{d-body-border}*/;
-	color: 					#333 /*{d-body-color}*/;
-	text-shadow: 0 /*{d-body-shadow-x}*/ 1px /*{d-body-shadow-y}*/ 0 /*{d-body-shadow-radius}*/ 	#fff /*{d-body-shadow-color}*/;
-	background: 			#fff /*{d-body-background-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #fff /*{d-body-background-start}*/), to( #fff /*{d-body-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #fff /*{d-body-background-start}*/, #fff /*{d-body-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #fff /*{d-body-background-start}*/, #fff /*{d-body-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #fff /*{d-body-background-start}*/, #fff /*{d-body-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #fff /*{d-body-background-start}*/, #fff /*{d-body-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #fff /*{d-body-background-start}*/, #fff /*{d-body-background-end}*/);
-}
-.ui-overlay-d {
-	background-image: none;
-	border-width: 0;
-}
-.ui-body-d,
-.ui-body-d input,
-.ui-body-d select,
-.ui-body-d textarea,
-.ui-body-d button {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-}
-.ui-body-d .ui-link-inherit {
-	color: 	#333 /*{d-body-color}*/;
-}
-.ui-body-d .ui-link {
-	color: #2489ce /*{d-body-link-color}*/;
-	font-weight: bold;
-}
-.ui-body-d .ui-link:visited {
-    color: #2489ce /*{d-body-link-visited}*/;
-}
-.ui-body-d .ui-link:hover {
-	color: #2489ce /*{d-body-link-hover}*/;
-}
-.ui-body-d .ui-link:active {
-	color: #2489ce /*{d-body-link-active}*/;
-}
-.ui-btn-up-d {
-	border: 1px solid 		#bbb /*{d-bup-border}*/;
-	background: 			#fff /*{d-bup-background-color}*/;
-	font-weight: bold;
-	color: 					#333 /*{d-bup-color}*/;
-	text-shadow: 0 /*{d-bup-shadow-x}*/ 1px /*{d-bup-shadow-y}*/ 0 /*{d-bup-shadow-radius}*/ #fff /*{d-bup-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #fafafa /*{d-bup-background-start}*/), to( #f6f6f6 /*{d-bup-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #fafafa /*{d-bup-background-start}*/, #f6f6f6 /*{d-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #fafafa /*{d-bup-background-start}*/, #f6f6f6 /*{d-bup-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #fafafa /*{d-bup-background-start}*/, #f6f6f6 /*{d-bup-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #fafafa /*{d-bup-background-start}*/, #f6f6f6 /*{d-bup-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #fafafa /*{d-bup-background-start}*/, #f6f6f6 /*{d-bup-background-end}*/);
-}
-.ui-btn-up-d:visited,
-.ui-btn-up-d a.ui-link-inherit {
-	color: 					#333 /*{d-bup-color}*/;
-}
-.ui-btn-hover-d {
-	border: 1px solid 		#aaa /*{d-bhover-border}*/;
-	background: 			#eee /*{d-bhover-background-color}*/;
-	font-weight: bold;
-	color: 					#333 /*{d-bhover-color}*/;
-	cursor: pointer;
-	text-shadow: 0 /*{d-bhover-shadow-x}*/ 1px /*{d-bhover-shadow-y}*/ 0 /*{d-bhover-shadow-radius}*/ 	#fff /*{d-bhover-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #eee /*{d-bhover-background-start}*/), to( #fff /*{d-bhover-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #eee /*{d-bhover-background-start}*/, #fff /*{d-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #eee /*{d-bhover-background-start}*/, #fff /*{d-bhover-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #eee /*{d-bhover-background-start}*/, #fff /*{d-bhover-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #eee /*{d-bhover-background-start}*/, #fff /*{d-bhover-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #eee /*{d-bhover-background-start}*/, #fff /*{d-bhover-background-end}*/);
-}
-.ui-btn-hover-d:visited,
-.ui-btn-hover-d:hover,
-.ui-btn-hover-d a.ui-link-inherit {
-	color: 					#333 /*{d-bhover-color}*/;
-}
-.ui-btn-down-d {
-	border: 1px solid 		#aaa /*{d-bdown-border}*/;
-	background: 			#eee /*{d-bdown-background-color}*/;
-	font-weight: bold;
-	color: 					#333 /*{d-bdown-color}*/;
-	text-shadow: 0 /*{d-bdown-shadow-x}*/ 1px /*{d-bdown-shadow-y}*/ 0 /*{d-bdown-shadow-radius}*/ 	#fff /*{d-bdown-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #e5e5e5 /*{d-bdown-background-start}*/), to( #f2f2f2 /*{d-bdown-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #e5e5e5 /*{d-bdown-background-start}*/, #f2f2f2 /*{d-bdown-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #e5e5e5 /*{d-bdown-background-start}*/, #f2f2f2 /*{d-bdown-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #e5e5e5 /*{d-bdown-background-start}*/, #f2f2f2 /*{d-bdown-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #e5e5e5 /*{d-bdown-background-start}*/, #f2f2f2 /*{d-bdown-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #e5e5e5 /*{d-bdown-background-start}*/, #f2f2f2 /*{d-bdown-background-end}*/);
-}
-.ui-btn-down-d:visited,
-.ui-btn-down-d:hover,
-.ui-btn-down-d a.ui-link-inherit {
-	color: 					#333 /*{d-bdown-color}*/;
-}
-.ui-btn-up-d,
-.ui-btn-hover-d,
-.ui-btn-down-d {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-	text-decoration: none;
-}
-/* E
------------------------------------------------------------------------------------------------------------*/
-.ui-bar-e {
-	border: 1px solid 		#f7c942 /*{e-bar-border}*/;
-	background: 			#fadb4e /*{e-bar-background-color}*/;
-	color: 					#333 /*{e-bar-color}*/;
-	font-weight: bold;
-	text-shadow: 0 /*{e-bar-shadow-x}*/ 1px /*{e-bar-shadow-y}*/ 0 /*{e-bar-shadow-radius}*/ 	#fff /*{e-bar-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #fceda7 /*{e-bar-background-start}*/), to( #fbef7e /*{e-bar-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #fceda7 /*{e-bar-background-start}*/, #fbef7e /*{e-bar-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #fceda7 /*{e-bar-background-start}*/, #fbef7e /*{e-bar-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #fceda7 /*{e-bar-background-start}*/, #fbef7e /*{e-bar-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #fceda7 /*{e-bar-background-start}*/, #fbef7e /*{e-bar-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #fceda7 /*{e-bar-background-start}*/, #fbef7e /*{e-bar-background-end}*/);
-}
-.ui-bar-e,
-.ui-bar-e input,
-.ui-bar-e select,
-.ui-bar-e textarea,
-.ui-bar-e button {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-}
-.ui-bar-e .ui-link-inherit {
-	color: 	#333 /*{e-bar-color}*/;
-}
-.ui-bar-e a.ui-link {
-	color: #2489ce /*{e-bar-link-color}*/;
-	font-weight: bold;
-}
-.ui-bar-e a.ui-link:visited {
-    color: #2489ce /*{e-bar-link-visited}*/;
-}
-.ui-bar-e a.ui-link:hover {
-	color: #2489ce /*{e-bar-link-hover}*/;
-}
-.ui-bar-e a.ui-link:active {
-	color: #2489ce /*{e-bar-link-active}*/;
-}
-.ui-body-e,
-.ui-overlay-e {
-	border: 1px solid 		#f7c942 /*{e-body-border}*/;
-	color: 					#222 /*{e-body-color}*/;
-	text-shadow: 0 /*{e-body-shadow-x}*/ 1px /*{e-body-shadow-y}*/ 0 /*{e-body-shadow-radius}*/ 	#fff /*{e-body-shadow-color}*/;
-	background: 			#fff9df /*{e-body-background-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #fffadf /*{e-body-background-start}*/), to( #fff3a5 /*{e-body-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #fffadf /*{e-body-background-start}*/, #fff3a5 /*{e-body-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #fffadf /*{e-body-background-start}*/, #fff3a5 /*{e-body-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #fffadf /*{e-body-background-start}*/, #fff3a5 /*{e-body-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #fffadf /*{e-body-background-start}*/, #fff3a5 /*{e-body-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #fffadf /*{e-body-background-start}*/, #fff3a5 /*{e-body-background-end}*/);
-}
-.ui-overlay-e {
-	background-image: none;
-	border-width: 0;
-}
-.ui-body-e,
-.ui-body-e input,
-.ui-body-e select,
-.ui-body-e textarea,
-.ui-body-e button {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-}
-.ui-body-e .ui-link-inherit {
-	color: 	#222 /*{e-body-color}*/;
-}
-.ui-body-e .ui-link {
-	color: #2489ce /*{e-body-link-color}*/;
-	font-weight: bold;
-}
-.ui-body-e .ui-link:visited {
-    color: #2489ce /*{e-body-link-visited}*/;
-}
-.ui-body-e .ui-link:hover {
-	color: #2489ce /*{e-body-link-hover}*/;
-}
-.ui-body-e .ui-link:active {
-	color: #2489ce /*{e-body-link-active}*/;
-}
-.ui-btn-up-e {
-	border: 1px solid 		#f4c63f /*{e-bup-border}*/;
-	background: 			#fadb4e /*{e-bup-background-color}*/;
-	font-weight: bold;
-	color: 					#222 /*{e-bup-color}*/;
-	text-shadow: 0 /*{e-bup-shadow-x}*/ 1px /*{e-bup-shadow-y}*/ 0 /*{e-bup-shadow-radius}*/ 	#fff /*{e-bup-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #ffefaa /*{e-bup-background-start}*/), to( #ffe155 /*{e-bup-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #ffefaa /*{e-bup-background-start}*/, #ffe155 /*{e-bup-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #ffefaa /*{e-bup-background-start}*/, #ffe155 /*{e-bup-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #ffefaa /*{e-bup-background-start}*/, #ffe155 /*{e-bup-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #ffefaa /*{e-bup-background-start}*/, #ffe155 /*{e-bup-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #ffefaa /*{e-bup-background-start}*/, #ffe155 /*{e-bup-background-end}*/);
-}
-.ui-btn-up-e:visited,
-.ui-btn-up-e a.ui-link-inherit {
-	color: 					#222 /*{e-bup-color}*/;
-}
-.ui-btn-hover-e {
-	border: 1px solid 		#f2c43d /*{e-bhover-border}*/;
-	background: 			#fbe26f /*{e-bhover-background-color}*/;
-	font-weight: bold;
-	color: 					#111 /*{e-bhover-color}*/;
-	text-shadow: 0 /*{e-bhover-shadow-x}*/ 1px /*{e-bhover-shadow-y}*/ 0 /*{e-bhover-shadow-radius}*/ 	#fff /*{e-bhover-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #fff5ba /*{e-bhover-background-start}*/), to( #fbdd52 /*{e-bhover-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #fff5ba /*{e-bhover-background-start}*/, #fbdd52 /*{e-bhover-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #fff5ba /*{e-bhover-background-start}*/, #fbdd52 /*{e-bhover-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #fff5ba /*{e-bhover-background-start}*/, #fbdd52 /*{e-bhover-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #fff5ba /*{e-bhover-background-start}*/, #fbdd52 /*{e-bhover-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #fff5ba /*{e-bhover-background-start}*/, #fbdd52 /*{e-bhover-background-end}*/);
-}
-.ui-btn-hover-e:visited,
-.ui-btn-hover-e:hover,
-.ui-btn-hover-e a.ui-link-inherit {
-	color: 					#333 /*{e-bhover-color}*/;
-}
-.ui-btn-down-e {
-	border: 1px solid 		#f2c43d /*{e-bdown-border}*/;
-	background: 			#fceda7 /*{e-bdown-background-color}*/;
-	font-weight: bold;
-	color: 					#111 /*{e-bdown-color}*/;
-	text-shadow: 0 /*{e-bdown-shadow-x}*/ 1px /*{e-bdown-shadow-y}*/ 0 /*{e-bdown-shadow-radius}*/ 	#fff /*{e-bdown-shadow-color}*/;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #f8d94c /*{e-bdown-background-start}*/), to( #fadb4e /*{e-bdown-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #f8d94c /*{e-bdown-background-start}*/, #fadb4e /*{e-bdown-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #f8d94c /*{e-bdown-background-start}*/, #fadb4e /*{e-bdown-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #f8d94c /*{e-bdown-background-start}*/, #fadb4e /*{e-bdown-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #f8d94c /*{e-bdown-background-start}*/, #fadb4e /*{e-bdown-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #f8d94c /*{e-bdown-background-start}*/, #fadb4e /*{e-bdown-background-end}*/);
-}
-.ui-btn-down-e:visited,
-.ui-btn-down-e:hover,
-.ui-btn-down-e a.ui-link-inherit {
-	color: 					#333 /*{e-bdown-color}*/;
-}
-.ui-btn-up-e,
-.ui-btn-hover-e,
-.ui-btn-down-e {
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-	text-decoration: none;
-}
-/* Structure */
-/* links within "buttons" 
------------------------------------------------------------------------------------------------------------*/
-a.ui-link-inherit {
-	text-decoration: none !important;
-}
-/* Active class used as the "on" state across all themes
------------------------------------------------------------------------------------------------------------*/
-.ui-btn-active {
-	border: 1px solid 		#2373a5 /*{global-active-border}*/;
-	background: 			#5393c5 /*{global-active-background-color}*/;
-	font-weight: bold;
-	color: 					#fff /*{global-active-color}*/;
-	cursor: pointer;
-	text-shadow: 0 /*{global-active-shadow-x}*/ 1px /*{global-active-shadow-y}*/ 0 /*{global-active-shadow-radius}*/ #3373a5 /*{global-active-shadow-color}*/;
-	text-decoration: none;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #5393c5 /*{global-active-background-start}*/), to( #6facd5 /*{global-active-background-end}*/)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient( #5393c5 /*{global-active-background-start}*/, #6facd5 /*{global-active-background-end}*/); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient( #5393c5 /*{global-active-background-start}*/, #6facd5 /*{global-active-background-end}*/); /* FF3.6 */
-	background-image:     -ms-linear-gradient( #5393c5 /*{global-active-background-start}*/, #6facd5 /*{global-active-background-end}*/); /* IE10 */
-	background-image:      -o-linear-gradient( #5393c5 /*{global-active-background-start}*/, #6facd5 /*{global-active-background-end}*/); /* Opera 11.10+ */
-	background-image:         linear-gradient( #5393c5 /*{global-active-background-start}*/, #6facd5 /*{global-active-background-end}*/);
-	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
-}
-.ui-btn-active:visited,
-.ui-btn-active:hover,
-.ui-btn-active a.ui-link-inherit {
-	color: 					#fff /*{global-active-color}*/;
-}
-/* button inner top highlight
------------------------------------------------------------------------------------------------------------*/
-.ui-btn-inner {
-	border-top: 1px solid 	#fff;
-	border-color: 			rgba(255,255,255,.3);
-}
-/* corner rounding classes
------------------------------------------------------------------------------------------------------------*/
-.ui-corner-all {
-	-webkit-border-radius: 				.6em /*{global-radii-blocks}*/;
-	border-radius: 						.6em /*{global-radii-blocks}*/;
-}
-/* Form field separator
------------------------------------------------------------------------------------------------------------*/
-.ui-br {
-	border-color: rgb(130,130,130);
-	border-color: rgba(130,130,130,.3);
-	border-style: solid;
-}
-/* Interaction cues
------------------------------------------------------------------------------------------------------------*/
-.ui-disabled {
-	filter: Alpha(Opacity=30);
-	opacity: .3;
-	zoom: 1;
-}
-.ui-disabled,
-.ui-disabled a {
-	cursor: default !important;
-	pointer-events: none;
-}
-/* Icons
------------------------------------------------------------------------------------------------------------*/
-.ui-icon,
-.ui-icon-searchfield:after {
-	background-color: 						#666 /*{global-icon-color}*/;
-	background-color: 						rgba(0,0,0,.4) /*{global-icon-disc}*/;
-	background-image: url(images/icons-18-white.png) /*{global-icon-set}*/;
-	background-repeat: no-repeat;
-	-webkit-border-radius: 				9px;
-	border-radius: 						9px;
-}
-/* Alt icon color
------------------------------------------------------------------------------------------------------------*/
-.ui-icon-alt .ui-icon,
-.ui-icon-alt .ui-icon-searchfield:after {
-	background-color: 						#fff;
-	background-color: 						rgba(255,255,255,.3);
-	background-image: url(images/icons-18-black.png);
-	background-repeat: no-repeat;
-}
-/* No disc
------------------------------------------------------------------------------------------------------------*/
-.ui-icon-nodisc .ui-icon,
-.ui-icon-nodisc .ui-icon-searchfield:after,
-.ui-icon-nodisc .ui-icon-alt .ui-icon,
-.ui-icon-nodisc .ui-icon-alt .ui-icon-searchfield:after {
-	background-color: transparent;
-}
-/* Icon sprite
------------------------------------------------------------------------------------------------------------*/
-/* plus minus */
-.ui-icon-plus {
-	background-position: 	-1px -1px;
-}
-.ui-icon-minus {
-	background-position: 	-37px -1px;
-}
-/* delete/close */
-.ui-icon-delete {
-	background-position: 	-73px -1px;
-}
-/* arrows */
-.ui-icon-arrow-r {
-	background-position: 	-108px -1px;
-}
-.ui-icon-arrow-l {
-	background-position: 	-144px -1px;
-}
-.ui-icon-arrow-u {
-	background-position: 	-180px -1px;
-}
-.ui-icon-arrow-d {
-	background-position: 	-216px -1px;
-}
-/* misc */
-.ui-icon-check {
-	background-position: 	-252px -1px;
-}
-.ui-icon-gear {
-	background-position: 	-288px -1px;
-}
-.ui-icon-refresh {
-	background-position: 	-323px -1px;
-}
-.ui-icon-forward {
-	background-position: 	-360px -1px;
-}
-.ui-icon-back {
-	background-position: 	-396px -1px;
-}
-.ui-icon-grid {
-	background-position: 	-432px -1px;
-}
-.ui-icon-star {
-	background-position: 	-467px -1px;
-}
-.ui-icon-alert {
-	background-position: 	-503px -1px;
-}
-.ui-icon-info {
-	background-position: 	-539px -1px;
-}
-.ui-icon-home {
-	background-position: 	-575px -1px;
-}
-/* search */
-.ui-icon-search,
-.ui-icon-searchfield:after {
-	background-position: 	-611px -1px;
-}
-/* checkbox radio */
-.ui-icon-checkbox-on {
-	background-position: 	-647px -1px;
-}
-.ui-icon-checkbox-off {
-	background-position: 	-683px -1px;
-}
-.ui-icon-radio-on {
-	background-position: 	-718px -1px;
-}
-.ui-icon-radio-off {
-	background-position: 	-754px -1px;
-}
-/* menu edit */
-.ui-icon-bars {
-	background-position: 	-788px -1px;
-}
-.ui-icon-edit {
-	background-position: 	-824px -1px;
-}
-/* HD/"retina" sprite
------------------------------------------------------------------------------------------------------------*/
-@media only screen and (-webkit-min-device-pixel-ratio: 1.3),
-       only screen and (min--moz-device-pixel-ratio: 1.3),
-       only screen and (min-resolution: 200dpi) {
-	
-	.ui-icon-plus, .ui-icon-minus, .ui-icon-delete, .ui-icon-arrow-r,
-	.ui-icon-arrow-l, .ui-icon-arrow-u, .ui-icon-arrow-d, .ui-icon-check,
-	.ui-icon-gear, .ui-icon-refresh, .ui-icon-forward, .ui-icon-back,
-	.ui-icon-grid, .ui-icon-star, .ui-icon-alert, .ui-icon-info, .ui-icon-home, .ui-icon-bars, .ui-icon-edit,
-	.ui-icon-search, .ui-icon-searchfield:after, 
-	.ui-icon-checkbox-off, .ui-icon-checkbox-on, .ui-icon-radio-off, .ui-icon-radio-on {
-		background-image: url(images/icons-36-white.png);
-		-moz-background-size: 864px 18px;
-		-o-background-size: 864px 18px;
-		-webkit-background-size: 864px 18px;
-		background-size: 864px 18px;
-	}
-	.ui-icon-alt .ui-icon {
-		background-image: url(images/icons-36-black.png);
-	}
-	.ui-icon-plus {
-		background-position: 	0px 50%;
-	}
-	.ui-icon-minus {
-		background-position: 	-36px 50%;
-	}
-	.ui-icon-delete {
-		background-position: 	-72px 50%;
-	}
-	.ui-icon-arrow-r {
-		background-position: 	-108px 50%;
-	}
-	.ui-icon-arrow-l {
-		background-position: 	-144px 50%;
-	}
-	.ui-icon-arrow-u {
-		background-position: 	-179px 50%;
-	}
-	.ui-icon-arrow-d {
-		background-position: 	-215px 50%;
-	}
-	.ui-icon-check {
-		background-position: 	-252px 50%;
-	}
-	.ui-icon-gear {
-		background-position: 	-287px 50%;
-	}
-	.ui-icon-refresh {
-		background-position: 	-323px 50%;
-	}
-	.ui-icon-forward {
-		background-position: 	-360px 50%;
-	}
-	.ui-icon-back {
-		background-position: 	-395px 50%;
-	}
-	.ui-icon-grid {
-		background-position: 	-431px 50%;
-	}
-	.ui-icon-star {
-		background-position: 	-467px 50%;
-	}
-	.ui-icon-alert {
-		background-position: 	-503px 50%;
-	}
-	.ui-icon-info {
-		background-position: 	-538px 50%;
-	}
-	.ui-icon-home {
-		background-position: 	-575px 50%;
-	}
-	.ui-icon-search,
-	.ui-icon-searchfield:after {
-		background-position: 	-611px 50%;
-	}
-	.ui-icon-checkbox-on {
-		background-position: 	-647px 50%;
-	}
-	.ui-icon-checkbox-off {
-		background-position: 	-683px 50%;
-	}
-	.ui-icon-radio-on {
-		background-position: 	-718px 50%;
-	}
-	.ui-icon-radio-off {
-		background-position: 	-754px 50%;
-	}
-	.ui-icon-bars {
-		background-position: 	-788px 50%;
-	
-	}.ui-icon-edit {
-		background-position: 	-824px 50%;
-	}
-}
-/* checks,radios */
-.ui-checkbox .ui-icon,
-.ui-selectmenu-list .ui-icon {
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-.ui-icon-checkbox-off,
-.ui-icon-radio-off {
-	background-color: transparent;	
-}
-.ui-checkbox-on .ui-icon,
-.ui-radio-on .ui-icon {
-	background-color: #4596ce /*{global-active-background-color}*/; /* NOTE: this hex should match the active state color. It's repeated here for cascade */
-}
-/* loading icon */
-.ui-icon-loading {
-	background: url(images/ajax-loader.gif);
-	background-size: 46px 46px;
-}
-/* Button corner class
------------------------------------------------------------------------------------------------------------*/
-.ui-btn-corner-all {
-	-webkit-border-radius: 				1em /*{global-radii-buttons}*/;
-	border-radius: 						1em /*{global-radii-buttons}*/;
-}
-/* radius clip workaround for cleaning up corner trapping */
-.ui-corner-all,
-.ui-btn-corner-all {
-	-webkit-background-clip: padding;
-	background-clip: padding-box;
-}
-/* Overlay / modal
------------------------------------------------------------------------------------------------------------*/
-.ui-overlay {
-	background: #666;
-	filter: Alpha(Opacity=50);
-	opacity: .5;
-	position: absolute;
-	width: 100%;
-	height: 100%;
-}
-.ui-overlay-shadow {
-	-moz-box-shadow: 0px 0px 12px 			rgba(0,0,0,.6);
-	-webkit-box-shadow: 0px 0px 12px 		rgba(0,0,0,.6);
-	box-shadow: 0px 0px 12px 				rgba(0,0,0,.6);
-}
-.ui-shadow {
-	-moz-box-shadow: 0px 1px 3px /*{global-box-shadow-size}*/ 			rgba(0,0,0,.2) /*{global-box-shadow-color}*/;
-	-webkit-box-shadow: 0px 1px 3px /*{global-box-shadow-size}*/ 		rgba(0,0,0,.2) /*{global-box-shadow-color}*/;
-	box-shadow: 0px 1px 3px /*{global-box-shadow-size}*/ 				rgba(0,0,0,.2) /*{global-box-shadow-color}*/;
-}
-.ui-bar-a .ui-shadow,
-.ui-bar-b .ui-shadow ,
-.ui-bar-c .ui-shadow  {
-	-moz-box-shadow: 0px 1px 0 				rgba(255,255,255,.3);
-	-webkit-box-shadow: 0px 1px 0 			rgba(255,255,255,.3);
-	box-shadow: 0px 1px 0 					rgba(255,255,255,.3);
-}
-.ui-shadow-inset {
-	-moz-box-shadow: inset 0px 1px 4px 		rgba(0,0,0,.2);
-	-webkit-box-shadow: inset 0px 1px 4px 	rgba(0,0,0,.2);
-	box-shadow: inset 0px 1px 4px 			rgba(0,0,0,.2);
-}
-.ui-icon-shadow {
-	-moz-box-shadow: 0px 1px 0 				rgba(255,255,255,.4) /*{global-icon-shadow}*/;
-	-webkit-box-shadow: 0px 1px 0 			rgba(255,255,255,.4) /*{global-icon-shadow}*/;
-	box-shadow: 0px 1px 0 					rgba(255,255,255,.4) /*{global-icon-shadow}*/;
-}
-/* Focus state - set here for specificity (note: these classes are added by JavaScript)
------------------------------------------------------------------------------------------------------------*/
-.ui-btn:focus, .ui-link-inherit:focus {
-	outline: 0;
-}
-.ui-btn.ui-focus {
-	z-index: 1;
-}
-.ui-focus,
-.ui-btn:focus {
-	-moz-box-shadow: inset 0px 0px 3px 		#387bbe /*{global-active-background-color}*/, 0px 0px 9px 		#387bbe /*{global-active-background-color}*/;
-	-webkit-box-shadow: inset 0px 0px 3px 	#387bbe /*{global-active-background-color}*/, 0px 0px 9px 		#387bbe /*{global-active-background-color}*/;
-	box-shadow: inset 0px 0px 3px 			#387bbe /*{global-active-background-color}*/, 0px 0px 9px 		#387bbe /*{global-active-background-color}*/;
-}
-.ui-input-text.ui-focus,
-.ui-input-search.ui-focus {
-	-moz-box-shadow: 0px 0px 12px 			#387bbe /*{global-active-background-color}*/;
-	-webkit-box-shadow: 0px 0px 12px 		#387bbe /*{global-active-background-color}*/;
-	box-shadow: 0px 0px 12px 					#387bbe /*{global-active-background-color}*/;	
-}
-/* unset box shadow in browsers that don't do it right
------------------------------------------------------------------------------------------------------------*/
-.ui-mobile-nosupport-boxshadow * {
-	-moz-box-shadow: none !important;
-	-webkit-box-shadow: none !important;
-	box-shadow: none !important;
-}
-/* ...and bring back focus */
-.ui-mobile-nosupport-boxshadow .ui-focus,
-.ui-mobile-nosupport-boxshadow .ui-btn:focus,
-.ui-mobile-nosupport-boxshadow .ui-link-inherit:focus {
-	outline-width: 1px;
-	outline-style: auto;
-}
-/* some unsets - more probably needed */
-.ui-mobile, .ui-mobile body { height: 99.9%; }
-.ui-mobile fieldset, .ui-page { padding: 0; margin: 0; }
-.ui-mobile a img, .ui-mobile fieldset { border-width: 0; }
-/* responsive page widths */
-.ui-mobile-viewport { margin: 0; overflow-x: visible; -webkit-text-size-adjust: 100%; -ms-text-size-adjust:none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
-/* Issue #2066 */
-body.ui-mobile-viewport,
-div.ui-mobile-viewport { overflow-x: hidden; }
-/* "page" containers - full-screen views, one should always be in view post-pageload */
-.ui-mobile [data-role=page], .ui-mobile [data-role=dialog], .ui-page { top: 0; left: 0; width: 100%; min-height: 100%; position: absolute; display: none; border: 0; }
-.ui-mobile .ui-page-active { display: block; overflow: visible; }
-/* on ios4, setting focus on the page element causes flashing during transitions when there is an outline, so we turn off outlines */
-.ui-page { outline: none; }
-/*orientations from js are available */
-@media screen and (orientation: portrait){
-.ui-mobile, .ui-mobile .ui-page { min-height: 420px; }
-}
-@media screen and (orientation: landscape){
-.ui-mobile, .ui-mobile .ui-page { min-height: 300px; }
-}
-/* loading screen */
-.ui-loading .ui-loader { display: block; }
-.ui-loader { display: none; z-index: 9999999; position: fixed; top: 50%; left: 50%; border:0; }
-.ui-loader-default { background: none; filter: Alpha(Opacity=18); opacity: .18; width: 46px; height: 46px; margin-left: -23px; margin-top: -23px; }
-.ui-loader-verbose { width: 200px; filter: Alpha(Opacity=88); opacity: .88; box-shadow: 0 1px 1px -1px #fff; height: auto; margin-left: -110px; margin-top: -43px; padding: 10px; }
-.ui-loader-default h1 { font-size: 0; width: 0; height: 0; overflow: hidden; }
-.ui-loader-verbose h1 { font-size: 16px; margin: 0; text-align: center; }
-.ui-loader .ui-icon { background-color: #000; display: block; margin: 0; width: 44px; height: 44px; padding: 1px; -webkit-border-radius: 36px; border-radius: 36px; }
-.ui-loader-verbose .ui-icon { margin: 0 auto 10px; filter: Alpha(Opacity=75); opacity: .75; }
-.ui-loader-textonly { padding: 15px; margin-left: -115px; }
-.ui-loader-textonly .ui-icon { display: none; }
-.ui-loader-fakefix { position: absolute; }
-/*fouc*/
-.ui-mobile-rendering > * { visibility: hidden; }
-/*headers, content panels*/
-.ui-bar, .ui-body { position: relative; padding: .4em 15px; overflow: hidden; display: block; clear:both; }
-.ui-bar { font-size: 16px; margin: 0; }
-.ui-bar h1, .ui-bar h2, .ui-bar h3, .ui-bar h4, .ui-bar h5, .ui-bar h6 { margin: 0; padding: 0; font-size: 16px; display: inline-block; }
-.ui-header, .ui-footer { position: relative; zoom: 1; }
-.ui-mobile .ui-header, .ui-mobile .ui-footer { border-left-width: 0; border-right-width: 0; }
-.ui-header .ui-btn-left,
-.ui-header .ui-btn-right,
-.ui-footer .ui-btn-left,
-.ui-footer .ui-btn-right,
-.ui-header-fixed.ui-fixed-hidden .ui-btn-left,
-.ui-header-fixed.ui-fixed-hidden .ui-btn-right { position: absolute; top: 3px; }
-.ui-header-fixed .ui-btn-left,
-.ui-header-fixed .ui-btn-right { top: 4px;}
-.ui-header .ui-btn-left,
-.ui-footer .ui-btn-left { left: 5px; }
-.ui-header .ui-btn-right,
-.ui-footer .ui-btn-right { right: 5px; }
-.ui-footer > .ui-btn-icon-notext,
-.ui-header > .ui-btn-icon-notext,
-.ui-header-fixed.ui-fixed-hidden > .ui-btn-icon-notext { top: 6px; }
-.ui-header-fixed > .ui-btn-icon-notext { top: 7px;}
-.ui-header .ui-title, .ui-footer .ui-title { min-height: 1.1em; text-align: center; font-size: 16px; display: block; margin: .6em 30% .8em; padding: 0; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; outline: 0 !important; }
-.ui-footer .ui-title { margin: .6em 15px .8em; }
-/* content area*/
-.ui-content { border-width: 0; overflow: visible; overflow-x: hidden; padding: 15px; }
-/* corner styling for dialogs and popups */
-.ui-corner-all > .ui-header:first-child,
-.ui-corner-all > .ui-content:first-child,
-.ui-corner-all > .ui-footer:first-child {
-	-webkit-border-top-left-radius: inherit;
-	border-top-left-radius: inherit;
-	-webkit-border-top-right-radius: inherit;
-	border-top-right-radius: inherit;
-}
-.ui-corner-all > .ui-header:last-child,
-.ui-corner-all > .ui-content:last-child,
-.ui-corner-all > .ui-footer:last-child {
-	-webkit-border-bottom-left-radius: inherit;
-	border-bottom-left-radius: inherit;
-	-webkit-border-bottom-right-radius: inherit;
-	border-bottom-right-radius: inherit;
-}
-/* icons sizing */
-.ui-icon { width: 18px; height: 18px; }
-/* non-js content hiding */
-.ui-nojs { position: absolute; left: -9999px; }
-/* accessible content hiding */
-.ui-hide-label label.ui-input-text, .ui-hide-label label.ui-select, .ui-hide-label label.ui-slider, .ui-hide-label label.ui-submit, .ui-hide-label .ui-controlgroup-label,
-.ui-hidden-accessible { position: absolute !important; left: -9999px; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
-/* Transitions originally inspired by those from jQtouch, nice work, folks */
-.ui-mobile-viewport-transitioning,
-.ui-mobile-viewport-transitioning .ui-page {
-	width: 100%;
-	height: 100%;
-	overflow: hidden;
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-}
-.ui-page-pre-in {
-	opacity: 0;
-}
-.in {
-	-webkit-animation-fill-mode: both;
-	-webkit-animation-timing-function: ease-out;
-	-webkit-animation-duration: 350ms;
-	-moz-animation-fill-mode: both;
-	-moz-animation-timing-function: ease-out;
-	-moz-animation-duration: 350ms;
-	animation-fill-mode: both;
-	animation-timing-function: ease-out;
-	animation-duration: 350ms;
-}
-.out {
-	-webkit-animation-fill-mode: both;
-	-webkit-animation-timing-function: ease-in;
-	-webkit-animation-duration: 225ms;
-	-moz-animation-fill-mode: both;
-	-moz-animation-timing-function: ease-in;
-	-moz-animation-duration: 225ms;
-	animation-fill-mode: both;
-	animation-timing-function: ease-in;
-	animation-duration: 225ms;
-}
-@-webkit-keyframes fadein {
-    from { opacity: 0; }
-    to { opacity: 1; }
-}
-@-moz-keyframes fadein {
-    from { opacity: 0; }
-    to { opacity: 1; }
-}
-@keyframes fadein {
-    from { opacity: 0; }
-    to { opacity: 1; }
-}
-@-webkit-keyframes fadeout {
-    from { opacity: 1; }
-    to { opacity: 0; }
-}
-@-moz-keyframes fadeout {
-    from { opacity: 1; }
-    to { opacity: 0; }
-}
-@keyframes fadeout {
-    from { opacity: 1; }
-    to { opacity: 0; }
-}
-.fade.out {
-	opacity: 0;
-	-webkit-animation-duration: 125ms;
-	-webkit-animation-name: fadeout;
-	-moz-animation-duration: 125ms;
-	-moz-animation-name: fadeout;
-	animation-duration: 125ms;
-	animation-name: fadeout;
-}
-.fade.in {
-	opacity: 1;
-	-webkit-animation-duration: 225ms;
-	-webkit-animation-name: fadein;
-	-moz-animation-duration: 225ms;
-	-moz-animation-name: fadein;
-	animation-duration: 225ms;
-	animation-name: fadein;
-}
-.pop {
-	-webkit-transform-origin: 50% 50%;
-	-moz-transform-origin: 50% 50%;
-	transform-origin: 50% 50%;
-}
-.pop.in {
-	-webkit-transform: scale(1);
-	-webkit-animation-name: popin;
-	-webkit-animation-duration: 350ms;
-	-moz-transform: scale(1);
-	-moz-animation-name: popin;
-	-moz-animation-duration: 350ms;
-	transform: scale(1);
-	animation-name: popin;
-	animation-duration: 350ms;
-    opacity: 1;
-}
-.pop.out {
-	-webkit-animation-name: fadeout;
-	-webkit-animation-duration: 100ms;
-	-moz-animation-name: fadeout;
-	-moz-animation-duration: 100ms;
-	animation-name: fadeout;
-	animation-duration: 100ms;
-	opacity: 0;
-}
-.pop.in.reverse {
-	-webkit-animation-name: fadein;
-	-moz-animation-name: fadein;
-	animation-name: fadein;
-}
-.pop.out.reverse {
-	-webkit-transform: scale(.8);
-	-webkit-animation-name: popout;
-	-moz-transform: scale(.8);
-	-moz-animation-name: popout;
-	transform: scale(.8);
-	animation-name: popout;
-}
-@-webkit-keyframes popin {
-    from {
-        -webkit-transform: scale(.8);
-        opacity: 0;
-    }
-    to {
-        -webkit-transform: scale(1);
-        opacity: 1;
-    }
-}
-@-moz-keyframes popin {
-    from {
-        -moz-transform: scale(.8);
-        opacity: 0;
-    }
-    to {
-        -moz-transform: scale(1);
-        opacity: 1;
-    }
-}
-@keyframes popin {
-    from {
-        transform: scale(.8);
-        opacity: 0;
-    }
-    to {
-        transform: scale(1);
-        opacity: 1;
-    }
-}
-@-webkit-keyframes popout {
-    from {
-        -webkit-transform: scale(1);
-        opacity: 1;
-    }
-    to {
-        -webkit-transform: scale(.8);
-        opacity: 0;
-    }
-}
-@-moz-keyframes popout {
-    from {
-        -moz-transform: scale(1);
-        opacity: 1;
-    }
-    to {
-        -moz-transform: scale(.8);
-        opacity: 0;
-    }
-}
-@keyframes popout {
-    from {
-        transform: scale(1);
-        opacity: 1;
-    }
-    to {
-        transform: scale(.8);
-        opacity: 0;
-    }
-}
-/* keyframes for slidein from sides */
-@-webkit-keyframes slideinfromright {
-    from { -webkit-transform: translateX(100%); }
-    to { -webkit-transform: translateX(0); }
-}
-@-moz-keyframes slideinfromright {
-    from { -moz-transform: translateX(100%); }
-    to { -moz-transform: translateX(0); }
-}
-@keyframes slideinfromright {
-    from { transform: translateX(100%); }
-    to { transform: translateX(0); }
-}
-@-webkit-keyframes slideinfromleft {
-    from { -webkit-transform: translateX(-100%); }
-    to { -webkit-transform: translateX(0); }
-}
-@-moz-keyframes slideinfromleft {
-    from { -moz-transform: translateX(-100%); }
-    to { -moz-transform: translateX(0); }
-}
-@keyframes slideinfromleft {
-    from { transform: translateX(-100%); }
-    to { transform: translateX(0); }
-}
-/* keyframes for slideout to sides */
-@-webkit-keyframes slideouttoleft {
-    from { -webkit-transform: translateX(0); }
-    to { -webkit-transform: translateX(-100%); }
-}
-@-moz-keyframes slideouttoleft {
-    from { -moz-transform: translateX(0); }
-    to { -moz-transform: translateX(-100%); }
-}
-@keyframes slideouttoleft {
-    from { transform: translateX(0); }
-    to { transform: translateX(-100%); }
-}
-@-webkit-keyframes slideouttoright {
-    from { -webkit-transform: translateX(0); }
-    to { -webkit-transform: translateX(100%); }
-}
-@-moz-keyframes slideouttoright {
-    from { -moz-transform: translateX(0); }
-    to { -moz-transform: translateX(100%); }
-}
-@keyframes slideouttoright {
-    from { transform: translateX(0); }
-    to { transform: translateX(100%); }
-}
-.slide.out, .slide.in {
-	-webkit-animation-timing-function: ease-out;
-	-webkit-animation-duration: 350ms;
-	-moz-animation-timing-function: ease-out;
-	-moz-animation-duration: 350ms;
-	animation-timing-function: ease-out;
-	animation-duration: 350ms;
-}
-.slide.out {
-	-webkit-transform: translateX(-100%);
-	-webkit-animation-name: slideouttoleft;
-	-moz-transform: translateX(-100%);
-	-moz-animation-name: slideouttoleft;
-	transform: translateX(-100%);
-	animation-name: slideouttoleft;
-}
-.slide.in {
-	-webkit-transform: translateX(0);
-	-webkit-animation-name: slideinfromright;
-	-moz-transform: translateX(0);
-	-moz-animation-name: slideinfromright;
-	transform: translateX(0);
-	animation-name: slideinfromright;
-}
-.slide.out.reverse {
-	-webkit-transform: translateX(100%);
-	-webkit-animation-name: slideouttoright;
-	-moz-transform: translateX(100%);
-	-moz-animation-name: slideouttoright;
-	transform: translateX(100%);
-	animation-name: slideouttoright;
-}
-.slide.in.reverse {
-	-webkit-transform: translateX(0);
-	-webkit-animation-name: slideinfromleft;
-	-moz-transform: translateX(0);
-	-moz-animation-name: slideinfromleft;
-	transform: translateX(0);
-	animation-name: slideinfromleft;
-}
-.slidefade.out {
-	-webkit-transform: translateX(-100%);
-	-webkit-animation-name: slideouttoleft;
-	-webkit-animation-duration: 225ms;
-	-moz-transform: translateX(-100%);
-	-moz-animation-name: slideouttoleft;
-	-moz-animation-duration: 225ms;
-	transform: translateX(-100%);
-	animation-name: slideouttoleft;
-	animation-duration: 225ms;
-}
-.slidefade.in {
-	-webkit-transform: translateX(0);
-	-webkit-animation-name: fadein;
-	-webkit-animation-duration: 200ms;
-	-moz-transform: translateX(0);
-	-moz-animation-name: fadein;
-	-moz-animation-duration: 200ms;
-	transform: translateX(0);
-	animation-name: fadein;
-	animation-duration: 200ms;
-}
-.slidefade.out.reverse {
-	-webkit-transform: translateX(100%);
-	-webkit-animation-name: slideouttoright;
-	-webkit-animation-duration: 200ms;
-	-moz-transform: translateX(100%);
-	-moz-animation-name: slideouttoright;
-	-moz-animation-duration: 200ms;
-	transform: translateX(100%);
-	animation-name: slideouttoright;
-	animation-duration: 200ms;
-}
-.slidefade.in.reverse {
-	-webkit-transform: translateX(0);
-	-webkit-animation-name: fadein;
-	-webkit-animation-duration: 200ms;
-	-moz-transform: translateX(0);
-	-moz-animation-name: fadein;
-	-moz-animation-duration: 200ms;
-	transform: translateX(0);
-	animation-name: fadein;
-	animation-duration: 200ms;
-}
-/* slide down */
-.slidedown.out {
-	-webkit-animation-name: fadeout;
-	-webkit-animation-duration: 100ms;
-	-moz-animation-name: fadeout;
-	-moz-animation-duration: 100ms;
-	animation-name: fadeout;
-	animation-duration: 100ms;
-}
-.slidedown.in {
-	-webkit-transform: translateY(0);
-	-webkit-animation-name: slideinfromtop;
-	-webkit-animation-duration: 250ms;
-	-moz-transform: translateY(0);
-	-moz-animation-name: slideinfromtop;
-	-moz-animation-duration: 250ms;
-	transform: translateY(0);
-	animation-name: slideinfromtop;
-	animation-duration: 250ms;
-}
-.slidedown.in.reverse {
-	-webkit-animation-name: fadein;
-	-webkit-animation-duration: 150ms;
-	-moz-animation-name: fadein;
-	-moz-animation-duration: 150ms;
-	animation-name: fadein;
-	animation-duration: 150ms;
-}
-.slidedown.out.reverse {
-	-webkit-transform: translateY(-100%);
-	-webkit-animation-name: slideouttotop;
-	-webkit-animation-duration: 200ms;
-	-moz-transform: translateY(-100%);
-	-moz-animation-name: slideouttotop;
-	-moz-animation-duration: 200ms;
-	transform: translateY(-100%);
-	animation-name: slideouttotop;
-	animation-duration: 200ms;
-}
-@-webkit-keyframes slideinfromtop {
-    from { -webkit-transform: translateY(-100%); }
-    to { -webkit-transform: translateY(0); }
-}
-@-moz-keyframes slideinfromtop {
-    from { -moz-transform: translateY(-100%); }
-    to { -moz-transform: translateY(0); }
-}
-@keyframes slideinfromtop {
-    from { transform: translateY(-100%); }
-    to { transform: translateY(0); }
-}
-@-webkit-keyframes slideouttotop {
-    from { -webkit-transform: translateY(0); }
-    to { -webkit-transform: translateY(-100%); }
-}
-@-moz-keyframes slideouttotop {
-    from { -moz-transform: translateY(0); }
-    to { -moz-transform: translateY(-100%); }
-}
-@keyframes slideouttotop {
-    from { transform: translateY(0); }
-    to { transform: translateY(-100%); }
-}
-/* slide up */
-.slideup.out {
-	-webkit-animation-name: fadeout;
-	-webkit-animation-duration: 100ms;
-	-moz-animation-name: fadeout;
-	-moz-animation-duration: 100ms;
-	animation-name: fadeout;
-	animation-duration: 100ms;
-}
-.slideup.in {
-	-webkit-transform: translateY(0);
-	-webkit-animation-name: slideinfrombottom;
-	-webkit-animation-duration: 250ms;
-	-moz-transform: translateY(0);
-	-moz-animation-name: slideinfrombottom;
-	-moz-animation-duration: 250ms;
-	transform: translateY(0);
-	animation-name: slideinfrombottom;
-	animation-duration: 250ms;
-}
-.slideup.in.reverse {
-	-webkit-animation-name: fadein;
-	-webkit-animation-duration: 150ms;
-	-moz-animation-name: fadein;
-	-moz-animation-duration: 150ms;
-	animation-name: fadein;
-	animation-duration: 150ms;
-}
-.slideup.out.reverse {
-	-webkit-transform: translateY(100%);
-	-webkit-animation-name: slideouttobottom;
-	-webkit-animation-duration: 200ms;
-	-moz-transform: translateY(100%);
-	-moz-animation-name: slideouttobottom;
-	-moz-animation-duration: 200ms;
-	transform: translateY(100%);
-	animation-name: slideouttobottom;
-	animation-duration: 200ms;
-}
-@-webkit-keyframes slideinfrombottom {
-    from { -webkit-transform: translateY(100%); }
-    to { -webkit-transform: translateY(0); }
-}
-@-moz-keyframes slideinfrombottom {
-    from { -moz-transform: translateY(100%); }
-    to { -moz-transform: translateY(0); }
-}
-@keyframes slideinfrombottom {
-    from { transform: translateY(100%); }
-    to { transform: translateY(0); }
-}
-@-webkit-keyframes slideouttobottom {
-    from { -webkit-transform: translateY(0); }
-    to { -webkit-transform: translateY(100%); }
-}
-@-moz-keyframes slideouttobottom {
-    from { -moz-transform: translateY(0); }
-    to { -moz-transform: translateY(100%); }
-}
-@keyframes slideouttobottom {
-    from { transform: translateY(0); }
-    to { transform: translateY(100%); }
-}
-/* The properties in this rule are only necessary for the 'flip' transition.
- * We need specify the perspective to create a projection matrix. This will add
- * some depth as the element flips. The depth number represents the distance of
- * the viewer from the z-plane. According to the CSS3 spec, 1000 is a moderate
- * value.
- */
-.viewport-flip {
-	-webkit-perspective: 1000;
-	-moz-perspective: 1000;
-	perspective: 1000;
-	position: absolute;
-}
-.flip {
-	-webkit-backface-visibility: hidden;
-	-webkit-transform: translateX(0); /* Needed to work around an iOS 3.1 bug that causes listview thumbs to disappear when -webkit-visibility:hidden is used. */
-	-moz-backface-visibility: hidden;
-	-moz-transform: translateX(0);
-	backface-visibility: hidden;
-	transform: translateX(0);
-}
-.flip.out {
-	-webkit-transform: rotateY(-90deg) scale(.9);
-	-webkit-animation-name: flipouttoleft;
-	-webkit-animation-duration: 175ms;
-	-moz-transform: rotateY(-90deg) scale(.9);
-	-moz-animation-name: flipouttoleft;
-	-moz-animation-duration: 175ms;
-	transform: rotateY(-90deg) scale(.9);
-	animation-name: flipouttoleft;
-	animation-duration: 175ms;
-}
-.flip.in {
-	-webkit-animation-name: flipintoright;
-	-webkit-animation-duration: 225ms;
-	-moz-animation-name: flipintoright;
-	-moz-animation-duration: 225ms;
-	animation-name: flipintoright;
-	animation-duration: 225ms;
-}
-.flip.out.reverse {
-	-webkit-transform: rotateY(90deg) scale(.9);
-	-webkit-animation-name: flipouttoright;
-	-moz-transform: rotateY(90deg) scale(.9);
-	-moz-animation-name: flipouttoright;
-	transform: rotateY(90deg) scale(.9);
-	animation-name: flipouttoright;
-}
-.flip.in.reverse {
-	-webkit-animation-name: flipintoleft;
-	-moz-animation-name: flipintoleft;
-	animation-name: flipintoleft;
-}
-@-webkit-keyframes flipouttoleft {
-    from { -webkit-transform: rotateY(0); }
-    to { -webkit-transform: rotateY(-90deg) scale(.9); }
-}
-@-moz-keyframes flipouttoleft {
-    from { -moz-transform: rotateY(0); }
-    to { -moz-transform: rotateY(-90deg) scale(.9); }
-}
-@keyframes flipouttoleft {
-    from { transform: rotateY(0); }
-    to { transform: rotateY(-90deg) scale(.9); }
-}
-@-webkit-keyframes flipouttoright {
-    from { -webkit-transform: rotateY(0) ; }
-    to { -webkit-transform: rotateY(90deg) scale(.9); }
-}
-@-moz-keyframes flipouttoright {
-    from { -moz-transform: rotateY(0); }
-    to { -moz-transform: rotateY(90deg) scale(.9); }
-}
-@keyframes flipouttoright {
-    from { transform: rotateY(0); }
-    to { transform: rotateY(90deg) scale(.9); }
-}
-@-webkit-keyframes flipintoleft {
-    from { -webkit-transform: rotateY(-90deg) scale(.9); }
-    to { -webkit-transform: rotateY(0); }
-}
-@-moz-keyframes flipintoleft {
-    from { -moz-transform: rotateY(-90deg) scale(.9); }
-    to { -moz-transform: rotateY(0); }
-}
-@keyframes flipintoleft {
-    from { transform: rotateY(-90deg) scale(.9); }
-    to { transform: rotateY(0); }
-}
-@-webkit-keyframes flipintoright {
-    from { -webkit-transform: rotateY(90deg) scale(.9); }
-    to { -webkit-transform: rotateY(0); }
-}
-@-moz-keyframes flipintoright {
-    from { -moz-transform: rotateY(90deg) scale(.9); }
-    to { -moz-transform: rotateY(0); }
-}
-@keyframes flipintoright {
-    from { transform: rotateY(90deg) scale(.9); }
-    to { transform: rotateY(0); }
-}
-/* The properties in this rule are only necessary for the 'flip' transition.
- * We need specify the perspective to create a projection matrix. This will add
- * some depth as the element flips. The depth number represents the distance of
- * the viewer from the z-plane. According to the CSS3 spec, 1000 is a moderate
- * value.
- */
-.viewport-turn {
-	-webkit-perspective: 200px;
-	-moz-perspective: 200px;
-	-ms-perspective: 200px;
-	perspective: 200px;
-	position: absolute;
-}
-.turn {
-	-webkit-backface-visibility: hidden;
-	-webkit-transform: translateX(0); /* Needed to work around an iOS 3.1 bug that causes listview thumbs to disappear when -webkit-visibility:hidden is used. */
-	-webkit-transform-origin: 0;
-	
-	-moz-backface-visibility: hidden;
-	-moz-transform: translateX(0);
-	-moz-transform-origin: 0;
-	
-	backface-visibility :hidden;
-	transform: translateX(0);
-	transform-origin: 0;
-}
-.turn.out {
-	-webkit-transform: rotateY(-90deg) scale(.9);
-	-webkit-animation-name: flipouttoleft;
-	-webkit-animation-duration: 125ms;
-	-moz-transform: rotateY(-90deg) scale(.9);
-	-moz-animation-name: flipouttoleft;
-	-moz-animation-duration: 125ms;
-	transform: rotateY(-90deg) scale(.9);
-	animation-name: flipouttoleft;
-	animation-duration: 125ms;
-}
-.turn.in {
-	-webkit-animation-name: flipintoright;
-	-webkit-animation-duration: 250ms;
-	-moz-animation-name: flipintoright;
-	-moz-animation-duration: 250ms;
-	animation-name: flipintoright;
-	animation-duration: 250ms;
-	
-}
-.turn.out.reverse {
-	-webkit-transform: rotateY(90deg) scale(.9);
-	-webkit-animation-name: flipouttoright;
-	-moz-transform: rotateY(90deg) scale(.9);
-	-moz-animation-name: flipouttoright;
-	transform: rotateY(90deg) scale(.9);
-	animation-name: flipouttoright;
-}
-.turn.in.reverse {
-	-webkit-animation-name: flipintoleft;
-	-moz-animation-name: flipintoleft;
-	animation-name: flipintoleft;
-}
-@-webkit-keyframes flipouttoleft {
-    from { -webkit-transform: rotateY(0); }
-    to { -webkit-transform: rotateY(-90deg) scale(.9); }
-}
-@-moz-keyframes flipouttoleft {
-    from { -moz-transform: rotateY(0); }
-    to { -moz-transform: rotateY(-90deg) scale(.9); }
-}
-@keyframes flipouttoleft {
-    from { transform: rotateY(0); }
-    to { transform: rotateY(-90deg) scale(.9); }
-}
-@-webkit-keyframes flipouttoright {
-    from { -webkit-transform: rotateY(0) ; }
-    to { -webkit-transform: rotateY(90deg) scale(.9); }
-}
-@-moz-keyframes flipouttoright {
-    from { -moz-transform: rotateY(0); }
-    to { -moz-transform: rotateY(90deg) scale(.9); }
-}
-@keyframes flipouttoright {
-    from { transform: rotateY(0); }
-    to { transform: rotateY(90deg) scale(.9); }
-}
-@-webkit-keyframes flipintoleft {
-    from { -webkit-transform: rotateY(-90deg) scale(.9); }
-    to { -webkit-transform: rotateY(0); }
-}
-@-moz-keyframes flipintoleft {
-    from { -moz-transform: rotateY(-90deg) scale(.9); }
-    to { -moz-transform: rotateY(0); }
-}
-@keyframes flipintoleft {
-    from { transform: rotateY(-90deg) scale(.9); }
-    to { transform: rotateY(0); }
-}
-@-webkit-keyframes flipintoright {
-    from { -webkit-transform: rotateY(90deg) scale(.9); }
-    to { -webkit-transform: rotateY(0); }
-}
-@-moz-keyframes flipintoright {
-    from { -moz-transform: rotateY(90deg) scale(.9); }
-    to { -moz-transform: rotateY(0); }
-}
-@keyframes flipintoright {
-    from { transform: rotateY(90deg) scale(.9); }
-    to { transform: rotateY(0); }
-}
-/* flow transition */
-.flow {
-	-webkit-transform-origin: 50% 30%;
-	-webkit-box-shadow: 0 0 20px rgba(0,0,0,.4);
-	-moz-transform-origin: 50% 30%;	
-	-moz-box-shadow: 0 0 20px rgba(0,0,0,.4);
-	transform-origin: 50% 30%;	
-	box-shadow: 0 0 20px rgba(0,0,0,.4);
-}
-.ui-dialog.flow {
-	-webkit-transform-origin: none;
-	-webkit-box-shadow: none;
-	-moz-transform-origin: none;	
-	-moz-box-shadow: none;
-	transform-origin: none;	
-	box-shadow: none;
-}
-.flow.out {
-	-webkit-transform: translateX(-100%) scale(.7);
-	-webkit-animation-name: flowouttoleft;
-	-webkit-animation-timing-function: ease;
-	-webkit-animation-duration: 350ms;
-	-moz-transform: translateX(-100%) scale(.7);
-	-moz-animation-name: flowouttoleft;
-	-moz-animation-timing-function: ease;
-	-moz-animation-duration: 350ms;
-	transform: translateX(-100%) scale(.7);
-	animation-name: flowouttoleft;
-	animation-timing-function: ease;
-	animation-duration: 350ms;
-}
-.flow.in {
-	-webkit-transform: translateX(0) scale(1);
-	-webkit-animation-name: flowinfromright;
-	-webkit-animation-timing-function: ease;
-	-webkit-animation-duration: 350ms;
-	-moz-transform: translateX(0) scale(1);
-	-moz-animation-name: flowinfromright;
-	-moz-animation-timing-function: ease;
-	-moz-animation-duration: 350ms;
-	transform: translateX(0) scale(1);
-	animation-name: flowinfromright;
-	animation-timing-function: ease;
-	animation-duration: 350ms;
-}
-.flow.out.reverse {
-	-webkit-transform: translateX(100%);
-	-webkit-animation-name: flowouttoright;
-	-moz-transform: translateX(100%);
-	-moz-animation-name: flowouttoright;
-	transform: translateX(100%);
-	animation-name: flowouttoright;
-}
-.flow.in.reverse {
-	-webkit-animation-name: flowinfromleft;
-	-moz-animation-name: flowinfromleft;
-	animation-name: flowinfromleft;
-}
-@-webkit-keyframes flowouttoleft {
-    0% { -webkit-transform: translateX(0) scale(1); }
-	60%, 70% { -webkit-transform: translateX(0) scale(.7); }
-    100% { -webkit-transform: translateX(-100%) scale(.7); }
-}
-@-moz-keyframes flowouttoleft {
-    0% { -moz-transform: translateX(0) scale(1); }
-	60%, 70% { -moz-transform: translateX(0) scale(.7); }
-    100% { -moz-transform:  translateX(-100%) scale(.7); }
-}
-@keyframes flowouttoleft {
-    0% { transform: translateX(0) scale(1); }
-	60%, 70% { transform: translateX(0) scale(.7); }
-    100% { transform:  translateX(-100%) scale(.7); }
-}
-@-webkit-keyframes flowouttoright {
-    0% { -webkit-transform: translateX(0) scale(1); }
-	60%, 70% { -webkit-transform: translateX(0) scale(.7); }
-    100% { -webkit-transform:  translateX(100%) scale(.7); }
-}
-@-moz-keyframes flowouttoright {
-    0% { -moz-transform: translateX(0) scale(1); }
-	60%, 70% { -moz-transform: translateX(0) scale(.7); }
-    100% { -moz-transform:  translateX(100%) scale(.7); }
-}
-@keyframes flowouttoright {
-    0% { transform: translateX(0) scale(1); }
-	60%, 70% { transform: translateX(0) scale(.7); }
-    100% { transform:  translateX(100%) scale(.7); }
-}
-@-webkit-keyframes flowinfromleft {
-    0% { -webkit-transform: translateX(-100%) scale(.7); }
-	30%, 40% { -webkit-transform: translateX(0) scale(.7); }
-    100% { -webkit-transform: translateX(0) scale(1); }
-}
-@-moz-keyframes flowinfromleft {
-    0% { -moz-transform: translateX(-100%) scale(.7); }
-	30%, 40% { -moz-transform: translateX(0) scale(.7); }
-    100% { -moz-transform: translateX(0) scale(1); }
-}
-@keyframes flowinfromleft {
-    0% { transform: translateX(-100%) scale(.7); }
-	30%, 40% { transform: translateX(0) scale(.7); }
-    100% { transform: translateX(0) scale(1); }
-}
-@-webkit-keyframes flowinfromright {
-    0% { -webkit-transform: translateX(100%) scale(.7); }
-	30%, 40% { -webkit-transform: translateX(0) scale(.7); }
-    100% { -webkit-transform: translateX(0) scale(1); }
-}
-@-moz-keyframes flowinfromright {
-    0% { -moz-transform: translateX(100%) scale(.7); }
-	30%, 40% { -moz-transform: translateX(0) scale(.7); }
-    100% { -moz-transform: translateX(0) scale(1); }
-}
-@keyframes flowinfromright {
-    0% { transform: translateX(100%) scale(.7); }
-	30%, 40% { transform: translateX(0) scale(.7); }
-    100% { transform: translateX(0) scale(1); }
-}
-/* content configurations. */
-.ui-grid-a, .ui-grid-b, .ui-grid-c, .ui-grid-d { overflow: hidden; }
-.ui-block-a, .ui-block-b, .ui-block-c, .ui-block-d, .ui-block-e { margin: 0; padding: 0; border: 0; float: left; min-height: 1px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; }
-/* grid solo: 100 - single item fallback */
-.ui-grid-solo .ui-block-a { display: block; float: none; }
-/* Lower percentages for older browsers (i.e. IE7) to prevent wrapping. -.5px to fix BB5 wrap issue. */
-/* grid a: 50/50 */
-.ui-grid-a .ui-block-a, .ui-grid-a .ui-block-b { width: 49.95%; }
-.ui-grid-a > :nth-child(n) { width: 50%; margin-right: -.5px; }
-.ui-grid-a .ui-block-a { clear: left; }
-/* grid b: 33/33/33 */
-.ui-grid-b .ui-block-a, .ui-grid-b .ui-block-b, .ui-grid-b .ui-block-c { width: 33.25%; }
-.ui-grid-b > :nth-child(n) { width: 33.333%; margin-right: -.5px; }
-.ui-grid-b .ui-block-a { clear: left; }
-/* grid c: 25/25/25/25 */
-.ui-grid-c .ui-block-a, .ui-grid-c .ui-block-b, .ui-grid-c .ui-block-c, .ui-grid-c .ui-block-d { width: 24.925%; }
-.ui-grid-c > :nth-child(n) { width: 25%; margin-right: -.5px; }
-.ui-grid-c .ui-block-a { clear: left; }
-/* grid d: 20/20/20/20/20 */
-.ui-grid-d .ui-block-a, .ui-grid-d .ui-block-b, .ui-grid-d .ui-block-c, .ui-grid-d .ui-block-d, .ui-grid-d .ui-block-e { width: 19.925%; }
-.ui-grid-d > :nth-child(n) { width: 20%; }
-.ui-grid-d .ui-block-a { clear: left; }
-/* preset breakpoint to switch to stacked grid styles below 35em (560px) */
-@media all and (max-width: 35em) {
-	.ui-responsive .ui-block-a, 
-	.ui-responsive .ui-block-b, 
-	.ui-responsive .ui-block-c,
-	.ui-responsive .ui-block-d,
-	.ui-responsive .ui-block-e { 
-		width: 100%; 
-		float:none; 
-	}
-}
-/* fixed page header & footer configuration */
-.ui-header-fixed,
-.ui-footer-fixed {
-	left: 0;
-	right: 0;
-	width: 100%;
-	position: fixed;
-	z-index: 1000;
-}
-.ui-header-fixed {
-	top: -1px;
-	padding-top: 1px;
-}
-.ui-header-fixed.ui-fixed-hidden {
-	top: 0;
-	padding-top: 0;
-}
-.ui-footer-fixed {
-	bottom: -1px;
-	padding-bottom: 1px;
-}
-.ui-footer-fixed.ui-fixed-hidden {
-	bottom: 0;
-	padding-bottom: 0;
-}
-.ui-header-fullscreen,
-.ui-footer-fullscreen {
-	filter: Alpha(Opacity=90);
-	opacity: .9;
-}
-.ui-page-header-fixed {
-	padding-top: 2.6875em;
-}
-.ui-page-footer-fixed {
-	padding-bottom: 2.6875em;
-}
-.ui-page-header-fullscreen > .ui-content,
-.ui-page-footer-fullscreen > .ui-content {
-	padding: 0;
-}
-.ui-fixed-hidden {
-	position: absolute;
-}
-.ui-page-header-fullscreen .ui-fixed-hidden,
-.ui-page-footer-fullscreen .ui-fixed-hidden {
-	left: -9999px;
-}
-.ui-header-fixed .ui-btn,
-.ui-footer-fixed .ui-btn { 
-	z-index: 10;
-}
-/* workarounds for other widgets */
-.ui-android-2x-fixed .ui-li-has-thumb {
-	-webkit-transform: translate3d(0,0,0);
-}
-.ui-navbar { max-width: 100%; }
-.ui-navbar.ui-mini { margin: 0; }
-.ui-navbar ul:before, .ui-navbar ul:after { content: " "; display: table; }
-.ui-navbar ul:after { clear: both; }
-.ui-navbar ul { list-style:none; margin: 0; padding: 0; position: relative; display: block; border: 0; max-width: 100%; overflow: visible; zoom: 1; }
-.ui-navbar li .ui-btn { display: block; text-align: center; margin: 0 -1px 0 0; border-right-width: 0; }
-.ui-navbar li .ui-btn-icon-right .ui-icon { right: 6px; }
-/* add border if not in header/footer (full width) */
-.ui-navbar li:last-child .ui-btn,
-.ui-navbar .ui-grid-duo .ui-block-b .ui-btn { margin-right: 0; border-right-width: 1px; }
-.ui-header .ui-navbar li:last-child .ui-btn,
-.ui-footer .ui-navbar li:last-child .ui-btn,
-.ui-header .ui-navbar .ui-grid-duo .ui-block-b .ui-btn,
-.ui-footer .ui-navbar .ui-grid-duo .ui-block-b .ui-btn { margin-right: -1px; border-right-width: 0; }
-.ui-navbar .ui-grid-duo li.ui-block-a:last-child .ui-btn { margin-right: -1px; border-right-width: 1px; }
-.ui-header .ui-navbar li .ui-btn,
-.ui-footer .ui-navbar li .ui-btn { border-top-width: 0; border-bottom-width: 0; }
-/* fixing gaps caused by subpixel problem */
-.ui-header .ui-navbar .ui-grid-b li.ui-block-c .ui-btn,
-.ui-footer .ui-navbar .ui-grid-b li.ui-block-c .ui-btn { margin-right: -5px; }
-.ui-header .ui-navbar .ui-grid-c li.ui-block-d .ui-btn,
-.ui-footer .ui-navbar .ui-grid-c li.ui-block-d .ui-btn,
-.ui-header .ui-navbar .ui-grid-d li.ui-block-e .ui-btn,
-.ui-footer .ui-navbar .ui-grid-d li.ui-block-e .ui-btn { margin-right: -4px; }
-.ui-header .ui-navbar .ui-grid-b li.ui-block-c .ui-btn-icon-right .ui-icon,
-.ui-footer .ui-navbar .ui-grid-b li.ui-block-c .ui-btn-icon-right .ui-icon,
-.ui-header .ui-navbar .ui-grid-c li.ui-block-d .ui-btn-icon-right .ui-icon,
-.ui-footer .ui-navbar .ui-grid-c li.ui-block-d .ui-btn-icon-right .ui-icon,
-.ui-header .ui-navbar .ui-grid-d li.ui-block-e .ui-btn-icon-right .ui-icon,
-.ui-footer .ui-navbar .ui-grid-d li.ui-block-e .ui-btn-icon-right .ui-icon { right: 8px; }
-.ui-navbar li .ui-btn .ui-btn-inner { padding-top: .7em; padding-bottom: .8em }
-.ui-navbar li .ui-btn-icon-top .ui-btn-inner { padding-top: 30px; }
-.ui-navbar li .ui-btn-icon-bottom .ui-btn-inner { padding-bottom: 30px; }
-.ui-btn { display: block; text-align: center; cursor:pointer; position: relative; margin: .5em 0; padding: 0; }
-.ui-mini { margin-top: .25em; margin-bottom: .25em; }
-.ui-btn-left, .ui-btn-right, .ui-input-clear, .ui-btn-inline,
-.ui-grid-a .ui-btn, .ui-grid-b .ui-btn, .ui-grid-c .ui-btn, .ui-grid-d .ui-btn, .ui-grid-e .ui-btn, .ui-grid-solo .ui-btn { margin-right: 5px; margin-left: 5px; }
-.ui-btn-inner { font-size: 16px; padding: .6em 20px; min-width: .75em; display: block; position: relative; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; zoom: 1; }
-.ui-btn input, .ui-btn button { z-index: 2; }
-.ui-btn-left, .ui-btn-right, .ui-btn-inline { display: inline-block; vertical-align: middle; }
-.ui-mobile .ui-btn-left, .ui-mobile .ui-btn-right, .ui-btn-left > .ui-btn, .ui-btn-right > .ui-btn { margin: 0; } /* .ui-mobile to increase specificity level */
-.ui-btn-block { display: block; }
-.ui-header > .ui-btn,
-.ui-footer > .ui-btn { display: inline-block; margin: 0; }
-.ui-header .ui-btn-block,
-.ui-footer .ui-btn-block { display: block; }
-.ui-header .ui-btn-inner,
-.ui-footer .ui-btn-inner,
-.ui-mini .ui-btn-inner { font-size: 12.5px; padding: .55em 11px .5em; }
-.ui-fullsize .ui-btn-inner,
-.ui-fullsize .ui-btn-inner { font-size: 16px; padding: .6em 20px; }
-.ui-btn-icon-notext { width: 24px; height: 24px; }
-.ui-btn-icon-notext .ui-btn-inner { padding: 0; height: 100%; }
-.ui-btn-icon-notext .ui-btn-inner .ui-icon { margin: 2px 1px 2px 3px; float: left; }
-.ui-btn-text { position: relative; z-index: 1; width: 100%; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; }
-div.ui-btn-text { width: auto; }
-.ui-btn-icon-notext .ui-btn-text { position: absolute; left: -9999px; }
-.ui-btn-icon-left .ui-btn-inner { padding-left: 40px; }
-.ui-btn-icon-right .ui-btn-inner { padding-right: 40px; }
-.ui-btn-icon-top .ui-btn-inner { padding-top: 40px; }
-.ui-btn-icon-bottom .ui-btn-inner { padding-bottom: 40px; }
-.ui-header .ui-btn-icon-left .ui-btn-inner,
-.ui-footer .ui-btn-icon-left .ui-btn-inner,
-.ui-mini.ui-btn-icon-left .ui-btn-inner,
-.ui-mini .ui-btn-icon-left .ui-btn-inner { padding-left: 30px; }
-.ui-header .ui-btn-icon-right .ui-btn-inner,
-.ui-footer .ui-btn-icon-right .ui-btn-inner,
-.ui-mini.ui-btn-icon-right .ui-btn-inner,
-.ui-mini .ui-btn-icon-right .ui-btn-inner { padding-right: 30px; }
-.ui-header .ui-btn-icon-top .ui-btn-inner,
-.ui-footer .ui-btn-icon-top .ui-btn-inner { padding: 30px 3px .5em 3px; }
-.ui-mini.ui-btn-icon-top .ui-btn-inner,
-.ui-mini .ui-btn-icon-top .ui-btn-inner { padding-top: 30px; }
-.ui-header .ui-btn-icon-bottom .ui-btn-inner,
-.ui-footer .ui-btn-icon-bottom .ui-btn-inner { padding: .55em 3px 30px 3px; }
-.ui-mini.ui-btn-icon-bottom .ui-btn-inner,
-.ui-mini .ui-btn-icon-bottom .ui-btn-inner { padding-bottom: 30px; }
-/* Corner styling inheritance */
-.ui-btn-inner,
-.ui-btn-text {
-	-webkit-border-radius: inherit;	
-	border-radius: inherit;
-}
-/*btn icon positioning*/
-.ui-btn-icon-notext .ui-icon { display: block; z-index: 0;}
-.ui-btn-icon-left > .ui-btn-inner > .ui-icon, .ui-btn-icon-right > .ui-btn-inner > .ui-icon { position: absolute; top: 50%; margin-top: -9px; }
-.ui-btn-icon-top .ui-btn-inner .ui-icon, .ui-btn-icon-bottom .ui-btn-inner .ui-icon { position: absolute; left: 50%; margin-left: -9px; }
-.ui-btn-icon-left .ui-icon { left: 10px; }
-.ui-btn-icon-right .ui-icon { right: 10px; }
-.ui-btn-icon-top .ui-icon { top: 10px; }
-.ui-btn-icon-bottom .ui-icon { top: auto; bottom: 10px; }
-.ui-header .ui-btn-icon-left .ui-icon,
-.ui-footer .ui-btn-icon-left .ui-icon,
-.ui-mini.ui-btn-icon-left .ui-icon,
-.ui-mini .ui-btn-icon-left .ui-icon { left: 5px; }
-.ui-header .ui-btn-icon-right .ui-icon,
-.ui-footer .ui-btn-icon-right .ui-icon,
-.ui-mini.ui-btn-icon-right .ui-icon,
-.ui-mini .ui-btn-icon-right .ui-icon { right: 5px; }
-.ui-header .ui-btn-icon-top .ui-icon,
-.ui-footer .ui-btn-icon-top .ui-icon,
-.ui-mini.ui-btn-icon-top .ui-icon,
-.ui-mini .ui-btn-icon-top .ui-icon { top: 5px; }
-.ui-header .ui-btn-icon-bottom .ui-icon,
-.ui-footer .ui-btn-icon-bottom .ui-icon,
-.ui-mini.ui-btn-icon-bottom .ui-icon,
-.ui-mini .ui-btn-icon-bottom .ui-icon { bottom: 5px; }
-/*hiding native button,inputs */
-.ui-btn-hidden { position: absolute; top: 0; left: 0; width: 100%; height: 100%; -webkit-appearance: none; cursor: pointer; background: #fff; background: rgba(255,255,255,0); filter: Alpha(Opacity=0); opacity: .1; font-size: 1px; border: none; text-indent: -9999px; }
-/* Fixes IE/WP filter alpha opacity bugs */
-.ui-disabled .ui-btn-hidden { display: none; }
-.ui-disabled { z-index: 1; }
-.ui-field-contain .ui-btn.ui-submit { margin: 0; }
-label.ui-submit { font-size: 16px; line-height: 1.4; font-weight: normal; margin: 0 0 .3em; display: block; }
-@media all and (min-width: 28em){
-	.ui-field-contain label.ui-submit { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }
-	.ui-field-contain .ui-btn.ui-submit { width: 78%; display: inline-block; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; }
-	.ui-hide-label .ui-btn.ui-submit { width: auto; display: block; }
-}
-.ui-collapsible-inset { margin: .5em 0; }
-.ui-collapsible-heading { font-size: 16px; display: block; margin: 0 -15px; padding: 0; position: relative; }
-.ui-collapsible-inset .ui-collapsible-heading { margin: 0; }
-.ui-collapsible-heading .ui-btn { text-align: left; margin: 0; border-left-width: 0; border-right-width: 0; }
-.ui-collapsible-inset .ui-collapsible-heading .ui-btn { border-right-width: 1px; border-left-width: 1px; }
-.ui-collapsible-collapsed + .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn { border-top-width: 0; }
-.ui-collapsible-set .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn { border-top-width: 1px; }
-.ui-collapsible-heading .ui-btn-inner { padding-left: 12px; padding-right: 12px; }
-.ui-collapsible-heading .ui-btn-icon-left .ui-btn-inner { padding-left: 40px; }
-.ui-collapsible-heading .ui-btn-icon-right .ui-btn-inner { padding-right: 40px; }
-.ui-collapsible-heading .ui-btn-icon-top .ui-btn-inner,
-.ui-collapsible-heading .ui-btn-icon-bottom .ui-btn-inner { text-align: center; }
-.ui-collapsible-heading .ui-btn-icon-left.ui-mini .ui-btn-inner { padding-left: 30px; }
-.ui-collapsible-heading .ui-btn-icon-right.ui-mini .ui-btn-inner { padding-right: 30px; }
-.ui-collapsible-heading .ui-btn span.ui-btn { position: absolute; left: 6px; top: 50%; margin: -12px 0 0 0; width: 20px; height: 20px; padding: 1px 0px 1px 2px; text-indent: -9999px; }
-.ui-collapsible-heading .ui-btn span.ui-btn .ui-btn-inner { padding: 10px 0; }
-.ui-collapsible-heading .ui-btn span.ui-btn .ui-icon { left: 0; margin-top: -10px; }
-.ui-collapsible-heading-status { position: absolute; top: -9999px; left:0px; }
-.ui-collapsible-content {
-	display: block;
-	margin: 0 -15px;	
-	padding: 10px 15px;
-	border-left-width: 0;
-	border-right-width: 0;
-	border-top: none;      /* Overrides ui-body-* */
-	background-image: none; /* Overrides ui-body-* */
-}
-.ui-collapsible-inset .ui-collapsible-content { margin: 0; border-right-width: 1px; border-left-width: 1px; }
-.ui-collapsible-content-collapsed { display: none; }
-.ui-collapsible-set > .ui-collapsible.ui-corner-all {
-	-webkit-border-radius: 0;
-	border-radius: 0;
-}
-.ui-collapsible-heading,
-.ui-collapsible-heading > .ui-btn {
-	-webkit-border-radius: inherit;	
-	border-radius: inherit;	
-}
-.ui-collapsible-set .ui-collapsible.ui-first-child {
-	-webkit-border-top-right-radius: inherit;	
-	border-top-right-radius: inherit;
-	-webkit-border-top-left-radius: inherit;	
-	border-top-left-radius: inherit;		
-}
-.ui-collapsible-content,
-.ui-collapsible-set .ui-collapsible.ui-last-child {
-	-webkit-border-bottom-right-radius: inherit;	
-	border-bottom-right-radius: inherit;
-	-webkit-border-bottom-left-radius: inherit;	
-	border-bottom-left-radius: inherit;		
-}
-.ui-collapsible-themed-content:not(.ui-collapsible-collapsed) > .ui-collapsible-heading {
-	-webkit-border-bottom-right-radius: 0;	
-	border-bottom-right-radius: 0;
-	-webkit-border-bottom-left-radius: 0;	
-	border-bottom-left-radius: 0;		
-}
-.ui-collapsible-set { margin: .5em 0; }
-.ui-collapsible-set .ui-collapsible { margin: -1px 0 0; }
-.ui-collapsible-set .ui-collapsible.ui-first-child { margin-top: 0; }
-.ui-controlgroup, fieldset.ui-controlgroup { padding: 0; margin: .5em 0; zoom: 1; }
-.ui-controlgroup.ui-mini, fieldset.ui-controlgroup.ui-mini { margin: .25em 0; }
-.ui-field-contain .ui-controlgroup, .ui-field-contain fieldset.ui-controlgroup { margin: 0; }
-.ui-bar .ui-controlgroup { margin: 0 5px; }
-.ui-controlgroup-label { font-size: 16px; line-height: 1.4; font-weight: normal; margin: 0 0 .4em; }
-.ui-controlgroup-controls label.ui-select,
-.ui-controlgroup-controls label.ui-submit { position: absolute; left: -9999px; }
-.ui-controlgroup li { list-style: none; }
-.ui-controlgroup .ui-btn { margin: 0; }
-.ui-controlgroup .ui-btn-icon-notext { width: auto; height: auto; top: auto; }
-.ui-controlgroup .ui-btn-icon-notext .ui-btn-inner { height: 20px; padding: .6em 20px .6em 20px }
-.ui-controlgroup-horizontal .ui-btn-icon-notext .ui-btn-inner { width: 18px; }
-.ui-controlgroup.ui-mini .ui-btn-icon-notext .ui-btn-inner,
-.ui-header .ui-controlgroup .ui-btn-icon-notext .ui-btn-inner,
-.ui-footer .ui-controlgroup .ui-btn-icon-notext .ui-btn-inner { height: 16px; padding: .55em 11px .5em 11px; }
-.ui-controlgroup .ui-btn-icon-notext .ui-btn-inner .ui-icon { position: absolute; top: 50%; right: 50%; margin: -9px -9px 0 0; }
-.ui-controlgroup-horizontal .ui-btn-inner { text-align: center; }
-.ui-controlgroup-horizontal.ui-mini .ui-btn-inner { height: 16px; line-height: 16px; }
-.ui-controlgroup .ui-checkbox label, .ui-controlgroup .ui-radio label { font-size: 16px; }
-.ui-controlgroup-horizontal .ui-controlgroup-controls:before,
-.ui-controlgroup-horizontal .ui-controlgroup-controls:after { content: ""; display: table; }
-.ui-controlgroup-horizontal .ui-controlgroup-controls:after { clear: both; }
-.ui-controlgroup-horizontal .ui-controlgroup-controls { display: inline-block; vertical-align: middle; zoom: 1; }
-.ui-controlgroup-horizontal .ui-controlgroup-controls > .ui-btn, .ui-controlgroup-horizontal .ui-controlgroup-controls li > .ui-btn,
-.ui-controlgroup-horizontal .ui-checkbox, .ui-controlgroup-horizontal .ui-radio,
-.ui-controlgroup-horizontal .ui-select { float: left; clear: none; margin: 0; }
-/* On IE7 the floating selects will be displayed as block if .ui-btn-text has width 100% */
-.ui-controlgroup-horizontal .ui-select .ui-btn-text { width: auto; }
-.ui-controlgroup-vertical .ui-btn {	border-bottom-width: 0; }
-.ui-controlgroup-vertical .ui-btn.ui-last-child { border-bottom-width: 1px; }
-.ui-controlgroup-horizontal .ui-btn { border-right-width: 0; }
-.ui-controlgroup-horizontal .ui-btn.ui-last-child {	border-right-width: 1px; }
-.ui-controlgroup .ui-btn-corner-all {
-	-webkit-border-radius: 0;
-	border-radius: 0;
-}
-.ui-controlgroup .ui-controlgroup-controls,
-.ui-controlgroup .ui-radio,
-.ui-controlgroup .ui-checkbox,
-.ui-controlgroup .ui-select,
-.ui-controlgroup li {
-	-webkit-border-radius: inherit;
-	border-radius: inherit;
-}
-.ui-controlgroup-vertical .ui-btn.ui-first-child {
-	-webkit-border-top-left-radius: inherit;
-	border-top-left-radius: inherit;
-	-webkit-border-top-right-radius: inherit;
-	border-top-right-radius: inherit;
-}
-.ui-controlgroup-vertical .ui-btn.ui-last-child {
-	-webkit-border-bottom-left-radius: inherit;
-	border-bottom-left-radius: inherit;
-	-webkit-border-bottom-right-radius: inherit;
-	border-bottom-right-radius: inherit;
-}
-.ui-controlgroup-horizontal .ui-btn.ui-first-child {
-	-webkit-border-top-left-radius: inherit;
-	border-top-left-radius: inherit;
-	-webkit-border-bottom-left-radius: inherit;
-	border-bottom-left-radius: inherit;
-}
-.ui-controlgroup-horizontal .ui-btn.ui-last-child {
-	-webkit-border-top-right-radius: inherit;
-	border-top-right-radius: inherit;
-	-webkit-border-bottom-right-radius: inherit;
-	border-bottom-right-radius: inherit;
-}
-.ui-controlgroup .ui-shadow:not(.ui-focus) {
-	-moz-box-shadow: none;
-	-webkit-box-shadow: none;
-	box-shadow: none;
-}
-@media all and (min-width: 28em){
-	.ui-field-contain .ui-controlgroup-label { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }
-	.ui-field-contain .ui-controlgroup-controls { width: 78%; display: inline-block; }
-	.ui-field-contain .ui-controlgroup .ui-select { width: 100%; display: block; } 
-	.ui-field-contain .ui-controlgroup-horizontal .ui-select { width: auto; }
-	.ui-hide-label .ui-controlgroup-controls { width: 100%; }
-}	
-.ui-dialog {
-	 background: none !important; /* this is to ensure that dialog theming does not apply (by default at least) on the page div */
-}
-.ui-dialog-contain {
-	width: 92.5%;
-	max-width: 500px;
-	margin: 10% auto 15px auto;
-	padding: 0;
-	position: relative;
-	top: -15px;
-}
-.ui-dialog-contain > .ui-header, 
-.ui-dialog-contain > .ui-content, 
-.ui-dialog-contain > .ui-footer { 
-	display: block;
-	position: relative; 
-	width: auto;
-	margin: 0;
-}
-.ui-dialog-contain > .ui-header {
-	border: none;
-	overflow: hidden;
-	z-index: 10; 
-	padding: 0;
-}
-.ui-dialog-contain > .ui-content { 
-	padding: 15px; 
-}
-.ui-dialog-contain > .ui-footer {
-	z-index: 10; 
-	padding: 0 15px; 
-}
-.ui-popup-open .ui-header-fixed,
-.ui-popup-open .ui-footer-fixed {
-	position: absolute !important; 	/* See line #553 of popup.js */
-}
-.ui-popup-screen {
-	background-image: url(data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==); /* Necessary to set some form of background to ensure element is clickable in IE6/7. While legacy IE won't understand the data-URI'd image, it ensures no additional requests occur in all other browsers with little overhead. */
-	top: 0px;
-	left: 0px;
-	right: 0px;
-	bottom: 1px;
-	position: absolute;
-	filter: Alpha(Opacity=0);
-	opacity: 0;
-	z-index: 1099;
-}
-.ui-popup-screen.in {
-	opacity: 0.5;
-	filter: Alpha(Opacity=50);
-}
-.ui-popup-screen.out {
-	opacity: 0;
-	filter: Alpha(Opacity=0);
-}
-.ui-popup-container {
-	z-index: 1100;
-	display: inline-block;
-	position: absolute;
-	padding: 0;
-	outline: 0;
-}
-.ui-popup {
-	position: relative;
-}
-.ui-popup.ui-content,
-.ui-popup .ui-content {
-	overflow: visible;
-}
-.ui-popup > p,
-.ui-popup > h1,
-.ui-popup > h2,
-.ui-popup > h3,
-.ui-popup > h4,
-.ui-popup > h5,
-.ui-popup > h6 {
-	margin: .5em 7px;
-}
-.ui-popup > span {
-	display: block;
-	margin: .5em 7px;
-}
-.ui-popup .ui-title {
-	font-size: 16px;
-	font-weight: bold;
-	margin-top: .5em;
-	margin-bottom: .5em;
-}
-.ui-popup-container .ui-content > p,
-.ui-popup-container .ui-content > h1,
-.ui-popup-container .ui-content > h2,
-.ui-popup-container .ui-content > h3,
-.ui-popup-container .ui-content > h4,
-.ui-popup-container .ui-content > h5,
-.ui-popup-container .ui-content > h6 {
-	margin: .5em 0;
-}
-.ui-popup-container .ui-content > span {
-	margin: 0;
-}
-.ui-popup-container .ui-content > p:first-child,
-.ui-popup-container .ui-content > h1:first-child,
-.ui-popup-container .ui-content > h2:first-child,
-.ui-popup-container .ui-content > h3:first-child,
-.ui-popup-container .ui-content > h4:first-child,
-.ui-popup-container .ui-content > h5:first-child,
-.ui-popup-container .ui-content > h6:first-child {
-	margin-top: 0;
-}
-.ui-popup-container .ui-content > p:last-child,
-.ui-popup-container .ui-content > h1:last-child,
-.ui-popup-container .ui-content > h2:last-child,
-.ui-popup-container .ui-content > h3:last-child,
-.ui-popup-container .ui-content > h4:last-child,
-.ui-popup-container .ui-content > h5:last-child,
-.ui-popup-container .ui-content > h6:last-child {
-	margin-bottom: 0;
-}
-.ui-popup > img {
-	width: auto;
-	height: auto;
-	max-width: 100%;
-	max-height: 100%;
-	vertical-align: middle;
-}
-.ui-popup:not(.ui-content) > img:only-child,
-.ui-popup:not(.ui-content) > .ui-btn-left:first-child + img:last-child,
-.ui-popup:not(.ui-content) > .ui-btn-right:first-child + img:last-child {
-	-webkit-border-radius: inherit;
-	border-radius: inherit;
-}
-.ui-popup iframe {
-	vertical-align: middle;
-}
-@media all and (min-width: 28em){
-	.ui-popup .ui-field-contain label.ui-submit,
-	.ui-popup .ui-field-contain .ui-controlgroup-label,
-	.ui-popup .ui-field-contain label.ui-select,
-	.ui-popup .ui-field-contain label.ui-input-text {
-		font-size: 16px; line-height: 1.4; display: block; font-weight: normal; margin: 0 0 .3em;
-	}
-	.ui-popup .ui-field-contain .ui-btn.ui-submit,
-	.ui-popup .ui-field-contain .ui-controlgroup-controls,
-	.ui-popup .ui-field-contain .ui-select,
-	.ui-popup .ui-field-contain input.ui-input-text,
-	.ui-popup .ui-field-contain textarea.ui-input-text,
-	.ui-popup .ui-field-contain .ui-input-search {
-		width: 100%; display: block;
-	}
-}
-.ui-popup > .ui-btn-left,
-.ui-popup > .ui-btn-right {
-	position: absolute; 
-	top: -9px;
-	margin: 0;
-	z-index: 1101;
-}
-.ui-popup > .ui-btn-left { left: -9px; }
-.ui-popup > .ui-btn-right { right: -9px; }
-.ui-popup-hidden { top: -99999px; left: -9999px; }
-.ui-checkbox, .ui-radio { position: relative; clear: both; margin: 0; z-index: 1; }
-.ui-checkbox .ui-btn, .ui-radio .ui-btn { text-align: left; z-index: 2; }
-.ui-controlgroup .ui-checkbox .ui-btn, .ui-controlgroup .ui-radio .ui-btn { margin: 0; }
-.ui-checkbox .ui-btn-inner, .ui-radio .ui-btn-inner { white-space: normal; }
-.ui-checkbox .ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-btn-icon-left .ui-btn-inner { padding-left: 45px; }
-.ui-checkbox .ui-mini.ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-mini.ui-btn-icon-left .ui-btn-inner { padding-left: 36px; }
-.ui-checkbox .ui-btn-icon-right .ui-btn-inner, .ui-radio .ui-btn-icon-right .ui-btn-inner { padding-right: 45px; }
-.ui-checkbox .ui-mini.ui-btn-icon-right .ui-btn-inner, .ui-radio .ui-mini.ui-btn-icon-right .ui-btn-inner { padding-right: 36px; }
-.ui-checkbox .ui-btn-icon-top .ui-btn-inner, .ui-radio .ui-btn-icon-top .ui-btn-inner { padding-right: 0; padding-left: 0; text-align: center; }
-.ui-checkbox .ui-btn-icon-bottom .ui-btn-inner, .ui-radio .ui-btn-icon-bottom .ui-btn-inner { padding-right: 0; padding-left: 0; text-align: center; }
-.ui-checkbox .ui-icon, .ui-radio .ui-icon { top: 1.1em; }
-.ui-checkbox .ui-btn-icon-left .ui-icon, .ui-radio .ui-btn-icon-left .ui-icon { left: 15px; }
-.ui-checkbox .ui-mini.ui-btn-icon-left .ui-icon, .ui-radio .ui-mini.ui-btn-icon-left .ui-icon { left: 9px; }
-.ui-checkbox .ui-btn-icon-right .ui-icon, .ui-radio .ui-btn-icon-right .ui-icon { right: 15px; }
-.ui-checkbox .ui-mini.ui-btn-icon-right .ui-icon, .ui-radio .ui-mini.ui-btn-icon-right .ui-icon { right: 9px; }
-.ui-checkbox .ui-btn-icon-top .ui-icon, .ui-radio .ui-btn-icon-top .ui-icon { top: 10px; }
-.ui-checkbox .ui-btn-icon-bottom .ui-icon, .ui-radio .ui-btn-icon-bottom .ui-icon { top: auto; bottom: 10px; }
-.ui-checkbox .ui-btn-icon-right .ui-icon, .ui-radio .ui-btn-icon-right .ui-icon { right: 15px; }
-.ui-checkbox .ui-mini.ui-btn-icon-right .ui-icon, .ui-radio .ui-mini.ui-btn-icon-right .ui-icon { right: 9px; }
-.ui-controlgroup-horizontal .ui-checkbox .ui-icon,
-.ui-controlgroup-horizontal .ui-radio .ui-icon { display: none; }
-.ui-controlgroup-horizontal .ui-checkbox .ui-btn-inner,
-.ui-controlgroup-horizontal .ui-radio .ui-btn-inner { padding: .6em 20px; }
-.ui-controlgroup-horizontal .ui-checkbox .ui-mini .ui-btn-inner,
-.ui-controlgroup-horizontal .ui-radio .ui-mini .ui-btn-inner { padding: .55em 11px .5em; }
-/* input, label positioning */
-.ui-checkbox input,.ui-radio input { position:absolute; left:20px; top:50%; width: 10px; height: 10px; margin:-5px 0 0 0; outline: 0 !important; z-index: 1; }
-.ui-field-contain, fieldset.ui-field-contain { padding: .8em 0; margin: 0; border-width: 0 0 1px 0; overflow: visible; }
-.ui-field-contain:last-child { border-bottom-width: 0; }
-.ui-field-contain { max-width: 100%; } /* This prevents horizontal scrollbar in IE7 */
-@media all and (min-width: 28em){
-	.ui-field-contain, .ui-mobile fieldset.ui-field-contain { border-width: 0; padding: 0; margin: 1em 0; }
-}
-.ui-select { display: block; position: relative; }
-.ui-select select { position: absolute; left: -9999px; top: -9999px; }
-.ui-select .ui-btn { opacity: 1; }
-.ui-field-contain .ui-select .ui-btn { margin: 0; }
-/* Fixes #2588: When Windows Phone 7.5 (Mango) tries to calculate a numeric opacity for a select (including "inherit") without explicitly specifying an opacity on the parent to give it context, a bug appears where clicking elsewhere on the page after opening the select will open the select again. */
-.ui-select .ui-btn select { cursor: pointer; -webkit-appearance: none; left: 0; top:0; width: 100%; min-height: 1.5em; min-height: 100%; height: 3em; max-height: 100%; filter: Alpha(Opacity=0); opacity: 0; z-index: 2; }
-.ui-select .ui-disabled { opacity: .3; }
-/* Display none because of issues with IE/WP's filter alpha opacity */
-.ui-select .ui-disabled select { display: none; }
-@-moz-document url-prefix() { .ui-select .ui-btn select { opacity: 0.0001; }}
-.ui-select .ui-btn.ui-select-nativeonly { border-radius: 0; border: 0; }
-.ui-select .ui-btn.ui-select-nativeonly select { opacity: 1; text-indent: 0; display: block; }
-.ui-select .ui-disabled.ui-select-nativeonly .ui-btn-inner { opacity: 0; }
-.ui-select .ui-btn-icon-right .ui-btn-inner, .ui-select .ui-li-has-count .ui-btn-inner { padding-right: 45px; }
-.ui-select .ui-mini.ui-btn-icon-right .ui-btn-inner { padding-right: 32px; }
-.ui-select .ui-btn-icon-right.ui-li-has-count .ui-btn-inner { padding-right: 80px; }
-.ui-select .ui-mini.ui-btn-icon-right.ui-li-has-count .ui-btn-inner { padding-right: 67px; }
-.ui-select .ui-btn-icon-right .ui-icon { right: 15px; }
-.ui-select .ui-mini.ui-btn-icon-right .ui-icon { right: 7px; }
-.ui-select .ui-btn-icon-right.ui-li-has-count .ui-li-count { right: 45px; }
-.ui-select .ui-mini.ui-btn-icon-right.ui-li-has-count .ui-li-count { right: 32px; }
-/* labels */
-label.ui-select { font-size: 16px; line-height: 1.4; font-weight: normal; margin: 0 0 .3em; display: block; }
-/*listbox*/
-.ui-select .ui-btn-text, .ui-selectmenu .ui-btn-text { display: block; min-height: 1em; overflow: hidden !important;
-/* This !important is required for iPad Safari specifically. See https://github.com/jquery/jquery-mobile/issues/2647 */ }
-.ui-select .ui-btn-text { text-overflow: ellipsis; }
-.ui-selectmenu { padding: 6px; min-width: 160px; }
-.ui-selectmenu .ui-listview { margin: 0; }
-.ui-selectmenu .ui-btn.ui-li-divider { cursor: default; }
-.ui-screen-hidden, .ui-selectmenu-list .ui-li .ui-icon { display: none; }
-.ui-selectmenu-list .ui-li .ui-icon { display: block; }
-.ui-li.ui-selectmenu-placeholder { display: none; }
-.ui-selectmenu .ui-header { margin: 0; padding: 0; }
-.ui-selectmenu.ui-popup .ui-header { -webkit-border-top-left-radius: 0; border-top-left-radius: 0; -webkit-border-top-right-radius: 0; border-top-right-radius: 0; }
-.ui-selectmenu .ui-header .ui-title { margin: 0.6em 46px 0.8em; }
-@media all and (min-width: 28em){
-	.ui-field-contain label.ui-select { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }
-	.ui-field-contain .ui-select { width: 78%; display: inline-block; }
-	.ui-hide-label .ui-select { width: 100%; } 
-}
-/* when no placeholder is defined in a multiple select, the header height doesn't even extend past the close button.  this shim's content in there */
-.ui-selectmenu .ui-header h1:after { content: '.'; visibility: hidden; }
-label.ui-input-text { font-size: 16px; line-height: 1.4; display: block; font-weight: normal; margin: 0 0 .3em; }
-input.ui-input-text, textarea.ui-input-text { background-image: none; padding: .4em; margin: .5em 0; min-height: 1.4em; line-height: 1.4em; font-size: 16px; display: block; width: 100%; outline: 0; }
-input.ui-mini, .ui-mini input, textarea.ui-mini { font-size: 14px; }
-div.ui-input-text input.ui-input-text, div.ui-input-text textarea.ui-input-text,
-.ui-input-search input.ui-input-text { border: none; width: 100%; padding: .4em 0; margin: 0; display: block; background: transparent none; outline: 0 !important; }
-.ui-input-search, div.ui-input-text { margin: .5em 0; background-image: none; position: relative; }
-.ui-input-search { padding: 0 30px; }
-div.ui-input-text { padding: 0 .4em; }
-div.ui-input-has-clear { padding: 0 30px 0 .4em; }
-input.ui-input-text.ui-mini, textarea.ui-input-text.ui-mini,
-.ui-input-search.ui-mini, div.ui-input-text.ui-mini { margin: .25em 0; }
-.ui-field-contain input.ui-input-text, .ui-field-contain textarea.ui-input-text,
-.ui-field-contain .ui-input-search, .ui-field-contain div.ui-input-text { margin: 0; }
-textarea.ui-input-text { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; }
-input.ui-input-text { -webkit-appearance: none; }
-textarea.ui-input-text { height: 50px; -webkit-transition: height 200ms linear; -moz-transition: height 200ms linear; -o-transition: height 200ms linear; transition: height 200ms linear; }
-textarea.ui-mini { height: 45px; }
-.ui-icon-searchfield:after { position: absolute; left: 7px; top: 50%; margin-top: -9px; content: ""; width: 18px; height: 18px; opacity: .5; }
-.ui-input-search .ui-input-clear, .ui-input-text .ui-input-clear { position: absolute; right: 0; top: 50%; margin-top: -13px; }
-.ui-mini .ui-input-clear { margin-top: -14px; right: -3px; }
-.ui-input-search .ui-input-clear-hidden, .ui-input-text .ui-input-clear-hidden { display: none; }
-/* Resolves issue #5166: Added to support issue introduced in Firefox 15. We can likely remove this in the future. */
-input::-moz-placeholder, textarea::-moz-placeholder { color: #aaa; }
-/* Resolves issue #5131: Width of textinput depends on its type, for Android 4.1 */
-input[type=number]::-webkit-outer-spin-button { margin: 0; }
-@media all and (min-width: 28em){
-	.ui-field-contain label.ui-input-text { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0 }
-	.ui-field-contain input.ui-input-text,
-	.ui-field-contain textarea.ui-input-text,
-	.ui-field-contain .ui-input-search,
-	.ui-field-contain div.ui-input-text { width: 78%; display: inline-block; }
-	.ui-field-contain .ui-input-search,
-	.ui-field-contain div.ui-input-text { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; }
-	.ui-hide-label input.ui-input-text,
-	.ui-hide-label textarea.ui-input-text,
-	.ui-hide-label .ui-input-search,
-	.ui-hide-label div.ui-input-text,
-	.ui-input-search input.ui-input-text,
-	div.ui-input-text input.ui-input-text { width: 100%; }
-}
-.ui-rangeslider {
-	zoom: 1;
-	margin: 0;
-}
-.ui-rangeslider:before,
-.ui-rangeslider:after {
-	content: "";
-	display: table;
-}
-.ui-rangeslider:after {
-	clear: both;
-}
-/* Margin-top/bottom: .5em * 16px/14px to make it equal to ui-rangeslider-sliders margin (input font-size is 14px) */
-.ui-rangeslider input.ui-input-text.ui-slider-input {
-	margin: .57143em 0;
-}
-.ui-rangeslider.ui-mini input.ui-slider-input {
-	margin: .28571em 0;
-}
-.ui-rangeslider input.ui-slider-input.ui-rangeslider-last {
-	float: right;
-}
-.ui-rangeslider .ui-rangeslider-sliders {
-	position: relative;
-	overflow: visible;
-	height: 30px;
-	margin: .5em 68px;
-}
-.ui-rangeslider.ui-mini .ui-rangeslider-sliders {
-	margin: .25em 68px;
-}
-.ui-field-contain .ui-rangeslider input.ui-slider-input,
-.ui-field-contain .ui-rangeslider.ui-mini input.ui-slider-input,
-.ui-field-contain .ui-rangeslider .ui-rangeslider-sliders,
-.ui-field-contain .ui-rangeslider.ui-mini .ui-rangeslider-sliders {
-	margin-top: 0;
-	margin-bottom: 0;
-}
-.ui-rangeslider .ui-rangeslider-sliders .ui-slider-track {
-	position: absolute;
-	top: 6px;
-	right: 0;
-	left: 0;
-	margin: 0;
-}
-.ui-rangeslider.ui-mini .ui-rangeslider-sliders .ui-slider-track {
-	top: 8px;
-}
-.ui-rangeslider .ui-slider-track:first-child .ui-slider-bg {
-	display: none;
-}
-.ui-rangeslider .ui-rangeslider-sliders .ui-slider-track:first-child {
-	background-color: transparent;
-	background: none;
-	border-width: 0;
-	height: 0;
-}
-/* this makes ie6 and ie7 set height to 0 to fix z-index problem */
-html >/**/body .ui-rangeslider .ui-rangeslider-sliders .ui-slider-track:first-child {
-	height: 15px;
-	border-width: 1px;
-}
-html >/**/body .ui-rangeslider.ui-mini .ui-rangeslider-sliders .ui-slider-track:first-child {
-	height: 12px;
-}
-@media all and (min-width: 28em){
-	.ui-field-contain .ui-rangeslider label.ui-slider {
-		float: left;
-	}
-	.ui-field-contain .ui-rangeslider input.ui-slider-input {
-		position: relative;
-		z-index: 1;
-	}
-	.ui-field-contain .ui-rangeslider input.ui-slider-input.ui-rangeslider-first,
-	.ui-field-contain .ui-rangeslider.ui-mini input.ui-slider-input.ui-rangeslider-first {
-		margin-right: 17px;
-	}
-	.ui-field-contain .ui-rangeslider .ui-rangeslider-sliders,
-	.ui-field-contain .ui-rangeslider.ui-mini .ui-rangeslider-sliders {
-		float: left;
-		width: 78%;
-		margin: 0 -68px;
-	}
-	.ui-field-contain .ui-rangeslider .ui-slider-track,
-	.ui-field-contain .ui-rangeslider.ui-mini .ui-slider-track {
-		right: 68px;
-		left: 68px;
-	}
-	.ui-field-contain.ui-hide-label .ui-rangeslider input.ui-slider-input.ui-rangeslider-first {
-		margin: 0;
-	}
-	.ui-field-contain.ui-hide-label .ui-rangeslider .ui-rangeslider-sliders,
-	.ui-field-contain.ui-hide-label .ui-rangeslider.ui-mini .ui-rangeslider-sliders {
-		width: auto;
-		float: none;
-		margin: 0 68px;
-	}
-	.ui-field-contain.ui-hide-label .ui-rangeslider .ui-slider-track,
-	.ui-field-contain.ui-hide-label .ui-rangeslider.ui-mini .ui-slider-track {
-		right: 0;
-		left: 0;
-	}
-}
-.ui-listview { margin: 0; }
-ol.ui-listview, ol.ui-listview .ui-li-divider { counter-reset: listnumbering; }
-.ui-content .ui-listview, .ui-panel-inner > .ui-listview { margin: -15px; }
-.ui-collapsible-content > .ui-listview { margin: -10px -15px; }
-.ui-content .ui-listview-inset, .ui-panel-inner .ui-listview-inset { margin: 1em 0; }
-.ui-collapsible-content .ui-listview-inset { margin: .5em 0; }
-.ui-listview, .ui-li { list-style: none; padding: 0; }
-.ui-li, .ui-li.ui-field-contain { display: block; margin: 0; position: relative; overflow: visible; text-align: left; border-width: 0; border-top-width: 1px; }
-.ui-li.ui-btn, .ui-li.ui-field-contain, .ui-li-divider, .ui-li-static { margin: 0; }
-.ui-listview-inset .ui-li { border-right-width: 1px; border-left-width: 1px; }
-.ui-li.ui-last-child, .ui-li.ui-field-contain.ui-last-child { border-bottom-width: 1px; }
-.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) > .ui-li.ui-first-child { border-top-width: 0; }
-.ui-collapsible-themed-content .ui-listview:not(.ui-listview-inset) > .ui-li.ui-last-child { border-bottom-width: 0; }
-.ui-li .ui-btn-text a.ui-link-inherit { text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
-.ui-li-static { background-image: none; }
-.ui-li-divider { padding: .5em 15px; font-size: 14px; font-weight: bold; }
-ol.ui-listview .ui-link-inherit:before, ol.ui-listview .ui-li-static:before, .ui-li-dec { font-size: .8em; display: inline-block; padding-right: .3em; font-weight: normal; counter-increment: listnumbering; content: counter(listnumbering) ". "; }
-ol.ui-listview .ui-li-jsnumbering:before { content: "" !important; } /* to avoid chance of duplication */
-.ui-listview > .ui-li.ui-first-child,
-.ui-listview .ui-btn.ui-first-child > .ui-li > .ui-btn-text > .ui-link-inherit {
-	-webkit-border-top-right-radius: inherit;	
-	border-top-right-radius: inherit;
-	-webkit-border-top-left-radius: inherit;
-	border-top-left-radius: inherit;
-}
-.ui-listview > .ui-li.ui-last-child,
-.ui-listview .ui-btn.ui-last-child > .ui-li > .ui-btn-text > .ui-link-inherit,
-.ui-collapsible-content > .ui-listview:not(.ui-listview-inset),
-.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) .ui-li.ui-last-child {
-	-webkit-border-bottom-right-radius: inherit;
-	border-bottom-right-radius: inherit;
-	-webkit-border-bottom-left-radius: inherit;
-	border-bottom-left-radius: inherit;
-}
-.ui-listview > .ui-li.ui-first-child .ui-li-link-alt {
-	-webkit-border-top-right-radius: inherit;	
-	border-top-right-radius: inherit;	
-}
-.ui-listview > .ui-li.ui-last-child .ui-li-link-alt {
-	-webkit-border-bottom-right-radius: inherit;
-	border-bottom-right-radius: inherit;	
-}
-.ui-listview > .ui-li.ui-first-child .ui-li-thumb:not(.ui-li-icon) {
-	-webkit-border-top-left-radius: inherit;
-	border-top-left-radius: inherit;	
-}
-.ui-listview > .ui-li.ui-last-child .ui-li-thumb:not(.ui-li-icon) {
-	-webkit-border-bottom-left-radius: inherit;
-	border-bottom-left-radius: inherit;	
-}
-.ui-li>.ui-btn-inner { display: block; position: relative; padding: 0; }
-.ui-li .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li { padding: .7em 15px; display: block; }
-.ui-li-has-thumb .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-thumb  { min-height: 59px; padding-left: 100px; }
-.ui-li-has-icon .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-icon { min-height: 20px; padding-left: 40px; }
-.ui-li-has-count .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-count, .ui-li-divider.ui-li-has-count { padding-right: 45px; }
-.ui-li-has-arrow .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-arrow { padding-right: 40px; }
-.ui-li-has-arrow.ui-li-has-count .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-arrow.ui-li-has-count { padding-right: 75px; }
-.ui-li-heading { font-size: 16px; font-weight: bold; display: block; margin: .6em 0; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
-.ui-li-desc { font-size: 12px; font-weight: normal; display: block; margin: -.5em 0 .6em; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
-.ui-li-thumb, .ui-listview .ui-li-icon { position: absolute; left: 1px; top: 0; max-height: 80px; max-width: 80px; }
-.ui-listview .ui-li-icon { max-height: 16px; max-width: 16px; left: 10px; top: .9em; }
-.ui-li-thumb, .ui-listview .ui-li-icon, .ui-li-content { float: left; margin-right: 10px; }
-.ui-li-aside { float: right; width: 50%; text-align: right; margin: .3em 0; }
-@media all and (min-width: 480px){
-	 .ui-li-aside { width: 45%; }
-}	 
-.ui-li-divider { cursor: default; }
-.ui-li-has-alt .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-alt { padding-right: 53px; }
-.ui-li-has-alt.ui-li-has-count .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li-has-alt.ui-li-has-count { padding-right: 88px; }
-.ui-li-has-count .ui-li-count { position: absolute; font-size: 11px; font-weight: bold; padding: .2em .5em; top: 50%; margin-top: -.9em; right: 10px; }
-.ui-li-has-count.ui-li-divider .ui-li-count, .ui-li-has-count .ui-link-inherit .ui-li-count { margin-top: -.95em; }
-.ui-li-has-arrow.ui-li-has-count .ui-li-count { right: 40px; }
-.ui-li-has-alt.ui-li-has-count .ui-li-count { right: 53px; }
-.ui-li-link-alt { position: absolute; width: 40px; height: 100%; border-width: 0; border-left-width: 1px; top: 0; right: 0; margin: 0; padding: 0; z-index: 2; }
-.ui-li-link-alt .ui-btn { overflow: hidden; position: absolute; right: 8px; top: 50%; margin: -13px 0 0 0; border-bottom-width: 1px; z-index: -1;}
-.ui-li-link-alt .ui-btn-inner { padding: 0; height: 100%; position: absolute; width: 100%; top: 0; left: 0;}
-.ui-li-link-alt .ui-btn .ui-icon { right: 50%; margin-right: -9px; }
-.ui-li-link-alt .ui-btn-icon-notext .ui-btn-inner .ui-icon { position: absolute; top: 50%; margin-top: -9px; }
-.ui-listview * .ui-btn-inner > .ui-btn > .ui-btn-inner { border-top: 0px; }
-.ui-listview-filter { border-width: 0; overflow: hidden; margin: -15px -15px 15px -15px; }
-.ui-collapsible-content .ui-listview-filter { margin: -10px -15px 10px -15px; border-bottom: inherit; }
-.ui-listview-filter-inset { margin: -15px -5px; background: transparent; }
-.ui-collapsible-content .ui-listview-filter-inset { margin: -5px; border-bottom-width: 0; }
-.ui-listview-filter .ui-input-search { margin: 5px; width: auto; display: block; }
-.ui-li.ui-screen-hidden{ display:none; }
-/* Odd iPad positioning issue. */
-@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) {
-    .ui-li .ui-btn-text { overflow:  visible; }
-}
-label.ui-slider {
-	font-size: 16px;
-	line-height: 1.4;
-	font-weight: normal;
-	margin: 0;
-	display: block;
-}
-.ui-field-contain label.ui-slider {
-	margin-bottom: .4em;
-}
-div.ui-slider {
-	height: 30px;
-	margin: .5em 0;
-	zoom: 1;
-}
-div.ui-slider.ui-mini {
-	margin: .25em 0;
-}
-.ui-field-contain div.ui-slider,
-.ui-field-contain div.ui-slider.ui-mini {
-	margin: 0;
-}
-div.ui-slider:before, div.ui-slider:after {
-	content: "";
-	display: table;
-}
-div.ui-slider:after {
-	clear: both;
-}
-/* High level of specificity to override Textinput CSS. */
-input.ui-input-text.ui-slider-input {
-	display: block;
-	float: left;
-	margin: 0;
-	padding: 4px;
-	width: 40px;
-	height: 22px;
-	line-height: 22px;
-	font-size: 14px;
-	border: none;
-	background-image: none;
-	font-weight: bold;
-	text-align: center;
-	vertical-align: text-bottom;
-	outline: 0;
-	-webkit-box-sizing: content-box;
-	-moz-box-sizing: content-box;
-	-ms-box-sizing: content-box;
-	box-sizing: content-box;
-}
-.ui-slider-input::-webkit-outer-spin-button,
-.ui-slider-input::-webkit-inner-spin-button {
-	-webkit-appearance: none;
-	margin: 0;
-}
-.ui-slider-track,
-.ui-slider-switch {
-	position: relative;
-	overflow: visible;
-	height: 15px;
-	margin: 0 15px 0 68px;
-	top: 6px;
-}
-.ui-slider-track.ui-mini {
-	height: 12px;
-	top: 8px;
-}
-.ui-slider-bg {
-	border: none;
-	height: 100%;
-}
-/* High level of specificity to override button margins in grids */
-.ui-slider-track .ui-btn.ui-slider-handle,
-.ui-slider-switch .ui-btn.ui-slider-handle {
-	position: absolute;
-	z-index: 1;
-	top: 50%;
-	width: 28px;
-	height: 28px;
-	margin: -15px 0 0 -15px;
-	outline: 0;
-}
-.ui-slider-track.ui-mini .ui-slider-handle {
-	height: 14px;
-	width: 14px;
-	margin: -8px 0 0 -7px;
-}
-.ui-slider-handle .ui-btn-inner {
-	padding: 0;
-	height: 100%;
-}
-.ui-slider-track.ui-mini .ui-slider-handle .ui-btn-inner {
-	height: 30px;
-	width: 30px;
-	padding: 0;
-	margin: -9px 0 0 -9px;
-	border-top: none;
-}
-select.ui-slider-switch {
-	display: none;
-}
-div.ui-slider-switch {
-	display: inline-block;
-	height: 32px;
-	width: 5.8em;
-	margin: .5em 0;
-	top: 0;
-}
-div.ui-slider-switch.ui-mini {
-	width: 5em;
-	height: 29px;
-	margin: .25em 0;
-	top: 0;
-}
-.ui-field-contain .ui-slider-switch,
-.ui-field-contain .ui-slider-switch.ui-mini {
-	margin: 0;
-}
-.ui-slider-inneroffset {
-	margin: 0 16px;
-	position: relative;
-	z-index: 1;
-}
-.ui-slider-switch.ui-mini .ui-slider-inneroffset {
-	margin: 0 15px 0 14px;
-}
-.ui-slider-switch .ui-btn.ui-slider-handle {
-	margin: 1px 0 0 -15px;
-}
-.ui-slider-switch.ui-mini .ui-slider-handle {
-	width: 25px;
-	height: 25px;
-	margin: 1px 0 0 -13px;
-	padding: 0;
-}
-.ui-slider-handle-snapping {
-	-webkit-transition: left 70ms linear;
-	-moz-transition: left 70ms linear;
-}
-.ui-slider-switch.ui-mini .ui-slider-handle .ui-btn-inner {
-	height: 30px;
-	width: 30px;
-	padding: 0;
-	margin: 0;
-	border-top: none;
-}
-.ui-slider-switch .ui-slider-label {
-	position: absolute;
-	text-align: center;
-	width: 100%;
-	overflow: hidden;
-	font-size: 16px;
-	top: 0;
-	line-height: 2;
-	min-height: 100%;
-	border-width: 0;
-	white-space: nowrap;
-	cursor: pointer;
-}
-.ui-slider-switch.ui-mini .ui-slider-label {
-	font-size: 14px;
-}
-.ui-slider-switch .ui-slider-label-a {
-	z-index: 1;
-	left: 0;
-	text-indent: -1.5em;
-}
-.ui-slider-switch .ui-slider-label-b {
-	z-index: 0;
-	right: 0;
-	text-indent: 1.5em;
-}
-@media all and (min-width: 28em){
-	.ui-field-contain label.ui-slider {
-		vertical-align: top;
-		display: inline-block;
-		width: 20%;
-		margin: 0 2% 0 0;
-	}
-	.ui-field-contain div.ui-slider {
-		display: inline-block;
-		width: 78%;
-	}
-	.ui-field-contain.ui-hide-label div.ui-slider {
-		display: block;
-		width: auto;
-	}
-	.ui-field-contain div.ui-slider-switch,
-	.ui-field-contain.ui-hide-label div.ui-slider-switch {
-		display: inline-block;
-		width: 5.8em;
-	}
-	.ui-field-contain div.ui-slider-switch.ui-mini {
-		width: 5em;
-	}
-}	
-.ui-table {
-   border: 0;
-   border-collapse: collapse;
-   padding: 0;
-   width: 100%;
-}
-.ui-table th,
-.ui-table td {
-  line-height: 1.5em;
-  text-align: left;
-  padding: .4em .5em;
-  vertical-align:top;
-}
-.ui-table th .ui-btn,
-.ui-table td .ui-btn {
-	line-height: normal;
-}
-.ui-table th {
-  font-weight: bold;
-}
-.ui-table caption {
-  text-align:left;
-  margin-bottom:1.4em;
-  opacity: .5;
-}
-/* Add strokes between each row */
-.table-stroke thead th {
-  border-bottom: 1px solid #d6d6d6; /* non-RGBA fallback */
-  border-bottom: 1px solid rgba(0, 0, 0, .1);
-}
-.table-stroke tbody th,
-.table-stroke tbody td {
-  border-bottom: 1px solid #e6e6e6; /* non-RGBA fallback  */
-  border-bottom: 1px solid rgba(0, 0, 0, .05);
-}
-/* Add alternating row stripes */
-.table-stripe tbody tr:nth-child(odd) td,
-.table-stripe tbody tr:nth-child(odd) th {
-  background-color: #eeeeee; /* non-RGBA fallback  */
-  background-color: rgba(0,0,0,0.04);
-}
-/* Add stroke to the header and last item */
-.table-stripe thead th,
-.table-stripe tbody tr:last-child {
-  border-bottom: 1px solid #d6d6d6; /* non-RGBA fallback  */
-  border-bottom: 1px solid rgba(0, 0, 0, .1);
-}
-/*
- Styles for the table columntoggle mode
-*/
-.ui-table-columntoggle-btn {
-	float: right;
-	margin-bottom:.8em;
-}
-/* Remove top/bottom margins around the fieldcontain on check list */
-.ui-table-columntoggle-popup fieldset {
-	margin:0;
-}
-/* Hide all prioritized columns by default */
-@media only all {
-	th.ui-table-priority-6,
-	td.ui-table-priority-6,
-	th.ui-table-priority-5,
-	td.ui-table-priority-5,
-	th.ui-table-priority-4,
-	td.ui-table-priority-4,
-	th.ui-table-priority-3,
-	td.ui-table-priority-3,
-	th.ui-table-priority-2,
-	td.ui-table-priority-2,
-	th.ui-table-priority-1,
-	td.ui-table-priority-1 {
-		display: none;
-	}
-}
-/* Preset breakpoints if ".ui-responsive" class added to table */
-/* Show priority 1 at 320px (20em x 16px) */
-@media screen and (min-width: 20em) {
-	.ui-table-columntoggle.ui-responsive th.ui-table-priority-1,
-	.ui-table-columntoggle.ui-responsive td.ui-table-priority-1 {
-		display: table-cell;
-	}
-}
-/* Show priority 2 at 480px (30em x 16px) */
-@media screen and (min-width: 30em) {
-	.ui-table-columntoggle.ui-responsive th.ui-table-priority-2,
-	.ui-table-columntoggle.ui-responsive td.ui-table-priority-2 {
-		display: table-cell;
-	}
-}
-/* Show priority 3 at 640px (40em x 16px) */
-@media screen and (min-width: 40em) {
-	.ui-table-columntoggle.ui-responsive th.ui-table-priority-3,
-	.ui-table-columntoggle.ui-responsive td.ui-table-priority-3 {
-		display: table-cell;
-	}
-}
-/* Show priority 4 at 800px (50em x 16px) */
-@media screen and (min-width: 50em) {
-	.ui-table-columntoggle.ui-responsive th.ui-table-priority-4,
-	.ui-table-columntoggle.ui-responsive td.ui-table-priority-4 {
-		display: table-cell;
-	}
-}
-/* Show priority 5 at 960px (60em x 16px) */
-@media screen and (min-width: 60em) {
-	.ui-table-columntoggle.ui-responsive th.ui-table-priority-5,
-	.ui-table-columntoggle.ui-responsive td.ui-table-priority-5 {
-		display: table-cell;
-	}
-}
-/* Show priority 6 at 1,120px (70em x 16px) */
-@media screen and (min-width: 70em) {
-	.ui-table-columntoggle.ui-responsive th.ui-table-priority-6,
-	.ui-table-columntoggle.ui-responsive td.ui-table-priority-6 {
-		display: table-cell;
-	}
-}
-/* Unchecked manually: Always hide */
-.ui-table-columntoggle th.ui-table-cell-hidden,
-.ui-table-columntoggle td.ui-table-cell-hidden,
-.ui-table-columntoggle.ui-responsive th.ui-table-cell-hidden,
-.ui-table-columntoggle.ui-responsive td.ui-table-cell-hidden {
-	display: none;
-}
-/* Checked manually: Always show */
-.ui-table-columntoggle th.ui-table-cell-visible,
-.ui-table-columntoggle td.ui-table-cell-visible,
-.ui-table-columntoggle.ui-responsive th.ui-table-cell-visible,
-.ui-table-columntoggle.ui-responsive td.ui-table-cell-visible {
-	display: table-cell;
-}
-/*
- Styles for the table columntoggle mode
-*/
-.ui-table-reflow td .ui-table-cell-label,
-.ui-table-reflow th .ui-table-cell-label { 
-	display: none;
-}
-/* Mobile first styles: Begin with the stacked presentation at narrow widths */ 
-@media only all {
-	/* Hide the table headers */ 
-	.ui-table-reflow thead td, 
-	.ui-table-reflow thead th {
-		display: none;
-	}
-	/* Show the table cells as a block level element */ 
-	.ui-table-reflow td,
-	.ui-table-reflow th { 
-		text-align: left;
-		display: block;
-	}
-	/* Add a fair amount of top margin to visually separate each row when stacked */  
-	.ui-table-reflow tbody th {
-		margin-top: 3em;
-	}
-	/* Make the label elements a percentage width */ 
-	.ui-table-reflow td .ui-table-cell-label,
-	.ui-table-reflow th .ui-table-cell-label { 
-		display: block;
-		padding: .4em; 
-		min-width: 30%; 
-		display: inline-block;
-		margin: -.4em 1em -.4em -.4em;
-	}
-	/* For grouped headers, have a different style to visually separate the levels by classing the first label in each col group */ 
-	.ui-table-reflow th .ui-table-cell-label-top,
-	.ui-table-reflow td .ui-table-cell-label-top {
-		display: block;
-		padding: .4em 0;
-		margin: .4em 0;
-		text-transform: uppercase;
-		font-size: .9em;
-		font-weight: normal;
-	}
-}
-/* Breakpoint to show as a standard table at 560px (35em x 16px) or wider */ 
-@media ( min-width: 35em ) {
-	/* Fixes table rendering when switching between breakpoints in Safari <= 5. See https://github.com/jquery/jquery-mobile/issues/5380 */
-	.ui-table-reflow.ui-responsive {
-		display: table-row-group;
-	}
-	/* Show the table header rows */ 
-	.ui-table-reflow.ui-responsive td,
-	.ui-table-reflow.ui-responsive th,
-	.ui-table-reflow.ui-responsive tbody th,
-	.ui-table-reflow.ui-responsive tbody td,
-	.ui-table-reflow.ui-responsive thead td,
-	.ui-table-reflow.ui-responsive thead th {
-		display: table-cell;
-		margin: 0;
-	}
-	/* Hide the labels in each cell */ 
-	.ui-table-reflow.ui-responsive td .ui-table-cell-label,
-	.ui-table-reflow.ui-responsive th .ui-table-cell-label { 
-		display: none;
-	}
-}
-/* Hack to make IE9 and WP7.5 treat cells like block level elements, scoped to ui-responsive class */ 
-/* Applied in a max-width media query up to the table layout breakpoint so we don't need to negate this*/ 
-@media ( max-width: 35em ) {
-	.ui-table-reflow.ui-responsive td,
-	.ui-table-reflow.ui-responsive th {
-		width: 100%;
-		-webkit-box-sizing: border-box;
-		-moz-box-sizing: border-box;
-		box-sizing: border-box;
-		float: left;
-		clear: left;
-	}
-}
-/* panel */
-.ui-panel {
-	width: 17em;
-	min-height: 100%;
-	border-width: 0;
-	position: absolute;
-	top: 0;
-	display: block;
-}
-.ui-panel-closed {
-	width: 0;
-	overflow: hidden;
-}
-.ui-panel-fixed {
-	position: fixed;
-	bottom: -1px; /* fixes gap on Chrome for Android */
-	padding-bottom: 1px;
-}
-.ui-panel-display-overlay {
-	z-index: 1001; /* fixed toolbars have z-index 1000 */
-}
-.ui-panel-display-reveal {
-	z-index: 0;
-}
-.ui-panel-display-push {
-	z-index: 999;
-}
-.ui-panel-inner {
-	padding: 15px;
-}
-/* content-wrap */
-.ui-panel-content-wrap {
-	position: relative;
-	left: 0;
-	min-height: inherit;
-	border: none;
-	z-index: 999;
-}
-.ui-panel-content-wrap-display-overlay,
-.ui-panel-animate.ui-panel-content-wrap > .ui-header, /* ios4 fix */
-.ui-panel-content-wrap-closed {
-	position: static;
-}
-/* dismiss */
-.ui-panel-dismiss {
-	position: absolute;
-	top: 0;
-	left:0;
-	height: 100%;
-	width: 100%;
-	z-index: 1002;
-	display: none;
-}
-.ui-panel-dismiss-open {
-	display: block;
-}
-/* animate class is added to panel, wrapper and fixed toolbars */
-.ui-panel-animate {
-	-webkit-transition: -webkit-transform 350ms ease;
-	-moz-transition: -moz-transform 350ms ease;
-	transition: transform 350ms ease;
-}
-/* hardware acceleration for smoother transitions */
-.ui-panel-animate.ui-panel:not(.ui-panel-display-reveal),
-.ui-panel-animate.ui-panel:not(.ui-panel-display-reveal) > div,
-.ui-panel-animate.ui-panel-content-wrap,
-.ui-panel-animate.ui-panel-content-fixed-toolbar {
-	-webkit-backface-visibility: hidden;
-	-webkit-transform: translate3d(0,0,0);
-}
-/* positioning: panel */
-/* panel left  */
-.ui-panel-position-left {
-	left: -17em;
-}
-/* animated: panel left (for overlay and push) */
-.ui-panel-animate.ui-panel-position-left.ui-panel-display-overlay,
-.ui-panel-animate.ui-panel-position-left.ui-panel-display-push {
-	left: 0;
-	-webkit-transform: translate3d(-17em,0,0);
-	-moz-transform: translate3d(-17em,0,0);
-	transform: translate3d(-17em,0,0);
-}
-/* panel left open */
-.ui-panel-position-left.ui-panel-display-reveal, /* negate "panel left" for reveal */
-.ui-panel-position-left.ui-panel-open {
-	left: 0;
-}
-/* animated: panel left open (for overlay and push) */
-.ui-panel-animate.ui-panel-position-left.ui-panel-open.ui-panel-display-overlay,
-.ui-panel-animate.ui-panel-position-left.ui-panel-open.ui-panel-display-push {
-	-webkit-transform: translate3d(0,0,0);
-	-moz-transform: translate3d(0,0,0);
-	transform: translate3d(0,0,0);
-}
-/* panel right */
-.ui-panel-position-right {
-	right: -17em;
-}
-/* animated: panel right (for overlay and push) */
-.ui-panel-animate.ui-panel-position-right.ui-panel-display-overlay,
-.ui-panel-animate.ui-panel-position-right.ui-panel-display-push {
-	right: 0;
-	-webkit-transform: translate3d(17em,0,0);
-	-moz-transform: translate3d(17em,0,0);
-	transform: translate3d(17em,0,0);
-}
-/* panel right open */
-.ui-panel-position-right.ui-panel-display-reveal,  /* negate "panel right" for reveal */
-.ui-panel-position-right.ui-panel-open {
-	right: 0;
-}
-/* animated: panel right open (for overlay and push) */
-.ui-panel-animate.ui-panel-position-right.ui-panel-open.ui-panel-display-overlay,
-.ui-panel-animate.ui-panel-position-right.ui-panel-open.ui-panel-display-push {
-	-webkit-transform: translate3d(0,0,0);
-	-moz-transform: translate3d(0,0,0);
-	transform: translate3d(0,0,0);
-}
-/* positioning: content wrap, fixed toolbars and dismiss */
-/* panel left open */
-.ui-panel-content-fixed-toolbar-position-left.ui-panel-content-fixed-toolbar-open,
-.ui-panel-content-wrap-position-left.ui-panel-content-wrap-open,
-.ui-panel-dismiss-position-left.ui-panel-dismiss-open {
-	left: 17em;
-	right: -17em;
-}
-/* animated: panel left open (for reveal and push) */
-.ui-panel-animate.ui-panel-content-fixed-toolbar-position-left.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-reveal,
-.ui-panel-animate.ui-panel-content-fixed-toolbar-position-left.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-push,
-.ui-panel-animate.ui-panel-content-wrap-position-left.ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal,
-.ui-panel-animate.ui-panel-content-wrap-position-left.ui-panel-content-wrap-open.ui-panel-content-wrap-display-push {
-	left: 0;
-	right: 0;
-	-webkit-transform: translate3d(17em,0,0);
-	-moz-transform: translate3d(17em,0,0);
-	transform: translate3d(17em,0,0);
-}
-/* panel right open */
-.ui-panel-content-fixed-toolbar-position-right.ui-panel-content-fixed-toolbar-open,
-.ui-panel-content-wrap-position-right.ui-panel-content-wrap-open,
-.ui-panel-dismiss-position-right.ui-panel-dismiss-open {
-	left: -17em;
-	right: 17em;
-}
-/* animated: panel right open (for reveal and push) */
-.ui-panel-animate.ui-panel-content-fixed-toolbar-position-right.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-reveal, 
-.ui-panel-animate.ui-panel-content-fixed-toolbar-position-right.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-push,
-.ui-panel-animate.ui-panel-content-wrap-position-right.ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal, 
-.ui-panel-animate.ui-panel-content-wrap-position-right.ui-panel-content-wrap-open.ui-panel-content-wrap-display-push {
-	left: 0;
-	right: 0;
-	-webkit-transform: translate3d(-17em,0,0);
-	-moz-transform: translate3d(-17em,0,0);
-	transform: translate3d(-17em,0,0);
-}
-/* negate "panel left/right open" for overlay */
-.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-overlay,
-.ui-panel-content-wrap-open.ui-panel-content-wrap-display-overlay {
-	left: 0;
-}
-/* always disable overflow-x to prevent zoom issue on Android */
-.ui-page-active.ui-page-panel {
-	overflow-x: hidden;
-}
-/* shadows and borders */
-.ui-panel-display-reveal {
-	-webkit-box-shadow: inset -5px 0 5px rgba(0,0,0,.15);
-	-moz-box-shadow: inset -5px 0 5px rgba(0,0,0,.15);
-	box-shadow: inset -5px 0 5px rgba(0,0,0,.15);
-}
-.ui-panel-position-right.ui-panel-display-reveal {
-	-webkit-box-shadow: inset 5px 0 5px rgba(0,0,0,.15);
-	-moz-box-shadow: inset 5px 0 5px rgba(0,0,0,.15);
-	box-shadow: inset 5px 0 5px rgba(0,0,0,.15);
-}
-.ui-panel-position-right.ui-panel-display-overlay {
-	-webkit-box-shadow: -5px 0px 5px rgba(0,0,0,.15);
-	-moz-box-shadow: -5px 0px 5px rgba(0,0,0,.15);
-	box-shadow: -5px 0px 5px rgba(0,0,0,.15);
-}
-.ui-panel-position-left.ui-panel-display-overlay {
-	-webkit-box-shadow: 5px 0px 5px rgba(0,0,0,.15);
-	-moz-box-shadow: 5px 0px 5px rgba(0,0,0,.15);
-	box-shadow: 5px 0px 5px rgba(0,0,0,.15);
-}
-.ui-panel-display-push.ui-panel-open.ui-panel-position-left {
-	border-right-width: 1px;
-	margin-right: -1px;
-}
-.ui-panel-animate.ui-panel-content-fixed-toolbar-position-left.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-push {
-	margin-left: 1px;
-}
-.ui-panel-display-push.ui-panel-open.ui-panel-position-right {
-	border-left-width: 1px;
-	margin-left: -1px;
-}
-.ui-panel-animate.ui-panel-content-fixed-toolbar-position-right.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-push {
-	margin-right: 1px;
-}
-/* wrap on wide viewports once open */
-@media (min-width:55em){
-	.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-push.ui-panel-content-fixed-toolbar-position-left,
-	.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-reveal.ui-panel-content-fixed-toolbar-position-left,
-	.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-display-push.ui-panel-content-wrap-position-left,
-	.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-display-reveal.ui-panel-content-wrap-position-left {
-		margin-right: 17em;
-	}
-	.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-push.ui-panel-content-fixed-toolbar-position-right,
-	.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-reveal.ui-panel-content-fixed-toolbar-position-right,
-	.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-display-push.ui-panel-content-wrap-position-right,
-	.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-display-reveal.ui-panel-content-wrap-position-right {
-		margin-left: 17em;
-	}
-	.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-push,
-	.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-reveal {
-		width: auto;	
-	}
-	.ui-responsive-panel .ui-panel-dismiss-display-push {
-		display: none;
-	}	
-}
diff --git a/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.js b/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.js
deleted file mode 100644
index bbe96bc3d53..00000000000
--- a/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.js
+++ /dev/null
@@ -1,11092 +0,0 @@
-/*
-* jQuery Mobile Git Build: SHA1: caa77b258660731d663844fe7867aa2c3a107ab1 <> Date: Wed Feb 20 15:03:27 2013 -0500
-* http://jquerymobile.com
-*
-* Copyright 2010, 2013 jQuery Foundation, Inc. and other contributors
-* Released under the MIT license.
-* http://jquery.org/license
-*
-*/
-
-
-(function ( root, doc, factory ) {
-	if ( typeof define === "function" && define.amd ) {
-		// AMD. Register as an anonymous module.
-		define( [ "jquery" ], function ( $ ) {
-			factory( $, root, doc );
-			return $.mobile;
-		});
-	} else {
-		// Browser globals
-		factory( root.jQuery, root, doc );
-	}
-}( this, document, function ( jQuery, window, document, undefined ) {
-(function( $ ) {
-	$.mobile = {};
-}( jQuery ));
-(function( $, window, undefined ) {
-
-	var nsNormalizeDict = {};
-
-	// jQuery.mobile configurable options
-	$.mobile = $.extend($.mobile, {
-
-		// Version of the jQuery Mobile Framework
-		version: "1.3.0",
-
-		// Namespace used framework-wide for data-attrs. Default is no namespace
-		ns: "",
-
-		// Define the url parameter used for referencing widget-generated sub-pages.
-		// Translates to to example.html&ui-page=subpageIdentifier
-		// hash segment before &ui-page= is used to make Ajax request
-		subPageUrlKey: "ui-page",
-
-		// Class assigned to page currently in view, and during transitions
-		activePageClass: "ui-page-active",
-
-		// Class used for "active" button state, from CSS framework
-		activeBtnClass: "ui-btn-active",
-
-		// Class used for "focus" form element state, from CSS framework
-		focusClass: "ui-focus",
-
-		// Automatically handle clicks and form submissions through Ajax, when same-domain
-		ajaxEnabled: true,
-
-		// Automatically load and show pages based on location.hash
-		hashListeningEnabled: true,
-
-		// disable to prevent jquery from bothering with links
-		linkBindingEnabled: true,
-
-		// Set default page transition - 'none' for no transitions
-		defaultPageTransition: "fade",
-
-		// Set maximum window width for transitions to apply - 'false' for no limit
-		maxTransitionWidth: false,
-
-		// Minimum scroll distance that will be remembered when returning to a page
-		minScrollBack: 250,
-
-		// DEPRECATED: the following property is no longer in use, but defined until 2.0 to prevent conflicts
-		touchOverflowEnabled: false,
-
-		// Set default dialog transition - 'none' for no transitions
-		defaultDialogTransition: "pop",
-
-		// Error response message - appears when an Ajax page request fails
-		pageLoadErrorMessage: "Error Loading Page",
-
-		// For error messages, which theme does the box uses?
-		pageLoadErrorMessageTheme: "e",
-
-		// replace calls to window.history.back with phonegaps navigation helper
-		// where it is provided on the window object
-		phonegapNavigationEnabled: false,
-
-		//automatically initialize the DOM when it's ready
-		autoInitializePage: true,
-
-		pushStateEnabled: true,
-
-		// allows users to opt in to ignoring content by marking a parent element as
-		// data-ignored
-		ignoreContentEnabled: false,
-
-		// turn of binding to the native orientationchange due to android orientation behavior
-		orientationChangeEnabled: true,
-
-		buttonMarkup: {
-			hoverDelay: 200
-		},
-
-		// define the window and the document objects
-		window: $( window ),
-		document: $( document ),
-
-		// TODO might be useful upstream in jquery itself ?
-		keyCode: {
-			ALT: 18,
-			BACKSPACE: 8,
-			CAPS_LOCK: 20,
-			COMMA: 188,
-			COMMAND: 91,
-			COMMAND_LEFT: 91, // COMMAND
-			COMMAND_RIGHT: 93,
-			CONTROL: 17,
-			DELETE: 46,
-			DOWN: 40,
-			END: 35,
-			ENTER: 13,
-			ESCAPE: 27,
-			HOME: 36,
-			INSERT: 45,
-			LEFT: 37,
-			MENU: 93, // COMMAND_RIGHT
-			NUMPAD_ADD: 107,
-			NUMPAD_DECIMAL: 110,
-			NUMPAD_DIVIDE: 111,
-			NUMPAD_ENTER: 108,
-			NUMPAD_MULTIPLY: 106,
-			NUMPAD_SUBTRACT: 109,
-			PAGE_DOWN: 34,
-			PAGE_UP: 33,
-			PERIOD: 190,
-			RIGHT: 39,
-			SHIFT: 16,
-			SPACE: 32,
-			TAB: 9,
-			UP: 38,
-			WINDOWS: 91 // COMMAND
-		},
-
-		// Place to store various widget extensions
-		behaviors: {},
-
-		// Scroll page vertically: scroll to 0 to hide iOS address bar, or pass a Y value
-		silentScroll: function( ypos ) {
-			if ( $.type( ypos ) !== "number" ) {
-				ypos = $.mobile.defaultHomeScroll;
-			}
-
-			// prevent scrollstart and scrollstop events
-			$.event.special.scrollstart.enabled = false;
-
-			setTimeout( function() {
-				window.scrollTo( 0, ypos );
-				$.mobile.document.trigger( "silentscroll", { x: 0, y: ypos });
-			}, 20 );
-
-			setTimeout( function() {
-				$.event.special.scrollstart.enabled = true;
-			}, 150 );
-		},
-
-		// Expose our cache for testing purposes.
-		nsNormalizeDict: nsNormalizeDict,
-
-		// Take a data attribute property, prepend the namespace
-		// and then camel case the attribute string. Add the result
-		// to our nsNormalizeDict so we don't have to do this again.
-		nsNormalize: function( prop ) {
-			if ( !prop ) {
-				return;
-			}
-
-			return nsNormalizeDict[ prop ] || ( nsNormalizeDict[ prop ] = $.camelCase( $.mobile.ns + prop ) );
-		},
-
-		// Find the closest parent with a theme class on it. Note that
-		// we are not using $.fn.closest() on purpose here because this
-		// method gets called quite a bit and we need it to be as fast
-		// as possible.
-		getInheritedTheme: function( el, defaultTheme ) {
-			var e = el[ 0 ],
-				ltr = "",
-				re = /ui-(bar|body|overlay)-([a-z])\b/,
-				c, m;
-
-			while ( e ) {
-				c = e.className || "";
-				if ( c && ( m = re.exec( c ) ) && ( ltr = m[ 2 ] ) ) {
-					// We found a parent with a theme class
-					// on it so bail from this loop.
-					break;
-				}
-
-				e = e.parentNode;
-			}
-
-			// Return the theme letter we found, if none, return the
-			// specified default.
-
-			return ltr || defaultTheme || "a";
-		},
-
-		// TODO the following $ and $.fn extensions can/probably should be moved into jquery.mobile.core.helpers
-		//
-		// Find the closest javascript page element to gather settings data jsperf test
-		// http://jsperf.com/single-complex-selector-vs-many-complex-selectors/edit
-		// possibly naive, but it shows that the parsing overhead for *just* the page selector vs
-		// the page and dialog selector is negligable. This could probably be speed up by
-		// doing a similar parent node traversal to the one found in the inherited theme code above
-		closestPageData: function( $target ) {
-			return $target
-				.closest( ':jqmData(role="page"), :jqmData(role="dialog")' )
-				.data( "mobile-page" );
-		},
-
-		enhanceable: function( $set ) {
-			return this.haveParents( $set, "enhance" );
-		},
-
-		hijackable: function( $set ) {
-			return this.haveParents( $set, "ajax" );
-		},
-
-		haveParents: function( $set, attr ) {
-			if ( !$.mobile.ignoreContentEnabled ) {
-				return $set;
-			}
-
-			var count = $set.length,
-				$newSet = $(),
-				e, $element, excluded;
-
-			for ( var i = 0; i < count; i++ ) {
-				$element = $set.eq( i );
-				excluded = false;
-				e = $set[ i ];
-
-				while ( e ) {
-					var c = e.getAttribute ? e.getAttribute( "data-" + $.mobile.ns + attr ) : "";
-
-					if ( c === "false" ) {
-						excluded = true;
-						break;
-					}
-
-					e = e.parentNode;
-				}
-
-				if ( !excluded ) {
-					$newSet = $newSet.add( $element );
-				}
-			}
-
-			return $newSet;
-		},
-
-		getScreenHeight: function() {
-			// Native innerHeight returns more accurate value for this across platforms,
-			// jQuery version is here as a normalized fallback for platforms like Symbian
-			return window.innerHeight || $.mobile.window.height();
-		}
-	}, $.mobile );
-
-	// Mobile version of data and removeData and hasData methods
-	// ensures all data is set and retrieved using jQuery Mobile's data namespace
-	$.fn.jqmData = function( prop, value ) {
-		var result;
-		if ( typeof prop !== "undefined" ) {
-			if ( prop ) {
-				prop = $.mobile.nsNormalize( prop );
-			}
-
-			// undefined is permitted as an explicit input for the second param
-			// in this case it returns the value and does not set it to undefined
-			if( arguments.length < 2 || value === undefined ){
-				result = this.data( prop );
-			} else {
-				result = this.data( prop, value );
-			}
-		}
-		return result;
-	};
-
-	$.jqmData = function( elem, prop, value ) {
-		var result;
-		if ( typeof prop !== "undefined" ) {
-			result = $.data( elem, prop ? $.mobile.nsNormalize( prop ) : prop, value );
-		}
-		return result;
-	};
-
-	$.fn.jqmRemoveData = function( prop ) {
-		return this.removeData( $.mobile.nsNormalize( prop ) );
-	};
-
-	$.jqmRemoveData = function( elem, prop ) {
-		return $.removeData( elem, $.mobile.nsNormalize( prop ) );
-	};
-
-	$.fn.removeWithDependents = function() {
-		$.removeWithDependents( this );
-	};
-
-	$.removeWithDependents = function( elem ) {
-		var $elem = $( elem );
-
-		( $elem.jqmData( 'dependents' ) || $() ).remove();
-		$elem.remove();
-	};
-
-	$.fn.addDependents = function( newDependents ) {
-		$.addDependents( $( this ), newDependents );
-	};
-
-	$.addDependents = function( elem, newDependents ) {
-		var dependents = $( elem ).jqmData( 'dependents' ) || $();
-
-		$( elem ).jqmData( 'dependents', $.merge( dependents, newDependents ) );
-	};
-
-	// note that this helper doesn't attempt to handle the callback
-	// or setting of an html elements text, its only purpose is
-	// to return the html encoded version of the text in all cases. (thus the name)
-	$.fn.getEncodedText = function() {
-		return $( "<div/>" ).text( $( this ).text() ).html();
-	};
-
-	// fluent helper function for the mobile namespaced equivalent
-	$.fn.jqmEnhanceable = function() {
-		return $.mobile.enhanceable( this );
-	};
-
-	$.fn.jqmHijackable = function() {
-		return $.mobile.hijackable( this );
-	};
-
-	// Monkey-patching Sizzle to filter the :jqmData selector
-	var oldFind = $.find,
-		jqmDataRE = /:jqmData\(([^)]*)\)/g;
-
-	$.find = function( selector, context, ret, extra ) {
-		selector = selector.replace( jqmDataRE, "[data-" + ( $.mobile.ns || "" ) + "$1]" );
-
-		return oldFind.call( this, selector, context, ret, extra );
-	};
-
-	$.extend( $.find, oldFind );
-
-	$.find.matches = function( expr, set ) {
-		return $.find( expr, null, null, set );
-	};
-
-	$.find.matchesSelector = function( node, expr ) {
-		return $.find( expr, null, null, [ node ] ).length > 0;
-	};
-})( jQuery, this );
-
-
-/*!
- * jQuery UI Widget v1.10.0pre - 2012-11-13 (ff055a0c353c3c8ce6e5bfa07ad7cb03e8885bc5)
- * http://jqueryui.com
- *
- * Copyright 2010, 2013 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/jQuery.widget/
- */
-(function( $, undefined ) {
-
-var uuid = 0,
-	slice = Array.prototype.slice,
-	_cleanData = $.cleanData;
-$.cleanData = function( elems ) {
-	for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-		try {
-			$( elem ).triggerHandler( "remove" );
-		// http://bugs.jquery.com/ticket/8235
-		} catch( e ) {}
-	}
-	_cleanData( elems );
-};
-
-$.widget = function( name, base, prototype ) {
-	var fullName, existingConstructor, constructor, basePrototype,
-		namespace = name.split( "." )[ 0 ];
-
-	name = name.split( "." )[ 1 ];
-	fullName = namespace + "-" + name;
-
-	if ( !prototype ) {
-		prototype = base;
-		base = $.Widget;
-	}
-
-	// create selector for plugin
-	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
-		return !!$.data( elem, fullName );
-	};
-
-	$[ namespace ] = $[ namespace ] || {};
-	existingConstructor = $[ namespace ][ name ];
-	constructor = $[ namespace ][ name ] = function( options, element ) {
-		// allow instantiation without "new" keyword
-		if ( !this._createWidget ) {
-			return new constructor( options, element );
-		}
-
-		// allow instantiation without initializing for simple inheritance
-		// must use "new" keyword (the code above always passes args)
-		if ( arguments.length ) {
-			this._createWidget( options, element );
-		}
-	};
-	// extend with the existing constructor to carry over any static properties
-	$.extend( constructor, existingConstructor, {
-		version: prototype.version,
-		// copy the object used to create the prototype in case we need to
-		// redefine the widget later
-		_proto: $.extend( {}, prototype ),
-		// track widgets that inherit from this widget in case this widget is
-		// redefined after a widget inherits from it
-		_childConstructors: []
-	});
-
-	basePrototype = new base();
-	// we need to make the options hash a property directly on the new instance
-	// otherwise we'll modify the options hash on the prototype that we're
-	// inheriting from
-	basePrototype.options = $.widget.extend( {}, basePrototype.options );
-	$.each( prototype, function( prop, value ) {
-		if ( $.isFunction( value ) ) {
-			prototype[ prop ] = (function() {
-				var _super = function() {
-						return base.prototype[ prop ].apply( this, arguments );
-					},
-					_superApply = function( args ) {
-						return base.prototype[ prop ].apply( this, args );
-					};
-				return function() {
-					var __super = this._super,
-						__superApply = this._superApply,
-						returnValue;
-
-					this._super = _super;
-					this._superApply = _superApply;
-
-					returnValue = value.apply( this, arguments );
-
-					this._super = __super;
-					this._superApply = __superApply;
-
-					return returnValue;
-				};
-			})();
-		}
-	});
-	constructor.prototype = $.widget.extend( basePrototype, {
-		// TODO: remove support for widgetEventPrefix
-		// always use the name + a colon as the prefix, e.g., draggable:start
-		// don't prefix for widgets that aren't DOM-based
-		widgetEventPrefix: existingConstructor ? basePrototype.widgetEventPrefix : name
-	}, prototype, {
-		constructor: constructor,
-		namespace: namespace,
-		widgetName: name,
-		widgetFullName: fullName
-	});
-
-	// If this widget is being redefined then we need to find all widgets that
-	// are inheriting from it and redefine all of them so that they inherit from
-	// the new version of this widget. We're essentially trying to replace one
-	// level in the prototype chain.
-	if ( existingConstructor ) {
-		$.each( existingConstructor._childConstructors, function( i, child ) {
-			var childPrototype = child.prototype;
-
-			// redefine the child widget using the same prototype that was
-			// originally used, but inherit from the new version of the base
-			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
-		});
-		// remove the list of existing child constructors from the old constructor
-		// so the old child constructors can be garbage collected
-		delete existingConstructor._childConstructors;
-	} else {
-		base._childConstructors.push( constructor );
-	}
-
-	$.widget.bridge( name, constructor );
-};
-
-$.widget.extend = function( target ) {
-	var input = slice.call( arguments, 1 ),
-		inputIndex = 0,
-		inputLength = input.length,
-		key,
-		value;
-	for ( ; inputIndex < inputLength; inputIndex++ ) {
-		for ( key in input[ inputIndex ] ) {
-			value = input[ inputIndex ][ key ];
-			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
-				// Clone objects
-				if ( $.isPlainObject( value ) ) {
-					target[ key ] = $.isPlainObject( target[ key ] ) ?
-						$.widget.extend( {}, target[ key ], value ) :
-						// Don't extend strings, arrays, etc. with objects
-						$.widget.extend( {}, value );
-				// Copy everything else by reference
-				} else {
-					target[ key ] = value;
-				}
-			}
-		}
-	}
-	return target;
-};
-
-$.widget.bridge = function( name, object ) {
-	var fullName = object.prototype.widgetFullName || name;
-	$.fn[ name ] = function( options ) {
-		var isMethodCall = typeof options === "string",
-			args = slice.call( arguments, 1 ),
-			returnValue = this;
-
-		// allow multiple hashes to be passed on init
-		options = !isMethodCall && args.length ?
-			$.widget.extend.apply( null, [ options ].concat(args) ) :
-			options;
-
-		if ( isMethodCall ) {
-			this.each(function() {
-				var methodValue,
-					instance = $.data( this, fullName );
-				if ( !instance ) {
-					return $.error( "cannot call methods on " + name + " prior to initialization; " +
-						"attempted to call method '" + options + "'" );
-				}
-				if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
-					return $.error( "no such method '" + options + "' for " + name + " widget instance" );
-				}
-				methodValue = instance[ options ].apply( instance, args );
-				if ( methodValue !== instance && methodValue !== undefined ) {
-					returnValue = methodValue && methodValue.jquery ?
-						returnValue.pushStack( methodValue.get() ) :
-						methodValue;
-					return false;
-				}
-			});
-		} else {
-			this.each(function() {
-				var instance = $.data( this, fullName );
-				if ( instance ) {
-					instance.option( options || {} )._init();
-				} else {
-					$.data( this, fullName, new object( options, this ) );
-				}
-			});
-		}
-
-		return returnValue;
-	};
-};
-
-$.Widget = function( /* options, element */ ) {};
-$.Widget._childConstructors = [];
-
-$.Widget.prototype = {
-	widgetName: "widget",
-	widgetEventPrefix: "",
-	defaultElement: "<div>",
-	options: {
-		disabled: false,
-
-		// callbacks
-		create: null
-	},
-	_createWidget: function( options, element ) {
-		element = $( element || this.defaultElement || this )[ 0 ];
-		this.element = $( element );
-		this.uuid = uuid++;
-		this.eventNamespace = "." + this.widgetName + this.uuid;
-		this.options = $.widget.extend( {},
-			this.options,
-			this._getCreateOptions(),
-			options );
-
-		this.bindings = $();
-		this.hoverable = $();
-		this.focusable = $();
-
-		if ( element !== this ) {
-			$.data( element, this.widgetFullName, this );
-			this._on( true, this.element, {
-				remove: function( event ) {
-					if ( event.target === element ) {
-						this.destroy();
-					}
-				}
-			});
-			this.document = $( element.style ?
-				// element within the document
-				element.ownerDocument :
-				// element is window or document
-				element.document || element );
-			this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
-		}
-
-		this._create();
-		this._trigger( "create", null, this._getCreateEventData() );
-		this._init();
-	},
-	_getCreateOptions: $.noop,
-	_getCreateEventData: $.noop,
-	_create: $.noop,
-	_init: $.noop,
-
-	destroy: function() {
-		this._destroy();
-		// we can probably remove the unbind calls in 2.0
-		// all event bindings should go through this._on()
-		this.element
-			.unbind( this.eventNamespace )
-			// 1.9 BC for #7810
-			// TODO remove dual storage
-			.removeData( this.widgetName )
-			.removeData( this.widgetFullName )
-			// support: jquery <1.6.3
-			// http://bugs.jquery.com/ticket/9413
-			.removeData( $.camelCase( this.widgetFullName ) );
-		this.widget()
-			.unbind( this.eventNamespace )
-			.removeAttr( "aria-disabled" )
-			.removeClass(
-				this.widgetFullName + "-disabled " +
-				"ui-state-disabled" );
-
-		// clean up events and states
-		this.bindings.unbind( this.eventNamespace );
-		this.hoverable.removeClass( "ui-state-hover" );
-		this.focusable.removeClass( "ui-state-focus" );
-	},
-	_destroy: $.noop,
-
-	widget: function() {
-		return this.element;
-	},
-
-	option: function( key, value ) {
-		var options = key,
-			parts,
-			curOption,
-			i;
-
-		if ( arguments.length === 0 ) {
-			// don't return a reference to the internal hash
-			return $.widget.extend( {}, this.options );
-		}
-
-		if ( typeof key === "string" ) {
-			// handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
-			options = {};
-			parts = key.split( "." );
-			key = parts.shift();
-			if ( parts.length ) {
-				curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
-				for ( i = 0; i < parts.length - 1; i++ ) {
-					curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
-					curOption = curOption[ parts[ i ] ];
-				}
-				key = parts.pop();
-				if ( value === undefined ) {
-					return curOption[ key ] === undefined ? null : curOption[ key ];
-				}
-				curOption[ key ] = value;
-			} else {
-				if ( value === undefined ) {
-					return this.options[ key ] === undefined ? null : this.options[ key ];
-				}
-				options[ key ] = value;
-			}
-		}
-
-		this._setOptions( options );
-
-		return this;
-	},
-	_setOptions: function( options ) {
-		var key;
-
-		for ( key in options ) {
-			this._setOption( key, options[ key ] );
-		}
-
-		return this;
-	},
-	_setOption: function( key, value ) {
-		this.options[ key ] = value;
-
-		if ( key === "disabled" ) {
-			this.widget()
-				.toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value )
-				.attr( "aria-disabled", value );
-			this.hoverable.removeClass( "ui-state-hover" );
-			this.focusable.removeClass( "ui-state-focus" );
-		}
-
-		return this;
-	},
-
-	enable: function() {
-		return this._setOption( "disabled", false );
-	},
-	disable: function() {
-		return this._setOption( "disabled", true );
-	},
-
-	_on: function( suppressDisabledCheck, element, handlers ) {
-		var delegateElement,
-			instance = this;
-
-		// no suppressDisabledCheck flag, shuffle arguments
-		if ( typeof suppressDisabledCheck !== "boolean" ) {
-			handlers = element;
-			element = suppressDisabledCheck;
-			suppressDisabledCheck = false;
-		}
-
-		// no element argument, shuffle and use this.element
-		if ( !handlers ) {
-			handlers = element;
-			element = this.element;
-			delegateElement = this.widget();
-		} else {
-			// accept selectors, DOM elements
-			element = delegateElement = $( element );
-			this.bindings = this.bindings.add( element );
-		}
-
-		$.each( handlers, function( event, handler ) {
-			function handlerProxy() {
-				// allow widgets to customize the disabled handling
-				// - disabled as an array instead of boolean
-				// - disabled class as method for disabling individual parts
-				if ( !suppressDisabledCheck &&
-						( instance.options.disabled === true ||
-							$( this ).hasClass( "ui-state-disabled" ) ) ) {
-					return;
-				}
-				return ( typeof handler === "string" ? instance[ handler ] : handler )
-					.apply( instance, arguments );
-			}
-
-			// copy the guid so direct unbinding works
-			if ( typeof handler !== "string" ) {
-				handlerProxy.guid = handler.guid =
-					handler.guid || handlerProxy.guid || $.guid++;
-			}
-
-			var match = event.match( /^(\w+)\s*(.*)$/ ),
-				eventName = match[1] + instance.eventNamespace,
-				selector = match[2];
-			if ( selector ) {
-				delegateElement.delegate( selector, eventName, handlerProxy );
-			} else {
-				element.bind( eventName, handlerProxy );
-			}
-		});
-	},
-
-	_off: function( element, eventName ) {
-		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
-		element.unbind( eventName ).undelegate( eventName );
-	},
-
-	_delay: function( handler, delay ) {
-		function handlerProxy() {
-			return ( typeof handler === "string" ? instance[ handler ] : handler )
-				.apply( instance, arguments );
-		}
-		var instance = this;
-		return setTimeout( handlerProxy, delay || 0 );
-	},
-
-	_hoverable: function( element ) {
-		this.hoverable = this.hoverable.add( element );
-		this._on( element, {
-			mouseenter: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-hover" );
-			},
-			mouseleave: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-hover" );
-			}
-		});
-	},
-
-	_focusable: function( element ) {
-		this.focusable = this.focusable.add( element );
-		this._on( element, {
-			focusin: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-focus" );
-			},
-			focusout: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-focus" );
-			}
-		});
-	},
-
-	_trigger: function( type, event, data ) {
-		var prop, orig,
-			callback = this.options[ type ];
-
-		data = data || {};
-		event = $.Event( event );
-		event.type = ( type === this.widgetEventPrefix ?
-			type :
-			this.widgetEventPrefix + type ).toLowerCase();
-		// the original event may come from any element
-		// so we need to reset the target on the new event
-		event.target = this.element[ 0 ];
-
-		// copy original event properties over to the new event
-		orig = event.originalEvent;
-		if ( orig ) {
-			for ( prop in orig ) {
-				if ( !( prop in event ) ) {
-					event[ prop ] = orig[ prop ];
-				}
-			}
-		}
-
-		this.element.trigger( event, data );
-		return !( $.isFunction( callback ) &&
-			callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
-			event.isDefaultPrevented() );
-	}
-};
-
-$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
-	$.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
-		if ( typeof options === "string" ) {
-			options = { effect: options };
-		}
-		var hasOptions,
-			effectName = !options ?
-				method :
-				options === true || typeof options === "number" ?
-					defaultEffect :
-					options.effect || defaultEffect;
-		options = options || {};
-		if ( typeof options === "number" ) {
-			options = { duration: options };
-		}
-		hasOptions = !$.isEmptyObject( options );
-		options.complete = callback;
-		if ( options.delay ) {
-			element.delay( options.delay );
-		}
-		if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
-			element[ method ]( options );
-		} else if ( effectName !== method && element[ effectName ] ) {
-			element[ effectName ]( options.duration, options.easing, callback );
-		} else {
-			element.queue(function( next ) {
-				$( this )[ method ]();
-				if ( callback ) {
-					callback.call( element[ 0 ] );
-				}
-				next();
-			});
-		}
-	};
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-$.widget( "mobile.widget", {
-	// decorate the parent _createWidget to trigger `widgetinit` for users
-	// who wish to do post post `widgetcreate` alterations/additions
-	//
-	// TODO create a pull request for jquery ui to trigger this event
-	// in the original _createWidget
-	_createWidget: function() {
-		$.Widget.prototype._createWidget.apply( this, arguments );
-		this._trigger( 'init' );
-	},
-
-	_getCreateOptions: function() {
-
-		var elem = this.element,
-			options = {};
-
-		$.each( this.options, function( option ) {
-
-			var value = elem.jqmData( option.replace( /[A-Z]/g, function( c ) {
-							return "-" + c.toLowerCase();
-						})
-					);
-
-			if ( value !== undefined ) {
-				options[ option ] = value;
-			}
-		});
-
-		return options;
-	},
-
-	enhanceWithin: function( target, useKeepNative ) {
-		this.enhance( $( this.options.initSelector, $( target )), useKeepNative );
-	},
-
-	enhance: function( targets, useKeepNative ) {
-		var page, keepNative, $widgetElements = $( targets ), self = this;
-
-		// if ignoreContentEnabled is set to true the framework should
-		// only enhance the selected elements when they do NOT have a
-		// parent with the data-namespace-ignore attribute
-		$widgetElements = $.mobile.enhanceable( $widgetElements );
-
-		if ( useKeepNative && $widgetElements.length ) {
-			// TODO remove dependency on the page widget for the keepNative.
-			// Currently the keepNative value is defined on the page prototype so
-			// the method is as well
-			page = $.mobile.closestPageData( $widgetElements );
-			keepNative = ( page && page.keepNativeSelector()) || "";
-
-			$widgetElements = $widgetElements.not( keepNative );
-		}
-
-		$widgetElements[ this.widgetName ]();
-	},
-
-	raise: function( msg ) {
-		throw "Widget [" + this.widgetName + "]: " + msg;
-	}
-});
-
-})( jQuery );
-
-
-(function( $, window ) {
-	// DEPRECATED
-	// NOTE global mobile object settings
-	$.extend( $.mobile, {
-		// DEPRECATED Should the text be visble in the loading message?
-		loadingMessageTextVisible: undefined,
-
-		// DEPRECATED When the text is visible, what theme does the loading box use?
-		loadingMessageTheme: undefined,
-
-		// DEPRECATED default message setting
-		loadingMessage: undefined,
-
-		// DEPRECATED
-		// Turn on/off page loading message. Theme doubles as an object argument
-		// with the following shape: { theme: '', text: '', html: '', textVisible: '' }
-		// NOTE that the $.mobile.loading* settings and params past the first are deprecated
-		showPageLoadingMsg: function( theme, msgText, textonly ) {
-			$.mobile.loading( 'show', theme, msgText, textonly );
-		},
-
-		// DEPRECATED
-		hidePageLoadingMsg: function() {
-			$.mobile.loading( 'hide' );
-		},
-
-		loading: function() {
-			this.loaderWidget.loader.apply( this.loaderWidget, arguments );
-		}
-	});
-
-	// TODO move loader class down into the widget settings
-	var loaderClass = "ui-loader", $html = $( "html" ), $window = $.mobile.window;
-
-	$.widget( "mobile.loader", {
-		// NOTE if the global config settings are defined they will override these
-		//      options
-		options: {
-			// the theme for the loading message
-			theme: "a",
-
-			// whether the text in the loading message is shown
-			textVisible: false,
-
-			// custom html for the inner content of the loading message
-			html: "",
-
-			// the text to be displayed when the popup is shown
-			text: "loading"
-		},
-
-		defaultHtml: "<div class='" + loaderClass + "'>" +
-			"<span class='ui-icon ui-icon-loading'></span>" +
-			"<h1></h1>" +
-			"</div>",
-
-		// For non-fixed supportin browsers. Position at y center (if scrollTop supported), above the activeBtn (if defined), or just 100px from top
-		fakeFixLoader: function() {
-			var activeBtn = $( "." + $.mobile.activeBtnClass ).first();
-
-			this.element
-				.css({
-					top: $.support.scrollTop && $window.scrollTop() + $window.height() / 2 ||
-						activeBtn.length && activeBtn.offset().top || 100
-				});
-		},
-
-		// check position of loader to see if it appears to be "fixed" to center
-		// if not, use abs positioning
-		checkLoaderPosition: function() {
-			var offset = this.element.offset(),
-				scrollTop = $window.scrollTop(),
-				screenHeight = $.mobile.getScreenHeight();
-
-			if ( offset.top < scrollTop || ( offset.top - scrollTop ) > screenHeight ) {
-				this.element.addClass( "ui-loader-fakefix" );
-				this.fakeFixLoader();
-				$window
-					.unbind( "scroll", this.checkLoaderPosition )
-					.bind( "scroll", $.proxy( this.fakeFixLoader, this ) );
-			}
-		},
-
-		resetHtml: function() {
-			this.element.html( $( this.defaultHtml ).html() );
-		},
-
-		// Turn on/off page loading message. Theme doubles as an object argument
-		// with the following shape: { theme: '', text: '', html: '', textVisible: '' }
-		// NOTE that the $.mobile.loading* settings and params past the first are deprecated
-		// TODO sweet jesus we need to break some of this out
-		show: function( theme, msgText, textonly ) {
-			var textVisible, message, $header, loadSettings;
-
-			this.resetHtml();
-
-			// use the prototype options so that people can set them globally at
-			// mobile init. Consistency, it's what's for dinner
-			if ( $.type(theme) === "object" ) {
-				loadSettings = $.extend( {}, this.options, theme );
-
-				// prefer object property from the param then the old theme setting
-				theme = loadSettings.theme || $.mobile.loadingMessageTheme;
-			} else {
-				loadSettings = this.options;
-
-				// here we prefer the them value passed as a string argument, then
-				// we prefer the global option because we can't use undefined default
-				// prototype options, then the prototype option
-				theme = theme || $.mobile.loadingMessageTheme || loadSettings.theme;
-			}
-
-			// set the message text, prefer the param, then the settings object
-			// then loading message
-			message = msgText || $.mobile.loadingMessage || loadSettings.text;
-
-			// prepare the dom
-			$html.addClass( "ui-loading" );
-
-			if ( $.mobile.loadingMessage !== false || loadSettings.html ) {
-				// boolean values require a bit more work :P, supports object properties
-				// and old settings
-				if ( $.mobile.loadingMessageTextVisible !== undefined ) {
-					textVisible = $.mobile.loadingMessageTextVisible;
-				} else {
-					textVisible = loadSettings.textVisible;
-				}
-
-				// add the proper css given the options (theme, text, etc)
-				// Force text visibility if the second argument was supplied, or
-				// if the text was explicitly set in the object args
-				this.element.attr("class", loaderClass +
-					" ui-corner-all ui-body-" + theme +
-					" ui-loader-" + ( textVisible || msgText || theme.text ? "verbose" : "default" ) +
-					( loadSettings.textonly || textonly ? " ui-loader-textonly" : "" ) );
-
-				// TODO verify that jquery.fn.html is ok to use in both cases here
-				//      this might be overly defensive in preventing unknowing xss
-				// if the html attribute is defined on the loading settings, use that
-				// otherwise use the fallbacks from above
-				if ( loadSettings.html ) {
-					this.element.html( loadSettings.html );
-				} else {
-					this.element.find( "h1" ).text( message );
-				}
-
-				// attach the loader to the DOM
-				this.element.appendTo( $.mobile.pageContainer );
-
-				// check that the loader is visible
-				this.checkLoaderPosition();
-
-				// on scroll check the loader position
-				$window.bind( "scroll", $.proxy( this.checkLoaderPosition, this ) );
-			}
-		},
-
-		hide: function() {
-			$html.removeClass( "ui-loading" );
-
-			if ( $.mobile.loadingMessage ) {
-				this.element.removeClass( "ui-loader-fakefix" );
-			}
-
-			$.mobile.window.unbind( "scroll", this.fakeFixLoader );
-			$.mobile.window.unbind( "scroll", this.checkLoaderPosition );
-		}
-	});
-
-	$window.bind( 'pagecontainercreate', function() {
-		$.mobile.loaderWidget = $.mobile.loaderWidget || $( $.mobile.loader.prototype.defaultHtml ).loader();
-	});
-})(jQuery, this);
-
-
-// Script: jQuery hashchange event
-// 
-// *Version: 1.3, Last updated: 7/21/2010*
-// 
-// Project Home - http://benalman.com/projects/jquery-hashchange-plugin/
-// GitHub       - http://github.com/cowboy/jquery-hashchange/
-// Source       - http://github.com/cowboy/jquery-hashchange/raw/master/jquery.ba-hashchange.js
-// (Minified)   - http://github.com/cowboy/jquery-hashchange/raw/master/jquery.ba-hashchange.min.js (0.8kb gzipped)
-// 
-// About: License
-// 
-// Copyright (c) 2010 "Cowboy" Ben Alman,
-// Dual licensed under the MIT and GPL licenses.
-// http://benalman.com/about/license/
-// 
-// About: Examples
-// 
-// These working examples, complete with fully commented code, illustrate a few
-// ways in which this plugin can be used.
-// 
-// hashchange event - http://benalman.com/code/projects/jquery-hashchange/examples/hashchange/
-// document.domain - http://benalman.com/code/projects/jquery-hashchange/examples/document_domain/
-// 
-// About: Support and Testing
-// 
-// Information about what version or versions of jQuery this plugin has been
-// tested with, what browsers it has been tested in, and where the unit tests
-// reside (so you can test it yourself).
-// 
-// jQuery Versions - 1.2.6, 1.3.2, 1.4.1, 1.4.2
-// Browsers Tested - Internet Explorer 6-8, Firefox 2-4, Chrome 5-6, Safari 3.2-5,
-//                   Opera 9.6-10.60, iPhone 3.1, Android 1.6-2.2, BlackBerry 4.6-5.
-// Unit Tests      - http://benalman.com/code/projects/jquery-hashchange/unit/
-// 
-// About: Known issues
-// 
-// While this jQuery hashchange event implementation is quite stable and
-// robust, there are a few unfortunate browser bugs surrounding expected
-// hashchange event-based behaviors, independent of any JavaScript
-// window.onhashchange abstraction. See the following examples for more
-// information:
-// 
-// Chrome: Back Button - http://benalman.com/code/projects/jquery-hashchange/examples/bug-chrome-back-button/
-// Firefox: Remote XMLHttpRequest - http://benalman.com/code/projects/jquery-hashchange/examples/bug-firefox-remote-xhr/
-// WebKit: Back Button in an Iframe - http://benalman.com/code/projects/jquery-hashchange/examples/bug-webkit-hash-iframe/
-// Safari: Back Button from a different domain - http://benalman.com/code/projects/jquery-hashchange/examples/bug-safari-back-from-diff-domain/
-// 
-// Also note that should a browser natively support the window.onhashchange 
-// event, but not report that it does, the fallback polling loop will be used.
-// 
-// About: Release History
-// 
-// 1.3   - (7/21/2010) Reorganized IE6/7 Iframe code to make it more
-//         "removable" for mobile-only development. Added IE6/7 document.title
-//         support. Attempted to make Iframe as hidden as possible by using
-//         techniques from http://www.paciellogroup.com/blog/?p=604. Added 
-//         support for the "shortcut" format $(window).hashchange( fn ) and
-//         $(window).hashchange() like jQuery provides for built-in events.
-//         Renamed jQuery.hashchangeDelay to <jQuery.fn.hashchange.delay> and
-//         lowered its default value to 50. Added <jQuery.fn.hashchange.domain>
-//         and <jQuery.fn.hashchange.src> properties plus document-domain.html
-//         file to address access denied issues when setting document.domain in
-//         IE6/7.
-// 1.2   - (2/11/2010) Fixed a bug where coming back to a page using this plugin
-//         from a page on another domain would cause an error in Safari 4. Also,
-//         IE6/7 Iframe is now inserted after the body (this actually works),
-//         which prevents the page from scrolling when the event is first bound.
-//         Event can also now be bound before DOM ready, but it won't be usable
-//         before then in IE6/7.
-// 1.1   - (1/21/2010) Incorporated document.documentMode test to fix IE8 bug
-//         where browser version is incorrectly reported as 8.0, despite
-//         inclusion of the X-UA-Compatible IE=EmulateIE7 meta tag.
-// 1.0   - (1/9/2010) Initial Release. Broke out the jQuery BBQ event.special
-//         window.onhashchange functionality into a separate plugin for users
-//         who want just the basic event & back button support, without all the
-//         extra awesomeness that BBQ provides. This plugin will be included as
-//         part of jQuery BBQ, but also be available separately.
-
-(function( $, window, undefined ) {
-  // Reused string.
-  var str_hashchange = 'hashchange',
-    
-    // Method / object references.
-    doc = document,
-    fake_onhashchange,
-    special = $.event.special,
-    
-    // Does the browser support window.onhashchange? Note that IE8 running in
-    // IE7 compatibility mode reports true for 'onhashchange' in window, even
-    // though the event isn't supported, so also test document.documentMode.
-    doc_mode = doc.documentMode,
-    supports_onhashchange = 'on' + str_hashchange in window && ( doc_mode === undefined || doc_mode > 7 );
-  
-  // Get location.hash (or what you'd expect location.hash to be) sans any
-  // leading #. Thanks for making this necessary, Firefox!
-  function get_fragment( url ) {
-    url = url || location.href;
-    return '#' + url.replace( /^[^#]*#?(.*)$/, '$1' );
-  };
-  
-  // Method: jQuery.fn.hashchange
-  // 
-  // Bind a handler to the window.onhashchange event or trigger all bound
-  // window.onhashchange event handlers. This behavior is consistent with
-  // jQuery's built-in event handlers.
-  // 
-  // Usage:
-  // 
-  // > jQuery(window).hashchange( [ handler ] );
-  // 
-  // Arguments:
-  // 
-  //  handler - (Function) Optional handler to be bound to the hashchange
-  //    event. This is a "shortcut" for the more verbose form:
-  //    jQuery(window).bind( 'hashchange', handler ). If handler is omitted,
-  //    all bound window.onhashchange event handlers will be triggered. This
-  //    is a shortcut for the more verbose
-  //    jQuery(window).trigger( 'hashchange' ). These forms are described in
-  //    the <hashchange event> section.
-  // 
-  // Returns:
-  // 
-  //  (jQuery) The initial jQuery collection of elements.
-  
-  // Allow the "shortcut" format $(elem).hashchange( fn ) for binding and
-  // $(elem).hashchange() for triggering, like jQuery does for built-in events.
-  $.fn[ str_hashchange ] = function( fn ) {
-    return fn ? this.bind( str_hashchange, fn ) : this.trigger( str_hashchange );
-  };
-  
-  // Property: jQuery.fn.hashchange.delay
-  // 
-  // The numeric interval (in milliseconds) at which the <hashchange event>
-  // polling loop executes. Defaults to 50.
-  
-  // Property: jQuery.fn.hashchange.domain
-  // 
-  // If you're setting document.domain in your JavaScript, and you want hash
-  // history to work in IE6/7, not only must this property be set, but you must
-  // also set document.domain BEFORE jQuery is loaded into the page. This
-  // property is only applicable if you are supporting IE6/7 (or IE8 operating
-  // in "IE7 compatibility" mode).
-  // 
-  // In addition, the <jQuery.fn.hashchange.src> property must be set to the
-  // path of the included "document-domain.html" file, which can be renamed or
-  // modified if necessary (note that the document.domain specified must be the
-  // same in both your main JavaScript as well as in this file).
-  // 
-  // Usage:
-  // 
-  // jQuery.fn.hashchange.domain = document.domain;
-  
-  // Property: jQuery.fn.hashchange.src
-  // 
-  // If, for some reason, you need to specify an Iframe src file (for example,
-  // when setting document.domain as in <jQuery.fn.hashchange.domain>), you can
-  // do so using this property. Note that when using this property, history
-  // won't be recorded in IE6/7 until the Iframe src file loads. This property
-  // is only applicable if you are supporting IE6/7 (or IE8 operating in "IE7
-  // compatibility" mode).
-  // 
-  // Usage:
-  // 
-  // jQuery.fn.hashchange.src = 'path/to/file.html';
-  
-  $.fn[ str_hashchange ].delay = 50;
-  /*
-  $.fn[ str_hashchange ].domain = null;
-  $.fn[ str_hashchange ].src = null;
-  */
-  
-  // Event: hashchange event
-  // 
-  // Fired when location.hash changes. In browsers that support it, the native
-  // HTML5 window.onhashchange event is used, otherwise a polling loop is
-  // initialized, running every <jQuery.fn.hashchange.delay> milliseconds to
-  // see if the hash has changed. In IE6/7 (and IE8 operating in "IE7
-  // compatibility" mode), a hidden Iframe is created to allow the back button
-  // and hash-based history to work.
-  // 
-  // Usage as described in <jQuery.fn.hashchange>:
-  // 
-  // > // Bind an event handler.
-  // > jQuery(window).hashchange( function(e) {
-  // >   var hash = location.hash;
-  // >   ...
-  // > });
-  // > 
-  // > // Manually trigger the event handler.
-  // > jQuery(window).hashchange();
-  // 
-  // A more verbose usage that allows for event namespacing:
-  // 
-  // > // Bind an event handler.
-  // > jQuery(window).bind( 'hashchange', function(e) {
-  // >   var hash = location.hash;
-  // >   ...
-  // > });
-  // > 
-  // > // Manually trigger the event handler.
-  // > jQuery(window).trigger( 'hashchange' );
-  // 
-  // Additional Notes:
-  // 
-  // * The polling loop and Iframe are not created until at least one handler
-  //   is actually bound to the 'hashchange' event.
-  // * If you need the bound handler(s) to execute immediately, in cases where
-  //   a location.hash exists on page load, via bookmark or page refresh for
-  //   example, use jQuery(window).hashchange() or the more verbose 
-  //   jQuery(window).trigger( 'hashchange' ).
-  // * The event can be bound before DOM ready, but since it won't be usable
-  //   before then in IE6/7 (due to the necessary Iframe), recommended usage is
-  //   to bind it inside a DOM ready handler.
-  
-  // Override existing $.event.special.hashchange methods (allowing this plugin
-  // to be defined after jQuery BBQ in BBQ's source code).
-  special[ str_hashchange ] = $.extend( special[ str_hashchange ], {
-    
-    // Called only when the first 'hashchange' event is bound to window.
-    setup: function() {
-      // If window.onhashchange is supported natively, there's nothing to do..
-      if ( supports_onhashchange ) { return false; }
-      
-      // Otherwise, we need to create our own. And we don't want to call this
-      // until the user binds to the event, just in case they never do, since it
-      // will create a polling loop and possibly even a hidden Iframe.
-      $( fake_onhashchange.start );
-    },
-    
-    // Called only when the last 'hashchange' event is unbound from window.
-    teardown: function() {
-      // If window.onhashchange is supported natively, there's nothing to do..
-      if ( supports_onhashchange ) { return false; }
-      
-      // Otherwise, we need to stop ours (if possible).
-      $( fake_onhashchange.stop );
-    }
-    
-  });
-  
-  // fake_onhashchange does all the work of triggering the window.onhashchange
-  // event for browsers that don't natively support it, including creating a
-  // polling loop to watch for hash changes and in IE 6/7 creating a hidden
-  // Iframe to enable back and forward.
-  fake_onhashchange = (function() {
-    var self = {},
-      timeout_id,
-      
-      // Remember the initial hash so it doesn't get triggered immediately.
-      last_hash = get_fragment(),
-      
-      fn_retval = function( val ) { return val; },
-      history_set = fn_retval,
-      history_get = fn_retval;
-    
-    // Start the polling loop.
-    self.start = function() {
-      timeout_id || poll();
-    };
-    
-    // Stop the polling loop.
-    self.stop = function() {
-      timeout_id && clearTimeout( timeout_id );
-      timeout_id = undefined;
-    };
-    
-    // This polling loop checks every $.fn.hashchange.delay milliseconds to see
-    // if location.hash has changed, and triggers the 'hashchange' event on
-    // window when necessary.
-    function poll() {
-      var hash = get_fragment(),
-        history_hash = history_get( last_hash );
-      
-      if ( hash !== last_hash ) {
-        history_set( last_hash = hash, history_hash );
-        
-        $(window).trigger( str_hashchange );
-        
-      } else if ( history_hash !== last_hash ) {
-        location.href = location.href.replace( /#.*/, '' ) + history_hash;
-      }
-      
-      timeout_id = setTimeout( poll, $.fn[ str_hashchange ].delay );
-    };
-    
-    // vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-    // vvvvvvvvvvvvvvvvvvv REMOVE IF NOT SUPPORTING IE6/7/8 vvvvvvvvvvvvvvvvvvv
-    // vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-    window.attachEvent && !window.addEventListener && !supports_onhashchange && (function() {
-      // Not only do IE6/7 need the "magical" Iframe treatment, but so does IE8
-      // when running in "IE7 compatibility" mode.
-      
-      var iframe,
-        iframe_src;
-      
-      // When the event is bound and polling starts in IE 6/7, create a hidden
-      // Iframe for history handling.
-      self.start = function() {
-        if ( !iframe ) {
-          iframe_src = $.fn[ str_hashchange ].src;
-          iframe_src = iframe_src && iframe_src + get_fragment();
-          
-          // Create hidden Iframe. Attempt to make Iframe as hidden as possible
-          // by using techniques from http://www.paciellogroup.com/blog/?p=604.
-          iframe = $('<iframe tabindex="-1" title="empty"/>').hide()
-            
-            // When Iframe has completely loaded, initialize the history and
-            // start polling.
-            .one( 'load', function() {
-              iframe_src || history_set( get_fragment() );
-              poll();
-            })
-            
-            // Load Iframe src if specified, otherwise nothing.
-            .attr( 'src', iframe_src || 'javascript:0' )
-            
-            // Append Iframe after the end of the body to prevent unnecessary
-            // initial page scrolling (yes, this works).
-            .insertAfter( 'body' )[0].contentWindow;
-          
-          // Whenever `document.title` changes, update the Iframe's title to
-          // prettify the back/next history menu entries. Since IE sometimes
-          // errors with "Unspecified error" the very first time this is set
-          // (yes, very useful) wrap this with a try/catch block.
-          doc.onpropertychange = function() {
-            try {
-              if ( event.propertyName === 'title' ) {
-                iframe.document.title = doc.title;
-              }
-            } catch(e) {}
-          };
-          
-        }
-      };
-      
-      // Override the "stop" method since an IE6/7 Iframe was created. Even
-      // if there are no longer any bound event handlers, the polling loop
-      // is still necessary for back/next to work at all!
-      self.stop = fn_retval;
-      
-      // Get history by looking at the hidden Iframe's location.hash.
-      history_get = function() {
-        return get_fragment( iframe.location.href );
-      };
-      
-      // Set a new history item by opening and then closing the Iframe
-      // document, *then* setting its location.hash. If document.domain has
-      // been set, update that as well.
-      history_set = function( hash, history_hash ) {
-        var iframe_doc = iframe.document,
-          domain = $.fn[ str_hashchange ].domain;
-        
-        if ( hash !== history_hash ) {
-          // Update Iframe with any initial `document.title` that might be set.
-          iframe_doc.title = doc.title;
-          
-          // Opening the Iframe's document after it has been closed is what
-          // actually adds a history entry.
-          iframe_doc.open();
-          
-          // Set document.domain for the Iframe document as well, if necessary.
-          domain && iframe_doc.write( '<script>document.domain="' + domain + '"</script>' );
-          
-          iframe_doc.close();
-          
-          // Update the Iframe's hash, for great justice.
-          iframe.location.hash = hash;
-        }
-      };
-      
-    })();
-    // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    // ^^^^^^^^^^^^^^^^^^^ REMOVE IF NOT SUPPORTING IE6/7/8 ^^^^^^^^^^^^^^^^^^^
-    // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    
-    return self;
-  })();
-  
-})(jQuery,this);
-
-(function( $, undefined ) {
-
-	/*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
-	window.matchMedia = window.matchMedia || (function( doc, undefined ) {
-
-		
-
-		var bool,
-			docElem = doc.documentElement,
-			refNode = docElem.firstElementChild || docElem.firstChild,
-			// fakeBody required for <FF4 when executed in <head>
-			fakeBody = doc.createElement( "body" ),
-			div = doc.createElement( "div" );
-
-		div.id = "mq-test-1";
-		div.style.cssText = "position:absolute;top:-100em";
-		fakeBody.style.background = "none";
-		fakeBody.appendChild(div);
-
-		return function(q){
-
-			div.innerHTML = "&shy;<style media=\"" + q + "\"> #mq-test-1 { width: 42px; }</style>";
-
-			docElem.insertBefore( fakeBody, refNode );
-			bool = div.offsetWidth === 42;
-			docElem.removeChild( fakeBody );
-
-			return {
-				matches: bool,
-				media: q
-			};
-
-		};
-
-	}( document ));
-
-	// $.mobile.media uses matchMedia to return a boolean.
-	$.mobile.media = function( q ) {
-		return window.matchMedia( q ).matches;
-	};
-
-})(jQuery);
-
-	(function( $, undefined ) {
-		var support = {
-			touch: "ontouchend" in document
-		};
-
-		$.mobile.support = $.mobile.support || {};
-		$.extend( $.support, support );
-		$.extend( $.mobile.support, support );
-	}( jQuery ));
-
-	(function( $, undefined ) {
-		$.extend( $.support, {
-			orientation: "orientation" in window && "onorientationchange" in window
-		});
-	}( jQuery ));
-
-(function( $, undefined ) {
-
-// thx Modernizr
-function propExists( prop ) {
-	var uc_prop = prop.charAt( 0 ).toUpperCase() + prop.substr( 1 ),
-		props = ( prop + " " + vendors.join( uc_prop + " " ) + uc_prop ).split( " " );
-
-	for ( var v in props ) {
-		if ( fbCSS[ props[ v ] ] !== undefined ) {
-			return true;
-		}
-	}
-}
-
-var fakeBody = $( "<body>" ).prependTo( "html" ),
-	fbCSS = fakeBody[ 0 ].style,
-	vendors = [ "Webkit", "Moz", "O" ],
-	webos = "palmGetResource" in window, //only used to rule out scrollTop
-	opera = window.opera,
-	operamini = window.operamini && ({}).toString.call( window.operamini ) === "[object OperaMini]",
-	bb = window.blackberry && !propExists( "-webkit-transform" ); //only used to rule out box shadow, as it's filled opaque on BB 5 and lower
-
-
-function validStyle( prop, value, check_vend ) {
-	var div = document.createElement( 'div' ),
-		uc = function( txt ) {
-			return txt.charAt( 0 ).toUpperCase() + txt.substr( 1 );
-		},
-		vend_pref = function( vend ) {
-			if( vend === "" ) {
-				return "";
-			} else {
-				return  "-" + vend.charAt( 0 ).toLowerCase() + vend.substr( 1 ) + "-";
-			}
-		},
-		check_style = function( vend ) {
-			var vend_prop = vend_pref( vend ) + prop + ": " + value + ";",
-				uc_vend = uc( vend ),
-				propStyle = uc_vend + ( uc_vend === "" ? prop : uc( prop ) );
-
-			div.setAttribute( "style", vend_prop );
-
-			if ( !!div.style[ propStyle ] ) {
-				ret = true;
-			}
-		},
-		check_vends = check_vend ? check_vend : vendors,
-		ret;
-
-	for( var i = 0; i < check_vends.length; i++ ) {
-		check_style( check_vends[i] );
-	}
-	return !!ret;
-}
-
-function transform3dTest() {
-	var mqProp = "transform-3d",
-		// Because the `translate3d` test below throws false positives in Android:
-		ret = $.mobile.media( "(-" + vendors.join( "-" + mqProp + "),(-" ) + "-" + mqProp + "),(" + mqProp + ")" );
-
-	if( ret ) {
-		return !!ret;
-	}
-
-	var el = document.createElement( "div" ),
-		transforms = {
-			// We’re omitting Opera for the time being; MS uses unprefixed.
-			'MozTransform':'-moz-transform',
-			'transform':'transform'
-		};
-
-	fakeBody.append( el );
-
-	for ( var t in transforms ) {
-		if( el.style[ t ] !== undefined ){
-			el.style[ t ] = 'translate3d( 100px, 1px, 1px )';
-			ret = window.getComputedStyle( el ).getPropertyValue( transforms[ t ] );
-		}
-	}
-	return ( !!ret && ret !== "none" );
-}
-
-// Test for dynamic-updating base tag support ( allows us to avoid href,src attr rewriting )
-function baseTagTest() {
-	var fauxBase = location.protocol + "//" + location.host + location.pathname + "ui-dir/",
-		base = $( "head base" ),
-		fauxEle = null,
-		href = "",
-		link, rebase;
-
-	if ( !base.length ) {
-		base = fauxEle = $( "<base>", { "href": fauxBase }).appendTo( "head" );
-	} else {
-		href = base.attr( "href" );
-	}
-
-	link = $( "<a href='testurl' />" ).prependTo( fakeBody );
-	rebase = link[ 0 ].href;
-	base[ 0 ].href = href || location.pathname;
-
-	if ( fauxEle ) {
-		fauxEle.remove();
-	}
-	return rebase.indexOf( fauxBase ) === 0;
-}
-
-// Thanks Modernizr
-function cssPointerEventsTest() {
-	var element = document.createElement( 'x' ),
-		documentElement = document.documentElement,
-		getComputedStyle = window.getComputedStyle,
-		supports;
-
-	if ( !( 'pointerEvents' in element.style ) ) {
-		return false;
-	}
-
-	element.style.pointerEvents = 'auto';
-	element.style.pointerEvents = 'x';
-	documentElement.appendChild( element );
-	supports = getComputedStyle &&
-	getComputedStyle( element, '' ).pointerEvents === 'auto';
-	documentElement.removeChild( element );
-	return !!supports;
-}
-
-function boundingRect() {
-	var div = document.createElement( "div" );
-	return typeof div.getBoundingClientRect !== "undefined";
-}
-
-// non-UA-based IE version check by James Padolsey, modified by jdalton - from http://gist.github.com/527683
-// allows for inclusion of IE 6+, including Windows Mobile 7
-$.extend( $.mobile, { browser: {} } );
-$.mobile.browser.oldIE = (function() {
-	var v = 3,
-		div = document.createElement( "div" ),
-		a = div.all || [];
-
-	do {
-		div.innerHTML = "<!--[if gt IE " + ( ++v ) + "]><br><![endif]-->";
-	} while( a[0] );
-
-	return v > 4 ? v : !v;
-})();
-
-function fixedPosition() {
-	var w = window,
-		ua = navigator.userAgent,
-		platform = navigator.platform,
-		// Rendering engine is Webkit, and capture major version
-		wkmatch = ua.match( /AppleWebKit\/([0-9]+)/ ),
-		wkversion = !!wkmatch && wkmatch[ 1 ],
-		ffmatch = ua.match( /Fennec\/([0-9]+)/ ),
-		ffversion = !!ffmatch && ffmatch[ 1 ],
-		operammobilematch = ua.match( /Opera Mobi\/([0-9]+)/ ),
-		omversion = !!operammobilematch && operammobilematch[ 1 ];
-
-	if(
-		// iOS 4.3 and older : Platform is iPhone/Pad/Touch and Webkit version is less than 534 (ios5)
-		( ( platform.indexOf( "iPhone" ) > -1 || platform.indexOf( "iPad" ) > -1  || platform.indexOf( "iPod" ) > -1 ) && wkversion && wkversion < 534 ) ||
-		// Opera Mini
-		( w.operamini && ({}).toString.call( w.operamini ) === "[object OperaMini]" ) ||
-		( operammobilematch && omversion < 7458 )	||
-		//Android lte 2.1: Platform is Android and Webkit version is less than 533 (Android 2.2)
-		( ua.indexOf( "Android" ) > -1 && wkversion && wkversion < 533 ) ||
-		// Firefox Mobile before 6.0 -
-		( ffversion && ffversion < 6 ) ||
-		// WebOS less than 3
-		( "palmGetResource" in window && wkversion && wkversion < 534 )	||
-		// MeeGo
-		( ua.indexOf( "MeeGo" ) > -1 && ua.indexOf( "NokiaBrowser/8.5.0" ) > -1 ) ) {
-		return false;
-	}
-
-	return true;
-}
-
-$.extend( $.support, {
-	cssTransitions: "WebKitTransitionEvent" in window ||
-		validStyle( 'transition', 'height 100ms linear', [ "Webkit", "Moz", "" ] ) &&
-		!$.mobile.browser.oldIE && !opera,
-
-	// Note, Chrome for iOS has an extremely quirky implementation of popstate.
-	// We've chosen to take the shortest path to a bug fix here for issue #5426
-	// See the following link for information about the regex chosen
-	// https://developers.google.com/chrome/mobile/docs/user-agent#chrome_for_ios_user-agent
-	pushState: "pushState" in history &&
-		"replaceState" in history &&
-		( window.navigator.userAgent.search(/CriOS/) === -1 ),
-
-	mediaquery: $.mobile.media( "only all" ),
-	cssPseudoElement: !!propExists( "content" ),
-	touchOverflow: !!propExists( "overflowScrolling" ),
-	cssTransform3d: transform3dTest(),
-	boxShadow: !!propExists( "boxShadow" ) && !bb,
-	fixedPosition: fixedPosition(),
-	scrollTop: ("pageXOffset" in window ||
-		"scrollTop" in document.documentElement ||
-		"scrollTop" in fakeBody[ 0 ]) && !webos && !operamini,
-
-	dynamicBaseTag: baseTagTest(),
-	cssPointerEvents: cssPointerEventsTest(),
-	boundingRect: boundingRect()
-});
-
-fakeBody.remove();
-
-
-// $.mobile.ajaxBlacklist is used to override ajaxEnabled on platforms that have known conflicts with hash history updates (BB5, Symbian)
-// or that generally work better browsing in regular http for full page refreshes (Opera Mini)
-// Note: This detection below is used as a last resort.
-// We recommend only using these detection methods when all other more reliable/forward-looking approaches are not possible
-var nokiaLTE7_3 = (function() {
-
-	var ua = window.navigator.userAgent;
-
-	//The following is an attempt to match Nokia browsers that are running Symbian/s60, with webkit, version 7.3 or older
-	return ua.indexOf( "Nokia" ) > -1 &&
-			( ua.indexOf( "Symbian/3" ) > -1 || ua.indexOf( "Series60/5" ) > -1 ) &&
-			ua.indexOf( "AppleWebKit" ) > -1 &&
-			ua.match( /(BrowserNG|NokiaBrowser)\/7\.[0-3]/ );
-})();
-
-// Support conditions that must be met in order to proceed
-// default enhanced qualifications are media query support OR IE 7+
-
-$.mobile.gradeA = function() {
-	return ( $.support.mediaquery || $.mobile.browser.oldIE && $.mobile.browser.oldIE >= 7 ) && ( $.support.boundingRect || $.fn.jquery.match(/1\.[0-7+]\.[0-9+]?/) !== null );
-};
-
-$.mobile.ajaxBlacklist =
-			// BlackBerry browsers, pre-webkit
-			window.blackberry && !window.WebKitPoint ||
-			// Opera Mini
-			operamini ||
-			// Symbian webkits pre 7.3
-			nokiaLTE7_3;
-
-// Lastly, this workaround is the only way we've found so far to get pre 7.3 Symbian webkit devices
-// to render the stylesheets when they're referenced before this script, as we'd recommend doing.
-// This simply reappends the CSS in place, which for some reason makes it apply
-if ( nokiaLTE7_3 ) {
-	$(function() {
-		$( "head link[rel='stylesheet']" ).attr( "rel", "alternate stylesheet" ).attr( "rel", "stylesheet" );
-	});
-}
-
-// For ruling out shadows via css
-if ( !$.support.boxShadow ) {
-	$( "html" ).addClass( "ui-mobile-nosupport-boxshadow" );
-}
-
-})( jQuery );
-
-
-(function( $, undefined ) {
-	var $win = $.mobile.window, self, history;
-
-	$.event.special.navigate = self = {
-		bound: false,
-
-		pushStateEnabled: true,
-
-		originalEventName: undefined,
-
-		// If pushstate support is present and push state support is defined to
-		// be true on the mobile namespace.
-		isPushStateEnabled: function() {
-			return $.support.pushState &&
-				$.mobile.pushStateEnabled === true &&
-				this.isHashChangeEnabled();
-		},
-
-		// !! assumes mobile namespace is present
-		isHashChangeEnabled: function() {
-			return $.mobile.hashListeningEnabled === true;
-		},
-
-		// TODO a lot of duplication between popstate and hashchange
-		popstate: function( event ) {
-			var newEvent = new $.Event( "navigate" ),
-				beforeNavigate = new $.Event( "beforenavigate" ),
-				state = event.originalEvent.state || {},
-				href = location.href;
-
-			$win.trigger( beforeNavigate );
-
-			if( beforeNavigate.isDefaultPrevented() ){
-				return;
-			}
-
-			if( event.historyState ){
-				$.extend(state, event.historyState);
-			}
-
-			// Make sure the original event is tracked for the end
-			// user to inspect incase they want to do something special
-			newEvent.originalEvent = event;
-
-			// NOTE we let the current stack unwind because any assignment to
-			//      location.hash will stop the world and run this event handler. By
-			//      doing this we create a similar behavior to hashchange on hash
-			//      assignment
-			setTimeout(function() {
-				$win.trigger( newEvent, {
-					state: state
-				});
-			}, 0);
-		},
-
-		hashchange: function( event, data ) {
-			var newEvent = new $.Event( "navigate" ),
-				beforeNavigate = new $.Event( "beforenavigate" );
-
-			$win.trigger( beforeNavigate );
-
-			if( beforeNavigate.isDefaultPrevented() ){
-				return;
-			}
-
-			// Make sure the original event is tracked for the end
-			// user to inspect incase they want to do something special
-			newEvent.originalEvent = event;
-
-			// Trigger the hashchange with state provided by the user
-			// that altered the hash
-			$win.trigger( newEvent, {
-				// Users that want to fully normalize the two events
-				// will need to do history management down the stack and
-				// add the state to the event before this binding is fired
-				// TODO consider allowing for the explicit addition of callbacks
-				//      to be fired before this value is set to avoid event timing issues
-				state: event.hashchangeState || {}
-			});
-		},
-
-		// TODO We really only want to set this up once
-		//      but I'm not clear if there's a beter way to achieve
-		//      this with the jQuery special event structure
-		setup: function( data, namespaces ) {
-			if( self.bound ) {
-				return;
-			}
-
-			self.bound = true;
-
-			if( self.isPushStateEnabled() ) {
-				self.originalEventName = "popstate";
-				$win.bind( "popstate.navigate", self.popstate );
-			} else if ( self.isHashChangeEnabled() ){
-				self.originalEventName = "hashchange";
-				$win.bind( "hashchange.navigate", self.hashchange );
-			}
-		}
-	};
-})( jQuery );
-
-
-
-(function( $, undefined ) {
-		var path, documentBase, $base, dialogHashKey = "&ui-state=dialog";
-
-		$.mobile.path = path = {
-			uiStateKey: "&ui-state",
-
-			// This scary looking regular expression parses an absolute URL or its relative
-			// variants (protocol, site, document, query, and hash), into the various
-			// components (protocol, host, path, query, fragment, etc that make up the
-			// URL as well as some other commonly used sub-parts. When used with RegExp.exec()
-			// or String.match, it parses the URL into a results array that looks like this:
-			//
-			//     [0]: http://jblas:password@mycompany.com:8080/mail/inbox?msg=1234&type=unread#msg-content
-			//     [1]: http://jblas:password@mycompany.com:8080/mail/inbox?msg=1234&type=unread
-			//     [2]: http://jblas:password@mycompany.com:8080/mail/inbox
-			//     [3]: http://jblas:password@mycompany.com:8080
-			//     [4]: http:
-			//     [5]: //
-			//     [6]: jblas:password@mycompany.com:8080
-			//     [7]: jblas:password
-			//     [8]: jblas
-			//     [9]: password
-			//    [10]: mycompany.com:8080
-			//    [11]: mycompany.com
-			//    [12]: 8080
-			//    [13]: /mail/inbox
-			//    [14]: /mail/
-			//    [15]: inbox
-			//    [16]: ?msg=1234&type=unread
-			//    [17]: #msg-content
-			//
-			urlParseRE: /^\s*(((([^:\/#\?]+:)?(?:(\/\/)((?:(([^:@\/#\?]+)(?:\:([^:@\/#\?]+))?)@)?(([^:\/#\?\]\[]+|\[[^\/\]@#?]+\])(?:\:([0-9]+))?))?)?)?((\/?(?:[^\/\?#]+\/+)*)([^\?#]*)))?(\?[^#]+)?)(#.*)?/,
-
-			// Abstraction to address xss (Issue #4787) by removing the authority in
-			// browsers that auto	decode it. All references to location.href should be
-			// replaced with a call to this method so that it can be dealt with properly here
-			getLocation: function( url ) {
-				var uri = url ? this.parseUrl( url ) : location,
-					hash = this.parseUrl( url || location.href ).hash;
-
-				// mimic the browser with an empty string when the hash is empty
-				hash = hash === "#" ? "" : hash;
-
-				// Make sure to parse the url or the location object for the hash because using location.hash
-				// is autodecoded in firefox, the rest of the url should be from the object (location unless
-				// we're testing) to avoid the inclusion of the authority
-				return uri.protocol + "//" + uri.host + uri.pathname + uri.search + hash;
-			},
-
-			parseLocation: function() {
-				return this.parseUrl( this.getLocation() );
-			},
-
-			//Parse a URL into a structure that allows easy access to
-			//all of the URL components by name.
-			parseUrl: function( url ) {
-				// If we're passed an object, we'll assume that it is
-				// a parsed url object and just return it back to the caller.
-				if ( $.type( url ) === "object" ) {
-					return url;
-				}
-
-				var matches = path.urlParseRE.exec( url || "" ) || [];
-
-					// Create an object that allows the caller to access the sub-matches
-					// by name. Note that IE returns an empty string instead of undefined,
-					// like all other browsers do, so we normalize everything so its consistent
-					// no matter what browser we're running on.
-					return {
-						href:         matches[  0 ] || "",
-						hrefNoHash:   matches[  1 ] || "",
-						hrefNoSearch: matches[  2 ] || "",
-						domain:       matches[  3 ] || "",
-						protocol:     matches[  4 ] || "",
-						doubleSlash:  matches[  5 ] || "",
-						authority:    matches[  6 ] || "",
-						username:     matches[  8 ] || "",
-						password:     matches[  9 ] || "",
-						host:         matches[ 10 ] || "",
-						hostname:     matches[ 11 ] || "",
-						port:         matches[ 12 ] || "",
-						pathname:     matches[ 13 ] || "",
-						directory:    matches[ 14 ] || "",
-						filename:     matches[ 15 ] || "",
-						search:       matches[ 16 ] || "",
-						hash:         matches[ 17 ] || ""
-					};
-			},
-
-			//Turn relPath into an asbolute path. absPath is
-			//an optional absolute path which describes what
-			//relPath is relative to.
-			makePathAbsolute: function( relPath, absPath ) {
-				if ( relPath && relPath.charAt( 0 ) === "/" ) {
-					return relPath;
-				}
-
-				relPath = relPath || "";
-				absPath = absPath ? absPath.replace( /^\/|(\/[^\/]*|[^\/]+)$/g, "" ) : "";
-
-				var absStack = absPath ? absPath.split( "/" ) : [],
-					relStack = relPath.split( "/" );
-				for ( var i = 0; i < relStack.length; i++ ) {
-					var d = relStack[ i ];
-					switch ( d ) {
-						case ".":
-							break;
-						case "..":
-							if ( absStack.length ) {
-								absStack.pop();
-							}
-							break;
-						default:
-							absStack.push( d );
-							break;
-					}
-				}
-				return "/" + absStack.join( "/" );
-			},
-
-			//Returns true if both urls have the same domain.
-			isSameDomain: function( absUrl1, absUrl2 ) {
-				return path.parseUrl( absUrl1 ).domain === path.parseUrl( absUrl2 ).domain;
-			},
-
-			//Returns true for any relative variant.
-			isRelativeUrl: function( url ) {
-				// All relative Url variants have one thing in common, no protocol.
-				return path.parseUrl( url ).protocol === "";
-			},
-
-			//Returns true for an absolute url.
-			isAbsoluteUrl: function( url ) {
-				return path.parseUrl( url ).protocol !== "";
-			},
-
-			//Turn the specified realtive URL into an absolute one. This function
-			//can handle all relative variants (protocol, site, document, query, fragment).
-			makeUrlAbsolute: function( relUrl, absUrl ) {
-				if ( !path.isRelativeUrl( relUrl ) ) {
-					return relUrl;
-				}
-
-				if ( absUrl === undefined ) {
-					absUrl = this.documentBase;
-				}
-
-				var relObj = path.parseUrl( relUrl ),
-					absObj = path.parseUrl( absUrl ),
-					protocol = relObj.protocol || absObj.protocol,
-					doubleSlash = relObj.protocol ? relObj.doubleSlash : ( relObj.doubleSlash || absObj.doubleSlash ),
-					authority = relObj.authority || absObj.authority,
-					hasPath = relObj.pathname !== "",
-					pathname = path.makePathAbsolute( relObj.pathname || absObj.filename, absObj.pathname ),
-					search = relObj.search || ( !hasPath && absObj.search ) || "",
-					hash = relObj.hash;
-
-				return protocol + doubleSlash + authority + pathname + search + hash;
-			},
-
-			//Add search (aka query) params to the specified url.
-			addSearchParams: function( url, params ) {
-				var u = path.parseUrl( url ),
-					p = ( typeof params === "object" ) ? $.param( params ) : params,
-					s = u.search || "?";
-				return u.hrefNoSearch + s + ( s.charAt( s.length - 1 ) !== "?" ? "&" : "" ) + p + ( u.hash || "" );
-			},
-
-			convertUrlToDataUrl: function( absUrl ) {
-				var u = path.parseUrl( absUrl );
-				if ( path.isEmbeddedPage( u ) ) {
-					// For embedded pages, remove the dialog hash key as in getFilePath(),
-					// and remove otherwise the Data Url won't match the id of the embedded Page.
-					return u.hash
-						.split( dialogHashKey )[0]
-						.replace( /^#/, "" )
-						.replace( /\?.*$/, "" );
-				} else if ( path.isSameDomain( u, this.documentBase ) ) {
-					return u.hrefNoHash.replace( this.documentBase.domain, "" ).split( dialogHashKey )[0];
-				}
-
-				return window.decodeURIComponent(absUrl);
-			},
-
-			//get path from current hash, or from a file path
-			get: function( newPath ) {
-				if ( newPath === undefined ) {
-					newPath = path.parseLocation().hash;
-				}
-				return path.stripHash( newPath ).replace( /[^\/]*\.[^\/*]+$/, '' );
-			},
-
-			//set location hash to path
-			set: function( path ) {
-				location.hash = path;
-			},
-
-			//test if a given url (string) is a path
-			//NOTE might be exceptionally naive
-			isPath: function( url ) {
-				return ( /\// ).test( url );
-			},
-
-			//return a url path with the window's location protocol/hostname/pathname removed
-			clean: function( url ) {
-				return url.replace( this.documentBase.domain, "" );
-			},
-
-			//just return the url without an initial #
-			stripHash: function( url ) {
-				return url.replace( /^#/, "" );
-			},
-
-			stripQueryParams: function( url ) {
-				return url.replace( /\?.*$/, "" );
-			},
-
-			//remove the preceding hash, any query params, and dialog notations
-			cleanHash: function( hash ) {
-				return path.stripHash( hash.replace( /\?.*$/, "" ).replace( dialogHashKey, "" ) );
-			},
-
-			isHashValid: function( hash ) {
-				return ( /^#[^#]+$/ ).test( hash );
-			},
-
-			//check whether a url is referencing the same domain, or an external domain or different protocol
-			//could be mailto, etc
-			isExternal: function( url ) {
-				var u = path.parseUrl( url );
-				return u.protocol && u.domain !== this.documentUrl.domain ? true : false;
-			},
-
-			hasProtocol: function( url ) {
-				return ( /^(:?\w+:)/ ).test( url );
-			},
-
-			isEmbeddedPage: function( url ) {
-				var u = path.parseUrl( url );
-
-				//if the path is absolute, then we need to compare the url against
-				//both the this.documentUrl and the documentBase. The main reason for this
-				//is that links embedded within external documents will refer to the
-				//application document, whereas links embedded within the application
-				//document will be resolved against the document base.
-				if ( u.protocol !== "" ) {
-					return ( !this.isPath(u.hash) && u.hash && ( u.hrefNoHash === this.documentUrl.hrefNoHash || ( this.documentBaseDiffers && u.hrefNoHash === this.documentBase.hrefNoHash ) ) );
-				}
-				return ( /^#/ ).test( u.href );
-			},
-
-			squash: function( url, resolutionUrl ) {
-				var state, href, cleanedUrl, search, stateIndex,
-					isPath = this.isPath( url ),
-					uri = this.parseUrl( url ),
-					preservedHash = uri.hash,
-					uiState = "";
-
-				// produce a url against which we can resole the provided path
-				resolutionUrl = resolutionUrl || (path.isPath(url) ? path.getLocation() : path.getDocumentUrl());
-
-				// If the url is anything but a simple string, remove any preceding hash
-				// eg #foo/bar -> foo/bar
-				//    #foo -> #foo
-				cleanedUrl = isPath ? path.stripHash( url ) : url;
-
-				// If the url is a full url with a hash check if the parsed hash is a path
-				// if it is, strip the #, and use it otherwise continue without change
-				cleanedUrl = path.isPath( uri.hash ) ? path.stripHash( uri.hash ) : cleanedUrl;
-
-				// Split the UI State keys off the href
-				stateIndex = cleanedUrl.indexOf( this.uiStateKey );
-
-				// store the ui state keys for use
-				if( stateIndex > -1 ){
-					uiState = cleanedUrl.slice( stateIndex );
-					cleanedUrl = cleanedUrl.slice( 0, stateIndex );
-				}
-
-				// make the cleanedUrl absolute relative to the resolution url
-				href = path.makeUrlAbsolute( cleanedUrl, resolutionUrl );
-
-				// grab the search from the resolved url since parsing from
-				// the passed url may not yield the correct result
-				search = this.parseUrl( href ).search;
-
-				// TODO all this crap is terrible, clean it up
-				if ( isPath ) {
-					// reject the hash if it's a path or it's just a dialog key
-					if( path.isPath( preservedHash ) || preservedHash.replace("#", "").indexOf( this.uiStateKey ) === 0) {
-						preservedHash = "";
-					}
-
-					// Append the UI State keys where it exists and it's been removed
-					// from the url
-					if( uiState && preservedHash.indexOf( this.uiStateKey ) === -1){
-						preservedHash += uiState;
-					}
-
-					// make sure that pound is on the front of the hash
-					if( preservedHash.indexOf( "#" ) === -1 && preservedHash !== "" ){
-						preservedHash = "#" + preservedHash;
-					}
-
-					// reconstruct each of the pieces with the new search string and hash
-					href = path.parseUrl( href );
-					href = href.protocol + "//" + href.host + href.pathname + search + preservedHash;
-				} else {
-					href += href.indexOf( "#" ) > -1 ? uiState : "#" + uiState;
-				}
-
-				return href;
-			},
-
-			isPreservableHash: function( hash ) {
-				return hash.replace( "#", "" ).indexOf( this.uiStateKey ) === 0;
-			}
-		};
-
-		path.documentUrl = path.parseLocation();
-
-		$base = $( "head" ).find( "base" );
-
-		path.documentBase = $base.length ?
-			path.parseUrl( path.makeUrlAbsolute( $base.attr( "href" ), path.documentUrl.href ) ) :
-			path.documentUrl;
-
-		path.documentBaseDiffers = (path.documentUrl.hrefNoHash !== path.documentBase.hrefNoHash);
-
-		//return the original document url
-		path.getDocumentUrl = function( asParsedObject ) {
-			return asParsedObject ? $.extend( {}, path.documentUrl ) : path.documentUrl.href;
-		};
-
-		//return the original document base url
-		path.getDocumentBase = function( asParsedObject ) {
-			return asParsedObject ? $.extend( {}, path.documentBase ) : path.documentBase.href;
-		};
-})( jQuery );
-
-
-
-(function( $, undefined ) {
-	var path = $.mobile.path;
-
-	$.mobile.History = function( stack, index ) {
-		this.stack = stack || [];
-		this.activeIndex = index || 0;
-	};
-
-	$.extend($.mobile.History.prototype, {
-		getActive: function() {
-			return this.stack[ this.activeIndex ];
-		},
-
-		getLast: function() {
-			return this.stack[ this.previousIndex ];
-		},
-
-		getNext: function() {
-			return this.stack[ this.activeIndex + 1 ];
-		},
-
-		getPrev: function() {
-			return this.stack[ this.activeIndex - 1 ];
-		},
-
-		// addNew is used whenever a new page is added
-		add: function( url, data ){
-			data = data || {};
-
-			//if there's forward history, wipe it
-			if ( this.getNext() ) {
-				this.clearForward();
-			}
-
-			// if the hash is included in the data make sure the shape
-			// is consistent for comparison
-			if( data.hash && data.hash.indexOf( "#" ) === -1) {
-				data.hash = "#" + data.hash;
-			}
-
-			data.url = url;
-			this.stack.push( data );
-			this.activeIndex = this.stack.length - 1;
-		},
-
-		//wipe urls ahead of active index
-		clearForward: function() {
-			this.stack = this.stack.slice( 0, this.activeIndex + 1 );
-		},
-
-		find: function( url, stack, earlyReturn ) {
-			stack = stack || this.stack;
-
-			var entry, i, length = stack.length, index;
-
-			for ( i = 0; i < length; i++ ) {
-				entry = stack[i];
-
-				if ( decodeURIComponent(url) === decodeURIComponent(entry.url) ||
-					decodeURIComponent(url) === decodeURIComponent(entry.hash) ) {
-					index = i;
-
-					if( earlyReturn ) {
-						return index;
-					}
-				}
-			}
-
-			return index;
-		},
-
-		closest: function( url ) {
-			var closest, a = this.activeIndex;
-
-			// First, take the slice of the history stack before the current index and search
-			// for a url match. If one is found, we'll avoid avoid looking through forward history
-			// NOTE the preference for backward history movement is driven by the fact that
-			//      most mobile browsers only have a dedicated back button, and users rarely use
-			//      the forward button in desktop browser anyhow
-			closest = this.find( url, this.stack.slice(0, a) );
-
-			// If nothing was found in backward history check forward. The `true`
-			// value passed as the third parameter causes the find method to break
-			// on the first match in the forward history slice. The starting index
-			// of the slice must then be added to the result to get the element index
-			// in the original history stack :( :(
-			//
-			// TODO this is hyper confusing and should be cleaned up (ugh so bad)
-			if( closest === undefined ) {
-				closest = this.find( url, this.stack.slice(a), true );
-				closest = closest === undefined ? closest : closest + a;
-			}
-
-			return closest;
-		},
-
-		direct: function( opts ) {
-			var newActiveIndex = this.closest( opts.url ), a = this.activeIndex;
-
-			// save new page index, null check to prevent falsey 0 result
-			// record the previous index for reference
-			if( newActiveIndex !== undefined ) {
-				this.activeIndex = newActiveIndex;
-				this.previousIndex = a;
-			}
-
-			// invoke callbacks where appropriate
-			//
-			// TODO this is also convoluted and confusing
-			if ( newActiveIndex < a ) {
-				( opts.present || opts.back || $.noop )( this.getActive(), 'back' );
-			} else if ( newActiveIndex > a ) {
-				( opts.present || opts.forward || $.noop )( this.getActive(), 'forward' );
-			} else if ( newActiveIndex === undefined && opts.missing ){
-				opts.missing( this.getActive() );
-			}
-		}
-	});
-})( jQuery );
-
-
-(function( $, undefined ) {
-	var path = $.mobile.path;
-
-	$.mobile.Navigator = function( history ) {
-		this.history = history;
-		this.ignoreInitialHashChange = true;
-
-		// This ensures that browsers which don't fire the initial popstate
-		// like opera don't have further hash assignment popstates blocked
-		setTimeout($.proxy(function() {
-			this.ignoreInitialHashChange = false;
-		}, this), 200);
-
-		$.mobile.window.bind({
-			"popstate.history": $.proxy( this.popstate, this ),
-			"hashchange.history": $.proxy( this.hashchange, this )
-		});
-	};
-
-	$.extend($.mobile.Navigator.prototype, {
-		squash: function( url, data ) {
-			var state, href, hash = path.isPath(url) ? path.stripHash(url) : url;
-
-			href = path.squash( url );
-
-			// make sure to provide this information when it isn't explicitly set in the
-			// data object that was passed to the squash method
-			state = $.extend({
-				hash: hash,
-				url: href
-			}, data);
-
-			// replace the current url with the new href and store the state
-			// Note that in some cases we might be replacing an url with the
-			// same url. We do this anyways because we need to make sure that
-			// all of our history entries have a state object associated with
-			// them. This allows us to work around the case where $.mobile.back()
-			// is called to transition from an external page to an embedded page.
-			// In that particular case, a hashchange event is *NOT* generated by the browser.
-			// Ensuring each history entry has a state object means that onPopState()
-			// will always trigger our hashchange callback even when a hashchange event
-			// is not fired.
-			window.history.replaceState( state, state.title || document.title, href );
-
-			return state;
-		},
-
-		hash: function( url, href ) {
-			var parsed, loc, hash;
-
-			// Grab the hash for recording. If the passed url is a path
-			// we used the parsed version of the squashed url to reconstruct,
-			// otherwise we assume it's a hash and store it directly
-			parsed = path.parseUrl( url );
-			loc = path.parseLocation();
-
-			if( loc.pathname + loc.search === parsed.pathname + parsed.search ) {
-				// If the pathname and search of the passed url is identical to the current loc
-				// then we must use the hash. Otherwise there will be no event
-				// eg, url = "/foo/bar?baz#bang", location.href = "http://example.com/foo/bar?baz"
-				hash = parsed.hash ? parsed.hash : parsed.pathname + parsed.search;
-			} else if ( path.isPath(url) ) {
-				var resolved = path.parseUrl( href );
-				// If the passed url is a path, make it domain relative and remove any trailing hash
-				hash = resolved.pathname + resolved.search + (path.isPreservableHash( resolved.hash )? resolved.hash.replace( "#", "" ) : "");
-			} else {
-				hash = url;
-			}
-
-			return hash;
-		},
-
-		// TODO reconsider name
-		go: function( url, data, noEvents ) {
-			var state, href, hash, popstateEvent,
-				isPopStateEvent = $.event.special.navigate.isPushStateEnabled();
-
-			// Get the url as it would look squashed on to the current resolution url
-			href = path.squash( url );
-
-			// sort out what the hash sould be from the url
-			hash = this.hash( url, href );
-
-			// Here we prevent the next hash change or popstate event from doing any
-			// history management. In the case of hashchange we don't swallow it
-			// if there will be no hashchange fired (since that won't reset the value)
-			// and will swallow the following hashchange
-			if( noEvents && hash !== path.stripHash(path.parseLocation().hash) ) {
-				this.preventNextHashChange = noEvents;
-			}
-
-			// IMPORTANT in the case where popstate is supported the event will be triggered
-			//      directly, stopping further execution - ie, interupting the flow of this
-			//      method call to fire bindings at this expression. Below the navigate method
-			//      there is a binding to catch this event and stop its propagation.
-			//
-			//      We then trigger a new popstate event on the window with a null state
-			//      so that the navigate events can conclude their work properly
-			//
-			// if the url is a path we want to preserve the query params that are available on
-			// the current url.
-			this.preventHashAssignPopState = true;
-			window.location.hash = hash;
-
-			// If popstate is enabled and the browser triggers `popstate` events when the hash
-			// is set (this often happens immediately in browsers like Chrome), then the
-			// this flag will be set to false already. If it's a browser that does not trigger
-			// a `popstate` on hash assignement or `replaceState` then we need avoid the branch
-			// that swallows the event created by the popstate generated by the hash assignment
-			// At the time of this writing this happens with Opera 12 and some version of IE
-			this.preventHashAssignPopState = false;
-
-			state = $.extend({
-				url: href,
-				hash: hash,
-				title: document.title
-			}, data);
-
-			if( isPopStateEvent ) {
-				popstateEvent = new $.Event( "popstate" );
-				popstateEvent.originalEvent = {
-					type: "popstate",
-					state: null
-				};
-
-				this.squash( url, state );
-
-				// Trigger a new faux popstate event to replace the one that we
-				// caught that was triggered by the hash setting above.
-				if( !noEvents ) {
-					this.ignorePopState = true;
-					$.mobile.window.trigger( popstateEvent );
-				}
-			}
-
-			// record the history entry so that the information can be included
-			// in hashchange event driven navigate events in a similar fashion to
-			// the state that's provided by popstate
-			this.history.add( state.url, state );
-		},
-
-
-		// This binding is intended to catch the popstate events that are fired
-		// when execution of the `$.navigate` method stops at window.location.hash = url;
-		// and completely prevent them from propagating. The popstate event will then be
-		// retriggered after execution resumes
-		//
-		// TODO grab the original event here and use it for the synthetic event in the
-		//      second half of the navigate execution that will follow this binding
-		popstate: function( event ) {
-			var active, hash, state, closestIndex;
-
-			// Partly to support our test suite which manually alters the support
-			// value to test hashchange. Partly to prevent all around weirdness
-			if( !$.event.special.navigate.isPushStateEnabled() ){
-				return;
-			}
-
-			// If this is the popstate triggered by the actual alteration of the hash
-			// prevent it completely. History is tracked manually
-			if( this.preventHashAssignPopState ) {
-				this.preventHashAssignPopState = false;
-				event.stopImmediatePropagation();
-				return;
-			}
-
-			// if this is the popstate triggered after the `replaceState` call in the go
-			// method, then simply ignore it. The history entry has already been captured
-			if( this.ignorePopState ) {
-				this.ignorePopState = false;
-				return;
-			}
-
-			// If there is no state, and the history stack length is one were
-			// probably getting the page load popstate fired by browsers like chrome
-			// avoid it and set the one time flag to false
-			if( !event.originalEvent.state &&
-				this.history.stack.length === 1 &&
-				this.ignoreInitialHashChange ) {
-				this.ignoreInitialHashChange = false;
-
-				return;
-			}
-
-			// account for direct manipulation of the hash. That is, we will receive a popstate
-			// when the hash is changed by assignment, and it won't have a state associated. We
-			// then need to squash the hash. See below for handling of hash assignment that
-			// matches an existing history entry
-			// TODO it might be better to only add to the history stack
-			//      when the hash is adjacent to the active history entry
-			hash = path.parseLocation().hash;
-			if( !event.originalEvent.state && hash ) {
-				// squash the hash that's been assigned on the URL with replaceState
-				// also grab the resulting state object for storage
-				state = this.squash( hash );
-
-				// record the new hash as an additional history entry
-				// to match the browser's treatment of hash assignment
-				this.history.add( state.url, state );
-
-				// pass the newly created state information
-				// along with the event
-				event.historyState = state;
-
-				// do not alter history, we've added a new history entry
-				// so we know where we are
-				return;
-			}
-
-			// If all else fails this is a popstate that comes from the back or forward buttons
-			// make sure to set the state of our history stack properly, and record the directionality
-			this.history.direct({
-				url: (event.originalEvent.state || {}).url || hash,
-
-				// When the url is either forward or backward in history include the entry
-				// as data on the event object for merging as data in the navigate event
-				present: function( historyEntry, direction ) {
-					// make sure to create a new object to pass down as the navigate event data
-					event.historyState = $.extend({}, historyEntry);
-					event.historyState.direction = direction;
-				}
-			});
-		},
-
-		// NOTE must bind before `navigate` special event hashchange binding otherwise the
-		//      navigation data won't be attached to the hashchange event in time for those
-		//      bindings to attach it to the `navigate` special event
-		// TODO add a check here that `hashchange.navigate` is bound already otherwise it's
-		//      broken (exception?)
-		hashchange: function( event ) {
-			var history, hash;
-
-			// If hashchange listening is explicitly disabled or pushstate is supported
-			// avoid making use of the hashchange handler.
-			if(!$.event.special.navigate.isHashChangeEnabled() ||
-				$.event.special.navigate.isPushStateEnabled() ) {
-				return;
-			}
-
-			// On occasion explicitly want to prevent the next hash from propogating because we only
-			// with to alter the url to represent the new state do so here
-			if( this.preventNextHashChange ){
-				this.preventNextHashChange = false;
-				event.stopImmediatePropagation();
-				return;
-			}
-
-			history = this.history;
-			hash = path.parseLocation().hash;
-
-			// If this is a hashchange caused by the back or forward button
-			// make sure to set the state of our history stack properly
-			this.history.direct({
-				url: hash,
-
-				// When the url is either forward or backward in history include the entry
-				// as data on the event object for merging as data in the navigate event
-				present: function( historyEntry, direction ) {
-					// make sure to create a new object to pass down as the navigate event data
-					event.hashchangeState = $.extend({}, historyEntry);
-					event.hashchangeState.direction = direction;
-				},
-
-				// When we don't find a hash in our history clearly we're aiming to go there
-				// record the entry as new for future traversal
-				//
-				// NOTE it's not entirely clear that this is the right thing to do given that we
-				//      can't know the users intention. It might be better to explicitly _not_
-				//      support location.hash assignment in preference to $.navigate calls
-				// TODO first arg to add should be the href, but it causes issues in identifying
-				//      embeded pages
-				missing: function() {
-					history.add( hash, {
-						hash: hash,
-						title: document.title
-					});
-				}
-			});
-		}
-	});
-})( jQuery );
-
-
-
-(function( $, undefined ) {
-	// TODO consider queueing navigation activity until previous activities have completed
-	//      so that end users don't have to think about it. Punting for now
-	// TODO !! move the event bindings into callbacks on the navigate event
-	$.mobile.navigate = function( url, data, noEvents ) {
-		$.mobile.navigate.navigator.go( url, data, noEvents );
-	};
-
-	// expose the history on the navigate method in anticipation of full integration with
-	// existing navigation functionalty that is tightly coupled to the history information
-	$.mobile.navigate.history = new $.mobile.History();
-
-	// instantiate an instance of the navigator for use within the $.navigate method
-	$.mobile.navigate.navigator = new $.mobile.Navigator( $.mobile.navigate.history );
-
-	var loc = $.mobile.path.parseLocation();
-	$.mobile.navigate.history.add( loc.href, {hash: loc.hash} );
-})( jQuery );
-
-
-// This plugin is an experiment for abstracting away the touch and mouse
-// events so that developers don't have to worry about which method of input
-// the device their document is loaded on supports.
-//
-// The idea here is to allow the developer to register listeners for the
-// basic mouse events, such as mousedown, mousemove, mouseup, and click,
-// and the plugin will take care of registering the correct listeners
-// behind the scenes to invoke the listener at the fastest possible time
-// for that device, while still retaining the order of event firing in
-// the traditional mouse environment, should multiple handlers be registered
-// on the same element for different events.
-//
-// The current version exposes the following virtual events to jQuery bind methods:
-// "vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel"
-
-(function( $, window, document, undefined ) {
-
-var dataPropertyName = "virtualMouseBindings",
-	touchTargetPropertyName = "virtualTouchID",
-	virtualEventNames = "vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel".split( " " ),
-	touchEventProps = "clientX clientY pageX pageY screenX screenY".split( " " ),
-	mouseHookProps = $.event.mouseHooks ? $.event.mouseHooks.props : [],
-	mouseEventProps = $.event.props.concat( mouseHookProps ),
-	activeDocHandlers = {},
-	resetTimerID = 0,
-	startX = 0,
-	startY = 0,
-	didScroll = false,
-	clickBlockList = [],
-	blockMouseTriggers = false,
-	blockTouchTriggers = false,
-	eventCaptureSupported = "addEventListener" in document,
-	$document = $( document ),
-	nextTouchID = 1,
-	lastTouchID = 0, threshold;
-
-$.vmouse = {
-	moveDistanceThreshold: 10,
-	clickDistanceThreshold: 10,
-	resetTimerDuration: 1500
-};
-
-function getNativeEvent( event ) {
-
-	while ( event && typeof event.originalEvent !== "undefined" ) {
-		event = event.originalEvent;
-	}
-	return event;
-}
-
-function createVirtualEvent( event, eventType ) {
-
-	var t = event.type,
-		oe, props, ne, prop, ct, touch, i, j, len;
-
-	event = $.Event( event );
-	event.type = eventType;
-
-	oe = event.originalEvent;
-	props = $.event.props;
-
-	// addresses separation of $.event.props in to $.event.mouseHook.props and Issue 3280
-	// https://github.com/jquery/jquery-mobile/issues/3280
-	if ( t.search( /^(mouse|click)/ ) > -1 ) {
-		props = mouseEventProps;
-	}
-
-	// copy original event properties over to the new event
-	// this would happen if we could call $.event.fix instead of $.Event
-	// but we don't have a way to force an event to be fixed multiple times
-	if ( oe ) {
-		for ( i = props.length, prop; i; ) {
-			prop = props[ --i ];
-			event[ prop ] = oe[ prop ];
-		}
-	}
-
-	// make sure that if the mouse and click virtual events are generated
-	// without a .which one is defined
-	if ( t.search(/mouse(down|up)|click/) > -1 && !event.which ) {
-		event.which = 1;
-	}
-
-	if ( t.search(/^touch/) !== -1 ) {
-		ne = getNativeEvent( oe );
-		t = ne.touches;
-		ct = ne.changedTouches;
-		touch = ( t && t.length ) ? t[0] : ( ( ct && ct.length ) ? ct[ 0 ] : undefined );
-
-		if ( touch ) {
-			for ( j = 0, len = touchEventProps.length; j < len; j++) {
-				prop = touchEventProps[ j ];
-				event[ prop ] = touch[ prop ];
-			}
-		}
-	}
-
-	return event;
-}
-
-function getVirtualBindingFlags( element ) {
-
-	var flags = {},
-		b, k;
-
-	while ( element ) {
-
-		b = $.data( element, dataPropertyName );
-
-		for (  k in b ) {
-			if ( b[ k ] ) {
-				flags[ k ] = flags.hasVirtualBinding = true;
-			}
-		}
-		element = element.parentNode;
-	}
-	return flags;
-}
-
-function getClosestElementWithVirtualBinding( element, eventType ) {
-	var b;
-	while ( element ) {
-
-		b = $.data( element, dataPropertyName );
-
-		if ( b && ( !eventType || b[ eventType ] ) ) {
-			return element;
-		}
-		element = element.parentNode;
-	}
-	return null;
-}
-
-function enableTouchBindings() {
-	blockTouchTriggers = false;
-}
-
-function disableTouchBindings() {
-	blockTouchTriggers = true;
-}
-
-function enableMouseBindings() {
-	lastTouchID = 0;
-	clickBlockList.length = 0;
-	blockMouseTriggers = false;
-
-	// When mouse bindings are enabled, our
-	// touch bindings are disabled.
-	disableTouchBindings();
-}
-
-function disableMouseBindings() {
-	// When mouse bindings are disabled, our
-	// touch bindings are enabled.
-	enableTouchBindings();
-}
-
-function startResetTimer() {
-	clearResetTimer();
-	resetTimerID = setTimeout( function() {
-		resetTimerID = 0;
-		enableMouseBindings();
-	}, $.vmouse.resetTimerDuration );
-}
-
-function clearResetTimer() {
-	if ( resetTimerID ) {
-		clearTimeout( resetTimerID );
-		resetTimerID = 0;
-	}
-}
-
-function triggerVirtualEvent( eventType, event, flags ) {
-	var ve;
-
-	if ( ( flags && flags[ eventType ] ) ||
-				( !flags && getClosestElementWithVirtualBinding( event.target, eventType ) ) ) {
-
-		ve = createVirtualEvent( event, eventType );
-
-		$( event.target).trigger( ve );
-	}
-
-	return ve;
-}
-
-function mouseEventCallback( event ) {
-	var touchID = $.data( event.target, touchTargetPropertyName );
-
-	if ( !blockMouseTriggers && ( !lastTouchID || lastTouchID !== touchID ) ) {
-		var ve = triggerVirtualEvent( "v" + event.type, event );
-		if ( ve ) {
-			if ( ve.isDefaultPrevented() ) {
-				event.preventDefault();
-			}
-			if ( ve.isPropagationStopped() ) {
-				event.stopPropagation();
-			}
-			if ( ve.isImmediatePropagationStopped() ) {
-				event.stopImmediatePropagation();
-			}
-		}
-	}
-}
-
-function handleTouchStart( event ) {
-
-	var touches = getNativeEvent( event ).touches,
-		target, flags;
-
-	if ( touches && touches.length === 1 ) {
-
-		target = event.target;
-		flags = getVirtualBindingFlags( target );
-
-		if ( flags.hasVirtualBinding ) {
-
-			lastTouchID = nextTouchID++;
-			$.data( target, touchTargetPropertyName, lastTouchID );
-
-			clearResetTimer();
-
-			disableMouseBindings();
-			didScroll = false;
-
-			var t = getNativeEvent( event ).touches[ 0 ];
-			startX = t.pageX;
-			startY = t.pageY;
-
-			triggerVirtualEvent( "vmouseover", event, flags );
-			triggerVirtualEvent( "vmousedown", event, flags );
-		}
-	}
-}
-
-function handleScroll( event ) {
-	if ( blockTouchTriggers ) {
-		return;
-	}
-
-	if ( !didScroll ) {
-		triggerVirtualEvent( "vmousecancel", event, getVirtualBindingFlags( event.target ) );
-	}
-
-	didScroll = true;
-	startResetTimer();
-}
-
-function handleTouchMove( event ) {
-	if ( blockTouchTriggers ) {
-		return;
-	}
-
-	var t = getNativeEvent( event ).touches[ 0 ],
-		didCancel = didScroll,
-		moveThreshold = $.vmouse.moveDistanceThreshold,
-		flags = getVirtualBindingFlags( event.target );
-
-		didScroll = didScroll ||
-			( Math.abs( t.pageX - startX ) > moveThreshold ||
-				Math.abs( t.pageY - startY ) > moveThreshold );
-
-
-	if ( didScroll && !didCancel ) {
-		triggerVirtualEvent( "vmousecancel", event, flags );
-	}
-
-	triggerVirtualEvent( "vmousemove", event, flags );
-	startResetTimer();
-}
-
-function handleTouchEnd( event ) {
-	if ( blockTouchTriggers ) {
-		return;
-	}
-
-	disableTouchBindings();
-
-	var flags = getVirtualBindingFlags( event.target ),
-		t;
-	triggerVirtualEvent( "vmouseup", event, flags );
-
-	if ( !didScroll ) {
-		var ve = triggerVirtualEvent( "vclick", event, flags );
-		if ( ve && ve.isDefaultPrevented() ) {
-			// The target of the mouse events that follow the touchend
-			// event don't necessarily match the target used during the
-			// touch. This means we need to rely on coordinates for blocking
-			// any click that is generated.
-			t = getNativeEvent( event ).changedTouches[ 0 ];
-			clickBlockList.push({
-				touchID: lastTouchID,
-				x: t.clientX,
-				y: t.clientY
-			});
-
-			// Prevent any mouse events that follow from triggering
-			// virtual event notifications.
-			blockMouseTriggers = true;
-		}
-	}
-	triggerVirtualEvent( "vmouseout", event, flags);
-	didScroll = false;
-
-	startResetTimer();
-}
-
-function hasVirtualBindings( ele ) {
-	var bindings = $.data( ele, dataPropertyName ),
-		k;
-
-	if ( bindings ) {
-		for ( k in bindings ) {
-			if ( bindings[ k ] ) {
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
-function dummyMouseHandler() {}
-
-function getSpecialEventObject( eventType ) {
-	var realType = eventType.substr( 1 );
-
-	return {
-		setup: function( data, namespace ) {
-			// If this is the first virtual mouse binding for this element,
-			// add a bindings object to its data.
-
-			if ( !hasVirtualBindings( this ) ) {
-				$.data( this, dataPropertyName, {} );
-			}
-
-			// If setup is called, we know it is the first binding for this
-			// eventType, so initialize the count for the eventType to zero.
-			var bindings = $.data( this, dataPropertyName );
-			bindings[ eventType ] = true;
-
-			// If this is the first virtual mouse event for this type,
-			// register a global handler on the document.
-
-			activeDocHandlers[ eventType ] = ( activeDocHandlers[ eventType ] || 0 ) + 1;
-
-			if ( activeDocHandlers[ eventType ] === 1 ) {
-				$document.bind( realType, mouseEventCallback );
-			}
-
-			// Some browsers, like Opera Mini, won't dispatch mouse/click events
-			// for elements unless they actually have handlers registered on them.
-			// To get around this, we register dummy handlers on the elements.
-
-			$( this ).bind( realType, dummyMouseHandler );
-
-			// For now, if event capture is not supported, we rely on mouse handlers.
-			if ( eventCaptureSupported ) {
-				// If this is the first virtual mouse binding for the document,
-				// register our touchstart handler on the document.
-
-				activeDocHandlers[ "touchstart" ] = ( activeDocHandlers[ "touchstart" ] || 0) + 1;
-
-				if ( activeDocHandlers[ "touchstart" ] === 1 ) {
-					$document.bind( "touchstart", handleTouchStart )
-						.bind( "touchend", handleTouchEnd )
-
-						// On touch platforms, touching the screen and then dragging your finger
-						// causes the window content to scroll after some distance threshold is
-						// exceeded. On these platforms, a scroll prevents a click event from being
-						// dispatched, and on some platforms, even the touchend is suppressed. To
-						// mimic the suppression of the click event, we need to watch for a scroll
-						// event. Unfortunately, some platforms like iOS don't dispatch scroll
-						// events until *AFTER* the user lifts their finger (touchend). This means
-						// we need to watch both scroll and touchmove events to figure out whether
-						// or not a scroll happenens before the touchend event is fired.
-
-						.bind( "touchmove", handleTouchMove )
-						.bind( "scroll", handleScroll );
-				}
-			}
-		},
-
-		teardown: function( data, namespace ) {
-			// If this is the last virtual binding for this eventType,
-			// remove its global handler from the document.
-
-			--activeDocHandlers[ eventType ];
-
-			if ( !activeDocHandlers[ eventType ] ) {
-				$document.unbind( realType, mouseEventCallback );
-			}
-
-			if ( eventCaptureSupported ) {
-				// If this is the last virtual mouse binding in existence,
-				// remove our document touchstart listener.
-
-				--activeDocHandlers[ "touchstart" ];
-
-				if ( !activeDocHandlers[ "touchstart" ] ) {
-					$document.unbind( "touchstart", handleTouchStart )
-						.unbind( "touchmove", handleTouchMove )
-						.unbind( "touchend", handleTouchEnd )
-						.unbind( "scroll", handleScroll );
-				}
-			}
-
-			var $this = $( this ),
-				bindings = $.data( this, dataPropertyName );
-
-			// teardown may be called when an element was
-			// removed from the DOM. If this is the case,
-			// jQuery core may have already stripped the element
-			// of any data bindings so we need to check it before
-			// using it.
-			if ( bindings ) {
-				bindings[ eventType ] = false;
-			}
-
-			// Unregister the dummy event handler.
-
-			$this.unbind( realType, dummyMouseHandler );
-
-			// If this is the last virtual mouse binding on the
-			// element, remove the binding data from the element.
-
-			if ( !hasVirtualBindings( this ) ) {
-				$this.removeData( dataPropertyName );
-			}
-		}
-	};
-}
-
-// Expose our custom events to the jQuery bind/unbind mechanism.
-
-for ( var i = 0; i < virtualEventNames.length; i++ ) {
-	$.event.special[ virtualEventNames[ i ] ] = getSpecialEventObject( virtualEventNames[ i ] );
-}
-
-// Add a capture click handler to block clicks.
-// Note that we require event capture support for this so if the device
-// doesn't support it, we punt for now and rely solely on mouse events.
-if ( eventCaptureSupported ) {
-	document.addEventListener( "click", function( e ) {
-		var cnt = clickBlockList.length,
-			target = e.target,
-			x, y, ele, i, o, touchID;
-
-		if ( cnt ) {
-			x = e.clientX;
-			y = e.clientY;
-			threshold = $.vmouse.clickDistanceThreshold;
-
-			// The idea here is to run through the clickBlockList to see if
-			// the current click event is in the proximity of one of our
-			// vclick events that had preventDefault() called on it. If we find
-			// one, then we block the click.
-			//
-			// Why do we have to rely on proximity?
-			//
-			// Because the target of the touch event that triggered the vclick
-			// can be different from the target of the click event synthesized
-			// by the browser. The target of a mouse/click event that is syntehsized
-			// from a touch event seems to be implementation specific. For example,
-			// some browsers will fire mouse/click events for a link that is near
-			// a touch event, even though the target of the touchstart/touchend event
-			// says the user touched outside the link. Also, it seems that with most
-			// browsers, the target of the mouse/click event is not calculated until the
-			// time it is dispatched, so if you replace an element that you touched
-			// with another element, the target of the mouse/click will be the new
-			// element underneath that point.
-			//
-			// Aside from proximity, we also check to see if the target and any
-			// of its ancestors were the ones that blocked a click. This is necessary
-			// because of the strange mouse/click target calculation done in the
-			// Android 2.1 browser, where if you click on an element, and there is a
-			// mouse/click handler on one of its ancestors, the target will be the
-			// innermost child of the touched element, even if that child is no where
-			// near the point of touch.
-
-			ele = target;
-
-			while ( ele ) {
-				for ( i = 0; i < cnt; i++ ) {
-					o = clickBlockList[ i ];
-					touchID = 0;
-
-					if ( ( ele === target && Math.abs( o.x - x ) < threshold && Math.abs( o.y - y ) < threshold ) ||
-								$.data( ele, touchTargetPropertyName ) === o.touchID ) {
-						// XXX: We may want to consider removing matches from the block list
-						//      instead of waiting for the reset timer to fire.
-						e.preventDefault();
-						e.stopPropagation();
-						return;
-					}
-				}
-				ele = ele.parentNode;
-			}
-		}
-	}, true);
-}
-})( jQuery, window, document );
-
-
-(function( $, window, undefined ) {
-	var $document = $( document );
-
-	// add new event shortcuts
-	$.each( ( "touchstart touchmove touchend " +
-		"tap taphold " +
-		"swipe swipeleft swiperight " +
-		"scrollstart scrollstop" ).split( " " ), function( i, name ) {
-
-		$.fn[ name ] = function( fn ) {
-			return fn ? this.bind( name, fn ) : this.trigger( name );
-		};
-
-		// jQuery < 1.8
-		if ( $.attrFn ) {
-			$.attrFn[ name ] = true;
-		}
-	});
-
-	var supportTouch = $.mobile.support.touch,
-		scrollEvent = "touchmove scroll",
-		touchStartEvent = supportTouch ? "touchstart" : "mousedown",
-		touchStopEvent = supportTouch ? "touchend" : "mouseup",
-		touchMoveEvent = supportTouch ? "touchmove" : "mousemove";
-
-	function triggerCustomEvent( obj, eventType, event ) {
-		var originalType = event.type;
-		event.type = eventType;
-		$.event.dispatch.call( obj, event );
-		event.type = originalType;
-	}
-
-	// also handles scrollstop
-	$.event.special.scrollstart = {
-
-		enabled: true,
-
-		setup: function() {
-
-			var thisObject = this,
-				$this = $( thisObject ),
-				scrolling,
-				timer;
-
-			function trigger( event, state ) {
-				scrolling = state;
-				triggerCustomEvent( thisObject, scrolling ? "scrollstart" : "scrollstop", event );
-			}
-
-			// iPhone triggers scroll after a small delay; use touchmove instead
-			$this.bind( scrollEvent, function( event ) {
-
-				if ( !$.event.special.scrollstart.enabled ) {
-					return;
-				}
-
-				if ( !scrolling ) {
-					trigger( event, true );
-				}
-
-				clearTimeout( timer );
-				timer = setTimeout( function() {
-					trigger( event, false );
-				}, 50 );
-			});
-		}
-	};
-
-	// also handles taphold
-	$.event.special.tap = {
-		tapholdThreshold: 750,
-
-		setup: function() {
-			var thisObject = this,
-				$this = $( thisObject );
-
-			$this.bind( "vmousedown", function( event ) {
-
-				if ( event.which && event.which !== 1 ) {
-					return false;
-				}
-
-				var origTarget = event.target,
-					origEvent = event.originalEvent,
-					timer;
-
-				function clearTapTimer() {
-					clearTimeout( timer );
-				}
-
-				function clearTapHandlers() {
-					clearTapTimer();
-
-					$this.unbind( "vclick", clickHandler )
-						.unbind( "vmouseup", clearTapTimer );
-					$document.unbind( "vmousecancel", clearTapHandlers );
-				}
-
-				function clickHandler( event ) {
-					clearTapHandlers();
-
-					// ONLY trigger a 'tap' event if the start target is
-					// the same as the stop target.
-					if ( origTarget === event.target ) {
-						triggerCustomEvent( thisObject, "tap", event );
-					}
-				}
-
-				$this.bind( "vmouseup", clearTapTimer )
-					.bind( "vclick", clickHandler );
-				$document.bind( "vmousecancel", clearTapHandlers );
-
-				timer = setTimeout( function() {
-					triggerCustomEvent( thisObject, "taphold", $.Event( "taphold", { target: origTarget } ) );
-				}, $.event.special.tap.tapholdThreshold );
-			});
-		}
-	};
-
-	// also handles swipeleft, swiperight
-	$.event.special.swipe = {
-		scrollSupressionThreshold: 30, // More than this horizontal displacement, and we will suppress scrolling.
-
-		durationThreshold: 1000, // More time than this, and it isn't a swipe.
-
-		horizontalDistanceThreshold: 30,  // Swipe horizontal displacement must be more than this.
-
-		verticalDistanceThreshold: 75,  // Swipe vertical displacement must be less than this.
-
-		start: function( event ) {
-			var data = event.originalEvent.touches ?
-					event.originalEvent.touches[ 0 ] : event;
-			return {
-						time: ( new Date() ).getTime(),
-						coords: [ data.pageX, data.pageY ],
-						origin: $( event.target )
-					};
-		},
-
-		stop: function( event ) {
-			var data = event.originalEvent.touches ?
-					event.originalEvent.touches[ 0 ] : event;
-			return {
-						time: ( new Date() ).getTime(),
-						coords: [ data.pageX, data.pageY ]
-					};
-		},
-
-		handleSwipe: function( start, stop ) {
-			if ( stop.time - start.time < $.event.special.swipe.durationThreshold &&
-				Math.abs( start.coords[ 0 ] - stop.coords[ 0 ] ) > $.event.special.swipe.horizontalDistanceThreshold &&
-				Math.abs( start.coords[ 1 ] - stop.coords[ 1 ] ) < $.event.special.swipe.verticalDistanceThreshold ) {
-
-				start.origin.trigger( "swipe" )
-					.trigger( start.coords[0] > stop.coords[ 0 ] ? "swipeleft" : "swiperight" );
-			}
-		},
-
-		setup: function() {
-			var thisObject = this,
-				$this = $( thisObject );
-
-			$this.bind( touchStartEvent, function( event ) {
-				var start = $.event.special.swipe.start( event ),
-					stop;
-
-				function moveHandler( event ) {
-					if ( !start ) {
-						return;
-					}
-
-					stop = $.event.special.swipe.stop( event );
-
-					// prevent scrolling
-					if ( Math.abs( start.coords[ 0 ] - stop.coords[ 0 ] ) > $.event.special.swipe.scrollSupressionThreshold ) {
-						event.preventDefault();
-					}
-				}
-
-				$this.bind( touchMoveEvent, moveHandler )
-					.one( touchStopEvent, function() {
-						$this.unbind( touchMoveEvent, moveHandler );
-
-						if ( start && stop ) {
-							$.event.special.swipe.handleSwipe( start, stop );
-						}
-						start = stop = undefined;
-					});
-			});
-		}
-	};
-	$.each({
-		scrollstop: "scrollstart",
-		taphold: "tap",
-		swipeleft: "swipe",
-		swiperight: "swipe"
-	}, function( event, sourceEvent ) {
-
-		$.event.special[ event ] = {
-			setup: function() {
-				$( this ).bind( sourceEvent, $.noop );
-			}
-		};
-	});
-
-})( jQuery, this );
-
-
-	// throttled resize event
-	(function( $ ) {
-		$.event.special.throttledresize = {
-			setup: function() {
-				$( this ).bind( "resize", handler );
-			},
-			teardown: function() {
-				$( this ).unbind( "resize", handler );
-			}
-		};
-
-		var throttle = 250,
-			handler = function() {
-				curr = ( new Date() ).getTime();
-				diff = curr - lastCall;
-
-				if ( diff >= throttle ) {
-
-					lastCall = curr;
-					$( this ).trigger( "throttledresize" );
-
-				} else {
-
-					if ( heldCall ) {
-						clearTimeout( heldCall );
-					}
-
-					// Promise a held call will still execute
-					heldCall = setTimeout( handler, throttle - diff );
-				}
-			},
-			lastCall = 0,
-			heldCall,
-			curr,
-			diff;
-	})( jQuery );
-
-(function( $, window ) {
-	var win = $( window ),
-		event_name = "orientationchange",
-		special_event,
-		get_orientation,
-		last_orientation,
-		initial_orientation_is_landscape,
-		initial_orientation_is_default,
-		portrait_map = { "0": true, "180": true };
-
-	// It seems that some device/browser vendors use window.orientation values 0 and 180 to
-	// denote the "default" orientation. For iOS devices, and most other smart-phones tested,
-	// the default orientation is always "portrait", but in some Android and RIM based tablets,
-	// the default orientation is "landscape". The following code attempts to use the window
-	// dimensions to figure out what the current orientation is, and then makes adjustments
-	// to the to the portrait_map if necessary, so that we can properly decode the
-	// window.orientation value whenever get_orientation() is called.
-	//
-	// Note that we used to use a media query to figure out what the orientation the browser
-	// thinks it is in:
-	//
-	//     initial_orientation_is_landscape = $.mobile.media("all and (orientation: landscape)");
-	//
-	// but there was an iPhone/iPod Touch bug beginning with iOS 4.2, up through iOS 5.1,
-	// where the browser *ALWAYS* applied the landscape media query. This bug does not
-	// happen on iPad.
-
-	if ( $.support.orientation ) {
-
-		// Check the window width and height to figure out what the current orientation
-		// of the device is at this moment. Note that we've initialized the portrait map
-		// values to 0 and 180, *AND* we purposely check for landscape so that if we guess
-		// wrong, , we default to the assumption that portrait is the default orientation.
-		// We use a threshold check below because on some platforms like iOS, the iPhone
-		// form-factor can report a larger width than height if the user turns on the
-		// developer console. The actual threshold value is somewhat arbitrary, we just
-		// need to make sure it is large enough to exclude the developer console case.
-
-		var ww = window.innerWidth || win.width(),
-			wh = window.innerHeight || win.height(),
-			landscape_threshold = 50;
-
-		initial_orientation_is_landscape = ww > wh && ( ww - wh ) > landscape_threshold;
-
-
-		// Now check to see if the current window.orientation is 0 or 180.
-		initial_orientation_is_default = portrait_map[ window.orientation ];
-
-		// If the initial orientation is landscape, but window.orientation reports 0 or 180, *OR*
-		// if the initial orientation is portrait, but window.orientation reports 90 or -90, we
-		// need to flip our portrait_map values because landscape is the default orientation for
-		// this device/browser.
-		if ( ( initial_orientation_is_landscape && initial_orientation_is_default ) || ( !initial_orientation_is_landscape && !initial_orientation_is_default ) ) {
-			portrait_map = { "-90": true, "90": true };
-		}
-	}
-
-	$.event.special.orientationchange = $.extend( {}, $.event.special.orientationchange, {
-		setup: function() {
-			// If the event is supported natively, return false so that jQuery
-			// will bind to the event using DOM methods.
-			if ( $.support.orientation && !$.event.special.orientationchange.disabled ) {
-				return false;
-			}
-
-			// Get the current orientation to avoid initial double-triggering.
-			last_orientation = get_orientation();
-
-			// Because the orientationchange event doesn't exist, simulate the
-			// event by testing window dimensions on resize.
-			win.bind( "throttledresize", handler );
-		},
-		teardown: function() {
-			// If the event is not supported natively, return false so that
-			// jQuery will unbind the event using DOM methods.
-			if ( $.support.orientation && !$.event.special.orientationchange.disabled ) {
-				return false;
-			}
-
-			// Because the orientationchange event doesn't exist, unbind the
-			// resize event handler.
-			win.unbind( "throttledresize", handler );
-		},
-		add: function( handleObj ) {
-			// Save a reference to the bound event handler.
-			var old_handler = handleObj.handler;
-
-
-			handleObj.handler = function( event ) {
-				// Modify event object, adding the .orientation property.
-				event.orientation = get_orientation();
-
-				// Call the originally-bound event handler and return its result.
-				return old_handler.apply( this, arguments );
-			};
-		}
-	});
-
-	// If the event is not supported natively, this handler will be bound to
-	// the window resize event to simulate the orientationchange event.
-	function handler() {
-		// Get the current orientation.
-		var orientation = get_orientation();
-
-		if ( orientation !== last_orientation ) {
-			// The orientation has changed, so trigger the orientationchange event.
-			last_orientation = orientation;
-			win.trigger( event_name );
-		}
-	}
-
-	// Get the current page orientation. This method is exposed publicly, should it
-	// be needed, as jQuery.event.special.orientationchange.orientation()
-	$.event.special.orientationchange.orientation = get_orientation = function() {
-		var isPortrait = true, elem = document.documentElement;
-
-		// prefer window orientation to the calculation based on screensize as
-		// the actual screen resize takes place before or after the orientation change event
-		// has been fired depending on implementation (eg android 2.3 is before, iphone after).
-		// More testing is required to determine if a more reliable method of determining the new screensize
-		// is possible when orientationchange is fired. (eg, use media queries + element + opacity)
-		if ( $.support.orientation ) {
-			// if the window orientation registers as 0 or 180 degrees report
-			// portrait, otherwise landscape
-			isPortrait = portrait_map[ window.orientation ];
-		} else {
-			isPortrait = elem && elem.clientWidth / elem.clientHeight < 1.1;
-		}
-
-		return isPortrait ? "portrait" : "landscape";
-	};
-
-	$.fn[ event_name ] = function( fn ) {
-		return fn ? this.bind( event_name, fn ) : this.trigger( event_name );
-	};
-
-	// jQuery < 1.8
-	if ( $.attrFn ) {
-		$.attrFn[ event_name ] = true;
-	}
-
-}( jQuery, this ));
-
-
-
-(function( $, undefined ) {
-
-$.widget( "mobile.page", $.mobile.widget, {
-	options: {
-		theme: "c",
-		domCache: false,
-		keepNativeDefault: ":jqmData(role='none'), :jqmData(role='nojs')"
-	},
-
-	_create: function() {
-		// if false is returned by the callbacks do not create the page
-		if ( this._trigger( "beforecreate" ) === false ) {
-			return false;
-		}
-
-		this.element
-			.attr( "tabindex", "0" )
-			.addClass( "ui-page ui-body-" + this.options.theme );
-
-		this._on( this.element, {
-			pagebeforehide: "removeContainerBackground",
-			pagebeforeshow: "_handlePageBeforeShow"
-		});
-	},
-
-	_handlePageBeforeShow: function( e ) {
-		this.setContainerBackground();
-	},
-
-	removeContainerBackground: function() {
-		$.mobile.pageContainer.removeClass( "ui-overlay-" + $.mobile.getInheritedTheme( this.element.parent() ) );
-	},
-
-	// set the page container background to the page theme
-	setContainerBackground: function( theme ) {
-		if ( this.options.theme ) {
-			$.mobile.pageContainer.addClass( "ui-overlay-" + ( theme || this.options.theme ) );
-		}
-	},
-
-	keepNativeSelector: function() {
-		var options = this.options,
-			keepNativeDefined = options.keepNative && $.trim( options.keepNative );
-
-		if ( keepNativeDefined && options.keepNative !== options.keepNativeDefault ) {
-			return [options.keepNative, options.keepNativeDefault].join( ", " );
-		}
-
-		return options.keepNativeDefault;
-	}
-});
-})( jQuery );
-
-(function( $, window, undefined ) {
-
-var createHandler = function( sequential ) {
-
-	// Default to sequential
-	if ( sequential === undefined ) {
-		sequential = true;
-	}
-
-	return function( name, reverse, $to, $from ) {
-
-		var deferred = new $.Deferred(),
-			reverseClass = reverse ? " reverse" : "",
-			active	= $.mobile.urlHistory.getActive(),
-			toScroll = active.lastScroll || $.mobile.defaultHomeScroll,
-			screenHeight = $.mobile.getScreenHeight(),
-			maxTransitionOverride = $.mobile.maxTransitionWidth !== false && $.mobile.window.width() > $.mobile.maxTransitionWidth,
-			none = !$.support.cssTransitions || maxTransitionOverride || !name || name === "none" || Math.max( $.mobile.window.scrollTop(), toScroll ) > $.mobile.getMaxScrollForTransition(),
-			toPreClass = " ui-page-pre-in",
-			toggleViewportClass = function() {
-				$.mobile.pageContainer.toggleClass( "ui-mobile-viewport-transitioning viewport-" + name );
-			},
-			scrollPage = function() {
-				// By using scrollTo instead of silentScroll, we can keep things better in order
-				// Just to be precautios, disable scrollstart listening like silentScroll would
-				$.event.special.scrollstart.enabled = false;
-
-				window.scrollTo( 0, toScroll );
-
-				// reenable scrollstart listening like silentScroll would
-				setTimeout( function() {
-					$.event.special.scrollstart.enabled = true;
-				}, 150 );
-			},
-			cleanFrom = function() {
-				$from
-					.removeClass( $.mobile.activePageClass + " out in reverse " + name )
-					.height( "" );
-			},
-			startOut = function() {
-				// if it's not sequential, call the doneOut transition to start the TO page animating in simultaneously
-				if ( !sequential ) {
-					doneOut();
-				}
-				else {
-					$from.animationComplete( doneOut );
-				}
-
-				// Set the from page's height and start it transitioning out
-				// Note: setting an explicit height helps eliminate tiling in the transitions
-				$from
-					.height( screenHeight + $.mobile.window.scrollTop() )
-					.addClass( name + " out" + reverseClass );
-			},
-
-			doneOut = function() {
-
-				if ( $from && sequential ) {
-					cleanFrom();
-				}
-
-				startIn();
-			},
-
-			startIn = function() {
-
-				// Prevent flickering in phonegap container: see comments at #4024 regarding iOS
-				$to.css( "z-index", -10 );
-
-				$to.addClass( $.mobile.activePageClass + toPreClass );
-
-				// Send focus to page as it is now display: block
-				$.mobile.focusPage( $to );
-
-				// Set to page height
-				$to.height( screenHeight + toScroll );
-
-				scrollPage();
-
-				// Restores visibility of the new page: added together with $to.css( "z-index", -10 );
-				$to.css( "z-index", "" );
-
-				if ( !none ) {
-					$to.animationComplete( doneIn );
-				}
-
-				$to
-					.removeClass( toPreClass )
-					.addClass( name + " in" + reverseClass );
-
-				if ( none ) {
-					doneIn();
-				}
-
-			},
-
-			doneIn = function() {
-
-				if ( !sequential ) {
-
-					if ( $from ) {
-						cleanFrom();
-					}
-				}
-
-				$to
-					.removeClass( "out in reverse " + name )
-					.height( "" );
-
-				toggleViewportClass();
-
-				// In some browsers (iOS5), 3D transitions block the ability to scroll to the desired location during transition
-				// This ensures we jump to that spot after the fact, if we aren't there already.
-				if ( $.mobile.window.scrollTop() !== toScroll ) {
-					scrollPage();
-				}
-
-				deferred.resolve( name, reverse, $to, $from, true );
-			};
-
-		toggleViewportClass();
-
-		if ( $from && !none ) {
-			startOut();
-		}
-		else {
-			doneOut();
-		}
-
-		return deferred.promise();
-	};
-};
-
-// generate the handlers from the above
-var sequentialHandler = createHandler(),
-	simultaneousHandler = createHandler( false ),
-	defaultGetMaxScrollForTransition = function() {
-		return $.mobile.getScreenHeight() * 3;
-	};
-
-// Make our transition handler the public default.
-$.mobile.defaultTransitionHandler = sequentialHandler;
-
-//transition handler dictionary for 3rd party transitions
-$.mobile.transitionHandlers = {
-	"default": $.mobile.defaultTransitionHandler,
-	"sequential": sequentialHandler,
-	"simultaneous": simultaneousHandler
-};
-
-$.mobile.transitionFallbacks = {};
-
-// If transition is defined, check if css 3D transforms are supported, and if not, if a fallback is specified
-$.mobile._maybeDegradeTransition = function( transition ) {
-		if ( transition && !$.support.cssTransform3d && $.mobile.transitionFallbacks[ transition ] ) {
-			transition = $.mobile.transitionFallbacks[ transition ];
-		}
-
-		return transition;
-};
-
-// Set the getMaxScrollForTransition to default if no implementation was set by user
-$.mobile.getMaxScrollForTransition = $.mobile.getMaxScrollForTransition || defaultGetMaxScrollForTransition;
-})( jQuery, this );
-
-(function( $, undefined ) {
-
-	//define vars for interal use
-	var $window = $.mobile.window,
-		$html = $( 'html' ),
-		$head = $( 'head' ),
-
-		// NOTE: path extensions dependent on core attributes. Moved here to remove deps from
-		//       $.mobile.path definition
-		path = $.extend($.mobile.path, {
-
-			//return the substring of a filepath before the sub-page key, for making a server request
-			getFilePath: function( path ) {
-				var splitkey = '&' + $.mobile.subPageUrlKey;
-				return path && path.split( splitkey )[0].split( dialogHashKey )[0];
-			},
-
-			//check if the specified url refers to the first page in the main application document.
-			isFirstPageUrl: function( url ) {
-				// We only deal with absolute paths.
-				var u = path.parseUrl( path.makeUrlAbsolute( url, this.documentBase ) ),
-
-					// Does the url have the same path as the document?
-					samePath = u.hrefNoHash === this.documentUrl.hrefNoHash || ( this.documentBaseDiffers && u.hrefNoHash === this.documentBase.hrefNoHash ),
-
-					// Get the first page element.
-					fp = $.mobile.firstPage,
-
-					// Get the id of the first page element if it has one.
-					fpId = fp && fp[0] ? fp[0].id : undefined;
-
-				// The url refers to the first page if the path matches the document and
-				// it either has no hash value, or the hash is exactly equal to the id of the
-				// first page element.
-				return samePath && ( !u.hash || u.hash === "#" || ( fpId && u.hash.replace( /^#/, "" ) === fpId ) );
-			},
-
-			// Some embedded browsers, like the web view in Phone Gap, allow cross-domain XHR
-			// requests if the document doing the request was loaded via the file:// protocol.
-			// This is usually to allow the application to "phone home" and fetch app specific
-			// data. We normally let the browser handle external/cross-domain urls, but if the
-			// allowCrossDomainPages option is true, we will allow cross-domain http/https
-			// requests to go through our page loading logic.
-			isPermittedCrossDomainRequest: function( docUrl, reqUrl ) {
-				return $.mobile.allowCrossDomainPages &&
-					docUrl.protocol === "file:" &&
-					reqUrl.search( /^https?:/ ) !== -1;
-			}
-		}),
-
-		// used to track last vclicked element to make sure its value is added to form data
-		$lastVClicked = null,
-
-		//will be defined when a link is clicked and given an active class
-		$activeClickedLink = null,
-
-		// resolved on domready
-		domreadyDeferred = $.Deferred(),
-
-		//urlHistory is purely here to make guesses at whether the back or forward button was clicked
-		//and provide an appropriate transition
-		urlHistory = $.mobile.navigate.history,
-
-		//define first selector to receive focus when a page is shown
-		focusable = "[tabindex],a,button:visible,select:visible,input",
-
-		//queue to hold simultanious page transitions
-		pageTransitionQueue = [],
-
-		//indicates whether or not page is in process of transitioning
-		isPageTransitioning = false,
-
-		//nonsense hash change key for dialogs, so they create a history entry
-		dialogHashKey = "&ui-state=dialog",
-
-		//existing base tag?
-		$base = $head.children( "base" ),
-
-		//tuck away the original document URL minus any fragment.
-		documentUrl = path.documentUrl,
-
-		//if the document has an embedded base tag, documentBase is set to its
-		//initial value. If a base tag does not exist, then we default to the documentUrl.
-		documentBase = path.documentBase,
-
-		//cache the comparison once.
-		documentBaseDiffers = path.documentBaseDiffers,
-
-		getScreenHeight = $.mobile.getScreenHeight;
-
-		//base element management, defined depending on dynamic base tag support
-		var base = $.support.dynamicBaseTag ? {
-
-			//define base element, for use in routing asset urls that are referenced in Ajax-requested markup
-			element: ( $base.length ? $base : $( "<base>", { href: documentBase.hrefNoHash } ).prependTo( $head ) ),
-
-			//set the generated BASE element's href attribute to a new page's base path
-			set: function( href ) {
-				href = path.parseUrl(href).hrefNoHash;
-				base.element.attr( "href", path.makeUrlAbsolute( href, documentBase ) );
-			},
-
-			//set the generated BASE element's href attribute to a new page's base path
-			reset: function() {
-				base.element.attr( "href", documentBase.hrefNoSearch );
-			}
-
-		} : undefined;
-
-
-	//return the original document url
-	$.mobile.getDocumentUrl = path.getDocumentUrl;
-
-	//return the original document base url
-	$.mobile.getDocumentBase = path.getDocumentBase;
-
-	/* internal utility functions */
-
-	// NOTE Issue #4950 Android phonegap doesn't navigate back properly
-	//      when a full page refresh has taken place. It appears that hashchange
-	//      and replacestate history alterations work fine but we need to support
-	//      both forms of history traversal in our code that uses backward history
-	//      movement
-	$.mobile.back = function() {
-		var nav = window.navigator;
-
-		// if the setting is on and the navigator object is
-		// available use the phonegap navigation capability
-		if( this.phonegapNavigationEnabled &&
-			nav &&
-			nav.app &&
-			nav.app.backHistory ){
-			nav.app.backHistory();
-		} else {
-			window.history.back();
-		}
-	};
-
-	//direct focus to the page title, or otherwise first focusable element
-	$.mobile.focusPage = function ( page ) {
-		var autofocus = page.find( "[autofocus]" ),
-			pageTitle = page.find( ".ui-title:eq(0)" );
-
-		if ( autofocus.length ) {
-			autofocus.focus();
-			return;
-		}
-
-		if ( pageTitle.length ) {
-			pageTitle.focus();
-		} else{
-			page.focus();
-		}
-	};
-
-	//remove active classes after page transition or error
-	function removeActiveLinkClass( forceRemoval ) {
-		if ( !!$activeClickedLink && ( !$activeClickedLink.closest( "." + $.mobile.activePageClass ).length || forceRemoval ) ) {
-			$activeClickedLink.removeClass( $.mobile.activeBtnClass );
-		}
-		$activeClickedLink = null;
-	}
-
-	function releasePageTransitionLock() {
-		isPageTransitioning = false;
-		if ( pageTransitionQueue.length > 0 ) {
-			$.mobile.changePage.apply( null, pageTransitionQueue.pop() );
-		}
-	}
-
-	// Save the last scroll distance per page, before it is hidden
-	var setLastScrollEnabled = true,
-		setLastScroll, delayedSetLastScroll;
-
-	setLastScroll = function() {
-		// this barrier prevents setting the scroll value based on the browser
-		// scrolling the window based on a hashchange
-		if ( !setLastScrollEnabled ) {
-			return;
-		}
-
-		var active = $.mobile.urlHistory.getActive();
-
-		if ( active ) {
-			var lastScroll = $window.scrollTop();
-
-			// Set active page's lastScroll prop.
-			// If the location we're scrolling to is less than minScrollBack, let it go.
-			active.lastScroll = lastScroll < $.mobile.minScrollBack ? $.mobile.defaultHomeScroll : lastScroll;
-		}
-	};
-
-	// bind to scrollstop to gather scroll position. The delay allows for the hashchange
-	// event to fire and disable scroll recording in the case where the browser scrolls
-	// to the hash targets location (sometimes the top of the page). once pagechange fires
-	// getLastScroll is again permitted to operate
-	delayedSetLastScroll = function() {
-		setTimeout( setLastScroll, 100 );
-	};
-
-	// disable an scroll setting when a hashchange has been fired, this only works
-	// because the recording of the scroll position is delayed for 100ms after
-	// the browser might have changed the position because of the hashchange
-	$window.bind( $.support.pushState ? "popstate" : "hashchange", function() {
-		setLastScrollEnabled = false;
-	});
-
-	// handle initial hashchange from chrome :(
-	$window.one( $.support.pushState ? "popstate" : "hashchange", function() {
-		setLastScrollEnabled = true;
-	});
-
-	// wait until the mobile page container has been determined to bind to pagechange
-	$window.one( "pagecontainercreate", function() {
-		// once the page has changed, re-enable the scroll recording
-		$.mobile.pageContainer.bind( "pagechange", function() {
-
-			setLastScrollEnabled = true;
-
-			// remove any binding that previously existed on the get scroll
-			// which may or may not be different than the scroll element determined for
-			// this page previously
-			$window.unbind( "scrollstop", delayedSetLastScroll );
-
-			// determine and bind to the current scoll element which may be the window
-			// or in the case of touch overflow the element with touch overflow
-			$window.bind( "scrollstop", delayedSetLastScroll );
-		});
-	});
-
-	// bind to scrollstop for the first page as "pagechange" won't be fired in that case
-	$window.bind( "scrollstop", delayedSetLastScroll );
-
-	// No-op implementation of transition degradation
-	$.mobile._maybeDegradeTransition = $.mobile._maybeDegradeTransition || function( transition ) {
-		return transition;
-	};
-
-	//function for transitioning between two existing pages
-	function transitionPages( toPage, fromPage, transition, reverse ) {
-		if ( fromPage ) {
-			//trigger before show/hide events
-			fromPage.data( "mobile-page" )._trigger( "beforehide", null, { nextPage: toPage } );
-		}
-
-		toPage.data( "mobile-page" )._trigger( "beforeshow", null, { prevPage: fromPage || $( "" ) } );
-
-		//clear page loader
-		$.mobile.hidePageLoadingMsg();
-
-		transition = $.mobile._maybeDegradeTransition( transition );
-
-		//find the transition handler for the specified transition. If there
-		//isn't one in our transitionHandlers dictionary, use the default one.
-		//call the handler immediately to kick-off the transition.
-		var th = $.mobile.transitionHandlers[ transition || "default" ] || $.mobile.defaultTransitionHandler,
-			promise = th( transition, reverse, toPage, fromPage );
-
-		promise.done(function() {
-			//trigger show/hide events
-			if ( fromPage ) {
-				fromPage.data( "mobile-page" )._trigger( "hide", null, { nextPage: toPage } );
-			}
-
-			//trigger pageshow, define prevPage as either fromPage or empty jQuery obj
-			toPage.data( "mobile-page" )._trigger( "show", null, { prevPage: fromPage || $( "" ) } );
-		});
-
-		return promise;
-	}
-
-	//simply set the active page's minimum height to screen height, depending on orientation
-	$.mobile.resetActivePageHeight = function resetActivePageHeight( height ) {
-		var aPage = $( "." + $.mobile.activePageClass ),
-			aPagePadT = parseFloat( aPage.css( "padding-top" ) ),
-			aPagePadB = parseFloat( aPage.css( "padding-bottom" ) ),
-			aPageBorderT = parseFloat( aPage.css( "border-top-width" ) ),
-			aPageBorderB = parseFloat( aPage.css( "border-bottom-width" ) );
-
-		height = ( typeof height === "number" )? height : getScreenHeight();
-		
-		aPage.css( "min-height", height - aPagePadT - aPagePadB - aPageBorderT - aPageBorderB );
-	};
-
-	//shared page enhancements
-	function enhancePage( $page, role ) {
-		// If a role was specified, make sure the data-role attribute
-		// on the page element is in sync.
-		if ( role ) {
-			$page.attr( "data-" + $.mobile.ns + "role", role );
-		}
-
-		//run page plugin
-		$page.page();
-	}
-
-	// determine the current base url
-	function findBaseWithDefault() {
-		var closestBase = ( $.mobile.activePage && getClosestBaseUrl( $.mobile.activePage ) );
-		return closestBase || documentBase.hrefNoHash;
-	}
-
-	/* exposed $.mobile methods */
-
-	//animation complete callback
-	$.fn.animationComplete = function( callback ) {
-		if ( $.support.cssTransitions ) {
-			return $( this ).one( 'webkitAnimationEnd animationend', callback );
-		}
-		else{
-			// defer execution for consistency between webkit/non webkit
-			setTimeout( callback, 0 );
-			return $( this );
-		}
-	};
-
-	//expose path object on $.mobile
-	$.mobile.path = path;
-
-	//expose base object on $.mobile
-	$.mobile.base = base;
-
-	//history stack
-	$.mobile.urlHistory = urlHistory;
-
-	$.mobile.dialogHashKey = dialogHashKey;
-
-	//enable cross-domain page support
-	$.mobile.allowCrossDomainPages = false;
-
-	$.mobile._bindPageRemove = function() {
-		var page = $( this );
-
-		// when dom caching is not enabled or the page is embedded bind to remove the page on hide
-		if ( !page.data( "mobile-page" ).options.domCache &&
-			page.is( ":jqmData(external-page='true')" ) ) {
-
-			page.bind( 'pagehide.remove', function( e ) {
-				var $this = $( this ),
-					prEvent = new $.Event( "pageremove" );
-
-				$this.trigger( prEvent );
-
-				if ( !prEvent.isDefaultPrevented() ) {
-					$this.removeWithDependents();
-				}
-			});
-		}
-	};
-
-	// Load a page into the DOM.
-	$.mobile.loadPage = function( url, options ) {
-		// This function uses deferred notifications to let callers
-		// know when the page is done loading, or if an error has occurred.
-		var deferred = $.Deferred(),
-
-			// The default loadPage options with overrides specified by
-			// the caller.
-			settings = $.extend( {}, $.mobile.loadPage.defaults, options ),
-
-			// The DOM element for the page after it has been loaded.
-			page = null,
-
-			// If the reloadPage option is true, and the page is already
-			// in the DOM, dupCachedPage will be set to the page element
-			// so that it can be removed after the new version of the
-			// page is loaded off the network.
-			dupCachedPage = null,
-
-			// The absolute version of the URL passed into the function. This
-			// version of the URL may contain dialog/subpage params in it.
-			absUrl = path.makeUrlAbsolute( url, findBaseWithDefault() );
-
-		// If the caller provided data, and we're using "get" request,
-		// append the data to the URL.
-		if ( settings.data && settings.type === "get" ) {
-			absUrl = path.addSearchParams( absUrl, settings.data );
-			settings.data = undefined;
-		}
-
-		// If the caller is using a "post" request, reloadPage must be true
-		if ( settings.data && settings.type === "post" ) {
-			settings.reloadPage = true;
-		}
-
-		// The absolute version of the URL minus any dialog/subpage params.
-		// In otherwords the real URL of the page to be loaded.
-		var fileUrl = path.getFilePath( absUrl ),
-
-			// The version of the Url actually stored in the data-url attribute of
-			// the page. For embedded pages, it is just the id of the page. For pages
-			// within the same domain as the document base, it is the site relative
-			// path. For cross-domain pages (Phone Gap only) the entire absolute Url
-			// used to load the page.
-			dataUrl = path.convertUrlToDataUrl( absUrl );
-
-		// Make sure we have a pageContainer to work with.
-		settings.pageContainer = settings.pageContainer || $.mobile.pageContainer;
-
-		// Check to see if the page already exists in the DOM.
-		// NOTE do _not_ use the :jqmData psuedo selector because parenthesis
-		//      are a valid url char and it breaks on the first occurence
-		page = settings.pageContainer.children( "[data-" + $.mobile.ns +"url='" + dataUrl + "']" );
-
-		// If we failed to find the page, check to see if the url is a
-		// reference to an embedded page. If so, it may have been dynamically
-		// injected by a developer, in which case it would be lacking a data-url
-		// attribute and in need of enhancement.
-		if ( page.length === 0 && dataUrl && !path.isPath( dataUrl ) ) {
-			page = settings.pageContainer.children( "#" + dataUrl )
-				.attr( "data-" + $.mobile.ns + "url", dataUrl )
-				.jqmData( "url", dataUrl );
-		}
-
-		// If we failed to find a page in the DOM, check the URL to see if it
-		// refers to the first page in the application. If it isn't a reference
-		// to the first page and refers to non-existent embedded page, error out.
-		if ( page.length === 0 ) {
-			if ( $.mobile.firstPage && path.isFirstPageUrl( fileUrl ) ) {
-				// Check to make sure our cached-first-page is actually
-				// in the DOM. Some user deployed apps are pruning the first
-				// page from the DOM for various reasons, we check for this
-				// case here because we don't want a first-page with an id
-				// falling through to the non-existent embedded page error
-				// case. If the first-page is not in the DOM, then we let
-				// things fall through to the ajax loading code below so
-				// that it gets reloaded.
-				if ( $.mobile.firstPage.parent().length ) {
-					page = $( $.mobile.firstPage );
-				}
-			} else if ( path.isEmbeddedPage( fileUrl )  ) {
-				deferred.reject( absUrl, options );
-				return deferred.promise();
-			}
-		}
-
-		// If the page we are interested in is already in the DOM,
-		// and the caller did not indicate that we should force a
-		// reload of the file, we are done. Otherwise, track the
-		// existing page as a duplicated.
-		if ( page.length ) {
-			if ( !settings.reloadPage ) {
-				enhancePage( page, settings.role );
-				deferred.resolve( absUrl, options, page );
-				return deferred.promise();
-			}
-			dupCachedPage = page;
-		}
-
-		var mpc = settings.pageContainer,
-			pblEvent = new $.Event( "pagebeforeload" ),
-			triggerData = { url: url, absUrl: absUrl, dataUrl: dataUrl, deferred: deferred, options: settings };
-
-		// Let listeners know we're about to load a page.
-		mpc.trigger( pblEvent, triggerData );
-
-		// If the default behavior is prevented, stop here!
-		if ( pblEvent.isDefaultPrevented() ) {
-			return deferred.promise();
-		}
-
-		if ( settings.showLoadMsg ) {
-
-			// This configurable timeout allows cached pages a brief delay to load without showing a message
-			var loadMsgDelay = setTimeout(function() {
-					$.mobile.showPageLoadingMsg();
-				}, settings.loadMsgDelay ),
-
-				// Shared logic for clearing timeout and removing message.
-				hideMsg = function() {
-
-					// Stop message show timer
-					clearTimeout( loadMsgDelay );
-
-					// Hide loading message
-					$.mobile.hidePageLoadingMsg();
-				};
-		}
-
-		// Reset base to the default document base.
-		if ( base ) {
-			base.reset();
-		}
-
-		if ( !( $.mobile.allowCrossDomainPages || path.isSameDomain( documentUrl, absUrl ) ) ) {
-			deferred.reject( absUrl, options );
-		} else {
-			// Load the new page.
-			$.ajax({
-				url: fileUrl,
-				type: settings.type,
-				data: settings.data,
-				dataType: "html",
-				success: function( html, textStatus, xhr ) {
-					//pre-parse html to check for a data-url,
-					//use it as the new fileUrl, base path, etc
-					var all = $( "<div></div>" ),
-
-						//page title regexp
-						newPageTitle = html.match( /<title[^>]*>([^<]*)/ ) && RegExp.$1,
-
-						// TODO handle dialogs again
-						pageElemRegex = new RegExp( "(<[^>]+\\bdata-" + $.mobile.ns + "role=[\"']?page[\"']?[^>]*>)" ),
-						dataUrlRegex = new RegExp( "\\bdata-" + $.mobile.ns + "url=[\"']?([^\"'>]*)[\"']?" );
-
-
-					// data-url must be provided for the base tag so resource requests can be directed to the
-					// correct url. loading into a temprorary element makes these requests immediately
-					if ( pageElemRegex.test( html ) &&
-							RegExp.$1 &&
-							dataUrlRegex.test( RegExp.$1 ) &&
-							RegExp.$1 ) {
-						url = fileUrl = path.getFilePath( $( "<div>" + RegExp.$1 + "</div>" ).text() );
-					}
-
-					if ( base ) {
-						base.set( fileUrl );
-					}
-
-					//workaround to allow scripts to execute when included in page divs
-					all.get( 0 ).innerHTML = html;
-					page = all.find( ":jqmData(role='page'), :jqmData(role='dialog')" ).first();
-
-					//if page elem couldn't be found, create one and insert the body element's contents
-					if ( !page.length ) {
-						page = $( "<div data-" + $.mobile.ns + "role='page'>" + ( html.split( /<\/?body[^>]*>/gmi )[1] || "" ) + "</div>" );
-					}
-
-					if ( newPageTitle && !page.jqmData( "title" ) ) {
-						if ( ~newPageTitle.indexOf( "&" ) ) {
-							newPageTitle = $( "<div>" + newPageTitle + "</div>" ).text();
-						}
-						page.jqmData( "title", newPageTitle );
-					}
-
-					//rewrite src and href attrs to use a base url
-					if ( !$.support.dynamicBaseTag ) {
-						var newPath = path.get( fileUrl );
-						page.find( "[src], link[href], a[rel='external'], :jqmData(ajax='false'), a[target]" ).each(function() {
-							var thisAttr = $( this ).is( '[href]' ) ? 'href' :
-									$( this ).is( '[src]' ) ? 'src' : 'action',
-								thisUrl = $( this ).attr( thisAttr );
-
-							// XXX_jblas: We need to fix this so that it removes the document
-							//            base URL, and then prepends with the new page URL.
-							//if full path exists and is same, chop it - helps IE out
-							thisUrl = thisUrl.replace( location.protocol + '//' + location.host + location.pathname, '' );
-
-							if ( !/^(\w+:|#|\/)/.test( thisUrl ) ) {
-								$( this ).attr( thisAttr, newPath + thisUrl );
-							}
-						});
-					}
-
-					//append to page and enhance
-					// TODO taging a page with external to make sure that embedded pages aren't removed
-					//      by the various page handling code is bad. Having page handling code in many
-					//      places is bad. Solutions post 1.0
-					page
-						.attr( "data-" + $.mobile.ns + "url", path.convertUrlToDataUrl( fileUrl ) )
-						.attr( "data-" + $.mobile.ns + "external-page", true )
-						.appendTo( settings.pageContainer );
-
-					// wait for page creation to leverage options defined on widget
-					page.one( 'pagecreate', $.mobile._bindPageRemove );
-
-					enhancePage( page, settings.role );
-
-					// Enhancing the page may result in new dialogs/sub pages being inserted
-					// into the DOM. If the original absUrl refers to a sub-page, that is the
-					// real page we are interested in.
-					if ( absUrl.indexOf( "&" + $.mobile.subPageUrlKey ) > -1 ) {
-						page = settings.pageContainer.children( "[data-" + $.mobile.ns +"url='" + dataUrl + "']" );
-					}
-
-					// Remove loading message.
-					if ( settings.showLoadMsg ) {
-						hideMsg();
-					}
-
-					// Add the page reference and xhr to our triggerData.
-					triggerData.xhr = xhr;
-					triggerData.textStatus = textStatus;
-					triggerData.page = page;
-
-					// Let listeners know the page loaded successfully.
-					settings.pageContainer.trigger( "pageload", triggerData );
-
-					deferred.resolve( absUrl, options, page, dupCachedPage );
-				},
-				error: function( xhr, textStatus, errorThrown ) {
-					//set base back to current path
-					if ( base ) {
-						base.set( path.get() );
-					}
-
-					// Add error info to our triggerData.
-					triggerData.xhr = xhr;
-					triggerData.textStatus = textStatus;
-					triggerData.errorThrown = errorThrown;
-
-					var plfEvent = new $.Event( "pageloadfailed" );
-
-					// Let listeners know the page load failed.
-					settings.pageContainer.trigger( plfEvent, triggerData );
-
-					// If the default behavior is prevented, stop here!
-					// Note that it is the responsibility of the listener/handler
-					// that called preventDefault(), to resolve/reject the
-					// deferred object within the triggerData.
-					if ( plfEvent.isDefaultPrevented() ) {
-						return;
-					}
-
-					// Remove loading message.
-					if ( settings.showLoadMsg ) {
-
-						// Remove loading message.
-						hideMsg();
-
-						// show error message
-						$.mobile.showPageLoadingMsg( $.mobile.pageLoadErrorMessageTheme, $.mobile.pageLoadErrorMessage, true );
-
-						// hide after delay
-						setTimeout( $.mobile.hidePageLoadingMsg, 1500 );
-					}
-
-					deferred.reject( absUrl, options );
-				}
-			});
-		}
-
-		return deferred.promise();
-	};
-
-	$.mobile.loadPage.defaults = {
-		type: "get",
-		data: undefined,
-		reloadPage: false,
-		role: undefined, // By default we rely on the role defined by the @data-role attribute.
-		showLoadMsg: false,
-		pageContainer: undefined,
-		loadMsgDelay: 50 // This delay allows loads that pull from browser cache to occur without showing the loading message.
-	};
-
-	// Show a specific page in the page container.
-	$.mobile.changePage = function( toPage, options ) {
-		// If we are in the midst of a transition, queue the current request.
-		// We'll call changePage() once we're done with the current transition to
-		// service the request.
-		if ( isPageTransitioning ) {
-			pageTransitionQueue.unshift( arguments );
-			return;
-		}
-
-		var settings = $.extend( {}, $.mobile.changePage.defaults, options ), isToPageString;
-
-		// Make sure we have a pageContainer to work with.
-		settings.pageContainer = settings.pageContainer || $.mobile.pageContainer;
-
-		// Make sure we have a fromPage.
-		settings.fromPage = settings.fromPage || $.mobile.activePage;
-
-		isToPageString = (typeof toPage === "string");
-
-		var mpc = settings.pageContainer,
-			pbcEvent = new $.Event( "pagebeforechange" ),
-			triggerData = { toPage: toPage, options: settings };
-
-		// NOTE: preserve the original target as the dataUrl value will be simplified
-		//       eg, removing ui-state, and removing query params from the hash
-		//       this is so that users who want to use query params have access to them
-		//       in the event bindings for the page life cycle See issue #5085
-		if ( isToPageString ) {
-			// if the toPage is a string simply convert it
-			triggerData.absUrl = path.makeUrlAbsolute( toPage, findBaseWithDefault() );
-		} else {
-			// if the toPage is a jQuery object grab the absolute url stored
-			// in the loadPage callback where it exists
-			triggerData.absUrl = toPage.data( 'absUrl' );
-		}
-
-		// Let listeners know we're about to change the current page.
-		mpc.trigger( pbcEvent, triggerData );
-
-		// If the default behavior is prevented, stop here!
-		if ( pbcEvent.isDefaultPrevented() ) {
-			return;
-		}
-
-		// We allow "pagebeforechange" observers to modify the toPage in the trigger
-		// data to allow for redirects. Make sure our toPage is updated.
-		//
-		// We also need to re-evaluate whether it is a string, because an object can
-		// also be replaced by a string
-
-		toPage = triggerData.toPage;
-		isToPageString = (typeof toPage === "string");
-
-		// Set the isPageTransitioning flag to prevent any requests from
-		// entering this method while we are in the midst of loading a page
-		// or transitioning.
-		isPageTransitioning = true;
-
-		// If the caller passed us a url, call loadPage()
-		// to make sure it is loaded into the DOM. We'll listen
-		// to the promise object it returns so we know when
-		// it is done loading or if an error ocurred.
-		if ( isToPageString ) {
-			// preserve the original target as the dataUrl value will be simplified
-			// eg, removing ui-state, and removing query params from the hash
-			// this is so that users who want to use query params have access to them
-			// in the event bindings for the page life cycle See issue #5085
-			settings.target = toPage;
-
-			$.mobile.loadPage( toPage, settings )
-				.done(function( url, options, newPage, dupCachedPage ) {
-					isPageTransitioning = false;
-					options.duplicateCachedPage = dupCachedPage;
-
-					// store the original absolute url so that it can be provided
-					// to events in the triggerData of the subsequent changePage call
-					newPage.data( 'absUrl', triggerData.absUrl );
-					$.mobile.changePage( newPage, options );
-				})
-				.fail(function( url, options ) {
-					isPageTransitioning = false;
-
-					//clear out the active button state
-					removeActiveLinkClass( true );
-
-					//release transition lock so navigation is free again
-					releasePageTransitionLock();
-					settings.pageContainer.trigger( "pagechangefailed", triggerData );
-				});
-			return;
-		}
-
-		// If we are going to the first-page of the application, we need to make
-		// sure settings.dataUrl is set to the application document url. This allows
-		// us to avoid generating a document url with an id hash in the case where the
-		// first-page of the document has an id attribute specified.
-		if ( toPage[ 0 ] === $.mobile.firstPage[ 0 ] && !settings.dataUrl ) {
-			settings.dataUrl = documentUrl.hrefNoHash;
-		}
-
-		// The caller passed us a real page DOM element. Update our
-		// internal state and then trigger a transition to the page.
-		var fromPage = settings.fromPage,
-			url = ( settings.dataUrl && path.convertUrlToDataUrl( settings.dataUrl ) ) || toPage.jqmData( "url" ),
-			// The pageUrl var is usually the same as url, except when url is obscured as a dialog url. pageUrl always contains the file path
-			pageUrl = url,
-			fileUrl = path.getFilePath( url ),
-			active = urlHistory.getActive(),
-			activeIsInitialPage = urlHistory.activeIndex === 0,
-			historyDir = 0,
-			pageTitle = document.title,
-			isDialog = settings.role === "dialog" || toPage.jqmData( "role" ) === "dialog";
-
-
-		// By default, we prevent changePage requests when the fromPage and toPage
-		// are the same element, but folks that generate content manually/dynamically
-		// and reuse pages want to be able to transition to the same page. To allow
-		// this, they will need to change the default value of allowSamePageTransition
-		// to true, *OR*, pass it in as an option when they manually call changePage().
-		// It should be noted that our default transition animations assume that the
-		// formPage and toPage are different elements, so they may behave unexpectedly.
-		// It is up to the developer that turns on the allowSamePageTransitiona option
-		// to either turn off transition animations, or make sure that an appropriate
-		// animation transition is used.
-		if ( fromPage && fromPage[0] === toPage[0] && !settings.allowSamePageTransition ) {
-			isPageTransitioning = false;
-			mpc.trigger( "pagechange", triggerData );
-
-			// Even if there is no page change to be done, we should keep the urlHistory in sync with the hash changes
-			if ( settings.fromHashChange ) {
-				urlHistory.direct({ url: url });
-			}
-
-			return;
-		}
-
-		// We need to make sure the page we are given has already been enhanced.
-		enhancePage( toPage, settings.role );
-
-		// If the changePage request was sent from a hashChange event, check to see if the
-		// page is already within the urlHistory stack. If so, we'll assume the user hit
-		// the forward/back button and will try to match the transition accordingly.
-		if ( settings.fromHashChange ) {
-			historyDir = options.direction === "back" ? -1 : 1;
-		}
-
-		// Kill the keyboard.
-		// XXX_jblas: We need to stop crawling the entire document to kill focus. Instead,
-		//            we should be tracking focus with a delegate() handler so we already have
-		//            the element in hand at this point.
-		// Wrap this in a try/catch block since IE9 throw "Unspecified error" if document.activeElement
-		// is undefined when we are in an IFrame.
-		try {
-			if ( document.activeElement && document.activeElement.nodeName.toLowerCase() !== 'body' ) {
-				$( document.activeElement ).blur();
-			} else {
-				$( "input:focus, textarea:focus, select:focus" ).blur();
-			}
-		} catch( e ) {}
-
-		// Record whether we are at a place in history where a dialog used to be - if so, do not add a new history entry and do not change the hash either
-		var alreadyThere = false;
-
-		// If we're displaying the page as a dialog, we don't want the url
-		// for the dialog content to be used in the hash. Instead, we want
-		// to append the dialogHashKey to the url of the current page.
-		if ( isDialog && active ) {
-			// on the initial page load active.url is undefined and in that case should
-			// be an empty string. Moving the undefined -> empty string back into
-			// urlHistory.addNew seemed imprudent given undefined better represents
-			// the url state
-
-			// If we are at a place in history that once belonged to a dialog, reuse
-			// this state without adding to urlHistory and without modifying the hash.
-			// However, if a dialog is already displayed at this point, and we're
-			// about to display another dialog, then we must add another hash and
-			// history entry on top so that one may navigate back to the original dialog
-			if ( active.url &&
-				active.url.indexOf( dialogHashKey ) > -1 &&
-				$.mobile.activePage &&
-				!$.mobile.activePage.is( ".ui-dialog" ) &&
-				urlHistory.activeIndex > 0 ) {
-				settings.changeHash = false;
-				alreadyThere = true;
-			}
-
-			// Normally, we tack on a dialog hash key, but if this is the location of a stale dialog,
-			// we reuse the URL from the entry
-			url = ( active.url || "" );
-
-			// account for absolute urls instead of just relative urls use as hashes
-			if( !alreadyThere && url.indexOf("#") > -1 ) {
-				url += dialogHashKey;
-			} else {
-				url += "#" + dialogHashKey;
-			}
-
-			// tack on another dialogHashKey if this is the same as the initial hash
-			// this makes sure that a history entry is created for this dialog
-			if ( urlHistory.activeIndex === 0 && url === urlHistory.initialDst ) {
-				url += dialogHashKey;
-			}
-		}
-
-		// if title element wasn't found, try the page div data attr too
-		// If this is a deep-link or a reload ( active === undefined ) then just use pageTitle
-		var newPageTitle = ( !active )? pageTitle : toPage.jqmData( "title" ) || toPage.children( ":jqmData(role='header')" ).find( ".ui-title" ).getEncodedText();
-		if ( !!newPageTitle && pageTitle === document.title ) {
-			pageTitle = newPageTitle;
-		}
-		if ( !toPage.jqmData( "title" ) ) {
-			toPage.jqmData( "title", pageTitle );
-		}
-
-		// Make sure we have a transition defined.
-		settings.transition = settings.transition ||
-			( ( historyDir && !activeIsInitialPage ) ? active.transition : undefined ) ||
-			( isDialog ? $.mobile.defaultDialogTransition : $.mobile.defaultPageTransition );
-
-		//add page to history stack if it's not back or forward
-		if ( !historyDir && alreadyThere ) {
-			urlHistory.getActive().pageUrl = pageUrl;
-		}
-
-		// Set the location hash.
-		if ( url && !settings.fromHashChange ) {
-			var params;
-
-			// rebuilding the hash here since we loose it earlier on
-			// TODO preserve the originally passed in path
-			if( !path.isPath( url ) && url.indexOf( "#" ) < 0 ) {
-				url = "#" + url;
-			}
-
-			// TODO the property names here are just silly
-			params = {
-				transition: settings.transition,
-				title: pageTitle,
-				pageUrl: pageUrl,
-				role: settings.role
-			};
-
-			if ( settings.changeHash !== false && $.mobile.hashListeningEnabled ) {
-				$.mobile.navigate( url, params, true);
-			} else if ( toPage[ 0 ] !== $.mobile.firstPage[ 0 ] ) {
-				$.mobile.navigate.history.add( url, params );
-			}
-		}
-
-		//set page title
-		document.title = pageTitle;
-
-		//set "toPage" as activePage
-		$.mobile.activePage = toPage;
-
-		// If we're navigating back in the URL history, set reverse accordingly.
-		settings.reverse = settings.reverse || historyDir < 0;
-
-		transitionPages( toPage, fromPage, settings.transition, settings.reverse )
-			.done(function( name, reverse, $to, $from, alreadyFocused ) {
-				removeActiveLinkClass();
-
-				//if there's a duplicateCachedPage, remove it from the DOM now that it's hidden
-				if ( settings.duplicateCachedPage ) {
-					settings.duplicateCachedPage.remove();
-				}
-
-				// Send focus to the newly shown page. Moved from promise .done binding in transitionPages
-				// itself to avoid ie bug that reports offsetWidth as > 0 (core check for visibility)
-				// despite visibility: hidden addresses issue #2965
-				// https://github.com/jquery/jquery-mobile/issues/2965
-				if ( !alreadyFocused ) {
-					$.mobile.focusPage( toPage );
-				}
-
-				releasePageTransitionLock();
-				mpc.trigger( "pagechange", triggerData );
-			});
-	};
-
-	$.mobile.changePage.defaults = {
-		transition: undefined,
-		reverse: false,
-		changeHash: true,
-		fromHashChange: false,
-		role: undefined, // By default we rely on the role defined by the @data-role attribute.
-		duplicateCachedPage: undefined,
-		pageContainer: undefined,
-		showLoadMsg: true, //loading message shows by default when pages are being fetched during changePage
-		dataUrl: undefined,
-		fromPage: undefined,
-		allowSamePageTransition: false
-	};
-
-/* Event Bindings - hashchange, submit, and click */
-	function findClosestLink( ele )
-	{
-		while ( ele ) {
-			// Look for the closest element with a nodeName of "a".
-			// Note that we are checking if we have a valid nodeName
-			// before attempting to access it. This is because the
-			// node we get called with could have originated from within
-			// an embedded SVG document where some symbol instance elements
-			// don't have nodeName defined on them, or strings are of type
-			// SVGAnimatedString.
-			if ( ( typeof ele.nodeName === "string" ) && ele.nodeName.toLowerCase() === "a" ) {
-				break;
-			}
-			ele = ele.parentNode;
-		}
-		return ele;
-	}
-
-	// The base URL for any given element depends on the page it resides in.
-	function getClosestBaseUrl( ele )
-	{
-		// Find the closest page and extract out its url.
-		var url = $( ele ).closest( ".ui-page" ).jqmData( "url" ),
-			base = documentBase.hrefNoHash;
-
-		if ( !url || !path.isPath( url ) ) {
-			url = base;
-		}
-
-		return path.makeUrlAbsolute( url, base);
-	}
-
-	//The following event bindings should be bound after mobileinit has been triggered
-	//the following deferred is resolved in the init file
-	$.mobile.navreadyDeferred = $.Deferred();
-	$.mobile._registerInternalEvents = function() {
-		var getAjaxFormData = function( $form, calculateOnly ) {
-			var type, target, url, ret = true, formData, vclickedName;
-			if ( !$.mobile.ajaxEnabled ||
-					// test that the form is, itself, ajax false
-					$form.is( ":jqmData(ajax='false')" ) ||
-					// test that $.mobile.ignoreContentEnabled is set and
-					// the form or one of it's parents is ajax=false
-					!$form.jqmHijackable().length ) {
-				return false;
-			}
-
-			target = $form.attr( "target" );
-			url = $form.attr( "action" );
-
-			// If no action is specified, browsers default to using the
-			// URL of the document containing the form. Since we dynamically
-			// pull in pages from external documents, the form should submit
-			// to the URL for the source document of the page containing
-			// the form.
-			if ( !url ) {
-				// Get the @data-url for the page containing the form.
-				url = getClosestBaseUrl( $form );
-				if ( url === documentBase.hrefNoHash ) {
-					// The url we got back matches the document base,
-					// which means the page must be an internal/embedded page,
-					// so default to using the actual document url as a browser
-					// would.
-					url = documentUrl.hrefNoSearch;
-				}
-			}
-
-			url = path.makeUrlAbsolute(  url, getClosestBaseUrl( $form ) );
-
-			if ( ( path.isExternal( url ) && !path.isPermittedCrossDomainRequest( documentUrl, url ) ) || target ) {
-				return false;
-			}
-
-			if ( !calculateOnly ) {
-				type = $form.attr( "method" );
-				formData = $form.serializeArray();
-
-				if ( $lastVClicked && $lastVClicked[ 0 ].form === $form[ 0 ] ) {
-					vclickedName = $lastVClicked.attr( "name" );
-					if ( vclickedName ) {
-						// Make sure the last clicked element is included in the form
-						$.each( formData, function( key, value ) {
-							if ( value.name === vclickedName ) {
-								// Unset vclickedName - we've found it in the serialized data already
-								vclickedName = "";
-								return false;
-							}
-						});
-						if ( vclickedName ) {
-							formData.push( { name: vclickedName, value: $lastVClicked.attr( "value" ) } );
-						}
-					}
-				}
-
-				ret = {
-					url: url,
-					options: {
-						type:		type && type.length && type.toLowerCase() || "get",
-						data:		$.param( formData ),
-						transition:	$form.jqmData( "transition" ),
-						reverse:	$form.jqmData( "direction" ) === "reverse",
-						reloadPage:	true
-					}
-				};
-			}
-
-			return ret;
-		};
-
-		//bind to form submit events, handle with Ajax
-		$.mobile.document.delegate( "form", "submit", function( event ) {
-			var formData = getAjaxFormData( $( this ) );
-
-			if ( formData ) {
-				$.mobile.changePage( formData.url, formData.options );
-				event.preventDefault();
-			}
-		});
-
-		//add active state on vclick
-		$.mobile.document.bind( "vclick", function( event ) {
-			var $btn, btnEls, target = event.target, needClosest = false;
-			// if this isn't a left click we don't care. Its important to note
-			// that when the virtual event is generated it will create the which attr
-			if ( event.which > 1 || !$.mobile.linkBindingEnabled ) {
-				return;
-			}
-
-			// Record that this element was clicked, in case we need it for correct
-			// form submission during the "submit" handler above
-			$lastVClicked = $( target );
-
-			// Try to find a target element to which the active class will be applied
-			if ( $.data( target, "mobile-button" ) ) {
-				// If the form will not be submitted via AJAX, do not add active class
-				if ( !getAjaxFormData( $( target ).closest( "form" ), true ) ) {
-					return;
-				}
-				// We will apply the active state to this button widget - the parent
-				// of the input that was clicked will have the associated data
-				if ( target.parentNode ) {
-					target = target.parentNode;
-				}
-			} else {
-				target = findClosestLink( target );
-				if ( !( target && path.parseUrl( target.getAttribute( "href" ) || "#" ).hash !== "#" ) ) {
-					return;
-				}
-
-				// TODO teach $.mobile.hijackable to operate on raw dom elements so the
-				// link wrapping can be avoided
-				if ( !$( target ).jqmHijackable().length ) {
-					return;
-				}
-			}
-
-			// Avoid calling .closest by using the data set during .buttonMarkup()
-			// List items have the button data in the parent of the element clicked
-			if ( !!~target.className.indexOf( "ui-link-inherit" ) ) {
-				if ( target.parentNode ) {
-					btnEls = $.data( target.parentNode, "buttonElements" );
-				}
-			// Otherwise, look for the data on the target itself
-			} else {
-				btnEls = $.data( target, "buttonElements" );
-			}
-			// If found, grab the button's outer element
-			if ( btnEls ) {
-				target = btnEls.outer;
-			} else {
-				needClosest = true;
-			}
-
-			$btn = $( target );
-			// If the outer element wasn't found by the our heuristics, use .closest()
-			if ( needClosest ) {
-				$btn = $btn.closest( ".ui-btn" );
-			}
-
-			if ( $btn.length > 0 && !$btn.hasClass( "ui-disabled" ) ) {
-				removeActiveLinkClass( true );
-				$activeClickedLink = $btn;
-				$activeClickedLink.addClass( $.mobile.activeBtnClass );
-			}
-		});
-
-		// click routing - direct to HTTP or Ajax, accordingly
-		$.mobile.document.bind( "click", function( event ) {
-			if ( !$.mobile.linkBindingEnabled || event.isDefaultPrevented() ) {
-				return;
-			}
-
-			var link = findClosestLink( event.target ), $link = $( link ), httpCleanup;
-
-			// If there is no link associated with the click or its not a left
-			// click we want to ignore the click
-			// TODO teach $.mobile.hijackable to operate on raw dom elements so the link wrapping
-			// can be avoided
-			if ( !link || event.which > 1 || !$link.jqmHijackable().length ) {
-				return;
-			}
-
-			//remove active link class if external (then it won't be there if you come back)
-			httpCleanup = function() {
-				window.setTimeout(function() { removeActiveLinkClass( true ); }, 200 );
-			};
-
-			//if there's a data-rel=back attr, go back in history
-			if ( $link.is( ":jqmData(rel='back')" ) ) {
-				$.mobile.back();
-				return false;
-			}
-
-			var baseUrl = getClosestBaseUrl( $link ),
-
-				//get href, if defined, otherwise default to empty hash
-				href = path.makeUrlAbsolute( $link.attr( "href" ) || "#", baseUrl );
-
-			//if ajax is disabled, exit early
-			if ( !$.mobile.ajaxEnabled && !path.isEmbeddedPage( href ) ) {
-				httpCleanup();
-				//use default click handling
-				return;
-			}
-
-			// XXX_jblas: Ideally links to application pages should be specified as
-			//            an url to the application document with a hash that is either
-			//            the site relative path or id to the page. But some of the
-			//            internal code that dynamically generates sub-pages for nested
-			//            lists and select dialogs, just write a hash in the link they
-			//            create. This means the actual URL path is based on whatever
-			//            the current value of the base tag is at the time this code
-			//            is called. For now we are just assuming that any url with a
-			//            hash in it is an application page reference.
-			if ( href.search( "#" ) !== -1 ) {
-				href = href.replace( /[^#]*#/, "" );
-				if ( !href ) {
-					//link was an empty hash meant purely
-					//for interaction, so we ignore it.
-					event.preventDefault();
-					return;
-				} else if ( path.isPath( href ) ) {
-					//we have apath so make it the href we want to load.
-					href = path.makeUrlAbsolute( href, baseUrl );
-				} else {
-					//we have a simple id so use the documentUrl as its base.
-					href = path.makeUrlAbsolute( "#" + href, documentUrl.hrefNoHash );
-				}
-			}
-
-				// Should we handle this link, or let the browser deal with it?
-			var useDefaultUrlHandling = $link.is( "[rel='external']" ) || $link.is( ":jqmData(ajax='false')" ) || $link.is( "[target]" ),
-
-				// Some embedded browsers, like the web view in Phone Gap, allow cross-domain XHR
-				// requests if the document doing the request was loaded via the file:// protocol.
-				// This is usually to allow the application to "phone home" and fetch app specific
-				// data. We normally let the browser handle external/cross-domain urls, but if the
-				// allowCrossDomainPages option is true, we will allow cross-domain http/https
-				// requests to go through our page loading logic.
-
-				//check for protocol or rel and its not an embedded page
-				//TODO overlap in logic from isExternal, rel=external check should be
-				//     moved into more comprehensive isExternalLink
-				isExternal = useDefaultUrlHandling || ( path.isExternal( href ) && !path.isPermittedCrossDomainRequest( documentUrl, href ) );
-
-			if ( isExternal ) {
-				httpCleanup();
-				//use default click handling
-				return;
-			}
-
-			//use ajax
-			var transition = $link.jqmData( "transition" ),
-				reverse = $link.jqmData( "direction" ) === "reverse" ||
-							// deprecated - remove by 1.0
-							$link.jqmData( "back" ),
-
-				//this may need to be more specific as we use data-rel more
-				role = $link.attr( "data-" + $.mobile.ns + "rel" ) || undefined;
-
-			$.mobile.changePage( href, { transition: transition, reverse: reverse, role: role, link: $link } );
-			event.preventDefault();
-		});
-
-		//prefetch pages when anchors with data-prefetch are encountered
-		$.mobile.document.delegate( ".ui-page", "pageshow.prefetch", function() {
-			var urls = [];
-			$( this ).find( "a:jqmData(prefetch)" ).each(function() {
-				var $link = $( this ),
-					url = $link.attr( "href" );
-
-				if ( url && $.inArray( url, urls ) === -1 ) {
-					urls.push( url );
-
-					$.mobile.loadPage( url, { role: $link.attr( "data-" + $.mobile.ns + "rel" ) } );
-				}
-			});
-		});
-
-		$.mobile._handleHashChange = function( url, data ) {
-			//find first page via hash
-			var to = path.stripHash(url),
-				//transition is false if it's the first page, undefined otherwise (and may be overridden by default)
-				transition = $.mobile.urlHistory.stack.length === 0 ? "none" : undefined,
-
-				// default options for the changPage calls made after examining the current state
-				// of the page and the hash, NOTE that the transition is derived from the previous
-				// history entry
-				changePageOptions = {
-					changeHash: false,
-					fromHashChange: true,
-					reverse: data.direction === "back"
-				};
-
-			$.extend( changePageOptions, data, {
-				transition: (urlHistory.getLast() || {}).transition || transition
-			});
-
-			// special case for dialogs
-			if ( urlHistory.activeIndex > 0 && to.indexOf( dialogHashKey ) > -1 && urlHistory.initialDst !== to ) {
-
-				// If current active page is not a dialog skip the dialog and continue
-				// in the same direction
-				if ( $.mobile.activePage && !$.mobile.activePage.is( ".ui-dialog" ) ) {
-					//determine if we're heading forward or backward and continue accordingly past
-					//the current dialog
-					if( data.direction === "back" ) {
-						$.mobile.back();
-					} else {
-						window.history.forward();
-					}
-
-					// prevent changePage call
-					return;
-				} else {
-					// if the current active page is a dialog and we're navigating
-					// to a dialog use the dialog objected saved in the stack
-					to = data.pageUrl;
-					var active = $.mobile.urlHistory.getActive();
-
-					// make sure to set the role, transition and reversal
-					// as most of this is lost by the domCache cleaning
-					$.extend( changePageOptions, {
-						role: active.role,
-						transition: active.transition,
-						reverse: data.direction === "back"
-					});
-				}
-			}
-
-			//if to is defined, load it
-			if ( to ) {
-				// At this point, 'to' can be one of 3 things, a cached page element from
-				// a history stack entry, an id, or site-relative/absolute URL. If 'to' is
-				// an id, we need to resolve it against the documentBase, not the location.href,
-				// since the hashchange could've been the result of a forward/backward navigation
-				// that crosses from an external page/dialog to an internal page/dialog.
-				to = !path.isPath( to ) ? ( path.makeUrlAbsolute( '#' + to, documentBase ) ) : to;
-
-				// If we're about to go to an initial URL that contains a reference to a non-existent
-				// internal page, go to the first page instead. We know that the initial hash refers to a
-				// non-existent page, because the initial hash did not end up in the initial urlHistory entry
-				if ( to === path.makeUrlAbsolute( '#' + urlHistory.initialDst, documentBase ) &&
-					urlHistory.stack.length && urlHistory.stack[0].url !== urlHistory.initialDst.replace( dialogHashKey, "" ) ) {
-					to = $.mobile.firstPage;
-				}
-
-				$.mobile.changePage( to, changePageOptions );
-			}	else {
-
-				//there's no hash, go to the first page in the dom
-				$.mobile.changePage( $.mobile.firstPage, changePageOptions );
-			}
-		};
-
-		// TODO roll the logic here into the handleHashChange method
-		$window.bind( "navigate", function( e, data ) {
-			var url = $.event.special.navigate.originalEventName.indexOf( "hashchange" ) > -1 ? data.state.hash : data.state.url;
-
-			if( !url ) {
-				url = $.mobile.path.parseLocation().hash;
-			}
-
-			if( !url || url === "#" || url.indexOf( "#" + $.mobile.path.uiStateKey ) === 0 ){
-				url = location.href;
-			}
-
-			$.mobile._handleHashChange( url, data.state );
-		});
-
-		//set page min-heights to be device specific
-		$.mobile.document.bind( "pageshow", $.mobile.resetActivePageHeight );
-		$.mobile.window.bind( "throttledresize", $.mobile.resetActivePageHeight );
-
-	};//navreadyDeferred done callback
-
-	$( function() { domreadyDeferred.resolve(); } );
-
-	$.when( domreadyDeferred, $.mobile.navreadyDeferred ).done( function() { $.mobile._registerInternalEvents(); } );
-})( jQuery );
-
-/*
-* fallback transition for flip in non-3D supporting browsers (which tend to handle complex transitions poorly in general
-*/
-
-(function( $, window, undefined ) {
-
-$.mobile.transitionFallbacks.flip = "fade";
-
-})( jQuery, this );
-/*
-* fallback transition for flow in non-3D supporting browsers (which tend to handle complex transitions poorly in general
-*/
-
-(function( $, window, undefined ) {
-
-$.mobile.transitionFallbacks.flow = "fade";
-
-})( jQuery, this );
-/*
-* fallback transition for pop in non-3D supporting browsers (which tend to handle complex transitions poorly in general
-*/
-
-(function( $, window, undefined ) {
-
-$.mobile.transitionFallbacks.pop = "fade";
-
-})( jQuery, this );
-/*
-* fallback transition for slide in non-3D supporting browsers (which tend to handle complex transitions poorly in general
-*/
-
-(function( $, window, undefined ) {
-
-// Use the simultaneous transitions handler for slide transitions
-$.mobile.transitionHandlers.slide = $.mobile.transitionHandlers.simultaneous;
-
-// Set the slide transitions's fallback to "fade"
-$.mobile.transitionFallbacks.slide = "fade";
-
-})( jQuery, this );
-/*
-* fallback transition for slidedown in non-3D supporting browsers (which tend to handle complex transitions poorly in general
-*/
-
-(function( $, window, undefined ) {
-
-$.mobile.transitionFallbacks.slidedown = "fade";
-
-})( jQuery, this );
-/*
-* fallback transition for slidefade in non-3D supporting browsers (which tend to handle complex transitions poorly in general
-*/
-
-(function( $, window, undefined ) {
-
-// Set the slide transitions's fallback to "fade"
-$.mobile.transitionFallbacks.slidefade = "fade";
-
-})( jQuery, this );
-/*
-* fallback transition for slideup in non-3D supporting browsers (which tend to handle complex transitions poorly in general
-*/
-
-(function( $, window, undefined ) {
-
-$.mobile.transitionFallbacks.slideup = "fade";
-
-})( jQuery, this );
-/*
-* fallback transition for turn in non-3D supporting browsers (which tend to handle complex transitions poorly in general
-*/
-
-(function( $, window, undefined ) {
-
-$.mobile.transitionFallbacks.turn = "fade";
-
-})( jQuery, this );
-
-(function( $, undefined ) {
-
-$.mobile.page.prototype.options.degradeInputs = {
-	color: false,
-	date: false,
-	datetime: false,
-	"datetime-local": false,
-	email: false,
-	month: false,
-	number: false,
-	range: "number",
-	search: "text",
-	tel: false,
-	time: false,
-	url: false,
-	week: false
-};
-
-
-//auto self-init widgets
-$.mobile.document.bind( "pagecreate create", function( e ) {
-
-	var page = $.mobile.closestPageData( $( e.target ) ), options;
-
-	if ( !page ) {
-		return;
-	}
-
-	options = page.options;
-
-	// degrade inputs to avoid poorly implemented native functionality
-	$( e.target ).find( "input" ).not( page.keepNativeSelector() ).each(function() {
-		var $this = $( this ),
-			type = this.getAttribute( "type" ),
-			optType = options.degradeInputs[ type ] || "text";
-
-		if ( options.degradeInputs[ type ] ) {
-			var html = $( "<div>" ).html( $this.clone() ).html(),
-				// In IE browsers, the type sometimes doesn't exist in the cloned markup, so we replace the closing tag instead
-				hasType = html.indexOf( " type=" ) > -1,
-				findstr = hasType ? /\s+type=["']?\w+['"]?/ : /\/?>/,
-				repstr = " type=\"" + optType + "\" data-" + $.mobile.ns + "type=\"" + type + "\"" + ( hasType ? "" : ">" );
-
-			$this.replaceWith( html.replace( findstr, repstr ) );
-		}
-	});
-
-});
-
-})( jQuery );
-
-(function( $, window, undefined ) {
-
-$.widget( "mobile.dialog", $.mobile.widget, {
-	options: {
-		closeBtn: "left",
-		closeBtnText: "Close",
-		overlayTheme: "a",
-		corners: true,
-		initSelector: ":jqmData(role='dialog')"
-	},
-
-	// Override the theme set by the page plugin on pageshow
-	_handlePageBeforeShow: function() {
-		this._isCloseable = true;
-		if ( this.options.overlayTheme ) {
-			this.element
-				.page( "removeContainerBackground" )
-				.page( "setContainerBackground", this.options.overlayTheme );
-		}
-	},
-
-	_create: function() {
-		var self = this,
-			$el = this.element,
-			cornerClass = !!this.options.corners ? " ui-corner-all" : "",
-			dialogWrap = $( "<div/>", {
-					"role" : "dialog",
-					"class" : "ui-dialog-contain ui-overlay-shadow" + cornerClass
-				});
-
-		$el.addClass( "ui-dialog ui-overlay-" + this.options.overlayTheme );
-
-		// Class the markup for dialog styling
-		// Set aria role
-		$el.wrapInner( dialogWrap );
-
-		/* bind events
-			- clicks and submits should use the closing transition that the dialog opened with
-				unless a data-transition is specified on the link/form
-			- if the click was on the close button, or the link has a data-rel="back" it'll go back in history naturally
-		*/
-		$el.bind( "vclick submit", function( event ) {
-			var $target = $( event.target ).closest( event.type === "vclick" ? "a" : "form" ),
-				active;
-
-			if ( $target.length && !$target.jqmData( "transition" ) ) {
-
-				active = $.mobile.urlHistory.getActive() || {};
-
-				$target.attr( "data-" + $.mobile.ns + "transition", ( active.transition || $.mobile.defaultDialogTransition ) )
-					.attr( "data-" + $.mobile.ns + "direction", "reverse" );
-			}
-		});
-
-		this._on( $el, {
-			pagebeforeshow: "_handlePageBeforeShow"
-		});
-
-		$.extend( this, {
-			_createComplete: false
-		});
-
-		this._setCloseBtn( this.options.closeBtn );
-	},
-
-	_setCloseBtn: function( value ) {
-		var self = this, btn, location;
-
-		if ( this._headerCloseButton ) {
-			this._headerCloseButton.remove();
-			this._headerCloseButton = null;
-		}
-		if ( value !== "none" ) {
-			// Sanitize value
-			location = ( value === "left" ? "left" : "right" );
-			btn = $( "<a href='#' class='ui-btn-" + location + "' data-" + $.mobile.ns + "icon='delete' data-" + $.mobile.ns + "iconpos='notext'>"+ this.options.closeBtnText + "</a>" );
-			this.element.children().find( ":jqmData(role='header')" ).first().prepend( btn );
-			if ( this._createComplete && $.fn.buttonMarkup ) {
-				btn.buttonMarkup();
-			}
-			this._createComplete = true;
-
-			// this must be an anonymous function so that select menu dialogs can replace
-			// the close method. This is a change from previously just defining data-rel=back
-			// on the button and letting nav handle it
-			//
-			// Use click rather than vclick in order to prevent the possibility of unintentionally
-			// reopening the dialog if the dialog opening item was directly under the close button.
-			btn.bind( "click", function() {
-				self.close();
-			});
-
-			this._headerCloseButton = btn;
-		}
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "closeBtn" ) {
-			this._setCloseBtn( value );
-			this._super( key, value );
-			this.element.attr( "data-" + ( $.mobile.ns || "" ) + "close-btn", value );
-		}
-	},
-
-	// Close method goes back in history
-	close: function() {
-		var idx, dst, hist = $.mobile.navigate.history;
-
-		if ( this._isCloseable ) {
-			this._isCloseable = false;
-			// If the hash listening is enabled and there is at least one preceding history
-			// entry it's ok to go back. Initial pages with the dialog hash state are an example
-			// where the stack check is necessary
-			if ( $.mobile.hashListeningEnabled && hist.activeIndex > 0 ) {
-				$.mobile.back();
-			} else {
-				idx = Math.max( 0, hist.activeIndex - 1 );
-				dst = hist.stack[ idx ].pageUrl || hist.stack[ idx ].url;
-				hist.previousIndex = hist.activeIndex;
-				hist.activeIndex = idx;
-				if ( !$.mobile.path.isPath( dst ) ) {
-					dst = $.mobile.path.makeUrlAbsolute( "#" + dst );
-				}
-
-				$.mobile.changePage( dst, { direction: "back", changeHash: false, fromHashChange: true } );
-			}
-		}
-	}
-});
-
-//auto self-init widgets
-$.mobile.document.delegate( $.mobile.dialog.prototype.options.initSelector, "pagecreate", function() {
-	$.mobile.dialog.prototype.enhance( this );
-});
-
-})( jQuery, this );
-
-(function( $, undefined ) {
-
-$.mobile.page.prototype.options.backBtnText  = "Back";
-$.mobile.page.prototype.options.addBackBtn   = false;
-$.mobile.page.prototype.options.backBtnTheme = null;
-$.mobile.page.prototype.options.headerTheme  = "a";
-$.mobile.page.prototype.options.footerTheme  = "a";
-$.mobile.page.prototype.options.contentTheme = null;
-
-// NOTE bind used to force this binding to run before the buttonMarkup binding
-//      which expects .ui-footer top be applied in its gigantic selector
-// TODO remove the buttonMarkup giant selector and move it to the various modules
-//      on which it depends
-$.mobile.document.bind( "pagecreate", function( e ) {
-	var $page = $( e.target ),
-		o = $page.data( "mobile-page" ).options,
-		pageRole = $page.jqmData( "role" ),
-		pageTheme = o.theme;
-
-	$( ":jqmData(role='header'), :jqmData(role='footer'), :jqmData(role='content')", $page )
-		.jqmEnhanceable()
-		.each(function() {
-
-		var $this = $( this ),
-			role = $this.jqmData( "role" ),
-			theme = $this.jqmData( "theme" ),
-			contentTheme = theme || o.contentTheme || ( pageRole === "dialog" && pageTheme ),
-			$headeranchors,
-			leftbtn,
-			rightbtn,
-			backBtn;
-
-		$this.addClass( "ui-" + role );
-
-		//apply theming and markup modifications to page,header,content,footer
-		if ( role === "header" || role === "footer" ) {
-
-			var thisTheme = theme || ( role === "header" ? o.headerTheme : o.footerTheme ) || pageTheme;
-
-			$this
-				//add theme class
-				.addClass( "ui-bar-" + thisTheme )
-				// Add ARIA role
-				.attr( "role", role === "header" ? "banner" : "contentinfo" );
-
-			if ( role === "header") {
-				// Right,left buttons
-				$headeranchors	= $this.children( "a, button" );
-				leftbtn	= $headeranchors.hasClass( "ui-btn-left" );
-				rightbtn = $headeranchors.hasClass( "ui-btn-right" );
-
-				leftbtn = leftbtn || $headeranchors.eq( 0 ).not( ".ui-btn-right" ).addClass( "ui-btn-left" ).length;
-
-				rightbtn = rightbtn || $headeranchors.eq( 1 ).addClass( "ui-btn-right" ).length;
-			}
-
-			// Auto-add back btn on pages beyond first view
-			if ( o.addBackBtn &&
-				role === "header" &&
-				$( ".ui-page" ).length > 1 &&
-				$page.jqmData( "url" ) !== $.mobile.path.stripHash( location.hash ) &&
-				!leftbtn ) {
-
-				backBtn = $( "<a href='javascript:void(0);' class='ui-btn-left' data-"+ $.mobile.ns +"rel='back' data-"+ $.mobile.ns +"icon='arrow-l'>"+ o.backBtnText +"</a>" )
-					// If theme is provided, override default inheritance
-					.attr( "data-"+ $.mobile.ns +"theme", o.backBtnTheme || thisTheme )
-					.prependTo( $this );
-			}
-
-			// Page title
-			$this.children( "h1, h2, h3, h4, h5, h6" )
-				.addClass( "ui-title" )
-				// Regardless of h element number in src, it becomes h1 for the enhanced page
-				.attr({
-					"role": "heading",
-					"aria-level": "1"
-				});
-
-		} else if ( role === "content" ) {
-			if ( contentTheme ) {
-				$this.addClass( "ui-body-" + ( contentTheme ) );
-			}
-
-			// Add ARIA role
-			$this.attr( "role", "main" );
-		}
-	});
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-$.mobile.behaviors.addFirstLastClasses = {
-	_getVisibles: function( $els, create ) {
-		var visibles;
-
-		if ( create ) {
-			visibles = $els.not( ".ui-screen-hidden" );
-		} else {
-			visibles = $els.filter( ":visible" );
-			if ( visibles.length === 0 ) {
-				visibles = $els.not( ".ui-screen-hidden" );
-			}
-		}
-
-		return visibles;
-	},
-
-	_addFirstLastClasses: function( $els, $visibles, create ) {
-		$els.removeClass( "ui-first-child ui-last-child" );
-		$visibles.eq( 0 ).addClass( "ui-first-child" ).end().last().addClass( "ui-last-child" );
-		if ( !create ) {
-			this.element.trigger( "updatelayout" );
-		}
-	}
-};
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-// filter function removes whitespace between label and form element so we can use inline-block (nodeType 3 = text)
-$.fn.fieldcontain = function( options ) {
-	return this
-		.addClass( "ui-field-contain ui-body ui-br" )
-		.contents().filter( function() {
-			return ( this.nodeType === 3 && !/\S/.test( this.nodeValue ) );
-		}).remove();
-};
-
-//auto self-init widgets
-$( document ).bind( "pagecreate create", function( e ) {
-	$( ":jqmData(role='fieldcontain')", e.target ).jqmEnhanceable().fieldcontain();
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-$.fn.grid = function( options ) {
-	return this.each(function() {
-
-		var $this = $( this ),
-			o = $.extend({
-				grid: null
-			}, options ),
-			$kids = $this.children(),
-			gridCols = { solo:1, a:2, b:3, c:4, d:5 },
-			grid = o.grid,
-			iterator;
-
-			if ( !grid ) {
-				if ( $kids.length <= 5 ) {
-					for ( var letter in gridCols ) {
-						if ( gridCols[ letter ] === $kids.length ) {
-							grid = letter;
-						}
-					}
-				} else {
-					grid = "a";
-					$this.addClass( "ui-grid-duo" );
-				}
-			}
-			iterator = gridCols[grid];
-
-		$this.addClass( "ui-grid-" + grid );
-
-		$kids.filter( ":nth-child(" + iterator + "n+1)" ).addClass( "ui-block-a" );
-
-		if ( iterator > 1 ) {
-			$kids.filter( ":nth-child(" + iterator + "n+2)" ).addClass( "ui-block-b" );
-		}
-		if ( iterator > 2 ) {
-			$kids.filter( ":nth-child(" + iterator + "n+3)" ).addClass( "ui-block-c" );
-		}
-		if ( iterator > 3 ) {
-			$kids.filter( ":nth-child(" + iterator + "n+4)" ).addClass( "ui-block-d" );
-		}
-		if ( iterator > 4 ) {
-			$kids.filter( ":nth-child(" + iterator + "n+5)" ).addClass( "ui-block-e" );
-		}
-	});
-};
-})( jQuery );
-
-(function( $, undefined ) {
-
-$( document ).bind( "pagecreate create", function( e ) {
-	$( ":jqmData(role='nojs')", e.target ).addClass( "ui-nojs" );
-	
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-$.mobile.behaviors.formReset = {
-	_handleFormReset: function() {
-		this._on( this.element.closest( "form" ), {
-			reset: function() {
-				this._delay( "_reset" );
-			}
-		});
-	}
-};
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-// This function calls getAttribute, which should be safe for data-* attributes
-var getAttrFixed = function( e, key ) {
-	var value = e.getAttribute( key );
-
-	return value === "true" ? true :
-		value === "false" ? false :
-		value === null ? undefined : value;
-};
-
-$.fn.buttonMarkup = function( options ) {
-	var $workingSet = this,
-		nsKey = "data-" + $.mobile.ns,
-		key;
-
-	// Enforce options to be of type string
-	options = ( options && ( $.type( options ) === "object" ) )? options : {};
-	for ( var i = 0; i < $workingSet.length; i++ ) {
-		var el = $workingSet.eq( i ),
-			e = el[ 0 ],
-			o = $.extend( {}, $.fn.buttonMarkup.defaults, {
-				icon:       options.icon       !== undefined ? options.icon       : getAttrFixed( e, nsKey + "icon" ),
-				iconpos:    options.iconpos    !== undefined ? options.iconpos    : getAttrFixed( e, nsKey + "iconpos" ),
-				theme:      options.theme      !== undefined ? options.theme      : getAttrFixed( e, nsKey + "theme" ) || $.mobile.getInheritedTheme( el, "c" ),
-				inline:     options.inline     !== undefined ? options.inline     : getAttrFixed( e, nsKey + "inline" ),
-				shadow:     options.shadow     !== undefined ? options.shadow     : getAttrFixed( e, nsKey + "shadow" ),
-				corners:    options.corners    !== undefined ? options.corners    : getAttrFixed( e, nsKey + "corners" ),
-				iconshadow: options.iconshadow !== undefined ? options.iconshadow : getAttrFixed( e, nsKey + "iconshadow" ),
-				mini:       options.mini       !== undefined ? options.mini       : getAttrFixed( e, nsKey + "mini" )
-			}, options ),
-
-			// Classes Defined
-			innerClass = "ui-btn-inner",
-			textClass = "ui-btn-text",
-			buttonClass, iconClass,
-			hover = false,
-			state = "up",
-			// Button inner markup
-			buttonInner,
-			buttonText,
-			buttonIcon,
-			buttonElements;
-
-		for ( key in o ) {
-			e.setAttribute( nsKey + key, o[ key ] );
-		}
-
-		if ( getAttrFixed( e, nsKey + "rel" ) === "popup" && el.attr( "href" ) ) {
-			e.setAttribute( "aria-haspopup", true );
-			e.setAttribute( "aria-owns", el.attr( "href" ) );
-		}
-
-		// Check if this element is already enhanced
-		buttonElements = $.data( ( ( e.tagName === "INPUT" || e.tagName === "BUTTON" ) ? e.parentNode : e ), "buttonElements" );
-
-		if ( buttonElements ) {
-			e = buttonElements.outer;
-			el = $( e );
-			buttonInner = buttonElements.inner;
-			buttonText = buttonElements.text;
-			// We will recreate this icon below
-			$( buttonElements.icon ).remove();
-			buttonElements.icon = null;
-			hover = buttonElements.hover;
-			state = buttonElements.state;
-		}
-		else {
-			buttonInner = document.createElement( o.wrapperEls );
-			buttonText = document.createElement( o.wrapperEls );
-		}
-		buttonIcon = o.icon ? document.createElement( "span" ) : null;
-
-		if ( attachEvents && !buttonElements ) {
-			attachEvents();
-		}
-
-		// if not, try to find closest theme container
-		if ( !o.theme ) {
-			o.theme = $.mobile.getInheritedTheme( el, "c" );
-		}
-
-		buttonClass = "ui-btn ";
-		buttonClass += ( hover ? "ui-btn-hover-" + o.theme : "" );
-		buttonClass += ( state ? " ui-btn-" + state + "-" + o.theme : "" );
-		buttonClass += o.shadow ? " ui-shadow" : "";
-		buttonClass += o.corners ? " ui-btn-corner-all" : "";
-
-		if ( o.mini !== undefined ) {
-			// Used to control styling in headers/footers, where buttons default to `mini` style.
-			buttonClass += o.mini === true ? " ui-mini" : " ui-fullsize";
-		}
-
-		if ( o.inline !== undefined ) {
-			// Used to control styling in headers/footers, where buttons default to `inline` style.
-			buttonClass += o.inline === true ? " ui-btn-inline" : " ui-btn-block";
-		}
-
-		if ( o.icon ) {
-			o.icon = "ui-icon-" + o.icon;
-			o.iconpos = o.iconpos || "left";
-
-			iconClass = "ui-icon " + o.icon;
-
-			if ( o.iconshadow ) {
-				iconClass += " ui-icon-shadow";
-			}
-		}
-
-		if ( o.iconpos ) {
-			buttonClass += " ui-btn-icon-" + o.iconpos;
-
-			if ( o.iconpos === "notext" && !el.attr( "title" ) ) {
-				el.attr( "title", el.getEncodedText() );
-			}
-		}
-
-		if ( o.iconpos && o.iconpos === "notext" && !el.attr( "title" ) ) {
-			el.attr( "title", el.getEncodedText() );
-		}
-
-		if ( buttonElements ) {
-			el.removeClass( buttonElements.bcls || "" );
-		}
-		el.removeClass( "ui-link" ).addClass( buttonClass );
-
-		buttonInner.className = innerClass;
-		buttonText.className = textClass;
-		if ( !buttonElements ) {
-			buttonInner.appendChild( buttonText );
-		}
-		if ( buttonIcon ) {
-			buttonIcon.className = iconClass;
-			if ( !( buttonElements && buttonElements.icon ) ) {
-				buttonIcon.innerHTML = "&#160;";
-				buttonInner.appendChild( buttonIcon );
-			}
-		}
-
-		while ( e.firstChild && !buttonElements ) {
-			buttonText.appendChild( e.firstChild );
-		}
-
-		if ( !buttonElements ) {
-			e.appendChild( buttonInner );
-		}
-
-		// Assign a structure containing the elements of this button to the elements of this button. This
-		// will allow us to recognize this as an already-enhanced button in future calls to buttonMarkup().
-		buttonElements = {
-			hover : hover,
-			state : state,
-			bcls  : buttonClass,
-			outer : e,
-			inner : buttonInner,
-			text  : buttonText,
-			icon  : buttonIcon
-		};
-
-		$.data( e,           'buttonElements', buttonElements );
-		$.data( buttonInner, 'buttonElements', buttonElements );
-		$.data( buttonText,  'buttonElements', buttonElements );
-		if ( buttonIcon ) {
-			$.data( buttonIcon, 'buttonElements', buttonElements );
-		}
-	}
-
-	return this;
-};
-
-$.fn.buttonMarkup.defaults = {
-	corners: true,
-	shadow: true,
-	iconshadow: true,
-	wrapperEls: "span"
-};
-
-function closestEnabledButton( element ) {
-    var cname;
-
-    while ( element ) {
-		// Note that we check for typeof className below because the element we
-		// handed could be in an SVG DOM where className on SVG elements is defined to
-		// be of a different type (SVGAnimatedString). We only operate on HTML DOM
-		// elements, so we look for plain "string".
-        cname = ( typeof element.className === 'string' ) && ( element.className + ' ' );
-        if ( cname && cname.indexOf( "ui-btn " ) > -1 && cname.indexOf( "ui-disabled " ) < 0 ) {
-            break;
-        }
-
-        element = element.parentNode;
-    }
-
-    return element;
-}
-
-function updateButtonClass( $btn, classToRemove, classToAdd, hover, state ) {
-	var buttonElements = $.data( $btn[ 0 ], "buttonElements" );
-	$btn.removeClass( classToRemove ).addClass( classToAdd );
-	if ( buttonElements ) {
-		buttonElements.bcls = $( document.createElement( "div" ) )
-			.addClass( buttonElements.bcls + " " + classToAdd )
-			.removeClass( classToRemove )
-			.attr( "class" );
-		if ( hover !== undefined ) {
-			buttonElements.hover = hover;
-		}
-		buttonElements.state = state;
-	}
-}
-
-var attachEvents = function() {
-	var hoverDelay = $.mobile.buttonMarkup.hoverDelay, hov, foc;
-
-	$.mobile.document.bind( {
-		"vmousedown vmousecancel vmouseup vmouseover vmouseout focus blur scrollstart": function( event ) {
-			var theme,
-				$btn = $( closestEnabledButton( event.target ) ),
-				isTouchEvent = event.originalEvent && /^touch/.test( event.originalEvent.type ),
-				evt = event.type;
-
-			if ( $btn.length ) {
-				theme = $btn.attr( "data-" + $.mobile.ns + "theme" );
-
-				if ( evt === "vmousedown" ) {
-					if ( isTouchEvent ) {
-						// Use a short delay to determine if the user is scrolling before highlighting
-						hov = setTimeout( function() {
-							updateButtonClass( $btn, "ui-btn-up-" + theme, "ui-btn-down-" + theme, undefined, "down" );
-						}, hoverDelay );
-					} else {
-						updateButtonClass( $btn, "ui-btn-up-" + theme, "ui-btn-down-" + theme, undefined, "down" );
-					}
-				} else if ( evt === "vmousecancel" || evt === "vmouseup" ) {
-					updateButtonClass( $btn, "ui-btn-down-" + theme, "ui-btn-up-" + theme, undefined, "up" );
-				} else if ( evt === "vmouseover" || evt === "focus" ) {
-					if ( isTouchEvent ) {
-						// Use a short delay to determine if the user is scrolling before highlighting
-						foc = setTimeout( function() {
-							updateButtonClass( $btn, "ui-btn-up-" + theme, "ui-btn-hover-" + theme, true, "" );
-						}, hoverDelay );
-					} else {
-						updateButtonClass( $btn, "ui-btn-up-" + theme, "ui-btn-hover-" + theme, true, "" );
-					}
-				} else if ( evt === "vmouseout" || evt === "blur" || evt === "scrollstart" ) {
-					updateButtonClass( $btn, "ui-btn-hover-" + theme  + " ui-btn-down-" + theme, "ui-btn-up-" + theme, false, "up" );
-					if ( hov ) {
-						clearTimeout( hov );
-					}
-					if ( foc ) {
-						clearTimeout( foc );
-					}
-				}
-			}
-		},
-		"focusin focus": function( event ) {
-			$( closestEnabledButton( event.target ) ).addClass( $.mobile.focusClass );
-		},
-		"focusout blur": function( event ) {
-			$( closestEnabledButton( event.target ) ).removeClass( $.mobile.focusClass );
-		}
-	});
-
-	attachEvents = null;
-};
-
-//links in bars, or those with  data-role become buttons
-//auto self-init widgets
-$.mobile.document.bind( "pagecreate create", function( e ) {
-
-	$( ":jqmData(role='button'), .ui-bar > a, .ui-header > a, .ui-footer > a, .ui-bar > :jqmData(role='controlgroup') > a", e.target )
-		.jqmEnhanceable()
-		.not( "button, input, .ui-btn, :jqmData(role='none'), :jqmData(role='nojs')" )
-		.buttonMarkup();
-});
-
-})( jQuery );
-
-
-(function( $, undefined ) {
-
-$.widget( "mobile.collapsible", $.mobile.widget, {
-	options: {
-		expandCueText: " click to expand contents",
-		collapseCueText: " click to collapse contents",
-		collapsed: true,
-		heading: "h1,h2,h3,h4,h5,h6,legend",
-		collapsedIcon: "plus",
-		expandedIcon: "minus",
-		iconpos: "left",
-		theme: null,
-		contentTheme: null,
-		inset: true,
-		corners: true,
-		mini: false,
-		initSelector: ":jqmData(role='collapsible')"
-	},
-	_create: function() {
-
-		var $el = this.element,
-			o = this.options,
-			collapsible = $el.addClass( "ui-collapsible" ),
-			collapsibleHeading = $el.children( o.heading ).first(),
-			collapsibleContent = collapsible.wrapInner( "<div class='ui-collapsible-content'></div>" ).children( ".ui-collapsible-content" ),
-			collapsibleSet = $el.closest( ":jqmData(role='collapsible-set')" ).addClass( "ui-collapsible-set" ),
-			collapsibleClasses = "";
-
-		// Replace collapsibleHeading if it's a legend
-		if ( collapsibleHeading.is( "legend" ) ) {
-			collapsibleHeading = $( "<div role='heading'>"+ collapsibleHeading.html() +"</div>" ).insertBefore( collapsibleHeading );
-			collapsibleHeading.next().remove();
-		}
-
-		// If we are in a collapsible set
-		if ( collapsibleSet.length ) {
-			// Inherit the theme from collapsible-set
-			if ( !o.theme ) {
-				o.theme = collapsibleSet.jqmData( "theme" ) || $.mobile.getInheritedTheme( collapsibleSet, "c" );
-			}
-			// Inherit the content-theme from collapsible-set
-			if ( !o.contentTheme ) {
-				o.contentTheme = collapsibleSet.jqmData( "content-theme" );
-			}
-
-			// Get the preference for collapsed icon in the set, but override with data- attribute on the individual collapsible
-			o.collapsedIcon = $el.jqmData( "collapsed-icon" ) || collapsibleSet.jqmData( "collapsed-icon" ) || o.collapsedIcon;
-
-			// Get the preference for expanded icon in the set, but override with data- attribute on the individual collapsible
-			o.expandedIcon = $el.jqmData( "expanded-icon" ) || collapsibleSet.jqmData( "expanded-icon" ) || o.expandedIcon;
-
-			// Gets the preference icon position in the set, but override with data- attribute on the individual collapsible
-			o.iconpos = $el.jqmData( "iconpos" ) || collapsibleSet.jqmData( "iconpos" ) || o.iconpos;
-
-			// Inherit the preference for inset from collapsible-set or set the default value to ensure equalty within a set
-			if ( collapsibleSet.jqmData( "inset" ) !== undefined ) {
-				o.inset = collapsibleSet.jqmData( "inset" );
-			} else {
-				o.inset = true;
-			}
-			// Set corners for individual collapsibles to false when in a collapsible-set
-			o.corners = false;
-			// Gets the preference for mini in the set
-			if ( !o.mini ) {
-				o.mini = collapsibleSet.jqmData( "mini" );
-			}
-		} else {
-			// get inherited theme if not a set and no theme has been set
-			if ( !o.theme ) {
-				o.theme = $.mobile.getInheritedTheme( $el, "c" );
-			}
-		}
-
-		if ( !!o.inset ) {
-			collapsibleClasses += " ui-collapsible-inset";
-			if ( !!o.corners ) {
-				collapsibleClasses += " ui-corner-all" ;
-			}
-		}
-		if ( o.contentTheme ) {
-			collapsibleClasses += " ui-collapsible-themed-content";
-			collapsibleContent.addClass( "ui-body-" + o.contentTheme );
-		}
-		if ( collapsibleClasses !== "" ) {
-			collapsible.addClass( collapsibleClasses );
-		}
-		
-		collapsibleHeading
-			//drop heading in before content
-			.insertBefore( collapsibleContent )
-			//modify markup & attributes
-			.addClass( "ui-collapsible-heading" )
-			.append( "<span class='ui-collapsible-heading-status'></span>" )
-			.wrapInner( "<a href='#' class='ui-collapsible-heading-toggle'></a>" )
-			.find( "a" )
-				.first()
-				.buttonMarkup({
-					shadow: false,
-					corners: false,
-					iconpos: o.iconpos,
-					icon: o.collapsedIcon,
-					mini: o.mini,
-					theme: o.theme
-				});
-
-		//events
-		collapsible
-			.bind( "expand collapse", function( event ) {
-				if ( !event.isDefaultPrevented() ) {
-					var $this = $( this ),
-						isCollapse = ( event.type === "collapse" );
-
-					event.preventDefault();
-
-					collapsibleHeading
-						.toggleClass( "ui-collapsible-heading-collapsed", isCollapse )
-						.find( ".ui-collapsible-heading-status" )
-							.text( isCollapse ? o.expandCueText : o.collapseCueText )
-						.end()
-						.find( ".ui-icon" )
-							.toggleClass( "ui-icon-" + o.expandedIcon, !isCollapse )
-							// logic or cause same icon for expanded/collapsed state would remove the ui-icon-class
-							.toggleClass( "ui-icon-" + o.collapsedIcon, ( isCollapse || o.expandedIcon === o.collapsedIcon ) )
-						.end()
-						.find( "a" ).first().removeClass( $.mobile.activeBtnClass );
-
-					$this.toggleClass( "ui-collapsible-collapsed", isCollapse );
-					collapsibleContent.toggleClass( "ui-collapsible-content-collapsed", isCollapse ).attr( "aria-hidden", isCollapse );
-
-					collapsibleContent.trigger( "updatelayout" );
-				}
-			})
-			.trigger( o.collapsed ? "collapse" : "expand" );
-
-		collapsibleHeading
-			.bind( "tap", function( event ) {
-				collapsibleHeading.find( "a" ).first().addClass( $.mobile.activeBtnClass );
-			})
-			.bind( "click", function( event ) {
-
-				var type = collapsibleHeading.is( ".ui-collapsible-heading-collapsed" ) ? "expand" : "collapse";
-
-				collapsible.trigger( type );
-
-				event.preventDefault();
-				event.stopPropagation();
-			});
-	}
-});
-
-//auto self-init widgets
-$.mobile.document.bind( "pagecreate create", function( e ) {
-	$.mobile.collapsible.prototype.enhanceWithin( e.target );
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-$.widget( "mobile.collapsibleset", $.mobile.widget, {
-	options: {
-		initSelector: ":jqmData(role='collapsible-set')"
-	},
-	_create: function() {
-		var $el = this.element.addClass( "ui-collapsible-set" ),
-			o = this.options;
-
-		// Inherit the theme from collapsible-set
-		if ( !o.theme ) {
-			o.theme = $.mobile.getInheritedTheme( $el, "c" );
-		}
-		// Inherit the content-theme from collapsible-set
-		if ( !o.contentTheme ) {
-			o.contentTheme = $el.jqmData( "content-theme" );
-		}
-		// Inherit the corner styling from collapsible-set
-		if ( !o.corners ) {
-			o.corners = $el.jqmData( "corners" );
-		}
-		
-		if ( $el.jqmData( "inset" ) !== undefined ) {
-			o.inset = $el.jqmData( "inset" );
-		}
-		o.inset = o.inset !== undefined ? o.inset : true;
-		o.corners = o.corners !== undefined ? o.corners : true;
-		
-		if ( !!o.corners && !!o.inset ) {
-			$el.addClass( "ui-corner-all" );
-		}
-
-		// Initialize the collapsible set if it's not already initialized
-		if ( !$el.jqmData( "collapsiblebound" ) ) {
-			$el
-				.jqmData( "collapsiblebound", true )
-				.bind( "expand", function( event ) {
-					var closestCollapsible = $( event.target )
-						.closest( ".ui-collapsible" );
-					if ( closestCollapsible.parent().is( ":jqmData(role='collapsible-set')" ) ) {
-						closestCollapsible
-							.siblings( ".ui-collapsible" )
-							.trigger( "collapse" );
-					}
-				});
-		}
-	},
-
-	_init: function() {
-		var $el = this.element,
-			collapsiblesInSet = $el.children( ":jqmData(role='collapsible')" ),
-			expanded = collapsiblesInSet.filter( ":jqmData(collapsed='false')" );
-		this._refresh( "true" );
-
-		// Because the corners are handled by the collapsible itself and the default state is collapsed
-		// That was causing https://github.com/jquery/jquery-mobile/issues/4116
-		expanded.trigger( "expand" );
-	},
-
-	_refresh: function( create ) {
-		var collapsiblesInSet = this.element.children( ":jqmData(role='collapsible')" );
-
-		$.mobile.collapsible.prototype.enhance( collapsiblesInSet.not( ".ui-collapsible" ) );
-
-		this._addFirstLastClasses( collapsiblesInSet, this._getVisibles( collapsiblesInSet, create ), create );
-	},
-
-	refresh: function() {
-		this._refresh( false );
-	}
-});
-
-$.widget( "mobile.collapsibleset", $.mobile.collapsibleset, $.mobile.behaviors.addFirstLastClasses );
-
-//auto self-init widgets
-$.mobile.document.bind( "pagecreate create", function( e ) {
-	$.mobile.collapsibleset.prototype.enhanceWithin( e.target );
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-$.widget( "mobile.navbar", $.mobile.widget, {
-	options: {
-		iconpos: "top",
-		grid: null,
-		initSelector: ":jqmData(role='navbar')"
-	},
-
-	_create: function() {
-
-		var $navbar = this.element,
-			$navbtns = $navbar.find( "a" ),
-			iconpos = $navbtns.filter( ":jqmData(icon)" ).length ?
-									this.options.iconpos : undefined;
-
-		$navbar.addClass( "ui-navbar ui-mini" )
-			.attr( "role", "navigation" )
-			.find( "ul" )
-			.jqmEnhanceable()
-			.grid({ grid: this.options.grid });
-
-		$navbtns.buttonMarkup({
-			corners:	false,
-			shadow:		false,
-			inline:     true,
-			iconpos:	iconpos
-		});
-
-		$navbar.delegate( "a", "vclick", function( event ) {
-			if ( !$(event.target).hasClass( "ui-disabled" ) ) {
-				$navbtns.removeClass( $.mobile.activeBtnClass );
-				$( this ).addClass( $.mobile.activeBtnClass );
-				// The code below is a workaround to fix #1181. We have to see why removeActiveLinkClass() doesn't take care of it.
-				var activeNavbtn = $( this );
-				$( document ).one( "pagechange", function( event ) {
-					activeNavbtn.removeClass( $.mobile.activeBtnClass );
-				});
-			}
-		});
-
-		// Buttons in the navbar with ui-state-persist class should regain their active state before page show
-		$navbar.closest( ".ui-page" ).bind( "pagebeforeshow", function() {
-			$navbtns.filter( ".ui-state-persist" ).addClass( $.mobile.activeBtnClass );
-		});
-	}
-});
-
-//auto self-init widgets
-$.mobile.document.bind( "pagecreate create", function( e ) {
-	$.mobile.navbar.prototype.enhanceWithin( e.target );
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-//Keeps track of the number of lists per page UID
-//This allows support for multiple nested list in the same page
-//https://github.com/jquery/jquery-mobile/issues/1617
-var listCountPerPage = {};
-
-$.widget( "mobile.listview", $.mobile.widget, {
-
-	options: {
-		theme: null,
-		countTheme: "c",
-		headerTheme: "b",
-		dividerTheme: "b",
-		icon: "arrow-r",
-		splitIcon: "arrow-r",
-		splitTheme: "b",
-		corners: true,
-		shadow: true,
-		inset: false,
-		initSelector: ":jqmData(role='listview')"
-	},
-
-	_create: function() {
-		var t = this,
-			listviewClasses = "";
-
-		listviewClasses += t.options.inset ? " ui-listview-inset" : "";
-
-		if ( !!t.options.inset ) {
-			listviewClasses += t.options.corners ? " ui-corner-all" : "";
-			listviewClasses += t.options.shadow ? " ui-shadow" : "";
-		}
-
-		// create listview markup
-		t.element.addClass(function( i, orig ) {
-			return orig + " ui-listview" + listviewClasses;
-		});
-
-		t.refresh( true );
-	},
-
-	// This is a generic utility method for finding the first
-	// node with a given nodeName. It uses basic DOM traversal
-	// to be fast and is meant to be a substitute for simple
-	// $.fn.closest() and $.fn.children() calls on a single
-	// element. Note that callers must pass both the lowerCase
-	// and upperCase version of the nodeName they are looking for.
-	// The main reason for this is that this function will be
-	// called many times and we want to avoid having to lowercase
-	// the nodeName from the element every time to ensure we have
-	// a match. Note that this function lives here for now, but may
-	// be moved into $.mobile if other components need a similar method.
-	_findFirstElementByTagName: function( ele, nextProp, lcName, ucName ) {
-		var dict = {};
-		dict[ lcName ] = dict[ ucName ] = true;
-		while ( ele ) {
-			if ( dict[ ele.nodeName ] ) {
-				return ele;
-			}
-			ele = ele[ nextProp ];
-		}
-		return null;
-	},
-	_getChildrenByTagName: function( ele, lcName, ucName ) {
-		var results = [],
-			dict = {};
-		dict[ lcName ] = dict[ ucName ] = true;
-		ele = ele.firstChild;
-		while ( ele ) {
-			if ( dict[ ele.nodeName ] ) {
-				results.push( ele );
-			}
-			ele = ele.nextSibling;
-		}
-		return $( results );
-	},
-
-	_addThumbClasses: function( containers ) {
-		var i, img, len = containers.length;
-		for ( i = 0; i < len; i++ ) {
-			img = $( this._findFirstElementByTagName( containers[ i ].firstChild, "nextSibling", "img", "IMG" ) );
-			if ( img.length ) {
-				img.addClass( "ui-li-thumb" );
-				$( this._findFirstElementByTagName( img[ 0 ].parentNode, "parentNode", "li", "LI" ) ).addClass( img.is( ".ui-li-icon" ) ? "ui-li-has-icon" : "ui-li-has-thumb" );
-			}
-		}
-	},
-
-	refresh: function( create ) {
-		this.parentPage = this.element.closest( ".ui-page" );
-		this._createSubPages();
-
-		var o = this.options,
-			$list = this.element,
-			self = this,
-			dividertheme = $list.jqmData( "dividertheme" ) || o.dividerTheme,
-			listsplittheme = $list.jqmData( "splittheme" ),
-			listspliticon = $list.jqmData( "spliticon" ),
-			listicon = $list.jqmData( "icon" ),
-			li = this._getChildrenByTagName( $list[ 0 ], "li", "LI" ),
-			ol = !!$.nodeName( $list[ 0 ], "ol" ),
-			jsCount = !$.support.cssPseudoElement,
-			start = $list.attr( "start" ),
-			itemClassDict = {},
-			item, itemClass, itemTheme,
-			a, last, splittheme, counter, startCount, newStartCount, countParent, icon, imgParents, img, linkIcon;
-
-		if ( ol && jsCount ) {
-			$list.find( ".ui-li-dec" ).remove();
-		}
-
-		if ( ol ) {
-			// Check if a start attribute has been set while taking a value of 0 into account
-			if ( start || start === 0 ) {
-				if ( !jsCount ) {
-					startCount = parseInt( start , 10 ) - 1;
-					$list.css( "counter-reset", "listnumbering " + startCount );
-				} else {
-					counter = parseInt( start , 10 );
-				}
-			} else if ( jsCount ) {
-					counter = 1;
-			}
-		}
-
-		if ( !o.theme ) {
-			o.theme = $.mobile.getInheritedTheme( this.element, "c" );
-		}
-
-		for ( var pos = 0, numli = li.length; pos < numli; pos++ ) {
-			item = li.eq( pos );
-			itemClass = "ui-li";
-
-			// If we're creating the element, we update it regardless
-			if ( create || !item.hasClass( "ui-li" ) ) {
-				itemTheme = item.jqmData( "theme" ) || o.theme;
-				a = this._getChildrenByTagName( item[ 0 ], "a", "A" );
-				var isDivider = ( item.jqmData( "role" ) === "list-divider" );
-
-				if ( a.length && !isDivider ) {
-					icon = item.jqmData( "icon" );
-
-					item.buttonMarkup({
-						wrapperEls: "div",
-						shadow: false,
-						corners: false,
-						iconpos: "right",
-						icon: a.length > 1 || icon === false ? false : icon || listicon || o.icon,
-						theme: itemTheme
-					});
-
-					if ( ( icon !== false ) && ( a.length === 1 ) ) {
-						item.addClass( "ui-li-has-arrow" );
-					}
-
-					a.first().removeClass( "ui-link" ).addClass( "ui-link-inherit" );
-
-					if ( a.length > 1 ) {
-						itemClass += " ui-li-has-alt";
-
-						last = a.last();
-						splittheme = listsplittheme || last.jqmData( "theme" ) || o.splitTheme;
-						linkIcon = last.jqmData( "icon" );
-
-						last.appendTo( item )
-							.attr( "title", $.trim(last.getEncodedText()) )
-							.addClass( "ui-li-link-alt" )
-							.empty()
-							.buttonMarkup({
-								shadow: false,
-								corners: false,
-								theme: itemTheme,
-								icon: false,
-								iconpos: "notext"
-							})
-							.find( ".ui-btn-inner" )
-								.append(
-									$( document.createElement( "span" ) ).buttonMarkup({
-										shadow: true,
-										corners: true,
-										theme: splittheme,
-										iconpos: "notext",
-										// link icon overrides list item icon overrides ul element overrides options
-										icon: linkIcon || icon || listspliticon || o.splitIcon
-									})
-								);
-					}
-				} else if ( isDivider ) {
-
-					itemClass += " ui-li-divider ui-bar-" + ( item.jqmData( "theme" ) || dividertheme );
-					item.attr( "role", "heading" );
-
-					if ( ol ) {
-						//reset counter when a divider heading is encountered
-						if ( start || start === 0 ) {
-							if ( !jsCount ) {
-								newStartCount = parseInt( start , 10 ) - 1;
-								item.css( "counter-reset", "listnumbering " + newStartCount );
-							} else {
-								counter = parseInt( start , 10 );
-							}
-						} else if ( jsCount ) {
-								counter = 1;
-						}
-					}
-
-				} else {
-					itemClass += " ui-li-static ui-btn-up-" + itemTheme;
-				}
-			}
-
-			if ( ol && jsCount && itemClass.indexOf( "ui-li-divider" ) < 0 ) {
-				countParent = itemClass.indexOf( "ui-li-static" ) > 0 ? item : item.find( ".ui-link-inherit" );
-
-				countParent.addClass( "ui-li-jsnumbering" )
-					.prepend( "<span class='ui-li-dec'>" + ( counter++ ) + ". </span>" );
-			}
-
-			// Instead of setting item class directly on the list item and its
-			// btn-inner at this point in time, push the item into a dictionary
-			// that tells us what class to set on it so we can do this after this
-			// processing loop is finished.
-
-			if ( !itemClassDict[ itemClass ] ) {
-				itemClassDict[ itemClass ] = [];
-			}
-
-			itemClassDict[ itemClass ].push( item[ 0 ] );
-		}
-
-		// Set the appropriate listview item classes on each list item
-		// and their btn-inner elements. The main reason we didn't do this
-		// in the for-loop above is because we can eliminate per-item function overhead
-		// by calling addClass() and children() once or twice afterwards. This
-		// can give us a significant boost on platforms like WP7.5.
-
-		for ( itemClass in itemClassDict ) {
-			$( itemClassDict[ itemClass ] ).addClass( itemClass ).children( ".ui-btn-inner" ).addClass( itemClass );
-		}
-
-		$list.find( "h1, h2, h3, h4, h5, h6" ).addClass( "ui-li-heading" )
-			.end()
-
-			.find( "p, dl" ).addClass( "ui-li-desc" )
-			.end()
-
-			.find( ".ui-li-aside" ).each(function() {
-					var $this = $( this );
-					$this.prependTo( $this.parent() ); //shift aside to front for css float
-				})
-			.end()
-
-			.find( ".ui-li-count" ).each(function() {
-					$( this ).closest( "li" ).addClass( "ui-li-has-count" );
-				}).addClass( "ui-btn-up-" + ( $list.jqmData( "counttheme" ) || this.options.countTheme) + " ui-btn-corner-all" );
-
-		// The idea here is to look at the first image in the list item
-		// itself, and any .ui-link-inherit element it may contain, so we
-		// can place the appropriate classes on the image and list item.
-		// Note that we used to use something like:
-		//
-		//    li.find(">img:eq(0), .ui-link-inherit>img:eq(0)").each( ... );
-		//
-		// But executing a find() like that on Windows Phone 7.5 took a
-		// really long time. Walking things manually with the code below
-		// allows the 400 listview item page to load in about 3 seconds as
-		// opposed to 30 seconds.
-
-		this._addThumbClasses( li );
-		this._addThumbClasses( $list.find( ".ui-link-inherit" ) );
-
-		this._addFirstLastClasses( li, this._getVisibles( li, create ), create );
-		// autodividers binds to this to redraw dividers after the listview refresh
-		this._trigger( "afterrefresh" );
-	},
-
-	//create a string for ID/subpage url creation
-	_idStringEscape: function( str ) {
-		return str.replace(/[^a-zA-Z0-9]/g, '-');
-	},
-
-	_createSubPages: function() {
-		var parentList = this.element,
-			parentPage = parentList.closest( ".ui-page" ),
-			parentUrl = parentPage.jqmData( "url" ),
-			parentId = parentUrl || parentPage[ 0 ][ $.expando ],
-			parentListId = parentList.attr( "id" ),
-			o = this.options,
-			dns = "data-" + $.mobile.ns,
-			self = this,
-			persistentFooterID = parentPage.find( ":jqmData(role='footer')" ).jqmData( "id" ),
-			hasSubPages;
-
-		if ( typeof listCountPerPage[ parentId ] === "undefined" ) {
-			listCountPerPage[ parentId ] = -1;
-		}
-
-		parentListId = parentListId || ++listCountPerPage[ parentId ];
-
-		$( parentList.find( "li>ul, li>ol" ).toArray().reverse() ).each(function( i ) {
-			var self = this,
-				list = $( this ),
-				listId = list.attr( "id" ) || parentListId + "-" + i,
-				parent = list.parent(),
-				nodeElsFull = $( list.prevAll().toArray().reverse() ),
-				nodeEls = nodeElsFull.length ? nodeElsFull : $( "<span>" + $.trim(parent.contents()[ 0 ].nodeValue) + "</span>" ),
-				title = nodeEls.first().getEncodedText(),//url limits to first 30 chars of text
-				id = ( parentUrl || "" ) + "&" + $.mobile.subPageUrlKey + "=" + listId,
-				theme = list.jqmData( "theme" ) || o.theme,
-				countTheme = list.jqmData( "counttheme" ) || parentList.jqmData( "counttheme" ) || o.countTheme,
-				newPage, anchor;
-
-			//define hasSubPages for use in later removal
-			hasSubPages = true;
-
-			newPage = list.detach()
-						.wrap( "<div " + dns + "role='page' " + dns + "url='" + id + "' " + dns + "theme='" + theme + "' " + dns + "count-theme='" + countTheme + "'><div " + dns + "role='content'></div></div>" )
-						.parent()
-							.before( "<div " + dns + "role='header' " + dns + "theme='" + o.headerTheme + "'><div class='ui-title'>" + title + "</div></div>" )
-							.after( persistentFooterID ? $( "<div " + dns + "role='footer' " + dns + "id='"+ persistentFooterID +"'>" ) : "" )
-							.parent()
-								.appendTo( $.mobile.pageContainer );
-
-			newPage.page();
-
-			anchor = parent.find( 'a:first' );
-
-			if ( !anchor.length ) {
-				anchor = $( "<a/>" ).html( nodeEls || title ).prependTo( parent.empty() );
-			}
-
-			anchor.attr( "href", "#" + id );
-
-		}).listview();
-
-		// on pagehide, remove any nested pages along with the parent page, as long as they aren't active
-		// and aren't embedded
-		if ( hasSubPages &&
-			parentPage.is( ":jqmData(external-page='true')" ) &&
-			parentPage.data( "mobile-page" ).options.domCache === false ) {
-
-			var newRemove = function( e, ui ) {
-				var nextPage = ui.nextPage, npURL,
-					prEvent = new $.Event( "pageremove" );
-
-				if ( ui.nextPage ) {
-					npURL = nextPage.jqmData( "url" );
-					if ( npURL.indexOf( parentUrl + "&" + $.mobile.subPageUrlKey ) !== 0 ) {
-						self.childPages().remove();
-						parentPage.trigger( prEvent );
-						if ( !prEvent.isDefaultPrevented() ) {
-							parentPage.removeWithDependents();
-						}
-					}
-				}
-			};
-
-			// unbind the original page remove and replace with our specialized version
-			parentPage
-				.unbind( "pagehide.remove" )
-				.bind( "pagehide.remove", newRemove);
-		}
-	},
-
-	// TODO sort out a better way to track sub pages of the listview this is brittle
-	childPages: function() {
-		var parentUrl = this.parentPage.jqmData( "url" );
-
-		return $( ":jqmData(url^='"+  parentUrl + "&" + $.mobile.subPageUrlKey + "')" );
-	}
-});
-
-$.widget( "mobile.listview", $.mobile.listview, $.mobile.behaviors.addFirstLastClasses );
-
-//auto self-init widgets
-$.mobile.document.bind( "pagecreate create", function( e ) {
-	$.mobile.listview.prototype.enhanceWithin( e.target );
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-$.mobile.listview.prototype.options.autodividers = false;
-$.mobile.listview.prototype.options.autodividersSelector = function( elt ) {
-	// look for the text in the given element
-	var text = $.trim( elt.text() ) || null;
-
-	if ( !text ) {
-		return null;
-	}
-
-	// create the text for the divider (first uppercased letter)
-	text = text.slice( 0, 1 ).toUpperCase();
-
-	return text;
-};
-
-$.mobile.document.delegate( "ul,ol", "listviewcreate", function() {
-
-	var list = $( this ),
-			listview = list.data( "mobile-listview" );
-
-	if ( !listview || !listview.options.autodividers ) {
-		return;
-	}
-
-	var replaceDividers = function () {
-		list.find( "li:jqmData(role='list-divider')" ).remove();
-
-		var lis = list.find( 'li' ),
-			lastDividerText = null, li, dividerText;
-
-		for ( var i = 0; i < lis.length ; i++ ) {
-			li = lis[i];
-			dividerText = listview.options.autodividersSelector( $( li ) );
-
-			if ( dividerText && lastDividerText !== dividerText ) {
-				var divider = document.createElement( 'li' );
-				divider.appendChild( document.createTextNode( dividerText ) );
-				divider.setAttribute( 'data-' + $.mobile.ns + 'role', 'list-divider' );
-				li.parentNode.insertBefore( divider, li );
-			}
-
-			lastDividerText = dividerText;
-		}
-	};
-
-	var afterListviewRefresh = function () {
-		list.unbind( 'listviewafterrefresh', afterListviewRefresh );
-		replaceDividers();
-		listview.refresh();
-		list.bind( 'listviewafterrefresh', afterListviewRefresh );
-	};
-
-	afterListviewRefresh();
-});
-
-})( jQuery );
-
-/*
-* "checkboxradio" plugin
-*/
-
-(function( $, undefined ) {
-
-$.widget( "mobile.checkboxradio", $.mobile.widget, {
-	options: {
-		theme: null,
-		mini: false,
-		initSelector: "input[type='checkbox'],input[type='radio']"
-	},
-	_create: function() {
-		var self = this,
-			input = this.element,
-			o = this.options,
-			inheritAttr = function( input, dataAttr ) {
-				return input.jqmData( dataAttr ) || input.closest( "form, fieldset" ).jqmData( dataAttr );
-			},
-			// NOTE: Windows Phone could not find the label through a selector
-			// filter works though.
-			parentLabel = $( input ).closest( "label" ),
-			label = parentLabel.length ? parentLabel : $( input ).closest( "form, fieldset, :jqmData(role='page'), :jqmData(role='dialog')" ).find( "label" ).filter( "[for='" + input[0].id + "']" ).first(),
-			inputtype = input[0].type,
-			mini = inheritAttr( input, "mini" ) || o.mini,
-			checkedState = inputtype + "-on",
-			uncheckedState = inputtype + "-off",
-			iconpos = inheritAttr( input, "iconpos" ),
-			checkedClass = "ui-" + checkedState,
-			uncheckedClass = "ui-" + uncheckedState;
-
-		if ( inputtype !== "checkbox" && inputtype !== "radio" ) {
-			return;
-		}
-
-		// Expose for other methods
-		$.extend( this, {
-			label: label,
-			inputtype: inputtype,
-			checkedClass: checkedClass,
-			uncheckedClass: uncheckedClass,
-			checkedicon: checkedState,
-			uncheckedicon: uncheckedState
-		});
-
-		// If there's no selected theme check the data attr
-		if ( !o.theme ) {
-			o.theme = $.mobile.getInheritedTheme( this.element, "c" );
-		}
-
-		label.buttonMarkup({
-			theme: o.theme,
-			icon: uncheckedState,
-			shadow: false,
-			mini: mini,
-			iconpos: iconpos
-		});
-
-		// Wrap the input + label in a div
-		var wrapper = document.createElement('div');
-		wrapper.className = 'ui-' + inputtype;
-
-		input.add( label ).wrapAll( wrapper );
-
-		label.bind({
-			vmouseover: function( event ) {
-				if ( $( this ).parent().is( ".ui-disabled" ) ) {
-					event.stopPropagation();
-				}
-			},
-
-			vclick: function( event ) {
-				if ( input.is( ":disabled" ) ) {
-					event.preventDefault();
-					return;
-				}
-
-				self._cacheVals();
-
-				input.prop( "checked", inputtype === "radio" && true || !input.prop( "checked" ) );
-
-				// trigger click handler's bound directly to the input as a substitute for
-				// how label clicks behave normally in the browsers
-				// TODO: it would be nice to let the browser's handle the clicks and pass them
-				//       through to the associate input. we can swallow that click at the parent
-				//       wrapper element level
-				input.triggerHandler( 'click' );
-
-				// Input set for common radio buttons will contain all the radio
-				// buttons, but will not for checkboxes. clearing the checked status
-				// of other radios ensures the active button state is applied properly
-				self._getInputSet().not( input ).prop( "checked", false );
-
-				self._updateAll();
-				return false;
-			}
-		});
-
-		input
-			.bind({
-				vmousedown: function() {
-					self._cacheVals();
-				},
-
-				vclick: function() {
-					var $this = $( this );
-
-					// Adds checked attribute to checked input when keyboard is used
-					if ( $this.is( ":checked" ) ) {
-
-						$this.prop( "checked", true);
-						self._getInputSet().not( $this ).prop( "checked", false );
-					} else {
-
-						$this.prop( "checked", false );
-					}
-
-					self._updateAll();
-				},
-
-				focus: function() {
-					label.addClass( $.mobile.focusClass );
-				},
-
-				blur: function() {
-					label.removeClass( $.mobile.focusClass );
-				}
-			});
-
-		if ( this._handleFormReset ) {
-			this._handleFormReset();
-		}
-		this.refresh();
-	},
-
-	_cacheVals: function() {
-		this._getInputSet().each(function() {
-			$( this ).jqmData( "cacheVal", this.checked );
-		});
-	},
-
-	//returns either a set of radios with the same name attribute, or a single checkbox
-	_getInputSet: function() {
-		if ( this.inputtype === "checkbox" ) {
-			return this.element;
-		}
-
-		return this.element.closest( "form, :jqmData(role='page'), :jqmData(role='dialog')" )
-			.find( "input[name='" + this.element[0].name + "'][type='" + this.inputtype + "']" );
-	},
-
-	_updateAll: function() {
-		var self = this;
-
-		this._getInputSet().each(function() {
-			var $this = $( this );
-
-			if ( this.checked || self.inputtype === "checkbox" ) {
-				$this.trigger( "change" );
-			}
-		})
-		.checkboxradio( "refresh" );
-	},
-
-	_reset: function() {
-		this.refresh();
-	},
-
-	refresh: function() {
-		var input = this.element[ 0 ],
-			active = " " + $.mobile.activeBtnClass,
-			checkedClass = this.checkedClass + ( this.element.parents( ".ui-controlgroup-horizontal" ).length ? active : "" ),
-			label = this.label;
-
-		if ( input.checked ) {
-			label.removeClass( this.uncheckedClass + active ).addClass( checkedClass ).buttonMarkup( { icon: this.checkedicon } );
-		} else {
-			label.removeClass( checkedClass ).addClass( this.uncheckedClass ).buttonMarkup( { icon: this.uncheckedicon } );
-		}
-
-		if ( input.disabled ) {
-			this.disable();
-		} else {
-			this.enable();
-		}
-	},
-
-	disable: function() {
-		this.element.prop( "disabled", true ).parent().addClass( "ui-disabled" );
-	},
-
-	enable: function() {
-		this.element.prop( "disabled", false ).parent().removeClass( "ui-disabled" );
-	}
-});
-
-$.widget( "mobile.checkboxradio", $.mobile.checkboxradio, $.mobile.behaviors.formReset );
-
-//auto self-init widgets
-$.mobile.document.bind( "pagecreate create", function( e ) {
-	$.mobile.checkboxradio.prototype.enhanceWithin( e.target, true );
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-$.widget( "mobile.button", $.mobile.widget, {
-	options: {
-		theme: null,
-		icon: null,
-		iconpos: null,
-		corners: true,
-		shadow: true,
-		iconshadow: true,
-		inline: null,
-		mini: null,
-		initSelector: "button, [type='button'], [type='submit'], [type='reset']"
-	},
-	_create: function() {
-		var $el = this.element,
-			$button,
-			// create a copy of this.options we can pass to buttonMarkup
-			o = ( function( tdo ) {
-				var key, ret = {};
-
-				for ( key in tdo ) {
-					if ( tdo[ key ] !== null && key !== "initSelector" ) {
-						ret[ key ] = tdo[ key ];
-					}
-				}
-
-				return ret;
-			} )( this.options ),
-			classes = "",
-			$buttonPlaceholder;
-
-		// if this is a link, check if it's been enhanced and, if not, use the right function
-		if ( $el[ 0 ].tagName === "A" ) {
-			if ( !$el.hasClass( "ui-btn" ) ) {
-				$el.buttonMarkup();
-			}
-			return;
-		}
-
-		// get the inherited theme
-		// TODO centralize for all widgets
-		if ( !this.options.theme ) {
-			this.options.theme = $.mobile.getInheritedTheme( this.element, "c" );
-		}
-
-		// TODO: Post 1.1--once we have time to test thoroughly--any classes manually applied to the original element should be carried over to the enhanced element, with an `-enhanced` suffix. See https://github.com/jquery/jquery-mobile/issues/3577
-		/* if ( $el[0].className.length ) {
-			classes = $el[0].className;
-		} */
-		if ( !!~$el[0].className.indexOf( "ui-btn-left" ) ) {
-			classes = "ui-btn-left";
-		}
-
-		if (  !!~$el[0].className.indexOf( "ui-btn-right" ) ) {
-			classes = "ui-btn-right";
-		}
-
-		if (  $el.attr( "type" ) === "submit" || $el.attr( "type" ) === "reset" ) {
-			classes ? classes += " ui-submit" :  classes = "ui-submit";
-		}
-		$( "label[for='" + $el.attr( "id" ) + "']" ).addClass( "ui-submit" );
-
-		// Add ARIA role
-		this.button = $( "<div></div>" )
-			[ $el.html() ? "html" : "text" ]( $el.html() || $el.val() )
-			.insertBefore( $el )
-			.buttonMarkup( o )
-			.addClass( classes )
-			.append( $el.addClass( "ui-btn-hidden" ) );
-
-        $button = this.button;
-
-		$el.bind({
-			focus: function() {
-				$button.addClass( $.mobile.focusClass );
-			},
-
-			blur: function() {
-				$button.removeClass( $.mobile.focusClass );
-			}
-		});
-
-		this.refresh();
-	},
-
-	_setOption: function( key, value ) {
-		var op = {};
-
-		op[ key ] = value;
-		if ( key !== "initSelector" ) {
-			this.button.buttonMarkup( op );
-			// Record the option change in the options and in the DOM data-* attributes
-			this.element.attr( "data-" + ( $.mobile.ns || "" ) + ( key.replace( /([A-Z])/, "-$1" ).toLowerCase() ), value );
-		}
-		this._super( "_setOption", key, value );
-	},
-
-	enable: function() {
-		this.element.attr( "disabled", false );
-		this.button.removeClass( "ui-disabled" ).attr( "aria-disabled", false );
-		return this._setOption( "disabled", false );
-	},
-
-	disable: function() {
-		this.element.attr( "disabled", true );
-		this.button.addClass( "ui-disabled" ).attr( "aria-disabled", true );
-		return this._setOption( "disabled", true );
-	},
-
-	refresh: function() {
-		var $el = this.element;
-
-		if ( $el.prop("disabled") ) {
-			this.disable();
-		} else {
-			this.enable();
-		}
-
-		// Grab the button's text element from its implementation-independent data item
-		$( this.button.data( 'buttonElements' ).text )[ $el.html() ? "html" : "text" ]( $el.html() || $el.val() );
-	}
-});
-
-//auto self-init widgets
-$.mobile.document.bind( "pagecreate create", function( e ) {
-	$.mobile.button.prototype.enhanceWithin( e.target, true );
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-	$.widget( "mobile.controlgroup", $.mobile.widget, {
-		options: {
-			shadow: false,
-			corners: true,
-			excludeInvisible: true,
-			type: "vertical",
-			mini: false,
-			initSelector: ":jqmData(role='controlgroup')"
-		},
-
-		_create: function() {
-			var $el = this.element,
-				ui = {
-					inner: $( "<div class='ui-controlgroup-controls'></div>" ),
-					legend: $( "<div role='heading' class='ui-controlgroup-label'></div>" )
-				},
-				grouplegend = $el.children( "legend" ),
-				self = this;
-
-			// Apply the proto
-			$el.wrapInner( ui.inner );
-			if ( grouplegend.length ) {
-				ui.legend.append( grouplegend ).insertBefore( $el.children( 0 ) );
-			}
-			$el.addClass( "ui-corner-all ui-controlgroup" );
-
-			$.extend( this, {
-				_initialRefresh: true
-			});
-
-			$.each( this.options, function( key, value ) {
-				// Cause initial options to be applied by their handler by temporarily setting the option to undefined
-				// - the handler then sets it to the initial value
-				self.options[ key ] = undefined;
-				self._setOption( key, value, true );
-			});
-		},
-
-		_init: function() {
-			this.refresh();
-		},
-
-		_setOption: function( key, value ) {
-			var setter = "_set" + key.charAt( 0 ).toUpperCase() + key.slice( 1 );
-
-			if ( this[ setter ] !== undefined ) {
-				this[ setter ]( value );
-			}
-
-			this._super( key, value );
-			this.element.attr( "data-" + ( $.mobile.ns || "" ) + ( key.replace( /([A-Z])/, "-$1" ).toLowerCase() ), value );
-		},
-
-		_setType: function( value ) {
-			this.element
-				.removeClass( "ui-controlgroup-horizontal ui-controlgroup-vertical" )
-				.addClass( "ui-controlgroup-" + value );
-			this.refresh();
-		},
-
-		_setCorners: function( value ) {
-			this.element.toggleClass( "ui-corner-all", value );
-		},
-
-		_setShadow: function( value ) {
-			this.element.toggleClass( "ui-shadow", value );
-		},
-
-		_setMini: function( value ) {
-			this.element.toggleClass( "ui-mini", value );
-		},
-
-		container: function() {
-			return this.element.children( ".ui-controlgroup-controls" );
-		},
-
-		refresh: function() {
-			var els = this.element.find( ".ui-btn" ).not( ".ui-slider-handle" ),
-				create = this._initialRefresh;
-			if ( $.mobile.checkboxradio ) {
-				this.element.find( ":mobile-checkboxradio" ).checkboxradio( "refresh" );
-			}
-			this._addFirstLastClasses( els, this.options.excludeInvisible ? this._getVisibles( els, create ) : els, create );
-			this._initialRefresh = false;
-		}
-	});
-
-	$.widget( "mobile.controlgroup", $.mobile.controlgroup, $.mobile.behaviors.addFirstLastClasses );
-
-	// TODO: Implement a mechanism to allow widgets to become enhanced in the
-	// correct order when their correct enhancement depends on other widgets in
-	// the page being correctly enhanced already.
-	//
-	// For now, we wait until dom-ready to attach the controlgroup's enhancement
-	// hook, because by that time, all the other widgets' enhancement hooks should
-	// already be in place, ensuring that all widgets that need to be grouped will
-	// already have been enhanced by the time the controlgroup is created.
-	$( function() {
-		$.mobile.document.bind( "pagecreate create", function( e )  {
-			$.mobile.controlgroup.prototype.enhanceWithin( e.target, true );
-		});
-	});
-})(jQuery);
-
-(function( $, undefined ) {
-
-$( document ).bind( "pagecreate create", function( e ) {
-
-	//links within content areas, tests included with page
-	$( e.target )
-		.find( "a" )
-		.jqmEnhanceable()
-		.not( ".ui-btn, .ui-link-inherit, :jqmData(role='none'), :jqmData(role='nojs')" )
-		.addClass( "ui-link" );
-
-});
-
-})( jQuery );
-
-
-(function( $, undefined ) {
-
-	function fitSegmentInsideSegment( winSize, segSize, offset, desired ) {
-		var ret = desired;
-
-		if ( winSize < segSize ) {
-			// Center segment if it's bigger than the window
-			ret = offset + ( winSize - segSize ) / 2;
-		} else {
-			// Otherwise center it at the desired coordinate while keeping it completely inside the window
-			ret = Math.min( Math.max( offset, desired - segSize / 2 ), offset + winSize - segSize );
-		}
-
-		return ret;
-	}
-
-	function windowCoords() {
-		var $win = $.mobile.window;
-
-		return {
-			x: $win.scrollLeft(),
-			y: $win.scrollTop(),
-			cx: ( window.innerWidth || $win.width() ),
-			cy: ( window.innerHeight || $win.height() )
-		};
-	}
-
-	$.widget( "mobile.popup", $.mobile.widget, {
-		options: {
-			theme: null,
-			overlayTheme: null,
-			shadow: true,
-			corners: true,
-			transition: "none",
-			positionTo: "origin",
-			tolerance: null,
-			initSelector: ":jqmData(role='popup')",
-			closeLinkSelector: "a:jqmData(rel='back')",
-			closeLinkEvents: "click.popup",
-			navigateEvents: "navigate.popup",
-			closeEvents: "navigate.popup pagebeforechange.popup",
-			dismissible: true,
-
-			// NOTE Windows Phone 7 has a scroll position caching issue that
-			//      requires us to disable popup history management by default
-			//      https://github.com/jquery/jquery-mobile/issues/4784
-			//
-			// NOTE this option is modified in _create!
-			history: !$.mobile.browser.oldIE
-		},
-
-		_eatEventAndClose: function( e ) {
-			e.preventDefault();
-			e.stopImmediatePropagation();
-			if ( this.options.dismissible ) {
-				this.close();
-			}
-			return false;
-		},
-
-		// Make sure the screen size is increased beyond the page height if the popup's causes the document to increase in height
-		_resizeScreen: function() {
-			var popupHeight = this._ui.container.outerHeight( true );
-
-			this._ui.screen.removeAttr( "style" );
-			if ( popupHeight > this._ui.screen.height() ) {
-				this._ui.screen.height( popupHeight );
-			}
-		},
-
-		_handleWindowKeyUp: function( e ) {
-			if ( this._isOpen && e.keyCode === $.mobile.keyCode.ESCAPE ) {
-				return this._eatEventAndClose( e );
-			}
-		},
-
-		_expectResizeEvent: function() {
-			var winCoords = windowCoords();
-
-			if ( this._resizeData ) {
-				if ( winCoords.x === this._resizeData.winCoords.x &&
-					winCoords.y === this._resizeData.winCoords.y &&
-					winCoords.cx === this._resizeData.winCoords.cx &&
-					winCoords.cy === this._resizeData.winCoords.cy ) {
-					// timeout not refreshed
-					return false;
-				} else {
-					// clear existing timeout - it will be refreshed below
-					clearTimeout( this._resizeData.timeoutId );
-				}
-			}
-
-			this._resizeData = {
-				timeoutId: setTimeout( $.proxy( this, "_resizeTimeout" ), 200 ),
-				winCoords: winCoords
-			};
-
-			return true;
-		},
-
-		_resizeTimeout: function() {
-			if ( this._isOpen ) {
-				if ( !this._expectResizeEvent() ) {
-					if ( this._ui.container.hasClass( "ui-popup-hidden" ) ) {
-						// effectively rapid-open the popup while leaving the screen intact
-						this._ui.container.removeClass( "ui-popup-hidden" );
-						this.reposition( { positionTo: "window" } );
-						this._ignoreResizeEvents();
-					}
-
-					this._resizeScreen();
-					this._resizeData = null;
-					this._orientationchangeInProgress = false;
-				}
-			} else {
-				this._resizeData = null;
-				this._orientationchangeInProgress = false;
-			}
-		},
-
-		_ignoreResizeEvents: function() {
-			var self = this;
-
-			if ( this._ignoreResizeTo ) {
-				clearTimeout( this._ignoreResizeTo );
-			}
-			this._ignoreResizeTo = setTimeout( function() { self._ignoreResizeTo = 0; }, 1000 );
-		},
-
-		_handleWindowResize: function( e ) {
-			if ( this._isOpen && this._ignoreResizeTo === 0 ) {
-				if ( ( this._expectResizeEvent() || this._orientationchangeInProgress ) &&
-					!this._ui.container.hasClass( "ui-popup-hidden" ) ) {
-					// effectively rapid-close the popup while leaving the screen intact
-					this._ui.container
-						.addClass( "ui-popup-hidden" )
-						.removeAttr( "style" );
-				}
-			}
-		},
-
-		_handleWindowOrientationchange: function( e ) {
-			if ( !this._orientationchangeInProgress && this._isOpen && this._ignoreResizeTo === 0 ) {
-				this._expectResizeEvent();
-				this._orientationchangeInProgress = true;
-			}
-		},
-
-		// When the popup is open, attempting to focus on an element that is not a
-		// child of the popup will redirect focus to the popup
-		_handleDocumentFocusIn: function( e ) {
-			var tgt = e.target, $tgt, ui = this._ui;
-
-			if ( !this._isOpen ) {
-				return;
-			}
-
-			if ( tgt !== ui.container[ 0 ] ) {
-				$tgt = $( e.target );
-				if ( 0 === $tgt.parents().filter( ui.container[ 0 ] ).length ) {
-					$( document.activeElement ).one( "focus", function( e ) {
-						$tgt.blur();
-					});
-					ui.focusElement.focus();
-					e.preventDefault();
-					e.stopImmediatePropagation();
-					return false;
-				} else if ( ui.focusElement[ 0 ] === ui.container[ 0 ] ) {
-					ui.focusElement = $tgt;
-				}
-			} else if ( ui.focusElement && ui.focusElement[ 0 ] !== ui.container[ 0 ] ) {
-				ui.container.blur();
-				ui.focusElement.focus();
-			}
-
-			this._ignoreResizeEvents();
-		},
-
-		_create: function() {
-			var ui = {
-					screen: $( "<div class='ui-screen-hidden ui-popup-screen'></div>" ),
-					placeholder: $( "<div style='display: none;'><!-- placeholder --></div>" ),
-					container: $( "<div class='ui-popup-container ui-popup-hidden'></div>" )
-				},
-				thisPage = this.element.closest( ".ui-page" ),
-				myId = this.element.attr( "id" ),
-				self = this;
-
-			// We need to adjust the history option to be false if there's no AJAX nav.
-			// We can't do it in the option declarations because those are run before
-			// it is determined whether there shall be AJAX nav.
-			this.options.history = this.options.history && $.mobile.ajaxEnabled && $.mobile.hashListeningEnabled;
-
-			if ( thisPage.length === 0 ) {
-				thisPage = $( "body" );
-			}
-
-			// define the container for navigation event bindings
-			// TODO this would be nice at the the mobile widget level
-			this.options.container = this.options.container || $.mobile.pageContainer;
-
-			// Apply the proto
-			thisPage.append( ui.screen );
-			ui.container.insertAfter( ui.screen );
-			// Leave a placeholder where the element used to be
-			ui.placeholder.insertAfter( this.element );
-			if ( myId ) {
-				ui.screen.attr( "id", myId + "-screen" );
-				ui.container.attr( "id", myId + "-popup" );
-				ui.placeholder.html( "<!-- placeholder for " + myId + " -->" );
-			}
-			ui.container.append( this.element );
-			ui.focusElement = ui.container;
-
-			// Add class to popup element
-			this.element.addClass( "ui-popup" );
-
-			// Define instance variables
-			$.extend( this, {
-				_scrollTop: 0,
-				_page: thisPage,
-				_ui: ui,
-				_fallbackTransition: "",
-				_currentTransition: false,
-				_prereqs: null,
-				_isOpen: false,
-				_tolerance: null,
-				_resizeData: null,
-				_ignoreResizeTo: 0,
-				_orientationchangeInProgress: false
-			});
-
-			$.each( this.options, function( key, value ) {
-				// Cause initial options to be applied by their handler by temporarily setting the option to undefined
-				// - the handler then sets it to the initial value
-				self.options[ key ] = undefined;
-				self._setOption( key, value, true );
-			});
-
-			ui.screen.bind( "vclick", $.proxy( this, "_eatEventAndClose" ) );
-
-			this._on( $.mobile.window, {
-				orientationchange: $.proxy( this, "_handleWindowOrientationchange" ),
-				resize: $.proxy( this, "_handleWindowResize" ),
-				keyup: $.proxy( this, "_handleWindowKeyUp" )
-			});
-			this._on( $.mobile.document, {
-				focusin: $.proxy( this, "_handleDocumentFocusIn" )
-			});
-		},
-
-		_applyTheme: function( dst, theme, prefix ) {
-			var classes = ( dst.attr( "class" ) || "").split( " " ),
-				alreadyAdded = true,
-				currentTheme = null,
-				matches,
-				themeStr = String( theme );
-
-			while ( classes.length > 0 ) {
-				currentTheme = classes.pop();
-				matches = ( new RegExp( "^ui-" + prefix + "-([a-z])$" ) ).exec( currentTheme );
-				if ( matches && matches.length > 1 ) {
-					currentTheme = matches[ 1 ];
-					break;
-				} else {
-					currentTheme = null;
-				}
-			}
-
-			if ( theme !== currentTheme ) {
-				dst.removeClass( "ui-" + prefix + "-" + currentTheme );
-				if ( ! ( theme === null || theme === "none" ) ) {
-					dst.addClass( "ui-" + prefix + "-" + themeStr );
-				}
-			}
-		},
-
-		_setTheme: function( value ) {
-			this._applyTheme( this.element, value, "body" );
-		},
-
-		_setOverlayTheme: function( value ) {
-			this._applyTheme( this._ui.screen, value, "overlay" );
-
-			if ( this._isOpen ) {
-				this._ui.screen.addClass( "in" );
-			}
-		},
-
-		_setShadow: function( value ) {
-			this.element.toggleClass( "ui-overlay-shadow", value );
-		},
-
-		_setCorners: function( value ) {
-			this.element.toggleClass( "ui-corner-all", value );
-		},
-
-		_applyTransition: function( value ) {
-			this._ui.container.removeClass( this._fallbackTransition );
-			if ( value && value !== "none" ) {
-				this._fallbackTransition = $.mobile._maybeDegradeTransition( value );
-				if ( this._fallbackTransition === "none" ) {
-					this._fallbackTransition = "";
-				}
-				this._ui.container.addClass( this._fallbackTransition );
-			}
-		},
-
-		_setTransition: function( value ) {
-			if ( !this._currentTransition ) {
-				this._applyTransition( value );
-			}
-		},
-
-		_setTolerance: function( value ) {
-			var tol = { t: 30, r: 15, b: 30, l: 15 };
-
-			if ( value !== undefined ) {
-				var ar = String( value ).split( "," );
-
-				$.each( ar, function( idx, val ) { ar[ idx ] = parseInt( val, 10 ); } );
-
-				switch( ar.length ) {
-					// All values are to be the same
-					case 1:
-						if ( !isNaN( ar[ 0 ] ) ) {
-							tol.t = tol.r = tol.b = tol.l = ar[ 0 ];
-						}
-						break;
-
-					// The first value denotes top/bottom tolerance, and the second value denotes left/right tolerance
-					case 2:
-						if ( !isNaN( ar[ 0 ] ) ) {
-							tol.t = tol.b = ar[ 0 ];
-						}
-						if ( !isNaN( ar[ 1 ] ) ) {
-							tol.l = tol.r = ar[ 1 ];
-						}
-						break;
-
-					// The array contains values in the order top, right, bottom, left
-					case 4:
-						if ( !isNaN( ar[ 0 ] ) ) {
-							tol.t = ar[ 0 ];
-						}
-						if ( !isNaN( ar[ 1 ] ) ) {
-							tol.r = ar[ 1 ];
-						}
-						if ( !isNaN( ar[ 2 ] ) ) {
-							tol.b = ar[ 2 ];
-						}
-						if ( !isNaN( ar[ 3 ] ) ) {
-							tol.l = ar[ 3 ];
-						}
-						break;
-
-					default:
-						break;
-				}
-			}
-
-			this._tolerance = tol;
-		},
-
-		_setOption: function( key, value ) {
-			var exclusions, setter = "_set" + key.charAt( 0 ).toUpperCase() + key.slice( 1 );
-
-			if ( this[ setter ] !== undefined ) {
-				this[ setter ]( value );
-			}
-
-			// TODO REMOVE FOR 1.2.1 by moving them out to a default options object
-			exclusions = [
-				"initSelector",
-				"closeLinkSelector",
-				"closeLinkEvents",
-				"navigateEvents",
-				"closeEvents",
-				"history",
-				"container"
-			];
-
-			$.mobile.widget.prototype._setOption.apply( this, arguments );
-			if ( $.inArray( key, exclusions ) === -1 ) {
-				// Record the option change in the options and in the DOM data-* attributes
-				this.element.attr( "data-" + ( $.mobile.ns || "" ) + ( key.replace( /([A-Z])/, "-$1" ).toLowerCase() ), value );
-			}
-		},
-
-		// Try and center the overlay over the given coordinates
-		_placementCoords: function( desired ) {
-			// rectangle within which the popup must fit
-			var
-				winCoords = windowCoords(),
-				rc = {
-					x: this._tolerance.l,
-					y: winCoords.y + this._tolerance.t,
-					cx: winCoords.cx - this._tolerance.l - this._tolerance.r,
-					cy: winCoords.cy - this._tolerance.t - this._tolerance.b
-				},
-				menuSize, ret;
-
-			// Clamp the width of the menu before grabbing its size
-			this._ui.container.css( "max-width", rc.cx );
-			menuSize = {
-				cx: this._ui.container.outerWidth( true ),
-				cy: this._ui.container.outerHeight( true )
-			};
-
-			// Center the menu over the desired coordinates, while not going outside
-			// the window tolerances. This will center wrt. the window if the popup is too large.
-			ret = {
-				x: fitSegmentInsideSegment( rc.cx, menuSize.cx, rc.x, desired.x ),
-				y: fitSegmentInsideSegment( rc.cy, menuSize.cy, rc.y, desired.y )
-			};
-
-			// Make sure the top of the menu is visible
-			ret.y = Math.max( 0, ret.y );
-
-			// If the height of the menu is smaller than the height of the document
-			// align the bottom with the bottom of the document
-
-			// fix for $.mobile.document.height() bug in core 1.7.2.
-			var docEl = document.documentElement, docBody = document.body,
-				docHeight = Math.max( docEl.clientHeight, docBody.scrollHeight, docBody.offsetHeight, docEl.scrollHeight, docEl.offsetHeight );
-
-			ret.y -= Math.min( ret.y, Math.max( 0, ret.y + menuSize.cy - docHeight ) );
-
-			return { left: ret.x, top: ret.y };
-		},
-
-		_createPrereqs: function( screenPrereq, containerPrereq, whenDone ) {
-			var self = this, prereqs;
-
-			// It is important to maintain both the local variable prereqs and self._prereqs. The local variable remains in
-			// the closure of the functions which call the callbacks passed in. The comparison between the local variable and
-			// self._prereqs is necessary, because once a function has been passed to .animationComplete() it will be called
-			// next time an animation completes, even if that's not the animation whose end the function was supposed to catch
-			// (for example, if an abort happens during the opening animation, the .animationComplete handler is not called for
-			// that animation anymore, but the handler remains attached, so it is called the next time the popup is opened
-			// - making it stale. Comparing the local variable prereqs to the widget-level variable self._prereqs ensures that
-			// callbacks triggered by a stale .animationComplete will be ignored.
-
-			prereqs = {
-				screen: $.Deferred(),
-				container: $.Deferred()
-			};
-
-			prereqs.screen.then( function() {
-				if ( prereqs === self._prereqs ) {
-					screenPrereq();
-				}
-			});
-
-			prereqs.container.then( function() {
-				if ( prereqs === self._prereqs ) {
-					containerPrereq();
-				}
-			});
-
-			$.when( prereqs.screen, prereqs.container ).done( function() {
-				if ( prereqs === self._prereqs ) {
-					self._prereqs = null;
-					whenDone();
-				}
-			});
-
-			self._prereqs = prereqs;
-		},
-
-		_animate: function( args ) {
-			// NOTE before removing the default animation of the screen
-			//      this had an animate callback that would resolve the deferred
-			//      now the deferred is resolved immediately
-			// TODO remove the dependency on the screen deferred
-			this._ui.screen
-				.removeClass( args.classToRemove )
-				.addClass( args.screenClassToAdd );
-
-			args.prereqs.screen.resolve();
-
-			if ( args.transition && args.transition !== "none" ) {
-				if ( args.applyTransition ) {
-					this._applyTransition( args.transition );
-				}
-				if ( this._fallbackTransition ) {
-					this._ui.container
-						.animationComplete( $.proxy( args.prereqs.container, "resolve" ) )
-						.addClass( args.containerClassToAdd )
-						.removeClass( args.classToRemove );
-					return;
-				}
-			}
-			this._ui.container.removeClass( args.classToRemove );
-			args.prereqs.container.resolve();
-		},
-
-		// The desired coordinates passed in will be returned untouched if no reference element can be identified via
-		// desiredPosition.positionTo. Nevertheless, this function ensures that its return value always contains valid
-		// x and y coordinates by specifying the center middle of the window if the coordinates are absent.
-		// options: { x: coordinate, y: coordinate, positionTo: string: "origin", "window", or jQuery selector
-		_desiredCoords: function( o ) {
-			var dst = null, offset, winCoords = windowCoords(), x = o.x, y = o.y, pTo = o.positionTo;
-
-			// Establish which element will serve as the reference
-			if ( pTo && pTo !== "origin" ) {
-				if ( pTo === "window" ) {
-					x = winCoords.cx / 2 + winCoords.x;
-					y = winCoords.cy / 2 + winCoords.y;
-				} else {
-					try {
-						dst = $( pTo );
-					} catch( e ) {
-						dst = null;
-					}
-					if ( dst ) {
-						dst.filter( ":visible" );
-						if ( dst.length === 0 ) {
-							dst = null;
-						}
-					}
-				}
-			}
-
-			// If an element was found, center over it
-			if ( dst ) {
-				offset = dst.offset();
-				x = offset.left + dst.outerWidth() / 2;
-				y = offset.top + dst.outerHeight() / 2;
-			}
-
-			// Make sure x and y are valid numbers - center over the window
-			if ( $.type( x ) !== "number" || isNaN( x ) ) {
-				x = winCoords.cx / 2 + winCoords.x;
-			}
-			if ( $.type( y ) !== "number" || isNaN( y ) ) {
-				y = winCoords.cy / 2 + winCoords.y;
-			}
-
-			return { x: x, y: y };
-		},
-
-		_reposition: function( o ) {
-			// We only care about position-related parameters for repositioning
-			o = { x: o.x, y: o.y, positionTo: o.positionTo };
-			this._trigger( "beforeposition", o );
-			this._ui.container.offset( this._placementCoords( this._desiredCoords( o ) ) );
-		},
-
-		reposition: function( o ) {
-			if ( this._isOpen ) {
-				this._reposition( o );
-			}
-		},
-
-		_openPrereqsComplete: function() {
-			this._ui.container.addClass( "ui-popup-active" );
-			this._isOpen = true;
-			this._resizeScreen();
-			this._ui.container.attr( "tabindex", "0" ).focus();
-			this._ignoreResizeEvents();
-			this._trigger( "afteropen" );
-		},
-
-		_open: function( options ) {
-			var o = $.extend( {}, this.options, options ),
-				// TODO move blacklist to private method
-				androidBlacklist = ( function() {
-					var w = window,
-						ua = navigator.userAgent,
-						// Rendering engine is Webkit, and capture major version
-						wkmatch = ua.match( /AppleWebKit\/([0-9\.]+)/ ),
-						wkversion = !!wkmatch && wkmatch[ 1 ],
-						androidmatch = ua.match( /Android (\d+(?:\.\d+))/ ),
-						andversion = !!androidmatch && androidmatch[ 1 ],
-						chromematch = ua.indexOf( "Chrome" ) > -1;
-
-					// Platform is Android, WebKit version is greater than 534.13 ( Android 3.2.1 ) and not Chrome.
-					if( androidmatch !== null && andversion === "4.0" && wkversion && wkversion > 534.13 && !chromematch ) {
-						return true;
-					}
-					return false;
-				}());
-
-			// Count down to triggering "popupafteropen" - we have two prerequisites:
-			// 1. The popup window animation completes (container())
-			// 2. The screen opacity animation completes (screen())
-			this._createPrereqs(
-				$.noop,
-				$.noop,
-				$.proxy( this, "_openPrereqsComplete" ) );
-
-			this._currentTransition = o.transition;
-			this._applyTransition( o.transition );
-
-			if ( !this.options.theme ) {
-				this._setTheme( this._page.jqmData( "theme" ) || $.mobile.getInheritedTheme( this._page, "c" ) );
-			}
-
-			this._ui.screen.removeClass( "ui-screen-hidden" );
-			this._ui.container.removeClass( "ui-popup-hidden" );
-
-			// Give applications a chance to modify the contents of the container before it appears
-			this._reposition( o );
-
-			if ( this.options.overlayTheme && androidBlacklist ) {
-				/* TODO:
-				The native browser on Android 4.0.X ("Ice Cream Sandwich") suffers from an issue where the popup overlay appears to be z-indexed
-				above the popup itself when certain other styles exist on the same page -- namely, any element set to `position: fixed` and certain
-				types of input. These issues are reminiscent of previously uncovered bugs in older versions of Android's native browser:
-				https://github.com/scottjehl/Device-Bugs/issues/3
-
-				This fix closes the following bugs ( I use "closes" with reluctance, and stress that this issue should be revisited as soon as possible ):
-
-				https://github.com/jquery/jquery-mobile/issues/4816
-				https://github.com/jquery/jquery-mobile/issues/4844
-				https://github.com/jquery/jquery-mobile/issues/4874
-				*/
-
-				// TODO sort out why this._page isn't working
-				this.element.closest( ".ui-page" ).addClass( "ui-popup-open" );
-			}
-			this._animate({
-				additionalCondition: true,
-				transition: o.transition,
-				classToRemove: "",
-				screenClassToAdd: "in",
-				containerClassToAdd: "in",
-				applyTransition: false,
-				prereqs: this._prereqs
-			});
-		},
-
-		_closePrereqScreen: function() {
-			this._ui.screen
-				.removeClass( "out" )
-				.addClass( "ui-screen-hidden" );
-		},
-
-		_closePrereqContainer: function() {
-			this._ui.container
-				.removeClass( "reverse out" )
-				.addClass( "ui-popup-hidden" )
-				.removeAttr( "style" );
-		},
-
-		_closePrereqsDone: function() {
-			var opts = this.options;
-
-			this._ui.container.removeAttr( "tabindex" );
-
-			// remove the global mutex for popups
-			$.mobile.popup.active = undefined;
-
-			// alert users that the popup is closed
-			this._trigger( "afterclose" );
-		},
-
-		_close: function( immediate ) {
-			this._ui.container.removeClass( "ui-popup-active" );
-			this._page.removeClass( "ui-popup-open" );
-
-			this._isOpen = false;
-
-			// Count down to triggering "popupafterclose" - we have two prerequisites:
-			// 1. The popup window reverse animation completes (container())
-			// 2. The screen opacity animation completes (screen())
-			this._createPrereqs(
-				$.proxy( this, "_closePrereqScreen" ),
-				$.proxy( this, "_closePrereqContainer" ),
-				$.proxy( this, "_closePrereqsDone" ) );
-
-			this._animate( {
-				additionalCondition: this._ui.screen.hasClass( "in" ),
-				transition: ( immediate ? "none" : ( this._currentTransition ) ),
-				classToRemove: "in",
-				screenClassToAdd: "out",
-				containerClassToAdd: "reverse out",
-				applyTransition: true,
-				prereqs: this._prereqs
-			});
-		},
-
-		_unenhance: function() {
-			// Put the element back to where the placeholder was and remove the "ui-popup" class
-			this._setTheme( "none" );
-			this.element
-				// Cannot directly insertAfter() - we need to detach() first, because
-				// insertAfter() will do nothing if the payload div was not attached
-				// to the DOM at the time the widget was created, and so the payload
-				// will remain inside the container even after we call insertAfter().
-				// If that happens and we remove the container a few lines below, we
-				// will cause an infinite recursion - #5244
-				.detach()
-				.insertAfter( this._ui.placeholder )
-				.removeClass( "ui-popup ui-overlay-shadow ui-corner-all" );
-			this._ui.screen.remove();
-			this._ui.container.remove();
-			this._ui.placeholder.remove();
-		},
-
-		_destroy: function() {
-			if ( $.mobile.popup.active === this ) {
-				this.element.one( "popupafterclose", $.proxy( this, "_unenhance" ) );
-				this.close();
-			} else {
-				this._unenhance();
-			}
-		},
-
-		_closePopup: function( e, data ) {
-			var parsedDst, toUrl, o = this.options, immediate = false;
-
-			// restore location on screen
-			window.scrollTo( 0, this._scrollTop );
-
-			if ( e && e.type === "pagebeforechange" && data ) {
-				// Determine whether we need to rapid-close the popup, or whether we can
-				// take the time to run the closing transition
-				if ( typeof data.toPage === "string" ) {
-					parsedDst = data.toPage;
-				} else {
-					parsedDst = data.toPage.jqmData( "url" );
-				}
-				parsedDst = $.mobile.path.parseUrl( parsedDst );
-				toUrl = parsedDst.pathname + parsedDst.search + parsedDst.hash;
-
-				if ( this._myUrl !== $.mobile.path.makeUrlAbsolute( toUrl ) ) {
-					// Going to a different page - close immediately
-					immediate = true;
-				} else {
-					e.preventDefault();
-				}
-			}
-
-			// remove nav bindings
-			o.container.unbind( o.closeEvents );
-			// unbind click handlers added when history is disabled
-			this.element.undelegate( o.closeLinkSelector, o.closeLinkEvents );
-
-			this._close( immediate );
-		},
-
-		// any navigation event after a popup is opened should close the popup
-		// NOTE the pagebeforechange is bound to catch navigation events that don't
-		//      alter the url (eg, dialogs from popups)
-		_bindContainerClose: function() {
-			this.options.container
-				.one( this.options.closeEvents, $.proxy( this, "_closePopup" ) );
-		},
-
-		// TODO no clear deliniation of what should be here and
-		// what should be in _open. Seems to be "visual" vs "history" for now
-		open: function( options ) {
-			var self = this, opts = this.options, url, hashkey, activePage, currentIsDialog, hasHash, urlHistory;
-
-			// make sure open is idempotent
-			if( $.mobile.popup.active ) {
-				return;
-			}
-
-			// set the global popup mutex
-			$.mobile.popup.active = this;
-			this._scrollTop = $.mobile.window.scrollTop();
-
-			// if history alteration is disabled close on navigate events
-			// and leave the url as is
-			if( !( opts.history ) ) {
-				self._open( options );
-				self._bindContainerClose();
-
-				// When histoy is disabled we have to grab the data-rel
-				// back link clicks so we can close the popup instead of
-				// relying on history to do it for us
-				self.element
-					.delegate( opts.closeLinkSelector, opts.closeLinkEvents, function( e ) {
-						self.close();
-						e.preventDefault();
-					});
-
-				return;
-			}
-
-			// cache some values for min/readability
-			urlHistory = $.mobile.urlHistory;
-			hashkey = $.mobile.dialogHashKey;
-			activePage = $.mobile.activePage;
-			currentIsDialog = activePage.is( ".ui-dialog" );
-			this._myUrl = url = urlHistory.getActive().url;
-			hasHash = ( url.indexOf( hashkey ) > -1 ) && !currentIsDialog && ( urlHistory.activeIndex > 0 );
-
-			if ( hasHash ) {
-				self._open( options );
-				self._bindContainerClose();
-				return;
-			}
-
-			// if the current url has no dialog hash key proceed as normal
-			// otherwise, if the page is a dialog simply tack on the hash key
-			if ( url.indexOf( hashkey ) === -1 && !currentIsDialog ){
-				url = url + (url.indexOf( "#" ) > -1 ? hashkey : "#" + hashkey);
-			} else {
-				url = $.mobile.path.parseLocation().hash + hashkey;
-			}
-
-			// Tack on an extra hashkey if this is the first page and we've just reconstructed the initial hash
-			if ( urlHistory.activeIndex === 0 && url === urlHistory.initialDst ) {
-				url += hashkey;
-			}
-
-			// swallow the the initial navigation event, and bind for the next
-			$(window).one( "beforenavigate", function( e ) {
-				e.preventDefault();
-				self._open( options );
-				self._bindContainerClose();
-			});
-
-			this.urlAltered = true;
-			$.mobile.navigate( url, {role: "dialog"} );
-		},
-
-		close: function() {
-			// make sure close is idempotent
-			if( $.mobile.popup.active !== this ) {
-				return;
-			}
-
-			this._scrollTop = $.mobile.window.scrollTop();
-
-			if( this.options.history && this.urlAltered ) {
-				$.mobile.back();
-				this.urlAltered = false;
-			} else {
-				// simulate the nav bindings having fired
-				this._closePopup();
-			}
-		}
-	});
-
-
-	// TODO this can be moved inside the widget
-	$.mobile.popup.handleLink = function( $link ) {
-		var closestPage = $link.closest( ":jqmData(role='page')" ),
-			scope = ( ( closestPage.length === 0 ) ? $( "body" ) : closestPage ),
-			// NOTE make sure to get only the hash, ie7 (wp7) return the absolute href
-			//      in this case ruining the element selection
-			popup = $( $.mobile.path.parseUrl($link.attr( "href" )).hash, scope[0] ),
-			offset;
-
-		if ( popup.data( "mobile-popup" ) ) {
-			offset = $link.offset();
-			popup.popup( "open", {
-				x: offset.left + $link.outerWidth() / 2,
-				y: offset.top + $link.outerHeight() / 2,
-				transition: $link.jqmData( "transition" ),
-				positionTo: $link.jqmData( "position-to" )
-			});
-		}
-
-		//remove after delay
-		setTimeout( function() {
-			// Check if we are in a listview
-			var $parent = $link.parent().parent();
-			if ($parent.hasClass("ui-li")) {
-				$link = $parent.parent();
-			}
-			$link.removeClass( $.mobile.activeBtnClass );
-		}, 300 );
-	};
-
-	// TODO move inside _create
-	$.mobile.document.bind( "pagebeforechange", function( e, data ) {
-		if ( data.options.role === "popup" ) {
-			$.mobile.popup.handleLink( data.options.link );
-			e.preventDefault();
-		}
-	});
-
-	$.mobile.document.bind( "pagecreate create", function( e )  {
-		$.mobile.popup.prototype.enhanceWithin( e.target, true );
-	});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-$.widget( "mobile.panel", $.mobile.widget, {
-	options: {
-		classes: {
-			panel: "ui-panel",
-			panelOpen: "ui-panel-open",
-			panelClosed: "ui-panel-closed",
-			panelFixed: "ui-panel-fixed",
-			panelInner: "ui-panel-inner",
-			modal: "ui-panel-dismiss",
-			modalOpen: "ui-panel-dismiss-open",
-			pagePanel: "ui-page-panel",
-			pagePanelOpen: "ui-page-panel-open",
-			contentWrap: "ui-panel-content-wrap",
-			contentWrapOpen: "ui-panel-content-wrap-open",
-			contentWrapClosed: "ui-panel-content-wrap-closed",
-			contentFixedToolbar: "ui-panel-content-fixed-toolbar",
-			contentFixedToolbarOpen: "ui-panel-content-fixed-toolbar-open",
-			contentFixedToolbarClosed: "ui-panel-content-fixed-toolbar-closed",
-			animate: "ui-panel-animate"
-		},
-		animate: true,
-		theme: "c",
-		position: "left",
-		dismissible: true,
-		display: "reveal", //accepts reveal, push, overlay
-		initSelector: ":jqmData(role='panel')",
-		swipeClose: true,
-		positionFixed: false
-	},
-
-	_panelID: null,
-	_closeLink: null,
-	_page: null,
-	_modal: null,
-	_pannelInner: null,
-	_wrapper: null,
-	_fixedToolbar: null,
-
-	_create: function() {
-		var self = this,
-			$el = self.element,
-			page = $el.closest( ":jqmData(role='page')" ),
-			_getPageTheme = function() {
-				var $theme = $.data( page[0], "mobilePage" ).options.theme,
-				$pageThemeClass = "ui-body-" + $theme;
-				return $pageThemeClass;
-			},
-			_getPanelInner = function() {
-				var $pannelInner = $el.find( "." + self.options.classes.panelInner );
-				if ( $pannelInner.length === 0 ) {
-					$pannelInner = $el.children().wrapAll( '<div class="' + self.options.classes.panelInner + '" />' ).parent();
-				}
-				return $pannelInner;
-			},
-			_getWrapper = function() {
-				var $wrapper = page.find( "." + self.options.classes.contentWrap );
-				if ( $wrapper.length === 0 ) {
-					$wrapper = page.children( ".ui-header:not(:jqmData(position='fixed')), .ui-content:not(:jqmData(role='popup')), .ui-footer:not(:jqmData(position='fixed'))" ).wrapAll( '<div class="' + self.options.classes.contentWrap + ' ' + _getPageTheme() + '" />' ).parent();
-					if ( $.support.cssTransform3d && !!self.options.animate ) {
-						$wrapper.addClass( self.options.classes.animate );
-					}
-				}
-				return $wrapper;
-			},
-			_getFixedToolbar = function() {
-				var $fixedToolbar = page.find( "." + self.options.classes.contentFixedToolbar );
-				if ( $fixedToolbar.length === 0 ) {
-					$fixedToolbar = page.find( ".ui-header:jqmData(position='fixed'), .ui-footer:jqmData(position='fixed')" ).addClass( self.options.classes.contentFixedToolbar );
-					if ( $.support.cssTransform3d && !!self.options.animate ) {
-						$fixedToolbar.addClass( self.options.classes.animate );
-					}
-				}
-				return $fixedToolbar;
-			};
-
-		// expose some private props to other methods
-		$.extend( this, {
-			_panelID: $el.attr( "id" ),
-			_closeLink: $el.find( ":jqmData(rel='close')" ),
-			_page: $el.closest( ":jqmData(role='page')" ),
-			_pageTheme: _getPageTheme(),
-			_pannelInner: _getPanelInner(),
-			_wrapper: _getWrapper(),
-			_fixedToolbar: _getFixedToolbar()
-		});
-		
-		self._addPanelClasses();
-		self._wrapper.addClass( this.options.classes.contentWrapClosed );
-		self._fixedToolbar.addClass( this.options.classes.contentFixedToolbarClosed );
-		// add class to page so we can set "overflow-x: hidden;" for it to fix Android zoom issue
-		self._page.addClass( self.options.classes.pagePanel );
-		
-		// if animating, add the class to do so
-		if ( $.support.cssTransform3d && !!self.options.animate ) {
-			this.element.addClass( self.options.classes.animate );
-		}
-		
-		self._bindUpdateLayout();
-		self._bindCloseEvents();
-		self._bindLinkListeners();
-		self._bindPageEvents();
-
-		if ( !!self.options.dismissible ) {
-			self._createModal();
-		}
-
-		self._bindSwipeEvents();
-	},
-
-	_createModal: function( options ) {
-		var self = this;
-		
-		self._modal = $( "<div class='" + self.options.classes.modal + "' data-panelid='" + self._panelID + "'></div>" )
-			.on( "mousedown", function() {
-				self.close();
-			})
-			.appendTo( this._page );
-	},
-
-	_getPosDisplayClasses: function( prefix ) {
-		return prefix + "-position-" + this.options.position + " " + prefix + "-display-" + this.options.display;
-	},
-
-	_getPanelClasses: function() {
-		var panelClasses = this.options.classes.panel +
-			" " + this._getPosDisplayClasses( this.options.classes.panel ) +
-			" " + this.options.classes.panelClosed;
-
-		if ( this.options.theme ) {
-			panelClasses += " ui-body-" + this.options.theme;
-		}
-		if ( !!this.options.positionFixed ) {
-			panelClasses += " " + this.options.classes.panelFixed;
-		}
-		return panelClasses;
-	},
-
-	_addPanelClasses: function() {
-		this.element.addClass( this._getPanelClasses() );
-	},
-
-	_bindCloseEvents: function() {
-		var self = this;
-		
-		self._closeLink.on( "click.panel" , function( e ) {
-			e.preventDefault();
-			self.close();
-			return false;
-		});
-		self.element.on( "click.panel" , "a:jqmData(ajax='false')", function( e ) {
-			self.close();
-		});		
-	},
-
-	_positionPanel: function() {
-		var self = this,
-			pannelInnerHeight = self._pannelInner.outerHeight(),
-			expand = pannelInnerHeight > $.mobile.getScreenHeight();
-
-		if ( expand || !self.options.positionFixed ) {
-			if ( expand ) {
-				self._unfixPanel();
-				$.mobile.resetActivePageHeight( pannelInnerHeight );
-			}
-			self._scrollIntoView( pannelInnerHeight );
-		} else {
-			self._fixPanel();
-		}
-	},
-
-	_scrollIntoView: function( pannelInnerHeight ) {
-		if ( pannelInnerHeight < $( window ).scrollTop() ) {
-			window.scrollTo( 0, 0 );
-		}	
-	},
-
-	_bindFixListener: function() {
-		this._on( $( window ), { "throttledresize": "_positionPanel" });
-	},
-
-	_unbindFixListener: function() {
-		this._off( $( window ), "throttledresize" );
-	},
-
-	_unfixPanel: function() {
-		if ( !!this.options.positionFixed && $.support.fixedPosition ) {
-			this.element.removeClass( this.options.classes.panelFixed );
-		}
-	},
-
-	_fixPanel: function() {
-		if ( !!this.options.positionFixed && $.support.fixedPosition ) {
-			this.element.addClass( this.options.classes.panelFixed );
-		}
-	},
-	
-	_bindUpdateLayout: function() {
-		var self = this;
-		
-		self.element.on( "updatelayout", function( e ) {
-			if ( self._open ) {
-				self._positionPanel();
-			}
-		});
-	},
-
-	_bindLinkListeners: function() {
-		var self = this;
-
-		self._page.on( "click.panel" , "a", function( e ) {
-			if ( this.href.split( "#" )[ 1 ] === self._panelID && self._panelID !== undefined ) {
-				e.preventDefault();
-				var $link = $( this );
-				if ( ! $link.hasClass( "ui-link" ) ) {
-					$link.addClass( $.mobile.activeBtnClass );
-					self.element.one( "panelopen panelclose", function() {
-						$link.removeClass( $.mobile.activeBtnClass );
-					});
-				}
-				self.toggle();
-				return false;
-			}
-		});
-	},
-	
-	_bindSwipeEvents: function() {
-		var self = this,
-			area = self._modal ? self.element.add( self._modal ) : self.element;
-		
-		// on swipe, close the panel
-		if( !!self.options.swipeClose ) {
-			if ( self.options.position === "left" ) {
-				area.on( "swipeleft.panel", function( e ) {
-					self.close();
-				});
-			} else {
-				area.on( "swiperight.panel", function( e ) {
-					self.close();
-				});
-			}
-		}
-	},
-
-	_bindPageEvents: function() {
-		var self = this;
-			
-		self._page
-			// Close the panel if another panel on the page opens
-			.on( "panelbeforeopen", function( e ) {
-				if ( self._open && e.target !== self.element[ 0 ] ) {
-					self.close();
-				}
-			})
-			// clean up open panels after page hide
-			.on( "pagehide", function( e ) {
-				if ( self._open ) {
-					self.close( true );
-				}
-			})
-			// on escape, close? might need to have a target check too...
-			.on( "keyup.panel", function( e ) {
-				if ( e.keyCode === 27 && self._open ) {
-					self.close();
-				}
-			});
-	},
-
-	// state storage of open or closed
-	_open: false,
-
-	_contentWrapOpenClasses: null,
-	_fixedToolbarOpenClasses: null,
-	_modalOpenClasses: null,
-
-	open: function( immediate ) {
-		if ( !this._open ) {
-			var self = this,
-				o = self.options,
-				_openPanel = function() {
-					self._page.off( "panelclose" );
-					self._page.jqmData( "panel", "open" );
-					
-					if ( !immediate && $.support.cssTransform3d && !!o.animate ) {
-						self.element.add( self._wrapper ).on( self._transitionEndEvents, complete );
-					} else {
-						setTimeout( complete, 0 );
-					}
-					
-					if ( self.options.theme && self.options.display !== "overlay" ) {
-						self._page
-							.removeClass( self._pageTheme )
-							.addClass( "ui-body-" + self.options.theme );
-					}
-					
-					self.element.removeClass( o.classes.panelClosed ).addClass( o.classes.panelOpen );
-					
-					self._contentWrapOpenClasses = self._getPosDisplayClasses( o.classes.contentWrap );
-					self._wrapper
-						.removeClass( o.classes.contentWrapClosed )
-						.addClass( self._contentWrapOpenClasses + " " + o.classes.contentWrapOpen );
-						
-					self._fixedToolbarOpenClasses = self._getPosDisplayClasses( o.classes.contentFixedToolbar );
-					self._fixedToolbar
-						.removeClass( o.classes.contentFixedToolbarClosed )
-						.addClass( self._fixedToolbarOpenClasses + " " + o.classes.contentFixedToolbarOpen );
-						
-					self._modalOpenClasses = self._getPosDisplayClasses( o.classes.modal ) + " " + o.classes.modalOpen;
-					if ( self._modal ) {
-						self._modal.addClass( self._modalOpenClasses );
-					}
-				},
-				complete = function() {
-					self.element.add( self._wrapper ).off( self._transitionEndEvents, complete );
-
-					self._page.addClass( o.classes.pagePanelOpen );
-					
-					self._positionPanel();
-					self._bindFixListener();
-					
-					self._trigger( "open" );
-				};
-
-			if ( this.element.closest( ".ui-page-active" ).length < 0 ) {
-				immediate = true;
-			}
-			
-			self._trigger( "beforeopen" );
-			
-			if ( self._page.jqmData('panel') === "open" ) {
-				self._page.on( "panelclose", function() {
-					_openPanel();
-				});
-			} else {
-				_openPanel();
-			}
-			
-			self._open = true;
-		}
-	},
-
-	close: function( immediate ) {
-		if ( this._open ) {
-			var o = this.options,
-				self = this,
-				_closePanel = function() {
-					if ( !immediate && $.support.cssTransform3d && !!o.animate ) {
-						self.element.add( self._wrapper ).on( self._transitionEndEvents, complete );
-					} else {
-						setTimeout( complete, 0 );
-					}
-					
-					self._page.removeClass( o.classes.pagePanelOpen );
-					self.element.removeClass( o.classes.panelOpen );
-					self._wrapper.removeClass( o.classes.contentWrapOpen );
-					self._fixedToolbar.removeClass( o.classes.contentFixedToolbarOpen );
-					
-					if ( self._modal ) {
-						self._modal.removeClass( self._modalOpenClasses );
-					}
-				},
-				complete = function() {
-					if ( self.options.theme && self.options.display !== "overlay" ) {
-						self._page.removeClass( "ui-body-" + self.options.theme ).addClass( self._pageTheme );
-					}
-					self.element.add( self._wrapper ).off( self._transitionEndEvents, complete );
-					self.element.addClass( o.classes.panelClosed );
-					
-					self._wrapper
-						.removeClass( self._contentWrapOpenClasses )
-						.addClass( o.classes.contentWrapClosed );
-						
-					self._fixedToolbar
-						.removeClass( self._fixedToolbarOpenClasses )
-						.addClass( o.classes.contentFixedToolbarClosed );
-						
-					self._fixPanel();
-					self._unbindFixListener();
-					$.mobile.resetActivePageHeight();
-					
-					self._page.jqmRemoveData( "panel" );
-					self._trigger( "close" );
-				};
-				
-			if ( this.element.closest( ".ui-page-active" ).length < 0 ) {
-				immediate = true;
-			}
-			self._trigger( "beforeclose" );
-
-			_closePanel();
-
-			self._open = false;
-		}
-	},
-
-	toggle: function( options ) {
-		this[ this._open ? "close" : "open" ]();
-	},
-
-	_transitionEndEvents: "webkitTransitionEnd oTransitionEnd otransitionend transitionend msTransitionEnd",
-
-	_destroy: function() {
-		var classes = this.options.classes,
-			theme = this.options.theme,
-			hasOtherSiblingPanels = this.element.siblings( "." + classes.panel ).length;
-
-		// create
-		if ( !hasOtherSiblingPanels ) {
-			this._wrapper.children().unwrap();
-			this._page.find( "a" ).unbind( "panelopen panelclose" );
-			this._page.removeClass( classes.pagePanel );
-			if ( this._open ) {
-				this._page.jqmRemoveData( "panel" );
-				this._page.removeClass( classes.pagePanelOpen );
-				if ( theme ) {
-					this._page.removeClass( "ui-body-" + theme ).addClass( this._pageTheme );
-				}
-				$.mobile.resetActivePageHeight();
-			}
-		} else if ( this._open ) {
-			this._wrapper.removeClass( classes.contentWrapOpen );
-			this._fixedToolbar.removeClass( classes.contentFixedToolbarOpen );
-			this._page.jqmRemoveData( "panel" );
-			this._page.removeClass( classes.pagePanelOpen );
-			if ( theme ) {
-				this._page.removeClass( "ui-body-" + theme ).addClass( this._pageTheme );
-			}
-		}
-		
-		this._pannelInner.children().unwrap();
-
-		this.element.removeClass( [ this._getPanelClasses(), classes.panelAnimate ].join( " " ) )
-			.off( "swipeleft.panel swiperight.panel" )
-			.off( "panelbeforeopen" )
-			.off( "panelhide" )
-			.off( "keyup.panel" )
-			.off( "updatelayout" );
-
-		this._closeLink.off( "click.panel" );
-
-		if ( this._modal ) {
-			this._modal.remove();
-		}
-
-		// open and close
-		this.element.off( this._transitionEndEvents )
-			.removeClass( [ classes.panelUnfixed, classes.panelClosed, classes.panelOpen ].join( " " ) );
-	}
-});
-
-//auto self-init widgets
-$( document ).bind( "pagecreate create", function( e ) {
-	$.mobile.panel.prototype.enhanceWithin( e.target );
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-$.widget( "mobile.table", $.mobile.widget, {
-
-		options: {
-			classes: {
-				table: "ui-table"
-			},
-			initSelector: ":jqmData(role='table')"
-		},
-
-		_create: function() {
-
-			var self = this,
-				trs = this.element.find( "thead tr" );
-
-			this.element.addClass( this.options.classes.table );
-
-			// Expose headers and allHeaders properties on the widget
-			// headers references the THs within the first TR in the table
-			self.headers = this.element.find( "tr:eq(0)" ).children();
-
-			// allHeaders references headers, plus all THs in the thead, which may include several rows, or not
-			self.allHeaders = self.headers.add( trs.children() );
-
-			trs.each(function(){
-
-				var coltally = 0;
-
-				$( this ).children().each(function( i ){
-
-					var span = parseInt( $( this ).attr( "colspan" ), 10 ),
-						sel = ":nth-child(" + ( coltally + 1 ) + ")";
-					
-					$( this )
-						.jqmData( "colstart", coltally + 1 );
-
-					if( span ){
-						for( var j = 0; j < span - 1; j++ ){
-							coltally++;
-							sel += ", :nth-child(" + ( coltally + 1 ) + ")";
-						}
-					}
-
-					// Store "cells" data on header as a reference to all cells in the same column as this TH
-					$( this )
-						.jqmData( "cells", self.element.find( "tr" ).not( trs.eq(0) ).not( this ).children( sel ) );
-
-					coltally++;
-
-				});
-
-			});
-
-	}
-
-});
-
-//auto self-init widgets
-$.mobile.document.bind( "pagecreate create", function( e ) {
-	$.mobile.table.prototype.enhanceWithin( e.target );
-});
-
-})( jQuery );
-
-
-(function( $, undefined ) {
-
-$.mobile.table.prototype.options.mode = "columntoggle";
-
-$.mobile.table.prototype.options.columnBtnTheme = null;
-
-$.mobile.table.prototype.options.columnPopupTheme = null;
-
-$.mobile.table.prototype.options.columnBtnText = "Columns...";
-
-$.mobile.table.prototype.options.classes = $.extend(
-	$.mobile.table.prototype.options.classes,
-	{
-		popup: "ui-table-columntoggle-popup",
-		columnBtn: "ui-table-columntoggle-btn",
-		priorityPrefix: "ui-table-priority-",
-		columnToggleTable: "ui-table-columntoggle"
-	}
-);
-
-$.mobile.document.delegate( ":jqmData(role='table')", "tablecreate", function() {
-
-	var $table = $( this ),
-		self = $table.data( "mobile-table" ),
-		o = self.options,
-		ns = $.mobile.ns;
-
-	if( o.mode !== "columntoggle" ){
-		return;
-	}
-
-	self.element.addClass( o.classes.columnToggleTable );
-
-	var id = ( $table.attr( "id" ) || o.classes.popup ) + "-popup", //TODO BETTER FALLBACK ID HERE
-		$menuButton = $( "<a href='#" + id + "' class='" + o.classes.columnBtn + "' data-" + ns + "rel='popup' data-" + ns + "mini='true'>" + o.columnBtnText + "</a>" ),
-		$popup = $( "<div data-" + ns + "role='popup' data-" + ns + "role='fieldcontain' class='" + o.classes.popup + "' id='" + id + "'></div>"),
-		$menu = $("<fieldset data-" + ns + "role='controlgroup'></fieldset>");
-
-	// create the hide/show toggles
-	self.headers.not( "td" ).each(function(){
-
-		var priority = $( this ).jqmData( "priority" ),
-			$cells = $( this ).add( $( this ).jqmData( "cells" ) );
-
-		if( priority ){
-
-			$cells.addClass( o.classes.priorityPrefix + priority );
-
-			$("<label><input type='checkbox' checked />" + $( this ).text() + "</label>" )
-				.appendTo( $menu )
-				.children( 0 )
-				.jqmData( "cells", $cells )
-				.checkboxradio({
-					theme: o.columnPopupTheme
-				});
-		}
-	});
-		$menu.appendTo( $popup );
-
-	// bind change event listeners to inputs - TODO: move to a private method?
-	$menu.on( "change", "input", function( e ){
-		if( this.checked ){
-			$( this ).jqmData( "cells" ).removeClass( "ui-table-cell-hidden" ).addClass( "ui-table-cell-visible" );
-		}
-		else {
-			$( this ).jqmData( "cells" ).removeClass( "ui-table-cell-visible" ).addClass( "ui-table-cell-hidden" );
-		}
-	});
-
-	$menuButton
-		.insertBefore( $table )
-		.buttonMarkup({
-			theme: o.columnBtnTheme
-		});
-
-	$popup
-		.insertBefore( $table )
-		.popup();
-
-	// refresh method
-	self.refresh = function(){
-		$menu.find( "input" ).each( function(){
-			this.checked = $( this ).jqmData( "cells" ).eq(0).css( "display" ) === "table-cell";
-			$( this ).checkboxradio( "refresh" );
-		});
-	};
-
-	$.mobile.window.on( "throttledresize", self.refresh );
-
-	self.refresh();
-
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-$.mobile.table.prototype.options.mode = "reflow";
-
-$.mobile.table.prototype.options.classes = $.extend(
-	$.mobile.table.prototype.options.classes,
-	{
-		reflowTable: "ui-table-reflow",
-		cellLabels: "ui-table-cell-label"
-	}
-);
-
-$.mobile.document.delegate( ":jqmData(role='table')", "tablecreate", function() {
-
-	var $table = $( this ),
-		self = $table.data( "mobile-table" ),
-		o = self.options;
-
-	// If it's not reflow mode, return here.
-	if( o.mode !== "reflow" ){
-		return;
-	}
-
-	self.element.addClass( o.classes.reflowTable );
-
-	// get headers in reverse order so that top-level headers are appended last
-	var reverseHeaders =  $( self.allHeaders.get().reverse() );
-
-	// create the hide/show toggles
-	reverseHeaders.each(function(i){
-		var $cells = $( this ).jqmData( "cells" ),
-			colstart = $( this ).jqmData( "colstart" ),
-			hierarchyClass = $cells.not( this ).filter( "thead th" ).length && " ui-table-cell-label-top",
-			text = $(this).text();
-
-			if( text !== ""  ){
-
-				if( hierarchyClass ){
-					var iteration = parseInt( $( this ).attr( "colspan" ), 10 ),
-						filter = "";
-
-					if( iteration ){
-						filter = "td:nth-child("+ iteration +"n + " + ( colstart ) +")";
-					}
-					$cells.filter( filter ).prepend( "<b class='" + o.classes.cellLabels + hierarchyClass + "'>" + text + "</b>"  );
-				}
-				else {
-					$cells.prepend( "<b class='" + o.classes.cellLabels + "'>" + text + "</b>"  );
-				}
-
-			}
-	});
-
-});
-
-})( jQuery );
-
-(function( $ ) {
-	var	meta = $( "meta[name=viewport]" ),
-		initialContent = meta.attr( "content" ),
-		disabledZoom = initialContent + ",maximum-scale=1, user-scalable=no",
-		enabledZoom = initialContent + ",maximum-scale=10, user-scalable=yes",
-		disabledInitially = /(user-scalable[\s]*=[\s]*no)|(maximum-scale[\s]*=[\s]*1)[$,\s]/.test( initialContent );
-
-	$.mobile.zoom = $.extend( {}, {
-		enabled: !disabledInitially,
-		locked: false,
-		disable: function( lock ) {
-			if ( !disabledInitially && !$.mobile.zoom.locked ) {
-				meta.attr( "content", disabledZoom );
-				$.mobile.zoom.enabled = false;
-				$.mobile.zoom.locked = lock || false;
-			}
-		},
-		enable: function( unlock ) {
-			if ( !disabledInitially && ( !$.mobile.zoom.locked || unlock === true ) ) {
-				meta.attr( "content", enabledZoom );
-				$.mobile.zoom.enabled = true;
-				$.mobile.zoom.locked = false;
-			}
-		},
-		restore: function() {
-			if ( !disabledInitially ) {
-				meta.attr( "content", initialContent );
-				$.mobile.zoom.enabled = true;
-			}
-		}
-	});
-
-}( jQuery ));
-
-(function( $, undefined ) {
-
-$.widget( "mobile.textinput", $.mobile.widget, {
-	options: {
-		theme: null,
-		mini: false,
-		// This option defaults to true on iOS devices.
-		preventFocusZoom: /iPhone|iPad|iPod/.test( navigator.platform ) && navigator.userAgent.indexOf( "AppleWebKit" ) > -1,
-		initSelector: "input[type='text'], input[type='search'], :jqmData(type='search'), input[type='number'], :jqmData(type='number'), input[type='password'], input[type='email'], input[type='url'], input[type='tel'], textarea, input[type='time'], input[type='date'], input[type='month'], input[type='week'], input[type='datetime'], input[type='datetime-local'], input[type='color'], input:not([type]), input[type='file']",
-		clearBtn: false,
-		clearSearchButtonText: null, //deprecating for 1.3...
-		clearBtnText: "clear text",
-		disabled: false
-	},
-
-	_create: function() {
-
-		var self = this,
-			input = this.element,
-			o = this.options,
-			theme = o.theme || $.mobile.getInheritedTheme( this.element, "c" ),
-			themeclass  = " ui-body-" + theme,
-			miniclass = o.mini ? " ui-mini" : "",
-			isSearch = input.is( "[type='search'], :jqmData(type='search')" ),
-			focusedEl,
-			clearbtn,
-			clearBtnText = o.clearSearchButtonText || o.clearBtnText,
-			clearBtnBlacklist = input.is( "textarea, :jqmData(type='range')" ),
-			inputNeedsClearBtn = !!o.clearBtn && !clearBtnBlacklist,
-			inputNeedsWrap = input.is( "input" ) && !input.is( ":jqmData(type='range')" );
-
-		function toggleClear() {
-			setTimeout( function() {
-				clearbtn.toggleClass( "ui-input-clear-hidden", !input.val() );
-			}, 0 );
-		}
-
-		$( "label[for='" + input.attr( "id" ) + "']" ).addClass( "ui-input-text" );
-
-		focusedEl = input.addClass( "ui-input-text ui-body-"+ theme );
-
-		// XXX: Temporary workaround for issue 785 (Apple bug 8910589).
-		//      Turn off autocorrect and autocomplete on non-iOS 5 devices
-		//      since the popup they use can't be dismissed by the user. Note
-		//      that we test for the presence of the feature by looking for
-		//      the autocorrect property on the input element. We currently
-		//      have no test for iOS 5 or newer so we're temporarily using
-		//      the touchOverflow support flag for jQM 1.0. Yes, I feel dirty. - jblas
-		if ( typeof input[0].autocorrect !== "undefined" && !$.support.touchOverflow ) {
-			// Set the attribute instead of the property just in case there
-			// is code that attempts to make modifications via HTML.
-			input[0].setAttribute( "autocorrect", "off" );
-			input[0].setAttribute( "autocomplete", "off" );
-		}
-
-		//"search" and "text" input widgets
-		if ( isSearch ) {
-			focusedEl = input.wrap( "<div class='ui-input-search ui-shadow-inset ui-btn-corner-all ui-btn-shadow ui-icon-searchfield" + themeclass + miniclass + "'></div>" ).parent();
-		} else if ( inputNeedsWrap ) {
-			focusedEl = input.wrap( "<div class='ui-input-text ui-shadow-inset ui-corner-all ui-btn-shadow" + themeclass + miniclass + "'></div>" ).parent();
-		}
-
-		if( inputNeedsClearBtn || isSearch ) {
-			clearbtn = $( "<a href='#' class='ui-input-clear' title='" + clearBtnText + "'>" + clearBtnText + "</a>" )
-				.bind( "click", function( event ) {
-					input
-						.val( "" )
-						.focus()
-						.trigger( "change" );
-					clearbtn.addClass( "ui-input-clear-hidden" );
-					event.preventDefault();
-				})
-				.appendTo( focusedEl )
-				.buttonMarkup({
-					icon: "delete",
-					iconpos: "notext",
-					corners: true,
-					shadow: true,
-					mini: o.mini
-				});
-				
-			if ( !isSearch ) {
-				focusedEl.addClass( "ui-input-has-clear" );
-			}
-
-			toggleClear();
-
-			input.bind( "paste cut keyup input focus change blur", toggleClear );
-		}
-		else if ( !inputNeedsWrap && !isSearch ) {
-			input.addClass( "ui-corner-all ui-shadow-inset" + themeclass + miniclass );
-		}
-
-		input.focus(function() {
-				// In many situations, iOS will zoom into the input upon tap, this prevents that from happening
-				if ( o.preventFocusZoom ) {
-					$.mobile.zoom.disable( true );
-				}			
-				focusedEl.addClass( $.mobile.focusClass );
-			})
-			.blur(function() {
-				focusedEl.removeClass( $.mobile.focusClass );
-				if ( o.preventFocusZoom ) {
-					$.mobile.zoom.enable( true );
-				}				
-			})
-
-		// Autogrow
-		if ( input.is( "textarea" ) ) {
-			var extraLineHeight = 15,
-				keyupTimeoutBuffer = 100,
-				keyupTimeout;
-
-			this._keyup = function() {
-				var scrollHeight = input[ 0 ].scrollHeight,
-					clientHeight = input[ 0 ].clientHeight;
-
-				if ( clientHeight < scrollHeight ) {
-					input.height( scrollHeight + extraLineHeight );
-				}
-			};
-
-			input.on( "keyup change input paste", function() {
-				clearTimeout( keyupTimeout );
-				keyupTimeout = setTimeout( self._keyup, keyupTimeoutBuffer );
-			});
-
-			// binding to pagechange here ensures that for pages loaded via
-			// ajax the height is recalculated without user input
-			this._on( $.mobile.document, { "pagechange": "_keyup" });
-
-			// Issue 509: the browser is not providing scrollHeight properly until the styles load
-			if ( $.trim( input.val() ) ) {
-				// bind to the window load to make sure the height is calculated based on BOTH
-				// the DOM and CSS
-				this._on( $.mobile.window, {"load": "_keyup"});
-			}
-		}
-		if ( input.attr( "disabled" ) ) {
-			this.disable();
-		}
-	},
-
-	disable: function() {
-		var $el,
-			isSearch = this.element.is( "[type='search'], :jqmData(type='search')" ),
-			inputNeedsWrap = this.element.is( "input" ) && !this.element.is( ":jqmData(type='range')" ),
-			parentNeedsDisabled = this.element.attr( "disabled", true )	&& ( inputNeedsWrap || isSearch );
-			
-		if ( parentNeedsDisabled ) {
-			$el = this.element.parent();
-		} else {
-			$el = this.element;
-		}
-		$el.addClass( "ui-disabled" );
-		return this._setOption( "disabled", true );
-	},
-
-	enable: function() {
-		var $el,
-			isSearch = this.element.is( "[type='search'], :jqmData(type='search')" ),
-			inputNeedsWrap = this.element.is( "input" ) && !this.element.is( ":jqmData(type='range')" ),
-			parentNeedsEnabled = this.element.attr( "disabled", false )	&& ( inputNeedsWrap || isSearch );
-
-		if ( parentNeedsEnabled ) {
-			$el = this.element.parent();
-		} else {
-			$el = this.element;
-		}
-		$el.removeClass( "ui-disabled" );
-		return this._setOption( "disabled", false );
-	}
-});
-
-//auto self-init widgets
-$.mobile.document.bind( "pagecreate create", function( e ) {
-	$.mobile.textinput.prototype.enhanceWithin( e.target, true );
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-$.mobile.listview.prototype.options.filter = false;
-$.mobile.listview.prototype.options.filterPlaceholder = "Filter items...";
-$.mobile.listview.prototype.options.filterTheme = "c";
-$.mobile.listview.prototype.options.filterReveal = false;
-// TODO rename callback/deprecate and default to the item itself as the first argument
-var defaultFilterCallback = function( text, searchValue, item ) {
-		return text.toString().toLowerCase().indexOf( searchValue ) === -1;
-	};
-
-$.mobile.listview.prototype.options.filterCallback = defaultFilterCallback;
-
-$.mobile.document.delegate( "ul, ol", "listviewcreate", function() {
-
-	var list = $( this ),
-		listview = list.data( "mobile-listview" );
-
-	if ( !listview.options.filter ) {
-		return;
-	}
-
-	if ( listview.options.filterReveal ) {
-		list.children().addClass( "ui-screen-hidden" );
-	}
-
-	var wrapper = $( "<form>", {
-			"class": "ui-listview-filter ui-bar-" + listview.options.filterTheme,
-			"role": "search"
-		}).submit( function( e ) {
-			e.preventDefault();
-			search.blur();
-		}),
-		onKeyUp = function( e ) {
-			var $this = $( this ),
-				val = this.value.toLowerCase(),
-				listItems = null,
-				li = list.children(),
-				lastval = $this.jqmData( "lastval" ) + "",
-				childItems = false,
-				itemtext = "",
-				item,
-				// Check if a custom filter callback applies
-				isCustomFilterCallback = listview.options.filterCallback !== defaultFilterCallback;
-
-			if ( lastval && lastval === val ) {
-				// Execute the handler only once per value change
-				return;
-			}
-
-			listview._trigger( "beforefilter", "beforefilter", { input: this } );
-
-			// Change val as lastval for next execution
-			$this.jqmData( "lastval" , val );
-			if ( isCustomFilterCallback || val.length < lastval.length || val.indexOf( lastval ) !== 0 ) {
-
-				// Custom filter callback applies or removed chars or pasted something totally different, check all items
-				listItems = list.children();
-			} else {
-
-				// Only chars added, not removed, only use visible subset
-				listItems = list.children( ":not(.ui-screen-hidden)" );
-
-				if ( !listItems.length && listview.options.filterReveal ) {
-					listItems = list.children( ".ui-screen-hidden" );
-				}
-			}
-
-			if ( val ) {
-
-				// This handles hiding regular rows without the text we search for
-				// and any list dividers without regular rows shown under it
-
-				for ( var i = listItems.length - 1; i >= 0; i-- ) {
-					item = $( listItems[ i ] );
-					itemtext = item.jqmData( "filtertext" ) || item.text();
-
-					if ( item.is( "li:jqmData(role=list-divider)" ) ) {
-
-						item.toggleClass( "ui-filter-hidequeue" , !childItems );
-
-						// New bucket!
-						childItems = false;
-
-					} else if ( listview.options.filterCallback( itemtext, val, item ) ) {
-
-						//mark to be hidden
-						item.toggleClass( "ui-filter-hidequeue" , true );
-					} else {
-
-						// There's a shown item in the bucket
-						childItems = true;
-					}
-				}
-
-				// Show items, not marked to be hidden
-				listItems
-					.filter( ":not(.ui-filter-hidequeue)" )
-					.toggleClass( "ui-screen-hidden", false );
-
-				// Hide items, marked to be hidden
-				listItems
-					.filter( ".ui-filter-hidequeue" )
-					.toggleClass( "ui-screen-hidden", true )
-					.toggleClass( "ui-filter-hidequeue", false );
-
-			} else {
-
-				//filtervalue is empty => show all
-				listItems.toggleClass( "ui-screen-hidden", !!listview.options.filterReveal );
-			}
-			listview._addFirstLastClasses( li, listview._getVisibles( li, false ), false );
-		},
-		search = $( "<input>", {
-			placeholder: listview.options.filterPlaceholder
-		})
-		.attr( "data-" + $.mobile.ns + "type", "search" )
-		.jqmData( "lastval", "" )
-		.bind( "keyup change input", onKeyUp )
-		.appendTo( wrapper )
-		.textinput();
-
-	if ( listview.options.inset ) {
-		wrapper.addClass( "ui-listview-filter-inset" );
-	}
-
-	wrapper.bind( "submit", function() {
-		return false;
-	})
-	.insertBefore( list );
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-
-$.widget( "mobile.slider", $.mobile.widget, {
-	widgetEventPrefix: "slide",
-
-	options: {
-		theme: null,
-		trackTheme: null,
-		disabled: false,
-		initSelector: "input[type='range'], :jqmData(type='range'), :jqmData(role='slider')",
-		mini: false,
-		highlight: false
-	},
-
-	_create: function() {
-
-		// TODO: Each of these should have comments explain what they're for
-		var self = this,
-			control = this.element,
-			parentTheme = $.mobile.getInheritedTheme( control, "c" ),
-			theme = this.options.theme || parentTheme,
-			trackTheme = this.options.trackTheme || parentTheme,
-			cType = control[ 0 ].nodeName.toLowerCase(),
-			isSelect = this.isToggleSwitch = cType === "select",
-			isRangeslider = control.parent().is( ":jqmData(role='rangeslider')" ),
-			selectClass = ( this.isToggleSwitch ) ? "ui-slider-switch" : "",
-			controlID = control.attr( "id" ),
-			$label = $( "[for='" + controlID + "']" ),
-			labelID = $label.attr( "id" ) || controlID + "-label",
-			label = $label.attr( "id", labelID ),
-			min = !this.isToggleSwitch ? parseFloat( control.attr( "min" ) ) : 0,
-			max =  !this.isToggleSwitch ? parseFloat( control.attr( "max" ) ) : control.find( "option" ).length-1,
-			step = window.parseFloat( control.attr( "step" ) || 1 ),
-			miniClass = ( this.options.mini || control.jqmData( "mini" ) ) ? " ui-mini" : "",
-			domHandle = document.createElement( "a" ),
-			handle = $( domHandle ),
-			domSlider = document.createElement( "div" ),
-			slider = $( domSlider ),
-			valuebg = this.options.highlight && !this.isToggleSwitch ? (function() {
-				var bg = document.createElement( "div" );
-				bg.className = "ui-slider-bg " + $.mobile.activeBtnClass + " ui-btn-corner-all";
-				return $( bg ).prependTo( slider );
-			})() : false,
-			options;
-			
-		domHandle.setAttribute( "href", "#" );
-		domSlider.setAttribute( "role", "application" );
-		domSlider.className = [this.isToggleSwitch ? "ui-slider " : "ui-slider-track ",selectClass," ui-btn-down-",trackTheme," ui-btn-corner-all", miniClass].join( "" );
-		domHandle.className = "ui-slider-handle";
-		domSlider.appendChild( domHandle );
-
-		handle.buttonMarkup({ corners: true, theme: theme, shadow: true })
-				.attr({
-					"role": "slider",
-					"aria-valuemin": min,
-					"aria-valuemax": max,
-					"aria-valuenow": this._value(),
-					"aria-valuetext": this._value(),
-					"title": this._value(),
-					"aria-labelledby": labelID
-				});
-
-		$.extend( this, {
-			slider: slider,
-			handle: handle,
-			type: cType,
-			step: step,
-			max: max,
-			min: min,
-			valuebg: valuebg,
-			isRangeslider: isRangeslider,
-			dragging: false,
-			beforeStart: null,
-			userModified: false,
-			mouseMoved: false
-		});
-
-		if ( this.isToggleSwitch ) {
-			var wrapper = document.createElement( "div" );
-			wrapper.className = "ui-slider-inneroffset";
-
-			for ( var j = 0, length = domSlider.childNodes.length; j < length; j++ ) {
-				wrapper.appendChild( domSlider.childNodes[j] );
-			}
-
-			domSlider.appendChild( wrapper );
-
-			// slider.wrapInner( "<div class='ui-slider-inneroffset'></div>" );
-
-			// make the handle move with a smooth transition
-			handle.addClass( "ui-slider-handle-snapping" );
-
-			options = control.find( "option" );
-
-			for ( var i = 0, optionsCount = options.length; i < optionsCount; i++ ) {
-				var side = !i ? "b" : "a",
-					sliderTheme = !i ? " ui-btn-down-" + trackTheme : ( " " + $.mobile.activeBtnClass ),
-					sliderLabel = document.createElement( "div" ),
-					sliderImg = document.createElement( "span" );
-
-				sliderImg.className = ["ui-slider-label ui-slider-label-", side, sliderTheme, " ui-btn-corner-all"].join( "" );
-				sliderImg.setAttribute( "role", "img" );
-				sliderImg.appendChild( document.createTextNode( options[i].innerHTML ) );
-				$( sliderImg ).prependTo( slider );
-			}
-
-			self._labels = $( ".ui-slider-label", slider );
-
-		}
-
-		label.addClass( "ui-slider" );
-		
-		// monitor the input for updated values
-		control.addClass( this.isToggleSwitch ? "ui-slider-switch" : "ui-slider-input" );
-
-		this._on( control, {
-			"change": "_controlChange",
-			"keyup": "_controlKeyup",
-			"blur": "_controlBlur",
-			"vmouseup": "_controlVMouseUp"
-		});
-
-		slider.bind( "vmousedown", $.proxy( this._sliderVMouseDown, this ) )
-			.bind( "vclick", false );
-
-		// We have to instantiate a new function object for the unbind to work properly
-		// since the method itself is defined in the prototype (causing it to unbind everything)
-		this._on( document, { "vmousemove": "_preventDocumentDrag" });
-		this._on( slider.add( document ), { "vmouseup": "_sliderVMouseUp" });
-
-		slider.insertAfter( control );
-
-		// wrap in a div for styling purposes
-		if ( !this.isToggleSwitch && !isRangeslider ) {
-			var wrapper = this.options.mini ? "<div class='ui-slider ui-mini'>" : "<div class='ui-slider'>";
-			
-			control.add( slider ).wrapAll( wrapper );
-		}
-
-		// Only add focus class to toggle switch, sliders get it automatically from ui-btn
-		if ( this.isToggleSwitch ) {
-			this.handle.bind({
-				focus: function() {
-					slider.addClass( $.mobile.focusClass );
-				},
-
-				blur: function() {
-					slider.removeClass( $.mobile.focusClass );
-				}
-			});
-		}
-
-		// bind the handle event callbacks and set the context to the widget instance
-		this._on( this.handle, {
-			"vmousedown": "_handleVMouseDown",
-			"keydown": "_handleKeydown",
-			"keyup": "_handleKeyup"
-		});
-
-		this.handle.bind( "vclick", false );
-
-		if ( this._handleFormReset ) {
-			this._handleFormReset();
-		}
-
-		this.refresh( undefined, undefined, true );
-	},
-
-	_controlChange: function( event ) {
-		// if the user dragged the handle, the "change" event was triggered from inside refresh(); don't call refresh() again
-		if ( this._trigger( "controlchange", event ) === false ) {
-			return false;
-		}
-		if ( !this.mouseMoved ) {
-			this.refresh( this._value(), true );
-		}
-	},
-
-	_controlKeyup: function( event ) { // necessary?
-		this.refresh( this._value(), true, true );
-	},
-
-	_controlBlur: function( event ) {
-		this.refresh( this._value(), true );
-	},
-
-	// it appears the clicking the up and down buttons in chrome on
-	// range/number inputs doesn't trigger a change until the field is
-	// blurred. Here we check thif the value has changed and refresh
-	_controlVMouseUp: function( event ) {
-		this._checkedRefresh();
-	},
-
-	// NOTE force focus on handle
-	_handleVMouseDown: function( event ) {
-		this.handle.focus();
-	},
-
-	_handleKeydown: function( event ) {
-		var index = this._value();
-		if ( this.options.disabled ) {
-			return;
-		}
-
-		// In all cases prevent the default and mark the handle as active
-		switch ( event.keyCode ) {
-		 case $.mobile.keyCode.HOME:
-		 case $.mobile.keyCode.END:
-		 case $.mobile.keyCode.PAGE_UP:
-		 case $.mobile.keyCode.PAGE_DOWN:
-		 case $.mobile.keyCode.UP:
-		 case $.mobile.keyCode.RIGHT:
-		 case $.mobile.keyCode.DOWN:
-		 case $.mobile.keyCode.LEFT:
-			event.preventDefault();
-
-			if ( !this._keySliding ) {
-				this._keySliding = true;
-				this.handle.addClass( "ui-state-active" );
-			}
-
-			break;
-		}
-
-		// move the slider according to the keypress
-		switch ( event.keyCode ) {
-		 case $.mobile.keyCode.HOME:
-			this.refresh( this.min );
-			break;
-		 case $.mobile.keyCode.END:
-			this.refresh( this.max );
-			break;
-		 case $.mobile.keyCode.PAGE_UP:
-		 case $.mobile.keyCode.UP:
-		 case $.mobile.keyCode.RIGHT:
-			this.refresh( index + this.step );
-			break;
-		 case $.mobile.keyCode.PAGE_DOWN:
-		 case $.mobile.keyCode.DOWN:
-		 case $.mobile.keyCode.LEFT:
-			this.refresh( index - this.step );
-			break;
-		}
-	}, // remove active mark
-
-	_handleKeyup: function( event ) {
-		if ( this._keySliding ) {
-			this._keySliding = false;
-			this.handle.removeClass( "ui-state-active" );
-		}
-	},
-
-	_sliderVMouseDown: function( event ) {
-		// NOTE: we don't do this in refresh because we still want to
-		//       support programmatic alteration of disabled inputs
-		if ( this.options.disabled ) {
-			return false;
-		}
-		if ( this._trigger( "beforestart", event ) === false ) {
-			return false;
-		}
-		this.dragging = true;
-		this.userModified = false;
-		this.mouseMoved = false;
-
-		if ( this.isToggleSwitch ) {
-			this.beforeStart = this.element[0].selectedIndex;
-		}
-
-		
-		this.refresh( event );
- 		this._trigger( "start" );
-		return false;
-	},
-
-	_sliderVMouseUp: function() {
-		if ( this.dragging ) {
-			this.dragging = false;
-
-			if ( this.isToggleSwitch ) {
-				// make the handle move with a smooth transition
-				this.handle.addClass( "ui-slider-handle-snapping" );
-
-				if ( this.mouseMoved ) {
-					// this is a drag, change the value only if user dragged enough
-					if ( this.userModified ) {
-						this.refresh( this.beforeStart === 0 ? 1 : 0 );
-					} else {
-						this.refresh( this.beforeStart );
-					}
-				} else {
-					// this is just a click, change the value
-					this.refresh( this.beforeStart === 0 ? 1 : 0 );
-				}
-			}
-
-			this.mouseMoved = false;
-			this._trigger( "stop" );
-			return false;
-		}
-	},
-
-	_preventDocumentDrag: function( event ) {
-			// NOTE: we don't do this in refresh because we still want to
-			//       support programmatic alteration of disabled inputs
-			if ( this._trigger( "drag", event ) === false) {
-				return false;
-			}
-			if ( this.dragging && !this.options.disabled ) {
-				
-				// this.mouseMoved must be updated before refresh() because it will be used in the control "change" event
-				this.mouseMoved = true;
-
-				if ( this.isToggleSwitch ) {
-					// make the handle move in sync with the mouse
-					this.handle.removeClass( "ui-slider-handle-snapping" );
-				}
-				
-				this.refresh( event );
-
-				// only after refresh() you can calculate this.userModified
-				this.userModified = this.beforeStart !== this.element[0].selectedIndex;
-				return false;
-			}
-		},
-
-	_checkedRefresh: function() {
-		if ( this.value != this._value() ) {
-			this.refresh( this._value() );
-		}
-	},
-
-	_value: function() {
-		return  this.isToggleSwitch ? this.element[0].selectedIndex : parseFloat( this.element.val() ) ;
-	},
-
-
-	_reset: function() {
-		this.refresh( undefined, false, true );
-	},
-
-	refresh: function( val, isfromControl, preventInputUpdate ) {
-		// NOTE: we don't return here because we want to support programmatic
-		//       alteration of the input value, which should still update the slider
-		
-		var self = this,
-			parentTheme = $.mobile.getInheritedTheme( this.element, "c" ),
-			theme = this.options.theme || parentTheme,
-			trackTheme = this.options.trackTheme || parentTheme;
-
-		self.slider[0].className = [ this.isToggleSwitch ? "ui-slider ui-slider-switch" : "ui-slider-track"," ui-btn-down-" + trackTheme,' ui-btn-corner-all', ( this.options.mini ) ? " ui-mini":""].join( "" );
-		if ( this.options.disabled || this.element.attr( "disabled" ) ) {
-			this.disable();
-		}
-
-		// set the stored value for comparison later
-		this.value = this._value();
-		if ( this.options.highlight && !this.isToggleSwitch && this.slider.find( ".ui-slider-bg" ).length === 0 ) {
-			this.valuebg = (function() {
-				var bg = document.createElement( "div" );
-				bg.className = "ui-slider-bg " + $.mobile.activeBtnClass + " ui-btn-corner-all";
-				return $( bg ).prependTo( self.slider );
-			})();
-		}
-		this.handle.buttonMarkup({ corners: true, theme: theme, shadow: true });
-
-		var pxStep, percent,
-			control = this.element,
-			isInput = !this.isToggleSwitch,
-			optionElements = isInput ? [] : control.find( "option" ),
-			min =  isInput ? parseFloat( control.attr( "min" ) ) : 0,
-			max = isInput ? parseFloat( control.attr( "max" ) ) : optionElements.length - 1,
-			step = ( isInput && parseFloat( control.attr( "step" ) ) > 0 ) ? parseFloat( control.attr( "step" ) ) : 1;
-			
-		if ( typeof val === "object" ) {
-			var left, width, data = val,
-				// a slight tolerance helped get to the ends of the slider
-				tol = 8;
-
-			left = this.slider.offset().left;
-			width = this.slider.width();
-			pxStep = width/((max-min)/step);
-			if ( !this.dragging ||
-					data.pageX < left - tol ||
-					data.pageX > left + width + tol ) {
-				return;
-			}
-			if ( pxStep > 1 ) {
-				percent = ( ( data.pageX - left ) / width ) * 100;
-			} else {
-				percent = Math.round( ( ( data.pageX - left ) / width ) * 100 );
-			}
-		} else {
-			if ( val == null ) {
-				val = isInput ? parseFloat( control.val() || 0 ) : control[0].selectedIndex;
-			}
-			percent = ( parseFloat( val ) - min ) / ( max - min ) * 100;
-		}
-
-		if ( isNaN( percent ) ) {
-			return;
-		}
-
-		var newval = ( percent / 100 ) * ( max - min ) + min;
-
-		//from jQuery UI slider, the following source will round to the nearest step
-		var valModStep = ( newval - min ) % step;
-		var alignValue = newval - valModStep;
-
-		if ( Math.abs( valModStep ) * 2 >= step ) {
-			alignValue += ( valModStep > 0 ) ? step : ( -step );
-		}
-
-		var percentPerStep = 100/((max-min)/step);
-		// Since JavaScript has problems with large floats, round
-		// the final value to 5 digits after the decimal point (see jQueryUI: #4124)
-		newval = parseFloat( alignValue.toFixed(5) );
-
-		if ( typeof pxStep === "undefined" ) {
-			pxStep = width / ( (max-min) / step );
-		}
-		if ( pxStep > 1 && isInput ) {
-			percent = ( newval - min ) * percentPerStep * ( 1 / step );
-		}
-		if ( percent < 0 ) {
-			percent = 0;
-		}
-
-		if ( percent > 100 ) {
-			percent = 100;
-		}
-
-		if ( newval < min ) {
-			newval = min;
-		}
-
-		if ( newval > max ) {
-			newval = max;
-		}
-
-		this.handle.css( "left", percent + "%" );
-
-		this.handle[0].setAttribute( "aria-valuenow", isInput ? newval : optionElements.eq( newval ).attr( "value" ) );
-
-		this.handle[0].setAttribute( "aria-valuetext", isInput ? newval : optionElements.eq( newval ).getEncodedText() );
-
-		this.handle[0].setAttribute( "title", isInput ? newval : optionElements.eq( newval ).getEncodedText() );
-
-		if ( this.valuebg ) {
-			this.valuebg.css( "width", percent + "%" );
-		}
-
-		// drag the label widths
-		if ( this._labels ) {
-			var handlePercent = this.handle.width() / this.slider.width() * 100,
-				aPercent = percent && handlePercent + ( 100 - handlePercent ) * percent / 100,
-				bPercent = percent === 100 ? 0 : Math.min( handlePercent + 100 - aPercent, 100 );
-
-			this._labels.each(function() {
-				var ab = $( this ).is( ".ui-slider-label-a" );
-				$( this ).width( ( ab ? aPercent : bPercent  ) + "%" );
-			});
-		}
-
-		if ( !preventInputUpdate ) {
-			var valueChanged = false;
-
-			// update control"s value
-			if ( isInput ) {
-				valueChanged = control.val() !== newval;
-				control.val( newval );
-			} else {
-				valueChanged = control[ 0 ].selectedIndex !== newval;
-				control[ 0 ].selectedIndex = newval;
-			}
-			if ( this._trigger( "beforechange", val ) === false) {
-					return false;
-			}
-			if ( !isfromControl && valueChanged ) {
-				control.trigger( "change" );
-			}
-		}
-	},
-
-	enable: function() {
-		this.element.attr( "disabled", false );
-		this.slider.removeClass( "ui-disabled" ).attr( "aria-disabled", false );
-		return this._setOption( "disabled", false );
-	},
-
-	disable: function() {
-		this.element.attr( "disabled", true );
-		this.slider.addClass( "ui-disabled" ).attr( "aria-disabled", true );
-		return this._setOption( "disabled", true );
-	}
-
-});
-
-$.widget( "mobile.slider", $.mobile.slider, $.mobile.behaviors.formReset );
-
-//auto self-init widgets
-$.mobile.document.bind( "pagecreate create", function( e ) {
-	$.mobile.slider.prototype.enhanceWithin( e.target, true );
-});
-
-})( jQuery );
-
-(function( $, undefined ) {
-	$.widget( "mobile.rangeslider", $.mobile.widget, {
-
-		options: {
-			theme: null,
-			trackTheme: null,
-			disabled: false,
-			initSelector: ":jqmData(role='rangeslider')",
-			mini: false,
-			highlight: true
-		},
-
-		_create: function() {
-			var secondLabel,
-			$el = this.element,
-			elClass = this.options.mini ? "ui-rangeslider ui-mini" : "ui-rangeslider",
-			_inputFirst = $el.find( "input" ).first(),
-			_inputLast = $el.find( "input" ).last(),
-			label = $el.find( "label" ).first(),
-			_sliderFirst = $.data( _inputFirst.get(0), "mobileSlider" ).slider,
-			_sliderLast = $.data( _inputLast.get(0), "mobileSlider" ).slider,
-			firstHandle = $.data( _inputFirst.get(0), "mobileSlider" ).handle,
-			_sliders = $( "<div class=\"ui-rangeslider-sliders\" />" ).appendTo( $el );
-			
-			if ( $el.find( "label" ).length > 1 ) {
-				secondLabel = $el.find( "label" ).last().hide();
-			}
-
-			_inputFirst.addClass( "ui-rangeslider-first" );
-			_inputLast.addClass( "ui-rangeslider-last" );
-			$el.addClass( elClass );
-			
-			_sliderFirst.appendTo( _sliders );
-			_sliderLast.appendTo( _sliders );
-			label.prependTo( $el );
-			firstHandle.prependTo( _sliderLast );
-
-			$.extend( this, {
-				_inputFirst: _inputFirst,
-				_inputLast: _inputLast,
-				_sliderFirst: _sliderFirst,
-				_sliderLast: _sliderLast,
-				_targetVal: null,
-				_sliderTarget: false,
-				_sliders: _sliders,
-				_proxy: false
-			});
-			
-			this.refresh();
-			this._on( this.element.find( "input.ui-slider-input" ), {
-				"slidebeforestart": "_slidebeforestart",
-				"slidestop": "_slidestop",
-				"slidedrag": "_slidedrag",
-				"slidebeforechange": "_change",
-				"blur": "_change",
-				"keyup": "_change"
-			});
-			this._on( firstHandle, {
-				"vmousedown": "_dragFirstHandle"
-			});
-		},
-
-		_dragFirstHandle: function( event ) {
-			//if the first handle is dragged send the event to the first slider
-			$.data( this._inputFirst.get(0), "mobileSlider" ).dragging = true;
-			$.data( this._inputFirst.get(0), "mobileSlider" ).refresh( event );
-			return false;
-		},
-
-		_slidedrag: function( event ) {
-			var first = $( event.target ).is( this._inputFirst ),
-				otherSlider = ( first ) ? this._inputLast : this._inputFirst;
-
-			this._sliderTarget = false;
-			//if the drag was initaed on an extream and the other handle is focused send the events to
-			//the closest handle
-			if ( ( this._proxy === "first" && first ) || ( this._proxy === "last" && !first ) ) {
-				$.data( otherSlider.get(0), "mobileSlider" ).dragging = true;
-				$.data( otherSlider.get(0), "mobileSlider" ).refresh( event );
-				return false;
-			}
-		},
-
-		_slidestop: function( event ) {
-			var first = $( event.target ).is( this._inputFirst );
-			
-			this._proxy = false;
-			//this stops dragging of the handle and brings the active track to the front 
-			//this makes clicks on the track go the the last handle used
-			this.element.find( "input" ).trigger( "vmouseup" );
-			this._sliderFirst.css( "z-index", first ? 1 : "" );
-		},
-
-		_slidebeforestart: function( event ) {
-			this._sliderTarget = false;
-			//if the track is the target remember this and the original value
-			if ( $( event.originalEvent.target ).hasClass( "ui-slider-track" ) ) {
-				this._sliderTarget = true;
-				this._targetVal = $( event.target ).val();
-			}
-		},
-
-		_setOption: function( options ) {
-			this._superApply( options );
-			this.refresh();
-		},
-
-		refresh: function() {
-			var $el = this.element,
-				o = this.options;
-
-			$el.find( "input" ).slider({
-				theme: o.theme,
-				trackTheme: o.trackTheme,
-				disabled: o.disabled,
-				mini: o.mini,
-				highlight: o.highlight
-			}).slider( "refresh" );
-			this._updateHighlight();
-		},
-
-		_change: function( event ) {
-			if ( event.type == "keyup" ) {
-				this._updateHighlight();
-				return false;
-			}
-
-			var min = parseFloat( this._inputFirst.val(), 10 ),
-				max = parseFloat( this._inputLast.val(), 10 ),
-				first = $( event.target ).hasClass( "ui-rangeslider-first" ),
-				thisSlider = first ? this._inputFirst : this._inputLast,
-				otherSlider = first ? this._inputLast : this._inputFirst;
-				
-			if ( min > max && !this._sliderTarget ) {
-				//this prevents min from being greater then max
-				thisSlider.val( first ? max: min ).slider( "refresh" );
-				this._trigger( "normalize" );
-			} else if ( min > max ) {
-				//this makes it so clicks on the target on either extream go to the closest handle
-				thisSlider.val( this._targetVal ).slider( "refresh" );
-				
-				var self = this;
-				//You must wait for the stack to unwind so first slider is updated before updating second
-				setTimeout( function() {
-					otherSlider.val( first ? min: max ).slider( "refresh" );
-					$.data( otherSlider.get(0), "mobileSlider" ).handle.focus();
-					self._sliderFirst.css( "z-index", first ? "" : 1 );
-					self._trigger( "normalize" );
-				}, 0 );
-				this._proxy = ( first ) ? "first" : "last";
-			}
-			//fixes issue where when both _sliders are at min they cannot be adjusted
-			if ( min === max ) {
-				$.data( thisSlider.get(0), "mobileSlider" ).handle.css( "z-index", 1 );
-				$.data( otherSlider.get(0), "mobileSlider" ).handle.css( "z-index", 0 );
-			} else {
-				$.data( otherSlider.get(0), "mobileSlider" ).handle.css( "z-index", "" );
-				$.data( thisSlider.get(0), "mobileSlider" ).handle.css( "z-index", "" );
-			}
-			
-			this._updateHighlight();
-			
-			if ( min >= max ) {
-				return false;
-			}
-		},
-
-		_updateHighlight: function() {
-			var min = parseInt( $.data( this._inputFirst.get(0), "mobileSlider" ).handle.get(0).style.left, 10 ),
-				max = parseInt( $.data( this._inputLast.get(0), "mobileSlider" ).handle.get(0).style.left, 10 ),
-				width = (max - min);
-
-			this.element.find( ".ui-slider-bg" ).css({
-				"margin-left": min + "%",
-				"width": width + "%"
-			});
-		},
-
-		_destroy: function() {
-			this.element.removeClass( "ui-rangeslider ui-mini" ).find( "label" ).show();
-			this._inputFirst.after( this._sliderFirst );
-			this._inputLast.after( this._sliderLast );
-			this._sliders.remove();
-			this.element.find( "input" ).removeClass( "ui-rangeslider-first ui-rangeslider-last" ).slider( "destroy" );
-		}
-
-	});
-
-$.widget( "mobile.rangeslider", $.mobile.rangeslider, $.mobile.behaviors.formReset );
-
-//auto self-init widgets
-$( document ).bind( "pagecreate create", function( e ) {
-	$.mobile.rangeslider.prototype.enhanceWithin( e.target, true );
-});
-
-})( jQuery );
-(function( $, undefined ) {
-
-$.widget( "mobile.selectmenu", $.mobile.widget, {
-	options: {
-		theme: null,
-		disabled: false,
-		icon: "arrow-d",
-		iconpos: "right",
-		inline: false,
-		corners: true,
-		shadow: true,
-		iconshadow: true,
-		overlayTheme: "a",
-		dividerTheme: "b",
-		hidePlaceholderMenuItems: true,
-		closeText: "Close",
-		nativeMenu: true,
-		// This option defaults to true on iOS devices.
-		preventFocusZoom: /iPhone|iPad|iPod/.test( navigator.platform ) && navigator.userAgent.indexOf( "AppleWebKit" ) > -1,
-		initSelector: "select:not( :jqmData(role='slider') )",
-		mini: false
-	},
-
-	_button: function() {
-		return $( "<div/>" );
-	},
-
-	_setDisabled: function( value ) {
-		this.element.attr( "disabled", value );
-		this.button.attr( "aria-disabled", value );
-		return this._setOption( "disabled", value );
-	},
-
-	_focusButton : function() {
-		var self = this;
-
-		setTimeout( function() {
-			self.button.focus();
-		}, 40);
-	},
-
-	_selectOptions: function() {
-		return this.select.find( "option" );
-	},
-
-	// setup items that are generally necessary for select menu extension
-	_preExtension: function() {
-		var classes = "";
-		// TODO: Post 1.1--once we have time to test thoroughly--any classes manually applied to the original element should be carried over to the enhanced element, with an `-enhanced` suffix. See https://github.com/jquery/jquery-mobile/issues/3577
-		/* if ( $el[0].className.length ) {
-			classes = $el[0].className;
-		} */
-		if ( !!~this.element[0].className.indexOf( "ui-btn-left" ) ) {
-			classes = " ui-btn-left";
-		}
-
-		if (  !!~this.element[0].className.indexOf( "ui-btn-right" ) ) {
-			classes = " ui-btn-right";
-		}
-
-		this.select = this.element.removeClass( "ui-btn-left ui-btn-right" ).wrap( "<div class='ui-select" + classes + "'>" );
-		this.selectID  = this.select.attr( "id" );
-		this.label = $( "label[for='"+ this.selectID +"']" ).addClass( "ui-select" );
-		this.isMultiple = this.select[ 0 ].multiple;
-		if ( !this.options.theme ) {
-			this.options.theme = $.mobile.getInheritedTheme( this.select, "c" );
-		}
-	},
-
-	_destroy: function() {
-		var wrapper = this.element.parents( ".ui-select" );
-		if ( wrapper.length > 0 ) {
-			if ( wrapper.is( ".ui-btn-left, .ui-btn-right" ) ) {
-				this.element.addClass( wrapper.is( ".ui-btn-left" ) ? "ui-btn-left" : "ui-btn-right" );
-			}
-			this.element.insertAfter( wrapper );
-			wrapper.remove();
-		}
-	},
-
-	_create: function() {
-		this._preExtension();
-
-		// Allows for extension of the native select for custom selects and other plugins
-		// see select.custom for example extension
-		// TODO explore plugin registration
-		this._trigger( "beforeCreate" );
-
-		this.button = this._button();
-
-		var self = this,
-
-			options = this.options,
-
-			inline = options.inline || this.select.jqmData( "inline" ),
-			mini = options.mini || this.select.jqmData( "mini" ),
-			iconpos = options.icon ? ( options.iconpos || this.select.jqmData( "iconpos" ) ) : false,
-
-			// IE throws an exception at options.item() function when
-			// there is no selected item
-			// select first in this case
-			selectedIndex = this.select[ 0 ].selectedIndex === -1 ? 0 : this.select[ 0 ].selectedIndex,
-
-			// TODO values buttonId and menuId are undefined here
-			button = this.button
-				.insertBefore( this.select )
-				.buttonMarkup( {
-					theme: options.theme,
-					icon: options.icon,
-					iconpos: iconpos,
-					inline: inline,
-					corners: options.corners,
-					shadow: options.shadow,
-					iconshadow: options.iconshadow,
-					mini: mini
-				});
-
-		this.setButtonText();
-
-		// Opera does not properly support opacity on select elements
-		// In Mini, it hides the element, but not its text
-		// On the desktop,it seems to do the opposite
-		// for these reasons, using the nativeMenu option results in a full native select in Opera
-		if ( options.nativeMenu && window.opera && window.opera.version ) {
-			button.addClass( "ui-select-nativeonly" );
-		}
-
-		// Add counter for multi selects
-		if ( this.isMultiple ) {
-			this.buttonCount = $( "<span>" )
-				.addClass( "ui-li-count ui-btn-up-c ui-btn-corner-all" )
-				.hide()
-				.appendTo( button.addClass('ui-li-has-count') );
-		}
-
-		// Disable if specified
-		if ( options.disabled || this.element.attr('disabled')) {
-			this.disable();
-		}
-
-		// Events on native select
-		this.select.change(function() {
-			self.refresh();
-		});
-
-		if ( this._handleFormReset ) {
-			this._handleFormReset();
-		}
-		this.build();
-	},
-
-	build: function() {
-		var self = this;
-
-		this.select
-			.appendTo( self.button )
-			.bind( "vmousedown", function() {
-				// Add active class to button
-				self.button.addClass( $.mobile.activeBtnClass );
-			})
-			.bind( "focus", function() {
-				self.button.addClass( $.mobile.focusClass );
-			})
-			.bind( "blur", function() {
-				self.button.removeClass( $.mobile.focusClass );
-			})
-			.bind( "focus vmouseover", function() {
-				self.button.trigger( "vmouseover" );
-			})
-			.bind( "vmousemove", function() {
-				// Remove active class on scroll/touchmove
-				self.button.removeClass( $.mobile.activeBtnClass );
-			})
-			.bind( "change blur vmouseout", function() {
-				self.button.trigger( "vmouseout" )
-					.removeClass( $.mobile.activeBtnClass );
-			})
-			.bind( "change blur", function() {
-				self.button.removeClass( "ui-btn-down-" + self.options.theme );
-			});
-
-		// In many situations, iOS will zoom into the select upon tap, this prevents that from happening
-		self.button.bind( "vmousedown", function() {
-			if ( self.options.preventFocusZoom ) {
-					$.mobile.zoom.disable( true );
-			}
-		});
-		self.label.bind( "click focus", function() {
-			if ( self.options.preventFocusZoom ) {
-					$.mobile.zoom.disable( true );
-			}
-		});
-		self.select.bind( "focus", function() {
-			if ( self.options.preventFocusZoom ) {
-					$.mobile.zoom.disable( true );
-			}
-		});
-		self.button.bind( "mouseup", function() {
-			if ( self.options.preventFocusZoom ) {				
-				setTimeout(function() {
-					$.mobile.zoom.enable( true );
-				}, 0 );
-			}
-		});
-		self.select.bind( "blur", function() {
-			if ( self.options.preventFocusZoom ) {				
-				$.mobile.zoom.enable( true );
-			}
-		});
-
-	},
-
-	selected: function() {
-		return this._selectOptions().filter( ":selected" );
-	},
-
-	selectedIndices: function() {
-		var self = this;
-
-		return this.selected().map(function() {
-			return self._selectOptions().index( this );
-		}).get();
-	},
-
-	setButtonText: function() {
-		var self = this,
-			selected = this.selected(),
-			text = this.placeholder,
-			span = $( document.createElement( "span" ) );
-
-		this.button.find( ".ui-btn-text" ).html(function() {
-			if ( selected.length ) {
-				text = selected.map(function() {
-					return $( this ).text();
-				}).get().join( ", " );
-			} else {
-				text = self.placeholder;
-			}
-
-			// TODO possibly aggregate multiple select option classes
-			return span.text( text )
-				.addClass( self.select.attr( "class" ) )
-				.addClass( selected.attr( "class" ) );
-		});
-	},
-
-	setButtonCount: function() {
-		var selected = this.selected();
-
-		// multiple count inside button
-		if ( this.isMultiple ) {
-			this.buttonCount[ selected.length > 1 ? "show" : "hide" ]().text( selected.length );
-		}
-	},
-
-	_reset: function() {
-		this.refresh();
-	},
-
-	refresh: function() {
-		this.setButtonText();
-		this.setButtonCount();
-	},
-
-	// open and close preserved in native selects
-	// to simplify users code when looping over selects
-	open: $.noop,
-	close: $.noop,
-
-	disable: function() {
-		this._setDisabled( true );
-		this.button.addClass( "ui-disabled" );
-	},
-
-	enable: function() {
-		this._setDisabled( false );
-		this.button.removeClass( "ui-disabled" );
-	}
-});
-
-$.widget( "mobile.selectmenu", $.mobile.selectmenu, $.mobile.behaviors.formReset );
-
-//auto self-init widgets
-$.mobile.document.bind( "pagecreate create", function( e ) {
-	$.mobile.selectmenu.prototype.enhanceWithin( e.target, true );
-});
-})( jQuery );
-
-/*
-* custom "selectmenu" plugin
-*/
-
-(function( $, undefined ) {
-	var extendSelect = function( widget ) {
-
-		var select = widget.select,
-			origDestroy = widget._destroy,
-			selectID  = widget.selectID,
-			prefix = ( selectID ? selectID : ( ( $.mobile.ns || "" ) + "uuid-" + widget.uuid ) ),
-			popupID = prefix + "-listbox",
-			dialogID = prefix + "-dialog",
-			label = widget.label,
-			thisPage = widget.select.closest( ".ui-page" ),
-			selectOptions = widget._selectOptions(),
-			isMultiple = widget.isMultiple = widget.select[ 0 ].multiple,
-			buttonId = selectID + "-button",
-			menuId = selectID + "-menu",
-			menuPage = $( "<div data-" + $.mobile.ns + "role='dialog' id='" + dialogID + "' data-" +$.mobile.ns + "theme='"+ widget.options.theme +"' data-" +$.mobile.ns + "overlay-theme='"+ widget.options.overlayTheme +"'>" +
-				"<div data-" + $.mobile.ns + "role='header'>" +
-				"<div class='ui-title'>" + label.getEncodedText() + "</div>"+
-				"</div>"+
-				"<div data-" + $.mobile.ns + "role='content'></div>"+
-				"</div>" ),
-
-			listbox =  $( "<div id='" + popupID + "' class='ui-selectmenu'>" ).insertAfter( widget.select ).popup( { theme: widget.options.overlayTheme } ),
-
-			list = $( "<ul>", {
-				"class": "ui-selectmenu-list",
-				"id": menuId,
-				"role": "listbox",
-				"aria-labelledby": buttonId
-				}).attr( "data-" + $.mobile.ns + "theme", widget.options.theme )
-					.attr( "data-" + $.mobile.ns + "divider-theme", widget.options.dividerTheme )
-					.appendTo( listbox ),
-
-
-			header = $( "<div>", {
-				"class": "ui-header ui-bar-" + widget.options.theme
-			}).prependTo( listbox ),
-
-			headerTitle = $( "<h1>", {
-				"class": "ui-title"
-			}).appendTo( header ),
-
-			menuPageContent,
-			menuPageClose,
-			headerClose;
-
-		if ( widget.isMultiple ) {
-			headerClose = $( "<a>", {
-				"text": widget.options.closeText,
-				"href": "#",
-				"class": "ui-btn-left"
-			}).attr( "data-" + $.mobile.ns + "iconpos", "notext" ).attr( "data-" + $.mobile.ns + "icon", "delete" ).appendTo( header ).buttonMarkup();
-		}
-
-		$.extend( widget, {
-			select: widget.select,
-			selectID: selectID,
-			buttonId: buttonId,
-			menuId: menuId,
-			popupID: popupID,
-			dialogID: dialogID,
-			thisPage: thisPage,
-			menuPage: menuPage,
-			label: label,
-			selectOptions: selectOptions,
-			isMultiple: isMultiple,
-			theme: widget.options.theme,
-			listbox: listbox,
-			list: list,
-			header: header,
-			headerTitle: headerTitle,
-			headerClose: headerClose,
-			menuPageContent: menuPageContent,
-			menuPageClose: menuPageClose,
-			placeholder: "",
-
-			build: function() {
-				var self = this;
-
-				// Create list from select, update state
-				self.refresh();
-
-				if ( self._origTabIndex === undefined ) {
-					// Map undefined to false, because self._origTabIndex === undefined
-					// indicates that we have not yet checked whether the select has
-					// originally had a tabindex attribute, whereas false indicates that
-					// we have checked the select for such an attribute, and have found
-					// none present.
-					self._origTabIndex = ( self.select[ 0 ].getAttribute( "tabindex" ) === null ) ? false : self.select.attr( "tabindex" );
-				}
-				self.select.attr( "tabindex", "-1" ).focus(function() {
-					$( this ).blur();
-					self.button.focus();
-				});
-
-				// Button events
-				self.button.bind( "vclick keydown" , function( event ) {
-					if ( self.options.disabled || self.isOpen ) {
-						return;
-					}
-
-					if (event.type === "vclick" ||
-							event.keyCode && (event.keyCode === $.mobile.keyCode.ENTER ||
-																event.keyCode === $.mobile.keyCode.SPACE)) {
-
-						self._decideFormat();
-						if ( self.menuType === "overlay" ) {
-							self.button.attr( "href", "#" + self.popupID ).attr( "data-" + ( $.mobile.ns || "" ) + "rel", "popup" );
-						} else {
-							self.button.attr( "href", "#" + self.dialogID ).attr( "data-" + ( $.mobile.ns || "" ) + "rel", "dialog" );
-						}
-						self.isOpen = true;
-						// Do not prevent default, so the navigation may have a chance to actually open the chosen format
-					}
-				});
-
-				// Events for list items
-				self.list.attr( "role", "listbox" )
-					.bind( "focusin", function( e ) {
-						$( e.target )
-							.attr( "tabindex", "0" )
-							.trigger( "vmouseover" );
-
-					})
-					.bind( "focusout", function( e ) {
-						$( e.target )
-							.attr( "tabindex", "-1" )
-							.trigger( "vmouseout" );
-					})
-					.delegate( "li:not(.ui-disabled, .ui-li-divider)", "click", function( event ) {
-
-						// index of option tag to be selected
-						var oldIndex = self.select[ 0 ].selectedIndex,
-							newIndex = self.list.find( "li:not(.ui-li-divider)" ).index( this ),
-							option = self._selectOptions().eq( newIndex )[ 0 ];
-
-						// toggle selected status on the tag for multi selects
-						option.selected = self.isMultiple ? !option.selected : true;
-
-						// toggle checkbox class for multiple selects
-						if ( self.isMultiple ) {
-							$( this ).find( ".ui-icon" )
-								.toggleClass( "ui-icon-checkbox-on", option.selected )
-								.toggleClass( "ui-icon-checkbox-off", !option.selected );
-						}
-
-						// trigger change if value changed
-						if ( self.isMultiple || oldIndex !== newIndex ) {
-							self.select.trigger( "change" );
-						}
-
-						// hide custom select for single selects only - otherwise focus clicked item
-						// We need to grab the clicked item the hard way, because the list may have been rebuilt
-						if ( self.isMultiple ) {
-							self.list.find( "li:not(.ui-li-divider)" ).eq( newIndex )
-								.addClass( "ui-btn-down-" + widget.options.theme ).find( "a" ).first().focus();
-						}
-						else {
-							self.close();
-						}
-
-						event.preventDefault();
-					})
-					.keydown(function( event ) {  //keyboard events for menu items
-						var target = $( event.target ),
-							li = target.closest( "li" ),
-							prev, next;
-
-						// switch logic based on which key was pressed
-						switch ( event.keyCode ) {
-							// up or left arrow keys
-						case 38:
-							prev = li.prev().not( ".ui-selectmenu-placeholder" );
-
-							if ( prev.is( ".ui-li-divider" ) ) {
-								prev = prev.prev();
-							}
-
-							// if there's a previous option, focus it
-							if ( prev.length ) {
-								target
-									.blur()
-									.attr( "tabindex", "-1" );
-
-								prev.addClass( "ui-btn-down-" + widget.options.theme ).find( "a" ).first().focus();
-							}
-
-							return false;
-							// down or right arrow keys
-						case 40:
-							next = li.next();
-
-							if ( next.is( ".ui-li-divider" ) ) {
-								next = next.next();
-							}
-
-							// if there's a next option, focus it
-							if ( next.length ) {
-								target
-									.blur()
-									.attr( "tabindex", "-1" );
-
-								next.addClass( "ui-btn-down-" + widget.options.theme ).find( "a" ).first().focus();
-							}
-
-							return false;
-							// If enter or space is pressed, trigger click
-						case 13:
-						case 32:
-							target.trigger( "click" );
-
-							return false;
-						}
-					});
-
-				// button refocus ensures proper height calculation
-				// by removing the inline style and ensuring page inclusion
-				self.menuPage.bind( "pagehide", function() {
-					// TODO centralize page removal binding / handling in the page plugin.
-					// Suggestion from @jblas to do refcounting
-					//
-					// TODO extremely confusing dependency on the open method where the pagehide.remove
-					// bindings are stripped to prevent the parent page from disappearing. The way
-					// we're keeping pages in the DOM right now sucks
-					//
-					// rebind the page remove that was unbound in the open function
-					// to allow for the parent page removal from actions other than the use
-					// of a dialog sized custom select
-					//
-					// doing this here provides for the back button on the custom select dialog
-					$.mobile._bindPageRemove.call( self.thisPage );
-				});
-
-				// Events on the popup
-				self.listbox.bind( "popupafterclose", function( event ) {
-					self.close();
-				});
-
-				// Close button on small overlays
-				if ( self.isMultiple ) {
-					self.headerClose.click(function() {
-						if ( self.menuType === "overlay" ) {
-							self.close();
-							return false;
-						}
-					});
-				}
-
-				// track this dependency so that when the parent page
-				// is removed on pagehide it will also remove the menupage
-				self.thisPage.addDependents( this.menuPage );
-			},
-
-			_isRebuildRequired: function() {
-				var list = this.list.find( "li" ),
-					options = this._selectOptions();
-
-				// TODO exceedingly naive method to determine difference
-				// ignores value changes etc in favor of a forcedRebuild
-				// from the user in the refresh method
-				return options.text() !== list.text();
-			},
-
-			selected: function() {
-				return this._selectOptions().filter( ":selected:not( :jqmData(placeholder='true') )" );
-			},
-
-			refresh: function( forceRebuild , foo ) {
-				var self = this,
-				select = this.element,
-				isMultiple = this.isMultiple,
-				indicies;
-
-				if (  forceRebuild || this._isRebuildRequired() ) {
-					self._buildList();
-				}
-
-				indicies = this.selectedIndices();
-
-				self.setButtonText();
-				self.setButtonCount();
-
-				self.list.find( "li:not(.ui-li-divider)" )
-					.removeClass( $.mobile.activeBtnClass )
-					.attr( "aria-selected", false )
-					.each(function( i ) {
-
-						if ( $.inArray( i, indicies ) > -1 ) {
-							var item = $( this );
-
-							// Aria selected attr
-							item.attr( "aria-selected", true );
-
-							// Multiple selects: add the "on" checkbox state to the icon
-							if ( self.isMultiple ) {
-								item.find( ".ui-icon" ).removeClass( "ui-icon-checkbox-off" ).addClass( "ui-icon-checkbox-on" );
-							} else {
-								if ( item.is( ".ui-selectmenu-placeholder" ) ) {
-									item.next().addClass( $.mobile.activeBtnClass );
-								} else {
-									item.addClass( $.mobile.activeBtnClass );
-								}
-							}
-						}
-					});
-			},
-
-			close: function() {
-				if ( this.options.disabled || !this.isOpen ) {
-					return;
-				}
-
-				var self = this;
-
-				if ( self.menuType === "page" ) {
-					self.menuPage.dialog( "close" );
-					self.list.appendTo( self.listbox );
-				} else {
-					self.listbox.popup( "close" );
-				}
-
-				self._focusButton();
-				// allow the dialog to be closed again
-				self.isOpen = false;
-			},
-
-			open: function() {
-				this.button.click();
-			},
-
-			_decideFormat: function() {
-				var self = this,
-					$window = $.mobile.window,
-					selfListParent = self.list.parent(),
-					menuHeight = selfListParent.outerHeight(),
-					menuWidth = selfListParent.outerWidth(),
-					activePage = $( "." + $.mobile.activePageClass ),
-					scrollTop = $window.scrollTop(),
-					btnOffset = self.button.offset().top,
-					screenHeight = $window.height(),
-					screenWidth = $window.width();
-
-				function focusMenuItem() {
-					var selector = self.list.find( "." + $.mobile.activeBtnClass + " a" );
-					if ( selector.length === 0 ) {
-						selector = self.list.find( "li.ui-btn:not( :jqmData(placeholder='true') ) a" );
-					}
-					selector.first().focus().closest( "li" ).addClass( "ui-btn-down-" + widget.options.theme );
-				}
-
-				if ( menuHeight > screenHeight - 80 || !$.support.scrollTop ) {
-
-					self.menuPage.appendTo( $.mobile.pageContainer ).page();
-					self.menuPageContent = menuPage.find( ".ui-content" );
-					self.menuPageClose = menuPage.find( ".ui-header a" );
-
-					// prevent the parent page from being removed from the DOM,
-					// otherwise the results of selecting a list item in the dialog
-					// fall into a black hole
-					self.thisPage.unbind( "pagehide.remove" );
-
-					//for WebOS/Opera Mini (set lastscroll using button offset)
-					if ( scrollTop === 0 && btnOffset > screenHeight ) {
-						self.thisPage.one( "pagehide", function() {
-							$( this ).jqmData( "lastScroll", btnOffset );
-						});
-					}
-
-					self.menuPage
-						.one( "pageshow", function() {
-							focusMenuItem();
-						})
-						.one( "pagehide", function() {
-							self.close();
-						});
-
-					self.menuType = "page";
-					self.menuPageContent.append( self.list );
-					self.menuPage.find("div .ui-title").text(self.label.text());
-				} else {
-					self.menuType = "overlay";
-
-					self.listbox.one( "popupafteropen", focusMenuItem );
-				}
-			},
-
-			_buildList: function() {
-				var self = this,
-					o = this.options,
-					placeholder = this.placeholder,
-					needPlaceholder = true,
-					optgroups = [],
-					lis = [],
-					dataIcon = self.isMultiple ? "checkbox-off" : "false";
-
-				self.list.empty().filter( ".ui-listview" ).listview( "destroy" );
-
-				var $options = self.select.find( "option" ),
-					numOptions = $options.length,
-					select = this.select[ 0 ],
-					dataPrefix = 'data-' + $.mobile.ns,
-					dataIndexAttr = dataPrefix + 'option-index',
-					dataIconAttr = dataPrefix + 'icon',
-					dataRoleAttr = dataPrefix + 'role',
-					dataPlaceholderAttr = dataPrefix + 'placeholder',
-					fragment = document.createDocumentFragment(),
-					isPlaceholderItem = false,
-					optGroup;
-
-				for (var i = 0; i < numOptions;i++, isPlaceholderItem = false) {
-					var option = $options[i],
-						$option = $( option ),
-						parent = option.parentNode,
-						text = $option.text(),
-						anchor  = document.createElement( 'a' ),
-						classes = [];
-
-					anchor.setAttribute( 'href', '#' );
-					anchor.appendChild( document.createTextNode( text ) );
-
-					// Are we inside an optgroup?
-					if ( parent !== select && parent.nodeName.toLowerCase() === "optgroup" ) {
-						var optLabel = parent.getAttribute( 'label' );
-						if ( optLabel !== optGroup ) {
-							var divider = document.createElement( 'li' );
-							divider.setAttribute( dataRoleAttr, 'list-divider' );
-							divider.setAttribute( 'role', 'option' );
-							divider.setAttribute( 'tabindex', '-1' );
-							divider.appendChild( document.createTextNode( optLabel ) );
-							fragment.appendChild( divider );
-							optGroup = optLabel;
-						}
-					}
-
-					if ( needPlaceholder && ( !option.getAttribute( "value" ) || text.length === 0 || $option.jqmData( "placeholder" ) ) ) {
-						needPlaceholder = false;
-						isPlaceholderItem = true;
-
-						// If we have identified a placeholder, record the fact that it was
-						// us who have added the placeholder to the option and mark it
-						// retroactively in the select as well
-						if ( null === option.getAttribute( dataPlaceholderAttr ) ) {
-							this._removePlaceholderAttr = true;
-						}
-						option.setAttribute( dataPlaceholderAttr, true );
-						if ( o.hidePlaceholderMenuItems ) {
-							classes.push( "ui-selectmenu-placeholder" );
-						}
-						if ( placeholder !== text ) {
-							placeholder = self.placeholder = text;
-						}
-					}
-
-					var item = document.createElement('li');
-					if ( option.disabled ) {
-						classes.push( "ui-disabled" );
-						item.setAttribute('aria-disabled',true);
-					}
-					item.setAttribute( dataIndexAttr,i );
-					item.setAttribute( dataIconAttr, dataIcon );
-					if ( isPlaceholderItem ) {
-						item.setAttribute( dataPlaceholderAttr, true );
-					}
-					item.className = classes.join( " " );
-					item.setAttribute( 'role', 'option' );
-					anchor.setAttribute( 'tabindex', '-1' );
-					item.appendChild( anchor );
-					fragment.appendChild( item );
-				}
-
-				self.list[0].appendChild( fragment );
-
-				// Hide header if it's not a multiselect and there's no placeholder
-				if ( !this.isMultiple && !placeholder.length ) {
-					this.header.hide();
-				} else {
-					this.headerTitle.text( this.placeholder );
-				}
-
-				// Now populated, create listview
-				self.list.listview();
-			},
-
-			_button: function() {
-				return $( "<a>", {
-					"href": "#",
-					"role": "button",
-					// TODO value is undefined at creation
-					"id": this.buttonId,
-					"aria-haspopup": "true",
-
-					// TODO value is undefined at creation
-					"aria-owns": this.menuId
-				});
-			},
-
-			_destroy: function() {
-				this.close();
-
-				// Restore the tabindex attribute to its original value
-				if ( this._origTabIndex !== undefined ) {
-					if ( this._origTabIndex !== false ) {
-						this.select.attr( "tabindex", this._origTabIndex );
-					} else {
-						this.select.removeAttr( "tabindex" );
-					}
-				}
-
-				// Remove the placeholder attribute if we were the ones to add it
-				if ( this._removePlaceholderAttr ) {
-					this._selectOptions().removeAttr( "data-" + $.mobile.ns + "placeholder" );
-				}
-
-				// Remove the popup
-				this.listbox.remove();
-
-				// Chain up
-				origDestroy.apply( this, arguments );
-			}
-		});
-	};
-
-	// issue #3894 - core doesn't trigger events on disabled delegates
-	$.mobile.document.bind( "selectmenubeforecreate", function( event ) {
-		var selectmenuWidget = $( event.target ).data( "mobile-selectmenu" );
-
-		if ( !selectmenuWidget.options.nativeMenu &&
-				selectmenuWidget.element.parents( ":jqmData(role='popup')" ).length === 0 ) {
-			extendSelect( selectmenuWidget );
-		}
-	});
-})( jQuery );
-
-(function( $, undefined ) {
-
-
-	$.widget( "mobile.fixedtoolbar", $.mobile.widget, {
-		options: {
-			visibleOnPageShow: true,
-			disablePageZoom: true,
-			transition: "slide", //can be none, fade, slide (slide maps to slideup or slidedown)
-			fullscreen: false,
-			tapToggle: true,
-			tapToggleBlacklist: "a, button, input, select, textarea, .ui-header-fixed, .ui-footer-fixed, .ui-popup, .ui-panel, .ui-panel-dismiss-open",
-			hideDuringFocus: "input, textarea, select",
-			updatePagePadding: true,
-			trackPersistentToolbars: true,
-
-			// Browser detection! Weeee, here we go...
-			// Unfortunately, position:fixed is costly, not to mention probably impossible, to feature-detect accurately.
-			// Some tests exist, but they currently return false results in critical devices and browsers, which could lead to a broken experience.
-			// Testing fixed positioning is also pretty obtrusive to page load, requiring injected elements and scrolling the window
-			// The following function serves to rule out some popular browsers with known fixed-positioning issues
-			// This is a plugin option like any other, so feel free to improve or overwrite it
-			supportBlacklist: function() {
-				return !$.support.fixedPosition;
-			},
-			initSelector: ":jqmData(position='fixed')"
-		},
-
-		_create: function() {
-
-			var self = this,
-				o = self.options,
-				$el = self.element,
-				tbtype = $el.is( ":jqmData(role='header')" ) ? "header" : "footer",
-				$page = $el.closest( ".ui-page" );
-
-			// Feature detecting support for
-			if ( o.supportBlacklist() ) {
-				self.destroy();
-				return;
-			}
-
-			$el.addClass( "ui-"+ tbtype +"-fixed" );
-
-			// "fullscreen" overlay positioning
-			if ( o.fullscreen ) {
-				$el.addClass( "ui-"+ tbtype +"-fullscreen" );
-				$page.addClass( "ui-page-" + tbtype + "-fullscreen" );
-			}
-			// If not fullscreen, add class to page to set top or bottom padding
-			else{
-				$page.addClass( "ui-page-" + tbtype + "-fixed" );
-			}
-
-			$.extend( this, {
-				_thisPage: null
-			});
-
-			self._addTransitionClass();
-			self._bindPageEvents();
-			self._bindToggleHandlers();
-		},
-
-		_addTransitionClass: function() {
-			var tclass = this.options.transition;
-
-			if ( tclass && tclass !== "none" ) {
-				// use appropriate slide for header or footer
-				if ( tclass === "slide" ) {
-					tclass = this.element.is( ".ui-header" ) ? "slidedown" : "slideup";
-				}
-
-				this.element.addClass( tclass );
-			}
-		},
-
-		_bindPageEvents: function() {
-			this._thisPage = this.element.closest( ".ui-page" );
-			//page event bindings
-			// Fixed toolbars require page zoom to be disabled, otherwise usability issues crop up
-			// This method is meant to disable zoom while a fixed-positioned toolbar page is visible
-			this._on( this._thisPage, {
-				"pagebeforeshow": "_handlePageBeforeShow",
-				"webkitAnimationStart":"_handleAnimationStart",
-				"animationstart":"_handleAnimationStart",
-				"updatelayout": "_handleAnimationStart",
-				"pageshow": "_handlePageShow",
-				"pagebeforehide": "_handlePageBeforeHide"
-			});
-		},
-
-		_handlePageBeforeShow: function() {
-			var o = this.options;
-			if ( o.disablePageZoom ) {
-				$.mobile.zoom.disable( true );
-			}
-			if ( !o.visibleOnPageShow ) {
-				this.hide( true );
-			}
-		},
-
-		_handleAnimationStart: function() {
-			if ( this.options.updatePagePadding ) {
-				this.updatePagePadding( this._thisPage );
-			}
-		},
-
-		_handlePageShow: function() {
-			this.updatePagePadding( this._thisPage );
-			if ( this.options.updatePagePadding ) {
-				this._on( $.mobile.window, { "throttledresize": "updatePagePadding" } );
-			}
-		},
-
-		_handlePageBeforeHide: function( e, ui ) {
-			var o = this.options;
-
-			if ( o.disablePageZoom ) {
-				$.mobile.zoom.enable( true );
-			}
-			if ( o.updatePagePadding ) {
-				this._off( $.mobile.window, "throttledresize" );
-			}
-
-			if ( o.trackPersistentToolbars ) {
-				var thisFooter = $( ".ui-footer-fixed:jqmData(id)", this._thisPage ),
-					thisHeader = $( ".ui-header-fixed:jqmData(id)", this._thisPage ),
-					nextFooter = thisFooter.length && ui.nextPage && $( ".ui-footer-fixed:jqmData(id='" + thisFooter.jqmData( "id" ) + "')", ui.nextPage ) || $(),
-					nextHeader = thisHeader.length && ui.nextPage && $( ".ui-header-fixed:jqmData(id='" + thisHeader.jqmData( "id" ) + "')", ui.nextPage ) || $();
-
-				if ( nextFooter.length || nextHeader.length ) {
-
-					nextFooter.add( nextHeader ).appendTo( $.mobile.pageContainer );
-
-					ui.nextPage.one( "pageshow", function() {
-						nextHeader.prependTo( this );
-						nextFooter.appendTo( this );
-					});
-				}
-			}
-		},
-
-		_visible: true,
-
-		// This will set the content element's top or bottom padding equal to the toolbar's height
-		updatePagePadding: function( tbPage ) {
-			var $el = this.element,
-				header = $el.is( ".ui-header" ),
-				pos = parseFloat( $el.css( header ? "top" : "bottom" ) );
-
-			// This behavior only applies to "fixed", not "fullscreen"
-			if ( this.options.fullscreen ) { return; }
-
-			tbPage = tbPage || this._thisPage || $el.closest( ".ui-page" );
-			$( tbPage ).css( "padding-" + ( header ? "top" : "bottom" ), $el.outerHeight() + pos );
-		},
-
-		_useTransition: function( notransition ) {
-			var $win = $.mobile.window,
-				$el = this.element,
-				scroll = $win.scrollTop(),
-				elHeight = $el.height(),
-				pHeight = $el.closest( ".ui-page" ).height(),
-				viewportHeight = $.mobile.getScreenHeight(),
-				tbtype = $el.is( ":jqmData(role='header')" ) ? "header" : "footer";
-
-			return !notransition &&
-				( this.options.transition && this.options.transition !== "none" &&
-				(
-					( tbtype === "header" && !this.options.fullscreen && scroll > elHeight ) ||
-					( tbtype === "footer" && !this.options.fullscreen && scroll + viewportHeight < pHeight - elHeight )
-				) || this.options.fullscreen
-				);
-		},
-
-		show: function( notransition ) {
-			var hideClass = "ui-fixed-hidden",
-				$el = this.element;
-
-			if ( this._useTransition( notransition ) ) {
-				$el
-					.removeClass( "out " + hideClass )
-					.addClass( "in" )
-					.animationComplete(function () {
-						$el.removeClass('in');
-					});
-			}
-			else {
-				$el.removeClass( hideClass );
-			}
-			this._visible = true;
-		},
-
-		hide: function( notransition ) {
-			var hideClass = "ui-fixed-hidden",
-				$el = this.element,
-				// if it's a slide transition, our new transitions need the reverse class as well to slide outward
-				outclass = "out" + ( this.options.transition === "slide" ? " reverse" : "" );
-
-			if( this._useTransition( notransition ) ) {
-				$el
-					.addClass( outclass )
-					.removeClass( "in" )
-					.animationComplete(function() {
-						$el.addClass( hideClass ).removeClass( outclass );
-					});
-			}
-			else {
-				$el.addClass( hideClass ).removeClass( outclass );
-			}
-			this._visible = false;
-		},
-
-		toggle: function() {
-			this[ this._visible ? "hide" : "show" ]();
-		},
-
-		_bindToggleHandlers: function() {
-			var self = this, delay,
-				o = self.options,
-				$el = self.element;
-
-			// tap toggle
-			$el.closest( ".ui-page" )
-				.bind( "vclick", function( e ) {
-					if ( o.tapToggle && !$( e.target ).closest( o.tapToggleBlacklist ).length ) {
-						self.toggle();
-					}
-				})
-				.bind( "focusin focusout", function( e ) {
-					//this hides the toolbars on a keyboard pop to give more screen room and prevent ios bug which 
-					//positions fixed toolbars in the middle of the screen on pop if the input is near the top or
-					//bottom of the screen addresses issues #4410 Footer navbar moves up when clicking on a textbox in an Android environment
-					//and issue #4113 Header and footer change their position after keyboard popup - iOS
-					//and issue #4410 Footer navbar moves up when clicking on a textbox in an Android environment
-					if ( screen.width < 1025 && $( e.target ).is( o.hideDuringFocus ) && !$( e.target ).closest( ".ui-header-fixed, .ui-footer-fixed" ).length ) {
-						//Fix for issue #4724 Moving through form in Mobile Safari with "Next" and "Previous" system 
-						//controls causes fixed position, tap-toggle false Header to reveal itself 
-						if ( e.type === "focusout" && !self._visible ) {
-							//wait for the stack to unwind and see if we have jumped to another input
-							delay = setTimeout( function() {
-								self.show();
-							}, 0 ); 
-						} else if ( e.type === "focusin" && self._visible ) {
-							//if we have jumped to another input clear the time out to cancel the show.
-							clearTimeout( delay );
-							self.hide();
-						}
-					}
-				});
-		},
-
-		_destroy: function() {
-			var $el = this.element,
-				header = $el.is( ".ui-header" );
-
-			$el.closest( ".ui-page" ).css( "padding-" + ( header ? "top" : "bottom" ), "" );
-			$el.removeClass( "ui-header-fixed ui-footer-fixed ui-header-fullscreen ui-footer-fullscreen in out fade slidedown slideup ui-fixed-hidden" );
-			$el.closest( ".ui-page" ).removeClass( "ui-page-header-fixed ui-page-footer-fixed ui-page-header-fullscreen ui-page-footer-fullscreen" );
-		}
-
-	});
-
-	//auto self-init widgets
-	$.mobile.document
-		.bind( "pagecreate create", function( e ) {
-
-			// DEPRECATED in 1.1: support for data-fullscreen=true|false on the page element.
-			// This line ensures it still works, but we recommend moving the attribute to the toolbars themselves.
-			if ( $( e.target ).jqmData( "fullscreen" ) ) {
-				$( $.mobile.fixedtoolbar.prototype.options.initSelector, e.target ).not( ":jqmData(fullscreen)" ).jqmData( "fullscreen", true );
-			}
-
-			$.mobile.fixedtoolbar.prototype.enhanceWithin( e.target );
-		});
-
-})( jQuery );
-
-(function( $, undefined ) {
-	$.widget( "mobile.fixedtoolbar", $.mobile.fixedtoolbar, {
-
-			_create: function() {
-				this._super();
-				this._workarounds();
-			},
-
-			//check the browser and version and run needed workarounds
-			_workarounds: function() {
-				var ua = navigator.userAgent,
-				platform = navigator.platform,
-				// Rendering engine is Webkit, and capture major version
-				wkmatch = ua.match( /AppleWebKit\/([0-9]+)/ ),
-				wkversion = !!wkmatch && wkmatch[ 1 ],
-				os = null,
-				self = this;
-				//set the os we are working in if it dosent match one with workarounds return
-				if( platform.indexOf( "iPhone" ) > -1 || platform.indexOf( "iPad" ) > -1  || platform.indexOf( "iPod" ) > -1 ){
-					os = "ios";
-				} else if( ua.indexOf( "Android" ) > -1 ){
-					os = "android";
-				} else {
-					return;
-				}
-				//check os version if it dosent match one with workarounds return
-				if( os === "ios" ) {
-					//iOS  workarounds
-					self._bindScrollWorkaround();
-				} else if( os === "android" && wkversion && wkversion < 534 ) {
-					//Android 2.3 run all Android 2.3 workaround
-					self._bindScrollWorkaround();
-					self._bindListThumbWorkaround();
-				} else {
-					return;
-				}
-			},
-
-			//Utility class for checking header and footer positions relative to viewport
-			_viewportOffset: function() {
-				var $el = this.element,
-					header = $el.is( ".ui-header" ),
-					offset = Math.abs($el.offset().top - $.mobile.window.scrollTop());
-				if( !header ) {
-					offset = Math.round(offset - $.mobile.window.height() + $el.outerHeight())-60;
-				}
-				return offset;
-			},
-
-			//bind events for _triggerRedraw() function 
-			_bindScrollWorkaround: function() {
-				var self = this;
-				//bind to scrollstop and check if the toolbars are correctly positioned
-				this._on( $.mobile.window, { scrollstop: function() {
-					var viewportOffset = self._viewportOffset();
-					//check if the header is visible and if its in the right place
-					if( viewportOffset > 2 && self._visible) {
-						self._triggerRedraw();
-					}
-				}});
-			},
-
-			//this addresses issue #4250 Persistent footer instability in v1.1 with long select lists in Android 2.3.3
-			//and issue #3748 Android 2.x: Page transitions broken when fixed toolbars used
-			//the absolutely positioned thumbnail in a list view causes problems with fixed position buttons above in a nav bar
-			//setting the li's to -webkit-transform:translate3d(0,0,0); solves this problem to avoide potential issues in other
-			//platforms we scope this with the class ui-android-2x-fix
-			_bindListThumbWorkaround: function() {
-				this.element.closest(".ui-page").addClass( "ui-android-2x-fixed" );
-			},
-			//this addresses issues #4337 Fixed header problem after scrolling content on iOS and Android
-			//and device bugs project issue #1 Form elements can lose click hit area in position: fixed containers.
-			//this also addresses not on fixed toolbars page in docs
-			//adding 1px of padding to the bottom then removing it causes a "redraw"
-			//which positions the toolbars correctly (they will always be visually correct) 
-			_triggerRedraw: function() {
-				var paddingBottom = parseFloat( $( ".ui-page-active" ).css( "padding-bottom" ) );
-				//trigger page redraw to fix incorrectly positioned fixed elements
-				$( ".ui-page-active" ).css( "padding-bottom", ( paddingBottom + 1 ) +"px" );
-				//if the padding is reset with out a timeout the reposition will not occure.
-				//this is independant of JQM the browser seems to need the time to react.
-				setTimeout( function() {
-					$( ".ui-page-active" ).css( "padding-bottom", paddingBottom + "px" );
-				}, 0 );
-			},
-
-			destroy: function() {
-				this._super();
-				//Remove the class we added to the page previously in android 2.x 
-				this.element.closest(".ui-page-active").removeClass( "ui-android-2x-fix" );
-			}
-	});
-
-	})( jQuery );
-
-(function( $, window ) {
-
-	$.mobile.iosorientationfixEnabled = true;
-
-	// This fix addresses an iOS bug, so return early if the UA claims it's something else.
-	var ua = navigator.userAgent;
-	if( !( /iPhone|iPad|iPod/.test( navigator.platform ) && /OS [1-5]_[0-9_]* like Mac OS X/i.test( ua ) && ua.indexOf( "AppleWebKit" ) > -1 ) ){
-		$.mobile.iosorientationfixEnabled = false;
-		return;
-	}
-
-	var zoom = $.mobile.zoom,
-		evt, x, y, z, aig;
-
-	function checkTilt( e ) {
-		evt = e.originalEvent;
-		aig = evt.accelerationIncludingGravity;
-
-		x = Math.abs( aig.x );
-		y = Math.abs( aig.y );
-		z = Math.abs( aig.z );
-
-		// If portrait orientation and in one of the danger zones
-		if ( !window.orientation && ( x > 7 || ( ( z > 6 && y < 8 || z < 8 && y > 6 ) && x > 5 ) ) ) {
-				if ( zoom.enabled ) {
-					zoom.disable();
-				}
-		}	else if ( !zoom.enabled ) {
-				zoom.enable();
-		}
-	}
-
-	$.mobile.document.on( "mobileinit", function(){
-		if( $.mobile.iosorientationfixEnabled ){
-			$.mobile.window
-				.bind( "orientationchange.iosorientationfix", zoom.enable )
-				.bind( "devicemotion.iosorientationfix", checkTilt );
-		}
-	});
-
-}( jQuery, this ));
-
-(function( $, window, undefined ) {
-	var	$html = $( "html" ),
-			$head = $( "head" ),
-			$window = $.mobile.window;
-
-	//remove initial build class (only present on first pageshow)
-	function hideRenderingClass() {
-		$html.removeClass( "ui-mobile-rendering" );
-	}
-
-	// trigger mobileinit event - useful hook for configuring $.mobile settings before they're used
-	$( window.document ).trigger( "mobileinit" );
-
-	// support conditions
-	// if device support condition(s) aren't met, leave things as they are -> a basic, usable experience,
-	// otherwise, proceed with the enhancements
-	if ( !$.mobile.gradeA() ) {
-		return;
-	}
-
-	// override ajaxEnabled on platforms that have known conflicts with hash history updates
-	// or generally work better browsing in regular http for full page refreshes (BB5, Opera Mini)
-	if ( $.mobile.ajaxBlacklist ) {
-		$.mobile.ajaxEnabled = false;
-	}
-
-	// Add mobile, initial load "rendering" classes to docEl
-	$html.addClass( "ui-mobile ui-mobile-rendering" );
-
-	// This is a fallback. If anything goes wrong (JS errors, etc), or events don't fire,
-	// this ensures the rendering class is removed after 5 seconds, so content is visible and accessible
-	setTimeout( hideRenderingClass, 5000 );
-
-	$.extend( $.mobile, {
-		// find and enhance the pages in the dom and transition to the first page.
-		initializePage: function() {
-			// find present pages
-			var path = $.mobile.path,
-				$pages = $( ":jqmData(role='page'), :jqmData(role='dialog')" ),
-				hash = path.stripHash( path.stripQueryParams(path.parseLocation().hash) ),
-				hashPage = document.getElementById( hash );
-
-			// if no pages are found, create one with body's inner html
-			if ( !$pages.length ) {
-				$pages = $( "body" ).wrapInner( "<div data-" + $.mobile.ns + "role='page'></div>" ).children( 0 );
-			}
-
-			// add dialogs, set data-url attrs
-			$pages.each(function() {
-				var $this = $( this );
-
-				// unless the data url is already set set it to the pathname
-				if ( !$this.jqmData( "url" ) ) {
-					$this.attr( "data-" + $.mobile.ns + "url", $this.attr( "id" ) || location.pathname + location.search );
-				}
-			});
-
-			// define first page in dom case one backs out to the directory root (not always the first page visited, but defined as fallback)
-			$.mobile.firstPage = $pages.first();
-
-			// define page container
-			$.mobile.pageContainer = $.mobile.firstPage.parent().addClass( "ui-mobile-viewport" );
-
-			// alert listeners that the pagecontainer has been determined for binding
-			// to events triggered on it
-			$window.trigger( "pagecontainercreate" );
-
-			// cue page loading message
-			$.mobile.showPageLoadingMsg();
-
-			//remove initial build class (only present on first pageshow)
-			hideRenderingClass();
-
-			// if hashchange listening is disabled, there's no hash deeplink,
-			// the hash is not valid (contains more than one # or does not start with #)
-			// or there is no page with that hash, change to the first page in the DOM
-			// Remember, however, that the hash can also be a path!
-			if ( ! ( $.mobile.hashListeningEnabled &&
-				$.mobile.path.isHashValid( location.hash ) &&
-				( $( hashPage ).is( ':jqmData(role="page")' ) ||
-					$.mobile.path.isPath( hash ) ||
-					hash === $.mobile.dialogHashKey ) ) ) {
-
-				// Store the initial destination
-				if ( $.mobile.path.isHashValid( location.hash ) ) {
-					$.mobile.urlHistory.initialDst = hash.replace( "#", "" );
-				}
-
-				// make sure to set initial popstate state if it exists
-				// so that navigation back to the initial page works properly
-				if( $.event.special.navigate.isPushStateEnabled() ) {
-					$.mobile.navigate.navigator.squash( path.parseLocation().href );
-				}
-
-				$.mobile.changePage( $.mobile.firstPage, {
-					transition: "none",
-					reverse: true,
-					changeHash: false,
-					fromHashChange: true
-				});
-			} else {
-				// trigger hashchange or navigate to squash and record the correct
-				// history entry for an initial hash path
-				if( !$.event.special.navigate.isPushStateEnabled() ) {
-					$window.trigger( "hashchange", [true] );
-				} else {
-					// TODO figure out how to simplify this interaction with the initial history entry
-					// at the bottom js/navigate/navigate.js
-					$.mobile.navigate.history.stack = [];
-					$.mobile.navigate( $.mobile.path.isPath( location.hash ) ? location.hash : location.href );
-				}
-			}
-		}
-	});
-
-	// initialize events now, after mobileinit has occurred
-	$.mobile.navreadyDeferred.resolve();
-
-	// check which scrollTop value should be used by scrolling to 1 immediately at domready
-	// then check what the scroll top is. Android will report 0... others 1
-	// note that this initial scroll won't hide the address bar. It's just for the check.
-	$(function() {
-		window.scrollTo( 0, 1 );
-
-		// if defaultHomeScroll hasn't been set yet, see if scrollTop is 1
-		// it should be 1 in most browsers, but android treats 1 as 0 (for hiding addr bar)
-		// so if it's 1, use 0 from now on
-		$.mobile.defaultHomeScroll = ( !$.support.scrollTop || $.mobile.window.scrollTop() === 1 ) ? 0 : 1;
-
-		//dom-ready inits
-		if ( $.mobile.autoInitializePage ) {
-			$.mobile.initializePage();
-		}
-
-		// window load event
-		// hide iOS browser chrome on load
-		$window.load( $.mobile.silentScroll );
-
-		if ( !$.support.cssPointerEvents ) {
-			// IE and Opera don't support CSS pointer-events: none that we use to disable link-based buttons
-			// by adding the 'ui-disabled' class to them. Using a JavaScript workaround for those browser.
-			// https://github.com/jquery/jquery-mobile/issues/3558
-
-			$.mobile.document.delegate( ".ui-disabled", "vclick",
-				function( e ) {
-					e.preventDefault();
-					e.stopImmediatePropagation();
-				}
-			);
-		}
-	});
-}( jQuery, this ));
-
-
-}));
diff --git a/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css b/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css
deleted file mode 100644
index 7c783e61fa3..00000000000
--- a/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery Mobile vGit Build: SHA1: caa77b258660731d663844fe7867aa2c3a107ab1 <> Date: Wed Feb 20 15:03:27 2013 -0500 jquerymobile.com | jquery.org/license !*/
-.ui-bar-a{border:1px solid #333;background:#111;color:#fff;font-weight:bold;text-shadow:0 -1px 0 #000;background-image:-webkit-gradient(linear,left top,left bottom,from( #3c3c3c ),to( #111 ));background-image:-webkit-linear-gradient( #3c3c3c,#111 );background-image:-moz-linear-gradient( #3c3c3c,#111 );background-image:-ms-linear-gradient( #3c3c3c,#111 );background-image:-o-linear-gradient( #3c3c3c,#111 );background-image:linear-gradient( #3c3c3c,#111 )}.ui-bar-a,.ui-bar-a input,.ui-bar-a select,.ui-bar-a textarea,.ui-bar-a button{font-family:Helvetica,Arial,sans-serif}.ui-bar-a .ui-link-inherit{color:#fff}.ui-bar-a a.ui-link{color:#7cc4e7;font-weight:bold}.ui-bar-a a.ui-link:visited{color:#2489ce}.ui-bar-a a.ui-link:hover{color:#2489ce}.ui-bar-a a.ui-link:active{color:#2489ce}.ui-body-a,.ui-overlay-a{border:1px solid #444;background:#222;color:#fff;text-shadow:0 1px 0 #111;font-weight:normal;background-image:-webkit-gradient(linear,left top,left bottom,from( #444 ),to( #222 ));background-image:-webkit-linear-gradient( #444,#222 );background-image:-moz-linear-gradient( #444,#222 );background-image:-ms-linear-gradient( #444,#222 );background-image:-o-linear-gradient( #444,#222 );background-image:linear-gradient( #444,#222 )}.ui-overlay-a{background-image:none;border-width:0}.ui-body-a,.ui-body-a input,.ui-body-a select,.ui-body-a textarea,.ui-body-a button{font-family:Helvetica,Arial,sans-serif}.ui-body-a .ui-link-inherit{color:#fff}.ui-body-a .ui-link{color:#2489ce;font-weight:bold}.ui-body-a .ui-link:visited{color:#2489ce}.ui-body-a .ui-link:hover{color:#2489ce}.ui-body-a .ui-link:active{color:#2489ce}.ui-btn-up-a{border:1px solid #111;background:#333;font-weight:bold;color:#fff;text-shadow:0 1px 0 #111;background-image:-webkit-gradient(linear,left top,left bottom,from( #444 ),to( #2d2d2d ));background-image:-webkit-linear-gradient( #444,#2d2d2d );background-image:-moz-linear-gradient( #444,#2d2d2d );background-image:-ms-linear-gradient( #444,#2d2d2d );background-image:-o-linear-gradient( #444,#2d2d2d );background-image:linear-gradient( #444,#2d2d2d )}.ui-btn-up-a:visited,.ui-btn-up-a a.ui-link-inherit{color:#fff}.ui-btn-hover-a{border:1px solid #000;background:#444;font-weight:bold;color:#fff;text-shadow:0 1px 0 #111;background-image:-webkit-gradient(linear,left top,left bottom,from( #555 ),to( #383838 ));background-image:-webkit-linear-gradient( #555,#383838 );background-image:-moz-linear-gradient( #555,#383838 );background-image:-ms-linear-gradient( #555,#383838 );background-image:-o-linear-gradient( #555,#383838 );background-image:linear-gradient( #555,#383838 )}.ui-btn-hover-a:visited,.ui-btn-hover-a:hover,.ui-btn-hover-a a.ui-link-inherit{color:#fff}.ui-btn-down-a{border:1px solid #000;background:#222;font-weight:bold;color:#fff;text-shadow:0 1px 0 #111;background-image:-webkit-gradient(linear,left top,left bottom,from( #202020 ),to( #2c2c2c ));background-image:-webkit-linear-gradient( #202020,#2c2c2c );background-image:-moz-linear-gradient( #202020,#2c2c2c );background-image:-ms-linear-gradient( #202020,#2c2c2c );background-image:-o-linear-gradient( #202020,#2c2c2c );background-image:linear-gradient( #202020,#2c2c2c )}.ui-btn-down-a:visited,.ui-btn-down-a:hover,.ui-btn-down-a a.ui-link-inherit{color:#fff}.ui-btn-up-a,.ui-btn-hover-a,.ui-btn-down-a{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-b{border:1px solid #456f9a;background:#5e87b0;color:#fff;font-weight:bold;text-shadow:0 1px 0 #3e6790;background-image:-webkit-gradient(linear,left top,left bottom,from( #6facd5 ),to( #497bae ));background-image:-webkit-linear-gradient( #6facd5,#497bae );background-image:-moz-linear-gradient( #6facd5,#497bae );background-image:-ms-linear-gradient( #6facd5,#497bae );background-image:-o-linear-gradient( #6facd5,#497bae );background-image:linear-gradient( #6facd5,#497bae )}.ui-bar-b,.ui-bar-b input,.ui-bar-b select,.ui-bar-b textarea,.ui-bar-b button{font-family:Helvetica,Arial,sans-serif}.ui-bar-b .ui-link-inherit{color:#fff}.ui-bar-b a.ui-link{color:#ddf0f8;font-weight:bold}.ui-bar-b a.ui-link:visited{color:#ddf0f8}.ui-bar-b a.ui-link:hover{color:#ddf0f8}.ui-bar-b a.ui-link:active{color:#ddf0f8}.ui-body-b,.ui-overlay-b{border:1px solid #999;background:#f3f3f3;color:#222;text-shadow:0 1px 0 #fff;font-weight:normal;background-image:-webkit-gradient(linear,left top,left bottom,from( #ddd ),to( #ccc ));background-image:-webkit-linear-gradient( #ddd,#ccc );background-image:-moz-linear-gradient( #ddd,#ccc );background-image:-ms-linear-gradient( #ddd,#ccc );background-image:-o-linear-gradient( #ddd,#ccc );background-image:linear-gradient( #ddd,#ccc )}.ui-overlay-b{background-image:none;border-width:0}.ui-body-b,.ui-body-b input,.ui-body-b select,.ui-body-b textarea,.ui-body-b button{font-family:Helvetica,Arial,sans-serif}.ui-body-b .ui-link-inherit{color:#333}.ui-body-b .ui-link{color:#2489ce;font-weight:bold}.ui-body-b .ui-link:visited{color:#2489ce}.ui-body-b .ui-link:hover{color:#2489ce}.ui-body-b .ui-link:active{color:#2489ce}.ui-btn-up-b{border:1px solid #044062;background:#396b9e;font-weight:bold;color:#fff;text-shadow:0 1px 0 #194b7e;background-image:-webkit-gradient(linear,left top,left bottom,from( #5f9cc5 ),to( #396b9e ));background-image:-webkit-linear-gradient( #5f9cc5,#396b9e );background-image:-moz-linear-gradient( #5f9cc5,#396b9e );background-image:-ms-linear-gradient( #5f9cc5,#396b9e );background-image:-o-linear-gradient( #5f9cc5,#396b9e );background-image:linear-gradient( #5f9cc5,#396b9e )}.ui-btn-up-b:visited,.ui-btn-up-b a.ui-link-inherit{color:#fff}.ui-btn-hover-b{border:1px solid #00415e;background:#4b88b6;font-weight:bold;color:#fff;text-shadow:0 1px 0 #194b7e;background-image:-webkit-gradient(linear,left top,left bottom,from( #6facd5 ),to( #4272a4 ));background-image:-webkit-linear-gradient( #6facd5,#4272a4 );background-image:-moz-linear-gradient( #6facd5,#4272a4 );background-image:-ms-linear-gradient( #6facd5,#4272a4 );background-image:-o-linear-gradient( #6facd5,#4272a4 );background-image:linear-gradient( #6facd5,#4272a4 )}.ui-btn-hover-b:visited,.ui-btn-hover-b:hover,.ui-btn-hover-b a.ui-link-inherit{color:#fff}.ui-btn-down-b{border:1px solid #225377;background:#4e89c5;font-weight:bold;color:#fff;text-shadow:0 1px 0 #194b7e;background-image:-webkit-gradient(linear,left top,left bottom,from( #295b8e ),to( #3e79b5 ));background-image:-webkit-linear-gradient( #295b8e,#3e79b5 );background-image:-moz-linear-gradient( #295b8e,#3e79b5 );background-image:-ms-linear-gradient( #295b8e,#3e79b5 );background-image:-o-linear-gradient( #295b8e,#3e79b5 );background-image:linear-gradient( #295b8e,#3e79b5 )}.ui-btn-down-b:visited,.ui-btn-down-b:hover,.ui-btn-down-b a.ui-link-inherit{color:#fff}.ui-btn-up-b,.ui-btn-hover-b,.ui-btn-down-b{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-c{border:1px solid #b3b3b3;background:#eee;color:#3e3e3e;font-weight:bold;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from( #f0f0f0 ),to( #ddd ));background-image:-webkit-linear-gradient( #f0f0f0,#ddd );background-image:-moz-linear-gradient( #f0f0f0,#ddd );background-image:-ms-linear-gradient( #f0f0f0,#ddd );background-image:-o-linear-gradient( #f0f0f0,#ddd );background-image:linear-gradient( #f0f0f0,#ddd )}.ui-bar-c .ui-link-inherit{color:#3e3e3e}.ui-bar-c a.ui-link{color:#7cc4e7;font-weight:bold}.ui-bar-c a.ui-link:visited{color:#2489ce}.ui-bar-c a.ui-link:hover{color:#2489ce}.ui-bar-c a.ui-link:active{color:#2489ce}.ui-bar-c,.ui-bar-c input,.ui-bar-c select,.ui-bar-c textarea,.ui-bar-c button{font-family:Helvetica,Arial,sans-serif}.ui-body-c,.ui-overlay-c{border:1px solid #aaa;color:#333;text-shadow:0 1px 0 #fff;background:#f9f9f9;background-image:-webkit-gradient(linear,left top,left bottom,from( #f9f9f9 ),to( #eee ));background-image:-webkit-linear-gradient( #f9f9f9,#eee );background-image:-moz-linear-gradient( #f9f9f9,#eee );background-image:-ms-linear-gradient( #f9f9f9,#eee );background-image:-o-linear-gradient( #f9f9f9,#eee );background-image:linear-gradient( #f9f9f9,#eee )}.ui-overlay-c{background-image:none;border-width:0}.ui-body-c,.ui-body-c input,.ui-body-c select,.ui-body-c textarea,.ui-body-c button{font-family:Helvetica,Arial,sans-serif}.ui-body-c .ui-link-inherit{color:#333}.ui-body-c .ui-link{color:#2489ce;font-weight:bold}.ui-body-c .ui-link:visited{color:#2489ce}.ui-body-c .ui-link:hover{color:#2489ce}.ui-body-c .ui-link:active{color:#2489ce}.ui-btn-up-c{border:1px solid #ccc;background:#eee;font-weight:bold;color:#222;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from( #fff ),to( #f1f1f1 ));background-image:-webkit-linear-gradient( #fff,#f1f1f1 );background-image:-moz-linear-gradient( #fff,#f1f1f1 );background-image:-ms-linear-gradient( #fff,#f1f1f1 );background-image:-o-linear-gradient( #fff,#f1f1f1 );background-image:linear-gradient( #fff,#f1f1f1 )}.ui-btn-up-c:visited,.ui-btn-up-c a.ui-link-inherit{color:#2f3e46}.ui-btn-hover-c{border:1px solid #bbb;background:#dfdfdf;font-weight:bold;color:#222;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from( #f6f6f6 ),to( #e0e0e0 ));background-image:-webkit-linear-gradient( #f6f6f6,#e0e0e0 );background-image:-moz-linear-gradient( #f6f6f6,#e0e0e0 );background-image:-ms-linear-gradient( #f6f6f6,#e0e0e0 );background-image:-o-linear-gradient( #f6f6f6,#e0e0e0 );background-image:linear-gradient( #f6f6f6,#e0e0e0 )}.ui-btn-hover-c:visited,.ui-btn-hover-c:hover,.ui-btn-hover-c a.ui-link-inherit{color:#2f3e46}.ui-btn-down-c{border:1px solid #bbb;background:#d6d6d6;font-weight:bold;color:#222;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from( #d0d0d0 ),to( #dfdfdf ));background-image:-webkit-linear-gradient( #d0d0d0,#dfdfdf );background-image:-moz-linear-gradient( #d0d0d0,#dfdfdf );background-image:-ms-linear-gradient( #d0d0d0,#dfdfdf );background-image:-o-linear-gradient( #d0d0d0,#dfdfdf );background-image:linear-gradient( #d0d0d0,#dfdfdf )}.ui-btn-down-c:visited,.ui-btn-down-c:hover,.ui-btn-down-c a.ui-link-inherit{color:#2f3e46}.ui-btn-up-c,.ui-btn-hover-c,.ui-btn-down-c{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-d{border:1px solid #bbb;background:#bbb;color:#333;font-weight:bold;text-shadow:0 1px 0 #eee;background-image:-webkit-gradient(linear,left top,left bottom,from( #ddd ),to( #bbb ));background-image:-webkit-linear-gradient( #ddd,#bbb );background-image:-moz-linear-gradient( #ddd,#bbb );background-image:-ms-linear-gradient( #ddd,#bbb );background-image:-o-linear-gradient( #ddd,#bbb );background-image:linear-gradient( #ddd,#bbb )}.ui-bar-d,.ui-bar-d input,.ui-bar-d select,.ui-bar-d textarea,.ui-bar-d button{font-family:Helvetica,Arial,sans-serif}.ui-bar-d .ui-link-inherit{color:#333}.ui-bar-d a.ui-link{color:#2489ce;font-weight:bold}.ui-bar-d a.ui-link:visited{color:#2489ce}.ui-bar-d a.ui-link:hover{color:#2489ce}.ui-bar-d a.ui-link:active{color:#2489ce}.ui-body-d,.ui-overlay-d{border:1px solid #bbb;color:#333;text-shadow:0 1px 0 #fff;background:#fff;background-image:-webkit-gradient(linear,left top,left bottom,from( #fff ),to( #fff ));background-image:-webkit-linear-gradient( #fff,#fff );background-image:-moz-linear-gradient( #fff,#fff );background-image:-ms-linear-gradient( #fff,#fff );background-image:-o-linear-gradient( #fff,#fff );background-image:linear-gradient( #fff,#fff )}.ui-overlay-d{background-image:none;border-width:0}.ui-body-d,.ui-body-d input,.ui-body-d select,.ui-body-d textarea,.ui-body-d button{font-family:Helvetica,Arial,sans-serif}.ui-body-d .ui-link-inherit{color:#333}.ui-body-d .ui-link{color:#2489ce;font-weight:bold}.ui-body-d .ui-link:visited{color:#2489ce}.ui-body-d .ui-link:hover{color:#2489ce}.ui-body-d .ui-link:active{color:#2489ce}.ui-btn-up-d{border:1px solid #bbb;background:#fff;font-weight:bold;color:#333;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from( #fafafa ),to( #f6f6f6 ));background-image:-webkit-linear-gradient( #fafafa,#f6f6f6 );background-image:-moz-linear-gradient( #fafafa,#f6f6f6 );background-image:-ms-linear-gradient( #fafafa,#f6f6f6 );background-image:-o-linear-gradient( #fafafa,#f6f6f6 );background-image:linear-gradient( #fafafa,#f6f6f6 )}.ui-btn-up-d:visited,.ui-btn-up-d a.ui-link-inherit{color:#333}.ui-btn-hover-d{border:1px solid #aaa;background:#eee;font-weight:bold;color:#333;cursor:pointer;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from( #eee ),to( #fff ));background-image:-webkit-linear-gradient( #eee,#fff );background-image:-moz-linear-gradient( #eee,#fff );background-image:-ms-linear-gradient( #eee,#fff );background-image:-o-linear-gradient( #eee,#fff );background-image:linear-gradient( #eee,#fff )}.ui-btn-hover-d:visited,.ui-btn-hover-d:hover,.ui-btn-hover-d a.ui-link-inherit{color:#333}.ui-btn-down-d{border:1px solid #aaa;background:#eee;font-weight:bold;color:#333;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from( #e5e5e5 ),to( #f2f2f2 ));background-image:-webkit-linear-gradient( #e5e5e5,#f2f2f2 );background-image:-moz-linear-gradient( #e5e5e5,#f2f2f2 );background-image:-ms-linear-gradient( #e5e5e5,#f2f2f2 );background-image:-o-linear-gradient( #e5e5e5,#f2f2f2 );background-image:linear-gradient( #e5e5e5,#f2f2f2 )}.ui-btn-down-d:visited,.ui-btn-down-d:hover,.ui-btn-down-d a.ui-link-inherit{color:#333}.ui-btn-up-d,.ui-btn-hover-d,.ui-btn-down-d{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-e{border:1px solid #f7c942;background:#fadb4e;color:#333;font-weight:bold;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from( #fceda7 ),to( #fbef7e ));background-image:-webkit-linear-gradient( #fceda7,#fbef7e );background-image:-moz-linear-gradient( #fceda7,#fbef7e );background-image:-ms-linear-gradient( #fceda7,#fbef7e );background-image:-o-linear-gradient( #fceda7,#fbef7e );background-image:linear-gradient( #fceda7,#fbef7e )}.ui-bar-e,.ui-bar-e input,.ui-bar-e select,.ui-bar-e textarea,.ui-bar-e button{font-family:Helvetica,Arial,sans-serif}.ui-bar-e .ui-link-inherit{color:#333}.ui-bar-e a.ui-link{color:#2489ce;font-weight:bold}.ui-bar-e a.ui-link:visited{color:#2489ce}.ui-bar-e a.ui-link:hover{color:#2489ce}.ui-bar-e a.ui-link:active{color:#2489ce}.ui-body-e,.ui-overlay-e{border:1px solid #f7c942;color:#222;text-shadow:0 1px 0 #fff;background:#fff9df;background-image:-webkit-gradient(linear,left top,left bottom,from( #fffadf ),to( #fff3a5 ));background-image:-webkit-linear-gradient( #fffadf,#fff3a5 );background-image:-moz-linear-gradient( #fffadf,#fff3a5 );background-image:-ms-linear-gradient( #fffadf,#fff3a5 );background-image:-o-linear-gradient( #fffadf,#fff3a5 );background-image:linear-gradient( #fffadf,#fff3a5 )}.ui-overlay-e{background-image:none;border-width:0}.ui-body-e,.ui-body-e input,.ui-body-e select,.ui-body-e textarea,.ui-body-e button{font-family:Helvetica,Arial,sans-serif}.ui-body-e .ui-link-inherit{color:#222}.ui-body-e .ui-link{color:#2489ce;font-weight:bold}.ui-body-e .ui-link:visited{color:#2489ce}.ui-body-e .ui-link:hover{color:#2489ce}.ui-body-e .ui-link:active{color:#2489ce}.ui-btn-up-e{border:1px solid #f4c63f;background:#fadb4e;font-weight:bold;color:#222;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from( #ffefaa ),to( #ffe155 ));background-image:-webkit-linear-gradient( #ffefaa,#ffe155 );background-image:-moz-linear-gradient( #ffefaa,#ffe155 );background-image:-ms-linear-gradient( #ffefaa,#ffe155 );background-image:-o-linear-gradient( #ffefaa,#ffe155 );background-image:linear-gradient( #ffefaa,#ffe155 )}.ui-btn-up-e:visited,.ui-btn-up-e a.ui-link-inherit{color:#222}.ui-btn-hover-e{border:1px solid #f2c43d;background:#fbe26f;font-weight:bold;color:#111;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from( #fff5ba ),to( #fbdd52 ));background-image:-webkit-linear-gradient( #fff5ba,#fbdd52 );background-image:-moz-linear-gradient( #fff5ba,#fbdd52 );background-image:-ms-linear-gradient( #fff5ba,#fbdd52 );background-image:-o-linear-gradient( #fff5ba,#fbdd52 );background-image:linear-gradient( #fff5ba,#fbdd52 )}.ui-btn-hover-e:visited,.ui-btn-hover-e:hover,.ui-btn-hover-e a.ui-link-inherit{color:#333}.ui-btn-down-e{border:1px solid #f2c43d;background:#fceda7;font-weight:bold;color:#111;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from( #f8d94c ),to( #fadb4e ));background-image:-webkit-linear-gradient( #f8d94c,#fadb4e );background-image:-moz-linear-gradient( #f8d94c,#fadb4e );background-image:-ms-linear-gradient( #f8d94c,#fadb4e );background-image:-o-linear-gradient( #f8d94c,#fadb4e );background-image:linear-gradient( #f8d94c,#fadb4e )}.ui-btn-down-e:visited,.ui-btn-down-e:hover,.ui-btn-down-e a.ui-link-inherit{color:#333}.ui-btn-up-e,.ui-btn-hover-e,.ui-btn-down-e{font-family:Helvetica,Arial,sans-serif;text-decoration:none}a.ui-link-inherit{text-decoration:none!important}.ui-btn-active{border:1px solid #2373a5;background:#5393c5;font-weight:bold;color:#fff;cursor:pointer;text-shadow:0 1px 0 #3373a5;text-decoration:none;background-image:-webkit-gradient(linear,left top,left bottom,from( #5393c5 ),to( #6facd5 ));background-image:-webkit-linear-gradient( #5393c5,#6facd5 );background-image:-moz-linear-gradient( #5393c5,#6facd5 );background-image:-ms-linear-gradient( #5393c5,#6facd5 );background-image:-o-linear-gradient( #5393c5,#6facd5 );background-image:linear-gradient( #5393c5,#6facd5 );font-family:Helvetica,Arial,sans-serif}.ui-btn-active:visited,.ui-btn-active:hover,.ui-btn-active a.ui-link-inherit{color:#fff}.ui-btn-inner{border-top:1px solid #fff;border-color:rgba(255,255,255,.3)}.ui-corner-all{-webkit-border-radius:.6em;border-radius:.6em}.ui-br{border-color:rgb(130,130,130);border-color:rgba(130,130,130,.3);border-style:solid}.ui-disabled{filter:Alpha(Opacity=30);opacity:.3;zoom:1}.ui-disabled,.ui-disabled a{cursor:default!important;pointer-events:none}.ui-icon,.ui-icon-searchfield:after{background-color:#666;background-color:rgba(0,0,0,.4);background-image:url(images/icons-18-white.png);background-repeat:no-repeat;-webkit-border-radius:9px;border-radius:9px}.ui-icon-alt .ui-icon,.ui-icon-alt .ui-icon-searchfield:after{background-color:#fff;background-color:rgba(255,255,255,.3);background-image:url(images/icons-18-black.png);background-repeat:no-repeat}.ui-icon-nodisc .ui-icon,.ui-icon-nodisc .ui-icon-searchfield:after,.ui-icon-nodisc .ui-icon-alt .ui-icon,.ui-icon-nodisc .ui-icon-alt .ui-icon-searchfield:after{background-color:transparent}.ui-icon-plus{background-position:-1px -1px}.ui-icon-minus{background-position:-37px -1px}.ui-icon-delete{background-position:-73px -1px}.ui-icon-arrow-r{background-position:-108px -1px}.ui-icon-arrow-l{background-position:-144px -1px}.ui-icon-arrow-u{background-position:-180px -1px}.ui-icon-arrow-d{background-position:-216px -1px}.ui-icon-check{background-position:-252px -1px}.ui-icon-gear{background-position:-288px -1px}.ui-icon-refresh{background-position:-323px -1px}.ui-icon-forward{background-position:-360px -1px}.ui-icon-back{background-position:-396px -1px}.ui-icon-grid{background-position:-432px -1px}.ui-icon-star{background-position:-467px -1px}.ui-icon-alert{background-position:-503px -1px}.ui-icon-info{background-position:-539px -1px}.ui-icon-home{background-position:-575px -1px}.ui-icon-search,.ui-icon-searchfield:after{background-position:-611px -1px}.ui-icon-checkbox-on{background-position:-647px -1px}.ui-icon-checkbox-off{background-position:-683px -1px}.ui-icon-radio-on{background-position:-718px -1px}.ui-icon-radio-off{background-position:-754px -1px}.ui-icon-bars{background-position:-788px -1px}.ui-icon-edit{background-position:-824px -1px}@media only screen and (-webkit-min-device-pixel-ratio:1.3),only screen and (min--moz-device-pixel-ratio:1.3),only screen and (min-resolution:200dpi){.ui-icon-plus,.ui-icon-minus,.ui-icon-delete,.ui-icon-arrow-r,.ui-icon-arrow-l,.ui-icon-arrow-u,.ui-icon-arrow-d,.ui-icon-check,.ui-icon-gear,.ui-icon-refresh,.ui-icon-forward,.ui-icon-back,.ui-icon-grid,.ui-icon-star,.ui-icon-alert,.ui-icon-info,.ui-icon-home,.ui-icon-bars,.ui-icon-edit,.ui-icon-search,.ui-icon-searchfield:after,.ui-icon-checkbox-off,.ui-icon-checkbox-on,.ui-icon-radio-off,.ui-icon-radio-on{background-image:url(images/icons-36-white.png);-moz-background-size:864px 18px;-o-background-size:864px 18px;-webkit-background-size:864px 18px;background-size:864px 18px}.ui-icon-alt .ui-icon{background-image:url(images/icons-36-black.png)}.ui-icon-plus{background-position:0 50%}.ui-icon-minus{background-position:-36px 50%}.ui-icon-delete{background-position:-72px 50%}.ui-icon-arrow-r{background-position:-108px 50%}.ui-icon-arrow-l{background-position:-144px 50%}.ui-icon-arrow-u{background-position:-179px 50%}.ui-icon-arrow-d{background-position:-215px 50%}.ui-icon-check{background-position:-252px 50%}.ui-icon-gear{background-position:-287px 50%}.ui-icon-refresh{background-position:-323px 50%}.ui-icon-forward{background-position:-360px 50%}.ui-icon-back{background-position:-395px 50%}.ui-icon-grid{background-position:-431px 50%}.ui-icon-star{background-position:-467px 50%}.ui-icon-alert{background-position:-503px 50%}.ui-icon-info{background-position:-538px 50%}.ui-icon-home{background-position:-575px 50%}.ui-icon-search,.ui-icon-searchfield:after{background-position:-611px 50%}.ui-icon-checkbox-on{background-position:-647px 50%}.ui-icon-checkbox-off{background-position:-683px 50%}.ui-icon-radio-on{background-position:-718px 50%}.ui-icon-radio-off{background-position:-754px 50%}.ui-icon-bars{background-position:-788px 50%}.ui-icon-edit{background-position:-824px 50%}}.ui-checkbox .ui-icon,.ui-selectmenu-list .ui-icon{-webkit-border-radius:3px;border-radius:3px}.ui-icon-checkbox-off,.ui-icon-radio-off{background-color:transparent}.ui-checkbox-on .ui-icon,.ui-radio-on .ui-icon{background-color:#4596ce}.ui-icon-loading{background:url(images/ajax-loader.gif);background-size:46px 46px}.ui-btn-corner-all{-webkit-border-radius:1em;border-radius:1em}.ui-corner-all,.ui-btn-corner-all{-webkit-background-clip:padding;background-clip:padding-box}.ui-overlay{background:#666;filter:Alpha(Opacity=50);opacity:.5;position:absolute;width:100%;height:100%}.ui-overlay-shadow{-moz-box-shadow:0 0 12px rgba(0,0,0,.6);-webkit-box-shadow:0 0 12px rgba(0,0,0,.6);box-shadow:0 0 12px rgba(0,0,0,.6)}.ui-shadow{-moz-box-shadow:0 1px 3px rgba(0,0,0,.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,.2);box-shadow:0 1px 3px rgba(0,0,0,.2)}.ui-bar-a .ui-shadow,.ui-bar-b .ui-shadow,.ui-bar-c .ui-shadow{-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.ui-shadow-inset{-moz-box-shadow:inset 0 1px 4px rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 4px rgba(0,0,0,.2);box-shadow:inset 0 1px 4px rgba(0,0,0,.2)}.ui-icon-shadow{-moz-box-shadow:0 1px 0 rgba(255,255,255,.4);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.4);box-shadow:0 1px 0 rgba(255,255,255,.4)}.ui-btn:focus,.ui-link-inherit:focus{outline:0}.ui-btn.ui-focus{z-index:1}.ui-focus,.ui-btn:focus{-moz-box-shadow:inset 0 0 3px #387bbe,0px 0 9px #387bbe;-webkit-box-shadow:inset 0 0 3px #387bbe,0px 0 9px #387bbe;box-shadow:inset 0 0 3px #387bbe,0px 0 9px #387bbe}.ui-input-text.ui-focus,.ui-input-search.ui-focus{-moz-box-shadow:0 0 12px #387bbe;-webkit-box-shadow:0 0 12px #387bbe;box-shadow:0 0 12px #387bbe}.ui-mobile-nosupport-boxshadow *{-moz-box-shadow:none!important;-webkit-box-shadow:none!important;box-shadow:none!important}.ui-mobile-nosupport-boxshadow .ui-focus,.ui-mobile-nosupport-boxshadow .ui-btn:focus,.ui-mobile-nosupport-boxshadow .ui-link-inherit:focus{outline-width:1px;outline-style:auto}.ui-mobile,.ui-mobile body{height:99.9%}.ui-mobile fieldset,.ui-page{padding:0;margin:0}.ui-mobile a img,.ui-mobile fieldset{border-width:0}.ui-mobile-viewport{margin:0;overflow-x:visible;-webkit-text-size-adjust:100%;-ms-text-size-adjust:none;-webkit-tap-highlight-color:rgba(0,0,0,0)}body.ui-mobile-viewport,div.ui-mobile-viewport{overflow-x:hidden}.ui-mobile [data-role=page],.ui-mobile [data-role=dialog],.ui-page{top:0;left:0;width:100%;min-height:100%;position:absolute;display:none;border:0}.ui-mobile .ui-page-active{display:block;overflow:visible}.ui-page{outline:none}@media screen and (orientation:portrait){.ui-mobile,.ui-mobile .ui-page{min-height:420px}}@media screen and (orientation:landscape){.ui-mobile,.ui-mobile .ui-page{min-height:300px}}.ui-loading .ui-loader{display:block}.ui-loader{display:none;z-index:9999999;position:fixed;top:50%;left:50%;border:0}.ui-loader-default{background:none;filter:Alpha(Opacity=18);opacity:.18;width:46px;height:46px;margin-left:-23px;margin-top:-23px}.ui-loader-verbose{width:200px;filter:Alpha(Opacity=88);opacity:.88;box-shadow:0 1px 1px -1px #fff;height:auto;margin-left:-110px;margin-top:-43px;padding:10px}.ui-loader-default h1{font-size:0;width:0;height:0;overflow:hidden}.ui-loader-verbose h1{font-size:16px;margin:0;text-align:center}.ui-loader .ui-icon{background-color:#000;display:block;margin:0;width:44px;height:44px;padding:1px;-webkit-border-radius:36px;border-radius:36px}.ui-loader-verbose .ui-icon{margin:0 auto 10px;filter:Alpha(Opacity=75);opacity:.75}.ui-loader-textonly{padding:15px;margin-left:-115px}.ui-loader-textonly .ui-icon{display:none}.ui-loader-fakefix{position:absolute}.ui-mobile-rendering > *{visibility:hidden}.ui-bar,.ui-body{position:relative;padding:.4em 15px;overflow:hidden;display:block;clear:both}.ui-bar{font-size:16px;margin:0}.ui-bar h1,.ui-bar h2,.ui-bar h3,.ui-bar h4,.ui-bar h5,.ui-bar h6{margin:0;padding:0;font-size:16px;display:inline-block}.ui-header,.ui-footer{position:relative;zoom:1}.ui-mobile .ui-header,.ui-mobile .ui-footer{border-left-width:0;border-right-width:0}.ui-header .ui-btn-left,.ui-header .ui-btn-right,.ui-footer .ui-btn-left,.ui-footer .ui-btn-right,.ui-header-fixed.ui-fixed-hidden .ui-btn-left,.ui-header-fixed.ui-fixed-hidden .ui-btn-right{position:absolute;top:3px}.ui-header-fixed .ui-btn-left,.ui-header-fixed .ui-btn-right{top:4px}.ui-header .ui-btn-left,.ui-footer .ui-btn-left{left:5px}.ui-header .ui-btn-right,.ui-footer .ui-btn-right{right:5px}.ui-footer > .ui-btn-icon-notext,.ui-header > .ui-btn-icon-notext,.ui-header-fixed.ui-fixed-hidden > .ui-btn-icon-notext{top:6px}.ui-header-fixed > .ui-btn-icon-notext{top:7px}.ui-header .ui-title,.ui-footer .ui-title{min-height:1.1em;text-align:center;font-size:16px;display:block;margin:.6em 30% .8em;padding:0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;outline:0!important}.ui-footer .ui-title{margin:.6em 15px .8em}.ui-content{border-width:0;overflow:visible;overflow-x:hidden;padding:15px}.ui-corner-all > .ui-header:first-child,.ui-corner-all > .ui-content:first-child,.ui-corner-all > .ui-footer:first-child{-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit}.ui-corner-all > .ui-header:last-child,.ui-corner-all > .ui-content:last-child,.ui-corner-all > .ui-footer:last-child{-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit}.ui-icon{width:18px;height:18px}.ui-nojs{position:absolute;left:-9999px}.ui-hide-label label.ui-input-text,.ui-hide-label label.ui-select,.ui-hide-label label.ui-slider,.ui-hide-label label.ui-submit,.ui-hide-label .ui-controlgroup-label,.ui-hidden-accessible{position:absolute!important;left:-9999px;clip:rect(1px);clip:rect(1px,1px,1px,1px)}.ui-mobile-viewport-transitioning,.ui-mobile-viewport-transitioning .ui-page{width:100%;height:100%;overflow:hidden;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.ui-page-pre-in{opacity:0}.in{-webkit-animation-fill-mode:both;-webkit-animation-timing-function:ease-out;-webkit-animation-duration:350ms;-moz-animation-fill-mode:both;-moz-animation-timing-function:ease-out;-moz-animation-duration:350ms;animation-fill-mode:both;animation-timing-function:ease-out;animation-duration:350ms}.out{-webkit-animation-fill-mode:both;-webkit-animation-timing-function:ease-in;-webkit-animation-duration:225ms;-moz-animation-fill-mode:both;-moz-animation-timing-function:ease-in;-moz-animation-duration:225ms;animation-fill-mode:both;animation-timing-function:ease-in;animation-duration:225ms}@-webkit-keyframes fadein{from{opacity:0}to{opacity:1}}@-moz-keyframes fadein{from{opacity:0}to{opacity:1}}@keyframes fadein{from{opacity:0}to{opacity:1}}@-webkit-keyframes fadeout{from{opacity:1}to{opacity:0}}@-moz-keyframes fadeout{from{opacity:1}to{opacity:0}}@keyframes fadeout{from{opacity:1}to{opacity:0}}.fade.out{opacity:0;-webkit-animation-duration:125ms;-webkit-animation-name:fadeout;-moz-animation-duration:125ms;-moz-animation-name:fadeout;animation-duration:125ms;animation-name:fadeout}.fade.in{opacity:1;-webkit-animation-duration:225ms;-webkit-animation-name:fadein;-moz-animation-duration:225ms;-moz-animation-name:fadein;animation-duration:225ms;animation-name:fadein}.pop{-webkit-transform-origin:50% 50%;-moz-transform-origin:50% 50%;transform-origin:50% 50%}.pop.in{-webkit-transform:scale(1);-webkit-animation-name:popin;-webkit-animation-duration:350ms;-moz-transform:scale(1);-moz-animation-name:popin;-moz-animation-duration:350ms;transform:scale(1);animation-name:popin;animation-duration:350ms;opacity:1}.pop.out{-webkit-animation-name:fadeout;-webkit-animation-duration:100ms;-moz-animation-name:fadeout;-moz-animation-duration:100ms;animation-name:fadeout;animation-duration:100ms;opacity:0}.pop.in.reverse{-webkit-animation-name:fadein;-moz-animation-name:fadein;animation-name:fadein}.pop.out.reverse{-webkit-transform:scale(.8);-webkit-animation-name:popout;-moz-transform:scale(.8);-moz-animation-name:popout;transform:scale(.8);animation-name:popout}@-webkit-keyframes popin{from{-webkit-transform:scale(.8);opacity:0}to{-webkit-transform:scale(1);opacity:1}}@-moz-keyframes popin{from{-moz-transform:scale(.8);opacity:0}to{-moz-transform:scale(1);opacity:1}}@keyframes popin{from{transform:scale(.8);opacity:0}to{transform:scale(1);opacity:1}}@-webkit-keyframes popout{from{-webkit-transform:scale(1);opacity:1}to{-webkit-transform:scale(.8);opacity:0}}@-moz-keyframes popout{from{-moz-transform:scale(1);opacity:1}to{-moz-transform:scale(.8);opacity:0}}@keyframes popout{from{transform:scale(1);opacity:1}to{transform:scale(.8);opacity:0}}@-webkit-keyframes slideinfromright{from{-webkit-transform:translateX(100%)}to{-webkit-transform:translateX(0)}}@-moz-keyframes slideinfromright{from{-moz-transform:translateX(100%)}to{-moz-transform:translateX(0)}}@keyframes slideinfromright{from{transform:translateX(100%)}to{transform:translateX(0)}}@-webkit-keyframes slideinfromleft{from{-webkit-transform:translateX(-100%)}to{-webkit-transform:translateX(0)}}@-moz-keyframes slideinfromleft{from{-moz-transform:translateX(-100%)}to{-moz-transform:translateX(0)}}@keyframes slideinfromleft{from{transform:translateX(-100%)}to{transform:translateX(0)}}@-webkit-keyframes slideouttoleft{from{-webkit-transform:translateX(0)}to{-webkit-transform:translateX(-100%)}}@-moz-keyframes slideouttoleft{from{-moz-transform:translateX(0)}to{-moz-transform:translateX(-100%)}}@keyframes slideouttoleft{from{transform:translateX(0)}to{transform:translateX(-100%)}}@-webkit-keyframes slideouttoright{from{-webkit-transform:translateX(0)}to{-webkit-transform:translateX(100%)}}@-moz-keyframes slideouttoright{from{-moz-transform:translateX(0)}to{-moz-transform:translateX(100%)}}@keyframes slideouttoright{from{transform:translateX(0)}to{transform:translateX(100%)}}.slide.out,.slide.in{-webkit-animation-timing-function:ease-out;-webkit-animation-duration:350ms;-moz-animation-timing-function:ease-out;-moz-animation-duration:350ms;animation-timing-function:ease-out;animation-duration:350ms}.slide.out{-webkit-transform:translateX(-100%);-webkit-animation-name:slideouttoleft;-moz-transform:translateX(-100%);-moz-animation-name:slideouttoleft;transform:translateX(-100%);animation-name:slideouttoleft}.slide.in{-webkit-transform:translateX(0);-webkit-animation-name:slideinfromright;-moz-transform:translateX(0);-moz-animation-name:slideinfromright;transform:translateX(0);animation-name:slideinfromright}.slide.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:slideouttoright;-moz-transform:translateX(100%);-moz-animation-name:slideouttoright;transform:translateX(100%);animation-name:slideouttoright}.slide.in.reverse{-webkit-transform:translateX(0);-webkit-animation-name:slideinfromleft;-moz-transform:translateX(0);-moz-animation-name:slideinfromleft;transform:translateX(0);animation-name:slideinfromleft}.slidefade.out{-webkit-transform:translateX(-100%);-webkit-animation-name:slideouttoleft;-webkit-animation-duration:225ms;-moz-transform:translateX(-100%);-moz-animation-name:slideouttoleft;-moz-animation-duration:225ms;transform:translateX(-100%);animation-name:slideouttoleft;animation-duration:225ms}.slidefade.in{-webkit-transform:translateX(0);-webkit-animation-name:fadein;-webkit-animation-duration:200ms;-moz-transform:translateX(0);-moz-animation-name:fadein;-moz-animation-duration:200ms;transform:translateX(0);animation-name:fadein;animation-duration:200ms}.slidefade.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:slideouttoright;-webkit-animation-duration:200ms;-moz-transform:translateX(100%);-moz-animation-name:slideouttoright;-moz-animation-duration:200ms;transform:translateX(100%);animation-name:slideouttoright;animation-duration:200ms}.slidefade.in.reverse{-webkit-transform:translateX(0);-webkit-animation-name:fadein;-webkit-animation-duration:200ms;-moz-transform:translateX(0);-moz-animation-name:fadein;-moz-animation-duration:200ms;transform:translateX(0);animation-name:fadein;animation-duration:200ms}.slidedown.out{-webkit-animation-name:fadeout;-webkit-animation-duration:100ms;-moz-animation-name:fadeout;-moz-animation-duration:100ms;animation-name:fadeout;animation-duration:100ms}.slidedown.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfromtop;-webkit-animation-duration:250ms;-moz-transform:translateY(0);-moz-animation-name:slideinfromtop;-moz-animation-duration:250ms;transform:translateY(0);animation-name:slideinfromtop;animation-duration:250ms}.slidedown.in.reverse{-webkit-animation-name:fadein;-webkit-animation-duration:150ms;-moz-animation-name:fadein;-moz-animation-duration:150ms;animation-name:fadein;animation-duration:150ms}.slidedown.out.reverse{-webkit-transform:translateY(-100%);-webkit-animation-name:slideouttotop;-webkit-animation-duration:200ms;-moz-transform:translateY(-100%);-moz-animation-name:slideouttotop;-moz-animation-duration:200ms;transform:translateY(-100%);animation-name:slideouttotop;animation-duration:200ms}@-webkit-keyframes slideinfromtop{from{-webkit-transform:translateY(-100%)}to{-webkit-transform:translateY(0)}}@-moz-keyframes slideinfromtop{from{-moz-transform:translateY(-100%)}to{-moz-transform:translateY(0)}}@keyframes slideinfromtop{from{transform:translateY(-100%)}to{transform:translateY(0)}}@-webkit-keyframes slideouttotop{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(-100%)}}@-moz-keyframes slideouttotop{from{-moz-transform:translateY(0)}to{-moz-transform:translateY(-100%)}}@keyframes slideouttotop{from{transform:translateY(0)}to{transform:translateY(-100%)}}.slideup.out{-webkit-animation-name:fadeout;-webkit-animation-duration:100ms;-moz-animation-name:fadeout;-moz-animation-duration:100ms;animation-name:fadeout;animation-duration:100ms}.slideup.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfrombottom;-webkit-animation-duration:250ms;-moz-transform:translateY(0);-moz-animation-name:slideinfrombottom;-moz-animation-duration:250ms;transform:translateY(0);animation-name:slideinfrombottom;animation-duration:250ms}.slideup.in.reverse{-webkit-animation-name:fadein;-webkit-animation-duration:150ms;-moz-animation-name:fadein;-moz-animation-duration:150ms;animation-name:fadein;animation-duration:150ms}.slideup.out.reverse{-webkit-transform:translateY(100%);-webkit-animation-name:slideouttobottom;-webkit-animation-duration:200ms;-moz-transform:translateY(100%);-moz-animation-name:slideouttobottom;-moz-animation-duration:200ms;transform:translateY(100%);animation-name:slideouttobottom;animation-duration:200ms}@-webkit-keyframes slideinfrombottom{from{-webkit-transform:translateY(100%)}to{-webkit-transform:translateY(0)}}@-moz-keyframes slideinfrombottom{from{-moz-transform:translateY(100%)}to{-moz-transform:translateY(0)}}@keyframes slideinfrombottom{from{transform:translateY(100%)}to{transform:translateY(0)}}@-webkit-keyframes slideouttobottom{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(100%)}}@-moz-keyframes slideouttobottom{from{-moz-transform:translateY(0)}to{-moz-transform:translateY(100%)}}@keyframes slideouttobottom{from{transform:translateY(0)}to{transform:translateY(100%)}}.viewport-flip{-webkit-perspective:1000;-moz-perspective:1000;perspective:1000;position:absolute}.flip{-webkit-backface-visibility:hidden;-webkit-transform:translateX(0);-moz-backface-visibility:hidden;-moz-transform:translateX(0);backface-visibility:hidden;transform:translateX(0)}.flip.out{-webkit-transform:rotateY(-90deg) scale(.9);-webkit-animation-name:flipouttoleft;-webkit-animation-duration:175ms;-moz-transform:rotateY(-90deg) scale(.9);-moz-animation-name:flipouttoleft;-moz-animation-duration:175ms;transform:rotateY(-90deg) scale(.9);animation-name:flipouttoleft;animation-duration:175ms}.flip.in{-webkit-animation-name:flipintoright;-webkit-animation-duration:225ms;-moz-animation-name:flipintoright;-moz-animation-duration:225ms;animation-name:flipintoright;animation-duration:225ms}.flip.out.reverse{-webkit-transform:rotateY(90deg) scale(.9);-webkit-animation-name:flipouttoright;-moz-transform:rotateY(90deg) scale(.9);-moz-animation-name:flipouttoright;transform:rotateY(90deg) scale(.9);animation-name:flipouttoright}.flip.in.reverse{-webkit-animation-name:flipintoleft;-moz-animation-name:flipintoleft;animation-name:flipintoleft}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(-90deg) scale(.9)}}@-moz-keyframes flipouttoleft{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(-90deg) scale(.9)}}@keyframes flipouttoleft{from{transform:rotateY(0)}to{transform:rotateY(-90deg) scale(.9)}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(90deg) scale(.9)}}@-moz-keyframes flipouttoright{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(90deg) scale(.9)}}@keyframes flipouttoright{from{transform:rotateY(0)}to{transform:rotateY(90deg) scale(.9)}}@-webkit-keyframes flipintoleft{from{-webkit-transform:rotateY(-90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoleft{from{-moz-transform:rotateY(-90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@keyframes flipintoleft{from{transform:rotateY(-90deg) scale(.9)}to{transform:rotateY(0)}}@-webkit-keyframes flipintoright{from{-webkit-transform:rotateY(90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoright{from{-moz-transform:rotateY(90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@keyframes flipintoright{from{transform:rotateY(90deg) scale(.9)}to{transform:rotateY(0)}}.viewport-turn{-webkit-perspective:200px;-moz-perspective:200px;-ms-perspective:200px;perspective:200px;position:absolute}.turn{-webkit-backface-visibility:hidden;-webkit-transform:translateX(0);-webkit-transform-origin:0;-moz-backface-visibility:hidden;-moz-transform:translateX(0);-moz-transform-origin:0;backface-visibility:hidden;transform:translateX(0);transform-origin:0}.turn.out{-webkit-transform:rotateY(-90deg) scale(.9);-webkit-animation-name:flipouttoleft;-webkit-animation-duration:125ms;-moz-transform:rotateY(-90deg) scale(.9);-moz-animation-name:flipouttoleft;-moz-animation-duration:125ms;transform:rotateY(-90deg) scale(.9);animation-name:flipouttoleft;animation-duration:125ms}.turn.in{-webkit-animation-name:flipintoright;-webkit-animation-duration:250ms;-moz-animation-name:flipintoright;-moz-animation-duration:250ms;animation-name:flipintoright;animation-duration:250ms}.turn.out.reverse{-webkit-transform:rotateY(90deg) scale(.9);-webkit-animation-name:flipouttoright;-moz-transform:rotateY(90deg) scale(.9);-moz-animation-name:flipouttoright;transform:rotateY(90deg) scale(.9);animation-name:flipouttoright}.turn.in.reverse{-webkit-animation-name:flipintoleft;-moz-animation-name:flipintoleft;animation-name:flipintoleft}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(-90deg) scale(.9)}}@-moz-keyframes flipouttoleft{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(-90deg) scale(.9)}}@keyframes flipouttoleft{from{transform:rotateY(0)}to{transform:rotateY(-90deg) scale(.9)}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(90deg) scale(.9)}}@-moz-keyframes flipouttoright{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(90deg) scale(.9)}}@keyframes flipouttoright{from{transform:rotateY(0)}to{transform:rotateY(90deg) scale(.9)}}@-webkit-keyframes flipintoleft{from{-webkit-transform:rotateY(-90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoleft{from{-moz-transform:rotateY(-90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@keyframes flipintoleft{from{transform:rotateY(-90deg) scale(.9)}to{transform:rotateY(0)}}@-webkit-keyframes flipintoright{from{-webkit-transform:rotateY(90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoright{from{-moz-transform:rotateY(90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@keyframes flipintoright{from{transform:rotateY(90deg) scale(.9)}to{transform:rotateY(0)}}.flow{-webkit-transform-origin:50% 30%;-webkit-box-shadow:0 0 20px rgba(0,0,0,.4);-moz-transform-origin:50% 30%;-moz-box-shadow:0 0 20px rgba(0,0,0,.4);transform-origin:50% 30%;box-shadow:0 0 20px rgba(0,0,0,.4)}.ui-dialog.flow{-webkit-transform-origin:none;-webkit-box-shadow:none;-moz-transform-origin:none;-moz-box-shadow:none;transform-origin:none;box-shadow:none}.flow.out{-webkit-transform:translateX(-100%) scale(.7);-webkit-animation-name:flowouttoleft;-webkit-animation-timing-function:ease;-webkit-animation-duration:350ms;-moz-transform:translateX(-100%) scale(.7);-moz-animation-name:flowouttoleft;-moz-animation-timing-function:ease;-moz-animation-duration:350ms;transform:translateX(-100%) scale(.7);animation-name:flowouttoleft;animation-timing-function:ease;animation-duration:350ms}.flow.in{-webkit-transform:translateX(0) scale(1);-webkit-animation-name:flowinfromright;-webkit-animation-timing-function:ease;-webkit-animation-duration:350ms;-moz-transform:translateX(0) scale(1);-moz-animation-name:flowinfromright;-moz-animation-timing-function:ease;-moz-animation-duration:350ms;transform:translateX(0) scale(1);animation-name:flowinfromright;animation-timing-function:ease;animation-duration:350ms}.flow.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:flowouttoright;-moz-transform:translateX(100%);-moz-animation-name:flowouttoright;transform:translateX(100%);animation-name:flowouttoright}.flow.in.reverse{-webkit-animation-name:flowinfromleft;-moz-animation-name:flowinfromleft;animation-name:flowinfromleft}@-webkit-keyframes flowouttoleft{0%{-webkit-transform:translateX(0) scale(1)}60%,70%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(-100%) scale(.7)}}@-moz-keyframes flowouttoleft{0%{-moz-transform:translateX(0) scale(1)}60%,70%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(-100%) scale(.7)}}@keyframes flowouttoleft{0%{transform:translateX(0) scale(1)}60%,70%{transform:translateX(0) scale(.7)}100%{transform:translateX(-100%) scale(.7)}}@-webkit-keyframes flowouttoright{0%{-webkit-transform:translateX(0) scale(1)}60%,70%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(100%) scale(.7)}}@-moz-keyframes flowouttoright{0%{-moz-transform:translateX(0) scale(1)}60%,70%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(100%) scale(.7)}}@keyframes flowouttoright{0%{transform:translateX(0) scale(1)}60%,70%{transform:translateX(0) scale(.7)}100%{transform:translateX(100%) scale(.7)}}@-webkit-keyframes flowinfromleft{0%{-webkit-transform:translateX(-100%) scale(.7)}30%,40%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(0) scale(1)}}@-moz-keyframes flowinfromleft{0%{-moz-transform:translateX(-100%) scale(.7)}30%,40%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(0) scale(1)}}@keyframes flowinfromleft{0%{transform:translateX(-100%) scale(.7)}30%,40%{transform:translateX(0) scale(.7)}100%{transform:translateX(0) scale(1)}}@-webkit-keyframes flowinfromright{0%{-webkit-transform:translateX(100%) scale(.7)}30%,40%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(0) scale(1)}}@-moz-keyframes flowinfromright{0%{-moz-transform:translateX(100%) scale(.7)}30%,40%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(0) scale(1)}}@keyframes flowinfromright{0%{transform:translateX(100%) scale(.7)}30%,40%{transform:translateX(0) scale(.7)}100%{transform:translateX(0) scale(1)}}.ui-grid-a,.ui-grid-b,.ui-grid-c,.ui-grid-d{overflow:hidden}.ui-block-a,.ui-block-b,.ui-block-c,.ui-block-d,.ui-block-e{margin:0;padding:0;border:0;float:left;min-height:1px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui-grid-solo .ui-block-a{display:block;float:none}.ui-grid-a .ui-block-a,.ui-grid-a .ui-block-b{width:49.95%}.ui-grid-a >:nth-child(n){width:50%;margin-right:-.5px}.ui-grid-a .ui-block-a{clear:left}.ui-grid-b .ui-block-a,.ui-grid-b .ui-block-b,.ui-grid-b .ui-block-c{width:33.25%}.ui-grid-b >:nth-child(n){width:33.333%;margin-right:-.5px}.ui-grid-b .ui-block-a{clear:left}.ui-grid-c .ui-block-a,.ui-grid-c .ui-block-b,.ui-grid-c .ui-block-c,.ui-grid-c .ui-block-d{width:24.925%}.ui-grid-c >:nth-child(n){width:25%;margin-right:-.5px}.ui-grid-c .ui-block-a{clear:left}.ui-grid-d .ui-block-a,.ui-grid-d .ui-block-b,.ui-grid-d .ui-block-c,.ui-grid-d .ui-block-d,.ui-grid-d .ui-block-e{width:19.925%}.ui-grid-d >:nth-child(n){width:20%}.ui-grid-d .ui-block-a{clear:left}@media all and (max-width:35em){.ui-responsive .ui-block-a,.ui-responsive .ui-block-b,.ui-responsive .ui-block-c,.ui-responsive .ui-block-d,.ui-responsive .ui-block-e{width:100%;float:none}}.ui-header-fixed,.ui-footer-fixed{left:0;right:0;width:100%;position:fixed;z-index:1000}.ui-header-fixed{top:-1px;padding-top:1px}.ui-header-fixed.ui-fixed-hidden{top:0;padding-top:0}.ui-footer-fixed{bottom:-1px;padding-bottom:1px}.ui-footer-fixed.ui-fixed-hidden{bottom:0;padding-bottom:0}.ui-header-fullscreen,.ui-footer-fullscreen{filter:Alpha(Opacity=90);opacity:.9}.ui-page-header-fixed{padding-top:2.6875em}.ui-page-footer-fixed{padding-bottom:2.6875em}.ui-page-header-fullscreen > .ui-content,.ui-page-footer-fullscreen > .ui-content{padding:0}.ui-fixed-hidden{position:absolute}.ui-page-header-fullscreen .ui-fixed-hidden,.ui-page-footer-fullscreen .ui-fixed-hidden{left:-9999px}.ui-header-fixed .ui-btn,.ui-footer-fixed .ui-btn{z-index:10}.ui-android-2x-fixed .ui-li-has-thumb{-webkit-transform:translate3d(0,0,0)}.ui-navbar{max-width:100%}.ui-navbar.ui-mini{margin:0}.ui-navbar ul:before,.ui-navbar ul:after{content:" ";display:table}.ui-navbar ul:after{clear:both}.ui-navbar ul{list-style:none;margin:0;padding:0;position:relative;display:block;border:0;max-width:100%;overflow:visible;zoom:1}.ui-navbar li .ui-btn{display:block;text-align:center;margin:0 -1px 0 0;border-right-width:0}.ui-navbar li .ui-btn-icon-right .ui-icon{right:6px}.ui-navbar li:last-child .ui-btn,.ui-navbar .ui-grid-duo .ui-block-b .ui-btn{margin-right:0;border-right-width:1px}.ui-header .ui-navbar li:last-child .ui-btn,.ui-footer .ui-navbar li:last-child .ui-btn,.ui-header .ui-navbar .ui-grid-duo .ui-block-b .ui-btn,.ui-footer .ui-navbar .ui-grid-duo .ui-block-b .ui-btn{margin-right:-1px;border-right-width:0}.ui-navbar .ui-grid-duo li.ui-block-a:last-child .ui-btn{margin-right:-1px;border-right-width:1px}.ui-header .ui-navbar li .ui-btn,.ui-footer .ui-navbar li .ui-btn{border-top-width:0;border-bottom-width:0}.ui-header .ui-navbar .ui-grid-b li.ui-block-c .ui-btn,.ui-footer .ui-navbar .ui-grid-b li.ui-block-c .ui-btn{margin-right:-5px}.ui-header .ui-navbar .ui-grid-c li.ui-block-d .ui-btn,.ui-footer .ui-navbar .ui-grid-c li.ui-block-d .ui-btn,.ui-header .ui-navbar .ui-grid-d li.ui-block-e .ui-btn,.ui-footer .ui-navbar .ui-grid-d li.ui-block-e .ui-btn{margin-right:-4px}.ui-header .ui-navbar .ui-grid-b li.ui-block-c .ui-btn-icon-right .ui-icon,.ui-footer .ui-navbar .ui-grid-b li.ui-block-c .ui-btn-icon-right .ui-icon,.ui-header .ui-navbar .ui-grid-c li.ui-block-d .ui-btn-icon-right .ui-icon,.ui-footer .ui-navbar .ui-grid-c li.ui-block-d .ui-btn-icon-right .ui-icon,.ui-header .ui-navbar .ui-grid-d li.ui-block-e .ui-btn-icon-right .ui-icon,.ui-footer .ui-navbar .ui-grid-d li.ui-block-e .ui-btn-icon-right .ui-icon{right:8px}.ui-navbar li .ui-btn .ui-btn-inner{padding-top:.7em;padding-bottom:.8em}.ui-navbar li .ui-btn-icon-top .ui-btn-inner{padding-top:30px}.ui-navbar li .ui-btn-icon-bottom .ui-btn-inner{padding-bottom:30px}.ui-btn{display:block;text-align:center;cursor:pointer;position:relative;margin:.5em 0;padding:0}.ui-mini{margin-top:.25em;margin-bottom:.25em}.ui-btn-left,.ui-btn-right,.ui-input-clear,.ui-btn-inline,.ui-grid-a .ui-btn,.ui-grid-b .ui-btn,.ui-grid-c .ui-btn,.ui-grid-d .ui-btn,.ui-grid-e .ui-btn,.ui-grid-solo .ui-btn{margin-right:5px;margin-left:5px}.ui-btn-inner{font-size:16px;padding:.6em 20px;min-width:.75em;display:block;position:relative;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;zoom:1}.ui-btn input,.ui-btn button{z-index:2}.ui-btn-left,.ui-btn-right,.ui-btn-inline{display:inline-block;vertical-align:middle}.ui-mobile .ui-btn-left,.ui-mobile .ui-btn-right,.ui-btn-left > .ui-btn,.ui-btn-right > .ui-btn{margin:0}.ui-btn-block{display:block}.ui-header > .ui-btn,.ui-footer > .ui-btn{display:inline-block;margin:0}.ui-header .ui-btn-block,.ui-footer .ui-btn-block{display:block}.ui-header .ui-btn-inner,.ui-footer .ui-btn-inner,.ui-mini .ui-btn-inner{font-size:12.5px;padding:.55em 11px .5em}.ui-fullsize .ui-btn-inner,.ui-fullsize .ui-btn-inner{font-size:16px;padding:.6em 20px}.ui-btn-icon-notext{width:24px;height:24px}.ui-btn-icon-notext .ui-btn-inner{padding:0;height:100%}.ui-btn-icon-notext .ui-btn-inner .ui-icon{margin:2px 1px 2px 3px;float:left}.ui-btn-text{position:relative;z-index:1;width:100%;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}div.ui-btn-text{width:auto}.ui-btn-icon-notext .ui-btn-text{position:absolute;left:-9999px}.ui-btn-icon-left .ui-btn-inner{padding-left:40px}.ui-btn-icon-right .ui-btn-inner{padding-right:40px}.ui-btn-icon-top .ui-btn-inner{padding-top:40px}.ui-btn-icon-bottom .ui-btn-inner{padding-bottom:40px}.ui-header .ui-btn-icon-left .ui-btn-inner,.ui-footer .ui-btn-icon-left .ui-btn-inner,.ui-mini.ui-btn-icon-left .ui-btn-inner,.ui-mini .ui-btn-icon-left .ui-btn-inner{padding-left:30px}.ui-header .ui-btn-icon-right .ui-btn-inner,.ui-footer .ui-btn-icon-right .ui-btn-inner,.ui-mini.ui-btn-icon-right .ui-btn-inner,.ui-mini .ui-btn-icon-right .ui-btn-inner{padding-right:30px}.ui-header .ui-btn-icon-top .ui-btn-inner,.ui-footer .ui-btn-icon-top .ui-btn-inner{padding:30px 3px .5em 3px}.ui-mini.ui-btn-icon-top .ui-btn-inner,.ui-mini .ui-btn-icon-top .ui-btn-inner{padding-top:30px}.ui-header .ui-btn-icon-bottom .ui-btn-inner,.ui-footer .ui-btn-icon-bottom .ui-btn-inner{padding:.55em 3px 30px 3px}.ui-mini.ui-btn-icon-bottom .ui-btn-inner,.ui-mini .ui-btn-icon-bottom .ui-btn-inner{padding-bottom:30px}.ui-btn-inner,.ui-btn-text{-webkit-border-radius:inherit;border-radius:inherit}.ui-btn-icon-notext .ui-icon{display:block;z-index:0}.ui-btn-icon-left > .ui-btn-inner > .ui-icon,.ui-btn-icon-right > .ui-btn-inner > .ui-icon{position:absolute;top:50%;margin-top:-9px}.ui-btn-icon-top .ui-btn-inner .ui-icon,.ui-btn-icon-bottom .ui-btn-inner .ui-icon{position:absolute;left:50%;margin-left:-9px}.ui-btn-icon-left .ui-icon{left:10px}.ui-btn-icon-right .ui-icon{right:10px}.ui-btn-icon-top .ui-icon{top:10px}.ui-btn-icon-bottom .ui-icon{top:auto;bottom:10px}.ui-header .ui-btn-icon-left .ui-icon,.ui-footer .ui-btn-icon-left .ui-icon,.ui-mini.ui-btn-icon-left .ui-icon,.ui-mini .ui-btn-icon-left .ui-icon{left:5px}.ui-header .ui-btn-icon-right .ui-icon,.ui-footer .ui-btn-icon-right .ui-icon,.ui-mini.ui-btn-icon-right .ui-icon,.ui-mini .ui-btn-icon-right .ui-icon{right:5px}.ui-header .ui-btn-icon-top .ui-icon,.ui-footer .ui-btn-icon-top .ui-icon,.ui-mini.ui-btn-icon-top .ui-icon,.ui-mini .ui-btn-icon-top .ui-icon{top:5px}.ui-header .ui-btn-icon-bottom .ui-icon,.ui-footer .ui-btn-icon-bottom .ui-icon,.ui-mini.ui-btn-icon-bottom .ui-icon,.ui-mini .ui-btn-icon-bottom .ui-icon{bottom:5px}.ui-btn-hidden{position:absolute;top:0;left:0;width:100%;height:100%;-webkit-appearance:none;cursor:pointer;background:#fff;background:rgba(255,255,255,0);filter:Alpha(Opacity=0);opacity:.1;font-size:1px;border:none;text-indent:-9999px}.ui-disabled .ui-btn-hidden{display:none}.ui-disabled{z-index:1}.ui-field-contain .ui-btn.ui-submit{margin:0}label.ui-submit{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em;display:block}@media all and (min-width:28em){.ui-field-contain label.ui-submit{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain .ui-btn.ui-submit{width:78%;display:inline-block;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui-hide-label .ui-btn.ui-submit{width:auto;display:block}}.ui-collapsible-inset{margin:.5em 0}.ui-collapsible-heading{font-size:16px;display:block;margin:0 -15px;padding:0;position:relative}.ui-collapsible-inset .ui-collapsible-heading{margin:0}.ui-collapsible-heading .ui-btn{text-align:left;margin:0;border-left-width:0;border-right-width:0}.ui-collapsible-inset .ui-collapsible-heading .ui-btn{border-right-width:1px;border-left-width:1px}.ui-collapsible-collapsed + .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn{border-top-width:0}.ui-collapsible-set .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn{border-top-width:1px}.ui-collapsible-heading .ui-btn-inner{padding-left:12px;padding-right:12px}.ui-collapsible-heading .ui-btn-icon-left .ui-btn-inner{padding-left:40px}.ui-collapsible-heading .ui-btn-icon-right .ui-btn-inner{padding-right:40px}.ui-collapsible-heading .ui-btn-icon-top .ui-btn-inner,.ui-collapsible-heading .ui-btn-icon-bottom .ui-btn-inner{text-align:center}.ui-collapsible-heading .ui-btn-icon-left.ui-mini .ui-btn-inner{padding-left:30px}.ui-collapsible-heading .ui-btn-icon-right.ui-mini .ui-btn-inner{padding-right:30px}.ui-collapsible-heading .ui-btn span.ui-btn{position:absolute;left:6px;top:50%;margin:-12px 0 0 0;width:20px;height:20px;padding:1px 0 1px 2px;text-indent:-9999px}.ui-collapsible-heading .ui-btn span.ui-btn .ui-btn-inner{padding:10px 0}.ui-collapsible-heading .ui-btn span.ui-btn .ui-icon{left:0;margin-top:-10px}.ui-collapsible-heading-status{position:absolute;top:-9999px;left:0}.ui-collapsible-content{display:block;margin:0 -15px;padding:10px 15px;border-left-width:0;border-right-width:0;border-top:none;background-image:none}.ui-collapsible-inset .ui-collapsible-content{margin:0;border-right-width:1px;border-left-width:1px}.ui-collapsible-content-collapsed{display:none}.ui-collapsible-set > .ui-collapsible.ui-corner-all{-webkit-border-radius:0;border-radius:0}.ui-collapsible-heading,.ui-collapsible-heading > .ui-btn{-webkit-border-radius:inherit;border-radius:inherit}.ui-collapsible-set .ui-collapsible.ui-first-child{-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit}.ui-collapsible-content,.ui-collapsible-set .ui-collapsible.ui-last-child{-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit}.ui-collapsible-themed-content:not(.ui-collapsible-collapsed) > .ui-collapsible-heading{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0}.ui-collapsible-set{margin:.5em 0}.ui-collapsible-set .ui-collapsible{margin:-1px 0 0}.ui-collapsible-set .ui-collapsible.ui-first-child{margin-top:0}.ui-controlgroup,fieldset.ui-controlgroup{padding:0;margin:.5em 0;zoom:1}.ui-controlgroup.ui-mini,fieldset.ui-controlgroup.ui-mini{margin:.25em 0}.ui-field-contain .ui-controlgroup,.ui-field-contain fieldset.ui-controlgroup{margin:0}.ui-bar .ui-controlgroup{margin:0 5px}.ui-controlgroup-label{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .4em}.ui-controlgroup-controls label.ui-select,.ui-controlgroup-controls label.ui-submit{position:absolute;left:-9999px}.ui-controlgroup li{list-style:none}.ui-controlgroup .ui-btn{margin:0}.ui-controlgroup .ui-btn-icon-notext{width:auto;height:auto;top:auto}.ui-controlgroup .ui-btn-icon-notext .ui-btn-inner{height:20px;padding:.6em 20px .6em 20px}.ui-controlgroup-horizontal .ui-btn-icon-notext .ui-btn-inner{width:18px}.ui-controlgroup.ui-mini .ui-btn-icon-notext .ui-btn-inner,.ui-header .ui-controlgroup .ui-btn-icon-notext .ui-btn-inner,.ui-footer .ui-controlgroup .ui-btn-icon-notext .ui-btn-inner{height:16px;padding:.55em 11px .5em 11px}.ui-controlgroup .ui-btn-icon-notext .ui-btn-inner .ui-icon{position:absolute;top:50%;right:50%;margin:-9px -9px 0 0}.ui-controlgroup-horizontal .ui-btn-inner{text-align:center}.ui-controlgroup-horizontal.ui-mini .ui-btn-inner{height:16px;line-height:16px}.ui-controlgroup .ui-checkbox label,.ui-controlgroup .ui-radio label{font-size:16px}.ui-controlgroup-horizontal .ui-controlgroup-controls:before,.ui-controlgroup-horizontal .ui-controlgroup-controls:after{content:"";display:table}.ui-controlgroup-horizontal .ui-controlgroup-controls:after{clear:both}.ui-controlgroup-horizontal .ui-controlgroup-controls{display:inline-block;vertical-align:middle;zoom:1}.ui-controlgroup-horizontal .ui-controlgroup-controls > .ui-btn,.ui-controlgroup-horizontal .ui-controlgroup-controls li > .ui-btn,.ui-controlgroup-horizontal .ui-checkbox,.ui-controlgroup-horizontal .ui-radio,.ui-controlgroup-horizontal .ui-select{float:left;clear:none;margin:0}.ui-controlgroup-horizontal .ui-select .ui-btn-text{width:auto}.ui-controlgroup-vertical .ui-btn{border-bottom-width:0}.ui-controlgroup-vertical .ui-btn.ui-last-child{border-bottom-width:1px}.ui-controlgroup-horizontal .ui-btn{border-right-width:0}.ui-controlgroup-horizontal .ui-btn.ui-last-child{border-right-width:1px}.ui-controlgroup .ui-btn-corner-all{-webkit-border-radius:0;border-radius:0}.ui-controlgroup .ui-controlgroup-controls,.ui-controlgroup .ui-radio,.ui-controlgroup .ui-checkbox,.ui-controlgroup .ui-select,.ui-controlgroup li{-webkit-border-radius:inherit;border-radius:inherit}.ui-controlgroup-vertical .ui-btn.ui-first-child{-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit}.ui-controlgroup-vertical .ui-btn.ui-last-child{-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit}.ui-controlgroup-horizontal .ui-btn.ui-first-child{-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit}.ui-controlgroup-horizontal .ui-btn.ui-last-child{-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit}.ui-controlgroup .ui-shadow:not(.ui-focus){-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none}@media all and (min-width:28em){.ui-field-contain .ui-controlgroup-label{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain .ui-controlgroup-controls{width:78%;display:inline-block}.ui-field-contain .ui-controlgroup .ui-select{width:100%;display:block}.ui-field-contain .ui-controlgroup-horizontal .ui-select{width:auto}.ui-hide-label .ui-controlgroup-controls{width:100%}}.ui-dialog{background:none!important}.ui-dialog-contain{width:92.5%;max-width:500px;margin:10% auto 15px auto;padding:0;position:relative;top:-15px}.ui-dialog-contain > .ui-header,.ui-dialog-contain > .ui-content,.ui-dialog-contain > .ui-footer{display:block;position:relative;width:auto;margin:0}.ui-dialog-contain > .ui-header{border:none;overflow:hidden;z-index:10;padding:0}.ui-dialog-contain > .ui-content{padding:15px}.ui-dialog-contain > .ui-footer{z-index:10;padding:0 15px}.ui-popup-open .ui-header-fixed,.ui-popup-open .ui-footer-fixed{position:absolute!important}.ui-popup-screen{background-image:url(data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==);top:0;left:0;right:0;bottom:1px;position:absolute;filter:Alpha(Opacity=0);opacity:0;z-index:1099}.ui-popup-screen.in{opacity:0.5;filter:Alpha(Opacity=50)}.ui-popup-screen.out{opacity:0;filter:Alpha(Opacity=0)}.ui-popup-container{z-index:1100;display:inline-block;position:absolute;padding:0;outline:0}.ui-popup{position:relative}.ui-popup.ui-content,.ui-popup .ui-content{overflow:visible}.ui-popup > p,.ui-popup > h1,.ui-popup > h2,.ui-popup > h3,.ui-popup > h4,.ui-popup > h5,.ui-popup > h6{margin:.5em 7px}.ui-popup > span{display:block;margin:.5em 7px}.ui-popup .ui-title{font-size:16px;font-weight:bold;margin-top:.5em;margin-bottom:.5em}.ui-popup-container .ui-content > p,.ui-popup-container .ui-content > h1,.ui-popup-container .ui-content > h2,.ui-popup-container .ui-content > h3,.ui-popup-container .ui-content > h4,.ui-popup-container .ui-content > h5,.ui-popup-container .ui-content > h6{margin:.5em 0}.ui-popup-container .ui-content > span{margin:0}.ui-popup-container .ui-content > p:first-child,.ui-popup-container .ui-content > h1:first-child,.ui-popup-container .ui-content > h2:first-child,.ui-popup-container .ui-content > h3:first-child,.ui-popup-container .ui-content > h4:first-child,.ui-popup-container .ui-content > h5:first-child,.ui-popup-container .ui-content > h6:first-child{margin-top:0}.ui-popup-container .ui-content > p:last-child,.ui-popup-container .ui-content > h1:last-child,.ui-popup-container .ui-content > h2:last-child,.ui-popup-container .ui-content > h3:last-child,.ui-popup-container .ui-content > h4:last-child,.ui-popup-container .ui-content > h5:last-child,.ui-popup-container .ui-content > h6:last-child{margin-bottom:0}.ui-popup > img{width:auto;height:auto;max-width:100%;max-height:100%;vertical-align:middle}.ui-popup:not(.ui-content) > img:only-child,.ui-popup:not(.ui-content) > .ui-btn-left:first-child + img:last-child,.ui-popup:not(.ui-content) > .ui-btn-right:first-child + img:last-child{-webkit-border-radius:inherit;border-radius:inherit}.ui-popup iframe{vertical-align:middle}@media all and (min-width:28em){.ui-popup .ui-field-contain label.ui-submit,.ui-popup .ui-field-contain .ui-controlgroup-label,.ui-popup .ui-field-contain label.ui-select,.ui-popup .ui-field-contain label.ui-input-text{font-size:16px;line-height:1.4;display:block;font-weight:normal;margin:0 0 .3em}.ui-popup .ui-field-contain .ui-btn.ui-submit,.ui-popup .ui-field-contain .ui-controlgroup-controls,.ui-popup .ui-field-contain .ui-select,.ui-popup .ui-field-contain input.ui-input-text,.ui-popup .ui-field-contain textarea.ui-input-text,.ui-popup .ui-field-contain .ui-input-search{width:100%;display:block}}.ui-popup > .ui-btn-left,.ui-popup > .ui-btn-right{position:absolute;top:-9px;margin:0;z-index:1101}.ui-popup > .ui-btn-left{left:-9px}.ui-popup > .ui-btn-right{right:-9px}.ui-popup-hidden{top:-99999px;left:-9999px}.ui-checkbox,.ui-radio{position:relative;clear:both;margin:0;z-index:1}.ui-checkbox .ui-btn,.ui-radio .ui-btn{text-align:left;z-index:2}.ui-controlgroup .ui-checkbox .ui-btn,.ui-controlgroup .ui-radio .ui-btn{margin:0}.ui-checkbox .ui-btn-inner,.ui-radio .ui-btn-inner{white-space:normal}.ui-checkbox .ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-btn-icon-left .ui-btn-inner{padding-left:45px}.ui-checkbox .ui-mini.ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-mini.ui-btn-icon-left .ui-btn-inner{padding-left:36px}.ui-checkbox .ui-btn-icon-right .ui-btn-inner,.ui-radio .ui-btn-icon-right .ui-btn-inner{padding-right:45px}.ui-checkbox .ui-mini.ui-btn-icon-right .ui-btn-inner,.ui-radio .ui-mini.ui-btn-icon-right .ui-btn-inner{padding-right:36px}.ui-checkbox .ui-btn-icon-top .ui-btn-inner,.ui-radio .ui-btn-icon-top .ui-btn-inner{padding-right:0;padding-left:0;text-align:center}.ui-checkbox .ui-btn-icon-bottom .ui-btn-inner,.ui-radio .ui-btn-icon-bottom .ui-btn-inner{padding-right:0;padding-left:0;text-align:center}.ui-checkbox .ui-icon,.ui-radio .ui-icon{top:1.1em}.ui-checkbox .ui-btn-icon-left .ui-icon,.ui-radio .ui-btn-icon-left .ui-icon{left:15px}.ui-checkbox .ui-mini.ui-btn-icon-left .ui-icon,.ui-radio .ui-mini.ui-btn-icon-left .ui-icon{left:9px}.ui-checkbox .ui-btn-icon-right .ui-icon,.ui-radio .ui-btn-icon-right .ui-icon{right:15px}.ui-checkbox .ui-mini.ui-btn-icon-right .ui-icon,.ui-radio .ui-mini.ui-btn-icon-right .ui-icon{right:9px}.ui-checkbox .ui-btn-icon-top .ui-icon,.ui-radio .ui-btn-icon-top .ui-icon{top:10px}.ui-checkbox .ui-btn-icon-bottom .ui-icon,.ui-radio .ui-btn-icon-bottom .ui-icon{top:auto;bottom:10px}.ui-checkbox .ui-btn-icon-right .ui-icon,.ui-radio .ui-btn-icon-right .ui-icon{right:15px}.ui-checkbox .ui-mini.ui-btn-icon-right .ui-icon,.ui-radio .ui-mini.ui-btn-icon-right .ui-icon{right:9px}.ui-controlgroup-horizontal .ui-checkbox .ui-icon,.ui-controlgroup-horizontal .ui-radio .ui-icon{display:none}.ui-controlgroup-horizontal .ui-checkbox .ui-btn-inner,.ui-controlgroup-horizontal .ui-radio .ui-btn-inner{padding:.6em 20px}.ui-controlgroup-horizontal .ui-checkbox .ui-mini .ui-btn-inner,.ui-controlgroup-horizontal .ui-radio .ui-mini .ui-btn-inner{padding:.55em 11px .5em}.ui-checkbox input,.ui-radio input{position:absolute;left:20px;top:50%;width:10px;height:10px;margin:-5px 0 0 0;outline:0!important;z-index:1}.ui-field-contain,fieldset.ui-field-contain{padding:.8em 0;margin:0;border-width:0 0 1px 0;overflow:visible}.ui-field-contain:last-child{border-bottom-width:0}.ui-field-contain{max-width:100%}@media all and (min-width:28em){.ui-field-contain,.ui-mobile fieldset.ui-field-contain{border-width:0;padding:0;margin:1em 0}}.ui-select{display:block;position:relative}.ui-select select{position:absolute;left:-9999px;top:-9999px}.ui-select .ui-btn{opacity:1}.ui-field-contain .ui-select .ui-btn{margin:0}.ui-select .ui-btn select{cursor:pointer;-webkit-appearance:none;left:0;top:0;width:100%;min-height:1.5em;min-height:100%;height:3em;max-height:100%;filter:Alpha(Opacity=0);opacity:0;z-index:2}.ui-select .ui-disabled{opacity:.3}.ui-select .ui-disabled select{display:none}@-moz-document url-prefix(){.ui-select .ui-btn select{opacity:0.0001}}.ui-select .ui-btn.ui-select-nativeonly{border-radius:0;border:0}.ui-select .ui-btn.ui-select-nativeonly select{opacity:1;text-indent:0;display:block}.ui-select .ui-disabled.ui-select-nativeonly .ui-btn-inner{opacity:0}.ui-select .ui-btn-icon-right .ui-btn-inner,.ui-select .ui-li-has-count .ui-btn-inner{padding-right:45px}.ui-select .ui-mini.ui-btn-icon-right .ui-btn-inner{padding-right:32px}.ui-select .ui-btn-icon-right.ui-li-has-count .ui-btn-inner{padding-right:80px}.ui-select .ui-mini.ui-btn-icon-right.ui-li-has-count .ui-btn-inner{padding-right:67px}.ui-select .ui-btn-icon-right .ui-icon{right:15px}.ui-select .ui-mini.ui-btn-icon-right .ui-icon{right:7px}.ui-select .ui-btn-icon-right.ui-li-has-count .ui-li-count{right:45px}.ui-select .ui-mini.ui-btn-icon-right.ui-li-has-count .ui-li-count{right:32px}label.ui-select{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em;display:block}.ui-select .ui-btn-text,.ui-selectmenu .ui-btn-text{display:block;min-height:1em;overflow:hidden!important}.ui-select .ui-btn-text{text-overflow:ellipsis}.ui-selectmenu{padding:6px;min-width:160px}.ui-selectmenu .ui-listview{margin:0}.ui-selectmenu .ui-btn.ui-li-divider{cursor:default}.ui-screen-hidden,.ui-selectmenu-list .ui-li .ui-icon{display:none}.ui-selectmenu-list .ui-li .ui-icon{display:block}.ui-li.ui-selectmenu-placeholder{display:none}.ui-selectmenu .ui-header{margin:0;padding:0}.ui-selectmenu.ui-popup .ui-header{-webkit-border-top-left-radius:0;border-top-left-radius:0;-webkit-border-top-right-radius:0;border-top-right-radius:0}.ui-selectmenu .ui-header .ui-title{margin:0.6em 46px 0.8em}@media all and (min-width:28em){.ui-field-contain label.ui-select{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain .ui-select{width:78%;display:inline-block}.ui-hide-label .ui-select{width:100%}}.ui-selectmenu .ui-header h1:after{content:'.';visibility:hidden}label.ui-input-text{font-size:16px;line-height:1.4;display:block;font-weight:normal;margin:0 0 .3em}input.ui-input-text,textarea.ui-input-text{background-image:none;padding:.4em;margin:.5em 0;min-height:1.4em;line-height:1.4em;font-size:16px;display:block;width:100%;outline:0}input.ui-mini,.ui-mini input,textarea.ui-mini{font-size:14px}div.ui-input-text input.ui-input-text,div.ui-input-text textarea.ui-input-text,.ui-input-search input.ui-input-text{border:none;width:100%;padding:.4em 0;margin:0;display:block;background:transparent none;outline:0!important}.ui-input-search,div.ui-input-text{margin:.5em 0;background-image:none;position:relative}.ui-input-search{padding:0 30px}div.ui-input-text{padding:0 .4em}div.ui-input-has-clear{padding:0 30px 0 .4em}input.ui-input-text.ui-mini,textarea.ui-input-text.ui-mini,.ui-input-search.ui-mini,div.ui-input-text.ui-mini{margin:.25em 0}.ui-field-contain input.ui-input-text,.ui-field-contain textarea.ui-input-text,.ui-field-contain .ui-input-search,.ui-field-contain div.ui-input-text{margin:0}textarea.ui-input-text{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}input.ui-input-text{-webkit-appearance:none}textarea.ui-input-text{height:50px;-webkit-transition:height 200ms linear;-moz-transition:height 200ms linear;-o-transition:height 200ms linear;transition:height 200ms linear}textarea.ui-mini{height:45px}.ui-icon-searchfield:after{position:absolute;left:7px;top:50%;margin-top:-9px;content:"";width:18px;height:18px;opacity:.5}.ui-input-search .ui-input-clear,.ui-input-text .ui-input-clear{position:absolute;right:0;top:50%;margin-top:-13px}.ui-mini .ui-input-clear{margin-top:-14px;right:-3px}.ui-input-search .ui-input-clear-hidden,.ui-input-text .ui-input-clear-hidden{display:none}input::-moz-placeholder,textarea::-moz-placeholder{color:#aaa}input[type=number]::-webkit-outer-spin-button{margin:0}@media all and (min-width:28em){.ui-field-contain label.ui-input-text{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain input.ui-input-text,.ui-field-contain textarea.ui-input-text,.ui-field-contain .ui-input-search,.ui-field-contain div.ui-input-text{width:78%;display:inline-block}.ui-field-contain .ui-input-search,.ui-field-contain div.ui-input-text{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui-hide-label input.ui-input-text,.ui-hide-label textarea.ui-input-text,.ui-hide-label .ui-input-search,.ui-hide-label div.ui-input-text,.ui-input-search input.ui-input-text,div.ui-input-text input.ui-input-text{width:100%}}.ui-rangeslider{zoom:1;margin:0}.ui-rangeslider:before,.ui-rangeslider:after{content:"";display:table}.ui-rangeslider:after{clear:both}.ui-rangeslider input.ui-input-text.ui-slider-input{margin:.57143em 0}.ui-rangeslider.ui-mini input.ui-slider-input{margin:.28571em 0}.ui-rangeslider input.ui-slider-input.ui-rangeslider-last{float:right}.ui-rangeslider .ui-rangeslider-sliders{position:relative;overflow:visible;height:30px;margin:.5em 68px}.ui-rangeslider.ui-mini .ui-rangeslider-sliders{margin:.25em 68px}.ui-field-contain .ui-rangeslider input.ui-slider-input,.ui-field-contain .ui-rangeslider.ui-mini input.ui-slider-input,.ui-field-contain .ui-rangeslider .ui-rangeslider-sliders,.ui-field-contain .ui-rangeslider.ui-mini .ui-rangeslider-sliders{margin-top:0;margin-bottom:0}.ui-rangeslider .ui-rangeslider-sliders .ui-slider-track{position:absolute;top:6px;right:0;left:0;margin:0}.ui-rangeslider.ui-mini .ui-rangeslider-sliders .ui-slider-track{top:8px}.ui-rangeslider .ui-slider-track:first-child .ui-slider-bg{display:none}.ui-rangeslider .ui-rangeslider-sliders .ui-slider-track:first-child{background-color:transparent;background:none;border-width:0;height:0}html >body .ui-rangeslider.ui-mini .ui-rangeslider-sliders .ui-slider-track:first-child{height:12px}@media all and (min-width:28em){.ui-field-contain .ui-rangeslider label.ui-slider{float:left}.ui-field-contain .ui-rangeslider input.ui-slider-input{position:relative;z-index:1}.ui-field-contain .ui-rangeslider input.ui-slider-input.ui-rangeslider-first,.ui-field-contain .ui-rangeslider.ui-mini input.ui-slider-input.ui-rangeslider-first{margin-right:17px}.ui-field-contain .ui-rangeslider .ui-rangeslider-sliders,.ui-field-contain .ui-rangeslider.ui-mini .ui-rangeslider-sliders{float:left;width:78%;margin:0 -68px}.ui-field-contain .ui-rangeslider .ui-slider-track,.ui-field-contain .ui-rangeslider.ui-mini .ui-slider-track{right:68px;left:68px}.ui-field-contain.ui-hide-label .ui-rangeslider input.ui-slider-input.ui-rangeslider-first{margin:0}.ui-field-contain.ui-hide-label .ui-rangeslider .ui-rangeslider-sliders,.ui-field-contain.ui-hide-label .ui-rangeslider.ui-mini .ui-rangeslider-sliders{width:auto;float:none;margin:0 68px}.ui-field-contain.ui-hide-label .ui-rangeslider .ui-slider-track,.ui-field-contain.ui-hide-label .ui-rangeslider.ui-mini .ui-slider-track{right:0;left:0}}.ui-listview{margin:0}ol.ui-listview,ol.ui-listview .ui-li-divider{counter-reset:listnumbering}.ui-content .ui-listview,.ui-panel-inner > .ui-listview{margin:-15px}.ui-collapsible-content > .ui-listview{margin:-10px -15px}.ui-content .ui-listview-inset,.ui-panel-inner .ui-listview-inset{margin:1em 0}.ui-collapsible-content .ui-listview-inset{margin:.5em 0}.ui-listview,.ui-li{list-style:none;padding:0}.ui-li,.ui-li.ui-field-contain{display:block;margin:0;position:relative;overflow:visible;text-align:left;border-width:0;border-top-width:1px}.ui-li.ui-btn,.ui-li.ui-field-contain,.ui-li-divider,.ui-li-static{margin:0}.ui-listview-inset .ui-li{border-right-width:1px;border-left-width:1px}.ui-li.ui-last-child,.ui-li.ui-field-contain.ui-last-child{border-bottom-width:1px}.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) > .ui-li.ui-first-child{border-top-width:0}.ui-collapsible-themed-content .ui-listview:not(.ui-listview-inset) > .ui-li.ui-last-child{border-bottom-width:0}.ui-li .ui-btn-text a.ui-link-inherit{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-static{background-image:none}.ui-li-divider{padding:.5em 15px;font-size:14px;font-weight:bold}ol.ui-listview .ui-link-inherit:before,ol.ui-listview .ui-li-static:before,.ui-li-dec{font-size:.8em;display:inline-block;padding-right:.3em;font-weight:normal;counter-increment:listnumbering;content:counter(listnumbering) ". "}ol.ui-listview .ui-li-jsnumbering:before{content:""!important}.ui-listview > .ui-li.ui-first-child,.ui-listview .ui-btn.ui-first-child > .ui-li > .ui-btn-text > .ui-link-inherit{-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit}.ui-listview > .ui-li.ui-last-child,.ui-listview .ui-btn.ui-last-child > .ui-li > .ui-btn-text > .ui-link-inherit,.ui-collapsible-content > .ui-listview:not(.ui-listview-inset),.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) .ui-li.ui-last-child{-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit}.ui-listview > .ui-li.ui-first-child .ui-li-link-alt{-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit}.ui-listview > .ui-li.ui-last-child .ui-li-link-alt{-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit}.ui-listview > .ui-li.ui-first-child .ui-li-thumb:not(.ui-li-icon){-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit}.ui-listview > .ui-li.ui-last-child .ui-li-thumb:not(.ui-li-icon){-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit}.ui-li>.ui-btn-inner{display:block;position:relative;padding:0}.ui-li .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li{padding:.7em 15px;display:block}.ui-li-has-thumb .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-thumb{min-height:59px;padding-left:100px}.ui-li-has-icon .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-icon{min-height:20px;padding-left:40px}.ui-li-has-count .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-count,.ui-li-divider.ui-li-has-count{padding-right:45px}.ui-li-has-arrow .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-arrow{padding-right:40px}.ui-li-has-arrow.ui-li-has-count .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-arrow.ui-li-has-count{padding-right:75px}.ui-li-heading{font-size:16px;font-weight:bold;display:block;margin:.6em 0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-desc{font-size:12px;font-weight:normal;display:block;margin:-.5em 0 .6em;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-thumb,.ui-listview .ui-li-icon{position:absolute;left:1px;top:0;max-height:80px;max-width:80px}.ui-listview .ui-li-icon{max-height:16px;max-width:16px;left:10px;top:.9em}.ui-li-thumb,.ui-listview .ui-li-icon,.ui-li-content{float:left;margin-right:10px}.ui-li-aside{float:right;width:50%;text-align:right;margin:.3em 0}@media all and (min-width:480px){.ui-li-aside{width:45%}}.ui-li-divider{cursor:default}.ui-li-has-alt .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-alt{padding-right:53px}.ui-li-has-alt.ui-li-has-count .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-alt.ui-li-has-count{padding-right:88px}.ui-li-has-count .ui-li-count{position:absolute;font-size:11px;font-weight:bold;padding:.2em .5em;top:50%;margin-top:-.9em;right:10px}.ui-li-has-count.ui-li-divider .ui-li-count,.ui-li-has-count .ui-link-inherit .ui-li-count{margin-top:-.95em}.ui-li-has-arrow.ui-li-has-count .ui-li-count{right:40px}.ui-li-has-alt.ui-li-has-count .ui-li-count{right:53px}.ui-li-link-alt{position:absolute;width:40px;height:100%;border-width:0;border-left-width:1px;top:0;right:0;margin:0;padding:0;z-index:2}.ui-li-link-alt .ui-btn{overflow:hidden;position:absolute;right:8px;top:50%;margin:-13px 0 0 0;border-bottom-width:1px;z-index:-1}.ui-li-link-alt .ui-btn-inner{padding:0;height:100%;position:absolute;width:100%;top:0;left:0}.ui-li-link-alt .ui-btn .ui-icon{right:50%;margin-right:-9px}.ui-li-link-alt .ui-btn-icon-notext .ui-btn-inner .ui-icon{position:absolute;top:50%;margin-top:-9px}.ui-listview * .ui-btn-inner > .ui-btn > .ui-btn-inner{border-top:0}.ui-listview-filter{border-width:0;overflow:hidden;margin:-15px -15px 15px -15px}.ui-collapsible-content .ui-listview-filter{margin:-10px -15px 10px -15px;border-bottom:inherit}.ui-listview-filter-inset{margin:-15px -5px;background:transparent}.ui-collapsible-content .ui-listview-filter-inset{margin:-5px;border-bottom-width:0}.ui-listview-filter .ui-input-search{margin:5px;width:auto;display:block}.ui-li.ui-screen-hidden{display:none}@media only screen and (min-device-width:768px) and (max-device-width:1024px){.ui-li .ui-btn-text{overflow:visible}}label.ui-slider{font-size:16px;line-height:1.4;font-weight:normal;margin:0;display:block}.ui-field-contain label.ui-slider{margin-bottom:.4em}div.ui-slider{height:30px;margin:.5em 0;zoom:1}div.ui-slider.ui-mini{margin:.25em 0}.ui-field-contain div.ui-slider,.ui-field-contain div.ui-slider.ui-mini{margin:0}div.ui-slider:before,div.ui-slider:after{content:"";display:table}div.ui-slider:after{clear:both}input.ui-input-text.ui-slider-input{display:block;float:left;margin:0;padding:4px;width:40px;height:22px;line-height:22px;font-size:14px;border:none;background-image:none;font-weight:bold;text-align:center;vertical-align:text-bottom;outline:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;-ms-box-sizing:content-box;box-sizing:content-box}.ui-slider-input::-webkit-outer-spin-button,.ui-slider-input::-webkit-inner-spin-button{-webkit-appearance:none;margin:0}.ui-slider-track,.ui-slider-switch{position:relative;overflow:visible;height:15px;margin:0 15px 0 68px;top:6px}.ui-slider-track.ui-mini{height:12px;top:8px}.ui-slider-bg{border:none;height:100%}.ui-slider-track .ui-btn.ui-slider-handle,.ui-slider-switch .ui-btn.ui-slider-handle{position:absolute;z-index:1;top:50%;width:28px;height:28px;margin:-15px 0 0 -15px;outline:0}.ui-slider-track.ui-mini .ui-slider-handle{height:14px;width:14px;margin:-8px 0 0 -7px}.ui-slider-handle .ui-btn-inner{padding:0;height:100%}.ui-slider-track.ui-mini .ui-slider-handle .ui-btn-inner{height:30px;width:30px;padding:0;margin:-9px 0 0 -9px;border-top:none}select.ui-slider-switch{display:none}div.ui-slider-switch{display:inline-block;height:32px;width:5.8em;margin:.5em 0;top:0}div.ui-slider-switch.ui-mini{width:5em;height:29px;margin:.25em 0;top:0}.ui-field-contain .ui-slider-switch,.ui-field-contain .ui-slider-switch.ui-mini{margin:0}.ui-slider-inneroffset{margin:0 16px;position:relative;z-index:1}.ui-slider-switch.ui-mini .ui-slider-inneroffset{margin:0 15px 0 14px}.ui-slider-switch .ui-btn.ui-slider-handle{margin:1px 0 0 -15px}.ui-slider-switch.ui-mini .ui-slider-handle{width:25px;height:25px;margin:1px 0 0 -13px;padding:0}.ui-slider-handle-snapping{-webkit-transition:left 70ms linear;-moz-transition:left 70ms linear}.ui-slider-switch.ui-mini .ui-slider-handle .ui-btn-inner{height:30px;width:30px;padding:0;margin:0;border-top:none}.ui-slider-switch .ui-slider-label{position:absolute;text-align:center;width:100%;overflow:hidden;font-size:16px;top:0;line-height:2;min-height:100%;border-width:0;white-space:nowrap;cursor:pointer}.ui-slider-switch.ui-mini .ui-slider-label{font-size:14px}.ui-slider-switch .ui-slider-label-a{z-index:1;left:0;text-indent:-1.5em}.ui-slider-switch .ui-slider-label-b{z-index:0;right:0;text-indent:1.5em}@media all and (min-width:28em){.ui-field-contain label.ui-slider{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain div.ui-slider{display:inline-block;width:78%}.ui-field-contain.ui-hide-label div.ui-slider{display:block;width:auto}.ui-field-contain div.ui-slider-switch,.ui-field-contain.ui-hide-label div.ui-slider-switch{display:inline-block;width:5.8em}.ui-field-contain div.ui-slider-switch.ui-mini{width:5em}}.ui-table{border:0;border-collapse:collapse;padding:0;width:100%}.ui-table th,.ui-table td{line-height:1.5em;text-align:left;padding:.4em .5em;vertical-align:top}.ui-table th .ui-btn,.ui-table td .ui-btn{line-height:normal}.ui-table th{font-weight:bold}.ui-table caption{text-align:left;margin-bottom:1.4em;opacity:.5}.table-stroke thead th{border-bottom:1px solid #d6d6d6;border-bottom:1px solid rgba(0,0,0,.1)}.table-stroke tbody th,.table-stroke tbody td{border-bottom:1px solid #e6e6e6;border-bottom:1px solid rgba(0,0,0,.05)}.table-stripe tbody tr:nth-child(odd) td,.table-stripe tbody tr:nth-child(odd) th{background-color:#eee;background-color:rgba(0,0,0,0.04)}.table-stripe thead th,.table-stripe tbody tr:last-child{border-bottom:1px solid #d6d6d6;border-bottom:1px solid rgba(0,0,0,.1)}.ui-table-columntoggle-btn{float:right;margin-bottom:.8em}.ui-table-columntoggle-popup fieldset{margin:0}@media only all{th.ui-table-priority-6,td.ui-table-priority-6,th.ui-table-priority-5,td.ui-table-priority-5,th.ui-table-priority-4,td.ui-table-priority-4,th.ui-table-priority-3,td.ui-table-priority-3,th.ui-table-priority-2,td.ui-table-priority-2,th.ui-table-priority-1,td.ui-table-priority-1{display:none}}@media screen and (min-width:20em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-1,.ui-table-columntoggle.ui-responsive td.ui-table-priority-1{display:table-cell}}@media screen and (min-width:30em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-2,.ui-table-columntoggle.ui-responsive td.ui-table-priority-2{display:table-cell}}@media screen and (min-width:40em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-3,.ui-table-columntoggle.ui-responsive td.ui-table-priority-3{display:table-cell}}@media screen and (min-width:50em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-4,.ui-table-columntoggle.ui-responsive td.ui-table-priority-4{display:table-cell}}@media screen and (min-width:60em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-5,.ui-table-columntoggle.ui-responsive td.ui-table-priority-5{display:table-cell}}@media screen and (min-width:70em){.ui-table-columntoggle.ui-responsive th.ui-table-priority-6,.ui-table-columntoggle.ui-responsive td.ui-table-priority-6{display:table-cell}}.ui-table-columntoggle th.ui-table-cell-hidden,.ui-table-columntoggle td.ui-table-cell-hidden,.ui-table-columntoggle.ui-responsive th.ui-table-cell-hidden,.ui-table-columntoggle.ui-responsive td.ui-table-cell-hidden{display:none}.ui-table-columntoggle th.ui-table-cell-visible,.ui-table-columntoggle td.ui-table-cell-visible,.ui-table-columntoggle.ui-responsive th.ui-table-cell-visible,.ui-table-columntoggle.ui-responsive td.ui-table-cell-visible{display:table-cell}.ui-table-reflow td .ui-table-cell-label,.ui-table-reflow th .ui-table-cell-label{display:none}@media only all{.ui-table-reflow thead td,.ui-table-reflow thead th{display:none}.ui-table-reflow td,.ui-table-reflow th{text-align:left;display:block}.ui-table-reflow tbody th{margin-top:3em}.ui-table-reflow td .ui-table-cell-label,.ui-table-reflow th .ui-table-cell-label{display:block;padding:.4em;min-width:30%;display:inline-block;margin:-.4em 1em -.4em -.4em}.ui-table-reflow th .ui-table-cell-label-top,.ui-table-reflow td .ui-table-cell-label-top{display:block;padding:.4em 0;margin:.4em 0;text-transform:uppercase;font-size:.9em;font-weight:normal}}@media ( min-width:35em ){.ui-table-reflow.ui-responsive{display:table-row-group}.ui-table-reflow.ui-responsive td,.ui-table-reflow.ui-responsive th,.ui-table-reflow.ui-responsive tbody th,.ui-table-reflow.ui-responsive tbody td,.ui-table-reflow.ui-responsive thead td,.ui-table-reflow.ui-responsive thead th{display:table-cell;margin:0}.ui-table-reflow.ui-responsive td .ui-table-cell-label,.ui-table-reflow.ui-responsive th .ui-table-cell-label{display:none}}@media ( max-width:35em ){.ui-table-reflow.ui-responsive td,.ui-table-reflow.ui-responsive th{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;clear:left}}.ui-panel{width:17em;min-height:100%;border-width:0;position:absolute;top:0;display:block}.ui-panel-closed{width:0;overflow:hidden}.ui-panel-fixed{position:fixed;bottom:-1px;padding-bottom:1px}.ui-panel-display-overlay{z-index:1001}.ui-panel-display-reveal{z-index:0}.ui-panel-display-push{z-index:999}.ui-panel-inner{padding:15px}.ui-panel-content-wrap{position:relative;left:0;min-height:inherit;border:none;z-index:999}.ui-panel-content-wrap-display-overlay,.ui-panel-animate.ui-panel-content-wrap > .ui-header,.ui-panel-content-wrap-closed{position:static}.ui-panel-dismiss{position:absolute;top:0;left:0;height:100%;width:100%;z-index:1002;display:none}.ui-panel-dismiss-open{display:block}.ui-panel-animate{-webkit-transition:-webkit-transform 350ms ease;-moz-transition:-moz-transform 350ms ease;transition:transform 350ms ease}.ui-panel-animate.ui-panel:not(.ui-panel-display-reveal),.ui-panel-animate.ui-panel:not(.ui-panel-display-reveal) > div,.ui-panel-animate.ui-panel-content-wrap,.ui-panel-animate.ui-panel-content-fixed-toolbar{-webkit-backface-visibility:hidden;-webkit-transform:translate3d(0,0,0)}.ui-panel-position-left{left:-17em}.ui-panel-animate.ui-panel-position-left.ui-panel-display-overlay,.ui-panel-animate.ui-panel-position-left.ui-panel-display-push{left:0;-webkit-transform:translate3d(-17em,0,0);-moz-transform:translate3d(-17em,0,0);transform:translate3d(-17em,0,0)}.ui-panel-position-left.ui-panel-display-reveal,.ui-panel-position-left.ui-panel-open{left:0}.ui-panel-animate.ui-panel-position-left.ui-panel-open.ui-panel-display-overlay,.ui-panel-animate.ui-panel-position-left.ui-panel-open.ui-panel-display-push{-webkit-transform:translate3d(0,0,0);-moz-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.ui-panel-position-right{right:-17em}.ui-panel-animate.ui-panel-position-right.ui-panel-display-overlay,.ui-panel-animate.ui-panel-position-right.ui-panel-display-push{right:0;-webkit-transform:translate3d(17em,0,0);-moz-transform:translate3d(17em,0,0);transform:translate3d(17em,0,0)}.ui-panel-position-right.ui-panel-display-reveal,.ui-panel-position-right.ui-panel-open{right:0}.ui-panel-animate.ui-panel-position-right.ui-panel-open.ui-panel-display-overlay,.ui-panel-animate.ui-panel-position-right.ui-panel-open.ui-panel-display-push{-webkit-transform:translate3d(0,0,0);-moz-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.ui-panel-content-fixed-toolbar-position-left.ui-panel-content-fixed-toolbar-open,.ui-panel-content-wrap-position-left.ui-panel-content-wrap-open,.ui-panel-dismiss-position-left.ui-panel-dismiss-open{left:17em;right:-17em}.ui-panel-animate.ui-panel-content-fixed-toolbar-position-left.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-reveal,.ui-panel-animate.ui-panel-content-fixed-toolbar-position-left.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-push,.ui-panel-animate.ui-panel-content-wrap-position-left.ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal,.ui-panel-animate.ui-panel-content-wrap-position-left.ui-panel-content-wrap-open.ui-panel-content-wrap-display-push{left:0;right:0;-webkit-transform:translate3d(17em,0,0);-moz-transform:translate3d(17em,0,0);transform:translate3d(17em,0,0)}.ui-panel-content-fixed-toolbar-position-right.ui-panel-content-fixed-toolbar-open,.ui-panel-content-wrap-position-right.ui-panel-content-wrap-open,.ui-panel-dismiss-position-right.ui-panel-dismiss-open{left:-17em;right:17em}.ui-panel-animate.ui-panel-content-fixed-toolbar-position-right.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-reveal,.ui-panel-animate.ui-panel-content-fixed-toolbar-position-right.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-push,.ui-panel-animate.ui-panel-content-wrap-position-right.ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal,.ui-panel-animate.ui-panel-content-wrap-position-right.ui-panel-content-wrap-open.ui-panel-content-wrap-display-push{left:0;right:0;-webkit-transform:translate3d(-17em,0,0);-moz-transform:translate3d(-17em,0,0);transform:translate3d(-17em,0,0)}.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-overlay,.ui-panel-content-wrap-open.ui-panel-content-wrap-display-overlay{left:0}.ui-page-active.ui-page-panel{overflow-x:hidden}.ui-panel-display-reveal{-webkit-box-shadow:inset -5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:inset -5px 0 5px rgba(0,0,0,.15);box-shadow:inset -5px 0 5px rgba(0,0,0,.15)}.ui-panel-position-right.ui-panel-display-reveal{-webkit-box-shadow:inset 5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:inset 5px 0 5px rgba(0,0,0,.15);box-shadow:inset 5px 0 5px rgba(0,0,0,.15)}.ui-panel-position-right.ui-panel-display-overlay{-webkit-box-shadow:-5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:-5px 0 5px rgba(0,0,0,.15);box-shadow:-5px 0 5px rgba(0,0,0,.15)}.ui-panel-position-left.ui-panel-display-overlay{-webkit-box-shadow:5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:5px 0 5px rgba(0,0,0,.15);box-shadow:5px 0 5px rgba(0,0,0,.15)}.ui-panel-display-push.ui-panel-open.ui-panel-position-left{border-right-width:1px;margin-right:-1px}.ui-panel-animate.ui-panel-content-fixed-toolbar-position-left.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-push{margin-left:1px}.ui-panel-display-push.ui-panel-open.ui-panel-position-right{border-left-width:1px;margin-left:-1px}.ui-panel-animate.ui-panel-content-fixed-toolbar-position-right.ui-panel-content-fixed-toolbar-open.ui-panel-content-fixed-toolbar-display-push{margin-right:1px}@media (min-width:55em){.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-push.ui-panel-content-fixed-toolbar-position-left,.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-reveal.ui-panel-content-fixed-toolbar-position-left,.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-display-push.ui-panel-content-wrap-position-left,.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-display-reveal.ui-panel-content-wrap-position-left{margin-right:17em}.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-push.ui-panel-content-fixed-toolbar-position-right,.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-reveal.ui-panel-content-fixed-toolbar-position-right,.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-display-push.ui-panel-content-wrap-position-right,.ui-responsive-panel.ui-page-panel-open .ui-panel-content-wrap-display-reveal.ui-panel-content-wrap-position-right{margin-left:17em}.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-push,.ui-responsive-panel.ui-page-panel-open .ui-panel-content-fixed-toolbar-display-reveal{width:auto}.ui-responsive-panel .ui-panel-dismiss-display-push{display:none}}
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js b/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
deleted file mode 100644
index 8d12031a373..00000000000
--- a/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery Mobile vGit Build: SHA1: 3d48d6517f808550ee402a2859feedec13b0a3fe <> Date: Tue Feb 19 15:25:22 2013 -0800 jquerymobile.com | jquery.org/license !*/
-(function(a,b,c){typeof define=="function"&&define.amd?define(["jquery"],function(d){return c(d,a,b),d.mobile}):c(a.jQuery,a,b)})(this,document,function(a,b,c,d){(function(a){a.mobile={}})(a),function(a,b,d){var e={};a.mobile=a.extend(a.mobile,{version:"1.3.0",ns:"",subPageUrlKey:"ui-page",activePageClass:"ui-page-active",activeBtnClass:"ui-btn-active",focusClass:"ui-focus",ajaxEnabled:!0,hashListeningEnabled:!0,linkBindingEnabled:!0,defaultPageTransition:"fade",maxTransitionWidth:!1,minScrollBack:250,touchOverflowEnabled:!1,defaultDialogTransition:"pop",pageLoadErrorMessage:"Error Loading Page",pageLoadErrorMessageTheme:"e",phonegapNavigationEnabled:!1,autoInitializePage:!0,pushStateEnabled:!0,ignoreContentEnabled:!1,orientationChangeEnabled:!0,buttonMarkup:{hoverDelay:200},window:a(b),document:a(c),keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91},behaviors:{},silentScroll:function(c){a.type(c)!=="number"&&(c=a.mobile.defaultHomeScroll),a.event.special.scrollstart.enabled=!1,setTimeout(function(){b.scrollTo(0,c),a.mobile.document.trigger("silentscroll",{x:0,y:c})},20),setTimeout(function(){a.event.special.scrollstart.enabled=!0},150)},nsNormalizeDict:e,nsNormalize:function(b){if(!b)return;return e[b]||(e[b]=a.camelCase(a.mobile.ns+b))},getInheritedTheme:function(a,b){var c=a[0],d="",e=/ui-(bar|body|overlay)-([a-z])\b/,f,g;while(c){f=c.className||"";if(f&&(g=e.exec(f))&&(d=g[2]))break;c=c.parentNode}return d||b||"a"},closestPageData:function(a){return a.closest(':jqmData(role="page"), :jqmData(role="dialog")').data("mobile-page")},enhanceable:function(a){return this.haveParents(a,"enhance")},hijackable:function(a){return this.haveParents(a,"ajax")},haveParents:function(b,c){if(!a.mobile.ignoreContentEnabled)return b;var d=b.length,e=a(),f,g,h;for(var i=0;i<d;i++){g=b.eq(i),h=!1,f=b[i];while(f){var j=f.getAttribute?f.getAttribute("data-"+a.mobile.ns+c):"";if(j==="false"){h=!0;break}f=f.parentNode}h||(e=e.add(g))}return e},getScreenHeight:function(){return b.innerHeight||a.mobile.window.height()}},a.mobile),a.fn.jqmData=function(b,c){var e;return typeof b!="undefined"&&(b&&(b=a.mobile.nsNormalize(b)),arguments.length<2||c===d?e=this.data(b):e=this.data(b,c)),e},a.jqmData=function(b,c,d){var e;return typeof c!="undefined"&&(e=a.data(b,c?a.mobile.nsNormalize(c):c,d)),e},a.fn.jqmRemoveData=function(b){return this.removeData(a.mobile.nsNormalize(b))},a.jqmRemoveData=function(b,c){return a.removeData(b,a.mobile.nsNormalize(c))},a.fn.removeWithDependents=function(){a.removeWithDependents(this)},a.removeWithDependents=function(b){var c=a(b);(c.jqmData("dependents")||a()).remove(),c.remove()},a.fn.addDependents=function(b){a.addDependents(a(this),b)},a.addDependents=function(b,c){var d=a(b).jqmData("dependents")||a();a(b).jqmData("dependents",a.merge(d,c))},a.fn.getEncodedText=function(){return a("<div/>").text(a(this).text()).html()},a.fn.jqmEnhanceable=function(){return a.mobile.enhanceable(this)},a.fn.jqmHijackable=function(){return a.mobile.hijackable(this)};var f=a.find,g=/:jqmData\(([^)]*)\)/g;a.find=function(b,c,d,e){return b=b.replace(g,"[data-"+(a.mobile.ns||"")+"$1]"),f.call(this,b,c,d,e)},a.extend(a.find,f),a.find.matches=function(b,c){return a.find(b,null,null,c)},a.find.matchesSelector=function(b,c){return a.find(c,null,null,[b]).length>0}}(a,this),function(a,b){var c=0,d=Array.prototype.slice,e=a.cleanData;a.cleanData=function(b){for(var c=0,d;(d=b[c])!=null;c++)try{a(d).triggerHandler("remove")}catch(f){}e(b)},a.widget=function(b,c,d){var e,f,g,h,i=b.split(".")[0];b=b.split(".")[1],e=i+"-"+b,d||(d=c,c=a.Widget),a.expr[":"][e.toLowerCase()]=function(b){return!!a.data(b,e)},a[i]=a[i]||{},f=a[i][b],g=a[i][b]=function(a,b){if(!this._createWidget)return new g(a,b);arguments.length&&this._createWidget(a,b)},a.extend(g,f,{version:d.version,_proto:a.extend({},d),_childConstructors:[]}),h=new c,h.options=a.widget.extend({},h.options),a.each(d,function(b,e){a.isFunction(e)&&(d[b]=function(){var a=function(){return c.prototype[b].apply(this,arguments)},d=function(a){return c.prototype[b].apply(this,a)};return function(){var b=this._super,c=this._superApply,f;return this._super=a,this._superApply=d,f=e.apply(this,arguments),this._super=b,this._superApply=c,f}}())}),g.prototype=a.widget.extend(h,{widgetEventPrefix:f?h.widgetEventPrefix:b},d,{constructor:g,namespace:i,widgetName:b,widgetFullName:e}),f?(a.each(f._childConstructors,function(b,c){var d=c.prototype;a.widget(d.namespace+"."+d.widgetName,g,c._proto)}),delete f._childConstructors):c._childConstructors.push(g),a.widget.bridge(b,g)},a.widget.extend=function(c){var e=d.call(arguments,1),f=0,g=e.length,h,i;for(;f<g;f++)for(h in e[f])i=e[f][h],e[f].hasOwnProperty(h)&&i!==b&&(a.isPlainObject(i)?c[h]=a.isPlainObject(c[h])?a.widget.extend({},c[h],i):a.widget.extend({},i):c[h]=i);return c},a.widget.bridge=function(c,e){var f=e.prototype.widgetFullName||c;a.fn[c]=function(g){var h=typeof g=="string",i=d.call(arguments,1),j=this;return g=!h&&i.length?a.widget.extend.apply(null,[g].concat(i)):g,h?this.each(function(){var d,e=a.data(this,f);if(!e)return a.error("cannot call methods on "+c+" prior to initialization; "+"attempted to call method '"+g+"'");if(!a.isFunction(e[g])||g.charAt(0)==="_")return a.error("no such method '"+g+"' for "+c+" widget instance");d=e[g].apply(e,i);if(d!==e&&d!==b)return j=d&&d.jquery?j.pushStack(d.get()):d,!1}):this.each(function(){var b=a.data(this,f);b?b.option(g||{})._init():a.data(this,f,new e(g,this))}),j}},a.Widget=function(){},a.Widget._childConstructors=[],a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(b,d){d=a(d||this.defaultElement||this)[0],this.element=a(d),this.uuid=c++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=a.widget.extend({},this.options,this._getCreateOptions(),b),this.bindings=a(),this.hoverable=a(),this.focusable=a(),d!==this&&(a.data(d,this.widgetFullName,this),this._on(!0,this.element,{remove:function(a){a.target===d&&this.destroy()}}),this.document=a(d.style?d.ownerDocument:d.document||d),this.window=a(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:a.noop,_getCreateEventData:a.noop,_create:a.noop,_init:a.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(a.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:a.noop,widget:function(){return this.element},option:function(c,d){var e=c,f,g,h;if(arguments.length===0)return a.widget.extend({},this.options);if(typeof c=="string"){e={},f=c.split("."),c=f.shift();if(f.length){g=e[c]=a.widget.extend({},this.options[c]);for(h=0;h<f.length-1;h++)g[f[h]]=g[f[h]]||{},g=g[f[h]];c=f.pop();if(d===b)return g[c]===b?null:g[c];g[c]=d}else{if(d===b)return this.options[c]===b?null:this.options[c];e[c]=d}}return this._setOptions(e),this},_setOptions:function(a){var b;for(b in a)this._setOption(b,a[b]);return this},_setOption:function(a,b){return this.options[a]=b,a==="disabled"&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!b).attr("aria-disabled",b),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(b,c,d){var e,f=this;typeof b!="boolean"&&(d=c,c=b,b=!1),d?(c=e=a(c),this.bindings=this.bindings.add(c)):(d=c,c=this.element,e=this.widget()),a.each(d,function(d,g){function h(){if(!b&&(f.options.disabled===!0||a(this).hasClass("ui-state-disabled")))return;return(typeof g=="string"?f[g]:g).apply(f,arguments)}typeof g!="string"&&(h.guid=g.guid=g.guid||h.guid||a.guid++);var i=d.match(/^(\w+)\s*(.*)$/),j=i[1]+f.eventNamespace,k=i[2];k?e.delegate(k,j,h):c.bind(j,h)})},_off:function(a,b){b=(b||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,a.unbind(b).undelegate(b)},_delay:function(a,b){function c(){return(typeof a=="string"?d[a]:a).apply(d,arguments)}var d=this;return setTimeout(c,b||0)},_hoverable:function(b){this.hoverable=this.hoverable.add(b),this._on(b,{mouseenter:function(b){a(b.currentTarget).addClass("ui-state-hover")},mouseleave:function(b){a(b.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(b){this.focusable=this.focusable.add(b),this._on(b,{focusin:function(b){a(b.currentTarget).addClass("ui-state-focus")},focusout:function(b){a(b.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(b,c,d){var e,f,g=this.options[b];d=d||{},c=a.Event(c),c.type=(b===this.widgetEventPrefix?b:this.widgetEventPrefix+b).toLowerCase(),c.target=this.element[0],f=c.originalEvent;if(f)for(e in f)e in c||(c[e]=f[e]);return this.element.trigger(c,d),!(a.isFunction(g)&&g.apply(this.element[0],[c].concat(d))===!1||c.isDefaultPrevented())}},a.each({show:"fadeIn",hide:"fadeOut"},function(b,c){a.Widget.prototype["_"+b]=function(d,e,f){typeof e=="string"&&(e={effect:e});var g,h=e?e===!0||typeof e=="number"?c:e.effect||c:b;e=e||{},typeof e=="number"&&(e={duration:e}),g=!a.isEmptyObject(e),e.complete=f,e.delay&&d.delay(e.delay),g&&a.effects&&a.effects.effect[h]?d[b](e):h!==b&&d[h]?d[h](e.duration,e.easing,f):d.queue(function(c){a(this)[b](),f&&f.call(d[0]),c()})}})}(a),function(a,b){a.widget("mobile.widget",{_createWidget:function(){a.Widget.prototype._createWidget.apply(this,arguments),this._trigger("init")},_getCreateOptions:function(){var c=this.element,d={};return a.each(this.options,function(a){var e=c.jqmData(a.replace(/[A-Z]/g,function(a){return"-"+a.toLowerCase()}));e!==b&&(d[a]=e)}),d},enhanceWithin:function(b,c){this.enhance(a(this.options.initSelector,a(b)),c)},enhance:function(b,c){var d,e,f=a(b),g=this;f=a.mobile.enhanceable(f),c&&f.length&&(d=a.mobile.closestPageData(f),e=d&&d.keepNativeSelector()||"",f=f.not(e)),f[this.widgetName]()},raise:function(a){throw"Widget ["+this.widgetName+"]: "+a}})}(a),function(a,b){a.extend(a.mobile,{loadingMessageTextVisible:d,loadingMessageTheme:d,loadingMessage:d,showPageLoadingMsg:function(b,c,d){a.mobile.loading("show",b,c,d)},hidePageLoadingMsg:function(){a.mobile.loading("hide")},loading:function(){this.loaderWidget.loader.apply(this.loaderWidget,arguments)}});var c="ui-loader",e=a("html"),f=a.mobile.window;a.widget("mobile.loader",{options:{theme:"a",textVisible:!1,html:"",text:"loading"},defaultHtml:"<div class='"+c+"'>"+"<span class='ui-icon ui-icon-loading'></span>"+"<h1></h1>"+"</div>",fakeFixLoader:function(){var b=a("."+a.mobile.activeBtnClass).first();this.element.css({top:a.support.scrollTop&&f.scrollTop()+f.height()/2||b.length&&b.offset().top||100})},checkLoaderPosition:function(){var b=this.element.offset(),c=f.scrollTop(),d=a.mobile.getScreenHeight();if(b.top<c||b.top-c>d)this.element.addClass("ui-loader-fakefix"),this.fakeFixLoader(),f.unbind("scroll",this.checkLoaderPosition).bind("scroll",a.proxy(this.fakeFixLoader,this))},resetHtml:function(){this.element.html(a(this.defaultHtml).html())},show:function(b,g,h){var i,j,k,l;this.resetHtml(),a.type(b)==="object"?(l=a.extend({},this.options,b),b=l.theme||a.mobile.loadingMessageTheme):(l=this.options,b=b||a.mobile.loadingMessageTheme||l.theme),j=g||a.mobile.loadingMessage||l.text,e.addClass("ui-loading");if(a.mobile.loadingMessage!==!1||l.html)a.mobile.loadingMessageTextVisible!==d?i=a.mobile.loadingMessageTextVisible:i=l.textVisible,this.element.attr("class",c+" ui-corner-all ui-body-"+b+" ui-loader-"+(i||g||b.text?"verbose":"default")+(l.textonly||h?" ui-loader-textonly":"")),l.html?this.element.html(l.html):this.element.find("h1").text(j),this.element.appendTo(a.mobile.pageContainer),this.checkLoaderPosition(),f.bind("scroll",a.proxy(this.checkLoaderPosition,this))},hide:function(){e.removeClass("ui-loading"),a.mobile.loadingMessage&&this.element.removeClass("ui-loader-fakefix"),a.mobile.window.unbind("scroll",this.fakeFixLoader),a.mobile.window.unbind("scroll",this.checkLoaderPosition)}}),f.bind("pagecontainercreate",function(){a.mobile.loaderWidget=a.mobile.loaderWidget||a(a.mobile.loader.prototype.defaultHtml).loader()})}(a,this),function(a,b,d){function k(a){return a=a||location.href,"#"+a.replace(/^[^#]*#?(.*)$/,"$1")}var e="hashchange",f=c,g,h=a.event.special,i=f.documentMode,j="on"+e in b&&(i===d||i>7);a.fn[e]=function(a){return a?this.bind(e,a):this.trigger(e)},a.fn[e].delay=50,h[e]=a.extend(h[e],{setup:function(){if(j)return!1;a(g.start)},teardown:function(){if(j)return!1;a(g.stop)}}),g=function(){function n(){var c=k(),d=m(h);c!==h?(l(h=c,d),a(b).trigger(e)):d!==h&&(location.href=location.href.replace(/#.*/,"")+d),g=setTimeout(n,a.fn[e].delay)}var c={},g,h=k(),i=function(a){return a},l=i,m=i;return c.start=function(){g||n()},c.stop=function(){g&&clearTimeout(g),g=d},b.attachEvent&&!b.addEventListener&&!j&&function(){var b,d;c.start=function(){b||(d=a.fn[e].src,d=d&&d+k(),b=a('<iframe tabindex="-1" title="empty"/>').hide().one("load",function(){d||l(k()),n()}).attr("src",d||"javascript:0").insertAfter("body")[0].contentWindow,f.onpropertychange=function(){try{event.propertyName==="title"&&(b.document.title=f.title)}catch(a){}})},c.stop=i,m=function(){return k(b.location.href)},l=function(c,d){var g=b.document,h=a.fn[e].domain;c!==d&&(g.title=f.title,g.open(),h&&g.write('<script>document.domain="'+h+'"</script>'),g.close(),b.location.hash=c)}}(),c}()}(a,this),function(a,d){b.matchMedia=b.matchMedia||function(a,b){var c,d=a.documentElement,e=d.firstElementChild||d.firstChild,f=a.createElement("body"),g=a.createElement("div");return g.id="mq-test-1",g.style.cssText="position:absolute;top:-100em",f.style.background="none",f.appendChild(g),function(a){return g.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',d.insertBefore(f,e),c=g.offsetWidth===42,d.removeChild(f),{matches:c,media:a}}}(c),a.mobile.media=function(a){return b.matchMedia(a).matches}}(a),function(a,b){var d={touch:"ontouchend"in c};a.mobile.support=a.mobile.support||{},a.extend(a.support,d),a.extend(a.mobile.support,d)}(a),function(a,c){a.extend(a.support,{orientation:"orientation"in b&&"onorientationchange"in b})}(a),function(a,d){function e(a){var b=a.charAt(0).toUpperCase()+a.substr(1),c=(a+" "+h.join(b+" ")+b).split(" ");for(var e in c)if(g[c[e]]!==d)return!0}function m(a,b,d){var e=c.createElement("div"),f=function(a){return a.charAt(0).toUpperCase()+a.substr(1)},g=function(a){return a===""?"":"-"+a.charAt(0).toLowerCase()+a.substr(1)+"-"},i=function(c){var d=g(c)+a+": "+b+";",h=f(c),i=h+(h===""?a:f(a));e.setAttribute("style",d),!e.style[i]||(k=!0)},j=d?d:h,k;for(var l=0;l<j.length;l++)i(j[l]);return!!k}function n(){var e="transform-3d",g=a.mobile.media("(-"+h.join("-"+e+"),(-")+"-"+e+"),("+e+")");if(g)return!!g;var i=c.createElement("div"),j={MozTransform:"-moz-transform",transform:"transform"};f.append(i);for(var k in j)i.style[k]!==d&&(i.style[k]="translate3d( 100px, 1px, 1px )",g=b.getComputedStyle(i).getPropertyValue(j[k]));return!!g&&g!=="none"}function o(){var b=location.protocol+"//"+location.host+location.pathname+"ui-dir/",c=a("head base"),d=null,e="",g,h;return c.length?e=c.attr("href"):c=d=a("<base>",{href:b}).appendTo("head"),g=a("<a href='testurl' />").prependTo(f),h=g[0].href,c[0].href=e||location.pathname,d&&d.remove(),h.indexOf(b)===0}function p(){var a=c.createElement("x"),d=c.documentElement,e=b.getComputedStyle,f;return"pointerEvents"in a.style?(a.style.pointerEvents="auto",a.style.pointerEvents="x",d.appendChild(a),f=e&&e(a,"").pointerEvents==="auto",d.removeChild(a),!!f):!1}function q(){var a=c.createElement("div");return typeof a.getBoundingClientRect!="undefined"}function r(){var a=b,c=navigator.userAgent,d=navigator.platform,e=c.match(/AppleWebKit\/([0-9]+)/),f=!!e&&e[1],g=c.match(/Fennec\/([0-9]+)/),h=!!g&&g[1],i=c.match(/Opera Mobi\/([0-9]+)/),j=!!i&&i[1];return(d.indexOf("iPhone")>-1||d.indexOf("iPad")>-1||d.indexOf("iPod")>-1)&&f&&f<534||a.operamini&&{}.toString.call(a.operamini)==="[object OperaMini]"||i&&j<7458||c.indexOf("Android")>-1&&f&&f<533||h&&h<6||"palmGetResource"in b&&f&&f<534||c.indexOf("MeeGo")>-1&&c.indexOf("NokiaBrowser/8.5.0")>-1?!1:!0}var f=a("<body>").prependTo("html"),g=f[0].style,h=["Webkit","Moz","O"],i="palmGetResource"in b,j=b.opera,k=b.operamini&&{}.toString.call(b.operamini)==="[object OperaMini]",l=b.blackberry&&!e("-webkit-transform");a.extend(a.mobile,{browser:{}}),a.mobile.browser.oldIE=function(){var a=3,b=c.createElement("div"),d=b.all||[];do b.innerHTML="<!--[if gt IE "+ ++a+"]><br><![endif]-->";while(d[0]);return a>4?a:!a}(),a.extend(a.support,{cssTransitions:"WebKitTransitionEvent"in b||m("transition","height 100ms linear",["Webkit","Moz",""])&&!a.mobile.browser.oldIE&&!j,pushState:"pushState"in history&&"replaceState"in history&&b.navigator.userAgent.search(/CriOS/)===-1,mediaquery:a.mobile.media("only all"),cssPseudoElement:!!e("content"),touchOverflow:!!e("overflowScrolling"),cssTransform3d:n(),boxShadow:!!e("boxShadow")&&!l,fixedPosition:r(),scrollTop:("pageXOffset"in b||"scrollTop"in c.documentElement||"scrollTop"in f[0])&&!i&&!k,dynamicBaseTag:o(),cssPointerEvents:p(),boundingRect:q()}),f.remove();var s=function(){var a=b.navigator.userAgent;return a.indexOf("Nokia")>-1&&(a.indexOf("Symbian/3")>-1||a.indexOf("Series60/5")>-1)&&a.indexOf("AppleWebKit")>-1&&a.match(/(BrowserNG|NokiaBrowser)\/7\.[0-3]/)}();a.mobile.gradeA=function(){return(a.support.mediaquery||a.mobile.browser.oldIE&&a.mobile.browser.oldIE>=7)&&(a.support.boundingRect||a.fn.jquery.match(/1\.[0-7+]\.[0-9+]?/)!==null)},a.mobile.ajaxBlacklist=b.blackberry&&!b.WebKitPoint||k||s,s&&a(function(){a("head link[rel='stylesheet']").attr("rel","alternate stylesheet").attr("rel","stylesheet")}),a.support.boxShadow||a("html").addClass("ui-mobile-nosupport-boxshadow")}(a),function(a,b){var c=a.mobile.window,d,e;a.event.special.navigate=d={bound:!1,pushStateEnabled:!0,originalEventName:b,isPushStateEnabled:function(){return a.support.pushState&&a.mobile.pushStateEnabled===!0&&this.isHashChangeEnabled()},isHashChangeEnabled:function(){return a.mobile.hashListeningEnabled===!0},popstate:function(b){var d=new a.Event("navigate"),e=new a.Event("beforenavigate"),f=b.originalEvent.state||{},g=location.href;c.trigger(e);if(e.isDefaultPrevented())return;b.historyState&&a.extend(f,b.historyState),d.originalEvent=b,setTimeout(function(){c.trigger(d,{state:f})},0)},hashchange:function(b,d){var e=new a.Event("navigate"),f=new a.Event("beforenavigate");c.trigger(f);if(f.isDefaultPrevented())return;e.originalEvent=b,c.trigger(e,{state:b.hashchangeState||{}})},setup:function(a,b){if(d.bound)return;d.bound=!0,d.isPushStateEnabled()?(d.originalEventName="popstate",c.bind("popstate.navigate",d.popstate)):d.isHashChangeEnabled()&&(d.originalEventName="hashchange",c.bind("hashchange.navigate",d.hashchange))}}}(a),function(a,c){var d,e,f,g="&ui-state=dialog";a.mobile.path=d={uiStateKey:"&ui-state",urlParseRE:/^\s*(((([^:\/#\?]+:)?(?:(\/\/)((?:(([^:@\/#\?]+)(?:\:([^:@\/#\?]+))?)@)?(([^:\/#\?\]\[]+|\[[^\/\]@#?]+\])(?:\:([0-9]+))?))?)?)?((\/?(?:[^\/\?#]+\/+)*)([^\?#]*)))?(\?[^#]+)?)(#.*)?/,getLocation:function(a){var b=a?this.parseUrl(a):location,c=this.parseUrl(a||location.href).hash;return c=c==="#"?"":c,b.protocol+"//"+b.host+b.pathname+b.search+c},parseLocation:function(){return this.parseUrl(this.getLocation())},parseUrl:function(b){if(a.type(b)==="object")return b;var c=d.urlParseRE.exec(b||"")||[];return{href:c[0]||"",hrefNoHash:c[1]||"",hrefNoSearch:c[2]||"",domain:c[3]||"",protocol:c[4]||"",doubleSlash:c[5]||"",authority:c[6]||"",username:c[8]||"",password:c[9]||"",host:c[10]||"",hostname:c[11]||"",port:c[12]||"",pathname:c[13]||"",directory:c[14]||"",filename:c[15]||"",search:c[16]||"",hash:c[17]||""}},makePathAbsolute:function(a,b){if(a&&a.charAt(0)==="/")return a;a=a||"",b=b?b.replace(/^\/|(\/[^\/]*|[^\/]+)$/g,""):"";var c=b?b.split("/"):[],d=a.split("/");for(var e=0;e<d.length;e++){var f=d[e];switch(f){case".":break;case"..":c.length&&c.pop();break;default:c.push(f)}}return"/"+c.join("/")},isSameDomain:function(a,b){return d.parseUrl(a).domain===d.parseUrl(b).domain},isRelativeUrl:function(a){return d.parseUrl(a).protocol===""},isAbsoluteUrl:function(a){return d.parseUrl(a).protocol!==""},makeUrlAbsolute:function(a,b){if(!d.isRelativeUrl(a))return a;b===c&&(b=this.documentBase);var e=d.parseUrl(a),f=d.parseUrl(b),g=e.protocol||f.protocol,h=e.protocol?e.doubleSlash:e.doubleSlash||f.doubleSlash,i=e.authority||f.authority,j=e.pathname!=="",k=d.makePathAbsolute(e.pathname||f.filename,f.pathname),l=e.search||!j&&f.search||"",m=e.hash;return g+h+i+k+l+m},addSearchParams:function(b,c){var e=d.parseUrl(b),f=typeof c=="object"?a.param(c):c,g=e.search||"?";return e.hrefNoSearch+g+(g.charAt(g.length-1)!=="?"?"&":"")+f+(e.hash||"")},convertUrlToDataUrl:function(a){var c=d.parseUrl(a);return d.isEmbeddedPage(c)?c.hash.split(g)[0].replace(/^#/,"").replace(/\?.*$/,""):d.isSameDomain(c,this.documentBase)?c.hrefNoHash.replace(this.documentBase.domain,"").split(g)[0]:b.decodeURIComponent(a)},get:function(a){return a===c&&(a=d.parseLocation().hash),d.stripHash(a).replace(/[^\/]*\.[^\/*]+$/,"")},set:function(a){location.hash=a},isPath:function(a){return/\//.test(a)},clean:function(a){return a.replace(this.documentBase.domain,"")},stripHash:function(a){return a.replace(/^#/,"")},stripQueryParams:function(a){return a.replace(/\?.*$/,"")},cleanHash:function(a){return d.stripHash(a.replace(/\?.*$/,"").replace(g,""))},isHashValid:function(a){return/^#[^#]+$/.test(a)},isExternal:function(a){var b=d.parseUrl(a);return b.protocol&&b.domain!==this.documentUrl.domain?!0:!1},hasProtocol:function(a){return/^(:?\w+:)/.test(a)},isEmbeddedPage:function(a){var b=d.parseUrl(a);return b.protocol!==""?!this.isPath(b.hash)&&b.hash&&(b.hrefNoHash===this.documentUrl.hrefNoHash||this.documentBaseDiffers&&b.hrefNoHash===this.documentBase.hrefNoHash):/^#/.test(b.href)},squash:function(a,b){var c,e,f,g,h,i=this.isPath(a),j=this.parseUrl(a),k=j.hash,l="";b=b||(d.isPath(a)?d.getLocation():d.getDocumentUrl()),f=i?d.stripHash(a):a,f=d.isPath(j.hash)?d.stripHash(j.hash):f,h=f.indexOf(this.uiStateKey),h>-1&&(l=f.slice(h),f=f.slice(0,h)),e=d.makeUrlAbsolute(f,b),g=this.parseUrl(e).search;if(i){if(d.isPath(k)||k.replace("#","").indexOf(this.uiStateKey)===0)k="";l&&k.indexOf(this.uiStateKey)===-1&&(k+=l),k.indexOf("#")===-1&&k!==""&&(k="#"+k),e=d.parseUrl(e),e=e.protocol+"//"+e.host+e.pathname+g+k}else e+=e.indexOf("#")>-1?l:"#"+l;return e},isPreservableHash:function(a){return a.replace("#","").indexOf(this.uiStateKey)===0}},d.documentUrl=d.parseLocation(),f=a("head").find("base"),d.documentBase=f.length?d.parseUrl(d.makeUrlAbsolute(f.attr("href"),d.documentUrl.href)):d.documentUrl,d.documentBaseDiffers=d.documentUrl.hrefNoHash!==d.documentBase.hrefNoHash,d.getDocumentUrl=function(b){return b?a.extend({},d.documentUrl):d.documentUrl.href},d.getDocumentBase=function(b){return b?a.extend({},d.documentBase):d.documentBase.href}}(a),function(a,b){var c=a.mobile.path;a.mobile.History=function(a,b){this.stack=a||[],this.activeIndex=b||0},a.extend(a.mobile.History.prototype,{getActive:function(){return this.stack[this.activeIndex]},getLast:function(){return this.stack[this.previousIndex]},getNext:function(){return this.stack[this.activeIndex+1]},getPrev:function(){return this.stack[this.activeIndex-1]},add:function(a,b){b=b||{},this.getNext()&&this.clearForward(),b.hash&&b.hash.indexOf("#")===-1&&(b.hash="#"+b.hash),b.url=a,this.stack.push(b),this.activeIndex=this.stack.length-1},clearForward:function(){this.stack=this.stack.slice(0,this.activeIndex+1)},find:function(a,b,c){b=b||this.stack;var d,e,f=b.length,g;for(e=0;e<f;e++){d=b[e];if(decodeURIComponent(a)===decodeURIComponent(d.url)||decodeURIComponent(a)===decodeURIComponent(d.hash)){g=e;if(c)return g}}return g},closest:function(a){var c,d=this.activeIndex;return c=this.find(a,this.stack.slice(0,d)),c===b&&(c=this.find(a,this.stack.slice(d),!0),c=c===b?c:c+d),c},direct:function(c){var d=this.closest(c.url),e=this.activeIndex;d!==b&&(this.activeIndex=d,this.previousIndex=e),d<e?(c.present||c.back||a.noop)(this.getActive(),"back"):d>e?(c.present||c.forward||a.noop)(this.getActive(),"forward"):d===b&&c.missing&&c.missing(this.getActive())}})}(a),function(a,d){var e=a.mobile.path;a.mobile.Navigator=function(b){this.history=b,this.ignoreInitialHashChange=!0,setTimeout(a.proxy(function(){this.ignoreInitialHashChange=!1},this),200),a.mobile.window.bind({"popstate.history":a.proxy(this.popstate,this),"hashchange.history":a.proxy(this.hashchange,this)})},a.extend(a.mobile.Navigator.prototype,{squash:function(d,f){var g,h,i=e.isPath(d)?e.stripHash(d):d;return h=e.squash(d),g=a.extend({hash:i,url:h},f),b.history.replaceState(g,g.title||c.title,h),g},hash:function(a,b){var c,d,f;c=e.parseUrl(a),d=e.parseLocation();if(d.pathname+d.search===c.pathname+c.search)f=c.hash?c.hash:c.pathname+c.search;else if(e.isPath(a)){var g=e.parseUrl(b);f=g.pathname+g.search+(e.isPreservableHash(g.hash)?g.hash.replace("#",""):"")}else f=a;return f},go:function(d,f,g){var h,i,j,k,l=a.event.special.navigate.isPushStateEnabled();i=e.squash(d),j=this.hash(d,i),g&&j!==e.stripHash(e.parseLocation().hash)&&(this.preventNextHashChange=g),this.preventHashAssignPopState=!0,b.location.hash=j,this.preventHashAssignPopState=!1,h=a.extend({url:i,hash:j,title:c.title},f),l&&(k=new a.Event("popstate"),k.originalEvent={type:"popstate",state:null},this.squash(d,h),g||(this.ignorePopState=!0,a.mobile.window.trigger(k))),this.history.add(h.url,h)},popstate:function(b){var c,d,f,g;if(!a.event.special.navigate.isPushStateEnabled())return;if(this.preventHashAssignPopState){this.preventHashAssignPopState=!1,b.stopImmediatePropagation();return}if(this.ignorePopState){this.ignorePopState=!1;return}if(!b.originalEvent.state&&this.history.stack.length===1&&this.ignoreInitialHashChange){this.ignoreInitialHashChange=!1;return}d=e.parseLocation().hash;if(!b.originalEvent.state&&d){f=this.squash(d),this.history.add(f.url,f),b.historyState=f;return}this.history.direct({url:(b.originalEvent.state||{}).url||d,present:function(c,d){b.historyState=a.extend({},c),b.historyState.direction=d}})},hashchange:function(b){var d,f;if(!a.event.special.navigate.isHashChangeEnabled()||a.event.special.navigate.isPushStateEnabled())return;if(this.preventNextHashChange){this.preventNextHashChange=!1,b.stopImmediatePropagation();return}d=this.history,f=e.parseLocation().hash,this.history.direct({url:f,present:function(c,d){b.hashchangeState=a.extend({},c),b.hashchangeState.direction=d},missing:function(){d.add(f,{hash:f,title:c.title})}})}})}(a),function(a,b){a.mobile.navigate=function(b,c,d){a.mobile.navigate.navigator.go(b,c,d)},a.mobile.navigate.history=new a.mobile.History,a.mobile.navigate.navigator=new a.mobile.Navigator(a.mobile.navigate.history);var c=a.mobile.path.parseLocation();a.mobile.navigate.history.add(c.href,{hash:c.hash})}(a),function(a,b,c,d){function x(a){while(a&&typeof a.originalEvent!="undefined")a=a.originalEvent;return a}function y(b,c){var e=b.type,f,g,i,k,l,m,n,o,p;b=a.Event(b),b.type=c,f=b.originalEvent,g=a.event.props,e.search(/^(mouse|click)/)>-1&&(g=j);if(f)for(n=g.length,k;n;)k=g[--n],b[k]=f[k];e.search(/mouse(down|up)|click/)>-1&&!b.which&&(b.which=1);if(e.search(/^touch/)!==-1){i=x(f),e=i.touches,l=i.changedTouches,m=e&&e.length?e[0]:l&&l.length?l[0]:d;if(m)for(o=0,p=h.length;o<p;o++)k=h[o],b[k]=m[k]}return b}function z(b){var c={},d,f;while(b){d=a.data(b,e);for(f in d)d[f]&&(c[f]=c.hasVirtualBinding=!0);b=b.parentNode}return c}function A(b,c){var d;while(b){d=a.data(b,e);if(d&&(!c||d[c]))return b;b=b.parentNode}return null}function B(){r=!1}function C(){r=!0}function D(){v=0,p.length=0,q=!1,C()}function E(){B()}function F(){G(),l=setTimeout(function(){l=0,D()},a.vmouse.resetTimerDuration)}function G(){l&&(clearTimeout(l),l=0)}function H(b,c,d){var e;if(d&&d[b]||!d&&A(c.target,b))e=y(c,b),a(c.target).trigger(e);return e}function I(b){var c=a.data(b.target,f);if(!q&&(!v||v!==c)){var d=H("v"+b.type,b);d&&(d.isDefaultPrevented()&&b.preventDefault(),d.isPropagationStopped()&&b.stopPropagation(),d.isImmediatePropagationStopped()&&b.stopImmediatePropagation())}}function J(b){var c=x(b).touches,d,e;if(c&&c.length===1){d=b.target,e=z(d);if(e.hasVirtualBinding){v=u++,a.data(d,f,v),G(),E(),o=!1;var g=x(b).touches[0];m=g.pageX,n=g.pageY,H("vmouseover",b,e),H("vmousedown",b,e)}}}function K(a){if(r)return;o||H("vmousecancel",a,z(a.target)),o=!0,F()}function L(b){if(r)return;var c=x(b).touches[0],d=o,e=a.vmouse.moveDistanceThreshold,f=z(b.target);o=o||Math.abs(c.pageX-m)>e||Math.abs(c.pageY-n)>e,o&&!d&&H("vmousecancel",b,f),H("vmousemove",b,f),F()}function M(a){if(r)return;C();var b=z(a.target),c;H("vmouseup",a,b);if(!o){var d=H("vclick",a,b);d&&d.isDefaultPrevented()&&(c=x(a).changedTouches[0],p.push({touchID:v,x:c.clientX,y:c.clientY}),q=!0)}H("vmouseout",a,b),o=!1,F()}function N(b){var c=a.data(b,e),d;if(c)for(d in c)if(c[d])return!0;return!1}function O(){}function P(b){var c=b.substr(1);return{setup:function(d,f){N(this)||a.data(this,e,{});var g=a.data(this,e);g[b]=!0,k[b]=(k[b]||0)+1,k[b]===1&&t.bind(c,I),a(this).bind(c,O),s&&(k.touchstart=(k.touchstart||0)+1,k.touchstart===1&&t.bind("touchstart",J).bind("touchend",M).bind("touchmove",L).bind("scroll",K))},teardown:function(d,f){--k[b],k[b]||t.unbind(c,I),s&&(--k.touchstart,k.touchstart||t.unbind("touchstart",J).unbind("touchmove",L).unbind("touchend",M).unbind("scroll",K));var g=a(this),h=a.data(this,e);h&&(h[b]=!1),g.unbind(c,O),N(this)||g.removeData(e)}}}var e="virtualMouseBindings",f="virtualTouchID",g="vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel".split(" "),h="clientX clientY pageX pageY screenX screenY".split(" "),i=a.event.mouseHooks?a.event.mouseHooks.props:[],j=a.event.props.concat(i),k={},l=0,m=0,n=0,o=!1,p=[],q=!1,r=!1,s="addEventListener"in c,t=a(c),u=1,v=0,w;a.vmouse={moveDistanceThreshold:10,clickDistanceThreshold:10,resetTimerDuration:1500};for(var Q=0;Q<g.length;Q++)a.event.special[g[Q]]=P(g[Q]);s&&c.addEventListener("click",function(b){var c=p.length,d=b.target,e,g,h,i,j,k;if(c){e=b.clientX,g=b.clientY,w=a.vmouse.clickDistanceThreshold,h=d;while(h){for(i=0;i<c;i++){j=p[i],k=0;if(h===d&&Math.abs(j.x-e)<w&&Math.abs(j.y-g)<w||a.data(h,f)===j.touchID){b.preventDefault(),b.stopPropagation();return}}h=h.parentNode}}},!0)}(a,b,c),function(a,b,d){function k(b,c,d){var e=d.type;d.type=c,a.event.dispatch.call(b,d),d.type=e}var e=a(c);a.each("touchstart touchmove touchend tap taphold swipe swipeleft swiperight scrollstart scrollstop".split(" "),function(b,c){a.fn[c]=function(a){return a?this.bind(c,a):this.trigger(c)},a.attrFn&&(a.attrFn[c]=!0)});var f=a.mobile.support.touch,g="touchmove scroll",h=f?"touchstart":"mousedown",i=f?"touchend":"mouseup",j=f?"touchmove":"mousemove";a.event.special.scrollstart={enabled:!0,setup:function(){function f(a,c){d=c,k(b,d?"scrollstart":"scrollstop",a)}var b=this,c=a(b),d,e;c.bind(g,function(b){if(!a.event.special.scrollstart.enabled)return;d||f(b,!0),clearTimeout(e),e=setTimeout(function(){f(b,!1)},50)})}},a.event.special.tap={tapholdThreshold:750,setup:function(){var b=this,c=a(b);c.bind("vmousedown",function(d){function i(){clearTimeout(h)}function j(){i(),c.unbind("vclick",l).unbind("vmouseup",i),e.unbind("vmousecancel",j)}function l(a){j(),f===a.target&&k(b,"tap",a)}if(d.which&&d.which!==1)return!1;var f=d.target,g=d.originalEvent,h;c.bind("vmouseup",i).bind("vclick",l),e.bind("vmousecancel",j),h=setTimeout(function(){k(b,"taphold",a.Event("taphold",{target:f}))},a.event.special.tap.tapholdThreshold)})}},a.event.special.swipe={scrollSupressionThreshold:30,durationThreshold:1e3,horizontalDistanceThreshold:30,verticalDistanceThreshold:75,start:function(b){var c=b.originalEvent.touches?b.originalEvent.touches[0]:b;return{time:(new Date).getTime(),coords:[c.pageX,c.pageY],origin:a(b.target)}},stop:function(a){var b=a.originalEvent.touches?a.originalEvent.touches[0]:a;return{time:(new Date).getTime(),coords:[b.pageX,b.pageY]}},handleSwipe:function(b,c){c.time-b.time<a.event.special.swipe.durationThreshold&&Math.abs(b.coords[0]-c.coords[0])>a.event.special.swipe.horizontalDistanceThreshold&&Math.abs(b.coords[1]-c.coords[1])<a.event.special.swipe.verticalDistanceThreshold&&b.origin.trigger("swipe").trigger(b.coords[0]>c.coords[0]?"swipeleft":"swiperight")},setup:function(){var b=this,c=a(b);c.bind(h,function(b){function g(b){if(!e)return;f=a.event.special.swipe.stop(b),Math.abs(e.coords[0]-f.coords[0])>a.event.special.swipe.scrollSupressionThreshold&&b.preventDefault()}var e=a.event.special.swipe.start(b),f;c.bind(j,g).one(i,function(){c.unbind(j,g),e&&f&&a.event.special.swipe.handleSwipe(e,f),e=f=d})})}},a.each({scrollstop:"scrollstart",taphold:"tap",swipeleft:"swipe",swiperight:"swipe"},function(b,c){a.event.special[b]={setup:function(){a(this).bind(c,a.noop)}}})}(a,this),function(a){a.event.special.throttledresize={setup:function(){a(this).bind("resize",c)},teardown:function(){a(this).unbind("resize",c)}};var b=250,c=function(){f=(new Date).getTime(),g=f-d,g>=b?(d=f,a(this).trigger("throttledresize")):(e&&clearTimeout(e),e=setTimeout(c,b-g))},d=0,e,f,g}(a),function(a,b){function o(){var a=g();a!==h&&(h=a,d.trigger(e))}var d=a(b),e="orientationchange",f,g,h,i,j,k={0:!0,180:!0};if(a.support.orientation){var l=b.innerWidth||d.width(),m=b.innerHeight||d.height(),n=50;i=l>m&&l-m>n,j=k[b.orientation];if(i&&j||!i&&!j)k={"-90":!0,90:!0}}a.event.special.orientationchange=a.extend({},a.event.special.orientationchange,{setup:function(){if(a.support.orientation&&!a.event.special.orientationchange.disabled)return!1;h=g(),d.bind("throttledresize",o)},teardown:function(){if(a.support.orientation&&!a.event.special.orientationchange.disabled)return!1;d.unbind("throttledresize",o)},add:function(a){var b=a.handler;a.handler=function(a){return a.orientation=g(),b.apply(this,arguments)}}}),a.event.special.orientationchange.orientation=g=function(){var d=!0,e=c.documentElement;return a.support.orientation?d=k[b.orientation]:d=e&&e.clientWidth/e.clientHeight<1.1,d?"portrait":"landscape"},a.fn[e]=function(a){return a?this.bind(e,a):this.trigger(e)},a.attrFn&&(a.attrFn[e]=!0)}(a,this),function(a,b){a.widget("mobile.page",a.mobile.widget,{options:{theme:"c",domCache:!1,keepNativeDefault:":jqmData(role='none'), :jqmData(role='nojs')"},_create:function(){if(this._trigger("beforecreate")===!1)return!1;this.element.attr("tabindex","0").addClass("ui-page ui-body-"+this.options.theme),this._on(this.element,{pagebeforehide:"removeContainerBackground",pagebeforeshow:"_handlePageBeforeShow"})},_handlePageBeforeShow:function(a){this.setContainerBackground()},removeContainerBackground:function(){a.mobile.pageContainer.removeClass("ui-overlay-"+a.mobile.getInheritedTheme(this.element.parent()))},setContainerBackground:function(b){this.options.theme&&a.mobile.pageContainer.addClass("ui-overlay-"+(b||this.options.theme))},keepNativeSelector:function(){var b=this.options,c=b.keepNative&&a.trim(b.keepNative);return c&&b.keepNative!==b.keepNativeDefault?[b.keepNative,b.keepNativeDefault].join(", "):b.keepNativeDefault}})}(a),function(a,b,c){var d=function(d){return d===c&&(d=!0),function(c,e,f,g){var h=new a.Deferred,i=e?" reverse":"",j=a.mobile.urlHistory.getActive(),k=j.lastScroll||a.mobile.defaultHomeScroll,l=a.mobile.getScreenHeight(),m=a.mobile.maxTransitionWidth!==!1&&a.mobile.window.width()>a.mobile.maxTransitionWidth,n=!a.support.cssTransitions||m||!c||c==="none"||Math.max(a.mobile.window.scrollTop(),k)>a.mobile.getMaxScrollForTransition(),o=" ui-page-pre-in",p=function(){a.mobile.pageContainer.toggleClass("ui-mobile-viewport-transitioning viewport-"+c)},q=function(){a.event.special.scrollstart.enabled=!1,b.scrollTo(0,k),setTimeout(function(){a.event.special.scrollstart.enabled=!0},150)},r=function(){g.removeClass(a.mobile.activePageClass+" out in reverse "+c).height("")},s=function(){d?g.animationComplete(t):t(),g.height(l+a.mobile.window.scrollTop()).addClass(c+" out"+i)},t=function(){g&&d&&r(),u()},u=function(){f.css("z-index",-10),f.addClass(a.mobile.activePageClass+o),a.mobile.focusPage(f),f.height(l+k),q(),f.css("z-index",""),n||f.animationComplete(v),f.removeClass(o).addClass(c+" in"+i),n&&v()},v=function(){d||g&&r(),f.removeClass("out in reverse "+c).height(""),p(),a.mobile.window.scrollTop()!==k&&q(),h.resolve(c,e,f,g,!0)};return p(),g&&!n?s():t(),h.promise()}},e=d(),f=d(!1),g=function(){return a.mobile.getScreenHeight()*3};a.mobile.defaultTransitionHandler=e,a.mobile.transitionHandlers={"default":a.mobile.defaultTransitionHandler,sequential:e,simultaneous:f},a.mobile.transitionFallbacks={},a.mobile._maybeDegradeTransition=function(b){return b&&!a.support.cssTransform3d&&a.mobile.transitionFallbacks[b]&&(b=a.mobile.transitionFallbacks[b]),b},a.mobile.getMaxScrollForTransition=a.mobile.getMaxScrollForTransition||g}(a,this),function(a,d){function w(b){!!j&&(!j.closest("."+a.mobile.activePageClass).length||b)&&j.removeClass(a.mobile.activeBtnClass),j=null}function x(){o=!1,n.length>0&&a.mobile.changePage.apply(null,n.pop())}function B(b,c,d,e){c&&c.data("mobile-page")._trigger("beforehide",null,{nextPage:b}),b.data("mobile-page")._trigger("beforeshow",null,{prevPage:c||a("")}),a.mobile.hidePageLoadingMsg(),d=a.mobile._maybeDegradeTransition(d);var f=a.mobile.transitionHandlers[d||"default"]||a.mobile.defaultTransitionHandler,g=f(d,e,b,c);return g.done(function(){c&&c.data("mobile-page")._trigger("hide",null,{nextPage:b}),b.data("mobile-page")._trigger("show",null,{prevPage:c||a("")})}),g}function C(b,c){c&&b.attr("data-"+a.mobile.ns+"role",c),b.page()}function D(){var b=a.mobile.activePage&&F(a.mobile.activePage);return b||s.hrefNoHash}function E(a){while(a){if(typeof a.nodeName=="string"&&a.nodeName.toLowerCase()==="a")break;a=a.parentNode}return a}function F(b){var c=a(b).closest(".ui-page").jqmData("url"),d=s.hrefNoHash;if(!c||!h.isPath(c))c=d;return h.makeUrlAbsolute(c,d)}var e=a.mobile.window,f=a("html"),g=a("head"),h=a.extend(a.mobile.path,{getFilePath:function(b){var c="&"+a.mobile.subPageUrlKey;return b&&b.split(c)[0].split(p)[0]},isFirstPageUrl:function(b){var c=h.parseUrl(h.makeUrlAbsolute(b,this.documentBase)),e=c.hrefNoHash===this.documentUrl.hrefNoHash||this.documentBaseDiffers&&c.hrefNoHash===this.documentBase.hrefNoHash,f=a.mobile.firstPage,g=f&&f[0]?f[0].id:d;return e&&(!c.hash||c.hash==="#"||g&&c.hash.replace(/^#/,"")===g)},isPermittedCrossDomainRequest:function(b,c){return a.mobile.allowCrossDomainPages&&b.protocol==="file:"&&c.search(/^https?:/)!==-1}}),i=null,j=null,k=a.Deferred(),l=a.mobile.navigate.history,m="[tabindex],a,button:visible,select:visible,input",n=[],o=!1,p="&ui-state=dialog",q=g.children("base"),r=h.documentUrl,s=h.documentBase,t=h.documentBaseDiffers,u=a.mobile.getScreenHeight,v=a.support.dynamicBaseTag?{element:q.length?q:a("<base>",{href:s.hrefNoHash}).prependTo(g),set:function(a){a=h.parseUrl(a).hrefNoHash,v.element.attr("href",h.makeUrlAbsolute(a,s))},reset:function(){v.element.attr("href",s.hrefNoSearch)}}:d;a.mobile.getDocumentUrl=h.getDocumentUrl,a.mobile.getDocumentBase=h.getDocumentBase,a.mobile.back=function(){var a=b.navigator;this.phonegapNavigationEnabled&&a&&a.app&&a.app.backHistory?a.app.backHistory():b.history.back()},a.mobile.focusPage=function(a){var b=a.find("[autofocus]"),c=a.find(".ui-title:eq(0)");if(b.length){b.focus();return}c.length?c.focus():a.focus()};var y=!0,z,A;z=function(){if(!y)return;var b=a.mobile.urlHistory.getActive();if(b){var c=e.scrollTop();b.lastScroll=c<a.mobile.minScrollBack?a.mobile.defaultHomeScroll:c}},A=function(){setTimeout(z,100)},e.bind(a.support.pushState?"popstate":"hashchange",function(){y=!1}),e.one(a.support.pushState?"popstate":"hashchange",function(){y=!0}),e.one("pagecontainercreate",function(){a.mobile.pageContainer.bind("pagechange",function(){y=!0,e.unbind("scrollstop",A),e.bind("scrollstop",A)})}),e.bind("scrollstop",A),a.mobile._maybeDegradeTransition=a.mobile._maybeDegradeTransition||function(a){return a},a.mobile.resetActivePageHeight=function(b){var c=a("."+a.mobile.activePageClass),d=parseFloat(c.css("padding-top")),e=parseFloat(c.css("padding-bottom")),f=parseFloat(c.css("border-top-width")),g=parseFloat(c.css("border-bottom-width"));b=typeof b=="number"?b:u(),c.css("min-height",b-d-e-f-g)},a.fn.animationComplete=function(b){return a.support.cssTransitions?a(this).one("webkitAnimationEnd animationend",b):(setTimeout(b,0),a(this))},a.mobile.path=h,a.mobile.base=v,a.mobile.urlHistory=l,a.mobile.dialogHashKey=p,a.mobile.allowCrossDomainPages=!1,a.mobile._bindPageRemove=function(){var b=a(this);!b.data("mobile-page").options.domCache&&b.is(":jqmData(external-page='true')")&&b.bind("pagehide.remove",function(b){var c=a(this),d=new a.Event("pageremove");c.trigger(d),d.isDefaultPrevented()||c.removeWithDependents()})},a.mobile.loadPage=function(b,c){var e=a.Deferred(),f=a.extend({},a.mobile.loadPage.defaults,c),g=null,i=null,j=h.makeUrlAbsolute(b,D());f.data&&f.type==="get"&&(j=h.addSearchParams(j,f.data),f.data=d),f.data&&f.type==="post"&&(f.reloadPage=!0);var k=h.getFilePath(j),l=h.convertUrlToDataUrl(j);f.pageContainer=f.pageContainer||a.mobile.pageContainer,g=f.pageContainer.children("[data-"+a.mobile.ns+"url='"+l+"']"),g.length===0&&l&&!h.isPath(l)&&(g=f.pageContainer.children("#"+l).attr("data-"+a.mobile.ns+"url",l).jqmData("url",l));if(g.length===0)if(a.mobile.firstPage&&h.isFirstPageUrl(k))a.mobile.firstPage.parent().length&&(g=a(a.mobile.firstPage));else if(h.isEmbeddedPage(k))return e.reject(j,c),e.promise();if(g.length){if(!f.reloadPage)return C(g,f.role),e.resolve(j,c,g),e.promise();i=g}var m=f.pageContainer,n=new a.Event("pagebeforeload"),o={url:b,absUrl:j,dataUrl:l,deferred:e,options:f};m.trigger(n,o);if(n.isDefaultPrevented())return e.promise();if(f.showLoadMsg)var p=setTimeout(function(){a.mobile.showPageLoadingMsg()},f.loadMsgDelay),q=function(){clearTimeout(p),a.mobile.hidePageLoadingMsg()};return v&&v.reset(),!a.mobile.allowCrossDomainPages&&!h.isSameDomain(r,j)?e.reject(j,c):a.ajax({url:k,type:f.type,data:f.data,dataType:"html",success:function(d,m,n){var p=a("<div></div>"),r=d.match(/<title[^>]*>([^<]*)/)&&RegExp.$1,s=new RegExp("(<[^>]+\\bdata-"+a.mobile.ns+"role=[\"']?page[\"']?[^>]*>)"),t=new RegExp("\\bdata-"+a.mobile.ns+"url=[\"']?([^\"'>]*)[\"']?");s.test(d)&&RegExp.$1&&t.test(RegExp.$1)&&RegExp.$1&&(b=k=h.getFilePath(a("<div>"+RegExp.$1+"</div>").text())),v&&v.set(k),p.get(0).innerHTML=d,g=p.find(":jqmData(role='page'), :jqmData(role='dialog')").first(),g.length||(g=a("<div data-"+a.mobile.ns+"role='page'>"+(d.split(/<\/?body[^>]*>/gmi)[1]||"")+"</div>")),r&&!g.jqmData("title")&&(~r.indexOf("&")&&(r=a("<div>"+r+"</div>").text()),g.jqmData("title",r));if(!a.support.dynamicBaseTag){var u=h.get(k);g.find("[src], link[href], a[rel='external'], :jqmData(ajax='false'), a[target]").each(function(){var b=a(this).is("[href]")?"href":a(this).is("[src]")?"src":"action",c=a(this).attr(b);c=c.replace(location.protocol+"//"+location.host+location.pathname,""),/^(\w+:|#|\/)/.test(c)||a(this).attr(b,u+c)})}g.attr("data-"+a.mobile.ns+"url",h.convertUrlToDataUrl(k)).attr("data-"+a.mobile.ns+"external-page",!0).appendTo(f.pageContainer),g.one("pagecreate",a.mobile._bindPageRemove),C(g,f.role),j.indexOf("&"+a.mobile.subPageUrlKey)>-1&&(g=f.pageContainer.children("[data-"+a.mobile.ns+"url='"+l+"']")),f.showLoadMsg&&q(),o.xhr=n,o.textStatus=m,o.page=g,f.pageContainer.trigger("pageload",o),e.resolve(j,c,g,i)},error:function(b,d,g){v&&v.set(h.get()),o.xhr=b,o.textStatus=d,o.errorThrown=g;var i=new a.Event("pageloadfailed");f.pageContainer.trigger(i,o);if(i.isDefaultPrevented())return;f.showLoadMsg&&(q(),a.mobile.showPageLoadingMsg(a.mobile.pageLoadErrorMessageTheme,a.mobile.pageLoadErrorMessage,!0),setTimeout(a.mobile.hidePageLoadingMsg,1500)),e.reject(j,c)}}),e.promise()},a.mobile.loadPage.defaults={type:"get",data:d,reloadPage:!1,role:d,showLoadMsg:!1,pageContainer:d,loadMsgDelay:50},a.mobile.changePage=function(b,e){if(o){n.unshift(arguments);return}var f=a.extend({},a.mobile.changePage.defaults,e),g;f.pageContainer=f.pageContainer||a.mobile.pageContainer,f.fromPage=f.fromPage||a.mobile.activePage,g=typeof b=="string";var i=f.pageContainer,j=new a.Event("pagebeforechange"),k={toPage:b,options:f};g?k.absUrl=h.makeUrlAbsolute(b,D()):k.absUrl=b.data("absUrl"),i.trigger(j,k);if(j.isDefaultPrevented())return;b=k.toPage,g=typeof b=="string",o=!0;if(g){f.target=b,a.mobile.loadPage(b,f).done(function(b,c,d,e){o=!1,c.duplicateCachedPage=e,d.data("absUrl",k.absUrl),a.mobile.changePage(d,c)}).fail(function(a,b){o=!1,w(!0),x(),f.pageContainer.trigger("pagechangefailed",k)});return}b[0]===a.mobile.firstPage[0]&&!f.dataUrl&&(f.dataUrl=r.hrefNoHash);var m=f.fromPage,q=f.dataUrl&&h.convertUrlToDataUrl(f.dataUrl)||b.jqmData("url"),s=q,t=h.getFilePath(q),u=l.getActive(),v=l.activeIndex===0,y=0,z=c.title,A=f.role==="dialog"||b.jqmData("role")==="dialog";if(m&&m[0]===b[0]&&!f.allowSamePageTransition){o=!1,i.trigger("pagechange",k),f.fromHashChange&&l.direct({url:q});return}C(b,f.role),f.fromHashChange&&(y=e.direction==="back"?-1:1);try{c.activeElement&&c.activeElement.nodeName.toLowerCase()!=="body"?a(c.activeElement).blur():a("input:focus, textarea:focus, select:focus").blur()}catch(E){}var F=!1;A&&u&&(u.url&&u.url.indexOf(p)>-1&&a.mobile.activePage&&!a.mobile.activePage.is(".ui-dialog")&&l.activeIndex>0&&(f.changeHash=!1,F=!0),q=u.url||"",!F&&q.indexOf("#")>-1?q+=p:q+="#"+p,l.activeIndex===0&&q===l.initialDst&&(q+=p));var G=u?b.jqmData("title")||b.children(":jqmData(role='header')").find(".ui-title").getEncodedText():z;!!G&&z===c.title&&(z=G),b.jqmData("title")||b.jqmData("title",z),f.transition=f.transition||(y&&!v?u.transition:d)||(A?a.mobile.defaultDialogTransition:a.mobile.defaultPageTransition),!y&&F&&(l.getActive().pageUrl=s);if(q&&!f.fromHashChange){var H;!h.isPath(q)&&q.indexOf("#")<0&&(q="#"+q),H={transition:f.transition,title:z,pageUrl:s,role:f.role},f.changeHash!==!1&&a.mobile.hashListeningEnabled?a.mobile.navigate(q,H,!0):b[0]!==a.mobile.firstPage[0]&&a.mobile.navigate.history.add(q,H)}c.title=z,a.mobile.activePage=b,f.reverse=f.reverse||y<0,B(b,m,f.transition,f.reverse).done(function(c,d,e,g,h){w(),f.duplicateCachedPage&&f.duplicateCachedPage.remove(),h||a.mobile.focusPage(b),x(),i.trigger("pagechange",k)})},a.mobile.changePage.defaults={transition:d,reverse:!1,changeHash:!0,fromHashChange:!1,role:d,duplicateCachedPage:d,pageContainer:d,showLoadMsg:!0,dataUrl:d,fromPage:d,allowSamePageTransition:!1},a.mobile.navreadyDeferred=a.Deferred(),a.mobile._registerInternalEvents=function(){var c=function(b,c){var d,e,f,g=!0,j,k;return!a.mobile.ajaxEnabled||b.is(":jqmData(ajax='false')")||!b.jqmHijackable().length?!1:(e=b.attr("target"),f=b.attr("action"),f||(f=F(b),f===s.hrefNoHash&&(f=r.hrefNoSearch)),f=h.makeUrlAbsolute(f,F(b)),h.isExternal(f)&&!h.isPermittedCrossDomainRequest(r,f)||e?!1:(c||(d=b.attr("method"),j=b.serializeArray(),i&&i[0].form===b[0]&&(k=i.attr("name"),k&&(a.each(j,function(a,b){if(b.name===k)return k="",!1}),k&&j.push({name:k,value:i.attr("value")}))),g={url:f,options:{type:d&&d.length&&d.toLowerCase()||"get",data:a.param(j),transition:b.jqmData("transition"),reverse:b.jqmData("direction")==="reverse",reloadPage:!0}}),g))};a.mobile.document.delegate("form","submit",function(b){var d=c(a(this));d&&(a.mobile.changePage(d.url,d.options),b.preventDefault())}),a.mobile.document.bind("vclick",function(b){var d,e,f=b.target,g=!1;if(b.which>1||!a.mobile.linkBindingEnabled)return;i=a(f);if(a.data(f,"mobile-button")){if(!c(a(f).closest("form"),!0))return;f.parentNode&&(f=f.parentNode)}else{f=E(f);if(!f||h.parseUrl(f.getAttribute("href")||"#").hash==="#")return;if(!a(f).jqmHijackable().length)return}~f.className.indexOf("ui-link-inherit")?f.parentNode&&(e=a.data(f.parentNode,"buttonElements")):e=a.data(f,"buttonElements"),e?f=e.outer:g=!0,d=a(f),g&&(d=d.closest(".ui-btn")),d.length>0&&!d.hasClass("ui-disabled")&&(w(!0),j=d,j.addClass(a.mobile.activeBtnClass))}),a.mobile.document.bind("click",function(c){if(!a.mobile.linkBindingEnabled||c.isDefaultPrevented())return;var e=E(c.target),f=a(e),g;if(!e||c.which>1||!f.jqmHijackable().length)return;g=function(){b.setTimeout(function(){w(!0)},200)};if(f.is(":jqmData(rel='back')"))return a.mobile.back(),!1;var i=F(f),j=h.makeUrlAbsolute(f.attr("href")||"#",i);if(!a.mobile.ajaxEnabled&&!h.isEmbeddedPage(j)){g();return}if(j.search("#")!==-1){j=j.replace(/[^#]*#/,"");if(!j){c.preventDefault();return}h.isPath(j)?j=h.makeUrlAbsolute(j,i):j=h.makeUrlAbsolute("#"+j,r.hrefNoHash)}var k=f.is("[rel='external']")||f.is(":jqmData(ajax='false')")||f.is("[target]"),l=k||h.isExternal(j)&&!h.isPermittedCrossDomainRequest(r,j);if(l){g();return}var m=f.jqmData("transition"),n=f.jqmData("direction")==="reverse"||f.jqmData("back"),o=f.attr("data-"+a.mobile.ns+"rel")||d;a.mobile.changePage(j,{transition:m,reverse:n,role:o,link:f}),c.preventDefault()}),a.mobile.document.delegate(".ui-page","pageshow.prefetch",function(){var b=[];a(this).find("a:jqmData(prefetch)").each(function(){var c=a(this),d=c.attr("href");d&&a.inArray(d,b)===-1&&(b.push(d),a.mobile.loadPage(d,{role:c.attr("data-"+a.mobile.ns+"rel")}))})}),a.mobile._handleHashChange=function(c,e){var f=h.stripHash(c),g=a.mobile.urlHistory.stack.length===0?"none":d,i={changeHash:!1,fromHashChange:!0,reverse:e.direction==="back"};a.extend(i,e,{transition:(l.getLast()||{}).transition||g});if(l.activeIndex>0&&f.indexOf(p)>-1&&l.initialDst!==f){if(a.mobile.activePage&&!a.mobile.activePage.is(".ui-dialog")){e.direction==="back"?a.mobile.back():b.history.forward();return}f=e.pageUrl;var j=a.mobile.urlHistory.getActive();a.extend(i,{role:j.role,transition:j.transition,reverse:e.direction==="back"})}f?(f=h.isPath(f)?f:h.makeUrlAbsolute("#"+f,s),f===h.makeUrlAbsolute("#"+l.initialDst,s)&&l.stack.length&&l.stack[0].url!==l.initialDst.replace(p,"")&&(f=a.mobile.firstPage),a.mobile.changePage(f,i)):a.mobile.changePage(a.mobile.firstPage,i)},e.bind("navigate",function(b,c){var d=a.event.special.navigate.originalEventName.indexOf("hashchange")>-1?c.state.hash:c.state.url;d||(d=a.mobile.path.parseLocation().hash);if(!d||d==="#"||d.indexOf("#"+a.mobile.path.uiStateKey)===0)d=location.href;a.mobile._handleHashChange(d,c.state)}),a.mobile.document.bind("pageshow",a.mobile.resetActivePageHeight),a.mobile.window.bind("throttledresize",a.mobile.resetActivePageHeight)},a(function(){k.resolve()}),a.when(k,a.mobile.navreadyDeferred).done(function(){a.mobile._registerInternalEvents()})}(a),function(a,b,c){a.mobile.transitionFallbacks.flip="fade"}(a,this),function(a,b,c){a.mobile.transitionFallbacks.flow="fade"}(a,this),function(a,b,c){a.mobile.transitionFallbacks.pop="fade"}(a,this),function(a,b,c){a.mobile.transitionHandlers.slide=a.mobile.transitionHandlers.simultaneous,a.mobile.transitionFallbacks.slide="fade"}(a,this),function(a,b,c){a.mobile.transitionFallbacks.slidedown="fade"}(a,this),function(a,b,c){a.mobile.transitionFallbacks.slidefade="fade"}(a,this),function(a,b,c){a.mobile.transitionFallbacks.slideup="fade"}(a,this),function(a,b,c){a.mobile.transitionFallbacks.turn="fade"}(a,this),function(a,b){a.mobile.page.prototype.options.degradeInputs={color:!1,date:!1,datetime:!1,"datetime-local":!1,email:!1,month:!1,number:!1,range:"number",search:"text",tel:!1,time:!1,url:!1,week:!1},a.mobile.document.bind("pagecreate create",function(b){var c=a.mobile.closestPageData(a(b.target)),d;if(!c)return;d=c.options,a(b.target).find("input").not(c.keepNativeSelector()).each(function(){var b=a(this),c=this.getAttribute("type"),e=d.degradeInputs[c]||"text";if(d.degradeInputs[c]){var f=a("<div>").html(b.clone()).html(),g=f.indexOf(" type=")>-1,h=g?/\s+type=["']?\w+['"]?/:/\/?>/,i=' type="'+e+'" data-'+a.mobile.ns+'type="'+c+'"'+(g?"":">");b.replaceWith(f.replace(h,i))}})})}(a),function(a,b,c){a.widget("mobile.dialog",a.mobile.widget,{options:{closeBtn:"left",closeBtnText:"Close",overlayTheme:"a",corners:!0,initSelector:":jqmData(role='dialog')"},_handlePageBeforeShow:function(){this._isCloseable=!0,this.options.overlayTheme&&this.element.page("removeContainerBackground").page("setContainerBackground",this.options.overlayTheme)},_create:function(){var b=this,c=this.element,d=this.options.corners?" ui-corner-all":"",e=a("<div/>",{role:"dialog","class":"ui-dialog-contain ui-overlay-shadow"+d});c.addClass("ui-dialog ui-overlay-"+this.options.overlayTheme),c.wrapInner(e),c.bind("vclick submit",function(b){var c=a(b.target).closest(b.type==="vclick"?"a":"form"),d;c.length&&!c.jqmData("transition")&&(d=a.mobile.urlHistory.getActive()||{},c.attr("data-"+a.mobile.ns+"transition",d.transition||a.mobile.defaultDialogTransition).attr("data-"+a.mobile.ns+"direction","reverse"))}),this._on(c,{pagebeforeshow:"_handlePageBeforeShow"}),a.extend(this,{_createComplete:!1}),this._setCloseBtn(this.options.closeBtn)},_setCloseBtn:function(b){var c=this,d,e;this._headerCloseButton&&(this._headerCloseButton.remove(),this._headerCloseButton=null),b!=="none"&&(e=b==="left"?"left":"right",d=a("<a href='#' class='ui-btn-"+e+"' data-"+a.mobile.ns+"icon='delete' data-"+a.mobile.ns+"iconpos='notext'>"+this.options.closeBtnText+"</a>"),this.element.children().find(":jqmData(role='header')").first().prepend(d),this._createComplete&&a.fn.buttonMarkup&&d.buttonMarkup(),this._createComplete=!0,d.bind("click",function(){c.close()}),this._headerCloseButton=d)},_setOption:function(b,c){b==="closeBtn"&&(this._setCloseBtn(c),this._super(b,c),this.element.attr("data-"+(a.mobile.ns||"")+"close-btn",c))},close:function(){var b,c,d=a.mobile.navigate.history;this._isCloseable&&(this._isCloseable=!1,a.mobile.hashListeningEnabled&&d.activeIndex>0?a.mobile.back():(b=Math.max(0,d.activeIndex-1),c=d.stack[b].pageUrl||d.stack[b].url,d.previousIndex=d.activeIndex,d.activeIndex=b,a.mobile.path.isPath(c)||(c=a.mobile.path.makeUrlAbsolute("#"+c)),a.mobile.changePage(c,{direction:"back",changeHash:!1,fromHashChange:!0})))}}),a.mobile.document.delegate(a.mobile.dialog.prototype.options.initSelector,"pagecreate",function(){a.mobile.dialog.prototype.enhance(this)})}(a,this),function(a,b){a.mobile.page.prototype.options.backBtnText="Back",a.mobile.page.prototype.options.addBackBtn=!1,a.mobile.page.prototype.options.backBtnTheme=null,a.mobile.page.prototype.options.headerTheme="a",a.mobile.page.prototype.options.footerTheme="a",a.mobile.page.prototype.options.contentTheme=null,a.mobile.document.bind("pagecreate",function(b){var c=a(b.target),d=c.data("mobile-page").options,e=c.jqmData("role"),f=d.theme;a(":jqmData(role='header'), :jqmData(role='footer'), :jqmData(role='content')",c).jqmEnhanceable().each(function(){var b=a(this),g=b.jqmData("role"),h=b.jqmData("theme"),i=h||d.contentTheme||e==="dialog"&&f,j,k,l,m;b.addClass("ui-"+g);if(g==="header"||g==="footer"){var n=h||(g==="header"?d.headerTheme:d.footerTheme)||f;b.addClass("ui-bar-"+n).attr("role",g==="header"?"banner":"contentinfo"),g==="header"&&(j=b.children("a, button"),k=j.hasClass("ui-btn-left"),l=j.hasClass("ui-btn-right"),k=k||j.eq(0).not(".ui-btn-right").addClass("ui-btn-left").length,l=l||j.eq(1).addClass("ui-btn-right").length),d.addBackBtn&&g==="header"&&a(".ui-page").length>1&&c.jqmData("url")!==a.mobile.path.stripHash(location.hash)&&!k&&(m=a("<a href='javascript:void(0);' class='ui-btn-left' data-"+a.mobile.ns+"rel='back' data-"+a.mobile.ns+"icon='arrow-l'>"+d.backBtnText+"</a>").attr("data-"+a.mobile.ns+"theme",d.backBtnTheme||n).prependTo(b)),b.children("h1, h2, h3, h4, h5, h6").addClass("ui-title").attr({role:"heading","aria-level":"1"})}else g==="content"&&(i&&b.addClass("ui-body-"+i),b.attr("role","main"))})})}(a),function(a,b){a.mobile.behaviors.addFirstLastClasses={_getVisibles:function(a,b){var c;return b?c=a.not(".ui-screen-hidden"):(c=a.filter(":visible"),c.length===0&&(c=a.not(".ui-screen-hidden"))),c},_addFirstLastClasses:function(a,b,c){a.removeClass("ui-first-child ui-last-child"),b.eq(0).addClass("ui-first-child").end().last().addClass("ui-last-child"),c||this.element.trigger("updatelayout")}}}(a),function(a,b){a.fn.fieldcontain=function(a){return this.addClass("ui-field-contain ui-body ui-br").contents().filter(function(){return this.nodeType===3&&!/\S/.test(this.nodeValue)}).remove()},a(c).bind("pagecreate create",function(b){a(":jqmData(role='fieldcontain')",b.target).jqmEnhanceable().fieldcontain()})}(a),function(a,b){a.fn.grid=function(b){return this.each(function(){var c=a(this),d=a.extend({grid:null},b),e=c.children(),f={solo:1,a:2,b:3,c:4,d:5},g=d.grid,h;if(!g)if(e.length<=5)for(var i in f)f[i]===e.length&&(g=i);else g="a",c.addClass("ui-grid-duo");h=f[g],c.addClass("ui-grid-"+g),e.filter(":nth-child("+h+"n+1)").addClass("ui-block-a"),h>1&&e.filter(":nth-child("+h+"n+2)").addClass("ui-block-b"),h>2&&e.filter(":nth-child("+h+"n+3)").addClass("ui-block-c"),h>3&&e.filter(":nth-child("+h+"n+4)").addClass("ui-block-d"),h>4&&e.filter(":nth-child("+h+"n+5)").addClass("ui-block-e")})}}(a),function(a,b){a(c).bind("pagecreate create",function(b){a(":jqmData(role='nojs')",b.target).addClass("ui-nojs")})}(a),function(a,b){a.mobile.behaviors.formReset={_handleFormReset:function(){this._on(this.element.closest("form"),{reset:function(){this._delay("_reset")}})}}}(a),function(a,b){function e(a){var b;while(a){b=typeof a.className=="string"&&a.className+" ";if(b&&b.indexOf("ui-btn ")>-1&&b.indexOf("ui-disabled ")<0)break;a=a.parentNode}return a}function f(d,e,f,g,h){var i=a.data(d[0],"buttonElements");d.removeClass(e).addClass(f),i&&(i.bcls=a(c.createElement("div")).addClass(i.bcls+" "+f).removeClass(e).attr("class"),g!==b&&(i.hover=g),i.state=h)}var d=function(a,c){var d=a.getAttribute(c);return d==="true"?!0:d==="false"?!1:d===null?b:d};a.fn.buttonMarkup=function(e){var f=this,h="data-"+a.mobile.ns,i;e=e&&a.type(e)==="object"?e:{};for(var j=0;j<f.length;j++){var k=f.eq(j),l=k[0],m=a.extend({},a.fn.buttonMarkup.defaults,{icon:e.icon!==b?e.icon:d(l,h+"icon"),iconpos:e.iconpos!==b?e.iconpos:d(l,h+"iconpos"),theme:e.theme!==b?e.theme:d(l,h+"theme")||a.mobile.getInheritedTheme(k,"c"),inline:e.inline!==b?e.inline:d(l,h+"inline"),shadow:e.shadow!==b?e.shadow:d(l,h+"shadow"),corners:e.corners!==b?e.corners:d(l,h+"corners"),iconshadow:e.iconshadow!==b?e.iconshadow:d(l,h+"iconshadow"),mini:e.mini!==b?e.mini:d(l,h+"mini")},e),n="ui-btn-inner",o="ui-btn-text",p,q,r=!1,s="up",t,u,v,w;for(i in m)l.setAttribute(h+i,m[i]);d(l,h+"rel")==="popup"&&k.attr("href")&&(l.setAttribute("aria-haspopup",!0),l.setAttribute("aria-owns",k.attr("href"))),w=a.data(l.tagName==="INPUT"||l.tagName==="BUTTON"?l.parentNode:l,"buttonElements"),w?(l=w.outer,k=a(l),t=w.inner,u=w.text,a(w.icon).remove(),w.icon=null,r=w.hover,s=w.state):(t=c.createElement(m.wrapperEls),u=c.createElement(m.wrapperEls)),v=m.icon?c.createElement("span"):null,g&&!w&&g(),m.theme||(m.theme=a.mobile.getInheritedTheme(k,"c")),p="ui-btn ",p+=r?"ui-btn-hover-"+m.theme:"",p+=s?" ui-btn-"+s+"-"+m.theme:"",p+=m.shadow?" ui-shadow":"",p+=m.corners?" ui-btn-corner-all":"",m.mini!==b&&(p+=m.mini===!0?" ui-mini":" ui-fullsize"),m.inline!==b&&(p+=m.inline===!0?" ui-btn-inline":" ui-btn-block"),m.icon&&(m.icon="ui-icon-"+m.icon,m.iconpos=m.iconpos||"left",q="ui-icon "+m.icon,m.iconshadow&&(q+=" ui-icon-shadow")),m.iconpos&&(p+=" ui-btn-icon-"+m.iconpos,m.iconpos==="notext"&&!k.attr("title")&&k.attr("title",k.getEncodedText())),m.iconpos&&m.iconpos==="notext"&&!k.attr("title")&&k.attr("title",k.getEncodedText()),w&&k.removeClass(w.bcls||""),k.removeClass("ui-link").addClass(p),t.className=n,u.className=o,w||t.appendChild(u);if(v){v.className=q;if(!w||!w.icon)v.innerHTML="&#160;",t.appendChild(v)}while(l.firstChild&&!w)u.appendChild(l.firstChild);w||l.appendChild(t),w={hover:r,state:s,bcls:p,outer:l,inner:t,text:u,icon:v},a.data(l,"buttonElements",w),a.data(t,"buttonElements",w),a.data(u,"buttonElements",w),v&&a.data(v,"buttonElements",w)}return this},a.fn.buttonMarkup.defaults={corners:!0,shadow:!0,iconshadow:!0,wrapperEls:"span"};var g=function(){var c=a.mobile.buttonMarkup.hoverDelay,d,h;a.mobile.document.bind({"vmousedown vmousecancel vmouseup vmouseover vmouseout focus blur scrollstart":function(g){var i,j=a(e(g.target)),k=g.originalEvent&&/^touch/.test(g.originalEvent.type),l=g.type;if(j.length){i=j.attr("data-"+a.mobile.ns+"theme");if(l==="vmousedown")k?d=setTimeout(function(){f(j,"ui-btn-up-"+i,"ui-btn-down-"+i,b,"down")},c):f(j,"ui-btn-up-"+i,"ui-btn-down-"+i,b,"down");else if(l==="vmousecancel"||l==="vmouseup")f(j,"ui-btn-down-"+i,"ui-btn-up-"+i,b,"up");else if(l==="vmouseover"||l==="focus")k?h=setTimeout(function(){f(j,"ui-btn-up-"+i,"ui-btn-hover-"+i,!0,"")},c):f(j,"ui-btn-up-"+i,"ui-btn-hover-"+i,!0,"");else if(l==="vmouseout"||l==="blur"||l==="scrollstart")f(j,"ui-btn-hover-"+i+" ui-btn-down-"+i,"ui-btn-up-"+i,!1,"up"),d&&clearTimeout(d),h&&clearTimeout(h)}},"focusin focus":function(b){a(e(b.target)).addClass(a.mobile.focusClass)},"focusout blur":function(b){a(e(b.target)).removeClass(a.mobile.focusClass)}}),g=null};a.mobile.document.bind("pagecreate create",function(b){a(":jqmData(role='button'), .ui-bar > a, .ui-header > a, .ui-footer > a, .ui-bar > :jqmData(role='controlgroup') > a",b.target).jqmEnhanceable().not("button, input, .ui-btn, :jqmData(role='none'), :jqmData(role='nojs')").buttonMarkup()})}(a),function(a,b){a.widget("mobile.collapsible",a.mobile.widget,{options:{expandCueText:" click to expand contents",collapseCueText:" click to collapse contents",collapsed:!0,heading:"h1,h2,h3,h4,h5,h6,legend",collapsedIcon:"plus",expandedIcon:"minus",iconpos:"left",theme:null,contentTheme:null,inset:!0,corners:!0,mini:!1,initSelector:":jqmData(role='collapsible')"},_create:function(){var c=this.element,d=this.options,e=c.addClass("ui-collapsible"),f=c.children(d.heading).first(),g=e.wrapInner("<div class='ui-collapsible-content'></div>").children(".ui-collapsible-content"),h=c.closest(":jqmData(role='collapsible-set')").addClass("ui-collapsible-set"),i="";f.is("legend")&&(f=a("<div role='heading'>"+f.html()+"</div>").insertBefore(f),f.next().remove()),h.length?(d.theme||(d.theme=h.jqmData("theme")||a.mobile.getInheritedTheme(h,"c")),d.contentTheme||(d.contentTheme=h.jqmData("content-theme")),d.collapsedIcon=c.jqmData("collapsed-icon")||h.jqmData("collapsed-icon")||d.collapsedIcon,d.expandedIcon=c.jqmData("expanded-icon")||h.jqmData("expanded-icon")||d.expandedIcon,d.iconpos=c.jqmData("iconpos")||h.jqmData("iconpos")||d.iconpos,h.jqmData("inset")!==b?d.inset=h.jqmData("inset"):d.inset=!0,d.corners=!1,d.mini||(d.mini=h.jqmData("mini"))):d.theme||(d.theme=a.mobile.getInheritedTheme(c,"c")),!d.inset||(i+=" ui-collapsible-inset",!d.corners||(i+=" ui-corner-all")),d.contentTheme&&(i+=" ui-collapsible-themed-content",g.addClass("ui-body-"+d.contentTheme)),i!==""&&e.addClass(i),f.insertBefore(g).addClass("ui-collapsible-heading").append("<span class='ui-collapsible-heading-status'></span>").wrapInner("<a href='#' class='ui-collapsible-heading-toggle'></a>").find("a").first().buttonMarkup({shadow:!1,corners:!1,iconpos:d.iconpos,icon:d.collapsedIcon,mini:d.mini,theme:d.theme}),e.bind("expand collapse",function(b){if(!b.isDefaultPrevented()){var c=a(this),e=b.type==="collapse";b.preventDefault(),f.toggleClass("ui-collapsible-heading-collapsed",e).find(".ui-collapsible-heading-status").text(e?d.expandCueText:d.collapseCueText).end().find(".ui-icon").toggleClass("ui-icon-"+d.expandedIcon,!e).toggleClass("ui-icon-"+d.collapsedIcon,e||d.expandedIcon===d.collapsedIcon).end().find("a").first().removeClass(a.mobile.activeBtnClass),c.toggleClass("ui-collapsible-collapsed",e),g.toggleClass("ui-collapsible-content-collapsed",e).attr("aria-hidden",e),g.trigger("updatelayout")}}).trigger(d.collapsed?"collapse":"expand"),f.bind("tap",function(b){f.find("a").first().addClass(a.mobile.activeBtnClass)}).bind("click",function(a){var b=f.is(".ui-collapsible-heading-collapsed")?"expand":"collapse";e.trigger(b),a.preventDefault(),a.stopPropagation()})}}),a.mobile.document.bind("pagecreate create",function(b){a.mobile.collapsible.prototype.enhanceWithin(b.target)})}(a),function(a,b){a.widget("mobile.collapsibleset",a.mobile.widget,{options:{initSelector:":jqmData(role='collapsible-set')"},_create:function(){var c=this.element.addClass("ui-collapsible-set"),d=this.options;d.theme||(d.theme=a.mobile.getInheritedTheme(c,"c")),d.contentTheme||(d.contentTheme=c.jqmData("content-theme")),d.corners||(d.corners=c.jqmData("corners")),c.jqmData("inset")!==b&&(d.inset=c.jqmData("inset")),d.inset=d.inset!==b?d.inset:!0,d.corners=d.corners!==b?d.corners:!0,!!d.corners&&!!d.inset&&c.addClass("ui-corner-all"),c.jqmData("collapsiblebound")||c.jqmData("collapsiblebound",!0).bind("expand",function(b){var c=a(b.target).closest(".ui-collapsible");c.parent().is(":jqmData(role='collapsible-set')")&&c.siblings(".ui-collapsible").trigger("collapse")})},_init:function(){var a=this.element,b=a.children(":jqmData(role='collapsible')"),c=b.filter(":jqmData(collapsed='false')");this._refresh("true"),c.trigger("expand")},_refresh:function(b){var c=this.element.children(":jqmData(role='collapsible')");a.mobile.collapsible.prototype.enhance(c.not(".ui-collapsible")),this._addFirstLastClasses(c,this._getVisibles(c,b),b)},refresh:function(){this._refresh(!1)}}),a.widget("mobile.collapsibleset",a.mobile.collapsibleset,a.mobile.behaviors.addFirstLastClasses),a.mobile.document.bind("pagecreate create",function(b){a.mobile.collapsibleset.prototype.enhanceWithin(b.target)})}(a),function(a,b){a.widget("mobile.navbar",a.mobile.widget,{options:{iconpos:"top",grid:null,initSelector:":jqmData(role='navbar')"},_create:function(){var d=this.element,e=d.find("a"),f=e.filter(":jqmData(icon)").length?this.options.iconpos:b;d.addClass("ui-navbar ui-mini").attr("role","navigation").find("ul").jqmEnhanceable().grid({grid:this.options.grid}),e.buttonMarkup({corners:!1,shadow:!1,inline:!0,iconpos:f}),d.delegate("a","vclick",function(b){if(!a(b.target).hasClass("ui-disabled")){e.removeClass(a.mobile.activeBtnClass),a(this).addClass(a.mobile.activeBtnClass);var d=a(this);a(c).one("pagechange",function(b){d.removeClass(a.mobile.activeBtnClass)})}}),d.closest(".ui-page").bind("pagebeforeshow",function(){e.filter(".ui-state-persist").addClass(a.mobile.activeBtnClass)})}}),a.mobile.document.bind("pagecreate create",function(b){a.mobile.navbar.prototype.enhanceWithin(b.target)})}(a),function(a,b){var d={};a.widget("mobile.listview",a.mobile.widget,{options:{theme:null,countTheme:"c",headerTheme:"b",dividerTheme:"b",icon:"arrow-r",splitIcon:"arrow-r",splitTheme:"b",corners:!0,shadow:!0,inset:!1,initSelector:":jqmData(role='listview')"},_create:function(){var a=this,b="";b+=a.options.inset?" ui-listview-inset":"",!a.options.inset||(b+=a.options.corners?" ui-corner-all":"",b+=a.options.shadow?" ui-shadow":""),a.element.addClass(function(a,c){return c+" ui-listview"+b}),a.refresh(!0)},_findFirstElementByTagName:function(a,b,c,d){var e={};e[c]=e[d]=!0;while(a){if(e[a.nodeName])return a;a=a[b]}return null},_getChildrenByTagName:function(b,c,d){var e=[],f={};f[c]=f[d]=!0,b=b.firstChild;while(b)f[b.nodeName]&&e.push(b),b=b.nextSibling;return a(e)},_addThumbClasses:function(b){var c,d,e=b.length;for(c=0;c<e;c++)d=a(this._findFirstElementByTagName(b[c].firstChild,"nextSibling","img","IMG")),d.length&&(d.addClass("ui-li-thumb"),a(this._findFirstElementByTagName(d[0].parentNode,"parentNode","li","LI")).addClass(d.is(".ui-li-icon")?"ui-li-has-icon":"ui-li-has-thumb"))},refresh:function(b){this.parentPage=this.element.closest(".ui-page"),this._createSubPages();var d=this.options,e=this.element,f=this,g=e.jqmData("dividertheme")||d.dividerTheme,h=e.jqmData("splittheme"),i=e.jqmData("spliticon"),j=e.jqmData("icon"),k=this._getChildrenByTagName(e[0],"li","LI"),l=!!a.nodeName(e[0],"ol"),m=!a.support.cssPseudoElement,n=e.attr("start"),o={},p,q,r,s,t,u,v,w,x,y,z,A,B,C;l&&m&&e.find(".ui-li-dec").remove(),l&&(n||n===0?m?v=parseInt(n,10):(w=parseInt(n,10)-1,e.css("counter-reset","listnumbering "+w)):m&&(v=1)),d.theme||(d.theme=a.mobile.getInheritedTheme(this.element,"c"));for(var D=0,E=k.length;D<E;D++){p=k.eq(D),q="ui-li";if(b||!p.hasClass("ui-li")){r=p.jqmData("theme")||d.theme,s=this._getChildrenByTagName(p[0],"a","A");var F=p.jqmData("role")==="list-divider";s.length&&!F?(z=p.jqmData("icon"),p.buttonMarkup({wrapperEls:"div",shadow:!1,corners:!1,iconpos:"right",icon:s.length>1||z===!1?!1:z||j||d.icon,theme:r}),z!==!1&&s.length===1&&p.addClass("ui-li-has-arrow"),s.first().removeClass("ui-link").addClass("ui-link-inherit"),s.length>1&&(q+=" ui-li-has-alt",t=s.last(),u=h||t.jqmData("theme")||d.splitTheme,C=t.jqmData("icon"),t.appendTo(p).attr("title",a.trim(t.getEncodedText())).addClass("ui-li-link-alt").empty().buttonMarkup({shadow:!1,corners:!1,theme:r,icon:!1,iconpos:"notext"}).find(".ui-btn-inner").append(a(c.createElement("span")).buttonMarkup({shadow:!0,corners:!0,theme:u,iconpos:"notext",icon:C||z||i||d.splitIcon})))):F?(q+=" ui-li-divider ui-bar-"+(p.jqmData("theme")||g),p.attr("role","heading"),l&&(n||n===0?m?v=parseInt(n,10):(x=parseInt(n,10)-1,p.css("counter-reset","listnumbering "+x)):m&&(v=1))):q+=" ui-li-static ui-btn-up-"+r}l&&m&&q.indexOf("ui-li-divider")<0&&(y=q.indexOf("ui-li-static")>0?p:p.find(".ui-link-inherit"),y.addClass("ui-li-jsnumbering").prepend("<span class='ui-li-dec'>"+v++ +". </span>")),o[q]||(o[q]=[]),o[q].push(p[0])}for(q in o)a(o[q]).addClass(q).children(".ui-btn-inner").addClass(q);e.find("h1, h2, h3, h4, h5, h6").addClass("ui-li-heading").end().find("p, dl").addClass("ui-li-desc").end().find(".ui-li-aside").each(function(){var b=a(this);b.prependTo(b.parent())}).end().find(".ui-li-count").each(function(){a(this).closest("li").addClass("ui-li-has-count")}).addClass("ui-btn-up-"+(e.jqmData("counttheme")||this.options.countTheme)+" ui-btn-corner-all"),this._addThumbClasses(k),this._addThumbClasses(e.find(".ui-link-inherit")),this._addFirstLastClasses(k,this._getVisibles(k,b),b),this._trigger("afterrefresh")},_idStringEscape:function(a){return a.replace(/[^a-zA-Z0-9]/g,"-")},_createSubPages:function(){var b=this.element,c=b.closest(".ui-page"),e=c.jqmData("url"),f=e||c[0][a.expando],g=b.attr("id"),h=this.options,i="data-"+a.mobile.ns,j=this,k=c.find(":jqmData(role='footer')").jqmData("id"),l;typeof d[f]=="undefined"&&(d[f]=-1),g=g||++d[f],a(b.find("li>ul, li>ol").toArray().reverse()).each(function(c){var d=this,f=a(this),j=f.attr("id")||g+"-"+c,m=f.parent(),n=a(f.prevAll().toArray().reverse()),p=n.length?n:a("<span>"+a.trim(m.contents()[0].nodeValue)+"</span>"),q=p.first().getEncodedText(),r=(e||"")+"&"+a.mobile.subPageUrlKey+"="+j,s=f.jqmData("theme")||h.theme,t=f.jqmData("counttheme")||b.jqmData("counttheme")||h.countTheme,u,v;l=!0,u=f.detach().wrap("<div "+i+"role='page' "+i+"url='"+r+"' "+i+"theme='"+s+"' "+i+"count-theme='"+t+"'><div "+i+"role='content'></div></div>").parent().before("<div "+i+"role='header' "+i+"theme='"+h.headerTheme+"'><div class='ui-title'>"+q+"</div></div>").after(k?a("<div "+i+"role='footer' "+i+"id='"+k+"'>"):"").parent().appendTo(a.mobile.pageContainer),u.page(),v=m.find("a:first"),v.length||(v=a("<a/>").html(p||q).prependTo(m.empty())),v.attr("href","#"+r)}).listview();if(l&&c.is(":jqmData(external-page='true')")&&c.data("mobile-page").options.domCache===!1){var m=function(b,d){var f=d.nextPage,g,h=new a.Event("pageremove");d.nextPage&&(g=f.jqmData("url"),g.indexOf(e+"&"+a.mobile.subPageUrlKey)!==0&&(j.childPages().remove(),c.trigger(h),h.isDefaultPrevented()||c.removeWithDependents()))};c.unbind("pagehide.remove").bind("pagehide.remove",m)}},childPages:function(){var b=this.parentPage.jqmData("url");return a(":jqmData(url^='"+b+"&"+a.mobile.subPageUrlKey+"')")}}),a.widget("mobile.listview",a.mobile.listview,a.mobile.behaviors.addFirstLastClasses),a.mobile.document.bind("pagecreate create",function(b){a.mobile.listview.prototype.enhanceWithin(b.target)})}(a),function(a,b){a.mobile.listview.prototype.options.autodividers=!1,a.mobile.listview.prototype.options.autodividersSelector=function(b){var c=a.trim(b.text())||null;return c?(c=c.slice(0,1).toUpperCase(),c):null},a.mobile.document.delegate("ul,ol","listviewcreate",function(){var b=a(this),d=b.data("mobile-listview");if(!d||!d.options.autodividers)return;var e=function(){b.find("li:jqmData(role='list-divider')").remove();var e=b.find("li"),f=null,g,h;for(var i=0;i<e.length;i++){g=e[i],h=d.options.autodividersSelector(a(g));if(h&&f!==h){var j=c.createElement("li");j.appendChild(c.createTextNode(h)),j.setAttribute("data-"+a.mobile.ns+"role","list-divider"),g.parentNode.insertBefore(j,g)}f=h}},f=function(){b.unbind("listviewafterrefresh",f),e(),d.refresh(),b.bind("listviewafterrefresh",f)};f()})}(a),function(a,b){a.widget("mobile.checkboxradio",a.mobile.widget,{options:{theme:null,mini:!1,initSelector:"input[type='checkbox'],input[type='radio']"},_create:function(){var b=this,d=this.element,e=this.options,f=function(a,b){return a.jqmData(b)||a.closest("form, fieldset").jqmData(b)},g=a(d).closest("label"),h=g.length?g:a(d).closest("form, fieldset, :jqmData(role='page'), :jqmData(role='dialog')").find("label").filter("[for='"+d[0].id+"']").first(),i=d[0].type,j=f(d,"mini")||e.mini,k=i+"-on",l=i+"-off",m=f(d,"iconpos"),n="ui-"+k,o="ui-"+l;if(i!=="checkbox"&&i!=="radio")return;a.extend(this,{label:h,inputtype:i,checkedClass:n,uncheckedClass:o,checkedicon:k,uncheckedicon:l}),e.theme||(e.theme=a.mobile.getInheritedTheme(this.element,"c")),h.buttonMarkup({theme:e.theme,icon:l,shadow:!1,mini:j,iconpos:m});var p=c.createElement("div");p.className="ui-"+i,d.add(h).wrapAll(p),h.bind({vmouseover:function(b){a(this).parent().is(".ui-disabled")&&b.stopPropagation()},vclick:function(a){if(d.is(":disabled")){a.preventDefault();return}return b._cacheVals(),d.prop("checked",i==="radio"&&!0||!d.prop("checked")),d.triggerHandler("click"),b._getInputSet().not(d).prop("checked",!1),b._updateAll(),!1}}),d.bind({vmousedown:function(){b._cacheVals()},vclick:function(){var c=a(this);c.is(":checked")?(c.prop("checked",!0),b._getInputSet().not(c).prop("checked",!1)):c.prop("checked",!1),b._updateAll()},focus:function(){h.addClass(a.mobile.focusClass)},blur:function(){h.removeClass(a.mobile.focusClass)}}),this._handleFormReset&&this._handleFormReset(),this.refresh()},_cacheVals:function(){this._getInputSet().each(function(){a(this).jqmData("cacheVal",this.checked)})},_getInputSet:function(){return this.inputtype==="checkbox"?this.element:this.element.closest("form, :jqmData(role='page'), :jqmData(role='dialog')").find("input[name='"+this.element[0].name+"'][type='"+this.inputtype+"']")},_updateAll:function(){var b=this;this._getInputSet().each(function(){var c=a(this);(this.checked||b.inputtype==="checkbox")&&c.trigger("change")}).checkboxradio("refresh")},_reset:function(){this.refresh()},refresh:function(){var b=this.element[0],c=" "+a.mobile.activeBtnClass,d=this.checkedClass+(this.element.parents(".ui-controlgroup-horizontal").length?c:""),e=this.label;b.checked?e.removeClass(this.uncheckedClass+c).addClass(d).buttonMarkup({icon:this.checkedicon}):e.removeClass(d).addClass(this.uncheckedClass).buttonMarkup({icon:this.uncheckedicon}),b.disabled?this.disable():this.enable()},disable:function(){this.element.prop("disabled",!0).parent().addClass("ui-disabled")},enable:function(){this.element.prop("disabled",!1).parent().removeClass("ui-disabled")}}),a.widget("mobile.checkboxradio",a.mobile.checkboxradio,a.mobile.behaviors.formReset),a.mobile.document.bind("pagecreate create",function(b){a.mobile.checkboxradio.prototype.enhanceWithin(b.target,!0)})}(a),function(a,b){a.widget("mobile.button",a.mobile.widget,{options:{theme:null,icon:null,iconpos:null,corners:!0,shadow:!0,iconshadow:!0,inline:null,mini:null,initSelector:"button, [type='button'], [type='submit'], [type='reset']"},_create:function(){var b=this.element,c,d=function(a){var b,c={};for(b in a)a[b]!==null&&b!=="initSelector"&&(c[b]=a[b]);return c}(this.options),e="",f;if(b[0].tagName==="A"){b.hasClass("ui-btn")||b.buttonMarkup();return}this.options.theme||(this.options.theme=a.mobile.getInheritedTheme(this.element,"c")),!~b[0].className.indexOf("ui-btn-left")||(e="ui-btn-left"),!~b[0].className.indexOf("ui-btn-right")||(e="ui-btn-right");if(b.attr("type")==="submit"||b.attr("type")==="reset")e?e+=" ui-submit":e="ui-submit";a("label[for='"+b.attr("id")+"']").addClass("ui-submit"),this.button=a("<div></div>")[b.html()?"html":"text"](b.html()||b.val()).insertBefore(b).buttonMarkup(d).addClass(e).append(b.addClass("ui-btn-hidden")),c=this.button,b.bind({focus:function(){c.addClass(a.mobile.focusClass)},blur:function(){c.removeClass(a.mobile.focusClass)}}),this.refresh()},_setOption:function(b,c){var d={};d[b]=c,b!=="initSelector"&&(this.button.buttonMarkup(d),this.element.attr("data-"+(a.mobile.ns||"")+b.replace(/([A-Z])/,"-$1").toLowerCase(),c)),this._super("_setOption",b,c)},enable:function(){return this.element.attr("disabled",!1),this.button.removeClass("ui-disabled").attr("aria-disabled",!1),this._setOption("disabled",!1)},disable:function(){return this.element.attr("disabled",!0),this.button.addClass("ui-disabled").attr("aria-disabled",!0),this._setOption("disabled",!0)},refresh:function(){var b=this.element;b.prop("disabled")?this.disable():this.enable(),a(this.button.data("buttonElements").text)[b.html()?"html":"text"](b.html()||b.val())}}),a.mobile.document.bind("pagecreate create",function(b){a.mobile.button.prototype.enhanceWithin(b.target,!0)})}(a),function(a,b){a.widget("mobile.controlgroup",a.mobile.widget,{options:{shadow:!1,corners:!0,excludeInvisible:!0,type:"vertical",mini:!1,initSelector:":jqmData(role='controlgroup')"},_create:function(){var c=this.element,d={inner:a("<div class='ui-controlgroup-controls'></div>"),legend:a("<div role='heading' class='ui-controlgroup-label'></div>")},e=c.children("legend"),f=this;c.wrapInner(d.inner),e.length&&d.legend.append(e).insertBefore(c.children(0)),c.addClass("ui-corner-all ui-controlgroup"),a.extend(this,{_initialRefresh:!0}),a.each(this.options,function(a,c){f.options[a]=b,f._setOption(a,c,!0)})},_init:function(){this.refresh()},_setOption:function(c,d){var e="_set"+c.charAt(0).toUpperCase()+c.slice(1);this[e]!==b&&this[e](d),this._super(c,d),this.element.attr("data-"+(a.mobile.ns||"")+c.replace(/([A-Z])/,"-$1").toLowerCase(),d)},_setType:function(a){this.element.removeClass("ui-controlgroup-horizontal ui-controlgroup-vertical").addClass("ui-controlgroup-"+a),this.refresh()},_setCorners:function(a){this.element.toggleClass("ui-corner-all",a)},_setShadow:function(a){this.element.toggleClass("ui-shadow",a)},_setMini:function(a){this.element.toggleClass("ui-mini",a)},container:function(){return this.element.children(".ui-controlgroup-controls")},refresh:function(){var b=this.element.find(".ui-btn").not(".ui-slider-handle"),c=this._initialRefresh;a.mobile.checkboxradio&&this.element.find(":mobile-checkboxradio").checkboxradio("refresh"),this._addFirstLastClasses(b,this.options.excludeInvisible?this._getVisibles(b,c):b,c),this._initialRefresh=!1}}),a.widget("mobile.controlgroup",a.mobile.controlgroup,a.mobile.behaviors.addFirstLastClasses),a(function(){a.mobile.document.bind("pagecreate create",function(b){a.mobile.controlgroup.prototype.enhanceWithin(b.target,!0)})})}(a),function(a,b){a(c).bind("pagecreate create",function(b){a(b.target).find("a").jqmEnhanceable().not(".ui-btn, .ui-link-inherit, :jqmData(role='none'), :jqmData(role='nojs')").addClass("ui-link")})}(a),function(a,d){function e(a,b,c,d){var e=d;return a<b?e=c+(a-b)/2:e=Math.min(Math.max(c,d-b/2),c+a-b),e}function f(){var c=a.mobile.window;return{x:c.scrollLeft(),y:c.scrollTop(),cx:b.innerWidth||c.width(),cy:b.innerHeight||c.height()}}a.widget("mobile.popup",a.mobile.widget,{options:{theme:null,overlayTheme:null,shadow:!0,corners:!0,transition:"none",positionTo:"origin",tolerance:null,initSelector:":jqmData(role='popup')",closeLinkSelector:"a:jqmData(rel='back')",closeLinkEvents:"click.popup",navigateEvents:"navigate.popup",closeEvents:"navigate.popup pagebeforechange.popup",dismissible:!0,history:!a.mobile.browser.oldIE},_eatEventAndClose:function(a){return a.preventDefault(),a.stopImmediatePropagation(),this.options.dismissible&&this.close(),!1},_resizeScreen:function(){var a=this._ui.container.outerHeight(!0);this._ui.screen.removeAttr("style"),a>this._ui.screen.height()&&this._ui.screen.height(a)},_handleWindowKeyUp:function(b){if(this._isOpen&&b.keyCode===a.mobile.keyCode.ESCAPE)return this._eatEventAndClose(b)},_expectResizeEvent:function(){var b=f();if(this._resizeData){if(b.x===this._resizeData.winCoords.x&&b.y===this._resizeData.winCoords.y&&b.cx===this._resizeData.winCoords.cx&&b.cy===this._resizeData.winCoords.cy)return!1;clearTimeout(this._resizeData.timeoutId)}return this._resizeData={timeoutId:setTimeout(a.proxy(this,"_resizeTimeout"),200),winCoords:b},!0},_resizeTimeout:function(){this._isOpen?this._expectResizeEvent()||(this._ui.container.hasClass("ui-popup-hidden")&&(this._ui.container.removeClass("ui-popup-hidden"),this.reposition({positionTo:"window"}),this._ignoreResizeEvents()),this._resizeScreen(),this._resizeData=null,this._orientationchangeInProgress=!1):(this._resizeData=null,this._orientationchangeInProgress=!1)},_ignoreResizeEvents:function(){var a=this;this._ignoreResizeTo&&clearTimeout(this._ignoreResizeTo),this._ignoreResizeTo=setTimeout(function(){a._ignoreResizeTo=0},1e3)},_handleWindowResize:function(a){this._isOpen&&this._ignoreResizeTo===0&&(this._expectResizeEvent()||this._orientationchangeInProgress)&&!this._ui.container.hasClass("ui-popup-hidden")&&this._ui.container.addClass("ui-popup-hidden").removeAttr("style")},_handleWindowOrientationchange:function(a){!this._orientationchangeInProgress&&this._isOpen&&this._ignoreResizeTo===0&&(this._expectResizeEvent(),this._orientationchangeInProgress=!0)},_handleDocumentFocusIn:function(b){var d=b.target,e,f=this._ui;if(!this._isOpen)return;if(d!==f.container[0]){e=a(b.target);if(0===e.parents().filter(f.container[0]).length)return a(c.activeElement).one("focus",function(a){e.blur()}),f.focusElement.focus(),b.preventDefault(),b.stopImmediatePropagation(),!1;f.focusElement[0]===f.container[0]&&(f.focusElement=e)}else f.focusElement&&f.focusElement[0]!==f.container[0]&&(f.container.blur(),f.focusElement.focus());this._ignoreResizeEvents()},_create:function(){var b={screen:a("<div class='ui-screen-hidden ui-popup-screen'></div>"),placeholder:a("<div style='display: none;'><!-- placeholder --></div>"),container:a("<div class='ui-popup-container ui-popup-hidden'></div>")},c=this.element.closest(".ui-page"),e=this.element.attr("id"),f=this;this.options.history=this.options.history&&a.mobile.ajaxEnabled&&a.mobile.hashListeningEnabled,c.length===0&&(c=a("body")),this.options.container=this.options.container||a.mobile.pageContainer,c.append(b.screen),b.container.insertAfter(b.screen),b.placeholder.insertAfter(this.element),e&&(b.screen.attr("id",e+"-screen"),b.container.attr("id",e+"-popup"),b.placeholder.html("<!-- placeholder for "+e+" -->")),b.container.append(this.element),b.focusElement=b.container,this.element.addClass("ui-popup"),a.extend(this,{_scrollTop:0,_page:c,_ui:b,_fallbackTransition:"",_currentTransition:!1,_prereqs:null,_isOpen:!1,_tolerance:null,_resizeData:null,_ignoreResizeTo:0,_orientationchangeInProgress:!1}),a.each(this.options,function(a,b){f.options[a]=d,f._setOption(a,b,!0)}),b.screen.bind("vclick",a.proxy(this,"_eatEventAndClose")),this._on(a.mobile.window,{orientationchange:a.proxy(this,"_handleWindowOrientationchange"),resize:a.proxy(this,"_handleWindowResize"),keyup:a.proxy(this,"_handleWindowKeyUp")}),this._on(a.mobile.document,{focusin:a.proxy(this,"_handleDocumentFocusIn")})},_applyTheme:function(a,b,c){var d=(a.attr("class")||"").split(" "),e=!0,f=null,g,h=String(b);while(d.length>0){f=d.pop(),g=(new RegExp("^ui-"+c+"-([a-z])$")).exec(f);if(g&&g.length>1){f=g[1];break}f=null}b!==f&&(a.removeClass("ui-"+c+"-"+f),b!==null&&b!=="none"&&a.addClass("ui-"+c+"-"+h))},_setTheme:function(a){this._applyTheme(this.element,a,"body")},_setOverlayTheme:function(a){this._applyTheme(this._ui.screen,a,"overlay"),this._isOpen&&this._ui.screen.addClass("in")},_setShadow:function(a){this.element.toggleClass("ui-overlay-shadow",a)},_setCorners:function(a){this.element.toggleClass("ui-corner-all",a)},_applyTransition:function(b){this._ui.container.removeClass(this._fallbackTransition),b&&b!=="none"&&(this._fallbackTransition=a.mobile._maybeDegradeTransition(b),this._fallbackTransition==="none"&&(this._fallbackTransition=""),this._ui.container.addClass(this._fallbackTransition))},_setTransition:function(a){this._currentTransition||this._applyTransition(a)},_setTolerance:function(b){var c={t:30,r:15,b:30,l:15};if(b!==d){var e=String(b).split(",");a.each(e,function(a,b){e[a]=parseInt(b,10)});switch(e.length){case 1:isNaN(e[0])||(c.t=c.r=c.b=c.l=e[0]);break;case 2:isNaN(e[0])||(c.t=c.b=e[0]),isNaN(e[1])||(c.l=c.r=e[1]);break;case 4:isNaN(e[0])||(c.t=e[0]),isNaN(e[1])||(c.r=e[1]),isNaN(e[2])||(c.b=e[2]),isNaN(e[3])||(c.l=e[3]);break;default:}}this._tolerance=c},_setOption:function(b,c){var e,f="_set"+b.charAt(0).toUpperCase()+b.slice(1);this[f]!==d&&this[f](c),e=["initSelector","closeLinkSelector","closeLinkEvents","navigateEvents","closeEvents","history","container"],a.mobile.widget.prototype._setOption.apply(this,arguments),a.inArray(b,e)===-1&&this.element.attr("data-"+(a.mobile.ns||"")+b.replace(/([A-Z])/,"-$1").toLowerCase(),c)},_placementCoords:function(a){var b=f(),d={x:this._tolerance.l,y:b.y+this._tolerance.t,cx:b.cx-this._tolerance.l-this._tolerance.r,cy:b.cy-this._tolerance.t-this._tolerance.b},g,h;this._ui.container.css("max-width",d.cx),g={cx:this._ui.container.outerWidth(!0),cy:this._ui.container.outerHeight(!0)},h={x:e(d.cx,g.cx,d.x,a.x),y:e(d.cy,g.cy,d.y,a.y)},h.y=Math.max(0,h.y);var i=c.documentElement,j=c.body,k=Math.max(i.clientHeight,j.scrollHeight,j.offsetHeight,i.scrollHeight,i.offsetHeight);return h.y-=Math.min(h.y,Math.max(0,h.y+g.cy-k)),{left:h.x,top:h.y}},_createPrereqs:function(b,c,d){var e=this,f;f={screen:a.Deferred(),container:a.Deferred()},f.screen.then(function(){f===e._prereqs&&b()}),f.container.then(function(){f===e._prereqs&&c()}),a.when(f.screen,f.container).done(function(){f===e._prereqs&&(e._prereqs=null,d())}),e._prereqs=f},_animate:function(b){this._ui.screen.removeClass(b.classToRemove).addClass(b.screenClassToAdd),b.prereqs.screen.resolve();if(b.transition&&b.transition!=="none"){b.applyTransition&&this._applyTransition(b.transition);if(this._fallbackTransition){this._ui.container.animationComplete(a.proxy(b.prereqs.container,"resolve")).addClass(b.containerClassToAdd).removeClass(b.classToRemove);return}}this._ui.container.removeClass(b.classToRemove),b.prereqs.container.resolve()},_desiredCoords:function(b){var c=null,d,e=f(),g=b.x,h=b.y,i=b.positionTo;if(i&&i!=="origin")if(i==="window")g=e.cx/2+e.x,h=e.cy/2+e.y;else{try{c=a(i)}catch(j){c=null}c&&(c.filter(":visible"),c.length===0&&(c=null))}c&&(d=c.offset(),g=d.left+c.outerWidth()/2,h=d.top+c.outerHeight()/2);if(a.type(g)!=="number"||isNaN(g))g=e.cx/2+e.x;if(a.type(h)!=="number"||isNaN(h))h=e.cy/2+e.y;return{x:g,y:h}},_reposition:function(a){a={x:a.x,y:a.y,positionTo:a.positionTo},this._trigger("beforeposition",a),this._ui.container.offset(this._placementCoords(this._desiredCoords(a)))},reposition:function(a){this._isOpen&&this._reposition(a)},_openPrereqsComplete:function(){this._ui.container.addClass("ui-popup-active"),this._isOpen=!0,this._resizeScreen(),this._ui.container.attr("tabindex","0").focus(),this._ignoreResizeEvents(),this._trigger("afteropen")},_open:function(c){var d=a.extend({},this.options,c),e=function(){var a=b,c=navigator.userAgent,d=c.match(/AppleWebKit\/([0-9\.]+)/),e=!!d&&d[1],f=c.match(/Android (\d+(?:\.\d+))/),g=!!f&&f[1],h=c.indexOf("Chrome")>-1;return f!==null&&g==="4.0"&&e&&e>534.13&&!h?!0:!1}();this._createPrereqs(a.noop,a.noop,a.proxy(this,"_openPrereqsComplete")),this._currentTransition=d.transition,this._applyTransition(d.transition),this.options.theme||this._setTheme(this._page.jqmData("theme")||a.mobile.getInheritedTheme(this._page,"c")),this._ui.screen.removeClass("ui-screen-hidden"),this._ui.container.removeClass("ui-popup-hidden"),this._reposition(d),this.options.overlayTheme&&e&&this.element.closest(".ui-page").addClass("ui-popup-open"),this._animate({additionalCondition:!0,transition:d.transition,classToRemove:"",screenClassToAdd:"in",containerClassToAdd:"in",applyTransition:!1,prereqs:this._prereqs})},_closePrereqScreen:function(){this._ui.screen.removeClass("out").addClass("ui-screen-hidden")},_closePrereqContainer:function(){this._ui.container.removeClass("reverse out").addClass("ui-popup-hidden").removeAttr("style")},_closePrereqsDone:function(){var b=this.options;this._ui.container.removeAttr("tabindex"),a.mobile.popup.active=d,this._trigger("afterclose")},_close:function(b){this._ui.container.removeClass("ui-popup-active"),this._page.removeClass("ui-popup-open"),this._isOpen=!1,this._createPrereqs(a.proxy(this,"_closePrereqScreen"),a.proxy(this,"_closePrereqContainer"),a.proxy(this,"_closePrereqsDone")),this._animate({additionalCondition:this._ui.screen.hasClass("in"),transition:b?"none":this._currentTransition,classToRemove:"in",screenClassToAdd:"out",containerClassToAdd:"reverse out",applyTransition:!0,prereqs:this._prereqs})},_unenhance:function(){this._setTheme("none"),this.element.detach().insertAfter(this._ui.placeholder).removeClass("ui-popup ui-overlay-shadow ui-corner-all"),this._ui.screen.remove(),this._ui.container.remove(),this._ui.placeholder.remove()},_destroy:function(){a.mobile.popup.active===this?(this.element.one("popupafterclose",a.proxy(this,"_unenhance")),this.close()):this._unenhance()},_closePopup:function(c,d){var e,f,g=this.options,h=!1;b.scrollTo(0,this._scrollTop),c&&c.type==="pagebeforechange"&&d&&(typeof d.toPage=="string"?e=d.toPage:e=d.toPage.jqmData("url"),e=a.mobile.path.parseUrl(e),f=e.pathname+e.search+e.hash,this._myUrl!==a.mobile.path.makeUrlAbsolute(f)?h=!0:c.preventDefault()),g.container.unbind(g.closeEvents),this.element.undelegate(g.closeLinkSelector,g.closeLinkEvents),this._close(h)},_bindContainerClose:function(){this.options.container.one(this.options.closeEvents,a.proxy(this,"_closePopup"))},open:function(c){var d=this,e=this.options,f,g,h,i,j,k;if(a.mobile.popup.active)return;a.mobile.popup.active=this,this._scrollTop=a.mobile.window.scrollTop();if(!e.history){d._open(c),d._bindContainerClose(),d.element.delegate(e.closeLinkSelector,e.closeLinkEvents,function(a){d.close(),a.preventDefault()});return}k=a.mobile.urlHistory,g=a.mobile.dialogHashKey,h=a.mobile.activePage,i=h.is(".ui-dialog"),this._myUrl=f=k.getActive().url,j=f.indexOf(g)>-1&&!i&&k.activeIndex>0;if(j){d._open(c),d._bindContainerClose();return}f.indexOf(g)===-1&&!i?f=f+(f.indexOf("#")>-1?g:"#"+g):f=a.mobile.path.parseLocation().hash+g,k.activeIndex===0&&f===k.initialDst&&(f+=g),a(b).one("beforenavigate",function(a){a.preventDefault(),d._open(c),d._bindContainerClose()}),this.urlAltered=!0,a.mobile.navigate(f,{role:"dialog"})},close:function(){if(a.mobile.popup.active!==this)return;this._scrollTop=a.mobile.window.scrollTop(),this.options.history&&this.urlAltered?(a.mobile.back(),this.urlAltered=!1):this._closePopup()}}),a.mobile.popup.handleLink=function(b){var c=b.closest(":jqmData(role='page')"),d=c.length===0?a("body"):c,e=a(a.mobile.path.parseUrl(b.attr("href")).hash,d[0]),f;e.data("mobile-popup")&&(f=b.offset(),e.popup("open",{x:f.left+b.outerWidth()/2,y:f.top+b.outerHeight()/2,transition:b.jqmData("transition"),positionTo:b.jqmData("position-to")})),setTimeout(function(){var c=b.parent().parent();c.hasClass("ui-li")&&(b=c.parent()),b.removeClass(a.mobile.activeBtnClass)},300)},a.mobile.document.bind("pagebeforechange",function(b,c){c.options.role==="popup"&&(a.mobile.popup.handleLink(c.options.link),b.preventDefault())}),a.mobile.document.bind("pagecreate create",function(b){a.mobile.popup.prototype.enhanceWithin(b.target,!0)})}(a),function(a,d){a.widget("mobile.panel",a.mobile.widget,{options:{classes:{panel:"ui-panel",panelOpen:"ui-panel-open",panelClosed:"ui-panel-closed",panelFixed:"ui-panel-fixed",panelInner:"ui-panel-inner",modal:"ui-panel-dismiss",modalOpen:"ui-panel-dismiss-open",pagePanel:"ui-page-panel",pagePanelOpen:"ui-page-panel-open",contentWrap:"ui-panel-content-wrap",contentWrapOpen:"ui-panel-content-wrap-open",contentWrapClosed:"ui-panel-content-wrap-closed",contentFixedToolbar:"ui-panel-content-fixed-toolbar",contentFixedToolbarOpen:"ui-panel-content-fixed-toolbar-open",contentFixedToolbarClosed:"ui-panel-content-fixed-toolbar-closed",animate:"ui-panel-animate"},animate:!0,theme:"c",position:"left",dismissible:!0,display:"reveal",initSelector:":jqmData(role='panel')",swipeClose:!0,positionFixed:!1},_panelID:null,_closeLink:null,_page:null,_modal:null,_pannelInner:null,_wrapper:null,_fixedToolbar:null,_create:function(){var b=this,c=b.element,d=c.closest(":jqmData(role='page')"),e=function(){var b=a.data(d[0],"mobilePage").options.theme,c="ui-body-"+b;return c},f=function(){var a=c.find("."+b.options.classes.panelInner);return a.length===0&&(a=c.children().wrapAll('<div class="'+b.options.classes.panelInner+'" />').parent()),a},g=function(){var c=d.find("."+b.options.classes.contentWrap);return c.length===0&&(c=d.children(".ui-header:not(:jqmData(position='fixed')), .ui-content:not(:jqmData(role='popup')), .ui-footer:not(:jqmData(position='fixed'))").wrapAll('<div class="'+b.options.classes.contentWrap+" "+e()+'" />').parent(),a.support.cssTransform3d&&!!b.options.animate&&c.addClass(b.options.classes.animate)),c},h=function(){var c=d.find("."+b.options.classes.contentFixedToolbar);return c.length===0&&(c=d.find(".ui-header:jqmData(position='fixed'), .ui-footer:jqmData(position='fixed')").addClass(b.options.classes.contentFixedToolbar),a.support.cssTransform3d&&!!b.options.animate&&c.addClass(b.options.classes.animate)),c};a.extend(this,{_panelID:c.attr("id"),_closeLink:c.find(":jqmData(rel='close')"),_page:c.closest(":jqmData(role='page')"),_pageTheme:e(),_pannelInner:f(),_wrapper:g(),_fixedToolbar:h()}),b._addPanelClasses(),b._wrapper.addClass(this.options.classes.contentWrapClosed),b._fixedToolbar.addClass(this.options.classes.contentFixedToolbarClosed),b._page.addClass(b.options.classes.pagePanel),a.support.cssTransform3d&&!!b.options.animate&&this.element.addClass(b.options.classes.animate),b._bindUpdateLayout(),b._bindCloseEvents(),b._bindLinkListeners(),b._bindPageEvents(),!b.options.dismissible||b._createModal(),b._bindSwipeEvents()},_createModal:function(b){var c=this;c._modal=a("<div class='"+c.options.classes.modal+"' data-panelid='"+c._panelID+"'></div>").on("mousedown",function(){c.close()}).appendTo(this._page)},_getPosDisplayClasses:function(a){return a+"-position-"+this.options.position+" "+a+"-display-"+this.options.display},_getPanelClasses:function(){var a=this.options.classes.panel+" "+this._getPosDisplayClasses(this.options.classes.panel)+" "+this.options.classes.panelClosed;return this.options.theme&&(a+=" ui-body-"+this.options.theme),!this.options.positionFixed||(a+=" "+this.options.classes.panelFixed),a},_addPanelClasses:function(){this.element.addClass(this._getPanelClasses())},_bindCloseEvents:function(){var a=this;a._closeLink.on("click.panel",function(b){return b.preventDefault(),a.close(),!1}),a.element.on("click.panel","a:jqmData(ajax='false')",function(b){a.close()})},_positionPanel:function(){var b=this,c=b._pannelInner.outerHeight(),d=c>a.mobile.getScreenHeight();d||!b.options.positionFixed?(d&&(b._unfixPanel(),a.mobile.resetActivePageHeight(c)),b._scrollIntoView(c)):b._fixPanel()},_scrollIntoView:function(c){c<a(b).scrollTop()&&b.scrollTo(0,0)},_bindFixListener:function(){this._on(a(b),{throttledresize:"_positionPanel"})},_unbindFixListener:function(){this._off(a(b),"throttledresize")},_unfixPanel:function(){!!this.options.positionFixed&&a.support.fixedPosition&&this.element.removeClass(this.options.classes.panelFixed)},_fixPanel:function(){!!this.options.positionFixed&&a.support.fixedPosition&&this.element.addClass(this.options.classes.panelFixed)},_bindUpdateLayout:function(){var a=this;a.element.on("updatelayout",function(b){a._open&&a._positionPanel()})},_bindLinkListeners:function(){var b=this;b._page.on("click.panel","a",function(c){if(this.href.split("#")[1]===b._panelID&&b._panelID!==d){c.preventDefault();var e=a(this);return e.hasClass("ui-link")||(e.addClass(a.mobile.activeBtnClass),b.element.one("panelopen panelclose",function(){e.removeClass(a.mobile.activeBtnClass)})),b.toggle(),!1}})},_bindSwipeEvents:function(){var a=this,b=a._modal?a.element.add(a._modal):a.element;!a.options.swipeClose||(a.options.position==="left"?b.on("swipeleft.panel",function(b){a.close()}):b.on("swiperight.panel",function(b){a.close()}))},_bindPageEvents:function(){var a=this;a._page.on("panelbeforeopen",function(b){a._open&&b.target!==a.element[0]&&a.close()}).on("pagehide",function(b){a._open&&a.close(!0)}).on("keyup.panel",function(b){b.keyCode===27&&a._open&&a.close()})},_open:!1,_contentWrapOpenClasses:null,_fixedToolbarOpenClasses:null,_modalOpenClasses:null,open:function(b){if(!this._open){var c=this,d=c.options,e=function(){c._page.off("panelclose"),c._page.jqmData("panel","open"),!b&&a.support.cssTransform3d&&!!d.animate?c.element.add(c._wrapper).on(c._transitionEndEvents,f):setTimeout(f,0),c.options.theme&&c.options.display!=="overlay"&&c._page.removeClass(c._pageTheme).addClass("ui-body-"+c.options.theme),c.element.removeClass(d.classes.panelClosed).addClass(d.classes.panelOpen),c._contentWrapOpenClasses=c._getPosDisplayClasses(d.classes.contentWrap),c._wrapper.removeClass(d.classes.contentWrapClosed).addClass(c._contentWrapOpenClasses+" "+d.classes.contentWrapOpen),c._fixedToolbarOpenClasses=c._getPosDisplayClasses(d.classes.contentFixedToolbar),c._fixedToolbar.removeClass(d.classes.contentFixedToolbarClosed).addClass(c._fixedToolbarOpenClasses+" "+d.classes.contentFixedToolbarOpen),c._modalOpenClasses=c._getPosDisplayClasses(d.classes.modal)+" "+d.classes.modalOpen,c._modal&&c._modal.addClass(c._modalOpenClasses)},f=function(){c.element.add(c._wrapper).off(c._transitionEndEvents,f),c._page.addClass(d.classes.pagePanelOpen),c._positionPanel(),c._bindFixListener(),c._trigger("open")};this.element.closest(".ui-page-active").length<0&&(b=!0),c._trigger("beforeopen"),c._page.jqmData("panel")==="open"?c._page.on("panelclose",function(){e()}):e(),c._open=!0}},close:function(b){if(this._open){var c=this.options,d=this,e=function(){!b&&a.support.cssTransform3d&&!!c.animate?d.element.add(d._wrapper).on(d._transitionEndEvents,f):setTimeout(f,0),d._page.removeClass(c.classes.pagePanelOpen),d.element.removeClass(c.classes.panelOpen),d._wrapper.removeClass(c.classes.contentWrapOpen),d._fixedToolbar.removeClass(c.classes.contentFixedToolbarOpen),d._modal&&d._modal.removeClass(d._modalOpenClasses)},f=function(){d.options.theme&&d.options.display!=="overlay"&&d._page.removeClass("ui-body-"+d.options.theme).addClass(d._pageTheme),d.element.add(d._wrapper).off(d._transitionEndEvents,f),d.element.addClass(c.classes.panelClosed),d._wrapper.removeClass(d._contentWrapOpenClasses).addClass(c.classes.contentWrapClosed),d._fixedToolbar.removeClass(d._fixedToolbarOpenClasses).addClass(c.classes.contentFixedToolbarClosed),d._fixPanel(),d._unbindFixListener(),a.mobile.resetActivePageHeight(),d._page.jqmRemoveData("panel"),d._trigger("close")};this.element.closest(".ui-page-active").length<0&&(b=!0),d._trigger("beforeclose"),e(),d._open=!1}},toggle:function(a){this[this._open?"close":"open"]()},_transitionEndEvents:"webkitTransitionEnd oTransitionEnd otransitionend transitionend msTransitionEnd",_destroy:function(){var b=this.options.classes,c=this.options.theme,d=this.element.siblings("."+b.panel).length;d?this._open&&(this._wrapper.removeClass(b.contentWrapOpen),this._fixedToolbar.removeClass(b.contentFixedToolbarOpen),this._page.jqmRemoveData("panel"),this._page.removeClass(b.pagePanelOpen),c&&this._page.removeClass("ui-body-"+c).addClass(this._pageTheme)):(this._wrapper.children().unwrap(),this._page.find("a").unbind("panelopen panelclose"),this._page.removeClass(b.pagePanel),this._open&&(this._page.jqmRemoveData("panel"),this._page.removeClass(b.pagePanelOpen),c&&this._page.removeClass("ui-body-"+c).addClass(this._pageTheme),a.mobile.resetActivePageHeight())),this._pannelInner.children().unwrap(),this.element.removeClass([this._getPanelClasses(),b.panelAnimate].join(" ")).off("swipeleft.panel swiperight.panel").off("panelbeforeopen").off("panelhide").off("keyup.panel").off("updatelayout"),this._closeLink.off("click.panel"),this._modal&&this._modal.remove(),this.element.off(this._transitionEndEvents).removeClass([b.panelUnfixed,b.panelClosed,b.panelOpen].join(" "))}}),a(c).bind("pagecreate create",function(b){a.mobile.panel.prototype.enhanceWithin(b.target)})}(a),function(a,b){a.widget("mobile.table",a.mobile.widget,{options:{classes:{table:"ui-table"},initSelector:":jqmData(role='table')"},_create:function(){var b=this,c=this.element.find("thead tr");this.element.addClass(this.options.classes.table),b.headers=this.element.find("tr:eq(0)").children(),b.allHeaders=b.headers.add(c.children()),c.each(function(){var d=0;a(this).children().each(function(e){var f=parseInt(a(this).attr("colspan"),10),g=":nth-child("+(d+1)+")";a(this).jqmData("colstart",d+1);if(f)for(var h=0;h<f-1;h++)d++,g+=", :nth-child("+(d+1)+")";a(this).jqmData("cells",b.element.find("tr").not(c.eq(0)).not(this).children(g)),d++})})}}),a.mobile.document.bind("pagecreate create",function(b){a.mobile.table.prototype.enhanceWithin(b.target)})}(a),function(a,b){a.mobile.table.prototype.options.mode="columntoggle",a.mobile.table.prototype.options.columnBtnTheme=null,a.mobile.table.prototype.options.columnPopupTheme=null,a.mobile.table.prototype.options.columnBtnText="Columns...",a.mobile.table.prototype.options.classes=a.extend(a.mobile.table.prototype.options.classes,{popup:"ui-table-columntoggle-popup",columnBtn:"ui-table-columntoggle-btn",priorityPrefix:"ui-table-priority-",columnToggleTable:"ui-table-columntoggle"}),a.mobile.document.delegate(":jqmData(role='table')","tablecreate",function(){var b=a(this),c=b.data("mobile-table"),d=c.options,e=a.mobile.ns;if(d.mode!=="columntoggle")return;c.element.addClass(d.classes.columnToggleTable);var f=(b.attr("id")||d.classes.popup)+"-popup",g=a("<a href='#"+f+"' class='"+d.classes.columnBtn+"' data-"+e+"rel='popup' data-"+e+"mini='true'>"+d.columnBtnText+"</a>"),h=a("<div data-"+e+"role='popup' data-"+e+"role='fieldcontain' class='"+d.classes.popup+"' id='"+f+"'></div>"),i=a("<fieldset data-"+e+"role='controlgroup'></fieldset>");c.headers.not("td").each(function(){var b=a(this).jqmData("priority"),c=a(this).add(a(this).jqmData("cells"));b&&(c.addClass(d.classes.priorityPrefix+b),a("<label><input type='checkbox' checked />"+a(this).text()+"</label>").appendTo(i).children(0).jqmData("cells",c).checkboxradio({theme:d.columnPopupTheme}))}),i.appendTo(h),i.on("change","input",function(b){this.checked?a(this).jqmData("cells").removeClass("ui-table-cell-hidden").addClass("ui-table-cell-visible"):a(this).jqmData("cells").removeClass("ui-table-cell-visible").addClass("ui-table-cell-hidden")}),g.insertBefore(b).buttonMarkup({theme:d.columnBtnTheme}),h.insertBefore(b).popup(),c.refresh=function(){i.find("input").each(function(){this.checked=a(this).jqmData("cells").eq(0).css("display")==="table-cell",a(this).checkboxradio("refresh")})},a.mobile.window.on("throttledresize",c.refresh),c.refresh()})}(a),function(a,b){a.mobile.table.prototype.options.mode="reflow",a.mobile.table.prototype.options.classes=a.extend(a.mobile.table.prototype.options.classes,{reflowTable:"ui-table-reflow",cellLabels:"ui-table-cell-label"}),a.mobile.document.delegate(":jqmData(role='table')","tablecreate",function(){var b=a(this),c=b.data("mobile-table"),d=c.options;if(d.mode!=="reflow")return;c.element.addClass(d.classes.reflowTable);var e=a(c.allHeaders.get().reverse());e.each(function(b){var c=a(this).jqmData("cells"),e=a(this).jqmData("colstart"),f=c.not(this).filter("thead th").length&&" ui-table-cell-label-top",g=a(this).text();if(g!=="")if(f){var h=parseInt(a(this).attr("colspan"),10),i="";h&&(i="td:nth-child("+h+"n + "+e+")"),c.filter(i).prepend("<b class='"+d.classes.cellLabels+f+"'>"+g+"</b>")}else c.prepend("<b class='"+d.classes.cellLabels+"'>"+g+"</b>")})})}(a),function(a){var b=a("meta[name=viewport]"),c=b.attr("content"),d=c+",maximum-scale=1, user-scalable=no",e=c+",maximum-scale=10, user-scalable=yes",f=/(user-scalable[\s]*=[\s]*no)|(maximum-scale[\s]*=[\s]*1)[$,\s]/.test(c);a.mobile.zoom=a.extend({},{enabled:!f,locked:!1,disable:function(c){!f&&!a.mobile.zoom.locked&&(b.attr("content",d),a.mobile.zoom.enabled=!1,a.mobile.zoom.locked=c||!1)},enable:function(c){!f&&(!a.mobile.zoom.locked||c===!0)&&(b.attr("content",e),a.mobile.zoom.enabled=!0,a.mobile.zoom.locked=!1)},restore:function(){f||(b.attr("content",c),a.mobile.zoom.enabled=!0)}})}(a),function(a,b){a.widget("mobile.textinput",a.mobile.widget,{options:{theme:null,mini:!1,preventFocusZoom:/iPhone|iPad|iPod/.test(navigator.platform)&&navigator.userAgent.indexOf("AppleWebKit")>-1,initSelector:"input[type='text'], input[type='search'], :jqmData(type='search'), input[type='number'], :jqmData(type='number'), input[type='password'], input[type='email'], input[type='url'], input[type='tel'], textarea, input[type='time'], input[type='date'], input[type='month'], input[type='week'], input[type='datetime'], input[type='datetime-local'], input[type='color'], input:not([type]), input[type='file']",clearBtn:!1,clearSearchButtonText:null,clearBtnText:"clear text",disabled:!1},_create:function(){function o(){setTimeout(function(){j.toggleClass("ui-input-clear-hidden",!c.val())},0)}var b=this,c=this.element,d=this.options,e=d.theme||a.mobile.getInheritedTheme(this.element,"c"),f=" ui-body-"+e,g=d.mini?" ui-mini":"",h=c.is("[type='search'], :jqmData(type='search')"),i,j,k=d.clearSearchButtonText||d.clearBtnText,l=c.is("textarea, :jqmData(type='range')"),m=!!d.clearBtn&&!l,n=c.is("input")&&!c.is(":jqmData(type='range')");a("label[for='"+c.attr("id")+"']").addClass("ui-input-text"),i=c.addClass("ui-input-text ui-body-"+e),typeof c[0].autocorrect!="undefined"&&!a.support.touchOverflow&&(c[0].setAttribute("autocorrect","off"),c[0].setAttribute("autocomplete","off")),h?i=c.wrap("<div class='ui-input-search ui-shadow-inset ui-btn-corner-all ui-btn-shadow ui-icon-searchfield"+f+g+"'></div>").parent():n&&(i=c.wrap("<div class='ui-input-text ui-shadow-inset ui-corner-all ui-btn-shadow"+f+g+"'></div>").parent()),m||h?(j=a("<a href='#' class='ui-input-clear' title='"+k+"'>"+k+"</a>").bind("click",function(a){c.val("").focus().trigger("change"),j.addClass("ui-input-clear-hidden"),a.preventDefault()}).appendTo(i).buttonMarkup({icon:"delete",iconpos:"notext",corners:!0,shadow:!0,mini:d.mini}),h||i.addClass("ui-input-has-clear"),o(),c.bind("paste cut keyup input focus change blur",o)):!n&&!h&&c.addClass("ui-corner-all ui-shadow-inset"+f+g),c.focus(function(){d.preventFocusZoom&&a.mobile.zoom.disable(!0),i.addClass(a.mobile.focusClass)}).blur(function(){i.removeClass(a.mobile.focusClass),d.preventFocusZoom&&a.mobile.zoom.enable(!0)});if(c.is("textarea")){var p=15,q=100,r;this._keyup=function(){var a=c[0].scrollHeight,b=c[0].clientHeight;b<a&&c.height(a+p)},c.on("keyup change input paste",function(){clearTimeout(r),r=setTimeout(b._keyup,q)}),this._on(a.mobile.document,{pagechange:"_keyup"}),a.trim(c.val())&&this._on(a.mobile.window,{load:"_keyup"})}c.attr("disabled")&&this.disable()},disable:function(){var a,b=this.element.is("[type='search'], :jqmData(type='search')"),c=this.element.is("input")&&!this.element.is(":jqmData(type='range')"),d=this.element.attr("disabled",!0)&&(c||b);return d?a=this.element.parent():a=this.element,a.addClass("ui-disabled"),this._setOption("disabled",!0)},enable:function(){var a,b=this.element.is("[type='search'], :jqmData(type='search')"),c=this.element.is("input")&&!this.element.is(":jqmData(type='range')"),d=this.element.attr("disabled",!1)&&(c||b);return d?a=this.element.parent():a=this.element,a.removeClass("ui-disabled"),this._setOption("disabled",!1)}}),a.mobile.document.bind("pagecreate create",function(b){a.mobile.textinput.prototype.enhanceWithin(b.target,!0)})}(a),function(a,b){a.mobile.listview.prototype.options.filter=!1,a.mobile.listview.prototype.options.filterPlaceholder="Filter items...",a.mobile.listview.prototype.options.filterTheme="c",a.mobile.listview.prototype.options.filterReveal=!1;var c=function(a,b,c){return a.toString().toLowerCase().indexOf(b)===-1};a.mobile.listview.prototype.options.filterCallback=c,a.mobile.document.delegate("ul, ol","listviewcreate",function(){var b=a(this),d=b.data("mobile-listview");if(!d.options.filter)return;d.options.filterReveal&&b.children().addClass("ui-screen-hidden");var e=a("<form>",{"class":"ui-listview-filter ui-bar-"+d.options.filterTheme,role:"search"}).submit(function(a){a.preventDefault(),g.blur()}),f=function(e){var f=a(this),g=this.value.toLowerCase(),h=null,i=b.children(),j=f.jqmData("lastval")+"",k=!1,l="",m,n=d.options.filterCallback!==c;if(j&&j===g)return;d._trigger("beforefilter","beforefilter",{input:this}),f.jqmData("lastval",g),n||g.length<j.length||g.indexOf(j)!==0?h=b.children():(h=b.children(":not(.ui-screen-hidden)"),!h.length&&d.options.filterReveal&&(h=b.children(".ui-screen-hidden")));if(g){for(var o=h.length-1;o>=0;o--)m=a(h[o]),l=m.jqmData("filtertext")||m.text(),m.is("li:jqmData(role=list-divider)")?(m.toggleClass("ui-filter-hidequeue",!k),k=!1):d.options.filterCallback(l,g,m)?m.toggleClass("ui-filter-hidequeue",!0):k=!0;h.filter(":not(.ui-filter-hidequeue)").toggleClass("ui-screen-hidden",!1),h.filter(".ui-filter-hidequeue").toggleClass("ui-screen-hidden",!0).toggleClass("ui-filter-hidequeue",!1)}else h.toggleClass("ui-screen-hidden",!!d.options.filterReveal);d._addFirstLastClasses(i,d._getVisibles(i,!1),!1)},g=a("<input>",{placeholder:d.options.filterPlaceholder}).attr("data-"+a.mobile.ns+"type","search").jqmData("lastval","").bind("keyup change input",f).appendTo(e).textinput();d.options.inset&&e.addClass("ui-listview-filter-inset"),e.bind("submit",function(){return!1}).insertBefore(b)})}(a),function(a,d){a.widget("mobile.slider",a.mobile.widget,{widgetEventPrefix:"slide",options:{theme:null,trackTheme:null,disabled:!1,initSelector:"input[type='range'], :jqmData(type='range'), :jqmData(role='slider')",mini:!1,highlight:!1},_create:function(){var e=this,f=this.element,g=a.mobile.getInheritedTheme(f,"c"),h=this.options.theme||g,i=this.options.trackTheme||g,j=f[0].nodeName.toLowerCase(),k=this.isToggleSwitch=j==="select",l=f.parent().is(":jqmData(role='rangeslider')"),m=this.isToggleSwitch?"ui-slider-switch":"",n=f.attr("id"),o=a("[for='"+n+"']"),p=o.attr("id")||n+"-label",q=o.attr("id",p),r=this.isToggleSwitch?0:parseFloat(f.attr("min")),s=this.isToggleSwitch?f.find("option").length-1:parseFloat(f.attr("max")),t=b.parseFloat(f.attr("step")||1),u=this.options.mini||f.jqmData("mini")?" ui-mini":"",v=c.createElement("a"),w=a(v),x=c.createElement("div"),y=a(x),z=this.options.highlight&&!this.isToggleSwitch?function(){var b=c.createElement("div");return b.className="ui-slider-bg "+a.mobile.activeBtnClass+" ui-btn-corner-all",a(b).prependTo(y)}():!1,A;v.setAttribute("href","#"),x.setAttribute("role","application"),x.className=[this.isToggleSwitch?"ui-slider ":"ui-slider-track ",m," ui-btn-down-",i," ui-btn-corner-all",u].join(""),v.className="ui-slider-handle",x.appendChild(v),w.buttonMarkup({corners:!0,theme:h,shadow:!0}).attr({role:"slider","aria-valuemin":r,"aria-valuemax":s,"aria-valuenow":this._value(),"aria-valuetext":this._value(),title:this._value(),"aria-labelledby":p}),a.extend(this,{slider:y,handle:w,type:j,step:t,max:s,min:r,valuebg:z,isRangeslider:l,dragging:!1,beforeStart:null,userModified:!1,mouseMoved:!1});if(this.isToggleSwitch){var B=c.createElement("div");B.className="ui-slider-inneroffset";for(var C=0,D=x.childNodes.length;C<D;C++)B.appendChild(x.childNodes[C]);x.appendChild(B),w.addClass("ui-slider-handle-snapping"),A=f.find("option");for(var E=0,F=A.length;E<F;E++){var G=E?"a":"b",H=E?" "+a.mobile.activeBtnClass:" ui-btn-down-"+i,I=c.createElement("div"),J=c.createElement("span");J.className=["ui-slider-label ui-slider-label-",G,H," ui-btn-corner-all"].join(""),J.setAttribute("role","img"),J.appendChild(c.createTextNode(A[E].innerHTML)),a(J).prependTo(y)}e._labels=a(".ui-slider-label",y)}q.addClass("ui-slider"),f.addClass(this.isToggleSwitch?"ui-slider-switch":"ui-slider-input"),this._on(f,{change:"_controlChange",keyup:"_controlKeyup",blur:"_controlBlur",vmouseup:"_controlVMouseUp"}),y.bind("vmousedown",a.proxy(this._sliderVMouseDown,this)).bind("vclick",!1),this._on(c,{vmousemove:"_preventDocumentDrag"}),this._on(y.add(c),{vmouseup:"_sliderVMouseUp"}),y.insertAfter(f);if(!this.isToggleSwitch&&!l){var B=this.options.mini?"<div class='ui-slider ui-mini'>":"<div class='ui-slider'>";f.add(y).wrapAll(B)}this.isToggleSwitch&&this.handle.bind({focus:function(){y.addClass(a.mobile.focusClass)},blur:function(){y.removeClass(a.mobile.focusClass)}}),this._on(this.handle,{vmousedown:"_handleVMouseDown",keydown:"_handleKeydown",keyup:"_handleKeyup"}),this.handle.bind("vclick",!1),this._handleFormReset&&this._handleFormReset(),this.refresh(d,d,!0)},_controlChange:function(a){if(this._trigger("controlchange",a)===!1)return!1;this.mouseMoved||this.refresh(this._value(),!0)},_controlKeyup:function(a){this.refresh(this._value(),!0,!0)},_controlBlur:function(a){this.refresh(this._value(),!0)},_controlVMouseUp:function(a){this._checkedRefresh()},_handleVMouseDown:function(a){this.handle.focus()},_handleKeydown:function(b){var c=this._value();if(this.options.disabled)return;switch(b.keyCode){case a.mobile.keyCode.HOME:case a.mobile.keyCode.END:case a.mobile.keyCode.PAGE_UP:case a.mobile.keyCode.PAGE_DOWN:case a.mobile.keyCode.UP:case a.mobile.keyCode.RIGHT:case a.mobile.keyCode.DOWN:case a.mobile.keyCode.LEFT:b.preventDefault(),this._keySliding||(this._keySliding=!0,this.handle.addClass("ui-state-active"))}switch(b.keyCode){case a.mobile.keyCode.HOME:this.refresh(this.min);break;case a.mobile.keyCode.END:this.refresh(this.max);break;case a.mobile.keyCode.PAGE_UP:case a.mobile.keyCode.UP:case a.mobile.keyCode.RIGHT:this.refresh(c+this.step);break;case a.mobile.keyCode.PAGE_DOWN:case a.mobile.keyCode.DOWN:case a.mobile.keyCode.LEFT:this.refresh(c-this.step)}},_handleKeyup:function(a){this._keySliding&&(this._keySliding=!1,this.handle.removeClass("ui-state-active"))},_sliderVMouseDown:function(a){return this.options.disabled?!1:this._trigger("beforestart",a)===!1?!1:(this.dragging=!0,this.userModified=!1,this.mouseMoved=!1,this.isToggleSwitch&&(this.beforeStart=this.element[0].selectedIndex),this.refresh(a),this._trigger("start"),!1)},_sliderVMouseUp:function(){if(this.dragging)return this.dragging=!1,this.isToggleSwitch&&(this.handle.addClass("ui-slider-handle-snapping"),this.mouseMoved?this.userModified?this.refresh(this.beforeStart===0?1:0):this.refresh(this.beforeStart):this.refresh(this.beforeStart===0?1:0)),this.mouseMoved=!1,this._trigger("stop"),!1},_preventDocumentDrag:function(a){if(this._trigger("drag",a)===!1)return!1;if(this.dragging&&!this.options.disabled)return this.mouseMoved=!0,this.isToggleSwitch&&this.handle.removeClass("ui-slider-handle-snapping"),this.refresh(a),this.userModified=this.beforeStart!==this.element[0].selectedIndex,!1},_checkedRefresh:function(){this.value!=this._value()&&this.refresh(this._value())},_value:function(){return this.isToggleSwitch?this.element[0].selectedIndex:parseFloat(this.element.val())},_reset:function(){this.refresh(d,!1,!0)},refresh:function(b,d,e){var f=this,g=a.mobile.getInheritedTheme(this.element,"c"),h=this.options.theme||g,i=this.options.trackTheme||g;f.slider[0].className=[this.isToggleSwitch?"ui-slider ui-slider-switch":"ui-slider-track"," ui-btn-down-"+i," ui-btn-corner-all",this.options.mini?" ui-mini":""].join(""),(this.options.disabled||this.element.attr("disabled"))&&this.disable(),this.value=this._value(),this.options.highlight&&!this.isToggleSwitch&&this.slider.find(".ui-slider-bg").length===0&&(this.valuebg=function(){var b=c.createElement("div");return b.className="ui-slider-bg "+a.mobile.activeBtnClass+" ui-btn-corner-all",a(b).prependTo(f.slider)}()),this.handle.buttonMarkup({corners:!0,theme:h,shadow:!0});var j,k,l=this.element,m=!this.isToggleSwitch,n=m?[]:l.find("option"),o=m?parseFloat(l.attr("min")):0,p=m?parseFloat(l.attr("max")):n.length-1,q=m&&parseFloat(l.attr("step"))>0?parseFloat(l.attr("step")):1;if(typeof b=="object"){var r,s,t=b,u=8;r=this.slider.offset().left,s=this.slider.width(),j=s/((p-o)/q);if(!this.dragging||t.pageX<r-u||t.pageX>r+s+u)return;j>1?k=(t.pageX-r)/s*100:k=Math.round((t.pageX-r)/s*100)}else b==null&&(b=m?parseFloat(l.val()||0):l[0].selectedIndex),k=(parseFloat(b)-o)/(p-o)*100;if(isNaN(k))return;var v=k/100*(p-o)+o,w=(v-o)%q,x=v-w;Math.abs(w)*2>=q&&(x+=w>0?q:-q);var y=100/((p-o)/q);v=parseFloat(x.toFixed(5)),typeof j=="undefined"&&(j=s/((p-o)/q)),j>1&&m&&(k=(v-o)*y*(1/q)),k<0&&(k=0),k>100&&(k=100),v<o&&(v=o),v>p&&(v=p),this.handle.css("left",k+"%"),this.handle[0].setAttribute("aria-valuenow",m?v:n.eq(v).attr("value")),this.handle[0].setAttribute("aria-valuetext",m?v:n.eq(v).getEncodedText()),this.handle[0].setAttribute("title",m?v:n.eq(v).getEncodedText()),this.valuebg&&this.valuebg.css("width",k+"%");if(this._labels){var z=this.handle.width()/this.slider.width()*100,A=k&&z+(100-z)*k/100,B=k===100?0:Math.min(z+100-A,100);this._labels.each(function(){var b=a(this).is(".ui-slider-label-a");a(this).width((b?A:B)+"%")})}if(!e){var C=!1;m?(C=l.val()!==v,l.val(v)):(C=l[0].selectedIndex!==v,l[0].selectedIndex=v);if(this._trigger("beforechange",b)===!1)return!1;!d&&C&&l.trigger("change")}},enable:function(){return this.element.attr("disabled",!1),this.slider.removeClass("ui-disabled").attr("aria-disabled",!1),this._setOption("disabled",!1)},disable:function(){return this.element.attr("disabled",!0),this.slider.addClass("ui-disabled").attr("aria-disabled",!0),this._setOption("disabled",!0)}}),a.widget("mobile.slider",a.mobile.slider,a.mobile.behaviors.formReset),a.mobile.document.bind("pagecreate create",function(b){a.mobile.slider.prototype.enhanceWithin(b.target,!0)})}(a),function(a,b){a.widget("mobile.rangeslider",a.mobile.widget,{options:{theme:null,trackTheme:null,disabled:!1,initSelector:":jqmData(role='rangeslider')",mini:!1,highlight:!0},_create:function(){var b,c=this.element,d=this.options.mini?"ui-rangeslider ui-mini":"ui-rangeslider",e=c.find("input").first(),f=c.find("input").last(),g=c.find("label").first(),h=a.data(e.get(0),"mobileSlider").slider,i=a.data(f.get(0),"mobileSlider").slider,j=a.data(e.get(0),"mobileSlider").handle,k=a('<div class="ui-rangeslider-sliders" />').appendTo(c);c.find("label").length>1&&(b=c.find("label").last().hide()),e.addClass("ui-rangeslider-first"),f.addClass("ui-rangeslider-last"),c.addClass(d),h.appendTo(k),i.appendTo(k),g.prependTo(c),j.prependTo(i),a.extend(this,{_inputFirst:e,_inputLast:f,_sliderFirst:h,_sliderLast:i,_targetVal:null,_sliderTarget:!1,_sliders:k,_proxy:!1}),this.refresh(),this._on(this.element.find("input.ui-slider-input"),{slidebeforestart:"_slidebeforestart",slidestop:"_slidestop",slidedrag:"_slidedrag",slidebeforechange:"_change",blur:"_change",keyup:"_change"}),this._on(j,{vmousedown:"_dragFirstHandle"})},_dragFirstHandle:function(b){return a.data(this._inputFirst.get(0),"mobileSlider").dragging=!0,a.data(this._inputFirst.get(0),"mobileSlider").refresh(b),!1},_slidedrag:function(b){var c=a(b.target).is(this._inputFirst),d=c?this._inputLast:this._inputFirst;this._sliderTarget=!1;if(this._proxy==="first"&&c||this._proxy==="last"&&!c)return a.data(d.get(0),"mobileSlider").dragging=!0,a.data(d.get(0),"mobileSlider").refresh(b),!1},_slidestop:function(b){var c=a(b.target).is(this._inputFirst);this._proxy=!1,this.element.find("input").trigger("vmouseup"),this._sliderFirst.css("z-index",c?1:"")},_slidebeforestart:function(b){this._sliderTarget=!1,a(b.originalEvent.target).hasClass("ui-slider-track")&&(this._sliderTarget=!0,this._targetVal=a(b.target).val())},_setOption:function(a){this._superApply(a),this.refresh()},refresh:function(){var a=this.element,b=this.options;a.find("input").slider({theme:b.theme,trackTheme:b.trackTheme,disabled:b.disabled,mini:b.mini,highlight:b.highlight}).slider("refresh"),this._updateHighlight()},_change:function(b){if(b.type=="keyup")return this._updateHighlight(),!1;var c=parseFloat(this._inputFirst.val(),10),d=parseFloat(this._inputLast.val(),10),e=a(b.target).hasClass("ui-rangeslider-first"),f=e?this._inputFirst:this._inputLast,g=e?this._inputLast:this._inputFirst;if(c>d&&!this._sliderTarget)f.val(e?d:c).slider("refresh"),this._trigger("normalize");else if(c>d){f.val(this._targetVal).slider("refresh");var h=this;setTimeout(function(){g.val(e?c:d).slider("refresh"),a.data(g.get(0),"mobileSlider").handle.focus(),h._sliderFirst.css("z-index",e?"":1),h._trigger("normalize")},0),this._proxy=e?"first":"last"}c===d?(a.data(f.get(0),"mobileSlider").handle.css("z-index",1),a.data(g.get(0),"mobileSlider").handle.css("z-index",0)):(a.data(g.get(0),"mobileSlider").handle.css("z-index",""),a.data(f.get(0),"mobileSlider").handle.css("z-index","")),this._updateHighlight();if(c>=d)return!1},_updateHighlight:function(){var b=parseInt(a.data(this._inputFirst.get(0),"mobileSlider").handle.get(0).style.left,10),c=parseInt(a.data(this._inputLast.get(0),"mobileSlider").handle.get(0).style.left,10),d=c-b;this.element.find(".ui-slider-bg").css({"margin-left":b+"%",width:d+"%"})},_destroy:function(){this.element.removeClass("ui-rangeslider ui-mini").find("label").show(),this._inputFirst.after(this._sliderFirst),this._inputLast.after(this._sliderLast),this._sliders.remove(),this.element.find("input").removeClass("ui-rangeslider-first ui-rangeslider-last").slider("destroy")}}),a.widget("mobile.rangeslider",a.mobile.rangeslider,a.mobile.behaviors.formReset),a(c).bind("pagecreate create",function(b){a.mobile.rangeslider.prototype.enhanceWithin(b.target,!0)})}(a),function(a,d){a.widget("mobile.selectmenu",a.mobile.widget,{options:{theme:null,disabled:!1,icon:"arrow-d",iconpos:"right",inline:!1,corners:!0,shadow:!0,iconshadow:!0,overlayTheme:"a",dividerTheme:"b",hidePlaceholderMenuItems:!0,closeText:"Close",nativeMenu:!0,preventFocusZoom:/iPhone|iPad|iPod/.test(navigator.platform)&&navigator.userAgent.indexOf("AppleWebKit")>-1,initSelector:"select:not( :jqmData(role='slider') )",mini:!1},_button:function(){return a("<div/>")},_setDisabled:function(a){return this.element.attr("disabled",a),this.button.attr("aria-disabled",a),this._setOption("disabled",a)},_focusButton:function(){var a=this;setTimeout(function(){a.button.focus()},40)},_selectOptions:function(){return this.select.find("option")},_preExtension:function(){var b="";!~this.element[0].className.indexOf("ui-btn-left")||(b=" ui-btn-left"),!~this.element[0].className.indexOf("ui-btn-right")||(b=" ui-btn-right"),this.select=this.element.removeClass("ui-btn-left ui-btn-right").wrap("<div class='ui-select"+b+"'>"),this.selectID=this.select.attr("id"),this.label=a("label[for='"+this.selectID+"']").addClass("ui-select"),this.isMultiple=this.select[0].multiple,this.options.theme||(this.options.theme=a.mobile.getInheritedTheme(this.select,"c"))},_destroy:function(){var a=this.element.parents(".ui-select");a.length>0&&(a.is(".ui-btn-left, .ui-btn-right")&&this.element.addClass(a.is(".ui-btn-left")?"ui-btn-left":"ui-btn-right"),this.element.insertAfter(a),a.remove())},_create:function(){this._preExtension(),this._trigger("beforeCreate"),this.button=this._button();var c=this,d=this.options,e=d.inline||this.select.jqmData("inline"),f=d.mini||this.select.jqmData("mini"),g=d.icon?d.iconpos||this.select.jqmData("iconpos"):!1,h=this.select[0].selectedIndex===-1?0:this.select[0].selectedIndex,i=this.button.insertBefore(this.select).buttonMarkup({theme:d.theme,icon:d.icon,iconpos:g,inline:e,corners:d.corners,shadow:d.shadow,iconshadow:d.iconshadow,mini:f});this.setButtonText(),d.nativeMenu&&b.opera&&b.opera.version&&i.addClass("ui-select-nativeonly"),this.isMultiple&&(this.buttonCount=a("<span>").addClass("ui-li-count ui-btn-up-c ui-btn-corner-all").hide().appendTo(i.addClass("ui-li-has-count"))),(d.disabled||this.element.attr("disabled"))&&this.disable(),this.select.change(function(){c.refresh()}),this._handleFormReset&&this._handleFormReset(),this.build()},build:function(){var b=this;this.select.appendTo(b.button).bind("vmousedown",function(){b.button.addClass(a.mobile.activeBtnClass)}).bind("focus",function(){b.button.addClass(a.mobile.focusClass)}).bind("blur",function(){b.button.removeClass(a.mobile.focusClass)}).bind("focus vmouseover",function(){b.button.trigger("vmouseover")}).bind("vmousemove",function(){b.button.removeClass(a.mobile.activeBtnClass)}).bind("change blur vmouseout",function(){b.button.trigger("vmouseout").removeClass(a.mobile.activeBtnClass)}).bind("change blur",function(){b.button.removeClass("ui-btn-down-"+b.options.theme)}),b.button.bind("vmousedown",function(){b.options.preventFocusZoom&&a.mobile.zoom.disable(!0)}),b.label.bind("click focus",function(){b.options.preventFocusZoom&&a.mobile.zoom.disable(!0)}),b.select.bind("focus",function(){b.options.preventFocusZoom&&a.mobile.zoom.disable(!0)}),b.button.bind("mouseup",function(){b.options.preventFocusZoom&&setTimeout(function(){a.mobile.zoom.enable(!0)},0)}),b.select.bind("blur",function(){b.options.preventFocusZoom&&a.mobile.zoom.enable(!0)})},selected:function(){return this._selectOptions().filter(":selected")},selectedIndices:function(){var a=this;return this.selected().map(function(){return a._selectOptions().index(this)}).get()},setButtonText:function(){var b=this,d=this.selected(),e=this.placeholder,f=a(c.createElement("span"));this.button.find(".ui-btn-text").html(function(){return d.length?e=d.map(function(){return a(this).text()}).get().join(", "):e=b.placeholder,f.text(e).addClass(b.select.attr("class")).addClass(d.attr("class"))})},setButtonCount:function(){var a=this.selected();this.isMultiple&&this.buttonCount[a.length>1?"show":"hide"]().text(a.length)},_reset:function(){this.refresh()},refresh:function(){this.setButtonText(),this.setButtonCount()},open:a.noop,close:a.noop,disable:function(){this._setDisabled(!0),this.button.addClass("ui-disabled")},enable:function(){this._setDisabled(!1),this.button.removeClass("ui-disabled")}}),a.widget("mobile.selectmenu",a.mobile.selectmenu,a.mobile.behaviors.formReset),a.mobile.document.bind("pagecreate create",function(b){a.mobile.selectmenu.prototype.enhanceWithin(b.target,!0)})}(a),function(a,b){var d=function(d){var e=d.select,f=d._destroy,g=d.selectID,h=g?g:(a.mobile.ns||"")+"uuid-"+d.uuid,i=h+"-listbox",j=h+"-dialog",k=d.label,l=d.select.closest(".ui-page"),m=d._selectOptions(),n=d.isMultiple=d.select[0].multiple,o=g+"-button",p=g+"-menu",q=a("<div data-"+a.mobile.ns+"role='dialog' id='"+j+"' data-"+a.mobile.ns+"theme='"+d.options.theme+"' data-"+a.mobile.ns+"overlay-theme='"+d.options.overlayTheme+"'>"+"<div data-"+a.mobile.ns+"role='header'>"+"<div class='ui-title'>"+k.getEncodedText()+"</div>"+"</div>"+"<div data-"+a.mobile.ns+"role='content'></div>"+"</div>"),r=a("<div id='"+i+"' class='ui-selectmenu'>").insertAfter(d.select).popup({theme:d.options.overlayTheme}),s=a("<ul>",{"class":"ui-selectmenu-list",id:p,role:"listbox","aria-labelledby":o}).attr("data-"+a.mobile.ns+"theme",d.options.theme).attr("data-"+a.mobile.ns+"divider-theme",d.options.dividerTheme).appendTo(r),t=a("<div>",{"class":"ui-header ui-bar-"+d.options.theme}).prependTo(r),u=a("<h1>",{"class":"ui-title"}).appendTo(t),v,w,x;d.isMultiple&&(x=a("<a>",{text:d.options.closeText,href:"#","class":"ui-btn-left"}).attr("data-"+a.mobile.ns+"iconpos","notext").attr("data-"+a.mobile.ns+"icon","delete").appendTo(t).buttonMarkup()),a.extend(d,{select:d.select,selectID:g,buttonId:o,menuId:p,popupID:i,dialogID:j,thisPage:l,menuPage:q,label:k,selectOptions:m,isMultiple:n,theme:d.options.theme,listbox:r,list:s,header:t,headerTitle:u,headerClose:x,menuPageContent:v,menuPageClose:w,placeholder:"",build:function(){var c=this;c.refresh(),c._origTabIndex===b&&(c._origTabIndex=c.select[0].getAttribute("tabindex")===null?!1:c.select.attr("tabindex")),c.select.attr("tabindex","-1").focus(function(){a(this).blur(),c.button.focus()}),c.button.bind("vclick keydown",function(b){if(c.options.disabled||c.isOpen)return;if(b.type==="vclick"||b.keyCode&&(b.keyCode===a.mobile.keyCode.ENTER||b.keyCode===a.mobile.keyCode.SPACE))c._decideFormat(),c.menuType==="overlay"?c.button.attr("href","#"+c.popupID).attr("data-"+(a.mobile.ns||"")+"rel","popup"):c.button.attr("href","#"+c.dialogID).attr("data-"+(a.mobile.ns||"")+"rel","dialog"),c.isOpen=!0}),c.list.attr("role","listbox").bind("focusin",function(b){a(b.target).attr("tabindex","0").trigger("vmouseover")}).bind("focusout",function(b){a(b.target).attr("tabindex","-1").trigger("vmouseout")}).delegate("li:not(.ui-disabled, .ui-li-divider)","click",function(b){var e=c.select[0].selectedIndex,f=c.list.find("li:not(.ui-li-divider)").index(this),g=c._selectOptions().eq(f)[0];g.selected=c.isMultiple?!g.selected:!0,c.isMultiple&&a(this).find(".ui-icon").toggleClass("ui-icon-checkbox-on",g.selected).toggleClass("ui-icon-checkbox-off",!g.selected),(c.isMultiple||e!==f)&&c.select.trigger("change"),c.isMultiple?c.list.find("li:not(.ui-li-divider)").eq(f).addClass("ui-btn-down-"+d.options.theme).find("a").first().focus():c.close(),b.preventDefault()}).keydown(function(b){var c=a(b.target),e=c.closest("li"),f,g;switch(b.keyCode){case 38:return f=e.prev().not(".ui-selectmenu-placeholder"),f.is(".ui-li-divider")&&(f=f.prev()),f.length&&(c.blur().attr("tabindex","-1"),f.addClass("ui-btn-down-"+d.options.theme).find("a").first().focus()),!1;case 40:return g=e.next(),g.is(".ui-li-divider")&&(g=g.next()),g.length&&(c.blur().attr("tabindex","-1"),g.addClass("ui-btn-down-"+d.options.theme).find("a").first().focus()),!1;case 13:case 32:return c.trigger("click"),!1}}),c.menuPage.bind("pagehide",function(){a.mobile._bindPageRemove.call(c.thisPage)}),c.listbox.bind("popupafterclose",function(a){c.close()}),c.isMultiple&&c.headerClose.click(function(){if(c.menuType==="overlay")return c.close(),!1}),c.thisPage.addDependents(this.menuPage)},_isRebuildRequired:function(){var a=this.list.find("li"),b=this._selectOptions();return b.text()!==a.text()},selected:function(){return this._selectOptions().filter(":selected:not( :jqmData(placeholder='true') )")},refresh:function(b,c){var d=this,e=this.element,f=this.isMultiple,g;(b||this._isRebuildRequired())&&d._buildList(),g=this.selectedIndices(),d.setButtonText(),d.setButtonCount(),d.list.find("li:not(.ui-li-divider)").removeClass(a.mobile.activeBtnClass).attr("aria-selected",!1).each(function(b){if(a.inArray(b,g)>-1){var c=a(this);c.attr("aria-selected",!0),d.isMultiple?c.find(".ui-icon").removeClass("ui-icon-checkbox-off").addClass("ui-icon-checkbox-on"):c.is(".ui-selectmenu-placeholder")?c.next().addClass(a.mobile.activeBtnClass):c.addClass(a.mobile.activeBtnClass)}})},close:function(){if(this.options.disabled||!this.isOpen)return;var a=this;a.menuType==="page"?(a.menuPage.dialog("close"),a.list.appendTo(a.listbox)):a.listbox.popup("close"),a._focusButton(),a.isOpen=!1},open:function(){this.button.click()},_decideFormat:function(){function m(){var c=b.list.find("."+a.mobile.activeBtnClass+" a");c.length===0&&(c=b.list.find("li.ui-btn:not( :jqmData(placeholder='true') ) a")),c.first().focus().closest("li").addClass("ui-btn-down-"+d.options.theme)}var b=this,c=a.mobile.window,e=b.list.parent(),f=e.outerHeight(),g=e.outerWidth(),h=a("."+a.mobile.activePageClass),i=c.scrollTop(),j=b.button.offset().top,k=c.height(),l=c.width();f>k-80||!a.support.scrollTop?(b.menuPage.appendTo(a.mobile.pageContainer).page(),b.menuPageContent=q.find(".ui-content"),b.menuPageClose=q.find(".ui-header a"),b.thisPage.unbind("pagehide.remove"),i===0&&j>k&&b.thisPage.one("pagehide",function(){a(this).jqmData("lastScroll",j)}),b.menuPage.one("pageshow",function(){m()}).one("pagehide",function(){b.close()}),b.menuType="page",b.menuPageContent.append(b.list),b.menuPage.find("div .ui-title").text(b.label.text())):(b.menuType="overlay",b.listbox.one("popupafteropen",m))},_buildList:function(){var b=this,d=this.options,e=this.placeholder,f=!0,g=[],h=[],i=b.isMultiple?"checkbox-off":"false";b.list.empty().filter(".ui-listview").listview("destroy");var j=b.select.find("option"),k=j.length,l=this.select[0],m="data-"+a.mobile.ns,n=m+"option-index",o=m+"icon",p=m+"role",q=m+"placeholder",r=c.createDocumentFragment(),s=!1,t;for(var u=0;u<k;u++,s=!1){var v=j[u],w=a(v),x=v.parentNode,y=w.text(),z=c.createElement("a"),A=[];z.setAttribute("href","#"),z.appendChild(c.createTextNode(y));if(x!==l&&x.nodeName.toLowerCase()==="optgroup"){var B=x.getAttribute("label");if(B!==t){var C=c.createElement("li");C.setAttribute(p,"list-divider"),C.setAttribute("role","option"),C.setAttribute("tabindex","-1"),C.appendChild(c.createTextNode(B)),r.appendChild(C),t=B}}f&&(!v.getAttribute("value")||y.length===0||w.jqmData("placeholder"))&&(f=!1,s=!0,null===v.getAttribute(q)&&(this._removePlaceholderAttr=!0),v.setAttribute(q,!0),d.hidePlaceholderMenuItems&&A.push("ui-selectmenu-placeholder"),e!==y&&(e=b.placeholder=y));var D=c.createElement("li");v.disabled&&(A.push("ui-disabled"),D.setAttribute("aria-disabled",!0)),D.setAttribute(n,u),D.setAttribute(o,i),s&&D.setAttribute(q,!0),D.className=A.join(" "),D.setAttribute("role","option"),z.setAttribute("tabindex","-1"),D.appendChild(z),r.appendChild(D)}b.list[0].appendChild(r),!this.isMultiple&&!e.length?this.header.hide():this.headerTitle.text(this.placeholder),b.list.listview()},_button:function(){return a("<a>",{href:"#",role:"button",id:this.buttonId,"aria-haspopup":"true","aria-owns":this.menuId})},_destroy:function(){this.close(),this._origTabIndex!==b&&(this._origTabIndex!==!1?this.select.attr("tabindex",this._origTabIndex):this.select.removeAttr("tabindex")),this._removePlaceholderAttr&&this._selectOptions().removeAttr("data-"+a.mobile.ns+"placeholder"),this.listbox.remove(),f.apply(this,arguments)}})};a.mobile.document.bind("selectmenubeforecreate",function(b){var c=a(b.target).data("mobile-selectmenu");!c.options.nativeMenu&&c.element.parents(":jqmData(role='popup')").length===0&&d(c)})}(a),function(a,b){a.widget("mobile.fixedtoolbar",a.mobile.widget,{options:{visibleOnPageShow:!0,disablePageZoom:!0,transition:"slide",fullscreen:!1,tapToggle:!0,tapToggleBlacklist:"a, button, input, select, textarea, .ui-header-fixed, .ui-footer-fixed, .ui-popup, .ui-panel, .ui-panel-dismiss-open",hideDuringFocus:"input, textarea, select",updatePagePadding:!0,trackPersistentToolbars:!0,supportBlacklist:function(){return!a.support.fixedPosition},initSelector:":jqmData(position='fixed')"},_create:function(){var b=this,c=b.options,d=b.element,e=d.is(":jqmData(role='header')")?"header":"footer",f=d.closest(".ui-page");if(c.supportBlacklist()){b.destroy();return}d.addClass("ui-"+e+"-fixed"),c.fullscreen?(d.addClass("ui-"+e+"-fullscreen"),f.addClass("ui-page-"+e+"-fullscreen")):f.addClass("ui-page-"+e+"-fixed"),a.extend(this,{_thisPage:null}),b._addTransitionClass(),b._bindPageEvents(),b._bindToggleHandlers()},_addTransitionClass:function(){var a=this.options.transition;a&&a!=="none"&&(a==="slide"&&(a=this.element.is(".ui-header")?"slidedown":"slideup"),this.element.addClass(a))},_bindPageEvents:function(){this._thisPage=this.element.closest(".ui-page"),this._on(this._thisPage,{pagebeforeshow:"_handlePageBeforeShow",webkitAnimationStart:"_handleAnimationStart",animationstart:"_handleAnimationStart",updatelayout:"_handleAnimationStart",pageshow:"_handlePageShow",pagebeforehide:"_handlePageBeforeHide"})},_handlePageBeforeShow:function(){var b=this.options;b.disablePageZoom&&a.mobile.zoom.disable(!0),b.visibleOnPageShow||this.hide(!0)},_handleAnimationStart:function(){this.options.updatePagePadding&&this.updatePagePadding(this._thisPage)},_handlePageShow:function(){this.updatePagePadding(this._thisPage),this.options.updatePagePadding&&this._on(a.mobile.window,{throttledresize:"updatePagePadding"})},_handlePageBeforeHide:function(b,c){var d=this.options;d.disablePageZoom&&a.mobile.zoom.enable(!0),d.updatePagePadding&&this._off(a.mobile.window,"throttledresize");if(d.trackPersistentToolbars){var e=a(".ui-footer-fixed:jqmData(id)",this._thisPage),f=a(".ui-header-fixed:jqmData(id)",this._thisPage),g=e.length&&c.nextPage&&a(".ui-footer-fixed:jqmData(id='"+e.jqmData("id")+"')",c.nextPage)||a(),h=f.length&&c.nextPage&&a(".ui-header-fixed:jqmData(id='"+f.jqmData("id")+"')",c.nextPage)||a();if(g.length||h.length)g.add(h).appendTo(a.mobile.pageContainer),c.nextPage.one("pageshow",function(){h.prependTo(this),g.appendTo(this)})}},_visible:!0,updatePagePadding:function(b){var c=this.element,d=c.is(".ui-header"),e=parseFloat(c.css(d?"top":"bottom"));if(this.options.fullscreen)return;b=b||this._thisPage||c.closest(".ui-page"),a(b).css("padding-"+(d?"top":"bottom"),c.outerHeight()+e)},_useTransition:function(b){var c=a.mobile.window,d=this.element,e=c.scrollTop(),f=d.height(),g=d.closest(".ui-page").height(),h=a.mobile.getScreenHeight(),i=d.is(":jqmData(role='header')")?"header":"footer";return!b&&(this.options.transition&&this.options.transition!=="none"&&(i==="header"&&!this.options.fullscreen&&e>f||i==="footer"&&!this.options.fullscreen&&e+h<g-f)||this.options.fullscreen)},show:function(a){var b="ui-fixed-hidden",c=this.element;this._useTransition(a)?c.removeClass("out "+b).addClass("in").animationComplete(function(){c.removeClass("in")}):c.removeClass(b),this._visible=!0},hide:function(a){var b="ui-fixed-hidden",c=this.element,d="out"+(this.options.transition==="slide"?" reverse":"");this._useTransition(a)?c.addClass(d).removeClass("in").animationComplete(function(){c.addClass(b).removeClass(d)}):c.addClass(b).removeClass(d),this._visible=!1},toggle:function(){this[this._visible?"hide":"show"]()},_bindToggleHandlers:function(){var b=this,c,d=b.options,e=b.element;e.closest(".ui-page").bind("vclick",function(c){d.tapToggle&&!a(c.target).closest(d.tapToggleBlacklist).length&&b.toggle()}).bind("focusin focusout",function(e){screen.width<1025&&a(e.target).is(d.hideDuringFocus)&&!a(e.target).closest(".ui-header-fixed, .ui-footer-fixed").length&&(e.type==="focusout"&&!b._visible?c=setTimeout(function(){b.show()},0):e.type==="focusin"&&b._visible&&(clearTimeout(c),b.hide()))})},_destroy:function(){var a=this.element,b=a.is(".ui-header");a.closest(".ui-page").css("padding-"+(b?"top":"bottom"),""),a.removeClass("ui-header-fixed ui-footer-fixed ui-header-fullscreen ui-footer-fullscreen in out fade slidedown slideup ui-fixed-hidden"),a.closest(".ui-page").removeClass("ui-page-header-fixed ui-page-footer-fixed ui-page-header-fullscreen ui-page-footer-fullscreen")}}),a.mobile.document.bind("pagecreate create",function(b){a(b.target).jqmData("fullscreen")&&a(a.mobile.fixedtoolbar.prototype.options.initSelector,b.target).not(":jqmData(fullscreen)").jqmData("fullscreen",!0),a.mobile.fixedtoolbar.prototype.enhanceWithin(b.target)})}(a),function(a,b){a.widget("mobile.fixedtoolbar",a.mobile.fixedtoolbar,{_create:function(){this._super(),this._workarounds()},_workarounds:function(){var a=navigator.userAgent,b=navigator.platform,c=a.match(/AppleWebKit\/([0-9]+)/),d=!!c&&c[1],e=null,f=this;if(b.indexOf("iPhone")>-1||b.indexOf("iPad")>-1||b.indexOf("iPod")>-1)e="ios";else if(a.indexOf("Android")>-1)e="android";else return;if(e==="ios")f._bindScrollWorkaround();else if(e==="android"&&d&&d<534)f._bindScrollWorkaround(),f._bindListThumbWorkaround();else return},_viewportOffset:function(){var b=this.element,c=b.is(".ui-header"),d=Math.abs(b.offset().top-a.mobile.window.scrollTop());return c||(d=Math.round(d-a.mobile.window.height()+b.outerHeight())-60),d},_bindScrollWorkaround:function(){var b=this;this._on(a.mobile.window,{scrollstop:function(){var a=b._viewportOffset();a>2&&b._visible&&b._triggerRedraw()}})},_bindListThumbWorkaround:function(){this.element.closest(".ui-page").addClass("ui-android-2x-fixed")},_triggerRedraw:function(){var b=parseFloat(a(".ui-page-active").css("padding-bottom"));a(".ui-page-active").css("padding-bottom",b+1+"px"),setTimeout(function(){a(".ui-page-active").css("padding-bottom",b+"px")},0)},destroy:function(){this._super(),this.element.closest(".ui-page-active").removeClass("ui-android-2x-fix")}})}(a),function(a,b){function j(a){e=a.originalEvent,i=e.accelerationIncludingGravity,f=Math.abs(i.x),g=Math.abs(i.y),h=Math.abs(i.z),!b.orientation&&(f>7||(h>6&&g<8||h<8&&g>6)&&f>5)?d.enabled&&d.disable():d.enabled||d.enable()}a.mobile.iosorientationfixEnabled=!0;var c=navigator.userAgent;if(!(/iPhone|iPad|iPod/.test(navigator.platform)&&/OS [1-5]_[0-9_]* like Mac OS X/i.test(c)&&c.indexOf("AppleWebKit")>-1)){a.mobile.iosorientationfixEnabled=!1;return}var d=a.mobile.zoom,e,f,g,h,i;a.mobile.document.on("mobileinit",function(){a.mobile.iosorientationfixEnabled&&a.mobile.window.bind("orientationchange.iosorientationfix",d.enable).bind("devicemotion.iosorientationfix",j)})}(a,this),function(a,b,d){function h(){e.removeClass("ui-mobile-rendering")}var e=a("html"),f=a("head"),g=a.mobile.window;a(b.document).trigger("mobileinit");if(!a.mobile.gradeA())return;a.mobile.ajaxBlacklist&&(a.mobile.ajaxEnabled=!1),e.addClass("ui-mobile ui-mobile-rendering"),setTimeout(h,5e3),a.extend(a.mobile,{initializePage:function(){var b=a.mobile.path,d=a(":jqmData(role='page'), :jqmData(role='dialog')"),e=b.stripHash(b.stripQueryParams(b.parseLocation().hash)),f=c.getElementById(e);d.length||(d=a("body").wrapInner("<div data-"+a.mobile.ns+"role='page'></div>").children(0)),d.each(function(){var b=a(this);b.jqmData("url")||b.attr("data-"+a.mobile.ns+"url",b.attr("id")||location.pathname+location.search)}),a.mobile.firstPage=d.first(),a.mobile.pageContainer=a.mobile.firstPage.parent().addClass("ui-mobile-viewport"),g.trigger("pagecontainercreate"),a.mobile.showPageLoadingMsg(),h(),!a.mobile.hashListeningEnabled||!a.mobile.path.isHashValid(location.hash)||!a(f).is(':jqmData(role="page")')&&!a.mobile.path.isPath(e)&&e!==a.mobile.dialogHashKey?(a.mobile.path.isHashValid(location.hash)&&(a.mobile.urlHistory.initialDst=e.replace("#","")),a.event.special.navigate.isPushStateEnabled()&&a.mobile.navigate.navigator.squash(b.parseLocation().href),a.mobile.changePage(a.mobile.firstPage,{transition:"none",reverse:!0,changeHash:!1,fromHashChange:!0})):a.event.special.navigate.isPushStateEnabled()?(a.mobile.navigate.history.stack=[],a.mobile.navigate(a.mobile.path.isPath(location.hash)?location.hash:location.href)):g.trigger("hashchange",[!0])}}),a.mobile.navreadyDeferred.resolve(),a(function(){b.scrollTo(0,1),a.mobile.defaultHomeScroll=!a.support.scrollTop||a.mobile.window.scrollTop()===1?0:1,a.mobile.autoInitializePage&&a.mobile.initializePage(),g.load(a.mobile.silentScroll),a.support.cssPointerEvents||a.mobile.document.delegate(".ui-disabled","vclick",function(a){a.preventDefault(),a.stopImmediatePropagation()})})}(a,this)});
\ No newline at end of file
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index eafaac26c6a..c136eeac280 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -986,13 +986,13 @@ function top_httphead()
  * Ouput html header of a page.
  * This code is also duplicated into security2.lib.php::dol_loginfunction
  *
- * @param 	string 	$head			Optionnal head lines
- * @param 	string 	$title			HTML title
- * @param 	int    	$disablejs		Disable js output
- * @param 	int    	$disablehead	Disable head output
- * @param 	array  	$arrayofjs		Array of complementary js files
- * @param 	array  	$arrayofcss		Array of complementary css files
- * @param 	int    	$disablejmobile	Disable jmobile
+ * @param 	string 	$head			 Optionnal head lines
+ * @param 	string 	$title			 HTML title
+ * @param 	int    	$disablejs		 Disable js output
+ * @param 	int    	$disablehead	 Disable head output
+ * @param 	array  	$arrayofjs		 Array of complementary js files
+ * @param 	array  	$arrayofcss		 Array of complementary css files
+ * @param 	int    	$disablejmobile	 Disable jmobile (No more used)
  * @param   int     $disablenofollow Disable no follow tag
  * @return	void
  */
@@ -1059,8 +1059,8 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
             if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";  // JQuery
             else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";    // JQuery
-            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/tipTip.css'.($ext?'?'.$ext:'').'">'."\n";                           // Tooltip
-            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
+            if (! defined('DISABLE_JQUERY_TIPTIP')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/tipTip.css'.($ext?'?'.$ext:'').'">'."\n";                           // Tooltip
+            if (! defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
             /* Removed a old hidden problematic feature never used in Dolibarr. If an external module need datatable, the module must provide all lib it needs and manage version problems with other dolibarr components
             if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES) || (defined('REQUIRE_JQUERY_DATATABLES') && constant('REQUIRE_JQUERY_DATATABLES')))     // jQuery datatables
             {
@@ -1068,7 +1068,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css'.($ext?'?'.$ext:'').'">'."\n";
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'.($ext?'?'.$ext:'').'"></script>'."\n";
             }*/
-            if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
+            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
             {
             	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
             	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'">'."\n";
@@ -1078,15 +1078,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             {
             	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css'.($ext?'?'.$ext:'').'">'."\n";
             }
-            // jQuery jMobile
-            if (! $disablejmobile && (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || ! empty($conf->dol_use_jmobile)))
-            {
-                $tmp=basename($_SERVER["PHP_SELF"]);
-                if ($tmp == 'get_menudiv.php' || $conf->dol_use_jmobile == 4)
-                {
-            	   print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css'.($ext?'?'.$ext:'').'">'."\n";
-                }
-            }
         }
 
         print '<!-- Includes CSS for Dolibarr theme -->'."\n";
@@ -1149,8 +1140,8 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             if (constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/jquery.tipTip.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            if (! defined('DISABLE_JQUERY_TIPTIP')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/jquery.tipTip.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             // jQuery jnotify
             if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
             {
@@ -1167,7 +1158,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/blockUI.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
             // Flot
-            if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT))
+            if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && ! defined('DISABLE_JQUERY_FLOT'))
             {
                 if (constant('JS_JQUERY_FLOT'))
                 {
@@ -1183,7 +1174,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 }
             }
             // jQuery jeditable
-            if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE))
+            if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! defined('DISABLE_JQUERY_JEDITABLE'))
             {
             	print '<!-- JS to manage editInPlace feature -->'."\n";
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
@@ -1234,55 +1225,18 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
             }
-            if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
+            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
             {
             	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/select2_locale.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
             }
-            // jQuery jMobile
-            if (! $disablejmobile && (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || (! empty($conf->dol_use_jmobile) && $conf->dol_use_jmobile > 0)))
-            {
-            	// We must force not using ajax because cache of jquery does not load js of other pages.
-            	// This also increase seriously speed onto mobile device where complex js code is very slow and memory very low.
-            	// Note: dol_use_jmobile=1 use jmobile without ajax, dol_use_jmobile=2 use jmobile with ajax
-            	// 3=???
-            	// 4=all pages, not only menu
-                $tmp=basename($_SERVER["PHP_SELF"]);
-                if ($tmp == 'get_menudiv.php' || $conf->dol_use_jmobile == 4)
-                {
-                    if (empty($conf->dol_use_jmobile) || ($conf->dol_use_jmobile != 2 && $conf->dol_use_jmobile != 3))
-                	{
-                		print '<script type="text/javascript">
-    	            		$(document).bind("mobileinit", function() {
-                		    ';
-                		if ($conf->theme == 'md')
-                		{
-                   		    // Disabled decoration for some css
-                    		print '
-                    		    $.mobile.keepNative = \'input[type="submit"]\';
-                    		   ';
-                		}
-                        print '
-                   				$.extend(  $.mobile , {
-                   					autoInitializePage : true,
-                   					touchOverflowEnabled : true,
-                   					defaultPageTransition : \'none\',
-                   					defaultDialogTransition : \'none\',
-                   					ajaxEnabled : false
-                   					});
-               				});
-                			</script>';
-                	}
-                	if (empty($conf->dol_use_jmobile) || $conf->dol_use_jmobile != 3) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                }
-            }
         }
 
         if (! $disablejs && ! empty($conf->use_javascript_ajax))
         {
             // CKEditor
-            if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor'))
+            if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && ! defined('DISABLE_CKEDITOR'))
             {
                 print '<!-- Includes JS for CKEditor -->'."\n";
                 $pathckeditor = DOL_URL_ROOT . '/includes/ckeditor/ckeditor/';
@@ -1301,12 +1255,15 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             }
             
             // Browser notifications
-            $enablebrowsernotif=false;
-            if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_NOTIFICATION)) $enablebrowsernotif=true;
-            if ($enablebrowsernotif)
+            if (! defined('DISABLE_BROWSER_NOTIF'))
             {
-                print '<!-- Includes JS of Dolibarr -->'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php?version='.urlencode(DOL_VERSION).($ext?'&amp;'.$ext:'').'"></script>'."\n";
+                $enablebrowsernotif=false;
+                if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_NOTIFICATION)) $enablebrowsernotif=true;
+                if ($enablebrowsernotif)
+                {
+                    print '<!-- Includes JS of Dolibarr -->'."\n";
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php?version='.urlencode(DOL_VERSION).($ext?'&amp;'.$ext:'').'"></script>'."\n";
+                }
             }
             
             // Global js function
@@ -1314,8 +1271,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
 
             // Add datepicker default options
-            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
-
+            if (! defined('DISABLE_DATE_PICKER'))
+            {
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
+            }
+            
             // JS forced by modules (relative url starting with /)
             if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
         	{
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 7d519eb633a..9a190da54b3 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -4253,7 +4253,7 @@ ul.ulmenu {
 }
 .ulmenu {
 	box-shadow: none !important;
-	border-bottom: 1px solid #444;
+	border-bottom: 1px solid #ccc;
 }
 .ui-btn-icon-right {
 	border-right: 1px solid #ccc !important;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index ff95b7781d9..3292420e82a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4152,7 +4152,7 @@ ul.ulmenu {
 }
 .ulmenu {
 	box-shadow: none !important;
-	border-bottom: 1px solid #444;
+	border-bottom: 1px solid #ccc;
 }
 .ui-btn-icon-right {
 	border-right: 1px solid #ccc !important;

From 49d0deea39a62838d21b511ad607c88c5ba3118e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2017 00:46:19 +0100
Subject: [PATCH 0301/1163] NEW Upgrade jquery to 3.3.1 and jquery-ui to 1.12

---
 .../jquery/css/smoothness/jquery-ui.css       |  2032 +-
 htdocs/includes/jquery/js/jquery-ui.js        | 25833 +++++++++-------
 htdocs/includes/jquery/js/jquery-ui.min.js    |    22 +-
 htdocs/includes/jquery/js/jquery.js           | 10347 +++----
 htdocs/includes/jquery/js/jquery.min.js       |     9 +-
 5 files changed, 20472 insertions(+), 17771 deletions(-)

diff --git a/htdocs/includes/jquery/css/smoothness/jquery-ui.css b/htdocs/includes/jquery/css/smoothness/jquery-ui.css
index 1c22746c81b..f687a9d95d1 100644
--- a/htdocs/includes/jquery/css/smoothness/jquery-ui.css
+++ b/htdocs/includes/jquery/css/smoothness/jquery-ui.css
@@ -1,9 +1,17 @@
-/*! jQuery UI - v1.11.4 - 2015-03-11
-* http://jqueryui.com
-* Includes: core.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, draggable.css, menu.css, progressbar.css, resizable.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
-
+/*!
+ * jQuery UI CSS Framework 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/category/theming/
+ */
+.ui-draggable-handle {
+	-ms-touch-action: none;
+	touch-action: none;
+}
 /* Layout helpers
 ----------------------------------*/
 .ui-helper-hidden {
@@ -38,9 +46,6 @@
 .ui-helper-clearfix:after {
 	clear: both;
 }
-.ui-helper-clearfix {
-	min-height: 0; /* support: IE7 */
-}
 .ui-helper-zfix {
 	width: 100%;
 	height: 100%;
@@ -60,20 +65,27 @@
 ----------------------------------*/
 .ui-state-disabled {
 	cursor: default !important;
+	pointer-events: none;
 }
 
 
 /* Icons
 ----------------------------------*/
-
-/* states and images */
 .ui-icon {
-	display: block;
+	display: inline-block;
+	vertical-align: middle;
+	margin-top: -.25em;
+	position: relative;
 	text-indent: -99999px;
 	overflow: hidden;
 	background-repeat: no-repeat;
 }
 
+.ui-widget-icon-block {
+	left: 50%;
+	margin-left: -8px;
+	display: block;
+}
 
 /* Misc visuals
 ----------------------------------*/
@@ -86,27 +98,97 @@
 	width: 100%;
 	height: 100%;
 }
+.ui-resizable {
+	position: relative;
+}
+.ui-resizable-handle {
+	position: absolute;
+	font-size: 0.1px;
+	display: block;
+	-ms-touch-action: none;
+	touch-action: none;
+}
+.ui-resizable-disabled .ui-resizable-handle,
+.ui-resizable-autohide .ui-resizable-handle {
+	display: none;
+}
+.ui-resizable-n {
+	cursor: n-resize;
+	height: 7px;
+	width: 100%;
+	top: -5px;
+	left: 0;
+}
+.ui-resizable-s {
+	cursor: s-resize;
+	height: 7px;
+	width: 100%;
+	bottom: -5px;
+	left: 0;
+}
+.ui-resizable-e {
+	cursor: e-resize;
+	width: 7px;
+	right: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-w {
+	cursor: w-resize;
+	width: 7px;
+	left: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-se {
+	cursor: se-resize;
+	width: 12px;
+	height: 12px;
+	right: 1px;
+	bottom: 1px;
+}
+.ui-resizable-sw {
+	cursor: sw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	bottom: -5px;
+}
+.ui-resizable-nw {
+	cursor: nw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	top: -5px;
+}
+.ui-resizable-ne {
+	cursor: ne-resize;
+	width: 9px;
+	height: 9px;
+	right: -5px;
+	top: -5px;
+}
+.ui-selectable {
+	-ms-touch-action: none;
+	touch-action: none;
+}
+.ui-selectable-helper {
+	position: absolute;
+	z-index: 100;
+	border: 1px dotted black;
+}
+.ui-sortable-handle {
+	-ms-touch-action: none;
+	touch-action: none;
+}
 .ui-accordion .ui-accordion-header {
 	display: block;
 	cursor: pointer;
 	position: relative;
 	margin: 2px 0 0 0;
 	padding: .5em .5em .5em .7em;
-	min-height: 0; /* support: IE7 */
 	font-size: 100%;
 }
-.ui-accordion .ui-accordion-icons {
-	padding-left: 2.2em;
-}
-.ui-accordion .ui-accordion-icons .ui-accordion-icons {
-	padding-left: 2.2em;
-}
-.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
-	position: absolute;
-	left: .5em;
-	top: 50%;
-	margin-top: -8px;
-}
 .ui-accordion .ui-accordion-content {
 	padding: 1em 2.2em;
 	border-top: 0;
@@ -118,17 +200,78 @@
 	left: 0;
 	cursor: default;
 }
+.ui-menu {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	display: block;
+	outline: 0;
+}
+.ui-menu .ui-menu {
+	position: absolute;
+}
+.ui-menu .ui-menu-item {
+	margin: 0;
+	cursor: pointer;
+	/* support: IE10, see #8844 */
+	list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
+}
+.ui-menu .ui-menu-item-wrapper {
+	position: relative;
+	padding: 3px 1em 3px .4em;
+}
+.ui-menu .ui-menu-divider {
+	margin: 5px 0;
+	height: 0;
+	font-size: 0;
+	line-height: 0;
+	border-width: 1px 0 0 0;
+}
+.ui-menu .ui-state-focus,
+.ui-menu .ui-state-active {
+	margin: -1px;
+}
+
+/* icon support */
+.ui-menu-icons {
+	position: relative;
+}
+.ui-menu-icons .ui-menu-item-wrapper {
+	padding-left: 2em;
+}
+
+/* left-aligned */
+.ui-menu .ui-icon {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: .2em;
+	margin: auto 0;
+}
+
+/* right-aligned */
+.ui-menu .ui-menu-icon {
+	left: auto;
+	right: 0;
+}
 .ui-button {
+	padding: .4em 1em;
 	display: inline-block;
 	position: relative;
-	padding: 0;
 	line-height: normal;
 	margin-right: .1em;
 	cursor: pointer;
 	vertical-align: middle;
 	text-align: center;
-	overflow: visible; /* removes extra width in IE */
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+
+	/* Support: IE <= 11 */
+	overflow: visible;
 }
+
 .ui-button,
 .ui-button:link,
 .ui-button:visited,
@@ -136,92 +279,130 @@
 .ui-button:active {
 	text-decoration: none;
 }
+
 /* to make room for the icon, a width needs to be set here */
 .ui-button-icon-only {
-	width: 2.2em;
-}
-/* button elements seem to need a little more width */
-button.ui-button-icon-only {
-	width: 2.4em;
-}
-.ui-button-icons-only {
-	width: 3.4em;
-}
-button.ui-button-icons-only {
-	width: 3.7em;
+	width: 2em;
+	box-sizing: border-box;
+	text-indent: -9999px;
+	white-space: nowrap;
 }
 
-/* button text element */
-.ui-button .ui-button-text {
-	display: block;
-	line-height: normal;
-}
-.ui-button-text-only .ui-button-text {
-	padding: .4em 1em;
-}
-.ui-button-icon-only .ui-button-text,
-.ui-button-icons-only .ui-button-text {
-	padding: .4em;
-	text-indent: -9999999px;
-}
-.ui-button-text-icon-primary .ui-button-text,
-.ui-button-text-icons .ui-button-text {
-	padding: .4em 1em .4em 2.1em;
-}
-.ui-button-text-icon-secondary .ui-button-text,
-.ui-button-text-icons .ui-button-text {
-	padding: .4em 2.1em .4em 1em;
-}
-.ui-button-text-icons .ui-button-text {
-	padding-left: 2.1em;
-	padding-right: 2.1em;
-}
-/* no icon support for input elements, provide padding by default */
-input.ui-button {
-	padding: .4em 1em;
+/* no icon support for input elements */
+input.ui-button.ui-button-icon-only {
+	text-indent: 0;
 }
 
 /* button icon element(s) */
-.ui-button-icon-only .ui-icon,
-.ui-button-text-icon-primary .ui-icon,
-.ui-button-text-icon-secondary .ui-icon,
-.ui-button-text-icons .ui-icon,
-.ui-button-icons-only .ui-icon {
+.ui-button-icon-only .ui-icon {
 	position: absolute;
 	top: 50%;
-	margin-top: -8px;
-}
-.ui-button-icon-only .ui-icon {
 	left: 50%;
+	margin-top: -8px;
 	margin-left: -8px;
 }
-.ui-button-text-icon-primary .ui-button-icon-primary,
-.ui-button-text-icons .ui-button-icon-primary,
-.ui-button-icons-only .ui-button-icon-primary {
-	left: .5em;
-}
-.ui-button-text-icon-secondary .ui-button-icon-secondary,
-.ui-button-text-icons .ui-button-icon-secondary,
-.ui-button-icons-only .ui-button-icon-secondary {
-	right: .5em;
+
+.ui-button.ui-icon-notext .ui-icon {
+	padding: 0;
+	width: 2.1em;
+	height: 2.1em;
+	text-indent: -9999px;
+	white-space: nowrap;
+
 }
 
-/* button sets */
-.ui-buttonset {
-	margin-right: 7px;
-}
-.ui-buttonset .ui-button {
-	margin-left: 0;
-	margin-right: -.3em;
+input.ui-button.ui-icon-notext .ui-icon {
+	width: auto;
+	height: auto;
+	text-indent: 0;
+	white-space: normal;
+	padding: .4em 1em;
 }
 
 /* workarounds */
-/* reset extra padding in Firefox, see h5bp.com/l */
+/* Support: Firefox 5 - 40 */
 input.ui-button::-moz-focus-inner,
 button.ui-button::-moz-focus-inner {
 	border: 0;
 	padding: 0;
 }
+.ui-controlgroup {
+	vertical-align: middle;
+	display: inline-block;
+}
+.ui-controlgroup > .ui-controlgroup-item {
+	float: left;
+	margin-left: 0;
+	margin-right: 0;
+}
+.ui-controlgroup > .ui-controlgroup-item:focus,
+.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus {
+	z-index: 9999;
+}
+.ui-controlgroup-vertical > .ui-controlgroup-item {
+	display: block;
+	float: none;
+	width: 100%;
+	margin-top: 0;
+	margin-bottom: 0;
+	text-align: left;
+}
+.ui-controlgroup-vertical .ui-controlgroup-item {
+	box-sizing: border-box;
+}
+.ui-controlgroup .ui-controlgroup-label {
+	padding: .4em 1em;
+}
+.ui-controlgroup .ui-controlgroup-label span {
+	font-size: 80%;
+}
+.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item {
+	border-left: none;
+}
+.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item {
+	border-top: none;
+}
+.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content {
+	border-right: none;
+}
+.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content {
+	border-bottom: none;
+}
+
+/* Spinner specific style fixes */
+.ui-controlgroup-vertical .ui-spinner-input {
+
+	/* Support: IE8 only, Android < 4.4 only */
+	width: 75%;
+	width: calc( 100% - 2.4em );
+}
+.ui-controlgroup-vertical .ui-spinner .ui-spinner-up {
+	border-top-style: solid;
+}
+
+.ui-checkboxradio-label .ui-icon-background {
+	box-shadow: inset 1px 1px 1px #ccc;
+	border-radius: .12em;
+	border: none;
+}
+.ui-checkboxradio-radio-label .ui-icon-background {
+	width: 16px;
+	height: 16px;
+	border-radius: 1em;
+	overflow: visible;
+	border: none;
+}
+.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,
+.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon {
+	background-image: none;
+	width: 8px;
+	height: 8px;
+	border-width: 4px;
+	border-style: solid;
+}
+.ui-checkboxradio-disabled {
+	pointer-events: none;
+}
 .ui-datepicker {
 	width: 17em;
 	padding: .2em .2em 0;
@@ -387,8 +568,17 @@ button.ui-button::-moz-focus-inner {
 	border-right-width: 0;
 	border-left-width: 1px;
 }
-.ui-dialog {
+
+/* Icons */
+.ui-datepicker .ui-icon {
+	display: block;
+	text-indent: -99999px;
 	overflow: hidden;
+	background-repeat: no-repeat;
+	left: .5em;
+	top: .3em;
+}
+.ui-dialog {
 	position: absolute;
 	top: 0;
 	left: 0;
@@ -437,73 +627,48 @@ button.ui-button::-moz-focus-inner {
 	margin: .5em .4em .5em 0;
 	cursor: pointer;
 }
+.ui-dialog .ui-resizable-n {
+	height: 2px;
+	top: 0;
+}
+.ui-dialog .ui-resizable-e {
+	width: 2px;
+	right: 0;
+}
+.ui-dialog .ui-resizable-s {
+	height: 2px;
+	bottom: 0;
+}
+.ui-dialog .ui-resizable-w {
+	width: 2px;
+	left: 0;
+}
+.ui-dialog .ui-resizable-se,
+.ui-dialog .ui-resizable-sw,
+.ui-dialog .ui-resizable-ne,
+.ui-dialog .ui-resizable-nw {
+	width: 7px;
+	height: 7px;
+}
 .ui-dialog .ui-resizable-se {
-	width: 12px;
-	height: 12px;
-	right: -5px;
-	bottom: -5px;
-	background-position: 16px 16px;
+	right: 0;
+	bottom: 0;
+}
+.ui-dialog .ui-resizable-sw {
+	left: 0;
+	bottom: 0;
+}
+.ui-dialog .ui-resizable-ne {
+	right: 0;
+	top: 0;
+}
+.ui-dialog .ui-resizable-nw {
+	left: 0;
+	top: 0;
 }
 .ui-draggable .ui-dialog-titlebar {
 	cursor: move;
 }
-.ui-draggable-handle {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-menu {
-	list-style: none;
-	padding: 0;
-	margin: 0;
-	display: block;
-	outline: none;
-}
-.ui-menu .ui-menu {
-	position: absolute;
-}
-.ui-menu .ui-menu-item {
-	position: relative;
-	margin: 0;
-	padding: 3px 1em 3px .4em;
-	cursor: pointer;
-	min-height: 0; /* support: IE7 */
-	/* support: IE10, see #8844 */
-	list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
-}
-.ui-menu .ui-menu-divider {
-	margin: 5px 0;
-	height: 0;
-	font-size: 0;
-	line-height: 0;
-	border-width: 1px 0 0 0;
-}
-.ui-menu .ui-state-focus,
-.ui-menu .ui-state-active {
-	margin: -1px;
-}
-
-/* icon support */
-.ui-menu-icons {
-	position: relative;
-}
-.ui-menu-icons .ui-menu-item {
-	padding-left: 2em;
-}
-
-/* left-aligned */
-.ui-menu .ui-icon {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: .2em;
-	margin: auto 0;
-}
-
-/* right-aligned */
-.ui-menu .ui-menu-icon {
-	left: auto;
-	right: 0;
-}
 .ui-progressbar {
 	height: 2em;
 	text-align: left;
@@ -522,85 +687,6 @@ button.ui-button::-moz-focus-inner {
 .ui-progressbar-indeterminate .ui-progressbar-value {
 	background-image: none;
 }
-.ui-resizable {
-	position: relative;
-}
-.ui-resizable-handle {
-	position: absolute;
-	font-size: 0.1px;
-	display: block;
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-resizable-disabled .ui-resizable-handle,
-.ui-resizable-autohide .ui-resizable-handle {
-	display: none;
-}
-.ui-resizable-n {
-	cursor: n-resize;
-	height: 7px;
-	width: 100%;
-	top: -5px;
-	left: 0;
-}
-.ui-resizable-s {
-	cursor: s-resize;
-	height: 7px;
-	width: 100%;
-	bottom: -5px;
-	left: 0;
-}
-.ui-resizable-e {
-	cursor: e-resize;
-	width: 7px;
-	right: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-w {
-	cursor: w-resize;
-	width: 7px;
-	left: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-se {
-	cursor: se-resize;
-	width: 12px;
-	height: 12px;
-	right: 1px;
-	bottom: 1px;
-}
-.ui-resizable-sw {
-	cursor: sw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	bottom: -5px;
-}
-.ui-resizable-nw {
-	cursor: nw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	top: -5px;
-}
-.ui-resizable-ne {
-	cursor: ne-resize;
-	width: 9px;
-	height: 9px;
-	right: -5px;
-	top: -5px;
-}
-.ui-selectable {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-selectable-helper {
-	position: absolute;
-	z-index: 100;
-	border: 1px dotted black;
-}
 .ui-selectmenu-menu {
 	padding: 0;
 	margin: 0;
@@ -611,7 +697,6 @@ button.ui-button::-moz-focus-inner {
 }
 .ui-selectmenu-menu .ui-menu {
 	overflow: auto;
-	/* Support: IE7 */
 	overflow-x: hidden;
 	padding-bottom: 1px;
 }
@@ -627,28 +712,20 @@ button.ui-button::-moz-focus-inner {
 .ui-selectmenu-open {
 	display: block;
 }
-.ui-selectmenu-button {
-	display: inline-block;
-	overflow: hidden;
-	position: relative;
-	text-decoration: none;
-	cursor: pointer;
-}
-.ui-selectmenu-button span.ui-icon {
-	right: 0.5em;
-	left: auto;
-	margin-top: -8px;
-	position: absolute;
-	top: 50%;
-}
-.ui-selectmenu-button span.ui-selectmenu-text {
-	text-align: left;
-	padding: 0.4em 2.1em 0.4em 1em;
+.ui-selectmenu-text {
 	display: block;
-	line-height: 1.4;
+	margin-right: 20px;
 	overflow: hidden;
 	text-overflow: ellipsis;
+}
+.ui-selectmenu-button.ui-button {
+	text-align: left;
 	white-space: nowrap;
+	width: 14em;
+}
+.ui-selectmenu-icon.ui-icon {
+	float: right;
+	margin-top: 0;
 }
 .ui-slider {
 	position: relative;
@@ -715,10 +792,6 @@ button.ui-button::-moz-focus-inner {
 .ui-slider-vertical .ui-slider-range-max {
 	top: 0;
 }
-.ui-sortable-handle {
-	-ms-touch-action: none;
-	touch-action: none;
-}
 .ui-spinner {
 	position: relative;
 	display: inline-block;
@@ -730,14 +803,14 @@ button.ui-button::-moz-focus-inner {
 	border: none;
 	background: none;
 	color: inherit;
-	padding: 0;
+	padding: .222em 0;
 	margin: .2em 0;
 	vertical-align: middle;
 	margin-left: .4em;
-	margin-right: 22px;
+	margin-right: 2em;
 }
 .ui-spinner-button {
-	width: 16px;
+	width: 1.6em;
 	height: 50%;
 	font-size: .5em;
 	padding: 0;
@@ -751,16 +824,9 @@ button.ui-button::-moz-focus-inner {
 }
 /* more specificity required here to override default borders */
 .ui-spinner a.ui-spinner-button {
-	border-top: none;
-	border-bottom: none;
-	border-right: none;
-}
-/* vertically center icon */
-.ui-spinner .ui-icon {
-	position: absolute;
-	margin-top: -8px;
-	top: 50%;
-	left: 0;
+	border-top-style: none;
+	border-bottom-style: none;
+	border-right-style: none;
 }
 .ui-spinner-up {
 	top: 0;
@@ -768,12 +834,6 @@ button.ui-button::-moz-focus-inner {
 .ui-spinner-down {
 	bottom: 0;
 }
-
-/* TR overrides */
-.ui-spinner .ui-icon-triangle-1-s {
-	/* need to fix icons sprite */
-	background-position: -65px -16px;
-}
 .ui-tabs {
 	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
 	padding: .2em;
@@ -820,13 +880,26 @@ button.ui-button::-moz-focus-inner {
 	position: absolute;
 	z-index: 9999;
 	max-width: 300px;
-	-webkit-box-shadow: 0 0 5px #aaa;
-	box-shadow: 0 0 5px #aaa;
 }
 body .ui-tooltip {
 	border-width: 2px;
 }
 
+
+/*!
+ * jQuery UI CSS Framework 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/category/theming/
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?scope=&folderName=smoothness&cornerRadiusShadow=8px&offsetLeftShadow=-8px&offsetTopShadow=-8px&thicknessShadow=8px&opacityShadow=30&bgImgOpacityShadow=0&bgTextureShadow=flat&bgColorShadow=aaaaaa&opacityOverlay=30&bgImgOpacityOverlay=0&bgTextureOverlay=flat&bgColorOverlay=aaaaaa&iconColorError=cd0a0a&fcError=cd0a0a&borderColorError=cd0a0a&bgImgOpacityError=95&bgTextureError=glass&bgColorError=fef1ec&iconColorHighlight=2e83ff&fcHighlight=363636&borderColorHighlight=fcefa1&bgImgOpacityHighlight=55&bgTextureHighlight=glass&bgColorHighlight=fbf9ee&iconColorActive=454545&fcActive=212121&borderColorActive=aaaaaa&bgImgOpacityActive=65&bgTextureActive=glass&bgColorActive=ffffff&iconColorHover=454545&fcHover=212121&borderColorHover=999999&bgImgOpacityHover=75&bgTextureHover=glass&bgColorHover=dadada&iconColorDefault=888888&fcDefault=555555&borderColorDefault=d3d3d3&bgImgOpacityDefault=75&bgTextureDefault=glass&bgColorDefault=e6e6e6&iconColorContent=222222&fcContent=222222&borderColorContent=aaaaaa&bgImgOpacityContent=75&bgTextureContent=flat&bgColorContent=ffffff&iconColorHeader=222222&fcHeader=222222&borderColorHeader=aaaaaa&bgImgOpacityHeader=75&bgTextureHeader=highlight_soft&bgColorHeader=cccccc&cornerRadius=4px&fsDefault=1.1em&fwDefault=normal&ffDefault=Verdana%2CArial%2Csans-serif
+ */
+
+
 /* Component containers
 ----------------------------------*/
 .ui-widget {
@@ -843,9 +916,12 @@ body .ui-tooltip {
 	font-family: Verdana,Arial,sans-serif;
 	font-size: 1em;
 }
+.ui-widget.ui-widget-content {
+	border: 1px solid #d3d3d3;
+}
 .ui-widget-content {
 	border: 1px solid #aaaaaa;
-	background: #ffffff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;
+	background: #ffffff;
 	color: #222222;
 }
 .ui-widget-content a {
@@ -865,7 +941,13 @@ body .ui-tooltip {
 ----------------------------------*/
 .ui-state-default,
 .ui-widget-content .ui-state-default,
-.ui-widget-header .ui-state-default {
+.ui-widget-header .ui-state-default,
+.ui-button,
+
+/* We use html here because we need a greater specificity to make sure disabled
+works properly when clicked or hovered */
+html .ui-button.ui-state-disabled:hover,
+html .ui-button.ui-state-disabled:active {
 	border: 1px solid #d3d3d3;
 	background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
 	font-weight: normal;
@@ -873,7 +955,11 @@ body .ui-tooltip {
 }
 .ui-state-default a,
 .ui-state-default a:link,
-.ui-state-default a:visited {
+.ui-state-default a:visited,
+a.ui-button,
+a:link.ui-button,
+a:visited.ui-button,
+.ui-button {
 	color: #555555;
 	text-decoration: none;
 }
@@ -882,7 +968,9 @@ body .ui-tooltip {
 .ui-widget-header .ui-state-hover,
 .ui-state-focus,
 .ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus {
+.ui-widget-header .ui-state-focus,
+.ui-button:hover,
+.ui-button:focus {
 	border: 1px solid #999999;
 	background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
 	font-weight: normal;
@@ -895,18 +983,32 @@ body .ui-tooltip {
 .ui-state-focus a,
 .ui-state-focus a:hover,
 .ui-state-focus a:link,
-.ui-state-focus a:visited {
+.ui-state-focus a:visited,
+a.ui-button:hover,
+a.ui-button:focus {
 	color: #212121;
 	text-decoration: none;
 }
+
+.ui-visual-focus {
+	box-shadow: 0 0 3px 1px rgb(94, 158, 214);
+}
 .ui-state-active,
 .ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active {
+.ui-widget-header .ui-state-active,
+a.ui-button:active,
+.ui-button:active,
+.ui-button.ui-state-active:hover {
 	border: 1px solid #aaaaaa;
 	background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
 	font-weight: normal;
 	color: #212121;
 }
+.ui-icon-background,
+.ui-state-active .ui-icon-background {
+	border: #aaaaaa;
+	background-color: #212121;
+}
 .ui-state-active a,
 .ui-state-active a:link,
 .ui-state-active a:visited {
@@ -923,6 +1025,10 @@ body .ui-tooltip {
 	background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
 	color: #363636;
 }
+.ui-state-checked {
+	border: 1px solid #fcefa1;
+	background: #fbf9ee;
+}
 .ui-state-highlight a,
 .ui-widget-content .ui-state-highlight a,
 .ui-widget-header .ui-state-highlight a {
@@ -983,41 +1089,45 @@ body .ui-tooltip {
 .ui-widget-header .ui-icon {
 	background-image: url("images/ui-icons_222222_256x240.png");
 }
-.ui-state-default .ui-icon {
-	background-image: url("images/ui-icons_888888_256x240.png");
-}
 .ui-state-hover .ui-icon,
-.ui-state-focus .ui-icon {
+.ui-state-focus .ui-icon,
+.ui-button:hover .ui-icon,
+.ui-button:focus .ui-icon {
 	background-image: url("images/ui-icons_454545_256x240.png");
 }
-.ui-state-active .ui-icon {
+.ui-state-active .ui-icon,
+.ui-button:active .ui-icon {
 	background-image: url("images/ui-icons_454545_256x240.png");
 }
-.ui-state-highlight .ui-icon {
+.ui-state-highlight .ui-icon,
+.ui-button .ui-state-highlight.ui-icon {
 	background-image: url("images/ui-icons_2e83ff_256x240.png");
 }
 .ui-state-error .ui-icon,
 .ui-state-error-text .ui-icon {
 	background-image: url("images/ui-icons_cd0a0a_256x240.png");
 }
+.ui-button .ui-icon {
+	background-image: url("images/ui-icons_888888_256x240.png");
+}
 
 /* positioning */
 .ui-icon-blank { background-position: 16px 16px; }
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-caret-1-n { background-position: 0 0; }
+.ui-icon-caret-1-ne { background-position: -16px 0; }
+.ui-icon-caret-1-e { background-position: -32px 0; }
+.ui-icon-caret-1-se { background-position: -48px 0; }
+.ui-icon-caret-1-s { background-position: -65px 0; }
+.ui-icon-caret-1-sw { background-position: -80px 0; }
+.ui-icon-caret-1-w { background-position: -96px 0; }
+.ui-icon-caret-1-nw { background-position: -112px 0; }
+.ui-icon-caret-2-n-s { background-position: -128px 0; }
+.ui-icon-caret-2-e-w { background-position: -144px 0; }
 .ui-icon-triangle-1-n { background-position: 0 -16px; }
 .ui-icon-triangle-1-ne { background-position: -16px -16px; }
 .ui-icon-triangle-1-e { background-position: -32px -16px; }
 .ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-s { background-position: -65px -16px; }
 .ui-icon-triangle-1-sw { background-position: -80px -16px; }
 .ui-icon-triangle-1-w { background-position: -96px -16px; }
 .ui-icon-triangle-1-nw { background-position: -112px -16px; }
@@ -1027,7 +1137,7 @@ body .ui-tooltip {
 .ui-icon-arrow-1-ne { background-position: -16px -32px; }
 .ui-icon-arrow-1-e { background-position: -32px -32px; }
 .ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-s { background-position: -65px -32px; }
 .ui-icon-arrow-1-sw { background-position: -80px -32px; }
 .ui-icon-arrow-1-w { background-position: -96px -32px; }
 .ui-icon-arrow-1-nw { background-position: -112px -32px; }
@@ -1039,7 +1149,7 @@ body .ui-tooltip {
 .ui-icon-arrowstop-1-e { background-position: -208px -32px; }
 .ui-icon-arrowstop-1-s { background-position: -224px -32px; }
 .ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-n { background-position: 1px -48px; }
 .ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
 .ui-icon-arrowthick-1-e { background-position: -32px -48px; }
 .ui-icon-arrowthick-1-se { background-position: -48px -48px; }
@@ -1211,15 +1321,1325 @@ body .ui-tooltip {
 
 /* Overlays */
 .ui-widget-overlay {
-	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
+	background: #aaaaaa;
 	opacity: .3;
 	filter: Alpha(Opacity=30); /* support: IE8 */
 }
 .ui-widget-shadow {
-	margin: -8px 0 0 -8px;
+	-webkit-box-shadow: -8px -8px 8px #aaaaaa;
+	box-shadow: -8px -8px 8px #aaaaaa;
+}
+
+/*! jQuery UI - v1.12.1 - 2017-02-22
+* http://jqueryui.com
+* Includes: draggable.css, core.css, resizable.css, selectable.css, sortable.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css, theme.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?scope=&folderName=smoothness&cornerRadiusShadow=8px&offsetLeftShadow=-8px&offsetTopShadow=-8px&thicknessShadow=8px&opacityShadow=30&bgImgOpacityShadow=0&bgTextureShadow=flat&bgColorShadow=aaaaaa&opacityOverlay=30&bgImgOpacityOverlay=0&bgTextureOverlay=flat&bgColorOverlay=aaaaaa&iconColorError=cd0a0a&fcError=cd0a0a&borderColorError=cd0a0a&bgImgOpacityError=95&bgTextureError=glass&bgColorError=fef1ec&iconColorHighlight=2e83ff&fcHighlight=363636&borderColorHighlight=fcefa1&bgImgOpacityHighlight=55&bgTextureHighlight=glass&bgColorHighlight=fbf9ee&iconColorActive=454545&fcActive=212121&borderColorActive=aaaaaa&bgImgOpacityActive=65&bgTextureActive=glass&bgColorActive=ffffff&iconColorHover=454545&fcHover=212121&borderColorHover=999999&bgImgOpacityHover=75&bgTextureHover=glass&bgColorHover=dadada&iconColorDefault=888888&fcDefault=555555&borderColorDefault=d3d3d3&bgImgOpacityDefault=75&bgTextureDefault=glass&bgColorDefault=e6e6e6&iconColorContent=222222&fcContent=222222&borderColorContent=aaaaaa&bgImgOpacityContent=75&bgTextureContent=flat&bgColorContent=ffffff&iconColorHeader=222222&fcHeader=222222&borderColorHeader=aaaaaa&bgImgOpacityHeader=75&bgTextureHeader=highlight_soft&bgColorHeader=cccccc&cornerRadius=4px&fsDefault=1.1em&fwDefault=normal&ffDefault=Verdana%2CArial%2Csans-serif
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-draggable-handle {
+	-ms-touch-action: none;
+	touch-action: none;
+}
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden {
+	display: none;
+}
+.ui-helper-hidden-accessible {
+	border: 0;
+	clip: rect(0 0 0 0);
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
+}
+.ui-helper-reset {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	line-height: 1.3;
+	text-decoration: none;
+	font-size: 100%;
+	list-style: none;
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+	content: "";
+	display: table;
+	border-collapse: collapse;
+}
+.ui-helper-clearfix:after {
+	clear: both;
+}
+.ui-helper-zfix {
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	position: absolute;
+	opacity: 0;
+	filter:Alpha(Opacity=0); /* support: IE8 */
+}
+
+.ui-front {
+	z-index: 100;
+}
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled {
+	cursor: default !important;
+	pointer-events: none;
+}
+
+
+/* Icons
+----------------------------------*/
+.ui-icon {
+	display: inline-block;
+	vertical-align: middle;
+	margin-top: -.25em;
+	position: relative;
+	text-indent: -99999px;
+	overflow: hidden;
+	background-repeat: no-repeat;
+}
+
+.ui-widget-icon-block {
+	left: 50%;
+	margin-left: -8px;
+	display: block;
+}
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+.ui-resizable {
+	position: relative;
+}
+.ui-resizable-handle {
+	position: absolute;
+	font-size: 0.1px;
+	display: block;
+	-ms-touch-action: none;
+	touch-action: none;
+}
+.ui-resizable-disabled .ui-resizable-handle,
+.ui-resizable-autohide .ui-resizable-handle {
+	display: none;
+}
+.ui-resizable-n {
+	cursor: n-resize;
+	height: 7px;
+	width: 100%;
+	top: -5px;
+	left: 0;
+}
+.ui-resizable-s {
+	cursor: s-resize;
+	height: 7px;
+	width: 100%;
+	bottom: -5px;
+	left: 0;
+}
+.ui-resizable-e {
+	cursor: e-resize;
+	width: 7px;
+	right: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-w {
+	cursor: w-resize;
+	width: 7px;
+	left: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-se {
+	cursor: se-resize;
+	width: 12px;
+	height: 12px;
+	right: 1px;
+	bottom: 1px;
+}
+.ui-resizable-sw {
+	cursor: sw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	bottom: -5px;
+}
+.ui-resizable-nw {
+	cursor: nw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	top: -5px;
+}
+.ui-resizable-ne {
+	cursor: ne-resize;
+	width: 9px;
+	height: 9px;
+	right: -5px;
+	top: -5px;
+}
+.ui-selectable {
+	-ms-touch-action: none;
+	touch-action: none;
+}
+.ui-selectable-helper {
+	position: absolute;
+	z-index: 100;
+	border: 1px dotted black;
+}
+.ui-sortable-handle {
+	-ms-touch-action: none;
+	touch-action: none;
+}
+.ui-accordion .ui-accordion-header {
+	display: block;
+	cursor: pointer;
+	position: relative;
+	margin: 2px 0 0 0;
+	padding: .5em .5em .5em .7em;
+	font-size: 100%;
+}
+.ui-accordion .ui-accordion-content {
+	padding: 1em 2.2em;
+	border-top: 0;
+	overflow: auto;
+}
+.ui-autocomplete {
+	position: absolute;
+	top: 0;
+	left: 0;
+	cursor: default;
+}
+.ui-menu {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	display: block;
+	outline: 0;
+}
+.ui-menu .ui-menu {
+	position: absolute;
+}
+.ui-menu .ui-menu-item {
+	margin: 0;
+	cursor: pointer;
+	/* support: IE10, see #8844 */
+	list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
+}
+.ui-menu .ui-menu-item-wrapper {
+	position: relative;
+	padding: 3px 1em 3px .4em;
+}
+.ui-menu .ui-menu-divider {
+	margin: 5px 0;
+	height: 0;
+	font-size: 0;
+	line-height: 0;
+	border-width: 1px 0 0 0;
+}
+.ui-menu .ui-state-focus,
+.ui-menu .ui-state-active {
+	margin: -1px;
+}
+
+/* icon support */
+.ui-menu-icons {
+	position: relative;
+}
+.ui-menu-icons .ui-menu-item-wrapper {
+	padding-left: 2em;
+}
+
+/* left-aligned */
+.ui-menu .ui-icon {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: .2em;
+	margin: auto 0;
+}
+
+/* right-aligned */
+.ui-menu .ui-menu-icon {
+	left: auto;
+	right: 0;
+}
+.ui-button {
+	padding: .4em 1em;
+	display: inline-block;
+	position: relative;
+	line-height: normal;
+	margin-right: .1em;
+	cursor: pointer;
+	vertical-align: middle;
+	text-align: center;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+
+	/* Support: IE <= 11 */
+	overflow: visible;
+}
+
+.ui-button,
+.ui-button:link,
+.ui-button:visited,
+.ui-button:hover,
+.ui-button:active {
+	text-decoration: none;
+}
+
+/* to make room for the icon, a width needs to be set here */
+.ui-button-icon-only {
+	width: 2em;
+	box-sizing: border-box;
+	text-indent: -9999px;
+	white-space: nowrap;
+}
+
+/* no icon support for input elements */
+input.ui-button.ui-button-icon-only {
+	text-indent: 0;
+}
+
+/* button icon element(s) */
+.ui-button-icon-only .ui-icon {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	margin-top: -8px;
+	margin-left: -8px;
+}
+
+.ui-button.ui-icon-notext .ui-icon {
+	padding: 0;
+	width: 2.1em;
+	height: 2.1em;
+	text-indent: -9999px;
+	white-space: nowrap;
+
+}
+
+input.ui-button.ui-icon-notext .ui-icon {
+	width: auto;
+	height: auto;
+	text-indent: 0;
+	white-space: normal;
+	padding: .4em 1em;
+}
+
+/* workarounds */
+/* Support: Firefox 5 - 40 */
+input.ui-button::-moz-focus-inner,
+button.ui-button::-moz-focus-inner {
+	border: 0;
+	padding: 0;
+}
+.ui-controlgroup {
+	vertical-align: middle;
+	display: inline-block;
+}
+.ui-controlgroup > .ui-controlgroup-item {
+	float: left;
+	margin-left: 0;
+	margin-right: 0;
+}
+.ui-controlgroup > .ui-controlgroup-item:focus,
+.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus {
+	z-index: 9999;
+}
+.ui-controlgroup-vertical > .ui-controlgroup-item {
+	display: block;
+	float: none;
+	width: 100%;
+	margin-top: 0;
+	margin-bottom: 0;
+	text-align: left;
+}
+.ui-controlgroup-vertical .ui-controlgroup-item {
+	box-sizing: border-box;
+}
+.ui-controlgroup .ui-controlgroup-label {
+	padding: .4em 1em;
+}
+.ui-controlgroup .ui-controlgroup-label span {
+	font-size: 80%;
+}
+.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item {
+	border-left: none;
+}
+.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item {
+	border-top: none;
+}
+.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content {
+	border-right: none;
+}
+.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content {
+	border-bottom: none;
+}
+
+/* Spinner specific style fixes */
+.ui-controlgroup-vertical .ui-spinner-input {
+
+	/* Support: IE8 only, Android < 4.4 only */
+	width: 75%;
+	width: calc( 100% - 2.4em );
+}
+.ui-controlgroup-vertical .ui-spinner .ui-spinner-up {
+	border-top-style: solid;
+}
+
+.ui-checkboxradio-label .ui-icon-background {
+	box-shadow: inset 1px 1px 1px #ccc;
+	border-radius: .12em;
+	border: none;
+}
+.ui-checkboxradio-radio-label .ui-icon-background {
+	width: 16px;
+	height: 16px;
+	border-radius: 1em;
+	overflow: visible;
+	border: none;
+}
+.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,
+.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon {
+	background-image: none;
+	width: 8px;
+	height: 8px;
+	border-width: 4px;
+	border-style: solid;
+}
+.ui-checkboxradio-disabled {
+	pointer-events: none;
+}
+.ui-datepicker {
+	width: 17em;
+	padding: .2em .2em 0;
+	display: none;
+}
+.ui-datepicker .ui-datepicker-header {
+	position: relative;
+	padding: .2em 0;
+}
+.ui-datepicker .ui-datepicker-prev,
+.ui-datepicker .ui-datepicker-next {
+	position: absolute;
+	top: 2px;
+	width: 1.8em;
+	height: 1.8em;
+}
+.ui-datepicker .ui-datepicker-prev-hover,
+.ui-datepicker .ui-datepicker-next-hover {
+	top: 1px;
+}
+.ui-datepicker .ui-datepicker-prev {
+	left: 2px;
+}
+.ui-datepicker .ui-datepicker-next {
+	right: 2px;
+}
+.ui-datepicker .ui-datepicker-prev-hover {
+	left: 1px;
+}
+.ui-datepicker .ui-datepicker-next-hover {
+	right: 1px;
+}
+.ui-datepicker .ui-datepicker-prev span,
+.ui-datepicker .ui-datepicker-next span {
+	display: block;
+	position: absolute;
+	left: 50%;
+	margin-left: -8px;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-datepicker .ui-datepicker-title {
+	margin: 0 2.3em;
+	line-height: 1.8em;
+	text-align: center;
+}
+.ui-datepicker .ui-datepicker-title select {
+	font-size: 1em;
+	margin: 1px 0;
+}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year {
+	width: 45%;
+}
+.ui-datepicker table {
+	width: 100%;
+	font-size: .9em;
+	border-collapse: collapse;
+	margin: 0 0 .4em;
+}
+.ui-datepicker th {
+	padding: .7em .3em;
+	text-align: center;
+	font-weight: bold;
+	border: 0;
+}
+.ui-datepicker td {
+	border: 0;
+	padding: 1px;
+}
+.ui-datepicker td span,
+.ui-datepicker td a {
+	display: block;
+	padding: .2em;
+	text-align: right;
+	text-decoration: none;
+}
+.ui-datepicker .ui-datepicker-buttonpane {
+	background-image: none;
+	margin: .7em 0 0 0;
+	padding: 0 .2em;
+	border-left: 0;
+	border-right: 0;
+	border-bottom: 0;
+}
+.ui-datepicker .ui-datepicker-buttonpane button {
+	float: right;
+	margin: .5em .2em .4em;
+	cursor: pointer;
+	padding: .2em .6em .3em .6em;
+	width: auto;
+	overflow: visible;
+}
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
+	float: left;
+}
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi {
+	width: auto;
+}
+.ui-datepicker-multi .ui-datepicker-group {
+	float: left;
+}
+.ui-datepicker-multi .ui-datepicker-group table {
+	width: 95%;
+	margin: 0 auto .4em;
+}
+.ui-datepicker-multi-2 .ui-datepicker-group {
+	width: 50%;
+}
+.ui-datepicker-multi-3 .ui-datepicker-group {
+	width: 33.3%;
+}
+.ui-datepicker-multi-4 .ui-datepicker-group {
+	width: 25%;
+}
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
+	border-left-width: 0;
+}
+.ui-datepicker-multi .ui-datepicker-buttonpane {
+	clear: left;
+}
+.ui-datepicker-row-break {
+	clear: both;
+	width: 100%;
+	font-size: 0;
+}
+
+/* RTL support */
+.ui-datepicker-rtl {
+	direction: rtl;
+}
+.ui-datepicker-rtl .ui-datepicker-prev {
+	right: 2px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next {
+	left: 2px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-prev:hover {
+	right: 1px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next:hover {
+	left: 1px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane {
+	clear: right;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button {
+	float: left;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
+.ui-datepicker-rtl .ui-datepicker-group {
+	float: right;
+}
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
+	border-right-width: 0;
+	border-left-width: 1px;
+}
+
+/* Icons */
+.ui-datepicker .ui-icon {
+	display: block;
+	text-indent: -99999px;
+	overflow: hidden;
+	background-repeat: no-repeat;
+	left: .5em;
+	top: .3em;
+}
+.ui-dialog {
+	position: absolute;
+	top: 0;
+	left: 0;
+	padding: .2em;
+	outline: 0;
+}
+.ui-dialog .ui-dialog-titlebar {
+	padding: .4em 1em;
+	position: relative;
+}
+.ui-dialog .ui-dialog-title {
+	float: left;
+	margin: .1em 0;
+	white-space: nowrap;
+	width: 90%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.ui-dialog .ui-dialog-titlebar-close {
+	position: absolute;
+	right: .3em;
+	top: 50%;
+	width: 20px;
+	margin: -10px 0 0 0;
+	padding: 1px;
+	height: 20px;
+}
+.ui-dialog .ui-dialog-content {
+	position: relative;
+	border: 0;
+	padding: .5em 1em;
+	background: none;
+	overflow: auto;
+}
+.ui-dialog .ui-dialog-buttonpane {
+	text-align: left;
+	border-width: 1px 0 0 0;
+	background-image: none;
+	margin-top: .5em;
+	padding: .3em 1em .5em .4em;
+}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+	float: right;
+}
+.ui-dialog .ui-dialog-buttonpane button {
+	margin: .5em .4em .5em 0;
+	cursor: pointer;
+}
+.ui-dialog .ui-resizable-n {
+	height: 2px;
+	top: 0;
+}
+.ui-dialog .ui-resizable-e {
+	width: 2px;
+	right: 0;
+}
+.ui-dialog .ui-resizable-s {
+	height: 2px;
+	bottom: 0;
+}
+.ui-dialog .ui-resizable-w {
+	width: 2px;
+	left: 0;
+}
+.ui-dialog .ui-resizable-se,
+.ui-dialog .ui-resizable-sw,
+.ui-dialog .ui-resizable-ne,
+.ui-dialog .ui-resizable-nw {
+	width: 7px;
+	height: 7px;
+}
+.ui-dialog .ui-resizable-se {
+	right: 0;
+	bottom: 0;
+}
+.ui-dialog .ui-resizable-sw {
+	left: 0;
+	bottom: 0;
+}
+.ui-dialog .ui-resizable-ne {
+	right: 0;
+	top: 0;
+}
+.ui-dialog .ui-resizable-nw {
+	left: 0;
+	top: 0;
+}
+.ui-draggable .ui-dialog-titlebar {
+	cursor: move;
+}
+.ui-progressbar {
+	height: 2em;
+	text-align: left;
+	overflow: hidden;
+}
+.ui-progressbar .ui-progressbar-value {
+	margin: -1px;
+	height: 100%;
+}
+.ui-progressbar .ui-progressbar-overlay {
+	background: url("data:image/gif;base64,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");
+	height: 100%;
+	filter: alpha(opacity=25); /* support: IE8 */
+	opacity: 0.25;
+}
+.ui-progressbar-indeterminate .ui-progressbar-value {
+	background-image: none;
+}
+.ui-selectmenu-menu {
+	padding: 0;
+	margin: 0;
+	position: absolute;
+	top: 0;
+	left: 0;
+	display: none;
+}
+.ui-selectmenu-menu .ui-menu {
+	overflow: auto;
+	overflow-x: hidden;
+	padding-bottom: 1px;
+}
+.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup {
+	font-size: 1em;
+	font-weight: bold;
+	line-height: 1.5;
+	padding: 2px 0.4em;
+	margin: 0.5em 0 0 0;
+	height: auto;
+	border: 0;
+}
+.ui-selectmenu-open {
+	display: block;
+}
+.ui-selectmenu-text {
+	display: block;
+	margin-right: 20px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.ui-selectmenu-button.ui-button {
+	text-align: left;
+	white-space: nowrap;
+	width: 14em;
+}
+.ui-selectmenu-icon.ui-icon {
+	float: right;
+	margin-top: 0;
+}
+.ui-slider {
+	position: relative;
+	text-align: left;
+}
+.ui-slider .ui-slider-handle {
+	position: absolute;
+	z-index: 2;
+	width: 1.2em;
+	height: 1.2em;
+	cursor: default;
+	-ms-touch-action: none;
+	touch-action: none;
+}
+.ui-slider .ui-slider-range {
+	position: absolute;
+	z-index: 1;
+	font-size: .7em;
+	display: block;
+	border: 0;
+	background-position: 0 0;
+}
+
+/* support: IE8 - See #6727 */
+.ui-slider.ui-state-disabled .ui-slider-handle,
+.ui-slider.ui-state-disabled .ui-slider-range {
+	filter: inherit;
+}
+
+.ui-slider-horizontal {
+	height: .8em;
+}
+.ui-slider-horizontal .ui-slider-handle {
+	top: -.3em;
+	margin-left: -.6em;
+}
+.ui-slider-horizontal .ui-slider-range {
+	top: 0;
+	height: 100%;
+}
+.ui-slider-horizontal .ui-slider-range-min {
+	left: 0;
+}
+.ui-slider-horizontal .ui-slider-range-max {
+	right: 0;
+}
+
+.ui-slider-vertical {
+	width: .8em;
+	height: 100px;
+}
+.ui-slider-vertical .ui-slider-handle {
+	left: -.3em;
+	margin-left: 0;
+	margin-bottom: -.6em;
+}
+.ui-slider-vertical .ui-slider-range {
+	left: 0;
+	width: 100%;
+}
+.ui-slider-vertical .ui-slider-range-min {
+	bottom: 0;
+}
+.ui-slider-vertical .ui-slider-range-max {
+	top: 0;
+}
+.ui-spinner {
+	position: relative;
+	display: inline-block;
+	overflow: hidden;
+	padding: 0;
+	vertical-align: middle;
+}
+.ui-spinner-input {
+	border: none;
+	background: none;
+	color: inherit;
+	padding: .222em 0;
+	margin: .2em 0;
+	vertical-align: middle;
+	margin-left: .4em;
+	margin-right: 2em;
+}
+.ui-spinner-button {
+	width: 1.6em;
+	height: 50%;
+	font-size: .5em;
+	padding: 0;
+	margin: 0;
+	text-align: center;
+	position: absolute;
+	cursor: default;
+	display: block;
+	overflow: hidden;
+	right: 0;
+}
+/* more specificity required here to override default borders */
+.ui-spinner a.ui-spinner-button {
+	border-top-style: none;
+	border-bottom-style: none;
+	border-right-style: none;
+}
+.ui-spinner-up {
+	top: 0;
+}
+.ui-spinner-down {
+	bottom: 0;
+}
+.ui-tabs {
+	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+	padding: .2em;
+}
+.ui-tabs .ui-tabs-nav {
+	margin: 0;
+	padding: .2em .2em 0;
+}
+.ui-tabs .ui-tabs-nav li {
+	list-style: none;
+	float: left;
+	position: relative;
+	top: 0;
+	margin: 1px .2em 0 0;
+	border-bottom-width: 0;
+	padding: 0;
+	white-space: nowrap;
+}
+.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
+	float: left;
+	padding: .5em 1em;
+	text-decoration: none;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active {
+	margin-bottom: -1px;
+	padding-bottom: 1px;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
+.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
+.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
+	cursor: text;
+}
+.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
+	cursor: pointer;
+}
+.ui-tabs .ui-tabs-panel {
+	display: block;
+	border-width: 0;
+	padding: 1em 1.4em;
+	background: none;
+}
+.ui-tooltip {
 	padding: 8px;
-	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
+	position: absolute;
+	z-index: 9999;
+	max-width: 300px;
+}
+body .ui-tooltip {
+	border-width: 2px;
+}
+
+/* Component containers
+----------------------------------*/
+.ui-widget {
+	font-family: Verdana,Arial,sans-serif;
+	font-size: 1.1em;
+}
+.ui-widget .ui-widget {
+	font-size: 1em;
+}
+.ui-widget input,
+.ui-widget select,
+.ui-widget textarea,
+.ui-widget button {
+	font-family: Verdana,Arial,sans-serif;
+	font-size: 1em;
+}
+.ui-widget.ui-widget-content {
+	border: 1px solid #d3d3d3;
+}
+.ui-widget-content {
+	border: 1px solid #aaaaaa;
+	background: #ffffff;
+	color: #222222;
+}
+.ui-widget-content a {
+	color: #222222;
+}
+.ui-widget-header {
+	border: 1px solid #aaaaaa;
+	background: #cccccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;
+	color: #222222;
+	font-weight: bold;
+}
+.ui-widget-header a {
+	color: #222222;
+}
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default,
+.ui-button,
+
+/* We use html here because we need a greater specificity to make sure disabled
+works properly when clicked or hovered */
+html .ui-button.ui-state-disabled:hover,
+html .ui-button.ui-state-disabled:active {
+	border: 1px solid #d3d3d3;
+	background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
+	font-weight: normal;
+	color: #555555;
+}
+.ui-state-default a,
+.ui-state-default a:link,
+.ui-state-default a:visited,
+a.ui-button,
+a:link.ui-button,
+a:visited.ui-button,
+.ui-button {
+	color: #555555;
+	text-decoration: none;
+}
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus,
+.ui-button:hover,
+.ui-button:focus {
+	border: 1px solid #999999;
+	background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
+	font-weight: normal;
+	color: #212121;
+}
+.ui-state-hover a,
+.ui-state-hover a:hover,
+.ui-state-hover a:link,
+.ui-state-hover a:visited,
+.ui-state-focus a,
+.ui-state-focus a:hover,
+.ui-state-focus a:link,
+.ui-state-focus a:visited,
+a.ui-button:hover,
+a.ui-button:focus {
+	color: #212121;
+	text-decoration: none;
+}
+
+.ui-visual-focus {
+	box-shadow: 0 0 3px 1px rgb(94, 158, 214);
+}
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active,
+a.ui-button:active,
+.ui-button:active,
+.ui-button.ui-state-active:hover {
+	border: 1px solid #aaaaaa;
+	background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
+	font-weight: normal;
+	color: #212121;
+}
+.ui-icon-background,
+.ui-state-active .ui-icon-background {
+	border: #aaaaaa;
+	background-color: #212121;
+}
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
+	color: #212121;
+	text-decoration: none;
+}
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight,
+.ui-widget-content .ui-state-highlight,
+.ui-widget-header .ui-state-highlight {
+	border: 1px solid #fcefa1;
+	background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
+	color: #363636;
+}
+.ui-state-checked {
+	border: 1px solid #fcefa1;
+	background: #fbf9ee;
+}
+.ui-state-highlight a,
+.ui-widget-content .ui-state-highlight a,
+.ui-widget-header .ui-state-highlight a {
+	color: #363636;
+}
+.ui-state-error,
+.ui-widget-content .ui-state-error,
+.ui-widget-header .ui-state-error {
+	border: 1px solid #cd0a0a;
+	background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
+	color: #cd0a0a;
+}
+.ui-state-error a,
+.ui-widget-content .ui-state-error a,
+.ui-widget-header .ui-state-error a {
+	color: #cd0a0a;
+}
+.ui-state-error-text,
+.ui-widget-content .ui-state-error-text,
+.ui-widget-header .ui-state-error-text {
+	color: #cd0a0a;
+}
+.ui-priority-primary,
+.ui-widget-content .ui-priority-primary,
+.ui-widget-header .ui-priority-primary {
+	font-weight: bold;
+}
+.ui-priority-secondary,
+.ui-widget-content .ui-priority-secondary,
+.ui-widget-header .ui-priority-secondary {
+	opacity: .7;
+	filter:Alpha(Opacity=70); /* support: IE8 */
+	font-weight: normal;
+}
+.ui-state-disabled,
+.ui-widget-content .ui-state-disabled,
+.ui-widget-header .ui-state-disabled {
+	opacity: .35;
+	filter:Alpha(Opacity=35); /* support: IE8 */
+	background-image: none;
+}
+.ui-state-disabled .ui-icon {
+	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
+}
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	width: 16px;
+	height: 16px;
+}
+.ui-icon,
+.ui-widget-content .ui-icon {
+	background-image: url("images/ui-icons_222222_256x240.png");
+}
+.ui-widget-header .ui-icon {
+	background-image: url("images/ui-icons_222222_256x240.png");
+}
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon,
+.ui-button:hover .ui-icon,
+.ui-button:focus .ui-icon {
+	background-image: url("images/ui-icons_454545_256x240.png");
+}
+.ui-state-active .ui-icon,
+.ui-button:active .ui-icon {
+	background-image: url("images/ui-icons_454545_256x240.png");
+}
+.ui-state-highlight .ui-icon,
+.ui-button .ui-state-highlight.ui-icon {
+	background-image: url("images/ui-icons_2e83ff_256x240.png");
+}
+.ui-state-error .ui-icon,
+.ui-state-error-text .ui-icon {
+	background-image: url("images/ui-icons_cd0a0a_256x240.png");
+}
+.ui-button .ui-icon {
+	background-image: url("images/ui-icons_888888_256x240.png");
+}
+
+/* positioning */
+.ui-icon-blank { background-position: 16px 16px; }
+.ui-icon-caret-1-n { background-position: 0 0; }
+.ui-icon-caret-1-ne { background-position: -16px 0; }
+.ui-icon-caret-1-e { background-position: -32px 0; }
+.ui-icon-caret-1-se { background-position: -48px 0; }
+.ui-icon-caret-1-s { background-position: -65px 0; }
+.ui-icon-caret-1-sw { background-position: -80px 0; }
+.ui-icon-caret-1-w { background-position: -96px 0; }
+.ui-icon-caret-1-nw { background-position: -112px 0; }
+.ui-icon-caret-2-n-s { background-position: -128px 0; }
+.ui-icon-caret-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -65px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -65px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 1px -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-on { background-position: -96px -144px; }
+.ui-icon-radio-off { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-left,
+.ui-corner-tl {
+	border-top-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-right,
+.ui-corner-tr {
+	border-top-right-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-left,
+.ui-corner-bl {
+	border-bottom-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-right,
+.ui-corner-br {
+	border-bottom-right-radius: 4px;
+}
+
+/* Overlays */
+.ui-widget-overlay {
+	background: #aaaaaa;
 	opacity: .3;
 	filter: Alpha(Opacity=30); /* support: IE8 */
-	border-radius: 8px;
 }
+.ui-widget-shadow {
+	-webkit-box-shadow: -8px -8px 8px #aaaaaa;
+	box-shadow: -8px -8px 8px #aaaaaa;
+}
+
diff --git a/htdocs/includes/jquery/js/jquery-ui.js b/htdocs/includes/jquery/js/jquery-ui.js
index 31ee9cd8116..1eafd76658d 100644
--- a/htdocs/includes/jquery/js/jquery-ui.js
+++ b/htdocs/includes/jquery/js/jquery-ui.js
@@ -1,7 +1,7 @@
-/*! jQuery UI - v1.11.4 - 2015-03-11
+/*! jQuery UI - v1.12.1 - 2017-02-22
 * http://jqueryui.com
-* Includes: core.js, widget.js, mouse.js, position.js, accordion.js, autocomplete.js, button.js, datepicker.js, dialog.js, draggable.js, droppable.js, effect.js, effect-blind.js, effect-bounce.js, effect-clip.js, effect-drop.js, effect-explode.js, effect-fade.js, effect-fold.js, effect-highlight.js, effect-puff.js, effect-pulsate.js, effect-scale.js, effect-shake.js, effect-size.js, effect-slide.js, effect-transfer.js, menu.js, progressbar.js, resizable.js, selectable.js, selectmenu.js, slider.js, sortable.js, spinner.js, tabs.js, tooltip.js
-* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
+* Includes: widget.js, position.js, data.js, disable-selection.js, focusable.js, form-reset-mixin.js, jquery-1-7.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/draggable.js, widgets/droppable.js, widgets/resizable.js, widgets/selectable.js, widgets/sortable.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/selectmenu.js, widgets/slider.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
 
 (function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
@@ -14,319 +14,36 @@
 		factory( jQuery );
 	}
 }(function( $ ) {
-/*!
- * jQuery UI Core 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/category/ui-core/
- */
 
-
-// $.ui might exist from components with no dependencies, e.g., $.ui.position
 $.ui = $.ui || {};
 
-$.extend( $.ui, {
-	version: "1.11.4",
-
-	keyCode: {
-		BACKSPACE: 8,
-		COMMA: 188,
-		DELETE: 46,
-		DOWN: 40,
-		END: 35,
-		ENTER: 13,
-		ESCAPE: 27,
-		HOME: 36,
-		LEFT: 37,
-		PAGE_DOWN: 34,
-		PAGE_UP: 33,
-		PERIOD: 190,
-		RIGHT: 39,
-		SPACE: 32,
-		TAB: 9,
-		UP: 38
-	}
-});
-
-// plugins
-$.fn.extend({
-	scrollParent: function( includeHidden ) {
-		var position = this.css( "position" ),
-			excludeStaticParent = position === "absolute",
-			overflowRegex = includeHidden ? /(auto|scroll|hidden)/ : /(auto|scroll)/,
-			scrollParent = this.parents().filter( function() {
-				var parent = $( this );
-				if ( excludeStaticParent && parent.css( "position" ) === "static" ) {
-					return false;
-				}
-				return overflowRegex.test( parent.css( "overflow" ) + parent.css( "overflow-y" ) + parent.css( "overflow-x" ) );
-			}).eq( 0 );
-
-		return position === "fixed" || !scrollParent.length ? $( this[ 0 ].ownerDocument || document ) : scrollParent;
-	},
-
-	uniqueId: (function() {
-		var uuid = 0;
-
-		return function() {
-			return this.each(function() {
-				if ( !this.id ) {
-					this.id = "ui-id-" + ( ++uuid );
-				}
-			});
-		};
-	})(),
-
-	removeUniqueId: function() {
-		return this.each(function() {
-			if ( /^ui-id-\d+$/.test( this.id ) ) {
-				$( this ).removeAttr( "id" );
-			}
-		});
-	}
-});
-
-// selectors
-function focusable( element, isTabIndexNotNaN ) {
-	var map, mapName, img,
-		nodeName = element.nodeName.toLowerCase();
-	if ( "area" === nodeName ) {
-		map = element.parentNode;
-		mapName = map.name;
-		if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
-			return false;
-		}
-		img = $( "img[usemap='#" + mapName + "']" )[ 0 ];
-		return !!img && visible( img );
-	}
-	return ( /^(input|select|textarea|button|object)$/.test( nodeName ) ?
-		!element.disabled :
-		"a" === nodeName ?
-			element.href || isTabIndexNotNaN :
-			isTabIndexNotNaN) &&
-		// the element and all of its ancestors must be visible
-		visible( element );
-}
-
-function visible( element ) {
-	return $.expr.filters.visible( element ) &&
-		!$( element ).parents().addBack().filter(function() {
-			return $.css( this, "visibility" ) === "hidden";
-		}).length;
-}
-
-$.extend( $.expr[ ":" ], {
-	data: $.expr.createPseudo ?
-		$.expr.createPseudo(function( dataName ) {
-			return function( elem ) {
-				return !!$.data( elem, dataName );
-			};
-		}) :
-		// support: jQuery <1.8
-		function( elem, i, match ) {
-			return !!$.data( elem, match[ 3 ] );
-		},
-
-	focusable: function( element ) {
-		return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );
-	},
-
-	tabbable: function( element ) {
-		var tabIndex = $.attr( element, "tabindex" ),
-			isTabIndexNaN = isNaN( tabIndex );
-		return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN );
-	}
-});
-
-// support: jQuery <1.8
-if ( !$( "<a>" ).outerWidth( 1 ).jquery ) {
-	$.each( [ "Width", "Height" ], function( i, name ) {
-		var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
-			type = name.toLowerCase(),
-			orig = {
-				innerWidth: $.fn.innerWidth,
-				innerHeight: $.fn.innerHeight,
-				outerWidth: $.fn.outerWidth,
-				outerHeight: $.fn.outerHeight
-			};
-
-		function reduce( elem, size, border, margin ) {
-			$.each( side, function() {
-				size -= parseFloat( $.css( elem, "padding" + this ) ) || 0;
-				if ( border ) {
-					size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0;
-				}
-				if ( margin ) {
-					size -= parseFloat( $.css( elem, "margin" + this ) ) || 0;
-				}
-			});
-			return size;
-		}
-
-		$.fn[ "inner" + name ] = function( size ) {
-			if ( size === undefined ) {
-				return orig[ "inner" + name ].call( this );
-			}
-
-			return this.each(function() {
-				$( this ).css( type, reduce( this, size ) + "px" );
-			});
-		};
-
-		$.fn[ "outer" + name] = function( size, margin ) {
-			if ( typeof size !== "number" ) {
-				return orig[ "outer" + name ].call( this, size );
-			}
-
-			return this.each(function() {
-				$( this).css( type, reduce( this, size, true, margin ) + "px" );
-			});
-		};
-	});
-}
-
-// support: jQuery <1.8
-if ( !$.fn.addBack ) {
-	$.fn.addBack = function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
-	};
-}
-
-// support: jQuery 1.6.1, 1.6.2 (http://bugs.jquery.com/ticket/9413)
-if ( $( "<a>" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) {
-	$.fn.removeData = (function( removeData ) {
-		return function( key ) {
-			if ( arguments.length ) {
-				return removeData.call( this, $.camelCase( key ) );
-			} else {
-				return removeData.call( this );
-			}
-		};
-	})( $.fn.removeData );
-}
-
-// deprecated
-$.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
-
-$.fn.extend({
-	focus: (function( orig ) {
-		return function( delay, fn ) {
-			return typeof delay === "number" ?
-				this.each(function() {
-					var elem = this;
-					setTimeout(function() {
-						$( elem ).focus();
-						if ( fn ) {
-							fn.call( elem );
-						}
-					}, delay );
-				}) :
-				orig.apply( this, arguments );
-		};
-	})( $.fn.focus ),
-
-	disableSelection: (function() {
-		var eventType = "onselectstart" in document.createElement( "div" ) ?
-			"selectstart" :
-			"mousedown";
-
-		return function() {
-			return this.bind( eventType + ".ui-disableSelection", function( event ) {
-				event.preventDefault();
-			});
-		};
-	})(),
-
-	enableSelection: function() {
-		return this.unbind( ".ui-disableSelection" );
-	},
-
-	zIndex: function( zIndex ) {
-		if ( zIndex !== undefined ) {
-			return this.css( "zIndex", zIndex );
-		}
-
-		if ( this.length ) {
-			var elem = $( this[ 0 ] ), position, value;
-			while ( elem.length && elem[ 0 ] !== document ) {
-				// Ignore z-index if position is set to a value where z-index is ignored by the browser
-				// This makes behavior of this function consistent across browsers
-				// WebKit always returns auto if the element is positioned
-				position = elem.css( "position" );
-				if ( position === "absolute" || position === "relative" || position === "fixed" ) {
-					// IE returns 0 when zIndex is not specified
-					// other browsers return a string
-					// we ignore the case of nested elements with an explicit value of 0
-					// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
-					value = parseInt( elem.css( "zIndex" ), 10 );
-					if ( !isNaN( value ) && value !== 0 ) {
-						return value;
-					}
-				}
-				elem = elem.parent();
-			}
-		}
-
-		return 0;
-	}
-});
-
-// $.ui.plugin is deprecated. Use $.widget() extensions instead.
-$.ui.plugin = {
-	add: function( module, option, set ) {
-		var i,
-			proto = $.ui[ module ].prototype;
-		for ( i in set ) {
-			proto.plugins[ i ] = proto.plugins[ i ] || [];
-			proto.plugins[ i ].push( [ option, set[ i ] ] );
-		}
-	},
-	call: function( instance, name, args, allowDisconnected ) {
-		var i,
-			set = instance.plugins[ name ];
-
-		if ( !set ) {
-			return;
-		}
-
-		if ( !allowDisconnected && ( !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) ) {
-			return;
-		}
-
-		for ( i = 0; i < set.length; i++ ) {
-			if ( instance.options[ set[ i ][ 0 ] ] ) {
-				set[ i ][ 1 ].apply( instance.element, args );
-			}
-		}
-	}
-};
+var version = $.ui.version = "1.12.1";
 
 
 /*!
- * jQuery UI Widget 1.11.4
+ * jQuery UI Widget 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/jQuery.widget/
  */
 
+//>>label: Widget
+//>>group: Core
+//>>description: Provides a factory for creating stateful widgets with a common API.
+//>>docs: http://api.jqueryui.com/jQuery.widget/
+//>>demos: http://jqueryui.com/widget/
 
-var widget_uuid = 0,
-	widget_slice = Array.prototype.slice;
 
-$.cleanData = (function( orig ) {
+
+var widgetUuid = 0;
+var widgetSlice = Array.prototype.slice;
+
+$.cleanData = ( function( orig ) {
 	return function( elems ) {
 		var events, elem, i;
-		for ( i = 0; (elem = elems[i]) != null; i++ ) {
+		for ( i = 0; ( elem = elems[ i ] ) != null; i++ ) {
 			try {
 
 				// Only trigger remove when necessary to save time
@@ -335,29 +52,34 @@ $.cleanData = (function( orig ) {
 					$( elem ).triggerHandler( "remove" );
 				}
 
-			// http://bugs.jquery.com/ticket/8235
+			// Http://bugs.jquery.com/ticket/8235
 			} catch ( e ) {}
 		}
 		orig( elems );
 	};
-})( $.cleanData );
+} )( $.cleanData );
 
 $.widget = function( name, base, prototype ) {
-	var fullName, existingConstructor, constructor, basePrototype,
-		// proxiedPrototype allows the provided prototype to remain unmodified
-		// so that it can be used as a mixin for multiple widgets (#8876)
-		proxiedPrototype = {},
-		namespace = name.split( "." )[ 0 ];
+	var existingConstructor, constructor, basePrototype;
 
+	// ProxiedPrototype allows the provided prototype to remain unmodified
+	// so that it can be used as a mixin for multiple widgets (#8876)
+	var proxiedPrototype = {};
+
+	var namespace = name.split( "." )[ 0 ];
 	name = name.split( "." )[ 1 ];
-	fullName = namespace + "-" + name;
+	var fullName = namespace + "-" + name;
 
 	if ( !prototype ) {
 		prototype = base;
 		base = $.Widget;
 	}
 
-	// create selector for plugin
+	if ( $.isArray( prototype ) ) {
+		prototype = $.extend.apply( null, [ {} ].concat( prototype ) );
+	}
+
+	// Create selector for plugin
 	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
 		return !!$.data( elem, fullName );
 	};
@@ -365,30 +87,35 @@ $.widget = function( name, base, prototype ) {
 	$[ namespace ] = $[ namespace ] || {};
 	existingConstructor = $[ namespace ][ name ];
 	constructor = $[ namespace ][ name ] = function( options, element ) {
-		// allow instantiation without "new" keyword
+
+		// Allow instantiation without "new" keyword
 		if ( !this._createWidget ) {
 			return new constructor( options, element );
 		}
 
-		// allow instantiation without initializing for simple inheritance
+		// Allow instantiation without initializing for simple inheritance
 		// must use "new" keyword (the code above always passes args)
 		if ( arguments.length ) {
 			this._createWidget( options, element );
 		}
 	};
-	// extend with the existing constructor to carry over any static properties
+
+	// Extend with the existing constructor to carry over any static properties
 	$.extend( constructor, existingConstructor, {
 		version: prototype.version,
-		// copy the object used to create the prototype in case we need to
+
+		// Copy the object used to create the prototype in case we need to
 		// redefine the widget later
 		_proto: $.extend( {}, prototype ),
-		// track widgets that inherit from this widget in case this widget is
+
+		// Track widgets that inherit from this widget in case this widget is
 		// redefined after a widget inherits from it
 		_childConstructors: []
-	});
+	} );
 
 	basePrototype = new base();
-	// we need to make the options hash a property directly on the new instance
+
+	// We need to make the options hash a property directly on the new instance
 	// otherwise we'll modify the options hash on the prototype that we're
 	// inheriting from
 	basePrototype.options = $.widget.extend( {}, basePrototype.options );
@@ -397,17 +124,19 @@ $.widget = function( name, base, prototype ) {
 			proxiedPrototype[ prop ] = value;
 			return;
 		}
-		proxiedPrototype[ prop ] = (function() {
-			var _super = function() {
-					return base.prototype[ prop ].apply( this, arguments );
-				},
-				_superApply = function( args ) {
-					return base.prototype[ prop ].apply( this, args );
-				};
+		proxiedPrototype[ prop ] = ( function() {
+			function _super() {
+				return base.prototype[ prop ].apply( this, arguments );
+			}
+
+			function _superApply( args ) {
+				return base.prototype[ prop ].apply( this, args );
+			}
+
 			return function() {
-				var __super = this._super,
-					__superApply = this._superApply,
-					returnValue;
+				var __super = this._super;
+				var __superApply = this._superApply;
+				var returnValue;
 
 				this._super = _super;
 				this._superApply = _superApply;
@@ -419,19 +148,20 @@ $.widget = function( name, base, prototype ) {
 
 				return returnValue;
 			};
-		})();
-	});
+		} )();
+	} );
 	constructor.prototype = $.widget.extend( basePrototype, {
+
 		// TODO: remove support for widgetEventPrefix
 		// always use the name + a colon as the prefix, e.g., draggable:start
 		// don't prefix for widgets that aren't DOM-based
-		widgetEventPrefix: existingConstructor ? (basePrototype.widgetEventPrefix || name) : name
+		widgetEventPrefix: existingConstructor ? ( basePrototype.widgetEventPrefix || name ) : name
 	}, proxiedPrototype, {
 		constructor: constructor,
 		namespace: namespace,
 		widgetName: name,
 		widgetFullName: fullName
-	});
+	} );
 
 	// If this widget is being redefined then we need to find all widgets that
 	// are inheriting from it and redefine all of them so that they inherit from
@@ -441,11 +171,13 @@ $.widget = function( name, base, prototype ) {
 		$.each( existingConstructor._childConstructors, function( i, child ) {
 			var childPrototype = child.prototype;
 
-			// redefine the child widget using the same prototype that was
+			// Redefine the child widget using the same prototype that was
 			// originally used, but inherit from the new version of the base
-			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
-		});
-		// remove the list of existing child constructors from the old constructor
+			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor,
+				child._proto );
+		} );
+
+		// Remove the list of existing child constructors from the old constructor
 		// so the old child constructors can be garbage collected
 		delete existingConstructor._childConstructors;
 	} else {
@@ -458,21 +190,25 @@ $.widget = function( name, base, prototype ) {
 };
 
 $.widget.extend = function( target ) {
-	var input = widget_slice.call( arguments, 1 ),
-		inputIndex = 0,
-		inputLength = input.length,
-		key,
-		value;
+	var input = widgetSlice.call( arguments, 1 );
+	var inputIndex = 0;
+	var inputLength = input.length;
+	var key;
+	var value;
+
 	for ( ; inputIndex < inputLength; inputIndex++ ) {
 		for ( key in input[ inputIndex ] ) {
 			value = input[ inputIndex ][ key ];
 			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
+
 				// Clone objects
 				if ( $.isPlainObject( value ) ) {
 					target[ key ] = $.isPlainObject( target[ key ] ) ?
 						$.widget.extend( {}, target[ key ], value ) :
+
 						// Don't extend strings, arrays, etc. with objects
 						$.widget.extend( {}, value );
+
 				// Copy everything else by reference
 				} else {
 					target[ key ] = value;
@@ -486,41 +222,55 @@ $.widget.extend = function( target ) {
 $.widget.bridge = function( name, object ) {
 	var fullName = object.prototype.widgetFullName || name;
 	$.fn[ name ] = function( options ) {
-		var isMethodCall = typeof options === "string",
-			args = widget_slice.call( arguments, 1 ),
-			returnValue = this;
+		var isMethodCall = typeof options === "string";
+		var args = widgetSlice.call( arguments, 1 );
+		var returnValue = this;
 
 		if ( isMethodCall ) {
-			this.each(function() {
-				var methodValue,
-					instance = $.data( this, fullName );
-				if ( options === "instance" ) {
-					returnValue = instance;
-					return false;
-				}
-				if ( !instance ) {
-					return $.error( "cannot call methods on " + name + " prior to initialization; " +
-						"attempted to call method '" + options + "'" );
-				}
-				if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
-					return $.error( "no such method '" + options + "' for " + name + " widget instance" );
-				}
-				methodValue = instance[ options ].apply( instance, args );
-				if ( methodValue !== instance && methodValue !== undefined ) {
-					returnValue = methodValue && methodValue.jquery ?
-						returnValue.pushStack( methodValue.get() ) :
-						methodValue;
-					return false;
-				}
-			});
+
+			// If this is an empty collection, we need to have the instance method
+			// return undefined instead of the jQuery instance
+			if ( !this.length && options === "instance" ) {
+				returnValue = undefined;
+			} else {
+				this.each( function() {
+					var methodValue;
+					var instance = $.data( this, fullName );
+
+					if ( options === "instance" ) {
+						returnValue = instance;
+						return false;
+					}
+
+					if ( !instance ) {
+						return $.error( "cannot call methods on " + name +
+							" prior to initialization; " +
+							"attempted to call method '" + options + "'" );
+					}
+
+					if ( !$.isFunction( instance[ options ] ) || options.charAt( 0 ) === "_" ) {
+						return $.error( "no such method '" + options + "' for " + name +
+							" widget instance" );
+					}
+
+					methodValue = instance[ options ].apply( instance, args );
+
+					if ( methodValue !== instance && methodValue !== undefined ) {
+						returnValue = methodValue && methodValue.jquery ?
+							returnValue.pushStack( methodValue.get() ) :
+							methodValue;
+						return false;
+					}
+				} );
+			}
 		} else {
 
 			// Allow multiple hashes to be passed on init
 			if ( args.length ) {
-				options = $.widget.extend.apply( null, [ options ].concat(args) );
+				options = $.widget.extend.apply( null, [ options ].concat( args ) );
 			}
 
-			this.each(function() {
+			this.each( function() {
 				var instance = $.data( this, fullName );
 				if ( instance ) {
 					instance.option( options || {} );
@@ -530,7 +280,7 @@ $.widget.bridge = function( name, object ) {
 				} else {
 					$.data( this, fullName, new object( options, this ) );
 				}
-			});
+			} );
 		}
 
 		return returnValue;
@@ -544,21 +294,25 @@ $.Widget.prototype = {
 	widgetName: "widget",
 	widgetEventPrefix: "",
 	defaultElement: "<div>",
+
 	options: {
+		classes: {},
 		disabled: false,
 
-		// callbacks
+		// Callbacks
 		create: null
 	},
+
 	_createWidget: function( options, element ) {
 		element = $( element || this.defaultElement || this )[ 0 ];
 		this.element = $( element );
-		this.uuid = widget_uuid++;
+		this.uuid = widgetUuid++;
 		this.eventNamespace = "." + this.widgetName + this.uuid;
 
 		this.bindings = $();
 		this.hoverable = $();
 		this.focusable = $();
+		this.classesElementLookup = {};
 
 		if ( element !== this ) {
 			$.data( element, this.widgetFullName, this );
@@ -568,13 +322,15 @@ $.Widget.prototype = {
 						this.destroy();
 					}
 				}
-			});
+			} );
 			this.document = $( element.style ?
-				// element within the document
+
+				// Element within the document
 				element.ownerDocument :
-				// element is window or document
+
+				// Element is window or document
 				element.document || element );
-			this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
+			this.window = $( this.document[ 0 ].defaultView || this.document[ 0 ].parentWindow );
 		}
 
 		this.options = $.widget.extend( {},
@@ -583,36 +339,46 @@ $.Widget.prototype = {
 			options );
 
 		this._create();
+
+		if ( this.options.disabled ) {
+			this._setOptionDisabled( this.options.disabled );
+		}
+
 		this._trigger( "create", null, this._getCreateEventData() );
 		this._init();
 	},
-	_getCreateOptions: $.noop,
+
+	_getCreateOptions: function() {
+		return {};
+	},
+
 	_getCreateEventData: $.noop,
+
 	_create: $.noop,
+
 	_init: $.noop,
 
 	destroy: function() {
+		var that = this;
+
 		this._destroy();
-		// we can probably remove the unbind calls in 2.0
+		$.each( this.classesElementLookup, function( key, value ) {
+			that._removeClass( value, key );
+		} );
+
+		// We can probably remove the unbind calls in 2.0
 		// all event bindings should go through this._on()
 		this.element
-			.unbind( this.eventNamespace )
-			.removeData( this.widgetFullName )
-			// support: jquery <1.6.3
-			// http://bugs.jquery.com/ticket/9413
-			.removeData( $.camelCase( this.widgetFullName ) );
+			.off( this.eventNamespace )
+			.removeData( this.widgetFullName );
 		this.widget()
-			.unbind( this.eventNamespace )
-			.removeAttr( "aria-disabled" )
-			.removeClass(
-				this.widgetFullName + "-disabled " +
-				"ui-state-disabled" );
+			.off( this.eventNamespace )
+			.removeAttr( "aria-disabled" );
 
-		// clean up events and states
-		this.bindings.unbind( this.eventNamespace );
-		this.hoverable.removeClass( "ui-state-hover" );
-		this.focusable.removeClass( "ui-state-focus" );
+		// Clean up events and states
+		this.bindings.off( this.eventNamespace );
 	},
+
 	_destroy: $.noop,
 
 	widget: function() {
@@ -620,18 +386,20 @@ $.Widget.prototype = {
 	},
 
 	option: function( key, value ) {
-		var options = key,
-			parts,
-			curOption,
-			i;
+		var options = key;
+		var parts;
+		var curOption;
+		var i;
 
 		if ( arguments.length === 0 ) {
-			// don't return a reference to the internal hash
+
+			// Don't return a reference to the internal hash
 			return $.widget.extend( {}, this.options );
 		}
 
 		if ( typeof key === "string" ) {
-			// handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
+
+			// Handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
 			options = {};
 			parts = key.split( "." );
 			key = parts.shift();
@@ -658,6 +426,7 @@ $.Widget.prototype = {
 
 		return this;
 	},
+
 	_setOptions: function( options ) {
 		var key;
 
@@ -667,42 +436,152 @@ $.Widget.prototype = {
 
 		return this;
 	},
+
 	_setOption: function( key, value ) {
+		if ( key === "classes" ) {
+			this._setOptionClasses( value );
+		}
+
 		this.options[ key ] = value;
 
 		if ( key === "disabled" ) {
-			this.widget()
-				.toggleClass( this.widgetFullName + "-disabled", !!value );
-
-			// If the widget is becoming disabled, then nothing is interactive
-			if ( value ) {
-				this.hoverable.removeClass( "ui-state-hover" );
-				this.focusable.removeClass( "ui-state-focus" );
-			}
+			this._setOptionDisabled( value );
 		}
 
 		return this;
 	},
 
-	enable: function() {
-		return this._setOptions({ disabled: false });
+	_setOptionClasses: function( value ) {
+		var classKey, elements, currentElements;
+
+		for ( classKey in value ) {
+			currentElements = this.classesElementLookup[ classKey ];
+			if ( value[ classKey ] === this.options.classes[ classKey ] ||
+					!currentElements ||
+					!currentElements.length ) {
+				continue;
+			}
+
+			// We are doing this to create a new jQuery object because the _removeClass() call
+			// on the next line is going to destroy the reference to the current elements being
+			// tracked. We need to save a copy of this collection so that we can add the new classes
+			// below.
+			elements = $( currentElements.get() );
+			this._removeClass( currentElements, classKey );
+
+			// We don't use _addClass() here, because that uses this.options.classes
+			// for generating the string of classes. We want to use the value passed in from
+			// _setOption(), this is the new value of the classes option which was passed to
+			// _setOption(). We pass this value directly to _classes().
+			elements.addClass( this._classes( {
+				element: elements,
+				keys: classKey,
+				classes: value,
+				add: true
+			} ) );
+		}
 	},
+
+	_setOptionDisabled: function( value ) {
+		this._toggleClass( this.widget(), this.widgetFullName + "-disabled", null, !!value );
+
+		// If the widget is becoming disabled, then nothing is interactive
+		if ( value ) {
+			this._removeClass( this.hoverable, null, "ui-state-hover" );
+			this._removeClass( this.focusable, null, "ui-state-focus" );
+		}
+	},
+
+	enable: function() {
+		return this._setOptions( { disabled: false } );
+	},
+
 	disable: function() {
-		return this._setOptions({ disabled: true });
+		return this._setOptions( { disabled: true } );
+	},
+
+	_classes: function( options ) {
+		var full = [];
+		var that = this;
+
+		options = $.extend( {
+			element: this.element,
+			classes: this.options.classes || {}
+		}, options );
+
+		function processClassString( classes, checkOption ) {
+			var current, i;
+			for ( i = 0; i < classes.length; i++ ) {
+				current = that.classesElementLookup[ classes[ i ] ] || $();
+				if ( options.add ) {
+					current = $( $.unique( current.get().concat( options.element.get() ) ) );
+				} else {
+					current = $( current.not( options.element ).get() );
+				}
+				that.classesElementLookup[ classes[ i ] ] = current;
+				full.push( classes[ i ] );
+				if ( checkOption && options.classes[ classes[ i ] ] ) {
+					full.push( options.classes[ classes[ i ] ] );
+				}
+			}
+		}
+
+		this._on( options.element, {
+			"remove": "_untrackClassesElement"
+		} );
+
+		if ( options.keys ) {
+			processClassString( options.keys.match( /\S+/g ) || [], true );
+		}
+		if ( options.extra ) {
+			processClassString( options.extra.match( /\S+/g ) || [] );
+		}
+
+		return full.join( " " );
+	},
+
+	_untrackClassesElement: function( event ) {
+		var that = this;
+		$.each( that.classesElementLookup, function( key, value ) {
+			if ( $.inArray( event.target, value ) !== -1 ) {
+				that.classesElementLookup[ key ] = $( value.not( event.target ).get() );
+			}
+		} );
+	},
+
+	_removeClass: function( element, keys, extra ) {
+		return this._toggleClass( element, keys, extra, false );
+	},
+
+	_addClass: function( element, keys, extra ) {
+		return this._toggleClass( element, keys, extra, true );
+	},
+
+	_toggleClass: function( element, keys, extra, add ) {
+		add = ( typeof add === "boolean" ) ? add : extra;
+		var shift = ( typeof element === "string" || element === null ),
+			options = {
+				extra: shift ? keys : extra,
+				keys: shift ? element : keys,
+				element: shift ? this.element : element,
+				add: add
+			};
+		options.element.toggleClass( this._classes( options ), add );
+		return this;
 	},
 
 	_on: function( suppressDisabledCheck, element, handlers ) {
-		var delegateElement,
-			instance = this;
+		var delegateElement;
+		var instance = this;
 
-		// no suppressDisabledCheck flag, shuffle arguments
+		// No suppressDisabledCheck flag, shuffle arguments
 		if ( typeof suppressDisabledCheck !== "boolean" ) {
 			handlers = element;
 			element = suppressDisabledCheck;
 			suppressDisabledCheck = false;
 		}
 
-		// no element argument, shuffle and use this.element
+		// No element argument, shuffle and use this.element
 		if ( !handlers ) {
 			handlers = element;
 			element = this.element;
@@ -714,39 +593,41 @@ $.Widget.prototype = {
 
 		$.each( handlers, function( event, handler ) {
 			function handlerProxy() {
-				// allow widgets to customize the disabled handling
+
+				// Allow widgets to customize the disabled handling
 				// - disabled as an array instead of boolean
 				// - disabled class as method for disabling individual parts
 				if ( !suppressDisabledCheck &&
 						( instance.options.disabled === true ||
-							$( this ).hasClass( "ui-state-disabled" ) ) ) {
+						$( this ).hasClass( "ui-state-disabled" ) ) ) {
 					return;
 				}
 				return ( typeof handler === "string" ? instance[ handler ] : handler )
 					.apply( instance, arguments );
 			}
 
-			// copy the guid so direct unbinding works
+			// Copy the guid so direct unbinding works
 			if ( typeof handler !== "string" ) {
 				handlerProxy.guid = handler.guid =
 					handler.guid || handlerProxy.guid || $.guid++;
 			}
 
-			var match = event.match( /^([\w:-]*)\s*(.*)$/ ),
-				eventName = match[1] + instance.eventNamespace,
-				selector = match[2];
+			var match = event.match( /^([\w:-]*)\s*(.*)$/ );
+			var eventName = match[ 1 ] + instance.eventNamespace;
+			var selector = match[ 2 ];
+
 			if ( selector ) {
-				delegateElement.delegate( selector, eventName, handlerProxy );
+				delegateElement.on( eventName, selector, handlerProxy );
 			} else {
-				element.bind( eventName, handlerProxy );
+				element.on( eventName, handlerProxy );
 			}
-		});
+		} );
 	},
 
 	_off: function( element, eventName ) {
-		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) +
+		eventName = ( eventName || "" ).split( " " ).join( this.eventNamespace + " " ) +
 			this.eventNamespace;
-		element.unbind( eventName ).undelegate( eventName );
+		element.off( eventName ).off( eventName );
 
 		// Clear the stack to avoid memory leaks (#10056)
 		this.bindings = $( this.bindings.not( element ).get() );
@@ -767,40 +648,41 @@ $.Widget.prototype = {
 		this.hoverable = this.hoverable.add( element );
 		this._on( element, {
 			mouseenter: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-hover" );
+				this._addClass( $( event.currentTarget ), null, "ui-state-hover" );
 			},
 			mouseleave: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-hover" );
+				this._removeClass( $( event.currentTarget ), null, "ui-state-hover" );
 			}
-		});
+		} );
 	},
 
 	_focusable: function( element ) {
 		this.focusable = this.focusable.add( element );
 		this._on( element, {
 			focusin: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-focus" );
+				this._addClass( $( event.currentTarget ), null, "ui-state-focus" );
 			},
 			focusout: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-focus" );
+				this._removeClass( $( event.currentTarget ), null, "ui-state-focus" );
 			}
-		});
+		} );
 	},
 
 	_trigger: function( type, event, data ) {
-		var prop, orig,
-			callback = this.options[ type ];
+		var prop, orig;
+		var callback = this.options[ type ];
 
 		data = data || {};
 		event = $.Event( event );
 		event.type = ( type === this.widgetEventPrefix ?
 			type :
 			this.widgetEventPrefix + type ).toLowerCase();
-		// the original event may come from any element
+
+		// The original event may come from any element
 		// so we need to reset the target on the new event
 		event.target = this.element[ 0 ];
 
-		// copy original event properties over to the new event
+		// Copy original event properties over to the new event
 		orig = event.originalEvent;
 		if ( orig ) {
 			for ( prop in orig ) {
@@ -812,7 +694,7 @@ $.Widget.prototype = {
 
 		this.element.trigger( event, data );
 		return !( $.isFunction( callback ) &&
-			callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
+			callback.apply( this.element[ 0 ], [ event ].concat( data ) ) === false ||
 			event.isDefaultPrevented() );
 	}
 };
@@ -822,228 +704,47 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
 		if ( typeof options === "string" ) {
 			options = { effect: options };
 		}
-		var hasOptions,
-			effectName = !options ?
-				method :
-				options === true || typeof options === "number" ?
-					defaultEffect :
-					options.effect || defaultEffect;
+
+		var hasOptions;
+		var effectName = !options ?
+			method :
+			options === true || typeof options === "number" ?
+				defaultEffect :
+				options.effect || defaultEffect;
+
 		options = options || {};
 		if ( typeof options === "number" ) {
 			options = { duration: options };
 		}
+
 		hasOptions = !$.isEmptyObject( options );
 		options.complete = callback;
+
 		if ( options.delay ) {
 			element.delay( options.delay );
 		}
+
 		if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
 			element[ method ]( options );
 		} else if ( effectName !== method && element[ effectName ] ) {
 			element[ effectName ]( options.duration, options.easing, callback );
 		} else {
-			element.queue(function( next ) {
+			element.queue( function( next ) {
 				$( this )[ method ]();
 				if ( callback ) {
 					callback.call( element[ 0 ] );
 				}
 				next();
-			});
+			} );
 		}
 	};
-});
+} );
 
 var widget = $.widget;
 
 
 /*!
- * jQuery UI Mouse 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/mouse/
- */
-
-
-var mouseHandled = false;
-$( document ).mouseup( function() {
-	mouseHandled = false;
-});
-
-var mouse = $.widget("ui.mouse", {
-	version: "1.11.4",
-	options: {
-		cancel: "input,textarea,button,select,option",
-		distance: 1,
-		delay: 0
-	},
-	_mouseInit: function() {
-		var that = this;
-
-		this.element
-			.bind("mousedown." + this.widgetName, function(event) {
-				return that._mouseDown(event);
-			})
-			.bind("click." + this.widgetName, function(event) {
-				if (true === $.data(event.target, that.widgetName + ".preventClickEvent")) {
-					$.removeData(event.target, that.widgetName + ".preventClickEvent");
-					event.stopImmediatePropagation();
-					return false;
-				}
-			});
-
-		this.started = false;
-	},
-
-	// TODO: make sure destroying one instance of mouse doesn't mess with
-	// other instances of mouse
-	_mouseDestroy: function() {
-		this.element.unbind("." + this.widgetName);
-		if ( this._mouseMoveDelegate ) {
-			this.document
-				.unbind("mousemove." + this.widgetName, this._mouseMoveDelegate)
-				.unbind("mouseup." + this.widgetName, this._mouseUpDelegate);
-		}
-	},
-
-	_mouseDown: function(event) {
-		// don't let more than one widget handle mouseStart
-		if ( mouseHandled ) {
-			return;
-		}
-
-		this._mouseMoved = false;
-
-		// we may have missed mouseup (out of window)
-		(this._mouseStarted && this._mouseUp(event));
-
-		this._mouseDownEvent = event;
-
-		var that = this,
-			btnIsLeft = (event.which === 1),
-			// event.target.nodeName works around a bug in IE 8 with
-			// disabled inputs (#7620)
-			elIsCancel = (typeof this.options.cancel === "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false);
-		if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
-			return true;
-		}
-
-		this.mouseDelayMet = !this.options.delay;
-		if (!this.mouseDelayMet) {
-			this._mouseDelayTimer = setTimeout(function() {
-				that.mouseDelayMet = true;
-			}, this.options.delay);
-		}
-
-		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
-			this._mouseStarted = (this._mouseStart(event) !== false);
-			if (!this._mouseStarted) {
-				event.preventDefault();
-				return true;
-			}
-		}
-
-		// Click event may never have fired (Gecko & Opera)
-		if (true === $.data(event.target, this.widgetName + ".preventClickEvent")) {
-			$.removeData(event.target, this.widgetName + ".preventClickEvent");
-		}
-
-		// these delegates are required to keep context
-		this._mouseMoveDelegate = function(event) {
-			return that._mouseMove(event);
-		};
-		this._mouseUpDelegate = function(event) {
-			return that._mouseUp(event);
-		};
-
-		this.document
-			.bind( "mousemove." + this.widgetName, this._mouseMoveDelegate )
-			.bind( "mouseup." + this.widgetName, this._mouseUpDelegate );
-
-		event.preventDefault();
-
-		mouseHandled = true;
-		return true;
-	},
-
-	_mouseMove: function(event) {
-		// Only check for mouseups outside the document if you've moved inside the document
-		// at least once. This prevents the firing of mouseup in the case of IE<9, which will
-		// fire a mousemove event if content is placed under the cursor. See #7778
-		// Support: IE <9
-		if ( this._mouseMoved ) {
-			// IE mouseup check - mouseup happened when mouse was out of window
-			if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) {
-				return this._mouseUp(event);
-
-			// Iframe mouseup check - mouseup occurred in another document
-			} else if ( !event.which ) {
-				return this._mouseUp( event );
-			}
-		}
-
-		if ( event.which || event.button ) {
-			this._mouseMoved = true;
-		}
-
-		if (this._mouseStarted) {
-			this._mouseDrag(event);
-			return event.preventDefault();
-		}
-
-		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
-			this._mouseStarted =
-				(this._mouseStart(this._mouseDownEvent, event) !== false);
-			(this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event));
-		}
-
-		return !this._mouseStarted;
-	},
-
-	_mouseUp: function(event) {
-		this.document
-			.unbind( "mousemove." + this.widgetName, this._mouseMoveDelegate )
-			.unbind( "mouseup." + this.widgetName, this._mouseUpDelegate );
-
-		if (this._mouseStarted) {
-			this._mouseStarted = false;
-
-			if (event.target === this._mouseDownEvent.target) {
-				$.data(event.target, this.widgetName + ".preventClickEvent", true);
-			}
-
-			this._mouseStop(event);
-		}
-
-		mouseHandled = false;
-		return false;
-	},
-
-	_mouseDistanceMet: function(event) {
-		return (Math.max(
-				Math.abs(this._mouseDownEvent.pageX - event.pageX),
-				Math.abs(this._mouseDownEvent.pageY - event.pageY)
-			) >= this.options.distance
-		);
-	},
-
-	_mouseDelayMet: function(/* event */) {
-		return this.mouseDelayMet;
-	},
-
-	// These are placeholder methods, to be overriden by extending plugin
-	_mouseStart: function(/* event */) {},
-	_mouseDrag: function(/* event */) {},
-	_mouseStop: function(/* event */) {},
-	_mouseCapture: function(/* event */) { return true; }
-});
-
-
-/*!
- * jQuery UI Position 1.11.4
+ * jQuery UI Position 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1053,14 +754,17 @@ var mouse = $.widget("ui.mouse", {
  * http://api.jqueryui.com/position/
  */
 
-(function() {
+//>>label: Position
+//>>group: Core
+//>>description: Positions elements relative to other elements.
+//>>docs: http://api.jqueryui.com/position/
+//>>demos: http://jqueryui.com/position/
 
-$.ui = $.ui || {};
 
-var cachedScrollbarWidth, supportsOffsetFractions,
+( function() {
+var cachedScrollbarWidth,
 	max = Math.max,
 	abs = Math.abs,
-	round = Math.round,
 	rhorizontal = /left|center|right/,
 	rvertical = /top|center|bottom/,
 	roffset = /[\+\-]\d+(\.[\d]+)?%?/,
@@ -1080,7 +784,7 @@ function parseCss( element, property ) {
 }
 
 function getDimensions( elem ) {
-	var raw = elem[0];
+	var raw = elem[ 0 ];
 	if ( raw.nodeType === 9 ) {
 		return {
 			width: elem.width(),
@@ -1115,8 +819,10 @@ $.position = {
 			return cachedScrollbarWidth;
 		}
 		var w1, w2,
-			div = $( "<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
-			innerDiv = div.children()[0];
+			div = $( "<div " +
+				"style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'>" +
+				"<div style='height:100px;width:auto;'></div></div>" ),
+			innerDiv = div.children()[ 0 ];
 
 		$( "body" ).append( div );
 		w1 = innerDiv.offsetWidth;
@@ -1125,12 +831,12 @@ $.position = {
 		w2 = innerDiv.offsetWidth;
 
 		if ( w1 === w2 ) {
-			w2 = div[0].clientWidth;
+			w2 = div[ 0 ].clientWidth;
 		}
 
 		div.remove();
 
-		return (cachedScrollbarWidth = w1 - w2);
+		return ( cachedScrollbarWidth = w1 - w2 );
 	},
 	getScrollInfo: function( within ) {
 		var overflowX = within.isWindow || within.isDocument ? "" :
@@ -1138,9 +844,9 @@ $.position = {
 			overflowY = within.isWindow || within.isDocument ? "" :
 				within.element.css( "overflow-y" ),
 			hasOverflowX = overflowX === "scroll" ||
-				( overflowX === "auto" && within.width < within.element[0].scrollWidth ),
+				( overflowX === "auto" && within.width < within.element[ 0 ].scrollWidth ),
 			hasOverflowY = overflowY === "scroll" ||
-				( overflowY === "auto" && within.height < within.element[0].scrollHeight );
+				( overflowY === "auto" && within.height < within.element[ 0 ].scrollHeight );
 		return {
 			width: hasOverflowY ? $.position.scrollbarWidth() : 0,
 			height: hasOverflowX ? $.position.scrollbarWidth() : 0
@@ -1148,20 +854,18 @@ $.position = {
 	},
 	getWithinInfo: function( element ) {
 		var withinElement = $( element || window ),
-			isWindow = $.isWindow( withinElement[0] ),
-			isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9;
+			isWindow = $.isWindow( withinElement[ 0 ] ),
+			isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9,
+			hasOffset = !isWindow && !isDocument;
 		return {
 			element: withinElement,
 			isWindow: isWindow,
 			isDocument: isDocument,
-			offset: withinElement.offset() || { left: 0, top: 0 },
+			offset: hasOffset ? $( element ).offset() : { left: 0, top: 0 },
 			scrollLeft: withinElement.scrollLeft(),
 			scrollTop: withinElement.scrollTop(),
-
-			// support: jQuery 1.6.x
-			// jQuery 1.6 doesn't support .outerWidth/Height() on documents or windows
-			width: isWindow || isDocument ? withinElement.width() : withinElement.outerWidth(),
-			height: isWindow || isDocument ? withinElement.height() : withinElement.outerHeight()
+			width: withinElement.outerWidth(),
+			height: withinElement.outerHeight()
 		};
 	}
 };
@@ -1171,7 +875,7 @@ $.fn.position = function( options ) {
 		return _position.apply( this, arguments );
 	}
 
-	// make a copy, we don't want to modify arguments
+	// Make a copy, we don't want to modify arguments
 	options = $.extend( {}, options );
 
 	var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
@@ -1182,24 +886,26 @@ $.fn.position = function( options ) {
 		offsets = {};
 
 	dimensions = getDimensions( target );
-	if ( target[0].preventDefault ) {
-		// force left top to allow flipping
+	if ( target[ 0 ].preventDefault ) {
+
+		// Force left top to allow flipping
 		options.at = "left top";
 	}
 	targetWidth = dimensions.width;
 	targetHeight = dimensions.height;
 	targetOffset = dimensions.offset;
-	// clone to reuse original targetOffset later
+
+	// Clone to reuse original targetOffset later
 	basePosition = $.extend( {}, targetOffset );
 
-	// force my and at to have valid horizontal and vertical positions
+	// Force my and at to have valid horizontal and vertical positions
 	// if a value is missing or invalid, it will be converted to center
 	$.each( [ "my", "at" ], function() {
 		var pos = ( options[ this ] || "" ).split( " " ),
 			horizontalOffset,
 			verticalOffset;
 
-		if ( pos.length === 1) {
+		if ( pos.length === 1 ) {
 			pos = rhorizontal.test( pos[ 0 ] ) ?
 				pos.concat( [ "center" ] ) :
 				rvertical.test( pos[ 0 ] ) ?
@@ -1209,7 +915,7 @@ $.fn.position = function( options ) {
 		pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
 		pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
 
-		// calculate offsets
+		// Calculate offsets
 		horizontalOffset = roffset.exec( pos[ 0 ] );
 		verticalOffset = roffset.exec( pos[ 1 ] );
 		offsets[ this ] = [
@@ -1217,14 +923,14 @@ $.fn.position = function( options ) {
 			verticalOffset ? verticalOffset[ 0 ] : 0
 		];
 
-		// reduce to just the positions without the offsets
+		// Reduce to just the positions without the offsets
 		options[ this ] = [
 			rposition.exec( pos[ 0 ] )[ 0 ],
 			rposition.exec( pos[ 1 ] )[ 0 ]
 		];
-	});
+	} );
 
-	// normalize collision option
+	// Normalize collision option
 	if ( collision.length === 1 ) {
 		collision[ 1 ] = collision[ 0 ];
 	}
@@ -1245,15 +951,17 @@ $.fn.position = function( options ) {
 	basePosition.left += atOffset[ 0 ];
 	basePosition.top += atOffset[ 1 ];
 
-	return this.each(function() {
+	return this.each( function() {
 		var collisionPosition, using,
 			elem = $( this ),
 			elemWidth = elem.outerWidth(),
 			elemHeight = elem.outerHeight(),
 			marginLeft = parseCss( this, "marginLeft" ),
 			marginTop = parseCss( this, "marginTop" ),
-			collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) + scrollInfo.width,
-			collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) + scrollInfo.height,
+			collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) +
+				scrollInfo.width,
+			collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) +
+				scrollInfo.height,
 			position = $.extend( {}, basePosition ),
 			myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() );
 
@@ -1272,12 +980,6 @@ $.fn.position = function( options ) {
 		position.left += myOffset[ 0 ];
 		position.top += myOffset[ 1 ];
 
-		// if the browser doesn't support fractions, then round for consistent results
-		if ( !supportsOffsetFractions ) {
-			position.left = round( position.left );
-			position.top = round( position.top );
-		}
-
 		collisionPosition = {
 			marginLeft: marginLeft,
 			marginTop: marginTop
@@ -1298,12 +1000,13 @@ $.fn.position = function( options ) {
 					at: options.at,
 					within: within,
 					elem: elem
-				});
+				} );
 			}
-		});
+		} );
 
 		if ( options.using ) {
-			// adds feedback as second argument to using callback, if present
+
+			// Adds feedback as second argument to using callback, if present
 			using = function( props ) {
 				var left = targetOffset.left - position.left,
 					right = left + targetWidth - elemWidth,
@@ -1343,7 +1046,7 @@ $.fn.position = function( options ) {
 		}
 
 		elem.offset( $.extend( position, { using: using } ) );
-	});
+	} );
 };
 
 $.ui.position = {
@@ -1357,16 +1060,20 @@ $.ui.position = {
 				overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
 				newOverRight;
 
-			// element is wider than within
+			// Element is wider than within
 			if ( data.collisionWidth > outerWidth ) {
-				// element is initially over the left side of within
+
+				// Element is initially over the left side of within
 				if ( overLeft > 0 && overRight <= 0 ) {
-					newOverRight = position.left + overLeft + data.collisionWidth - outerWidth - withinOffset;
+					newOverRight = position.left + overLeft + data.collisionWidth - outerWidth -
+						withinOffset;
 					position.left += overLeft - newOverRight;
-				// element is initially over right side of within
+
+				// Element is initially over right side of within
 				} else if ( overRight > 0 && overLeft <= 0 ) {
 					position.left = withinOffset;
-				// element is initially over both left and right sides of within
+
+				// Element is initially over both left and right sides of within
 				} else {
 					if ( overLeft > overRight ) {
 						position.left = withinOffset + outerWidth - data.collisionWidth;
@@ -1374,13 +1081,16 @@ $.ui.position = {
 						position.left = withinOffset;
 					}
 				}
-			// too far left -> align with left edge
+
+			// Too far left -> align with left edge
 			} else if ( overLeft > 0 ) {
 				position.left += overLeft;
-			// too far right -> align with right edge
+
+			// Too far right -> align with right edge
 			} else if ( overRight > 0 ) {
 				position.left -= overRight;
-			// adjust based on position and margin
+
+			// Adjust based on position and margin
 			} else {
 				position.left = max( position.left - collisionPosLeft, position.left );
 			}
@@ -1394,16 +1104,20 @@ $.ui.position = {
 				overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
 				newOverBottom;
 
-			// element is taller than within
+			// Element is taller than within
 			if ( data.collisionHeight > outerHeight ) {
-				// element is initially over the top of within
+
+				// Element is initially over the top of within
 				if ( overTop > 0 && overBottom <= 0 ) {
-					newOverBottom = position.top + overTop + data.collisionHeight - outerHeight - withinOffset;
+					newOverBottom = position.top + overTop + data.collisionHeight - outerHeight -
+						withinOffset;
 					position.top += overTop - newOverBottom;
-				// element is initially over bottom of within
+
+				// Element is initially over bottom of within
 				} else if ( overBottom > 0 && overTop <= 0 ) {
 					position.top = withinOffset;
-				// element is initially over both top and bottom of within
+
+				// Element is initially over both top and bottom of within
 				} else {
 					if ( overTop > overBottom ) {
 						position.top = withinOffset + outerHeight - data.collisionHeight;
@@ -1411,13 +1125,16 @@ $.ui.position = {
 						position.top = withinOffset;
 					}
 				}
-			// too far up -> align with top
+
+			// Too far up -> align with top
 			} else if ( overTop > 0 ) {
 				position.top += overTop;
-			// too far down -> align with bottom edge
+
+			// Too far down -> align with bottom edge
 			} else if ( overBottom > 0 ) {
 				position.top -= overBottom;
-			// adjust based on position and margin
+
+			// Adjust based on position and margin
 			} else {
 				position.top = max( position.top - collisionPosTop, position.top );
 			}
@@ -1447,12 +1164,14 @@ $.ui.position = {
 				newOverLeft;
 
 			if ( overLeft < 0 ) {
-				newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset;
+				newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth -
+					outerWidth - withinOffset;
 				if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
 					position.left += myOffset + atOffset + offset;
 				}
 			} else if ( overRight > 0 ) {
-				newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft;
+				newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset +
+					atOffset + offset - offsetLeft;
 				if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
 					position.left += myOffset + atOffset + offset;
 				}
@@ -1481,12 +1200,14 @@ $.ui.position = {
 				newOverTop,
 				newOverBottom;
 			if ( overTop < 0 ) {
-				newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset;
+				newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight -
+					outerHeight - withinOffset;
 				if ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) {
 					position.top += myOffset + atOffset + offset;
 				}
 			} else if ( overBottom > 0 ) {
-				newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
+				newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset +
+					offset - offsetTop;
 				if ( newOverTop > 0 || abs( newOverTop ) < overBottom ) {
 					position.top += myOffset + atOffset + offset;
 				}
@@ -1505,4351 +1226,810 @@ $.ui.position = {
 	}
 };
 
-// fraction support test
-(function() {
-	var testElement, testElementParent, testElementStyle, offsetLeft, i,
-		body = document.getElementsByTagName( "body" )[ 0 ],
-		div = document.createElement( "div" );
-
-	//Create a "fake body" for testing based on method used in jQuery.support
-	testElement = document.createElement( body ? "div" : "body" );
-	testElementStyle = {
-		visibility: "hidden",
-		width: 0,
-		height: 0,
-		border: 0,
-		margin: 0,
-		background: "none"
-	};
-	if ( body ) {
-		$.extend( testElementStyle, {
-			position: "absolute",
-			left: "-1000px",
-			top: "-1000px"
-		});
-	}
-	for ( i in testElementStyle ) {
-		testElement.style[ i ] = testElementStyle[ i ];
-	}
-	testElement.appendChild( div );
-	testElementParent = body || document.documentElement;
-	testElementParent.insertBefore( testElement, testElementParent.firstChild );
-
-	div.style.cssText = "position: absolute; left: 10.7432222px;";
-
-	offsetLeft = $( div ).offset().left;
-	supportsOffsetFractions = offsetLeft > 10 && offsetLeft < 11;
-
-	testElement.innerHTML = "";
-	testElementParent.removeChild( testElement );
-})();
-
-})();
+} )();
 
 var position = $.ui.position;
 
 
 /*!
- * jQuery UI Accordion 1.11.4
+ * jQuery UI :data 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/accordion/
  */
 
+//>>label: :data Selector
+//>>group: Core
+//>>description: Selects elements which have data stored under the specified key.
+//>>docs: http://api.jqueryui.com/data-selector/
 
-var accordion = $.widget( "ui.accordion", {
-	version: "1.11.4",
-	options: {
-		active: 0,
-		animate: {},
-		collapsible: false,
-		event: "click",
-		header: "> li > :first-child,> :not(li):even",
-		heightStyle: "auto",
-		icons: {
-			activeHeader: "ui-icon-triangle-1-s",
-			header: "ui-icon-triangle-1-e"
-		},
 
-		// callbacks
-		activate: null,
-		beforeActivate: null
-	},
-
-	hideProps: {
-		borderTopWidth: "hide",
-		borderBottomWidth: "hide",
-		paddingTop: "hide",
-		paddingBottom: "hide",
-		height: "hide"
-	},
-
-	showProps: {
-		borderTopWidth: "show",
-		borderBottomWidth: "show",
-		paddingTop: "show",
-		paddingBottom: "show",
-		height: "show"
-	},
-
-	_create: function() {
-		var options = this.options;
-		this.prevShow = this.prevHide = $();
-		this.element.addClass( "ui-accordion ui-widget ui-helper-reset" )
-			// ARIA
-			.attr( "role", "tablist" );
-
-		// don't allow collapsible: false and active: false / null
-		if ( !options.collapsible && (options.active === false || options.active == null) ) {
-			options.active = 0;
-		}
-
-		this._processPanels();
-		// handle negative values
-		if ( options.active < 0 ) {
-			options.active += this.headers.length;
-		}
-		this._refresh();
-	},
-
-	_getCreateEventData: function() {
-		return {
-			header: this.active,
-			panel: !this.active.length ? $() : this.active.next()
-		};
-	},
-
-	_createIcons: function() {
-		var icons = this.options.icons;
-		if ( icons ) {
-			$( "<span>" )
-				.addClass( "ui-accordion-header-icon ui-icon " + icons.header )
-				.prependTo( this.headers );
-			this.active.children( ".ui-accordion-header-icon" )
-				.removeClass( icons.header )
-				.addClass( icons.activeHeader );
-			this.headers.addClass( "ui-accordion-icons" );
-		}
-	},
-
-	_destroyIcons: function() {
-		this.headers
-			.removeClass( "ui-accordion-icons" )
-			.children( ".ui-accordion-header-icon" )
-				.remove();
-	},
-
-	_destroy: function() {
-		var contents;
-
-		// clean up main element
-		this.element
-			.removeClass( "ui-accordion ui-widget ui-helper-reset" )
-			.removeAttr( "role" );
-
-		// clean up headers
-		this.headers
-			.removeClass( "ui-accordion-header ui-accordion-header-active ui-state-default " +
-				"ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-expanded" )
-			.removeAttr( "aria-selected" )
-			.removeAttr( "aria-controls" )
-			.removeAttr( "tabIndex" )
-			.removeUniqueId();
-
-		this._destroyIcons();
-
-		// clean up content panels
-		contents = this.headers.next()
-			.removeClass( "ui-helper-reset ui-widget-content ui-corner-bottom " +
-				"ui-accordion-content ui-accordion-content-active ui-state-disabled" )
-			.css( "display", "" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-hidden" )
-			.removeAttr( "aria-labelledby" )
-			.removeUniqueId();
-
-		if ( this.options.heightStyle !== "content" ) {
-			contents.css( "height", "" );
-		}
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "active" ) {
-			// _activate() will handle invalid values and update this.options
-			this._activate( value );
-			return;
-		}
-
-		if ( key === "event" ) {
-			if ( this.options.event ) {
-				this._off( this.headers, this.options.event );
-			}
-			this._setupEvents( value );
-		}
-
-		this._super( key, value );
-
-		// setting collapsible: false while collapsed; open first panel
-		if ( key === "collapsible" && !value && this.options.active === false ) {
-			this._activate( 0 );
-		}
-
-		if ( key === "icons" ) {
-			this._destroyIcons();
-			if ( value ) {
-				this._createIcons();
-			}
-		}
-
-		// #5332 - opacity doesn't cascade to positioned elements in IE
-		// so we need to add the disabled class to the headers and panels
-		if ( key === "disabled" ) {
-			this.element
-				.toggleClass( "ui-state-disabled", !!value )
-				.attr( "aria-disabled", value );
-			this.headers.add( this.headers.next() )
-				.toggleClass( "ui-state-disabled", !!value );
-		}
-	},
-
-	_keydown: function( event ) {
-		if ( event.altKey || event.ctrlKey ) {
-			return;
-		}
-
-		var keyCode = $.ui.keyCode,
-			length = this.headers.length,
-			currentIndex = this.headers.index( event.target ),
-			toFocus = false;
-
-		switch ( event.keyCode ) {
-			case keyCode.RIGHT:
-			case keyCode.DOWN:
-				toFocus = this.headers[ ( currentIndex + 1 ) % length ];
-				break;
-			case keyCode.LEFT:
-			case keyCode.UP:
-				toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
-				break;
-			case keyCode.SPACE:
-			case keyCode.ENTER:
-				this._eventHandler( event );
-				break;
-			case keyCode.HOME:
-				toFocus = this.headers[ 0 ];
-				break;
-			case keyCode.END:
-				toFocus = this.headers[ length - 1 ];
-				break;
-		}
-
-		if ( toFocus ) {
-			$( event.target ).attr( "tabIndex", -1 );
-			$( toFocus ).attr( "tabIndex", 0 );
-			toFocus.focus();
-			event.preventDefault();
-		}
-	},
-
-	_panelKeyDown: function( event ) {
-		if ( event.keyCode === $.ui.keyCode.UP && event.ctrlKey ) {
-			$( event.currentTarget ).prev().focus();
-		}
-	},
-
-	refresh: function() {
-		var options = this.options;
-		this._processPanels();
-
-		// was collapsed or no panel
-		if ( ( options.active === false && options.collapsible === true ) || !this.headers.length ) {
-			options.active = false;
-			this.active = $();
-		// active false only when collapsible is true
-		} else if ( options.active === false ) {
-			this._activate( 0 );
-		// was active, but active panel is gone
-		} else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
-			// all remaining panel are disabled
-			if ( this.headers.length === this.headers.find(".ui-state-disabled").length ) {
-				options.active = false;
-				this.active = $();
-			// activate previous panel
-			} else {
-				this._activate( Math.max( 0, options.active - 1 ) );
-			}
-		// was active, active panel still exists
-		} else {
-			// make sure active index is correct
-			options.active = this.headers.index( this.active );
-		}
-
-		this._destroyIcons();
-
-		this._refresh();
-	},
-
-	_processPanels: function() {
-		var prevHeaders = this.headers,
-			prevPanels = this.panels;
-
-		this.headers = this.element.find( this.options.header )
-			.addClass( "ui-accordion-header ui-state-default ui-corner-all" );
-
-		this.panels = this.headers.next()
-			.addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" )
-			.filter( ":not(.ui-accordion-content-active)" )
-			.hide();
-
-		// Avoid memory leaks (#10056)
-		if ( prevPanels ) {
-			this._off( prevHeaders.not( this.headers ) );
-			this._off( prevPanels.not( this.panels ) );
-		}
-	},
-
-	_refresh: function() {
-		var maxHeight,
-			options = this.options,
-			heightStyle = options.heightStyle,
-			parent = this.element.parent();
-
-		this.active = this._findActive( options.active )
-			.addClass( "ui-accordion-header-active ui-state-active ui-corner-top" )
-			.removeClass( "ui-corner-all" );
-		this.active.next()
-			.addClass( "ui-accordion-content-active" )
-			.show();
-
-		this.headers
-			.attr( "role", "tab" )
-			.each(function() {
-				var header = $( this ),
-					headerId = header.uniqueId().attr( "id" ),
-					panel = header.next(),
-					panelId = panel.uniqueId().attr( "id" );
-				header.attr( "aria-controls", panelId );
-				panel.attr( "aria-labelledby", headerId );
-			})
-			.next()
-				.attr( "role", "tabpanel" );
-
-		this.headers
-			.not( this.active )
-			.attr({
-				"aria-selected": "false",
-				"aria-expanded": "false",
-				tabIndex: -1
-			})
-			.next()
-				.attr({
-					"aria-hidden": "true"
-				})
-				.hide();
-
-		// make sure at least one header is in the tab order
-		if ( !this.active.length ) {
-			this.headers.eq( 0 ).attr( "tabIndex", 0 );
-		} else {
-			this.active.attr({
-				"aria-selected": "true",
-				"aria-expanded": "true",
-				tabIndex: 0
-			})
-			.next()
-				.attr({
-					"aria-hidden": "false"
-				});
-		}
-
-		this._createIcons();
-
-		this._setupEvents( options.event );
-
-		if ( heightStyle === "fill" ) {
-			maxHeight = parent.height();
-			this.element.siblings( ":visible" ).each(function() {
-				var elem = $( this ),
-					position = elem.css( "position" );
-
-				if ( position === "absolute" || position === "fixed" ) {
-					return;
-				}
-				maxHeight -= elem.outerHeight( true );
-			});
-
-			this.headers.each(function() {
-				maxHeight -= $( this ).outerHeight( true );
-			});
-
-			this.headers.next()
-				.each(function() {
-					$( this ).height( Math.max( 0, maxHeight -
-						$( this ).innerHeight() + $( this ).height() ) );
-				})
-				.css( "overflow", "auto" );
-		} else if ( heightStyle === "auto" ) {
-			maxHeight = 0;
-			this.headers.next()
-				.each(function() {
-					maxHeight = Math.max( maxHeight, $( this ).css( "height", "" ).height() );
-				})
-				.height( maxHeight );
-		}
-	},
-
-	_activate: function( index ) {
-		var active = this._findActive( index )[ 0 ];
-
-		// trying to activate the already active panel
-		if ( active === this.active[ 0 ] ) {
-			return;
-		}
-
-		// trying to collapse, simulate a click on the currently active header
-		active = active || this.active[ 0 ];
-
-		this._eventHandler({
-			target: active,
-			currentTarget: active,
-			preventDefault: $.noop
-		});
-	},
-
-	_findActive: function( selector ) {
-		return typeof selector === "number" ? this.headers.eq( selector ) : $();
-	},
-
-	_setupEvents: function( event ) {
-		var events = {
-			keydown: "_keydown"
-		};
-		if ( event ) {
-			$.each( event.split( " " ), function( index, eventName ) {
-				events[ eventName ] = "_eventHandler";
-			});
-		}
-
-		this._off( this.headers.add( this.headers.next() ) );
-		this._on( this.headers, events );
-		this._on( this.headers.next(), { keydown: "_panelKeyDown" });
-		this._hoverable( this.headers );
-		this._focusable( this.headers );
-	},
-
-	_eventHandler: function( event ) {
-		var options = this.options,
-			active = this.active,
-			clicked = $( event.currentTarget ),
-			clickedIsActive = clicked[ 0 ] === active[ 0 ],
-			collapsing = clickedIsActive && options.collapsible,
-			toShow = collapsing ? $() : clicked.next(),
-			toHide = active.next(),
-			eventData = {
-				oldHeader: active,
-				oldPanel: toHide,
-				newHeader: collapsing ? $() : clicked,
-				newPanel: toShow
+var data = $.extend( $.expr[ ":" ], {
+	data: $.expr.createPseudo ?
+		$.expr.createPseudo( function( dataName ) {
+			return function( elem ) {
+				return !!$.data( elem, dataName );
 			};
+		} ) :
 
-		event.preventDefault();
-
-		if (
-				// click on active header, but not collapsible
-				( clickedIsActive && !options.collapsible ) ||
-				// allow canceling activation
-				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
-			return;
+		// Support: jQuery <1.8
+		function( elem, i, match ) {
+			return !!$.data( elem, match[ 3 ] );
 		}
-
-		options.active = collapsing ? false : this.headers.index( clicked );
-
-		// when the call to ._toggle() comes after the class changes
-		// it causes a very odd bug in IE 8 (see #6720)
-		this.active = clickedIsActive ? $() : clicked;
-		this._toggle( eventData );
-
-		// switch classes
-		// corner classes on the previously active header stay after the animation
-		active.removeClass( "ui-accordion-header-active ui-state-active" );
-		if ( options.icons ) {
-			active.children( ".ui-accordion-header-icon" )
-				.removeClass( options.icons.activeHeader )
-				.addClass( options.icons.header );
-		}
-
-		if ( !clickedIsActive ) {
-			clicked
-				.removeClass( "ui-corner-all" )
-				.addClass( "ui-accordion-header-active ui-state-active ui-corner-top" );
-			if ( options.icons ) {
-				clicked.children( ".ui-accordion-header-icon" )
-					.removeClass( options.icons.header )
-					.addClass( options.icons.activeHeader );
-			}
-
-			clicked
-				.next()
-				.addClass( "ui-accordion-content-active" );
-		}
-	},
-
-	_toggle: function( data ) {
-		var toShow = data.newPanel,
-			toHide = this.prevShow.length ? this.prevShow : data.oldPanel;
-
-		// handle activating a panel during the animation for another activation
-		this.prevShow.add( this.prevHide ).stop( true, true );
-		this.prevShow = toShow;
-		this.prevHide = toHide;
-
-		if ( this.options.animate ) {
-			this._animate( toShow, toHide, data );
-		} else {
-			toHide.hide();
-			toShow.show();
-			this._toggleComplete( data );
-		}
-
-		toHide.attr({
-			"aria-hidden": "true"
-		});
-		toHide.prev().attr({
-			"aria-selected": "false",
-			"aria-expanded": "false"
-		});
-		// if we're switching panels, remove the old header from the tab order
-		// if we're opening from collapsed state, remove the previous header from the tab order
-		// if we're collapsing, then keep the collapsing header in the tab order
-		if ( toShow.length && toHide.length ) {
-			toHide.prev().attr({
-				"tabIndex": -1,
-				"aria-expanded": "false"
-			});
-		} else if ( toShow.length ) {
-			this.headers.filter(function() {
-				return parseInt( $( this ).attr( "tabIndex" ), 10 ) === 0;
-			})
-			.attr( "tabIndex", -1 );
-		}
-
-		toShow
-			.attr( "aria-hidden", "false" )
-			.prev()
-				.attr({
-					"aria-selected": "true",
-					"aria-expanded": "true",
-					tabIndex: 0
-				});
-	},
-
-	_animate: function( toShow, toHide, data ) {
-		var total, easing, duration,
-			that = this,
-			adjust = 0,
-			boxSizing = toShow.css( "box-sizing" ),
-			down = toShow.length &&
-				( !toHide.length || ( toShow.index() < toHide.index() ) ),
-			animate = this.options.animate || {},
-			options = down && animate.down || animate,
-			complete = function() {
-				that._toggleComplete( data );
-			};
-
-		if ( typeof options === "number" ) {
-			duration = options;
-		}
-		if ( typeof options === "string" ) {
-			easing = options;
-		}
-		// fall back from options to animation in case of partial down settings
-		easing = easing || options.easing || animate.easing;
-		duration = duration || options.duration || animate.duration;
-
-		if ( !toHide.length ) {
-			return toShow.animate( this.showProps, duration, easing, complete );
-		}
-		if ( !toShow.length ) {
-			return toHide.animate( this.hideProps, duration, easing, complete );
-		}
-
-		total = toShow.show().outerHeight();
-		toHide.animate( this.hideProps, {
-			duration: duration,
-			easing: easing,
-			step: function( now, fx ) {
-				fx.now = Math.round( now );
-			}
-		});
-		toShow
-			.hide()
-			.animate( this.showProps, {
-				duration: duration,
-				easing: easing,
-				complete: complete,
-				step: function( now, fx ) {
-					fx.now = Math.round( now );
-					if ( fx.prop !== "height" ) {
-						if ( boxSizing === "content-box" ) {
-							adjust += fx.now;
-						}
-					} else if ( that.options.heightStyle !== "content" ) {
-						fx.now = Math.round( total - toHide.outerHeight() - adjust );
-						adjust = 0;
-					}
-				}
-			});
-	},
-
-	_toggleComplete: function( data ) {
-		var toHide = data.oldPanel;
-
-		toHide
-			.removeClass( "ui-accordion-content-active" )
-			.prev()
-				.removeClass( "ui-corner-top" )
-				.addClass( "ui-corner-all" );
-
-		// Work around for rendering bug in IE (#5421)
-		if ( toHide.length ) {
-			toHide.parent()[ 0 ].className = toHide.parent()[ 0 ].className;
-		}
-		this._trigger( "activate", null, data );
-	}
-});
-
+} );
 
 /*!
- * jQuery UI Menu 1.11.4
+ * jQuery UI Disable Selection 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/menu/
  */
 
+//>>label: disableSelection
+//>>group: Core
+//>>description: Disable selection of text content within the set of matched elements.
+//>>docs: http://api.jqueryui.com/disableSelection/
 
-var menu = $.widget( "ui.menu", {
-	version: "1.11.4",
-	defaultElement: "<ul>",
-	delay: 300,
-	options: {
-		icons: {
-			submenu: "ui-icon-carat-1-e"
-		},
-		items: "> *",
-		menus: "ul",
-		position: {
-			my: "left-1 top",
-			at: "right top"
-		},
-		role: "menu",
+// This file is deprecated
 
-		// callbacks
-		blur: null,
-		focus: null,
-		select: null
-	},
 
-	_create: function() {
-		this.activeMenu = this.element;
+var disableSelection = $.fn.extend( {
+	disableSelection: ( function() {
+		var eventType = "onselectstart" in document.createElement( "div" ) ?
+			"selectstart" :
+			"mousedown";
 
-		// Flag used to prevent firing of the click handler
-		// as the event bubbles up through nested menus
-		this.mouseHandled = false;
-		this.element
-			.uniqueId()
-			.addClass( "ui-menu ui-widget ui-widget-content" )
-			.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length )
-			.attr({
-				role: this.options.role,
-				tabIndex: 0
-			});
-
-		if ( this.options.disabled ) {
-			this.element
-				.addClass( "ui-state-disabled" )
-				.attr( "aria-disabled", "true" );
-		}
-
-		this._on({
-			// Prevent focus from sticking to links inside menu after clicking
-			// them (focus should always stay on UL during navigation).
-			"mousedown .ui-menu-item": function( event ) {
+		return function() {
+			return this.on( eventType + ".ui-disableSelection", function( event ) {
 				event.preventDefault();
-			},
-			"click .ui-menu-item": function( event ) {
-				var target = $( event.target );
-				if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
-					this.select( event );
+			} );
+		};
+	} )(),
 
-					// Only set the mouseHandled flag if the event will bubble, see #9469.
-					if ( !event.isPropagationStopped() ) {
-						this.mouseHandled = true;
-					}
-
-					// Open submenu on click
-					if ( target.has( ".ui-menu" ).length ) {
-						this.expand( event );
-					} else if ( !this.element.is( ":focus" ) && $( this.document[ 0 ].activeElement ).closest( ".ui-menu" ).length ) {
-
-						// Redirect focus to the menu
-						this.element.trigger( "focus", [ true ] );
-
-						// If the active item is on the top level, let it stay active.
-						// Otherwise, blur the active item since it is no longer visible.
-						if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
-							clearTimeout( this.timer );
-						}
-					}
-				}
-			},
-			"mouseenter .ui-menu-item": function( event ) {
-				// Ignore mouse events while typeahead is active, see #10458.
-				// Prevents focusing the wrong item when typeahead causes a scroll while the mouse
-				// is over an item in the menu
-				if ( this.previousFilter ) {
-					return;
-				}
-				var target = $( event.currentTarget );
-				// Remove ui-state-active class from siblings of the newly focused menu item
-				// to avoid a jump caused by adjacent elements both having a class with a border
-				target.siblings( ".ui-state-active" ).removeClass( "ui-state-active" );
-				this.focus( event, target );
-			},
-			mouseleave: "collapseAll",
-			"mouseleave .ui-menu": "collapseAll",
-			focus: function( event, keepActiveItem ) {
-				// If there's already an active item, keep it active
-				// If not, activate the first item
-				var item = this.active || this.element.find( this.options.items ).eq( 0 );
-
-				if ( !keepActiveItem ) {
-					this.focus( event, item );
-				}
-			},
-			blur: function( event ) {
-				this._delay(function() {
-					if ( !$.contains( this.element[0], this.document[0].activeElement ) ) {
-						this.collapseAll( event );
-					}
-				});
-			},
-			keydown: "_keydown"
-		});
-
-		this.refresh();
-
-		// Clicks outside of a menu collapse any open menus
-		this._on( this.document, {
-			click: function( event ) {
-				if ( this._closeOnDocumentClick( event ) ) {
-					this.collapseAll( event );
-				}
-
-				// Reset the mouseHandled flag
-				this.mouseHandled = false;
-			}
-		});
-	},
-
-	_destroy: function() {
-		// Destroy (sub)menus
-		this.element
-			.removeAttr( "aria-activedescendant" )
-			.find( ".ui-menu" ).addBack()
-				.removeClass( "ui-menu ui-widget ui-widget-content ui-menu-icons ui-front" )
-				.removeAttr( "role" )
-				.removeAttr( "tabIndex" )
-				.removeAttr( "aria-labelledby" )
-				.removeAttr( "aria-expanded" )
-				.removeAttr( "aria-hidden" )
-				.removeAttr( "aria-disabled" )
-				.removeUniqueId()
-				.show();
-
-		// Destroy menu items
-		this.element.find( ".ui-menu-item" )
-			.removeClass( "ui-menu-item" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-disabled" )
-			.removeUniqueId()
-			.removeClass( "ui-state-hover" )
-			.removeAttr( "tabIndex" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-haspopup" )
-			.children().each( function() {
-				var elem = $( this );
-				if ( elem.data( "ui-menu-submenu-carat" ) ) {
-					elem.remove();
-				}
-			});
-
-		// Destroy menu dividers
-		this.element.find( ".ui-menu-divider" ).removeClass( "ui-menu-divider ui-widget-content" );
-	},
-
-	_keydown: function( event ) {
-		var match, prev, character, skip,
-			preventDefault = true;
-
-		switch ( event.keyCode ) {
-		case $.ui.keyCode.PAGE_UP:
-			this.previousPage( event );
-			break;
-		case $.ui.keyCode.PAGE_DOWN:
-			this.nextPage( event );
-			break;
-		case $.ui.keyCode.HOME:
-			this._move( "first", "first", event );
-			break;
-		case $.ui.keyCode.END:
-			this._move( "last", "last", event );
-			break;
-		case $.ui.keyCode.UP:
-			this.previous( event );
-			break;
-		case $.ui.keyCode.DOWN:
-			this.next( event );
-			break;
-		case $.ui.keyCode.LEFT:
-			this.collapse( event );
-			break;
-		case $.ui.keyCode.RIGHT:
-			if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
-				this.expand( event );
-			}
-			break;
-		case $.ui.keyCode.ENTER:
-		case $.ui.keyCode.SPACE:
-			this._activate( event );
-			break;
-		case $.ui.keyCode.ESCAPE:
-			this.collapse( event );
-			break;
-		default:
-			preventDefault = false;
-			prev = this.previousFilter || "";
-			character = String.fromCharCode( event.keyCode );
-			skip = false;
-
-			clearTimeout( this.filterTimer );
-
-			if ( character === prev ) {
-				skip = true;
-			} else {
-				character = prev + character;
-			}
-
-			match = this._filterMenuItems( character );
-			match = skip && match.index( this.active.next() ) !== -1 ?
-				this.active.nextAll( ".ui-menu-item" ) :
-				match;
-
-			// If no matches on the current filter, reset to the last character pressed
-			// to move down the menu to the first item that starts with that character
-			if ( !match.length ) {
-				character = String.fromCharCode( event.keyCode );
-				match = this._filterMenuItems( character );
-			}
-
-			if ( match.length ) {
-				this.focus( event, match );
-				this.previousFilter = character;
-				this.filterTimer = this._delay(function() {
-					delete this.previousFilter;
-				}, 1000 );
-			} else {
-				delete this.previousFilter;
-			}
-		}
-
-		if ( preventDefault ) {
-			event.preventDefault();
-		}
-	},
-
-	_activate: function( event ) {
-		if ( !this.active.is( ".ui-state-disabled" ) ) {
-			if ( this.active.is( "[aria-haspopup='true']" ) ) {
-				this.expand( event );
-			} else {
-				this.select( event );
-			}
-		}
-	},
-
-	refresh: function() {
-		var menus, items,
-			that = this,
-			icon = this.options.icons.submenu,
-			submenus = this.element.find( this.options.menus );
-
-		this.element.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length );
-
-		// Initialize nested menus
-		submenus.filter( ":not(.ui-menu)" )
-			.addClass( "ui-menu ui-widget ui-widget-content ui-front" )
-			.hide()
-			.attr({
-				role: this.options.role,
-				"aria-hidden": "true",
-				"aria-expanded": "false"
-			})
-			.each(function() {
-				var menu = $( this ),
-					item = menu.parent(),
-					submenuCarat = $( "<span>" )
-						.addClass( "ui-menu-icon ui-icon " + icon )
-						.data( "ui-menu-submenu-carat", true );
-
-				item
-					.attr( "aria-haspopup", "true" )
-					.prepend( submenuCarat );
-				menu.attr( "aria-labelledby", item.attr( "id" ) );
-			});
-
-		menus = submenus.add( this.element );
-		items = menus.find( this.options.items );
-
-		// Initialize menu-items containing spaces and/or dashes only as dividers
-		items.not( ".ui-menu-item" ).each(function() {
-			var item = $( this );
-			if ( that._isDivider( item ) ) {
-				item.addClass( "ui-widget-content ui-menu-divider" );
-			}
-		});
-
-		// Don't refresh list items that are already adapted
-		items.not( ".ui-menu-item, .ui-menu-divider" )
-			.addClass( "ui-menu-item" )
-			.uniqueId()
-			.attr({
-				tabIndex: -1,
-				role: this._itemRole()
-			});
-
-		// Add aria-disabled attribute to any disabled menu item
-		items.filter( ".ui-state-disabled" ).attr( "aria-disabled", "true" );
-
-		// If the active item has been removed, blur the menu
-		if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
-			this.blur();
-		}
-	},
-
-	_itemRole: function() {
-		return {
-			menu: "menuitem",
-			listbox: "option"
-		}[ this.options.role ];
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "icons" ) {
-			this.element.find( ".ui-menu-icon" )
-				.removeClass( this.options.icons.submenu )
-				.addClass( value.submenu );
-		}
-		if ( key === "disabled" ) {
-			this.element
-				.toggleClass( "ui-state-disabled", !!value )
-				.attr( "aria-disabled", value );
-		}
-		this._super( key, value );
-	},
-
-	focus: function( event, item ) {
-		var nested, focused;
-		this.blur( event, event && event.type === "focus" );
-
-		this._scrollIntoView( item );
-
-		this.active = item.first();
-		focused = this.active.addClass( "ui-state-focus" ).removeClass( "ui-state-active" );
-		// Only update aria-activedescendant if there's a role
-		// otherwise we assume focus is managed elsewhere
-		if ( this.options.role ) {
-			this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
-		}
-
-		// Highlight active parent menu item, if any
-		this.active
-			.parent()
-			.closest( ".ui-menu-item" )
-			.addClass( "ui-state-active" );
-
-		if ( event && event.type === "keydown" ) {
-			this._close();
-		} else {
-			this.timer = this._delay(function() {
-				this._close();
-			}, this.delay );
-		}
-
-		nested = item.children( ".ui-menu" );
-		if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) {
-			this._startOpening(nested);
-		}
-		this.activeMenu = item.parent();
-
-		this._trigger( "focus", event, { item: item } );
-	},
-
-	_scrollIntoView: function( item ) {
-		var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
-		if ( this._hasScroll() ) {
-			borderTop = parseFloat( $.css( this.activeMenu[0], "borderTopWidth" ) ) || 0;
-			paddingTop = parseFloat( $.css( this.activeMenu[0], "paddingTop" ) ) || 0;
-			offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
-			scroll = this.activeMenu.scrollTop();
-			elementHeight = this.activeMenu.height();
-			itemHeight = item.outerHeight();
-
-			if ( offset < 0 ) {
-				this.activeMenu.scrollTop( scroll + offset );
-			} else if ( offset + itemHeight > elementHeight ) {
-				this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
-			}
-		}
-	},
-
-	blur: function( event, fromFocus ) {
-		if ( !fromFocus ) {
-			clearTimeout( this.timer );
-		}
-
-		if ( !this.active ) {
-			return;
-		}
-
-		this.active.removeClass( "ui-state-focus" );
-		this.active = null;
-
-		this._trigger( "blur", event, { item: this.active } );
-	},
-
-	_startOpening: function( submenu ) {
-		clearTimeout( this.timer );
-
-		// Don't open if already open fixes a Firefox bug that caused a .5 pixel
-		// shift in the submenu position when mousing over the carat icon
-		if ( submenu.attr( "aria-hidden" ) !== "true" ) {
-			return;
-		}
-
-		this.timer = this._delay(function() {
-			this._close();
-			this._open( submenu );
-		}, this.delay );
-	},
-
-	_open: function( submenu ) {
-		var position = $.extend({
-			of: this.active
-		}, this.options.position );
-
-		clearTimeout( this.timer );
-		this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
-			.hide()
-			.attr( "aria-hidden", "true" );
-
-		submenu
-			.show()
-			.removeAttr( "aria-hidden" )
-			.attr( "aria-expanded", "true" )
-			.position( position );
-	},
-
-	collapseAll: function( event, all ) {
-		clearTimeout( this.timer );
-		this.timer = this._delay(function() {
-			// If we were passed an event, look for the submenu that contains the event
-			var currentMenu = all ? this.element :
-				$( event && event.target ).closest( this.element.find( ".ui-menu" ) );
-
-			// If we found no valid submenu ancestor, use the main menu to close all sub menus anyway
-			if ( !currentMenu.length ) {
-				currentMenu = this.element;
-			}
-
-			this._close( currentMenu );
-
-			this.blur( event );
-			this.activeMenu = currentMenu;
-		}, this.delay );
-	},
-
-	// With no arguments, closes the currently active menu - if nothing is active
-	// it closes all menus.  If passed an argument, it will search for menus BELOW
-	_close: function( startMenu ) {
-		if ( !startMenu ) {
-			startMenu = this.active ? this.active.parent() : this.element;
-		}
-
-		startMenu
-			.find( ".ui-menu" )
-				.hide()
-				.attr( "aria-hidden", "true" )
-				.attr( "aria-expanded", "false" )
-			.end()
-			.find( ".ui-state-active" ).not( ".ui-state-focus" )
-				.removeClass( "ui-state-active" );
-	},
-
-	_closeOnDocumentClick: function( event ) {
-		return !$( event.target ).closest( ".ui-menu" ).length;
-	},
-
-	_isDivider: function( item ) {
-
-		// Match hyphen, em dash, en dash
-		return !/[^\-\u2014\u2013\s]/.test( item.text() );
-	},
-
-	collapse: function( event ) {
-		var newItem = this.active &&
-			this.active.parent().closest( ".ui-menu-item", this.element );
-		if ( newItem && newItem.length ) {
-			this._close();
-			this.focus( event, newItem );
-		}
-	},
-
-	expand: function( event ) {
-		var newItem = this.active &&
-			this.active
-				.children( ".ui-menu " )
-				.find( this.options.items )
-				.first();
-
-		if ( newItem && newItem.length ) {
-			this._open( newItem.parent() );
-
-			// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
-			this._delay(function() {
-				this.focus( event, newItem );
-			});
-		}
-	},
-
-	next: function( event ) {
-		this._move( "next", "first", event );
-	},
-
-	previous: function( event ) {
-		this._move( "prev", "last", event );
-	},
-
-	isFirstItem: function() {
-		return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
-	},
-
-	isLastItem: function() {
-		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
-	},
-
-	_move: function( direction, filter, event ) {
-		var next;
-		if ( this.active ) {
-			if ( direction === "first" || direction === "last" ) {
-				next = this.active
-					[ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
-					.eq( -1 );
-			} else {
-				next = this.active
-					[ direction + "All" ]( ".ui-menu-item" )
-					.eq( 0 );
-			}
-		}
-		if ( !next || !next.length || !this.active ) {
-			next = this.activeMenu.find( this.options.items )[ filter ]();
-		}
-
-		this.focus( event, next );
-	},
-
-	nextPage: function( event ) {
-		var item, base, height;
-
-		if ( !this.active ) {
-			this.next( event );
-			return;
-		}
-		if ( this.isLastItem() ) {
-			return;
-		}
-		if ( this._hasScroll() ) {
-			base = this.active.offset().top;
-			height = this.element.height();
-			this.active.nextAll( ".ui-menu-item" ).each(function() {
-				item = $( this );
-				return item.offset().top - base - height < 0;
-			});
-
-			this.focus( event, item );
-		} else {
-			this.focus( event, this.activeMenu.find( this.options.items )
-				[ !this.active ? "first" : "last" ]() );
-		}
-	},
-
-	previousPage: function( event ) {
-		var item, base, height;
-		if ( !this.active ) {
-			this.next( event );
-			return;
-		}
-		if ( this.isFirstItem() ) {
-			return;
-		}
-		if ( this._hasScroll() ) {
-			base = this.active.offset().top;
-			height = this.element.height();
-			this.active.prevAll( ".ui-menu-item" ).each(function() {
-				item = $( this );
-				return item.offset().top - base + height > 0;
-			});
-
-			this.focus( event, item );
-		} else {
-			this.focus( event, this.activeMenu.find( this.options.items ).first() );
-		}
-	},
-
-	_hasScroll: function() {
-		return this.element.outerHeight() < this.element.prop( "scrollHeight" );
-	},
-
-	select: function( event ) {
-		// TODO: It should never be possible to not have an active item at this
-		// point, but the tests don't trigger mouseenter before click.
-		this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
-		var ui = { item: this.active };
-		if ( !this.active.has( ".ui-menu" ).length ) {
-			this.collapseAll( event, true );
-		}
-		this._trigger( "select", event, ui );
-	},
-
-	_filterMenuItems: function(character) {
-		var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ),
-			regex = new RegExp( "^" + escapedCharacter, "i" );
-
-		return this.activeMenu
-			.find( this.options.items )
-
-			// Only match on items, not dividers or other content (#10571)
-			.filter( ".ui-menu-item" )
-			.filter(function() {
-				return regex.test( $.trim( $( this ).text() ) );
-			});
+	enableSelection: function() {
+		return this.off( ".ui-disableSelection" );
 	}
-});
+} );
 
 
 /*!
- * jQuery UI Autocomplete 1.11.4
+ * jQuery UI Focusable 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/autocomplete/
  */
 
+//>>label: :focusable Selector
+//>>group: Core
+//>>description: Selects elements which can be focused.
+//>>docs: http://api.jqueryui.com/focusable-selector/
 
-$.widget( "ui.autocomplete", {
-	version: "1.11.4",
-	defaultElement: "<input>",
-	options: {
-		appendTo: null,
-		autoFocus: false,
-		delay: 300,
-		minLength: 1,
-		position: {
-			my: "left top",
-			at: "left bottom",
-			collision: "none"
-		},
-		source: null,
 
-		// callbacks
-		change: null,
-		close: null,
-		focus: null,
-		open: null,
-		response: null,
-		search: null,
-		select: null
-	},
 
-	requestIndex: 0,
-	pending: 0,
+// Selectors
+$.ui.focusable = function( element, hasTabindex ) {
+	var map, mapName, img, focusableIfVisible, fieldset,
+		nodeName = element.nodeName.toLowerCase();
 
-	_create: function() {
-		// Some browsers only repeat keydown events, not keypress events,
-		// so we use the suppressKeyPress flag to determine if we've already
-		// handled the keydown event. #7269
-		// Unfortunately the code for & in keypress is the same as the up arrow,
-		// so we use the suppressKeyPressRepeat flag to avoid handling keypress
-		// events when we know the keydown event was used to modify the
-		// search term. #7799
-		var suppressKeyPress, suppressKeyPressRepeat, suppressInput,
-			nodeName = this.element[ 0 ].nodeName.toLowerCase(),
-			isTextarea = nodeName === "textarea",
-			isInput = nodeName === "input";
-
-		this.isMultiLine =
-			// Textareas are always multi-line
-			isTextarea ? true :
-			// Inputs are always single-line, even if inside a contentEditable element
-			// IE also treats inputs as contentEditable
-			isInput ? false :
-			// All other element types are determined by whether or not they're contentEditable
-			this.element.prop( "isContentEditable" );
-
-		this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
-		this.isNewMenu = true;
-
-		this.element
-			.addClass( "ui-autocomplete-input" )
-			.attr( "autocomplete", "off" );
-
-		this._on( this.element, {
-			keydown: function( event ) {
-				if ( this.element.prop( "readOnly" ) ) {
-					suppressKeyPress = true;
-					suppressInput = true;
-					suppressKeyPressRepeat = true;
-					return;
-				}
-
-				suppressKeyPress = false;
-				suppressInput = false;
-				suppressKeyPressRepeat = false;
-				var keyCode = $.ui.keyCode;
-				switch ( event.keyCode ) {
-				case keyCode.PAGE_UP:
-					suppressKeyPress = true;
-					this._move( "previousPage", event );
-					break;
-				case keyCode.PAGE_DOWN:
-					suppressKeyPress = true;
-					this._move( "nextPage", event );
-					break;
-				case keyCode.UP:
-					suppressKeyPress = true;
-					this._keyEvent( "previous", event );
-					break;
-				case keyCode.DOWN:
-					suppressKeyPress = true;
-					this._keyEvent( "next", event );
-					break;
-				case keyCode.ENTER:
-					// when menu is open and has focus
-					if ( this.menu.active ) {
-						// #6055 - Opera still allows the keypress to occur
-						// which causes forms to submit
-						suppressKeyPress = true;
-						event.preventDefault();
-						this.menu.select( event );
-					}
-					break;
-				case keyCode.TAB:
-					if ( this.menu.active ) {
-						this.menu.select( event );
-					}
-					break;
-				case keyCode.ESCAPE:
-					if ( this.menu.element.is( ":visible" ) ) {
-						if ( !this.isMultiLine ) {
-							this._value( this.term );
-						}
-						this.close( event );
-						// Different browsers have different default behavior for escape
-						// Single press can mean undo or clear
-						// Double press in IE means clear the whole form
-						event.preventDefault();
-					}
-					break;
-				default:
-					suppressKeyPressRepeat = true;
-					// search timeout should be triggered before the input value is changed
-					this._searchTimeout( event );
-					break;
-				}
-			},
-			keypress: function( event ) {
-				if ( suppressKeyPress ) {
-					suppressKeyPress = false;
-					if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
-						event.preventDefault();
-					}
-					return;
-				}
-				if ( suppressKeyPressRepeat ) {
-					return;
-				}
-
-				// replicate some key handlers to allow them to repeat in Firefox and Opera
-				var keyCode = $.ui.keyCode;
-				switch ( event.keyCode ) {
-				case keyCode.PAGE_UP:
-					this._move( "previousPage", event );
-					break;
-				case keyCode.PAGE_DOWN:
-					this._move( "nextPage", event );
-					break;
-				case keyCode.UP:
-					this._keyEvent( "previous", event );
-					break;
-				case keyCode.DOWN:
-					this._keyEvent( "next", event );
-					break;
-				}
-			},
-			input: function( event ) {
-				if ( suppressInput ) {
-					suppressInput = false;
-					event.preventDefault();
-					return;
-				}
-				this._searchTimeout( event );
-			},
-			focus: function() {
-				this.selectedItem = null;
-				this.previous = this._value();
-			},
-			blur: function( event ) {
-				if ( this.cancelBlur ) {
-					delete this.cancelBlur;
-					return;
-				}
-
-				clearTimeout( this.searching );
-				this.close( event );
-				this._change( event );
-			}
-		});
-
-		this._initSource();
-		this.menu = $( "<ul>" )
-			.addClass( "ui-autocomplete ui-front" )
-			.appendTo( this._appendTo() )
-			.menu({
-				// disable ARIA support, the live region takes care of that
-				role: null
-			})
-			.hide()
-			.menu( "instance" );
-
-		this._on( this.menu.element, {
-			mousedown: function( event ) {
-				// prevent moving focus out of the text field
-				event.preventDefault();
-
-				// IE doesn't prevent moving focus even with event.preventDefault()
-				// so we set a flag to know when we should ignore the blur event
-				this.cancelBlur = true;
-				this._delay(function() {
-					delete this.cancelBlur;
-				});
-
-				// clicking on the scrollbar causes focus to shift to the body
-				// but we can't detect a mouseup or a click immediately afterward
-				// so we have to track the next mousedown and close the menu if
-				// the user clicks somewhere outside of the autocomplete
-				var menuElement = this.menu.element[ 0 ];
-				if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
-					this._delay(function() {
-						var that = this;
-						this.document.one( "mousedown", function( event ) {
-							if ( event.target !== that.element[ 0 ] &&
-									event.target !== menuElement &&
-									!$.contains( menuElement, event.target ) ) {
-								that.close();
-							}
-						});
-					});
-				}
-			},
-			menufocus: function( event, ui ) {
-				var label, item;
-				// support: Firefox
-				// Prevent accidental activation of menu items in Firefox (#7024 #9118)
-				if ( this.isNewMenu ) {
-					this.isNewMenu = false;
-					if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
-						this.menu.blur();
-
-						this.document.one( "mousemove", function() {
-							$( event.target ).trigger( event.originalEvent );
-						});
-
-						return;
-					}
-				}
-
-				item = ui.item.data( "ui-autocomplete-item" );
-				if ( false !== this._trigger( "focus", event, { item: item } ) ) {
-					// use value to match what will end up in the input, if it was a key event
-					if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
-						this._value( item.value );
-					}
-				}
-
-				// Announce the value in the liveRegion
-				label = ui.item.attr( "aria-label" ) || item.value;
-				if ( label && $.trim( label ).length ) {
-					this.liveRegion.children().hide();
-					$( "<div>" ).text( label ).appendTo( this.liveRegion );
-				}
-			},
-			menuselect: function( event, ui ) {
-				var item = ui.item.data( "ui-autocomplete-item" ),
-					previous = this.previous;
-
-				// only trigger when focus was lost (click on menu)
-				if ( this.element[ 0 ] !== this.document[ 0 ].activeElement ) {
-					this.element.focus();
-					this.previous = previous;
-					// #6109 - IE triggers two focus events and the second
-					// is asynchronous, so we need to reset the previous
-					// term synchronously and asynchronously :-(
-					this._delay(function() {
-						this.previous = previous;
-						this.selectedItem = item;
-					});
-				}
-
-				if ( false !== this._trigger( "select", event, { item: item } ) ) {
-					this._value( item.value );
-				}
-				// reset the term after the select event
-				// this allows custom select handling to work properly
-				this.term = this._value();
-
-				this.close( event );
-				this.selectedItem = item;
-			}
-		});
-
-		this.liveRegion = $( "<span>", {
-				role: "status",
-				"aria-live": "assertive",
-				"aria-relevant": "additions"
-			})
-			.addClass( "ui-helper-hidden-accessible" )
-			.appendTo( this.document[ 0 ].body );
-
-		// turning off autocomplete prevents the browser from remembering the
-		// value when navigating through history, so we re-enable autocomplete
-		// if the page is unloaded before the widget is destroyed. #7790
-		this._on( this.window, {
-			beforeunload: function() {
-				this.element.removeAttr( "autocomplete" );
-			}
-		});
-	},
-
-	_destroy: function() {
-		clearTimeout( this.searching );
-		this.element
-			.removeClass( "ui-autocomplete-input" )
-			.removeAttr( "autocomplete" );
-		this.menu.element.remove();
-		this.liveRegion.remove();
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-		if ( key === "source" ) {
-			this._initSource();
-		}
-		if ( key === "appendTo" ) {
-			this.menu.element.appendTo( this._appendTo() );
-		}
-		if ( key === "disabled" && value && this.xhr ) {
-			this.xhr.abort();
-		}
-	},
-
-	_appendTo: function() {
-		var element = this.options.appendTo;
-
-		if ( element ) {
-			element = element.jquery || element.nodeType ?
-				$( element ) :
-				this.document.find( element ).eq( 0 );
-		}
-
-		if ( !element || !element[ 0 ] ) {
-			element = this.element.closest( ".ui-front" );
-		}
-
-		if ( !element.length ) {
-			element = this.document[ 0 ].body;
-		}
-
-		return element;
-	},
-
-	_initSource: function() {
-		var array, url,
-			that = this;
-		if ( $.isArray( this.options.source ) ) {
-			array = this.options.source;
-			this.source = function( request, response ) {
-				response( $.ui.autocomplete.filter( array, request.term ) );
-			};
-		} else if ( typeof this.options.source === "string" ) {
-			url = this.options.source;
-			this.source = function( request, response ) {
-				if ( that.xhr ) {
-					that.xhr.abort();
-				}
-				that.xhr = $.ajax({
-					url: url,
-					data: request,
-					dataType: "json",
-					success: function( data ) {
-						response( data );
-					},
-					error: function() {
-						response([]);
-					}
-				});
-			};
-		} else {
-			this.source = this.options.source;
-		}
-	},
-
-	_searchTimeout: function( event ) {
-		clearTimeout( this.searching );
-		this.searching = this._delay(function() {
-
-			// Search if the value has changed, or if the user retypes the same value (see #7434)
-			var equalValues = this.term === this._value(),
-				menuVisible = this.menu.element.is( ":visible" ),
-				modifierKey = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
-
-			if ( !equalValues || ( equalValues && !menuVisible && !modifierKey ) ) {
-				this.selectedItem = null;
-				this.search( null, event );
-			}
-		}, this.options.delay );
-	},
-
-	search: function( value, event ) {
-		value = value != null ? value : this._value();
-
-		// always save the actual value, not the one passed as an argument
-		this.term = this._value();
-
-		if ( value.length < this.options.minLength ) {
-			return this.close( event );
-		}
-
-		if ( this._trigger( "search", event ) === false ) {
-			return;
-		}
-
-		return this._search( value );
-	},
-
-	_search: function( value ) {
-		this.pending++;
-		this.element.addClass( "ui-autocomplete-loading" );
-		this.cancelSearch = false;
-
-		this.source( { term: value }, this._response() );
-	},
-
-	_response: function() {
-		var index = ++this.requestIndex;
-
-		return $.proxy(function( content ) {
-			if ( index === this.requestIndex ) {
-				this.__response( content );
-			}
-
-			this.pending--;
-			if ( !this.pending ) {
-				this.element.removeClass( "ui-autocomplete-loading" );
-			}
-		}, this );
-	},
-
-	__response: function( content ) {
-		if ( content ) {
-			content = this._normalize( content );
-		}
-		this._trigger( "response", null, { content: content } );
-		if ( !this.options.disabled && content && content.length && !this.cancelSearch ) {
-			this._suggest( content );
-			this._trigger( "open" );
-		} else {
-			// use ._close() instead of .close() so we don't cancel future searches
-			this._close();
-		}
-	},
-
-	close: function( event ) {
-		this.cancelSearch = true;
-		this._close( event );
-	},
-
-	_close: function( event ) {
-		if ( this.menu.element.is( ":visible" ) ) {
-			this.menu.element.hide();
-			this.menu.blur();
-			this.isNewMenu = true;
-			this._trigger( "close", event );
-		}
-	},
-
-	_change: function( event ) {
-		if ( this.previous !== this._value() ) {
-			this._trigger( "change", event, { item: this.selectedItem } );
-		}
-	},
-
-	_normalize: function( items ) {
-		// assume all items have the right format when the first item is complete
-		if ( items.length && items[ 0 ].label && items[ 0 ].value ) {
-			return items;
-		}
-		return $.map( items, function( item ) {
-			if ( typeof item === "string" ) {
-				return {
-					label: item,
-					value: item
-				};
-			}
-			return $.extend( {}, item, {
-				label: item.label || item.value,
-				value: item.value || item.label
-			});
-		});
-	},
-
-	_suggest: function( items ) {
-		var ul = this.menu.element.empty();
-		this._renderMenu( ul, items );
-		this.isNewMenu = true;
-		this.menu.refresh();
-
-		// size and position menu
-		ul.show();
-		this._resizeMenu();
-		ul.position( $.extend({
-			of: this.element
-		}, this.options.position ) );
-
-		if ( this.options.autoFocus ) {
-			this.menu.next();
-		}
-	},
-
-	_resizeMenu: function() {
-		var ul = this.menu.element;
-		ul.outerWidth( Math.max(
-			// Firefox wraps long text (possibly a rounding bug)
-			// so we add 1px to avoid the wrapping (#7513)
-			ul.width( "" ).outerWidth() + 1,
-			this.element.outerWidth()
-		) );
-	},
-
-	_renderMenu: function( ul, items ) {
-		var that = this;
-		$.each( items, function( index, item ) {
-			that._renderItemData( ul, item );
-		});
-	},
-
-	_renderItemData: function( ul, item ) {
-		return this._renderItem( ul, item ).data( "ui-autocomplete-item", item );
-	},
-
-	_renderItem: function( ul, item ) {
-		return $( "<li>" ).text( item.label ).appendTo( ul );
-	},
-
-	_move: function( direction, event ) {
-		if ( !this.menu.element.is( ":visible" ) ) {
-			this.search( null, event );
-			return;
-		}
-		if ( this.menu.isFirstItem() && /^previous/.test( direction ) ||
-				this.menu.isLastItem() && /^next/.test( direction ) ) {
-
-			if ( !this.isMultiLine ) {
-				this._value( this.term );
-			}
-
-			this.menu.blur();
-			return;
-		}
-		this.menu[ direction ]( event );
-	},
-
-	widget: function() {
-		return this.menu.element;
-	},
-
-	_value: function() {
-		return this.valueMethod.apply( this.element, arguments );
-	},
-
-	_keyEvent: function( keyEvent, event ) {
-		if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
-			this._move( keyEvent, event );
-
-			// prevents moving cursor to beginning/end of the text field in some browsers
-			event.preventDefault();
-		}
-	}
-});
-
-$.extend( $.ui.autocomplete, {
-	escapeRegex: function( value ) {
-		return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
-	},
-	filter: function( array, term ) {
-		var matcher = new RegExp( $.ui.autocomplete.escapeRegex( term ), "i" );
-		return $.grep( array, function( value ) {
-			return matcher.test( value.label || value.value || value );
-		});
-	}
-});
-
-// live region extension, adding a `messages` option
-// NOTE: This is an experimental API. We are still investigating
-// a full solution for string manipulation and internationalization.
-$.widget( "ui.autocomplete", $.ui.autocomplete, {
-	options: {
-		messages: {
-			noResults: "No search results.",
-			results: function( amount ) {
-				return amount + ( amount > 1 ? " results are" : " result is" ) +
-					" available, use up and down arrow keys to navigate.";
-			}
-		}
-	},
-
-	__response: function( content ) {
-		var message;
-		this._superApply( arguments );
-		if ( this.options.disabled || this.cancelSearch ) {
-			return;
-		}
-		if ( content && content.length ) {
-			message = this.options.messages.results( content.length );
-		} else {
-			message = this.options.messages.noResults;
-		}
-		this.liveRegion.children().hide();
-		$( "<div>" ).text( message ).appendTo( this.liveRegion );
-	}
-});
-
-var autocomplete = $.ui.autocomplete;
-
-
-/*!
- * jQuery UI Button 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/button/
- */
-
-
-var lastActive,
-	baseClasses = "ui-button ui-widget ui-state-default ui-corner-all",
-	typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",
-	formResetHandler = function() {
-		var form = $( this );
-		setTimeout(function() {
-			form.find( ":ui-button" ).button( "refresh" );
-		}, 1 );
-	},
-	radioGroup = function( radio ) {
-		var name = radio.name,
-			form = radio.form,
-			radios = $( [] );
-		if ( name ) {
-			name = name.replace( /'/g, "\\'" );
-			if ( form ) {
-				radios = $( form ).find( "[name='" + name + "'][type=radio]" );
-			} else {
-				radios = $( "[name='" + name + "'][type=radio]", radio.ownerDocument )
-					.filter(function() {
-						return !this.form;
-					});
-			}
-		}
-		return radios;
-	};
-
-$.widget( "ui.button", {
-	version: "1.11.4",
-	defaultElement: "<button>",
-	options: {
-		disabled: null,
-		text: true,
-		label: null,
-		icons: {
-			primary: null,
-			secondary: null
-		}
-	},
-	_create: function() {
-		this.element.closest( "form" )
-			.unbind( "reset" + this.eventNamespace )
-			.bind( "reset" + this.eventNamespace, formResetHandler );
-
-		if ( typeof this.options.disabled !== "boolean" ) {
-			this.options.disabled = !!this.element.prop( "disabled" );
-		} else {
-			this.element.prop( "disabled", this.options.disabled );
-		}
-
-		this._determineButtonType();
-		this.hasTitle = !!this.buttonElement.attr( "title" );
-
-		var that = this,
-			options = this.options,
-			toggleButton = this.type === "checkbox" || this.type === "radio",
-			activeClass = !toggleButton ? "ui-state-active" : "";
-
-		if ( options.label === null ) {
-			options.label = (this.type === "input" ? this.buttonElement.val() : this.buttonElement.html());
-		}
-
-		this._hoverable( this.buttonElement );
-
-		this.buttonElement
-			.addClass( baseClasses )
-			.attr( "role", "button" )
-			.bind( "mouseenter" + this.eventNamespace, function() {
-				if ( options.disabled ) {
-					return;
-				}
-				if ( this === lastActive ) {
-					$( this ).addClass( "ui-state-active" );
-				}
-			})
-			.bind( "mouseleave" + this.eventNamespace, function() {
-				if ( options.disabled ) {
-					return;
-				}
-				$( this ).removeClass( activeClass );
-			})
-			.bind( "click" + this.eventNamespace, function( event ) {
-				if ( options.disabled ) {
-					event.preventDefault();
-					event.stopImmediatePropagation();
-				}
-			});
-
-		// Can't use _focusable() because the element that receives focus
-		// and the element that gets the ui-state-focus class are different
-		this._on({
-			focus: function() {
-				this.buttonElement.addClass( "ui-state-focus" );
-			},
-			blur: function() {
-				this.buttonElement.removeClass( "ui-state-focus" );
-			}
-		});
-
-		if ( toggleButton ) {
-			this.element.bind( "change" + this.eventNamespace, function() {
-				that.refresh();
-			});
-		}
-
-		if ( this.type === "checkbox" ) {
-			this.buttonElement.bind( "click" + this.eventNamespace, function() {
-				if ( options.disabled ) {
-					return false;
-				}
-			});
-		} else if ( this.type === "radio" ) {
-			this.buttonElement.bind( "click" + this.eventNamespace, function() {
-				if ( options.disabled ) {
-					return false;
-				}
-				$( this ).addClass( "ui-state-active" );
-				that.buttonElement.attr( "aria-pressed", "true" );
-
-				var radio = that.element[ 0 ];
-				radioGroup( radio )
-					.not( radio )
-					.map(function() {
-						return $( this ).button( "widget" )[ 0 ];
-					})
-					.removeClass( "ui-state-active" )
-					.attr( "aria-pressed", "false" );
-			});
-		} else {
-			this.buttonElement
-				.bind( "mousedown" + this.eventNamespace, function() {
-					if ( options.disabled ) {
-						return false;
-					}
-					$( this ).addClass( "ui-state-active" );
-					lastActive = this;
-					that.document.one( "mouseup", function() {
-						lastActive = null;
-					});
-				})
-				.bind( "mouseup" + this.eventNamespace, function() {
-					if ( options.disabled ) {
-						return false;
-					}
-					$( this ).removeClass( "ui-state-active" );
-				})
-				.bind( "keydown" + this.eventNamespace, function(event) {
-					if ( options.disabled ) {
-						return false;
-					}
-					if ( event.keyCode === $.ui.keyCode.SPACE || event.keyCode === $.ui.keyCode.ENTER ) {
-						$( this ).addClass( "ui-state-active" );
-					}
-				})
-				// see #8559, we bind to blur here in case the button element loses
-				// focus between keydown and keyup, it would be left in an "active" state
-				.bind( "keyup" + this.eventNamespace + " blur" + this.eventNamespace, function() {
-					$( this ).removeClass( "ui-state-active" );
-				});
-
-			if ( this.buttonElement.is("a") ) {
-				this.buttonElement.keyup(function(event) {
-					if ( event.keyCode === $.ui.keyCode.SPACE ) {
-						// TODO pass through original event correctly (just as 2nd argument doesn't work)
-						$( this ).click();
-					}
-				});
-			}
-		}
-
-		this._setOption( "disabled", options.disabled );
-		this._resetButton();
-	},
-
-	_determineButtonType: function() {
-		var ancestor, labelSelector, checked;
-
-		if ( this.element.is("[type=checkbox]") ) {
-			this.type = "checkbox";
-		} else if ( this.element.is("[type=radio]") ) {
-			this.type = "radio";
-		} else if ( this.element.is("input") ) {
-			this.type = "input";
-		} else {
-			this.type = "button";
-		}
-
-		if ( this.type === "checkbox" || this.type === "radio" ) {
-			// we don't search against the document in case the element
-			// is disconnected from the DOM
-			ancestor = this.element.parents().last();
-			labelSelector = "label[for='" + this.element.attr("id") + "']";
-			this.buttonElement = ancestor.find( labelSelector );
-			if ( !this.buttonElement.length ) {
-				ancestor = ancestor.length ? ancestor.siblings() : this.element.siblings();
-				this.buttonElement = ancestor.filter( labelSelector );
-				if ( !this.buttonElement.length ) {
-					this.buttonElement = ancestor.find( labelSelector );
-				}
-			}
-			this.element.addClass( "ui-helper-hidden-accessible" );
-
-			checked = this.element.is( ":checked" );
-			if ( checked ) {
-				this.buttonElement.addClass( "ui-state-active" );
-			}
-			this.buttonElement.prop( "aria-pressed", checked );
-		} else {
-			this.buttonElement = this.element;
-		}
-	},
-
-	widget: function() {
-		return this.buttonElement;
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass( "ui-helper-hidden-accessible" );
-		this.buttonElement
-			.removeClass( baseClasses + " ui-state-active " + typeClasses )
-			.removeAttr( "role" )
-			.removeAttr( "aria-pressed" )
-			.html( this.buttonElement.find(".ui-button-text").html() );
-
-		if ( !this.hasTitle ) {
-			this.buttonElement.removeAttr( "title" );
-		}
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-		if ( key === "disabled" ) {
-			this.widget().toggleClass( "ui-state-disabled", !!value );
-			this.element.prop( "disabled", !!value );
-			if ( value ) {
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					this.buttonElement.removeClass( "ui-state-focus" );
-				} else {
-					this.buttonElement.removeClass( "ui-state-focus ui-state-active" );
-				}
-			}
-			return;
-		}
-		this._resetButton();
-	},
-
-	refresh: function() {
-		//See #8237 & #8828
-		var isDisabled = this.element.is( "input, button" ) ? this.element.is( ":disabled" ) : this.element.hasClass( "ui-button-disabled" );
-
-		if ( isDisabled !== this.options.disabled ) {
-			this._setOption( "disabled", isDisabled );
-		}
-		if ( this.type === "radio" ) {
-			radioGroup( this.element[0] ).each(function() {
-				if ( $( this ).is( ":checked" ) ) {
-					$( this ).button( "widget" )
-						.addClass( "ui-state-active" )
-						.attr( "aria-pressed", "true" );
-				} else {
-					$( this ).button( "widget" )
-						.removeClass( "ui-state-active" )
-						.attr( "aria-pressed", "false" );
-				}
-			});
-		} else if ( this.type === "checkbox" ) {
-			if ( this.element.is( ":checked" ) ) {
-				this.buttonElement
-					.addClass( "ui-state-active" )
-					.attr( "aria-pressed", "true" );
-			} else {
-				this.buttonElement
-					.removeClass( "ui-state-active" )
-					.attr( "aria-pressed", "false" );
-			}
-		}
-	},
-
-	_resetButton: function() {
-		if ( this.type === "input" ) {
-			if ( this.options.label ) {
-				this.element.val( this.options.label );
-			}
-			return;
-		}
-		var buttonElement = this.buttonElement.removeClass( typeClasses ),
-			buttonText = $( "<span></span>", this.document[0] )
-				.addClass( "ui-button-text" )
-				.html( this.options.label )
-				.appendTo( buttonElement.empty() )
-				.text(),
-			icons = this.options.icons,
-			multipleIcons = icons.primary && icons.secondary,
-			buttonClasses = [];
-
-		if ( icons.primary || icons.secondary ) {
-			if ( this.options.text ) {
-				buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
-			}
-
-			if ( icons.primary ) {
-				buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
-			}
-
-			if ( icons.secondary ) {
-				buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" );
-			}
-
-			if ( !this.options.text ) {
-				buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" );
-
-				if ( !this.hasTitle ) {
-					buttonElement.attr( "title", $.trim( buttonText ) );
-				}
-			}
-		} else {
-			buttonClasses.push( "ui-button-text-only" );
-		}
-		buttonElement.addClass( buttonClasses.join( " " ) );
-	}
-});
-
-$.widget( "ui.buttonset", {
-	version: "1.11.4",
-	options: {
-		items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"
-	},
-
-	_create: function() {
-		this.element.addClass( "ui-buttonset" );
-	},
-
-	_init: function() {
-		this.refresh();
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "disabled" ) {
-			this.buttons.button( "option", key, value );
-		}
-
-		this._super( key, value );
-	},
-
-	refresh: function() {
-		var rtl = this.element.css( "direction" ) === "rtl",
-			allButtons = this.element.find( this.options.items ),
-			existingButtons = allButtons.filter( ":ui-button" );
-
-		// Initialize new buttons
-		allButtons.not( ":ui-button" ).button();
-
-		// Refresh existing buttons
-		existingButtons.button( "refresh" );
-
-		this.buttons = allButtons
-			.map(function() {
-				return $( this ).button( "widget" )[ 0 ];
-			})
-				.removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
-				.filter( ":first" )
-					.addClass( rtl ? "ui-corner-right" : "ui-corner-left" )
-				.end()
-				.filter( ":last" )
-					.addClass( rtl ? "ui-corner-left" : "ui-corner-right" )
-				.end()
-			.end();
-	},
-
-	_destroy: function() {
-		this.element.removeClass( "ui-buttonset" );
-		this.buttons
-			.map(function() {
-				return $( this ).button( "widget" )[ 0 ];
-			})
-				.removeClass( "ui-corner-left ui-corner-right" )
-			.end()
-			.button( "destroy" );
-	}
-});
-
-var button = $.ui.button;
-
-
-/*!
- * jQuery UI Datepicker 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/datepicker/
- */
-
-
-$.extend($.ui, { datepicker: { version: "1.11.4" } });
-
-var datepicker_instActive;
-
-function datepicker_getZindex( elem ) {
-	var position, value;
-	while ( elem.length && elem[ 0 ] !== document ) {
-		// Ignore z-index if position is set to a value where z-index is ignored by the browser
-		// This makes behavior of this function consistent across browsers
-		// WebKit always returns auto if the element is positioned
-		position = elem.css( "position" );
-		if ( position === "absolute" || position === "relative" || position === "fixed" ) {
-			// IE returns 0 when zIndex is not specified
-			// other browsers return a string
-			// we ignore the case of nested elements with an explicit value of 0
-			// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
-			value = parseInt( elem.css( "zIndex" ), 10 );
-			if ( !isNaN( value ) && value !== 0 ) {
-				return value;
-			}
-		}
-		elem = elem.parent();
-	}
-
-	return 0;
-}
-/* Date picker manager.
-   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
-   Settings for (groups of) date pickers are maintained in an instance object,
-   allowing multiple different settings on the same page. */
-
-function Datepicker() {
-	this._curInst = null; // The current instance in use
-	this._keyEvent = false; // If the last event was a key event
-	this._disabledInputs = []; // List of date picker inputs that have been disabled
-	this._datepickerShowing = false; // True if the popup picker is showing , false if not
-	this._inDialog = false; // True if showing within a "dialog", false if not
-	this._mainDivId = "ui-datepicker-div"; // The ID of the main datepicker division
-	this._inlineClass = "ui-datepicker-inline"; // The name of the inline marker class
-	this._appendClass = "ui-datepicker-append"; // The name of the append marker class
-	this._triggerClass = "ui-datepicker-trigger"; // The name of the trigger marker class
-	this._dialogClass = "ui-datepicker-dialog"; // The name of the dialog marker class
-	this._disableClass = "ui-datepicker-disabled"; // The name of the disabled covering marker class
-	this._unselectableClass = "ui-datepicker-unselectable"; // The name of the unselectable cell marker class
-	this._currentClass = "ui-datepicker-current-day"; // The name of the current day marker class
-	this._dayOverClass = "ui-datepicker-days-cell-over"; // The name of the day hover marker class
-	this.regional = []; // Available regional settings, indexed by language code
-	this.regional[""] = { // Default regional settings
-		closeText: "Done", // Display text for close link
-		prevText: "Prev", // Display text for previous month link
-		nextText: "Next", // Display text for next month link
-		currentText: "Today", // Display text for current month link
-		monthNames: ["January","February","March","April","May","June",
-			"July","August","September","October","November","December"], // Names of months for drop-down and formatting
-		monthNamesShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], // For formatting
-		dayNames: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], // For formatting
-		dayNamesShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], // For formatting
-		dayNamesMin: ["Su","Mo","Tu","We","Th","Fr","Sa"], // Column headings for days starting at Sunday
-		weekHeader: "Wk", // Column header for week of the year
-		dateFormat: "mm/dd/yy", // See format options on parseDate
-		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
-		isRTL: false, // True if right-to-left language, false if left-to-right
-		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
-		yearSuffix: "" // Additional text to append to the year in the month headers
-	};
-	this._defaults = { // Global defaults for all the date picker instances
-		showOn: "focus", // "focus" for popup on focus,
-			// "button" for trigger button, or "both" for either
-		showAnim: "fadeIn", // Name of jQuery animation for popup
-		showOptions: {}, // Options for enhanced animations
-		defaultDate: null, // Used when field is blank: actual date,
-			// +/-number for offset from today, null for today
-		appendText: "", // Display text following the input box, e.g. showing the format
-		buttonText: "...", // Text for trigger button
-		buttonImage: "", // URL for trigger button image
-		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
-		hideIfNoPrevNext: false, // True to hide next/previous month links
-			// if not applicable, false to just disable them
-		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
-		gotoCurrent: false, // True if today link goes back to current selection instead
-		changeMonth: false, // True if month can be selected directly, false if only prev/next
-		changeYear: false, // True if year can be selected directly, false if only prev/next
-		yearRange: "c-10:c+10", // Range of years to display in drop-down,
-			// either relative to today's year (-nn:+nn), relative to currently displayed year
-			// (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
-		showOtherMonths: false, // True to show dates in other months, false to leave blank
-		selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
-		showWeek: false, // True to show week of the year, false to not show it
-		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
-			// takes a Date and returns the number of the week for it
-		shortYearCutoff: "+10", // Short year values < this are in the current century,
-			// > this are in the previous century,
-			// string value starting with "+" for current year + value
-		minDate: null, // The earliest selectable date, or null for no limit
-		maxDate: null, // The latest selectable date, or null for no limit
-		duration: "fast", // Duration of display/closure
-		beforeShowDay: null, // Function that takes a date and returns an array with
-			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or "",
-			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
-		beforeShow: null, // Function that takes an input field and
-			// returns a set of custom settings for the date picker
-		onSelect: null, // Define a callback function when a date is selected
-		onChangeMonthYear: null, // Define a callback function when the month or year is changed
-		onClose: null, // Define a callback function when the datepicker is closed
-		numberOfMonths: 1, // Number of months to show at a time
-		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
-		stepMonths: 1, // Number of months to step back/forward
-		stepBigMonths: 12, // Number of months to step back/forward for the big links
-		altField: "", // Selector for an alternate field to store selected dates into
-		altFormat: "", // The date format to use for the alternate field
-		constrainInput: true, // The input is constrained by the current date format
-		showButtonPanel: false, // True to show button panel, false to not show it
-		autoSize: false, // True to size the input for the date format, false to leave as is
-		disabled: false // The initial disabled state
-	};
-	$.extend(this._defaults, this.regional[""]);
-	this.regional.en = $.extend( true, {}, this.regional[ "" ]);
-	this.regional[ "en-US" ] = $.extend( true, {}, this.regional.en );
-	this.dpDiv = datepicker_bindHover($("<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"));
-}
-
-$.extend(Datepicker.prototype, {
-	/* Class name added to elements to indicate already configured with a date picker. */
-	markerClassName: "hasDatepicker",
-
-	//Keep track of the maximum number of rows displayed (see #7043)
-	maxRows: 4,
-
-	// TODO rename to "widget" when switching to widget factory
-	_widgetDatepicker: function() {
-		return this.dpDiv;
-	},
-
-	/* Override the default settings for all instances of the date picker.
-	 * @param  settings  object - the new settings to use as defaults (anonymous object)
-	 * @return the manager object
-	 */
-	setDefaults: function(settings) {
-		datepicker_extendRemove(this._defaults, settings || {});
-		return this;
-	},
-
-	/* Attach the date picker to a jQuery selection.
-	 * @param  target	element - the target input field or division or span
-	 * @param  settings  object - the new settings to use for this date picker instance (anonymous)
-	 */
-	_attachDatepicker: function(target, settings) {
-		var nodeName, inline, inst;
-		nodeName = target.nodeName.toLowerCase();
-		inline = (nodeName === "div" || nodeName === "span");
-		if (!target.id) {
-			this.uuid += 1;
-			target.id = "dp" + this.uuid;
-		}
-		inst = this._newInst($(target), inline);
-		inst.settings = $.extend({}, settings || {});
-		if (nodeName === "input") {
-			this._connectDatepicker(target, inst);
-		} else if (inline) {
-			this._inlineDatepicker(target, inst);
-		}
-	},
-
-	/* Create a new instance object. */
-	_newInst: function(target, inline) {
-		var id = target[0].id.replace(/([^A-Za-z0-9_\-])/g, "\\\\$1"); // escape jQuery meta chars
-		return {id: id, input: target, // associated target
-			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
-			drawMonth: 0, drawYear: 0, // month being drawn
-			inline: inline, // is datepicker inline or not
-			dpDiv: (!inline ? this.dpDiv : // presentation div
-			datepicker_bindHover($("<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")))};
-	},
-
-	/* Attach the date picker to an input field. */
-	_connectDatepicker: function(target, inst) {
-		var input = $(target);
-		inst.append = $([]);
-		inst.trigger = $([]);
-		if (input.hasClass(this.markerClassName)) {
-			return;
-		}
-		this._attachments(input, inst);
-		input.addClass(this.markerClassName).keydown(this._doKeyDown).
-			keypress(this._doKeyPress).keyup(this._doKeyUp);
-		this._autoSize(inst);
-		$.data(target, "datepicker", inst);
-		//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
-		if( inst.settings.disabled ) {
-			this._disableDatepicker( target );
-		}
-	},
-
-	/* Make attachments based on settings. */
-	_attachments: function(input, inst) {
-		var showOn, buttonText, buttonImage,
-			appendText = this._get(inst, "appendText"),
-			isRTL = this._get(inst, "isRTL");
-
-		if (inst.append) {
-			inst.append.remove();
-		}
-		if (appendText) {
-			inst.append = $("<span class='" + this._appendClass + "'>" + appendText + "</span>");
-			input[isRTL ? "before" : "after"](inst.append);
-		}
-
-		input.unbind("focus", this._showDatepicker);
-
-		if (inst.trigger) {
-			inst.trigger.remove();
-		}
-
-		showOn = this._get(inst, "showOn");
-		if (showOn === "focus" || showOn === "both") { // pop-up date picker when in the marked field
-			input.focus(this._showDatepicker);
-		}
-		if (showOn === "button" || showOn === "both") { // pop-up date picker when button clicked
-			buttonText = this._get(inst, "buttonText");
-			buttonImage = this._get(inst, "buttonImage");
-			inst.trigger = $(this._get(inst, "buttonImageOnly") ?
-				$("<img/>").addClass(this._triggerClass).
-					attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
-				$("<button type='button'></button>").addClass(this._triggerClass).
-					html(!buttonImage ? buttonText : $("<img/>").attr(
-					{ src:buttonImage, alt:buttonText, title:buttonText })));
-			input[isRTL ? "before" : "after"](inst.trigger);
-			inst.trigger.click(function() {
-				if ($.datepicker._datepickerShowing && $.datepicker._lastInput === input[0]) {
-					$.datepicker._hideDatepicker();
-				} else if ($.datepicker._datepickerShowing && $.datepicker._lastInput !== input[0]) {
-					$.datepicker._hideDatepicker();
-					$.datepicker._showDatepicker(input[0]);
-				} else {
-					$.datepicker._showDatepicker(input[0]);
-				}
-				return false;
-			});
-		}
-	},
-
-	/* Apply the maximum length for the date format. */
-	_autoSize: function(inst) {
-		if (this._get(inst, "autoSize") && !inst.inline) {
-			var findMax, max, maxI, i,
-				date = new Date(2009, 12 - 1, 20), // Ensure double digits
-				dateFormat = this._get(inst, "dateFormat");
-
-			if (dateFormat.match(/[DM]/)) {
-				findMax = function(names) {
-					max = 0;
-					maxI = 0;
-					for (i = 0; i < names.length; i++) {
-						if (names[i].length > max) {
-							max = names[i].length;
-							maxI = i;
-						}
-					}
-					return maxI;
-				};
-				date.setMonth(findMax(this._get(inst, (dateFormat.match(/MM/) ?
-					"monthNames" : "monthNamesShort"))));
-				date.setDate(findMax(this._get(inst, (dateFormat.match(/DD/) ?
-					"dayNames" : "dayNamesShort"))) + 20 - date.getDay());
-			}
-			inst.input.attr("size", this._formatDate(inst, date).length);
-		}
-	},
-
-	/* Attach an inline date picker to a div. */
-	_inlineDatepicker: function(target, inst) {
-		var divSpan = $(target);
-		if (divSpan.hasClass(this.markerClassName)) {
-			return;
-		}
-		divSpan.addClass(this.markerClassName).append(inst.dpDiv);
-		$.data(target, "datepicker", inst);
-		this._setDate(inst, this._getDefaultDate(inst), true);
-		this._updateDatepicker(inst);
-		this._updateAlternate(inst);
-		//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
-		if( inst.settings.disabled ) {
-			this._disableDatepicker( target );
-		}
-		// Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
-		// http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
-		inst.dpDiv.css( "display", "block" );
-	},
-
-	/* Pop-up the date picker in a "dialog" box.
-	 * @param  input element - ignored
-	 * @param  date	string or Date - the initial date to display
-	 * @param  onSelect  function - the function to call when a date is selected
-	 * @param  settings  object - update the dialog date picker instance's settings (anonymous object)
-	 * @param  pos int[2] - coordinates for the dialog's position within the screen or
-	 *					event - with x/y coordinates or
-	 *					leave empty for default (screen centre)
-	 * @return the manager object
-	 */
-	_dialogDatepicker: function(input, date, onSelect, settings, pos) {
-		var id, browserWidth, browserHeight, scrollX, scrollY,
-			inst = this._dialogInst; // internal instance
-
-		if (!inst) {
-			this.uuid += 1;
-			id = "dp" + this.uuid;
-			this._dialogInput = $("<input type='text' id='" + id +
-				"' style='position: absolute; top: -100px; width: 0px;'/>");
-			this._dialogInput.keydown(this._doKeyDown);
-			$("body").append(this._dialogInput);
-			inst = this._dialogInst = this._newInst(this._dialogInput, false);
-			inst.settings = {};
-			$.data(this._dialogInput[0], "datepicker", inst);
-		}
-		datepicker_extendRemove(inst.settings, settings || {});
-		date = (date && date.constructor === Date ? this._formatDate(inst, date) : date);
-		this._dialogInput.val(date);
-
-		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
-		if (!this._pos) {
-			browserWidth = document.documentElement.clientWidth;
-			browserHeight = document.documentElement.clientHeight;
-			scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
-			scrollY = document.documentElement.scrollTop || document.body.scrollTop;
-			this._pos = // should use actual width/height below
-				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
-		}
-
-		// move input on screen for focus, but hidden behind dialog
-		this._dialogInput.css("left", (this._pos[0] + 20) + "px").css("top", this._pos[1] + "px");
-		inst.settings.onSelect = onSelect;
-		this._inDialog = true;
-		this.dpDiv.addClass(this._dialogClass);
-		this._showDatepicker(this._dialogInput[0]);
-		if ($.blockUI) {
-			$.blockUI(this.dpDiv);
-		}
-		$.data(this._dialogInput[0], "datepicker", inst);
-		return this;
-	},
-
-	/* Detach a datepicker from its control.
-	 * @param  target	element - the target input field or division or span
-	 */
-	_destroyDatepicker: function(target) {
-		var nodeName,
-			$target = $(target),
-			inst = $.data(target, "datepicker");
-
-		if (!$target.hasClass(this.markerClassName)) {
-			return;
-		}
-
-		nodeName = target.nodeName.toLowerCase();
-		$.removeData(target, "datepicker");
-		if (nodeName === "input") {
-			inst.append.remove();
-			inst.trigger.remove();
-			$target.removeClass(this.markerClassName).
-				unbind("focus", this._showDatepicker).
-				unbind("keydown", this._doKeyDown).
-				unbind("keypress", this._doKeyPress).
-				unbind("keyup", this._doKeyUp);
-		} else if (nodeName === "div" || nodeName === "span") {
-			$target.removeClass(this.markerClassName).empty();
-		}
-
-		if ( datepicker_instActive === inst ) {
-			datepicker_instActive = null;
-		}
-	},
-
-	/* Enable the date picker to a jQuery selection.
-	 * @param  target	element - the target input field or division or span
-	 */
-	_enableDatepicker: function(target) {
-		var nodeName, inline,
-			$target = $(target),
-			inst = $.data(target, "datepicker");
-
-		if (!$target.hasClass(this.markerClassName)) {
-			return;
-		}
-
-		nodeName = target.nodeName.toLowerCase();
-		if (nodeName === "input") {
-			target.disabled = false;
-			inst.trigger.filter("button").
-				each(function() { this.disabled = false; }).end().
-				filter("img").css({opacity: "1.0", cursor: ""});
-		} else if (nodeName === "div" || nodeName === "span") {
-			inline = $target.children("." + this._inlineClass);
-			inline.children().removeClass("ui-state-disabled");
-			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
-				prop("disabled", false);
-		}
-		this._disabledInputs = $.map(this._disabledInputs,
-			function(value) { return (value === target ? null : value); }); // delete entry
-	},
-
-	/* Disable the date picker to a jQuery selection.
-	 * @param  target	element - the target input field or division or span
-	 */
-	_disableDatepicker: function(target) {
-		var nodeName, inline,
-			$target = $(target),
-			inst = $.data(target, "datepicker");
-
-		if (!$target.hasClass(this.markerClassName)) {
-			return;
-		}
-
-		nodeName = target.nodeName.toLowerCase();
-		if (nodeName === "input") {
-			target.disabled = true;
-			inst.trigger.filter("button").
-				each(function() { this.disabled = true; }).end().
-				filter("img").css({opacity: "0.5", cursor: "default"});
-		} else if (nodeName === "div" || nodeName === "span") {
-			inline = $target.children("." + this._inlineClass);
-			inline.children().addClass("ui-state-disabled");
-			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
-				prop("disabled", true);
-		}
-		this._disabledInputs = $.map(this._disabledInputs,
-			function(value) { return (value === target ? null : value); }); // delete entry
-		this._disabledInputs[this._disabledInputs.length] = target;
-	},
-
-	/* Is the first field in a jQuery collection disabled as a datepicker?
-	 * @param  target	element - the target input field or division or span
-	 * @return boolean - true if disabled, false if enabled
-	 */
-	_isDisabledDatepicker: function(target) {
-		if (!target) {
+	if ( "area" === nodeName ) {
+		map = element.parentNode;
+		mapName = map.name;
+		if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
 			return false;
 		}
-		for (var i = 0; i < this._disabledInputs.length; i++) {
-			if (this._disabledInputs[i] === target) {
+		img = $( "img[usemap='#" + mapName + "']" );
+		return img.length > 0 && img.is( ":visible" );
+	}
+
+	if ( /^(input|select|textarea|button|object)$/.test( nodeName ) ) {
+		focusableIfVisible = !element.disabled;
+
+		if ( focusableIfVisible ) {
+
+			// Form controls within a disabled fieldset are disabled.
+			// However, controls within the fieldset's legend do not get disabled.
+			// Since controls generally aren't placed inside legends, we skip
+			// this portion of the check.
+			fieldset = $( element ).closest( "fieldset" )[ 0 ];
+			if ( fieldset ) {
+				focusableIfVisible = !fieldset.disabled;
+			}
+		}
+	} else if ( "a" === nodeName ) {
+		focusableIfVisible = element.href || hasTabindex;
+	} else {
+		focusableIfVisible = hasTabindex;
+	}
+
+	return focusableIfVisible && $( element ).is( ":visible" ) && visible( $( element ) );
+};
+
+// Support: IE 8 only
+// IE 8 doesn't resolve inherit to visible/hidden for computed values
+function visible( element ) {
+	var visibility = element.css( "visibility" );
+	while ( visibility === "inherit" ) {
+		element = element.parent();
+		visibility = element.css( "visibility" );
+	}
+	return visibility !== "hidden";
+}
+
+$.extend( $.expr[ ":" ], {
+	focusable: function( element ) {
+		return $.ui.focusable( element, $.attr( element, "tabindex" ) != null );
+	}
+} );
+
+var focusable = $.ui.focusable;
+
+
+
+
+// Support: IE8 Only
+// IE8 does not support the form attribute and when it is supplied. It overwrites the form prop
+// with a string, so we need to find the proper form.
+var form = $.fn.form = function() {
+	return typeof this[ 0 ].form === "string" ? this.closest( "form" ) : $( this[ 0 ].form );
+};
+
+
+/*!
+ * jQuery UI Form Reset Mixin 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Form Reset Mixin
+//>>group: Core
+//>>description: Refresh input widgets when their form is reset
+//>>docs: http://api.jqueryui.com/form-reset-mixin/
+
+
+
+var formResetMixin = $.ui.formResetMixin = {
+	_formResetHandler: function() {
+		var form = $( this );
+
+		// Wait for the form reset to actually happen before refreshing
+		setTimeout( function() {
+			var instances = form.data( "ui-form-reset-instances" );
+			$.each( instances, function() {
+				this.refresh();
+			} );
+		} );
+	},
+
+	_bindFormResetHandler: function() {
+		this.form = this.element.form();
+		if ( !this.form.length ) {
+			return;
+		}
+
+		var instances = this.form.data( "ui-form-reset-instances" ) || [];
+		if ( !instances.length ) {
+
+			// We don't use _on() here because we use a single event handler per form
+			this.form.on( "reset.ui-form-reset", this._formResetHandler );
+		}
+		instances.push( this );
+		this.form.data( "ui-form-reset-instances", instances );
+	},
+
+	_unbindFormResetHandler: function() {
+		if ( !this.form.length ) {
+			return;
+		}
+
+		var instances = this.form.data( "ui-form-reset-instances" );
+		instances.splice( $.inArray( this, instances ), 1 );
+		if ( instances.length ) {
+			this.form.data( "ui-form-reset-instances", instances );
+		} else {
+			this.form
+				.removeData( "ui-form-reset-instances" )
+				.off( "reset.ui-form-reset" );
+		}
+	}
+};
+
+
+/*!
+ * jQuery UI Support for jQuery core 1.7.x 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ */
+
+//>>label: jQuery 1.7 Support
+//>>group: Core
+//>>description: Support version 1.7.x of jQuery core
+
+
+
+// Support: jQuery 1.7 only
+// Not a great way to check versions, but since we only support 1.7+ and only
+// need to detect <1.8, this is a simple check that should suffice. Checking
+// for "1.7." would be a bit safer, but the version string is 1.7, not 1.7.0
+// and we'll never reach 1.70.0 (if we do, we certainly won't be supporting
+// 1.7 anymore). See #11197 for why we're not using feature detection.
+if ( $.fn.jquery.substring( 0, 3 ) === "1.7" ) {
+
+	// Setters for .innerWidth(), .innerHeight(), .outerWidth(), .outerHeight()
+	// Unlike jQuery Core 1.8+, these only support numeric values to set the
+	// dimensions in pixels
+	$.each( [ "Width", "Height" ], function( i, name ) {
+		var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
+			type = name.toLowerCase(),
+			orig = {
+				innerWidth: $.fn.innerWidth,
+				innerHeight: $.fn.innerHeight,
+				outerWidth: $.fn.outerWidth,
+				outerHeight: $.fn.outerHeight
+			};
+
+		function reduce( elem, size, border, margin ) {
+			$.each( side, function() {
+				size -= parseFloat( $.css( elem, "padding" + this ) ) || 0;
+				if ( border ) {
+					size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0;
+				}
+				if ( margin ) {
+					size -= parseFloat( $.css( elem, "margin" + this ) ) || 0;
+				}
+			} );
+			return size;
+		}
+
+		$.fn[ "inner" + name ] = function( size ) {
+			if ( size === undefined ) {
+				return orig[ "inner" + name ].call( this );
+			}
+
+			return this.each( function() {
+				$( this ).css( type, reduce( this, size ) + "px" );
+			} );
+		};
+
+		$.fn[ "outer" + name ] = function( size, margin ) {
+			if ( typeof size !== "number" ) {
+				return orig[ "outer" + name ].call( this, size );
+			}
+
+			return this.each( function() {
+				$( this ).css( type, reduce( this, size, true, margin ) + "px" );
+			} );
+		};
+	} );
+
+	$.fn.addBack = function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter( selector )
+		);
+	};
+}
+
+;
+/*!
+ * jQuery UI Keycode 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Keycode
+//>>group: Core
+//>>description: Provide keycodes as keynames
+//>>docs: http://api.jqueryui.com/jQuery.ui.keyCode/
+
+
+var keycode = $.ui.keyCode = {
+	BACKSPACE: 8,
+	COMMA: 188,
+	DELETE: 46,
+	DOWN: 40,
+	END: 35,
+	ENTER: 13,
+	ESCAPE: 27,
+	HOME: 36,
+	LEFT: 37,
+	PAGE_DOWN: 34,
+	PAGE_UP: 33,
+	PERIOD: 190,
+	RIGHT: 39,
+	SPACE: 32,
+	TAB: 9,
+	UP: 38
+};
+
+
+
+
+// Internal use only
+var escapeSelector = $.ui.escapeSelector = ( function() {
+	var selectorEscape = /([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g;
+	return function( selector ) {
+		return selector.replace( selectorEscape, "\\$1" );
+	};
+} )();
+
+
+/*!
+ * jQuery UI Labels 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: labels
+//>>group: Core
+//>>description: Find all the labels associated with a given input
+//>>docs: http://api.jqueryui.com/labels/
+
+
+
+var labels = $.fn.labels = function() {
+	var ancestor, selector, id, labels, ancestors;
+
+	// Check control.labels first
+	if ( this[ 0 ].labels && this[ 0 ].labels.length ) {
+		return this.pushStack( this[ 0 ].labels );
+	}
+
+	// Support: IE <= 11, FF <= 37, Android <= 2.3 only
+	// Above browsers do not support control.labels. Everything below is to support them
+	// as well as document fragments. control.labels does not work on document fragments
+	labels = this.eq( 0 ).parents( "label" );
+
+	// Look for the label based on the id
+	id = this.attr( "id" );
+	if ( id ) {
+
+		// We don't search against the document in case the element
+		// is disconnected from the DOM
+		ancestor = this.eq( 0 ).parents().last();
+
+		// Get a full set of top level ancestors
+		ancestors = ancestor.add( ancestor.length ? ancestor.siblings() : this.siblings() );
+
+		// Create a selector for the label based on the id
+		selector = "label[for='" + $.ui.escapeSelector( id ) + "']";
+
+		labels = labels.add( ancestors.find( selector ).addBack( selector ) );
+
+	}
+
+	// Return whatever we have found for labels
+	return this.pushStack( labels );
+};
+
+
+/*!
+ * jQuery UI Scroll Parent 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: scrollParent
+//>>group: Core
+//>>description: Get the closest ancestor element that is scrollable.
+//>>docs: http://api.jqueryui.com/scrollParent/
+
+
+
+var scrollParent = $.fn.scrollParent = function( includeHidden ) {
+	var position = this.css( "position" ),
+		excludeStaticParent = position === "absolute",
+		overflowRegex = includeHidden ? /(auto|scroll|hidden)/ : /(auto|scroll)/,
+		scrollParent = this.parents().filter( function() {
+			var parent = $( this );
+			if ( excludeStaticParent && parent.css( "position" ) === "static" ) {
+				return false;
+			}
+			return overflowRegex.test( parent.css( "overflow" ) + parent.css( "overflow-y" ) +
+				parent.css( "overflow-x" ) );
+		} ).eq( 0 );
+
+	return position === "fixed" || !scrollParent.length ?
+		$( this[ 0 ].ownerDocument || document ) :
+		scrollParent;
+};
+
+
+/*!
+ * jQuery UI Tabbable 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: :tabbable Selector
+//>>group: Core
+//>>description: Selects elements which can be tabbed to.
+//>>docs: http://api.jqueryui.com/tabbable-selector/
+
+
+
+var tabbable = $.extend( $.expr[ ":" ], {
+	tabbable: function( element ) {
+		var tabIndex = $.attr( element, "tabindex" ),
+			hasTabindex = tabIndex != null;
+		return ( !hasTabindex || tabIndex >= 0 ) && $.ui.focusable( element, hasTabindex );
+	}
+} );
+
+
+/*!
+ * jQuery UI Unique ID 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: uniqueId
+//>>group: Core
+//>>description: Functions to generate and remove uniqueId's
+//>>docs: http://api.jqueryui.com/uniqueId/
+
+
+
+var uniqueId = $.fn.extend( {
+	uniqueId: ( function() {
+		var uuid = 0;
+
+		return function() {
+			return this.each( function() {
+				if ( !this.id ) {
+					this.id = "ui-id-" + ( ++uuid );
+				}
+			} );
+		};
+	} )(),
+
+	removeUniqueId: function() {
+		return this.each( function() {
+			if ( /^ui-id-\d+$/.test( this.id ) ) {
+				$( this ).removeAttr( "id" );
+			}
+		} );
+	}
+} );
+
+
+
+
+// This file is deprecated
+var ie = $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
+
+/*!
+ * jQuery UI Mouse 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Mouse
+//>>group: Widgets
+//>>description: Abstracts mouse-based interactions to assist in creating certain widgets.
+//>>docs: http://api.jqueryui.com/mouse/
+
+
+
+var mouseHandled = false;
+$( document ).on( "mouseup", function() {
+	mouseHandled = false;
+} );
+
+var widgetsMouse = $.widget( "ui.mouse", {
+	version: "1.12.1",
+	options: {
+		cancel: "input, textarea, button, select, option",
+		distance: 1,
+		delay: 0
+	},
+	_mouseInit: function() {
+		var that = this;
+
+		this.element
+			.on( "mousedown." + this.widgetName, function( event ) {
+				return that._mouseDown( event );
+			} )
+			.on( "click." + this.widgetName, function( event ) {
+				if ( true === $.data( event.target, that.widgetName + ".preventClickEvent" ) ) {
+					$.removeData( event.target, that.widgetName + ".preventClickEvent" );
+					event.stopImmediatePropagation();
+					return false;
+				}
+			} );
+
+		this.started = false;
+	},
+
+	// TODO: make sure destroying one instance of mouse doesn't mess with
+	// other instances of mouse
+	_mouseDestroy: function() {
+		this.element.off( "." + this.widgetName );
+		if ( this._mouseMoveDelegate ) {
+			this.document
+				.off( "mousemove." + this.widgetName, this._mouseMoveDelegate )
+				.off( "mouseup." + this.widgetName, this._mouseUpDelegate );
+		}
+	},
+
+	_mouseDown: function( event ) {
+
+		// don't let more than one widget handle mouseStart
+		if ( mouseHandled ) {
+			return;
+		}
+
+		this._mouseMoved = false;
+
+		// We may have missed mouseup (out of window)
+		( this._mouseStarted && this._mouseUp( event ) );
+
+		this._mouseDownEvent = event;
+
+		var that = this,
+			btnIsLeft = ( event.which === 1 ),
+
+			// event.target.nodeName works around a bug in IE 8 with
+			// disabled inputs (#7620)
+			elIsCancel = ( typeof this.options.cancel === "string" && event.target.nodeName ?
+				$( event.target ).closest( this.options.cancel ).length : false );
+		if ( !btnIsLeft || elIsCancel || !this._mouseCapture( event ) ) {
+			return true;
+		}
+
+		this.mouseDelayMet = !this.options.delay;
+		if ( !this.mouseDelayMet ) {
+			this._mouseDelayTimer = setTimeout( function() {
+				that.mouseDelayMet = true;
+			}, this.options.delay );
+		}
+
+		if ( this._mouseDistanceMet( event ) && this._mouseDelayMet( event ) ) {
+			this._mouseStarted = ( this._mouseStart( event ) !== false );
+			if ( !this._mouseStarted ) {
+				event.preventDefault();
 				return true;
 			}
 		}
-		return false;
-	},
 
-	/* Retrieve the instance data for the target control.
-	 * @param  target  element - the target input field or division or span
-	 * @return  object - the associated instance data
-	 * @throws  error if a jQuery problem getting data
-	 */
-	_getInst: function(target) {
-		try {
-			return $.data(target, "datepicker");
-		}
-		catch (err) {
-			throw "Missing instance data for this datepicker";
-		}
-	},
-
-	/* Update or retrieve the settings for a date picker attached to an input field or division.
-	 * @param  target  element - the target input field or division or span
-	 * @param  name	object - the new settings to update or
-	 *				string - the name of the setting to change or retrieve,
-	 *				when retrieving also "all" for all instance settings or
-	 *				"defaults" for all global defaults
-	 * @param  value   any - the new value for the setting
-	 *				(omit if above is an object or to retrieve a value)
-	 */
-	_optionDatepicker: function(target, name, value) {
-		var settings, date, minDate, maxDate,
-			inst = this._getInst(target);
-
-		if (arguments.length === 2 && typeof name === "string") {
-			return (name === "defaults" ? $.extend({}, $.datepicker._defaults) :
-				(inst ? (name === "all" ? $.extend({}, inst.settings) :
-				this._get(inst, name)) : null));
+		// Click event may never have fired (Gecko & Opera)
+		if ( true === $.data( event.target, this.widgetName + ".preventClickEvent" ) ) {
+			$.removeData( event.target, this.widgetName + ".preventClickEvent" );
 		}
 
-		settings = name || {};
-		if (typeof name === "string") {
-			settings = {};
-			settings[name] = value;
-		}
+		// These delegates are required to keep context
+		this._mouseMoveDelegate = function( event ) {
+			return that._mouseMove( event );
+		};
+		this._mouseUpDelegate = function( event ) {
+			return that._mouseUp( event );
+		};
 
-		if (inst) {
-			if (this._curInst === inst) {
-				this._hideDatepicker();
-			}
+		this.document
+			.on( "mousemove." + this.widgetName, this._mouseMoveDelegate )
+			.on( "mouseup." + this.widgetName, this._mouseUpDelegate );
 
-			date = this._getDateDatepicker(target, true);
-			minDate = this._getMinMaxDate(inst, "min");
-			maxDate = this._getMinMaxDate(inst, "max");
-			datepicker_extendRemove(inst.settings, settings);
-			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
-			if (minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined) {
-				inst.settings.minDate = this._formatDate(inst, minDate);
-			}
-			if (maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined) {
-				inst.settings.maxDate = this._formatDate(inst, maxDate);
-			}
-			if ( "disabled" in settings ) {
-				if ( settings.disabled ) {
-					this._disableDatepicker(target);
-				} else {
-					this._enableDatepicker(target);
-				}
-			}
-			this._attachments($(target), inst);
-			this._autoSize(inst);
-			this._setDate(inst, date);
-			this._updateAlternate(inst);
-			this._updateDatepicker(inst);
-		}
-	},
+		event.preventDefault();
 
-	// change method deprecated
-	_changeDatepicker: function(target, name, value) {
-		this._optionDatepicker(target, name, value);
-	},
-
-	/* Redraw the date picker attached to an input field or division.
-	 * @param  target  element - the target input field or division or span
-	 */
-	_refreshDatepicker: function(target) {
-		var inst = this._getInst(target);
-		if (inst) {
-			this._updateDatepicker(inst);
-		}
-	},
-
-	/* Set the dates for a jQuery selection.
-	 * @param  target element - the target input field or division or span
-	 * @param  date	Date - the new date
-	 */
-	_setDateDatepicker: function(target, date) {
-		var inst = this._getInst(target);
-		if (inst) {
-			this._setDate(inst, date);
-			this._updateDatepicker(inst);
-			this._updateAlternate(inst);
-		}
-	},
-
-	/* Get the date(s) for the first entry in a jQuery selection.
-	 * @param  target element - the target input field or division or span
-	 * @param  noDefault boolean - true if no default date is to be used
-	 * @return Date - the current date
-	 */
-	_getDateDatepicker: function(target, noDefault) {
-		var inst = this._getInst(target);
-		if (inst && !inst.inline) {
-			this._setDateFromField(inst, noDefault);
-		}
-		return (inst ? this._getDate(inst) : null);
-	},
-
-	/* Handle keystrokes. */
-	_doKeyDown: function(event) {
-		var onSelect, dateStr, sel,
-			inst = $.datepicker._getInst(event.target),
-			handled = true,
-			isRTL = inst.dpDiv.is(".ui-datepicker-rtl");
-
-		inst._keyEvent = true;
-		if ($.datepicker._datepickerShowing) {
-			switch (event.keyCode) {
-				case 9: $.datepicker._hideDatepicker();
-						handled = false;
-						break; // hide on tab out
-				case 13: sel = $("td." + $.datepicker._dayOverClass + ":not(." +
-									$.datepicker._currentClass + ")", inst.dpDiv);
-						if (sel[0]) {
-							$.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
-						}
-
-						onSelect = $.datepicker._get(inst, "onSelect");
-						if (onSelect) {
-							dateStr = $.datepicker._formatDate(inst);
-
-							// trigger custom callback
-							onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);
-						} else {
-							$.datepicker._hideDatepicker();
-						}
-
-						return false; // don't submit the form
-				case 27: $.datepicker._hideDatepicker();
-						break; // hide on escape
-				case 33: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
-							-$.datepicker._get(inst, "stepBigMonths") :
-							-$.datepicker._get(inst, "stepMonths")), "M");
-						break; // previous month/year on page up/+ ctrl
-				case 34: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
-							+$.datepicker._get(inst, "stepBigMonths") :
-							+$.datepicker._get(inst, "stepMonths")), "M");
-						break; // next month/year on page down/+ ctrl
-				case 35: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._clearDate(event.target);
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // clear on ctrl or command +end
-				case 36: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._gotoToday(event.target);
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // current on ctrl or command +home
-				case 37: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._adjustDate(event.target, (isRTL ? +1 : -1), "D");
-						}
-						handled = event.ctrlKey || event.metaKey;
-						// -1 day on ctrl or command +left
-						if (event.originalEvent.altKey) {
-							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
-								-$.datepicker._get(inst, "stepBigMonths") :
-								-$.datepicker._get(inst, "stepMonths")), "M");
-						}
-						// next month/year on alt +left on Mac
-						break;
-				case 38: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._adjustDate(event.target, -7, "D");
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // -1 week on ctrl or command +up
-				case 39: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._adjustDate(event.target, (isRTL ? -1 : +1), "D");
-						}
-						handled = event.ctrlKey || event.metaKey;
-						// +1 day on ctrl or command +right
-						if (event.originalEvent.altKey) {
-							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
-								+$.datepicker._get(inst, "stepBigMonths") :
-								+$.datepicker._get(inst, "stepMonths")), "M");
-						}
-						// next month/year on alt +right
-						break;
-				case 40: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._adjustDate(event.target, +7, "D");
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // +1 week on ctrl or command +down
-				default: handled = false;
-			}
-		} else if (event.keyCode === 36 && event.ctrlKey) { // display the date picker on ctrl+home
-			$.datepicker._showDatepicker(this);
-		} else {
-			handled = false;
-		}
-
-		if (handled) {
-			event.preventDefault();
-			event.stopPropagation();
-		}
-	},
-
-	/* Filter entered characters - based on date format. */
-	_doKeyPress: function(event) {
-		var chars, chr,
-			inst = $.datepicker._getInst(event.target);
-
-		if ($.datepicker._get(inst, "constrainInput")) {
-			chars = $.datepicker._possibleChars($.datepicker._get(inst, "dateFormat"));
-			chr = String.fromCharCode(event.charCode == null ? event.keyCode : event.charCode);
-			return event.ctrlKey || event.metaKey || (chr < " " || !chars || chars.indexOf(chr) > -1);
-		}
-	},
-
-	/* Synchronise manual entry and field/alternate field. */
-	_doKeyUp: function(event) {
-		var date,
-			inst = $.datepicker._getInst(event.target);
-
-		if (inst.input.val() !== inst.lastVal) {
-			try {
-				date = $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
-					(inst.input ? inst.input.val() : null),
-					$.datepicker._getFormatConfig(inst));
-
-				if (date) { // only if valid
-					$.datepicker._setDateFromField(inst);
-					$.datepicker._updateAlternate(inst);
-					$.datepicker._updateDatepicker(inst);
-				}
-			}
-			catch (err) {
-			}
-		}
+		mouseHandled = true;
 		return true;
 	},
 
-	/* Pop-up the date picker for a given input field.
-	 * If false returned from beforeShow event handler do not show.
-	 * @param  input  element - the input field attached to the date picker or
-	 *					event - if triggered by focus
-	 */
-	_showDatepicker: function(input) {
-		input = input.target || input;
-		if (input.nodeName.toLowerCase() !== "input") { // find from button/image trigger
-			input = $("input", input.parentNode)[0];
+	_mouseMove: function( event ) {
+
+		// Only check for mouseups outside the document if you've moved inside the document
+		// at least once. This prevents the firing of mouseup in the case of IE<9, which will
+		// fire a mousemove event if content is placed under the cursor. See #7778
+		// Support: IE <9
+		if ( this._mouseMoved ) {
+
+			// IE mouseup check - mouseup happened when mouse was out of window
+			if ( $.ui.ie && ( !document.documentMode || document.documentMode < 9 ) &&
+					!event.button ) {
+				return this._mouseUp( event );
+
+			// Iframe mouseup check - mouseup occurred in another document
+			} else if ( !event.which ) {
+
+				// Support: Safari <=8 - 9
+				// Safari sets which to 0 if you press any of the following keys
+				// during a drag (#14461)
+				if ( event.originalEvent.altKey || event.originalEvent.ctrlKey ||
+						event.originalEvent.metaKey || event.originalEvent.shiftKey ) {
+					this.ignoreMissingWhich = true;
+				} else if ( !this.ignoreMissingWhich ) {
+					return this._mouseUp( event );
+				}
+			}
 		}
 
-		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput === input) { // already here
+		if ( event.which || event.button ) {
+			this._mouseMoved = true;
+		}
+
+		if ( this._mouseStarted ) {
+			this._mouseDrag( event );
+			return event.preventDefault();
+		}
+
+		if ( this._mouseDistanceMet( event ) && this._mouseDelayMet( event ) ) {
+			this._mouseStarted =
+				( this._mouseStart( this._mouseDownEvent, event ) !== false );
+			( this._mouseStarted ? this._mouseDrag( event ) : this._mouseUp( event ) );
+		}
+
+		return !this._mouseStarted;
+	},
+
+	_mouseUp: function( event ) {
+		this.document
+			.off( "mousemove." + this.widgetName, this._mouseMoveDelegate )
+			.off( "mouseup." + this.widgetName, this._mouseUpDelegate );
+
+		if ( this._mouseStarted ) {
+			this._mouseStarted = false;
+
+			if ( event.target === this._mouseDownEvent.target ) {
+				$.data( event.target, this.widgetName + ".preventClickEvent", true );
+			}
+
+			this._mouseStop( event );
+		}
+
+		if ( this._mouseDelayTimer ) {
+			clearTimeout( this._mouseDelayTimer );
+			delete this._mouseDelayTimer;
+		}
+
+		this.ignoreMissingWhich = false;
+		mouseHandled = false;
+		event.preventDefault();
+	},
+
+	_mouseDistanceMet: function( event ) {
+		return ( Math.max(
+				Math.abs( this._mouseDownEvent.pageX - event.pageX ),
+				Math.abs( this._mouseDownEvent.pageY - event.pageY )
+			) >= this.options.distance
+		);
+	},
+
+	_mouseDelayMet: function( /* event */ ) {
+		return this.mouseDelayMet;
+	},
+
+	// These are placeholder methods, to be overriden by extending plugin
+	_mouseStart: function( /* event */ ) {},
+	_mouseDrag: function( /* event */ ) {},
+	_mouseStop: function( /* event */ ) {},
+	_mouseCapture: function( /* event */ ) { return true; }
+} );
+
+
+
+
+// $.ui.plugin is deprecated. Use $.widget() extensions instead.
+var plugin = $.ui.plugin = {
+	add: function( module, option, set ) {
+		var i,
+			proto = $.ui[ module ].prototype;
+		for ( i in set ) {
+			proto.plugins[ i ] = proto.plugins[ i ] || [];
+			proto.plugins[ i ].push( [ option, set[ i ] ] );
+		}
+	},
+	call: function( instance, name, args, allowDisconnected ) {
+		var i,
+			set = instance.plugins[ name ];
+
+		if ( !set ) {
 			return;
 		}
 
-		var inst, beforeShow, beforeShowSettings, isFixed,
-			offset, showAnim, duration;
-
-		inst = $.datepicker._getInst(input);
-		if ($.datepicker._curInst && $.datepicker._curInst !== inst) {
-			$.datepicker._curInst.dpDiv.stop(true, true);
-			if ( inst && $.datepicker._datepickerShowing ) {
-				$.datepicker._hideDatepicker( $.datepicker._curInst.input[0] );
-			}
-		}
-
-		beforeShow = $.datepicker._get(inst, "beforeShow");
-		beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {};
-		if(beforeShowSettings === false){
-			return;
-		}
-		datepicker_extendRemove(inst.settings, beforeShowSettings);
-
-		inst.lastVal = null;
-		$.datepicker._lastInput = input;
-		$.datepicker._setDateFromField(inst);
-
-		if ($.datepicker._inDialog) { // hide cursor
-			input.value = "";
-		}
-		if (!$.datepicker._pos) { // position below input
-			$.datepicker._pos = $.datepicker._findPos(input);
-			$.datepicker._pos[1] += input.offsetHeight; // add the height
-		}
-
-		isFixed = false;
-		$(input).parents().each(function() {
-			isFixed |= $(this).css("position") === "fixed";
-			return !isFixed;
-		});
-
-		offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
-		$.datepicker._pos = null;
-		//to avoid flashes on Firefox
-		inst.dpDiv.empty();
-		// determine sizing offscreen
-		inst.dpDiv.css({position: "absolute", display: "block", top: "-1000px"});
-		$.datepicker._updateDatepicker(inst);
-		// fix width for dynamic number of date pickers
-		// and adjust position before showing
-		offset = $.datepicker._checkOffset(inst, offset, isFixed);
-		inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
-			"static" : (isFixed ? "fixed" : "absolute")), display: "none",
-			left: offset.left + "px", top: offset.top + "px"});
-
-		if (!inst.inline) {
-			showAnim = $.datepicker._get(inst, "showAnim");
-			duration = $.datepicker._get(inst, "duration");
-			inst.dpDiv.css( "z-index", datepicker_getZindex( $( input ) ) + 1 );
-			$.datepicker._datepickerShowing = true;
-
-			if ( $.effects && $.effects.effect[ showAnim ] ) {
-				inst.dpDiv.show(showAnim, $.datepicker._get(inst, "showOptions"), duration);
-			} else {
-				inst.dpDiv[showAnim || "show"](showAnim ? duration : null);
-			}
-
-			if ( $.datepicker._shouldFocusInput( inst ) ) {
-				inst.input.focus();
-			}
-
-			$.datepicker._curInst = inst;
-		}
-	},
-
-	/* Generate the date picker content. */
-	_updateDatepicker: function(inst) {
-		this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
-		datepicker_instActive = inst; // for delegate hover events
-		inst.dpDiv.empty().append(this._generateHTML(inst));
-		this._attachHandlers(inst);
-
-		var origyearshtml,
-			numMonths = this._getNumberOfMonths(inst),
-			cols = numMonths[1],
-			width = 17,
-			activeCell = inst.dpDiv.find( "." + this._dayOverClass + " a" );
-
-		if ( activeCell.length > 0 ) {
-			datepicker_handleMouseover.apply( activeCell.get( 0 ) );
-		}
-
-		inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");
-		if (cols > 1) {
-			inst.dpDiv.addClass("ui-datepicker-multi-" + cols).css("width", (width * cols) + "em");
-		}
-		inst.dpDiv[(numMonths[0] !== 1 || numMonths[1] !== 1 ? "add" : "remove") +
-			"Class"]("ui-datepicker-multi");
-		inst.dpDiv[(this._get(inst, "isRTL") ? "add" : "remove") +
-			"Class"]("ui-datepicker-rtl");
-
-		if (inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) {
-			inst.input.focus();
-		}
-
-		// deffered render of the years select (to avoid flashes on Firefox)
-		if( inst.yearshtml ){
-			origyearshtml = inst.yearshtml;
-			setTimeout(function(){
-				//assure that inst.yearshtml didn't change.
-				if( origyearshtml === inst.yearshtml && inst.yearshtml ){
-					inst.dpDiv.find("select.ui-datepicker-year:first").replaceWith(inst.yearshtml);
-				}
-				origyearshtml = inst.yearshtml = null;
-			}, 0);
-		}
-	},
-
-	// #6694 - don't focus the input if it's already focused
-	// this breaks the change event in IE
-	// Support: IE and jQuery <1.9
-	_shouldFocusInput: function( inst ) {
-		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
-	},
-
-	/* Check positioning to remain on screen. */
-	_checkOffset: function(inst, offset, isFixed) {
-		var dpWidth = inst.dpDiv.outerWidth(),
-			dpHeight = inst.dpDiv.outerHeight(),
-			inputWidth = inst.input ? inst.input.outerWidth() : 0,
-			inputHeight = inst.input ? inst.input.outerHeight() : 0,
-			viewWidth = document.documentElement.clientWidth + (isFixed ? 0 : $(document).scrollLeft()),
-			viewHeight = document.documentElement.clientHeight + (isFixed ? 0 : $(document).scrollTop());
-
-		offset.left -= (this._get(inst, "isRTL") ? (dpWidth - inputWidth) : 0);
-		offset.left -= (isFixed && offset.left === inst.input.offset().left) ? $(document).scrollLeft() : 0;
-		offset.top -= (isFixed && offset.top === (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
-
-		// now check if datepicker is showing outside window viewport - move to a better place if so.
-		offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
-			Math.abs(offset.left + dpWidth - viewWidth) : 0);
-		offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
-			Math.abs(dpHeight + inputHeight) : 0);
-
-		return offset;
-	},
-
-	/* Find an object's position on the screen. */
-	_findPos: function(obj) {
-		var position,
-			inst = this._getInst(obj),
-			isRTL = this._get(inst, "isRTL");
-
-		while (obj && (obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden(obj))) {
-			obj = obj[isRTL ? "previousSibling" : "nextSibling"];
-		}
-
-		position = $(obj).offset();
-		return [position.left, position.top];
-	},
-
-	/* Hide the date picker from view.
-	 * @param  input  element - the input field attached to the date picker
-	 */
-	_hideDatepicker: function(input) {
-		var showAnim, duration, postProcess, onClose,
-			inst = this._curInst;
-
-		if (!inst || (input && inst !== $.data(input, "datepicker"))) {
+		if ( !allowDisconnected && ( !instance.element[ 0 ].parentNode ||
+				instance.element[ 0 ].parentNode.nodeType === 11 ) ) {
 			return;
 		}
 
-		if (this._datepickerShowing) {
-			showAnim = this._get(inst, "showAnim");
-			duration = this._get(inst, "duration");
-			postProcess = function() {
-				$.datepicker._tidyDialog(inst);
-			};
-
-			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
-			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
-				inst.dpDiv.hide(showAnim, $.datepicker._get(inst, "showOptions"), duration, postProcess);
-			} else {
-				inst.dpDiv[(showAnim === "slideDown" ? "slideUp" :
-					(showAnim === "fadeIn" ? "fadeOut" : "hide"))]((showAnim ? duration : null), postProcess);
+		for ( i = 0; i < set.length; i++ ) {
+			if ( instance.options[ set[ i ][ 0 ] ] ) {
+				set[ i ][ 1 ].apply( instance.element, args );
 			}
-
-			if (!showAnim) {
-				postProcess();
-			}
-			this._datepickerShowing = false;
-
-			onClose = this._get(inst, "onClose");
-			if (onClose) {
-				onClose.apply((inst.input ? inst.input[0] : null), [(inst.input ? inst.input.val() : ""), inst]);
-			}
-
-			this._lastInput = null;
-			if (this._inDialog) {
-				this._dialogInput.css({ position: "absolute", left: "0", top: "-100px" });
-				if ($.blockUI) {
-					$.unblockUI();
-					$("body").append(this.dpDiv);
-				}
-			}
-			this._inDialog = false;
-		}
-	},
-
-	/* Tidy up after a dialog display. */
-	_tidyDialog: function(inst) {
-		inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar");
-	},
-
-	/* Close date picker if clicked elsewhere. */
-	_checkExternalClick: function(event) {
-		if (!$.datepicker._curInst) {
-			return;
-		}
-
-		var $target = $(event.target),
-			inst = $.datepicker._getInst($target[0]);
-
-		if ( ( ( $target[0].id !== $.datepicker._mainDivId &&
-				$target.parents("#" + $.datepicker._mainDivId).length === 0 &&
-				!$target.hasClass($.datepicker.markerClassName) &&
-				!$target.closest("." + $.datepicker._triggerClass).length &&
-				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI) ) ) ||
-			( $target.hasClass($.datepicker.markerClassName) && $.datepicker._curInst !== inst ) ) {
-				$.datepicker._hideDatepicker();
-		}
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustDate: function(id, offset, period) {
-		var target = $(id),
-			inst = this._getInst(target[0]);
-
-		if (this._isDisabledDatepicker(target[0])) {
-			return;
-		}
-		this._adjustInstDate(inst, offset +
-			(period === "M" ? this._get(inst, "showCurrentAtPos") : 0), // undo positioning
-			period);
-		this._updateDatepicker(inst);
-	},
-
-	/* Action for current link. */
-	_gotoToday: function(id) {
-		var date,
-			target = $(id),
-			inst = this._getInst(target[0]);
-
-		if (this._get(inst, "gotoCurrent") && inst.currentDay) {
-			inst.selectedDay = inst.currentDay;
-			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
-			inst.drawYear = inst.selectedYear = inst.currentYear;
-		} else {
-			date = new Date();
-			inst.selectedDay = date.getDate();
-			inst.drawMonth = inst.selectedMonth = date.getMonth();
-			inst.drawYear = inst.selectedYear = date.getFullYear();
-		}
-		this._notifyChange(inst);
-		this._adjustDate(target);
-	},
-
-	/* Action for selecting a new month/year. */
-	_selectMonthYear: function(id, select, period) {
-		var target = $(id),
-			inst = this._getInst(target[0]);
-
-		inst["selected" + (period === "M" ? "Month" : "Year")] =
-		inst["draw" + (period === "M" ? "Month" : "Year")] =
-			parseInt(select.options[select.selectedIndex].value,10);
-
-		this._notifyChange(inst);
-		this._adjustDate(target);
-	},
-
-	/* Action for selecting a day. */
-	_selectDay: function(id, month, year, td) {
-		var inst,
-			target = $(id);
-
-		if ($(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(target[0])) {
-			return;
-		}
-
-		inst = this._getInst(target[0]);
-		inst.selectedDay = inst.currentDay = $("a", td).html();
-		inst.selectedMonth = inst.currentMonth = month;
-		inst.selectedYear = inst.currentYear = year;
-		this._selectDate(id, this._formatDate(inst,
-			inst.currentDay, inst.currentMonth, inst.currentYear));
-	},
-
-	/* Erase the input field and hide the date picker. */
-	_clearDate: function(id) {
-		var target = $(id);
-		this._selectDate(target, "");
-	},
-
-	/* Update the input field with the selected date. */
-	_selectDate: function(id, dateStr) {
-		var onSelect,
-			target = $(id),
-			inst = this._getInst(target[0]);
-
-		dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
-		if (inst.input) {
-			inst.input.val(dateStr);
-		}
-		this._updateAlternate(inst);
-
-		onSelect = this._get(inst, "onSelect");
-		if (onSelect) {
-			onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);  // trigger custom callback
-		} else if (inst.input) {
-			inst.input.trigger("change"); // fire the change event
-		}
-
-		if (inst.inline){
-			this._updateDatepicker(inst);
-		} else {
-			this._hideDatepicker();
-			this._lastInput = inst.input[0];
-			if (typeof(inst.input[0]) !== "object") {
-				inst.input.focus(); // restore focus
-			}
-			this._lastInput = null;
-		}
-	},
-
-	/* Update any alternate field to synchronise with the main field. */
-	_updateAlternate: function(inst) {
-		var altFormat, date, dateStr,
-			altField = this._get(inst, "altField");
-
-		if (altField) { // update alternate field too
-			altFormat = this._get(inst, "altFormat") || this._get(inst, "dateFormat");
-			date = this._getDate(inst);
-			dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst));
-			$(altField).each(function() { $(this).val(dateStr); });
-		}
-	},
-
-	/* Set as beforeShowDay function to prevent selection of weekends.
-	 * @param  date  Date - the date to customise
-	 * @return [boolean, string] - is this date selectable?, what is its CSS class?
-	 */
-	noWeekends: function(date) {
-		var day = date.getDay();
-		return [(day > 0 && day < 6), ""];
-	},
-
-	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
-	 * @param  date  Date - the date to get the week for
-	 * @return  number - the number of the week within the year that contains this date
-	 */
-	iso8601Week: function(date) {
-		var time,
-			checkDate = new Date(date.getTime());
-
-		// Find Thursday of this week starting on Monday
-		checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
-
-		time = checkDate.getTime();
-		checkDate.setMonth(0); // Compare with Jan 1
-		checkDate.setDate(1);
-		return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
-	},
-
-	/* Parse a string value into a date object.
-	 * See formatDate below for the possible formats.
-	 *
-	 * @param  format string - the expected format of the date
-	 * @param  value string - the date in the above format
-	 * @param  settings Object - attributes include:
-	 *					shortYearCutoff  number - the cutoff year for determining the century (optional)
-	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
-	 *					dayNames		string[7] - names of the days from Sunday (optional)
-	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
-	 *					monthNames		string[12] - names of the months (optional)
-	 * @return  Date - the extracted date value or null if value is blank
-	 */
-	parseDate: function (format, value, settings) {
-		if (format == null || value == null) {
-			throw "Invalid arguments";
-		}
-
-		value = (typeof value === "object" ? value.toString() : value + "");
-		if (value === "") {
-			return null;
-		}
-
-		var iFormat, dim, extra,
-			iValue = 0,
-			shortYearCutoffTemp = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff,
-			shortYearCutoff = (typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
-				new Date().getFullYear() % 100 + parseInt(shortYearCutoffTemp, 10)),
-			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
-			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
-			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
-			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
-			year = -1,
-			month = -1,
-			day = -1,
-			doy = -1,
-			literal = false,
-			date,
-			// Check whether a format character is doubled
-			lookAhead = function(match) {
-				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
-				if (matches) {
-					iFormat++;
-				}
-				return matches;
-			},
-			// Extract a number from the string value
-			getNumber = function(match) {
-				var isDoubled = lookAhead(match),
-					size = (match === "@" ? 14 : (match === "!" ? 20 :
-					(match === "y" && isDoubled ? 4 : (match === "o" ? 3 : 2)))),
-					minSize = (match === "y" ? size : 1),
-					digits = new RegExp("^\\d{" + minSize + "," + size + "}"),
-					num = value.substring(iValue).match(digits);
-				if (!num) {
-					throw "Missing number at position " + iValue;
-				}
-				iValue += num[0].length;
-				return parseInt(num[0], 10);
-			},
-			// Extract a name from the string value and convert to an index
-			getName = function(match, shortNames, longNames) {
-				var index = -1,
-					names = $.map(lookAhead(match) ? longNames : shortNames, function (v, k) {
-						return [ [k, v] ];
-					}).sort(function (a, b) {
-						return -(a[1].length - b[1].length);
-					});
-
-				$.each(names, function (i, pair) {
-					var name = pair[1];
-					if (value.substr(iValue, name.length).toLowerCase() === name.toLowerCase()) {
-						index = pair[0];
-						iValue += name.length;
-						return false;
-					}
-				});
-				if (index !== -1) {
-					return index + 1;
-				} else {
-					throw "Unknown name at position " + iValue;
-				}
-			},
-			// Confirm that a literal character matches the string value
-			checkLiteral = function() {
-				if (value.charAt(iValue) !== format.charAt(iFormat)) {
-					throw "Unexpected literal at position " + iValue;
-				}
-				iValue++;
-			};
-
-		for (iFormat = 0; iFormat < format.length; iFormat++) {
-			if (literal) {
-				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
-					literal = false;
-				} else {
-					checkLiteral();
-				}
-			} else {
-				switch (format.charAt(iFormat)) {
-					case "d":
-						day = getNumber("d");
-						break;
-					case "D":
-						getName("D", dayNamesShort, dayNames);
-						break;
-					case "o":
-						doy = getNumber("o");
-						break;
-					case "m":
-						month = getNumber("m");
-						break;
-					case "M":
-						month = getName("M", monthNamesShort, monthNames);
-						break;
-					case "y":
-						year = getNumber("y");
-						break;
-					case "@":
-						date = new Date(getNumber("@"));
-						year = date.getFullYear();
-						month = date.getMonth() + 1;
-						day = date.getDate();
-						break;
-					case "!":
-						date = new Date((getNumber("!") - this._ticksTo1970) / 10000);
-						year = date.getFullYear();
-						month = date.getMonth() + 1;
-						day = date.getDate();
-						break;
-					case "'":
-						if (lookAhead("'")){
-							checkLiteral();
-						} else {
-							literal = true;
-						}
-						break;
-					default:
-						checkLiteral();
-				}
-			}
-		}
-
-		if (iValue < value.length){
-			extra = value.substr(iValue);
-			if (!/^\s+/.test(extra)) {
-				throw "Extra/unparsed characters found in date: " + extra;
-			}
-		}
-
-		if (year === -1) {
-			year = new Date().getFullYear();
-		} else if (year < 100) {
-			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
-				(year <= shortYearCutoff ? 0 : -100);
-		}
-
-		if (doy > -1) {
-			month = 1;
-			day = doy;
-			do {
-				dim = this._getDaysInMonth(year, month - 1);
-				if (day <= dim) {
-					break;
-				}
-				month++;
-				day -= dim;
-			} while (true);
-		}
-
-		date = this._daylightSavingAdjust(new Date(year, month - 1, day));
-		if (date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day) {
-			throw "Invalid date"; // E.g. 31/02/00
-		}
-		return date;
-	},
-
-	/* Standard date formats. */
-	ATOM: "yy-mm-dd", // RFC 3339 (ISO 8601)
-	COOKIE: "D, dd M yy",
-	ISO_8601: "yy-mm-dd",
-	RFC_822: "D, d M y",
-	RFC_850: "DD, dd-M-y",
-	RFC_1036: "D, d M y",
-	RFC_1123: "D, d M yy",
-	RFC_2822: "D, d M yy",
-	RSS: "D, d M y", // RFC 822
-	TICKS: "!",
-	TIMESTAMP: "@",
-	W3C: "yy-mm-dd", // ISO 8601
-
-	_ticksTo1970: (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) +
-		Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000),
-
-	/* Format a date object into a string value.
-	 * The format can be combinations of the following:
-	 * d  - day of month (no leading zero)
-	 * dd - day of month (two digit)
-	 * o  - day of year (no leading zeros)
-	 * oo - day of year (three digit)
-	 * D  - day name short
-	 * DD - day name long
-	 * m  - month of year (no leading zero)
-	 * mm - month of year (two digit)
-	 * M  - month name short
-	 * MM - month name long
-	 * y  - year (two digit)
-	 * yy - year (four digit)
-	 * @ - Unix timestamp (ms since 01/01/1970)
-	 * ! - Windows ticks (100ns since 01/01/0001)
-	 * "..." - literal text
-	 * '' - single quote
-	 *
-	 * @param  format string - the desired format of the date
-	 * @param  date Date - the date value to format
-	 * @param  settings Object - attributes include:
-	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
-	 *					dayNames		string[7] - names of the days from Sunday (optional)
-	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
-	 *					monthNames		string[12] - names of the months (optional)
-	 * @return  string - the date in the above format
-	 */
-	formatDate: function (format, date, settings) {
-		if (!date) {
-			return "";
-		}
-
-		var iFormat,
-			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
-			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
-			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
-			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
-			// Check whether a format character is doubled
-			lookAhead = function(match) {
-				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
-				if (matches) {
-					iFormat++;
-				}
-				return matches;
-			},
-			// Format a number, with leading zero if necessary
-			formatNumber = function(match, value, len) {
-				var num = "" + value;
-				if (lookAhead(match)) {
-					while (num.length < len) {
-						num = "0" + num;
-					}
-				}
-				return num;
-			},
-			// Format a name, short or long as requested
-			formatName = function(match, value, shortNames, longNames) {
-				return (lookAhead(match) ? longNames[value] : shortNames[value]);
-			},
-			output = "",
-			literal = false;
-
-		if (date) {
-			for (iFormat = 0; iFormat < format.length; iFormat++) {
-				if (literal) {
-					if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
-						literal = false;
-					} else {
-						output += format.charAt(iFormat);
-					}
-				} else {
-					switch (format.charAt(iFormat)) {
-						case "d":
-							output += formatNumber("d", date.getDate(), 2);
-							break;
-						case "D":
-							output += formatName("D", date.getDay(), dayNamesShort, dayNames);
-							break;
-						case "o":
-							output += formatNumber("o",
-								Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
-							break;
-						case "m":
-							output += formatNumber("m", date.getMonth() + 1, 2);
-							break;
-						case "M":
-							output += formatName("M", date.getMonth(), monthNamesShort, monthNames);
-							break;
-						case "y":
-							output += (lookAhead("y") ? date.getFullYear() :
-								(date.getYear() % 100 < 10 ? "0" : "") + date.getYear() % 100);
-							break;
-						case "@":
-							output += date.getTime();
-							break;
-						case "!":
-							output += date.getTime() * 10000 + this._ticksTo1970;
-							break;
-						case "'":
-							if (lookAhead("'")) {
-								output += "'";
-							} else {
-								literal = true;
-							}
-							break;
-						default:
-							output += format.charAt(iFormat);
-					}
-				}
-			}
-		}
-		return output;
-	},
-
-	/* Extract all possible characters from the date format. */
-	_possibleChars: function (format) {
-		var iFormat,
-			chars = "",
-			literal = false,
-			// Check whether a format character is doubled
-			lookAhead = function(match) {
-				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
-				if (matches) {
-					iFormat++;
-				}
-				return matches;
-			};
-
-		for (iFormat = 0; iFormat < format.length; iFormat++) {
-			if (literal) {
-				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
-					literal = false;
-				} else {
-					chars += format.charAt(iFormat);
-				}
-			} else {
-				switch (format.charAt(iFormat)) {
-					case "d": case "m": case "y": case "@":
-						chars += "0123456789";
-						break;
-					case "D": case "M":
-						return null; // Accept anything
-					case "'":
-						if (lookAhead("'")) {
-							chars += "'";
-						} else {
-							literal = true;
-						}
-						break;
-					default:
-						chars += format.charAt(iFormat);
-				}
-			}
-		}
-		return chars;
-	},
-
-	/* Get a setting value, defaulting if necessary. */
-	_get: function(inst, name) {
-		return inst.settings[name] !== undefined ?
-			inst.settings[name] : this._defaults[name];
-	},
-
-	/* Parse existing date and initialise date picker. */
-	_setDateFromField: function(inst, noDefault) {
-		if (inst.input.val() === inst.lastVal) {
-			return;
-		}
-
-		var dateFormat = this._get(inst, "dateFormat"),
-			dates = inst.lastVal = inst.input ? inst.input.val() : null,
-			defaultDate = this._getDefaultDate(inst),
-			date = defaultDate,
-			settings = this._getFormatConfig(inst);
-
-		try {
-			date = this.parseDate(dateFormat, dates, settings) || defaultDate;
-		} catch (event) {
-			dates = (noDefault ? "" : dates);
-		}
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		inst.currentDay = (dates ? date.getDate() : 0);
-		inst.currentMonth = (dates ? date.getMonth() : 0);
-		inst.currentYear = (dates ? date.getFullYear() : 0);
-		this._adjustInstDate(inst);
-	},
-
-	/* Retrieve the default date shown on opening. */
-	_getDefaultDate: function(inst) {
-		return this._restrictMinMax(inst,
-			this._determineDate(inst, this._get(inst, "defaultDate"), new Date()));
-	},
-
-	/* A date may be specified as an exact value or a relative one. */
-	_determineDate: function(inst, date, defaultDate) {
-		var offsetNumeric = function(offset) {
-				var date = new Date();
-				date.setDate(date.getDate() + offset);
-				return date;
-			},
-			offsetString = function(offset) {
-				try {
-					return $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
-						offset, $.datepicker._getFormatConfig(inst));
-				}
-				catch (e) {
-					// Ignore
-				}
-
-				var date = (offset.toLowerCase().match(/^c/) ?
-					$.datepicker._getDate(inst) : null) || new Date(),
-					year = date.getFullYear(),
-					month = date.getMonth(),
-					day = date.getDate(),
-					pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,
-					matches = pattern.exec(offset);
-
-				while (matches) {
-					switch (matches[2] || "d") {
-						case "d" : case "D" :
-							day += parseInt(matches[1],10); break;
-						case "w" : case "W" :
-							day += parseInt(matches[1],10) * 7; break;
-						case "m" : case "M" :
-							month += parseInt(matches[1],10);
-							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
-							break;
-						case "y": case "Y" :
-							year += parseInt(matches[1],10);
-							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
-							break;
-					}
-					matches = pattern.exec(offset);
-				}
-				return new Date(year, month, day);
-			},
-			newDate = (date == null || date === "" ? defaultDate : (typeof date === "string" ? offsetString(date) :
-				(typeof date === "number" ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
-
-		newDate = (newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate);
-		if (newDate) {
-			newDate.setHours(0);
-			newDate.setMinutes(0);
-			newDate.setSeconds(0);
-			newDate.setMilliseconds(0);
-		}
-		return this._daylightSavingAdjust(newDate);
-	},
-
-	/* Handle switch to/from daylight saving.
-	 * Hours may be non-zero on daylight saving cut-over:
-	 * > 12 when midnight changeover, but then cannot generate
-	 * midnight datetime, so jump to 1AM, otherwise reset.
-	 * @param  date  (Date) the date to check
-	 * @return  (Date) the corrected date
-	 */
-	_daylightSavingAdjust: function(date) {
-		if (!date) {
-			return null;
-		}
-		date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0);
-		return date;
-	},
-
-	/* Set the date(s) directly. */
-	_setDate: function(inst, date, noChange) {
-		var clear = !date,
-			origMonth = inst.selectedMonth,
-			origYear = inst.selectedYear,
-			newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
-
-		inst.selectedDay = inst.currentDay = newDate.getDate();
-		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
-		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
-		if ((origMonth !== inst.selectedMonth || origYear !== inst.selectedYear) && !noChange) {
-			this._notifyChange(inst);
-		}
-		this._adjustInstDate(inst);
-		if (inst.input) {
-			inst.input.val(clear ? "" : this._formatDate(inst));
-		}
-	},
-
-	/* Retrieve the date(s) directly. */
-	_getDate: function(inst) {
-		var startDate = (!inst.currentYear || (inst.input && inst.input.val() === "") ? null :
-			this._daylightSavingAdjust(new Date(
-			inst.currentYear, inst.currentMonth, inst.currentDay)));
-			return startDate;
-	},
-
-	/* Attach the onxxx handlers.  These are declared statically so
-	 * they work with static code transformers like Caja.
-	 */
-	_attachHandlers: function(inst) {
-		var stepMonths = this._get(inst, "stepMonths"),
-			id = "#" + inst.id.replace( /\\\\/g, "\\" );
-		inst.dpDiv.find("[data-handler]").map(function () {
-			var handler = {
-				prev: function () {
-					$.datepicker._adjustDate(id, -stepMonths, "M");
-				},
-				next: function () {
-					$.datepicker._adjustDate(id, +stepMonths, "M");
-				},
-				hide: function () {
-					$.datepicker._hideDatepicker();
-				},
-				today: function () {
-					$.datepicker._gotoToday(id);
-				},
-				selectDay: function () {
-					$.datepicker._selectDay(id, +this.getAttribute("data-month"), +this.getAttribute("data-year"), this);
-					return false;
-				},
-				selectMonth: function () {
-					$.datepicker._selectMonthYear(id, this, "M");
-					return false;
-				},
-				selectYear: function () {
-					$.datepicker._selectMonthYear(id, this, "Y");
-					return false;
-				}
-			};
-			$(this).bind(this.getAttribute("data-event"), handler[this.getAttribute("data-handler")]);
-		});
-	},
-
-	/* Generate the HTML for the current state of the date picker. */
-	_generateHTML: function(inst) {
-		var maxDraw, prevText, prev, nextText, next, currentText, gotoDate,
-			controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
-			monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
-			selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate,
-			cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows,
-			printDate, dRow, tbody, daySettings, otherMonth, unselectable,
-			tempDate = new Date(),
-			today = this._daylightSavingAdjust(
-				new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate())), // clear time
-			isRTL = this._get(inst, "isRTL"),
-			showButtonPanel = this._get(inst, "showButtonPanel"),
-			hideIfNoPrevNext = this._get(inst, "hideIfNoPrevNext"),
-			navigationAsDateFormat = this._get(inst, "navigationAsDateFormat"),
-			numMonths = this._getNumberOfMonths(inst),
-			showCurrentAtPos = this._get(inst, "showCurrentAtPos"),
-			stepMonths = this._get(inst, "stepMonths"),
-			isMultiMonth = (numMonths[0] !== 1 || numMonths[1] !== 1),
-			currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) :
-				new Date(inst.currentYear, inst.currentMonth, inst.currentDay))),
-			minDate = this._getMinMaxDate(inst, "min"),
-			maxDate = this._getMinMaxDate(inst, "max"),
-			drawMonth = inst.drawMonth - showCurrentAtPos,
-			drawYear = inst.drawYear;
-
-		if (drawMonth < 0) {
-			drawMonth += 12;
-			drawYear--;
-		}
-		if (maxDate) {
-			maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
-				maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate()));
-			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
-			while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
-				drawMonth--;
-				if (drawMonth < 0) {
-					drawMonth = 11;
-					drawYear--;
-				}
-			}
-		}
-		inst.drawMonth = drawMonth;
-		inst.drawYear = drawYear;
-
-		prevText = this._get(inst, "prevText");
-		prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText,
-			this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
-			this._getFormatConfig(inst)));
-
-		prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
-			"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
-			" title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>" :
-			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+ prevText +"'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>"));
-
-		nextText = this._get(inst, "nextText");
-		nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
-			this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
-			this._getFormatConfig(inst)));
-
-		next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
-			"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
-			" title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>" :
-			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+ nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>"));
-
-		currentText = this._get(inst, "currentText");
-		gotoDate = (this._get(inst, "gotoCurrent") && inst.currentDay ? currentDate : today);
-		currentText = (!navigationAsDateFormat ? currentText :
-			this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
-
-		controls = (!inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
-			this._get(inst, "closeText") + "</button>" : "");
-
-		buttonPanel = (showButtonPanel) ? "<div class='ui-datepicker-buttonpane ui-widget-content'>" + (isRTL ? controls : "") +
-			(this._isInRange(inst, gotoDate) ? "<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'" +
-			">" + currentText + "</button>" : "") + (isRTL ? "" : controls) + "</div>" : "";
-
-		firstDay = parseInt(this._get(inst, "firstDay"),10);
-		firstDay = (isNaN(firstDay) ? 0 : firstDay);
-
-		showWeek = this._get(inst, "showWeek");
-		dayNames = this._get(inst, "dayNames");
-		dayNamesMin = this._get(inst, "dayNamesMin");
-		monthNames = this._get(inst, "monthNames");
-		monthNamesShort = this._get(inst, "monthNamesShort");
-		beforeShowDay = this._get(inst, "beforeShowDay");
-		showOtherMonths = this._get(inst, "showOtherMonths");
-		selectOtherMonths = this._get(inst, "selectOtherMonths");
-		defaultDate = this._getDefaultDate(inst);
-		html = "";
-		dow;
-		for (row = 0; row < numMonths[0]; row++) {
-			group = "";
-			this.maxRows = 4;
-			for (col = 0; col < numMonths[1]; col++) {
-				selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
-				cornerClass = " ui-corner-all";
-				calender = "";
-				if (isMultiMonth) {
-					calender += "<div class='ui-datepicker-group";
-					if (numMonths[1] > 1) {
-						switch (col) {
-							case 0: calender += " ui-datepicker-group-first";
-								cornerClass = " ui-corner-" + (isRTL ? "right" : "left"); break;
-							case numMonths[1]-1: calender += " ui-datepicker-group-last";
-								cornerClass = " ui-corner-" + (isRTL ? "left" : "right"); break;
-							default: calender += " ui-datepicker-group-middle"; cornerClass = ""; break;
-						}
-					}
-					calender += "'>";
-				}
-				calender += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
-					(/all|left/.test(cornerClass) && row === 0 ? (isRTL ? next : prev) : "") +
-					(/all|right/.test(cornerClass) && row === 0 ? (isRTL ? prev : next) : "") +
-					this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
-					row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
-					"</div><table class='ui-datepicker-calendar'><thead>" +
-					"<tr>";
-				thead = (showWeek ? "<th class='ui-datepicker-week-col'>" + this._get(inst, "weekHeader") + "</th>" : "");
-				for (dow = 0; dow < 7; dow++) { // days of the week
-					day = (dow + firstDay) % 7;
-					thead += "<th scope='col'" + ((dow + firstDay + 6) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "") + ">" +
-						"<span title='" + dayNames[day] + "'>" + dayNamesMin[day] + "</span></th>";
-				}
-				calender += thead + "</tr></thead><tbody>";
-				daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
-				if (drawYear === inst.selectedYear && drawMonth === inst.selectedMonth) {
-					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
-				}
-				leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
-				curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
-				numRows = (isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows); //If multiple months, use the higher number of rows (see #7043)
-				this.maxRows = numRows;
-				printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
-				for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows
-					calender += "<tr>";
-					tbody = (!showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
-						this._get(inst, "calculateWeek")(printDate) + "</td>");
-					for (dow = 0; dow < 7; dow++) { // create date picker days
-						daySettings = (beforeShowDay ?
-							beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, ""]);
-						otherMonth = (printDate.getMonth() !== drawMonth);
-						unselectable = (otherMonth && !selectOtherMonths) || !daySettings[0] ||
-							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
-						tbody += "<td class='" +
-							((dow + firstDay + 6) % 7 >= 5 ? " ui-datepicker-week-end" : "") + // highlight weekends
-							(otherMonth ? " ui-datepicker-other-month" : "") + // highlight days from other months
-							((printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent) || // user pressed key
-							(defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime()) ?
-							// or defaultDate is current printedDate and defaultDate is selectedDate
-							" " + this._dayOverClass : "") + // highlight selected day
-							(unselectable ? " " + this._unselectableClass + " ui-state-disabled": "") +  // highlight unselectable days
-							(otherMonth && !showOtherMonths ? "" : " " + daySettings[1] + // highlight custom dates
-							(printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "") + // highlight selected day
-							(printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "")) + "'" + // highlight today (if different)
-							((!otherMonth || showOtherMonths) && daySettings[2] ? " title='" + daySettings[2].replace(/'/g, "&#39;") + "'" : "") + // cell title
-							(unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'") + ">" + // actions
-							(otherMonth && !showOtherMonths ? "&#xa0;" : // display for other months
-							(unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +
-							(printDate.getTime() === today.getTime() ? " ui-state-highlight" : "") +
-							(printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "") + // highlight selected day
-							(otherMonth ? " ui-priority-secondary" : "") + // distinguish dates from other months
-							"' href='#'>" + printDate.getDate() + "</a>")) + "</td>"; // display selectable date
-						printDate.setDate(printDate.getDate() + 1);
-						printDate = this._daylightSavingAdjust(printDate);
-					}
-					calender += tbody + "</tr>";
-				}
-				drawMonth++;
-				if (drawMonth > 11) {
-					drawMonth = 0;
-					drawYear++;
-				}
-				calender += "</tbody></table>" + (isMultiMonth ? "</div>" +
-							((numMonths[0] > 0 && col === numMonths[1]-1) ? "<div class='ui-datepicker-row-break'></div>" : "") : "");
-				group += calender;
-			}
-			html += group;
-		}
-		html += buttonPanel;
-		inst._keyEvent = false;
-		return html;
-	},
-
-	/* Generate the month and year header. */
-	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
-			secondary, monthNames, monthNamesShort) {
-
-		var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear,
-			changeMonth = this._get(inst, "changeMonth"),
-			changeYear = this._get(inst, "changeYear"),
-			showMonthAfterYear = this._get(inst, "showMonthAfterYear"),
-			html = "<div class='ui-datepicker-title'>",
-			monthHtml = "";
-
-		// month selection
-		if (secondary || !changeMonth) {
-			monthHtml += "<span class='ui-datepicker-month'>" + monthNames[drawMonth] + "</span>";
-		} else {
-			inMinYear = (minDate && minDate.getFullYear() === drawYear);
-			inMaxYear = (maxDate && maxDate.getFullYear() === drawYear);
-			monthHtml += "<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";
-			for ( month = 0; month < 12; month++) {
-				if ((!inMinYear || month >= minDate.getMonth()) && (!inMaxYear || month <= maxDate.getMonth())) {
-					monthHtml += "<option value='" + month + "'" +
-						(month === drawMonth ? " selected='selected'" : "") +
-						">" + monthNamesShort[month] + "</option>";
-				}
-			}
-			monthHtml += "</select>";
-		}
-
-		if (!showMonthAfterYear) {
-			html += monthHtml + (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "");
-		}
-
-		// year selection
-		if ( !inst.yearshtml ) {
-			inst.yearshtml = "";
-			if (secondary || !changeYear) {
-				html += "<span class='ui-datepicker-year'>" + drawYear + "</span>";
-			} else {
-				// determine range of years to display
-				years = this._get(inst, "yearRange").split(":");
-				thisYear = new Date().getFullYear();
-				determineYear = function(value) {
-					var year = (value.match(/c[+\-].*/) ? drawYear + parseInt(value.substring(1), 10) :
-						(value.match(/[+\-].*/) ? thisYear + parseInt(value, 10) :
-						parseInt(value, 10)));
-					return (isNaN(year) ? thisYear : year);
-				};
-				year = determineYear(years[0]);
-				endYear = Math.max(year, determineYear(years[1] || ""));
-				year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
-				endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
-				inst.yearshtml += "<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";
-				for (; year <= endYear; year++) {
-					inst.yearshtml += "<option value='" + year + "'" +
-						(year === drawYear ? " selected='selected'" : "") +
-						">" + year + "</option>";
-				}
-				inst.yearshtml += "</select>";
-
-				html += inst.yearshtml;
-				inst.yearshtml = null;
-			}
-		}
-
-		html += this._get(inst, "yearSuffix");
-		if (showMonthAfterYear) {
-			html += (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "") + monthHtml;
-		}
-		html += "</div>"; // Close datepicker_header
-		return html;
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustInstDate: function(inst, offset, period) {
-		var year = inst.drawYear + (period === "Y" ? offset : 0),
-			month = inst.drawMonth + (period === "M" ? offset : 0),
-			day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) + (period === "D" ? offset : 0),
-			date = this._restrictMinMax(inst, this._daylightSavingAdjust(new Date(year, month, day)));
-
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		if (period === "M" || period === "Y") {
-			this._notifyChange(inst);
-		}
-	},
-
-	/* Ensure a date is within any min/max bounds. */
-	_restrictMinMax: function(inst, date) {
-		var minDate = this._getMinMaxDate(inst, "min"),
-			maxDate = this._getMinMaxDate(inst, "max"),
-			newDate = (minDate && date < minDate ? minDate : date);
-		return (maxDate && newDate > maxDate ? maxDate : newDate);
-	},
-
-	/* Notify change of month/year. */
-	_notifyChange: function(inst) {
-		var onChange = this._get(inst, "onChangeMonthYear");
-		if (onChange) {
-			onChange.apply((inst.input ? inst.input[0] : null),
-				[inst.selectedYear, inst.selectedMonth + 1, inst]);
-		}
-	},
-
-	/* Determine the number of months to show. */
-	_getNumberOfMonths: function(inst) {
-		var numMonths = this._get(inst, "numberOfMonths");
-		return (numMonths == null ? [1, 1] : (typeof numMonths === "number" ? [1, numMonths] : numMonths));
-	},
-
-	/* Determine the current maximum date - ensure no time components are set. */
-	_getMinMaxDate: function(inst, minMax) {
-		return this._determineDate(inst, this._get(inst, minMax + "Date"), null);
-	},
-
-	/* Find the number of days in a given month. */
-	_getDaysInMonth: function(year, month) {
-		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
-	},
-
-	/* Find the day of the week of the first of a month. */
-	_getFirstDayOfMonth: function(year, month) {
-		return new Date(year, month, 1).getDay();
-	},
-
-	/* Determines if we should allow a "next/prev" month display change. */
-	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
-		var numMonths = this._getNumberOfMonths(inst),
-			date = this._daylightSavingAdjust(new Date(curYear,
-			curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
-
-		if (offset < 0) {
-			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
-		}
-		return this._isInRange(inst, date);
-	},
-
-	/* Is the given date in the accepted range? */
-	_isInRange: function(inst, date) {
-		var yearSplit, currentYear,
-			minDate = this._getMinMaxDate(inst, "min"),
-			maxDate = this._getMinMaxDate(inst, "max"),
-			minYear = null,
-			maxYear = null,
-			years = this._get(inst, "yearRange");
-			if (years){
-				yearSplit = years.split(":");
-				currentYear = new Date().getFullYear();
-				minYear = parseInt(yearSplit[0], 10);
-				maxYear = parseInt(yearSplit[1], 10);
-				if ( yearSplit[0].match(/[+\-].*/) ) {
-					minYear += currentYear;
-				}
-				if ( yearSplit[1].match(/[+\-].*/) ) {
-					maxYear += currentYear;
-				}
-			}
-
-		return ((!minDate || date.getTime() >= minDate.getTime()) &&
-			(!maxDate || date.getTime() <= maxDate.getTime()) &&
-			(!minYear || date.getFullYear() >= minYear) &&
-			(!maxYear || date.getFullYear() <= maxYear));
-	},
-
-	/* Provide the configuration settings for formatting/parsing. */
-	_getFormatConfig: function(inst) {
-		var shortYearCutoff = this._get(inst, "shortYearCutoff");
-		shortYearCutoff = (typeof shortYearCutoff !== "string" ? shortYearCutoff :
-			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
-		return {shortYearCutoff: shortYearCutoff,
-			dayNamesShort: this._get(inst, "dayNamesShort"), dayNames: this._get(inst, "dayNames"),
-			monthNamesShort: this._get(inst, "monthNamesShort"), monthNames: this._get(inst, "monthNames")};
-	},
-
-	/* Format the given date for display. */
-	_formatDate: function(inst, day, month, year) {
-		if (!day) {
-			inst.currentDay = inst.selectedDay;
-			inst.currentMonth = inst.selectedMonth;
-			inst.currentYear = inst.selectedYear;
-		}
-		var date = (day ? (typeof day === "object" ? day :
-			this._daylightSavingAdjust(new Date(year, month, day))) :
-			this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
-		return this.formatDate(this._get(inst, "dateFormat"), date, this._getFormatConfig(inst));
-	}
-});
-
-/*
- * Bind hover events for datepicker elements.
- * Done via delegate so the binding only occurs once in the lifetime of the parent div.
- * Global datepicker_instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
- */
-function datepicker_bindHover(dpDiv) {
-	var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
-	return dpDiv.delegate(selector, "mouseout", function() {
-			$(this).removeClass("ui-state-hover");
-			if (this.className.indexOf("ui-datepicker-prev") !== -1) {
-				$(this).removeClass("ui-datepicker-prev-hover");
-			}
-			if (this.className.indexOf("ui-datepicker-next") !== -1) {
-				$(this).removeClass("ui-datepicker-next-hover");
-			}
-		})
-		.delegate( selector, "mouseover", datepicker_handleMouseover );
-}
-
-function datepicker_handleMouseover() {
-	if (!$.datepicker._isDisabledDatepicker( datepicker_instActive.inline? datepicker_instActive.dpDiv.parent()[0] : datepicker_instActive.input[0])) {
-		$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
-		$(this).addClass("ui-state-hover");
-		if (this.className.indexOf("ui-datepicker-prev") !== -1) {
-			$(this).addClass("ui-datepicker-prev-hover");
-		}
-		if (this.className.indexOf("ui-datepicker-next") !== -1) {
-			$(this).addClass("ui-datepicker-next-hover");
 		}
 	}
-}
-
-/* jQuery extend now ignores nulls! */
-function datepicker_extendRemove(target, props) {
-	$.extend(target, props);
-	for (var name in props) {
-		if (props[name] == null) {
-			target[name] = props[name];
-		}
-	}
-	return target;
-}
-
-/* Invoke the datepicker functionality.
-   @param  options  string - a command, optionally followed by additional parameters or
-					Object - settings for attaching new datepicker functionality
-   @return  jQuery object */
-$.fn.datepicker = function(options){
-
-	/* Verify an empty collection wasn't passed - Fixes #6976 */
-	if ( !this.length ) {
-		return this;
-	}
-
-	/* Initialise the date picker. */
-	if (!$.datepicker.initialized) {
-		$(document).mousedown($.datepicker._checkExternalClick);
-		$.datepicker.initialized = true;
-	}
-
-	/* Append datepicker main container to body if not exist. */
-	if ($("#"+$.datepicker._mainDivId).length === 0) {
-		$("body").append($.datepicker.dpDiv);
-	}
-
-	var otherArgs = Array.prototype.slice.call(arguments, 1);
-	if (typeof options === "string" && (options === "isDisabled" || options === "getDate" || options === "widget")) {
-		return $.datepicker["_" + options + "Datepicker"].
-			apply($.datepicker, [this[0]].concat(otherArgs));
-	}
-	if (options === "option" && arguments.length === 2 && typeof arguments[1] === "string") {
-		return $.datepicker["_" + options + "Datepicker"].
-			apply($.datepicker, [this[0]].concat(otherArgs));
-	}
-	return this.each(function() {
-		typeof options === "string" ?
-			$.datepicker["_" + options + "Datepicker"].
-				apply($.datepicker, [this].concat(otherArgs)) :
-			$.datepicker._attachDatepicker(this, options);
-	});
 };
 
-$.datepicker = new Datepicker(); // singleton instance
-$.datepicker.initialized = false;
-$.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.11.4";
 
-var datepicker = $.datepicker;
+
+var safeActiveElement = $.ui.safeActiveElement = function( document ) {
+	var activeElement;
+
+	// Support: IE 9 only
+	// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
+	try {
+		activeElement = document.activeElement;
+	} catch ( error ) {
+		activeElement = document.body;
+	}
+
+	// Support: IE 9 - 11 only
+	// IE may return null instead of an element
+	// Interestingly, this only seems to occur when NOT in an iframe
+	if ( !activeElement ) {
+		activeElement = document.body;
+	}
+
+	// Support: IE 11 only
+	// IE11 returns a seemingly empty object in some cases when accessing
+	// document.activeElement from an <iframe>
+	if ( !activeElement.nodeName ) {
+		activeElement = document.body;
+	}
+
+	return activeElement;
+};
+
+
+
+var safeBlur = $.ui.safeBlur = function( element ) {
+
+	// Support: IE9 - 10 only
+	// If the <body> is blurred, IE will switch windows, see #9420
+	if ( element && element.nodeName.toLowerCase() !== "body" ) {
+		$( element ).trigger( "blur" );
+	}
+};
 
 
 /*!
- * jQuery UI Draggable 1.11.4
+ * jQuery UI Draggable 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/draggable/
  */
 
+//>>label: Draggable
+//>>group: Interactions
+//>>description: Enables dragging functionality for any element.
+//>>docs: http://api.jqueryui.com/draggable/
+//>>demos: http://jqueryui.com/draggable/
+//>>css.structure: ../../themes/base/draggable.css
 
-$.widget("ui.draggable", $.ui.mouse, {
-	version: "1.11.4",
+
+
+$.widget( "ui.draggable", $.ui.mouse, {
+	version: "1.12.1",
 	widgetEventPrefix: "drag",
 	options: {
 		addClasses: true,
@@ -5877,7 +2057,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 		stack: false,
 		zIndex: false,
 
-		// callbacks
+		// Callbacks
 		drag: null,
 		start: null,
 		stop: null
@@ -5887,11 +2067,8 @@ $.widget("ui.draggable", $.ui.mouse, {
 		if ( this.options.helper === "original" ) {
 			this._setPositionRelative();
 		}
-		if (this.options.addClasses){
-			this.element.addClass("ui-draggable");
-		}
-		if (this.options.disabled){
-			this.element.addClass("ui-draggable-disabled");
+		if ( this.options.addClasses ) {
+			this._addClass( "ui-draggable" );
 		}
 		this._setHandleClassName();
 
@@ -5911,27 +2088,27 @@ $.widget("ui.draggable", $.ui.mouse, {
 			this.destroyOnClear = true;
 			return;
 		}
-		this.element.removeClass( "ui-draggable ui-draggable-dragging ui-draggable-disabled" );
 		this._removeHandleClassName();
 		this._mouseDestroy();
 	},
 
-	_mouseCapture: function(event) {
+	_mouseCapture: function( event ) {
 		var o = this.options;
 
-		this._blurActiveElement( event );
-
-		// among others, prevent a drag on a resizable-handle
-		if (this.helper || o.disabled || $(event.target).closest(".ui-resizable-handle").length > 0) {
+		// Among others, prevent a drag on a resizable-handle
+		if ( this.helper || o.disabled ||
+				$( event.target ).closest( ".ui-resizable-handle" ).length > 0 ) {
 			return false;
 		}
 
 		//Quit if we're not on a valid handle
-		this.handle = this._getHandle(event);
-		if (!this.handle) {
+		this.handle = this._getHandle( event );
+		if ( !this.handle ) {
 			return false;
 		}
 
+		this._blurActiveElement( event );
+
 		this._blockFrames( o.iframeFix === true ? "iframe" : o.iframeFix );
 
 		return true;
@@ -5939,7 +2116,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 	},
 
 	_blockFrames: function( selector ) {
-		this.iframeBlocks = this.document.find( selector ).map(function() {
+		this.iframeBlocks = this.document.find( selector ).map( function() {
 			var iframe = $( this );
 
 			return $( "<div>" )
@@ -5948,7 +2125,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 				.outerWidth( iframe.outerWidth() )
 				.outerHeight( iframe.outerHeight() )
 				.offset( iframe.offset() )[ 0 ];
-		});
+		} );
 	},
 
 	_unblockFrames: function() {
@@ -5959,41 +2136,34 @@ $.widget("ui.draggable", $.ui.mouse, {
 	},
 
 	_blurActiveElement: function( event ) {
-		var document = this.document[ 0 ];
+		var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
+			target = $( event.target );
 
-		// Only need to blur if the event occurred on the draggable itself, see #10527
-		if ( !this.handleElement.is( event.target ) ) {
+		// Don't blur if the event occurred on an element that is within
+		// the currently focused element
+		// See #10527, #12472
+		if ( target.closest( activeElement ).length ) {
 			return;
 		}
 
-		// support: IE9
-		// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
-		try {
-
-			// Support: IE9, IE10
-			// If the <body> is blurred, IE will switch windows, see #9520
-			if ( document.activeElement && document.activeElement.nodeName.toLowerCase() !== "body" ) {
-
-				// Blur any element that currently has focus, see #4261
-				$( document.activeElement ).blur();
-			}
-		} catch ( error ) {}
+		// Blur any element that currently has focus, see #4261
+		$.ui.safeBlur( activeElement );
 	},
 
-	_mouseStart: function(event) {
+	_mouseStart: function( event ) {
 
 		var o = this.options;
 
 		//Create and append the visible helper
-		this.helper = this._createHelper(event);
+		this.helper = this._createHelper( event );
 
-		this.helper.addClass("ui-draggable-dragging");
+		this._addClass( this.helper, "ui-draggable-dragging" );
 
 		//Cache the helper size
 		this._cacheHelperProportions();
 
 		//If ddmanager is used for droppables, set the global draggable
-		if ($.ui.ddmanager) {
+		if ( $.ui.ddmanager ) {
 			$.ui.ddmanager.current = this;
 		}
 
@@ -6009,9 +2179,9 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this.cssPosition = this.helper.css( "position" );
 		this.scrollParent = this.helper.scrollParent( true );
 		this.offsetParent = this.helper.offsetParent();
-		this.hasFixedAncestor = this.helper.parents().filter(function() {
+		this.hasFixedAncestor = this.helper.parents().filter( function() {
 				return $( this ).css( "position" ) === "fixed";
-			}).length > 0;
+			} ).length > 0;
 
 		//The element's absolute position on the page minus margins
 		this.positionAbs = this.element.offset();
@@ -6023,13 +2193,13 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this.originalPageY = event.pageY;
 
 		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
-		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+		( o.cursorAt && this._adjustOffsetFromHelper( o.cursorAt ) );
 
 		//Set a containment if given in the options
 		this._setContainment();
 
 		//Trigger event + callbacks
-		if (this._trigger("start", event) === false) {
+		if ( this._trigger( "start", event ) === false ) {
 			this._clear();
 			return false;
 		}
@@ -6038,19 +2208,18 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this._cacheHelperProportions();
 
 		//Prepare the droppable offsets
-		if ($.ui.ddmanager && !o.dropBehaviour) {
-			$.ui.ddmanager.prepareOffsets(this, event);
+		if ( $.ui.ddmanager && !o.dropBehaviour ) {
+			$.ui.ddmanager.prepareOffsets( this, event );
 		}
 
-		// Reset helper's right/bottom css if they're set and set explicit width/height instead
-		// as this prevents resizing of elements with right/bottom set (see #7772)
-		this._normalizeRightBottom();
+		// Execute the drag once - this causes the helper not to be visible before getting its
+		// correct position
+		this._mouseDrag( event, true );
 
-		this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-
-		//If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
+		// If the ddmanager is used for droppables, inform the manager that dragging has started
+		// (see #5003)
 		if ( $.ui.ddmanager ) {
-			$.ui.ddmanager.dragStart(this, event);
+			$.ui.ddmanager.dragStart( this, event );
 		}
 
 		return true;
@@ -6071,7 +2240,8 @@ $.widget("ui.draggable", $.ui.mouse, {
 		};
 	},
 
-	_mouseDrag: function(event, noPropagation) {
+	_mouseDrag: function( event, noPropagation ) {
+
 		// reset any necessary cached properties (see #5009)
 		if ( this.hasFixedAncestor ) {
 			this.offset.parent = this._getParentOffset();
@@ -6079,13 +2249,13 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 		//Compute the helpers position
 		this.position = this._generatePosition( event, true );
-		this.positionAbs = this._convertPositionTo("absolute");
+		this.positionAbs = this._convertPositionTo( "absolute" );
 
 		//Call plugins and callbacks and use the resulting position if something is returned
-		if (!noPropagation) {
+		if ( !noPropagation ) {
 			var ui = this._uiHash();
-			if (this._trigger("drag", event, ui) === false) {
-				this._mouseUp({});
+			if ( this._trigger( "drag", event, ui ) === false ) {
+				this._mouseUp( new $.Event( "mouseup", event ) );
 				return false;
 			}
 			this.position = ui.position;
@@ -6094,36 +2264,44 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this.helper[ 0 ].style.left = this.position.left + "px";
 		this.helper[ 0 ].style.top = this.position.top + "px";
 
-		if ($.ui.ddmanager) {
-			$.ui.ddmanager.drag(this, event);
+		if ( $.ui.ddmanager ) {
+			$.ui.ddmanager.drag( this, event );
 		}
 
 		return false;
 	},
 
-	_mouseStop: function(event) {
+	_mouseStop: function( event ) {
 
 		//If we are using droppables, inform the manager about the drop
 		var that = this,
 			dropped = false;
-		if ($.ui.ddmanager && !this.options.dropBehaviour) {
-			dropped = $.ui.ddmanager.drop(this, event);
+		if ( $.ui.ddmanager && !this.options.dropBehaviour ) {
+			dropped = $.ui.ddmanager.drop( this, event );
 		}
 
 		//if a drop comes from outside (a sortable)
-		if (this.dropped) {
+		if ( this.dropped ) {
 			dropped = this.dropped;
 			this.dropped = false;
 		}
 
-		if ((this.options.revert === "invalid" && !dropped) || (this.options.revert === "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
-			$(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
-				if (that._trigger("stop", event) !== false) {
-					that._clear();
+		if ( ( this.options.revert === "invalid" && !dropped ) ||
+				( this.options.revert === "valid" && dropped ) ||
+				this.options.revert === true || ( $.isFunction( this.options.revert ) &&
+				this.options.revert.call( this.element, dropped ) )
+		) {
+			$( this.helper ).animate(
+				this.originalPosition,
+				parseInt( this.options.revertDuration, 10 ),
+				function() {
+					if ( that._trigger( "stop", event ) !== false ) {
+						that._clear();
+					}
 				}
-			});
+			);
 		} else {
-			if (this._trigger("stop", event) !== false) {
+			if ( this._trigger( "stop", event ) !== false ) {
 				this._clear();
 			}
 		}
@@ -6134,24 +2312,27 @@ $.widget("ui.draggable", $.ui.mouse, {
 	_mouseUp: function( event ) {
 		this._unblockFrames();
 
-		//If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
+		// If the ddmanager is used for droppables, inform the manager that dragging has stopped
+		// (see #5003)
 		if ( $.ui.ddmanager ) {
-			$.ui.ddmanager.dragStop(this, event);
+			$.ui.ddmanager.dragStop( this, event );
 		}
 
 		// Only need to focus if the event occurred on the draggable itself, see #10527
 		if ( this.handleElement.is( event.target ) ) {
-			// The interaction is over; whether or not the click resulted in a drag, focus the element
-			this.element.focus();
+
+			// The interaction is over; whether or not the click resulted in a drag,
+			// focus the element
+			this.element.trigger( "focus" );
 		}
 
-		return $.ui.mouse.prototype._mouseUp.call(this, event);
+		return $.ui.mouse.prototype._mouseUp.call( this, event );
 	},
 
 	cancel: function() {
 
-		if (this.helper.is(".ui-draggable-dragging")) {
-			this._mouseUp({});
+		if ( this.helper.is( ".ui-draggable-dragging" ) ) {
+			this._mouseUp( new $.Event( "mouseup", { target: this.element[ 0 ] } ) );
 		} else {
 			this._clear();
 		}
@@ -6160,7 +2341,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 	},
 
-	_getHandle: function(event) {
+	_getHandle: function( event ) {
 		return this.options.handle ?
 			!!$( event.target ).closest( this.element.find( this.options.handle ) ).length :
 			true;
@@ -6169,14 +2350,14 @@ $.widget("ui.draggable", $.ui.mouse, {
 	_setHandleClassName: function() {
 		this.handleElement = this.options.handle ?
 			this.element.find( this.options.handle ) : this.element;
-		this.handleElement.addClass( "ui-draggable-handle" );
+		this._addClass( this.handleElement, "ui-draggable-handle" );
 	},
 
 	_removeHandleClassName: function() {
-		this.handleElement.removeClass( "ui-draggable-handle" );
+		this._removeClass( this.handleElement, "ui-draggable-handle" );
 	},
 
-	_createHelper: function(event) {
+	_createHelper: function( event ) {
 
 		var o = this.options,
 			helperIsFunction = $.isFunction( o.helper ),
@@ -6186,19 +2367,22 @@ $.widget("ui.draggable", $.ui.mouse, {
 					this.element.clone().removeAttr( "id" ) :
 					this.element );
 
-		if (!helper.parents("body").length) {
-			helper.appendTo((o.appendTo === "parent" ? this.element[0].parentNode : o.appendTo));
+		if ( !helper.parents( "body" ).length ) {
+			helper.appendTo( ( o.appendTo === "parent" ?
+				this.element[ 0 ].parentNode :
+				o.appendTo ) );
 		}
 
-		// http://bugs.jqueryui.com/ticket/9446
+		// Http://bugs.jqueryui.com/ticket/9446
 		// a helper function can return the original element
 		// which wouldn't have been set to relative in _create
 		if ( helperIsFunction && helper[ 0 ] === this.element[ 0 ] ) {
 			this._setPositionRelative();
 		}
 
-		if (helper[0] !== this.element[0] && !(/(fixed|absolute)/).test(helper.css("position"))) {
-			helper.css("position", "absolute");
+		if ( helper[ 0 ] !== this.element[ 0 ] &&
+				!( /(fixed|absolute)/ ).test( helper.css( "position" ) ) ) {
+			helper.css( "position", "absolute" );
 		}
 
 		return helper;
@@ -6211,23 +2395,23 @@ $.widget("ui.draggable", $.ui.mouse, {
 		}
 	},
 
-	_adjustOffsetFromHelper: function(obj) {
-		if (typeof obj === "string") {
-			obj = obj.split(" ");
+	_adjustOffsetFromHelper: function( obj ) {
+		if ( typeof obj === "string" ) {
+			obj = obj.split( " " );
 		}
-		if ($.isArray(obj)) {
-			obj = { left: +obj[0], top: +obj[1] || 0 };
+		if ( $.isArray( obj ) ) {
+			obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 };
 		}
-		if ("left" in obj) {
+		if ( "left" in obj ) {
 			this.offset.click.left = obj.left + this.margins.left;
 		}
-		if ("right" in obj) {
+		if ( "right" in obj ) {
 			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
 		}
-		if ("top" in obj) {
+		if ( "top" in obj ) {
 			this.offset.click.top = obj.top + this.margins.top;
 		}
-		if ("bottom" in obj) {
+		if ( "bottom" in obj ) {
 			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
 		}
 	},
@@ -6242,11 +2426,15 @@ $.widget("ui.draggable", $.ui.mouse, {
 		var po = this.offsetParent.offset(),
 			document = this.document[ 0 ];
 
-		// This is a special case where we need to modify a offset calculated on start, since the following happened:
-		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
-		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
-		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
-		if (this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
+		// This is a special case where we need to modify a offset calculated on start, since the
+		// following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the
+		// next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't
+		// the document, which means that the scroll is included in the initial calculation of the
+		// offset of the parent, and never recalculated upon drag
+		if ( this.cssPosition === "absolute" && this.scrollParent[ 0 ] !== document &&
+				$.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) {
 			po.left += this.scrollParent.scrollLeft();
 			po.top += this.scrollParent.scrollTop();
 		}
@@ -6256,8 +2444,8 @@ $.widget("ui.draggable", $.ui.mouse, {
 		}
 
 		return {
-			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"), 10) || 0),
-			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"), 10) || 0)
+			top: po.top + ( parseInt( this.offsetParent.css( "borderTopWidth" ), 10 ) || 0 ),
+			left: po.left + ( parseInt( this.offsetParent.css( "borderLeftWidth" ), 10 ) || 0 )
 		};
 
 	},
@@ -6271,18 +2459,20 @@ $.widget("ui.draggable", $.ui.mouse, {
 			scrollIsRootNode = this._isRootNode( this.scrollParent[ 0 ] );
 
 		return {
-			top: p.top - ( parseInt(this.helper.css( "top" ), 10) || 0 ) + ( !scrollIsRootNode ? this.scrollParent.scrollTop() : 0 ),
-			left: p.left - ( parseInt(this.helper.css( "left" ), 10) || 0 ) + ( !scrollIsRootNode ? this.scrollParent.scrollLeft() : 0 )
+			top: p.top - ( parseInt( this.helper.css( "top" ), 10 ) || 0 ) +
+				( !scrollIsRootNode ? this.scrollParent.scrollTop() : 0 ),
+			left: p.left - ( parseInt( this.helper.css( "left" ), 10 ) || 0 ) +
+				( !scrollIsRootNode ? this.scrollParent.scrollLeft() : 0 )
 		};
 
 	},
 
 	_cacheMargins: function() {
 		this.margins = {
-			left: (parseInt(this.element.css("marginLeft"), 10) || 0),
-			top: (parseInt(this.element.css("marginTop"), 10) || 0),
-			right: (parseInt(this.element.css("marginRight"), 10) || 0),
-			bottom: (parseInt(this.element.css("marginBottom"), 10) || 0)
+			left: ( parseInt( this.element.css( "marginLeft" ), 10 ) || 0 ),
+			top: ( parseInt( this.element.css( "marginTop" ), 10 ) || 0 ),
+			right: ( parseInt( this.element.css( "marginRight" ), 10 ) || 0 ),
+			bottom: ( parseInt( this.element.css( "marginBottom" ), 10 ) || 0 )
 		};
 	},
 
@@ -6310,18 +2500,22 @@ $.widget("ui.draggable", $.ui.mouse, {
 			this.containment = [
 				$( window ).scrollLeft() - this.offset.relative.left - this.offset.parent.left,
 				$( window ).scrollTop() - this.offset.relative.top - this.offset.parent.top,
-				$( window ).scrollLeft() + $( window ).width() - this.helperProportions.width - this.margins.left,
-				$( window ).scrollTop() + ( $( window ).height() || document.body.parentNode.scrollHeight ) - this.helperProportions.height - this.margins.top
+				$( window ).scrollLeft() + $( window ).width() -
+					this.helperProportions.width - this.margins.left,
+				$( window ).scrollTop() +
+					( $( window ).height() || document.body.parentNode.scrollHeight ) -
+					this.helperProportions.height - this.margins.top
 			];
 			return;
 		}
 
-		if ( o.containment === "document") {
+		if ( o.containment === "document" ) {
 			this.containment = [
 				0,
 				0,
 				$( document ).width() - this.helperProportions.width - this.margins.left,
-				( $( document ).height() || document.body.parentNode.scrollHeight ) - this.helperProportions.height - this.margins.top
+				( $( document ).height() || document.body.parentNode.scrollHeight ) -
+					this.helperProportions.height - this.margins.top
 			];
 			return;
 		}
@@ -6345,8 +2539,10 @@ $.widget("ui.draggable", $.ui.mouse, {
 		isUserScrollable = /(scroll|auto)/.test( c.css( "overflow" ) );
 
 		this.containment = [
-			( parseInt( c.css( "borderLeftWidth" ), 10 ) || 0 ) + ( parseInt( c.css( "paddingLeft" ), 10 ) || 0 ),
-			( parseInt( c.css( "borderTopWidth" ), 10 ) || 0 ) + ( parseInt( c.css( "paddingTop" ), 10 ) || 0 ),
+			( parseInt( c.css( "borderLeftWidth" ), 10 ) || 0 ) +
+				( parseInt( c.css( "paddingLeft" ), 10 ) || 0 ),
+			( parseInt( c.css( "borderTopWidth" ), 10 ) || 0 ) +
+				( parseInt( c.css( "paddingTop" ), 10 ) || 0 ),
 			( isUserScrollable ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) -
 				( parseInt( c.css( "borderRightWidth" ), 10 ) || 0 ) -
 				( parseInt( c.css( "paddingRight" ), 10 ) || 0 ) -
@@ -6363,9 +2559,9 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this.relativeContainer = c;
 	},
 
-	_convertPositionTo: function(d, pos) {
+	_convertPositionTo: function( d, pos ) {
 
-		if (!pos) {
+		if ( !pos ) {
 			pos = this.position;
 		}
 
@@ -6374,16 +2570,32 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 		return {
 			top: (
-				pos.top	+																// The absolute mouse position
-				this.offset.relative.top * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.top * mod -										// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.offset.scroll.top : ( scrollIsRootNode ? 0 : this.offset.scroll.top ) ) * mod)
+
+				// The absolute mouse position
+				pos.top	+
+
+				// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.relative.top * mod +
+
+				// The offsetParent's offset without borders (offset + border)
+				this.offset.parent.top * mod -
+				( ( this.cssPosition === "fixed" ?
+					-this.offset.scroll.top :
+					( scrollIsRootNode ? 0 : this.offset.scroll.top ) ) * mod )
 			),
 			left: (
-				pos.left +																// The absolute mouse position
-				this.offset.relative.left * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.left * mod	-										// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.offset.scroll.left : ( scrollIsRootNode ? 0 : this.offset.scroll.left ) ) * mod)
+
+				// The absolute mouse position
+				pos.left +
+
+				// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.relative.left * mod +
+
+				// The offsetParent's offset without borders (offset + border)
+				this.offset.parent.left * mod	-
+				( ( this.cssPosition === "fixed" ?
+					-this.offset.scroll.left :
+					( scrollIsRootNode ? 0 : this.offset.scroll.left ) ) * mod )
 			)
 		};
 
@@ -6413,7 +2625,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 		// If we are not dragging yet, we won't check for options
 		if ( constrainPosition ) {
 			if ( this.containment ) {
-				if ( this.relativeContainer ){
+				if ( this.relativeContainer ) {
 					co = this.relativeContainer.offset();
 					containment = [
 						this.containment[ 0 ] + co.left,
@@ -6425,27 +2637,40 @@ $.widget("ui.draggable", $.ui.mouse, {
 					containment = this.containment;
 				}
 
-				if (event.pageX - this.offset.click.left < containment[0]) {
-					pageX = containment[0] + this.offset.click.left;
+				if ( event.pageX - this.offset.click.left < containment[ 0 ] ) {
+					pageX = containment[ 0 ] + this.offset.click.left;
 				}
-				if (event.pageY - this.offset.click.top < containment[1]) {
-					pageY = containment[1] + this.offset.click.top;
+				if ( event.pageY - this.offset.click.top < containment[ 1 ] ) {
+					pageY = containment[ 1 ] + this.offset.click.top;
 				}
-				if (event.pageX - this.offset.click.left > containment[2]) {
-					pageX = containment[2] + this.offset.click.left;
+				if ( event.pageX - this.offset.click.left > containment[ 2 ] ) {
+					pageX = containment[ 2 ] + this.offset.click.left;
 				}
-				if (event.pageY - this.offset.click.top > containment[3]) {
-					pageY = containment[3] + this.offset.click.top;
+				if ( event.pageY - this.offset.click.top > containment[ 3 ] ) {
+					pageY = containment[ 3 ] + this.offset.click.top;
 				}
 			}
 
-			if (o.grid) {
-				//Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE (see ticket #6950)
-				top = o.grid[1] ? this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1] : this.originalPageY;
-				pageY = containment ? ((top - this.offset.click.top >= containment[1] || top - this.offset.click.top > containment[3]) ? top : ((top - this.offset.click.top >= containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+			if ( o.grid ) {
 
-				left = o.grid[0] ? this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0] : this.originalPageX;
-				pageX = containment ? ((left - this.offset.click.left >= containment[0] || left - this.offset.click.left > containment[2]) ? left : ((left - this.offset.click.left >= containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+				//Check for grid elements set to 0 to prevent divide by 0 error causing invalid
+				// argument errors in IE (see ticket #6950)
+				top = o.grid[ 1 ] ? this.originalPageY + Math.round( ( pageY -
+					this.originalPageY ) / o.grid[ 1 ] ) * o.grid[ 1 ] : this.originalPageY;
+				pageY = containment ? ( ( top - this.offset.click.top >= containment[ 1 ] ||
+					top - this.offset.click.top > containment[ 3 ] ) ?
+						top :
+						( ( top - this.offset.click.top >= containment[ 1 ] ) ?
+							top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) : top;
+
+				left = o.grid[ 0 ] ? this.originalPageX +
+					Math.round( ( pageX - this.originalPageX ) / o.grid[ 0 ] ) * o.grid[ 0 ] :
+					this.originalPageX;
+				pageX = containment ? ( ( left - this.offset.click.left >= containment[ 0 ] ||
+					left - this.offset.click.left > containment[ 2 ] ) ?
+						left :
+						( ( left - this.offset.click.left >= containment[ 0 ] ) ?
+							left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) : left;
 			}
 
 			if ( o.axis === "y" ) {
@@ -6459,26 +2684,46 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 		return {
 			top: (
-				pageY -																	// The absolute mouse position
-				this.offset.click.top	-												// Click offset (relative to the element)
-				this.offset.relative.top -												// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.top +												// The offsetParent's offset without borders (offset + border)
-				( this.cssPosition === "fixed" ? -this.offset.scroll.top : ( scrollIsRootNode ? 0 : this.offset.scroll.top ) )
+
+				// The absolute mouse position
+				pageY -
+
+				// Click offset (relative to the element)
+				this.offset.click.top -
+
+				// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.relative.top -
+
+				// The offsetParent's offset without borders (offset + border)
+				this.offset.parent.top +
+				( this.cssPosition === "fixed" ?
+					-this.offset.scroll.top :
+					( scrollIsRootNode ? 0 : this.offset.scroll.top ) )
 			),
 			left: (
-				pageX -																	// The absolute mouse position
-				this.offset.click.left -												// Click offset (relative to the element)
-				this.offset.relative.left -												// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.left +												// The offsetParent's offset without borders (offset + border)
-				( this.cssPosition === "fixed" ? -this.offset.scroll.left : ( scrollIsRootNode ? 0 : this.offset.scroll.left ) )
+
+				// The absolute mouse position
+				pageX -
+
+				// Click offset (relative to the element)
+				this.offset.click.left -
+
+				// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.relative.left -
+
+				// The offsetParent's offset without borders (offset + border)
+				this.offset.parent.left +
+				( this.cssPosition === "fixed" ?
+					-this.offset.scroll.left :
+					( scrollIsRootNode ? 0 : this.offset.scroll.left ) )
 			)
 		};
 
 	},
 
 	_clear: function() {
-		this.helper.removeClass("ui-draggable-dragging");
-		if (this.helper[0] !== this.element[0] && !this.cancelHelperRemoval) {
+		this._removeClass( this.helper, "ui-draggable-dragging" );
+		if ( this.helper[ 0 ] !== this.element[ 0 ] && !this.cancelHelperRemoval ) {
 			this.helper.remove();
 		}
 		this.helper = null;
@@ -6488,17 +2733,6 @@ $.widget("ui.draggable", $.ui.mouse, {
 		}
 	},
 
-	_normalizeRightBottom: function() {
-		if ( this.options.axis !== "y" && this.helper.css( "right" ) !== "auto" ) {
-			this.helper.width( this.helper.width() );
-			this.helper.css( "right", "auto" );
-		}
-		if ( this.options.axis !== "x" && this.helper.css( "bottom" ) !== "auto" ) {
-			this.helper.height( this.helper.height() );
-			this.helper.css( "bottom", "auto" );
-		}
-	},
-
 	// From now on bulk stuff - mainly helpers
 
 	_trigger: function( type, event, ui ) {
@@ -6524,33 +2758,33 @@ $.widget("ui.draggable", $.ui.mouse, {
 		};
 	}
 
-});
+} );
 
 $.ui.plugin.add( "draggable", "connectToSortable", {
 	start: function( event, ui, draggable ) {
 		var uiSortable = $.extend( {}, ui, {
 			item: draggable.element
-		});
+		} );
 
 		draggable.sortables = [];
-		$( draggable.options.connectToSortable ).each(function() {
+		$( draggable.options.connectToSortable ).each( function() {
 			var sortable = $( this ).sortable( "instance" );
 
 			if ( sortable && !sortable.options.disabled ) {
 				draggable.sortables.push( sortable );
 
-				// refreshPositions is called at drag start to refresh the containerCache
+				// RefreshPositions is called at drag start to refresh the containerCache
 				// which is used in drag. This ensures it's initialized and synchronized
 				// with any changes that might have happened on the page since initialization.
 				sortable.refreshPositions();
-				sortable._trigger("activate", event, uiSortable);
+				sortable._trigger( "activate", event, uiSortable );
 			}
-		});
+		} );
 	},
 	stop: function( event, ui, draggable ) {
 		var uiSortable = $.extend( {}, ui, {
 			item: draggable.element
-		});
+		} );
 
 		draggable.cancelHelperRemoval = false;
 
@@ -6573,12 +2807,13 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 					left: sortable.placeholder.css( "left" )
 				};
 
-				sortable._mouseStop(event);
+				sortable._mouseStop( event );
 
 				// Once drag has ended, the sortable should return to using
 				// its original helper, not the shared helper from draggable
 				sortable.options.helper = sortable.options._helper;
 			} else {
+
 				// Prevent this Sortable from removing the helper.
 				// However, don't set the draggable to remove the helper
 				// either as another connected Sortable may yet handle the removal.
@@ -6586,7 +2821,7 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 
 				sortable._trigger( "deactivate", event, uiSortable );
 			}
-		});
+		} );
 	},
 	drag: function( event, ui, draggable ) {
 		$.each( draggable.sortables, function() {
@@ -6602,6 +2837,7 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 				innermostIntersecting = true;
 
 				$.each( draggable.sortables, function() {
+
 					// Copy over variables that sortable's _intersectsWith uses
 					this.positionAbs = draggable.positionAbs;
 					this.helperProportions = draggable.helperProportions;
@@ -6614,10 +2850,11 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 					}
 
 					return innermostIntersecting;
-				});
+				} );
 			}
 
 			if ( innermostIntersecting ) {
+
 				// If it intersects, we use a little isOver variable and set it once,
 				// so that the move-in stuff gets fired only once.
 				if ( !sortable.isOver ) {
@@ -6662,21 +2899,23 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 					// adding to one sortable changes the location of the other sortables (#9675)
 					$.each( draggable.sortables, function() {
 						this.refreshPositions();
-					});
+					} );
 
-					// hack so receive/update callbacks work (mostly)
+					// Hack so receive/update callbacks work (mostly)
 					draggable.currentItem = draggable.element;
 					sortable.fromOutside = draggable;
 				}
 
 				if ( sortable.currentItem ) {
 					sortable._mouseDrag( event );
+
 					// Copy the sortable's position because the draggable's can potentially reflect
 					// a relative position, while sortable is always absolute, which the dragged
 					// element has now become. (#8809)
 					ui.position = sortable.position;
 				}
 			} else {
+
 				// If it doesn't intersect with the sortable, and it intersected before,
 				// we fake the drag stop of the sortable, but make sure it doesn't remove
 				// the helper by using cancelHelperRemoval.
@@ -6693,7 +2932,7 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 					sortable._trigger( "out", event, sortable._uiHash( sortable ) );
 					sortable._mouseStop( event, true );
 
-					// restore sortable behaviors that were modfied
+					// Restore sortable behaviors that were modfied
 					// when the draggable entered the sortable area (#9481)
 					sortable.options.revert = sortable.options._revert;
 					sortable.options.helper = sortable.options._helper;
@@ -6717,55 +2956,56 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
 					// from one sortable changes the location of other sortables (#9675)
 					$.each( draggable.sortables, function() {
 						this.refreshPositions();
-					});
+					} );
 				}
 			}
-		});
+		} );
 	}
-});
+} );
 
-$.ui.plugin.add("draggable", "cursor", {
+$.ui.plugin.add( "draggable", "cursor", {
 	start: function( event, ui, instance ) {
 		var t = $( "body" ),
 			o = instance.options;
 
-		if (t.css("cursor")) {
-			o._cursor = t.css("cursor");
+		if ( t.css( "cursor" ) ) {
+			o._cursor = t.css( "cursor" );
 		}
-		t.css("cursor", o.cursor);
+		t.css( "cursor", o.cursor );
 	},
 	stop: function( event, ui, instance ) {
 		var o = instance.options;
-		if (o._cursor) {
-			$("body").css("cursor", o._cursor);
+		if ( o._cursor ) {
+			$( "body" ).css( "cursor", o._cursor );
 		}
 	}
-});
+} );
 
-$.ui.plugin.add("draggable", "opacity", {
+$.ui.plugin.add( "draggable", "opacity", {
 	start: function( event, ui, instance ) {
 		var t = $( ui.helper ),
 			o = instance.options;
-		if (t.css("opacity")) {
-			o._opacity = t.css("opacity");
+		if ( t.css( "opacity" ) ) {
+			o._opacity = t.css( "opacity" );
 		}
-		t.css("opacity", o.opacity);
+		t.css( "opacity", o.opacity );
 	},
 	stop: function( event, ui, instance ) {
 		var o = instance.options;
-		if (o._opacity) {
-			$(ui.helper).css("opacity", o._opacity);
+		if ( o._opacity ) {
+			$( ui.helper ).css( "opacity", o._opacity );
 		}
 	}
-});
+} );
 
-$.ui.plugin.add("draggable", "scroll", {
+$.ui.plugin.add( "draggable", "scroll", {
 	start: function( event, ui, i ) {
 		if ( !i.scrollParentNotHidden ) {
 			i.scrollParentNotHidden = i.helper.scrollParent( false );
 		}
 
-		if ( i.scrollParentNotHidden[ 0 ] !== i.document[ 0 ] && i.scrollParentNotHidden[ 0 ].tagName !== "HTML" ) {
+		if ( i.scrollParentNotHidden[ 0 ] !== i.document[ 0 ] &&
+				i.scrollParentNotHidden[ 0 ].tagName !== "HTML" ) {
 			i.overflowOffset = i.scrollParentNotHidden.offset();
 		}
 	},
@@ -6778,7 +3018,8 @@ $.ui.plugin.add("draggable", "scroll", {
 
 		if ( scrollParent !== document && scrollParent.tagName !== "HTML" ) {
 			if ( !o.axis || o.axis !== "x" ) {
-				if ( ( i.overflowOffset.top + scrollParent.offsetHeight ) - event.pageY < o.scrollSensitivity ) {
+				if ( ( i.overflowOffset.top + scrollParent.offsetHeight ) - event.pageY <
+						o.scrollSensitivity ) {
 					scrollParent.scrollTop = scrolled = scrollParent.scrollTop + o.scrollSpeed;
 				} else if ( event.pageY - i.overflowOffset.top < o.scrollSensitivity ) {
 					scrollParent.scrollTop = scrolled = scrollParent.scrollTop - o.scrollSpeed;
@@ -6786,7 +3027,8 @@ $.ui.plugin.add("draggable", "scroll", {
 			}
 
 			if ( !o.axis || o.axis !== "y" ) {
-				if ( ( i.overflowOffset.left + scrollParent.offsetWidth ) - event.pageX < o.scrollSensitivity ) {
+				if ( ( i.overflowOffset.left + scrollParent.offsetWidth ) - event.pageX <
+						o.scrollSensitivity ) {
 					scrollParent.scrollLeft = scrolled = scrollParent.scrollLeft + o.scrollSpeed;
 				} else if ( event.pageX - i.overflowOffset.left < o.scrollSensitivity ) {
 					scrollParent.scrollLeft = scrolled = scrollParent.scrollLeft - o.scrollSpeed;
@@ -6795,49 +3037,56 @@ $.ui.plugin.add("draggable", "scroll", {
 
 		} else {
 
-			if (!o.axis || o.axis !== "x") {
-				if (event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
-					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-				} else if ($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
-					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+			if ( !o.axis || o.axis !== "x" ) {
+				if ( event.pageY - $( document ).scrollTop() < o.scrollSensitivity ) {
+					scrolled = $( document ).scrollTop( $( document ).scrollTop() - o.scrollSpeed );
+				} else if ( $( window ).height() - ( event.pageY - $( document ).scrollTop() ) <
+						o.scrollSensitivity ) {
+					scrolled = $( document ).scrollTop( $( document ).scrollTop() + o.scrollSpeed );
 				}
 			}
 
-			if (!o.axis || o.axis !== "y") {
-				if (event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
-					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-				} else if ($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
-					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+			if ( !o.axis || o.axis !== "y" ) {
+				if ( event.pageX - $( document ).scrollLeft() < o.scrollSensitivity ) {
+					scrolled = $( document ).scrollLeft(
+						$( document ).scrollLeft() - o.scrollSpeed
+					);
+				} else if ( $( window ).width() - ( event.pageX - $( document ).scrollLeft() ) <
+						o.scrollSensitivity ) {
+					scrolled = $( document ).scrollLeft(
+						$( document ).scrollLeft() + o.scrollSpeed
+					);
 				}
 			}
 
 		}
 
-		if (scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
-			$.ui.ddmanager.prepareOffsets(i, event);
+		if ( scrolled !== false && $.ui.ddmanager && !o.dropBehaviour ) {
+			$.ui.ddmanager.prepareOffsets( i, event );
 		}
 
 	}
-});
+} );
 
-$.ui.plugin.add("draggable", "snap", {
+$.ui.plugin.add( "draggable", "snap", {
 	start: function( event, ui, i ) {
 
 		var o = i.options;
 
 		i.snapElements = [];
 
-		$(o.snap.constructor !== String ? ( o.snap.items || ":data(ui-draggable)" ) : o.snap).each(function() {
-			var $t = $(this),
-				$o = $t.offset();
-			if (this !== i.element[0]) {
-				i.snapElements.push({
-					item: this,
-					width: $t.outerWidth(), height: $t.outerHeight(),
-					top: $o.top, left: $o.left
-				});
-			}
-		});
+		$( o.snap.constructor !== String ? ( o.snap.items || ":data(ui-draggable)" ) : o.snap )
+			.each( function() {
+				var $t = $( this ),
+					$o = $t.offset();
+				if ( this !== i.element[ 0 ] ) {
+					i.snapElements.push( {
+						item: this,
+						width: $t.outerWidth(), height: $t.outerHeight(),
+						top: $o.top, left: $o.left
+					} );
+				}
+			} );
 
 	},
 	drag: function( event, ui, inst ) {
@@ -6848,125 +3097,652 @@ $.ui.plugin.add("draggable", "snap", {
 			x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
 			y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
 
-		for (i = inst.snapElements.length - 1; i >= 0; i--){
+		for ( i = inst.snapElements.length - 1; i >= 0; i-- ) {
 
-			l = inst.snapElements[i].left - inst.margins.left;
-			r = l + inst.snapElements[i].width;
-			t = inst.snapElements[i].top - inst.margins.top;
-			b = t + inst.snapElements[i].height;
+			l = inst.snapElements[ i ].left - inst.margins.left;
+			r = l + inst.snapElements[ i ].width;
+			t = inst.snapElements[ i ].top - inst.margins.top;
+			b = t + inst.snapElements[ i ].height;
 
-			if ( x2 < l - d || x1 > r + d || y2 < t - d || y1 > b + d || !$.contains( inst.snapElements[ i ].item.ownerDocument, inst.snapElements[ i ].item ) ) {
-				if (inst.snapElements[i].snapping) {
-					(inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+			if ( x2 < l - d || x1 > r + d || y2 < t - d || y1 > b + d ||
+					!$.contains( inst.snapElements[ i ].item.ownerDocument,
+					inst.snapElements[ i ].item ) ) {
+				if ( inst.snapElements[ i ].snapping ) {
+					( inst.options.snap.release &&
+						inst.options.snap.release.call(
+							inst.element,
+							event,
+							$.extend( inst._uiHash(), { snapItem: inst.snapElements[ i ].item } )
+						) );
 				}
-				inst.snapElements[i].snapping = false;
+				inst.snapElements[ i ].snapping = false;
 				continue;
 			}
 
-			if (o.snapMode !== "inner") {
-				ts = Math.abs(t - y2) <= d;
-				bs = Math.abs(b - y1) <= d;
-				ls = Math.abs(l - x2) <= d;
-				rs = Math.abs(r - x1) <= d;
-				if (ts) {
-					ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top;
+			if ( o.snapMode !== "inner" ) {
+				ts = Math.abs( t - y2 ) <= d;
+				bs = Math.abs( b - y1 ) <= d;
+				ls = Math.abs( l - x2 ) <= d;
+				rs = Math.abs( r - x1 ) <= d;
+				if ( ts ) {
+					ui.position.top = inst._convertPositionTo( "relative", {
+						top: t - inst.helperProportions.height,
+						left: 0
+					} ).top;
 				}
-				if (bs) {
-					ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top;
+				if ( bs ) {
+					ui.position.top = inst._convertPositionTo( "relative", {
+						top: b,
+						left: 0
+					} ).top;
 				}
-				if (ls) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left;
+				if ( ls ) {
+					ui.position.left = inst._convertPositionTo( "relative", {
+						top: 0,
+						left: l - inst.helperProportions.width
+					} ).left;
 				}
-				if (rs) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left;
+				if ( rs ) {
+					ui.position.left = inst._convertPositionTo( "relative", {
+						top: 0,
+						left: r
+					} ).left;
 				}
 			}
 
-			first = (ts || bs || ls || rs);
+			first = ( ts || bs || ls || rs );
 
-			if (o.snapMode !== "outer") {
-				ts = Math.abs(t - y1) <= d;
-				bs = Math.abs(b - y2) <= d;
-				ls = Math.abs(l - x1) <= d;
-				rs = Math.abs(r - x2) <= d;
-				if (ts) {
-					ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top;
+			if ( o.snapMode !== "outer" ) {
+				ts = Math.abs( t - y1 ) <= d;
+				bs = Math.abs( b - y2 ) <= d;
+				ls = Math.abs( l - x1 ) <= d;
+				rs = Math.abs( r - x2 ) <= d;
+				if ( ts ) {
+					ui.position.top = inst._convertPositionTo( "relative", {
+						top: t,
+						left: 0
+					} ).top;
 				}
-				if (bs) {
-					ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top;
+				if ( bs ) {
+					ui.position.top = inst._convertPositionTo( "relative", {
+						top: b - inst.helperProportions.height,
+						left: 0
+					} ).top;
 				}
-				if (ls) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left;
+				if ( ls ) {
+					ui.position.left = inst._convertPositionTo( "relative", {
+						top: 0,
+						left: l
+					} ).left;
 				}
-				if (rs) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left;
+				if ( rs ) {
+					ui.position.left = inst._convertPositionTo( "relative", {
+						top: 0,
+						left: r - inst.helperProportions.width
+					} ).left;
 				}
 			}
 
-			if (!inst.snapElements[i].snapping && (ts || bs || ls || rs || first)) {
-				(inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+			if ( !inst.snapElements[ i ].snapping && ( ts || bs || ls || rs || first ) ) {
+				( inst.options.snap.snap &&
+					inst.options.snap.snap.call(
+						inst.element,
+						event,
+						$.extend( inst._uiHash(), {
+							snapItem: inst.snapElements[ i ].item
+						} ) ) );
 			}
-			inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
+			inst.snapElements[ i ].snapping = ( ts || bs || ls || rs || first );
 
 		}
 
 	}
-});
+} );
 
-$.ui.plugin.add("draggable", "stack", {
+$.ui.plugin.add( "draggable", "stack", {
 	start: function( event, ui, instance ) {
 		var min,
 			o = instance.options,
-			group = $.makeArray($(o.stack)).sort(function(a, b) {
-				return (parseInt($(a).css("zIndex"), 10) || 0) - (parseInt($(b).css("zIndex"), 10) || 0);
-			});
+			group = $.makeArray( $( o.stack ) ).sort( function( a, b ) {
+				return ( parseInt( $( a ).css( "zIndex" ), 10 ) || 0 ) -
+					( parseInt( $( b ).css( "zIndex" ), 10 ) || 0 );
+			} );
 
-		if (!group.length) { return; }
+		if ( !group.length ) { return; }
 
-		min = parseInt($(group[0]).css("zIndex"), 10) || 0;
-		$(group).each(function(i) {
-			$(this).css("zIndex", min + i);
-		});
-		this.css("zIndex", (min + group.length));
+		min = parseInt( $( group[ 0 ] ).css( "zIndex" ), 10 ) || 0;
+		$( group ).each( function( i ) {
+			$( this ).css( "zIndex", min + i );
+		} );
+		this.css( "zIndex", ( min + group.length ) );
 	}
-});
+} );
 
-$.ui.plugin.add("draggable", "zIndex", {
+$.ui.plugin.add( "draggable", "zIndex", {
 	start: function( event, ui, instance ) {
 		var t = $( ui.helper ),
 			o = instance.options;
 
-		if (t.css("zIndex")) {
-			o._zIndex = t.css("zIndex");
+		if ( t.css( "zIndex" ) ) {
+			o._zIndex = t.css( "zIndex" );
 		}
-		t.css("zIndex", o.zIndex);
+		t.css( "zIndex", o.zIndex );
 	},
 	stop: function( event, ui, instance ) {
 		var o = instance.options;
 
-		if (o._zIndex) {
-			$(ui.helper).css("zIndex", o._zIndex);
+		if ( o._zIndex ) {
+			$( ui.helper ).css( "zIndex", o._zIndex );
 		}
 	}
-});
+} );
 
-var draggable = $.ui.draggable;
+var widgetsDraggable = $.ui.draggable;
 
 
 /*!
- * jQuery UI Resizable 1.11.4
+ * jQuery UI Droppable 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/resizable/
  */
 
+//>>label: Droppable
+//>>group: Interactions
+//>>description: Enables drop targets for draggable elements.
+//>>docs: http://api.jqueryui.com/droppable/
+//>>demos: http://jqueryui.com/droppable/
 
-$.widget("ui.resizable", $.ui.mouse, {
-	version: "1.11.4",
+
+
+$.widget( "ui.droppable", {
+	version: "1.12.1",
+	widgetEventPrefix: "drop",
+	options: {
+		accept: "*",
+		addClasses: true,
+		greedy: false,
+		scope: "default",
+		tolerance: "intersect",
+
+		// Callbacks
+		activate: null,
+		deactivate: null,
+		drop: null,
+		out: null,
+		over: null
+	},
+	_create: function() {
+
+		var proportions,
+			o = this.options,
+			accept = o.accept;
+
+		this.isover = false;
+		this.isout = true;
+
+		this.accept = $.isFunction( accept ) ? accept : function( d ) {
+			return d.is( accept );
+		};
+
+		this.proportions = function( /* valueToWrite */ ) {
+			if ( arguments.length ) {
+
+				// Store the droppable's proportions
+				proportions = arguments[ 0 ];
+			} else {
+
+				// Retrieve or derive the droppable's proportions
+				return proportions ?
+					proportions :
+					proportions = {
+						width: this.element[ 0 ].offsetWidth,
+						height: this.element[ 0 ].offsetHeight
+					};
+			}
+		};
+
+		this._addToManager( o.scope );
+
+		o.addClasses && this._addClass( "ui-droppable" );
+
+	},
+
+	_addToManager: function( scope ) {
+
+		// Add the reference and positions to the manager
+		$.ui.ddmanager.droppables[ scope ] = $.ui.ddmanager.droppables[ scope ] || [];
+		$.ui.ddmanager.droppables[ scope ].push( this );
+	},
+
+	_splice: function( drop ) {
+		var i = 0;
+		for ( ; i < drop.length; i++ ) {
+			if ( drop[ i ] === this ) {
+				drop.splice( i, 1 );
+			}
+		}
+	},
+
+	_destroy: function() {
+		var drop = $.ui.ddmanager.droppables[ this.options.scope ];
+
+		this._splice( drop );
+	},
+
+	_setOption: function( key, value ) {
+
+		if ( key === "accept" ) {
+			this.accept = $.isFunction( value ) ? value : function( d ) {
+				return d.is( value );
+			};
+		} else if ( key === "scope" ) {
+			var drop = $.ui.ddmanager.droppables[ this.options.scope ];
+
+			this._splice( drop );
+			this._addToManager( value );
+		}
+
+		this._super( key, value );
+	},
+
+	_activate: function( event ) {
+		var draggable = $.ui.ddmanager.current;
+
+		this._addActiveClass();
+		if ( draggable ) {
+			this._trigger( "activate", event, this.ui( draggable ) );
+		}
+	},
+
+	_deactivate: function( event ) {
+		var draggable = $.ui.ddmanager.current;
+
+		this._removeActiveClass();
+		if ( draggable ) {
+			this._trigger( "deactivate", event, this.ui( draggable ) );
+		}
+	},
+
+	_over: function( event ) {
+
+		var draggable = $.ui.ddmanager.current;
+
+		// Bail if draggable and droppable are same element
+		if ( !draggable || ( draggable.currentItem ||
+				draggable.element )[ 0 ] === this.element[ 0 ] ) {
+			return;
+		}
+
+		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem ||
+				draggable.element ) ) ) {
+			this._addHoverClass();
+			this._trigger( "over", event, this.ui( draggable ) );
+		}
+
+	},
+
+	_out: function( event ) {
+
+		var draggable = $.ui.ddmanager.current;
+
+		// Bail if draggable and droppable are same element
+		if ( !draggable || ( draggable.currentItem ||
+				draggable.element )[ 0 ] === this.element[ 0 ] ) {
+			return;
+		}
+
+		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem ||
+				draggable.element ) ) ) {
+			this._removeHoverClass();
+			this._trigger( "out", event, this.ui( draggable ) );
+		}
+
+	},
+
+	_drop: function( event, custom ) {
+
+		var draggable = custom || $.ui.ddmanager.current,
+			childrenIntersection = false;
+
+		// Bail if draggable and droppable are same element
+		if ( !draggable || ( draggable.currentItem ||
+				draggable.element )[ 0 ] === this.element[ 0 ] ) {
+			return false;
+		}
+
+		this.element
+			.find( ":data(ui-droppable)" )
+			.not( ".ui-draggable-dragging" )
+			.each( function() {
+				var inst = $( this ).droppable( "instance" );
+				if (
+					inst.options.greedy &&
+					!inst.options.disabled &&
+					inst.options.scope === draggable.options.scope &&
+					inst.accept.call(
+						inst.element[ 0 ], ( draggable.currentItem || draggable.element )
+					) &&
+					intersect(
+						draggable,
+						$.extend( inst, { offset: inst.element.offset() } ),
+						inst.options.tolerance, event
+					)
+				) {
+					childrenIntersection = true;
+					return false; }
+			} );
+		if ( childrenIntersection ) {
+			return false;
+		}
+
+		if ( this.accept.call( this.element[ 0 ],
+				( draggable.currentItem || draggable.element ) ) ) {
+			this._removeActiveClass();
+			this._removeHoverClass();
+
+			this._trigger( "drop", event, this.ui( draggable ) );
+			return this.element;
+		}
+
+		return false;
+
+	},
+
+	ui: function( c ) {
+		return {
+			draggable: ( c.currentItem || c.element ),
+			helper: c.helper,
+			position: c.position,
+			offset: c.positionAbs
+		};
+	},
+
+	// Extension points just to make backcompat sane and avoid duplicating logic
+	// TODO: Remove in 1.13 along with call to it below
+	_addHoverClass: function() {
+		this._addClass( "ui-droppable-hover" );
+	},
+
+	_removeHoverClass: function() {
+		this._removeClass( "ui-droppable-hover" );
+	},
+
+	_addActiveClass: function() {
+		this._addClass( "ui-droppable-active" );
+	},
+
+	_removeActiveClass: function() {
+		this._removeClass( "ui-droppable-active" );
+	}
+} );
+
+var intersect = $.ui.intersect = ( function() {
+	function isOverAxis( x, reference, size ) {
+		return ( x >= reference ) && ( x < ( reference + size ) );
+	}
+
+	return function( draggable, droppable, toleranceMode, event ) {
+
+		if ( !droppable.offset ) {
+			return false;
+		}
+
+		var x1 = ( draggable.positionAbs ||
+				draggable.position.absolute ).left + draggable.margins.left,
+			y1 = ( draggable.positionAbs ||
+				draggable.position.absolute ).top + draggable.margins.top,
+			x2 = x1 + draggable.helperProportions.width,
+			y2 = y1 + draggable.helperProportions.height,
+			l = droppable.offset.left,
+			t = droppable.offset.top,
+			r = l + droppable.proportions().width,
+			b = t + droppable.proportions().height;
+
+		switch ( toleranceMode ) {
+		case "fit":
+			return ( l <= x1 && x2 <= r && t <= y1 && y2 <= b );
+		case "intersect":
+			return ( l < x1 + ( draggable.helperProportions.width / 2 ) && // Right Half
+				x2 - ( draggable.helperProportions.width / 2 ) < r && // Left Half
+				t < y1 + ( draggable.helperProportions.height / 2 ) && // Bottom Half
+				y2 - ( draggable.helperProportions.height / 2 ) < b ); // Top Half
+		case "pointer":
+			return isOverAxis( event.pageY, t, droppable.proportions().height ) &&
+				isOverAxis( event.pageX, l, droppable.proportions().width );
+		case "touch":
+			return (
+				( y1 >= t && y1 <= b ) || // Top edge touching
+				( y2 >= t && y2 <= b ) || // Bottom edge touching
+				( y1 < t && y2 > b ) // Surrounded vertically
+			) && (
+				( x1 >= l && x1 <= r ) || // Left edge touching
+				( x2 >= l && x2 <= r ) || // Right edge touching
+				( x1 < l && x2 > r ) // Surrounded horizontally
+			);
+		default:
+			return false;
+		}
+	};
+} )();
+
+/*
+	This manager tracks offsets of draggables and droppables
+*/
+$.ui.ddmanager = {
+	current: null,
+	droppables: { "default": [] },
+	prepareOffsets: function( t, event ) {
+
+		var i, j,
+			m = $.ui.ddmanager.droppables[ t.options.scope ] || [],
+			type = event ? event.type : null, // workaround for #2317
+			list = ( t.currentItem || t.element ).find( ":data(ui-droppable)" ).addBack();
+
+		droppablesLoop: for ( i = 0; i < m.length; i++ ) {
+
+			// No disabled and non-accepted
+			if ( m[ i ].options.disabled || ( t && !m[ i ].accept.call( m[ i ].element[ 0 ],
+					( t.currentItem || t.element ) ) ) ) {
+				continue;
+			}
+
+			// Filter out elements in the current dragged item
+			for ( j = 0; j < list.length; j++ ) {
+				if ( list[ j ] === m[ i ].element[ 0 ] ) {
+					m[ i ].proportions().height = 0;
+					continue droppablesLoop;
+				}
+			}
+
+			m[ i ].visible = m[ i ].element.css( "display" ) !== "none";
+			if ( !m[ i ].visible ) {
+				continue;
+			}
+
+			// Activate the droppable if used directly from draggables
+			if ( type === "mousedown" ) {
+				m[ i ]._activate.call( m[ i ], event );
+			}
+
+			m[ i ].offset = m[ i ].element.offset();
+			m[ i ].proportions( {
+				width: m[ i ].element[ 0 ].offsetWidth,
+				height: m[ i ].element[ 0 ].offsetHeight
+			} );
+
+		}
+
+	},
+	drop: function( draggable, event ) {
+
+		var dropped = false;
+
+		// Create a copy of the droppables in case the list changes during the drop (#9116)
+		$.each( ( $.ui.ddmanager.droppables[ draggable.options.scope ] || [] ).slice(), function() {
+
+			if ( !this.options ) {
+				return;
+			}
+			if ( !this.options.disabled && this.visible &&
+					intersect( draggable, this, this.options.tolerance, event ) ) {
+				dropped = this._drop.call( this, event ) || dropped;
+			}
+
+			if ( !this.options.disabled && this.visible && this.accept.call( this.element[ 0 ],
+					( draggable.currentItem || draggable.element ) ) ) {
+				this.isout = true;
+				this.isover = false;
+				this._deactivate.call( this, event );
+			}
+
+		} );
+		return dropped;
+
+	},
+	dragStart: function( draggable, event ) {
+
+		// Listen for scrolling so that if the dragging causes scrolling the position of the
+		// droppables can be recalculated (see #5003)
+		draggable.element.parentsUntil( "body" ).on( "scroll.droppable", function() {
+			if ( !draggable.options.refreshPositions ) {
+				$.ui.ddmanager.prepareOffsets( draggable, event );
+			}
+		} );
+	},
+	drag: function( draggable, event ) {
+
+		// If you have a highly dynamic page, you might try this option. It renders positions
+		// every time you move the mouse.
+		if ( draggable.options.refreshPositions ) {
+			$.ui.ddmanager.prepareOffsets( draggable, event );
+		}
+
+		// Run through all droppables and check their positions based on specific tolerance options
+		$.each( $.ui.ddmanager.droppables[ draggable.options.scope ] || [], function() {
+
+			if ( this.options.disabled || this.greedyChild || !this.visible ) {
+				return;
+			}
+
+			var parentInstance, scope, parent,
+				intersects = intersect( draggable, this, this.options.tolerance, event ),
+				c = !intersects && this.isover ?
+					"isout" :
+					( intersects && !this.isover ? "isover" : null );
+			if ( !c ) {
+				return;
+			}
+
+			if ( this.options.greedy ) {
+
+				// find droppable parents with same scope
+				scope = this.options.scope;
+				parent = this.element.parents( ":data(ui-droppable)" ).filter( function() {
+					return $( this ).droppable( "instance" ).options.scope === scope;
+				} );
+
+				if ( parent.length ) {
+					parentInstance = $( parent[ 0 ] ).droppable( "instance" );
+					parentInstance.greedyChild = ( c === "isover" );
+				}
+			}
+
+			// We just moved into a greedy child
+			if ( parentInstance && c === "isover" ) {
+				parentInstance.isover = false;
+				parentInstance.isout = true;
+				parentInstance._out.call( parentInstance, event );
+			}
+
+			this[ c ] = true;
+			this[ c === "isout" ? "isover" : "isout" ] = false;
+			this[ c === "isover" ? "_over" : "_out" ].call( this, event );
+
+			// We just moved out of a greedy child
+			if ( parentInstance && c === "isout" ) {
+				parentInstance.isout = false;
+				parentInstance.isover = true;
+				parentInstance._over.call( parentInstance, event );
+			}
+		} );
+
+	},
+	dragStop: function( draggable, event ) {
+		draggable.element.parentsUntil( "body" ).off( "scroll.droppable" );
+
+		// Call prepareOffsets one final time since IE does not fire return scroll events when
+		// overflow was caused by drag (see #5003)
+		if ( !draggable.options.refreshPositions ) {
+			$.ui.ddmanager.prepareOffsets( draggable, event );
+		}
+	}
+};
+
+// DEPRECATED
+// TODO: switch return back to widget declaration at top of file when this is removed
+if ( $.uiBackCompat !== false ) {
+
+	// Backcompat for activeClass and hoverClass options
+	$.widget( "ui.droppable", $.ui.droppable, {
+		options: {
+			hoverClass: false,
+			activeClass: false
+		},
+		_addActiveClass: function() {
+			this._super();
+			if ( this.options.activeClass ) {
+				this.element.addClass( this.options.activeClass );
+			}
+		},
+		_removeActiveClass: function() {
+			this._super();
+			if ( this.options.activeClass ) {
+				this.element.removeClass( this.options.activeClass );
+			}
+		},
+		_addHoverClass: function() {
+			this._super();
+			if ( this.options.hoverClass ) {
+				this.element.addClass( this.options.hoverClass );
+			}
+		},
+		_removeHoverClass: function() {
+			this._super();
+			if ( this.options.hoverClass ) {
+				this.element.removeClass( this.options.hoverClass );
+			}
+		}
+	} );
+}
+
+var widgetsDroppable = $.ui.droppable;
+
+
+/*!
+ * jQuery UI Resizable 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Resizable
+//>>group: Interactions
+//>>description: Enables resize functionality for any element.
+//>>docs: http://api.jqueryui.com/resizable/
+//>>demos: http://jqueryui.com/resizable/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/resizable.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+$.widget( "ui.resizable", $.ui.mouse, {
+	version: "1.12.1",
 	widgetEventPrefix: "resize",
 	options: {
 		alsoResize: false,
@@ -6975,6 +3751,9 @@ $.widget("ui.resizable", $.ui.mouse, {
 		animateEasing: "swing",
 		aspectRatio: false,
 		autoHide: false,
+		classes: {
+			"ui-resizable-se": "ui-icon ui-icon-gripsmall-diagonal-se"
+		},
 		containment: false,
 		ghost: false,
 		grid: false,
@@ -6984,26 +3763,27 @@ $.widget("ui.resizable", $.ui.mouse, {
 		maxWidth: null,
 		minHeight: 10,
 		minWidth: 10,
+
 		// See #7960
 		zIndex: 90,
 
-		// callbacks
+		// Callbacks
 		resize: null,
 		start: null,
 		stop: null
 	},
 
 	_num: function( value ) {
-		return parseInt( value, 10 ) || 0;
+		return parseFloat( value ) || 0;
 	},
 
 	_isNumber: function( value ) {
-		return !isNaN( parseInt( value, 10 ) );
+		return !isNaN( parseFloat( value ) );
 	},
 
 	_hasScroll: function( el, a ) {
 
-		if ( $( el ).css( "overflow" ) === "hidden") {
+		if ( $( el ).css( "overflow" ) === "hidden" ) {
 			return false;
 		}
 
@@ -7025,30 +3805,30 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 	_create: function() {
 
-		var n, i, handle, axis, hname,
-			that = this,
-			o = this.options;
-		this.element.addClass("ui-resizable");
+		var margins,
+			o = this.options,
+			that = this;
+		this._addClass( "ui-resizable" );
 
-		$.extend(this, {
-			_aspectRatio: !!(o.aspectRatio),
+		$.extend( this, {
+			_aspectRatio: !!( o.aspectRatio ),
 			aspectRatio: o.aspectRatio,
 			originalElement: this.element,
 			_proportionallyResizeElements: [],
 			_helper: o.helper || o.ghost || o.animate ? o.helper || "ui-resizable-helper" : null
-		});
+		} );
 
 		// Wrap the element if it cannot hold child nodes
-		if (this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)) {
+		if ( this.element[ 0 ].nodeName.match( /^(canvas|textarea|input|select|button|img)$/i ) ) {
 
 			this.element.wrap(
-				$("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({
-					position: this.element.css("position"),
+				$( "<div class='ui-wrapper' style='overflow: hidden;'></div>" ).css( {
+					position: this.element.css( "position" ),
 					width: this.element.outerWidth(),
 					height: this.element.outerHeight(),
-					top: this.element.css("top"),
-					left: this.element.css("left")
-				})
+					top: this.element.css( "top" ),
+					left: this.element.css( "left" )
+				} )
 			);
 
 			this.element = this.element.parent().data(
@@ -7057,38 +3837,110 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 			this.elementIsWrapper = true;
 
-			this.element.css({
-				marginLeft: this.originalElement.css("marginLeft"),
-				marginTop: this.originalElement.css("marginTop"),
-				marginRight: this.originalElement.css("marginRight"),
-				marginBottom: this.originalElement.css("marginBottom")
-			});
-			this.originalElement.css({
-				marginLeft: 0,
-				marginTop: 0,
-				marginRight: 0,
-				marginBottom: 0
-			});
+			margins = {
+				marginTop: this.originalElement.css( "marginTop" ),
+				marginRight: this.originalElement.css( "marginRight" ),
+				marginBottom: this.originalElement.css( "marginBottom" ),
+				marginLeft: this.originalElement.css( "marginLeft" )
+			};
+
+			this.element.css( margins );
+			this.originalElement.css( "margin", 0 );
+
 			// support: Safari
 			// Prevent Safari textarea resize
-			this.originalResizeStyle = this.originalElement.css("resize");
-			this.originalElement.css("resize", "none");
+			this.originalResizeStyle = this.originalElement.css( "resize" );
+			this.originalElement.css( "resize", "none" );
 
-			this._proportionallyResizeElements.push( this.originalElement.css({
+			this._proportionallyResizeElements.push( this.originalElement.css( {
 				position: "static",
 				zoom: 1,
 				display: "block"
-			}) );
+			} ) );
 
-			// support: IE9
+			// Support: IE9
 			// avoid IE jump (hard set the margin)
-			this.originalElement.css({ margin: this.originalElement.css("margin") });
+			this.originalElement.css( margins );
 
 			this._proportionallyResize();
 		}
 
+		this._setupHandles();
+
+		if ( o.autoHide ) {
+			$( this.element )
+				.on( "mouseenter", function() {
+					if ( o.disabled ) {
+						return;
+					}
+					that._removeClass( "ui-resizable-autohide" );
+					that._handles.show();
+				} )
+				.on( "mouseleave", function() {
+					if ( o.disabled ) {
+						return;
+					}
+					if ( !that.resizing ) {
+						that._addClass( "ui-resizable-autohide" );
+						that._handles.hide();
+					}
+				} );
+		}
+
+		this._mouseInit();
+	},
+
+	_destroy: function() {
+
+		this._mouseDestroy();
+
+		var wrapper,
+			_destroy = function( exp ) {
+				$( exp )
+					.removeData( "resizable" )
+					.removeData( "ui-resizable" )
+					.off( ".resizable" )
+					.find( ".ui-resizable-handle" )
+						.remove();
+			};
+
+		// TODO: Unwrap at same DOM position
+		if ( this.elementIsWrapper ) {
+			_destroy( this.element );
+			wrapper = this.element;
+			this.originalElement.css( {
+				position: wrapper.css( "position" ),
+				width: wrapper.outerWidth(),
+				height: wrapper.outerHeight(),
+				top: wrapper.css( "top" ),
+				left: wrapper.css( "left" )
+			} ).insertAfter( wrapper );
+			wrapper.remove();
+		}
+
+		this.originalElement.css( "resize", this.originalResizeStyle );
+		_destroy( this.originalElement );
+
+		return this;
+	},
+
+	_setOption: function( key, value ) {
+		this._super( key, value );
+
+		switch ( key ) {
+		case "handles":
+			this._removeHandles();
+			this._setupHandles();
+			break;
+		default:
+			break;
+		}
+	},
+
+	_setupHandles: function() {
+		var o = this.options, handle, i, n, hname, axis, that = this;
 		this.handles = o.handles ||
-			( !$(".ui-resizable-handle", this.element).length ?
+			( !$( ".ui-resizable-handle", this.element ).length ?
 				"e,s,se" : {
 					n: ".ui-resizable-n",
 					e: ".ui-resizable-e",
@@ -7103,59 +3955,59 @@ $.widget("ui.resizable", $.ui.mouse, {
 		this._handles = $();
 		if ( this.handles.constructor === String ) {
 
-			if ( this.handles === "all") {
+			if ( this.handles === "all" ) {
 				this.handles = "n,e,s,w,se,sw,ne,nw";
 			}
 
-			n = this.handles.split(",");
+			n = this.handles.split( "," );
 			this.handles = {};
 
-			for (i = 0; i < n.length; i++) {
+			for ( i = 0; i < n.length; i++ ) {
 
-				handle = $.trim(n[i]);
+				handle = $.trim( n[ i ] );
 				hname = "ui-resizable-" + handle;
-				axis = $("<div class='ui-resizable-handle " + hname + "'></div>");
+				axis = $( "<div>" );
+				this._addClass( axis, "ui-resizable-handle " + hname );
 
-				axis.css({ zIndex: o.zIndex });
+				axis.css( { zIndex: o.zIndex } );
 
-				// TODO : What's going on here?
-				if ("se" === handle) {
-					axis.addClass("ui-icon ui-icon-gripsmall-diagonal-se");
-				}
-
-				this.handles[handle] = ".ui-resizable-" + handle;
-				this.element.append(axis);
+				this.handles[ handle ] = ".ui-resizable-" + handle;
+				this.element.append( axis );
 			}
 
 		}
 
-		this._renderAxis = function(target) {
+		this._renderAxis = function( target ) {
 
 			var i, axis, padPos, padWrapper;
 
 			target = target || this.element;
 
-			for (i in this.handles) {
+			for ( i in this.handles ) {
 
-				if (this.handles[i].constructor === String) {
-					this.handles[i] = this.element.children( this.handles[ i ] ).first().show();
+				if ( this.handles[ i ].constructor === String ) {
+					this.handles[ i ] = this.element.children( this.handles[ i ] ).first().show();
 				} else if ( this.handles[ i ].jquery || this.handles[ i ].nodeType ) {
 					this.handles[ i ] = $( this.handles[ i ] );
-					this._on( this.handles[ i ], { "mousedown": that._mouseDown });
+					this._on( this.handles[ i ], { "mousedown": that._mouseDown } );
 				}
 
-				if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)) {
+				if ( this.elementIsWrapper &&
+						this.originalElement[ 0 ]
+							.nodeName
+							.match( /^(textarea|input|select|button)$/i ) ) {
+					axis = $( this.handles[ i ], this.element );
 
-					axis = $(this.handles[i], this.element);
-
-					padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
+					padWrapper = /sw|ne|nw|se|n|s/.test( i ) ?
+						axis.outerHeight() :
+						axis.outerWidth();
 
 					padPos = [ "padding",
-						/ne|nw|n/.test(i) ? "Top" :
-						/se|sw|s/.test(i) ? "Bottom" :
-						/^e$/.test(i) ? "Right" : "Left" ].join("");
+						/ne|nw|n/.test( i ) ? "Top" :
+						/se|sw|s/.test( i ) ? "Bottom" :
+						/^e$/.test( i ) ? "Right" : "Left" ].join( "" );
 
-					target.css(padPos, padWrapper);
+					target.css( padPos, padWrapper );
 
 					this._proportionallyResize();
 				}
@@ -7165,87 +4017,37 @@ $.widget("ui.resizable", $.ui.mouse, {
 		};
 
 		// TODO: make renderAxis a prototype function
-		this._renderAxis(this.element);
+		this._renderAxis( this.element );
 
 		this._handles = this._handles.add( this.element.find( ".ui-resizable-handle" ) );
 		this._handles.disableSelection();
 
-		this._handles.mouseover(function() {
-			if (!that.resizing) {
-				if (this.className) {
-					axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
+		this._handles.on( "mouseover", function() {
+			if ( !that.resizing ) {
+				if ( this.className ) {
+					axis = this.className.match( /ui-resizable-(se|sw|ne|nw|n|e|s|w)/i );
 				}
-				that.axis = axis && axis[1] ? axis[1] : "se";
+				that.axis = axis && axis[ 1 ] ? axis[ 1 ] : "se";
 			}
-		});
+		} );
 
-		if (o.autoHide) {
+		if ( o.autoHide ) {
 			this._handles.hide();
-			$(this.element)
-				.addClass("ui-resizable-autohide")
-				.mouseenter(function() {
-					if (o.disabled) {
-						return;
-					}
-					$(this).removeClass("ui-resizable-autohide");
-					that._handles.show();
-				})
-				.mouseleave(function() {
-					if (o.disabled) {
-						return;
-					}
-					if (!that.resizing) {
-						$(this).addClass("ui-resizable-autohide");
-						that._handles.hide();
-					}
-				});
+			this._addClass( "ui-resizable-autohide" );
 		}
-
-		this._mouseInit();
 	},
 
-	_destroy: function() {
-
-		this._mouseDestroy();
-
-		var wrapper,
-			_destroy = function(exp) {
-				$(exp)
-					.removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing")
-					.removeData("resizable")
-					.removeData("ui-resizable")
-					.unbind(".resizable")
-					.find(".ui-resizable-handle")
-						.remove();
-			};
-
-		// TODO: Unwrap at same DOM position
-		if (this.elementIsWrapper) {
-			_destroy(this.element);
-			wrapper = this.element;
-			this.originalElement.css({
-				position: wrapper.css("position"),
-				width: wrapper.outerWidth(),
-				height: wrapper.outerHeight(),
-				top: wrapper.css("top"),
-				left: wrapper.css("left")
-			}).insertAfter( wrapper );
-			wrapper.remove();
-		}
-
-		this.originalElement.css("resize", this.originalResizeStyle);
-		_destroy(this.originalElement);
-
-		return this;
+	_removeHandles: function() {
+		this._handles.remove();
 	},
 
-	_mouseCapture: function(event) {
+	_mouseCapture: function( event ) {
 		var i, handle,
 			capture = false;
 
-		for (i in this.handles) {
-			handle = $(this.handles[i])[0];
-			if (handle === event.target || $.contains(handle, event.target)) {
+		for ( i in this.handles ) {
+			handle = $( this.handles[ i ] )[ 0 ];
+			if ( handle === event.target || $.contains( handle, event.target ) ) {
 				capture = true;
 			}
 		}
@@ -7253,7 +4055,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 		return !this.options.disabled && capture;
 	},
 
-	_mouseStart: function(event) {
+	_mouseStart: function( event ) {
 
 		var curleft, curtop, cursor,
 			o = this.options,
@@ -7263,12 +4065,12 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 		this._renderProxy();
 
-		curleft = this._num(this.helper.css("left"));
-		curtop = this._num(this.helper.css("top"));
+		curleft = this._num( this.helper.css( "left" ) );
+		curtop = this._num( this.helper.css( "top" ) );
 
-		if (o.containment) {
-			curleft += $(o.containment).scrollLeft() || 0;
-			curtop += $(o.containment).scrollTop() || 0;
+		if ( o.containment ) {
+			curleft += $( o.containment ).scrollLeft() || 0;
+			curtop += $( o.containment ).scrollTop() || 0;
 		}
 
 		this.offset = this.helper.offset();
@@ -7298,45 +4100,45 @@ $.widget("ui.resizable", $.ui.mouse, {
 		this.originalPosition = { left: curleft, top: curtop };
 		this.originalMousePosition = { left: event.pageX, top: event.pageY };
 
-		this.aspectRatio = (typeof o.aspectRatio === "number") ?
+		this.aspectRatio = ( typeof o.aspectRatio === "number" ) ?
 			o.aspectRatio :
-			((this.originalSize.width / this.originalSize.height) || 1);
+			( ( this.originalSize.width / this.originalSize.height ) || 1 );
 
-		cursor = $(".ui-resizable-" + this.axis).css("cursor");
-		$("body").css("cursor", cursor === "auto" ? this.axis + "-resize" : cursor);
+		cursor = $( ".ui-resizable-" + this.axis ).css( "cursor" );
+		$( "body" ).css( "cursor", cursor === "auto" ? this.axis + "-resize" : cursor );
 
-		el.addClass("ui-resizable-resizing");
-		this._propagate("start", event);
+		this._addClass( "ui-resizable-resizing" );
+		this._propagate( "start", event );
 		return true;
 	},
 
-	_mouseDrag: function(event) {
+	_mouseDrag: function( event ) {
 
 		var data, props,
 			smp = this.originalMousePosition,
 			a = this.axis,
-			dx = (event.pageX - smp.left) || 0,
-			dy = (event.pageY - smp.top) || 0,
-			trigger = this._change[a];
+			dx = ( event.pageX - smp.left ) || 0,
+			dy = ( event.pageY - smp.top ) || 0,
+			trigger = this._change[ a ];
 
 		this._updatePrevProperties();
 
-		if (!trigger) {
+		if ( !trigger ) {
 			return false;
 		}
 
-		data = trigger.apply(this, [ event, dx, dy ]);
+		data = trigger.apply( this, [ event, dx, dy ] );
 
-		this._updateVirtualBoundaries(event.shiftKey);
-		if (this._aspectRatio || event.shiftKey) {
-			data = this._updateRatio(data, event);
+		this._updateVirtualBoundaries( event.shiftKey );
+		if ( this._aspectRatio || event.shiftKey ) {
+			data = this._updateRatio( data, event );
 		}
 
-		data = this._respectSize(data, event);
+		data = this._respectSize( data, event );
 
-		this._updateCache(data);
+		this._updateCache( data );
 
-		this._propagate("resize", event);
+		this._propagate( "resize", event );
 
 		props = this._applyChanges();
 
@@ -7353,47 +4155,47 @@ $.widget("ui.resizable", $.ui.mouse, {
 		return false;
 	},
 
-	_mouseStop: function(event) {
+	_mouseStop: function( event ) {
 
 		this.resizing = false;
 		var pr, ista, soffseth, soffsetw, s, left, top,
 			o = this.options, that = this;
 
-		if (this._helper) {
+		if ( this._helper ) {
 
 			pr = this._proportionallyResizeElements;
-			ista = pr.length && (/textarea/i).test(pr[0].nodeName);
-			soffseth = ista && this._hasScroll(pr[0], "left") ? 0 : that.sizeDiff.height;
+			ista = pr.length && ( /textarea/i ).test( pr[ 0 ].nodeName );
+			soffseth = ista && this._hasScroll( pr[ 0 ], "left" ) ? 0 : that.sizeDiff.height;
 			soffsetw = ista ? 0 : that.sizeDiff.width;
 
 			s = {
-				width: (that.helper.width()  - soffsetw),
-				height: (that.helper.height() - soffseth)
+				width: ( that.helper.width()  - soffsetw ),
+				height: ( that.helper.height() - soffseth )
 			};
-			left = (parseInt(that.element.css("left"), 10) +
-				(that.position.left - that.originalPosition.left)) || null;
-			top = (parseInt(that.element.css("top"), 10) +
-				(that.position.top - that.originalPosition.top)) || null;
+			left = ( parseFloat( that.element.css( "left" ) ) +
+				( that.position.left - that.originalPosition.left ) ) || null;
+			top = ( parseFloat( that.element.css( "top" ) ) +
+				( that.position.top - that.originalPosition.top ) ) || null;
 
-			if (!o.animate) {
-				this.element.css($.extend(s, { top: top, left: left }));
+			if ( !o.animate ) {
+				this.element.css( $.extend( s, { top: top, left: left } ) );
 			}
 
-			that.helper.height(that.size.height);
-			that.helper.width(that.size.width);
+			that.helper.height( that.size.height );
+			that.helper.width( that.size.width );
 
-			if (this._helper && !o.animate) {
+			if ( this._helper && !o.animate ) {
 				this._proportionallyResize();
 			}
 		}
 
-		$("body").css("cursor", "auto");
+		$( "body" ).css( "cursor", "auto" );
 
-		this.element.removeClass("ui-resizable-resizing");
+		this._removeClass( "ui-resizable-resizing" );
 
-		this._propagate("stop", event);
+		this._propagate( "stop", event );
 
-		if (this._helper) {
+		if ( this._helper ) {
 			this.helper.remove();
 		}
 
@@ -7433,51 +4235,51 @@ $.widget("ui.resizable", $.ui.mouse, {
 		return props;
 	},
 
-	_updateVirtualBoundaries: function(forceAspectRatio) {
+	_updateVirtualBoundaries: function( forceAspectRatio ) {
 		var pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b,
 			o = this.options;
 
 		b = {
-			minWidth: this._isNumber(o.minWidth) ? o.minWidth : 0,
-			maxWidth: this._isNumber(o.maxWidth) ? o.maxWidth : Infinity,
-			minHeight: this._isNumber(o.minHeight) ? o.minHeight : 0,
-			maxHeight: this._isNumber(o.maxHeight) ? o.maxHeight : Infinity
+			minWidth: this._isNumber( o.minWidth ) ? o.minWidth : 0,
+			maxWidth: this._isNumber( o.maxWidth ) ? o.maxWidth : Infinity,
+			minHeight: this._isNumber( o.minHeight ) ? o.minHeight : 0,
+			maxHeight: this._isNumber( o.maxHeight ) ? o.maxHeight : Infinity
 		};
 
-		if (this._aspectRatio || forceAspectRatio) {
+		if ( this._aspectRatio || forceAspectRatio ) {
 			pMinWidth = b.minHeight * this.aspectRatio;
 			pMinHeight = b.minWidth / this.aspectRatio;
 			pMaxWidth = b.maxHeight * this.aspectRatio;
 			pMaxHeight = b.maxWidth / this.aspectRatio;
 
-			if (pMinWidth > b.minWidth) {
+			if ( pMinWidth > b.minWidth ) {
 				b.minWidth = pMinWidth;
 			}
-			if (pMinHeight > b.minHeight) {
+			if ( pMinHeight > b.minHeight ) {
 				b.minHeight = pMinHeight;
 			}
-			if (pMaxWidth < b.maxWidth) {
+			if ( pMaxWidth < b.maxWidth ) {
 				b.maxWidth = pMaxWidth;
 			}
-			if (pMaxHeight < b.maxHeight) {
+			if ( pMaxHeight < b.maxHeight ) {
 				b.maxHeight = pMaxHeight;
 			}
 		}
 		this._vBoundaries = b;
 	},
 
-	_updateCache: function(data) {
+	_updateCache: function( data ) {
 		this.offset = this.helper.offset();
-		if (this._isNumber(data.left)) {
+		if ( this._isNumber( data.left ) ) {
 			this.position.left = data.left;
 		}
-		if (this._isNumber(data.top)) {
+		if ( this._isNumber( data.top ) ) {
 			this.position.top = data.top;
 		}
-		if (this._isNumber(data.height)) {
+		if ( this._isNumber( data.height ) ) {
 			this.size.height = data.height;
 		}
-		if (this._isNumber(data.width)) {
+		if ( this._isNumber( data.width ) ) {
 			this.size.width = data.width;
 		}
 	},
@@ -7488,19 +4290,19 @@ $.widget("ui.resizable", $.ui.mouse, {
 			csize = this.size,
 			a = this.axis;
 
-		if (this._isNumber(data.height)) {
-			data.width = (data.height * this.aspectRatio);
-		} else if (this._isNumber(data.width)) {
-			data.height = (data.width / this.aspectRatio);
+		if ( this._isNumber( data.height ) ) {
+			data.width = ( data.height * this.aspectRatio );
+		} else if ( this._isNumber( data.width ) ) {
+			data.height = ( data.width / this.aspectRatio );
 		}
 
-		if (a === "sw") {
-			data.left = cpos.left + (csize.width - data.width);
+		if ( a === "sw" ) {
+			data.left = cpos.left + ( csize.width - data.width );
 			data.top = null;
 		}
-		if (a === "nw") {
-			data.top = cpos.top + (csize.height - data.height);
-			data.left = cpos.left + (csize.width - data.width);
+		if ( a === "nw" ) {
+			data.top = cpos.top + ( csize.height - data.height );
+			data.left = cpos.left + ( csize.width - data.width );
 		}
 
 		return data;
@@ -7510,43 +4312,43 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 		var o = this._vBoundaries,
 			a = this.axis,
-			ismaxw = this._isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width),
-			ismaxh = this._isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
-			isminw = this._isNumber(data.width) && o.minWidth && (o.minWidth > data.width),
-			isminh = this._isNumber(data.height) && o.minHeight && (o.minHeight > data.height),
+			ismaxw = this._isNumber( data.width ) && o.maxWidth && ( o.maxWidth < data.width ),
+			ismaxh = this._isNumber( data.height ) && o.maxHeight && ( o.maxHeight < data.height ),
+			isminw = this._isNumber( data.width ) && o.minWidth && ( o.minWidth > data.width ),
+			isminh = this._isNumber( data.height ) && o.minHeight && ( o.minHeight > data.height ),
 			dw = this.originalPosition.left + this.originalSize.width,
-			dh = this.position.top + this.size.height,
-			cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
-		if (isminw) {
+			dh = this.originalPosition.top + this.originalSize.height,
+			cw = /sw|nw|w/.test( a ), ch = /nw|ne|n/.test( a );
+		if ( isminw ) {
 			data.width = o.minWidth;
 		}
-		if (isminh) {
+		if ( isminh ) {
 			data.height = o.minHeight;
 		}
-		if (ismaxw) {
+		if ( ismaxw ) {
 			data.width = o.maxWidth;
 		}
-		if (ismaxh) {
+		if ( ismaxh ) {
 			data.height = o.maxHeight;
 		}
 
-		if (isminw && cw) {
+		if ( isminw && cw ) {
 			data.left = dw - o.minWidth;
 		}
-		if (ismaxw && cw) {
+		if ( ismaxw && cw ) {
 			data.left = dw - o.maxWidth;
 		}
-		if (isminh && ch) {
+		if ( isminh && ch ) {
 			data.top = dh - o.minHeight;
 		}
-		if (ismaxh && ch) {
+		if ( ismaxh && ch ) {
 			data.top = dh - o.maxHeight;
 		}
 
 		// Fixing jump error on top/left - bug #2330
-		if (!data.width && !data.height && !data.left && data.top) {
+		if ( !data.width && !data.height && !data.left && data.top ) {
 			data.top = null;
-		} else if (!data.width && !data.height && !data.top && data.left) {
+		} else if ( !data.width && !data.height && !data.top && data.left ) {
 			data.left = null;
 		}
 
@@ -7570,8 +4372,8 @@ $.widget("ui.resizable", $.ui.mouse, {
 			];
 
 		for ( ; i < 4; i++ ) {
-			widths[ i ] = ( parseInt( borders[ i ], 10 ) || 0 );
-			widths[ i ] += ( parseInt( paddings[ i ], 10 ) || 0 );
+			widths[ i ] = ( parseFloat( borders[ i ] ) || 0 );
+			widths[ i ] += ( parseFloat( paddings[ i ] ) || 0 );
 		}
 
 		return {
@@ -7582,7 +4384,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 	_proportionallyResize: function() {
 
-		if (!this._proportionallyResizeElements.length) {
+		if ( !this._proportionallyResizeElements.length ) {
 			return;
 		}
 
@@ -7590,20 +4392,20 @@ $.widget("ui.resizable", $.ui.mouse, {
 			i = 0,
 			element = this.helper || this.element;
 
-		for ( ; i < this._proportionallyResizeElements.length; i++) {
+		for ( ; i < this._proportionallyResizeElements.length; i++ ) {
 
-			prel = this._proportionallyResizeElements[i];
+			prel = this._proportionallyResizeElements[ i ];
 
 			// TODO: Seems like a bug to cache this.outerDimensions
 			// considering that we are in a loop.
-			if (!this.outerDimensions) {
+			if ( !this.outerDimensions ) {
 				this.outerDimensions = this._getPaddingPlusBorderDimensions( prel );
 			}
 
-			prel.css({
-				height: (element.height() - this.outerDimensions.height) || 0,
-				width: (element.width() - this.outerDimensions.width) || 0
-			});
+			prel.css( {
+				height: ( element.height() - this.outerDimensions.height ) || 0,
+				width: ( element.width() - this.outerDimensions.width ) || 0
+			} );
 
 		}
 
@@ -7614,21 +4416,22 @@ $.widget("ui.resizable", $.ui.mouse, {
 		var el = this.element, o = this.options;
 		this.elementOffset = el.offset();
 
-		if (this._helper) {
+		if ( this._helper ) {
 
-			this.helper = this.helper || $("<div style='overflow:hidden;'></div>");
+			this.helper = this.helper || $( "<div style='overflow:hidden;'></div>" );
 
-			this.helper.addClass(this._helper).css({
-				width: this.element.outerWidth() - 1,
-				height: this.element.outerHeight() - 1,
+			this._addClass( this.helper, this._helper );
+			this.helper.css( {
+				width: this.element.outerWidth(),
+				height: this.element.outerHeight(),
 				position: "absolute",
 				left: this.elementOffset.left + "px",
 				top: this.elementOffset.top + "px",
 				zIndex: ++o.zIndex //TODO: Don't modify option
-			});
+			} );
 
 			this.helper
-				.appendTo("body")
+				.appendTo( "body" )
 				.disableSelection();
 
 		} else {
@@ -7638,41 +4441,41 @@ $.widget("ui.resizable", $.ui.mouse, {
 	},
 
 	_change: {
-		e: function(event, dx) {
+		e: function( event, dx ) {
 			return { width: this.originalSize.width + dx };
 		},
-		w: function(event, dx) {
+		w: function( event, dx ) {
 			var cs = this.originalSize, sp = this.originalPosition;
 			return { left: sp.left + dx, width: cs.width - dx };
 		},
-		n: function(event, dx, dy) {
+		n: function( event, dx, dy ) {
 			var cs = this.originalSize, sp = this.originalPosition;
 			return { top: sp.top + dy, height: cs.height - dy };
 		},
-		s: function(event, dx, dy) {
+		s: function( event, dx, dy ) {
 			return { height: this.originalSize.height + dy };
 		},
-		se: function(event, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments),
-				this._change.e.apply(this, [ event, dx, dy ]));
+		se: function( event, dx, dy ) {
+			return $.extend( this._change.s.apply( this, arguments ),
+				this._change.e.apply( this, [ event, dx, dy ] ) );
 		},
-		sw: function(event, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments),
-				this._change.w.apply(this, [ event, dx, dy ]));
+		sw: function( event, dx, dy ) {
+			return $.extend( this._change.s.apply( this, arguments ),
+				this._change.w.apply( this, [ event, dx, dy ] ) );
 		},
-		ne: function(event, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments),
-				this._change.e.apply(this, [ event, dx, dy ]));
+		ne: function( event, dx, dy ) {
+			return $.extend( this._change.n.apply( this, arguments ),
+				this._change.e.apply( this, [ event, dx, dy ] ) );
 		},
-		nw: function(event, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments),
-				this._change.w.apply(this, [ event, dx, dy ]));
+		nw: function( event, dx, dy ) {
+			return $.extend( this._change.n.apply( this, arguments ),
+				this._change.w.apply( this, [ event, dx, dy ] ) );
 		}
 	},
 
-	_propagate: function(n, event) {
-		$.ui.plugin.call(this, n, [ event, this.ui() ]);
-		(n !== "resize" && this._trigger(n, event, this.ui()));
+	_propagate: function( n, event ) {
+		$.ui.plugin.call( this, n, [ event, this.ui() ] );
+		( n !== "resize" && this._trigger( n, event, this.ui() ) );
 	},
 
 	plugins: {},
@@ -7689,54 +4492,57 @@ $.widget("ui.resizable", $.ui.mouse, {
 		};
 	}
 
-});
+} );
 
 /*
  * Resizable Extensions
  */
 
-$.ui.plugin.add("resizable", "animate", {
+$.ui.plugin.add( "resizable", "animate", {
 
 	stop: function( event ) {
-		var that = $(this).resizable( "instance" ),
+		var that = $( this ).resizable( "instance" ),
 			o = that.options,
 			pr = that._proportionallyResizeElements,
-			ista = pr.length && (/textarea/i).test(pr[0].nodeName),
-			soffseth = ista && that._hasScroll(pr[0], "left") ? 0 : that.sizeDiff.height,
+			ista = pr.length && ( /textarea/i ).test( pr[ 0 ].nodeName ),
+			soffseth = ista && that._hasScroll( pr[ 0 ], "left" ) ? 0 : that.sizeDiff.height,
 			soffsetw = ista ? 0 : that.sizeDiff.width,
-			style = { width: (that.size.width - soffsetw), height: (that.size.height - soffseth) },
-			left = (parseInt(that.element.css("left"), 10) +
-				(that.position.left - that.originalPosition.left)) || null,
-			top = (parseInt(that.element.css("top"), 10) +
-				(that.position.top - that.originalPosition.top)) || null;
+			style = {
+				width: ( that.size.width - soffsetw ),
+				height: ( that.size.height - soffseth )
+			},
+			left = ( parseFloat( that.element.css( "left" ) ) +
+				( that.position.left - that.originalPosition.left ) ) || null,
+			top = ( parseFloat( that.element.css( "top" ) ) +
+				( that.position.top - that.originalPosition.top ) ) || null;
 
 		that.element.animate(
-			$.extend(style, top && left ? { top: top, left: left } : {}), {
+			$.extend( style, top && left ? { top: top, left: left } : {} ), {
 				duration: o.animateDuration,
 				easing: o.animateEasing,
 				step: function() {
 
 					var data = {
-						width: parseInt(that.element.css("width"), 10),
-						height: parseInt(that.element.css("height"), 10),
-						top: parseInt(that.element.css("top"), 10),
-						left: parseInt(that.element.css("left"), 10)
+						width: parseFloat( that.element.css( "width" ) ),
+						height: parseFloat( that.element.css( "height" ) ),
+						top: parseFloat( that.element.css( "top" ) ),
+						left: parseFloat( that.element.css( "left" ) )
 					};
 
-					if (pr && pr.length) {
-						$(pr[0]).css({ width: data.width, height: data.height });
+					if ( pr && pr.length ) {
+						$( pr[ 0 ] ).css( { width: data.width, height: data.height } );
 					}
 
-					// propagating resize, and updating values for each animation step
-					that._updateCache(data);
-					that._propagate("resize", event);
+					// Propagating resize, and updating values for each animation step
+					that._updateCache( data );
+					that._propagate( "resize", event );
 
 				}
 			}
 		);
 	}
 
-});
+} );
 
 $.ui.plugin.add( "resizable", "containment", {
 
@@ -7746,7 +4552,9 @@ $.ui.plugin.add( "resizable", "containment", {
 			o = that.options,
 			el = that.element,
 			oc = o.containment,
-			ce = ( oc instanceof $ ) ? oc.get( 0 ) : ( /parent/.test( oc ) ) ? el.parent().get( 0 ) : oc;
+			ce = ( oc instanceof $ ) ?
+				oc.get( 0 ) :
+				( /parent/.test( oc ) ) ? el.parent().get( 0 ) : oc;
 
 		if ( !ce ) {
 			return;
@@ -7774,9 +4582,9 @@ $.ui.plugin.add( "resizable", "containment", {
 		} else {
 			element = $( ce );
 			p = [];
-			$([ "Top", "Right", "Left", "Bottom" ]).each(function( i, name ) {
+			$( [ "Top", "Right", "Left", "Bottom" ] ).each( function( i, name ) {
 				p[ i ] = that._num( element.css( "padding" + name ) );
-			});
+			} );
 
 			that.containerOffset = element.offset();
 			that.containerPosition = element.position();
@@ -7857,14 +4665,14 @@ $.ui.plugin.add( "resizable", "containment", {
 		}
 
 		woset = Math.abs( that.sizeDiff.width +
-			(that._helper ?
+			( that._helper ?
 				that.offset.left - cop.left :
-				(that.offset.left - co.left)) );
+				( that.offset.left - co.left ) ) );
 
 		hoset = Math.abs( that.sizeDiff.height +
-			(that._helper ?
+			( that._helper ?
 				that.offset.top - cop.top :
-				(that.offset.top - co.top)) );
+				( that.offset.top - co.top ) ) );
 
 		if ( woset + that.size.width >= that.parentData.width ) {
 			that.size.width = that.parentData.width - woset;
@@ -7902,167 +4710,174 @@ $.ui.plugin.add( "resizable", "containment", {
 			h = helper.outerHeight() - that.sizeDiff.height;
 
 		if ( that._helper && !o.animate && ( /relative/ ).test( ce.css( "position" ) ) ) {
-			$( this ).css({
+			$( this ).css( {
 				left: ho.left - cop.left - co.left,
 				width: w,
 				height: h
-			});
+			} );
 		}
 
 		if ( that._helper && !o.animate && ( /static/ ).test( ce.css( "position" ) ) ) {
-			$( this ).css({
+			$( this ).css( {
 				left: ho.left - cop.left - co.left,
 				width: w,
 				height: h
-			});
+			} );
 		}
 	}
-});
+} );
 
-$.ui.plugin.add("resizable", "alsoResize", {
+$.ui.plugin.add( "resizable", "alsoResize", {
 
 	start: function() {
-		var that = $(this).resizable( "instance" ),
+		var that = $( this ).resizable( "instance" ),
 			o = that.options;
 
-		$(o.alsoResize).each(function() {
-			var el = $(this);
-			el.data("ui-resizable-alsoresize", {
-				width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
-				left: parseInt(el.css("left"), 10), top: parseInt(el.css("top"), 10)
-			});
-		});
+		$( o.alsoResize ).each( function() {
+			var el = $( this );
+			el.data( "ui-resizable-alsoresize", {
+				width: parseFloat( el.width() ), height: parseFloat( el.height() ),
+				left: parseFloat( el.css( "left" ) ), top: parseFloat( el.css( "top" ) )
+			} );
+		} );
 	},
 
-	resize: function(event, ui) {
-		var that = $(this).resizable( "instance" ),
+	resize: function( event, ui ) {
+		var that = $( this ).resizable( "instance" ),
 			o = that.options,
 			os = that.originalSize,
 			op = that.originalPosition,
 			delta = {
-				height: (that.size.height - os.height) || 0,
-				width: (that.size.width - os.width) || 0,
-				top: (that.position.top - op.top) || 0,
-				left: (that.position.left - op.left) || 0
+				height: ( that.size.height - os.height ) || 0,
+				width: ( that.size.width - os.width ) || 0,
+				top: ( that.position.top - op.top ) || 0,
+				left: ( that.position.left - op.left ) || 0
 			};
 
-			$(o.alsoResize).each(function() {
-				var el = $(this), start = $(this).data("ui-resizable-alsoresize"), style = {},
-					css = el.parents(ui.originalElement[0]).length ?
+			$( o.alsoResize ).each( function() {
+				var el = $( this ), start = $( this ).data( "ui-resizable-alsoresize" ), style = {},
+					css = el.parents( ui.originalElement[ 0 ] ).length ?
 							[ "width", "height" ] :
 							[ "width", "height", "top", "left" ];
 
-				$.each(css, function(i, prop) {
-					var sum = (start[prop] || 0) + (delta[prop] || 0);
-					if (sum && sum >= 0) {
-						style[prop] = sum || null;
+				$.each( css, function( i, prop ) {
+					var sum = ( start[ prop ] || 0 ) + ( delta[ prop ] || 0 );
+					if ( sum && sum >= 0 ) {
+						style[ prop ] = sum || null;
 					}
-				});
+				} );
 
-				el.css(style);
-			});
+				el.css( style );
+			} );
 	},
 
 	stop: function() {
-		$(this).removeData("resizable-alsoresize");
+		$( this ).removeData( "ui-resizable-alsoresize" );
 	}
-});
+} );
 
-$.ui.plugin.add("resizable", "ghost", {
+$.ui.plugin.add( "resizable", "ghost", {
 
 	start: function() {
 
-		var that = $(this).resizable( "instance" ), o = that.options, cs = that.size;
+		var that = $( this ).resizable( "instance" ), cs = that.size;
 
 		that.ghost = that.originalElement.clone();
-		that.ghost
-			.css({
-				opacity: 0.25,
-				display: "block",
-				position: "relative",
-				height: cs.height,
-				width: cs.width,
-				margin: 0,
-				left: 0,
-				top: 0
-			})
-			.addClass("ui-resizable-ghost")
-			.addClass(typeof o.ghost === "string" ? o.ghost : "");
+		that.ghost.css( {
+			opacity: 0.25,
+			display: "block",
+			position: "relative",
+			height: cs.height,
+			width: cs.width,
+			margin: 0,
+			left: 0,
+			top: 0
+		} );
 
-		that.ghost.appendTo(that.helper);
+		that._addClass( that.ghost, "ui-resizable-ghost" );
+
+		// DEPRECATED
+		// TODO: remove after 1.12
+		if ( $.uiBackCompat !== false && typeof that.options.ghost === "string" ) {
+
+			// Ghost option
+			that.ghost.addClass( this.options.ghost );
+		}
+
+		that.ghost.appendTo( that.helper );
 
 	},
 
 	resize: function() {
-		var that = $(this).resizable( "instance" );
-		if (that.ghost) {
-			that.ghost.css({
+		var that = $( this ).resizable( "instance" );
+		if ( that.ghost ) {
+			that.ghost.css( {
 				position: "relative",
 				height: that.size.height,
 				width: that.size.width
-			});
+			} );
 		}
 	},
 
 	stop: function() {
-		var that = $(this).resizable( "instance" );
-		if (that.ghost && that.helper) {
-			that.helper.get(0).removeChild(that.ghost.get(0));
+		var that = $( this ).resizable( "instance" );
+		if ( that.ghost && that.helper ) {
+			that.helper.get( 0 ).removeChild( that.ghost.get( 0 ) );
 		}
 	}
 
-});
+} );
 
-$.ui.plugin.add("resizable", "grid", {
+$.ui.plugin.add( "resizable", "grid", {
 
 	resize: function() {
 		var outerDimensions,
-			that = $(this).resizable( "instance" ),
+			that = $( this ).resizable( "instance" ),
 			o = that.options,
 			cs = that.size,
 			os = that.originalSize,
 			op = that.originalPosition,
 			a = that.axis,
 			grid = typeof o.grid === "number" ? [ o.grid, o.grid ] : o.grid,
-			gridX = (grid[0] || 1),
-			gridY = (grid[1] || 1),
-			ox = Math.round((cs.width - os.width) / gridX) * gridX,
-			oy = Math.round((cs.height - os.height) / gridY) * gridY,
+			gridX = ( grid[ 0 ] || 1 ),
+			gridY = ( grid[ 1 ] || 1 ),
+			ox = Math.round( ( cs.width - os.width ) / gridX ) * gridX,
+			oy = Math.round( ( cs.height - os.height ) / gridY ) * gridY,
 			newWidth = os.width + ox,
 			newHeight = os.height + oy,
-			isMaxWidth = o.maxWidth && (o.maxWidth < newWidth),
-			isMaxHeight = o.maxHeight && (o.maxHeight < newHeight),
-			isMinWidth = o.minWidth && (o.minWidth > newWidth),
-			isMinHeight = o.minHeight && (o.minHeight > newHeight);
+			isMaxWidth = o.maxWidth && ( o.maxWidth < newWidth ),
+			isMaxHeight = o.maxHeight && ( o.maxHeight < newHeight ),
+			isMinWidth = o.minWidth && ( o.minWidth > newWidth ),
+			isMinHeight = o.minHeight && ( o.minHeight > newHeight );
 
 		o.grid = grid;
 
-		if (isMinWidth) {
+		if ( isMinWidth ) {
 			newWidth += gridX;
 		}
-		if (isMinHeight) {
+		if ( isMinHeight ) {
 			newHeight += gridY;
 		}
-		if (isMaxWidth) {
+		if ( isMaxWidth ) {
 			newWidth -= gridX;
 		}
-		if (isMaxHeight) {
+		if ( isMaxHeight ) {
 			newHeight -= gridY;
 		}
 
-		if (/^(se|s|e)$/.test(a)) {
+		if ( /^(se|s|e)$/.test( a ) ) {
 			that.size.width = newWidth;
 			that.size.height = newHeight;
-		} else if (/^(ne)$/.test(a)) {
+		} else if ( /^(ne)$/.test( a ) ) {
 			that.size.width = newWidth;
 			that.size.height = newHeight;
 			that.position.top = op.top - oy;
-		} else if (/^(sw)$/.test(a)) {
+		} else if ( /^(sw)$/.test( a ) ) {
 			that.size.width = newWidth;
 			that.size.height = newHeight;
 			that.position.left = op.left - ox;
 		} else {
-			if ( newHeight - gridY <= 0 || newWidth - gridX <= 0) {
+			if ( newHeight - gridY <= 0 || newWidth - gridX <= 0 ) {
 				outerDimensions = that._getPaddingPlusBorderDimensions( this );
 			}
 
@@ -8085,32 +4900,6817 @@ $.ui.plugin.add("resizable", "grid", {
 		}
 	}
 
-});
+} );
 
-var resizable = $.ui.resizable;
+var widgetsResizable = $.ui.resizable;
 
 
 /*!
- * jQuery UI Dialog 1.11.4
+ * jQuery UI Selectable 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/dialog/
  */
 
+//>>label: Selectable
+//>>group: Interactions
+//>>description: Allows groups of elements to be selected with the mouse.
+//>>docs: http://api.jqueryui.com/selectable/
+//>>demos: http://jqueryui.com/selectable/
+//>>css.structure: ../../themes/base/selectable.css
 
-var dialog = $.widget( "ui.dialog", {
-	version: "1.11.4",
+
+
+var widgetsSelectable = $.widget( "ui.selectable", $.ui.mouse, {
+	version: "1.12.1",
+	options: {
+		appendTo: "body",
+		autoRefresh: true,
+		distance: 0,
+		filter: "*",
+		tolerance: "touch",
+
+		// Callbacks
+		selected: null,
+		selecting: null,
+		start: null,
+		stop: null,
+		unselected: null,
+		unselecting: null
+	},
+	_create: function() {
+		var that = this;
+
+		this._addClass( "ui-selectable" );
+
+		this.dragged = false;
+
+		// Cache selectee children based on filter
+		this.refresh = function() {
+			that.elementPos = $( that.element[ 0 ] ).offset();
+			that.selectees = $( that.options.filter, that.element[ 0 ] );
+			that._addClass( that.selectees, "ui-selectee" );
+			that.selectees.each( function() {
+				var $this = $( this ),
+					selecteeOffset = $this.offset(),
+					pos = {
+						left: selecteeOffset.left - that.elementPos.left,
+						top: selecteeOffset.top - that.elementPos.top
+					};
+				$.data( this, "selectable-item", {
+					element: this,
+					$element: $this,
+					left: pos.left,
+					top: pos.top,
+					right: pos.left + $this.outerWidth(),
+					bottom: pos.top + $this.outerHeight(),
+					startselected: false,
+					selected: $this.hasClass( "ui-selected" ),
+					selecting: $this.hasClass( "ui-selecting" ),
+					unselecting: $this.hasClass( "ui-unselecting" )
+				} );
+			} );
+		};
+		this.refresh();
+
+		this._mouseInit();
+
+		this.helper = $( "<div>" );
+		this._addClass( this.helper, "ui-selectable-helper" );
+	},
+
+	_destroy: function() {
+		this.selectees.removeData( "selectable-item" );
+		this._mouseDestroy();
+	},
+
+	_mouseStart: function( event ) {
+		var that = this,
+			options = this.options;
+
+		this.opos = [ event.pageX, event.pageY ];
+		this.elementPos = $( this.element[ 0 ] ).offset();
+
+		if ( this.options.disabled ) {
+			return;
+		}
+
+		this.selectees = $( options.filter, this.element[ 0 ] );
+
+		this._trigger( "start", event );
+
+		$( options.appendTo ).append( this.helper );
+
+		// position helper (lasso)
+		this.helper.css( {
+			"left": event.pageX,
+			"top": event.pageY,
+			"width": 0,
+			"height": 0
+		} );
+
+		if ( options.autoRefresh ) {
+			this.refresh();
+		}
+
+		this.selectees.filter( ".ui-selected" ).each( function() {
+			var selectee = $.data( this, "selectable-item" );
+			selectee.startselected = true;
+			if ( !event.metaKey && !event.ctrlKey ) {
+				that._removeClass( selectee.$element, "ui-selected" );
+				selectee.selected = false;
+				that._addClass( selectee.$element, "ui-unselecting" );
+				selectee.unselecting = true;
+
+				// selectable UNSELECTING callback
+				that._trigger( "unselecting", event, {
+					unselecting: selectee.element
+				} );
+			}
+		} );
+
+		$( event.target ).parents().addBack().each( function() {
+			var doSelect,
+				selectee = $.data( this, "selectable-item" );
+			if ( selectee ) {
+				doSelect = ( !event.metaKey && !event.ctrlKey ) ||
+					!selectee.$element.hasClass( "ui-selected" );
+				that._removeClass( selectee.$element, doSelect ? "ui-unselecting" : "ui-selected" )
+					._addClass( selectee.$element, doSelect ? "ui-selecting" : "ui-unselecting" );
+				selectee.unselecting = !doSelect;
+				selectee.selecting = doSelect;
+				selectee.selected = doSelect;
+
+				// selectable (UN)SELECTING callback
+				if ( doSelect ) {
+					that._trigger( "selecting", event, {
+						selecting: selectee.element
+					} );
+				} else {
+					that._trigger( "unselecting", event, {
+						unselecting: selectee.element
+					} );
+				}
+				return false;
+			}
+		} );
+
+	},
+
+	_mouseDrag: function( event ) {
+
+		this.dragged = true;
+
+		if ( this.options.disabled ) {
+			return;
+		}
+
+		var tmp,
+			that = this,
+			options = this.options,
+			x1 = this.opos[ 0 ],
+			y1 = this.opos[ 1 ],
+			x2 = event.pageX,
+			y2 = event.pageY;
+
+		if ( x1 > x2 ) { tmp = x2; x2 = x1; x1 = tmp; }
+		if ( y1 > y2 ) { tmp = y2; y2 = y1; y1 = tmp; }
+		this.helper.css( { left: x1, top: y1, width: x2 - x1, height: y2 - y1 } );
+
+		this.selectees.each( function() {
+			var selectee = $.data( this, "selectable-item" ),
+				hit = false,
+				offset = {};
+
+			//prevent helper from being selected if appendTo: selectable
+			if ( !selectee || selectee.element === that.element[ 0 ] ) {
+				return;
+			}
+
+			offset.left   = selectee.left   + that.elementPos.left;
+			offset.right  = selectee.right  + that.elementPos.left;
+			offset.top    = selectee.top    + that.elementPos.top;
+			offset.bottom = selectee.bottom + that.elementPos.top;
+
+			if ( options.tolerance === "touch" ) {
+				hit = ( !( offset.left > x2 || offset.right < x1 || offset.top > y2 ||
+                    offset.bottom < y1 ) );
+			} else if ( options.tolerance === "fit" ) {
+				hit = ( offset.left > x1 && offset.right < x2 && offset.top > y1 &&
+                    offset.bottom < y2 );
+			}
+
+			if ( hit ) {
+
+				// SELECT
+				if ( selectee.selected ) {
+					that._removeClass( selectee.$element, "ui-selected" );
+					selectee.selected = false;
+				}
+				if ( selectee.unselecting ) {
+					that._removeClass( selectee.$element, "ui-unselecting" );
+					selectee.unselecting = false;
+				}
+				if ( !selectee.selecting ) {
+					that._addClass( selectee.$element, "ui-selecting" );
+					selectee.selecting = true;
+
+					// selectable SELECTING callback
+					that._trigger( "selecting", event, {
+						selecting: selectee.element
+					} );
+				}
+			} else {
+
+				// UNSELECT
+				if ( selectee.selecting ) {
+					if ( ( event.metaKey || event.ctrlKey ) && selectee.startselected ) {
+						that._removeClass( selectee.$element, "ui-selecting" );
+						selectee.selecting = false;
+						that._addClass( selectee.$element, "ui-selected" );
+						selectee.selected = true;
+					} else {
+						that._removeClass( selectee.$element, "ui-selecting" );
+						selectee.selecting = false;
+						if ( selectee.startselected ) {
+							that._addClass( selectee.$element, "ui-unselecting" );
+							selectee.unselecting = true;
+						}
+
+						// selectable UNSELECTING callback
+						that._trigger( "unselecting", event, {
+							unselecting: selectee.element
+						} );
+					}
+				}
+				if ( selectee.selected ) {
+					if ( !event.metaKey && !event.ctrlKey && !selectee.startselected ) {
+						that._removeClass( selectee.$element, "ui-selected" );
+						selectee.selected = false;
+
+						that._addClass( selectee.$element, "ui-unselecting" );
+						selectee.unselecting = true;
+
+						// selectable UNSELECTING callback
+						that._trigger( "unselecting", event, {
+							unselecting: selectee.element
+						} );
+					}
+				}
+			}
+		} );
+
+		return false;
+	},
+
+	_mouseStop: function( event ) {
+		var that = this;
+
+		this.dragged = false;
+
+		$( ".ui-unselecting", this.element[ 0 ] ).each( function() {
+			var selectee = $.data( this, "selectable-item" );
+			that._removeClass( selectee.$element, "ui-unselecting" );
+			selectee.unselecting = false;
+			selectee.startselected = false;
+			that._trigger( "unselected", event, {
+				unselected: selectee.element
+			} );
+		} );
+		$( ".ui-selecting", this.element[ 0 ] ).each( function() {
+			var selectee = $.data( this, "selectable-item" );
+			that._removeClass( selectee.$element, "ui-selecting" )
+				._addClass( selectee.$element, "ui-selected" );
+			selectee.selecting = false;
+			selectee.selected = true;
+			selectee.startselected = true;
+			that._trigger( "selected", event, {
+				selected: selectee.element
+			} );
+		} );
+		this._trigger( "stop", event );
+
+		this.helper.remove();
+
+		return false;
+	}
+
+} );
+
+
+/*!
+ * jQuery UI Sortable 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Sortable
+//>>group: Interactions
+//>>description: Enables items in a list to be sorted using the mouse.
+//>>docs: http://api.jqueryui.com/sortable/
+//>>demos: http://jqueryui.com/sortable/
+//>>css.structure: ../../themes/base/sortable.css
+
+
+
+var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
+	version: "1.12.1",
+	widgetEventPrefix: "sort",
+	ready: false,
+	options: {
+		appendTo: "parent",
+		axis: false,
+		connectWith: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		dropOnEmpty: true,
+		forcePlaceholderSize: false,
+		forceHelperSize: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		items: "> *",
+		opacity: false,
+		placeholder: false,
+		revert: false,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		tolerance: "intersect",
+		zIndex: 1000,
+
+		// Callbacks
+		activate: null,
+		beforeStop: null,
+		change: null,
+		deactivate: null,
+		out: null,
+		over: null,
+		receive: null,
+		remove: null,
+		sort: null,
+		start: null,
+		stop: null,
+		update: null
+	},
+
+	_isOverAxis: function( x, reference, size ) {
+		return ( x >= reference ) && ( x < ( reference + size ) );
+	},
+
+	_isFloating: function( item ) {
+		return ( /left|right/ ).test( item.css( "float" ) ) ||
+			( /inline|table-cell/ ).test( item.css( "display" ) );
+	},
+
+	_create: function() {
+		this.containerCache = {};
+		this._addClass( "ui-sortable" );
+
+		//Get the items
+		this.refresh();
+
+		//Let's determine the parent's offset
+		this.offset = this.element.offset();
+
+		//Initialize mouse events for interaction
+		this._mouseInit();
+
+		this._setHandleClassName();
+
+		//We're ready to go
+		this.ready = true;
+
+	},
+
+	_setOption: function( key, value ) {
+		this._super( key, value );
+
+		if ( key === "handle" ) {
+			this._setHandleClassName();
+		}
+	},
+
+	_setHandleClassName: function() {
+		var that = this;
+		this._removeClass( this.element.find( ".ui-sortable-handle" ), "ui-sortable-handle" );
+		$.each( this.items, function() {
+			that._addClass(
+				this.instance.options.handle ?
+					this.item.find( this.instance.options.handle ) :
+					this.item,
+				"ui-sortable-handle"
+			);
+		} );
+	},
+
+	_destroy: function() {
+		this._mouseDestroy();
+
+		for ( var i = this.items.length - 1; i >= 0; i-- ) {
+			this.items[ i ].item.removeData( this.widgetName + "-item" );
+		}
+
+		return this;
+	},
+
+	_mouseCapture: function( event, overrideHandle ) {
+		var currentItem = null,
+			validHandle = false,
+			that = this;
+
+		if ( this.reverting ) {
+			return false;
+		}
+
+		if ( this.options.disabled || this.options.type === "static" ) {
+			return false;
+		}
+
+		//We have to refresh the items data once first
+		this._refreshItems( event );
+
+		//Find out if the clicked node (or one of its parents) is a actual item in this.items
+		$( event.target ).parents().each( function() {
+			if ( $.data( this, that.widgetName + "-item" ) === that ) {
+				currentItem = $( this );
+				return false;
+			}
+		} );
+		if ( $.data( event.target, that.widgetName + "-item" ) === that ) {
+			currentItem = $( event.target );
+		}
+
+		if ( !currentItem ) {
+			return false;
+		}
+		if ( this.options.handle && !overrideHandle ) {
+			$( this.options.handle, currentItem ).find( "*" ).addBack().each( function() {
+				if ( this === event.target ) {
+					validHandle = true;
+				}
+			} );
+			if ( !validHandle ) {
+				return false;
+			}
+		}
+
+		this.currentItem = currentItem;
+		this._removeCurrentsFromItems();
+		return true;
+
+	},
+
+	_mouseStart: function( event, overrideHandle, noActivation ) {
+
+		var i, body,
+			o = this.options;
+
+		this.currentContainer = this;
+
+		//We only need to call refreshPositions, because the refreshItems call has been moved to
+		// mouseCapture
+		this.refreshPositions();
+
+		//Create and append the visible helper
+		this.helper = this._createHelper( event );
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//Get the next scrolling parent
+		this.scrollParent = this.helper.scrollParent();
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.currentItem.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		$.extend( this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+			parent: this._getParentOffset(),
+
+			// This is a relative to absolute position minus the actual position calculation -
+			// only used for relative positioned helper
+			relative: this._getRelativeOffset()
+		} );
+
+		// Only after we got the offset, we can change the helper's position to absolute
+		// TODO: Still need to figure out a way to make relative sorting possible
+		this.helper.css( "position", "absolute" );
+		this.cssPosition = this.helper.css( "position" );
+
+		//Generate the original position
+		this.originalPosition = this._generatePosition( event );
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+
+		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
+		( o.cursorAt && this._adjustOffsetFromHelper( o.cursorAt ) );
+
+		//Cache the former DOM position
+		this.domPosition = {
+			prev: this.currentItem.prev()[ 0 ],
+			parent: this.currentItem.parent()[ 0 ]
+		};
+
+		// If the helper is not the original, hide the original so it's not playing any role during
+		// the drag, won't cause anything bad this way
+		if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
+			this.currentItem.hide();
+		}
+
+		//Create the placeholder
+		this._createPlaceholder();
+
+		//Set a containment if given in the options
+		if ( o.containment ) {
+			this._setContainment();
+		}
+
+		if ( o.cursor && o.cursor !== "auto" ) { // cursor option
+			body = this.document.find( "body" );
+
+			// Support: IE
+			this.storedCursor = body.css( "cursor" );
+			body.css( "cursor", o.cursor );
+
+			this.storedStylesheet =
+				$( "<style>*{ cursor: " + o.cursor + " !important; }</style>" ).appendTo( body );
+		}
+
+		if ( o.opacity ) { // opacity option
+			if ( this.helper.css( "opacity" ) ) {
+				this._storedOpacity = this.helper.css( "opacity" );
+			}
+			this.helper.css( "opacity", o.opacity );
+		}
+
+		if ( o.zIndex ) { // zIndex option
+			if ( this.helper.css( "zIndex" ) ) {
+				this._storedZIndex = this.helper.css( "zIndex" );
+			}
+			this.helper.css( "zIndex", o.zIndex );
+		}
+
+		//Prepare scrolling
+		if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+				this.scrollParent[ 0 ].tagName !== "HTML" ) {
+			this.overflowOffset = this.scrollParent.offset();
+		}
+
+		//Call callbacks
+		this._trigger( "start", event, this._uiHash() );
+
+		//Recache the helper size
+		if ( !this._preserveHelperProportions ) {
+			this._cacheHelperProportions();
+		}
+
+		//Post "activate" events to possible containers
+		if ( !noActivation ) {
+			for ( i = this.containers.length - 1; i >= 0; i-- ) {
+				this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
+			}
+		}
+
+		//Prepare possible droppables
+		if ( $.ui.ddmanager ) {
+			$.ui.ddmanager.current = this;
+		}
+
+		if ( $.ui.ddmanager && !o.dropBehaviour ) {
+			$.ui.ddmanager.prepareOffsets( this, event );
+		}
+
+		this.dragging = true;
+
+		this._addClass( this.helper, "ui-sortable-helper" );
+
+		// Execute the drag once - this causes the helper not to be visiblebefore getting its
+		// correct position
+		this._mouseDrag( event );
+		return true;
+
+	},
+
+	_mouseDrag: function( event ) {
+		var i, item, itemElement, intersection,
+			o = this.options,
+			scrolled = false;
+
+		//Compute the helpers position
+		this.position = this._generatePosition( event );
+		this.positionAbs = this._convertPositionTo( "absolute" );
+
+		if ( !this.lastPositionAbs ) {
+			this.lastPositionAbs = this.positionAbs;
+		}
+
+		//Do scrolling
+		if ( this.options.scroll ) {
+			if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+					this.scrollParent[ 0 ].tagName !== "HTML" ) {
+
+				if ( ( this.overflowOffset.top + this.scrollParent[ 0 ].offsetHeight ) -
+						event.pageY < o.scrollSensitivity ) {
+					this.scrollParent[ 0 ].scrollTop =
+						scrolled = this.scrollParent[ 0 ].scrollTop + o.scrollSpeed;
+				} else if ( event.pageY - this.overflowOffset.top < o.scrollSensitivity ) {
+					this.scrollParent[ 0 ].scrollTop =
+						scrolled = this.scrollParent[ 0 ].scrollTop - o.scrollSpeed;
+				}
+
+				if ( ( this.overflowOffset.left + this.scrollParent[ 0 ].offsetWidth ) -
+						event.pageX < o.scrollSensitivity ) {
+					this.scrollParent[ 0 ].scrollLeft = scrolled =
+						this.scrollParent[ 0 ].scrollLeft + o.scrollSpeed;
+				} else if ( event.pageX - this.overflowOffset.left < o.scrollSensitivity ) {
+					this.scrollParent[ 0 ].scrollLeft = scrolled =
+						this.scrollParent[ 0 ].scrollLeft - o.scrollSpeed;
+				}
+
+			} else {
+
+				if ( event.pageY - this.document.scrollTop() < o.scrollSensitivity ) {
+					scrolled = this.document.scrollTop( this.document.scrollTop() - o.scrollSpeed );
+				} else if ( this.window.height() - ( event.pageY - this.document.scrollTop() ) <
+						o.scrollSensitivity ) {
+					scrolled = this.document.scrollTop( this.document.scrollTop() + o.scrollSpeed );
+				}
+
+				if ( event.pageX - this.document.scrollLeft() < o.scrollSensitivity ) {
+					scrolled = this.document.scrollLeft(
+						this.document.scrollLeft() - o.scrollSpeed
+					);
+				} else if ( this.window.width() - ( event.pageX - this.document.scrollLeft() ) <
+						o.scrollSensitivity ) {
+					scrolled = this.document.scrollLeft(
+						this.document.scrollLeft() + o.scrollSpeed
+					);
+				}
+
+			}
+
+			if ( scrolled !== false && $.ui.ddmanager && !o.dropBehaviour ) {
+				$.ui.ddmanager.prepareOffsets( this, event );
+			}
+		}
+
+		//Regenerate the absolute position used for position checks
+		this.positionAbs = this._convertPositionTo( "absolute" );
+
+		//Set the helper position
+		if ( !this.options.axis || this.options.axis !== "y" ) {
+			this.helper[ 0 ].style.left = this.position.left + "px";
+		}
+		if ( !this.options.axis || this.options.axis !== "x" ) {
+			this.helper[ 0 ].style.top = this.position.top + "px";
+		}
+
+		//Rearrange
+		for ( i = this.items.length - 1; i >= 0; i-- ) {
+
+			//Cache variables and intersection, continue if no intersection
+			item = this.items[ i ];
+			itemElement = item.item[ 0 ];
+			intersection = this._intersectsWithPointer( item );
+			if ( !intersection ) {
+				continue;
+			}
+
+			// Only put the placeholder inside the current Container, skip all
+			// items from other containers. This works because when moving
+			// an item from one container to another the
+			// currentContainer is switched before the placeholder is moved.
+			//
+			// Without this, moving items in "sub-sortables" can cause
+			// the placeholder to jitter between the outer and inner container.
+			if ( item.instance !== this.currentContainer ) {
+				continue;
+			}
+
+			// Cannot intersect with itself
+			// no useless actions that have been done before
+			// no action if the item moved is the parent of the item checked
+			if ( itemElement !== this.currentItem[ 0 ] &&
+				this.placeholder[ intersection === 1 ? "next" : "prev" ]()[ 0 ] !== itemElement &&
+				!$.contains( this.placeholder[ 0 ], itemElement ) &&
+				( this.options.type === "semi-dynamic" ?
+					!$.contains( this.element[ 0 ], itemElement ) :
+					true
+				)
+			) {
+
+				this.direction = intersection === 1 ? "down" : "up";
+
+				if ( this.options.tolerance === "pointer" || this._intersectsWithSides( item ) ) {
+					this._rearrange( event, item );
+				} else {
+					break;
+				}
+
+				this._trigger( "change", event, this._uiHash() );
+				break;
+			}
+		}
+
+		//Post events to containers
+		this._contactContainers( event );
+
+		//Interconnect with droppables
+		if ( $.ui.ddmanager ) {
+			$.ui.ddmanager.drag( this, event );
+		}
+
+		//Call callbacks
+		this._trigger( "sort", event, this._uiHash() );
+
+		this.lastPositionAbs = this.positionAbs;
+		return false;
+
+	},
+
+	_mouseStop: function( event, noPropagation ) {
+
+		if ( !event ) {
+			return;
+		}
+
+		//If we are using droppables, inform the manager about the drop
+		if ( $.ui.ddmanager && !this.options.dropBehaviour ) {
+			$.ui.ddmanager.drop( this, event );
+		}
+
+		if ( this.options.revert ) {
+			var that = this,
+				cur = this.placeholder.offset(),
+				axis = this.options.axis,
+				animation = {};
+
+			if ( !axis || axis === "x" ) {
+				animation.left = cur.left - this.offset.parent.left - this.margins.left +
+					( this.offsetParent[ 0 ] === this.document[ 0 ].body ?
+						0 :
+						this.offsetParent[ 0 ].scrollLeft
+					);
+			}
+			if ( !axis || axis === "y" ) {
+				animation.top = cur.top - this.offset.parent.top - this.margins.top +
+					( this.offsetParent[ 0 ] === this.document[ 0 ].body ?
+						0 :
+						this.offsetParent[ 0 ].scrollTop
+					);
+			}
+			this.reverting = true;
+			$( this.helper ).animate(
+				animation,
+				parseInt( this.options.revert, 10 ) || 500,
+				function() {
+					that._clear( event );
+				}
+			);
+		} else {
+			this._clear( event, noPropagation );
+		}
+
+		return false;
+
+	},
+
+	cancel: function() {
+
+		if ( this.dragging ) {
+
+			this._mouseUp( new $.Event( "mouseup", { target: null } ) );
+
+			if ( this.options.helper === "original" ) {
+				this.currentItem.css( this._storedCSS );
+				this._removeClass( this.currentItem, "ui-sortable-helper" );
+			} else {
+				this.currentItem.show();
+			}
+
+			//Post deactivating events to containers
+			for ( var i = this.containers.length - 1; i >= 0; i-- ) {
+				this.containers[ i ]._trigger( "deactivate", null, this._uiHash( this ) );
+				if ( this.containers[ i ].containerCache.over ) {
+					this.containers[ i ]._trigger( "out", null, this._uiHash( this ) );
+					this.containers[ i ].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		if ( this.placeholder ) {
+
+			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately,
+			// it unbinds ALL events from the original node!
+			if ( this.placeholder[ 0 ].parentNode ) {
+				this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] );
+			}
+			if ( this.options.helper !== "original" && this.helper &&
+					this.helper[ 0 ].parentNode ) {
+				this.helper.remove();
+			}
+
+			$.extend( this, {
+				helper: null,
+				dragging: false,
+				reverting: false,
+				_noFinalSort: null
+			} );
+
+			if ( this.domPosition.prev ) {
+				$( this.domPosition.prev ).after( this.currentItem );
+			} else {
+				$( this.domPosition.parent ).prepend( this.currentItem );
+			}
+		}
+
+		return this;
+
+	},
+
+	serialize: function( o ) {
+
+		var items = this._getItemsAsjQuery( o && o.connected ),
+			str = [];
+		o = o || {};
+
+		$( items ).each( function() {
+			var res = ( $( o.item || this ).attr( o.attribute || "id" ) || "" )
+				.match( o.expression || ( /(.+)[\-=_](.+)/ ) );
+			if ( res ) {
+				str.push(
+					( o.key || res[ 1 ] + "[]" ) +
+					"=" + ( o.key && o.expression ? res[ 1 ] : res[ 2 ] ) );
+			}
+		} );
+
+		if ( !str.length && o.key ) {
+			str.push( o.key + "=" );
+		}
+
+		return str.join( "&" );
+
+	},
+
+	toArray: function( o ) {
+
+		var items = this._getItemsAsjQuery( o && o.connected ),
+			ret = [];
+
+		o = o || {};
+
+		items.each( function() {
+			ret.push( $( o.item || this ).attr( o.attribute || "id" ) || "" );
+		} );
+		return ret;
+
+	},
+
+	/* Be careful with the following core functions */
+	_intersectsWith: function( item ) {
+
+		var x1 = this.positionAbs.left,
+			x2 = x1 + this.helperProportions.width,
+			y1 = this.positionAbs.top,
+			y2 = y1 + this.helperProportions.height,
+			l = item.left,
+			r = l + item.width,
+			t = item.top,
+			b = t + item.height,
+			dyClick = this.offset.click.top,
+			dxClick = this.offset.click.left,
+			isOverElementHeight = ( this.options.axis === "x" ) || ( ( y1 + dyClick ) > t &&
+				( y1 + dyClick ) < b ),
+			isOverElementWidth = ( this.options.axis === "y" ) || ( ( x1 + dxClick ) > l &&
+				( x1 + dxClick ) < r ),
+			isOverElement = isOverElementHeight && isOverElementWidth;
+
+		if ( this.options.tolerance === "pointer" ||
+			this.options.forcePointerForContainers ||
+			( this.options.tolerance !== "pointer" &&
+				this.helperProportions[ this.floating ? "width" : "height" ] >
+				item[ this.floating ? "width" : "height" ] )
+		) {
+			return isOverElement;
+		} else {
+
+			return ( l < x1 + ( this.helperProportions.width / 2 ) && // Right Half
+				x2 - ( this.helperProportions.width / 2 ) < r && // Left Half
+				t < y1 + ( this.helperProportions.height / 2 ) && // Bottom Half
+				y2 - ( this.helperProportions.height / 2 ) < b ); // Top Half
+
+		}
+	},
+
+	_intersectsWithPointer: function( item ) {
+		var verticalDirection, horizontalDirection,
+			isOverElementHeight = ( this.options.axis === "x" ) ||
+				this._isOverAxis(
+					this.positionAbs.top + this.offset.click.top, item.top, item.height ),
+			isOverElementWidth = ( this.options.axis === "y" ) ||
+				this._isOverAxis(
+					this.positionAbs.left + this.offset.click.left, item.left, item.width ),
+			isOverElement = isOverElementHeight && isOverElementWidth;
+
+		if ( !isOverElement ) {
+			return false;
+		}
+
+		verticalDirection = this._getDragVerticalDirection();
+		horizontalDirection = this._getDragHorizontalDirection();
+
+		return this.floating ?
+			( ( horizontalDirection === "right" || verticalDirection === "down" ) ? 2 : 1 )
+			: ( verticalDirection && ( verticalDirection === "down" ? 2 : 1 ) );
+
+	},
+
+	_intersectsWithSides: function( item ) {
+
+		var isOverBottomHalf = this._isOverAxis( this.positionAbs.top +
+				this.offset.click.top, item.top + ( item.height / 2 ), item.height ),
+			isOverRightHalf = this._isOverAxis( this.positionAbs.left +
+				this.offset.click.left, item.left + ( item.width / 2 ), item.width ),
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if ( this.floating && horizontalDirection ) {
+			return ( ( horizontalDirection === "right" && isOverRightHalf ) ||
+				( horizontalDirection === "left" && !isOverRightHalf ) );
+		} else {
+			return verticalDirection && ( ( verticalDirection === "down" && isOverBottomHalf ) ||
+				( verticalDirection === "up" && !isOverBottomHalf ) );
+		}
+
+	},
+
+	_getDragVerticalDirection: function() {
+		var delta = this.positionAbs.top - this.lastPositionAbs.top;
+		return delta !== 0 && ( delta > 0 ? "down" : "up" );
+	},
+
+	_getDragHorizontalDirection: function() {
+		var delta = this.positionAbs.left - this.lastPositionAbs.left;
+		return delta !== 0 && ( delta > 0 ? "right" : "left" );
+	},
+
+	refresh: function( event ) {
+		this._refreshItems( event );
+		this._setHandleClassName();
+		this.refreshPositions();
+		return this;
+	},
+
+	_connectWith: function() {
+		var options = this.options;
+		return options.connectWith.constructor === String ?
+			[ options.connectWith ] :
+			options.connectWith;
+	},
+
+	_getItemsAsjQuery: function( connected ) {
+
+		var i, j, cur, inst,
+			items = [],
+			queries = [],
+			connectWith = this._connectWith();
+
+		if ( connectWith && connected ) {
+			for ( i = connectWith.length - 1; i >= 0; i-- ) {
+				cur = $( connectWith[ i ], this.document[ 0 ] );
+				for ( j = cur.length - 1; j >= 0; j-- ) {
+					inst = $.data( cur[ j ], this.widgetFullName );
+					if ( inst && inst !== this && !inst.options.disabled ) {
+						queries.push( [ $.isFunction( inst.options.items ) ?
+							inst.options.items.call( inst.element ) :
+							$( inst.options.items, inst.element )
+								.not( ".ui-sortable-helper" )
+								.not( ".ui-sortable-placeholder" ), inst ] );
+					}
+				}
+			}
+		}
+
+		queries.push( [ $.isFunction( this.options.items ) ?
+			this.options.items
+				.call( this.element, null, { options: this.options, item: this.currentItem } ) :
+			$( this.options.items, this.element )
+				.not( ".ui-sortable-helper" )
+				.not( ".ui-sortable-placeholder" ), this ] );
+
+		function addItems() {
+			items.push( this );
+		}
+		for ( i = queries.length - 1; i >= 0; i-- ) {
+			queries[ i ][ 0 ].each( addItems );
+		}
+
+		return $( items );
+
+	},
+
+	_removeCurrentsFromItems: function() {
+
+		var list = this.currentItem.find( ":data(" + this.widgetName + "-item)" );
+
+		this.items = $.grep( this.items, function( item ) {
+			for ( var j = 0; j < list.length; j++ ) {
+				if ( list[ j ] === item.item[ 0 ] ) {
+					return false;
+				}
+			}
+			return true;
+		} );
+
+	},
+
+	_refreshItems: function( event ) {
+
+		this.items = [];
+		this.containers = [ this ];
+
+		var i, j, cur, inst, targetData, _queries, item, queriesLength,
+			items = this.items,
+			queries = [ [ $.isFunction( this.options.items ) ?
+				this.options.items.call( this.element[ 0 ], event, { item: this.currentItem } ) :
+				$( this.options.items, this.element ), this ] ],
+			connectWith = this._connectWith();
+
+		//Shouldn't be run the first time through due to massive slow-down
+		if ( connectWith && this.ready ) {
+			for ( i = connectWith.length - 1; i >= 0; i-- ) {
+				cur = $( connectWith[ i ], this.document[ 0 ] );
+				for ( j = cur.length - 1; j >= 0; j-- ) {
+					inst = $.data( cur[ j ], this.widgetFullName );
+					if ( inst && inst !== this && !inst.options.disabled ) {
+						queries.push( [ $.isFunction( inst.options.items ) ?
+							inst.options.items
+								.call( inst.element[ 0 ], event, { item: this.currentItem } ) :
+							$( inst.options.items, inst.element ), inst ] );
+						this.containers.push( inst );
+					}
+				}
+			}
+		}
+
+		for ( i = queries.length - 1; i >= 0; i-- ) {
+			targetData = queries[ i ][ 1 ];
+			_queries = queries[ i ][ 0 ];
+
+			for ( j = 0, queriesLength = _queries.length; j < queriesLength; j++ ) {
+				item = $( _queries[ j ] );
+
+				// Data for target checking (mouse manager)
+				item.data( this.widgetName + "-item", targetData );
+
+				items.push( {
+					item: item,
+					instance: targetData,
+					width: 0, height: 0,
+					left: 0, top: 0
+				} );
+			}
+		}
+
+	},
+
+	refreshPositions: function( fast ) {
+
+		// Determine whether items are being displayed horizontally
+		this.floating = this.items.length ?
+			this.options.axis === "x" || this._isFloating( this.items[ 0 ].item ) :
+			false;
+
+		//This has to be redone because due to the item being moved out/into the offsetParent,
+		// the offsetParent's position will change
+		if ( this.offsetParent && this.helper ) {
+			this.offset.parent = this._getParentOffset();
+		}
+
+		var i, item, t, p;
+
+		for ( i = this.items.length - 1; i >= 0; i-- ) {
+			item = this.items[ i ];
+
+			//We ignore calculating positions of all connected containers when we're not over them
+			if ( item.instance !== this.currentContainer && this.currentContainer &&
+					item.item[ 0 ] !== this.currentItem[ 0 ] ) {
+				continue;
+			}
+
+			t = this.options.toleranceElement ?
+				$( this.options.toleranceElement, item.item ) :
+				item.item;
+
+			if ( !fast ) {
+				item.width = t.outerWidth();
+				item.height = t.outerHeight();
+			}
+
+			p = t.offset();
+			item.left = p.left;
+			item.top = p.top;
+		}
+
+		if ( this.options.custom && this.options.custom.refreshContainers ) {
+			this.options.custom.refreshContainers.call( this );
+		} else {
+			for ( i = this.containers.length - 1; i >= 0; i-- ) {
+				p = this.containers[ i ].element.offset();
+				this.containers[ i ].containerCache.left = p.left;
+				this.containers[ i ].containerCache.top = p.top;
+				this.containers[ i ].containerCache.width =
+					this.containers[ i ].element.outerWidth();
+				this.containers[ i ].containerCache.height =
+					this.containers[ i ].element.outerHeight();
+			}
+		}
+
+		return this;
+	},
+
+	_createPlaceholder: function( that ) {
+		that = that || this;
+		var className,
+			o = that.options;
+
+		if ( !o.placeholder || o.placeholder.constructor === String ) {
+			className = o.placeholder;
+			o.placeholder = {
+				element: function() {
+
+					var nodeName = that.currentItem[ 0 ].nodeName.toLowerCase(),
+						element = $( "<" + nodeName + ">", that.document[ 0 ] );
+
+						that._addClass( element, "ui-sortable-placeholder",
+								className || that.currentItem[ 0 ].className )
+							._removeClass( element, "ui-sortable-helper" );
+
+					if ( nodeName === "tbody" ) {
+						that._createTrPlaceholder(
+							that.currentItem.find( "tr" ).eq( 0 ),
+							$( "<tr>", that.document[ 0 ] ).appendTo( element )
+						);
+					} else if ( nodeName === "tr" ) {
+						that._createTrPlaceholder( that.currentItem, element );
+					} else if ( nodeName === "img" ) {
+						element.attr( "src", that.currentItem.attr( "src" ) );
+					}
+
+					if ( !className ) {
+						element.css( "visibility", "hidden" );
+					}
+
+					return element;
+				},
+				update: function( container, p ) {
+
+					// 1. If a className is set as 'placeholder option, we don't force sizes -
+					// the class is responsible for that
+					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a
+					// class name is specified
+					if ( className && !o.forcePlaceholderSize ) {
+						return;
+					}
+
+					//If the element doesn't have a actual height by itself (without styles coming
+					// from a stylesheet), it receives the inline height from the dragged item
+					if ( !p.height() ) {
+						p.height(
+							that.currentItem.innerHeight() -
+							parseInt( that.currentItem.css( "paddingTop" ) || 0, 10 ) -
+							parseInt( that.currentItem.css( "paddingBottom" ) || 0, 10 ) );
+					}
+					if ( !p.width() ) {
+						p.width(
+							that.currentItem.innerWidth() -
+							parseInt( that.currentItem.css( "paddingLeft" ) || 0, 10 ) -
+							parseInt( that.currentItem.css( "paddingRight" ) || 0, 10 ) );
+					}
+				}
+			};
+		}
+
+		//Create the placeholder
+		that.placeholder = $( o.placeholder.element.call( that.element, that.currentItem ) );
+
+		//Append it after the actual current item
+		that.currentItem.after( that.placeholder );
+
+		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
+		o.placeholder.update( that, that.placeholder );
+
+	},
+
+	_createTrPlaceholder: function( sourceTr, targetTr ) {
+		var that = this;
+
+		sourceTr.children().each( function() {
+			$( "<td>&#160;</td>", that.document[ 0 ] )
+				.attr( "colspan", $( this ).attr( "colspan" ) || 1 )
+				.appendTo( targetTr );
+		} );
+	},
+
+	_contactContainers: function( event ) {
+		var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, cur, nearBottom,
+			floating, axis,
+			innermostContainer = null,
+			innermostIndex = null;
+
+		// Get innermost container that intersects with item
+		for ( i = this.containers.length - 1; i >= 0; i-- ) {
+
+			// Never consider a container that's located within the item itself
+			if ( $.contains( this.currentItem[ 0 ], this.containers[ i ].element[ 0 ] ) ) {
+				continue;
+			}
+
+			if ( this._intersectsWith( this.containers[ i ].containerCache ) ) {
+
+				// If we've already found a container and it's more "inner" than this, then continue
+				if ( innermostContainer &&
+						$.contains(
+							this.containers[ i ].element[ 0 ],
+							innermostContainer.element[ 0 ] ) ) {
+					continue;
+				}
+
+				innermostContainer = this.containers[ i ];
+				innermostIndex = i;
+
+			} else {
+
+				// container doesn't intersect. trigger "out" event if necessary
+				if ( this.containers[ i ].containerCache.over ) {
+					this.containers[ i ]._trigger( "out", event, this._uiHash( this ) );
+					this.containers[ i ].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		// If no intersecting containers found, return
+		if ( !innermostContainer ) {
+			return;
+		}
+
+		// Move the item into the container if it's not there already
+		if ( this.containers.length === 1 ) {
+			if ( !this.containers[ innermostIndex ].containerCache.over ) {
+				this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) );
+				this.containers[ innermostIndex ].containerCache.over = 1;
+			}
+		} else {
+
+			// When entering a new container, we will find the item with the least distance and
+			// append our item near it
+			dist = 10000;
+			itemWithLeastDistance = null;
+			floating = innermostContainer.floating || this._isFloating( this.currentItem );
+			posProperty = floating ? "left" : "top";
+			sizeProperty = floating ? "width" : "height";
+			axis = floating ? "pageX" : "pageY";
+
+			for ( j = this.items.length - 1; j >= 0; j-- ) {
+				if ( !$.contains(
+						this.containers[ innermostIndex ].element[ 0 ], this.items[ j ].item[ 0 ] )
+				) {
+					continue;
+				}
+				if ( this.items[ j ].item[ 0 ] === this.currentItem[ 0 ] ) {
+					continue;
+				}
+
+				cur = this.items[ j ].item.offset()[ posProperty ];
+				nearBottom = false;
+				if ( event[ axis ] - cur > this.items[ j ][ sizeProperty ] / 2 ) {
+					nearBottom = true;
+				}
+
+				if ( Math.abs( event[ axis ] - cur ) < dist ) {
+					dist = Math.abs( event[ axis ] - cur );
+					itemWithLeastDistance = this.items[ j ];
+					this.direction = nearBottom ? "up" : "down";
+				}
+			}
+
+			//Check if dropOnEmpty is enabled
+			if ( !itemWithLeastDistance && !this.options.dropOnEmpty ) {
+				return;
+			}
+
+			if ( this.currentContainer === this.containers[ innermostIndex ] ) {
+				if ( !this.currentContainer.containerCache.over ) {
+					this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash() );
+					this.currentContainer.containerCache.over = 1;
+				}
+				return;
+			}
+
+			itemWithLeastDistance ?
+				this._rearrange( event, itemWithLeastDistance, null, true ) :
+				this._rearrange( event, null, this.containers[ innermostIndex ].element, true );
+			this._trigger( "change", event, this._uiHash() );
+			this.containers[ innermostIndex ]._trigger( "change", event, this._uiHash( this ) );
+			this.currentContainer = this.containers[ innermostIndex ];
+
+			//Update the placeholder
+			this.options.placeholder.update( this.currentContainer, this.placeholder );
+
+			this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) );
+			this.containers[ innermostIndex ].containerCache.over = 1;
+		}
+
+	},
+
+	_createHelper: function( event ) {
+
+		var o = this.options,
+			helper = $.isFunction( o.helper ) ?
+				$( o.helper.apply( this.element[ 0 ], [ event, this.currentItem ] ) ) :
+				( o.helper === "clone" ? this.currentItem.clone() : this.currentItem );
+
+		//Add the helper to the DOM if that didn't happen already
+		if ( !helper.parents( "body" ).length ) {
+			$( o.appendTo !== "parent" ?
+				o.appendTo :
+				this.currentItem[ 0 ].parentNode )[ 0 ].appendChild( helper[ 0 ] );
+		}
+
+		if ( helper[ 0 ] === this.currentItem[ 0 ] ) {
+			this._storedCSS = {
+				width: this.currentItem[ 0 ].style.width,
+				height: this.currentItem[ 0 ].style.height,
+				position: this.currentItem.css( "position" ),
+				top: this.currentItem.css( "top" ),
+				left: this.currentItem.css( "left" )
+			};
+		}
+
+		if ( !helper[ 0 ].style.width || o.forceHelperSize ) {
+			helper.width( this.currentItem.width() );
+		}
+		if ( !helper[ 0 ].style.height || o.forceHelperSize ) {
+			helper.height( this.currentItem.height() );
+		}
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function( obj ) {
+		if ( typeof obj === "string" ) {
+			obj = obj.split( " " );
+		}
+		if ( $.isArray( obj ) ) {
+			obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 };
+		}
+		if ( "left" in obj ) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ( "right" in obj ) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ( "top" in obj ) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ( "bottom" in obj ) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+		//Get the offsetParent and cache its position
+		this.offsetParent = this.helper.offsetParent();
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the
+		// following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the
+		// next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't
+		// the document, which means that the scroll is included in the initial calculation of the
+		// offset of the parent, and never recalculated upon drag
+		if ( this.cssPosition === "absolute" && this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+				$.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		// This needs to be actually done for all browsers, since pageX/pageY includes this
+		// information with an ugly IE fix
+		if ( this.offsetParent[ 0 ] === this.document[ 0 ].body ||
+				( this.offsetParent[ 0 ].tagName &&
+				this.offsetParent[ 0 ].tagName.toLowerCase() === "html" && $.ui.ie ) ) {
+			po = { top: 0, left: 0 };
+		}
+
+		return {
+			top: po.top + ( parseInt( this.offsetParent.css( "borderTopWidth" ), 10 ) || 0 ),
+			left: po.left + ( parseInt( this.offsetParent.css( "borderLeftWidth" ), 10 ) || 0 )
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if ( this.cssPosition === "relative" ) {
+			var p = this.currentItem.position();
+			return {
+				top: p.top - ( parseInt( this.helper.css( "top" ), 10 ) || 0 ) +
+					this.scrollParent.scrollTop(),
+				left: p.left - ( parseInt( this.helper.css( "left" ), 10 ) || 0 ) +
+					this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: ( parseInt( this.currentItem.css( "marginLeft" ), 10 ) || 0 ),
+			top: ( parseInt( this.currentItem.css( "marginTop" ), 10 ) || 0 )
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var ce, co, over,
+			o = this.options;
+		if ( o.containment === "parent" ) {
+			o.containment = this.helper[ 0 ].parentNode;
+		}
+		if ( o.containment === "document" || o.containment === "window" ) {
+			this.containment = [
+				0 - this.offset.relative.left - this.offset.parent.left,
+				0 - this.offset.relative.top - this.offset.parent.top,
+				o.containment === "document" ?
+					this.document.width() :
+					this.window.width() - this.helperProportions.width - this.margins.left,
+				( o.containment === "document" ?
+					( this.document.height() || document.body.parentNode.scrollHeight ) :
+					this.window.height() || this.document[ 0 ].body.parentNode.scrollHeight
+				) - this.helperProportions.height - this.margins.top
+			];
+		}
+
+		if ( !( /^(document|window|parent)$/ ).test( o.containment ) ) {
+			ce = $( o.containment )[ 0 ];
+			co = $( o.containment ).offset();
+			over = ( $( ce ).css( "overflow" ) !== "hidden" );
+
+			this.containment = [
+				co.left + ( parseInt( $( ce ).css( "borderLeftWidth" ), 10 ) || 0 ) +
+					( parseInt( $( ce ).css( "paddingLeft" ), 10 ) || 0 ) - this.margins.left,
+				co.top + ( parseInt( $( ce ).css( "borderTopWidth" ), 10 ) || 0 ) +
+					( parseInt( $( ce ).css( "paddingTop" ), 10 ) || 0 ) - this.margins.top,
+				co.left + ( over ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) -
+					( parseInt( $( ce ).css( "borderLeftWidth" ), 10 ) || 0 ) -
+					( parseInt( $( ce ).css( "paddingRight" ), 10 ) || 0 ) -
+					this.helperProportions.width - this.margins.left,
+				co.top + ( over ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) -
+					( parseInt( $( ce ).css( "borderTopWidth" ), 10 ) || 0 ) -
+					( parseInt( $( ce ).css( "paddingBottom" ), 10 ) || 0 ) -
+					this.helperProportions.height - this.margins.top
+			];
+		}
+
+	},
+
+	_convertPositionTo: function( d, pos ) {
+
+		if ( !pos ) {
+			pos = this.position;
+		}
+		var mod = d === "absolute" ? 1 : -1,
+			scroll = this.cssPosition === "absolute" &&
+				!( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+				$.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ?
+					this.offsetParent :
+					this.scrollParent,
+			scrollIsRootNode = ( /(html|body)/i ).test( scroll[ 0 ].tagName );
+
+		return {
+			top: (
+
+				// The absolute mouse position
+				pos.top	+
+
+				// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.relative.top * mod +
+
+				// The offsetParent's offset without borders (offset + border)
+				this.offset.parent.top * mod -
+				( ( this.cssPosition === "fixed" ?
+					-this.scrollParent.scrollTop() :
+					( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod )
+			),
+			left: (
+
+				// The absolute mouse position
+				pos.left +
+
+				// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.relative.left * mod +
+
+				// The offsetParent's offset without borders (offset + border)
+				this.offset.parent.left * mod	-
+				( ( this.cssPosition === "fixed" ?
+					-this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 :
+					scroll.scrollLeft() ) * mod )
+			)
+		};
+
+	},
+
+	_generatePosition: function( event ) {
+
+		var top, left,
+			o = this.options,
+			pageX = event.pageX,
+			pageY = event.pageY,
+			scroll = this.cssPosition === "absolute" &&
+				!( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+				$.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ?
+					this.offsetParent :
+					this.scrollParent,
+				scrollIsRootNode = ( /(html|body)/i ).test( scroll[ 0 ].tagName );
+
+		// This is another very weird special case that only happens for relative elements:
+		// 1. If the css position is relative
+		// 2. and the scroll parent is the document or similar to the offset parent
+		// we have to refresh the relative offset during the scroll so there are no jumps
+		if ( this.cssPosition === "relative" && !( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+				this.scrollParent[ 0 ] !== this.offsetParent[ 0 ] ) ) {
+			this.offset.relative = this._getRelativeOffset();
+		}
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		if ( this.originalPosition ) { //If we are not dragging yet, we won't check for options
+
+			if ( this.containment ) {
+				if ( event.pageX - this.offset.click.left < this.containment[ 0 ] ) {
+					pageX = this.containment[ 0 ] + this.offset.click.left;
+				}
+				if ( event.pageY - this.offset.click.top < this.containment[ 1 ] ) {
+					pageY = this.containment[ 1 ] + this.offset.click.top;
+				}
+				if ( event.pageX - this.offset.click.left > this.containment[ 2 ] ) {
+					pageX = this.containment[ 2 ] + this.offset.click.left;
+				}
+				if ( event.pageY - this.offset.click.top > this.containment[ 3 ] ) {
+					pageY = this.containment[ 3 ] + this.offset.click.top;
+				}
+			}
+
+			if ( o.grid ) {
+				top = this.originalPageY + Math.round( ( pageY - this.originalPageY ) /
+					o.grid[ 1 ] ) * o.grid[ 1 ];
+				pageY = this.containment ?
+					( ( top - this.offset.click.top >= this.containment[ 1 ] &&
+						top - this.offset.click.top <= this.containment[ 3 ] ) ?
+							top :
+							( ( top - this.offset.click.top >= this.containment[ 1 ] ) ?
+								top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) :
+								top;
+
+				left = this.originalPageX + Math.round( ( pageX - this.originalPageX ) /
+					o.grid[ 0 ] ) * o.grid[ 0 ];
+				pageX = this.containment ?
+					( ( left - this.offset.click.left >= this.containment[ 0 ] &&
+						left - this.offset.click.left <= this.containment[ 2 ] ) ?
+							left :
+							( ( left - this.offset.click.left >= this.containment[ 0 ] ) ?
+								left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) :
+								left;
+			}
+
+		}
+
+		return {
+			top: (
+
+				// The absolute mouse position
+				pageY -
+
+				// Click offset (relative to the element)
+				this.offset.click.top -
+
+				// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.relative.top -
+
+				// The offsetParent's offset without borders (offset + border)
+				this.offset.parent.top +
+				( ( this.cssPosition === "fixed" ?
+					-this.scrollParent.scrollTop() :
+					( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) )
+			),
+			left: (
+
+				// The absolute mouse position
+				pageX -
+
+				// Click offset (relative to the element)
+				this.offset.click.left -
+
+				// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.relative.left -
+
+				// The offsetParent's offset without borders (offset + border)
+				this.offset.parent.left +
+				( ( this.cssPosition === "fixed" ?
+					-this.scrollParent.scrollLeft() :
+					scrollIsRootNode ? 0 : scroll.scrollLeft() ) )
+			)
+		};
+
+	},
+
+	_rearrange: function( event, i, a, hardRefresh ) {
+
+		a ? a[ 0 ].appendChild( this.placeholder[ 0 ] ) :
+			i.item[ 0 ].parentNode.insertBefore( this.placeholder[ 0 ],
+				( this.direction === "down" ? i.item[ 0 ] : i.item[ 0 ].nextSibling ) );
+
+		//Various things done here to improve the performance:
+		// 1. we create a setTimeout, that calls refreshPositions
+		// 2. on the instance, we have a counter variable, that get's higher after every append
+		// 3. on the local scope, we copy the counter variable, and check in the timeout,
+		// if it's still the same
+		// 4. this lets only the last addition to the timeout stack through
+		this.counter = this.counter ? ++this.counter : 1;
+		var counter = this.counter;
+
+		this._delay( function() {
+			if ( counter === this.counter ) {
+
+				//Precompute after each DOM insertion, NOT on mousemove
+				this.refreshPositions( !hardRefresh );
+			}
+		} );
+
+	},
+
+	_clear: function( event, noPropagation ) {
+
+		this.reverting = false;
+
+		// We delay all events that have to be triggered to after the point where the placeholder
+		// has been removed and everything else normalized again
+		var i,
+			delayedTriggers = [];
+
+		// We first have to update the dom position of the actual currentItem
+		// Note: don't do it if the current item is already removed (by a user), or it gets
+		// reappended (see #4088)
+		if ( !this._noFinalSort && this.currentItem.parent().length ) {
+			this.placeholder.before( this.currentItem );
+		}
+		this._noFinalSort = null;
+
+		if ( this.helper[ 0 ] === this.currentItem[ 0 ] ) {
+			for ( i in this._storedCSS ) {
+				if ( this._storedCSS[ i ] === "auto" || this._storedCSS[ i ] === "static" ) {
+					this._storedCSS[ i ] = "";
+				}
+			}
+			this.currentItem.css( this._storedCSS );
+			this._removeClass( this.currentItem, "ui-sortable-helper" );
+		} else {
+			this.currentItem.show();
+		}
+
+		if ( this.fromOutside && !noPropagation ) {
+			delayedTriggers.push( function( event ) {
+				this._trigger( "receive", event, this._uiHash( this.fromOutside ) );
+			} );
+		}
+		if ( ( this.fromOutside ||
+				this.domPosition.prev !==
+				this.currentItem.prev().not( ".ui-sortable-helper" )[ 0 ] ||
+				this.domPosition.parent !== this.currentItem.parent()[ 0 ] ) && !noPropagation ) {
+
+			// Trigger update callback if the DOM position has changed
+			delayedTriggers.push( function( event ) {
+				this._trigger( "update", event, this._uiHash() );
+			} );
+		}
+
+		// Check if the items Container has Changed and trigger appropriate
+		// events.
+		if ( this !== this.currentContainer ) {
+			if ( !noPropagation ) {
+				delayedTriggers.push( function( event ) {
+					this._trigger( "remove", event, this._uiHash() );
+				} );
+				delayedTriggers.push( ( function( c ) {
+					return function( event ) {
+						c._trigger( "receive", event, this._uiHash( this ) );
+					};
+				} ).call( this, this.currentContainer ) );
+				delayedTriggers.push( ( function( c ) {
+					return function( event ) {
+						c._trigger( "update", event, this._uiHash( this ) );
+					};
+				} ).call( this, this.currentContainer ) );
+			}
+		}
+
+		//Post events to containers
+		function delayEvent( type, instance, container ) {
+			return function( event ) {
+				container._trigger( type, event, instance._uiHash( instance ) );
+			};
+		}
+		for ( i = this.containers.length - 1; i >= 0; i-- ) {
+			if ( !noPropagation ) {
+				delayedTriggers.push( delayEvent( "deactivate", this, this.containers[ i ] ) );
+			}
+			if ( this.containers[ i ].containerCache.over ) {
+				delayedTriggers.push( delayEvent( "out", this, this.containers[ i ] ) );
+				this.containers[ i ].containerCache.over = 0;
+			}
+		}
+
+		//Do what was originally in plugins
+		if ( this.storedCursor ) {
+			this.document.find( "body" ).css( "cursor", this.storedCursor );
+			this.storedStylesheet.remove();
+		}
+		if ( this._storedOpacity ) {
+			this.helper.css( "opacity", this._storedOpacity );
+		}
+		if ( this._storedZIndex ) {
+			this.helper.css( "zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex );
+		}
+
+		this.dragging = false;
+
+		if ( !noPropagation ) {
+			this._trigger( "beforeStop", event, this._uiHash() );
+		}
+
+		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately,
+		// it unbinds ALL events from the original node!
+		this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] );
+
+		if ( !this.cancelHelperRemoval ) {
+			if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
+				this.helper.remove();
+			}
+			this.helper = null;
+		}
+
+		if ( !noPropagation ) {
+			for ( i = 0; i < delayedTriggers.length; i++ ) {
+
+				// Trigger all delayed events
+				delayedTriggers[ i ].call( this, event );
+			}
+			this._trigger( "stop", event, this._uiHash() );
+		}
+
+		this.fromOutside = false;
+		return !this.cancelHelperRemoval;
+
+	},
+
+	_trigger: function() {
+		if ( $.Widget.prototype._trigger.apply( this, arguments ) === false ) {
+			this.cancel();
+		}
+	},
+
+	_uiHash: function( _inst ) {
+		var inst = _inst || this;
+		return {
+			helper: inst.helper,
+			placeholder: inst.placeholder || $( [] ),
+			position: inst.position,
+			originalPosition: inst.originalPosition,
+			offset: inst.positionAbs,
+			item: inst.currentItem,
+			sender: _inst ? _inst.element : null
+		};
+	}
+
+} );
+
+
+/*!
+ * jQuery UI Accordion 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Accordion
+//>>group: Widgets
+// jscs:disable maximumLineLength
+//>>description: Displays collapsible content panels for presenting information in a limited amount of space.
+// jscs:enable maximumLineLength
+//>>docs: http://api.jqueryui.com/accordion/
+//>>demos: http://jqueryui.com/accordion/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/accordion.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+var widgetsAccordion = $.widget( "ui.accordion", {
+	version: "1.12.1",
+	options: {
+		active: 0,
+		animate: {},
+		classes: {
+			"ui-accordion-header": "ui-corner-top",
+			"ui-accordion-header-collapsed": "ui-corner-all",
+			"ui-accordion-content": "ui-corner-bottom"
+		},
+		collapsible: false,
+		event: "click",
+		header: "> li > :first-child, > :not(li):even",
+		heightStyle: "auto",
+		icons: {
+			activeHeader: "ui-icon-triangle-1-s",
+			header: "ui-icon-triangle-1-e"
+		},
+
+		// Callbacks
+		activate: null,
+		beforeActivate: null
+	},
+
+	hideProps: {
+		borderTopWidth: "hide",
+		borderBottomWidth: "hide",
+		paddingTop: "hide",
+		paddingBottom: "hide",
+		height: "hide"
+	},
+
+	showProps: {
+		borderTopWidth: "show",
+		borderBottomWidth: "show",
+		paddingTop: "show",
+		paddingBottom: "show",
+		height: "show"
+	},
+
+	_create: function() {
+		var options = this.options;
+
+		this.prevShow = this.prevHide = $();
+		this._addClass( "ui-accordion", "ui-widget ui-helper-reset" );
+		this.element.attr( "role", "tablist" );
+
+		// Don't allow collapsible: false and active: false / null
+		if ( !options.collapsible && ( options.active === false || options.active == null ) ) {
+			options.active = 0;
+		}
+
+		this._processPanels();
+
+		// handle negative values
+		if ( options.active < 0 ) {
+			options.active += this.headers.length;
+		}
+		this._refresh();
+	},
+
+	_getCreateEventData: function() {
+		return {
+			header: this.active,
+			panel: !this.active.length ? $() : this.active.next()
+		};
+	},
+
+	_createIcons: function() {
+		var icon, children,
+			icons = this.options.icons;
+
+		if ( icons ) {
+			icon = $( "<span>" );
+			this._addClass( icon, "ui-accordion-header-icon", "ui-icon " + icons.header );
+			icon.prependTo( this.headers );
+			children = this.active.children( ".ui-accordion-header-icon" );
+			this._removeClass( children, icons.header )
+				._addClass( children, null, icons.activeHeader )
+				._addClass( this.headers, "ui-accordion-icons" );
+		}
+	},
+
+	_destroyIcons: function() {
+		this._removeClass( this.headers, "ui-accordion-icons" );
+		this.headers.children( ".ui-accordion-header-icon" ).remove();
+	},
+
+	_destroy: function() {
+		var contents;
+
+		// Clean up main element
+		this.element.removeAttr( "role" );
+
+		// Clean up headers
+		this.headers
+			.removeAttr( "role aria-expanded aria-selected aria-controls tabIndex" )
+			.removeUniqueId();
+
+		this._destroyIcons();
+
+		// Clean up content panels
+		contents = this.headers.next()
+			.css( "display", "" )
+			.removeAttr( "role aria-hidden aria-labelledby" )
+			.removeUniqueId();
+
+		if ( this.options.heightStyle !== "content" ) {
+			contents.css( "height", "" );
+		}
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "active" ) {
+
+			// _activate() will handle invalid values and update this.options
+			this._activate( value );
+			return;
+		}
+
+		if ( key === "event" ) {
+			if ( this.options.event ) {
+				this._off( this.headers, this.options.event );
+			}
+			this._setupEvents( value );
+		}
+
+		this._super( key, value );
+
+		// Setting collapsible: false while collapsed; open first panel
+		if ( key === "collapsible" && !value && this.options.active === false ) {
+			this._activate( 0 );
+		}
+
+		if ( key === "icons" ) {
+			this._destroyIcons();
+			if ( value ) {
+				this._createIcons();
+			}
+		}
+	},
+
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this.element.attr( "aria-disabled", value );
+
+		// Support: IE8 Only
+		// #5332 / #6059 - opacity doesn't cascade to positioned elements in IE
+		// so we need to add the disabled class to the headers and panels
+		this._toggleClass( null, "ui-state-disabled", !!value );
+		this._toggleClass( this.headers.add( this.headers.next() ), null, "ui-state-disabled",
+			!!value );
+	},
+
+	_keydown: function( event ) {
+		if ( event.altKey || event.ctrlKey ) {
+			return;
+		}
+
+		var keyCode = $.ui.keyCode,
+			length = this.headers.length,
+			currentIndex = this.headers.index( event.target ),
+			toFocus = false;
+
+		switch ( event.keyCode ) {
+		case keyCode.RIGHT:
+		case keyCode.DOWN:
+			toFocus = this.headers[ ( currentIndex + 1 ) % length ];
+			break;
+		case keyCode.LEFT:
+		case keyCode.UP:
+			toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
+			break;
+		case keyCode.SPACE:
+		case keyCode.ENTER:
+			this._eventHandler( event );
+			break;
+		case keyCode.HOME:
+			toFocus = this.headers[ 0 ];
+			break;
+		case keyCode.END:
+			toFocus = this.headers[ length - 1 ];
+			break;
+		}
+
+		if ( toFocus ) {
+			$( event.target ).attr( "tabIndex", -1 );
+			$( toFocus ).attr( "tabIndex", 0 );
+			$( toFocus ).trigger( "focus" );
+			event.preventDefault();
+		}
+	},
+
+	_panelKeyDown: function( event ) {
+		if ( event.keyCode === $.ui.keyCode.UP && event.ctrlKey ) {
+			$( event.currentTarget ).prev().trigger( "focus" );
+		}
+	},
+
+	refresh: function() {
+		var options = this.options;
+		this._processPanels();
+
+		// Was collapsed or no panel
+		if ( ( options.active === false && options.collapsible === true ) ||
+				!this.headers.length ) {
+			options.active = false;
+			this.active = $();
+
+		// active false only when collapsible is true
+		} else if ( options.active === false ) {
+			this._activate( 0 );
+
+		// was active, but active panel is gone
+		} else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
+
+			// all remaining panel are disabled
+			if ( this.headers.length === this.headers.find( ".ui-state-disabled" ).length ) {
+				options.active = false;
+				this.active = $();
+
+			// activate previous panel
+			} else {
+				this._activate( Math.max( 0, options.active - 1 ) );
+			}
+
+		// was active, active panel still exists
+		} else {
+
+			// make sure active index is correct
+			options.active = this.headers.index( this.active );
+		}
+
+		this._destroyIcons();
+
+		this._refresh();
+	},
+
+	_processPanels: function() {
+		var prevHeaders = this.headers,
+			prevPanels = this.panels;
+
+		this.headers = this.element.find( this.options.header );
+		this._addClass( this.headers, "ui-accordion-header ui-accordion-header-collapsed",
+			"ui-state-default" );
+
+		this.panels = this.headers.next().filter( ":not(.ui-accordion-content-active)" ).hide();
+		this._addClass( this.panels, "ui-accordion-content", "ui-helper-reset ui-widget-content" );
+
+		// Avoid memory leaks (#10056)
+		if ( prevPanels ) {
+			this._off( prevHeaders.not( this.headers ) );
+			this._off( prevPanels.not( this.panels ) );
+		}
+	},
+
+	_refresh: function() {
+		var maxHeight,
+			options = this.options,
+			heightStyle = options.heightStyle,
+			parent = this.element.parent();
+
+		this.active = this._findActive( options.active );
+		this._addClass( this.active, "ui-accordion-header-active", "ui-state-active" )
+			._removeClass( this.active, "ui-accordion-header-collapsed" );
+		this._addClass( this.active.next(), "ui-accordion-content-active" );
+		this.active.next().show();
+
+		this.headers
+			.attr( "role", "tab" )
+			.each( function() {
+				var header = $( this ),
+					headerId = header.uniqueId().attr( "id" ),
+					panel = header.next(),
+					panelId = panel.uniqueId().attr( "id" );
+				header.attr( "aria-controls", panelId );
+				panel.attr( "aria-labelledby", headerId );
+			} )
+			.next()
+				.attr( "role", "tabpanel" );
+
+		this.headers
+			.not( this.active )
+				.attr( {
+					"aria-selected": "false",
+					"aria-expanded": "false",
+					tabIndex: -1
+				} )
+				.next()
+					.attr( {
+						"aria-hidden": "true"
+					} )
+					.hide();
+
+		// Make sure at least one header is in the tab order
+		if ( !this.active.length ) {
+			this.headers.eq( 0 ).attr( "tabIndex", 0 );
+		} else {
+			this.active.attr( {
+				"aria-selected": "true",
+				"aria-expanded": "true",
+				tabIndex: 0
+			} )
+				.next()
+					.attr( {
+						"aria-hidden": "false"
+					} );
+		}
+
+		this._createIcons();
+
+		this._setupEvents( options.event );
+
+		if ( heightStyle === "fill" ) {
+			maxHeight = parent.height();
+			this.element.siblings( ":visible" ).each( function() {
+				var elem = $( this ),
+					position = elem.css( "position" );
+
+				if ( position === "absolute" || position === "fixed" ) {
+					return;
+				}
+				maxHeight -= elem.outerHeight( true );
+			} );
+
+			this.headers.each( function() {
+				maxHeight -= $( this ).outerHeight( true );
+			} );
+
+			this.headers.next()
+				.each( function() {
+					$( this ).height( Math.max( 0, maxHeight -
+						$( this ).innerHeight() + $( this ).height() ) );
+				} )
+				.css( "overflow", "auto" );
+		} else if ( heightStyle === "auto" ) {
+			maxHeight = 0;
+			this.headers.next()
+				.each( function() {
+					var isVisible = $( this ).is( ":visible" );
+					if ( !isVisible ) {
+						$( this ).show();
+					}
+					maxHeight = Math.max( maxHeight, $( this ).css( "height", "" ).height() );
+					if ( !isVisible ) {
+						$( this ).hide();
+					}
+				} )
+				.height( maxHeight );
+		}
+	},
+
+	_activate: function( index ) {
+		var active = this._findActive( index )[ 0 ];
+
+		// Trying to activate the already active panel
+		if ( active === this.active[ 0 ] ) {
+			return;
+		}
+
+		// Trying to collapse, simulate a click on the currently active header
+		active = active || this.active[ 0 ];
+
+		this._eventHandler( {
+			target: active,
+			currentTarget: active,
+			preventDefault: $.noop
+		} );
+	},
+
+	_findActive: function( selector ) {
+		return typeof selector === "number" ? this.headers.eq( selector ) : $();
+	},
+
+	_setupEvents: function( event ) {
+		var events = {
+			keydown: "_keydown"
+		};
+		if ( event ) {
+			$.each( event.split( " " ), function( index, eventName ) {
+				events[ eventName ] = "_eventHandler";
+			} );
+		}
+
+		this._off( this.headers.add( this.headers.next() ) );
+		this._on( this.headers, events );
+		this._on( this.headers.next(), { keydown: "_panelKeyDown" } );
+		this._hoverable( this.headers );
+		this._focusable( this.headers );
+	},
+
+	_eventHandler: function( event ) {
+		var activeChildren, clickedChildren,
+			options = this.options,
+			active = this.active,
+			clicked = $( event.currentTarget ),
+			clickedIsActive = clicked[ 0 ] === active[ 0 ],
+			collapsing = clickedIsActive && options.collapsible,
+			toShow = collapsing ? $() : clicked.next(),
+			toHide = active.next(),
+			eventData = {
+				oldHeader: active,
+				oldPanel: toHide,
+				newHeader: collapsing ? $() : clicked,
+				newPanel: toShow
+			};
+
+		event.preventDefault();
+
+		if (
+
+				// click on active header, but not collapsible
+				( clickedIsActive && !options.collapsible ) ||
+
+				// allow canceling activation
+				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
+			return;
+		}
+
+		options.active = collapsing ? false : this.headers.index( clicked );
+
+		// When the call to ._toggle() comes after the class changes
+		// it causes a very odd bug in IE 8 (see #6720)
+		this.active = clickedIsActive ? $() : clicked;
+		this._toggle( eventData );
+
+		// Switch classes
+		// corner classes on the previously active header stay after the animation
+		this._removeClass( active, "ui-accordion-header-active", "ui-state-active" );
+		if ( options.icons ) {
+			activeChildren = active.children( ".ui-accordion-header-icon" );
+			this._removeClass( activeChildren, null, options.icons.activeHeader )
+				._addClass( activeChildren, null, options.icons.header );
+		}
+
+		if ( !clickedIsActive ) {
+			this._removeClass( clicked, "ui-accordion-header-collapsed" )
+				._addClass( clicked, "ui-accordion-header-active", "ui-state-active" );
+			if ( options.icons ) {
+				clickedChildren = clicked.children( ".ui-accordion-header-icon" );
+				this._removeClass( clickedChildren, null, options.icons.header )
+					._addClass( clickedChildren, null, options.icons.activeHeader );
+			}
+
+			this._addClass( clicked.next(), "ui-accordion-content-active" );
+		}
+	},
+
+	_toggle: function( data ) {
+		var toShow = data.newPanel,
+			toHide = this.prevShow.length ? this.prevShow : data.oldPanel;
+
+		// Handle activating a panel during the animation for another activation
+		this.prevShow.add( this.prevHide ).stop( true, true );
+		this.prevShow = toShow;
+		this.prevHide = toHide;
+
+		if ( this.options.animate ) {
+			this._animate( toShow, toHide, data );
+		} else {
+			toHide.hide();
+			toShow.show();
+			this._toggleComplete( data );
+		}
+
+		toHide.attr( {
+			"aria-hidden": "true"
+		} );
+		toHide.prev().attr( {
+			"aria-selected": "false",
+			"aria-expanded": "false"
+		} );
+
+		// if we're switching panels, remove the old header from the tab order
+		// if we're opening from collapsed state, remove the previous header from the tab order
+		// if we're collapsing, then keep the collapsing header in the tab order
+		if ( toShow.length && toHide.length ) {
+			toHide.prev().attr( {
+				"tabIndex": -1,
+				"aria-expanded": "false"
+			} );
+		} else if ( toShow.length ) {
+			this.headers.filter( function() {
+				return parseInt( $( this ).attr( "tabIndex" ), 10 ) === 0;
+			} )
+				.attr( "tabIndex", -1 );
+		}
+
+		toShow
+			.attr( "aria-hidden", "false" )
+			.prev()
+				.attr( {
+					"aria-selected": "true",
+					"aria-expanded": "true",
+					tabIndex: 0
+				} );
+	},
+
+	_animate: function( toShow, toHide, data ) {
+		var total, easing, duration,
+			that = this,
+			adjust = 0,
+			boxSizing = toShow.css( "box-sizing" ),
+			down = toShow.length &&
+				( !toHide.length || ( toShow.index() < toHide.index() ) ),
+			animate = this.options.animate || {},
+			options = down && animate.down || animate,
+			complete = function() {
+				that._toggleComplete( data );
+			};
+
+		if ( typeof options === "number" ) {
+			duration = options;
+		}
+		if ( typeof options === "string" ) {
+			easing = options;
+		}
+
+		// fall back from options to animation in case of partial down settings
+		easing = easing || options.easing || animate.easing;
+		duration = duration || options.duration || animate.duration;
+
+		if ( !toHide.length ) {
+			return toShow.animate( this.showProps, duration, easing, complete );
+		}
+		if ( !toShow.length ) {
+			return toHide.animate( this.hideProps, duration, easing, complete );
+		}
+
+		total = toShow.show().outerHeight();
+		toHide.animate( this.hideProps, {
+			duration: duration,
+			easing: easing,
+			step: function( now, fx ) {
+				fx.now = Math.round( now );
+			}
+		} );
+		toShow
+			.hide()
+			.animate( this.showProps, {
+				duration: duration,
+				easing: easing,
+				complete: complete,
+				step: function( now, fx ) {
+					fx.now = Math.round( now );
+					if ( fx.prop !== "height" ) {
+						if ( boxSizing === "content-box" ) {
+							adjust += fx.now;
+						}
+					} else if ( that.options.heightStyle !== "content" ) {
+						fx.now = Math.round( total - toHide.outerHeight() - adjust );
+						adjust = 0;
+					}
+				}
+			} );
+	},
+
+	_toggleComplete: function( data ) {
+		var toHide = data.oldPanel,
+			prev = toHide.prev();
+
+		this._removeClass( toHide, "ui-accordion-content-active" );
+		this._removeClass( prev, "ui-accordion-header-active" )
+			._addClass( prev, "ui-accordion-header-collapsed" );
+
+		// Work around for rendering bug in IE (#5421)
+		if ( toHide.length ) {
+			toHide.parent()[ 0 ].className = toHide.parent()[ 0 ].className;
+		}
+		this._trigger( "activate", null, data );
+	}
+} );
+
+
+/*!
+ * jQuery UI Menu 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Menu
+//>>group: Widgets
+//>>description: Creates nestable menus.
+//>>docs: http://api.jqueryui.com/menu/
+//>>demos: http://jqueryui.com/menu/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/menu.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+var widgetsMenu = $.widget( "ui.menu", {
+	version: "1.12.1",
+	defaultElement: "<ul>",
+	delay: 300,
+	options: {
+		icons: {
+			submenu: "ui-icon-caret-1-e"
+		},
+		items: "> *",
+		menus: "ul",
+		position: {
+			my: "left top",
+			at: "right top"
+		},
+		role: "menu",
+
+		// Callbacks
+		blur: null,
+		focus: null,
+		select: null
+	},
+
+	_create: function() {
+		this.activeMenu = this.element;
+
+		// Flag used to prevent firing of the click handler
+		// as the event bubbles up through nested menus
+		this.mouseHandled = false;
+		this.element
+			.uniqueId()
+			.attr( {
+				role: this.options.role,
+				tabIndex: 0
+			} );
+
+		this._addClass( "ui-menu", "ui-widget ui-widget-content" );
+		this._on( {
+
+			// Prevent focus from sticking to links inside menu after clicking
+			// them (focus should always stay on UL during navigation).
+			"mousedown .ui-menu-item": function( event ) {
+				event.preventDefault();
+			},
+			"click .ui-menu-item": function( event ) {
+				var target = $( event.target );
+				var active = $( $.ui.safeActiveElement( this.document[ 0 ] ) );
+				if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
+					this.select( event );
+
+					// Only set the mouseHandled flag if the event will bubble, see #9469.
+					if ( !event.isPropagationStopped() ) {
+						this.mouseHandled = true;
+					}
+
+					// Open submenu on click
+					if ( target.has( ".ui-menu" ).length ) {
+						this.expand( event );
+					} else if ( !this.element.is( ":focus" ) &&
+							active.closest( ".ui-menu" ).length ) {
+
+						// Redirect focus to the menu
+						this.element.trigger( "focus", [ true ] );
+
+						// If the active item is on the top level, let it stay active.
+						// Otherwise, blur the active item since it is no longer visible.
+						if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
+							clearTimeout( this.timer );
+						}
+					}
+				}
+			},
+			"mouseenter .ui-menu-item": function( event ) {
+
+				// Ignore mouse events while typeahead is active, see #10458.
+				// Prevents focusing the wrong item when typeahead causes a scroll while the mouse
+				// is over an item in the menu
+				if ( this.previousFilter ) {
+					return;
+				}
+
+				var actualTarget = $( event.target ).closest( ".ui-menu-item" ),
+					target = $( event.currentTarget );
+
+				// Ignore bubbled events on parent items, see #11641
+				if ( actualTarget[ 0 ] !== target[ 0 ] ) {
+					return;
+				}
+
+				// Remove ui-state-active class from siblings of the newly focused menu item
+				// to avoid a jump caused by adjacent elements both having a class with a border
+				this._removeClass( target.siblings().children( ".ui-state-active" ),
+					null, "ui-state-active" );
+				this.focus( event, target );
+			},
+			mouseleave: "collapseAll",
+			"mouseleave .ui-menu": "collapseAll",
+			focus: function( event, keepActiveItem ) {
+
+				// If there's already an active item, keep it active
+				// If not, activate the first item
+				var item = this.active || this.element.find( this.options.items ).eq( 0 );
+
+				if ( !keepActiveItem ) {
+					this.focus( event, item );
+				}
+			},
+			blur: function( event ) {
+				this._delay( function() {
+					var notContained = !$.contains(
+						this.element[ 0 ],
+						$.ui.safeActiveElement( this.document[ 0 ] )
+					);
+					if ( notContained ) {
+						this.collapseAll( event );
+					}
+				} );
+			},
+			keydown: "_keydown"
+		} );
+
+		this.refresh();
+
+		// Clicks outside of a menu collapse any open menus
+		this._on( this.document, {
+			click: function( event ) {
+				if ( this._closeOnDocumentClick( event ) ) {
+					this.collapseAll( event );
+				}
+
+				// Reset the mouseHandled flag
+				this.mouseHandled = false;
+			}
+		} );
+	},
+
+	_destroy: function() {
+		var items = this.element.find( ".ui-menu-item" )
+				.removeAttr( "role aria-disabled" ),
+			submenus = items.children( ".ui-menu-item-wrapper" )
+				.removeUniqueId()
+				.removeAttr( "tabIndex role aria-haspopup" );
+
+		// Destroy (sub)menus
+		this.element
+			.removeAttr( "aria-activedescendant" )
+			.find( ".ui-menu" ).addBack()
+				.removeAttr( "role aria-labelledby aria-expanded aria-hidden aria-disabled " +
+					"tabIndex" )
+				.removeUniqueId()
+				.show();
+
+		submenus.children().each( function() {
+			var elem = $( this );
+			if ( elem.data( "ui-menu-submenu-caret" ) ) {
+				elem.remove();
+			}
+		} );
+	},
+
+	_keydown: function( event ) {
+		var match, prev, character, skip,
+			preventDefault = true;
+
+		switch ( event.keyCode ) {
+		case $.ui.keyCode.PAGE_UP:
+			this.previousPage( event );
+			break;
+		case $.ui.keyCode.PAGE_DOWN:
+			this.nextPage( event );
+			break;
+		case $.ui.keyCode.HOME:
+			this._move( "first", "first", event );
+			break;
+		case $.ui.keyCode.END:
+			this._move( "last", "last", event );
+			break;
+		case $.ui.keyCode.UP:
+			this.previous( event );
+			break;
+		case $.ui.keyCode.DOWN:
+			this.next( event );
+			break;
+		case $.ui.keyCode.LEFT:
+			this.collapse( event );
+			break;
+		case $.ui.keyCode.RIGHT:
+			if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
+				this.expand( event );
+			}
+			break;
+		case $.ui.keyCode.ENTER:
+		case $.ui.keyCode.SPACE:
+			this._activate( event );
+			break;
+		case $.ui.keyCode.ESCAPE:
+			this.collapse( event );
+			break;
+		default:
+			preventDefault = false;
+			prev = this.previousFilter || "";
+			skip = false;
+
+			// Support number pad values
+			character = event.keyCode >= 96 && event.keyCode <= 105 ?
+				( event.keyCode - 96 ).toString() : String.fromCharCode( event.keyCode );
+
+			clearTimeout( this.filterTimer );
+
+			if ( character === prev ) {
+				skip = true;
+			} else {
+				character = prev + character;
+			}
+
+			match = this._filterMenuItems( character );
+			match = skip && match.index( this.active.next() ) !== -1 ?
+				this.active.nextAll( ".ui-menu-item" ) :
+				match;
+
+			// If no matches on the current filter, reset to the last character pressed
+			// to move down the menu to the first item that starts with that character
+			if ( !match.length ) {
+				character = String.fromCharCode( event.keyCode );
+				match = this._filterMenuItems( character );
+			}
+
+			if ( match.length ) {
+				this.focus( event, match );
+				this.previousFilter = character;
+				this.filterTimer = this._delay( function() {
+					delete this.previousFilter;
+				}, 1000 );
+			} else {
+				delete this.previousFilter;
+			}
+		}
+
+		if ( preventDefault ) {
+			event.preventDefault();
+		}
+	},
+
+	_activate: function( event ) {
+		if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
+			if ( this.active.children( "[aria-haspopup='true']" ).length ) {
+				this.expand( event );
+			} else {
+				this.select( event );
+			}
+		}
+	},
+
+	refresh: function() {
+		var menus, items, newSubmenus, newItems, newWrappers,
+			that = this,
+			icon = this.options.icons.submenu,
+			submenus = this.element.find( this.options.menus );
+
+		this._toggleClass( "ui-menu-icons", null, !!this.element.find( ".ui-icon" ).length );
+
+		// Initialize nested menus
+		newSubmenus = submenus.filter( ":not(.ui-menu)" )
+			.hide()
+			.attr( {
+				role: this.options.role,
+				"aria-hidden": "true",
+				"aria-expanded": "false"
+			} )
+			.each( function() {
+				var menu = $( this ),
+					item = menu.prev(),
+					submenuCaret = $( "<span>" ).data( "ui-menu-submenu-caret", true );
+
+				that._addClass( submenuCaret, "ui-menu-icon", "ui-icon " + icon );
+				item
+					.attr( "aria-haspopup", "true" )
+					.prepend( submenuCaret );
+				menu.attr( "aria-labelledby", item.attr( "id" ) );
+			} );
+
+		this._addClass( newSubmenus, "ui-menu", "ui-widget ui-widget-content ui-front" );
+
+		menus = submenus.add( this.element );
+		items = menus.find( this.options.items );
+
+		// Initialize menu-items containing spaces and/or dashes only as dividers
+		items.not( ".ui-menu-item" ).each( function() {
+			var item = $( this );
+			if ( that._isDivider( item ) ) {
+				that._addClass( item, "ui-menu-divider", "ui-widget-content" );
+			}
+		} );
+
+		// Don't refresh list items that are already adapted
+		newItems = items.not( ".ui-menu-item, .ui-menu-divider" );
+		newWrappers = newItems.children()
+			.not( ".ui-menu" )
+				.uniqueId()
+				.attr( {
+					tabIndex: -1,
+					role: this._itemRole()
+				} );
+		this._addClass( newItems, "ui-menu-item" )
+			._addClass( newWrappers, "ui-menu-item-wrapper" );
+
+		// Add aria-disabled attribute to any disabled menu item
+		items.filter( ".ui-state-disabled" ).attr( "aria-disabled", "true" );
+
+		// If the active item has been removed, blur the menu
+		if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
+			this.blur();
+		}
+	},
+
+	_itemRole: function() {
+		return {
+			menu: "menuitem",
+			listbox: "option"
+		}[ this.options.role ];
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "icons" ) {
+			var icons = this.element.find( ".ui-menu-icon" );
+			this._removeClass( icons, null, this.options.icons.submenu )
+				._addClass( icons, null, value.submenu );
+		}
+		this._super( key, value );
+	},
+
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this.element.attr( "aria-disabled", String( value ) );
+		this._toggleClass( null, "ui-state-disabled", !!value );
+	},
+
+	focus: function( event, item ) {
+		var nested, focused, activeParent;
+		this.blur( event, event && event.type === "focus" );
+
+		this._scrollIntoView( item );
+
+		this.active = item.first();
+
+		focused = this.active.children( ".ui-menu-item-wrapper" );
+		this._addClass( focused, null, "ui-state-active" );
+
+		// Only update aria-activedescendant if there's a role
+		// otherwise we assume focus is managed elsewhere
+		if ( this.options.role ) {
+			this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
+		}
+
+		// Highlight active parent menu item, if any
+		activeParent = this.active
+			.parent()
+				.closest( ".ui-menu-item" )
+					.children( ".ui-menu-item-wrapper" );
+		this._addClass( activeParent, null, "ui-state-active" );
+
+		if ( event && event.type === "keydown" ) {
+			this._close();
+		} else {
+			this.timer = this._delay( function() {
+				this._close();
+			}, this.delay );
+		}
+
+		nested = item.children( ".ui-menu" );
+		if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) {
+			this._startOpening( nested );
+		}
+		this.activeMenu = item.parent();
+
+		this._trigger( "focus", event, { item: item } );
+	},
+
+	_scrollIntoView: function( item ) {
+		var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
+		if ( this._hasScroll() ) {
+			borderTop = parseFloat( $.css( this.activeMenu[ 0 ], "borderTopWidth" ) ) || 0;
+			paddingTop = parseFloat( $.css( this.activeMenu[ 0 ], "paddingTop" ) ) || 0;
+			offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
+			scroll = this.activeMenu.scrollTop();
+			elementHeight = this.activeMenu.height();
+			itemHeight = item.outerHeight();
+
+			if ( offset < 0 ) {
+				this.activeMenu.scrollTop( scroll + offset );
+			} else if ( offset + itemHeight > elementHeight ) {
+				this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
+			}
+		}
+	},
+
+	blur: function( event, fromFocus ) {
+		if ( !fromFocus ) {
+			clearTimeout( this.timer );
+		}
+
+		if ( !this.active ) {
+			return;
+		}
+
+		this._removeClass( this.active.children( ".ui-menu-item-wrapper" ),
+			null, "ui-state-active" );
+
+		this._trigger( "blur", event, { item: this.active } );
+		this.active = null;
+	},
+
+	_startOpening: function( submenu ) {
+		clearTimeout( this.timer );
+
+		// Don't open if already open fixes a Firefox bug that caused a .5 pixel
+		// shift in the submenu position when mousing over the caret icon
+		if ( submenu.attr( "aria-hidden" ) !== "true" ) {
+			return;
+		}
+
+		this.timer = this._delay( function() {
+			this._close();
+			this._open( submenu );
+		}, this.delay );
+	},
+
+	_open: function( submenu ) {
+		var position = $.extend( {
+			of: this.active
+		}, this.options.position );
+
+		clearTimeout( this.timer );
+		this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
+			.hide()
+			.attr( "aria-hidden", "true" );
+
+		submenu
+			.show()
+			.removeAttr( "aria-hidden" )
+			.attr( "aria-expanded", "true" )
+			.position( position );
+	},
+
+	collapseAll: function( event, all ) {
+		clearTimeout( this.timer );
+		this.timer = this._delay( function() {
+
+			// If we were passed an event, look for the submenu that contains the event
+			var currentMenu = all ? this.element :
+				$( event && event.target ).closest( this.element.find( ".ui-menu" ) );
+
+			// If we found no valid submenu ancestor, use the main menu to close all
+			// sub menus anyway
+			if ( !currentMenu.length ) {
+				currentMenu = this.element;
+			}
+
+			this._close( currentMenu );
+
+			this.blur( event );
+
+			// Work around active item staying active after menu is blurred
+			this._removeClass( currentMenu.find( ".ui-state-active" ), null, "ui-state-active" );
+
+			this.activeMenu = currentMenu;
+		}, this.delay );
+	},
+
+	// With no arguments, closes the currently active menu - if nothing is active
+	// it closes all menus.  If passed an argument, it will search for menus BELOW
+	_close: function( startMenu ) {
+		if ( !startMenu ) {
+			startMenu = this.active ? this.active.parent() : this.element;
+		}
+
+		startMenu.find( ".ui-menu" )
+			.hide()
+			.attr( "aria-hidden", "true" )
+			.attr( "aria-expanded", "false" );
+	},
+
+	_closeOnDocumentClick: function( event ) {
+		return !$( event.target ).closest( ".ui-menu" ).length;
+	},
+
+	_isDivider: function( item ) {
+
+		// Match hyphen, em dash, en dash
+		return !/[^\-\u2014\u2013\s]/.test( item.text() );
+	},
+
+	collapse: function( event ) {
+		var newItem = this.active &&
+			this.active.parent().closest( ".ui-menu-item", this.element );
+		if ( newItem && newItem.length ) {
+			this._close();
+			this.focus( event, newItem );
+		}
+	},
+
+	expand: function( event ) {
+		var newItem = this.active &&
+			this.active
+				.children( ".ui-menu " )
+					.find( this.options.items )
+						.first();
+
+		if ( newItem && newItem.length ) {
+			this._open( newItem.parent() );
+
+			// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
+			this._delay( function() {
+				this.focus( event, newItem );
+			} );
+		}
+	},
+
+	next: function( event ) {
+		this._move( "next", "first", event );
+	},
+
+	previous: function( event ) {
+		this._move( "prev", "last", event );
+	},
+
+	isFirstItem: function() {
+		return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
+	},
+
+	isLastItem: function() {
+		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
+	},
+
+	_move: function( direction, filter, event ) {
+		var next;
+		if ( this.active ) {
+			if ( direction === "first" || direction === "last" ) {
+				next = this.active
+					[ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
+					.eq( -1 );
+			} else {
+				next = this.active
+					[ direction + "All" ]( ".ui-menu-item" )
+					.eq( 0 );
+			}
+		}
+		if ( !next || !next.length || !this.active ) {
+			next = this.activeMenu.find( this.options.items )[ filter ]();
+		}
+
+		this.focus( event, next );
+	},
+
+	nextPage: function( event ) {
+		var item, base, height;
+
+		if ( !this.active ) {
+			this.next( event );
+			return;
+		}
+		if ( this.isLastItem() ) {
+			return;
+		}
+		if ( this._hasScroll() ) {
+			base = this.active.offset().top;
+			height = this.element.height();
+			this.active.nextAll( ".ui-menu-item" ).each( function() {
+				item = $( this );
+				return item.offset().top - base - height < 0;
+			} );
+
+			this.focus( event, item );
+		} else {
+			this.focus( event, this.activeMenu.find( this.options.items )
+				[ !this.active ? "first" : "last" ]() );
+		}
+	},
+
+	previousPage: function( event ) {
+		var item, base, height;
+		if ( !this.active ) {
+			this.next( event );
+			return;
+		}
+		if ( this.isFirstItem() ) {
+			return;
+		}
+		if ( this._hasScroll() ) {
+			base = this.active.offset().top;
+			height = this.element.height();
+			this.active.prevAll( ".ui-menu-item" ).each( function() {
+				item = $( this );
+				return item.offset().top - base + height > 0;
+			} );
+
+			this.focus( event, item );
+		} else {
+			this.focus( event, this.activeMenu.find( this.options.items ).first() );
+		}
+	},
+
+	_hasScroll: function() {
+		return this.element.outerHeight() < this.element.prop( "scrollHeight" );
+	},
+
+	select: function( event ) {
+
+		// TODO: It should never be possible to not have an active item at this
+		// point, but the tests don't trigger mouseenter before click.
+		this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
+		var ui = { item: this.active };
+		if ( !this.active.has( ".ui-menu" ).length ) {
+			this.collapseAll( event, true );
+		}
+		this._trigger( "select", event, ui );
+	},
+
+	_filterMenuItems: function( character ) {
+		var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ),
+			regex = new RegExp( "^" + escapedCharacter, "i" );
+
+		return this.activeMenu
+			.find( this.options.items )
+
+				// Only match on items, not dividers or other content (#10571)
+				.filter( ".ui-menu-item" )
+					.filter( function() {
+						return regex.test(
+							$.trim( $( this ).children( ".ui-menu-item-wrapper" ).text() ) );
+					} );
+	}
+} );
+
+
+/*!
+ * jQuery UI Autocomplete 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Autocomplete
+//>>group: Widgets
+//>>description: Lists suggested words as the user is typing.
+//>>docs: http://api.jqueryui.com/autocomplete/
+//>>demos: http://jqueryui.com/autocomplete/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/autocomplete.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+$.widget( "ui.autocomplete", {
+	version: "1.12.1",
+	defaultElement: "<input>",
+	options: {
+		appendTo: null,
+		autoFocus: false,
+		delay: 300,
+		minLength: 1,
+		position: {
+			my: "left top",
+			at: "left bottom",
+			collision: "none"
+		},
+		source: null,
+
+		// Callbacks
+		change: null,
+		close: null,
+		focus: null,
+		open: null,
+		response: null,
+		search: null,
+		select: null
+	},
+
+	requestIndex: 0,
+	pending: 0,
+
+	_create: function() {
+
+		// Some browsers only repeat keydown events, not keypress events,
+		// so we use the suppressKeyPress flag to determine if we've already
+		// handled the keydown event. #7269
+		// Unfortunately the code for & in keypress is the same as the up arrow,
+		// so we use the suppressKeyPressRepeat flag to avoid handling keypress
+		// events when we know the keydown event was used to modify the
+		// search term. #7799
+		var suppressKeyPress, suppressKeyPressRepeat, suppressInput,
+			nodeName = this.element[ 0 ].nodeName.toLowerCase(),
+			isTextarea = nodeName === "textarea",
+			isInput = nodeName === "input";
+
+		// Textareas are always multi-line
+		// Inputs are always single-line, even if inside a contentEditable element
+		// IE also treats inputs as contentEditable
+		// All other element types are determined by whether or not they're contentEditable
+		this.isMultiLine = isTextarea || !isInput && this._isContentEditable( this.element );
+
+		this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
+		this.isNewMenu = true;
+
+		this._addClass( "ui-autocomplete-input" );
+		this.element.attr( "autocomplete", "off" );
+
+		this._on( this.element, {
+			keydown: function( event ) {
+				if ( this.element.prop( "readOnly" ) ) {
+					suppressKeyPress = true;
+					suppressInput = true;
+					suppressKeyPressRepeat = true;
+					return;
+				}
+
+				suppressKeyPress = false;
+				suppressInput = false;
+				suppressKeyPressRepeat = false;
+				var keyCode = $.ui.keyCode;
+				switch ( event.keyCode ) {
+				case keyCode.PAGE_UP:
+					suppressKeyPress = true;
+					this._move( "previousPage", event );
+					break;
+				case keyCode.PAGE_DOWN:
+					suppressKeyPress = true;
+					this._move( "nextPage", event );
+					break;
+				case keyCode.UP:
+					suppressKeyPress = true;
+					this._keyEvent( "previous", event );
+					break;
+				case keyCode.DOWN:
+					suppressKeyPress = true;
+					this._keyEvent( "next", event );
+					break;
+				case keyCode.ENTER:
+
+					// when menu is open and has focus
+					if ( this.menu.active ) {
+
+						// #6055 - Opera still allows the keypress to occur
+						// which causes forms to submit
+						suppressKeyPress = true;
+						event.preventDefault();
+						this.menu.select( event );
+					}
+					break;
+				case keyCode.TAB:
+					if ( this.menu.active ) {
+						this.menu.select( event );
+					}
+					break;
+				case keyCode.ESCAPE:
+					if ( this.menu.element.is( ":visible" ) ) {
+						if ( !this.isMultiLine ) {
+							this._value( this.term );
+						}
+						this.close( event );
+
+						// Different browsers have different default behavior for escape
+						// Single press can mean undo or clear
+						// Double press in IE means clear the whole form
+						event.preventDefault();
+					}
+					break;
+				default:
+					suppressKeyPressRepeat = true;
+
+					// search timeout should be triggered before the input value is changed
+					this._searchTimeout( event );
+					break;
+				}
+			},
+			keypress: function( event ) {
+				if ( suppressKeyPress ) {
+					suppressKeyPress = false;
+					if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+						event.preventDefault();
+					}
+					return;
+				}
+				if ( suppressKeyPressRepeat ) {
+					return;
+				}
+
+				// Replicate some key handlers to allow them to repeat in Firefox and Opera
+				var keyCode = $.ui.keyCode;
+				switch ( event.keyCode ) {
+				case keyCode.PAGE_UP:
+					this._move( "previousPage", event );
+					break;
+				case keyCode.PAGE_DOWN:
+					this._move( "nextPage", event );
+					break;
+				case keyCode.UP:
+					this._keyEvent( "previous", event );
+					break;
+				case keyCode.DOWN:
+					this._keyEvent( "next", event );
+					break;
+				}
+			},
+			input: function( event ) {
+				if ( suppressInput ) {
+					suppressInput = false;
+					event.preventDefault();
+					return;
+				}
+				this._searchTimeout( event );
+			},
+			focus: function() {
+				this.selectedItem = null;
+				this.previous = this._value();
+			},
+			blur: function( event ) {
+				if ( this.cancelBlur ) {
+					delete this.cancelBlur;
+					return;
+				}
+
+				clearTimeout( this.searching );
+				this.close( event );
+				this._change( event );
+			}
+		} );
+
+		this._initSource();
+		this.menu = $( "<ul>" )
+			.appendTo( this._appendTo() )
+			.menu( {
+
+				// disable ARIA support, the live region takes care of that
+				role: null
+			} )
+			.hide()
+			.menu( "instance" );
+
+		this._addClass( this.menu.element, "ui-autocomplete", "ui-front" );
+		this._on( this.menu.element, {
+			mousedown: function( event ) {
+
+				// prevent moving focus out of the text field
+				event.preventDefault();
+
+				// IE doesn't prevent moving focus even with event.preventDefault()
+				// so we set a flag to know when we should ignore the blur event
+				this.cancelBlur = true;
+				this._delay( function() {
+					delete this.cancelBlur;
+
+					// Support: IE 8 only
+					// Right clicking a menu item or selecting text from the menu items will
+					// result in focus moving out of the input. However, we've already received
+					// and ignored the blur event because of the cancelBlur flag set above. So
+					// we restore focus to ensure that the menu closes properly based on the user's
+					// next actions.
+					if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
+						this.element.trigger( "focus" );
+					}
+				} );
+			},
+			menufocus: function( event, ui ) {
+				var label, item;
+
+				// support: Firefox
+				// Prevent accidental activation of menu items in Firefox (#7024 #9118)
+				if ( this.isNewMenu ) {
+					this.isNewMenu = false;
+					if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
+						this.menu.blur();
+
+						this.document.one( "mousemove", function() {
+							$( event.target ).trigger( event.originalEvent );
+						} );
+
+						return;
+					}
+				}
+
+				item = ui.item.data( "ui-autocomplete-item" );
+				if ( false !== this._trigger( "focus", event, { item: item } ) ) {
+
+					// use value to match what will end up in the input, if it was a key event
+					if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
+						this._value( item.value );
+					}
+				}
+
+				// Announce the value in the liveRegion
+				label = ui.item.attr( "aria-label" ) || item.value;
+				if ( label && $.trim( label ).length ) {
+					this.liveRegion.children().hide();
+					$( "<div>" ).text( label ).appendTo( this.liveRegion );
+				}
+			},
+			menuselect: function( event, ui ) {
+				var item = ui.item.data( "ui-autocomplete-item" ),
+					previous = this.previous;
+
+				// Only trigger when focus was lost (click on menu)
+				if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
+					this.element.trigger( "focus" );
+					this.previous = previous;
+
+					// #6109 - IE triggers two focus events and the second
+					// is asynchronous, so we need to reset the previous
+					// term synchronously and asynchronously :-(
+					this._delay( function() {
+						this.previous = previous;
+						this.selectedItem = item;
+					} );
+				}
+
+				if ( false !== this._trigger( "select", event, { item: item } ) ) {
+					this._value( item.value );
+				}
+
+				// reset the term after the select event
+				// this allows custom select handling to work properly
+				this.term = this._value();
+
+				this.close( event );
+				this.selectedItem = item;
+			}
+		} );
+
+		this.liveRegion = $( "<div>", {
+			role: "status",
+			"aria-live": "assertive",
+			"aria-relevant": "additions"
+		} )
+			.appendTo( this.document[ 0 ].body );
+
+		this._addClass( this.liveRegion, null, "ui-helper-hidden-accessible" );
+
+		// Turning off autocomplete prevents the browser from remembering the
+		// value when navigating through history, so we re-enable autocomplete
+		// if the page is unloaded before the widget is destroyed. #7790
+		this._on( this.window, {
+			beforeunload: function() {
+				this.element.removeAttr( "autocomplete" );
+			}
+		} );
+	},
+
+	_destroy: function() {
+		clearTimeout( this.searching );
+		this.element.removeAttr( "autocomplete" );
+		this.menu.element.remove();
+		this.liveRegion.remove();
+	},
+
+	_setOption: function( key, value ) {
+		this._super( key, value );
+		if ( key === "source" ) {
+			this._initSource();
+		}
+		if ( key === "appendTo" ) {
+			this.menu.element.appendTo( this._appendTo() );
+		}
+		if ( key === "disabled" && value && this.xhr ) {
+			this.xhr.abort();
+		}
+	},
+
+	_isEventTargetInWidget: function( event ) {
+		var menuElement = this.menu.element[ 0 ];
+
+		return event.target === this.element[ 0 ] ||
+			event.target === menuElement ||
+			$.contains( menuElement, event.target );
+	},
+
+	_closeOnClickOutside: function( event ) {
+		if ( !this._isEventTargetInWidget( event ) ) {
+			this.close();
+		}
+	},
+
+	_appendTo: function() {
+		var element = this.options.appendTo;
+
+		if ( element ) {
+			element = element.jquery || element.nodeType ?
+				$( element ) :
+				this.document.find( element ).eq( 0 );
+		}
+
+		if ( !element || !element[ 0 ] ) {
+			element = this.element.closest( ".ui-front, dialog" );
+		}
+
+		if ( !element.length ) {
+			element = this.document[ 0 ].body;
+		}
+
+		return element;
+	},
+
+	_initSource: function() {
+		var array, url,
+			that = this;
+		if ( $.isArray( this.options.source ) ) {
+			array = this.options.source;
+			this.source = function( request, response ) {
+				response( $.ui.autocomplete.filter( array, request.term ) );
+			};
+		} else if ( typeof this.options.source === "string" ) {
+			url = this.options.source;
+			this.source = function( request, response ) {
+				if ( that.xhr ) {
+					that.xhr.abort();
+				}
+				that.xhr = $.ajax( {
+					url: url,
+					data: request,
+					dataType: "json",
+					success: function( data ) {
+						response( data );
+					},
+					error: function() {
+						response( [] );
+					}
+				} );
+			};
+		} else {
+			this.source = this.options.source;
+		}
+	},
+
+	_searchTimeout: function( event ) {
+		clearTimeout( this.searching );
+		this.searching = this._delay( function() {
+
+			// Search if the value has changed, or if the user retypes the same value (see #7434)
+			var equalValues = this.term === this._value(),
+				menuVisible = this.menu.element.is( ":visible" ),
+				modifierKey = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
+
+			if ( !equalValues || ( equalValues && !menuVisible && !modifierKey ) ) {
+				this.selectedItem = null;
+				this.search( null, event );
+			}
+		}, this.options.delay );
+	},
+
+	search: function( value, event ) {
+		value = value != null ? value : this._value();
+
+		// Always save the actual value, not the one passed as an argument
+		this.term = this._value();
+
+		if ( value.length < this.options.minLength ) {
+			return this.close( event );
+		}
+
+		if ( this._trigger( "search", event ) === false ) {
+			return;
+		}
+
+		return this._search( value );
+	},
+
+	_search: function( value ) {
+		this.pending++;
+		this._addClass( "ui-autocomplete-loading" );
+		this.cancelSearch = false;
+
+		this.source( { term: value }, this._response() );
+	},
+
+	_response: function() {
+		var index = ++this.requestIndex;
+
+		return $.proxy( function( content ) {
+			if ( index === this.requestIndex ) {
+				this.__response( content );
+			}
+
+			this.pending--;
+			if ( !this.pending ) {
+				this._removeClass( "ui-autocomplete-loading" );
+			}
+		}, this );
+	},
+
+	__response: function( content ) {
+		if ( content ) {
+			content = this._normalize( content );
+		}
+		this._trigger( "response", null, { content: content } );
+		if ( !this.options.disabled && content && content.length && !this.cancelSearch ) {
+			this._suggest( content );
+			this._trigger( "open" );
+		} else {
+
+			// use ._close() instead of .close() so we don't cancel future searches
+			this._close();
+		}
+	},
+
+	close: function( event ) {
+		this.cancelSearch = true;
+		this._close( event );
+	},
+
+	_close: function( event ) {
+
+		// Remove the handler that closes the menu on outside clicks
+		this._off( this.document, "mousedown" );
+
+		if ( this.menu.element.is( ":visible" ) ) {
+			this.menu.element.hide();
+			this.menu.blur();
+			this.isNewMenu = true;
+			this._trigger( "close", event );
+		}
+	},
+
+	_change: function( event ) {
+		if ( this.previous !== this._value() ) {
+			this._trigger( "change", event, { item: this.selectedItem } );
+		}
+	},
+
+	_normalize: function( items ) {
+
+		// assume all items have the right format when the first item is complete
+		if ( items.length && items[ 0 ].label && items[ 0 ].value ) {
+			return items;
+		}
+		return $.map( items, function( item ) {
+			if ( typeof item === "string" ) {
+				return {
+					label: item,
+					value: item
+				};
+			}
+			return $.extend( {}, item, {
+				label: item.label || item.value,
+				value: item.value || item.label
+			} );
+		} );
+	},
+
+	_suggest: function( items ) {
+		var ul = this.menu.element.empty();
+		this._renderMenu( ul, items );
+		this.isNewMenu = true;
+		this.menu.refresh();
+
+		// Size and position menu
+		ul.show();
+		this._resizeMenu();
+		ul.position( $.extend( {
+			of: this.element
+		}, this.options.position ) );
+
+		if ( this.options.autoFocus ) {
+			this.menu.next();
+		}
+
+		// Listen for interactions outside of the widget (#6642)
+		this._on( this.document, {
+			mousedown: "_closeOnClickOutside"
+		} );
+	},
+
+	_resizeMenu: function() {
+		var ul = this.menu.element;
+		ul.outerWidth( Math.max(
+
+			// Firefox wraps long text (possibly a rounding bug)
+			// so we add 1px to avoid the wrapping (#7513)
+			ul.width( "" ).outerWidth() + 1,
+			this.element.outerWidth()
+		) );
+	},
+
+	_renderMenu: function( ul, items ) {
+		var that = this;
+		$.each( items, function( index, item ) {
+			that._renderItemData( ul, item );
+		} );
+	},
+
+	_renderItemData: function( ul, item ) {
+		return this._renderItem( ul, item ).data( "ui-autocomplete-item", item );
+	},
+
+	_renderItem: function( ul, item ) {
+		return $( "<li>" )
+			.append( $( "<div>" ).text( item.label ) )
+			.appendTo( ul );
+	},
+
+	_move: function( direction, event ) {
+		if ( !this.menu.element.is( ":visible" ) ) {
+			this.search( null, event );
+			return;
+		}
+		if ( this.menu.isFirstItem() && /^previous/.test( direction ) ||
+				this.menu.isLastItem() && /^next/.test( direction ) ) {
+
+			if ( !this.isMultiLine ) {
+				this._value( this.term );
+			}
+
+			this.menu.blur();
+			return;
+		}
+		this.menu[ direction ]( event );
+	},
+
+	widget: function() {
+		return this.menu.element;
+	},
+
+	_value: function() {
+		return this.valueMethod.apply( this.element, arguments );
+	},
+
+	_keyEvent: function( keyEvent, event ) {
+		if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+			this._move( keyEvent, event );
+
+			// Prevents moving cursor to beginning/end of the text field in some browsers
+			event.preventDefault();
+		}
+	},
+
+	// Support: Chrome <=50
+	// We should be able to just use this.element.prop( "isContentEditable" )
+	// but hidden elements always report false in Chrome.
+	// https://code.google.com/p/chromium/issues/detail?id=313082
+	_isContentEditable: function( element ) {
+		if ( !element.length ) {
+			return false;
+		}
+
+		var editable = element.prop( "contentEditable" );
+
+		if ( editable === "inherit" ) {
+		  return this._isContentEditable( element.parent() );
+		}
+
+		return editable === "true";
+	}
+} );
+
+$.extend( $.ui.autocomplete, {
+	escapeRegex: function( value ) {
+		return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
+	},
+	filter: function( array, term ) {
+		var matcher = new RegExp( $.ui.autocomplete.escapeRegex( term ), "i" );
+		return $.grep( array, function( value ) {
+			return matcher.test( value.label || value.value || value );
+		} );
+	}
+} );
+
+// Live region extension, adding a `messages` option
+// NOTE: This is an experimental API. We are still investigating
+// a full solution for string manipulation and internationalization.
+$.widget( "ui.autocomplete", $.ui.autocomplete, {
+	options: {
+		messages: {
+			noResults: "No search results.",
+			results: function( amount ) {
+				return amount + ( amount > 1 ? " results are" : " result is" ) +
+					" available, use up and down arrow keys to navigate.";
+			}
+		}
+	},
+
+	__response: function( content ) {
+		var message;
+		this._superApply( arguments );
+		if ( this.options.disabled || this.cancelSearch ) {
+			return;
+		}
+		if ( content && content.length ) {
+			message = this.options.messages.results( content.length );
+		} else {
+			message = this.options.messages.noResults;
+		}
+		this.liveRegion.children().hide();
+		$( "<div>" ).text( message ).appendTo( this.liveRegion );
+	}
+} );
+
+var widgetsAutocomplete = $.ui.autocomplete;
+
+
+/*!
+ * jQuery UI Controlgroup 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Controlgroup
+//>>group: Widgets
+//>>description: Visually groups form control widgets
+//>>docs: http://api.jqueryui.com/controlgroup/
+//>>demos: http://jqueryui.com/controlgroup/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/controlgroup.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+var controlgroupCornerRegex = /ui-corner-([a-z]){2,6}/g;
+
+var widgetsControlgroup = $.widget( "ui.controlgroup", {
+	version: "1.12.1",
+	defaultElement: "<div>",
+	options: {
+		direction: "horizontal",
+		disabled: null,
+		onlyVisible: true,
+		items: {
+			"button": "input[type=button], input[type=submit], input[type=reset], button, a",
+			"controlgroupLabel": ".ui-controlgroup-label",
+			"checkboxradio": "input[type='checkbox'], input[type='radio']",
+			"selectmenu": "select",
+			"spinner": ".ui-spinner-input"
+		}
+	},
+
+	_create: function() {
+		this._enhance();
+	},
+
+	// To support the enhanced option in jQuery Mobile, we isolate DOM manipulation
+	_enhance: function() {
+		this.element.attr( "role", "toolbar" );
+		this.refresh();
+	},
+
+	_destroy: function() {
+		this._callChildMethod( "destroy" );
+		this.childWidgets.removeData( "ui-controlgroup-data" );
+		this.element.removeAttr( "role" );
+		if ( this.options.items.controlgroupLabel ) {
+			this.element
+				.find( this.options.items.controlgroupLabel )
+				.find( ".ui-controlgroup-label-contents" )
+				.contents().unwrap();
+		}
+	},
+
+	_initWidgets: function() {
+		var that = this,
+			childWidgets = [];
+
+		// First we iterate over each of the items options
+		$.each( this.options.items, function( widget, selector ) {
+			var labels;
+			var options = {};
+
+			// Make sure the widget has a selector set
+			if ( !selector ) {
+				return;
+			}
+
+			if ( widget === "controlgroupLabel" ) {
+				labels = that.element.find( selector );
+				labels.each( function() {
+					var element = $( this );
+
+					if ( element.children( ".ui-controlgroup-label-contents" ).length ) {
+						return;
+					}
+					element.contents()
+						.wrapAll( "<span class='ui-controlgroup-label-contents'></span>" );
+				} );
+				that._addClass( labels, null, "ui-widget ui-widget-content ui-state-default" );
+				childWidgets = childWidgets.concat( labels.get() );
+				return;
+			}
+
+			// Make sure the widget actually exists
+			if ( !$.fn[ widget ] ) {
+				return;
+			}
+
+			// We assume everything is in the middle to start because we can't determine
+			// first / last elements until all enhancments are done.
+			if ( that[ "_" + widget + "Options" ] ) {
+				options = that[ "_" + widget + "Options" ]( "middle" );
+			} else {
+				options = { classes: {} };
+			}
+
+			// Find instances of this widget inside controlgroup and init them
+			that.element
+				.find( selector )
+				.each( function() {
+					var element = $( this );
+					var instance = element[ widget ]( "instance" );
+
+					// We need to clone the default options for this type of widget to avoid
+					// polluting the variable options which has a wider scope than a single widget.
+					var instanceOptions = $.widget.extend( {}, options );
+
+					// If the button is the child of a spinner ignore it
+					// TODO: Find a more generic solution
+					if ( widget === "button" && element.parent( ".ui-spinner" ).length ) {
+						return;
+					}
+
+					// Create the widget if it doesn't exist
+					if ( !instance ) {
+						instance = element[ widget ]()[ widget ]( "instance" );
+					}
+					if ( instance ) {
+						instanceOptions.classes =
+							that._resolveClassesValues( instanceOptions.classes, instance );
+					}
+					element[ widget ]( instanceOptions );
+
+					// Store an instance of the controlgroup to be able to reference
+					// from the outermost element for changing options and refresh
+					var widgetElement = element[ widget ]( "widget" );
+					$.data( widgetElement[ 0 ], "ui-controlgroup-data",
+						instance ? instance : element[ widget ]( "instance" ) );
+
+					childWidgets.push( widgetElement[ 0 ] );
+				} );
+		} );
+
+		this.childWidgets = $( $.unique( childWidgets ) );
+		this._addClass( this.childWidgets, "ui-controlgroup-item" );
+	},
+
+	_callChildMethod: function( method ) {
+		this.childWidgets.each( function() {
+			var element = $( this ),
+				data = element.data( "ui-controlgroup-data" );
+			if ( data && data[ method ] ) {
+				data[ method ]();
+			}
+		} );
+	},
+
+	_updateCornerClass: function( element, position ) {
+		var remove = "ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all";
+		var add = this._buildSimpleOptions( position, "label" ).classes.label;
+
+		this._removeClass( element, null, remove );
+		this._addClass( element, null, add );
+	},
+
+	_buildSimpleOptions: function( position, key ) {
+		var direction = this.options.direction === "vertical";
+		var result = {
+			classes: {}
+		};
+		result.classes[ key ] = {
+			"middle": "",
+			"first": "ui-corner-" + ( direction ? "top" : "left" ),
+			"last": "ui-corner-" + ( direction ? "bottom" : "right" ),
+			"only": "ui-corner-all"
+		}[ position ];
+
+		return result;
+	},
+
+	_spinnerOptions: function( position ) {
+		var options = this._buildSimpleOptions( position, "ui-spinner" );
+
+		options.classes[ "ui-spinner-up" ] = "";
+		options.classes[ "ui-spinner-down" ] = "";
+
+		return options;
+	},
+
+	_buttonOptions: function( position ) {
+		return this._buildSimpleOptions( position, "ui-button" );
+	},
+
+	_checkboxradioOptions: function( position ) {
+		return this._buildSimpleOptions( position, "ui-checkboxradio-label" );
+	},
+
+	_selectmenuOptions: function( position ) {
+		var direction = this.options.direction === "vertical";
+		return {
+			width: direction ? "auto" : false,
+			classes: {
+				middle: {
+					"ui-selectmenu-button-open": "",
+					"ui-selectmenu-button-closed": ""
+				},
+				first: {
+					"ui-selectmenu-button-open": "ui-corner-" + ( direction ? "top" : "tl" ),
+					"ui-selectmenu-button-closed": "ui-corner-" + ( direction ? "top" : "left" )
+				},
+				last: {
+					"ui-selectmenu-button-open": direction ? "" : "ui-corner-tr",
+					"ui-selectmenu-button-closed": "ui-corner-" + ( direction ? "bottom" : "right" )
+				},
+				only: {
+					"ui-selectmenu-button-open": "ui-corner-top",
+					"ui-selectmenu-button-closed": "ui-corner-all"
+				}
+
+			}[ position ]
+		};
+	},
+
+	_resolveClassesValues: function( classes, instance ) {
+		var result = {};
+		$.each( classes, function( key ) {
+			var current = instance.options.classes[ key ] || "";
+			current = $.trim( current.replace( controlgroupCornerRegex, "" ) );
+			result[ key ] = ( current + " " + classes[ key ] ).replace( /\s+/g, " " );
+		} );
+		return result;
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "direction" ) {
+			this._removeClass( "ui-controlgroup-" + this.options.direction );
+		}
+
+		this._super( key, value );
+		if ( key === "disabled" ) {
+			this._callChildMethod( value ? "disable" : "enable" );
+			return;
+		}
+
+		this.refresh();
+	},
+
+	refresh: function() {
+		var children,
+			that = this;
+
+		this._addClass( "ui-controlgroup ui-controlgroup-" + this.options.direction );
+
+		if ( this.options.direction === "horizontal" ) {
+			this._addClass( null, "ui-helper-clearfix" );
+		}
+		this._initWidgets();
+
+		children = this.childWidgets;
+
+		// We filter here because we need to track all childWidgets not just the visible ones
+		if ( this.options.onlyVisible ) {
+			children = children.filter( ":visible" );
+		}
+
+		if ( children.length ) {
+
+			// We do this last because we need to make sure all enhancment is done
+			// before determining first and last
+			$.each( [ "first", "last" ], function( index, value ) {
+				var instance = children[ value ]().data( "ui-controlgroup-data" );
+
+				if ( instance && that[ "_" + instance.widgetName + "Options" ] ) {
+					var options = that[ "_" + instance.widgetName + "Options" ](
+						children.length === 1 ? "only" : value
+					);
+					options.classes = that._resolveClassesValues( options.classes, instance );
+					instance.element[ instance.widgetName ]( options );
+				} else {
+					that._updateCornerClass( children[ value ](), value );
+				}
+			} );
+
+			// Finally call the refresh method on each of the child widgets.
+			this._callChildMethod( "refresh" );
+		}
+	}
+} );
+
+/*!
+ * jQuery UI Checkboxradio 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Checkboxradio
+//>>group: Widgets
+//>>description: Enhances a form with multiple themeable checkboxes or radio buttons.
+//>>docs: http://api.jqueryui.com/checkboxradio/
+//>>demos: http://jqueryui.com/checkboxradio/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/button.css
+//>>css.structure: ../../themes/base/checkboxradio.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+$.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
+	version: "1.12.1",
+	options: {
+		disabled: null,
+		label: null,
+		icon: true,
+		classes: {
+			"ui-checkboxradio-label": "ui-corner-all",
+			"ui-checkboxradio-icon": "ui-corner-all"
+		}
+	},
+
+	_getCreateOptions: function() {
+		var disabled, labels;
+		var that = this;
+		var options = this._super() || {};
+
+		// We read the type here, because it makes more sense to throw a element type error first,
+		// rather then the error for lack of a label. Often if its the wrong type, it
+		// won't have a label (e.g. calling on a div, btn, etc)
+		this._readType();
+
+		labels = this.element.labels();
+
+		// If there are multiple labels, use the last one
+		this.label = $( labels[ labels.length - 1 ] );
+		if ( !this.label.length ) {
+			$.error( "No label found for checkboxradio widget" );
+		}
+
+		this.originalLabel = "";
+
+		// We need to get the label text but this may also need to make sure it does not contain the
+		// input itself.
+		this.label.contents().not( this.element[ 0 ] ).each( function() {
+
+			// The label contents could be text, html, or a mix. We concat each element to get a
+			// string representation of the label, without the input as part of it.
+			that.originalLabel += this.nodeType === 3 ? $( this ).text() : this.outerHTML;
+		} );
+
+		// Set the label option if we found label text
+		if ( this.originalLabel ) {
+			options.label = this.originalLabel;
+		}
+
+		disabled = this.element[ 0 ].disabled;
+		if ( disabled != null ) {
+			options.disabled = disabled;
+		}
+		return options;
+	},
+
+	_create: function() {
+		var checked = this.element[ 0 ].checked;
+
+		this._bindFormResetHandler();
+
+		if ( this.options.disabled == null ) {
+			this.options.disabled = this.element[ 0 ].disabled;
+		}
+
+		this._setOption( "disabled", this.options.disabled );
+		this._addClass( "ui-checkboxradio", "ui-helper-hidden-accessible" );
+		this._addClass( this.label, "ui-checkboxradio-label", "ui-button ui-widget" );
+
+		if ( this.type === "radio" ) {
+			this._addClass( this.label, "ui-checkboxradio-radio-label" );
+		}
+
+		if ( this.options.label && this.options.label !== this.originalLabel ) {
+			this._updateLabel();
+		} else if ( this.originalLabel ) {
+			this.options.label = this.originalLabel;
+		}
+
+		this._enhance();
+
+		if ( checked ) {
+			this._addClass( this.label, "ui-checkboxradio-checked", "ui-state-active" );
+			if ( this.icon ) {
+				this._addClass( this.icon, null, "ui-state-hover" );
+			}
+		}
+
+		this._on( {
+			change: "_toggleClasses",
+			focus: function() {
+				this._addClass( this.label, null, "ui-state-focus ui-visual-focus" );
+			},
+			blur: function() {
+				this._removeClass( this.label, null, "ui-state-focus ui-visual-focus" );
+			}
+		} );
+	},
+
+	_readType: function() {
+		var nodeName = this.element[ 0 ].nodeName.toLowerCase();
+		this.type = this.element[ 0 ].type;
+		if ( nodeName !== "input" || !/radio|checkbox/.test( this.type ) ) {
+			$.error( "Can't create checkboxradio on element.nodeName=" + nodeName +
+				" and element.type=" + this.type );
+		}
+	},
+
+	// Support jQuery Mobile enhanced option
+	_enhance: function() {
+		this._updateIcon( this.element[ 0 ].checked );
+	},
+
+	widget: function() {
+		return this.label;
+	},
+
+	_getRadioGroup: function() {
+		var group;
+		var name = this.element[ 0 ].name;
+		var nameSelector = "input[name='" + $.ui.escapeSelector( name ) + "']";
+
+		if ( !name ) {
+			return $( [] );
+		}
+
+		if ( this.form.length ) {
+			group = $( this.form[ 0 ].elements ).filter( nameSelector );
+		} else {
+
+			// Not inside a form, check all inputs that also are not inside a form
+			group = $( nameSelector ).filter( function() {
+				return $( this ).form().length === 0;
+			} );
+		}
+
+		return group.not( this.element );
+	},
+
+	_toggleClasses: function() {
+		var checked = this.element[ 0 ].checked;
+		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
+
+		if ( this.options.icon && this.type === "checkbox" ) {
+			this._toggleClass( this.icon, null, "ui-icon-check ui-state-checked", checked )
+				._toggleClass( this.icon, null, "ui-icon-blank", !checked );
+		}
+
+		if ( this.type === "radio" ) {
+			this._getRadioGroup()
+				.each( function() {
+					var instance = $( this ).checkboxradio( "instance" );
+
+					if ( instance ) {
+						instance._removeClass( instance.label,
+							"ui-checkboxradio-checked", "ui-state-active" );
+					}
+				} );
+		}
+	},
+
+	_destroy: function() {
+		this._unbindFormResetHandler();
+
+		if ( this.icon ) {
+			this.icon.remove();
+			this.iconSpace.remove();
+		}
+	},
+
+	_setOption: function( key, value ) {
+
+		// We don't allow the value to be set to nothing
+		if ( key === "label" && !value ) {
+			return;
+		}
+
+		this._super( key, value );
+
+		if ( key === "disabled" ) {
+			this._toggleClass( this.label, null, "ui-state-disabled", value );
+			this.element[ 0 ].disabled = value;
+
+			// Don't refresh when setting disabled
+			return;
+		}
+		this.refresh();
+	},
+
+	_updateIcon: function( checked ) {
+		var toAdd = "ui-icon ui-icon-background ";
+
+		if ( this.options.icon ) {
+			if ( !this.icon ) {
+				this.icon = $( "<span>" );
+				this.iconSpace = $( "<span> </span>" );
+				this._addClass( this.iconSpace, "ui-checkboxradio-icon-space" );
+			}
+
+			if ( this.type === "checkbox" ) {
+				toAdd += checked ? "ui-icon-check ui-state-checked" : "ui-icon-blank";
+				this._removeClass( this.icon, null, checked ? "ui-icon-blank" : "ui-icon-check" );
+			} else {
+				toAdd += "ui-icon-blank";
+			}
+			this._addClass( this.icon, "ui-checkboxradio-icon", toAdd );
+			if ( !checked ) {
+				this._removeClass( this.icon, null, "ui-icon-check ui-state-checked" );
+			}
+			this.icon.prependTo( this.label ).after( this.iconSpace );
+		} else if ( this.icon !== undefined ) {
+			this.icon.remove();
+			this.iconSpace.remove();
+			delete this.icon;
+		}
+	},
+
+	_updateLabel: function() {
+
+		// Remove the contents of the label ( minus the icon, icon space, and input )
+		var contents = this.label.contents().not( this.element[ 0 ] );
+		if ( this.icon ) {
+			contents = contents.not( this.icon[ 0 ] );
+		}
+		if ( this.iconSpace ) {
+			contents = contents.not( this.iconSpace[ 0 ] );
+		}
+		contents.remove();
+
+		this.label.append( this.options.label );
+	},
+
+	refresh: function() {
+		var checked = this.element[ 0 ].checked,
+			isDisabled = this.element[ 0 ].disabled;
+
+		this._updateIcon( checked );
+		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
+		if ( this.options.label !== null ) {
+			this._updateLabel();
+		}
+
+		if ( isDisabled !== this.options.disabled ) {
+			this._setOptions( { "disabled": isDisabled } );
+		}
+	}
+
+} ] );
+
+var widgetsCheckboxradio = $.ui.checkboxradio;
+
+
+/*!
+ * jQuery UI Button 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Button
+//>>group: Widgets
+//>>description: Enhances a form with themeable buttons.
+//>>docs: http://api.jqueryui.com/button/
+//>>demos: http://jqueryui.com/button/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/button.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+$.widget( "ui.button", {
+	version: "1.12.1",
+	defaultElement: "<button>",
+	options: {
+		classes: {
+			"ui-button": "ui-corner-all"
+		},
+		disabled: null,
+		icon: null,
+		iconPosition: "beginning",
+		label: null,
+		showLabel: true
+	},
+
+	_getCreateOptions: function() {
+		var disabled,
+
+			// This is to support cases like in jQuery Mobile where the base widget does have
+			// an implementation of _getCreateOptions
+			options = this._super() || {};
+
+		this.isInput = this.element.is( "input" );
+
+		disabled = this.element[ 0 ].disabled;
+		if ( disabled != null ) {
+			options.disabled = disabled;
+		}
+
+		this.originalLabel = this.isInput ? this.element.val() : this.element.html();
+		if ( this.originalLabel ) {
+			options.label = this.originalLabel;
+		}
+
+		return options;
+	},
+
+	_create: function() {
+		if ( !this.option.showLabel & !this.options.icon ) {
+			this.options.showLabel = true;
+		}
+
+		// We have to check the option again here even though we did in _getCreateOptions,
+		// because null may have been passed on init which would override what was set in
+		// _getCreateOptions
+		if ( this.options.disabled == null ) {
+			this.options.disabled = this.element[ 0 ].disabled || false;
+		}
+
+		this.hasTitle = !!this.element.attr( "title" );
+
+		// Check to see if the label needs to be set or if its already correct
+		if ( this.options.label && this.options.label !== this.originalLabel ) {
+			if ( this.isInput ) {
+				this.element.val( this.options.label );
+			} else {
+				this.element.html( this.options.label );
+			}
+		}
+		this._addClass( "ui-button", "ui-widget" );
+		this._setOption( "disabled", this.options.disabled );
+		this._enhance();
+
+		if ( this.element.is( "a" ) ) {
+			this._on( {
+				"keyup": function( event ) {
+					if ( event.keyCode === $.ui.keyCode.SPACE ) {
+						event.preventDefault();
+
+						// Support: PhantomJS <= 1.9, IE 8 Only
+						// If a native click is available use it so we actually cause navigation
+						// otherwise just trigger a click event
+						if ( this.element[ 0 ].click ) {
+							this.element[ 0 ].click();
+						} else {
+							this.element.trigger( "click" );
+						}
+					}
+				}
+			} );
+		}
+	},
+
+	_enhance: function() {
+		if ( !this.element.is( "button" ) ) {
+			this.element.attr( "role", "button" );
+		}
+
+		if ( this.options.icon ) {
+			this._updateIcon( "icon", this.options.icon );
+			this._updateTooltip();
+		}
+	},
+
+	_updateTooltip: function() {
+		this.title = this.element.attr( "title" );
+
+		if ( !this.options.showLabel && !this.title ) {
+			this.element.attr( "title", this.options.label );
+		}
+	},
+
+	_updateIcon: function( option, value ) {
+		var icon = option !== "iconPosition",
+			position = icon ? this.options.iconPosition : value,
+			displayBlock = position === "top" || position === "bottom";
+
+		// Create icon
+		if ( !this.icon ) {
+			this.icon = $( "<span>" );
+
+			this._addClass( this.icon, "ui-button-icon", "ui-icon" );
+
+			if ( !this.options.showLabel ) {
+				this._addClass( "ui-button-icon-only" );
+			}
+		} else if ( icon ) {
+
+			// If we are updating the icon remove the old icon class
+			this._removeClass( this.icon, null, this.options.icon );
+		}
+
+		// If we are updating the icon add the new icon class
+		if ( icon ) {
+			this._addClass( this.icon, null, value );
+		}
+
+		this._attachIcon( position );
+
+		// If the icon is on top or bottom we need to add the ui-widget-icon-block class and remove
+		// the iconSpace if there is one.
+		if ( displayBlock ) {
+			this._addClass( this.icon, null, "ui-widget-icon-block" );
+			if ( this.iconSpace ) {
+				this.iconSpace.remove();
+			}
+		} else {
+
+			// Position is beginning or end so remove the ui-widget-icon-block class and add the
+			// space if it does not exist
+			if ( !this.iconSpace ) {
+				this.iconSpace = $( "<span> </span>" );
+				this._addClass( this.iconSpace, "ui-button-icon-space" );
+			}
+			this._removeClass( this.icon, null, "ui-wiget-icon-block" );
+			this._attachIconSpace( position );
+		}
+	},
+
+	_destroy: function() {
+		this.element.removeAttr( "role" );
+
+		if ( this.icon ) {
+			this.icon.remove();
+		}
+		if ( this.iconSpace ) {
+			this.iconSpace.remove();
+		}
+		if ( !this.hasTitle ) {
+			this.element.removeAttr( "title" );
+		}
+	},
+
+	_attachIconSpace: function( iconPosition ) {
+		this.icon[ /^(?:end|bottom)/.test( iconPosition ) ? "before" : "after" ]( this.iconSpace );
+	},
+
+	_attachIcon: function( iconPosition ) {
+		this.element[ /^(?:end|bottom)/.test( iconPosition ) ? "append" : "prepend" ]( this.icon );
+	},
+
+	_setOptions: function( options ) {
+		var newShowLabel = options.showLabel === undefined ?
+				this.options.showLabel :
+				options.showLabel,
+			newIcon = options.icon === undefined ? this.options.icon : options.icon;
+
+		if ( !newShowLabel && !newIcon ) {
+			options.showLabel = true;
+		}
+		this._super( options );
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "icon" ) {
+			if ( value ) {
+				this._updateIcon( key, value );
+			} else if ( this.icon ) {
+				this.icon.remove();
+				if ( this.iconSpace ) {
+					this.iconSpace.remove();
+				}
+			}
+		}
+
+		if ( key === "iconPosition" ) {
+			this._updateIcon( key, value );
+		}
+
+		// Make sure we can't end up with a button that has neither text nor icon
+		if ( key === "showLabel" ) {
+				this._toggleClass( "ui-button-icon-only", null, !value );
+				this._updateTooltip();
+		}
+
+		if ( key === "label" ) {
+			if ( this.isInput ) {
+				this.element.val( value );
+			} else {
+
+				// If there is an icon, append it, else nothing then append the value
+				// this avoids removal of the icon when setting label text
+				this.element.html( value );
+				if ( this.icon ) {
+					this._attachIcon( this.options.iconPosition );
+					this._attachIconSpace( this.options.iconPosition );
+				}
+			}
+		}
+
+		this._super( key, value );
+
+		if ( key === "disabled" ) {
+			this._toggleClass( null, "ui-state-disabled", value );
+			this.element[ 0 ].disabled = value;
+			if ( value ) {
+				this.element.blur();
+			}
+		}
+	},
+
+	refresh: function() {
+
+		// Make sure to only check disabled if its an element that supports this otherwise
+		// check for the disabled class to determine state
+		var isDisabled = this.element.is( "input, button" ) ?
+			this.element[ 0 ].disabled : this.element.hasClass( "ui-button-disabled" );
+
+		if ( isDisabled !== this.options.disabled ) {
+			this._setOptions( { disabled: isDisabled } );
+		}
+
+		this._updateTooltip();
+	}
+} );
+
+// DEPRECATED
+if ( $.uiBackCompat !== false ) {
+
+	// Text and Icons options
+	$.widget( "ui.button", $.ui.button, {
+		options: {
+			text: true,
+			icons: {
+				primary: null,
+				secondary: null
+			}
+		},
+
+		_create: function() {
+			if ( this.options.showLabel && !this.options.text ) {
+				this.options.showLabel = this.options.text;
+			}
+			if ( !this.options.showLabel && this.options.text ) {
+				this.options.text = this.options.showLabel;
+			}
+			if ( !this.options.icon && ( this.options.icons.primary ||
+					this.options.icons.secondary ) ) {
+				if ( this.options.icons.primary ) {
+					this.options.icon = this.options.icons.primary;
+				} else {
+					this.options.icon = this.options.icons.secondary;
+					this.options.iconPosition = "end";
+				}
+			} else if ( this.options.icon ) {
+				this.options.icons.primary = this.options.icon;
+			}
+			this._super();
+		},
+
+		_setOption: function( key, value ) {
+			if ( key === "text" ) {
+				this._super( "showLabel", value );
+				return;
+			}
+			if ( key === "showLabel" ) {
+				this.options.text = value;
+			}
+			if ( key === "icon" ) {
+				this.options.icons.primary = value;
+			}
+			if ( key === "icons" ) {
+				if ( value.primary ) {
+					this._super( "icon", value.primary );
+					this._super( "iconPosition", "beginning" );
+				} else if ( value.secondary ) {
+					this._super( "icon", value.secondary );
+					this._super( "iconPosition", "end" );
+				}
+			}
+			this._superApply( arguments );
+		}
+	} );
+
+	$.fn.button = ( function( orig ) {
+		return function() {
+			if ( !this.length || ( this.length && this[ 0 ].tagName !== "INPUT" ) ||
+					( this.length && this[ 0 ].tagName === "INPUT" && (
+						this.attr( "type" ) !== "checkbox" && this.attr( "type" ) !== "radio"
+					) ) ) {
+				return orig.apply( this, arguments );
+			}
+			if ( !$.ui.checkboxradio ) {
+				$.error( "Checkboxradio widget missing" );
+			}
+			if ( arguments.length === 0 ) {
+				return this.checkboxradio( {
+					"icon": false
+				} );
+			}
+			return this.checkboxradio.apply( this, arguments );
+		};
+	} )( $.fn.button );
+
+	$.fn.buttonset = function() {
+		if ( !$.ui.controlgroup ) {
+			$.error( "Controlgroup widget missing" );
+		}
+		if ( arguments[ 0 ] === "option" && arguments[ 1 ] === "items" && arguments[ 2 ] ) {
+			return this.controlgroup.apply( this,
+				[ arguments[ 0 ], "items.button", arguments[ 2 ] ] );
+		}
+		if ( arguments[ 0 ] === "option" && arguments[ 1 ] === "items" ) {
+			return this.controlgroup.apply( this, [ arguments[ 0 ], "items.button" ] );
+		}
+		if ( typeof arguments[ 0 ] === "object" && arguments[ 0 ].items ) {
+			arguments[ 0 ].items = {
+				button: arguments[ 0 ].items
+			};
+		}
+		return this.controlgroup.apply( this, arguments );
+	};
+}
+
+var widgetsButton = $.ui.button;
+
+
+// jscs:disable maximumLineLength
+/* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
+/*!
+ * jQuery UI Datepicker 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Datepicker
+//>>group: Widgets
+//>>description: Displays a calendar from an input or inline for selecting dates.
+//>>docs: http://api.jqueryui.com/datepicker/
+//>>demos: http://jqueryui.com/datepicker/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/datepicker.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+$.extend( $.ui, { datepicker: { version: "1.12.1" } } );
+
+var datepicker_instActive;
+
+function datepicker_getZindex( elem ) {
+	var position, value;
+	while ( elem.length && elem[ 0 ] !== document ) {
+
+		// Ignore z-index if position is set to a value where z-index is ignored by the browser
+		// This makes behavior of this function consistent across browsers
+		// WebKit always returns auto if the element is positioned
+		position = elem.css( "position" );
+		if ( position === "absolute" || position === "relative" || position === "fixed" ) {
+
+			// IE returns 0 when zIndex is not specified
+			// other browsers return a string
+			// we ignore the case of nested elements with an explicit value of 0
+			// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
+			value = parseInt( elem.css( "zIndex" ), 10 );
+			if ( !isNaN( value ) && value !== 0 ) {
+				return value;
+			}
+		}
+		elem = elem.parent();
+	}
+
+	return 0;
+}
+/* Date picker manager.
+   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
+   Settings for (groups of) date pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Datepicker() {
+	this._curInst = null; // The current instance in use
+	this._keyEvent = false; // If the last event was a key event
+	this._disabledInputs = []; // List of date picker inputs that have been disabled
+	this._datepickerShowing = false; // True if the popup picker is showing , false if not
+	this._inDialog = false; // True if showing within a "dialog", false if not
+	this._mainDivId = "ui-datepicker-div"; // The ID of the main datepicker division
+	this._inlineClass = "ui-datepicker-inline"; // The name of the inline marker class
+	this._appendClass = "ui-datepicker-append"; // The name of the append marker class
+	this._triggerClass = "ui-datepicker-trigger"; // The name of the trigger marker class
+	this._dialogClass = "ui-datepicker-dialog"; // The name of the dialog marker class
+	this._disableClass = "ui-datepicker-disabled"; // The name of the disabled covering marker class
+	this._unselectableClass = "ui-datepicker-unselectable"; // The name of the unselectable cell marker class
+	this._currentClass = "ui-datepicker-current-day"; // The name of the current day marker class
+	this._dayOverClass = "ui-datepicker-days-cell-over"; // The name of the day hover marker class
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[ "" ] = { // Default regional settings
+		closeText: "Done", // Display text for close link
+		prevText: "Prev", // Display text for previous month link
+		nextText: "Next", // Display text for next month link
+		currentText: "Today", // Display text for current month link
+		monthNames: [ "January","February","March","April","May","June",
+			"July","August","September","October","November","December" ], // Names of months for drop-down and formatting
+		monthNamesShort: [ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ], // For formatting
+		dayNames: [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ], // For formatting
+		dayNamesShort: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ], // For formatting
+		dayNamesMin: [ "Su","Mo","Tu","We","Th","Fr","Sa" ], // Column headings for days starting at Sunday
+		weekHeader: "Wk", // Column header for week of the year
+		dateFormat: "mm/dd/yy", // See format options on parseDate
+		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
+		isRTL: false, // True if right-to-left language, false if left-to-right
+		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
+		yearSuffix: "" // Additional text to append to the year in the month headers
+	};
+	this._defaults = { // Global defaults for all the date picker instances
+		showOn: "focus", // "focus" for popup on focus,
+			// "button" for trigger button, or "both" for either
+		showAnim: "fadeIn", // Name of jQuery animation for popup
+		showOptions: {}, // Options for enhanced animations
+		defaultDate: null, // Used when field is blank: actual date,
+			// +/-number for offset from today, null for today
+		appendText: "", // Display text following the input box, e.g. showing the format
+		buttonText: "...", // Text for trigger button
+		buttonImage: "", // URL for trigger button image
+		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
+		hideIfNoPrevNext: false, // True to hide next/previous month links
+			// if not applicable, false to just disable them
+		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
+		gotoCurrent: false, // True if today link goes back to current selection instead
+		changeMonth: false, // True if month can be selected directly, false if only prev/next
+		changeYear: false, // True if year can be selected directly, false if only prev/next
+		yearRange: "c-10:c+10", // Range of years to display in drop-down,
+			// either relative to today's year (-nn:+nn), relative to currently displayed year
+			// (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
+		showOtherMonths: false, // True to show dates in other months, false to leave blank
+		selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
+		showWeek: false, // True to show week of the year, false to not show it
+		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
+			// takes a Date and returns the number of the week for it
+		shortYearCutoff: "+10", // Short year values < this are in the current century,
+			// > this are in the previous century,
+			// string value starting with "+" for current year + value
+		minDate: null, // The earliest selectable date, or null for no limit
+		maxDate: null, // The latest selectable date, or null for no limit
+		duration: "fast", // Duration of display/closure
+		beforeShowDay: null, // Function that takes a date and returns an array with
+			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or "",
+			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
+		beforeShow: null, // Function that takes an input field and
+			// returns a set of custom settings for the date picker
+		onSelect: null, // Define a callback function when a date is selected
+		onChangeMonthYear: null, // Define a callback function when the month or year is changed
+		onClose: null, // Define a callback function when the datepicker is closed
+		numberOfMonths: 1, // Number of months to show at a time
+		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
+		stepMonths: 1, // Number of months to step back/forward
+		stepBigMonths: 12, // Number of months to step back/forward for the big links
+		altField: "", // Selector for an alternate field to store selected dates into
+		altFormat: "", // The date format to use for the alternate field
+		constrainInput: true, // The input is constrained by the current date format
+		showButtonPanel: false, // True to show button panel, false to not show it
+		autoSize: false, // True to size the input for the date format, false to leave as is
+		disabled: false // The initial disabled state
+	};
+	$.extend( this._defaults, this.regional[ "" ] );
+	this.regional.en = $.extend( true, {}, this.regional[ "" ] );
+	this.regional[ "en-US" ] = $.extend( true, {}, this.regional.en );
+	this.dpDiv = datepicker_bindHover( $( "<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>" ) );
+}
+
+$.extend( Datepicker.prototype, {
+	/* Class name added to elements to indicate already configured with a date picker. */
+	markerClassName: "hasDatepicker",
+
+	//Keep track of the maximum number of rows displayed (see #7043)
+	maxRows: 4,
+
+	// TODO rename to "widget" when switching to widget factory
+	_widgetDatepicker: function() {
+		return this.dpDiv;
+	},
+
+	/* Override the default settings for all instances of the date picker.
+	 * @param  settings  object - the new settings to use as defaults (anonymous object)
+	 * @return the manager object
+	 */
+	setDefaults: function( settings ) {
+		datepicker_extendRemove( this._defaults, settings || {} );
+		return this;
+	},
+
+	/* Attach the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 * @param  settings  object - the new settings to use for this date picker instance (anonymous)
+	 */
+	_attachDatepicker: function( target, settings ) {
+		var nodeName, inline, inst;
+		nodeName = target.nodeName.toLowerCase();
+		inline = ( nodeName === "div" || nodeName === "span" );
+		if ( !target.id ) {
+			this.uuid += 1;
+			target.id = "dp" + this.uuid;
+		}
+		inst = this._newInst( $( target ), inline );
+		inst.settings = $.extend( {}, settings || {} );
+		if ( nodeName === "input" ) {
+			this._connectDatepicker( target, inst );
+		} else if ( inline ) {
+			this._inlineDatepicker( target, inst );
+		}
+	},
+
+	/* Create a new instance object. */
+	_newInst: function( target, inline ) {
+		var id = target[ 0 ].id.replace( /([^A-Za-z0-9_\-])/g, "\\\\$1" ); // escape jQuery meta chars
+		return { id: id, input: target, // associated target
+			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
+			drawMonth: 0, drawYear: 0, // month being drawn
+			inline: inline, // is datepicker inline or not
+			dpDiv: ( !inline ? this.dpDiv : // presentation div
+			datepicker_bindHover( $( "<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>" ) ) ) };
+	},
+
+	/* Attach the date picker to an input field. */
+	_connectDatepicker: function( target, inst ) {
+		var input = $( target );
+		inst.append = $( [] );
+		inst.trigger = $( [] );
+		if ( input.hasClass( this.markerClassName ) ) {
+			return;
+		}
+		this._attachments( input, inst );
+		input.addClass( this.markerClassName ).on( "keydown", this._doKeyDown ).
+			on( "keypress", this._doKeyPress ).on( "keyup", this._doKeyUp );
+		this._autoSize( inst );
+		$.data( target, "datepicker", inst );
+
+		//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
+		if ( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+	},
+
+	/* Make attachments based on settings. */
+	_attachments: function( input, inst ) {
+		var showOn, buttonText, buttonImage,
+			appendText = this._get( inst, "appendText" ),
+			isRTL = this._get( inst, "isRTL" );
+
+		if ( inst.append ) {
+			inst.append.remove();
+		}
+		if ( appendText ) {
+			inst.append = $( "<span class='" + this._appendClass + "'>" + appendText + "</span>" );
+			input[ isRTL ? "before" : "after" ]( inst.append );
+		}
+
+		input.off( "focus", this._showDatepicker );
+
+		if ( inst.trigger ) {
+			inst.trigger.remove();
+		}
+
+		showOn = this._get( inst, "showOn" );
+		if ( showOn === "focus" || showOn === "both" ) { // pop-up date picker when in the marked field
+			input.on( "focus", this._showDatepicker );
+		}
+		if ( showOn === "button" || showOn === "both" ) { // pop-up date picker when button clicked
+			buttonText = this._get( inst, "buttonText" );
+			buttonImage = this._get( inst, "buttonImage" );
+			inst.trigger = $( this._get( inst, "buttonImageOnly" ) ?
+				$( "<img/>" ).addClass( this._triggerClass ).
+					attr( { src: buttonImage, alt: buttonText, title: buttonText } ) :
+				$( "<button type='button'></button>" ).addClass( this._triggerClass ).
+					html( !buttonImage ? buttonText : $( "<img/>" ).attr(
+					{ src:buttonImage, alt:buttonText, title:buttonText } ) ) );
+			input[ isRTL ? "before" : "after" ]( inst.trigger );
+			inst.trigger.on( "click", function() {
+				if ( $.datepicker._datepickerShowing && $.datepicker._lastInput === input[ 0 ] ) {
+					$.datepicker._hideDatepicker();
+				} else if ( $.datepicker._datepickerShowing && $.datepicker._lastInput !== input[ 0 ] ) {
+					$.datepicker._hideDatepicker();
+					$.datepicker._showDatepicker( input[ 0 ] );
+				} else {
+					$.datepicker._showDatepicker( input[ 0 ] );
+				}
+				return false;
+			} );
+		}
+	},
+
+	/* Apply the maximum length for the date format. */
+	_autoSize: function( inst ) {
+		if ( this._get( inst, "autoSize" ) && !inst.inline ) {
+			var findMax, max, maxI, i,
+				date = new Date( 2009, 12 - 1, 20 ), // Ensure double digits
+				dateFormat = this._get( inst, "dateFormat" );
+
+			if ( dateFormat.match( /[DM]/ ) ) {
+				findMax = function( names ) {
+					max = 0;
+					maxI = 0;
+					for ( i = 0; i < names.length; i++ ) {
+						if ( names[ i ].length > max ) {
+							max = names[ i ].length;
+							maxI = i;
+						}
+					}
+					return maxI;
+				};
+				date.setMonth( findMax( this._get( inst, ( dateFormat.match( /MM/ ) ?
+					"monthNames" : "monthNamesShort" ) ) ) );
+				date.setDate( findMax( this._get( inst, ( dateFormat.match( /DD/ ) ?
+					"dayNames" : "dayNamesShort" ) ) ) + 20 - date.getDay() );
+			}
+			inst.input.attr( "size", this._formatDate( inst, date ).length );
+		}
+	},
+
+	/* Attach an inline date picker to a div. */
+	_inlineDatepicker: function( target, inst ) {
+		var divSpan = $( target );
+		if ( divSpan.hasClass( this.markerClassName ) ) {
+			return;
+		}
+		divSpan.addClass( this.markerClassName ).append( inst.dpDiv );
+		$.data( target, "datepicker", inst );
+		this._setDate( inst, this._getDefaultDate( inst ), true );
+		this._updateDatepicker( inst );
+		this._updateAlternate( inst );
+
+		//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
+		if ( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+
+		// Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
+		// http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
+		inst.dpDiv.css( "display", "block" );
+	},
+
+	/* Pop-up the date picker in a "dialog" box.
+	 * @param  input element - ignored
+	 * @param  date	string or Date - the initial date to display
+	 * @param  onSelect  function - the function to call when a date is selected
+	 * @param  settings  object - update the dialog date picker instance's settings (anonymous object)
+	 * @param  pos int[2] - coordinates for the dialog's position within the screen or
+	 *					event - with x/y coordinates or
+	 *					leave empty for default (screen centre)
+	 * @return the manager object
+	 */
+	_dialogDatepicker: function( input, date, onSelect, settings, pos ) {
+		var id, browserWidth, browserHeight, scrollX, scrollY,
+			inst = this._dialogInst; // internal instance
+
+		if ( !inst ) {
+			this.uuid += 1;
+			id = "dp" + this.uuid;
+			this._dialogInput = $( "<input type='text' id='" + id +
+				"' style='position: absolute; top: -100px; width: 0px;'/>" );
+			this._dialogInput.on( "keydown", this._doKeyDown );
+			$( "body" ).append( this._dialogInput );
+			inst = this._dialogInst = this._newInst( this._dialogInput, false );
+			inst.settings = {};
+			$.data( this._dialogInput[ 0 ], "datepicker", inst );
+		}
+		datepicker_extendRemove( inst.settings, settings || {} );
+		date = ( date && date.constructor === Date ? this._formatDate( inst, date ) : date );
+		this._dialogInput.val( date );
+
+		this._pos = ( pos ? ( pos.length ? pos : [ pos.pageX, pos.pageY ] ) : null );
+		if ( !this._pos ) {
+			browserWidth = document.documentElement.clientWidth;
+			browserHeight = document.documentElement.clientHeight;
+			scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+			scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+			this._pos = // should use actual width/height below
+				[ ( browserWidth / 2 ) - 100 + scrollX, ( browserHeight / 2 ) - 150 + scrollY ];
+		}
+
+		// Move input on screen for focus, but hidden behind dialog
+		this._dialogInput.css( "left", ( this._pos[ 0 ] + 20 ) + "px" ).css( "top", this._pos[ 1 ] + "px" );
+		inst.settings.onSelect = onSelect;
+		this._inDialog = true;
+		this.dpDiv.addClass( this._dialogClass );
+		this._showDatepicker( this._dialogInput[ 0 ] );
+		if ( $.blockUI ) {
+			$.blockUI( this.dpDiv );
+		}
+		$.data( this._dialogInput[ 0 ], "datepicker", inst );
+		return this;
+	},
+
+	/* Detach a datepicker from its control.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_destroyDatepicker: function( target ) {
+		var nodeName,
+			$target = $( target ),
+			inst = $.data( target, "datepicker" );
+
+		if ( !$target.hasClass( this.markerClassName ) ) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		$.removeData( target, "datepicker" );
+		if ( nodeName === "input" ) {
+			inst.append.remove();
+			inst.trigger.remove();
+			$target.removeClass( this.markerClassName ).
+				off( "focus", this._showDatepicker ).
+				off( "keydown", this._doKeyDown ).
+				off( "keypress", this._doKeyPress ).
+				off( "keyup", this._doKeyUp );
+		} else if ( nodeName === "div" || nodeName === "span" ) {
+			$target.removeClass( this.markerClassName ).empty();
+		}
+
+		if ( datepicker_instActive === inst ) {
+			datepicker_instActive = null;
+		}
+	},
+
+	/* Enable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_enableDatepicker: function( target ) {
+		var nodeName, inline,
+			$target = $( target ),
+			inst = $.data( target, "datepicker" );
+
+		if ( !$target.hasClass( this.markerClassName ) ) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if ( nodeName === "input" ) {
+			target.disabled = false;
+			inst.trigger.filter( "button" ).
+				each( function() { this.disabled = false; } ).end().
+				filter( "img" ).css( { opacity: "1.0", cursor: "" } );
+		} else if ( nodeName === "div" || nodeName === "span" ) {
+			inline = $target.children( "." + this._inlineClass );
+			inline.children().removeClass( "ui-state-disabled" );
+			inline.find( "select.ui-datepicker-month, select.ui-datepicker-year" ).
+				prop( "disabled", false );
+		}
+		this._disabledInputs = $.map( this._disabledInputs,
+			function( value ) { return ( value === target ? null : value ); } ); // delete entry
+	},
+
+	/* Disable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_disableDatepicker: function( target ) {
+		var nodeName, inline,
+			$target = $( target ),
+			inst = $.data( target, "datepicker" );
+
+		if ( !$target.hasClass( this.markerClassName ) ) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if ( nodeName === "input" ) {
+			target.disabled = true;
+			inst.trigger.filter( "button" ).
+				each( function() { this.disabled = true; } ).end().
+				filter( "img" ).css( { opacity: "0.5", cursor: "default" } );
+		} else if ( nodeName === "div" || nodeName === "span" ) {
+			inline = $target.children( "." + this._inlineClass );
+			inline.children().addClass( "ui-state-disabled" );
+			inline.find( "select.ui-datepicker-month, select.ui-datepicker-year" ).
+				prop( "disabled", true );
+		}
+		this._disabledInputs = $.map( this._disabledInputs,
+			function( value ) { return ( value === target ? null : value ); } ); // delete entry
+		this._disabledInputs[ this._disabledInputs.length ] = target;
+	},
+
+	/* Is the first field in a jQuery collection disabled as a datepicker?
+	 * @param  target	element - the target input field or division or span
+	 * @return boolean - true if disabled, false if enabled
+	 */
+	_isDisabledDatepicker: function( target ) {
+		if ( !target ) {
+			return false;
+		}
+		for ( var i = 0; i < this._disabledInputs.length; i++ ) {
+			if ( this._disabledInputs[ i ] === target ) {
+				return true;
+			}
+		}
+		return false;
+	},
+
+	/* Retrieve the instance data for the target control.
+	 * @param  target  element - the target input field or division or span
+	 * @return  object - the associated instance data
+	 * @throws  error if a jQuery problem getting data
+	 */
+	_getInst: function( target ) {
+		try {
+			return $.data( target, "datepicker" );
+		}
+		catch ( err ) {
+			throw "Missing instance data for this datepicker";
+		}
+	},
+
+	/* Update or retrieve the settings for a date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 * @param  name	object - the new settings to update or
+	 *				string - the name of the setting to change or retrieve,
+	 *				when retrieving also "all" for all instance settings or
+	 *				"defaults" for all global defaults
+	 * @param  value   any - the new value for the setting
+	 *				(omit if above is an object or to retrieve a value)
+	 */
+	_optionDatepicker: function( target, name, value ) {
+		var settings, date, minDate, maxDate,
+			inst = this._getInst( target );
+
+		if ( arguments.length === 2 && typeof name === "string" ) {
+			return ( name === "defaults" ? $.extend( {}, $.datepicker._defaults ) :
+				( inst ? ( name === "all" ? $.extend( {}, inst.settings ) :
+				this._get( inst, name ) ) : null ) );
+		}
+
+		settings = name || {};
+		if ( typeof name === "string" ) {
+			settings = {};
+			settings[ name ] = value;
+		}
+
+		if ( inst ) {
+			if ( this._curInst === inst ) {
+				this._hideDatepicker();
+			}
+
+			date = this._getDateDatepicker( target, true );
+			minDate = this._getMinMaxDate( inst, "min" );
+			maxDate = this._getMinMaxDate( inst, "max" );
+			datepicker_extendRemove( inst.settings, settings );
+
+			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
+			if ( minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined ) {
+				inst.settings.minDate = this._formatDate( inst, minDate );
+			}
+			if ( maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined ) {
+				inst.settings.maxDate = this._formatDate( inst, maxDate );
+			}
+			if ( "disabled" in settings ) {
+				if ( settings.disabled ) {
+					this._disableDatepicker( target );
+				} else {
+					this._enableDatepicker( target );
+				}
+			}
+			this._attachments( $( target ), inst );
+			this._autoSize( inst );
+			this._setDate( inst, date );
+			this._updateAlternate( inst );
+			this._updateDatepicker( inst );
+		}
+	},
+
+	// Change method deprecated
+	_changeDatepicker: function( target, name, value ) {
+		this._optionDatepicker( target, name, value );
+	},
+
+	/* Redraw the date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 */
+	_refreshDatepicker: function( target ) {
+		var inst = this._getInst( target );
+		if ( inst ) {
+			this._updateDatepicker( inst );
+		}
+	},
+
+	/* Set the dates for a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  date	Date - the new date
+	 */
+	_setDateDatepicker: function( target, date ) {
+		var inst = this._getInst( target );
+		if ( inst ) {
+			this._setDate( inst, date );
+			this._updateDatepicker( inst );
+			this._updateAlternate( inst );
+		}
+	},
+
+	/* Get the date(s) for the first entry in a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  noDefault boolean - true if no default date is to be used
+	 * @return Date - the current date
+	 */
+	_getDateDatepicker: function( target, noDefault ) {
+		var inst = this._getInst( target );
+		if ( inst && !inst.inline ) {
+			this._setDateFromField( inst, noDefault );
+		}
+		return ( inst ? this._getDate( inst ) : null );
+	},
+
+	/* Handle keystrokes. */
+	_doKeyDown: function( event ) {
+		var onSelect, dateStr, sel,
+			inst = $.datepicker._getInst( event.target ),
+			handled = true,
+			isRTL = inst.dpDiv.is( ".ui-datepicker-rtl" );
+
+		inst._keyEvent = true;
+		if ( $.datepicker._datepickerShowing ) {
+			switch ( event.keyCode ) {
+				case 9: $.datepicker._hideDatepicker();
+						handled = false;
+						break; // hide on tab out
+				case 13: sel = $( "td." + $.datepicker._dayOverClass + ":not(." +
+									$.datepicker._currentClass + ")", inst.dpDiv );
+						if ( sel[ 0 ] ) {
+							$.datepicker._selectDay( event.target, inst.selectedMonth, inst.selectedYear, sel[ 0 ] );
+						}
+
+						onSelect = $.datepicker._get( inst, "onSelect" );
+						if ( onSelect ) {
+							dateStr = $.datepicker._formatDate( inst );
+
+							// Trigger custom callback
+							onSelect.apply( ( inst.input ? inst.input[ 0 ] : null ), [ dateStr, inst ] );
+						} else {
+							$.datepicker._hideDatepicker();
+						}
+
+						return false; // don't submit the form
+				case 27: $.datepicker._hideDatepicker();
+						break; // hide on escape
+				case 33: $.datepicker._adjustDate( event.target, ( event.ctrlKey ?
+							-$.datepicker._get( inst, "stepBigMonths" ) :
+							-$.datepicker._get( inst, "stepMonths" ) ), "M" );
+						break; // previous month/year on page up/+ ctrl
+				case 34: $.datepicker._adjustDate( event.target, ( event.ctrlKey ?
+							+$.datepicker._get( inst, "stepBigMonths" ) :
+							+$.datepicker._get( inst, "stepMonths" ) ), "M" );
+						break; // next month/year on page down/+ ctrl
+				case 35: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._clearDate( event.target );
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // clear on ctrl or command +end
+				case 36: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._gotoToday( event.target );
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // current on ctrl or command +home
+				case 37: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._adjustDate( event.target, ( isRTL ? +1 : -1 ), "D" );
+						}
+						handled = event.ctrlKey || event.metaKey;
+
+						// -1 day on ctrl or command +left
+						if ( event.originalEvent.altKey ) {
+							$.datepicker._adjustDate( event.target, ( event.ctrlKey ?
+								-$.datepicker._get( inst, "stepBigMonths" ) :
+								-$.datepicker._get( inst, "stepMonths" ) ), "M" );
+						}
+
+						// next month/year on alt +left on Mac
+						break;
+				case 38: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._adjustDate( event.target, -7, "D" );
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // -1 week on ctrl or command +up
+				case 39: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._adjustDate( event.target, ( isRTL ? -1 : +1 ), "D" );
+						}
+						handled = event.ctrlKey || event.metaKey;
+
+						// +1 day on ctrl or command +right
+						if ( event.originalEvent.altKey ) {
+							$.datepicker._adjustDate( event.target, ( event.ctrlKey ?
+								+$.datepicker._get( inst, "stepBigMonths" ) :
+								+$.datepicker._get( inst, "stepMonths" ) ), "M" );
+						}
+
+						// next month/year on alt +right
+						break;
+				case 40: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._adjustDate( event.target, +7, "D" );
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // +1 week on ctrl or command +down
+				default: handled = false;
+			}
+		} else if ( event.keyCode === 36 && event.ctrlKey ) { // display the date picker on ctrl+home
+			$.datepicker._showDatepicker( this );
+		} else {
+			handled = false;
+		}
+
+		if ( handled ) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
+	},
+
+	/* Filter entered characters - based on date format. */
+	_doKeyPress: function( event ) {
+		var chars, chr,
+			inst = $.datepicker._getInst( event.target );
+
+		if ( $.datepicker._get( inst, "constrainInput" ) ) {
+			chars = $.datepicker._possibleChars( $.datepicker._get( inst, "dateFormat" ) );
+			chr = String.fromCharCode( event.charCode == null ? event.keyCode : event.charCode );
+			return event.ctrlKey || event.metaKey || ( chr < " " || !chars || chars.indexOf( chr ) > -1 );
+		}
+	},
+
+	/* Synchronise manual entry and field/alternate field. */
+	_doKeyUp: function( event ) {
+		var date,
+			inst = $.datepicker._getInst( event.target );
+
+		if ( inst.input.val() !== inst.lastVal ) {
+			try {
+				date = $.datepicker.parseDate( $.datepicker._get( inst, "dateFormat" ),
+					( inst.input ? inst.input.val() : null ),
+					$.datepicker._getFormatConfig( inst ) );
+
+				if ( date ) { // only if valid
+					$.datepicker._setDateFromField( inst );
+					$.datepicker._updateAlternate( inst );
+					$.datepicker._updateDatepicker( inst );
+				}
+			}
+			catch ( err ) {
+			}
+		}
+		return true;
+	},
+
+	/* Pop-up the date picker for a given input field.
+	 * If false returned from beforeShow event handler do not show.
+	 * @param  input  element - the input field attached to the date picker or
+	 *					event - if triggered by focus
+	 */
+	_showDatepicker: function( input ) {
+		input = input.target || input;
+		if ( input.nodeName.toLowerCase() !== "input" ) { // find from button/image trigger
+			input = $( "input", input.parentNode )[ 0 ];
+		}
+
+		if ( $.datepicker._isDisabledDatepicker( input ) || $.datepicker._lastInput === input ) { // already here
+			return;
+		}
+
+		var inst, beforeShow, beforeShowSettings, isFixed,
+			offset, showAnim, duration;
+
+		inst = $.datepicker._getInst( input );
+		if ( $.datepicker._curInst && $.datepicker._curInst !== inst ) {
+			$.datepicker._curInst.dpDiv.stop( true, true );
+			if ( inst && $.datepicker._datepickerShowing ) {
+				$.datepicker._hideDatepicker( $.datepicker._curInst.input[ 0 ] );
+			}
+		}
+
+		beforeShow = $.datepicker._get( inst, "beforeShow" );
+		beforeShowSettings = beforeShow ? beforeShow.apply( input, [ input, inst ] ) : {};
+		if ( beforeShowSettings === false ) {
+			return;
+		}
+		datepicker_extendRemove( inst.settings, beforeShowSettings );
+
+		inst.lastVal = null;
+		$.datepicker._lastInput = input;
+		$.datepicker._setDateFromField( inst );
+
+		if ( $.datepicker._inDialog ) { // hide cursor
+			input.value = "";
+		}
+		if ( !$.datepicker._pos ) { // position below input
+			$.datepicker._pos = $.datepicker._findPos( input );
+			$.datepicker._pos[ 1 ] += input.offsetHeight; // add the height
+		}
+
+		isFixed = false;
+		$( input ).parents().each( function() {
+			isFixed |= $( this ).css( "position" ) === "fixed";
+			return !isFixed;
+		} );
+
+		offset = { left: $.datepicker._pos[ 0 ], top: $.datepicker._pos[ 1 ] };
+		$.datepicker._pos = null;
+
+		//to avoid flashes on Firefox
+		inst.dpDiv.empty();
+
+		// determine sizing offscreen
+		inst.dpDiv.css( { position: "absolute", display: "block", top: "-1000px" } );
+		$.datepicker._updateDatepicker( inst );
+
+		// fix width for dynamic number of date pickers
+		// and adjust position before showing
+		offset = $.datepicker._checkOffset( inst, offset, isFixed );
+		inst.dpDiv.css( { position: ( $.datepicker._inDialog && $.blockUI ?
+			"static" : ( isFixed ? "fixed" : "absolute" ) ), display: "none",
+			left: offset.left + "px", top: offset.top + "px" } );
+
+		if ( !inst.inline ) {
+			showAnim = $.datepicker._get( inst, "showAnim" );
+			duration = $.datepicker._get( inst, "duration" );
+			inst.dpDiv.css( "z-index", datepicker_getZindex( $( input ) ) + 1 );
+			$.datepicker._datepickerShowing = true;
+
+			if ( $.effects && $.effects.effect[ showAnim ] ) {
+				inst.dpDiv.show( showAnim, $.datepicker._get( inst, "showOptions" ), duration );
+			} else {
+				inst.dpDiv[ showAnim || "show" ]( showAnim ? duration : null );
+			}
+
+			if ( $.datepicker._shouldFocusInput( inst ) ) {
+				inst.input.trigger( "focus" );
+			}
+
+			$.datepicker._curInst = inst;
+		}
+	},
+
+	/* Generate the date picker content. */
+	_updateDatepicker: function( inst ) {
+		this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
+		datepicker_instActive = inst; // for delegate hover events
+		inst.dpDiv.empty().append( this._generateHTML( inst ) );
+		this._attachHandlers( inst );
+
+		var origyearshtml,
+			numMonths = this._getNumberOfMonths( inst ),
+			cols = numMonths[ 1 ],
+			width = 17,
+			activeCell = inst.dpDiv.find( "." + this._dayOverClass + " a" );
+
+		if ( activeCell.length > 0 ) {
+			datepicker_handleMouseover.apply( activeCell.get( 0 ) );
+		}
+
+		inst.dpDiv.removeClass( "ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4" ).width( "" );
+		if ( cols > 1 ) {
+			inst.dpDiv.addClass( "ui-datepicker-multi-" + cols ).css( "width", ( width * cols ) + "em" );
+		}
+		inst.dpDiv[ ( numMonths[ 0 ] !== 1 || numMonths[ 1 ] !== 1 ? "add" : "remove" ) +
+			"Class" ]( "ui-datepicker-multi" );
+		inst.dpDiv[ ( this._get( inst, "isRTL" ) ? "add" : "remove" ) +
+			"Class" ]( "ui-datepicker-rtl" );
+
+		if ( inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) {
+			inst.input.trigger( "focus" );
+		}
+
+		// Deffered render of the years select (to avoid flashes on Firefox)
+		if ( inst.yearshtml ) {
+			origyearshtml = inst.yearshtml;
+			setTimeout( function() {
+
+				//assure that inst.yearshtml didn't change.
+				if ( origyearshtml === inst.yearshtml && inst.yearshtml ) {
+					inst.dpDiv.find( "select.ui-datepicker-year:first" ).replaceWith( inst.yearshtml );
+				}
+				origyearshtml = inst.yearshtml = null;
+			}, 0 );
+		}
+	},
+
+	// #6694 - don't focus the input if it's already focused
+	// this breaks the change event in IE
+	// Support: IE and jQuery <1.9
+	_shouldFocusInput: function( inst ) {
+		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
+	},
+
+	/* Check positioning to remain on screen. */
+	_checkOffset: function( inst, offset, isFixed ) {
+		var dpWidth = inst.dpDiv.outerWidth(),
+			dpHeight = inst.dpDiv.outerHeight(),
+			inputWidth = inst.input ? inst.input.outerWidth() : 0,
+			inputHeight = inst.input ? inst.input.outerHeight() : 0,
+			viewWidth = document.documentElement.clientWidth + ( isFixed ? 0 : $( document ).scrollLeft() ),
+			viewHeight = document.documentElement.clientHeight + ( isFixed ? 0 : $( document ).scrollTop() );
+
+		offset.left -= ( this._get( inst, "isRTL" ) ? ( dpWidth - inputWidth ) : 0 );
+		offset.left -= ( isFixed && offset.left === inst.input.offset().left ) ? $( document ).scrollLeft() : 0;
+		offset.top -= ( isFixed && offset.top === ( inst.input.offset().top + inputHeight ) ) ? $( document ).scrollTop() : 0;
+
+		// Now check if datepicker is showing outside window viewport - move to a better place if so.
+		offset.left -= Math.min( offset.left, ( offset.left + dpWidth > viewWidth && viewWidth > dpWidth ) ?
+			Math.abs( offset.left + dpWidth - viewWidth ) : 0 );
+		offset.top -= Math.min( offset.top, ( offset.top + dpHeight > viewHeight && viewHeight > dpHeight ) ?
+			Math.abs( dpHeight + inputHeight ) : 0 );
+
+		return offset;
+	},
+
+	/* Find an object's position on the screen. */
+	_findPos: function( obj ) {
+		var position,
+			inst = this._getInst( obj ),
+			isRTL = this._get( inst, "isRTL" );
+
+		while ( obj && ( obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden( obj ) ) ) {
+			obj = obj[ isRTL ? "previousSibling" : "nextSibling" ];
+		}
+
+		position = $( obj ).offset();
+		return [ position.left, position.top ];
+	},
+
+	/* Hide the date picker from view.
+	 * @param  input  element - the input field attached to the date picker
+	 */
+	_hideDatepicker: function( input ) {
+		var showAnim, duration, postProcess, onClose,
+			inst = this._curInst;
+
+		if ( !inst || ( input && inst !== $.data( input, "datepicker" ) ) ) {
+			return;
+		}
+
+		if ( this._datepickerShowing ) {
+			showAnim = this._get( inst, "showAnim" );
+			duration = this._get( inst, "duration" );
+			postProcess = function() {
+				$.datepicker._tidyDialog( inst );
+			};
+
+			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
+			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
+				inst.dpDiv.hide( showAnim, $.datepicker._get( inst, "showOptions" ), duration, postProcess );
+			} else {
+				inst.dpDiv[ ( showAnim === "slideDown" ? "slideUp" :
+					( showAnim === "fadeIn" ? "fadeOut" : "hide" ) ) ]( ( showAnim ? duration : null ), postProcess );
+			}
+
+			if ( !showAnim ) {
+				postProcess();
+			}
+			this._datepickerShowing = false;
+
+			onClose = this._get( inst, "onClose" );
+			if ( onClose ) {
+				onClose.apply( ( inst.input ? inst.input[ 0 ] : null ), [ ( inst.input ? inst.input.val() : "" ), inst ] );
+			}
+
+			this._lastInput = null;
+			if ( this._inDialog ) {
+				this._dialogInput.css( { position: "absolute", left: "0", top: "-100px" } );
+				if ( $.blockUI ) {
+					$.unblockUI();
+					$( "body" ).append( this.dpDiv );
+				}
+			}
+			this._inDialog = false;
+		}
+	},
+
+	/* Tidy up after a dialog display. */
+	_tidyDialog: function( inst ) {
+		inst.dpDiv.removeClass( this._dialogClass ).off( ".ui-datepicker-calendar" );
+	},
+
+	/* Close date picker if clicked elsewhere. */
+	_checkExternalClick: function( event ) {
+		if ( !$.datepicker._curInst ) {
+			return;
+		}
+
+		var $target = $( event.target ),
+			inst = $.datepicker._getInst( $target[ 0 ] );
+
+		if ( ( ( $target[ 0 ].id !== $.datepicker._mainDivId &&
+				$target.parents( "#" + $.datepicker._mainDivId ).length === 0 &&
+				!$target.hasClass( $.datepicker.markerClassName ) &&
+				!$target.closest( "." + $.datepicker._triggerClass ).length &&
+				$.datepicker._datepickerShowing && !( $.datepicker._inDialog && $.blockUI ) ) ) ||
+			( $target.hasClass( $.datepicker.markerClassName ) && $.datepicker._curInst !== inst ) ) {
+				$.datepicker._hideDatepicker();
+		}
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustDate: function( id, offset, period ) {
+		var target = $( id ),
+			inst = this._getInst( target[ 0 ] );
+
+		if ( this._isDisabledDatepicker( target[ 0 ] ) ) {
+			return;
+		}
+		this._adjustInstDate( inst, offset +
+			( period === "M" ? this._get( inst, "showCurrentAtPos" ) : 0 ), // undo positioning
+			period );
+		this._updateDatepicker( inst );
+	},
+
+	/* Action for current link. */
+	_gotoToday: function( id ) {
+		var date,
+			target = $( id ),
+			inst = this._getInst( target[ 0 ] );
+
+		if ( this._get( inst, "gotoCurrent" ) && inst.currentDay ) {
+			inst.selectedDay = inst.currentDay;
+			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
+			inst.drawYear = inst.selectedYear = inst.currentYear;
+		} else {
+			date = new Date();
+			inst.selectedDay = date.getDate();
+			inst.drawMonth = inst.selectedMonth = date.getMonth();
+			inst.drawYear = inst.selectedYear = date.getFullYear();
+		}
+		this._notifyChange( inst );
+		this._adjustDate( target );
+	},
+
+	/* Action for selecting a new month/year. */
+	_selectMonthYear: function( id, select, period ) {
+		var target = $( id ),
+			inst = this._getInst( target[ 0 ] );
+
+		inst[ "selected" + ( period === "M" ? "Month" : "Year" ) ] =
+		inst[ "draw" + ( period === "M" ? "Month" : "Year" ) ] =
+			parseInt( select.options[ select.selectedIndex ].value, 10 );
+
+		this._notifyChange( inst );
+		this._adjustDate( target );
+	},
+
+	/* Action for selecting a day. */
+	_selectDay: function( id, month, year, td ) {
+		var inst,
+			target = $( id );
+
+		if ( $( td ).hasClass( this._unselectableClass ) || this._isDisabledDatepicker( target[ 0 ] ) ) {
+			return;
+		}
+
+		inst = this._getInst( target[ 0 ] );
+		inst.selectedDay = inst.currentDay = $( "a", td ).html();
+		inst.selectedMonth = inst.currentMonth = month;
+		inst.selectedYear = inst.currentYear = year;
+		this._selectDate( id, this._formatDate( inst,
+			inst.currentDay, inst.currentMonth, inst.currentYear ) );
+	},
+
+	/* Erase the input field and hide the date picker. */
+	_clearDate: function( id ) {
+		var target = $( id );
+		this._selectDate( target, "" );
+	},
+
+	/* Update the input field with the selected date. */
+	_selectDate: function( id, dateStr ) {
+		var onSelect,
+			target = $( id ),
+			inst = this._getInst( target[ 0 ] );
+
+		dateStr = ( dateStr != null ? dateStr : this._formatDate( inst ) );
+		if ( inst.input ) {
+			inst.input.val( dateStr );
+		}
+		this._updateAlternate( inst );
+
+		onSelect = this._get( inst, "onSelect" );
+		if ( onSelect ) {
+			onSelect.apply( ( inst.input ? inst.input[ 0 ] : null ), [ dateStr, inst ] );  // trigger custom callback
+		} else if ( inst.input ) {
+			inst.input.trigger( "change" ); // fire the change event
+		}
+
+		if ( inst.inline ) {
+			this._updateDatepicker( inst );
+		} else {
+			this._hideDatepicker();
+			this._lastInput = inst.input[ 0 ];
+			if ( typeof( inst.input[ 0 ] ) !== "object" ) {
+				inst.input.trigger( "focus" ); // restore focus
+			}
+			this._lastInput = null;
+		}
+	},
+
+	/* Update any alternate field to synchronise with the main field. */
+	_updateAlternate: function( inst ) {
+		var altFormat, date, dateStr,
+			altField = this._get( inst, "altField" );
+
+		if ( altField ) { // update alternate field too
+			altFormat = this._get( inst, "altFormat" ) || this._get( inst, "dateFormat" );
+			date = this._getDate( inst );
+			dateStr = this.formatDate( altFormat, date, this._getFormatConfig( inst ) );
+			$( altField ).val( dateStr );
+		}
+	},
+
+	/* Set as beforeShowDay function to prevent selection of weekends.
+	 * @param  date  Date - the date to customise
+	 * @return [boolean, string] - is this date selectable?, what is its CSS class?
+	 */
+	noWeekends: function( date ) {
+		var day = date.getDay();
+		return [ ( day > 0 && day < 6 ), "" ];
+	},
+
+	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
+	 * @param  date  Date - the date to get the week for
+	 * @return  number - the number of the week within the year that contains this date
+	 */
+	iso8601Week: function( date ) {
+		var time,
+			checkDate = new Date( date.getTime() );
+
+		// Find Thursday of this week starting on Monday
+		checkDate.setDate( checkDate.getDate() + 4 - ( checkDate.getDay() || 7 ) );
+
+		time = checkDate.getTime();
+		checkDate.setMonth( 0 ); // Compare with Jan 1
+		checkDate.setDate( 1 );
+		return Math.floor( Math.round( ( time - checkDate ) / 86400000 ) / 7 ) + 1;
+	},
+
+	/* Parse a string value into a date object.
+	 * See formatDate below for the possible formats.
+	 *
+	 * @param  format string - the expected format of the date
+	 * @param  value string - the date in the above format
+	 * @param  settings Object - attributes include:
+	 *					shortYearCutoff  number - the cutoff year for determining the century (optional)
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  Date - the extracted date value or null if value is blank
+	 */
+	parseDate: function( format, value, settings ) {
+		if ( format == null || value == null ) {
+			throw "Invalid arguments";
+		}
+
+		value = ( typeof value === "object" ? value.toString() : value + "" );
+		if ( value === "" ) {
+			return null;
+		}
+
+		var iFormat, dim, extra,
+			iValue = 0,
+			shortYearCutoffTemp = ( settings ? settings.shortYearCutoff : null ) || this._defaults.shortYearCutoff,
+			shortYearCutoff = ( typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
+				new Date().getFullYear() % 100 + parseInt( shortYearCutoffTemp, 10 ) ),
+			dayNamesShort = ( settings ? settings.dayNamesShort : null ) || this._defaults.dayNamesShort,
+			dayNames = ( settings ? settings.dayNames : null ) || this._defaults.dayNames,
+			monthNamesShort = ( settings ? settings.monthNamesShort : null ) || this._defaults.monthNamesShort,
+			monthNames = ( settings ? settings.monthNames : null ) || this._defaults.monthNames,
+			year = -1,
+			month = -1,
+			day = -1,
+			doy = -1,
+			literal = false,
+			date,
+
+			// Check whether a format character is doubled
+			lookAhead = function( match ) {
+				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
+				if ( matches ) {
+					iFormat++;
+				}
+				return matches;
+			},
+
+			// Extract a number from the string value
+			getNumber = function( match ) {
+				var isDoubled = lookAhead( match ),
+					size = ( match === "@" ? 14 : ( match === "!" ? 20 :
+					( match === "y" && isDoubled ? 4 : ( match === "o" ? 3 : 2 ) ) ) ),
+					minSize = ( match === "y" ? size : 1 ),
+					digits = new RegExp( "^\\d{" + minSize + "," + size + "}" ),
+					num = value.substring( iValue ).match( digits );
+				if ( !num ) {
+					throw "Missing number at position " + iValue;
+				}
+				iValue += num[ 0 ].length;
+				return parseInt( num[ 0 ], 10 );
+			},
+
+			// Extract a name from the string value and convert to an index
+			getName = function( match, shortNames, longNames ) {
+				var index = -1,
+					names = $.map( lookAhead( match ) ? longNames : shortNames, function( v, k ) {
+						return [ [ k, v ] ];
+					} ).sort( function( a, b ) {
+						return -( a[ 1 ].length - b[ 1 ].length );
+					} );
+
+				$.each( names, function( i, pair ) {
+					var name = pair[ 1 ];
+					if ( value.substr( iValue, name.length ).toLowerCase() === name.toLowerCase() ) {
+						index = pair[ 0 ];
+						iValue += name.length;
+						return false;
+					}
+				} );
+				if ( index !== -1 ) {
+					return index + 1;
+				} else {
+					throw "Unknown name at position " + iValue;
+				}
+			},
+
+			// Confirm that a literal character matches the string value
+			checkLiteral = function() {
+				if ( value.charAt( iValue ) !== format.charAt( iFormat ) ) {
+					throw "Unexpected literal at position " + iValue;
+				}
+				iValue++;
+			};
+
+		for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
+			if ( literal ) {
+				if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
+					literal = false;
+				} else {
+					checkLiteral();
+				}
+			} else {
+				switch ( format.charAt( iFormat ) ) {
+					case "d":
+						day = getNumber( "d" );
+						break;
+					case "D":
+						getName( "D", dayNamesShort, dayNames );
+						break;
+					case "o":
+						doy = getNumber( "o" );
+						break;
+					case "m":
+						month = getNumber( "m" );
+						break;
+					case "M":
+						month = getName( "M", monthNamesShort, monthNames );
+						break;
+					case "y":
+						year = getNumber( "y" );
+						break;
+					case "@":
+						date = new Date( getNumber( "@" ) );
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "!":
+						date = new Date( ( getNumber( "!" ) - this._ticksTo1970 ) / 10000 );
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "'":
+						if ( lookAhead( "'" ) ) {
+							checkLiteral();
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						checkLiteral();
+				}
+			}
+		}
+
+		if ( iValue < value.length ) {
+			extra = value.substr( iValue );
+			if ( !/^\s+/.test( extra ) ) {
+				throw "Extra/unparsed characters found in date: " + extra;
+			}
+		}
+
+		if ( year === -1 ) {
+			year = new Date().getFullYear();
+		} else if ( year < 100 ) {
+			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
+				( year <= shortYearCutoff ? 0 : -100 );
+		}
+
+		if ( doy > -1 ) {
+			month = 1;
+			day = doy;
+			do {
+				dim = this._getDaysInMonth( year, month - 1 );
+				if ( day <= dim ) {
+					break;
+				}
+				month++;
+				day -= dim;
+			} while ( true );
+		}
+
+		date = this._daylightSavingAdjust( new Date( year, month - 1, day ) );
+		if ( date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day ) {
+			throw "Invalid date"; // E.g. 31/02/00
+		}
+		return date;
+	},
+
+	/* Standard date formats. */
+	ATOM: "yy-mm-dd", // RFC 3339 (ISO 8601)
+	COOKIE: "D, dd M yy",
+	ISO_8601: "yy-mm-dd",
+	RFC_822: "D, d M y",
+	RFC_850: "DD, dd-M-y",
+	RFC_1036: "D, d M y",
+	RFC_1123: "D, d M yy",
+	RFC_2822: "D, d M yy",
+	RSS: "D, d M y", // RFC 822
+	TICKS: "!",
+	TIMESTAMP: "@",
+	W3C: "yy-mm-dd", // ISO 8601
+
+	_ticksTo1970: ( ( ( 1970 - 1 ) * 365 + Math.floor( 1970 / 4 ) - Math.floor( 1970 / 100 ) +
+		Math.floor( 1970 / 400 ) ) * 24 * 60 * 60 * 10000000 ),
+
+	/* Format a date object into a string value.
+	 * The format can be combinations of the following:
+	 * d  - day of month (no leading zero)
+	 * dd - day of month (two digit)
+	 * o  - day of year (no leading zeros)
+	 * oo - day of year (three digit)
+	 * D  - day name short
+	 * DD - day name long
+	 * m  - month of year (no leading zero)
+	 * mm - month of year (two digit)
+	 * M  - month name short
+	 * MM - month name long
+	 * y  - year (two digit)
+	 * yy - year (four digit)
+	 * @ - Unix timestamp (ms since 01/01/1970)
+	 * ! - Windows ticks (100ns since 01/01/0001)
+	 * "..." - literal text
+	 * '' - single quote
+	 *
+	 * @param  format string - the desired format of the date
+	 * @param  date Date - the date value to format
+	 * @param  settings Object - attributes include:
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  string - the date in the above format
+	 */
+	formatDate: function( format, date, settings ) {
+		if ( !date ) {
+			return "";
+		}
+
+		var iFormat,
+			dayNamesShort = ( settings ? settings.dayNamesShort : null ) || this._defaults.dayNamesShort,
+			dayNames = ( settings ? settings.dayNames : null ) || this._defaults.dayNames,
+			monthNamesShort = ( settings ? settings.monthNamesShort : null ) || this._defaults.monthNamesShort,
+			monthNames = ( settings ? settings.monthNames : null ) || this._defaults.monthNames,
+
+			// Check whether a format character is doubled
+			lookAhead = function( match ) {
+				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
+				if ( matches ) {
+					iFormat++;
+				}
+				return matches;
+			},
+
+			// Format a number, with leading zero if necessary
+			formatNumber = function( match, value, len ) {
+				var num = "" + value;
+				if ( lookAhead( match ) ) {
+					while ( num.length < len ) {
+						num = "0" + num;
+					}
+				}
+				return num;
+			},
+
+			// Format a name, short or long as requested
+			formatName = function( match, value, shortNames, longNames ) {
+				return ( lookAhead( match ) ? longNames[ value ] : shortNames[ value ] );
+			},
+			output = "",
+			literal = false;
+
+		if ( date ) {
+			for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
+				if ( literal ) {
+					if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
+						literal = false;
+					} else {
+						output += format.charAt( iFormat );
+					}
+				} else {
+					switch ( format.charAt( iFormat ) ) {
+						case "d":
+							output += formatNumber( "d", date.getDate(), 2 );
+							break;
+						case "D":
+							output += formatName( "D", date.getDay(), dayNamesShort, dayNames );
+							break;
+						case "o":
+							output += formatNumber( "o",
+								Math.round( ( new Date( date.getFullYear(), date.getMonth(), date.getDate() ).getTime() - new Date( date.getFullYear(), 0, 0 ).getTime() ) / 86400000 ), 3 );
+							break;
+						case "m":
+							output += formatNumber( "m", date.getMonth() + 1, 2 );
+							break;
+						case "M":
+							output += formatName( "M", date.getMonth(), monthNamesShort, monthNames );
+							break;
+						case "y":
+							output += ( lookAhead( "y" ) ? date.getFullYear() :
+								( date.getFullYear() % 100 < 10 ? "0" : "" ) + date.getFullYear() % 100 );
+							break;
+						case "@":
+							output += date.getTime();
+							break;
+						case "!":
+							output += date.getTime() * 10000 + this._ticksTo1970;
+							break;
+						case "'":
+							if ( lookAhead( "'" ) ) {
+								output += "'";
+							} else {
+								literal = true;
+							}
+							break;
+						default:
+							output += format.charAt( iFormat );
+					}
+				}
+			}
+		}
+		return output;
+	},
+
+	/* Extract all possible characters from the date format. */
+	_possibleChars: function( format ) {
+		var iFormat,
+			chars = "",
+			literal = false,
+
+			// Check whether a format character is doubled
+			lookAhead = function( match ) {
+				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
+				if ( matches ) {
+					iFormat++;
+				}
+				return matches;
+			};
+
+		for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
+			if ( literal ) {
+				if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
+					literal = false;
+				} else {
+					chars += format.charAt( iFormat );
+				}
+			} else {
+				switch ( format.charAt( iFormat ) ) {
+					case "d": case "m": case "y": case "@":
+						chars += "0123456789";
+						break;
+					case "D": case "M":
+						return null; // Accept anything
+					case "'":
+						if ( lookAhead( "'" ) ) {
+							chars += "'";
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						chars += format.charAt( iFormat );
+				}
+			}
+		}
+		return chars;
+	},
+
+	/* Get a setting value, defaulting if necessary. */
+	_get: function( inst, name ) {
+		return inst.settings[ name ] !== undefined ?
+			inst.settings[ name ] : this._defaults[ name ];
+	},
+
+	/* Parse existing date and initialise date picker. */
+	_setDateFromField: function( inst, noDefault ) {
+		if ( inst.input.val() === inst.lastVal ) {
+			return;
+		}
+
+		var dateFormat = this._get( inst, "dateFormat" ),
+			dates = inst.lastVal = inst.input ? inst.input.val() : null,
+			defaultDate = this._getDefaultDate( inst ),
+			date = defaultDate,
+			settings = this._getFormatConfig( inst );
+
+		try {
+			date = this.parseDate( dateFormat, dates, settings ) || defaultDate;
+		} catch ( event ) {
+			dates = ( noDefault ? "" : dates );
+		}
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		inst.currentDay = ( dates ? date.getDate() : 0 );
+		inst.currentMonth = ( dates ? date.getMonth() : 0 );
+		inst.currentYear = ( dates ? date.getFullYear() : 0 );
+		this._adjustInstDate( inst );
+	},
+
+	/* Retrieve the default date shown on opening. */
+	_getDefaultDate: function( inst ) {
+		return this._restrictMinMax( inst,
+			this._determineDate( inst, this._get( inst, "defaultDate" ), new Date() ) );
+	},
+
+	/* A date may be specified as an exact value or a relative one. */
+	_determineDate: function( inst, date, defaultDate ) {
+		var offsetNumeric = function( offset ) {
+				var date = new Date();
+				date.setDate( date.getDate() + offset );
+				return date;
+			},
+			offsetString = function( offset ) {
+				try {
+					return $.datepicker.parseDate( $.datepicker._get( inst, "dateFormat" ),
+						offset, $.datepicker._getFormatConfig( inst ) );
+				}
+				catch ( e ) {
+
+					// Ignore
+				}
+
+				var date = ( offset.toLowerCase().match( /^c/ ) ?
+					$.datepicker._getDate( inst ) : null ) || new Date(),
+					year = date.getFullYear(),
+					month = date.getMonth(),
+					day = date.getDate(),
+					pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,
+					matches = pattern.exec( offset );
+
+				while ( matches ) {
+					switch ( matches[ 2 ] || "d" ) {
+						case "d" : case "D" :
+							day += parseInt( matches[ 1 ], 10 ); break;
+						case "w" : case "W" :
+							day += parseInt( matches[ 1 ], 10 ) * 7; break;
+						case "m" : case "M" :
+							month += parseInt( matches[ 1 ], 10 );
+							day = Math.min( day, $.datepicker._getDaysInMonth( year, month ) );
+							break;
+						case "y": case "Y" :
+							year += parseInt( matches[ 1 ], 10 );
+							day = Math.min( day, $.datepicker._getDaysInMonth( year, month ) );
+							break;
+					}
+					matches = pattern.exec( offset );
+				}
+				return new Date( year, month, day );
+			},
+			newDate = ( date == null || date === "" ? defaultDate : ( typeof date === "string" ? offsetString( date ) :
+				( typeof date === "number" ? ( isNaN( date ) ? defaultDate : offsetNumeric( date ) ) : new Date( date.getTime() ) ) ) );
+
+		newDate = ( newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate );
+		if ( newDate ) {
+			newDate.setHours( 0 );
+			newDate.setMinutes( 0 );
+			newDate.setSeconds( 0 );
+			newDate.setMilliseconds( 0 );
+		}
+		return this._daylightSavingAdjust( newDate );
+	},
+
+	/* Handle switch to/from daylight saving.
+	 * Hours may be non-zero on daylight saving cut-over:
+	 * > 12 when midnight changeover, but then cannot generate
+	 * midnight datetime, so jump to 1AM, otherwise reset.
+	 * @param  date  (Date) the date to check
+	 * @return  (Date) the corrected date
+	 */
+	_daylightSavingAdjust: function( date ) {
+		if ( !date ) {
+			return null;
+		}
+		date.setHours( date.getHours() > 12 ? date.getHours() + 2 : 0 );
+		return date;
+	},
+
+	/* Set the date(s) directly. */
+	_setDate: function( inst, date, noChange ) {
+		var clear = !date,
+			origMonth = inst.selectedMonth,
+			origYear = inst.selectedYear,
+			newDate = this._restrictMinMax( inst, this._determineDate( inst, date, new Date() ) );
+
+		inst.selectedDay = inst.currentDay = newDate.getDate();
+		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
+		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
+		if ( ( origMonth !== inst.selectedMonth || origYear !== inst.selectedYear ) && !noChange ) {
+			this._notifyChange( inst );
+		}
+		this._adjustInstDate( inst );
+		if ( inst.input ) {
+			inst.input.val( clear ? "" : this._formatDate( inst ) );
+		}
+	},
+
+	/* Retrieve the date(s) directly. */
+	_getDate: function( inst ) {
+		var startDate = ( !inst.currentYear || ( inst.input && inst.input.val() === "" ) ? null :
+			this._daylightSavingAdjust( new Date(
+			inst.currentYear, inst.currentMonth, inst.currentDay ) ) );
+			return startDate;
+	},
+
+	/* Attach the onxxx handlers.  These are declared statically so
+	 * they work with static code transformers like Caja.
+	 */
+	_attachHandlers: function( inst ) {
+		var stepMonths = this._get( inst, "stepMonths" ),
+			id = "#" + inst.id.replace( /\\\\/g, "\\" );
+		inst.dpDiv.find( "[data-handler]" ).map( function() {
+			var handler = {
+				prev: function() {
+					$.datepicker._adjustDate( id, -stepMonths, "M" );
+				},
+				next: function() {
+					$.datepicker._adjustDate( id, +stepMonths, "M" );
+				},
+				hide: function() {
+					$.datepicker._hideDatepicker();
+				},
+				today: function() {
+					$.datepicker._gotoToday( id );
+				},
+				selectDay: function() {
+					$.datepicker._selectDay( id, +this.getAttribute( "data-month" ), +this.getAttribute( "data-year" ), this );
+					return false;
+				},
+				selectMonth: function() {
+					$.datepicker._selectMonthYear( id, this, "M" );
+					return false;
+				},
+				selectYear: function() {
+					$.datepicker._selectMonthYear( id, this, "Y" );
+					return false;
+				}
+			};
+			$( this ).on( this.getAttribute( "data-event" ), handler[ this.getAttribute( "data-handler" ) ] );
+		} );
+	},
+
+	/* Generate the HTML for the current state of the date picker. */
+	_generateHTML: function( inst ) {
+		var maxDraw, prevText, prev, nextText, next, currentText, gotoDate,
+			controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
+			monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
+			selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate,
+			cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows,
+			printDate, dRow, tbody, daySettings, otherMonth, unselectable,
+			tempDate = new Date(),
+			today = this._daylightSavingAdjust(
+				new Date( tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate() ) ), // clear time
+			isRTL = this._get( inst, "isRTL" ),
+			showButtonPanel = this._get( inst, "showButtonPanel" ),
+			hideIfNoPrevNext = this._get( inst, "hideIfNoPrevNext" ),
+			navigationAsDateFormat = this._get( inst, "navigationAsDateFormat" ),
+			numMonths = this._getNumberOfMonths( inst ),
+			showCurrentAtPos = this._get( inst, "showCurrentAtPos" ),
+			stepMonths = this._get( inst, "stepMonths" ),
+			isMultiMonth = ( numMonths[ 0 ] !== 1 || numMonths[ 1 ] !== 1 ),
+			currentDate = this._daylightSavingAdjust( ( !inst.currentDay ? new Date( 9999, 9, 9 ) :
+				new Date( inst.currentYear, inst.currentMonth, inst.currentDay ) ) ),
+			minDate = this._getMinMaxDate( inst, "min" ),
+			maxDate = this._getMinMaxDate( inst, "max" ),
+			drawMonth = inst.drawMonth - showCurrentAtPos,
+			drawYear = inst.drawYear;
+
+		if ( drawMonth < 0 ) {
+			drawMonth += 12;
+			drawYear--;
+		}
+		if ( maxDate ) {
+			maxDraw = this._daylightSavingAdjust( new Date( maxDate.getFullYear(),
+				maxDate.getMonth() - ( numMonths[ 0 ] * numMonths[ 1 ] ) + 1, maxDate.getDate() ) );
+			maxDraw = ( minDate && maxDraw < minDate ? minDate : maxDraw );
+			while ( this._daylightSavingAdjust( new Date( drawYear, drawMonth, 1 ) ) > maxDraw ) {
+				drawMonth--;
+				if ( drawMonth < 0 ) {
+					drawMonth = 11;
+					drawYear--;
+				}
+			}
+		}
+		inst.drawMonth = drawMonth;
+		inst.drawYear = drawYear;
+
+		prevText = this._get( inst, "prevText" );
+		prevText = ( !navigationAsDateFormat ? prevText : this.formatDate( prevText,
+			this._daylightSavingAdjust( new Date( drawYear, drawMonth - stepMonths, 1 ) ),
+			this._getFormatConfig( inst ) ) );
+
+		prev = ( this._canAdjustMonth( inst, -1, drawYear, drawMonth ) ?
+			"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
+			" title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w" ) + "'>" + prevText + "</span></a>" :
+			( hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w" ) + "'>" + prevText + "</span></a>" ) );
+
+		nextText = this._get( inst, "nextText" );
+		nextText = ( !navigationAsDateFormat ? nextText : this.formatDate( nextText,
+			this._daylightSavingAdjust( new Date( drawYear, drawMonth + stepMonths, 1 ) ),
+			this._getFormatConfig( inst ) ) );
+
+		next = ( this._canAdjustMonth( inst, +1, drawYear, drawMonth ) ?
+			"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
+			" title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e" ) + "'>" + nextText + "</span></a>" :
+			( hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e" ) + "'>" + nextText + "</span></a>" ) );
+
+		currentText = this._get( inst, "currentText" );
+		gotoDate = ( this._get( inst, "gotoCurrent" ) && inst.currentDay ? currentDate : today );
+		currentText = ( !navigationAsDateFormat ? currentText :
+			this.formatDate( currentText, gotoDate, this._getFormatConfig( inst ) ) );
+
+		controls = ( !inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
+			this._get( inst, "closeText" ) + "</button>" : "" );
+
+		buttonPanel = ( showButtonPanel ) ? "<div class='ui-datepicker-buttonpane ui-widget-content'>" + ( isRTL ? controls : "" ) +
+			( this._isInRange( inst, gotoDate ) ? "<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'" +
+			">" + currentText + "</button>" : "" ) + ( isRTL ? "" : controls ) + "</div>" : "";
+
+		firstDay = parseInt( this._get( inst, "firstDay" ), 10 );
+		firstDay = ( isNaN( firstDay ) ? 0 : firstDay );
+
+		showWeek = this._get( inst, "showWeek" );
+		dayNames = this._get( inst, "dayNames" );
+		dayNamesMin = this._get( inst, "dayNamesMin" );
+		monthNames = this._get( inst, "monthNames" );
+		monthNamesShort = this._get( inst, "monthNamesShort" );
+		beforeShowDay = this._get( inst, "beforeShowDay" );
+		showOtherMonths = this._get( inst, "showOtherMonths" );
+		selectOtherMonths = this._get( inst, "selectOtherMonths" );
+		defaultDate = this._getDefaultDate( inst );
+		html = "";
+
+		for ( row = 0; row < numMonths[ 0 ]; row++ ) {
+			group = "";
+			this.maxRows = 4;
+			for ( col = 0; col < numMonths[ 1 ]; col++ ) {
+				selectedDate = this._daylightSavingAdjust( new Date( drawYear, drawMonth, inst.selectedDay ) );
+				cornerClass = " ui-corner-all";
+				calender = "";
+				if ( isMultiMonth ) {
+					calender += "<div class='ui-datepicker-group";
+					if ( numMonths[ 1 ] > 1 ) {
+						switch ( col ) {
+							case 0: calender += " ui-datepicker-group-first";
+								cornerClass = " ui-corner-" + ( isRTL ? "right" : "left" ); break;
+							case numMonths[ 1 ] - 1: calender += " ui-datepicker-group-last";
+								cornerClass = " ui-corner-" + ( isRTL ? "left" : "right" ); break;
+							default: calender += " ui-datepicker-group-middle"; cornerClass = ""; break;
+						}
+					}
+					calender += "'>";
+				}
+				calender += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
+					( /all|left/.test( cornerClass ) && row === 0 ? ( isRTL ? next : prev ) : "" ) +
+					( /all|right/.test( cornerClass ) && row === 0 ? ( isRTL ? prev : next ) : "" ) +
+					this._generateMonthYearHeader( inst, drawMonth, drawYear, minDate, maxDate,
+					row > 0 || col > 0, monthNames, monthNamesShort ) + // draw month headers
+					"</div><table class='ui-datepicker-calendar'><thead>" +
+					"<tr>";
+				thead = ( showWeek ? "<th class='ui-datepicker-week-col'>" + this._get( inst, "weekHeader" ) + "</th>" : "" );
+				for ( dow = 0; dow < 7; dow++ ) { // days of the week
+					day = ( dow + firstDay ) % 7;
+					thead += "<th scope='col'" + ( ( dow + firstDay + 6 ) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "" ) + ">" +
+						"<span title='" + dayNames[ day ] + "'>" + dayNamesMin[ day ] + "</span></th>";
+				}
+				calender += thead + "</tr></thead><tbody>";
+				daysInMonth = this._getDaysInMonth( drawYear, drawMonth );
+				if ( drawYear === inst.selectedYear && drawMonth === inst.selectedMonth ) {
+					inst.selectedDay = Math.min( inst.selectedDay, daysInMonth );
+				}
+				leadDays = ( this._getFirstDayOfMonth( drawYear, drawMonth ) - firstDay + 7 ) % 7;
+				curRows = Math.ceil( ( leadDays + daysInMonth ) / 7 ); // calculate the number of rows to generate
+				numRows = ( isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows ); //If multiple months, use the higher number of rows (see #7043)
+				this.maxRows = numRows;
+				printDate = this._daylightSavingAdjust( new Date( drawYear, drawMonth, 1 - leadDays ) );
+				for ( dRow = 0; dRow < numRows; dRow++ ) { // create date picker rows
+					calender += "<tr>";
+					tbody = ( !showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
+						this._get( inst, "calculateWeek" )( printDate ) + "</td>" );
+					for ( dow = 0; dow < 7; dow++ ) { // create date picker days
+						daySettings = ( beforeShowDay ?
+							beforeShowDay.apply( ( inst.input ? inst.input[ 0 ] : null ), [ printDate ] ) : [ true, "" ] );
+						otherMonth = ( printDate.getMonth() !== drawMonth );
+						unselectable = ( otherMonth && !selectOtherMonths ) || !daySettings[ 0 ] ||
+							( minDate && printDate < minDate ) || ( maxDate && printDate > maxDate );
+						tbody += "<td class='" +
+							( ( dow + firstDay + 6 ) % 7 >= 5 ? " ui-datepicker-week-end" : "" ) + // highlight weekends
+							( otherMonth ? " ui-datepicker-other-month" : "" ) + // highlight days from other months
+							( ( printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent ) || // user pressed key
+							( defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime() ) ?
+
+							// or defaultDate is current printedDate and defaultDate is selectedDate
+							" " + this._dayOverClass : "" ) + // highlight selected day
+							( unselectable ? " " + this._unselectableClass + " ui-state-disabled" : "" ) +  // highlight unselectable days
+							( otherMonth && !showOtherMonths ? "" : " " + daySettings[ 1 ] + // highlight custom dates
+							( printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "" ) + // highlight selected day
+							( printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "" ) ) + "'" + // highlight today (if different)
+							( ( !otherMonth || showOtherMonths ) && daySettings[ 2 ] ? " title='" + daySettings[ 2 ].replace( /'/g, "&#39;" ) + "'" : "" ) + // cell title
+							( unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'" ) + ">" + // actions
+							( otherMonth && !showOtherMonths ? "&#xa0;" : // display for other months
+							( unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +
+							( printDate.getTime() === today.getTime() ? " ui-state-highlight" : "" ) +
+							( printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "" ) + // highlight selected day
+							( otherMonth ? " ui-priority-secondary" : "" ) + // distinguish dates from other months
+							"' href='#'>" + printDate.getDate() + "</a>" ) ) + "</td>"; // display selectable date
+						printDate.setDate( printDate.getDate() + 1 );
+						printDate = this._daylightSavingAdjust( printDate );
+					}
+					calender += tbody + "</tr>";
+				}
+				drawMonth++;
+				if ( drawMonth > 11 ) {
+					drawMonth = 0;
+					drawYear++;
+				}
+				calender += "</tbody></table>" + ( isMultiMonth ? "</div>" +
+							( ( numMonths[ 0 ] > 0 && col === numMonths[ 1 ] - 1 ) ? "<div class='ui-datepicker-row-break'></div>" : "" ) : "" );
+				group += calender;
+			}
+			html += group;
+		}
+		html += buttonPanel;
+		inst._keyEvent = false;
+		return html;
+	},
+
+	/* Generate the month and year header. */
+	_generateMonthYearHeader: function( inst, drawMonth, drawYear, minDate, maxDate,
+			secondary, monthNames, monthNamesShort ) {
+
+		var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear,
+			changeMonth = this._get( inst, "changeMonth" ),
+			changeYear = this._get( inst, "changeYear" ),
+			showMonthAfterYear = this._get( inst, "showMonthAfterYear" ),
+			html = "<div class='ui-datepicker-title'>",
+			monthHtml = "";
+
+		// Month selection
+		if ( secondary || !changeMonth ) {
+			monthHtml += "<span class='ui-datepicker-month'>" + monthNames[ drawMonth ] + "</span>";
+		} else {
+			inMinYear = ( minDate && minDate.getFullYear() === drawYear );
+			inMaxYear = ( maxDate && maxDate.getFullYear() === drawYear );
+			monthHtml += "<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";
+			for ( month = 0; month < 12; month++ ) {
+				if ( ( !inMinYear || month >= minDate.getMonth() ) && ( !inMaxYear || month <= maxDate.getMonth() ) ) {
+					monthHtml += "<option value='" + month + "'" +
+						( month === drawMonth ? " selected='selected'" : "" ) +
+						">" + monthNamesShort[ month ] + "</option>";
+				}
+			}
+			monthHtml += "</select>";
+		}
+
+		if ( !showMonthAfterYear ) {
+			html += monthHtml + ( secondary || !( changeMonth && changeYear ) ? "&#xa0;" : "" );
+		}
+
+		// Year selection
+		if ( !inst.yearshtml ) {
+			inst.yearshtml = "";
+			if ( secondary || !changeYear ) {
+				html += "<span class='ui-datepicker-year'>" + drawYear + "</span>";
+			} else {
+
+				// determine range of years to display
+				years = this._get( inst, "yearRange" ).split( ":" );
+				thisYear = new Date().getFullYear();
+				determineYear = function( value ) {
+					var year = ( value.match( /c[+\-].*/ ) ? drawYear + parseInt( value.substring( 1 ), 10 ) :
+						( value.match( /[+\-].*/ ) ? thisYear + parseInt( value, 10 ) :
+						parseInt( value, 10 ) ) );
+					return ( isNaN( year ) ? thisYear : year );
+				};
+				year = determineYear( years[ 0 ] );
+				endYear = Math.max( year, determineYear( years[ 1 ] || "" ) );
+				year = ( minDate ? Math.max( year, minDate.getFullYear() ) : year );
+				endYear = ( maxDate ? Math.min( endYear, maxDate.getFullYear() ) : endYear );
+				inst.yearshtml += "<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";
+				for ( ; year <= endYear; year++ ) {
+					inst.yearshtml += "<option value='" + year + "'" +
+						( year === drawYear ? " selected='selected'" : "" ) +
+						">" + year + "</option>";
+				}
+				inst.yearshtml += "</select>";
+
+				html += inst.yearshtml;
+				inst.yearshtml = null;
+			}
+		}
+
+		html += this._get( inst, "yearSuffix" );
+		if ( showMonthAfterYear ) {
+			html += ( secondary || !( changeMonth && changeYear ) ? "&#xa0;" : "" ) + monthHtml;
+		}
+		html += "</div>"; // Close datepicker_header
+		return html;
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustInstDate: function( inst, offset, period ) {
+		var year = inst.selectedYear + ( period === "Y" ? offset : 0 ),
+			month = inst.selectedMonth + ( period === "M" ? offset : 0 ),
+			day = Math.min( inst.selectedDay, this._getDaysInMonth( year, month ) ) + ( period === "D" ? offset : 0 ),
+			date = this._restrictMinMax( inst, this._daylightSavingAdjust( new Date( year, month, day ) ) );
+
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		if ( period === "M" || period === "Y" ) {
+			this._notifyChange( inst );
+		}
+	},
+
+	/* Ensure a date is within any min/max bounds. */
+	_restrictMinMax: function( inst, date ) {
+		var minDate = this._getMinMaxDate( inst, "min" ),
+			maxDate = this._getMinMaxDate( inst, "max" ),
+			newDate = ( minDate && date < minDate ? minDate : date );
+		return ( maxDate && newDate > maxDate ? maxDate : newDate );
+	},
+
+	/* Notify change of month/year. */
+	_notifyChange: function( inst ) {
+		var onChange = this._get( inst, "onChangeMonthYear" );
+		if ( onChange ) {
+			onChange.apply( ( inst.input ? inst.input[ 0 ] : null ),
+				[ inst.selectedYear, inst.selectedMonth + 1, inst ] );
+		}
+	},
+
+	/* Determine the number of months to show. */
+	_getNumberOfMonths: function( inst ) {
+		var numMonths = this._get( inst, "numberOfMonths" );
+		return ( numMonths == null ? [ 1, 1 ] : ( typeof numMonths === "number" ? [ 1, numMonths ] : numMonths ) );
+	},
+
+	/* Determine the current maximum date - ensure no time components are set. */
+	_getMinMaxDate: function( inst, minMax ) {
+		return this._determineDate( inst, this._get( inst, minMax + "Date" ), null );
+	},
+
+	/* Find the number of days in a given month. */
+	_getDaysInMonth: function( year, month ) {
+		return 32 - this._daylightSavingAdjust( new Date( year, month, 32 ) ).getDate();
+	},
+
+	/* Find the day of the week of the first of a month. */
+	_getFirstDayOfMonth: function( year, month ) {
+		return new Date( year, month, 1 ).getDay();
+	},
+
+	/* Determines if we should allow a "next/prev" month display change. */
+	_canAdjustMonth: function( inst, offset, curYear, curMonth ) {
+		var numMonths = this._getNumberOfMonths( inst ),
+			date = this._daylightSavingAdjust( new Date( curYear,
+			curMonth + ( offset < 0 ? offset : numMonths[ 0 ] * numMonths[ 1 ] ), 1 ) );
+
+		if ( offset < 0 ) {
+			date.setDate( this._getDaysInMonth( date.getFullYear(), date.getMonth() ) );
+		}
+		return this._isInRange( inst, date );
+	},
+
+	/* Is the given date in the accepted range? */
+	_isInRange: function( inst, date ) {
+		var yearSplit, currentYear,
+			minDate = this._getMinMaxDate( inst, "min" ),
+			maxDate = this._getMinMaxDate( inst, "max" ),
+			minYear = null,
+			maxYear = null,
+			years = this._get( inst, "yearRange" );
+			if ( years ) {
+				yearSplit = years.split( ":" );
+				currentYear = new Date().getFullYear();
+				minYear = parseInt( yearSplit[ 0 ], 10 );
+				maxYear = parseInt( yearSplit[ 1 ], 10 );
+				if ( yearSplit[ 0 ].match( /[+\-].*/ ) ) {
+					minYear += currentYear;
+				}
+				if ( yearSplit[ 1 ].match( /[+\-].*/ ) ) {
+					maxYear += currentYear;
+				}
+			}
+
+		return ( ( !minDate || date.getTime() >= minDate.getTime() ) &&
+			( !maxDate || date.getTime() <= maxDate.getTime() ) &&
+			( !minYear || date.getFullYear() >= minYear ) &&
+			( !maxYear || date.getFullYear() <= maxYear ) );
+	},
+
+	/* Provide the configuration settings for formatting/parsing. */
+	_getFormatConfig: function( inst ) {
+		var shortYearCutoff = this._get( inst, "shortYearCutoff" );
+		shortYearCutoff = ( typeof shortYearCutoff !== "string" ? shortYearCutoff :
+			new Date().getFullYear() % 100 + parseInt( shortYearCutoff, 10 ) );
+		return { shortYearCutoff: shortYearCutoff,
+			dayNamesShort: this._get( inst, "dayNamesShort" ), dayNames: this._get( inst, "dayNames" ),
+			monthNamesShort: this._get( inst, "monthNamesShort" ), monthNames: this._get( inst, "monthNames" ) };
+	},
+
+	/* Format the given date for display. */
+	_formatDate: function( inst, day, month, year ) {
+		if ( !day ) {
+			inst.currentDay = inst.selectedDay;
+			inst.currentMonth = inst.selectedMonth;
+			inst.currentYear = inst.selectedYear;
+		}
+		var date = ( day ? ( typeof day === "object" ? day :
+			this._daylightSavingAdjust( new Date( year, month, day ) ) ) :
+			this._daylightSavingAdjust( new Date( inst.currentYear, inst.currentMonth, inst.currentDay ) ) );
+		return this.formatDate( this._get( inst, "dateFormat" ), date, this._getFormatConfig( inst ) );
+	}
+} );
+
+/*
+ * Bind hover events for datepicker elements.
+ * Done via delegate so the binding only occurs once in the lifetime of the parent div.
+ * Global datepicker_instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
+ */
+function datepicker_bindHover( dpDiv ) {
+	var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
+	return dpDiv.on( "mouseout", selector, function() {
+			$( this ).removeClass( "ui-state-hover" );
+			if ( this.className.indexOf( "ui-datepicker-prev" ) !== -1 ) {
+				$( this ).removeClass( "ui-datepicker-prev-hover" );
+			}
+			if ( this.className.indexOf( "ui-datepicker-next" ) !== -1 ) {
+				$( this ).removeClass( "ui-datepicker-next-hover" );
+			}
+		} )
+		.on( "mouseover", selector, datepicker_handleMouseover );
+}
+
+function datepicker_handleMouseover() {
+	if ( !$.datepicker._isDisabledDatepicker( datepicker_instActive.inline ? datepicker_instActive.dpDiv.parent()[ 0 ] : datepicker_instActive.input[ 0 ] ) ) {
+		$( this ).parents( ".ui-datepicker-calendar" ).find( "a" ).removeClass( "ui-state-hover" );
+		$( this ).addClass( "ui-state-hover" );
+		if ( this.className.indexOf( "ui-datepicker-prev" ) !== -1 ) {
+			$( this ).addClass( "ui-datepicker-prev-hover" );
+		}
+		if ( this.className.indexOf( "ui-datepicker-next" ) !== -1 ) {
+			$( this ).addClass( "ui-datepicker-next-hover" );
+		}
+	}
+}
+
+/* jQuery extend now ignores nulls! */
+function datepicker_extendRemove( target, props ) {
+	$.extend( target, props );
+	for ( var name in props ) {
+		if ( props[ name ] == null ) {
+			target[ name ] = props[ name ];
+		}
+	}
+	return target;
+}
+
+/* Invoke the datepicker functionality.
+   @param  options  string - a command, optionally followed by additional parameters or
+					Object - settings for attaching new datepicker functionality
+   @return  jQuery object */
+$.fn.datepicker = function( options ) {
+
+	/* Verify an empty collection wasn't passed - Fixes #6976 */
+	if ( !this.length ) {
+		return this;
+	}
+
+	/* Initialise the date picker. */
+	if ( !$.datepicker.initialized ) {
+		$( document ).on( "mousedown", $.datepicker._checkExternalClick );
+		$.datepicker.initialized = true;
+	}
+
+	/* Append datepicker main container to body if not exist. */
+	if ( $( "#" + $.datepicker._mainDivId ).length === 0 ) {
+		$( "body" ).append( $.datepicker.dpDiv );
+	}
+
+	var otherArgs = Array.prototype.slice.call( arguments, 1 );
+	if ( typeof options === "string" && ( options === "isDisabled" || options === "getDate" || options === "widget" ) ) {
+		return $.datepicker[ "_" + options + "Datepicker" ].
+			apply( $.datepicker, [ this[ 0 ] ].concat( otherArgs ) );
+	}
+	if ( options === "option" && arguments.length === 2 && typeof arguments[ 1 ] === "string" ) {
+		return $.datepicker[ "_" + options + "Datepicker" ].
+			apply( $.datepicker, [ this[ 0 ] ].concat( otherArgs ) );
+	}
+	return this.each( function() {
+		typeof options === "string" ?
+			$.datepicker[ "_" + options + "Datepicker" ].
+				apply( $.datepicker, [ this ].concat( otherArgs ) ) :
+			$.datepicker._attachDatepicker( this, options );
+	} );
+};
+
+$.datepicker = new Datepicker(); // singleton instance
+$.datepicker.initialized = false;
+$.datepicker.uuid = new Date().getTime();
+$.datepicker.version = "1.12.1";
+
+var widgetsDatepicker = $.datepicker;
+
+
+/*!
+ * jQuery UI Dialog 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Dialog
+//>>group: Widgets
+//>>description: Displays customizable dialog windows.
+//>>docs: http://api.jqueryui.com/dialog/
+//>>demos: http://jqueryui.com/dialog/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/dialog.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+$.widget( "ui.dialog", {
+	version: "1.12.1",
 	options: {
 		appendTo: "body",
 		autoOpen: true,
 		buttons: [],
+		classes: {
+			"ui-dialog": "ui-corner-all",
+			"ui-dialog-titlebar": "ui-corner-all"
+		},
 		closeOnEscape: true,
 		closeText: "Close",
-		dialogClass: "",
 		draggable: true,
 		hide: null,
 		height: "auto",
@@ -8124,6 +11724,7 @@ var dialog = $.widget( "ui.dialog", {
 			at: "center",
 			of: window,
 			collision: "fit",
+
 			// Ensure the titlebar is always visible
 			using: function( pos ) {
 				var topOffset = $( this ).css( pos ).offset().top;
@@ -8137,7 +11738,7 @@ var dialog = $.widget( "ui.dialog", {
 		title: null,
 		width: 300,
 
-		// callbacks
+		// Callbacks
 		beforeClose: null,
 		close: null,
 		drag: null,
@@ -8180,16 +11781,24 @@ var dialog = $.widget( "ui.dialog", {
 			index: this.element.parent().children().index( this.element )
 		};
 		this.originalTitle = this.element.attr( "title" );
-		this.options.title = this.options.title || this.originalTitle;
+		if ( this.options.title == null && this.originalTitle != null ) {
+			this.options.title = this.originalTitle;
+		}
+
+		// Dialogs can't be disabled
+		if ( this.options.disabled ) {
+			this.options.disabled = false;
+		}
 
 		this._createWrapper();
 
 		this.element
 			.show()
 			.removeAttr( "title" )
-			.addClass( "ui-dialog-content ui-widget-content" )
 			.appendTo( this.uiDialog );
 
+		this._addClass( "ui-dialog-content", "ui-widget-content" );
+
 		this._createTitlebar();
 		this._createButtonPane();
 
@@ -8213,7 +11822,7 @@ var dialog = $.widget( "ui.dialog", {
 
 	_appendTo: function() {
 		var element = this.options.appendTo;
-		if ( element && (element.jquery || element.nodeType) ) {
+		if ( element && ( element.jquery || element.nodeType ) ) {
 			return $( element );
 		}
 		return this.document.find( element || "body" ).eq( 0 );
@@ -8228,18 +11837,19 @@ var dialog = $.widget( "ui.dialog", {
 
 		this.element
 			.removeUniqueId()
-			.removeClass( "ui-dialog-content ui-widget-content" )
 			.css( this.originalCss )
+
 			// Without detaching first, the following becomes really slow
 			.detach();
 
-		this.uiDialog.stop( true, true ).remove();
+		this.uiDialog.remove();
 
 		if ( this.originalTitle ) {
 			this.element.attr( "title", this.originalTitle );
 		}
 
 		next = originalPosition.parent.children().eq( originalPosition.index );
+
 		// Don't try to place the dialog next to itself (#8613)
 		if ( next.length && next[ 0 ] !== this.element[ 0 ] ) {
 			next.before( this.element );
@@ -8256,8 +11866,7 @@ var dialog = $.widget( "ui.dialog", {
 	enable: $.noop,
 
 	close: function( event ) {
-		var activeElement,
-			that = this;
+		var that = this;
 
 		if ( !this._isOpen || this._trigger( "beforeClose", event ) === false ) {
 			return;
@@ -8268,28 +11877,17 @@ var dialog = $.widget( "ui.dialog", {
 		this._destroyOverlay();
 		this._untrackInstance();
 
-		if ( !this.opener.filter( ":focusable" ).focus().length ) {
+		if ( !this.opener.filter( ":focusable" ).trigger( "focus" ).length ) {
 
-			// support: IE9
-			// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
-			try {
-				activeElement = this.document[ 0 ].activeElement;
-
-				// Support: IE9, IE10
-				// If the <body> is blurred, IE will switch windows, see #4520
-				if ( activeElement && activeElement.nodeName.toLowerCase() !== "body" ) {
-
-					// Hiding a focused element doesn't trigger blur in WebKit
-					// so in case we have nothing to focus on, explicitly blur the active element
-					// https://bugs.webkit.org/show_bug.cgi?id=47182
-					$( activeElement ).blur();
-				}
-			} catch ( error ) {}
+			// Hiding a focused element doesn't trigger blur in WebKit
+			// so in case we have nothing to focus on, explicitly blur the active element
+			// https://bugs.webkit.org/show_bug.cgi?id=47182
+			$.ui.safeBlur( $.ui.safeActiveElement( this.document[ 0 ] ) );
 		}
 
 		this._hide( this.uiDialog, this.options.hide, function() {
 			that._trigger( "close", event );
-		});
+		} );
 	},
 
 	isOpen: function() {
@@ -8302,9 +11900,9 @@ var dialog = $.widget( "ui.dialog", {
 
 	_moveToTop: function( event, silent ) {
 		var moved = false,
-			zIndices = this.uiDialog.siblings( ".ui-front:visible" ).map(function() {
+			zIndices = this.uiDialog.siblings( ".ui-front:visible" ).map( function() {
 				return +$( this ).css( "z-index" );
-			}).get(),
+			} ).get(),
 			zIndexMax = Math.max.apply( null, zIndices );
 
 		if ( zIndexMax >= +this.uiDialog.css( "z-index" ) ) {
@@ -8328,7 +11926,7 @@ var dialog = $.widget( "ui.dialog", {
 		}
 
 		this._isOpen = true;
-		this.opener = $( this.document[ 0 ].activeElement );
+		this.opener = $( $.ui.safeActiveElement( this.document[ 0 ] ) );
 
 		this._size();
 		this._position();
@@ -8345,7 +11943,7 @@ var dialog = $.widget( "ui.dialog", {
 		this._show( this.uiDialog, this.options.show, function() {
 			that._focusTabbable();
 			that._trigger( "focus" );
-		});
+		} );
 
 		// Track the dialog immediately upon openening in case a focus event
 		// somehow occurs outside of the dialog before an element inside the
@@ -8356,6 +11954,7 @@ var dialog = $.widget( "ui.dialog", {
 	},
 
 	_focusTabbable: function() {
+
 		// Set focus to the first match:
 		// 1. An element that was focused previously
 		// 2. First element inside the dialog matching [autofocus]
@@ -8379,20 +11978,21 @@ var dialog = $.widget( "ui.dialog", {
 		if ( !hasFocus.length ) {
 			hasFocus = this.uiDialog;
 		}
-		hasFocus.eq( 0 ).focus();
+		hasFocus.eq( 0 ).trigger( "focus" );
 	},
 
 	_keepFocus: function( event ) {
 		function checkFocus() {
-			var activeElement = this.document[0].activeElement,
-				isActive = this.uiDialog[0] === activeElement ||
-					$.contains( this.uiDialog[0], activeElement );
+			var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
+				isActive = this.uiDialog[ 0 ] === activeElement ||
+					$.contains( this.uiDialog[ 0 ], activeElement );
 			if ( !isActive ) {
 				this._focusTabbable();
 			}
 		}
 		event.preventDefault();
 		checkFocus.call( this );
+
 		// support: IE
 		// IE <= 8 doesn't prevent moving focus even with event.preventDefault()
 		// so we check again later
@@ -8400,17 +12000,17 @@ var dialog = $.widget( "ui.dialog", {
 	},
 
 	_createWrapper: function() {
-		this.uiDialog = $("<div>")
-			.addClass( "ui-dialog ui-widget ui-widget-content ui-corner-all ui-front " +
-				this.options.dialogClass )
+		this.uiDialog = $( "<div>" )
 			.hide()
-			.attr({
+			.attr( {
+
 				// Setting tabIndex makes the div focusable
 				tabIndex: -1,
 				role: "dialog"
-			})
+			} )
 			.appendTo( this._appendTo() );
 
+		this._addClass( this.uiDialog, "ui-dialog", "ui-widget ui-widget-content ui-front" );
 		this._on( this.uiDialog, {
 			keydown: function( event ) {
 				if ( this.options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
@@ -8420,7 +12020,7 @@ var dialog = $.widget( "ui.dialog", {
 					return;
 				}
 
-				// prevent tabbing out of dialogs
+				// Prevent tabbing out of dialogs
 				if ( event.keyCode !== $.ui.keyCode.TAB || event.isDefaultPrevented() ) {
 					return;
 				}
@@ -8428,15 +12028,17 @@ var dialog = $.widget( "ui.dialog", {
 					first = tabbables.filter( ":first" ),
 					last = tabbables.filter( ":last" );
 
-				if ( ( event.target === last[0] || event.target === this.uiDialog[0] ) && !event.shiftKey ) {
-					this._delay(function() {
-						first.focus();
-					});
+				if ( ( event.target === last[ 0 ] || event.target === this.uiDialog[ 0 ] ) &&
+						!event.shiftKey ) {
+					this._delay( function() {
+						first.trigger( "focus" );
+					} );
 					event.preventDefault();
-				} else if ( ( event.target === first[0] || event.target === this.uiDialog[0] ) && event.shiftKey ) {
-					this._delay(function() {
-						last.focus();
-					});
+				} else if ( ( event.target === first[ 0 ] ||
+						event.target === this.uiDialog[ 0 ] ) && event.shiftKey ) {
+					this._delay( function() {
+						last.trigger( "focus" );
+					} );
 					event.preventDefault();
 				}
 			},
@@ -8445,81 +12047,84 @@ var dialog = $.widget( "ui.dialog", {
 					this._focusTabbable();
 				}
 			}
-		});
+		} );
 
 		// We assume that any existing aria-describedby attribute means
 		// that the dialog content is marked up properly
 		// otherwise we brute force the content as the description
 		if ( !this.element.find( "[aria-describedby]" ).length ) {
-			this.uiDialog.attr({
+			this.uiDialog.attr( {
 				"aria-describedby": this.element.uniqueId().attr( "id" )
-			});
+			} );
 		}
 	},
 
 	_createTitlebar: function() {
 		var uiDialogTitle;
 
-		this.uiDialogTitlebar = $( "<div>" )
-			.addClass( "ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix" )
-			.prependTo( this.uiDialog );
+		this.uiDialogTitlebar = $( "<div>" );
+		this._addClass( this.uiDialogTitlebar,
+			"ui-dialog-titlebar", "ui-widget-header ui-helper-clearfix" );
 		this._on( this.uiDialogTitlebar, {
 			mousedown: function( event ) {
+
 				// Don't prevent click on close button (#8838)
 				// Focusing a dialog that is partially scrolled out of view
 				// causes the browser to scroll it into view, preventing the click event
 				if ( !$( event.target ).closest( ".ui-dialog-titlebar-close" ) ) {
+
 					// Dialog isn't getting focus when dragging (#8063)
-					this.uiDialog.focus();
+					this.uiDialog.trigger( "focus" );
 				}
 			}
-		});
+		} );
 
-		// support: IE
+		// Support: IE
 		// Use type="button" to prevent enter keypresses in textboxes from closing the
 		// dialog in IE (#9312)
 		this.uiDialogTitlebarClose = $( "<button type='button'></button>" )
-			.button({
-				label: this.options.closeText,
-				icons: {
-					primary: "ui-icon-closethick"
-				},
-				text: false
-			})
-			.addClass( "ui-dialog-titlebar-close" )
+			.button( {
+				label: $( "<a>" ).text( this.options.closeText ).html(),
+				icon: "ui-icon-closethick",
+				showLabel: false
+			} )
 			.appendTo( this.uiDialogTitlebar );
+
+		this._addClass( this.uiDialogTitlebarClose, "ui-dialog-titlebar-close" );
 		this._on( this.uiDialogTitlebarClose, {
 			click: function( event ) {
 				event.preventDefault();
 				this.close( event );
 			}
-		});
+		} );
 
-		uiDialogTitle = $( "<span>" )
-			.uniqueId()
-			.addClass( "ui-dialog-title" )
-			.prependTo( this.uiDialogTitlebar );
+		uiDialogTitle = $( "<span>" ).uniqueId().prependTo( this.uiDialogTitlebar );
+		this._addClass( uiDialogTitle, "ui-dialog-title" );
 		this._title( uiDialogTitle );
 
-		this.uiDialog.attr({
+		this.uiDialogTitlebar.prependTo( this.uiDialog );
+
+		this.uiDialog.attr( {
 			"aria-labelledby": uiDialogTitle.attr( "id" )
-		});
+		} );
 	},
 
 	_title: function( title ) {
-		if ( !this.options.title ) {
+		if ( this.options.title ) {
+			title.text( this.options.title );
+		} else {
 			title.html( "&#160;" );
 		}
-		title.text( this.options.title );
 	},
 
 	_createButtonPane: function() {
-		this.uiDialogButtonPane = $( "<div>" )
-			.addClass( "ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" );
+		this.uiDialogButtonPane = $( "<div>" );
+		this._addClass( this.uiDialogButtonPane, "ui-dialog-buttonpane",
+			"ui-widget-content ui-helper-clearfix" );
 
 		this.uiButtonSet = $( "<div>" )
-			.addClass( "ui-dialog-buttonset" )
 			.appendTo( this.uiDialogButtonPane );
+		this._addClass( this.uiButtonSet, "ui-dialog-buttonset" );
 
 		this._createButtons();
 	},
@@ -8528,12 +12133,12 @@ var dialog = $.widget( "ui.dialog", {
 		var that = this,
 			buttons = this.options.buttons;
 
-		// if we already have a button pane, remove it
+		// If we already have a button pane, remove it
 		this.uiDialogButtonPane.remove();
 		this.uiButtonSet.empty();
 
-		if ( $.isEmptyObject( buttons ) || ($.isArray( buttons ) && !buttons.length) ) {
-			this.uiDialog.removeClass( "ui-dialog-buttons" );
+		if ( $.isEmptyObject( buttons ) || ( $.isArray( buttons ) && !buttons.length ) ) {
+			this._removeClass( this.uiDialog, "ui-dialog-buttons" );
 			return;
 		}
 
@@ -8542,24 +12147,41 @@ var dialog = $.widget( "ui.dialog", {
 			props = $.isFunction( props ) ?
 				{ click: props, text: name } :
 				props;
+
 			// Default to a non-submitting button
 			props = $.extend( { type: "button" }, props );
+
 			// Change the context for the click callback to be the main element
 			click = props.click;
-			props.click = function() {
-				click.apply( that.element[ 0 ], arguments );
-			};
 			buttonOptions = {
+				icon: props.icon,
+				iconPosition: props.iconPosition,
+				showLabel: props.showLabel,
+
+				// Deprecated options
 				icons: props.icons,
-				text: props.showText
+				text: props.text
 			};
+
+			delete props.click;
+			delete props.icon;
+			delete props.iconPosition;
+			delete props.showLabel;
+
+			// Deprecated options
 			delete props.icons;
-			delete props.showText;
+			if ( typeof props.text === "boolean" ) {
+				delete props.text;
+			}
+
 			$( "<button></button>", props )
 				.button( buttonOptions )
-				.appendTo( that.uiButtonSet );
-		});
-		this.uiDialog.addClass( "ui-dialog-buttons" );
+				.appendTo( that.uiButtonSet )
+				.on( "click", function() {
+					click.apply( that.element[ 0 ], arguments );
+				} );
+		} );
+		this._addClass( this.uiDialog, "ui-dialog-buttons" );
 		this.uiDialogButtonPane.appendTo( this.uiDialog );
 	},
 
@@ -8574,12 +12196,12 @@ var dialog = $.widget( "ui.dialog", {
 			};
 		}
 
-		this.uiDialog.draggable({
+		this.uiDialog.draggable( {
 			cancel: ".ui-dialog-content, .ui-dialog-titlebar-close",
 			handle: ".ui-dialog-titlebar",
 			containment: "document",
 			start: function( event, ui ) {
-				$( this ).addClass( "ui-dialog-dragging" );
+				that._addClass( $( this ), "ui-dialog-dragging" );
 				that._blockFrames();
 				that._trigger( "dragStart", event, filteredUi( ui ) );
 			},
@@ -8592,26 +12214,27 @@ var dialog = $.widget( "ui.dialog", {
 
 				options.position = {
 					my: "left top",
-					at: "left" + (left >= 0 ? "+" : "") + left + " " +
-						"top" + (top >= 0 ? "+" : "") + top,
+					at: "left" + ( left >= 0 ? "+" : "" ) + left + " " +
+						"top" + ( top >= 0 ? "+" : "" ) + top,
 					of: that.window
 				};
-				$( this ).removeClass( "ui-dialog-dragging" );
+				that._removeClass( $( this ), "ui-dialog-dragging" );
 				that._unblockFrames();
 				that._trigger( "dragStop", event, filteredUi( ui ) );
 			}
-		});
+		} );
 	},
 
 	_makeResizable: function() {
 		var that = this,
 			options = this.options,
 			handles = options.resizable,
+
 			// .ui-resizable has position: relative defined in the stylesheet
 			// but dialogs have to use absolute or fixed positioning
-			position = this.uiDialog.css("position"),
+			position = this.uiDialog.css( "position" ),
 			resizeHandles = typeof handles === "string" ?
-				handles	:
+				handles :
 				"n,e,s,w,se,sw,ne,nw";
 
 		function filteredUi( ui ) {
@@ -8623,7 +12246,7 @@ var dialog = $.widget( "ui.dialog", {
 			};
 		}
 
-		this.uiDialog.resizable({
+		this.uiDialog.resizable( {
 			cancel: ".ui-dialog-content",
 			containment: "document",
 			alsoResize: this.element,
@@ -8633,7 +12256,7 @@ var dialog = $.widget( "ui.dialog", {
 			minHeight: this._minHeight(),
 			handles: resizeHandles,
 			start: function( event, ui ) {
-				$( this ).addClass( "ui-dialog-resizing" );
+				that._addClass( $( this ), "ui-dialog-resizing" );
 				that._blockFrames();
 				that._trigger( "resizeStart", event, filteredUi( ui ) );
 			},
@@ -8649,16 +12272,16 @@ var dialog = $.widget( "ui.dialog", {
 				options.width = that.uiDialog.width();
 				options.position = {
 					my: "left top",
-					at: "left" + (left >= 0 ? "+" : "") + left + " " +
-						"top" + (top >= 0 ? "+" : "") + top,
+					at: "left" + ( left >= 0 ? "+" : "" ) + left + " " +
+						"top" + ( top >= 0 ? "+" : "" ) + top,
 					of: that.window
 				};
-				$( this ).removeClass( "ui-dialog-resizing" );
+				that._removeClass( $( this ), "ui-dialog-resizing" );
 				that._unblockFrames();
 				that._trigger( "resizeStop", event, filteredUi( ui ) );
 			}
-		})
-		.css( "position", position );
+		} )
+			.css( "position", position );
 	},
 
 	_trackFocus: function() {
@@ -8667,7 +12290,7 @@ var dialog = $.widget( "ui.dialog", {
 				this._makeFocusTarget();
 				this._focusedElement = $( event.target );
 			}
-		});
+		} );
 	},
 
 	_makeFocusTarget: function() {
@@ -8701,6 +12324,7 @@ var dialog = $.widget( "ui.dialog", {
 	},
 
 	_position: function() {
+
 		// Need to show the dialog to get the actual offset in the position plugin
 		var isVisible = this.uiDialog.is( ":visible" );
 		if ( !isVisible ) {
@@ -8726,7 +12350,7 @@ var dialog = $.widget( "ui.dialog", {
 			if ( key in that.resizableRelatedOptions ) {
 				resizableOptions[ key ] = value;
 			}
-		});
+		} );
 
 		if ( resize ) {
 			this._size();
@@ -8741,12 +12365,6 @@ var dialog = $.widget( "ui.dialog", {
 		var isDraggable, isResizable,
 			uiDialog = this.uiDialog;
 
-		if ( key === "dialogClass" ) {
-			uiDialog
-				.removeClass( this.options.dialogClass )
-				.addClass( value );
-		}
-
 		if ( key === "disabled" ) {
 			return;
 		}
@@ -8762,10 +12380,11 @@ var dialog = $.widget( "ui.dialog", {
 		}
 
 		if ( key === "closeText" ) {
-			this.uiDialogTitlebarClose.button({
+			this.uiDialogTitlebarClose.button( {
+
 				// Ensure that we always pass a string
-				label: "" + value
-			});
+				label: $( "<a>" ).text( "" + this.options.closeText ).html()
+			} );
 		}
 
 		if ( key === "draggable" ) {
@@ -8784,18 +12403,19 @@ var dialog = $.widget( "ui.dialog", {
 		}
 
 		if ( key === "resizable" ) {
+
 			// currently resizable, becoming non-resizable
 			isResizable = uiDialog.is( ":data(ui-resizable)" );
 			if ( isResizable && !value ) {
 				uiDialog.resizable( "destroy" );
 			}
 
-			// currently resizable, changing handles
+			// Currently resizable, changing handles
 			if ( isResizable && typeof value === "string" ) {
 				uiDialog.resizable( "option", "handles", value );
 			}
 
-			// currently non-resizable, becoming resizable
+			// Currently non-resizable, becoming resizable
 			if ( !isResizable && value !== false ) {
 				this._makeResizable();
 			}
@@ -8807,29 +12427,30 @@ var dialog = $.widget( "ui.dialog", {
 	},
 
 	_size: function() {
+
 		// If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
 		// divs will both have width and height set, so we need to reset them
 		var nonContentHeight, minContentHeight, maxContentHeight,
 			options = this.options;
 
 		// Reset content sizing
-		this.element.show().css({
+		this.element.show().css( {
 			width: "auto",
 			minHeight: 0,
 			maxHeight: "none",
 			height: 0
-		});
+		} );
 
 		if ( options.minWidth > options.width ) {
 			options.width = options.minWidth;
 		}
 
-		// reset wrapper sizing
+		// Reset wrapper sizing
 		// determine the height of all the non-content elements
-		nonContentHeight = this.uiDialog.css({
-				height: "auto",
-				width: options.width
-			})
+		nonContentHeight = this.uiDialog.css( {
+			height: "auto",
+			width: options.width
+		} )
 			.outerHeight();
 		minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
 		maxContentHeight = typeof options.maxHeight === "number" ?
@@ -8837,11 +12458,11 @@ var dialog = $.widget( "ui.dialog", {
 			"none";
 
 		if ( options.height === "auto" ) {
-			this.element.css({
+			this.element.css( {
 				minHeight: minContentHeight,
 				maxHeight: maxContentHeight,
 				height: "auto"
-			});
+			} );
 		} else {
 			this.element.height( Math.max( 0, options.height - nonContentHeight ) );
 		}
@@ -8852,18 +12473,18 @@ var dialog = $.widget( "ui.dialog", {
 	},
 
 	_blockFrames: function() {
-		this.iframeBlocks = this.document.find( "iframe" ).map(function() {
+		this.iframeBlocks = this.document.find( "iframe" ).map( function() {
 			var iframe = $( this );
 
 			return $( "<div>" )
-				.css({
+				.css( {
 					position: "absolute",
 					width: iframe.outerWidth(),
 					height: iframe.outerHeight()
-				})
+				} )
 				.appendTo( iframe.parent() )
-				.offset( iframe.offset() )[0];
-		});
+				.offset( iframe.offset() )[ 0 ];
+		} );
 	},
 
 	_unblockFrames: function() {
@@ -8891,9 +12512,9 @@ var dialog = $.widget( "ui.dialog", {
 		// We use a delay in case the overlay is created from an
 		// event that we're going to be cancelling (#2804)
 		var isOpening = true;
-		this._delay(function() {
+		this._delay( function() {
 			isOpening = false;
-		});
+		} );
 
 		if ( !this.document.data( "ui-dialog-overlays" ) ) {
 
@@ -8911,17 +12532,18 @@ var dialog = $.widget( "ui.dialog", {
 						this._trackingInstances()[ 0 ]._focusTabbable();
 					}
 				}
-			});
+			} );
 		}
 
 		this.overlay = $( "<div>" )
-			.addClass( "ui-widget-overlay ui-front" )
 			.appendTo( this._appendTo() );
+
+		this._addClass( this.overlay, null, "ui-widget-overlay ui-front" );
 		this._on( this.overlay, {
 			mousedown: "_keepFocus"
-		});
+		} );
 		this.document.data( "ui-dialog-overlays",
-			(this.document.data( "ui-dialog-overlays" ) || 0) + 1 );
+			( this.document.data( "ui-dialog-overlays" ) || 0 ) + 1 );
 	},
 
 	_destroyOverlay: function() {
@@ -8933,9 +12555,8 @@ var dialog = $.widget( "ui.dialog", {
 			var overlays = this.document.data( "ui-dialog-overlays" ) - 1;
 
 			if ( !overlays ) {
-				this.document
-					.unbind( "focusin" )
-					.removeData( "ui-dialog-overlays" );
+				this._off( this.document, "focusin" );
+				this.document.removeData( "ui-dialog-overlays" );
 			} else {
 				this.document.data( "ui-dialog-overlays", overlays );
 			}
@@ -8944,419 +12565,3590 @@ var dialog = $.widget( "ui.dialog", {
 			this.overlay = null;
 		}
 	}
-});
+} );
+
+// DEPRECATED
+// TODO: switch return back to widget declaration at top of file when this is removed
+if ( $.uiBackCompat !== false ) {
+
+	// Backcompat for dialogClass option
+	$.widget( "ui.dialog", $.ui.dialog, {
+		options: {
+			dialogClass: ""
+		},
+		_createWrapper: function() {
+			this._super();
+			this.uiDialog.addClass( this.options.dialogClass );
+		},
+		_setOption: function( key, value ) {
+			if ( key === "dialogClass" ) {
+				this.uiDialog
+					.removeClass( this.options.dialogClass )
+					.addClass( value );
+			}
+			this._superApply( arguments );
+		}
+	} );
+}
+
+var widgetsDialog = $.ui.dialog;
 
 
 /*!
- * jQuery UI Droppable 1.11.4
+ * jQuery UI Progressbar 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/droppable/
  */
 
+//>>label: Progressbar
+//>>group: Widgets
+// jscs:disable maximumLineLength
+//>>description: Displays a status indicator for loading state, standard percentage, and other progress indicators.
+// jscs:enable maximumLineLength
+//>>docs: http://api.jqueryui.com/progressbar/
+//>>demos: http://jqueryui.com/progressbar/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/progressbar.css
+//>>css.theme: ../../themes/base/theme.css
 
-$.widget( "ui.droppable", {
-	version: "1.11.4",
-	widgetEventPrefix: "drop",
+
+
+var widgetsProgressbar = $.widget( "ui.progressbar", {
+	version: "1.12.1",
 	options: {
-		accept: "*",
-		activeClass: false,
-		addClasses: true,
-		greedy: false,
-		hoverClass: false,
-		scope: "default",
-		tolerance: "intersect",
+		classes: {
+			"ui-progressbar": "ui-corner-all",
+			"ui-progressbar-value": "ui-corner-left",
+			"ui-progressbar-complete": "ui-corner-right"
+		},
+		max: 100,
+		value: 0,
 
-		// callbacks
-		activate: null,
-		deactivate: null,
-		drop: null,
-		out: null,
-		over: null
+		change: null,
+		complete: null
 	},
+
+	min: 0,
+
 	_create: function() {
 
-		var proportions,
-			o = this.options,
-			accept = o.accept;
+		// Constrain initial value
+		this.oldValue = this.options.value = this._constrainedValue();
 
-		this.isover = false;
-		this.isout = true;
+		this.element.attr( {
 
-		this.accept = $.isFunction( accept ) ? accept : function( d ) {
-			return d.is( accept );
-		};
+			// Only set static values; aria-valuenow and aria-valuemax are
+			// set inside _refreshValue()
+			role: "progressbar",
+			"aria-valuemin": this.min
+		} );
+		this._addClass( "ui-progressbar", "ui-widget ui-widget-content" );
 
-		this.proportions = function( /* valueToWrite */ ) {
-			if ( arguments.length ) {
-				// Store the droppable's proportions
-				proportions = arguments[ 0 ];
-			} else {
-				// Retrieve or derive the droppable's proportions
-				return proportions ?
-					proportions :
-					proportions = {
-						width: this.element[ 0 ].offsetWidth,
-						height: this.element[ 0 ].offsetHeight
-					};
+		this.valueDiv = $( "<div>" ).appendTo( this.element );
+		this._addClass( this.valueDiv, "ui-progressbar-value", "ui-widget-header" );
+		this._refreshValue();
+	},
+
+	_destroy: function() {
+		this.element.removeAttr( "role aria-valuemin aria-valuemax aria-valuenow" );
+
+		this.valueDiv.remove();
+	},
+
+	value: function( newValue ) {
+		if ( newValue === undefined ) {
+			return this.options.value;
+		}
+
+		this.options.value = this._constrainedValue( newValue );
+		this._refreshValue();
+	},
+
+	_constrainedValue: function( newValue ) {
+		if ( newValue === undefined ) {
+			newValue = this.options.value;
+		}
+
+		this.indeterminate = newValue === false;
+
+		// Sanitize value
+		if ( typeof newValue !== "number" ) {
+			newValue = 0;
+		}
+
+		return this.indeterminate ? false :
+			Math.min( this.options.max, Math.max( this.min, newValue ) );
+	},
+
+	_setOptions: function( options ) {
+
+		// Ensure "value" option is set after other values (like max)
+		var value = options.value;
+		delete options.value;
+
+		this._super( options );
+
+		this.options.value = this._constrainedValue( value );
+		this._refreshValue();
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "max" ) {
+
+			// Don't allow a max less than min
+			value = Math.max( this.min, value );
+		}
+		this._super( key, value );
+	},
+
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this.element.attr( "aria-disabled", value );
+		this._toggleClass( null, "ui-state-disabled", !!value );
+	},
+
+	_percentage: function() {
+		return this.indeterminate ?
+			100 :
+			100 * ( this.options.value - this.min ) / ( this.options.max - this.min );
+	},
+
+	_refreshValue: function() {
+		var value = this.options.value,
+			percentage = this._percentage();
+
+		this.valueDiv
+			.toggle( this.indeterminate || value > this.min )
+			.width( percentage.toFixed( 0 ) + "%" );
+
+		this
+			._toggleClass( this.valueDiv, "ui-progressbar-complete", null,
+				value === this.options.max )
+			._toggleClass( "ui-progressbar-indeterminate", null, this.indeterminate );
+
+		if ( this.indeterminate ) {
+			this.element.removeAttr( "aria-valuenow" );
+			if ( !this.overlayDiv ) {
+				this.overlayDiv = $( "<div>" ).appendTo( this.valueDiv );
+				this._addClass( this.overlayDiv, "ui-progressbar-overlay" );
 			}
+		} else {
+			this.element.attr( {
+				"aria-valuemax": this.options.max,
+				"aria-valuenow": value
+			} );
+			if ( this.overlayDiv ) {
+				this.overlayDiv.remove();
+				this.overlayDiv = null;
+			}
+		}
+
+		if ( this.oldValue !== value ) {
+			this.oldValue = value;
+			this._trigger( "change" );
+		}
+		if ( value === this.options.max ) {
+			this._trigger( "complete" );
+		}
+	}
+} );
+
+
+/*!
+ * jQuery UI Selectmenu 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Selectmenu
+//>>group: Widgets
+// jscs:disable maximumLineLength
+//>>description: Duplicates and extends the functionality of a native HTML select element, allowing it to be customizable in behavior and appearance far beyond the limitations of a native select.
+// jscs:enable maximumLineLength
+//>>docs: http://api.jqueryui.com/selectmenu/
+//>>demos: http://jqueryui.com/selectmenu/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/selectmenu.css, ../../themes/base/button.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
+	version: "1.12.1",
+	defaultElement: "<select>",
+	options: {
+		appendTo: null,
+		classes: {
+			"ui-selectmenu-button-open": "ui-corner-top",
+			"ui-selectmenu-button-closed": "ui-corner-all"
+		},
+		disabled: null,
+		icons: {
+			button: "ui-icon-triangle-1-s"
+		},
+		position: {
+			my: "left top",
+			at: "left bottom",
+			collision: "none"
+		},
+		width: false,
+
+		// Callbacks
+		change: null,
+		close: null,
+		focus: null,
+		open: null,
+		select: null
+	},
+
+	_create: function() {
+		var selectmenuId = this.element.uniqueId().attr( "id" );
+		this.ids = {
+			element: selectmenuId,
+			button: selectmenuId + "-button",
+			menu: selectmenuId + "-menu"
 		};
 
-		this._addToManager( o.scope );
-
-		o.addClasses && this.element.addClass( "ui-droppable" );
+		this._drawButton();
+		this._drawMenu();
+		this._bindFormResetHandler();
 
+		this._rendered = false;
+		this.menuItems = $();
 	},
 
-	_addToManager: function( scope ) {
-		// Add the reference and positions to the manager
-		$.ui.ddmanager.droppables[ scope ] = $.ui.ddmanager.droppables[ scope ] || [];
-		$.ui.ddmanager.droppables[ scope ].push( this );
+	_drawButton: function() {
+		var icon,
+			that = this,
+			item = this._parseOption(
+				this.element.find( "option:selected" ),
+				this.element[ 0 ].selectedIndex
+			);
+
+		// Associate existing label with the new button
+		this.labels = this.element.labels().attr( "for", this.ids.button );
+		this._on( this.labels, {
+			click: function( event ) {
+				this.button.focus();
+				event.preventDefault();
+			}
+		} );
+
+		// Hide original select element
+		this.element.hide();
+
+		// Create button
+		this.button = $( "<span>", {
+			tabindex: this.options.disabled ? -1 : 0,
+			id: this.ids.button,
+			role: "combobox",
+			"aria-expanded": "false",
+			"aria-autocomplete": "list",
+			"aria-owns": this.ids.menu,
+			"aria-haspopup": "true",
+			title: this.element.attr( "title" )
+		} )
+			.insertAfter( this.element );
+
+		this._addClass( this.button, "ui-selectmenu-button ui-selectmenu-button-closed",
+			"ui-button ui-widget" );
+
+		icon = $( "<span>" ).appendTo( this.button );
+		this._addClass( icon, "ui-selectmenu-icon", "ui-icon " + this.options.icons.button );
+		this.buttonItem = this._renderButtonItem( item )
+			.appendTo( this.button );
+
+		if ( this.options.width !== false ) {
+			this._resizeButton();
+		}
+
+		this._on( this.button, this._buttonEvents );
+		this.button.one( "focusin", function() {
+
+			// Delay rendering the menu items until the button receives focus.
+			// The menu may have already been rendered via a programmatic open.
+			if ( !that._rendered ) {
+				that._refreshMenu();
+			}
+		} );
 	},
 
-	_splice: function( drop ) {
-		var i = 0;
-		for ( ; i < drop.length; i++ ) {
-			if ( drop[ i ] === this ) {
-				drop.splice( i, 1 );
+	_drawMenu: function() {
+		var that = this;
+
+		// Create menu
+		this.menu = $( "<ul>", {
+			"aria-hidden": "true",
+			"aria-labelledby": this.ids.button,
+			id: this.ids.menu
+		} );
+
+		// Wrap menu
+		this.menuWrap = $( "<div>" ).append( this.menu );
+		this._addClass( this.menuWrap, "ui-selectmenu-menu", "ui-front" );
+		this.menuWrap.appendTo( this._appendTo() );
+
+		// Initialize menu widget
+		this.menuInstance = this.menu
+			.menu( {
+				classes: {
+					"ui-menu": "ui-corner-bottom"
+				},
+				role: "listbox",
+				select: function( event, ui ) {
+					event.preventDefault();
+
+					// Support: IE8
+					// If the item was selected via a click, the text selection
+					// will be destroyed in IE
+					that._setSelection();
+
+					that._select( ui.item.data( "ui-selectmenu-item" ), event );
+				},
+				focus: function( event, ui ) {
+					var item = ui.item.data( "ui-selectmenu-item" );
+
+					// Prevent inital focus from firing and check if its a newly focused item
+					if ( that.focusIndex != null && item.index !== that.focusIndex ) {
+						that._trigger( "focus", event, { item: item } );
+						if ( !that.isOpen ) {
+							that._select( item, event );
+						}
+					}
+					that.focusIndex = item.index;
+
+					that.button.attr( "aria-activedescendant",
+						that.menuItems.eq( item.index ).attr( "id" ) );
+				}
+			} )
+			.menu( "instance" );
+
+		// Don't close the menu on mouseleave
+		this.menuInstance._off( this.menu, "mouseleave" );
+
+		// Cancel the menu's collapseAll on document click
+		this.menuInstance._closeOnDocumentClick = function() {
+			return false;
+		};
+
+		// Selects often contain empty items, but never contain dividers
+		this.menuInstance._isDivider = function() {
+			return false;
+		};
+	},
+
+	refresh: function() {
+		this._refreshMenu();
+		this.buttonItem.replaceWith(
+			this.buttonItem = this._renderButtonItem(
+
+				// Fall back to an empty object in case there are no options
+				this._getSelectedItem().data( "ui-selectmenu-item" ) || {}
+			)
+		);
+		if ( this.options.width === null ) {
+			this._resizeButton();
+		}
+	},
+
+	_refreshMenu: function() {
+		var item,
+			options = this.element.find( "option" );
+
+		this.menu.empty();
+
+		this._parseOptions( options );
+		this._renderMenu( this.menu, this.items );
+
+		this.menuInstance.refresh();
+		this.menuItems = this.menu.find( "li" )
+			.not( ".ui-selectmenu-optgroup" )
+				.find( ".ui-menu-item-wrapper" );
+
+		this._rendered = true;
+
+		if ( !options.length ) {
+			return;
+		}
+
+		item = this._getSelectedItem();
+
+		// Update the menu to have the correct item focused
+		this.menuInstance.focus( null, item );
+		this._setAria( item.data( "ui-selectmenu-item" ) );
+
+		// Set disabled state
+		this._setOption( "disabled", this.element.prop( "disabled" ) );
+	},
+
+	open: function( event ) {
+		if ( this.options.disabled ) {
+			return;
+		}
+
+		// If this is the first time the menu is being opened, render the items
+		if ( !this._rendered ) {
+			this._refreshMenu();
+		} else {
+
+			// Menu clears focus on close, reset focus to selected item
+			this._removeClass( this.menu.find( ".ui-state-active" ), null, "ui-state-active" );
+			this.menuInstance.focus( null, this._getSelectedItem() );
+		}
+
+		// If there are no options, don't open the menu
+		if ( !this.menuItems.length ) {
+			return;
+		}
+
+		this.isOpen = true;
+		this._toggleAttr();
+		this._resizeMenu();
+		this._position();
+
+		this._on( this.document, this._documentClick );
+
+		this._trigger( "open", event );
+	},
+
+	_position: function() {
+		this.menuWrap.position( $.extend( { of: this.button }, this.options.position ) );
+	},
+
+	close: function( event ) {
+		if ( !this.isOpen ) {
+			return;
+		}
+
+		this.isOpen = false;
+		this._toggleAttr();
+
+		this.range = null;
+		this._off( this.document );
+
+		this._trigger( "close", event );
+	},
+
+	widget: function() {
+		return this.button;
+	},
+
+	menuWidget: function() {
+		return this.menu;
+	},
+
+	_renderButtonItem: function( item ) {
+		var buttonItem = $( "<span>" );
+
+		this._setText( buttonItem, item.label );
+		this._addClass( buttonItem, "ui-selectmenu-text" );
+
+		return buttonItem;
+	},
+
+	_renderMenu: function( ul, items ) {
+		var that = this,
+			currentOptgroup = "";
+
+		$.each( items, function( index, item ) {
+			var li;
+
+			if ( item.optgroup !== currentOptgroup ) {
+				li = $( "<li>", {
+					text: item.optgroup
+				} );
+				that._addClass( li, "ui-selectmenu-optgroup", "ui-menu-divider" +
+					( item.element.parent( "optgroup" ).prop( "disabled" ) ?
+						" ui-state-disabled" :
+						"" ) );
+
+				li.appendTo( ul );
+
+				currentOptgroup = item.optgroup;
+			}
+
+			that._renderItemData( ul, item );
+		} );
+	},
+
+	_renderItemData: function( ul, item ) {
+		return this._renderItem( ul, item ).data( "ui-selectmenu-item", item );
+	},
+
+	_renderItem: function( ul, item ) {
+		var li = $( "<li>" ),
+			wrapper = $( "<div>", {
+				title: item.element.attr( "title" )
+			} );
+
+		if ( item.disabled ) {
+			this._addClass( li, null, "ui-state-disabled" );
+		}
+		this._setText( wrapper, item.label );
+
+		return li.append( wrapper ).appendTo( ul );
+	},
+
+	_setText: function( element, value ) {
+		if ( value ) {
+			element.text( value );
+		} else {
+			element.html( "&#160;" );
+		}
+	},
+
+	_move: function( direction, event ) {
+		var item, next,
+			filter = ".ui-menu-item";
+
+		if ( this.isOpen ) {
+			item = this.menuItems.eq( this.focusIndex ).parent( "li" );
+		} else {
+			item = this.menuItems.eq( this.element[ 0 ].selectedIndex ).parent( "li" );
+			filter += ":not(.ui-state-disabled)";
+		}
+
+		if ( direction === "first" || direction === "last" ) {
+			next = item[ direction === "first" ? "prevAll" : "nextAll" ]( filter ).eq( -1 );
+		} else {
+			next = item[ direction + "All" ]( filter ).eq( 0 );
+		}
+
+		if ( next.length ) {
+			this.menuInstance.focus( event, next );
+		}
+	},
+
+	_getSelectedItem: function() {
+		return this.menuItems.eq( this.element[ 0 ].selectedIndex ).parent( "li" );
+	},
+
+	_toggle: function( event ) {
+		this[ this.isOpen ? "close" : "open" ]( event );
+	},
+
+	_setSelection: function() {
+		var selection;
+
+		if ( !this.range ) {
+			return;
+		}
+
+		if ( window.getSelection ) {
+			selection = window.getSelection();
+			selection.removeAllRanges();
+			selection.addRange( this.range );
+
+		// Support: IE8
+		} else {
+			this.range.select();
+		}
+
+		// Support: IE
+		// Setting the text selection kills the button focus in IE, but
+		// restoring the focus doesn't kill the selection.
+		this.button.focus();
+	},
+
+	_documentClick: {
+		mousedown: function( event ) {
+			if ( !this.isOpen ) {
+				return;
+			}
+
+			if ( !$( event.target ).closest( ".ui-selectmenu-menu, #" +
+					$.ui.escapeSelector( this.ids.button ) ).length ) {
+				this.close( event );
 			}
 		}
 	},
 
-	_destroy: function() {
-		var drop = $.ui.ddmanager.droppables[ this.options.scope ];
+	_buttonEvents: {
 
-		this._splice( drop );
+		// Prevent text selection from being reset when interacting with the selectmenu (#10144)
+		mousedown: function() {
+			var selection;
 
-		this.element.removeClass( "ui-droppable ui-droppable-disabled" );
+			if ( window.getSelection ) {
+				selection = window.getSelection();
+				if ( selection.rangeCount ) {
+					this.range = selection.getRangeAt( 0 );
+				}
+
+			// Support: IE8
+			} else {
+				this.range = document.selection.createRange();
+			}
+		},
+
+		click: function( event ) {
+			this._setSelection();
+			this._toggle( event );
+		},
+
+		keydown: function( event ) {
+			var preventDefault = true;
+			switch ( event.keyCode ) {
+			case $.ui.keyCode.TAB:
+			case $.ui.keyCode.ESCAPE:
+				this.close( event );
+				preventDefault = false;
+				break;
+			case $.ui.keyCode.ENTER:
+				if ( this.isOpen ) {
+					this._selectFocusedItem( event );
+				}
+				break;
+			case $.ui.keyCode.UP:
+				if ( event.altKey ) {
+					this._toggle( event );
+				} else {
+					this._move( "prev", event );
+				}
+				break;
+			case $.ui.keyCode.DOWN:
+				if ( event.altKey ) {
+					this._toggle( event );
+				} else {
+					this._move( "next", event );
+				}
+				break;
+			case $.ui.keyCode.SPACE:
+				if ( this.isOpen ) {
+					this._selectFocusedItem( event );
+				} else {
+					this._toggle( event );
+				}
+				break;
+			case $.ui.keyCode.LEFT:
+				this._move( "prev", event );
+				break;
+			case $.ui.keyCode.RIGHT:
+				this._move( "next", event );
+				break;
+			case $.ui.keyCode.HOME:
+			case $.ui.keyCode.PAGE_UP:
+				this._move( "first", event );
+				break;
+			case $.ui.keyCode.END:
+			case $.ui.keyCode.PAGE_DOWN:
+				this._move( "last", event );
+				break;
+			default:
+				this.menu.trigger( event );
+				preventDefault = false;
+			}
+
+			if ( preventDefault ) {
+				event.preventDefault();
+			}
+		}
+	},
+
+	_selectFocusedItem: function( event ) {
+		var item = this.menuItems.eq( this.focusIndex ).parent( "li" );
+		if ( !item.hasClass( "ui-state-disabled" ) ) {
+			this._select( item.data( "ui-selectmenu-item" ), event );
+		}
+	},
+
+	_select: function( item, event ) {
+		var oldIndex = this.element[ 0 ].selectedIndex;
+
+		// Change native select element
+		this.element[ 0 ].selectedIndex = item.index;
+		this.buttonItem.replaceWith( this.buttonItem = this._renderButtonItem( item ) );
+		this._setAria( item );
+		this._trigger( "select", event, { item: item } );
+
+		if ( item.index !== oldIndex ) {
+			this._trigger( "change", event, { item: item } );
+		}
+
+		this.close( event );
+	},
+
+	_setAria: function( item ) {
+		var id = this.menuItems.eq( item.index ).attr( "id" );
+
+		this.button.attr( {
+			"aria-labelledby": id,
+			"aria-activedescendant": id
+		} );
+		this.menu.attr( "aria-activedescendant", id );
 	},
 
 	_setOption: function( key, value ) {
+		if ( key === "icons" ) {
+			var icon = this.button.find( "span.ui-icon" );
+			this._removeClass( icon, null, this.options.icons.button )
+				._addClass( icon, null, value.button );
+		}
 
-		if ( key === "accept" ) {
-			this.accept = $.isFunction( value ) ? value : function( d ) {
-				return d.is( value );
-			};
-		} else if ( key === "scope" ) {
-			var drop = $.ui.ddmanager.droppables[ this.options.scope ];
+		this._super( key, value );
 
-			this._splice( drop );
-			this._addToManager( value );
+		if ( key === "appendTo" ) {
+			this.menuWrap.appendTo( this._appendTo() );
+		}
+
+		if ( key === "width" ) {
+			this._resizeButton();
+		}
+	},
+
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this.menuInstance.option( "disabled", value );
+		this.button.attr( "aria-disabled", value );
+		this._toggleClass( this.button, null, "ui-state-disabled", value );
+
+		this.element.prop( "disabled", value );
+		if ( value ) {
+			this.button.attr( "tabindex", -1 );
+			this.close();
+		} else {
+			this.button.attr( "tabindex", 0 );
+		}
+	},
+
+	_appendTo: function() {
+		var element = this.options.appendTo;
+
+		if ( element ) {
+			element = element.jquery || element.nodeType ?
+				$( element ) :
+				this.document.find( element ).eq( 0 );
+		}
+
+		if ( !element || !element[ 0 ] ) {
+			element = this.element.closest( ".ui-front, dialog" );
+		}
+
+		if ( !element.length ) {
+			element = this.document[ 0 ].body;
+		}
+
+		return element;
+	},
+
+	_toggleAttr: function() {
+		this.button.attr( "aria-expanded", this.isOpen );
+
+		// We can't use two _toggleClass() calls here, because we need to make sure
+		// we always remove classes first and add them second, otherwise if both classes have the
+		// same theme class, it will be removed after we add it.
+		this._removeClass( this.button, "ui-selectmenu-button-" +
+			( this.isOpen ? "closed" : "open" ) )
+			._addClass( this.button, "ui-selectmenu-button-" +
+				( this.isOpen ? "open" : "closed" ) )
+			._toggleClass( this.menuWrap, "ui-selectmenu-open", null, this.isOpen );
+
+		this.menu.attr( "aria-hidden", !this.isOpen );
+	},
+
+	_resizeButton: function() {
+		var width = this.options.width;
+
+		// For `width: false`, just remove inline style and stop
+		if ( width === false ) {
+			this.button.css( "width", "" );
+			return;
+		}
+
+		// For `width: null`, match the width of the original element
+		if ( width === null ) {
+			width = this.element.show().outerWidth();
+			this.element.hide();
+		}
+
+		this.button.outerWidth( width );
+	},
+
+	_resizeMenu: function() {
+		this.menu.outerWidth( Math.max(
+			this.button.outerWidth(),
+
+			// Support: IE10
+			// IE10 wraps long text (possibly a rounding bug)
+			// so we add 1px to avoid the wrapping
+			this.menu.width( "" ).outerWidth() + 1
+		) );
+	},
+
+	_getCreateOptions: function() {
+		var options = this._super();
+
+		options.disabled = this.element.prop( "disabled" );
+
+		return options;
+	},
+
+	_parseOptions: function( options ) {
+		var that = this,
+			data = [];
+		options.each( function( index, item ) {
+			data.push( that._parseOption( $( item ), index ) );
+		} );
+		this.items = data;
+	},
+
+	_parseOption: function( option, index ) {
+		var optgroup = option.parent( "optgroup" );
+
+		return {
+			element: option,
+			index: index,
+			value: option.val(),
+			label: option.text(),
+			optgroup: optgroup.attr( "label" ) || "",
+			disabled: optgroup.prop( "disabled" ) || option.prop( "disabled" )
+		};
+	},
+
+	_destroy: function() {
+		this._unbindFormResetHandler();
+		this.menuWrap.remove();
+		this.button.remove();
+		this.element.show();
+		this.element.removeUniqueId();
+		this.labels.attr( "for", this.ids.element );
+	}
+} ] );
+
+
+/*!
+ * jQuery UI Slider 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Slider
+//>>group: Widgets
+//>>description: Displays a flexible slider with ranges and accessibility via keyboard.
+//>>docs: http://api.jqueryui.com/slider/
+//>>demos: http://jqueryui.com/slider/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/slider.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+var widgetsSlider = $.widget( "ui.slider", $.ui.mouse, {
+	version: "1.12.1",
+	widgetEventPrefix: "slide",
+
+	options: {
+		animate: false,
+		classes: {
+			"ui-slider": "ui-corner-all",
+			"ui-slider-handle": "ui-corner-all",
+
+			// Note: ui-widget-header isn't the most fittingly semantic framework class for this
+			// element, but worked best visually with a variety of themes
+			"ui-slider-range": "ui-corner-all ui-widget-header"
+		},
+		distance: 0,
+		max: 100,
+		min: 0,
+		orientation: "horizontal",
+		range: false,
+		step: 1,
+		value: 0,
+		values: null,
+
+		// Callbacks
+		change: null,
+		slide: null,
+		start: null,
+		stop: null
+	},
+
+	// Number of pages in a slider
+	// (how many times can you page up/down to go through the whole range)
+	numPages: 5,
+
+	_create: function() {
+		this._keySliding = false;
+		this._mouseSliding = false;
+		this._animateOff = true;
+		this._handleIndex = null;
+		this._detectOrientation();
+		this._mouseInit();
+		this._calculateNewMax();
+
+		this._addClass( "ui-slider ui-slider-" + this.orientation,
+			"ui-widget ui-widget-content" );
+
+		this._refresh();
+
+		this._animateOff = false;
+	},
+
+	_refresh: function() {
+		this._createRange();
+		this._createHandles();
+		this._setupEvents();
+		this._refreshValue();
+	},
+
+	_createHandles: function() {
+		var i, handleCount,
+			options = this.options,
+			existingHandles = this.element.find( ".ui-slider-handle" ),
+			handle = "<span tabindex='0'></span>",
+			handles = [];
+
+		handleCount = ( options.values && options.values.length ) || 1;
+
+		if ( existingHandles.length > handleCount ) {
+			existingHandles.slice( handleCount ).remove();
+			existingHandles = existingHandles.slice( 0, handleCount );
+		}
+
+		for ( i = existingHandles.length; i < handleCount; i++ ) {
+			handles.push( handle );
+		}
+
+		this.handles = existingHandles.add( $( handles.join( "" ) ).appendTo( this.element ) );
+
+		this._addClass( this.handles, "ui-slider-handle", "ui-state-default" );
+
+		this.handle = this.handles.eq( 0 );
+
+		this.handles.each( function( i ) {
+			$( this )
+				.data( "ui-slider-handle-index", i )
+				.attr( "tabIndex", 0 );
+		} );
+	},
+
+	_createRange: function() {
+		var options = this.options;
+
+		if ( options.range ) {
+			if ( options.range === true ) {
+				if ( !options.values ) {
+					options.values = [ this._valueMin(), this._valueMin() ];
+				} else if ( options.values.length && options.values.length !== 2 ) {
+					options.values = [ options.values[ 0 ], options.values[ 0 ] ];
+				} else if ( $.isArray( options.values ) ) {
+					options.values = options.values.slice( 0 );
+				}
+			}
+
+			if ( !this.range || !this.range.length ) {
+				this.range = $( "<div>" )
+					.appendTo( this.element );
+
+				this._addClass( this.range, "ui-slider-range" );
+			} else {
+				this._removeClass( this.range, "ui-slider-range-min ui-slider-range-max" );
+
+				// Handle range switching from true to min/max
+				this.range.css( {
+					"left": "",
+					"bottom": ""
+				} );
+			}
+			if ( options.range === "min" || options.range === "max" ) {
+				this._addClass( this.range, "ui-slider-range-" + options.range );
+			}
+		} else {
+			if ( this.range ) {
+				this.range.remove();
+			}
+			this.range = null;
+		}
+	},
+
+	_setupEvents: function() {
+		this._off( this.handles );
+		this._on( this.handles, this._handleEvents );
+		this._hoverable( this.handles );
+		this._focusable( this.handles );
+	},
+
+	_destroy: function() {
+		this.handles.remove();
+		if ( this.range ) {
+			this.range.remove();
+		}
+
+		this._mouseDestroy();
+	},
+
+	_mouseCapture: function( event ) {
+		var position, normValue, distance, closestHandle, index, allowed, offset, mouseOverHandle,
+			that = this,
+			o = this.options;
+
+		if ( o.disabled ) {
+			return false;
+		}
+
+		this.elementSize = {
+			width: this.element.outerWidth(),
+			height: this.element.outerHeight()
+		};
+		this.elementOffset = this.element.offset();
+
+		position = { x: event.pageX, y: event.pageY };
+		normValue = this._normValueFromMouse( position );
+		distance = this._valueMax() - this._valueMin() + 1;
+		this.handles.each( function( i ) {
+			var thisDistance = Math.abs( normValue - that.values( i ) );
+			if ( ( distance > thisDistance ) ||
+				( distance === thisDistance &&
+					( i === that._lastChangedValue || that.values( i ) === o.min ) ) ) {
+				distance = thisDistance;
+				closestHandle = $( this );
+				index = i;
+			}
+		} );
+
+		allowed = this._start( event, index );
+		if ( allowed === false ) {
+			return false;
+		}
+		this._mouseSliding = true;
+
+		this._handleIndex = index;
+
+		this._addClass( closestHandle, null, "ui-state-active" );
+		closestHandle.trigger( "focus" );
+
+		offset = closestHandle.offset();
+		mouseOverHandle = !$( event.target ).parents().addBack().is( ".ui-slider-handle" );
+		this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
+			left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
+			top: event.pageY - offset.top -
+				( closestHandle.height() / 2 ) -
+				( parseInt( closestHandle.css( "borderTopWidth" ), 10 ) || 0 ) -
+				( parseInt( closestHandle.css( "borderBottomWidth" ), 10 ) || 0 ) +
+				( parseInt( closestHandle.css( "marginTop" ), 10 ) || 0 )
+		};
+
+		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
+			this._slide( event, index, normValue );
+		}
+		this._animateOff = true;
+		return true;
+	},
+
+	_mouseStart: function() {
+		return true;
+	},
+
+	_mouseDrag: function( event ) {
+		var position = { x: event.pageX, y: event.pageY },
+			normValue = this._normValueFromMouse( position );
+
+		this._slide( event, this._handleIndex, normValue );
+
+		return false;
+	},
+
+	_mouseStop: function( event ) {
+		this._removeClass( this.handles, null, "ui-state-active" );
+		this._mouseSliding = false;
+
+		this._stop( event, this._handleIndex );
+		this._change( event, this._handleIndex );
+
+		this._handleIndex = null;
+		this._clickOffset = null;
+		this._animateOff = false;
+
+		return false;
+	},
+
+	_detectOrientation: function() {
+		this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
+	},
+
+	_normValueFromMouse: function( position ) {
+		var pixelTotal,
+			pixelMouse,
+			percentMouse,
+			valueTotal,
+			valueMouse;
+
+		if ( this.orientation === "horizontal" ) {
+			pixelTotal = this.elementSize.width;
+			pixelMouse = position.x - this.elementOffset.left -
+				( this._clickOffset ? this._clickOffset.left : 0 );
+		} else {
+			pixelTotal = this.elementSize.height;
+			pixelMouse = position.y - this.elementOffset.top -
+				( this._clickOffset ? this._clickOffset.top : 0 );
+		}
+
+		percentMouse = ( pixelMouse / pixelTotal );
+		if ( percentMouse > 1 ) {
+			percentMouse = 1;
+		}
+		if ( percentMouse < 0 ) {
+			percentMouse = 0;
+		}
+		if ( this.orientation === "vertical" ) {
+			percentMouse = 1 - percentMouse;
+		}
+
+		valueTotal = this._valueMax() - this._valueMin();
+		valueMouse = this._valueMin() + percentMouse * valueTotal;
+
+		return this._trimAlignValue( valueMouse );
+	},
+
+	_uiHash: function( index, value, values ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			handleIndex: index,
+			value: value !== undefined ? value : this.value()
+		};
+
+		if ( this._hasMultipleValues() ) {
+			uiHash.value = value !== undefined ? value : this.values( index );
+			uiHash.values = values || this.values();
+		}
+
+		return uiHash;
+	},
+
+	_hasMultipleValues: function() {
+		return this.options.values && this.options.values.length;
+	},
+
+	_start: function( event, index ) {
+		return this._trigger( "start", event, this._uiHash( index ) );
+	},
+
+	_slide: function( event, index, newVal ) {
+		var allowed, otherVal,
+			currentValue = this.value(),
+			newValues = this.values();
+
+		if ( this._hasMultipleValues() ) {
+			otherVal = this.values( index ? 0 : 1 );
+			currentValue = this.values( index );
+
+			if ( this.options.values.length === 2 && this.options.range === true ) {
+				newVal =  index === 0 ? Math.min( otherVal, newVal ) : Math.max( otherVal, newVal );
+			}
+
+			newValues[ index ] = newVal;
+		}
+
+		if ( newVal === currentValue ) {
+			return;
+		}
+
+		allowed = this._trigger( "slide", event, this._uiHash( index, newVal, newValues ) );
+
+		// A slide can be canceled by returning false from the slide callback
+		if ( allowed === false ) {
+			return;
+		}
+
+		if ( this._hasMultipleValues() ) {
+			this.values( index, newVal );
+		} else {
+			this.value( newVal );
+		}
+	},
+
+	_stop: function( event, index ) {
+		this._trigger( "stop", event, this._uiHash( index ) );
+	},
+
+	_change: function( event, index ) {
+		if ( !this._keySliding && !this._mouseSliding ) {
+
+			//store the last changed value index for reference when handles overlap
+			this._lastChangedValue = index;
+			this._trigger( "change", event, this._uiHash( index ) );
+		}
+	},
+
+	value: function( newValue ) {
+		if ( arguments.length ) {
+			this.options.value = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, 0 );
+			return;
+		}
+
+		return this._value();
+	},
+
+	values: function( index, newValue ) {
+		var vals,
+			newValues,
+			i;
+
+		if ( arguments.length > 1 ) {
+			this.options.values[ index ] = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, index );
+			return;
+		}
+
+		if ( arguments.length ) {
+			if ( $.isArray( arguments[ 0 ] ) ) {
+				vals = this.options.values;
+				newValues = arguments[ 0 ];
+				for ( i = 0; i < vals.length; i += 1 ) {
+					vals[ i ] = this._trimAlignValue( newValues[ i ] );
+					this._change( null, i );
+				}
+				this._refreshValue();
+			} else {
+				if ( this._hasMultipleValues() ) {
+					return this._values( index );
+				} else {
+					return this.value();
+				}
+			}
+		} else {
+			return this._values();
+		}
+	},
+
+	_setOption: function( key, value ) {
+		var i,
+			valsLength = 0;
+
+		if ( key === "range" && this.options.range === true ) {
+			if ( value === "min" ) {
+				this.options.value = this._values( 0 );
+				this.options.values = null;
+			} else if ( value === "max" ) {
+				this.options.value = this._values( this.options.values.length - 1 );
+				this.options.values = null;
+			}
+		}
+
+		if ( $.isArray( this.options.values ) ) {
+			valsLength = this.options.values.length;
+		}
+
+		this._super( key, value );
+
+		switch ( key ) {
+			case "orientation":
+				this._detectOrientation();
+				this._removeClass( "ui-slider-horizontal ui-slider-vertical" )
+					._addClass( "ui-slider-" + this.orientation );
+				this._refreshValue();
+				if ( this.options.range ) {
+					this._refreshRange( value );
+				}
+
+				// Reset positioning from previous orientation
+				this.handles.css( value === "horizontal" ? "bottom" : "left", "" );
+				break;
+			case "value":
+				this._animateOff = true;
+				this._refreshValue();
+				this._change( null, 0 );
+				this._animateOff = false;
+				break;
+			case "values":
+				this._animateOff = true;
+				this._refreshValue();
+
+				// Start from the last handle to prevent unreachable handles (#9046)
+				for ( i = valsLength - 1; i >= 0; i-- ) {
+					this._change( null, i );
+				}
+				this._animateOff = false;
+				break;
+			case "step":
+			case "min":
+			case "max":
+				this._animateOff = true;
+				this._calculateNewMax();
+				this._refreshValue();
+				this._animateOff = false;
+				break;
+			case "range":
+				this._animateOff = true;
+				this._refresh();
+				this._animateOff = false;
+				break;
+		}
+	},
+
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this._toggleClass( null, "ui-state-disabled", !!value );
+	},
+
+	//internal value getter
+	// _value() returns value trimmed by min and max, aligned by step
+	_value: function() {
+		var val = this.options.value;
+		val = this._trimAlignValue( val );
+
+		return val;
+	},
+
+	//internal values getter
+	// _values() returns array of values trimmed by min and max, aligned by step
+	// _values( index ) returns single value trimmed by min and max, aligned by step
+	_values: function( index ) {
+		var val,
+			vals,
+			i;
+
+		if ( arguments.length ) {
+			val = this.options.values[ index ];
+			val = this._trimAlignValue( val );
+
+			return val;
+		} else if ( this._hasMultipleValues() ) {
+
+			// .slice() creates a copy of the array
+			// this copy gets trimmed by min and max and then returned
+			vals = this.options.values.slice();
+			for ( i = 0; i < vals.length; i += 1 ) {
+				vals[ i ] = this._trimAlignValue( vals[ i ] );
+			}
+
+			return vals;
+		} else {
+			return [];
+		}
+	},
+
+	// Returns the step-aligned value that val is closest to, between (inclusive) min and max
+	_trimAlignValue: function( val ) {
+		if ( val <= this._valueMin() ) {
+			return this._valueMin();
+		}
+		if ( val >= this._valueMax() ) {
+			return this._valueMax();
+		}
+		var step = ( this.options.step > 0 ) ? this.options.step : 1,
+			valModStep = ( val - this._valueMin() ) % step,
+			alignValue = val - valModStep;
+
+		if ( Math.abs( valModStep ) * 2 >= step ) {
+			alignValue += ( valModStep > 0 ) ? step : ( -step );
+		}
+
+		// Since JavaScript has problems with large floats, round
+		// the final value to 5 digits after the decimal point (see #4124)
+		return parseFloat( alignValue.toFixed( 5 ) );
+	},
+
+	_calculateNewMax: function() {
+		var max = this.options.max,
+			min = this._valueMin(),
+			step = this.options.step,
+			aboveMin = Math.round( ( max - min ) / step ) * step;
+		max = aboveMin + min;
+		if ( max > this.options.max ) {
+
+			//If max is not divisible by step, rounding off may increase its value
+			max -= step;
+		}
+		this.max = parseFloat( max.toFixed( this._precision() ) );
+	},
+
+	_precision: function() {
+		var precision = this._precisionOf( this.options.step );
+		if ( this.options.min !== null ) {
+			precision = Math.max( precision, this._precisionOf( this.options.min ) );
+		}
+		return precision;
+	},
+
+	_precisionOf: function( num ) {
+		var str = num.toString(),
+			decimal = str.indexOf( "." );
+		return decimal === -1 ? 0 : str.length - decimal - 1;
+	},
+
+	_valueMin: function() {
+		return this.options.min;
+	},
+
+	_valueMax: function() {
+		return this.max;
+	},
+
+	_refreshRange: function( orientation ) {
+		if ( orientation === "vertical" ) {
+			this.range.css( { "width": "", "left": "" } );
+		}
+		if ( orientation === "horizontal" ) {
+			this.range.css( { "height": "", "bottom": "" } );
+		}
+	},
+
+	_refreshValue: function() {
+		var lastValPercent, valPercent, value, valueMin, valueMax,
+			oRange = this.options.range,
+			o = this.options,
+			that = this,
+			animate = ( !this._animateOff ) ? o.animate : false,
+			_set = {};
+
+		if ( this._hasMultipleValues() ) {
+			this.handles.each( function( i ) {
+				valPercent = ( that.values( i ) - that._valueMin() ) / ( that._valueMax() -
+					that._valueMin() ) * 100;
+				_set[ that.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+				$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+				if ( that.options.range === true ) {
+					if ( that.orientation === "horizontal" ) {
+						if ( i === 0 ) {
+							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( {
+								left: valPercent + "%"
+							}, o.animate );
+						}
+						if ( i === 1 ) {
+							that.range[ animate ? "animate" : "css" ]( {
+								width: ( valPercent - lastValPercent ) + "%"
+							}, {
+								queue: false,
+								duration: o.animate
+							} );
+						}
+					} else {
+						if ( i === 0 ) {
+							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( {
+								bottom: ( valPercent ) + "%"
+							}, o.animate );
+						}
+						if ( i === 1 ) {
+							that.range[ animate ? "animate" : "css" ]( {
+								height: ( valPercent - lastValPercent ) + "%"
+							}, {
+								queue: false,
+								duration: o.animate
+							} );
+						}
+					}
+				}
+				lastValPercent = valPercent;
+			} );
+		} else {
+			value = this.value();
+			valueMin = this._valueMin();
+			valueMax = this._valueMax();
+			valPercent = ( valueMax !== valueMin ) ?
+					( value - valueMin ) / ( valueMax - valueMin ) * 100 :
+					0;
+			_set[ this.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+			this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+
+			if ( oRange === "min" && this.orientation === "horizontal" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( {
+					width: valPercent + "%"
+				}, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "horizontal" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( {
+					width: ( 100 - valPercent ) + "%"
+				}, o.animate );
+			}
+			if ( oRange === "min" && this.orientation === "vertical" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( {
+					height: valPercent + "%"
+				}, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "vertical" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( {
+					height: ( 100 - valPercent ) + "%"
+				}, o.animate );
+			}
+		}
+	},
+
+	_handleEvents: {
+		keydown: function( event ) {
+			var allowed, curVal, newVal, step,
+				index = $( event.target ).data( "ui-slider-handle-index" );
+
+			switch ( event.keyCode ) {
+				case $.ui.keyCode.HOME:
+				case $.ui.keyCode.END:
+				case $.ui.keyCode.PAGE_UP:
+				case $.ui.keyCode.PAGE_DOWN:
+				case $.ui.keyCode.UP:
+				case $.ui.keyCode.RIGHT:
+				case $.ui.keyCode.DOWN:
+				case $.ui.keyCode.LEFT:
+					event.preventDefault();
+					if ( !this._keySliding ) {
+						this._keySliding = true;
+						this._addClass( $( event.target ), null, "ui-state-active" );
+						allowed = this._start( event, index );
+						if ( allowed === false ) {
+							return;
+						}
+					}
+					break;
+			}
+
+			step = this.options.step;
+			if ( this._hasMultipleValues() ) {
+				curVal = newVal = this.values( index );
+			} else {
+				curVal = newVal = this.value();
+			}
+
+			switch ( event.keyCode ) {
+				case $.ui.keyCode.HOME:
+					newVal = this._valueMin();
+					break;
+				case $.ui.keyCode.END:
+					newVal = this._valueMax();
+					break;
+				case $.ui.keyCode.PAGE_UP:
+					newVal = this._trimAlignValue(
+						curVal + ( ( this._valueMax() - this._valueMin() ) / this.numPages )
+					);
+					break;
+				case $.ui.keyCode.PAGE_DOWN:
+					newVal = this._trimAlignValue(
+						curVal - ( ( this._valueMax() - this._valueMin() ) / this.numPages ) );
+					break;
+				case $.ui.keyCode.UP:
+				case $.ui.keyCode.RIGHT:
+					if ( curVal === this._valueMax() ) {
+						return;
+					}
+					newVal = this._trimAlignValue( curVal + step );
+					break;
+				case $.ui.keyCode.DOWN:
+				case $.ui.keyCode.LEFT:
+					if ( curVal === this._valueMin() ) {
+						return;
+					}
+					newVal = this._trimAlignValue( curVal - step );
+					break;
+			}
+
+			this._slide( event, index, newVal );
+		},
+		keyup: function( event ) {
+			var index = $( event.target ).data( "ui-slider-handle-index" );
+
+			if ( this._keySliding ) {
+				this._keySliding = false;
+				this._stop( event, index );
+				this._change( event, index );
+				this._removeClass( $( event.target ), null, "ui-state-active" );
+			}
+		}
+	}
+} );
+
+
+/*!
+ * jQuery UI Spinner 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Spinner
+//>>group: Widgets
+//>>description: Displays buttons to easily input numbers via the keyboard or mouse.
+//>>docs: http://api.jqueryui.com/spinner/
+//>>demos: http://jqueryui.com/spinner/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/spinner.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+function spinnerModifer( fn ) {
+	return function() {
+		var previous = this.element.val();
+		fn.apply( this, arguments );
+		this._refresh();
+		if ( previous !== this.element.val() ) {
+			this._trigger( "change" );
+		}
+	};
+}
+
+$.widget( "ui.spinner", {
+	version: "1.12.1",
+	defaultElement: "<input>",
+	widgetEventPrefix: "spin",
+	options: {
+		classes: {
+			"ui-spinner": "ui-corner-all",
+			"ui-spinner-down": "ui-corner-br",
+			"ui-spinner-up": "ui-corner-tr"
+		},
+		culture: null,
+		icons: {
+			down: "ui-icon-triangle-1-s",
+			up: "ui-icon-triangle-1-n"
+		},
+		incremental: true,
+		max: null,
+		min: null,
+		numberFormat: null,
+		page: 10,
+		step: 1,
+
+		change: null,
+		spin: null,
+		start: null,
+		stop: null
+	},
+
+	_create: function() {
+
+		// handle string values that need to be parsed
+		this._setOption( "max", this.options.max );
+		this._setOption( "min", this.options.min );
+		this._setOption( "step", this.options.step );
+
+		// Only format if there is a value, prevents the field from being marked
+		// as invalid in Firefox, see #9573.
+		if ( this.value() !== "" ) {
+
+			// Format the value, but don't constrain.
+			this._value( this.element.val(), true );
+		}
+
+		this._draw();
+		this._on( this._events );
+		this._refresh();
+
+		// Turning off autocomplete prevents the browser from remembering the
+		// value when navigating through history, so we re-enable autocomplete
+		// if the page is unloaded before the widget is destroyed. #7790
+		this._on( this.window, {
+			beforeunload: function() {
+				this.element.removeAttr( "autocomplete" );
+			}
+		} );
+	},
+
+	_getCreateOptions: function() {
+		var options = this._super();
+		var element = this.element;
+
+		$.each( [ "min", "max", "step" ], function( i, option ) {
+			var value = element.attr( option );
+			if ( value != null && value.length ) {
+				options[ option ] = value;
+			}
+		} );
+
+		return options;
+	},
+
+	_events: {
+		keydown: function( event ) {
+			if ( this._start( event ) && this._keydown( event ) ) {
+				event.preventDefault();
+			}
+		},
+		keyup: "_stop",
+		focus: function() {
+			this.previous = this.element.val();
+		},
+		blur: function( event ) {
+			if ( this.cancelBlur ) {
+				delete this.cancelBlur;
+				return;
+			}
+
+			this._stop();
+			this._refresh();
+			if ( this.previous !== this.element.val() ) {
+				this._trigger( "change", event );
+			}
+		},
+		mousewheel: function( event, delta ) {
+			if ( !delta ) {
+				return;
+			}
+			if ( !this.spinning && !this._start( event ) ) {
+				return false;
+			}
+
+			this._spin( ( delta > 0 ? 1 : -1 ) * this.options.step, event );
+			clearTimeout( this.mousewheelTimer );
+			this.mousewheelTimer = this._delay( function() {
+				if ( this.spinning ) {
+					this._stop( event );
+				}
+			}, 100 );
+			event.preventDefault();
+		},
+		"mousedown .ui-spinner-button": function( event ) {
+			var previous;
+
+			// We never want the buttons to have focus; whenever the user is
+			// interacting with the spinner, the focus should be on the input.
+			// If the input is focused then this.previous is properly set from
+			// when the input first received focus. If the input is not focused
+			// then we need to set this.previous based on the value before spinning.
+			previous = this.element[ 0 ] === $.ui.safeActiveElement( this.document[ 0 ] ) ?
+				this.previous : this.element.val();
+			function checkFocus() {
+				var isActive = this.element[ 0 ] === $.ui.safeActiveElement( this.document[ 0 ] );
+				if ( !isActive ) {
+					this.element.trigger( "focus" );
+					this.previous = previous;
+
+					// support: IE
+					// IE sets focus asynchronously, so we need to check if focus
+					// moved off of the input because the user clicked on the button.
+					this._delay( function() {
+						this.previous = previous;
+					} );
+				}
+			}
+
+			// Ensure focus is on (or stays on) the text field
+			event.preventDefault();
+			checkFocus.call( this );
+
+			// Support: IE
+			// IE doesn't prevent moving focus even with event.preventDefault()
+			// so we set a flag to know when we should ignore the blur event
+			// and check (again) if focus moved off of the input.
+			this.cancelBlur = true;
+			this._delay( function() {
+				delete this.cancelBlur;
+				checkFocus.call( this );
+			} );
+
+			if ( this._start( event ) === false ) {
+				return;
+			}
+
+			this._repeat( null, $( event.currentTarget )
+				.hasClass( "ui-spinner-up" ) ? 1 : -1, event );
+		},
+		"mouseup .ui-spinner-button": "_stop",
+		"mouseenter .ui-spinner-button": function( event ) {
+
+			// button will add ui-state-active if mouse was down while mouseleave and kept down
+			if ( !$( event.currentTarget ).hasClass( "ui-state-active" ) ) {
+				return;
+			}
+
+			if ( this._start( event ) === false ) {
+				return false;
+			}
+			this._repeat( null, $( event.currentTarget )
+				.hasClass( "ui-spinner-up" ) ? 1 : -1, event );
+		},
+
+		// TODO: do we really want to consider this a stop?
+		// shouldn't we just stop the repeater and wait until mouseup before
+		// we trigger the stop event?
+		"mouseleave .ui-spinner-button": "_stop"
+	},
+
+	// Support mobile enhanced option and make backcompat more sane
+	_enhance: function() {
+		this.uiSpinner = this.element
+			.attr( "autocomplete", "off" )
+			.wrap( "<span>" )
+			.parent()
+
+				// Add buttons
+				.append(
+					"<a></a><a></a>"
+				);
+	},
+
+	_draw: function() {
+		this._enhance();
+
+		this._addClass( this.uiSpinner, "ui-spinner", "ui-widget ui-widget-content" );
+		this._addClass( "ui-spinner-input" );
+
+		this.element.attr( "role", "spinbutton" );
+
+		// Button bindings
+		this.buttons = this.uiSpinner.children( "a" )
+			.attr( "tabIndex", -1 )
+			.attr( "aria-hidden", true )
+			.button( {
+				classes: {
+					"ui-button": ""
+				}
+			} );
+
+		// TODO: Right now button does not support classes this is already updated in button PR
+		this._removeClass( this.buttons, "ui-corner-all" );
+
+		this._addClass( this.buttons.first(), "ui-spinner-button ui-spinner-up" );
+		this._addClass( this.buttons.last(), "ui-spinner-button ui-spinner-down" );
+		this.buttons.first().button( {
+			"icon": this.options.icons.up,
+			"showLabel": false
+		} );
+		this.buttons.last().button( {
+			"icon": this.options.icons.down,
+			"showLabel": false
+		} );
+
+		// IE 6 doesn't understand height: 50% for the buttons
+		// unless the wrapper has an explicit height
+		if ( this.buttons.height() > Math.ceil( this.uiSpinner.height() * 0.5 ) &&
+				this.uiSpinner.height() > 0 ) {
+			this.uiSpinner.height( this.uiSpinner.height() );
+		}
+	},
+
+	_keydown: function( event ) {
+		var options = this.options,
+			keyCode = $.ui.keyCode;
+
+		switch ( event.keyCode ) {
+		case keyCode.UP:
+			this._repeat( null, 1, event );
+			return true;
+		case keyCode.DOWN:
+			this._repeat( null, -1, event );
+			return true;
+		case keyCode.PAGE_UP:
+			this._repeat( null, options.page, event );
+			return true;
+		case keyCode.PAGE_DOWN:
+			this._repeat( null, -options.page, event );
+			return true;
+		}
+
+		return false;
+	},
+
+	_start: function( event ) {
+		if ( !this.spinning && this._trigger( "start", event ) === false ) {
+			return false;
+		}
+
+		if ( !this.counter ) {
+			this.counter = 1;
+		}
+		this.spinning = true;
+		return true;
+	},
+
+	_repeat: function( i, steps, event ) {
+		i = i || 500;
+
+		clearTimeout( this.timer );
+		this.timer = this._delay( function() {
+			this._repeat( 40, steps, event );
+		}, i );
+
+		this._spin( steps * this.options.step, event );
+	},
+
+	_spin: function( step, event ) {
+		var value = this.value() || 0;
+
+		if ( !this.counter ) {
+			this.counter = 1;
+		}
+
+		value = this._adjustValue( value + step * this._increment( this.counter ) );
+
+		if ( !this.spinning || this._trigger( "spin", event, { value: value } ) !== false ) {
+			this._value( value );
+			this.counter++;
+		}
+	},
+
+	_increment: function( i ) {
+		var incremental = this.options.incremental;
+
+		if ( incremental ) {
+			return $.isFunction( incremental ) ?
+				incremental( i ) :
+				Math.floor( i * i * i / 50000 - i * i / 500 + 17 * i / 200 + 1 );
+		}
+
+		return 1;
+	},
+
+	_precision: function() {
+		var precision = this._precisionOf( this.options.step );
+		if ( this.options.min !== null ) {
+			precision = Math.max( precision, this._precisionOf( this.options.min ) );
+		}
+		return precision;
+	},
+
+	_precisionOf: function( num ) {
+		var str = num.toString(),
+			decimal = str.indexOf( "." );
+		return decimal === -1 ? 0 : str.length - decimal - 1;
+	},
+
+	_adjustValue: function( value ) {
+		var base, aboveMin,
+			options = this.options;
+
+		// Make sure we're at a valid step
+		// - find out where we are relative to the base (min or 0)
+		base = options.min !== null ? options.min : 0;
+		aboveMin = value - base;
+
+		// - round to the nearest step
+		aboveMin = Math.round( aboveMin / options.step ) * options.step;
+
+		// - rounding is based on 0, so adjust back to our base
+		value = base + aboveMin;
+
+		// Fix precision from bad JS floating point math
+		value = parseFloat( value.toFixed( this._precision() ) );
+
+		// Clamp the value
+		if ( options.max !== null && value > options.max ) {
+			return options.max;
+		}
+		if ( options.min !== null && value < options.min ) {
+			return options.min;
+		}
+
+		return value;
+	},
+
+	_stop: function( event ) {
+		if ( !this.spinning ) {
+			return;
+		}
+
+		clearTimeout( this.timer );
+		clearTimeout( this.mousewheelTimer );
+		this.counter = 0;
+		this.spinning = false;
+		this._trigger( "stop", event );
+	},
+
+	_setOption: function( key, value ) {
+		var prevValue, first, last;
+
+		if ( key === "culture" || key === "numberFormat" ) {
+			prevValue = this._parse( this.element.val() );
+			this.options[ key ] = value;
+			this.element.val( this._format( prevValue ) );
+			return;
+		}
+
+		if ( key === "max" || key === "min" || key === "step" ) {
+			if ( typeof value === "string" ) {
+				value = this._parse( value );
+			}
+		}
+		if ( key === "icons" ) {
+			first = this.buttons.first().find( ".ui-icon" );
+			this._removeClass( first, null, this.options.icons.up );
+			this._addClass( first, null, value.up );
+			last = this.buttons.last().find( ".ui-icon" );
+			this._removeClass( last, null, this.options.icons.down );
+			this._addClass( last, null, value.down );
 		}
 
 		this._super( key, value );
 	},
 
-	_activate: function( event ) {
-		var draggable = $.ui.ddmanager.current;
-		if ( this.options.activeClass ) {
-			this.element.addClass( this.options.activeClass );
-		}
-		if ( draggable ){
-			this._trigger( "activate", event, this.ui( draggable ) );
-		}
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this._toggleClass( this.uiSpinner, null, "ui-state-disabled", !!value );
+		this.element.prop( "disabled", !!value );
+		this.buttons.button( value ? "disable" : "enable" );
 	},
 
-	_deactivate: function( event ) {
-		var draggable = $.ui.ddmanager.current;
-		if ( this.options.activeClass ) {
-			this.element.removeClass( this.options.activeClass );
-		}
-		if ( draggable ){
-			this._trigger( "deactivate", event, this.ui( draggable ) );
+	_setOptions: spinnerModifer( function( options ) {
+		this._super( options );
+	} ),
+
+	_parse: function( val ) {
+		if ( typeof val === "string" && val !== "" ) {
+			val = window.Globalize && this.options.numberFormat ?
+				Globalize.parseFloat( val, 10, this.options.culture ) : +val;
 		}
+		return val === "" || isNaN( val ) ? null : val;
 	},
 
-	_over: function( event ) {
-
-		var draggable = $.ui.ddmanager.current;
-
-		// Bail if draggable and droppable are same element
-		if ( !draggable || ( draggable.currentItem || draggable.element )[ 0 ] === this.element[ 0 ] ) {
-			return;
+	_format: function( value ) {
+		if ( value === "" ) {
+			return "";
 		}
-
-		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem || draggable.element ) ) ) {
-			if ( this.options.hoverClass ) {
-				this.element.addClass( this.options.hoverClass );
-			}
-			this._trigger( "over", event, this.ui( draggable ) );
-		}
-
+		return window.Globalize && this.options.numberFormat ?
+			Globalize.format( value, this.options.numberFormat, this.options.culture ) :
+			value;
 	},
 
-	_out: function( event ) {
-
-		var draggable = $.ui.ddmanager.current;
-
-		// Bail if draggable and droppable are same element
-		if ( !draggable || ( draggable.currentItem || draggable.element )[ 0 ] === this.element[ 0 ] ) {
-			return;
-		}
-
-		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem || draggable.element ) ) ) {
-			if ( this.options.hoverClass ) {
-				this.element.removeClass( this.options.hoverClass );
-			}
-			this._trigger( "out", event, this.ui( draggable ) );
-		}
+	_refresh: function() {
+		this.element.attr( {
+			"aria-valuemin": this.options.min,
+			"aria-valuemax": this.options.max,
 
+			// TODO: what should we do with values that can't be parsed?
+			"aria-valuenow": this._parse( this.element.val() )
+		} );
 	},
 
-	_drop: function( event, custom ) {
+	isValid: function() {
+		var value = this.value();
 
-		var draggable = custom || $.ui.ddmanager.current,
-			childrenIntersection = false;
-
-		// Bail if draggable and droppable are same element
-		if ( !draggable || ( draggable.currentItem || draggable.element )[ 0 ] === this.element[ 0 ] ) {
+		// Null is invalid
+		if ( value === null ) {
 			return false;
 		}
 
-		this.element.find( ":data(ui-droppable)" ).not( ".ui-draggable-dragging" ).each(function() {
-			var inst = $( this ).droppable( "instance" );
-			if (
-				inst.options.greedy &&
-				!inst.options.disabled &&
-				inst.options.scope === draggable.options.scope &&
-				inst.accept.call( inst.element[ 0 ], ( draggable.currentItem || draggable.element ) ) &&
-				$.ui.intersect( draggable, $.extend( inst, { offset: inst.element.offset() } ), inst.options.tolerance, event )
-			) { childrenIntersection = true; return false; }
-		});
-		if ( childrenIntersection ) {
-			return false;
-		}
-
-		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem || draggable.element ) ) ) {
-			if ( this.options.activeClass ) {
-				this.element.removeClass( this.options.activeClass );
-			}
-			if ( this.options.hoverClass ) {
-				this.element.removeClass( this.options.hoverClass );
-			}
-			this._trigger( "drop", event, this.ui( draggable ) );
-			return this.element;
-		}
-
-		return false;
-
+		// If value gets adjusted, it's invalid
+		return value === this._adjustValue( value );
 	},
 
-	ui: function( c ) {
-		return {
-			draggable: ( c.currentItem || c.element ),
-			helper: c.helper,
-			position: c.position,
-			offset: c.positionAbs
-		};
-	}
-
-});
-
-$.ui.intersect = (function() {
-	function isOverAxis( x, reference, size ) {
-		return ( x >= reference ) && ( x < ( reference + size ) );
-	}
-
-	return function( draggable, droppable, toleranceMode, event ) {
-
-		if ( !droppable.offset ) {
-			return false;
-		}
-
-		var x1 = ( draggable.positionAbs || draggable.position.absolute ).left + draggable.margins.left,
-			y1 = ( draggable.positionAbs || draggable.position.absolute ).top + draggable.margins.top,
-			x2 = x1 + draggable.helperProportions.width,
-			y2 = y1 + draggable.helperProportions.height,
-			l = droppable.offset.left,
-			t = droppable.offset.top,
-			r = l + droppable.proportions().width,
-			b = t + droppable.proportions().height;
-
-		switch ( toleranceMode ) {
-		case "fit":
-			return ( l <= x1 && x2 <= r && t <= y1 && y2 <= b );
-		case "intersect":
-			return ( l < x1 + ( draggable.helperProportions.width / 2 ) && // Right Half
-				x2 - ( draggable.helperProportions.width / 2 ) < r && // Left Half
-				t < y1 + ( draggable.helperProportions.height / 2 ) && // Bottom Half
-				y2 - ( draggable.helperProportions.height / 2 ) < b ); // Top Half
-		case "pointer":
-			return isOverAxis( event.pageY, t, droppable.proportions().height ) && isOverAxis( event.pageX, l, droppable.proportions().width );
-		case "touch":
-			return (
-				( y1 >= t && y1 <= b ) || // Top edge touching
-				( y2 >= t && y2 <= b ) || // Bottom edge touching
-				( y1 < t && y2 > b ) // Surrounded vertically
-			) && (
-				( x1 >= l && x1 <= r ) || // Left edge touching
-				( x2 >= l && x2 <= r ) || // Right edge touching
-				( x1 < l && x2 > r ) // Surrounded horizontally
-			);
-		default:
-			return false;
-		}
-	};
-})();
-
-/*
-	This manager tracks offsets of draggables and droppables
-*/
-$.ui.ddmanager = {
-	current: null,
-	droppables: { "default": [] },
-	prepareOffsets: function( t, event ) {
-
-		var i, j,
-			m = $.ui.ddmanager.droppables[ t.options.scope ] || [],
-			type = event ? event.type : null, // workaround for #2317
-			list = ( t.currentItem || t.element ).find( ":data(ui-droppable)" ).addBack();
-
-		droppablesLoop: for ( i = 0; i < m.length; i++ ) {
-
-			// No disabled and non-accepted
-			if ( m[ i ].options.disabled || ( t && !m[ i ].accept.call( m[ i ].element[ 0 ], ( t.currentItem || t.element ) ) ) ) {
-				continue;
-			}
-
-			// Filter out elements in the current dragged item
-			for ( j = 0; j < list.length; j++ ) {
-				if ( list[ j ] === m[ i ].element[ 0 ] ) {
-					m[ i ].proportions().height = 0;
-					continue droppablesLoop;
+	// Update the value without triggering change
+	_value: function( value, allowAny ) {
+		var parsed;
+		if ( value !== "" ) {
+			parsed = this._parse( value );
+			if ( parsed !== null ) {
+				if ( !allowAny ) {
+					parsed = this._adjustValue( parsed );
 				}
+				value = this._format( parsed );
 			}
-
-			m[ i ].visible = m[ i ].element.css( "display" ) !== "none";
-			if ( !m[ i ].visible ) {
-				continue;
-			}
-
-			// Activate the droppable if used directly from draggables
-			if ( type === "mousedown" ) {
-				m[ i ]._activate.call( m[ i ], event );
-			}
-
-			m[ i ].offset = m[ i ].element.offset();
-			m[ i ].proportions({ width: m[ i ].element[ 0 ].offsetWidth, height: m[ i ].element[ 0 ].offsetHeight });
-
 		}
-
+		this.element.val( value );
+		this._refresh();
 	},
-	drop: function( draggable, event ) {
 
-		var dropped = false;
-		// Create a copy of the droppables in case the list changes during the drop (#9116)
-		$.each( ( $.ui.ddmanager.droppables[ draggable.options.scope ] || [] ).slice(), function() {
-
-			if ( !this.options ) {
-				return;
-			}
-			if ( !this.options.disabled && this.visible && $.ui.intersect( draggable, this, this.options.tolerance, event ) ) {
-				dropped = this._drop.call( this, event ) || dropped;
-			}
-
-			if ( !this.options.disabled && this.visible && this.accept.call( this.element[ 0 ], ( draggable.currentItem || draggable.element ) ) ) {
-				this.isout = true;
-				this.isover = false;
-				this._deactivate.call( this, event );
-			}
-
-		});
-		return dropped;
+	_destroy: function() {
+		this.element
+			.prop( "disabled", false )
+			.removeAttr( "autocomplete role aria-valuemin aria-valuemax aria-valuenow" );
 
+		this.uiSpinner.replaceWith( this.element );
 	},
-	dragStart: function( draggable, event ) {
-		// Listen for scrolling so that if the dragging causes scrolling the position of the droppables can be recalculated (see #5003)
-		draggable.element.parentsUntil( "body" ).bind( "scroll.droppable", function() {
-			if ( !draggable.options.refreshPositions ) {
-				$.ui.ddmanager.prepareOffsets( draggable, event );
-			}
-		});
-	},
-	drag: function( draggable, event ) {
 
-		// If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
-		if ( draggable.options.refreshPositions ) {
-			$.ui.ddmanager.prepareOffsets( draggable, event );
+	stepUp: spinnerModifer( function( steps ) {
+		this._stepUp( steps );
+	} ),
+	_stepUp: function( steps ) {
+		if ( this._start() ) {
+			this._spin( ( steps || 1 ) * this.options.step );
+			this._stop();
 		}
-
-		// Run through all droppables and check their positions based on specific tolerance options
-		$.each( $.ui.ddmanager.droppables[ draggable.options.scope ] || [], function() {
-
-			if ( this.options.disabled || this.greedyChild || !this.visible ) {
-				return;
-			}
-
-			var parentInstance, scope, parent,
-				intersects = $.ui.intersect( draggable, this, this.options.tolerance, event ),
-				c = !intersects && this.isover ? "isout" : ( intersects && !this.isover ? "isover" : null );
-			if ( !c ) {
-				return;
-			}
-
-			if ( this.options.greedy ) {
-				// find droppable parents with same scope
-				scope = this.options.scope;
-				parent = this.element.parents( ":data(ui-droppable)" ).filter(function() {
-					return $( this ).droppable( "instance" ).options.scope === scope;
-				});
-
-				if ( parent.length ) {
-					parentInstance = $( parent[ 0 ] ).droppable( "instance" );
-					parentInstance.greedyChild = ( c === "isover" );
-				}
-			}
-
-			// we just moved into a greedy child
-			if ( parentInstance && c === "isover" ) {
-				parentInstance.isover = false;
-				parentInstance.isout = true;
-				parentInstance._out.call( parentInstance, event );
-			}
-
-			this[ c ] = true;
-			this[c === "isout" ? "isover" : "isout"] = false;
-			this[c === "isover" ? "_over" : "_out"].call( this, event );
-
-			// we just moved out of a greedy child
-			if ( parentInstance && c === "isout" ) {
-				parentInstance.isout = false;
-				parentInstance.isover = true;
-				parentInstance._over.call( parentInstance, event );
-			}
-		});
-
 	},
-	dragStop: function( draggable, event ) {
-		draggable.element.parentsUntil( "body" ).unbind( "scroll.droppable" );
-		// Call prepareOffsets one final time since IE does not fire return scroll events when overflow was caused by drag (see #5003)
-		if ( !draggable.options.refreshPositions ) {
-			$.ui.ddmanager.prepareOffsets( draggable, event );
+
+	stepDown: spinnerModifer( function( steps ) {
+		this._stepDown( steps );
+	} ),
+	_stepDown: function( steps ) {
+		if ( this._start() ) {
+			this._spin( ( steps || 1 ) * -this.options.step );
+			this._stop();
 		}
+	},
+
+	pageUp: spinnerModifer( function( pages ) {
+		this._stepUp( ( pages || 1 ) * this.options.page );
+	} ),
+
+	pageDown: spinnerModifer( function( pages ) {
+		this._stepDown( ( pages || 1 ) * this.options.page );
+	} ),
+
+	value: function( newVal ) {
+		if ( !arguments.length ) {
+			return this._parse( this.element.val() );
+		}
+		spinnerModifer( this._value ).call( this, newVal );
+	},
+
+	widget: function() {
+		return this.uiSpinner;
 	}
-};
+} );
 
-var droppable = $.ui.droppable;
+// DEPRECATED
+// TODO: switch return back to widget declaration at top of file when this is removed
+if ( $.uiBackCompat !== false ) {
+
+	// Backcompat for spinner html extension points
+	$.widget( "ui.spinner", $.ui.spinner, {
+		_enhance: function() {
+			this.uiSpinner = this.element
+				.attr( "autocomplete", "off" )
+				.wrap( this._uiSpinnerHtml() )
+				.parent()
+
+					// Add buttons
+					.append( this._buttonHtml() );
+		},
+		_uiSpinnerHtml: function() {
+			return "<span>";
+		},
+
+		_buttonHtml: function() {
+			return "<a></a><a></a>";
+		}
+	} );
+}
+
+var widgetsSpinner = $.ui.spinner;
 
 
 /*!
- * jQuery UI Effects 1.11.4
+ * jQuery UI Tabs 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/category/effects-core/
  */
 
+//>>label: Tabs
+//>>group: Widgets
+//>>description: Transforms a set of container elements into a tab structure.
+//>>docs: http://api.jqueryui.com/tabs/
+//>>demos: http://jqueryui.com/tabs/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/tabs.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+$.widget( "ui.tabs", {
+	version: "1.12.1",
+	delay: 300,
+	options: {
+		active: null,
+		classes: {
+			"ui-tabs": "ui-corner-all",
+			"ui-tabs-nav": "ui-corner-all",
+			"ui-tabs-panel": "ui-corner-bottom",
+			"ui-tabs-tab": "ui-corner-top"
+		},
+		collapsible: false,
+		event: "click",
+		heightStyle: "content",
+		hide: null,
+		show: null,
+
+		// Callbacks
+		activate: null,
+		beforeActivate: null,
+		beforeLoad: null,
+		load: null
+	},
+
+	_isLocal: ( function() {
+		var rhash = /#.*$/;
+
+		return function( anchor ) {
+			var anchorUrl, locationUrl;
+
+			anchorUrl = anchor.href.replace( rhash, "" );
+			locationUrl = location.href.replace( rhash, "" );
+
+			// Decoding may throw an error if the URL isn't UTF-8 (#9518)
+			try {
+				anchorUrl = decodeURIComponent( anchorUrl );
+			} catch ( error ) {}
+			try {
+				locationUrl = decodeURIComponent( locationUrl );
+			} catch ( error ) {}
+
+			return anchor.hash.length > 1 && anchorUrl === locationUrl;
+		};
+	} )(),
+
+	_create: function() {
+		var that = this,
+			options = this.options;
+
+		this.running = false;
+
+		this._addClass( "ui-tabs", "ui-widget ui-widget-content" );
+		this._toggleClass( "ui-tabs-collapsible", null, options.collapsible );
+
+		this._processTabs();
+		options.active = this._initialActive();
+
+		// Take disabling tabs via class attribute from HTML
+		// into account and update option properly.
+		if ( $.isArray( options.disabled ) ) {
+			options.disabled = $.unique( options.disabled.concat(
+				$.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) {
+					return that.tabs.index( li );
+				} )
+			) ).sort();
+		}
+
+		// Check for length avoids error when initializing empty list
+		if ( this.options.active !== false && this.anchors.length ) {
+			this.active = this._findActive( options.active );
+		} else {
+			this.active = $();
+		}
+
+		this._refresh();
+
+		if ( this.active.length ) {
+			this.load( options.active );
+		}
+	},
+
+	_initialActive: function() {
+		var active = this.options.active,
+			collapsible = this.options.collapsible,
+			locationHash = location.hash.substring( 1 );
+
+		if ( active === null ) {
+
+			// check the fragment identifier in the URL
+			if ( locationHash ) {
+				this.tabs.each( function( i, tab ) {
+					if ( $( tab ).attr( "aria-controls" ) === locationHash ) {
+						active = i;
+						return false;
+					}
+				} );
+			}
+
+			// Check for a tab marked active via a class
+			if ( active === null ) {
+				active = this.tabs.index( this.tabs.filter( ".ui-tabs-active" ) );
+			}
+
+			// No active tab, set to false
+			if ( active === null || active === -1 ) {
+				active = this.tabs.length ? 0 : false;
+			}
+		}
+
+		// Handle numbers: negative, out of range
+		if ( active !== false ) {
+			active = this.tabs.index( this.tabs.eq( active ) );
+			if ( active === -1 ) {
+				active = collapsible ? false : 0;
+			}
+		}
+
+		// Don't allow collapsible: false and active: false
+		if ( !collapsible && active === false && this.anchors.length ) {
+			active = 0;
+		}
+
+		return active;
+	},
+
+	_getCreateEventData: function() {
+		return {
+			tab: this.active,
+			panel: !this.active.length ? $() : this._getPanelForTab( this.active )
+		};
+	},
+
+	_tabKeydown: function( event ) {
+		var focusedTab = $( $.ui.safeActiveElement( this.document[ 0 ] ) ).closest( "li" ),
+			selectedIndex = this.tabs.index( focusedTab ),
+			goingForward = true;
+
+		if ( this._handlePageNav( event ) ) {
+			return;
+		}
+
+		switch ( event.keyCode ) {
+		case $.ui.keyCode.RIGHT:
+		case $.ui.keyCode.DOWN:
+			selectedIndex++;
+			break;
+		case $.ui.keyCode.UP:
+		case $.ui.keyCode.LEFT:
+			goingForward = false;
+			selectedIndex--;
+			break;
+		case $.ui.keyCode.END:
+			selectedIndex = this.anchors.length - 1;
+			break;
+		case $.ui.keyCode.HOME:
+			selectedIndex = 0;
+			break;
+		case $.ui.keyCode.SPACE:
+
+			// Activate only, no collapsing
+			event.preventDefault();
+			clearTimeout( this.activating );
+			this._activate( selectedIndex );
+			return;
+		case $.ui.keyCode.ENTER:
+
+			// Toggle (cancel delayed activation, allow collapsing)
+			event.preventDefault();
+			clearTimeout( this.activating );
+
+			// Determine if we should collapse or activate
+			this._activate( selectedIndex === this.options.active ? false : selectedIndex );
+			return;
+		default:
+			return;
+		}
+
+		// Focus the appropriate tab, based on which key was pressed
+		event.preventDefault();
+		clearTimeout( this.activating );
+		selectedIndex = this._focusNextTab( selectedIndex, goingForward );
+
+		// Navigating with control/command key will prevent automatic activation
+		if ( !event.ctrlKey && !event.metaKey ) {
+
+			// Update aria-selected immediately so that AT think the tab is already selected.
+			// Otherwise AT may confuse the user by stating that they need to activate the tab,
+			// but the tab will already be activated by the time the announcement finishes.
+			focusedTab.attr( "aria-selected", "false" );
+			this.tabs.eq( selectedIndex ).attr( "aria-selected", "true" );
+
+			this.activating = this._delay( function() {
+				this.option( "active", selectedIndex );
+			}, this.delay );
+		}
+	},
+
+	_panelKeydown: function( event ) {
+		if ( this._handlePageNav( event ) ) {
+			return;
+		}
+
+		// Ctrl+up moves focus to the current tab
+		if ( event.ctrlKey && event.keyCode === $.ui.keyCode.UP ) {
+			event.preventDefault();
+			this.active.trigger( "focus" );
+		}
+	},
+
+	// Alt+page up/down moves focus to the previous/next tab (and activates)
+	_handlePageNav: function( event ) {
+		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_UP ) {
+			this._activate( this._focusNextTab( this.options.active - 1, false ) );
+			return true;
+		}
+		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_DOWN ) {
+			this._activate( this._focusNextTab( this.options.active + 1, true ) );
+			return true;
+		}
+	},
+
+	_findNextTab: function( index, goingForward ) {
+		var lastTabIndex = this.tabs.length - 1;
+
+		function constrain() {
+			if ( index > lastTabIndex ) {
+				index = 0;
+			}
+			if ( index < 0 ) {
+				index = lastTabIndex;
+			}
+			return index;
+		}
+
+		while ( $.inArray( constrain(), this.options.disabled ) !== -1 ) {
+			index = goingForward ? index + 1 : index - 1;
+		}
+
+		return index;
+	},
+
+	_focusNextTab: function( index, goingForward ) {
+		index = this._findNextTab( index, goingForward );
+		this.tabs.eq( index ).trigger( "focus" );
+		return index;
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "active" ) {
+
+			// _activate() will handle invalid values and update this.options
+			this._activate( value );
+			return;
+		}
+
+		this._super( key, value );
+
+		if ( key === "collapsible" ) {
+			this._toggleClass( "ui-tabs-collapsible", null, value );
+
+			// Setting collapsible: false while collapsed; open first panel
+			if ( !value && this.options.active === false ) {
+				this._activate( 0 );
+			}
+		}
+
+		if ( key === "event" ) {
+			this._setupEvents( value );
+		}
+
+		if ( key === "heightStyle" ) {
+			this._setupHeightStyle( value );
+		}
+	},
+
+	_sanitizeSelector: function( hash ) {
+		return hash ? hash.replace( /[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g, "\\$&" ) : "";
+	},
+
+	refresh: function() {
+		var options = this.options,
+			lis = this.tablist.children( ":has(a[href])" );
+
+		// Get disabled tabs from class attribute from HTML
+		// this will get converted to a boolean if needed in _refresh()
+		options.disabled = $.map( lis.filter( ".ui-state-disabled" ), function( tab ) {
+			return lis.index( tab );
+		} );
+
+		this._processTabs();
+
+		// Was collapsed or no tabs
+		if ( options.active === false || !this.anchors.length ) {
+			options.active = false;
+			this.active = $();
+
+		// was active, but active tab is gone
+		} else if ( this.active.length && !$.contains( this.tablist[ 0 ], this.active[ 0 ] ) ) {
+
+			// all remaining tabs are disabled
+			if ( this.tabs.length === options.disabled.length ) {
+				options.active = false;
+				this.active = $();
+
+			// activate previous tab
+			} else {
+				this._activate( this._findNextTab( Math.max( 0, options.active - 1 ), false ) );
+			}
+
+		// was active, active tab still exists
+		} else {
+
+			// make sure active index is correct
+			options.active = this.tabs.index( this.active );
+		}
+
+		this._refresh();
+	},
+
+	_refresh: function() {
+		this._setOptionDisabled( this.options.disabled );
+		this._setupEvents( this.options.event );
+		this._setupHeightStyle( this.options.heightStyle );
+
+		this.tabs.not( this.active ).attr( {
+			"aria-selected": "false",
+			"aria-expanded": "false",
+			tabIndex: -1
+		} );
+		this.panels.not( this._getPanelForTab( this.active ) )
+			.hide()
+			.attr( {
+				"aria-hidden": "true"
+			} );
+
+		// Make sure one tab is in the tab order
+		if ( !this.active.length ) {
+			this.tabs.eq( 0 ).attr( "tabIndex", 0 );
+		} else {
+			this.active
+				.attr( {
+					"aria-selected": "true",
+					"aria-expanded": "true",
+					tabIndex: 0
+				} );
+			this._addClass( this.active, "ui-tabs-active", "ui-state-active" );
+			this._getPanelForTab( this.active )
+				.show()
+				.attr( {
+					"aria-hidden": "false"
+				} );
+		}
+	},
+
+	_processTabs: function() {
+		var that = this,
+			prevTabs = this.tabs,
+			prevAnchors = this.anchors,
+			prevPanels = this.panels;
+
+		this.tablist = this._getList().attr( "role", "tablist" );
+		this._addClass( this.tablist, "ui-tabs-nav",
+			"ui-helper-reset ui-helper-clearfix ui-widget-header" );
+
+		// Prevent users from focusing disabled tabs via click
+		this.tablist
+			.on( "mousedown" + this.eventNamespace, "> li", function( event ) {
+				if ( $( this ).is( ".ui-state-disabled" ) ) {
+					event.preventDefault();
+				}
+			} )
+
+			// Support: IE <9
+			// Preventing the default action in mousedown doesn't prevent IE
+			// from focusing the element, so if the anchor gets focused, blur.
+			// We don't have to worry about focusing the previously focused
+			// element since clicking on a non-focusable element should focus
+			// the body anyway.
+			.on( "focus" + this.eventNamespace, ".ui-tabs-anchor", function() {
+				if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
+					this.blur();
+				}
+			} );
+
+		this.tabs = this.tablist.find( "> li:has(a[href])" )
+			.attr( {
+				role: "tab",
+				tabIndex: -1
+			} );
+		this._addClass( this.tabs, "ui-tabs-tab", "ui-state-default" );
+
+		this.anchors = this.tabs.map( function() {
+			return $( "a", this )[ 0 ];
+		} )
+			.attr( {
+				role: "presentation",
+				tabIndex: -1
+			} );
+		this._addClass( this.anchors, "ui-tabs-anchor" );
+
+		this.panels = $();
+
+		this.anchors.each( function( i, anchor ) {
+			var selector, panel, panelId,
+				anchorId = $( anchor ).uniqueId().attr( "id" ),
+				tab = $( anchor ).closest( "li" ),
+				originalAriaControls = tab.attr( "aria-controls" );
+
+			// Inline tab
+			if ( that._isLocal( anchor ) ) {
+				selector = anchor.hash;
+				panelId = selector.substring( 1 );
+				panel = that.element.find( that._sanitizeSelector( selector ) );
+
+			// remote tab
+			} else {
+
+				// If the tab doesn't already have aria-controls,
+				// generate an id by using a throw-away element
+				panelId = tab.attr( "aria-controls" ) || $( {} ).uniqueId()[ 0 ].id;
+				selector = "#" + panelId;
+				panel = that.element.find( selector );
+				if ( !panel.length ) {
+					panel = that._createPanel( panelId );
+					panel.insertAfter( that.panels[ i - 1 ] || that.tablist );
+				}
+				panel.attr( "aria-live", "polite" );
+			}
+
+			if ( panel.length ) {
+				that.panels = that.panels.add( panel );
+			}
+			if ( originalAriaControls ) {
+				tab.data( "ui-tabs-aria-controls", originalAriaControls );
+			}
+			tab.attr( {
+				"aria-controls": panelId,
+				"aria-labelledby": anchorId
+			} );
+			panel.attr( "aria-labelledby", anchorId );
+		} );
+
+		this.panels.attr( "role", "tabpanel" );
+		this._addClass( this.panels, "ui-tabs-panel", "ui-widget-content" );
+
+		// Avoid memory leaks (#10056)
+		if ( prevTabs ) {
+			this._off( prevTabs.not( this.tabs ) );
+			this._off( prevAnchors.not( this.anchors ) );
+			this._off( prevPanels.not( this.panels ) );
+		}
+	},
+
+	// Allow overriding how to find the list for rare usage scenarios (#7715)
+	_getList: function() {
+		return this.tablist || this.element.find( "ol, ul" ).eq( 0 );
+	},
+
+	_createPanel: function( id ) {
+		return $( "<div>" )
+			.attr( "id", id )
+			.data( "ui-tabs-destroy", true );
+	},
+
+	_setOptionDisabled: function( disabled ) {
+		var currentItem, li, i;
+
+		if ( $.isArray( disabled ) ) {
+			if ( !disabled.length ) {
+				disabled = false;
+			} else if ( disabled.length === this.anchors.length ) {
+				disabled = true;
+			}
+		}
+
+		// Disable tabs
+		for ( i = 0; ( li = this.tabs[ i ] ); i++ ) {
+			currentItem = $( li );
+			if ( disabled === true || $.inArray( i, disabled ) !== -1 ) {
+				currentItem.attr( "aria-disabled", "true" );
+				this._addClass( currentItem, null, "ui-state-disabled" );
+			} else {
+				currentItem.removeAttr( "aria-disabled" );
+				this._removeClass( currentItem, null, "ui-state-disabled" );
+			}
+		}
+
+		this.options.disabled = disabled;
+
+		this._toggleClass( this.widget(), this.widgetFullName + "-disabled", null,
+			disabled === true );
+	},
+
+	_setupEvents: function( event ) {
+		var events = {};
+		if ( event ) {
+			$.each( event.split( " " ), function( index, eventName ) {
+				events[ eventName ] = "_eventHandler";
+			} );
+		}
+
+		this._off( this.anchors.add( this.tabs ).add( this.panels ) );
+
+		// Always prevent the default action, even when disabled
+		this._on( true, this.anchors, {
+			click: function( event ) {
+				event.preventDefault();
+			}
+		} );
+		this._on( this.anchors, events );
+		this._on( this.tabs, { keydown: "_tabKeydown" } );
+		this._on( this.panels, { keydown: "_panelKeydown" } );
+
+		this._focusable( this.tabs );
+		this._hoverable( this.tabs );
+	},
+
+	_setupHeightStyle: function( heightStyle ) {
+		var maxHeight,
+			parent = this.element.parent();
+
+		if ( heightStyle === "fill" ) {
+			maxHeight = parent.height();
+			maxHeight -= this.element.outerHeight() - this.element.height();
+
+			this.element.siblings( ":visible" ).each( function() {
+				var elem = $( this ),
+					position = elem.css( "position" );
+
+				if ( position === "absolute" || position === "fixed" ) {
+					return;
+				}
+				maxHeight -= elem.outerHeight( true );
+			} );
+
+			this.element.children().not( this.panels ).each( function() {
+				maxHeight -= $( this ).outerHeight( true );
+			} );
+
+			this.panels.each( function() {
+				$( this ).height( Math.max( 0, maxHeight -
+					$( this ).innerHeight() + $( this ).height() ) );
+			} )
+				.css( "overflow", "auto" );
+		} else if ( heightStyle === "auto" ) {
+			maxHeight = 0;
+			this.panels.each( function() {
+				maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
+			} ).height( maxHeight );
+		}
+	},
+
+	_eventHandler: function( event ) {
+		var options = this.options,
+			active = this.active,
+			anchor = $( event.currentTarget ),
+			tab = anchor.closest( "li" ),
+			clickedIsActive = tab[ 0 ] === active[ 0 ],
+			collapsing = clickedIsActive && options.collapsible,
+			toShow = collapsing ? $() : this._getPanelForTab( tab ),
+			toHide = !active.length ? $() : this._getPanelForTab( active ),
+			eventData = {
+				oldTab: active,
+				oldPanel: toHide,
+				newTab: collapsing ? $() : tab,
+				newPanel: toShow
+			};
+
+		event.preventDefault();
+
+		if ( tab.hasClass( "ui-state-disabled" ) ||
+
+				// tab is already loading
+				tab.hasClass( "ui-tabs-loading" ) ||
+
+				// can't switch durning an animation
+				this.running ||
+
+				// click on active header, but not collapsible
+				( clickedIsActive && !options.collapsible ) ||
+
+				// allow canceling activation
+				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
+			return;
+		}
+
+		options.active = collapsing ? false : this.tabs.index( tab );
+
+		this.active = clickedIsActive ? $() : tab;
+		if ( this.xhr ) {
+			this.xhr.abort();
+		}
+
+		if ( !toHide.length && !toShow.length ) {
+			$.error( "jQuery UI Tabs: Mismatching fragment identifier." );
+		}
+
+		if ( toShow.length ) {
+			this.load( this.tabs.index( tab ), event );
+		}
+		this._toggle( event, eventData );
+	},
+
+	// Handles show/hide for selecting tabs
+	_toggle: function( event, eventData ) {
+		var that = this,
+			toShow = eventData.newPanel,
+			toHide = eventData.oldPanel;
+
+		this.running = true;
+
+		function complete() {
+			that.running = false;
+			that._trigger( "activate", event, eventData );
+		}
+
+		function show() {
+			that._addClass( eventData.newTab.closest( "li" ), "ui-tabs-active", "ui-state-active" );
+
+			if ( toShow.length && that.options.show ) {
+				that._show( toShow, that.options.show, complete );
+			} else {
+				toShow.show();
+				complete();
+			}
+		}
+
+		// Start out by hiding, then showing, then completing
+		if ( toHide.length && this.options.hide ) {
+			this._hide( toHide, this.options.hide, function() {
+				that._removeClass( eventData.oldTab.closest( "li" ),
+					"ui-tabs-active", "ui-state-active" );
+				show();
+			} );
+		} else {
+			this._removeClass( eventData.oldTab.closest( "li" ),
+				"ui-tabs-active", "ui-state-active" );
+			toHide.hide();
+			show();
+		}
+
+		toHide.attr( "aria-hidden", "true" );
+		eventData.oldTab.attr( {
+			"aria-selected": "false",
+			"aria-expanded": "false"
+		} );
+
+		// If we're switching tabs, remove the old tab from the tab order.
+		// If we're opening from collapsed state, remove the previous tab from the tab order.
+		// If we're collapsing, then keep the collapsing tab in the tab order.
+		if ( toShow.length && toHide.length ) {
+			eventData.oldTab.attr( "tabIndex", -1 );
+		} else if ( toShow.length ) {
+			this.tabs.filter( function() {
+				return $( this ).attr( "tabIndex" ) === 0;
+			} )
+				.attr( "tabIndex", -1 );
+		}
+
+		toShow.attr( "aria-hidden", "false" );
+		eventData.newTab.attr( {
+			"aria-selected": "true",
+			"aria-expanded": "true",
+			tabIndex: 0
+		} );
+	},
+
+	_activate: function( index ) {
+		var anchor,
+			active = this._findActive( index );
+
+		// Trying to activate the already active panel
+		if ( active[ 0 ] === this.active[ 0 ] ) {
+			return;
+		}
+
+		// Trying to collapse, simulate a click on the current active header
+		if ( !active.length ) {
+			active = this.active;
+		}
+
+		anchor = active.find( ".ui-tabs-anchor" )[ 0 ];
+		this._eventHandler( {
+			target: anchor,
+			currentTarget: anchor,
+			preventDefault: $.noop
+		} );
+	},
+
+	_findActive: function( index ) {
+		return index === false ? $() : this.tabs.eq( index );
+	},
+
+	_getIndex: function( index ) {
+
+		// meta-function to give users option to provide a href string instead of a numerical index.
+		if ( typeof index === "string" ) {
+			index = this.anchors.index( this.anchors.filter( "[href$='" +
+				$.ui.escapeSelector( index ) + "']" ) );
+		}
+
+		return index;
+	},
+
+	_destroy: function() {
+		if ( this.xhr ) {
+			this.xhr.abort();
+		}
+
+		this.tablist
+			.removeAttr( "role" )
+			.off( this.eventNamespace );
+
+		this.anchors
+			.removeAttr( "role tabIndex" )
+			.removeUniqueId();
+
+		this.tabs.add( this.panels ).each( function() {
+			if ( $.data( this, "ui-tabs-destroy" ) ) {
+				$( this ).remove();
+			} else {
+				$( this ).removeAttr( "role tabIndex " +
+					"aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded" );
+			}
+		} );
+
+		this.tabs.each( function() {
+			var li = $( this ),
+				prev = li.data( "ui-tabs-aria-controls" );
+			if ( prev ) {
+				li
+					.attr( "aria-controls", prev )
+					.removeData( "ui-tabs-aria-controls" );
+			} else {
+				li.removeAttr( "aria-controls" );
+			}
+		} );
+
+		this.panels.show();
+
+		if ( this.options.heightStyle !== "content" ) {
+			this.panels.css( "height", "" );
+		}
+	},
+
+	enable: function( index ) {
+		var disabled = this.options.disabled;
+		if ( disabled === false ) {
+			return;
+		}
+
+		if ( index === undefined ) {
+			disabled = false;
+		} else {
+			index = this._getIndex( index );
+			if ( $.isArray( disabled ) ) {
+				disabled = $.map( disabled, function( num ) {
+					return num !== index ? num : null;
+				} );
+			} else {
+				disabled = $.map( this.tabs, function( li, num ) {
+					return num !== index ? num : null;
+				} );
+			}
+		}
+		this._setOptionDisabled( disabled );
+	},
+
+	disable: function( index ) {
+		var disabled = this.options.disabled;
+		if ( disabled === true ) {
+			return;
+		}
+
+		if ( index === undefined ) {
+			disabled = true;
+		} else {
+			index = this._getIndex( index );
+			if ( $.inArray( index, disabled ) !== -1 ) {
+				return;
+			}
+			if ( $.isArray( disabled ) ) {
+				disabled = $.merge( [ index ], disabled ).sort();
+			} else {
+				disabled = [ index ];
+			}
+		}
+		this._setOptionDisabled( disabled );
+	},
+
+	load: function( index, event ) {
+		index = this._getIndex( index );
+		var that = this,
+			tab = this.tabs.eq( index ),
+			anchor = tab.find( ".ui-tabs-anchor" ),
+			panel = this._getPanelForTab( tab ),
+			eventData = {
+				tab: tab,
+				panel: panel
+			},
+			complete = function( jqXHR, status ) {
+				if ( status === "abort" ) {
+					that.panels.stop( false, true );
+				}
+
+				that._removeClass( tab, "ui-tabs-loading" );
+				panel.removeAttr( "aria-busy" );
+
+				if ( jqXHR === that.xhr ) {
+					delete that.xhr;
+				}
+			};
+
+		// Not remote
+		if ( this._isLocal( anchor[ 0 ] ) ) {
+			return;
+		}
+
+		this.xhr = $.ajax( this._ajaxSettings( anchor, event, eventData ) );
+
+		// Support: jQuery <1.8
+		// jQuery <1.8 returns false if the request is canceled in beforeSend,
+		// but as of 1.8, $.ajax() always returns a jqXHR object.
+		if ( this.xhr && this.xhr.statusText !== "canceled" ) {
+			this._addClass( tab, "ui-tabs-loading" );
+			panel.attr( "aria-busy", "true" );
+
+			this.xhr
+				.done( function( response, status, jqXHR ) {
+
+					// support: jQuery <1.8
+					// http://bugs.jquery.com/ticket/11778
+					setTimeout( function() {
+						panel.html( response );
+						that._trigger( "load", event, eventData );
+
+						complete( jqXHR, status );
+					}, 1 );
+				} )
+				.fail( function( jqXHR, status ) {
+
+					// support: jQuery <1.8
+					// http://bugs.jquery.com/ticket/11778
+					setTimeout( function() {
+						complete( jqXHR, status );
+					}, 1 );
+				} );
+		}
+	},
+
+	_ajaxSettings: function( anchor, event, eventData ) {
+		var that = this;
+		return {
+
+			// Support: IE <11 only
+			// Strip any hash that exists to prevent errors with the Ajax request
+			url: anchor.attr( "href" ).replace( /#.*$/, "" ),
+			beforeSend: function( jqXHR, settings ) {
+				return that._trigger( "beforeLoad", event,
+					$.extend( { jqXHR: jqXHR, ajaxSettings: settings }, eventData ) );
+			}
+		};
+	},
+
+	_getPanelForTab: function( tab ) {
+		var id = $( tab ).attr( "aria-controls" );
+		return this.element.find( this._sanitizeSelector( "#" + id ) );
+	}
+} );
+
+// DEPRECATED
+// TODO: Switch return back to widget declaration at top of file when this is removed
+if ( $.uiBackCompat !== false ) {
+
+	// Backcompat for ui-tab class (now ui-tabs-tab)
+	$.widget( "ui.tabs", $.ui.tabs, {
+		_processTabs: function() {
+			this._superApply( arguments );
+			this._addClass( this.tabs, "ui-tab" );
+		}
+	} );
+}
+
+var widgetsTabs = $.ui.tabs;
+
+
+/*!
+ * jQuery UI Tooltip 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Tooltip
+//>>group: Widgets
+//>>description: Shows additional information for any element on hover or focus.
+//>>docs: http://api.jqueryui.com/tooltip/
+//>>demos: http://jqueryui.com/tooltip/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/tooltip.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+$.widget( "ui.tooltip", {
+	version: "1.12.1",
+	options: {
+		classes: {
+			"ui-tooltip": "ui-corner-all ui-widget-shadow"
+		},
+		content: function() {
+
+			// support: IE<9, Opera in jQuery <1.7
+			// .text() can't accept undefined, so coerce to a string
+			var title = $( this ).attr( "title" ) || "";
+
+			// Escape title, since we're going from an attribute to raw HTML
+			return $( "<a>" ).text( title ).html();
+		},
+		hide: true,
+
+		// Disabled elements have inconsistent behavior across browsers (#8661)
+		items: "[title]:not([disabled])",
+		position: {
+			my: "left top+15",
+			at: "left bottom",
+			collision: "flipfit flip"
+		},
+		show: true,
+		track: false,
+
+		// Callbacks
+		close: null,
+		open: null
+	},
+
+	_addDescribedBy: function( elem, id ) {
+		var describedby = ( elem.attr( "aria-describedby" ) || "" ).split( /\s+/ );
+		describedby.push( id );
+		elem
+			.data( "ui-tooltip-id", id )
+			.attr( "aria-describedby", $.trim( describedby.join( " " ) ) );
+	},
+
+	_removeDescribedBy: function( elem ) {
+		var id = elem.data( "ui-tooltip-id" ),
+			describedby = ( elem.attr( "aria-describedby" ) || "" ).split( /\s+/ ),
+			index = $.inArray( id, describedby );
+
+		if ( index !== -1 ) {
+			describedby.splice( index, 1 );
+		}
+
+		elem.removeData( "ui-tooltip-id" );
+		describedby = $.trim( describedby.join( " " ) );
+		if ( describedby ) {
+			elem.attr( "aria-describedby", describedby );
+		} else {
+			elem.removeAttr( "aria-describedby" );
+		}
+	},
+
+	_create: function() {
+		this._on( {
+			mouseover: "open",
+			focusin: "open"
+		} );
+
+		// IDs of generated tooltips, needed for destroy
+		this.tooltips = {};
+
+		// IDs of parent tooltips where we removed the title attribute
+		this.parents = {};
+
+		// Append the aria-live region so tooltips announce correctly
+		this.liveRegion = $( "<div>" )
+			.attr( {
+				role: "log",
+				"aria-live": "assertive",
+				"aria-relevant": "additions"
+			} )
+			.appendTo( this.document[ 0 ].body );
+		this._addClass( this.liveRegion, null, "ui-helper-hidden-accessible" );
+
+		this.disabledTitles = $( [] );
+	},
+
+	_setOption: function( key, value ) {
+		var that = this;
+
+		this._super( key, value );
+
+		if ( key === "content" ) {
+			$.each( this.tooltips, function( id, tooltipData ) {
+				that._updateContent( tooltipData.element );
+			} );
+		}
+	},
+
+	_setOptionDisabled: function( value ) {
+		this[ value ? "_disable" : "_enable" ]();
+	},
+
+	_disable: function() {
+		var that = this;
+
+		// Close open tooltips
+		$.each( this.tooltips, function( id, tooltipData ) {
+			var event = $.Event( "blur" );
+			event.target = event.currentTarget = tooltipData.element[ 0 ];
+			that.close( event, true );
+		} );
+
+		// Remove title attributes to prevent native tooltips
+		this.disabledTitles = this.disabledTitles.add(
+			this.element.find( this.options.items ).addBack()
+				.filter( function() {
+					var element = $( this );
+					if ( element.is( "[title]" ) ) {
+						return element
+							.data( "ui-tooltip-title", element.attr( "title" ) )
+							.removeAttr( "title" );
+					}
+				} )
+		);
+	},
+
+	_enable: function() {
+
+		// restore title attributes
+		this.disabledTitles.each( function() {
+			var element = $( this );
+			if ( element.data( "ui-tooltip-title" ) ) {
+				element.attr( "title", element.data( "ui-tooltip-title" ) );
+			}
+		} );
+		this.disabledTitles = $( [] );
+	},
+
+	open: function( event ) {
+		var that = this,
+			target = $( event ? event.target : this.element )
+
+				// we need closest here due to mouseover bubbling,
+				// but always pointing at the same event target
+				.closest( this.options.items );
+
+		// No element to show a tooltip for or the tooltip is already open
+		if ( !target.length || target.data( "ui-tooltip-id" ) ) {
+			return;
+		}
+
+		if ( target.attr( "title" ) ) {
+			target.data( "ui-tooltip-title", target.attr( "title" ) );
+		}
+
+		target.data( "ui-tooltip-open", true );
+
+		// Kill parent tooltips, custom or native, for hover
+		if ( event && event.type === "mouseover" ) {
+			target.parents().each( function() {
+				var parent = $( this ),
+					blurEvent;
+				if ( parent.data( "ui-tooltip-open" ) ) {
+					blurEvent = $.Event( "blur" );
+					blurEvent.target = blurEvent.currentTarget = this;
+					that.close( blurEvent, true );
+				}
+				if ( parent.attr( "title" ) ) {
+					parent.uniqueId();
+					that.parents[ this.id ] = {
+						element: this,
+						title: parent.attr( "title" )
+					};
+					parent.attr( "title", "" );
+				}
+			} );
+		}
+
+		this._registerCloseHandlers( event, target );
+		this._updateContent( target, event );
+	},
+
+	_updateContent: function( target, event ) {
+		var content,
+			contentOption = this.options.content,
+			that = this,
+			eventType = event ? event.type : null;
+
+		if ( typeof contentOption === "string" || contentOption.nodeType ||
+				contentOption.jquery ) {
+			return this._open( event, target, contentOption );
+		}
+
+		content = contentOption.call( target[ 0 ], function( response ) {
+
+			// IE may instantly serve a cached response for ajax requests
+			// delay this call to _open so the other call to _open runs first
+			that._delay( function() {
+
+				// Ignore async response if tooltip was closed already
+				if ( !target.data( "ui-tooltip-open" ) ) {
+					return;
+				}
+
+				// JQuery creates a special event for focusin when it doesn't
+				// exist natively. To improve performance, the native event
+				// object is reused and the type is changed. Therefore, we can't
+				// rely on the type being correct after the event finished
+				// bubbling, so we set it back to the previous value. (#8740)
+				if ( event ) {
+					event.type = eventType;
+				}
+				this._open( event, target, response );
+			} );
+		} );
+		if ( content ) {
+			this._open( event, target, content );
+		}
+	},
+
+	_open: function( event, target, content ) {
+		var tooltipData, tooltip, delayedShow, a11yContent,
+			positionOption = $.extend( {}, this.options.position );
+
+		if ( !content ) {
+			return;
+		}
+
+		// Content can be updated multiple times. If the tooltip already
+		// exists, then just update the content and bail.
+		tooltipData = this._find( target );
+		if ( tooltipData ) {
+			tooltipData.tooltip.find( ".ui-tooltip-content" ).html( content );
+			return;
+		}
+
+		// If we have a title, clear it to prevent the native tooltip
+		// we have to check first to avoid defining a title if none exists
+		// (we don't want to cause an element to start matching [title])
+		//
+		// We use removeAttr only for key events, to allow IE to export the correct
+		// accessible attributes. For mouse events, set to empty string to avoid
+		// native tooltip showing up (happens only when removing inside mouseover).
+		if ( target.is( "[title]" ) ) {
+			if ( event && event.type === "mouseover" ) {
+				target.attr( "title", "" );
+			} else {
+				target.removeAttr( "title" );
+			}
+		}
+
+		tooltipData = this._tooltip( target );
+		tooltip = tooltipData.tooltip;
+		this._addDescribedBy( target, tooltip.attr( "id" ) );
+		tooltip.find( ".ui-tooltip-content" ).html( content );
+
+		// Support: Voiceover on OS X, JAWS on IE <= 9
+		// JAWS announces deletions even when aria-relevant="additions"
+		// Voiceover will sometimes re-read the entire log region's contents from the beginning
+		this.liveRegion.children().hide();
+		a11yContent = $( "<div>" ).html( tooltip.find( ".ui-tooltip-content" ).html() );
+		a11yContent.removeAttr( "name" ).find( "[name]" ).removeAttr( "name" );
+		a11yContent.removeAttr( "id" ).find( "[id]" ).removeAttr( "id" );
+		a11yContent.appendTo( this.liveRegion );
+
+		function position( event ) {
+			positionOption.of = event;
+			if ( tooltip.is( ":hidden" ) ) {
+				return;
+			}
+			tooltip.position( positionOption );
+		}
+		if ( this.options.track && event && /^mouse/.test( event.type ) ) {
+			this._on( this.document, {
+				mousemove: position
+			} );
+
+			// trigger once to override element-relative positioning
+			position( event );
+		} else {
+			tooltip.position( $.extend( {
+				of: target
+			}, this.options.position ) );
+		}
+
+		tooltip.hide();
+
+		this._show( tooltip, this.options.show );
+
+		// Handle tracking tooltips that are shown with a delay (#8644). As soon
+		// as the tooltip is visible, position the tooltip using the most recent
+		// event.
+		// Adds the check to add the timers only when both delay and track options are set (#14682)
+		if ( this.options.track && this.options.show && this.options.show.delay ) {
+			delayedShow = this.delayedShow = setInterval( function() {
+				if ( tooltip.is( ":visible" ) ) {
+					position( positionOption.of );
+					clearInterval( delayedShow );
+				}
+			}, $.fx.interval );
+		}
+
+		this._trigger( "open", event, { tooltip: tooltip } );
+	},
+
+	_registerCloseHandlers: function( event, target ) {
+		var events = {
+			keyup: function( event ) {
+				if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
+					var fakeEvent = $.Event( event );
+					fakeEvent.currentTarget = target[ 0 ];
+					this.close( fakeEvent, true );
+				}
+			}
+		};
+
+		// Only bind remove handler for delegated targets. Non-delegated
+		// tooltips will handle this in destroy.
+		if ( target[ 0 ] !== this.element[ 0 ] ) {
+			events.remove = function() {
+				this._removeTooltip( this._find( target ).tooltip );
+			};
+		}
+
+		if ( !event || event.type === "mouseover" ) {
+			events.mouseleave = "close";
+		}
+		if ( !event || event.type === "focusin" ) {
+			events.focusout = "close";
+		}
+		this._on( true, target, events );
+	},
+
+	close: function( event ) {
+		var tooltip,
+			that = this,
+			target = $( event ? event.currentTarget : this.element ),
+			tooltipData = this._find( target );
+
+		// The tooltip may already be closed
+		if ( !tooltipData ) {
+
+			// We set ui-tooltip-open immediately upon open (in open()), but only set the
+			// additional data once there's actually content to show (in _open()). So even if the
+			// tooltip doesn't have full data, we always remove ui-tooltip-open in case we're in
+			// the period between open() and _open().
+			target.removeData( "ui-tooltip-open" );
+			return;
+		}
+
+		tooltip = tooltipData.tooltip;
+
+		// Disabling closes the tooltip, so we need to track when we're closing
+		// to avoid an infinite loop in case the tooltip becomes disabled on close
+		if ( tooltipData.closing ) {
+			return;
+		}
+
+		// Clear the interval for delayed tracking tooltips
+		clearInterval( this.delayedShow );
+
+		// Only set title if we had one before (see comment in _open())
+		// If the title attribute has changed since open(), don't restore
+		if ( target.data( "ui-tooltip-title" ) && !target.attr( "title" ) ) {
+			target.attr( "title", target.data( "ui-tooltip-title" ) );
+		}
+
+		this._removeDescribedBy( target );
+
+		tooltipData.hiding = true;
+		tooltip.stop( true );
+		this._hide( tooltip, this.options.hide, function() {
+			that._removeTooltip( $( this ) );
+		} );
+
+		target.removeData( "ui-tooltip-open" );
+		this._off( target, "mouseleave focusout keyup" );
+
+		// Remove 'remove' binding only on delegated targets
+		if ( target[ 0 ] !== this.element[ 0 ] ) {
+			this._off( target, "remove" );
+		}
+		this._off( this.document, "mousemove" );
+
+		if ( event && event.type === "mouseleave" ) {
+			$.each( this.parents, function( id, parent ) {
+				$( parent.element ).attr( "title", parent.title );
+				delete that.parents[ id ];
+			} );
+		}
+
+		tooltipData.closing = true;
+		this._trigger( "close", event, { tooltip: tooltip } );
+		if ( !tooltipData.hiding ) {
+			tooltipData.closing = false;
+		}
+	},
+
+	_tooltip: function( element ) {
+		var tooltip = $( "<div>" ).attr( "role", "tooltip" ),
+			content = $( "<div>" ).appendTo( tooltip ),
+			id = tooltip.uniqueId().attr( "id" );
+
+		this._addClass( content, "ui-tooltip-content" );
+		this._addClass( tooltip, "ui-tooltip", "ui-widget ui-widget-content" );
+
+		tooltip.appendTo( this._appendTo( element ) );
+
+		return this.tooltips[ id ] = {
+			element: element,
+			tooltip: tooltip
+		};
+	},
+
+	_find: function( target ) {
+		var id = target.data( "ui-tooltip-id" );
+		return id ? this.tooltips[ id ] : null;
+	},
+
+	_removeTooltip: function( tooltip ) {
+		tooltip.remove();
+		delete this.tooltips[ tooltip.attr( "id" ) ];
+	},
+
+	_appendTo: function( target ) {
+		var element = target.closest( ".ui-front, dialog" );
+
+		if ( !element.length ) {
+			element = this.document[ 0 ].body;
+		}
+
+		return element;
+	},
+
+	_destroy: function() {
+		var that = this;
+
+		// Close open tooltips
+		$.each( this.tooltips, function( id, tooltipData ) {
+
+			// Delegate to close method to handle common cleanup
+			var event = $.Event( "blur" ),
+				element = tooltipData.element;
+			event.target = event.currentTarget = element[ 0 ];
+			that.close( event, true );
+
+			// Remove immediately; destroying an open tooltip doesn't use the
+			// hide animation
+			$( "#" + id ).remove();
+
+			// Restore the title
+			if ( element.data( "ui-tooltip-title" ) ) {
+
+				// If the title attribute has changed since open(), don't restore
+				if ( !element.attr( "title" ) ) {
+					element.attr( "title", element.data( "ui-tooltip-title" ) );
+				}
+				element.removeData( "ui-tooltip-title" );
+			}
+		} );
+		this.liveRegion.remove();
+	}
+} );
+
+// DEPRECATED
+// TODO: Switch return back to widget declaration at top of file when this is removed
+if ( $.uiBackCompat !== false ) {
+
+	// Backcompat for tooltipClass option
+	$.widget( "ui.tooltip", $.ui.tooltip, {
+		options: {
+			tooltipClass: null
+		},
+		_tooltip: function() {
+			var tooltipData = this._superApply( arguments );
+			if ( this.options.tooltipClass ) {
+				tooltipData.tooltip.addClass( this.options.tooltipClass );
+			}
+			return tooltipData;
+		}
+	} );
+}
+
+var widgetsTooltip = $.ui.tooltip;
+
+
+/*!
+ * jQuery UI Effects 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Effects Core
+//>>group: Effects
+// jscs:disable maximumLineLength
+//>>description: Extends the internal jQuery effects. Includes morphing and easing. Required by all other effects.
+// jscs:enable maximumLineLength
+//>>docs: http://api.jqueryui.com/category/effects-core/
+//>>demos: http://jqueryui.com/effect/
+
+
 
 var dataSpace = "ui-effects-",
+	dataSpaceStyle = "ui-effects-style",
+	dataSpaceAnimated = "ui-effects-animated",
 
 	// Create a local jQuery because jQuery Color relies on it and the
 	// global may not exist with AMD and a custom build (#10199)
@@ -9376,13 +16168,15 @@ $.effects = {
  *
  * Date: Wed Jan 16 08:47:09 2013 -0600
  */
-(function( jQuery, undefined ) {
+( function( jQuery, undefined ) {
 
-	var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",
+	var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor " +
+		"borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",
 
-	// plusequals test for += 100 -= 100
+	// Plusequals test for += 100 -= 100
 	rplusequals = /^([\-+])=\s*(\d+\.?\d*)/,
-	// a set of RE's that can match strings and generate color tuples.
+
+	// A set of RE's that can match strings and generate color tuples.
 	stringParsers = [ {
 			re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
 			parse: function( execResult ) {
@@ -9404,7 +16198,8 @@ $.effects = {
 				];
 			}
 		}, {
-			// this regex ignores A-F because it's compared against an already lowercased string
+
+			// This regex ignores A-F because it's compared against an already lowercased string
 			re: /#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,
 			parse: function( execResult ) {
 				return [
@@ -9414,7 +16209,8 @@ $.effects = {
 				];
 			}
 		}, {
-			// this regex ignores A-F because it's compared against an already lowercased string
+
+			// This regex ignores A-F because it's compared against an already lowercased string
 			re: /#([a-f0-9])([a-f0-9])([a-f0-9])/,
 			parse: function( execResult ) {
 				return [
@@ -9436,7 +16232,7 @@ $.effects = {
 			}
 		} ],
 
-	// jQuery.Color( )
+	// JQuery.Color( )
 	color = jQuery.Color = function( color, green, blue, alpha ) {
 		return new jQuery.Color.fn.parse( color, green, blue, alpha );
 	},
@@ -9490,20 +16286,20 @@ $.effects = {
 	},
 	support = color.support = {},
 
-	// element for support tests
+	// Element for support tests
 	supportElem = jQuery( "<p>" )[ 0 ],
 
-	// colors = jQuery.Color.names
+	// Colors = jQuery.Color.names
 	colors,
 
-	// local aliases of functions called often
+	// Local aliases of functions called often
 	each = jQuery.each;
 
-// determine rgba support immediately
+// Determine rgba support immediately
 supportElem.style.cssText = "background-color:rgba(1,1,1,.5)";
 support.rgba = supportElem.style.backgroundColor.indexOf( "rgba" ) > -1;
 
-// define cache name and alpha properties
+// Define cache name and alpha properties
 // for rgba and hsla spaces
 each( spaces, function( spaceName, space ) {
 	space.cache = "_" + spaceName;
@@ -9512,13 +16308,13 @@ each( spaces, function( spaceName, space ) {
 		type: "percent",
 		def: 1
 	};
-});
+} );
 
 function clamp( value, prop, allowEmpty ) {
 	var type = propTypes[ prop.type ] || {};
 
 	if ( value == null ) {
-		return (allowEmpty || !prop.def) ? null : prop.def;
+		return ( allowEmpty || !prop.def ) ? null : prop.def;
 	}
 
 	// ~~ is an short way of doing floor for positive numbers
@@ -9531,12 +16327,13 @@ function clamp( value, prop, allowEmpty ) {
 	}
 
 	if ( type.mod ) {
-		// we add mod before modding to make sure that negatives values
+
+		// We add mod before modding to make sure that negatives values
 		// get converted properly: -10 -> 350
-		return (value + type.mod) % type.mod;
+		return ( value + type.mod ) % type.mod;
 	}
 
-	// for now all property types without mod have min and max
+	// For now all property types without mod have min and max
 	return 0 > value ? 0 : type.max < value ? type.max : value;
 }
 
@@ -9555,20 +16352,20 @@ function stringParse( string ) {
 		if ( values ) {
 			parsed = inst[ spaceName ]( values );
 
-			// if this was an rgba parse the assignment might happen twice
+			// If this was an rgba parse the assignment might happen twice
 			// oh well....
 			inst[ spaces[ spaceName ].cache ] = parsed[ spaces[ spaceName ].cache ];
 			rgba = inst._rgba = parsed._rgba;
 
-			// exit each( stringParsers ) here because we matched
+			// Exit each( stringParsers ) here because we matched
 			return false;
 		}
-	});
+	} );
 
 	// Found a stringParser that handled it
 	if ( rgba.length ) {
 
-		// if this came from a parsed string, force "transparent" when alpha is 0
+		// If this came from a parsed string, force "transparent" when alpha is 0
 		// chrome, (and maybe others) return "transparent" as rgba(0,0,0,0)
 		if ( rgba.join() === "0,0,0,0" ) {
 			jQuery.extend( rgba, colors.transparent );
@@ -9576,7 +16373,7 @@ function stringParse( string ) {
 		return inst;
 	}
 
-	// named colors
+	// Named colors
 	return colors[ string ];
 }
 
@@ -9595,7 +16392,7 @@ color.fn = jQuery.extend( color.prototype, {
 			type = jQuery.type( red ),
 			rgba = this._rgba = [];
 
-		// more than 1 argument specified - assume ( red, green, blue, alpha )
+		// More than 1 argument specified - assume ( red, green, blue, alpha )
 		if ( green !== undefined ) {
 			red = [ red, green, blue, alpha ];
 			type = "array";
@@ -9608,7 +16405,7 @@ color.fn = jQuery.extend( color.prototype, {
 		if ( type === "array" ) {
 			each( spaces.rgba.props, function( key, prop ) {
 				rgba[ prop.idx ] = clamp( red[ prop.idx ], prop );
-			});
+			} );
 			return this;
 		}
 
@@ -9618,16 +16415,16 @@ color.fn = jQuery.extend( color.prototype, {
 					if ( red[ space.cache ] ) {
 						inst[ space.cache ] = red[ space.cache ].slice();
 					}
-				});
+				} );
 			} else {
 				each( spaces, function( spaceName, space ) {
 					var cache = space.cache;
 					each( space.props, function( key, prop ) {
 
-						// if the cache doesn't exist, and we know how to convert
+						// If the cache doesn't exist, and we know how to convert
 						if ( !inst[ cache ] && space.to ) {
 
-							// if the value was null, we don't need to copy it
+							// If the value was null, we don't need to copy it
 							// if the key was alpha, we don't need to copy it either
 							if ( key === "alpha" || red[ key ] == null ) {
 								return;
@@ -9635,20 +16432,22 @@ color.fn = jQuery.extend( color.prototype, {
 							inst[ cache ] = space.to( inst._rgba );
 						}
 
-						// this is the only case where we allow nulls for ALL properties.
+						// This is the only case where we allow nulls for ALL properties.
 						// call clamp with alwaysAllowEmpty
 						inst[ cache ][ prop.idx ] = clamp( red[ key ], prop, true );
-					});
+					} );
 
-					// everything defined but alpha?
-					if ( inst[ cache ] && jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
-						// use the default of 1
+					// Everything defined but alpha?
+					if ( inst[ cache ] &&
+							jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
+
+						// Use the default of 1
 						inst[ cache ][ 3 ] = 1;
 						if ( space.from ) {
 							inst._rgba = space.from( inst[ cache ] );
 						}
 					}
-				});
+				} );
 			}
 			return this;
 		}
@@ -9661,17 +16460,17 @@ color.fn = jQuery.extend( color.prototype, {
 		each( spaces, function( _, space ) {
 			var localCache,
 				isCache = is[ space.cache ];
-			if (isCache) {
+			if ( isCache ) {
 				localCache = inst[ space.cache ] || space.to && space.to( inst._rgba ) || [];
 				each( space.props, function( _, prop ) {
 					if ( isCache[ prop.idx ] != null ) {
 						same = ( isCache[ prop.idx ] === localCache[ prop.idx ] );
 						return same;
 					}
-				});
+				} );
 			}
 			return same;
-		});
+		} );
 		return same;
 	},
 	_space: function() {
@@ -9681,7 +16480,7 @@ color.fn = jQuery.extend( color.prototype, {
 			if ( inst[ space.cache ] ) {
 				used.push( spaceName );
 			}
-		});
+		} );
 		return used.pop();
 	},
 	transition: function( other, distance ) {
@@ -9699,11 +16498,12 @@ color.fn = jQuery.extend( color.prototype, {
 				endValue = end[ index ],
 				type = propTypes[ prop.type ] || {};
 
-			// if null, don't override start value
+			// If null, don't override start value
 			if ( endValue === null ) {
 				return;
 			}
-			// if null - use end
+
+			// If null - use end
 			if ( startValue === null ) {
 				result[ index ] = endValue;
 			} else {
@@ -9716,11 +16516,12 @@ color.fn = jQuery.extend( color.prototype, {
 				}
 				result[ index ] = clamp( ( endValue - startValue ) * distance + startValue, prop );
 			}
-		});
+		} );
 		return this[ spaceName ]( result );
 	},
 	blend: function( opaque ) {
-		// if we are already opaque - return ourself
+
+		// If we are already opaque - return ourself
 		if ( this._rgba[ 3 ] === 1 ) {
 			return this;
 		}
@@ -9731,13 +16532,13 @@ color.fn = jQuery.extend( color.prototype, {
 
 		return color( jQuery.map( rgb, function( v, i ) {
 			return ( 1 - a ) * blend[ i ] + a * v;
-		}));
+		} ) );
 	},
 	toRgbaString: function() {
 		var prefix = "rgba(",
 			rgba = jQuery.map( this._rgba, function( v, i ) {
 				return v == null ? ( i > 2 ? 1 : 0 ) : v;
-			});
+			} );
 
 		if ( rgba[ 3 ] === 1 ) {
 			rgba.pop();
@@ -9753,12 +16554,12 @@ color.fn = jQuery.extend( color.prototype, {
 					v = i > 2 ? 1 : 0;
 				}
 
-				// catch 1 and 2
+				// Catch 1 and 2
 				if ( i && i < 3 ) {
 					v = Math.round( v * 100 ) + "%";
 				}
 				return v;
-			});
+			} );
 
 		if ( hsla[ 3 ] === 1 ) {
 			hsla.pop();
@@ -9776,18 +16577,18 @@ color.fn = jQuery.extend( color.prototype, {
 
 		return "#" + jQuery.map( rgba, function( v ) {
 
-			// default to 0 when nulls exist
+			// Default to 0 when nulls exist
 			v = ( v || 0 ).toString( 16 );
 			return v.length === 1 ? "0" + v : v;
-		}).join("");
+		} ).join( "" );
 	},
 	toString: function() {
 		return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString();
 	}
-});
+} );
 color.fn.parse.prototype = color.fn;
 
-// hsla conversions adapted from:
+// Hsla conversions adapted from:
 // https://code.google.com/p/maashaack/source/browse/packages/graphics/trunk/src/graphics/colors/HUE2RGB.as?r=5021
 
 function hue2rgb( p, q, h ) {
@@ -9795,7 +16596,7 @@ function hue2rgb( p, q, h ) {
 	if ( h * 6 < 1 ) {
 		return p + ( q - p ) * h * 6;
 	}
-	if ( h * 2 < 1) {
+	if ( h * 2 < 1 ) {
 		return q;
 	}
 	if ( h * 3 < 2 ) {
@@ -9829,7 +16630,7 @@ spaces.hsla.to = function( rgba ) {
 		h = ( 60 * ( r - g ) / diff ) + 240;
 	}
 
-	// chroma (diff) == 0 means greyscale which, by definition, saturation = 0%
+	// Chroma (diff) == 0 means greyscale which, by definition, saturation = 0%
 	// otherwise, saturation is based on the ratio of chroma (diff) to lightness (add)
 	if ( diff === 0 ) {
 		s = 0;
@@ -9838,7 +16639,7 @@ spaces.hsla.to = function( rgba ) {
 	} else {
 		s = diff / ( 2 - add );
 	}
-	return [ Math.round(h) % 360, s, l, a == null ? 1 : a ];
+	return [ Math.round( h ) % 360, s, l, a == null ? 1 : a ];
 };
 
 spaces.hsla.from = function( hsla ) {
@@ -9866,10 +16667,10 @@ each( spaces, function( spaceName, space ) {
 		to = space.to,
 		from = space.from;
 
-	// makes rgba() and hsla()
+	// Makes rgba() and hsla()
 	color.fn[ spaceName ] = function( value ) {
 
-		// generate a cache for this space if it doesn't exist
+		// Generate a cache for this space if it doesn't exist
 		if ( to && !this[ cache ] ) {
 			this[ cache ] = to( this._rgba );
 		}
@@ -9888,7 +16689,7 @@ each( spaces, function( spaceName, space ) {
 				val = local[ prop.idx ];
 			}
 			local[ prop.idx ] = clamp( val, prop );
-		});
+		} );
 
 		if ( from ) {
 			ret = color( from( local ) );
@@ -9899,9 +16700,10 @@ each( spaces, function( spaceName, space ) {
 		}
 	};
 
-	// makes red() green() blue() alpha() hue() saturation() lightness()
+	// Makes red() green() blue() alpha() hue() saturation() lightness()
 	each( props, function( key, prop ) {
-		// alpha is included in more than one space
+
+		// Alpha is included in more than one space
 		if ( color.fn[ key ] ) {
 			return;
 		}
@@ -9932,10 +16734,10 @@ each( spaces, function( spaceName, space ) {
 			local[ prop.idx ] = value;
 			return this[ fn ]( local );
 		};
-	});
-});
+	} );
+} );
 
-// add cssHook and .fx.step function for each named hook.
+// Add cssHook and .fx.step function for each named hook.
 // accept a space separated string of properties
 color.hook = function( hook ) {
 	var hooks = hook.split( " " );
@@ -9945,12 +16747,13 @@ color.hook = function( hook ) {
 				var parsed, curElem,
 					backgroundColor = "";
 
-				if ( value !== "transparent" && ( jQuery.type( value ) !== "string" || ( parsed = stringParse( value ) ) ) ) {
+				if ( value !== "transparent" && ( jQuery.type( value ) !== "string" ||
+						( parsed = stringParse( value ) ) ) ) {
 					value = color( parsed || value );
 					if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
 						curElem = hook === "backgroundColor" ? elem.parentNode : elem;
 						while (
-							(backgroundColor === "" || backgroundColor === "transparent") &&
+							( backgroundColor === "" || backgroundColor === "transparent" ) &&
 							curElem && curElem.style
 						) {
 							try {
@@ -9970,7 +16773,9 @@ color.hook = function( hook ) {
 				try {
 					elem.style[ hook ] = value;
 				} catch ( e ) {
-					// wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit'
+
+					// Wrapped to prevent IE from throwing errors on "invalid" values like
+					// 'auto' or 'inherit'
 				}
 			}
 		};
@@ -9982,7 +16787,7 @@ color.hook = function( hook ) {
 			}
 			jQuery.cssHooks[ hook ].set( fx.elem, fx.start.transition( fx.end, fx.pos ) );
 		};
-	});
+	} );
 
 };
 
@@ -9994,7 +16799,7 @@ jQuery.cssHooks.borderColor = {
 
 		each( [ "Top", "Right", "Bottom", "Left" ], function( i, part ) {
 			expanded[ "border" + part + "Color" ] = value;
-		});
+		} );
 		return expanded;
 	}
 };
@@ -10003,6 +16808,7 @@ jQuery.cssHooks.borderColor = {
 // Usage of any of the other color names requires adding yourself or including
 // jquery.color.svg-names.js.
 colors = jQuery.Color.names = {
+
 	// 4.1. Basic color keywords
 	aqua: "#00ffff",
 	black: "#000000",
@@ -10027,12 +16833,12 @@ colors = jQuery.Color.names = {
 	_default: "#ffffff"
 };
 
-})( jQuery );
+} )( jQuery );
 
 /******************************************************************************/
 /****************************** CLASS ANIMATIONS ******************************/
 /******************************************************************************/
-(function() {
+( function() {
 
 var classAnimationActions = [ "add", "remove", "toggle" ],
 	shorthandStyles = {
@@ -10047,14 +16853,17 @@ var classAnimationActions = [ "add", "remove", "toggle" ],
 		padding: 1
 	};
 
-$.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function( _, prop ) {
-	$.fx.step[ prop ] = function( fx ) {
-		if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) {
-			jQuery.style( fx.elem, prop, fx.end );
-			fx.setAttr = true;
-		}
-	};
-});
+$.each(
+	[ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ],
+	function( _, prop ) {
+		$.fx.step[ prop ] = function( fx ) {
+			if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) {
+				jQuery.style( fx.elem, prop, fx.end );
+				fx.setAttr = true;
+			}
+		};
+	}
+);
 
 function getElementStyles( elem ) {
 	var key, len,
@@ -10071,7 +16880,8 @@ function getElementStyles( elem ) {
 				styles[ $.camelCase( key ) ] = style[ key ];
 			}
 		}
-	// support: Opera, IE <9
+
+	// Support: Opera, IE <9
 	} else {
 		for ( key in style ) {
 			if ( typeof style[ key ] === "string" ) {
@@ -10101,7 +16911,7 @@ function styleDifference( oldStyle, newStyle ) {
 	return diff;
 }
 
-// support: jQuery <1.8
+// Support: jQuery <1.8
 if ( !$.fn.addBack ) {
 	$.fn.addBack = function( selector ) {
 		return this.add( selector == null ?
@@ -10119,275 +16929,448 @@ $.effects.animateClass = function( value, duration, easing, callback ) {
 			applyClassChange,
 			allAnimations = o.children ? animated.find( "*" ).addBack() : animated;
 
-		// map the animated objects to store the original styles.
-		allAnimations = allAnimations.map(function() {
+		// Map the animated objects to store the original styles.
+		allAnimations = allAnimations.map( function() {
 			var el = $( this );
 			return {
 				el: el,
 				start: getElementStyles( this )
 			};
-		});
+		} );
 
-		// apply class change
+		// Apply class change
 		applyClassChange = function() {
-			$.each( classAnimationActions, function(i, action) {
+			$.each( classAnimationActions, function( i, action ) {
 				if ( value[ action ] ) {
 					animated[ action + "Class" ]( value[ action ] );
 				}
-			});
+			} );
 		};
 		applyClassChange();
 
-		// map all animated objects again - calculate new styles and diff
-		allAnimations = allAnimations.map(function() {
+		// Map all animated objects again - calculate new styles and diff
+		allAnimations = allAnimations.map( function() {
 			this.end = getElementStyles( this.el[ 0 ] );
 			this.diff = styleDifference( this.start, this.end );
 			return this;
-		});
+		} );
 
-		// apply original class
+		// Apply original class
 		animated.attr( "class", baseClass );
 
-		// map all animated objects again - this time collecting a promise
-		allAnimations = allAnimations.map(function() {
+		// Map all animated objects again - this time collecting a promise
+		allAnimations = allAnimations.map( function() {
 			var styleInfo = this,
 				dfd = $.Deferred(),
-				opts = $.extend({}, o, {
+				opts = $.extend( {}, o, {
 					queue: false,
 					complete: function() {
 						dfd.resolve( styleInfo );
 					}
-				});
+				} );
 
 			this.el.animate( this.diff, opts );
 			return dfd.promise();
-		});
+		} );
 
-		// once all animations have completed:
-		$.when.apply( $, allAnimations.get() ).done(function() {
+		// Once all animations have completed:
+		$.when.apply( $, allAnimations.get() ).done( function() {
 
-			// set the final class
+			// Set the final class
 			applyClassChange();
 
-			// for each animated element,
+			// For each animated element,
 			// clear all css properties that were animated
 			$.each( arguments, function() {
 				var el = this.el;
-				$.each( this.diff, function(key) {
+				$.each( this.diff, function( key ) {
 					el.css( key, "" );
-				});
-			});
+				} );
+			} );
 
-			// this is guarnteed to be there if you use jQuery.speed()
+			// This is guarnteed to be there if you use jQuery.speed()
 			// it also handles dequeuing the next anim...
 			o.complete.call( animated[ 0 ] );
-		});
-	});
+		} );
+	} );
 };
 
-$.fn.extend({
-	addClass: (function( orig ) {
+$.fn.extend( {
+	addClass: ( function( orig ) {
 		return function( classNames, speed, easing, callback ) {
 			return speed ?
 				$.effects.animateClass.call( this,
 					{ add: classNames }, speed, easing, callback ) :
 				orig.apply( this, arguments );
 		};
-	})( $.fn.addClass ),
+	} )( $.fn.addClass ),
 
-	removeClass: (function( orig ) {
+	removeClass: ( function( orig ) {
 		return function( classNames, speed, easing, callback ) {
 			return arguments.length > 1 ?
 				$.effects.animateClass.call( this,
 					{ remove: classNames }, speed, easing, callback ) :
 				orig.apply( this, arguments );
 		};
-	})( $.fn.removeClass ),
+	} )( $.fn.removeClass ),
 
-	toggleClass: (function( orig ) {
+	toggleClass: ( function( orig ) {
 		return function( classNames, force, speed, easing, callback ) {
 			if ( typeof force === "boolean" || force === undefined ) {
 				if ( !speed ) {
-					// without speed parameter
+
+					// Without speed parameter
 					return orig.apply( this, arguments );
 				} else {
 					return $.effects.animateClass.call( this,
-						(force ? { add: classNames } : { remove: classNames }),
+						( force ? { add: classNames } : { remove: classNames } ),
 						speed, easing, callback );
 				}
 			} else {
-				// without force parameter
+
+				// Without force parameter
 				return $.effects.animateClass.call( this,
 					{ toggle: classNames }, force, speed, easing );
 			}
 		};
-	})( $.fn.toggleClass ),
+	} )( $.fn.toggleClass ),
 
-	switchClass: function( remove, add, speed, easing, callback) {
+	switchClass: function( remove, add, speed, easing, callback ) {
 		return $.effects.animateClass.call( this, {
 			add: add,
 			remove: remove
 		}, speed, easing, callback );
 	}
-});
+} );
 
-})();
+} )();
 
 /******************************************************************************/
 /*********************************** EFFECTS **********************************/
 /******************************************************************************/
 
-(function() {
+( function() {
+
+if ( $.expr && $.expr.filters && $.expr.filters.animated ) {
+	$.expr.filters.animated = ( function( orig ) {
+		return function( elem ) {
+			return !!$( elem ).data( dataSpaceAnimated ) || orig( elem );
+		};
+	} )( $.expr.filters.animated );
+}
+
+if ( $.uiBackCompat !== false ) {
+	$.extend( $.effects, {
+
+		// Saves a set of properties in a data storage
+		save: function( element, set ) {
+			var i = 0, length = set.length;
+			for ( ; i < length; i++ ) {
+				if ( set[ i ] !== null ) {
+					element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
+				}
+			}
+		},
+
+		// Restores a set of previously saved properties from a data storage
+		restore: function( element, set ) {
+			var val, i = 0, length = set.length;
+			for ( ; i < length; i++ ) {
+				if ( set[ i ] !== null ) {
+					val = element.data( dataSpace + set[ i ] );
+					element.css( set[ i ], val );
+				}
+			}
+		},
+
+		setMode: function( el, mode ) {
+			if ( mode === "toggle" ) {
+				mode = el.is( ":hidden" ) ? "show" : "hide";
+			}
+			return mode;
+		},
+
+		// Wraps the element around a wrapper that copies position properties
+		createWrapper: function( element ) {
+
+			// If the element is already wrapped, return it
+			if ( element.parent().is( ".ui-effects-wrapper" ) ) {
+				return element.parent();
+			}
+
+			// Wrap the element
+			var props = {
+					width: element.outerWidth( true ),
+					height: element.outerHeight( true ),
+					"float": element.css( "float" )
+				},
+				wrapper = $( "<div></div>" )
+					.addClass( "ui-effects-wrapper" )
+					.css( {
+						fontSize: "100%",
+						background: "transparent",
+						border: "none",
+						margin: 0,
+						padding: 0
+					} ),
+
+				// Store the size in case width/height are defined in % - Fixes #5245
+				size = {
+					width: element.width(),
+					height: element.height()
+				},
+				active = document.activeElement;
+
+			// Support: Firefox
+			// Firefox incorrectly exposes anonymous content
+			// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
+			try {
+				active.id;
+			} catch ( e ) {
+				active = document.body;
+			}
+
+			element.wrap( wrapper );
+
+			// Fixes #7595 - Elements lose focus when wrapped.
+			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+				$( active ).trigger( "focus" );
+			}
+
+			// Hotfix for jQuery 1.4 since some change in wrap() seems to actually
+			// lose the reference to the wrapped element
+			wrapper = element.parent();
+
+			// Transfer positioning properties to the wrapper
+			if ( element.css( "position" ) === "static" ) {
+				wrapper.css( { position: "relative" } );
+				element.css( { position: "relative" } );
+			} else {
+				$.extend( props, {
+					position: element.css( "position" ),
+					zIndex: element.css( "z-index" )
+				} );
+				$.each( [ "top", "left", "bottom", "right" ], function( i, pos ) {
+					props[ pos ] = element.css( pos );
+					if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
+						props[ pos ] = "auto";
+					}
+				} );
+				element.css( {
+					position: "relative",
+					top: 0,
+					left: 0,
+					right: "auto",
+					bottom: "auto"
+				} );
+			}
+			element.css( size );
+
+			return wrapper.css( props ).show();
+		},
+
+		removeWrapper: function( element ) {
+			var active = document.activeElement;
+
+			if ( element.parent().is( ".ui-effects-wrapper" ) ) {
+				element.parent().replaceWith( element );
+
+				// Fixes #7595 - Elements lose focus when wrapped.
+				if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+					$( active ).trigger( "focus" );
+				}
+			}
+
+			return element;
+		}
+	} );
+}
 
 $.extend( $.effects, {
-	version: "1.11.4",
+	version: "1.12.1",
 
-	// Saves a set of properties in a data storage
-	save: function( element, set ) {
-		for ( var i = 0; i < set.length; i++ ) {
-			if ( set[ i ] !== null ) {
-				element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
-			}
+	define: function( name, mode, effect ) {
+		if ( !effect ) {
+			effect = mode;
+			mode = "effect";
 		}
+
+		$.effects.effect[ name ] = effect;
+		$.effects.effect[ name ].mode = mode;
+
+		return effect;
 	},
 
-	// Restores a set of previously saved properties from a data storage
-	restore: function( element, set ) {
-		var val, i;
-		for ( i = 0; i < set.length; i++ ) {
-			if ( set[ i ] !== null ) {
-				val = element.data( dataSpace + set[ i ] );
-				// support: jQuery 1.6.2
-				// http://bugs.jquery.com/ticket/9917
-				// jQuery 1.6.2 incorrectly returns undefined for any falsy value.
-				// We can't differentiate between "" and 0 here, so we just assume
-				// empty string since it's likely to be a more common value...
-				if ( val === undefined ) {
-					val = "";
-				}
-				element.css( set[ i ], val );
-			}
+	scaledDimensions: function( element, percent, direction ) {
+		if ( percent === 0 ) {
+			return {
+				height: 0,
+				width: 0,
+				outerHeight: 0,
+				outerWidth: 0
+			};
 		}
+
+		var x = direction !== "horizontal" ? ( ( percent || 100 ) / 100 ) : 1,
+			y = direction !== "vertical" ? ( ( percent || 100 ) / 100 ) : 1;
+
+		return {
+			height: element.height() * y,
+			width: element.width() * x,
+			outerHeight: element.outerHeight() * y,
+			outerWidth: element.outerWidth() * x
+		};
+
 	},
 
-	setMode: function( el, mode ) {
-		if (mode === "toggle") {
-			mode = el.is( ":hidden" ) ? "show" : "hide";
+	clipToBox: function( animation ) {
+		return {
+			width: animation.clip.right - animation.clip.left,
+			height: animation.clip.bottom - animation.clip.top,
+			left: animation.clip.left,
+			top: animation.clip.top
+		};
+	},
+
+	// Injects recently queued functions to be first in line (after "inprogress")
+	unshift: function( element, queueLength, count ) {
+		var queue = element.queue();
+
+		if ( queueLength > 1 ) {
+			queue.splice.apply( queue,
+				[ 1, 0 ].concat( queue.splice( queueLength, count ) ) );
+		}
+		element.dequeue();
+	},
+
+	saveStyle: function( element ) {
+		element.data( dataSpaceStyle, element[ 0 ].style.cssText );
+	},
+
+	restoreStyle: function( element ) {
+		element[ 0 ].style.cssText = element.data( dataSpaceStyle ) || "";
+		element.removeData( dataSpaceStyle );
+	},
+
+	mode: function( element, mode ) {
+		var hidden = element.is( ":hidden" );
+
+		if ( mode === "toggle" ) {
+			mode = hidden ? "show" : "hide";
+		}
+		if ( hidden ? mode === "hide" : mode === "show" ) {
+			mode = "none";
 		}
 		return mode;
 	},
 
 	// Translates a [top,left] array into a baseline value
-	// this should be a little more flexible in the future to handle a string & hash
 	getBaseline: function( origin, original ) {
 		var y, x;
+
 		switch ( origin[ 0 ] ) {
-			case "top": y = 0; break;
-			case "middle": y = 0.5; break;
-			case "bottom": y = 1; break;
-			default: y = origin[ 0 ] / original.height;
+		case "top":
+			y = 0;
+			break;
+		case "middle":
+			y = 0.5;
+			break;
+		case "bottom":
+			y = 1;
+			break;
+		default:
+			y = origin[ 0 ] / original.height;
 		}
+
 		switch ( origin[ 1 ] ) {
-			case "left": x = 0; break;
-			case "center": x = 0.5; break;
-			case "right": x = 1; break;
-			default: x = origin[ 1 ] / original.width;
+		case "left":
+			x = 0;
+			break;
+		case "center":
+			x = 0.5;
+			break;
+		case "right":
+			x = 1;
+			break;
+		default:
+			x = origin[ 1 ] / original.width;
 		}
+
 		return {
 			x: x,
 			y: y
 		};
 	},
 
-	// Wraps the element around a wrapper that copies position properties
-	createWrapper: function( element ) {
+	// Creates a placeholder element so that the original element can be made absolute
+	createPlaceholder: function( element ) {
+		var placeholder,
+			cssPosition = element.css( "position" ),
+			position = element.position();
 
-		// if the element is already wrapped, return it
-		if ( element.parent().is( ".ui-effects-wrapper" )) {
-			return element.parent();
-		}
+		// Lock in margins first to account for form elements, which
+		// will change margin if you explicitly set height
+		// see: http://jsfiddle.net/JZSMt/3/ https://bugs.webkit.org/show_bug.cgi?id=107380
+		// Support: Safari
+		element.css( {
+			marginTop: element.css( "marginTop" ),
+			marginBottom: element.css( "marginBottom" ),
+			marginLeft: element.css( "marginLeft" ),
+			marginRight: element.css( "marginRight" )
+		} )
+		.outerWidth( element.outerWidth() )
+		.outerHeight( element.outerHeight() );
 
-		// wrap the element
-		var props = {
-				width: element.outerWidth(true),
-				height: element.outerHeight(true),
+		if ( /^(static|relative)/.test( cssPosition ) ) {
+			cssPosition = "absolute";
+
+			placeholder = $( "<" + element[ 0 ].nodeName + ">" ).insertAfter( element ).css( {
+
+				// Convert inline to inline block to account for inline elements
+				// that turn to inline block based on content (like img)
+				display: /^(inline|ruby)/.test( element.css( "display" ) ) ?
+					"inline-block" :
+					"block",
+				visibility: "hidden",
+
+				// Margins need to be set to account for margin collapse
+				marginTop: element.css( "marginTop" ),
+				marginBottom: element.css( "marginBottom" ),
+				marginLeft: element.css( "marginLeft" ),
+				marginRight: element.css( "marginRight" ),
 				"float": element.css( "float" )
-			},
-			wrapper = $( "<div></div>" )
-				.addClass( "ui-effects-wrapper" )
-				.css({
-					fontSize: "100%",
-					background: "transparent",
-					border: "none",
-					margin: 0,
-					padding: 0
-				}),
-			// Store the size in case width/height are defined in % - Fixes #5245
-			size = {
-				width: element.width(),
-				height: element.height()
-			},
-			active = document.activeElement;
+			} )
+			.outerWidth( element.outerWidth() )
+			.outerHeight( element.outerHeight() )
+			.addClass( "ui-effects-placeholder" );
 
-		// support: Firefox
-		// Firefox incorrectly exposes anonymous content
-		// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
-		try {
-			active.id;
-		} catch ( e ) {
-			active = document.body;
+			element.data( dataSpace + "placeholder", placeholder );
 		}
 
-		element.wrap( wrapper );
+		element.css( {
+			position: cssPosition,
+			left: position.left,
+			top: position.top
+		} );
 
-		// Fixes #7595 - Elements lose focus when wrapped.
-		if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-			$( active ).focus();
-		}
-
-		wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually lose the reference to the wrapped element
-
-		// transfer positioning properties to the wrapper
-		if ( element.css( "position" ) === "static" ) {
-			wrapper.css({ position: "relative" });
-			element.css({ position: "relative" });
-		} else {
-			$.extend( props, {
-				position: element.css( "position" ),
-				zIndex: element.css( "z-index" )
-			});
-			$.each([ "top", "left", "bottom", "right" ], function(i, pos) {
-				props[ pos ] = element.css( pos );
-				if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
-					props[ pos ] = "auto";
-				}
-			});
-			element.css({
-				position: "relative",
-				top: 0,
-				left: 0,
-				right: "auto",
-				bottom: "auto"
-			});
-		}
-		element.css(size);
-
-		return wrapper.css( props ).show();
+		return placeholder;
 	},
 
-	removeWrapper: function( element ) {
-		var active = document.activeElement;
+	removePlaceholder: function( element ) {
+		var dataKey = dataSpace + "placeholder",
+				placeholder = element.data( dataKey );
 
-		if ( element.parent().is( ".ui-effects-wrapper" ) ) {
-			element.parent().replaceWith( element );
-
-			// Fixes #7595 - Elements lose focus when wrapped.
-			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-				$( active ).focus();
-			}
+		if ( placeholder ) {
+			placeholder.remove();
+			element.removeData( dataKey );
 		}
+	},
 
-		return element;
+	// Removes a placeholder if it exists and restores
+	// properties that were modified during placeholder creation
+	cleanUp: function( element ) {
+		$.effects.restoreStyle( element );
+		$.effects.removePlaceholder( element );
 	},
 
 	setTransition: function( element, list, factor, value ) {
@@ -10397,49 +17380,49 @@ $.extend( $.effects, {
 			if ( unit[ 0 ] > 0 ) {
 				value[ x ] = unit[ 0 ] * factor + unit[ 1 ];
 			}
-		});
+		} );
 		return value;
 	}
-});
+} );
 
-// return an effect options object for the given parameters:
+// Return an effect options object for the given parameters:
 function _normalizeArguments( effect, options, speed, callback ) {
 
-	// allow passing all options as the first parameter
+	// Allow passing all options as the first parameter
 	if ( $.isPlainObject( effect ) ) {
 		options = effect;
 		effect = effect.effect;
 	}
 
-	// convert to an object
+	// Convert to an object
 	effect = { effect: effect };
 
-	// catch (effect, null, ...)
+	// Catch (effect, null, ...)
 	if ( options == null ) {
 		options = {};
 	}
 
-	// catch (effect, callback)
+	// Catch (effect, callback)
 	if ( $.isFunction( options ) ) {
 		callback = options;
 		speed = null;
 		options = {};
 	}
 
-	// catch (effect, speed, ?)
+	// Catch (effect, speed, ?)
 	if ( typeof options === "number" || $.fx.speeds[ options ] ) {
 		callback = speed;
 		speed = options;
 		options = {};
 	}
 
-	// catch (effect, options, callback)
+	// Catch (effect, options, callback)
 	if ( $.isFunction( speed ) ) {
 		callback = speed;
 		speed = null;
 	}
 
-	// add options to effect
+	// Add options to effect
 	if ( options ) {
 		$.extend( effect, options );
 	}
@@ -10456,6 +17439,7 @@ function _normalizeArguments( effect, options, speed, callback ) {
 }
 
 function standardAnimationOption( option ) {
+
 	// Valid standard speeds (nothing, number, named speed)
 	if ( !option || typeof option === "number" || $.fx.speeds[ option ] ) {
 		return true;
@@ -10480,54 +17464,116 @@ function standardAnimationOption( option ) {
 	return false;
 }
 
-$.fn.extend({
+$.fn.extend( {
 	effect: function( /* effect, options, speed, callback */ ) {
 		var args = _normalizeArguments.apply( this, arguments ),
-			mode = args.mode,
+			effectMethod = $.effects.effect[ args.effect ],
+			defaultMode = effectMethod.mode,
 			queue = args.queue,
-			effectMethod = $.effects.effect[ args.effect ];
+			queueName = queue || "fx",
+			complete = args.complete,
+			mode = args.mode,
+			modes = [],
+			prefilter = function( next ) {
+				var el = $( this ),
+					normalizedMode = $.effects.mode( el, mode ) || defaultMode;
+
+				// Sentinel for duck-punching the :animated psuedo-selector
+				el.data( dataSpaceAnimated, true );
+
+				// Save effect mode for later use,
+				// we can't just call $.effects.mode again later,
+				// as the .show() below destroys the initial state
+				modes.push( normalizedMode );
+
+				// See $.uiBackCompat inside of run() for removal of defaultMode in 1.13
+				if ( defaultMode && ( normalizedMode === "show" ||
+						( normalizedMode === defaultMode && normalizedMode === "hide" ) ) ) {
+					el.show();
+				}
+
+				if ( !defaultMode || normalizedMode !== "none" ) {
+					$.effects.saveStyle( el );
+				}
+
+				if ( $.isFunction( next ) ) {
+					next();
+				}
+			};
 
 		if ( $.fx.off || !effectMethod ) {
-			// delegate to the original method (e.g., .show()) if possible
+
+			// Delegate to the original method (e.g., .show()) if possible
 			if ( mode ) {
-				return this[ mode ]( args.duration, args.complete );
+				return this[ mode ]( args.duration, complete );
 			} else {
 				return this.each( function() {
-					if ( args.complete ) {
-						args.complete.call( this );
+					if ( complete ) {
+						complete.call( this );
 					}
-				});
+				} );
 			}
 		}
 
 		function run( next ) {
-			var elem = $( this ),
-				complete = args.complete,
-				mode = args.mode;
+			var elem = $( this );
+
+			function cleanup() {
+				elem.removeData( dataSpaceAnimated );
+
+				$.effects.cleanUp( elem );
+
+				if ( args.mode === "hide" ) {
+					elem.hide();
+				}
+
+				done();
+			}
 
 			function done() {
 				if ( $.isFunction( complete ) ) {
-					complete.call( elem[0] );
+					complete.call( elem[ 0 ] );
 				}
+
 				if ( $.isFunction( next ) ) {
 					next();
 				}
 			}
 
-			// If the element already has the correct final state, delegate to
-			// the core methods so the internal tracking of "olddisplay" works.
-			if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
-				elem[ mode ]();
-				done();
+			// Override mode option on a per element basis,
+			// as toggle can be either show or hide depending on element state
+			args.mode = modes.shift();
+
+			if ( $.uiBackCompat !== false && !defaultMode ) {
+				if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
+
+					// Call the core method to track "olddisplay" properly
+					elem[ mode ]();
+					done();
+				} else {
+					effectMethod.call( elem[ 0 ], args, done );
+				}
 			} else {
-				effectMethod.call( elem[0], args, done );
+				if ( args.mode === "none" ) {
+
+					// Call the core method to track "olddisplay" properly
+					elem[ mode ]();
+					done();
+				} else {
+					effectMethod.call( elem[ 0 ], args, cleanup );
+				}
 			}
 		}
 
-		return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
+		// Run prefilter on all elements first to ensure that
+		// any showing or hiding happens before placeholder creation,
+		// which ensures that any layout changes are correctly captured.
+		return queue === false ?
+			this.each( prefilter ).each( run ) :
+			this.queue( queueName, prefilter ).queue( queueName, run );
 	},
 
-	show: (function( orig ) {
+	show: ( function( orig ) {
 		return function( option ) {
 			if ( standardAnimationOption( option ) ) {
 				return orig.apply( this, arguments );
@@ -10537,9 +17583,9 @@ $.fn.extend({
 				return this.effect.call( this, args );
 			}
 		};
-	})( $.fn.show ),
+	} )( $.fn.show ),
 
-	hide: (function( orig ) {
+	hide: ( function( orig ) {
 		return function( option ) {
 			if ( standardAnimationOption( option ) ) {
 				return orig.apply( this, arguments );
@@ -10549,9 +17595,9 @@ $.fn.extend({
 				return this.effect.call( this, args );
 			}
 		};
-	})( $.fn.hide ),
+	} )( $.fn.hide ),
 
-	toggle: (function( orig ) {
+	toggle: ( function( orig ) {
 		return function( option ) {
 			if ( standardAnimationOption( option ) || typeof option === "boolean" ) {
 				return orig.apply( this, arguments );
@@ -10561,10 +17607,9 @@ $.fn.extend({
 				return this.effect.call( this, args );
 			}
 		};
-	})( $.fn.toggle ),
+	} )( $.fn.toggle ),
 
-	// helper functions
-	cssUnit: function(key) {
+	cssUnit: function( key ) {
 		var style = this.css( key ),
 			val = [];
 
@@ -10572,20 +17617,92 @@ $.fn.extend({
 			if ( style.indexOf( unit ) > 0 ) {
 				val = [ parseFloat( style ), unit ];
 			}
-		});
+		} );
 		return val;
-	}
-});
+	},
 
-})();
+	cssClip: function( clipObj ) {
+		if ( clipObj ) {
+			return this.css( "clip", "rect(" + clipObj.top + "px " + clipObj.right + "px " +
+				clipObj.bottom + "px " + clipObj.left + "px)" );
+		}
+		return parseClip( this.css( "clip" ), this );
+	},
+
+	transfer: function( options, done ) {
+		var element = $( this ),
+			target = $( options.to ),
+			targetFixed = target.css( "position" ) === "fixed",
+			body = $( "body" ),
+			fixTop = targetFixed ? body.scrollTop() : 0,
+			fixLeft = targetFixed ? body.scrollLeft() : 0,
+			endPosition = target.offset(),
+			animation = {
+				top: endPosition.top - fixTop,
+				left: endPosition.left - fixLeft,
+				height: target.innerHeight(),
+				width: target.innerWidth()
+			},
+			startPosition = element.offset(),
+			transfer = $( "<div class='ui-effects-transfer'></div>" )
+				.appendTo( "body" )
+				.addClass( options.className )
+				.css( {
+					top: startPosition.top - fixTop,
+					left: startPosition.left - fixLeft,
+					height: element.innerHeight(),
+					width: element.innerWidth(),
+					position: targetFixed ? "fixed" : "absolute"
+				} )
+				.animate( animation, options.duration, options.easing, function() {
+					transfer.remove();
+					if ( $.isFunction( done ) ) {
+						done();
+					}
+				} );
+	}
+} );
+
+function parseClip( str, element ) {
+		var outerWidth = element.outerWidth(),
+			outerHeight = element.outerHeight(),
+			clipRegex = /^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,
+			values = clipRegex.exec( str ) || [ "", 0, outerWidth, outerHeight, 0 ];
+
+		return {
+			top: parseFloat( values[ 1 ] ) || 0,
+			right: values[ 2 ] === "auto" ? outerWidth : parseFloat( values[ 2 ] ),
+			bottom: values[ 3 ] === "auto" ? outerHeight : parseFloat( values[ 3 ] ),
+			left: parseFloat( values[ 4 ] ) || 0
+		};
+}
+
+$.fx.step.clip = function( fx ) {
+	if ( !fx.clipInit ) {
+		fx.start = $( fx.elem ).cssClip();
+		if ( typeof fx.end === "string" ) {
+			fx.end = parseClip( fx.end, fx.elem );
+		}
+		fx.clipInit = true;
+	}
+
+	$( fx.elem ).cssClip( {
+		top: fx.pos * ( fx.end.top - fx.start.top ) + fx.start.top,
+		right: fx.pos * ( fx.end.right - fx.start.right ) + fx.start.right,
+		bottom: fx.pos * ( fx.end.bottom - fx.start.bottom ) + fx.start.bottom,
+		left: fx.pos * ( fx.end.left - fx.start.left ) + fx.start.left
+	} );
+};
+
+} )();
 
 /******************************************************************************/
 /*********************************** EASING ***********************************/
 /******************************************************************************/
 
-(function() {
+( function() {
 
-// based on easing equations from Robert Penner (http://www.robertpenner.com/easing)
+// Based on easing equations from Robert Penner (http://www.robertpenner.com/easing)
 
 var baseEasings = {};
 
@@ -10593,7 +17710,7 @@ $.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) {
 	baseEasings[ name ] = function( p ) {
 		return Math.pow( p, i + 2 );
 	};
-});
+} );
 
 $.extend( baseEasings, {
 	Sine: function( p ) {
@@ -10604,7 +17721,7 @@ $.extend( baseEasings, {
 	},
 	Elastic: function( p ) {
 		return p === 0 || p === 1 ? p :
-			-Math.pow( 2, 8 * (p - 1) ) * Math.sin( ( (p - 1) * 80 - 7.5 ) * Math.PI / 15 );
+			-Math.pow( 2, 8 * ( p - 1 ) ) * Math.sin( ( ( p - 1 ) * 80 - 7.5 ) * Math.PI / 15 );
 	},
 	Back: function( p ) {
 		return p * p * ( 3 * p - 2 );
@@ -10616,7 +17733,7 @@ $.extend( baseEasings, {
 		while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {}
 		return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
 	}
-});
+} );
 
 $.each( baseEasings, function( name, easeIn ) {
 	$.easing[ "easeIn" + name ] = easeIn;
@@ -10628,168 +17745,146 @@ $.each( baseEasings, function( name, easeIn ) {
 			easeIn( p * 2 ) / 2 :
 			1 - easeIn( p * -2 + 2 ) / 2;
 	};
-});
+} );
 
-})();
+} )();
 
 var effect = $.effects;
 
 
 /*!
- * jQuery UI Effects Blind 1.11.4
+ * jQuery UI Effects Blind 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/blind-effect/
  */
 
+//>>label: Blind Effect
+//>>group: Effects
+//>>description: Blinds the element.
+//>>docs: http://api.jqueryui.com/blind-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectBlind = $.effects.effect.blind = function( o, done ) {
-	// Create element
-	var el = $( this ),
-		rvertical = /up|down|vertical/,
-		rpositivemotion = /up|left|vertical|horizontal/,
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		direction = o.direction || "up",
-		vertical = rvertical.test( direction ),
-		ref = vertical ? "height" : "width",
-		ref2 = vertical ? "top" : "left",
-		motion = rpositivemotion.test( direction ),
-		animation = {},
-		show = mode === "show",
-		wrapper, distance, margin;
 
-	// if already wrapped, the wrapper's properties are my property. #6245
-	if ( el.parent().is( ".ui-effects-wrapper" ) ) {
-		$.effects.save( el.parent(), props );
-	} else {
-		$.effects.save( el, props );
-	}
-	el.show();
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
 
-	distance = wrapper[ ref ]();
-	margin = parseFloat( wrapper.css( ref2 ) ) || 0;
+var effectsEffectBlind = $.effects.define( "blind", "hide", function( options, done ) {
+	var map = {
+			up: [ "bottom", "top" ],
+			vertical: [ "bottom", "top" ],
+			down: [ "top", "bottom" ],
+			left: [ "right", "left" ],
+			horizontal: [ "right", "left" ],
+			right: [ "left", "right" ]
+		},
+		element = $( this ),
+		direction = options.direction || "up",
+		start = element.cssClip(),
+		animate = { clip: $.extend( {}, start ) },
+		placeholder = $.effects.createPlaceholder( element );
 
-	animation[ ref ] = show ? distance : 0;
-	if ( !motion ) {
-		el
-			.css( vertical ? "bottom" : "right", 0 )
-			.css( vertical ? "top" : "left", "auto" )
-			.css({ position: "absolute" });
+	animate.clip[ map[ direction ][ 0 ] ] = animate.clip[ map[ direction ][ 1 ] ];
 
-		animation[ ref2 ] = show ? margin : distance + margin;
-	}
-
-	// start at 0 if we are showing
-	if ( show ) {
-		wrapper.css( ref, 0 );
-		if ( !motion ) {
-			wrapper.css( ref2, margin + distance );
+	if ( options.mode === "show" ) {
+		element.cssClip( animate.clip );
+		if ( placeholder ) {
+			placeholder.css( $.effects.clipToBox( animate ) );
 		}
+
+		animate.clip = start;
 	}
 
-	// Animate
-	wrapper.animate( animation, {
-		duration: o.duration,
-		easing: o.easing,
+	if ( placeholder ) {
+		placeholder.animate( $.effects.clipToBox( animate ), options.duration, options.easing );
+	}
+
+	element.animate( animate, {
 		queue: false,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-};
+		duration: options.duration,
+		easing: options.easing,
+		complete: done
+	} );
+} );
 
 
 /*!
- * jQuery UI Effects Bounce 1.11.4
+ * jQuery UI Effects Bounce 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/bounce-effect/
  */
 
+//>>label: Bounce Effect
+//>>group: Effects
+//>>description: Bounces an element horizontally or vertically n times.
+//>>docs: http://api.jqueryui.com/bounce-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectBounce = $.effects.effect.bounce = function( o, done ) {
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
 
-		// defaults:
-		mode = $.effects.setMode( el, o.mode || "effect" ),
+
+var effectsEffectBounce = $.effects.define( "bounce", function( options, done ) {
+	var upAnim, downAnim, refValue,
+		element = $( this ),
+
+		// Defaults:
+		mode = options.mode,
 		hide = mode === "hide",
 		show = mode === "show",
-		direction = o.direction || "up",
-		distance = o.distance,
-		times = o.times || 5,
+		direction = options.direction || "up",
+		distance = options.distance,
+		times = options.times || 5,
 
-		// number of internal animations
+		// Number of internal animations
 		anims = times * 2 + ( show || hide ? 1 : 0 ),
-		speed = o.duration / anims,
-		easing = o.easing,
+		speed = options.duration / anims,
+		easing = options.easing,
 
-		// utility:
+		// Utility:
 		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
 		motion = ( direction === "up" || direction === "left" ),
-		i,
-		upAnim,
-		downAnim,
+		i = 0,
 
-		// we will need to re-assemble the queue to stack our animations in place
-		queue = el.queue(),
-		queuelen = queue.length;
+		queuelen = element.queue().length;
 
-	// Avoid touching opacity to prevent clearType and PNG issues in IE
-	if ( show || hide ) {
-		props.push( "opacity" );
-	}
+	$.effects.createPlaceholder( element );
 
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el ); // Create Wrapper
+	refValue = element.css( ref );
 
-	// default distance for the BIGGEST bounce is the outer Distance / 3
+	// Default distance for the BIGGEST bounce is the outer Distance / 3
 	if ( !distance ) {
-		distance = el[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3;
+		distance = element[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3;
 	}
 
 	if ( show ) {
 		downAnim = { opacity: 1 };
-		downAnim[ ref ] = 0;
+		downAnim[ ref ] = refValue;
 
-		// if we are showing, force opacity 0 and set the initial position
+		// If we are showing, force opacity 0 and set the initial position
 		// then do the "first" animation
-		el.css( "opacity", 0 )
+		element
+			.css( "opacity", 0 )
 			.css( ref, motion ? -distance * 2 : distance * 2 )
 			.animate( downAnim, speed, easing );
 	}
 
-	// start at the smallest distance if we are hiding
+	// Start at the smallest distance if we are hiding
 	if ( hide ) {
 		distance = distance / Math.pow( 2, times - 1 );
 	}
 
 	downAnim = {};
-	downAnim[ ref ] = 0;
+	downAnim[ ref ] = refValue;
+
 	// Bounces up/down/left/right then back to 0 -- times * 2 animations happen here
-	for ( i = 0; i < times; i++ ) {
+	for ( ; i < times; i++ ) {
 		upAnim = {};
 		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
 
-		el.animate( upAnim, speed, easing )
+		element
+			.animate( upAnim, speed, easing )
 			.animate( downAnim, speed, easing );
 
 		distance = hide ? distance * 2 : distance / 2;
@@ -10800,186 +17895,158 @@ var effectBounce = $.effects.effect.bounce = function( o, done ) {
 		upAnim = { opacity: 0 };
 		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
 
-		el.animate( upAnim, speed, easing );
+		element.animate( upAnim, speed, easing );
 	}
 
-	el.queue(function() {
-		if ( hide ) {
-			el.hide();
-		}
-		$.effects.restore( el, props );
-		$.effects.removeWrapper( el );
-		done();
-	});
+	element.queue( done );
 
-	// inject all the animations we just queued to be first in line (after "inprogress")
-	if ( queuelen > 1) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	el.dequeue();
-
-};
+	$.effects.unshift( element, queuelen, anims + 1 );
+} );
 
 
 /*!
- * jQuery UI Effects Clip 1.11.4
+ * jQuery UI Effects Clip 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/clip-effect/
  */
 
+//>>label: Clip Effect
+//>>group: Effects
+//>>description: Clips the element on and off like an old TV.
+//>>docs: http://api.jqueryui.com/clip-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectClip = $.effects.effect.clip = function( o, done ) {
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-		direction = o.direction || "vertical",
-		vert = direction === "vertical",
-		size = vert ? "height" : "width",
-		position = vert ? "top" : "left",
-		animation = {},
-		wrapper, animate, distance;
 
-	// Save & Show
-	$.effects.save( el, props );
-	el.show();
 
-	// Create Wrapper
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-	animate = ( el[0].tagName === "IMG" ) ? wrapper : el;
-	distance = animate[ size ]();
+var effectsEffectClip = $.effects.define( "clip", "hide", function( options, done ) {
+	var start,
+		animate = {},
+		element = $( this ),
+		direction = options.direction || "vertical",
+		both = direction === "both",
+		horizontal = both || direction === "horizontal",
+		vertical = both || direction === "vertical";
 
-	// Shift
-	if ( show ) {
-		animate.css( size, 0 );
-		animate.css( position, distance / 2 );
+	start = element.cssClip();
+	animate.clip = {
+		top: vertical ? ( start.bottom - start.top ) / 2 : start.top,
+		right: horizontal ? ( start.right - start.left ) / 2 : start.right,
+		bottom: vertical ? ( start.bottom - start.top ) / 2 : start.bottom,
+		left: horizontal ? ( start.right - start.left ) / 2 : start.left
+	};
+
+	$.effects.createPlaceholder( element );
+
+	if ( options.mode === "show" ) {
+		element.cssClip( animate.clip );
+		animate.clip = start;
 	}
 
-	// Create Animation Object:
-	animation[ size ] = show ? distance : 0;
-	animation[ position ] = show ? 0 : distance / 2;
-
-	// Animate
-	animate.animate( animation, {
+	element.animate( animate, {
 		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( !show ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
+		duration: options.duration,
+		easing: options.easing,
+		complete: done
+	} );
 
-};
+} );
 
 
 /*!
- * jQuery UI Effects Drop 1.11.4
+ * jQuery UI Effects Drop 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/drop-effect/
  */
 
+//>>label: Drop Effect
+//>>group: Effects
+//>>description: Moves an element in one direction and hides it at the same time.
+//>>docs: http://api.jqueryui.com/drop-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectDrop = $.effects.effect.drop = function( o, done ) {
 
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "opacity", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
+
+var effectsEffectDrop = $.effects.define( "drop", "hide", function( options, done ) {
+
+	var distance,
+		element = $( this ),
+		mode = options.mode,
 		show = mode === "show",
-		direction = o.direction || "left",
+		direction = options.direction || "left",
 		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		motion = ( direction === "up" || direction === "left" ) ? "pos" : "neg",
+		motion = ( direction === "up" || direction === "left" ) ? "-=" : "+=",
+		oppositeMotion = ( motion === "+=" ) ? "-=" : "+=",
 		animation = {
-			opacity: show ? 1 : 0
-		},
-		distance;
+			opacity: 0
+		};
 
-	// Adjust
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el );
+	$.effects.createPlaceholder( element );
 
-	distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]( true ) / 2;
+	distance = options.distance ||
+		element[ ref === "top" ? "outerHeight" : "outerWidth" ]( true ) / 2;
+
+	animation[ ref ] = motion + distance;
 
 	if ( show ) {
-		el
-			.css( "opacity", 0 )
-			.css( ref, motion === "pos" ? -distance : distance );
+		element.css( animation );
+
+		animation[ ref ] = oppositeMotion + distance;
+		animation.opacity = 1;
 	}
 
-	// Animation
-	animation[ ref ] = ( show ?
-		( motion === "pos" ? "+=" : "-=" ) :
-		( motion === "pos" ? "-=" : "+=" ) ) +
-		distance;
-
 	// Animate
-	el.animate( animation, {
+	element.animate( animation, {
 		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-};
+		duration: options.duration,
+		easing: options.easing,
+		complete: done
+	} );
+} );
 
 
 /*!
- * jQuery UI Effects Explode 1.11.4
+ * jQuery UI Effects Explode 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/explode-effect/
  */
 
+//>>label: Explode Effect
+//>>group: Effects
+// jscs:disable maximumLineLength
+//>>description: Explodes an element in all directions into n pieces. Implodes an element to its original wholeness.
+// jscs:enable maximumLineLength
+//>>docs: http://api.jqueryui.com/explode-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectExplode = $.effects.effect.explode = function( o, done ) {
 
-	var rows = o.pieces ? Math.round( Math.sqrt( o.pieces ) ) : 3,
+
+var effectsEffectExplode = $.effects.define( "explode", "hide", function( options, done ) {
+
+	var i, j, left, top, mx, my,
+		rows = options.pieces ? Math.round( Math.sqrt( options.pieces ) ) : 3,
 		cells = rows,
-		el = $( this ),
-		mode = $.effects.setMode( el, o.mode || "hide" ),
+		element = $( this ),
+		mode = options.mode,
 		show = mode === "show",
 
-		// show and then visibility:hidden the element before calculating offset
-		offset = el.show().css( "visibility", "hidden" ).offset(),
+		// Show and then visibility:hidden the element before calculating offset
+		offset = element.show().css( "visibility", "hidden" ).offset(),
 
-		// width and height of a piece
-		width = Math.ceil( el.outerWidth() / cells ),
-		height = Math.ceil( el.outerHeight() / rows ),
-		pieces = [],
+		// Width and height of a piece
+		width = Math.ceil( element.outerWidth() / cells ),
+		height = Math.ceil( element.outerHeight() / rows ),
+		pieces = [];
 
-		// loop
-		i, j, left, top, mx, my;
-
-	// children animate complete:
+	// Children animate complete:
 	function childComplete() {
 		pieces.push( this );
 		if ( pieces.length === rows * cells ) {
@@ -10987,277 +18054,266 @@ var effectExplode = $.effects.effect.explode = function( o, done ) {
 		}
 	}
 
-	// clone the element for each row and cell.
-	for ( i = 0; i < rows ; i++ ) { // ===>
+	// Clone the element for each row and cell.
+	for ( i = 0; i < rows; i++ ) { // ===>
 		top = offset.top + i * height;
-		my = i - ( rows - 1 ) / 2 ;
+		my = i - ( rows - 1 ) / 2;
 
-		for ( j = 0; j < cells ; j++ ) { // |||
+		for ( j = 0; j < cells; j++ ) { // |||
 			left = offset.left + j * width;
-			mx = j - ( cells - 1 ) / 2 ;
+			mx = j - ( cells - 1 ) / 2;
 
 			// Create a clone of the now hidden main element that will be absolute positioned
 			// within a wrapper div off the -left and -top equal to size of our pieces
-			el
+			element
 				.clone()
 				.appendTo( "body" )
 				.wrap( "<div></div>" )
-				.css({
+				.css( {
 					position: "absolute",
 					visibility: "visible",
 					left: -j * width,
 					top: -i * height
-				})
+				} )
 
-			// select the wrapper - make it overflow: hidden and absolute positioned based on
-			// where the original was located +left and +top equal to the size of pieces
+				// Select the wrapper - make it overflow: hidden and absolute positioned based on
+				// where the original was located +left and +top equal to the size of pieces
 				.parent()
-				.addClass( "ui-effects-explode" )
-				.css({
-					position: "absolute",
-					overflow: "hidden",
-					width: width,
-					height: height,
-					left: left + ( show ? mx * width : 0 ),
-					top: top + ( show ? my * height : 0 ),
-					opacity: show ? 0 : 1
-				}).animate({
-					left: left + ( show ? 0 : mx * width ),
-					top: top + ( show ? 0 : my * height ),
-					opacity: show ? 1 : 0
-				}, o.duration || 500, o.easing, childComplete );
+					.addClass( "ui-effects-explode" )
+					.css( {
+						position: "absolute",
+						overflow: "hidden",
+						width: width,
+						height: height,
+						left: left + ( show ? mx * width : 0 ),
+						top: top + ( show ? my * height : 0 ),
+						opacity: show ? 0 : 1
+					} )
+					.animate( {
+						left: left + ( show ? 0 : mx * width ),
+						top: top + ( show ? 0 : my * height ),
+						opacity: show ? 1 : 0
+					}, options.duration || 500, options.easing, childComplete );
 		}
 	}
 
 	function animComplete() {
-		el.css({
+		element.css( {
 			visibility: "visible"
-		});
+		} );
 		$( pieces ).remove();
-		if ( !show ) {
-			el.hide();
-		}
 		done();
 	}
-};
+} );
 
 
 /*!
- * jQuery UI Effects Fade 1.11.4
+ * jQuery UI Effects Fade 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/fade-effect/
  */
 
+//>>label: Fade Effect
+//>>group: Effects
+//>>description: Fades the element.
+//>>docs: http://api.jqueryui.com/fade-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectFade = $.effects.effect.fade = function( o, done ) {
-	var el = $( this ),
-		mode = $.effects.setMode( el, o.mode || "toggle" );
 
-	el.animate({
-		opacity: mode
-	}, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: done
-	});
-};
+
+var effectsEffectFade = $.effects.define( "fade", "toggle", function( options, done ) {
+	var show = options.mode === "show";
+
+	$( this )
+		.css( "opacity", show ? 0 : 1 )
+		.animate( {
+			opacity: show ? 1 : 0
+		}, {
+			queue: false,
+			duration: options.duration,
+			easing: options.easing,
+			complete: done
+		} );
+} );
 
 
 /*!
- * jQuery UI Effects Fold 1.11.4
+ * jQuery UI Effects Fold 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/fold-effect/
  */
 
+//>>label: Fold Effect
+//>>group: Effects
+//>>description: Folds an element first horizontally and then vertically.
+//>>docs: http://api.jqueryui.com/fold-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectFold = $.effects.effect.fold = function( o, done ) {
+
+
+var effectsEffectFold = $.effects.define( "fold", "hide", function( options, done ) {
 
 	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
+	var element = $( this ),
+		mode = options.mode,
 		show = mode === "show",
 		hide = mode === "hide",
-		size = o.size || 15,
+		size = options.size || 15,
 		percent = /([0-9]+)%/.exec( size ),
-		horizFirst = !!o.horizFirst,
-		widthFirst = show !== horizFirst,
-		ref = widthFirst ? [ "width", "height" ] : [ "height", "width" ],
-		duration = o.duration / 2,
-		wrapper, distance,
-		animation1 = {},
-		animation2 = {};
+		horizFirst = !!options.horizFirst,
+		ref = horizFirst ? [ "right", "bottom" ] : [ "bottom", "right" ],
+		duration = options.duration / 2,
 
-	$.effects.save( el, props );
-	el.show();
+		placeholder = $.effects.createPlaceholder( element ),
 
-	// Create Wrapper
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-	distance = widthFirst ?
-		[ wrapper.width(), wrapper.height() ] :
-		[ wrapper.height(), wrapper.width() ];
+		start = element.cssClip(),
+		animation1 = { clip: $.extend( {}, start ) },
+		animation2 = { clip: $.extend( {}, start ) },
+
+		distance = [ start[ ref[ 0 ] ], start[ ref[ 1 ] ] ],
+
+		queuelen = element.queue().length;
 
 	if ( percent ) {
 		size = parseInt( percent[ 1 ], 10 ) / 100 * distance[ hide ? 0 : 1 ];
 	}
+	animation1.clip[ ref[ 0 ] ] = size;
+	animation2.clip[ ref[ 0 ] ] = size;
+	animation2.clip[ ref[ 1 ] ] = 0;
+
 	if ( show ) {
-		wrapper.css( horizFirst ? {
-			height: 0,
-			width: size
-		} : {
-			height: size,
-			width: 0
-		});
+		element.cssClip( animation2.clip );
+		if ( placeholder ) {
+			placeholder.css( $.effects.clipToBox( animation2 ) );
+		}
+
+		animation2.clip = start;
 	}
 
-	// Animation
-	animation1[ ref[ 0 ] ] = show ? distance[ 0 ] : size;
-	animation2[ ref[ 1 ] ] = show ? distance[ 1 ] : 0;
-
 	// Animate
-	wrapper
-		.animate( animation1, duration, o.easing )
-		.animate( animation2, duration, o.easing, function() {
-			if ( hide ) {
-				el.hide();
+	element
+		.queue( function( next ) {
+			if ( placeholder ) {
+				placeholder
+					.animate( $.effects.clipToBox( animation1 ), duration, options.easing )
+					.animate( $.effects.clipToBox( animation2 ), duration, options.easing );
 			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		});
 
-};
+			next();
+		} )
+		.animate( animation1, duration, options.easing )
+		.animate( animation2, duration, options.easing )
+		.queue( done );
+
+	$.effects.unshift( element, queuelen, 4 );
+} );
 
 
 /*!
- * jQuery UI Effects Highlight 1.11.4
+ * jQuery UI Effects Highlight 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/highlight-effect/
  */
 
+//>>label: Highlight Effect
+//>>group: Effects
+//>>description: Highlights the background of an element in a defined color for a custom duration.
+//>>docs: http://api.jqueryui.com/highlight-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectHighlight = $.effects.effect.highlight = function( o, done ) {
-	var elem = $( this ),
-		props = [ "backgroundImage", "backgroundColor", "opacity" ],
-		mode = $.effects.setMode( elem, o.mode || "show" ),
+
+
+var effectsEffectHighlight = $.effects.define( "highlight", "show", function( options, done ) {
+	var element = $( this ),
 		animation = {
-			backgroundColor: elem.css( "backgroundColor" )
+			backgroundColor: element.css( "backgroundColor" )
 		};
 
-	if (mode === "hide") {
+	if ( options.mode === "hide" ) {
 		animation.opacity = 0;
 	}
 
-	$.effects.save( elem, props );
+	$.effects.saveStyle( element );
 
-	elem
-		.show()
-		.css({
+	element
+		.css( {
 			backgroundImage: "none",
-			backgroundColor: o.color || "#ffff99"
-		})
+			backgroundColor: options.color || "#ffff99"
+		} )
 		.animate( animation, {
 			queue: false,
-			duration: o.duration,
-			easing: o.easing,
-			complete: function() {
-				if ( mode === "hide" ) {
-					elem.hide();
-				}
-				$.effects.restore( elem, props );
-				done();
-			}
-		});
-};
+			duration: options.duration,
+			easing: options.easing,
+			complete: done
+		} );
+} );
 
 
 /*!
- * jQuery UI Effects Size 1.11.4
+ * jQuery UI Effects Size 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/size-effect/
  */
 
+//>>label: Size Effect
+//>>group: Effects
+//>>description: Resize an element to a specified width and height.
+//>>docs: http://api.jqueryui.com/size-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectSize = $.effects.effect.size = function( o, done ) {
+
+
+var effectsEffectSize = $.effects.define( "size", function( options, done ) {
 
 	// Create element
-	var original, baseline, factor,
-		el = $( this ),
-		props0 = [ "position", "top", "bottom", "left", "right", "width", "height", "overflow", "opacity" ],
-
-		// Always restore
-		props1 = [ "position", "top", "bottom", "left", "right", "overflow", "opacity" ],
+	var baseline, factor, temp,
+		element = $( this ),
 
 		// Copy for children
-		props2 = [ "width", "height", "overflow" ],
 		cProps = [ "fontSize" ],
 		vProps = [ "borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom" ],
 		hProps = [ "borderLeftWidth", "borderRightWidth", "paddingLeft", "paddingRight" ],
 
 		// Set options
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		restore = o.restore || mode !== "effect",
-		scale = o.scale || "both",
-		origin = o.origin || [ "middle", "center" ],
-		position = el.css( "position" ),
-		props = restore ? props0 : props1,
-		zero = {
-			height: 0,
-			width: 0,
-			outerHeight: 0,
-			outerWidth: 0
-		};
+		mode = options.mode,
+		restore = mode !== "effect",
+		scale = options.scale || "both",
+		origin = options.origin || [ "middle", "center" ],
+		position = element.css( "position" ),
+		pos = element.position(),
+		original = $.effects.scaledDimensions( element ),
+		from = options.from || original,
+		to = options.to || $.effects.scaledDimensions( element, 0 );
+
+	$.effects.createPlaceholder( element );
 
 	if ( mode === "show" ) {
-		el.show();
-	}
-	original = {
-		height: el.height(),
-		width: el.width(),
-		outerHeight: el.outerHeight(),
-		outerWidth: el.outerWidth()
-	};
-
-	if ( o.mode === "toggle" && mode === "show" ) {
-		el.from = o.to || zero;
-		el.to = o.from || original;
-	} else {
-		el.from = o.from || ( mode === "show" ? zero : original );
-		el.to = o.to || ( mode === "hide" ? zero : original );
+		temp = from;
+		from = to;
+		to = temp;
 	}
 
 	// Set scaling factor
 	factor = {
 		from: {
-			y: el.from.height / original.height,
-			x: el.from.width / original.width
+			y: from.height / original.height,
+			x: from.width / original.width
 		},
 		to: {
-			y: el.to.height / original.height,
-			x: el.to.width / original.width
+			y: to.height / original.height,
+			x: to.width / original.width
 		}
 	};
 
@@ -11266,16 +18322,14 @@ var effectSize = $.effects.effect.size = function( o, done ) {
 
 		// Vertical props scaling
 		if ( factor.from.y !== factor.to.y ) {
-			props = props.concat( vProps );
-			el.from = $.effects.setTransition( el, vProps, factor.from.y, el.from );
-			el.to = $.effects.setTransition( el, vProps, factor.to.y, el.to );
+			from = $.effects.setTransition( element, vProps, factor.from.y, from );
+			to = $.effects.setTransition( element, vProps, factor.to.y, to );
 		}
 
 		// Horizontal props scaling
 		if ( factor.from.x !== factor.to.x ) {
-			props = props.concat( hProps );
-			el.from = $.effects.setTransition( el, hProps, factor.from.x, el.from );
-			el.to = $.effects.setTransition( el, hProps, factor.to.x, el.to );
+			from = $.effects.setTransition( element, hProps, factor.from.x, from );
+			to = $.effects.setTransition( element, hProps, factor.to.x, to );
 		}
 	}
 
@@ -11284,348 +18338,256 @@ var effectSize = $.effects.effect.size = function( o, done ) {
 
 		// Vertical props scaling
 		if ( factor.from.y !== factor.to.y ) {
-			props = props.concat( cProps ).concat( props2 );
-			el.from = $.effects.setTransition( el, cProps, factor.from.y, el.from );
-			el.to = $.effects.setTransition( el, cProps, factor.to.y, el.to );
+			from = $.effects.setTransition( element, cProps, factor.from.y, from );
+			to = $.effects.setTransition( element, cProps, factor.to.y, to );
 		}
 	}
 
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el );
-	el.css( "overflow", "hidden" ).css( el.from );
-
-	// Adjust
-	if (origin) { // Calculate baseline shifts
+	// Adjust the position properties based on the provided origin points
+	if ( origin ) {
 		baseline = $.effects.getBaseline( origin, original );
-		el.from.top = ( original.outerHeight - el.outerHeight() ) * baseline.y;
-		el.from.left = ( original.outerWidth - el.outerWidth() ) * baseline.x;
-		el.to.top = ( original.outerHeight - el.to.outerHeight ) * baseline.y;
-		el.to.left = ( original.outerWidth - el.to.outerWidth ) * baseline.x;
+		from.top = ( original.outerHeight - from.outerHeight ) * baseline.y + pos.top;
+		from.left = ( original.outerWidth - from.outerWidth ) * baseline.x + pos.left;
+		to.top = ( original.outerHeight - to.outerHeight ) * baseline.y + pos.top;
+		to.left = ( original.outerWidth - to.outerWidth ) * baseline.x + pos.left;
 	}
-	el.css( el.from ); // set top & left
+	element.css( from );
 
-	// Animate
-	if ( scale === "content" || scale === "both" ) { // Scale the children
+	// Animate the children if desired
+	if ( scale === "content" || scale === "both" ) {
 
-		// Add margins/font-size
-		vProps = vProps.concat([ "marginTop", "marginBottom" ]).concat(cProps);
-		hProps = hProps.concat([ "marginLeft", "marginRight" ]);
-		props2 = props0.concat(vProps).concat(hProps);
+		vProps = vProps.concat( [ "marginTop", "marginBottom" ] ).concat( cProps );
+		hProps = hProps.concat( [ "marginLeft", "marginRight" ] );
 
-		el.find( "*[width]" ).each( function() {
+		// Only animate children with width attributes specified
+		// TODO: is this right? should we include anything with css width specified as well
+		element.find( "*[width]" ).each( function() {
 			var child = $( this ),
-				c_original = {
-					height: child.height(),
-					width: child.width(),
-					outerHeight: child.outerHeight(),
-					outerWidth: child.outerWidth()
+				childOriginal = $.effects.scaledDimensions( child ),
+				childFrom = {
+					height: childOriginal.height * factor.from.y,
+					width: childOriginal.width * factor.from.x,
+					outerHeight: childOriginal.outerHeight * factor.from.y,
+					outerWidth: childOriginal.outerWidth * factor.from.x
+				},
+				childTo = {
+					height: childOriginal.height * factor.to.y,
+					width: childOriginal.width * factor.to.x,
+					outerHeight: childOriginal.height * factor.to.y,
+					outerWidth: childOriginal.width * factor.to.x
 				};
-			if (restore) {
-				$.effects.save(child, props2);
-			}
-
-			child.from = {
-				height: c_original.height * factor.from.y,
-				width: c_original.width * factor.from.x,
-				outerHeight: c_original.outerHeight * factor.from.y,
-				outerWidth: c_original.outerWidth * factor.from.x
-			};
-			child.to = {
-				height: c_original.height * factor.to.y,
-				width: c_original.width * factor.to.x,
-				outerHeight: c_original.height * factor.to.y,
-				outerWidth: c_original.width * factor.to.x
-			};
 
 			// Vertical props scaling
 			if ( factor.from.y !== factor.to.y ) {
-				child.from = $.effects.setTransition( child, vProps, factor.from.y, child.from );
-				child.to = $.effects.setTransition( child, vProps, factor.to.y, child.to );
+				childFrom = $.effects.setTransition( child, vProps, factor.from.y, childFrom );
+				childTo = $.effects.setTransition( child, vProps, factor.to.y, childTo );
 			}
 
 			// Horizontal props scaling
 			if ( factor.from.x !== factor.to.x ) {
-				child.from = $.effects.setTransition( child, hProps, factor.from.x, child.from );
-				child.to = $.effects.setTransition( child, hProps, factor.to.x, child.to );
+				childFrom = $.effects.setTransition( child, hProps, factor.from.x, childFrom );
+				childTo = $.effects.setTransition( child, hProps, factor.to.x, childTo );
+			}
+
+			if ( restore ) {
+				$.effects.saveStyle( child );
 			}
 
 			// Animate children
-			child.css( child.from );
-			child.animate( child.to, o.duration, o.easing, function() {
+			child.css( childFrom );
+			child.animate( childTo, options.duration, options.easing, function() {
 
 				// Restore children
 				if ( restore ) {
-					$.effects.restore( child, props2 );
+					$.effects.restoreStyle( child );
 				}
-			});
-		});
+			} );
+		} );
 	}
 
 	// Animate
-	el.animate( el.to, {
+	element.animate( to, {
 		queue: false,
-		duration: o.duration,
-		easing: o.easing,
+		duration: options.duration,
+		easing: options.easing,
 		complete: function() {
-			if ( el.to.opacity === 0 ) {
-				el.css( "opacity", el.from.opacity );
+
+			var offset = element.offset();
+
+			if ( to.opacity === 0 ) {
+				element.css( "opacity", from.opacity );
 			}
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
+
 			if ( !restore ) {
+				element
+					.css( "position", position === "static" ? "relative" : position )
+					.offset( offset );
 
-				// we need to calculate our new positioning based on the scaling
-				if ( position === "static" ) {
-					el.css({
-						position: "relative",
-						top: el.to.top,
-						left: el.to.left
-					});
-				} else {
-					$.each([ "top", "left" ], function( idx, pos ) {
-						el.css( pos, function( _, str ) {
-							var val = parseInt( str, 10 ),
-								toRef = idx ? el.to.left : el.to.top;
-
-							// if original was "auto", recalculate the new value from wrapper
-							if ( str === "auto" ) {
-								return toRef + "px";
-							}
-
-							return val + toRef + "px";
-						});
-					});
-				}
+				// Need to save style here so that automatic style restoration
+				// doesn't restore to the original styles from before the animation.
+				$.effects.saveStyle( element );
 			}
 
-			$.effects.removeWrapper( el );
 			done();
 		}
-	});
+	} );
 
-};
+} );
 
 
 /*!
- * jQuery UI Effects Scale 1.11.4
+ * jQuery UI Effects Scale 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/scale-effect/
  */
 
+//>>label: Scale Effect
+//>>group: Effects
+//>>description: Grows or shrinks an element and its content.
+//>>docs: http://api.jqueryui.com/scale-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectScale = $.effects.effect.scale = function( o, done ) {
+
+
+var effectsEffectScale = $.effects.define( "scale", function( options, done ) {
 
 	// Create element
 	var el = $( this ),
-		options = $.extend( true, {}, o ),
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		percent = parseInt( o.percent, 10 ) ||
-			( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode === "hide" ? 0 : 100 ) ),
-		direction = o.direction || "both",
-		origin = o.origin,
-		original = {
-			height: el.height(),
-			width: el.width(),
-			outerHeight: el.outerHeight(),
-			outerWidth: el.outerWidth()
-		},
-		factor = {
-			y: direction !== "horizontal" ? (percent / 100) : 1,
-			x: direction !== "vertical" ? (percent / 100) : 1
-		};
+		mode = options.mode,
+		percent = parseInt( options.percent, 10 ) ||
+			( parseInt( options.percent, 10 ) === 0 ? 0 : ( mode !== "effect" ? 0 : 100 ) ),
 
-	// We are going to pass this effect to the size effect:
-	options.effect = "size";
-	options.queue = false;
-	options.complete = done;
-
-	// Set default origin and restore for show/hide
-	if ( mode !== "effect" ) {
-		options.origin = origin || [ "middle", "center" ];
-		options.restore = true;
-	}
-
-	options.from = o.from || ( mode === "show" ? {
-		height: 0,
-		width: 0,
-		outerHeight: 0,
-		outerWidth: 0
-	} : original );
-	options.to = {
-		height: original.height * factor.y,
-		width: original.width * factor.x,
-		outerHeight: original.outerHeight * factor.y,
-		outerWidth: original.outerWidth * factor.x
-	};
+		newOptions = $.extend( true, {
+			from: $.effects.scaledDimensions( el ),
+			to: $.effects.scaledDimensions( el, percent, options.direction || "both" ),
+			origin: options.origin || [ "middle", "center" ]
+		}, options );
 
 	// Fade option to support puff
 	if ( options.fade ) {
-		if ( mode === "show" ) {
-			options.from.opacity = 0;
-			options.to.opacity = 1;
-		}
-		if ( mode === "hide" ) {
-			options.from.opacity = 1;
-			options.to.opacity = 0;
-		}
+		newOptions.from.opacity = 1;
+		newOptions.to.opacity = 0;
 	}
 
-	// Animate
-	el.effect( options );
-
-};
+	$.effects.effect.size.call( this, newOptions, done );
+} );
 
 
 /*!
- * jQuery UI Effects Puff 1.11.4
+ * jQuery UI Effects Puff 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/puff-effect/
  */
 
+//>>label: Puff Effect
+//>>group: Effects
+//>>description: Creates a puff effect by scaling the element up and hiding it at the same time.
+//>>docs: http://api.jqueryui.com/puff-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectPuff = $.effects.effect.puff = function( o, done ) {
-	var elem = $( this ),
-		mode = $.effects.setMode( elem, o.mode || "hide" ),
-		hide = mode === "hide",
-		percent = parseInt( o.percent, 10 ) || 150,
-		factor = percent / 100,
-		original = {
-			height: elem.height(),
-			width: elem.width(),
-			outerHeight: elem.outerHeight(),
-			outerWidth: elem.outerWidth()
-		};
 
-	$.extend( o, {
-		effect: "scale",
-		queue: false,
+
+var effectsEffectPuff = $.effects.define( "puff", "hide", function( options, done ) {
+	var newOptions = $.extend( true, {}, options, {
 		fade: true,
-		mode: mode,
-		complete: done,
-		percent: hide ? percent : 100,
-		from: hide ?
-			original :
-			{
-				height: original.height * factor,
-				width: original.width * factor,
-				outerHeight: original.outerHeight * factor,
-				outerWidth: original.outerWidth * factor
-			}
-	});
+		percent: parseInt( options.percent, 10 ) || 150
+	} );
 
-	elem.effect( o );
-};
+	$.effects.effect.scale.call( this, newOptions, done );
+} );
 
 
 /*!
- * jQuery UI Effects Pulsate 1.11.4
+ * jQuery UI Effects Pulsate 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/pulsate-effect/
  */
 
+//>>label: Pulsate Effect
+//>>group: Effects
+//>>description: Pulsates an element n times by changing the opacity to zero and back.
+//>>docs: http://api.jqueryui.com/pulsate-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectPulsate = $.effects.effect.pulsate = function( o, done ) {
-	var elem = $( this ),
-		mode = $.effects.setMode( elem, o.mode || "show" ),
+
+
+var effectsEffectPulsate = $.effects.define( "pulsate", "show", function( options, done ) {
+	var element = $( this ),
+		mode = options.mode,
 		show = mode === "show",
 		hide = mode === "hide",
-		showhide = ( show || mode === "hide" ),
+		showhide = show || hide,
 
-		// showing or hiding leaves of the "last" animation
-		anims = ( ( o.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
-		duration = o.duration / anims,
+		// Showing or hiding leaves off the "last" animation
+		anims = ( ( options.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
+		duration = options.duration / anims,
 		animateTo = 0,
-		queue = elem.queue(),
-		queuelen = queue.length,
-		i;
+		i = 1,
+		queuelen = element.queue().length;
 
-	if ( show || !elem.is(":visible")) {
-		elem.css( "opacity", 0 ).show();
+	if ( show || !element.is( ":visible" ) ) {
+		element.css( "opacity", 0 ).show();
 		animateTo = 1;
 	}
 
-	// anims - 1 opacity "toggles"
-	for ( i = 1; i < anims; i++ ) {
-		elem.animate({
-			opacity: animateTo
-		}, duration, o.easing );
+	// Anims - 1 opacity "toggles"
+	for ( ; i < anims; i++ ) {
+		element.animate( { opacity: animateTo }, duration, options.easing );
 		animateTo = 1 - animateTo;
 	}
 
-	elem.animate({
-		opacity: animateTo
-	}, duration, o.easing);
+	element.animate( { opacity: animateTo }, duration, options.easing );
 
-	elem.queue(function() {
-		if ( hide ) {
-			elem.hide();
-		}
-		done();
-	});
+	element.queue( done );
 
-	// We just queued up "anims" animations, we need to put them next in the queue
-	if ( queuelen > 1 ) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	elem.dequeue();
-};
+	$.effects.unshift( element, queuelen, anims + 1 );
+} );
 
 
 /*!
- * jQuery UI Effects Shake 1.11.4
+ * jQuery UI Effects Shake 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/shake-effect/
  */
 
+//>>label: Shake Effect
+//>>group: Effects
+//>>description: Shakes an element horizontally or vertically n times.
+//>>docs: http://api.jqueryui.com/shake-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectShake = $.effects.effect.shake = function( o, done ) {
 
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		direction = o.direction || "left",
-		distance = o.distance || 20,
-		times = o.times || 3,
+
+var effectsEffectShake = $.effects.define( "shake", function( options, done ) {
+
+	var i = 1,
+		element = $( this ),
+		direction = options.direction || "left",
+		distance = options.distance || 20,
+		times = options.times || 3,
 		anims = times * 2 + 1,
-		speed = Math.round( o.duration / anims ),
-		ref = (direction === "up" || direction === "down") ? "top" : "left",
-		positiveMotion = (direction === "up" || direction === "left"),
+		speed = Math.round( options.duration / anims ),
+		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
+		positiveMotion = ( direction === "up" || direction === "left" ),
 		animation = {},
 		animation1 = {},
 		animation2 = {},
-		i,
 
-		// we will need to re-assemble the queue to stack our animations in place
-		queue = el.queue(),
-		queuelen = queue.length;
+		queuelen = element.queue().length;
 
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el );
+	$.effects.createPlaceholder( element );
 
 	// Animation
 	animation[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance;
@@ -11633,4984 +18595,111 @@ var effectShake = $.effects.effect.shake = function( o, done ) {
 	animation2[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance * 2;
 
 	// Animate
-	el.animate( animation, speed, o.easing );
+	element.animate( animation, speed, options.easing );
 
 	// Shakes
-	for ( i = 1; i < times; i++ ) {
-		el.animate( animation1, speed, o.easing ).animate( animation2, speed, o.easing );
+	for ( ; i < times; i++ ) {
+		element
+			.animate( animation1, speed, options.easing )
+			.animate( animation2, speed, options.easing );
 	}
-	el
-		.animate( animation1, speed, o.easing )
-		.animate( animation, speed / 2, o.easing )
-		.queue(function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		});
 
-	// inject all the animations we just queued to be first in line (after "inprogress")
-	if ( queuelen > 1) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	el.dequeue();
+	element
+		.animate( animation1, speed, options.easing )
+		.animate( animation, speed / 2, options.easing )
+		.queue( done );
 
-};
+	$.effects.unshift( element, queuelen, anims + 1 );
+} );
 
 
 /*!
- * jQuery UI Effects Slide 1.11.4
+ * jQuery UI Effects Slide 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/slide-effect/
  */
 
+//>>label: Slide Effect
+//>>group: Effects
+//>>description: Slides an element in and out of the viewport.
+//>>docs: http://api.jqueryui.com/slide-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectSlide = $.effects.effect.slide = function( o, done ) {
 
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "width", "height" ],
-		mode = $.effects.setMode( el, o.mode || "show" ),
-		show = mode === "show",
-		direction = o.direction || "left",
-		ref = (direction === "up" || direction === "down") ? "top" : "left",
-		positiveMotion = (direction === "up" || direction === "left"),
-		distance,
+
+var effectsEffectSlide = $.effects.define( "slide", "show", function( options, done ) {
+	var startClip, startRef,
+		element = $( this ),
+		map = {
+			up: [ "bottom", "top" ],
+			down: [ "top", "bottom" ],
+			left: [ "right", "left" ],
+			right: [ "left", "right" ]
+		},
+		mode = options.mode,
+		direction = options.direction || "left",
+		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
+		positiveMotion = ( direction === "up" || direction === "left" ),
+		distance = options.distance ||
+			element[ ref === "top" ? "outerHeight" : "outerWidth" ]( true ),
 		animation = {};
 
-	// Adjust
-	$.effects.save( el, props );
-	el.show();
-	distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]( true );
+	$.effects.createPlaceholder( element );
 
-	$.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
+	startClip = element.cssClip();
+	startRef = element.position()[ ref ];
 
-	if ( show ) {
-		el.css( ref, positiveMotion ? (isNaN(distance) ? "-" + distance : -distance) : distance );
+	// Define hide animation
+	animation[ ref ] = ( positiveMotion ? -1 : 1 ) * distance + startRef;
+	animation.clip = element.cssClip();
+	animation.clip[ map[ direction ][ 1 ] ] = animation.clip[ map[ direction ][ 0 ] ];
+
+	// Reverse the animation if we're showing
+	if ( mode === "show" ) {
+		element.cssClip( animation.clip );
+		element.css( ref, animation[ ref ] );
+		animation.clip = startClip;
+		animation[ ref ] = startRef;
 	}
 
-	// Animation
-	animation[ ref ] = ( show ?
-		( positiveMotion ? "+=" : "-=") :
-		( positiveMotion ? "-=" : "+=")) +
-		distance;
-
-	// Animate
-	el.animate( animation, {
+	// Actually animate
+	element.animate( animation, {
 		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-};
+		duration: options.duration,
+		easing: options.easing,
+		complete: done
+	} );
+} );
 
 
 /*!
- * jQuery UI Effects Transfer 1.11.4
+ * jQuery UI Effects Transfer 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
- *
- * http://api.jqueryui.com/transfer-effect/
  */
 
+//>>label: Transfer Effect
+//>>group: Effects
+//>>description: Displays a transfer effect from one element to another.
+//>>docs: http://api.jqueryui.com/transfer-effect/
+//>>demos: http://jqueryui.com/effect/
 
-var effectTransfer = $.effects.effect.transfer = function( o, done ) {
-	var elem = $( this ),
-		target = $( o.to ),
-		targetFixed = target.css( "position" ) === "fixed",
-		body = $("body"),
-		fixTop = targetFixed ? body.scrollTop() : 0,
-		fixLeft = targetFixed ? body.scrollLeft() : 0,
-		endPosition = target.offset(),
-		animation = {
-			top: endPosition.top - fixTop,
-			left: endPosition.left - fixLeft,
-			height: target.innerHeight(),
-			width: target.innerWidth()
-		},
-		startPosition = elem.offset(),
-		transfer = $( "<div class='ui-effects-transfer'></div>" )
-			.appendTo( document.body )
-			.addClass( o.className )
-			.css({
-				top: startPosition.top - fixTop,
-				left: startPosition.left - fixLeft,
-				height: elem.innerHeight(),
-				width: elem.innerWidth(),
-				position: targetFixed ? "fixed" : "absolute"
-			})
-			.animate( animation, o.duration, o.easing, function() {
-				transfer.remove();
-				done();
-			});
-};
 
 
-/*!
- * jQuery UI Progressbar 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/progressbar/
- */
-
-
-var progressbar = $.widget( "ui.progressbar", {
-	version: "1.11.4",
-	options: {
-		max: 100,
-		value: 0,
-
-		change: null,
-		complete: null
-	},
-
-	min: 0,
-
-	_create: function() {
-		// Constrain initial value
-		this.oldValue = this.options.value = this._constrainedValue();
-
-		this.element
-			.addClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
-			.attr({
-				// Only set static values, aria-valuenow and aria-valuemax are
-				// set inside _refreshValue()
-				role: "progressbar",
-				"aria-valuemin": this.min
-			});
-
-		this.valueDiv = $( "<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>" )
-			.appendTo( this.element );
-
-		this._refreshValue();
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-valuemin" )
-			.removeAttr( "aria-valuemax" )
-			.removeAttr( "aria-valuenow" );
-
-		this.valueDiv.remove();
-	},
-
-	value: function( newValue ) {
-		if ( newValue === undefined ) {
-			return this.options.value;
-		}
-
-		this.options.value = this._constrainedValue( newValue );
-		this._refreshValue();
-	},
-
-	_constrainedValue: function( newValue ) {
-		if ( newValue === undefined ) {
-			newValue = this.options.value;
-		}
-
-		this.indeterminate = newValue === false;
-
-		// sanitize value
-		if ( typeof newValue !== "number" ) {
-			newValue = 0;
-		}
-
-		return this.indeterminate ? false :
-			Math.min( this.options.max, Math.max( this.min, newValue ) );
-	},
-
-	_setOptions: function( options ) {
-		// Ensure "value" option is set after other values (like max)
-		var value = options.value;
-		delete options.value;
-
-		this._super( options );
-
-		this.options.value = this._constrainedValue( value );
-		this._refreshValue();
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "max" ) {
-			// Don't allow a max less than min
-			value = Math.max( this.min, value );
-		}
-		if ( key === "disabled" ) {
-			this.element
-				.toggleClass( "ui-state-disabled", !!value )
-				.attr( "aria-disabled", value );
-		}
-		this._super( key, value );
-	},
-
-	_percentage: function() {
-		return this.indeterminate ? 100 : 100 * ( this.options.value - this.min ) / ( this.options.max - this.min );
-	},
-
-	_refreshValue: function() {
-		var value = this.options.value,
-			percentage = this._percentage();
-
-		this.valueDiv
-			.toggle( this.indeterminate || value > this.min )
-			.toggleClass( "ui-corner-right", value === this.options.max )
-			.width( percentage.toFixed(0) + "%" );
-
-		this.element.toggleClass( "ui-progressbar-indeterminate", this.indeterminate );
-
-		if ( this.indeterminate ) {
-			this.element.removeAttr( "aria-valuenow" );
-			if ( !this.overlayDiv ) {
-				this.overlayDiv = $( "<div class='ui-progressbar-overlay'></div>" ).appendTo( this.valueDiv );
-			}
-		} else {
-			this.element.attr({
-				"aria-valuemax": this.options.max,
-				"aria-valuenow": value
-			});
-			if ( this.overlayDiv ) {
-				this.overlayDiv.remove();
-				this.overlayDiv = null;
-			}
-		}
-
-		if ( this.oldValue !== value ) {
-			this.oldValue = value;
-			this._trigger( "change" );
-		}
-		if ( value === this.options.max ) {
-			this._trigger( "complete" );
-		}
-	}
-});
-
-
-/*!
- * jQuery UI Selectable 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/selectable/
- */
-
-
-var selectable = $.widget("ui.selectable", $.ui.mouse, {
-	version: "1.11.4",
-	options: {
-		appendTo: "body",
-		autoRefresh: true,
-		distance: 0,
-		filter: "*",
-		tolerance: "touch",
-
-		// callbacks
-		selected: null,
-		selecting: null,
-		start: null,
-		stop: null,
-		unselected: null,
-		unselecting: null
-	},
-	_create: function() {
-		var selectees,
-			that = this;
-
-		this.element.addClass("ui-selectable");
-
-		this.dragged = false;
-
-		// cache selectee children based on filter
-		this.refresh = function() {
-			selectees = $(that.options.filter, that.element[0]);
-			selectees.addClass("ui-selectee");
-			selectees.each(function() {
-				var $this = $(this),
-					pos = $this.offset();
-				$.data(this, "selectable-item", {
-					element: this,
-					$element: $this,
-					left: pos.left,
-					top: pos.top,
-					right: pos.left + $this.outerWidth(),
-					bottom: pos.top + $this.outerHeight(),
-					startselected: false,
-					selected: $this.hasClass("ui-selected"),
-					selecting: $this.hasClass("ui-selecting"),
-					unselecting: $this.hasClass("ui-unselecting")
-				});
-			});
-		};
-		this.refresh();
-
-		this.selectees = selectees.addClass("ui-selectee");
-
-		this._mouseInit();
-
-		this.helper = $("<div class='ui-selectable-helper'></div>");
-	},
-
-	_destroy: function() {
-		this.selectees
-			.removeClass("ui-selectee")
-			.removeData("selectable-item");
-		this.element
-			.removeClass("ui-selectable ui-selectable-disabled");
-		this._mouseDestroy();
-	},
-
-	_mouseStart: function(event) {
-		var that = this,
-			options = this.options;
-
-		this.opos = [ event.pageX, event.pageY ];
-
-		if (this.options.disabled) {
-			return;
-		}
-
-		this.selectees = $(options.filter, this.element[0]);
-
-		this._trigger("start", event);
-
-		$(options.appendTo).append(this.helper);
-		// position helper (lasso)
-		this.helper.css({
-			"left": event.pageX,
-			"top": event.pageY,
-			"width": 0,
-			"height": 0
-		});
-
-		if (options.autoRefresh) {
-			this.refresh();
-		}
-
-		this.selectees.filter(".ui-selected").each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.startselected = true;
-			if (!event.metaKey && !event.ctrlKey) {
-				selectee.$element.removeClass("ui-selected");
-				selectee.selected = false;
-				selectee.$element.addClass("ui-unselecting");
-				selectee.unselecting = true;
-				// selectable UNSELECTING callback
-				that._trigger("unselecting", event, {
-					unselecting: selectee.element
-				});
-			}
-		});
-
-		$(event.target).parents().addBack().each(function() {
-			var doSelect,
-				selectee = $.data(this, "selectable-item");
-			if (selectee) {
-				doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass("ui-selected");
-				selectee.$element
-					.removeClass(doSelect ? "ui-unselecting" : "ui-selected")
-					.addClass(doSelect ? "ui-selecting" : "ui-unselecting");
-				selectee.unselecting = !doSelect;
-				selectee.selecting = doSelect;
-				selectee.selected = doSelect;
-				// selectable (UN)SELECTING callback
-				if (doSelect) {
-					that._trigger("selecting", event, {
-						selecting: selectee.element
-					});
-				} else {
-					that._trigger("unselecting", event, {
-						unselecting: selectee.element
-					});
-				}
-				return false;
-			}
-		});
-
-	},
-
-	_mouseDrag: function(event) {
-
-		this.dragged = true;
-
-		if (this.options.disabled) {
-			return;
-		}
-
-		var tmp,
-			that = this,
-			options = this.options,
-			x1 = this.opos[0],
-			y1 = this.opos[1],
-			x2 = event.pageX,
-			y2 = event.pageY;
-
-		if (x1 > x2) { tmp = x2; x2 = x1; x1 = tmp; }
-		if (y1 > y2) { tmp = y2; y2 = y1; y1 = tmp; }
-		this.helper.css({ left: x1, top: y1, width: x2 - x1, height: y2 - y1 });
-
-		this.selectees.each(function() {
-			var selectee = $.data(this, "selectable-item"),
-				hit = false;
-
-			//prevent helper from being selected if appendTo: selectable
-			if (!selectee || selectee.element === that.element[0]) {
-				return;
-			}
-
-			if (options.tolerance === "touch") {
-				hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) );
-			} else if (options.tolerance === "fit") {
-				hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2);
-			}
-
-			if (hit) {
-				// SELECT
-				if (selectee.selected) {
-					selectee.$element.removeClass("ui-selected");
-					selectee.selected = false;
-				}
-				if (selectee.unselecting) {
-					selectee.$element.removeClass("ui-unselecting");
-					selectee.unselecting = false;
-				}
-				if (!selectee.selecting) {
-					selectee.$element.addClass("ui-selecting");
-					selectee.selecting = true;
-					// selectable SELECTING callback
-					that._trigger("selecting", event, {
-						selecting: selectee.element
-					});
-				}
-			} else {
-				// UNSELECT
-				if (selectee.selecting) {
-					if ((event.metaKey || event.ctrlKey) && selectee.startselected) {
-						selectee.$element.removeClass("ui-selecting");
-						selectee.selecting = false;
-						selectee.$element.addClass("ui-selected");
-						selectee.selected = true;
-					} else {
-						selectee.$element.removeClass("ui-selecting");
-						selectee.selecting = false;
-						if (selectee.startselected) {
-							selectee.$element.addClass("ui-unselecting");
-							selectee.unselecting = true;
-						}
-						// selectable UNSELECTING callback
-						that._trigger("unselecting", event, {
-							unselecting: selectee.element
-						});
-					}
-				}
-				if (selectee.selected) {
-					if (!event.metaKey && !event.ctrlKey && !selectee.startselected) {
-						selectee.$element.removeClass("ui-selected");
-						selectee.selected = false;
-
-						selectee.$element.addClass("ui-unselecting");
-						selectee.unselecting = true;
-						// selectable UNSELECTING callback
-						that._trigger("unselecting", event, {
-							unselecting: selectee.element
-						});
-					}
-				}
-			}
-		});
-
-		return false;
-	},
-
-	_mouseStop: function(event) {
-		var that = this;
-
-		this.dragged = false;
-
-		$(".ui-unselecting", this.element[0]).each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.$element.removeClass("ui-unselecting");
-			selectee.unselecting = false;
-			selectee.startselected = false;
-			that._trigger("unselected", event, {
-				unselected: selectee.element
-			});
-		});
-		$(".ui-selecting", this.element[0]).each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.$element.removeClass("ui-selecting").addClass("ui-selected");
-			selectee.selecting = false;
-			selectee.selected = true;
-			selectee.startselected = true;
-			that._trigger("selected", event, {
-				selected: selectee.element
-			});
-		});
-		this._trigger("stop", event);
-
-		this.helper.remove();
-
-		return false;
-	}
-
-});
-
-
-/*!
- * jQuery UI Selectmenu 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/selectmenu
- */
-
-
-var selectmenu = $.widget( "ui.selectmenu", {
-	version: "1.11.4",
-	defaultElement: "<select>",
-	options: {
-		appendTo: null,
-		disabled: null,
-		icons: {
-			button: "ui-icon-triangle-1-s"
-		},
-		position: {
-			my: "left top",
-			at: "left bottom",
-			collision: "none"
-		},
-		width: null,
-
-		// callbacks
-		change: null,
-		close: null,
-		focus: null,
-		open: null,
-		select: null
-	},
-
-	_create: function() {
-		var selectmenuId = this.element.uniqueId().attr( "id" );
-		this.ids = {
-			element: selectmenuId,
-			button: selectmenuId + "-button",
-			menu: selectmenuId + "-menu"
-		};
-
-		this._drawButton();
-		this._drawMenu();
-
-		if ( this.options.disabled ) {
-			this.disable();
-		}
-	},
-
-	_drawButton: function() {
-		var that = this;
-
-		// Associate existing label with the new button
-		this.label = $( "label[for='" + this.ids.element + "']" ).attr( "for", this.ids.button );
-		this._on( this.label, {
-			click: function( event ) {
-				this.button.focus();
-				event.preventDefault();
-			}
-		});
-
-		// Hide original select element
-		this.element.hide();
-
-		// Create button
-		this.button = $( "<span>", {
-			"class": "ui-selectmenu-button ui-widget ui-state-default ui-corner-all",
-			tabindex: this.options.disabled ? -1 : 0,
-			id: this.ids.button,
-			role: "combobox",
-			"aria-expanded": "false",
-			"aria-autocomplete": "list",
-			"aria-owns": this.ids.menu,
-			"aria-haspopup": "true"
-		})
-			.insertAfter( this.element );
-
-		$( "<span>", {
-			"class": "ui-icon " + this.options.icons.button
-		})
-			.prependTo( this.button );
-
-		this.buttonText = $( "<span>", {
-			"class": "ui-selectmenu-text"
-		})
-			.appendTo( this.button );
-
-		this._setText( this.buttonText, this.element.find( "option:selected" ).text() );
-		this._resizeButton();
-
-		this._on( this.button, this._buttonEvents );
-		this.button.one( "focusin", function() {
-
-			// Delay rendering the menu items until the button receives focus.
-			// The menu may have already been rendered via a programmatic open.
-			if ( !that.menuItems ) {
-				that._refreshMenu();
-			}
-		});
-		this._hoverable( this.button );
-		this._focusable( this.button );
-	},
-
-	_drawMenu: function() {
-		var that = this;
-
-		// Create menu
-		this.menu = $( "<ul>", {
-			"aria-hidden": "true",
-			"aria-labelledby": this.ids.button,
-			id: this.ids.menu
-		});
-
-		// Wrap menu
-		this.menuWrap = $( "<div>", {
-			"class": "ui-selectmenu-menu ui-front"
-		})
-			.append( this.menu )
-			.appendTo( this._appendTo() );
-
-		// Initialize menu widget
-		this.menuInstance = this.menu
-			.menu({
-				role: "listbox",
-				select: function( event, ui ) {
-					event.preventDefault();
-
-					// support: IE8
-					// If the item was selected via a click, the text selection
-					// will be destroyed in IE
-					that._setSelection();
-
-					that._select( ui.item.data( "ui-selectmenu-item" ), event );
-				},
-				focus: function( event, ui ) {
-					var item = ui.item.data( "ui-selectmenu-item" );
-
-					// Prevent inital focus from firing and check if its a newly focused item
-					if ( that.focusIndex != null && item.index !== that.focusIndex ) {
-						that._trigger( "focus", event, { item: item } );
-						if ( !that.isOpen ) {
-							that._select( item, event );
-						}
-					}
-					that.focusIndex = item.index;
-
-					that.button.attr( "aria-activedescendant",
-						that.menuItems.eq( item.index ).attr( "id" ) );
-				}
-			})
-			.menu( "instance" );
-
-		// Adjust menu styles to dropdown
-		this.menu
-			.addClass( "ui-corner-bottom" )
-			.removeClass( "ui-corner-all" );
-
-		// Don't close the menu on mouseleave
-		this.menuInstance._off( this.menu, "mouseleave" );
-
-		// Cancel the menu's collapseAll on document click
-		this.menuInstance._closeOnDocumentClick = function() {
-			return false;
-		};
-
-		// Selects often contain empty items, but never contain dividers
-		this.menuInstance._isDivider = function() {
-			return false;
-		};
-	},
-
-	refresh: function() {
-		this._refreshMenu();
-		this._setText( this.buttonText, this._getSelectedItem().text() );
-		if ( !this.options.width ) {
-			this._resizeButton();
-		}
-	},
-
-	_refreshMenu: function() {
-		this.menu.empty();
-
-		var item,
-			options = this.element.find( "option" );
-
-		if ( !options.length ) {
-			return;
-		}
-
-		this._parseOptions( options );
-		this._renderMenu( this.menu, this.items );
-
-		this.menuInstance.refresh();
-		this.menuItems = this.menu.find( "li" ).not( ".ui-selectmenu-optgroup" );
-
-		item = this._getSelectedItem();
-
-		// Update the menu to have the correct item focused
-		this.menuInstance.focus( null, item );
-		this._setAria( item.data( "ui-selectmenu-item" ) );
-
-		// Set disabled state
-		this._setOption( "disabled", this.element.prop( "disabled" ) );
-	},
-
-	open: function( event ) {
-		if ( this.options.disabled ) {
-			return;
-		}
-
-		// If this is the first time the menu is being opened, render the items
-		if ( !this.menuItems ) {
-			this._refreshMenu();
-		} else {
-
-			// Menu clears focus on close, reset focus to selected item
-			this.menu.find( ".ui-state-focus" ).removeClass( "ui-state-focus" );
-			this.menuInstance.focus( null, this._getSelectedItem() );
-		}
-
-		this.isOpen = true;
-		this._toggleAttr();
-		this._resizeMenu();
-		this._position();
-
-		this._on( this.document, this._documentClick );
-
-		this._trigger( "open", event );
-	},
-
-	_position: function() {
-		this.menuWrap.position( $.extend( { of: this.button }, this.options.position ) );
-	},
-
-	close: function( event ) {
-		if ( !this.isOpen ) {
-			return;
-		}
-
-		this.isOpen = false;
-		this._toggleAttr();
-
-		this.range = null;
-		this._off( this.document );
-
-		this._trigger( "close", event );
-	},
-
-	widget: function() {
-		return this.button;
-	},
-
-	menuWidget: function() {
-		return this.menu;
-	},
-
-	_renderMenu: function( ul, items ) {
-		var that = this,
-			currentOptgroup = "";
-
-		$.each( items, function( index, item ) {
-			if ( item.optgroup !== currentOptgroup ) {
-				$( "<li>", {
-					"class": "ui-selectmenu-optgroup ui-menu-divider" +
-						( item.element.parent( "optgroup" ).prop( "disabled" ) ?
-							" ui-state-disabled" :
-							"" ),
-					text: item.optgroup
-				})
-					.appendTo( ul );
-
-				currentOptgroup = item.optgroup;
-			}
-
-			that._renderItemData( ul, item );
-		});
-	},
-
-	_renderItemData: function( ul, item ) {
-		return this._renderItem( ul, item ).data( "ui-selectmenu-item", item );
-	},
-
-	_renderItem: function( ul, item ) {
-		var li = $( "<li>" );
-
-		if ( item.disabled ) {
-			li.addClass( "ui-state-disabled" );
-		}
-		this._setText( li, item.label );
-
-		return li.appendTo( ul );
-	},
-
-	_setText: function( element, value ) {
-		if ( value ) {
-			element.text( value );
-		} else {
-			element.html( "&#160;" );
-		}
-	},
-
-	_move: function( direction, event ) {
-		var item, next,
-			filter = ".ui-menu-item";
-
-		if ( this.isOpen ) {
-			item = this.menuItems.eq( this.focusIndex );
-		} else {
-			item = this.menuItems.eq( this.element[ 0 ].selectedIndex );
-			filter += ":not(.ui-state-disabled)";
-		}
-
-		if ( direction === "first" || direction === "last" ) {
-			next = item[ direction === "first" ? "prevAll" : "nextAll" ]( filter ).eq( -1 );
-		} else {
-			next = item[ direction + "All" ]( filter ).eq( 0 );
-		}
-
-		if ( next.length ) {
-			this.menuInstance.focus( event, next );
-		}
-	},
-
-	_getSelectedItem: function() {
-		return this.menuItems.eq( this.element[ 0 ].selectedIndex );
-	},
-
-	_toggle: function( event ) {
-		this[ this.isOpen ? "close" : "open" ]( event );
-	},
-
-	_setSelection: function() {
-		var selection;
-
-		if ( !this.range ) {
-			return;
-		}
-
-		if ( window.getSelection ) {
-			selection = window.getSelection();
-			selection.removeAllRanges();
-			selection.addRange( this.range );
-
-		// support: IE8
-		} else {
-			this.range.select();
-		}
-
-		// support: IE
-		// Setting the text selection kills the button focus in IE, but
-		// restoring the focus doesn't kill the selection.
-		this.button.focus();
-	},
-
-	_documentClick: {
-		mousedown: function( event ) {
-			if ( !this.isOpen ) {
-				return;
-			}
-
-			if ( !$( event.target ).closest( ".ui-selectmenu-menu, #" + this.ids.button ).length ) {
-				this.close( event );
-			}
-		}
-	},
-
-	_buttonEvents: {
-
-		// Prevent text selection from being reset when interacting with the selectmenu (#10144)
-		mousedown: function() {
-			var selection;
-
-			if ( window.getSelection ) {
-				selection = window.getSelection();
-				if ( selection.rangeCount ) {
-					this.range = selection.getRangeAt( 0 );
-				}
-
-			// support: IE8
-			} else {
-				this.range = document.selection.createRange();
-			}
-		},
-
-		click: function( event ) {
-			this._setSelection();
-			this._toggle( event );
-		},
-
-		keydown: function( event ) {
-			var preventDefault = true;
-			switch ( event.keyCode ) {
-				case $.ui.keyCode.TAB:
-				case $.ui.keyCode.ESCAPE:
-					this.close( event );
-					preventDefault = false;
-					break;
-				case $.ui.keyCode.ENTER:
-					if ( this.isOpen ) {
-						this._selectFocusedItem( event );
-					}
-					break;
-				case $.ui.keyCode.UP:
-					if ( event.altKey ) {
-						this._toggle( event );
-					} else {
-						this._move( "prev", event );
-					}
-					break;
-				case $.ui.keyCode.DOWN:
-					if ( event.altKey ) {
-						this._toggle( event );
-					} else {
-						this._move( "next", event );
-					}
-					break;
-				case $.ui.keyCode.SPACE:
-					if ( this.isOpen ) {
-						this._selectFocusedItem( event );
-					} else {
-						this._toggle( event );
-					}
-					break;
-				case $.ui.keyCode.LEFT:
-					this._move( "prev", event );
-					break;
-				case $.ui.keyCode.RIGHT:
-					this._move( "next", event );
-					break;
-				case $.ui.keyCode.HOME:
-				case $.ui.keyCode.PAGE_UP:
-					this._move( "first", event );
-					break;
-				case $.ui.keyCode.END:
-				case $.ui.keyCode.PAGE_DOWN:
-					this._move( "last", event );
-					break;
-				default:
-					this.menu.trigger( event );
-					preventDefault = false;
-			}
-
-			if ( preventDefault ) {
-				event.preventDefault();
-			}
-		}
-	},
-
-	_selectFocusedItem: function( event ) {
-		var item = this.menuItems.eq( this.focusIndex );
-		if ( !item.hasClass( "ui-state-disabled" ) ) {
-			this._select( item.data( "ui-selectmenu-item" ), event );
-		}
-	},
-
-	_select: function( item, event ) {
-		var oldIndex = this.element[ 0 ].selectedIndex;
-
-		// Change native select element
-		this.element[ 0 ].selectedIndex = item.index;
-		this._setText( this.buttonText, item.label );
-		this._setAria( item );
-		this._trigger( "select", event, { item: item } );
-
-		if ( item.index !== oldIndex ) {
-			this._trigger( "change", event, { item: item } );
-		}
-
-		this.close( event );
-	},
-
-	_setAria: function( item ) {
-		var id = this.menuItems.eq( item.index ).attr( "id" );
-
-		this.button.attr({
-			"aria-labelledby": id,
-			"aria-activedescendant": id
-		});
-		this.menu.attr( "aria-activedescendant", id );
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "icons" ) {
-			this.button.find( "span.ui-icon" )
-				.removeClass( this.options.icons.button )
-				.addClass( value.button );
-		}
-
-		this._super( key, value );
-
-		if ( key === "appendTo" ) {
-			this.menuWrap.appendTo( this._appendTo() );
-		}
-
-		if ( key === "disabled" ) {
-			this.menuInstance.option( "disabled", value );
-			this.button
-				.toggleClass( "ui-state-disabled", value )
-				.attr( "aria-disabled", value );
-
-			this.element.prop( "disabled", value );
-			if ( value ) {
-				this.button.attr( "tabindex", -1 );
-				this.close();
-			} else {
-				this.button.attr( "tabindex", 0 );
-			}
-		}
-
-		if ( key === "width" ) {
-			this._resizeButton();
-		}
-	},
-
-	_appendTo: function() {
-		var element = this.options.appendTo;
-
-		if ( element ) {
-			element = element.jquery || element.nodeType ?
-				$( element ) :
-				this.document.find( element ).eq( 0 );
-		}
-
-		if ( !element || !element[ 0 ] ) {
-			element = this.element.closest( ".ui-front" );
-		}
-
-		if ( !element.length ) {
-			element = this.document[ 0 ].body;
-		}
-
-		return element;
-	},
-
-	_toggleAttr: function() {
-		this.button
-			.toggleClass( "ui-corner-top", this.isOpen )
-			.toggleClass( "ui-corner-all", !this.isOpen )
-			.attr( "aria-expanded", this.isOpen );
-		this.menuWrap.toggleClass( "ui-selectmenu-open", this.isOpen );
-		this.menu.attr( "aria-hidden", !this.isOpen );
-	},
-
-	_resizeButton: function() {
-		var width = this.options.width;
-
-		if ( !width ) {
-			width = this.element.show().outerWidth();
-			this.element.hide();
-		}
-
-		this.button.outerWidth( width );
-	},
-
-	_resizeMenu: function() {
-		this.menu.outerWidth( Math.max(
-			this.button.outerWidth(),
-
-			// support: IE10
-			// IE10 wraps long text (possibly a rounding bug)
-			// so we add 1px to avoid the wrapping
-			this.menu.width( "" ).outerWidth() + 1
-		) );
-	},
-
-	_getCreateOptions: function() {
-		return { disabled: this.element.prop( "disabled" ) };
-	},
-
-	_parseOptions: function( options ) {
-		var data = [];
-		options.each(function( index, item ) {
-			var option = $( item ),
-				optgroup = option.parent( "optgroup" );
-			data.push({
-				element: option,
-				index: index,
-				value: option.val(),
-				label: option.text(),
-				optgroup: optgroup.attr( "label" ) || "",
-				disabled: optgroup.prop( "disabled" ) || option.prop( "disabled" )
-			});
-		});
-		this.items = data;
-	},
-
-	_destroy: function() {
-		this.menuWrap.remove();
-		this.button.remove();
-		this.element.show();
-		this.element.removeUniqueId();
-		this.label.attr( "for", this.ids.element );
-	}
-});
-
-
-/*!
- * jQuery UI Slider 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/slider/
- */
-
-
-var slider = $.widget( "ui.slider", $.ui.mouse, {
-	version: "1.11.4",
-	widgetEventPrefix: "slide",
-
-	options: {
-		animate: false,
-		distance: 0,
-		max: 100,
-		min: 0,
-		orientation: "horizontal",
-		range: false,
-		step: 1,
-		value: 0,
-		values: null,
-
-		// callbacks
-		change: null,
-		slide: null,
-		start: null,
-		stop: null
-	},
-
-	// number of pages in a slider
-	// (how many times can you page up/down to go through the whole range)
-	numPages: 5,
-
-	_create: function() {
-		this._keySliding = false;
-		this._mouseSliding = false;
-		this._animateOff = true;
-		this._handleIndex = null;
-		this._detectOrientation();
-		this._mouseInit();
-		this._calculateNewMax();
-
-		this.element
-			.addClass( "ui-slider" +
-				" ui-slider-" + this.orientation +
-				" ui-widget" +
-				" ui-widget-content" +
-				" ui-corner-all");
-
-		this._refresh();
-		this._setOption( "disabled", this.options.disabled );
-
-		this._animateOff = false;
-	},
-
-	_refresh: function() {
-		this._createRange();
-		this._createHandles();
-		this._setupEvents();
-		this._refreshValue();
-	},
-
-	_createHandles: function() {
-		var i, handleCount,
-			options = this.options,
-			existingHandles = this.element.find( ".ui-slider-handle" ).addClass( "ui-state-default ui-corner-all" ),
-			handle = "<span class='ui-slider-handle ui-state-default ui-corner-all' tabindex='0'></span>",
-			handles = [];
-
-		handleCount = ( options.values && options.values.length ) || 1;
-
-		if ( existingHandles.length > handleCount ) {
-			existingHandles.slice( handleCount ).remove();
-			existingHandles = existingHandles.slice( 0, handleCount );
-		}
-
-		for ( i = existingHandles.length; i < handleCount; i++ ) {
-			handles.push( handle );
-		}
-
-		this.handles = existingHandles.add( $( handles.join( "" ) ).appendTo( this.element ) );
-
-		this.handle = this.handles.eq( 0 );
-
-		this.handles.each(function( i ) {
-			$( this ).data( "ui-slider-handle-index", i );
-		});
-	},
-
-	_createRange: function() {
-		var options = this.options,
-			classes = "";
-
-		if ( options.range ) {
-			if ( options.range === true ) {
-				if ( !options.values ) {
-					options.values = [ this._valueMin(), this._valueMin() ];
-				} else if ( options.values.length && options.values.length !== 2 ) {
-					options.values = [ options.values[0], options.values[0] ];
-				} else if ( $.isArray( options.values ) ) {
-					options.values = options.values.slice(0);
-				}
-			}
-
-			if ( !this.range || !this.range.length ) {
-				this.range = $( "<div></div>" )
-					.appendTo( this.element );
-
-				classes = "ui-slider-range" +
-				// note: this isn't the most fittingly semantic framework class for this element,
-				// but worked best visually with a variety of themes
-				" ui-widget-header ui-corner-all";
-			} else {
-				this.range.removeClass( "ui-slider-range-min ui-slider-range-max" )
-					// Handle range switching from true to min/max
-					.css({
-						"left": "",
-						"bottom": ""
-					});
-			}
-
-			this.range.addClass( classes +
-				( ( options.range === "min" || options.range === "max" ) ? " ui-slider-range-" + options.range : "" ) );
-		} else {
-			if ( this.range ) {
-				this.range.remove();
-			}
-			this.range = null;
-		}
-	},
-
-	_setupEvents: function() {
-		this._off( this.handles );
-		this._on( this.handles, this._handleEvents );
-		this._hoverable( this.handles );
-		this._focusable( this.handles );
-	},
-
-	_destroy: function() {
-		this.handles.remove();
-		if ( this.range ) {
-			this.range.remove();
-		}
-
-		this.element
-			.removeClass( "ui-slider" +
-				" ui-slider-horizontal" +
-				" ui-slider-vertical" +
-				" ui-widget" +
-				" ui-widget-content" +
-				" ui-corner-all" );
-
-		this._mouseDestroy();
-	},
-
-	_mouseCapture: function( event ) {
-		var position, normValue, distance, closestHandle, index, allowed, offset, mouseOverHandle,
-			that = this,
-			o = this.options;
-
-		if ( o.disabled ) {
-			return false;
-		}
-
-		this.elementSize = {
-			width: this.element.outerWidth(),
-			height: this.element.outerHeight()
-		};
-		this.elementOffset = this.element.offset();
-
-		position = { x: event.pageX, y: event.pageY };
-		normValue = this._normValueFromMouse( position );
-		distance = this._valueMax() - this._valueMin() + 1;
-		this.handles.each(function( i ) {
-			var thisDistance = Math.abs( normValue - that.values(i) );
-			if (( distance > thisDistance ) ||
-				( distance === thisDistance &&
-					(i === that._lastChangedValue || that.values(i) === o.min ))) {
-				distance = thisDistance;
-				closestHandle = $( this );
-				index = i;
-			}
-		});
-
-		allowed = this._start( event, index );
-		if ( allowed === false ) {
-			return false;
-		}
-		this._mouseSliding = true;
-
-		this._handleIndex = index;
-
-		closestHandle
-			.addClass( "ui-state-active" )
-			.focus();
-
-		offset = closestHandle.offset();
-		mouseOverHandle = !$( event.target ).parents().addBack().is( ".ui-slider-handle" );
-		this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
-			left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
-			top: event.pageY - offset.top -
-				( closestHandle.height() / 2 ) -
-				( parseInt( closestHandle.css("borderTopWidth"), 10 ) || 0 ) -
-				( parseInt( closestHandle.css("borderBottomWidth"), 10 ) || 0) +
-				( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
-		};
-
-		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
-			this._slide( event, index, normValue );
-		}
-		this._animateOff = true;
-		return true;
-	},
-
-	_mouseStart: function() {
-		return true;
-	},
-
-	_mouseDrag: function( event ) {
-		var position = { x: event.pageX, y: event.pageY },
-			normValue = this._normValueFromMouse( position );
-
-		this._slide( event, this._handleIndex, normValue );
-
-		return false;
-	},
-
-	_mouseStop: function( event ) {
-		this.handles.removeClass( "ui-state-active" );
-		this._mouseSliding = false;
-
-		this._stop( event, this._handleIndex );
-		this._change( event, this._handleIndex );
-
-		this._handleIndex = null;
-		this._clickOffset = null;
-		this._animateOff = false;
-
-		return false;
-	},
-
-	_detectOrientation: function() {
-		this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
-	},
-
-	_normValueFromMouse: function( position ) {
-		var pixelTotal,
-			pixelMouse,
-			percentMouse,
-			valueTotal,
-			valueMouse;
-
-		if ( this.orientation === "horizontal" ) {
-			pixelTotal = this.elementSize.width;
-			pixelMouse = position.x - this.elementOffset.left - ( this._clickOffset ? this._clickOffset.left : 0 );
-		} else {
-			pixelTotal = this.elementSize.height;
-			pixelMouse = position.y - this.elementOffset.top - ( this._clickOffset ? this._clickOffset.top : 0 );
-		}
-
-		percentMouse = ( pixelMouse / pixelTotal );
-		if ( percentMouse > 1 ) {
-			percentMouse = 1;
-		}
-		if ( percentMouse < 0 ) {
-			percentMouse = 0;
-		}
-		if ( this.orientation === "vertical" ) {
-			percentMouse = 1 - percentMouse;
-		}
-
-		valueTotal = this._valueMax() - this._valueMin();
-		valueMouse = this._valueMin() + percentMouse * valueTotal;
-
-		return this._trimAlignValue( valueMouse );
-	},
-
-	_start: function( event, index ) {
-		var uiHash = {
-			handle: this.handles[ index ],
-			value: this.value()
-		};
-		if ( this.options.values && this.options.values.length ) {
-			uiHash.value = this.values( index );
-			uiHash.values = this.values();
-		}
-		return this._trigger( "start", event, uiHash );
-	},
-
-	_slide: function( event, index, newVal ) {
-		var otherVal,
-			newValues,
-			allowed;
-
-		if ( this.options.values && this.options.values.length ) {
-			otherVal = this.values( index ? 0 : 1 );
-
-			if ( ( this.options.values.length === 2 && this.options.range === true ) &&
-					( ( index === 0 && newVal > otherVal) || ( index === 1 && newVal < otherVal ) )
-				) {
-				newVal = otherVal;
-			}
-
-			if ( newVal !== this.values( index ) ) {
-				newValues = this.values();
-				newValues[ index ] = newVal;
-				// A slide can be canceled by returning false from the slide callback
-				allowed = this._trigger( "slide", event, {
-					handle: this.handles[ index ],
-					value: newVal,
-					values: newValues
-				} );
-				otherVal = this.values( index ? 0 : 1 );
-				if ( allowed !== false ) {
-					this.values( index, newVal );
-				}
-			}
-		} else {
-			if ( newVal !== this.value() ) {
-				// A slide can be canceled by returning false from the slide callback
-				allowed = this._trigger( "slide", event, {
-					handle: this.handles[ index ],
-					value: newVal
-				} );
-				if ( allowed !== false ) {
-					this.value( newVal );
-				}
-			}
-		}
-	},
-
-	_stop: function( event, index ) {
-		var uiHash = {
-			handle: this.handles[ index ],
-			value: this.value()
-		};
-		if ( this.options.values && this.options.values.length ) {
-			uiHash.value = this.values( index );
-			uiHash.values = this.values();
-		}
-
-		this._trigger( "stop", event, uiHash );
-	},
-
-	_change: function( event, index ) {
-		if ( !this._keySliding && !this._mouseSliding ) {
-			var uiHash = {
-				handle: this.handles[ index ],
-				value: this.value()
-			};
-			if ( this.options.values && this.options.values.length ) {
-				uiHash.value = this.values( index );
-				uiHash.values = this.values();
-			}
-
-			//store the last changed value index for reference when handles overlap
-			this._lastChangedValue = index;
-
-			this._trigger( "change", event, uiHash );
-		}
-	},
-
-	value: function( newValue ) {
-		if ( arguments.length ) {
-			this.options.value = this._trimAlignValue( newValue );
-			this._refreshValue();
-			this._change( null, 0 );
-			return;
-		}
-
-		return this._value();
-	},
-
-	values: function( index, newValue ) {
-		var vals,
-			newValues,
-			i;
-
-		if ( arguments.length > 1 ) {
-			this.options.values[ index ] = this._trimAlignValue( newValue );
-			this._refreshValue();
-			this._change( null, index );
-			return;
-		}
-
-		if ( arguments.length ) {
-			if ( $.isArray( arguments[ 0 ] ) ) {
-				vals = this.options.values;
-				newValues = arguments[ 0 ];
-				for ( i = 0; i < vals.length; i += 1 ) {
-					vals[ i ] = this._trimAlignValue( newValues[ i ] );
-					this._change( null, i );
-				}
-				this._refreshValue();
-			} else {
-				if ( this.options.values && this.options.values.length ) {
-					return this._values( index );
-				} else {
-					return this.value();
-				}
-			}
-		} else {
-			return this._values();
-		}
-	},
-
-	_setOption: function( key, value ) {
-		var i,
-			valsLength = 0;
-
-		if ( key === "range" && this.options.range === true ) {
-			if ( value === "min" ) {
-				this.options.value = this._values( 0 );
-				this.options.values = null;
-			} else if ( value === "max" ) {
-				this.options.value = this._values( this.options.values.length - 1 );
-				this.options.values = null;
-			}
-		}
-
-		if ( $.isArray( this.options.values ) ) {
-			valsLength = this.options.values.length;
-		}
-
-		if ( key === "disabled" ) {
-			this.element.toggleClass( "ui-state-disabled", !!value );
-		}
-
-		this._super( key, value );
-
-		switch ( key ) {
-			case "orientation":
-				this._detectOrientation();
-				this.element
-					.removeClass( "ui-slider-horizontal ui-slider-vertical" )
-					.addClass( "ui-slider-" + this.orientation );
-				this._refreshValue();
-
-				// Reset positioning from previous orientation
-				this.handles.css( value === "horizontal" ? "bottom" : "left", "" );
-				break;
-			case "value":
-				this._animateOff = true;
-				this._refreshValue();
-				this._change( null, 0 );
-				this._animateOff = false;
-				break;
-			case "values":
-				this._animateOff = true;
-				this._refreshValue();
-				for ( i = 0; i < valsLength; i += 1 ) {
-					this._change( null, i );
-				}
-				this._animateOff = false;
-				break;
-			case "step":
-			case "min":
-			case "max":
-				this._animateOff = true;
-				this._calculateNewMax();
-				this._refreshValue();
-				this._animateOff = false;
-				break;
-			case "range":
-				this._animateOff = true;
-				this._refresh();
-				this._animateOff = false;
-				break;
-		}
-	},
-
-	//internal value getter
-	// _value() returns value trimmed by min and max, aligned by step
-	_value: function() {
-		var val = this.options.value;
-		val = this._trimAlignValue( val );
-
-		return val;
-	},
-
-	//internal values getter
-	// _values() returns array of values trimmed by min and max, aligned by step
-	// _values( index ) returns single value trimmed by min and max, aligned by step
-	_values: function( index ) {
-		var val,
-			vals,
-			i;
-
-		if ( arguments.length ) {
-			val = this.options.values[ index ];
-			val = this._trimAlignValue( val );
-
-			return val;
-		} else if ( this.options.values && this.options.values.length ) {
-			// .slice() creates a copy of the array
-			// this copy gets trimmed by min and max and then returned
-			vals = this.options.values.slice();
-			for ( i = 0; i < vals.length; i += 1) {
-				vals[ i ] = this._trimAlignValue( vals[ i ] );
-			}
-
-			return vals;
-		} else {
-			return [];
-		}
-	},
-
-	// returns the step-aligned value that val is closest to, between (inclusive) min and max
-	_trimAlignValue: function( val ) {
-		if ( val <= this._valueMin() ) {
-			return this._valueMin();
-		}
-		if ( val >= this._valueMax() ) {
-			return this._valueMax();
-		}
-		var step = ( this.options.step > 0 ) ? this.options.step : 1,
-			valModStep = (val - this._valueMin()) % step,
-			alignValue = val - valModStep;
-
-		if ( Math.abs(valModStep) * 2 >= step ) {
-			alignValue += ( valModStep > 0 ) ? step : ( -step );
-		}
-
-		// Since JavaScript has problems with large floats, round
-		// the final value to 5 digits after the decimal point (see #4124)
-		return parseFloat( alignValue.toFixed(5) );
-	},
-
-	_calculateNewMax: function() {
-		var max = this.options.max,
-			min = this._valueMin(),
-			step = this.options.step,
-			aboveMin = Math.floor( ( +( max - min ).toFixed( this._precision() ) ) / step ) * step;
-		max = aboveMin + min;
-		this.max = parseFloat( max.toFixed( this._precision() ) );
-	},
-
-	_precision: function() {
-		var precision = this._precisionOf( this.options.step );
-		if ( this.options.min !== null ) {
-			precision = Math.max( precision, this._precisionOf( this.options.min ) );
-		}
-		return precision;
-	},
-
-	_precisionOf: function( num ) {
-		var str = num.toString(),
-			decimal = str.indexOf( "." );
-		return decimal === -1 ? 0 : str.length - decimal - 1;
-	},
-
-	_valueMin: function() {
-		return this.options.min;
-	},
-
-	_valueMax: function() {
-		return this.max;
-	},
-
-	_refreshValue: function() {
-		var lastValPercent, valPercent, value, valueMin, valueMax,
-			oRange = this.options.range,
-			o = this.options,
-			that = this,
-			animate = ( !this._animateOff ) ? o.animate : false,
-			_set = {};
-
-		if ( this.options.values && this.options.values.length ) {
-			this.handles.each(function( i ) {
-				valPercent = ( that.values(i) - that._valueMin() ) / ( that._valueMax() - that._valueMin() ) * 100;
-				_set[ that.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
-				$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
-				if ( that.options.range === true ) {
-					if ( that.orientation === "horizontal" ) {
-						if ( i === 0 ) {
-							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { left: valPercent + "%" }, o.animate );
-						}
-						if ( i === 1 ) {
-							that.range[ animate ? "animate" : "css" ]( { width: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
-						}
-					} else {
-						if ( i === 0 ) {
-							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { bottom: ( valPercent ) + "%" }, o.animate );
-						}
-						if ( i === 1 ) {
-							that.range[ animate ? "animate" : "css" ]( { height: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
-						}
-					}
-				}
-				lastValPercent = valPercent;
-			});
-		} else {
-			value = this.value();
-			valueMin = this._valueMin();
-			valueMax = this._valueMax();
-			valPercent = ( valueMax !== valueMin ) ?
-					( value - valueMin ) / ( valueMax - valueMin ) * 100 :
-					0;
-			_set[ this.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
-			this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
-
-			if ( oRange === "min" && this.orientation === "horizontal" ) {
-				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { width: valPercent + "%" }, o.animate );
-			}
-			if ( oRange === "max" && this.orientation === "horizontal" ) {
-				this.range[ animate ? "animate" : "css" ]( { width: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
-			}
-			if ( oRange === "min" && this.orientation === "vertical" ) {
-				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { height: valPercent + "%" }, o.animate );
-			}
-			if ( oRange === "max" && this.orientation === "vertical" ) {
-				this.range[ animate ? "animate" : "css" ]( { height: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
-			}
-		}
-	},
-
-	_handleEvents: {
-		keydown: function( event ) {
-			var allowed, curVal, newVal, step,
-				index = $( event.target ).data( "ui-slider-handle-index" );
-
-			switch ( event.keyCode ) {
-				case $.ui.keyCode.HOME:
-				case $.ui.keyCode.END:
-				case $.ui.keyCode.PAGE_UP:
-				case $.ui.keyCode.PAGE_DOWN:
-				case $.ui.keyCode.UP:
-				case $.ui.keyCode.RIGHT:
-				case $.ui.keyCode.DOWN:
-				case $.ui.keyCode.LEFT:
-					event.preventDefault();
-					if ( !this._keySliding ) {
-						this._keySliding = true;
-						$( event.target ).addClass( "ui-state-active" );
-						allowed = this._start( event, index );
-						if ( allowed === false ) {
-							return;
-						}
-					}
-					break;
-			}
-
-			step = this.options.step;
-			if ( this.options.values && this.options.values.length ) {
-				curVal = newVal = this.values( index );
-			} else {
-				curVal = newVal = this.value();
-			}
-
-			switch ( event.keyCode ) {
-				case $.ui.keyCode.HOME:
-					newVal = this._valueMin();
-					break;
-				case $.ui.keyCode.END:
-					newVal = this._valueMax();
-					break;
-				case $.ui.keyCode.PAGE_UP:
-					newVal = this._trimAlignValue(
-						curVal + ( ( this._valueMax() - this._valueMin() ) / this.numPages )
-					);
-					break;
-				case $.ui.keyCode.PAGE_DOWN:
-					newVal = this._trimAlignValue(
-						curVal - ( (this._valueMax() - this._valueMin()) / this.numPages ) );
-					break;
-				case $.ui.keyCode.UP:
-				case $.ui.keyCode.RIGHT:
-					if ( curVal === this._valueMax() ) {
-						return;
-					}
-					newVal = this._trimAlignValue( curVal + step );
-					break;
-				case $.ui.keyCode.DOWN:
-				case $.ui.keyCode.LEFT:
-					if ( curVal === this._valueMin() ) {
-						return;
-					}
-					newVal = this._trimAlignValue( curVal - step );
-					break;
-			}
-
-			this._slide( event, index, newVal );
-		},
-		keyup: function( event ) {
-			var index = $( event.target ).data( "ui-slider-handle-index" );
-
-			if ( this._keySliding ) {
-				this._keySliding = false;
-				this._stop( event, index );
-				this._change( event, index );
-				$( event.target ).removeClass( "ui-state-active" );
-			}
-		}
-	}
-});
-
-
-/*!
- * jQuery UI Sortable 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/sortable/
- */
-
-
-var sortable = $.widget("ui.sortable", $.ui.mouse, {
-	version: "1.11.4",
-	widgetEventPrefix: "sort",
-	ready: false,
-	options: {
-		appendTo: "parent",
-		axis: false,
-		connectWith: false,
-		containment: false,
-		cursor: "auto",
-		cursorAt: false,
-		dropOnEmpty: true,
-		forcePlaceholderSize: false,
-		forceHelperSize: false,
-		grid: false,
-		handle: false,
-		helper: "original",
-		items: "> *",
-		opacity: false,
-		placeholder: false,
-		revert: false,
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		scope: "default",
-		tolerance: "intersect",
-		zIndex: 1000,
-
-		// callbacks
-		activate: null,
-		beforeStop: null,
-		change: null,
-		deactivate: null,
-		out: null,
-		over: null,
-		receive: null,
-		remove: null,
-		sort: null,
-		start: null,
-		stop: null,
-		update: null
-	},
-
-	_isOverAxis: function( x, reference, size ) {
-		return ( x >= reference ) && ( x < ( reference + size ) );
-	},
-
-	_isFloating: function( item ) {
-		return (/left|right/).test(item.css("float")) || (/inline|table-cell/).test(item.css("display"));
-	},
-
-	_create: function() {
-		this.containerCache = {};
-		this.element.addClass("ui-sortable");
-
-		//Get the items
-		this.refresh();
-
-		//Let's determine the parent's offset
-		this.offset = this.element.offset();
-
-		//Initialize mouse events for interaction
-		this._mouseInit();
-
-		this._setHandleClassName();
-
-		//We're ready to go
-		this.ready = true;
-
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-
-		if ( key === "handle" ) {
-			this._setHandleClassName();
-		}
-	},
-
-	_setHandleClassName: function() {
-		this.element.find( ".ui-sortable-handle" ).removeClass( "ui-sortable-handle" );
-		$.each( this.items, function() {
-			( this.instance.options.handle ?
-				this.item.find( this.instance.options.handle ) : this.item )
-				.addClass( "ui-sortable-handle" );
-		});
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass( "ui-sortable ui-sortable-disabled" )
-			.find( ".ui-sortable-handle" )
-				.removeClass( "ui-sortable-handle" );
-		this._mouseDestroy();
-
-		for ( var i = this.items.length - 1; i >= 0; i-- ) {
-			this.items[i].item.removeData(this.widgetName + "-item");
-		}
-
-		return this;
-	},
-
-	_mouseCapture: function(event, overrideHandle) {
-		var currentItem = null,
-			validHandle = false,
-			that = this;
-
-		if (this.reverting) {
-			return false;
-		}
-
-		if(this.options.disabled || this.options.type === "static") {
-			return false;
-		}
-
-		//We have to refresh the items data once first
-		this._refreshItems(event);
-
-		//Find out if the clicked node (or one of its parents) is a actual item in this.items
-		$(event.target).parents().each(function() {
-			if($.data(this, that.widgetName + "-item") === that) {
-				currentItem = $(this);
-				return false;
-			}
-		});
-		if($.data(event.target, that.widgetName + "-item") === that) {
-			currentItem = $(event.target);
-		}
-
-		if(!currentItem) {
-			return false;
-		}
-		if(this.options.handle && !overrideHandle) {
-			$(this.options.handle, currentItem).find("*").addBack().each(function() {
-				if(this === event.target) {
-					validHandle = true;
-				}
-			});
-			if(!validHandle) {
-				return false;
-			}
-		}
-
-		this.currentItem = currentItem;
-		this._removeCurrentsFromItems();
-		return true;
-
-	},
-
-	_mouseStart: function(event, overrideHandle, noActivation) {
-
-		var i, body,
-			o = this.options;
-
-		this.currentContainer = this;
-
-		//We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
-		this.refreshPositions();
-
-		//Create and append the visible helper
-		this.helper = this._createHelper(event);
-
-		//Cache the helper size
-		this._cacheHelperProportions();
-
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-
-		//Cache the margins of the original element
-		this._cacheMargins();
-
-		//Get the next scrolling parent
-		this.scrollParent = this.helper.scrollParent();
-
-		//The element's absolute position on the page minus margins
-		this.offset = this.currentItem.offset();
-		this.offset = {
-			top: this.offset.top - this.margins.top,
-			left: this.offset.left - this.margins.left
-		};
-
-		$.extend(this.offset, {
-			click: { //Where the click happened, relative to the element
-				left: event.pageX - this.offset.left,
-				top: event.pageY - this.offset.top
-			},
-			parent: this._getParentOffset(),
-			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
-		});
-
-		// Only after we got the offset, we can change the helper's position to absolute
-		// TODO: Still need to figure out a way to make relative sorting possible
-		this.helper.css("position", "absolute");
-		this.cssPosition = this.helper.css("position");
-
-		//Generate the original position
-		this.originalPosition = this._generatePosition(event);
-		this.originalPageX = event.pageX;
-		this.originalPageY = event.pageY;
-
-		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
-		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
-
-		//Cache the former DOM position
-		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
-
-		//If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
-		if(this.helper[0] !== this.currentItem[0]) {
-			this.currentItem.hide();
-		}
-
-		//Create the placeholder
-		this._createPlaceholder();
-
-		//Set a containment if given in the options
-		if(o.containment) {
-			this._setContainment();
-		}
-
-		if( o.cursor && o.cursor !== "auto" ) { // cursor option
-			body = this.document.find( "body" );
-
-			// support: IE
-			this.storedCursor = body.css( "cursor" );
-			body.css( "cursor", o.cursor );
-
-			this.storedStylesheet = $( "<style>*{ cursor: "+o.cursor+" !important; }</style>" ).appendTo( body );
-		}
-
-		if(o.opacity) { // opacity option
-			if (this.helper.css("opacity")) {
-				this._storedOpacity = this.helper.css("opacity");
-			}
-			this.helper.css("opacity", o.opacity);
-		}
-
-		if(o.zIndex) { // zIndex option
-			if (this.helper.css("zIndex")) {
-				this._storedZIndex = this.helper.css("zIndex");
-			}
-			this.helper.css("zIndex", o.zIndex);
-		}
-
-		//Prepare scrolling
-		if(this.scrollParent[0] !== this.document[0] && this.scrollParent[0].tagName !== "HTML") {
-			this.overflowOffset = this.scrollParent.offset();
-		}
-
-		//Call callbacks
-		this._trigger("start", event, this._uiHash());
-
-		//Recache the helper size
-		if(!this._preserveHelperProportions) {
-			this._cacheHelperProportions();
-		}
-
-
-		//Post "activate" events to possible containers
-		if( !noActivation ) {
-			for ( i = this.containers.length - 1; i >= 0; i-- ) {
-				this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
-			}
-		}
-
-		//Prepare possible droppables
-		if($.ui.ddmanager) {
-			$.ui.ddmanager.current = this;
-		}
-
-		if ($.ui.ddmanager && !o.dropBehaviour) {
-			$.ui.ddmanager.prepareOffsets(this, event);
-		}
-
-		this.dragging = true;
-
-		this.helper.addClass("ui-sortable-helper");
-		this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-		return true;
-
-	},
-
-	_mouseDrag: function(event) {
-		var i, item, itemElement, intersection,
-			o = this.options,
-			scrolled = false;
-
-		//Compute the helpers position
-		this.position = this._generatePosition(event);
-		this.positionAbs = this._convertPositionTo("absolute");
-
-		if (!this.lastPositionAbs) {
-			this.lastPositionAbs = this.positionAbs;
-		}
-
-		//Do scrolling
-		if(this.options.scroll) {
-			if(this.scrollParent[0] !== this.document[0] && this.scrollParent[0].tagName !== "HTML") {
-
-				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
-					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
-				} else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity) {
-					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
-				}
-
-				if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
-					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
-				} else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity) {
-					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
-				}
-
-			} else {
-
-				if(event.pageY - this.document.scrollTop() < o.scrollSensitivity) {
-					scrolled = this.document.scrollTop(this.document.scrollTop() - o.scrollSpeed);
-				} else if(this.window.height() - (event.pageY - this.document.scrollTop()) < o.scrollSensitivity) {
-					scrolled = this.document.scrollTop(this.document.scrollTop() + o.scrollSpeed);
-				}
-
-				if(event.pageX - this.document.scrollLeft() < o.scrollSensitivity) {
-					scrolled = this.document.scrollLeft(this.document.scrollLeft() - o.scrollSpeed);
-				} else if(this.window.width() - (event.pageX - this.document.scrollLeft()) < o.scrollSensitivity) {
-					scrolled = this.document.scrollLeft(this.document.scrollLeft() + o.scrollSpeed);
-				}
-
-			}
-
-			if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
-				$.ui.ddmanager.prepareOffsets(this, event);
-			}
-		}
-
-		//Regenerate the absolute position used for position checks
-		this.positionAbs = this._convertPositionTo("absolute");
-
-		//Set the helper position
-		if(!this.options.axis || this.options.axis !== "y") {
-			this.helper[0].style.left = this.position.left+"px";
-		}
-		if(!this.options.axis || this.options.axis !== "x") {
-			this.helper[0].style.top = this.position.top+"px";
-		}
-
-		//Rearrange
-		for (i = this.items.length - 1; i >= 0; i--) {
-
-			//Cache variables and intersection, continue if no intersection
-			item = this.items[i];
-			itemElement = item.item[0];
-			intersection = this._intersectsWithPointer(item);
-			if (!intersection) {
-				continue;
-			}
-
-			// Only put the placeholder inside the current Container, skip all
-			// items from other containers. This works because when moving
-			// an item from one container to another the
-			// currentContainer is switched before the placeholder is moved.
-			//
-			// Without this, moving items in "sub-sortables" can cause
-			// the placeholder to jitter between the outer and inner container.
-			if (item.instance !== this.currentContainer) {
-				continue;
-			}
-
-			// cannot intersect with itself
-			// no useless actions that have been done before
-			// no action if the item moved is the parent of the item checked
-			if (itemElement !== this.currentItem[0] &&
-				this.placeholder[intersection === 1 ? "next" : "prev"]()[0] !== itemElement &&
-				!$.contains(this.placeholder[0], itemElement) &&
-				(this.options.type === "semi-dynamic" ? !$.contains(this.element[0], itemElement) : true)
-			) {
-
-				this.direction = intersection === 1 ? "down" : "up";
-
-				if (this.options.tolerance === "pointer" || this._intersectsWithSides(item)) {
-					this._rearrange(event, item);
-				} else {
-					break;
-				}
-
-				this._trigger("change", event, this._uiHash());
-				break;
-			}
-		}
-
-		//Post events to containers
-		this._contactContainers(event);
-
-		//Interconnect with droppables
-		if($.ui.ddmanager) {
-			$.ui.ddmanager.drag(this, event);
-		}
-
-		//Call callbacks
-		this._trigger("sort", event, this._uiHash());
-
-		this.lastPositionAbs = this.positionAbs;
-		return false;
-
-	},
-
-	_mouseStop: function(event, noPropagation) {
-
-		if(!event) {
-			return;
-		}
-
-		//If we are using droppables, inform the manager about the drop
-		if ($.ui.ddmanager && !this.options.dropBehaviour) {
-			$.ui.ddmanager.drop(this, event);
-		}
-
-		if(this.options.revert) {
-			var that = this,
-				cur = this.placeholder.offset(),
-				axis = this.options.axis,
-				animation = {};
-
-			if ( !axis || axis === "x" ) {
-				animation.left = cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === this.document[0].body ? 0 : this.offsetParent[0].scrollLeft);
-			}
-			if ( !axis || axis === "y" ) {
-				animation.top = cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === this.document[0].body ? 0 : this.offsetParent[0].scrollTop);
-			}
-			this.reverting = true;
-			$(this.helper).animate( animation, parseInt(this.options.revert, 10) || 500, function() {
-				that._clear(event);
-			});
-		} else {
-			this._clear(event, noPropagation);
-		}
-
-		return false;
-
-	},
-
-	cancel: function() {
-
-		if(this.dragging) {
-
-			this._mouseUp({ target: null });
-
-			if(this.options.helper === "original") {
-				this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
-			} else {
-				this.currentItem.show();
-			}
-
-			//Post deactivating events to containers
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				this.containers[i]._trigger("deactivate", null, this._uiHash(this));
-				if(this.containers[i].containerCache.over) {
-					this.containers[i]._trigger("out", null, this._uiHash(this));
-					this.containers[i].containerCache.over = 0;
-				}
-			}
-
-		}
-
-		if (this.placeholder) {
-			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-			if(this.placeholder[0].parentNode) {
-				this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-			}
-			if(this.options.helper !== "original" && this.helper && this.helper[0].parentNode) {
-				this.helper.remove();
-			}
-
-			$.extend(this, {
-				helper: null,
-				dragging: false,
-				reverting: false,
-				_noFinalSort: null
-			});
-
-			if(this.domPosition.prev) {
-				$(this.domPosition.prev).after(this.currentItem);
-			} else {
-				$(this.domPosition.parent).prepend(this.currentItem);
-			}
-		}
-
-		return this;
-
-	},
-
-	serialize: function(o) {
-
-		var items = this._getItemsAsjQuery(o && o.connected),
-			str = [];
-		o = o || {};
-
-		$(items).each(function() {
-			var res = ($(o.item || this).attr(o.attribute || "id") || "").match(o.expression || (/(.+)[\-=_](.+)/));
-			if (res) {
-				str.push((o.key || res[1]+"[]")+"="+(o.key && o.expression ? res[1] : res[2]));
-			}
-		});
-
-		if(!str.length && o.key) {
-			str.push(o.key + "=");
-		}
-
-		return str.join("&");
-
-	},
-
-	toArray: function(o) {
-
-		var items = this._getItemsAsjQuery(o && o.connected),
-			ret = [];
-
-		o = o || {};
-
-		items.each(function() { ret.push($(o.item || this).attr(o.attribute || "id") || ""); });
-		return ret;
-
-	},
-
-	/* Be careful with the following core functions */
-	_intersectsWith: function(item) {
-
-		var x1 = this.positionAbs.left,
-			x2 = x1 + this.helperProportions.width,
-			y1 = this.positionAbs.top,
-			y2 = y1 + this.helperProportions.height,
-			l = item.left,
-			r = l + item.width,
-			t = item.top,
-			b = t + item.height,
-			dyClick = this.offset.click.top,
-			dxClick = this.offset.click.left,
-			isOverElementHeight = ( this.options.axis === "x" ) || ( ( y1 + dyClick ) > t && ( y1 + dyClick ) < b ),
-			isOverElementWidth = ( this.options.axis === "y" ) || ( ( x1 + dxClick ) > l && ( x1 + dxClick ) < r ),
-			isOverElement = isOverElementHeight && isOverElementWidth;
-
-		if ( this.options.tolerance === "pointer" ||
-			this.options.forcePointerForContainers ||
-			(this.options.tolerance !== "pointer" && this.helperProportions[this.floating ? "width" : "height"] > item[this.floating ? "width" : "height"])
-		) {
-			return isOverElement;
-		} else {
-
-			return (l < x1 + (this.helperProportions.width / 2) && // Right Half
-				x2 - (this.helperProportions.width / 2) < r && // Left Half
-				t < y1 + (this.helperProportions.height / 2) && // Bottom Half
-				y2 - (this.helperProportions.height / 2) < b ); // Top Half
-
-		}
-	},
-
-	_intersectsWithPointer: function(item) {
-
-		var isOverElementHeight = (this.options.axis === "x") || this._isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
-			isOverElementWidth = (this.options.axis === "y") || this._isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
-			isOverElement = isOverElementHeight && isOverElementWidth,
-			verticalDirection = this._getDragVerticalDirection(),
-			horizontalDirection = this._getDragHorizontalDirection();
-
-		if (!isOverElement) {
-			return false;
-		}
-
-		return this.floating ?
-			( ((horizontalDirection && horizontalDirection === "right") || verticalDirection === "down") ? 2 : 1 )
-			: ( verticalDirection && (verticalDirection === "down" ? 2 : 1) );
-
-	},
-
-	_intersectsWithSides: function(item) {
-
-		var isOverBottomHalf = this._isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
-			isOverRightHalf = this._isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
-			verticalDirection = this._getDragVerticalDirection(),
-			horizontalDirection = this._getDragHorizontalDirection();
-
-		if (this.floating && horizontalDirection) {
-			return ((horizontalDirection === "right" && isOverRightHalf) || (horizontalDirection === "left" && !isOverRightHalf));
-		} else {
-			return verticalDirection && ((verticalDirection === "down" && isOverBottomHalf) || (verticalDirection === "up" && !isOverBottomHalf));
-		}
-
-	},
-
-	_getDragVerticalDirection: function() {
-		var delta = this.positionAbs.top - this.lastPositionAbs.top;
-		return delta !== 0 && (delta > 0 ? "down" : "up");
-	},
-
-	_getDragHorizontalDirection: function() {
-		var delta = this.positionAbs.left - this.lastPositionAbs.left;
-		return delta !== 0 && (delta > 0 ? "right" : "left");
-	},
-
-	refresh: function(event) {
-		this._refreshItems(event);
-		this._setHandleClassName();
-		this.refreshPositions();
-		return this;
-	},
-
-	_connectWith: function() {
-		var options = this.options;
-		return options.connectWith.constructor === String ? [options.connectWith] : options.connectWith;
-	},
-
-	_getItemsAsjQuery: function(connected) {
-
-		var i, j, cur, inst,
-			items = [],
-			queries = [],
-			connectWith = this._connectWith();
-
-		if(connectWith && connected) {
-			for (i = connectWith.length - 1; i >= 0; i--){
-				cur = $(connectWith[i], this.document[0]);
-				for ( j = cur.length - 1; j >= 0; j--){
-					inst = $.data(cur[j], this.widgetFullName);
-					if(inst && inst !== this && !inst.options.disabled) {
-						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), inst]);
-					}
-				}
-			}
-		}
-
-		queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), this]);
-
-		function addItems() {
-			items.push( this );
-		}
-		for (i = queries.length - 1; i >= 0; i--){
-			queries[i][0].each( addItems );
-		}
-
-		return $(items);
-
-	},
-
-	_removeCurrentsFromItems: function() {
-
-		var list = this.currentItem.find(":data(" + this.widgetName + "-item)");
-
-		this.items = $.grep(this.items, function (item) {
-			for (var j=0; j < list.length; j++) {
-				if(list[j] === item.item[0]) {
-					return false;
-				}
-			}
-			return true;
-		});
-
-	},
-
-	_refreshItems: function(event) {
-
-		this.items = [];
-		this.containers = [this];
-
-		var i, j, cur, inst, targetData, _queries, item, queriesLength,
-			items = this.items,
-			queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]],
-			connectWith = this._connectWith();
-
-		if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
-			for (i = connectWith.length - 1; i >= 0; i--){
-				cur = $(connectWith[i], this.document[0]);
-				for (j = cur.length - 1; j >= 0; j--){
-					inst = $.data(cur[j], this.widgetFullName);
-					if(inst && inst !== this && !inst.options.disabled) {
-						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
-						this.containers.push(inst);
-					}
-				}
-			}
-		}
-
-		for (i = queries.length - 1; i >= 0; i--) {
-			targetData = queries[i][1];
-			_queries = queries[i][0];
-
-			for (j=0, queriesLength = _queries.length; j < queriesLength; j++) {
-				item = $(_queries[j]);
-
-				item.data(this.widgetName + "-item", targetData); // Data for target checking (mouse manager)
-
-				items.push({
-					item: item,
-					instance: targetData,
-					width: 0, height: 0,
-					left: 0, top: 0
-				});
-			}
-		}
-
-	},
-
-	refreshPositions: function(fast) {
-
-		// Determine whether items are being displayed horizontally
-		this.floating = this.items.length ?
-			this.options.axis === "x" || this._isFloating( this.items[ 0 ].item ) :
-			false;
-
-		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
-		if(this.offsetParent && this.helper) {
-			this.offset.parent = this._getParentOffset();
-		}
-
-		var i, item, t, p;
-
-		for (i = this.items.length - 1; i >= 0; i--){
-			item = this.items[i];
-
-			//We ignore calculating positions of all connected containers when we're not over them
-			if(item.instance !== this.currentContainer && this.currentContainer && item.item[0] !== this.currentItem[0]) {
-				continue;
-			}
-
-			t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
-
-			if (!fast) {
-				item.width = t.outerWidth();
-				item.height = t.outerHeight();
-			}
-
-			p = t.offset();
-			item.left = p.left;
-			item.top = p.top;
-		}
-
-		if(this.options.custom && this.options.custom.refreshContainers) {
-			this.options.custom.refreshContainers.call(this);
-		} else {
-			for (i = this.containers.length - 1; i >= 0; i--){
-				p = this.containers[i].element.offset();
-				this.containers[i].containerCache.left = p.left;
-				this.containers[i].containerCache.top = p.top;
-				this.containers[i].containerCache.width = this.containers[i].element.outerWidth();
-				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
-			}
-		}
-
-		return this;
-	},
-
-	_createPlaceholder: function(that) {
-		that = that || this;
-		var className,
-			o = that.options;
-
-		if(!o.placeholder || o.placeholder.constructor === String) {
-			className = o.placeholder;
-			o.placeholder = {
-				element: function() {
-
-					var nodeName = that.currentItem[0].nodeName.toLowerCase(),
-						element = $( "<" + nodeName + ">", that.document[0] )
-							.addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
-							.removeClass("ui-sortable-helper");
-
-					if ( nodeName === "tbody" ) {
-						that._createTrPlaceholder(
-							that.currentItem.find( "tr" ).eq( 0 ),
-							$( "<tr>", that.document[ 0 ] ).appendTo( element )
-						);
-					} else if ( nodeName === "tr" ) {
-						that._createTrPlaceholder( that.currentItem, element );
-					} else if ( nodeName === "img" ) {
-						element.attr( "src", that.currentItem.attr( "src" ) );
-					}
-
-					if ( !className ) {
-						element.css( "visibility", "hidden" );
-					}
-
-					return element;
-				},
-				update: function(container, p) {
-
-					// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
-					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
-					if(className && !o.forcePlaceholderSize) {
-						return;
-					}
-
-					//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
-					if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css("paddingTop")||0, 10) - parseInt(that.currentItem.css("paddingBottom")||0, 10)); }
-					if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css("paddingLeft")||0, 10) - parseInt(that.currentItem.css("paddingRight")||0, 10)); }
-				}
-			};
-		}
-
-		//Create the placeholder
-		that.placeholder = $(o.placeholder.element.call(that.element, that.currentItem));
-
-		//Append it after the actual current item
-		that.currentItem.after(that.placeholder);
-
-		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
-		o.placeholder.update(that, that.placeholder);
-
-	},
-
-	_createTrPlaceholder: function( sourceTr, targetTr ) {
-		var that = this;
-
-		sourceTr.children().each(function() {
-			$( "<td>&#160;</td>", that.document[ 0 ] )
-				.attr( "colspan", $( this ).attr( "colspan" ) || 1 )
-				.appendTo( targetTr );
-		});
-	},
-
-	_contactContainers: function(event) {
-		var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, cur, nearBottom, floating, axis,
-			innermostContainer = null,
-			innermostIndex = null;
-
-		// get innermost container that intersects with item
-		for (i = this.containers.length - 1; i >= 0; i--) {
-
-			// never consider a container that's located within the item itself
-			if($.contains(this.currentItem[0], this.containers[i].element[0])) {
-				continue;
-			}
-
-			if(this._intersectsWith(this.containers[i].containerCache)) {
-
-				// if we've already found a container and it's more "inner" than this, then continue
-				if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0])) {
-					continue;
-				}
-
-				innermostContainer = this.containers[i];
-				innermostIndex = i;
-
-			} else {
-				// container doesn't intersect. trigger "out" event if necessary
-				if(this.containers[i].containerCache.over) {
-					this.containers[i]._trigger("out", event, this._uiHash(this));
-					this.containers[i].containerCache.over = 0;
-				}
-			}
-
-		}
-
-		// if no intersecting containers found, return
-		if(!innermostContainer) {
-			return;
-		}
-
-		// move the item into the container if it's not there already
-		if(this.containers.length === 1) {
-			if (!this.containers[innermostIndex].containerCache.over) {
-				this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
-				this.containers[innermostIndex].containerCache.over = 1;
-			}
-		} else {
-
-			//When entering a new container, we will find the item with the least distance and append our item near it
-			dist = 10000;
-			itemWithLeastDistance = null;
-			floating = innermostContainer.floating || this._isFloating(this.currentItem);
-			posProperty = floating ? "left" : "top";
-			sizeProperty = floating ? "width" : "height";
-			axis = floating ? "clientX" : "clientY";
-
-			for (j = this.items.length - 1; j >= 0; j--) {
-				if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) {
-					continue;
-				}
-				if(this.items[j].item[0] === this.currentItem[0]) {
-					continue;
-				}
-
-				cur = this.items[j].item.offset()[posProperty];
-				nearBottom = false;
-				if ( event[ axis ] - cur > this.items[ j ][ sizeProperty ] / 2 ) {
-					nearBottom = true;
-				}
-
-				if ( Math.abs( event[ axis ] - cur ) < dist ) {
-					dist = Math.abs( event[ axis ] - cur );
-					itemWithLeastDistance = this.items[ j ];
-					this.direction = nearBottom ? "up": "down";
-				}
-			}
-
-			//Check if dropOnEmpty is enabled
-			if(!itemWithLeastDistance && !this.options.dropOnEmpty) {
-				return;
-			}
-
-			if(this.currentContainer === this.containers[innermostIndex]) {
-				if ( !this.currentContainer.containerCache.over ) {
-					this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash() );
-					this.currentContainer.containerCache.over = 1;
-				}
-				return;
-			}
-
-			itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true);
-			this._trigger("change", event, this._uiHash());
-			this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
-			this.currentContainer = this.containers[innermostIndex];
-
-			//Update the placeholder
-			this.options.placeholder.update(this.currentContainer, this.placeholder);
-
-			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
-			this.containers[innermostIndex].containerCache.over = 1;
-		}
-
-
-	},
-
-	_createHelper: function(event) {
-
-		var o = this.options,
-			helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper === "clone" ? this.currentItem.clone() : this.currentItem);
-
-		//Add the helper to the DOM if that didn't happen already
-		if(!helper.parents("body").length) {
-			$(o.appendTo !== "parent" ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
-		}
-
-		if(helper[0] === this.currentItem[0]) {
-			this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
-		}
-
-		if(!helper[0].style.width || o.forceHelperSize) {
-			helper.width(this.currentItem.width());
-		}
-		if(!helper[0].style.height || o.forceHelperSize) {
-			helper.height(this.currentItem.height());
-		}
-
-		return helper;
-
-	},
-
-	_adjustOffsetFromHelper: function(obj) {
-		if (typeof obj === "string") {
-			obj = obj.split(" ");
-		}
-		if ($.isArray(obj)) {
-			obj = {left: +obj[0], top: +obj[1] || 0};
-		}
-		if ("left" in obj) {
-			this.offset.click.left = obj.left + this.margins.left;
-		}
-		if ("right" in obj) {
-			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
-		}
-		if ("top" in obj) {
-			this.offset.click.top = obj.top + this.margins.top;
-		}
-		if ("bottom" in obj) {
-			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
-		}
-	},
-
-	_getParentOffset: function() {
-
-
-		//Get the offsetParent and cache its position
-		this.offsetParent = this.helper.offsetParent();
-		var po = this.offsetParent.offset();
-
-		// This is a special case where we need to modify a offset calculated on start, since the following happened:
-		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
-		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
-		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
-		if(this.cssPosition === "absolute" && this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) {
-			po.left += this.scrollParent.scrollLeft();
-			po.top += this.scrollParent.scrollTop();
-		}
-
-		// This needs to be actually done for all browsers, since pageX/pageY includes this information
-		// with an ugly IE fix
-		if( this.offsetParent[0] === this.document[0].body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
-			po = { top: 0, left: 0 };
-		}
-
-		return {
-			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
-			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
-		};
-
-	},
-
-	_getRelativeOffset: function() {
-
-		if(this.cssPosition === "relative") {
-			var p = this.currentItem.position();
-			return {
-				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
-				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
-			};
-		} else {
-			return { top: 0, left: 0 };
-		}
-
-	},
-
-	_cacheMargins: function() {
-		this.margins = {
-			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
-			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
-		};
-	},
-
-	_cacheHelperProportions: function() {
-		this.helperProportions = {
-			width: this.helper.outerWidth(),
-			height: this.helper.outerHeight()
-		};
-	},
-
-	_setContainment: function() {
-
-		var ce, co, over,
-			o = this.options;
-		if(o.containment === "parent") {
-			o.containment = this.helper[0].parentNode;
-		}
-		if(o.containment === "document" || o.containment === "window") {
-			this.containment = [
-				0 - this.offset.relative.left - this.offset.parent.left,
-				0 - this.offset.relative.top - this.offset.parent.top,
-				o.containment === "document" ? this.document.width() : this.window.width() - this.helperProportions.width - this.margins.left,
-				(o.containment === "document" ? this.document.width() : this.window.height() || this.document[0].body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
-			];
-		}
-
-		if(!(/^(document|window|parent)$/).test(o.containment)) {
-			ce = $(o.containment)[0];
-			co = $(o.containment).offset();
-			over = ($(ce).css("overflow") !== "hidden");
-
-			this.containment = [
-				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
-				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
-				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
-				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
-			];
-		}
-
-	},
-
-	_convertPositionTo: function(d, pos) {
-
-		if(!pos) {
-			pos = this.position;
-		}
-		var mod = d === "absolute" ? 1 : -1,
-			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
-			scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-
-		return {
-			top: (
-				pos.top	+																// The absolute mouse position
-				this.offset.relative.top * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.top * mod -											// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
-			),
-			left: (
-				pos.left +																// The absolute mouse position
-				this.offset.relative.left * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.left * mod	-										// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
-			)
-		};
-
-	},
-
-	_generatePosition: function(event) {
-
-		var top, left,
-			o = this.options,
-			pageX = event.pageX,
-			pageY = event.pageY,
-			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-
-		// This is another very weird special case that only happens for relative elements:
-		// 1. If the css position is relative
-		// 2. and the scroll parent is the document or similar to the offset parent
-		// we have to refresh the relative offset during the scroll so there are no jumps
-		if(this.cssPosition === "relative" && !(this.scrollParent[0] !== this.document[0] && this.scrollParent[0] !== this.offsetParent[0])) {
-			this.offset.relative = this._getRelativeOffset();
-		}
-
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-
-		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
-
-			if(this.containment) {
-				if(event.pageX - this.offset.click.left < this.containment[0]) {
-					pageX = this.containment[0] + this.offset.click.left;
-				}
-				if(event.pageY - this.offset.click.top < this.containment[1]) {
-					pageY = this.containment[1] + this.offset.click.top;
-				}
-				if(event.pageX - this.offset.click.left > this.containment[2]) {
-					pageX = this.containment[2] + this.offset.click.left;
-				}
-				if(event.pageY - this.offset.click.top > this.containment[3]) {
-					pageY = this.containment[3] + this.offset.click.top;
-				}
-			}
-
-			if(o.grid) {
-				top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
-				pageY = this.containment ? ( (top - this.offset.click.top >= this.containment[1] && top - this.offset.click.top <= this.containment[3]) ? top : ((top - this.offset.click.top >= this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-
-				left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
-				pageX = this.containment ? ( (left - this.offset.click.left >= this.containment[0] && left - this.offset.click.left <= this.containment[2]) ? left : ((left - this.offset.click.left >= this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
-			}
-
-		}
-
-		return {
-			top: (
-				pageY -																// The absolute mouse position
-				this.offset.click.top -													// Click offset (relative to the element)
-				this.offset.relative.top	-											// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.top +												// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
-			),
-			left: (
-				pageX -																// The absolute mouse position
-				this.offset.click.left -												// Click offset (relative to the element)
-				this.offset.relative.left	-											// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.left +												// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
-			)
-		};
-
-	},
-
-	_rearrange: function(event, i, a, hardRefresh) {
-
-		a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction === "down" ? i.item[0] : i.item[0].nextSibling));
-
-		//Various things done here to improve the performance:
-		// 1. we create a setTimeout, that calls refreshPositions
-		// 2. on the instance, we have a counter variable, that get's higher after every append
-		// 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
-		// 4. this lets only the last addition to the timeout stack through
-		this.counter = this.counter ? ++this.counter : 1;
-		var counter = this.counter;
-
-		this._delay(function() {
-			if(counter === this.counter) {
-				this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
-			}
-		});
-
-	},
-
-	_clear: function(event, noPropagation) {
-
-		this.reverting = false;
-		// We delay all events that have to be triggered to after the point where the placeholder has been removed and
-		// everything else normalized again
-		var i,
-			delayedTriggers = [];
-
-		// We first have to update the dom position of the actual currentItem
-		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
-		if(!this._noFinalSort && this.currentItem.parent().length) {
-			this.placeholder.before(this.currentItem);
-		}
-		this._noFinalSort = null;
-
-		if(this.helper[0] === this.currentItem[0]) {
-			for(i in this._storedCSS) {
-				if(this._storedCSS[i] === "auto" || this._storedCSS[i] === "static") {
-					this._storedCSS[i] = "";
-				}
-			}
-			this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
-		} else {
-			this.currentItem.show();
-		}
-
-		if(this.fromOutside && !noPropagation) {
-			delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
-		}
-		if((this.fromOutside || this.domPosition.prev !== this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent !== this.currentItem.parent()[0]) && !noPropagation) {
-			delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
-		}
-
-		// Check if the items Container has Changed and trigger appropriate
-		// events.
-		if (this !== this.currentContainer) {
-			if(!noPropagation) {
-				delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); };  }).call(this, this.currentContainer));
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this));  }; }).call(this, this.currentContainer));
-			}
-		}
-
-
-		//Post events to containers
-		function delayEvent( type, instance, container ) {
-			return function( event ) {
-				container._trigger( type, event, instance._uiHash( instance ) );
-			};
-		}
-		for (i = this.containers.length - 1; i >= 0; i--){
-			if (!noPropagation) {
-				delayedTriggers.push( delayEvent( "deactivate", this, this.containers[ i ] ) );
-			}
-			if(this.containers[i].containerCache.over) {
-				delayedTriggers.push( delayEvent( "out", this, this.containers[ i ] ) );
-				this.containers[i].containerCache.over = 0;
-			}
-		}
-
-		//Do what was originally in plugins
-		if ( this.storedCursor ) {
-			this.document.find( "body" ).css( "cursor", this.storedCursor );
-			this.storedStylesheet.remove();
-		}
-		if(this._storedOpacity) {
-			this.helper.css("opacity", this._storedOpacity);
-		}
-		if(this._storedZIndex) {
-			this.helper.css("zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex);
-		}
-
-		this.dragging = false;
-
-		if(!noPropagation) {
-			this._trigger("beforeStop", event, this._uiHash());
-		}
-
-		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-		this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-
-		if ( !this.cancelHelperRemoval ) {
-			if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
-				this.helper.remove();
-			}
-			this.helper = null;
-		}
-
-		if(!noPropagation) {
-			for (i=0; i < delayedTriggers.length; i++) {
-				delayedTriggers[i].call(this, event);
-			} //Trigger all delayed events
-			this._trigger("stop", event, this._uiHash());
-		}
-
-		this.fromOutside = false;
-		return !this.cancelHelperRemoval;
-
-	},
-
-	_trigger: function() {
-		if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
-			this.cancel();
-		}
-	},
-
-	_uiHash: function(_inst) {
-		var inst = _inst || this;
-		return {
-			helper: inst.helper,
-			placeholder: inst.placeholder || $([]),
-			position: inst.position,
-			originalPosition: inst.originalPosition,
-			offset: inst.positionAbs,
-			item: inst.currentItem,
-			sender: _inst ? _inst.element : null
-		};
-	}
-
-});
-
-
-/*!
- * jQuery UI Spinner 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/spinner/
- */
-
-
-function spinner_modifier( fn ) {
-	return function() {
-		var previous = this.element.val();
-		fn.apply( this, arguments );
-		this._refresh();
-		if ( previous !== this.element.val() ) {
-			this._trigger( "change" );
-		}
-	};
+var effect;
+if ( $.uiBackCompat !== false ) {
+	effect = $.effects.define( "transfer", function( options, done ) {
+		$( this ).transfer( options, done );
+	} );
 }
+var effectsEffectTransfer = effect;
 
-var spinner = $.widget( "ui.spinner", {
-	version: "1.11.4",
-	defaultElement: "<input>",
-	widgetEventPrefix: "spin",
-	options: {
-		culture: null,
-		icons: {
-			down: "ui-icon-triangle-1-s",
-			up: "ui-icon-triangle-1-n"
-		},
-		incremental: true,
-		max: null,
-		min: null,
-		numberFormat: null,
-		page: 10,
-		step: 1,
-
-		change: null,
-		spin: null,
-		start: null,
-		stop: null
-	},
-
-	_create: function() {
-		// handle string values that need to be parsed
-		this._setOption( "max", this.options.max );
-		this._setOption( "min", this.options.min );
-		this._setOption( "step", this.options.step );
-
-		// Only format if there is a value, prevents the field from being marked
-		// as invalid in Firefox, see #9573.
-		if ( this.value() !== "" ) {
-			// Format the value, but don't constrain.
-			this._value( this.element.val(), true );
-		}
-
-		this._draw();
-		this._on( this._events );
-		this._refresh();
-
-		// turning off autocomplete prevents the browser from remembering the
-		// value when navigating through history, so we re-enable autocomplete
-		// if the page is unloaded before the widget is destroyed. #7790
-		this._on( this.window, {
-			beforeunload: function() {
-				this.element.removeAttr( "autocomplete" );
-			}
-		});
-	},
-
-	_getCreateOptions: function() {
-		var options = {},
-			element = this.element;
-
-		$.each( [ "min", "max", "step" ], function( i, option ) {
-			var value = element.attr( option );
-			if ( value !== undefined && value.length ) {
-				options[ option ] = value;
-			}
-		});
-
-		return options;
-	},
-
-	_events: {
-		keydown: function( event ) {
-			if ( this._start( event ) && this._keydown( event ) ) {
-				event.preventDefault();
-			}
-		},
-		keyup: "_stop",
-		focus: function() {
-			this.previous = this.element.val();
-		},
-		blur: function( event ) {
-			if ( this.cancelBlur ) {
-				delete this.cancelBlur;
-				return;
-			}
-
-			this._stop();
-			this._refresh();
-			if ( this.previous !== this.element.val() ) {
-				this._trigger( "change", event );
-			}
-		},
-		mousewheel: function( event, delta ) {
-			if ( !delta ) {
-				return;
-			}
-			if ( !this.spinning && !this._start( event ) ) {
-				return false;
-			}
-
-			this._spin( (delta > 0 ? 1 : -1) * this.options.step, event );
-			clearTimeout( this.mousewheelTimer );
-			this.mousewheelTimer = this._delay(function() {
-				if ( this.spinning ) {
-					this._stop( event );
-				}
-			}, 100 );
-			event.preventDefault();
-		},
-		"mousedown .ui-spinner-button": function( event ) {
-			var previous;
-
-			// We never want the buttons to have focus; whenever the user is
-			// interacting with the spinner, the focus should be on the input.
-			// If the input is focused then this.previous is properly set from
-			// when the input first received focus. If the input is not focused
-			// then we need to set this.previous based on the value before spinning.
-			previous = this.element[0] === this.document[0].activeElement ?
-				this.previous : this.element.val();
-			function checkFocus() {
-				var isActive = this.element[0] === this.document[0].activeElement;
-				if ( !isActive ) {
-					this.element.focus();
-					this.previous = previous;
-					// support: IE
-					// IE sets focus asynchronously, so we need to check if focus
-					// moved off of the input because the user clicked on the button.
-					this._delay(function() {
-						this.previous = previous;
-					});
-				}
-			}
-
-			// ensure focus is on (or stays on) the text field
-			event.preventDefault();
-			checkFocus.call( this );
-
-			// support: IE
-			// IE doesn't prevent moving focus even with event.preventDefault()
-			// so we set a flag to know when we should ignore the blur event
-			// and check (again) if focus moved off of the input.
-			this.cancelBlur = true;
-			this._delay(function() {
-				delete this.cancelBlur;
-				checkFocus.call( this );
-			});
-
-			if ( this._start( event ) === false ) {
-				return;
-			}
-
-			this._repeat( null, $( event.currentTarget ).hasClass( "ui-spinner-up" ) ? 1 : -1, event );
-		},
-		"mouseup .ui-spinner-button": "_stop",
-		"mouseenter .ui-spinner-button": function( event ) {
-			// button will add ui-state-active if mouse was down while mouseleave and kept down
-			if ( !$( event.currentTarget ).hasClass( "ui-state-active" ) ) {
-				return;
-			}
-
-			if ( this._start( event ) === false ) {
-				return false;
-			}
-			this._repeat( null, $( event.currentTarget ).hasClass( "ui-spinner-up" ) ? 1 : -1, event );
-		},
-		// TODO: do we really want to consider this a stop?
-		// shouldn't we just stop the repeater and wait until mouseup before
-		// we trigger the stop event?
-		"mouseleave .ui-spinner-button": "_stop"
-	},
-
-	_draw: function() {
-		var uiSpinner = this.uiSpinner = this.element
-			.addClass( "ui-spinner-input" )
-			.attr( "autocomplete", "off" )
-			.wrap( this._uiSpinnerHtml() )
-			.parent()
-				// add buttons
-				.append( this._buttonHtml() );
-
-		this.element.attr( "role", "spinbutton" );
-
-		// button bindings
-		this.buttons = uiSpinner.find( ".ui-spinner-button" )
-			.attr( "tabIndex", -1 )
-			.button()
-			.removeClass( "ui-corner-all" );
-
-		// IE 6 doesn't understand height: 50% for the buttons
-		// unless the wrapper has an explicit height
-		if ( this.buttons.height() > Math.ceil( uiSpinner.height() * 0.5 ) &&
-				uiSpinner.height() > 0 ) {
-			uiSpinner.height( uiSpinner.height() );
-		}
-
-		// disable spinner if element was already disabled
-		if ( this.options.disabled ) {
-			this.disable();
-		}
-	},
-
-	_keydown: function( event ) {
-		var options = this.options,
-			keyCode = $.ui.keyCode;
-
-		switch ( event.keyCode ) {
-		case keyCode.UP:
-			this._repeat( null, 1, event );
-			return true;
-		case keyCode.DOWN:
-			this._repeat( null, -1, event );
-			return true;
-		case keyCode.PAGE_UP:
-			this._repeat( null, options.page, event );
-			return true;
-		case keyCode.PAGE_DOWN:
-			this._repeat( null, -options.page, event );
-			return true;
-		}
-
-		return false;
-	},
-
-	_uiSpinnerHtml: function() {
-		return "<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>";
-	},
-
-	_buttonHtml: function() {
-		return "" +
-			"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'>" +
-				"<span class='ui-icon " + this.options.icons.up + "'>&#9650;</span>" +
-			"</a>" +
-			"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>" +
-				"<span class='ui-icon " + this.options.icons.down + "'>&#9660;</span>" +
-			"</a>";
-	},
-
-	_start: function( event ) {
-		if ( !this.spinning && this._trigger( "start", event ) === false ) {
-			return false;
-		}
-
-		if ( !this.counter ) {
-			this.counter = 1;
-		}
-		this.spinning = true;
-		return true;
-	},
-
-	_repeat: function( i, steps, event ) {
-		i = i || 500;
-
-		clearTimeout( this.timer );
-		this.timer = this._delay(function() {
-			this._repeat( 40, steps, event );
-		}, i );
-
-		this._spin( steps * this.options.step, event );
-	},
-
-	_spin: function( step, event ) {
-		var value = this.value() || 0;
-
-		if ( !this.counter ) {
-			this.counter = 1;
-		}
-
-		value = this._adjustValue( value + step * this._increment( this.counter ) );
-
-		if ( !this.spinning || this._trigger( "spin", event, { value: value } ) !== false) {
-			this._value( value );
-			this.counter++;
-		}
-	},
-
-	_increment: function( i ) {
-		var incremental = this.options.incremental;
-
-		if ( incremental ) {
-			return $.isFunction( incremental ) ?
-				incremental( i ) :
-				Math.floor( i * i * i / 50000 - i * i / 500 + 17 * i / 200 + 1 );
-		}
-
-		return 1;
-	},
-
-	_precision: function() {
-		var precision = this._precisionOf( this.options.step );
-		if ( this.options.min !== null ) {
-			precision = Math.max( precision, this._precisionOf( this.options.min ) );
-		}
-		return precision;
-	},
-
-	_precisionOf: function( num ) {
-		var str = num.toString(),
-			decimal = str.indexOf( "." );
-		return decimal === -1 ? 0 : str.length - decimal - 1;
-	},
-
-	_adjustValue: function( value ) {
-		var base, aboveMin,
-			options = this.options;
-
-		// make sure we're at a valid step
-		// - find out where we are relative to the base (min or 0)
-		base = options.min !== null ? options.min : 0;
-		aboveMin = value - base;
-		// - round to the nearest step
-		aboveMin = Math.round(aboveMin / options.step) * options.step;
-		// - rounding is based on 0, so adjust back to our base
-		value = base + aboveMin;
-
-		// fix precision from bad JS floating point math
-		value = parseFloat( value.toFixed( this._precision() ) );
-
-		// clamp the value
-		if ( options.max !== null && value > options.max) {
-			return options.max;
-		}
-		if ( options.min !== null && value < options.min ) {
-			return options.min;
-		}
-
-		return value;
-	},
-
-	_stop: function( event ) {
-		if ( !this.spinning ) {
-			return;
-		}
-
-		clearTimeout( this.timer );
-		clearTimeout( this.mousewheelTimer );
-		this.counter = 0;
-		this.spinning = false;
-		this._trigger( "stop", event );
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "culture" || key === "numberFormat" ) {
-			var prevValue = this._parse( this.element.val() );
-			this.options[ key ] = value;
-			this.element.val( this._format( prevValue ) );
-			return;
-		}
-
-		if ( key === "max" || key === "min" || key === "step" ) {
-			if ( typeof value === "string" ) {
-				value = this._parse( value );
-			}
-		}
-		if ( key === "icons" ) {
-			this.buttons.first().find( ".ui-icon" )
-				.removeClass( this.options.icons.up )
-				.addClass( value.up );
-			this.buttons.last().find( ".ui-icon" )
-				.removeClass( this.options.icons.down )
-				.addClass( value.down );
-		}
-
-		this._super( key, value );
-
-		if ( key === "disabled" ) {
-			this.widget().toggleClass( "ui-state-disabled", !!value );
-			this.element.prop( "disabled", !!value );
-			this.buttons.button( value ? "disable" : "enable" );
-		}
-	},
-
-	_setOptions: spinner_modifier(function( options ) {
-		this._super( options );
-	}),
-
-	_parse: function( val ) {
-		if ( typeof val === "string" && val !== "" ) {
-			val = window.Globalize && this.options.numberFormat ?
-				Globalize.parseFloat( val, 10, this.options.culture ) : +val;
-		}
-		return val === "" || isNaN( val ) ? null : val;
-	},
-
-	_format: function( value ) {
-		if ( value === "" ) {
-			return "";
-		}
-		return window.Globalize && this.options.numberFormat ?
-			Globalize.format( value, this.options.numberFormat, this.options.culture ) :
-			value;
-	},
-
-	_refresh: function() {
-		this.element.attr({
-			"aria-valuemin": this.options.min,
-			"aria-valuemax": this.options.max,
-			// TODO: what should we do with values that can't be parsed?
-			"aria-valuenow": this._parse( this.element.val() )
-		});
-	},
-
-	isValid: function() {
-		var value = this.value();
-
-		// null is invalid
-		if ( value === null ) {
-			return false;
-		}
-
-		// if value gets adjusted, it's invalid
-		return value === this._adjustValue( value );
-	},
-
-	// update the value without triggering change
-	_value: function( value, allowAny ) {
-		var parsed;
-		if ( value !== "" ) {
-			parsed = this._parse( value );
-			if ( parsed !== null ) {
-				if ( !allowAny ) {
-					parsed = this._adjustValue( parsed );
-				}
-				value = this._format( parsed );
-			}
-		}
-		this.element.val( value );
-		this._refresh();
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass( "ui-spinner-input" )
-			.prop( "disabled", false )
-			.removeAttr( "autocomplete" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-valuemin" )
-			.removeAttr( "aria-valuemax" )
-			.removeAttr( "aria-valuenow" );
-		this.uiSpinner.replaceWith( this.element );
-	},
-
-	stepUp: spinner_modifier(function( steps ) {
-		this._stepUp( steps );
-	}),
-	_stepUp: function( steps ) {
-		if ( this._start() ) {
-			this._spin( (steps || 1) * this.options.step );
-			this._stop();
-		}
-	},
-
-	stepDown: spinner_modifier(function( steps ) {
-		this._stepDown( steps );
-	}),
-	_stepDown: function( steps ) {
-		if ( this._start() ) {
-			this._spin( (steps || 1) * -this.options.step );
-			this._stop();
-		}
-	},
-
-	pageUp: spinner_modifier(function( pages ) {
-		this._stepUp( (pages || 1) * this.options.page );
-	}),
-
-	pageDown: spinner_modifier(function( pages ) {
-		this._stepDown( (pages || 1) * this.options.page );
-	}),
-
-	value: function( newVal ) {
-		if ( !arguments.length ) {
-			return this._parse( this.element.val() );
-		}
-		spinner_modifier( this._value ).call( this, newVal );
-	},
-
-	widget: function() {
-		return this.uiSpinner;
-	}
-});
-
-
-/*!
- * jQuery UI Tabs 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/tabs/
- */
-
-
-var tabs = $.widget( "ui.tabs", {
-	version: "1.11.4",
-	delay: 300,
-	options: {
-		active: null,
-		collapsible: false,
-		event: "click",
-		heightStyle: "content",
-		hide: null,
-		show: null,
-
-		// callbacks
-		activate: null,
-		beforeActivate: null,
-		beforeLoad: null,
-		load: null
-	},
-
-	_isLocal: (function() {
-		var rhash = /#.*$/;
-
-		return function( anchor ) {
-			var anchorUrl, locationUrl;
-
-			// support: IE7
-			// IE7 doesn't normalize the href property when set via script (#9317)
-			anchor = anchor.cloneNode( false );
-
-			anchorUrl = anchor.href.replace( rhash, "" );
-			locationUrl = location.href.replace( rhash, "" );
-
-			// decoding may throw an error if the URL isn't UTF-8 (#9518)
-			try {
-				anchorUrl = decodeURIComponent( anchorUrl );
-			} catch ( error ) {}
-			try {
-				locationUrl = decodeURIComponent( locationUrl );
-			} catch ( error ) {}
-
-			return anchor.hash.length > 1 && anchorUrl === locationUrl;
-		};
-	})(),
-
-	_create: function() {
-		var that = this,
-			options = this.options;
-
-		this.running = false;
-
-		this.element
-			.addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" )
-			.toggleClass( "ui-tabs-collapsible", options.collapsible );
-
-		this._processTabs();
-		options.active = this._initialActive();
-
-		// Take disabling tabs via class attribute from HTML
-		// into account and update option properly.
-		if ( $.isArray( options.disabled ) ) {
-			options.disabled = $.unique( options.disabled.concat(
-				$.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) {
-					return that.tabs.index( li );
-				})
-			) ).sort();
-		}
-
-		// check for length avoids error when initializing empty list
-		if ( this.options.active !== false && this.anchors.length ) {
-			this.active = this._findActive( options.active );
-		} else {
-			this.active = $();
-		}
-
-		this._refresh();
-
-		if ( this.active.length ) {
-			this.load( options.active );
-		}
-	},
-
-	_initialActive: function() {
-		var active = this.options.active,
-			collapsible = this.options.collapsible,
-			locationHash = location.hash.substring( 1 );
-
-		if ( active === null ) {
-			// check the fragment identifier in the URL
-			if ( locationHash ) {
-				this.tabs.each(function( i, tab ) {
-					if ( $( tab ).attr( "aria-controls" ) === locationHash ) {
-						active = i;
-						return false;
-					}
-				});
-			}
-
-			// check for a tab marked active via a class
-			if ( active === null ) {
-				active = this.tabs.index( this.tabs.filter( ".ui-tabs-active" ) );
-			}
-
-			// no active tab, set to false
-			if ( active === null || active === -1 ) {
-				active = this.tabs.length ? 0 : false;
-			}
-		}
-
-		// handle numbers: negative, out of range
-		if ( active !== false ) {
-			active = this.tabs.index( this.tabs.eq( active ) );
-			if ( active === -1 ) {
-				active = collapsible ? false : 0;
-			}
-		}
-
-		// don't allow collapsible: false and active: false
-		if ( !collapsible && active === false && this.anchors.length ) {
-			active = 0;
-		}
-
-		return active;
-	},
-
-	_getCreateEventData: function() {
-		return {
-			tab: this.active,
-			panel: !this.active.length ? $() : this._getPanelForTab( this.active )
-		};
-	},
-
-	_tabKeydown: function( event ) {
-		var focusedTab = $( this.document[0].activeElement ).closest( "li" ),
-			selectedIndex = this.tabs.index( focusedTab ),
-			goingForward = true;
-
-		if ( this._handlePageNav( event ) ) {
-			return;
-		}
-
-		switch ( event.keyCode ) {
-			case $.ui.keyCode.RIGHT:
-			case $.ui.keyCode.DOWN:
-				selectedIndex++;
-				break;
-			case $.ui.keyCode.UP:
-			case $.ui.keyCode.LEFT:
-				goingForward = false;
-				selectedIndex--;
-				break;
-			case $.ui.keyCode.END:
-				selectedIndex = this.anchors.length - 1;
-				break;
-			case $.ui.keyCode.HOME:
-				selectedIndex = 0;
-				break;
-			case $.ui.keyCode.SPACE:
-				// Activate only, no collapsing
-				event.preventDefault();
-				clearTimeout( this.activating );
-				this._activate( selectedIndex );
-				return;
-			case $.ui.keyCode.ENTER:
-				// Toggle (cancel delayed activation, allow collapsing)
-				event.preventDefault();
-				clearTimeout( this.activating );
-				// Determine if we should collapse or activate
-				this._activate( selectedIndex === this.options.active ? false : selectedIndex );
-				return;
-			default:
-				return;
-		}
-
-		// Focus the appropriate tab, based on which key was pressed
-		event.preventDefault();
-		clearTimeout( this.activating );
-		selectedIndex = this._focusNextTab( selectedIndex, goingForward );
-
-		// Navigating with control/command key will prevent automatic activation
-		if ( !event.ctrlKey && !event.metaKey ) {
-
-			// Update aria-selected immediately so that AT think the tab is already selected.
-			// Otherwise AT may confuse the user by stating that they need to activate the tab,
-			// but the tab will already be activated by the time the announcement finishes.
-			focusedTab.attr( "aria-selected", "false" );
-			this.tabs.eq( selectedIndex ).attr( "aria-selected", "true" );
-
-			this.activating = this._delay(function() {
-				this.option( "active", selectedIndex );
-			}, this.delay );
-		}
-	},
-
-	_panelKeydown: function( event ) {
-		if ( this._handlePageNav( event ) ) {
-			return;
-		}
-
-		// Ctrl+up moves focus to the current tab
-		if ( event.ctrlKey && event.keyCode === $.ui.keyCode.UP ) {
-			event.preventDefault();
-			this.active.focus();
-		}
-	},
-
-	// Alt+page up/down moves focus to the previous/next tab (and activates)
-	_handlePageNav: function( event ) {
-		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_UP ) {
-			this._activate( this._focusNextTab( this.options.active - 1, false ) );
-			return true;
-		}
-		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_DOWN ) {
-			this._activate( this._focusNextTab( this.options.active + 1, true ) );
-			return true;
-		}
-	},
-
-	_findNextTab: function( index, goingForward ) {
-		var lastTabIndex = this.tabs.length - 1;
-
-		function constrain() {
-			if ( index > lastTabIndex ) {
-				index = 0;
-			}
-			if ( index < 0 ) {
-				index = lastTabIndex;
-			}
-			return index;
-		}
-
-		while ( $.inArray( constrain(), this.options.disabled ) !== -1 ) {
-			index = goingForward ? index + 1 : index - 1;
-		}
-
-		return index;
-	},
-
-	_focusNextTab: function( index, goingForward ) {
-		index = this._findNextTab( index, goingForward );
-		this.tabs.eq( index ).focus();
-		return index;
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "active" ) {
-			// _activate() will handle invalid values and update this.options
-			this._activate( value );
-			return;
-		}
-
-		if ( key === "disabled" ) {
-			// don't use the widget factory's disabled handling
-			this._setupDisabled( value );
-			return;
-		}
-
-		this._super( key, value);
-
-		if ( key === "collapsible" ) {
-			this.element.toggleClass( "ui-tabs-collapsible", value );
-			// Setting collapsible: false while collapsed; open first panel
-			if ( !value && this.options.active === false ) {
-				this._activate( 0 );
-			}
-		}
-
-		if ( key === "event" ) {
-			this._setupEvents( value );
-		}
-
-		if ( key === "heightStyle" ) {
-			this._setupHeightStyle( value );
-		}
-	},
-
-	_sanitizeSelector: function( hash ) {
-		return hash ? hash.replace( /[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g, "\\$&" ) : "";
-	},
-
-	refresh: function() {
-		var options = this.options,
-			lis = this.tablist.children( ":has(a[href])" );
-
-		// get disabled tabs from class attribute from HTML
-		// this will get converted to a boolean if needed in _refresh()
-		options.disabled = $.map( lis.filter( ".ui-state-disabled" ), function( tab ) {
-			return lis.index( tab );
-		});
-
-		this._processTabs();
-
-		// was collapsed or no tabs
-		if ( options.active === false || !this.anchors.length ) {
-			options.active = false;
-			this.active = $();
-		// was active, but active tab is gone
-		} else if ( this.active.length && !$.contains( this.tablist[ 0 ], this.active[ 0 ] ) ) {
-			// all remaining tabs are disabled
-			if ( this.tabs.length === options.disabled.length ) {
-				options.active = false;
-				this.active = $();
-			// activate previous tab
-			} else {
-				this._activate( this._findNextTab( Math.max( 0, options.active - 1 ), false ) );
-			}
-		// was active, active tab still exists
-		} else {
-			// make sure active index is correct
-			options.active = this.tabs.index( this.active );
-		}
-
-		this._refresh();
-	},
-
-	_refresh: function() {
-		this._setupDisabled( this.options.disabled );
-		this._setupEvents( this.options.event );
-		this._setupHeightStyle( this.options.heightStyle );
-
-		this.tabs.not( this.active ).attr({
-			"aria-selected": "false",
-			"aria-expanded": "false",
-			tabIndex: -1
-		});
-		this.panels.not( this._getPanelForTab( this.active ) )
-			.hide()
-			.attr({
-				"aria-hidden": "true"
-			});
-
-		// Make sure one tab is in the tab order
-		if ( !this.active.length ) {
-			this.tabs.eq( 0 ).attr( "tabIndex", 0 );
-		} else {
-			this.active
-				.addClass( "ui-tabs-active ui-state-active" )
-				.attr({
-					"aria-selected": "true",
-					"aria-expanded": "true",
-					tabIndex: 0
-				});
-			this._getPanelForTab( this.active )
-				.show()
-				.attr({
-					"aria-hidden": "false"
-				});
-		}
-	},
-
-	_processTabs: function() {
-		var that = this,
-			prevTabs = this.tabs,
-			prevAnchors = this.anchors,
-			prevPanels = this.panels;
-
-		this.tablist = this._getList()
-			.addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
-			.attr( "role", "tablist" )
-
-			// Prevent users from focusing disabled tabs via click
-			.delegate( "> li", "mousedown" + this.eventNamespace, function( event ) {
-				if ( $( this ).is( ".ui-state-disabled" ) ) {
-					event.preventDefault();
-				}
-			})
-
-			// support: IE <9
-			// Preventing the default action in mousedown doesn't prevent IE
-			// from focusing the element, so if the anchor gets focused, blur.
-			// We don't have to worry about focusing the previously focused
-			// element since clicking on a non-focusable element should focus
-			// the body anyway.
-			.delegate( ".ui-tabs-anchor", "focus" + this.eventNamespace, function() {
-				if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
-					this.blur();
-				}
-			});
-
-		this.tabs = this.tablist.find( "> li:has(a[href])" )
-			.addClass( "ui-state-default ui-corner-top" )
-			.attr({
-				role: "tab",
-				tabIndex: -1
-			});
-
-		this.anchors = this.tabs.map(function() {
-				return $( "a", this )[ 0 ];
-			})
-			.addClass( "ui-tabs-anchor" )
-			.attr({
-				role: "presentation",
-				tabIndex: -1
-			});
-
-		this.panels = $();
-
-		this.anchors.each(function( i, anchor ) {
-			var selector, panel, panelId,
-				anchorId = $( anchor ).uniqueId().attr( "id" ),
-				tab = $( anchor ).closest( "li" ),
-				originalAriaControls = tab.attr( "aria-controls" );
-
-			// inline tab
-			if ( that._isLocal( anchor ) ) {
-				selector = anchor.hash;
-				panelId = selector.substring( 1 );
-				panel = that.element.find( that._sanitizeSelector( selector ) );
-			// remote tab
-			} else {
-				// If the tab doesn't already have aria-controls,
-				// generate an id by using a throw-away element
-				panelId = tab.attr( "aria-controls" ) || $( {} ).uniqueId()[ 0 ].id;
-				selector = "#" + panelId;
-				panel = that.element.find( selector );
-				if ( !panel.length ) {
-					panel = that._createPanel( panelId );
-					panel.insertAfter( that.panels[ i - 1 ] || that.tablist );
-				}
-				panel.attr( "aria-live", "polite" );
-			}
-
-			if ( panel.length) {
-				that.panels = that.panels.add( panel );
-			}
-			if ( originalAriaControls ) {
-				tab.data( "ui-tabs-aria-controls", originalAriaControls );
-			}
-			tab.attr({
-				"aria-controls": panelId,
-				"aria-labelledby": anchorId
-			});
-			panel.attr( "aria-labelledby", anchorId );
-		});
-
-		this.panels
-			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
-			.attr( "role", "tabpanel" );
-
-		// Avoid memory leaks (#10056)
-		if ( prevTabs ) {
-			this._off( prevTabs.not( this.tabs ) );
-			this._off( prevAnchors.not( this.anchors ) );
-			this._off( prevPanels.not( this.panels ) );
-		}
-	},
-
-	// allow overriding how to find the list for rare usage scenarios (#7715)
-	_getList: function() {
-		return this.tablist || this.element.find( "ol,ul" ).eq( 0 );
-	},
-
-	_createPanel: function( id ) {
-		return $( "<div>" )
-			.attr( "id", id )
-			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
-			.data( "ui-tabs-destroy", true );
-	},
-
-	_setupDisabled: function( disabled ) {
-		if ( $.isArray( disabled ) ) {
-			if ( !disabled.length ) {
-				disabled = false;
-			} else if ( disabled.length === this.anchors.length ) {
-				disabled = true;
-			}
-		}
-
-		// disable tabs
-		for ( var i = 0, li; ( li = this.tabs[ i ] ); i++ ) {
-			if ( disabled === true || $.inArray( i, disabled ) !== -1 ) {
-				$( li )
-					.addClass( "ui-state-disabled" )
-					.attr( "aria-disabled", "true" );
-			} else {
-				$( li )
-					.removeClass( "ui-state-disabled" )
-					.removeAttr( "aria-disabled" );
-			}
-		}
-
-		this.options.disabled = disabled;
-	},
-
-	_setupEvents: function( event ) {
-		var events = {};
-		if ( event ) {
-			$.each( event.split(" "), function( index, eventName ) {
-				events[ eventName ] = "_eventHandler";
-			});
-		}
-
-		this._off( this.anchors.add( this.tabs ).add( this.panels ) );
-		// Always prevent the default action, even when disabled
-		this._on( true, this.anchors, {
-			click: function( event ) {
-				event.preventDefault();
-			}
-		});
-		this._on( this.anchors, events );
-		this._on( this.tabs, { keydown: "_tabKeydown" } );
-		this._on( this.panels, { keydown: "_panelKeydown" } );
-
-		this._focusable( this.tabs );
-		this._hoverable( this.tabs );
-	},
-
-	_setupHeightStyle: function( heightStyle ) {
-		var maxHeight,
-			parent = this.element.parent();
-
-		if ( heightStyle === "fill" ) {
-			maxHeight = parent.height();
-			maxHeight -= this.element.outerHeight() - this.element.height();
-
-			this.element.siblings( ":visible" ).each(function() {
-				var elem = $( this ),
-					position = elem.css( "position" );
-
-				if ( position === "absolute" || position === "fixed" ) {
-					return;
-				}
-				maxHeight -= elem.outerHeight( true );
-			});
-
-			this.element.children().not( this.panels ).each(function() {
-				maxHeight -= $( this ).outerHeight( true );
-			});
-
-			this.panels.each(function() {
-				$( this ).height( Math.max( 0, maxHeight -
-					$( this ).innerHeight() + $( this ).height() ) );
-			})
-			.css( "overflow", "auto" );
-		} else if ( heightStyle === "auto" ) {
-			maxHeight = 0;
-			this.panels.each(function() {
-				maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
-			}).height( maxHeight );
-		}
-	},
-
-	_eventHandler: function( event ) {
-		var options = this.options,
-			active = this.active,
-			anchor = $( event.currentTarget ),
-			tab = anchor.closest( "li" ),
-			clickedIsActive = tab[ 0 ] === active[ 0 ],
-			collapsing = clickedIsActive && options.collapsible,
-			toShow = collapsing ? $() : this._getPanelForTab( tab ),
-			toHide = !active.length ? $() : this._getPanelForTab( active ),
-			eventData = {
-				oldTab: active,
-				oldPanel: toHide,
-				newTab: collapsing ? $() : tab,
-				newPanel: toShow
-			};
-
-		event.preventDefault();
-
-		if ( tab.hasClass( "ui-state-disabled" ) ||
-				// tab is already loading
-				tab.hasClass( "ui-tabs-loading" ) ||
-				// can't switch durning an animation
-				this.running ||
-				// click on active header, but not collapsible
-				( clickedIsActive && !options.collapsible ) ||
-				// allow canceling activation
-				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
-			return;
-		}
-
-		options.active = collapsing ? false : this.tabs.index( tab );
-
-		this.active = clickedIsActive ? $() : tab;
-		if ( this.xhr ) {
-			this.xhr.abort();
-		}
-
-		if ( !toHide.length && !toShow.length ) {
-			$.error( "jQuery UI Tabs: Mismatching fragment identifier." );
-		}
-
-		if ( toShow.length ) {
-			this.load( this.tabs.index( tab ), event );
-		}
-		this._toggle( event, eventData );
-	},
-
-	// handles show/hide for selecting tabs
-	_toggle: function( event, eventData ) {
-		var that = this,
-			toShow = eventData.newPanel,
-			toHide = eventData.oldPanel;
-
-		this.running = true;
-
-		function complete() {
-			that.running = false;
-			that._trigger( "activate", event, eventData );
-		}
-
-		function show() {
-			eventData.newTab.closest( "li" ).addClass( "ui-tabs-active ui-state-active" );
-
-			if ( toShow.length && that.options.show ) {
-				that._show( toShow, that.options.show, complete );
-			} else {
-				toShow.show();
-				complete();
-			}
-		}
-
-		// start out by hiding, then showing, then completing
-		if ( toHide.length && this.options.hide ) {
-			this._hide( toHide, this.options.hide, function() {
-				eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
-				show();
-			});
-		} else {
-			eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
-			toHide.hide();
-			show();
-		}
-
-		toHide.attr( "aria-hidden", "true" );
-		eventData.oldTab.attr({
-			"aria-selected": "false",
-			"aria-expanded": "false"
-		});
-		// If we're switching tabs, remove the old tab from the tab order.
-		// If we're opening from collapsed state, remove the previous tab from the tab order.
-		// If we're collapsing, then keep the collapsing tab in the tab order.
-		if ( toShow.length && toHide.length ) {
-			eventData.oldTab.attr( "tabIndex", -1 );
-		} else if ( toShow.length ) {
-			this.tabs.filter(function() {
-				return $( this ).attr( "tabIndex" ) === 0;
-			})
-			.attr( "tabIndex", -1 );
-		}
-
-		toShow.attr( "aria-hidden", "false" );
-		eventData.newTab.attr({
-			"aria-selected": "true",
-			"aria-expanded": "true",
-			tabIndex: 0
-		});
-	},
-
-	_activate: function( index ) {
-		var anchor,
-			active = this._findActive( index );
-
-		// trying to activate the already active panel
-		if ( active[ 0 ] === this.active[ 0 ] ) {
-			return;
-		}
-
-		// trying to collapse, simulate a click on the current active header
-		if ( !active.length ) {
-			active = this.active;
-		}
-
-		anchor = active.find( ".ui-tabs-anchor" )[ 0 ];
-		this._eventHandler({
-			target: anchor,
-			currentTarget: anchor,
-			preventDefault: $.noop
-		});
-	},
-
-	_findActive: function( index ) {
-		return index === false ? $() : this.tabs.eq( index );
-	},
-
-	_getIndex: function( index ) {
-		// meta-function to give users option to provide a href string instead of a numerical index.
-		if ( typeof index === "string" ) {
-			index = this.anchors.index( this.anchors.filter( "[href$='" + index + "']" ) );
-		}
-
-		return index;
-	},
-
-	_destroy: function() {
-		if ( this.xhr ) {
-			this.xhr.abort();
-		}
-
-		this.element.removeClass( "ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible" );
-
-		this.tablist
-			.removeClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
-			.removeAttr( "role" );
-
-		this.anchors
-			.removeClass( "ui-tabs-anchor" )
-			.removeAttr( "role" )
-			.removeAttr( "tabIndex" )
-			.removeUniqueId();
-
-		this.tablist.unbind( this.eventNamespace );
-
-		this.tabs.add( this.panels ).each(function() {
-			if ( $.data( this, "ui-tabs-destroy" ) ) {
-				$( this ).remove();
-			} else {
-				$( this )
-					.removeClass( "ui-state-default ui-state-active ui-state-disabled " +
-						"ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel" )
-					.removeAttr( "tabIndex" )
-					.removeAttr( "aria-live" )
-					.removeAttr( "aria-busy" )
-					.removeAttr( "aria-selected" )
-					.removeAttr( "aria-labelledby" )
-					.removeAttr( "aria-hidden" )
-					.removeAttr( "aria-expanded" )
-					.removeAttr( "role" );
-			}
-		});
-
-		this.tabs.each(function() {
-			var li = $( this ),
-				prev = li.data( "ui-tabs-aria-controls" );
-			if ( prev ) {
-				li
-					.attr( "aria-controls", prev )
-					.removeData( "ui-tabs-aria-controls" );
-			} else {
-				li.removeAttr( "aria-controls" );
-			}
-		});
-
-		this.panels.show();
-
-		if ( this.options.heightStyle !== "content" ) {
-			this.panels.css( "height", "" );
-		}
-	},
-
-	enable: function( index ) {
-		var disabled = this.options.disabled;
-		if ( disabled === false ) {
-			return;
-		}
-
-		if ( index === undefined ) {
-			disabled = false;
-		} else {
-			index = this._getIndex( index );
-			if ( $.isArray( disabled ) ) {
-				disabled = $.map( disabled, function( num ) {
-					return num !== index ? num : null;
-				});
-			} else {
-				disabled = $.map( this.tabs, function( li, num ) {
-					return num !== index ? num : null;
-				});
-			}
-		}
-		this._setupDisabled( disabled );
-	},
-
-	disable: function( index ) {
-		var disabled = this.options.disabled;
-		if ( disabled === true ) {
-			return;
-		}
-
-		if ( index === undefined ) {
-			disabled = true;
-		} else {
-			index = this._getIndex( index );
-			if ( $.inArray( index, disabled ) !== -1 ) {
-				return;
-			}
-			if ( $.isArray( disabled ) ) {
-				disabled = $.merge( [ index ], disabled ).sort();
-			} else {
-				disabled = [ index ];
-			}
-		}
-		this._setupDisabled( disabled );
-	},
-
-	load: function( index, event ) {
-		index = this._getIndex( index );
-		var that = this,
-			tab = this.tabs.eq( index ),
-			anchor = tab.find( ".ui-tabs-anchor" ),
-			panel = this._getPanelForTab( tab ),
-			eventData = {
-				tab: tab,
-				panel: panel
-			},
-			complete = function( jqXHR, status ) {
-				if ( status === "abort" ) {
-					that.panels.stop( false, true );
-				}
-
-				tab.removeClass( "ui-tabs-loading" );
-				panel.removeAttr( "aria-busy" );
-
-				if ( jqXHR === that.xhr ) {
-					delete that.xhr;
-				}
-			};
-
-		// not remote
-		if ( this._isLocal( anchor[ 0 ] ) ) {
-			return;
-		}
-
-		this.xhr = $.ajax( this._ajaxSettings( anchor, event, eventData ) );
-
-		// support: jQuery <1.8
-		// jQuery <1.8 returns false if the request is canceled in beforeSend,
-		// but as of 1.8, $.ajax() always returns a jqXHR object.
-		if ( this.xhr && this.xhr.statusText !== "canceled" ) {
-			tab.addClass( "ui-tabs-loading" );
-			panel.attr( "aria-busy", "true" );
-
-			this.xhr
-				.done(function( response, status, jqXHR ) {
-					// support: jQuery <1.8
-					// http://bugs.jquery.com/ticket/11778
-					setTimeout(function() {
-						panel.html( response );
-						that._trigger( "load", event, eventData );
-
-						complete( jqXHR, status );
-					}, 1 );
-				})
-				.fail(function( jqXHR, status ) {
-					// support: jQuery <1.8
-					// http://bugs.jquery.com/ticket/11778
-					setTimeout(function() {
-						complete( jqXHR, status );
-					}, 1 );
-				});
-		}
-	},
-
-	_ajaxSettings: function( anchor, event, eventData ) {
-		var that = this;
-		return {
-			url: anchor.attr( "href" ),
-			beforeSend: function( jqXHR, settings ) {
-				return that._trigger( "beforeLoad", event,
-					$.extend( { jqXHR: jqXHR, ajaxSettings: settings }, eventData ) );
-			}
-		};
-	},
-
-	_getPanelForTab: function( tab ) {
-		var id = $( tab ).attr( "aria-controls" );
-		return this.element.find( this._sanitizeSelector( "#" + id ) );
-	}
-});
-
-
-/*!
- * jQuery UI Tooltip 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/tooltip/
- */
-
-
-var tooltip = $.widget( "ui.tooltip", {
-	version: "1.11.4",
-	options: {
-		content: function() {
-			// support: IE<9, Opera in jQuery <1.7
-			// .text() can't accept undefined, so coerce to a string
-			var title = $( this ).attr( "title" ) || "";
-			// Escape title, since we're going from an attribute to raw HTML
-			return $( "<a>" ).text( title ).html();
-		},
-		hide: true,
-		// Disabled elements have inconsistent behavior across browsers (#8661)
-		items: "[title]:not([disabled])",
-		position: {
-			my: "left top+15",
-			at: "left bottom",
-			collision: "flipfit flip"
-		},
-		show: true,
-		tooltipClass: null,
-		track: false,
-
-		// callbacks
-		close: null,
-		open: null
-	},
-
-	_addDescribedBy: function( elem, id ) {
-		var describedby = (elem.attr( "aria-describedby" ) || "").split( /\s+/ );
-		describedby.push( id );
-		elem
-			.data( "ui-tooltip-id", id )
-			.attr( "aria-describedby", $.trim( describedby.join( " " ) ) );
-	},
-
-	_removeDescribedBy: function( elem ) {
-		var id = elem.data( "ui-tooltip-id" ),
-			describedby = (elem.attr( "aria-describedby" ) || "").split( /\s+/ ),
-			index = $.inArray( id, describedby );
-
-		if ( index !== -1 ) {
-			describedby.splice( index, 1 );
-		}
-
-		elem.removeData( "ui-tooltip-id" );
-		describedby = $.trim( describedby.join( " " ) );
-		if ( describedby ) {
-			elem.attr( "aria-describedby", describedby );
-		} else {
-			elem.removeAttr( "aria-describedby" );
-		}
-	},
-
-	_create: function() {
-		this._on({
-			mouseover: "open",
-			focusin: "open"
-		});
-
-		// IDs of generated tooltips, needed for destroy
-		this.tooltips = {};
-
-		// IDs of parent tooltips where we removed the title attribute
-		this.parents = {};
-
-		if ( this.options.disabled ) {
-			this._disable();
-		}
-
-		// Append the aria-live region so tooltips announce correctly
-		this.liveRegion = $( "<div>" )
-			.attr({
-				role: "log",
-				"aria-live": "assertive",
-				"aria-relevant": "additions"
-			})
-			.addClass( "ui-helper-hidden-accessible" )
-			.appendTo( this.document[ 0 ].body );
-	},
-
-	_setOption: function( key, value ) {
-		var that = this;
-
-		if ( key === "disabled" ) {
-			this[ value ? "_disable" : "_enable" ]();
-			this.options[ key ] = value;
-			// disable element style changes
-			return;
-		}
-
-		this._super( key, value );
-
-		if ( key === "content" ) {
-			$.each( this.tooltips, function( id, tooltipData ) {
-				that._updateContent( tooltipData.element );
-			});
-		}
-	},
-
-	_disable: function() {
-		var that = this;
-
-		// close open tooltips
-		$.each( this.tooltips, function( id, tooltipData ) {
-			var event = $.Event( "blur" );
-			event.target = event.currentTarget = tooltipData.element[ 0 ];
-			that.close( event, true );
-		});
-
-		// remove title attributes to prevent native tooltips
-		this.element.find( this.options.items ).addBack().each(function() {
-			var element = $( this );
-			if ( element.is( "[title]" ) ) {
-				element
-					.data( "ui-tooltip-title", element.attr( "title" ) )
-					.removeAttr( "title" );
-			}
-		});
-	},
-
-	_enable: function() {
-		// restore title attributes
-		this.element.find( this.options.items ).addBack().each(function() {
-			var element = $( this );
-			if ( element.data( "ui-tooltip-title" ) ) {
-				element.attr( "title", element.data( "ui-tooltip-title" ) );
-			}
-		});
-	},
-
-	open: function( event ) {
-		var that = this,
-			target = $( event ? event.target : this.element )
-				// we need closest here due to mouseover bubbling,
-				// but always pointing at the same event target
-				.closest( this.options.items );
-
-		// No element to show a tooltip for or the tooltip is already open
-		if ( !target.length || target.data( "ui-tooltip-id" ) ) {
-			return;
-		}
-
-		if ( target.attr( "title" ) ) {
-			target.data( "ui-tooltip-title", target.attr( "title" ) );
-		}
-
-		target.data( "ui-tooltip-open", true );
-
-		// kill parent tooltips, custom or native, for hover
-		if ( event && event.type === "mouseover" ) {
-			target.parents().each(function() {
-				var parent = $( this ),
-					blurEvent;
-				if ( parent.data( "ui-tooltip-open" ) ) {
-					blurEvent = $.Event( "blur" );
-					blurEvent.target = blurEvent.currentTarget = this;
-					that.close( blurEvent, true );
-				}
-				if ( parent.attr( "title" ) ) {
-					parent.uniqueId();
-					that.parents[ this.id ] = {
-						element: this,
-						title: parent.attr( "title" )
-					};
-					parent.attr( "title", "" );
-				}
-			});
-		}
-
-		this._registerCloseHandlers( event, target );
-		this._updateContent( target, event );
-	},
-
-	_updateContent: function( target, event ) {
-		var content,
-			contentOption = this.options.content,
-			that = this,
-			eventType = event ? event.type : null;
-
-		if ( typeof contentOption === "string" ) {
-			return this._open( event, target, contentOption );
-		}
-
-		content = contentOption.call( target[0], function( response ) {
-
-			// IE may instantly serve a cached response for ajax requests
-			// delay this call to _open so the other call to _open runs first
-			that._delay(function() {
-
-				// Ignore async response if tooltip was closed already
-				if ( !target.data( "ui-tooltip-open" ) ) {
-					return;
-				}
-
-				// jQuery creates a special event for focusin when it doesn't
-				// exist natively. To improve performance, the native event
-				// object is reused and the type is changed. Therefore, we can't
-				// rely on the type being correct after the event finished
-				// bubbling, so we set it back to the previous value. (#8740)
-				if ( event ) {
-					event.type = eventType;
-				}
-				this._open( event, target, response );
-			});
-		});
-		if ( content ) {
-			this._open( event, target, content );
-		}
-	},
-
-	_open: function( event, target, content ) {
-		var tooltipData, tooltip, delayedShow, a11yContent,
-			positionOption = $.extend( {}, this.options.position );
-
-		if ( !content ) {
-			return;
-		}
-
-		// Content can be updated multiple times. If the tooltip already
-		// exists, then just update the content and bail.
-		tooltipData = this._find( target );
-		if ( tooltipData ) {
-			tooltipData.tooltip.find( ".ui-tooltip-content" ).html( content );
-			return;
-		}
-
-		// if we have a title, clear it to prevent the native tooltip
-		// we have to check first to avoid defining a title if none exists
-		// (we don't want to cause an element to start matching [title])
-		//
-		// We use removeAttr only for key events, to allow IE to export the correct
-		// accessible attributes. For mouse events, set to empty string to avoid
-		// native tooltip showing up (happens only when removing inside mouseover).
-		if ( target.is( "[title]" ) ) {
-			if ( event && event.type === "mouseover" ) {
-				target.attr( "title", "" );
-			} else {
-				target.removeAttr( "title" );
-			}
-		}
-
-		tooltipData = this._tooltip( target );
-		tooltip = tooltipData.tooltip;
-		this._addDescribedBy( target, tooltip.attr( "id" ) );
-		tooltip.find( ".ui-tooltip-content" ).html( content );
-
-		// Support: Voiceover on OS X, JAWS on IE <= 9
-		// JAWS announces deletions even when aria-relevant="additions"
-		// Voiceover will sometimes re-read the entire log region's contents from the beginning
-		this.liveRegion.children().hide();
-		if ( content.clone ) {
-			a11yContent = content.clone();
-			a11yContent.removeAttr( "id" ).find( "[id]" ).removeAttr( "id" );
-		} else {
-			a11yContent = content;
-		}
-		$( "<div>" ).html( a11yContent ).appendTo( this.liveRegion );
-
-		function position( event ) {
-			positionOption.of = event;
-			if ( tooltip.is( ":hidden" ) ) {
-				return;
-			}
-			tooltip.position( positionOption );
-		}
-		if ( this.options.track && event && /^mouse/.test( event.type ) ) {
-			this._on( this.document, {
-				mousemove: position
-			});
-			// trigger once to override element-relative positioning
-			position( event );
-		} else {
-			tooltip.position( $.extend({
-				of: target
-			}, this.options.position ) );
-		}
-
-		tooltip.hide();
-
-		this._show( tooltip, this.options.show );
-		// Handle tracking tooltips that are shown with a delay (#8644). As soon
-		// as the tooltip is visible, position the tooltip using the most recent
-		// event.
-		if ( this.options.show && this.options.show.delay ) {
-			delayedShow = this.delayedShow = setInterval(function() {
-				if ( tooltip.is( ":visible" ) ) {
-					position( positionOption.of );
-					clearInterval( delayedShow );
-				}
-			}, $.fx.interval );
-		}
-
-		this._trigger( "open", event, { tooltip: tooltip } );
-	},
-
-	_registerCloseHandlers: function( event, target ) {
-		var events = {
-			keyup: function( event ) {
-				if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
-					var fakeEvent = $.Event(event);
-					fakeEvent.currentTarget = target[0];
-					this.close( fakeEvent, true );
-				}
-			}
-		};
-
-		// Only bind remove handler for delegated targets. Non-delegated
-		// tooltips will handle this in destroy.
-		if ( target[ 0 ] !== this.element[ 0 ] ) {
-			events.remove = function() {
-				this._removeTooltip( this._find( target ).tooltip );
-			};
-		}
-
-		if ( !event || event.type === "mouseover" ) {
-			events.mouseleave = "close";
-		}
-		if ( !event || event.type === "focusin" ) {
-			events.focusout = "close";
-		}
-		this._on( true, target, events );
-	},
-
-	close: function( event ) {
-		var tooltip,
-			that = this,
-			target = $( event ? event.currentTarget : this.element ),
-			tooltipData = this._find( target );
-
-		// The tooltip may already be closed
-		if ( !tooltipData ) {
-
-			// We set ui-tooltip-open immediately upon open (in open()), but only set the
-			// additional data once there's actually content to show (in _open()). So even if the
-			// tooltip doesn't have full data, we always remove ui-tooltip-open in case we're in
-			// the period between open() and _open().
-			target.removeData( "ui-tooltip-open" );
-			return;
-		}
-
-		tooltip = tooltipData.tooltip;
-
-		// disabling closes the tooltip, so we need to track when we're closing
-		// to avoid an infinite loop in case the tooltip becomes disabled on close
-		if ( tooltipData.closing ) {
-			return;
-		}
-
-		// Clear the interval for delayed tracking tooltips
-		clearInterval( this.delayedShow );
-
-		// only set title if we had one before (see comment in _open())
-		// If the title attribute has changed since open(), don't restore
-		if ( target.data( "ui-tooltip-title" ) && !target.attr( "title" ) ) {
-			target.attr( "title", target.data( "ui-tooltip-title" ) );
-		}
-
-		this._removeDescribedBy( target );
-
-		tooltipData.hiding = true;
-		tooltip.stop( true );
-		this._hide( tooltip, this.options.hide, function() {
-			that._removeTooltip( $( this ) );
-		});
-
-		target.removeData( "ui-tooltip-open" );
-		this._off( target, "mouseleave focusout keyup" );
-
-		// Remove 'remove' binding only on delegated targets
-		if ( target[ 0 ] !== this.element[ 0 ] ) {
-			this._off( target, "remove" );
-		}
-		this._off( this.document, "mousemove" );
-
-		if ( event && event.type === "mouseleave" ) {
-			$.each( this.parents, function( id, parent ) {
-				$( parent.element ).attr( "title", parent.title );
-				delete that.parents[ id ];
-			});
-		}
-
-		tooltipData.closing = true;
-		this._trigger( "close", event, { tooltip: tooltip } );
-		if ( !tooltipData.hiding ) {
-			tooltipData.closing = false;
-		}
-	},
-
-	_tooltip: function( element ) {
-		var tooltip = $( "<div>" )
-				.attr( "role", "tooltip" )
-				.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content " +
-					( this.options.tooltipClass || "" ) ),
-			id = tooltip.uniqueId().attr( "id" );
-
-		$( "<div>" )
-			.addClass( "ui-tooltip-content" )
-			.appendTo( tooltip );
-
-		tooltip.appendTo( this.document[0].body );
-
-		return this.tooltips[ id ] = {
-			element: element,
-			tooltip: tooltip
-		};
-	},
-
-	_find: function( target ) {
-		var id = target.data( "ui-tooltip-id" );
-		return id ? this.tooltips[ id ] : null;
-	},
-
-	_removeTooltip: function( tooltip ) {
-		tooltip.remove();
-		delete this.tooltips[ tooltip.attr( "id" ) ];
-	},
-
-	_destroy: function() {
-		var that = this;
-
-		// close open tooltips
-		$.each( this.tooltips, function( id, tooltipData ) {
-			// Delegate to close method to handle common cleanup
-			var event = $.Event( "blur" ),
-				element = tooltipData.element;
-			event.target = event.currentTarget = element[ 0 ];
-			that.close( event, true );
-
-			// Remove immediately; destroying an open tooltip doesn't use the
-			// hide animation
-			$( "#" + id ).remove();
-
-			// Restore the title
-			if ( element.data( "ui-tooltip-title" ) ) {
-				// If the title attribute has changed since open(), don't restore
-				if ( !element.attr( "title" ) ) {
-					element.attr( "title", element.data( "ui-tooltip-title" ) );
-				}
-				element.removeData( "ui-tooltip-title" );
-			}
-		});
-		this.liveRegion.remove();
-	}
-});
 
 
 
diff --git a/htdocs/includes/jquery/js/jquery-ui.min.js b/htdocs/includes/jquery/js/jquery-ui.min.js
index 5824d1292db..c7f5201d61f 100644
--- a/htdocs/includes/jquery/js/jquery-ui.min.js
+++ b/htdocs/includes/jquery/js/jquery-ui.min.js
@@ -1,13 +1,13 @@
-/*! jQuery UI - v1.11.4 - 2015-03-11
+/*! jQuery UI - v1.12.1 - 2017-02-22
 * http://jqueryui.com
-* Includes: core.js, widget.js, mouse.js, position.js, accordion.js, autocomplete.js, button.js, datepicker.js, dialog.js, draggable.js, droppable.js, effect.js, effect-blind.js, effect-bounce.js, effect-clip.js, effect-drop.js, effect-explode.js, effect-fade.js, effect-fold.js, effect-highlight.js, effect-puff.js, effect-pulsate.js, effect-scale.js, effect-shake.js, effect-size.js, effect-slide.js, effect-transfer.js, menu.js, progressbar.js, resizable.js, selectable.js, selectmenu.js, slider.js, sortable.js, spinner.js, tabs.js, tooltip.js
-* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
+* Includes: widget.js, position.js, data.js, disable-selection.js, focusable.js, form-reset-mixin.js, jquery-1-7.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/draggable.js, widgets/droppable.js, widgets/resizable.js, widgets/selectable.js, widgets/sortable.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/selectmenu.js, widgets/slider.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
 
-(function(e){"function"==typeof define&&define.amd?define(["jquery"],e):e(jQuery)})(function(e){function t(t,s){var n,a,o,r=t.nodeName.toLowerCase();return"area"===r?(n=t.parentNode,a=n.name,t.href&&a&&"map"===n.nodeName.toLowerCase()?(o=e("img[usemap='#"+a+"']")[0],!!o&&i(o)):!1):(/^(input|select|textarea|button|object)$/.test(r)?!t.disabled:"a"===r?t.href||s:s)&&i(t)}function i(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return"hidden"===e.css(this,"visibility")}).length}function s(e){for(var t,i;e.length&&e[0]!==document;){if(t=e.css("position"),("absolute"===t||"relative"===t||"fixed"===t)&&(i=parseInt(e.css("zIndex"),10),!isNaN(i)&&0!==i))return i;e=e.parent()}return 0}function n(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},e.extend(this._defaults,this.regional[""]),this.regional.en=e.extend(!0,{},this.regional[""]),this.regional["en-US"]=e.extend(!0,{},this.regional.en),this.dpDiv=a(e("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function a(t){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return t.delegate(i,"mouseout",function(){e(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).removeClass("ui-datepicker-next-hover")}).delegate(i,"mouseover",o)}function o(){e.datepicker._isDisabledDatepicker(v.inline?v.dpDiv.parent()[0]:v.input[0])||(e(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),e(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).addClass("ui-datepicker-next-hover"))}function r(t,i){e.extend(t,i);for(var s in i)null==i[s]&&(t[s]=i[s]);return t}function h(e){return function(){var t=this.element.val();e.apply(this,arguments),this._refresh(),t!==this.element.val()&&this._trigger("change")}}e.ui=e.ui||{},e.extend(e.ui,{version:"1.11.4",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({scrollParent:function(t){var i=this.css("position"),s="absolute"===i,n=t?/(auto|scroll|hidden)/:/(auto|scroll)/,a=this.parents().filter(function(){var t=e(this);return s&&"static"===t.css("position")?!1:n.test(t.css("overflow")+t.css("overflow-y")+t.css("overflow-x"))}).eq(0);return"fixed"!==i&&a.length?a:e(this[0].ownerDocument||document)},uniqueId:function(){var e=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++e)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(i){return!!e.data(i,t)}}):function(t,i,s){return!!e.data(t,s[3])},focusable:function(i){return t(i,!isNaN(e.attr(i,"tabindex")))},tabbable:function(i){var s=e.attr(i,"tabindex"),n=isNaN(s);return(n||s>=0)&&t(i,!n)}}),e("<a>").outerWidth(1).jquery||e.each(["Width","Height"],function(t,i){function s(t,i,s,a){return e.each(n,function(){i-=parseFloat(e.css(t,"padding"+this))||0,s&&(i-=parseFloat(e.css(t,"border"+this+"Width"))||0),a&&(i-=parseFloat(e.css(t,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],a=i.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+i]=function(t){return void 0===t?o["inner"+i].call(this):this.each(function(){e(this).css(a,s(this,t)+"px")})},e.fn["outer"+i]=function(t,n){return"number"!=typeof t?o["outer"+i].call(this,t):this.each(function(){e(this).css(a,s(this,t,!0,n)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(i){return arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.fn.extend({focus:function(t){return function(i,s){return"number"==typeof i?this.each(function(){var t=this;setTimeout(function(){e(t).focus(),s&&s.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),disableSelection:function(){var e="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.bind(e+".ui-disableSelection",function(e){e.preventDefault()})}}(),enableSelection:function(){return this.unbind(".ui-disableSelection")},zIndex:function(t){if(void 0!==t)return this.css("zIndex",t);if(this.length)for(var i,s,n=e(this[0]);n.length&&n[0]!==document;){if(i=n.css("position"),("absolute"===i||"relative"===i||"fixed"===i)&&(s=parseInt(n.css("zIndex"),10),!isNaN(s)&&0!==s))return s;n=n.parent()}return 0}}),e.ui.plugin={add:function(t,i,s){var n,a=e.ui[t].prototype;for(n in s)a.plugins[n]=a.plugins[n]||[],a.plugins[n].push([i,s[n]])},call:function(e,t,i,s){var n,a=e.plugins[t];if(a&&(s||e.element[0].parentNode&&11!==e.element[0].parentNode.nodeType))for(n=0;a.length>n;n++)e.options[a[n][0]]&&a[n][1].apply(e.element,i)}};var l=0,u=Array.prototype.slice;e.cleanData=function(t){return function(i){var s,n,a;for(a=0;null!=(n=i[a]);a++)try{s=e._data(n,"events"),s&&s.remove&&e(n).triggerHandler("remove")}catch(o){}t(i)}}(e.cleanData),e.widget=function(t,i,s){var n,a,o,r,h={},l=t.split(".")[0];return t=t.split(".")[1],n=l+"-"+t,s||(s=i,i=e.Widget),e.expr[":"][n.toLowerCase()]=function(t){return!!e.data(t,n)},e[l]=e[l]||{},a=e[l][t],o=e[l][t]=function(e,t){return this._createWidget?(arguments.length&&this._createWidget(e,t),void 0):new o(e,t)},e.extend(o,a,{version:s.version,_proto:e.extend({},s),_childConstructors:[]}),r=new i,r.options=e.widget.extend({},r.options),e.each(s,function(t,s){return e.isFunction(s)?(h[t]=function(){var e=function(){return i.prototype[t].apply(this,arguments)},n=function(e){return i.prototype[t].apply(this,e)};return function(){var t,i=this._super,a=this._superApply;return this._super=e,this._superApply=n,t=s.apply(this,arguments),this._super=i,this._superApply=a,t}}(),void 0):(h[t]=s,void 0)}),o.prototype=e.widget.extend(r,{widgetEventPrefix:a?r.widgetEventPrefix||t:t},h,{constructor:o,namespace:l,widgetName:t,widgetFullName:n}),a?(e.each(a._childConstructors,function(t,i){var s=i.prototype;e.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete a._childConstructors):i._childConstructors.push(o),e.widget.bridge(t,o),o},e.widget.extend=function(t){for(var i,s,n=u.call(arguments,1),a=0,o=n.length;o>a;a++)for(i in n[a])s=n[a][i],n[a].hasOwnProperty(i)&&void 0!==s&&(t[i]=e.isPlainObject(s)?e.isPlainObject(t[i])?e.widget.extend({},t[i],s):e.widget.extend({},s):s);return t},e.widget.bridge=function(t,i){var s=i.prototype.widgetFullName||t;e.fn[t]=function(n){var a="string"==typeof n,o=u.call(arguments,1),r=this;return a?this.each(function(){var i,a=e.data(this,s);return"instance"===n?(r=a,!1):a?e.isFunction(a[n])&&"_"!==n.charAt(0)?(i=a[n].apply(a,o),i!==a&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):e.error("no such method '"+n+"' for "+t+" widget instance"):e.error("cannot call methods on "+t+" prior to initialization; "+"attempted to call method '"+n+"'")}):(o.length&&(n=e.widget.extend.apply(null,[n].concat(o))),this.each(function(){var t=e.data(this,s);t?(t.option(n||{}),t._init&&t._init()):e.data(this,s,new i(n,this))})),r}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(t,i){i=e(i||this.defaultElement||this)[0],this.element=e(i),this.uuid=l++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=e(),this.hoverable=e(),this.focusable=e(),i!==this&&(e.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===i&&this.destroy()}}),this.document=e(i.style?i.ownerDocument:i.document||i),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(t,i){var s,n,a,o=t;if(0===arguments.length)return e.widget.extend({},this.options);if("string"==typeof t)if(o={},s=t.split("."),t=s.shift(),s.length){for(n=o[t]=e.widget.extend({},this.options[t]),a=0;s.length-1>a;a++)n[s[a]]=n[s[a]]||{},n=n[s[a]];if(t=s.pop(),1===arguments.length)return void 0===n[t]?null:n[t];n[t]=i}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=i}return this._setOptions(o),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,"disabled"===e&&(this.widget().toggleClass(this.widgetFullName+"-disabled",!!t),t&&(this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus"))),this},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_on:function(t,i,s){var n,a=this;"boolean"!=typeof t&&(s=i,i=t,t=!1),s?(i=n=e(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),e.each(s,function(s,o){function r(){return t||a.options.disabled!==!0&&!e(this).hasClass("ui-state-disabled")?("string"==typeof o?a[o]:o).apply(a,arguments):void 0}"string"!=typeof o&&(r.guid=o.guid=o.guid||r.guid||e.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+a.eventNamespace,u=h[2];u?n.delegate(u,l,r):i.bind(l,r)})},_off:function(t,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(i).undelegate(i),this.bindings=e(this.bindings.not(t).get()),this.focusable=e(this.focusable.not(t).get()),this.hoverable=e(this.hoverable.not(t).get())},_delay:function(e,t){function i(){return("string"==typeof e?s[e]:e).apply(s,arguments)}var s=this;return setTimeout(i,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,i,s){var n,a,o=this.options[t];if(s=s||{},i=e.Event(i),i.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),i.target=this.element[0],a=i.originalEvent)for(n in a)n in i||(i[n]=a[n]);return this.element.trigger(i,s),!(e.isFunction(o)&&o.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,i){e.Widget.prototype["_"+t]=function(s,n,a){"string"==typeof n&&(n={effect:n});var o,r=n?n===!0||"number"==typeof n?i:n.effect||i:t;n=n||{},"number"==typeof n&&(n={duration:n}),o=!e.isEmptyObject(n),n.complete=a,n.delay&&s.delay(n.delay),o&&e.effects&&e.effects.effect[r]?s[t](n):r!==t&&s[r]?s[r](n.duration,n.easing,a):s.queue(function(i){e(this)[t](),a&&a.call(s[0]),i()})}}),e.widget;var d=!1;e(document).mouseup(function(){d=!1}),e.widget("ui.mouse",{version:"1.11.4",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(i){return!0===e.data(i.target,t.widgetName+".preventClickEvent")?(e.removeData(i.target,t.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(!d){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var i=this,s=1===t.which,n="string"==typeof this.options.cancel&&t.target.nodeName?e(t.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(t)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(t)!==!1,!this._mouseStarted)?(t.preventDefault(),!0):(!0===e.data(t.target,this.widgetName+".preventClickEvent")&&e.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return i._mouseMove(e)},this._mouseUpDelegate=function(e){return i._mouseUp(e)},this.document.bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),d=!0,!0)):!0}},_mouseMove:function(t){if(this._mouseMoved){if(e.ui.ie&&(!document.documentMode||9>document.documentMode)&&!t.button)return this._mouseUp(t);if(!t.which)return this._mouseUp(t)}return(t.which||t.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){return this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),d=!1,!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),function(){function t(e,t,i){return[parseFloat(e[0])*(p.test(e[0])?t/100:1),parseFloat(e[1])*(p.test(e[1])?i/100:1)]}function i(t,i){return parseInt(e.css(t,i),10)||0}function s(t){var i=t[0];return 9===i.nodeType?{width:t.width(),height:t.height(),offset:{top:0,left:0}}:e.isWindow(i)?{width:t.width(),height:t.height(),offset:{top:t.scrollTop(),left:t.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:t.outerWidth(),height:t.outerHeight(),offset:t.offset()}}e.ui=e.ui||{};var n,a,o=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,u=/top|center|bottom/,d=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,p=/%$/,f=e.fn.position;e.position={scrollbarWidth:function(){if(void 0!==n)return n;var t,i,s=e("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),a=s.children()[0];return e("body").append(s),t=a.offsetWidth,s.css("overflow","scroll"),i=a.offsetWidth,t===i&&(i=s[0].clientWidth),s.remove(),n=t-i},getScrollInfo:function(t){var i=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),s=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),n="scroll"===i||"auto"===i&&t.width<t.element[0].scrollWidth,a="scroll"===s||"auto"===s&&t.height<t.element[0].scrollHeight;return{width:a?e.position.scrollbarWidth():0,height:n?e.position.scrollbarWidth():0}},getWithinInfo:function(t){var i=e(t||window),s=e.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType;return{element:i,isWindow:s,isDocument:n,offset:i.offset()||{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:s||n?i.width():i.outerWidth(),height:s||n?i.height():i.outerHeight()}}},e.fn.position=function(n){if(!n||!n.of)return f.apply(this,arguments);n=e.extend({},n);var p,m,g,v,y,b,_=e(n.of),x=e.position.getWithinInfo(n.within),w=e.position.getScrollInfo(x),k=(n.collision||"flip").split(" "),T={};return b=s(_),_[0].preventDefault&&(n.at="left top"),m=b.width,g=b.height,v=b.offset,y=e.extend({},v),e.each(["my","at"],function(){var e,t,i=(n[this]||"").split(" ");1===i.length&&(i=l.test(i[0])?i.concat(["center"]):u.test(i[0])?["center"].concat(i):["center","center"]),i[0]=l.test(i[0])?i[0]:"center",i[1]=u.test(i[1])?i[1]:"center",e=d.exec(i[0]),t=d.exec(i[1]),T[this]=[e?e[0]:0,t?t[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===k.length&&(k[1]=k[0]),"right"===n.at[0]?y.left+=m:"center"===n.at[0]&&(y.left+=m/2),"bottom"===n.at[1]?y.top+=g:"center"===n.at[1]&&(y.top+=g/2),p=t(T.at,m,g),y.left+=p[0],y.top+=p[1],this.each(function(){var s,l,u=e(this),d=u.outerWidth(),c=u.outerHeight(),f=i(this,"marginLeft"),b=i(this,"marginTop"),D=d+f+i(this,"marginRight")+w.width,S=c+b+i(this,"marginBottom")+w.height,M=e.extend({},y),C=t(T.my,u.outerWidth(),u.outerHeight());"right"===n.my[0]?M.left-=d:"center"===n.my[0]&&(M.left-=d/2),"bottom"===n.my[1]?M.top-=c:"center"===n.my[1]&&(M.top-=c/2),M.left+=C[0],M.top+=C[1],a||(M.left=h(M.left),M.top=h(M.top)),s={marginLeft:f,marginTop:b},e.each(["left","top"],function(t,i){e.ui.position[k[t]]&&e.ui.position[k[t]][i](M,{targetWidth:m,targetHeight:g,elemWidth:d,elemHeight:c,collisionPosition:s,collisionWidth:D,collisionHeight:S,offset:[p[0]+C[0],p[1]+C[1]],my:n.my,at:n.at,within:x,elem:u})}),n.using&&(l=function(e){var t=v.left-M.left,i=t+m-d,s=v.top-M.top,a=s+g-c,h={target:{element:_,left:v.left,top:v.top,width:m,height:g},element:{element:u,left:M.left,top:M.top,width:d,height:c},horizontal:0>i?"left":t>0?"right":"center",vertical:0>a?"top":s>0?"bottom":"middle"};d>m&&m>r(t+i)&&(h.horizontal="center"),c>g&&g>r(s+a)&&(h.vertical="middle"),h.important=o(r(t),r(i))>o(r(s),r(a))?"horizontal":"vertical",n.using.call(this,e,h)}),u.offset(e.extend(M,{using:l}))})},e.ui.position={fit:{left:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=e.left-t.collisionPosition.marginLeft,h=n-r,l=r+t.collisionWidth-a-n;t.collisionWidth>a?h>0&&0>=l?(i=e.left+h+t.collisionWidth-a-n,e.left+=h-i):e.left=l>0&&0>=h?n:h>l?n+a-t.collisionWidth:n:h>0?e.left+=h:l>0?e.left-=l:e.left=o(e.left-r,e.left)},top:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollTop:s.offset.top,a=t.within.height,r=e.top-t.collisionPosition.marginTop,h=n-r,l=r+t.collisionHeight-a-n;t.collisionHeight>a?h>0&&0>=l?(i=e.top+h+t.collisionHeight-a-n,e.top+=h-i):e.top=l>0&&0>=h?n:h>l?n+a-t.collisionHeight:n:h>0?e.top+=h:l>0?e.top-=l:e.top=o(e.top-r,e.top)}},flip:{left:function(e,t){var i,s,n=t.within,a=n.offset.left+n.scrollLeft,o=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=e.left-t.collisionPosition.marginLeft,u=l-h,d=l+t.collisionWidth-o-h,c="left"===t.my[0]?-t.elemWidth:"right"===t.my[0]?t.elemWidth:0,p="left"===t.at[0]?t.targetWidth:"right"===t.at[0]?-t.targetWidth:0,f=-2*t.offset[0];0>u?(i=e.left+c+p+f+t.collisionWidth-o-a,(0>i||r(u)>i)&&(e.left+=c+p+f)):d>0&&(s=e.left-t.collisionPosition.marginLeft+c+p+f-h,(s>0||d>r(s))&&(e.left+=c+p+f))},top:function(e,t){var i,s,n=t.within,a=n.offset.top+n.scrollTop,o=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=e.top-t.collisionPosition.marginTop,u=l-h,d=l+t.collisionHeight-o-h,c="top"===t.my[1],p=c?-t.elemHeight:"bottom"===t.my[1]?t.elemHeight:0,f="top"===t.at[1]?t.targetHeight:"bottom"===t.at[1]?-t.targetHeight:0,m=-2*t.offset[1];0>u?(s=e.top+p+f+m+t.collisionHeight-o-a,(0>s||r(u)>s)&&(e.top+=p+f+m)):d>0&&(i=e.top-t.collisionPosition.marginTop+p+f+m-h,(i>0||d>r(i))&&(e.top+=p+f+m))}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments),e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments),e.ui.position.fit.top.apply(this,arguments)}}},function(){var t,i,s,n,o,r=document.getElementsByTagName("body")[0],h=document.createElement("div");t=document.createElement(r?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},r&&e.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)t.style[o]=s[o];t.appendChild(h),i=r||document.documentElement,i.insertBefore(t,i.firstChild),h.style.cssText="position: absolute; left: 10.7432222px;",n=e(h).offset().left,a=n>10&&11>n,t.innerHTML="",i.removeChild(t)}()}(),e.ui.position,e.widget("ui.accordion",{version:"1.11.4",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var t=this.options;this.prevShow=this.prevHide=e(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),t.collapsible||t.active!==!1&&null!=t.active||(t.active=0),this._processPanels(),0>t.active&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():e()}},_createIcons:function(){var t=this.options.icons;t&&(e("<span>").addClass("ui-accordion-header-icon ui-icon "+t.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(t.header).addClass(t.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var e;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").removeUniqueId(),this._destroyIcons(),e=this.headers.next().removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").css("display","").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&e.css("height","")},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):("event"===e&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(t)),this._super(e,t),"collapsible"!==e||t||this.options.active!==!1||this._activate(0),"icons"===e&&(this._destroyIcons(),t&&this._createIcons()),"disabled"===e&&(this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!t)),void 0)},_keydown:function(t){if(!t.altKey&&!t.ctrlKey){var i=e.ui.keyCode,s=this.headers.length,n=this.headers.index(t.target),a=!1;switch(t.keyCode){case i.RIGHT:case i.DOWN:a=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:a=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(t);break;case i.HOME:a=this.headers[0];break;case i.END:a=this.headers[s-1]}a&&(e(t.target).attr("tabIndex",-1),e(a).attr("tabIndex",0),a.focus(),t.preventDefault())}},_panelKeyDown:function(t){t.keyCode===e.ui.keyCode.UP&&t.ctrlKey&&e(t.currentTarget).prev().focus()},refresh:function(){var t=this.options;this._processPanels(),t.active===!1&&t.collapsible===!0||!this.headers.length?(t.active=!1,this.active=e()):t.active===!1?this._activate(0):this.active.length&&!e.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=e()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var e=this.headers,t=this.panels;this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-state-default ui-corner-all"),this.panels=this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide(),t&&(this._off(e.not(this.headers)),this._off(t.not(this.panels)))},_refresh:function(){var t,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(){var t=e(this),i=t.uniqueId().attr("id"),s=t.next(),n=s.uniqueId().attr("id");t.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(t=n.height(),this.element.siblings(":visible").each(function(){var i=e(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(t-=i.outerHeight(!0))}),this.headers.each(function(){t-=e(this).outerHeight(!0)}),this.headers.next().each(function(){e(this).height(Math.max(0,t-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===s&&(t=0,this.headers.next().each(function(){t=Math.max(t,e(this).css("height","").height())}).height(t))},_activate:function(t){var i=this._findActive(t)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return"number"==typeof t?this.headers.eq(t):e()},_setupEvents:function(t){var i={keydown:"_keydown"};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n[0]===s[0],o=a&&i.collapsible,r=o?e():n.next(),h=s.next(),l={oldHeader:s,oldPanel:h,newHeader:o?e():n,newPanel:r};t.preventDefault(),a&&!i.collapsible||this._trigger("beforeActivate",t,l)===!1||(i.active=o?!1:this.headers.index(n),this.active=a?e():n,this._toggle(l),s.removeClass("ui-accordion-header-active ui-state-active"),i.icons&&s.children(".ui-accordion-header-icon").removeClass(i.icons.activeHeader).addClass(i.icons.header),a||(n.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),i.icons&&n.children(".ui-accordion-header-icon").removeClass(i.icons.header).addClass(i.icons.activeHeader),n.next().addClass("ui-accordion-content-active")))},_toggle:function(t){var i=t.newPanel,s=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,t):(s.hide(),i.show(),this._toggleComplete(t)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(e(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(e,t,i){var s,n,a,o=this,r=0,h=e.css("box-sizing"),l=e.length&&(!t.length||e.index()<t.index()),u=this.options.animate||{},d=l&&u.down||u,c=function(){o._toggleComplete(i)};return"number"==typeof d&&(a=d),"string"==typeof d&&(n=d),n=n||d.easing||u.easing,a=a||d.duration||u.duration,t.length?e.length?(s=e.show().outerHeight(),t.animate(this.hideProps,{duration:a,easing:n,step:function(e,t){t.now=Math.round(e)}}),e.hide().animate(this.showProps,{duration:a,easing:n,complete:c,step:function(e,i){i.now=Math.round(e),"height"!==i.prop?"content-box"===h&&(r+=i.now):"content"!==o.options.heightStyle&&(i.now=Math.round(s-t.outerHeight()-r),r=0)}}),void 0):t.animate(this.hideProps,a,n,c):e.animate(this.showProps,a,n,c)},_toggleComplete:function(e){var t=e.oldPanel;t.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),t.length&&(t.parent()[0].className=t.parent()[0].className),this._trigger("activate",null,e)}}),e.widget("ui.menu",{version:"1.11.4",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},items:"> *",menus:"ul",position:{my:"left-1 top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item":function(e){e.preventDefault()},"click .ui-menu-item":function(t){var i=e(t.target);!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&e(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){if(!this.previousFilter){var i=e(t.currentTarget);
-i.siblings(".ui-state-active").removeClass("ui-state-active"),this.focus(t,i)}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var i=this.active||this.element.find(this.options.items).eq(0);t||this.focus(e,i)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){this._closeOnDocumentClick(e)&&this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-menu-icons ui-front").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").removeUniqueId().removeClass("ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){var i,s,n,a,o=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:o=!1,s=this.previousFilter||"",n=String.fromCharCode(t.keyCode),a=!1,clearTimeout(this.filterTimer),n===s?a=!0:n=s+n,i=this._filterMenuItems(n),i=a&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(t.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(t,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}o&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.is("[aria-haspopup='true']")?this.expand(e):this.select(e))},refresh:function(){var t,i,s=this,n=this.options.icons.submenu,a=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),a.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-front").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),i=t.parent(),s=e("<span>").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);i.attr("aria-haspopup","true").prepend(s),t.attr("aria-labelledby",i.attr("id"))}),t=a.add(this.element),i=t.find(this.options.items),i.not(".ui-menu-item").each(function(){var t=e(this);s._isDivider(t)&&t.addClass("ui-widget-content ui-menu-divider")}),i.not(".ui-menu-item, .ui-menu-divider").addClass("ui-menu-item").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(e,t){"icons"===e&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(t.submenu),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},focus:function(e,t){var i,s;this.blur(e,e&&"focus"===e.type),this._scrollIntoView(t),this.active=t.first(),s=this.active.addClass("ui-state-focus").removeClass("ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").addClass("ui-state-active"),e&&"keydown"===e.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=t.children(".ui-menu"),i.length&&e&&/^mouse/.test(e.type)&&this._startOpening(i),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var i,s,n,a,o,r;this._hasScroll()&&(i=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,n=t.offset().top-this.activeMenu.offset().top-i-s,a=this.activeMenu.scrollTop(),o=this.activeMenu.height(),r=t.outerHeight(),0>n?this.activeMenu.scrollTop(a+n):n+r>o&&this.activeMenu.scrollTop(a+n-o+r))},blur:function(e,t){t||clearTimeout(this.timer),this.active&&(this.active.removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active}))},_startOpening:function(e){clearTimeout(this.timer),"true"===e.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(e)},this.delay))},_open:function(t){var i=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(t,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(t),this.activeMenu=s},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find(".ui-state-active").not(".ui-state-focus").removeClass("ui-state-active")},_closeOnDocumentClick:function(t){return!e(t.target).closest(".ui-menu").length},_isDivider:function(e){return!/[^\-\u2014\u2013\s]/.test(e.text())},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,i){var s;this.active&&(s="first"===e||"last"===e?this.active["first"===e?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[e+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[t]()),this.focus(i,s)},nextPage:function(t){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=e(this),0>i.offset().top-s-n}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(t),void 0)},previousPage:function(t){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=e(this),i.offset().top-s+n>0}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items).first())),void 0):(this.next(t),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||e(t.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,i)},_filterMenuItems:function(t){var i=t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(e.trim(e(this).text()))})}}),e.widget("ui.autocomplete",{version:"1.11.4",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var t,i,s,n=this.element[0].nodeName.toLowerCase(),a="textarea"===n,o="input"===n;this.isMultiLine=a?!0:o?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[a||o?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return t=!0,s=!0,i=!0,void 0;t=!1,s=!1,i=!1;var a=e.ui.keyCode;switch(n.keyCode){case a.PAGE_UP:t=!0,this._move("previousPage",n);break;case a.PAGE_DOWN:t=!0,this._move("nextPage",n);break;case a.UP:t=!0,this._keyEvent("previous",n);break;case a.DOWN:t=!0,this._keyEvent("next",n);break;case a.ENTER:this.menu.active&&(t=!0,n.preventDefault(),this.menu.select(n));break;case a.TAB:this.menu.active&&this.menu.select(n);break;case a.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(t)return t=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=e.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(e){return s?(s=!1,e.preventDefault(),void 0):(this._searchTimeout(e),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(e),this._change(e),void 0)}}),this._initSource(),this.menu=e("<ul>").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var i=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(s){s.target===t.element[0]||s.target===i||e.contains(i,s.target)||t.close()})})},menufocus:function(t,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:n})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&e.trim(s).length&&(this.liveRegion.children().hide(),e("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,t){var i=t.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",e,{item:i})&&this._value(i.value),this.term=this._value(),this.close(e),this.selectedItem=i}}),this.liveRegion=e("<span>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),"source"===e&&this._initSource(),"appendTo"===e&&this.menu.element.appendTo(this._appendTo()),"disabled"===e&&t&&this.xhr&&this.xhr.abort()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_initSource:function(){var t,i,s=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(i,s){s(e.ui.autocomplete.filter(t,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(t,n){s.xhr&&s.xhr.abort(),s.xhr=e.ajax({url:i,data:t,dataType:"json",success:function(e){n(e)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),i=this.menu.element.is(":visible"),s=e.altKey||e.ctrlKey||e.metaKey||e.shiftKey;(!t||t&&!i&&!s)&&(this.selectedItem=null,this.search(null,e))},this.options.delay)},search:function(e,t){return e=null!=e?e:this._value(),this.term=this._value(),e.length<this.options.minLength?this.close(t):this._trigger("search",t)!==!1?this._search(e):void 0},_search:function(e){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:e},this._response())},_response:function(){var t=++this.requestIndex;return e.proxy(function(e){t===this.requestIndex&&this.__response(e),this.pending--,this.pending||this.element.removeClass("ui-autocomplete-loading")},this)},__response:function(e){e&&(e=this._normalize(e)),this._trigger("response",null,{content:e}),!this.options.disabled&&e&&e.length&&!this.cancelSearch?(this._suggest(e),this._trigger("open")):this._close()},close:function(e){this.cancelSearch=!0,this._close(e)},_close:function(e){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",e))},_change:function(e){this.previous!==this._value()&&this._trigger("change",e,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:e.map(t,function(t){return"string"==typeof t?{label:t,value:t}:e.extend({},t,{label:t.label||t.value,value:t.value||t.label})})},_suggest:function(t){var i=this.menu.element.empty();this._renderMenu(i,t),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(e.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var e=this.menu.element;e.outerWidth(Math.max(e.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(t,i){var s=this;e.each(i,function(e,i){s._renderItemData(t,i)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-autocomplete-item",t)},_renderItem:function(t,i){return e("<li>").text(i.label).appendTo(t)},_move:function(e,t){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[e](t),void 0):(this.search(null,t),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(e,t),t.preventDefault())}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,i){var s=RegExp(e.ui.autocomplete.escapeRegex(i),"i");return e.grep(t,function(e){return s.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,this.liveRegion.children().hide(),e("<div>").text(i).appendTo(this.liveRegion))}}),e.ui.autocomplete;var c,p="ui-button ui-widget ui-state-default ui-corner-all",f="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",m=function(){var t=e(this);setTimeout(function(){t.find(":ui-button").button("refresh")},1)},g=function(t){var i=t.name,s=t.form,n=e([]);return i&&(i=i.replace(/'/g,"\\'"),n=s?e(s).find("[name='"+i+"'][type=radio]"):e("[name='"+i+"'][type=radio]",t.ownerDocument).filter(function(){return!this.form})),n};e.widget("ui.button",{version:"1.11.4",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,m),"boolean"!=typeof this.options.disabled?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var t=this,i=this.options,s="checkbox"===this.type||"radio"===this.type,n=s?"":"ui-state-active";null===i.label&&(i.label="input"===this.type?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(p).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){i.disabled||this===c&&e(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){i.disabled||e(this).removeClass(n)}).bind("click"+this.eventNamespace,function(e){i.disabled&&(e.preventDefault(),e.stopImmediatePropagation())}),this._on({focus:function(){this.buttonElement.addClass("ui-state-focus")},blur:function(){this.buttonElement.removeClass("ui-state-focus")}}),s&&this.element.bind("change"+this.eventNamespace,function(){t.refresh()}),"checkbox"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){return i.disabled?!1:void 0}):"radio"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){if(i.disabled)return!1;e(this).addClass("ui-state-active"),t.buttonElement.attr("aria-pressed","true");var s=t.element[0];g(s).not(s).map(function(){return e(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){return i.disabled?!1:(e(this).addClass("ui-state-active"),c=this,t.document.one("mouseup",function(){c=null}),void 0)}).bind("mouseup"+this.eventNamespace,function(){return i.disabled?!1:(e(this).removeClass("ui-state-active"),void 0)}).bind("keydown"+this.eventNamespace,function(t){return i.disabled?!1:((t.keyCode===e.ui.keyCode.SPACE||t.keyCode===e.ui.keyCode.ENTER)&&e(this).addClass("ui-state-active"),void 0)}).bind("keyup"+this.eventNamespace+" blur"+this.eventNamespace,function(){e(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(t){t.keyCode===e.ui.keyCode.SPACE&&e(this).click()})),this._setOption("disabled",i.disabled),this._resetButton()},_determineButtonType:function(){var e,t,i;this.type=this.element.is("[type=checkbox]")?"checkbox":this.element.is("[type=radio]")?"radio":this.element.is("input")?"input":"button","checkbox"===this.type||"radio"===this.type?(e=this.element.parents().last(),t="label[for='"+this.element.attr("id")+"']",this.buttonElement=e.find(t),this.buttonElement.length||(e=e.length?e.siblings():this.element.siblings(),this.buttonElement=e.filter(t),this.buttonElement.length||(this.buttonElement=e.find(t))),this.element.addClass("ui-helper-hidden-accessible"),i=this.element.is(":checked"),i&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",i)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(p+" ui-state-active "+f).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(e,t){return this._super(e,t),"disabled"===e?(this.widget().toggleClass("ui-state-disabled",!!t),this.element.prop("disabled",!!t),t&&("checkbox"===this.type||"radio"===this.type?this.buttonElement.removeClass("ui-state-focus"):this.buttonElement.removeClass("ui-state-focus ui-state-active")),void 0):(this._resetButton(),void 0)},refresh:function(){var t=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOption("disabled",t),"radio"===this.type?g(this.element[0]).each(function(){e(this).is(":checked")?e(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):e(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):"checkbox"===this.type&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if("input"===this.type)return this.options.label&&this.element.val(this.options.label),void 0;var t=this.buttonElement.removeClass(f),i=e("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(t.empty()).text(),s=this.options.icons,n=s.primary&&s.secondary,a=[];s.primary||s.secondary?(this.options.text&&a.push("ui-button-text-icon"+(n?"s":s.primary?"-primary":"-secondary")),s.primary&&t.prepend("<span class='ui-button-icon-primary ui-icon "+s.primary+"'></span>"),s.secondary&&t.append("<span class='ui-button-icon-secondary ui-icon "+s.secondary+"'></span>"),this.options.text||(a.push(n?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||t.attr("title",e.trim(i)))):a.push("ui-button-text-only"),t.addClass(a.join(" "))}}),e.widget("ui.buttonset",{version:"1.11.4",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(e,t){"disabled"===e&&this.buttons.button("option",e,t),this._super(e,t)},refresh:function(){var t="rtl"===this.element.css("direction"),i=this.element.find(this.options.items),s=i.filter(":ui-button");i.not(":ui-button").button(),s.button("refresh"),this.buttons=i.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(t?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(t?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}}),e.ui.button,e.extend(e.ui,{datepicker:{version:"1.11.4"}});var v;e.extend(n.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(e){return r(this._defaults,e||{}),this},_attachDatepicker:function(t,i){var s,n,a;s=t.nodeName.toLowerCase(),n="div"===s||"span"===s,t.id||(this.uuid+=1,t.id="dp"+this.uuid),a=this._newInst(e(t),n),a.settings=e.extend({},i||{}),"input"===s?this._connectDatepicker(t,a):n&&this._inlineDatepicker(t,a)},_newInst:function(t,i){var s=t[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:s,input:t,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?a(e("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(t,i){var s=e(t);i.append=e([]),i.trigger=e([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp),this._autoSize(i),e.data(t,"datepicker",i),i.settings.disabled&&this._disableDatepicker(t))},_attachments:function(t,i){var s,n,a,o=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),o&&(i.append=e("<span class='"+this._appendClass+"'>"+o+"</span>"),t[r?"before":"after"](i.append)),t.unbind("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&t.focus(this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),a=this._get(i,"buttonImage"),i.trigger=e(this._get(i,"buttonImageOnly")?e("<img/>").addClass(this._triggerClass).attr({src:a,alt:n,title:n}):e("<button type='button'></button>").addClass(this._triggerClass).html(a?e("<img/>").attr({src:a,alt:n,title:n}):n)),t[r?"before":"after"](i.trigger),i.trigger.click(function(){return e.datepicker._datepickerShowing&&e.datepicker._lastInput===t[0]?e.datepicker._hideDatepicker():e.datepicker._datepickerShowing&&e.datepicker._lastInput!==t[0]?(e.datepicker._hideDatepicker(),e.datepicker._showDatepicker(t[0])):e.datepicker._showDatepicker(t[0]),!1}))},_autoSize:function(e){if(this._get(e,"autoSize")&&!e.inline){var t,i,s,n,a=new Date(2009,11,20),o=this._get(e,"dateFormat");o.match(/[DM]/)&&(t=function(e){for(i=0,s=0,n=0;e.length>n;n++)e[n].length>i&&(i=e[n].length,s=n);return s},a.setMonth(t(this._get(e,o.match(/MM/)?"monthNames":"monthNamesShort"))),a.setDate(t(this._get(e,o.match(/DD/)?"dayNames":"dayNamesShort"))+20-a.getDay())),e.input.attr("size",this._formatDate(e,a).length)}},_inlineDatepicker:function(t,i){var s=e(t);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),e.data(t,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(t),i.dpDiv.css("display","block"))},_dialogDatepicker:function(t,i,s,n,a){var o,h,l,u,d,c=this._dialogInst;return c||(this.uuid+=1,o="dp"+this.uuid,this._dialogInput=e("<input type='text' id='"+o+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.keydown(this._doKeyDown),e("body").append(this._dialogInput),c=this._dialogInst=this._newInst(this._dialogInput,!1),c.settings={},e.data(this._dialogInput[0],"datepicker",c)),r(c.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(c,i):i,this._dialogInput.val(i),this._pos=a?a.length?a:[a.pageX,a.pageY]:null,this._pos||(h=document.documentElement.clientWidth,l=document.documentElement.clientHeight,u=document.documentElement.scrollLeft||document.body.scrollLeft,d=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[h/2-100+u,l/2-150+d]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),c.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),e.blockUI&&e.blockUI(this.dpDiv),e.data(this._dialogInput[0],"datepicker",c),this},_destroyDatepicker:function(t){var i,s=e(t),n=e.data(t,"datepicker");s.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),e.removeData(t,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty(),v===n&&(v=null))},_enableDatepicker:function(t){var i,s,n=e(t),a=e.data(t,"datepicker");n.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),"input"===i?(t.disabled=!1,a.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}))},_disableDatepicker:function(t){var i,s,n=e(t),a=e.data(t,"datepicker");n.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),"input"===i?(t.disabled=!0,a.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}),this._disabledInputs[this._disabledInputs.length]=t)},_isDisabledDatepicker:function(e){if(!e)return!1;for(var t=0;this._disabledInputs.length>t;t++)if(this._disabledInputs[t]===e)return!0;return!1},_getInst:function(t){try{return e.data(t,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(t,i,s){var n,a,o,h,l=this._getInst(t);return 2===arguments.length&&"string"==typeof i?"defaults"===i?e.extend({},e.datepicker._defaults):l?"all"===i?e.extend({},l.settings):this._get(l,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),l&&(this._curInst===l&&this._hideDatepicker(),a=this._getDateDatepicker(t,!0),o=this._getMinMaxDate(l,"min"),h=this._getMinMaxDate(l,"max"),r(l.settings,n),null!==o&&void 0!==n.dateFormat&&void 0===n.minDate&&(l.settings.minDate=this._formatDate(l,o)),null!==h&&void 0!==n.dateFormat&&void 0===n.maxDate&&(l.settings.maxDate=this._formatDate(l,h)),"disabled"in n&&(n.disabled?this._disableDatepicker(t):this._enableDatepicker(t)),this._attachments(e(t),l),this._autoSize(l),this._setDate(l,a),this._updateAlternate(l),this._updateDatepicker(l)),void 0)},_changeDatepicker:function(e,t,i){this._optionDatepicker(e,t,i)},_refreshDatepicker:function(e){var t=this._getInst(e);t&&this._updateDatepicker(t)},_setDateDatepicker:function(e,t){var i=this._getInst(e);i&&(this._setDate(i,t),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(e,t){var i=this._getInst(e);return i&&!i.inline&&this._setDateFromField(i,t),i?this._getDate(i):null},_doKeyDown:function(t){var i,s,n,a=e.datepicker._getInst(t.target),o=!0,r=a.dpDiv.is(".ui-datepicker-rtl");if(a._keyEvent=!0,e.datepicker._datepickerShowing)switch(t.keyCode){case 9:e.datepicker._hideDatepicker(),o=!1;break;case 13:return n=e("td."+e.datepicker._dayOverClass+":not(."+e.datepicker._currentClass+")",a.dpDiv),n[0]&&e.datepicker._selectDay(t.target,a.selectedMonth,a.selectedYear,n[0]),i=e.datepicker._get(a,"onSelect"),i?(s=e.datepicker._formatDate(a),i.apply(a.input?a.input[0]:null,[s,a])):e.datepicker._hideDatepicker(),!1;case 27:e.datepicker._hideDatepicker();break;case 33:e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(a,"stepBigMonths"):-e.datepicker._get(a,"stepMonths"),"M");break;case 34:e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(a,"stepBigMonths"):+e.datepicker._get(a,"stepMonths"),"M");break;case 35:(t.ctrlKey||t.metaKey)&&e.datepicker._clearDate(t.target),o=t.ctrlKey||t.metaKey;break;case 36:(t.ctrlKey||t.metaKey)&&e.datepicker._gotoToday(t.target),o=t.ctrlKey||t.metaKey;break;case 37:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,r?1:-1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(a,"stepBigMonths"):-e.datepicker._get(a,"stepMonths"),"M");break;case 38:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,-7,"D"),o=t.ctrlKey||t.metaKey;break;case 39:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,r?-1:1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(a,"stepBigMonths"):+e.datepicker._get(a,"stepMonths"),"M");break;case 40:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,7,"D"),o=t.ctrlKey||t.metaKey;break;default:o=!1}else 36===t.keyCode&&t.ctrlKey?e.datepicker._showDatepicker(this):o=!1;o&&(t.preventDefault(),t.stopPropagation())},_doKeyPress:function(t){var i,s,n=e.datepicker._getInst(t.target);
-return e.datepicker._get(n,"constrainInput")?(i=e.datepicker._possibleChars(e.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==t.charCode?t.keyCode:t.charCode),t.ctrlKey||t.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0},_doKeyUp:function(t){var i,s=e.datepicker._getInst(t.target);if(s.input.val()!==s.lastVal)try{i=e.datepicker.parseDate(e.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,e.datepicker._getFormatConfig(s)),i&&(e.datepicker._setDateFromField(s),e.datepicker._updateAlternate(s),e.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(t){if(t=t.target||t,"input"!==t.nodeName.toLowerCase()&&(t=e("input",t.parentNode)[0]),!e.datepicker._isDisabledDatepicker(t)&&e.datepicker._lastInput!==t){var i,n,a,o,h,l,u;i=e.datepicker._getInst(t),e.datepicker._curInst&&e.datepicker._curInst!==i&&(e.datepicker._curInst.dpDiv.stop(!0,!0),i&&e.datepicker._datepickerShowing&&e.datepicker._hideDatepicker(e.datepicker._curInst.input[0])),n=e.datepicker._get(i,"beforeShow"),a=n?n.apply(t,[t,i]):{},a!==!1&&(r(i.settings,a),i.lastVal=null,e.datepicker._lastInput=t,e.datepicker._setDateFromField(i),e.datepicker._inDialog&&(t.value=""),e.datepicker._pos||(e.datepicker._pos=e.datepicker._findPos(t),e.datepicker._pos[1]+=t.offsetHeight),o=!1,e(t).parents().each(function(){return o|="fixed"===e(this).css("position"),!o}),h={left:e.datepicker._pos[0],top:e.datepicker._pos[1]},e.datepicker._pos=null,i.dpDiv.empty(),i.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),e.datepicker._updateDatepicker(i),h=e.datepicker._checkOffset(i,h,o),i.dpDiv.css({position:e.datepicker._inDialog&&e.blockUI?"static":o?"fixed":"absolute",display:"none",left:h.left+"px",top:h.top+"px"}),i.inline||(l=e.datepicker._get(i,"showAnim"),u=e.datepicker._get(i,"duration"),i.dpDiv.css("z-index",s(e(t))+1),e.datepicker._datepickerShowing=!0,e.effects&&e.effects.effect[l]?i.dpDiv.show(l,e.datepicker._get(i,"showOptions"),u):i.dpDiv[l||"show"](l?u:null),e.datepicker._shouldFocusInput(i)&&i.input.focus(),e.datepicker._curInst=i))}},_updateDatepicker:function(t){this.maxRows=4,v=t,t.dpDiv.empty().append(this._generateHTML(t)),this._attachHandlers(t);var i,s=this._getNumberOfMonths(t),n=s[1],a=17,r=t.dpDiv.find("."+this._dayOverClass+" a");r.length>0&&o.apply(r.get(0)),t.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&t.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),t.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),t.dpDiv[(this._get(t,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),t===e.datepicker._curInst&&e.datepicker._datepickerShowing&&e.datepicker._shouldFocusInput(t)&&t.input.focus(),t.yearshtml&&(i=t.yearshtml,setTimeout(function(){i===t.yearshtml&&t.yearshtml&&t.dpDiv.find("select.ui-datepicker-year:first").replaceWith(t.yearshtml),i=t.yearshtml=null},0))},_shouldFocusInput:function(e){return e.input&&e.input.is(":visible")&&!e.input.is(":disabled")&&!e.input.is(":focus")},_checkOffset:function(t,i,s){var n=t.dpDiv.outerWidth(),a=t.dpDiv.outerHeight(),o=t.input?t.input.outerWidth():0,r=t.input?t.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:e(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:e(document).scrollTop());return i.left-=this._get(t,"isRTL")?n-o:0,i.left-=s&&i.left===t.input.offset().left?e(document).scrollLeft():0,i.top-=s&&i.top===t.input.offset().top+r?e(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+a>l&&l>a?Math.abs(a+r):0),i},_findPos:function(t){for(var i,s=this._getInst(t),n=this._get(s,"isRTL");t&&("hidden"===t.type||1!==t.nodeType||e.expr.filters.hidden(t));)t=t[n?"previousSibling":"nextSibling"];return i=e(t).offset(),[i.left,i.top]},_hideDatepicker:function(t){var i,s,n,a,o=this._curInst;!o||t&&o!==e.data(t,"datepicker")||this._datepickerShowing&&(i=this._get(o,"showAnim"),s=this._get(o,"duration"),n=function(){e.datepicker._tidyDialog(o)},e.effects&&(e.effects.effect[i]||e.effects[i])?o.dpDiv.hide(i,e.datepicker._get(o,"showOptions"),s,n):o.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,a=this._get(o,"onClose"),a&&a.apply(o.input?o.input[0]:null,[o.input?o.input.val():"",o]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),e.blockUI&&(e.unblockUI(),e("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(e){e.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(t){if(e.datepicker._curInst){var i=e(t.target),s=e.datepicker._getInst(i[0]);(i[0].id!==e.datepicker._mainDivId&&0===i.parents("#"+e.datepicker._mainDivId).length&&!i.hasClass(e.datepicker.markerClassName)&&!i.closest("."+e.datepicker._triggerClass).length&&e.datepicker._datepickerShowing&&(!e.datepicker._inDialog||!e.blockUI)||i.hasClass(e.datepicker.markerClassName)&&e.datepicker._curInst!==s)&&e.datepicker._hideDatepicker()}},_adjustDate:function(t,i,s){var n=e(t),a=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(a,i+("M"===s?this._get(a,"showCurrentAtPos"):0),s),this._updateDatepicker(a))},_gotoToday:function(t){var i,s=e(t),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(t,i,s){var n=e(t),a=this._getInst(n[0]);a["selected"+("M"===s?"Month":"Year")]=a["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(a),this._adjustDate(n)},_selectDay:function(t,i,s,n){var a,o=e(t);e(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0])||(a=this._getInst(o[0]),a.selectedDay=a.currentDay=e("a",n).html(),a.selectedMonth=a.currentMonth=i,a.selectedYear=a.currentYear=s,this._selectDate(t,this._formatDate(a,a.currentDay,a.currentMonth,a.currentYear)))},_clearDate:function(t){var i=e(t);this._selectDate(i,"")},_selectDate:function(t,i){var s,n=e(t),a=this._getInst(n[0]);i=null!=i?i:this._formatDate(a),a.input&&a.input.val(i),this._updateAlternate(a),s=this._get(a,"onSelect"),s?s.apply(a.input?a.input[0]:null,[i,a]):a.input&&a.input.trigger("change"),a.inline?this._updateDatepicker(a):(this._hideDatepicker(),this._lastInput=a.input[0],"object"!=typeof a.input[0]&&a.input.focus(),this._lastInput=null)},_updateAlternate:function(t){var i,s,n,a=this._get(t,"altField");a&&(i=this._get(t,"altFormat")||this._get(t,"dateFormat"),s=this._getDate(t),n=this.formatDate(i,s,this._getFormatConfig(t)),e(a).each(function(){e(this).val(n)}))},noWeekends:function(e){var t=e.getDay();return[t>0&&6>t,""]},iso8601Week:function(e){var t,i=new Date(e.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),t=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((t-i)/864e5)/7)+1},parseDate:function(t,i,s){if(null==t||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,a,o,r,h=0,l=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,u="string"!=typeof l?l:(new Date).getFullYear()%100+parseInt(l,10),d=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,c=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,m=-1,g=-1,v=-1,y=-1,b=!1,_=function(e){var i=t.length>n+1&&t.charAt(n+1)===e;return i&&n++,i},x=function(e){var t=_(e),s="@"===e?14:"!"===e?20:"y"===e&&t?4:"o"===e?3:2,n="y"===e?s:1,a=RegExp("^\\d{"+n+","+s+"}"),o=i.substring(h).match(a);if(!o)throw"Missing number at position "+h;return h+=o[0].length,parseInt(o[0],10)},w=function(t,s,n){var a=-1,o=e.map(_(t)?n:s,function(e,t){return[[t,e]]}).sort(function(e,t){return-(e[1].length-t[1].length)});if(e.each(o,function(e,t){var s=t[1];return i.substr(h,s.length).toLowerCase()===s.toLowerCase()?(a=t[0],h+=s.length,!1):void 0}),-1!==a)return a+1;throw"Unknown name at position "+h},k=function(){if(i.charAt(h)!==t.charAt(n))throw"Unexpected literal at position "+h;h++};for(n=0;t.length>n;n++)if(b)"'"!==t.charAt(n)||_("'")?k():b=!1;else switch(t.charAt(n)){case"d":v=x("d");break;case"D":w("D",d,c);break;case"o":y=x("o");break;case"m":g=x("m");break;case"M":g=w("M",p,f);break;case"y":m=x("y");break;case"@":r=new Date(x("@")),m=r.getFullYear(),g=r.getMonth()+1,v=r.getDate();break;case"!":r=new Date((x("!")-this._ticksTo1970)/1e4),m=r.getFullYear(),g=r.getMonth()+1,v=r.getDate();break;case"'":_("'")?k():b=!0;break;default:k()}if(i.length>h&&(o=i.substr(h),!/^\s+/.test(o)))throw"Extra/unparsed characters found in date: "+o;if(-1===m?m=(new Date).getFullYear():100>m&&(m+=(new Date).getFullYear()-(new Date).getFullYear()%100+(u>=m?0:-100)),y>-1)for(g=1,v=y;;){if(a=this._getDaysInMonth(m,g-1),a>=v)break;g++,v-=a}if(r=this._daylightSavingAdjust(new Date(m,g-1,v)),r.getFullYear()!==m||r.getMonth()+1!==g||r.getDate()!==v)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(e,t,i){if(!t)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,a=(i?i.dayNames:null)||this._defaults.dayNames,o=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(t){var i=e.length>s+1&&e.charAt(s+1)===t;return i&&s++,i},l=function(e,t,i){var s=""+t;if(h(e))for(;i>s.length;)s="0"+s;return s},u=function(e,t,i,s){return h(e)?s[t]:i[t]},d="",c=!1;if(t)for(s=0;e.length>s;s++)if(c)"'"!==e.charAt(s)||h("'")?d+=e.charAt(s):c=!1;else switch(e.charAt(s)){case"d":d+=l("d",t.getDate(),2);break;case"D":d+=u("D",t.getDay(),n,a);break;case"o":d+=l("o",Math.round((new Date(t.getFullYear(),t.getMonth(),t.getDate()).getTime()-new Date(t.getFullYear(),0,0).getTime())/864e5),3);break;case"m":d+=l("m",t.getMonth()+1,2);break;case"M":d+=u("M",t.getMonth(),o,r);break;case"y":d+=h("y")?t.getFullYear():(10>t.getYear()%100?"0":"")+t.getYear()%100;break;case"@":d+=t.getTime();break;case"!":d+=1e4*t.getTime()+this._ticksTo1970;break;case"'":h("'")?d+="'":c=!0;break;default:d+=e.charAt(s)}return d},_possibleChars:function(e){var t,i="",s=!1,n=function(i){var s=e.length>t+1&&e.charAt(t+1)===i;return s&&t++,s};for(t=0;e.length>t;t++)if(s)"'"!==e.charAt(t)||n("'")?i+=e.charAt(t):s=!1;else switch(e.charAt(t)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=e.charAt(t)}return i},_get:function(e,t){return void 0!==e.settings[t]?e.settings[t]:this._defaults[t]},_setDateFromField:function(e,t){if(e.input.val()!==e.lastVal){var i=this._get(e,"dateFormat"),s=e.lastVal=e.input?e.input.val():null,n=this._getDefaultDate(e),a=n,o=this._getFormatConfig(e);try{a=this.parseDate(i,s,o)||n}catch(r){s=t?"":s}e.selectedDay=a.getDate(),e.drawMonth=e.selectedMonth=a.getMonth(),e.drawYear=e.selectedYear=a.getFullYear(),e.currentDay=s?a.getDate():0,e.currentMonth=s?a.getMonth():0,e.currentYear=s?a.getFullYear():0,this._adjustInstDate(e)}},_getDefaultDate:function(e){return this._restrictMinMax(e,this._determineDate(e,this._get(e,"defaultDate"),new Date))},_determineDate:function(t,i,s){var n=function(e){var t=new Date;return t.setDate(t.getDate()+e),t},a=function(i){try{return e.datepicker.parseDate(e.datepicker._get(t,"dateFormat"),i,e.datepicker._getFormatConfig(t))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?e.datepicker._getDate(t):null)||new Date,a=n.getFullYear(),o=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":o+=parseInt(l[1],10),r=Math.min(r,e.datepicker._getDaysInMonth(a,o));break;case"y":case"Y":a+=parseInt(l[1],10),r=Math.min(r,e.datepicker._getDaysInMonth(a,o))}l=h.exec(i)}return new Date(a,o,r)},o=null==i||""===i?s:"string"==typeof i?a(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return o=o&&"Invalid Date"==""+o?s:o,o&&(o.setHours(0),o.setMinutes(0),o.setSeconds(0),o.setMilliseconds(0)),this._daylightSavingAdjust(o)},_daylightSavingAdjust:function(e){return e?(e.setHours(e.getHours()>12?e.getHours()+2:0),e):null},_setDate:function(e,t,i){var s=!t,n=e.selectedMonth,a=e.selectedYear,o=this._restrictMinMax(e,this._determineDate(e,t,new Date));e.selectedDay=e.currentDay=o.getDate(),e.drawMonth=e.selectedMonth=e.currentMonth=o.getMonth(),e.drawYear=e.selectedYear=e.currentYear=o.getFullYear(),n===e.selectedMonth&&a===e.selectedYear||i||this._notifyChange(e),this._adjustInstDate(e),e.input&&e.input.val(s?"":this._formatDate(e))},_getDate:function(e){var t=!e.currentYear||e.input&&""===e.input.val()?null:this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return t},_attachHandlers:function(t){var i=this._get(t,"stepMonths"),s="#"+t.id.replace(/\\\\/g,"\\");t.dpDiv.find("[data-handler]").map(function(){var t={prev:function(){e.datepicker._adjustDate(s,-i,"M")},next:function(){e.datepicker._adjustDate(s,+i,"M")},hide:function(){e.datepicker._hideDatepicker()},today:function(){e.datepicker._gotoToday(s)},selectDay:function(){return e.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return e.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return e.datepicker._selectMonthYear(s,this,"Y"),!1}};e(this).bind(this.getAttribute("data-event"),t[this.getAttribute("data-handler")])})},_generateHTML:function(e){var t,i,s,n,a,o,r,h,l,u,d,c,p,f,m,g,v,y,b,_,x,w,k,T,D,S,M,C,N,A,P,I,H,z,F,E,O,j,W,L=new Date,R=this._daylightSavingAdjust(new Date(L.getFullYear(),L.getMonth(),L.getDate())),Y=this._get(e,"isRTL"),B=this._get(e,"showButtonPanel"),J=this._get(e,"hideIfNoPrevNext"),q=this._get(e,"navigationAsDateFormat"),K=this._getNumberOfMonths(e),V=this._get(e,"showCurrentAtPos"),U=this._get(e,"stepMonths"),Q=1!==K[0]||1!==K[1],G=this._daylightSavingAdjust(e.currentDay?new Date(e.currentYear,e.currentMonth,e.currentDay):new Date(9999,9,9)),X=this._getMinMaxDate(e,"min"),$=this._getMinMaxDate(e,"max"),Z=e.drawMonth-V,et=e.drawYear;if(0>Z&&(Z+=12,et--),$)for(t=this._daylightSavingAdjust(new Date($.getFullYear(),$.getMonth()-K[0]*K[1]+1,$.getDate())),t=X&&X>t?X:t;this._daylightSavingAdjust(new Date(et,Z,1))>t;)Z--,0>Z&&(Z=11,et--);for(e.drawMonth=Z,e.drawYear=et,i=this._get(e,"prevText"),i=q?this.formatDate(i,this._daylightSavingAdjust(new Date(et,Z-U,1)),this._getFormatConfig(e)):i,s=this._canAdjustMonth(e,-1,et,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":J?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(e,"nextText"),n=q?this.formatDate(n,this._daylightSavingAdjust(new Date(et,Z+U,1)),this._getFormatConfig(e)):n,a=this._canAdjustMonth(e,1,et,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":J?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",o=this._get(e,"currentText"),r=this._get(e,"gotoCurrent")&&e.currentDay?G:R,o=q?this.formatDate(o,r,this._getFormatConfig(e)):o,h=e.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(e,"closeText")+"</button>",l=B?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(e,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+o+"</button>":"")+(Y?"":h)+"</div>":"",u=parseInt(this._get(e,"firstDay"),10),u=isNaN(u)?0:u,d=this._get(e,"showWeek"),c=this._get(e,"dayNames"),p=this._get(e,"dayNamesMin"),f=this._get(e,"monthNames"),m=this._get(e,"monthNamesShort"),g=this._get(e,"beforeShowDay"),v=this._get(e,"showOtherMonths"),y=this._get(e,"selectOtherMonths"),b=this._getDefaultDate(e),_="",w=0;K[0]>w;w++){for(k="",this.maxRows=4,T=0;K[1]>T;T++){if(D=this._daylightSavingAdjust(new Date(et,Z,e.selectedDay)),S=" ui-corner-all",M="",Q){if(M+="<div class='ui-datepicker-group",K[1]>1)switch(T){case 0:M+=" ui-datepicker-group-first",S=" ui-corner-"+(Y?"right":"left");break;case K[1]-1:M+=" ui-datepicker-group-last",S=" ui-corner-"+(Y?"left":"right");break;default:M+=" ui-datepicker-group-middle",S=""}M+="'>"}for(M+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+S+"'>"+(/all|left/.test(S)&&0===w?Y?a:s:"")+(/all|right/.test(S)&&0===w?Y?s:a:"")+this._generateMonthYearHeader(e,Z,et,X,$,w>0||T>0,f,m)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",C=d?"<th class='ui-datepicker-week-col'>"+this._get(e,"weekHeader")+"</th>":"",x=0;7>x;x++)N=(x+u)%7,C+="<th scope='col'"+((x+u+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+c[N]+"'>"+p[N]+"</span></th>";for(M+=C+"</tr></thead><tbody>",A=this._getDaysInMonth(et,Z),et===e.selectedYear&&Z===e.selectedMonth&&(e.selectedDay=Math.min(e.selectedDay,A)),P=(this._getFirstDayOfMonth(et,Z)-u+7)%7,I=Math.ceil((P+A)/7),H=Q?this.maxRows>I?this.maxRows:I:I,this.maxRows=H,z=this._daylightSavingAdjust(new Date(et,Z,1-P)),F=0;H>F;F++){for(M+="<tr>",E=d?"<td class='ui-datepicker-week-col'>"+this._get(e,"calculateWeek")(z)+"</td>":"",x=0;7>x;x++)O=g?g.apply(e.input?e.input[0]:null,[z]):[!0,""],j=z.getMonth()!==Z,W=j&&!y||!O[0]||X&&X>z||$&&z>$,E+="<td class='"+((x+u+6)%7>=5?" ui-datepicker-week-end":"")+(j?" ui-datepicker-other-month":"")+(z.getTime()===D.getTime()&&Z===e.selectedMonth&&e._keyEvent||b.getTime()===z.getTime()&&b.getTime()===D.getTime()?" "+this._dayOverClass:"")+(W?" "+this._unselectableClass+" ui-state-disabled":"")+(j&&!v?"":" "+O[1]+(z.getTime()===G.getTime()?" "+this._currentClass:"")+(z.getTime()===R.getTime()?" ui-datepicker-today":""))+"'"+(j&&!v||!O[2]?"":" title='"+O[2].replace(/'/g,"&#39;")+"'")+(W?"":" data-handler='selectDay' data-event='click' data-month='"+z.getMonth()+"' data-year='"+z.getFullYear()+"'")+">"+(j&&!v?"&#xa0;":W?"<span class='ui-state-default'>"+z.getDate()+"</span>":"<a class='ui-state-default"+(z.getTime()===R.getTime()?" ui-state-highlight":"")+(z.getTime()===G.getTime()?" ui-state-active":"")+(j?" ui-priority-secondary":"")+"' href='#'>"+z.getDate()+"</a>")+"</td>",z.setDate(z.getDate()+1),z=this._daylightSavingAdjust(z);M+=E+"</tr>"}Z++,Z>11&&(Z=0,et++),M+="</tbody></table>"+(Q?"</div>"+(K[0]>0&&T===K[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),k+=M}_+=k}return _+=l,e._keyEvent=!1,_},_generateMonthYearHeader:function(e,t,i,s,n,a,o,r){var h,l,u,d,c,p,f,m,g=this._get(e,"changeMonth"),v=this._get(e,"changeYear"),y=this._get(e,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",_="";if(a||!g)_+="<span class='ui-datepicker-month'>"+o[t]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,_+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",u=0;12>u;u++)(!h||u>=s.getMonth())&&(!l||n.getMonth()>=u)&&(_+="<option value='"+u+"'"+(u===t?" selected='selected'":"")+">"+r[u]+"</option>");_+="</select>"}if(y||(b+=_+(!a&&g&&v?"":"&#xa0;")),!e.yearshtml)if(e.yearshtml="",a||!v)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(d=this._get(e,"yearRange").split(":"),c=(new Date).getFullYear(),p=function(e){var t=e.match(/c[+\-].*/)?i+parseInt(e.substring(1),10):e.match(/[+\-].*/)?c+parseInt(e,10):parseInt(e,10);return isNaN(t)?c:t},f=p(d[0]),m=Math.max(f,p(d[1]||"")),f=s?Math.max(f,s.getFullYear()):f,m=n?Math.min(m,n.getFullYear()):m,e.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";m>=f;f++)e.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";e.yearshtml+="</select>",b+=e.yearshtml,e.yearshtml=null}return b+=this._get(e,"yearSuffix"),y&&(b+=(!a&&g&&v?"":"&#xa0;")+_),b+="</div>"},_adjustInstDate:function(e,t,i){var s=e.drawYear+("Y"===i?t:0),n=e.drawMonth+("M"===i?t:0),a=Math.min(e.selectedDay,this._getDaysInMonth(s,n))+("D"===i?t:0),o=this._restrictMinMax(e,this._daylightSavingAdjust(new Date(s,n,a)));e.selectedDay=o.getDate(),e.drawMonth=e.selectedMonth=o.getMonth(),e.drawYear=e.selectedYear=o.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(e)},_restrictMinMax:function(e,t){var i=this._getMinMaxDate(e,"min"),s=this._getMinMaxDate(e,"max"),n=i&&i>t?i:t;return s&&n>s?s:n},_notifyChange:function(e){var t=this._get(e,"onChangeMonthYear");t&&t.apply(e.input?e.input[0]:null,[e.selectedYear,e.selectedMonth+1,e])},_getNumberOfMonths:function(e){var t=this._get(e,"numberOfMonths");return null==t?[1,1]:"number"==typeof t?[1,t]:t},_getMinMaxDate:function(e,t){return this._determineDate(e,this._get(e,t+"Date"),null)},_getDaysInMonth:function(e,t){return 32-this._daylightSavingAdjust(new Date(e,t,32)).getDate()},_getFirstDayOfMonth:function(e,t){return new Date(e,t,1).getDay()},_canAdjustMonth:function(e,t,i,s){var n=this._getNumberOfMonths(e),a=this._daylightSavingAdjust(new Date(i,s+(0>t?t:n[0]*n[1]),1));return 0>t&&a.setDate(this._getDaysInMonth(a.getFullYear(),a.getMonth())),this._isInRange(e,a)},_isInRange:function(e,t){var i,s,n=this._getMinMaxDate(e,"min"),a=this._getMinMaxDate(e,"max"),o=null,r=null,h=this._get(e,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),o=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(o+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||t.getTime()>=n.getTime())&&(!a||t.getTime()<=a.getTime())&&(!o||t.getFullYear()>=o)&&(!r||r>=t.getFullYear())},_getFormatConfig:function(e){var t=this._get(e,"shortYearCutoff");return t="string"!=typeof t?t:(new Date).getFullYear()%100+parseInt(t,10),{shortYearCutoff:t,dayNamesShort:this._get(e,"dayNamesShort"),dayNames:this._get(e,"dayNames"),monthNamesShort:this._get(e,"monthNamesShort"),monthNames:this._get(e,"monthNames")}},_formatDate:function(e,t,i,s){t||(e.currentDay=e.selectedDay,e.currentMonth=e.selectedMonth,e.currentYear=e.selectedYear);var n=t?"object"==typeof t?t:this._daylightSavingAdjust(new Date(s,i,t)):this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return this.formatDate(this._get(e,"dateFormat"),n,this._getFormatConfig(e))}}),e.fn.datepicker=function(t){if(!this.length)return this;e.datepicker.initialized||(e(document).mousedown(e.datepicker._checkExternalClick),e.datepicker.initialized=!0),0===e("#"+e.datepicker._mainDivId).length&&e("body").append(e.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof t||"isDisabled"!==t&&"getDate"!==t&&"widget"!==t?"option"===t&&2===arguments.length&&"string"==typeof arguments[1]?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof t?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this].concat(i)):e.datepicker._attachDatepicker(this,t)}):e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(i))},e.datepicker=new n,e.datepicker.initialized=!1,e.datepicker.uuid=(new Date).getTime(),e.datepicker.version="1.11.4",e.datepicker,e.widget("ui.draggable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._setHandleClassName(),this._mouseInit()},_setOption:function(e,t){this._super(e,t),"handle"===e&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(t){var i=this.options;return this._blurActiveElement(t),this.helper||i.disabled||e(t.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(t),this.handle?(this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(t){this.iframeBlocks=this.document.find(t).map(function(){var t=e(this);return e("<div>").css("position","absolute").appendTo(t.parent()).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(t){var i=this.document[0];if(this.handleElement.is(t.target))try{i.activeElement&&"body"!==i.activeElement.nodeName.toLowerCase()&&e(i.activeElement).blur()}catch(s){}},_mouseStart:function(t){var i=this.options;return this.helper=this._createHelper(t),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),e.ui.ddmanager&&(e.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===e(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(t),this.originalPosition=this.position=this._generatePosition(t,!1),this.originalPageX=t.pageX,this.originalPageY=t.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",t)===!1?(this._clear(),!1):(this._cacheHelperProportions(),e.ui.ddmanager&&!i.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this._normalizeRightBottom(),this._mouseDrag(t,!0),e.ui.ddmanager&&e.ui.ddmanager.dragStart(this,t),!0)},_refreshOffsets:function(e){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:e.pageX-this.offset.left,top:e.pageY-this.offset.top}},_mouseDrag:function(t,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(t,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",t,s)===!1)return this._mouseUp({}),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var i=this,s=!1;return e.ui.ddmanager&&!this.options.dropBehaviour&&(s=e.ui.ddmanager.drop(this,t)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||e.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?e(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",t)!==!1&&i._clear()}):this._trigger("stop",t)!==!1&&this._clear(),!1},_mouseUp:function(t){return this._unblockFrames(),e.ui.ddmanager&&e.ui.ddmanager.dragStop(this,t),this.handleElement.is(t.target)&&this.element.focus(),e.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(t){return this.options.handle?!!e(t.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this.handleElement.addClass("ui-draggable-handle")},_removeHandleClassName:function(){this.handleElement.removeClass("ui-draggable-handle")},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper),n=s?e(i.helper.apply(this.element[0],[t])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_isRootNode:function(e){return/(html|body)/i.test(e.tagName)||e===this.document[0]},_getParentOffset:function(){var t=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var e=this.element.position(),t=this._isRootNode(this.scrollParent[0]);return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+(t?0:this.scrollParent.scrollTop()),left:e.left-(parseInt(this.helper.css("left"),10)||0)+(t?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options,a=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[e(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,e(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,e(window).scrollLeft()+e(window).width()-this.helperProportions.width-this.margins.left,e(window).scrollTop()+(e(window).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,e(a).width()-this.helperProportions.width-this.margins.left,(e(a).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=e(n.containment),s=i[0],s&&(t=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(t?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(t?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)
-},_convertPositionTo:function(e,t){t||(t=this.position);var i="absolute"===e?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:t.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:t.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(e,t){var i,s,n,a,o=this.options,r=this._isRootNode(this.scrollParent[0]),h=e.pageX,l=e.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),t&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,e.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),e.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),e.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),e.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),o.grid&&(n=o.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/o.grid[1])*o.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-o.grid[1]:n+o.grid[1]:n,a=o.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/o.grid[0])*o.grid[0]:this.originalPageX,h=i?a-this.offset.click.left>=i[0]||a-this.offset.click.left>i[2]?a:a-this.offset.click.left>=i[0]?a-o.grid[0]:a+o.grid[0]:a),"y"===o.axis&&(h=this.originalPageX),"x"===o.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_normalizeRightBottom:function(){"y"!==this.options.axis&&"auto"!==this.helper.css("right")&&(this.helper.width(this.helper.width()),this.helper.css("right","auto")),"x"!==this.options.axis&&"auto"!==this.helper.css("bottom")&&(this.helper.height(this.helper.height()),this.helper.css("bottom","auto"))},_trigger:function(t,i,s){return s=s||this._uiHash(),e.ui.plugin.call(this,t,[i,s,this],!0),/^(drag|start|stop)/.test(t)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),e.Widget.prototype._trigger.call(this,t,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),e.ui.plugin.add("draggable","connectToSortable",{start:function(t,i,s){var n=e.extend({},i,{item:s.element});s.sortables=[],e(s.options.connectToSortable).each(function(){var i=e(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",t,n))})},stop:function(t,i,s){var n=e.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,e.each(s.sortables,function(){var e=this;e.isOver?(e.isOver=0,s.cancelHelperRemoval=!0,e.cancelHelperRemoval=!1,e._storedCSS={position:e.placeholder.css("position"),top:e.placeholder.css("top"),left:e.placeholder.css("left")},e._mouseStop(t),e.options.helper=e.options._helper):(e.cancelHelperRemoval=!0,e._trigger("deactivate",t,n))})},drag:function(t,i,s){e.each(s.sortables,function(){var n=!1,a=this;a.positionAbs=s.positionAbs,a.helperProportions=s.helperProportions,a.offset.click=s.offset.click,a._intersectsWith(a.containerCache)&&(n=!0,e.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==a&&this._intersectsWith(this.containerCache)&&e.contains(a.element[0],this.element[0])&&(n=!1),n})),n?(a.isOver||(a.isOver=1,s._parent=i.helper.parent(),a.currentItem=i.helper.appendTo(a.element).data("ui-sortable-item",!0),a.options._helper=a.options.helper,a.options.helper=function(){return i.helper[0]},t.target=a.currentItem[0],a._mouseCapture(t,!0),a._mouseStart(t,!0,!0),a.offset.click.top=s.offset.click.top,a.offset.click.left=s.offset.click.left,a.offset.parent.left-=s.offset.parent.left-a.offset.parent.left,a.offset.parent.top-=s.offset.parent.top-a.offset.parent.top,s._trigger("toSortable",t),s.dropped=a.element,e.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,a.fromOutside=s),a.currentItem&&(a._mouseDrag(t),i.position=a.position)):a.isOver&&(a.isOver=0,a.cancelHelperRemoval=!0,a.options._revert=a.options.revert,a.options.revert=!1,a._trigger("out",t,a._uiHash(a)),a._mouseStop(t,!0),a.options.revert=a.options._revert,a.options.helper=a.options._helper,a.placeholder&&a.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(t),i.position=s._generatePosition(t,!0),s._trigger("fromSortable",t),s.dropped=!1,e.each(s.sortables,function(){this.refreshPositions()}))})}}),e.ui.plugin.add("draggable","cursor",{start:function(t,i,s){var n=e("body"),a=s.options;n.css("cursor")&&(a._cursor=n.css("cursor")),n.css("cursor",a.cursor)},stop:function(t,i,s){var n=s.options;n._cursor&&e("body").css("cursor",n._cursor)}}),e.ui.plugin.add("draggable","opacity",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("opacity")&&(a._opacity=n.css("opacity")),n.css("opacity",a.opacity)},stop:function(t,i,s){var n=s.options;n._opacity&&e(i.helper).css("opacity",n._opacity)}}),e.ui.plugin.add("draggable","scroll",{start:function(e,t,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(t,i,s){var n=s.options,a=!1,o=s.scrollParentNotHidden[0],r=s.document[0];o!==r&&"HTML"!==o.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+o.offsetHeight-t.pageY<n.scrollSensitivity?o.scrollTop=a=o.scrollTop+n.scrollSpeed:t.pageY-s.overflowOffset.top<n.scrollSensitivity&&(o.scrollTop=a=o.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+o.offsetWidth-t.pageX<n.scrollSensitivity?o.scrollLeft=a=o.scrollLeft+n.scrollSpeed:t.pageX-s.overflowOffset.left<n.scrollSensitivity&&(o.scrollLeft=a=o.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(t.pageY-e(r).scrollTop()<n.scrollSensitivity?a=e(r).scrollTop(e(r).scrollTop()-n.scrollSpeed):e(window).height()-(t.pageY-e(r).scrollTop())<n.scrollSensitivity&&(a=e(r).scrollTop(e(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(t.pageX-e(r).scrollLeft()<n.scrollSensitivity?a=e(r).scrollLeft(e(r).scrollLeft()-n.scrollSpeed):e(window).width()-(t.pageX-e(r).scrollLeft())<n.scrollSensitivity&&(a=e(r).scrollLeft(e(r).scrollLeft()+n.scrollSpeed)))),a!==!1&&e.ui.ddmanager&&!n.dropBehaviour&&e.ui.ddmanager.prepareOffsets(s,t)}}),e.ui.plugin.add("draggable","snap",{start:function(t,i,s){var n=s.options;s.snapElements=[],e(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var t=e(this),i=t.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:t.outerWidth(),height:t.outerHeight(),top:i.top,left:i.left})})},drag:function(t,i,s){var n,a,o,r,h,l,u,d,c,p,f=s.options,m=f.snapTolerance,g=i.offset.left,v=g+s.helperProportions.width,y=i.offset.top,b=y+s.helperProportions.height;for(c=s.snapElements.length-1;c>=0;c--)h=s.snapElements[c].left-s.margins.left,l=h+s.snapElements[c].width,u=s.snapElements[c].top-s.margins.top,d=u+s.snapElements[c].height,h-m>v||g>l+m||u-m>b||y>d+m||!e.contains(s.snapElements[c].item.ownerDocument,s.snapElements[c].item)?(s.snapElements[c].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=!1):("inner"!==f.snapMode&&(n=m>=Math.abs(u-b),a=m>=Math.abs(d-y),o=m>=Math.abs(h-v),r=m>=Math.abs(l-g),n&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.top=s._convertPositionTo("relative",{top:d,left:0}).top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left)),p=n||a||o||r,"outer"!==f.snapMode&&(n=m>=Math.abs(u-y),a=m>=Math.abs(d-b),o=m>=Math.abs(h-g),r=m>=Math.abs(l-v),n&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.top=s._convertPositionTo("relative",{top:d-s.helperProportions.height,left:0}).top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left)),!s.snapElements[c].snapping&&(n||a||o||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=n||a||o||r||p)}}),e.ui.plugin.add("draggable","stack",{start:function(t,i,s){var n,a=s.options,o=e.makeArray(e(a.stack)).sort(function(t,i){return(parseInt(e(t).css("zIndex"),10)||0)-(parseInt(e(i).css("zIndex"),10)||0)});o.length&&(n=parseInt(e(o[0]).css("zIndex"),10)||0,e(o).each(function(t){e(this).css("zIndex",n+t)}),this.css("zIndex",n+o.length))}}),e.ui.plugin.add("draggable","zIndex",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("zIndex")&&(a._zIndex=n.css("zIndex")),n.css("zIndex",a.zIndex)},stop:function(t,i,s){var n=s.options;n._zIndex&&e(i.helper).css("zIndex",n._zIndex)}}),e.ui.draggable,e.widget("ui.resizable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(e){return parseInt(e,10)||0},_isNumber:function(e){return!isNaN(parseInt(e,10))},_hasScroll:function(t,i){if("hidden"===e(t).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return t[s]>0?!0:(t[s]=1,n=t[s]>0,t[s]=0,n)},_create:function(){var t,i,s,n,a,o=this,r=this.options;if(this.element.addClass("ui-resizable"),e.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(e("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(e(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=e(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),t=this.handles.split(","),this.handles={},i=0;t.length>i;i++)s=e.trim(t[i]),a="ui-resizable-"+s,n=e("<div class='ui-resizable-handle "+a+"'></div>"),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(t){var i,s,n,a;t=t||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=e(this.handles[i]),this._on(this.handles[i],{mousedown:o._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=e(this.handles[i],this.element),a=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),t.css(n,a),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.mouseover(function(){o.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),o.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(e(this).removeClass("ui-resizable-autohide"),o._handles.show())}).mouseleave(function(){r.disabled||o.resizing||(e(this).addClass("ui-resizable-autohide"),o._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t,i=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),t=this.element,this.originalElement.css({position:t.css("position"),width:t.outerWidth(),height:t.outerHeight(),top:t.css("top"),left:t.css("left")}).insertAfter(t),t.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(t){var i,s,n=!1;for(i in this.handles)s=e(this.handles[i])[0],(s===t.target||e.contains(s,t.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(t){var i,s,n,a=this.options,o=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),a.containment&&(i+=e(a.containment).scrollLeft()||0,s+=e(a.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:o.width(),height:o.height()},this.originalSize=this._helper?{width:o.outerWidth(),height:o.outerHeight()}:{width:o.width(),height:o.height()},this.sizeDiff={width:o.outerWidth()-o.width(),height:o.outerHeight()-o.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio="number"==typeof a.aspectRatio?a.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=e(".ui-resizable-"+this.axis).css("cursor"),e("body").css("cursor","auto"===n?this.axis+"-resize":n),o.addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var i,s,n=this.originalMousePosition,a=this.axis,o=t.pageX-n.left||0,r=t.pageY-n.top||0,h=this._change[a];return this._updatePrevProperties(),h?(i=h.apply(this,[t,o,r]),this._updateVirtualBoundaries(t.shiftKey),(this._aspectRatio||t.shiftKey)&&(i=this._updateRatio(i,t)),i=this._respectSize(i,t),this._updateCache(i),this._propagate("resize",t),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),e.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",t,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(t){this.resizing=!1;var i,s,n,a,o,r,h,l=this.options,u=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:u.sizeDiff.height,a=s?0:u.sizeDiff.width,o={width:u.helper.width()-a,height:u.helper.height()-n},r=parseInt(u.element.css("left"),10)+(u.position.left-u.originalPosition.left)||null,h=parseInt(u.element.css("top"),10)+(u.position.top-u.originalPosition.top)||null,l.animate||this.element.css(e.extend(o,{top:h,left:r})),u.helper.height(u.size.height),u.helper.width(u.size.width),this._helper&&!l.animate&&this._proportionallyResize()),e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var e={};return this.position.top!==this.prevPosition.top&&(e.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(e.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(e.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(e.height=this.size.height+"px"),this.helper.css(e),e},_updateVirtualBoundaries:function(e){var t,i,s,n,a,o=this.options;a={minWidth:this._isNumber(o.minWidth)?o.minWidth:0,maxWidth:this._isNumber(o.maxWidth)?o.maxWidth:1/0,minHeight:this._isNumber(o.minHeight)?o.minHeight:0,maxHeight:this._isNumber(o.maxHeight)?o.maxHeight:1/0},(this._aspectRatio||e)&&(t=a.minHeight*this.aspectRatio,s=a.minWidth/this.aspectRatio,i=a.maxHeight*this.aspectRatio,n=a.maxWidth/this.aspectRatio,t>a.minWidth&&(a.minWidth=t),s>a.minHeight&&(a.minHeight=s),a.maxWidth>i&&(a.maxWidth=i),a.maxHeight>n&&(a.maxHeight=n)),this._vBoundaries=a},_updateCache:function(e){this.offset=this.helper.offset(),this._isNumber(e.left)&&(this.position.left=e.left),this._isNumber(e.top)&&(this.position.top=e.top),this._isNumber(e.height)&&(this.size.height=e.height),this._isNumber(e.width)&&(this.size.width=e.width)},_updateRatio:function(e){var t=this.position,i=this.size,s=this.axis;return this._isNumber(e.height)?e.width=e.height*this.aspectRatio:this._isNumber(e.width)&&(e.height=e.width/this.aspectRatio),"sw"===s&&(e.left=t.left+(i.width-e.width),e.top=null),"nw"===s&&(e.top=t.top+(i.height-e.height),e.left=t.left+(i.width-e.width)),e},_respectSize:function(e){var t=this._vBoundaries,i=this.axis,s=this._isNumber(e.width)&&t.maxWidth&&t.maxWidth<e.width,n=this._isNumber(e.height)&&t.maxHeight&&t.maxHeight<e.height,a=this._isNumber(e.width)&&t.minWidth&&t.minWidth>e.width,o=this._isNumber(e.height)&&t.minHeight&&t.minHeight>e.height,r=this.originalPosition.left+this.originalSize.width,h=this.position.top+this.size.height,l=/sw|nw|w/.test(i),u=/nw|ne|n/.test(i);return a&&(e.width=t.minWidth),o&&(e.height=t.minHeight),s&&(e.width=t.maxWidth),n&&(e.height=t.maxHeight),a&&l&&(e.left=r-t.minWidth),s&&l&&(e.left=r-t.maxWidth),o&&u&&(e.top=h-t.minHeight),n&&u&&(e.top=h-t.maxHeight),e.width||e.height||e.left||!e.top?e.width||e.height||e.top||!e.left||(e.left=null):e.top=null,e},_getPaddingPlusBorderDimensions:function(e){for(var t=0,i=[],s=[e.css("borderTopWidth"),e.css("borderRightWidth"),e.css("borderBottomWidth"),e.css("borderLeftWidth")],n=[e.css("paddingTop"),e.css("paddingRight"),e.css("paddingBottom"),e.css("paddingLeft")];4>t;t++)i[t]=parseInt(s[t],10)||0,i[t]+=parseInt(n[t],10)||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var e,t=0,i=this.helper||this.element;this._proportionallyResizeElements.length>t;t++)e=this._proportionallyResizeElements[t],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(e)),e.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var t=this.element,i=this.options;this.elementOffset=t.offset(),this._helper?(this.helper=this.helper||e("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(e,t){return{width:this.originalSize.width+t}},w:function(e,t){var i=this.originalSize,s=this.originalPosition;return{left:s.left+t,width:i.width-t}},n:function(e,t,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(e,t,i){return{height:this.originalSize.height+i}},se:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},sw:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,i,s]))},ne:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},nw:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,i,s]))}},_propagate:function(t,i){e.ui.plugin.call(this,t,[i,this.ui()]),"resize"!==t&&this._trigger(t,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),e.ui.plugin.add("resizable","animate",{stop:function(t){var i=e(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,a=n.length&&/textarea/i.test(n[0].nodeName),o=a&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=a?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-o},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,u=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(e.extend(h,u&&l?{top:u,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&e(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(){var t,i,s,n,a,o,r,h=e(this).resizable("instance"),l=h.options,u=h.element,d=l.containment,c=d instanceof e?d.get(0):/parent/.test(d)?u.parent().get(0):d;c&&(h.containerElement=e(c),/document/.test(d)||d===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}):(t=e(c),i=[],e(["Top","Right","Left","Bottom"]).each(function(e,s){i[e]=h._num(t.css("padding"+s))}),h.containerOffset=t.offset(),h.containerPosition=t.position(),h.containerSize={height:t.innerHeight()-i[3],width:t.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,a=h.containerSize.width,o=h._hasScroll(c,"left")?c.scrollWidth:a,r=h._hasScroll(c)?c.scrollHeight:n,h.parentData={element:c,left:s.left,top:s.top,width:o,height:r}))},resize:function(t){var i,s,n,a,o=e(this).resizable("instance"),r=o.options,h=o.containerOffset,l=o.position,u=o._aspectRatio||t.shiftKey,d={top:0,left:0},c=o.containerElement,p=!0;c[0]!==document&&/static/.test(c.css("position"))&&(d=h),l.left<(o._helper?h.left:0)&&(o.size.width=o.size.width+(o._helper?o.position.left-h.left:o.position.left-d.left),u&&(o.size.height=o.size.width/o.aspectRatio,p=!1),o.position.left=r.helper?h.left:0),l.top<(o._helper?h.top:0)&&(o.size.height=o.size.height+(o._helper?o.position.top-h.top:o.position.top),u&&(o.size.width=o.size.height*o.aspectRatio,p=!1),o.position.top=o._helper?h.top:0),n=o.containerElement.get(0)===o.element.parent().get(0),a=/relative|absolute/.test(o.containerElement.css("position")),n&&a?(o.offset.left=o.parentData.left+o.position.left,o.offset.top=o.parentData.top+o.position.top):(o.offset.left=o.element.offset().left,o.offset.top=o.element.offset().top),i=Math.abs(o.sizeDiff.width+(o._helper?o.offset.left-d.left:o.offset.left-h.left)),s=Math.abs(o.sizeDiff.height+(o._helper?o.offset.top-d.top:o.offset.top-h.top)),i+o.size.width>=o.parentData.width&&(o.size.width=o.parentData.width-i,u&&(o.size.height=o.size.width/o.aspectRatio,p=!1)),s+o.size.height>=o.parentData.height&&(o.size.height=o.parentData.height-s,u&&(o.size.width=o.size.height*o.aspectRatio,p=!1)),p||(o.position.left=o.prevPosition.left,o.position.top=o.prevPosition.top,o.size.width=o.prevSize.width,o.size.height=o.prevSize.height)},stop:function(){var t=e(this).resizable("instance"),i=t.options,s=t.containerOffset,n=t.containerPosition,a=t.containerElement,o=e(t.helper),r=o.offset(),h=o.outerWidth()-t.sizeDiff.width,l=o.outerHeight()-t.sizeDiff.height;t._helper&&!i.animate&&/relative/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l}),t._helper&&!i.animate&&/static/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),e.ui.plugin.add("resizable","alsoResize",{start:function(){var t=e(this).resizable("instance"),i=t.options;e(i.alsoResize).each(function(){var t=e(this);t.data("ui-resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})},resize:function(t,i){var s=e(this).resizable("instance"),n=s.options,a=s.originalSize,o=s.originalPosition,r={height:s.size.height-a.height||0,width:s.size.width-a.width||0,top:s.position.top-o.top||0,left:s.position.left-o.left||0};e(n.alsoResize).each(function(){var t=e(this),s=e(this).data("ui-resizable-alsoresize"),n={},a=t.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(a,function(e,t){var i=(s[t]||0)+(r[t]||0);i&&i>=0&&(n[t]=i||null)}),t.css(n)})},stop:function(){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","ghost",{start:function(){var t=e(this).resizable("instance"),i=t.options,s=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),t.ghost.appendTo(t.helper)},resize:function(){var t=e(this).resizable("instance");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=e(this).resizable("instance");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(){var t,i=e(this).resizable("instance"),s=i.options,n=i.size,a=i.originalSize,o=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,u=h[1]||1,d=Math.round((n.width-a.width)/l)*l,c=Math.round((n.height-a.height)/u)*u,p=a.width+d,f=a.height+c,m=s.maxWidth&&p>s.maxWidth,g=s.maxHeight&&f>s.maxHeight,v=s.minWidth&&s.minWidth>p,y=s.minHeight&&s.minHeight>f;s.grid=h,v&&(p+=l),y&&(f+=u),m&&(p-=l),g&&(f-=u),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=o.top-c):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=o.left-d):((0>=f-u||0>=p-l)&&(t=i._getPaddingPlusBorderDimensions(this)),f-u>0?(i.size.height=f,i.position.top=o.top-c):(f=u-t.height,i.size.height=f,i.position.top=o.top+a.height-f),p-l>0?(i.size.width=p,i.position.left=o.left-d):(p=l-t.width,i.size.width=p,i.position.left=o.left+a.width-p))}}),e.ui.resizable,e.widget("ui.dialog",{version:"1.11.4",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"Close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var i=e(this).css(t).offset().top;0>i&&e(this).css("top",t.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&e.fn.draggable&&this._makeDraggable(),this.options.resizable&&e.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var t=this.options.appendTo;return t&&(t.jquery||t.nodeType)?e(t):this.document.find(t||"body").eq(0)},_destroy:function(){var e,t=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),e=t.parent.children().eq(t.index),e.length&&e[0]!==this.element[0]?e.before(this.element):t.parent.append(this.element)},widget:function(){return this.uiDialog},disable:e.noop,enable:e.noop,close:function(t){var i,s=this;if(this._isOpen&&this._trigger("beforeClose",t)!==!1){if(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),!this.opener.filter(":focusable").focus().length)try{i=this.document[0].activeElement,i&&"body"!==i.nodeName.toLowerCase()&&e(i).blur()}catch(n){}this._hide(this.uiDialog,this.options.hide,function(){s._trigger("close",t)})}},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+e(this).css("z-index")}).get(),a=Math.max.apply(null,n);return a>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",a+1),s=!0),s&&!i&&this._trigger("focus",t),s},open:function(){var t=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=e(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){t._focusTabbable(),t._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var e=this._focusedElement;e||(e=this.element.find("[autofocus]")),e.length||(e=this.element.find(":tabbable")),e.length||(e=this.uiDialogButtonPane.find(":tabbable")),e.length||(e=this.uiDialogTitlebarClose.filter(":tabbable")),e.length||(e=this.uiDialog),e.eq(0).focus()},_keepFocus:function(t){function i(){var t=this.document[0].activeElement,i=this.uiDialog[0]===t||e.contains(this.uiDialog[0],t);i||this._focusTabbable()}t.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=e("<div>").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(t){if(this.options.closeOnEscape&&!t.isDefaultPrevented()&&t.keyCode&&t.keyCode===e.ui.keyCode.ESCAPE)return t.preventDefault(),this.close(t),void 0;
-if(t.keyCode===e.ui.keyCode.TAB&&!t.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");t.target!==n[0]&&t.target!==this.uiDialog[0]||t.shiftKey?t.target!==s[0]&&t.target!==this.uiDialog[0]||!t.shiftKey||(this._delay(function(){n.focus()}),t.preventDefault()):(this._delay(function(){s.focus()}),t.preventDefault())}},mousedown:function(e){this._moveToTop(e)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var t;this.uiDialogTitlebar=e("<div>").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(t){e(t.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=e("<button type='button'></button>").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(e){e.preventDefault(),this.close(e)}}),t=e("<span>").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(t),this.uiDialog.attr({"aria-labelledby":t.attr("id")})},_title:function(e){this.options.title||e.html("&#160;"),e.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=e("<div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=e("<div>").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var t=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),e.isEmptyObject(i)||e.isArray(i)&&!i.length?(this.uiDialog.removeClass("ui-dialog-buttons"),void 0):(e.each(i,function(i,s){var n,a;s=e.isFunction(s)?{click:s,text:i}:s,s=e.extend({type:"button"},s),n=s.click,s.click=function(){n.apply(t.element[0],arguments)},a={icons:s.icons,text:s.showText},delete s.icons,delete s.showText,e("<button></button>",s).button(a).appendTo(t.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function t(e){return{position:e.position,offset:e.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){e(this).addClass("ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,t(n))},drag:function(e,s){i._trigger("drag",e,t(s))},stop:function(n,a){var o=a.offset.left-i.document.scrollLeft(),r=a.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(o>=0?"+":"")+o+" "+"top"+(r>=0?"+":"")+r,of:i.window},e(this).removeClass("ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,t(a))}})},_makeResizable:function(){function t(e){return{originalPosition:e.originalPosition,originalSize:e.originalSize,position:e.position,size:e.size}}var i=this,s=this.options,n=s.resizable,a=this.uiDialog.css("position"),o="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:o,start:function(s,n){e(this).addClass("ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,t(n))},resize:function(e,s){i._trigger("resize",e,t(s))},stop:function(n,a){var o=i.uiDialog.offset(),r=o.left-i.document.scrollLeft(),h=o.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(h>=0?"+":"")+h,of:i.window},e(this).removeClass("ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,t(a))}}).css("position",a)},_trackFocus:function(){this._on(this.widget(),{focusin:function(t){this._makeFocusTarget(),this._focusedElement=e(t.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var t=this._trackingInstances(),i=e.inArray(this,t);-1!==i&&t.splice(i,1)},_trackingInstances:function(){var e=this.document.data("ui-dialog-instances");return e||(e=[],this.document.data("ui-dialog-instances",e)),e},_minHeight:function(){var e=this.options;return"auto"===e.height?e.minHeight:Math.min(e.minHeight,e.height)},_position:function(){var e=this.uiDialog.is(":visible");e||this.uiDialog.show(),this.uiDialog.position(this.options.position),e||this.uiDialog.hide()},_setOptions:function(t){var i=this,s=!1,n={};e.each(t,function(e,t){i._setOption(e,t),e in i.sizeRelatedOptions&&(s=!0),e in i.resizableRelatedOptions&&(n[e]=t)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,t){var i,s,n=this.uiDialog;"dialogClass"===e&&n.removeClass(this.options.dialogClass).addClass(t),"disabled"!==e&&(this._super(e,t),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:""+t}),"draggable"===e&&(i=n.is(":data(ui-draggable)"),i&&!t&&n.draggable("destroy"),!i&&t&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(s=n.is(":data(ui-resizable)"),s&&!t&&n.resizable("destroy"),s&&"string"==typeof t&&n.resizable("option","handles",t),s||t===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var e,t,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),e=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),t=Math.max(0,s.minHeight-e),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-e):"none","auto"===s.height?this.element.css({minHeight:t,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-e)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var t=e(this);return e("<div>").css({position:"absolute",width:t.outerWidth(),height:t.outerHeight()}).appendTo(t.parent()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(t){return e(t.target).closest(".ui-dialog").length?!0:!!e(t.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var t=!0;this._delay(function(){t=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(e){t||this._allowInteraction(e)||(e.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=e("<div>").addClass("ui-widget-overlay ui-front").appendTo(this._appendTo()),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var e=this.document.data("ui-dialog-overlays")-1;e?this.document.data("ui-dialog-overlays",e):this.document.unbind("focusin").removeData("ui-dialog-overlays"),this.overlay.remove(),this.overlay=null}}}),e.widget("ui.droppable",{version:"1.11.4",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var t,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=e.isFunction(s)?s:function(e){return e.is(s)},this.proportions=function(){return arguments.length?(t=arguments[0],void 0):t?t:t={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this.element.addClass("ui-droppable")},_addToManager:function(t){e.ui.ddmanager.droppables[t]=e.ui.ddmanager.droppables[t]||[],e.ui.ddmanager.droppables[t].push(this)},_splice:function(e){for(var t=0;e.length>t;t++)e[t]===this&&e.splice(t,1)},_destroy:function(){var t=e.ui.ddmanager.droppables[this.options.scope];this._splice(t),this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(t,i){if("accept"===t)this.accept=e.isFunction(i)?i:function(e){return e.is(i)};else if("scope"===t){var s=e.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(t,i)},_activate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),i&&this._trigger("activate",t,this.ui(i))},_deactivate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),i&&this._trigger("deactivate",t,this.ui(i))},_over:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",t,this.ui(i)))},_out:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",t,this.ui(i)))},_drop:function(t,i){var s=i||e.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=e(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&e.ui.intersect(s,e.extend(i,{offset:i.element.offset()}),i.options.tolerance,t)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",t,this.ui(s)),this.element):!1):!1},ui:function(e){return{draggable:e.currentItem||e.element,helper:e.helper,position:e.position,offset:e.positionAbs}}}),e.ui.intersect=function(){function e(e,t,i){return e>=t&&t+i>e}return function(t,i,s,n){if(!i.offset)return!1;var a=(t.positionAbs||t.position.absolute).left+t.margins.left,o=(t.positionAbs||t.position.absolute).top+t.margins.top,r=a+t.helperProportions.width,h=o+t.helperProportions.height,l=i.offset.left,u=i.offset.top,d=l+i.proportions().width,c=u+i.proportions().height;switch(s){case"fit":return a>=l&&d>=r&&o>=u&&c>=h;case"intersect":return a+t.helperProportions.width/2>l&&d>r-t.helperProportions.width/2&&o+t.helperProportions.height/2>u&&c>h-t.helperProportions.height/2;case"pointer":return e(n.pageY,u,i.proportions().height)&&e(n.pageX,l,i.proportions().width);case"touch":return(o>=u&&c>=o||h>=u&&c>=h||u>o&&h>c)&&(a>=l&&d>=a||r>=l&&d>=r||l>a&&r>d);default:return!1}}}(),e.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(t,i){var s,n,a=e.ui.ddmanager.droppables[t.options.scope]||[],o=i?i.type:null,r=(t.currentItem||t.element).find(":data(ui-droppable)").addBack();e:for(s=0;a.length>s;s++)if(!(a[s].options.disabled||t&&!a[s].accept.call(a[s].element[0],t.currentItem||t.element))){for(n=0;r.length>n;n++)if(r[n]===a[s].element[0]){a[s].proportions().height=0;continue e}a[s].visible="none"!==a[s].element.css("display"),a[s].visible&&("mousedown"===o&&a[s]._activate.call(a[s],i),a[s].offset=a[s].element.offset(),a[s].proportions({width:a[s].element[0].offsetWidth,height:a[s].element[0].offsetHeight}))}},drop:function(t,i){var s=!1;return e.each((e.ui.ddmanager.droppables[t.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&e.ui.intersect(t,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],t.currentItem||t.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(t,i){t.element.parentsUntil("body").bind("scroll.droppable",function(){t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)})},drag:function(t,i){t.options.refreshPositions&&e.ui.ddmanager.prepareOffsets(t,i),e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,a,o=e.ui.intersect(t,this,this.options.tolerance,i),r=!o&&this.isover?"isout":o&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,a=this.element.parents(":data(ui-droppable)").filter(function(){return e(this).droppable("instance").options.scope===n}),a.length&&(s=e(a[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(t,i){t.element.parentsUntil("body").unbind("scroll.droppable"),t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)}},e.ui.droppable;var y="ui-effects-",b=e;e.effects={effect:{}},function(e,t){function i(e,t,i){var s=d[t.type]||{};return null==e?i||!t.def?null:t.def:(e=s.floor?~~e:parseFloat(e),isNaN(e)?t.def:s.mod?(e+s.mod)%s.mod:0>e?0:e>s.max?s.max:e)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(e,a){var o,r=a.re.exec(i),h=r&&a.parse(r),l=a.space||"rgba";return h?(o=s[l](h),s[u[l].cache]=o[u[l].cache],n=s._rgba=o._rgba,!1):t}),n.length?("0,0,0,0"===n.join()&&e.extend(n,a.transparent),s):a[i]}function n(e,t,i){return i=(i+1)%1,1>6*i?e+6*(t-e)*i:1>2*i?t:2>3*i?e+6*(t-e)*(2/3-i):e}var a,o="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1],e[2],e[3],e[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[2.55*e[1],2.55*e[2],2.55*e[3],e[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(e){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(e){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(e){return[e[1],e[2]/100,e[3]/100,e[4]]}}],l=e.Color=function(t,i,s,n){return new e.Color.fn.parse(t,i,s,n)},u={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},d={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},c=l.support={},p=e("<p>")[0],f=e.each;p.style.cssText="background-color:rgba(1,1,1,.5)",c.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(u,function(e,t){t.cache="_"+e,t.props.alpha={idx:3,type:"percent",def:1}}),l.fn=e.extend(l.prototype,{parse:function(n,o,r,h){if(n===t)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=e(n).css(o),o=t);var d=this,c=e.type(n),p=this._rgba=[];return o!==t&&(n=[n,o,r,h],c="array"),"string"===c?this.parse(s(n)||a._default):"array"===c?(f(u.rgba.props,function(e,t){p[t.idx]=i(n[t.idx],t)}),this):"object"===c?(n instanceof l?f(u,function(e,t){n[t.cache]&&(d[t.cache]=n[t.cache].slice())}):f(u,function(t,s){var a=s.cache;f(s.props,function(e,t){if(!d[a]&&s.to){if("alpha"===e||null==n[e])return;d[a]=s.to(d._rgba)}d[a][t.idx]=i(n[e],t,!0)}),d[a]&&0>e.inArray(null,d[a].slice(0,3))&&(d[a][3]=1,s.from&&(d._rgba=s.from(d[a])))}),this):t},is:function(e){var i=l(e),s=!0,n=this;return f(u,function(e,a){var o,r=i[a.cache];return r&&(o=n[a.cache]||a.to&&a.to(n._rgba)||[],f(a.props,function(e,i){return null!=r[i.idx]?s=r[i.idx]===o[i.idx]:t})),s}),s},_space:function(){var e=[],t=this;return f(u,function(i,s){t[s.cache]&&e.push(i)}),e.pop()},transition:function(e,t){var s=l(e),n=s._space(),a=u[n],o=0===this.alpha()?l("transparent"):this,r=o[a.cache]||a.to(o._rgba),h=r.slice();return s=s[a.cache],f(a.props,function(e,n){var a=n.idx,o=r[a],l=s[a],u=d[n.type]||{};null!==l&&(null===o?h[a]=l:(u.mod&&(l-o>u.mod/2?o+=u.mod:o-l>u.mod/2&&(o-=u.mod)),h[a]=i((l-o)*t+o,n)))}),this[n](h)},blend:function(t){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(t)._rgba;return l(e.map(i,function(e,t){return(1-s)*n[t]+s*e}))},toRgbaString:function(){var t="rgba(",i=e.map(this._rgba,function(e,t){return null==e?t>2?1:0:e});return 1===i[3]&&(i.pop(),t="rgb("),t+i.join()+")"},toHslaString:function(){var t="hsla(",i=e.map(this.hsla(),function(e,t){return null==e&&(e=t>2?1:0),t&&3>t&&(e=Math.round(100*e)+"%"),e});return 1===i[3]&&(i.pop(),t="hsl("),t+i.join()+")"},toHexString:function(t){var i=this._rgba.slice(),s=i.pop();return t&&i.push(~~(255*s)),"#"+e.map(i,function(e){return e=(e||0).toString(16),1===e.length?"0"+e:e}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,u.hsla.to=function(e){if(null==e[0]||null==e[1]||null==e[2])return[null,null,null,e[3]];var t,i,s=e[0]/255,n=e[1]/255,a=e[2]/255,o=e[3],r=Math.max(s,n,a),h=Math.min(s,n,a),l=r-h,u=r+h,d=.5*u;return t=h===r?0:s===r?60*(n-a)/l+360:n===r?60*(a-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=d?l/u:l/(2-u),[Math.round(t)%360,i,d,null==o?1:o]},u.hsla.from=function(e){if(null==e[0]||null==e[1]||null==e[2])return[null,null,null,e[3]];var t=e[0]/360,i=e[1],s=e[2],a=e[3],o=.5>=s?s*(1+i):s+i-s*i,r=2*s-o;return[Math.round(255*n(r,o,t+1/3)),Math.round(255*n(r,o,t)),Math.round(255*n(r,o,t-1/3)),a]},f(u,function(s,n){var a=n.props,o=n.cache,h=n.to,u=n.from;l.fn[s]=function(s){if(h&&!this[o]&&(this[o]=h(this._rgba)),s===t)return this[o].slice();var n,r=e.type(s),d="array"===r||"object"===r?s:arguments,c=this[o].slice();return f(a,function(e,t){var s=d["object"===r?e:t.idx];null==s&&(s=c[t.idx]),c[t.idx]=i(s,t)}),u?(n=l(u(c)),n[o]=c,n):l(c)},f(a,function(t,i){l.fn[t]||(l.fn[t]=function(n){var a,o=e.type(n),h="alpha"===t?this._hsla?"hsla":"rgba":s,l=this[h](),u=l[i.idx];return"undefined"===o?u:("function"===o&&(n=n.call(this,u),o=e.type(n)),null==n&&i.empty?this:("string"===o&&(a=r.exec(n),a&&(n=u+parseFloat(a[2])*("+"===a[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(t){var i=t.split(" ");f(i,function(t,i){e.cssHooks[i]={set:function(t,n){var a,o,r="";if("transparent"!==n&&("string"!==e.type(n)||(a=s(n)))){if(n=l(a||n),!c.rgba&&1!==n._rgba[3]){for(o="backgroundColor"===i?t.parentNode:t;(""===r||"transparent"===r)&&o&&o.style;)try{r=e.css(o,"backgroundColor"),o=o.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{t.style[i]=n}catch(h){}}},e.fx.step[i]=function(t){t.colorInit||(t.start=l(t.elem,i),t.end=l(t.end),t.colorInit=!0),e.cssHooks[i].set(t.elem,t.start.transition(t.end,t.pos))}})},l.hook(o),e.cssHooks.borderColor={expand:function(e){var t={};return f(["Top","Right","Bottom","Left"],function(i,s){t["border"+s+"Color"]=e}),t}},a=e.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(b),function(){function t(t){var i,s,n=t.ownerDocument.defaultView?t.ownerDocument.defaultView.getComputedStyle(t,null):t.currentStyle,a={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(a[e.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(a[i]=n[i]);return a}function i(t,i){var s,a,o={};for(s in i)a=i[s],t[s]!==a&&(n[s]||(e.fx.step[s]||!isNaN(parseFloat(a)))&&(o[s]=a));return o}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};e.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(t,i){e.fx.step[i]=function(e){("none"!==e.end&&!e.setAttr||1===e.pos&&!e.setAttr)&&(b.style(e.elem,i,e.end),e.setAttr=!0)}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e.effects.animateClass=function(n,a,o,r){var h=e.speed(a,o,r);return this.queue(function(){var a,o=e(this),r=o.attr("class")||"",l=h.children?o.find("*").addBack():o;l=l.map(function(){var i=e(this);return{el:i,start:t(this)}}),a=function(){e.each(s,function(e,t){n[t]&&o[t+"Class"](n[t])})},a(),l=l.map(function(){return this.end=t(this.el[0]),this.diff=i(this.start,this.end),this}),o.attr("class",r),l=l.map(function(){var t=this,i=e.Deferred(),s=e.extend({},h,{queue:!1,complete:function(){i.resolve(t)}});return this.el.animate(this.diff,s),i.promise()}),e.when.apply(e,l.get()).done(function(){a(),e.each(arguments,function(){var t=this.el;e.each(this.diff,function(e){t.css(e,"")})}),h.complete.call(o[0])})})},e.fn.extend({addClass:function(t){return function(i,s,n,a){return s?e.effects.animateClass.call(this,{add:i},s,n,a):t.apply(this,arguments)}}(e.fn.addClass),removeClass:function(t){return function(i,s,n,a){return arguments.length>1?e.effects.animateClass.call(this,{remove:i},s,n,a):t.apply(this,arguments)}}(e.fn.removeClass),toggleClass:function(t){return function(i,s,n,a,o){return"boolean"==typeof s||void 0===s?n?e.effects.animateClass.call(this,s?{add:i}:{remove:i},n,a,o):t.apply(this,arguments):e.effects.animateClass.call(this,{toggle:i},s,n,a)}}(e.fn.toggleClass),switchClass:function(t,i,s,n,a){return e.effects.animateClass.call(this,{add:i,remove:t},s,n,a)}})}(),function(){function t(t,i,s,n){return e.isPlainObject(t)&&(i=t,t=t.effect),t={effect:t},null==i&&(i={}),e.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||e.fx.speeds[i])&&(n=s,s=i,i={}),e.isFunction(s)&&(n=s,s=null),i&&e.extend(t,i),s=s||i.duration,t.duration=e.fx.off?0:"number"==typeof s?s:s in e.fx.speeds?e.fx.speeds[s]:e.fx.speeds._default,t.complete=n||i.complete,t}function i(t){return!t||"number"==typeof t||e.fx.speeds[t]?!0:"string"!=typeof t||e.effects.effect[t]?e.isFunction(t)?!0:"object"!=typeof t||t.effect?!1:!0:!0}e.extend(e.effects,{version:"1.11.4",save:function(e,t){for(var i=0;t.length>i;i++)null!==t[i]&&e.data(y+t[i],e[0].style[t[i]])},restore:function(e,t){var i,s;for(s=0;t.length>s;s++)null!==t[s]&&(i=e.data(y+t[s]),void 0===i&&(i=""),e.css(t[s],i))},setMode:function(e,t){return"toggle"===t&&(t=e.is(":hidden")?"show":"hide"),t},getBaseline:function(e,t){var i,s;switch(e[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=e[0]/t.height}switch(e[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=e[1]/t.width}return{x:s,y:i}},createWrapper:function(t){if(t.parent().is(".ui-effects-wrapper"))return t.parent();var i={width:t.outerWidth(!0),height:t.outerHeight(!0),"float":t.css("float")},s=e("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:t.width(),height:t.height()},a=document.activeElement;try{a.id}catch(o){a=document.body}return t.wrap(s),(t[0]===a||e.contains(t[0],a))&&e(a).focus(),s=t.parent(),"static"===t.css("position")?(s.css({position:"relative"}),t.css({position:"relative"})):(e.extend(i,{position:t.css("position"),zIndex:t.css("z-index")}),e.each(["top","left","bottom","right"],function(e,s){i[s]=t.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),t.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),t.css(n),s.css(i).show()},removeWrapper:function(t){var i=document.activeElement;return t.parent().is(".ui-effects-wrapper")&&(t.parent().replaceWith(t),(t[0]===i||e.contains(t[0],i))&&e(i).focus()),t},setTransition:function(t,i,s,n){return n=n||{},e.each(i,function(e,i){var a=t.cssUnit(i);a[0]>0&&(n[i]=a[0]*s+a[1])}),n}}),e.fn.extend({effect:function(){function i(t){function i(){e.isFunction(a)&&a.call(n[0]),e.isFunction(t)&&t()}var n=e(this),a=s.complete,r=s.mode;(n.is(":hidden")?"hide"===r:"show"===r)?(n[r](),i()):o.call(n[0],s,i)}var s=t.apply(this,arguments),n=s.mode,a=s.queue,o=e.effects.effect[s.effect];return e.fx.off||!o?n?this[n](s.duration,s.complete):this.each(function(){s.complete&&s.complete.call(this)}):a===!1?this.each(i):this.queue(a||"fx",i)},show:function(e){return function(s){if(i(s))return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="show",this.effect.call(this,n)}}(e.fn.show),hide:function(e){return function(s){if(i(s))return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(e.fn.hide),toggle:function(e){return function(s){if(i(s)||"boolean"==typeof s)return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(e.fn.toggle),cssUnit:function(t){var i=this.css(t),s=[];return e.each(["em","px","%","pt"],function(e,t){i.indexOf(t)>0&&(s=[parseFloat(i),t])}),s}})}(),function(){var t={};e.each(["Quad","Cubic","Quart","Quint","Expo"],function(e,i){t[i]=function(t){return Math.pow(t,e+2)}}),e.extend(t,{Sine:function(e){return 1-Math.cos(e*Math.PI/2)},Circ:function(e){return 1-Math.sqrt(1-e*e)},Elastic:function(e){return 0===e||1===e?e:-Math.pow(2,8*(e-1))*Math.sin((80*(e-1)-7.5)*Math.PI/15)},Back:function(e){return e*e*(3*e-2)},Bounce:function(e){for(var t,i=4;((t=Math.pow(2,--i))-1)/11>e;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*t-2)/22-e,2)}}),e.each(t,function(t,i){e.easing["easeIn"+t]=i,e.easing["easeOut"+t]=function(e){return 1-i(1-e)},e.easing["easeInOut"+t]=function(e){return.5>e?i(2*e)/2:1-i(-2*e+2)/2}})}(),e.effects,e.effects.effect.blind=function(t,i){var s,n,a,o=e(this),r=/up|down|vertical/,h=/up|left|vertical|horizontal/,l=["position","top","bottom","left","right","height","width"],u=e.effects.setMode(o,t.mode||"hide"),d=t.direction||"up",c=r.test(d),p=c?"height":"width",f=c?"top":"left",m=h.test(d),g={},v="show"===u;o.parent().is(".ui-effects-wrapper")?e.effects.save(o.parent(),l):e.effects.save(o,l),o.show(),s=e.effects.createWrapper(o).css({overflow:"hidden"}),n=s[p](),a=parseFloat(s.css(f))||0,g[p]=v?n:0,m||(o.css(c?"bottom":"right",0).css(c?"top":"left","auto").css({position:"absolute"}),g[f]=v?a:n+a),v&&(s.css(p,0),m||s.css(f,a+n)),s.animate(g,{duration:t.duration,easing:t.easing,queue:!1,complete:function(){"hide"===u&&o.hide(),e.effects.restore(o,l),e.effects.removeWrapper(o),i()}})},e.effects.effect.bounce=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","height","width"],h=e.effects.setMode(o,t.mode||"effect"),l="hide"===h,u="show"===h,d=t.direction||"up",c=t.distance,p=t.times||5,f=2*p+(u||l?1:0),m=t.duration/f,g=t.easing,v="up"===d||"down"===d?"top":"left",y="up"===d||"left"===d,b=o.queue(),_=b.length;for((u||l)&&r.push("opacity"),e.effects.save(o,r),o.show(),e.effects.createWrapper(o),c||(c=o["top"===v?"outerHeight":"outerWidth"]()/3),u&&(a={opacity:1},a[v]=0,o.css("opacity",0).css(v,y?2*-c:2*c).animate(a,m,g)),l&&(c/=Math.pow(2,p-1)),a={},a[v]=0,s=0;p>s;s++)n={},n[v]=(y?"-=":"+=")+c,o.animate(n,m,g).animate(a,m,g),c=l?2*c:c/2;l&&(n={opacity:0},n[v]=(y?"-=":"+=")+c,o.animate(n,m,g)),o.queue(function(){l&&o.hide(),e.effects.restore(o,r),e.effects.removeWrapper(o),i()}),_>1&&b.splice.apply(b,[1,0].concat(b.splice(_,f+1))),o.dequeue()},e.effects.effect.clip=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","height","width"],h=e.effects.setMode(o,t.mode||"hide"),l="show"===h,u=t.direction||"vertical",d="vertical"===u,c=d?"height":"width",p=d?"top":"left",f={};e.effects.save(o,r),o.show(),s=e.effects.createWrapper(o).css({overflow:"hidden"}),n="IMG"===o[0].tagName?s:o,a=n[c](),l&&(n.css(c,0),n.css(p,a/2)),f[c]=l?a:0,f[p]=l?0:a/2,n.animate(f,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){l||o.hide(),e.effects.restore(o,r),e.effects.removeWrapper(o),i()}})},e.effects.effect.drop=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","opacity","height","width"],o=e.effects.setMode(n,t.mode||"hide"),r="show"===o,h=t.direction||"left",l="up"===h||"down"===h?"top":"left",u="up"===h||"left"===h?"pos":"neg",d={opacity:r?1:0};e.effects.save(n,a),n.show(),e.effects.createWrapper(n),s=t.distance||n["top"===l?"outerHeight":"outerWidth"](!0)/2,r&&n.css("opacity",0).css(l,"pos"===u?-s:s),d[l]=(r?"pos"===u?"+=":"-=":"pos"===u?"-=":"+=")+s,n.animate(d,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}})},e.effects.effect.explode=function(t,i){function s(){b.push(this),b.length===d*c&&n()}function n(){p.css({visibility:"visible"}),e(b).remove(),m||p.hide(),i()}var a,o,r,h,l,u,d=t.pieces?Math.round(Math.sqrt(t.pieces)):3,c=d,p=e(this),f=e.effects.setMode(p,t.mode||"hide"),m="show"===f,g=p.show().css("visibility","hidden").offset(),v=Math.ceil(p.outerWidth()/c),y=Math.ceil(p.outerHeight()/d),b=[];for(a=0;d>a;a++)for(h=g.top+a*y,u=a-(d-1)/2,o=0;c>o;o++)r=g.left+o*v,l=o-(c-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-o*v,top:-a*y}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:v,height:y,left:r+(m?l*v:0),top:h+(m?u*y:0),opacity:m?0:1}).animate({left:r+(m?0:l*v),top:h+(m?0:u*y),opacity:m?1:0},t.duration||500,t.easing,s)},e.effects.effect.fade=function(t,i){var s=e(this),n=e.effects.setMode(s,t.mode||"toggle");s.animate({opacity:n},{queue:!1,duration:t.duration,easing:t.easing,complete:i})},e.effects.effect.fold=function(t,i){var s,n,a=e(this),o=["position","top","bottom","left","right","height","width"],r=e.effects.setMode(a,t.mode||"hide"),h="show"===r,l="hide"===r,u=t.size||15,d=/([0-9]+)%/.exec(u),c=!!t.horizFirst,p=h!==c,f=p?["width","height"]:["height","width"],m=t.duration/2,g={},v={};e.effects.save(a,o),a.show(),s=e.effects.createWrapper(a).css({overflow:"hidden"}),n=p?[s.width(),s.height()]:[s.height(),s.width()],d&&(u=parseInt(d[1],10)/100*n[l?0:1]),h&&s.css(c?{height:0,width:u}:{height:u,width:0}),g[f[0]]=h?n[0]:u,v[f[1]]=h?n[1]:0,s.animate(g,m,t.easing).animate(v,m,t.easing,function(){l&&a.hide(),e.effects.restore(a,o),e.effects.removeWrapper(a),i()})},e.effects.effect.highlight=function(t,i){var s=e(this),n=["backgroundImage","backgroundColor","opacity"],a=e.effects.setMode(s,t.mode||"show"),o={backgroundColor:s.css("backgroundColor")};"hide"===a&&(o.opacity=0),e.effects.save(s,n),s.show().css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(o,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===a&&s.hide(),e.effects.restore(s,n),i()}})},e.effects.effect.size=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],l=["width","height","overflow"],u=["fontSize"],d=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],c=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=e.effects.setMode(o,t.mode||"effect"),f=t.restore||"effect"!==p,m=t.scale||"both",g=t.origin||["middle","center"],v=o.css("position"),y=f?r:h,b={height:0,width:0,outerHeight:0,outerWidth:0};"show"===p&&o.show(),s={height:o.height(),width:o.width(),outerHeight:o.outerHeight(),outerWidth:o.outerWidth()},"toggle"===t.mode&&"show"===p?(o.from=t.to||b,o.to=t.from||s):(o.from=t.from||("show"===p?b:s),o.to=t.to||("hide"===p?b:s)),a={from:{y:o.from.height/s.height,x:o.from.width/s.width},to:{y:o.to.height/s.height,x:o.to.width/s.width}},("box"===m||"both"===m)&&(a.from.y!==a.to.y&&(y=y.concat(d),o.from=e.effects.setTransition(o,d,a.from.y,o.from),o.to=e.effects.setTransition(o,d,a.to.y,o.to)),a.from.x!==a.to.x&&(y=y.concat(c),o.from=e.effects.setTransition(o,c,a.from.x,o.from),o.to=e.effects.setTransition(o,c,a.to.x,o.to))),("content"===m||"both"===m)&&a.from.y!==a.to.y&&(y=y.concat(u).concat(l),o.from=e.effects.setTransition(o,u,a.from.y,o.from),o.to=e.effects.setTransition(o,u,a.to.y,o.to)),e.effects.save(o,y),o.show(),e.effects.createWrapper(o),o.css("overflow","hidden").css(o.from),g&&(n=e.effects.getBaseline(g,s),o.from.top=(s.outerHeight-o.outerHeight())*n.y,o.from.left=(s.outerWidth-o.outerWidth())*n.x,o.to.top=(s.outerHeight-o.to.outerHeight)*n.y,o.to.left=(s.outerWidth-o.to.outerWidth)*n.x),o.css(o.from),("content"===m||"both"===m)&&(d=d.concat(["marginTop","marginBottom"]).concat(u),c=c.concat(["marginLeft","marginRight"]),l=r.concat(d).concat(c),o.find("*[width]").each(function(){var i=e(this),s={height:i.height(),width:i.width(),outerHeight:i.outerHeight(),outerWidth:i.outerWidth()};
-f&&e.effects.save(i,l),i.from={height:s.height*a.from.y,width:s.width*a.from.x,outerHeight:s.outerHeight*a.from.y,outerWidth:s.outerWidth*a.from.x},i.to={height:s.height*a.to.y,width:s.width*a.to.x,outerHeight:s.height*a.to.y,outerWidth:s.width*a.to.x},a.from.y!==a.to.y&&(i.from=e.effects.setTransition(i,d,a.from.y,i.from),i.to=e.effects.setTransition(i,d,a.to.y,i.to)),a.from.x!==a.to.x&&(i.from=e.effects.setTransition(i,c,a.from.x,i.from),i.to=e.effects.setTransition(i,c,a.to.x,i.to)),i.css(i.from),i.animate(i.to,t.duration,t.easing,function(){f&&e.effects.restore(i,l)})})),o.animate(o.to,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){0===o.to.opacity&&o.css("opacity",o.from.opacity),"hide"===p&&o.hide(),e.effects.restore(o,y),f||("static"===v?o.css({position:"relative",top:o.to.top,left:o.to.left}):e.each(["top","left"],function(e,t){o.css(t,function(t,i){var s=parseInt(i,10),n=e?o.to.left:o.to.top;return"auto"===i?n+"px":s+n+"px"})})),e.effects.removeWrapper(o),i()}})},e.effects.effect.scale=function(t,i){var s=e(this),n=e.extend(!0,{},t),a=e.effects.setMode(s,t.mode||"effect"),o=parseInt(t.percent,10)||(0===parseInt(t.percent,10)?0:"hide"===a?0:100),r=t.direction||"both",h=t.origin,l={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()},u={y:"horizontal"!==r?o/100:1,x:"vertical"!==r?o/100:1};n.effect="size",n.queue=!1,n.complete=i,"effect"!==a&&(n.origin=h||["middle","center"],n.restore=!0),n.from=t.from||("show"===a?{height:0,width:0,outerHeight:0,outerWidth:0}:l),n.to={height:l.height*u.y,width:l.width*u.x,outerHeight:l.outerHeight*u.y,outerWidth:l.outerWidth*u.x},n.fade&&("show"===a&&(n.from.opacity=0,n.to.opacity=1),"hide"===a&&(n.from.opacity=1,n.to.opacity=0)),s.effect(n)},e.effects.effect.puff=function(t,i){var s=e(this),n=e.effects.setMode(s,t.mode||"hide"),a="hide"===n,o=parseInt(t.percent,10)||150,r=o/100,h={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()};e.extend(t,{effect:"scale",queue:!1,fade:!0,mode:n,complete:i,percent:a?o:100,from:a?h:{height:h.height*r,width:h.width*r,outerHeight:h.outerHeight*r,outerWidth:h.outerWidth*r}}),s.effect(t)},e.effects.effect.pulsate=function(t,i){var s,n=e(this),a=e.effects.setMode(n,t.mode||"show"),o="show"===a,r="hide"===a,h=o||"hide"===a,l=2*(t.times||5)+(h?1:0),u=t.duration/l,d=0,c=n.queue(),p=c.length;for((o||!n.is(":visible"))&&(n.css("opacity",0).show(),d=1),s=1;l>s;s++)n.animate({opacity:d},u,t.easing),d=1-d;n.animate({opacity:d},u,t.easing),n.queue(function(){r&&n.hide(),i()}),p>1&&c.splice.apply(c,[1,0].concat(c.splice(p,l+1))),n.dequeue()},e.effects.effect.shake=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","height","width"],o=e.effects.setMode(n,t.mode||"effect"),r=t.direction||"left",h=t.distance||20,l=t.times||3,u=2*l+1,d=Math.round(t.duration/u),c="up"===r||"down"===r?"top":"left",p="up"===r||"left"===r,f={},m={},g={},v=n.queue(),y=v.length;for(e.effects.save(n,a),n.show(),e.effects.createWrapper(n),f[c]=(p?"-=":"+=")+h,m[c]=(p?"+=":"-=")+2*h,g[c]=(p?"-=":"+=")+2*h,n.animate(f,d,t.easing),s=1;l>s;s++)n.animate(m,d,t.easing).animate(g,d,t.easing);n.animate(m,d,t.easing).animate(f,d/2,t.easing).queue(function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}),y>1&&v.splice.apply(v,[1,0].concat(v.splice(y,u+1))),n.dequeue()},e.effects.effect.slide=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","width","height"],o=e.effects.setMode(n,t.mode||"show"),r="show"===o,h=t.direction||"left",l="up"===h||"down"===h?"top":"left",u="up"===h||"left"===h,d={};e.effects.save(n,a),n.show(),s=t.distance||n["top"===l?"outerHeight":"outerWidth"](!0),e.effects.createWrapper(n).css({overflow:"hidden"}),r&&n.css(l,u?isNaN(s)?"-"+s:-s:s),d[l]=(r?u?"+=":"-=":u?"-=":"+=")+s,n.animate(d,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}})},e.effects.effect.transfer=function(t,i){var s=e(this),n=e(t.to),a="fixed"===n.css("position"),o=e("body"),r=a?o.scrollTop():0,h=a?o.scrollLeft():0,l=n.offset(),u={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},d=s.offset(),c=e("<div class='ui-effects-transfer'></div>").appendTo(document.body).addClass(t.className).css({top:d.top-r,left:d.left-h,height:s.innerHeight(),width:s.innerWidth(),position:a?"fixed":"absolute"}).animate(u,t.duration,t.easing,function(){c.remove(),i()})},e.widget("ui.progressbar",{version:"1.11.4",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=e("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this._refreshValue()},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(e){return void 0===e?this.options.value:(this.options.value=this._constrainedValue(e),this._refreshValue(),void 0)},_constrainedValue:function(e){return void 0===e&&(e=this.options.value),this.indeterminate=e===!1,"number"!=typeof e&&(e=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,e))},_setOptions:function(e){var t=e.value;delete e.value,this._super(e),this.options.value=this._constrainedValue(t),this._refreshValue()},_setOption:function(e,t){"max"===e&&(t=Math.max(this.min,t)),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var t=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||t>this.min).toggleClass("ui-corner-right",t===this.options.max).width(i.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=e("<div class='ui-progressbar-overlay'></div>").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":t}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==t&&(this.oldValue=t,this._trigger("change")),t===this.options.max&&this._trigger("complete")}}),e.widget("ui.selectable",e.ui.mouse,{version:"1.11.4",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var t,i=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){t=e(i.options.filter,i.element[0]),t.addClass("ui-selectee"),t.each(function(){var t=e(this),i=t.offset();e.data(this,"selectable-item",{element:this,$element:t,left:i.left,top:i.top,right:i.left+t.outerWidth(),bottom:i.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=t.addClass("ui-selectee"),this._mouseInit(),this.helper=e("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(t){var i=this,s=this.options;this.opos=[t.pageX,t.pageY],this.options.disabled||(this.selectees=e(s.filter,this.element[0]),this._trigger("start",t),e(s.appendTo).append(this.helper),this.helper.css({left:t.pageX,top:t.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=e.data(this,"selectable-item");s.startselected=!0,t.metaKey||t.ctrlKey||(s.$element.removeClass("ui-selected"),s.selected=!1,s.$element.addClass("ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",t,{unselecting:s.element}))}),e(t.target).parents().addBack().each(function(){var s,n=e.data(this,"selectable-item");return n?(s=!t.metaKey&&!t.ctrlKey||!n.$element.hasClass("ui-selected"),n.$element.removeClass(s?"ui-unselecting":"ui-selected").addClass(s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",t,{selecting:n.element}):i._trigger("unselecting",t,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(t){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,a=this.opos[0],o=this.opos[1],r=t.pageX,h=t.pageY;return a>r&&(i=r,r=a,a=i),o>h&&(i=h,h=o,o=i),this.helper.css({left:a,top:o,width:r-a,height:h-o}),this.selectees.each(function(){var i=e.data(this,"selectable-item"),l=!1;i&&i.element!==s.element[0]&&("touch"===n.tolerance?l=!(i.left>r||a>i.right||i.top>h||o>i.bottom):"fit"===n.tolerance&&(l=i.left>a&&r>i.right&&i.top>o&&h>i.bottom),l?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,s._trigger("selecting",t,{selecting:i.element}))):(i.selecting&&((t.metaKey||t.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",t,{unselecting:i.element}))),i.selected&&(t.metaKey||t.ctrlKey||i.startselected||(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",t,{unselecting:i.element})))))}),!1}},_mouseStop:function(t){var i=this;return this.dragged=!1,e(".ui-unselecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",t,{unselected:s.element})}),e(".ui-selecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-selecting").addClass("ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",t,{selected:s.element})}),this._trigger("stop",t),this.helper.remove(),!1}}),e.widget("ui.selectmenu",{version:"1.11.4",defaultElement:"<select>",options:{appendTo:null,disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:null,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this.options.disabled&&this.disable()},_drawButton:function(){var t=this;this.label=e("label[for='"+this.ids.element+"']").attr("for",this.ids.button),this._on(this.label,{click:function(e){this.button.focus(),e.preventDefault()}}),this.element.hide(),this.button=e("<span>",{"class":"ui-selectmenu-button ui-widget ui-state-default ui-corner-all",tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true"}).insertAfter(this.element),e("<span>",{"class":"ui-icon "+this.options.icons.button}).prependTo(this.button),this.buttonText=e("<span>",{"class":"ui-selectmenu-text"}).appendTo(this.button),this._setText(this.buttonText,this.element.find("option:selected").text()),this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){t.menuItems||t._refreshMenu()}),this._hoverable(this.button),this._focusable(this.button)},_drawMenu:function(){var t=this;this.menu=e("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=e("<div>",{"class":"ui-selectmenu-menu ui-front"}).append(this.menu).appendTo(this._appendTo()),this.menuInstance=this.menu.menu({role:"listbox",select:function(e,i){e.preventDefault(),t._setSelection(),t._select(i.item.data("ui-selectmenu-item"),e)},focus:function(e,i){var s=i.item.data("ui-selectmenu-item");null!=t.focusIndex&&s.index!==t.focusIndex&&(t._trigger("focus",e,{item:s}),t.isOpen||t._select(s,e)),t.focusIndex=s.index,t.button.attr("aria-activedescendant",t.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menu.addClass("ui-corner-bottom").removeClass("ui-corner-all"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this._setText(this.buttonText,this._getSelectedItem().text()),this.options.width||this._resizeButton()},_refreshMenu:function(){this.menu.empty();var e,t=this.element.find("option");t.length&&(this._parseOptions(t),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup"),e=this._getSelectedItem(),this.menuInstance.focus(null,e),this._setAria(e.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(e){this.options.disabled||(this.menuItems?(this.menu.find(".ui-state-focus").removeClass("ui-state-focus"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",e))},_position:function(){this.menuWrap.position(e.extend({of:this.button},this.options.position))},close:function(e){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",e))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderMenu:function(t,i){var s=this,n="";e.each(i,function(i,a){a.optgroup!==n&&(e("<li>",{"class":"ui-selectmenu-optgroup ui-menu-divider"+(a.element.parent("optgroup").prop("disabled")?" ui-state-disabled":""),text:a.optgroup}).appendTo(t),n=a.optgroup),s._renderItemData(t,a)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-selectmenu-item",t)},_renderItem:function(t,i){var s=e("<li>");return i.disabled&&s.addClass("ui-state-disabled"),this._setText(s,i.label),s.appendTo(t)},_setText:function(e,t){t?e.text(t):e.html("&#160;")},_move:function(e,t){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex):(i=this.menuItems.eq(this.element[0].selectedIndex),n+=":not(.ui-state-disabled)"),s="first"===e||"last"===e?i["first"===e?"prevAll":"nextAll"](n).eq(-1):i[e+"All"](n).eq(0),s.length&&this.menuInstance.focus(t,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex)},_toggle:function(e){this[this.isOpen?"close":"open"](e)},_setSelection:function(){var e;this.range&&(window.getSelection?(e=window.getSelection(),e.removeAllRanges(),e.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(t){this.isOpen&&(e(t.target).closest(".ui-selectmenu-menu, #"+this.ids.button).length||this.close(t))}},_buttonEvents:{mousedown:function(){var e;window.getSelection?(e=window.getSelection(),e.rangeCount&&(this.range=e.getRangeAt(0))):this.range=document.selection.createRange()},click:function(e){this._setSelection(),this._toggle(e)},keydown:function(t){var i=!0;switch(t.keyCode){case e.ui.keyCode.TAB:case e.ui.keyCode.ESCAPE:this.close(t),i=!1;break;case e.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(t);break;case e.ui.keyCode.UP:t.altKey?this._toggle(t):this._move("prev",t);break;case e.ui.keyCode.DOWN:t.altKey?this._toggle(t):this._move("next",t);break;case e.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(t):this._toggle(t);break;case e.ui.keyCode.LEFT:this._move("prev",t);break;case e.ui.keyCode.RIGHT:this._move("next",t);break;case e.ui.keyCode.HOME:case e.ui.keyCode.PAGE_UP:this._move("first",t);break;case e.ui.keyCode.END:case e.ui.keyCode.PAGE_DOWN:this._move("last",t);break;default:this.menu.trigger(t),i=!1}i&&t.preventDefault()}},_selectFocusedItem:function(e){var t=this.menuItems.eq(this.focusIndex);t.hasClass("ui-state-disabled")||this._select(t.data("ui-selectmenu-item"),e)},_select:function(e,t){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=e.index,this._setText(this.buttonText,e.label),this._setAria(e),this._trigger("select",t,{item:e}),e.index!==i&&this._trigger("change",t,{item:e}),this.close(t)},_setAria:function(e){var t=this.menuItems.eq(e.index).attr("id");this.button.attr({"aria-labelledby":t,"aria-activedescendant":t}),this.menu.attr("aria-activedescendant",t)},_setOption:function(e,t){"icons"===e&&this.button.find("span.ui-icon").removeClass(this.options.icons.button).addClass(t.button),this._super(e,t),"appendTo"===e&&this.menuWrap.appendTo(this._appendTo()),"disabled"===e&&(this.menuInstance.option("disabled",t),this.button.toggleClass("ui-state-disabled",t).attr("aria-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)),"width"===e&&this._resizeButton()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_toggleAttr:function(){this.button.toggleClass("ui-corner-top",this.isOpen).toggleClass("ui-corner-all",!this.isOpen).attr("aria-expanded",this.isOpen),this.menuWrap.toggleClass("ui-selectmenu-open",this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var e=this.options.width;e||(e=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(e)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){return{disabled:this.element.prop("disabled")}},_parseOptions:function(t){var i=[];t.each(function(t,s){var n=e(s),a=n.parent("optgroup");i.push({element:n,index:t,value:n.val(),label:n.text(),optgroup:a.attr("label")||"",disabled:a.prop("disabled")||n.prop("disabled")})}),this.items=i},_destroy:function(){this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.label.attr("for",this.ids.element)}}),e.widget("ui.slider",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"),this._refresh(),this._setOption("disabled",this.options.disabled),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var t,i,s=this.options,n=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),a="<span class='ui-slider-handle ui-state-default ui-corner-all' tabindex='0'></span>",o=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),t=n.length;i>t;t++)o.push(a);this.handles=n.add(e(o.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.each(function(t){e(this).data("ui-slider-handle-index",t)})},_createRange:function(){var t=this.options,i="";t.range?(t.range===!0&&(t.values?t.values.length&&2!==t.values.length?t.values=[t.values[0],t.values[0]]:e.isArray(t.values)&&(t.values=t.values.slice(0)):t.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?this.range.removeClass("ui-slider-range-min ui-slider-range-max").css({left:"",bottom:""}):(this.range=e("<div></div>").appendTo(this.element),i="ui-slider-range ui-widget-header ui-corner-all"),this.range.addClass(i+("min"===t.range||"max"===t.range?" ui-slider-range-"+t.range:""))):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(t){var i,s,n,a,o,r,h,l,u=this,d=this.options;return d.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:t.pageX,y:t.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(t){var i=Math.abs(s-u.values(t));(n>i||n===i&&(t===u._lastChangedValue||u.values(t)===d.min))&&(n=i,a=e(this),o=t)}),r=this._start(t,o),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=o,a.addClass("ui-state-active").focus(),h=a.offset(),l=!e(t.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:t.pageX-h.left-a.width()/2,top:t.pageY-h.top-a.height()/2-(parseInt(a.css("borderTopWidth"),10)||0)-(parseInt(a.css("borderBottomWidth"),10)||0)+(parseInt(a.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(t,o,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(e){var t={x:e.pageX,y:e.pageY},i=this._normValueFromMouse(t);return this._slide(e,this._handleIndex,i),!1},_mouseStop:function(e){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(e,this._handleIndex),this._change(e,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(e){var t,i,s,n,a;return"horizontal"===this.orientation?(t=this.elementSize.width,i=e.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(t=this.elementSize.height,i=e.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/t,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),a=this._valueMin()+s*n,this._trimAlignValue(a)},_start:function(e,t){var i={handle:this.handles[t],value:this.value()};return this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._trigger("start",e,i)},_slide:function(e,t,i){var s,n,a;this.options.values&&this.options.values.length?(s=this.values(t?0:1),2===this.options.values.length&&this.options.range===!0&&(0===t&&i>s||1===t&&s>i)&&(i=s),i!==this.values(t)&&(n=this.values(),n[t]=i,a=this._trigger("slide",e,{handle:this.handles[t],value:i,values:n}),s=this.values(t?0:1),a!==!1&&this.values(t,i))):i!==this.value()&&(a=this._trigger("slide",e,{handle:this.handles[t],value:i}),a!==!1&&this.value(i))},_stop:function(e,t){var i={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._trigger("stop",e,i)},_change:function(e,t){if(!this._keySliding&&!this._mouseSliding){var i={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._lastChangedValue=t,this._trigger("change",e,i)}},value:function(e){return arguments.length?(this.options.value=this._trimAlignValue(e),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(t,i){var s,n,a;if(arguments.length>1)return this.options.values[t]=this._trimAlignValue(i),this._refreshValue(),this._change(null,t),void 0;if(!arguments.length)return this._values();if(!e.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(t):this.value();for(s=this.options.values,n=arguments[0],a=0;s.length>a;a+=1)s[a]=this._trimAlignValue(n[a]),this._change(null,a);this._refreshValue()},_setOption:function(t,i){var s,n=0;switch("range"===t&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),e.isArray(this.options.values)&&(n=this.options.values.length),"disabled"===t&&this.element.toggleClass("ui-state-disabled",!!i),this._super(t,i),t){case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue(),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=0;n>s;s+=1)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_value:function(){var e=this.options.value;return e=this._trimAlignValue(e)},_values:function(e){var t,i,s;if(arguments.length)return t=this.options.values[e],t=this._trimAlignValue(t);if(this.options.values&&this.options.values.length){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(e){if(this._valueMin()>=e)return this._valueMin();if(e>=this._valueMax())return this._valueMax();var t=this.options.step>0?this.options.step:1,i=(e-this._valueMin())%t,s=e-i;return 2*Math.abs(i)>=t&&(s+=i>0?t:-t),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var e=this.options.max,t=this._valueMin(),i=this.options.step,s=Math.floor(+(e-t).toFixed(this._precision())/i)*i;e=s+t,this.max=parseFloat(e.toFixed(this._precision()))},_precision:function(){var e=this._precisionOf(this.options.step);return null!==this.options.min&&(e=Math.max(e,this._precisionOf(this.options.min))),e},_precisionOf:function(e){var t=""+e,i=t.indexOf(".");return-1===i?0:t.length-i-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshValue:function(){var t,i,s,n,a,o=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,u={};this.options.values&&this.options.values.length?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),u["horizontal"===h.orientation?"left":"bottom"]=i+"%",e(this).stop(1,1)[l?"animate":"css"](u,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-t+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-t+"%"},{queue:!1,duration:r.animate}))),t=i}):(s=this.value(),n=this._valueMin(),a=this._valueMax(),i=a!==n?100*((s-n)/(a-n)):0,u["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](u,r.animate),"min"===o&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===o&&"horizontal"===this.orientation&&this.range[l?"animate":"css"]({width:100-i+"%"},{queue:!1,duration:r.animate}),"min"===o&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===o&&"vertical"===this.orientation&&this.range[l?"animate":"css"]({height:100-i+"%"},{queue:!1,duration:r.animate}))},_handleEvents:{keydown:function(t){var i,s,n,a,o=e(t.target).data("ui-slider-handle-index");switch(t.keyCode){case e.ui.keyCode.HOME:case e.ui.keyCode.END:case e.ui.keyCode.PAGE_UP:case e.ui.keyCode.PAGE_DOWN:case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(t.preventDefault(),!this._keySliding&&(this._keySliding=!0,e(t.target).addClass("ui-state-active"),i=this._start(t,o),i===!1))return}switch(a=this.options.step,s=n=this.options.values&&this.options.values.length?this.values(o):this.value(),t.keyCode){case e.ui.keyCode.HOME:n=this._valueMin();break;case e.ui.keyCode.END:n=this._valueMax();break;case e.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case e.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+a);break;case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-a)}this._slide(t,o,n)},keyup:function(t){var i=e(t.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(t,i),this._change(t,i),e(t.target).removeClass("ui-state-active"))}}}),e.widget("ui.sortable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(e,t,i){return e>=t&&t+i>e},_isFloating:function(e){return/left|right/.test(e.css("float"))||/inline|table-cell/.test(e.css("display"))},_create:function(){this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(e,t){this._super(e,t),"handle"===e&&this._setHandleClassName()},_setHandleClassName:function(){this.element.find(".ui-sortable-handle").removeClass("ui-sortable-handle"),e.each(this.items,function(){(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item).addClass("ui-sortable-handle")})},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").find(".ui-sortable-handle").removeClass("ui-sortable-handle"),this._mouseDestroy();for(var e=this.items.length-1;e>=0;e--)this.items[e].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(t,i){var s=null,n=!1,a=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(t),e(t.target).parents().each(function(){return e.data(this,a.widgetName+"-item")===a?(s=e(this),!1):void 0}),e.data(t.target,a.widgetName+"-item")===a&&(s=e(t.target)),s?!this.options.handle||i||(e(this.options.handle,s).find("*").addBack().each(function(){this===t.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(t,i,s){var n,a,o=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(t),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,o.cursorAt&&this._adjustOffsetFromHelper(o.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),o.containment&&this._setContainment(),o.cursor&&"auto"!==o.cursor&&(a=this.document.find("body"),this.storedCursor=a.css("cursor"),a.css("cursor",o.cursor),this.storedStylesheet=e("<style>*{ cursor: "+o.cursor+" !important; }</style>").appendTo(a)),o.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",o.opacity)),o.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",o.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",t,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",t,this._uiHash(this));
-return e.ui.ddmanager&&(e.ui.ddmanager.current=this),e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(t),!0},_mouseDrag:function(t){var i,s,n,a,o=this.options,r=!1;for(this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-t.pageY<o.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+o.scrollSpeed:t.pageY-this.overflowOffset.top<o.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-o.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-t.pageX<o.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+o.scrollSpeed:t.pageX-this.overflowOffset.left<o.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-o.scrollSpeed)):(t.pageY-this.document.scrollTop()<o.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-o.scrollSpeed):this.window.height()-(t.pageY-this.document.scrollTop())<o.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+o.scrollSpeed)),t.pageX-this.document.scrollLeft()<o.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-o.scrollSpeed):this.window.width()-(t.pageX-this.document.scrollLeft())<o.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+o.scrollSpeed))),r!==!1&&e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],a=this._intersectsWithPointer(s),a&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===a?"next":"prev"]()[0]!==n&&!e.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!e.contains(this.element[0],n):!0)){if(this.direction=1===a?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(t,s),this._trigger("change",t,this._uiHash());break}return this._contactContainers(t),e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),this._trigger("sort",t,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(t,i){if(t){if(e.ui.ddmanager&&!this.options.dropBehaviour&&e.ui.ddmanager.drop(this,t),this.options.revert){var s=this,n=this.placeholder.offset(),a=this.options.axis,o={};a&&"x"!==a||(o.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),a&&"y"!==a||(o.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,e(this.helper).animate(o,parseInt(this.options.revert,10)||500,function(){s._clear(t)})}else this._clear(t,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var t=this.containers.length-1;t>=0;t--)this.containers[t]._trigger("deactivate",null,this._uiHash(this)),this.containers[t].containerCache.over&&(this.containers[t]._trigger("out",null,this._uiHash(this)),this.containers[t].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),e.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?e(this.domPosition.prev).after(this.currentItem):e(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(t){var i=this._getItemsAsjQuery(t&&t.connected),s=[];return t=t||{},e(i).each(function(){var i=(e(t.item||this).attr(t.attribute||"id")||"").match(t.expression||/(.+)[\-=_](.+)/);i&&s.push((t.key||i[1]+"[]")+"="+(t.key&&t.expression?i[1]:i[2]))}),!s.length&&t.key&&s.push(t.key+"="),s.join("&")},toArray:function(t){var i=this._getItemsAsjQuery(t&&t.connected),s=[];return t=t||{},i.each(function(){s.push(e(t.item||this).attr(t.attribute||"id")||"")}),s},_intersectsWith:function(e){var t=this.positionAbs.left,i=t+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,a=e.left,o=a+e.width,r=e.top,h=r+e.height,l=this.offset.click.top,u=this.offset.click.left,d="x"===this.options.axis||s+l>r&&h>s+l,c="y"===this.options.axis||t+u>a&&o>t+u,p=d&&c;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>e[this.floating?"width":"height"]?p:t+this.helperProportions.width/2>a&&o>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(e){var t="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,e.top,e.height),i="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,e.left,e.width),s=t&&i,n=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return s?this.floating?a&&"right"===a||"down"===n?2:1:n&&("down"===n?2:1):!1},_intersectsWithSides:function(e){var t=this._isOverAxis(this.positionAbs.top+this.offset.click.top,e.top+e.height/2,e.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,e.left+e.width/2,e.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&t||"up"===s&&!t)},_getDragVerticalDirection:function(){var e=this.positionAbs.top-this.lastPositionAbs.top;return 0!==e&&(e>0?"down":"up")},_getDragHorizontalDirection:function(){var e=this.positionAbs.left-this.lastPositionAbs.left;return 0!==e&&(e>0?"right":"left")},refresh:function(e){return this._refreshItems(e),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var e=this.options;return e.connectWith.constructor===String?[e.connectWith]:e.connectWith},_getItemsAsjQuery:function(t){function i(){r.push(this)}var s,n,a,o,r=[],h=[],l=this._connectWith();if(l&&t)for(s=l.length-1;s>=0;s--)for(a=e(l[s],this.document[0]),n=a.length-1;n>=0;n--)o=e.data(a[n],this.widgetFullName),o&&o!==this&&!o.options.disabled&&h.push([e.isFunction(o.options.items)?o.options.items.call(o.element):e(o.options.items,o.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),o]);for(h.push([e.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):e(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return e(r)},_removeCurrentsFromItems:function(){var t=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=e.grep(this.items,function(e){for(var i=0;t.length>i;i++)if(t[i]===e.item[0])return!1;return!0})},_refreshItems:function(t){this.items=[],this.containers=[this];var i,s,n,a,o,r,h,l,u=this.items,d=[[e.isFunction(this.options.items)?this.options.items.call(this.element[0],t,{item:this.currentItem}):e(this.options.items,this.element),this]],c=this._connectWith();if(c&&this.ready)for(i=c.length-1;i>=0;i--)for(n=e(c[i],this.document[0]),s=n.length-1;s>=0;s--)a=e.data(n[s],this.widgetFullName),a&&a!==this&&!a.options.disabled&&(d.push([e.isFunction(a.options.items)?a.options.items.call(a.element[0],t,{item:this.currentItem}):e(a.options.items,a.element),a]),this.containers.push(a));for(i=d.length-1;i>=0;i--)for(o=d[i][1],r=d[i][0],s=0,l=r.length;l>s;s++)h=e(r[s]),h.data(this.widgetName+"-item",o),u.push({item:h,instance:o,width:0,height:0,left:0,top:0})},refreshPositions:function(t){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,a;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?e(this.options.toleranceElement,s.item):s.item,t||(s.width=n.outerWidth(),s.height=n.outerHeight()),a=n.offset(),s.left=a.left,s.top=a.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)a=this.containers[i].element.offset(),this.containers[i].containerCache.left=a.left,this.containers[i].containerCache.top=a.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(t){t=t||this;var i,s=t.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=t.currentItem[0].nodeName.toLowerCase(),n=e("<"+s+">",t.document[0]).addClass(i||t.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tbody"===s?t._createTrPlaceholder(t.currentItem.find("tr").eq(0),e("<tr>",t.document[0]).appendTo(n)):"tr"===s?t._createTrPlaceholder(t.currentItem,n):"img"===s&&n.attr("src",t.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(e,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(t.currentItem.innerHeight()-parseInt(t.currentItem.css("paddingTop")||0,10)-parseInt(t.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(t.currentItem.innerWidth()-parseInt(t.currentItem.css("paddingLeft")||0,10)-parseInt(t.currentItem.css("paddingRight")||0,10)))}}),t.placeholder=e(s.placeholder.element.call(t.element,t.currentItem)),t.currentItem.after(t.placeholder),s.placeholder.update(t,t.placeholder)},_createTrPlaceholder:function(t,i){var s=this;t.children().each(function(){e("<td>&#160;</td>",s.document[0]).attr("colspan",e(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(t){var i,s,n,a,o,r,h,l,u,d,c=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!e.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(c&&e.contains(this.containers[i].element[0],c.element[0]))continue;c=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",t,this._uiHash(this)),this.containers[i].containerCache.over=0);if(c)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",t,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,a=null,u=c.floating||this._isFloating(this.currentItem),o=u?"left":"top",r=u?"width":"height",d=u?"clientX":"clientY",s=this.items.length-1;s>=0;s--)e.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[o],l=!1,t[d]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(t[d]-h)&&(n=Math.abs(t[d]-h),a=this.items[s],this.direction=l?"up":"down"));if(!a&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",t,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;a?this._rearrange(t,a,null,!0):this._rearrange(t,null,this.containers[p].element,!0),this._trigger("change",t,this._uiHash()),this.containers[p]._trigger("change",t,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",t,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper)?e(i.helper.apply(this.element[0],[t,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||e("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&e.ui.ie)&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var e=this.currentItem.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.width():this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(t=e(n.containment)[0],i=e(n.containment).offset(),s="hidden"!==e(t).css("overflow"),this.containment=[i.left+(parseInt(e(t).css("borderLeftWidth"),10)||0)+(parseInt(e(t).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(e(t).css("borderTopWidth"),10)||0)+(parseInt(e(t).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(t.scrollWidth,t.offsetWidth):t.offsetWidth)-(parseInt(e(t).css("borderLeftWidth"),10)||0)-(parseInt(e(t).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(t.scrollHeight,t.offsetHeight):t.offsetHeight)-(parseInt(e(t).css("borderTopWidth"),10)||0)-(parseInt(e(t).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(t,i){i||(i=this.position);var s="absolute"===t?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,a=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():a?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():a?0:n.scrollLeft())*s}},_generatePosition:function(t){var i,s,n=this.options,a=t.pageX,o=t.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(t.pageX-this.offset.click.left<this.containment[0]&&(a=this.containment[0]+this.offset.click.left),t.pageY-this.offset.click.top<this.containment[1]&&(o=this.containment[1]+this.offset.click.top),t.pageX-this.offset.click.left>this.containment[2]&&(a=this.containment[2]+this.offset.click.left),t.pageY-this.offset.click.top>this.containment[3]&&(o=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((o-this.originalPageY)/n.grid[1])*n.grid[1],o=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((a-this.originalPageX)/n.grid[0])*n.grid[0],a=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:a-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(e,t,i,s){i?i[0].appendChild(this.placeholder[0]):t.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?t.item[0]:t.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(e,t){function i(e,t,i){return function(s){i._trigger(e,s,t._uiHash(t))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!t&&n.push(function(e){this._trigger("receive",e,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||t||n.push(function(e){this._trigger("update",e,this._uiHash())}),this!==this.currentContainer&&(t||(n.push(function(e){this._trigger("remove",e,this._uiHash())}),n.push(function(e){return function(t){e._trigger("receive",t,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(e){return function(t){e._trigger("update",t,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)t||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,t||this._trigger("beforeStop",e,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!t){for(s=0;n.length>s;s++)n[s].call(this,e);this._trigger("stop",e,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){e.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(t){var i=t||this;return{helper:i.helper,placeholder:i.placeholder||e([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:t?t.element:null}}}),e.widget("ui.spinner",{version:"1.11.4",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var t={},i=this.element;return e.each(["min","max","step"],function(e,s){var n=i.attr(s);void 0!==n&&n.length&&(t[s]=n)}),t},_events:{keydown:function(e){this._start(e)&&this._keydown(e)&&e.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",e),void 0)},mousewheel:function(e,t){if(t){if(!this.spinning&&!this._start(e))return!1;this._spin((t>0?1:-1)*this.options.step,e),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(e)},100),e.preventDefault()}},"mousedown .ui-spinner-button":function(t){function i(){var e=this.element[0]===this.document[0].activeElement;e||(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),t.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(t)!==!1&&this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(t){return e(t.currentTarget).hasClass("ui-state-active")?this._start(t)===!1?!1:(this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var e=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=e.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(.5*e.height())&&e.height()>0&&e.height(e.height()),this.options.disabled&&this.disable()},_keydown:function(t){var i=this.options,s=e.ui.keyCode;switch(t.keyCode){case s.UP:return this._repeat(null,1,t),!0;case s.DOWN:return this._repeat(null,-1,t),!0;case s.PAGE_UP:return this._repeat(null,i.page,t),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,t),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>&#9650;</span>"+"</a>"+"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>"+"<span class='ui-icon "+this.options.icons.down+"'>&#9660;</span>"+"</a>"},_start:function(e){return this.spinning||this._trigger("start",e)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(e,t,i){e=e||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,t,i)},e),this._spin(t*this.options.step,i)},_spin:function(e,t){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+e*this._increment(this.counter)),this.spinning&&this._trigger("spin",t,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(t){var i=this.options.incremental;return i?e.isFunction(i)?i(t):Math.floor(t*t*t/5e4-t*t/500+17*t/200+1):1},_precision:function(){var e=this._precisionOf(this.options.step);return null!==this.options.min&&(e=Math.max(e,this._precisionOf(this.options.min))),e},_precisionOf:function(e){var t=""+e,i=t.indexOf(".");return-1===i?0:t.length-i-1},_adjustValue:function(e){var t,i,s=this.options;return t=null!==s.min?s.min:0,i=e-t,i=Math.round(i/s.step)*s.step,e=t+i,e=parseFloat(e.toFixed(this._precision())),null!==s.max&&e>s.max?s.max:null!==s.min&&s.min>e?s.min:e},_stop:function(e){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",e))},_setOption:function(e,t){if("culture"===e||"numberFormat"===e){var i=this._parse(this.element.val());return this.options[e]=t,this.element.val(this._format(i)),void 0}("max"===e||"min"===e||"step"===e)&&"string"==typeof t&&(t=this._parse(t)),"icons"===e&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(t.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(t.down)),this._super(e,t),"disabled"===e&&(this.widget().toggleClass("ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable"))},_setOptions:h(function(e){this._super(e)}),_parse:function(e){return"string"==typeof e&&""!==e&&(e=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(e,10,this.options.culture):+e),""===e||isNaN(e)?null:e},_format:function(e){return""===e?"":window.Globalize&&this.options.numberFormat?Globalize.format(e,this.options.numberFormat,this.options.culture):e},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var e=this.value();return null===e?!1:e===this._adjustValue(e)},_value:function(e,t){var i;""!==e&&(i=this._parse(e),null!==i&&(t||(i=this._adjustValue(i)),e=this._format(i))),this.element.val(e),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:h(function(e){this._stepUp(e)}),_stepUp:function(e){this._start()&&(this._spin((e||1)*this.options.step),this._stop())},stepDown:h(function(e){this._stepDown(e)}),_stepDown:function(e){this._start()&&(this._spin((e||1)*-this.options.step),this._stop())},pageUp:h(function(e){this._stepUp((e||1)*this.options.page)}),pageDown:h(function(e){this._stepDown((e||1)*this.options.page)}),value:function(e){return arguments.length?(h(this._value).call(this,e),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),e.widget("ui.tabs",{version:"1.11.4",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var e=/#.*$/;return function(t){var i,s;t=t.cloneNode(!1),i=t.href.replace(e,""),s=location.href.replace(e,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return t.hash.length>1&&i===s}}(),_create:function(){var t=this,i=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",i.collapsible),this._processTabs(),i.active=this._initialActive(),e.isArray(i.disabled)&&(i.disabled=e.unique(i.disabled.concat(e.map(this.tabs.filter(".ui-state-disabled"),function(e){return t.tabs.index(e)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):e(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var t=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===t&&(s&&this.tabs.each(function(i,n){return e(n).attr("aria-controls")===s?(t=i,!1):void 0}),null===t&&(t=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===t||-1===t)&&(t=this.tabs.length?0:!1)),t!==!1&&(t=this.tabs.index(this.tabs.eq(t)),-1===t&&(t=i?!1:0)),!i&&t===!1&&this.anchors.length&&(t=0),t},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):e()}},_tabKeydown:function(t){var i=e(this.document[0].activeElement).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(t)){switch(t.keyCode){case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:s++;break;case e.ui.keyCode.UP:case e.ui.keyCode.LEFT:n=!1,s--;break;case e.ui.keyCode.END:s=this.anchors.length-1;break;case e.ui.keyCode.HOME:s=0;break;case e.ui.keyCode.SPACE:return t.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case e.ui.keyCode.ENTER:return t.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}t.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),t.ctrlKey||t.metaKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(t){this._handlePageNav(t)||t.ctrlKey&&t.keyCode===e.ui.keyCode.UP&&(t.preventDefault(),this.active.focus())},_handlePageNav:function(t){return t.altKey&&t.keyCode===e.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):t.altKey&&t.keyCode===e.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(t,i){function s(){return t>n&&(t=0),0>t&&(t=n),t}for(var n=this.tabs.length-1;-1!==e.inArray(s(),this.options.disabled);)t=i?t+1:t-1;return t},_focusNextTab:function(e,t){return e=this._findNextTab(e,t),this.tabs.eq(e).focus(),e},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):"disabled"===e?(this._setupDisabled(t),void 0):(this._super(e,t),"collapsible"===e&&(this.element.toggleClass("ui-tabs-collapsible",t),t||this.options.active!==!1||this._activate(0)),"event"===e&&this._setupEvents(t),"heightStyle"===e&&this._setupHeightStyle(t),void 0)},_sanitizeSelector:function(e){return e?e.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var t=this.options,i=this.tablist.children(":has(a[href])");t.disabled=e.map(i.filter(".ui-state-disabled"),function(e){return i.index(e)}),this._processTabs(),t.active!==!1&&this.anchors.length?this.active.length&&!e.contains(this.tablist[0],this.active[0])?this.tabs.length===t.disabled.length?(t.active=!1,this.active=e()):this._activate(this._findNextTab(Math.max(0,t.active-1),!1)):t.active=this.tabs.index(this.active):(t.active=!1,this.active=e()),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var t=this,i=this.tabs,s=this.anchors,n=this.panels;
-this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist").delegate("> li","mousedown"+this.eventNamespace,function(t){e(this).is(".ui-state-disabled")&&t.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){e(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return e("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=e(),this.anchors.each(function(i,s){var n,a,o,r=e(s).uniqueId().attr("id"),h=e(s).closest("li"),l=h.attr("aria-controls");t._isLocal(s)?(n=s.hash,o=n.substring(1),a=t.element.find(t._sanitizeSelector(n))):(o=h.attr("aria-controls")||e({}).uniqueId()[0].id,n="#"+o,a=t.element.find(n),a.length||(a=t._createPanel(o),a.insertAfter(t.panels[i-1]||t.tablist)),a.attr("aria-live","polite")),a.length&&(t.panels=t.panels.add(a)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":o,"aria-labelledby":r}),a.attr("aria-labelledby",r)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol,ul").eq(0)},_createPanel:function(t){return e("<div>").attr("id",t).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(t){e.isArray(t)&&(t.length?t.length===this.anchors.length&&(t=!0):t=!1);for(var i,s=0;i=this.tabs[s];s++)t===!0||-1!==e.inArray(s,t)?e(i).addClass("ui-state-disabled").attr("aria-disabled","true"):e(i).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=t},_setupEvents:function(t){var i={};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(e){e.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(t){var i,s=this.element.parent();"fill"===t?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var t=e(this),s=t.css("position");"absolute"!==s&&"fixed"!==s&&(i-=t.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=e(this).outerHeight(!0)}),this.panels.each(function(){e(this).height(Math.max(0,i-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===t&&(i=0,this.panels.each(function(){i=Math.max(i,e(this).height("").height())}).height(i))},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n.closest("li"),o=a[0]===s[0],r=o&&i.collapsible,h=r?e():this._getPanelForTab(a),l=s.length?this._getPanelForTab(s):e(),u={oldTab:s,oldPanel:l,newTab:r?e():a,newPanel:h};t.preventDefault(),a.hasClass("ui-state-disabled")||a.hasClass("ui-tabs-loading")||this.running||o&&!i.collapsible||this._trigger("beforeActivate",t,u)===!1||(i.active=r?!1:this.tabs.index(a),this.active=o?e():a,this.xhr&&this.xhr.abort(),l.length||h.length||e.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(a),t),this._toggle(t,u))},_toggle:function(t,i){function s(){a.running=!1,a._trigger("activate",t,i)}function n(){i.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),o.length&&a.options.show?a._show(o,a.options.show,s):(o.show(),s())}var a=this,o=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),n()}):(i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),o.length&&r.length?i.oldTab.attr("tabIndex",-1):o.length&&this.tabs.filter(function(){return 0===e(this).attr("tabIndex")}).attr("tabIndex",-1),o.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(t){var i,s=this._findActive(t);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return t===!1?e():this.tabs.eq(t)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+e+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tablist.unbind(this.eventNamespace),this.tabs.add(this.panels).each(function(){e.data(this,"ui-tabs-destroy")?e(this).remove():e(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var t=e(this),i=t.data("ui-tabs-aria-controls");i?t.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):t.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(t){var i=this.options.disabled;i!==!1&&(void 0===t?i=!1:(t=this._getIndex(t),i=e.isArray(i)?e.map(i,function(e){return e!==t?e:null}):e.map(this.tabs,function(e,i){return i!==t?i:null})),this._setupDisabled(i))},disable:function(t){var i=this.options.disabled;if(i!==!0){if(void 0===t)i=!0;else{if(t=this._getIndex(t),-1!==e.inArray(t,i))return;i=e.isArray(i)?e.merge([t],i).sort():[t]}this._setupDisabled(i)}},load:function(t,i){t=this._getIndex(t);var s=this,n=this.tabs.eq(t),a=n.find(".ui-tabs-anchor"),o=this._getPanelForTab(n),r={tab:n,panel:o},h=function(e,t){"abort"===t&&s.panels.stop(!1,!0),n.removeClass("ui-tabs-loading"),o.removeAttr("aria-busy"),e===s.xhr&&delete s.xhr};this._isLocal(a[0])||(this.xhr=e.ajax(this._ajaxSettings(a,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(n.addClass("ui-tabs-loading"),o.attr("aria-busy","true"),this.xhr.done(function(e,t,n){setTimeout(function(){o.html(e),s._trigger("load",i,r),h(n,t)},1)}).fail(function(e,t){setTimeout(function(){h(e,t)},1)})))},_ajaxSettings:function(t,i,s){var n=this;return{url:t.attr("href"),beforeSend:function(t,a){return n._trigger("beforeLoad",i,e.extend({jqXHR:t,ajaxSettings:a},s))}}},_getPanelForTab:function(t){var i=e(t).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),e.widget("ui.tooltip",{version:"1.11.4",options:{content:function(){var t=e(this).attr("title")||"";return e("<a>").text(t).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_addDescribedBy:function(t,i){var s=(t.attr("aria-describedby")||"").split(/\s+/);s.push(i),t.data("ui-tooltip-id",i).attr("aria-describedby",e.trim(s.join(" ")))},_removeDescribedBy:function(t){var i=t.data("ui-tooltip-id"),s=(t.attr("aria-describedby")||"").split(/\s+/),n=e.inArray(i,s);-1!==n&&s.splice(n,1),t.removeData("ui-tooltip-id"),s=e.trim(s.join(" ")),s?t.attr("aria-describedby",s):t.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable(),this.liveRegion=e("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body)},_setOption:function(t,i){var s=this;return"disabled"===t?(this[i?"_disable":"_enable"](),this.options[t]=i,void 0):(this._super(t,i),"content"===t&&e.each(this.tooltips,function(e,t){s._updateContent(t.element)}),void 0)},_disable:function(){var t=this;e.each(this.tooltips,function(i,s){var n=e.Event("blur");n.target=n.currentTarget=s.element[0],t.close(n,!0)}),this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.is("[title]")&&t.data("ui-tooltip-title",t.attr("title")).removeAttr("title")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.data("ui-tooltip-title")&&t.attr("title",t.data("ui-tooltip-title"))})},open:function(t){var i=this,s=e(t?t.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),t&&"mouseover"===t.type&&s.parents().each(function(){var t,s=e(this);s.data("ui-tooltip-open")&&(t=e.Event("blur"),t.target=t.currentTarget=this,i.close(t,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._registerCloseHandlers(t,s),this._updateContent(s,t))},_updateContent:function(e,t){var i,s=this.options.content,n=this,a=t?t.type:null;return"string"==typeof s?this._open(t,e,s):(i=s.call(e[0],function(i){n._delay(function(){e.data("ui-tooltip-open")&&(t&&(t.type=a),this._open(t,e,i))})}),i&&this._open(t,e,i),void 0)},_open:function(t,i,s){function n(e){l.of=e,o.is(":hidden")||o.position(l)}var a,o,r,h,l=e.extend({},this.options.position);if(s){if(a=this._find(i))return a.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(t&&"mouseover"===t.type?i.attr("title",""):i.removeAttr("title")),a=this._tooltip(i),o=a.tooltip,this._addDescribedBy(i,o.attr("id")),o.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),s.clone?(h=s.clone(),h.removeAttr("id").find("[id]").removeAttr("id")):h=s,e("<div>").html(h).appendTo(this.liveRegion),this.options.track&&t&&/^mouse/.test(t.type)?(this._on(this.document,{mousemove:n}),n(t)):o.position(e.extend({of:i},this.options.position)),o.hide(),this._show(o,this.options.show),this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){o.is(":visible")&&(n(l.of),clearInterval(r))},e.fx.interval)),this._trigger("open",t,{tooltip:o})}},_registerCloseHandlers:function(t,i){var s={keyup:function(t){if(t.keyCode===e.ui.keyCode.ESCAPE){var s=e.Event(t);s.currentTarget=i[0],this.close(s,!0)}}};i[0]!==this.element[0]&&(s.remove=function(){this._removeTooltip(this._find(i).tooltip)}),t&&"mouseover"!==t.type||(s.mouseleave="close"),t&&"focusin"!==t.type||(s.focusout="close"),this._on(!0,i,s)},close:function(t){var i,s=this,n=e(t?t.currentTarget:this.element),a=this._find(n);return a?(i=a.tooltip,a.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),a.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(e(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),t&&"mouseleave"===t.type&&e.each(this.parents,function(t,i){e(i.element).attr("title",i.title),delete s.parents[t]}),a.closing=!0,this._trigger("close",t,{tooltip:i}),a.hiding||(a.closing=!1)),void 0):(n.removeData("ui-tooltip-open"),void 0)},_tooltip:function(t){var i=e("<div>").attr("role","tooltip").addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||"")),s=i.uniqueId().attr("id");return e("<div>").addClass("ui-tooltip-content").appendTo(i),i.appendTo(this.document[0].body),this.tooltips[s]={element:t,tooltip:i}},_find:function(e){var t=e.data("ui-tooltip-id");return t?this.tooltips[t]:null},_removeTooltip:function(e){e.remove(),delete this.tooltips[e.attr("id")]},_destroy:function(){var t=this;e.each(this.tooltips,function(i,s){var n=e.Event("blur"),a=s.element;n.target=n.currentTarget=a[0],t.close(n,!0),e("#"+i).remove(),a.data("ui-tooltip-title")&&(a.attr("title")||a.attr("title",a.data("ui-tooltip-title")),a.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}})});
\ No newline at end of file
+(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){function e(t){for(var e=t.css("visibility");"inherit"===e;)t=t.parent(),e=t.css("visibility");return"hidden"!==e}function i(t){for(var e,i;t.length&&t[0]!==document;){if(e=t.css("position"),("absolute"===e||"relative"===e||"fixed"===e)&&(i=parseInt(t.css("zIndex"),10),!isNaN(i)&&0!==i))return i;t=t.parent()}return 0}function s(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},t.extend(this._defaults,this.regional[""]),this.regional.en=t.extend(!0,{},this.regional[""]),this.regional["en-US"]=t.extend(!0,{},this.regional.en),this.dpDiv=n(t("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function n(e){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.on("mouseout",i,function(){t(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).removeClass("ui-datepicker-next-hover")}).on("mouseover",i,o)}function o(){t.datepicker._isDisabledDatepicker(p.inline?p.dpDiv.parent()[0]:p.input[0])||(t(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),t(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).addClass("ui-datepicker-next-hover"))}function a(e,i){t.extend(e,i);for(var s in i)null==i[s]&&(e[s]=i[s]);return e}function r(t){return function(){var e=this.element.val();t.apply(this,arguments),this._refresh(),e!==this.element.val()&&this._trigger("change")}}t.ui=t.ui||{},t.ui.version="1.12.1";var l=0,h=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},l=e.split(".")[0];e=e.split(".")[1];var h=l+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][h.toLowerCase()]=function(e){return!!t.data(e,h)},t[l]=t[l]||{},n=t[l][e],o=t[l][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:l,widgetName:e,widgetFullName:h}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var i,s,n=h.call(arguments,1),o=0,a=n.length;a>o;o++)for(i in n[o])s=n[o][i],n[o].hasOwnProperty(i)&&void 0!==s&&(e[i]=t.isPlainObject(s)?t.isPlainObject(e[i])?t.widget.extend({},e[i],s):t.widget.extend({},s):s);return e},t.widget.bridge=function(e,i){var s=i.prototype.widgetFullName||e;t.fn[e]=function(n){var o="string"==typeof n,a=h.call(arguments,1),r=this;return o?this.length||"instance"!==n?this.each(function(){var i,o=t.data(this,s);return"instance"===n?(r=o,!1):o?t.isFunction(o[n])&&"_"!==n.charAt(0)?(i=o[n].apply(o,a),i!==o&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+n+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+n+"'")}):r=void 0:(a.length&&(n=t.widget.extend.apply(null,[n].concat(a))),this.each(function(){var e=t.data(this,s);e?(e.option(n||{}),e._init&&e._init()):t.data(this,s,new i(n,this))})),r}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(e,i){i=t(i||this.defaultElement||this)[0],this.element=t(i),this.uuid=l++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},i!==this&&(t.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===i&&this.destroy()}}),this.document=t(i.style?i.ownerDocument:i.document||i),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var l=s.match(/^([\w:-]*)\s*(.*)$/),h=l[1]+o.eventNamespace,c=l[2];c?n.on(h,c,r):i.on(h,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,function(){function e(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function i(e,i){return parseInt(t.css(e,i),10)||0}function s(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}var n,o=Math.max,a=Math.abs,r=/left|center|right/,l=/top|center|bottom/,h=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,d=t.fn.position;t.position={scrollbarWidth:function(){if(void 0!==n)return n;var e,i,s=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return t("body").append(s),e=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,e===i&&(i=s[0].clientWidth),s.remove(),n=e-i},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType,o=!s&&!n;return{element:i,isWindow:s,isDocument:n,offset:o?t(e).offset():{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:i.outerWidth(),height:i.outerHeight()}}},t.fn.position=function(n){if(!n||!n.of)return d.apply(this,arguments);n=t.extend({},n);var u,p,f,g,m,_,v=t(n.of),b=t.position.getWithinInfo(n.within),y=t.position.getScrollInfo(b),w=(n.collision||"flip").split(" "),k={};return _=s(v),v[0].preventDefault&&(n.at="left top"),p=_.width,f=_.height,g=_.offset,m=t.extend({},g),t.each(["my","at"],function(){var t,e,i=(n[this]||"").split(" ");1===i.length&&(i=r.test(i[0])?i.concat(["center"]):l.test(i[0])?["center"].concat(i):["center","center"]),i[0]=r.test(i[0])?i[0]:"center",i[1]=l.test(i[1])?i[1]:"center",t=h.exec(i[0]),e=h.exec(i[1]),k[this]=[t?t[0]:0,e?e[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===w.length&&(w[1]=w[0]),"right"===n.at[0]?m.left+=p:"center"===n.at[0]&&(m.left+=p/2),"bottom"===n.at[1]?m.top+=f:"center"===n.at[1]&&(m.top+=f/2),u=e(k.at,p,f),m.left+=u[0],m.top+=u[1],this.each(function(){var s,r,l=t(this),h=l.outerWidth(),c=l.outerHeight(),d=i(this,"marginLeft"),_=i(this,"marginTop"),x=h+d+i(this,"marginRight")+y.width,C=c+_+i(this,"marginBottom")+y.height,D=t.extend({},m),T=e(k.my,l.outerWidth(),l.outerHeight());"right"===n.my[0]?D.left-=h:"center"===n.my[0]&&(D.left-=h/2),"bottom"===n.my[1]?D.top-=c:"center"===n.my[1]&&(D.top-=c/2),D.left+=T[0],D.top+=T[1],s={marginLeft:d,marginTop:_},t.each(["left","top"],function(e,i){t.ui.position[w[e]]&&t.ui.position[w[e]][i](D,{targetWidth:p,targetHeight:f,elemWidth:h,elemHeight:c,collisionPosition:s,collisionWidth:x,collisionHeight:C,offset:[u[0]+T[0],u[1]+T[1]],my:n.my,at:n.at,within:b,elem:l})}),n.using&&(r=function(t){var e=g.left-D.left,i=e+p-h,s=g.top-D.top,r=s+f-c,u={target:{element:v,left:g.left,top:g.top,width:p,height:f},element:{element:l,left:D.left,top:D.top,width:h,height:c},horizontal:0>i?"left":e>0?"right":"center",vertical:0>r?"top":s>0?"bottom":"middle"};h>p&&p>a(e+i)&&(u.horizontal="center"),c>f&&f>a(s+r)&&(u.vertical="middle"),u.important=o(a(e),a(i))>o(a(s),a(r))?"horizontal":"vertical",n.using.call(this,t,u)}),l.offset(t.extend(D,{using:r}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,l=n-r,h=r+e.collisionWidth-a-n;e.collisionWidth>a?l>0&&0>=h?(i=t.left+l+e.collisionWidth-a-n,t.left+=l-i):t.left=h>0&&0>=l?n:l>h?n+a-e.collisionWidth:n:l>0?t.left+=l:h>0?t.left-=h:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,l=n-r,h=r+e.collisionHeight-a-n;e.collisionHeight>a?l>0&&0>=h?(i=t.top+l+e.collisionHeight-a-n,t.top+=l-i):t.top=h>0&&0>=l?n:l>h?n+a-e.collisionHeight:n:l>0?t.top+=l:h>0?t.top-=h:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,r=n.width,l=n.isWindow?n.scrollLeft:n.offset.left,h=t.left-e.collisionPosition.marginLeft,c=h-l,u=h+e.collisionWidth-r-l,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-r-o,(0>i||a(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-l,(s>0||u>a(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,r=n.height,l=n.isWindow?n.scrollTop:n.offset.top,h=t.top-e.collisionPosition.marginTop,c=h-l,u=h+e.collisionHeight-r-l,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-r-o,(0>s||a(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-l,(i>0||u>a(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}}}(),t.ui.position,t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])}}),t.fn.extend({disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}}),t.ui.focusable=function(i,s){var n,o,a,r,l,h=i.nodeName.toLowerCase();return"area"===h?(n=i.parentNode,o=n.name,i.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap='#"+o+"']"),a.length>0&&a.is(":visible")):!1):(/^(input|select|textarea|button|object)$/.test(h)?(r=!i.disabled,r&&(l=t(i).closest("fieldset")[0],l&&(r=!l.disabled))):r="a"===h?i.href||s:s,r&&t(i).is(":visible")&&e(t(i)))},t.extend(t.expr[":"],{focusable:function(e){return t.ui.focusable(e,null!=t.attr(e,"tabindex"))}}),t.ui.focusable,t.fn.form=function(){return"string"==typeof this[0].form?this.closest("form"):t(this[0].form)},t.ui.formResetMixin={_formResetHandler:function(){var e=t(this);setTimeout(function(){var i=e.data("ui-form-reset-instances");t.each(i,function(){this.refresh()})})},_bindFormResetHandler:function(){if(this.form=this.element.form(),this.form.length){var t=this.form.data("ui-form-reset-instances")||[];t.length||this.form.on("reset.ui-form-reset",this._formResetHandler),t.push(this),this.form.data("ui-form-reset-instances",t)}},_unbindFormResetHandler:function(){if(this.form.length){var e=this.form.data("ui-form-reset-instances");e.splice(t.inArray(this,e),1),e.length?this.form.data("ui-form-reset-instances",e):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset")}}},"1.7"===t.fn.jquery.substring(0,3)&&(t.each(["Width","Height"],function(e,i){function s(e,i,s,o){return t.each(n,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),o&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],o=i.toLowerCase(),a={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+i]=function(e){return void 0===e?a["inner"+i].call(this):this.each(function(){t(this).css(o,s(this,e)+"px")})},t.fn["outer"+i]=function(e,n){return"number"!=typeof e?a["outer"+i].call(this,e):this.each(function(){t(this).css(o,s(this,e,!0,n)+"px")})}}),t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.ui.escapeSelector=function(){var t=/([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g;return function(e){return e.replace(t,"\\$1")}}(),t.fn.labels=function(){var e,i,s,n,o;return this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(n=this.eq(0).parents("label"),s=this.attr("id"),s&&(e=this.eq(0).parents().last(),o=e.add(e.length?e.siblings():this.siblings()),i="label[for='"+t.ui.escapeSelector(s)+"']",n=n.add(o.find(i).addBack(i))),this.pushStack(n))},t.fn.scrollParent=function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,o=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&o.length?o:t(this[0].ownerDocument||document)},t.extend(t.expr[":"],{tabbable:function(e){var i=t.attr(e,"tabindex"),s=null!=i;return(!s||i>=0)&&t.ui.focusable(e,s)}}),t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var c=!1;t(document).on("mouseup",function(){c=!1}),t.widget("ui.mouse",{version:"1.12.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!c){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,s=1===e.which,n="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),c=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)if(e.originalEvent.altKey||e.originalEvent.ctrlKey||e.originalEvent.metaKey||e.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,c=!1,e.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.ui.plugin={add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;o.length>n;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}},t.ui.safeActiveElement=function(t){var e;try{e=t.activeElement}catch(i){e=t.body}return e||(e=t.body),e.nodeName||(e=t.body),e},t.ui.safeBlur=function(e){e&&"body"!==e.nodeName.toLowerCase()&&t(e).trigger("blur")},t.widget("ui.draggable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(t,e){this._super(t,e),"handle"===t&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(this._blurActiveElement(e),this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(e){this.iframeBlocks=this.document.find(e).map(function(){var e=t(this);return t("<div>").css("position","absolute").appendTo(e.parent()).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(e){var i=t.ui.safeActiveElement(this.document[0]),s=t(e.target);s.closest(i).length||t.ui.safeBlur(i)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===t(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(e),this.originalPosition=this.position=this._generatePosition(e,!1),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_refreshOffsets:function(t){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:t.pageX-this.offset.left,top:t.pageY-this.offset.top}},_mouseDrag:function(e,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp(new t.Event("mouseup",e)),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1},_mouseUp:function(e){return this._unblockFrames(),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),this.handleElement.is(e.target)&&this.element.trigger("focus"),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new t.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper),n=s?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_isRootNode:function(t){return/(html|body)/i.test(t.tagName)||t===this.document[0]},_getParentOffset:function(){var e=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var t=this.element.position(),e=this._isRootNode(this.scrollParent[0]);return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+(e?0:this.scrollParent.scrollTop()),left:t.left-(parseInt(this.helper.css("left"),10)||0)+(e?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options,o=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,t(o).width()-this.helperProportions.width-this.margins.left,(t(o).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)
+},_convertPositionTo:function(t,e){e||(e=this.position);var i="absolute"===t?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(t,e){var i,s,n,o,a=this.options,r=this._isRootNode(this.scrollParent[0]),l=t.pageX,h=t.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),e&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,t.pageX-this.offset.click.left<i[0]&&(l=i[0]+this.offset.click.left),t.pageY-this.offset.click.top<i[1]&&(h=i[1]+this.offset.click.top),t.pageX-this.offset.click.left>i[2]&&(l=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(h=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((h-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,h=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((l-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,l=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o),"y"===a.axis&&(l=this.originalPageX),"x"===a.axis&&(h=this.originalPageY)),{top:h-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:l-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s,this],!0),/^(drag|start|stop)/.test(e)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i,s){var n=t.extend({},i,{item:s.element});s.sortables=[],t(s.options.connectToSortable).each(function(){var i=t(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",e,n))})},stop:function(e,i,s){var n=t.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,t.each(s.sortables,function(){var t=this;t.isOver?(t.isOver=0,s.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,n))})},drag:function(e,i,s){t.each(s.sortables,function(){var n=!1,o=this;o.positionAbs=s.positionAbs,o.helperProportions=s.helperProportions,o.offset.click=s.offset.click,o._intersectsWith(o.containerCache)&&(n=!0,t.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==o&&this._intersectsWith(this.containerCache)&&t.contains(o.element[0],this.element[0])&&(n=!1),n})),n?(o.isOver||(o.isOver=1,s._parent=i.helper.parent(),o.currentItem=i.helper.appendTo(o.element).data("ui-sortable-item",!0),o.options._helper=o.options.helper,o.options.helper=function(){return i.helper[0]},e.target=o.currentItem[0],o._mouseCapture(e,!0),o._mouseStart(e,!0,!0),o.offset.click.top=s.offset.click.top,o.offset.click.left=s.offset.click.left,o.offset.parent.left-=s.offset.parent.left-o.offset.parent.left,o.offset.parent.top-=s.offset.parent.top-o.offset.parent.top,s._trigger("toSortable",e),s.dropped=o.element,t.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,o.fromOutside=s),o.currentItem&&(o._mouseDrag(e),i.position=o.position)):o.isOver&&(o.isOver=0,o.cancelHelperRemoval=!0,o.options._revert=o.options.revert,o.options.revert=!1,o._trigger("out",e,o._uiHash(o)),o._mouseStop(e,!0),o.options.revert=o.options._revert,o.options.helper=o.options._helper,o.placeholder&&o.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(e),i.position=s._generatePosition(e,!0),s._trigger("fromSortable",e),s.dropped=!1,t.each(s.sortables,function(){this.refreshPositions()}))})}}),t.ui.plugin.add("draggable","cursor",{start:function(e,i,s){var n=t("body"),o=s.options;n.css("cursor")&&(o._cursor=n.css("cursor")),n.css("cursor",o.cursor)},stop:function(e,i,s){var n=s.options;n._cursor&&t("body").css("cursor",n._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("opacity")&&(o._opacity=n.css("opacity")),n.css("opacity",o.opacity)},stop:function(e,i,s){var n=s.options;n._opacity&&t(i.helper).css("opacity",n._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(e,i,s){var n=s.options,o=!1,a=s.scrollParentNotHidden[0],r=s.document[0];a!==r&&"HTML"!==a.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+a.offsetHeight-e.pageY<n.scrollSensitivity?a.scrollTop=o=a.scrollTop+n.scrollSpeed:e.pageY-s.overflowOffset.top<n.scrollSensitivity&&(a.scrollTop=o=a.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+a.offsetWidth-e.pageX<n.scrollSensitivity?a.scrollLeft=o=a.scrollLeft+n.scrollSpeed:e.pageX-s.overflowOffset.left<n.scrollSensitivity&&(a.scrollLeft=o=a.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(e.pageY-t(r).scrollTop()<n.scrollSensitivity?o=t(r).scrollTop(t(r).scrollTop()-n.scrollSpeed):t(window).height()-(e.pageY-t(r).scrollTop())<n.scrollSensitivity&&(o=t(r).scrollTop(t(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(e.pageX-t(r).scrollLeft()<n.scrollSensitivity?o=t(r).scrollLeft(t(r).scrollLeft()-n.scrollSpeed):t(window).width()-(e.pageX-t(r).scrollLeft())<n.scrollSensitivity&&(o=t(r).scrollLeft(t(r).scrollLeft()+n.scrollSpeed)))),o!==!1&&t.ui.ddmanager&&!n.dropBehaviour&&t.ui.ddmanager.prepareOffsets(s,e)}}),t.ui.plugin.add("draggable","snap",{start:function(e,i,s){var n=s.options;s.snapElements=[],t(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var e=t(this),i=e.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:e.outerWidth(),height:e.outerHeight(),top:i.top,left:i.left})})},drag:function(e,i,s){var n,o,a,r,l,h,c,u,d,p,f=s.options,g=f.snapTolerance,m=i.offset.left,_=m+s.helperProportions.width,v=i.offset.top,b=v+s.helperProportions.height;for(d=s.snapElements.length-1;d>=0;d--)l=s.snapElements[d].left-s.margins.left,h=l+s.snapElements[d].width,c=s.snapElements[d].top-s.margins.top,u=c+s.snapElements[d].height,l-g>_||m>h+g||c-g>b||v>u+g||!t.contains(s.snapElements[d].item.ownerDocument,s.snapElements[d].item)?(s.snapElements[d].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=!1):("inner"!==f.snapMode&&(n=g>=Math.abs(c-b),o=g>=Math.abs(u-v),a=g>=Math.abs(l-_),r=g>=Math.abs(h-m),n&&(i.position.top=s._convertPositionTo("relative",{top:c-s.helperProportions.height,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left)),p=n||o||a||r,"outer"!==f.snapMode&&(n=g>=Math.abs(c-v),o=g>=Math.abs(u-b),a=g>=Math.abs(l-m),r=g>=Math.abs(h-_),n&&(i.position.top=s._convertPositionTo("relative",{top:c,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left)),!s.snapElements[d].snapping&&(n||o||a||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=n||o||a||r||p)}}),t.ui.plugin.add("draggable","stack",{start:function(e,i,s){var n,o=s.options,a=t.makeArray(t(o.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});a.length&&(n=parseInt(t(a[0]).css("zIndex"),10)||0,t(a).each(function(e){t(this).css("zIndex",n+e)}),this.css("zIndex",n+a.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("zIndex")&&(o._zIndex=n.css("zIndex")),n.css("zIndex",o.zIndex)},stop:function(e,i,s){var n=s.options;n._zIndex&&t(i.helper).css("zIndex",n._zIndex)}}),t.ui.draggable,t.widget("ui.droppable",{version:"1.12.1",widgetEventPrefix:"drop",options:{accept:"*",addClasses:!0,greedy:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=t.isFunction(s)?s:function(t){return t.is(s)},this.proportions=function(){return arguments.length?(e=arguments[0],void 0):e?e:e={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this._addClass("ui-droppable")},_addToManager:function(e){t.ui.ddmanager.droppables[e]=t.ui.ddmanager.droppables[e]||[],t.ui.ddmanager.droppables[e].push(this)},_splice:function(t){for(var e=0;t.length>e;e++)t[e]===this&&t.splice(e,1)},_destroy:function(){var e=t.ui.ddmanager.droppables[this.options.scope];this._splice(e)},_setOption:function(e,i){if("accept"===e)this.accept=t.isFunction(i)?i:function(t){return t.is(i)};else if("scope"===e){var s=t.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(e,i)},_activate:function(e){var i=t.ui.ddmanager.current;this._addActiveClass(),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this._removeActiveClass(),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._addHoverClass(),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._removeHoverClass(),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=t(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&u(s,t.extend(i,{offset:i.element.offset()}),i.options.tolerance,e)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this._removeActiveClass(),this._removeHoverClass(),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}},_addHoverClass:function(){this._addClass("ui-droppable-hover")},_removeHoverClass:function(){this._removeClass("ui-droppable-hover")},_addActiveClass:function(){this._addClass("ui-droppable-active")},_removeActiveClass:function(){this._removeClass("ui-droppable-active")}});var u=t.ui.intersect=function(){function t(t,e,i){return t>=e&&e+i>t}return function(e,i,s,n){if(!i.offset)return!1;var o=(e.positionAbs||e.position.absolute).left+e.margins.left,a=(e.positionAbs||e.position.absolute).top+e.margins.top,r=o+e.helperProportions.width,l=a+e.helperProportions.height,h=i.offset.left,c=i.offset.top,u=h+i.proportions().width,d=c+i.proportions().height;switch(s){case"fit":return o>=h&&u>=r&&a>=c&&d>=l;case"intersect":return o+e.helperProportions.width/2>h&&u>r-e.helperProportions.width/2&&a+e.helperProportions.height/2>c&&d>l-e.helperProportions.height/2;case"pointer":return t(n.pageY,c,i.proportions().height)&&t(n.pageX,h,i.proportions().width);case"touch":return(a>=c&&d>=a||l>=c&&d>=l||c>a&&l>d)&&(o>=h&&u>=o||r>=h&&u>=r||h>o&&r>u);default:return!1}}}();t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions().height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions({width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight}))}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&u(e,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").on("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,o,a=u(e,this,this.options.tolerance,i),r=!a&&this.isover?"isout":a&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,o=this.element.parents(":data(ui-droppable)").filter(function(){return t(this).droppable("instance").options.scope===n}),o.length&&(s=t(o[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").off("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}},t.uiBackCompat!==!1&&t.widget("ui.droppable",t.ui.droppable,{options:{hoverClass:!1,activeClass:!1},_addActiveClass:function(){this._super(),this.options.activeClass&&this.element.addClass(this.options.activeClass)},_removeActiveClass:function(){this._super(),this.options.activeClass&&this.element.removeClass(this.options.activeClass)},_addHoverClass:function(){this._super(),this.options.hoverClass&&this.element.addClass(this.options.hoverClass)},_removeHoverClass:function(){this._super(),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass)}}),t.ui.droppable,t.widget("ui.resizable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)},_create:function(){var e,i=this.options,s=this;this._addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!i.aspectRatio,aspectRatio:i.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:i.helper||i.ghost||i.animate?i.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,e={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(e),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(e),this._proportionallyResize()),this._setupHandles(),i.autoHide&&t(this.element).on("mouseenter",function(){i.disabled||(s._removeClass("ui-resizable-autohide"),s._handles.show())}).on("mouseleave",function(){i.disabled||s.resizing||(s._addClass("ui-resizable-autohide"),s._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeData("resizable").removeData("ui-resizable").off(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;default:}},_setupHandles:function(){var e,i,s,n,o,a=this.options,r=this;if(this.handles=a.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=t(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),s=this.handles.split(","),this.handles={},i=0;s.length>i;i++)e=t.trim(s[i]),n="ui-resizable-"+e,o=t("<div>"),this._addClass(o,"ui-resizable-handle "+n),o.css({zIndex:a.zIndex}),this.handles[e]=".ui-resizable-"+e,this.element.append(o);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=t(this.handles[i]),this._on(this.handles[i],{mousedown:r._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){r.resizing||(this.className&&(o=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),r.axis=o&&o[1]?o[1]:"se")}),a.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._handles.remove()},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(e){var i,s,n,o=this.options,a=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),o.containment&&(i+=t(o.containment).scrollLeft()||0,s+=t(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:e.pageX,top:e.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===n?this.axis+"-resize":n),this._addClass("ui-resizable-resizing"),this._propagate("start",e),!0},_mouseDrag:function(e){var i,s,n=this.originalMousePosition,o=this.axis,a=e.pageX-n.left||0,r=e.pageY-n.top||0,l=this._change[o];return this._updatePrevProperties(),l?(i=l.apply(this,[e,a,r]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",e,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,l,h=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseFloat(c.element.css("left"))+(c.position.left-c.originalPosition.left)||null,l=parseFloat(c.element.css("top"))+(c.position.top-c.originalPosition.top)||null,h.animate||this.element.css(t.extend(a,{top:l,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!h.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s,n,o,a=this.options;o={minWidth:this._isNumber(a.minWidth)?a.minWidth:0,maxWidth:this._isNumber(a.maxWidth)?a.maxWidth:1/0,minHeight:this._isNumber(a.minHeight)?a.minHeight:0,maxHeight:this._isNumber(a.maxHeight)?a.maxHeight:1/0},(this._aspectRatio||t)&&(e=o.minHeight*this.aspectRatio,s=o.minWidth/this.aspectRatio,i=o.maxHeight*this.aspectRatio,n=o.maxWidth/this.aspectRatio,e>o.minWidth&&(o.minWidth=e),s>o.minHeight&&(o.minHeight=s),o.maxWidth>i&&(o.maxWidth=i),o.maxHeight>n&&(o.maxHeight=n)),this._vBoundaries=o},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,l=this.originalPosition.top+this.originalSize.height,h=/sw|nw|w/.test(i),c=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&h&&(t.left=r-e.minWidth),s&&h&&(t.left=r-e.maxWidth),a&&c&&(t.top=l-e.minHeight),n&&c&&(t.top=l-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];4>e;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;this._proportionallyResizeElements.length>e;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,l={width:i.size.width-r,height:i.size.height-a},h=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,c=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(l,c&&h?{top:c,left:h}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var e,i,s,n,o,a,r,l=t(this).resizable("instance"),h=l.options,c=l.element,u=h.containment,d=u instanceof t?u.get(0):/parent/.test(u)?c.parent().get(0):u;d&&(l.containerElement=t(d),/document/.test(u)||u===document?(l.containerOffset={left:0,top:0},l.containerPosition={left:0,top:0},l.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(e=t(d),i=[],t(["Top","Right","Left","Bottom"]).each(function(t,s){i[t]=l._num(e.css("padding"+s))}),l.containerOffset=e.offset(),l.containerPosition=e.position(),l.containerSize={height:e.innerHeight()-i[3],width:e.innerWidth()-i[1]},s=l.containerOffset,n=l.containerSize.height,o=l.containerSize.width,a=l._hasScroll(d,"left")?d.scrollWidth:o,r=l._hasScroll(d)?d.scrollHeight:n,l.parentData={element:d,left:s.left,top:s.top,width:a,height:r}))},resize:function(e){var i,s,n,o,a=t(this).resizable("instance"),r=a.options,l=a.containerOffset,h=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement,p=!0;d[0]!==document&&/static/.test(d.css("position"))&&(u=l),h.left<(a._helper?l.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-l.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio,p=!1),a.position.left=r.helper?l.left:0),h.top<(a._helper?l.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-l.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio,p=!1),a.position.top=a._helper?l.top:0),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o?(a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top):(a.offset.left=a.element.offset().left,a.offset.top=a.element.offset().top),i=Math.abs(a.sizeDiff.width+(a._helper?a.offset.left-u.left:a.offset.left-l.left)),s=Math.abs(a.sizeDiff.height+(a._helper?a.offset.top-u.top:a.offset.top-l.top)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio,p=!1)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio,p=!1)),p||(a.position.left=a.prevPosition.left,a.position.top=a.prevPosition.top,a.size.width=a.prevSize.width,a.size.height=a.prevSize.height)},stop:function(){var e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),l=a.outerWidth()-e.sizeDiff.width,h=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:l,height:h}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:l,height:h})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).resizable("instance"),i=e.options;t(i.alsoResize).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseFloat(e.width()),height:parseFloat(e.height()),left:parseFloat(e.css("left")),top:parseFloat(e.css("top"))})})},resize:function(e,i){var s=t(this).resizable("instance"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0};
+t(n.alsoResize).each(function(){var e=t(this),s=t(this).data("ui-resizable-alsoresize"),n={},o=e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(o,function(t,e){var i=(s[e]||0)+(r[e]||0);i&&i>=0&&(n[e]=i||null)}),e.css(n)})},stop:function(){t(this).removeData("ui-resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).resizable("instance"),i=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:i.height,width:i.width,margin:0,left:0,top:0}),e._addClass(e.ghost,"ui-resizable-ghost"),t.uiBackCompat!==!1&&"string"==typeof e.options.ghost&&e.ghost.addClass(this.options.ghost),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).resizable("instance");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).resizable("instance");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e,i=t(this).resizable("instance"),s=i.options,n=i.size,o=i.originalSize,a=i.originalPosition,r=i.axis,l="number"==typeof s.grid?[s.grid,s.grid]:s.grid,h=l[0]||1,c=l[1]||1,u=Math.round((n.width-o.width)/h)*h,d=Math.round((n.height-o.height)/c)*c,p=o.width+u,f=o.height+d,g=s.maxWidth&&p>s.maxWidth,m=s.maxHeight&&f>s.maxHeight,_=s.minWidth&&s.minWidth>p,v=s.minHeight&&s.minHeight>f;s.grid=l,_&&(p+=h),v&&(f+=c),g&&(p-=h),m&&(f-=c),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=a.top-d):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=a.left-u):((0>=f-c||0>=p-h)&&(e=i._getPaddingPlusBorderDimensions(this)),f-c>0?(i.size.height=f,i.position.top=a.top-d):(f=c-e.height,i.size.height=f,i.position.top=a.top+o.height-f),p-h>0?(i.size.width=p,i.position.left=a.left-u):(p=h-e.width,i.size.width=p,i.position.left=a.left+o.width-p))}}),t.ui.resizable,t.widget("ui.selectable",t.ui.mouse,{version:"1.12.1",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e.elementPos=t(e.element[0]).offset(),e.selectees=t(e.options.filter,e.element[0]),e._addClass(e.selectees,"ui-selectee"),e.selectees.each(function(){var i=t(this),s=i.offset(),n={left:s.left-e.elementPos.left,top:s.top-e.elementPos.top};t.data(this,"selectable-item",{element:this,$element:i,left:n.left,top:n.top,right:n.left+i.outerWidth(),bottom:n.top+i.outerHeight(),startselected:!1,selected:i.hasClass("ui-selected"),selecting:i.hasClass("ui-selecting"),unselecting:i.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=t("<div>"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.elementPos=t(this.element[0]).offset(),this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(i._removeClass(s.$element,"ui-selected"),s.selected=!1,i._addClass(s.$element,"ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),i._removeClass(n.$element,s?"ui-unselecting":"ui-selected")._addClass(n.$element,s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,l=e.pageY;return o>r&&(i=r,r=o,o=i),a>l&&(i=l,l=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:l-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),h=!1,c={};i&&i.element!==s.element[0]&&(c.left=i.left+s.elementPos.left,c.right=i.right+s.elementPos.left,c.top=i.top+s.elementPos.top,c.bottom=i.bottom+s.elementPos.top,"touch"===n.tolerance?h=!(c.left>r||o>c.right||c.top>l||a>c.bottom):"fit"===n.tolerance&&(h=c.left>o&&r>c.right&&c.top>a&&l>c.bottom),h?(i.selected&&(s._removeClass(i.$element,"ui-selected"),i.selected=!1),i.unselecting&&(s._removeClass(i.$element,"ui-unselecting"),i.unselecting=!1),i.selecting||(s._addClass(i.$element,"ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,s._addClass(i.$element,"ui-selected"),i.selected=!0):(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,i.startselected&&(s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(s._removeClass(i.$element,"ui-selected"),i.selected=!1,s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-selecting")._addClass(s.$element,"ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}}),t.widget("ui.sortable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return t>=e&&e+i>t},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){var e=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),t.each(this.items,function(){e._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):void 0}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-this.document.scrollTop()<a.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-a.scrollSpeed):this.window.height()-(e.pageY-this.document.scrollTop())<a.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+a.scrollSpeed)),e.pageX-this.document.scrollLeft()<a.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-a.scrollSpeed):this.window.width()-(e.pageX-this.document.scrollLeft())<a.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new t.Event("mouseup",{target:null})),"original"===this.options.helper?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,l=r+t.height,h=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+h>r&&l>s+h,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&l>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var e,i,s="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),n="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),o=s&&n;return o?(e=this._getDragVerticalDirection(),i=this._getDragHorizontalDirection(),this.floating?"right"===i||"down"===e?2:1:e&&("down"===e?2:1)):!1},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],l=[],h=this._connectWith();if(h&&e)for(s=h.length-1;s>=0;s--)for(o=t(h[s],this.document[0]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&l.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(l.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=l.length-1;s>=0;s--)l[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,l,h,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i],this.document[0]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,h=r.length;h>s;s++)l=t(r[s]),l.data(this.widgetName+"-item",a),c.push({item:l,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]);return e._addClass(n,"ui-sortable-placeholder",i||e.currentItem[0].className)._removeClass(n,"ui-sortable-helper"),"tbody"===s?e._createTrPlaceholder(e.currentItem.find("tr").eq(0),t("<tr>",e.document[0]).appendTo(n)):"tr"===s?e._createTrPlaceholder(e.currentItem,n):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_createTrPlaceholder:function(e,i){var s=this;e.children().each(function(){t("<td>&#160;</td>",s.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(e){var i,s,n,o,a,r,l,h,c,u,d=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!t.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(d&&t.contains(this.containers[i].element[0],d.element[0]))continue;d=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",e,this._uiHash(this)),this.containers[i].containerCache.over=0);if(d)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,o=null,c=d.floating||this._isFloating(this.currentItem),a=c?"left":"top",r=c?"width":"height",u=c?"pageX":"pageY",s=this.items.length-1;s>=0;s--)t.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(l=this.items[s].item.offset()[a],h=!1,e[u]-l>this.items[s][r]/2&&(h=!0),n>Math.abs(e[u]-l)&&(n=Math.abs(e[u]-l),o=this.items[s],this.direction=h?"up":"down"));if(!o&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;o?this._rearrange(e,o,null,!0):this._rearrange(e,null,this.containers[p].element,!0),this._trigger("change",e,this._uiHash()),this.containers[p]._trigger("change",e,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,l=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():l?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():l?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}}),t.widget("ui.accordion",{version:"1.12.1",options:{active:0,animate:{},classes:{"ui-accordion-header":"ui-corner-top","ui-accordion-header-collapsed":"ui-corner-all","ui-accordion-content":"ui-corner-bottom"},collapsible:!1,event:"click",header:"> li > :first-child, > :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var e=this.options;this.prevShow=this.prevHide=t(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),e.collapsible||e.active!==!1&&null!=e.active||(e.active=0),this._processPanels(),0>e.active&&(e.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():t()}},_createIcons:function(){var e,i,s=this.options.icons;s&&(e=t("<span>"),this._addClass(e,"ui-accordion-header-icon","ui-icon "+s.header),e.prependTo(this.headers),i=this.active.children(".ui-accordion-header-icon"),this._removeClass(i,s.header)._addClass(i,null,s.activeHeader)._addClass(this.headers,"ui-accordion-icons"))
+},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||this.options.active!==!1||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons()),void 0)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t),this._toggleClass(this.headers.add(this.headers.next()),null,"ui-state-disabled",!!t)},_keydown:function(e){if(!e.altKey&&!e.ctrlKey){var i=t.ui.keyCode,s=this.headers.length,n=this.headers.index(e.target),o=!1;switch(e.keyCode){case i.RIGHT:case i.DOWN:o=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:o=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(e);break;case i.HOME:o=this.headers[0];break;case i.END:o=this.headers[s-1]}o&&(t(e.target).attr("tabIndex",-1),t(o).attr("tabIndex",0),t(o).trigger("focus"),e.preventDefault())}},_panelKeyDown:function(e){e.keyCode===t.ui.keyCode.UP&&e.ctrlKey&&t(e.currentTarget).prev().trigger("focus")},refresh:function(){var e=this.options;this._processPanels(),e.active===!1&&e.collapsible===!0||!this.headers.length?(e.active=!1,this.active=t()):e.active===!1?this._activate(0):this.active.length&&!t.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(e.active=!1,this.active=t()):this._activate(Math.max(0,e.active-1)):e.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var t=this.headers,e=this.panels;this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),e&&(this._off(t.not(this.headers)),this._off(e.not(this.panels)))},_refresh:function(){var e,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var e=t(this),i=e.uniqueId().attr("id"),s=e.next(),n=s.uniqueId().attr("id");e.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(e=n.height(),this.element.siblings(":visible").each(function(){var i=t(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(e-=i.outerHeight(!0))}),this.headers.each(function(){e-=t(this).outerHeight(!0)}),this.headers.next().each(function(){t(this).height(Math.max(0,e-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===s&&(e=0,this.headers.next().each(function(){var i=t(this).is(":visible");i||t(this).show(),e=Math.max(e,t(this).css("height","").height()),i||t(this).hide()}).height(e))},_activate:function(e){var i=this._findActive(e)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return"number"==typeof e?this.headers.eq(e):t()},_setupEvents:function(e){var i={keydown:"_keydown"};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(e){var i,s,n=this.options,o=this.active,a=t(e.currentTarget),r=a[0]===o[0],l=r&&n.collapsible,h=l?t():a.next(),c=o.next(),u={oldHeader:o,oldPanel:c,newHeader:l?t():a,newPanel:h};e.preventDefault(),r&&!n.collapsible||this._trigger("beforeActivate",e,u)===!1||(n.active=l?!1:this.headers.index(a),this.active=r?t():a,this._toggle(u),this._removeClass(o,"ui-accordion-header-active","ui-state-active"),n.icons&&(i=o.children(".ui-accordion-header-icon"),this._removeClass(i,null,n.icons.activeHeader)._addClass(i,null,n.icons.header)),r||(this._removeClass(a,"ui-accordion-header-collapsed")._addClass(a,"ui-accordion-header-active","ui-state-active"),n.icons&&(s=a.children(".ui-accordion-header-icon"),this._removeClass(s,null,n.icons.header)._addClass(s,null,n.icons.activeHeader)),this._addClass(a.next(),"ui-accordion-content-active")))},_toggle:function(e){var i=e.newPanel,s=this.prevShow.length?this.prevShow:e.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,e):(s.hide(),i.show(),this._toggleComplete(e)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(t(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(t,e,i){var s,n,o,a=this,r=0,l=t.css("box-sizing"),h=t.length&&(!e.length||t.index()<e.index()),c=this.options.animate||{},u=h&&c.down||c,d=function(){a._toggleComplete(i)};return"number"==typeof u&&(o=u),"string"==typeof u&&(n=u),n=n||u.easing||c.easing,o=o||u.duration||c.duration,e.length?t.length?(s=t.show().outerHeight(),e.animate(this.hideProps,{duration:o,easing:n,step:function(t,e){e.now=Math.round(t)}}),t.hide().animate(this.showProps,{duration:o,easing:n,complete:d,step:function(t,i){i.now=Math.round(t),"height"!==i.prop?"content-box"===l&&(r+=i.now):"content"!==a.options.heightStyle&&(i.now=Math.round(s-e.outerHeight()-r),r=0)}}),void 0):e.animate(this.hideProps,o,n,d):t.animate(this.showProps,o,n,d)},_toggleComplete:function(t){var e=t.oldPanel,i=e.prev();this._removeClass(e,"ui-accordion-content-active"),this._removeClass(i,"ui-accordion-header-active")._addClass(i,"ui-accordion-header-collapsed"),e.length&&(e.parent()[0].className=e.parent()[0].className),this._trigger("activate",null,t)}}),t.widget("ui.menu",{version:"1.12.1",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault()},"click .ui-menu-item":function(e){var i=t(e.target),s=t(t.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(e),e.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(e):!this.element.is(":focus")&&s.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){if(!this.previousFilter){var i=t(e.target).closest(".ui-menu-item"),s=t(e.currentTarget);i[0]===s[0]&&(this._removeClass(s.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(e,s))}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.find(this.options.items).eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){var i=!t.contains(this.element[0],t.ui.safeActiveElement(this.document[0]));i&&this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t),this.mouseHandled=!1}})},_destroy:function(){var e=this.element.find(".ui-menu-item").removeAttr("role aria-disabled"),i=e.children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),i.children().each(function(){var e=t(this);e.data("ui-menu-submenu-caret")&&e.remove()})},_keydown:function(e){var i,s,n,o,a=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:a=!1,s=this.previousFilter||"",o=!1,n=e.keyCode>=96&&105>=e.keyCode?""+(e.keyCode-96):String.fromCharCode(e.keyCode),clearTimeout(this.filterTimer),n===s?o=!0:n=s+n,i=this._filterMenuItems(n),i=o&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(e.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(e,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}a&&e.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i,s,n,o,a=this,r=this.options.icons.submenu,l=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),s=l.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),i=e.prev(),s=t("<span>").data("ui-menu-submenu-caret",!0);a._addClass(s,"ui-menu-icon","ui-icon "+r),i.attr("aria-haspopup","true").prepend(s),e.attr("aria-labelledby",i.attr("id"))}),this._addClass(s,"ui-menu","ui-widget ui-widget-content ui-front"),e=l.add(this.element),i=e.find(this.options.items),i.not(".ui-menu-item").each(function(){var e=t(this);a._isDivider(e)&&a._addClass(e,"ui-menu-divider","ui-widget-content")}),n=i.not(".ui-menu-item, .ui-menu-divider"),o=n.children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(n,"ui-menu-item")._addClass(o,"ui-menu-item-wrapper"),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){if("icons"===t){var i=this.element.find(".ui-menu-icon");this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)}this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t+""),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i,s,n;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children(".ui-menu-item-wrapper"),this._addClass(s,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),n=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(n,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.outerHeight(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this._removeClass(s.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(e){return!t(e.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(e),void 0)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items).first())),void 0):(this.next(e),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(e){this.active=this.active||t(e.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(e,!0),this._trigger("select",e,i)},_filterMenuItems:function(e){var i=e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(t.trim(t(this).children(".ui-menu-item-wrapper").text()))})}}),t.widget("ui.autocomplete",{version:"1.12.1",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;this.isMultiLine=o||!a&&this._isContentEditable(this.element),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,void 0;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),void 0):(this._searchTimeout(t),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(t),this._change(t),void 0)}}),this._initSource(),this.menu=t("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(e){e.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,this.element[0]!==t.ui.safeActiveElement(this.document[0])&&this.element.trigger("focus")})},menufocus:function(e,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,e.originalEvent&&/^mouse/.test(e.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){t(e.target).trigger(e.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",e,{item:n})&&e.originalEvent&&/^key/.test(e.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&t.trim(s).length&&(this.liveRegion.children().hide(),t("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,i){var s=i.item.data("ui-autocomplete-item"),n=this.previous;this.element[0]!==t.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=n,this._delay(function(){this.previous=n,this.selectedItem=s})),!1!==this._trigger("select",e,{item:s})&&this._value(s.value),this.term=this._value(),this.close(e),this.selectedItem=s}}),this.liveRegion=t("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(e){var i=this.menu.element[0];return e.target===this.element[0]||e.target===i||t.contains(i,e.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_initSource:function(){var e,i,s=this;t.isArray(this.options.source)?(e=this.options.source,this.source=function(i,s){s(t.ui.autocomplete.filter(e,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(e,n){s.xhr&&s.xhr.abort(),s.xhr=t.ajax({url:i,data:e,dataType:"json",success:function(t){n(t)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(t){clearTimeout(this.searching),this.searching=this._delay(function(){var e=this.term===this._value(),i=this.menu.element.is(":visible"),s=t.altKey||t.ctrlKey||t.metaKey||t.shiftKey;(!e||e&&!i&&!s)&&(this.selectedItem=null,this.search(null,t))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):this._trigger("search",e)!==!1?this._search(t):void 0},_search:function(t){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return t.proxy(function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")},this)},__response:function(t){t&&(t=this._normalize(t)),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(e){return e.length&&e[0].label&&e[0].value?e:t.map(e,function(e){return"string"==typeof e?{label:e,value:e}:t.extend({},e,{label:e.label||e.value,value:e.value||e.label})})},_suggest:function(e){var i=this.menu.element.empty();this._renderMenu(i,e),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(t.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(e,i){var s=this;t.each(i,function(t,i){s._renderItemData(e,i)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(e,i){return t("<li>").append(t("<div>").text(i.label)).appendTo(e)},_move:function(t,e){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[t](e),void 0):(this.search(null,e),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),t.extend(t.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(e,i){var s=RegExp(t.ui.autocomplete.escapeRegex(i),"i");return t.grep(e,function(t){return s.test(t.label||t.value||t)})}}),t.widget("ui.autocomplete",t.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(t>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=e&&e.length?this.options.messages.results(e.length):this.options.messages.noResults,this.liveRegion.children().hide(),t("<div>").text(i).appendTo(this.liveRegion))}}),t.ui.autocomplete;var d=/ui-corner-([a-z]){2,6}/g;t.widget("ui.controlgroup",{version:"1.12.1",defaultElement:"<div>",options:{direction:"horizontal",disabled:null,onlyVisible:!0,items:{button:"input[type=button], input[type=submit], input[type=reset], button, a",controlgroupLabel:".ui-controlgroup-label",checkboxradio:"input[type='checkbox'], input[type='radio']",selectmenu:"select",spinner:".ui-spinner-input"}},_create:function(){this._enhance()},_enhance:function(){this.element.attr("role","toolbar"),this.refresh()},_destroy:function(){this._callChildMethod("destroy"),this.childWidgets.removeData("ui-controlgroup-data"),this.element.removeAttr("role"),this.options.items.controlgroupLabel&&this.element.find(this.options.items.controlgroupLabel).find(".ui-controlgroup-label-contents").contents().unwrap()},_initWidgets:function(){var e=this,i=[];t.each(this.options.items,function(s,n){var o,a={};return n?"controlgroupLabel"===s?(o=e.element.find(n),o.each(function(){var e=t(this);e.children(".ui-controlgroup-label-contents").length||e.contents().wrapAll("<span class='ui-controlgroup-label-contents'></span>")}),e._addClass(o,null,"ui-widget ui-widget-content ui-state-default"),i=i.concat(o.get()),void 0):(t.fn[s]&&(a=e["_"+s+"Options"]?e["_"+s+"Options"]("middle"):{classes:{}},e.element.find(n).each(function(){var n=t(this),o=n[s]("instance"),r=t.widget.extend({},a);if("button"!==s||!n.parent(".ui-spinner").length){o||(o=n[s]()[s]("instance")),o&&(r.classes=e._resolveClassesValues(r.classes,o)),n[s](r);var l=n[s]("widget");t.data(l[0],"ui-controlgroup-data",o?o:n[s]("instance")),i.push(l[0])}})),void 0):void 0}),this.childWidgets=t(t.unique(i)),this._addClass(this.childWidgets,"ui-controlgroup-item")},_callChildMethod:function(e){this.childWidgets.each(function(){var i=t(this),s=i.data("ui-controlgroup-data");s&&s[e]&&s[e]()})},_updateCornerClass:function(t,e){var i="ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all",s=this._buildSimpleOptions(e,"label").classes.label;this._removeClass(t,null,i),this._addClass(t,null,s)},_buildSimpleOptions:function(t,e){var i="vertical"===this.options.direction,s={classes:{}};return s.classes[e]={middle:"",first:"ui-corner-"+(i?"top":"left"),last:"ui-corner-"+(i?"bottom":"right"),only:"ui-corner-all"}[t],s},_spinnerOptions:function(t){var e=this._buildSimpleOptions(t,"ui-spinner");return e.classes["ui-spinner-up"]="",e.classes["ui-spinner-down"]="",e},_buttonOptions:function(t){return this._buildSimpleOptions(t,"ui-button")},_checkboxradioOptions:function(t){return this._buildSimpleOptions(t,"ui-checkboxradio-label")},_selectmenuOptions:function(t){var e="vertical"===this.options.direction;return{width:e?"auto":!1,classes:{middle:{"ui-selectmenu-button-open":"","ui-selectmenu-button-closed":""},first:{"ui-selectmenu-button-open":"ui-corner-"+(e?"top":"tl"),"ui-selectmenu-button-closed":"ui-corner-"+(e?"top":"left")},last:{"ui-selectmenu-button-open":e?"":"ui-corner-tr","ui-selectmenu-button-closed":"ui-corner-"+(e?"bottom":"right")},only:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"}}[t]}},_resolveClassesValues:function(e,i){var s={};return t.each(e,function(n){var o=i.options.classes[n]||"";o=t.trim(o.replace(d,"")),s[n]=(o+" "+e[n]).replace(/\s+/g," ")}),s},_setOption:function(t,e){return"direction"===t&&this._removeClass("ui-controlgroup-"+this.options.direction),this._super(t,e),"disabled"===t?(this._callChildMethod(e?"disable":"enable"),void 0):(this.refresh(),void 0)},refresh:function(){var e,i=this;this._addClass("ui-controlgroup ui-controlgroup-"+this.options.direction),"horizontal"===this.options.direction&&this._addClass(null,"ui-helper-clearfix"),this._initWidgets(),e=this.childWidgets,this.options.onlyVisible&&(e=e.filter(":visible")),e.length&&(t.each(["first","last"],function(t,s){var n=e[s]().data("ui-controlgroup-data");if(n&&i["_"+n.widgetName+"Options"]){var o=i["_"+n.widgetName+"Options"](1===e.length?"only":s);o.classes=i._resolveClassesValues(o.classes,n),n.element[n.widgetName](o)}else i._updateCornerClass(e[s](),s)}),this._callChildMethod("refresh"))}}),t.widget("ui.checkboxradio",[t.ui.formResetMixin,{version:"1.12.1",options:{disabled:null,label:null,icon:!0,classes:{"ui-checkboxradio-label":"ui-corner-all","ui-checkboxradio-icon":"ui-corner-all"}},_getCreateOptions:function(){var e,i,s=this,n=this._super()||{};return this._readType(),i=this.element.labels(),this.label=t(i[i.length-1]),this.label.length||t.error("No label found for checkboxradio widget"),this.originalLabel="",this.label.contents().not(this.element[0]).each(function(){s.originalLabel+=3===this.nodeType?t(this).text():this.outerHTML}),this.originalLabel&&(n.label=this.originalLabel),e=this.element[0].disabled,null!=e&&(n.disabled=e),n},_create:function(){var t=this.element[0].checked;this._bindFormResetHandler(),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled),this._setOption("disabled",this.options.disabled),this._addClass("ui-checkboxradio","ui-helper-hidden-accessible"),this._addClass(this.label,"ui-checkboxradio-label","ui-button ui-widget"),"radio"===this.type&&this._addClass(this.label,"ui-checkboxradio-radio-label"),this.options.label&&this.options.label!==this.originalLabel?this._updateLabel():this.originalLabel&&(this.options.label=this.originalLabel),this._enhance(),t&&(this._addClass(this.label,"ui-checkboxradio-checked","ui-state-active"),this.icon&&this._addClass(this.icon,null,"ui-state-hover")),this._on({change:"_toggleClasses",focus:function(){this._addClass(this.label,null,"ui-state-focus ui-visual-focus")},blur:function(){this._removeClass(this.label,null,"ui-state-focus ui-visual-focus")}})},_readType:function(){var e=this.element[0].nodeName.toLowerCase();this.type=this.element[0].type,"input"===e&&/radio|checkbox/.test(this.type)||t.error("Can't create checkboxradio on element.nodeName="+e+" and element.type="+this.type)},_enhance:function(){this._updateIcon(this.element[0].checked)},widget:function(){return this.label},_getRadioGroup:function(){var e,i=this.element[0].name,s="input[name='"+t.ui.escapeSelector(i)+"']";return i?(e=this.form.length?t(this.form[0].elements).filter(s):t(s).filter(function(){return 0===t(this).form().length}),e.not(this.element)):t([])},_toggleClasses:function(){var e=this.element[0].checked;this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",e),this.options.icon&&"checkbox"===this.type&&this._toggleClass(this.icon,null,"ui-icon-check ui-state-checked",e)._toggleClass(this.icon,null,"ui-icon-blank",!e),"radio"===this.type&&this._getRadioGroup().each(function(){var e=t(this).checkboxradio("instance");e&&e._removeClass(e.label,"ui-checkboxradio-checked","ui-state-active")})},_destroy:function(){this._unbindFormResetHandler(),this.icon&&(this.icon.remove(),this.iconSpace.remove())},_setOption:function(t,e){return"label"!==t||e?(this._super(t,e),"disabled"===t?(this._toggleClass(this.label,null,"ui-state-disabled",e),this.element[0].disabled=e,void 0):(this.refresh(),void 0)):void 0},_updateIcon:function(e){var i="ui-icon ui-icon-background ";this.options.icon?(this.icon||(this.icon=t("<span>"),this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-checkboxradio-icon-space")),"checkbox"===this.type?(i+=e?"ui-icon-check ui-state-checked":"ui-icon-blank",this._removeClass(this.icon,null,e?"ui-icon-blank":"ui-icon-check")):i+="ui-icon-blank",this._addClass(this.icon,"ui-checkboxradio-icon",i),e||this._removeClass(this.icon,null,"ui-icon-check ui-state-checked"),this.icon.prependTo(this.label).after(this.iconSpace)):void 0!==this.icon&&(this.icon.remove(),this.iconSpace.remove(),delete this.icon)
+},_updateLabel:function(){var t=this.label.contents().not(this.element[0]);this.icon&&(t=t.not(this.icon[0])),this.iconSpace&&(t=t.not(this.iconSpace[0])),t.remove(),this.label.append(this.options.label)},refresh:function(){var t=this.element[0].checked,e=this.element[0].disabled;this._updateIcon(t),this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",t),null!==this.options.label&&this._updateLabel(),e!==this.options.disabled&&this._setOptions({disabled:e})}}]),t.ui.checkboxradio,t.widget("ui.button",{version:"1.12.1",defaultElement:"<button>",options:{classes:{"ui-button":"ui-corner-all"},disabled:null,icon:null,iconPosition:"beginning",label:null,showLabel:!0},_getCreateOptions:function(){var t,e=this._super()||{};return this.isInput=this.element.is("input"),t=this.element[0].disabled,null!=t&&(e.disabled=t),this.originalLabel=this.isInput?this.element.val():this.element.html(),this.originalLabel&&(e.label=this.originalLabel),e},_create:function(){!this.option.showLabel&!this.options.icon&&(this.options.showLabel=!0),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled||!1),this.hasTitle=!!this.element.attr("title"),this.options.label&&this.options.label!==this.originalLabel&&(this.isInput?this.element.val(this.options.label):this.element.html(this.options.label)),this._addClass("ui-button","ui-widget"),this._setOption("disabled",this.options.disabled),this._enhance(),this.element.is("a")&&this._on({keyup:function(e){e.keyCode===t.ui.keyCode.SPACE&&(e.preventDefault(),this.element[0].click?this.element[0].click():this.element.trigger("click"))}})},_enhance:function(){this.element.is("button")||this.element.attr("role","button"),this.options.icon&&(this._updateIcon("icon",this.options.icon),this._updateTooltip())},_updateTooltip:function(){this.title=this.element.attr("title"),this.options.showLabel||this.title||this.element.attr("title",this.options.label)},_updateIcon:function(e,i){var s="iconPosition"!==e,n=s?this.options.iconPosition:i,o="top"===n||"bottom"===n;this.icon?s&&this._removeClass(this.icon,null,this.options.icon):(this.icon=t("<span>"),this._addClass(this.icon,"ui-button-icon","ui-icon"),this.options.showLabel||this._addClass("ui-button-icon-only")),s&&this._addClass(this.icon,null,i),this._attachIcon(n),o?(this._addClass(this.icon,null,"ui-widget-icon-block"),this.iconSpace&&this.iconSpace.remove()):(this.iconSpace||(this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-button-icon-space")),this._removeClass(this.icon,null,"ui-wiget-icon-block"),this._attachIconSpace(n))},_destroy:function(){this.element.removeAttr("role"),this.icon&&this.icon.remove(),this.iconSpace&&this.iconSpace.remove(),this.hasTitle||this.element.removeAttr("title")},_attachIconSpace:function(t){this.icon[/^(?:end|bottom)/.test(t)?"before":"after"](this.iconSpace)},_attachIcon:function(t){this.element[/^(?:end|bottom)/.test(t)?"append":"prepend"](this.icon)},_setOptions:function(t){var e=void 0===t.showLabel?this.options.showLabel:t.showLabel,i=void 0===t.icon?this.options.icon:t.icon;e||i||(t.showLabel=!0),this._super(t)},_setOption:function(t,e){"icon"===t&&(e?this._updateIcon(t,e):this.icon&&(this.icon.remove(),this.iconSpace&&this.iconSpace.remove())),"iconPosition"===t&&this._updateIcon(t,e),"showLabel"===t&&(this._toggleClass("ui-button-icon-only",null,!e),this._updateTooltip()),"label"===t&&(this.isInput?this.element.val(e):(this.element.html(e),this.icon&&(this._attachIcon(this.options.iconPosition),this._attachIconSpace(this.options.iconPosition)))),this._super(t,e),"disabled"===t&&(this._toggleClass(null,"ui-state-disabled",e),this.element[0].disabled=e,e&&this.element.blur())},refresh:function(){var t=this.element.is("input, button")?this.element[0].disabled:this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOptions({disabled:t}),this._updateTooltip()}}),t.uiBackCompat!==!1&&(t.widget("ui.button",t.ui.button,{options:{text:!0,icons:{primary:null,secondary:null}},_create:function(){this.options.showLabel&&!this.options.text&&(this.options.showLabel=this.options.text),!this.options.showLabel&&this.options.text&&(this.options.text=this.options.showLabel),this.options.icon||!this.options.icons.primary&&!this.options.icons.secondary?this.options.icon&&(this.options.icons.primary=this.options.icon):this.options.icons.primary?this.options.icon=this.options.icons.primary:(this.options.icon=this.options.icons.secondary,this.options.iconPosition="end"),this._super()},_setOption:function(t,e){return"text"===t?(this._super("showLabel",e),void 0):("showLabel"===t&&(this.options.text=e),"icon"===t&&(this.options.icons.primary=e),"icons"===t&&(e.primary?(this._super("icon",e.primary),this._super("iconPosition","beginning")):e.secondary&&(this._super("icon",e.secondary),this._super("iconPosition","end"))),this._superApply(arguments),void 0)}}),t.fn.button=function(e){return function(){return!this.length||this.length&&"INPUT"!==this[0].tagName||this.length&&"INPUT"===this[0].tagName&&"checkbox"!==this.attr("type")&&"radio"!==this.attr("type")?e.apply(this,arguments):(t.ui.checkboxradio||t.error("Checkboxradio widget missing"),0===arguments.length?this.checkboxradio({icon:!1}):this.checkboxradio.apply(this,arguments))}}(t.fn.button),t.fn.buttonset=function(){return t.ui.controlgroup||t.error("Controlgroup widget missing"),"option"===arguments[0]&&"items"===arguments[1]&&arguments[2]?this.controlgroup.apply(this,[arguments[0],"items.button",arguments[2]]):"option"===arguments[0]&&"items"===arguments[1]?this.controlgroup.apply(this,[arguments[0],"items.button"]):("object"==typeof arguments[0]&&arguments[0].items&&(arguments[0].items={button:arguments[0].items}),this.controlgroup.apply(this,arguments))}),t.ui.button,t.extend(t.ui,{datepicker:{version:"1.12.1"}});var p;t.extend(s.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(t){return a(this._defaults,t||{}),this},_attachDatepicker:function(e,i){var s,n,o;s=e.nodeName.toLowerCase(),n="div"===s||"span"===s,e.id||(this.uuid+=1,e.id="dp"+this.uuid),o=this._newInst(t(e),n),o.settings=t.extend({},i||{}),"input"===s?this._connectDatepicker(e,o):n&&this._inlineDatepicker(e,o)},_newInst:function(e,i){var s=e[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:s,input:e,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?n(t("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(e,i){var s=t(e);i.append=t([]),i.trigger=t([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).on("keydown",this._doKeyDown).on("keypress",this._doKeyPress).on("keyup",this._doKeyUp),this._autoSize(i),t.data(e,"datepicker",i),i.settings.disabled&&this._disableDatepicker(e))},_attachments:function(e,i){var s,n,o,a=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),a&&(i.append=t("<span class='"+this._appendClass+"'>"+a+"</span>"),e[r?"before":"after"](i.append)),e.off("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&e.on("focus",this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),o=this._get(i,"buttonImage"),i.trigger=t(this._get(i,"buttonImageOnly")?t("<img/>").addClass(this._triggerClass).attr({src:o,alt:n,title:n}):t("<button type='button'></button>").addClass(this._triggerClass).html(o?t("<img/>").attr({src:o,alt:n,title:n}):n)),e[r?"before":"after"](i.trigger),i.trigger.on("click",function(){return t.datepicker._datepickerShowing&&t.datepicker._lastInput===e[0]?t.datepicker._hideDatepicker():t.datepicker._datepickerShowing&&t.datepicker._lastInput!==e[0]?(t.datepicker._hideDatepicker(),t.datepicker._showDatepicker(e[0])):t.datepicker._showDatepicker(e[0]),!1}))},_autoSize:function(t){if(this._get(t,"autoSize")&&!t.inline){var e,i,s,n,o=new Date(2009,11,20),a=this._get(t,"dateFormat");a.match(/[DM]/)&&(e=function(t){for(i=0,s=0,n=0;t.length>n;n++)t[n].length>i&&(i=t[n].length,s=n);return s},o.setMonth(e(this._get(t,a.match(/MM/)?"monthNames":"monthNamesShort"))),o.setDate(e(this._get(t,a.match(/DD/)?"dayNames":"dayNamesShort"))+20-o.getDay())),t.input.attr("size",this._formatDate(t,o).length)}},_inlineDatepicker:function(e,i){var s=t(e);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),t.data(e,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(e),i.dpDiv.css("display","block"))},_dialogDatepicker:function(e,i,s,n,o){var r,l,h,c,u,d=this._dialogInst;return d||(this.uuid+=1,r="dp"+this.uuid,this._dialogInput=t("<input type='text' id='"+r+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.on("keydown",this._doKeyDown),t("body").append(this._dialogInput),d=this._dialogInst=this._newInst(this._dialogInput,!1),d.settings={},t.data(this._dialogInput[0],"datepicker",d)),a(d.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(d,i):i,this._dialogInput.val(i),this._pos=o?o.length?o:[o.pageX,o.pageY]:null,this._pos||(l=document.documentElement.clientWidth,h=document.documentElement.clientHeight,c=document.documentElement.scrollLeft||document.body.scrollLeft,u=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[l/2-100+c,h/2-150+u]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),d.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),t.blockUI&&t.blockUI(this.dpDiv),t.data(this._dialogInput[0],"datepicker",d),this},_destroyDatepicker:function(e){var i,s=t(e),n=t.data(e,"datepicker");s.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),t.removeData(e,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).off("focus",this._showDatepicker).off("keydown",this._doKeyDown).off("keypress",this._doKeyPress).off("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty(),p===n&&(p=null))},_enableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!1,o.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}))},_disableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!0,o.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}),this._disabledInputs[this._disabledInputs.length]=e)},_isDisabledDatepicker:function(t){if(!t)return!1;for(var e=0;this._disabledInputs.length>e;e++)if(this._disabledInputs[e]===t)return!0;return!1},_getInst:function(e){try{return t.data(e,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(e,i,s){var n,o,r,l,h=this._getInst(e);return 2===arguments.length&&"string"==typeof i?"defaults"===i?t.extend({},t.datepicker._defaults):h?"all"===i?t.extend({},h.settings):this._get(h,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),h&&(this._curInst===h&&this._hideDatepicker(),o=this._getDateDatepicker(e,!0),r=this._getMinMaxDate(h,"min"),l=this._getMinMaxDate(h,"max"),a(h.settings,n),null!==r&&void 0!==n.dateFormat&&void 0===n.minDate&&(h.settings.minDate=this._formatDate(h,r)),null!==l&&void 0!==n.dateFormat&&void 0===n.maxDate&&(h.settings.maxDate=this._formatDate(h,l)),"disabled"in n&&(n.disabled?this._disableDatepicker(e):this._enableDatepicker(e)),this._attachments(t(e),h),this._autoSize(h),this._setDate(h,o),this._updateAlternate(h),this._updateDatepicker(h)),void 0)},_changeDatepicker:function(t,e,i){this._optionDatepicker(t,e,i)},_refreshDatepicker:function(t){var e=this._getInst(t);e&&this._updateDatepicker(e)},_setDateDatepicker:function(t,e){var i=this._getInst(t);i&&(this._setDate(i,e),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(t,e){var i=this._getInst(t);return i&&!i.inline&&this._setDateFromField(i,e),i?this._getDate(i):null},_doKeyDown:function(e){var i,s,n,o=t.datepicker._getInst(e.target),a=!0,r=o.dpDiv.is(".ui-datepicker-rtl");if(o._keyEvent=!0,t.datepicker._datepickerShowing)switch(e.keyCode){case 9:t.datepicker._hideDatepicker(),a=!1;break;case 13:return n=t("td."+t.datepicker._dayOverClass+":not(."+t.datepicker._currentClass+")",o.dpDiv),n[0]&&t.datepicker._selectDay(e.target,o.selectedMonth,o.selectedYear,n[0]),i=t.datepicker._get(o,"onSelect"),i?(s=t.datepicker._formatDate(o),i.apply(o.input?o.input[0]:null,[s,o])):t.datepicker._hideDatepicker(),!1;case 27:t.datepicker._hideDatepicker();break;case 33:t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 34:t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 35:(e.ctrlKey||e.metaKey)&&t.datepicker._clearDate(e.target),a=e.ctrlKey||e.metaKey;break;case 36:(e.ctrlKey||e.metaKey)&&t.datepicker._gotoToday(e.target),a=e.ctrlKey||e.metaKey;break;case 37:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?1:-1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 38:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,-7,"D"),a=e.ctrlKey||e.metaKey;break;case 39:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?-1:1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 40:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,7,"D"),a=e.ctrlKey||e.metaKey;break;default:a=!1}else 36===e.keyCode&&e.ctrlKey?t.datepicker._showDatepicker(this):a=!1;a&&(e.preventDefault(),e.stopPropagation())},_doKeyPress:function(e){var i,s,n=t.datepicker._getInst(e.target);return t.datepicker._get(n,"constrainInput")?(i=t.datepicker._possibleChars(t.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),e.ctrlKey||e.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0},_doKeyUp:function(e){var i,s=t.datepicker._getInst(e.target);if(s.input.val()!==s.lastVal)try{i=t.datepicker.parseDate(t.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,t.datepicker._getFormatConfig(s)),i&&(t.datepicker._setDateFromField(s),t.datepicker._updateAlternate(s),t.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(e){if(e=e.target||e,"input"!==e.nodeName.toLowerCase()&&(e=t("input",e.parentNode)[0]),!t.datepicker._isDisabledDatepicker(e)&&t.datepicker._lastInput!==e){var s,n,o,r,l,h,c;s=t.datepicker._getInst(e),t.datepicker._curInst&&t.datepicker._curInst!==s&&(t.datepicker._curInst.dpDiv.stop(!0,!0),s&&t.datepicker._datepickerShowing&&t.datepicker._hideDatepicker(t.datepicker._curInst.input[0])),n=t.datepicker._get(s,"beforeShow"),o=n?n.apply(e,[e,s]):{},o!==!1&&(a(s.settings,o),s.lastVal=null,t.datepicker._lastInput=e,t.datepicker._setDateFromField(s),t.datepicker._inDialog&&(e.value=""),t.datepicker._pos||(t.datepicker._pos=t.datepicker._findPos(e),t.datepicker._pos[1]+=e.offsetHeight),r=!1,t(e).parents().each(function(){return r|="fixed"===t(this).css("position"),!r}),l={left:t.datepicker._pos[0],top:t.datepicker._pos[1]},t.datepicker._pos=null,s.dpDiv.empty(),s.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),t.datepicker._updateDatepicker(s),l=t.datepicker._checkOffset(s,l,r),s.dpDiv.css({position:t.datepicker._inDialog&&t.blockUI?"static":r?"fixed":"absolute",display:"none",left:l.left+"px",top:l.top+"px"}),s.inline||(h=t.datepicker._get(s,"showAnim"),c=t.datepicker._get(s,"duration"),s.dpDiv.css("z-index",i(t(e))+1),t.datepicker._datepickerShowing=!0,t.effects&&t.effects.effect[h]?s.dpDiv.show(h,t.datepicker._get(s,"showOptions"),c):s.dpDiv[h||"show"](h?c:null),t.datepicker._shouldFocusInput(s)&&s.input.trigger("focus"),t.datepicker._curInst=s))}},_updateDatepicker:function(e){this.maxRows=4,p=e,e.dpDiv.empty().append(this._generateHTML(e)),this._attachHandlers(e);var i,s=this._getNumberOfMonths(e),n=s[1],a=17,r=e.dpDiv.find("."+this._dayOverClass+" a");r.length>0&&o.apply(r.get(0)),e.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&e.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),e.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),e.dpDiv[(this._get(e,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),e===t.datepicker._curInst&&t.datepicker._datepickerShowing&&t.datepicker._shouldFocusInput(e)&&e.input.trigger("focus"),e.yearshtml&&(i=e.yearshtml,setTimeout(function(){i===e.yearshtml&&e.yearshtml&&e.dpDiv.find("select.ui-datepicker-year:first").replaceWith(e.yearshtml),i=e.yearshtml=null},0))},_shouldFocusInput:function(t){return t.input&&t.input.is(":visible")&&!t.input.is(":disabled")&&!t.input.is(":focus")},_checkOffset:function(e,i,s){var n=e.dpDiv.outerWidth(),o=e.dpDiv.outerHeight(),a=e.input?e.input.outerWidth():0,r=e.input?e.input.outerHeight():0,l=document.documentElement.clientWidth+(s?0:t(document).scrollLeft()),h=document.documentElement.clientHeight+(s?0:t(document).scrollTop());return i.left-=this._get(e,"isRTL")?n-a:0,i.left-=s&&i.left===e.input.offset().left?t(document).scrollLeft():0,i.top-=s&&i.top===e.input.offset().top+r?t(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>l&&l>n?Math.abs(i.left+n-l):0),i.top-=Math.min(i.top,i.top+o>h&&h>o?Math.abs(o+r):0),i},_findPos:function(e){for(var i,s=this._getInst(e),n=this._get(s,"isRTL");e&&("hidden"===e.type||1!==e.nodeType||t.expr.filters.hidden(e));)e=e[n?"previousSibling":"nextSibling"];return i=t(e).offset(),[i.left,i.top]},_hideDatepicker:function(e){var i,s,n,o,a=this._curInst;!a||e&&a!==t.data(e,"datepicker")||this._datepickerShowing&&(i=this._get(a,"showAnim"),s=this._get(a,"duration"),n=function(){t.datepicker._tidyDialog(a)},t.effects&&(t.effects.effect[i]||t.effects[i])?a.dpDiv.hide(i,t.datepicker._get(a,"showOptions"),s,n):a.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,o=this._get(a,"onClose"),o&&o.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),t.blockUI&&(t.unblockUI(),t("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(t){t.dpDiv.removeClass(this._dialogClass).off(".ui-datepicker-calendar")},_checkExternalClick:function(e){if(t.datepicker._curInst){var i=t(e.target),s=t.datepicker._getInst(i[0]);(i[0].id!==t.datepicker._mainDivId&&0===i.parents("#"+t.datepicker._mainDivId).length&&!i.hasClass(t.datepicker.markerClassName)&&!i.closest("."+t.datepicker._triggerClass).length&&t.datepicker._datepickerShowing&&(!t.datepicker._inDialog||!t.blockUI)||i.hasClass(t.datepicker.markerClassName)&&t.datepicker._curInst!==s)&&t.datepicker._hideDatepicker()}},_adjustDate:function(e,i,s){var n=t(e),o=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(o,i+("M"===s?this._get(o,"showCurrentAtPos"):0),s),this._updateDatepicker(o))},_gotoToday:function(e){var i,s=t(e),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(e,i,s){var n=t(e),o=this._getInst(n[0]);o["selected"+("M"===s?"Month":"Year")]=o["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(o),this._adjustDate(n)},_selectDay:function(e,i,s,n){var o,a=t(e);t(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(a[0])||(o=this._getInst(a[0]),o.selectedDay=o.currentDay=t("a",n).html(),o.selectedMonth=o.currentMonth=i,o.selectedYear=o.currentYear=s,this._selectDate(e,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear)))},_clearDate:function(e){var i=t(e);this._selectDate(i,"")},_selectDate:function(e,i){var s,n=t(e),o=this._getInst(n[0]);i=null!=i?i:this._formatDate(o),o.input&&o.input.val(i),this._updateAlternate(o),s=this._get(o,"onSelect"),s?s.apply(o.input?o.input[0]:null,[i,o]):o.input&&o.input.trigger("change"),o.inline?this._updateDatepicker(o):(this._hideDatepicker(),this._lastInput=o.input[0],"object"!=typeof o.input[0]&&o.input.trigger("focus"),this._lastInput=null)},_updateAlternate:function(e){var i,s,n,o=this._get(e,"altField");o&&(i=this._get(e,"altFormat")||this._get(e,"dateFormat"),s=this._getDate(e),n=this.formatDate(i,s,this._getFormatConfig(e)),t(o).val(n))},noWeekends:function(t){var e=t.getDay();return[e>0&&6>e,""]},iso8601Week:function(t){var e,i=new Date(t.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),e=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((e-i)/864e5)/7)+1},parseDate:function(e,i,s){if(null==e||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,o,a,r,l=0,h=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,c="string"!=typeof h?h:(new Date).getFullYear()%100+parseInt(h,10),u=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,d=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,g=-1,m=-1,_=-1,v=-1,b=!1,y=function(t){var i=e.length>n+1&&e.charAt(n+1)===t;return i&&n++,i},w=function(t){var e=y(t),s="@"===t?14:"!"===t?20:"y"===t&&e?4:"o"===t?3:2,n="y"===t?s:1,o=RegExp("^\\d{"+n+","+s+"}"),a=i.substring(l).match(o);if(!a)throw"Missing number at position "+l;return l+=a[0].length,parseInt(a[0],10)},k=function(e,s,n){var o=-1,a=t.map(y(e)?n:s,function(t,e){return[[e,t]]}).sort(function(t,e){return-(t[1].length-e[1].length)});if(t.each(a,function(t,e){var s=e[1];return i.substr(l,s.length).toLowerCase()===s.toLowerCase()?(o=e[0],l+=s.length,!1):void 0}),-1!==o)return o+1;throw"Unknown name at position "+l},x=function(){if(i.charAt(l)!==e.charAt(n))throw"Unexpected literal at position "+l;l++};for(n=0;e.length>n;n++)if(b)"'"!==e.charAt(n)||y("'")?x():b=!1;else switch(e.charAt(n)){case"d":_=w("d");break;case"D":k("D",u,d);break;case"o":v=w("o");break;case"m":m=w("m");break;case"M":m=k("M",p,f);break;case"y":g=w("y");break;case"@":r=new Date(w("@")),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"!":r=new Date((w("!")-this._ticksTo1970)/1e4),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"'":y("'")?x():b=!0;break;default:x()}if(i.length>l&&(a=i.substr(l),!/^\s+/.test(a)))throw"Extra/unparsed characters found in date: "+a;if(-1===g?g=(new Date).getFullYear():100>g&&(g+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c>=g?0:-100)),v>-1)for(m=1,_=v;;){if(o=this._getDaysInMonth(g,m-1),o>=_)break;m++,_-=o}if(r=this._daylightSavingAdjust(new Date(g,m-1,_)),r.getFullYear()!==g||r.getMonth()+1!==m||r.getDate()!==_)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(t,e,i){if(!e)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,o=(i?i.dayNames:null)||this._defaults.dayNames,a=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,l=function(e){var i=t.length>s+1&&t.charAt(s+1)===e;return i&&s++,i},h=function(t,e,i){var s=""+e;if(l(t))for(;i>s.length;)s="0"+s;return s},c=function(t,e,i,s){return l(t)?s[e]:i[e]},u="",d=!1;if(e)for(s=0;t.length>s;s++)if(d)"'"!==t.charAt(s)||l("'")?u+=t.charAt(s):d=!1;else switch(t.charAt(s)){case"d":u+=h("d",e.getDate(),2);break;case"D":u+=c("D",e.getDay(),n,o);break;case"o":u+=h("o",Math.round((new Date(e.getFullYear(),e.getMonth(),e.getDate()).getTime()-new Date(e.getFullYear(),0,0).getTime())/864e5),3);break;case"m":u+=h("m",e.getMonth()+1,2);break;case"M":u+=c("M",e.getMonth(),a,r);break;case"y":u+=l("y")?e.getFullYear():(10>e.getFullYear()%100?"0":"")+e.getFullYear()%100;break;case"@":u+=e.getTime();break;case"!":u+=1e4*e.getTime()+this._ticksTo1970;break;case"'":l("'")?u+="'":d=!0;break;default:u+=t.charAt(s)}return u},_possibleChars:function(t){var e,i="",s=!1,n=function(i){var s=t.length>e+1&&t.charAt(e+1)===i;return s&&e++,s};for(e=0;t.length>e;e++)if(s)"'"!==t.charAt(e)||n("'")?i+=t.charAt(e):s=!1;else switch(t.charAt(e)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=t.charAt(e)}return i},_get:function(t,e){return void 0!==t.settings[e]?t.settings[e]:this._defaults[e]},_setDateFromField:function(t,e){if(t.input.val()!==t.lastVal){var i=this._get(t,"dateFormat"),s=t.lastVal=t.input?t.input.val():null,n=this._getDefaultDate(t),o=n,a=this._getFormatConfig(t);try{o=this.parseDate(i,s,a)||n}catch(r){s=e?"":s}t.selectedDay=o.getDate(),t.drawMonth=t.selectedMonth=o.getMonth(),t.drawYear=t.selectedYear=o.getFullYear(),t.currentDay=s?o.getDate():0,t.currentMonth=s?o.getMonth():0,t.currentYear=s?o.getFullYear():0,this._adjustInstDate(t)}},_getDefaultDate:function(t){return this._restrictMinMax(t,this._determineDate(t,this._get(t,"defaultDate"),new Date))},_determineDate:function(e,i,s){var n=function(t){var e=new Date;return e.setDate(e.getDate()+t),e},o=function(i){try{return t.datepicker.parseDate(t.datepicker._get(e,"dateFormat"),i,t.datepicker._getFormatConfig(e))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?t.datepicker._getDate(e):null)||new Date,o=n.getFullYear(),a=n.getMonth(),r=n.getDate(),l=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,h=l.exec(i);h;){switch(h[2]||"d"){case"d":case"D":r+=parseInt(h[1],10);break;case"w":case"W":r+=7*parseInt(h[1],10);break;case"m":case"M":a+=parseInt(h[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a));break;case"y":case"Y":o+=parseInt(h[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a))}h=l.exec(i)}return new Date(o,a,r)},a=null==i||""===i?s:"string"==typeof i?o(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return a=a&&"Invalid Date"==""+a?s:a,a&&(a.setHours(0),a.setMinutes(0),a.setSeconds(0),a.setMilliseconds(0)),this._daylightSavingAdjust(a)},_daylightSavingAdjust:function(t){return t?(t.setHours(t.getHours()>12?t.getHours()+2:0),t):null},_setDate:function(t,e,i){var s=!e,n=t.selectedMonth,o=t.selectedYear,a=this._restrictMinMax(t,this._determineDate(t,e,new Date));t.selectedDay=t.currentDay=a.getDate(),t.drawMonth=t.selectedMonth=t.currentMonth=a.getMonth(),t.drawYear=t.selectedYear=t.currentYear=a.getFullYear(),n===t.selectedMonth&&o===t.selectedYear||i||this._notifyChange(t),this._adjustInstDate(t),t.input&&t.input.val(s?"":this._formatDate(t))},_getDate:function(t){var e=!t.currentYear||t.input&&""===t.input.val()?null:this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return e},_attachHandlers:function(e){var i=this._get(e,"stepMonths"),s="#"+e.id.replace(/\\\\/g,"\\");e.dpDiv.find("[data-handler]").map(function(){var e={prev:function(){t.datepicker._adjustDate(s,-i,"M")},next:function(){t.datepicker._adjustDate(s,+i,"M")},hide:function(){t.datepicker._hideDatepicker()},today:function(){t.datepicker._gotoToday(s)},selectDay:function(){return t.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return t.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return t.datepicker._selectMonthYear(s,this,"Y"),!1}};t(this).on(this.getAttribute("data-event"),e[this.getAttribute("data-handler")])})},_generateHTML:function(t){var e,i,s,n,o,a,r,l,h,c,u,d,p,f,g,m,_,v,b,y,w,k,x,C,D,T,I,M,P,S,N,H,z,A,O,E,W,F,L,R=new Date,Y=this._daylightSavingAdjust(new Date(R.getFullYear(),R.getMonth(),R.getDate())),B=this._get(t,"isRTL"),j=this._get(t,"showButtonPanel"),q=this._get(t,"hideIfNoPrevNext"),K=this._get(t,"navigationAsDateFormat"),U=this._getNumberOfMonths(t),V=this._get(t,"showCurrentAtPos"),X=this._get(t,"stepMonths"),$=1!==U[0]||1!==U[1],G=this._daylightSavingAdjust(t.currentDay?new Date(t.currentYear,t.currentMonth,t.currentDay):new Date(9999,9,9)),J=this._getMinMaxDate(t,"min"),Q=this._getMinMaxDate(t,"max"),Z=t.drawMonth-V,te=t.drawYear;if(0>Z&&(Z+=12,te--),Q)for(e=this._daylightSavingAdjust(new Date(Q.getFullYear(),Q.getMonth()-U[0]*U[1]+1,Q.getDate())),e=J&&J>e?J:e;this._daylightSavingAdjust(new Date(te,Z,1))>e;)Z--,0>Z&&(Z=11,te--);for(t.drawMonth=Z,t.drawYear=te,i=this._get(t,"prevText"),i=K?this.formatDate(i,this._daylightSavingAdjust(new Date(te,Z-X,1)),this._getFormatConfig(t)):i,s=this._canAdjustMonth(t,-1,te,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(B?"e":"w")+"'>"+i+"</span></a>":q?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(B?"e":"w")+"'>"+i+"</span></a>",n=this._get(t,"nextText"),n=K?this.formatDate(n,this._daylightSavingAdjust(new Date(te,Z+X,1)),this._getFormatConfig(t)):n,o=this._canAdjustMonth(t,1,te,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(B?"w":"e")+"'>"+n+"</span></a>":q?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(B?"w":"e")+"'>"+n+"</span></a>",a=this._get(t,"currentText"),r=this._get(t,"gotoCurrent")&&t.currentDay?G:Y,a=K?this.formatDate(a,r,this._getFormatConfig(t)):a,l=t.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(t,"closeText")+"</button>",h=j?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(B?l:"")+(this._isInRange(t,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+a+"</button>":"")+(B?"":l)+"</div>":"",c=parseInt(this._get(t,"firstDay"),10),c=isNaN(c)?0:c,u=this._get(t,"showWeek"),d=this._get(t,"dayNames"),p=this._get(t,"dayNamesMin"),f=this._get(t,"monthNames"),g=this._get(t,"monthNamesShort"),m=this._get(t,"beforeShowDay"),_=this._get(t,"showOtherMonths"),v=this._get(t,"selectOtherMonths"),b=this._getDefaultDate(t),y="",k=0;U[0]>k;k++){for(x="",this.maxRows=4,C=0;U[1]>C;C++){if(D=this._daylightSavingAdjust(new Date(te,Z,t.selectedDay)),T=" ui-corner-all",I="",$){if(I+="<div class='ui-datepicker-group",U[1]>1)switch(C){case 0:I+=" ui-datepicker-group-first",T=" ui-corner-"+(B?"right":"left");
+break;case U[1]-1:I+=" ui-datepicker-group-last",T=" ui-corner-"+(B?"left":"right");break;default:I+=" ui-datepicker-group-middle",T=""}I+="'>"}for(I+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+T+"'>"+(/all|left/.test(T)&&0===k?B?o:s:"")+(/all|right/.test(T)&&0===k?B?s:o:"")+this._generateMonthYearHeader(t,Z,te,J,Q,k>0||C>0,f,g)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",M=u?"<th class='ui-datepicker-week-col'>"+this._get(t,"weekHeader")+"</th>":"",w=0;7>w;w++)P=(w+c)%7,M+="<th scope='col'"+((w+c+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+d[P]+"'>"+p[P]+"</span></th>";for(I+=M+"</tr></thead><tbody>",S=this._getDaysInMonth(te,Z),te===t.selectedYear&&Z===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,S)),N=(this._getFirstDayOfMonth(te,Z)-c+7)%7,H=Math.ceil((N+S)/7),z=$?this.maxRows>H?this.maxRows:H:H,this.maxRows=z,A=this._daylightSavingAdjust(new Date(te,Z,1-N)),O=0;z>O;O++){for(I+="<tr>",E=u?"<td class='ui-datepicker-week-col'>"+this._get(t,"calculateWeek")(A)+"</td>":"",w=0;7>w;w++)W=m?m.apply(t.input?t.input[0]:null,[A]):[!0,""],F=A.getMonth()!==Z,L=F&&!v||!W[0]||J&&J>A||Q&&A>Q,E+="<td class='"+((w+c+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(A.getTime()===D.getTime()&&Z===t.selectedMonth&&t._keyEvent||b.getTime()===A.getTime()&&b.getTime()===D.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!_?"":" "+W[1]+(A.getTime()===G.getTime()?" "+this._currentClass:"")+(A.getTime()===Y.getTime()?" ui-datepicker-today":""))+"'"+(F&&!_||!W[2]?"":" title='"+W[2].replace(/'/g,"&#39;")+"'")+(L?"":" data-handler='selectDay' data-event='click' data-month='"+A.getMonth()+"' data-year='"+A.getFullYear()+"'")+">"+(F&&!_?"&#xa0;":L?"<span class='ui-state-default'>"+A.getDate()+"</span>":"<a class='ui-state-default"+(A.getTime()===Y.getTime()?" ui-state-highlight":"")+(A.getTime()===G.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+"' href='#'>"+A.getDate()+"</a>")+"</td>",A.setDate(A.getDate()+1),A=this._daylightSavingAdjust(A);I+=E+"</tr>"}Z++,Z>11&&(Z=0,te++),I+="</tbody></table>"+($?"</div>"+(U[0]>0&&C===U[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),x+=I}y+=x}return y+=h,t._keyEvent=!1,y},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var l,h,c,u,d,p,f,g,m=this._get(t,"changeMonth"),_=this._get(t,"changeYear"),v=this._get(t,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",y="";if(o||!m)y+="<span class='ui-datepicker-month'>"+a[e]+"</span>";else{for(l=s&&s.getFullYear()===i,h=n&&n.getFullYear()===i,y+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",c=0;12>c;c++)(!l||c>=s.getMonth())&&(!h||n.getMonth()>=c)&&(y+="<option value='"+c+"'"+(c===e?" selected='selected'":"")+">"+r[c]+"</option>");y+="</select>"}if(v||(b+=y+(!o&&m&&_?"":"&#xa0;")),!t.yearshtml)if(t.yearshtml="",o||!_)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(u=this._get(t,"yearRange").split(":"),d=(new Date).getFullYear(),p=function(t){var e=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?d+parseInt(t,10):parseInt(t,10);return isNaN(e)?d:e},f=p(u[0]),g=Math.max(f,p(u[1]||"")),f=s?Math.max(f,s.getFullYear()):f,g=n?Math.min(g,n.getFullYear()):g,t.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";g>=f;f++)t.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";t.yearshtml+="</select>",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),v&&(b+=(!o&&m&&_?"":"&#xa0;")+y),b+="</div>"},_adjustInstDate:function(t,e,i){var s=t.selectedYear+("Y"===i?e:0),n=t.selectedMonth+("M"===i?e:0),o=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),a=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,o)));t.selectedDay=a.getDate(),t.drawMonth=t.selectedMonth=a.getMonth(),t.drawYear=t.selectedYear=a.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),s=this._getMinMaxDate(t,"max"),n=i&&i>e?i:e;return s&&n>s?s:n},_notifyChange:function(t){var e=this._get(t,"onChangeMonthYear");e&&e.apply(t.input?t.input[0]:null,[t.selectedYear,t.selectedMonth+1,t])},_getNumberOfMonths:function(t){var e=this._get(t,"numberOfMonths");return null==e?[1,1]:"number"==typeof e?[1,e]:e},_getMinMaxDate:function(t,e){return this._determineDate(t,this._get(t,e+"Date"),null)},_getDaysInMonth:function(t,e){return 32-this._daylightSavingAdjust(new Date(t,e,32)).getDate()},_getFirstDayOfMonth:function(t,e){return new Date(t,e,1).getDay()},_canAdjustMonth:function(t,e,i,s){var n=this._getNumberOfMonths(t),o=this._daylightSavingAdjust(new Date(i,s+(0>e?e:n[0]*n[1]),1));return 0>e&&o.setDate(this._getDaysInMonth(o.getFullYear(),o.getMonth())),this._isInRange(t,o)},_isInRange:function(t,e){var i,s,n=this._getMinMaxDate(t,"min"),o=this._getMinMaxDate(t,"max"),a=null,r=null,l=this._get(t,"yearRange");return l&&(i=l.split(":"),s=(new Date).getFullYear(),a=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(a+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||e.getTime()>=n.getTime())&&(!o||e.getTime()<=o.getTime())&&(!a||e.getFullYear()>=a)&&(!r||r>=e.getFullYear())},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),{shortYearCutoff:e,dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);var n=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),n,this._getFormatConfig(t))}}),t.fn.datepicker=function(e){if(!this.length)return this;t.datepicker.initialized||(t(document).on("mousedown",t.datepicker._checkExternalClick),t.datepicker.initialized=!0),0===t("#"+t.datepicker._mainDivId).length&&t("body").append(t.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof e||"isDisabled"!==e&&"getDate"!==e&&"widget"!==e?"option"===e&&2===arguments.length&&"string"==typeof arguments[1]?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof e?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this].concat(i)):t.datepicker._attachDatepicker(this,e)}):t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i))},t.datepicker=new s,t.datepicker.initialized=!1,t.datepicker.uuid=(new Date).getTime(),t.datepicker.version="1.12.1",t.datepicker,t.widget("ui.dialog",{version:"1.12.1",options:{appendTo:"body",autoOpen:!0,buttons:[],classes:{"ui-dialog":"ui-corner-all","ui-dialog-titlebar":"ui-corner-all"},closeOnEscape:!0,closeText:"Close",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),null==this.options.title&&null!=this.originalTitle&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog},disable:t.noop,enable:t.noop,close:function(e){var i=this;this._isOpen&&this._trigger("beforeClose",e)!==!1&&(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||t.ui.safeBlur(t.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,function(){i._trigger("close",e)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(e,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+t(this).css("z-index")}).get(),o=Math.max.apply(null,n);return o>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",o+1),s=!0),s&&!i&&this._trigger("focus",e),s},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=t(t.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var t=this._focusedElement;t||(t=this.element.find("[autofocus]")),t.length||(t=this.element.find(":tabbable")),t.length||(t=this.uiDialogButtonPane.find(":tabbable")),t.length||(t=this.uiDialogTitlebarClose.filter(":tabbable")),t.length||(t=this.uiDialog),t.eq(0).trigger("focus")},_keepFocus:function(e){function i(){var e=t.ui.safeActiveElement(this.document[0]),i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),void 0;if(e.keyCode===t.ui.keyCode.TAB&&!e.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(this._delay(function(){n.trigger("focus")}),e.preventDefault()):(this._delay(function(){s.trigger("focus")}),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=t("<button type='button'></button>").button({label:t("<a>").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(e,"ui-dialog-title"),this._title(e),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title?t.text(this.options.title):t.html("&#160;")},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this._removeClass(this.uiDialog,"ui-dialog-buttons"),void 0):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,o={icon:s.icon,iconPosition:s.iconPosition,showLabel:s.showLabel,icons:s.icons,text:s.text},delete s.click,delete s.icon,delete s.iconPosition,delete s.showLabel,delete s.icons,"boolean"==typeof s.text&&delete s.text,t("<button></button>",s).button(o).appendTo(e.uiButtonSet).on("click",function(){n.apply(e.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){i._addClass(t(this),"ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){var a=o.offset.left-i.document.scrollLeft(),r=o.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(a>=0?"+":"")+a+" "+"top"+(r>=0?"+":"")+r,of:i.window},i._removeClass(t(this),"ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){i._addClass(t(this),"ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){var a=i.uiDialog.offset(),r=a.left-i.document.scrollLeft(),l=a.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(l>=0?"+":"")+l,of:i.window},i._removeClass(t(this),"ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_trackFocus:function(){this._on(this.widget(),{focusin:function(e){this._makeFocusTarget(),this._focusedElement=t(e.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var e=this._trackingInstances(),i=t.inArray(this,e);-1!==i&&e.splice(i,1)},_trackingInstances:function(){var t=this.document.data("ui-dialog-instances");return t||(t=[],this.document.data("ui-dialog-instances",t)),t},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(e){var i=this,s=!1,n={};t.each(e,function(t,e){i._setOption(t,e),t in i.sizeRelatedOptions&&(s=!0),t in i.resizableRelatedOptions&&(n[t]=e)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,i){var s,n,o=this.uiDialog;"disabled"!==e&&(this._super(e,i),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:t("<a>").text(""+this.options.closeText).html()}),"draggable"===e&&(s=o.is(":data(ui-draggable)"),s&&!i&&o.draggable("destroy"),!s&&i&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(n=o.is(":data(ui-resizable)"),n&&!i&&o.resizable("destroy"),n&&"string"==typeof i&&o.resizable("option","handles",i),n||i===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=!0;this._delay(function(){e=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(t){e||this._allowInteraction(t)||(t.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=t("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var t=this.document.data("ui-dialog-overlays")-1;t?this.document.data("ui-dialog-overlays",t):(this._off(this.document,"focusin"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(t,e){"dialogClass"===t&&this.uiDialog.removeClass(this.options.dialogClass).addClass(e),this._superApply(arguments)}}),t.ui.dialog,t.widget("ui.progressbar",{version:"1.12.1",options:{classes:{"ui-progressbar":"ui-corner-all","ui-progressbar-value":"ui-corner-left","ui-progressbar-complete":"ui-corner-right"},max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.attr({role:"progressbar","aria-valuemin":this.min}),this._addClass("ui-progressbar","ui-widget ui-widget-content"),this.valueDiv=t("<div>").appendTo(this.element),this._addClass(this.valueDiv,"ui-progressbar-value","ui-widget-header"),this._refreshValue()},_destroy:function(){this.element.removeAttr("role aria-valuemin aria-valuemax aria-valuenow"),this.valueDiv.remove()},value:function(t){return void 0===t?this.options.value:(this.options.value=this._constrainedValue(t),this._refreshValue(),void 0)},_constrainedValue:function(t){return void 0===t&&(t=this.options.value),this.indeterminate=t===!1,"number"!=typeof t&&(t=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var e=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||e>this.min).width(i.toFixed(0)+"%"),this._toggleClass(this.valueDiv,"ui-progressbar-complete",null,e===this.options.max)._toggleClass("ui-progressbar-indeterminate",null,this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=t("<div>").appendTo(this.valueDiv),this._addClass(this.overlayDiv,"ui-progressbar-overlay"))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":e}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),e===this.options.max&&this._trigger("complete")}}),t.widget("ui.selectmenu",[t.ui.formResetMixin,{version:"1.12.1",defaultElement:"<select>",options:{appendTo:null,classes:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"},disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:!1,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this._bindFormResetHandler(),this._rendered=!1,this.menuItems=t()},_drawButton:function(){var e,i=this,s=this._parseOption(this.element.find("option:selected"),this.element[0].selectedIndex);this.labels=this.element.labels().attr("for",this.ids.button),this._on(this.labels,{click:function(t){this.button.focus(),t.preventDefault()}}),this.element.hide(),this.button=t("<span>",{tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true",title:this.element.attr("title")}).insertAfter(this.element),this._addClass(this.button,"ui-selectmenu-button ui-selectmenu-button-closed","ui-button ui-widget"),e=t("<span>").appendTo(this.button),this._addClass(e,"ui-selectmenu-icon","ui-icon "+this.options.icons.button),this.buttonItem=this._renderButtonItem(s).appendTo(this.button),this.options.width!==!1&&this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){i._rendered||i._refreshMenu()})},_drawMenu:function(){var e=this;this.menu=t("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=t("<div>").append(this.menu),this._addClass(this.menuWrap,"ui-selectmenu-menu","ui-front"),this.menuWrap.appendTo(this._appendTo()),this.menuInstance=this.menu.menu({classes:{"ui-menu":"ui-corner-bottom"},role:"listbox",select:function(t,i){t.preventDefault(),e._setSelection(),e._select(i.item.data("ui-selectmenu-item"),t)},focus:function(t,i){var s=i.item.data("ui-selectmenu-item");null!=e.focusIndex&&s.index!==e.focusIndex&&(e._trigger("focus",t,{item:s}),e.isOpen||e._select(s,t)),e.focusIndex=s.index,e.button.attr("aria-activedescendant",e.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(this._getSelectedItem().data("ui-selectmenu-item")||{})),null===this.options.width&&this._resizeButton()},_refreshMenu:function(){var t,e=this.element.find("option");this.menu.empty(),this._parseOptions(e),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup").find(".ui-menu-item-wrapper"),this._rendered=!0,e.length&&(t=this._getSelectedItem(),this.menuInstance.focus(null,t),this._setAria(t.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(t){this.options.disabled||(this._rendered?(this._removeClass(this.menu.find(".ui-state-active"),null,"ui-state-active"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.menuItems.length&&(this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",t)))},_position:function(){this.menuWrap.position(t.extend({of:this.button},this.options.position))},close:function(t){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",t))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderButtonItem:function(e){var i=t("<span>");return this._setText(i,e.label),this._addClass(i,"ui-selectmenu-text"),i},_renderMenu:function(e,i){var s=this,n="";t.each(i,function(i,o){var a;o.optgroup!==n&&(a=t("<li>",{text:o.optgroup}),s._addClass(a,"ui-selectmenu-optgroup","ui-menu-divider"+(o.element.parent("optgroup").prop("disabled")?" ui-state-disabled":"")),a.appendTo(e),n=o.optgroup),s._renderItemData(e,o)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-selectmenu-item",e)},_renderItem:function(e,i){var s=t("<li>"),n=t("<div>",{title:i.element.attr("title")});return i.disabled&&this._addClass(s,null,"ui-state-disabled"),this._setText(n,i.label),s.append(n).appendTo(e)},_setText:function(t,e){e?t.text(e):t.html("&#160;")},_move:function(t,e){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex).parent("li"):(i=this.menuItems.eq(this.element[0].selectedIndex).parent("li"),n+=":not(.ui-state-disabled)"),s="first"===t||"last"===t?i["first"===t?"prevAll":"nextAll"](n).eq(-1):i[t+"All"](n).eq(0),s.length&&this.menuInstance.focus(e,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex).parent("li")},_toggle:function(t){this[this.isOpen?"close":"open"](t)},_setSelection:function(){var t;this.range&&(window.getSelection?(t=window.getSelection(),t.removeAllRanges(),t.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(e){this.isOpen&&(t(e.target).closest(".ui-selectmenu-menu, #"+t.ui.escapeSelector(this.ids.button)).length||this.close(e))}},_buttonEvents:{mousedown:function(){var t;window.getSelection?(t=window.getSelection(),t.rangeCount&&(this.range=t.getRangeAt(0))):this.range=document.selection.createRange()},click:function(t){this._setSelection(),this._toggle(t)},keydown:function(e){var i=!0;switch(e.keyCode){case t.ui.keyCode.TAB:case t.ui.keyCode.ESCAPE:this.close(e),i=!1;break;case t.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(e);break;case t.ui.keyCode.UP:e.altKey?this._toggle(e):this._move("prev",e);break;case t.ui.keyCode.DOWN:e.altKey?this._toggle(e):this._move("next",e);break;case t.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(e):this._toggle(e);break;case t.ui.keyCode.LEFT:this._move("prev",e);break;case t.ui.keyCode.RIGHT:this._move("next",e);break;case t.ui.keyCode.HOME:case t.ui.keyCode.PAGE_UP:this._move("first",e);break;case t.ui.keyCode.END:case t.ui.keyCode.PAGE_DOWN:this._move("last",e);break;default:this.menu.trigger(e),i=!1}i&&e.preventDefault()}},_selectFocusedItem:function(t){var e=this.menuItems.eq(this.focusIndex).parent("li");e.hasClass("ui-state-disabled")||this._select(e.data("ui-selectmenu-item"),t)},_select:function(t,e){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=t.index,this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(t)),this._setAria(t),this._trigger("select",e,{item:t}),t.index!==i&&this._trigger("change",e,{item:t}),this.close(e)},_setAria:function(t){var e=this.menuItems.eq(t.index).attr("id");this.button.attr({"aria-labelledby":e,"aria-activedescendant":e}),this.menu.attr("aria-activedescendant",e)},_setOption:function(t,e){if("icons"===t){var i=this.button.find("span.ui-icon");this._removeClass(i,null,this.options.icons.button)._addClass(i,null,e.button)}this._super(t,e),"appendTo"===t&&this.menuWrap.appendTo(this._appendTo()),"width"===t&&this._resizeButton()},_setOptionDisabled:function(t){this._super(t),this.menuInstance.option("disabled",t),this.button.attr("aria-disabled",t),this._toggleClass(this.button,null,"ui-state-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_toggleAttr:function(){this.button.attr("aria-expanded",this.isOpen),this._removeClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"closed":"open"))._addClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"open":"closed"))._toggleClass(this.menuWrap,"ui-selectmenu-open",null,this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var t=this.options.width;return t===!1?(this.button.css("width",""),void 0):(null===t&&(t=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(t),void 0)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){var t=this._super();return t.disabled=this.element.prop("disabled"),t},_parseOptions:function(e){var i=this,s=[];e.each(function(e,n){s.push(i._parseOption(t(n),e))}),this.items=s},_parseOption:function(t,e){var i=t.parent("optgroup");return{element:t,index:e,value:t.val(),label:t.text(),optgroup:i.attr("label")||"",disabled:i.prop("disabled")||t.prop("disabled")}},_destroy:function(){this._unbindFormResetHandler(),this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.labels.attr("for",this.ids.element)}}]),t.widget("ui.slider",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"slide",options:{animate:!1,classes:{"ui-slider":"ui-corner-all","ui-slider-handle":"ui-corner-all","ui-slider-range":"ui-corner-all ui-widget-header"},distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this._addClass("ui-slider ui-slider-"+this.orientation,"ui-widget ui-widget-content"),this._refresh(),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle"),o="<span tabindex='0'></span>",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this._addClass(this.handles,"ui-slider-handle","ui-state-default"),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e).attr("tabIndex",0)})},_createRange:function(){var e=this.options;e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?(this._removeClass(this.range,"ui-slider-range-min ui-slider-range-max"),this.range.css({left:"",bottom:""})):(this.range=t("<div>").appendTo(this.element),this._addClass(this.range,"ui-slider-range")),("min"===e.range||"max"===e.range)&&this._addClass(this.range,"ui-slider-range-"+e.range)):(this.range&&this.range.remove(),this.range=null)
+},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,l,h,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,this._addClass(o,null,"ui-state-active"),o.trigger("focus"),l=o.offset(),h=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=h?{left:0,top:0}:{left:e.pageX-l.left-o.width()/2,top:e.pageY-l.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this._removeClass(this.handles,null,"ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_uiHash:function(t,e,i){var s={handle:this.handles[t],handleIndex:t,value:void 0!==e?e:this.value()};return this._hasMultipleValues()&&(s.value=void 0!==e?e:this.values(t),s.values=i||this.values()),s},_hasMultipleValues:function(){return this.options.values&&this.options.values.length},_start:function(t,e){return this._trigger("start",t,this._uiHash(e))},_slide:function(t,e,i){var s,n,o=this.value(),a=this.values();this._hasMultipleValues()&&(n=this.values(e?0:1),o=this.values(e),2===this.options.values.length&&this.options.range===!0&&(i=0===e?Math.min(n,i):Math.max(n,i)),a[e]=i),i!==o&&(s=this._trigger("slide",t,this._uiHash(e,i,a)),s!==!1&&(this._hasMultipleValues()?this.values(e,i):this.value(i)))},_stop:function(t,e){this._trigger("stop",t,this._uiHash(e))},_change:function(t,e){this._keySliding||this._mouseSliding||(this._lastChangedValue=e,this._trigger("change",t,this._uiHash(e)))},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),void 0;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this._hasMultipleValues()?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),this._super(e,i),e){case"orientation":this._detectOrientation(),this._removeClass("ui-slider-horizontal ui-slider-vertical")._addClass("ui-slider-"+this.orientation),this._refreshValue(),this.options.range&&this._refreshRange(i),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=n-1;s>=0;s--)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_setOptionDisabled:function(t){this._super(t),this._toggleClass(null,"ui-state-disabled",!!t)},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this._hasMultipleValues()){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var t=this.options.max,e=this._valueMin(),i=this.options.step,s=Math.round((t-e)/i)*i;t=s+e,t>this.options.max&&(t-=i),this.max=parseFloat(t.toFixed(this._precision()))},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshRange:function(t){"vertical"===t&&this.range.css({width:"",left:""}),"horizontal"===t&&this.range.css({height:"",bottom:""})},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,l=this,h=this._animateOff?!1:r.animate,c={};this._hasMultipleValues()?this.handles.each(function(s){i=100*((l.values(s)-l._valueMin())/(l._valueMax()-l._valueMin())),c["horizontal"===l.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[h?"animate":"css"](c,r.animate),l.options.range===!0&&("horizontal"===l.orientation?(0===s&&l.range.stop(1,1)[h?"animate":"css"]({left:i+"%"},r.animate),1===s&&l.range[h?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&l.range.stop(1,1)[h?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&l.range[h?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[h?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[h?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[h?"animate":"css"]({width:100-i+"%"},r.animate),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[h?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[h?"animate":"css"]({height:100-i+"%"},r.animate))},_handleEvents:{keydown:function(e){var i,s,n,o,a=t(e.target).data("ui-slider-handle-index");switch(e.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(e.preventDefault(),!this._keySliding&&(this._keySliding=!0,this._addClass(t(e.target),null,"ui-state-active"),i=this._start(e,a),i===!1))return}switch(o=this.options.step,s=n=this._hasMultipleValues()?this.values(a):this.value(),e.keyCode){case t.ui.keyCode.HOME:n=this._valueMin();break;case t.ui.keyCode.END:n=this._valueMax();break;case t.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+o);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-o)}this._slide(e,a,n)},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),this._removeClass(t(e.target),null,"ui-state-active"))}}}),t.widget("ui.spinner",{version:"1.12.1",defaultElement:"<input>",widgetEventPrefix:"spin",options:{classes:{"ui-spinner":"ui-corner-all","ui-spinner-down":"ui-corner-br","ui-spinner-up":"ui-corner-tr"},culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e=this._super(),i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);null!=n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var e=this.element[0]===t.ui.safeActiveElement(this.document[0]);e||(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===t.ui.safeActiveElement(this.document[0])?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap("<span>").parent().append("<a></a><a></a>")},_draw:function(){this._enhance(),this._addClass(this.uiSpinner,"ui-spinner","ui-widget ui-widget-content"),this._addClass("ui-spinner-input"),this.element.attr("role","spinbutton"),this.buttons=this.uiSpinner.children("a").attr("tabIndex",-1).attr("aria-hidden",!0).button({classes:{"ui-button":""}}),this._removeClass(this.buttons,"ui-corner-all"),this._addClass(this.buttons.first(),"ui-spinner-button ui-spinner-up"),this._addClass(this.buttons.last(),"ui-spinner-button ui-spinner-down"),this.buttons.first().button({icon:this.options.icons.up,showLabel:!1}),this.buttons.last().button({icon:this.options.icons.down,showLabel:!1}),this.buttons.height()>Math.ceil(.5*this.uiSpinner.height())&&this.uiSpinner.height()>0&&this.uiSpinner.height(this.uiSpinner.height())},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){var i,s,n;return"culture"===t||"numberFormat"===t?(i=this._parse(this.element.val()),this.options[t]=e,this.element.val(this._format(i)),void 0):(("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(s=this.buttons.first().find(".ui-icon"),this._removeClass(s,null,this.options.icons.up),this._addClass(s,null,e.up),n=this.buttons.last().find(".ui-icon"),this._removeClass(n,null,this.options.icons.down),this._addClass(n,null,e.down)),this._super(t,e),void 0)},_setOptionDisabled:function(t){this._super(t),this._toggleClass(this.uiSpinner,null,"ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable")},_setOptions:r(function(t){this._super(t)}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var t=this.value();return null===t?!1:t===this._adjustValue(t)},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.prop("disabled",!1).removeAttr("autocomplete role aria-valuemin aria-valuemax aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:r(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:r(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:r(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:r(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(r(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),t.uiBackCompat!==!1&&t.widget("ui.spinner",t.ui.spinner,{_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml())},_uiSpinnerHtml:function(){return"<span>"},_buttonHtml:function(){return"<a></a><a></a>"}}),t.ui.spinner,t.widget("ui.tabs",{version:"1.12.1",delay:300,options:{active:null,classes:{"ui-tabs":"ui-corner-all","ui-tabs-nav":"ui-corner-all","ui-tabs-panel":"ui-corner-bottom","ui-tabs-tab":"ui-corner-top"},collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var t=/#.*$/;return function(e){var i,s;i=e.href.replace(t,""),s=location.href.replace(t,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return e.hash.length>1&&i===s}}(),_create:function(){var e=this,i=this.options;this.running=!1,this._addClass("ui-tabs","ui-widget ui-widget-content"),this._toggleClass("ui-tabs-collapsible",null,i.collapsible),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var e=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===e&&(s&&this.tabs.each(function(i,n){return t(n).attr("aria-controls")===s?(e=i,!1):void 0}),null===e&&(e=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===e||-1===e)&&(e=this.tabs.length?0:!1)),e!==!1&&(e=this.tabs.index(this.tabs.eq(e)),-1===e&&(e=i?!1:0)),!i&&e===!1&&this.anchors.length&&(e=0),e},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(e){var i=t(t.ui.safeActiveElement(this.document[0])).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(e)){switch(e.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:s++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:n=!1,s--;break;case t.ui.keyCode.END:s=this.anchors.length-1;break;case t.ui.keyCode.HOME:s=0;break;case t.ui.keyCode.SPACE:return e.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case t.ui.keyCode.ENTER:return e.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}e.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),e.ctrlKey||e.metaKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.trigger("focus"))},_handlePageNav:function(e){return e.altKey&&e.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):e.altKey&&e.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).trigger("focus"),t},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):(this._super(t,e),"collapsible"===t&&(this._toggleClass("ui-tabs-collapsible",null,e),e||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(e),"heightStyle"===t&&this._setupHeightStyle(e),void 0)},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setOptionDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._addClass(this.active,"ui-tabs-active","ui-state-active"),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this,i=this.tabs,s=this.anchors,n=this.panels;this.tablist=this._getList().attr("role","tablist"),this._addClass(this.tablist,"ui-tabs-nav","ui-helper-reset ui-helper-clearfix ui-widget-header"),this.tablist.on("mousedown"+this.eventNamespace,"> li",function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).on("focus"+this.eventNamespace,".ui-tabs-anchor",function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").attr({role:"tab",tabIndex:-1}),this._addClass(this.tabs,"ui-tabs-tab","ui-state-default"),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).attr({role:"presentation",tabIndex:-1}),this._addClass(this.anchors,"ui-tabs-anchor"),this.panels=t(),this.anchors.each(function(i,s){var n,o,a,r=t(s).uniqueId().attr("id"),l=t(s).closest("li"),h=l.attr("aria-controls");e._isLocal(s)?(n=s.hash,a=n.substring(1),o=e.element.find(e._sanitizeSelector(n))):(a=l.attr("aria-controls")||t({}).uniqueId()[0].id,n="#"+a,o=e.element.find(n),o.length||(o=e._createPanel(a),o.insertAfter(e.panels[i-1]||e.tablist)),o.attr("aria-live","polite")),o.length&&(e.panels=e.panels.add(o)),h&&l.data("ui-tabs-aria-controls",h),l.attr({"aria-controls":a,"aria-labelledby":r}),o.attr("aria-labelledby",r)}),this.panels.attr("role","tabpanel"),this._addClass(this.panels,"ui-tabs-panel","ui-widget-content"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol, ul").eq(0)},_createPanel:function(e){return t("<div>").attr("id",e).data("ui-tabs-destroy",!0)},_setOptionDisabled:function(e){var i,s,n;for(t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1),n=0;s=this.tabs[n];n++)i=t(s),e===!0||-1!==t.inArray(n,e)?(i.attr("aria-disabled","true"),this._addClass(i,null,"ui-state-disabled")):(i.removeAttr("aria-disabled"),this._removeClass(i,null,"ui-state-disabled"));this.options.disabled=e,this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,e===!0)},_setupEvents:function(e){var i={};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(t){t.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,l=r?t():this._getPanelForTab(o),h=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:h,newTab:r?t():o,newPanel:l};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),h.length||l.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),l.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){o._addClass(i.newTab.closest("li"),"ui-tabs-active","ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){o._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),n()}):(this._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+t.ui.escapeSelector(e)+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.tablist.removeAttr("role").off(this.eventNamespace),this.anchors.removeAttr("role tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeAttr("role tabIndex aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(e){var i=this.options.disabled;i!==!1&&(void 0===e?i=!1:(e=this._getIndex(e),i=t.isArray(i)?t.map(i,function(t){return t!==e?t:null}):t.map(this.tabs,function(t,i){return i!==e?i:null})),this._setOptionDisabled(i))},disable:function(e){var i=this.options.disabled;if(i!==!0){if(void 0===e)i=!0;else{if(e=this._getIndex(e),-1!==t.inArray(e,i))return;i=t.isArray(i)?t.merge([e],i).sort():[e]}this._setOptionDisabled(i)}},load:function(e,i){e=this._getIndex(e);var s=this,n=this.tabs.eq(e),o=n.find(".ui-tabs-anchor"),a=this._getPanelForTab(n),r={tab:n,panel:a},l=function(t,e){"abort"===e&&s.panels.stop(!1,!0),s._removeClass(n,"ui-tabs-loading"),a.removeAttr("aria-busy"),t===s.xhr&&delete s.xhr};this._isLocal(o[0])||(this.xhr=t.ajax(this._ajaxSettings(o,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(this._addClass(n,"ui-tabs-loading"),a.attr("aria-busy","true"),this.xhr.done(function(t,e,n){setTimeout(function(){a.html(t),s._trigger("load",i,r),l(n,e)},1)}).fail(function(t,e){setTimeout(function(){l(t,e)},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href").replace(/#.*$/,""),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),t.uiBackCompat!==!1&&t.widget("ui.tabs",t.ui.tabs,{_processTabs:function(){this._superApply(arguments),this._addClass(this.tabs,"ui-tab")}}),t.ui.tabs,t.widget("ui.tooltip",{version:"1.12.1",options:{classes:{"ui-tooltip":"ui-corner-all ui-widget-shadow"},content:function(){var e=t(this).attr("title")||"";return t("<a>").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,track:!1,close:null,open:null},_addDescribedBy:function(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))},_removeDescribedBy:function(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.liveRegion=t("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this.disabledTitles=t([])},_setOption:function(e,i){var s=this;this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e.element)})},_setOptionDisabled:function(t){this[t?"_disable":"_enable"]()},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s.element[0],e.close(n,!0)}),this.disabledTitles=this.disabledTitles.add(this.element.find(this.options.items).addBack().filter(function(){var e=t(this);return e.is("[title]")?e.data("ui-tooltip-title",e.attr("title")).removeAttr("title"):void 0}))},_enable:function(){this.disabledTitles.each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))}),this.disabledTitles=t([])},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._registerCloseHandlers(e,s),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;return"string"==typeof s||s.nodeType||s.jquery?this._open(e,t,s):(i=s.call(t[0],function(i){n._delay(function(){t.data("ui-tooltip-open")&&(e&&(e.type=o),this._open(e,t,i))})}),i&&this._open(e,t,i),void 0)},_open:function(e,i,s){function n(t){h.of=t,a.is(":hidden")||a.position(h)}var o,a,r,l,h=t.extend({},this.options.position);if(s){if(o=this._find(i))return o.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(e&&"mouseover"===e.type?i.attr("title",""):i.removeAttr("title")),o=this._tooltip(i),a=o.tooltip,this._addDescribedBy(i,a.attr("id")),a.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),l=t("<div>").html(a.find(".ui-tooltip-content").html()),l.removeAttr("name").find("[name]").removeAttr("name"),l.removeAttr("id").find("[id]").removeAttr("id"),l.appendTo(this.liveRegion),this.options.track&&e&&/^mouse/.test(e.type)?(this._on(this.document,{mousemove:n}),n(e)):a.position(t.extend({of:i},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.track&&this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){a.is(":visible")&&(n(h.of),clearInterval(r))},t.fx.interval)),this._trigger("open",e,{tooltip:a})}},_registerCloseHandlers:function(e,i){var s={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var s=t.Event(e);s.currentTarget=i[0],this.close(s,!0)}}};i[0]!==this.element[0]&&(s.remove=function(){this._removeTooltip(this._find(i).tooltip)}),e&&"mouseover"!==e.type||(s.mouseleave="close"),e&&"focusin"!==e.type||(s.focusout="close"),this._on(!0,i,s)},close:function(e){var i,s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);return o?(i=o.tooltip,o.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),o.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]
+}),o.closing=!0,this._trigger("close",e,{tooltip:i}),o.hiding||(o.closing=!1)),void 0):(n.removeData("ui-tooltip-open"),void 0)},_tooltip:function(e){var i=t("<div>").attr("role","tooltip"),s=t("<div>").appendTo(i),n=i.uniqueId().attr("id");return this._addClass(s,"ui-tooltip-content"),this._addClass(i,"ui-tooltip","ui-widget ui-widget-content"),i.appendTo(this._appendTo(e)),this.tooltips[n]={element:e,tooltip:i}},_find:function(t){var e=t.data("ui-tooltip-id");return e?this.tooltips[e]:null},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_appendTo:function(t){var e=t.closest(".ui-front, dialog");return e.length||(e=this.document[0].body),e},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur"),o=s.element;n.target=n.currentTarget=o[0],e.close(n,!0),t("#"+i).remove(),o.data("ui-tooltip-title")&&(o.attr("title")||o.attr("title",o.data("ui-tooltip-title")),o.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}}),t.uiBackCompat!==!1&&t.widget("ui.tooltip",t.ui.tooltip,{options:{tooltipClass:null},_tooltip:function(){var t=this._superApply(arguments);return this.options.tooltipClass&&t.tooltip.addClass(this.options.tooltipClass),t}}),t.ui.tooltip;var f="ui-effects-",g="ui-effects-style",m="ui-effects-animated",_=t;t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=h(),n=s._rgba=[];return i=i.toLowerCase(),f(l,function(t,o){var a,r=o.re.exec(i),l=r&&o.parse(r),h=o.space||"rgba";return l?(a=s[h](l),s[c[h].cache]=a[c[h].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,l=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],h=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=h.support={},p=t("<p>")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),h.fn=t.extend(h.prototype,{parse:function(n,a,r,l){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,l],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof h?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=h(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=h(t),n=s._space(),o=c[n],a=0===this.alpha()?h("transparent"):this,r=a[o.cache]||o.to(a._rgba),l=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],h=s[o],c=u[n.type]||{};null!==h&&(null===a?l[o]=h:(c.mod&&(h-a>c.mod/2?a+=c.mod:a-h>c.mod/2&&(a-=c.mod)),l[o]=i((h-a)*e+a,n)))}),this[n](l)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=h(e)._rgba;return h(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),h.fn.parse.prototype=h.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),l=Math.min(s,n,o),h=r-l,c=r+l,u=.5*c;return e=l===r?0:s===r?60*(n-o)/h+360:n===r?60*(o-s)/h+120:60*(s-n)/h+240,i=0===h?0:.5>=u?h/c:h/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,l=n.to,c=n.from;h.fn[s]=function(s){if(l&&!this[a]&&(this[a]=l(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=h(c(d)),n[a]=d,n):h(d)},f(o,function(e,i){h.fn[e]||(h.fn[e]=function(n){var o,a=t.type(n),l="alpha"===e?this._hsla?"hsla":"rgba":s,h=this[l](),c=h[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),h[i.idx]=n,this[l](h)))})})}),h.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=h(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(l){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(l){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=h(e.elem,i),e.end=h(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},h.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(_),function(){function e(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function i(e,i){var s,o,a={};for(s in i)o=i[s],e[s]!==o&&(n[s]||(t.fx.step[s]||!isNaN(parseFloat(o)))&&(a[s]=o));return a}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(_.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(n,o,a,r){var l=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",h=l.children?a.find("*").addBack():a;h=h.map(function(){var i=t(this);return{el:i,start:e(this)}}),o=function(){t.each(s,function(t,e){n[e]&&a[e+"Class"](n[e])})},o(),h=h.map(function(){return this.end=e(this.el[0]),this.diff=i(this.start,this.end),this}),a.attr("class",r),h=h.map(function(){var e=this,i=t.Deferred(),s=t.extend({},l,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,h.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),l.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(e){return function(i,s,n,o,a){return"boolean"==typeof s||void 0===s?n?t.effects.animateClass.call(this,s?{add:i}:{remove:i},n,o,a):e.apply(this,arguments):t.effects.animateClass.call(this,{toggle:i},s,n,o)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function e(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function i(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}function s(t,e){var i=e.outerWidth(),s=e.outerHeight(),n=/^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,o=n.exec(t)||["",0,i,s,0];return{top:parseFloat(o[1])||0,right:"auto"===o[2]?i:parseFloat(o[2]),bottom:"auto"===o[3]?s:parseFloat(o[3]),left:parseFloat(o[4])||0}}t.expr&&t.expr.filters&&t.expr.filters.animated&&(t.expr.filters.animated=function(e){return function(i){return!!t(i).data(m)||e(i)}}(t.expr.filters.animated)),t.uiBackCompat!==!1&&t.extend(t.effects,{save:function(t,e){for(var i=0,s=e.length;s>i;i++)null!==e[i]&&t.data(f+e[i],t[0].style[e[i]])},restore:function(t,e){for(var i,s=0,n=e.length;n>s;s++)null!==e[s]&&(i=t.data(f+e[s]),t.css(e[s],i))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).trigger("focus"),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).trigger("focus")),e}}),t.extend(t.effects,{version:"1.12.1",define:function(e,i,s){return s||(s=i,i="effect"),t.effects.effect[e]=s,t.effects.effect[e].mode=i,s},scaledDimensions:function(t,e,i){if(0===e)return{height:0,width:0,outerHeight:0,outerWidth:0};var s="horizontal"!==i?(e||100)/100:1,n="vertical"!==i?(e||100)/100:1;return{height:t.height()*n,width:t.width()*s,outerHeight:t.outerHeight()*n,outerWidth:t.outerWidth()*s}},clipToBox:function(t){return{width:t.clip.right-t.clip.left,height:t.clip.bottom-t.clip.top,left:t.clip.left,top:t.clip.top}},unshift:function(t,e,i){var s=t.queue();e>1&&s.splice.apply(s,[1,0].concat(s.splice(e,i))),t.dequeue()},saveStyle:function(t){t.data(g,t[0].style.cssText)},restoreStyle:function(t){t[0].style.cssText=t.data(g)||"",t.removeData(g)},mode:function(t,e){var i=t.is(":hidden");return"toggle"===e&&(e=i?"show":"hide"),(i?"hide"===e:"show"===e)&&(e="none"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createPlaceholder:function(e){var i,s=e.css("position"),n=e.position();return e.css({marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()),/^(static|relative)/.test(s)&&(s="absolute",i=t("<"+e[0].nodeName+">").insertAfter(e).css({display:/^(inline|ruby)/.test(e.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight"),"float":e.css("float")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).addClass("ui-effects-placeholder"),e.data(f+"placeholder",i)),e.css({position:s,left:n.left,top:n.top}),i},removePlaceholder:function(t){var e=f+"placeholder",i=t.data(e);i&&(i.remove(),t.removeData(e))},cleanUp:function(e){t.effects.restoreStyle(e),t.effects.removePlaceholder(e)},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function i(e){function i(){r.removeData(m),t.effects.cleanUp(r),"hide"===s.mode&&r.hide(),a()}function a(){t.isFunction(l)&&l.call(r[0]),t.isFunction(e)&&e()}var r=t(this);s.mode=c.shift(),t.uiBackCompat===!1||o?"none"===s.mode?(r[h](),a()):n.call(r[0],s,i):(r.is(":hidden")?"hide"===h:"show"===h)?(r[h](),a()):n.call(r[0],s,a)}var s=e.apply(this,arguments),n=t.effects.effect[s.effect],o=n.mode,a=s.queue,r=a||"fx",l=s.complete,h=s.mode,c=[],u=function(e){var i=t(this),s=t.effects.mode(i,h)||o;i.data(m,!0),c.push(s),o&&("show"===s||s===o&&"hide"===s)&&i.show(),o&&"none"===s||t.effects.saveStyle(i),t.isFunction(e)&&e()};return t.fx.off||!n?h?this[h](s.duration,l):this.each(function(){l&&l.call(this)}):a===!1?this.each(u).each(i):this.queue(r,u).queue(r,i)},show:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="show",this.effect.call(this,n)}}(t.fn.show),hide:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(t.fn.hide),toggle:function(t){return function(s){if(i(s)||"boolean"==typeof s)return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s},cssClip:function(t){return t?this.css("clip","rect("+t.top+"px "+t.right+"px "+t.bottom+"px "+t.left+"px)"):s(this.css("clip"),this)},transfer:function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,l=o?a.scrollLeft():0,h=n.offset(),c={top:h.top-r,left:h.left-l,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("<div class='ui-effects-transfer'></div>").appendTo("body").addClass(e.className).css({top:u.top-r,left:u.left-l,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),t.isFunction(i)&&i()})}}),t.fx.step.clip=function(e){e.clipInit||(e.start=t(e.elem).cssClip(),"string"==typeof e.end&&(e.end=s(e.end,e.elem)),e.clipInit=!0),t(e.elem).cssClip({top:e.pos*(e.end.top-e.start.top)+e.start.top,right:e.pos*(e.end.right-e.start.right)+e.start.right,bottom:e.pos*(e.end.bottom-e.start.bottom)+e.start.bottom,left:e.pos*(e.end.left-e.start.left)+e.start.left})}}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}();var v=t.effects;t.effects.define("blind","hide",function(e,i){var s={up:["bottom","top"],vertical:["bottom","top"],down:["top","bottom"],left:["right","left"],horizontal:["right","left"],right:["left","right"]},n=t(this),o=e.direction||"up",a=n.cssClip(),r={clip:t.extend({},a)},l=t.effects.createPlaceholder(n);r.clip[s[o][0]]=r.clip[s[o][1]],"show"===e.mode&&(n.cssClip(r.clip),l&&l.css(t.effects.clipToBox(r)),r.clip=a),l&&l.animate(t.effects.clipToBox(r),e.duration,e.easing),n.animate(r,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("bounce",function(e,i){var s,n,o,a=t(this),r=e.mode,l="hide"===r,h="show"===r,c=e.direction||"up",u=e.distance,d=e.times||5,p=2*d+(h||l?1:0),f=e.duration/p,g=e.easing,m="up"===c||"down"===c?"top":"left",_="up"===c||"left"===c,v=0,b=a.queue().length;for(t.effects.createPlaceholder(a),o=a.css(m),u||(u=a["top"===m?"outerHeight":"outerWidth"]()/3),h&&(n={opacity:1},n[m]=o,a.css("opacity",0).css(m,_?2*-u:2*u).animate(n,f,g)),l&&(u/=Math.pow(2,d-1)),n={},n[m]=o;d>v;v++)s={},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g).animate(n,f,g),u=l?2*u:u/2;l&&(s={opacity:0},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g)),a.queue(i),t.effects.unshift(a,b,p+1)}),t.effects.define("clip","hide",function(e,i){var s,n={},o=t(this),a=e.direction||"vertical",r="both"===a,l=r||"horizontal"===a,h=r||"vertical"===a;s=o.cssClip(),n.clip={top:h?(s.bottom-s.top)/2:s.top,right:l?(s.right-s.left)/2:s.right,bottom:h?(s.bottom-s.top)/2:s.bottom,left:l?(s.right-s.left)/2:s.left},t.effects.createPlaceholder(o),"show"===e.mode&&(o.cssClip(n.clip),n.clip=s),o.animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("drop","hide",function(e,i){var s,n=t(this),o=e.mode,a="show"===o,r=e.direction||"left",l="up"===r||"down"===r?"top":"left",h="up"===r||"left"===r?"-=":"+=",c="+="===h?"-=":"+=",u={opacity:0};t.effects.createPlaceholder(n),s=e.distance||n["top"===l?"outerHeight":"outerWidth"](!0)/2,u[l]=h+s,a&&(n.css(u),u[l]=c+s,u.opacity=1),n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("explode","hide",function(e,i){function s(){b.push(this),b.length===u*d&&n()}function n(){p.css({visibility:"visible"}),t(b).remove(),i()}var o,a,r,l,h,c,u=e.pieces?Math.round(Math.sqrt(e.pieces)):3,d=u,p=t(this),f=e.mode,g="show"===f,m=p.show().css("visibility","hidden").offset(),_=Math.ceil(p.outerWidth()/d),v=Math.ceil(p.outerHeight()/u),b=[];for(o=0;u>o;o++)for(l=m.top+o*v,c=o-(u-1)/2,a=0;d>a;a++)r=m.left+a*_,h=a-(d-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-a*_,top:-o*v}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:_,height:v,left:r+(g?h*_:0),top:l+(g?c*v:0),opacity:g?0:1}).animate({left:r+(g?0:h*_),top:l+(g?0:c*v),opacity:g?1:0},e.duration||500,e.easing,s)}),t.effects.define("fade","toggle",function(e,i){var s="show"===e.mode;t(this).css("opacity",s?0:1).animate({opacity:s?1:0},{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("fold","hide",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=e.size||15,l=/([0-9]+)%/.exec(r),h=!!e.horizFirst,c=h?["right","bottom"]:["bottom","right"],u=e.duration/2,d=t.effects.createPlaceholder(s),p=s.cssClip(),f={clip:t.extend({},p)},g={clip:t.extend({},p)},m=[p[c[0]],p[c[1]]],_=s.queue().length;l&&(r=parseInt(l[1],10)/100*m[a?0:1]),f.clip[c[0]]=r,g.clip[c[0]]=r,g.clip[c[1]]=0,o&&(s.cssClip(g.clip),d&&d.css(t.effects.clipToBox(g)),g.clip=p),s.queue(function(i){d&&d.animate(t.effects.clipToBox(f),u,e.easing).animate(t.effects.clipToBox(g),u,e.easing),i()}).animate(f,u,e.easing).animate(g,u,e.easing).queue(i),t.effects.unshift(s,_,4)}),t.effects.define("highlight","show",function(e,i){var s=t(this),n={backgroundColor:s.css("backgroundColor")};"hide"===e.mode&&(n.opacity=0),t.effects.saveStyle(s),s.css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("size",function(e,i){var s,n,o,a=t(this),r=["fontSize"],l=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],h=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],c=e.mode,u="effect"!==c,d=e.scale||"both",p=e.origin||["middle","center"],f=a.css("position"),g=a.position(),m=t.effects.scaledDimensions(a),_=e.from||m,v=e.to||t.effects.scaledDimensions(a,0);t.effects.createPlaceholder(a),"show"===c&&(o=_,_=v,v=o),n={from:{y:_.height/m.height,x:_.width/m.width},to:{y:v.height/m.height,x:v.width/m.width}},("box"===d||"both"===d)&&(n.from.y!==n.to.y&&(_=t.effects.setTransition(a,l,n.from.y,_),v=t.effects.setTransition(a,l,n.to.y,v)),n.from.x!==n.to.x&&(_=t.effects.setTransition(a,h,n.from.x,_),v=t.effects.setTransition(a,h,n.to.x,v))),("content"===d||"both"===d)&&n.from.y!==n.to.y&&(_=t.effects.setTransition(a,r,n.from.y,_),v=t.effects.setTransition(a,r,n.to.y,v)),p&&(s=t.effects.getBaseline(p,m),_.top=(m.outerHeight-_.outerHeight)*s.y+g.top,_.left=(m.outerWidth-_.outerWidth)*s.x+g.left,v.top=(m.outerHeight-v.outerHeight)*s.y+g.top,v.left=(m.outerWidth-v.outerWidth)*s.x+g.left),a.css(_),("content"===d||"both"===d)&&(l=l.concat(["marginTop","marginBottom"]).concat(r),h=h.concat(["marginLeft","marginRight"]),a.find("*[width]").each(function(){var i=t(this),s=t.effects.scaledDimensions(i),o={height:s.height*n.from.y,width:s.width*n.from.x,outerHeight:s.outerHeight*n.from.y,outerWidth:s.outerWidth*n.from.x},a={height:s.height*n.to.y,width:s.width*n.to.x,outerHeight:s.height*n.to.y,outerWidth:s.width*n.to.x};n.from.y!==n.to.y&&(o=t.effects.setTransition(i,l,n.from.y,o),a=t.effects.setTransition(i,l,n.to.y,a)),n.from.x!==n.to.x&&(o=t.effects.setTransition(i,h,n.from.x,o),a=t.effects.setTransition(i,h,n.to.x,a)),u&&t.effects.saveStyle(i),i.css(o),i.animate(a,e.duration,e.easing,function(){u&&t.effects.restoreStyle(i)})})),a.animate(v,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){var e=a.offset();0===v.opacity&&a.css("opacity",_.opacity),u||(a.css("position","static"===f?"relative":f).offset(e),t.effects.saveStyle(a)),i()}})}),t.effects.define("scale",function(e,i){var s=t(this),n=e.mode,o=parseInt(e.percent,10)||(0===parseInt(e.percent,10)?0:"effect"!==n?0:100),a=t.extend(!0,{from:t.effects.scaledDimensions(s),to:t.effects.scaledDimensions(s,o,e.direction||"both"),origin:e.origin||["middle","center"]},e);e.fade&&(a.from.opacity=1,a.to.opacity=0),t.effects.effect.size.call(this,a,i)}),t.effects.define("puff","hide",function(e,i){var s=t.extend(!0,{},e,{fade:!0,percent:parseInt(e.percent,10)||150});t.effects.effect.scale.call(this,s,i)}),t.effects.define("pulsate","show",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=o||a,l=2*(e.times||5)+(r?1:0),h=e.duration/l,c=0,u=1,d=s.queue().length;for((o||!s.is(":visible"))&&(s.css("opacity",0).show(),c=1);l>u;u++)s.animate({opacity:c},h,e.easing),c=1-c;s.animate({opacity:c},h,e.easing),s.queue(i),t.effects.unshift(s,d,l+1)}),t.effects.define("shake",function(e,i){var s=1,n=t(this),o=e.direction||"left",a=e.distance||20,r=e.times||3,l=2*r+1,h=Math.round(e.duration/l),c="up"===o||"down"===o?"top":"left",u="up"===o||"left"===o,d={},p={},f={},g=n.queue().length;for(t.effects.createPlaceholder(n),d[c]=(u?"-=":"+=")+a,p[c]=(u?"+=":"-=")+2*a,f[c]=(u?"-=":"+=")+2*a,n.animate(d,h,e.easing);r>s;s++)n.animate(p,h,e.easing).animate(f,h,e.easing);n.animate(p,h,e.easing).animate(d,h/2,e.easing).queue(i),t.effects.unshift(n,g,l+1)}),t.effects.define("slide","show",function(e,i){var s,n,o=t(this),a={up:["bottom","top"],down:["top","bottom"],left:["right","left"],right:["left","right"]},r=e.mode,l=e.direction||"left",h="up"===l||"down"===l?"top":"left",c="up"===l||"left"===l,u=e.distance||o["top"===h?"outerHeight":"outerWidth"](!0),d={};t.effects.createPlaceholder(o),s=o.cssClip(),n=o.position()[h],d[h]=(c?-1:1)*u+n,d.clip=o.cssClip(),d.clip[a[l][1]]=d.clip[a[l][0]],"show"===r&&(o.cssClip(d.clip),o.css(h,d[h]),d.clip=s,d[h]=n),o.animate(d,{queue:!1,duration:e.duration,easing:e.easing,complete:i})});var v;t.uiBackCompat!==!1&&(v=t.effects.define("transfer",function(e,i){t(this).transfer(e,i)}))});
\ No newline at end of file
diff --git a/htdocs/includes/jquery/js/jquery.js b/htdocs/includes/jquery/js/jquery.js
index 4855adcbf14..072e308110f 100644
--- a/htdocs/includes/jquery/js/jquery.js
+++ b/htdocs/includes/jquery/js/jquery.js
@@ -1,20 +1,22 @@
 /*!
- * jQuery JavaScript Library v1.12.0
- * http://jquery.com/
+ * jQuery JavaScript Library v3.1.1
+ * https://jquery.com/
  *
  * Includes Sizzle.js
- * http://sizzlejs.com/
+ * https://sizzlejs.com/
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license
- * http://jquery.org/license
+ * https://jquery.org/license
  *
- * Date: 2016-01-08T19:56Z
+ * Date: 2016-09-22T22:30Z
  */
+( function( global, factory ) {
 
-(function( global, factory ) {
+	"use strict";
 
 	if ( typeof module === "object" && typeof module.exports === "object" ) {
+
 		// For CommonJS and CommonJS-like environments where a proper `window`
 		// is present, execute the factory and get jQuery.
 		// For environments that do not have a `window` with a `document`
@@ -35,24 +37,27 @@
 	}
 
 // Pass this if window is not defined yet
-}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
 
-// Support: Firefox 18+
-// Can't be in strict mode, several libs including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-//"use strict";
-var deletedIds = [];
+// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1
+// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode
+// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common
+// enough that all such attempts are guarded in a try block.
+"use strict";
+
+var arr = [];
 
 var document = window.document;
 
-var slice = deletedIds.slice;
+var getProto = Object.getPrototypeOf;
 
-var concat = deletedIds.concat;
+var slice = arr.slice;
 
-var push = deletedIds.push;
+var concat = arr.concat;
 
-var indexOf = deletedIds.indexOf;
+var push = arr.push;
+
+var indexOf = arr.indexOf;
 
 var class2type = {};
 
@@ -60,12 +65,30 @@ var toString = class2type.toString;
 
 var hasOwn = class2type.hasOwnProperty;
 
+var fnToString = hasOwn.toString;
+
+var ObjectFunctionString = fnToString.call( Object );
+
 var support = {};
 
 
 
+	function DOMEval( code, doc ) {
+		doc = doc || document;
+
+		var script = doc.createElement( "script" );
+
+		script.text = code;
+		doc.head.appendChild( script ).parentNode.removeChild( script );
+	}
+/* global Symbol */
+// Defining this global in .eslintrc.json would create a danger of using the global
+// unguarded in another place, it seems safer to define global only for this module
+
+
+
 var
-	version = "1.12.0",
+	version = "3.1.1",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -75,13 +98,13 @@ var
 		return new jQuery.fn.init( selector, context );
 	},
 
-	// Support: Android<4.1, IE<9
+	// Support: Android <=4.0 only
 	// Make sure we trim BOM and NBSP
 	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
 
 	// Matches dashed string for camelizing
 	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
+	rdashAlpha = /-([a-z])/g,
 
 	// Used by jQuery.camelCase as callback to replace()
 	fcamelCase = function( all, letter ) {
@@ -95,9 +118,6 @@ jQuery.fn = jQuery.prototype = {
 
 	constructor: jQuery,
 
-	// Start with an empty selector
-	selector: "",
-
 	// The default length of a jQuery object is 0
 	length: 0,
 
@@ -108,13 +128,14 @@ jQuery.fn = jQuery.prototype = {
 	// Get the Nth element in the matched element set OR
 	// Get the whole matched element set as a clean array
 	get: function( num ) {
-		return num != null ?
 
-			// Return just the one element from the set
-			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
+		// Return all the elements in a clean array
+		if ( num == null ) {
+			return slice.call( this );
+		}
 
-			// Return all the elements in a clean array
-			slice.call( this );
+		// Return just the one element from the set
+		return num < 0 ? this[ num + this.length ] : this[ num ];
 	},
 
 	// Take an array of elements and push it onto the stack
@@ -126,7 +147,6 @@ jQuery.fn = jQuery.prototype = {
 
 		// Add the old object onto the stack (as a reference)
 		ret.prevObject = this;
-		ret.context = this.context;
 
 		// Return the newly-formed element set
 		return ret;
@@ -168,12 +188,12 @@ jQuery.fn = jQuery.prototype = {
 	// For internal use only.
 	// Behaves like an Array's method, not like a jQuery method.
 	push: push,
-	sort: deletedIds.sort,
-	splice: deletedIds.splice
+	sort: arr.sort,
+	splice: arr.splice
 };
 
 jQuery.extend = jQuery.fn.extend = function() {
-	var src, copyIsArray, copy, name, options, clone,
+	var options, name, src, copy, copyIsArray, clone,
 		target = arguments[ 0 ] || {},
 		i = 1,
 		length = arguments.length,
@@ -183,7 +203,7 @@ jQuery.extend = jQuery.fn.extend = function() {
 	if ( typeof target === "boolean" ) {
 		deep = target;
 
-		// skip the boolean and the target
+		// Skip the boolean and the target
 		target = arguments[ i ] || {};
 		i++;
 	}
@@ -193,7 +213,7 @@ jQuery.extend = jQuery.fn.extend = function() {
 		target = {};
 	}
 
-	// extend jQuery itself if only one argument is passed
+	// Extend jQuery itself if only one argument is passed
 	if ( i === length ) {
 		target = this;
 		i--;
@@ -255,103 +275,81 @@ jQuery.extend( {
 
 	noop: function() {},
 
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
 	isFunction: function( obj ) {
 		return jQuery.type( obj ) === "function";
 	},
 
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type( obj ) === "array";
-	},
+	isArray: Array.isArray,
 
 	isWindow: function( obj ) {
-		/* jshint eqeqeq: false */
-		return obj != null && obj == obj.window;
+		return obj != null && obj === obj.window;
 	},
 
 	isNumeric: function( obj ) {
 
-		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
-		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
-		// subtraction forces infinities to NaN
-		// adding 1 corrects loss of precision from parseFloat (#15100)
-		var realStringObj = obj && obj.toString();
-		return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0;
+		// As of jQuery 3.0, isNumeric is limited to
+		// strings and numbers (primitives or objects)
+		// that can be coerced to finite numbers (gh-2662)
+		var type = jQuery.type( obj );
+		return ( type === "number" || type === "string" ) &&
+
+			// parseFloat NaNs numeric-cast false positives ("")
+			// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
+			// subtraction forces infinities to NaN
+			!isNaN( obj - parseFloat( obj ) );
+	},
+
+	isPlainObject: function( obj ) {
+		var proto, Ctor;
+
+		// Detect obvious negatives
+		// Use toString instead of jQuery.type to catch host objects
+		if ( !obj || toString.call( obj ) !== "[object Object]" ) {
+			return false;
+		}
+
+		proto = getProto( obj );
+
+		// Objects with no prototype (e.g., `Object.create( null )`) are plain
+		if ( !proto ) {
+			return true;
+		}
+
+		// Objects with prototype are plain iff they were constructed by a global Object function
+		Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor;
+		return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString;
 	},
 
 	isEmptyObject: function( obj ) {
+
+		/* eslint-disable no-unused-vars */
+		// See https://github.com/eslint/eslint/issues/6125
 		var name;
+
 		for ( name in obj ) {
 			return false;
 		}
 		return true;
 	},
 
-	isPlainObject: function( obj ) {
-		var key;
-
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!hasOwn.call( obj, "constructor" ) &&
-				!hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) {
-				return false;
-			}
-		} catch ( e ) {
-
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Support: IE<9
-		// Handle iteration over inherited properties before own properties.
-		if ( !support.ownFirst ) {
-			for ( key in obj ) {
-				return hasOwn.call( obj, key );
-			}
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-		for ( key in obj ) {}
-
-		return key === undefined || hasOwn.call( obj, key );
-	},
-
 	type: function( obj ) {
 		if ( obj == null ) {
 			return obj + "";
 		}
+
+		// Support: Android <=2.3 only (functionish RegExp)
 		return typeof obj === "object" || typeof obj === "function" ?
 			class2type[ toString.call( obj ) ] || "object" :
 			typeof obj;
 	},
 
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && jQuery.trim( data ) ) {
-
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data ); // jscs:ignore requireDotNotation
-			} )( data );
-		}
+	// Evaluates a script in a global context
+	globalEval: function( code ) {
+		DOMEval( code );
 	},
 
 	// Convert dashed to camelCase; used by the css and data modules
+	// Support: IE <=9 - 11, Edge 12 - 13
 	// Microsoft forgot to hump their vendor prefix (#9572)
 	camelCase: function( string ) {
 		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
@@ -382,7 +380,7 @@ jQuery.extend( {
 		return obj;
 	},
 
-	// Support: Android<4.1, IE<9
+	// Support: Android <=4.0 only
 	trim: function( text ) {
 		return text == null ?
 			"" :
@@ -408,43 +406,18 @@ jQuery.extend( {
 	},
 
 	inArray: function( elem, arr, i ) {
-		var len;
-
-		if ( arr ) {
-			if ( indexOf ) {
-				return indexOf.call( arr, elem, i );
-			}
-
-			len = arr.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-
-				// Skip accessing in sparse arrays
-				if ( i in arr && arr[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
+		return arr == null ? -1 : indexOf.call( arr, elem, i );
 	},
 
+	// Support: Android <=4.0 only, PhantomJS 1 only
+	// push.apply(_, arraylike) throws on ancient WebKit
 	merge: function( first, second ) {
 		var len = +second.length,
 			j = 0,
 			i = first.length;
 
-		while ( j < len ) {
-			first[ i++ ] = second[ j++ ];
-		}
-
-		// Support: IE<9
-		// Workaround casting of .length to NaN on otherwise arraylike objects (e.g., NodeLists)
-		if ( len !== len ) {
-			while ( second[ j ] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
+		for ( ; j < len; j++ ) {
+			first[ i++ ] = second[ j ];
 		}
 
 		first.length = i;
@@ -509,7 +482,7 @@ jQuery.extend( {
 	// Bind a function to a context, optionally partially applying any
 	// arguments.
 	proxy: function( fn, context ) {
-		var args, proxy, tmp;
+		var tmp, args, proxy;
 
 		if ( typeof context === "string" ) {
 			tmp = fn[ context ];
@@ -535,24 +508,16 @@ jQuery.extend( {
 		return proxy;
 	},
 
-	now: function() {
-		return +( new Date() );
-	},
+	now: Date.now,
 
 	// jQuery.support is not used in Core but other projects attach their
 	// properties to it so it needs to exist.
 	support: support
 } );
 
-// JSHint would error on this code due to the Symbol not being defined in ES5.
-// Defining this global in .jshintrc would create a danger of using the global
-// unguarded in another place, it seems safer to just disable JSHint for these
-// three lines.
-/* jshint ignore: start */
 if ( typeof Symbol === "function" ) {
-	jQuery.fn[ Symbol.iterator ] = deletedIds[ Symbol.iterator ];
+	jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ];
 }
-/* jshint ignore: end */
 
 // Populate the class2type map
 jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
@@ -562,7 +527,7 @@ function( i, name ) {
 
 function isArrayLike( obj ) {
 
-	// Support: iOS 8.2 (not reproducible in simulator)
+	// Support: real iOS 8.2 only (not reproducible in simulator)
 	// `in` check used to prevent JIT error (gh-2145)
 	// hasOwn isn't used here due to false negatives
 	// regarding Nodelist length in IE
@@ -578,14 +543,14 @@ function isArrayLike( obj ) {
 }
 var Sizzle =
 /*!
- * Sizzle CSS Selector Engine v2.2.1
- * http://sizzlejs.com/
+ * Sizzle CSS Selector Engine v2.3.3
+ * https://sizzlejs.com/
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2015-10-17
+ * Date: 2016-08-08
  */
 (function( window ) {
 
@@ -626,9 +591,6 @@ var i,
 		return 0;
 	},
 
-	// General-purpose constants
-	MAX_NEGATIVE = 1 << 31,
-
 	// Instance methods
 	hasOwn = ({}).hasOwnProperty,
 	arr = [],
@@ -637,7 +599,7 @@ var i,
 	push = arr.push,
 	slice = arr.slice,
 	// Use a stripped-down indexOf as it's faster than native
-	// http://jsperf.com/thor-indexof-vs-for/5
+	// https://jsperf.com/thor-indexof-vs-for/5
 	indexOf = function( list, elem ) {
 		var i = 0,
 			len = list.length;
@@ -657,7 +619,7 @@ var i,
 	whitespace = "[\\x20\\t\\r\\n\\f]",
 
 	// http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
+	identifier = "(?:\\\\.|[\\w-]|[^\0-\\xa0])+",
 
 	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
 	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
@@ -714,9 +676,9 @@ var i,
 	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
 
 	rsibling = /[+~]/,
-	rescape = /'|\\/g,
 
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+	// CSS escapes
+	// http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
 	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
 	funescape = function( _, escaped, escapedWhitespace ) {
 		var high = "0x" + escaped - 0x10000;
@@ -732,13 +694,39 @@ var i,
 				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
 	},
 
+	// CSS string/identifier serialization
+	// https://drafts.csswg.org/cssom/#common-serializing-idioms
+	rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,
+	fcssescape = function( ch, asCodePoint ) {
+		if ( asCodePoint ) {
+
+			// U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
+			if ( ch === "\0" ) {
+				return "\uFFFD";
+			}
+
+			// Control characters and (dependent upon position) numbers get escaped as code points
+			return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
+		}
+
+		// Other potentially-special ASCII characters get backslash-escaped
+		return "\\" + ch;
+	},
+
 	// Used for iframes
 	// See setDocument()
 	// Removing the function wrapper causes a "Permission Denied"
 	// error in IE
 	unloadHandler = function() {
 		setDocument();
-	};
+	},
+
+	disabledAncestor = addCombinator(
+		function( elem ) {
+			return elem.disabled === true && ("form" in elem || "label" in elem);
+		},
+		{ dir: "parentNode", next: "legend" }
+	);
 
 // Optimize for push.apply( _, NodeList )
 try {
@@ -770,7 +758,7 @@ try {
 }
 
 function Sizzle( selector, context, results, seed ) {
-	var m, i, elem, nid, nidselect, match, groups, newSelector,
+	var m, i, elem, nid, match, groups, newSelector,
 		newContext = context && context.ownerDocument,
 
 		// nodeType defaults to 9, since context defaults to document
@@ -863,7 +851,7 @@ function Sizzle( selector, context, results, seed ) {
 
 					// Capture the context ID, setting it first if necessary
 					if ( (nid = context.getAttribute( "id" )) ) {
-						nid = nid.replace( rescape, "\\$&" );
+						nid = nid.replace( rcssescape, fcssescape );
 					} else {
 						context.setAttribute( "id", (nid = expando) );
 					}
@@ -871,9 +859,8 @@ function Sizzle( selector, context, results, seed ) {
 					// Prefix every selector in the list
 					groups = tokenize( selector );
 					i = groups.length;
-					nidselect = ridentifier.test( nid ) ? "#" + nid : "[id='" + nid + "']";
 					while ( i-- ) {
-						groups[i] = nidselect + " " + toSelector( groups[i] );
+						groups[i] = "#" + nid + " " + toSelector( groups[i] );
 					}
 					newSelector = groups.join( "," );
 
@@ -934,22 +921,22 @@ function markFunction( fn ) {
 
 /**
  * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
+ * @param {Function} fn Passed the created element and returns a boolean result
  */
 function assert( fn ) {
-	var div = document.createElement("div");
+	var el = document.createElement("fieldset");
 
 	try {
-		return !!fn( div );
+		return !!fn( el );
 	} catch (e) {
 		return false;
 	} finally {
 		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
+		if ( el.parentNode ) {
+			el.parentNode.removeChild( el );
 		}
 		// release memory in IE
-		div = null;
+		el = null;
 	}
 }
 
@@ -976,8 +963,7 @@ function addHandle( attrs, handler ) {
 function siblingCheck( a, b ) {
 	var cur = b && a,
 		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
+			a.sourceIndex - b.sourceIndex;
 
 	// Use IE sourceIndex if available on both nodes
 	if ( diff ) {
@@ -1018,6 +1004,62 @@ function createButtonPseudo( type ) {
 	};
 }
 
+/**
+ * Returns a function to use in pseudos for :enabled/:disabled
+ * @param {Boolean} disabled true for :disabled; false for :enabled
+ */
+function createDisabledPseudo( disabled ) {
+
+	// Known :disabled false positives: fieldset[disabled] > legend:nth-of-type(n+2) :can-disable
+	return function( elem ) {
+
+		// Only certain elements can match :enabled or :disabled
+		// https://html.spec.whatwg.org/multipage/scripting.html#selector-enabled
+		// https://html.spec.whatwg.org/multipage/scripting.html#selector-disabled
+		if ( "form" in elem ) {
+
+			// Check for inherited disabledness on relevant non-disabled elements:
+			// * listed form-associated elements in a disabled fieldset
+			//   https://html.spec.whatwg.org/multipage/forms.html#category-listed
+			//   https://html.spec.whatwg.org/multipage/forms.html#concept-fe-disabled
+			// * option elements in a disabled optgroup
+			//   https://html.spec.whatwg.org/multipage/forms.html#concept-option-disabled
+			// All such elements have a "form" property.
+			if ( elem.parentNode && elem.disabled === false ) {
+
+				// Option elements defer to a parent optgroup if present
+				if ( "label" in elem ) {
+					if ( "label" in elem.parentNode ) {
+						return elem.parentNode.disabled === disabled;
+					} else {
+						return elem.disabled === disabled;
+					}
+				}
+
+				// Support: IE 6 - 11
+				// Use the isDisabled shortcut property to check for disabled fieldset ancestors
+				return elem.isDisabled === disabled ||
+
+					// Where there is no isDisabled, check manually
+					/* jshint -W018 */
+					elem.isDisabled !== !disabled &&
+						disabledAncestor( elem ) === disabled;
+			}
+
+			return elem.disabled === disabled;
+
+		// Try to winnow out elements that can't be disabled before trusting the disabled property.
+		// Some victims get caught in our net (label, legend, menu, track), but it shouldn't
+		// even exist on them, let alone have a boolean value.
+		} else if ( "label" in elem ) {
+			return elem.disabled === disabled;
+		}
+
+		// Remaining elements are neither :enabled nor :disabled
+		return false;
+	};
+}
+
 /**
  * Returns a function to use in pseudos for positionals
  * @param {Function} fn
@@ -1070,7 +1112,7 @@ isXML = Sizzle.isXML = function( elem ) {
  * @returns {Object} Returns the current document
  */
 setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare, parent,
+	var hasCompare, subWindow,
 		doc = node ? node.ownerDocument || node : preferredDoc;
 
 	// Return early if doc is invalid or already selected
@@ -1085,14 +1127,16 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 	// Support: IE 9-11, Edge
 	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
-	if ( (parent = document.defaultView) && parent.top !== parent ) {
-		// Support: IE 11
-		if ( parent.addEventListener ) {
-			parent.addEventListener( "unload", unloadHandler, false );
+	if ( preferredDoc !== document &&
+		(subWindow = document.defaultView) && subWindow.top !== subWindow ) {
+
+		// Support: IE 11, Edge
+		if ( subWindow.addEventListener ) {
+			subWindow.addEventListener( "unload", unloadHandler, false );
 
 		// Support: IE 9 - 10 only
-		} else if ( parent.attachEvent ) {
-			parent.attachEvent( "onunload", unloadHandler );
+		} else if ( subWindow.attachEvent ) {
+			subWindow.attachEvent( "onunload", unloadHandler );
 		}
 	}
 
@@ -1102,18 +1146,18 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Support: IE<8
 	// Verify that getAttribute really returns attributes and not properties
 	// (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
+	support.attributes = assert(function( el ) {
+		el.className = "i";
+		return !el.getAttribute("className");
 	});
 
 	/* getElement(s)By*
 	---------------------------------------------------------------------- */
 
 	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( document.createComment("") );
-		return !div.getElementsByTagName("*").length;
+	support.getElementsByTagName = assert(function( el ) {
+		el.appendChild( document.createComment("") );
+		return !el.getElementsByTagName("*").length;
 	});
 
 	// Support: IE<9
@@ -1121,32 +1165,28 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 	// Support: IE<10
 	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
+	// The broken getElementById methods don't pick up programmatically-set names,
 	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
+	support.getById = assert(function( el ) {
+		docElem.appendChild( el ).id = expando;
 		return !document.getElementsByName || !document.getElementsByName( expando ).length;
 	});
 
-	// ID find and filter
+	// ID filter and find
 	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
-				var m = context.getElementById( id );
-				return m ? [ m ] : [];
-			}
-		};
 		Expr.filter["ID"] = function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
 				return elem.getAttribute("id") === attrId;
 			};
 		};
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
+				var elem = context.getElementById( id );
+				return elem ? [ elem ] : [];
+			}
+		};
 	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
 		Expr.filter["ID"] =  function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
@@ -1155,6 +1195,36 @@ setDocument = Sizzle.setDocument = function( node ) {
 				return node && node.value === attrId;
 			};
 		};
+
+		// Support: IE 6 - 7 only
+		// getElementById is not reliable as a find shortcut
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
+				var node, i, elems,
+					elem = context.getElementById( id );
+
+				if ( elem ) {
+
+					// Verify the id attribute
+					node = elem.getAttributeNode("id");
+					if ( node && node.value === id ) {
+						return [ elem ];
+					}
+
+					// Fall back on getElementsByName
+					elems = context.getElementsByName( id );
+					i = 0;
+					while ( (elem = elems[i++]) ) {
+						node = elem.getAttributeNode("id");
+						if ( node && node.value === id ) {
+							return [ elem ];
+						}
+					}
+				}
+
+				return [];
+			}
+		};
 	}
 
 	// Tag
@@ -1208,77 +1278,87 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// We allow this because of a bug in IE8/9 that throws an error
 	// whenever `document.activeElement` is accessed on an iframe
 	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
+	// See https://bugs.jquery.com/ticket/13378
 	rbuggyQSA = [];
 
 	if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
 		// Build QSA regex
 		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
+		assert(function( el ) {
 			// Select is set to empty string on purpose
 			// This is to test IE's treatment of not explicitly
 			// setting a boolean content attribute,
 			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
+			// https://bugs.jquery.com/ticket/12359
+			docElem.appendChild( el ).innerHTML = "<a id='" + expando + "'></a>" +
 				"<select id='" + expando + "-\r\\' msallowcapture=''>" +
 				"<option selected=''></option></select>";
 
 			// Support: IE8, Opera 11-12.16
 			// Nothing should be selected when empty strings follow ^= or $= or *=
 			// The test attribute must be unknown in Opera but "safe" for WinRT
-			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
+			// https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
+			if ( el.querySelectorAll("[msallowcapture^='']").length ) {
 				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
 			}
 
 			// Support: IE8
 			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
+			if ( !el.querySelectorAll("[selected]").length ) {
 				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
 			}
 
 			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
-			if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
+			if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
 				rbuggyQSA.push("~=");
 			}
 
 			// Webkit/Opera - :checked should return selected option elements
 			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
 			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
+			if ( !el.querySelectorAll(":checked").length ) {
 				rbuggyQSA.push(":checked");
 			}
 
 			// Support: Safari 8+, iOS 8+
 			// https://bugs.webkit.org/show_bug.cgi?id=136851
-			// In-page `selector#id sibing-combinator selector` fails
-			if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
+			// In-page `selector#id sibling-combinator selector` fails
+			if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) {
 				rbuggyQSA.push(".#.+[+~]");
 			}
 		});
 
-		assert(function( div ) {
+		assert(function( el ) {
+			el.innerHTML = "<a href='' disabled='disabled'></a>" +
+				"<select disabled='disabled'><option/></select>";
+
 			// Support: Windows 8 Native Apps
 			// The type and name attributes are restricted during .innerHTML assignment
 			var input = document.createElement("input");
 			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "name", "D" );
+			el.appendChild( input ).setAttribute( "name", "D" );
 
 			// Support: IE8
 			// Enforce case-sensitivity of name attribute
-			if ( div.querySelectorAll("[name=d]").length ) {
+			if ( el.querySelectorAll("[name=d]").length ) {
 				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
 			}
 
 			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
 			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
+			if ( el.querySelectorAll(":enabled").length !== 2 ) {
+				rbuggyQSA.push( ":enabled", ":disabled" );
+			}
+
+			// Support: IE9-11+
+			// IE's :disabled selector does not pick up the children of disabled fieldsets
+			docElem.appendChild( el ).disabled = true;
+			if ( el.querySelectorAll(":disabled").length !== 2 ) {
 				rbuggyQSA.push( ":enabled", ":disabled" );
 			}
 
 			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
+			el.querySelectorAll("*,:x");
 			rbuggyQSA.push(",.*:");
 		});
 	}
@@ -1289,14 +1369,14 @@ setDocument = Sizzle.setDocument = function( node ) {
 		docElem.oMatchesSelector ||
 		docElem.msMatchesSelector) )) ) {
 
-		assert(function( div ) {
+		assert(function( el ) {
 			// Check to see if it's possible to do matchesSelector
 			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
+			support.disconnectedMatch = matches.call( el, "*" );
 
 			// This should fail with an exception
 			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
+			matches.call( el, "[s!='']:x" );
 			rbuggyMatches.push( "!=", pseudos );
 		});
 	}
@@ -1498,6 +1578,10 @@ Sizzle.attr = function( elem, name ) {
 				null;
 };
 
+Sizzle.escape = function( sel ) {
+	return (sel + "").replace( rcssescape, fcssescape );
+};
+
 Sizzle.error = function( msg ) {
 	throw new Error( "Syntax error, unrecognized expression: " + msg );
 };
@@ -1965,13 +2049,8 @@ Expr = Sizzle.selectors = {
 		},
 
 		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
+		"enabled": createDisabledPseudo( false ),
+		"disabled": createDisabledPseudo( true ),
 
 		"checked": function( elem ) {
 			// In CSS3, :checked should return both checked and selected elements
@@ -2173,7 +2252,9 @@ function toSelector( tokens ) {
 
 function addCombinator( matcher, combinator, base ) {
 	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
+		skip = combinator.next,
+		key = skip || dir,
+		checkNonElements = base && key === "parentNode",
 		doneName = done++;
 
 	return combinator.first ?
@@ -2184,6 +2265,7 @@ function addCombinator( matcher, combinator, base ) {
 					return matcher( elem, context, xml );
 				}
 			}
+			return false;
 		} :
 
 		// Check against all ancestor/preceding elements
@@ -2209,14 +2291,16 @@ function addCombinator( matcher, combinator, base ) {
 						// Defend against cloned attroperties (jQuery gh-1709)
 						uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
 
-						if ( (oldCache = uniqueCache[ dir ]) &&
+						if ( skip && skip === elem.nodeName.toLowerCase() ) {
+							elem = elem[ dir ] || elem;
+						} else if ( (oldCache = uniqueCache[ key ]) &&
 							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
 
 							// Assign to newCache so results back-propagate to previous elements
 							return (newCache[ 2 ] = oldCache[ 2 ]);
 						} else {
 							// Reuse newcache so results back-propagate to previous elements
-							uniqueCache[ dir ] = newCache;
+							uniqueCache[ key ] = newCache;
 
 							// A match means we're done; a fail means we have to keep checking
 							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
@@ -2226,6 +2310,7 @@ function addCombinator( matcher, combinator, base ) {
 					}
 				}
 			}
+			return false;
 		};
 }
 
@@ -2588,8 +2673,7 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 		// Reduce context if the leading compound selector is an ID
 		tokens = match[0] = match[0].slice( 0 );
 		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				support.getById && context.nodeType === 9 && documentIsHTML &&
-				Expr.relative[ tokens[1].type ] ) {
+				context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[1].type ] ) {
 
 			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
 			if ( !context ) {
@@ -2659,17 +2743,17 @@ setDocument();
 
 // Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
 // Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
+support.sortDetached = assert(function( el ) {
 	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
+	return el.compareDocumentPosition( document.createElement("fieldset") ) & 1;
 });
 
 // Support: IE<8
 // Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "<a href='#'></a>";
-	return div.firstChild.getAttribute("href") === "#" ;
+// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !assert(function( el ) {
+	el.innerHTML = "<a href='#'></a>";
+	return el.firstChild.getAttribute("href") === "#" ;
 }) ) {
 	addHandle( "type|href|height|width", function( elem, name, isXML ) {
 		if ( !isXML ) {
@@ -2680,10 +2764,10 @@ if ( !assert(function( div ) {
 
 // Support: IE<9
 // Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "<input/>";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
+if ( !support.attributes || !assert(function( el ) {
+	el.innerHTML = "<input/>";
+	el.firstChild.setAttribute( "value", "" );
+	return el.firstChild.getAttribute( "value" ) === "";
 }) ) {
 	addHandle( "value", function( elem, name, isXML ) {
 		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
@@ -2694,8 +2778,8 @@ if ( !support.attributes || !assert(function( div ) {
 
 // Support: IE<9
 // Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
+if ( !assert(function( el ) {
+	return el.getAttribute("disabled") == null;
 }) ) {
 	addHandle( booleans, function( elem, name, isXML ) {
 		var val;
@@ -2716,11 +2800,15 @@ return Sizzle;
 
 jQuery.find = Sizzle;
 jQuery.expr = Sizzle.selectors;
+
+// Deprecated
 jQuery.expr[ ":" ] = jQuery.expr.pseudos;
 jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
 jQuery.text = Sizzle.getText;
 jQuery.isXMLDoc = Sizzle.isXML;
 jQuery.contains = Sizzle.contains;
+jQuery.escapeSelector = Sizzle.escape;
+
 
 
 
@@ -2755,7 +2843,7 @@ var siblings = function( n, elem ) {
 
 var rneedsContext = jQuery.expr.match.needsContext;
 
-var rsingleTag = ( /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/ );
+var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
 
 
 
@@ -2765,29 +2853,33 @@ var risSimple = /^.[^:#\[\.,]*$/;
 function winnow( elements, qualifier, not ) {
 	if ( jQuery.isFunction( qualifier ) ) {
 		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
 			return !!qualifier.call( elem, i, elem ) !== not;
 		} );
-
 	}
 
+	// Single element
 	if ( qualifier.nodeType ) {
 		return jQuery.grep( elements, function( elem ) {
 			return ( elem === qualifier ) !== not;
 		} );
-
 	}
 
-	if ( typeof qualifier === "string" ) {
-		if ( risSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
+	// Arraylike of elements (jQuery, arguments, Array)
+	if ( typeof qualifier !== "string" ) {
+		return jQuery.grep( elements, function( elem ) {
+			return ( indexOf.call( qualifier, elem ) > -1 ) !== not;
+		} );
 	}
 
+	// Simple selector that can be filtered directly, removing non-Elements
+	if ( risSimple.test( qualifier ) ) {
+		return jQuery.filter( qualifier, elements, not );
+	}
+
+	// Complex selector, compare the two sets, removing non-Elements
+	qualifier = jQuery.filter( qualifier, elements );
 	return jQuery.grep( elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) > -1 ) !== not;
+		return ( indexOf.call( qualifier, elem ) > -1 ) !== not && elem.nodeType === 1;
 	} );
 }
 
@@ -2798,19 +2890,20 @@ jQuery.filter = function( expr, elems, not ) {
 		expr = ":not(" + expr + ")";
 	}
 
-	return elems.length === 1 && elem.nodeType === 1 ?
-		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-			return elem.nodeType === 1;
-		} ) );
+	if ( elems.length === 1 && elem.nodeType === 1 ) {
+		return jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [];
+	}
+
+	return jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
+		return elem.nodeType === 1;
+	} ) );
 };
 
 jQuery.fn.extend( {
 	find: function( selector ) {
-		var i,
-			ret = [],
-			self = this,
-			len = self.length;
+		var i, ret,
+			len = this.length,
+			self = this;
 
 		if ( typeof selector !== "string" ) {
 			return this.pushStack( jQuery( selector ).filter( function() {
@@ -2822,14 +2915,13 @@ jQuery.fn.extend( {
 			} ) );
 		}
 
+		ret = this.pushStack( [] );
+
 		for ( i = 0; i < len; i++ ) {
 			jQuery.find( selector, self[ i ], ret );
 		}
 
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
+		return len > 1 ? jQuery.uniqueSort( ret ) : ret;
 	},
 	filter: function( selector ) {
 		return this.pushStack( winnow( this, selector || [], false ) );
@@ -2861,7 +2953,8 @@ var rootjQuery,
 	// A simple way to check for HTML strings
 	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
 	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
+	// Shortcut simple #id case for speed
+	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,
 
 	init = jQuery.fn.init = function( selector, context, root ) {
 		var match, elem;
@@ -2871,14 +2964,14 @@ var rootjQuery,
 			return this;
 		}
 
-		// init accepts an alternate rootjQuery
+		// Method init() accepts an alternate rootjQuery
 		// so migrate can support jQuery.sub (gh-2101)
 		root = root || rootjQuery;
 
 		// Handle HTML strings
 		if ( typeof selector === "string" ) {
-			if ( selector.charAt( 0 ) === "<" &&
-				selector.charAt( selector.length - 1 ) === ">" &&
+			if ( selector[ 0 ] === "<" &&
+				selector[ selector.length - 1 ] === ">" &&
 				selector.length >= 3 ) {
 
 				// Assume that strings that start and end with <> are HTML and skip the regex check
@@ -2895,7 +2988,7 @@ var rootjQuery,
 				if ( match[ 1 ] ) {
 					context = context instanceof jQuery ? context[ 0 ] : context;
 
-					// scripts is true for back-compat
+					// Option to run scripts is true for back-compat
 					// Intentionally let the error be thrown if parseHTML is not present
 					jQuery.merge( this, jQuery.parseHTML(
 						match[ 1 ],
@@ -2924,23 +3017,12 @@ var rootjQuery,
 				} else {
 					elem = document.getElementById( match[ 2 ] );
 
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
+					if ( elem ) {
 
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[ 2 ] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
+						// Inject the element directly into the jQuery object
 						this[ 0 ] = elem;
+						this.length = 1;
 					}
-
-					this.context = document;
-					this.selector = selector;
 					return this;
 				}
 
@@ -2956,25 +3038,20 @@ var rootjQuery,
 
 		// HANDLE: $(DOMElement)
 		} else if ( selector.nodeType ) {
-			this.context = this[ 0 ] = selector;
+			this[ 0 ] = selector;
 			this.length = 1;
 			return this;
 
 		// HANDLE: $(function)
 		// Shortcut for document ready
 		} else if ( jQuery.isFunction( selector ) ) {
-			return typeof root.ready !== "undefined" ?
+			return root.ready !== undefined ?
 				root.ready( selector ) :
 
 				// Execute immediately if ready is not present
 				selector( jQuery );
 		}
 
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
 		return jQuery.makeArray( selector, this );
 	};
 
@@ -2987,7 +3064,7 @@ rootjQuery = jQuery( document );
 
 var rparentsprev = /^(?:parents|prev(?:Until|All))/,
 
-	// methods guaranteed to produce a unique set when starting from a unique set
+	// Methods guaranteed to produce a unique set when starting from a unique set
 	guaranteedUnique = {
 		children: true,
 		contents: true,
@@ -2997,12 +3074,12 @@ var rparentsprev = /^(?:parents|prev(?:Until|All))/,
 
 jQuery.fn.extend( {
 	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
+		var targets = jQuery( target, this ),
+			l = targets.length;
 
 		return this.filter( function() {
-			for ( i = 0; i < len; i++ ) {
+			var i = 0;
+			for ( ; i < l; i++ ) {
 				if ( jQuery.contains( this, targets[ i ] ) ) {
 					return true;
 				}
@@ -3015,23 +3092,24 @@ jQuery.fn.extend( {
 			i = 0,
 			l = this.length,
 			matched = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
+			targets = typeof selectors !== "string" && jQuery( selectors );
 
-		for ( ; i < l; i++ ) {
-			for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
+		// Positional selectors never match, since there's no _selection_ context
+		if ( !rneedsContext.test( selectors ) ) {
+			for ( ; i < l; i++ ) {
+				for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
 
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && ( pos ?
-					pos.index( cur ) > -1 :
+					// Always skip document fragments
+					if ( cur.nodeType < 11 && ( targets ?
+						targets.index( cur ) > -1 :
 
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector( cur, selectors ) ) ) {
+						// Don't pass non-elements to Sizzle
+						cur.nodeType === 1 &&
+							jQuery.find.matchesSelector( cur, selectors ) ) ) {
 
-					matched.push( cur );
-					break;
+						matched.push( cur );
+						break;
+					}
 				}
 			}
 		}
@@ -3039,8 +3117,7 @@ jQuery.fn.extend( {
 		return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );
 	},
 
-	// Determine the position of an element within
-	// the matched set of elements
+	// Determine the position of an element within the set
 	index: function( elem ) {
 
 		// No argument, return index in parent
@@ -3048,16 +3125,17 @@ jQuery.fn.extend( {
 			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
 		}
 
-		// index in selector
+		// Index in selector
 		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[ 0 ], jQuery( elem ) );
+			return indexOf.call( jQuery( elem ), this[ 0 ] );
 		}
 
 		// Locate the position of the desired element
-		return jQuery.inArray(
+		return indexOf.call( this,
 
 			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[ 0 ] : elem, this );
+			elem.jquery ? elem[ 0 ] : elem
+		);
 	},
 
 	add: function( selector, context ) {
@@ -3076,10 +3154,7 @@ jQuery.fn.extend( {
 } );
 
 function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
+	while ( ( cur = cur[ dir ] ) && cur.nodeType !== 1 ) {}
 	return cur;
 }
 
@@ -3119,46 +3194,44 @@ jQuery.each( {
 		return siblings( elem.firstChild );
 	},
 	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
+		return elem.contentDocument || jQuery.merge( [], elem.childNodes );
 	}
 }, function( name, fn ) {
 	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
+		var matched = jQuery.map( this, fn, until );
 
 		if ( name.slice( -5 ) !== "Until" ) {
 			selector = until;
 		}
 
 		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
+			matched = jQuery.filter( selector, matched );
 		}
 
 		if ( this.length > 1 ) {
 
 			// Remove duplicates
 			if ( !guaranteedUnique[ name ] ) {
-				ret = jQuery.uniqueSort( ret );
+				jQuery.uniqueSort( matched );
 			}
 
 			// Reverse order for parents* and prev-derivatives
 			if ( rparentsprev.test( name ) ) {
-				ret = ret.reverse();
+				matched.reverse();
 			}
 		}
 
-		return this.pushStack( ret );
+		return this.pushStack( matched );
 	};
 } );
-var rnotwhite = ( /\S+/g );
+var rnothtmlwhite = ( /[^\x20\t\r\n\f]+/g );
 
 
 
 // Convert String-formatted options into Object-formatted ones
 function createOptions( options ) {
 	var object = {};
-	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
+	jQuery.each( options.match( rnothtmlwhite ) || [], function( _, flag ) {
 		object[ flag ] = true;
 	} );
 	return object;
@@ -3342,9 +3415,9 @@ jQuery.Callbacks = function( options ) {
 			// Also disable .add unless we have memory (since it would have no effect)
 			// Abort any pending executions
 			lock: function() {
-				locked = true;
-				if ( !memory ) {
-					self.disable();
+				locked = queue = [];
+				if ( !memory && !firing ) {
+					list = memory = "";
 				}
 				return this;
 			},
@@ -3381,15 +3454,58 @@ jQuery.Callbacks = function( options ) {
 };
 
 
+function Identity( v ) {
+	return v;
+}
+function Thrower( ex ) {
+	throw ex;
+}
+
+function adoptValue( value, resolve, reject ) {
+	var method;
+
+	try {
+
+		// Check for promise aspect first to privilege synchronous behavior
+		if ( value && jQuery.isFunction( ( method = value.promise ) ) ) {
+			method.call( value ).done( resolve ).fail( reject );
+
+		// Other thenables
+		} else if ( value && jQuery.isFunction( ( method = value.then ) ) ) {
+			method.call( value, resolve, reject );
+
+		// Other non-thenables
+		} else {
+
+			// Support: Android 4.0 only
+			// Strict mode functions invoked without .call/.apply get global-object context
+			resolve.call( undefined, value );
+		}
+
+	// For Promises/A+, convert exceptions into rejections
+	// Since jQuery.when doesn't unwrap thenables, we can skip the extra checks appearing in
+	// Deferred#then to conditionally suppress rejection.
+	} catch ( value ) {
+
+		// Support: Android 4.0 only
+		// Strict mode functions invoked without .call/.apply get global-object context
+		reject.call( undefined, value );
+	}
+}
+
 jQuery.extend( {
 
 	Deferred: function( func ) {
 		var tuples = [
 
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks( "once memory" ), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks( "once memory" ), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks( "memory" ) ]
+				// action, add listener, callbacks,
+				// ... .then handlers, argument index, [final state]
+				[ "notify", "progress", jQuery.Callbacks( "memory" ),
+					jQuery.Callbacks( "memory" ), 2 ],
+				[ "resolve", "done", jQuery.Callbacks( "once memory" ),
+					jQuery.Callbacks( "once memory" ), 0, "resolved" ],
+				[ "reject", "fail", jQuery.Callbacks( "once memory" ),
+					jQuery.Callbacks( "once memory" ), 1, "rejected" ]
 			],
 			state = "pending",
 			promise = {
@@ -3400,13 +3516,23 @@ jQuery.extend( {
 					deferred.done( arguments ).fail( arguments );
 					return this;
 				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
+				"catch": function( fn ) {
+					return promise.then( null, fn );
+				},
+
+				// Keep pipe for back-compat
+				pipe: function( /* fnDone, fnFail, fnProgress */ ) {
 					var fns = arguments;
+
 					return jQuery.Deferred( function( newDefer ) {
 						jQuery.each( tuples, function( i, tuple ) {
-							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
 
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
+							// Map tuples (progress, done, fail) to arguments (done, fail, progress)
+							var fn = jQuery.isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ];
+
+							// deferred.progress(function() { bind to newDefer or newDefer.notify })
+							// deferred.done(function() { bind to newDefer or newDefer.resolve })
+							// deferred.fail(function() { bind to newDefer or newDefer.reject })
 							deferred[ tuple[ 1 ] ]( function() {
 								var returned = fn && fn.apply( this, arguments );
 								if ( returned && jQuery.isFunction( returned.promise ) ) {
@@ -3416,7 +3542,7 @@ jQuery.extend( {
 										.fail( newDefer.reject );
 								} else {
 									newDefer[ tuple[ 0 ] + "With" ](
-										this === promise ? newDefer.promise() : this,
+										this,
 										fn ? [ returned ] : arguments
 									);
 								}
@@ -3425,6 +3551,170 @@ jQuery.extend( {
 						fns = null;
 					} ).promise();
 				},
+				then: function( onFulfilled, onRejected, onProgress ) {
+					var maxDepth = 0;
+					function resolve( depth, deferred, handler, special ) {
+						return function() {
+							var that = this,
+								args = arguments,
+								mightThrow = function() {
+									var returned, then;
+
+									// Support: Promises/A+ section 2.3.3.3.3
+									// https://promisesaplus.com/#point-59
+									// Ignore double-resolution attempts
+									if ( depth < maxDepth ) {
+										return;
+									}
+
+									returned = handler.apply( that, args );
+
+									// Support: Promises/A+ section 2.3.1
+									// https://promisesaplus.com/#point-48
+									if ( returned === deferred.promise() ) {
+										throw new TypeError( "Thenable self-resolution" );
+									}
+
+									// Support: Promises/A+ sections 2.3.3.1, 3.5
+									// https://promisesaplus.com/#point-54
+									// https://promisesaplus.com/#point-75
+									// Retrieve `then` only once
+									then = returned &&
+
+										// Support: Promises/A+ section 2.3.4
+										// https://promisesaplus.com/#point-64
+										// Only check objects and functions for thenability
+										( typeof returned === "object" ||
+											typeof returned === "function" ) &&
+										returned.then;
+
+									// Handle a returned thenable
+									if ( jQuery.isFunction( then ) ) {
+
+										// Special processors (notify) just wait for resolution
+										if ( special ) {
+											then.call(
+												returned,
+												resolve( maxDepth, deferred, Identity, special ),
+												resolve( maxDepth, deferred, Thrower, special )
+											);
+
+										// Normal processors (resolve) also hook into progress
+										} else {
+
+											// ...and disregard older resolution values
+											maxDepth++;
+
+											then.call(
+												returned,
+												resolve( maxDepth, deferred, Identity, special ),
+												resolve( maxDepth, deferred, Thrower, special ),
+												resolve( maxDepth, deferred, Identity,
+													deferred.notifyWith )
+											);
+										}
+
+									// Handle all other returned values
+									} else {
+
+										// Only substitute handlers pass on context
+										// and multiple values (non-spec behavior)
+										if ( handler !== Identity ) {
+											that = undefined;
+											args = [ returned ];
+										}
+
+										// Process the value(s)
+										// Default process is resolve
+										( special || deferred.resolveWith )( that, args );
+									}
+								},
+
+								// Only normal processors (resolve) catch and reject exceptions
+								process = special ?
+									mightThrow :
+									function() {
+										try {
+											mightThrow();
+										} catch ( e ) {
+
+											if ( jQuery.Deferred.exceptionHook ) {
+												jQuery.Deferred.exceptionHook( e,
+													process.stackTrace );
+											}
+
+											// Support: Promises/A+ section 2.3.3.3.4.1
+											// https://promisesaplus.com/#point-61
+											// Ignore post-resolution exceptions
+											if ( depth + 1 >= maxDepth ) {
+
+												// Only substitute handlers pass on context
+												// and multiple values (non-spec behavior)
+												if ( handler !== Thrower ) {
+													that = undefined;
+													args = [ e ];
+												}
+
+												deferred.rejectWith( that, args );
+											}
+										}
+									};
+
+							// Support: Promises/A+ section 2.3.3.3.1
+							// https://promisesaplus.com/#point-57
+							// Re-resolve promises immediately to dodge false rejection from
+							// subsequent errors
+							if ( depth ) {
+								process();
+							} else {
+
+								// Call an optional hook to record the stack, in case of exception
+								// since it's otherwise lost when execution goes async
+								if ( jQuery.Deferred.getStackHook ) {
+									process.stackTrace = jQuery.Deferred.getStackHook();
+								}
+								window.setTimeout( process );
+							}
+						};
+					}
+
+					return jQuery.Deferred( function( newDefer ) {
+
+						// progress_handlers.add( ... )
+						tuples[ 0 ][ 3 ].add(
+							resolve(
+								0,
+								newDefer,
+								jQuery.isFunction( onProgress ) ?
+									onProgress :
+									Identity,
+								newDefer.notifyWith
+							)
+						);
+
+						// fulfilled_handlers.add( ... )
+						tuples[ 1 ][ 3 ].add(
+							resolve(
+								0,
+								newDefer,
+								jQuery.isFunction( onFulfilled ) ?
+									onFulfilled :
+									Identity
+							)
+						);
+
+						// rejected_handlers.add( ... )
+						tuples[ 2 ][ 3 ].add(
+							resolve(
+								0,
+								newDefer,
+								jQuery.isFunction( onRejected ) ?
+									onRejected :
+									Thrower
+							)
+						);
+					} ).promise();
+				},
 
 				// Get a promise for this deferred
 				// If obj is provided, the promise aspect is added to the object
@@ -3434,33 +3724,51 @@ jQuery.extend( {
 			},
 			deferred = {};
 
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
 		// Add list-specific methods
 		jQuery.each( tuples, function( i, tuple ) {
 			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
+				stateString = tuple[ 5 ];
 
-			// promise[ done | fail | progress ] = list.add
+			// promise.progress = list.add
+			// promise.done = list.add
+			// promise.fail = list.add
 			promise[ tuple[ 1 ] ] = list.add;
 
 			// Handle state
 			if ( stateString ) {
-				list.add( function() {
+				list.add(
+					function() {
 
-					// state = [ resolved | rejected ]
-					state = stateString;
+						// state = "resolved" (i.e., fulfilled)
+						// state = "rejected"
+						state = stateString;
+					},
 
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
+					// rejected_callbacks.disable
+					// fulfilled_callbacks.disable
+					tuples[ 3 - i ][ 2 ].disable,
+
+					// progress_callbacks.lock
+					tuples[ 0 ][ 2 ].lock
+				);
 			}
 
-			// deferred[ resolve | reject | notify ]
+			// progress_handlers.fire
+			// fulfilled_handlers.fire
+			// rejected_handlers.fire
+			list.add( tuple[ 3 ].fire );
+
+			// deferred.notify = function() { deferred.notifyWith(...) }
+			// deferred.resolve = function() { deferred.resolveWith(...) }
+			// deferred.reject = function() { deferred.rejectWith(...) }
 			deferred[ tuple[ 0 ] ] = function() {
-				deferred[ tuple[ 0 ] + "With" ]( this === deferred ? promise : this, arguments );
+				deferred[ tuple[ 0 ] + "With" ]( this === deferred ? undefined : this, arguments );
 				return this;
 			};
+
+			// deferred.notifyWith = list.fireWith
+			// deferred.resolveWith = list.fireWith
+			// deferred.rejectWith = list.fireWith
 			deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
 		} );
 
@@ -3477,69 +3785,94 @@ jQuery.extend( {
 	},
 
 	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
+	when: function( singleValue ) {
+		var
+
+			// count of uncompleted subordinates
+			remaining = arguments.length,
+
+			// count of unprocessed arguments
+			i = remaining,
+
+			// subordinate fulfillment data
+			resolveContexts = Array( i ),
 			resolveValues = slice.call( arguments ),
-			length = resolveValues.length,
 
-			// the count of uncompleted subordinates
-			remaining = length !== 1 ||
-				( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
+			// the master Deferred
+			master = jQuery.Deferred(),
 
-			// the master Deferred.
-			// If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
+			// subordinate callback factory
+			updateFunc = function( i ) {
 				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
-					if ( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
+					resolveContexts[ i ] = this;
+					resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
+					if ( !( --remaining ) ) {
+						master.resolveWith( resolveContexts, resolveValues );
 					}
 				};
-			},
+			};
 
-			progressValues, progressContexts, resolveContexts;
+		// Single- and empty arguments are adopted like Promise.resolve
+		if ( remaining <= 1 ) {
+			adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject );
 
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.progress( updateFunc( i, progressContexts, progressValues ) )
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject );
-				} else {
-					--remaining;
-				}
+			// Use .then() to unwrap secondary thenables (cf. gh-3000)
+			if ( master.state() === "pending" ||
+				jQuery.isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
+
+				return master.then();
 			}
 		}
 
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
+		// Multiple arguments are aggregated like Promise.all array elements
+		while ( i-- ) {
+			adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
 		}
 
-		return deferred.promise();
+		return master.promise();
 	}
 } );
 
 
+// These usually indicate a programmer mistake during development,
+// warn about them ASAP rather than swallowing them by default.
+var rerrorNames = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;
+
+jQuery.Deferred.exceptionHook = function( error, stack ) {
+
+	// Support: IE 8 - 9 only
+	// Console exists when dev tools are open, which can happen at any time
+	if ( window.console && window.console.warn && error && rerrorNames.test( error.name ) ) {
+		window.console.warn( "jQuery.Deferred exception: " + error.message, error.stack, stack );
+	}
+};
+
+
+
+
+jQuery.readyException = function( error ) {
+	window.setTimeout( function() {
+		throw error;
+	} );
+};
+
+
+
+
 // The deferred used on DOM ready
-var readyList;
+var readyList = jQuery.Deferred();
 
 jQuery.fn.ready = function( fn ) {
 
-	// Add the callback
-	jQuery.ready.promise().done( fn );
+	readyList
+		.then( fn )
+
+		// Wrap jQuery.readyException in a function so that the lookup
+		// happens at the time of error handling instead of callback
+		// registration.
+		.catch( function( error ) {
+			jQuery.readyException( error );
+		} );
 
 	return this;
 };
@@ -3580,469 +3913,352 @@ jQuery.extend( {
 
 		// If there are functions bound, to execute
 		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.triggerHandler ) {
-			jQuery( document ).triggerHandler( "ready" );
-			jQuery( document ).off( "ready" );
-		}
 	}
 } );
 
-/**
- * Clean-up method for dom ready events
- */
-function detach() {
-	if ( document.addEventListener ) {
-		document.removeEventListener( "DOMContentLoaded", completed );
-		window.removeEventListener( "load", completed );
+jQuery.ready.then = readyList.then;
 
-	} else {
-		document.detachEvent( "onreadystatechange", completed );
-		window.detachEvent( "onload", completed );
-	}
-}
-
-/**
- * The ready event handler and self cleanup method
- */
+// The ready event handler and self cleanup method
 function completed() {
-
-	// readyState === "complete" is good enough for us to call the dom ready in oldIE
-	if ( document.addEventListener ||
-		window.event.type === "load" ||
-		document.readyState === "complete" ) {
-
-		detach();
-		jQuery.ready();
-	}
+	document.removeEventListener( "DOMContentLoaded", completed );
+	window.removeEventListener( "load", completed );
+	jQuery.ready();
 }
 
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
+// Catch cases where $(document).ready() is called
+// after the browser event has already occurred.
+// Support: IE <=9 - 10 only
+// Older IE sometimes signals "interactive" too soon
+if ( document.readyState === "complete" ||
+	( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
 
-		readyList = jQuery.Deferred();
+	// Handle it asynchronously to allow scripts the opportunity to delay ready
+	window.setTimeout( jQuery.ready );
 
-		// Catch cases where $(document).ready() is called
-		// after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here,
-		// but it caused issues like the one
-		// discovered by ChrisS here:
-		// http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
+} else {
 
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			window.setTimeout( jQuery.ready );
+	// Use the handy event callback
+	document.addEventListener( "DOMContentLoaded", completed );
 
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
+	// A fallback to window.onload, that will always work
+	window.addEventListener( "load", completed );
+}
 
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed );
 
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed );
 
-		// If IE event model is used
-		} else {
 
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", completed );
+// Multifunctional method to get and set values of a collection
+// The value/s can optionally be executed if it's a function
+var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
+	var i = 0,
+		len = elems.length,
+		bulk = key == null;
 
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", completed );
+	// Sets many values
+	if ( jQuery.type( key ) === "object" ) {
+		chainable = true;
+		for ( i in key ) {
+			access( elems, fn, i, key[ i ], true, emptyGet, raw );
+		}
 
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
+	// Sets one value
+	} else if ( value !== undefined ) {
+		chainable = true;
 
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch ( e ) {}
+		if ( !jQuery.isFunction( value ) ) {
+			raw = true;
+		}
 
-			if ( top && top.doScroll ) {
-				( function doScrollCheck() {
-					if ( !jQuery.isReady ) {
+		if ( bulk ) {
 
-						try {
+			// Bulk operations run against the entire set
+			if ( raw ) {
+				fn.call( elems, value );
+				fn = null;
 
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll( "left" );
-						} catch ( e ) {
-							return window.setTimeout( doScrollCheck, 50 );
-						}
+			// ...except when executing function values
+			} else {
+				bulk = fn;
+				fn = function( elem, key, value ) {
+					return bulk.call( jQuery( elem ), value );
+				};
+			}
+		}
 
-						// detach all dom ready events
-						detach();
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				} )();
+		if ( fn ) {
+			for ( ; i < len; i++ ) {
+				fn(
+					elems[ i ], key, raw ?
+					value :
+					value.call( elems[ i ], i, fn( elems[ i ], key ) )
+				);
 			}
 		}
 	}
-	return readyList.promise( obj );
+
+	if ( chainable ) {
+		return elems;
+	}
+
+	// Gets
+	if ( bulk ) {
+		return fn.call( elems );
+	}
+
+	return len ? fn( elems[ 0 ], key ) : emptyGet;
+};
+var acceptData = function( owner ) {
+
+	// Accepts only:
+	//  - Node
+	//    - Node.ELEMENT_NODE
+	//    - Node.DOCUMENT_NODE
+	//  - Object
+	//    - Any
+	return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
 };
 
-// Kick off the DOM ready check even if the user does not
-jQuery.ready.promise();
 
 
 
-
-// Support: IE<9
-// Iteration over object's inherited properties before its own
-var i;
-for ( i in jQuery( support ) ) {
-	break;
+function Data() {
+	this.expando = jQuery.expando + Data.uid++;
 }
-support.ownFirst = i === "0";
 
-// Note: most support tests are defined in their respective modules.
-// false until the test is run
-support.inlineBlockNeedsLayout = false;
+Data.uid = 1;
 
-// Execute ASAP in case we need to set body.style.zoom
-jQuery( function() {
+Data.prototype = {
 
-	// Minified: var a,b,c,d
-	var val, div, body, container;
+	cache: function( owner ) {
 
-	body = document.getElementsByTagName( "body" )[ 0 ];
-	if ( !body || !body.style ) {
+		// Check if the owner object already has a cache
+		var value = owner[ this.expando ];
 
-		// Return for frameset docs that don't have a body
-		return;
-	}
+		// If not, create one
+		if ( !value ) {
+			value = {};
 
-	// Setup
-	div = document.createElement( "div" );
-	container = document.createElement( "div" );
-	container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
-	body.appendChild( container ).appendChild( div );
+			// We can accept data for non-element nodes in modern browsers,
+			// but we should not, see #8335.
+			// Always return an empty object.
+			if ( acceptData( owner ) ) {
 
-	if ( typeof div.style.zoom !== "undefined" ) {
+				// If it is a node unlikely to be stringify-ed or looped over
+				// use plain assignment
+				if ( owner.nodeType ) {
+					owner[ this.expando ] = value;
 
-		// Support: IE<8
-		// Check if natively block-level elements act like inline-block
-		// elements when setting their display to 'inline' and giving
-		// them layout
-		div.style.cssText = "display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1";
-
-		support.inlineBlockNeedsLayout = val = div.offsetWidth === 3;
-		if ( val ) {
-
-			// Prevent IE 6 from affecting layout for positioned elements #11048
-			// Prevent IE from shrinking the body in IE 7 mode #12869
-			// Support: IE<8
-			body.style.zoom = 1;
+				// Otherwise secure it in a non-enumerable property
+				// configurable must be true to allow the property to be
+				// deleted when data is removed
+				} else {
+					Object.defineProperty( owner, this.expando, {
+						value: value,
+						configurable: true
+					} );
+				}
+			}
 		}
+
+		return value;
+	},
+	set: function( owner, data, value ) {
+		var prop,
+			cache = this.cache( owner );
+
+		// Handle: [ owner, key, value ] args
+		// Always use camelCase key (gh-2257)
+		if ( typeof data === "string" ) {
+			cache[ jQuery.camelCase( data ) ] = value;
+
+		// Handle: [ owner, { properties } ] args
+		} else {
+
+			// Copy the properties one-by-one to the cache object
+			for ( prop in data ) {
+				cache[ jQuery.camelCase( prop ) ] = data[ prop ];
+			}
+		}
+		return cache;
+	},
+	get: function( owner, key ) {
+		return key === undefined ?
+			this.cache( owner ) :
+
+			// Always use camelCase key (gh-2257)
+			owner[ this.expando ] && owner[ this.expando ][ jQuery.camelCase( key ) ];
+	},
+	access: function( owner, key, value ) {
+
+		// In cases where either:
+		//
+		//   1. No key was specified
+		//   2. A string key was specified, but no value provided
+		//
+		// Take the "read" path and allow the get method to determine
+		// which value to return, respectively either:
+		//
+		//   1. The entire cache object
+		//   2. The data stored at the key
+		//
+		if ( key === undefined ||
+				( ( key && typeof key === "string" ) && value === undefined ) ) {
+
+			return this.get( owner, key );
+		}
+
+		// When the key is not a string, or both a key and value
+		// are specified, set or extend (existing objects) with either:
+		//
+		//   1. An object of properties
+		//   2. A key and value
+		//
+		this.set( owner, key, value );
+
+		// Since the "set" path can have two possible entry points
+		// return the expected data based on which path was taken[*]
+		return value !== undefined ? value : key;
+	},
+	remove: function( owner, key ) {
+		var i,
+			cache = owner[ this.expando ];
+
+		if ( cache === undefined ) {
+			return;
+		}
+
+		if ( key !== undefined ) {
+
+			// Support array or space separated string of keys
+			if ( jQuery.isArray( key ) ) {
+
+				// If key is an array of keys...
+				// We always set camelCase keys, so remove that.
+				key = key.map( jQuery.camelCase );
+			} else {
+				key = jQuery.camelCase( key );
+
+				// If a key with the spaces exists, use it.
+				// Otherwise, create an array by matching non-whitespace
+				key = key in cache ?
+					[ key ] :
+					( key.match( rnothtmlwhite ) || [] );
+			}
+
+			i = key.length;
+
+			while ( i-- ) {
+				delete cache[ key[ i ] ];
+			}
+		}
+
+		// Remove the expando if there's no more data
+		if ( key === undefined || jQuery.isEmptyObject( cache ) ) {
+
+			// Support: Chrome <=35 - 45
+			// Webkit & Blink performance suffers when deleting properties
+			// from DOM nodes, so set to undefined instead
+			// https://bugs.chromium.org/p/chromium/issues/detail?id=378607 (bug restricted)
+			if ( owner.nodeType ) {
+				owner[ this.expando ] = undefined;
+			} else {
+				delete owner[ this.expando ];
+			}
+		}
+	},
+	hasData: function( owner ) {
+		var cache = owner[ this.expando ];
+		return cache !== undefined && !jQuery.isEmptyObject( cache );
 	}
-
-	body.removeChild( container );
-} );
-
-
-( function() {
-	var div = document.createElement( "div" );
-
-	// Support: IE<9
-	support.deleteExpando = true;
-	try {
-		delete div.test;
-	} catch ( e ) {
-		support.deleteExpando = false;
-	}
-
-	// Null elements to avoid leaks in IE.
-	div = null;
-} )();
-var acceptData = function( elem ) {
-	var noData = jQuery.noData[ ( elem.nodeName + " " ).toLowerCase() ],
-		nodeType = +elem.nodeType || 1;
-
-	// Do not set data on non-element DOM nodes because it will not be cleared (#8335).
-	return nodeType !== 1 && nodeType !== 9 ?
-		false :
-
-		// Nodes accept data unless otherwise specified; rejection can be conditional
-		!noData || noData !== true && elem.getAttribute( "classid" ) === noData;
 };
+var dataPriv = new Data();
+
+var dataUser = new Data();
 
 
 
+//	Implementation Summary
+//
+//	1. Enforce API surface and semantic compatibility with 1.9.x branch
+//	2. Improve the module's maintainability by reducing the storage
+//		paths to a single mechanism.
+//	3. Use the same single mechanism to support "private" and "user" data.
+//	4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
+//	5. Avoid exposing implementation details on user objects (eg. expando properties)
+//	6. Provide a clear path for implementation upgrade to WeakMap in 2014
 
 var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
-	rmultiDash = /([A-Z])/g;
+	rmultiDash = /[A-Z]/g;
 
-function dataAttr( elem, key, data ) {
+function getData( data ) {
+	if ( data === "true" ) {
+		return true;
+	}
 
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
+	if ( data === "false" ) {
+		return false;
+	}
 
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+	if ( data === "null" ) {
+		return null;
+	}
 
-		data = elem.getAttribute( name );
+	// Only convert to a number if it doesn't change the string
+	if ( data === +data + "" ) {
+		return +data;
+	}
 
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch ( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
+	if ( rbrace.test( data ) ) {
+		return JSON.parse( data );
 	}
 
 	return data;
 }
 
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
+function dataAttr( elem, key, data ) {
 	var name;
-	for ( name in obj ) {
 
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[ name ] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+		name = "data-" + key.replace( rmultiDash, "-$&" ).toLowerCase();
+		data = elem.getAttribute( name );
 
-	return true;
-}
+		if ( typeof data === "string" ) {
+			try {
+				data = getData( data );
+			} catch ( e ) {}
 
-function internalData( elem, name, data, pvt /* Internal Use Only */ ) {
-	if ( !acceptData( elem ) ) {
-		return;
-	}
-
-	var ret, thisCache,
-		internalKey = jQuery.expando,
-
-		// We have to handle DOM nodes and JS objects differently because IE6-7
-		// can't GC object references properly across the DOM-JS boundary
-		isNode = elem.nodeType,
-
-		// Only DOM nodes need the global jQuery cache; JS object data is
-		// attached directly to the object so GC can occur automatically
-		cache = isNode ? jQuery.cache : elem,
-
-		// Only defining an ID for JS objects if its cache already exists allows
-		// the code to shortcut on the same path as a DOM node with no cache
-		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
-	// Avoid doing any more work than we need to when trying to get data on an
-	// object that has no data at all
-	if ( ( !id || !cache[ id ] || ( !pvt && !cache[ id ].data ) ) &&
-		data === undefined && typeof name === "string" ) {
-		return;
-	}
-
-	if ( !id ) {
-
-		// Only DOM nodes need a new unique ID for each element since their data
-		// ends up in the global cache
-		if ( isNode ) {
-			id = elem[ internalKey ] = deletedIds.pop() || jQuery.guid++;
+			// Make sure we set the data so it isn't changed later
+			dataUser.set( elem, key, data );
 		} else {
-			id = internalKey;
+			data = undefined;
 		}
 	}
-
-	if ( !cache[ id ] ) {
-
-		// Avoid exposing jQuery metadata on plain JS objects when the object
-		// is serialized using JSON.stringify
-		cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
-	}
-
-	// An object can be passed to jQuery.data instead of a key/value pair; this gets
-	// shallow copied over onto the existing cache
-	if ( typeof name === "object" || typeof name === "function" ) {
-		if ( pvt ) {
-			cache[ id ] = jQuery.extend( cache[ id ], name );
-		} else {
-			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-		}
-	}
-
-	thisCache = cache[ id ];
-
-	// jQuery data() is stored in a separate object inside the object's internal data
-	// cache in order to avoid key collisions between internal data and user-defined
-	// data.
-	if ( !pvt ) {
-		if ( !thisCache.data ) {
-			thisCache.data = {};
-		}
-
-		thisCache = thisCache.data;
-	}
-
-	if ( data !== undefined ) {
-		thisCache[ jQuery.camelCase( name ) ] = data;
-	}
-
-	// Check for both converted-to-camel and non-converted data property names
-	// If a data property was specified
-	if ( typeof name === "string" ) {
-
-		// First Try to find as-is property data
-		ret = thisCache[ name ];
-
-		// Test for null|undefined property data
-		if ( ret == null ) {
-
-			// Try to find the camelCased property
-			ret = thisCache[ jQuery.camelCase( name ) ];
-		}
-	} else {
-		ret = thisCache;
-	}
-
-	return ret;
-}
-
-function internalRemoveData( elem, name, pvt ) {
-	if ( !acceptData( elem ) ) {
-		return;
-	}
-
-	var thisCache, i,
-		isNode = elem.nodeType,
-
-		// See jQuery.data for more information
-		cache = isNode ? jQuery.cache : elem,
-		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-	// If there is already no cache entry for this object, there is no
-	// purpose in continuing
-	if ( !cache[ id ] ) {
-		return;
-	}
-
-	if ( name ) {
-
-		thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-		if ( thisCache ) {
-
-			// Support array or space separated string names for data keys
-			if ( !jQuery.isArray( name ) ) {
-
-				// try the string as a key before any manipulation
-				if ( name in thisCache ) {
-					name = [ name ];
-				} else {
-
-					// split the camel cased version by spaces unless a key with the spaces exists
-					name = jQuery.camelCase( name );
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
-						name = name.split( " " );
-					}
-				}
-			} else {
-
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
-			}
-
-			i = name.length;
-			while ( i-- ) {
-				delete thisCache[ name[ i ] ];
-			}
-
-			// If there is no data left in the cache, we want to continue
-			// and let the cache object itself get destroyed
-			if ( pvt ? !isEmptyDataObject( thisCache ) : !jQuery.isEmptyObject( thisCache ) ) {
-				return;
-			}
-		}
-	}
-
-	// See jQuery.data for more information
-	if ( !pvt ) {
-		delete cache[ id ].data;
-
-		// Don't destroy the parent cache unless the internal data object
-		// had been the only thing left in it
-		if ( !isEmptyDataObject( cache[ id ] ) ) {
-			return;
-		}
-	}
-
-	// Destroy the cache
-	if ( isNode ) {
-		jQuery.cleanData( [ elem ], true );
-
-	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-	/* jshint eqeqeq: false */
-	} else if ( support.deleteExpando || cache != cache.window ) {
-		/* jshint eqeqeq: true */
-		delete cache[ id ];
-
-	// When all else fails, undefined
-	} else {
-		cache[ id ] = undefined;
-	}
+	return data;
 }
 
 jQuery.extend( {
-	cache: {},
-
-	// The following elements (space-suffixed to avoid Object.prototype collisions)
-	// throw uncatchable exceptions if you attempt to set expando properties
-	noData: {
-		"applet ": true,
-		"embed ": true,
-
-		// ...but Flash objects (which have this classid) *can* handle expandos
-		"object ": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-	},
-
 	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[ jQuery.expando ] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
+		return dataUser.hasData( elem ) || dataPriv.hasData( elem );
 	},
 
 	data: function( elem, name, data ) {
-		return internalData( elem, name, data );
+		return dataUser.access( elem, name, data );
 	},
 
 	removeData: function( elem, name ) {
-		return internalRemoveData( elem, name );
+		dataUser.remove( elem, name );
 	},
 
-	// For internal use only.
+	// TODO: Now that all calls to _data and _removeData have been replaced
+	// with direct calls to dataPriv methods, these can be deprecated.
 	_data: function( elem, name, data ) {
-		return internalData( elem, name, data, true );
+		return dataPriv.access( elem, name, data );
 	},
 
 	_removeData: function( elem, name ) {
-		return internalRemoveData( elem, name, true );
+		dataPriv.remove( elem, name );
 	}
 } );
 
@@ -4052,19 +4268,16 @@ jQuery.fn.extend( {
 			elem = this[ 0 ],
 			attrs = elem && elem.attributes;
 
-		// Special expections of .data basically thwart jQuery.access,
-		// so implement the relevant behavior ourselves
-
 		// Gets all values
 		if ( key === undefined ) {
 			if ( this.length ) {
-				data = jQuery.data( elem );
+				data = dataUser.get( elem );
 
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
+				if ( elem.nodeType === 1 && !dataPriv.get( elem, "hasDataAttrs" ) ) {
 					i = attrs.length;
 					while ( i-- ) {
 
-						// Support: IE11+
+						// Support: IE 11 only
 						// The attrs elements can be null (#14894)
 						if ( attrs[ i ] ) {
 							name = attrs[ i ].name;
@@ -4074,7 +4287,7 @@ jQuery.fn.extend( {
 							}
 						}
 					}
-					jQuery._data( elem, "parsedAttrs", true );
+					dataPriv.set( elem, "hasDataAttrs", true );
 				}
 			}
 
@@ -4084,25 +4297,50 @@ jQuery.fn.extend( {
 		// Sets multiple values
 		if ( typeof key === "object" ) {
 			return this.each( function() {
-				jQuery.data( this, key );
+				dataUser.set( this, key );
 			} );
 		}
 
-		return arguments.length > 1 ?
+		return access( this, function( value ) {
+			var data;
 
-			// Sets one value
+			// The calling jQuery object (element matches) is not empty
+			// (and therefore has an element appears at this[ 0 ]) and the
+			// `value` parameter was not undefined. An empty jQuery object
+			// will result in `undefined` for elem = this[ 0 ] which will
+			// throw an exception if an attempt to read a data cache is made.
+			if ( elem && value === undefined ) {
+
+				// Attempt to get data from the cache
+				// The key will always be camelCased in Data
+				data = dataUser.get( elem, key );
+				if ( data !== undefined ) {
+					return data;
+				}
+
+				// Attempt to "discover" the data in
+				// HTML5 custom data-* attrs
+				data = dataAttr( elem, key );
+				if ( data !== undefined ) {
+					return data;
+				}
+
+				// We tried really hard, but the data doesn't exist.
+				return;
+			}
+
+			// Set the data...
 			this.each( function() {
-				jQuery.data( this, key, value );
-			} ) :
 
-			// Gets one value
-			// Try to fetch any internally stored data first
-			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : undefined;
+				// We always store the camelCased key
+				dataUser.set( this, key, value );
+			} );
+		}, null, value, arguments.length > 1, null, true );
 	},
 
 	removeData: function( key ) {
 		return this.each( function() {
-			jQuery.removeData( this, key );
+			dataUser.remove( this, key );
 		} );
 	}
 } );
@@ -4114,12 +4352,12 @@ jQuery.extend( {
 
 		if ( elem ) {
 			type = ( type || "fx" ) + "queue";
-			queue = jQuery._data( elem, type );
+			queue = dataPriv.get( elem, type );
 
 			// Speed up dequeue by getting out quickly if this is just a lookup
 			if ( data ) {
 				if ( !queue || jQuery.isArray( data ) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray( data ) );
+					queue = dataPriv.access( elem, type, jQuery.makeArray( data ) );
 				} else {
 					queue.push( data );
 				}
@@ -4153,7 +4391,7 @@ jQuery.extend( {
 				queue.unshift( "inprogress" );
 			}
 
-			// clear up the last queue stop function
+			// Clear up the last queue stop function
 			delete hooks.stop;
 			fn.call( elem, next, hooks );
 		}
@@ -4163,14 +4401,12 @@ jQuery.extend( {
 		}
 	},
 
-	// not intended for public consumption - generates a queueHooks object,
-	// or returns the current one
+	// Not public - generate a queueHooks object, or return the current one
 	_queueHooks: function( elem, type ) {
 		var key = type + "queueHooks";
-		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
+		return dataPriv.get( elem, key ) || dataPriv.access( elem, key, {
 			empty: jQuery.Callbacks( "once memory" ).add( function() {
-				jQuery._removeData( elem, type + "queue" );
-				jQuery._removeData( elem, key );
+				dataPriv.remove( elem, [ type + "queue", key ] );
 			} )
 		} );
 	}
@@ -4195,7 +4431,7 @@ jQuery.fn.extend( {
 			this.each( function() {
 				var queue = jQuery.queue( this, type, data );
 
-				// ensure a hooks for this queue
+				// Ensure a hooks for this queue
 				jQuery._queueHooks( this, type );
 
 				if ( type === "fx" && queue[ 0 ] !== "inprogress" ) {
@@ -4233,7 +4469,7 @@ jQuery.fn.extend( {
 		type = type || "fx";
 
 		while ( i-- ) {
-			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
+			tmp = dataPriv.get( elements[ i ], type + "queueHooks" );
 			if ( tmp && tmp.empty ) {
 				count++;
 				tmp.empty.add( resolve );
@@ -4243,57 +4479,6 @@ jQuery.fn.extend( {
 		return defer.promise( obj );
 	}
 } );
-
-
-( function() {
-	var shrinkWrapBlocksVal;
-
-	support.shrinkWrapBlocks = function() {
-		if ( shrinkWrapBlocksVal != null ) {
-			return shrinkWrapBlocksVal;
-		}
-
-		// Will be changed later if needed.
-		shrinkWrapBlocksVal = false;
-
-		// Minified: var b,c,d
-		var div, body, container;
-
-		body = document.getElementsByTagName( "body" )[ 0 ];
-		if ( !body || !body.style ) {
-
-			// Test fired too early or in an unsupported environment, exit.
-			return;
-		}
-
-		// Setup
-		div = document.createElement( "div" );
-		container = document.createElement( "div" );
-		container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
-		body.appendChild( container ).appendChild( div );
-
-		// Support: IE6
-		// Check if elements with layout shrink-wrap their children
-		if ( typeof div.style.zoom !== "undefined" ) {
-
-			// Reset CSS: box-sizing; display; margin; border
-			div.style.cssText =
-
-				// Support: Firefox<29, Android 2.3
-				// Vendor-prefix box-sizing
-				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
-				"box-sizing:content-box;display:block;margin:0;border:0;" +
-				"padding:1px;width:1px;zoom:1";
-			div.appendChild( document.createElement( "div" ) ).style.width = "5px";
-			shrinkWrapBlocksVal = div.offsetWidth !== 3;
-		}
-
-		body.removeChild( container );
-
-		return shrinkWrapBlocksVal;
-	};
-
-} )();
 var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source;
 
 var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
@@ -4301,15 +4486,46 @@ var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
 
 var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
 
-var isHidden = function( elem, el ) {
+var isHiddenWithinTree = function( elem, el ) {
 
-		// isHidden might be called from jQuery#filter function;
+		// isHiddenWithinTree might be called from jQuery#filter function;
 		// in that case, element will be second argument
 		elem = el || elem;
-		return jQuery.css( elem, "display" ) === "none" ||
-			!jQuery.contains( elem.ownerDocument, elem );
+
+		// Inline style trumps all
+		return elem.style.display === "none" ||
+			elem.style.display === "" &&
+
+			// Otherwise, check computed style
+			// Support: Firefox <=43 - 45
+			// Disconnected elements can have computed display: none, so first confirm that elem is
+			// in the document.
+			jQuery.contains( elem.ownerDocument, elem ) &&
+
+			jQuery.css( elem, "display" ) === "none";
 	};
 
+var swap = function( elem, options, callback, args ) {
+	var ret, name,
+		old = {};
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.apply( elem, args || [] );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+
 
 
 function adjustCSS( elem, prop, valueParts, tween ) {
@@ -4317,8 +4533,12 @@ function adjustCSS( elem, prop, valueParts, tween ) {
 		scale = 1,
 		maxIterations = 20,
 		currentValue = tween ?
-			function() { return tween.cur(); } :
-			function() { return jQuery.css( elem, prop, "" ); },
+			function() {
+				return tween.cur();
+			} :
+			function() {
+				return jQuery.css( elem, prop, "" );
+			},
 		initial = currentValue(),
 		unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
 
@@ -4371,175 +4591,126 @@ function adjustCSS( elem, prop, valueParts, tween ) {
 }
 
 
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
-	var i = 0,
-		length = elems.length,
-		bulk = key == null;
+var defaultDisplayMap = {};
 
-	// Sets many values
-	if ( jQuery.type( key ) === "object" ) {
-		chainable = true;
-		for ( i in key ) {
-			access( elems, fn, i, key[ i ], true, emptyGet, raw );
+function getDefaultDisplay( elem ) {
+	var temp,
+		doc = elem.ownerDocument,
+		nodeName = elem.nodeName,
+		display = defaultDisplayMap[ nodeName ];
+
+	if ( display ) {
+		return display;
+	}
+
+	temp = doc.body.appendChild( doc.createElement( nodeName ) );
+	display = jQuery.css( temp, "display" );
+
+	temp.parentNode.removeChild( temp );
+
+	if ( display === "none" ) {
+		display = "block";
+	}
+	defaultDisplayMap[ nodeName ] = display;
+
+	return display;
+}
+
+function showHide( elements, show ) {
+	var display, elem,
+		values = [],
+		index = 0,
+		length = elements.length;
+
+	// Determine new display value for elements that need to change
+	for ( ; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
 		}
 
-	// Sets one value
-	} else if ( value !== undefined ) {
-		chainable = true;
+		display = elem.style.display;
+		if ( show ) {
 
-		if ( !jQuery.isFunction( value ) ) {
-			raw = true;
-		}
-
-		if ( bulk ) {
-
-			// Bulk operations run against the entire set
-			if ( raw ) {
-				fn.call( elems, value );
-				fn = null;
-
-			// ...except when executing function values
-			} else {
-				bulk = fn;
-				fn = function( elem, key, value ) {
-					return bulk.call( jQuery( elem ), value );
-				};
+			// Since we force visibility upon cascade-hidden elements, an immediate (and slow)
+			// check is required in this first loop unless we have a nonempty display value (either
+			// inline or about-to-be-restored)
+			if ( display === "none" ) {
+				values[ index ] = dataPriv.get( elem, "display" ) || null;
+				if ( !values[ index ] ) {
+					elem.style.display = "";
+				}
 			}
-		}
+			if ( elem.style.display === "" && isHiddenWithinTree( elem ) ) {
+				values[ index ] = getDefaultDisplay( elem );
+			}
+		} else {
+			if ( display !== "none" ) {
+				values[ index ] = "none";
 
-		if ( fn ) {
-			for ( ; i < length; i++ ) {
-				fn(
-					elems[ i ],
-					key,
-					raw ? value : value.call( elems[ i ], i, fn( elems[ i ], key ) )
-				);
+				// Remember what we're overwriting
+				dataPriv.set( elem, "display", display );
 			}
 		}
 	}
 
-	return chainable ?
-		elems :
+	// Set the display of the elements in a second loop to avoid constant reflow
+	for ( index = 0; index < length; index++ ) {
+		if ( values[ index ] != null ) {
+			elements[ index ].style.display = values[ index ];
+		}
+	}
 
-		// Gets
-		bulk ?
-			fn.call( elems ) :
-			length ? fn( elems[ 0 ], key ) : emptyGet;
-};
+	return elements;
+}
+
+jQuery.fn.extend( {
+	show: function() {
+		return showHide( this, true );
+	},
+	hide: function() {
+		return showHide( this );
+	},
+	toggle: function( state ) {
+		if ( typeof state === "boolean" ) {
+			return state ? this.show() : this.hide();
+		}
+
+		return this.each( function() {
+			if ( isHiddenWithinTree( this ) ) {
+				jQuery( this ).show();
+			} else {
+				jQuery( this ).hide();
+			}
+		} );
+	}
+} );
 var rcheckableType = ( /^(?:checkbox|radio)$/i );
 
-var rtagName = ( /<([\w:-]+)/ );
+var rtagName = ( /<([a-z][^\/\0>\x20\t\r\n\f]+)/i );
 
 var rscriptType = ( /^$|\/(?:java|ecma)script/i );
 
-var rleadingWhitespace = ( /^\s+/ );
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|" +
-		"details|dialog|figcaption|figure|footer|header|hgroup|main|" +
-		"mark|meter|nav|output|picture|progress|section|summary|template|time|video";
-
-
-
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-		safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-
-( function() {
-	var div = document.createElement( "div" ),
-		fragment = document.createDocumentFragment(),
-		input = document.createElement( "input" );
-
-	// Setup
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-
-	// IE strips leading whitespace when .innerHTML is used
-	support.leadingWhitespace = div.firstChild.nodeType === 3;
-
-	// Make sure that tbody elements aren't automatically inserted
-	// IE will insert them into empty tables
-	support.tbody = !div.getElementsByTagName( "tbody" ).length;
-
-	// Make sure that link elements get serialized correctly by innerHTML
-	// This requires a wrapper element in IE
-	support.htmlSerialize = !!div.getElementsByTagName( "link" ).length;
-
-	// Makes sure cloning an html5 element does not cause problems
-	// Where outerHTML is undefined, this still works
-	support.html5Clone =
-		document.createElement( "nav" ).cloneNode( true ).outerHTML !== "<:nav></:nav>";
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	input.type = "checkbox";
-	input.checked = true;
-	fragment.appendChild( input );
-	support.appendChecked = input.checked;
-
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	// Support: IE6-IE11+
-	div.innerHTML = "<textarea>x</textarea>";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	fragment.appendChild( div );
-
-	// Support: Windows Web Apps (WWA)
-	// `name` and `type` must use .setAttribute for WWA (#14901)
-	input = document.createElement( "input" );
-	input.setAttribute( "type", "radio" );
-	input.setAttribute( "checked", "checked" );
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-
-	// Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3
-	// old WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<9
-	// Cloned elements keep attachEvent handlers, we use addEventListener on IE9+
-	support.noCloneEvent = !!div.addEventListener;
-
-	// Support: IE<9
-	// Since attributes and properties are the same in IE,
-	// cleanData must set properties to undefined rather than use removeAttribute
-	div[ jQuery.expando ] = 1;
-	support.attributes = !div.getAttribute( jQuery.expando );
-} )();
 
 
 // We have to close these tags to support XHTML (#13200)
 var wrapMap = {
-	option: [ 1, "<select multiple='multiple'>", "</select>" ],
-	legend: [ 1, "<fieldset>", "</fieldset>" ],
-	area: [ 1, "<map>", "</map>" ],
 
-	// Support: IE8
-	param: [ 1, "<object>", "</object>" ],
+	// Support: IE <=9 only
+	option: [ 1, "<select multiple='multiple'>", "</select>" ],
+
+	// XHTML parsers do not magically insert elements in the
+	// same way that tag soup parsers do. So we cannot shorten
+	// this by omitting <tbody> or other required elements.
 	thead: [ 1, "<table>", "</table>" ],
+	col: [ 2, "<table><colgroup>", "</colgroup></table>" ],
 	tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-	col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
 	td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
 
-	// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-	// unless wrapped in a div with non-breaking characters in front of it.
-	_default: support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>" ]
+	_default: [ 0, "", "" ]
 };
 
-// Support: IE8-IE9
+// Support: IE <=9 only
 wrapMap.optgroup = wrapMap.option;
 
 wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
@@ -4547,66 +4718,52 @@ wrapMap.th = wrapMap.td;
 
 
 function getAll( context, tag ) {
-	var elems, elem,
-		i = 0,
-		found = typeof context.getElementsByTagName !== "undefined" ?
-			context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== "undefined" ?
-				context.querySelectorAll( tag || "*" ) :
-				undefined;
 
-	if ( !found ) {
-		for ( found = [], elems = context.childNodes || context;
-			( elem = elems[ i ] ) != null;
-			i++
-		) {
-			if ( !tag || jQuery.nodeName( elem, tag ) ) {
-				found.push( elem );
-			} else {
-				jQuery.merge( found, getAll( elem, tag ) );
-			}
-		}
+	// Support: IE <=9 - 11 only
+	// Use typeof to avoid zero-argument method invocation on host objects (#15151)
+	var ret;
+
+	if ( typeof context.getElementsByTagName !== "undefined" ) {
+		ret = context.getElementsByTagName( tag || "*" );
+
+	} else if ( typeof context.querySelectorAll !== "undefined" ) {
+		ret = context.querySelectorAll( tag || "*" );
+
+	} else {
+		ret = [];
 	}
 
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], found ) :
-		found;
+	if ( tag === undefined || tag && jQuery.nodeName( context, tag ) ) {
+		return jQuery.merge( [ context ], ret );
+	}
+
+	return ret;
 }
 
 
 // Mark scripts as having already been evaluated
 function setGlobalEval( elems, refElements ) {
-	var elem,
-		i = 0;
-	for ( ; ( elem = elems[ i ] ) != null; i++ ) {
-		jQuery._data(
-			elem,
+	var i = 0,
+		l = elems.length;
+
+	for ( ; i < l; i++ ) {
+		dataPriv.set(
+			elems[ i ],
 			"globalEval",
-			!refElements || jQuery._data( refElements[ i ], "globalEval" )
+			!refElements || dataPriv.get( refElements[ i ], "globalEval" )
 		);
 	}
 }
 
 
-var rhtml = /<|&#?\w+;/,
-	rtbody = /<tbody/i;
-
-function fixDefaultChecked( elem ) {
-	if ( rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
+var rhtml = /<|&#?\w+;/;
 
 function buildFragment( elems, context, scripts, selection, ignored ) {
-	var j, elem, contains,
-		tmp, tag, tbody, wrap,
-		l = elems.length,
-
-		// Ensure a safe fragment
-		safe = createSafeFragment( context ),
-
+	var elem, tmp, tag, wrap, contains, j,
+		fragment = context.createDocumentFragment(),
 		nodes = [],
-		i = 0;
+		i = 0,
+		l = elems.length;
 
 	for ( ; i < l; i++ ) {
 		elem = elems[ i ];
@@ -4615,6 +4772,9 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 
 			// Add nodes directly
 			if ( jQuery.type( elem ) === "object" ) {
+
+				// Support: Android <=4.0 only, PhantomJS 1 only
+				// push.apply(_, arraylike) throws on ancient WebKit
 				jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
 
 			// Convert non-html into a text node
@@ -4623,12 +4783,11 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 
 			// Convert html into DOM nodes
 			} else {
-				tmp = tmp || safe.appendChild( context.createElement( "div" ) );
+				tmp = tmp || fragment.appendChild( context.createElement( "div" ) );
 
 				// Deserialize a standard representation
 				tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
 				wrap = wrapMap[ tag ] || wrapMap._default;
-
 				tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ];
 
 				// Descend through wrappers to the right content
@@ -4637,59 +4796,21 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 					tmp = tmp.lastChild;
 				}
 
-				// Manually add leading whitespace removed by IE
-				if ( !support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-					nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[ 0 ] ) );
-				}
-
-				// Remove IE's autoinserted <tbody> from table fragments
-				if ( !support.tbody ) {
-
-					// String was a <table>, *may* have spurious <tbody>
-					elem = tag === "table" && !rtbody.test( elem ) ?
-						tmp.firstChild :
-
-						// String was a bare <thead> or <tfoot>
-						wrap[ 1 ] === "<table>" && !rtbody.test( elem ) ?
-							tmp :
-							0;
-
-					j = elem && elem.childNodes.length;
-					while ( j-- ) {
-						if ( jQuery.nodeName( ( tbody = elem.childNodes[ j ] ), "tbody" ) &&
-							!tbody.childNodes.length ) {
-
-							elem.removeChild( tbody );
-						}
-					}
-				}
-
+				// Support: Android <=4.0 only, PhantomJS 1 only
+				// push.apply(_, arraylike) throws on ancient WebKit
 				jQuery.merge( nodes, tmp.childNodes );
 
-				// Fix #12392 for WebKit and IE > 9
+				// Remember the top-level container
+				tmp = fragment.firstChild;
+
+				// Ensure the created nodes are orphaned (#12392)
 				tmp.textContent = "";
-
-				// Fix #12392 for oldIE
-				while ( tmp.firstChild ) {
-					tmp.removeChild( tmp.firstChild );
-				}
-
-				// Remember the top-level container for proper cleanup
-				tmp = safe.lastChild;
 			}
 		}
 	}
 
-	// Fix #11356: Clear elements from fragment
-	if ( tmp ) {
-		safe.removeChild( tmp );
-	}
-
-	// Reset defaultChecked for any radios and checkboxes
-	// about to be appended to the DOM in IE 6/7 (#8060)
-	if ( !support.appendChecked ) {
-		jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
-	}
+	// Remove wrapper from fragment
+	fragment.textContent = "";
 
 	i = 0;
 	while ( ( elem = nodes[ i++ ] ) ) {
@@ -4699,14 +4820,13 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 			if ( ignored ) {
 				ignored.push( elem );
 			}
-
 			continue;
 		}
 
 		contains = jQuery.contains( elem.ownerDocument, elem );
 
 		// Append to fragment
-		tmp = getAll( safe.appendChild( elem ), "script" );
+		tmp = getAll( fragment.appendChild( elem ), "script" );
 
 		// Preserve script evaluation history
 		if ( contains ) {
@@ -4724,37 +4844,41 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 		}
 	}
 
-	tmp = null;
-
-	return safe;
+	return fragment;
 }
 
 
 ( function() {
-	var i, eventName,
-		div = document.createElement( "div" );
+	var fragment = document.createDocumentFragment(),
+		div = fragment.appendChild( document.createElement( "div" ) ),
+		input = document.createElement( "input" );
 
-	// Support: IE<9 (lack submit/change bubble), Firefox (lack focus(in | out) events)
-	for ( i in { submit: true, change: true, focusin: true } ) {
-		eventName = "on" + i;
+	// Support: Android 4.0 - 4.3 only
+	// Check state lost if the name is set (#11217)
+	// Support: Windows Web Apps (WWA)
+	// `name` and `type` must use .setAttribute for WWA (#14901)
+	input.setAttribute( "type", "radio" );
+	input.setAttribute( "checked", "checked" );
+	input.setAttribute( "name", "t" );
 
-		if ( !( support[ i ] = eventName in window ) ) {
+	div.appendChild( input );
 
-			// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
-			div.setAttribute( eventName, "t" );
-			support[ i ] = div.attributes[ eventName ].expando === false;
-		}
-	}
+	// Support: Android <=4.1 only
+	// Older WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
 
-	// Null elements to avoid leaks in IE.
-	div = null;
+	// Support: IE <=11 only
+	// Make sure textarea (and checkbox) defaultValue is properly cloned
+	div.innerHTML = "<textarea>x</textarea>";
+	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
 } )();
+var documentElement = document.documentElement;
 
 
-var rformElems = /^(?:input|select|textarea)$/i,
+
+var
 	rkeyEvent = /^key/,
 	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
 	rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
 
 function returnTrue() {
@@ -4765,7 +4889,7 @@ function returnFalse() {
 	return false;
 }
 
-// Support: IE9
+// Support: IE <=9 only
 // See #13393 for more info
 function safeActiveElement() {
 	try {
@@ -4843,10 +4967,11 @@ jQuery.event = {
 	global: {},
 
 	add: function( elem, types, handler, data, selector ) {
-		var tmp, events, t, handleObjIn,
-			special, eventHandle, handleObj,
-			handlers, type, namespaces, origType,
-			elemData = jQuery._data( elem );
+
+		var handleObjIn, eventHandle, tmp,
+			events, t, handleObj,
+			special, handlers, type, namespaces, origType,
+			elemData = dataPriv.get( elem );
 
 		// Don't attach events to noData or text/comment nodes (but allow plain objects)
 		if ( !elemData ) {
@@ -4860,6 +4985,12 @@ jQuery.event = {
 			selector = handleObjIn.selector;
 		}
 
+		// Ensure that invalid selectors throw exceptions at attach time
+		// Evaluate against documentElement in case elem is a non-element node (e.g., document)
+		if ( selector ) {
+			jQuery.find.matchesSelector( documentElement, selector );
+		}
+
 		// Make sure that the handler has a unique ID, used to find/remove it later
 		if ( !handler.guid ) {
 			handler.guid = jQuery.guid++;
@@ -4874,19 +5005,13 @@ jQuery.event = {
 
 				// Discard the second event of a jQuery.event.trigger() and
 				// when an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" &&
-					( !e || jQuery.event.triggered !== e.type ) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
+				return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ?
+					jQuery.event.dispatch.apply( elem, arguments ) : undefined;
 			};
-
-			// Add elem as a property of the handle fn to prevent a memory leak
-			// with IE non-native events
-			eventHandle.elem = elem;
 		}
 
 		// Handle multiple events separated by a space
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
+		types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
 		t = types.length;
 		while ( t-- ) {
 			tmp = rtypenamespace.exec( types[ t ] ) || [];
@@ -4924,16 +5049,12 @@ jQuery.event = {
 				handlers = events[ type ] = [];
 				handlers.delegateCount = 0;
 
-				// Only use addEventListener/attachEvent if the special events handler returns false
+				// Only use addEventListener if the special events handler returns false
 				if ( !special.setup ||
 					special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
 
-					// Bind the global event handler to the element
 					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
+						elem.addEventListener( type, eventHandle );
 					}
 				}
 			}
@@ -4957,24 +5078,22 @@ jQuery.event = {
 			jQuery.event.global[ type ] = true;
 		}
 
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
 	},
 
 	// Detach an event or set of events from an element
 	remove: function( elem, types, handler, selector, mappedTypes ) {
-		var j, handleObj, tmp,
-			origCount, t, events,
-			special, handlers, type,
-			namespaces, origType,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
+
+		var j, origCount, tmp,
+			events, t, handleObj,
+			special, handlers, type, namespaces, origType,
+			elemData = dataPriv.hasData( elem ) && dataPriv.get( elem );
 
 		if ( !elemData || !( events = elemData.events ) ) {
 			return;
 		}
 
 		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
+		types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
 		t = types.length;
 		while ( t-- ) {
 			tmp = rtypenamespace.exec( types[ t ] ) || [];
@@ -5029,19 +5148,2941 @@ jQuery.event = {
 			}
 		}
 
-		// Remove the expando if it's no longer used
+		// Remove data and the expando if it's no longer used
 		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery._removeData( elem, "events" );
+			dataPriv.remove( elem, "handle events" );
 		}
 	},
 
+	dispatch: function( nativeEvent ) {
+
+		// Make a writable jQuery.Event from the native event object
+		var event = jQuery.event.fix( nativeEvent );
+
+		var i, j, ret, matched, handleObj, handlerQueue,
+			args = new Array( arguments.length ),
+			handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [],
+			special = jQuery.event.special[ event.type ] || {};
+
+		// Use the fix-ed jQuery.Event rather than the (read-only) native event
+		args[ 0 ] = event;
+
+		for ( i = 1; i < arguments.length; i++ ) {
+			args[ i ] = arguments[ i ];
+		}
+
+		event.delegateTarget = this;
+
+		// Call the preDispatch hook for the mapped type, and let it bail if desired
+		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+			return;
+		}
+
+		// Determine handlers
+		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
+
+		// Run delegates first; they may want to stop propagation beneath us
+		i = 0;
+		while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
+			event.currentTarget = matched.elem;
+
+			j = 0;
+			while ( ( handleObj = matched.handlers[ j++ ] ) &&
+				!event.isImmediatePropagationStopped() ) {
+
+				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
+				// a subset or equal to those in the bound event (both can have no namespace).
+				if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) {
+
+					event.handleObj = handleObj;
+					event.data = handleObj.data;
+
+					ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
+						handleObj.handler ).apply( matched.elem, args );
+
+					if ( ret !== undefined ) {
+						if ( ( event.result = ret ) === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+				}
+			}
+		}
+
+		// Call the postDispatch hook for the mapped type
+		if ( special.postDispatch ) {
+			special.postDispatch.call( this, event );
+		}
+
+		return event.result;
+	},
+
+	handlers: function( event, handlers ) {
+		var i, handleObj, sel, matchedHandlers, matchedSelectors,
+			handlerQueue = [],
+			delegateCount = handlers.delegateCount,
+			cur = event.target;
+
+		// Find delegate handlers
+		if ( delegateCount &&
+
+			// Support: IE <=9
+			// Black-hole SVG <use> instance trees (trac-13180)
+			cur.nodeType &&
+
+			// Support: Firefox <=42
+			// Suppress spec-violating clicks indicating a non-primary pointer button (trac-3861)
+			// https://www.w3.org/TR/DOM-Level-3-Events/#event-type-click
+			// Support: IE 11 only
+			// ...but not arrow key "clicks" of radio inputs, which can have `button` -1 (gh-2343)
+			!( event.type === "click" && event.button >= 1 ) ) {
+
+			for ( ; cur !== this; cur = cur.parentNode || this ) {
+
+				// Don't check non-elements (#13208)
+				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
+				if ( cur.nodeType === 1 && !( event.type === "click" && cur.disabled === true ) ) {
+					matchedHandlers = [];
+					matchedSelectors = {};
+					for ( i = 0; i < delegateCount; i++ ) {
+						handleObj = handlers[ i ];
+
+						// Don't conflict with Object.prototype properties (#13203)
+						sel = handleObj.selector + " ";
+
+						if ( matchedSelectors[ sel ] === undefined ) {
+							matchedSelectors[ sel ] = handleObj.needsContext ?
+								jQuery( sel, this ).index( cur ) > -1 :
+								jQuery.find( sel, this, null, [ cur ] ).length;
+						}
+						if ( matchedSelectors[ sel ] ) {
+							matchedHandlers.push( handleObj );
+						}
+					}
+					if ( matchedHandlers.length ) {
+						handlerQueue.push( { elem: cur, handlers: matchedHandlers } );
+					}
+				}
+			}
+		}
+
+		// Add the remaining (directly-bound) handlers
+		cur = this;
+		if ( delegateCount < handlers.length ) {
+			handlerQueue.push( { elem: cur, handlers: handlers.slice( delegateCount ) } );
+		}
+
+		return handlerQueue;
+	},
+
+	addProp: function( name, hook ) {
+		Object.defineProperty( jQuery.Event.prototype, name, {
+			enumerable: true,
+			configurable: true,
+
+			get: jQuery.isFunction( hook ) ?
+				function() {
+					if ( this.originalEvent ) {
+							return hook( this.originalEvent );
+					}
+				} :
+				function() {
+					if ( this.originalEvent ) {
+							return this.originalEvent[ name ];
+					}
+				},
+
+			set: function( value ) {
+				Object.defineProperty( this, name, {
+					enumerable: true,
+					configurable: true,
+					writable: true,
+					value: value
+				} );
+			}
+		} );
+	},
+
+	fix: function( originalEvent ) {
+		return originalEvent[ jQuery.expando ] ?
+			originalEvent :
+			new jQuery.Event( originalEvent );
+	},
+
+	special: {
+		load: {
+
+			// Prevent triggered image.load events from bubbling to window.load
+			noBubble: true
+		},
+		focus: {
+
+			// Fire native event if possible so blur/focus sequence is correct
+			trigger: function() {
+				if ( this !== safeActiveElement() && this.focus ) {
+					this.focus();
+					return false;
+				}
+			},
+			delegateType: "focusin"
+		},
+		blur: {
+			trigger: function() {
+				if ( this === safeActiveElement() && this.blur ) {
+					this.blur();
+					return false;
+				}
+			},
+			delegateType: "focusout"
+		},
+		click: {
+
+			// For checkbox, fire native event so checked state will be right
+			trigger: function() {
+				if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) {
+					this.click();
+					return false;
+				}
+			},
+
+			// For cross-browser consistency, don't fire native .click() on links
+			_default: function( event ) {
+				return jQuery.nodeName( event.target, "a" );
+			}
+		},
+
+		beforeunload: {
+			postDispatch: function( event ) {
+
+				// Support: Firefox 20+
+				// Firefox doesn't alert if the returnValue field is not set.
+				if ( event.result !== undefined && event.originalEvent ) {
+					event.originalEvent.returnValue = event.result;
+				}
+			}
+		}
+	}
+};
+
+jQuery.removeEvent = function( elem, type, handle ) {
+
+	// This "if" is needed for plain objects
+	if ( elem.removeEventListener ) {
+		elem.removeEventListener( type, handle );
+	}
+};
+
+jQuery.Event = function( src, props ) {
+
+	// Allow instantiation without the 'new' keyword
+	if ( !( this instanceof jQuery.Event ) ) {
+		return new jQuery.Event( src, props );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = src.defaultPrevented ||
+				src.defaultPrevented === undefined &&
+
+				// Support: Android <=2.3 only
+				src.returnValue === false ?
+			returnTrue :
+			returnFalse;
+
+		// Create target properties
+		// Support: Safari <=6 - 7 only
+		// Target should not be a text node (#504, #13143)
+		this.target = ( src.target && src.target.nodeType === 3 ) ?
+			src.target.parentNode :
+			src.target;
+
+		this.currentTarget = src.currentTarget;
+		this.relatedTarget = src.relatedTarget;
+
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// Put explicitly provided properties onto the event object
+	if ( props ) {
+		jQuery.extend( this, props );
+	}
+
+	// Create a timestamp if incoming event doesn't have one
+	this.timeStamp = src && src.timeStamp || jQuery.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	constructor: jQuery.Event,
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse,
+	isSimulated: false,
+
+	preventDefault: function() {
+		var e = this.originalEvent;
+
+		this.isDefaultPrevented = returnTrue;
+
+		if ( e && !this.isSimulated ) {
+			e.preventDefault();
+		}
+	},
+	stopPropagation: function() {
+		var e = this.originalEvent;
+
+		this.isPropagationStopped = returnTrue;
+
+		if ( e && !this.isSimulated ) {
+			e.stopPropagation();
+		}
+	},
+	stopImmediatePropagation: function() {
+		var e = this.originalEvent;
+
+		this.isImmediatePropagationStopped = returnTrue;
+
+		if ( e && !this.isSimulated ) {
+			e.stopImmediatePropagation();
+		}
+
+		this.stopPropagation();
+	}
+};
+
+// Includes all common event props including KeyEvent and MouseEvent specific props
+jQuery.each( {
+	altKey: true,
+	bubbles: true,
+	cancelable: true,
+	changedTouches: true,
+	ctrlKey: true,
+	detail: true,
+	eventPhase: true,
+	metaKey: true,
+	pageX: true,
+	pageY: true,
+	shiftKey: true,
+	view: true,
+	"char": true,
+	charCode: true,
+	key: true,
+	keyCode: true,
+	button: true,
+	buttons: true,
+	clientX: true,
+	clientY: true,
+	offsetX: true,
+	offsetY: true,
+	pointerId: true,
+	pointerType: true,
+	screenX: true,
+	screenY: true,
+	targetTouches: true,
+	toElement: true,
+	touches: true,
+
+	which: function( event ) {
+		var button = event.button;
+
+		// Add which for key events
+		if ( event.which == null && rkeyEvent.test( event.type ) ) {
+			return event.charCode != null ? event.charCode : event.keyCode;
+		}
+
+		// Add which for click: 1 === left; 2 === middle; 3 === right
+		if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) {
+			if ( button & 1 ) {
+				return 1;
+			}
+
+			if ( button & 2 ) {
+				return 3;
+			}
+
+			if ( button & 4 ) {
+				return 2;
+			}
+
+			return 0;
+		}
+
+		return event.which;
+	}
+}, jQuery.event.addProp );
+
+// Create mouseenter/leave events using mouseover/out and event-time checks
+// so that event delegation works in jQuery.
+// Do the same for pointerenter/pointerleave and pointerover/pointerout
+//
+// Support: Safari 7 only
+// Safari sends mouseenter too often; see:
+// https://bugs.chromium.org/p/chromium/issues/detail?id=470258
+// for the description of the bug (it existed in older Chrome versions as well).
+jQuery.each( {
+	mouseenter: "mouseover",
+	mouseleave: "mouseout",
+	pointerenter: "pointerover",
+	pointerleave: "pointerout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		delegateType: fix,
+		bindType: fix,
+
+		handle: function( event ) {
+			var ret,
+				target = this,
+				related = event.relatedTarget,
+				handleObj = event.handleObj;
+
+			// For mouseenter/leave call the handler if related is outside the target.
+			// NB: No relatedTarget if the mouse left/entered the browser window
+			if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) {
+				event.type = handleObj.origType;
+				ret = handleObj.handler.apply( this, arguments );
+				event.type = fix;
+			}
+			return ret;
+		}
+	};
+} );
+
+jQuery.fn.extend( {
+
+	on: function( types, selector, data, fn ) {
+		return on( this, types, selector, data, fn );
+	},
+	one: function( types, selector, data, fn ) {
+		return on( this, types, selector, data, fn, 1 );
+	},
+	off: function( types, selector, fn ) {
+		var handleObj, type;
+		if ( types && types.preventDefault && types.handleObj ) {
+
+			// ( event )  dispatched jQuery.Event
+			handleObj = types.handleObj;
+			jQuery( types.delegateTarget ).off(
+				handleObj.namespace ?
+					handleObj.origType + "." + handleObj.namespace :
+					handleObj.origType,
+				handleObj.selector,
+				handleObj.handler
+			);
+			return this;
+		}
+		if ( typeof types === "object" ) {
+
+			// ( types-object [, selector] )
+			for ( type in types ) {
+				this.off( type, selector, types[ type ] );
+			}
+			return this;
+		}
+		if ( selector === false || typeof selector === "function" ) {
+
+			// ( types [, fn] )
+			fn = selector;
+			selector = undefined;
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		}
+		return this.each( function() {
+			jQuery.event.remove( this, types, fn, selector );
+		} );
+	}
+} );
+
+
+var
+
+	/* eslint-disable max-len */
+
+	// See https://github.com/eslint/eslint/issues/3229
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
+
+	/* eslint-enable */
+
+	// Support: IE <=10 - 11, Edge 12 - 13
+	// In IE/Edge using regex groups here causes severe slowdowns.
+	// See https://connect.microsoft.com/IE/feedback/details/1736512/
+	rnoInnerhtml = /<script|<style|<link/i,
+
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	rscriptTypeMasked = /^true\/(.*)/,
+	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;
+
+function manipulationTarget( elem, content ) {
+	if ( jQuery.nodeName( elem, "table" ) &&
+		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) {
+
+		return elem.getElementsByTagName( "tbody" )[ 0 ] || elem;
+	}
+
+	return elem;
+}
+
+// Replace/restore the type attribute of script elements for safe DOM manipulation
+function disableScript( elem ) {
+	elem.type = ( elem.getAttribute( "type" ) !== null ) + "/" + elem.type;
+	return elem;
+}
+function restoreScript( elem ) {
+	var match = rscriptTypeMasked.exec( elem.type );
+
+	if ( match ) {
+		elem.type = match[ 1 ];
+	} else {
+		elem.removeAttribute( "type" );
+	}
+
+	return elem;
+}
+
+function cloneCopyEvent( src, dest ) {
+	var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
+
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	// 1. Copy private data: events, handlers, etc.
+	if ( dataPriv.hasData( src ) ) {
+		pdataOld = dataPriv.access( src );
+		pdataCur = dataPriv.set( dest, pdataOld );
+		events = pdataOld.events;
+
+		if ( events ) {
+			delete pdataCur.handle;
+			pdataCur.events = {};
+
+			for ( type in events ) {
+				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+					jQuery.event.add( dest, type, events[ type ][ i ] );
+				}
+			}
+		}
+	}
+
+	// 2. Copy user data
+	if ( dataUser.hasData( src ) ) {
+		udataOld = dataUser.access( src );
+		udataCur = jQuery.extend( {}, udataOld );
+
+		dataUser.set( dest, udataCur );
+	}
+}
+
+// Fix IE bugs, see support tests
+function fixInput( src, dest ) {
+	var nodeName = dest.nodeName.toLowerCase();
+
+	// Fails to persist the checked state of a cloned checkbox or radio button.
+	if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
+		dest.checked = src.checked;
+
+	// Fails to return the selected option to the default selected state when cloning options
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+	}
+}
+
+function domManip( collection, args, callback, ignored ) {
+
+	// Flatten any nested arrays
+	args = concat.apply( [], args );
+
+	var fragment, first, scripts, hasScripts, node, doc,
+		i = 0,
+		l = collection.length,
+		iNoClone = l - 1,
+		value = args[ 0 ],
+		isFunction = jQuery.isFunction( value );
+
+	// We can't cloneNode fragments that contain checked, in WebKit
+	if ( isFunction ||
+			( l > 1 && typeof value === "string" &&
+				!support.checkClone && rchecked.test( value ) ) ) {
+		return collection.each( function( index ) {
+			var self = collection.eq( index );
+			if ( isFunction ) {
+				args[ 0 ] = value.call( this, index, self.html() );
+			}
+			domManip( self, args, callback, ignored );
+		} );
+	}
+
+	if ( l ) {
+		fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored );
+		first = fragment.firstChild;
+
+		if ( fragment.childNodes.length === 1 ) {
+			fragment = first;
+		}
+
+		// Require either new content or an interest in ignored elements to invoke the callback
+		if ( first || ignored ) {
+			scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
+			hasScripts = scripts.length;
+
+			// Use the original fragment for the last item
+			// instead of the first because it can end up
+			// being emptied incorrectly in certain situations (#8070).
+			for ( ; i < l; i++ ) {
+				node = fragment;
+
+				if ( i !== iNoClone ) {
+					node = jQuery.clone( node, true, true );
+
+					// Keep references to cloned scripts for later restoration
+					if ( hasScripts ) {
+
+						// Support: Android <=4.0 only, PhantomJS 1 only
+						// push.apply(_, arraylike) throws on ancient WebKit
+						jQuery.merge( scripts, getAll( node, "script" ) );
+					}
+				}
+
+				callback.call( collection[ i ], node, i );
+			}
+
+			if ( hasScripts ) {
+				doc = scripts[ scripts.length - 1 ].ownerDocument;
+
+				// Reenable scripts
+				jQuery.map( scripts, restoreScript );
+
+				// Evaluate executable scripts on first document insertion
+				for ( i = 0; i < hasScripts; i++ ) {
+					node = scripts[ i ];
+					if ( rscriptType.test( node.type || "" ) &&
+						!dataPriv.access( node, "globalEval" ) &&
+						jQuery.contains( doc, node ) ) {
+
+						if ( node.src ) {
+
+							// Optional AJAX dependency, but won't run scripts if not present
+							if ( jQuery._evalUrl ) {
+								jQuery._evalUrl( node.src );
+							}
+						} else {
+							DOMEval( node.textContent.replace( rcleanScript, "" ), doc );
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return collection;
+}
+
+function remove( elem, selector, keepData ) {
+	var node,
+		nodes = selector ? jQuery.filter( selector, elem ) : elem,
+		i = 0;
+
+	for ( ; ( node = nodes[ i ] ) != null; i++ ) {
+		if ( !keepData && node.nodeType === 1 ) {
+			jQuery.cleanData( getAll( node ) );
+		}
+
+		if ( node.parentNode ) {
+			if ( keepData && jQuery.contains( node.ownerDocument, node ) ) {
+				setGlobalEval( getAll( node, "script" ) );
+			}
+			node.parentNode.removeChild( node );
+		}
+	}
+
+	return elem;
+}
+
+jQuery.extend( {
+	htmlPrefilter: function( html ) {
+		return html.replace( rxhtmlTag, "<$1></$2>" );
+	},
+
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var i, l, srcElements, destElements,
+			clone = elem.cloneNode( true ),
+			inPage = jQuery.contains( elem.ownerDocument, elem );
+
+		// Fix IE cloning issues
+		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
+				!jQuery.isXMLDoc( elem ) ) {
+
+			// We eschew Sizzle here for performance reasons: https://jsperf.com/getall-vs-sizzle/2
+			destElements = getAll( clone );
+			srcElements = getAll( elem );
+
+			for ( i = 0, l = srcElements.length; i < l; i++ ) {
+				fixInput( srcElements[ i ], destElements[ i ] );
+			}
+		}
+
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			if ( deepDataAndEvents ) {
+				srcElements = srcElements || getAll( elem );
+				destElements = destElements || getAll( clone );
+
+				for ( i = 0, l = srcElements.length; i < l; i++ ) {
+					cloneCopyEvent( srcElements[ i ], destElements[ i ] );
+				}
+			} else {
+				cloneCopyEvent( elem, clone );
+			}
+		}
+
+		// Preserve script evaluation history
+		destElements = getAll( clone, "script" );
+		if ( destElements.length > 0 ) {
+			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
+		}
+
+		// Return the cloned set
+		return clone;
+	},
+
+	cleanData: function( elems ) {
+		var data, elem, type,
+			special = jQuery.event.special,
+			i = 0;
+
+		for ( ; ( elem = elems[ i ] ) !== undefined; i++ ) {
+			if ( acceptData( elem ) ) {
+				if ( ( data = elem[ dataPriv.expando ] ) ) {
+					if ( data.events ) {
+						for ( type in data.events ) {
+							if ( special[ type ] ) {
+								jQuery.event.remove( elem, type );
+
+							// This is a shortcut to avoid jQuery.event.remove's overhead
+							} else {
+								jQuery.removeEvent( elem, type, data.handle );
+							}
+						}
+					}
+
+					// Support: Chrome <=35 - 45+
+					// Assign undefined instead of using delete, see Data#remove
+					elem[ dataPriv.expando ] = undefined;
+				}
+				if ( elem[ dataUser.expando ] ) {
+
+					// Support: Chrome <=35 - 45+
+					// Assign undefined instead of using delete, see Data#remove
+					elem[ dataUser.expando ] = undefined;
+				}
+			}
+		}
+	}
+} );
+
+jQuery.fn.extend( {
+	detach: function( selector ) {
+		return remove( this, selector, true );
+	},
+
+	remove: function( selector ) {
+		return remove( this, selector );
+	},
+
+	text: function( value ) {
+		return access( this, function( value ) {
+			return value === undefined ?
+				jQuery.text( this ) :
+				this.empty().each( function() {
+					if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+						this.textContent = value;
+					}
+				} );
+		}, null, value, arguments.length );
+	},
+
+	append: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.appendChild( elem );
+			}
+		} );
+	},
+
+	prepend: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.insertBefore( elem, target.firstChild );
+			}
+		} );
+	},
+
+	before: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this );
+			}
+		} );
+	},
+
+	after: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			}
+		} );
+	},
+
+	empty: function() {
+		var elem,
+			i = 0;
+
+		for ( ; ( elem = this[ i ] ) != null; i++ ) {
+			if ( elem.nodeType === 1 ) {
+
+				// Prevent memory leaks
+				jQuery.cleanData( getAll( elem, false ) );
+
+				// Remove any remaining nodes
+				elem.textContent = "";
+			}
+		}
+
+		return this;
+	},
+
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map( function() {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		} );
+	},
+
+	html: function( value ) {
+		return access( this, function( value ) {
+			var elem = this[ 0 ] || {},
+				i = 0,
+				l = this.length;
+
+			if ( value === undefined && elem.nodeType === 1 ) {
+				return elem.innerHTML;
+			}
+
+			// See if we can take a shortcut and just use innerHTML
+			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
+
+				value = jQuery.htmlPrefilter( value );
+
+				try {
+					for ( ; i < l; i++ ) {
+						elem = this[ i ] || {};
+
+						// Remove element nodes and prevent memory leaks
+						if ( elem.nodeType === 1 ) {
+							jQuery.cleanData( getAll( elem, false ) );
+							elem.innerHTML = value;
+						}
+					}
+
+					elem = 0;
+
+				// If using innerHTML throws an exception, use the fallback method
+				} catch ( e ) {}
+			}
+
+			if ( elem ) {
+				this.empty().append( value );
+			}
+		}, null, value, arguments.length );
+	},
+
+	replaceWith: function() {
+		var ignored = [];
+
+		// Make the changes, replacing each non-ignored context element with the new content
+		return domManip( this, arguments, function( elem ) {
+			var parent = this.parentNode;
+
+			if ( jQuery.inArray( this, ignored ) < 0 ) {
+				jQuery.cleanData( getAll( this ) );
+				if ( parent ) {
+					parent.replaceChild( elem, this );
+				}
+			}
+
+		// Force callback invocation
+		}, ignored );
+	}
+} );
+
+jQuery.each( {
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var elems,
+			ret = [],
+			insert = jQuery( selector ),
+			last = insert.length - 1,
+			i = 0;
+
+		for ( ; i <= last; i++ ) {
+			elems = i === last ? this : this.clone( true );
+			jQuery( insert[ i ] )[ original ]( elems );
+
+			// Support: Android <=4.0 only, PhantomJS 1 only
+			// .get() because push.apply(_, arraylike) throws on ancient WebKit
+			push.apply( ret, elems.get() );
+		}
+
+		return this.pushStack( ret );
+	};
+} );
+var rmargin = ( /^margin/ );
+
+var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
+
+var getStyles = function( elem ) {
+
+		// Support: IE <=11 only, Firefox <=30 (#15098, #14150)
+		// IE throws on elements created in popups
+		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
+		var view = elem.ownerDocument.defaultView;
+
+		if ( !view || !view.opener ) {
+			view = window;
+		}
+
+		return view.getComputedStyle( elem );
+	};
+
+
+
+( function() {
+
+	// Executing both pixelPosition & boxSizingReliable tests require only one layout
+	// so they're executed at the same time to save the second computation.
+	function computeStyleTests() {
+
+		// This is a singleton, we need to execute it only once
+		if ( !div ) {
+			return;
+		}
+
+		div.style.cssText =
+			"box-sizing:border-box;" +
+			"position:relative;display:block;" +
+			"margin:auto;border:1px;padding:1px;" +
+			"top:1%;width:50%";
+		div.innerHTML = "";
+		documentElement.appendChild( container );
+
+		var divStyle = window.getComputedStyle( div );
+		pixelPositionVal = divStyle.top !== "1%";
+
+		// Support: Android 4.0 - 4.3 only, Firefox <=3 - 44
+		reliableMarginLeftVal = divStyle.marginLeft === "2px";
+		boxSizingReliableVal = divStyle.width === "4px";
+
+		// Support: Android 4.0 - 4.3 only
+		// Some styles come back with percentage values, even though they shouldn't
+		div.style.marginRight = "50%";
+		pixelMarginRightVal = divStyle.marginRight === "4px";
+
+		documentElement.removeChild( container );
+
+		// Nullify the div so it wouldn't be stored in the memory and
+		// it will also be a sign that checks already performed
+		div = null;
+	}
+
+	var pixelPositionVal, boxSizingReliableVal, pixelMarginRightVal, reliableMarginLeftVal,
+		container = document.createElement( "div" ),
+		div = document.createElement( "div" );
+
+	// Finish early in limited (non-browser) environments
+	if ( !div.style ) {
+		return;
+	}
+
+	// Support: IE <=9 - 11 only
+	// Style of cloned element affects source element cloned (#8908)
+	div.style.backgroundClip = "content-box";
+	div.cloneNode( true ).style.backgroundClip = "";
+	support.clearCloneStyle = div.style.backgroundClip === "content-box";
+
+	container.style.cssText = "border:0;width:8px;height:0;top:0;left:-9999px;" +
+		"padding:0;margin-top:1px;position:absolute";
+	container.appendChild( div );
+
+	jQuery.extend( support, {
+		pixelPosition: function() {
+			computeStyleTests();
+			return pixelPositionVal;
+		},
+		boxSizingReliable: function() {
+			computeStyleTests();
+			return boxSizingReliableVal;
+		},
+		pixelMarginRight: function() {
+			computeStyleTests();
+			return pixelMarginRightVal;
+		},
+		reliableMarginLeft: function() {
+			computeStyleTests();
+			return reliableMarginLeftVal;
+		}
+	} );
+} )();
+
+
+function curCSS( elem, name, computed ) {
+	var width, minWidth, maxWidth, ret,
+		style = elem.style;
+
+	computed = computed || getStyles( elem );
+
+	// Support: IE <=9 only
+	// getPropertyValue is only needed for .css('filter') (#12537)
+	if ( computed ) {
+		ret = computed.getPropertyValue( name ) || computed[ name ];
+
+		if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
+			ret = jQuery.style( elem, name );
+		}
+
+		// A tribute to the "awesome hack by Dean Edwards"
+		// Android Browser returns percentage for some values,
+		// but width seems to be reliably pixels.
+		// This is against the CSSOM draft spec:
+		// https://drafts.csswg.org/cssom/#resolved-values
+		if ( !support.pixelMarginRight() && rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+
+			// Remember the original values
+			width = style.width;
+			minWidth = style.minWidth;
+			maxWidth = style.maxWidth;
+
+			// Put in the new values to get a computed value out
+			style.minWidth = style.maxWidth = style.width = ret;
+			ret = computed.width;
+
+			// Revert the changed values
+			style.width = width;
+			style.minWidth = minWidth;
+			style.maxWidth = maxWidth;
+		}
+	}
+
+	return ret !== undefined ?
+
+		// Support: IE <=9 - 11 only
+		// IE returns zIndex value as an integer.
+		ret + "" :
+		ret;
+}
+
+
+function addGetHookIf( conditionFn, hookFn ) {
+
+	// Define the hook, we'll check on the first run if it's really needed.
+	return {
+		get: function() {
+			if ( conditionFn() ) {
+
+				// Hook not needed (or it's not possible to use it due
+				// to missing dependency), remove it.
+				delete this.get;
+				return;
+			}
+
+			// Hook needed; redefine it so that the support test is not executed again.
+			return ( this.get = hookFn ).apply( this, arguments );
+		}
+	};
+}
+
+
+var
+
+	// Swappable if display is none or starts with table
+	// except "table", "table-cell", or "table-caption"
+	// See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssNormalTransform = {
+		letterSpacing: "0",
+		fontWeight: "400"
+	},
+
+	cssPrefixes = [ "Webkit", "Moz", "ms" ],
+	emptyStyle = document.createElement( "div" ).style;
+
+// Return a css property mapped to a potentially vendor prefixed property
+function vendorPropName( name ) {
+
+	// Shortcut for names that are not vendor prefixed
+	if ( name in emptyStyle ) {
+		return name;
+	}
+
+	// Check for vendor prefixed names
+	var capName = name[ 0 ].toUpperCase() + name.slice( 1 ),
+		i = cssPrefixes.length;
+
+	while ( i-- ) {
+		name = cssPrefixes[ i ] + capName;
+		if ( name in emptyStyle ) {
+			return name;
+		}
+	}
+}
+
+function setPositiveNumber( elem, value, subtract ) {
+
+	// Any relative (+/-) values have already been
+	// normalized at this point
+	var matches = rcssNum.exec( value );
+	return matches ?
+
+		// Guard against undefined "subtract", e.g., when used as in cssHooks
+		Math.max( 0, matches[ 2 ] - ( subtract || 0 ) ) + ( matches[ 3 ] || "px" ) :
+		value;
+}
+
+function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
+	var i,
+		val = 0;
+
+	// If we already have the right measurement, avoid augmentation
+	if ( extra === ( isBorderBox ? "border" : "content" ) ) {
+		i = 4;
+
+	// Otherwise initialize for horizontal or vertical properties
+	} else {
+		i = name === "width" ? 1 : 0;
+	}
+
+	for ( ; i < 4; i += 2 ) {
+
+		// Both box models exclude margin, so add it if we want it
+		if ( extra === "margin" ) {
+			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
+		}
+
+		if ( isBorderBox ) {
+
+			// border-box includes padding, so remove it if we want content
+			if ( extra === "content" ) {
+				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+			}
+
+			// At this point, extra isn't border nor margin, so remove border
+			if ( extra !== "margin" ) {
+				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		} else {
+
+			// At this point, extra isn't content, so add padding
+			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+
+			// At this point, extra isn't content nor padding, so add border
+			if ( extra !== "padding" ) {
+				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		}
+	}
+
+	return val;
+}
+
+function getWidthOrHeight( elem, name, extra ) {
+
+	// Start with offset property, which is equivalent to the border-box value
+	var val,
+		valueIsBorderBox = true,
+		styles = getStyles( elem ),
+		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+
+	// Support: IE <=11 only
+	// Running getBoundingClientRect on a disconnected node
+	// in IE throws an error.
+	if ( elem.getClientRects().length ) {
+		val = elem.getBoundingClientRect()[ name ];
+	}
+
+	// Some non-html elements return undefined for offsetWidth, so check for null/undefined
+	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
+	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
+	if ( val <= 0 || val == null ) {
+
+		// Fall back to computed then uncomputed css if necessary
+		val = curCSS( elem, name, styles );
+		if ( val < 0 || val == null ) {
+			val = elem.style[ name ];
+		}
+
+		// Computed unit is not pixels. Stop here and return.
+		if ( rnumnonpx.test( val ) ) {
+			return val;
+		}
+
+		// Check for style in case a browser which returns unreliable values
+		// for getComputedStyle silently falls back to the reliable elem.style
+		valueIsBorderBox = isBorderBox &&
+			( support.boxSizingReliable() || val === elem.style[ name ] );
+
+		// Normalize "", auto, and prepare for extra
+		val = parseFloat( val ) || 0;
+	}
+
+	// Use the active box-sizing model to add/subtract irrelevant styles
+	return ( val +
+		augmentWidthOrHeight(
+			elem,
+			name,
+			extra || ( isBorderBox ? "border" : "content" ),
+			valueIsBorderBox,
+			styles
+		)
+	) + "px";
+}
+
+jQuery.extend( {
+
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity" );
+					return ret === "" ? "1" : ret;
+				}
+			}
+		}
+	},
+
+	// Don't automatically add "px" to these possibly-unitless properties
+	cssNumber: {
+		"animationIterationCount": true,
+		"columnCount": true,
+		"fillOpacity": true,
+		"flexGrow": true,
+		"flexShrink": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"order": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		"float": "cssFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, type, hooks,
+			origName = jQuery.camelCase( name ),
+			style = elem.style;
+
+		name = jQuery.cssProps[ origName ] ||
+			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
+
+		// Gets hook for the prefixed version, then unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
+
+			// Convert "+=" or "-=" to relative numbers (#7345)
+			if ( type === "string" && ( ret = rcssNum.exec( value ) ) && ret[ 1 ] ) {
+				value = adjustCSS( elem, name, ret );
+
+				// Fixes bug #9237
+				type = "number";
+			}
+
+			// Make sure that null and NaN values aren't set (#7116)
+			if ( value == null || value !== value ) {
+				return;
+			}
+
+			// If a number was passed in, add the unit (except for certain CSS properties)
+			if ( type === "number" ) {
+				value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" );
+			}
+
+			// background-* props affect original clone's values
+			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
+				style[ name ] = "inherit";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !( "set" in hooks ) ||
+				( value = hooks.set( elem, value, extra ) ) !== undefined ) {
+
+				style[ name ] = value;
+			}
+
+		} else {
+
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks &&
+				( ret = hooks.get( elem, false, extra ) ) !== undefined ) {
+
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra, styles ) {
+		var val, num, hooks,
+			origName = jQuery.camelCase( name );
+
+		// Make sure that we're working with the right name
+		name = jQuery.cssProps[ origName ] ||
+			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
+
+		// Try prefixed name followed by the unprefixed name
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks ) {
+			val = hooks.get( elem, true, extra );
+		}
+
+		// Otherwise, if a way to get the computed value exists, use that
+		if ( val === undefined ) {
+			val = curCSS( elem, name, styles );
+		}
+
+		// Convert "normal" to computed value
+		if ( val === "normal" && name in cssNormalTransform ) {
+			val = cssNormalTransform[ name ];
+		}
+
+		// Make numeric if forced or a qualifier was provided and val looks numeric
+		if ( extra === "" || extra ) {
+			num = parseFloat( val );
+			return extra === true || isFinite( num ) ? num || 0 : val;
+		}
+		return val;
+	}
+} );
+
+jQuery.each( [ "height", "width" ], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			if ( computed ) {
+
+				// Certain elements can have dimension info if we invisibly show them
+				// but it must have a current display style that would benefit
+				return rdisplayswap.test( jQuery.css( elem, "display" ) ) &&
+
+					// Support: Safari 8+
+					// Table columns in Safari have non-zero offsetWidth & zero
+					// getBoundingClientRect().width unless display is changed.
+					// Support: IE <=11 only
+					// Running getBoundingClientRect on a disconnected node
+					// in IE throws an error.
+					( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ?
+						swap( elem, cssShow, function() {
+							return getWidthOrHeight( elem, name, extra );
+						} ) :
+						getWidthOrHeight( elem, name, extra );
+			}
+		},
+
+		set: function( elem, value, extra ) {
+			var matches,
+				styles = extra && getStyles( elem ),
+				subtract = extra && augmentWidthOrHeight(
+					elem,
+					name,
+					extra,
+					jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+					styles
+				);
+
+			// Convert to pixels if value adjustment is needed
+			if ( subtract && ( matches = rcssNum.exec( value ) ) &&
+				( matches[ 3 ] || "px" ) !== "px" ) {
+
+				elem.style[ name ] = value;
+				value = jQuery.css( elem, name );
+			}
+
+			return setPositiveNumber( elem, value, subtract );
+		}
+	};
+} );
+
+jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
+	function( elem, computed ) {
+		if ( computed ) {
+			return ( parseFloat( curCSS( elem, "marginLeft" ) ) ||
+				elem.getBoundingClientRect().left -
+					swap( elem, { marginLeft: 0 }, function() {
+						return elem.getBoundingClientRect().left;
+					} )
+				) + "px";
+		}
+	}
+);
+
+// These hooks are used by animate to expand properties
+jQuery.each( {
+	margin: "",
+	padding: "",
+	border: "Width"
+}, function( prefix, suffix ) {
+	jQuery.cssHooks[ prefix + suffix ] = {
+		expand: function( value ) {
+			var i = 0,
+				expanded = {},
+
+				// Assumes a single number if not a string
+				parts = typeof value === "string" ? value.split( " " ) : [ value ];
+
+			for ( ; i < 4; i++ ) {
+				expanded[ prefix + cssExpand[ i ] + suffix ] =
+					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+			}
+
+			return expanded;
+		}
+	};
+
+	if ( !rmargin.test( prefix ) ) {
+		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+	}
+} );
+
+jQuery.fn.extend( {
+	css: function( name, value ) {
+		return access( this, function( elem, name, value ) {
+			var styles, len,
+				map = {},
+				i = 0;
+
+			if ( jQuery.isArray( name ) ) {
+				styles = getStyles( elem );
+				len = name.length;
+
+				for ( ; i < len; i++ ) {
+					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
+				}
+
+				return map;
+			}
+
+			return value !== undefined ?
+				jQuery.style( elem, name, value ) :
+				jQuery.css( elem, name );
+		}, name, value, arguments.length > 1 );
+	}
+} );
+
+
+function Tween( elem, options, prop, end, easing ) {
+	return new Tween.prototype.init( elem, options, prop, end, easing );
+}
+jQuery.Tween = Tween;
+
+Tween.prototype = {
+	constructor: Tween,
+	init: function( elem, options, prop, end, easing, unit ) {
+		this.elem = elem;
+		this.prop = prop;
+		this.easing = easing || jQuery.easing._default;
+		this.options = options;
+		this.start = this.now = this.cur();
+		this.end = end;
+		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+	},
+	cur: function() {
+		var hooks = Tween.propHooks[ this.prop ];
+
+		return hooks && hooks.get ?
+			hooks.get( this ) :
+			Tween.propHooks._default.get( this );
+	},
+	run: function( percent ) {
+		var eased,
+			hooks = Tween.propHooks[ this.prop ];
+
+		if ( this.options.duration ) {
+			this.pos = eased = jQuery.easing[ this.easing ](
+				percent, this.options.duration * percent, 0, 1, this.options.duration
+			);
+		} else {
+			this.pos = eased = percent;
+		}
+		this.now = ( this.end - this.start ) * eased + this.start;
+
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		if ( hooks && hooks.set ) {
+			hooks.set( this );
+		} else {
+			Tween.propHooks._default.set( this );
+		}
+		return this;
+	}
+};
+
+Tween.prototype.init.prototype = Tween.prototype;
+
+Tween.propHooks = {
+	_default: {
+		get: function( tween ) {
+			var result;
+
+			// Use a property on the element directly when it is not a DOM element,
+			// or when there is no matching style property that exists.
+			if ( tween.elem.nodeType !== 1 ||
+				tween.elem[ tween.prop ] != null && tween.elem.style[ tween.prop ] == null ) {
+				return tween.elem[ tween.prop ];
+			}
+
+			// Passing an empty string as a 3rd parameter to .css will automatically
+			// attempt a parseFloat and fallback to a string if the parse fails.
+			// Simple values such as "10px" are parsed to Float;
+			// complex values such as "rotate(1rad)" are returned as-is.
+			result = jQuery.css( tween.elem, tween.prop, "" );
+
+			// Empty strings, null, undefined and "auto" are converted to 0.
+			return !result || result === "auto" ? 0 : result;
+		},
+		set: function( tween ) {
+
+			// Use step hook for back compat.
+			// Use cssHook if its there.
+			// Use .style if available and use plain properties where available.
+			if ( jQuery.fx.step[ tween.prop ] ) {
+				jQuery.fx.step[ tween.prop ]( tween );
+			} else if ( tween.elem.nodeType === 1 &&
+				( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null ||
+					jQuery.cssHooks[ tween.prop ] ) ) {
+				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+			} else {
+				tween.elem[ tween.prop ] = tween.now;
+			}
+		}
+	}
+};
+
+// Support: IE <=9 only
+// Panic based approach to setting things on disconnected nodes
+Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+	set: function( tween ) {
+		if ( tween.elem.nodeType && tween.elem.parentNode ) {
+			tween.elem[ tween.prop ] = tween.now;
+		}
+	}
+};
+
+jQuery.easing = {
+	linear: function( p ) {
+		return p;
+	},
+	swing: function( p ) {
+		return 0.5 - Math.cos( p * Math.PI ) / 2;
+	},
+	_default: "swing"
+};
+
+jQuery.fx = Tween.prototype.init;
+
+// Back compat <1.8 extension point
+jQuery.fx.step = {};
+
+
+
+
+var
+	fxNow, timerId,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rrun = /queueHooks$/;
+
+function raf() {
+	if ( timerId ) {
+		window.requestAnimationFrame( raf );
+		jQuery.fx.tick();
+	}
+}
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	window.setTimeout( function() {
+		fxNow = undefined;
+	} );
+	return ( fxNow = jQuery.now() );
+}
+
+// Generate parameters to create a standard animation
+function genFx( type, includeWidth ) {
+	var which,
+		i = 0,
+		attrs = { height: type };
+
+	// If we include width, step value is 1 to do all cssExpand values,
+	// otherwise step value is 2 to skip over Left and Right
+	includeWidth = includeWidth ? 1 : 0;
+	for ( ; i < 4; i += 2 - includeWidth ) {
+		which = cssExpand[ i ];
+		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+	}
+
+	if ( includeWidth ) {
+		attrs.opacity = attrs.width = type;
+	}
+
+	return attrs;
+}
+
+function createTween( value, prop, animation ) {
+	var tween,
+		collection = ( Animation.tweeners[ prop ] || [] ).concat( Animation.tweeners[ "*" ] ),
+		index = 0,
+		length = collection.length;
+	for ( ; index < length; index++ ) {
+		if ( ( tween = collection[ index ].call( animation, prop, value ) ) ) {
+
+			// We're done with this property
+			return tween;
+		}
+	}
+}
+
+function defaultPrefilter( elem, props, opts ) {
+	var prop, value, toggle, hooks, oldfire, propTween, restoreDisplay, display,
+		isBox = "width" in props || "height" in props,
+		anim = this,
+		orig = {},
+		style = elem.style,
+		hidden = elem.nodeType && isHiddenWithinTree( elem ),
+		dataShow = dataPriv.get( elem, "fxshow" );
+
+	// Queue-skipping animations hijack the fx hooks
+	if ( !opts.queue ) {
+		hooks = jQuery._queueHooks( elem, "fx" );
+		if ( hooks.unqueued == null ) {
+			hooks.unqueued = 0;
+			oldfire = hooks.empty.fire;
+			hooks.empty.fire = function() {
+				if ( !hooks.unqueued ) {
+					oldfire();
+				}
+			};
+		}
+		hooks.unqueued++;
+
+		anim.always( function() {
+
+			// Ensure the complete handler is called before this completes
+			anim.always( function() {
+				hooks.unqueued--;
+				if ( !jQuery.queue( elem, "fx" ).length ) {
+					hooks.empty.fire();
+				}
+			} );
+		} );
+	}
+
+	// Detect show/hide animations
+	for ( prop in props ) {
+		value = props[ prop ];
+		if ( rfxtypes.test( value ) ) {
+			delete props[ prop ];
+			toggle = toggle || value === "toggle";
+			if ( value === ( hidden ? "hide" : "show" ) ) {
+
+				// Pretend to be hidden if this is a "show" and
+				// there is still data from a stopped show/hide
+				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
+					hidden = true;
+
+				// Ignore all other no-op show/hide data
+				} else {
+					continue;
+				}
+			}
+			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
+		}
+	}
+
+	// Bail out if this is a no-op like .hide().hide()
+	propTween = !jQuery.isEmptyObject( props );
+	if ( !propTween && jQuery.isEmptyObject( orig ) ) {
+		return;
+	}
+
+	// Restrict "overflow" and "display" styles during box animations
+	if ( isBox && elem.nodeType === 1 ) {
+
+		// Support: IE <=9 - 11, Edge 12 - 13
+		// Record all 3 overflow attributes because IE does not infer the shorthand
+		// from identically-valued overflowX and overflowY
+		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+		// Identify a display type, preferring old show/hide data over the CSS cascade
+		restoreDisplay = dataShow && dataShow.display;
+		if ( restoreDisplay == null ) {
+			restoreDisplay = dataPriv.get( elem, "display" );
+		}
+		display = jQuery.css( elem, "display" );
+		if ( display === "none" ) {
+			if ( restoreDisplay ) {
+				display = restoreDisplay;
+			} else {
+
+				// Get nonempty value(s) by temporarily forcing visibility
+				showHide( [ elem ], true );
+				restoreDisplay = elem.style.display || restoreDisplay;
+				display = jQuery.css( elem, "display" );
+				showHide( [ elem ] );
+			}
+		}
+
+		// Animate inline elements as inline-block
+		if ( display === "inline" || display === "inline-block" && restoreDisplay != null ) {
+			if ( jQuery.css( elem, "float" ) === "none" ) {
+
+				// Restore the original display value at the end of pure show/hide animations
+				if ( !propTween ) {
+					anim.done( function() {
+						style.display = restoreDisplay;
+					} );
+					if ( restoreDisplay == null ) {
+						display = style.display;
+						restoreDisplay = display === "none" ? "" : display;
+					}
+				}
+				style.display = "inline-block";
+			}
+		}
+	}
+
+	if ( opts.overflow ) {
+		style.overflow = "hidden";
+		anim.always( function() {
+			style.overflow = opts.overflow[ 0 ];
+			style.overflowX = opts.overflow[ 1 ];
+			style.overflowY = opts.overflow[ 2 ];
+		} );
+	}
+
+	// Implement show/hide animations
+	propTween = false;
+	for ( prop in orig ) {
+
+		// General show/hide setup for this element animation
+		if ( !propTween ) {
+			if ( dataShow ) {
+				if ( "hidden" in dataShow ) {
+					hidden = dataShow.hidden;
+				}
+			} else {
+				dataShow = dataPriv.access( elem, "fxshow", { display: restoreDisplay } );
+			}
+
+			// Store hidden/visible for toggle so `.stop().toggle()` "reverses"
+			if ( toggle ) {
+				dataShow.hidden = !hidden;
+			}
+
+			// Show elements before animating them
+			if ( hidden ) {
+				showHide( [ elem ], true );
+			}
+
+			/* eslint-disable no-loop-func */
+
+			anim.done( function() {
+
+			/* eslint-enable no-loop-func */
+
+				// The final step of a "hide" animation is actually hiding the element
+				if ( !hidden ) {
+					showHide( [ elem ] );
+				}
+				dataPriv.remove( elem, "fxshow" );
+				for ( prop in orig ) {
+					jQuery.style( elem, prop, orig[ prop ] );
+				}
+			} );
+		}
+
+		// Per-property setup
+		propTween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
+		if ( !( prop in dataShow ) ) {
+			dataShow[ prop ] = propTween.start;
+			if ( hidden ) {
+				propTween.end = propTween.start;
+				propTween.start = 0;
+			}
+		}
+	}
+}
+
+function propFilter( props, specialEasing ) {
+	var index, name, easing, value, hooks;
+
+	// camelCase, specialEasing and expand cssHook pass
+	for ( index in props ) {
+		name = jQuery.camelCase( index );
+		easing = specialEasing[ name ];
+		value = props[ index ];
+		if ( jQuery.isArray( value ) ) {
+			easing = value[ 1 ];
+			value = props[ index ] = value[ 0 ];
+		}
+
+		if ( index !== name ) {
+			props[ name ] = value;
+			delete props[ index ];
+		}
+
+		hooks = jQuery.cssHooks[ name ];
+		if ( hooks && "expand" in hooks ) {
+			value = hooks.expand( value );
+			delete props[ name ];
+
+			// Not quite $.extend, this won't overwrite existing keys.
+			// Reusing 'index' because we have the correct "name"
+			for ( index in value ) {
+				if ( !( index in props ) ) {
+					props[ index ] = value[ index ];
+					specialEasing[ index ] = easing;
+				}
+			}
+		} else {
+			specialEasing[ name ] = easing;
+		}
+	}
+}
+
+function Animation( elem, properties, options ) {
+	var result,
+		stopped,
+		index = 0,
+		length = Animation.prefilters.length,
+		deferred = jQuery.Deferred().always( function() {
+
+			// Don't match elem in the :animated selector
+			delete tick.elem;
+		} ),
+		tick = function() {
+			if ( stopped ) {
+				return false;
+			}
+			var currentTime = fxNow || createFxNow(),
+				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+
+				// Support: Android 2.3 only
+				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
+				temp = remaining / animation.duration || 0,
+				percent = 1 - temp,
+				index = 0,
+				length = animation.tweens.length;
+
+			for ( ; index < length; index++ ) {
+				animation.tweens[ index ].run( percent );
+			}
+
+			deferred.notifyWith( elem, [ animation, percent, remaining ] );
+
+			if ( percent < 1 && length ) {
+				return remaining;
+			} else {
+				deferred.resolveWith( elem, [ animation ] );
+				return false;
+			}
+		},
+		animation = deferred.promise( {
+			elem: elem,
+			props: jQuery.extend( {}, properties ),
+			opts: jQuery.extend( true, {
+				specialEasing: {},
+				easing: jQuery.easing._default
+			}, options ),
+			originalProperties: properties,
+			originalOptions: options,
+			startTime: fxNow || createFxNow(),
+			duration: options.duration,
+			tweens: [],
+			createTween: function( prop, end ) {
+				var tween = jQuery.Tween( elem, animation.opts, prop, end,
+						animation.opts.specialEasing[ prop ] || animation.opts.easing );
+				animation.tweens.push( tween );
+				return tween;
+			},
+			stop: function( gotoEnd ) {
+				var index = 0,
+
+					// If we are going to the end, we want to run all the tweens
+					// otherwise we skip this part
+					length = gotoEnd ? animation.tweens.length : 0;
+				if ( stopped ) {
+					return this;
+				}
+				stopped = true;
+				for ( ; index < length; index++ ) {
+					animation.tweens[ index ].run( 1 );
+				}
+
+				// Resolve when we played the last frame; otherwise, reject
+				if ( gotoEnd ) {
+					deferred.notifyWith( elem, [ animation, 1, 0 ] );
+					deferred.resolveWith( elem, [ animation, gotoEnd ] );
+				} else {
+					deferred.rejectWith( elem, [ animation, gotoEnd ] );
+				}
+				return this;
+			}
+		} ),
+		props = animation.props;
+
+	propFilter( props, animation.opts.specialEasing );
+
+	for ( ; index < length; index++ ) {
+		result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts );
+		if ( result ) {
+			if ( jQuery.isFunction( result.stop ) ) {
+				jQuery._queueHooks( animation.elem, animation.opts.queue ).stop =
+					jQuery.proxy( result.stop, result );
+			}
+			return result;
+		}
+	}
+
+	jQuery.map( props, createTween, animation );
+
+	if ( jQuery.isFunction( animation.opts.start ) ) {
+		animation.opts.start.call( elem, animation );
+	}
+
+	jQuery.fx.timer(
+		jQuery.extend( tick, {
+			elem: elem,
+			anim: animation,
+			queue: animation.opts.queue
+		} )
+	);
+
+	// attach callbacks from options
+	return animation.progress( animation.opts.progress )
+		.done( animation.opts.done, animation.opts.complete )
+		.fail( animation.opts.fail )
+		.always( animation.opts.always );
+}
+
+jQuery.Animation = jQuery.extend( Animation, {
+
+	tweeners: {
+		"*": [ function( prop, value ) {
+			var tween = this.createTween( prop, value );
+			adjustCSS( tween.elem, prop, rcssNum.exec( value ), tween );
+			return tween;
+		} ]
+	},
+
+	tweener: function( props, callback ) {
+		if ( jQuery.isFunction( props ) ) {
+			callback = props;
+			props = [ "*" ];
+		} else {
+			props = props.match( rnothtmlwhite );
+		}
+
+		var prop,
+			index = 0,
+			length = props.length;
+
+		for ( ; index < length; index++ ) {
+			prop = props[ index ];
+			Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || [];
+			Animation.tweeners[ prop ].unshift( callback );
+		}
+	},
+
+	prefilters: [ defaultPrefilter ],
+
+	prefilter: function( callback, prepend ) {
+		if ( prepend ) {
+			Animation.prefilters.unshift( callback );
+		} else {
+			Animation.prefilters.push( callback );
+		}
+	}
+} );
+
+jQuery.speed = function( speed, easing, fn ) {
+	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+		complete: fn || !fn && easing ||
+			jQuery.isFunction( speed ) && speed,
+		duration: speed,
+		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+	};
+
+	// Go to the end state if fx are off or if document is hidden
+	if ( jQuery.fx.off || document.hidden ) {
+		opt.duration = 0;
+
+	} else {
+		if ( typeof opt.duration !== "number" ) {
+			if ( opt.duration in jQuery.fx.speeds ) {
+				opt.duration = jQuery.fx.speeds[ opt.duration ];
+
+			} else {
+				opt.duration = jQuery.fx.speeds._default;
+			}
+		}
+	}
+
+	// Normalize opt.queue - true/undefined/null -> "fx"
+	if ( opt.queue == null || opt.queue === true ) {
+		opt.queue = "fx";
+	}
+
+	// Queueing
+	opt.old = opt.complete;
+
+	opt.complete = function() {
+		if ( jQuery.isFunction( opt.old ) ) {
+			opt.old.call( this );
+		}
+
+		if ( opt.queue ) {
+			jQuery.dequeue( this, opt.queue );
+		}
+	};
+
+	return opt;
+};
+
+jQuery.fn.extend( {
+	fadeTo: function( speed, to, easing, callback ) {
+
+		// Show any hidden elements after setting opacity to 0
+		return this.filter( isHiddenWithinTree ).css( "opacity", 0 ).show()
+
+			// Animate to the value specified
+			.end().animate( { opacity: to }, speed, easing, callback );
+	},
+	animate: function( prop, speed, easing, callback ) {
+		var empty = jQuery.isEmptyObject( prop ),
+			optall = jQuery.speed( speed, easing, callback ),
+			doAnimation = function() {
+
+				// Operate on a copy of prop so per-property easing won't be lost
+				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+
+				// Empty animations, or finishing resolves immediately
+				if ( empty || dataPriv.get( this, "finish" ) ) {
+					anim.stop( true );
+				}
+			};
+			doAnimation.finish = doAnimation;
+
+		return empty || optall.queue === false ?
+			this.each( doAnimation ) :
+			this.queue( optall.queue, doAnimation );
+	},
+	stop: function( type, clearQueue, gotoEnd ) {
+		var stopQueue = function( hooks ) {
+			var stop = hooks.stop;
+			delete hooks.stop;
+			stop( gotoEnd );
+		};
+
+		if ( typeof type !== "string" ) {
+			gotoEnd = clearQueue;
+			clearQueue = type;
+			type = undefined;
+		}
+		if ( clearQueue && type !== false ) {
+			this.queue( type || "fx", [] );
+		}
+
+		return this.each( function() {
+			var dequeue = true,
+				index = type != null && type + "queueHooks",
+				timers = jQuery.timers,
+				data = dataPriv.get( this );
+
+			if ( index ) {
+				if ( data[ index ] && data[ index ].stop ) {
+					stopQueue( data[ index ] );
+				}
+			} else {
+				for ( index in data ) {
+					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+						stopQueue( data[ index ] );
+					}
+				}
+			}
+
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this &&
+					( type == null || timers[ index ].queue === type ) ) {
+
+					timers[ index ].anim.stop( gotoEnd );
+					dequeue = false;
+					timers.splice( index, 1 );
+				}
+			}
+
+			// Start the next in the queue if the last step wasn't forced.
+			// Timers currently will call their complete callbacks, which
+			// will dequeue but only if they were gotoEnd.
+			if ( dequeue || !gotoEnd ) {
+				jQuery.dequeue( this, type );
+			}
+		} );
+	},
+	finish: function( type ) {
+		if ( type !== false ) {
+			type = type || "fx";
+		}
+		return this.each( function() {
+			var index,
+				data = dataPriv.get( this ),
+				queue = data[ type + "queue" ],
+				hooks = data[ type + "queueHooks" ],
+				timers = jQuery.timers,
+				length = queue ? queue.length : 0;
+
+			// Enable finishing flag on private data
+			data.finish = true;
+
+			// Empty the queue first
+			jQuery.queue( this, type, [] );
+
+			if ( hooks && hooks.stop ) {
+				hooks.stop.call( this, true );
+			}
+
+			// Look for any active animations, and finish them
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
+					timers[ index ].anim.stop( true );
+					timers.splice( index, 1 );
+				}
+			}
+
+			// Look for any animations in the old queue and finish them
+			for ( index = 0; index < length; index++ ) {
+				if ( queue[ index ] && queue[ index ].finish ) {
+					queue[ index ].finish.call( this );
+				}
+			}
+
+			// Turn off finishing flag
+			delete data.finish;
+		} );
+	}
+} );
+
+jQuery.each( [ "toggle", "show", "hide" ], function( i, name ) {
+	var cssFn = jQuery.fn[ name ];
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return speed == null || typeof speed === "boolean" ?
+			cssFn.apply( this, arguments ) :
+			this.animate( genFx( name, true ), speed, easing, callback );
+	};
+} );
+
+// Generate shortcuts for custom animations
+jQuery.each( {
+	slideDown: genFx( "show" ),
+	slideUp: genFx( "hide" ),
+	slideToggle: genFx( "toggle" ),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+} );
+
+jQuery.timers = [];
+jQuery.fx.tick = function() {
+	var timer,
+		i = 0,
+		timers = jQuery.timers;
+
+	fxNow = jQuery.now();
+
+	for ( ; i < timers.length; i++ ) {
+		timer = timers[ i ];
+
+		// Checks the timer has not already been removed
+		if ( !timer() && timers[ i ] === timer ) {
+			timers.splice( i--, 1 );
+		}
+	}
+
+	if ( !timers.length ) {
+		jQuery.fx.stop();
+	}
+	fxNow = undefined;
+};
+
+jQuery.fx.timer = function( timer ) {
+	jQuery.timers.push( timer );
+	if ( timer() ) {
+		jQuery.fx.start();
+	} else {
+		jQuery.timers.pop();
+	}
+};
+
+jQuery.fx.interval = 13;
+jQuery.fx.start = function() {
+	if ( !timerId ) {
+		timerId = window.requestAnimationFrame ?
+			window.requestAnimationFrame( raf ) :
+			window.setInterval( jQuery.fx.tick, jQuery.fx.interval );
+	}
+};
+
+jQuery.fx.stop = function() {
+	if ( window.cancelAnimationFrame ) {
+		window.cancelAnimationFrame( timerId );
+	} else {
+		window.clearInterval( timerId );
+	}
+
+	timerId = null;
+};
+
+jQuery.fx.speeds = {
+	slow: 600,
+	fast: 200,
+
+	// Default speed
+	_default: 400
+};
+
+
+// Based off of the plugin by Clint Helfers, with permission.
+// https://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
+jQuery.fn.delay = function( time, type ) {
+	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+	type = type || "fx";
+
+	return this.queue( type, function( next, hooks ) {
+		var timeout = window.setTimeout( next, time );
+		hooks.stop = function() {
+			window.clearTimeout( timeout );
+		};
+	} );
+};
+
+
+( function() {
+	var input = document.createElement( "input" ),
+		select = document.createElement( "select" ),
+		opt = select.appendChild( document.createElement( "option" ) );
+
+	input.type = "checkbox";
+
+	// Support: Android <=4.3 only
+	// Default value for a checkbox should be "on"
+	support.checkOn = input.value !== "";
+
+	// Support: IE <=11 only
+	// Must access selectedIndex to make default options select
+	support.optSelected = opt.selected;
+
+	// Support: IE <=11 only
+	// An input loses its value after becoming a radio
+	input = document.createElement( "input" );
+	input.value = "t";
+	input.type = "radio";
+	support.radioValue = input.value === "t";
+} )();
+
+
+var boolHook,
+	attrHandle = jQuery.expr.attrHandle;
+
+jQuery.fn.extend( {
+	attr: function( name, value ) {
+		return access( this, jQuery.attr, name, value, arguments.length > 1 );
+	},
+
+	removeAttr: function( name ) {
+		return this.each( function() {
+			jQuery.removeAttr( this, name );
+		} );
+	}
+} );
+
+jQuery.extend( {
+	attr: function( elem, name, value ) {
+		var ret, hooks,
+			nType = elem.nodeType;
+
+		// Don't get/set attributes on text, comment and attribute nodes
+		if ( nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		// Fallback to prop when attributes are not supported
+		if ( typeof elem.getAttribute === "undefined" ) {
+			return jQuery.prop( elem, name, value );
+		}
+
+		// Attribute hooks are determined by the lowercase version
+		// Grab necessary hook if one is defined
+		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+			hooks = jQuery.attrHooks[ name.toLowerCase() ] ||
+				( jQuery.expr.match.bool.test( name ) ? boolHook : undefined );
+		}
+
+		if ( value !== undefined ) {
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+				return;
+			}
+
+			if ( hooks && "set" in hooks &&
+				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
+				return ret;
+			}
+
+			elem.setAttribute( name, value + "" );
+			return value;
+		}
+
+		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
+			return ret;
+		}
+
+		ret = jQuery.find.attr( elem, name );
+
+		// Non-existent attributes return null, we normalize to undefined
+		return ret == null ? undefined : ret;
+	},
+
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				if ( !support.radioValue && value === "radio" &&
+					jQuery.nodeName( elem, "input" ) ) {
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
+					}
+					return value;
+				}
+			}
+		}
+	},
+
+	removeAttr: function( elem, value ) {
+		var name,
+			i = 0,
+
+			// Attribute names can contain non-HTML whitespace characters
+			// https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
+			attrNames = value && value.match( rnothtmlwhite );
+
+		if ( attrNames && elem.nodeType === 1 ) {
+			while ( ( name = attrNames[ i++ ] ) ) {
+				elem.removeAttribute( name );
+			}
+		}
+	}
+} );
+
+// Hooks for boolean attributes
+boolHook = {
+	set: function( elem, value, name ) {
+		if ( value === false ) {
+
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else {
+			elem.setAttribute( name, name );
+		}
+		return name;
+	}
+};
+
+jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
+	var getter = attrHandle[ name ] || jQuery.find.attr;
+
+	attrHandle[ name ] = function( elem, name, isXML ) {
+		var ret, handle,
+			lowercaseName = name.toLowerCase();
+
+		if ( !isXML ) {
+
+			// Avoid an infinite loop by temporarily removing this function from the getter
+			handle = attrHandle[ lowercaseName ];
+			attrHandle[ lowercaseName ] = ret;
+			ret = getter( elem, name, isXML ) != null ?
+				lowercaseName :
+				null;
+			attrHandle[ lowercaseName ] = handle;
+		}
+		return ret;
+	};
+} );
+
+
+
+
+var rfocusable = /^(?:input|select|textarea|button)$/i,
+	rclickable = /^(?:a|area)$/i;
+
+jQuery.fn.extend( {
+	prop: function( name, value ) {
+		return access( this, jQuery.prop, name, value, arguments.length > 1 );
+	},
+
+	removeProp: function( name ) {
+		return this.each( function() {
+			delete this[ jQuery.propFix[ name ] || name ];
+		} );
+	}
+} );
+
+jQuery.extend( {
+	prop: function( elem, name, value ) {
+		var ret, hooks,
+			nType = elem.nodeType;
+
+		// Don't get/set properties on text, comment and attribute nodes
+		if ( nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
+
+		if ( value !== undefined ) {
+			if ( hooks && "set" in hooks &&
+				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
+				return ret;
+			}
+
+			return ( elem[ name ] = value );
+		}
+
+		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
+			return ret;
+		}
+
+		return elem[ name ];
+	},
+
+	propHooks: {
+		tabIndex: {
+			get: function( elem ) {
+
+				// Support: IE <=9 - 11 only
+				// elem.tabIndex doesn't always return the
+				// correct value when it hasn't been explicitly set
+				// https://web.archive.org/web/20141116233347/http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				// Use proper attribute retrieval(#12072)
+				var tabindex = jQuery.find.attr( elem, "tabindex" );
+
+				if ( tabindex ) {
+					return parseInt( tabindex, 10 );
+				}
+
+				if (
+					rfocusable.test( elem.nodeName ) ||
+					rclickable.test( elem.nodeName ) &&
+					elem.href
+				) {
+					return 0;
+				}
+
+				return -1;
+			}
+		}
+	},
+
+	propFix: {
+		"for": "htmlFor",
+		"class": "className"
+	}
+} );
+
+// Support: IE <=11 only
+// Accessing the selectedIndex property
+// forces the browser to respect setting selected
+// on the option
+// The getter ensures a default option is selected
+// when in an optgroup
+// eslint rule "no-unused-expressions" is disabled for this code
+// since it considers such accessions noop
+if ( !support.optSelected ) {
+	jQuery.propHooks.selected = {
+		get: function( elem ) {
+
+			/* eslint no-unused-expressions: "off" */
+
+			var parent = elem.parentNode;
+			if ( parent && parent.parentNode ) {
+				parent.parentNode.selectedIndex;
+			}
+			return null;
+		},
+		set: function( elem ) {
+
+			/* eslint no-unused-expressions: "off" */
+
+			var parent = elem.parentNode;
+			if ( parent ) {
+				parent.selectedIndex;
+
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+		}
+	};
+}
+
+jQuery.each( [
+	"tabIndex",
+	"readOnly",
+	"maxLength",
+	"cellSpacing",
+	"cellPadding",
+	"rowSpan",
+	"colSpan",
+	"useMap",
+	"frameBorder",
+	"contentEditable"
+], function() {
+	jQuery.propFix[ this.toLowerCase() ] = this;
+} );
+
+
+
+
+	// Strip and collapse whitespace according to HTML spec
+	// https://html.spec.whatwg.org/multipage/infrastructure.html#strip-and-collapse-whitespace
+	function stripAndCollapse( value ) {
+		var tokens = value.match( rnothtmlwhite ) || [];
+		return tokens.join( " " );
+	}
+
+
+function getClass( elem ) {
+	return elem.getAttribute && elem.getAttribute( "class" ) || "";
+}
+
+jQuery.fn.extend( {
+	addClass: function( value ) {
+		var classes, elem, cur, curValue, clazz, j, finalValue,
+			i = 0;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each( function( j ) {
+				jQuery( this ).addClass( value.call( this, j, getClass( this ) ) );
+			} );
+		}
+
+		if ( typeof value === "string" && value ) {
+			classes = value.match( rnothtmlwhite ) || [];
+
+			while ( ( elem = this[ i++ ] ) ) {
+				curValue = getClass( elem );
+				cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " );
+
+				if ( cur ) {
+					j = 0;
+					while ( ( clazz = classes[ j++ ] ) ) {
+						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
+							cur += clazz + " ";
+						}
+					}
+
+					// Only assign if different to avoid unneeded rendering.
+					finalValue = stripAndCollapse( cur );
+					if ( curValue !== finalValue ) {
+						elem.setAttribute( "class", finalValue );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		var classes, elem, cur, curValue, clazz, j, finalValue,
+			i = 0;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each( function( j ) {
+				jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) );
+			} );
+		}
+
+		if ( !arguments.length ) {
+			return this.attr( "class", "" );
+		}
+
+		if ( typeof value === "string" && value ) {
+			classes = value.match( rnothtmlwhite ) || [];
+
+			while ( ( elem = this[ i++ ] ) ) {
+				curValue = getClass( elem );
+
+				// This expression is here for better compressibility (see addClass)
+				cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " );
+
+				if ( cur ) {
+					j = 0;
+					while ( ( clazz = classes[ j++ ] ) ) {
+
+						// Remove *all* instances
+						while ( cur.indexOf( " " + clazz + " " ) > -1 ) {
+							cur = cur.replace( " " + clazz + " ", " " );
+						}
+					}
+
+					// Only assign if different to avoid unneeded rendering.
+					finalValue = stripAndCollapse( cur );
+					if ( curValue !== finalValue ) {
+						elem.setAttribute( "class", finalValue );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value;
+
+		if ( typeof stateVal === "boolean" && type === "string" ) {
+			return stateVal ? this.addClass( value ) : this.removeClass( value );
+		}
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each( function( i ) {
+				jQuery( this ).toggleClass(
+					value.call( this, i, getClass( this ), stateVal ),
+					stateVal
+				);
+			} );
+		}
+
+		return this.each( function() {
+			var className, i, self, classNames;
+
+			if ( type === "string" ) {
+
+				// Toggle individual class names
+				i = 0;
+				self = jQuery( this );
+				classNames = value.match( rnothtmlwhite ) || [];
+
+				while ( ( className = classNames[ i++ ] ) ) {
+
+					// Check each className given, space separated list
+					if ( self.hasClass( className ) ) {
+						self.removeClass( className );
+					} else {
+						self.addClass( className );
+					}
+				}
+
+			// Toggle whole class name
+			} else if ( value === undefined || type === "boolean" ) {
+				className = getClass( this );
+				if ( className ) {
+
+					// Store className if set
+					dataPriv.set( this, "__className__", className );
+				}
+
+				// If the element has a class name or if we're passed `false`,
+				// then remove the whole classname (if there was one, the above saved it).
+				// Otherwise bring back whatever was previously saved (if anything),
+				// falling back to the empty string if nothing was stored.
+				if ( this.setAttribute ) {
+					this.setAttribute( "class",
+						className || value === false ?
+						"" :
+						dataPriv.get( this, "__className__" ) || ""
+					);
+				}
+			}
+		} );
+	},
+
+	hasClass: function( selector ) {
+		var className, elem,
+			i = 0;
+
+		className = " " + selector + " ";
+		while ( ( elem = this[ i++ ] ) ) {
+			if ( elem.nodeType === 1 &&
+				( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) {
+					return true;
+			}
+		}
+
+		return false;
+	}
+} );
+
+
+
+
+var rreturn = /\r/g;
+
+jQuery.fn.extend( {
+	val: function( value ) {
+		var hooks, ret, isFunction,
+			elem = this[ 0 ];
+
+		if ( !arguments.length ) {
+			if ( elem ) {
+				hooks = jQuery.valHooks[ elem.type ] ||
+					jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+				if ( hooks &&
+					"get" in hooks &&
+					( ret = hooks.get( elem, "value" ) ) !== undefined
+				) {
+					return ret;
+				}
+
+				ret = elem.value;
+
+				// Handle most common string cases
+				if ( typeof ret === "string" ) {
+					return ret.replace( rreturn, "" );
+				}
+
+				// Handle cases where value is null/undef or number
+				return ret == null ? "" : ret;
+			}
+
+			return;
+		}
+
+		isFunction = jQuery.isFunction( value );
+
+		return this.each( function( i ) {
+			var val;
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call( this, i, jQuery( this ).val() );
+			} else {
+				val = value;
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+
+			} else if ( typeof val === "number" ) {
+				val += "";
+
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map( val, function( value ) {
+					return value == null ? "" : value + "";
+				} );
+			}
+
+			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) {
+				this.value = val;
+			}
+		} );
+	}
+} );
+
+jQuery.extend( {
+	valHooks: {
+		option: {
+			get: function( elem ) {
+
+				var val = jQuery.find.attr( elem, "value" );
+				return val != null ?
+					val :
+
+					// Support: IE <=10 - 11 only
+					// option.text throws exceptions (#14686, #14858)
+					// Strip and collapse whitespace
+					// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
+					stripAndCollapse( jQuery.text( elem ) );
+			}
+		},
+		select: {
+			get: function( elem ) {
+				var value, option, i,
+					options = elem.options,
+					index = elem.selectedIndex,
+					one = elem.type === "select-one",
+					values = one ? null : [],
+					max = one ? index + 1 : options.length;
+
+				if ( index < 0 ) {
+					i = max;
+
+				} else {
+					i = one ? index : 0;
+				}
+
+				// Loop through all the selected options
+				for ( ; i < max; i++ ) {
+					option = options[ i ];
+
+					// Support: IE <=9 only
+					// IE8-9 doesn't update selected after form reset (#2551)
+					if ( ( option.selected || i === index ) &&
+
+							// Don't return options that are disabled or in a disabled optgroup
+							!option.disabled &&
+							( !option.parentNode.disabled ||
+								!jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				return values;
+			},
+
+			set: function( elem, value ) {
+				var optionSet, option,
+					options = elem.options,
+					values = jQuery.makeArray( value ),
+					i = options.length;
+
+				while ( i-- ) {
+					option = options[ i ];
+
+					/* eslint-disable no-cond-assign */
+
+					if ( option.selected =
+						jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1
+					) {
+						optionSet = true;
+					}
+
+					/* eslint-enable no-cond-assign */
+				}
+
+				// Force browsers to behave consistently when non-matching value is set
+				if ( !optionSet ) {
+					elem.selectedIndex = -1;
+				}
+				return values;
+			}
+		}
+	}
+} );
+
+// Radios and checkboxes getter/setter
+jQuery.each( [ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = {
+		set: function( elem, value ) {
+			if ( jQuery.isArray( value ) ) {
+				return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 );
+			}
+		}
+	};
+	if ( !support.checkOn ) {
+		jQuery.valHooks[ this ].get = function( elem ) {
+			return elem.getAttribute( "value" ) === null ? "on" : elem.value;
+		};
+	}
+} );
+
+
+
+
+// Return jQuery for attributes-only inclusion
+
+
+var rfocusMorph = /^(?:focusinfocus|focusoutblur)$/;
+
+jQuery.extend( jQuery.event, {
+
 	trigger: function( event, data, elem, onlyHandlers ) {
-		var handle, ontype, cur,
-			bubbleType, special, tmp, i,
+
+		var i, cur, tmp, bubbleType, ontype, handle, special,
 			eventPath = [ elem || document ],
 			type = hasOwn.call( event, "type" ) ? event.type : event,
 			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : [];
@@ -5124,9 +8165,8 @@ jQuery.event = {
 				special.bindType || type;
 
 			// jQuery handler
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] &&
-				jQuery._data( cur, "handle" );
-
+			handle = ( dataPriv.get( cur, "events" ) || {} )[ event.type ] &&
+				dataPriv.get( cur, "handle" );
 			if ( handle ) {
 				handle.apply( cur, data );
 			}
@@ -5145,16 +8185,13 @@ jQuery.event = {
 		// If nobody prevented the default action, do it now
 		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
 
-			if (
-				( !special._default ||
-				 special._default.apply( eventPath.pop(), data ) === false
-				) && acceptData( elem )
-			) {
+			if ( ( !special._default ||
+				special._default.apply( eventPath.pop(), data ) === false ) &&
+				acceptData( elem ) ) {
 
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
+				// Call a native DOM method on the target with the same name as the event.
 				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
+				if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) {
 
 					// Don't re-trigger an onFOO event when we call its FOO() method
 					tmp = elem[ ontype ];
@@ -5165,13 +8202,7 @@ jQuery.event = {
 
 					// Prevent re-triggering of the same event, since we already bubbled it above
 					jQuery.event.triggered = type;
-					try {
-						elem[ type ]();
-					} catch ( e ) {
-
-						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
-						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
-					}
+					elem[ type ]();
 					jQuery.event.triggered = undefined;
 
 					if ( tmp ) {
@@ -5184,285 +8215,8 @@ jQuery.event = {
 		return event.result;
 	},
 
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, j, ret, matched, handleObj,
-			handlerQueue = [],
-			args = slice.call( arguments ),
-			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[ 0 ] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( ( handleObj = matched.handlers[ j++ ] ) &&
-				!event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
-				// a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
-						handleObj.handler ).apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( ( event.result = ret ) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var i, matches, sel, handleObj,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Support (at least): Chrome, IE9
-		// Find delegate handlers
-		// Black-hole SVG <use> instance trees (#13180)
-		//
-		// Support: Firefox<=42+
-		// Avoid non-left-click in FF but don't block IE radio events (#3861, gh-2343)
-		if ( delegateCount && cur.nodeType &&
-			( event.type !== "click" || isNaN( event.button ) || event.button < 1 ) ) {
-
-			/* jshint eqeqeq: false */
-			for ( ; cur != this; cur = cur.parentNode || this ) {
-				/* jshint eqeqeq: true */
-
-				// Don't check non-elements (#13208)
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && ( cur.disabled !== true || event.type !== "click" ) ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) > -1 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push( { elem: cur, handlers: matches } );
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push( { elem: this, handlers: handlers.slice( delegateCount ) } );
-		}
-
-		return handlerQueue;
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: IE<9
-		// Fix target property (#1925)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Support: Safari 6-8+
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Support: IE<9
-		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
-		event.metaKey = !!event.metaKey;
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: ( "altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " +
-		"metaKey relatedTarget shiftKey target timeStamp view which" ).split( " " ),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split( " " ),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: ( "button buttons clientX clientY fromElement offsetX offsetY " +
-			"pageX pageY screenX screenY toElement" ).split( " " ),
-		filter: function( event, original ) {
-			var body, eventDoc, doc,
-				button = original.button,
-				fromElement = original.fromElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX +
-					( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) -
-					( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY +
-					( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) -
-					( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ?
-					original.toElement :
-					fromElement;
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	special: {
-		load: {
-
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		focus: {
-
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					try {
-						this.focus();
-						return false;
-					} catch ( e ) {
-
-						// Support: IE<9
-						// If we error on focus to hidden element (#1486, #12518),
-						// let .trigger() run the handlers
-					}
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-		click: {
-
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
-					this.click();
-					return false;
-				}
-			},
-
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Support: Firefox 20+
-				// Firefox doesn't alert if the returnValue field is not set.
-				if ( event.result !== undefined && event.originalEvent ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
 	// Piggyback on a donor event to simulate a different one
+	// Used only for `focus(in | out)` events
 	simulate: function( type, elem, event ) {
 		var e = jQuery.extend(
 			new jQuery.Event(),
@@ -5470,392 +8224,16 @@ jQuery.event = {
 			{
 				type: type,
 				isSimulated: true
-
-				// Previously, `originalEvent: {}` was set here, so stopPropagation call
-				// would not be triggered on donor event, since in our own
-				// jQuery.event.stopPropagation function we had a check for existence of
-				// originalEvent.stopPropagation method, so, consequently it would be a noop.
-				//
-				// Guard for simulated events was moved to jQuery.event.stopPropagation function
-				// since `originalEvent` should point to the original event for the
-				// constancy with other events and for more focused logic
 			}
 		);
 
 		jQuery.event.trigger( e, null, elem );
-
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-
-		// This "if" is needed for plain objects
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle );
-		}
-	} :
-	function( elem, type, handle ) {
-		var name = "on" + type;
-
-		if ( elem.detachEvent ) {
-
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8
-			// detachEvent needed property on element, by name of that event,
-			// to properly expose it to GC
-			if ( typeof elem[ name ] === "undefined" ) {
-				elem[ name ] = null;
-			}
-
-			elem.detachEvent( name, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-
-	// Allow instantiation without the 'new' keyword
-	if ( !( this instanceof jQuery.Event ) ) {
-		return new jQuery.Event( src, props );
 	}
 
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = src.defaultPrevented ||
-				src.defaultPrevented === undefined &&
-
-				// Support: IE < 9, Android < 4.0
-				src.returnValue === false ?
-			returnTrue :
-			returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	constructor: jQuery.Event,
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-		if ( !e ) {
-			return;
-		}
-
-		// If preventDefault exists, run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// Support: IE
-		// Otherwise set the returnValue property of the original event to false
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-
-		if ( !e || this.isSimulated ) {
-			return;
-		}
-
-		// If stopPropagation exists, run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-
-		// Support: IE
-		// Set the cancelBubble property of the original event to true
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		var e = this.originalEvent;
-
-		this.isImmediatePropagationStopped = returnTrue;
-
-		if ( e && e.stopImmediatePropagation ) {
-			e.stopImmediatePropagation();
-		}
-
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-// so that event delegation works in jQuery.
-// Do the same for pointerenter/pointerleave and pointerover/pointerout
-//
-// Support: Safari 7 only
-// Safari sends mouseenter too often; see:
-// https://code.google.com/p/chromium/issues/detail?id=470258
-// for the description of the bug (it existed in older Chrome versions as well).
-jQuery.each( {
-	mouseenter: "mouseover",
-	mouseleave: "mouseout",
-	pointerenter: "pointerover",
-	pointerleave: "pointerout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mouseenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
 } );
 
-// IE submit delegation
-if ( !support.submit ) {
-
-	jQuery.event.special.submit = {
-		setup: function() {
-
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ?
-
-						// Support: IE <=8
-						// We use jQuery.prop instead of elem.form
-						// to allow fixing the IE8 delegated submit issue (gh-2332)
-						// by 3rd party polyfills/workarounds.
-						jQuery.prop( elem, "form" ) :
-						undefined;
-
-				if ( form && !jQuery._data( form, "submit" ) ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submitBubble = true;
-					} );
-					jQuery._data( form, "submit", true );
-				}
-			} );
-
-			// return undefined since we don't need an event listener
-		},
-
-		postDispatch: function( event ) {
-
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submitBubble ) {
-				delete event._submitBubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event );
-				}
-			}
-		},
-
-		teardown: function() {
-
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
-		}
-	};
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !support.change ) {
-
-	jQuery.event.special.change = {
-
-		setup: function() {
-
-			if ( rformElems.test( this.nodeName ) ) {
-
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._justChanged = true;
-						}
-					} );
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._justChanged && !event.isTrigger ) {
-							this._justChanged = false;
-						}
-
-						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event );
-					} );
-				}
-				return false;
-			}
-
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
-
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "change" ) ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event );
-						}
-					} );
-					jQuery._data( elem, "change", true );
-				}
-			} );
-		},
-
-		handle: function( event ) {
-			var elem = event.target;
-
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger ||
-				( elem.type !== "radio" && elem.type !== "checkbox" ) ) {
-
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
-
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
-
-			return !rformElems.test( this.nodeName );
-		}
-	};
-}
-
-// Support: Firefox
-// Firefox doesn't have focus(in | out) events
-// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
-//
-// Support: Chrome, Safari
-// focus(in | out) events fire after focus & blur events,
-// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
-// Related ticket - https://code.google.com/p/chromium/issues/detail?id=449857
-if ( !support.focusin ) {
-	jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler on the document while someone wants focusin/focusout
-		var handler = function( event ) {
-			jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) );
-		};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				var doc = this.ownerDocument || this,
-					attaches = jQuery._data( doc, fix );
-
-				if ( !attaches ) {
-					doc.addEventListener( orig, handler, true );
-				}
-				jQuery._data( doc, fix, ( attaches || 0 ) + 1 );
-			},
-			teardown: function() {
-				var doc = this.ownerDocument || this,
-					attaches = jQuery._data( doc, fix ) - 1;
-
-				if ( !attaches ) {
-					doc.removeEventListener( orig, handler, true );
-					jQuery._removeData( doc, fix );
-				} else {
-					jQuery._data( doc, fix, attaches );
-				}
-			}
-		};
-	} );
-}
-
 jQuery.fn.extend( {
 
-	on: function( types, selector, data, fn ) {
-		return on( this, types, selector, data, fn );
-	},
-	one: function( types, selector, data, fn ) {
-		return on( this, types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ?
-					handleObj.origType + "." + handleObj.namespace :
-					handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each( function() {
-			jQuery.event.remove( this, types, fn, selector );
-		} );
-	},
-
 	trigger: function( type, data ) {
 		return this.each( function() {
 			jQuery.event.trigger( type, data, this );
@@ -5870,3104 +8248,9 @@ jQuery.fn.extend( {
 } );
 
 
-var rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rnoshimcache = new RegExp( "<(?:" + nodeNames + ")[\\s/>]", "i" ),
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
-
-	// Support: IE 10-11, Edge 10240+
-	// In IE/Edge using regex groups here causes severe slowdowns.
-	// See https://connect.microsoft.com/IE/feedback/details/1736512/
-	rnoInnerhtml = /<script|<style|<link/i,
-
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
-	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement( "div" ) );
-
-// Support: IE<8
-// Manipulating tables requires a tbody
-function manipulationTarget( elem, content ) {
-	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
-
-		elem.getElementsByTagName( "tbody" )[ 0 ] ||
-			elem.appendChild( elem.ownerDocument.createElement( "tbody" ) ) :
-		elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = ( jQuery.find.attr( elem, "type" ) !== null ) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-	if ( match ) {
-		elem.type = match[ 1 ];
-	} else {
-		elem.removeAttribute( "type" );
-	}
-	return elem;
-}
-
-function cloneCopyEvent( src, dest ) {
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
-
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
-
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
-			}
-		}
-	}
-
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
-
-function fixCloneNodeIssues( src, dest ) {
-	var nodeName, e, data;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	// IE6-8 copies events bound via attachEvent when using cloneNode.
-	if ( !support.noCloneEvent && dest[ jQuery.expando ] ) {
-		data = jQuery._data( dest );
-
-		for ( e in data.events ) {
-			jQuery.removeEvent( dest, e, data.handle );
-		}
-
-		// Event data gets referenced instead of copied if the expando gets copied too
-		dest.removeAttribute( jQuery.expando );
-	}
-
-	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
-	if ( nodeName === "script" && dest.text !== src.text ) {
-		disableScript( dest ).text = src.text;
-		restoreScript( dest );
-
-	// IE6-10 improperly clones children of object elements using classid.
-	// IE10 throws NoModificationAllowedError if parent is null, #12132.
-	} else if ( nodeName === "object" ) {
-		if ( dest.parentNode ) {
-			dest.outerHTML = src.outerHTML;
-		}
-
-		// This path appears unavoidable for IE9. When cloning an object
-		// element in IE9, the outerHTML strategy above is not sufficient.
-		// If the src has innerHTML and the destination does not,
-		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( support.html5Clone && ( src.innerHTML && !jQuery.trim( dest.innerHTML ) ) ) {
-			dest.innerHTML = src.innerHTML;
-		}
-
-	} else if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-
-		dest.defaultChecked = dest.checked = src.checked;
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.defaultSelected = dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-function domManip( collection, args, callback, ignored ) {
-
-	// Flatten any nested arrays
-	args = concat.apply( [], args );
-
-	var first, node, hasScripts,
-		scripts, doc, fragment,
-		i = 0,
-		l = collection.length,
-		iNoClone = l - 1,
-		value = args[ 0 ],
-		isFunction = jQuery.isFunction( value );
-
-	// We can't cloneNode fragments that contain checked, in WebKit
-	if ( isFunction ||
-			( l > 1 && typeof value === "string" &&
-				!support.checkClone && rchecked.test( value ) ) ) {
-		return collection.each( function( index ) {
-			var self = collection.eq( index );
-			if ( isFunction ) {
-				args[ 0 ] = value.call( this, index, self.html() );
-			}
-			domManip( self, args, callback, ignored );
-		} );
-	}
-
-	if ( l ) {
-		fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored );
-		first = fragment.firstChild;
-
-		if ( fragment.childNodes.length === 1 ) {
-			fragment = first;
-		}
-
-		// Require either new content or an interest in ignored elements to invoke the callback
-		if ( first || ignored ) {
-			scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-			hasScripts = scripts.length;
-
-			// Use the original fragment for the last item
-			// instead of the first because it can end up
-			// being emptied incorrectly in certain situations (#8070).
-			for ( ; i < l; i++ ) {
-				node = fragment;
-
-				if ( i !== iNoClone ) {
-					node = jQuery.clone( node, true, true );
-
-					// Keep references to cloned scripts for later restoration
-					if ( hasScripts ) {
-
-						// Support: Android<4.1, PhantomJS<2
-						// push.apply(_, arraylike) throws on ancient WebKit
-						jQuery.merge( scripts, getAll( node, "script" ) );
-					}
-				}
-
-				callback.call( collection[ i ], node, i );
-			}
-
-			if ( hasScripts ) {
-				doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-				// Reenable scripts
-				jQuery.map( scripts, restoreScript );
-
-				// Evaluate executable scripts on first document insertion
-				for ( i = 0; i < hasScripts; i++ ) {
-					node = scripts[ i ];
-					if ( rscriptType.test( node.type || "" ) &&
-						!jQuery._data( node, "globalEval" ) &&
-						jQuery.contains( doc, node ) ) {
-
-						if ( node.src ) {
-
-							// Optional AJAX dependency, but won't run scripts if not present
-							if ( jQuery._evalUrl ) {
-								jQuery._evalUrl( node.src );
-							}
-						} else {
-							jQuery.globalEval(
-								( node.text || node.textContent || node.innerHTML || "" )
-									.replace( rcleanScript, "" )
-							);
-						}
-					}
-				}
-			}
-
-			// Fix #11809: Avoid leaking memory
-			fragment = first = null;
-		}
-	}
-
-	return collection;
-}
-
-function remove( elem, selector, keepData ) {
-	var node,
-		elems = selector ? jQuery.filter( selector, elem ) : elem,
-		i = 0;
-
-	for ( ; ( node = elems[ i ] ) != null; i++ ) {
-
-		if ( !keepData && node.nodeType === 1 ) {
-			jQuery.cleanData( getAll( node ) );
-		}
-
-		if ( node.parentNode ) {
-			if ( keepData && jQuery.contains( node.ownerDocument, node ) ) {
-				setGlobalEval( getAll( node, "script" ) );
-			}
-			node.parentNode.removeChild( node );
-		}
-	}
-
-	return elem;
-}
-
-jQuery.extend( {
-	htmlPrefilter: function( html ) {
-		return html.replace( rxhtmlTag, "<$1></$2>" );
-	},
-
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var destElements, node, clone, i, srcElements,
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		if ( support.html5Clone || jQuery.isXMLDoc( elem ) ||
-			!rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-
-			clone = elem.cloneNode( true );
-
-		// IE<=8 does not properly clone detached, unknown element nodes
-		} else {
-			fragmentDiv.innerHTML = elem.outerHTML;
-			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-		}
-
-		if ( ( !support.noCloneEvent || !support.noCloneChecked ) &&
-				( elem.nodeType === 1 || elem.nodeType === 11 ) && !jQuery.isXMLDoc( elem ) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			// Fix all IE cloning issues
-			for ( i = 0; ( node = srcElements[ i ] ) != null; ++i ) {
-
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[ i ] ) {
-					fixCloneNodeIssues( node, destElements[ i ] );
-				}
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0; ( node = srcElements[ i ] ) != null; i++ ) {
-					cloneCopyEvent( node, destElements[ i ] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		destElements = srcElements = node = null;
-
-		// Return the cloned set
-		return clone;
-	},
-
-	cleanData: function( elems, /* internal */ forceAcceptData ) {
-		var elem, type, id, data,
-			i = 0,
-			internalKey = jQuery.expando,
-			cache = jQuery.cache,
-			attributes = support.attributes,
-			special = jQuery.event.special;
-
-		for ( ; ( elem = elems[ i ] ) != null; i++ ) {
-			if ( forceAcceptData || acceptData( elem ) ) {
-
-				id = elem[ internalKey ];
-				data = id && cache[ id ];
-
-				if ( data ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Remove cache only if it was not already removed by jQuery.event.remove
-					if ( cache[ id ] ) {
-
-						delete cache[ id ];
-
-						// Support: IE<9
-						// IE does not allow us to delete expando properties from nodes
-						// IE creates expando attributes along with the property
-						// IE does not have a removeAttribute function on Document nodes
-						if ( !attributes && typeof elem.removeAttribute !== "undefined" ) {
-							elem.removeAttribute( internalKey );
-
-						// Webkit & Blink performance suffers when deleting properties
-						// from DOM nodes, so set to undefined instead
-						// https://code.google.com/p/chromium/issues/detail?id=378607
-						} else {
-							elem[ internalKey ] = undefined;
-						}
-
-						deletedIds.push( id );
-					}
-				}
-			}
-		}
-	}
-} );
-
-jQuery.fn.extend( {
-
-	// Keep domManip exposed until 3.0 (gh-2225)
-	domManip: domManip,
-
-	detach: function( selector ) {
-		return remove( this, selector, true );
-	},
-
-	remove: function( selector ) {
-		return remove( this, selector );
-	},
-
-	text: function( value ) {
-		return access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append(
-					( this[ 0 ] && this[ 0 ].ownerDocument || document ).createTextNode( value )
-				);
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		} );
-	},
-
-	prepend: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		} );
-	},
-
-	before: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		} );
-	},
-
-	after: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		} );
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; ( elem = this[ i ] ) != null; i++ ) {
-
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem, false ) );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-
-			// If this is a select, ensure that it displays empty (#12336)
-			// Support: IE<9
-			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
-				elem.options.length = 0;
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function() {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		} );
-	},
-
-	html: function( value ) {
-		return access( this, function( value ) {
-			var elem = this[ 0 ] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
-
-				value = jQuery.htmlPrefilter( value );
-
-				try {
-					for ( ; i < l; i++ ) {
-
-						// Remove element nodes and prevent memory leaks
-						elem = this[ i ] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch ( e ) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var ignored = [];
-
-		// Make the changes, replacing each non-ignored context element with the new content
-		return domManip( this, arguments, function( elem ) {
-			var parent = this.parentNode;
-
-			if ( jQuery.inArray( this, ignored ) < 0 ) {
-				jQuery.cleanData( getAll( this ) );
-				if ( parent ) {
-					parent.replaceChild( elem, this );
-				}
-			}
-
-		// Force callback invocation
-		}, ignored );
-	}
-} );
-
-jQuery.each( {
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone( true );
-			jQuery( insert[ i ] )[ original ]( elems );
-
-			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
-			push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-} );
-
-
-var iframe,
-	elemdisplay = {
-
-		// Support: Firefox
-		// We have to pre-define these values for FF (#10227)
-		HTML: "block",
-		BODY: "block"
-	};
-
-/**
- * Retrieve the actual display of a element
- * @param {String} name nodeName of the element
- * @param {Object} doc Document object
- */
-
-// Called only from within defaultDisplay
-function actualDisplay( name, doc ) {
-	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-
-		display = jQuery.css( elem[ 0 ], "display" );
-
-	// We don't have any data stored on the element,
-	// so use "detach" method as fast way to get rid of the element
-	elem.detach();
-
-	return display;
-}
-
-/**
- * Try to determine the default display value of an element
- * @param {String} nodeName
- */
-function defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-
-			// Use the already-created iframe if possible
-			iframe = ( iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" ) )
-				.appendTo( doc.documentElement );
-
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = ( iframe[ 0 ].contentWindow || iframe[ 0 ].contentDocument ).document;
-
-			// Support: IE
-			doc.write();
-			doc.close();
-
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return display;
-}
-var rmargin = ( /^margin/ );
-
-var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
-
-var swap = function( elem, options, callback, args ) {
-	var ret, name,
-		old = {};
-
-	// Remember the old values, and insert the new ones
-	for ( name in options ) {
-		old[ name ] = elem.style[ name ];
-		elem.style[ name ] = options[ name ];
-	}
-
-	ret = callback.apply( elem, args || [] );
-
-	// Revert the old values
-	for ( name in options ) {
-		elem.style[ name ] = old[ name ];
-	}
-
-	return ret;
-};
-
-
-var documentElement = document.documentElement;
-
-
-
-( function() {
-	var pixelPositionVal, pixelMarginRightVal, boxSizingReliableVal,
-		reliableHiddenOffsetsVal, reliableMarginRightVal, reliableMarginLeftVal,
-		container = document.createElement( "div" ),
-		div = document.createElement( "div" );
-
-	// Finish early in limited (non-browser) environments
-	if ( !div.style ) {
-		return;
-	}
-
-	div.style.cssText = "float:left;opacity:.5";
-
-	// Support: IE<9
-	// Make sure that element opacity exists (as opposed to filter)
-	support.opacity = div.style.opacity === "0.5";
-
-	// Verify style float existence
-	// (IE uses styleFloat instead of cssFloat)
-	support.cssFloat = !!div.style.cssFloat;
-
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	container = document.createElement( "div" );
-	container.style.cssText = "border:0;width:8px;height:0;top:0;left:-9999px;" +
-		"padding:0;margin-top:1px;position:absolute";
-	div.innerHTML = "";
-	container.appendChild( div );
-
-	// Support: Firefox<29, Android 2.3
-	// Vendor-prefix box-sizing
-	support.boxSizing = div.style.boxSizing === "" || div.style.MozBoxSizing === "" ||
-		div.style.WebkitBoxSizing === "";
-
-	jQuery.extend( support, {
-		reliableHiddenOffsets: function() {
-			if ( pixelPositionVal == null ) {
-				computeStyleTests();
-			}
-			return reliableHiddenOffsetsVal;
-		},
-
-		boxSizingReliable: function() {
-
-			// We're checking for pixelPositionVal here instead of boxSizingReliableVal
-			// since that compresses better and they're computed together anyway.
-			if ( pixelPositionVal == null ) {
-				computeStyleTests();
-			}
-			return boxSizingReliableVal;
-		},
-
-		pixelMarginRight: function() {
-
-			// Support: Android 4.0-4.3
-			if ( pixelPositionVal == null ) {
-				computeStyleTests();
-			}
-			return pixelMarginRightVal;
-		},
-
-		pixelPosition: function() {
-			if ( pixelPositionVal == null ) {
-				computeStyleTests();
-			}
-			return pixelPositionVal;
-		},
-
-		reliableMarginRight: function() {
-
-			// Support: Android 2.3
-			if ( pixelPositionVal == null ) {
-				computeStyleTests();
-			}
-			return reliableMarginRightVal;
-		},
-
-		reliableMarginLeft: function() {
-
-			// Support: IE <=8 only, Android 4.0 - 4.3 only, Firefox <=3 - 37
-			if ( pixelPositionVal == null ) {
-				computeStyleTests();
-			}
-			return reliableMarginLeftVal;
-		}
-	} );
-
-	function computeStyleTests() {
-		var contents, divStyle,
-			documentElement = document.documentElement;
-
-		// Setup
-		documentElement.appendChild( container );
-
-		div.style.cssText =
-
-			// Support: Android 2.3
-			// Vendor-prefix box-sizing
-			"-webkit-box-sizing:border-box;box-sizing:border-box;" +
-			"position:relative;display:block;" +
-			"margin:auto;border:1px;padding:1px;" +
-			"top:1%;width:50%";
-
-		// Support: IE<9
-		// Assume reasonable values in the absence of getComputedStyle
-		pixelPositionVal = boxSizingReliableVal = reliableMarginLeftVal = false;
-		pixelMarginRightVal = reliableMarginRightVal = true;
-
-		// Check for getComputedStyle so that this code is not run in IE<9.
-		if ( window.getComputedStyle ) {
-			divStyle = window.getComputedStyle( div );
-			pixelPositionVal = ( divStyle || {} ).top !== "1%";
-			reliableMarginLeftVal = ( divStyle || {} ).marginLeft === "2px";
-			boxSizingReliableVal = ( divStyle || { width: "4px" } ).width === "4px";
-
-			// Support: Android 4.0 - 4.3 only
-			// Some styles come back with percentage values, even though they shouldn't
-			div.style.marginRight = "50%";
-			pixelMarginRightVal = ( divStyle || { marginRight: "4px" } ).marginRight === "4px";
-
-			// Support: Android 2.3 only
-			// Div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container (#3333)
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			contents = div.appendChild( document.createElement( "div" ) );
-
-			// Reset CSS: box-sizing; display; margin; border; padding
-			contents.style.cssText = div.style.cssText =
-
-				// Support: Android 2.3
-				// Vendor-prefix box-sizing
-				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
-				"box-sizing:content-box;display:block;margin:0;border:0;padding:0";
-			contents.style.marginRight = contents.style.width = "0";
-			div.style.width = "1px";
-
-			reliableMarginRightVal =
-				!parseFloat( ( window.getComputedStyle( contents ) || {} ).marginRight );
-
-			div.removeChild( contents );
-		}
-
-		// Support: IE6-8
-		// First check that getClientRects works as expected
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		div.style.display = "none";
-		reliableHiddenOffsetsVal = div.getClientRects().length === 0;
-		if ( reliableHiddenOffsetsVal ) {
-			div.style.display = "";
-			div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
-			contents = div.getElementsByTagName( "td" );
-			contents[ 0 ].style.cssText = "margin:0;border:0;padding:0;display:none";
-			reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
-			if ( reliableHiddenOffsetsVal ) {
-				contents[ 0 ].style.display = "";
-				contents[ 1 ].style.display = "none";
-				reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
-			}
-		}
-
-		// Teardown
-		documentElement.removeChild( container );
-	}
-
-} )();
-
-
-var getStyles, curCSS,
-	rposition = /^(top|right|bottom|left)$/;
-
-if ( window.getComputedStyle ) {
-	getStyles = function( elem ) {
-
-		// Support: IE<=11+, Firefox<=30+ (#15098, #14150)
-		// IE throws on elements created in popups
-		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
-		var view = elem.ownerDocument.defaultView;
-
-		if ( !view.opener ) {
-			view = window;
-		}
-
-		return view.getComputedStyle( elem );
-	};
-
-	curCSS = function( elem, name, computed ) {
-		var width, minWidth, maxWidth, ret,
-			style = elem.style;
-
-		computed = computed || getStyles( elem );
-
-		// getPropertyValue is only needed for .css('filter') in IE9, see #12537
-		ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined;
-
-		if ( computed ) {
-
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value"
-			// instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values,
-			// but width seems to be reliably pixels
-			// this is against the CSSOM draft spec:
-			// http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( !support.pixelMarginRight() && rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-				// Remember the original values
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
-
-				// Put in the new values to get a computed value out
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
-
-				// Revert the changed values
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
-			}
-		}
-
-		// Support: IE
-		// IE returns zIndex value as an integer.
-		return ret === undefined ?
-			ret :
-			ret + "";
-	};
-} else if ( documentElement.currentStyle ) {
-	getStyles = function( elem ) {
-		return elem.currentStyle;
-	};
-
-	curCSS = function( elem, name, computed ) {
-		var left, rs, rsLeft, ret,
-			style = elem.style;
-
-		computed = computed || getStyles( elem );
-		ret = computed ? computed[ name ] : undefined;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are
-		// proportional to the parent element instead
-		// and we can't measure the parent instead because it
-		// might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rs = elem.runtimeStyle;
-			rsLeft = rs && rs.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				rs.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				rs.left = rsLeft;
-			}
-		}
-
-		// Support: IE
-		// IE returns zIndex value as an integer.
-		return ret === undefined ?
-			ret :
-			ret + "" || "auto";
-	};
-}
-
-
-
-
-function addGetHookIf( conditionFn, hookFn ) {
-
-	// Define the hook, we'll check on the first run if it's really needed.
-	return {
-		get: function() {
-			if ( conditionFn() ) {
-
-				// Hook not needed (or it's not possible to use it due
-				// to missing dependency), remove it.
-				delete this.get;
-				return;
-			}
-
-			// Hook needed; redefine it so that the support test is not executed again.
-			return ( this.get = hookFn ).apply( this, arguments );
-		}
-	};
-}
-
-
-var
-
-		ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity\s*=\s*([^)]*)/i,
-
-	// swappable if display is none or starts with table except
-	// "table", "table-cell", or "table-caption"
-	// see here for display values:
-	// https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rnumsplit = new RegExp( "^(" + pnum + ")(.*)$", "i" ),
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: "0",
-		fontWeight: "400"
-	},
-
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ],
-	emptyStyle = document.createElement( "div" ).style;
-
-
-// return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( name ) {
-
-	// shortcut for names that are not vendor prefixed
-	if ( name in emptyStyle ) {
-		return name;
-	}
-
-	// check for vendor prefixed names
-	var capName = name.charAt( 0 ).toUpperCase() + name.slice( 1 ),
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in emptyStyle ) {
-			return name;
-		}
-	}
-}
-
-function showHide( elements, show ) {
-	var display, elem, hidden,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		values[ index ] = jQuery._data( elem, "olddisplay" );
-		display = elem.style.display;
-		if ( show ) {
-
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] =
-					jQuery._data( elem, "olddisplay", defaultDisplay( elem.nodeName ) );
-			}
-		} else {
-			hidden = isHidden( elem );
-
-			if ( display && display !== "none" || !hidden ) {
-				jQuery._data(
-					elem,
-					"olddisplay",
-					hidden ? display : jQuery.css( elem, "display" )
-				);
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-
-		// If we already have the right measurement, avoid augmentation
-		4 :
-
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-
-			// at this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = support.boxSizing &&
-			jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// Support: IE11 only
-	// In IE 11 fullscreen elements inside of an iframe have
-	// 100x too small dimensions (gh-1764).
-	if ( document.msFullscreenElement && window.top !== window ) {
-
-		// Support: IE11 only
-		// Running getBoundingClientRect on a disconnected node
-		// in IE throws an error.
-		if ( elem.getClientRects().length ) {
-			val = Math.round( elem.getBoundingClientRect()[ name ] * 100 );
-		}
-	}
-
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test( val ) ) {
-			return val;
-		}
-
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox &&
-			( support.boxSizingReliable() || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-jQuery.extend( {
-
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"animationIterationCount": true,
-		"columnCount": true,
-		"fillOpacity": true,
-		"flexGrow": true,
-		"flexShrink": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-
-		// normalize float css property
-		"float": support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] ||
-			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// Convert "+=" or "-=" to relative numbers (#7345)
-			if ( type === "string" && ( ret = rcssNum.exec( value ) ) && ret[ 1 ] ) {
-				value = adjustCSS( elem, name, ret );
-
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that null and NaN values aren't set. See: #7116
-			if ( value == null || value !== value ) {
-				return;
-			}
-
-			// If a number was passed in, add the unit (except for certain CSS properties)
-			if ( type === "number" ) {
-				value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" );
-			}
-
-			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
-			// but it would mean to define eight
-			// (for every problematic property) identical functions
-			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !( "set" in hooks ) ||
-				( value = hooks.set( elem, value, extra ) ) !== undefined ) {
-
-				// Support: IE
-				// Swallow errors from 'invalid' CSS values (#5509)
-				try {
-					style[ name ] = value;
-				} catch ( e ) {}
-			}
-
-		} else {
-
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks &&
-				( ret = hooks.get( elem, false, extra ) ) !== undefined ) {
-
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var num, val, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] ||
-			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || isFinite( num ) ? num || 0 : val;
-		}
-		return val;
-	}
-} );
-
-jQuery.each( [ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-
-				// certain elements can have dimension info if we invisibly show them
-				// however, it must have a current display style that would benefit from this
-				return rdisplayswap.test( jQuery.css( elem, "display" ) ) &&
-					elem.offsetWidth === 0 ?
-						swap( elem, cssShow, function() {
-							return getWidthOrHeight( elem, name, extra );
-						} ) :
-						getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var styles = extra && getStyles( elem );
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					support.boxSizing &&
-						jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				) : 0
-			);
-		}
-	};
-} );
-
-if ( !support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-
-			// IE uses filters for opacity
-			return ropacity.test( ( computed && elem.currentStyle ?
-				elem.currentStyle.filter :
-				elem.style.filter ) || "" ) ?
-					( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
-					computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle,
-				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// if setting opacity to 1, and no other filters exist -
-			// attempt to remove filter attribute #6652
-			// if value === "", then remove inline opacity #12685
-			if ( ( value >= 1 || value === "" ) &&
-					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
-					style.removeAttribute ) {
-
-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-				// if "filter:" is present at all, clearType is disabled, we want to avoid this
-				// style.removeAttribute is IE Only, but so apparently is this code path...
-				style.removeAttribute( "filter" );
-
-				// if there is no filter style applied in a css rule
-				// or unset inline opacity, we are done
-				if ( value === "" || currentStyle && !currentStyle.filter ) {
-					return;
-				}
-			}
-
-			// otherwise, set new filter values
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
-	function( elem, computed ) {
-		if ( computed ) {
-			return swap( elem, { "display": "inline-block" },
-				curCSS, [ elem, "marginRight" ] );
-		}
-	}
-);
-
-jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
-	function( elem, computed ) {
-		if ( computed ) {
-			return (
-				parseFloat( curCSS( elem, "marginLeft" ) ) ||
-
-				// Support: IE<=11+
-				// Running getBoundingClientRect on a disconnected node in IE throws an error
-				// Support: IE8 only
-				// getClientRects() errors on disconnected elems
-				( jQuery.contains( elem.ownerDocument, elem ) ?
-					elem.getBoundingClientRect().left -
-						swap( elem, { marginLeft: 0 }, function() {
-							return elem.getBoundingClientRect().left;
-						} ) :
-					0
-				)
-			) + "px";
-		}
-	}
-);
-
-// These hooks are used by animate to expand properties
-jQuery.each( {
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// assumes a single number if not a string
-				parts = typeof value === "string" ? value.split( " " ) : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-} );
-
-jQuery.fn.extend( {
-	css: function( name, value ) {
-		return access( this, function( elem, name, value ) {
-			var styles, len,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		if ( typeof state === "boolean" ) {
-			return state ? this.show() : this.hide();
-		}
-
-		return this.each( function() {
-			if ( isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		} );
-	}
-} );
-
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || jQuery.easing._default;
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			// Use a property on the element directly when it is not a DOM element,
-			// or when there is no matching style property that exists.
-			if ( tween.elem.nodeType !== 1 ||
-				tween.elem[ tween.prop ] != null && tween.elem.style[ tween.prop ] == null ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails
-			// so, simple values such as "10px" are parsed to Float.
-			// complex values such as "rotate(1rad)" are returned as is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-
-			// use step hook for back compat - use cssHook if its there - use .style if its
-			// available and use plain properties where available
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.nodeType === 1 &&
-				( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null ||
-					jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Support: IE <=9
-// Panic based approach to setting things on disconnected nodes
-
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p * Math.PI ) / 2;
-	},
-	_default: "swing"
-};
-
-jQuery.fx = Tween.prototype.init;
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-
-
-
-var
-	fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rrun = /queueHooks$/;
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	window.setTimeout( function() {
-		fxNow = undefined;
-	} );
-	return ( fxNow = jQuery.now() );
-}
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		attrs = { height: type },
-		i = 0;
-
-	// if we include width, step value is 1 to do all cssExpand values,
-	// if we don't include width, step value is 2 to skip over Left and Right
-	includeWidth = includeWidth ? 1 : 0;
-	for ( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-function createTween( value, prop, animation ) {
-	var tween,
-		collection = ( Animation.tweeners[ prop ] || [] ).concat( Animation.tweeners[ "*" ] ),
-		index = 0,
-		length = collection.length;
-	for ( ; index < length; index++ ) {
-		if ( ( tween = collection[ index ].call( animation, prop, value ) ) ) {
-
-			// we're done with this property
-			return tween;
-		}
-	}
-}
-
-function defaultPrefilter( elem, props, opts ) {
-	/* jshint validthis: true */
-	var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
-		anim = this,
-		orig = {},
-		style = elem.style,
-		hidden = elem.nodeType && isHidden( elem ),
-		dataShow = jQuery._data( elem, "fxshow" );
-
-	// handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always( function() {
-
-			// doing this makes sure that the complete handler will be called
-			// before this completes
-			anim.always( function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			} );
-		} );
-	}
-
-	// height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE does not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		display = jQuery.css( elem, "display" );
-
-		// Test default display if display is currently "none"
-		checkDisplay = display === "none" ?
-			jQuery._data( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
-
-		if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
-
-			// inline-level elements accept inline-block;
-			// block-level elements need to be inline with layout
-			if ( !support.inlineBlockNeedsLayout || defaultDisplay( elem.nodeName ) === "inline" ) {
-				style.display = "inline-block";
-			} else {
-				style.zoom = 1;
-			}
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		if ( !support.shrinkWrapBlocks() ) {
-			anim.always( function() {
-				style.overflow = opts.overflow[ 0 ];
-				style.overflowX = opts.overflow[ 1 ];
-				style.overflowY = opts.overflow[ 2 ];
-			} );
-		}
-	}
-
-	// show/hide pass
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-
-				// If there is dataShow left over from a stopped hide or show
-				// and we are going to proceed with show, we should pretend to be hidden
-				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
-					hidden = true;
-				} else {
-					continue;
-				}
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-
-		// Any non-fx value stops us from restoring the original display value
-		} else {
-			display = undefined;
-		}
-	}
-
-	if ( !jQuery.isEmptyObject( orig ) ) {
-		if ( dataShow ) {
-			if ( "hidden" in dataShow ) {
-				hidden = dataShow.hidden;
-			}
-		} else {
-			dataShow = jQuery._data( elem, "fxshow", {} );
-		}
-
-		// store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done( function() {
-				jQuery( elem ).hide();
-			} );
-		}
-		anim.done( function() {
-			var prop;
-			jQuery._removeData( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		} );
-		for ( prop in orig ) {
-			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-
-	// If this is a noop like .hide().hide(), restore an overwritten display value
-	} else if ( ( display === "none" ? defaultDisplay( elem.nodeName ) : display ) === "inline" ) {
-		style.display = display;
-	}
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// not quite $.extend, this wont overwrite keys already present.
-			// also - reusing 'index' from above because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = Animation.prefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-
-			// don't match elem in the :animated selector
-			delete tick.elem;
-		} ),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-
-				// Support: Android 2.3
-				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ] );
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise( {
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, {
-				specialEasing: {},
-				easing: jQuery.easing._default
-			}, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-
-					// if we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// resolve when we played the last frame
-				// otherwise, reject
-				if ( gotoEnd ) {
-					deferred.notifyWith( elem, [ animation, 1, 0 ] );
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		} ),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			if ( jQuery.isFunction( result.stop ) ) {
-				jQuery._queueHooks( animation.elem, animation.opts.queue ).stop =
-					jQuery.proxy( result.stop, result );
-			}
-			return result;
-		}
-	}
-
-	jQuery.map( props, createTween, animation );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		} )
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-	tweeners: {
-		"*": [ function( prop, value ) {
-			var tween = this.createTween( prop, value );
-			adjustCSS( tween.elem, prop, rcssNum.exec( value ), tween );
-			return tween;
-		} ]
-	},
-
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.match( rnotwhite );
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || [];
-			Animation.tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilters: [ defaultPrefilter ],
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			Animation.prefilters.unshift( callback );
-		} else {
-			Animation.prefilters.push( callback );
-		}
-	}
-} );
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ?
-			jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.fn.extend( {
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// animate to the value specified
-			.end().animate( { opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations, or finishing resolves immediately
-				if ( empty || jQuery._data( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each( function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = jQuery._data( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this &&
-					( type == null || timers[ index ].queue === type ) ) {
-
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// start the next in the queue if the last step wasn't forced
-			// timers currently will call their complete callbacks, which will dequeue
-			// but only if they were gotoEnd
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		} );
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each( function() {
-			var index,
-				data = jQuery._data( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// enable finishing flag on private data
-			data.finish = true;
-
-			// empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.stop ) {
-				hooks.stop.call( this, true );
-			}
-
-			// look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// turn off finishing flag
-			delete data.finish;
-		} );
-	}
-} );
-
-jQuery.each( [ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-} );
-
-// Generate shortcuts for custom animations
-jQuery.each( {
-	slideDown: genFx( "show" ),
-	slideUp: genFx( "hide" ),
-	slideToggle: genFx( "toggle" ),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-} );
-
-jQuery.timers = [];
-jQuery.fx.tick = function() {
-	var timer,
-		timers = jQuery.timers,
-		i = 0;
-
-	fxNow = jQuery.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	jQuery.timers.push( timer );
-	if ( timer() ) {
-		jQuery.fx.start();
-	} else {
-		jQuery.timers.pop();
-	}
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = window.setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.stop = function() {
-	window.clearInterval( timerId );
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-
-	// Default speed
-	_default: 400
-};
-
-
-// Based off of the plugin by Clint Helfers, with permission.
-// http://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
-jQuery.fn.delay = function( time, type ) {
-	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-	type = type || "fx";
-
-	return this.queue( type, function( next, hooks ) {
-		var timeout = window.setTimeout( next, time );
-		hooks.stop = function() {
-			window.clearTimeout( timeout );
-		};
-	} );
-};
-
-
-( function() {
-	var a,
-		input = document.createElement( "input" ),
-		div = document.createElement( "div" ),
-		select = document.createElement( "select" ),
-		opt = select.appendChild( document.createElement( "option" ) );
-
-	// Setup
-	div = document.createElement( "div" );
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-	a = div.getElementsByTagName( "a" )[ 0 ];
-
-	// Support: Windows Web Apps (WWA)
-	// `type` must use .setAttribute for WWA (#14901)
-	input.setAttribute( "type", "checkbox" );
-	div.appendChild( input );
-
-	a = div.getElementsByTagName( "a" )[ 0 ];
-
-	// First batch of tests.
-	a.style.cssText = "top:1px";
-
-	// Test setAttribute on camelCase class.
-	// If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-	support.getSetAttribute = div.className !== "t";
-
-	// Get the style information from getAttribute
-	// (IE uses .cssText instead)
-	support.style = /top/.test( a.getAttribute( "style" ) );
-
-	// Make sure that URLs aren't manipulated
-	// (IE normalizes it by default)
-	support.hrefNormalized = a.getAttribute( "href" ) === "/a";
-
-	// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
-	support.checkOn = !!input.value;
-
-	// Make sure that a selected-by-default option has a working selected property.
-	// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-	support.optSelected = opt.selected;
-
-	// Tests for enctype support on a form (#6743)
-	support.enctype = !!document.createElement( "form" ).enctype;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE8 only
-	// Check if we can trust getAttribute("value")
-	input = document.createElement( "input" );
-	input.setAttribute( "value", "" );
-	support.input = input.getAttribute( "value" ) === "";
-
-	// Check if an input maintains its value after becoming a radio
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
-} )();
-
-
-var rreturn = /\r/g;
-
-jQuery.fn.extend( {
-	val: function( value ) {
-		var hooks, ret, isFunction,
-			elem = this[ 0 ];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] ||
-					jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if (
-					hooks &&
-					"get" in hooks &&
-					( ret = hooks.get( elem, "value" ) ) !== undefined
-				) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-
-					// handle most common string cases
-					ret.replace( rreturn, "" ) :
-
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each( function( i ) {
-			var val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, jQuery( this ).val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map( val, function( value ) {
-					return value == null ? "" : value + "";
-				} );
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		} );
-	}
-} );
-
-jQuery.extend( {
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-
-					// Support: IE10-11+
-					// option.text throws exceptions (#14686, #14858)
-					jQuery.trim( jQuery.text( elem ) );
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// oldIE doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-
-							// Don't return options that are disabled or in a disabled optgroup
-							( support.optDisabled ?
-								!option.disabled :
-								option.getAttribute( "disabled" ) === null ) &&
-							( !option.parentNode.disabled ||
-								!jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
-
-				while ( i-- ) {
-					option = options[ i ];
-
-					if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) >= 0 ) {
-
-						// Support: IE6
-						// When new option element is added to select box we need to
-						// force reflow of newly added node in order to workaround delay
-						// of initialization properties
-						try {
-							option.selected = optionSet = true;
-
-						} catch ( _ ) {
-
-							// Will be executed only in IE6
-							option.scrollHeight;
-						}
-
-					} else {
-						option.selected = false;
-					}
-				}
-
-				// Force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
-				}
-
-				return options;
-			}
-		}
-	}
-} );
-
-// Radios and checkboxes getter/setter
-jQuery.each( [ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 );
-			}
-		}
-	};
-	if ( !support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			return elem.getAttribute( "value" ) === null ? "on" : elem.value;
-		};
-	}
-} );
-
-
-
-
-var nodeHook, boolHook,
-	attrHandle = jQuery.expr.attrHandle,
-	ruseDefault = /^(?:checked|selected)$/i,
-	getSetAttribute = support.getSetAttribute,
-	getSetInput = support.input;
-
-jQuery.fn.extend( {
-	attr: function( name, value ) {
-		return access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each( function() {
-			jQuery.removeAttr( this, name );
-		} );
-	}
-} );
-
-jQuery.extend( {
-	attr: function( elem, name, value ) {
-		var ret, hooks,
-			nType = elem.nodeType;
-
-		// Don't get/set attributes on text, comment and attribute nodes
-		if ( nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === "undefined" ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-				return;
-			}
-
-			if ( hooks && "set" in hooks &&
-				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
-				return ret;
-			}
-
-			elem.setAttribute( name, value + "" );
-			return value;
-		}
-
-		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
-			return ret;
-		}
-
-		ret = jQuery.find.attr( elem, name );
-
-		// Non-existent attributes return null, we normalize to undefined
-		return ret == null ? undefined : ret;
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !support.radioValue && value === "radio" &&
-					jQuery.nodeName( elem, "input" ) ) {
-
-					// Setting the type on a radio button after the value resets the value in IE8-9
-					// Reset value to default in case type is set after value during creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( ( name = attrNames[ i++ ] ) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( jQuery.expr.match.bool.test( name ) ) {
-
-					// Set corresponding property to false
-					if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-						elem[ propName ] = false;
-
-					// Support: IE<9
-					// Also clear defaultChecked/defaultSelected (if appropriate)
-					} else {
-						elem[ jQuery.camelCase( "default-" + name ) ] =
-							elem[ propName ] = false;
-					}
-
-				// See #9699 for explanation of this approach (setting first, then removal)
-				} else {
-					jQuery.attr( elem, name, "" );
-				}
-
-				elem.removeAttribute( getSetAttribute ? name : propName );
-			}
-		}
-	}
-} );
-
-// Hooks for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-
-			// IE<8 needs the *property* name
-			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
-
-		} else {
-
-			// Support: IE<9
-			// Use defaultChecked and defaultSelected for oldIE
-			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
-		}
-		return name;
-	}
-};
-
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-	var getter = attrHandle[ name ] || jQuery.find.attr;
-
-	if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-		attrHandle[ name ] = function( elem, name, isXML ) {
-			var ret, handle;
-			if ( !isXML ) {
-
-				// Avoid an infinite loop by temporarily removing this function from the getter
-				handle = attrHandle[ name ];
-				attrHandle[ name ] = ret;
-				ret = getter( elem, name, isXML ) != null ?
-					name.toLowerCase() :
-					null;
-				attrHandle[ name ] = handle;
-			}
-			return ret;
-		};
-	} else {
-		attrHandle[ name ] = function( elem, name, isXML ) {
-			if ( !isXML ) {
-				return elem[ jQuery.camelCase( "default-" + name ) ] ?
-					name.toLowerCase() :
-					null;
-			}
-		};
-	}
-} );
-
-// fix oldIE attroperties
-if ( !getSetInput || !getSetAttribute ) {
-	jQuery.attrHooks.value = {
-		set: function( elem, value, name ) {
-			if ( jQuery.nodeName( elem, "input" ) ) {
-
-				// Does not return so that setAttribute is also used
-				elem.defaultValue = value;
-			} else {
-
-				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
-				return nodeHook && nodeHook.set( elem, value, name );
-			}
-		}
-	};
-}
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = {
-		set: function( elem, value, name ) {
-
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				elem.setAttributeNode(
-					( ret = elem.ownerDocument.createAttribute( name ) )
-				);
-			}
-
-			ret.value = value += "";
-
-			// Break association with cloned elements by also using setAttribute (#9646)
-			if ( name === "value" || value === elem.getAttribute( name ) ) {
-				return value;
-			}
-		}
-	};
-
-	// Some attributes are constructed with empty-string values when not defined
-	attrHandle.id = attrHandle.name = attrHandle.coords =
-		function( elem, name, isXML ) {
-			var ret;
-			if ( !isXML ) {
-				return ( ret = elem.getAttributeNode( name ) ) && ret.value !== "" ?
-					ret.value :
-					null;
-			}
-		};
-
-	// Fixing value retrieval on a button requires this module
-	jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			if ( ret && ret.specified ) {
-				return ret.value;
-			}
-		},
-		set: nodeHook.set
-	};
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		set: function( elem, value, name ) {
-			nodeHook.set( elem, value === "" ? false : value, name );
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each( [ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		};
-	} );
-}
-
-if ( !support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-
-			// Return undefined in the case of empty string
-			// Note: IE uppercases css property names, but if we were to .toLowerCase()
-			// .cssText, that would destroy case sensitivity in URL's, like in "background"
-			return elem.style.cssText || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
-
-
-
-
-var rfocusable = /^(?:input|select|textarea|button|object)$/i,
-	rclickable = /^(?:a|area)$/i;
-
-jQuery.fn.extend( {
-	prop: function( name, value ) {
-		return access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each( function() {
-
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch ( e ) {}
-		} );
-	}
-} );
-
-jQuery.extend( {
-	prop: function( elem, name, value ) {
-		var ret, hooks,
-			nType = elem.nodeType;
-
-		// Don't get/set properties on text, comment and attribute nodes
-		if ( nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks &&
-				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
-				return ret;
-			}
-
-			return ( elem[ name ] = value );
-		}
-
-		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
-			return ret;
-		}
-
-		return elem[ name ];
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-
-				// elem.tabIndex doesn't always return the
-				// correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				// Use proper attribute retrieval(#12072)
-				var tabindex = jQuery.find.attr( elem, "tabindex" );
-
-				return tabindex ?
-					parseInt( tabindex, 10 ) :
-					rfocusable.test( elem.nodeName ) ||
-						rclickable.test( elem.nodeName ) && elem.href ?
-							0 :
-							-1;
-			}
-		}
-	},
-
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	}
-} );
-
-// Some attributes require a special call on IE
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !support.hrefNormalized ) {
-
-	// href/src property should get the full normalized URL (#10299/#12915)
-	jQuery.each( [ "href", "src" ], function( i, name ) {
-		jQuery.propHooks[ name ] = {
-			get: function( elem ) {
-				return elem.getAttribute( name, 4 );
-			}
-		};
-	} );
-}
-
-// Support: Safari, IE9+
-// mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	};
-}
-
-jQuery.each( [
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-} );
-
-// IE6/7 call enctype encoding
-if ( !support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-
-
-
-var rclass = /[\t\r\n\f]/g;
-
-function getClass( elem ) {
-	return jQuery.attr( elem, "class" ) || "";
-}
-
-jQuery.fn.extend( {
-	addClass: function( value ) {
-		var classes, elem, cur, curValue, clazz, j, finalValue,
-			i = 0;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each( function( j ) {
-				jQuery( this ).addClass( value.call( this, j, getClass( this ) ) );
-			} );
-		}
-
-		if ( typeof value === "string" && value ) {
-			classes = value.match( rnotwhite ) || [];
-
-			while ( ( elem = this[ i++ ] ) ) {
-				curValue = getClass( elem );
-				cur = elem.nodeType === 1 &&
-					( " " + curValue + " " ).replace( rclass, " " );
-
-				if ( cur ) {
-					j = 0;
-					while ( ( clazz = classes[ j++ ] ) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-
-					// only assign if different to avoid unneeded rendering.
-					finalValue = jQuery.trim( cur );
-					if ( curValue !== finalValue ) {
-						jQuery.attr( elem, "class", finalValue );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, curValue, clazz, j, finalValue,
-			i = 0;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each( function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) );
-			} );
-		}
-
-		if ( !arguments.length ) {
-			return this.attr( "class", "" );
-		}
-
-		if ( typeof value === "string" && value ) {
-			classes = value.match( rnotwhite ) || [];
-
-			while ( ( elem = this[ i++ ] ) ) {
-				curValue = getClass( elem );
-
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 &&
-					( " " + curValue + " " ).replace( rclass, " " );
-
-				if ( cur ) {
-					j = 0;
-					while ( ( clazz = classes[ j++ ] ) ) {
-
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) > -1 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-
-					// Only assign if different to avoid unneeded rendering.
-					finalValue = jQuery.trim( cur );
-					if ( curValue !== finalValue ) {
-						jQuery.attr( elem, "class", finalValue );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
-
-		if ( typeof stateVal === "boolean" && type === "string" ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each( function( i ) {
-				jQuery( this ).toggleClass(
-					value.call( this, i, getClass( this ), stateVal ),
-					stateVal
-				);
-			} );
-		}
-
-		return this.each( function() {
-			var className, i, self, classNames;
-
-			if ( type === "string" ) {
-
-				// Toggle individual class names
-				i = 0;
-				self = jQuery( this );
-				classNames = value.match( rnotwhite ) || [];
-
-				while ( ( className = classNames[ i++ ] ) ) {
-
-					// Check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
-					}
-				}
-
-			// Toggle whole class name
-			} else if ( value === undefined || type === "boolean" ) {
-				className = getClass( this );
-				if ( className ) {
-
-					// store className if set
-					jQuery._data( this, "__className__", className );
-				}
-
-				// If the element has a class name or if we're passed "false",
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				jQuery.attr( this, "class",
-					className || value === false ?
-					"" :
-					jQuery._data( this, "__className__" ) || ""
-				);
-			}
-		} );
-	},
-
-	hasClass: function( selector ) {
-		var className, elem,
-			i = 0;
-
-		className = " " + selector + " ";
-		while ( ( elem = this[ i++ ] ) ) {
-			if ( elem.nodeType === 1 &&
-				( " " + getClass( elem ) + " " ).replace( rclass, " " )
-					.indexOf( className ) > -1
-			) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-} );
-
-
-
-
-// Return jQuery for attributes-only inclusion
-
-
-jQuery.each( ( "blur focus focusin focusout load resize scroll unload click dblclick " +
+jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
 	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu" ).split( " " ),
+	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
 	function( i, name ) {
 
 	// Handle event binding
@@ -8985,6 +8268,52 @@ jQuery.fn.extend( {
 } );
 
 
+
+
+support.focusin = "onfocusin" in window;
+
+
+// Support: Firefox <=44
+// Firefox doesn't have focus(in | out) events
+// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
+//
+// Support: Chrome <=48 - 49, Safari <=9.0 - 9.1
+// focus(in | out) events fire after focus & blur events,
+// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
+// Related ticket - https://bugs.chromium.org/p/chromium/issues/detail?id=449857
+if ( !support.focusin ) {
+	jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+		// Attach a single capturing handler on the document while someone wants focusin/focusout
+		var handler = function( event ) {
+			jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) );
+		};
+
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				var doc = this.ownerDocument || this,
+					attaches = dataPriv.access( doc, fix );
+
+				if ( !attaches ) {
+					doc.addEventListener( orig, handler, true );
+				}
+				dataPriv.access( doc, fix, ( attaches || 0 ) + 1 );
+			},
+			teardown: function() {
+				var doc = this.ownerDocument || this,
+					attaches = dataPriv.access( doc, fix ) - 1;
+
+				if ( !attaches ) {
+					doc.removeEventListener( orig, handler, true );
+					dataPriv.remove( doc, fix );
+
+				} else {
+					dataPriv.access( doc, fix, attaches );
+				}
+			}
+		};
+	} );
+}
 var location = window.location;
 
 var nonce = jQuery.now();
@@ -8993,72 +8322,22 @@ var rquery = ( /\?/ );
 
 
 
-var rvalidtokens = /(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;
-
-jQuery.parseJSON = function( data ) {
-
-	// Attempt to parse using the native JSON parser first
-	if ( window.JSON && window.JSON.parse ) {
-
-		// Support: Android 2.3
-		// Workaround failure to string-cast null input
-		return window.JSON.parse( data + "" );
-	}
-
-	var requireNonComma,
-		depth = null,
-		str = jQuery.trim( data + "" );
-
-	// Guard against invalid (and possibly dangerous) input by ensuring that nothing remains
-	// after removing valid tokens
-	return str && !jQuery.trim( str.replace( rvalidtokens, function( token, comma, open, close ) {
-
-		// Force termination if we see a misplaced comma
-		if ( requireNonComma && comma ) {
-			depth = 0;
-		}
-
-		// Perform no more replacements after returning to outermost depth
-		if ( depth === 0 ) {
-			return token;
-		}
-
-		// Commas must not follow "[", "{", or ","
-		requireNonComma = open || comma;
-
-		// Determine new depth
-		// array/object open ("[" or "{"): depth += true - false (increment)
-		// array/object close ("]" or "}"): depth += false - true (decrement)
-		// other cases ("," or primitive): depth += true - true (numeric cast)
-		depth += !close - !open;
-
-		// Remove this token
-		return "";
-	} ) ) ?
-		( Function( "return " + str ) )() :
-		jQuery.error( "Invalid JSON: " + data );
-};
-
-
 // Cross-browser xml parsing
 jQuery.parseXML = function( data ) {
-	var xml, tmp;
+	var xml;
 	if ( !data || typeof data !== "string" ) {
 		return null;
 	}
+
+	// Support: IE 9 - 11 only
+	// IE throws on parseFromString with invalid input.
 	try {
-		if ( window.DOMParser ) { // Standard
-			tmp = new window.DOMParser();
-			xml = tmp.parseFromString( data, "text/xml" );
-		} else { // IE
-			xml = new window.ActiveXObject( "Microsoft.XMLDOM" );
-			xml.async = "false";
-			xml.loadXML( data );
-		}
+		xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
 	} catch ( e ) {
 		xml = undefined;
 	}
-	if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+
+	if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
 		jQuery.error( "Invalid XML: " + data );
 	}
 	return xml;
@@ -9066,17 +8345,134 @@ jQuery.parseXML = function( data ) {
 
 
 var
-	rhash = /#.*$/,
-	rts = /([?&])_=[^&]*/,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+	rsubmittable = /^(?:input|select|textarea|keygen)/i;
 
-	// IE leaves an \r character at EOL
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg,
+function buildParams( prefix, obj, traditional, add ) {
+	var name;
+
+	if ( jQuery.isArray( obj ) ) {
+
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+
+				// Item is non-scalar (array or object), encode its numeric index.
+				buildParams(
+					prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]",
+					v,
+					traditional,
+					add
+				);
+			}
+		} );
+
+	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
+
+		// Serialize object item.
+		for ( name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
+	} else {
+
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+
+// Serialize an array of form elements or a set of
+// key/values into a query string
+jQuery.param = function( a, traditional ) {
+	var prefix,
+		s = [],
+		add = function( key, valueOrFunction ) {
+
+			// If value is a function, invoke it and use its return value
+			var value = jQuery.isFunction( valueOrFunction ) ?
+				valueOrFunction() :
+				valueOrFunction;
+
+			s[ s.length ] = encodeURIComponent( key ) + "=" +
+				encodeURIComponent( value == null ? "" : value );
+		};
+
+	// If an array was passed in, assume that it is an array of form elements.
+	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+
+		// Serialize the form elements
+		jQuery.each( a, function() {
+			add( this.name, this.value );
+		} );
+
+	} else {
+
+		// If traditional, encode the "old" way (the way 1.3.2 or older
+		// did it), otherwise encode params recursively.
+		for ( prefix in a ) {
+			buildParams( prefix, a[ prefix ], traditional, add );
+		}
+	}
+
+	// Return the resulting serialization
+	return s.join( "&" );
+};
+
+jQuery.fn.extend( {
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+	serializeArray: function() {
+		return this.map( function() {
+
+			// Can add propHook for "elements" to filter or add form elements
+			var elements = jQuery.prop( this, "elements" );
+			return elements ? jQuery.makeArray( elements ) : this;
+		} )
+		.filter( function() {
+			var type = this.type;
+
+			// Use .is( ":disabled" ) so that fieldset[disabled] works
+			return this.name && !jQuery( this ).is( ":disabled" ) &&
+				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+				( this.checked || !rcheckableType.test( type ) );
+		} )
+		.map( function( i, elem ) {
+			var val = jQuery( this ).val();
+
+			if ( val == null ) {
+				return null;
+			}
+
+			if ( jQuery.isArray( val ) ) {
+				return jQuery.map( val, function( val ) {
+					return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+				} );
+			}
+
+			return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		} ).get();
+	}
+} );
+
+
+var
+	r20 = /%20/g,
+	rhash = /#.*$/,
+	rantiCache = /([?&])_=[^&]*/,
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg,
 
 	// #7653, #8125, #8152: local protocol detection
 	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
 	rnoContent = /^(?:GET|HEAD)$/,
 	rprotocol = /^\/\//,
-	rurl = /^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,
 
 	/* Prefilters
 	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
@@ -9099,11 +8495,9 @@ var
 	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
 	allTypes = "*/".concat( "*" ),
 
-	// Document location
-	ajaxLocation = location.href,
-
-	// Segment location into parts
-	ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+	// Anchor tag for parsing the document origin
+	originAnchor = document.createElement( "a" );
+	originAnchor.href = location.href;
 
 // Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
 function addToPrefiltersOrTransports( structure ) {
@@ -9118,7 +8512,7 @@ function addToPrefiltersOrTransports( structure ) {
 
 		var dataType,
 			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
+			dataTypes = dataTypeExpression.toLowerCase().match( rnothtmlwhite ) || [];
 
 		if ( jQuery.isFunction( func ) ) {
 
@@ -9126,7 +8520,7 @@ function addToPrefiltersOrTransports( structure ) {
 			while ( ( dataType = dataTypes[ i++ ] ) ) {
 
 				// Prepend if requested
-				if ( dataType.charAt( 0 ) === "+" ) {
+				if ( dataType[ 0 ] === "+" ) {
 					dataType = dataType.slice( 1 ) || "*";
 					( structure[ dataType ] = structure[ dataType ] || [] ).unshift( func );
 
@@ -9170,7 +8564,7 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions, jqX
 // that takes "flat" options (not to be deep extended)
 // Fixes #9887
 function ajaxExtend( target, src ) {
-	var deep, key,
+	var key, deep,
 		flatOptions = jQuery.ajaxSettings.flatOptions || {};
 
 	for ( key in src ) {
@@ -9190,7 +8584,8 @@ function ajaxExtend( target, src ) {
  * - returns the corresponding response
  */
 function ajaxHandleResponses( s, jqXHR, responses ) {
-	var firstDataType, ct, finalDataType, type,
+
+	var ct, type, finalDataType, firstDataType,
 		contents = s.contents,
 		dataTypes = s.dataTypes;
 
@@ -9322,7 +8717,7 @@ function ajaxConvert( s, response, jqXHR, isSuccess ) {
 				if ( conv !== true ) {
 
 					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s[ "throws" ] ) { // jscs:ignore requireDotNotation
+					if ( conv && s.throws ) {
 						response = conv( response );
 					} else {
 						try {
@@ -9352,13 +8747,14 @@ jQuery.extend( {
 	etag: {},
 
 	ajaxSettings: {
-		url: ajaxLocation,
+		url: location.href,
 		type: "GET",
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+		isLocal: rlocalProtocol.test( location.protocol ),
 		global: true,
 		processData: true,
 		async: true,
 		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+
 		/*
 		timeout: 0,
 		data: null,
@@ -9402,7 +8798,7 @@ jQuery.extend( {
 			"text html": true,
 
 			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
+			"text json": JSON.parse,
 
 			// Parse text as xml
 			"text xml": jQuery.parseXML
@@ -9446,30 +8842,32 @@ jQuery.extend( {
 		// Force options to be an object
 		options = options || {};
 
-		var
-
-			// Cross-domain detection vars
-			parts,
-
-			// Loop variable
-			i,
+		var transport,
 
 			// URL without anti-cache param
 			cacheURL,
 
-			// Response headers as string
+			// Response headers
 			responseHeadersString,
+			responseHeaders,
 
 			// timeout handle
 			timeoutTimer,
 
+			// Url cleanup var
+			urlAnchor,
+
+			// Request state (becomes false upon send and true upon completion)
+			completed,
+
 			// To know if global events are to be dispatched
 			fireGlobals,
 
-			transport,
+			// Loop variable
+			i,
 
-			// Response headers
-			responseHeaders,
+			// uncached part of the url
+			uncached,
 
 			// Create the final options object
 			s = jQuery.ajaxSetup( {}, options ),
@@ -9494,9 +8892,6 @@ jQuery.extend( {
 			requestHeaders = {},
 			requestHeadersNames = {},
 
-			// The jqXHR state
-			state = 0,
-
 			// Default abort message
 			strAbort = "canceled",
 
@@ -9507,7 +8902,7 @@ jQuery.extend( {
 				// Builds headers hashtable if needed
 				getResponseHeader: function( key ) {
 					var match;
-					if ( state === 2 ) {
+					if ( completed ) {
 						if ( !responseHeaders ) {
 							responseHeaders = {};
 							while ( ( match = rheaders.exec( responseHeadersString ) ) ) {
@@ -9521,14 +8916,14 @@ jQuery.extend( {
 
 				// Raw string
 				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
+					return completed ? responseHeadersString : null;
 				},
 
 				// Caches the header
 				setRequestHeader: function( name, value ) {
-					var lname = name.toLowerCase();
-					if ( !state ) {
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+					if ( completed == null ) {
+						name = requestHeadersNames[ name.toLowerCase() ] =
+							requestHeadersNames[ name.toLowerCase() ] || name;
 						requestHeaders[ name ] = value;
 					}
 					return this;
@@ -9536,7 +8931,7 @@ jQuery.extend( {
 
 				// Overrides response content-type header
 				overrideMimeType: function( type ) {
-					if ( !state ) {
+					if ( completed == null ) {
 						s.mimeType = type;
 					}
 					return this;
@@ -9546,16 +8941,16 @@ jQuery.extend( {
 				statusCode: function( map ) {
 					var code;
 					if ( map ) {
-						if ( state < 2 ) {
-							for ( code in map ) {
-
-								// Lazy-add the new callback in a way that preserves old ones
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-							}
-						} else {
+						if ( completed ) {
 
 							// Execute the appropriate callbacks
 							jqXHR.always( map[ jqXHR.status ] );
+						} else {
+
+							// Lazy-add the new callbacks in a way that preserves old ones
+							for ( code in map ) {
+								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
+							}
 						}
 					}
 					return this;
@@ -9573,32 +8968,41 @@ jQuery.extend( {
 			};
 
 		// Attach deferreds
-		deferred.promise( jqXHR ).complete = completeDeferred.add;
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
+		deferred.promise( jqXHR );
 
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+		// Add protocol if not provided (prefilters might expect it)
 		// Handle falsy url in the settings object (#10093: consistency with old signature)
 		// We also use the url parameter if available
-		s.url = ( ( url || s.url || ajaxLocation ) + "" )
-			.replace( rhash, "" )
-			.replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+		s.url = ( ( url || s.url || location.href ) + "" )
+			.replace( rprotocol, location.protocol + "//" );
 
 		// Alias method option to type as per ticket #12004
 		s.type = options.method || options.type || s.method || s.type;
 
 		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
+		s.dataTypes = ( s.dataType || "*" ).toLowerCase().match( rnothtmlwhite ) || [ "" ];
 
-		// A cross-domain request is in order when we have a protocol:host:port mismatch
+		// A cross-domain request is in order when the origin doesn't match the current origin.
 		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
-			);
+			urlAnchor = document.createElement( "a" );
+
+			// Support: IE <=8 - 11, Edge 12 - 13
+			// IE throws exception on accessing the href property if url is malformed,
+			// e.g. http://example.com:80x/
+			try {
+				urlAnchor.href = s.url;
+
+				// Support: IE <=8 - 11 only
+				// Anchor's host property isn't correctly set when s.url is relative
+				urlAnchor.href = urlAnchor.href;
+				s.crossDomain = originAnchor.protocol + "//" + originAnchor.host !==
+					urlAnchor.protocol + "//" + urlAnchor.host;
+			} catch ( e ) {
+
+				// If there is an error parsing the URL, assume it is crossDomain,
+				// it can be rejected by the transport if it is invalid
+				s.crossDomain = true;
+			}
 		}
 
 		// Convert data if not already a string
@@ -9610,7 +9014,7 @@ jQuery.extend( {
 		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
 
 		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
+		if ( completed ) {
 			return jqXHR;
 		}
 
@@ -9631,29 +9035,36 @@ jQuery.extend( {
 
 		// Save the URL in case we're toying with the If-Modified-Since
 		// and/or If-None-Match header later on
-		cacheURL = s.url;
+		// Remove hash to simplify url manipulation
+		cacheURL = s.url.replace( rhash, "" );
 
 		// More options handling for requests with no content
 		if ( !s.hasContent ) {
 
+			// Remember the hash so we can put it back
+			uncached = s.url.slice( cacheURL.length );
+
 			// If data is available, append data to url
 			if ( s.data ) {
-				cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
+				cacheURL += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data;
 
 				// #9682: remove data so that it's not used in an eventual retry
 				delete s.data;
 			}
 
-			// Add anti-cache in url if needed
+			// Add or update anti-cache param if needed
 			if ( s.cache === false ) {
-				s.url = rts.test( cacheURL ) ?
-
-					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + nonce++ ) :
-
-					// Otherwise add one to the end
-					cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
+				cacheURL = cacheURL.replace( rantiCache, "$1" );
+				uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce++ ) + uncached;
 			}
+
+			// Put hash and anti-cache on the URL that will be requested (gh-1732)
+			s.url = cacheURL + uncached;
+
+		// Change '%20' to '+' if this is encoded form body content (gh-2658)
+		} else if ( s.data && s.processData &&
+			( s.contentType || "" ).indexOf( "application/x-www-form-urlencoded" ) === 0 ) {
+			s.data = s.data.replace( r20, "+" );
 		}
 
 		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
@@ -9687,19 +9098,19 @@ jQuery.extend( {
 
 		// Allow custom headers/mimetypes and early abort
 		if ( s.beforeSend &&
-			( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+			( s.beforeSend.call( callbackContext, jqXHR, s ) === false || completed ) ) {
 
 			// Abort if not done already and return
 			return jqXHR.abort();
 		}
 
-		// aborting is no longer a cancellation
+		// Aborting is no longer a cancellation
 		strAbort = "abort";
 
 		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
+		completeDeferred.add( s.complete );
+		jqXHR.done( s.success );
+		jqXHR.fail( s.error );
 
 		// Get transport
 		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
@@ -9716,7 +9127,7 @@ jQuery.extend( {
 			}
 
 			// If request was aborted inside ajaxSend, stop there
-			if ( state === 2 ) {
+			if ( completed ) {
 				return jqXHR;
 			}
 
@@ -9728,18 +9139,17 @@ jQuery.extend( {
 			}
 
 			try {
-				state = 1;
+				completed = false;
 				transport.send( requestHeaders, done );
 			} catch ( e ) {
 
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-
-				// Simply rethrow otherwise
-				} else {
+				// Rethrow post-completion exceptions
+				if ( completed ) {
 					throw e;
 				}
+
+				// Propagate others as results
+				done( -1, e );
 			}
 		}
 
@@ -9748,13 +9158,12 @@ jQuery.extend( {
 			var isSuccess, success, error, response, modified,
 				statusText = nativeStatusText;
 
-			// Called once
-			if ( state === 2 ) {
+			// Ignore repeat invocations
+			if ( completed ) {
 				return;
 			}
 
-			// State is "done" now
-			state = 2;
+			completed = true;
 
 			// Clear timeout if it exists
 			if ( timeoutTimer ) {
@@ -9814,8 +9223,7 @@ jQuery.extend( {
 				}
 			} else {
 
-				// We extract error from statusText
-				// then normalize statusText and status for non-aborts
+				// Extract error from statusText and normalize for non-aborts
 				error = statusText;
 				if ( status || !statusText ) {
 					statusText = "error";
@@ -9873,7 +9281,7 @@ jQuery.extend( {
 jQuery.each( [ "get", "post" ], function( i, method ) {
 	jQuery[ method ] = function( url, data, callback, type ) {
 
-		// shift arguments if data argument was omitted
+		// Shift arguments if data argument was omitted
 		if ( jQuery.isFunction( data ) ) {
 			type = type || callback;
 			callback = data;
@@ -9909,16 +9317,15 @@ jQuery._evalUrl = function( url ) {
 
 jQuery.fn.extend( {
 	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each( function( i ) {
-				jQuery( this ).wrapAll( html.call( this, i ) );
-			} );
-		}
+		var wrap;
 
 		if ( this[ 0 ] ) {
+			if ( jQuery.isFunction( html ) ) {
+				html = html.call( this[ 0 ] );
+			}
 
 			// The elements to wrap the target around
-			var wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
+			wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
 
 			if ( this[ 0 ].parentNode ) {
 				wrap.insertBefore( this[ 0 ] );
@@ -9927,8 +9334,8 @@ jQuery.fn.extend( {
 			wrap.map( function() {
 				var elem = this;
 
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
+				while ( elem.firstElementChild ) {
+					elem = elem.firstElementChild;
 				}
 
 				return elem;
@@ -9966,383 +9373,184 @@ jQuery.fn.extend( {
 		} );
 	},
 
-	unwrap: function() {
-		return this.parent().each( function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		} ).end();
+	unwrap: function( selector ) {
+		this.parent( selector ).not( "body" ).each( function() {
+			jQuery( this ).replaceWith( this.childNodes );
+		} );
+		return this;
 	}
 } );
 
 
-function getDisplay( elem ) {
-	return elem.style && elem.style.display || jQuery.css( elem, "display" );
-}
-
-function filterHidden( elem ) {
-	while ( elem && elem.nodeType === 1 ) {
-		if ( getDisplay( elem ) === "none" || elem.type === "hidden" ) {
-			return true;
-		}
-		elem = elem.parentNode;
-	}
-	return false;
-}
-
-jQuery.expr.filters.hidden = function( elem ) {
-
-	// Support: Opera <= 12.12
-	// Opera reports offsetWidths and offsetHeights less than zero on some elements
-	return support.reliableHiddenOffsets() ?
-		( elem.offsetWidth <= 0 && elem.offsetHeight <= 0 &&
-			!elem.getClientRects().length ) :
-			filterHidden( elem );
+jQuery.expr.pseudos.hidden = function( elem ) {
+	return !jQuery.expr.pseudos.visible( elem );
 };
-
-jQuery.expr.filters.visible = function( elem ) {
-	return !jQuery.expr.filters.hidden( elem );
+jQuery.expr.pseudos.visible = function( elem ) {
+	return !!( elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length );
 };
 
 
 
 
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams(
-					prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]",
-					v,
-					traditional,
-					add
-				);
-			}
-		} );
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-
-// Serialize an array of form elements or a set of
-// key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
-
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		} );
-
-	} else {
-
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
-
-jQuery.fn.extend( {
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map( function() {
-
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		} )
-		.filter( function() {
-			var type = this.type;
-
-			// Use .is(":disabled") so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !rcheckableType.test( type ) );
-		} )
-		.map( function( i, elem ) {
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ) {
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					} ) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		} ).get();
-	}
-} );
-
-
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject !== undefined ?
-
-	// Support: IE6-IE8
-	function() {
-
-		// XHR cannot access local files, always use ActiveX for that case
-		if ( this.isLocal ) {
-			return createActiveXHR();
-		}
-
-		// Support: IE 9-11
-		// IE seems to error on cross-domain PATCH requests when ActiveX XHR
-		// is used. In IE 9+ always use the native XHR.
-		// Note: this condition won't catch Edge as it doesn't define
-		// document.documentMode but it also doesn't support ActiveX so it won't
-		// reach this code.
-		if ( document.documentMode > 8 ) {
-			return createStandardXHR();
-		}
-
-		// Support: IE<9
-		// oldIE XHR does not support non-RFC2616 methods (#13240)
-		// See http://msdn.microsoft.com/en-us/library/ie/ms536648(v=vs.85).aspx
-		// and http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9
-		// Although this check for six methods instead of eight
-		// since IE also does not support "trace" and "connect"
-		return /^(get|post|head|put|delete|options)$/i.test( this.type ) &&
-			createStandardXHR() || createActiveXHR();
-	} :
-
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
-
-var xhrId = 0,
-	xhrCallbacks = {},
-	xhrSupported = jQuery.ajaxSettings.xhr();
-
-// Support: IE<10
-// Open requests must be manually aborted on unload (#5280)
-// See https://support.microsoft.com/kb/2856746 for more info
-if ( window.attachEvent ) {
-	window.attachEvent( "onunload", function() {
-		for ( var key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( undefined, true );
-		}
-	} );
-}
-
-// Determine support properties
-support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-xhrSupported = support.ajax = !!xhrSupported;
-
-// Create transport if the browser can provide an xhr
-if ( xhrSupported ) {
-
-	jQuery.ajaxTransport( function( options ) {
-
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !options.crossDomain || support.cors ) {
-
-			var callback;
-
-			return {
-				send: function( headers, complete ) {
-					var i,
-						xhr = options.xhr(),
-						id = ++xhrId;
-
-					// Open the socket
-					xhr.open(
-						options.type,
-						options.url,
-						options.async,
-						options.username,
-						options.password
-					);
-
-					// Apply custom fields if provided
-					if ( options.xhrFields ) {
-						for ( i in options.xhrFields ) {
-							xhr[ i ] = options.xhrFields[ i ];
-						}
-					}
-
-					// Override mime type if needed
-					if ( options.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( options.mimeType );
-					}
-
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !options.crossDomain && !headers[ "X-Requested-With" ] ) {
-						headers[ "X-Requested-With" ] = "XMLHttpRequest";
-					}
-
-					// Set headers
-					for ( i in headers ) {
-
-						// Support: IE<9
-						// IE's ActiveXObject throws a 'Type Mismatch' exception when setting
-						// request header to a null-value.
-						//
-						// To keep consistent with other XHR implementations, cast the value
-						// to string and ignore `undefined`.
-						if ( headers[ i ] !== undefined ) {
-							xhr.setRequestHeader( i, headers[ i ] + "" );
-						}
-					}
-
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( options.hasContent && options.data ) || null );
-
-					// Listener
-					callback = function( _, isAbort ) {
-						var status, statusText, responses;
-
-						// Was never called and is aborted or complete
-						if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-
-							// Clean up
-							delete xhrCallbacks[ id ];
-							callback = undefined;
-							xhr.onreadystatechange = jQuery.noop;
-
-							// Abort manually if needed
-							if ( isAbort ) {
-								if ( xhr.readyState !== 4 ) {
-									xhr.abort();
-								}
-							} else {
-								responses = {};
-								status = xhr.status;
-
-								// Support: IE<10
-								// Accessing binary-data responseText throws an exception
-								// (#11426)
-								if ( typeof xhr.responseText === "string" ) {
-									responses.text = xhr.responseText;
-								}
-
-								// Firefox throws an exception when accessing
-								// statusText for faulty cross-domain requests
-								try {
-									statusText = xhr.statusText;
-								} catch ( e ) {
-
-									// We normalize with Webkit giving an empty statusText
-									statusText = "";
-								}
-
-								// Filter status for non standard behaviors
-
-								// If the request is local and we have data: assume a success
-								// (success with no data won't get notified, that's the best we
-								// can do given current implementations)
-								if ( !status && options.isLocal && !options.crossDomain ) {
-									status = responses.text ? 200 : 404;
-
-								// IE - #1450: sometimes returns 1223 when it should be 204
-								} else if ( status === 1223 ) {
-									status = 204;
-								}
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, xhr.getAllResponseHeaders() );
-						}
-					};
-
-					// Do send the request
-					// `xhr.send` may raise an exception, but it will be
-					// handled in jQuery.ajax (so no try/catch here)
-					if ( !options.async ) {
-
-						// If we're in sync mode we fire the callback
-						callback();
-					} else if ( xhr.readyState === 4 ) {
-
-						// (IE6 & IE7) if it's in cache and has been
-						// retrieved directly we need to fire the callback
-						window.setTimeout( callback );
-					} else {
-
-						// Register the callback, but delay it in case `xhr.send` throws
-						// Add to the list of active xhr callbacks
-						xhr.onreadystatechange = xhrCallbacks[ id ] = callback;
-					}
-				},
-
-				abort: function() {
-					if ( callback ) {
-						callback( undefined, true );
-					}
-				}
-			};
-		}
-	} );
-}
-
-// Functions to create xhrs
-function createStandardXHR() {
+jQuery.ajaxSettings.xhr = function() {
 	try {
 		return new window.XMLHttpRequest();
 	} catch ( e ) {}
-}
+};
 
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
-	} catch ( e ) {}
-}
+var xhrSuccessStatus = {
+
+		// File protocol always yields status code 0, assume 200
+		0: 200,
+
+		// Support: IE <=9 only
+		// #1450: sometimes IE returns 1223 when it should be 204
+		1223: 204
+	},
+	xhrSupported = jQuery.ajaxSettings.xhr();
+
+support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
+support.ajax = xhrSupported = !!xhrSupported;
+
+jQuery.ajaxTransport( function( options ) {
+	var callback, errorCallback;
+
+	// Cross domain only allowed if supported through XMLHttpRequest
+	if ( support.cors || xhrSupported && !options.crossDomain ) {
+		return {
+			send: function( headers, complete ) {
+				var i,
+					xhr = options.xhr();
+
+				xhr.open(
+					options.type,
+					options.url,
+					options.async,
+					options.username,
+					options.password
+				);
+
+				// Apply custom fields if provided
+				if ( options.xhrFields ) {
+					for ( i in options.xhrFields ) {
+						xhr[ i ] = options.xhrFields[ i ];
+					}
+				}
+
+				// Override mime type if needed
+				if ( options.mimeType && xhr.overrideMimeType ) {
+					xhr.overrideMimeType( options.mimeType );
+				}
+
+				// X-Requested-With header
+				// For cross-domain requests, seeing as conditions for a preflight are
+				// akin to a jigsaw puzzle, we simply never set it to be sure.
+				// (it can always be set on a per-request basis or even using ajaxSetup)
+				// For same-domain requests, won't change header if already provided.
+				if ( !options.crossDomain && !headers[ "X-Requested-With" ] ) {
+					headers[ "X-Requested-With" ] = "XMLHttpRequest";
+				}
+
+				// Set headers
+				for ( i in headers ) {
+					xhr.setRequestHeader( i, headers[ i ] );
+				}
+
+				// Callback
+				callback = function( type ) {
+					return function() {
+						if ( callback ) {
+							callback = errorCallback = xhr.onload =
+								xhr.onerror = xhr.onabort = xhr.onreadystatechange = null;
+
+							if ( type === "abort" ) {
+								xhr.abort();
+							} else if ( type === "error" ) {
+
+								// Support: IE <=9 only
+								// On a manual native abort, IE9 throws
+								// errors on any property access that is not readyState
+								if ( typeof xhr.status !== "number" ) {
+									complete( 0, "error" );
+								} else {
+									complete(
+
+										// File: protocol always yields status 0; see #8605, #14207
+										xhr.status,
+										xhr.statusText
+									);
+								}
+							} else {
+								complete(
+									xhrSuccessStatus[ xhr.status ] || xhr.status,
+									xhr.statusText,
+
+									// Support: IE <=9 only
+									// IE9 has no XHR2 but throws on binary (trac-11426)
+									// For XHR2 non-text, let the caller handle it (gh-2498)
+									( xhr.responseType || "text" ) !== "text"  ||
+									typeof xhr.responseText !== "string" ?
+										{ binary: xhr.response } :
+										{ text: xhr.responseText },
+									xhr.getAllResponseHeaders()
+								);
+							}
+						}
+					};
+				};
+
+				// Listen to events
+				xhr.onload = callback();
+				errorCallback = xhr.onerror = callback( "error" );
+
+				// Support: IE 9 only
+				// Use onreadystatechange to replace onabort
+				// to handle uncaught aborts
+				if ( xhr.onabort !== undefined ) {
+					xhr.onabort = errorCallback;
+				} else {
+					xhr.onreadystatechange = function() {
+
+						// Check readyState before timeout as it changes
+						if ( xhr.readyState === 4 ) {
+
+							// Allow onerror to be called first,
+							// but that will not handle a native abort
+							// Also, save errorCallback to a variable
+							// as xhr.onerror cannot be accessed
+							window.setTimeout( function() {
+								if ( callback ) {
+									errorCallback();
+								}
+							} );
+						}
+					};
+				}
+
+				// Create the abort callback
+				callback = callback( "abort" );
+
+				try {
+
+					// Do send the request (this may raise an exception)
+					xhr.send( options.hasContent && options.data || null );
+				} catch ( e ) {
+
+					// #14683: Only rethrow if this hasn't been notified as an error yet
+					if ( callback ) {
+						throw e;
+					}
+				}
+			},
+
+			abort: function() {
+				if ( callback ) {
+					callback();
+				}
+			}
+		};
+	}
+} );
 
 
 
@@ -10371,14 +9579,13 @@ jQuery.ajaxSetup( {
 	}
 } );
 
-// Handle cache's special case and global
+// Handle cache's special case and crossDomain
 jQuery.ajaxPrefilter( "script", function( s ) {
 	if ( s.cache === undefined ) {
 		s.cache = false;
 	}
 	if ( s.crossDomain ) {
 		s.type = "GET";
-		s.global = false;
 	}
 } );
 
@@ -10387,55 +9594,29 @@ jQuery.ajaxTransport( "script", function( s ) {
 
 	// This transport only deals with cross domain requests
 	if ( s.crossDomain ) {
-
-		var script,
-			head = document.head || jQuery( "head" )[ 0 ] || document.documentElement;
-
+		var script, callback;
 		return {
-
-			send: function( _, callback ) {
-
-				script = document.createElement( "script" );
-
-				script.async = true;
-
-				if ( s.scriptCharset ) {
-					script.charset = s.scriptCharset;
-				}
-
-				script.src = s.url;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _, isAbort ) {
-
-					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-
-						// Remove the script
-						if ( script.parentNode ) {
-							script.parentNode.removeChild( script );
-						}
-
-						// Dereference the script
-						script = null;
-
-						// Callback if not abort
-						if ( !isAbort ) {
-							callback( 200, "success" );
+			send: function( _, complete ) {
+				script = jQuery( "<script>" ).prop( {
+					charset: s.scriptCharset,
+					src: s.url
+				} ).on(
+					"load error",
+					callback = function( evt ) {
+						script.remove();
+						callback = null;
+						if ( evt ) {
+							complete( evt.type === "error" ? 404 : 200, evt.type );
 						}
 					}
-				};
+				);
 
-				// Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
 				// Use native DOM manipulation to avoid our domManip AJAX trickery
-				head.insertBefore( script, head.firstChild );
+				document.head.appendChild( script[ 0 ] );
 			},
-
 			abort: function() {
-				if ( script ) {
-					script.onload( undefined, true );
+				if ( callback ) {
+					callback();
 				}
 			}
 		};
@@ -10493,7 +9674,7 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 			return responseContainer[ 0 ];
 		};
 
-		// force json dataType
+		// Force json dataType
 		s.dataTypes[ 0 ] = "json";
 
 		// Install callback
@@ -10517,10 +9698,10 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 			// Save back as free
 			if ( s[ callbackName ] ) {
 
-				// make sure that re-using the options doesn't screw things around
+				// Make sure that re-using the options doesn't screw things around
 				s.jsonpCallback = originalSettings.jsonpCallback;
 
-				// save the callback name for future use
+				// Save the callback name for future use
 				oldCallbacks.push( callbackName );
 			}
 
@@ -10540,42 +9721,53 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 
 
 
-// Support: Safari 8+
+// Support: Safari 8 only
 // In Safari 8 documents created via document.implementation.createHTMLDocument
 // collapse sibling forms: the second one becomes a child of the first one.
 // Because of that, this security measure has to be disabled in Safari 8.
 // https://bugs.webkit.org/show_bug.cgi?id=137337
 support.createHTMLDocument = ( function() {
-	if ( !document.implementation.createHTMLDocument ) {
-		return false;
-	}
-	var doc = document.implementation.createHTMLDocument( "" );
-	doc.body.innerHTML = "<form></form><form></form>";
-	return doc.body.childNodes.length === 2;
+	var body = document.implementation.createHTMLDocument( "" ).body;
+	body.innerHTML = "<form></form><form></form>";
+	return body.childNodes.length === 2;
 } )();
 
 
-// data: string of html
+// Argument "data" should be string of html
 // context (optional): If specified, the fragment will be created in this context,
 // defaults to document
 // keepScripts (optional): If true, will include scripts passed in the html string
 jQuery.parseHTML = function( data, context, keepScripts ) {
-	if ( !data || typeof data !== "string" ) {
-		return null;
+	if ( typeof data !== "string" ) {
+		return [];
 	}
 	if ( typeof context === "boolean" ) {
 		keepScripts = context;
 		context = false;
 	}
 
-	// document.implementation stops scripts or inline event handlers from
-	// being executed immediately
-	context = context || ( support.createHTMLDocument ?
-		document.implementation.createHTMLDocument( "" ) :
-		document );
+	var base, parsed, scripts;
 
-	var parsed = rsingleTag.exec( data ),
-		scripts = !keepScripts && [];
+	if ( !context ) {
+
+		// Stop scripts or inline event handlers from being executed immediately
+		// by using document.implementation
+		if ( support.createHTMLDocument ) {
+			context = document.implementation.createHTMLDocument( "" );
+
+			// Set the base href for the created document
+			// so any parsed elements with URLs
+			// are based on the document's URL (gh-2965)
+			base = context.createElement( "base" );
+			base.href = document.location.href;
+			context.head.appendChild( base );
+		} else {
+			context = document;
+		}
+	}
+
+	parsed = rsingleTag.exec( data );
+	scripts = !keepScripts && [];
 
 	// Single tag
 	if ( parsed ) {
@@ -10592,23 +9784,16 @@ jQuery.parseHTML = function( data, context, keepScripts ) {
 };
 
 
-// Keep a copy of the old load method
-var _load = jQuery.fn.load;
-
 /**
  * Load a url into a page
  */
 jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
-	}
-
 	var selector, type, response,
 		self = this,
 		off = url.indexOf( " " );
 
 	if ( off > -1 ) {
-		selector = jQuery.trim( url.slice( off, url.length ) );
+		selector = stripAndCollapse( url.slice( off ) );
 		url = url.slice( 0, off );
 	}
 
@@ -10654,7 +9839,7 @@ jQuery.fn.load = function( url, params, callback ) {
 		// If it fails, this function gets "jqXHR", "status", "error"
 		} ).always( callback && function( jqXHR, status ) {
 			self.each( function() {
-				callback.apply( self, response || [ jqXHR.responseText, status, jqXHR ] );
+				callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
 			} );
 		} );
 	}
@@ -10682,7 +9867,7 @@ jQuery.each( [
 
 
 
-jQuery.expr.filters.animated = function( elem ) {
+jQuery.expr.pseudos.animated = function( elem ) {
 	return jQuery.grep( jQuery.timers, function( fn ) {
 		return elem === fn.elem;
 	} ).length;
@@ -10691,16 +9876,11 @@ jQuery.expr.filters.animated = function( elem ) {
 
 
 
-
 /**
  * Gets a window from an element
  */
 function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
+	return jQuery.isWindow( elem ) ? elem : elem.nodeType === 9 && elem.defaultView;
 }
 
 jQuery.offset = {
@@ -10710,7 +9890,7 @@ jQuery.offset = {
 			curElem = jQuery( elem ),
 			props = {};
 
-		// set position first, in-case top/left are set even on static elem
+		// Set position first, in-case top/left are set even on static elem
 		if ( position === "static" ) {
 			elem.style.position = "relative";
 		}
@@ -10719,14 +9899,15 @@ jQuery.offset = {
 		curCSSTop = jQuery.css( elem, "top" );
 		curCSSLeft = jQuery.css( elem, "left" );
 		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
-			jQuery.inArray( "auto", [ curCSSTop, curCSSLeft ] ) > -1;
+			( curCSSTop + curCSSLeft ).indexOf( "auto" ) > -1;
 
-		// need to be able to calculate position if either top or left
-		// is auto and position is either absolute or fixed
+		// Need to be able to calculate position if either
+		// top or left is auto and position is either absolute or fixed
 		if ( calculatePosition ) {
 			curPosition = curElem.position();
 			curTop = curPosition.top;
 			curLeft = curPosition.left;
+
 		} else {
 			curTop = parseFloat( curCSSTop ) || 0;
 			curLeft = parseFloat( curCSSLeft ) || 0;
@@ -10747,6 +9928,7 @@ jQuery.offset = {
 
 		if ( "using" in options ) {
 			options.using.call( elem, props );
+
 		} else {
 			curElem.css( props );
 		}
@@ -10755,6 +9937,8 @@ jQuery.offset = {
 
 jQuery.fn.extend( {
 	offset: function( options ) {
+
+		// Preserve chaining for setter
 		if ( arguments.length ) {
 			return options === undefined ?
 				this :
@@ -10763,32 +9947,36 @@ jQuery.fn.extend( {
 				} );
 		}
 
-		var docElem, win,
-			box = { top: 0, left: 0 },
-			elem = this[ 0 ],
-			doc = elem && elem.ownerDocument;
+		var docElem, win, rect, doc,
+			elem = this[ 0 ];
 
-		if ( !doc ) {
+		if ( !elem ) {
 			return;
 		}
 
-		docElem = doc.documentElement;
-
-		// Make sure it's not a disconnected DOM node
-		if ( !jQuery.contains( docElem, elem ) ) {
-			return box;
+		// Support: IE <=11 only
+		// Running getBoundingClientRect on a
+		// disconnected node in IE throws an error
+		if ( !elem.getClientRects().length ) {
+			return { top: 0, left: 0 };
 		}
 
-		// If we don't have gBCR, just use 0,0 rather than error
-		// BlackBerry 5, iOS 3 (original iPhone)
-		if ( typeof elem.getBoundingClientRect !== "undefined" ) {
-			box = elem.getBoundingClientRect();
+		rect = elem.getBoundingClientRect();
+
+		// Make sure element is not hidden (display: none)
+		if ( rect.width || rect.height ) {
+			doc = elem.ownerDocument;
+			win = getWindow( doc );
+			docElem = doc.documentElement;
+
+			return {
+				top: rect.top + win.pageYOffset - docElem.clientTop,
+				left: rect.left + win.pageXOffset - docElem.clientLeft
+			};
 		}
-		win = getWindow( doc );
-		return {
-			top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
-			left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
-		};
+
+		// Return zeros for disconnected and hidden elements (gh-2310)
+		return rect;
 	},
 
 	position: function() {
@@ -10797,15 +9985,16 @@ jQuery.fn.extend( {
 		}
 
 		var offsetParent, offset,
-			parentOffset = { top: 0, left: 0 },
-			elem = this[ 0 ];
+			elem = this[ 0 ],
+			parentOffset = { top: 0, left: 0 };
 
 		// Fixed elements are offset from window (parentOffset = {top:0, left: 0},
 		// because it is its only offset parent
 		if ( jQuery.css( elem, "position" ) === "fixed" ) {
 
-			// we assume that getBoundingClientRect is available when computed position is fixed
+			// Assume getBoundingClientRect is there when computed position is fixed
 			offset = elem.getBoundingClientRect();
+
 		} else {
 
 			// Get *real* offsetParent
@@ -10818,30 +10007,37 @@ jQuery.fn.extend( {
 			}
 
 			// Add offsetParent borders
-			// Subtract offsetParent scroll positions
-			parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true ) -
-				offsetParent.scrollTop();
-			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true ) -
-				offsetParent.scrollLeft();
+			parentOffset = {
+				top: parentOffset.top + jQuery.css( offsetParent[ 0 ], "borderTopWidth", true ),
+				left: parentOffset.left + jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true )
+			};
 		}
 
 		// Subtract parent offsets and element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
 		return {
-			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
+			top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ),
 			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
 		};
 	},
 
+	// This method will return documentElement in the following cases:
+	// 1) For the element inside the iframe without offsetParent, this method will return
+	//    documentElement of the parent window
+	// 2) For the hidden or detached element
+	// 3) For body or html element, i.e. in case of the html node - it will return itself
+	//
+	// but those exceptions were never presented as a real life use-cases
+	// and might be considered as more preferable results.
+	//
+	// This logic, however, is not guaranteed and can change at any point in the future
 	offsetParent: function() {
 		return this.map( function() {
 			var offsetParent = this.offsetParent;
 
-			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) &&
-				jQuery.css( offsetParent, "position" ) === "static" ) ) {
+			while ( offsetParent && jQuery.css( offsetParent, "position" ) === "static" ) {
 				offsetParent = offsetParent.offsetParent;
 			}
+
 			return offsetParent || documentElement;
 		} );
 	}
@@ -10849,43 +10045,42 @@ jQuery.fn.extend( {
 
 // Create scrollLeft and scrollTop methods
 jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
-	var top = /Y/.test( prop );
+	var top = "pageYOffset" === prop;
 
 	jQuery.fn[ method ] = function( val ) {
 		return access( this, function( elem, method, val ) {
 			var win = getWindow( elem );
 
 			if ( val === undefined ) {
-				return win ? ( prop in win ) ? win[ prop ] :
-					win.document.documentElement[ method ] :
-					elem[ method ];
+				return win ? win[ prop ] : elem[ method ];
 			}
 
 			if ( win ) {
 				win.scrollTo(
-					!top ? val : jQuery( win ).scrollLeft(),
-					top ? val : jQuery( win ).scrollTop()
+					!top ? val : win.pageXOffset,
+					top ? val : win.pageYOffset
 				);
 
 			} else {
 				elem[ method ] = val;
 			}
-		}, method, val, arguments.length, null );
+		}, method, val, arguments.length );
 	};
 } );
 
-// Support: Safari<7-8+, Chrome<37-44+
+// Support: Safari <=7 - 9.1, Chrome <=37 - 49
 // Add the top/left cssHooks using jQuery.fn.position
 // Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-// getComputedStyle returns percent when specified for top/left/bottom/right
-// rather than make the css module depend on the offset module, we just check for it here
+// Blink bug: https://bugs.chromium.org/p/chromium/issues/detail?id=589347
+// getComputedStyle returns percent when specified for top/left/bottom/right;
+// rather than make the css module depend on the offset module, just check for it here
 jQuery.each( [ "top", "left" ], function( i, prop ) {
 	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
 		function( elem, computed ) {
 			if ( computed ) {
 				computed = curCSS( elem, prop );
 
-				// if curCSS returns percentage, fallback to offset
+				// If curCSS returns percentage, fallback to offset
 				return rnumnonpx.test( computed ) ?
 					jQuery( elem ).position()[ prop ] + "px" :
 					computed;
@@ -10898,9 +10093,9 @@ jQuery.each( [ "top", "left" ], function( i, prop ) {
 // Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
 jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
-	function( defaultExtra, funcName ) {
+		function( defaultExtra, funcName ) {
 
-		// margin is only for outerHeight, outerWidth
+		// Margin is only for outerHeight, outerWidth
 		jQuery.fn[ funcName ] = function( margin, value ) {
 			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
 				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
@@ -10910,10 +10105,10 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 
 				if ( jQuery.isWindow( elem ) ) {
 
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
+					// $( window ).outerWidth/Height return w/h including scrollbars (gh-1729)
+					return funcName.indexOf( "outer" ) === 0 ?
+						elem[ "inner" + name ] :
+						elem.document.documentElement[ "client" + name ];
 				}
 
 				// Get document width or height
@@ -10922,8 +10117,6 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 
 					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
 					// whichever is greatest
-					// unfortunately, this causes bug #3838 in IE6/8 only,
-					// but there is currently no good, small way to fix it.
 					return Math.max(
 						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
 						elem.body[ "offset" + name ], doc[ "offset" + name ],
@@ -10938,7 +10131,7 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 
 					// Set width or height on the element
 					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
+			}, type, chainable ? margin : undefined, chainable );
 		};
 	} );
 } );
@@ -10965,12 +10158,7 @@ jQuery.fn.extend( {
 	}
 } );
 
-// The number of elements contained in the matched element set
-jQuery.fn.size = function() {
-	return this.length;
-};
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
+jQuery.parseJSON = JSON.parse;
 
 
 
@@ -10996,6 +10184,7 @@ if ( typeof define === "function" && define.amd ) {
 
 
 
+
 var
 
 	// Map over jQuery in case of overwrite
@@ -11016,12 +10205,16 @@ jQuery.noConflict = function( deep ) {
 	return jQuery;
 };
 
-// Expose jQuery and $ identifiers, even in
-// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
+// Expose jQuery and $ identifiers, even in AMD
+// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
 // and CommonJS for browser emulators (#13566)
 if ( !noGlobal ) {
 	window.jQuery = window.$ = jQuery;
 }
 
+
+
+
+
 return jQuery;
-}));
+} );
diff --git a/htdocs/includes/jquery/js/jquery.min.js b/htdocs/includes/jquery/js/jquery.min.js
index 6c60672fc59..4c5be4c0fbe 100644
--- a/htdocs/includes/jquery/js/jquery.min.js
+++ b/htdocs/includes/jquery/js/jquery.min.js
@@ -1,5 +1,4 @@
-/*! jQuery v1.12.0 | (c) jQuery Foundation | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b in a)return k.call(a,b);for(b in a);return void 0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void 0},now:function(){return+new Date},support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=R.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}if(f=d.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return A.find(a);this.length=1,this[0]=f}return this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||(e=n.uniqueSort(e)),D.test(a)&&(e=e.reverse())),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;
-return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f}}function S(a,b,c){if(M(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}}),function(){var a;l.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,e;return c=d.getElementsByTagName("body")[0],c&&c.style?(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(d.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(e),a):void 0}}();var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),V=["Top","Right","Bottom","Left"],W=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function X(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&U.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var Y=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)Y(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Z=/^(?:checkbox|radio)$/i,$=/<([\w:-]+)/,_=/^$|\/(?:java|ecma)script/i,aa=/^\s+/,ba="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ca(a){var b=ba.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}!function(){var a=d.createElement("div"),b=d.createDocumentFragment(),c=d.createElement("input");a.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",l.leadingWhitespace=3===a.firstChild.nodeType,l.tbody=!a.getElementsByTagName("tbody").length,l.htmlSerialize=!!a.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==d.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,b.appendChild(c),l.appendChecked=c.checked,a.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!a.cloneNode(!0).lastChild.defaultValue,b.appendChild(a),c=d.createElement("input"),c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),a.appendChild(c),l.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!!a.addEventListener,a[n.expando]=1,l.attributes=!a.getAttribute(n.expando)}();var da={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/<tbody/i;function ia(a){Z.test(a.type)&&(a.defaultChecked=a.checked)}function ja(a,b,c,d,e){for(var f,g,h,i,j,k,m,o=a.length,p=ca(b),q=[],r=0;o>r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?"<table>"!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.rnamespace||a.rnamespace.test(g.namespace))&&(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ma.test(f)?this.mouseHooks:la.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=g.srcElement||d),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,h.filter?h.filter(a,g):a},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,e,f,g=b.button,h=b.fromElement;return null==a.pageX&&null!=b.clientX&&(e=a.target.ownerDocument||d,f=e.documentElement,c=e.body,a.pageX=b.clientX+(f&&f.scrollLeft||c&&c.scrollLeft||0)-(f&&f.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(f&&f.scrollTop||c&&c.scrollTop||0)-(f&&f.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&h&&(a.relatedTarget=h===a.target?b.toElement:h),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==ra()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===ra()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c){var d=n.extend(new n.Event,c,{type:a,isSimulated:!0});n.event.trigger(d,null,b),d.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=d.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)}:function(a,b,c){var d="on"+b;a.detachEvent&&("undefined"==typeof a[d]&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?pa:qa):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={constructor:n.Event,isDefaultPrevented:qa,isPropagationStopped:qa,isImmediatePropagationStopped:qa,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=pa,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=pa,a&&!this.isSimulated&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=pa,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submit||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?n.prop(b,"form"):void 0;c&&!n._data(c,"submit")&&(n.event.add(c,"submit._submit",function(a){a._submitBubble=!0}),n._data(c,"submit",!0))})},postDispatch:function(a){a._submitBubble&&(delete a._submitBubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.change||(n.event.special.change={setup:function(){return ka.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._justChanged=!0)}),n.event.add(this,"click._change",function(a){this._justChanged&&!a.isTrigger&&(this._justChanged=!1),n.event.simulate("change",this,a)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;ka.test(b.nodeName)&&!n._data(b,"change")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a)}),n._data(b,"change",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!ka.test(this.nodeName)}}),l.focusin||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a))};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d){return sa(this,a,b,c,d)},one:function(a,b,c,d){return sa(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=qa),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var ta=/ jQuery\d+="(?:null|\d+)"/g,ua=new RegExp("<(?:"+ba+")[\\s/>]","i"),va=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,wa=/<script|<style|<link/i,xa=/checked\s*(?:[^=]|=\s*.checked.)/i,ya=/^true\/(.*)/,za=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Ja[0].contentWindow||Ja[0].contentDocument).document,b.write(),b.close(),c=La(a,b),Ja.detach()),Ka[a]=c),c}var Na=/^margin/,Oa=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Pa=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e},Qa=d.documentElement;!function(){var b,c,e,f,g,h,i=d.createElement("div"),j=d.createElement("div");if(j.style){j.style.cssText="float:left;opacity:.5",l.opacity="0.5"===j.style.opacity,l.cssFloat=!!j.style.cssFloat,j.style.backgroundClip="content-box",j.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===j.style.backgroundClip,i=d.createElement("div"),i.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",j.innerHTML="",i.appendChild(j),l.boxSizing=""===j.style.boxSizing||""===j.style.MozBoxSizing||""===j.style.WebkitBoxSizing,n.extend(l,{reliableHiddenOffsets:function(){return null==b&&k(),f},boxSizingReliable:function(){return null==b&&k(),e},pixelMarginRight:function(){return null==b&&k(),c},pixelPosition:function(){return null==b&&k(),b},reliableMarginRight:function(){return null==b&&k(),g},reliableMarginLeft:function(){return null==b&&k(),h}});function k(){var k,l,m=d.documentElement;m.appendChild(i),j.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",b=e=h=!1,c=g=!0,a.getComputedStyle&&(l=a.getComputedStyle(j),b="1%"!==(l||{}).top,h="2px"===(l||{}).marginLeft,e="4px"===(l||{width:"4px"}).width,j.style.marginRight="50%",c="4px"===(l||{marginRight:"4px"}).marginRight,k=j.appendChild(d.createElement("div")),k.style.cssText=j.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",k.style.marginRight=k.style.width="0",j.style.width="1px",g=!parseFloat((a.getComputedStyle(k)||{}).marginRight),j.removeChild(k)),j.style.display="none",f=0===j.getClientRects().length,f&&(j.style.display="",j.innerHTML="<table><tr><td></td><td>t</td></tr></table>",k=j.getElementsByTagName("td"),k[0].style.cssText="margin:0;border:0;padding:0;display:none",f=0===k[0].offsetHeight,f&&(k[0].style.display="",k[1].style.display="none",f=0===k[0].offsetHeight)),m.removeChild(i)}}}();var Ra,Sa,Ta=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ra=function(b){var c=b.ownerDocument.defaultView;return c.opener||(c=a),c.getComputedStyle(b)},Sa=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ra(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),!l.pixelMarginRight()&&Oa.test(g)&&Na.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):Qa.currentStyle&&(Ra=function(a){return a.currentStyle},Sa=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ra(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Oa.test(g)&&!Ta.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Ua(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Va=/alpha\([^)]*\)/i,Wa=/opacity\s*=\s*([^)]*)/i,Xa=/^(none|table(?!-c[ea]).+)/,Ya=new RegExp("^("+T+")(.*)$","i"),Za={position:"absolute",visibility:"hidden",display:"block"},$a={letterSpacing:"0",fontWeight:"400"},_a=["Webkit","O","Moz","ms"],ab=d.createElement("div").style;function bb(a){if(a in ab)return a;var b=a.charAt(0).toUpperCase()+a.slice(1),c=_a.length;while(c--)if(a=_a[c]+b,a in ab)return a}function cb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&W(d)&&(f[g]=n._data(d,"olddisplay",Ma(d.nodeName)))):(e=W(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function db(a,b,c){var d=Ya.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function eb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+V[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+V[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+V[f]+"Width",!0,e))):(g+=n.css(a,"padding"+V[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+V[f]+"Width",!0,e)));return g}function fb(b,c,e){var f=!0,g="width"===c?b.offsetWidth:b.offsetHeight,h=Ra(b),i=l.boxSizing&&"border-box"===n.css(b,"boxSizing",!1,h);if(d.msFullscreenElement&&a.top!==a&&b.getClientRects().length&&(g=Math.round(100*b.getBoundingClientRect()[c])),0>=g||null==g){if(g=Sa(b,c,h),(0>g||null==g)&&(g=b.style[c]),Oa.test(g))return g;f=i&&(l.boxSizingReliable()||g===b.style[c]),g=parseFloat(g)||0}return g+eb(b,c,e||(i?"border":"content"),f,h)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Sa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=bb(h)||h),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=U.exec(c))&&e[1]&&(c=X(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=bb(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Sa(a,b,d)),"normal"===f&&b in $a&&(f=$a[b]),""===c||c?(e=parseFloat(f),c===!0||isFinite(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Xa.test(n.css(a,"display"))&&0===a.offsetWidth?Pa(a,Za,function(){return fb(a,b,d)}):fb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ra(a);return db(a,c,d?eb(a,b,d,l.boxSizing&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Wa.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Va,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Va.test(f)?f.replace(Va,e):f+" "+e)}}),n.cssHooks.marginRight=Ua(l.reliableMarginRight,function(a,b){return b?Pa(a,{display:"inline-block"},Sa,[a,"marginRight"]):void 0}),n.cssHooks.marginLeft=Ua(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Sa(a,"marginLeft"))||(n.contains(a.ownerDocument,a)?a.getBoundingClientRect().left-Pa(a,{
-marginLeft:0},function(){return a.getBoundingClientRect().left}):0))+"px":void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+V[d]+b]=f[d]||f[d-2]||f[0];return e}},Na.test(a)||(n.cssHooks[a+b].set=db)}),n.fn.extend({css:function(a,b){return Y(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ra(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return cb(this,!0)},hide:function(){return cb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){W(this)?n(this).show():n(this).hide()})}});function gb(a,b,c,d,e){return new gb.prototype.init(a,b,c,d,e)}n.Tween=gb,gb.prototype={constructor:gb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=gb.propHooks[this.prop];return a&&a.get?a.get(this):gb.propHooks._default.get(this)},run:function(a){var b,c=gb.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):gb.propHooks._default.set(this),this}},gb.prototype.init.prototype=gb.prototype,gb.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},gb.propHooks.scrollTop=gb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},n.fx=gb.prototype.init,n.fx.step={};var hb,ib,jb=/^(?:toggle|show|hide)$/,kb=/queueHooks$/;function lb(){return a.setTimeout(function(){hb=void 0}),hb=n.now()}function mb(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=V[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function nb(a,b,c){for(var d,e=(qb.tweeners[b]||[]).concat(qb.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ob(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&W(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k="none"===j?n._data(a,"olddisplay")||Ma(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==Ma(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],jb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(o))"inline"===("none"===j?Ma(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=nb(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function pb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function qb(a,b,c){var d,e,f=0,g=qb.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=hb||lb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:hb||lb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(pb(k,j.opts.specialEasing);g>f;f++)if(d=qb.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,nb,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(qb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return X(c.elem,a,U.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],qb.tweeners[c]=qb.tweeners[c]||[],qb.tweeners[c].unshift(b)},prefilters:[ob],prefilter:function(a,b){b?qb.prefilters.unshift(a):qb.prefilters.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(W).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=qb(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&kb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(mb(b,!0),a,d,e)}}),n.each({slideDown:mb("show"),slideUp:mb("hide"),slideToggle:mb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(hb=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),hb=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ib||(ib=a.setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){a.clearInterval(ib),ib=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(b,c){return b=n.fx?n.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a,b=d.createElement("input"),c=d.createElement("div"),e=d.createElement("select"),f=e.appendChild(d.createElement("option"));c=d.createElement("div"),c.setAttribute("className","t"),c.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],b.setAttribute("type","checkbox"),c.appendChild(b),a=c.getElementsByTagName("a")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==c.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=f.selected,l.enctype=!!d.createElement("form").enctype,e.disabled=!0,l.optDisabled=!f.disabled,b=d.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value}();var rb=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(rb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],(c.selected||i===e)&&(l.optDisabled?!c.disabled:null===c.getAttribute("disabled"))&&(!c.parentNode.disabled||!n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>-1:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var sb,tb,ub=n.expr.attrHandle,vb=/^(?:checked|selected)$/i,wb=l.getSetAttribute,xb=l.input;n.fn.extend({attr:function(a,b){return Y(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),e=n.attrHooks[b]||(n.expr.match.bool.test(b)?tb:sb)),void 0!==c?null===c?void n.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=n.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(G);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?xb&&wb||!vb.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(wb?c:d)}}),tb={set:function(a,b,c){return b===!1?n.removeAttr(a,c):xb&&wb||!vb.test(c)?a.setAttribute(!wb&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=ub[b]||n.find.attr;xb&&wb||!vb.test(b)?ub[b]=function(a,b,d){var e,f;return d||(f=ub[b],ub[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,ub[b]=f),e}:ub[b]=function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),xb&&wb||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):sb&&sb.set(a,b,c)}}),wb||(sb={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},ub.id=ub.name=ub.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:sb.set},n.attrHooks.contenteditable={set:function(a,b,c){sb.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var yb=/^(?:input|select|textarea|button|object)$/i,zb=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return Y(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&n.isXMLDoc(a)||(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):yb.test(a.nodeName)||zb.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var Ab=/[\t\r\n\f]/g;function Bb(a){return n.attr(a,"class")||""}n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,Bb(this)))});if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=Bb(c),d=1===c.nodeType&&(" "+e+" ").replace(Ab," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=n.trim(d),e!==h&&n.attr(c,"class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,Bb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=Bb(c),d=1===c.nodeType&&(" "+e+" ").replace(Ab," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=n.trim(d),e!==h&&n.attr(c,"class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):n.isFunction(a)?this.each(function(c){n(this).toggleClass(a.call(this,c,Bb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=n(this),f=a.match(G)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(void 0===a||"boolean"===c)&&(b=Bb(this),b&&n._data(this,"__className__",b),n.attr(this,"class",b||a===!1?"":n._data(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+Bb(c)+" ").replace(Ab," ").indexOf(b)>-1)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Cb=a.location,Db=n.now(),Eb=/\?/,Fb=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(Fb,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new a.DOMParser,c=d.parseFromString(b,"text/xml")):(c=new a.ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var Gb=/#.*$/,Hb=/([?&])_=[^&]*/,Ib=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Jb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Kb=/^(?:GET|HEAD)$/,Lb=/^\/\//,Mb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Nb={},Ob={},Pb="*/".concat("*"),Qb=Cb.href,Rb=Mb.exec(Qb.toLowerCase())||[];function Sb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(G)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Tb(a,b,c,d){var e={},f=a===Ob;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Ub(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Vb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Wb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Qb,type:"GET",isLocal:Jb.test(Rb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Pb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Ub(Ub(a,n.ajaxSettings),b):Ub(n.ajaxSettings,a)},ajaxPrefilter:Sb(Nb),ajaxTransport:Sb(Ob),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var d,e,f,g,h,i,j,k,l=n.ajaxSetup({},c),m=l.context||l,o=l.context&&(m.nodeType||m.jquery)?n(m):n.event,p=n.Deferred(),q=n.Callbacks("once memory"),r=l.statusCode||{},s={},t={},u=0,v="canceled",w={readyState:0,getResponseHeader:function(a){var b;if(2===u){if(!k){k={};while(b=Ib.exec(g))k[b[1].toLowerCase()]=b[2]}b=k[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===u?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return u||(a=t[c]=t[c]||a,s[a]=b),this},overrideMimeType:function(a){return u||(l.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>u)for(b in a)r[b]=[r[b],a[b]];else w.always(a[w.status]);return this},abort:function(a){var b=a||v;return j&&j.abort(b),y(0,b),this}};if(p.promise(w).complete=q.add,w.success=w.done,w.error=w.fail,l.url=((b||l.url||Qb)+"").replace(Gb,"").replace(Lb,Rb[1]+"//"),l.type=c.method||c.type||l.method||l.type,l.dataTypes=n.trim(l.dataType||"*").toLowerCase().match(G)||[""],null==l.crossDomain&&(d=Mb.exec(l.url.toLowerCase()),l.crossDomain=!(!d||d[1]===Rb[1]&&d[2]===Rb[2]&&(d[3]||("http:"===d[1]?"80":"443"))===(Rb[3]||("http:"===Rb[1]?"80":"443")))),l.data&&l.processData&&"string"!=typeof l.data&&(l.data=n.param(l.data,l.traditional)),Tb(Nb,l,c,w),2===u)return w;i=n.event&&l.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),l.type=l.type.toUpperCase(),l.hasContent=!Kb.test(l.type),f=l.url,l.hasContent||(l.data&&(f=l.url+=(Eb.test(f)?"&":"?")+l.data,delete l.data),l.cache===!1&&(l.url=Hb.test(f)?f.replace(Hb,"$1_="+Db++):f+(Eb.test(f)?"&":"?")+"_="+Db++)),l.ifModified&&(n.lastModified[f]&&w.setRequestHeader("If-Modified-Since",n.lastModified[f]),n.etag[f]&&w.setRequestHeader("If-None-Match",n.etag[f])),(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&w.setRequestHeader("Content-Type",l.contentType),w.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+("*"!==l.dataTypes[0]?", "+Pb+"; q=0.01":""):l.accepts["*"]);for(e in l.headers)w.setRequestHeader(e,l.headers[e]);if(l.beforeSend&&(l.beforeSend.call(m,w,l)===!1||2===u))return w.abort();v="abort";for(e in{success:1,error:1,complete:1})w[e](l[e]);if(j=Tb(Ob,l,c,w)){if(w.readyState=1,i&&o.trigger("ajaxSend",[w,l]),2===u)return w;l.async&&l.timeout>0&&(h=a.setTimeout(function(){w.abort("timeout")},l.timeout));try{u=1,j.send(s,y)}catch(x){if(!(2>u))throw x;y(-1,x)}}else y(-1,"No Transport");function y(b,c,d,e){var k,s,t,v,x,y=c;2!==u&&(u=2,h&&a.clearTimeout(h),j=void 0,g=e||"",w.readyState=b>0?4:0,k=b>=200&&300>b||304===b,d&&(v=Vb(l,w,d)),v=Wb(l,v,w,k),k?(l.ifModified&&(x=w.getResponseHeader("Last-Modified"),x&&(n.lastModified[f]=x),x=w.getResponseHeader("etag"),x&&(n.etag[f]=x)),204===b||"HEAD"===l.type?y="nocontent":304===b?y="notmodified":(y=v.state,s=v.data,t=v.error,k=!t)):(t=y,(b||!y)&&(y="error",0>b&&(b=0))),w.status=b,w.statusText=(c||y)+"",k?p.resolveWith(m,[s,y,w]):p.rejectWith(m,[w,y,t]),w.statusCode(r),r=void 0,i&&o.trigger(k?"ajaxSuccess":"ajaxError",[w,l,k?s:t]),q.fireWith(m,[w,y]),i&&(o.trigger("ajaxComplete",[w,l]),--n.active||n.event.trigger("ajaxStop")))}return w},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax(n.extend({url:a,type:b,dataType:e,data:c,success:d},n.isPlainObject(a)&&a))}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return n.isFunction(a)?this.each(function(b){n(this).wrapInner(a.call(this,b))}):this.each(function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}});function Xb(a){return a.style&&a.style.display||n.css(a,"display")}function Yb(a){while(a&&1===a.nodeType){if("none"===Xb(a)||"hidden"===a.type)return!0;a=a.parentNode}return!1}n.expr.filters.hidden=function(a){return l.reliableHiddenOffsets()?a.offsetWidth<=0&&a.offsetHeight<=0&&!a.getClientRects().length:Yb(a)},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var Zb=/%20/g,$b=/\[\]$/,_b=/\r?\n/g,ac=/^(?:submit|button|image|reset|file)$/i,bc=/^(?:input|select|textarea|keygen)/i;function cc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||$b.test(a)?d(a,e):cc(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)cc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)cc(c,a[c],b,e);return d.join("&").replace(Zb,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&bc.test(this.nodeName)&&!ac.test(a)&&(this.checked||!Z.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(_b,"\r\n")}}):{name:b.name,value:c.replace(_b,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return this.isLocal?hc():d.documentMode>8?gc():/^(get|post|head|put|delete|options)$/i.test(this.type)&&gc()||hc()}:gc;var dc=0,ec={},fc=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in ec)ec[a](void 0,!0)}),l.cors=!!fc&&"withCredentials"in fc,fc=l.ajax=!!fc,fc&&n.ajaxTransport(function(b){if(!b.crossDomain||l.cors){var c;return{send:function(d,e){var f,g=b.xhr(),h=++dc;if(g.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(f in b.xhrFields)g[f]=b.xhrFields[f];b.mimeType&&g.overrideMimeType&&g.overrideMimeType(b.mimeType),b.crossDomain||d["X-Requested-With"]||(d["X-Requested-With"]="XMLHttpRequest");for(f in d)void 0!==d[f]&&g.setRequestHeader(f,d[f]+"");g.send(b.hasContent&&b.data||null),c=function(a,d){var f,i,j;if(c&&(d||4===g.readyState))if(delete ec[h],c=void 0,g.onreadystatechange=n.noop,d)4!==g.readyState&&g.abort();else{j={},f=g.status,"string"==typeof g.responseText&&(j.text=g.responseText);try{i=g.statusText}catch(k){i=""}f||!b.isLocal||b.crossDomain?1223===f&&(f=204):f=j.text?200:404}j&&e(f,i,j,g.getAllResponseHeaders())},b.async?4===g.readyState?a.setTimeout(c):g.onreadystatechange=ec[h]=c:c()},abort:function(){c&&c(void 0,!0)}}}});function gc(){try{return new a.XMLHttpRequest}catch(b){}}function hc(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=d.head||n("head")[0]||d.documentElement;return{send:function(e,f){b=d.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||f(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var ic=[],jc=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=ic.pop()||n.expando+"_"+Db++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(jc.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&jc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(jc,"$1"+e):b.jsonp!==!1&&(b.url+=(Eb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?n(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,ic.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),l.createHTMLDocument=function(){if(!d.implementation.createHTMLDocument)return!1;var a=d.implementation.createHTMLDocument("");return a.body.innerHTML="<form></form><form></form>",2===a.body.childNodes.length}(),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||(l.createHTMLDocument?d.implementation.createHTMLDocument(""):d);var e=x.exec(a),f=!c&&[];return e?[b.createElement(e[1])]:(e=ja([a],b,f),f&&f.length&&n(f).remove(),n.merge([],e.childNodes))};var kc=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&kc)return kc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=n.trim(a.slice(h,a.length)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(g,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function lc(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?("undefined"!=typeof e.getBoundingClientRect&&(d=e.getBoundingClientRect()),c=lc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0)-a.scrollTop(),c.left+=n.css(a[0],"borderLeftWidth",!0)-a.scrollLeft()),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Qa})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return Y(this,function(a,d,e){var f=lc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){
-n.cssHooks[b]=Ua(l.pixelPosition,function(a,c){return c?(c=Sa(a,b),Oa.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return Y(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var mc=a.jQuery,nc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=nc),b&&a.jQuery===n&&(a.jQuery=mc),n},b||(a.jQuery=a.$=n),n});
+/*! jQuery v3.1.1 | (c) jQuery Foundation | jquery.org/license */
+!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.1.1",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null==a?f.call(this):a<0?this[a+this.length]:this[a]},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c<b?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:h,sort:c.sort,splice:c.splice},r.extend=r.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||r.isFunction(g)||(g={}),h===i&&(g=this,h--);h<i;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(r.isPlainObject(d)||(e=r.isArray(d)))?(e?(e=!1,f=c&&r.isArray(c)?c:[]):f=c&&r.isPlainObject(c)?c:{},g[b]=r.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},r.extend({expando:"jQuery"+(q+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===r.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=r.type(a);return("number"===b||"string"===b)&&!isNaN(a-parseFloat(a))},isPlainObject:function(a){var b,c;return!(!a||"[object Object]"!==k.call(a))&&(!(b=e(a))||(c=l.call(b,"constructor")&&b.constructor,"function"==typeof c&&m.call(c)===n))},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?j[k.call(a)]||"object":typeof a},globalEval:function(a){p(a)},camelCase:function(a){return a.replace(t,"ms-").replace(u,v)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(w(a)){for(c=a.length;d<c;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(s,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(w(Object(a))?r.merge(c,"string"==typeof a?[a]:a):h.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:i.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;d<c;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;f<g;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,f=0,h=[];if(w(a))for(d=a.length;f<d;f++)e=b(a[f],f,c),null!=e&&h.push(e);else for(f in a)e=b(a[f],f,c),null!=e&&h.push(e);return g.apply([],h)},guid:1,proxy:function(a,b){var c,d,e;if("string"==typeof b&&(c=a[b],b=a,a=c),r.isFunction(a))return d=f.call(arguments,2),e=function(){return a.apply(b||this,d.concat(f.call(arguments)))},e.guid=a.guid=a.guid||r.guid++,e},now:Date.now,support:o}),"function"==typeof Symbol&&(r.fn[Symbol.iterator]=c[Symbol.iterator]),r.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){j["[object "+b+"]"]=b.toLowerCase()});function w(a){var b=!!a&&"length"in a&&a.length,c=r.type(a);return"function"!==c&&!r.isWindow(a)&&("array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",M="\\["+K+"*("+L+")(?:"+K+"*([*^$|!~]?=)"+K+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+L+"))|)"+K+"*\\]",N=":("+L+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+M+")*)|.*)\\)|)",O=new RegExp(K+"+","g"),P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0&&("form"in a||"label"in a)},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"form"in b?b.parentNode&&b.disabled===!1?"label"in b?"label"in b.parentNode?b.parentNode.disabled===a:b.disabled===a:b.isDisabled===a||b.isDisabled!==!a&&ea(b)===a:b.disabled===a:"label"in b&&b.disabled===a}}function pa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}}):(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c,d,e,f=b.getElementById(a);if(f){if(c=f.getAttributeNode("id"),c&&c.value===a)return[f];e=b.getElementsByName(a),d=0;while(f=e[d++])if(c=f.getAttributeNode("id"),c&&c.value===a)return[f]}return[]}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(_,aa).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:!b||(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:oa(!1),disabled:oa(!0),checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c<b;c+=2)a.push(c);return a}),odd:pa(function(a,b){for(var c=1;c<b;c+=2)a.push(c);return a}),lt:pa(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function ra(){}ra.prototype=d.filters=d.pseudos,d.setFilters=new ra,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=Q.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function sa(a){for(var b=0,c=a.length,d="";b<c;b++)d+=a[b].value;return d}function ta(a,b,c){var d=b.dir,e=b.next,f=e||d,g=c&&"parentNode"===f,h=x++;return b.first?function(b,c,e){while(b=b[d])if(1===b.nodeType||g)return a(b,c,e);return!1}:function(b,c,i){var j,k,l,m=[w,h];if(i){while(b=b[d])if((1===b.nodeType||g)&&a(b,c,i))return!0}else while(b=b[d])if(1===b.nodeType||g)if(l=b[u]||(b[u]={}),k=l[b.uniqueID]||(l[b.uniqueID]={}),e&&e===b.nodeName.toLowerCase())b=b[d]||b;else{if((j=k[f])&&j[0]===w&&j[1]===h)return m[2]=j[2];if(k[f]=m,m[2]=a(b,c,i))return!0}return!1}}function ua(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function va(a,b,c){for(var d=0,e=b.length;d<e;d++)ga(a,b[d],c);return c}function wa(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;h<i;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function xa(a,b,c,d,e,f){return d&&!d[u]&&(d=xa(d)),e&&!e[u]&&(e=xa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||va(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:wa(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=wa(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];i<f;i++)if(c=d.relative[a[i].type])m=[ta(ua(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;e<f;e++)if(d.relative[a[e].type])break;return xa(i>1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i<e&&ya(a.slice(i,e)),e<f&&ya(a=a.slice(e)),e<f&&sa(a))}m.push(c)}return ua(m)}function za(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.select=function(a,b,c,e){var f,i,j,k,l,m="function"==typeof a&&a,n=!e&&g(a=m.selector||a);if(c=c||[],1===n.length){if(i=n[0]=n[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&9===b.nodeType&&p&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(_,aa),b)||[])[0],!b)return c;m&&(b=b.parentNode),a=a.slice(i.shift().value.length)}f=V.needsContext.test(a)?0:i.length;while(f--){if(j=i[f],d.relative[k=j.type])break;if((l=d.find[k])&&(e=l(j.matches[0].replace(_,aa),$.test(i[0].type)&&qa(b.parentNode)||b))){if(i.splice(f,1),a=e.length&&sa(i),!a)return G.apply(c,e),c;break}}}return(m||h(a,n))(e,b,!p,c,!b||$.test(a)&&qa(b.parentNode)||b),c},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext,B=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,C=/^.[^:#\[\.,]*$/;function D(a,b,c){return r.isFunction(b)?r.grep(a,function(a,d){return!!b.call(a,d,a)!==c}):b.nodeType?r.grep(a,function(a){return a===b!==c}):"string"!=typeof b?r.grep(a,function(a){return i.call(b,a)>-1!==c}):C.test(b)?r.filter(b,a,c):(b=r.filter(b,a),r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType}))}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b<d;b++)if(r.contains(e[b],this))return!0}));for(c=this.pushStack([]),b=0;b<d;b++)r.find(a,e[b],c);return d>1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(D(this,a||[],!1))},not:function(a){return this.pushStack(D(this,a||[],!0))},is:function(a){return!!D(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var E,F=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,G=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||E,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:F.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),B.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};G.prototype=r.fn,E=r(d);var H=/^(?:parents|prev(?:Until|All))/,I={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a<c;a++)if(r.contains(this,b[a]))return!0})},closest:function(a,b){var c,d=0,e=this.length,f=[],g="string"!=typeof a&&r(a);if(!A.test(a))for(;d<e;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function J(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return J(a,"nextSibling")},prev:function(a){return J(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return a.contentDocument||r.merge([],a.childNodes)}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(I[a]||r.uniqueSort(e),H.test(a)&&e.reverse()),this.pushStack(e)}});var K=/[^\x20\t\r\n\f]+/g;function L(a){var b={};return r.each(a.match(K)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?L(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){r.each(b,function(b,c){r.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==r.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return r.each(arguments,function(a,b){var c;while((c=r.inArray(b,f,c))>-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function M(a){return a}function N(a){throw a}function O(a,b,c){var d;try{a&&r.isFunction(d=a.promise)?d.call(a).done(b).fail(c):a&&r.isFunction(d=a.then)?d.call(a,b,c):b.call(void 0,a)}catch(a){c.call(void 0,a)}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b<f)){if(a=d.apply(h,i),a===c.promise())throw new TypeError("Thenable self-resolution");j=a&&("object"==typeof a||"function"==typeof a)&&a.then,r.isFunction(j)?e?j.call(a,g(f,c,M,e),g(f,c,N,e)):(f++,j.call(a,g(f,c,M,e),g(f,c,N,e),g(f,c,M,c.notifyWith))):(d!==M&&(h=void 0,i=[a]),(e||c.resolveWith)(h,i))}},k=e?j:function(){try{j()}catch(a){r.Deferred.exceptionHook&&r.Deferred.exceptionHook(a,k.stackTrace),b+1>=f&&(d!==N&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:M,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:M)),c[2][3].add(g(0,a,r.isFunction(d)?d:N))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(O(a,g.done(h(c)).resolve,g.reject),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)O(e[c],h(c),g.reject);return g.promise()}});var P=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&P.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var Q=r.Deferred();r.fn.ready=function(a){return Q.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,holdReady:function(a){a?r.readyWait++:r.ready(!0)},ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||Q.resolveWith(d,[r]))}}),r.ready.then=Q.then;function R(){d.removeEventListener("DOMContentLoaded",R),
+a.removeEventListener("load",R),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",R),a.addEventListener("load",R));var S=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)S(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h<i;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},T=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function U(){this.expando=r.expando+U.uid++}U.uid=1,U.prototype={cache:function(a){var b=a[this.expando];return b||(b={},T(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[r.camelCase(b)]=c;else for(d in b)e[r.camelCase(d)]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][r.camelCase(b)]},access:function(a,b,c){return void 0===b||b&&"string"==typeof b&&void 0===c?this.get(a,b):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d=a[this.expando];if(void 0!==d){if(void 0!==b){r.isArray(b)?b=b.map(r.camelCase):(b=r.camelCase(b),b=b in d?[b]:b.match(K)||[]),c=b.length;while(c--)delete d[b[c]]}(void 0===b||r.isEmptyObject(d))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!r.isEmptyObject(b)}};var V=new U,W=new U,X=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Y=/[A-Z]/g;function Z(a){return"true"===a||"false"!==a&&("null"===a?null:a===+a+""?+a:X.test(a)?JSON.parse(a):a)}function $(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Y,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c=Z(c)}catch(e){}W.set(a,b,c)}else c=void 0;return c}r.extend({hasData:function(a){return W.hasData(a)||V.hasData(a)},data:function(a,b,c){return W.access(a,b,c)},removeData:function(a,b){W.remove(a,b)},_data:function(a,b,c){return V.access(a,b,c)},_removeData:function(a,b){V.remove(a,b)}}),r.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=W.get(f),1===f.nodeType&&!V.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=r.camelCase(d.slice(5)),$(f,d,e[d])));V.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){W.set(this,a)}):S(this,function(b){var c;if(f&&void 0===b){if(c=W.get(f,a),void 0!==c)return c;if(c=$(f,a),void 0!==c)return c}else this.each(function(){W.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){W.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=V.get(a,b),c&&(!d||r.isArray(c)?d=V.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return V.get(a,c)||V.access(a,c,{empty:r.Callbacks("once memory").add(function(){V.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?r.queue(this[0],a):void 0===b?this:this.each(function(){var c=r.queue(this,a,b);r._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&r.dequeue(this,a)})},dequeue:function(a){return this.each(function(){r.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=r.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=V.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var _=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,aa=new RegExp("^(?:([+-])=|)("+_+")([a-z%]*)$","i"),ba=["Top","Right","Bottom","Left"],ca=function(a,b){return a=b||a,"none"===a.style.display||""===a.style.display&&r.contains(a.ownerDocument,a)&&"none"===r.css(a,"display")},da=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};function ea(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return r.css(a,b,"")},i=h(),j=c&&c[3]||(r.cssNumber[b]?"":"px"),k=(r.cssNumber[b]||"px"!==j&&+i)&&aa.exec(r.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,r.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var fa={};function ga(a){var b,c=a.ownerDocument,d=a.nodeName,e=fa[d];return e?e:(b=c.body.appendChild(c.createElement(d)),e=r.css(b,"display"),b.parentNode.removeChild(b),"none"===e&&(e="block"),fa[d]=e,e)}function ha(a,b){for(var c,d,e=[],f=0,g=a.length;f<g;f++)d=a[f],d.style&&(c=d.style.display,b?("none"===c&&(e[f]=V.get(d,"display")||null,e[f]||(d.style.display="")),""===d.style.display&&ca(d)&&(e[f]=ga(d))):"none"!==c&&(e[f]="none",V.set(d,"display",c)));for(f=0;f<g;f++)null!=e[f]&&(a[f].style.display=e[f]);return a}r.fn.extend({show:function(){return ha(this,!0)},hide:function(){return ha(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){ca(this)?r(this).show():r(this).hide()})}});var ia=/^(?:checkbox|radio)$/i,ja=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,ka=/^$|\/(?:java|ecma)script/i,la={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};la.optgroup=la.option,la.tbody=la.tfoot=la.colgroup=la.caption=la.thead,la.th=la.td;function ma(a,b){var c;return c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[],void 0===b||b&&r.nodeName(a,b)?r.merge([a],c):c}function na(a,b){for(var c=0,d=a.length;c<d;c++)V.set(a[c],"globalEval",!b||V.get(b[c],"globalEval"))}var oa=/<|&#?\w+;/;function pa(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],n=0,o=a.length;n<o;n++)if(f=a[n],f||0===f)if("object"===r.type(f))r.merge(m,f.nodeType?[f]:f);else if(oa.test(f)){g=g||l.appendChild(b.createElement("div")),h=(ja.exec(f)||["",""])[1].toLowerCase(),i=la[h]||la._default,g.innerHTML=i[1]+r.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;r.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",n=0;while(f=m[n++])if(d&&r.inArray(f,d)>-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=ma(l.appendChild(f),"script"),j&&na(g),c){k=0;while(f=g[k++])ka.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var qa=d.documentElement,ra=/^key/,sa=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,ta=/^([^.]*)(?:\.(.+)|)/;function ua(){return!0}function va(){return!1}function wa(){try{return d.activeElement}catch(a){}}function xa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)xa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=va;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(qa,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(K)||[""],j=b.length;while(j--)h=ta.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.hasData(a)&&V.get(a);if(q&&(i=q.events)){b=(b||"").match(K)||[""],j=b.length;while(j--)if(h=ta.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&V.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(V.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c<arguments.length;c++)i[c]=arguments[c];if(b.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,b)!==!1){h=r.event.handlers.call(this,b,j),c=0;while((f=h[c++])&&!b.isPropagationStopped()){b.currentTarget=f.elem,d=0;while((g=f.handlers[d++])&&!b.isImmediatePropagationStopped())b.rnamespace&&!b.rnamespace.test(g.namespace)||(b.handleObj=g,b.data=g.data,e=((r.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(b.result=e)===!1&&(b.preventDefault(),b.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,b),b.result}},handlers:function(a,b){var c,d,e,f,g,h=[],i=b.delegateCount,j=a.target;if(i&&j.nodeType&&!("click"===a.type&&a.button>=1))for(;j!==this;j=j.parentNode||this)if(1===j.nodeType&&("click"!==a.type||j.disabled!==!0)){for(f=[],g={},c=0;c<i;c++)d=b[c],e=d.selector+" ",void 0===g[e]&&(g[e]=d.needsContext?r(e,this).index(j)>-1:r.find(e,this,null,[j]).length),g[e]&&f.push(d);f.length&&h.push({elem:j,handlers:f})}return j=this,i<b.length&&h.push({elem:j,handlers:b.slice(i)}),h},addProp:function(a,b){Object.defineProperty(r.Event.prototype,a,{enumerable:!0,configurable:!0,get:r.isFunction(b)?function(){if(this.originalEvent)return b(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[a]},set:function(b){Object.defineProperty(this,a,{enumerable:!0,configurable:!0,writable:!0,value:b})}})},fix:function(a){return a[r.expando]?a:new r.Event(a)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==wa()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===wa()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&r.nodeName(this,"input"))return this.click(),!1},_default:function(a){return r.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},r.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},r.Event=function(a,b){return this instanceof r.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ua:va,this.target=a.target&&3===a.target.nodeType?a.target.parentNode:a.target,this.currentTarget=a.currentTarget,this.relatedTarget=a.relatedTarget):this.type=a,b&&r.extend(this,b),this.timeStamp=a&&a.timeStamp||r.now(),void(this[r.expando]=!0)):new r.Event(a,b)},r.Event.prototype={constructor:r.Event,isDefaultPrevented:va,isPropagationStopped:va,isImmediatePropagationStopped:va,isSimulated:!1,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ua,a&&!this.isSimulated&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ua,a&&!this.isSimulated&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ua,a&&!this.isSimulated&&a.stopImmediatePropagation(),this.stopPropagation()}},r.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(a){var b=a.button;return null==a.which&&ra.test(a.type)?null!=a.charCode?a.charCode:a.keyCode:!a.which&&void 0!==b&&sa.test(a.type)?1&b?1:2&b?3:4&b?2:0:a.which}},r.event.addProp),r.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){r.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||r.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),r.fn.extend({on:function(a,b,c,d){return xa(this,a,b,c,d)},one:function(a,b,c,d){return xa(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,r(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=va),this.each(function(){r.event.remove(this,a,c,b)})}});var ya=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,za=/<script|<style|<link/i,Aa=/checked\s*(?:[^=]|=\s*.checked.)/i,Ba=/^true\/(.*)/,Ca=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Da(a,b){return r.nodeName(a,"table")&&r.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a:a}function Ea(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Fa(a){var b=Ba.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ga(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(V.hasData(a)&&(f=V.access(a),g=V.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c<d;c++)r.event.add(b,e,j[e][c])}W.hasData(a)&&(h=W.access(a),i=r.extend({},h),W.set(b,i))}}function Ha(a,b){var c=b.nodeName.toLowerCase();"input"===c&&ia.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function Ia(a,b,c,d){b=g.apply([],b);var e,f,h,i,j,k,l=0,m=a.length,n=m-1,q=b[0],s=r.isFunction(q);if(s||m>1&&"string"==typeof q&&!o.checkClone&&Aa.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ia(f,b,c,d)});if(m&&(e=pa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(ma(e,"script"),Ea),i=h.length;l<m;l++)j=e,l!==n&&(j=r.clone(j,!0,!0),i&&r.merge(h,ma(j,"script"))),c.call(a[l],j,l);if(i)for(k=h[h.length-1].ownerDocument,r.map(h,Fa),l=0;l<i;l++)j=h[l],ka.test(j.type||"")&&!V.access(j,"globalEval")&&r.contains(k,j)&&(j.src?r._evalUrl&&r._evalUrl(j.src):p(j.textContent.replace(Ca,""),k))}return a}function Ja(a,b,c){for(var d,e=b?r.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||r.cleanData(ma(d)),d.parentNode&&(c&&r.contains(d.ownerDocument,d)&&na(ma(d,"script")),d.parentNode.removeChild(d));return a}r.extend({htmlPrefilter:function(a){return a.replace(ya,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=ma(h),f=ma(a),d=0,e=f.length;d<e;d++)Ha(f[d],g[d]);if(b)if(c)for(f=f||ma(a),g=g||ma(h),d=0,e=f.length;d<e;d++)Ga(f[d],g[d]);else Ga(a,h);return g=ma(h,"script"),g.length>0&&na(g,!i&&ma(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(T(c)){if(b=c[V.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[V.expando]=void 0}c[W.expando]&&(c[W.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ja(this,a,!0)},remove:function(a){return Ja(this,a)},text:function(a){return S(this,function(a){return void 0===a?r.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return Ia(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Da(this,a);b.appendChild(a)}})},prepend:function(){return Ia(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Da(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ia(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ia(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(ma(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return S(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!za.test(a)&&!la[(ja.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c<d;c++)b=this[c]||{},1===b.nodeType&&(r.cleanData(ma(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ia(this,arguments,function(b){var c=this.parentNode;r.inArray(this,a)<0&&(r.cleanData(ma(this)),c&&c.replaceChild(b,this))},a)}}),r.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){r.fn[a]=function(a){for(var c,d=[],e=r(a),f=e.length-1,g=0;g<=f;g++)c=g===f?this:this.clone(!0),r(e[g])[b](c),h.apply(d,c.get());return this.pushStack(d)}});var Ka=/^margin/,La=new RegExp("^("+_+")(?!px)[a-z%]+$","i"),Ma=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)};!function(){function b(){if(i){i.style.cssText="box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",i.innerHTML="",qa.appendChild(h);var b=a.getComputedStyle(i);c="1%"!==b.top,g="2px"===b.marginLeft,e="4px"===b.width,i.style.marginRight="50%",f="4px"===b.marginRight,qa.removeChild(h),i=null}}var c,e,f,g,h=d.createElement("div"),i=d.createElement("div");i.style&&(i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",o.clearCloneStyle="content-box"===i.style.backgroundClip,h.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",h.appendChild(i),r.extend(o,{pixelPosition:function(){return b(),c},boxSizingReliable:function(){return b(),e},pixelMarginRight:function(){return b(),f},reliableMarginLeft:function(){return b(),g}}))}();function Na(a,b,c){var d,e,f,g,h=a.style;return c=c||Ma(a),c&&(g=c.getPropertyValue(b)||c[b],""!==g||r.contains(a.ownerDocument,a)||(g=r.style(a,b)),!o.pixelMarginRight()&&La.test(g)&&Ka.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function Oa(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Pa=/^(none|table(?!-c[ea]).+)/,Qa={position:"absolute",visibility:"hidden",display:"block"},Ra={letterSpacing:"0",fontWeight:"400"},Sa=["Webkit","Moz","ms"],Ta=d.createElement("div").style;function Ua(a){if(a in Ta)return a;var b=a[0].toUpperCase()+a.slice(1),c=Sa.length;while(c--)if(a=Sa[c]+b,a in Ta)return a}function Va(a,b,c){var d=aa.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Wa(a,b,c,d,e){var f,g=0;for(f=c===(d?"border":"content")?4:"width"===b?1:0;f<4;f+=2)"margin"===c&&(g+=r.css(a,c+ba[f],!0,e)),d?("content"===c&&(g-=r.css(a,"padding"+ba[f],!0,e)),"margin"!==c&&(g-=r.css(a,"border"+ba[f]+"Width",!0,e))):(g+=r.css(a,"padding"+ba[f],!0,e),"padding"!==c&&(g+=r.css(a,"border"+ba[f]+"Width",!0,e)));return g}function Xa(a,b,c){var d,e=!0,f=Ma(a),g="border-box"===r.css(a,"boxSizing",!1,f);if(a.getClientRects().length&&(d=a.getBoundingClientRect()[b]),d<=0||null==d){if(d=Na(a,b,f),(d<0||null==d)&&(d=a.style[b]),La.test(d))return d;e=g&&(o.boxSizingReliable()||d===a.style[b]),d=parseFloat(d)||0}return d+Wa(a,b,c||(g?"border":"content"),e,f)+"px"}r.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Na(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=r.camelCase(b),i=a.style;return b=r.cssProps[h]||(r.cssProps[h]=Ua(h)||h),g=r.cssHooks[b]||r.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=aa.exec(c))&&e[1]&&(c=ea(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(r.cssNumber[h]?"":"px")),o.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=r.camelCase(b);return b=r.cssProps[h]||(r.cssProps[h]=Ua(h)||h),g=r.cssHooks[b]||r.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Na(a,b,d)),"normal"===e&&b in Ra&&(e=Ra[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),r.each(["height","width"],function(a,b){r.cssHooks[b]={get:function(a,c,d){if(c)return!Pa.test(r.css(a,"display"))||a.getClientRects().length&&a.getBoundingClientRect().width?Xa(a,b,d):da(a,Qa,function(){return Xa(a,b,d)})},set:function(a,c,d){var e,f=d&&Ma(a),g=d&&Wa(a,b,d,"border-box"===r.css(a,"boxSizing",!1,f),f);return g&&(e=aa.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=r.css(a,b)),Va(a,c,g)}}}),r.cssHooks.marginLeft=Oa(o.reliableMarginLeft,function(a,b){if(b)return(parseFloat(Na(a,"marginLeft"))||a.getBoundingClientRect().left-da(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px"}),r.each({margin:"",padding:"",border:"Width"},function(a,b){r.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];d<4;d++)e[a+ba[d]+b]=f[d]||f[d-2]||f[0];return e}},Ka.test(a)||(r.cssHooks[a+b].set=Va)}),r.fn.extend({css:function(a,b){return S(this,function(a,b,c){var d,e,f={},g=0;if(r.isArray(b)){for(d=Ma(a),e=b.length;g<e;g++)f[b[g]]=r.css(a,b[g],!1,d);return f}return void 0!==c?r.style(a,b,c):r.css(a,b)},a,b,arguments.length>1)}});function Ya(a,b,c,d,e){return new Ya.prototype.init(a,b,c,d,e)}r.Tween=Ya,Ya.prototype={constructor:Ya,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=Ya.propHooks[this.prop];return a&&a.get?a.get(this):Ya.propHooks._default.get(this)},run:function(a){var b,c=Ya.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Ya.propHooks._default.set(this),this}},Ya.prototype.init.prototype=Ya.prototype,Ya.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},Ya.propHooks.scrollTop=Ya.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=Ya.prototype.init,r.fx.step={};var Za,$a,_a=/^(?:toggle|show|hide)$/,ab=/queueHooks$/;function bb(){$a&&(a.requestAnimationFrame(bb),r.fx.tick())}function cb(){return a.setTimeout(function(){Za=void 0}),Za=r.now()}function db(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=ba[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function eb(a,b,c){for(var d,e=(hb.tweeners[b]||[]).concat(hb.tweeners["*"]),f=0,g=e.length;f<g;f++)if(d=e[f].call(c,b,a))return d}function fb(a,b,c){var d,e,f,g,h,i,j,k,l="width"in b||"height"in b,m=this,n={},o=a.style,p=a.nodeType&&ca(a),q=V.get(a,"fxshow");c.queue||(g=r._queueHooks(a,"fx"),null==g.unqueued&&(g.unqueued=0,h=g.empty.fire,g.empty.fire=function(){g.unqueued||h()}),g.unqueued++,m.always(function(){m.always(function(){g.unqueued--,r.queue(a,"fx").length||g.empty.fire()})}));for(d in b)if(e=b[d],_a.test(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}n[d]=q&&q[d]||r.style(a,d)}if(i=!r.isEmptyObject(b),i||!r.isEmptyObject(n)){l&&1===a.nodeType&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=q&&q.display,null==j&&(j=V.get(a,"display")),k=r.css(a,"display"),"none"===k&&(j?k=j:(ha([a],!0),j=a.style.display||j,k=r.css(a,"display"),ha([a]))),("inline"===k||"inline-block"===k&&null!=j)&&"none"===r.css(a,"float")&&(i||(m.done(function(){o.display=j}),null==j&&(k=o.display,j="none"===k?"":k)),o.display="inline-block")),c.overflow&&(o.overflow="hidden",m.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]})),i=!1;for(d in n)i||(q?"hidden"in q&&(p=q.hidden):q=V.access(a,"fxshow",{display:j}),f&&(q.hidden=!p),p&&ha([a],!0),m.done(function(){p||ha([a]),V.remove(a,"fxshow");for(d in n)r.style(a,d,n[d])})),i=eb(p?q[d]:0,d,m),d in q||(q[d]=i.start,p&&(i.end=i.start,i.start=0))}}function gb(a,b){var c,d,e,f,g;for(c in a)if(d=r.camelCase(c),e=b[d],f=a[c],r.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=r.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function hb(a,b,c){var d,e,f=0,g=hb.prefilters.length,h=r.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Za||cb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;g<i;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),f<1&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:r.extend({},b),opts:r.extend(!0,{specialEasing:{},easing:r.easing._default},c),originalProperties:b,originalOptions:c,startTime:Za||cb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=r.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;c<d;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(gb(k,j.opts.specialEasing);f<g;f++)if(d=hb.prefilters[f].call(j,a,k,j.opts))return r.isFunction(d.stop)&&(r._queueHooks(j.elem,j.opts.queue).stop=r.proxy(d.stop,d)),d;return r.map(k,eb,j),r.isFunction(j.opts.start)&&j.opts.start.call(a,j),r.fx.timer(r.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}r.Animation=r.extend(hb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return ea(c.elem,a,aa.exec(b),c),c}]},tweener:function(a,b){r.isFunction(a)?(b=a,a=["*"]):a=a.match(K);for(var c,d=0,e=a.length;d<e;d++)c=a[d],hb.tweeners[c]=hb.tweeners[c]||[],hb.tweeners[c].unshift(b)},prefilters:[fb],prefilter:function(a,b){b?hb.prefilters.unshift(a):hb.prefilters.push(a)}}),r.speed=function(a,b,c){var e=a&&"object"==typeof a?r.extend({},a):{complete:c||!c&&b||r.isFunction(a)&&a,duration:a,easing:c&&b||b&&!r.isFunction(b)&&b};return r.fx.off||d.hidden?e.duration=0:"number"!=typeof e.duration&&(e.duration in r.fx.speeds?e.duration=r.fx.speeds[e.duration]:e.duration=r.fx.speeds._default),null!=e.queue&&e.queue!==!0||(e.queue="fx"),e.old=e.complete,e.complete=function(){r.isFunction(e.old)&&e.old.call(this),e.queue&&r.dequeue(this,e.queue)},e},r.fn.extend({fadeTo:function(a,b,c,d){return this.filter(ca).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=r.isEmptyObject(a),f=r.speed(b,c,d),g=function(){var b=hb(this,r.extend({},a),f);(e||V.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=r.timers,g=V.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&ab.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||r.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=V.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=r.timers,g=d?d.length:0;for(c.finish=!0,r.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;b<g;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),r.each(["toggle","show","hide"],function(a,b){var c=r.fn[b];r.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(db(b,!0),a,d,e)}}),r.each({slideDown:db("show"),slideUp:db("hide"),slideToggle:db("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){r.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),r.timers=[],r.fx.tick=function(){var a,b=0,c=r.timers;for(Za=r.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||r.fx.stop(),Za=void 0},r.fx.timer=function(a){r.timers.push(a),a()?r.fx.start():r.timers.pop()},r.fx.interval=13,r.fx.start=function(){$a||($a=a.requestAnimationFrame?a.requestAnimationFrame(bb):a.setInterval(r.fx.tick,r.fx.interval))},r.fx.stop=function(){a.cancelAnimationFrame?a.cancelAnimationFrame($a):a.clearInterval($a),$a=null},r.fx.speeds={slow:600,fast:200,_default:400},r.fn.delay=function(b,c){return b=r.fx?r.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",o.checkOn=""!==a.value,o.optSelected=c.selected,a=d.createElement("input"),a.value="t",a.type="radio",o.radioValue="t"===a.value}();var ib,jb=r.expr.attrHandle;r.fn.extend({attr:function(a,b){return S(this,r.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?ib:void 0)),
+void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&r.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(K);if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),ib={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=jb[b]||r.find.attr;jb[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=jb[g],jb[g]=e,e=null!=c(a,b,d)?g:null,jb[g]=f),e}});var kb=/^(?:input|select|textarea|button)$/i,lb=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return S(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):kb.test(a.nodeName)||lb.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});function mb(a){var b=a.match(K)||[];return b.join(" ")}function nb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,nb(this)))});if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=nb(c),d=1===c.nodeType&&" "+mb(e)+" "){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=mb(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,nb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=nb(c),d=1===c.nodeType&&" "+mb(e)+" "){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=mb(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,nb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(K)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=nb(this),b&&V.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":V.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+mb(nb(c))+" ").indexOf(b)>-1)return!0;return!1}});var ob=/\r/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":r.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(ob,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:mb(r.text(a))}},select:{get:function(a){var b,c,d,e=a.options,f=a.selectedIndex,g="select-one"===a.type,h=g?null:[],i=g?f+1:e.length;for(d=f<0?i:g?f:0;d<i;d++)if(c=e[d],(c.selected||d===f)&&!c.disabled&&(!c.parentNode.disabled||!r.nodeName(c.parentNode,"optgroup"))){if(b=r(c).val(),g)return b;h.push(b)}return h},set:function(a,b){var c,d,e=a.options,f=r.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=r.inArray(r.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(r.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var pb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!pb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,pb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(V.get(h,"events")||{})[b.type]&&V.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&T(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!T(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=V.access(d,b);e||d.addEventListener(a,c,!0),V.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=V.access(d,b)-1;e?V.access(d,b,e):(d.removeEventListener(a,c,!0),V.remove(d,b))}}});var qb=a.location,rb=r.now(),sb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var tb=/\[\]$/,ub=/\r?\n/g,vb=/^(?:submit|button|image|reset|file)$/i,wb=/^(?:input|select|textarea|keygen)/i;function xb(a,b,c,d){var e;if(r.isArray(b))r.each(b,function(b,e){c||tb.test(a)?d(a,e):xb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)xb(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(r.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)xb(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&wb.test(this.nodeName)&&!vb.test(a)&&(this.checked||!ia.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:r.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(ub,"\r\n")}}):{name:b.name,value:c.replace(ub,"\r\n")}}).get()}});var yb=/%20/g,zb=/#.*$/,Ab=/([?&])_=[^&]*/,Bb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Cb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Db=/^(?:GET|HEAD)$/,Eb=/^\/\//,Fb={},Gb={},Hb="*/".concat("*"),Ib=d.createElement("a");Ib.href=qb.href;function Jb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(K)||[];if(r.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Kb(a,b,c,d){var e={},f=a===Gb;function g(h){var i;return e[h]=!0,r.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Lb(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Mb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Nb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:qb.href,type:"GET",isLocal:Cb.test(qb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Hb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Lb(Lb(a,r.ajaxSettings),b):Lb(r.ajaxSettings,a)},ajaxPrefilter:Jb(Fb),ajaxTransport:Jb(Gb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Bb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||qb.href)+"").replace(Eb,qb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(K)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Ib.protocol+"//"+Ib.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Kb(Fb,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Db.test(o.type),f=o.url.replace(zb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(yb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(sb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Ab,"$1"),n=(sb.test(f)?"&":"?")+"_="+rb++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Hb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Kb(Gb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Mb(o,y,d)),v=Nb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this},wrapInner:function(a){return r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Ob={0:200,1223:204},Pb=r.ajaxSettings.xhr();o.cors=!!Pb&&"withCredentials"in Pb,o.ajax=Pb=!!Pb,r.ajaxTransport(function(b){var c,d;if(o.cors||Pb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Ob[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Qb=[],Rb=/(=)\?(?=&|$)|\?\?/;r.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Qb.pop()||r.expando+"_"+rb++;return this[a]=!0,a}}),r.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Rb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Rb.test(b.data)&&"data");if(h||"jsonp"===b.dataTypes[0])return e=b.jsonpCallback=r.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Rb,"$1"+e):b.jsonp!==!1&&(b.url+=(sb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||r.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?r(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Qb.push(e)),g&&r.isFunction(f)&&f(g[0]),g=f=void 0}),"script"}),o.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),r.parseHTML=function(a,b,c){if("string"!=typeof a)return[];"boolean"==typeof b&&(c=b,b=!1);var e,f,g;return b||(o.createHTMLDocument?(b=d.implementation.createHTMLDocument(""),e=b.createElement("base"),e.href=d.location.href,b.head.appendChild(e)):b=d),f=B.exec(a),g=!c&&[],f?[b.createElement(f[1])]:(f=pa([a],b,g),g&&g.length&&r(g).remove(),r.merge([],f.childNodes))},r.fn.load=function(a,b,c){var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=mb(a.slice(h)),a=a.slice(0,h)),r.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&r.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?r("<div>").append(r.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},r.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){r.fn[b]=function(a){return this.on(b,a)}}),r.expr.pseudos.animated=function(a){return r.grep(r.timers,function(b){return a===b.elem}).length};function Sb(a){return r.isWindow(a)?a:9===a.nodeType&&a.defaultView}r.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=r.css(a,"position"),l=r(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=r.css(a,"top"),i=r.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),r.isFunction(b)&&(b=b.call(a,c,r.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},r.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){r.offset.setOffset(this,a,b)});var b,c,d,e,f=this[0];if(f)return f.getClientRects().length?(d=f.getBoundingClientRect(),d.width||d.height?(e=f.ownerDocument,c=Sb(e),b=e.documentElement,{top:d.top+c.pageYOffset-b.clientTop,left:d.left+c.pageXOffset-b.clientLeft}):d):{top:0,left:0}},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===r.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),r.nodeName(a[0],"html")||(d=a.offset()),d={top:d.top+r.css(a[0],"borderTopWidth",!0),left:d.left+r.css(a[0],"borderLeftWidth",!0)}),{top:b.top-d.top-r.css(c,"marginTop",!0),left:b.left-d.left-r.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===r.css(a,"position"))a=a.offsetParent;return a||qa})}}),r.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;r.fn[a]=function(d){return S(this,function(a,d,e){var f=Sb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),r.each(["top","left"],function(a,b){r.cssHooks[b]=Oa(o.pixelPosition,function(a,c){if(c)return c=Na(a,b),La.test(c)?r(a).position()[b]+"px":c})}),r.each({Height:"height",Width:"width"},function(a,b){r.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){r.fn[d]=function(e,f){var g=arguments.length&&(c||"boolean"!=typeof e),h=c||(e===!0||f===!0?"margin":"border");return S(this,function(b,c,e){var f;return r.isWindow(b)?0===d.indexOf("outer")?b["inner"+a]:b.document.documentElement["client"+a]:9===b.nodeType?(f=b.documentElement,Math.max(b.body["scroll"+a],f["scroll"+a],b.body["offset"+a],f["offset"+a],f["client"+a])):void 0===e?r.css(b,c,h):r.style(b,c,e,h)},b,g?e:void 0,g)}})}),r.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),r.parseJSON=JSON.parse,"function"==typeof define&&define.amd&&define("jquery",[],function(){return r});var Tb=a.jQuery,Ub=a.$;return r.noConflict=function(b){return a.$===r&&(a.$=Ub),b&&a.jQuery===r&&(a.jQuery=Tb),r},b||(a.jQuery=a.$=r),r});

From 0ada82baa0d79f1d4262e08c9dd3f6dcd6bb1983 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2017 01:00:44 +0100
Subject: [PATCH 0302/1163] Remove useless line that show "root" in EDM module.

---
 htdocs/ecm/index.php      | 36 ++++--------------------------------
 htdocs/ecm/index_auto.php |  7 ++++---
 2 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 1b2a57c714d..5ca14fe5dff 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -115,36 +115,6 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 	    {
 	       $result=$ecmdir->changeNbOfFiles('+');
 	    }
-	    /*
-		if (dol_mkdir($upload_dir) >= 0)
-		{
-			$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0, 0, $_FILES['userfile']['error']);
-			if (is_numeric($resupload) && $resupload > 0)
-			{
-				$result=$ecmdir->changeNbOfFiles('+');
-			}
-			else
-			{
-				$langs->load("errors");
-				if ($resupload < 0)	// Unknown error
-				{
-					setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
-				}
-				else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
-				{
-					setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
-				}
-				else	// Known error
-				{
-					setEventMessages($langs->trans($resupload), null, 'errors');
-				}
-			}
-		}
-		else
-		{
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors');
-		}*/
 	}
 }
 
@@ -462,6 +432,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
 
 
 	// Root of manual section
+	/*
 	print '<tr class="ecmroot">';
 	print '<td class="ecmroot">';
 	print img_picto_common('','treemenu/base.gif','class="inline-block valignmiddle"');
@@ -474,10 +445,11 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
 	print '<td class="ecmroot">&nbsp;</td>';
 	print '<td class="ecmroot"></td>';
 	print '</tr>';
-
+    */
+	
     if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
     {
-        print '<tr><td colspan="6" style="padding-left: 20px">';
+        print '<tr><td colspan="6">';
 
     	// Show filemanager tree
 	    print '<div id="filetree" class="ecmfiletree"></div>';
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 9208ec46644..23a96e4367b 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -449,7 +449,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
 		$htmltooltip=$langs->trans("ECMAreaDesc2");
 
 		// Root title line (Automatic section)
-		print '<tr class="ecmroot">';
+		/*print '<tr class="ecmroot">';
 		print '<td class="ecmroot">';
 		print img_picto_common('','treemenu/base.gif','class="inline-block valignmiddle"');
 		$txt=$langs->trans("ECMRoot").' ('.$langs->trans("ECMSectionsAuto").')';
@@ -461,11 +461,12 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
 		print '<td class="ecmroot">&nbsp;</td>';
 		print '<td class="ecmroot"></td>';
 		print '</tr>';
-
+        */
+		
 		$sectionauto=dol_sort_array($sectionauto,'label','ASC',true,false);
 
 		print '<tr>';
-    	print '<td colspan="6" style="padding-left: 20px">';
+    	print '<td colspan="6">';
 	    print '<div id="filetreeauto" class="ecmfiletree"><ul class="ecmjqft">';
 
 		$nbofentries=0;

From 7673aff3bafcf7dcc025b1a8f2dcfbf77e1ef6d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2017 02:51:26 +0100
Subject: [PATCH 0303/1163] Fix js errors

---
 htdocs/core/get_menudiv.php | 3 +--
 htdocs/main.inc.php         | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index d71ded6aec7..d8a7cb1b34c 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -130,13 +130,12 @@ print '
 </style>
     
 <script type="text/javascript">
-/*jQuery time*/
 $(document).ready(function(){
     $("body ul").click(function(){
         console.log("We click on body ul");
 
         $(this).siblings().find("li ul").slideUp(0);
-        //slide up all the link lists
+
         $(this).find("li ul").slideToggle(200);
 
         target = $(this);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c136eeac280..5801f7a51e0 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1021,6 +1021,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";      				// Do not index
         print '<meta name="viewport" content="width=device-width, initial-scale=1.0">';	// Scale for mobile device
         print '<meta name="author" content="Dolibarr Development Team">'."\n";
+        // Favicon. Note, even if we remove this meta, the browser and android webview try to find a favicon.ico
 		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
         if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
         print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";
@@ -1041,7 +1042,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         //if (! empty($conf->dol_use_jmobile)) $ext='version='.urlencode(DOL_VERSION);
         $ext='version='.urlencode(DOL_VERSION);
         if (GETPOST('version')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
-        if (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext='testmenuhider='.GETPOST('testmenuhider','int');
+        if (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
         
         $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss')?'&amp;optioncss='.GETPOST('optioncss','alpha',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
         $themeparam.=($ext?'&amp;'.$ext:'');

From a2611e31fe301ec455df78f19637c03385e32510 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 24 Feb 2017 11:12:14 +0100
Subject: [PATCH 0304/1163] add selectform choice for private mailing

better usability than enter 0 ou 1 value
---
 htdocs/admin/dict.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 827f6e0b747..59225f2dc89 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1343,6 +1343,10 @@ if ($id)
                             else if ($fieldlist[$field]=='price' || preg_match('/^amount/i',$fieldlist[$field])) {
                                 $valuetoshow=price($valuetoshow);
                             }
+                            if ($value == 'private')
+                            {
+                                $valuetoshow = yn($elementList[$valuetoshow]);
+                            }				
                             else if ($fieldlist[$field]=='libelle_facture') {
                                 $langs->load("bills");
                                 $key=$langs->trans("PaymentCondition".strtoupper($obj->code));
@@ -1691,6 +1695,12 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			print $form->selectarray('source', $sourceList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
 			print '</td>';
 		}
+		elseif ($fieldlist[$field] == 'private')
+		{
+			print '<td>';
+			print $form->selectyesno("private",(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			print '</td>';
+		}
 		elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm")
 		{
 			print '<td>';

From baa1f3ed2be8b1d54d6bdf9a61e3b9c85f57ddc2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2017 14:35:20 +0100
Subject: [PATCH 0305/1163] Clean doc about changes in external libraries

---
 build/debian/README.howto                     | 10 ++++++----
 build/makepack-dolibarr.pl                    | 10 ++--------
 dev/dolibarr_changes.txt                      | 19 +------------------
 htdocs/core/class/smtps.class.php             |  2 +-
 htdocs/includes/nusoap/lib/nusoap.php         |  2 +-
 .../framework/Luracast/Restler/AutoLoader.php |  4 ++--
 .../Luracast/Restler/explorer/index.html      |  4 ++--
 7 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index afc2d391e1e..705899d47c4 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -339,18 +339,20 @@ To update dolibarr debian package when only files into debian has changed:
 
 To update dolibarr debian package when only files not into debian has changed:
 
-* Manually, add patches into debian/patches and update file debian/series, or do the 2 steps with "quilt import filepatch.patch"
+* Checkout the branch you want to work on: master of debian/...  
+* Manually, add patches into debian/patches and update the file debian/series, or do the 2 steps with "quilt import filepatch.patch"
 * You can test patching of serie with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revient a l'état du upstream sans les patch.
+* Update the debian/changelog to add entry of change.
 
 Once files has been prepared, it's time to test:
 
 * Try to build package
 > rm -fr ../build-area;
-> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x|3.5.5]
+> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
 ou
-> git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-3.5.x|3.5.5]
+> git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
 
-Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x]
+Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
 Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
 Note: You can use git-buildpackage -us -uc -d                if you want to test build when dependencies does not match 
 Note: Package is built into directory ../build-area
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index c06d8f0730f..d287afe4b86 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -532,8 +532,6 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`;
 		# Removed other test files
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/eldy/*.new`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/api/explorer`;				# This is a dev tool
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
@@ -547,8 +545,6 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/samples`;		# Keep this removal in case we embed libraries
         #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
    	    
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extensions/TableTools/swf`;	# Source of this flash is not available
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	    # Source of this flash is not available
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/select2/release.sh`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`;
@@ -566,14 +562,15 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.md`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/ae_fonts_*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
 	}
 
 	# Build package for each target
@@ -892,9 +889,6 @@ if ($nboftargetok) {
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mike42/escpos-php/LICENSE.md`;
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt`;
 			
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING`;
 			# Removed files we don't need
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source`;
 			
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 82f364b0c1f..b4a4d29dce9 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -3,11 +3,9 @@ This file describe changes made on external library after beeing included
 in Dolibarr root.
 
 
-
 ALL:
 ----
-Replace "& new" by "new"
-
+Check "DOL_CHANGE"
 
 
 CKEDITOR:
@@ -33,21 +31,6 @@ Replace call to serialize_val with no bugged value
 
 
 
-FPDI:
------
-Replace:
-	$this->_readXref($this->_xref, $this->_findXref());
-with:
-    try {
-	        $this->_readXref($this->_xref, $this->_findXref());
-    }
-    catch(Exception $e)
-    {
-        	print $e->getMessage();
-        	exit;
-    }
-
-
 
 TCPDF:
 ------
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index e7c7b343ac9..d16d9875fe3 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1072,7 +1072,7 @@ class SMTPs
 					{
 						foreach ( $this->_msgRecipients[$_host][$_which] as $_addr => $_realName )
 						{
-							if ( $_realName )	// DOL_CHANGE FIX
+							if ( $_realName )	// DOL_CHANGE LDR
 							{
 								$_realName = '"' . $_realName . '"';
 								$_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
diff --git a/htdocs/includes/nusoap/lib/nusoap.php b/htdocs/includes/nusoap/lib/nusoap.php
index 6defe0e6004..3113a0ee513 100644
--- a/htdocs/includes/nusoap/lib/nusoap.php
+++ b/htdocs/includes/nusoap/lib/nusoap.php
@@ -573,7 +573,7 @@ class nusoap_base {
 	                        }
 							$array_types[$tt] = 1;
 							// TODO: for literal, the name should be $name
-							//DOL_CHANGE This is to have tag name with name reported by wsdl and not "item"
+							// DOL_CHANGE This is to have tag name with name reported by wsdl and not "item"
                             //$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);
 							$tmp=preg_replace('/s$/i','',$name);
                             $xml .= $this->serialize_val($v,$tmp?$tmp:'item',false,false,false,false,$use);
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
index 9639ab44fb7..462cbcd4cc4 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
@@ -263,7 +263,7 @@ class AutoLoader
      * @return bool false unless className now exists
      */
     private function loadLastResort($className, $loader = null) {
-        // DOL_LDR Add protection to avoid conflict with other autouploader
+        // DOL_CHANGE LDR Add protection to avoid conflict with other autoloader
         /*print 'Try to load '.$className."\n";
         if (in_array($className, array('Google_Client')))
         {
@@ -307,7 +307,7 @@ class AutoLoader
      */
     private function alias($className, $currentClass)
     {
-        // DOL_LDR 
+        // DOL_CHANGE LDR 
         if ($className == 'Luracast\Restler\string') return;
         if ($className == 'Luracast\Restler\mixed') return;
         
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
index 214e6f6261c..5ff93006cf4 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>Api Explorer</title>
-  <!-- DOL_LDR_CHANGE <link href='https://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
+  <!-- DOL_CHANGE LDR Remove external links <link href='https://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
   <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">-->
   <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
@@ -55,7 +55,7 @@
       var key = $('#input_apiKey')[0].value;
 
       if(key && key.trim() != "") {
-        /* DOL_LDR_CHANGE */
+        /* DOL_CHANGE LDR We set DOLAPIKEY into header */
         log("added key " + key);
 
         /* Disabled for security reason. We keep only param in header

From f75af2af374688446b08fa539ee0f702284b40b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2017 14:37:18 +0100
Subject: [PATCH 0306/1163] Close #6146 - Let's experiment fontawesome.

---
 htdocs/includes/fontawesome/.gitignore        |   33 +
 htdocs/includes/fontawesome/.npmignore        |   42 +
 htdocs/includes/fontawesome/CONTRIBUTING.md   |  106 +
 htdocs/includes/fontawesome/Gemfile           |    8 +
 htdocs/includes/fontawesome/Gemfile.lock      |   68 +
 htdocs/includes/fontawesome/HELP-US-OUT.txt   |    7 +
 htdocs/includes/fontawesome/README.md         |  106 +
 htdocs/includes/fontawesome/_config.yml       |   60 +
 htdocs/includes/fontawesome/bower.json        |   22 +
 htdocs/includes/fontawesome/component.json    |   21 +
 htdocs/includes/fontawesome/composer.json     |   27 +
 .../includes/fontawesome/css/font-awesome.css | 2337 ++++++++++++++
 .../fontawesome/css/font-awesome.css.map      |    7 +
 .../fontawesome/css/font-awesome.min.css      |    4 +
 .../fontawesome/fonts/FontAwesome.otf         |  Bin 0 -> 134808 bytes
 .../fontawesome/fonts/fontawesome-webfont.eot |  Bin 0 -> 165742 bytes
 .../fontawesome/fonts/fontawesome-webfont.svg | 2671 +++++++++++++++++
 .../fontawesome/fonts/fontawesome-webfont.ttf |  Bin 0 -> 165548 bytes
 .../fonts/fontawesome-webfont.woff            |  Bin 0 -> 98024 bytes
 .../fonts/fontawesome-webfont.woff2           |  Bin 0 -> 77160 bytes
 .../includes/fontawesome/less/animated.less   |   34 +
 .../fontawesome/less/bordered-pulled.less     |   25 +
 htdocs/includes/fontawesome/less/core.less    |   12 +
 .../fontawesome/less/fixed-width.less         |    6 +
 .../fontawesome/less/font-awesome.less        |   18 +
 htdocs/includes/fontawesome/less/icons.less   |  789 +++++
 htdocs/includes/fontawesome/less/larger.less  |   13 +
 htdocs/includes/fontawesome/less/list.less    |   19 +
 htdocs/includes/fontawesome/less/mixins.less  |   60 +
 htdocs/includes/fontawesome/less/path.less    |   15 +
 .../fontawesome/less/rotated-flipped.less     |   20 +
 .../fontawesome/less/screen-reader.less       |    5 +
 htdocs/includes/fontawesome/less/stacked.less |   20 +
 .../includes/fontawesome/less/variables.less  |  800 +++++
 htdocs/includes/fontawesome/package.json      |   44 +
 .../includes/fontawesome/scss/_animated.scss  |   34 +
 .../fontawesome/scss/_bordered-pulled.scss    |   25 +
 htdocs/includes/fontawesome/scss/_core.scss   |   12 +
 .../fontawesome/scss/_fixed-width.scss        |    6 +
 htdocs/includes/fontawesome/scss/_icons.scss  |  789 +++++
 htdocs/includes/fontawesome/scss/_larger.scss |   13 +
 htdocs/includes/fontawesome/scss/_list.scss   |   19 +
 htdocs/includes/fontawesome/scss/_mixins.scss |   60 +
 htdocs/includes/fontawesome/scss/_path.scss   |   15 +
 .../fontawesome/scss/_rotated-flipped.scss    |   20 +
 .../fontawesome/scss/_screen-reader.scss      |    5 +
 .../includes/fontawesome/scss/_stacked.scss   |   20 +
 .../includes/fontawesome/scss/_variables.scss |  800 +++++
 .../fontawesome/scss/font-awesome.scss        |   18 +
 49 files changed, 9235 insertions(+)
 create mode 100644 htdocs/includes/fontawesome/.gitignore
 create mode 100644 htdocs/includes/fontawesome/.npmignore
 create mode 100644 htdocs/includes/fontawesome/CONTRIBUTING.md
 create mode 100644 htdocs/includes/fontawesome/Gemfile
 create mode 100644 htdocs/includes/fontawesome/Gemfile.lock
 create mode 100644 htdocs/includes/fontawesome/HELP-US-OUT.txt
 create mode 100644 htdocs/includes/fontawesome/README.md
 create mode 100644 htdocs/includes/fontawesome/_config.yml
 create mode 100644 htdocs/includes/fontawesome/bower.json
 create mode 100644 htdocs/includes/fontawesome/component.json
 create mode 100644 htdocs/includes/fontawesome/composer.json
 create mode 100644 htdocs/includes/fontawesome/css/font-awesome.css
 create mode 100644 htdocs/includes/fontawesome/css/font-awesome.css.map
 create mode 100644 htdocs/includes/fontawesome/css/font-awesome.min.css
 create mode 100644 htdocs/includes/fontawesome/fonts/FontAwesome.otf
 create mode 100644 htdocs/includes/fontawesome/fonts/fontawesome-webfont.eot
 create mode 100644 htdocs/includes/fontawesome/fonts/fontawesome-webfont.svg
 create mode 100644 htdocs/includes/fontawesome/fonts/fontawesome-webfont.ttf
 create mode 100644 htdocs/includes/fontawesome/fonts/fontawesome-webfont.woff
 create mode 100644 htdocs/includes/fontawesome/fonts/fontawesome-webfont.woff2
 create mode 100644 htdocs/includes/fontawesome/less/animated.less
 create mode 100644 htdocs/includes/fontawesome/less/bordered-pulled.less
 create mode 100644 htdocs/includes/fontawesome/less/core.less
 create mode 100644 htdocs/includes/fontawesome/less/fixed-width.less
 create mode 100644 htdocs/includes/fontawesome/less/font-awesome.less
 create mode 100644 htdocs/includes/fontawesome/less/icons.less
 create mode 100644 htdocs/includes/fontawesome/less/larger.less
 create mode 100644 htdocs/includes/fontawesome/less/list.less
 create mode 100644 htdocs/includes/fontawesome/less/mixins.less
 create mode 100644 htdocs/includes/fontawesome/less/path.less
 create mode 100644 htdocs/includes/fontawesome/less/rotated-flipped.less
 create mode 100644 htdocs/includes/fontawesome/less/screen-reader.less
 create mode 100644 htdocs/includes/fontawesome/less/stacked.less
 create mode 100644 htdocs/includes/fontawesome/less/variables.less
 create mode 100644 htdocs/includes/fontawesome/package.json
 create mode 100644 htdocs/includes/fontawesome/scss/_animated.scss
 create mode 100644 htdocs/includes/fontawesome/scss/_bordered-pulled.scss
 create mode 100644 htdocs/includes/fontawesome/scss/_core.scss
 create mode 100644 htdocs/includes/fontawesome/scss/_fixed-width.scss
 create mode 100644 htdocs/includes/fontawesome/scss/_icons.scss
 create mode 100644 htdocs/includes/fontawesome/scss/_larger.scss
 create mode 100644 htdocs/includes/fontawesome/scss/_list.scss
 create mode 100644 htdocs/includes/fontawesome/scss/_mixins.scss
 create mode 100644 htdocs/includes/fontawesome/scss/_path.scss
 create mode 100644 htdocs/includes/fontawesome/scss/_rotated-flipped.scss
 create mode 100644 htdocs/includes/fontawesome/scss/_screen-reader.scss
 create mode 100644 htdocs/includes/fontawesome/scss/_stacked.scss
 create mode 100644 htdocs/includes/fontawesome/scss/_variables.scss
 create mode 100644 htdocs/includes/fontawesome/scss/font-awesome.scss

diff --git a/htdocs/includes/fontawesome/.gitignore b/htdocs/includes/fontawesome/.gitignore
new file mode 100644
index 00000000000..39c4f20b707
--- /dev/null
+++ b/htdocs/includes/fontawesome/.gitignore
@@ -0,0 +1,33 @@
+*.pyc
+*.egg-info
+*.db
+*.db.old
+*.swp
+*.db-journal
+
+.coverage
+.DS_Store
+.installed.cfg
+_gh_pages/*
+
+.idea/*
+.svn/*
+src/website/static/*
+src/website/media/*
+
+bin
+cfcache
+develop-eggs
+dist
+downloads
+eggs
+parts
+tmp
+.sass-cache
+node_modules
+
+src/website/settingslocal.py
+stunnel.log
+
+.ruby-version
+.bundle
diff --git a/htdocs/includes/fontawesome/.npmignore b/htdocs/includes/fontawesome/.npmignore
new file mode 100644
index 00000000000..54a691f8159
--- /dev/null
+++ b/htdocs/includes/fontawesome/.npmignore
@@ -0,0 +1,42 @@
+*.pyc
+*.egg-info
+*.db
+*.db.old
+*.swp
+*.db-journal
+
+.coverage
+.DS_Store
+.installed.cfg
+_gh_pages/*
+
+.idea/*
+.svn/*
+src/website/static/*
+src/website/media/*
+
+bin
+cfcache
+develop-eggs
+dist
+downloads
+eggs
+parts
+tmp
+.sass-cache
+node_modules
+
+src/website/settingslocal.py
+stunnel.log
+
+.ruby-version
+
+# don't need these in the npm package.
+src/
+_config.yml
+bower.json
+component.json
+composer.json
+CONTRIBUTING.md
+Gemfile
+Gemfile.lock
diff --git a/htdocs/includes/fontawesome/CONTRIBUTING.md b/htdocs/includes/fontawesome/CONTRIBUTING.md
new file mode 100644
index 00000000000..f281d304ffb
--- /dev/null
+++ b/htdocs/includes/fontawesome/CONTRIBUTING.md
@@ -0,0 +1,106 @@
+# Contributing to Font Awesome
+
+Looking to contribute something to Font Awesome? **Here's how you can help.**
+
+
+
+## Requesting new icons
+
+New icons mostly start as requests by the [Font Awesome community on GitHub](../../issues). Want to request a new icon? Here are some things to keep in mind:
+
+1. Please be nice. Font Awesome is a happy place.
+2. Please do not request comprehensive sets of icons related to a very specific field.
+3. Please [search](../../search?type=Issues) to see if your icon request already exists. If a request is found, please add a 👍 reaction to that one.
+4. Please make requests for single icons, unless you are requesting a couple of strictly related icons (e.g., thumbs-up/thumbs-down).
+5. Please and thank you if you include the following:
+  - Title your [new issue](../../issues/new?title=Icon%20Request:%20icon-) `Icon request: icon-name` (e.g., `Icon request: icon-car`).
+  - Include a few use cases for your requested icon. How do you plan on using it?
+  - Attach a single color image or two that represent the idea you're going for.
+  - Request concrete objects: it's harder to make an icon to represent happiness, it's easier to make a smiley face. ☺
+
+
+
+## Suggesting icon keyword addition/removal
+
+Icon filters are maintained by the [Font Awesome community on GitHub](../../pulls?q=is%3Apr+label%3Adoc).
+
+If you feel that an icon
+
+* is missing keyword(s)
+* contains invalid keyword(s)
+
+please send a [PR](https://help.github.com/articles/using-pull-requests/) to the `master` branch.
+
+
+
+## Reporting issues
+
+We only accept issues that are icon requests, bug reports, or feature requests. Bugs must be isolated and reproducible problems that we can fix within the Font Awesome core. Please read the following guidelines to ensure you are the paragon of bug reporting.
+
+1. **Search for existing issues.** We get a lot of duplicate issues, and you'd help us out a lot by first checking if someone else has reported the same issue. Moreover, the issue may have already been resolved with a fix available.
+2. **Create an isolated and reproducible test case.** Be sure the problem exists in Font Awesome's code with a [reduced test case](http://css-tricks.com/reduced-test-cases/) that should be included in each bug report.
+3. **Include a live example.** Make use of jsFiddle, jsBin, or Codepen to share your isolated test cases.
+4. **Share as much information as possible.** Include operating system and version, browser and version, version of Font Awesome, etc. where appropriate. Also include steps to reproduce the bug.
+
+
+
+## Key branches
+
+- `master` is the latest, deployed version (use for pull request if they only affect the docs)
+- `gh-pages` is the hosted docs (not to be used for pull requests)
+- `*-wip` branches are the official work in progress branches for the next releases. All pull requests should be submitted against the appropriate branch
+
+
+
+## Notes on the repo
+
+As of v3.2.0, Font Awesome's CSS, LESS, SCSS, and documentation are all powered by Jekyll templates and built before each commit and release.
+- `_config.yml` - much of the site is driven off variables from this file, including Font Awesome and Bootstrap versions
+- `src/` - All edits to documentation, LESS, SCSS, and CSS should be made to files and templates in this directory
+- `src/icons.yml` - all LESS, SCSS, and CSS icon definitions are driven off this single file
+
+
+
+## Pull requests
+
+- At the moment we are not accepting pull requests containing icons
+- Submit all pull requests against the appropriate `*-wip` branch for easier merging
+- If your PR only affect the docs, feel free to push against the `master` branch
+- Any changes to the docs must be made to the Liquid templates in the `src` directory
+- Any changes to the styles must be made to the .less and .scss files in the `src` directory
+- If modifying the .less and .scss files, always recompile and commit the compiled files
+- Try not to pollute your pull request with unintended changes--keep them simple and small
+- Try to share which browsers your code has been tested in before submitting a pull request
+
+
+
+## Coding standards: HTML
+
+- Two spaces for indentation, never tabs
+- Double quotes only, never single quotes
+- Always use proper indentation
+- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags)
+
+
+
+## Coding standards: CSS
+
+- Adhere to the [Recess CSS property order](http://markdotto.com/2011/11/29/css-property-order/)
+- Multiple-line approach (one property and value per line)
+- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`)
+- End all lines with a semi-colon
+- For multiple, comma-separated selectors, place each selector on its own line
+- Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks)
+
+
+
+## License
+
+By contributing your code, you agree to license your contribution under the terms of the MIT License:
+- http://opensource.org/licenses/mit-license.html
+
+
+
+## Thanks
+
+Thanks to Bootstrap for their wonderful CONTRIBUTING.MD doc. It was modified to create this one.
diff --git a/htdocs/includes/fontawesome/Gemfile b/htdocs/includes/fontawesome/Gemfile
new file mode 100644
index 00000000000..7abbc906619
--- /dev/null
+++ b/htdocs/includes/fontawesome/Gemfile
@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'jekyll', '~> 1.0'
+gem 'safe_yaml', '~> 1.0.4'
+gem 'sass', '~> 3.0'
+gem 'less', '~> 2.5.0'
+gem 'libv8', '~> 3.16.14.0'
+gem 'therubyracer'
diff --git a/htdocs/includes/fontawesome/Gemfile.lock b/htdocs/includes/fontawesome/Gemfile.lock
new file mode 100644
index 00000000000..b673ad003b9
--- /dev/null
+++ b/htdocs/includes/fontawesome/Gemfile.lock
@@ -0,0 +1,68 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    blankslate (2.1.2.4)
+    classifier (1.3.4)
+      fast-stemmer (>= 1.0.0)
+    colorator (0.1)
+    commander (4.1.6)
+      highline (~> 1.6.11)
+    commonjs (0.2.7)
+    fast-stemmer (1.0.2)
+    ffi (1.9.10)
+    highline (1.6.21)
+    jekyll (1.5.1)
+      classifier (~> 1.3)
+      colorator (~> 0.1)
+      commander (~> 4.1.3)
+      liquid (~> 2.5.5)
+      listen (~> 1.3)
+      maruku (= 0.7.0)
+      pygments.rb (~> 0.5.0)
+      redcarpet (~> 2.3.0)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    less (2.5.1)
+      commonjs (~> 0.2.7)
+    libv8 (3.16.14.15)
+    liquid (2.5.5)
+    listen (1.3.1)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    maruku (0.7.0)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    posix-spawn (0.3.11)
+    pygments.rb (0.5.4)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.1.0)
+    rb-fsevent (0.9.6)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.4)
+      ffi (>= 0.5.0)
+    redcarpet (2.3.0)
+    ref (2.0.0)
+    safe_yaml (1.0.4)
+    sass (3.4.19)
+    therubyracer (0.12.2)
+      libv8 (~> 3.16.14.0)
+      ref
+    toml (0.1.2)
+      parslet (~> 1.5.0)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jekyll (~> 1.0)
+  less (~> 2.5.0)
+  libv8 (~> 3.16.14.0)
+  safe_yaml (~> 1.0.4)
+  sass (~> 3.0)
+  therubyracer
+
+BUNDLED WITH
+   1.13.2
diff --git a/htdocs/includes/fontawesome/HELP-US-OUT.txt b/htdocs/includes/fontawesome/HELP-US-OUT.txt
new file mode 100644
index 00000000000..83d083dd770
--- /dev/null
+++ b/htdocs/includes/fontawesome/HELP-US-OUT.txt
@@ -0,0 +1,7 @@
+I hope you love Font Awesome. If you've found it useful, please do me a favor and check out my latest project,
+Fort Awesome (https://fortawesome.com). It makes it easy to put the perfect icons on your website. Choose from our awesome,
+comprehensive icon sets or copy and paste your own.
+
+Please. Check it out.
+
+-Dave Gandy
diff --git a/htdocs/includes/fontawesome/README.md b/htdocs/includes/fontawesome/README.md
new file mode 100644
index 00000000000..3e1c1cfc1f4
--- /dev/null
+++ b/htdocs/includes/fontawesome/README.md
@@ -0,0 +1,106 @@
+# [Font Awesome v4.7.0](http://fontawesome.io)
+### The iconic font and CSS framework
+
+Font Awesome is a full suite of 675 pictographic icons for easy scalable vector graphics on websites,
+created and maintained by [Dave Gandy](https://twitter.com/davegandy).
+Stay up to date with the latest release and announcements on Twitter:
+[@fontawesome](http://twitter.com/fontawesome).
+
+Get started at http://fontawesome.io!
+
+## License
+- The Font Awesome font is licensed under the SIL OFL 1.1:
+  - http://scripts.sil.org/OFL
+- Font Awesome CSS, LESS, and Sass files are licensed under the MIT License:
+  - https://opensource.org/licenses/mit-license.html
+- The Font Awesome documentation is licensed under the CC BY 3.0 License:
+  - http://creativecommons.org/licenses/by/3.0/
+- Attribution is no longer required as of Font Awesome 3.0, but much appreciated:
+  - `Font Awesome by Dave Gandy - http://fontawesome.io`
+- Full details: http://fontawesome.io/license/
+
+## Changelog
+- [v4.7.0 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/10012)
+- [v4.6.3 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/9189)
+- [v4.6.3 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/9189)
+- [v4.6.2 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/9117)
+- [v4.6.1 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/8962)
+- [v4.6.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.6.0+is%3Aclosed)
+- [v4.5.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.5.0+is%3Aclosed)
+- [v4.4.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.4.0+is%3Aclosed)
+- [v4.3.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.3.0+is%3Aclosed)
+- [v4.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=12&page=1&state=closed)
+- [v4.1.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=6&page=1&state=closed)
+- [v4.0.3 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=9&page=1&state=closed)
+- [v4.0.2 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=8&page=1&state=closed)
+- [v4.0.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=7&page=1&state=closed)
+- [v4.0.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=2&page=1&state=closed)
+- [v3.2.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=5&page=1&state=closed)
+- [v3.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=3&page=1&state=closed)
+- [v3.1.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=4&page=1&state=closed)
+- v3.1.0 - Added 54 icons, icon stacking styles, flipping and rotating icons, removed Sass support
+- v3.0.2 - much improved rendering and alignment in IE7
+- v3.0.1 - much improved rendering in webkit, various bug fixes
+- v3.0.0 - all icons redesigned from scratch, optimized for Bootstrap's 14px default
+
+## Contributing
+
+Please read through our [contributing guidelines](https://github.com/FortAwesome/Font-Awesome/blob/master/CONTRIBUTING.md).
+Included are directions for opening issues, coding standards, and notes on development.
+
+## Versioning
+
+Font Awesome will be maintained under the Semantic Versioning guidelines as much as possible. Releases will be numbered
+with the following format:
+
+`<major>.<minor>.<patch>`
+
+And constructed with the following guidelines:
+
+* Breaking backward compatibility bumps the major (and resets the minor and patch)
+* New additions, including new icons, without breaking backward compatibility bumps the minor (and resets the patch)
+* Bug fixes, changes to brand logos, and misc changes bumps the patch
+
+For more information on SemVer, please visit http://semver.org.
+
+## Author
+- Email: dave@fontawesome.io
+- Twitter: http://twitter.com/davegandy
+- GitHub: https://github.com/davegandy
+
+## Component
+To include as a [component](https://github.com/componentjs/component), just run
+
+    $ component install FortAwesome/Font-Awesome
+
+Or add
+
+    "FortAwesome/Font-Awesome": "*"
+
+to the `dependencies` in your `component.json`.
+
+## Hacking on Font Awesome
+
+**Before you can build the project**, you must first have the following installed:
+
+- [Ruby](https://www.ruby-lang.org/en/)
+- Ruby Development Headers
+  - **Ubuntu:** `sudo apt-get install ruby-dev` *(Only if you're __NOT__ using `rbenv` or `rvm`)*
+  - **Windows:** [DevKit](http://rubyinstaller.org/)
+- [Bundler](http://bundler.io/) (Run `gem install bundler` to install).
+- [Node Package Manager (AKA NPM)](https://docs.npmjs.com/getting-started/installing-node)
+- [Less](http://lesscss.org/) (Run `npm install -g less` to install).
+- [Less Plugin: Clean CSS](https://github.com/less/less-plugin-clean-css) (Run `npm install -g less-plugin-clean-css` to install).
+
+From the root of the repository, install the tools used to develop.
+
+    $ bundle install
+    $ npm install
+
+Build the project and documentation:
+
+    $ bundle exec jekyll build
+
+Or serve it on a local server on http://localhost:7998/Font-Awesome/:
+
+    $ bundle exec jekyll -w serve
diff --git a/htdocs/includes/fontawesome/_config.yml b/htdocs/includes/fontawesome/_config.yml
new file mode 100644
index 00000000000..18129a1fc81
--- /dev/null
+++ b/htdocs/includes/fontawesome/_config.yml
@@ -0,0 +1,60 @@
+safe:             false
+port:             7998
+baseurl:          /Font-Awesome/  # Where GitHub serves the project up from
+url:              http://localhost:7998
+
+source:           src
+destination:      _gh_pages
+plugins:          src/_plugins
+
+pygments:         true
+permalink:        pretty
+
+# ensures SCSS files are compiled
+include:          [_*.scss]
+
+# used in building icon pages
+icon_meta:        src/icons.yml
+icon_layout:      icon.html    # Relative to _layouts directory
+icon_destination: icon         # Relative to destination
+
+fontawesome:
+  version:        4.7.0
+  minor_version:  4.7
+  major_version:  4
+  doc_blob:       v4.7.0
+  url:            http://fontawesome.io
+  legacy_url:     http://fortawesome.github.com/Font-Awesome/
+  blog_url:       http://articles.fortawesome.com
+  twitter:        fontawesome
+  tagline:        The iconic font and CSS toolkit
+  css_prefix:     fa
+  author:
+    name:         Dave Gandy
+    email:        dave@fontawesome.io
+    twitter:      davegandy
+    github:       davegandy
+  github:
+    url:          https://github.com/FortAwesome/Font-Awesome
+    project:      Font-Awesome
+    org:          FortAwesome
+  license:
+    font:
+      version:      SIL OFL 1.1
+      url:          http://scripts.sil.org/OFL
+    code:
+      version:      MIT License
+      url:          http://opensource.org/licenses/mit-license.html
+    documentation:
+      version:      CC BY 3.0
+      url:          http://creativecommons.org/licenses/by/3.0/
+
+bootstrap:
+  version:        3.3.5
+  url:            http://getbootstrap.com
+
+jquery:
+  version:        1.11.3
+
+jquery_validate:
+  version:        1.13.1
diff --git a/htdocs/includes/fontawesome/bower.json b/htdocs/includes/fontawesome/bower.json
new file mode 100644
index 00000000000..9e2112659b0
--- /dev/null
+++ b/htdocs/includes/fontawesome/bower.json
@@ -0,0 +1,22 @@
+{
+  "name": "font-awesome",
+  "description": "Font Awesome",
+  "keywords": [],
+  "homepage": "http://fontawesome.io",
+  "dependencies": {},
+  "devDependencies": {},
+  "license": ["OFL-1.1", "MIT", "CC-BY-3.0"],
+  "main": [
+    "less/font-awesome.less",
+    "scss/font-awesome.scss"
+  ],
+  "ignore": [
+    "*/.*",
+    "*.json",
+    "src",
+    "*.yml",
+    "Gemfile",
+    "Gemfile.lock",
+    "*.md"
+  ]
+}
diff --git a/htdocs/includes/fontawesome/component.json b/htdocs/includes/fontawesome/component.json
new file mode 100644
index 00000000000..0b0fb0a4d57
--- /dev/null
+++ b/htdocs/includes/fontawesome/component.json
@@ -0,0 +1,21 @@
+{
+  "name": "font-awesome",
+  "repo": "FortAwesome/Font-Awesome",
+  "description": "Font Awesome",
+  "version": "4.7.0",
+  "keywords": [],
+  "dependencies": {},
+  "development": {},
+  "license": "SIL, MIT, CC BY 3.0",
+  "styles": [
+    "css/font-awesome.css"
+  ],
+  "fonts": [
+    "fonts/fontawesome-webfont.eot",
+    "fonts/fontawesome-webfont.svg",
+    "fonts/fontawesome-webfont.ttf",
+    "fonts/fontawesome-webfont.woff",
+    "fonts/fontawesome-webfont.woff2",
+    "fonts/FontAwesome.otf"
+  ]
+}
diff --git a/htdocs/includes/fontawesome/composer.json b/htdocs/includes/fontawesome/composer.json
new file mode 100644
index 00000000000..c9f41120e83
--- /dev/null
+++ b/htdocs/includes/fontawesome/composer.json
@@ -0,0 +1,27 @@
+{
+  "name": "fortawesome/font-awesome",
+  "description": "The iconic font and CSS framework",
+  "keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"],
+  "homepage": "http://fontawesome.io/",
+  "authors": [
+    {
+      "name": "Dave Gandy",
+      "email": "dave@fontawesome.io",
+      "role": "Developer",
+      "homepage": "http://twitter.com/davegandy"
+    }
+  ],
+  "extra": {
+    "branch-alias": {
+      "dev-master": "4.6.x-dev"
+    }
+  },
+  "license": [
+      "OFL-1.1",
+      "MIT"
+  ],
+  "require-dev": {
+      "jekyll": "1.0.2",
+      "lessc": "1.4.2"
+  }
+}
diff --git a/htdocs/includes/fontawesome/css/font-awesome.css b/htdocs/includes/fontawesome/css/font-awesome.css
new file mode 100644
index 00000000000..ee906a8196d
--- /dev/null
+++ b/htdocs/includes/fontawesome/css/font-awesome.css
@@ -0,0 +1,2337 @@
+/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+/* FONT PATH
+ * -------------------------- */
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('../fonts/fontawesome-webfont.eot?v=4.7.0');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+.fa {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+/* makes the font 33% larger relative to the icon container */
+.fa-lg {
+  font-size: 1.33333333em;
+  line-height: 0.75em;
+  vertical-align: -15%;
+}
+.fa-2x {
+  font-size: 2em;
+}
+.fa-3x {
+  font-size: 3em;
+}
+.fa-4x {
+  font-size: 4em;
+}
+.fa-5x {
+  font-size: 5em;
+}
+.fa-fw {
+  width: 1.28571429em;
+  text-align: center;
+}
+.fa-ul {
+  padding-left: 0;
+  margin-left: 2.14285714em;
+  list-style-type: none;
+}
+.fa-ul > li {
+  position: relative;
+}
+.fa-li {
+  position: absolute;
+  left: -2.14285714em;
+  width: 2.14285714em;
+  top: 0.14285714em;
+  text-align: center;
+}
+.fa-li.fa-lg {
+  left: -1.85714286em;
+}
+.fa-border {
+  padding: .2em .25em .15em;
+  border: solid 0.08em #eeeeee;
+  border-radius: .1em;
+}
+.fa-pull-left {
+  float: left;
+}
+.fa-pull-right {
+  float: right;
+}
+.fa.fa-pull-left {
+  margin-right: .3em;
+}
+.fa.fa-pull-right {
+  margin-left: .3em;
+}
+/* Deprecated as of 4.4.0 */
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+.fa.pull-left {
+  margin-right: .3em;
+}
+.fa.pull-right {
+  margin-left: .3em;
+}
+.fa-spin {
+  -webkit-animation: fa-spin 2s infinite linear;
+  animation: fa-spin 2s infinite linear;
+}
+.fa-pulse {
+  -webkit-animation: fa-spin 1s infinite steps(8);
+  animation: fa-spin 1s infinite steps(8);
+}
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+.fa-rotate-90 {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
+  -webkit-transform: rotate(90deg);
+  -ms-transform: rotate(90deg);
+  transform: rotate(90deg);
+}
+.fa-rotate-180 {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
+  -webkit-transform: rotate(180deg);
+  -ms-transform: rotate(180deg);
+  transform: rotate(180deg);
+}
+.fa-rotate-270 {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
+  -webkit-transform: rotate(270deg);
+  -ms-transform: rotate(270deg);
+  transform: rotate(270deg);
+}
+.fa-flip-horizontal {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
+  -webkit-transform: scale(-1, 1);
+  -ms-transform: scale(-1, 1);
+  transform: scale(-1, 1);
+}
+.fa-flip-vertical {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
+  -webkit-transform: scale(1, -1);
+  -ms-transform: scale(1, -1);
+  transform: scale(1, -1);
+}
+:root .fa-rotate-90,
+:root .fa-rotate-180,
+:root .fa-rotate-270,
+:root .fa-flip-horizontal,
+:root .fa-flip-vertical {
+  filter: none;
+}
+.fa-stack {
+  position: relative;
+  display: inline-block;
+  width: 2em;
+  height: 2em;
+  line-height: 2em;
+  vertical-align: middle;
+}
+.fa-stack-1x,
+.fa-stack-2x {
+  position: absolute;
+  left: 0;
+  width: 100%;
+  text-align: center;
+}
+.fa-stack-1x {
+  line-height: inherit;
+}
+.fa-stack-2x {
+  font-size: 2em;
+}
+.fa-inverse {
+  color: #ffffff;
+}
+/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+   readers do not read off random characters that represent icons */
+.fa-glass:before {
+  content: "\f000";
+}
+.fa-music:before {
+  content: "\f001";
+}
+.fa-search:before {
+  content: "\f002";
+}
+.fa-envelope-o:before {
+  content: "\f003";
+}
+.fa-heart:before {
+  content: "\f004";
+}
+.fa-star:before {
+  content: "\f005";
+}
+.fa-star-o:before {
+  content: "\f006";
+}
+.fa-user:before {
+  content: "\f007";
+}
+.fa-film:before {
+  content: "\f008";
+}
+.fa-th-large:before {
+  content: "\f009";
+}
+.fa-th:before {
+  content: "\f00a";
+}
+.fa-th-list:before {
+  content: "\f00b";
+}
+.fa-check:before {
+  content: "\f00c";
+}
+.fa-remove:before,
+.fa-close:before,
+.fa-times:before {
+  content: "\f00d";
+}
+.fa-search-plus:before {
+  content: "\f00e";
+}
+.fa-search-minus:before {
+  content: "\f010";
+}
+.fa-power-off:before {
+  content: "\f011";
+}
+.fa-signal:before {
+  content: "\f012";
+}
+.fa-gear:before,
+.fa-cog:before {
+  content: "\f013";
+}
+.fa-trash-o:before {
+  content: "\f014";
+}
+.fa-home:before {
+  content: "\f015";
+}
+.fa-file-o:before {
+  content: "\f016";
+}
+.fa-clock-o:before {
+  content: "\f017";
+}
+.fa-road:before {
+  content: "\f018";
+}
+.fa-download:before {
+  content: "\f019";
+}
+.fa-arrow-circle-o-down:before {
+  content: "\f01a";
+}
+.fa-arrow-circle-o-up:before {
+  content: "\f01b";
+}
+.fa-inbox:before {
+  content: "\f01c";
+}
+.fa-play-circle-o:before {
+  content: "\f01d";
+}
+.fa-rotate-right:before,
+.fa-repeat:before {
+  content: "\f01e";
+}
+.fa-refresh:before {
+  content: "\f021";
+}
+.fa-list-alt:before {
+  content: "\f022";
+}
+.fa-lock:before {
+  content: "\f023";
+}
+.fa-flag:before {
+  content: "\f024";
+}
+.fa-headphones:before {
+  content: "\f025";
+}
+.fa-volume-off:before {
+  content: "\f026";
+}
+.fa-volume-down:before {
+  content: "\f027";
+}
+.fa-volume-up:before {
+  content: "\f028";
+}
+.fa-qrcode:before {
+  content: "\f029";
+}
+.fa-barcode:before {
+  content: "\f02a";
+}
+.fa-tag:before {
+  content: "\f02b";
+}
+.fa-tags:before {
+  content: "\f02c";
+}
+.fa-book:before {
+  content: "\f02d";
+}
+.fa-bookmark:before {
+  content: "\f02e";
+}
+.fa-print:before {
+  content: "\f02f";
+}
+.fa-camera:before {
+  content: "\f030";
+}
+.fa-font:before {
+  content: "\f031";
+}
+.fa-bold:before {
+  content: "\f032";
+}
+.fa-italic:before {
+  content: "\f033";
+}
+.fa-text-height:before {
+  content: "\f034";
+}
+.fa-text-width:before {
+  content: "\f035";
+}
+.fa-align-left:before {
+  content: "\f036";
+}
+.fa-align-center:before {
+  content: "\f037";
+}
+.fa-align-right:before {
+  content: "\f038";
+}
+.fa-align-justify:before {
+  content: "\f039";
+}
+.fa-list:before {
+  content: "\f03a";
+}
+.fa-dedent:before,
+.fa-outdent:before {
+  content: "\f03b";
+}
+.fa-indent:before {
+  content: "\f03c";
+}
+.fa-video-camera:before {
+  content: "\f03d";
+}
+.fa-photo:before,
+.fa-image:before,
+.fa-picture-o:before {
+  content: "\f03e";
+}
+.fa-pencil:before {
+  content: "\f040";
+}
+.fa-map-marker:before {
+  content: "\f041";
+}
+.fa-adjust:before {
+  content: "\f042";
+}
+.fa-tint:before {
+  content: "\f043";
+}
+.fa-edit:before,
+.fa-pencil-square-o:before {
+  content: "\f044";
+}
+.fa-share-square-o:before {
+  content: "\f045";
+}
+.fa-check-square-o:before {
+  content: "\f046";
+}
+.fa-arrows:before {
+  content: "\f047";
+}
+.fa-step-backward:before {
+  content: "\f048";
+}
+.fa-fast-backward:before {
+  content: "\f049";
+}
+.fa-backward:before {
+  content: "\f04a";
+}
+.fa-play:before {
+  content: "\f04b";
+}
+.fa-pause:before {
+  content: "\f04c";
+}
+.fa-stop:before {
+  content: "\f04d";
+}
+.fa-forward:before {
+  content: "\f04e";
+}
+.fa-fast-forward:before {
+  content: "\f050";
+}
+.fa-step-forward:before {
+  content: "\f051";
+}
+.fa-eject:before {
+  content: "\f052";
+}
+.fa-chevron-left:before {
+  content: "\f053";
+}
+.fa-chevron-right:before {
+  content: "\f054";
+}
+.fa-plus-circle:before {
+  content: "\f055";
+}
+.fa-minus-circle:before {
+  content: "\f056";
+}
+.fa-times-circle:before {
+  content: "\f057";
+}
+.fa-check-circle:before {
+  content: "\f058";
+}
+.fa-question-circle:before {
+  content: "\f059";
+}
+.fa-info-circle:before {
+  content: "\f05a";
+}
+.fa-crosshairs:before {
+  content: "\f05b";
+}
+.fa-times-circle-o:before {
+  content: "\f05c";
+}
+.fa-check-circle-o:before {
+  content: "\f05d";
+}
+.fa-ban:before {
+  content: "\f05e";
+}
+.fa-arrow-left:before {
+  content: "\f060";
+}
+.fa-arrow-right:before {
+  content: "\f061";
+}
+.fa-arrow-up:before {
+  content: "\f062";
+}
+.fa-arrow-down:before {
+  content: "\f063";
+}
+.fa-mail-forward:before,
+.fa-share:before {
+  content: "\f064";
+}
+.fa-expand:before {
+  content: "\f065";
+}
+.fa-compress:before {
+  content: "\f066";
+}
+.fa-plus:before {
+  content: "\f067";
+}
+.fa-minus:before {
+  content: "\f068";
+}
+.fa-asterisk:before {
+  content: "\f069";
+}
+.fa-exclamation-circle:before {
+  content: "\f06a";
+}
+.fa-gift:before {
+  content: "\f06b";
+}
+.fa-leaf:before {
+  content: "\f06c";
+}
+.fa-fire:before {
+  content: "\f06d";
+}
+.fa-eye:before {
+  content: "\f06e";
+}
+.fa-eye-slash:before {
+  content: "\f070";
+}
+.fa-warning:before,
+.fa-exclamation-triangle:before {
+  content: "\f071";
+}
+.fa-plane:before {
+  content: "\f072";
+}
+.fa-calendar:before {
+  content: "\f073";
+}
+.fa-random:before {
+  content: "\f074";
+}
+.fa-comment:before {
+  content: "\f075";
+}
+.fa-magnet:before {
+  content: "\f076";
+}
+.fa-chevron-up:before {
+  content: "\f077";
+}
+.fa-chevron-down:before {
+  content: "\f078";
+}
+.fa-retweet:before {
+  content: "\f079";
+}
+.fa-shopping-cart:before {
+  content: "\f07a";
+}
+.fa-folder:before {
+  content: "\f07b";
+}
+.fa-folder-open:before {
+  content: "\f07c";
+}
+.fa-arrows-v:before {
+  content: "\f07d";
+}
+.fa-arrows-h:before {
+  content: "\f07e";
+}
+.fa-bar-chart-o:before,
+.fa-bar-chart:before {
+  content: "\f080";
+}
+.fa-twitter-square:before {
+  content: "\f081";
+}
+.fa-facebook-square:before {
+  content: "\f082";
+}
+.fa-camera-retro:before {
+  content: "\f083";
+}
+.fa-key:before {
+  content: "\f084";
+}
+.fa-gears:before,
+.fa-cogs:before {
+  content: "\f085";
+}
+.fa-comments:before {
+  content: "\f086";
+}
+.fa-thumbs-o-up:before {
+  content: "\f087";
+}
+.fa-thumbs-o-down:before {
+  content: "\f088";
+}
+.fa-star-half:before {
+  content: "\f089";
+}
+.fa-heart-o:before {
+  content: "\f08a";
+}
+.fa-sign-out:before {
+  content: "\f08b";
+}
+.fa-linkedin-square:before {
+  content: "\f08c";
+}
+.fa-thumb-tack:before {
+  content: "\f08d";
+}
+.fa-external-link:before {
+  content: "\f08e";
+}
+.fa-sign-in:before {
+  content: "\f090";
+}
+.fa-trophy:before {
+  content: "\f091";
+}
+.fa-github-square:before {
+  content: "\f092";
+}
+.fa-upload:before {
+  content: "\f093";
+}
+.fa-lemon-o:before {
+  content: "\f094";
+}
+.fa-phone:before {
+  content: "\f095";
+}
+.fa-square-o:before {
+  content: "\f096";
+}
+.fa-bookmark-o:before {
+  content: "\f097";
+}
+.fa-phone-square:before {
+  content: "\f098";
+}
+.fa-twitter:before {
+  content: "\f099";
+}
+.fa-facebook-f:before,
+.fa-facebook:before {
+  content: "\f09a";
+}
+.fa-github:before {
+  content: "\f09b";
+}
+.fa-unlock:before {
+  content: "\f09c";
+}
+.fa-credit-card:before {
+  content: "\f09d";
+}
+.fa-feed:before,
+.fa-rss:before {
+  content: "\f09e";
+}
+.fa-hdd-o:before {
+  content: "\f0a0";
+}
+.fa-bullhorn:before {
+  content: "\f0a1";
+}
+.fa-bell:before {
+  content: "\f0f3";
+}
+.fa-certificate:before {
+  content: "\f0a3";
+}
+.fa-hand-o-right:before {
+  content: "\f0a4";
+}
+.fa-hand-o-left:before {
+  content: "\f0a5";
+}
+.fa-hand-o-up:before {
+  content: "\f0a6";
+}
+.fa-hand-o-down:before {
+  content: "\f0a7";
+}
+.fa-arrow-circle-left:before {
+  content: "\f0a8";
+}
+.fa-arrow-circle-right:before {
+  content: "\f0a9";
+}
+.fa-arrow-circle-up:before {
+  content: "\f0aa";
+}
+.fa-arrow-circle-down:before {
+  content: "\f0ab";
+}
+.fa-globe:before {
+  content: "\f0ac";
+}
+.fa-wrench:before {
+  content: "\f0ad";
+}
+.fa-tasks:before {
+  content: "\f0ae";
+}
+.fa-filter:before {
+  content: "\f0b0";
+}
+.fa-briefcase:before {
+  content: "\f0b1";
+}
+.fa-arrows-alt:before {
+  content: "\f0b2";
+}
+.fa-group:before,
+.fa-users:before {
+  content: "\f0c0";
+}
+.fa-chain:before,
+.fa-link:before {
+  content: "\f0c1";
+}
+.fa-cloud:before {
+  content: "\f0c2";
+}
+.fa-flask:before {
+  content: "\f0c3";
+}
+.fa-cut:before,
+.fa-scissors:before {
+  content: "\f0c4";
+}
+.fa-copy:before,
+.fa-files-o:before {
+  content: "\f0c5";
+}
+.fa-paperclip:before {
+  content: "\f0c6";
+}
+.fa-save:before,
+.fa-floppy-o:before {
+  content: "\f0c7";
+}
+.fa-square:before {
+  content: "\f0c8";
+}
+.fa-navicon:before,
+.fa-reorder:before,
+.fa-bars:before {
+  content: "\f0c9";
+}
+.fa-list-ul:before {
+  content: "\f0ca";
+}
+.fa-list-ol:before {
+  content: "\f0cb";
+}
+.fa-strikethrough:before {
+  content: "\f0cc";
+}
+.fa-underline:before {
+  content: "\f0cd";
+}
+.fa-table:before {
+  content: "\f0ce";
+}
+.fa-magic:before {
+  content: "\f0d0";
+}
+.fa-truck:before {
+  content: "\f0d1";
+}
+.fa-pinterest:before {
+  content: "\f0d2";
+}
+.fa-pinterest-square:before {
+  content: "\f0d3";
+}
+.fa-google-plus-square:before {
+  content: "\f0d4";
+}
+.fa-google-plus:before {
+  content: "\f0d5";
+}
+.fa-money:before {
+  content: "\f0d6";
+}
+.fa-caret-down:before {
+  content: "\f0d7";
+}
+.fa-caret-up:before {
+  content: "\f0d8";
+}
+.fa-caret-left:before {
+  content: "\f0d9";
+}
+.fa-caret-right:before {
+  content: "\f0da";
+}
+.fa-columns:before {
+  content: "\f0db";
+}
+.fa-unsorted:before,
+.fa-sort:before {
+  content: "\f0dc";
+}
+.fa-sort-down:before,
+.fa-sort-desc:before {
+  content: "\f0dd";
+}
+.fa-sort-up:before,
+.fa-sort-asc:before {
+  content: "\f0de";
+}
+.fa-envelope:before {
+  content: "\f0e0";
+}
+.fa-linkedin:before {
+  content: "\f0e1";
+}
+.fa-rotate-left:before,
+.fa-undo:before {
+  content: "\f0e2";
+}
+.fa-legal:before,
+.fa-gavel:before {
+  content: "\f0e3";
+}
+.fa-dashboard:before,
+.fa-tachometer:before {
+  content: "\f0e4";
+}
+.fa-comment-o:before {
+  content: "\f0e5";
+}
+.fa-comments-o:before {
+  content: "\f0e6";
+}
+.fa-flash:before,
+.fa-bolt:before {
+  content: "\f0e7";
+}
+.fa-sitemap:before {
+  content: "\f0e8";
+}
+.fa-umbrella:before {
+  content: "\f0e9";
+}
+.fa-paste:before,
+.fa-clipboard:before {
+  content: "\f0ea";
+}
+.fa-lightbulb-o:before {
+  content: "\f0eb";
+}
+.fa-exchange:before {
+  content: "\f0ec";
+}
+.fa-cloud-download:before {
+  content: "\f0ed";
+}
+.fa-cloud-upload:before {
+  content: "\f0ee";
+}
+.fa-user-md:before {
+  content: "\f0f0";
+}
+.fa-stethoscope:before {
+  content: "\f0f1";
+}
+.fa-suitcase:before {
+  content: "\f0f2";
+}
+.fa-bell-o:before {
+  content: "\f0a2";
+}
+.fa-coffee:before {
+  content: "\f0f4";
+}
+.fa-cutlery:before {
+  content: "\f0f5";
+}
+.fa-file-text-o:before {
+  content: "\f0f6";
+}
+.fa-building-o:before {
+  content: "\f0f7";
+}
+.fa-hospital-o:before {
+  content: "\f0f8";
+}
+.fa-ambulance:before {
+  content: "\f0f9";
+}
+.fa-medkit:before {
+  content: "\f0fa";
+}
+.fa-fighter-jet:before {
+  content: "\f0fb";
+}
+.fa-beer:before {
+  content: "\f0fc";
+}
+.fa-h-square:before {
+  content: "\f0fd";
+}
+.fa-plus-square:before {
+  content: "\f0fe";
+}
+.fa-angle-double-left:before {
+  content: "\f100";
+}
+.fa-angle-double-right:before {
+  content: "\f101";
+}
+.fa-angle-double-up:before {
+  content: "\f102";
+}
+.fa-angle-double-down:before {
+  content: "\f103";
+}
+.fa-angle-left:before {
+  content: "\f104";
+}
+.fa-angle-right:before {
+  content: "\f105";
+}
+.fa-angle-up:before {
+  content: "\f106";
+}
+.fa-angle-down:before {
+  content: "\f107";
+}
+.fa-desktop:before {
+  content: "\f108";
+}
+.fa-laptop:before {
+  content: "\f109";
+}
+.fa-tablet:before {
+  content: "\f10a";
+}
+.fa-mobile-phone:before,
+.fa-mobile:before {
+  content: "\f10b";
+}
+.fa-circle-o:before {
+  content: "\f10c";
+}
+.fa-quote-left:before {
+  content: "\f10d";
+}
+.fa-quote-right:before {
+  content: "\f10e";
+}
+.fa-spinner:before {
+  content: "\f110";
+}
+.fa-circle:before {
+  content: "\f111";
+}
+.fa-mail-reply:before,
+.fa-reply:before {
+  content: "\f112";
+}
+.fa-github-alt:before {
+  content: "\f113";
+}
+.fa-folder-o:before {
+  content: "\f114";
+}
+.fa-folder-open-o:before {
+  content: "\f115";
+}
+.fa-smile-o:before {
+  content: "\f118";
+}
+.fa-frown-o:before {
+  content: "\f119";
+}
+.fa-meh-o:before {
+  content: "\f11a";
+}
+.fa-gamepad:before {
+  content: "\f11b";
+}
+.fa-keyboard-o:before {
+  content: "\f11c";
+}
+.fa-flag-o:before {
+  content: "\f11d";
+}
+.fa-flag-checkered:before {
+  content: "\f11e";
+}
+.fa-terminal:before {
+  content: "\f120";
+}
+.fa-code:before {
+  content: "\f121";
+}
+.fa-mail-reply-all:before,
+.fa-reply-all:before {
+  content: "\f122";
+}
+.fa-star-half-empty:before,
+.fa-star-half-full:before,
+.fa-star-half-o:before {
+  content: "\f123";
+}
+.fa-location-arrow:before {
+  content: "\f124";
+}
+.fa-crop:before {
+  content: "\f125";
+}
+.fa-code-fork:before {
+  content: "\f126";
+}
+.fa-unlink:before,
+.fa-chain-broken:before {
+  content: "\f127";
+}
+.fa-question:before {
+  content: "\f128";
+}
+.fa-info:before {
+  content: "\f129";
+}
+.fa-exclamation:before {
+  content: "\f12a";
+}
+.fa-superscript:before {
+  content: "\f12b";
+}
+.fa-subscript:before {
+  content: "\f12c";
+}
+.fa-eraser:before {
+  content: "\f12d";
+}
+.fa-puzzle-piece:before {
+  content: "\f12e";
+}
+.fa-microphone:before {
+  content: "\f130";
+}
+.fa-microphone-slash:before {
+  content: "\f131";
+}
+.fa-shield:before {
+  content: "\f132";
+}
+.fa-calendar-o:before {
+  content: "\f133";
+}
+.fa-fire-extinguisher:before {
+  content: "\f134";
+}
+.fa-rocket:before {
+  content: "\f135";
+}
+.fa-maxcdn:before {
+  content: "\f136";
+}
+.fa-chevron-circle-left:before {
+  content: "\f137";
+}
+.fa-chevron-circle-right:before {
+  content: "\f138";
+}
+.fa-chevron-circle-up:before {
+  content: "\f139";
+}
+.fa-chevron-circle-down:before {
+  content: "\f13a";
+}
+.fa-html5:before {
+  content: "\f13b";
+}
+.fa-css3:before {
+  content: "\f13c";
+}
+.fa-anchor:before {
+  content: "\f13d";
+}
+.fa-unlock-alt:before {
+  content: "\f13e";
+}
+.fa-bullseye:before {
+  content: "\f140";
+}
+.fa-ellipsis-h:before {
+  content: "\f141";
+}
+.fa-ellipsis-v:before {
+  content: "\f142";
+}
+.fa-rss-square:before {
+  content: "\f143";
+}
+.fa-play-circle:before {
+  content: "\f144";
+}
+.fa-ticket:before {
+  content: "\f145";
+}
+.fa-minus-square:before {
+  content: "\f146";
+}
+.fa-minus-square-o:before {
+  content: "\f147";
+}
+.fa-level-up:before {
+  content: "\f148";
+}
+.fa-level-down:before {
+  content: "\f149";
+}
+.fa-check-square:before {
+  content: "\f14a";
+}
+.fa-pencil-square:before {
+  content: "\f14b";
+}
+.fa-external-link-square:before {
+  content: "\f14c";
+}
+.fa-share-square:before {
+  content: "\f14d";
+}
+.fa-compass:before {
+  content: "\f14e";
+}
+.fa-toggle-down:before,
+.fa-caret-square-o-down:before {
+  content: "\f150";
+}
+.fa-toggle-up:before,
+.fa-caret-square-o-up:before {
+  content: "\f151";
+}
+.fa-toggle-right:before,
+.fa-caret-square-o-right:before {
+  content: "\f152";
+}
+.fa-euro:before,
+.fa-eur:before {
+  content: "\f153";
+}
+.fa-gbp:before {
+  content: "\f154";
+}
+.fa-dollar:before,
+.fa-usd:before {
+  content: "\f155";
+}
+.fa-rupee:before,
+.fa-inr:before {
+  content: "\f156";
+}
+.fa-cny:before,
+.fa-rmb:before,
+.fa-yen:before,
+.fa-jpy:before {
+  content: "\f157";
+}
+.fa-ruble:before,
+.fa-rouble:before,
+.fa-rub:before {
+  content: "\f158";
+}
+.fa-won:before,
+.fa-krw:before {
+  content: "\f159";
+}
+.fa-bitcoin:before,
+.fa-btc:before {
+  content: "\f15a";
+}
+.fa-file:before {
+  content: "\f15b";
+}
+.fa-file-text:before {
+  content: "\f15c";
+}
+.fa-sort-alpha-asc:before {
+  content: "\f15d";
+}
+.fa-sort-alpha-desc:before {
+  content: "\f15e";
+}
+.fa-sort-amount-asc:before {
+  content: "\f160";
+}
+.fa-sort-amount-desc:before {
+  content: "\f161";
+}
+.fa-sort-numeric-asc:before {
+  content: "\f162";
+}
+.fa-sort-numeric-desc:before {
+  content: "\f163";
+}
+.fa-thumbs-up:before {
+  content: "\f164";
+}
+.fa-thumbs-down:before {
+  content: "\f165";
+}
+.fa-youtube-square:before {
+  content: "\f166";
+}
+.fa-youtube:before {
+  content: "\f167";
+}
+.fa-xing:before {
+  content: "\f168";
+}
+.fa-xing-square:before {
+  content: "\f169";
+}
+.fa-youtube-play:before {
+  content: "\f16a";
+}
+.fa-dropbox:before {
+  content: "\f16b";
+}
+.fa-stack-overflow:before {
+  content: "\f16c";
+}
+.fa-instagram:before {
+  content: "\f16d";
+}
+.fa-flickr:before {
+  content: "\f16e";
+}
+.fa-adn:before {
+  content: "\f170";
+}
+.fa-bitbucket:before {
+  content: "\f171";
+}
+.fa-bitbucket-square:before {
+  content: "\f172";
+}
+.fa-tumblr:before {
+  content: "\f173";
+}
+.fa-tumblr-square:before {
+  content: "\f174";
+}
+.fa-long-arrow-down:before {
+  content: "\f175";
+}
+.fa-long-arrow-up:before {
+  content: "\f176";
+}
+.fa-long-arrow-left:before {
+  content: "\f177";
+}
+.fa-long-arrow-right:before {
+  content: "\f178";
+}
+.fa-apple:before {
+  content: "\f179";
+}
+.fa-windows:before {
+  content: "\f17a";
+}
+.fa-android:before {
+  content: "\f17b";
+}
+.fa-linux:before {
+  content: "\f17c";
+}
+.fa-dribbble:before {
+  content: "\f17d";
+}
+.fa-skype:before {
+  content: "\f17e";
+}
+.fa-foursquare:before {
+  content: "\f180";
+}
+.fa-trello:before {
+  content: "\f181";
+}
+.fa-female:before {
+  content: "\f182";
+}
+.fa-male:before {
+  content: "\f183";
+}
+.fa-gittip:before,
+.fa-gratipay:before {
+  content: "\f184";
+}
+.fa-sun-o:before {
+  content: "\f185";
+}
+.fa-moon-o:before {
+  content: "\f186";
+}
+.fa-archive:before {
+  content: "\f187";
+}
+.fa-bug:before {
+  content: "\f188";
+}
+.fa-vk:before {
+  content: "\f189";
+}
+.fa-weibo:before {
+  content: "\f18a";
+}
+.fa-renren:before {
+  content: "\f18b";
+}
+.fa-pagelines:before {
+  content: "\f18c";
+}
+.fa-stack-exchange:before {
+  content: "\f18d";
+}
+.fa-arrow-circle-o-right:before {
+  content: "\f18e";
+}
+.fa-arrow-circle-o-left:before {
+  content: "\f190";
+}
+.fa-toggle-left:before,
+.fa-caret-square-o-left:before {
+  content: "\f191";
+}
+.fa-dot-circle-o:before {
+  content: "\f192";
+}
+.fa-wheelchair:before {
+  content: "\f193";
+}
+.fa-vimeo-square:before {
+  content: "\f194";
+}
+.fa-turkish-lira:before,
+.fa-try:before {
+  content: "\f195";
+}
+.fa-plus-square-o:before {
+  content: "\f196";
+}
+.fa-space-shuttle:before {
+  content: "\f197";
+}
+.fa-slack:before {
+  content: "\f198";
+}
+.fa-envelope-square:before {
+  content: "\f199";
+}
+.fa-wordpress:before {
+  content: "\f19a";
+}
+.fa-openid:before {
+  content: "\f19b";
+}
+.fa-institution:before,
+.fa-bank:before,
+.fa-university:before {
+  content: "\f19c";
+}
+.fa-mortar-board:before,
+.fa-graduation-cap:before {
+  content: "\f19d";
+}
+.fa-yahoo:before {
+  content: "\f19e";
+}
+.fa-google:before {
+  content: "\f1a0";
+}
+.fa-reddit:before {
+  content: "\f1a1";
+}
+.fa-reddit-square:before {
+  content: "\f1a2";
+}
+.fa-stumbleupon-circle:before {
+  content: "\f1a3";
+}
+.fa-stumbleupon:before {
+  content: "\f1a4";
+}
+.fa-delicious:before {
+  content: "\f1a5";
+}
+.fa-digg:before {
+  content: "\f1a6";
+}
+.fa-pied-piper-pp:before {
+  content: "\f1a7";
+}
+.fa-pied-piper-alt:before {
+  content: "\f1a8";
+}
+.fa-drupal:before {
+  content: "\f1a9";
+}
+.fa-joomla:before {
+  content: "\f1aa";
+}
+.fa-language:before {
+  content: "\f1ab";
+}
+.fa-fax:before {
+  content: "\f1ac";
+}
+.fa-building:before {
+  content: "\f1ad";
+}
+.fa-child:before {
+  content: "\f1ae";
+}
+.fa-paw:before {
+  content: "\f1b0";
+}
+.fa-spoon:before {
+  content: "\f1b1";
+}
+.fa-cube:before {
+  content: "\f1b2";
+}
+.fa-cubes:before {
+  content: "\f1b3";
+}
+.fa-behance:before {
+  content: "\f1b4";
+}
+.fa-behance-square:before {
+  content: "\f1b5";
+}
+.fa-steam:before {
+  content: "\f1b6";
+}
+.fa-steam-square:before {
+  content: "\f1b7";
+}
+.fa-recycle:before {
+  content: "\f1b8";
+}
+.fa-automobile:before,
+.fa-car:before {
+  content: "\f1b9";
+}
+.fa-cab:before,
+.fa-taxi:before {
+  content: "\f1ba";
+}
+.fa-tree:before {
+  content: "\f1bb";
+}
+.fa-spotify:before {
+  content: "\f1bc";
+}
+.fa-deviantart:before {
+  content: "\f1bd";
+}
+.fa-soundcloud:before {
+  content: "\f1be";
+}
+.fa-database:before {
+  content: "\f1c0";
+}
+.fa-file-pdf-o:before {
+  content: "\f1c1";
+}
+.fa-file-word-o:before {
+  content: "\f1c2";
+}
+.fa-file-excel-o:before {
+  content: "\f1c3";
+}
+.fa-file-powerpoint-o:before {
+  content: "\f1c4";
+}
+.fa-file-photo-o:before,
+.fa-file-picture-o:before,
+.fa-file-image-o:before {
+  content: "\f1c5";
+}
+.fa-file-zip-o:before,
+.fa-file-archive-o:before {
+  content: "\f1c6";
+}
+.fa-file-sound-o:before,
+.fa-file-audio-o:before {
+  content: "\f1c7";
+}
+.fa-file-movie-o:before,
+.fa-file-video-o:before {
+  content: "\f1c8";
+}
+.fa-file-code-o:before {
+  content: "\f1c9";
+}
+.fa-vine:before {
+  content: "\f1ca";
+}
+.fa-codepen:before {
+  content: "\f1cb";
+}
+.fa-jsfiddle:before {
+  content: "\f1cc";
+}
+.fa-life-bouy:before,
+.fa-life-buoy:before,
+.fa-life-saver:before,
+.fa-support:before,
+.fa-life-ring:before {
+  content: "\f1cd";
+}
+.fa-circle-o-notch:before {
+  content: "\f1ce";
+}
+.fa-ra:before,
+.fa-resistance:before,
+.fa-rebel:before {
+  content: "\f1d0";
+}
+.fa-ge:before,
+.fa-empire:before {
+  content: "\f1d1";
+}
+.fa-git-square:before {
+  content: "\f1d2";
+}
+.fa-git:before {
+  content: "\f1d3";
+}
+.fa-y-combinator-square:before,
+.fa-yc-square:before,
+.fa-hacker-news:before {
+  content: "\f1d4";
+}
+.fa-tencent-weibo:before {
+  content: "\f1d5";
+}
+.fa-qq:before {
+  content: "\f1d6";
+}
+.fa-wechat:before,
+.fa-weixin:before {
+  content: "\f1d7";
+}
+.fa-send:before,
+.fa-paper-plane:before {
+  content: "\f1d8";
+}
+.fa-send-o:before,
+.fa-paper-plane-o:before {
+  content: "\f1d9";
+}
+.fa-history:before {
+  content: "\f1da";
+}
+.fa-circle-thin:before {
+  content: "\f1db";
+}
+.fa-header:before {
+  content: "\f1dc";
+}
+.fa-paragraph:before {
+  content: "\f1dd";
+}
+.fa-sliders:before {
+  content: "\f1de";
+}
+.fa-share-alt:before {
+  content: "\f1e0";
+}
+.fa-share-alt-square:before {
+  content: "\f1e1";
+}
+.fa-bomb:before {
+  content: "\f1e2";
+}
+.fa-soccer-ball-o:before,
+.fa-futbol-o:before {
+  content: "\f1e3";
+}
+.fa-tty:before {
+  content: "\f1e4";
+}
+.fa-binoculars:before {
+  content: "\f1e5";
+}
+.fa-plug:before {
+  content: "\f1e6";
+}
+.fa-slideshare:before {
+  content: "\f1e7";
+}
+.fa-twitch:before {
+  content: "\f1e8";
+}
+.fa-yelp:before {
+  content: "\f1e9";
+}
+.fa-newspaper-o:before {
+  content: "\f1ea";
+}
+.fa-wifi:before {
+  content: "\f1eb";
+}
+.fa-calculator:before {
+  content: "\f1ec";
+}
+.fa-paypal:before {
+  content: "\f1ed";
+}
+.fa-google-wallet:before {
+  content: "\f1ee";
+}
+.fa-cc-visa:before {
+  content: "\f1f0";
+}
+.fa-cc-mastercard:before {
+  content: "\f1f1";
+}
+.fa-cc-discover:before {
+  content: "\f1f2";
+}
+.fa-cc-amex:before {
+  content: "\f1f3";
+}
+.fa-cc-paypal:before {
+  content: "\f1f4";
+}
+.fa-cc-stripe:before {
+  content: "\f1f5";
+}
+.fa-bell-slash:before {
+  content: "\f1f6";
+}
+.fa-bell-slash-o:before {
+  content: "\f1f7";
+}
+.fa-trash:before {
+  content: "\f1f8";
+}
+.fa-copyright:before {
+  content: "\f1f9";
+}
+.fa-at:before {
+  content: "\f1fa";
+}
+.fa-eyedropper:before {
+  content: "\f1fb";
+}
+.fa-paint-brush:before {
+  content: "\f1fc";
+}
+.fa-birthday-cake:before {
+  content: "\f1fd";
+}
+.fa-area-chart:before {
+  content: "\f1fe";
+}
+.fa-pie-chart:before {
+  content: "\f200";
+}
+.fa-line-chart:before {
+  content: "\f201";
+}
+.fa-lastfm:before {
+  content: "\f202";
+}
+.fa-lastfm-square:before {
+  content: "\f203";
+}
+.fa-toggle-off:before {
+  content: "\f204";
+}
+.fa-toggle-on:before {
+  content: "\f205";
+}
+.fa-bicycle:before {
+  content: "\f206";
+}
+.fa-bus:before {
+  content: "\f207";
+}
+.fa-ioxhost:before {
+  content: "\f208";
+}
+.fa-angellist:before {
+  content: "\f209";
+}
+.fa-cc:before {
+  content: "\f20a";
+}
+.fa-shekel:before,
+.fa-sheqel:before,
+.fa-ils:before {
+  content: "\f20b";
+}
+.fa-meanpath:before {
+  content: "\f20c";
+}
+.fa-buysellads:before {
+  content: "\f20d";
+}
+.fa-connectdevelop:before {
+  content: "\f20e";
+}
+.fa-dashcube:before {
+  content: "\f210";
+}
+.fa-forumbee:before {
+  content: "\f211";
+}
+.fa-leanpub:before {
+  content: "\f212";
+}
+.fa-sellsy:before {
+  content: "\f213";
+}
+.fa-shirtsinbulk:before {
+  content: "\f214";
+}
+.fa-simplybuilt:before {
+  content: "\f215";
+}
+.fa-skyatlas:before {
+  content: "\f216";
+}
+.fa-cart-plus:before {
+  content: "\f217";
+}
+.fa-cart-arrow-down:before {
+  content: "\f218";
+}
+.fa-diamond:before {
+  content: "\f219";
+}
+.fa-ship:before {
+  content: "\f21a";
+}
+.fa-user-secret:before {
+  content: "\f21b";
+}
+.fa-motorcycle:before {
+  content: "\f21c";
+}
+.fa-street-view:before {
+  content: "\f21d";
+}
+.fa-heartbeat:before {
+  content: "\f21e";
+}
+.fa-venus:before {
+  content: "\f221";
+}
+.fa-mars:before {
+  content: "\f222";
+}
+.fa-mercury:before {
+  content: "\f223";
+}
+.fa-intersex:before,
+.fa-transgender:before {
+  content: "\f224";
+}
+.fa-transgender-alt:before {
+  content: "\f225";
+}
+.fa-venus-double:before {
+  content: "\f226";
+}
+.fa-mars-double:before {
+  content: "\f227";
+}
+.fa-venus-mars:before {
+  content: "\f228";
+}
+.fa-mars-stroke:before {
+  content: "\f229";
+}
+.fa-mars-stroke-v:before {
+  content: "\f22a";
+}
+.fa-mars-stroke-h:before {
+  content: "\f22b";
+}
+.fa-neuter:before {
+  content: "\f22c";
+}
+.fa-genderless:before {
+  content: "\f22d";
+}
+.fa-facebook-official:before {
+  content: "\f230";
+}
+.fa-pinterest-p:before {
+  content: "\f231";
+}
+.fa-whatsapp:before {
+  content: "\f232";
+}
+.fa-server:before {
+  content: "\f233";
+}
+.fa-user-plus:before {
+  content: "\f234";
+}
+.fa-user-times:before {
+  content: "\f235";
+}
+.fa-hotel:before,
+.fa-bed:before {
+  content: "\f236";
+}
+.fa-viacoin:before {
+  content: "\f237";
+}
+.fa-train:before {
+  content: "\f238";
+}
+.fa-subway:before {
+  content: "\f239";
+}
+.fa-medium:before {
+  content: "\f23a";
+}
+.fa-yc:before,
+.fa-y-combinator:before {
+  content: "\f23b";
+}
+.fa-optin-monster:before {
+  content: "\f23c";
+}
+.fa-opencart:before {
+  content: "\f23d";
+}
+.fa-expeditedssl:before {
+  content: "\f23e";
+}
+.fa-battery-4:before,
+.fa-battery:before,
+.fa-battery-full:before {
+  content: "\f240";
+}
+.fa-battery-3:before,
+.fa-battery-three-quarters:before {
+  content: "\f241";
+}
+.fa-battery-2:before,
+.fa-battery-half:before {
+  content: "\f242";
+}
+.fa-battery-1:before,
+.fa-battery-quarter:before {
+  content: "\f243";
+}
+.fa-battery-0:before,
+.fa-battery-empty:before {
+  content: "\f244";
+}
+.fa-mouse-pointer:before {
+  content: "\f245";
+}
+.fa-i-cursor:before {
+  content: "\f246";
+}
+.fa-object-group:before {
+  content: "\f247";
+}
+.fa-object-ungroup:before {
+  content: "\f248";
+}
+.fa-sticky-note:before {
+  content: "\f249";
+}
+.fa-sticky-note-o:before {
+  content: "\f24a";
+}
+.fa-cc-jcb:before {
+  content: "\f24b";
+}
+.fa-cc-diners-club:before {
+  content: "\f24c";
+}
+.fa-clone:before {
+  content: "\f24d";
+}
+.fa-balance-scale:before {
+  content: "\f24e";
+}
+.fa-hourglass-o:before {
+  content: "\f250";
+}
+.fa-hourglass-1:before,
+.fa-hourglass-start:before {
+  content: "\f251";
+}
+.fa-hourglass-2:before,
+.fa-hourglass-half:before {
+  content: "\f252";
+}
+.fa-hourglass-3:before,
+.fa-hourglass-end:before {
+  content: "\f253";
+}
+.fa-hourglass:before {
+  content: "\f254";
+}
+.fa-hand-grab-o:before,
+.fa-hand-rock-o:before {
+  content: "\f255";
+}
+.fa-hand-stop-o:before,
+.fa-hand-paper-o:before {
+  content: "\f256";
+}
+.fa-hand-scissors-o:before {
+  content: "\f257";
+}
+.fa-hand-lizard-o:before {
+  content: "\f258";
+}
+.fa-hand-spock-o:before {
+  content: "\f259";
+}
+.fa-hand-pointer-o:before {
+  content: "\f25a";
+}
+.fa-hand-peace-o:before {
+  content: "\f25b";
+}
+.fa-trademark:before {
+  content: "\f25c";
+}
+.fa-registered:before {
+  content: "\f25d";
+}
+.fa-creative-commons:before {
+  content: "\f25e";
+}
+.fa-gg:before {
+  content: "\f260";
+}
+.fa-gg-circle:before {
+  content: "\f261";
+}
+.fa-tripadvisor:before {
+  content: "\f262";
+}
+.fa-odnoklassniki:before {
+  content: "\f263";
+}
+.fa-odnoklassniki-square:before {
+  content: "\f264";
+}
+.fa-get-pocket:before {
+  content: "\f265";
+}
+.fa-wikipedia-w:before {
+  content: "\f266";
+}
+.fa-safari:before {
+  content: "\f267";
+}
+.fa-chrome:before {
+  content: "\f268";
+}
+.fa-firefox:before {
+  content: "\f269";
+}
+.fa-opera:before {
+  content: "\f26a";
+}
+.fa-internet-explorer:before {
+  content: "\f26b";
+}
+.fa-tv:before,
+.fa-television:before {
+  content: "\f26c";
+}
+.fa-contao:before {
+  content: "\f26d";
+}
+.fa-500px:before {
+  content: "\f26e";
+}
+.fa-amazon:before {
+  content: "\f270";
+}
+.fa-calendar-plus-o:before {
+  content: "\f271";
+}
+.fa-calendar-minus-o:before {
+  content: "\f272";
+}
+.fa-calendar-times-o:before {
+  content: "\f273";
+}
+.fa-calendar-check-o:before {
+  content: "\f274";
+}
+.fa-industry:before {
+  content: "\f275";
+}
+.fa-map-pin:before {
+  content: "\f276";
+}
+.fa-map-signs:before {
+  content: "\f277";
+}
+.fa-map-o:before {
+  content: "\f278";
+}
+.fa-map:before {
+  content: "\f279";
+}
+.fa-commenting:before {
+  content: "\f27a";
+}
+.fa-commenting-o:before {
+  content: "\f27b";
+}
+.fa-houzz:before {
+  content: "\f27c";
+}
+.fa-vimeo:before {
+  content: "\f27d";
+}
+.fa-black-tie:before {
+  content: "\f27e";
+}
+.fa-fonticons:before {
+  content: "\f280";
+}
+.fa-reddit-alien:before {
+  content: "\f281";
+}
+.fa-edge:before {
+  content: "\f282";
+}
+.fa-credit-card-alt:before {
+  content: "\f283";
+}
+.fa-codiepie:before {
+  content: "\f284";
+}
+.fa-modx:before {
+  content: "\f285";
+}
+.fa-fort-awesome:before {
+  content: "\f286";
+}
+.fa-usb:before {
+  content: "\f287";
+}
+.fa-product-hunt:before {
+  content: "\f288";
+}
+.fa-mixcloud:before {
+  content: "\f289";
+}
+.fa-scribd:before {
+  content: "\f28a";
+}
+.fa-pause-circle:before {
+  content: "\f28b";
+}
+.fa-pause-circle-o:before {
+  content: "\f28c";
+}
+.fa-stop-circle:before {
+  content: "\f28d";
+}
+.fa-stop-circle-o:before {
+  content: "\f28e";
+}
+.fa-shopping-bag:before {
+  content: "\f290";
+}
+.fa-shopping-basket:before {
+  content: "\f291";
+}
+.fa-hashtag:before {
+  content: "\f292";
+}
+.fa-bluetooth:before {
+  content: "\f293";
+}
+.fa-bluetooth-b:before {
+  content: "\f294";
+}
+.fa-percent:before {
+  content: "\f295";
+}
+.fa-gitlab:before {
+  content: "\f296";
+}
+.fa-wpbeginner:before {
+  content: "\f297";
+}
+.fa-wpforms:before {
+  content: "\f298";
+}
+.fa-envira:before {
+  content: "\f299";
+}
+.fa-universal-access:before {
+  content: "\f29a";
+}
+.fa-wheelchair-alt:before {
+  content: "\f29b";
+}
+.fa-question-circle-o:before {
+  content: "\f29c";
+}
+.fa-blind:before {
+  content: "\f29d";
+}
+.fa-audio-description:before {
+  content: "\f29e";
+}
+.fa-volume-control-phone:before {
+  content: "\f2a0";
+}
+.fa-braille:before {
+  content: "\f2a1";
+}
+.fa-assistive-listening-systems:before {
+  content: "\f2a2";
+}
+.fa-asl-interpreting:before,
+.fa-american-sign-language-interpreting:before {
+  content: "\f2a3";
+}
+.fa-deafness:before,
+.fa-hard-of-hearing:before,
+.fa-deaf:before {
+  content: "\f2a4";
+}
+.fa-glide:before {
+  content: "\f2a5";
+}
+.fa-glide-g:before {
+  content: "\f2a6";
+}
+.fa-signing:before,
+.fa-sign-language:before {
+  content: "\f2a7";
+}
+.fa-low-vision:before {
+  content: "\f2a8";
+}
+.fa-viadeo:before {
+  content: "\f2a9";
+}
+.fa-viadeo-square:before {
+  content: "\f2aa";
+}
+.fa-snapchat:before {
+  content: "\f2ab";
+}
+.fa-snapchat-ghost:before {
+  content: "\f2ac";
+}
+.fa-snapchat-square:before {
+  content: "\f2ad";
+}
+.fa-pied-piper:before {
+  content: "\f2ae";
+}
+.fa-first-order:before {
+  content: "\f2b0";
+}
+.fa-yoast:before {
+  content: "\f2b1";
+}
+.fa-themeisle:before {
+  content: "\f2b2";
+}
+.fa-google-plus-circle:before,
+.fa-google-plus-official:before {
+  content: "\f2b3";
+}
+.fa-fa:before,
+.fa-font-awesome:before {
+  content: "\f2b4";
+}
+.fa-handshake-o:before {
+  content: "\f2b5";
+}
+.fa-envelope-open:before {
+  content: "\f2b6";
+}
+.fa-envelope-open-o:before {
+  content: "\f2b7";
+}
+.fa-linode:before {
+  content: "\f2b8";
+}
+.fa-address-book:before {
+  content: "\f2b9";
+}
+.fa-address-book-o:before {
+  content: "\f2ba";
+}
+.fa-vcard:before,
+.fa-address-card:before {
+  content: "\f2bb";
+}
+.fa-vcard-o:before,
+.fa-address-card-o:before {
+  content: "\f2bc";
+}
+.fa-user-circle:before {
+  content: "\f2bd";
+}
+.fa-user-circle-o:before {
+  content: "\f2be";
+}
+.fa-user-o:before {
+  content: "\f2c0";
+}
+.fa-id-badge:before {
+  content: "\f2c1";
+}
+.fa-drivers-license:before,
+.fa-id-card:before {
+  content: "\f2c2";
+}
+.fa-drivers-license-o:before,
+.fa-id-card-o:before {
+  content: "\f2c3";
+}
+.fa-quora:before {
+  content: "\f2c4";
+}
+.fa-free-code-camp:before {
+  content: "\f2c5";
+}
+.fa-telegram:before {
+  content: "\f2c6";
+}
+.fa-thermometer-4:before,
+.fa-thermometer:before,
+.fa-thermometer-full:before {
+  content: "\f2c7";
+}
+.fa-thermometer-3:before,
+.fa-thermometer-three-quarters:before {
+  content: "\f2c8";
+}
+.fa-thermometer-2:before,
+.fa-thermometer-half:before {
+  content: "\f2c9";
+}
+.fa-thermometer-1:before,
+.fa-thermometer-quarter:before {
+  content: "\f2ca";
+}
+.fa-thermometer-0:before,
+.fa-thermometer-empty:before {
+  content: "\f2cb";
+}
+.fa-shower:before {
+  content: "\f2cc";
+}
+.fa-bathtub:before,
+.fa-s15:before,
+.fa-bath:before {
+  content: "\f2cd";
+}
+.fa-podcast:before {
+  content: "\f2ce";
+}
+.fa-window-maximize:before {
+  content: "\f2d0";
+}
+.fa-window-minimize:before {
+  content: "\f2d1";
+}
+.fa-window-restore:before {
+  content: "\f2d2";
+}
+.fa-times-rectangle:before,
+.fa-window-close:before {
+  content: "\f2d3";
+}
+.fa-times-rectangle-o:before,
+.fa-window-close-o:before {
+  content: "\f2d4";
+}
+.fa-bandcamp:before {
+  content: "\f2d5";
+}
+.fa-grav:before {
+  content: "\f2d6";
+}
+.fa-etsy:before {
+  content: "\f2d7";
+}
+.fa-imdb:before {
+  content: "\f2d8";
+}
+.fa-ravelry:before {
+  content: "\f2d9";
+}
+.fa-eercast:before {
+  content: "\f2da";
+}
+.fa-microchip:before {
+  content: "\f2db";
+}
+.fa-snowflake-o:before {
+  content: "\f2dc";
+}
+.fa-superpowers:before {
+  content: "\f2dd";
+}
+.fa-wpexplorer:before {
+  content: "\f2de";
+}
+.fa-meetup:before {
+  content: "\f2e0";
+}
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+.sr-only-focusable:active,
+.sr-only-focusable:focus {
+  position: static;
+  width: auto;
+  height: auto;
+  margin: 0;
+  overflow: visible;
+  clip: auto;
+}
diff --git a/htdocs/includes/fontawesome/css/font-awesome.css.map b/htdocs/includes/fontawesome/css/font-awesome.css.map
new file mode 100644
index 00000000000..60763a8640f
--- /dev/null
+++ b/htdocs/includes/fontawesome/css/font-awesome.css.map
@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "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",
+"sources": ["../scss/_path.scss","../scss/_core.scss","../scss/_larger.scss","../scss/_fixed-width.scss","../scss/_list.scss","../scss/_variables.scss","../scss/_bordered-pulled.scss","../scss/_animated.scss","../scss/_rotated-flipped.scss","../scss/_mixins.scss","../scss/_stacked.scss","../scss/_icons.scss"],
+"names": [],
+"file": "font-awesome.css"
+}
diff --git a/htdocs/includes/fontawesome/css/font-awesome.min.css b/htdocs/includes/fontawesome/css/font-awesome.min.css
new file mode 100644
index 00000000000..540440ce89f
--- /dev/null
+++ b/htdocs/includes/fontawesome/css/font-awesome.min.css
@@ -0,0 +1,4 @@
+/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-resistance:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-vcard:before,.fa-address-card:before{content:"\f2bb"}.fa-vcard-o:before,.fa-address-card-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer:before,.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bathtub:before,.fa-s15:before,.fa-bath:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}
diff --git a/htdocs/includes/fontawesome/fonts/FontAwesome.otf b/htdocs/includes/fontawesome/fonts/FontAwesome.otf
new file mode 100644
index 0000000000000000000000000000000000000000..401ec0f36e4f73b8efa40bd6f604fe80d286db70
GIT binary patch
literal 134808
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

literal 0
HcmV?d00001

diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.eot b/htdocs/includes/fontawesome/fonts/fontawesome-webfont.eot
new file mode 100644
index 0000000000000000000000000000000000000000..e9f60ca953f93e35eab4108bd414bc02ddcf3928
GIT binary patch
literal 165742
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

literal 0
HcmV?d00001

diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.svg b/htdocs/includes/fontawesome/fonts/fontawesome-webfont.svg
new file mode 100644
index 00000000000..855c845e538
--- /dev/null
+++ b/htdocs/includes/fontawesome/fonts/fontawesome-webfont.svg
@@ -0,0 +1,2671 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg>
+<metadata>
+Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016
+ By ,,,
+Copyright Dave Gandy 2016. All rights reserved.
+</metadata>
+<defs>
+<font id="FontAwesome" horiz-adv-x="1536" >
+  <font-face 
+    font-family="FontAwesome"
+    font-weight="400"
+    font-stretch="normal"
+    units-per-em="1792"
+    panose-1="0 0 0 0 0 0 0 0 0 0"
+    ascent="1536"
+    descent="-256"
+    bbox="-1.02083 -256.962 2304.6 1537.02"
+    underline-thickness="0"
+    underline-position="0"
+    unicode-range="U+0020-F500"
+  />
+<missing-glyph horiz-adv-x="896" 
+d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
+    <glyph glyph-name=".notdef" horiz-adv-x="896" 
+d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
+    <glyph glyph-name=".null" horiz-adv-x="0" 
+ />
+    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="597" 
+ />
+    <glyph glyph-name="space" unicode=" " horiz-adv-x="448" 
+ />
+    <glyph glyph-name="dieresis" unicode="&#xa8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="copyright" unicode="&#xa9;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="registered" unicode="&#xae;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="acute" unicode="&#xb4;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="AE" unicode="&#xc6;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="Oslash" unicode="&#xd8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="trademark" unicode="&#x2122;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="infinity" unicode="&#x221e;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="notequal" unicode="&#x2260;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="glass" unicode="&#xf000;" horiz-adv-x="1792" 
+d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
+    <glyph glyph-name="music" unicode="&#xf001;" 
+d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89
+t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="search" unicode="&#xf002;" horiz-adv-x="1664" 
+d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5
+t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+    <glyph glyph-name="envelope" unicode="&#xf003;" horiz-adv-x="1792" 
+d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13
+t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z
+M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="heart" unicode="&#xf004;" horiz-adv-x="1792" 
+d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600
+q-18 -18 -44 -18z" />
+    <glyph glyph-name="star" unicode="&#xf005;" horiz-adv-x="1664" 
+d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455
+l502 -73q56 -9 56 -46z" />
+    <glyph glyph-name="star_empty" unicode="&#xf006;" horiz-adv-x="1664" 
+d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500
+l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
+    <glyph glyph-name="user" unicode="&#xf007;" horiz-adv-x="1280" 
+d="M1280 137q0 -109 -62.5 -187t-150.5 -78h-854q-88 0 -150.5 78t-62.5 187q0 85 8.5 160.5t31.5 152t58.5 131t94 89t134.5 34.5q131 -128 313 -128t313 128q76 0 134.5 -34.5t94 -89t58.5 -131t31.5 -152t8.5 -160.5zM1024 1024q0 -159 -112.5 -271.5t-271.5 -112.5
+t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="film" unicode="&#xf008;" horiz-adv-x="1920" 
+d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128
+q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45
+t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128
+q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19
+t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="th_large" unicode="&#xf009;" horiz-adv-x="1664" 
+d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38
+h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="th" unicode="&#xf00a;" horiz-adv-x="1792" 
+d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
+h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192
+q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="th_list" unicode="&#xf00b;" horiz-adv-x="1792" 
+d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
+h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="ok" unicode="&#xf00c;" horiz-adv-x="1792" 
+d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
+    <glyph glyph-name="remove" unicode="&#xf00d;" horiz-adv-x="1408" 
+d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68
+t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
+    <glyph glyph-name="zoom_in" unicode="&#xf00e;" horiz-adv-x="1664" 
+d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224
+q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5
+t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+    <glyph glyph-name="zoom_out" unicode="&#xf010;" horiz-adv-x="1664" 
+d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z
+M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z
+" />
+    <glyph glyph-name="off" unicode="&#xf011;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5
+t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
+    <glyph glyph-name="signal" unicode="&#xf012;" horiz-adv-x="1792" 
+d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
+v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="cog" unicode="&#xf013;" 
+d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38
+q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13
+l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22
+q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
+    <glyph glyph-name="trash" unicode="&#xf014;" horiz-adv-x="1408" 
+d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576
+q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832
+q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="home" unicode="&#xf015;" horiz-adv-x="1664" 
+d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5
+l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
+    <glyph glyph-name="file_alt" unicode="&#xf016;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+" />
+    <glyph glyph-name="time" unicode="&#xf017;" 
+d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="road" unicode="&#xf018;" horiz-adv-x="1920" 
+d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256
+q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
+    <glyph glyph-name="download_alt" unicode="&#xf019;" horiz-adv-x="1664" 
+d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136
+q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
+    <glyph glyph-name="download" unicode="&#xf01a;" 
+d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273
+t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="upload" unicode="&#xf01b;" 
+d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198
+t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="inbox" unicode="&#xf01c;" 
+d="M1023 576h316q-1 3 -2.5 8.5t-2.5 7.5l-212 496h-708l-212 -496q-1 -3 -2.5 -8.5t-2.5 -7.5h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552
+q25 -61 25 -123z" />
+    <glyph glyph-name="play_circle" unicode="&#xf01d;" 
+d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="repeat" unicode="&#xf01e;" 
+d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q15 0 25 -9
+l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
+    <glyph glyph-name="refresh" unicode="&#xf021;" 
+d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117
+q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5
+q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="list_alt" unicode="&#xf022;" horiz-adv-x="1792" 
+d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z
+M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5
+t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47
+t47 -113z" />
+    <glyph glyph-name="lock" unicode="&#xf023;" horiz-adv-x="1152" 
+d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="flag" unicode="&#xf024;" horiz-adv-x="1792" 
+d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48
+t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="headphones" unicode="&#xf025;" horiz-adv-x="1664" 
+d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78
+t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5
+t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
+    <glyph glyph-name="volume_off" unicode="&#xf026;" horiz-adv-x="768" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="volume_down" unicode="&#xf027;" horiz-adv-x="1152" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
+t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
+    <glyph glyph-name="volume_up" unicode="&#xf028;" horiz-adv-x="1664" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
+t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5
+t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289
+t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
+    <glyph glyph-name="qrcode" unicode="&#xf029;" horiz-adv-x="1408" 
+d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z
+M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
+    <glyph glyph-name="barcode" unicode="&#xf02a;" horiz-adv-x="1792" 
+d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z
+M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
+    <glyph glyph-name="tag" unicode="&#xf02b;" 
+d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
+l715 -714q37 -39 37 -91z" />
+    <glyph glyph-name="tags" unicode="&#xf02c;" horiz-adv-x="1920" 
+d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
+l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
+    <glyph glyph-name="book" unicode="&#xf02d;" horiz-adv-x="1664" 
+d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23
+q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906
+q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5
+t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
+    <glyph glyph-name="bookmark" unicode="&#xf02e;" horiz-adv-x="1280" 
+d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+    <glyph glyph-name="print" unicode="&#xf02f;" horiz-adv-x="1664" 
+d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68
+v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
+    <glyph glyph-name="camera" unicode="&#xf030;" horiz-adv-x="1920" 
+d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136
+q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="font" unicode="&#xf031;" horiz-adv-x="1664" 
+d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57
+q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -5 -0.5 -13.5t-0.5 -12.5q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5
+q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
+    <glyph glyph-name="bold" unicode="&#xf032;" horiz-adv-x="1408" 
+d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142
+q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5
+t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68 -0.5t68 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5
+t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
+    <glyph glyph-name="italic" unicode="&#xf033;" horiz-adv-x="1024" 
+d="M0 -126l17 85q22 7 61.5 16.5t72 19t59.5 23.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5
+q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
+    <glyph glyph-name="text_height" unicode="&#xf034;" horiz-adv-x="1792" 
+d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2
+t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5
+q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
+q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
+    <glyph glyph-name="text_width" unicode="&#xf035;" 
+d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1
+t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
+q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5
+t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49
+t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
+    <glyph glyph-name="align_left" unicode="&#xf036;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45
+t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_center" unicode="&#xf037;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19
+h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_right" unicode="&#xf038;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
+t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_justify" unicode="&#xf039;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
+t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="list" unicode="&#xf03a;" horiz-adv-x="1792" 
+d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5
+t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344
+q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
+t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192
+q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="indent_left" unicode="&#xf03b;" horiz-adv-x="1792" 
+d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
+t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
+q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="indent_right" unicode="&#xf03c;" horiz-adv-x="1792" 
+d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
+t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
+q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="facetime_video" unicode="&#xf03d;" horiz-adv-x="1792" 
+d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5
+q39 -17 39 -59z" />
+    <glyph glyph-name="picture" unicode="&#xf03e;" horiz-adv-x="1920" 
+d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216
+q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="pencil" unicode="&#xf040;" 
+d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38
+q53 0 91 -38l235 -234q37 -39 37 -91z" />
+    <glyph glyph-name="map_marker" unicode="&#xf041;" horiz-adv-x="1024" 
+d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
+    <glyph glyph-name="adjust" unicode="&#xf042;" 
+d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="tint" unicode="&#xf043;" horiz-adv-x="1024" 
+d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362
+q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
+    <glyph glyph-name="edit" unicode="&#xf044;" horiz-adv-x="1792" 
+d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
+q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92
+l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
+    <glyph glyph-name="share" unicode="&#xf045;" horiz-adv-x="1664" 
+d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832
+q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5
+t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="check" unicode="&#xf046;" horiz-adv-x="1664" 
+d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832
+q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110
+q24 -24 24 -57t-24 -57z" />
+    <glyph glyph-name="move" unicode="&#xf047;" horiz-adv-x="1792" 
+d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45
+t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="step_backward" unicode="&#xf048;" horiz-adv-x="1024" 
+d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19z" />
+    <glyph glyph-name="fast_backward" unicode="&#xf049;" horiz-adv-x="1792" 
+d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19l710 710
+q19 19 32 13t13 -32v-710q4 10 13 19z" />
+    <glyph glyph-name="backward" unicode="&#xf04a;" horiz-adv-x="1664" 
+d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q4 10 13 19z" />
+    <glyph glyph-name="play" unicode="&#xf04b;" horiz-adv-x="1408" 
+d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
+    <glyph glyph-name="pause" unicode="&#xf04c;" 
+d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="stop" unicode="&#xf04d;" 
+d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="forward" unicode="&#xf04e;" horiz-adv-x="1664" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
+    <glyph glyph-name="fast_forward" unicode="&#xf050;" horiz-adv-x="1792" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19l-710 -710
+q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
+    <glyph glyph-name="step_forward" unicode="&#xf051;" horiz-adv-x="1024" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19z" />
+    <glyph glyph-name="eject" unicode="&#xf052;" horiz-adv-x="1538" 
+d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
+    <glyph glyph-name="chevron_left" unicode="&#xf053;" horiz-adv-x="1280" 
+d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="chevron_right" unicode="&#xf054;" horiz-adv-x="1280" 
+d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="plus_sign" unicode="&#xf055;" 
+d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5
+t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="minus_sign" unicode="&#xf056;" 
+d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="remove_sign" unicode="&#xf057;" 
+d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19
+q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ok_sign" unicode="&#xf058;" 
+d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="question_sign" unicode="&#xf059;" 
+d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59
+q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="info_sign" unicode="&#xf05a;" 
+d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23
+t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="screenshot" unicode="&#xf05b;" 
+d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109
+q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143
+q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="remove_circle" unicode="&#xf05c;" 
+d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5
+t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ok_circle" unicode="&#xf05d;" 
+d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198
+t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ban_circle" unicode="&#xf05e;" 
+d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61
+t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
+    <glyph glyph-name="arrow_left" unicode="&#xf060;" 
+d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5
+t32.5 -90.5z" />
+    <glyph glyph-name="arrow_right" unicode="&#xf061;" 
+d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
+    <glyph glyph-name="arrow_up" unicode="&#xf062;" horiz-adv-x="1664" 
+d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651
+q37 -39 37 -91z" />
+    <glyph glyph-name="arrow_down" unicode="&#xf063;" horiz-adv-x="1664" 
+d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
+    <glyph glyph-name="share_alt" unicode="&#xf064;" horiz-adv-x="1792" 
+d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22
+t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
+    <glyph glyph-name="resize_full" unicode="&#xf065;" 
+d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332
+q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="resize_small" unicode="&#xf066;" 
+d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45
+t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
+    <glyph glyph-name="plus" unicode="&#xf067;" horiz-adv-x="1408" 
+d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="minus" unicode="&#xf068;" horiz-adv-x="1408" 
+d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="asterisk" unicode="&#xf069;" horiz-adv-x="1664" 
+d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154
+q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
+    <glyph glyph-name="exclamation_sign" unicode="&#xf06a;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192
+q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
+    <glyph glyph-name="gift" unicode="&#xf06b;" 
+d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320
+q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5
+t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="leaf" unicode="&#xf06c;" horiz-adv-x="1792" 
+d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268
+q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-43 0 -63.5 17.5t-45.5 59.5q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5
+t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
+    <glyph glyph-name="fire" unicode="&#xf06d;" horiz-adv-x="1408" 
+d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1
+q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
+    <glyph glyph-name="eye_open" unicode="&#xf06e;" horiz-adv-x="1792" 
+d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5
+t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
+    <glyph glyph-name="eye_close" unicode="&#xf070;" horiz-adv-x="1792" 
+d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9
+q-106 -189 -316 -567t-315 -566l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5
+q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z
+" />
+    <glyph glyph-name="warning_sign" unicode="&#xf071;" horiz-adv-x="1792" 
+d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185
+q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
+    <glyph glyph-name="plane" unicode="&#xf072;" horiz-adv-x="1408" 
+d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9
+q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
+    <glyph glyph-name="calendar" unicode="&#xf073;" horiz-adv-x="1664" 
+d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z
+M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64
+q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47
+h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="random" unicode="&#xf074;" horiz-adv-x="1792" 
+d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1
+t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5
+v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111
+t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+    <glyph glyph-name="comment" unicode="&#xf075;" horiz-adv-x="1792" 
+d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281
+q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="magnet" unicode="&#xf076;" 
+d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384
+q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="chevron_up" unicode="&#xf077;" horiz-adv-x="1792" 
+d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
+    <glyph glyph-name="chevron_down" unicode="&#xf078;" horiz-adv-x="1792" 
+d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
+    <glyph glyph-name="retweet" unicode="&#xf079;" horiz-adv-x="1920" 
+d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -10 7 -21
+zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z
+" />
+    <glyph glyph-name="shopping_cart" unicode="&#xf07a;" horiz-adv-x="1664" 
+d="M640 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1536 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1664 1088v-512q0 -24 -16.5 -42.5t-40.5 -21.5l-1044 -122q13 -60 13 -70q0 -16 -24 -64h920q26 0 45 -19t19 -45
+t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 11 8 31.5t16 36t21.5 40t15.5 29.5l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t19.5 -15.5t13 -24.5t8 -26t5.5 -29.5t4.5 -26h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="folder_close" unicode="&#xf07b;" horiz-adv-x="1664" 
+d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="folder_open" unicode="&#xf07c;" horiz-adv-x="1920" 
+d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5
+t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="resize_vertical" unicode="&#xf07d;" horiz-adv-x="768" 
+d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="resize_horizontal" unicode="&#xf07e;" horiz-adv-x="1792" 
+d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="bar_chart" unicode="&#xf080;" horiz-adv-x="2048" 
+d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
+    <glyph glyph-name="twitter_sign" unicode="&#xf081;" 
+d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4
+q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5
+t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="facebook_sign" unicode="&#xf082;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-188v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-532q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960z" />
+    <glyph glyph-name="camera_retro" unicode="&#xf083;" horiz-adv-x="1792" 
+d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5
+t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280
+q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="key" unicode="&#xf084;" horiz-adv-x="1792" 
+d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26
+l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5
+t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
+    <glyph glyph-name="cogs" unicode="&#xf085;" horiz-adv-x="1920" 
+d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -11 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5
+l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7
+l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -8 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31
+q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20
+t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68
+q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70
+q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
+    <glyph glyph-name="comments" unicode="&#xf086;" horiz-adv-x="1792" 
+d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224
+q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7
+q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
+    <glyph glyph-name="thumbs_up_alt" unicode="&#xf087;" 
+d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5
+t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769
+q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128
+q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
+    <glyph glyph-name="thumbs_down_alt" unicode="&#xf088;" 
+d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 31 18 69q0 37 -17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5
+t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z
+M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5
+h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -73 49 -163z" />
+    <glyph glyph-name="star_half" unicode="&#xf089;" horiz-adv-x="896" 
+d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
+    <glyph glyph-name="heart_empty" unicode="&#xf08a;" horiz-adv-x="1792" 
+d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559
+q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5
+q224 0 351 -124t127 -344z" />
+    <glyph glyph-name="signout" unicode="&#xf08b;" horiz-adv-x="1664" 
+d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704
+q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
+    <glyph glyph-name="linkedin_sign" unicode="&#xf08c;" 
+d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5
+q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="pushpin" unicode="&#xf08d;" horiz-adv-x="1152" 
+d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38
+t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
+    <glyph glyph-name="external_link" unicode="&#xf08e;" horiz-adv-x="1792" 
+d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320
+q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="signin" unicode="&#xf090;" 
+d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5
+q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="trophy" unicode="&#xf091;" horiz-adv-x="1664" 
+d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91
+t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96
+q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="github_sign" unicode="&#xf092;" 
+d="M519 336q4 6 -3 13q-9 7 -14 2q-4 -6 3 -13q9 -7 14 -2zM491 377q-5 7 -12 4q-6 -4 0 -12q7 -8 12 -5q6 4 0 13zM450 417q2 4 -5 8q-7 2 -8 -2q-3 -5 4 -8q8 -2 9 2zM471 394q2 1 1.5 4.5t-3.5 5.5q-6 7 -10 3t1 -11q6 -6 11 -2zM557 319q2 7 -9 11q-9 3 -13 -4
+q-2 -7 9 -11q9 -3 13 4zM599 316q0 8 -12 8q-10 0 -10 -8t11 -8t11 8zM638 323q-2 7 -13 5t-9 -9q2 -8 12 -6t10 10zM1280 640q0 212 -150 362t-362 150t-362 -150t-150 -362q0 -167 98 -300.5t252 -185.5q18 -3 26.5 5t8.5 20q0 52 -1 95q-6 -1 -15.5 -2.5t-35.5 -2t-48 4
+t-43.5 20t-29.5 41.5q-23 59 -57 74q-2 1 -4.5 3.5l-8 8t-7 9.5t4 7.5t19.5 3.5q6 0 15 -2t30 -15.5t33 -35.5q16 -28 37.5 -42t43.5 -14t38 3.5t30 9.5q7 47 33 69q-49 6 -86 18.5t-73 39t-55.5 76t-19.5 119.5q0 79 53 137q-24 62 5 136q19 6 54.5 -7.5t60.5 -29.5l26 -16
+q58 17 128 17t128 -17q11 7 28.5 18t55.5 26t57 9q29 -74 5 -136q53 -58 53 -137q0 -57 -14 -100.5t-35.5 -70t-53.5 -44.5t-62.5 -26t-68.5 -12q35 -31 35 -95q0 -40 -0.5 -89t-0.5 -51q0 -12 8.5 -20t26.5 -5q154 52 252 185.5t98 300.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="upload_alt" unicode="&#xf093;" horiz-adv-x="1664" 
+d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92
+t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
+    <glyph glyph-name="lemon" unicode="&#xf094;" 
+d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5
+q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44
+q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5
+q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -13 2 -25t3.5 -16.5t7.5 -20.5t8 -20q16 -40 25 -118.5t9 -136.5z" />
+    <glyph glyph-name="phone" unicode="&#xf095;" horiz-adv-x="1408" 
+d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -53 3.5t-57.5 12.5t-47 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-127 79 -264 216t-216 264q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47t-12.5 57.5t-3.5 53q0 92 51 186
+q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174q2 -1 19 -11.5t24 -14
+t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
+    <glyph glyph-name="check_empty" unicode="&#xf096;" horiz-adv-x="1408" 
+d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
+q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="bookmark_empty" unicode="&#xf097;" horiz-adv-x="1280" 
+d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289
+q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+    <glyph glyph-name="phone_sign" unicode="&#xf098;" 
+d="M1280 343q0 11 -2 16t-18 16.5t-40.5 25t-47.5 26.5t-45.5 25t-28.5 15q-5 3 -19 13t-25 15t-21 5q-15 0 -36.5 -20.5t-39.5 -45t-38.5 -45t-33.5 -20.5q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170 126.5t-127 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5
+t-3.5 16.5q0 13 20.5 33.5t45 38.5t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5
+t320.5 -216.5q6 -2 30 -11t33 -12.5t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z
+" />
+    <glyph glyph-name="twitter" unicode="&#xf099;" horiz-adv-x="1664" 
+d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41
+q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
+    <glyph glyph-name="facebook" unicode="&#xf09a;" horiz-adv-x="1024" 
+d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
+    <glyph glyph-name="github" unicode="&#xf09b;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -40 7t-13 30q0 3 0.5 76.5t0.5 134.5q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 119 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24
+q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-85 13.5q-45 -113 -8 -204q-79 -87 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-39 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5
+t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -88.5t0.5 -54.5q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103zM291 305q3 7 -7 12
+q-10 3 -13 -2q-3 -7 7 -12q9 -6 13 2zM322 271q7 5 -2 16q-10 9 -16 3q-7 -5 2 -16q10 -10 16 -3zM352 226q9 7 0 19q-8 13 -17 6q-9 -5 0 -18t17 -7zM394 184q8 8 -4 19q-12 12 -20 3q-9 -8 4 -19q12 -12 20 -3zM451 159q3 11 -13 16q-15 4 -19 -7t13 -15q15 -6 19 6z
+M514 154q0 13 -17 11q-16 0 -16 -11q0 -13 17 -11q16 0 16 11zM572 164q-2 11 -18 9q-16 -3 -14 -15t18 -8t14 14z" />
+    <glyph glyph-name="unlock" unicode="&#xf09c;" horiz-adv-x="1664" 
+d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5
+t316.5 -131.5t131.5 -316.5z" />
+    <glyph glyph-name="credit_card" unicode="&#xf09d;" horiz-adv-x="1920" 
+d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608
+q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
+    <glyph glyph-name="rss" unicode="&#xf09e;" horiz-adv-x="1408" 
+d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5
+t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294
+q187 -186 294 -425.5t120 -501.5z" />
+    <glyph glyph-name="hdd" unicode="&#xf0a0;" 
+d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5
+h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75
+l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
+    <glyph glyph-name="bullhorn" unicode="&#xf0a1;" horiz-adv-x="1792" 
+d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5
+t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
+    <glyph glyph-name="bell" unicode="&#xf0a2;" horiz-adv-x="1792" 
+d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z
+M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5
+t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+    <glyph glyph-name="certificate" unicode="&#xf0a3;" 
+d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70
+l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70
+l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
+    <glyph glyph-name="hand_right" unicode="&#xf0a4;" horiz-adv-x="1792" 
+d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106
+q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43
+q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5
+t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
+    <glyph glyph-name="hand_left" unicode="&#xf0a5;" horiz-adv-x="1792" 
+d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-8 9 -12 14q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576q-50 0 -89 -38.5
+t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45z
+M1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128q0 122 81.5 189t206.5 67
+q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="hand_up" unicode="&#xf0a6;" 
+d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576
+q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5
+t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76
+q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
+    <glyph glyph-name="hand_down" unicode="&#xf0a7;" 
+d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33
+t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580
+q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100
+q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
+    <glyph glyph-name="circle_arrow_left" unicode="&#xf0a8;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_right" unicode="&#xf0a9;" 
+d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_up" unicode="&#xf0aa;" 
+d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_down" unicode="&#xf0ab;" 
+d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="globe" unicode="&#xf0ac;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11
+q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 11t-9.5 10q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5
+q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5
+q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5
+t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-4 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3
+q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25
+q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5
+t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5
+t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10.5t17 -19.5q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21
+q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5
+q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3
+q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5
+t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q8 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5
+q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7
+q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
+    <glyph glyph-name="wrench" unicode="&#xf0ad;" horiz-adv-x="1664" 
+d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5
+t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
+    <glyph glyph-name="tasks" unicode="&#xf0ae;" horiz-adv-x="1792" 
+d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19
+t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="filter" unicode="&#xf0b0;" horiz-adv-x="1408" 
+d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
+    <glyph glyph-name="briefcase" unicode="&#xf0b1;" horiz-adv-x="1792" 
+d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68
+t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="fullscreen" unicode="&#xf0b2;" 
+d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144
+l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z
+" />
+    <glyph glyph-name="group" unicode="&#xf0c0;" horiz-adv-x="1920" 
+d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5
+t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75
+t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5
+t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
+    <glyph glyph-name="link" unicode="&#xf0c1;" horiz-adv-x="1664" 
+d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26
+l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15
+t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207
+q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
+    <glyph glyph-name="cloud" unicode="&#xf0c2;" horiz-adv-x="1920" 
+d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z
+" />
+    <glyph glyph-name="beaker" unicode="&#xf0c3;" horiz-adv-x="1664" 
+d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
+    <glyph glyph-name="cut" unicode="&#xf0c4;" horiz-adv-x="1792" 
+d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84
+q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148
+q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108
+q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6
+q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
+    <glyph glyph-name="copy" unicode="&#xf0c5;" horiz-adv-x="1792" 
+d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299
+h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
+    <glyph glyph-name="paper_clip" unicode="&#xf0c6;" horiz-adv-x="1408" 
+d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181
+l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235
+z" />
+    <glyph glyph-name="save" unicode="&#xf0c7;" 
+d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5
+h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
+    <glyph glyph-name="sign_blank" unicode="&#xf0c8;" 
+d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="reorder" unicode="&#xf0c9;" 
+d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45
+t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="ul" unicode="&#xf0ca;" horiz-adv-x="1792" 
+d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
+t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z
+M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="ol" unicode="&#xf0cb;" horiz-adv-x="1792" 
+d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362
+q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5
+t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 121.5t0.5 121.5v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216
+q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="strikethrough" unicode="&#xf0cc;" horiz-adv-x="1792" 
+d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 98 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6
+l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -56 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23
+l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
+    <glyph glyph-name="underline" unicode="&#xf0cd;" 
+d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47
+q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41
+q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472
+q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
+    <glyph glyph-name="table" unicode="&#xf0ce;" horiz-adv-x="1664" 
+d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23
+v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192
+q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192
+q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113
+z" />
+    <glyph glyph-name="magic" unicode="&#xf0d0;" horiz-adv-x="1664" 
+d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276
+l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
+    <glyph glyph-name="truck" unicode="&#xf0d1;" horiz-adv-x="1792" 
+d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5
+t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38
+t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="pinterest" unicode="&#xf0d2;" 
+d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134
+q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33
+q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="pinterest_sign" unicode="&#xf0d3;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5
+t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5
+t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
+    <glyph glyph-name="google_plus_sign" unicode="&#xf0d4;" 
+d="M917 631q0 26 -6 64h-362v-132h217q-3 -24 -16.5 -50t-37.5 -53t-66.5 -44.5t-96.5 -17.5q-99 0 -169 71t-70 171t70 171t169 71q92 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585
+h109v110h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="google_plus" unicode="&#xf0d5;" horiz-adv-x="2304" 
+d="M1437 623q0 -208 -87 -370.5t-248 -254t-369 -91.5q-149 0 -285 58t-234 156t-156 234t-58 285t58 285t156 234t234 156t285 58q286 0 491 -192l-199 -191q-117 113 -292 113q-123 0 -227.5 -62t-165.5 -168.5t-61 -232.5t61 -232.5t165.5 -168.5t227.5 -62
+q83 0 152.5 23t114.5 57.5t78.5 78.5t49 83t21.5 74h-416v252h692q12 -63 12 -122zM2304 745v-210h-209v-209h-210v209h-209v210h209v209h210v-209h209z" />
+    <glyph glyph-name="money" unicode="&#xf0d6;" horiz-adv-x="1920" 
+d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384
+v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="caret_down" unicode="&#xf0d7;" horiz-adv-x="1024" 
+d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="caret_up" unicode="&#xf0d8;" horiz-adv-x="1024" 
+d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="caret_left" unicode="&#xf0d9;" horiz-adv-x="640" 
+d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="caret_right" unicode="&#xf0da;" horiz-adv-x="640" 
+d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="columns" unicode="&#xf0db;" horiz-adv-x="1664" 
+d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="sort" unicode="&#xf0dc;" horiz-adv-x="1024" 
+d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="sort_down" unicode="&#xf0dd;" horiz-adv-x="1024" 
+d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="sort_up" unicode="&#xf0de;" horiz-adv-x="1024" 
+d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="envelope_alt" unicode="&#xf0e0;" horiz-adv-x="1792" 
+d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123
+q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
+    <glyph glyph-name="linkedin" unicode="&#xf0e1;" 
+d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329
+q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
+    <glyph glyph-name="undo" unicode="&#xf0e2;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
+t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
+    <glyph glyph-name="legal" unicode="&#xf0e3;" horiz-adv-x="1792" 
+d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5
+t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14
+q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28
+q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
+    <glyph glyph-name="dashboard" unicode="&#xf0e4;" horiz-adv-x="1792" 
+d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5
+t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5
+t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29
+q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="comment_alt" unicode="&#xf0e5;" horiz-adv-x="1792" 
+d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640
+q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5
+t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="comments_alt" unicode="&#xf0e6;" horiz-adv-x="1792" 
+d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257
+t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5
+t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129
+q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
+    <glyph glyph-name="bolt" unicode="&#xf0e7;" horiz-adv-x="896" 
+d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
+    <glyph glyph-name="sitemap" unicode="&#xf0e8;" horiz-adv-x="1792" 
+d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320
+q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68
+z" />
+    <glyph glyph-name="umbrella" unicode="&#xf0e9;" horiz-adv-x="1664" 
+d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97
+q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69
+q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
+    <glyph glyph-name="paste" unicode="&#xf0ea;" horiz-adv-x="1792" 
+d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28
+h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
+    <glyph glyph-name="light_bulb" unicode="&#xf0eb;" horiz-adv-x="1024" 
+d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134
+q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47
+q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5
+t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
+    <glyph glyph-name="exchange" unicode="&#xf0ec;" horiz-adv-x="1792" 
+d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9
+q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+    <glyph glyph-name="cloud_download" unicode="&#xf0ed;" horiz-adv-x="1920" 
+d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
+q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+    <glyph glyph-name="cloud_upload" unicode="&#xf0ee;" horiz-adv-x="1920" 
+d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
+q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+    <glyph glyph-name="user_md" unicode="&#xf0f0;" horiz-adv-x="1408" 
+d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56
+t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68
+t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
+t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="stethoscope" unicode="&#xf0f1;" horiz-adv-x="1408" 
+d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48
+t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252
+t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="suitcase" unicode="&#xf0f2;" horiz-adv-x="1792" 
+d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66
+t66 -158z" />
+    <glyph glyph-name="bell_alt" unicode="&#xf0f3;" horiz-adv-x="1792" 
+d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5
+t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+    <glyph glyph-name="coffee" unicode="&#xf0f4;" horiz-adv-x="1920" 
+d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45
+t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="food" unicode="&#xf0f5;" horiz-adv-x="1408" 
+d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45
+t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="file_text_alt" unicode="&#xf0f6;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704
+q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
+    <glyph glyph-name="building" unicode="&#xf0f7;" horiz-adv-x="1408" 
+d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="hospital" unicode="&#xf0f8;" horiz-adv-x="1408" 
+d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5
+t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320
+v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="ambulance" unicode="&#xf0f9;" horiz-adv-x="1920" 
+d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152
+q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="medkit" unicode="&#xf0fa;" horiz-adv-x="1792" 
+d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32
+q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="fighter_jet" unicode="&#xf0fb;" horiz-adv-x="1920" 
+d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96
+q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q128 -28 200 -52t80 -34z" />
+    <glyph glyph-name="beer" unicode="&#xf0fc;" horiz-adv-x="1664" 
+d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
+    <glyph glyph-name="h_sign" unicode="&#xf0fd;" 
+d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="f0fe" unicode="&#xf0fe;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="double_angle_left" unicode="&#xf100;" horiz-adv-x="1024" 
+d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
+t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_right" unicode="&#xf101;" horiz-adv-x="1024" 
+d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23
+l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_up" unicode="&#xf102;" horiz-adv-x="1152" 
+d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393
+q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_down" unicode="&#xf103;" horiz-adv-x="1152" 
+d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
+t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="angle_left" unicode="&#xf104;" horiz-adv-x="640" 
+d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="angle_right" unicode="&#xf105;" horiz-adv-x="640" 
+d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="angle_up" unicode="&#xf106;" horiz-adv-x="1152" 
+d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="angle_down" unicode="&#xf107;" horiz-adv-x="1152" 
+d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="desktop" unicode="&#xf108;" horiz-adv-x="1920" 
+d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19
+t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="laptop" unicode="&#xf109;" horiz-adv-x="1920" 
+d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z
+M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
+    <glyph glyph-name="tablet" unicode="&#xf10a;" horiz-adv-x="1152" 
+d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832
+q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="mobile_phone" unicode="&#xf10b;" horiz-adv-x="768" 
+d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136
+q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="circle_blank" unicode="&#xf10c;" 
+d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103
+t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="quote_left" unicode="&#xf10d;" horiz-adv-x="1664" 
+d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z
+M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
+    <glyph glyph-name="quote_right" unicode="&#xf10e;" horiz-adv-x="1664" 
+d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216
+v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
+    <glyph glyph-name="spinner" unicode="&#xf110;" horiz-adv-x="1792" 
+d="M526 142q0 -53 -37.5 -90.5t-90.5 -37.5q-52 0 -90 38t-38 90q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 -64q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -53 -37.5 -90.5t-90.5 -37.5
+t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1522 142q0 -52 -38 -90t-90 -38q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM558 1138q0 -66 -47 -113t-113 -47t-113 47t-47 113t47 113t113 47t113 -47t47 -113z
+M1728 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1088 1344q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1618 1138q0 -93 -66 -158.5t-158 -65.5q-93 0 -158.5 65.5t-65.5 158.5
+q0 92 65.5 158t158.5 66q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="circle" unicode="&#xf111;" 
+d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="reply" unicode="&#xf112;" horiz-adv-x="1792" 
+d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19
+l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
+    <glyph glyph-name="github_alt" unicode="&#xf113;" horiz-adv-x="1664" 
+d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320
+q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86
+t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218
+q0 -87 -27 -168q136 -160 136 -398z" />
+    <glyph glyph-name="folder_close_alt" unicode="&#xf114;" horiz-adv-x="1664" 
+d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320
+q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="folder_open_alt" unicode="&#xf115;" horiz-adv-x="1920" 
+d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68
+v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z
+" />
+    <glyph glyph-name="expand_alt" unicode="&#xf116;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="collapse_alt" unicode="&#xf117;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="smile" unicode="&#xf118;" 
+d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5
+t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="frown" unicode="&#xf119;" 
+d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204
+t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="meh" unicode="&#xf11a;" 
+d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="gamepad" unicode="&#xf11b;" horiz-adv-x="1920" 
+d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
+t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150
+t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
+    <glyph glyph-name="keyboard" unicode="&#xf11c;" horiz-adv-x="1920" 
+d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16
+h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16
+h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96
+q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896
+h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="flag_alt" unicode="&#xf11d;" horiz-adv-x="1792" 
+d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9
+h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102
+q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+    <glyph glyph-name="flag_checkered" unicode="&#xf11e;" horiz-adv-x="1792" 
+d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2
+q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266
+q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8
+q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+    <glyph glyph-name="terminal" unicode="&#xf120;" horiz-adv-x="1664" 
+d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9
+t9 -23z" />
+    <glyph glyph-name="code" unicode="&#xf121;" horiz-adv-x="1920" 
+d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5
+l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
+    <glyph glyph-name="reply_all" unicode="&#xf122;" horiz-adv-x="1792" 
+d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1
+q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
+    <glyph glyph-name="star_half_empty" unicode="&#xf123;" horiz-adv-x="1664" 
+d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5
+l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
+    <glyph glyph-name="location_arrow" unicode="&#xf124;" horiz-adv-x="1408" 
+d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
+    <glyph glyph-name="crop" unicode="&#xf125;" horiz-adv-x="1664" 
+d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23
+v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="code_fork" unicode="&#xf126;" horiz-adv-x="1024" 
+d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5
+q-2 -287 -226 -414q-67 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497
+q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="unlink" unicode="&#xf127;" horiz-adv-x="1664" 
+d="M439 265l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320
+q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18
+l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9
+t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+    <glyph glyph-name="question" unicode="&#xf128;" horiz-adv-x="1024" 
+d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5
+t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
+    <glyph glyph-name="_279" unicode="&#xf129;" horiz-adv-x="640" 
+d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192
+q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="exclamation" unicode="&#xf12a;" horiz-adv-x="640" 
+d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
+    <glyph glyph-name="superscript" unicode="&#xf12b;" 
+d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
+M1534 846v-206h-514l-3 27q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5
+t-65.5 -51.5t-30.5 -63h232v80h126z" />
+    <glyph glyph-name="subscript" unicode="&#xf12c;" 
+d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
+M1536 -50v-206h-514l-4 27q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73
+h232v80h126z" />
+    <glyph glyph-name="_283" unicode="&#xf12d;" horiz-adv-x="1920" 
+d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
+    <glyph glyph-name="puzzle_piece" unicode="&#xf12e;" horiz-adv-x="1664" 
+d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5
+t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89
+q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117
+q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
+    <glyph glyph-name="microphone" unicode="&#xf130;" horiz-adv-x="1152" 
+d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5
+t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
+    <glyph glyph-name="microphone_off" unicode="&#xf131;" horiz-adv-x="1408" 
+d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128
+q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23
+t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
+    <glyph glyph-name="shield" unicode="&#xf132;" horiz-adv-x="1280" 
+d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150
+t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="calendar_empty" unicode="&#xf133;" horiz-adv-x="1664" 
+d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
+q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="fire_extinguisher" unicode="&#xf134;" horiz-adv-x="1408" 
+d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800
+q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113
+q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
+    <glyph glyph-name="rocket" unicode="&#xf135;" horiz-adv-x="1664" 
+d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1
+q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
+    <glyph glyph-name="maxcdn" unicode="&#xf136;" horiz-adv-x="1792" 
+d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
+    <glyph glyph-name="chevron_sign_left" unicode="&#xf137;" 
+d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_right" unicode="&#xf138;" 
+d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_up" unicode="&#xf139;" 
+d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_down" unicode="&#xf13a;" 
+d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="html5" unicode="&#xf13b;" horiz-adv-x="1408" 
+d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
+    <glyph glyph-name="css3" unicode="&#xf13c;" horiz-adv-x="1792" 
+d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
+    <glyph glyph-name="anchor" unicode="&#xf13d;" horiz-adv-x="1792" 
+d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352
+q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19
+t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="unlock_alt" unicode="&#xf13e;" horiz-adv-x="1152" 
+d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181
+v-320h736z" />
+    <glyph glyph-name="bullseye" unicode="&#xf140;" 
+d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150
+t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ellipsis_horizontal" unicode="&#xf141;" horiz-adv-x="1408" 
+d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="ellipsis_vertical" unicode="&#xf142;" horiz-adv-x="384" 
+d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="_303" unicode="&#xf143;" 
+d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 233 -176.5 396.5t-396.5 176.5q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128
+q13 0 23 10t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="play_sign" unicode="&#xf144;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56
+q16 -8 32 -8q17 0 32 9z" />
+    <glyph glyph-name="ticket" unicode="&#xf145;" horiz-adv-x="1792" 
+d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136
+t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
+    <glyph glyph-name="minus_sign_alt" unicode="&#xf146;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="check_minus" unicode="&#xf147;" horiz-adv-x="1408" 
+d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5
+t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="level_up" unicode="&#xf148;" horiz-adv-x="1024" 
+d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
+    <glyph glyph-name="level_down" unicode="&#xf149;" horiz-adv-x="1024" 
+d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
+    <glyph glyph-name="check_sign" unicode="&#xf14a;" 
+d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5
+t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="edit_sign" unicode="&#xf14b;" 
+d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_312" unicode="&#xf14c;" 
+d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960
+q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="share_sign" unicode="&#xf14d;" 
+d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q11 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5
+t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="compass" unicode="&#xf14e;" 
+d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="collapse" unicode="&#xf150;" 
+d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="collapse_top" unicode="&#xf151;" 
+d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_317" unicode="&#xf152;" 
+d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5
+t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="eur" unicode="&#xf153;" horiz-adv-x="1024" 
+d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9
+t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26
+l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
+    <glyph glyph-name="gbp" unicode="&#xf154;" horiz-adv-x="1024" 
+d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7
+q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
+    <glyph glyph-name="usd" unicode="&#xf155;" horiz-adv-x="1024" 
+d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43
+t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5
+t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50
+t53 -63.5t31.5 -76.5t13 -94z" />
+    <glyph glyph-name="inr" unicode="&#xf156;" horiz-adv-x="898" 
+d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102
+q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="jpy" unicode="&#xf157;" horiz-adv-x="1027" 
+d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61
+l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
+    <glyph glyph-name="rub" unicode="&#xf158;" horiz-adv-x="1280" 
+d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128
+q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
+    <glyph glyph-name="krw" unicode="&#xf159;" horiz-adv-x="1792" 
+d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23
+t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28
+q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="btc" unicode="&#xf15a;" horiz-adv-x="1280" 
+d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164
+l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30
+t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
+    <glyph glyph-name="file" unicode="&#xf15b;" 
+d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
+    <glyph glyph-name="file_text" unicode="&#xf15c;" 
+d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704
+q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
+    <glyph glyph-name="sort_by_alphabet" unicode="&#xf15d;" horiz-adv-x="1664" 
+d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23
+v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162
+l230 -662h70z" />
+    <glyph glyph-name="_329" unicode="&#xf15e;" horiz-adv-x="1664" 
+d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150
+v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248
+v119h121z" />
+    <glyph glyph-name="sort_by_attributes" unicode="&#xf160;" horiz-adv-x="1792" 
+d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832
+q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="sort_by_attributes_alt" unicode="&#xf161;" horiz-adv-x="1792" 
+d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192
+q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="sort_by_order" unicode="&#xf162;" 
+d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23
+zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5
+t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
+    <glyph glyph-name="sort_by_order_alt" unicode="&#xf163;" 
+d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9
+t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13
+q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
+    <glyph glyph-name="_334" unicode="&#xf164;" horiz-adv-x="1664" 
+d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76
+q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5
+t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
+    <glyph glyph-name="_335" unicode="&#xf165;" horiz-adv-x="1664" 
+d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135
+t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121
+t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
+    <glyph glyph-name="youtube_sign" unicode="&#xf166;" 
+d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 17 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15
+q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38
+q21 -29 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5
+q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78q7 -23 23 -69l24 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38
+q-51 0 -78 -38q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5
+h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="youtube" unicode="&#xf167;" 
+d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73
+q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51
+q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99
+q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-38 -51 -106 -51q-67 0 -105 51
+q-28 38 -28 118v175q0 80 28 117q38 51 105 51q68 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
+    <glyph glyph-name="xing" unicode="&#xf168;" horiz-adv-x="1408" 
+d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942
+q25 45 64 45h241q22 0 31 -15z" />
+    <glyph glyph-name="xing_sign" unicode="&#xf169;" 
+d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1
+l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="youtube_play" unicode="&#xf16a;" horiz-adv-x="1792" 
+d="M711 408l484 250l-484 253v-503zM896 1270q168 0 324.5 -4.5t229.5 -9.5l73 -4q1 0 17 -1.5t23 -3t23.5 -4.5t28.5 -8t28 -13t31 -19.5t29 -26.5q6 -6 15.5 -18.5t29 -58.5t26.5 -101q8 -64 12.5 -136.5t5.5 -113.5v-40v-136q1 -145 -18 -290q-7 -55 -25 -99.5t-32 -61.5
+l-14 -17q-14 -15 -29 -26.5t-31 -19t-28 -12.5t-28.5 -8t-24 -4.5t-23 -3t-16.5 -1.5q-251 -19 -627 -19q-207 2 -359.5 6.5t-200.5 7.5l-49 4l-36 4q-36 5 -54.5 10t-51 21t-56.5 41q-6 6 -15.5 18.5t-29 58.5t-26.5 101q-8 64 -12.5 136.5t-5.5 113.5v40v136
+q-1 145 18 290q7 55 25 99.5t32 61.5l14 17q14 15 29 26.5t31 19.5t28 13t28.5 8t23.5 4.5t23 3t17 1.5q251 18 627 18z" />
+    <glyph glyph-name="dropbox" unicode="&#xf16b;" horiz-adv-x="1792" 
+d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
+    <glyph glyph-name="stackexchange" unicode="&#xf16c;" 
+d="M1289 -96h-1118v480h-160v-640h1438v640h-160v-480zM347 428l33 157l783 -165l-33 -156zM450 802l67 146l725 -339l-67 -145zM651 1158l102 123l614 -513l-102 -123zM1048 1536l477 -641l-128 -96l-477 641zM330 65v159h800v-159h-800z" />
+    <glyph glyph-name="instagram" unicode="&#xf16d;" 
+d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1162 640q0 -164 -115 -279t-279 -115t-279 115t-115 279t115 279t279 115t279 -115t115 -279zM1270 1050q0 -38 -27 -65t-65 -27t-65 27t-27 65t27 65t65 27t65 -27t27 -65zM768 1270
+q-7 0 -76.5 0.5t-105.5 0t-96.5 -3t-103 -10t-71.5 -18.5q-50 -20 -88 -58t-58 -88q-11 -29 -18.5 -71.5t-10 -103t-3 -96.5t0 -105.5t0.5 -76.5t-0.5 -76.5t0 -105.5t3 -96.5t10 -103t18.5 -71.5q20 -50 58 -88t88 -58q29 -11 71.5 -18.5t103 -10t96.5 -3t105.5 0t76.5 0.5
+t76.5 -0.5t105.5 0t96.5 3t103 10t71.5 18.5q50 20 88 58t58 88q11 29 18.5 71.5t10 103t3 96.5t0 105.5t-0.5 76.5t0.5 76.5t0 105.5t-3 96.5t-10 103t-18.5 71.5q-20 50 -58 88t-88 58q-29 11 -71.5 18.5t-103 10t-96.5 3t-105.5 0t-76.5 -0.5zM1536 640q0 -229 -5 -317
+q-10 -208 -124 -322t-322 -124q-88 -5 -317 -5t-317 5q-208 10 -322 124t-124 322q-5 88 -5 317t5 317q10 208 124 322t322 124q88 5 317 5t317 -5q208 -10 322 -124t124 -322q5 -88 5 -317z" />
+    <glyph glyph-name="flickr" unicode="&#xf16e;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150
+t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
+    <glyph glyph-name="adn" unicode="&#xf170;" 
+d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="f171" unicode="&#xf171;" horiz-adv-x="1408" 
+d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22
+t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18
+t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5
+t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
+    <glyph glyph-name="bitbucket_sign" unicode="&#xf172;" 
+d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5
+t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z
+M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="tumblr" unicode="&#xf173;" horiz-adv-x="1024" 
+d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14
+q78 2 134 29z" />
+    <glyph glyph-name="tumblr_sign" unicode="&#xf174;" 
+d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z
+M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="long_arrow_down" unicode="&#xf175;" horiz-adv-x="768" 
+d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
+    <glyph glyph-name="long_arrow_up" unicode="&#xf176;" horiz-adv-x="768" 
+d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
+    <glyph glyph-name="long_arrow_left" unicode="&#xf177;" horiz-adv-x="1792" 
+d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="long_arrow_right" unicode="&#xf178;" horiz-adv-x="1792" 
+d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
+    <glyph glyph-name="apple" unicode="&#xf179;" horiz-adv-x="1408" 
+d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q113 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65
+q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
+    <glyph glyph-name="windows" unicode="&#xf17a;" horiz-adv-x="1664" 
+d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
+    <glyph glyph-name="android" unicode="&#xf17b;" horiz-adv-x="1408" 
+d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30
+t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5
+h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
+    <glyph glyph-name="linux" unicode="&#xf17c;" 
+d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-10 -11 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z
+M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7
+q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15
+q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5
+t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19
+q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63
+q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18q-2 -1 -4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92
+q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152
+q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-6 0 -8 -2t0 -4
+t5 -3q14 -4 18 -31q0 -3 8 2q2 2 2 3zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5
+t-30 -18.5t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43
+q-19 4 -51 9.5t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49
+t-14 -48q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54
+q110 143 124 195q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5
+t-40.5 -33.5t-61 -14q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5
+t15.5 47.5q1 -31 8 -56.5t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
+    <glyph glyph-name="dribble" unicode="&#xf17d;" 
+d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81
+t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19
+q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -5 6.5 -17t7.5 -17q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6
+t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="skype" unicode="&#xf17e;" 
+d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5
+t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5
+q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80
+q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
+    <glyph glyph-name="foursquare" unicode="&#xf180;" horiz-adv-x="1280" 
+d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z
+M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324
+l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
+    <glyph glyph-name="trello" unicode="&#xf181;" 
+d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408
+q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="female" unicode="&#xf182;" horiz-adv-x="1280" 
+d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43
+q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="male" unicode="&#xf183;" horiz-adv-x="1024" 
+d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z
+M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="gittip" unicode="&#xf184;" 
+d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="sun" unicode="&#xf185;" horiz-adv-x="1792" 
+d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4
+l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94
+q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
+    <glyph glyph-name="_366" unicode="&#xf186;" 
+d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61
+t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
+    <glyph glyph-name="archive" unicode="&#xf187;" horiz-adv-x="1792" 
+d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536
+q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="bug" unicode="&#xf188;" horiz-adv-x="1664" 
+d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207
+q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19
+t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
+    <glyph glyph-name="vk" unicode="&#xf189;" horiz-adv-x="1920" 
+d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-40 -51 -55 -72t-30.5 -49.5t-12 -42t13 -34.5t32.5 -43t57 -53q4 -2 5 -4q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58
+t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6
+q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q16 19 38 30q53 26 239 24
+q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2
+q39 5 64 -2.5t31 -16.5z" />
+    <glyph glyph-name="weibo" unicode="&#xf18a;" horiz-adv-x="1792" 
+d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12
+q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422
+q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178
+q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z
+M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
+    <glyph glyph-name="renren" unicode="&#xf18b;" 
+d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495
+q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
+    <glyph glyph-name="_372" unicode="&#xf18c;" horiz-adv-x="1408" 
+d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5
+t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56
+t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -4 1 -50t-1 -72q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5
+t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
+    <glyph glyph-name="stack_exchange" unicode="&#xf18d;" horiz-adv-x="1280" 
+d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z
+" />
+    <glyph glyph-name="_374" unicode="&#xf18e;" 
+d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
+t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="arrow_circle_alt_left" unicode="&#xf190;" 
+d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
+t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_376" unicode="&#xf191;" 
+d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z
+M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="dot_circle_alt" unicode="&#xf192;" 
+d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5
+t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_378" unicode="&#xf193;" horiz-adv-x="1664" 
+d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128
+q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 17 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
+    <glyph glyph-name="vimeo_square" unicode="&#xf194;" 
+d="M1292 898q10 216 -161 222q-231 8 -312 -261q44 19 82 19q85 0 74 -96q-4 -57 -74 -167t-105 -110q-43 0 -82 169q-13 54 -45 255q-30 189 -160 177q-59 -7 -164 -100l-81 -72l-81 -72l52 -67q76 52 87 52q57 0 107 -179q15 -55 45 -164.5t45 -164.5q68 -179 164 -179
+q157 0 383 294q220 283 226 444zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_380" unicode="&#xf195;" horiz-adv-x="1152" 
+d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160
+q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="plus_square_o" unicode="&#xf196;" horiz-adv-x="1408" 
+d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832
+q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_382" unicode="&#xf197;" horiz-adv-x="2176" 
+d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40
+t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29
+q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
+    <glyph glyph-name="_383" unicode="&#xf198;" horiz-adv-x="1664" 
+d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9
+q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102
+t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
+    <glyph glyph-name="_384" unicode="&#xf199;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69
+q-47 32 -142 92.5t-142 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13
+t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
+    <glyph glyph-name="_385" unicode="&#xf19a;" horiz-adv-x="1792" 
+d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5
+t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21
+t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286
+t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273
+t273 -182.5t331.5 -68z" />
+    <glyph glyph-name="_386" unicode="&#xf19b;" horiz-adv-x="1792" 
+d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
+    <glyph glyph-name="_387" unicode="&#xf19c;" horiz-adv-x="2048" 
+d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64
+q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
+    <glyph glyph-name="_388" unicode="&#xf19d;" horiz-adv-x="2304" 
+d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433
+q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
+    <glyph glyph-name="_389" unicode="&#xf19e;" 
+d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q44 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0
+q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
+    <glyph glyph-name="uniF1A0" unicode="&#xf1a0;" 
+d="M768 750h725q12 -67 12 -128q0 -217 -91 -387.5t-259.5 -266.5t-386.5 -96q-157 0 -299 60.5t-245 163.5t-163.5 245t-60.5 299t60.5 299t163.5 245t245 163.5t299 60.5q300 0 515 -201l-209 -201q-123 119 -306 119q-129 0 -238.5 -65t-173.5 -176.5t-64 -243.5
+t64 -243.5t173.5 -176.5t238.5 -65q87 0 160 24t120 60t82 82t51.5 87t22.5 78h-436v264z" />
+    <glyph glyph-name="f1a1" unicode="&#xf1a1;" horiz-adv-x="1792" 
+d="M1095 369q16 -16 0 -31q-62 -62 -199 -62t-199 62q-16 15 0 31q6 6 15 6t15 -6q48 -49 169 -49q120 0 169 49q6 6 15 6t15 -6zM788 550q0 -37 -26 -63t-63 -26t-63.5 26t-26.5 63q0 38 26.5 64t63.5 26t63 -26.5t26 -63.5zM1183 550q0 -37 -26.5 -63t-63.5 -26t-63 26
+t-26 63t26 63.5t63 26.5t63.5 -26t26.5 -64zM1434 670q0 49 -35 84t-85 35t-86 -36q-130 90 -311 96l63 283l200 -45q0 -37 26 -63t63 -26t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5q-54 0 -80 -50l-221 49q-19 5 -25 -16l-69 -312q-180 -7 -309 -97q-35 37 -87 37
+q-50 0 -85 -35t-35 -84q0 -35 18.5 -64t49.5 -44q-6 -27 -6 -56q0 -142 140 -243t337 -101q198 0 338 101t140 243q0 32 -7 57q30 15 48 43.5t18 63.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191
+t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_392" unicode="&#xf1a2;" 
+d="M939 407q13 -13 0 -26q-53 -53 -171 -53t-171 53q-13 13 0 26q5 6 13 6t13 -6q42 -42 145 -42t145 42q5 6 13 6t13 -6zM676 563q0 -31 -23 -54t-54 -23t-54 23t-23 54q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1014 563q0 -31 -23 -54t-54 -23t-54 23t-23 54
+q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1229 666q0 42 -30 72t-73 30q-42 0 -73 -31q-113 78 -267 82l54 243l171 -39q1 -32 23.5 -54t53.5 -22q32 0 54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5q-48 0 -69 -43l-189 42q-17 5 -21 -13l-60 -268q-154 -6 -265 -83
+q-30 32 -74 32q-43 0 -73 -30t-30 -72q0 -30 16 -55t42 -38q-5 -25 -5 -48q0 -122 120 -208.5t289 -86.5q170 0 290 86.5t120 208.5q0 25 -6 49q25 13 40.5 37.5t15.5 54.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_393" unicode="&#xf1a3;" 
+d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150
+v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103
+t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="f1a4" unicode="&#xf1a4;" horiz-adv-x="1920" 
+d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328
+v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
+    <glyph glyph-name="_395" unicode="&#xf1a5;" 
+d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="_396" unicode="&#xf1a6;" horiz-adv-x="2048" 
+d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123
+v-369h123z" />
+    <glyph glyph-name="_397" unicode="&#xf1a7;" 
+d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101
+v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_398" unicode="&#xf1a8;" horiz-adv-x="2038" 
+d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14
+q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24
+q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33
+q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5
+t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43
+q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5
+t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13
+t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
+    <glyph glyph-name="_399" unicode="&#xf1a9;" 
+d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10
+q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14
+q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14
+t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44
+q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
+    <glyph glyph-name="_400" unicode="&#xf1aa;" 
+d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z
+M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5
+t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5
+q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126
+t135.5 51q85 0 145 -60.5t60 -145.5z" />
+    <glyph glyph-name="f1ab" unicode="&#xf1ab;" 
+d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5
+q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28
+q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z
+M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11
+q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q107 36 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5
+q20 0 20 -21v-418z" />
+    <glyph glyph-name="_402" unicode="&#xf1ac;" horiz-adv-x="1792" 
+d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48
+l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23
+t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128
+q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128
+q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
+    <glyph glyph-name="_403" unicode="&#xf1ad;" 
+d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9
+t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64
+q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
+q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9
+t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64
+q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
+q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9
+t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
+    <glyph glyph-name="_404" unicode="&#xf1ae;" horiz-adv-x="1280" 
+d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68q29 28 68.5 28t67.5 -28l228 -228h368l228 228q28 28 68 28t68 -28q28 -29 28 -68.5t-28 -67.5zM864 1152
+q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="uniF1B1" unicode="&#xf1b0;" horiz-adv-x="1664" 
+d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5
+q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819
+q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5
+t100.5 134t141.5 55.5z" />
+    <glyph glyph-name="_406" unicode="&#xf1b1;" horiz-adv-x="768" 
+d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
+    <glyph glyph-name="_407" unicode="&#xf1b2;" horiz-adv-x="1792" 
+d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z
+" />
+    <glyph glyph-name="_408" unicode="&#xf1b3;" horiz-adv-x="2304" 
+d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67
+t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-4 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70
+v-400l434 -186q36 -16 57 -48t21 -70z" />
+    <glyph glyph-name="_409" unicode="&#xf1b4;" horiz-adv-x="2048" 
+d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658
+q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204
+q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
+    <glyph glyph-name="_410" unicode="&#xf1b5;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5
+t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217
+t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
+    <glyph glyph-name="_411" unicode="&#xf1b6;" horiz-adv-x="1792" 
+d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5
+q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89
+q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
+    <glyph glyph-name="_412" unicode="&#xf1b7;" 
+d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5
+q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5
+q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z
+" />
+    <glyph glyph-name="_413" unicode="&#xf1b8;" horiz-adv-x="1792" 
+d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188
+l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5
+t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1
+q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
+    <glyph glyph-name="_414" unicode="&#xf1b9;" horiz-adv-x="2048" 
+d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384
+q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5
+l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="_415" unicode="&#xf1ba;" horiz-adv-x="2048" 
+d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5
+t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z
+M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
+    <glyph glyph-name="_416" unicode="&#xf1bb;" 
+d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384
+q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
+    <glyph glyph-name="_417" unicode="&#xf1bc;" 
+d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64
+q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37
+q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_418" unicode="&#xf1bd;" horiz-adv-x="1024" 
+d="M1024 1233l-303 -582l24 -31h279v-415h-507l-44 -30l-142 -273l-30 -30h-301v303l303 583l-24 30h-279v415h507l44 30l142 273l30 30h301v-303z" />
+    <glyph glyph-name="_419" unicode="&#xf1be;" horiz-adv-x="2304" 
+d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11
+q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245
+q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785
+l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242
+q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236
+q0 -11 -8 -19t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786
+q-13 2 -22 11t-9 22v899q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
+    <glyph glyph-name="uniF1C0" unicode="&#xf1c0;" 
+d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127
+t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5
+t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
+    <glyph glyph-name="uniF1C1" unicode="&#xf1c1;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197
+q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8
+q-1 1 -1 2q-1 2 -1 3q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
+    <glyph glyph-name="_422" unicode="&#xf1c2;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4q0 3 -0.5 6.5t-1.5 8t-1 6.5q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5
+t-3.5 -21.5l-4 -21h-4l-2 21q-2 26 -7 46l-99 438h90v107h-300z" />
+    <glyph glyph-name="_423" unicode="&#xf1c3;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107
+h-290v-107h68l189 -272l-194 -283h-68z" />
+    <glyph glyph-name="_424" unicode="&#xf1c4;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
+    <glyph glyph-name="_425" unicode="&#xf1c5;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
+    <glyph glyph-name="_426" unicode="&#xf1c6;" 
+d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400
+v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79
+q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
+    <glyph glyph-name="_427" unicode="&#xf1c7;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5
+q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
+    <glyph glyph-name="_428" unicode="&#xf1c8;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
+    <glyph glyph-name="_429" unicode="&#xf1c9;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243
+l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
+    <glyph glyph-name="_430" unicode="&#xf1ca;" 
+d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406
+q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
+    <glyph glyph-name="_431" unicode="&#xf1cb;" horiz-adv-x="1792" 
+d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546
+q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
+    <glyph glyph-name="_432" unicode="&#xf1cc;" horiz-adv-x="2048" 
+d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94
+q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55
+t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97l93 -108q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5t-85 -189.5z" />
+    <glyph glyph-name="_433" unicode="&#xf1cd;" horiz-adv-x="1792" 
+d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194
+q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5
+t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
+    <glyph glyph-name="_434" unicode="&#xf1ce;" horiz-adv-x="1792" 
+d="M1760 640q0 -176 -68.5 -336t-184 -275.5t-275.5 -184t-336 -68.5t-336 68.5t-275.5 184t-184 275.5t-68.5 336q0 213 97 398.5t265 305.5t374 151v-228q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5
+t136.5 204t51 248.5q0 230 -145.5 406t-366.5 221v228q206 -31 374 -151t265 -305.5t97 -398.5z" />
+    <glyph glyph-name="uniF1D0" unicode="&#xf1d0;" horiz-adv-x="1792" 
+d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41
+t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170
+t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136
+q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
+    <glyph glyph-name="uniF1D1" unicode="&#xf1d1;" horiz-adv-x="1792" 
+d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251
+l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162
+q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33
+q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5
+t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
+t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF1D2" unicode="&#xf1d2;" 
+d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85
+q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392
+q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072
+q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_438" unicode="&#xf1d3;" horiz-adv-x="1792" 
+d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58
+q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47
+q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171
+v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
+    <glyph glyph-name="_439" unicode="&#xf1d4;" 
+d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF1D5" unicode="&#xf1d5;" horiz-adv-x="1280" 
+d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5
+t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153
+t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
+    <glyph glyph-name="uniF1D6" unicode="&#xf1d6;" horiz-adv-x="1792" 
+d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5
+q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20
+t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5
+t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
+    <glyph glyph-name="uniF1D7" unicode="&#xf1d7;" horiz-adv-x="2048" 
+d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25
+q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5
+q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109
+q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
+    <glyph glyph-name="_443" unicode="&#xf1d8;" horiz-adv-x="1792" 
+d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
+    <glyph glyph-name="_444" unicode="&#xf1d9;" horiz-adv-x="1792" 
+d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137
+l863 639l-478 -797z" />
+    <glyph glyph-name="_445" unicode="&#xf1da;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
+t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23
+t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_446" unicode="&#xf1db;" 
+d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_447" unicode="&#xf1dc;" horiz-adv-x="1792" 
+d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15
+t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2
+t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160
+q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5
+q0 -26 -12 -48t-36 -22z" />
+    <glyph glyph-name="_448" unicode="&#xf1dd;" horiz-adv-x="1280" 
+d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179
+q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
+    <glyph glyph-name="_449" unicode="&#xf1de;" 
+d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256
+q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
+    <glyph glyph-name="uniF1E0" unicode="&#xf1e0;" 
+d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5
+t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
+    <glyph glyph-name="_451" unicode="&#xf1e1;" 
+d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5
+t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_452" unicode="&#xf1e2;" horiz-adv-x="1792" 
+d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5
+t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91
+q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9
+t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+    <glyph glyph-name="_453" unicode="&#xf1e3;" horiz-adv-x="1792" 
+d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323
+l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
+    <glyph glyph-name="_454" unicode="&#xf1e4;" horiz-adv-x="1792" 
+d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
+v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23
+zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5
+t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
+    <glyph glyph-name="_455" unicode="&#xf1e5;" horiz-adv-x="1792" 
+d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z
+M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_456" unicode="&#xf1e6;" horiz-adv-x="1792" 
+d="M1755 1083q37 -38 37 -90.5t-37 -90.5l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234
+l401 400q38 37 91 37t90 -37z" />
+    <glyph glyph-name="_457" unicode="&#xf1e7;" horiz-adv-x="1792" 
+d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5
+t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z
+M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q4 -2 11.5 -7
+t10.5 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
+    <glyph glyph-name="_458" unicode="&#xf1e8;" horiz-adv-x="1792" 
+d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
+    <glyph glyph-name="_459" unicode="&#xf1e9;" 
+d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36
+q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q71 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5
+t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87
+q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
+    <glyph glyph-name="_460" unicode="&#xf1ea;" horiz-adv-x="2048" 
+d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19
+t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
+    <glyph glyph-name="_461" unicode="&#xf1eb;" horiz-adv-x="2048" 
+d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121
+q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z
+M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
+    <glyph glyph-name="_462" unicode="&#xf1ec;" horiz-adv-x="1792" 
+d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
+t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5
+t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5
+t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
+M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38
+h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_463" unicode="&#xf1ed;" 
+d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246
+q24 70 35 133q1 6 2.5 7.5t3.5 1t6 -3.5q79 -59 98 -162zM1347 1172q0 -107 -46 -236q-80 -233 -302 -315q-113 -40 -252 -42q0 -1 -90 -1l-90 1q-100 0 -118 -96q-2 -8 -85 -530q-1 -10 -12 -10h-295q-22 0 -36.5 16.5t-11.5 38.5l232 1471q5 29 27.5 48t51.5 19h598
+q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z" />
+    <glyph glyph-name="_464" unicode="&#xf1ee;" horiz-adv-x="1792" 
+d="M441 864q33 0 52 -26q266 -364 362 -774h-446q-127 441 -367 749q-12 16 -3 33.5t29 17.5h373zM1000 507q-49 -199 -125 -393q-79 310 -256 594q40 221 44 449q211 -340 337 -650zM1099 1216q235 -324 384.5 -698.5t184.5 -773.5h-451q-41 665 -553 1472h435zM1792 640
+q0 -424 -101 -812q-67 560 -359 1083q-25 301 -106 584q-4 16 5.5 28.5t25.5 12.5h359q21 0 38.5 -13t22.5 -33q115 -409 115 -850z" />
+    <glyph glyph-name="uniF1F0" unicode="&#xf1f0;" horiz-adv-x="2304" 
+d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27
+q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128
+q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_466" unicode="&#xf1f1;" horiz-adv-x="2304" 
+d="M1119 1195q-128 85 -281 85q-103 0 -197.5 -40.5t-162.5 -108.5t-108.5 -162t-40.5 -197q0 -104 40.5 -198t108.5 -162t162 -108.5t198 -40.5q153 0 281 85q-131 107 -178 265.5t0.5 316.5t177.5 265zM1152 1171q-126 -99 -172 -249.5t-0.5 -300.5t172.5 -249
+q127 99 172.5 249t-0.5 300.5t-172 249.5zM1185 1195q130 -107 177.5 -265.5t0.5 -317t-178 -264.5q128 -85 281 -85q104 0 198 40.5t162 108.5t108.5 162t40.5 198q0 103 -40.5 197t-108.5 162t-162.5 108.5t-197.5 40.5q-153 0 -281 -85zM1926 473h7v3h-17v-3h7v-17h3v17z
+M1955 456h4v20h-5l-6 -13l-6 13h-5v-20h3v15l6 -13h4l5 13v-15zM1947 16v-2h-2h-3v3h3h2v-1zM1947 7h3l-4 5h2l1 1q1 1 1 3t-1 3l-1 1h-3h-6v-13h3v5h1zM685 75q0 19 11 31t30 12q18 0 29 -12.5t11 -30.5q0 -19 -11 -31t-29 -12q-19 0 -30 12t-11 31zM1158 119q30 0 35 -32
+h-70q5 32 35 32zM1514 75q0 19 11 31t29 12t29.5 -12.5t11.5 -30.5q0 -19 -11 -31t-30 -12q-18 0 -29 12t-11 31zM1786 75q0 18 11.5 30.5t29.5 12.5t29.5 -12.5t11.5 -30.5q0 -19 -11.5 -31t-29.5 -12t-29.5 12.5t-11.5 30.5zM1944 3q-2 0 -4 1q-1 0 -3 2t-2 3q-1 2 -1 4
+q0 3 1 4q0 2 2 4l1 1q2 0 2 1q2 1 4 1q3 0 4 -1l4 -2l2 -4v-1q1 -2 1 -3l-1 -1v-3t-1 -1l-1 -2q-2 -2 -4 -2q-1 -1 -4 -1zM599 7h30v85q0 24 -14.5 38.5t-39.5 15.5q-32 0 -47 -24q-14 24 -45 24q-24 0 -39 -20v16h-30v-135h30v75q0 36 33 36q30 0 30 -36v-75h29v75
+q0 36 33 36q30 0 30 -36v-75zM765 7h29v68v67h-29v-16q-17 20 -43 20q-29 0 -48 -20t-19 -51t19 -51t48 -20q28 0 43 20v-17zM943 48q0 34 -47 40l-14 2q-23 4 -23 14q0 15 25 15q23 0 43 -11l12 24q-22 14 -55 14q-26 0 -41 -12t-15 -32q0 -33 47 -39l13 -2q24 -4 24 -14
+q0 -17 -31 -17q-25 0 -45 14l-13 -23q25 -17 58 -17q29 0 45.5 12t16.5 32zM1073 14l-8 25q-13 -7 -26 -7q-19 0 -19 22v61h48v27h-48v41h-30v-41h-28v-27h28v-61q0 -50 47 -50q21 0 36 10zM1159 146q-29 0 -48 -20t-19 -51q0 -32 19.5 -51.5t49.5 -19.5q33 0 55 19l-14 22
+q-18 -15 -39 -15q-34 0 -41 33h101v12q0 32 -18 51.5t-46 19.5zM1318 146q-23 0 -35 -20v16h-30v-135h30v76q0 35 29 35q10 0 18 -4l9 28q-9 4 -21 4zM1348 75q0 -31 19.5 -51t52.5 -20q29 0 48 16l-14 24q-18 -13 -35 -12q-18 0 -29.5 12t-11.5 31t11.5 31t29.5 12
+q19 0 35 -12l14 24q-20 16 -48 16q-33 0 -52.5 -20t-19.5 -51zM1593 7h30v68v67h-30v-16q-15 20 -42 20q-29 0 -48.5 -20t-19.5 -51t19.5 -51t48.5 -20q28 0 42 20v-17zM1726 146q-23 0 -35 -20v16h-29v-135h29v76q0 35 29 35q10 0 18 -4l9 28q-8 4 -21 4zM1866 7h29v68v122
+h-29v-71q-15 20 -43 20t-47.5 -20.5t-19.5 -50.5t19.5 -50.5t47.5 -20.5q29 0 43 20v-17zM1944 27l-2 -1h-3q-2 -1 -4 -3q-3 -1 -3 -4q-1 -2 -1 -6q0 -3 1 -5q0 -2 3 -4q2 -2 4 -3t5 -1q4 0 6 1q0 1 2 2l2 1q1 1 3 4q1 2 1 5q0 4 -1 6q-1 1 -3 4q0 1 -2 2l-2 1q-1 0 -3 0.5
+t-3 0.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_467" unicode="&#xf1f2;" horiz-adv-x="2304" 
+d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42
+q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604
+v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569
+q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73
+t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
+    <glyph glyph-name="f1f3" unicode="&#xf1f3;" horiz-adv-x="2304" 
+d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z
+M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260
+l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279
+v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040
+q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168
+q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5
+t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21
+h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5
+t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
+    <glyph glyph-name="_469" unicode="&#xf1f4;" horiz-adv-x="2304" 
+d="M745 630q0 -37 -25.5 -61.5t-62.5 -24.5q-29 0 -46.5 16t-17.5 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM1530 779q0 -42 -22 -57t-66 -15l-32 -1l17 107q2 11 13 11h18q22 0 35 -2t25 -12.5t12 -30.5zM1881 630q0 -36 -25.5 -61t-61.5 -25q-29 0 -47 16
+t-18 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM513 801q0 59 -38.5 85.5t-100.5 26.5h-160q-19 0 -21 -19l-65 -408q-1 -6 3 -11t10 -5h76q20 0 22 19l18 110q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM822 489l41 261q1 6 -3 11t-10 5h-76
+q-14 0 -17 -33q-27 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q28 0 58 12t48 32q-4 -12 -4 -21q0 -16 13 -16h69q19 0 22 19zM1269 752q0 5 -4 9.5t-9 4.5h-77q-11 0 -18 -10l-106 -156l-44 150q-5 16 -22 16h-75q-5 0 -9 -4.5t-4 -9.5q0 -2 19.5 -59
+t42 -123t23.5 -70q-82 -112 -82 -120q0 -13 13 -13h77q11 0 18 10l255 368q2 2 2 7zM1649 801q0 59 -38.5 85.5t-100.5 26.5h-159q-20 0 -22 -19l-65 -408q-1 -6 3 -11t10 -5h82q12 0 16 13l18 116q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM1958 489
+l41 261q1 6 -3 11t-10 5h-76q-14 0 -17 -33q-26 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q29 0 59 12t47 32q0 -1 -2 -9t-2 -12q0 -16 13 -16h69q19 0 22 19zM2176 898v1q0 14 -13 14h-74q-11 0 -13 -11l-65 -416l-1 -2q0 -5 4 -9.5t10 -4.5h66
+q19 0 21 19zM392 764q-5 -35 -26 -46t-60 -11l-33 -1l17 107q2 11 13 11h19q40 0 58 -11.5t12 -48.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_470" unicode="&#xf1f5;" horiz-adv-x="2304" 
+d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109
+q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118
+q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151
+q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31
+q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_471" unicode="&#xf1f6;" horiz-adv-x="2048" 
+d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5
+l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5
+l418 363q10 8 23.5 7t21.5 -11z" />
+    <glyph glyph-name="_472" unicode="&#xf1f7;" horiz-adv-x="2048" 
+d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128
+q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161
+q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
+    <glyph glyph-name="_473" unicode="&#xf1f8;" horiz-adv-x="1408" 
+d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704
+q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167
+q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_474" unicode="&#xf1f9;" 
+d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5
+t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5
+t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_475" unicode="&#xf1fa;" 
+d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53
+q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24
+t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61
+t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
+    <glyph glyph-name="_476" unicode="&#xf1fb;" horiz-adv-x="1792" 
+d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10
+t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
+    <glyph glyph-name="f1fc" unicode="&#xf1fc;" horiz-adv-x="1792" 
+d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5
+t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
+    <glyph glyph-name="_478" unicode="&#xf1fd;" horiz-adv-x="1792" 
+d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11q24 0 44 -7t31 -15t33 -27q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5
+t47 37.5q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-24 0 -44 7t-31 15t-33 27q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38
+t-58 27t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448
+h256v448h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5
+q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
+    <glyph glyph-name="_479" unicode="&#xf1fe;" horiz-adv-x="2048" 
+d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
+    <glyph glyph-name="_480" unicode="&#xf200;" horiz-adv-x="1792" 
+d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_481" unicode="&#xf201;" horiz-adv-x="2048" 
+d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9
+t9 -23z" />
+    <glyph glyph-name="_482" unicode="&#xf202;" horiz-adv-x="1792" 
+d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20
+q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50
+t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1
+q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
+    <glyph glyph-name="_483" unicode="&#xf203;" 
+d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73
+q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110
+q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_484" unicode="&#xf204;" horiz-adv-x="2048" 
+d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5
+t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5
+t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
+    <glyph glyph-name="_485" unicode="&#xf205;" horiz-adv-x="2048" 
+d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5
+t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
+    <glyph glyph-name="_486" unicode="&#xf206;" horiz-adv-x="2304" 
+d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94
+q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469
+q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400
+q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
+    <glyph glyph-name="_487" unicode="&#xf207;" 
+d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5
+h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
+    <glyph glyph-name="_488" unicode="&#xf208;" horiz-adv-x="2048" 
+d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327
+q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5
+q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
+    <glyph glyph-name="_489" unicode="&#xf209;" horiz-adv-x="1280" 
+d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q17 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119
+t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5
+t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14
+q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88
+q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5
+t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
+    <glyph glyph-name="_490" unicode="&#xf20a;" horiz-adv-x="2048" 
+d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206
+q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307
+t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14
+t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
+    <glyph glyph-name="_491" unicode="&#xf20b;" 
+d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5
+t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_492" unicode="&#xf20c;" 
+d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55
+q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410
+q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
+    <glyph glyph-name="_493" unicode="&#xf20d;" 
+d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960q0 -118 -85 -203t-203 -85h-960q-118 0 -203 85t-85 203v960q0 118 85 203t203 85h960q118 0 203 -85t85 -203z" />
+    <glyph glyph-name="_494" unicode="&#xf20e;" horiz-adv-x="2048" 
+d="M2048 641q0 -21 -13 -36.5t-33 -19.5l-205 -356q3 -9 3 -18q0 -20 -12.5 -35.5t-32.5 -19.5l-193 -337q3 -8 3 -16q0 -23 -16.5 -40t-40.5 -17q-25 0 -41 18h-400q-17 -20 -43 -20t-43 20h-399q-17 -20 -43 -20q-23 0 -40 16.5t-17 40.5q0 8 4 20l-193 335
+q-20 4 -32.5 19.5t-12.5 35.5q0 9 3 18l-206 356q-20 5 -32.5 20.5t-12.5 35.5q0 21 13.5 36.5t33.5 19.5l199 344q0 1 -0.5 3t-0.5 3q0 36 34 51l209 363q-4 10 -4 18q0 24 17 40.5t40 16.5q26 0 44 -21h396q16 21 43 21t43 -21h398q18 21 44 21q23 0 40 -16.5t17 -40.5
+q0 -6 -4 -18l207 -358q23 -1 39 -17.5t16 -38.5q0 -13 -7 -27l187 -324q19 -4 31.5 -19.5t12.5 -35.5zM1063 -158h389l-342 354h-143l-342 -354h360q18 16 39 16t39 -16zM112 654q1 -4 1 -13q0 -10 -2 -15l208 -360l15 -6l188 199v347l-187 194q-13 -8 -29 -10zM986 1438
+h-388l190 -200l554 200h-280q-16 -16 -38 -16t-38 16zM1689 226q1 6 5 11l-64 68l-17 -79h76zM1583 226l22 105l-252 266l-296 -307l63 -64h463zM1495 -142l16 28l65 310h-427l333 -343q8 4 13 5zM578 -158h5l342 354h-373v-335l4 -6q14 -5 22 -13zM552 226h402l64 66
+l-309 321l-157 -166v-221zM359 226h163v189l-168 -177q4 -8 5 -12zM358 1051q0 -1 0.5 -2t0.5 -2q0 -16 -8 -29l171 -177v269zM552 1121v-311l153 -157l297 314l-223 236zM556 1425l-4 -8v-264l205 74l-191 201q-6 -2 -10 -3zM1447 1438h-16l-621 -224l213 -225zM1023 946
+l-297 -315l311 -319l296 307zM688 634l-136 141v-284zM1038 270l-42 -44h85zM1374 618l238 -251l132 624l-3 5l-1 1zM1718 1018q-8 13 -8 29v2l-216 376q-5 1 -13 5l-437 -463l310 -327zM522 1142v223l-163 -282zM522 196h-163l163 -283v283zM1607 196l-48 -227l130 227h-82
+zM1729 266l207 361q-2 10 -2 14q0 1 3 16l-171 296l-129 -612l77 -82q5 3 15 7z" />
+    <glyph glyph-name="f210" unicode="&#xf210;" 
+d="M0 856q0 131 91.5 226.5t222.5 95.5h742l352 358v-1470q0 -132 -91.5 -227t-222.5 -95h-780q-131 0 -222.5 95t-91.5 227v790zM1232 102l-176 180v425q0 46 -32 79t-78 33h-484q-46 0 -78 -33t-32 -79v-492q0 -46 32.5 -79.5t77.5 -33.5h770z" />
+    <glyph glyph-name="_496" unicode="&#xf211;" 
+d="M934 1386q-317 -121 -556 -362.5t-358 -560.5q-20 89 -20 176q0 208 102.5 384.5t278.5 279t384 102.5q82 0 169 -19zM1203 1267q93 -65 164 -155q-389 -113 -674.5 -400.5t-396.5 -676.5q-93 72 -155 162q112 386 395 671t667 399zM470 -67q115 356 379.5 622t619.5 384
+q40 -92 54 -195q-292 -120 -516 -345t-343 -518q-103 14 -194 52zM1536 -125q-193 50 -367 115q-135 -84 -290 -107q109 205 274 370.5t369 275.5q-21 -152 -101 -284q65 -175 115 -370z" />
+    <glyph glyph-name="f212" unicode="&#xf212;" horiz-adv-x="2048" 
+d="M1893 1144l155 -1272q-131 0 -257 57q-200 91 -393 91q-226 0 -374 -148q-148 148 -374 148q-193 0 -393 -91q-128 -57 -252 -57h-5l155 1272q224 127 482 127q233 0 387 -106q154 106 387 106q258 0 482 -127zM1398 157q129 0 232 -28.5t260 -93.5l-124 1021
+q-171 78 -368 78q-224 0 -374 -141q-150 141 -374 141q-197 0 -368 -78l-124 -1021q105 43 165.5 65t148.5 39.5t178 17.5q202 0 374 -108q172 108 374 108zM1438 191l-55 907q-211 -4 -359 -155q-152 155 -374 155q-176 0 -336 -66l-114 -941q124 51 228.5 76t221.5 25
+q209 0 374 -102q172 107 374 102z" />
+    <glyph glyph-name="_498" unicode="&#xf213;" horiz-adv-x="2048" 
+d="M1500 165v733q0 21 -15 36t-35 15h-93q-20 0 -35 -15t-15 -36v-733q0 -20 15 -35t35 -15h93q20 0 35 15t15 35zM1216 165v531q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-531q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM924 165v429q0 20 -15 35t-35 15h-101
+q-20 0 -35 -15t-15 -35v-429q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM632 165v362q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-362q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM2048 311q0 -166 -118 -284t-284 -118h-1244q-166 0 -284 118t-118 284
+q0 116 63 214.5t168 148.5q-10 34 -10 73q0 113 80.5 193.5t193.5 80.5q102 0 180 -67q45 183 194 300t338 117q149 0 275 -73.5t199.5 -199.5t73.5 -275q0 -66 -14 -122q135 -33 221 -142.5t86 -247.5z" />
+    <glyph glyph-name="_499" unicode="&#xf214;" 
+d="M0 1536h1536v-1392l-776 -338l-760 338v1392zM1436 209v926h-1336v-926l661 -294zM1436 1235v201h-1336v-201h1336zM181 937v-115h-37v115h37zM181 789v-115h-37v115h37zM181 641v-115h-37v115h37zM181 493v-115h-37v115h37zM181 345v-115h-37v115h37zM207 202l15 34
+l105 -47l-15 -33zM343 142l15 34l105 -46l-15 -34zM478 82l15 34l105 -46l-15 -34zM614 23l15 33l104 -46l-15 -34zM797 10l105 46l15 -33l-105 -47zM932 70l105 46l15 -34l-105 -46zM1068 130l105 46l15 -34l-105 -46zM1203 189l105 47l15 -34l-105 -46zM259 1389v-36h-114
+v36h114zM421 1389v-36h-115v36h115zM583 1389v-36h-115v36h115zM744 1389v-36h-114v36h114zM906 1389v-36h-114v36h114zM1068 1389v-36h-115v36h115zM1230 1389v-36h-115v36h115zM1391 1389v-36h-114v36h114zM181 1049v-79h-37v115h115v-36h-78zM421 1085v-36h-115v36h115z
+M583 1085v-36h-115v36h115zM744 1085v-36h-114v36h114zM906 1085v-36h-114v36h114zM1068 1085v-36h-115v36h115zM1230 1085v-36h-115v36h115zM1355 970v79h-78v36h115v-115h-37zM1355 822v115h37v-115h-37zM1355 674v115h37v-115h-37zM1355 526v115h37v-115h-37zM1355 378
+v115h37v-115h-37zM1355 230v115h37v-115h-37zM760 265q-129 0 -221 91.5t-92 221.5q0 129 92 221t221 92q130 0 221.5 -92t91.5 -221q0 -130 -91.5 -221.5t-221.5 -91.5zM595 646q0 -36 19.5 -56.5t49.5 -25t64 -7t64 -2t49.5 -9t19.5 -30.5q0 -49 -112 -49q-97 0 -123 51
+h-3l-31 -63q67 -42 162 -42q29 0 56.5 5t55.5 16t45.5 33t17.5 53q0 46 -27.5 69.5t-67.5 27t-79.5 3t-67 5t-27.5 25.5q0 21 20.5 33t40.5 15t41 3q34 0 70.5 -11t51.5 -34h3l30 58q-3 1 -21 8.5t-22.5 9t-19.5 7t-22 7t-20 4.5t-24 4t-23 1q-29 0 -56.5 -5t-54 -16.5
+t-43 -34t-16.5 -53.5z" />
+    <glyph glyph-name="_500" unicode="&#xf215;" horiz-adv-x="2048" 
+d="M863 504q0 112 -79.5 191.5t-191.5 79.5t-191 -79.5t-79 -191.5t79 -191t191 -79t191.5 79t79.5 191zM1726 505q0 112 -79 191t-191 79t-191.5 -79t-79.5 -191q0 -113 79.5 -192t191.5 -79t191 79.5t79 191.5zM2048 1314v-1348q0 -44 -31.5 -75.5t-76.5 -31.5h-1832
+q-45 0 -76.5 31.5t-31.5 75.5v1348q0 44 31.5 75.5t76.5 31.5h431q44 0 76 -31.5t32 -75.5v-161h754v161q0 44 32 75.5t76 31.5h431q45 0 76.5 -31.5t31.5 -75.5z" />
+    <glyph glyph-name="_501" unicode="&#xf216;" horiz-adv-x="2048" 
+d="M1430 953zM1690 749q148 0 253 -98.5t105 -244.5q0 -157 -109 -261.5t-267 -104.5q-85 0 -162 27.5t-138 73.5t-118 106t-109 126t-103.5 132.5t-108.5 126.5t-117 106t-136 73.5t-159 27.5q-154 0 -251.5 -91.5t-97.5 -244.5q0 -157 104 -250t263 -93q100 0 208 37.5
+t193 98.5q5 4 21 18.5t30 24t22 9.5q14 0 24.5 -10.5t10.5 -24.5q0 -24 -60 -77q-101 -88 -234.5 -142t-260.5 -54q-133 0 -245.5 58t-180 165t-67.5 241q0 205 141.5 341t347.5 136q120 0 226.5 -43.5t185.5 -113t151.5 -153t139 -167.5t133.5 -153.5t149.5 -113
+t172.5 -43.5q102 0 168.5 61.5t66.5 162.5q0 95 -64.5 159t-159.5 64q-30 0 -81.5 -18.5t-68.5 -18.5q-20 0 -35.5 15t-15.5 35q0 18 8.5 57t8.5 59q0 159 -107.5 263t-266.5 104q-58 0 -111.5 -18.5t-84 -40.5t-55.5 -40.5t-33 -18.5q-15 0 -25.5 10.5t-10.5 25.5
+q0 19 25 46q59 67 147 103.5t182 36.5q191 0 318 -125.5t127 -315.5q0 -37 -4 -66q57 15 115 15z" />
+    <glyph glyph-name="_502" unicode="&#xf217;" horiz-adv-x="1664" 
+d="M1216 832q0 26 -19 45t-45 19h-128v128q0 26 -19 45t-45 19t-45 -19t-19 -45v-128h-128q-26 0 -45 -19t-19 -45t19 -45t45 -19h128v-128q0 -26 19 -45t45 -19t45 19t19 45v128h128q26 0 45 19t19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
+q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="_503" unicode="&#xf218;" horiz-adv-x="1664" 
+d="M1280 832q0 26 -19 45t-45 19t-45 -19l-147 -146v293q0 26 -19 45t-45 19t-45 -19t-19 -45v-293l-147 146q-19 19 -45 19t-45 -19t-19 -45t19 -45l256 -256q19 -19 45 -19t45 19l256 256q19 19 19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
+q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="_504" unicode="&#xf219;" horiz-adv-x="2048" 
+d="M212 768l623 -665l-300 665h-323zM1024 -4l349 772h-698zM538 896l204 384h-262l-288 -384h346zM1213 103l623 665h-323zM683 896h682l-204 384h-274zM1510 896h346l-288 384h-262zM1651 1382l384 -512q14 -18 13 -41.5t-17 -40.5l-960 -1024q-18 -20 -47 -20t-47 20
+l-960 1024q-16 17 -17 40.5t13 41.5l384 512q18 26 51 26h1152q33 0 51 -26z" />
+    <glyph glyph-name="_505" unicode="&#xf21a;" horiz-adv-x="2048" 
+d="M1811 -19q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
+q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83
+q19 19 45 19t45 -19l83 -83zM237 19q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -82l83 82q19 19 45 19t45 -19l83 -82l64 64v293l-210 314q-17 26 -7 56.5t40 40.5l177 58v299h128v128h256v128h256v-128h256v-128h128v-299l177 -58q30 -10 40 -40.5t-7 -56.5l-210 -314
+v-293l19 18q19 19 45 19t45 -19l83 -82l83 82q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
+q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83zM640 1152v-128l384 128l384 -128v128h-128v128h-512v-128h-128z" />
+    <glyph glyph-name="_506" unicode="&#xf21b;" 
+d="M576 0l96 448l-96 128l-128 64zM832 0l128 640l-128 -64l-96 -128zM992 1010q-2 4 -4 6q-10 8 -96 8q-70 0 -167 -19q-7 -2 -21 -2t-21 2q-97 19 -167 19q-86 0 -96 -8q-2 -2 -4 -6q2 -18 4 -27q2 -3 7.5 -6.5t7.5 -10.5q2 -4 7.5 -20.5t7 -20.5t7.5 -17t8.5 -17t9 -14
+t12 -13.5t14 -9.5t17.5 -8t20.5 -4t24.5 -2q36 0 59 12.5t32.5 30t14.5 34.5t11.5 29.5t17.5 12.5h12q11 0 17.5 -12.5t11.5 -29.5t14.5 -34.5t32.5 -30t59 -12.5q13 0 24.5 2t20.5 4t17.5 8t14 9.5t12 13.5t9 14t8.5 17t7.5 17t7 20.5t7.5 20.5q2 7 7.5 10.5t7.5 6.5
+q2 9 4 27zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 61 4.5 118t19 125.5t37.5 123.5t63.5 103.5t93.5 74.5l-90 220h214q-22 64 -22 128q0 12 2 32q-194 40 -194 96q0 57 210 99q17 62 51.5 134t70.5 114q32 37 76 37q30 0 84 -31t84 -31t84 31
+t84 31q44 0 76 -37q36 -42 70.5 -114t51.5 -134q210 -42 210 -99q0 -56 -194 -96q7 -81 -20 -160h214l-82 -225q63 -33 107.5 -96.5t65.5 -143.5t29 -151.5t8 -148.5z" />
+    <glyph glyph-name="_507" unicode="&#xf21c;" horiz-adv-x="2304" 
+d="M2301 500q12 -103 -22 -198.5t-99 -163.5t-158.5 -106t-196.5 -31q-161 11 -279.5 125t-134.5 274q-12 111 27.5 210.5t118.5 170.5l-71 107q-96 -80 -151 -194t-55 -244q0 -27 -18.5 -46.5t-45.5 -19.5h-256h-69q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5
+t-131.5 316.5t131.5 316.5t316.5 131.5q76 0 152 -27l24 45q-123 110 -304 110h-64q-26 0 -45 19t-19 45t19 45t45 19h128q78 0 145 -13.5t116.5 -38.5t71.5 -39.5t51 -36.5h512h115l-85 128h-222q-30 0 -49 22.5t-14 52.5q4 23 23 38t43 15h253q33 0 53 -28l70 -105
+l114 114q19 19 46 19h101q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-179l115 -172q131 63 275 36q143 -26 244 -134.5t118 -253.5zM448 128q115 0 203 72.5t111 183.5h-314q-35 0 -55 31q-18 32 -1 63l147 277q-47 13 -91 13q-132 0 -226 -94t-94 -226t94 -226
+t226 -94zM1856 128q132 0 226 94t94 226t-94 226t-226 94q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94z" />
+    <glyph glyph-name="_508" unicode="&#xf21d;" 
+d="M1408 0q0 -63 -61.5 -113.5t-164 -81t-225 -46t-253.5 -15.5t-253.5 15.5t-225 46t-164 81t-61.5 113.5q0 49 33 88.5t91 66.5t118 44.5t131 29.5q26 5 48 -10.5t26 -41.5q5 -26 -10.5 -48t-41.5 -26q-58 -10 -106 -23.5t-76.5 -25.5t-48.5 -23.5t-27.5 -19.5t-8.5 -12
+q3 -11 27 -26.5t73 -33t114 -32.5t160.5 -25t201.5 -10t201.5 10t160.5 25t114 33t73 33.5t27 27.5q-1 4 -8.5 11t-27.5 19t-48.5 23.5t-76.5 25t-106 23.5q-26 4 -41.5 26t-10.5 48q4 26 26 41.5t48 10.5q71 -12 131 -29.5t118 -44.5t91 -66.5t33 -88.5zM1024 896v-384
+q0 -26 -19 -45t-45 -19h-64v-384q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v384h-64q-26 0 -45 19t-19 45v384q0 53 37.5 90.5t90.5 37.5h384q53 0 90.5 -37.5t37.5 -90.5zM928 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5
+t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="_509" unicode="&#xf21e;" horiz-adv-x="1792" 
+d="M1280 512h305q-5 -6 -10 -10.5t-9 -7.5l-3 -4l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-5 2 -21 20h369q22 0 39.5 13.5t22.5 34.5l70 281l190 -667q6 -20 23 -33t39 -13q21 0 38 13t23 33l146 485l56 -112q18 -35 57 -35zM1792 940q0 -145 -103 -300h-369l-111 221
+q-8 17 -25.5 27t-36.5 8q-45 -5 -56 -46l-129 -430l-196 686q-6 20 -23.5 33t-39.5 13t-39 -13.5t-22 -34.5l-116 -464h-423q-103 155 -103 300q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124
+t127 -344z" />
+    <glyph glyph-name="venus" unicode="&#xf221;" horiz-adv-x="1280" 
+d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292
+q11 134 80.5 249t182 188t245.5 88q170 19 319 -54t236 -212t87 -306zM128 960q0 -185 131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5z" />
+    <glyph glyph-name="_511" unicode="&#xf222;" 
+d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-382 -383q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5
+q203 0 359 -126l382 382h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_512" unicode="&#xf223;" horiz-adv-x="1280" 
+d="M830 1220q145 -72 233.5 -210.5t88.5 -305.5q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5
+t-147.5 384.5q0 167 88.5 305.5t233.5 210.5q-165 96 -228 273q-6 16 3.5 29.5t26.5 13.5h69q21 0 29 -20q44 -106 140 -171t214 -65t214 65t140 171q8 20 37 20h61q17 0 26.5 -13.5t3.5 -29.5q-63 -177 -228 -273zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_513" unicode="&#xf224;" 
+d="M1024 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
+q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-149 16 -270.5 103t-186.5 223.5t-53 291.5q16 204 160 353.5t347 172.5q118 14 228 -19t198 -103l255 254h-134q-14 0 -23 9t-9 23v64zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_514" unicode="&#xf225;" horiz-adv-x="1792" 
+d="M1280 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
+q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5t-147.5 384.5q0 201 126 359l-52 53l-101 -111q-9 -10 -22 -10.5t-23 7.5l-48 44q-10 8 -10.5 21.5t8.5 23.5l105 115l-111 112v-134q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9
+t-9 23v288q0 26 19 45t45 19h288q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-133l106 -107l86 94q9 10 22 10.5t23 -7.5l48 -44q10 -8 10.5 -21.5t-8.5 -23.5l-90 -99l57 -56q158 126 359 126t359 -126l255 254h-134q-14 0 -23 9t-9 23v64zM832 256q185 0 316.5 131.5
+t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_515" unicode="&#xf226;" horiz-adv-x="1792" 
+d="M1790 1007q12 -155 -52.5 -292t-186 -224t-271.5 -103v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-512v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23
+t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292q17 206 164.5 356.5t352.5 169.5q206 21 377 -94q171 115 377 94q205 -19 352.5 -169.5t164.5 -356.5zM896 647q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM576 512q115 0 218 57q-154 165 -154 391
+q0 224 154 391q-103 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5zM1152 128v260q-137 15 -256 94q-119 -79 -256 -94v-260h512zM1216 512q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5q-115 0 -218 -57q154 -167 154 -391
+q0 -226 -154 -391q103 -57 218 -57z" />
+    <glyph glyph-name="_516" unicode="&#xf227;" horiz-adv-x="1920" 
+d="M1536 1120q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-31 -182 -166 -312t-318 -156q-210 -29 -384.5 80t-241.5 300q-117 6 -221 57.5t-177.5 133t-113.5 192.5t-32 230
+q9 135 78 252t182 191.5t248 89.5q118 14 227.5 -19t198.5 -103l255 254h-134q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q59 -74 93 -169q182 -9 328 -124l255 254h-134q-14 0 -23 9
+t-9 23v64zM1024 704q0 20 -4 58q-162 -25 -271 -150t-109 -292q0 -20 4 -58q162 25 271 150t109 292zM128 704q0 -168 111 -294t276 -149q-3 29 -3 59q0 210 135 369.5t338 196.5q-53 120 -163.5 193t-245.5 73q-185 0 -316.5 -131.5t-131.5 -316.5zM1088 -128
+q185 0 316.5 131.5t131.5 316.5q0 168 -111 294t-276 149q3 -28 3 -59q0 -210 -135 -369.5t-338 -196.5q53 -120 163.5 -193t245.5 -73z" />
+    <glyph glyph-name="_517" unicode="&#xf228;" horiz-adv-x="2048" 
+d="M1664 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-32 -180 -164.5 -310t-313.5 -157q-223 -34 -409 90q-117 -78 -256 -93v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23
+t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-155 17 -279.5 109.5t-187 237.5t-39.5 307q25 187 159.5 322.5t320.5 164.5q224 34 410 -90q146 97 320 97q201 0 359 -126l255 254h-134q-14 0 -23 9
+t-9 23v64zM896 391q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM128 704q0 -185 131.5 -316.5t316.5 -131.5q117 0 218 57q-154 167 -154 391t154 391q-101 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5zM1216 256q185 0 316.5 131.5t131.5 316.5
+t-131.5 316.5t-316.5 131.5q-117 0 -218 -57q154 -167 154 -391t-154 -391q101 -57 218 -57z" />
+    <glyph glyph-name="_518" unicode="&#xf229;" 
+d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-213 -214l140 -140q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-140 141l-78 -79q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5
+t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5q203 0 359 -126l78 78l-172 172q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l172 -172l213 213h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_519" unicode="&#xf22a;" horiz-adv-x="1280" 
+d="M640 892q217 -24 364.5 -187.5t147.5 -384.5q0 -167 -87 -306t-236 -212t-319 -54q-133 15 -245.5 88t-182 188t-80.5 249q-12 155 52.5 292t186 224t271.5 103v132h-160q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h160v165l-92 -92q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22
+t9 23l202 201q19 19 45 19t45 -19l202 -201q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-92 92v-165h160q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-160v-132zM576 -128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5
+t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_520" unicode="&#xf22b;" horiz-adv-x="2048" 
+d="M1901 621q19 -19 19 -45t-19 -45l-294 -294q-9 -10 -22.5 -10t-22.5 10l-45 45q-10 9 -10 22.5t10 22.5l185 185h-294v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-132q-24 -217 -187.5 -364.5t-384.5 -147.5q-167 0 -306 87t-212 236t-54 319q15 133 88 245.5
+t188 182t249 80.5q155 12 292 -52.5t224 -186t103 -271.5h132v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h294l-185 185q-10 9 -10 22.5t10 22.5l45 45q9 10 22.5 10t22.5 -10zM576 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5
+t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_521" unicode="&#xf22c;" horiz-adv-x="1280" 
+d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-612q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v612q-217 24 -364.5 187.5t-147.5 384.5q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM576 512q185 0 316.5 131.5
+t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_522" unicode="&#xf22d;" horiz-adv-x="1280" 
+d="M1024 576q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1152 576q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123
+t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5z" />
+    <glyph glyph-name="_523" unicode="&#xf22e;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_524" unicode="&#xf22f;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_525" unicode="&#xf230;" 
+d="M1451 1408q35 0 60 -25t25 -60v-1366q0 -35 -25 -60t-60 -25h-391v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-735q-35 0 -60 25t-25 60v1366q0 35 25 60t60 25h1366z" />
+    <glyph glyph-name="_526" unicode="&#xf231;" horiz-adv-x="1280" 
+d="M0 939q0 108 37.5 203.5t103.5 166.5t152 123t185 78t202 26q158 0 294 -66.5t221 -193.5t85 -287q0 -96 -19 -188t-60 -177t-100 -149.5t-145 -103t-189 -38.5q-68 0 -135 32t-96 88q-10 -39 -28 -112.5t-23.5 -95t-20.5 -71t-26 -71t-32 -62.5t-46 -77.5t-62 -86.5
+l-14 -5l-9 10q-15 157 -15 188q0 92 21.5 206.5t66.5 287.5t52 203q-32 65 -32 169q0 83 52 156t132 73q61 0 95 -40.5t34 -102.5q0 -66 -44 -191t-44 -187q0 -63 45 -104.5t109 -41.5q55 0 102 25t78.5 68t56 95t38 110.5t20 111t6.5 99.5q0 173 -109.5 269.5t-285.5 96.5
+q-200 0 -334 -129.5t-134 -328.5q0 -44 12.5 -85t27 -65t27 -45.5t12.5 -30.5q0 -28 -15 -73t-37 -45q-2 0 -17 3q-51 15 -90.5 56t-61 94.5t-32.5 108t-11 106.5z" />
+    <glyph glyph-name="_527" unicode="&#xf232;" 
+d="M985 562q13 0 97.5 -44t89.5 -53q2 -5 2 -15q0 -33 -17 -76q-16 -39 -71 -65.5t-102 -26.5q-57 0 -190 62q-98 45 -170 118t-148 185q-72 107 -71 194v8q3 91 74 158q24 22 52 22q6 0 18 -1.5t19 -1.5q19 0 26.5 -6.5t15.5 -27.5q8 -20 33 -88t25 -75q0 -21 -34.5 -57.5
+t-34.5 -46.5q0 -7 5 -15q34 -73 102 -137q56 -53 151 -101q12 -7 22 -7q15 0 54 48.5t52 48.5zM782 32q127 0 243.5 50t200.5 134t134 200.5t50 243.5t-50 243.5t-134 200.5t-200.5 134t-243.5 50t-243.5 -50t-200.5 -134t-134 -200.5t-50 -243.5q0 -203 120 -368l-79 -233
+l242 77q158 -104 345 -104zM782 1414q153 0 292.5 -60t240.5 -161t161 -240.5t60 -292.5t-60 -292.5t-161 -240.5t-240.5 -161t-292.5 -60q-195 0 -365 94l-417 -134l136 405q-108 178 -108 389q0 153 60 292.5t161 240.5t240.5 161t292.5 60z" />
+    <glyph glyph-name="_528" unicode="&#xf233;" horiz-adv-x="1792" 
+d="M128 128h1024v128h-1024v-128zM128 640h1024v128h-1024v-128zM1696 192q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM128 1152h1024v128h-1024v-128zM1696 704q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1696 1216
+q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1792 384v-384h-1792v384h1792zM1792 896v-384h-1792v384h1792zM1792 1408v-384h-1792v384h1792z" />
+    <glyph glyph-name="_529" unicode="&#xf234;" horiz-adv-x="2048" 
+d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1664 512h352q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-352q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5
+t-9.5 22.5v352h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v352q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5v-352zM928 288q0 -52 38 -90t90 -38h256v-238q-68 -50 -171 -50h-874q-121 0 -194 69t-73 190q0 53 3.5 103.5t14 109t26.5 108.5
+t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q79 -61 154.5 -91.5t164.5 -30.5t164.5 30.5t154.5 91.5q20 17 39 17q132 0 217 -96h-223q-52 0 -90 -38t-38 -90v-192z" />
+    <glyph glyph-name="_530" unicode="&#xf235;" horiz-adv-x="2048" 
+d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1781 320l249 -249q9 -9 9 -23q0 -13 -9 -22l-136 -136q-9 -9 -22 -9q-14 0 -23 9l-249 249l-249 -249q-9 -9 -23 -9q-13 0 -22 9l-136 136
+q-9 9 -9 22q0 14 9 23l249 249l-249 249q-9 9 -9 23q0 13 9 22l136 136q9 9 22 9q14 0 23 -9l249 -249l249 249q9 9 23 9q13 0 22 -9l136 -136q9 -9 9 -22q0 -14 -9 -23zM1283 320l-181 -181q-37 -37 -37 -91q0 -53 37 -90l83 -83q-21 -3 -44 -3h-874q-121 0 -194 69
+t-73 190q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q154 -122 319 -122t319 122q20 17 39 17q28 0 57 -6q-28 -27 -41 -50t-13 -56q0 -54 37 -91z" />
+    <glyph glyph-name="_531" unicode="&#xf236;" horiz-adv-x="2048" 
+d="M256 512h1728q26 0 45 -19t19 -45v-448h-256v256h-1536v-256h-256v1216q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-704zM832 832q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM2048 576v64q0 159 -112.5 271.5t-271.5 112.5h-704
+q-26 0 -45 -19t-19 -45v-384h1152z" />
+    <glyph glyph-name="_532" unicode="&#xf237;" 
+d="M1536 1536l-192 -448h192v-192h-274l-55 -128h329v-192h-411l-357 -832l-357 832h-411v192h329l-55 128h-274v192h192l-192 448h256l323 -768h378l323 768h256zM768 320l108 256h-216z" />
+    <glyph glyph-name="_533" unicode="&#xf238;" 
+d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM768 192q80 0 136 56t56 136t-56 136t-136 56
+t-136 -56t-56 -136t56 -136t136 -56zM1344 768v512h-1152v-512h1152z" />
+    <glyph glyph-name="_534" unicode="&#xf239;" 
+d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM288 224q66 0 113 47t47 113t-47 113t-113 47
+t-113 -47t-47 -113t47 -113t113 -47zM704 768v512h-544v-512h544zM1248 224q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM1408 768v512h-576v-512h576z" />
+    <glyph glyph-name="_535" unicode="&#xf23a;" horiz-adv-x="1792" 
+d="M597 1115v-1173q0 -25 -12.5 -42.5t-36.5 -17.5q-17 0 -33 8l-465 233q-21 10 -35.5 33.5t-14.5 46.5v1140q0 20 10 34t29 14q14 0 44 -15l511 -256q3 -3 3 -5zM661 1014l534 -866l-534 266v600zM1792 996v-1054q0 -25 -14 -40.5t-38 -15.5t-47 13l-441 220zM1789 1116
+q0 -3 -256.5 -419.5t-300.5 -487.5l-390 634l324 527q17 28 52 28q14 0 26 -6l541 -270q4 -2 4 -6z" />
+    <glyph glyph-name="_536" unicode="&#xf23b;" 
+d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z" />
+    <glyph glyph-name="_537" unicode="&#xf23c;" horiz-adv-x="2296" 
+d="M478 -139q-8 -16 -27 -34.5t-37 -25.5q-25 -9 -51.5 3.5t-28.5 31.5q-1 22 40 55t68 38q23 4 34 -21.5t2 -46.5zM1819 -139q7 -16 26 -34.5t38 -25.5q25 -9 51.5 3.5t27.5 31.5q2 22 -39.5 55t-68.5 38q-22 4 -33 -21.5t-2 -46.5zM1867 -30q13 -27 56.5 -59.5t77.5 -41.5
+q45 -13 82 4.5t37 50.5q0 46 -67.5 100.5t-115.5 59.5q-40 5 -63.5 -37.5t-6.5 -76.5zM428 -30q-13 -27 -56 -59.5t-77 -41.5q-45 -13 -82 4.5t-37 50.5q0 46 67.5 100.5t115.5 59.5q40 5 63 -37.5t6 -76.5zM1158 1094h1q-41 0 -76 -15q27 -8 44 -30.5t17 -49.5
+q0 -35 -27 -60t-65 -25q-52 0 -80 43q-5 -23 -5 -42q0 -74 56 -126.5t135 -52.5q80 0 136 52.5t56 126.5t-56 126.5t-136 52.5zM1462 1312q-99 109 -220.5 131.5t-245.5 -44.5q27 60 82.5 96.5t118 39.5t121.5 -17t99.5 -74.5t44.5 -131.5zM2212 73q8 -11 -11 -42
+q7 -23 7 -40q1 -56 -44.5 -112.5t-109.5 -91.5t-118 -37q-48 -2 -92 21.5t-66 65.5q-687 -25 -1259 0q-23 -41 -66.5 -65t-92.5 -22q-86 3 -179.5 80.5t-92.5 160.5q2 22 7 40q-19 31 -11 42q6 10 31 1q14 22 41 51q-7 29 2 38q11 10 39 -4q29 20 59 34q0 29 13 37
+q23 12 51 -16q35 5 61 -2q18 -4 38 -19v73q-11 0 -18 2q-53 10 -97 44.5t-55 87.5q-9 38 0 81q15 62 93 95q2 17 19 35.5t36 23.5t33 -7.5t19 -30.5h13q46 -5 60 -23q3 -3 5 -7q10 1 30.5 3.5t30.5 3.5q-15 11 -30 17q-23 40 -91 43q0 6 1 10q-62 2 -118.5 18.5t-84.5 47.5
+q-32 36 -42.5 92t-2.5 112q16 126 90 179q23 16 52 4.5t32 -40.5q0 -1 1.5 -14t2.5 -21t3 -20t5.5 -19t8.5 -10q27 -14 76 -12q48 46 98 74q-40 4 -162 -14l47 46q61 58 163 111q145 73 282 86q-20 8 -41 15.5t-47 14t-42.5 10.5t-47.5 11t-43 10q595 126 904 -139
+q98 -84 158 -222q85 -10 121 9h1q5 3 8.5 10t5.5 19t3 19.5t3 21.5l1 14q3 28 32 40t52 -5q73 -52 91 -178q7 -57 -3.5 -113t-42.5 -91q-28 -32 -83.5 -48.5t-115.5 -18.5v-10q-71 -2 -95 -43q-14 -5 -31 -17q11 -1 32 -3.5t30 -3.5q1 5 5 8q16 18 60 23h13q5 18 19 30t33 8
+t36 -23t19 -36q79 -32 93 -95q9 -40 1 -81q-12 -53 -56 -88t-97 -44q-10 -2 -17 -2q0 -49 -1 -73q20 15 38 19q26 7 61 2q28 28 51 16q14 -9 14 -37q33 -16 59 -34q27 13 38 4q10 -10 2 -38q28 -30 41 -51q23 8 31 -1zM1937 1025q0 -29 -9 -54q82 -32 112 -132
+q4 37 -9.5 98.5t-41.5 90.5q-20 19 -36 17t-16 -20zM1859 925q35 -42 47.5 -108.5t-0.5 -124.5q67 13 97 45q13 14 18 28q-3 64 -31 114.5t-79 66.5q-15 -15 -52 -21zM1822 921q-30 0 -44 1q42 -115 53 -239q21 0 43 3q16 68 1 135t-53 100zM258 839q30 100 112 132
+q-9 25 -9 54q0 18 -16.5 20t-35.5 -17q-28 -29 -41.5 -90.5t-9.5 -98.5zM294 737q29 -31 97 -45q-13 58 -0.5 124.5t47.5 108.5v0q-37 6 -52 21q-51 -16 -78.5 -66t-31.5 -115q9 -17 18 -28zM471 683q14 124 73 235q-19 -4 -55 -18l-45 -19v1q-46 -89 -20 -196q25 -3 47 -3z
+M1434 644q8 -38 16.5 -108.5t11.5 -89.5q3 -18 9.5 -21.5t23.5 4.5q40 20 62 85.5t23 125.5q-24 2 -146 4zM1152 1285q-116 0 -199 -82.5t-83 -198.5q0 -117 83 -199.5t199 -82.5t199 82.5t83 199.5q0 116 -83 198.5t-199 82.5zM1380 646q-105 2 -211 0v1q-1 -27 2.5 -86
+t13.5 -66q29 -14 93.5 -14.5t95.5 10.5q9 3 11 39t-0.5 69.5t-4.5 46.5zM1112 447q8 4 9.5 48t-0.5 88t-4 63v1q-212 -3 -214 -3q-4 -20 -7 -62t0 -83t14 -46q34 -15 101 -16t101 10zM718 636q-16 -59 4.5 -118.5t77.5 -84.5q15 -8 24 -5t12 21q3 16 8 90t10 103
+q-69 -2 -136 -6zM591 510q3 -23 -34 -36q132 -141 271.5 -240t305.5 -154q172 49 310.5 146t293.5 250q-33 13 -30 34q0 2 0.5 3.5t1.5 3t1 2.5v1v-1q-17 2 -50 5.5t-48 4.5q-26 -90 -82 -132q-51 -38 -82 1q-5 6 -9 14q-7 13 -17 62q-2 -5 -5 -9t-7.5 -7t-8 -5.5t-9.5 -4
+l-10 -2.5t-12 -2l-12 -1.5t-13.5 -1t-13.5 -0.5q-106 -9 -163 11q-4 -17 -10 -26.5t-21 -15t-23 -7t-36 -3.5q-6 -1 -9 -1q-179 -17 -203 40q-2 -63 -56 -54q-47 8 -91 54q-12 13 -20 26q-17 29 -26 65q-58 -6 -87 -10q1 -2 4 -10zM507 -118q3 14 3 30q-17 71 -51 130
+t-73 70q-41 12 -101.5 -14.5t-104.5 -80t-39 -107.5q35 -53 100 -93t119 -42q51 -2 94 28t53 79zM510 53q23 -63 27 -119q195 113 392 174q-98 52 -180.5 120t-179.5 165q-6 -4 -29 -13q0 -1 -1 -4t-1 -5q31 -18 22 -37q-12 -23 -56 -34q-10 -13 -29 -24h-1q-2 -83 1 -150
+q19 -34 35 -73zM579 -113q532 -21 1145 0q-254 147 -428 196q-76 -35 -156 -57q-8 -3 -16 0q-65 21 -129 49q-208 -60 -416 -188h-1v-1q1 0 1 1zM1763 -67q4 54 28 120q14 38 33 71l-1 -1q3 77 3 153q-15 8 -30 25q-42 9 -56 33q-9 20 22 38q-2 4 -2 9q-16 4 -28 12
+q-204 -190 -383 -284q198 -59 414 -176zM2155 -90q5 54 -39 107.5t-104 80t-102 14.5q-38 -11 -72.5 -70.5t-51.5 -129.5q0 -16 3 -30q10 -49 53 -79t94 -28q54 2 119 42t100 93z" />
+    <glyph glyph-name="_538" unicode="&#xf23d;" horiz-adv-x="2304" 
+d="M1524 -25q0 -68 -48 -116t-116 -48t-116.5 48t-48.5 116t48.5 116.5t116.5 48.5t116 -48.5t48 -116.5zM775 -25q0 -68 -48.5 -116t-116.5 -48t-116 48t-48 116t48 116.5t116 48.5t116.5 -48.5t48.5 -116.5zM0 1469q57 -60 110.5 -104.5t121 -82t136 -63t166 -45.5
+t200 -31.5t250 -18.5t304 -9.5t372.5 -2.5q139 0 244.5 -5t181 -16.5t124 -27.5t71 -39.5t24 -51.5t-19.5 -64t-56.5 -76.5t-89.5 -91t-116 -104.5t-139 -119q-185 -157 -286 -247q29 51 76.5 109t94 105.5t94.5 98.5t83 91.5t54 80.5t13 70t-45.5 55.5t-116.5 41t-204 23.5
+t-304 5q-168 -2 -314 6t-256 23t-204.5 41t-159.5 51.5t-122.5 62.5t-91.5 66.5t-68 71.5t-50.5 69.5t-40 68t-36.5 59.5z" />
+    <glyph glyph-name="_539" unicode="&#xf23e;" horiz-adv-x="1792" 
+d="M896 1472q-169 0 -323 -66t-265.5 -177.5t-177.5 -265.5t-66 -323t66 -323t177.5 -265.5t265.5 -177.5t323 -66t323 66t265.5 177.5t177.5 265.5t66 323t-66 323t-177.5 265.5t-265.5 177.5t-323 66zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348
+t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM496 704q16 0 16 -16v-480q0 -16 -16 -16h-32q-16 0 -16 16v480q0 16 16 16h32zM896 640q53 0 90.5 -37.5t37.5 -90.5q0 -35 -17.5 -64t-46.5 -46v-114q0 -14 -9 -23
+t-23 -9h-64q-14 0 -23 9t-9 23v114q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5zM896 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM544 928v-96
+q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 93 65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5v-96q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 146 -103 249t-249 103t-249 -103t-103 -249zM1408 192v512q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-512
+q0 -26 19 -45t45 -19h896q26 0 45 19t19 45z" />
+    <glyph glyph-name="_540" unicode="&#xf240;" horiz-adv-x="2304" 
+d="M1920 1024v-768h-1664v768h1664zM2048 448h128v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288zM2304 832v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113
+v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="_541" unicode="&#xf241;" horiz-adv-x="2304" 
+d="M256 256v768h1280v-768h-1280zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_542" unicode="&#xf242;" horiz-adv-x="2304" 
+d="M256 256v768h896v-768h-896zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_543" unicode="&#xf243;" horiz-adv-x="2304" 
+d="M256 256v768h512v-768h-512zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_544" unicode="&#xf244;" horiz-adv-x="2304" 
+d="M2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23
+v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_545" unicode="&#xf245;" horiz-adv-x="1280" 
+d="M1133 493q31 -30 14 -69q-17 -40 -59 -40h-382l201 -476q10 -25 0 -49t-34 -35l-177 -75q-25 -10 -49 0t-35 34l-191 452l-312 -312q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v1504q0 42 40 59q12 5 24 5q27 0 45 -19z" />
+    <glyph glyph-name="_546" unicode="&#xf246;" horiz-adv-x="1024" 
+d="M832 1408q-320 0 -320 -224v-416h128v-128h-128v-544q0 -224 320 -224h64v-128h-64q-272 0 -384 146q-112 -146 -384 -146h-64v128h64q320 0 320 224v544h-128v128h128v416q0 224 -320 224h-64v128h64q272 0 384 -146q112 146 384 146h64v-128h-64z" />
+    <glyph glyph-name="_547" unicode="&#xf247;" horiz-adv-x="2048" 
+d="M2048 1152h-128v-1024h128v-384h-384v128h-1280v-128h-384v384h128v1024h-128v384h384v-128h1280v128h384v-384zM1792 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 -128v128h-128v-128h128zM1664 0v128h128v1024h-128v128h-1280v-128h-128v-1024h128v-128
+h1280zM1920 -128v128h-128v-128h128zM1280 896h384v-768h-896v256h-384v768h896v-256zM512 512h640v512h-640v-512zM1536 256v512h-256v-384h-384v-128h640z" />
+    <glyph glyph-name="_548" unicode="&#xf248;" horiz-adv-x="2304" 
+d="M2304 768h-128v-640h128v-384h-384v128h-896v-128h-384v384h128v128h-384v-128h-384v384h128v640h-128v384h384v-128h896v128h384v-384h-128v-128h384v128h384v-384zM2048 1024v-128h128v128h-128zM1408 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 256
+v128h-128v-128h128zM1536 384h-128v-128h128v128zM384 384h896v128h128v640h-128v128h-896v-128h-128v-640h128v-128zM896 -128v128h-128v-128h128zM2176 -128v128h-128v-128h128zM2048 128v640h-128v128h-384v-384h128v-384h-384v128h-384v-128h128v-128h896v128h128z" />
+    <glyph glyph-name="_549" unicode="&#xf249;" 
+d="M1024 288v-416h-928q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68v-928h-416q-40 0 -68 -28t-28 -68zM1152 256h381q-15 -82 -65 -132l-184 -184q-50 -50 -132 -65v381z" />
+    <glyph glyph-name="_550" unicode="&#xf24a;" 
+d="M1400 256h-248v-248q29 10 41 22l185 185q12 12 22 41zM1120 384h288v896h-1280v-1280h896v288q0 40 28 68t68 28zM1536 1312v-1024q0 -40 -20 -88t-48 -76l-184 -184q-28 -28 -76 -48t-88 -20h-1024q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68
+z" />
+    <glyph glyph-name="_551" unicode="&#xf24b;" horiz-adv-x="2304" 
+d="M1951 538q0 -26 -15.5 -44.5t-38.5 -23.5q-8 -2 -18 -2h-153v140h153q10 0 18 -2q23 -5 38.5 -23.5t15.5 -44.5zM1933 751q0 -25 -15 -42t-38 -21q-3 -1 -15 -1h-139v129h139q3 0 8.5 -0.5t6.5 -0.5q23 -4 38 -21.5t15 -42.5zM728 587v308h-228v-308q0 -58 -38 -94.5
+t-105 -36.5q-108 0 -229 59v-112q53 -15 121 -23t109 -9l42 -1q328 0 328 217zM1442 403v113q-99 -52 -200 -59q-108 -8 -169 41t-61 142t61 142t169 41q101 -7 200 -58v112q-48 12 -100 19.5t-80 9.5l-28 2q-127 6 -218.5 -14t-140.5 -60t-71 -88t-22 -106t22 -106t71 -88
+t140.5 -60t218.5 -14q101 4 208 31zM2176 518q0 54 -43 88.5t-109 39.5v3q57 8 89 41.5t32 79.5q0 55 -41 88t-107 36q-3 0 -12 0.5t-14 0.5h-455v-510h491q74 0 121.5 36.5t47.5 96.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90
+t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_552" unicode="&#xf24c;" horiz-adv-x="2304" 
+d="M858 295v693q-106 -41 -172 -135.5t-66 -211.5t66 -211.5t172 -134.5zM1362 641q0 117 -66 211.5t-172 135.5v-694q106 41 172 135.5t66 211.5zM1577 641q0 -159 -78.5 -294t-213.5 -213.5t-294 -78.5q-119 0 -227.5 46.5t-187 125t-125 187t-46.5 227.5q0 159 78.5 294
+t213.5 213.5t294 78.5t294 -78.5t213.5 -213.5t78.5 -294zM1960 634q0 139 -55.5 261.5t-147.5 205.5t-213.5 131t-252.5 48h-301q-176 0 -323.5 -81t-235 -230t-87.5 -335q0 -171 87 -317.5t236 -231.5t323 -85h301q129 0 251.5 50.5t214.5 135t147.5 202.5t55.5 246z
+M2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_553" unicode="&#xf24d;" horiz-adv-x="1792" 
+d="M1664 -96v1088q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5zM1792 992v-1088q0 -66 -47 -113t-113 -47h-1088q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113
+zM1408 1376v-160h-128v160q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h160v-128h-160q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="_554" unicode="&#xf24e;" horiz-adv-x="2304" 
+d="M1728 1088l-384 -704h768zM448 1088l-384 -704h768zM1269 1280q-14 -40 -45.5 -71.5t-71.5 -45.5v-1291h608q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1344q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h608v1291q-40 14 -71.5 45.5t-45.5 71.5h-491q-14 0 -23 9t-9 23v64
+q0 14 9 23t23 9h491q21 57 70 92.5t111 35.5t111 -35.5t70 -92.5h491q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-491zM1088 1264q33 0 56.5 23.5t23.5 56.5t-23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5zM2176 384q0 -73 -46.5 -131t-117.5 -91
+t-144.5 -49.5t-139.5 -16.5t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81zM896 384q0 -73 -46.5 -131t-117.5 -91t-144.5 -49.5t-139.5 -16.5
+t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81z" />
+    <glyph glyph-name="_555" unicode="&#xf250;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-77 -29 -149 -92.5
+t-129.5 -152.5t-92.5 -210t-35 -253h1024q0 132 -35 253t-92.5 210t-129.5 152.5t-149 92.5q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+    <glyph glyph-name="_556" unicode="&#xf251;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -66 9 -128h1006q9 61 9 128zM1280 -128q0 130 -34 249.5t-90.5 208t-126.5 152t-146 94.5h-230q-76 -31 -146 -94.5t-126.5 -152t-90.5 -208t-34 -249.5h1024z" />
+    <glyph glyph-name="_557" unicode="&#xf252;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -206 85 -384h854q85 178 85 384zM1223 192q-54 141 -145.5 241.5t-194.5 142.5h-230q-103 -42 -194.5 -142.5t-145.5 -241.5h910z" />
+    <glyph glyph-name="_558" unicode="&#xf253;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-137 -51 -244 -196
+h700q-107 145 -244 196q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+    <glyph glyph-name="_559" unicode="&#xf254;" 
+d="M1504 -64q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472zM130 0q3 55 16 107t30 95t46 87t53.5 76t64.5 69.5t66 60t70.5 55t66.5 47.5t65 43q-43 28 -65 43t-66.5 47.5t-70.5 55t-66 60t-64.5 69.5t-53.5 76t-46 87
+t-30 95t-16 107h1276q-3 -55 -16 -107t-30 -95t-46 -87t-53.5 -76t-64.5 -69.5t-66 -60t-70.5 -55t-66.5 -47.5t-65 -43q43 -28 65 -43t66.5 -47.5t70.5 -55t66 -60t64.5 -69.5t53.5 -76t46 -87t30 -95t16 -107h-1276zM1504 1536q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9
+h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472z" />
+    <glyph glyph-name="_560" unicode="&#xf255;" 
+d="M768 1152q-53 0 -90.5 -37.5t-37.5 -90.5v-128h-32v93q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-429l-32 30v172q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-224q0 -47 35 -82l310 -296q39 -39 39 -102q0 -26 19 -45t45 -19h640q26 0 45 19t19 45v25
+q0 41 10 77l108 436q10 36 10 77v246q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-32h-32v125q0 40 -25 72.5t-64 40.5q-14 2 -23 2q-46 0 -79 -33t-33 -79v-128h-32v122q0 51 -32.5 89.5t-82.5 43.5q-5 1 -13 1zM768 1280q84 0 149 -50q57 34 123 34q59 0 111 -27
+t86 -76q27 7 59 7q100 0 170 -71.5t70 -171.5v-246q0 -51 -13 -108l-109 -436q-6 -24 -6 -71q0 -80 -56 -136t-136 -56h-640q-84 0 -138 58.5t-54 142.5l-308 296q-76 73 -76 175v224q0 99 70.5 169.5t169.5 70.5q11 0 16 -1q6 95 75.5 160t164.5 65q52 0 98 -21
+q72 69 174 69z" />
+    <glyph glyph-name="_561" unicode="&#xf256;" horiz-adv-x="1792" 
+d="M880 1408q-46 0 -79 -33t-33 -79v-656h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528v-256l-154 205q-38 51 -102 51q-53 0 -90.5 -37.5t-37.5 -90.5q0 -43 26 -77l384 -512q38 -51 102 -51h688q34 0 61 22t34 56l76 405q5 32 5 59v498q0 46 -33 79t-79 33t-79 -33
+t-33 -79v-272h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528h-32v656q0 46 -33 79t-79 33zM880 1536q68 0 125.5 -35.5t88.5 -96.5q19 4 42 4q99 0 169.5 -70.5t70.5 -169.5v-17q105 6 180.5 -64t75.5 -175v-498q0 -40 -8 -83l-76 -404q-14 -79 -76.5 -131t-143.5 -52
+h-688q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 106 75 181t181 75q78 0 128 -34v434q0 99 70.5 169.5t169.5 70.5q23 0 42 -4q31 61 88.5 96.5t125.5 35.5z" />
+    <glyph glyph-name="_562" unicode="&#xf257;" horiz-adv-x="1792" 
+d="M1073 -128h-177q-163 0 -226 141q-23 49 -23 102v5q-62 30 -98.5 88.5t-36.5 127.5q0 38 5 48h-261q-106 0 -181 75t-75 181t75 181t181 75h113l-44 17q-74 28 -119.5 93.5t-45.5 145.5q0 106 75 181t181 75q46 0 91 -17l628 -239h401q106 0 181 -75t75 -181v-668
+q0 -88 -54 -157.5t-140 -90.5l-339 -85q-92 -23 -186 -23zM1024 583l-155 -71l-163 -74q-30 -14 -48 -41.5t-18 -60.5q0 -46 33 -79t79 -33q26 0 46 10l338 154q-49 10 -80.5 50t-31.5 90v55zM1344 272q0 46 -33 79t-79 33q-26 0 -46 -10l-290 -132q-28 -13 -37 -17
+t-30.5 -17t-29.5 -23.5t-16 -29t-8 -40.5q0 -50 31.5 -82t81.5 -32q20 0 38 9l352 160q30 14 48 41.5t18 60.5zM1112 1024l-650 248q-24 8 -46 8q-53 0 -90.5 -37.5t-37.5 -90.5q0 -40 22.5 -73t59.5 -47l526 -200v-64h-640q-53 0 -90.5 -37.5t-37.5 -90.5t37.5 -90.5
+t90.5 -37.5h535l233 106v198q0 63 46 106l111 102h-69zM1073 0q82 0 155 19l339 85q43 11 70 45.5t27 78.5v668q0 53 -37.5 90.5t-90.5 37.5h-308l-136 -126q-36 -33 -36 -82v-296q0 -46 33 -77t79 -31t79 35t33 81v208h32v-208q0 -70 -57 -114q52 -8 86.5 -48.5t34.5 -93.5
+q0 -42 -23 -78t-61 -53l-310 -141h91z" />
+    <glyph glyph-name="_563" unicode="&#xf258;" horiz-adv-x="2048" 
+d="M1151 1536q61 0 116 -28t91 -77l572 -781q118 -159 118 -359v-355q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v177l-286 143h-546q-80 0 -136 56t-56 136v32q0 119 84.5 203.5t203.5 84.5h420l42 128h-686q-100 0 -173.5 67.5t-81.5 166.5q-65 79 -65 182v32
+q0 80 56 136t136 56h959zM1920 -64v355q0 157 -93 284l-573 781q-39 52 -103 52h-959q-26 0 -45 -19t-19 -45q0 -32 1.5 -49.5t9.5 -40.5t25 -43q10 31 35.5 50t56.5 19h832v-32h-832q-26 0 -45 -19t-19 -45q0 -44 3 -58q8 -44 44 -73t81 -29h640h91q40 0 68 -28t28 -68
+q0 -15 -5 -30l-64 -192q-10 -29 -35 -47.5t-56 -18.5h-443q-66 0 -113 -47t-47 -113v-32q0 -26 19 -45t45 -19h561q16 0 29 -7l317 -158q24 -13 38.5 -36t14.5 -50v-197q0 -26 19 -45t45 -19h384q26 0 45 19t19 45z" />
+    <glyph glyph-name="_564" unicode="&#xf259;" horiz-adv-x="2048" 
+d="M459 -256q-77 0 -137.5 47.5t-79.5 122.5l-101 401q-13 57 -13 108q0 45 -5 67l-116 477q-7 27 -7 57q0 93 62 161t155 78q17 85 82.5 139t152.5 54q83 0 148 -51.5t85 -132.5l83 -348l103 428q20 81 85 132.5t148 51.5q89 0 155.5 -57.5t80.5 -144.5q92 -10 152 -79
+t60 -162q0 -24 -7 -59l-123 -512q10 7 37.5 28.5t38.5 29.5t35 23t41 20.5t41.5 11t49.5 5.5q105 0 180 -74t75 -179q0 -62 -28.5 -118t-78.5 -94l-507 -380q-68 -51 -153 -51h-694zM1104 1408q-38 0 -68.5 -24t-39.5 -62l-164 -682h-127l-145 602q-9 38 -39.5 62t-68.5 24
+q-48 0 -80 -33t-32 -80q0 -15 3 -28l132 -547h-26l-99 408q-9 37 -40 62.5t-69 25.5q-47 0 -80 -33t-33 -79q0 -14 3 -26l116 -478q7 -28 9 -86t10 -88l100 -401q8 -32 34 -52.5t59 -20.5h694q42 0 76 26l507 379q56 43 56 110q0 52 -37.5 88.5t-89.5 36.5q-43 0 -77 -26
+l-307 -230v227q0 4 32 138t68 282t39 161q4 18 4 29q0 47 -32 81t-79 34q-39 0 -69.5 -24t-39.5 -62l-116 -482h-26l150 624q3 14 3 28q0 48 -31.5 82t-79.5 34z" />
+    <glyph glyph-name="_565" unicode="&#xf25a;" horiz-adv-x="1792" 
+d="M640 1408q-53 0 -90.5 -37.5t-37.5 -90.5v-512v-384l-151 202q-41 54 -107 54q-52 0 -89 -38t-37 -90q0 -43 26 -77l384 -512q38 -51 102 -51h718q22 0 39.5 13.5t22.5 34.5l92 368q24 96 24 194v217q0 41 -28 71t-68 30t-68 -28t-28 -68h-32v61q0 48 -32 81.5t-80 33.5
+q-46 0 -79 -33t-33 -79v-64h-32v90q0 55 -37 94.5t-91 39.5q-53 0 -90.5 -37.5t-37.5 -90.5v-96h-32v570q0 55 -37 94.5t-91 39.5zM640 1536q107 0 181.5 -77.5t74.5 -184.5v-220q22 2 32 2q99 0 173 -69q47 21 99 21q113 0 184 -87q27 7 56 7q94 0 159 -67.5t65 -161.5
+v-217q0 -116 -28 -225l-92 -368q-16 -64 -68 -104.5t-118 -40.5h-718q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 105 74.5 180.5t179.5 75.5q71 0 130 -35v547q0 106 75 181t181 75zM768 128v384h-32v-384h32zM1024 128v384h-32v-384h32zM1280 128v384h-32
+v-384h32z" />
+    <glyph glyph-name="_566" unicode="&#xf25b;" 
+d="M1288 889q60 0 107 -23q141 -63 141 -226v-177q0 -94 -23 -186l-85 -339q-21 -86 -90.5 -140t-157.5 -54h-668q-106 0 -181 75t-75 181v401l-239 628q-17 45 -17 91q0 106 75 181t181 75q80 0 145.5 -45.5t93.5 -119.5l17 -44v113q0 106 75 181t181 75t181 -75t75 -181
+v-261q27 5 48 5q69 0 127.5 -36.5t88.5 -98.5zM1072 896q-33 0 -60.5 -18t-41.5 -48l-74 -163l-71 -155h55q50 0 90 -31.5t50 -80.5l154 338q10 20 10 46q0 46 -33 79t-79 33zM1293 761q-22 0 -40.5 -8t-29 -16t-23.5 -29.5t-17 -30.5t-17 -37l-132 -290q-10 -20 -10 -46
+q0 -46 33 -79t79 -33q33 0 60.5 18t41.5 48l160 352q9 18 9 38q0 50 -32 81.5t-82 31.5zM128 1120q0 -22 8 -46l248 -650v-69l102 111q43 46 106 46h198l106 233v535q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5v-640h-64l-200 526q-14 37 -47 59.5t-73 22.5
+q-53 0 -90.5 -37.5t-37.5 -90.5zM1180 -128q44 0 78.5 27t45.5 70l85 339q19 73 19 155v91l-141 -310q-17 -38 -53 -61t-78 -23q-53 0 -93.5 34.5t-48.5 86.5q-44 -57 -114 -57h-208v32h208q46 0 81 33t35 79t-31 79t-77 33h-296q-49 0 -82 -36l-126 -136v-308
+q0 -53 37.5 -90.5t90.5 -37.5h668z" />
+    <glyph glyph-name="_567" unicode="&#xf25c;" horiz-adv-x="1973" 
+d="M857 992v-117q0 -13 -9.5 -22t-22.5 -9h-298v-812q0 -13 -9 -22.5t-22 -9.5h-135q-13 0 -22.5 9t-9.5 23v812h-297q-13 0 -22.5 9t-9.5 22v117q0 14 9 23t23 9h793q13 0 22.5 -9.5t9.5 -22.5zM1895 995l77 -961q1 -13 -8 -24q-10 -10 -23 -10h-134q-12 0 -21 8.5
+t-10 20.5l-46 588l-189 -425q-8 -19 -29 -19h-120q-20 0 -29 19l-188 427l-45 -590q-1 -12 -10 -20.5t-21 -8.5h-135q-13 0 -23 10q-9 10 -9 24l78 961q1 12 10 20.5t21 8.5h142q20 0 29 -19l220 -520q10 -24 20 -51q3 7 9.5 24.5t10.5 26.5l221 520q9 19 29 19h141
+q13 0 22 -8.5t10 -20.5z" />
+    <glyph glyph-name="_568" unicode="&#xf25d;" horiz-adv-x="1792" 
+d="M1042 833q0 88 -60 121q-33 18 -117 18h-123v-281h162q66 0 102 37t36 105zM1094 548l205 -373q8 -17 -1 -31q-8 -16 -27 -16h-152q-20 0 -28 17l-194 365h-155v-350q0 -14 -9 -23t-23 -9h-134q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h294q128 0 190 -24q85 -31 134 -109
+t49 -180q0 -92 -42.5 -165.5t-115.5 -109.5q6 -10 9 -16zM896 1376q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM1792 640
+q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_569" unicode="&#xf25e;" horiz-adv-x="1792" 
+d="M605 303q153 0 257 104q14 18 3 36l-45 82q-6 13 -24 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78
+q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-148 0 -246 -96.5t-98 -240.5q0 -146 97 -241.5t247 -95.5zM1235 303q153 0 257 104q14 18 4 36l-45 82q-8 14 -25 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5
+t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-147 0 -245.5 -96.5t-98.5 -240.5q0 -146 97 -241.5t247 -95.5zM896 1376
+q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191
+t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71z" />
+    <glyph glyph-name="f260" unicode="&#xf260;" horiz-adv-x="2048" 
+d="M736 736l384 -384l-384 -384l-672 672l672 672l168 -168l-96 -96l-72 72l-480 -480l480 -480l193 193l-289 287zM1312 1312l672 -672l-672 -672l-168 168l96 96l72 -72l480 480l-480 480l-193 -193l289 -287l-96 -96l-384 384z" />
+    <glyph glyph-name="f261" unicode="&#xf261;" horiz-adv-x="1792" 
+d="M717 182l271 271l-279 279l-88 -88l192 -191l-96 -96l-279 279l279 279l40 -40l87 87l-127 128l-454 -454zM1075 190l454 454l-454 454l-271 -271l279 -279l88 88l-192 191l96 96l279 -279l-279 -279l-40 40l-87 -88zM1792 640q0 -182 -71 -348t-191 -286t-286 -191
+t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_572" unicode="&#xf262;" horiz-adv-x="2304" 
+d="M651 539q0 -39 -27.5 -66.5t-65.5 -27.5q-39 0 -66.5 27.5t-27.5 66.5q0 38 27.5 65.5t66.5 27.5q38 0 65.5 -27.5t27.5 -65.5zM1805 540q0 -39 -27.5 -66.5t-66.5 -27.5t-66.5 27.5t-27.5 66.5t27.5 66t66.5 27t66.5 -27t27.5 -66zM765 539q0 79 -56.5 136t-136.5 57
+t-136.5 -56.5t-56.5 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM1918 540q0 80 -56.5 136.5t-136.5 56.5q-79 0 -136 -56.5t-57 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM850 539q0 -116 -81.5 -197.5t-196.5 -81.5q-116 0 -197.5 82t-81.5 197
+t82 196.5t197 81.5t196.5 -81.5t81.5 -196.5zM2004 540q0 -115 -81.5 -196.5t-197.5 -81.5q-115 0 -196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5q116 0 197.5 -81.5t81.5 -196.5zM1040 537q0 191 -135.5 326.5t-326.5 135.5q-125 0 -231 -62t-168 -168.5t-62 -231.5
+t62 -231.5t168 -168.5t231 -62q191 0 326.5 135.5t135.5 326.5zM1708 1110q-254 111 -556 111q-319 0 -573 -110q117 0 223 -45.5t182.5 -122.5t122 -183t45.5 -223q0 115 43.5 219.5t118 180.5t177.5 123t217 50zM2187 537q0 191 -135 326.5t-326 135.5t-326.5 -135.5
+t-135.5 -326.5t135.5 -326.5t326.5 -135.5t326 135.5t135 326.5zM1921 1103h383q-44 -51 -75 -114.5t-40 -114.5q110 -151 110 -337q0 -156 -77 -288t-209 -208.5t-287 -76.5q-133 0 -249 56t-196 155q-47 -56 -129 -179q-11 22 -53.5 82.5t-74.5 97.5
+q-80 -99 -196.5 -155.5t-249.5 -56.5q-155 0 -287 76.5t-209 208.5t-77 288q0 186 110 337q-9 51 -40 114.5t-75 114.5h365q149 100 355 156.5t432 56.5q224 0 421 -56t348 -157z" />
+    <glyph glyph-name="f263" unicode="&#xf263;" horiz-adv-x="1280" 
+d="M640 629q-188 0 -321 133t-133 320q0 188 133 321t321 133t321 -133t133 -321q0 -187 -133 -320t-321 -133zM640 1306q-92 0 -157.5 -65.5t-65.5 -158.5q0 -92 65.5 -157.5t157.5 -65.5t157.5 65.5t65.5 157.5q0 93 -65.5 158.5t-157.5 65.5zM1163 574q13 -27 15 -49.5
+t-4.5 -40.5t-26.5 -38.5t-42.5 -37t-61.5 -41.5q-115 -73 -315 -94l73 -72l267 -267q30 -31 30 -74t-30 -73l-12 -13q-31 -30 -74 -30t-74 30q-67 68 -267 268l-267 -268q-31 -30 -74 -30t-73 30l-12 13q-31 30 -31 73t31 74l267 267l72 72q-203 21 -317 94
+q-39 25 -61.5 41.5t-42.5 37t-26.5 38.5t-4.5 40.5t15 49.5q10 20 28 35t42 22t56 -2t65 -35q5 -4 15 -11t43 -24.5t69 -30.5t92 -24t113 -11q91 0 174 25.5t120 50.5l38 25q33 26 65 35t56 2t42 -22t28 -35z" />
+    <glyph glyph-name="_574" unicode="&#xf264;" 
+d="M927 956q0 -66 -46.5 -112.5t-112.5 -46.5t-112.5 46.5t-46.5 112.5t46.5 112.5t112.5 46.5t112.5 -46.5t46.5 -112.5zM1141 593q-10 20 -28 32t-47.5 9.5t-60.5 -27.5q-10 -8 -29 -20t-81 -32t-127 -20t-124 18t-86 36l-27 18q-31 25 -60.5 27.5t-47.5 -9.5t-28 -32
+q-22 -45 -2 -74.5t87 -73.5q83 -53 226 -67l-51 -52q-142 -142 -191 -190q-22 -22 -22 -52.5t22 -52.5l9 -9q22 -22 52.5 -22t52.5 22l191 191q114 -115 191 -191q22 -22 52.5 -22t52.5 22l9 9q22 22 22 52.5t-22 52.5l-191 190l-52 52q141 14 225 67q67 44 87 73.5t-2 74.5
+zM1092 956q0 134 -95 229t-229 95t-229 -95t-95 -229t95 -229t229 -95t229 95t95 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_575" unicode="&#xf265;" horiz-adv-x="1720" 
+d="M1565 1408q65 0 110 -45.5t45 -110.5v-519q0 -176 -68 -336t-182.5 -275t-274 -182.5t-334.5 -67.5q-176 0 -335.5 67.5t-274.5 182.5t-183 275t-68 336v519q0 64 46 110t110 46h1409zM861 344q47 0 82 33l404 388q37 35 37 85q0 49 -34.5 83.5t-83.5 34.5q-47 0 -82 -33
+l-323 -310l-323 310q-35 33 -81 33q-49 0 -83.5 -34.5t-34.5 -83.5q0 -51 36 -85l405 -388q33 -33 81 -33z" />
+    <glyph glyph-name="_576" unicode="&#xf266;" horiz-adv-x="2304" 
+d="M1494 -103l-295 695q-25 -49 -158.5 -305.5t-198.5 -389.5q-1 -1 -27.5 -0.5t-26.5 1.5q-82 193 -255.5 587t-259.5 596q-21 50 -66.5 107.5t-103.5 100.5t-102 43q0 5 -0.5 24t-0.5 27h583v-50q-39 -2 -79.5 -16t-66.5 -43t-10 -64q26 -59 216.5 -499t235.5 -540
+q31 61 140 266.5t131 247.5q-19 39 -126 281t-136 295q-38 69 -201 71v50l513 -1v-47q-60 -2 -93.5 -25t-12.5 -69q33 -70 87 -189.5t86 -187.5q110 214 173 363q24 55 -10 79.5t-129 26.5q1 7 1 25v24q64 0 170.5 0.5t180 1t92.5 0.5v-49q-62 -2 -119 -33t-90 -81
+l-213 -442q13 -33 127.5 -290t121.5 -274l441 1017q-14 38 -49.5 62.5t-65 31.5t-55.5 8v50l460 -4l1 -2l-1 -44q-139 -4 -201 -145q-526 -1216 -559 -1291h-49z" />
+    <glyph glyph-name="_577" unicode="&#xf267;" horiz-adv-x="1792" 
+d="M949 643q0 -26 -16.5 -45t-41.5 -19q-26 0 -45 16.5t-19 41.5q0 26 17 45t42 19t44 -16.5t19 -41.5zM964 585l350 581q-9 -8 -67.5 -62.5t-125.5 -116.5t-136.5 -127t-117 -110.5t-50.5 -51.5l-349 -580q7 7 67 62t126 116.5t136 127t117 111t50 50.5zM1611 640
+q0 -201 -104 -371q-3 2 -17 11t-26.5 16.5t-16.5 7.5q-13 0 -13 -13q0 -10 59 -44q-74 -112 -184.5 -190.5t-241.5 -110.5l-16 67q-1 10 -15 10q-5 0 -8 -5.5t-2 -9.5l16 -68q-72 -15 -146 -15q-199 0 -372 105q1 2 13 20.5t21.5 33.5t9.5 19q0 13 -13 13q-6 0 -17 -14.5
+t-22.5 -34.5t-13.5 -23q-113 75 -192 187.5t-110 244.5l69 15q10 3 10 15q0 5 -5.5 8t-10.5 2l-68 -15q-14 72 -14 139q0 206 109 379q2 -1 18.5 -12t30 -19t17.5 -8q13 0 13 12q0 6 -12.5 15.5t-32.5 21.5l-20 12q77 112 189 189t244 107l15 -67q2 -10 15 -10q5 0 8 5.5
+t2 10.5l-15 66q71 13 134 13q204 0 379 -109q-39 -56 -39 -65q0 -13 12 -13q11 0 48 64q111 -75 187.5 -186t107.5 -241l-56 -12q-10 -2 -10 -16q0 -5 5.5 -8t9.5 -2l57 13q14 -72 14 -140zM1696 640q0 163 -63.5 311t-170.5 255t-255 170.5t-311 63.5t-311 -63.5
+t-255 -170.5t-170.5 -255t-63.5 -311t63.5 -311t170.5 -255t255 -170.5t311 -63.5t311 63.5t255 170.5t170.5 255t63.5 311zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191
+t191 -286t71 -348z" />
+    <glyph glyph-name="_578" unicode="&#xf268;" horiz-adv-x="1792" 
+d="M893 1536q240 2 451 -120q232 -134 352 -372l-742 39q-160 9 -294 -74.5t-185 -229.5l-276 424q128 159 311 245.5t383 87.5zM146 1131l337 -663q72 -143 211 -217t293 -45l-230 -451q-212 33 -385 157.5t-272.5 316t-99.5 411.5q0 267 146 491zM1732 962
+q58 -150 59.5 -310.5t-48.5 -306t-153 -272t-246 -209.5q-230 -133 -498 -119l405 623q88 131 82.5 290.5t-106.5 277.5zM896 942q125 0 213.5 -88.5t88.5 -213.5t-88.5 -213.5t-213.5 -88.5t-213.5 88.5t-88.5 213.5t88.5 213.5t213.5 88.5z" />
+    <glyph glyph-name="_579" unicode="&#xf269;" horiz-adv-x="1792" 
+d="M903 -256q-283 0 -504.5 150.5t-329.5 398.5q-58 131 -67 301t26 332.5t111 312t179 242.5l-11 -281q11 14 68 15.5t70 -15.5q42 81 160.5 138t234.5 59q-54 -45 -119.5 -148.5t-58.5 -163.5q25 -8 62.5 -13.5t63 -7.5t68 -4t50.5 -3q15 -5 9.5 -45.5t-30.5 -75.5
+q-5 -7 -16.5 -18.5t-56.5 -35.5t-101 -34l15 -189l-139 67q-18 -43 -7.5 -81.5t36 -66.5t65.5 -41.5t81 -6.5q51 9 98 34.5t83.5 45t73.5 17.5q61 -4 89.5 -33t19.5 -65q-1 -2 -2.5 -5.5t-8.5 -12.5t-18 -15.5t-31.5 -10.5t-46.5 -1q-60 -95 -144.5 -135.5t-209.5 -29.5
+q74 -61 162.5 -82.5t168.5 -6t154.5 52t128 87.5t80.5 104q43 91 39 192.5t-37.5 188.5t-78.5 125q87 -38 137 -79.5t77 -112.5q15 170 -57.5 343t-209.5 284q265 -77 412 -279.5t151 -517.5q2 -127 -40.5 -255t-123.5 -238t-189 -196t-247.5 -135.5t-288.5 -49.5z" />
+    <glyph glyph-name="_580" unicode="&#xf26a;" horiz-adv-x="1792" 
+d="M1493 1308q-165 110 -359 110q-155 0 -293 -73t-240 -200q-75 -93 -119.5 -218t-48.5 -266v-42q4 -141 48.5 -266t119.5 -218q102 -127 240 -200t293 -73q194 0 359 110q-121 -108 -274.5 -168t-322.5 -60q-29 0 -43 1q-175 8 -333 82t-272 193t-181 281t-67 339
+q0 182 71 348t191 286t286 191t348 71h3q168 -1 320.5 -60.5t273.5 -167.5zM1792 640q0 -192 -77 -362.5t-213 -296.5q-104 -63 -222 -63q-137 0 -255 84q154 56 253.5 233t99.5 405q0 227 -99 404t-253 234q119 83 254 83q119 0 226 -65q135 -125 210.5 -295t75.5 -361z
+" />
+    <glyph glyph-name="_581" unicode="&#xf26b;" horiz-adv-x="1792" 
+d="M1792 599q0 -56 -7 -104h-1151q0 -146 109.5 -244.5t257.5 -98.5q99 0 185.5 46.5t136.5 130.5h423q-56 -159 -170.5 -281t-267.5 -188.5t-321 -66.5q-187 0 -356 83q-228 -116 -394 -116q-237 0 -237 263q0 115 45 275q17 60 109 229q199 360 475 606
+q-184 -79 -427 -354q63 274 283.5 449.5t501.5 175.5q30 0 45 -1q255 117 433 117q64 0 116 -13t94.5 -40.5t66.5 -76.5t24 -115q0 -116 -75 -286q101 -182 101 -390zM1722 1239q0 83 -53 132t-137 49q-108 0 -254 -70q121 -47 222.5 -131.5t170.5 -195.5q51 135 51 216z
+M128 2q0 -86 48.5 -132.5t134.5 -46.5q115 0 266 83q-122 72 -213.5 183t-137.5 245q-98 -205 -98 -332zM632 715h728q-5 142 -113 237t-251 95q-144 0 -251.5 -95t-112.5 -237z" />
+    <glyph glyph-name="_582" unicode="&#xf26c;" horiz-adv-x="2048" 
+d="M1792 288v960q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1248v-960q0 -66 -47 -113t-113 -47h-736v-128h352q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23
+v64q0 14 9 23t23 9h352v128h-736q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="_583" unicode="&#xf26d;" horiz-adv-x="1792" 
+d="M138 1408h197q-70 -64 -126 -149q-36 -56 -59 -115t-30 -125.5t-8.5 -120t10.5 -132t21 -126t28 -136.5q4 -19 6 -28q51 -238 81 -329q57 -171 152 -275h-272q-48 0 -82 34t-34 82v1304q0 48 34 82t82 34zM1346 1408h308q48 0 82 -34t34 -82v-1304q0 -48 -34 -82t-82 -34
+h-178q212 210 196 565l-469 -101q-2 -45 -12 -82t-31 -72t-59.5 -59.5t-93.5 -36.5q-123 -26 -199 40q-32 27 -53 61t-51.5 129t-64.5 258q-35 163 -45.5 263t-5.5 139t23 77q20 41 62.5 73t102.5 45q45 12 83.5 6.5t67 -17t54 -35t43 -48t34.5 -56.5l468 100
+q-68 175 -180 287z" />
+    <glyph glyph-name="_584" unicode="&#xf26e;" 
+d="M1401 -11l-6 -6q-113 -113 -259 -175q-154 -64 -317 -64q-165 0 -317 64q-148 63 -259 175q-113 112 -175 258q-42 103 -54 189q-4 28 48 36q51 8 56 -20q1 -1 1 -4q18 -90 46 -159q50 -124 152 -226q98 -98 226 -152q132 -56 276 -56q143 0 276 56q128 55 225 152l6 6
+q10 10 25 6q12 -3 33 -22q36 -37 17 -58zM929 604l-66 -66l63 -63q21 -21 -7 -49q-17 -17 -32 -17q-10 0 -19 10l-62 61l-66 -66q-5 -5 -15 -5q-15 0 -31 16l-2 2q-18 15 -18 29q0 7 8 17l66 65l-66 66q-16 16 14 45q18 18 31 18q6 0 13 -5l65 -66l65 65q18 17 48 -13
+q27 -27 11 -44zM1400 547q0 -118 -46 -228q-45 -105 -126 -186q-80 -80 -187 -126t-228 -46t-228 46t-187 126q-82 82 -125 186q-15 33 -15 40h-1q-9 27 43 44q50 16 60 -12q37 -99 97 -167h1v339v2q3 136 102 232q105 103 253 103q147 0 251 -103t104 -249
+q0 -147 -104.5 -251t-250.5 -104q-58 0 -112 16q-28 11 -13 61q16 51 44 43l14 -3q14 -3 33 -6t30 -3q104 0 176 71.5t72 174.5q0 101 -72 171q-71 71 -175 71q-107 0 -178 -80q-64 -72 -64 -160v-413q110 -67 242 -67q96 0 185 36.5t156 103.5t103.5 155t36.5 183
+q0 198 -141 339q-140 140 -339 140q-200 0 -340 -140q-53 -53 -77 -87l-2 -2q-8 -11 -13 -15.5t-21.5 -9.5t-38.5 3q-21 5 -36.5 16.5t-15.5 26.5v680q0 15 10.5 26.5t27.5 11.5h877q30 0 30 -55t-30 -55h-811v-483h1q40 42 102 84t108 61q109 46 231 46q121 0 228 -46
+t187 -126q81 -81 126 -186q46 -112 46 -229zM1369 1128q9 -8 9 -18t-5.5 -18t-16.5 -21q-26 -26 -39 -26q-9 0 -16 7q-106 91 -207 133q-128 56 -276 56q-133 0 -262 -49q-27 -10 -45 37q-9 25 -8 38q3 16 16 20q130 57 299 57q164 0 316 -64q137 -58 235 -152z" />
+    <glyph glyph-name="_585" unicode="&#xf270;" horiz-adv-x="1792" 
+d="M1551 60q15 6 26 3t11 -17.5t-15 -33.5q-13 -16 -44 -43.5t-95.5 -68t-141 -74t-188 -58t-229.5 -24.5q-119 0 -238 31t-209 76.5t-172.5 104t-132.5 105t-84 87.5q-8 9 -10 16.5t1 12t8 7t11.5 2t11.5 -4.5q192 -117 300 -166q389 -176 799 -90q190 40 391 135z
+M1758 175q11 -16 2.5 -69.5t-28.5 -102.5q-34 -83 -85 -124q-17 -14 -26 -9t0 24q21 45 44.5 121.5t6.5 98.5q-5 7 -15.5 11.5t-27 6t-29.5 2.5t-35 0t-31.5 -2t-31 -3t-22.5 -2q-6 -1 -13 -1.5t-11 -1t-8.5 -1t-7 -0.5h-5.5h-4.5t-3 0.5t-2 1.5l-1.5 3q-6 16 47 40t103 30
+q46 7 108 1t76 -24zM1364 618q0 -31 13.5 -64t32 -58t37.5 -46t33 -32l13 -11l-227 -224q-40 37 -79 75.5t-58 58.5l-19 20q-11 11 -25 33q-38 -59 -97.5 -102.5t-127.5 -63.5t-140 -23t-137.5 21t-117.5 65.5t-83 113t-31 162.5q0 84 28 154t72 116.5t106.5 83t122.5 57
+t130 34.5t119.5 18.5t99.5 6.5v127q0 65 -21 97q-34 53 -121 53q-6 0 -16.5 -1t-40.5 -12t-56 -29.5t-56 -59.5t-48 -96l-294 27q0 60 22 119t67 113t108 95t151.5 65.5t190.5 24.5q100 0 181 -25t129.5 -61.5t81 -83t45 -86t12.5 -73.5v-589zM692 597q0 -86 70 -133
+q66 -44 139 -22q84 25 114 123q14 45 14 101v162q-59 -2 -111 -12t-106.5 -33.5t-87 -71t-32.5 -114.5z" />
+    <glyph glyph-name="_586" unicode="&#xf271;" horiz-adv-x="1792" 
+d="M1536 1280q52 0 90 -38t38 -90v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128zM1152 1376v-288q0 -14 9 -23t23 -9
+h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 1376v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM1536 -128v1024h-1408v-1024h1408zM896 448h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224
+v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224z" />
+    <glyph glyph-name="_587" unicode="&#xf272;" horiz-adv-x="1792" 
+d="M1152 416v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23
+t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47
+t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_588" unicode="&#xf273;" horiz-adv-x="1792" 
+d="M1111 151l-46 -46q-9 -9 -22 -9t-23 9l-188 189l-188 -189q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22t9 23l189 188l-189 188q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l188 -188l188 188q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23l-188 -188l188 -188q9 -10 9 -23t-9 -22z
+M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
+q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_589" unicode="&#xf274;" horiz-adv-x="1792" 
+d="M1303 572l-512 -512q-10 -9 -23 -9t-23 9l-288 288q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l220 -220l444 444q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23
+t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47
+t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_590" unicode="&#xf275;" horiz-adv-x="1792" 
+d="M448 1536q26 0 45 -19t19 -45v-891l536 429q17 14 40 14q26 0 45 -19t19 -45v-379l536 429q17 14 40 14q26 0 45 -19t19 -45v-1152q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h384z" />
+    <glyph glyph-name="_591" unicode="&#xf276;" horiz-adv-x="1024" 
+d="M512 448q66 0 128 15v-655q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v655q62 -15 128 -15zM512 1536q212 0 362 -150t150 -362t-150 -362t-362 -150t-362 150t-150 362t150 362t362 150zM512 1312q14 0 23 9t9 23t-9 23t-23 9q-146 0 -249 -103t-103 -249
+q0 -14 9 -23t23 -9t23 9t9 23q0 119 84.5 203.5t203.5 84.5z" />
+    <glyph glyph-name="_592" unicode="&#xf277;" horiz-adv-x="1792" 
+d="M1745 1239q10 -10 10 -23t-10 -23l-141 -141q-28 -28 -68 -28h-1344q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h576v64q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-64h512q40 0 68 -28zM768 320h256v-512q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v512zM1600 768
+q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-1344q-40 0 -68 28l-141 141q-10 10 -10 23t10 23l141 141q28 28 68 28h512v192h256v-192h576z" />
+    <glyph glyph-name="_593" unicode="&#xf278;" horiz-adv-x="2048" 
+d="M2020 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173
+v-1270l544 217v1270zM1920 107v1270l-544 -217v-1270z" />
+    <glyph glyph-name="_594" unicode="&#xf279;" horiz-adv-x="1792" 
+d="M512 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472q0 20 17 28l480 256q7 4 15 4zM1760 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472
+q0 20 17 28l480 256q7 4 15 4zM640 1536q8 0 14 -3l512 -256q18 -10 18 -29v-1472q0 -13 -9.5 -22.5t-22.5 -9.5q-8 0 -14 3l-512 256q-18 10 -18 29v1472q0 13 9.5 22.5t22.5 9.5z" />
+    <glyph glyph-name="_595" unicode="&#xf27a;" horiz-adv-x="1792" 
+d="M640 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 640q0 53 -37.5 90.5t-90.5 37.5
+t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-110 0 -211 18q-173 -173 -435 -229q-52 -10 -86 -13q-12 -1 -22 6t-13 18q-4 15 20 37q5 5 23.5 21.5t25.5 23.5t23.5 25.5t24 31.5t20.5 37
+t20 48t14.5 57.5t12.5 72.5q-146 90 -229.5 216.5t-83.5 269.5q0 174 120 321.5t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="_596" unicode="&#xf27b;" horiz-adv-x="1792" 
+d="M640 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 -53 -37.5 -90.5t-90.5 -37.5
+t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5
+t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51
+t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 130 71 248.5t191 204.5t286 136.5t348 50.5t348 -50.5t286 -136.5t191 -204.5t71 -248.5z" />
+    <glyph glyph-name="_597" unicode="&#xf27c;" horiz-adv-x="1024" 
+d="M512 345l512 295v-591l-512 -296v592zM0 640v-591l512 296zM512 1527v-591l-512 -296v591zM512 936l512 295v-591z" />
+    <glyph glyph-name="_598" unicode="&#xf27d;" horiz-adv-x="1792" 
+d="M1709 1018q-10 -236 -332 -651q-333 -431 -562 -431q-142 0 -240 263q-44 160 -132 482q-72 262 -157 262q-18 0 -127 -76l-77 98q24 21 108 96.5t130 115.5q156 138 241 146q95 9 153 -55.5t81 -203.5q44 -287 66 -373q55 -249 120 -249q51 0 154 161q101 161 109 246
+q13 139 -109 139q-57 0 -121 -26q120 393 459 382q251 -8 236 -326z" />
+    <glyph glyph-name="f27e" unicode="&#xf27e;" 
+d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z" />
+    <glyph glyph-name="uniF280" unicode="&#xf280;" 
+d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925q32 0 44.5 -16t11.5 -63l174 21q0 55 -17.5 92.5t-50.5 56t-69 25.5t-85 7q-133 0 -199 -57.5t-66 -182.5v-72
+h-96v-128h76q20 0 20 -8v-382q0 -14 -5 -20t-18 -7l-73 -7v-88h448v86l-149 14q-6 1 -8.5 1.5t-3.5 2.5t-0.5 4t1 7t0.5 10v387h191l38 128h-231q-6 0 -2 6t4 9v80q0 27 1.5 40.5t7.5 28t19.5 20t36.5 5.5zM1248 96v86l-54 9q-7 1 -9.5 2.5t-2.5 3t1 7.5t1 12v520h-275
+l-23 -101l83 -22q23 -7 23 -27v-370q0 -14 -6 -18.5t-20 -6.5l-70 -9v-86h352z" />
+    <glyph glyph-name="uniF281" unicode="&#xf281;" horiz-adv-x="1792" 
+d="M1792 690q0 -58 -29.5 -105.5t-79.5 -72.5q12 -46 12 -96q0 -155 -106.5 -287t-290.5 -208.5t-400 -76.5t-399.5 76.5t-290 208.5t-106.5 287q0 47 11 94q-51 25 -82 73.5t-31 106.5q0 82 58 140.5t141 58.5q85 0 145 -63q218 152 515 162l116 521q3 13 15 21t26 5
+l369 -81q18 37 54 59.5t79 22.5q62 0 106 -43.5t44 -105.5t-44 -106t-106 -44t-105.5 43.5t-43.5 105.5l-334 74l-104 -472q300 -9 519 -160q58 61 143 61q83 0 141 -58.5t58 -140.5zM418 491q0 -62 43.5 -106t105.5 -44t106 44t44 106t-44 105.5t-106 43.5q-61 0 -105 -44
+t-44 -105zM1228 136q11 11 11 26t-11 26q-10 10 -25 10t-26 -10q-41 -42 -121 -62t-160 -20t-160 20t-121 62q-11 10 -26 10t-25 -10q-11 -10 -11 -25.5t11 -26.5q43 -43 118.5 -68t122.5 -29.5t91 -4.5t91 4.5t122.5 29.5t118.5 68zM1225 341q62 0 105.5 44t43.5 106
+q0 61 -44 105t-105 44q-62 0 -106 -43.5t-44 -105.5t44 -106t106 -44z" />
+    <glyph glyph-name="_602" unicode="&#xf282;" horiz-adv-x="1792" 
+d="M69 741h1q16 126 58.5 241.5t115 217t167.5 176t223.5 117.5t276.5 43q231 0 414 -105.5t294 -303.5q104 -187 104 -442v-188h-1125q1 -111 53.5 -192.5t136.5 -122.5t189.5 -57t213 -3t208 46.5t173.5 84.5v-377q-92 -55 -229.5 -92t-312.5 -38t-316 53
+q-189 73 -311.5 249t-124.5 372q-3 242 111 412t325 268q-48 -60 -78 -125.5t-46 -159.5h635q8 77 -8 140t-47 101.5t-70.5 66.5t-80.5 41t-75 20.5t-56 8.5l-22 1q-135 -5 -259.5 -44.5t-223.5 -104.5t-176 -140.5t-138 -163.5z" />
+    <glyph glyph-name="_603" unicode="&#xf283;" horiz-adv-x="2304" 
+d="M0 32v608h2304v-608q0 -66 -47 -113t-113 -47h-1984q-66 0 -113 47t-47 113zM640 256v-128h384v128h-384zM256 256v-128h256v128h-256zM2144 1408q66 0 113 -47t47 -113v-224h-2304v224q0 66 47 113t113 47h1984z" />
+    <glyph glyph-name="_604" unicode="&#xf284;" horiz-adv-x="1792" 
+d="M1584 246l-218 111q-74 -120 -196.5 -189t-263.5 -69q-147 0 -271 72t-196 196t-72 270q0 110 42.5 209.5t115 172t172 115t209.5 42.5q131 0 247.5 -60.5t192.5 -168.5l215 125q-110 169 -286.5 265t-378.5 96q-161 0 -308 -63t-253 -169t-169 -253t-63 -308t63 -308
+t169 -253t253 -169t308 -63q213 0 397.5 107t290.5 292zM1030 643l693 -352q-116 -253 -334.5 -400t-492.5 -147q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71q260 0 470.5 -133.5t335.5 -366.5zM1543 640h-39v-160h-96v352h136q32 0 54.5 -20
+t28.5 -48t1 -56t-27.5 -48t-57.5 -20z" />
+    <glyph glyph-name="uniF285" unicode="&#xf285;" horiz-adv-x="1792" 
+d="M1427 827l-614 386l92 151h855zM405 562l-184 116v858l1183 -743zM1424 697l147 -95v-858l-532 335zM1387 718l-500 -802h-855l356 571z" />
+    <glyph glyph-name="uniF286" unicode="&#xf286;" horiz-adv-x="1792" 
+d="M640 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1152 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1664 496v-752h-640v320q0 80 -56 136t-136 56t-136 -56t-56 -136v-320h-640v752q0 16 16 16h96
+q16 0 16 -16v-112h128v624q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 6 2.5 9.5t8.5 5t9.5 2t11.5 0t9 -0.5v391q-32 15 -32 50q0 23 16.5 39t38.5 16t38.5 -16t16.5 -39q0 -35 -32 -50v-17q45 10 83 10q21 0 59.5 -7.5t54.5 -7.5
+q17 0 47 7.5t37 7.5q16 0 16 -16v-210q0 -15 -35 -21.5t-62 -6.5q-18 0 -54.5 7.5t-55.5 7.5q-40 0 -90 -12v-133q1 0 9 0.5t11.5 0t9.5 -2t8.5 -5t2.5 -9.5v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-624h128v112q0 16 16 16h96
+q16 0 16 -16z" />
+    <glyph glyph-name="_607" unicode="&#xf287;" horiz-adv-x="2304" 
+d="M2288 731q16 -8 16 -27t-16 -27l-320 -192q-8 -5 -16 -5q-9 0 -16 4q-16 10 -16 28v128h-858q37 -58 83 -165q16 -37 24.5 -55t24 -49t27 -47t27 -34t31.5 -26t33 -8h96v96q0 14 9 23t23 9h320q14 0 23 -9t9 -23v-320q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v96h-96
+q-32 0 -61 10t-51 23.5t-45 40.5t-37 46t-33.5 57t-28.5 57.5t-28 60.5q-23 53 -37 81.5t-36 65t-44.5 53.5t-46.5 17h-360q-22 -84 -91 -138t-157 -54q-106 0 -181 75t-75 181t75 181t181 75q88 0 157 -54t91 -138h104q24 0 46.5 17t44.5 53.5t36 65t37 81.5q19 41 28 60.5
+t28.5 57.5t33.5 57t37 46t45 40.5t51 23.5t61 10h107q21 57 70 92.5t111 35.5q80 0 136 -56t56 -136t-56 -136t-136 -56q-62 0 -111 35.5t-70 92.5h-107q-17 0 -33 -8t-31.5 -26t-27 -34t-27 -47t-24 -49t-24.5 -55q-46 -107 -83 -165h1114v128q0 18 16 28t32 -1z" />
+    <glyph glyph-name="_608" unicode="&#xf288;" horiz-adv-x="1792" 
+d="M1150 774q0 -56 -39.5 -95t-95.5 -39h-253v269h253q56 0 95.5 -39.5t39.5 -95.5zM1329 774q0 130 -91.5 222t-222.5 92h-433v-896h180v269h253q130 0 222 91.5t92 221.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348
+t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_609" unicode="&#xf289;" horiz-adv-x="2304" 
+d="M1645 438q0 59 -34 106.5t-87 68.5q-7 -45 -23 -92q-7 -24 -27.5 -38t-44.5 -14q-12 0 -24 3q-31 10 -45 38.5t-4 58.5q23 71 23 143q0 123 -61 227.5t-166 165.5t-228 61q-134 0 -247 -73t-167 -194q108 -28 188 -106q22 -23 22 -55t-22 -54t-54 -22t-55 22
+q-75 75 -180 75q-106 0 -181 -74.5t-75 -180.5t75 -180.5t181 -74.5h1046q79 0 134.5 55.5t55.5 133.5zM1798 438q0 -142 -100.5 -242t-242.5 -100h-1046q-169 0 -289 119.5t-120 288.5q0 153 100 267t249 136q62 184 221 298t354 114q235 0 408.5 -158.5t196.5 -389.5
+q116 -25 192.5 -118.5t76.5 -214.5zM2048 438q0 -175 -97 -319q-23 -33 -64 -33q-24 0 -43 13q-26 17 -32 48.5t12 57.5q71 104 71 233t-71 233q-18 26 -12 57t32 49t57.5 11.5t49.5 -32.5q97 -142 97 -318zM2304 438q0 -244 -134 -443q-23 -34 -64 -34q-23 0 -42 13
+q-26 18 -32.5 49t11.5 57q108 164 108 358q0 195 -108 357q-18 26 -11.5 57.5t32.5 48.5q26 18 57 12t49 -33q134 -198 134 -442z" />
+    <glyph glyph-name="_610" unicode="&#xf28a;" 
+d="M1500 -13q0 -89 -63 -152.5t-153 -63.5t-153.5 63.5t-63.5 152.5q0 90 63.5 153.5t153.5 63.5t153 -63.5t63 -153.5zM1267 268q-115 -15 -192.5 -102.5t-77.5 -205.5q0 -74 33 -138q-146 -78 -379 -78q-109 0 -201 21t-153.5 54.5t-110.5 76.5t-76 85t-44.5 83
+t-23.5 66.5t-6 39.5q0 19 4.5 42.5t18.5 56t36.5 58t64 43.5t94.5 18t94 -17.5t63 -41t35.5 -53t17.5 -49t4 -33.5q0 -34 -23 -81q28 -27 82 -42t93 -17l40 -1q115 0 190 51t75 133q0 26 -9 48.5t-31.5 44.5t-49.5 41t-74 44t-93.5 47.5t-119.5 56.5q-28 13 -43 20
+q-116 55 -187 100t-122.5 102t-72 125.5t-20.5 162.5q0 78 20.5 150t66 137.5t112.5 114t166.5 77t221.5 28.5q120 0 220 -26t164.5 -67t109.5 -94t64 -105.5t19 -103.5q0 -46 -15 -82.5t-36.5 -58t-48.5 -36t-49 -19.5t-39 -5h-8h-32t-39 5t-44 14t-41 28t-37 46t-24 70.5
+t-10 97.5q-15 16 -59 25.5t-81 10.5l-37 1q-68 0 -117.5 -31t-70.5 -70t-21 -76q0 -24 5 -43t24 -46t53 -51t97 -53.5t150 -58.5q76 -25 138.5 -53.5t109 -55.5t83 -59t60.5 -59.5t41 -62.5t26.5 -62t14.5 -63.5t6 -62t1 -62.5z" />
+    <glyph glyph-name="_611" unicode="&#xf28b;" 
+d="M704 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1152 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103
+t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_612" unicode="&#xf28c;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM864 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192z" />
+    <glyph glyph-name="_613" unicode="&#xf28d;" 
+d="M1088 352v576q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="_614" unicode="&#xf28e;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h576q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-576z" />
+    <glyph glyph-name="_615" unicode="&#xf290;" horiz-adv-x="1792" 
+d="M1757 128l35 -313q3 -28 -16 -50q-19 -21 -48 -21h-1664q-29 0 -48 21q-19 22 -16 50l35 313h1722zM1664 967l86 -775h-1708l86 775q3 24 21 40.5t43 16.5h256v-128q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5v128h384v-128q0 -53 37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5v128h256q25 0 43 -16.5t21 -40.5zM1280 1152v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="_616" unicode="&#xf291;" horiz-adv-x="2048" 
+d="M1920 768q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5h-15l-115 -662q-8 -46 -44 -76t-82 -30h-1280q-46 0 -82 30t-44 76l-115 662h-15q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5h1792zM485 -32q26 2 43.5 22.5t15.5 46.5l-32 416q-2 26 -22.5 43.5
+t-46.5 15.5t-43.5 -22.5t-15.5 -46.5l32 -416q2 -25 20.5 -42t43.5 -17h5zM896 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1280 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1632 27l32 416
+q2 26 -15.5 46.5t-43.5 22.5t-46.5 -15.5t-22.5 -43.5l-32 -416q-2 -26 15.5 -46.5t43.5 -22.5h5q25 0 43.5 17t20.5 42zM476 1244l-93 -412h-132l101 441q19 88 89 143.5t160 55.5h167q0 26 19 45t45 19h384q26 0 45 -19t19 -45h167q90 0 160 -55.5t89 -143.5l101 -441
+h-132l-93 412q-11 44 -45.5 72t-79.5 28h-167q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45h-167q-45 0 -79.5 -28t-45.5 -72z" />
+    <glyph glyph-name="_617" unicode="&#xf292;" horiz-adv-x="1792" 
+d="M991 512l64 256h-254l-64 -256h254zM1759 1016l-56 -224q-7 -24 -31 -24h-327l-64 -256h311q15 0 25 -12q10 -14 6 -28l-56 -224q-5 -24 -31 -24h-327l-81 -328q-7 -24 -31 -24h-224q-16 0 -26 12q-9 12 -6 28l78 312h-254l-81 -328q-7 -24 -31 -24h-225q-15 0 -25 12
+q-9 12 -6 28l78 312h-311q-15 0 -25 12q-9 12 -6 28l56 224q7 24 31 24h327l64 256h-311q-15 0 -25 12q-10 14 -6 28l56 224q5 24 31 24h327l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h254l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h311
+q15 0 25 -12q9 -12 6 -28z" />
+    <glyph glyph-name="_618" unicode="&#xf293;" 
+d="M841 483l148 -148l-149 -149zM840 1094l149 -149l-148 -148zM710 -130l464 464l-306 306l306 306l-464 464v-611l-255 255l-93 -93l320 -321l-320 -321l93 -93l255 255v-611zM1429 640q0 -209 -32 -365.5t-87.5 -257t-140.5 -162.5t-181.5 -86.5t-219.5 -24.5
+t-219.5 24.5t-181.5 86.5t-140.5 162.5t-87.5 257t-32 365.5t32 365.5t87.5 257t140.5 162.5t181.5 86.5t219.5 24.5t219.5 -24.5t181.5 -86.5t140.5 -162.5t87.5 -257t32 -365.5z" />
+    <glyph glyph-name="_619" unicode="&#xf294;" horiz-adv-x="1024" 
+d="M596 113l173 172l-173 172v-344zM596 823l173 172l-173 172v-344zM628 640l356 -356l-539 -540v711l-297 -296l-108 108l372 373l-372 373l108 108l297 -296v711l539 -540z" />
+    <glyph glyph-name="_620" unicode="&#xf295;" 
+d="M1280 256q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM512 1024q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5
+t112.5 -271.5zM1440 1344q0 -20 -13 -38l-1056 -1408q-19 -26 -51 -26h-160q-26 0 -45 19t-19 45q0 20 13 38l1056 1408q19 26 51 26h160q26 0 45 -19t19 -45zM768 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
+t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="_621" unicode="&#xf296;" horiz-adv-x="1792" 
+d="M104 830l792 -1015l-868 630q-18 13 -25 34.5t0 42.5l101 308v0zM566 830h660l-330 -1015v0zM368 1442l198 -612h-462l198 612q8 23 33 23t33 -23zM1688 830l101 -308q7 -21 0 -42.5t-25 -34.5l-868 -630l792 1015v0zM1688 830h-462l198 612q8 23 33 23t33 -23z" />
+    <glyph glyph-name="_622" unicode="&#xf297;" horiz-adv-x="1792" 
+d="M384 704h160v224h-160v-224zM1221 372v92q-104 -36 -243 -38q-135 -1 -259.5 46.5t-220.5 122.5l1 -96q88 -80 212 -128.5t272 -47.5q129 0 238 49zM640 704h640v224h-640v-224zM1792 736q0 -187 -99 -352q89 -102 89 -229q0 -157 -129.5 -268t-313.5 -111
+q-122 0 -225 52.5t-161 140.5q-19 -1 -57 -1t-57 1q-58 -88 -161 -140.5t-225 -52.5q-184 0 -313.5 111t-129.5 268q0 127 89 229q-99 165 -99 352q0 209 120 385.5t326.5 279.5t449.5 103t449.5 -103t326.5 -279.5t120 -385.5z" />
+    <glyph glyph-name="_623" unicode="&#xf298;" 
+d="M515 625v-128h-252v128h252zM515 880v-127h-252v127h252zM1273 369v-128h-341v128h341zM1273 625v-128h-672v128h672zM1273 880v-127h-672v127h672zM1408 20v1240q0 8 -6 14t-14 6h-32l-378 -256l-210 171l-210 -171l-378 256h-32q-8 0 -14 -6t-6 -14v-1240q0 -8 6 -14
+t14 -6h1240q8 0 14 6t6 14zM553 1130l185 150h-406zM983 1130l221 150h-406zM1536 1260v-1240q0 -62 -43 -105t-105 -43h-1240q-62 0 -105 43t-43 105v1240q0 62 43 105t105 43h1240q62 0 105 -43t43 -105z" />
+    <glyph glyph-name="_624" unicode="&#xf299;" horiz-adv-x="1792" 
+d="M896 720q-104 196 -160 278q-139 202 -347 318q-34 19 -70 36q-89 40 -94 32t34 -38l39 -31q62 -43 112.5 -93.5t94.5 -116.5t70.5 -113t70.5 -131q9 -17 13 -25q44 -84 84 -153t98 -154t115.5 -150t131 -123.5t148.5 -90.5q153 -66 154 -60q1 3 -49 37q-53 36 -81 57
+q-77 58 -179 211t-185 310zM549 177q-76 60 -132.5 125t-98 143.5t-71 154.5t-58.5 186t-52 209t-60.5 252t-76.5 289q273 0 497.5 -36t379 -92t271 -144.5t185.5 -172.5t110 -198.5t56 -199.5t12.5 -198.5t-9.5 -173t-20 -143.5t-13 -107l323 -327h-104l-281 285
+q-22 -2 -91.5 -14t-121.5 -19t-138 -6t-160.5 17t-167.5 59t-179 111z" />
+    <glyph glyph-name="_625" unicode="&#xf29a;" horiz-adv-x="1792" 
+d="M1374 879q-6 26 -28.5 39.5t-48.5 7.5q-261 -62 -401 -62t-401 62q-26 6 -48.5 -7.5t-28.5 -39.5t7.5 -48.5t39.5 -28.5q194 -46 303 -58q-2 -158 -15.5 -269t-26.5 -155.5t-41 -115.5l-9 -21q-10 -25 1 -49t36 -34q9 -4 23 -4q44 0 60 41l8 20q54 139 71 259h42
+q17 -120 71 -259l8 -20q16 -41 60 -41q14 0 23 4q25 10 36 34t1 49l-9 21q-28 71 -41 115.5t-26.5 155.5t-15.5 269q109 12 303 58q26 6 39.5 28.5t7.5 48.5zM1024 1024q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
+M1600 640q0 -143 -55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5zM896 1408q-156 0 -298 -61t-245 -164t-164 -245t-61 -298t61 -298
+t164 -245t245 -164t298 -61t298 61t245 164t164 245t61 298t-61 298t-164 245t-245 164t-298 61zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_626" unicode="&#xf29b;" 
+d="M1438 723q34 -35 29 -82l-44 -551q-4 -42 -34.5 -70t-71.5 -28q-6 0 -9 1q-44 3 -72.5 36.5t-25.5 77.5l35 429l-143 -8q55 -113 55 -240q0 -216 -148 -372l-137 137q91 101 91 235q0 145 -102.5 248t-247.5 103q-134 0 -236 -92l-137 138q120 114 284 141l264 300
+l-149 87l-181 -161q-33 -30 -77 -27.5t-73 35.5t-26.5 77t34.5 73l239 213q26 23 60 26.5t64 -14.5l488 -283q36 -21 48 -68q17 -67 -26 -117l-205 -232l371 20q49 3 83 -32zM1240 1180q-74 0 -126 52t-52 126t52 126t126 52t126.5 -52t52.5 -126t-52.5 -126t-126.5 -52z
+M613 -62q106 0 196 61l139 -139q-146 -116 -335 -116q-148 0 -273.5 73t-198.5 198t-73 273q0 188 116 336l139 -139q-60 -88 -60 -197q0 -145 102.5 -247.5t247.5 -102.5z" />
+    <glyph glyph-name="_627" unicode="&#xf29c;" 
+d="M880 336v-160q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h160q14 0 23 -9t9 -23zM1136 832q0 -50 -15 -90t-45.5 -69t-52 -44t-59.5 -36q-32 -18 -46.5 -28t-26 -24t-11.5 -29v-32q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v68q0 35 10.5 64.5
+t24 47.5t39 35.5t41 25.5t44.5 21q53 25 75 43t22 49q0 42 -43.5 71.5t-95.5 29.5q-56 0 -95 -27q-29 -20 -80 -83q-9 -12 -25 -12q-11 0 -19 6l-108 82q-10 7 -12 20t5 23q122 192 349 192q129 0 238.5 -89.5t109.5 -214.5zM768 1280q-130 0 -248.5 -51t-204 -136.5
+t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5
+t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_628" unicode="&#xf29d;" horiz-adv-x="1408" 
+d="M366 1225q-64 0 -110 45.5t-46 110.5q0 64 46 109.5t110 45.5t109.5 -45.5t45.5 -109.5q0 -65 -45.5 -110.5t-109.5 -45.5zM917 583q0 -50 -30 -67.5t-63.5 -6.5t-47.5 34l-367 438q-7 12 -14 15.5t-11 1.5l-3 -3q-7 -8 4 -21l122 -139l1 -354l-161 -457
+q-67 -192 -92 -234q-15 -26 -28 -32q-50 -26 -103 -1q-29 13 -41.5 43t-9.5 57q2 17 197 618l5 416l-85 -164l35 -222q4 -24 -1 -42t-14 -27.5t-19 -16t-17 -7.5l-7 -2q-19 -3 -34.5 3t-24 16t-14 22t-7.5 19.5t-2 9.5l-46 299l211 381q23 34 113 34q75 0 107 -40l424 -521
+q7 -5 14 -17l3 -3l-1 -1q7 -13 7 -29zM514 433q43 -113 88.5 -225t69.5 -168l24 -55q36 -93 42 -125q11 -70 -36 -97q-35 -22 -66 -16t-51 22t-29 35h-1q-6 16 -8 25l-124 351zM1338 -159q31 -49 31 -57q0 -5 -3 -7q-9 -5 -14.5 0.5t-15.5 26t-16 30.5q-114 172 -423 661
+q3 -1 7 1t7 4l3 2q11 9 11 17z" />
+    <glyph glyph-name="_629" unicode="&#xf29e;" horiz-adv-x="2304" 
+d="M504 542h171l-1 265zM1530 641q0 87 -50.5 140t-146.5 53h-54v-388h52q91 0 145 57t54 138zM956 1018l1 -756q0 -14 -9.5 -24t-23.5 -10h-216q-14 0 -23.5 10t-9.5 24v62h-291l-55 -81q-10 -15 -28 -15h-267q-21 0 -30.5 18t3.5 35l556 757q9 14 27 14h332q14 0 24 -10
+t10 -24zM1783 641q0 -193 -125.5 -303t-324.5 -110h-270q-14 0 -24 10t-10 24v756q0 14 10 24t24 10h268q200 0 326 -109t126 -302zM1939 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5
+t-7.5 60t-20 91.5t-41 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2123 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-45 -108t-74 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5
+h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2304 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66 104.5t41 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96
+t9.5 -70.5z" />
+    <glyph glyph-name="uniF2A0" unicode="&#xf2a0;" horiz-adv-x="1408" 
+d="M617 -153q0 11 -13 58t-31 107t-20 69q-1 4 -5 26.5t-8.5 36t-13.5 21.5q-15 14 -51 14q-23 0 -70 -5.5t-71 -5.5q-34 0 -47 11q-6 5 -11 15.5t-7.5 20t-6.5 24t-5 18.5q-37 128 -37 255t37 255q1 4 5 18.5t6.5 24t7.5 20t11 15.5q13 11 47 11q24 0 71 -5.5t70 -5.5
+q36 0 51 14q9 8 13.5 21.5t8.5 36t5 26.5q2 9 20 69t31 107t13 58q0 22 -43.5 52.5t-75.5 42.5q-20 8 -45 8q-34 0 -98 -18q-57 -17 -96.5 -40.5t-71 -66t-46 -70t-45.5 -94.5q-6 -12 -9 -19q-49 -107 -68 -216t-19 -244t19 -244t68 -216q56 -122 83 -161q63 -91 179 -127
+l6 -2q64 -18 98 -18q25 0 45 8q32 12 75.5 42.5t43.5 52.5zM776 760q-26 0 -45 19t-19 45.5t19 45.5q37 37 37 90q0 52 -37 91q-19 19 -19 45t19 45t45 19t45 -19q75 -75 75 -181t-75 -181q-21 -19 -45 -19zM957 579q-27 0 -45 19q-19 19 -19 45t19 45q112 114 112 272
+t-112 272q-19 19 -19 45t19 45t45 19t45 -19q150 -150 150 -362t-150 -362q-18 -19 -45 -19zM1138 398q-27 0 -45 19q-19 19 -19 45t19 45q90 91 138.5 208t48.5 245t-48.5 245t-138.5 208q-19 19 -19 45t19 45t45 19t45 -19q109 -109 167 -249t58 -294t-58 -294t-167 -249
+q-18 -19 -45 -19z" />
+    <glyph glyph-name="uniF2A1" unicode="&#xf2a1;" horiz-adv-x="2176" 
+d="M192 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 352
+q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 864
+q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 1376q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 192q0 -80 -56 -136
+t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 1216q0 -80 -56 -136t-136 -56
+t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 192q0 -80 -56 -136t-136 -56t-136 56
+t-56 136t56 136t136 56t136 -56t56 -136zM1664 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136
+t56 136t136 56t136 -56t56 -136zM2176 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="uniF2A2" unicode="&#xf2a2;" horiz-adv-x="1792" 
+d="M128 -192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM320 0q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM365 365l256 -256l-90 -90l-256 256zM704 384q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45z
+M1411 704q0 -59 -11.5 -108.5t-37.5 -93.5t-44 -67.5t-53 -64.5q-31 -35 -45.5 -54t-33.5 -50t-26.5 -64t-7.5 -74q0 -159 -112.5 -271.5t-271.5 -112.5q-26 0 -45 19t-19 45t19 45t45 19q106 0 181 75t75 181q0 57 11.5 105.5t37 91t43.5 66.5t52 63q40 46 59.5 72
+t37.5 74.5t18 103.5q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM896 576q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45
+t45 19t45 -19t19 -45zM1184 704q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 93 -65.5 158.5t-158.5 65.5q-92 0 -158 -65.5t-66 -158.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 146 103 249t249 103t249 -103t103 -249zM1578 993q10 -25 -1 -49t-36 -34q-9 -4 -23 -4
+q-19 0 -35.5 11t-23.5 30q-68 178 -224 295q-21 16 -25 42t12 47q17 21 43 25t47 -12q183 -137 266 -351zM1788 1074q9 -25 -1.5 -49t-35.5 -34q-11 -4 -23 -4q-44 0 -60 41q-92 238 -297 393q-22 16 -25.5 42t12.5 47q16 22 42 25.5t47 -12.5q235 -175 341 -449z" />
+    <glyph glyph-name="uniF2A3" unicode="&#xf2a3;" horiz-adv-x="2304" 
+d="M1032 576q-59 2 -84 55q-17 34 -48 53.5t-68 19.5q-53 0 -90.5 -37.5t-37.5 -90.5q0 -56 36 -89l10 -8q34 -31 82 -31q37 0 68 19.5t48 53.5q25 53 84 55zM1600 704q0 56 -36 89l-10 8q-34 31 -82 31q-37 0 -68 -19.5t-48 -53.5q-25 -53 -84 -55q59 -2 84 -55
+q17 -34 48 -53.5t68 -19.5q53 0 90.5 37.5t37.5 90.5zM1174 925q-17 -35 -55 -48t-73 4q-62 31 -134 31q-51 0 -99 -17q3 0 9.5 0.5t9.5 0.5q92 0 170.5 -50t118.5 -133q17 -36 3.5 -73.5t-49.5 -54.5q-18 -9 -39 -9q21 0 39 -9q36 -17 49.5 -54.5t-3.5 -73.5
+q-40 -83 -118.5 -133t-170.5 -50h-6q-16 2 -44 4l-290 27l-239 -120q-14 -7 -29 -7q-40 0 -57 35l-160 320q-11 23 -4 47.5t29 37.5l209 119l148 267q17 155 91.5 291.5t195.5 236.5q31 25 70.5 21.5t64.5 -34.5t21.5 -70t-34.5 -65q-70 -59 -117 -128q123 84 267 101
+q40 5 71.5 -19t35.5 -64q5 -40 -19 -71.5t-64 -35.5q-84 -10 -159 -55q46 10 99 10q115 0 218 -50q36 -18 49 -55.5t-5 -73.5zM2137 1085l160 -320q11 -23 4 -47.5t-29 -37.5l-209 -119l-148 -267q-17 -155 -91.5 -291.5t-195.5 -236.5q-26 -22 -61 -22q-45 0 -74 35
+q-25 31 -21.5 70t34.5 65q70 59 117 128q-123 -84 -267 -101q-4 -1 -12 -1q-36 0 -63.5 24t-31.5 60q-5 40 19 71.5t64 35.5q84 10 159 55q-46 -10 -99 -10q-115 0 -218 50q-36 18 -49 55.5t5 73.5q17 35 55 48t73 -4q62 -31 134 -31q51 0 99 17q-3 0 -9.5 -0.5t-9.5 -0.5
+q-92 0 -170.5 50t-118.5 133q-17 36 -3.5 73.5t49.5 54.5q18 9 39 9q-21 0 -39 9q-36 17 -49.5 54.5t3.5 73.5q40 83 118.5 133t170.5 50h6h1q14 -2 42 -4l291 -27l239 120q14 7 29 7q40 0 57 -35z" />
+    <glyph glyph-name="uniF2A4" unicode="&#xf2a4;" horiz-adv-x="1792" 
+d="M1056 704q0 -26 19 -45t45 -19t45 19t19 45q0 146 -103 249t-249 103t-249 -103t-103 -249q0 -26 19 -45t45 -19t45 19t19 45q0 93 66 158.5t158 65.5t158 -65.5t66 -158.5zM835 1280q-117 0 -223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5q0 -26 19 -45t45 -19t45 19
+t19 45q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -55 -18 -103.5t-37.5 -74.5t-59.5 -72q-34 -39 -52 -63t-43.5 -66.5t-37 -91t-11.5 -105.5q0 -106 -75 -181t-181 -75q-26 0 -45 -19t-19 -45t19 -45t45 -19q159 0 271.5 112.5t112.5 271.5q0 41 7.5 74
+t26.5 64t33.5 50t45.5 54q35 41 53 64.5t44 67.5t37.5 93.5t11.5 108.5q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5zM591 561l226 -226l-579 -579q-12 -12 -29 -12t-29 12l-168 168q-12 12 -12 29t12 29zM1612 1524l168 -168q12 -12 12 -29t-12 -30l-233 -233
+l-26 -25l-71 -71q-66 153 -195 258l91 91l207 207q13 12 30 12t29 -12z" />
+    <glyph glyph-name="uniF2A5" unicode="&#xf2a5;" 
+d="M866 1021q0 -27 -13 -94q-11 -50 -31.5 -150t-30.5 -150q-2 -11 -4.5 -12.5t-13.5 -2.5q-20 -2 -31 -2q-58 0 -84 49.5t-26 113.5q0 88 35 174t103 124q28 14 51 14q28 0 36.5 -16.5t8.5 -47.5zM1352 597q0 14 -39 75.5t-52 66.5q-21 8 -34 8q-91 0 -226 -77l-2 2
+q3 22 27.5 135t24.5 178q0 233 -242 233q-24 0 -68 -6q-94 -17 -168.5 -89.5t-111.5 -166.5t-37 -189q0 -146 80.5 -225t227.5 -79q25 0 25 -3t-1 -5q-4 -34 -26 -117q-14 -52 -51.5 -101t-82.5 -49q-42 0 -42 47q0 24 10.5 47.5t25 39.5t29.5 28.5t26 20t11 8.5q0 3 -7 10
+q-24 22 -58.5 36.5t-65.5 14.5q-35 0 -63.5 -34t-41 -75t-12.5 -75q0 -88 51.5 -142t138.5 -54q82 0 155 53t117.5 126t65.5 153q6 22 15.5 66.5t14.5 66.5q3 12 14 18q118 60 227 60q48 0 127 -18q1 -1 4 -1q5 0 9.5 4.5t4.5 8.5zM1536 1120v-960q0 -119 -84.5 -203.5
+t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF2A6" unicode="&#xf2a6;" horiz-adv-x="1535" 
+d="M744 1231q0 24 -2 38.5t-8.5 30t-21 23t-37.5 7.5q-39 0 -78 -23q-105 -58 -159 -190.5t-54 -269.5q0 -44 8.5 -85.5t26.5 -80.5t52.5 -62.5t81.5 -23.5q4 0 18 -0.5t20 0t16 3t15 8.5t7 16q16 77 48 231.5t48 231.5q19 91 19 146zM1498 575q0 -7 -7.5 -13.5t-15.5 -6.5
+l-6 1q-22 3 -62 11t-72 12.5t-63 4.5q-167 0 -351 -93q-15 -8 -21 -27q-10 -36 -24.5 -105.5t-22.5 -100.5q-23 -91 -70 -179.5t-112.5 -164.5t-154.5 -123t-185 -47q-135 0 -214.5 83.5t-79.5 219.5q0 53 19.5 117t63 116.5t97.5 52.5q38 0 120 -33.5t83 -61.5
+q0 -1 -16.5 -12.5t-39.5 -31t-46 -44.5t-39 -61t-16 -74q0 -33 16.5 -53t48.5 -20q45 0 85 31.5t66.5 78t48 105.5t32.5 107t16 90v9q0 2 -3.5 3.5t-8.5 1.5h-10t-10 -0.5t-6 -0.5q-227 0 -352 122.5t-125 348.5q0 108 34.5 221t96 210t156 167.5t204.5 89.5q52 9 106 9
+q374 0 374 -360q0 -98 -38 -273t-43 -211l3 -3q101 57 182.5 88t167.5 31q22 0 53 -13q19 -7 80 -102.5t61 -116.5z" />
+    <glyph glyph-name="uniF2A7" unicode="&#xf2a7;" horiz-adv-x="1664" 
+d="M831 863q32 0 59 -18l222 -148q61 -40 110 -97l146 -170q40 -46 29 -106l-72 -413q-6 -32 -29.5 -53.5t-55.5 -25.5l-527 -56l-352 -32h-9q-39 0 -67.5 28t-28.5 68q0 37 27 64t65 32l260 32h-448q-41 0 -69.5 30t-26.5 71q2 39 32 65t69 26l442 1l-521 64q-41 5 -66 37
+t-19 73q6 35 34.5 57.5t65.5 22.5h10l481 -60l-351 94q-38 10 -62 41.5t-18 68.5q6 36 33 58.5t62 22.5q6 0 20 -2l448 -96l217 -37q1 0 3 -0.5t3 -0.5q23 0 30.5 23t-12.5 36l-186 125q-35 23 -42 63.5t18 73.5q27 38 76 38zM761 661l186 -125l-218 37l-5 2l-36 38
+l-238 262q-1 1 -2.5 3.5t-2.5 3.5q-24 31 -18.5 70t37.5 64q31 23 68 17.5t64 -33.5l142 -147q-2 -1 -5 -3.5t-4 -4.5q-32 -45 -23 -99t55 -85zM1648 1115l15 -266q4 -73 -11 -147l-48 -219q-12 -59 -67 -87l-106 -54q2 62 -39 109l-146 170q-53 61 -117 103l-222 148
+q-34 23 -76 23q-51 0 -88 -37l-235 312q-25 33 -18 73.5t41 63.5q33 22 71.5 14t62.5 -40l266 -352l-262 455q-21 35 -10.5 75t47.5 59q35 18 72.5 6t57.5 -46l241 -420l-136 337q-15 35 -4.5 74t44.5 56q37 19 76 6t56 -51l193 -415l101 -196q8 -15 23 -17.5t27 7.5t11 26
+l-12 224q-2 41 26 71t69 31q39 0 67 -28.5t30 -67.5z" />
+    <glyph glyph-name="uniF2A8" unicode="&#xf2a8;" horiz-adv-x="1792" 
+d="M335 180q-2 0 -6 2q-86 57 -168.5 145t-139.5 180q-21 30 -21 69q0 9 2 19t4 18t7 18t8.5 16t10.5 17t10 15t12 15.5t11 14.5q184 251 452 365q-110 198 -110 211q0 19 17 29q116 64 128 64q18 0 28 -16l124 -229q92 19 192 19q266 0 497.5 -137.5t378.5 -369.5
+q20 -31 20 -69t-20 -69q-91 -142 -218.5 -253.5t-278.5 -175.5q110 -198 110 -211q0 -20 -17 -29q-116 -64 -127 -64q-19 0 -29 16l-124 229l-64 119l-444 820l7 7q-58 -24 -99 -47q3 -5 127 -234t243 -449t119 -223q0 -7 -9 -9q-13 -3 -72 -3q-57 0 -60 7l-456 841
+q-39 -28 -82 -68q24 -43 214 -393.5t190 -354.5q0 -10 -11 -10q-14 0 -82.5 22t-72.5 28l-106 197l-224 413q-44 -53 -78 -106q2 -3 18 -25t23 -34l176 -327q0 -10 -10 -10zM1165 282l49 -91q273 111 450 385q-180 277 -459 389q67 -64 103 -148.5t36 -176.5
+q0 -106 -47 -200.5t-132 -157.5zM848 896q0 -20 14 -34t34 -14q86 0 147 -61t61 -147q0 -20 14 -34t34 -14t34 14t14 34q0 126 -89 215t-215 89q-20 0 -34 -14t-14 -34zM1214 961l-9 4l7 -7z" />
+    <glyph glyph-name="uniF2A9" unicode="&#xf2a9;" horiz-adv-x="1280" 
+d="M1050 430q0 -215 -147 -374q-148 -161 -378 -161q-232 0 -378 161q-147 159 -147 374q0 147 68 270.5t189 196.5t268 73q96 0 182 -31q-32 -62 -39 -126q-66 28 -143 28q-167 0 -280.5 -123t-113.5 -291q0 -170 112.5 -288.5t281.5 -118.5t281 118.5t112 288.5
+q0 89 -32 166q66 13 123 49q41 -98 41 -212zM846 619q0 -192 -79.5 -345t-238.5 -253l-14 -1q-29 0 -62 5q83 32 146.5 102.5t99.5 154.5t58.5 189t30 192.5t7.5 178.5q0 69 -3 103q55 -160 55 -326zM791 947v-2q-73 214 -206 440q88 -59 142.5 -186.5t63.5 -251.5z
+M1035 744q-83 0 -160 75q218 120 290 247q19 37 21 56q-42 -94 -139.5 -166.5t-204.5 -97.5q-35 54 -35 113q0 37 17 79t43 68q46 44 157 74q59 16 106 58.5t74 100.5q74 -105 74 -253q0 -109 -24 -170q-32 -77 -88.5 -130.5t-130.5 -53.5z" />
+    <glyph glyph-name="uniF2AA" unicode="&#xf2aa;" 
+d="M1050 495q0 78 -28 147q-41 -25 -85 -34q22 -50 22 -114q0 -117 -77 -198.5t-193 -81.5t-193.5 81.5t-77.5 198.5q0 115 78 199.5t193 84.5q53 0 98 -19q4 43 27 87q-60 21 -125 21q-154 0 -257.5 -108.5t-103.5 -263.5t103.5 -261t257.5 -106t257.5 106.5t103.5 260.5z
+M872 850q2 -24 2 -71q0 -63 -5 -123t-20.5 -132.5t-40.5 -130t-68.5 -106t-100.5 -70.5q21 -3 42 -3h10q219 139 219 411q0 116 -38 225zM872 850q-4 80 -44 171.5t-98 130.5q92 -156 142 -302zM1207 955q0 102 -51 174q-41 -86 -124 -109q-69 -19 -109 -53.5t-40 -99.5
+q0 -40 24 -77q74 17 140.5 67t95.5 115q-4 -52 -74.5 -111.5t-138.5 -97.5q52 -52 110 -52q51 0 90 37t60 90q17 42 17 117zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="uniF2AB" unicode="&#xf2ab;" 
+d="M1279 388q0 22 -22 27q-67 15 -118 59t-80 108q-7 19 -7 25q0 15 19.5 26t43 17t43 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-12 0 -32 -8t-31 -8q-4 0 -12 2q5 95 5 114q0 79 -17 114q-36 78 -103 121.5t-152 43.5q-199 0 -275 -165q-17 -35 -17 -114q0 -19 5 -114
+q-4 -2 -14 -2q-12 0 -32 7.5t-30 7.5q-21 0 -38.5 -12t-17.5 -32q0 -21 19.5 -35.5t43 -20.5t43 -17t19.5 -26q0 -6 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -46 137 -68q2 -5 6 -26t11.5 -30.5t23.5 -9.5q12 0 37.5 4.5t39.5 4.5q35 0 67 -15t54 -32.5t57.5 -32.5
+t76.5 -15q43 0 79 15t57.5 32.5t53.5 32.5t67 15q14 0 39.5 -4t38.5 -4q16 0 23 10t11 30t6 25q137 22 137 68zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="uniF2AC" unicode="&#xf2ac;" horiz-adv-x="1664" 
+d="M848 1408q134 1 240.5 -68.5t163.5 -192.5q27 -58 27 -179q0 -47 -9 -191q14 -7 28 -7q18 0 51 13.5t51 13.5q29 0 56 -18t27 -46q0 -32 -31.5 -54t-69 -31.5t-69 -29t-31.5 -47.5q0 -15 12 -43q37 -82 102.5 -150t144.5 -101q28 -12 80 -23q28 -6 28 -35
+q0 -70 -219 -103q-7 -11 -11 -39t-14 -46.5t-33 -18.5q-20 0 -62 6.5t-64 6.5q-37 0 -62 -5q-32 -5 -63 -22.5t-58 -38t-58 -40.5t-76 -33.5t-99 -13.5q-52 0 -96.5 13.5t-75 33.5t-57.5 40.5t-58 38t-62 22.5q-26 5 -63 5q-24 0 -65.5 -7.5t-58.5 -7.5q-25 0 -35 18.5
+t-14 47.5t-11 40q-219 33 -219 103q0 29 28 35q52 11 80 23q78 32 144.5 101t102.5 150q12 28 12 43q0 28 -31.5 47.5t-69.5 29.5t-69.5 31.5t-31.5 52.5q0 27 26 45.5t55 18.5q15 0 48 -13t53 -13q18 0 32 7q-9 142 -9 190q0 122 27 180q64 137 172 198t264 63z" />
+    <glyph glyph-name="uniF2AD" unicode="&#xf2ad;" 
+d="M1280 388q0 22 -22 27q-67 14 -118 58t-80 109q-7 14 -7 25q0 15 19.5 26t42.5 17t42.5 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-11 0 -31 -8t-32 -8q-4 0 -12 2q5 63 5 115q0 78 -17 114q-36 78 -102.5 121.5t-152.5 43.5q-198 0 -275 -165q-18 -38 -18 -115
+q0 -38 6 -114q-10 -2 -15 -2q-11 0 -31.5 8t-30.5 8q-20 0 -37.5 -12.5t-17.5 -32.5q0 -21 19.5 -35.5t42.5 -20.5t42.5 -17t19.5 -26q0 -11 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -47 138 -69q2 -5 6 -26t11 -30.5t23 -9.5q13 0 38.5 5t38.5 5q35 0 67.5 -15
+t54.5 -32.5t57.5 -32.5t76.5 -15q43 0 79 15t57.5 32.5t54 32.5t67.5 15q13 0 39 -4.5t39 -4.5q15 0 22.5 9.5t11.5 31t5 24.5q138 22 138 69zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960
+q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF2AE" unicode="&#xf2ae;" horiz-adv-x="2304" 
+d="M2304 1536q-69 -46 -125 -92t-89 -81t-59.5 -71.5t-37.5 -57.5t-22 -44.5t-14 -29.5q-10 -18 -35.5 -136.5t-48.5 -164.5q-15 -29 -50 -60.5t-67.5 -50.5t-72.5 -41t-48 -28q-47 -31 -151 -231q-341 14 -630 -158q-92 -53 -303 -179q47 16 86 31t55 22l15 7
+q71 27 163 64.5t133.5 53.5t108 34.5t142.5 31.5q186 31 465 -7q1 0 10 -3q11 -6 14 -17t-3 -22l-194 -345q-15 -29 -47 -22q-128 24 -354 24q-146 0 -402 -44.5t-392 -46.5q-82 -1 -149 13t-107 37t-61 40t-33 34l-1 1v2q0 6 6 6q138 0 371 55q192 366 374.5 524t383.5 158
+q5 0 14.5 -0.5t38 -5t55 -12t61.5 -24.5t63 -39.5t54 -59t40 -82.5l102 177q2 4 21 42.5t44.5 86.5t61 109.5t84 133.5t100.5 137q66 82 128 141.5t121.5 96.5t92.5 53.5t88 39.5z" />
+    <glyph glyph-name="uniF2B0" unicode="&#xf2b0;" 
+d="M1322 640q0 -45 -5 -76l-236 14l224 -78q-19 -73 -58 -141l-214 103l177 -158q-44 -61 -107 -108l-157 178l103 -215q-61 -37 -140 -59l-79 228l14 -240q-38 -6 -76 -6t-76 6l14 238l-78 -226q-74 19 -140 59l103 215l-157 -178q-59 43 -108 108l178 158l-214 -104
+q-39 69 -58 141l224 79l-237 -14q-5 42 -5 76q0 35 5 77l238 -14l-225 79q19 73 58 140l214 -104l-177 159q46 61 107 108l158 -178l-103 215q67 39 140 58l77 -224l-13 236q36 6 75 6q38 0 76 -6l-14 -237l78 225q74 -19 140 -59l-103 -214l158 178q61 -47 107 -108
+l-177 -159l213 104q37 -62 58 -141l-224 -78l237 14q5 -31 5 -77zM1352 640q0 160 -78.5 295.5t-213 214t-292.5 78.5q-119 0 -227 -46.5t-186.5 -125t-124.5 -187.5t-46 -229q0 -119 46 -228t124.5 -187.5t186.5 -125t227 -46.5q158 0 292.5 78.5t213 214t78.5 294.5z
+M1425 1023v-766l-657 -383l-657 383v766l657 383zM768 -183l708 412v823l-708 411l-708 -411v-823zM1536 1088v-896l-768 -448l-768 448v896l768 448z" />
+    <glyph glyph-name="uniF2B1" unicode="&#xf2b1;" horiz-adv-x="1664" 
+d="M339 1318h691l-26 -72h-665q-110 0 -188.5 -79t-78.5 -189v-771q0 -95 60.5 -169.5t153.5 -93.5q23 -5 98 -5v-72h-45q-140 0 -239.5 100t-99.5 240v771q0 140 99.5 240t239.5 100zM1190 1536h247l-482 -1294q-23 -61 -40.5 -103.5t-45 -98t-54 -93.5t-64.5 -78.5
+t-79.5 -65t-95.5 -41t-116 -18.5v195q163 26 220 182q20 52 20 105q0 54 -20 106l-285 733h228l187 -585zM1664 978v-1111h-795q37 55 45 73h678v1038q0 85 -49.5 155t-129.5 99l25 67q101 -34 163.5 -123.5t62.5 -197.5z" />
+    <glyph glyph-name="uniF2B2" unicode="&#xf2b2;" horiz-adv-x="1792" 
+d="M852 1227q0 -29 -17 -52.5t-45 -23.5t-45 23.5t-17 52.5t17 52.5t45 23.5t45 -23.5t17 -52.5zM688 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50 -21.5t-20 -51.5v-114q0 -30 20.5 -52t49.5 -22q30 0 50.5 22t20.5 52zM860 -149v114q0 30 -20 51.5t-50 21.5t-50.5 -21.5
+t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22q29 0 49.5 22t20.5 52zM1034 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1208 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114
+q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1476 535q-84 -160 -232 -259.5t-323 -99.5q-123 0 -229.5 51.5t-178.5 137t-113 197.5t-41 232q0 88 21 174q-104 -175 -104 -390q0 -162 65 -312t185 -251q30 57 91 57q56 0 86 -50q32 50 87 50q56 0 86 -50q32 50 87 50t87 -50
+q30 50 86 50q28 0 52.5 -15.5t37.5 -40.5q112 94 177 231.5t73 287.5zM1326 564q0 75 -72 75q-17 0 -47 -6q-95 -19 -149 -19q-226 0 -226 243q0 86 30 204q-83 -127 -83 -275q0 -150 89 -260.5t235 -110.5q111 0 210 70q13 48 13 79zM884 1223q0 50 -32 89.5t-81 39.5
+t-81 -39.5t-32 -89.5q0 -51 31.5 -90.5t81.5 -39.5t81.5 39.5t31.5 90.5zM1513 884q0 96 -37.5 179t-113 137t-173.5 54q-77 0 -149 -35t-127 -94q-48 -159 -48 -268q0 -104 45.5 -157t147.5 -53q53 0 142 19q36 6 53 6q51 0 77.5 -28t26.5 -80q0 -26 -4 -46
+q75 68 117.5 165.5t42.5 200.5zM1792 667q0 -111 -33.5 -249.5t-93.5 -204.5q-58 -64 -195 -142.5t-228 -104.5l-4 -1v-114q0 -43 -29.5 -75t-72.5 -32q-56 0 -86 50q-32 -50 -87 -50t-87 50q-30 -50 -86 -50q-55 0 -87 50q-30 -50 -86 -50q-47 0 -75 33.5t-28 81.5
+q-90 -68 -198 -68q-118 0 -211 80q54 1 106 20q-113 31 -182 127q32 -7 71 -7q89 0 164 46q-192 192 -240 306q-24 56 -24 160q0 57 9 125.5t31.5 146.5t55 141t86.5 105t120 42q59 0 81 -52q19 29 42 54q2 3 12 13t13 16q10 15 23 38t25 42t28 39q87 111 211.5 177
+t260.5 66q35 0 62 -4q59 64 146 64q83 0 140 -57q5 -5 5 -12q0 -5 -6 -13.5t-12.5 -16t-16 -17l-10.5 -10.5q17 -6 36 -18t19 -24q0 -6 -16 -25q157 -138 197 -378q25 30 60 30q45 0 100 -49q90 -80 90 -279z" />
+    <glyph glyph-name="uniF2B3" unicode="&#xf2b3;" 
+d="M917 631q0 33 -6 64h-362v-132h217q-12 -76 -74.5 -120.5t-142.5 -44.5q-99 0 -169 71.5t-70 170.5t70 170.5t169 71.5q93 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585h109v110
+h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="uniF2B4" unicode="&#xf2b4;" 
+d="M1536 1024v-839q0 -48 -49 -62q-174 -52 -338 -52q-73 0 -215.5 29.5t-227.5 29.5q-164 0 -370 -48v-338h-160v1368q-63 25 -101 81t-38 124q0 91 64 155t155 64t155 -64t64 -155q0 -68 -38 -124t-101 -81v-68q190 44 343 44q99 0 198 -15q14 -2 111.5 -22.5t149.5 -20.5
+q77 0 165 18q11 2 80 21t89 19q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="uniF2B5" unicode="&#xf2b5;" horiz-adv-x="2304" 
+d="M192 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32zM1665 442q-10 13 -38.5 50t-41.5 54t-38 49t-42.5 53t-40.5 47t-45 49l-125 -140q-83 -94 -208.5 -92t-205.5 98q-57 69 -56.5 158t58.5 157l177 206q-22 11 -51 16.5t-47.5 6t-56.5 -0.5t-49 -1q-92 0 -158 -66
+l-158 -158h-155v-544q5 0 21 0.5t22 0t19.5 -2t20.5 -4.5t17.5 -8.5t18.5 -13.5l297 -292q115 -111 227 -111q78 0 125 47q57 -20 112.5 8t72.5 85q74 -6 127 44q20 18 36 45.5t14 50.5q10 -10 43 -10q43 0 77 21t49.5 53t12 71.5t-30.5 73.5zM1824 384h96v512h-93l-157 180
+q-66 76 -169 76h-167q-89 0 -146 -67l-209 -243q-28 -33 -28 -75t27 -75q43 -51 110 -52t111 49l193 218q25 23 53.5 21.5t47 -27t8.5 -56.5q16 -19 56 -63t60 -68q29 -36 82.5 -105.5t64.5 -84.5q52 -66 60 -140zM2112 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32z
+M2304 960v-640q0 -26 -19 -45t-45 -19h-434q-27 -65 -82 -106.5t-125 -51.5q-33 -48 -80.5 -81.5t-102.5 -45.5q-42 -53 -104.5 -81.5t-128.5 -24.5q-60 -34 -126 -39.5t-127.5 14t-117 53.5t-103.5 81l-287 282h-358q-26 0 -45 19t-19 45v672q0 26 19 45t45 19h421
+q14 14 47 48t47.5 48t44 40t50.5 37.5t51 25.5t62 19.5t68 5.5h117q99 0 181 -56q82 56 181 56h167q35 0 67 -6t56.5 -14.5t51.5 -26.5t44.5 -31t43 -39.5t39 -42t41 -48t41.5 -48.5h355q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="uniF2B6" unicode="&#xf2b6;" horiz-adv-x="1792" 
+d="M1792 882v-978q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v978q0 15 11 24q8 7 39 34.5t41.5 36t45.5 37.5t70 55.5t96 73t143.5 107t192.5 140.5q5 4 52.5 40t71.5 52.5t64 35t69 18.5t69 -18.5t65 -35.5t71 -52t52 -40q110 -80 192.5 -140.5t143.5 -107
+t96 -73t70 -55.5t45.5 -37.5t41.5 -36t39 -34.5q11 -9 11 -24zM1228 297q263 191 345 252q11 8 12.5 20.5t-6.5 23.5l-38 52q-8 11 -21 12.5t-24 -6.5q-231 -169 -343 -250q-5 -3 -52 -39t-71.5 -52.5t-64.5 -35t-69 -18.5t-69 18.5t-64.5 35t-71.5 52.5t-52 39
+q-186 134 -343 250q-11 8 -24 6.5t-21 -12.5l-38 -52q-8 -11 -6.5 -23.5t12.5 -20.5q82 -61 345 -252q10 -8 50 -38t65 -47t64 -39.5t77.5 -33.5t75.5 -11t75.5 11t79 34.5t64.5 39.5t65 47.5t48 36.5z" />
+    <glyph glyph-name="uniF2B7" unicode="&#xf2b7;" horiz-adv-x="1792" 
+d="M1474 623l39 -51q8 -11 6.5 -23.5t-11.5 -20.5q-43 -34 -126.5 -98.5t-146.5 -113t-67 -51.5q-39 -32 -60 -48t-60.5 -41t-76.5 -36.5t-74 -11.5h-1h-1q-37 0 -74 11.5t-76 36.5t-61 41.5t-60 47.5q-5 4 -65 50.5t-143.5 111t-122.5 94.5q-11 8 -12.5 20.5t6.5 23.5
+l37 52q8 11 21.5 13t24.5 -7q94 -73 306 -236q5 -4 43.5 -35t60.5 -46.5t56.5 -32.5t58.5 -17h1h1q24 0 58.5 17t56.5 32.5t60.5 46.5t43.5 35q258 198 313 242q11 8 24 6.5t21 -12.5zM1664 -96v928q-90 83 -159 139q-91 74 -389 304q-3 2 -43 35t-61 48t-56 32.5t-59 17.5
+h-1h-1q-24 0 -59 -17.5t-56 -32.5t-61 -48t-43 -35q-215 -166 -315.5 -245.5t-129.5 -104t-82 -74.5q-14 -12 -21 -19v-928q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 832v-928q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v928q0 56 41 94
+q123 114 350 290.5t233 181.5q36 30 59 47.5t61.5 42t76 36.5t74.5 12h1h1q37 0 74.5 -12t76 -36.5t61.5 -42t59 -47.5q43 -36 156 -122t226 -177t201 -173q41 -38 41 -94z" />
+    <glyph glyph-name="uniF2B8" unicode="&#xf2b8;" 
+d="M330 1l202 -214l-34 236l-216 213zM556 -225l274 218l-11 245l-300 -215zM245 413l227 -213l-48 327l-245 204zM495 189l317 214l-14 324l-352 -200zM843 178l95 -80l-2 239l-103 79q0 -1 1 -8.5t0 -12t-5 -7.5l-78 -52l85 -70q7 -6 7 -88zM138 930l256 -200l-68 465
+l-279 173zM1173 267l15 234l-230 -164l2 -240zM417 722l373 194l-19 441l-423 -163zM1270 357l20 233l-226 142l-2 -105l144 -95q6 -4 4 -9l-7 -119zM1461 496l30 222l-179 -128l-20 -228zM1273 329l-71 49l-8 -117q0 -5 -4 -8l-234 -187q-7 -5 -14 0l-98 83l7 -161
+q0 -5 -4 -8l-293 -234q-4 -2 -6 -2q-8 2 -8 3l-228 242q-4 4 -59 277q-2 7 5 11l61 37q-94 86 -95 92l-72 351q-2 7 6 12l94 45q-133 100 -135 108l-96 466q-2 10 7 13l433 135q5 0 8 -1l317 -153q6 -4 6 -9l20 -463q0 -7 -6 -10l-118 -61l126 -85q5 -2 5 -8l5 -123l121 74
+q5 4 11 0l84 -56l3 110q0 6 5 9l206 126q6 3 11 0l245 -135q4 -4 5 -7t-6.5 -60t-17.5 -124.5t-10 -70.5q0 -5 -4 -7l-191 -153q-6 -5 -13 0z" />
+    <glyph glyph-name="uniF2B9" unicode="&#xf2b9;" horiz-adv-x="1664" 
+d="M1201 298q0 57 -5.5 107t-21 100.5t-39.5 86t-64 58t-91 22.5q-6 -4 -33.5 -20.5t-42.5 -24.5t-40.5 -20t-49 -17t-46.5 -5t-46.5 5t-49 17t-40.5 20t-42.5 24.5t-33.5 20.5q-51 0 -91 -22.5t-64 -58t-39.5 -86t-21 -100.5t-5.5 -107q0 -73 42 -121.5t103 -48.5h576
+q61 0 103 48.5t42 121.5zM1028 892q0 108 -76.5 184t-183.5 76t-183.5 -76t-76.5 -184q0 -107 76.5 -183t183.5 -76t183.5 76t76.5 183zM1664 352v-192q0 -14 -9 -23t-23 -9h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216
+q66 0 113 -47t47 -113v-224h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="uniF2BA" unicode="&#xf2ba;" horiz-adv-x="1664" 
+d="M1028 892q0 -107 -76.5 -183t-183.5 -76t-183.5 76t-76.5 183q0 108 76.5 184t183.5 76t183.5 -76t76.5 -184zM980 672q46 0 82.5 -17t60 -47.5t39.5 -67t24 -81t11.5 -82.5t3.5 -79q0 -67 -39.5 -118.5t-105.5 -51.5h-576q-66 0 -105.5 51.5t-39.5 118.5q0 48 4.5 93.5
+t18.5 98.5t36.5 91.5t63 64.5t93.5 26h5q7 -4 32 -19.5t35.5 -21t33 -17t37 -16t35 -9t39.5 -4.5t39.5 4.5t35 9t37 16t33 17t35.5 21t32 19.5zM1664 928q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96
+q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216q66 0 113 -47t47 -113v-224h96q13 0 22.5 -9.5t9.5 -22.5v-192zM1408 -96v1472q0 13 -9.5 22.5t-22.5 9.5h-1216
+q-13 0 -22.5 -9.5t-9.5 -22.5v-1472q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5z" />
+    <glyph glyph-name="uniF2BB" unicode="&#xf2bb;" horiz-adv-x="2048" 
+d="M1024 405q0 64 -9 117.5t-29.5 103t-60.5 78t-97 28.5q-6 -4 -30 -18t-37.5 -21.5t-35.5 -17.5t-43 -14.5t-42 -4.5t-42 4.5t-43 14.5t-35.5 17.5t-37.5 21.5t-30 18q-57 0 -97 -28.5t-60.5 -78t-29.5 -103t-9 -117.5t37 -106.5t91 -42.5h512q54 0 91 42.5t37 106.5z
+M867 925q0 94 -66.5 160.5t-160.5 66.5t-160.5 -66.5t-66.5 -160.5t66.5 -160.5t160.5 -66.5t160.5 66.5t66.5 160.5zM1792 416v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1792 676v56q0 15 -10.5 25.5t-25.5 10.5h-568
+q-15 0 -25.5 -10.5t-10.5 -25.5v-56q0 -15 10.5 -25.5t25.5 -10.5h568q15 0 25.5 10.5t10.5 25.5zM1792 928v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-352v96q0 14 -9 23t-23 9
+h-64q-14 0 -23 -9t-9 -23v-96h-768v96q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-96h-352q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2BC" unicode="&#xf2bc;" horiz-adv-x="2048" 
+d="M1024 405q0 -64 -37 -106.5t-91 -42.5h-512q-54 0 -91 42.5t-37 106.5t9 117.5t29.5 103t60.5 78t97 28.5q6 -4 30 -18t37.5 -21.5t35.5 -17.5t43 -14.5t42 -4.5t42 4.5t43 14.5t35.5 17.5t37.5 21.5t30 18q57 0 97 -28.5t60.5 -78t29.5 -103t9 -117.5zM867 925
+q0 -94 -66.5 -160.5t-160.5 -66.5t-160.5 66.5t-66.5 160.5t66.5 160.5t160.5 66.5t160.5 -66.5t66.5 -160.5zM1792 480v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1792 732v-56q0 -15 -10.5 -25.5t-25.5 -10.5h-568
+q-15 0 -25.5 10.5t-10.5 25.5v56q0 15 10.5 25.5t25.5 10.5h568q15 0 25.5 -10.5t10.5 -25.5zM1792 992v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1920 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1728q-13 0 -22.5 -9.5
+t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h352v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h768v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h352q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113
+t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2BD" unicode="&#xf2bd;" horiz-adv-x="1792" 
+d="M1523 197q-22 155 -87.5 257.5t-184.5 118.5q-67 -74 -159.5 -115.5t-195.5 -41.5t-195.5 41.5t-159.5 115.5q-119 -16 -184.5 -118.5t-87.5 -257.5q106 -150 271 -237.5t356 -87.5t356 87.5t271 237.5zM1280 896q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5
+t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1792 640q0 -182 -71 -347.5t-190.5 -286t-285.5 -191.5t-349 -71q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2BE" unicode="&#xf2be;" horiz-adv-x="1792" 
+d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348q0 -181 -70.5 -347t-190.5 -286t-286 -191.5t-349 -71.5t-349 71t-285.5 191.5t-190.5 286t-71 347.5t71 348t191 286t286 191t348 71zM1515 185q149 205 149 455q0 156 -61 298t-164 245t-245 164t-298 61t-298 -61
+t-245 -164t-164 -245t-61 -298q0 -250 149 -455q66 327 306 327q131 -128 313 -128t313 128q240 0 306 -327zM1280 832q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5z" />
+    <glyph glyph-name="uniF2C0" unicode="&#xf2c0;" 
+d="M1201 752q47 -14 89.5 -38t89 -73t79.5 -115.5t55 -172t22 -236.5q0 -154 -100 -263.5t-241 -109.5h-854q-141 0 -241 109.5t-100 263.5q0 131 22 236.5t55 172t79.5 115.5t89 73t89.5 38q-79 125 -79 272q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5
+t198.5 -40.5t163.5 -109.5t109.5 -163.5t40.5 -198.5q0 -147 -79 -272zM768 1408q-159 0 -271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5zM1195 -128q88 0 150.5 71.5t62.5 173.5q0 239 -78.5 377t-225.5 145
+q-145 -127 -336 -127t-336 127q-147 -7 -225.5 -145t-78.5 -377q0 -102 62.5 -173.5t150.5 -71.5h854z" />
+    <glyph glyph-name="uniF2C1" unicode="&#xf2c1;" horiz-adv-x="1280" 
+d="M1024 278q0 -64 -37 -107t-91 -43h-512q-54 0 -91 43t-37 107t9 118t29.5 104t61 78.5t96.5 28.5q80 -75 188 -75t188 75q56 0 96.5 -28.5t61 -78.5t29.5 -104t9 -118zM870 797q0 -94 -67.5 -160.5t-162.5 -66.5t-162.5 66.5t-67.5 160.5t67.5 160.5t162.5 66.5
+t162.5 -66.5t67.5 -160.5zM1152 -96v1376h-1024v-1376q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1280 1376v-1472q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h352v-96q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v96h352
+q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C2" unicode="&#xf2c2;" horiz-adv-x="2048" 
+d="M896 324q0 54 -7.5 100.5t-24.5 90t-51 68.5t-81 25q-64 -64 -156 -64t-156 64q-47 0 -81 -25t-51 -68.5t-24.5 -90t-7.5 -100.5q0 -55 31.5 -93.5t75.5 -38.5h426q44 0 75.5 38.5t31.5 93.5zM768 768q0 80 -56 136t-136 56t-136 -56t-56 -136t56 -136t136 -56t136 56
+t56 136zM1792 288v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1408 544v64q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1792 544v64q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23
+v-64q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1792 800v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM128 1152h1792v96q0 14 -9 23t-23 9h-1728q-14 0 -23 -9t-9 -23v-96zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728
+q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C3" unicode="&#xf2c3;" horiz-adv-x="2048" 
+d="M896 324q0 -55 -31.5 -93.5t-75.5 -38.5h-426q-44 0 -75.5 38.5t-31.5 93.5q0 54 7.5 100.5t24.5 90t51 68.5t81 25q64 -64 156 -64t156 64q47 0 81 -25t51 -68.5t24.5 -90t7.5 -100.5zM768 768q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z
+M1792 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1408 608v-64q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h320q14 0 23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v64
+q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 864v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1920 32v1120h-1792v-1120q0 -13 9.5 -22.5t22.5 -9.5h1728q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47
+h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C4" unicode="&#xf2c4;" horiz-adv-x="1792" 
+d="M1255 749q0 318 -105 474.5t-330 156.5q-222 0 -326 -157t-104 -474q0 -316 104 -471.5t326 -155.5q74 0 131 17q-22 43 -39 73t-44 65t-53.5 56.5t-63 36t-77.5 14.5q-46 0 -79 -16l-49 97q105 91 276 91q132 0 215.5 -54t150.5 -155q67 149 67 402zM1645 117h117
+q3 -27 -2 -67t-26.5 -95t-58 -100.5t-107 -78t-162.5 -32.5q-71 0 -130.5 19t-105.5 56t-79 78t-66 96q-97 -27 -205 -27q-150 0 -292.5 58t-253 158.5t-178 249t-67.5 317.5q0 170 67.5 319.5t178.5 250.5t253.5 159t291.5 58q121 0 238.5 -36t217 -106t176 -164.5
+t119.5 -219t43 -261.5q0 -190 -80.5 -347.5t-218.5 -264.5q47 -70 93.5 -106.5t104.5 -36.5q61 0 94 37.5t38 85.5z" />
+    <glyph glyph-name="uniF2C5" unicode="&#xf2c5;" horiz-adv-x="2304" 
+d="M453 -101q0 -21 -16 -37.5t-37 -16.5q-1 0 -13 3q-63 15 -162 140q-225 284 -225 676q0 341 213 614q39 51 95 103.5t94 52.5q19 0 35 -13.5t16 -32.5q0 -27 -63 -90q-98 -102 -147 -184q-119 -199 -119 -449q0 -281 123 -491q50 -85 136 -173q2 -3 14.5 -16t19.5 -21
+t17 -20.5t14.5 -23.5t4.5 -21zM1796 33q0 -29 -17.5 -48.5t-46.5 -19.5h-1081q-26 0 -45 19t-19 45q0 29 17.5 48.5t46.5 19.5h1081q26 0 45 -19t19 -45zM1581 644q0 -134 -67 -233q-25 -38 -69.5 -78.5t-83.5 -60.5q-16 -10 -27 -10q-7 0 -15 6t-8 12q0 9 19 30t42 46
+t42 67.5t19 88.5q0 76 -35 130q-29 42 -46 42q-3 0 -3 -5q0 -12 7.5 -35.5t7.5 -36.5q0 -22 -21.5 -35t-44.5 -13q-66 0 -66 76q0 15 1.5 44t1.5 44q0 25 -10 46q-13 25 -42 53.5t-51 28.5q-5 0 -7 -0.5t-3.5 -2.5t-1.5 -6q0 -2 16 -26t16 -54q0 -37 -19 -68t-46 -54
+t-53.5 -46t-45.5 -54t-19 -68q0 -98 42 -160q29 -43 79 -63q16 -5 17 -10q1 -2 1 -5q0 -16 -18 -16q-6 0 -33 11q-119 43 -195 139.5t-76 218.5q0 55 24.5 115.5t60 115t70.5 108.5t59.5 113.5t24.5 111.5q0 53 -25 94q-29 48 -56 64q-19 9 -19 21q0 20 41 20q50 0 110 -29
+q41 -19 71 -44.5t49.5 -51t33.5 -62.5t22 -69t16 -80q0 -1 3 -17.5t4.5 -25t5.5 -25t9 -27t11 -21.5t14.5 -16.5t18.5 -5.5q23 0 37 14t14 37q0 25 -20 67t-20 52t10 10q27 0 93 -70q72 -76 102.5 -156t30.5 -186zM2304 615q0 -274 -138 -503q-19 -32 -48 -72t-68 -86.5
+t-81 -77t-74 -30.5q-16 0 -31 15.5t-15 31.5q0 15 29 50.5t68.5 77t48.5 52.5q183 230 183 531q0 131 -20.5 235t-72.5 211q-58 119 -163 228q-2 3 -13 13.5t-16.5 16.5t-15 17.5t-15 20t-9.5 18.5t-4 19q0 19 16 35.5t35 16.5q70 0 196 -169q98 -131 146 -273t60 -314
+q2 -42 2 -64z" />
+    <glyph glyph-name="uniF2C6" unicode="&#xf2c6;" horiz-adv-x="1792" 
+d="M1189 229l147 693q9 44 -10.5 63t-51.5 7l-864 -333q-29 -11 -39.5 -25t-2.5 -26.5t32 -19.5l221 -69l513 323q21 14 32 6q7 -5 -4 -15l-415 -375v0v0l-16 -228q23 0 45 22l108 104l224 -165q64 -36 81 38zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
+t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2C7" unicode="&#xf2c7;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v907h128v-907q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2C8" unicode="&#xf2c8;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v651h128v-651q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2C9" unicode="&#xf2c9;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v395h128v-395q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2CA" unicode="&#xf2ca;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v139h128v-139q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2CB" unicode="&#xf2cb;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 79 56 135.5t136 56.5t136 -56.5t56 -135.5zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5z
+M896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192v128h192z" />
+    <glyph glyph-name="uniF2CC" unicode="&#xf2cc;" horiz-adv-x="1920" 
+d="M1433 1287q10 -10 10 -23t-10 -23l-626 -626q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l44 44q-72 91 -81.5 207t46.5 215q-74 71 -176 71q-106 0 -181 -75t-75 -181v-1280h-256v1280q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5q106 0 201 -41
+t166 -115q94 39 197 24.5t185 -79.5l44 44q10 10 23 10t23 -10zM1344 1024q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1600 896q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1856 1024q26 0 45 -19t19 -45t-19 -45t-45 -19
+t-45 19t-19 45t19 45t45 19zM1216 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1408 832q0 26 19 45t45 19t45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45zM1728 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 768
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 640q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1600 768q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 512q-26 0 -45 19t-19 45t19 45t45 19t45 -19
+t19 -45t-19 -45t-45 -19zM1472 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 384
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 256q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19z" />
+    <glyph glyph-name="uniF2CD" unicode="&#xf2cd;" horiz-adv-x="1792" 
+d="M1664 448v-192q0 -169 -128 -286v-194q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v118q-63 -22 -128 -22h-768q-65 0 -128 22v-110q0 -17 -9.5 -28.5t-22.5 -11.5h-64q-13 0 -22.5 11.5t-9.5 28.5v186q-128 117 -128 286v192h1536zM704 864q0 -14 -9 -23t-23 -9t-23 9
+t-9 23t9 23t23 9t23 -9t9 -23zM768 928q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM704 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1056q0 -14 -9 -23t-23 -9t-23 9
+t-9 23t9 23t23 9t23 -9t9 -23zM704 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v640q0 106 75 181t181 75q108 0 184 -78q46 19 98 12t93 -39l22 22q11 11 22 0l42 -42
+q11 -11 0 -22l-314 -314q-11 -11 -22 0l-42 42q-11 11 0 22l22 22q-36 46 -40.5 104t23.5 108q-37 35 -88 35q-53 0 -90.5 -37.5t-37.5 -90.5v-640h1504q14 0 23 -9t9 -23zM896 1056q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1120q0 -14 -9 -23t-23 -9
+t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM896 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1248q0 -14 -9 -23
+t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1024 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1088 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23z" />
+    <glyph glyph-name="uniF2CE" unicode="&#xf2ce;" 
+d="M994 344q0 -86 -17 -197q-31 -215 -55 -313q-22 -90 -152 -90t-152 90q-24 98 -55 313q-17 110 -17 197q0 168 224 168t224 -168zM1536 768q0 -240 -134 -434t-350 -280q-8 -3 -15 3t-6 15q7 48 10 66q4 32 6 47q1 9 9 12q159 81 255.5 234t96.5 337q0 180 -91 330.5
+t-247 234.5t-337 74q-124 -7 -237 -61t-193.5 -140.5t-128 -202t-46.5 -240.5q1 -184 99 -336.5t257 -231.5q7 -3 9 -12q3 -21 6 -45q1 -9 5 -32.5t6 -35.5q1 -9 -6.5 -15t-15.5 -2q-148 58 -261 169.5t-173.5 264t-52.5 319.5q7 143 66 273.5t154.5 227t225 157.5t272.5 70
+q164 10 315.5 -46.5t261 -160.5t175 -250.5t65.5 -308.5zM994 800q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5zM1282 768q0 -122 -53.5 -228.5t-146.5 -177.5q-8 -6 -16 -2t-10 14q-6 52 -29 92q-7 10 3 20
+q58 54 91 127t33 155q0 111 -58.5 204t-157.5 141.5t-212 36.5q-133 -15 -229 -113t-109 -231q-10 -92 23.5 -176t98.5 -144q10 -10 3 -20q-24 -41 -29 -93q-2 -9 -10 -13t-16 2q-95 74 -148.5 183t-51.5 234q3 131 69 244t177 181.5t241 74.5q144 7 268 -60t196.5 -187.5
+t72.5 -263.5z" />
+    <glyph glyph-name="uniF2D0" unicode="&#xf2d0;" horiz-adv-x="1792" 
+d="M256 128h1280v768h-1280v-768zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D1" unicode="&#xf2d1;" horiz-adv-x="1792" 
+d="M1792 224v-192q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D2" unicode="&#xf2d2;" horiz-adv-x="2048" 
+d="M256 0h768v512h-768v-512zM1280 512h512v768h-768v-256h96q66 0 113 -47t47 -113v-352zM2048 1376v-960q0 -66 -47 -113t-113 -47h-608v-352q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h608v352q0 66 47 113t113 47h960q66 0 113 -47
+t47 -113z" />
+    <glyph glyph-name="uniF2D3" unicode="&#xf2d3;" horiz-adv-x="1792" 
+d="M1175 215l146 146q10 10 10 23t-10 23l-233 233l233 233q10 10 10 23t-10 23l-146 146q-10 10 -23 10t-23 -10l-233 -233l-233 233q-10 10 -23 10t-23 -10l-146 -146q-10 -10 -10 -23t10 -23l233 -233l-233 -233q-10 -10 -10 -23t10 -23l146 -146q10 -10 23 -10t23 10
+l233 233l233 -233q10 -10 23 -10t23 10zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D4" unicode="&#xf2d4;" horiz-adv-x="1792" 
+d="M1257 425l-146 -146q-10 -10 -23 -10t-23 10l-169 169l-169 -169q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l169 169l-169 169q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l169 -169l169 169q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+l-169 -169l169 -169q10 -10 10 -23t-10 -23zM256 128h1280v1024h-1280v-1024zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D5" unicode="&#xf2d5;" horiz-adv-x="1792" 
+d="M1070 358l306 564h-654l-306 -564h654zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2D6" unicode="&#xf2d6;" horiz-adv-x="1794" 
+d="M1291 1060q-15 17 -35 8.5t-26 -28.5t5 -38q14 -17 40 -14.5t34 20.5t-18 52zM895 814q-8 -8 -19.5 -8t-18.5 8q-8 8 -8 19t8 18q7 8 18.5 8t19.5 -8q7 -7 7 -18t-7 -19zM1060 740l-35 -35q-12 -13 -29.5 -13t-30.5 13l-38 38q-12 13 -12 30t12 30l35 35q12 12 29.5 12
+t30.5 -12l38 -39q12 -12 12 -29.5t-12 -29.5zM951 870q-7 -8 -18.5 -8t-19.5 8q-7 8 -7 19t7 19q8 8 19 8t19 -8t8 -19t-8 -19zM1354 968q-34 -64 -107.5 -85.5t-127.5 16.5q-38 28 -61 66.5t-21 87.5t39 92t75.5 53t70.5 -5t70 -51q2 -2 13 -12.5t14.5 -13.5t13 -13.5
+t12.5 -15.5t10 -15.5t8.5 -18t4 -18.5t1 -21t-5 -22t-9.5 -24zM1555 486q3 20 -8.5 34.5t-27.5 21.5t-33 17t-23 20q-40 71 -84 98.5t-113 11.5q19 13 40 18.5t33 4.5l12 -1q2 45 -34 90q6 20 6.5 40.5t-2.5 30.5l-3 10q43 24 71 65t34 91q10 84 -43 150.5t-137 76.5
+q-60 7 -114 -18.5t-82 -74.5q-30 -51 -33.5 -101t14.5 -87t43.5 -64t56.5 -42q-45 4 -88 36t-57 88q-28 108 32 222q-16 21 -29 32q-50 0 -89 -19q19 24 42 37t36 14l13 1q0 50 -13 78q-10 21 -32.5 28.5t-47 -3.5t-37.5 -40q2 4 4 7q-7 -28 -6.5 -75.5t19 -117t48.5 -122.5
+q-25 -14 -47 -36q-35 -16 -85.5 -70.5t-84.5 -101.5l-33 -46q-90 -34 -181 -125.5t-75 -162.5q1 -16 11 -27q-15 -12 -30 -30q-21 -25 -21 -54t21.5 -40t63.5 6q41 19 77 49.5t55 60.5q-2 2 -6.5 5t-20.5 7.5t-33 3.5q23 5 51 12.5t40 10t27.5 6t26 4t23.5 0.5q14 -7 22 34
+q7 37 7 90q0 102 -40 150q106 -103 101 -219q-1 -29 -15 -50t-27 -27l-13 -6q-4 -7 -19 -32t-26 -45.5t-26.5 -52t-25 -61t-17 -63t-6.5 -66.5t10 -63q-35 54 -37 80q-22 -24 -34.5 -39t-33.5 -42t-30.5 -46t-16.5 -41t-0.5 -38t25.5 -27q45 -25 144 64t190.5 221.5
+t122.5 228.5q86 52 145 115.5t86 119.5q47 -93 154 -178q104 -83 167 -80q39 2 46 43zM1794 640q0 -182 -71 -348t-191 -286t-286.5 -191t-348.5 -71t-348.5 71t-286.5 191t-191 286t-71 348t71 348t191 286t286.5 191t348.5 71t348.5 -71t286.5 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2D7" unicode="&#xf2d7;" 
+d="M518 1353v-655q103 -1 191.5 1.5t125.5 5.5l37 3q68 2 90.5 24.5t39.5 94.5l33 142h103l-14 -322l7 -319h-103l-29 127q-15 68 -45 93t-84 26q-87 8 -352 8v-556q0 -78 43.5 -115.5t133.5 -37.5h357q35 0 59.5 2t55 7.5t54 18t48.5 32t46 50.5t39 73l93 216h89
+q-6 -37 -31.5 -252t-30.5 -276q-146 5 -263.5 8t-162.5 4h-44h-628l-376 -12v102l127 25q67 13 91.5 37t25.5 79l8 643q3 402 -8 645q-2 61 -25.5 84t-91.5 36l-127 24v102l376 -12h702q139 0 374 27q-6 -68 -14 -194.5t-12 -219.5l-5 -92h-93l-32 124q-31 121 -74 179.5
+t-113 58.5h-548q-28 0 -35.5 -8.5t-7.5 -30.5z" />
+    <glyph glyph-name="uniF2D8" unicode="&#xf2d8;" 
+d="M922 739v-182q0 -4 0.5 -15t0 -15l-1.5 -12t-3.5 -11.5t-6.5 -7.5t-11 -5.5t-16 -1.5v309q9 0 16 -1t11 -5t6.5 -5.5t3.5 -9.5t1 -10.5v-13.5v-14zM1238 643v-121q0 -1 0.5 -12.5t0 -15.5t-2.5 -11.5t-7.5 -10.5t-13.5 -3q-9 0 -14 9q-4 10 -4 165v7v8.5v9t1.5 8.5l3.5 7
+t5 5.5t8 1.5q6 0 10 -1.5t6.5 -4.5t4 -6t2 -8.5t0.5 -8v-9.5v-9zM180 407h122v472h-122v-472zM614 407h106v472h-159l-28 -221q-20 148 -32 221h-158v-472h107v312l45 -312h76l43 319v-319zM1039 712q0 67 -5 90q-3 16 -11 28.5t-17 20.5t-25 14t-26.5 8.5t-31 4t-29 1.5
+h-29.5h-12h-91v-472h56q169 -1 197 24.5t25 180.5q-1 62 -1 100zM1356 515v133q0 29 -2 45t-9.5 33.5t-24.5 25t-46 7.5q-46 0 -77 -34v154h-117v-472h110l7 30q30 -36 77 -36q50 0 66 30.5t16 83.5zM1536 1248v-1216q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113
+v1216q0 66 47 113t113 47h1216q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D9" unicode="&#xf2d9;" horiz-adv-x="2176" 
+d="M1143 -197q-6 1 -11 4q-13 8 -36 23t-86 65t-116.5 104.5t-112 140t-89.5 172.5q-17 3 -175 37q66 -213 235 -362t391 -184zM502 409l168 -28q-25 76 -41 167.5t-19 145.5l-4 53q-84 -82 -121 -224q5 -65 17 -114zM612 1018q-43 -64 -77 -148q44 46 74 68zM2049 584
+q0 161 -62 307t-167.5 252t-250.5 168.5t-304 62.5q-147 0 -281 -52.5t-240 -148.5q-30 -58 -45 -160q60 51 143 83.5t158.5 43t143 13.5t108.5 -1l40 -3q33 -1 53 -15.5t24.5 -33t6.5 -37t-1 -28.5q-126 11 -227.5 0.5t-183 -43.5t-142.5 -71.5t-131 -98.5
+q4 -36 11.5 -92.5t35.5 -178t62 -179.5q123 -6 247.5 14.5t214.5 53.5t162.5 67t109.5 59l37 24q22 16 39.5 20.5t30.5 -5t17 -34.5q14 -97 -39 -121q-208 -97 -467 -134q-135 -20 -317 -16q41 -96 110 -176.5t137 -127t130.5 -79t101.5 -43.5l39 -12q143 -23 263 15
+q195 99 314 289t119 418zM2123 621q-14 -135 -40 -212q-70 -208 -181.5 -346.5t-318.5 -253.5q-48 -33 -82 -44q-72 -26 -163 -16q-36 -3 -73 -3q-283 0 -504.5 173t-295.5 442q-1 0 -4 0.5t-5 0.5q-6 -50 2.5 -112.5t26 -115t36 -98t31.5 -71.5l14 -26q8 -12 54 -82
+q-71 38 -124.5 106.5t-78.5 140t-39.5 137t-17.5 107.5l-2 42q-5 2 -33.5 12.5t-48.5 18t-53 20.5t-57.5 25t-50 25.5t-42.5 27t-25 25.5q19 -10 50.5 -25.5t113 -45.5t145.5 -38l2 32q11 149 94 290q41 202 176 365q28 115 81 214q15 28 32 45t49 32q158 74 303.5 104
+t302 11t306.5 -97q220 -115 333 -336t87 -474z" />
+    <glyph glyph-name="uniF2DA" unicode="&#xf2da;" horiz-adv-x="1792" 
+d="M1341 752q29 44 -6.5 129.5t-121.5 142.5q-58 39 -125.5 53.5t-118 4.5t-68.5 -37q-12 -23 -4.5 -28t42.5 -10q23 -3 38.5 -5t44.5 -9.5t56 -17.5q36 -13 67.5 -31.5t53 -37t40 -38.5t30.5 -38t22 -34.5t16.5 -28.5t12 -18.5t10.5 -6t11 9.5zM1704 178
+q-52 -127 -148.5 -220t-214.5 -141.5t-253 -60.5t-266 13.5t-251 91t-210 161.5t-141.5 235.5t-46.5 303.5q1 41 8.5 84.5t12.5 64t24 80.5t23 73q-51 -208 1 -397t173 -318t291 -206t346 -83t349 74.5t289 244.5q20 27 18 14q0 -4 -4 -14zM1465 627q0 -104 -40.5 -199
+t-108.5 -164t-162 -109.5t-198 -40.5t-198 40.5t-162 109.5t-108.5 164t-40.5 199t40.5 199t108.5 164t162 109.5t198 40.5t198 -40.5t162 -109.5t108.5 -164t40.5 -199zM1752 915q-65 147 -180.5 251t-253 153.5t-292 53.5t-301 -36.5t-275.5 -129t-220 -211.5t-131 -297
+t-10 -373q-49 161 -51.5 311.5t35.5 272.5t109 227t165.5 180.5t207 126t232 71t242.5 9t236 -54t216 -124.5t178 -197q33 -50 62 -121t31 -112zM1690 573q12 244 -136.5 416t-396.5 240q-8 0 -10 5t24 8q125 -4 230 -50t173 -120t116 -168.5t58.5 -199t-1 -208
+t-61.5 -197.5t-122.5 -167t-185 -117.5t-248.5 -46.5q108 30 201.5 80t174 123t129.5 176.5t55 225.5z" />
+    <glyph glyph-name="uniF2DB" unicode="&#xf2db;" 
+d="M192 256v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 512v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 768v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16
+q0 16 16 16h112zM192 1024v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 1280v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM1280 1440v-1472q0 -40 -28 -68t-68 -28h-832q-40 0 -68 28
+t-28 68v1472q0 40 28 68t68 28h832q40 0 68 -28t28 -68zM1536 208v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 464v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 720v-32
+q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 976v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 1232v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16
+h48q16 0 16 -16z" />
+    <glyph glyph-name="uniF2DC" unicode="&#xf2dc;" horiz-adv-x="1664" 
+d="M1566 419l-167 -33l186 -107q23 -13 29.5 -38.5t-6.5 -48.5q-14 -23 -39 -29.5t-48 6.5l-186 106l55 -160q13 -38 -12 -63.5t-60.5 -20.5t-48.5 42l-102 300l-271 156v-313l208 -238q16 -18 17 -39t-11 -36.5t-28.5 -25t-37 -5.5t-36.5 22l-112 128v-214q0 -26 -19 -45
+t-45 -19t-45 19t-19 45v214l-112 -128q-16 -18 -36.5 -22t-37 5.5t-28.5 25t-11 36.5t17 39l208 238v313l-271 -156l-102 -300q-13 -37 -48.5 -42t-60.5 20.5t-12 63.5l55 160l-186 -106q-23 -13 -48 -6.5t-39 29.5q-13 23 -6.5 48.5t29.5 38.5l186 107l-167 33
+q-29 6 -42 29t-8.5 46.5t25.5 40t50 10.5l310 -62l271 157l-271 157l-310 -62q-4 -1 -13 -1q-27 0 -44 18t-19 40t11 43t40 26l167 33l-186 107q-23 13 -29.5 38.5t6.5 48.5t39 30t48 -7l186 -106l-55 160q-13 38 12 63.5t60.5 20.5t48.5 -42l102 -300l271 -156v313
+l-208 238q-16 18 -17 39t11 36.5t28.5 25t37 5.5t36.5 -22l112 -128v214q0 26 19 45t45 19t45 -19t19 -45v-214l112 128q16 18 36.5 22t37 -5.5t28.5 -25t11 -36.5t-17 -39l-208 -238v-313l271 156l102 300q13 37 48.5 42t60.5 -20.5t12 -63.5l-55 -160l186 106
+q23 13 48 6.5t39 -29.5q13 -23 6.5 -48.5t-29.5 -38.5l-186 -107l167 -33q27 -5 40 -26t11 -43t-19 -40t-44 -18q-9 0 -13 1l-310 62l-271 -157l271 -157l310 62q29 6 50 -10.5t25.5 -40t-8.5 -46.5t-42 -29z" />
+    <glyph glyph-name="uniF2DD" unicode="&#xf2dd;" horiz-adv-x="1792" 
+d="M1473 607q7 118 -33 226.5t-113 189t-177 131t-221 57.5q-116 7 -225.5 -32t-192 -110.5t-135 -175t-59.5 -220.5q-7 -118 33 -226.5t113 -189t177.5 -131t221.5 -57.5q155 -9 293 59t224 195.5t94 283.5zM1792 1536l-349 -348q120 -117 180.5 -272t50.5 -321
+q-11 -183 -102 -339t-241 -255.5t-332 -124.5l-999 -132l347 347q-120 116 -180.5 271.5t-50.5 321.5q11 184 102 340t241.5 255.5t332.5 124.5q167 22 500 66t500 66z" />
+    <glyph glyph-name="uniF2DE" unicode="&#xf2de;" horiz-adv-x="1792" 
+d="M948 508l163 -329h-51l-175 350l-171 -350h-49l179 374l-78 33l21 49l240 -102l-21 -50zM563 1100l304 -130l-130 -304l-304 130zM907 915l240 -103l-103 -239l-239 102zM1188 765l191 -81l-82 -190l-190 81zM1680 640q0 159 -62 304t-167.5 250.5t-250.5 167.5t-304 62
+t-304 -62t-250.5 -167.5t-167.5 -250.5t-62 -304t62 -304t167.5 -250.5t250.5 -167.5t304 -62t304 62t250.5 167.5t167.5 250.5t62 304zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71
+t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2E0" unicode="&#xf2e0;" horiz-adv-x="1920" 
+d="M1334 302q-4 24 -27.5 34t-49.5 10.5t-48.5 12.5t-25.5 38q-5 47 33 139.5t75 181t32 127.5q-14 101 -117 103q-45 1 -75 -16l-3 -2l-5 -2.5t-4.5 -2t-5 -2t-5 -0.5t-6 1.5t-6 3.5t-6.5 5q-3 2 -9 8.5t-9 9t-8.5 7.5t-9.5 7.5t-9.5 5.5t-11 4.5t-11.5 2.5q-30 5 -48 -3
+t-45 -31q-1 -1 -9 -8.5t-12.5 -11t-15 -10t-16.5 -5.5t-17 3q-54 27 -84 40q-41 18 -94 -5t-76 -65q-16 -28 -41 -98.5t-43.5 -132.5t-40 -134t-21.5 -73q-22 -69 18.5 -119t110.5 -46q30 2 50.5 15t38.5 46q7 13 79 199.5t77 194.5q6 11 21.5 18t29.5 0q27 -15 21 -53
+q-2 -18 -51 -139.5t-50 -132.5q-6 -38 19.5 -56.5t60.5 -7t55 49.5q4 8 45.5 92t81.5 163.5t46 88.5q20 29 41 28q29 0 25 -38q-2 -16 -65.5 -147.5t-70.5 -159.5q-12 -53 13 -103t74 -74q17 -9 51 -15.5t71.5 -8t62.5 14t20 48.5zM383 86q3 -15 -5 -27.5t-23 -15.5
+q-14 -3 -26.5 5t-15.5 23q-3 14 5 27t22 16t27 -5t16 -23zM953 -177q12 -17 8.5 -37.5t-20.5 -32.5t-37.5 -8t-32.5 21q-11 17 -7.5 37.5t20.5 32.5t37.5 8t31.5 -21zM177 635q-18 -27 -49.5 -33t-57.5 13q-26 18 -32 50t12 58q18 27 49.5 33t57.5 -12q26 -19 32 -50.5
+t-12 -58.5zM1467 -42q19 -28 13 -61.5t-34 -52.5t-60.5 -13t-51.5 34t-13 61t33 53q28 19 60.5 13t52.5 -34zM1579 562q69 -113 42.5 -244.5t-134.5 -207.5q-90 -63 -199 -60q-20 -80 -84.5 -127t-143.5 -44.5t-140 57.5q-12 -9 -13 -10q-103 -71 -225 -48.5t-193 126.5
+q-50 73 -53 164q-83 14 -142.5 70.5t-80.5 128t-2 152t81 138.5q-36 60 -38 128t24.5 125t79.5 98.5t121 50.5q32 85 99 148t146.5 91.5t168 17t159.5 -66.5q72 21 140 17.5t128.5 -36t104.5 -80t67.5 -115t17.5 -140.5q52 -16 87 -57t45.5 -89t-5.5 -99.5t-58 -87.5z
+M455 1222q14 -20 9.5 -44.5t-24.5 -38.5q-19 -14 -43.5 -9.5t-37.5 24.5q-14 20 -9.5 44.5t24.5 38.5q19 14 43.5 9.5t37.5 -24.5zM614 1503q4 -16 -5 -30.5t-26 -18.5t-31 5.5t-18 26.5q-3 17 6.5 31t25.5 18q17 4 31 -5.5t17 -26.5zM1800 555q4 -20 -6.5 -37t-30.5 -21
+q-19 -4 -36 6.5t-21 30.5t6.5 37t30.5 22q20 4 36.5 -7.5t20.5 -30.5zM1136 1448q16 -27 8.5 -58.5t-35.5 -47.5q-27 -16 -57.5 -8.5t-46.5 34.5q-16 28 -8.5 59t34.5 48t58 9t47 -36zM1882 792q4 -15 -4 -27.5t-23 -16.5q-15 -3 -27.5 5.5t-15.5 22.5q-3 15 5 28t23 16
+q14 3 26.5 -5t15.5 -23zM1691 1033q15 -22 10.5 -49t-26.5 -43q-22 -15 -49 -10t-42 27t-10 49t27 43t48.5 11t41.5 -28z" />
+    <glyph glyph-name="uniF2E1" unicode="&#xf2e1;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E2" unicode="&#xf2e2;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E3" unicode="&#xf2e3;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E4" unicode="&#xf2e4;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E5" unicode="&#xf2e5;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E6" unicode="&#xf2e6;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E7" unicode="&#xf2e7;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_698" unicode="&#xf2e8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E9" unicode="&#xf2e9;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EA" unicode="&#xf2ea;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EB" unicode="&#xf2eb;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EC" unicode="&#xf2ec;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2ED" unicode="&#xf2ed;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EE" unicode="&#xf2ee;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="lessequal" unicode="&#xf500;" horiz-adv-x="1792" 
+ />
+  </font>
+</defs></svg>
diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.ttf b/htdocs/includes/fontawesome/fonts/fontawesome-webfont.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..35acda2fa1196aad98c2adf4378a7611dd713aa3
GIT binary patch
literal 165548
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

literal 0
HcmV?d00001

diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.woff b/htdocs/includes/fontawesome/fonts/fontawesome-webfont.woff
new file mode 100644
index 0000000000000000000000000000000000000000..400014a4b06eee3d0c0d54402a47ab2601b2862b
GIT binary patch
literal 98024
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
SdSQM28?+M|D(2r_;{O0|uQ74}

literal 0
HcmV?d00001

diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.woff2 b/htdocs/includes/fontawesome/fonts/fontawesome-webfont.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..4d13fc60404b91e398a37200c4a77b645cfd9586
GIT binary patch
literal 77160
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

literal 0
HcmV?d00001

diff --git a/htdocs/includes/fontawesome/less/animated.less b/htdocs/includes/fontawesome/less/animated.less
new file mode 100644
index 00000000000..66ad52a5ba0
--- /dev/null
+++ b/htdocs/includes/fontawesome/less/animated.less
@@ -0,0 +1,34 @@
+// Animated Icons
+// --------------------------
+
+.@{fa-css-prefix}-spin {
+  -webkit-animation: fa-spin 2s infinite linear;
+          animation: fa-spin 2s infinite linear;
+}
+
+.@{fa-css-prefix}-pulse {
+  -webkit-animation: fa-spin 1s infinite steps(8);
+          animation: fa-spin 1s infinite steps(8);
+}
+
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+            transform: rotate(359deg);
+  }
+}
+
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+            transform: rotate(359deg);
+  }
+}
diff --git a/htdocs/includes/fontawesome/less/bordered-pulled.less b/htdocs/includes/fontawesome/less/bordered-pulled.less
new file mode 100644
index 00000000000..f1c8ad75f52
--- /dev/null
+++ b/htdocs/includes/fontawesome/less/bordered-pulled.less
@@ -0,0 +1,25 @@
+// Bordered & Pulled
+// -------------------------
+
+.@{fa-css-prefix}-border {
+  padding: .2em .25em .15em;
+  border: solid .08em @fa-border-color;
+  border-radius: .1em;
+}
+
+.@{fa-css-prefix}-pull-left { float: left; }
+.@{fa-css-prefix}-pull-right { float: right; }
+
+.@{fa-css-prefix} {
+  &.@{fa-css-prefix}-pull-left { margin-right: .3em; }
+  &.@{fa-css-prefix}-pull-right { margin-left: .3em; }
+}
+
+/* Deprecated as of 4.4.0 */
+.pull-right { float: right; }
+.pull-left { float: left; }
+
+.@{fa-css-prefix} {
+  &.pull-left { margin-right: .3em; }
+  &.pull-right { margin-left: .3em; }
+}
diff --git a/htdocs/includes/fontawesome/less/core.less b/htdocs/includes/fontawesome/less/core.less
new file mode 100644
index 00000000000..c577ac84a6a
--- /dev/null
+++ b/htdocs/includes/fontawesome/less/core.less
@@ -0,0 +1,12 @@
+// Base Class Definition
+// -------------------------
+
+.@{fa-css-prefix} {
+  display: inline-block;
+  font: normal normal normal @fa-font-size-base/@fa-line-height-base FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+}
diff --git a/htdocs/includes/fontawesome/less/fixed-width.less b/htdocs/includes/fontawesome/less/fixed-width.less
new file mode 100644
index 00000000000..110289f2f4b
--- /dev/null
+++ b/htdocs/includes/fontawesome/less/fixed-width.less
@@ -0,0 +1,6 @@
+// Fixed Width Icons
+// -------------------------
+.@{fa-css-prefix}-fw {
+  width: (18em / 14);
+  text-align: center;
+}
diff --git a/htdocs/includes/fontawesome/less/font-awesome.less b/htdocs/includes/fontawesome/less/font-awesome.less
new file mode 100644
index 00000000000..c3677def313
--- /dev/null
+++ b/htdocs/includes/fontawesome/less/font-awesome.less
@@ -0,0 +1,18 @@
+/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+
+@import "variables.less";
+@import "mixins.less";
+@import "path.less";
+@import "core.less";
+@import "larger.less";
+@import "fixed-width.less";
+@import "list.less";
+@import "bordered-pulled.less";
+@import "animated.less";
+@import "rotated-flipped.less";
+@import "stacked.less";
+@import "icons.less";
+@import "screen-reader.less";
diff --git a/htdocs/includes/fontawesome/less/icons.less b/htdocs/includes/fontawesome/less/icons.less
new file mode 100644
index 00000000000..159d600425c
--- /dev/null
+++ b/htdocs/includes/fontawesome/less/icons.less
@@ -0,0 +1,789 @@
+/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+   readers do not read off random characters that represent icons */
+
+.@{fa-css-prefix}-glass:before { content: @fa-var-glass; }
+.@{fa-css-prefix}-music:before { content: @fa-var-music; }
+.@{fa-css-prefix}-search:before { content: @fa-var-search; }
+.@{fa-css-prefix}-envelope-o:before { content: @fa-var-envelope-o; }
+.@{fa-css-prefix}-heart:before { content: @fa-var-heart; }
+.@{fa-css-prefix}-star:before { content: @fa-var-star; }
+.@{fa-css-prefix}-star-o:before { content: @fa-var-star-o; }
+.@{fa-css-prefix}-user:before { content: @fa-var-user; }
+.@{fa-css-prefix}-film:before { content: @fa-var-film; }
+.@{fa-css-prefix}-th-large:before { content: @fa-var-th-large; }
+.@{fa-css-prefix}-th:before { content: @fa-var-th; }
+.@{fa-css-prefix}-th-list:before { content: @fa-var-th-list; }
+.@{fa-css-prefix}-check:before { content: @fa-var-check; }
+.@{fa-css-prefix}-remove:before,
+.@{fa-css-prefix}-close:before,
+.@{fa-css-prefix}-times:before { content: @fa-var-times; }
+.@{fa-css-prefix}-search-plus:before { content: @fa-var-search-plus; }
+.@{fa-css-prefix}-search-minus:before { content: @fa-var-search-minus; }
+.@{fa-css-prefix}-power-off:before { content: @fa-var-power-off; }
+.@{fa-css-prefix}-signal:before { content: @fa-var-signal; }
+.@{fa-css-prefix}-gear:before,
+.@{fa-css-prefix}-cog:before { content: @fa-var-cog; }
+.@{fa-css-prefix}-trash-o:before { content: @fa-var-trash-o; }
+.@{fa-css-prefix}-home:before { content: @fa-var-home; }
+.@{fa-css-prefix}-file-o:before { content: @fa-var-file-o; }
+.@{fa-css-prefix}-clock-o:before { content: @fa-var-clock-o; }
+.@{fa-css-prefix}-road:before { content: @fa-var-road; }
+.@{fa-css-prefix}-download:before { content: @fa-var-download; }
+.@{fa-css-prefix}-arrow-circle-o-down:before { content: @fa-var-arrow-circle-o-down; }
+.@{fa-css-prefix}-arrow-circle-o-up:before { content: @fa-var-arrow-circle-o-up; }
+.@{fa-css-prefix}-inbox:before { content: @fa-var-inbox; }
+.@{fa-css-prefix}-play-circle-o:before { content: @fa-var-play-circle-o; }
+.@{fa-css-prefix}-rotate-right:before,
+.@{fa-css-prefix}-repeat:before { content: @fa-var-repeat; }
+.@{fa-css-prefix}-refresh:before { content: @fa-var-refresh; }
+.@{fa-css-prefix}-list-alt:before { content: @fa-var-list-alt; }
+.@{fa-css-prefix}-lock:before { content: @fa-var-lock; }
+.@{fa-css-prefix}-flag:before { content: @fa-var-flag; }
+.@{fa-css-prefix}-headphones:before { content: @fa-var-headphones; }
+.@{fa-css-prefix}-volume-off:before { content: @fa-var-volume-off; }
+.@{fa-css-prefix}-volume-down:before { content: @fa-var-volume-down; }
+.@{fa-css-prefix}-volume-up:before { content: @fa-var-volume-up; }
+.@{fa-css-prefix}-qrcode:before { content: @fa-var-qrcode; }
+.@{fa-css-prefix}-barcode:before { content: @fa-var-barcode; }
+.@{fa-css-prefix}-tag:before { content: @fa-var-tag; }
+.@{fa-css-prefix}-tags:before { content: @fa-var-tags; }
+.@{fa-css-prefix}-book:before { content: @fa-var-book; }
+.@{fa-css-prefix}-bookmark:before { content: @fa-var-bookmark; }
+.@{fa-css-prefix}-print:before { content: @fa-var-print; }
+.@{fa-css-prefix}-camera:before { content: @fa-var-camera; }
+.@{fa-css-prefix}-font:before { content: @fa-var-font; }
+.@{fa-css-prefix}-bold:before { content: @fa-var-bold; }
+.@{fa-css-prefix}-italic:before { content: @fa-var-italic; }
+.@{fa-css-prefix}-text-height:before { content: @fa-var-text-height; }
+.@{fa-css-prefix}-text-width:before { content: @fa-var-text-width; }
+.@{fa-css-prefix}-align-left:before { content: @fa-var-align-left; }
+.@{fa-css-prefix}-align-center:before { content: @fa-var-align-center; }
+.@{fa-css-prefix}-align-right:before { content: @fa-var-align-right; }
+.@{fa-css-prefix}-align-justify:before { content: @fa-var-align-justify; }
+.@{fa-css-prefix}-list:before { content: @fa-var-list; }
+.@{fa-css-prefix}-dedent:before,
+.@{fa-css-prefix}-outdent:before { content: @fa-var-outdent; }
+.@{fa-css-prefix}-indent:before { content: @fa-var-indent; }
+.@{fa-css-prefix}-video-camera:before { content: @fa-var-video-camera; }
+.@{fa-css-prefix}-photo:before,
+.@{fa-css-prefix}-image:before,
+.@{fa-css-prefix}-picture-o:before { content: @fa-var-picture-o; }
+.@{fa-css-prefix}-pencil:before { content: @fa-var-pencil; }
+.@{fa-css-prefix}-map-marker:before { content: @fa-var-map-marker; }
+.@{fa-css-prefix}-adjust:before { content: @fa-var-adjust; }
+.@{fa-css-prefix}-tint:before { content: @fa-var-tint; }
+.@{fa-css-prefix}-edit:before,
+.@{fa-css-prefix}-pencil-square-o:before { content: @fa-var-pencil-square-o; }
+.@{fa-css-prefix}-share-square-o:before { content: @fa-var-share-square-o; }
+.@{fa-css-prefix}-check-square-o:before { content: @fa-var-check-square-o; }
+.@{fa-css-prefix}-arrows:before { content: @fa-var-arrows; }
+.@{fa-css-prefix}-step-backward:before { content: @fa-var-step-backward; }
+.@{fa-css-prefix}-fast-backward:before { content: @fa-var-fast-backward; }
+.@{fa-css-prefix}-backward:before { content: @fa-var-backward; }
+.@{fa-css-prefix}-play:before { content: @fa-var-play; }
+.@{fa-css-prefix}-pause:before { content: @fa-var-pause; }
+.@{fa-css-prefix}-stop:before { content: @fa-var-stop; }
+.@{fa-css-prefix}-forward:before { content: @fa-var-forward; }
+.@{fa-css-prefix}-fast-forward:before { content: @fa-var-fast-forward; }
+.@{fa-css-prefix}-step-forward:before { content: @fa-var-step-forward; }
+.@{fa-css-prefix}-eject:before { content: @fa-var-eject; }
+.@{fa-css-prefix}-chevron-left:before { content: @fa-var-chevron-left; }
+.@{fa-css-prefix}-chevron-right:before { content: @fa-var-chevron-right; }
+.@{fa-css-prefix}-plus-circle:before { content: @fa-var-plus-circle; }
+.@{fa-css-prefix}-minus-circle:before { content: @fa-var-minus-circle; }
+.@{fa-css-prefix}-times-circle:before { content: @fa-var-times-circle; }
+.@{fa-css-prefix}-check-circle:before { content: @fa-var-check-circle; }
+.@{fa-css-prefix}-question-circle:before { content: @fa-var-question-circle; }
+.@{fa-css-prefix}-info-circle:before { content: @fa-var-info-circle; }
+.@{fa-css-prefix}-crosshairs:before { content: @fa-var-crosshairs; }
+.@{fa-css-prefix}-times-circle-o:before { content: @fa-var-times-circle-o; }
+.@{fa-css-prefix}-check-circle-o:before { content: @fa-var-check-circle-o; }
+.@{fa-css-prefix}-ban:before { content: @fa-var-ban; }
+.@{fa-css-prefix}-arrow-left:before { content: @fa-var-arrow-left; }
+.@{fa-css-prefix}-arrow-right:before { content: @fa-var-arrow-right; }
+.@{fa-css-prefix}-arrow-up:before { content: @fa-var-arrow-up; }
+.@{fa-css-prefix}-arrow-down:before { content: @fa-var-arrow-down; }
+.@{fa-css-prefix}-mail-forward:before,
+.@{fa-css-prefix}-share:before { content: @fa-var-share; }
+.@{fa-css-prefix}-expand:before { content: @fa-var-expand; }
+.@{fa-css-prefix}-compress:before { content: @fa-var-compress; }
+.@{fa-css-prefix}-plus:before { content: @fa-var-plus; }
+.@{fa-css-prefix}-minus:before { content: @fa-var-minus; }
+.@{fa-css-prefix}-asterisk:before { content: @fa-var-asterisk; }
+.@{fa-css-prefix}-exclamation-circle:before { content: @fa-var-exclamation-circle; }
+.@{fa-css-prefix}-gift:before { content: @fa-var-gift; }
+.@{fa-css-prefix}-leaf:before { content: @fa-var-leaf; }
+.@{fa-css-prefix}-fire:before { content: @fa-var-fire; }
+.@{fa-css-prefix}-eye:before { content: @fa-var-eye; }
+.@{fa-css-prefix}-eye-slash:before { content: @fa-var-eye-slash; }
+.@{fa-css-prefix}-warning:before,
+.@{fa-css-prefix}-exclamation-triangle:before { content: @fa-var-exclamation-triangle; }
+.@{fa-css-prefix}-plane:before { content: @fa-var-plane; }
+.@{fa-css-prefix}-calendar:before { content: @fa-var-calendar; }
+.@{fa-css-prefix}-random:before { content: @fa-var-random; }
+.@{fa-css-prefix}-comment:before { content: @fa-var-comment; }
+.@{fa-css-prefix}-magnet:before { content: @fa-var-magnet; }
+.@{fa-css-prefix}-chevron-up:before { content: @fa-var-chevron-up; }
+.@{fa-css-prefix}-chevron-down:before { content: @fa-var-chevron-down; }
+.@{fa-css-prefix}-retweet:before { content: @fa-var-retweet; }
+.@{fa-css-prefix}-shopping-cart:before { content: @fa-var-shopping-cart; }
+.@{fa-css-prefix}-folder:before { content: @fa-var-folder; }
+.@{fa-css-prefix}-folder-open:before { content: @fa-var-folder-open; }
+.@{fa-css-prefix}-arrows-v:before { content: @fa-var-arrows-v; }
+.@{fa-css-prefix}-arrows-h:before { content: @fa-var-arrows-h; }
+.@{fa-css-prefix}-bar-chart-o:before,
+.@{fa-css-prefix}-bar-chart:before { content: @fa-var-bar-chart; }
+.@{fa-css-prefix}-twitter-square:before { content: @fa-var-twitter-square; }
+.@{fa-css-prefix}-facebook-square:before { content: @fa-var-facebook-square; }
+.@{fa-css-prefix}-camera-retro:before { content: @fa-var-camera-retro; }
+.@{fa-css-prefix}-key:before { content: @fa-var-key; }
+.@{fa-css-prefix}-gears:before,
+.@{fa-css-prefix}-cogs:before { content: @fa-var-cogs; }
+.@{fa-css-prefix}-comments:before { content: @fa-var-comments; }
+.@{fa-css-prefix}-thumbs-o-up:before { content: @fa-var-thumbs-o-up; }
+.@{fa-css-prefix}-thumbs-o-down:before { content: @fa-var-thumbs-o-down; }
+.@{fa-css-prefix}-star-half:before { content: @fa-var-star-half; }
+.@{fa-css-prefix}-heart-o:before { content: @fa-var-heart-o; }
+.@{fa-css-prefix}-sign-out:before { content: @fa-var-sign-out; }
+.@{fa-css-prefix}-linkedin-square:before { content: @fa-var-linkedin-square; }
+.@{fa-css-prefix}-thumb-tack:before { content: @fa-var-thumb-tack; }
+.@{fa-css-prefix}-external-link:before { content: @fa-var-external-link; }
+.@{fa-css-prefix}-sign-in:before { content: @fa-var-sign-in; }
+.@{fa-css-prefix}-trophy:before { content: @fa-var-trophy; }
+.@{fa-css-prefix}-github-square:before { content: @fa-var-github-square; }
+.@{fa-css-prefix}-upload:before { content: @fa-var-upload; }
+.@{fa-css-prefix}-lemon-o:before { content: @fa-var-lemon-o; }
+.@{fa-css-prefix}-phone:before { content: @fa-var-phone; }
+.@{fa-css-prefix}-square-o:before { content: @fa-var-square-o; }
+.@{fa-css-prefix}-bookmark-o:before { content: @fa-var-bookmark-o; }
+.@{fa-css-prefix}-phone-square:before { content: @fa-var-phone-square; }
+.@{fa-css-prefix}-twitter:before { content: @fa-var-twitter; }
+.@{fa-css-prefix}-facebook-f:before,
+.@{fa-css-prefix}-facebook:before { content: @fa-var-facebook; }
+.@{fa-css-prefix}-github:before { content: @fa-var-github; }
+.@{fa-css-prefix}-unlock:before { content: @fa-var-unlock; }
+.@{fa-css-prefix}-credit-card:before { content: @fa-var-credit-card; }
+.@{fa-css-prefix}-feed:before,
+.@{fa-css-prefix}-rss:before { content: @fa-var-rss; }
+.@{fa-css-prefix}-hdd-o:before { content: @fa-var-hdd-o; }
+.@{fa-css-prefix}-bullhorn:before { content: @fa-var-bullhorn; }
+.@{fa-css-prefix}-bell:before { content: @fa-var-bell; }
+.@{fa-css-prefix}-certificate:before { content: @fa-var-certificate; }
+.@{fa-css-prefix}-hand-o-right:before { content: @fa-var-hand-o-right; }
+.@{fa-css-prefix}-hand-o-left:before { content: @fa-var-hand-o-left; }
+.@{fa-css-prefix}-hand-o-up:before { content: @fa-var-hand-o-up; }
+.@{fa-css-prefix}-hand-o-down:before { content: @fa-var-hand-o-down; }
+.@{fa-css-prefix}-arrow-circle-left:before { content: @fa-var-arrow-circle-left; }
+.@{fa-css-prefix}-arrow-circle-right:before { content: @fa-var-arrow-circle-right; }
+.@{fa-css-prefix}-arrow-circle-up:before { content: @fa-var-arrow-circle-up; }
+.@{fa-css-prefix}-arrow-circle-down:before { content: @fa-var-arrow-circle-down; }
+.@{fa-css-prefix}-globe:before { content: @fa-var-globe; }
+.@{fa-css-prefix}-wrench:before { content: @fa-var-wrench; }
+.@{fa-css-prefix}-tasks:before { content: @fa-var-tasks; }
+.@{fa-css-prefix}-filter:before { content: @fa-var-filter; }
+.@{fa-css-prefix}-briefcase:before { content: @fa-var-briefcase; }
+.@{fa-css-prefix}-arrows-alt:before { content: @fa-var-arrows-alt; }
+.@{fa-css-prefix}-group:before,
+.@{fa-css-prefix}-users:before { content: @fa-var-users; }
+.@{fa-css-prefix}-chain:before,
+.@{fa-css-prefix}-link:before { content: @fa-var-link; }
+.@{fa-css-prefix}-cloud:before { content: @fa-var-cloud; }
+.@{fa-css-prefix}-flask:before { content: @fa-var-flask; }
+.@{fa-css-prefix}-cut:before,
+.@{fa-css-prefix}-scissors:before { content: @fa-var-scissors; }
+.@{fa-css-prefix}-copy:before,
+.@{fa-css-prefix}-files-o:before { content: @fa-var-files-o; }
+.@{fa-css-prefix}-paperclip:before { content: @fa-var-paperclip; }
+.@{fa-css-prefix}-save:before,
+.@{fa-css-prefix}-floppy-o:before { content: @fa-var-floppy-o; }
+.@{fa-css-prefix}-square:before { content: @fa-var-square; }
+.@{fa-css-prefix}-navicon:before,
+.@{fa-css-prefix}-reorder:before,
+.@{fa-css-prefix}-bars:before { content: @fa-var-bars; }
+.@{fa-css-prefix}-list-ul:before { content: @fa-var-list-ul; }
+.@{fa-css-prefix}-list-ol:before { content: @fa-var-list-ol; }
+.@{fa-css-prefix}-strikethrough:before { content: @fa-var-strikethrough; }
+.@{fa-css-prefix}-underline:before { content: @fa-var-underline; }
+.@{fa-css-prefix}-table:before { content: @fa-var-table; }
+.@{fa-css-prefix}-magic:before { content: @fa-var-magic; }
+.@{fa-css-prefix}-truck:before { content: @fa-var-truck; }
+.@{fa-css-prefix}-pinterest:before { content: @fa-var-pinterest; }
+.@{fa-css-prefix}-pinterest-square:before { content: @fa-var-pinterest-square; }
+.@{fa-css-prefix}-google-plus-square:before { content: @fa-var-google-plus-square; }
+.@{fa-css-prefix}-google-plus:before { content: @fa-var-google-plus; }
+.@{fa-css-prefix}-money:before { content: @fa-var-money; }
+.@{fa-css-prefix}-caret-down:before { content: @fa-var-caret-down; }
+.@{fa-css-prefix}-caret-up:before { content: @fa-var-caret-up; }
+.@{fa-css-prefix}-caret-left:before { content: @fa-var-caret-left; }
+.@{fa-css-prefix}-caret-right:before { content: @fa-var-caret-right; }
+.@{fa-css-prefix}-columns:before { content: @fa-var-columns; }
+.@{fa-css-prefix}-unsorted:before,
+.@{fa-css-prefix}-sort:before { content: @fa-var-sort; }
+.@{fa-css-prefix}-sort-down:before,
+.@{fa-css-prefix}-sort-desc:before { content: @fa-var-sort-desc; }
+.@{fa-css-prefix}-sort-up:before,
+.@{fa-css-prefix}-sort-asc:before { content: @fa-var-sort-asc; }
+.@{fa-css-prefix}-envelope:before { content: @fa-var-envelope; }
+.@{fa-css-prefix}-linkedin:before { content: @fa-var-linkedin; }
+.@{fa-css-prefix}-rotate-left:before,
+.@{fa-css-prefix}-undo:before { content: @fa-var-undo; }
+.@{fa-css-prefix}-legal:before,
+.@{fa-css-prefix}-gavel:before { content: @fa-var-gavel; }
+.@{fa-css-prefix}-dashboard:before,
+.@{fa-css-prefix}-tachometer:before { content: @fa-var-tachometer; }
+.@{fa-css-prefix}-comment-o:before { content: @fa-var-comment-o; }
+.@{fa-css-prefix}-comments-o:before { content: @fa-var-comments-o; }
+.@{fa-css-prefix}-flash:before,
+.@{fa-css-prefix}-bolt:before { content: @fa-var-bolt; }
+.@{fa-css-prefix}-sitemap:before { content: @fa-var-sitemap; }
+.@{fa-css-prefix}-umbrella:before { content: @fa-var-umbrella; }
+.@{fa-css-prefix}-paste:before,
+.@{fa-css-prefix}-clipboard:before { content: @fa-var-clipboard; }
+.@{fa-css-prefix}-lightbulb-o:before { content: @fa-var-lightbulb-o; }
+.@{fa-css-prefix}-exchange:before { content: @fa-var-exchange; }
+.@{fa-css-prefix}-cloud-download:before { content: @fa-var-cloud-download; }
+.@{fa-css-prefix}-cloud-upload:before { content: @fa-var-cloud-upload; }
+.@{fa-css-prefix}-user-md:before { content: @fa-var-user-md; }
+.@{fa-css-prefix}-stethoscope:before { content: @fa-var-stethoscope; }
+.@{fa-css-prefix}-suitcase:before { content: @fa-var-suitcase; }
+.@{fa-css-prefix}-bell-o:before { content: @fa-var-bell-o; }
+.@{fa-css-prefix}-coffee:before { content: @fa-var-coffee; }
+.@{fa-css-prefix}-cutlery:before { content: @fa-var-cutlery; }
+.@{fa-css-prefix}-file-text-o:before { content: @fa-var-file-text-o; }
+.@{fa-css-prefix}-building-o:before { content: @fa-var-building-o; }
+.@{fa-css-prefix}-hospital-o:before { content: @fa-var-hospital-o; }
+.@{fa-css-prefix}-ambulance:before { content: @fa-var-ambulance; }
+.@{fa-css-prefix}-medkit:before { content: @fa-var-medkit; }
+.@{fa-css-prefix}-fighter-jet:before { content: @fa-var-fighter-jet; }
+.@{fa-css-prefix}-beer:before { content: @fa-var-beer; }
+.@{fa-css-prefix}-h-square:before { content: @fa-var-h-square; }
+.@{fa-css-prefix}-plus-square:before { content: @fa-var-plus-square; }
+.@{fa-css-prefix}-angle-double-left:before { content: @fa-var-angle-double-left; }
+.@{fa-css-prefix}-angle-double-right:before { content: @fa-var-angle-double-right; }
+.@{fa-css-prefix}-angle-double-up:before { content: @fa-var-angle-double-up; }
+.@{fa-css-prefix}-angle-double-down:before { content: @fa-var-angle-double-down; }
+.@{fa-css-prefix}-angle-left:before { content: @fa-var-angle-left; }
+.@{fa-css-prefix}-angle-right:before { content: @fa-var-angle-right; }
+.@{fa-css-prefix}-angle-up:before { content: @fa-var-angle-up; }
+.@{fa-css-prefix}-angle-down:before { content: @fa-var-angle-down; }
+.@{fa-css-prefix}-desktop:before { content: @fa-var-desktop; }
+.@{fa-css-prefix}-laptop:before { content: @fa-var-laptop; }
+.@{fa-css-prefix}-tablet:before { content: @fa-var-tablet; }
+.@{fa-css-prefix}-mobile-phone:before,
+.@{fa-css-prefix}-mobile:before { content: @fa-var-mobile; }
+.@{fa-css-prefix}-circle-o:before { content: @fa-var-circle-o; }
+.@{fa-css-prefix}-quote-left:before { content: @fa-var-quote-left; }
+.@{fa-css-prefix}-quote-right:before { content: @fa-var-quote-right; }
+.@{fa-css-prefix}-spinner:before { content: @fa-var-spinner; }
+.@{fa-css-prefix}-circle:before { content: @fa-var-circle; }
+.@{fa-css-prefix}-mail-reply:before,
+.@{fa-css-prefix}-reply:before { content: @fa-var-reply; }
+.@{fa-css-prefix}-github-alt:before { content: @fa-var-github-alt; }
+.@{fa-css-prefix}-folder-o:before { content: @fa-var-folder-o; }
+.@{fa-css-prefix}-folder-open-o:before { content: @fa-var-folder-open-o; }
+.@{fa-css-prefix}-smile-o:before { content: @fa-var-smile-o; }
+.@{fa-css-prefix}-frown-o:before { content: @fa-var-frown-o; }
+.@{fa-css-prefix}-meh-o:before { content: @fa-var-meh-o; }
+.@{fa-css-prefix}-gamepad:before { content: @fa-var-gamepad; }
+.@{fa-css-prefix}-keyboard-o:before { content: @fa-var-keyboard-o; }
+.@{fa-css-prefix}-flag-o:before { content: @fa-var-flag-o; }
+.@{fa-css-prefix}-flag-checkered:before { content: @fa-var-flag-checkered; }
+.@{fa-css-prefix}-terminal:before { content: @fa-var-terminal; }
+.@{fa-css-prefix}-code:before { content: @fa-var-code; }
+.@{fa-css-prefix}-mail-reply-all:before,
+.@{fa-css-prefix}-reply-all:before { content: @fa-var-reply-all; }
+.@{fa-css-prefix}-star-half-empty:before,
+.@{fa-css-prefix}-star-half-full:before,
+.@{fa-css-prefix}-star-half-o:before { content: @fa-var-star-half-o; }
+.@{fa-css-prefix}-location-arrow:before { content: @fa-var-location-arrow; }
+.@{fa-css-prefix}-crop:before { content: @fa-var-crop; }
+.@{fa-css-prefix}-code-fork:before { content: @fa-var-code-fork; }
+.@{fa-css-prefix}-unlink:before,
+.@{fa-css-prefix}-chain-broken:before { content: @fa-var-chain-broken; }
+.@{fa-css-prefix}-question:before { content: @fa-var-question; }
+.@{fa-css-prefix}-info:before { content: @fa-var-info; }
+.@{fa-css-prefix}-exclamation:before { content: @fa-var-exclamation; }
+.@{fa-css-prefix}-superscript:before { content: @fa-var-superscript; }
+.@{fa-css-prefix}-subscript:before { content: @fa-var-subscript; }
+.@{fa-css-prefix}-eraser:before { content: @fa-var-eraser; }
+.@{fa-css-prefix}-puzzle-piece:before { content: @fa-var-puzzle-piece; }
+.@{fa-css-prefix}-microphone:before { content: @fa-var-microphone; }
+.@{fa-css-prefix}-microphone-slash:before { content: @fa-var-microphone-slash; }
+.@{fa-css-prefix}-shield:before { content: @fa-var-shield; }
+.@{fa-css-prefix}-calendar-o:before { content: @fa-var-calendar-o; }
+.@{fa-css-prefix}-fire-extinguisher:before { content: @fa-var-fire-extinguisher; }
+.@{fa-css-prefix}-rocket:before { content: @fa-var-rocket; }
+.@{fa-css-prefix}-maxcdn:before { content: @fa-var-maxcdn; }
+.@{fa-css-prefix}-chevron-circle-left:before { content: @fa-var-chevron-circle-left; }
+.@{fa-css-prefix}-chevron-circle-right:before { content: @fa-var-chevron-circle-right; }
+.@{fa-css-prefix}-chevron-circle-up:before { content: @fa-var-chevron-circle-up; }
+.@{fa-css-prefix}-chevron-circle-down:before { content: @fa-var-chevron-circle-down; }
+.@{fa-css-prefix}-html5:before { content: @fa-var-html5; }
+.@{fa-css-prefix}-css3:before { content: @fa-var-css3; }
+.@{fa-css-prefix}-anchor:before { content: @fa-var-anchor; }
+.@{fa-css-prefix}-unlock-alt:before { content: @fa-var-unlock-alt; }
+.@{fa-css-prefix}-bullseye:before { content: @fa-var-bullseye; }
+.@{fa-css-prefix}-ellipsis-h:before { content: @fa-var-ellipsis-h; }
+.@{fa-css-prefix}-ellipsis-v:before { content: @fa-var-ellipsis-v; }
+.@{fa-css-prefix}-rss-square:before { content: @fa-var-rss-square; }
+.@{fa-css-prefix}-play-circle:before { content: @fa-var-play-circle; }
+.@{fa-css-prefix}-ticket:before { content: @fa-var-ticket; }
+.@{fa-css-prefix}-minus-square:before { content: @fa-var-minus-square; }
+.@{fa-css-prefix}-minus-square-o:before { content: @fa-var-minus-square-o; }
+.@{fa-css-prefix}-level-up:before { content: @fa-var-level-up; }
+.@{fa-css-prefix}-level-down:before { content: @fa-var-level-down; }
+.@{fa-css-prefix}-check-square:before { content: @fa-var-check-square; }
+.@{fa-css-prefix}-pencil-square:before { content: @fa-var-pencil-square; }
+.@{fa-css-prefix}-external-link-square:before { content: @fa-var-external-link-square; }
+.@{fa-css-prefix}-share-square:before { content: @fa-var-share-square; }
+.@{fa-css-prefix}-compass:before { content: @fa-var-compass; }
+.@{fa-css-prefix}-toggle-down:before,
+.@{fa-css-prefix}-caret-square-o-down:before { content: @fa-var-caret-square-o-down; }
+.@{fa-css-prefix}-toggle-up:before,
+.@{fa-css-prefix}-caret-square-o-up:before { content: @fa-var-caret-square-o-up; }
+.@{fa-css-prefix}-toggle-right:before,
+.@{fa-css-prefix}-caret-square-o-right:before { content: @fa-var-caret-square-o-right; }
+.@{fa-css-prefix}-euro:before,
+.@{fa-css-prefix}-eur:before { content: @fa-var-eur; }
+.@{fa-css-prefix}-gbp:before { content: @fa-var-gbp; }
+.@{fa-css-prefix}-dollar:before,
+.@{fa-css-prefix}-usd:before { content: @fa-var-usd; }
+.@{fa-css-prefix}-rupee:before,
+.@{fa-css-prefix}-inr:before { content: @fa-var-inr; }
+.@{fa-css-prefix}-cny:before,
+.@{fa-css-prefix}-rmb:before,
+.@{fa-css-prefix}-yen:before,
+.@{fa-css-prefix}-jpy:before { content: @fa-var-jpy; }
+.@{fa-css-prefix}-ruble:before,
+.@{fa-css-prefix}-rouble:before,
+.@{fa-css-prefix}-rub:before { content: @fa-var-rub; }
+.@{fa-css-prefix}-won:before,
+.@{fa-css-prefix}-krw:before { content: @fa-var-krw; }
+.@{fa-css-prefix}-bitcoin:before,
+.@{fa-css-prefix}-btc:before { content: @fa-var-btc; }
+.@{fa-css-prefix}-file:before { content: @fa-var-file; }
+.@{fa-css-prefix}-file-text:before { content: @fa-var-file-text; }
+.@{fa-css-prefix}-sort-alpha-asc:before { content: @fa-var-sort-alpha-asc; }
+.@{fa-css-prefix}-sort-alpha-desc:before { content: @fa-var-sort-alpha-desc; }
+.@{fa-css-prefix}-sort-amount-asc:before { content: @fa-var-sort-amount-asc; }
+.@{fa-css-prefix}-sort-amount-desc:before { content: @fa-var-sort-amount-desc; }
+.@{fa-css-prefix}-sort-numeric-asc:before { content: @fa-var-sort-numeric-asc; }
+.@{fa-css-prefix}-sort-numeric-desc:before { content: @fa-var-sort-numeric-desc; }
+.@{fa-css-prefix}-thumbs-up:before { content: @fa-var-thumbs-up; }
+.@{fa-css-prefix}-thumbs-down:before { content: @fa-var-thumbs-down; }
+.@{fa-css-prefix}-youtube-square:before { content: @fa-var-youtube-square; }
+.@{fa-css-prefix}-youtube:before { content: @fa-var-youtube; }
+.@{fa-css-prefix}-xing:before { content: @fa-var-xing; }
+.@{fa-css-prefix}-xing-square:before { content: @fa-var-xing-square; }
+.@{fa-css-prefix}-youtube-play:before { content: @fa-var-youtube-play; }
+.@{fa-css-prefix}-dropbox:before { content: @fa-var-dropbox; }
+.@{fa-css-prefix}-stack-overflow:before { content: @fa-var-stack-overflow; }
+.@{fa-css-prefix}-instagram:before { content: @fa-var-instagram; }
+.@{fa-css-prefix}-flickr:before { content: @fa-var-flickr; }
+.@{fa-css-prefix}-adn:before { content: @fa-var-adn; }
+.@{fa-css-prefix}-bitbucket:before { content: @fa-var-bitbucket; }
+.@{fa-css-prefix}-bitbucket-square:before { content: @fa-var-bitbucket-square; }
+.@{fa-css-prefix}-tumblr:before { content: @fa-var-tumblr; }
+.@{fa-css-prefix}-tumblr-square:before { content: @fa-var-tumblr-square; }
+.@{fa-css-prefix}-long-arrow-down:before { content: @fa-var-long-arrow-down; }
+.@{fa-css-prefix}-long-arrow-up:before { content: @fa-var-long-arrow-up; }
+.@{fa-css-prefix}-long-arrow-left:before { content: @fa-var-long-arrow-left; }
+.@{fa-css-prefix}-long-arrow-right:before { content: @fa-var-long-arrow-right; }
+.@{fa-css-prefix}-apple:before { content: @fa-var-apple; }
+.@{fa-css-prefix}-windows:before { content: @fa-var-windows; }
+.@{fa-css-prefix}-android:before { content: @fa-var-android; }
+.@{fa-css-prefix}-linux:before { content: @fa-var-linux; }
+.@{fa-css-prefix}-dribbble:before { content: @fa-var-dribbble; }
+.@{fa-css-prefix}-skype:before { content: @fa-var-skype; }
+.@{fa-css-prefix}-foursquare:before { content: @fa-var-foursquare; }
+.@{fa-css-prefix}-trello:before { content: @fa-var-trello; }
+.@{fa-css-prefix}-female:before { content: @fa-var-female; }
+.@{fa-css-prefix}-male:before { content: @fa-var-male; }
+.@{fa-css-prefix}-gittip:before,
+.@{fa-css-prefix}-gratipay:before { content: @fa-var-gratipay; }
+.@{fa-css-prefix}-sun-o:before { content: @fa-var-sun-o; }
+.@{fa-css-prefix}-moon-o:before { content: @fa-var-moon-o; }
+.@{fa-css-prefix}-archive:before { content: @fa-var-archive; }
+.@{fa-css-prefix}-bug:before { content: @fa-var-bug; }
+.@{fa-css-prefix}-vk:before { content: @fa-var-vk; }
+.@{fa-css-prefix}-weibo:before { content: @fa-var-weibo; }
+.@{fa-css-prefix}-renren:before { content: @fa-var-renren; }
+.@{fa-css-prefix}-pagelines:before { content: @fa-var-pagelines; }
+.@{fa-css-prefix}-stack-exchange:before { content: @fa-var-stack-exchange; }
+.@{fa-css-prefix}-arrow-circle-o-right:before { content: @fa-var-arrow-circle-o-right; }
+.@{fa-css-prefix}-arrow-circle-o-left:before { content: @fa-var-arrow-circle-o-left; }
+.@{fa-css-prefix}-toggle-left:before,
+.@{fa-css-prefix}-caret-square-o-left:before { content: @fa-var-caret-square-o-left; }
+.@{fa-css-prefix}-dot-circle-o:before { content: @fa-var-dot-circle-o; }
+.@{fa-css-prefix}-wheelchair:before { content: @fa-var-wheelchair; }
+.@{fa-css-prefix}-vimeo-square:before { content: @fa-var-vimeo-square; }
+.@{fa-css-prefix}-turkish-lira:before,
+.@{fa-css-prefix}-try:before { content: @fa-var-try; }
+.@{fa-css-prefix}-plus-square-o:before { content: @fa-var-plus-square-o; }
+.@{fa-css-prefix}-space-shuttle:before { content: @fa-var-space-shuttle; }
+.@{fa-css-prefix}-slack:before { content: @fa-var-slack; }
+.@{fa-css-prefix}-envelope-square:before { content: @fa-var-envelope-square; }
+.@{fa-css-prefix}-wordpress:before { content: @fa-var-wordpress; }
+.@{fa-css-prefix}-openid:before { content: @fa-var-openid; }
+.@{fa-css-prefix}-institution:before,
+.@{fa-css-prefix}-bank:before,
+.@{fa-css-prefix}-university:before { content: @fa-var-university; }
+.@{fa-css-prefix}-mortar-board:before,
+.@{fa-css-prefix}-graduation-cap:before { content: @fa-var-graduation-cap; }
+.@{fa-css-prefix}-yahoo:before { content: @fa-var-yahoo; }
+.@{fa-css-prefix}-google:before { content: @fa-var-google; }
+.@{fa-css-prefix}-reddit:before { content: @fa-var-reddit; }
+.@{fa-css-prefix}-reddit-square:before { content: @fa-var-reddit-square; }
+.@{fa-css-prefix}-stumbleupon-circle:before { content: @fa-var-stumbleupon-circle; }
+.@{fa-css-prefix}-stumbleupon:before { content: @fa-var-stumbleupon; }
+.@{fa-css-prefix}-delicious:before { content: @fa-var-delicious; }
+.@{fa-css-prefix}-digg:before { content: @fa-var-digg; }
+.@{fa-css-prefix}-pied-piper-pp:before { content: @fa-var-pied-piper-pp; }
+.@{fa-css-prefix}-pied-piper-alt:before { content: @fa-var-pied-piper-alt; }
+.@{fa-css-prefix}-drupal:before { content: @fa-var-drupal; }
+.@{fa-css-prefix}-joomla:before { content: @fa-var-joomla; }
+.@{fa-css-prefix}-language:before { content: @fa-var-language; }
+.@{fa-css-prefix}-fax:before { content: @fa-var-fax; }
+.@{fa-css-prefix}-building:before { content: @fa-var-building; }
+.@{fa-css-prefix}-child:before { content: @fa-var-child; }
+.@{fa-css-prefix}-paw:before { content: @fa-var-paw; }
+.@{fa-css-prefix}-spoon:before { content: @fa-var-spoon; }
+.@{fa-css-prefix}-cube:before { content: @fa-var-cube; }
+.@{fa-css-prefix}-cubes:before { content: @fa-var-cubes; }
+.@{fa-css-prefix}-behance:before { content: @fa-var-behance; }
+.@{fa-css-prefix}-behance-square:before { content: @fa-var-behance-square; }
+.@{fa-css-prefix}-steam:before { content: @fa-var-steam; }
+.@{fa-css-prefix}-steam-square:before { content: @fa-var-steam-square; }
+.@{fa-css-prefix}-recycle:before { content: @fa-var-recycle; }
+.@{fa-css-prefix}-automobile:before,
+.@{fa-css-prefix}-car:before { content: @fa-var-car; }
+.@{fa-css-prefix}-cab:before,
+.@{fa-css-prefix}-taxi:before { content: @fa-var-taxi; }
+.@{fa-css-prefix}-tree:before { content: @fa-var-tree; }
+.@{fa-css-prefix}-spotify:before { content: @fa-var-spotify; }
+.@{fa-css-prefix}-deviantart:before { content: @fa-var-deviantart; }
+.@{fa-css-prefix}-soundcloud:before { content: @fa-var-soundcloud; }
+.@{fa-css-prefix}-database:before { content: @fa-var-database; }
+.@{fa-css-prefix}-file-pdf-o:before { content: @fa-var-file-pdf-o; }
+.@{fa-css-prefix}-file-word-o:before { content: @fa-var-file-word-o; }
+.@{fa-css-prefix}-file-excel-o:before { content: @fa-var-file-excel-o; }
+.@{fa-css-prefix}-file-powerpoint-o:before { content: @fa-var-file-powerpoint-o; }
+.@{fa-css-prefix}-file-photo-o:before,
+.@{fa-css-prefix}-file-picture-o:before,
+.@{fa-css-prefix}-file-image-o:before { content: @fa-var-file-image-o; }
+.@{fa-css-prefix}-file-zip-o:before,
+.@{fa-css-prefix}-file-archive-o:before { content: @fa-var-file-archive-o; }
+.@{fa-css-prefix}-file-sound-o:before,
+.@{fa-css-prefix}-file-audio-o:before { content: @fa-var-file-audio-o; }
+.@{fa-css-prefix}-file-movie-o:before,
+.@{fa-css-prefix}-file-video-o:before { content: @fa-var-file-video-o; }
+.@{fa-css-prefix}-file-code-o:before { content: @fa-var-file-code-o; }
+.@{fa-css-prefix}-vine:before { content: @fa-var-vine; }
+.@{fa-css-prefix}-codepen:before { content: @fa-var-codepen; }
+.@{fa-css-prefix}-jsfiddle:before { content: @fa-var-jsfiddle; }
+.@{fa-css-prefix}-life-bouy:before,
+.@{fa-css-prefix}-life-buoy:before,
+.@{fa-css-prefix}-life-saver:before,
+.@{fa-css-prefix}-support:before,
+.@{fa-css-prefix}-life-ring:before { content: @fa-var-life-ring; }
+.@{fa-css-prefix}-circle-o-notch:before { content: @fa-var-circle-o-notch; }
+.@{fa-css-prefix}-ra:before,
+.@{fa-css-prefix}-resistance:before,
+.@{fa-css-prefix}-rebel:before { content: @fa-var-rebel; }
+.@{fa-css-prefix}-ge:before,
+.@{fa-css-prefix}-empire:before { content: @fa-var-empire; }
+.@{fa-css-prefix}-git-square:before { content: @fa-var-git-square; }
+.@{fa-css-prefix}-git:before { content: @fa-var-git; }
+.@{fa-css-prefix}-y-combinator-square:before,
+.@{fa-css-prefix}-yc-square:before,
+.@{fa-css-prefix}-hacker-news:before { content: @fa-var-hacker-news; }
+.@{fa-css-prefix}-tencent-weibo:before { content: @fa-var-tencent-weibo; }
+.@{fa-css-prefix}-qq:before { content: @fa-var-qq; }
+.@{fa-css-prefix}-wechat:before,
+.@{fa-css-prefix}-weixin:before { content: @fa-var-weixin; }
+.@{fa-css-prefix}-send:before,
+.@{fa-css-prefix}-paper-plane:before { content: @fa-var-paper-plane; }
+.@{fa-css-prefix}-send-o:before,
+.@{fa-css-prefix}-paper-plane-o:before { content: @fa-var-paper-plane-o; }
+.@{fa-css-prefix}-history:before { content: @fa-var-history; }
+.@{fa-css-prefix}-circle-thin:before { content: @fa-var-circle-thin; }
+.@{fa-css-prefix}-header:before { content: @fa-var-header; }
+.@{fa-css-prefix}-paragraph:before { content: @fa-var-paragraph; }
+.@{fa-css-prefix}-sliders:before { content: @fa-var-sliders; }
+.@{fa-css-prefix}-share-alt:before { content: @fa-var-share-alt; }
+.@{fa-css-prefix}-share-alt-square:before { content: @fa-var-share-alt-square; }
+.@{fa-css-prefix}-bomb:before { content: @fa-var-bomb; }
+.@{fa-css-prefix}-soccer-ball-o:before,
+.@{fa-css-prefix}-futbol-o:before { content: @fa-var-futbol-o; }
+.@{fa-css-prefix}-tty:before { content: @fa-var-tty; }
+.@{fa-css-prefix}-binoculars:before { content: @fa-var-binoculars; }
+.@{fa-css-prefix}-plug:before { content: @fa-var-plug; }
+.@{fa-css-prefix}-slideshare:before { content: @fa-var-slideshare; }
+.@{fa-css-prefix}-twitch:before { content: @fa-var-twitch; }
+.@{fa-css-prefix}-yelp:before { content: @fa-var-yelp; }
+.@{fa-css-prefix}-newspaper-o:before { content: @fa-var-newspaper-o; }
+.@{fa-css-prefix}-wifi:before { content: @fa-var-wifi; }
+.@{fa-css-prefix}-calculator:before { content: @fa-var-calculator; }
+.@{fa-css-prefix}-paypal:before { content: @fa-var-paypal; }
+.@{fa-css-prefix}-google-wallet:before { content: @fa-var-google-wallet; }
+.@{fa-css-prefix}-cc-visa:before { content: @fa-var-cc-visa; }
+.@{fa-css-prefix}-cc-mastercard:before { content: @fa-var-cc-mastercard; }
+.@{fa-css-prefix}-cc-discover:before { content: @fa-var-cc-discover; }
+.@{fa-css-prefix}-cc-amex:before { content: @fa-var-cc-amex; }
+.@{fa-css-prefix}-cc-paypal:before { content: @fa-var-cc-paypal; }
+.@{fa-css-prefix}-cc-stripe:before { content: @fa-var-cc-stripe; }
+.@{fa-css-prefix}-bell-slash:before { content: @fa-var-bell-slash; }
+.@{fa-css-prefix}-bell-slash-o:before { content: @fa-var-bell-slash-o; }
+.@{fa-css-prefix}-trash:before { content: @fa-var-trash; }
+.@{fa-css-prefix}-copyright:before { content: @fa-var-copyright; }
+.@{fa-css-prefix}-at:before { content: @fa-var-at; }
+.@{fa-css-prefix}-eyedropper:before { content: @fa-var-eyedropper; }
+.@{fa-css-prefix}-paint-brush:before { content: @fa-var-paint-brush; }
+.@{fa-css-prefix}-birthday-cake:before { content: @fa-var-birthday-cake; }
+.@{fa-css-prefix}-area-chart:before { content: @fa-var-area-chart; }
+.@{fa-css-prefix}-pie-chart:before { content: @fa-var-pie-chart; }
+.@{fa-css-prefix}-line-chart:before { content: @fa-var-line-chart; }
+.@{fa-css-prefix}-lastfm:before { content: @fa-var-lastfm; }
+.@{fa-css-prefix}-lastfm-square:before { content: @fa-var-lastfm-square; }
+.@{fa-css-prefix}-toggle-off:before { content: @fa-var-toggle-off; }
+.@{fa-css-prefix}-toggle-on:before { content: @fa-var-toggle-on; }
+.@{fa-css-prefix}-bicycle:before { content: @fa-var-bicycle; }
+.@{fa-css-prefix}-bus:before { content: @fa-var-bus; }
+.@{fa-css-prefix}-ioxhost:before { content: @fa-var-ioxhost; }
+.@{fa-css-prefix}-angellist:before { content: @fa-var-angellist; }
+.@{fa-css-prefix}-cc:before { content: @fa-var-cc; }
+.@{fa-css-prefix}-shekel:before,
+.@{fa-css-prefix}-sheqel:before,
+.@{fa-css-prefix}-ils:before { content: @fa-var-ils; }
+.@{fa-css-prefix}-meanpath:before { content: @fa-var-meanpath; }
+.@{fa-css-prefix}-buysellads:before { content: @fa-var-buysellads; }
+.@{fa-css-prefix}-connectdevelop:before { content: @fa-var-connectdevelop; }
+.@{fa-css-prefix}-dashcube:before { content: @fa-var-dashcube; }
+.@{fa-css-prefix}-forumbee:before { content: @fa-var-forumbee; }
+.@{fa-css-prefix}-leanpub:before { content: @fa-var-leanpub; }
+.@{fa-css-prefix}-sellsy:before { content: @fa-var-sellsy; }
+.@{fa-css-prefix}-shirtsinbulk:before { content: @fa-var-shirtsinbulk; }
+.@{fa-css-prefix}-simplybuilt:before { content: @fa-var-simplybuilt; }
+.@{fa-css-prefix}-skyatlas:before { content: @fa-var-skyatlas; }
+.@{fa-css-prefix}-cart-plus:before { content: @fa-var-cart-plus; }
+.@{fa-css-prefix}-cart-arrow-down:before { content: @fa-var-cart-arrow-down; }
+.@{fa-css-prefix}-diamond:before { content: @fa-var-diamond; }
+.@{fa-css-prefix}-ship:before { content: @fa-var-ship; }
+.@{fa-css-prefix}-user-secret:before { content: @fa-var-user-secret; }
+.@{fa-css-prefix}-motorcycle:before { content: @fa-var-motorcycle; }
+.@{fa-css-prefix}-street-view:before { content: @fa-var-street-view; }
+.@{fa-css-prefix}-heartbeat:before { content: @fa-var-heartbeat; }
+.@{fa-css-prefix}-venus:before { content: @fa-var-venus; }
+.@{fa-css-prefix}-mars:before { content: @fa-var-mars; }
+.@{fa-css-prefix}-mercury:before { content: @fa-var-mercury; }
+.@{fa-css-prefix}-intersex:before,
+.@{fa-css-prefix}-transgender:before { content: @fa-var-transgender; }
+.@{fa-css-prefix}-transgender-alt:before { content: @fa-var-transgender-alt; }
+.@{fa-css-prefix}-venus-double:before { content: @fa-var-venus-double; }
+.@{fa-css-prefix}-mars-double:before { content: @fa-var-mars-double; }
+.@{fa-css-prefix}-venus-mars:before { content: @fa-var-venus-mars; }
+.@{fa-css-prefix}-mars-stroke:before { content: @fa-var-mars-stroke; }
+.@{fa-css-prefix}-mars-stroke-v:before { content: @fa-var-mars-stroke-v; }
+.@{fa-css-prefix}-mars-stroke-h:before { content: @fa-var-mars-stroke-h; }
+.@{fa-css-prefix}-neuter:before { content: @fa-var-neuter; }
+.@{fa-css-prefix}-genderless:before { content: @fa-var-genderless; }
+.@{fa-css-prefix}-facebook-official:before { content: @fa-var-facebook-official; }
+.@{fa-css-prefix}-pinterest-p:before { content: @fa-var-pinterest-p; }
+.@{fa-css-prefix}-whatsapp:before { content: @fa-var-whatsapp; }
+.@{fa-css-prefix}-server:before { content: @fa-var-server; }
+.@{fa-css-prefix}-user-plus:before { content: @fa-var-user-plus; }
+.@{fa-css-prefix}-user-times:before { content: @fa-var-user-times; }
+.@{fa-css-prefix}-hotel:before,
+.@{fa-css-prefix}-bed:before { content: @fa-var-bed; }
+.@{fa-css-prefix}-viacoin:before { content: @fa-var-viacoin; }
+.@{fa-css-prefix}-train:before { content: @fa-var-train; }
+.@{fa-css-prefix}-subway:before { content: @fa-var-subway; }
+.@{fa-css-prefix}-medium:before { content: @fa-var-medium; }
+.@{fa-css-prefix}-yc:before,
+.@{fa-css-prefix}-y-combinator:before { content: @fa-var-y-combinator; }
+.@{fa-css-prefix}-optin-monster:before { content: @fa-var-optin-monster; }
+.@{fa-css-prefix}-opencart:before { content: @fa-var-opencart; }
+.@{fa-css-prefix}-expeditedssl:before { content: @fa-var-expeditedssl; }
+.@{fa-css-prefix}-battery-4:before,
+.@{fa-css-prefix}-battery:before,
+.@{fa-css-prefix}-battery-full:before { content: @fa-var-battery-full; }
+.@{fa-css-prefix}-battery-3:before,
+.@{fa-css-prefix}-battery-three-quarters:before { content: @fa-var-battery-three-quarters; }
+.@{fa-css-prefix}-battery-2:before,
+.@{fa-css-prefix}-battery-half:before { content: @fa-var-battery-half; }
+.@{fa-css-prefix}-battery-1:before,
+.@{fa-css-prefix}-battery-quarter:before { content: @fa-var-battery-quarter; }
+.@{fa-css-prefix}-battery-0:before,
+.@{fa-css-prefix}-battery-empty:before { content: @fa-var-battery-empty; }
+.@{fa-css-prefix}-mouse-pointer:before { content: @fa-var-mouse-pointer; }
+.@{fa-css-prefix}-i-cursor:before { content: @fa-var-i-cursor; }
+.@{fa-css-prefix}-object-group:before { content: @fa-var-object-group; }
+.@{fa-css-prefix}-object-ungroup:before { content: @fa-var-object-ungroup; }
+.@{fa-css-prefix}-sticky-note:before { content: @fa-var-sticky-note; }
+.@{fa-css-prefix}-sticky-note-o:before { content: @fa-var-sticky-note-o; }
+.@{fa-css-prefix}-cc-jcb:before { content: @fa-var-cc-jcb; }
+.@{fa-css-prefix}-cc-diners-club:before { content: @fa-var-cc-diners-club; }
+.@{fa-css-prefix}-clone:before { content: @fa-var-clone; }
+.@{fa-css-prefix}-balance-scale:before { content: @fa-var-balance-scale; }
+.@{fa-css-prefix}-hourglass-o:before { content: @fa-var-hourglass-o; }
+.@{fa-css-prefix}-hourglass-1:before,
+.@{fa-css-prefix}-hourglass-start:before { content: @fa-var-hourglass-start; }
+.@{fa-css-prefix}-hourglass-2:before,
+.@{fa-css-prefix}-hourglass-half:before { content: @fa-var-hourglass-half; }
+.@{fa-css-prefix}-hourglass-3:before,
+.@{fa-css-prefix}-hourglass-end:before { content: @fa-var-hourglass-end; }
+.@{fa-css-prefix}-hourglass:before { content: @fa-var-hourglass; }
+.@{fa-css-prefix}-hand-grab-o:before,
+.@{fa-css-prefix}-hand-rock-o:before { content: @fa-var-hand-rock-o; }
+.@{fa-css-prefix}-hand-stop-o:before,
+.@{fa-css-prefix}-hand-paper-o:before { content: @fa-var-hand-paper-o; }
+.@{fa-css-prefix}-hand-scissors-o:before { content: @fa-var-hand-scissors-o; }
+.@{fa-css-prefix}-hand-lizard-o:before { content: @fa-var-hand-lizard-o; }
+.@{fa-css-prefix}-hand-spock-o:before { content: @fa-var-hand-spock-o; }
+.@{fa-css-prefix}-hand-pointer-o:before { content: @fa-var-hand-pointer-o; }
+.@{fa-css-prefix}-hand-peace-o:before { content: @fa-var-hand-peace-o; }
+.@{fa-css-prefix}-trademark:before { content: @fa-var-trademark; }
+.@{fa-css-prefix}-registered:before { content: @fa-var-registered; }
+.@{fa-css-prefix}-creative-commons:before { content: @fa-var-creative-commons; }
+.@{fa-css-prefix}-gg:before { content: @fa-var-gg; }
+.@{fa-css-prefix}-gg-circle:before { content: @fa-var-gg-circle; }
+.@{fa-css-prefix}-tripadvisor:before { content: @fa-var-tripadvisor; }
+.@{fa-css-prefix}-odnoklassniki:before { content: @fa-var-odnoklassniki; }
+.@{fa-css-prefix}-odnoklassniki-square:before { content: @fa-var-odnoklassniki-square; }
+.@{fa-css-prefix}-get-pocket:before { content: @fa-var-get-pocket; }
+.@{fa-css-prefix}-wikipedia-w:before { content: @fa-var-wikipedia-w; }
+.@{fa-css-prefix}-safari:before { content: @fa-var-safari; }
+.@{fa-css-prefix}-chrome:before { content: @fa-var-chrome; }
+.@{fa-css-prefix}-firefox:before { content: @fa-var-firefox; }
+.@{fa-css-prefix}-opera:before { content: @fa-var-opera; }
+.@{fa-css-prefix}-internet-explorer:before { content: @fa-var-internet-explorer; }
+.@{fa-css-prefix}-tv:before,
+.@{fa-css-prefix}-television:before { content: @fa-var-television; }
+.@{fa-css-prefix}-contao:before { content: @fa-var-contao; }
+.@{fa-css-prefix}-500px:before { content: @fa-var-500px; }
+.@{fa-css-prefix}-amazon:before { content: @fa-var-amazon; }
+.@{fa-css-prefix}-calendar-plus-o:before { content: @fa-var-calendar-plus-o; }
+.@{fa-css-prefix}-calendar-minus-o:before { content: @fa-var-calendar-minus-o; }
+.@{fa-css-prefix}-calendar-times-o:before { content: @fa-var-calendar-times-o; }
+.@{fa-css-prefix}-calendar-check-o:before { content: @fa-var-calendar-check-o; }
+.@{fa-css-prefix}-industry:before { content: @fa-var-industry; }
+.@{fa-css-prefix}-map-pin:before { content: @fa-var-map-pin; }
+.@{fa-css-prefix}-map-signs:before { content: @fa-var-map-signs; }
+.@{fa-css-prefix}-map-o:before { content: @fa-var-map-o; }
+.@{fa-css-prefix}-map:before { content: @fa-var-map; }
+.@{fa-css-prefix}-commenting:before { content: @fa-var-commenting; }
+.@{fa-css-prefix}-commenting-o:before { content: @fa-var-commenting-o; }
+.@{fa-css-prefix}-houzz:before { content: @fa-var-houzz; }
+.@{fa-css-prefix}-vimeo:before { content: @fa-var-vimeo; }
+.@{fa-css-prefix}-black-tie:before { content: @fa-var-black-tie; }
+.@{fa-css-prefix}-fonticons:before { content: @fa-var-fonticons; }
+.@{fa-css-prefix}-reddit-alien:before { content: @fa-var-reddit-alien; }
+.@{fa-css-prefix}-edge:before { content: @fa-var-edge; }
+.@{fa-css-prefix}-credit-card-alt:before { content: @fa-var-credit-card-alt; }
+.@{fa-css-prefix}-codiepie:before { content: @fa-var-codiepie; }
+.@{fa-css-prefix}-modx:before { content: @fa-var-modx; }
+.@{fa-css-prefix}-fort-awesome:before { content: @fa-var-fort-awesome; }
+.@{fa-css-prefix}-usb:before { content: @fa-var-usb; }
+.@{fa-css-prefix}-product-hunt:before { content: @fa-var-product-hunt; }
+.@{fa-css-prefix}-mixcloud:before { content: @fa-var-mixcloud; }
+.@{fa-css-prefix}-scribd:before { content: @fa-var-scribd; }
+.@{fa-css-prefix}-pause-circle:before { content: @fa-var-pause-circle; }
+.@{fa-css-prefix}-pause-circle-o:before { content: @fa-var-pause-circle-o; }
+.@{fa-css-prefix}-stop-circle:before { content: @fa-var-stop-circle; }
+.@{fa-css-prefix}-stop-circle-o:before { content: @fa-var-stop-circle-o; }
+.@{fa-css-prefix}-shopping-bag:before { content: @fa-var-shopping-bag; }
+.@{fa-css-prefix}-shopping-basket:before { content: @fa-var-shopping-basket; }
+.@{fa-css-prefix}-hashtag:before { content: @fa-var-hashtag; }
+.@{fa-css-prefix}-bluetooth:before { content: @fa-var-bluetooth; }
+.@{fa-css-prefix}-bluetooth-b:before { content: @fa-var-bluetooth-b; }
+.@{fa-css-prefix}-percent:before { content: @fa-var-percent; }
+.@{fa-css-prefix}-gitlab:before { content: @fa-var-gitlab; }
+.@{fa-css-prefix}-wpbeginner:before { content: @fa-var-wpbeginner; }
+.@{fa-css-prefix}-wpforms:before { content: @fa-var-wpforms; }
+.@{fa-css-prefix}-envira:before { content: @fa-var-envira; }
+.@{fa-css-prefix}-universal-access:before { content: @fa-var-universal-access; }
+.@{fa-css-prefix}-wheelchair-alt:before { content: @fa-var-wheelchair-alt; }
+.@{fa-css-prefix}-question-circle-o:before { content: @fa-var-question-circle-o; }
+.@{fa-css-prefix}-blind:before { content: @fa-var-blind; }
+.@{fa-css-prefix}-audio-description:before { content: @fa-var-audio-description; }
+.@{fa-css-prefix}-volume-control-phone:before { content: @fa-var-volume-control-phone; }
+.@{fa-css-prefix}-braille:before { content: @fa-var-braille; }
+.@{fa-css-prefix}-assistive-listening-systems:before { content: @fa-var-assistive-listening-systems; }
+.@{fa-css-prefix}-asl-interpreting:before,
+.@{fa-css-prefix}-american-sign-language-interpreting:before { content: @fa-var-american-sign-language-interpreting; }
+.@{fa-css-prefix}-deafness:before,
+.@{fa-css-prefix}-hard-of-hearing:before,
+.@{fa-css-prefix}-deaf:before { content: @fa-var-deaf; }
+.@{fa-css-prefix}-glide:before { content: @fa-var-glide; }
+.@{fa-css-prefix}-glide-g:before { content: @fa-var-glide-g; }
+.@{fa-css-prefix}-signing:before,
+.@{fa-css-prefix}-sign-language:before { content: @fa-var-sign-language; }
+.@{fa-css-prefix}-low-vision:before { content: @fa-var-low-vision; }
+.@{fa-css-prefix}-viadeo:before { content: @fa-var-viadeo; }
+.@{fa-css-prefix}-viadeo-square:before { content: @fa-var-viadeo-square; }
+.@{fa-css-prefix}-snapchat:before { content: @fa-var-snapchat; }
+.@{fa-css-prefix}-snapchat-ghost:before { content: @fa-var-snapchat-ghost; }
+.@{fa-css-prefix}-snapchat-square:before { content: @fa-var-snapchat-square; }
+.@{fa-css-prefix}-pied-piper:before { content: @fa-var-pied-piper; }
+.@{fa-css-prefix}-first-order:before { content: @fa-var-first-order; }
+.@{fa-css-prefix}-yoast:before { content: @fa-var-yoast; }
+.@{fa-css-prefix}-themeisle:before { content: @fa-var-themeisle; }
+.@{fa-css-prefix}-google-plus-circle:before,
+.@{fa-css-prefix}-google-plus-official:before { content: @fa-var-google-plus-official; }
+.@{fa-css-prefix}-fa:before,
+.@{fa-css-prefix}-font-awesome:before { content: @fa-var-font-awesome; }
+.@{fa-css-prefix}-handshake-o:before { content: @fa-var-handshake-o; }
+.@{fa-css-prefix}-envelope-open:before { content: @fa-var-envelope-open; }
+.@{fa-css-prefix}-envelope-open-o:before { content: @fa-var-envelope-open-o; }
+.@{fa-css-prefix}-linode:before { content: @fa-var-linode; }
+.@{fa-css-prefix}-address-book:before { content: @fa-var-address-book; }
+.@{fa-css-prefix}-address-book-o:before { content: @fa-var-address-book-o; }
+.@{fa-css-prefix}-vcard:before,
+.@{fa-css-prefix}-address-card:before { content: @fa-var-address-card; }
+.@{fa-css-prefix}-vcard-o:before,
+.@{fa-css-prefix}-address-card-o:before { content: @fa-var-address-card-o; }
+.@{fa-css-prefix}-user-circle:before { content: @fa-var-user-circle; }
+.@{fa-css-prefix}-user-circle-o:before { content: @fa-var-user-circle-o; }
+.@{fa-css-prefix}-user-o:before { content: @fa-var-user-o; }
+.@{fa-css-prefix}-id-badge:before { content: @fa-var-id-badge; }
+.@{fa-css-prefix}-drivers-license:before,
+.@{fa-css-prefix}-id-card:before { content: @fa-var-id-card; }
+.@{fa-css-prefix}-drivers-license-o:before,
+.@{fa-css-prefix}-id-card-o:before { content: @fa-var-id-card-o; }
+.@{fa-css-prefix}-quora:before { content: @fa-var-quora; }
+.@{fa-css-prefix}-free-code-camp:before { content: @fa-var-free-code-camp; }
+.@{fa-css-prefix}-telegram:before { content: @fa-var-telegram; }
+.@{fa-css-prefix}-thermometer-4:before,
+.@{fa-css-prefix}-thermometer:before,
+.@{fa-css-prefix}-thermometer-full:before { content: @fa-var-thermometer-full; }
+.@{fa-css-prefix}-thermometer-3:before,
+.@{fa-css-prefix}-thermometer-three-quarters:before { content: @fa-var-thermometer-three-quarters; }
+.@{fa-css-prefix}-thermometer-2:before,
+.@{fa-css-prefix}-thermometer-half:before { content: @fa-var-thermometer-half; }
+.@{fa-css-prefix}-thermometer-1:before,
+.@{fa-css-prefix}-thermometer-quarter:before { content: @fa-var-thermometer-quarter; }
+.@{fa-css-prefix}-thermometer-0:before,
+.@{fa-css-prefix}-thermometer-empty:before { content: @fa-var-thermometer-empty; }
+.@{fa-css-prefix}-shower:before { content: @fa-var-shower; }
+.@{fa-css-prefix}-bathtub:before,
+.@{fa-css-prefix}-s15:before,
+.@{fa-css-prefix}-bath:before { content: @fa-var-bath; }
+.@{fa-css-prefix}-podcast:before { content: @fa-var-podcast; }
+.@{fa-css-prefix}-window-maximize:before { content: @fa-var-window-maximize; }
+.@{fa-css-prefix}-window-minimize:before { content: @fa-var-window-minimize; }
+.@{fa-css-prefix}-window-restore:before { content: @fa-var-window-restore; }
+.@{fa-css-prefix}-times-rectangle:before,
+.@{fa-css-prefix}-window-close:before { content: @fa-var-window-close; }
+.@{fa-css-prefix}-times-rectangle-o:before,
+.@{fa-css-prefix}-window-close-o:before { content: @fa-var-window-close-o; }
+.@{fa-css-prefix}-bandcamp:before { content: @fa-var-bandcamp; }
+.@{fa-css-prefix}-grav:before { content: @fa-var-grav; }
+.@{fa-css-prefix}-etsy:before { content: @fa-var-etsy; }
+.@{fa-css-prefix}-imdb:before { content: @fa-var-imdb; }
+.@{fa-css-prefix}-ravelry:before { content: @fa-var-ravelry; }
+.@{fa-css-prefix}-eercast:before { content: @fa-var-eercast; }
+.@{fa-css-prefix}-microchip:before { content: @fa-var-microchip; }
+.@{fa-css-prefix}-snowflake-o:before { content: @fa-var-snowflake-o; }
+.@{fa-css-prefix}-superpowers:before { content: @fa-var-superpowers; }
+.@{fa-css-prefix}-wpexplorer:before { content: @fa-var-wpexplorer; }
+.@{fa-css-prefix}-meetup:before { content: @fa-var-meetup; }
diff --git a/htdocs/includes/fontawesome/less/larger.less b/htdocs/includes/fontawesome/less/larger.less
new file mode 100644
index 00000000000..c9d646770e2
--- /dev/null
+++ b/htdocs/includes/fontawesome/less/larger.less
@@ -0,0 +1,13 @@
+// Icon Sizes
+// -------------------------
+
+/* makes the font 33% larger relative to the icon container */
+.@{fa-css-prefix}-lg {
+  font-size: (4em / 3);
+  line-height: (3em / 4);
+  vertical-align: -15%;
+}
+.@{fa-css-prefix}-2x { font-size: 2em; }
+.@{fa-css-prefix}-3x { font-size: 3em; }
+.@{fa-css-prefix}-4x { font-size: 4em; }
+.@{fa-css-prefix}-5x { font-size: 5em; }
diff --git a/htdocs/includes/fontawesome/less/list.less b/htdocs/includes/fontawesome/less/list.less
new file mode 100644
index 00000000000..0b440382f61
--- /dev/null
+++ b/htdocs/includes/fontawesome/less/list.less
@@ -0,0 +1,19 @@
+// List Icons
+// -------------------------
+
+.@{fa-css-prefix}-ul {
+  padding-left: 0;
+  margin-left: @fa-li-width;
+  list-style-type: none;
+  > li { position: relative; }
+}
+.@{fa-css-prefix}-li {
+  position: absolute;
+  left: -@fa-li-width;
+  width: @fa-li-width;
+  top: (2em / 14);
+  text-align: center;
+  &.@{fa-css-prefix}-lg {
+    left: (-@fa-li-width + (4em / 14));
+  }
+}
diff --git a/htdocs/includes/fontawesome/less/mixins.less b/htdocs/includes/fontawesome/less/mixins.less
new file mode 100644
index 00000000000..beef231d0e1
--- /dev/null
+++ b/htdocs/includes/fontawesome/less/mixins.less
@@ -0,0 +1,60 @@
+// Mixins
+// --------------------------
+
+.fa-icon() {
+  display: inline-block;
+  font: normal normal normal @fa-font-size-base/@fa-line-height-base FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+}
+
+.fa-icon-rotate(@degrees, @rotation) {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation})";
+  -webkit-transform: rotate(@degrees);
+      -ms-transform: rotate(@degrees);
+          transform: rotate(@degrees);
+}
+
+.fa-icon-flip(@horiz, @vert, @rotation) {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation}, mirror=1)";
+  -webkit-transform: scale(@horiz, @vert);
+      -ms-transform: scale(@horiz, @vert);
+          transform: scale(@horiz, @vert);
+}
+
+
+// Only display content to screen readers. A la Bootstrap 4.
+//
+// See: http://a11yproject.com/posts/how-to-hide-content/
+
+.sr-only() {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0,0,0,0);
+  border: 0;
+}
+
+// Use in conjunction with .sr-only to only display content when it's focused.
+//
+// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
+//
+// Credit: HTML5 Boilerplate
+
+.sr-only-focusable() {
+  &:active,
+  &:focus {
+    position: static;
+    width: auto;
+    height: auto;
+    margin: 0;
+    overflow: visible;
+    clip: auto;
+  }
+}
diff --git a/htdocs/includes/fontawesome/less/path.less b/htdocs/includes/fontawesome/less/path.less
new file mode 100644
index 00000000000..835be41f815
--- /dev/null
+++ b/htdocs/includes/fontawesome/less/path.less
@@ -0,0 +1,15 @@
+/* FONT PATH
+ * -------------------------- */
+
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
+    url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'),
+    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
+    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
+    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
+  // src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
+  font-weight: normal;
+  font-style: normal;
+}
diff --git a/htdocs/includes/fontawesome/less/rotated-flipped.less b/htdocs/includes/fontawesome/less/rotated-flipped.less
new file mode 100644
index 00000000000..f6ba81475b9
--- /dev/null
+++ b/htdocs/includes/fontawesome/less/rotated-flipped.less
@@ -0,0 +1,20 @@
+// Rotated & Flipped Icons
+// -------------------------
+
+.@{fa-css-prefix}-rotate-90  { .fa-icon-rotate(90deg, 1);  }
+.@{fa-css-prefix}-rotate-180 { .fa-icon-rotate(180deg, 2); }
+.@{fa-css-prefix}-rotate-270 { .fa-icon-rotate(270deg, 3); }
+
+.@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); }
+.@{fa-css-prefix}-flip-vertical   { .fa-icon-flip(1, -1, 2); }
+
+// Hook for IE8-9
+// -------------------------
+
+:root .@{fa-css-prefix}-rotate-90,
+:root .@{fa-css-prefix}-rotate-180,
+:root .@{fa-css-prefix}-rotate-270,
+:root .@{fa-css-prefix}-flip-horizontal,
+:root .@{fa-css-prefix}-flip-vertical {
+  filter: none;
+}
diff --git a/htdocs/includes/fontawesome/less/screen-reader.less b/htdocs/includes/fontawesome/less/screen-reader.less
new file mode 100644
index 00000000000..11c188196d5
--- /dev/null
+++ b/htdocs/includes/fontawesome/less/screen-reader.less
@@ -0,0 +1,5 @@
+// Screen Readers
+// -------------------------
+
+.sr-only { .sr-only(); }
+.sr-only-focusable { .sr-only-focusable(); }
diff --git a/htdocs/includes/fontawesome/less/stacked.less b/htdocs/includes/fontawesome/less/stacked.less
new file mode 100644
index 00000000000..fc53fb0e7ab
--- /dev/null
+++ b/htdocs/includes/fontawesome/less/stacked.less
@@ -0,0 +1,20 @@
+// Stacked Icons
+// -------------------------
+
+.@{fa-css-prefix}-stack {
+  position: relative;
+  display: inline-block;
+  width: 2em;
+  height: 2em;
+  line-height: 2em;
+  vertical-align: middle;
+}
+.@{fa-css-prefix}-stack-1x, .@{fa-css-prefix}-stack-2x {
+  position: absolute;
+  left: 0;
+  width: 100%;
+  text-align: center;
+}
+.@{fa-css-prefix}-stack-1x { line-height: inherit; }
+.@{fa-css-prefix}-stack-2x { font-size: 2em; }
+.@{fa-css-prefix}-inverse { color: @fa-inverse; }
diff --git a/htdocs/includes/fontawesome/less/variables.less b/htdocs/includes/fontawesome/less/variables.less
new file mode 100644
index 00000000000..7ddbbc0115f
--- /dev/null
+++ b/htdocs/includes/fontawesome/less/variables.less
@@ -0,0 +1,800 @@
+// Variables
+// --------------------------
+
+@fa-font-path:        "../fonts";
+@fa-font-size-base:   14px;
+@fa-line-height-base: 1;
+//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.7.0/fonts"; // for referencing Bootstrap CDN font files directly
+@fa-css-prefix:       fa;
+@fa-version:          "4.7.0";
+@fa-border-color:     #eee;
+@fa-inverse:          #fff;
+@fa-li-width:         (30em / 14);
+
+@fa-var-500px: "\f26e";
+@fa-var-address-book: "\f2b9";
+@fa-var-address-book-o: "\f2ba";
+@fa-var-address-card: "\f2bb";
+@fa-var-address-card-o: "\f2bc";
+@fa-var-adjust: "\f042";
+@fa-var-adn: "\f170";
+@fa-var-align-center: "\f037";
+@fa-var-align-justify: "\f039";
+@fa-var-align-left: "\f036";
+@fa-var-align-right: "\f038";
+@fa-var-amazon: "\f270";
+@fa-var-ambulance: "\f0f9";
+@fa-var-american-sign-language-interpreting: "\f2a3";
+@fa-var-anchor: "\f13d";
+@fa-var-android: "\f17b";
+@fa-var-angellist: "\f209";
+@fa-var-angle-double-down: "\f103";
+@fa-var-angle-double-left: "\f100";
+@fa-var-angle-double-right: "\f101";
+@fa-var-angle-double-up: "\f102";
+@fa-var-angle-down: "\f107";
+@fa-var-angle-left: "\f104";
+@fa-var-angle-right: "\f105";
+@fa-var-angle-up: "\f106";
+@fa-var-apple: "\f179";
+@fa-var-archive: "\f187";
+@fa-var-area-chart: "\f1fe";
+@fa-var-arrow-circle-down: "\f0ab";
+@fa-var-arrow-circle-left: "\f0a8";
+@fa-var-arrow-circle-o-down: "\f01a";
+@fa-var-arrow-circle-o-left: "\f190";
+@fa-var-arrow-circle-o-right: "\f18e";
+@fa-var-arrow-circle-o-up: "\f01b";
+@fa-var-arrow-circle-right: "\f0a9";
+@fa-var-arrow-circle-up: "\f0aa";
+@fa-var-arrow-down: "\f063";
+@fa-var-arrow-left: "\f060";
+@fa-var-arrow-right: "\f061";
+@fa-var-arrow-up: "\f062";
+@fa-var-arrows: "\f047";
+@fa-var-arrows-alt: "\f0b2";
+@fa-var-arrows-h: "\f07e";
+@fa-var-arrows-v: "\f07d";
+@fa-var-asl-interpreting: "\f2a3";
+@fa-var-assistive-listening-systems: "\f2a2";
+@fa-var-asterisk: "\f069";
+@fa-var-at: "\f1fa";
+@fa-var-audio-description: "\f29e";
+@fa-var-automobile: "\f1b9";
+@fa-var-backward: "\f04a";
+@fa-var-balance-scale: "\f24e";
+@fa-var-ban: "\f05e";
+@fa-var-bandcamp: "\f2d5";
+@fa-var-bank: "\f19c";
+@fa-var-bar-chart: "\f080";
+@fa-var-bar-chart-o: "\f080";
+@fa-var-barcode: "\f02a";
+@fa-var-bars: "\f0c9";
+@fa-var-bath: "\f2cd";
+@fa-var-bathtub: "\f2cd";
+@fa-var-battery: "\f240";
+@fa-var-battery-0: "\f244";
+@fa-var-battery-1: "\f243";
+@fa-var-battery-2: "\f242";
+@fa-var-battery-3: "\f241";
+@fa-var-battery-4: "\f240";
+@fa-var-battery-empty: "\f244";
+@fa-var-battery-full: "\f240";
+@fa-var-battery-half: "\f242";
+@fa-var-battery-quarter: "\f243";
+@fa-var-battery-three-quarters: "\f241";
+@fa-var-bed: "\f236";
+@fa-var-beer: "\f0fc";
+@fa-var-behance: "\f1b4";
+@fa-var-behance-square: "\f1b5";
+@fa-var-bell: "\f0f3";
+@fa-var-bell-o: "\f0a2";
+@fa-var-bell-slash: "\f1f6";
+@fa-var-bell-slash-o: "\f1f7";
+@fa-var-bicycle: "\f206";
+@fa-var-binoculars: "\f1e5";
+@fa-var-birthday-cake: "\f1fd";
+@fa-var-bitbucket: "\f171";
+@fa-var-bitbucket-square: "\f172";
+@fa-var-bitcoin: "\f15a";
+@fa-var-black-tie: "\f27e";
+@fa-var-blind: "\f29d";
+@fa-var-bluetooth: "\f293";
+@fa-var-bluetooth-b: "\f294";
+@fa-var-bold: "\f032";
+@fa-var-bolt: "\f0e7";
+@fa-var-bomb: "\f1e2";
+@fa-var-book: "\f02d";
+@fa-var-bookmark: "\f02e";
+@fa-var-bookmark-o: "\f097";
+@fa-var-braille: "\f2a1";
+@fa-var-briefcase: "\f0b1";
+@fa-var-btc: "\f15a";
+@fa-var-bug: "\f188";
+@fa-var-building: "\f1ad";
+@fa-var-building-o: "\f0f7";
+@fa-var-bullhorn: "\f0a1";
+@fa-var-bullseye: "\f140";
+@fa-var-bus: "\f207";
+@fa-var-buysellads: "\f20d";
+@fa-var-cab: "\f1ba";
+@fa-var-calculator: "\f1ec";
+@fa-var-calendar: "\f073";
+@fa-var-calendar-check-o: "\f274";
+@fa-var-calendar-minus-o: "\f272";
+@fa-var-calendar-o: "\f133";
+@fa-var-calendar-plus-o: "\f271";
+@fa-var-calendar-times-o: "\f273";
+@fa-var-camera: "\f030";
+@fa-var-camera-retro: "\f083";
+@fa-var-car: "\f1b9";
+@fa-var-caret-down: "\f0d7";
+@fa-var-caret-left: "\f0d9";
+@fa-var-caret-right: "\f0da";
+@fa-var-caret-square-o-down: "\f150";
+@fa-var-caret-square-o-left: "\f191";
+@fa-var-caret-square-o-right: "\f152";
+@fa-var-caret-square-o-up: "\f151";
+@fa-var-caret-up: "\f0d8";
+@fa-var-cart-arrow-down: "\f218";
+@fa-var-cart-plus: "\f217";
+@fa-var-cc: "\f20a";
+@fa-var-cc-amex: "\f1f3";
+@fa-var-cc-diners-club: "\f24c";
+@fa-var-cc-discover: "\f1f2";
+@fa-var-cc-jcb: "\f24b";
+@fa-var-cc-mastercard: "\f1f1";
+@fa-var-cc-paypal: "\f1f4";
+@fa-var-cc-stripe: "\f1f5";
+@fa-var-cc-visa: "\f1f0";
+@fa-var-certificate: "\f0a3";
+@fa-var-chain: "\f0c1";
+@fa-var-chain-broken: "\f127";
+@fa-var-check: "\f00c";
+@fa-var-check-circle: "\f058";
+@fa-var-check-circle-o: "\f05d";
+@fa-var-check-square: "\f14a";
+@fa-var-check-square-o: "\f046";
+@fa-var-chevron-circle-down: "\f13a";
+@fa-var-chevron-circle-left: "\f137";
+@fa-var-chevron-circle-right: "\f138";
+@fa-var-chevron-circle-up: "\f139";
+@fa-var-chevron-down: "\f078";
+@fa-var-chevron-left: "\f053";
+@fa-var-chevron-right: "\f054";
+@fa-var-chevron-up: "\f077";
+@fa-var-child: "\f1ae";
+@fa-var-chrome: "\f268";
+@fa-var-circle: "\f111";
+@fa-var-circle-o: "\f10c";
+@fa-var-circle-o-notch: "\f1ce";
+@fa-var-circle-thin: "\f1db";
+@fa-var-clipboard: "\f0ea";
+@fa-var-clock-o: "\f017";
+@fa-var-clone: "\f24d";
+@fa-var-close: "\f00d";
+@fa-var-cloud: "\f0c2";
+@fa-var-cloud-download: "\f0ed";
+@fa-var-cloud-upload: "\f0ee";
+@fa-var-cny: "\f157";
+@fa-var-code: "\f121";
+@fa-var-code-fork: "\f126";
+@fa-var-codepen: "\f1cb";
+@fa-var-codiepie: "\f284";
+@fa-var-coffee: "\f0f4";
+@fa-var-cog: "\f013";
+@fa-var-cogs: "\f085";
+@fa-var-columns: "\f0db";
+@fa-var-comment: "\f075";
+@fa-var-comment-o: "\f0e5";
+@fa-var-commenting: "\f27a";
+@fa-var-commenting-o: "\f27b";
+@fa-var-comments: "\f086";
+@fa-var-comments-o: "\f0e6";
+@fa-var-compass: "\f14e";
+@fa-var-compress: "\f066";
+@fa-var-connectdevelop: "\f20e";
+@fa-var-contao: "\f26d";
+@fa-var-copy: "\f0c5";
+@fa-var-copyright: "\f1f9";
+@fa-var-creative-commons: "\f25e";
+@fa-var-credit-card: "\f09d";
+@fa-var-credit-card-alt: "\f283";
+@fa-var-crop: "\f125";
+@fa-var-crosshairs: "\f05b";
+@fa-var-css3: "\f13c";
+@fa-var-cube: "\f1b2";
+@fa-var-cubes: "\f1b3";
+@fa-var-cut: "\f0c4";
+@fa-var-cutlery: "\f0f5";
+@fa-var-dashboard: "\f0e4";
+@fa-var-dashcube: "\f210";
+@fa-var-database: "\f1c0";
+@fa-var-deaf: "\f2a4";
+@fa-var-deafness: "\f2a4";
+@fa-var-dedent: "\f03b";
+@fa-var-delicious: "\f1a5";
+@fa-var-desktop: "\f108";
+@fa-var-deviantart: "\f1bd";
+@fa-var-diamond: "\f219";
+@fa-var-digg: "\f1a6";
+@fa-var-dollar: "\f155";
+@fa-var-dot-circle-o: "\f192";
+@fa-var-download: "\f019";
+@fa-var-dribbble: "\f17d";
+@fa-var-drivers-license: "\f2c2";
+@fa-var-drivers-license-o: "\f2c3";
+@fa-var-dropbox: "\f16b";
+@fa-var-drupal: "\f1a9";
+@fa-var-edge: "\f282";
+@fa-var-edit: "\f044";
+@fa-var-eercast: "\f2da";
+@fa-var-eject: "\f052";
+@fa-var-ellipsis-h: "\f141";
+@fa-var-ellipsis-v: "\f142";
+@fa-var-empire: "\f1d1";
+@fa-var-envelope: "\f0e0";
+@fa-var-envelope-o: "\f003";
+@fa-var-envelope-open: "\f2b6";
+@fa-var-envelope-open-o: "\f2b7";
+@fa-var-envelope-square: "\f199";
+@fa-var-envira: "\f299";
+@fa-var-eraser: "\f12d";
+@fa-var-etsy: "\f2d7";
+@fa-var-eur: "\f153";
+@fa-var-euro: "\f153";
+@fa-var-exchange: "\f0ec";
+@fa-var-exclamation: "\f12a";
+@fa-var-exclamation-circle: "\f06a";
+@fa-var-exclamation-triangle: "\f071";
+@fa-var-expand: "\f065";
+@fa-var-expeditedssl: "\f23e";
+@fa-var-external-link: "\f08e";
+@fa-var-external-link-square: "\f14c";
+@fa-var-eye: "\f06e";
+@fa-var-eye-slash: "\f070";
+@fa-var-eyedropper: "\f1fb";
+@fa-var-fa: "\f2b4";
+@fa-var-facebook: "\f09a";
+@fa-var-facebook-f: "\f09a";
+@fa-var-facebook-official: "\f230";
+@fa-var-facebook-square: "\f082";
+@fa-var-fast-backward: "\f049";
+@fa-var-fast-forward: "\f050";
+@fa-var-fax: "\f1ac";
+@fa-var-feed: "\f09e";
+@fa-var-female: "\f182";
+@fa-var-fighter-jet: "\f0fb";
+@fa-var-file: "\f15b";
+@fa-var-file-archive-o: "\f1c6";
+@fa-var-file-audio-o: "\f1c7";
+@fa-var-file-code-o: "\f1c9";
+@fa-var-file-excel-o: "\f1c3";
+@fa-var-file-image-o: "\f1c5";
+@fa-var-file-movie-o: "\f1c8";
+@fa-var-file-o: "\f016";
+@fa-var-file-pdf-o: "\f1c1";
+@fa-var-file-photo-o: "\f1c5";
+@fa-var-file-picture-o: "\f1c5";
+@fa-var-file-powerpoint-o: "\f1c4";
+@fa-var-file-sound-o: "\f1c7";
+@fa-var-file-text: "\f15c";
+@fa-var-file-text-o: "\f0f6";
+@fa-var-file-video-o: "\f1c8";
+@fa-var-file-word-o: "\f1c2";
+@fa-var-file-zip-o: "\f1c6";
+@fa-var-files-o: "\f0c5";
+@fa-var-film: "\f008";
+@fa-var-filter: "\f0b0";
+@fa-var-fire: "\f06d";
+@fa-var-fire-extinguisher: "\f134";
+@fa-var-firefox: "\f269";
+@fa-var-first-order: "\f2b0";
+@fa-var-flag: "\f024";
+@fa-var-flag-checkered: "\f11e";
+@fa-var-flag-o: "\f11d";
+@fa-var-flash: "\f0e7";
+@fa-var-flask: "\f0c3";
+@fa-var-flickr: "\f16e";
+@fa-var-floppy-o: "\f0c7";
+@fa-var-folder: "\f07b";
+@fa-var-folder-o: "\f114";
+@fa-var-folder-open: "\f07c";
+@fa-var-folder-open-o: "\f115";
+@fa-var-font: "\f031";
+@fa-var-font-awesome: "\f2b4";
+@fa-var-fonticons: "\f280";
+@fa-var-fort-awesome: "\f286";
+@fa-var-forumbee: "\f211";
+@fa-var-forward: "\f04e";
+@fa-var-foursquare: "\f180";
+@fa-var-free-code-camp: "\f2c5";
+@fa-var-frown-o: "\f119";
+@fa-var-futbol-o: "\f1e3";
+@fa-var-gamepad: "\f11b";
+@fa-var-gavel: "\f0e3";
+@fa-var-gbp: "\f154";
+@fa-var-ge: "\f1d1";
+@fa-var-gear: "\f013";
+@fa-var-gears: "\f085";
+@fa-var-genderless: "\f22d";
+@fa-var-get-pocket: "\f265";
+@fa-var-gg: "\f260";
+@fa-var-gg-circle: "\f261";
+@fa-var-gift: "\f06b";
+@fa-var-git: "\f1d3";
+@fa-var-git-square: "\f1d2";
+@fa-var-github: "\f09b";
+@fa-var-github-alt: "\f113";
+@fa-var-github-square: "\f092";
+@fa-var-gitlab: "\f296";
+@fa-var-gittip: "\f184";
+@fa-var-glass: "\f000";
+@fa-var-glide: "\f2a5";
+@fa-var-glide-g: "\f2a6";
+@fa-var-globe: "\f0ac";
+@fa-var-google: "\f1a0";
+@fa-var-google-plus: "\f0d5";
+@fa-var-google-plus-circle: "\f2b3";
+@fa-var-google-plus-official: "\f2b3";
+@fa-var-google-plus-square: "\f0d4";
+@fa-var-google-wallet: "\f1ee";
+@fa-var-graduation-cap: "\f19d";
+@fa-var-gratipay: "\f184";
+@fa-var-grav: "\f2d6";
+@fa-var-group: "\f0c0";
+@fa-var-h-square: "\f0fd";
+@fa-var-hacker-news: "\f1d4";
+@fa-var-hand-grab-o: "\f255";
+@fa-var-hand-lizard-o: "\f258";
+@fa-var-hand-o-down: "\f0a7";
+@fa-var-hand-o-left: "\f0a5";
+@fa-var-hand-o-right: "\f0a4";
+@fa-var-hand-o-up: "\f0a6";
+@fa-var-hand-paper-o: "\f256";
+@fa-var-hand-peace-o: "\f25b";
+@fa-var-hand-pointer-o: "\f25a";
+@fa-var-hand-rock-o: "\f255";
+@fa-var-hand-scissors-o: "\f257";
+@fa-var-hand-spock-o: "\f259";
+@fa-var-hand-stop-o: "\f256";
+@fa-var-handshake-o: "\f2b5";
+@fa-var-hard-of-hearing: "\f2a4";
+@fa-var-hashtag: "\f292";
+@fa-var-hdd-o: "\f0a0";
+@fa-var-header: "\f1dc";
+@fa-var-headphones: "\f025";
+@fa-var-heart: "\f004";
+@fa-var-heart-o: "\f08a";
+@fa-var-heartbeat: "\f21e";
+@fa-var-history: "\f1da";
+@fa-var-home: "\f015";
+@fa-var-hospital-o: "\f0f8";
+@fa-var-hotel: "\f236";
+@fa-var-hourglass: "\f254";
+@fa-var-hourglass-1: "\f251";
+@fa-var-hourglass-2: "\f252";
+@fa-var-hourglass-3: "\f253";
+@fa-var-hourglass-end: "\f253";
+@fa-var-hourglass-half: "\f252";
+@fa-var-hourglass-o: "\f250";
+@fa-var-hourglass-start: "\f251";
+@fa-var-houzz: "\f27c";
+@fa-var-html5: "\f13b";
+@fa-var-i-cursor: "\f246";
+@fa-var-id-badge: "\f2c1";
+@fa-var-id-card: "\f2c2";
+@fa-var-id-card-o: "\f2c3";
+@fa-var-ils: "\f20b";
+@fa-var-image: "\f03e";
+@fa-var-imdb: "\f2d8";
+@fa-var-inbox: "\f01c";
+@fa-var-indent: "\f03c";
+@fa-var-industry: "\f275";
+@fa-var-info: "\f129";
+@fa-var-info-circle: "\f05a";
+@fa-var-inr: "\f156";
+@fa-var-instagram: "\f16d";
+@fa-var-institution: "\f19c";
+@fa-var-internet-explorer: "\f26b";
+@fa-var-intersex: "\f224";
+@fa-var-ioxhost: "\f208";
+@fa-var-italic: "\f033";
+@fa-var-joomla: "\f1aa";
+@fa-var-jpy: "\f157";
+@fa-var-jsfiddle: "\f1cc";
+@fa-var-key: "\f084";
+@fa-var-keyboard-o: "\f11c";
+@fa-var-krw: "\f159";
+@fa-var-language: "\f1ab";
+@fa-var-laptop: "\f109";
+@fa-var-lastfm: "\f202";
+@fa-var-lastfm-square: "\f203";
+@fa-var-leaf: "\f06c";
+@fa-var-leanpub: "\f212";
+@fa-var-legal: "\f0e3";
+@fa-var-lemon-o: "\f094";
+@fa-var-level-down: "\f149";
+@fa-var-level-up: "\f148";
+@fa-var-life-bouy: "\f1cd";
+@fa-var-life-buoy: "\f1cd";
+@fa-var-life-ring: "\f1cd";
+@fa-var-life-saver: "\f1cd";
+@fa-var-lightbulb-o: "\f0eb";
+@fa-var-line-chart: "\f201";
+@fa-var-link: "\f0c1";
+@fa-var-linkedin: "\f0e1";
+@fa-var-linkedin-square: "\f08c";
+@fa-var-linode: "\f2b8";
+@fa-var-linux: "\f17c";
+@fa-var-list: "\f03a";
+@fa-var-list-alt: "\f022";
+@fa-var-list-ol: "\f0cb";
+@fa-var-list-ul: "\f0ca";
+@fa-var-location-arrow: "\f124";
+@fa-var-lock: "\f023";
+@fa-var-long-arrow-down: "\f175";
+@fa-var-long-arrow-left: "\f177";
+@fa-var-long-arrow-right: "\f178";
+@fa-var-long-arrow-up: "\f176";
+@fa-var-low-vision: "\f2a8";
+@fa-var-magic: "\f0d0";
+@fa-var-magnet: "\f076";
+@fa-var-mail-forward: "\f064";
+@fa-var-mail-reply: "\f112";
+@fa-var-mail-reply-all: "\f122";
+@fa-var-male: "\f183";
+@fa-var-map: "\f279";
+@fa-var-map-marker: "\f041";
+@fa-var-map-o: "\f278";
+@fa-var-map-pin: "\f276";
+@fa-var-map-signs: "\f277";
+@fa-var-mars: "\f222";
+@fa-var-mars-double: "\f227";
+@fa-var-mars-stroke: "\f229";
+@fa-var-mars-stroke-h: "\f22b";
+@fa-var-mars-stroke-v: "\f22a";
+@fa-var-maxcdn: "\f136";
+@fa-var-meanpath: "\f20c";
+@fa-var-medium: "\f23a";
+@fa-var-medkit: "\f0fa";
+@fa-var-meetup: "\f2e0";
+@fa-var-meh-o: "\f11a";
+@fa-var-mercury: "\f223";
+@fa-var-microchip: "\f2db";
+@fa-var-microphone: "\f130";
+@fa-var-microphone-slash: "\f131";
+@fa-var-minus: "\f068";
+@fa-var-minus-circle: "\f056";
+@fa-var-minus-square: "\f146";
+@fa-var-minus-square-o: "\f147";
+@fa-var-mixcloud: "\f289";
+@fa-var-mobile: "\f10b";
+@fa-var-mobile-phone: "\f10b";
+@fa-var-modx: "\f285";
+@fa-var-money: "\f0d6";
+@fa-var-moon-o: "\f186";
+@fa-var-mortar-board: "\f19d";
+@fa-var-motorcycle: "\f21c";
+@fa-var-mouse-pointer: "\f245";
+@fa-var-music: "\f001";
+@fa-var-navicon: "\f0c9";
+@fa-var-neuter: "\f22c";
+@fa-var-newspaper-o: "\f1ea";
+@fa-var-object-group: "\f247";
+@fa-var-object-ungroup: "\f248";
+@fa-var-odnoklassniki: "\f263";
+@fa-var-odnoklassniki-square: "\f264";
+@fa-var-opencart: "\f23d";
+@fa-var-openid: "\f19b";
+@fa-var-opera: "\f26a";
+@fa-var-optin-monster: "\f23c";
+@fa-var-outdent: "\f03b";
+@fa-var-pagelines: "\f18c";
+@fa-var-paint-brush: "\f1fc";
+@fa-var-paper-plane: "\f1d8";
+@fa-var-paper-plane-o: "\f1d9";
+@fa-var-paperclip: "\f0c6";
+@fa-var-paragraph: "\f1dd";
+@fa-var-paste: "\f0ea";
+@fa-var-pause: "\f04c";
+@fa-var-pause-circle: "\f28b";
+@fa-var-pause-circle-o: "\f28c";
+@fa-var-paw: "\f1b0";
+@fa-var-paypal: "\f1ed";
+@fa-var-pencil: "\f040";
+@fa-var-pencil-square: "\f14b";
+@fa-var-pencil-square-o: "\f044";
+@fa-var-percent: "\f295";
+@fa-var-phone: "\f095";
+@fa-var-phone-square: "\f098";
+@fa-var-photo: "\f03e";
+@fa-var-picture-o: "\f03e";
+@fa-var-pie-chart: "\f200";
+@fa-var-pied-piper: "\f2ae";
+@fa-var-pied-piper-alt: "\f1a8";
+@fa-var-pied-piper-pp: "\f1a7";
+@fa-var-pinterest: "\f0d2";
+@fa-var-pinterest-p: "\f231";
+@fa-var-pinterest-square: "\f0d3";
+@fa-var-plane: "\f072";
+@fa-var-play: "\f04b";
+@fa-var-play-circle: "\f144";
+@fa-var-play-circle-o: "\f01d";
+@fa-var-plug: "\f1e6";
+@fa-var-plus: "\f067";
+@fa-var-plus-circle: "\f055";
+@fa-var-plus-square: "\f0fe";
+@fa-var-plus-square-o: "\f196";
+@fa-var-podcast: "\f2ce";
+@fa-var-power-off: "\f011";
+@fa-var-print: "\f02f";
+@fa-var-product-hunt: "\f288";
+@fa-var-puzzle-piece: "\f12e";
+@fa-var-qq: "\f1d6";
+@fa-var-qrcode: "\f029";
+@fa-var-question: "\f128";
+@fa-var-question-circle: "\f059";
+@fa-var-question-circle-o: "\f29c";
+@fa-var-quora: "\f2c4";
+@fa-var-quote-left: "\f10d";
+@fa-var-quote-right: "\f10e";
+@fa-var-ra: "\f1d0";
+@fa-var-random: "\f074";
+@fa-var-ravelry: "\f2d9";
+@fa-var-rebel: "\f1d0";
+@fa-var-recycle: "\f1b8";
+@fa-var-reddit: "\f1a1";
+@fa-var-reddit-alien: "\f281";
+@fa-var-reddit-square: "\f1a2";
+@fa-var-refresh: "\f021";
+@fa-var-registered: "\f25d";
+@fa-var-remove: "\f00d";
+@fa-var-renren: "\f18b";
+@fa-var-reorder: "\f0c9";
+@fa-var-repeat: "\f01e";
+@fa-var-reply: "\f112";
+@fa-var-reply-all: "\f122";
+@fa-var-resistance: "\f1d0";
+@fa-var-retweet: "\f079";
+@fa-var-rmb: "\f157";
+@fa-var-road: "\f018";
+@fa-var-rocket: "\f135";
+@fa-var-rotate-left: "\f0e2";
+@fa-var-rotate-right: "\f01e";
+@fa-var-rouble: "\f158";
+@fa-var-rss: "\f09e";
+@fa-var-rss-square: "\f143";
+@fa-var-rub: "\f158";
+@fa-var-ruble: "\f158";
+@fa-var-rupee: "\f156";
+@fa-var-s15: "\f2cd";
+@fa-var-safari: "\f267";
+@fa-var-save: "\f0c7";
+@fa-var-scissors: "\f0c4";
+@fa-var-scribd: "\f28a";
+@fa-var-search: "\f002";
+@fa-var-search-minus: "\f010";
+@fa-var-search-plus: "\f00e";
+@fa-var-sellsy: "\f213";
+@fa-var-send: "\f1d8";
+@fa-var-send-o: "\f1d9";
+@fa-var-server: "\f233";
+@fa-var-share: "\f064";
+@fa-var-share-alt: "\f1e0";
+@fa-var-share-alt-square: "\f1e1";
+@fa-var-share-square: "\f14d";
+@fa-var-share-square-o: "\f045";
+@fa-var-shekel: "\f20b";
+@fa-var-sheqel: "\f20b";
+@fa-var-shield: "\f132";
+@fa-var-ship: "\f21a";
+@fa-var-shirtsinbulk: "\f214";
+@fa-var-shopping-bag: "\f290";
+@fa-var-shopping-basket: "\f291";
+@fa-var-shopping-cart: "\f07a";
+@fa-var-shower: "\f2cc";
+@fa-var-sign-in: "\f090";
+@fa-var-sign-language: "\f2a7";
+@fa-var-sign-out: "\f08b";
+@fa-var-signal: "\f012";
+@fa-var-signing: "\f2a7";
+@fa-var-simplybuilt: "\f215";
+@fa-var-sitemap: "\f0e8";
+@fa-var-skyatlas: "\f216";
+@fa-var-skype: "\f17e";
+@fa-var-slack: "\f198";
+@fa-var-sliders: "\f1de";
+@fa-var-slideshare: "\f1e7";
+@fa-var-smile-o: "\f118";
+@fa-var-snapchat: "\f2ab";
+@fa-var-snapchat-ghost: "\f2ac";
+@fa-var-snapchat-square: "\f2ad";
+@fa-var-snowflake-o: "\f2dc";
+@fa-var-soccer-ball-o: "\f1e3";
+@fa-var-sort: "\f0dc";
+@fa-var-sort-alpha-asc: "\f15d";
+@fa-var-sort-alpha-desc: "\f15e";
+@fa-var-sort-amount-asc: "\f160";
+@fa-var-sort-amount-desc: "\f161";
+@fa-var-sort-asc: "\f0de";
+@fa-var-sort-desc: "\f0dd";
+@fa-var-sort-down: "\f0dd";
+@fa-var-sort-numeric-asc: "\f162";
+@fa-var-sort-numeric-desc: "\f163";
+@fa-var-sort-up: "\f0de";
+@fa-var-soundcloud: "\f1be";
+@fa-var-space-shuttle: "\f197";
+@fa-var-spinner: "\f110";
+@fa-var-spoon: "\f1b1";
+@fa-var-spotify: "\f1bc";
+@fa-var-square: "\f0c8";
+@fa-var-square-o: "\f096";
+@fa-var-stack-exchange: "\f18d";
+@fa-var-stack-overflow: "\f16c";
+@fa-var-star: "\f005";
+@fa-var-star-half: "\f089";
+@fa-var-star-half-empty: "\f123";
+@fa-var-star-half-full: "\f123";
+@fa-var-star-half-o: "\f123";
+@fa-var-star-o: "\f006";
+@fa-var-steam: "\f1b6";
+@fa-var-steam-square: "\f1b7";
+@fa-var-step-backward: "\f048";
+@fa-var-step-forward: "\f051";
+@fa-var-stethoscope: "\f0f1";
+@fa-var-sticky-note: "\f249";
+@fa-var-sticky-note-o: "\f24a";
+@fa-var-stop: "\f04d";
+@fa-var-stop-circle: "\f28d";
+@fa-var-stop-circle-o: "\f28e";
+@fa-var-street-view: "\f21d";
+@fa-var-strikethrough: "\f0cc";
+@fa-var-stumbleupon: "\f1a4";
+@fa-var-stumbleupon-circle: "\f1a3";
+@fa-var-subscript: "\f12c";
+@fa-var-subway: "\f239";
+@fa-var-suitcase: "\f0f2";
+@fa-var-sun-o: "\f185";
+@fa-var-superpowers: "\f2dd";
+@fa-var-superscript: "\f12b";
+@fa-var-support: "\f1cd";
+@fa-var-table: "\f0ce";
+@fa-var-tablet: "\f10a";
+@fa-var-tachometer: "\f0e4";
+@fa-var-tag: "\f02b";
+@fa-var-tags: "\f02c";
+@fa-var-tasks: "\f0ae";
+@fa-var-taxi: "\f1ba";
+@fa-var-telegram: "\f2c6";
+@fa-var-television: "\f26c";
+@fa-var-tencent-weibo: "\f1d5";
+@fa-var-terminal: "\f120";
+@fa-var-text-height: "\f034";
+@fa-var-text-width: "\f035";
+@fa-var-th: "\f00a";
+@fa-var-th-large: "\f009";
+@fa-var-th-list: "\f00b";
+@fa-var-themeisle: "\f2b2";
+@fa-var-thermometer: "\f2c7";
+@fa-var-thermometer-0: "\f2cb";
+@fa-var-thermometer-1: "\f2ca";
+@fa-var-thermometer-2: "\f2c9";
+@fa-var-thermometer-3: "\f2c8";
+@fa-var-thermometer-4: "\f2c7";
+@fa-var-thermometer-empty: "\f2cb";
+@fa-var-thermometer-full: "\f2c7";
+@fa-var-thermometer-half: "\f2c9";
+@fa-var-thermometer-quarter: "\f2ca";
+@fa-var-thermometer-three-quarters: "\f2c8";
+@fa-var-thumb-tack: "\f08d";
+@fa-var-thumbs-down: "\f165";
+@fa-var-thumbs-o-down: "\f088";
+@fa-var-thumbs-o-up: "\f087";
+@fa-var-thumbs-up: "\f164";
+@fa-var-ticket: "\f145";
+@fa-var-times: "\f00d";
+@fa-var-times-circle: "\f057";
+@fa-var-times-circle-o: "\f05c";
+@fa-var-times-rectangle: "\f2d3";
+@fa-var-times-rectangle-o: "\f2d4";
+@fa-var-tint: "\f043";
+@fa-var-toggle-down: "\f150";
+@fa-var-toggle-left: "\f191";
+@fa-var-toggle-off: "\f204";
+@fa-var-toggle-on: "\f205";
+@fa-var-toggle-right: "\f152";
+@fa-var-toggle-up: "\f151";
+@fa-var-trademark: "\f25c";
+@fa-var-train: "\f238";
+@fa-var-transgender: "\f224";
+@fa-var-transgender-alt: "\f225";
+@fa-var-trash: "\f1f8";
+@fa-var-trash-o: "\f014";
+@fa-var-tree: "\f1bb";
+@fa-var-trello: "\f181";
+@fa-var-tripadvisor: "\f262";
+@fa-var-trophy: "\f091";
+@fa-var-truck: "\f0d1";
+@fa-var-try: "\f195";
+@fa-var-tty: "\f1e4";
+@fa-var-tumblr: "\f173";
+@fa-var-tumblr-square: "\f174";
+@fa-var-turkish-lira: "\f195";
+@fa-var-tv: "\f26c";
+@fa-var-twitch: "\f1e8";
+@fa-var-twitter: "\f099";
+@fa-var-twitter-square: "\f081";
+@fa-var-umbrella: "\f0e9";
+@fa-var-underline: "\f0cd";
+@fa-var-undo: "\f0e2";
+@fa-var-universal-access: "\f29a";
+@fa-var-university: "\f19c";
+@fa-var-unlink: "\f127";
+@fa-var-unlock: "\f09c";
+@fa-var-unlock-alt: "\f13e";
+@fa-var-unsorted: "\f0dc";
+@fa-var-upload: "\f093";
+@fa-var-usb: "\f287";
+@fa-var-usd: "\f155";
+@fa-var-user: "\f007";
+@fa-var-user-circle: "\f2bd";
+@fa-var-user-circle-o: "\f2be";
+@fa-var-user-md: "\f0f0";
+@fa-var-user-o: "\f2c0";
+@fa-var-user-plus: "\f234";
+@fa-var-user-secret: "\f21b";
+@fa-var-user-times: "\f235";
+@fa-var-users: "\f0c0";
+@fa-var-vcard: "\f2bb";
+@fa-var-vcard-o: "\f2bc";
+@fa-var-venus: "\f221";
+@fa-var-venus-double: "\f226";
+@fa-var-venus-mars: "\f228";
+@fa-var-viacoin: "\f237";
+@fa-var-viadeo: "\f2a9";
+@fa-var-viadeo-square: "\f2aa";
+@fa-var-video-camera: "\f03d";
+@fa-var-vimeo: "\f27d";
+@fa-var-vimeo-square: "\f194";
+@fa-var-vine: "\f1ca";
+@fa-var-vk: "\f189";
+@fa-var-volume-control-phone: "\f2a0";
+@fa-var-volume-down: "\f027";
+@fa-var-volume-off: "\f026";
+@fa-var-volume-up: "\f028";
+@fa-var-warning: "\f071";
+@fa-var-wechat: "\f1d7";
+@fa-var-weibo: "\f18a";
+@fa-var-weixin: "\f1d7";
+@fa-var-whatsapp: "\f232";
+@fa-var-wheelchair: "\f193";
+@fa-var-wheelchair-alt: "\f29b";
+@fa-var-wifi: "\f1eb";
+@fa-var-wikipedia-w: "\f266";
+@fa-var-window-close: "\f2d3";
+@fa-var-window-close-o: "\f2d4";
+@fa-var-window-maximize: "\f2d0";
+@fa-var-window-minimize: "\f2d1";
+@fa-var-window-restore: "\f2d2";
+@fa-var-windows: "\f17a";
+@fa-var-won: "\f159";
+@fa-var-wordpress: "\f19a";
+@fa-var-wpbeginner: "\f297";
+@fa-var-wpexplorer: "\f2de";
+@fa-var-wpforms: "\f298";
+@fa-var-wrench: "\f0ad";
+@fa-var-xing: "\f168";
+@fa-var-xing-square: "\f169";
+@fa-var-y-combinator: "\f23b";
+@fa-var-y-combinator-square: "\f1d4";
+@fa-var-yahoo: "\f19e";
+@fa-var-yc: "\f23b";
+@fa-var-yc-square: "\f1d4";
+@fa-var-yelp: "\f1e9";
+@fa-var-yen: "\f157";
+@fa-var-yoast: "\f2b1";
+@fa-var-youtube: "\f167";
+@fa-var-youtube-play: "\f16a";
+@fa-var-youtube-square: "\f166";
+
diff --git a/htdocs/includes/fontawesome/package.json b/htdocs/includes/fontawesome/package.json
new file mode 100644
index 00000000000..86f58db06bb
--- /dev/null
+++ b/htdocs/includes/fontawesome/package.json
@@ -0,0 +1,44 @@
+{
+  "name": "font-awesome",
+  "description": "The iconic font and CSS framework",
+  "version": "4.7.0",
+  "style": "css/font-awesome.css",
+  "keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"],
+  "homepage": "http://fontawesome.io/",
+  "bugs": {
+    "url" : "http://github.com/FortAwesome/Font-Awesome/issues"
+  },
+  "author": {
+    "name": "Dave Gandy",
+    "email": "dave@fontawesome.io",
+    "web": "http://twitter.com/davegandy"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/FortAwesome/Font-Awesome.git"
+  },
+  "contributors": [
+    {
+      "name": "Brian Talbot",
+      "web": "http://twitter.com/talbs"
+    },
+    {
+      "name": "Travis Chase",
+      "web": "http://twitter.com/supercodepoet"
+    },
+    {
+      "name": "Rob Madole",
+      "web": "http://twitter.com/robmadole"
+    },
+    {
+      "name": "Geremia Taglialatela",
+      "web": "http://twitter.com/gtagliala"
+    }
+  ],
+  "license": "(OFL-1.1 AND MIT)",
+  "dependencies": {
+  },
+  "engines" : {
+    "node" : ">=0.10.3"
+  }
+}
diff --git a/htdocs/includes/fontawesome/scss/_animated.scss b/htdocs/includes/fontawesome/scss/_animated.scss
new file mode 100644
index 00000000000..8a020dbfff7
--- /dev/null
+++ b/htdocs/includes/fontawesome/scss/_animated.scss
@@ -0,0 +1,34 @@
+// Spinning Icons
+// --------------------------
+
+.#{$fa-css-prefix}-spin {
+  -webkit-animation: fa-spin 2s infinite linear;
+          animation: fa-spin 2s infinite linear;
+}
+
+.#{$fa-css-prefix}-pulse {
+  -webkit-animation: fa-spin 1s infinite steps(8);
+          animation: fa-spin 1s infinite steps(8);
+}
+
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+            transform: rotate(359deg);
+  }
+}
+
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+            transform: rotate(359deg);
+  }
+}
diff --git a/htdocs/includes/fontawesome/scss/_bordered-pulled.scss b/htdocs/includes/fontawesome/scss/_bordered-pulled.scss
new file mode 100644
index 00000000000..d4b85a02f24
--- /dev/null
+++ b/htdocs/includes/fontawesome/scss/_bordered-pulled.scss
@@ -0,0 +1,25 @@
+// Bordered & Pulled
+// -------------------------
+
+.#{$fa-css-prefix}-border {
+  padding: .2em .25em .15em;
+  border: solid .08em $fa-border-color;
+  border-radius: .1em;
+}
+
+.#{$fa-css-prefix}-pull-left { float: left; }
+.#{$fa-css-prefix}-pull-right { float: right; }
+
+.#{$fa-css-prefix} {
+  &.#{$fa-css-prefix}-pull-left { margin-right: .3em; }
+  &.#{$fa-css-prefix}-pull-right { margin-left: .3em; }
+}
+
+/* Deprecated as of 4.4.0 */
+.pull-right { float: right; }
+.pull-left { float: left; }
+
+.#{$fa-css-prefix} {
+  &.pull-left { margin-right: .3em; }
+  &.pull-right { margin-left: .3em; }
+}
diff --git a/htdocs/includes/fontawesome/scss/_core.scss b/htdocs/includes/fontawesome/scss/_core.scss
new file mode 100644
index 00000000000..7425ef85fc8
--- /dev/null
+++ b/htdocs/includes/fontawesome/scss/_core.scss
@@ -0,0 +1,12 @@
+// Base Class Definition
+// -------------------------
+
+.#{$fa-css-prefix} {
+  display: inline-block;
+  font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+}
diff --git a/htdocs/includes/fontawesome/scss/_fixed-width.scss b/htdocs/includes/fontawesome/scss/_fixed-width.scss
new file mode 100644
index 00000000000..b221c98133a
--- /dev/null
+++ b/htdocs/includes/fontawesome/scss/_fixed-width.scss
@@ -0,0 +1,6 @@
+// Fixed Width Icons
+// -------------------------
+.#{$fa-css-prefix}-fw {
+  width: (18em / 14);
+  text-align: center;
+}
diff --git a/htdocs/includes/fontawesome/scss/_icons.scss b/htdocs/includes/fontawesome/scss/_icons.scss
new file mode 100644
index 00000000000..e63e702c4d9
--- /dev/null
+++ b/htdocs/includes/fontawesome/scss/_icons.scss
@@ -0,0 +1,789 @@
+/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+   readers do not read off random characters that represent icons */
+
+.#{$fa-css-prefix}-glass:before { content: $fa-var-glass; }
+.#{$fa-css-prefix}-music:before { content: $fa-var-music; }
+.#{$fa-css-prefix}-search:before { content: $fa-var-search; }
+.#{$fa-css-prefix}-envelope-o:before { content: $fa-var-envelope-o; }
+.#{$fa-css-prefix}-heart:before { content: $fa-var-heart; }
+.#{$fa-css-prefix}-star:before { content: $fa-var-star; }
+.#{$fa-css-prefix}-star-o:before { content: $fa-var-star-o; }
+.#{$fa-css-prefix}-user:before { content: $fa-var-user; }
+.#{$fa-css-prefix}-film:before { content: $fa-var-film; }
+.#{$fa-css-prefix}-th-large:before { content: $fa-var-th-large; }
+.#{$fa-css-prefix}-th:before { content: $fa-var-th; }
+.#{$fa-css-prefix}-th-list:before { content: $fa-var-th-list; }
+.#{$fa-css-prefix}-check:before { content: $fa-var-check; }
+.#{$fa-css-prefix}-remove:before,
+.#{$fa-css-prefix}-close:before,
+.#{$fa-css-prefix}-times:before { content: $fa-var-times; }
+.#{$fa-css-prefix}-search-plus:before { content: $fa-var-search-plus; }
+.#{$fa-css-prefix}-search-minus:before { content: $fa-var-search-minus; }
+.#{$fa-css-prefix}-power-off:before { content: $fa-var-power-off; }
+.#{$fa-css-prefix}-signal:before { content: $fa-var-signal; }
+.#{$fa-css-prefix}-gear:before,
+.#{$fa-css-prefix}-cog:before { content: $fa-var-cog; }
+.#{$fa-css-prefix}-trash-o:before { content: $fa-var-trash-o; }
+.#{$fa-css-prefix}-home:before { content: $fa-var-home; }
+.#{$fa-css-prefix}-file-o:before { content: $fa-var-file-o; }
+.#{$fa-css-prefix}-clock-o:before { content: $fa-var-clock-o; }
+.#{$fa-css-prefix}-road:before { content: $fa-var-road; }
+.#{$fa-css-prefix}-download:before { content: $fa-var-download; }
+.#{$fa-css-prefix}-arrow-circle-o-down:before { content: $fa-var-arrow-circle-o-down; }
+.#{$fa-css-prefix}-arrow-circle-o-up:before { content: $fa-var-arrow-circle-o-up; }
+.#{$fa-css-prefix}-inbox:before { content: $fa-var-inbox; }
+.#{$fa-css-prefix}-play-circle-o:before { content: $fa-var-play-circle-o; }
+.#{$fa-css-prefix}-rotate-right:before,
+.#{$fa-css-prefix}-repeat:before { content: $fa-var-repeat; }
+.#{$fa-css-prefix}-refresh:before { content: $fa-var-refresh; }
+.#{$fa-css-prefix}-list-alt:before { content: $fa-var-list-alt; }
+.#{$fa-css-prefix}-lock:before { content: $fa-var-lock; }
+.#{$fa-css-prefix}-flag:before { content: $fa-var-flag; }
+.#{$fa-css-prefix}-headphones:before { content: $fa-var-headphones; }
+.#{$fa-css-prefix}-volume-off:before { content: $fa-var-volume-off; }
+.#{$fa-css-prefix}-volume-down:before { content: $fa-var-volume-down; }
+.#{$fa-css-prefix}-volume-up:before { content: $fa-var-volume-up; }
+.#{$fa-css-prefix}-qrcode:before { content: $fa-var-qrcode; }
+.#{$fa-css-prefix}-barcode:before { content: $fa-var-barcode; }
+.#{$fa-css-prefix}-tag:before { content: $fa-var-tag; }
+.#{$fa-css-prefix}-tags:before { content: $fa-var-tags; }
+.#{$fa-css-prefix}-book:before { content: $fa-var-book; }
+.#{$fa-css-prefix}-bookmark:before { content: $fa-var-bookmark; }
+.#{$fa-css-prefix}-print:before { content: $fa-var-print; }
+.#{$fa-css-prefix}-camera:before { content: $fa-var-camera; }
+.#{$fa-css-prefix}-font:before { content: $fa-var-font; }
+.#{$fa-css-prefix}-bold:before { content: $fa-var-bold; }
+.#{$fa-css-prefix}-italic:before { content: $fa-var-italic; }
+.#{$fa-css-prefix}-text-height:before { content: $fa-var-text-height; }
+.#{$fa-css-prefix}-text-width:before { content: $fa-var-text-width; }
+.#{$fa-css-prefix}-align-left:before { content: $fa-var-align-left; }
+.#{$fa-css-prefix}-align-center:before { content: $fa-var-align-center; }
+.#{$fa-css-prefix}-align-right:before { content: $fa-var-align-right; }
+.#{$fa-css-prefix}-align-justify:before { content: $fa-var-align-justify; }
+.#{$fa-css-prefix}-list:before { content: $fa-var-list; }
+.#{$fa-css-prefix}-dedent:before,
+.#{$fa-css-prefix}-outdent:before { content: $fa-var-outdent; }
+.#{$fa-css-prefix}-indent:before { content: $fa-var-indent; }
+.#{$fa-css-prefix}-video-camera:before { content: $fa-var-video-camera; }
+.#{$fa-css-prefix}-photo:before,
+.#{$fa-css-prefix}-image:before,
+.#{$fa-css-prefix}-picture-o:before { content: $fa-var-picture-o; }
+.#{$fa-css-prefix}-pencil:before { content: $fa-var-pencil; }
+.#{$fa-css-prefix}-map-marker:before { content: $fa-var-map-marker; }
+.#{$fa-css-prefix}-adjust:before { content: $fa-var-adjust; }
+.#{$fa-css-prefix}-tint:before { content: $fa-var-tint; }
+.#{$fa-css-prefix}-edit:before,
+.#{$fa-css-prefix}-pencil-square-o:before { content: $fa-var-pencil-square-o; }
+.#{$fa-css-prefix}-share-square-o:before { content: $fa-var-share-square-o; }
+.#{$fa-css-prefix}-check-square-o:before { content: $fa-var-check-square-o; }
+.#{$fa-css-prefix}-arrows:before { content: $fa-var-arrows; }
+.#{$fa-css-prefix}-step-backward:before { content: $fa-var-step-backward; }
+.#{$fa-css-prefix}-fast-backward:before { content: $fa-var-fast-backward; }
+.#{$fa-css-prefix}-backward:before { content: $fa-var-backward; }
+.#{$fa-css-prefix}-play:before { content: $fa-var-play; }
+.#{$fa-css-prefix}-pause:before { content: $fa-var-pause; }
+.#{$fa-css-prefix}-stop:before { content: $fa-var-stop; }
+.#{$fa-css-prefix}-forward:before { content: $fa-var-forward; }
+.#{$fa-css-prefix}-fast-forward:before { content: $fa-var-fast-forward; }
+.#{$fa-css-prefix}-step-forward:before { content: $fa-var-step-forward; }
+.#{$fa-css-prefix}-eject:before { content: $fa-var-eject; }
+.#{$fa-css-prefix}-chevron-left:before { content: $fa-var-chevron-left; }
+.#{$fa-css-prefix}-chevron-right:before { content: $fa-var-chevron-right; }
+.#{$fa-css-prefix}-plus-circle:before { content: $fa-var-plus-circle; }
+.#{$fa-css-prefix}-minus-circle:before { content: $fa-var-minus-circle; }
+.#{$fa-css-prefix}-times-circle:before { content: $fa-var-times-circle; }
+.#{$fa-css-prefix}-check-circle:before { content: $fa-var-check-circle; }
+.#{$fa-css-prefix}-question-circle:before { content: $fa-var-question-circle; }
+.#{$fa-css-prefix}-info-circle:before { content: $fa-var-info-circle; }
+.#{$fa-css-prefix}-crosshairs:before { content: $fa-var-crosshairs; }
+.#{$fa-css-prefix}-times-circle-o:before { content: $fa-var-times-circle-o; }
+.#{$fa-css-prefix}-check-circle-o:before { content: $fa-var-check-circle-o; }
+.#{$fa-css-prefix}-ban:before { content: $fa-var-ban; }
+.#{$fa-css-prefix}-arrow-left:before { content: $fa-var-arrow-left; }
+.#{$fa-css-prefix}-arrow-right:before { content: $fa-var-arrow-right; }
+.#{$fa-css-prefix}-arrow-up:before { content: $fa-var-arrow-up; }
+.#{$fa-css-prefix}-arrow-down:before { content: $fa-var-arrow-down; }
+.#{$fa-css-prefix}-mail-forward:before,
+.#{$fa-css-prefix}-share:before { content: $fa-var-share; }
+.#{$fa-css-prefix}-expand:before { content: $fa-var-expand; }
+.#{$fa-css-prefix}-compress:before { content: $fa-var-compress; }
+.#{$fa-css-prefix}-plus:before { content: $fa-var-plus; }
+.#{$fa-css-prefix}-minus:before { content: $fa-var-minus; }
+.#{$fa-css-prefix}-asterisk:before { content: $fa-var-asterisk; }
+.#{$fa-css-prefix}-exclamation-circle:before { content: $fa-var-exclamation-circle; }
+.#{$fa-css-prefix}-gift:before { content: $fa-var-gift; }
+.#{$fa-css-prefix}-leaf:before { content: $fa-var-leaf; }
+.#{$fa-css-prefix}-fire:before { content: $fa-var-fire; }
+.#{$fa-css-prefix}-eye:before { content: $fa-var-eye; }
+.#{$fa-css-prefix}-eye-slash:before { content: $fa-var-eye-slash; }
+.#{$fa-css-prefix}-warning:before,
+.#{$fa-css-prefix}-exclamation-triangle:before { content: $fa-var-exclamation-triangle; }
+.#{$fa-css-prefix}-plane:before { content: $fa-var-plane; }
+.#{$fa-css-prefix}-calendar:before { content: $fa-var-calendar; }
+.#{$fa-css-prefix}-random:before { content: $fa-var-random; }
+.#{$fa-css-prefix}-comment:before { content: $fa-var-comment; }
+.#{$fa-css-prefix}-magnet:before { content: $fa-var-magnet; }
+.#{$fa-css-prefix}-chevron-up:before { content: $fa-var-chevron-up; }
+.#{$fa-css-prefix}-chevron-down:before { content: $fa-var-chevron-down; }
+.#{$fa-css-prefix}-retweet:before { content: $fa-var-retweet; }
+.#{$fa-css-prefix}-shopping-cart:before { content: $fa-var-shopping-cart; }
+.#{$fa-css-prefix}-folder:before { content: $fa-var-folder; }
+.#{$fa-css-prefix}-folder-open:before { content: $fa-var-folder-open; }
+.#{$fa-css-prefix}-arrows-v:before { content: $fa-var-arrows-v; }
+.#{$fa-css-prefix}-arrows-h:before { content: $fa-var-arrows-h; }
+.#{$fa-css-prefix}-bar-chart-o:before,
+.#{$fa-css-prefix}-bar-chart:before { content: $fa-var-bar-chart; }
+.#{$fa-css-prefix}-twitter-square:before { content: $fa-var-twitter-square; }
+.#{$fa-css-prefix}-facebook-square:before { content: $fa-var-facebook-square; }
+.#{$fa-css-prefix}-camera-retro:before { content: $fa-var-camera-retro; }
+.#{$fa-css-prefix}-key:before { content: $fa-var-key; }
+.#{$fa-css-prefix}-gears:before,
+.#{$fa-css-prefix}-cogs:before { content: $fa-var-cogs; }
+.#{$fa-css-prefix}-comments:before { content: $fa-var-comments; }
+.#{$fa-css-prefix}-thumbs-o-up:before { content: $fa-var-thumbs-o-up; }
+.#{$fa-css-prefix}-thumbs-o-down:before { content: $fa-var-thumbs-o-down; }
+.#{$fa-css-prefix}-star-half:before { content: $fa-var-star-half; }
+.#{$fa-css-prefix}-heart-o:before { content: $fa-var-heart-o; }
+.#{$fa-css-prefix}-sign-out:before { content: $fa-var-sign-out; }
+.#{$fa-css-prefix}-linkedin-square:before { content: $fa-var-linkedin-square; }
+.#{$fa-css-prefix}-thumb-tack:before { content: $fa-var-thumb-tack; }
+.#{$fa-css-prefix}-external-link:before { content: $fa-var-external-link; }
+.#{$fa-css-prefix}-sign-in:before { content: $fa-var-sign-in; }
+.#{$fa-css-prefix}-trophy:before { content: $fa-var-trophy; }
+.#{$fa-css-prefix}-github-square:before { content: $fa-var-github-square; }
+.#{$fa-css-prefix}-upload:before { content: $fa-var-upload; }
+.#{$fa-css-prefix}-lemon-o:before { content: $fa-var-lemon-o; }
+.#{$fa-css-prefix}-phone:before { content: $fa-var-phone; }
+.#{$fa-css-prefix}-square-o:before { content: $fa-var-square-o; }
+.#{$fa-css-prefix}-bookmark-o:before { content: $fa-var-bookmark-o; }
+.#{$fa-css-prefix}-phone-square:before { content: $fa-var-phone-square; }
+.#{$fa-css-prefix}-twitter:before { content: $fa-var-twitter; }
+.#{$fa-css-prefix}-facebook-f:before,
+.#{$fa-css-prefix}-facebook:before { content: $fa-var-facebook; }
+.#{$fa-css-prefix}-github:before { content: $fa-var-github; }
+.#{$fa-css-prefix}-unlock:before { content: $fa-var-unlock; }
+.#{$fa-css-prefix}-credit-card:before { content: $fa-var-credit-card; }
+.#{$fa-css-prefix}-feed:before,
+.#{$fa-css-prefix}-rss:before { content: $fa-var-rss; }
+.#{$fa-css-prefix}-hdd-o:before { content: $fa-var-hdd-o; }
+.#{$fa-css-prefix}-bullhorn:before { content: $fa-var-bullhorn; }
+.#{$fa-css-prefix}-bell:before { content: $fa-var-bell; }
+.#{$fa-css-prefix}-certificate:before { content: $fa-var-certificate; }
+.#{$fa-css-prefix}-hand-o-right:before { content: $fa-var-hand-o-right; }
+.#{$fa-css-prefix}-hand-o-left:before { content: $fa-var-hand-o-left; }
+.#{$fa-css-prefix}-hand-o-up:before { content: $fa-var-hand-o-up; }
+.#{$fa-css-prefix}-hand-o-down:before { content: $fa-var-hand-o-down; }
+.#{$fa-css-prefix}-arrow-circle-left:before { content: $fa-var-arrow-circle-left; }
+.#{$fa-css-prefix}-arrow-circle-right:before { content: $fa-var-arrow-circle-right; }
+.#{$fa-css-prefix}-arrow-circle-up:before { content: $fa-var-arrow-circle-up; }
+.#{$fa-css-prefix}-arrow-circle-down:before { content: $fa-var-arrow-circle-down; }
+.#{$fa-css-prefix}-globe:before { content: $fa-var-globe; }
+.#{$fa-css-prefix}-wrench:before { content: $fa-var-wrench; }
+.#{$fa-css-prefix}-tasks:before { content: $fa-var-tasks; }
+.#{$fa-css-prefix}-filter:before { content: $fa-var-filter; }
+.#{$fa-css-prefix}-briefcase:before { content: $fa-var-briefcase; }
+.#{$fa-css-prefix}-arrows-alt:before { content: $fa-var-arrows-alt; }
+.#{$fa-css-prefix}-group:before,
+.#{$fa-css-prefix}-users:before { content: $fa-var-users; }
+.#{$fa-css-prefix}-chain:before,
+.#{$fa-css-prefix}-link:before { content: $fa-var-link; }
+.#{$fa-css-prefix}-cloud:before { content: $fa-var-cloud; }
+.#{$fa-css-prefix}-flask:before { content: $fa-var-flask; }
+.#{$fa-css-prefix}-cut:before,
+.#{$fa-css-prefix}-scissors:before { content: $fa-var-scissors; }
+.#{$fa-css-prefix}-copy:before,
+.#{$fa-css-prefix}-files-o:before { content: $fa-var-files-o; }
+.#{$fa-css-prefix}-paperclip:before { content: $fa-var-paperclip; }
+.#{$fa-css-prefix}-save:before,
+.#{$fa-css-prefix}-floppy-o:before { content: $fa-var-floppy-o; }
+.#{$fa-css-prefix}-square:before { content: $fa-var-square; }
+.#{$fa-css-prefix}-navicon:before,
+.#{$fa-css-prefix}-reorder:before,
+.#{$fa-css-prefix}-bars:before { content: $fa-var-bars; }
+.#{$fa-css-prefix}-list-ul:before { content: $fa-var-list-ul; }
+.#{$fa-css-prefix}-list-ol:before { content: $fa-var-list-ol; }
+.#{$fa-css-prefix}-strikethrough:before { content: $fa-var-strikethrough; }
+.#{$fa-css-prefix}-underline:before { content: $fa-var-underline; }
+.#{$fa-css-prefix}-table:before { content: $fa-var-table; }
+.#{$fa-css-prefix}-magic:before { content: $fa-var-magic; }
+.#{$fa-css-prefix}-truck:before { content: $fa-var-truck; }
+.#{$fa-css-prefix}-pinterest:before { content: $fa-var-pinterest; }
+.#{$fa-css-prefix}-pinterest-square:before { content: $fa-var-pinterest-square; }
+.#{$fa-css-prefix}-google-plus-square:before { content: $fa-var-google-plus-square; }
+.#{$fa-css-prefix}-google-plus:before { content: $fa-var-google-plus; }
+.#{$fa-css-prefix}-money:before { content: $fa-var-money; }
+.#{$fa-css-prefix}-caret-down:before { content: $fa-var-caret-down; }
+.#{$fa-css-prefix}-caret-up:before { content: $fa-var-caret-up; }
+.#{$fa-css-prefix}-caret-left:before { content: $fa-var-caret-left; }
+.#{$fa-css-prefix}-caret-right:before { content: $fa-var-caret-right; }
+.#{$fa-css-prefix}-columns:before { content: $fa-var-columns; }
+.#{$fa-css-prefix}-unsorted:before,
+.#{$fa-css-prefix}-sort:before { content: $fa-var-sort; }
+.#{$fa-css-prefix}-sort-down:before,
+.#{$fa-css-prefix}-sort-desc:before { content: $fa-var-sort-desc; }
+.#{$fa-css-prefix}-sort-up:before,
+.#{$fa-css-prefix}-sort-asc:before { content: $fa-var-sort-asc; }
+.#{$fa-css-prefix}-envelope:before { content: $fa-var-envelope; }
+.#{$fa-css-prefix}-linkedin:before { content: $fa-var-linkedin; }
+.#{$fa-css-prefix}-rotate-left:before,
+.#{$fa-css-prefix}-undo:before { content: $fa-var-undo; }
+.#{$fa-css-prefix}-legal:before,
+.#{$fa-css-prefix}-gavel:before { content: $fa-var-gavel; }
+.#{$fa-css-prefix}-dashboard:before,
+.#{$fa-css-prefix}-tachometer:before { content: $fa-var-tachometer; }
+.#{$fa-css-prefix}-comment-o:before { content: $fa-var-comment-o; }
+.#{$fa-css-prefix}-comments-o:before { content: $fa-var-comments-o; }
+.#{$fa-css-prefix}-flash:before,
+.#{$fa-css-prefix}-bolt:before { content: $fa-var-bolt; }
+.#{$fa-css-prefix}-sitemap:before { content: $fa-var-sitemap; }
+.#{$fa-css-prefix}-umbrella:before { content: $fa-var-umbrella; }
+.#{$fa-css-prefix}-paste:before,
+.#{$fa-css-prefix}-clipboard:before { content: $fa-var-clipboard; }
+.#{$fa-css-prefix}-lightbulb-o:before { content: $fa-var-lightbulb-o; }
+.#{$fa-css-prefix}-exchange:before { content: $fa-var-exchange; }
+.#{$fa-css-prefix}-cloud-download:before { content: $fa-var-cloud-download; }
+.#{$fa-css-prefix}-cloud-upload:before { content: $fa-var-cloud-upload; }
+.#{$fa-css-prefix}-user-md:before { content: $fa-var-user-md; }
+.#{$fa-css-prefix}-stethoscope:before { content: $fa-var-stethoscope; }
+.#{$fa-css-prefix}-suitcase:before { content: $fa-var-suitcase; }
+.#{$fa-css-prefix}-bell-o:before { content: $fa-var-bell-o; }
+.#{$fa-css-prefix}-coffee:before { content: $fa-var-coffee; }
+.#{$fa-css-prefix}-cutlery:before { content: $fa-var-cutlery; }
+.#{$fa-css-prefix}-file-text-o:before { content: $fa-var-file-text-o; }
+.#{$fa-css-prefix}-building-o:before { content: $fa-var-building-o; }
+.#{$fa-css-prefix}-hospital-o:before { content: $fa-var-hospital-o; }
+.#{$fa-css-prefix}-ambulance:before { content: $fa-var-ambulance; }
+.#{$fa-css-prefix}-medkit:before { content: $fa-var-medkit; }
+.#{$fa-css-prefix}-fighter-jet:before { content: $fa-var-fighter-jet; }
+.#{$fa-css-prefix}-beer:before { content: $fa-var-beer; }
+.#{$fa-css-prefix}-h-square:before { content: $fa-var-h-square; }
+.#{$fa-css-prefix}-plus-square:before { content: $fa-var-plus-square; }
+.#{$fa-css-prefix}-angle-double-left:before { content: $fa-var-angle-double-left; }
+.#{$fa-css-prefix}-angle-double-right:before { content: $fa-var-angle-double-right; }
+.#{$fa-css-prefix}-angle-double-up:before { content: $fa-var-angle-double-up; }
+.#{$fa-css-prefix}-angle-double-down:before { content: $fa-var-angle-double-down; }
+.#{$fa-css-prefix}-angle-left:before { content: $fa-var-angle-left; }
+.#{$fa-css-prefix}-angle-right:before { content: $fa-var-angle-right; }
+.#{$fa-css-prefix}-angle-up:before { content: $fa-var-angle-up; }
+.#{$fa-css-prefix}-angle-down:before { content: $fa-var-angle-down; }
+.#{$fa-css-prefix}-desktop:before { content: $fa-var-desktop; }
+.#{$fa-css-prefix}-laptop:before { content: $fa-var-laptop; }
+.#{$fa-css-prefix}-tablet:before { content: $fa-var-tablet; }
+.#{$fa-css-prefix}-mobile-phone:before,
+.#{$fa-css-prefix}-mobile:before { content: $fa-var-mobile; }
+.#{$fa-css-prefix}-circle-o:before { content: $fa-var-circle-o; }
+.#{$fa-css-prefix}-quote-left:before { content: $fa-var-quote-left; }
+.#{$fa-css-prefix}-quote-right:before { content: $fa-var-quote-right; }
+.#{$fa-css-prefix}-spinner:before { content: $fa-var-spinner; }
+.#{$fa-css-prefix}-circle:before { content: $fa-var-circle; }
+.#{$fa-css-prefix}-mail-reply:before,
+.#{$fa-css-prefix}-reply:before { content: $fa-var-reply; }
+.#{$fa-css-prefix}-github-alt:before { content: $fa-var-github-alt; }
+.#{$fa-css-prefix}-folder-o:before { content: $fa-var-folder-o; }
+.#{$fa-css-prefix}-folder-open-o:before { content: $fa-var-folder-open-o; }
+.#{$fa-css-prefix}-smile-o:before { content: $fa-var-smile-o; }
+.#{$fa-css-prefix}-frown-o:before { content: $fa-var-frown-o; }
+.#{$fa-css-prefix}-meh-o:before { content: $fa-var-meh-o; }
+.#{$fa-css-prefix}-gamepad:before { content: $fa-var-gamepad; }
+.#{$fa-css-prefix}-keyboard-o:before { content: $fa-var-keyboard-o; }
+.#{$fa-css-prefix}-flag-o:before { content: $fa-var-flag-o; }
+.#{$fa-css-prefix}-flag-checkered:before { content: $fa-var-flag-checkered; }
+.#{$fa-css-prefix}-terminal:before { content: $fa-var-terminal; }
+.#{$fa-css-prefix}-code:before { content: $fa-var-code; }
+.#{$fa-css-prefix}-mail-reply-all:before,
+.#{$fa-css-prefix}-reply-all:before { content: $fa-var-reply-all; }
+.#{$fa-css-prefix}-star-half-empty:before,
+.#{$fa-css-prefix}-star-half-full:before,
+.#{$fa-css-prefix}-star-half-o:before { content: $fa-var-star-half-o; }
+.#{$fa-css-prefix}-location-arrow:before { content: $fa-var-location-arrow; }
+.#{$fa-css-prefix}-crop:before { content: $fa-var-crop; }
+.#{$fa-css-prefix}-code-fork:before { content: $fa-var-code-fork; }
+.#{$fa-css-prefix}-unlink:before,
+.#{$fa-css-prefix}-chain-broken:before { content: $fa-var-chain-broken; }
+.#{$fa-css-prefix}-question:before { content: $fa-var-question; }
+.#{$fa-css-prefix}-info:before { content: $fa-var-info; }
+.#{$fa-css-prefix}-exclamation:before { content: $fa-var-exclamation; }
+.#{$fa-css-prefix}-superscript:before { content: $fa-var-superscript; }
+.#{$fa-css-prefix}-subscript:before { content: $fa-var-subscript; }
+.#{$fa-css-prefix}-eraser:before { content: $fa-var-eraser; }
+.#{$fa-css-prefix}-puzzle-piece:before { content: $fa-var-puzzle-piece; }
+.#{$fa-css-prefix}-microphone:before { content: $fa-var-microphone; }
+.#{$fa-css-prefix}-microphone-slash:before { content: $fa-var-microphone-slash; }
+.#{$fa-css-prefix}-shield:before { content: $fa-var-shield; }
+.#{$fa-css-prefix}-calendar-o:before { content: $fa-var-calendar-o; }
+.#{$fa-css-prefix}-fire-extinguisher:before { content: $fa-var-fire-extinguisher; }
+.#{$fa-css-prefix}-rocket:before { content: $fa-var-rocket; }
+.#{$fa-css-prefix}-maxcdn:before { content: $fa-var-maxcdn; }
+.#{$fa-css-prefix}-chevron-circle-left:before { content: $fa-var-chevron-circle-left; }
+.#{$fa-css-prefix}-chevron-circle-right:before { content: $fa-var-chevron-circle-right; }
+.#{$fa-css-prefix}-chevron-circle-up:before { content: $fa-var-chevron-circle-up; }
+.#{$fa-css-prefix}-chevron-circle-down:before { content: $fa-var-chevron-circle-down; }
+.#{$fa-css-prefix}-html5:before { content: $fa-var-html5; }
+.#{$fa-css-prefix}-css3:before { content: $fa-var-css3; }
+.#{$fa-css-prefix}-anchor:before { content: $fa-var-anchor; }
+.#{$fa-css-prefix}-unlock-alt:before { content: $fa-var-unlock-alt; }
+.#{$fa-css-prefix}-bullseye:before { content: $fa-var-bullseye; }
+.#{$fa-css-prefix}-ellipsis-h:before { content: $fa-var-ellipsis-h; }
+.#{$fa-css-prefix}-ellipsis-v:before { content: $fa-var-ellipsis-v; }
+.#{$fa-css-prefix}-rss-square:before { content: $fa-var-rss-square; }
+.#{$fa-css-prefix}-play-circle:before { content: $fa-var-play-circle; }
+.#{$fa-css-prefix}-ticket:before { content: $fa-var-ticket; }
+.#{$fa-css-prefix}-minus-square:before { content: $fa-var-minus-square; }
+.#{$fa-css-prefix}-minus-square-o:before { content: $fa-var-minus-square-o; }
+.#{$fa-css-prefix}-level-up:before { content: $fa-var-level-up; }
+.#{$fa-css-prefix}-level-down:before { content: $fa-var-level-down; }
+.#{$fa-css-prefix}-check-square:before { content: $fa-var-check-square; }
+.#{$fa-css-prefix}-pencil-square:before { content: $fa-var-pencil-square; }
+.#{$fa-css-prefix}-external-link-square:before { content: $fa-var-external-link-square; }
+.#{$fa-css-prefix}-share-square:before { content: $fa-var-share-square; }
+.#{$fa-css-prefix}-compass:before { content: $fa-var-compass; }
+.#{$fa-css-prefix}-toggle-down:before,
+.#{$fa-css-prefix}-caret-square-o-down:before { content: $fa-var-caret-square-o-down; }
+.#{$fa-css-prefix}-toggle-up:before,
+.#{$fa-css-prefix}-caret-square-o-up:before { content: $fa-var-caret-square-o-up; }
+.#{$fa-css-prefix}-toggle-right:before,
+.#{$fa-css-prefix}-caret-square-o-right:before { content: $fa-var-caret-square-o-right; }
+.#{$fa-css-prefix}-euro:before,
+.#{$fa-css-prefix}-eur:before { content: $fa-var-eur; }
+.#{$fa-css-prefix}-gbp:before { content: $fa-var-gbp; }
+.#{$fa-css-prefix}-dollar:before,
+.#{$fa-css-prefix}-usd:before { content: $fa-var-usd; }
+.#{$fa-css-prefix}-rupee:before,
+.#{$fa-css-prefix}-inr:before { content: $fa-var-inr; }
+.#{$fa-css-prefix}-cny:before,
+.#{$fa-css-prefix}-rmb:before,
+.#{$fa-css-prefix}-yen:before,
+.#{$fa-css-prefix}-jpy:before { content: $fa-var-jpy; }
+.#{$fa-css-prefix}-ruble:before,
+.#{$fa-css-prefix}-rouble:before,
+.#{$fa-css-prefix}-rub:before { content: $fa-var-rub; }
+.#{$fa-css-prefix}-won:before,
+.#{$fa-css-prefix}-krw:before { content: $fa-var-krw; }
+.#{$fa-css-prefix}-bitcoin:before,
+.#{$fa-css-prefix}-btc:before { content: $fa-var-btc; }
+.#{$fa-css-prefix}-file:before { content: $fa-var-file; }
+.#{$fa-css-prefix}-file-text:before { content: $fa-var-file-text; }
+.#{$fa-css-prefix}-sort-alpha-asc:before { content: $fa-var-sort-alpha-asc; }
+.#{$fa-css-prefix}-sort-alpha-desc:before { content: $fa-var-sort-alpha-desc; }
+.#{$fa-css-prefix}-sort-amount-asc:before { content: $fa-var-sort-amount-asc; }
+.#{$fa-css-prefix}-sort-amount-desc:before { content: $fa-var-sort-amount-desc; }
+.#{$fa-css-prefix}-sort-numeric-asc:before { content: $fa-var-sort-numeric-asc; }
+.#{$fa-css-prefix}-sort-numeric-desc:before { content: $fa-var-sort-numeric-desc; }
+.#{$fa-css-prefix}-thumbs-up:before { content: $fa-var-thumbs-up; }
+.#{$fa-css-prefix}-thumbs-down:before { content: $fa-var-thumbs-down; }
+.#{$fa-css-prefix}-youtube-square:before { content: $fa-var-youtube-square; }
+.#{$fa-css-prefix}-youtube:before { content: $fa-var-youtube; }
+.#{$fa-css-prefix}-xing:before { content: $fa-var-xing; }
+.#{$fa-css-prefix}-xing-square:before { content: $fa-var-xing-square; }
+.#{$fa-css-prefix}-youtube-play:before { content: $fa-var-youtube-play; }
+.#{$fa-css-prefix}-dropbox:before { content: $fa-var-dropbox; }
+.#{$fa-css-prefix}-stack-overflow:before { content: $fa-var-stack-overflow; }
+.#{$fa-css-prefix}-instagram:before { content: $fa-var-instagram; }
+.#{$fa-css-prefix}-flickr:before { content: $fa-var-flickr; }
+.#{$fa-css-prefix}-adn:before { content: $fa-var-adn; }
+.#{$fa-css-prefix}-bitbucket:before { content: $fa-var-bitbucket; }
+.#{$fa-css-prefix}-bitbucket-square:before { content: $fa-var-bitbucket-square; }
+.#{$fa-css-prefix}-tumblr:before { content: $fa-var-tumblr; }
+.#{$fa-css-prefix}-tumblr-square:before { content: $fa-var-tumblr-square; }
+.#{$fa-css-prefix}-long-arrow-down:before { content: $fa-var-long-arrow-down; }
+.#{$fa-css-prefix}-long-arrow-up:before { content: $fa-var-long-arrow-up; }
+.#{$fa-css-prefix}-long-arrow-left:before { content: $fa-var-long-arrow-left; }
+.#{$fa-css-prefix}-long-arrow-right:before { content: $fa-var-long-arrow-right; }
+.#{$fa-css-prefix}-apple:before { content: $fa-var-apple; }
+.#{$fa-css-prefix}-windows:before { content: $fa-var-windows; }
+.#{$fa-css-prefix}-android:before { content: $fa-var-android; }
+.#{$fa-css-prefix}-linux:before { content: $fa-var-linux; }
+.#{$fa-css-prefix}-dribbble:before { content: $fa-var-dribbble; }
+.#{$fa-css-prefix}-skype:before { content: $fa-var-skype; }
+.#{$fa-css-prefix}-foursquare:before { content: $fa-var-foursquare; }
+.#{$fa-css-prefix}-trello:before { content: $fa-var-trello; }
+.#{$fa-css-prefix}-female:before { content: $fa-var-female; }
+.#{$fa-css-prefix}-male:before { content: $fa-var-male; }
+.#{$fa-css-prefix}-gittip:before,
+.#{$fa-css-prefix}-gratipay:before { content: $fa-var-gratipay; }
+.#{$fa-css-prefix}-sun-o:before { content: $fa-var-sun-o; }
+.#{$fa-css-prefix}-moon-o:before { content: $fa-var-moon-o; }
+.#{$fa-css-prefix}-archive:before { content: $fa-var-archive; }
+.#{$fa-css-prefix}-bug:before { content: $fa-var-bug; }
+.#{$fa-css-prefix}-vk:before { content: $fa-var-vk; }
+.#{$fa-css-prefix}-weibo:before { content: $fa-var-weibo; }
+.#{$fa-css-prefix}-renren:before { content: $fa-var-renren; }
+.#{$fa-css-prefix}-pagelines:before { content: $fa-var-pagelines; }
+.#{$fa-css-prefix}-stack-exchange:before { content: $fa-var-stack-exchange; }
+.#{$fa-css-prefix}-arrow-circle-o-right:before { content: $fa-var-arrow-circle-o-right; }
+.#{$fa-css-prefix}-arrow-circle-o-left:before { content: $fa-var-arrow-circle-o-left; }
+.#{$fa-css-prefix}-toggle-left:before,
+.#{$fa-css-prefix}-caret-square-o-left:before { content: $fa-var-caret-square-o-left; }
+.#{$fa-css-prefix}-dot-circle-o:before { content: $fa-var-dot-circle-o; }
+.#{$fa-css-prefix}-wheelchair:before { content: $fa-var-wheelchair; }
+.#{$fa-css-prefix}-vimeo-square:before { content: $fa-var-vimeo-square; }
+.#{$fa-css-prefix}-turkish-lira:before,
+.#{$fa-css-prefix}-try:before { content: $fa-var-try; }
+.#{$fa-css-prefix}-plus-square-o:before { content: $fa-var-plus-square-o; }
+.#{$fa-css-prefix}-space-shuttle:before { content: $fa-var-space-shuttle; }
+.#{$fa-css-prefix}-slack:before { content: $fa-var-slack; }
+.#{$fa-css-prefix}-envelope-square:before { content: $fa-var-envelope-square; }
+.#{$fa-css-prefix}-wordpress:before { content: $fa-var-wordpress; }
+.#{$fa-css-prefix}-openid:before { content: $fa-var-openid; }
+.#{$fa-css-prefix}-institution:before,
+.#{$fa-css-prefix}-bank:before,
+.#{$fa-css-prefix}-university:before { content: $fa-var-university; }
+.#{$fa-css-prefix}-mortar-board:before,
+.#{$fa-css-prefix}-graduation-cap:before { content: $fa-var-graduation-cap; }
+.#{$fa-css-prefix}-yahoo:before { content: $fa-var-yahoo; }
+.#{$fa-css-prefix}-google:before { content: $fa-var-google; }
+.#{$fa-css-prefix}-reddit:before { content: $fa-var-reddit; }
+.#{$fa-css-prefix}-reddit-square:before { content: $fa-var-reddit-square; }
+.#{$fa-css-prefix}-stumbleupon-circle:before { content: $fa-var-stumbleupon-circle; }
+.#{$fa-css-prefix}-stumbleupon:before { content: $fa-var-stumbleupon; }
+.#{$fa-css-prefix}-delicious:before { content: $fa-var-delicious; }
+.#{$fa-css-prefix}-digg:before { content: $fa-var-digg; }
+.#{$fa-css-prefix}-pied-piper-pp:before { content: $fa-var-pied-piper-pp; }
+.#{$fa-css-prefix}-pied-piper-alt:before { content: $fa-var-pied-piper-alt; }
+.#{$fa-css-prefix}-drupal:before { content: $fa-var-drupal; }
+.#{$fa-css-prefix}-joomla:before { content: $fa-var-joomla; }
+.#{$fa-css-prefix}-language:before { content: $fa-var-language; }
+.#{$fa-css-prefix}-fax:before { content: $fa-var-fax; }
+.#{$fa-css-prefix}-building:before { content: $fa-var-building; }
+.#{$fa-css-prefix}-child:before { content: $fa-var-child; }
+.#{$fa-css-prefix}-paw:before { content: $fa-var-paw; }
+.#{$fa-css-prefix}-spoon:before { content: $fa-var-spoon; }
+.#{$fa-css-prefix}-cube:before { content: $fa-var-cube; }
+.#{$fa-css-prefix}-cubes:before { content: $fa-var-cubes; }
+.#{$fa-css-prefix}-behance:before { content: $fa-var-behance; }
+.#{$fa-css-prefix}-behance-square:before { content: $fa-var-behance-square; }
+.#{$fa-css-prefix}-steam:before { content: $fa-var-steam; }
+.#{$fa-css-prefix}-steam-square:before { content: $fa-var-steam-square; }
+.#{$fa-css-prefix}-recycle:before { content: $fa-var-recycle; }
+.#{$fa-css-prefix}-automobile:before,
+.#{$fa-css-prefix}-car:before { content: $fa-var-car; }
+.#{$fa-css-prefix}-cab:before,
+.#{$fa-css-prefix}-taxi:before { content: $fa-var-taxi; }
+.#{$fa-css-prefix}-tree:before { content: $fa-var-tree; }
+.#{$fa-css-prefix}-spotify:before { content: $fa-var-spotify; }
+.#{$fa-css-prefix}-deviantart:before { content: $fa-var-deviantart; }
+.#{$fa-css-prefix}-soundcloud:before { content: $fa-var-soundcloud; }
+.#{$fa-css-prefix}-database:before { content: $fa-var-database; }
+.#{$fa-css-prefix}-file-pdf-o:before { content: $fa-var-file-pdf-o; }
+.#{$fa-css-prefix}-file-word-o:before { content: $fa-var-file-word-o; }
+.#{$fa-css-prefix}-file-excel-o:before { content: $fa-var-file-excel-o; }
+.#{$fa-css-prefix}-file-powerpoint-o:before { content: $fa-var-file-powerpoint-o; }
+.#{$fa-css-prefix}-file-photo-o:before,
+.#{$fa-css-prefix}-file-picture-o:before,
+.#{$fa-css-prefix}-file-image-o:before { content: $fa-var-file-image-o; }
+.#{$fa-css-prefix}-file-zip-o:before,
+.#{$fa-css-prefix}-file-archive-o:before { content: $fa-var-file-archive-o; }
+.#{$fa-css-prefix}-file-sound-o:before,
+.#{$fa-css-prefix}-file-audio-o:before { content: $fa-var-file-audio-o; }
+.#{$fa-css-prefix}-file-movie-o:before,
+.#{$fa-css-prefix}-file-video-o:before { content: $fa-var-file-video-o; }
+.#{$fa-css-prefix}-file-code-o:before { content: $fa-var-file-code-o; }
+.#{$fa-css-prefix}-vine:before { content: $fa-var-vine; }
+.#{$fa-css-prefix}-codepen:before { content: $fa-var-codepen; }
+.#{$fa-css-prefix}-jsfiddle:before { content: $fa-var-jsfiddle; }
+.#{$fa-css-prefix}-life-bouy:before,
+.#{$fa-css-prefix}-life-buoy:before,
+.#{$fa-css-prefix}-life-saver:before,
+.#{$fa-css-prefix}-support:before,
+.#{$fa-css-prefix}-life-ring:before { content: $fa-var-life-ring; }
+.#{$fa-css-prefix}-circle-o-notch:before { content: $fa-var-circle-o-notch; }
+.#{$fa-css-prefix}-ra:before,
+.#{$fa-css-prefix}-resistance:before,
+.#{$fa-css-prefix}-rebel:before { content: $fa-var-rebel; }
+.#{$fa-css-prefix}-ge:before,
+.#{$fa-css-prefix}-empire:before { content: $fa-var-empire; }
+.#{$fa-css-prefix}-git-square:before { content: $fa-var-git-square; }
+.#{$fa-css-prefix}-git:before { content: $fa-var-git; }
+.#{$fa-css-prefix}-y-combinator-square:before,
+.#{$fa-css-prefix}-yc-square:before,
+.#{$fa-css-prefix}-hacker-news:before { content: $fa-var-hacker-news; }
+.#{$fa-css-prefix}-tencent-weibo:before { content: $fa-var-tencent-weibo; }
+.#{$fa-css-prefix}-qq:before { content: $fa-var-qq; }
+.#{$fa-css-prefix}-wechat:before,
+.#{$fa-css-prefix}-weixin:before { content: $fa-var-weixin; }
+.#{$fa-css-prefix}-send:before,
+.#{$fa-css-prefix}-paper-plane:before { content: $fa-var-paper-plane; }
+.#{$fa-css-prefix}-send-o:before,
+.#{$fa-css-prefix}-paper-plane-o:before { content: $fa-var-paper-plane-o; }
+.#{$fa-css-prefix}-history:before { content: $fa-var-history; }
+.#{$fa-css-prefix}-circle-thin:before { content: $fa-var-circle-thin; }
+.#{$fa-css-prefix}-header:before { content: $fa-var-header; }
+.#{$fa-css-prefix}-paragraph:before { content: $fa-var-paragraph; }
+.#{$fa-css-prefix}-sliders:before { content: $fa-var-sliders; }
+.#{$fa-css-prefix}-share-alt:before { content: $fa-var-share-alt; }
+.#{$fa-css-prefix}-share-alt-square:before { content: $fa-var-share-alt-square; }
+.#{$fa-css-prefix}-bomb:before { content: $fa-var-bomb; }
+.#{$fa-css-prefix}-soccer-ball-o:before,
+.#{$fa-css-prefix}-futbol-o:before { content: $fa-var-futbol-o; }
+.#{$fa-css-prefix}-tty:before { content: $fa-var-tty; }
+.#{$fa-css-prefix}-binoculars:before { content: $fa-var-binoculars; }
+.#{$fa-css-prefix}-plug:before { content: $fa-var-plug; }
+.#{$fa-css-prefix}-slideshare:before { content: $fa-var-slideshare; }
+.#{$fa-css-prefix}-twitch:before { content: $fa-var-twitch; }
+.#{$fa-css-prefix}-yelp:before { content: $fa-var-yelp; }
+.#{$fa-css-prefix}-newspaper-o:before { content: $fa-var-newspaper-o; }
+.#{$fa-css-prefix}-wifi:before { content: $fa-var-wifi; }
+.#{$fa-css-prefix}-calculator:before { content: $fa-var-calculator; }
+.#{$fa-css-prefix}-paypal:before { content: $fa-var-paypal; }
+.#{$fa-css-prefix}-google-wallet:before { content: $fa-var-google-wallet; }
+.#{$fa-css-prefix}-cc-visa:before { content: $fa-var-cc-visa; }
+.#{$fa-css-prefix}-cc-mastercard:before { content: $fa-var-cc-mastercard; }
+.#{$fa-css-prefix}-cc-discover:before { content: $fa-var-cc-discover; }
+.#{$fa-css-prefix}-cc-amex:before { content: $fa-var-cc-amex; }
+.#{$fa-css-prefix}-cc-paypal:before { content: $fa-var-cc-paypal; }
+.#{$fa-css-prefix}-cc-stripe:before { content: $fa-var-cc-stripe; }
+.#{$fa-css-prefix}-bell-slash:before { content: $fa-var-bell-slash; }
+.#{$fa-css-prefix}-bell-slash-o:before { content: $fa-var-bell-slash-o; }
+.#{$fa-css-prefix}-trash:before { content: $fa-var-trash; }
+.#{$fa-css-prefix}-copyright:before { content: $fa-var-copyright; }
+.#{$fa-css-prefix}-at:before { content: $fa-var-at; }
+.#{$fa-css-prefix}-eyedropper:before { content: $fa-var-eyedropper; }
+.#{$fa-css-prefix}-paint-brush:before { content: $fa-var-paint-brush; }
+.#{$fa-css-prefix}-birthday-cake:before { content: $fa-var-birthday-cake; }
+.#{$fa-css-prefix}-area-chart:before { content: $fa-var-area-chart; }
+.#{$fa-css-prefix}-pie-chart:before { content: $fa-var-pie-chart; }
+.#{$fa-css-prefix}-line-chart:before { content: $fa-var-line-chart; }
+.#{$fa-css-prefix}-lastfm:before { content: $fa-var-lastfm; }
+.#{$fa-css-prefix}-lastfm-square:before { content: $fa-var-lastfm-square; }
+.#{$fa-css-prefix}-toggle-off:before { content: $fa-var-toggle-off; }
+.#{$fa-css-prefix}-toggle-on:before { content: $fa-var-toggle-on; }
+.#{$fa-css-prefix}-bicycle:before { content: $fa-var-bicycle; }
+.#{$fa-css-prefix}-bus:before { content: $fa-var-bus; }
+.#{$fa-css-prefix}-ioxhost:before { content: $fa-var-ioxhost; }
+.#{$fa-css-prefix}-angellist:before { content: $fa-var-angellist; }
+.#{$fa-css-prefix}-cc:before { content: $fa-var-cc; }
+.#{$fa-css-prefix}-shekel:before,
+.#{$fa-css-prefix}-sheqel:before,
+.#{$fa-css-prefix}-ils:before { content: $fa-var-ils; }
+.#{$fa-css-prefix}-meanpath:before { content: $fa-var-meanpath; }
+.#{$fa-css-prefix}-buysellads:before { content: $fa-var-buysellads; }
+.#{$fa-css-prefix}-connectdevelop:before { content: $fa-var-connectdevelop; }
+.#{$fa-css-prefix}-dashcube:before { content: $fa-var-dashcube; }
+.#{$fa-css-prefix}-forumbee:before { content: $fa-var-forumbee; }
+.#{$fa-css-prefix}-leanpub:before { content: $fa-var-leanpub; }
+.#{$fa-css-prefix}-sellsy:before { content: $fa-var-sellsy; }
+.#{$fa-css-prefix}-shirtsinbulk:before { content: $fa-var-shirtsinbulk; }
+.#{$fa-css-prefix}-simplybuilt:before { content: $fa-var-simplybuilt; }
+.#{$fa-css-prefix}-skyatlas:before { content: $fa-var-skyatlas; }
+.#{$fa-css-prefix}-cart-plus:before { content: $fa-var-cart-plus; }
+.#{$fa-css-prefix}-cart-arrow-down:before { content: $fa-var-cart-arrow-down; }
+.#{$fa-css-prefix}-diamond:before { content: $fa-var-diamond; }
+.#{$fa-css-prefix}-ship:before { content: $fa-var-ship; }
+.#{$fa-css-prefix}-user-secret:before { content: $fa-var-user-secret; }
+.#{$fa-css-prefix}-motorcycle:before { content: $fa-var-motorcycle; }
+.#{$fa-css-prefix}-street-view:before { content: $fa-var-street-view; }
+.#{$fa-css-prefix}-heartbeat:before { content: $fa-var-heartbeat; }
+.#{$fa-css-prefix}-venus:before { content: $fa-var-venus; }
+.#{$fa-css-prefix}-mars:before { content: $fa-var-mars; }
+.#{$fa-css-prefix}-mercury:before { content: $fa-var-mercury; }
+.#{$fa-css-prefix}-intersex:before,
+.#{$fa-css-prefix}-transgender:before { content: $fa-var-transgender; }
+.#{$fa-css-prefix}-transgender-alt:before { content: $fa-var-transgender-alt; }
+.#{$fa-css-prefix}-venus-double:before { content: $fa-var-venus-double; }
+.#{$fa-css-prefix}-mars-double:before { content: $fa-var-mars-double; }
+.#{$fa-css-prefix}-venus-mars:before { content: $fa-var-venus-mars; }
+.#{$fa-css-prefix}-mars-stroke:before { content: $fa-var-mars-stroke; }
+.#{$fa-css-prefix}-mars-stroke-v:before { content: $fa-var-mars-stroke-v; }
+.#{$fa-css-prefix}-mars-stroke-h:before { content: $fa-var-mars-stroke-h; }
+.#{$fa-css-prefix}-neuter:before { content: $fa-var-neuter; }
+.#{$fa-css-prefix}-genderless:before { content: $fa-var-genderless; }
+.#{$fa-css-prefix}-facebook-official:before { content: $fa-var-facebook-official; }
+.#{$fa-css-prefix}-pinterest-p:before { content: $fa-var-pinterest-p; }
+.#{$fa-css-prefix}-whatsapp:before { content: $fa-var-whatsapp; }
+.#{$fa-css-prefix}-server:before { content: $fa-var-server; }
+.#{$fa-css-prefix}-user-plus:before { content: $fa-var-user-plus; }
+.#{$fa-css-prefix}-user-times:before { content: $fa-var-user-times; }
+.#{$fa-css-prefix}-hotel:before,
+.#{$fa-css-prefix}-bed:before { content: $fa-var-bed; }
+.#{$fa-css-prefix}-viacoin:before { content: $fa-var-viacoin; }
+.#{$fa-css-prefix}-train:before { content: $fa-var-train; }
+.#{$fa-css-prefix}-subway:before { content: $fa-var-subway; }
+.#{$fa-css-prefix}-medium:before { content: $fa-var-medium; }
+.#{$fa-css-prefix}-yc:before,
+.#{$fa-css-prefix}-y-combinator:before { content: $fa-var-y-combinator; }
+.#{$fa-css-prefix}-optin-monster:before { content: $fa-var-optin-monster; }
+.#{$fa-css-prefix}-opencart:before { content: $fa-var-opencart; }
+.#{$fa-css-prefix}-expeditedssl:before { content: $fa-var-expeditedssl; }
+.#{$fa-css-prefix}-battery-4:before,
+.#{$fa-css-prefix}-battery:before,
+.#{$fa-css-prefix}-battery-full:before { content: $fa-var-battery-full; }
+.#{$fa-css-prefix}-battery-3:before,
+.#{$fa-css-prefix}-battery-three-quarters:before { content: $fa-var-battery-three-quarters; }
+.#{$fa-css-prefix}-battery-2:before,
+.#{$fa-css-prefix}-battery-half:before { content: $fa-var-battery-half; }
+.#{$fa-css-prefix}-battery-1:before,
+.#{$fa-css-prefix}-battery-quarter:before { content: $fa-var-battery-quarter; }
+.#{$fa-css-prefix}-battery-0:before,
+.#{$fa-css-prefix}-battery-empty:before { content: $fa-var-battery-empty; }
+.#{$fa-css-prefix}-mouse-pointer:before { content: $fa-var-mouse-pointer; }
+.#{$fa-css-prefix}-i-cursor:before { content: $fa-var-i-cursor; }
+.#{$fa-css-prefix}-object-group:before { content: $fa-var-object-group; }
+.#{$fa-css-prefix}-object-ungroup:before { content: $fa-var-object-ungroup; }
+.#{$fa-css-prefix}-sticky-note:before { content: $fa-var-sticky-note; }
+.#{$fa-css-prefix}-sticky-note-o:before { content: $fa-var-sticky-note-o; }
+.#{$fa-css-prefix}-cc-jcb:before { content: $fa-var-cc-jcb; }
+.#{$fa-css-prefix}-cc-diners-club:before { content: $fa-var-cc-diners-club; }
+.#{$fa-css-prefix}-clone:before { content: $fa-var-clone; }
+.#{$fa-css-prefix}-balance-scale:before { content: $fa-var-balance-scale; }
+.#{$fa-css-prefix}-hourglass-o:before { content: $fa-var-hourglass-o; }
+.#{$fa-css-prefix}-hourglass-1:before,
+.#{$fa-css-prefix}-hourglass-start:before { content: $fa-var-hourglass-start; }
+.#{$fa-css-prefix}-hourglass-2:before,
+.#{$fa-css-prefix}-hourglass-half:before { content: $fa-var-hourglass-half; }
+.#{$fa-css-prefix}-hourglass-3:before,
+.#{$fa-css-prefix}-hourglass-end:before { content: $fa-var-hourglass-end; }
+.#{$fa-css-prefix}-hourglass:before { content: $fa-var-hourglass; }
+.#{$fa-css-prefix}-hand-grab-o:before,
+.#{$fa-css-prefix}-hand-rock-o:before { content: $fa-var-hand-rock-o; }
+.#{$fa-css-prefix}-hand-stop-o:before,
+.#{$fa-css-prefix}-hand-paper-o:before { content: $fa-var-hand-paper-o; }
+.#{$fa-css-prefix}-hand-scissors-o:before { content: $fa-var-hand-scissors-o; }
+.#{$fa-css-prefix}-hand-lizard-o:before { content: $fa-var-hand-lizard-o; }
+.#{$fa-css-prefix}-hand-spock-o:before { content: $fa-var-hand-spock-o; }
+.#{$fa-css-prefix}-hand-pointer-o:before { content: $fa-var-hand-pointer-o; }
+.#{$fa-css-prefix}-hand-peace-o:before { content: $fa-var-hand-peace-o; }
+.#{$fa-css-prefix}-trademark:before { content: $fa-var-trademark; }
+.#{$fa-css-prefix}-registered:before { content: $fa-var-registered; }
+.#{$fa-css-prefix}-creative-commons:before { content: $fa-var-creative-commons; }
+.#{$fa-css-prefix}-gg:before { content: $fa-var-gg; }
+.#{$fa-css-prefix}-gg-circle:before { content: $fa-var-gg-circle; }
+.#{$fa-css-prefix}-tripadvisor:before { content: $fa-var-tripadvisor; }
+.#{$fa-css-prefix}-odnoklassniki:before { content: $fa-var-odnoklassniki; }
+.#{$fa-css-prefix}-odnoklassniki-square:before { content: $fa-var-odnoklassniki-square; }
+.#{$fa-css-prefix}-get-pocket:before { content: $fa-var-get-pocket; }
+.#{$fa-css-prefix}-wikipedia-w:before { content: $fa-var-wikipedia-w; }
+.#{$fa-css-prefix}-safari:before { content: $fa-var-safari; }
+.#{$fa-css-prefix}-chrome:before { content: $fa-var-chrome; }
+.#{$fa-css-prefix}-firefox:before { content: $fa-var-firefox; }
+.#{$fa-css-prefix}-opera:before { content: $fa-var-opera; }
+.#{$fa-css-prefix}-internet-explorer:before { content: $fa-var-internet-explorer; }
+.#{$fa-css-prefix}-tv:before,
+.#{$fa-css-prefix}-television:before { content: $fa-var-television; }
+.#{$fa-css-prefix}-contao:before { content: $fa-var-contao; }
+.#{$fa-css-prefix}-500px:before { content: $fa-var-500px; }
+.#{$fa-css-prefix}-amazon:before { content: $fa-var-amazon; }
+.#{$fa-css-prefix}-calendar-plus-o:before { content: $fa-var-calendar-plus-o; }
+.#{$fa-css-prefix}-calendar-minus-o:before { content: $fa-var-calendar-minus-o; }
+.#{$fa-css-prefix}-calendar-times-o:before { content: $fa-var-calendar-times-o; }
+.#{$fa-css-prefix}-calendar-check-o:before { content: $fa-var-calendar-check-o; }
+.#{$fa-css-prefix}-industry:before { content: $fa-var-industry; }
+.#{$fa-css-prefix}-map-pin:before { content: $fa-var-map-pin; }
+.#{$fa-css-prefix}-map-signs:before { content: $fa-var-map-signs; }
+.#{$fa-css-prefix}-map-o:before { content: $fa-var-map-o; }
+.#{$fa-css-prefix}-map:before { content: $fa-var-map; }
+.#{$fa-css-prefix}-commenting:before { content: $fa-var-commenting; }
+.#{$fa-css-prefix}-commenting-o:before { content: $fa-var-commenting-o; }
+.#{$fa-css-prefix}-houzz:before { content: $fa-var-houzz; }
+.#{$fa-css-prefix}-vimeo:before { content: $fa-var-vimeo; }
+.#{$fa-css-prefix}-black-tie:before { content: $fa-var-black-tie; }
+.#{$fa-css-prefix}-fonticons:before { content: $fa-var-fonticons; }
+.#{$fa-css-prefix}-reddit-alien:before { content: $fa-var-reddit-alien; }
+.#{$fa-css-prefix}-edge:before { content: $fa-var-edge; }
+.#{$fa-css-prefix}-credit-card-alt:before { content: $fa-var-credit-card-alt; }
+.#{$fa-css-prefix}-codiepie:before { content: $fa-var-codiepie; }
+.#{$fa-css-prefix}-modx:before { content: $fa-var-modx; }
+.#{$fa-css-prefix}-fort-awesome:before { content: $fa-var-fort-awesome; }
+.#{$fa-css-prefix}-usb:before { content: $fa-var-usb; }
+.#{$fa-css-prefix}-product-hunt:before { content: $fa-var-product-hunt; }
+.#{$fa-css-prefix}-mixcloud:before { content: $fa-var-mixcloud; }
+.#{$fa-css-prefix}-scribd:before { content: $fa-var-scribd; }
+.#{$fa-css-prefix}-pause-circle:before { content: $fa-var-pause-circle; }
+.#{$fa-css-prefix}-pause-circle-o:before { content: $fa-var-pause-circle-o; }
+.#{$fa-css-prefix}-stop-circle:before { content: $fa-var-stop-circle; }
+.#{$fa-css-prefix}-stop-circle-o:before { content: $fa-var-stop-circle-o; }
+.#{$fa-css-prefix}-shopping-bag:before { content: $fa-var-shopping-bag; }
+.#{$fa-css-prefix}-shopping-basket:before { content: $fa-var-shopping-basket; }
+.#{$fa-css-prefix}-hashtag:before { content: $fa-var-hashtag; }
+.#{$fa-css-prefix}-bluetooth:before { content: $fa-var-bluetooth; }
+.#{$fa-css-prefix}-bluetooth-b:before { content: $fa-var-bluetooth-b; }
+.#{$fa-css-prefix}-percent:before { content: $fa-var-percent; }
+.#{$fa-css-prefix}-gitlab:before { content: $fa-var-gitlab; }
+.#{$fa-css-prefix}-wpbeginner:before { content: $fa-var-wpbeginner; }
+.#{$fa-css-prefix}-wpforms:before { content: $fa-var-wpforms; }
+.#{$fa-css-prefix}-envira:before { content: $fa-var-envira; }
+.#{$fa-css-prefix}-universal-access:before { content: $fa-var-universal-access; }
+.#{$fa-css-prefix}-wheelchair-alt:before { content: $fa-var-wheelchair-alt; }
+.#{$fa-css-prefix}-question-circle-o:before { content: $fa-var-question-circle-o; }
+.#{$fa-css-prefix}-blind:before { content: $fa-var-blind; }
+.#{$fa-css-prefix}-audio-description:before { content: $fa-var-audio-description; }
+.#{$fa-css-prefix}-volume-control-phone:before { content: $fa-var-volume-control-phone; }
+.#{$fa-css-prefix}-braille:before { content: $fa-var-braille; }
+.#{$fa-css-prefix}-assistive-listening-systems:before { content: $fa-var-assistive-listening-systems; }
+.#{$fa-css-prefix}-asl-interpreting:before,
+.#{$fa-css-prefix}-american-sign-language-interpreting:before { content: $fa-var-american-sign-language-interpreting; }
+.#{$fa-css-prefix}-deafness:before,
+.#{$fa-css-prefix}-hard-of-hearing:before,
+.#{$fa-css-prefix}-deaf:before { content: $fa-var-deaf; }
+.#{$fa-css-prefix}-glide:before { content: $fa-var-glide; }
+.#{$fa-css-prefix}-glide-g:before { content: $fa-var-glide-g; }
+.#{$fa-css-prefix}-signing:before,
+.#{$fa-css-prefix}-sign-language:before { content: $fa-var-sign-language; }
+.#{$fa-css-prefix}-low-vision:before { content: $fa-var-low-vision; }
+.#{$fa-css-prefix}-viadeo:before { content: $fa-var-viadeo; }
+.#{$fa-css-prefix}-viadeo-square:before { content: $fa-var-viadeo-square; }
+.#{$fa-css-prefix}-snapchat:before { content: $fa-var-snapchat; }
+.#{$fa-css-prefix}-snapchat-ghost:before { content: $fa-var-snapchat-ghost; }
+.#{$fa-css-prefix}-snapchat-square:before { content: $fa-var-snapchat-square; }
+.#{$fa-css-prefix}-pied-piper:before { content: $fa-var-pied-piper; }
+.#{$fa-css-prefix}-first-order:before { content: $fa-var-first-order; }
+.#{$fa-css-prefix}-yoast:before { content: $fa-var-yoast; }
+.#{$fa-css-prefix}-themeisle:before { content: $fa-var-themeisle; }
+.#{$fa-css-prefix}-google-plus-circle:before,
+.#{$fa-css-prefix}-google-plus-official:before { content: $fa-var-google-plus-official; }
+.#{$fa-css-prefix}-fa:before,
+.#{$fa-css-prefix}-font-awesome:before { content: $fa-var-font-awesome; }
+.#{$fa-css-prefix}-handshake-o:before { content: $fa-var-handshake-o; }
+.#{$fa-css-prefix}-envelope-open:before { content: $fa-var-envelope-open; }
+.#{$fa-css-prefix}-envelope-open-o:before { content: $fa-var-envelope-open-o; }
+.#{$fa-css-prefix}-linode:before { content: $fa-var-linode; }
+.#{$fa-css-prefix}-address-book:before { content: $fa-var-address-book; }
+.#{$fa-css-prefix}-address-book-o:before { content: $fa-var-address-book-o; }
+.#{$fa-css-prefix}-vcard:before,
+.#{$fa-css-prefix}-address-card:before { content: $fa-var-address-card; }
+.#{$fa-css-prefix}-vcard-o:before,
+.#{$fa-css-prefix}-address-card-o:before { content: $fa-var-address-card-o; }
+.#{$fa-css-prefix}-user-circle:before { content: $fa-var-user-circle; }
+.#{$fa-css-prefix}-user-circle-o:before { content: $fa-var-user-circle-o; }
+.#{$fa-css-prefix}-user-o:before { content: $fa-var-user-o; }
+.#{$fa-css-prefix}-id-badge:before { content: $fa-var-id-badge; }
+.#{$fa-css-prefix}-drivers-license:before,
+.#{$fa-css-prefix}-id-card:before { content: $fa-var-id-card; }
+.#{$fa-css-prefix}-drivers-license-o:before,
+.#{$fa-css-prefix}-id-card-o:before { content: $fa-var-id-card-o; }
+.#{$fa-css-prefix}-quora:before { content: $fa-var-quora; }
+.#{$fa-css-prefix}-free-code-camp:before { content: $fa-var-free-code-camp; }
+.#{$fa-css-prefix}-telegram:before { content: $fa-var-telegram; }
+.#{$fa-css-prefix}-thermometer-4:before,
+.#{$fa-css-prefix}-thermometer:before,
+.#{$fa-css-prefix}-thermometer-full:before { content: $fa-var-thermometer-full; }
+.#{$fa-css-prefix}-thermometer-3:before,
+.#{$fa-css-prefix}-thermometer-three-quarters:before { content: $fa-var-thermometer-three-quarters; }
+.#{$fa-css-prefix}-thermometer-2:before,
+.#{$fa-css-prefix}-thermometer-half:before { content: $fa-var-thermometer-half; }
+.#{$fa-css-prefix}-thermometer-1:before,
+.#{$fa-css-prefix}-thermometer-quarter:before { content: $fa-var-thermometer-quarter; }
+.#{$fa-css-prefix}-thermometer-0:before,
+.#{$fa-css-prefix}-thermometer-empty:before { content: $fa-var-thermometer-empty; }
+.#{$fa-css-prefix}-shower:before { content: $fa-var-shower; }
+.#{$fa-css-prefix}-bathtub:before,
+.#{$fa-css-prefix}-s15:before,
+.#{$fa-css-prefix}-bath:before { content: $fa-var-bath; }
+.#{$fa-css-prefix}-podcast:before { content: $fa-var-podcast; }
+.#{$fa-css-prefix}-window-maximize:before { content: $fa-var-window-maximize; }
+.#{$fa-css-prefix}-window-minimize:before { content: $fa-var-window-minimize; }
+.#{$fa-css-prefix}-window-restore:before { content: $fa-var-window-restore; }
+.#{$fa-css-prefix}-times-rectangle:before,
+.#{$fa-css-prefix}-window-close:before { content: $fa-var-window-close; }
+.#{$fa-css-prefix}-times-rectangle-o:before,
+.#{$fa-css-prefix}-window-close-o:before { content: $fa-var-window-close-o; }
+.#{$fa-css-prefix}-bandcamp:before { content: $fa-var-bandcamp; }
+.#{$fa-css-prefix}-grav:before { content: $fa-var-grav; }
+.#{$fa-css-prefix}-etsy:before { content: $fa-var-etsy; }
+.#{$fa-css-prefix}-imdb:before { content: $fa-var-imdb; }
+.#{$fa-css-prefix}-ravelry:before { content: $fa-var-ravelry; }
+.#{$fa-css-prefix}-eercast:before { content: $fa-var-eercast; }
+.#{$fa-css-prefix}-microchip:before { content: $fa-var-microchip; }
+.#{$fa-css-prefix}-snowflake-o:before { content: $fa-var-snowflake-o; }
+.#{$fa-css-prefix}-superpowers:before { content: $fa-var-superpowers; }
+.#{$fa-css-prefix}-wpexplorer:before { content: $fa-var-wpexplorer; }
+.#{$fa-css-prefix}-meetup:before { content: $fa-var-meetup; }
diff --git a/htdocs/includes/fontawesome/scss/_larger.scss b/htdocs/includes/fontawesome/scss/_larger.scss
new file mode 100644
index 00000000000..41e9a8184aa
--- /dev/null
+++ b/htdocs/includes/fontawesome/scss/_larger.scss
@@ -0,0 +1,13 @@
+// Icon Sizes
+// -------------------------
+
+/* makes the font 33% larger relative to the icon container */
+.#{$fa-css-prefix}-lg {
+  font-size: (4em / 3);
+  line-height: (3em / 4);
+  vertical-align: -15%;
+}
+.#{$fa-css-prefix}-2x { font-size: 2em; }
+.#{$fa-css-prefix}-3x { font-size: 3em; }
+.#{$fa-css-prefix}-4x { font-size: 4em; }
+.#{$fa-css-prefix}-5x { font-size: 5em; }
diff --git a/htdocs/includes/fontawesome/scss/_list.scss b/htdocs/includes/fontawesome/scss/_list.scss
new file mode 100644
index 00000000000..7d1e4d54d6c
--- /dev/null
+++ b/htdocs/includes/fontawesome/scss/_list.scss
@@ -0,0 +1,19 @@
+// List Icons
+// -------------------------
+
+.#{$fa-css-prefix}-ul {
+  padding-left: 0;
+  margin-left: $fa-li-width;
+  list-style-type: none;
+  > li { position: relative; }
+}
+.#{$fa-css-prefix}-li {
+  position: absolute;
+  left: -$fa-li-width;
+  width: $fa-li-width;
+  top: (2em / 14);
+  text-align: center;
+  &.#{$fa-css-prefix}-lg {
+    left: -$fa-li-width + (4em / 14);
+  }
+}
diff --git a/htdocs/includes/fontawesome/scss/_mixins.scss b/htdocs/includes/fontawesome/scss/_mixins.scss
new file mode 100644
index 00000000000..c3bbd5745d3
--- /dev/null
+++ b/htdocs/includes/fontawesome/scss/_mixins.scss
@@ -0,0 +1,60 @@
+// Mixins
+// --------------------------
+
+@mixin fa-icon() {
+  display: inline-block;
+  font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+}
+
+@mixin fa-icon-rotate($degrees, $rotation) {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation})";
+  -webkit-transform: rotate($degrees);
+      -ms-transform: rotate($degrees);
+          transform: rotate($degrees);
+}
+
+@mixin fa-icon-flip($horiz, $vert, $rotation) {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}, mirror=1)";
+  -webkit-transform: scale($horiz, $vert);
+      -ms-transform: scale($horiz, $vert);
+          transform: scale($horiz, $vert);
+}
+
+
+// Only display content to screen readers. A la Bootstrap 4.
+//
+// See: http://a11yproject.com/posts/how-to-hide-content/
+
+@mixin sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0,0,0,0);
+  border: 0;
+}
+
+// Use in conjunction with .sr-only to only display content when it's focused.
+//
+// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
+//
+// Credit: HTML5 Boilerplate
+
+@mixin sr-only-focusable {
+  &:active,
+  &:focus {
+    position: static;
+    width: auto;
+    height: auto;
+    margin: 0;
+    overflow: visible;
+    clip: auto;
+  }
+}
diff --git a/htdocs/includes/fontawesome/scss/_path.scss b/htdocs/includes/fontawesome/scss/_path.scss
new file mode 100644
index 00000000000..bb457c23a8e
--- /dev/null
+++ b/htdocs/includes/fontawesome/scss/_path.scss
@@ -0,0 +1,15 @@
+/* FONT PATH
+ * -------------------------- */
+
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}');
+  src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
+    url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'),
+    url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'),
+    url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
+    url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg');
+//  src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
+  font-weight: normal;
+  font-style: normal;
+}
diff --git a/htdocs/includes/fontawesome/scss/_rotated-flipped.scss b/htdocs/includes/fontawesome/scss/_rotated-flipped.scss
new file mode 100644
index 00000000000..a3558fd09ca
--- /dev/null
+++ b/htdocs/includes/fontawesome/scss/_rotated-flipped.scss
@@ -0,0 +1,20 @@
+// Rotated & Flipped Icons
+// -------------------------
+
+.#{$fa-css-prefix}-rotate-90  { @include fa-icon-rotate(90deg, 1);  }
+.#{$fa-css-prefix}-rotate-180 { @include fa-icon-rotate(180deg, 2); }
+.#{$fa-css-prefix}-rotate-270 { @include fa-icon-rotate(270deg, 3); }
+
+.#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); }
+.#{$fa-css-prefix}-flip-vertical   { @include fa-icon-flip(1, -1, 2); }
+
+// Hook for IE8-9
+// -------------------------
+
+:root .#{$fa-css-prefix}-rotate-90,
+:root .#{$fa-css-prefix}-rotate-180,
+:root .#{$fa-css-prefix}-rotate-270,
+:root .#{$fa-css-prefix}-flip-horizontal,
+:root .#{$fa-css-prefix}-flip-vertical {
+  filter: none;
+}
diff --git a/htdocs/includes/fontawesome/scss/_screen-reader.scss b/htdocs/includes/fontawesome/scss/_screen-reader.scss
new file mode 100644
index 00000000000..637426f0da6
--- /dev/null
+++ b/htdocs/includes/fontawesome/scss/_screen-reader.scss
@@ -0,0 +1,5 @@
+// Screen Readers
+// -------------------------
+
+.sr-only { @include sr-only(); }
+.sr-only-focusable { @include sr-only-focusable(); }
diff --git a/htdocs/includes/fontawesome/scss/_stacked.scss b/htdocs/includes/fontawesome/scss/_stacked.scss
new file mode 100644
index 00000000000..aef7403660c
--- /dev/null
+++ b/htdocs/includes/fontawesome/scss/_stacked.scss
@@ -0,0 +1,20 @@
+// Stacked Icons
+// -------------------------
+
+.#{$fa-css-prefix}-stack {
+  position: relative;
+  display: inline-block;
+  width: 2em;
+  height: 2em;
+  line-height: 2em;
+  vertical-align: middle;
+}
+.#{$fa-css-prefix}-stack-1x, .#{$fa-css-prefix}-stack-2x {
+  position: absolute;
+  left: 0;
+  width: 100%;
+  text-align: center;
+}
+.#{$fa-css-prefix}-stack-1x { line-height: inherit; }
+.#{$fa-css-prefix}-stack-2x { font-size: 2em; }
+.#{$fa-css-prefix}-inverse { color: $fa-inverse; }
diff --git a/htdocs/includes/fontawesome/scss/_variables.scss b/htdocs/includes/fontawesome/scss/_variables.scss
new file mode 100644
index 00000000000..498fc4a087c
--- /dev/null
+++ b/htdocs/includes/fontawesome/scss/_variables.scss
@@ -0,0 +1,800 @@
+// Variables
+// --------------------------
+
+$fa-font-path:        "../fonts" !default;
+$fa-font-size-base:   14px !default;
+$fa-line-height-base: 1 !default;
+//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.7.0/fonts" !default; // for referencing Bootstrap CDN font files directly
+$fa-css-prefix:       fa !default;
+$fa-version:          "4.7.0" !default;
+$fa-border-color:     #eee !default;
+$fa-inverse:          #fff !default;
+$fa-li-width:         (30em / 14) !default;
+
+$fa-var-500px: "\f26e";
+$fa-var-address-book: "\f2b9";
+$fa-var-address-book-o: "\f2ba";
+$fa-var-address-card: "\f2bb";
+$fa-var-address-card-o: "\f2bc";
+$fa-var-adjust: "\f042";
+$fa-var-adn: "\f170";
+$fa-var-align-center: "\f037";
+$fa-var-align-justify: "\f039";
+$fa-var-align-left: "\f036";
+$fa-var-align-right: "\f038";
+$fa-var-amazon: "\f270";
+$fa-var-ambulance: "\f0f9";
+$fa-var-american-sign-language-interpreting: "\f2a3";
+$fa-var-anchor: "\f13d";
+$fa-var-android: "\f17b";
+$fa-var-angellist: "\f209";
+$fa-var-angle-double-down: "\f103";
+$fa-var-angle-double-left: "\f100";
+$fa-var-angle-double-right: "\f101";
+$fa-var-angle-double-up: "\f102";
+$fa-var-angle-down: "\f107";
+$fa-var-angle-left: "\f104";
+$fa-var-angle-right: "\f105";
+$fa-var-angle-up: "\f106";
+$fa-var-apple: "\f179";
+$fa-var-archive: "\f187";
+$fa-var-area-chart: "\f1fe";
+$fa-var-arrow-circle-down: "\f0ab";
+$fa-var-arrow-circle-left: "\f0a8";
+$fa-var-arrow-circle-o-down: "\f01a";
+$fa-var-arrow-circle-o-left: "\f190";
+$fa-var-arrow-circle-o-right: "\f18e";
+$fa-var-arrow-circle-o-up: "\f01b";
+$fa-var-arrow-circle-right: "\f0a9";
+$fa-var-arrow-circle-up: "\f0aa";
+$fa-var-arrow-down: "\f063";
+$fa-var-arrow-left: "\f060";
+$fa-var-arrow-right: "\f061";
+$fa-var-arrow-up: "\f062";
+$fa-var-arrows: "\f047";
+$fa-var-arrows-alt: "\f0b2";
+$fa-var-arrows-h: "\f07e";
+$fa-var-arrows-v: "\f07d";
+$fa-var-asl-interpreting: "\f2a3";
+$fa-var-assistive-listening-systems: "\f2a2";
+$fa-var-asterisk: "\f069";
+$fa-var-at: "\f1fa";
+$fa-var-audio-description: "\f29e";
+$fa-var-automobile: "\f1b9";
+$fa-var-backward: "\f04a";
+$fa-var-balance-scale: "\f24e";
+$fa-var-ban: "\f05e";
+$fa-var-bandcamp: "\f2d5";
+$fa-var-bank: "\f19c";
+$fa-var-bar-chart: "\f080";
+$fa-var-bar-chart-o: "\f080";
+$fa-var-barcode: "\f02a";
+$fa-var-bars: "\f0c9";
+$fa-var-bath: "\f2cd";
+$fa-var-bathtub: "\f2cd";
+$fa-var-battery: "\f240";
+$fa-var-battery-0: "\f244";
+$fa-var-battery-1: "\f243";
+$fa-var-battery-2: "\f242";
+$fa-var-battery-3: "\f241";
+$fa-var-battery-4: "\f240";
+$fa-var-battery-empty: "\f244";
+$fa-var-battery-full: "\f240";
+$fa-var-battery-half: "\f242";
+$fa-var-battery-quarter: "\f243";
+$fa-var-battery-three-quarters: "\f241";
+$fa-var-bed: "\f236";
+$fa-var-beer: "\f0fc";
+$fa-var-behance: "\f1b4";
+$fa-var-behance-square: "\f1b5";
+$fa-var-bell: "\f0f3";
+$fa-var-bell-o: "\f0a2";
+$fa-var-bell-slash: "\f1f6";
+$fa-var-bell-slash-o: "\f1f7";
+$fa-var-bicycle: "\f206";
+$fa-var-binoculars: "\f1e5";
+$fa-var-birthday-cake: "\f1fd";
+$fa-var-bitbucket: "\f171";
+$fa-var-bitbucket-square: "\f172";
+$fa-var-bitcoin: "\f15a";
+$fa-var-black-tie: "\f27e";
+$fa-var-blind: "\f29d";
+$fa-var-bluetooth: "\f293";
+$fa-var-bluetooth-b: "\f294";
+$fa-var-bold: "\f032";
+$fa-var-bolt: "\f0e7";
+$fa-var-bomb: "\f1e2";
+$fa-var-book: "\f02d";
+$fa-var-bookmark: "\f02e";
+$fa-var-bookmark-o: "\f097";
+$fa-var-braille: "\f2a1";
+$fa-var-briefcase: "\f0b1";
+$fa-var-btc: "\f15a";
+$fa-var-bug: "\f188";
+$fa-var-building: "\f1ad";
+$fa-var-building-o: "\f0f7";
+$fa-var-bullhorn: "\f0a1";
+$fa-var-bullseye: "\f140";
+$fa-var-bus: "\f207";
+$fa-var-buysellads: "\f20d";
+$fa-var-cab: "\f1ba";
+$fa-var-calculator: "\f1ec";
+$fa-var-calendar: "\f073";
+$fa-var-calendar-check-o: "\f274";
+$fa-var-calendar-minus-o: "\f272";
+$fa-var-calendar-o: "\f133";
+$fa-var-calendar-plus-o: "\f271";
+$fa-var-calendar-times-o: "\f273";
+$fa-var-camera: "\f030";
+$fa-var-camera-retro: "\f083";
+$fa-var-car: "\f1b9";
+$fa-var-caret-down: "\f0d7";
+$fa-var-caret-left: "\f0d9";
+$fa-var-caret-right: "\f0da";
+$fa-var-caret-square-o-down: "\f150";
+$fa-var-caret-square-o-left: "\f191";
+$fa-var-caret-square-o-right: "\f152";
+$fa-var-caret-square-o-up: "\f151";
+$fa-var-caret-up: "\f0d8";
+$fa-var-cart-arrow-down: "\f218";
+$fa-var-cart-plus: "\f217";
+$fa-var-cc: "\f20a";
+$fa-var-cc-amex: "\f1f3";
+$fa-var-cc-diners-club: "\f24c";
+$fa-var-cc-discover: "\f1f2";
+$fa-var-cc-jcb: "\f24b";
+$fa-var-cc-mastercard: "\f1f1";
+$fa-var-cc-paypal: "\f1f4";
+$fa-var-cc-stripe: "\f1f5";
+$fa-var-cc-visa: "\f1f0";
+$fa-var-certificate: "\f0a3";
+$fa-var-chain: "\f0c1";
+$fa-var-chain-broken: "\f127";
+$fa-var-check: "\f00c";
+$fa-var-check-circle: "\f058";
+$fa-var-check-circle-o: "\f05d";
+$fa-var-check-square: "\f14a";
+$fa-var-check-square-o: "\f046";
+$fa-var-chevron-circle-down: "\f13a";
+$fa-var-chevron-circle-left: "\f137";
+$fa-var-chevron-circle-right: "\f138";
+$fa-var-chevron-circle-up: "\f139";
+$fa-var-chevron-down: "\f078";
+$fa-var-chevron-left: "\f053";
+$fa-var-chevron-right: "\f054";
+$fa-var-chevron-up: "\f077";
+$fa-var-child: "\f1ae";
+$fa-var-chrome: "\f268";
+$fa-var-circle: "\f111";
+$fa-var-circle-o: "\f10c";
+$fa-var-circle-o-notch: "\f1ce";
+$fa-var-circle-thin: "\f1db";
+$fa-var-clipboard: "\f0ea";
+$fa-var-clock-o: "\f017";
+$fa-var-clone: "\f24d";
+$fa-var-close: "\f00d";
+$fa-var-cloud: "\f0c2";
+$fa-var-cloud-download: "\f0ed";
+$fa-var-cloud-upload: "\f0ee";
+$fa-var-cny: "\f157";
+$fa-var-code: "\f121";
+$fa-var-code-fork: "\f126";
+$fa-var-codepen: "\f1cb";
+$fa-var-codiepie: "\f284";
+$fa-var-coffee: "\f0f4";
+$fa-var-cog: "\f013";
+$fa-var-cogs: "\f085";
+$fa-var-columns: "\f0db";
+$fa-var-comment: "\f075";
+$fa-var-comment-o: "\f0e5";
+$fa-var-commenting: "\f27a";
+$fa-var-commenting-o: "\f27b";
+$fa-var-comments: "\f086";
+$fa-var-comments-o: "\f0e6";
+$fa-var-compass: "\f14e";
+$fa-var-compress: "\f066";
+$fa-var-connectdevelop: "\f20e";
+$fa-var-contao: "\f26d";
+$fa-var-copy: "\f0c5";
+$fa-var-copyright: "\f1f9";
+$fa-var-creative-commons: "\f25e";
+$fa-var-credit-card: "\f09d";
+$fa-var-credit-card-alt: "\f283";
+$fa-var-crop: "\f125";
+$fa-var-crosshairs: "\f05b";
+$fa-var-css3: "\f13c";
+$fa-var-cube: "\f1b2";
+$fa-var-cubes: "\f1b3";
+$fa-var-cut: "\f0c4";
+$fa-var-cutlery: "\f0f5";
+$fa-var-dashboard: "\f0e4";
+$fa-var-dashcube: "\f210";
+$fa-var-database: "\f1c0";
+$fa-var-deaf: "\f2a4";
+$fa-var-deafness: "\f2a4";
+$fa-var-dedent: "\f03b";
+$fa-var-delicious: "\f1a5";
+$fa-var-desktop: "\f108";
+$fa-var-deviantart: "\f1bd";
+$fa-var-diamond: "\f219";
+$fa-var-digg: "\f1a6";
+$fa-var-dollar: "\f155";
+$fa-var-dot-circle-o: "\f192";
+$fa-var-download: "\f019";
+$fa-var-dribbble: "\f17d";
+$fa-var-drivers-license: "\f2c2";
+$fa-var-drivers-license-o: "\f2c3";
+$fa-var-dropbox: "\f16b";
+$fa-var-drupal: "\f1a9";
+$fa-var-edge: "\f282";
+$fa-var-edit: "\f044";
+$fa-var-eercast: "\f2da";
+$fa-var-eject: "\f052";
+$fa-var-ellipsis-h: "\f141";
+$fa-var-ellipsis-v: "\f142";
+$fa-var-empire: "\f1d1";
+$fa-var-envelope: "\f0e0";
+$fa-var-envelope-o: "\f003";
+$fa-var-envelope-open: "\f2b6";
+$fa-var-envelope-open-o: "\f2b7";
+$fa-var-envelope-square: "\f199";
+$fa-var-envira: "\f299";
+$fa-var-eraser: "\f12d";
+$fa-var-etsy: "\f2d7";
+$fa-var-eur: "\f153";
+$fa-var-euro: "\f153";
+$fa-var-exchange: "\f0ec";
+$fa-var-exclamation: "\f12a";
+$fa-var-exclamation-circle: "\f06a";
+$fa-var-exclamation-triangle: "\f071";
+$fa-var-expand: "\f065";
+$fa-var-expeditedssl: "\f23e";
+$fa-var-external-link: "\f08e";
+$fa-var-external-link-square: "\f14c";
+$fa-var-eye: "\f06e";
+$fa-var-eye-slash: "\f070";
+$fa-var-eyedropper: "\f1fb";
+$fa-var-fa: "\f2b4";
+$fa-var-facebook: "\f09a";
+$fa-var-facebook-f: "\f09a";
+$fa-var-facebook-official: "\f230";
+$fa-var-facebook-square: "\f082";
+$fa-var-fast-backward: "\f049";
+$fa-var-fast-forward: "\f050";
+$fa-var-fax: "\f1ac";
+$fa-var-feed: "\f09e";
+$fa-var-female: "\f182";
+$fa-var-fighter-jet: "\f0fb";
+$fa-var-file: "\f15b";
+$fa-var-file-archive-o: "\f1c6";
+$fa-var-file-audio-o: "\f1c7";
+$fa-var-file-code-o: "\f1c9";
+$fa-var-file-excel-o: "\f1c3";
+$fa-var-file-image-o: "\f1c5";
+$fa-var-file-movie-o: "\f1c8";
+$fa-var-file-o: "\f016";
+$fa-var-file-pdf-o: "\f1c1";
+$fa-var-file-photo-o: "\f1c5";
+$fa-var-file-picture-o: "\f1c5";
+$fa-var-file-powerpoint-o: "\f1c4";
+$fa-var-file-sound-o: "\f1c7";
+$fa-var-file-text: "\f15c";
+$fa-var-file-text-o: "\f0f6";
+$fa-var-file-video-o: "\f1c8";
+$fa-var-file-word-o: "\f1c2";
+$fa-var-file-zip-o: "\f1c6";
+$fa-var-files-o: "\f0c5";
+$fa-var-film: "\f008";
+$fa-var-filter: "\f0b0";
+$fa-var-fire: "\f06d";
+$fa-var-fire-extinguisher: "\f134";
+$fa-var-firefox: "\f269";
+$fa-var-first-order: "\f2b0";
+$fa-var-flag: "\f024";
+$fa-var-flag-checkered: "\f11e";
+$fa-var-flag-o: "\f11d";
+$fa-var-flash: "\f0e7";
+$fa-var-flask: "\f0c3";
+$fa-var-flickr: "\f16e";
+$fa-var-floppy-o: "\f0c7";
+$fa-var-folder: "\f07b";
+$fa-var-folder-o: "\f114";
+$fa-var-folder-open: "\f07c";
+$fa-var-folder-open-o: "\f115";
+$fa-var-font: "\f031";
+$fa-var-font-awesome: "\f2b4";
+$fa-var-fonticons: "\f280";
+$fa-var-fort-awesome: "\f286";
+$fa-var-forumbee: "\f211";
+$fa-var-forward: "\f04e";
+$fa-var-foursquare: "\f180";
+$fa-var-free-code-camp: "\f2c5";
+$fa-var-frown-o: "\f119";
+$fa-var-futbol-o: "\f1e3";
+$fa-var-gamepad: "\f11b";
+$fa-var-gavel: "\f0e3";
+$fa-var-gbp: "\f154";
+$fa-var-ge: "\f1d1";
+$fa-var-gear: "\f013";
+$fa-var-gears: "\f085";
+$fa-var-genderless: "\f22d";
+$fa-var-get-pocket: "\f265";
+$fa-var-gg: "\f260";
+$fa-var-gg-circle: "\f261";
+$fa-var-gift: "\f06b";
+$fa-var-git: "\f1d3";
+$fa-var-git-square: "\f1d2";
+$fa-var-github: "\f09b";
+$fa-var-github-alt: "\f113";
+$fa-var-github-square: "\f092";
+$fa-var-gitlab: "\f296";
+$fa-var-gittip: "\f184";
+$fa-var-glass: "\f000";
+$fa-var-glide: "\f2a5";
+$fa-var-glide-g: "\f2a6";
+$fa-var-globe: "\f0ac";
+$fa-var-google: "\f1a0";
+$fa-var-google-plus: "\f0d5";
+$fa-var-google-plus-circle: "\f2b3";
+$fa-var-google-plus-official: "\f2b3";
+$fa-var-google-plus-square: "\f0d4";
+$fa-var-google-wallet: "\f1ee";
+$fa-var-graduation-cap: "\f19d";
+$fa-var-gratipay: "\f184";
+$fa-var-grav: "\f2d6";
+$fa-var-group: "\f0c0";
+$fa-var-h-square: "\f0fd";
+$fa-var-hacker-news: "\f1d4";
+$fa-var-hand-grab-o: "\f255";
+$fa-var-hand-lizard-o: "\f258";
+$fa-var-hand-o-down: "\f0a7";
+$fa-var-hand-o-left: "\f0a5";
+$fa-var-hand-o-right: "\f0a4";
+$fa-var-hand-o-up: "\f0a6";
+$fa-var-hand-paper-o: "\f256";
+$fa-var-hand-peace-o: "\f25b";
+$fa-var-hand-pointer-o: "\f25a";
+$fa-var-hand-rock-o: "\f255";
+$fa-var-hand-scissors-o: "\f257";
+$fa-var-hand-spock-o: "\f259";
+$fa-var-hand-stop-o: "\f256";
+$fa-var-handshake-o: "\f2b5";
+$fa-var-hard-of-hearing: "\f2a4";
+$fa-var-hashtag: "\f292";
+$fa-var-hdd-o: "\f0a0";
+$fa-var-header: "\f1dc";
+$fa-var-headphones: "\f025";
+$fa-var-heart: "\f004";
+$fa-var-heart-o: "\f08a";
+$fa-var-heartbeat: "\f21e";
+$fa-var-history: "\f1da";
+$fa-var-home: "\f015";
+$fa-var-hospital-o: "\f0f8";
+$fa-var-hotel: "\f236";
+$fa-var-hourglass: "\f254";
+$fa-var-hourglass-1: "\f251";
+$fa-var-hourglass-2: "\f252";
+$fa-var-hourglass-3: "\f253";
+$fa-var-hourglass-end: "\f253";
+$fa-var-hourglass-half: "\f252";
+$fa-var-hourglass-o: "\f250";
+$fa-var-hourglass-start: "\f251";
+$fa-var-houzz: "\f27c";
+$fa-var-html5: "\f13b";
+$fa-var-i-cursor: "\f246";
+$fa-var-id-badge: "\f2c1";
+$fa-var-id-card: "\f2c2";
+$fa-var-id-card-o: "\f2c3";
+$fa-var-ils: "\f20b";
+$fa-var-image: "\f03e";
+$fa-var-imdb: "\f2d8";
+$fa-var-inbox: "\f01c";
+$fa-var-indent: "\f03c";
+$fa-var-industry: "\f275";
+$fa-var-info: "\f129";
+$fa-var-info-circle: "\f05a";
+$fa-var-inr: "\f156";
+$fa-var-instagram: "\f16d";
+$fa-var-institution: "\f19c";
+$fa-var-internet-explorer: "\f26b";
+$fa-var-intersex: "\f224";
+$fa-var-ioxhost: "\f208";
+$fa-var-italic: "\f033";
+$fa-var-joomla: "\f1aa";
+$fa-var-jpy: "\f157";
+$fa-var-jsfiddle: "\f1cc";
+$fa-var-key: "\f084";
+$fa-var-keyboard-o: "\f11c";
+$fa-var-krw: "\f159";
+$fa-var-language: "\f1ab";
+$fa-var-laptop: "\f109";
+$fa-var-lastfm: "\f202";
+$fa-var-lastfm-square: "\f203";
+$fa-var-leaf: "\f06c";
+$fa-var-leanpub: "\f212";
+$fa-var-legal: "\f0e3";
+$fa-var-lemon-o: "\f094";
+$fa-var-level-down: "\f149";
+$fa-var-level-up: "\f148";
+$fa-var-life-bouy: "\f1cd";
+$fa-var-life-buoy: "\f1cd";
+$fa-var-life-ring: "\f1cd";
+$fa-var-life-saver: "\f1cd";
+$fa-var-lightbulb-o: "\f0eb";
+$fa-var-line-chart: "\f201";
+$fa-var-link: "\f0c1";
+$fa-var-linkedin: "\f0e1";
+$fa-var-linkedin-square: "\f08c";
+$fa-var-linode: "\f2b8";
+$fa-var-linux: "\f17c";
+$fa-var-list: "\f03a";
+$fa-var-list-alt: "\f022";
+$fa-var-list-ol: "\f0cb";
+$fa-var-list-ul: "\f0ca";
+$fa-var-location-arrow: "\f124";
+$fa-var-lock: "\f023";
+$fa-var-long-arrow-down: "\f175";
+$fa-var-long-arrow-left: "\f177";
+$fa-var-long-arrow-right: "\f178";
+$fa-var-long-arrow-up: "\f176";
+$fa-var-low-vision: "\f2a8";
+$fa-var-magic: "\f0d0";
+$fa-var-magnet: "\f076";
+$fa-var-mail-forward: "\f064";
+$fa-var-mail-reply: "\f112";
+$fa-var-mail-reply-all: "\f122";
+$fa-var-male: "\f183";
+$fa-var-map: "\f279";
+$fa-var-map-marker: "\f041";
+$fa-var-map-o: "\f278";
+$fa-var-map-pin: "\f276";
+$fa-var-map-signs: "\f277";
+$fa-var-mars: "\f222";
+$fa-var-mars-double: "\f227";
+$fa-var-mars-stroke: "\f229";
+$fa-var-mars-stroke-h: "\f22b";
+$fa-var-mars-stroke-v: "\f22a";
+$fa-var-maxcdn: "\f136";
+$fa-var-meanpath: "\f20c";
+$fa-var-medium: "\f23a";
+$fa-var-medkit: "\f0fa";
+$fa-var-meetup: "\f2e0";
+$fa-var-meh-o: "\f11a";
+$fa-var-mercury: "\f223";
+$fa-var-microchip: "\f2db";
+$fa-var-microphone: "\f130";
+$fa-var-microphone-slash: "\f131";
+$fa-var-minus: "\f068";
+$fa-var-minus-circle: "\f056";
+$fa-var-minus-square: "\f146";
+$fa-var-minus-square-o: "\f147";
+$fa-var-mixcloud: "\f289";
+$fa-var-mobile: "\f10b";
+$fa-var-mobile-phone: "\f10b";
+$fa-var-modx: "\f285";
+$fa-var-money: "\f0d6";
+$fa-var-moon-o: "\f186";
+$fa-var-mortar-board: "\f19d";
+$fa-var-motorcycle: "\f21c";
+$fa-var-mouse-pointer: "\f245";
+$fa-var-music: "\f001";
+$fa-var-navicon: "\f0c9";
+$fa-var-neuter: "\f22c";
+$fa-var-newspaper-o: "\f1ea";
+$fa-var-object-group: "\f247";
+$fa-var-object-ungroup: "\f248";
+$fa-var-odnoklassniki: "\f263";
+$fa-var-odnoklassniki-square: "\f264";
+$fa-var-opencart: "\f23d";
+$fa-var-openid: "\f19b";
+$fa-var-opera: "\f26a";
+$fa-var-optin-monster: "\f23c";
+$fa-var-outdent: "\f03b";
+$fa-var-pagelines: "\f18c";
+$fa-var-paint-brush: "\f1fc";
+$fa-var-paper-plane: "\f1d8";
+$fa-var-paper-plane-o: "\f1d9";
+$fa-var-paperclip: "\f0c6";
+$fa-var-paragraph: "\f1dd";
+$fa-var-paste: "\f0ea";
+$fa-var-pause: "\f04c";
+$fa-var-pause-circle: "\f28b";
+$fa-var-pause-circle-o: "\f28c";
+$fa-var-paw: "\f1b0";
+$fa-var-paypal: "\f1ed";
+$fa-var-pencil: "\f040";
+$fa-var-pencil-square: "\f14b";
+$fa-var-pencil-square-o: "\f044";
+$fa-var-percent: "\f295";
+$fa-var-phone: "\f095";
+$fa-var-phone-square: "\f098";
+$fa-var-photo: "\f03e";
+$fa-var-picture-o: "\f03e";
+$fa-var-pie-chart: "\f200";
+$fa-var-pied-piper: "\f2ae";
+$fa-var-pied-piper-alt: "\f1a8";
+$fa-var-pied-piper-pp: "\f1a7";
+$fa-var-pinterest: "\f0d2";
+$fa-var-pinterest-p: "\f231";
+$fa-var-pinterest-square: "\f0d3";
+$fa-var-plane: "\f072";
+$fa-var-play: "\f04b";
+$fa-var-play-circle: "\f144";
+$fa-var-play-circle-o: "\f01d";
+$fa-var-plug: "\f1e6";
+$fa-var-plus: "\f067";
+$fa-var-plus-circle: "\f055";
+$fa-var-plus-square: "\f0fe";
+$fa-var-plus-square-o: "\f196";
+$fa-var-podcast: "\f2ce";
+$fa-var-power-off: "\f011";
+$fa-var-print: "\f02f";
+$fa-var-product-hunt: "\f288";
+$fa-var-puzzle-piece: "\f12e";
+$fa-var-qq: "\f1d6";
+$fa-var-qrcode: "\f029";
+$fa-var-question: "\f128";
+$fa-var-question-circle: "\f059";
+$fa-var-question-circle-o: "\f29c";
+$fa-var-quora: "\f2c4";
+$fa-var-quote-left: "\f10d";
+$fa-var-quote-right: "\f10e";
+$fa-var-ra: "\f1d0";
+$fa-var-random: "\f074";
+$fa-var-ravelry: "\f2d9";
+$fa-var-rebel: "\f1d0";
+$fa-var-recycle: "\f1b8";
+$fa-var-reddit: "\f1a1";
+$fa-var-reddit-alien: "\f281";
+$fa-var-reddit-square: "\f1a2";
+$fa-var-refresh: "\f021";
+$fa-var-registered: "\f25d";
+$fa-var-remove: "\f00d";
+$fa-var-renren: "\f18b";
+$fa-var-reorder: "\f0c9";
+$fa-var-repeat: "\f01e";
+$fa-var-reply: "\f112";
+$fa-var-reply-all: "\f122";
+$fa-var-resistance: "\f1d0";
+$fa-var-retweet: "\f079";
+$fa-var-rmb: "\f157";
+$fa-var-road: "\f018";
+$fa-var-rocket: "\f135";
+$fa-var-rotate-left: "\f0e2";
+$fa-var-rotate-right: "\f01e";
+$fa-var-rouble: "\f158";
+$fa-var-rss: "\f09e";
+$fa-var-rss-square: "\f143";
+$fa-var-rub: "\f158";
+$fa-var-ruble: "\f158";
+$fa-var-rupee: "\f156";
+$fa-var-s15: "\f2cd";
+$fa-var-safari: "\f267";
+$fa-var-save: "\f0c7";
+$fa-var-scissors: "\f0c4";
+$fa-var-scribd: "\f28a";
+$fa-var-search: "\f002";
+$fa-var-search-minus: "\f010";
+$fa-var-search-plus: "\f00e";
+$fa-var-sellsy: "\f213";
+$fa-var-send: "\f1d8";
+$fa-var-send-o: "\f1d9";
+$fa-var-server: "\f233";
+$fa-var-share: "\f064";
+$fa-var-share-alt: "\f1e0";
+$fa-var-share-alt-square: "\f1e1";
+$fa-var-share-square: "\f14d";
+$fa-var-share-square-o: "\f045";
+$fa-var-shekel: "\f20b";
+$fa-var-sheqel: "\f20b";
+$fa-var-shield: "\f132";
+$fa-var-ship: "\f21a";
+$fa-var-shirtsinbulk: "\f214";
+$fa-var-shopping-bag: "\f290";
+$fa-var-shopping-basket: "\f291";
+$fa-var-shopping-cart: "\f07a";
+$fa-var-shower: "\f2cc";
+$fa-var-sign-in: "\f090";
+$fa-var-sign-language: "\f2a7";
+$fa-var-sign-out: "\f08b";
+$fa-var-signal: "\f012";
+$fa-var-signing: "\f2a7";
+$fa-var-simplybuilt: "\f215";
+$fa-var-sitemap: "\f0e8";
+$fa-var-skyatlas: "\f216";
+$fa-var-skype: "\f17e";
+$fa-var-slack: "\f198";
+$fa-var-sliders: "\f1de";
+$fa-var-slideshare: "\f1e7";
+$fa-var-smile-o: "\f118";
+$fa-var-snapchat: "\f2ab";
+$fa-var-snapchat-ghost: "\f2ac";
+$fa-var-snapchat-square: "\f2ad";
+$fa-var-snowflake-o: "\f2dc";
+$fa-var-soccer-ball-o: "\f1e3";
+$fa-var-sort: "\f0dc";
+$fa-var-sort-alpha-asc: "\f15d";
+$fa-var-sort-alpha-desc: "\f15e";
+$fa-var-sort-amount-asc: "\f160";
+$fa-var-sort-amount-desc: "\f161";
+$fa-var-sort-asc: "\f0de";
+$fa-var-sort-desc: "\f0dd";
+$fa-var-sort-down: "\f0dd";
+$fa-var-sort-numeric-asc: "\f162";
+$fa-var-sort-numeric-desc: "\f163";
+$fa-var-sort-up: "\f0de";
+$fa-var-soundcloud: "\f1be";
+$fa-var-space-shuttle: "\f197";
+$fa-var-spinner: "\f110";
+$fa-var-spoon: "\f1b1";
+$fa-var-spotify: "\f1bc";
+$fa-var-square: "\f0c8";
+$fa-var-square-o: "\f096";
+$fa-var-stack-exchange: "\f18d";
+$fa-var-stack-overflow: "\f16c";
+$fa-var-star: "\f005";
+$fa-var-star-half: "\f089";
+$fa-var-star-half-empty: "\f123";
+$fa-var-star-half-full: "\f123";
+$fa-var-star-half-o: "\f123";
+$fa-var-star-o: "\f006";
+$fa-var-steam: "\f1b6";
+$fa-var-steam-square: "\f1b7";
+$fa-var-step-backward: "\f048";
+$fa-var-step-forward: "\f051";
+$fa-var-stethoscope: "\f0f1";
+$fa-var-sticky-note: "\f249";
+$fa-var-sticky-note-o: "\f24a";
+$fa-var-stop: "\f04d";
+$fa-var-stop-circle: "\f28d";
+$fa-var-stop-circle-o: "\f28e";
+$fa-var-street-view: "\f21d";
+$fa-var-strikethrough: "\f0cc";
+$fa-var-stumbleupon: "\f1a4";
+$fa-var-stumbleupon-circle: "\f1a3";
+$fa-var-subscript: "\f12c";
+$fa-var-subway: "\f239";
+$fa-var-suitcase: "\f0f2";
+$fa-var-sun-o: "\f185";
+$fa-var-superpowers: "\f2dd";
+$fa-var-superscript: "\f12b";
+$fa-var-support: "\f1cd";
+$fa-var-table: "\f0ce";
+$fa-var-tablet: "\f10a";
+$fa-var-tachometer: "\f0e4";
+$fa-var-tag: "\f02b";
+$fa-var-tags: "\f02c";
+$fa-var-tasks: "\f0ae";
+$fa-var-taxi: "\f1ba";
+$fa-var-telegram: "\f2c6";
+$fa-var-television: "\f26c";
+$fa-var-tencent-weibo: "\f1d5";
+$fa-var-terminal: "\f120";
+$fa-var-text-height: "\f034";
+$fa-var-text-width: "\f035";
+$fa-var-th: "\f00a";
+$fa-var-th-large: "\f009";
+$fa-var-th-list: "\f00b";
+$fa-var-themeisle: "\f2b2";
+$fa-var-thermometer: "\f2c7";
+$fa-var-thermometer-0: "\f2cb";
+$fa-var-thermometer-1: "\f2ca";
+$fa-var-thermometer-2: "\f2c9";
+$fa-var-thermometer-3: "\f2c8";
+$fa-var-thermometer-4: "\f2c7";
+$fa-var-thermometer-empty: "\f2cb";
+$fa-var-thermometer-full: "\f2c7";
+$fa-var-thermometer-half: "\f2c9";
+$fa-var-thermometer-quarter: "\f2ca";
+$fa-var-thermometer-three-quarters: "\f2c8";
+$fa-var-thumb-tack: "\f08d";
+$fa-var-thumbs-down: "\f165";
+$fa-var-thumbs-o-down: "\f088";
+$fa-var-thumbs-o-up: "\f087";
+$fa-var-thumbs-up: "\f164";
+$fa-var-ticket: "\f145";
+$fa-var-times: "\f00d";
+$fa-var-times-circle: "\f057";
+$fa-var-times-circle-o: "\f05c";
+$fa-var-times-rectangle: "\f2d3";
+$fa-var-times-rectangle-o: "\f2d4";
+$fa-var-tint: "\f043";
+$fa-var-toggle-down: "\f150";
+$fa-var-toggle-left: "\f191";
+$fa-var-toggle-off: "\f204";
+$fa-var-toggle-on: "\f205";
+$fa-var-toggle-right: "\f152";
+$fa-var-toggle-up: "\f151";
+$fa-var-trademark: "\f25c";
+$fa-var-train: "\f238";
+$fa-var-transgender: "\f224";
+$fa-var-transgender-alt: "\f225";
+$fa-var-trash: "\f1f8";
+$fa-var-trash-o: "\f014";
+$fa-var-tree: "\f1bb";
+$fa-var-trello: "\f181";
+$fa-var-tripadvisor: "\f262";
+$fa-var-trophy: "\f091";
+$fa-var-truck: "\f0d1";
+$fa-var-try: "\f195";
+$fa-var-tty: "\f1e4";
+$fa-var-tumblr: "\f173";
+$fa-var-tumblr-square: "\f174";
+$fa-var-turkish-lira: "\f195";
+$fa-var-tv: "\f26c";
+$fa-var-twitch: "\f1e8";
+$fa-var-twitter: "\f099";
+$fa-var-twitter-square: "\f081";
+$fa-var-umbrella: "\f0e9";
+$fa-var-underline: "\f0cd";
+$fa-var-undo: "\f0e2";
+$fa-var-universal-access: "\f29a";
+$fa-var-university: "\f19c";
+$fa-var-unlink: "\f127";
+$fa-var-unlock: "\f09c";
+$fa-var-unlock-alt: "\f13e";
+$fa-var-unsorted: "\f0dc";
+$fa-var-upload: "\f093";
+$fa-var-usb: "\f287";
+$fa-var-usd: "\f155";
+$fa-var-user: "\f007";
+$fa-var-user-circle: "\f2bd";
+$fa-var-user-circle-o: "\f2be";
+$fa-var-user-md: "\f0f0";
+$fa-var-user-o: "\f2c0";
+$fa-var-user-plus: "\f234";
+$fa-var-user-secret: "\f21b";
+$fa-var-user-times: "\f235";
+$fa-var-users: "\f0c0";
+$fa-var-vcard: "\f2bb";
+$fa-var-vcard-o: "\f2bc";
+$fa-var-venus: "\f221";
+$fa-var-venus-double: "\f226";
+$fa-var-venus-mars: "\f228";
+$fa-var-viacoin: "\f237";
+$fa-var-viadeo: "\f2a9";
+$fa-var-viadeo-square: "\f2aa";
+$fa-var-video-camera: "\f03d";
+$fa-var-vimeo: "\f27d";
+$fa-var-vimeo-square: "\f194";
+$fa-var-vine: "\f1ca";
+$fa-var-vk: "\f189";
+$fa-var-volume-control-phone: "\f2a0";
+$fa-var-volume-down: "\f027";
+$fa-var-volume-off: "\f026";
+$fa-var-volume-up: "\f028";
+$fa-var-warning: "\f071";
+$fa-var-wechat: "\f1d7";
+$fa-var-weibo: "\f18a";
+$fa-var-weixin: "\f1d7";
+$fa-var-whatsapp: "\f232";
+$fa-var-wheelchair: "\f193";
+$fa-var-wheelchair-alt: "\f29b";
+$fa-var-wifi: "\f1eb";
+$fa-var-wikipedia-w: "\f266";
+$fa-var-window-close: "\f2d3";
+$fa-var-window-close-o: "\f2d4";
+$fa-var-window-maximize: "\f2d0";
+$fa-var-window-minimize: "\f2d1";
+$fa-var-window-restore: "\f2d2";
+$fa-var-windows: "\f17a";
+$fa-var-won: "\f159";
+$fa-var-wordpress: "\f19a";
+$fa-var-wpbeginner: "\f297";
+$fa-var-wpexplorer: "\f2de";
+$fa-var-wpforms: "\f298";
+$fa-var-wrench: "\f0ad";
+$fa-var-xing: "\f168";
+$fa-var-xing-square: "\f169";
+$fa-var-y-combinator: "\f23b";
+$fa-var-y-combinator-square: "\f1d4";
+$fa-var-yahoo: "\f19e";
+$fa-var-yc: "\f23b";
+$fa-var-yc-square: "\f1d4";
+$fa-var-yelp: "\f1e9";
+$fa-var-yen: "\f157";
+$fa-var-yoast: "\f2b1";
+$fa-var-youtube: "\f167";
+$fa-var-youtube-play: "\f16a";
+$fa-var-youtube-square: "\f166";
+
diff --git a/htdocs/includes/fontawesome/scss/font-awesome.scss b/htdocs/includes/fontawesome/scss/font-awesome.scss
new file mode 100644
index 00000000000..f1c83aaa5d2
--- /dev/null
+++ b/htdocs/includes/fontawesome/scss/font-awesome.scss
@@ -0,0 +1,18 @@
+/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+
+@import "variables";
+@import "mixins";
+@import "path";
+@import "core";
+@import "larger";
+@import "fixed-width";
+@import "list";
+@import "bordered-pulled";
+@import "animated";
+@import "rotated-flipped";
+@import "stacked";
+@import "icons";
+@import "screen-reader";

From 559478048c6bca0752ec0badaacd2ed051052e2a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2017 14:38:20 +0100
Subject: [PATCH 0307/1163] Move resources for theme at a batter place

---
 .../common}/fontawesome/.gitignore                  |   0
 .../common}/fontawesome/.npmignore                  |   0
 .../common}/fontawesome/CONTRIBUTING.md             |   0
 .../{includes => theme/common}/fontawesome/Gemfile  |   0
 .../common}/fontawesome/Gemfile.lock                |   0
 .../common}/fontawesome/HELP-US-OUT.txt             |   0
 .../common}/fontawesome/README.md                   |   0
 .../common}/fontawesome/_config.yml                 |   0
 .../common}/fontawesome/bower.json                  |   0
 .../common}/fontawesome/component.json              |   0
 .../common}/fontawesome/composer.json               |   0
 .../common}/fontawesome/css/font-awesome.css        |   0
 .../common}/fontawesome/css/font-awesome.css.map    |   0
 .../common}/fontawesome/css/font-awesome.min.css    |   0
 .../common}/fontawesome/fonts/FontAwesome.otf       | Bin
 .../fontawesome/fonts/fontawesome-webfont.eot       | Bin
 .../fontawesome/fonts/fontawesome-webfont.svg       |   0
 .../fontawesome/fonts/fontawesome-webfont.ttf       | Bin
 .../fontawesome/fonts/fontawesome-webfont.woff      | Bin
 .../fontawesome/fonts/fontawesome-webfont.woff2     | Bin
 .../common}/fontawesome/less/animated.less          |   0
 .../common}/fontawesome/less/bordered-pulled.less   |   0
 .../common}/fontawesome/less/core.less              |   0
 .../common}/fontawesome/less/fixed-width.less       |   0
 .../common}/fontawesome/less/font-awesome.less      |   0
 .../common}/fontawesome/less/icons.less             |   0
 .../common}/fontawesome/less/larger.less            |   0
 .../common}/fontawesome/less/list.less              |   0
 .../common}/fontawesome/less/mixins.less            |   0
 .../common}/fontawesome/less/path.less              |   0
 .../common}/fontawesome/less/rotated-flipped.less   |   0
 .../common}/fontawesome/less/screen-reader.less     |   0
 .../common}/fontawesome/less/stacked.less           |   0
 .../common}/fontawesome/less/variables.less         |   0
 .../common}/fontawesome/package.json                |   0
 .../common}/fontawesome/scss/_animated.scss         |   0
 .../common}/fontawesome/scss/_bordered-pulled.scss  |   0
 .../common}/fontawesome/scss/_core.scss             |   0
 .../common}/fontawesome/scss/_fixed-width.scss      |   0
 .../common}/fontawesome/scss/_icons.scss            |   0
 .../common}/fontawesome/scss/_larger.scss           |   0
 .../common}/fontawesome/scss/_list.scss             |   0
 .../common}/fontawesome/scss/_mixins.scss           |   0
 .../common}/fontawesome/scss/_path.scss             |   0
 .../common}/fontawesome/scss/_rotated-flipped.scss  |   0
 .../common}/fontawesome/scss/_screen-reader.scss    |   0
 .../common}/fontawesome/scss/_stacked.scss          |   0
 .../common}/fontawesome/scss/_variables.scss        |   0
 .../common}/fontawesome/scss/font-awesome.scss      |   0
 49 files changed, 0 insertions(+), 0 deletions(-)
 rename htdocs/{includes => theme/common}/fontawesome/.gitignore (100%)
 rename htdocs/{includes => theme/common}/fontawesome/.npmignore (100%)
 rename htdocs/{includes => theme/common}/fontawesome/CONTRIBUTING.md (100%)
 rename htdocs/{includes => theme/common}/fontawesome/Gemfile (100%)
 rename htdocs/{includes => theme/common}/fontawesome/Gemfile.lock (100%)
 rename htdocs/{includes => theme/common}/fontawesome/HELP-US-OUT.txt (100%)
 rename htdocs/{includes => theme/common}/fontawesome/README.md (100%)
 rename htdocs/{includes => theme/common}/fontawesome/_config.yml (100%)
 rename htdocs/{includes => theme/common}/fontawesome/bower.json (100%)
 rename htdocs/{includes => theme/common}/fontawesome/component.json (100%)
 rename htdocs/{includes => theme/common}/fontawesome/composer.json (100%)
 rename htdocs/{includes => theme/common}/fontawesome/css/font-awesome.css (100%)
 rename htdocs/{includes => theme/common}/fontawesome/css/font-awesome.css.map (100%)
 rename htdocs/{includes => theme/common}/fontawesome/css/font-awesome.min.css (100%)
 rename htdocs/{includes => theme/common}/fontawesome/fonts/FontAwesome.otf (100%)
 rename htdocs/{includes => theme/common}/fontawesome/fonts/fontawesome-webfont.eot (100%)
 rename htdocs/{includes => theme/common}/fontawesome/fonts/fontawesome-webfont.svg (100%)
 rename htdocs/{includes => theme/common}/fontawesome/fonts/fontawesome-webfont.ttf (100%)
 rename htdocs/{includes => theme/common}/fontawesome/fonts/fontawesome-webfont.woff (100%)
 rename htdocs/{includes => theme/common}/fontawesome/fonts/fontawesome-webfont.woff2 (100%)
 rename htdocs/{includes => theme/common}/fontawesome/less/animated.less (100%)
 rename htdocs/{includes => theme/common}/fontawesome/less/bordered-pulled.less (100%)
 rename htdocs/{includes => theme/common}/fontawesome/less/core.less (100%)
 rename htdocs/{includes => theme/common}/fontawesome/less/fixed-width.less (100%)
 rename htdocs/{includes => theme/common}/fontawesome/less/font-awesome.less (100%)
 rename htdocs/{includes => theme/common}/fontawesome/less/icons.less (100%)
 rename htdocs/{includes => theme/common}/fontawesome/less/larger.less (100%)
 rename htdocs/{includes => theme/common}/fontawesome/less/list.less (100%)
 rename htdocs/{includes => theme/common}/fontawesome/less/mixins.less (100%)
 rename htdocs/{includes => theme/common}/fontawesome/less/path.less (100%)
 rename htdocs/{includes => theme/common}/fontawesome/less/rotated-flipped.less (100%)
 rename htdocs/{includes => theme/common}/fontawesome/less/screen-reader.less (100%)
 rename htdocs/{includes => theme/common}/fontawesome/less/stacked.less (100%)
 rename htdocs/{includes => theme/common}/fontawesome/less/variables.less (100%)
 rename htdocs/{includes => theme/common}/fontawesome/package.json (100%)
 rename htdocs/{includes => theme/common}/fontawesome/scss/_animated.scss (100%)
 rename htdocs/{includes => theme/common}/fontawesome/scss/_bordered-pulled.scss (100%)
 rename htdocs/{includes => theme/common}/fontawesome/scss/_core.scss (100%)
 rename htdocs/{includes => theme/common}/fontawesome/scss/_fixed-width.scss (100%)
 rename htdocs/{includes => theme/common}/fontawesome/scss/_icons.scss (100%)
 rename htdocs/{includes => theme/common}/fontawesome/scss/_larger.scss (100%)
 rename htdocs/{includes => theme/common}/fontawesome/scss/_list.scss (100%)
 rename htdocs/{includes => theme/common}/fontawesome/scss/_mixins.scss (100%)
 rename htdocs/{includes => theme/common}/fontawesome/scss/_path.scss (100%)
 rename htdocs/{includes => theme/common}/fontawesome/scss/_rotated-flipped.scss (100%)
 rename htdocs/{includes => theme/common}/fontawesome/scss/_screen-reader.scss (100%)
 rename htdocs/{includes => theme/common}/fontawesome/scss/_stacked.scss (100%)
 rename htdocs/{includes => theme/common}/fontawesome/scss/_variables.scss (100%)
 rename htdocs/{includes => theme/common}/fontawesome/scss/font-awesome.scss (100%)

diff --git a/htdocs/includes/fontawesome/.gitignore b/htdocs/theme/common/fontawesome/.gitignore
similarity index 100%
rename from htdocs/includes/fontawesome/.gitignore
rename to htdocs/theme/common/fontawesome/.gitignore
diff --git a/htdocs/includes/fontawesome/.npmignore b/htdocs/theme/common/fontawesome/.npmignore
similarity index 100%
rename from htdocs/includes/fontawesome/.npmignore
rename to htdocs/theme/common/fontawesome/.npmignore
diff --git a/htdocs/includes/fontawesome/CONTRIBUTING.md b/htdocs/theme/common/fontawesome/CONTRIBUTING.md
similarity index 100%
rename from htdocs/includes/fontawesome/CONTRIBUTING.md
rename to htdocs/theme/common/fontawesome/CONTRIBUTING.md
diff --git a/htdocs/includes/fontawesome/Gemfile b/htdocs/theme/common/fontawesome/Gemfile
similarity index 100%
rename from htdocs/includes/fontawesome/Gemfile
rename to htdocs/theme/common/fontawesome/Gemfile
diff --git a/htdocs/includes/fontawesome/Gemfile.lock b/htdocs/theme/common/fontawesome/Gemfile.lock
similarity index 100%
rename from htdocs/includes/fontawesome/Gemfile.lock
rename to htdocs/theme/common/fontawesome/Gemfile.lock
diff --git a/htdocs/includes/fontawesome/HELP-US-OUT.txt b/htdocs/theme/common/fontawesome/HELP-US-OUT.txt
similarity index 100%
rename from htdocs/includes/fontawesome/HELP-US-OUT.txt
rename to htdocs/theme/common/fontawesome/HELP-US-OUT.txt
diff --git a/htdocs/includes/fontawesome/README.md b/htdocs/theme/common/fontawesome/README.md
similarity index 100%
rename from htdocs/includes/fontawesome/README.md
rename to htdocs/theme/common/fontawesome/README.md
diff --git a/htdocs/includes/fontawesome/_config.yml b/htdocs/theme/common/fontawesome/_config.yml
similarity index 100%
rename from htdocs/includes/fontawesome/_config.yml
rename to htdocs/theme/common/fontawesome/_config.yml
diff --git a/htdocs/includes/fontawesome/bower.json b/htdocs/theme/common/fontawesome/bower.json
similarity index 100%
rename from htdocs/includes/fontawesome/bower.json
rename to htdocs/theme/common/fontawesome/bower.json
diff --git a/htdocs/includes/fontawesome/component.json b/htdocs/theme/common/fontawesome/component.json
similarity index 100%
rename from htdocs/includes/fontawesome/component.json
rename to htdocs/theme/common/fontawesome/component.json
diff --git a/htdocs/includes/fontawesome/composer.json b/htdocs/theme/common/fontawesome/composer.json
similarity index 100%
rename from htdocs/includes/fontawesome/composer.json
rename to htdocs/theme/common/fontawesome/composer.json
diff --git a/htdocs/includes/fontawesome/css/font-awesome.css b/htdocs/theme/common/fontawesome/css/font-awesome.css
similarity index 100%
rename from htdocs/includes/fontawesome/css/font-awesome.css
rename to htdocs/theme/common/fontawesome/css/font-awesome.css
diff --git a/htdocs/includes/fontawesome/css/font-awesome.css.map b/htdocs/theme/common/fontawesome/css/font-awesome.css.map
similarity index 100%
rename from htdocs/includes/fontawesome/css/font-awesome.css.map
rename to htdocs/theme/common/fontawesome/css/font-awesome.css.map
diff --git a/htdocs/includes/fontawesome/css/font-awesome.min.css b/htdocs/theme/common/fontawesome/css/font-awesome.min.css
similarity index 100%
rename from htdocs/includes/fontawesome/css/font-awesome.min.css
rename to htdocs/theme/common/fontawesome/css/font-awesome.min.css
diff --git a/htdocs/includes/fontawesome/fonts/FontAwesome.otf b/htdocs/theme/common/fontawesome/fonts/FontAwesome.otf
similarity index 100%
rename from htdocs/includes/fontawesome/fonts/FontAwesome.otf
rename to htdocs/theme/common/fontawesome/fonts/FontAwesome.otf
diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.eot b/htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from htdocs/includes/fontawesome/fonts/fontawesome-webfont.eot
rename to htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.eot
diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.svg b/htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from htdocs/includes/fontawesome/fonts/fontawesome-webfont.svg
rename to htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.svg
diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.ttf b/htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from htdocs/includes/fontawesome/fonts/fontawesome-webfont.ttf
rename to htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.ttf
diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.woff b/htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from htdocs/includes/fontawesome/fonts/fontawesome-webfont.woff
rename to htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.woff
diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.woff2 b/htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from htdocs/includes/fontawesome/fonts/fontawesome-webfont.woff2
rename to htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.woff2
diff --git a/htdocs/includes/fontawesome/less/animated.less b/htdocs/theme/common/fontawesome/less/animated.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/animated.less
rename to htdocs/theme/common/fontawesome/less/animated.less
diff --git a/htdocs/includes/fontawesome/less/bordered-pulled.less b/htdocs/theme/common/fontawesome/less/bordered-pulled.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/bordered-pulled.less
rename to htdocs/theme/common/fontawesome/less/bordered-pulled.less
diff --git a/htdocs/includes/fontawesome/less/core.less b/htdocs/theme/common/fontawesome/less/core.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/core.less
rename to htdocs/theme/common/fontawesome/less/core.less
diff --git a/htdocs/includes/fontawesome/less/fixed-width.less b/htdocs/theme/common/fontawesome/less/fixed-width.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/fixed-width.less
rename to htdocs/theme/common/fontawesome/less/fixed-width.less
diff --git a/htdocs/includes/fontawesome/less/font-awesome.less b/htdocs/theme/common/fontawesome/less/font-awesome.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/font-awesome.less
rename to htdocs/theme/common/fontawesome/less/font-awesome.less
diff --git a/htdocs/includes/fontawesome/less/icons.less b/htdocs/theme/common/fontawesome/less/icons.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/icons.less
rename to htdocs/theme/common/fontawesome/less/icons.less
diff --git a/htdocs/includes/fontawesome/less/larger.less b/htdocs/theme/common/fontawesome/less/larger.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/larger.less
rename to htdocs/theme/common/fontawesome/less/larger.less
diff --git a/htdocs/includes/fontawesome/less/list.less b/htdocs/theme/common/fontawesome/less/list.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/list.less
rename to htdocs/theme/common/fontawesome/less/list.less
diff --git a/htdocs/includes/fontawesome/less/mixins.less b/htdocs/theme/common/fontawesome/less/mixins.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/mixins.less
rename to htdocs/theme/common/fontawesome/less/mixins.less
diff --git a/htdocs/includes/fontawesome/less/path.less b/htdocs/theme/common/fontawesome/less/path.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/path.less
rename to htdocs/theme/common/fontawesome/less/path.less
diff --git a/htdocs/includes/fontawesome/less/rotated-flipped.less b/htdocs/theme/common/fontawesome/less/rotated-flipped.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/rotated-flipped.less
rename to htdocs/theme/common/fontawesome/less/rotated-flipped.less
diff --git a/htdocs/includes/fontawesome/less/screen-reader.less b/htdocs/theme/common/fontawesome/less/screen-reader.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/screen-reader.less
rename to htdocs/theme/common/fontawesome/less/screen-reader.less
diff --git a/htdocs/includes/fontawesome/less/stacked.less b/htdocs/theme/common/fontawesome/less/stacked.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/stacked.less
rename to htdocs/theme/common/fontawesome/less/stacked.less
diff --git a/htdocs/includes/fontawesome/less/variables.less b/htdocs/theme/common/fontawesome/less/variables.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/variables.less
rename to htdocs/theme/common/fontawesome/less/variables.less
diff --git a/htdocs/includes/fontawesome/package.json b/htdocs/theme/common/fontawesome/package.json
similarity index 100%
rename from htdocs/includes/fontawesome/package.json
rename to htdocs/theme/common/fontawesome/package.json
diff --git a/htdocs/includes/fontawesome/scss/_animated.scss b/htdocs/theme/common/fontawesome/scss/_animated.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_animated.scss
rename to htdocs/theme/common/fontawesome/scss/_animated.scss
diff --git a/htdocs/includes/fontawesome/scss/_bordered-pulled.scss b/htdocs/theme/common/fontawesome/scss/_bordered-pulled.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_bordered-pulled.scss
rename to htdocs/theme/common/fontawesome/scss/_bordered-pulled.scss
diff --git a/htdocs/includes/fontawesome/scss/_core.scss b/htdocs/theme/common/fontawesome/scss/_core.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_core.scss
rename to htdocs/theme/common/fontawesome/scss/_core.scss
diff --git a/htdocs/includes/fontawesome/scss/_fixed-width.scss b/htdocs/theme/common/fontawesome/scss/_fixed-width.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_fixed-width.scss
rename to htdocs/theme/common/fontawesome/scss/_fixed-width.scss
diff --git a/htdocs/includes/fontawesome/scss/_icons.scss b/htdocs/theme/common/fontawesome/scss/_icons.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_icons.scss
rename to htdocs/theme/common/fontawesome/scss/_icons.scss
diff --git a/htdocs/includes/fontawesome/scss/_larger.scss b/htdocs/theme/common/fontawesome/scss/_larger.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_larger.scss
rename to htdocs/theme/common/fontawesome/scss/_larger.scss
diff --git a/htdocs/includes/fontawesome/scss/_list.scss b/htdocs/theme/common/fontawesome/scss/_list.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_list.scss
rename to htdocs/theme/common/fontawesome/scss/_list.scss
diff --git a/htdocs/includes/fontawesome/scss/_mixins.scss b/htdocs/theme/common/fontawesome/scss/_mixins.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_mixins.scss
rename to htdocs/theme/common/fontawesome/scss/_mixins.scss
diff --git a/htdocs/includes/fontawesome/scss/_path.scss b/htdocs/theme/common/fontawesome/scss/_path.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_path.scss
rename to htdocs/theme/common/fontawesome/scss/_path.scss
diff --git a/htdocs/includes/fontawesome/scss/_rotated-flipped.scss b/htdocs/theme/common/fontawesome/scss/_rotated-flipped.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_rotated-flipped.scss
rename to htdocs/theme/common/fontawesome/scss/_rotated-flipped.scss
diff --git a/htdocs/includes/fontawesome/scss/_screen-reader.scss b/htdocs/theme/common/fontawesome/scss/_screen-reader.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_screen-reader.scss
rename to htdocs/theme/common/fontawesome/scss/_screen-reader.scss
diff --git a/htdocs/includes/fontawesome/scss/_stacked.scss b/htdocs/theme/common/fontawesome/scss/_stacked.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_stacked.scss
rename to htdocs/theme/common/fontawesome/scss/_stacked.scss
diff --git a/htdocs/includes/fontawesome/scss/_variables.scss b/htdocs/theme/common/fontawesome/scss/_variables.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_variables.scss
rename to htdocs/theme/common/fontawesome/scss/_variables.scss
diff --git a/htdocs/includes/fontawesome/scss/font-awesome.scss b/htdocs/theme/common/fontawesome/scss/font-awesome.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/font-awesome.scss
rename to htdocs/theme/common/fontawesome/scss/font-awesome.scss

From 47ea9b57e8407f737a1aa30d18e0494d70523116 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2017 14:41:12 +0100
Subject: [PATCH 0308/1163] Fix Remove debug var_dump

---
 htdocs/core/lib/functionsnumtoword.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index 7df62774ca6..3314aa94631 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -159,7 +159,7 @@ function dolNumberToWord($numero, $langs, $numorcurrency='number')
 			break;
 		}
 	}
-	var_dump($langs);
+
 	/*In dolibarr 3.6.2 (my current version) doesn't have $langs->default and
 	in case exist why ask $lang like a parameter?*/
 	if (((is_object($langs) && $langs->default == 'es_MX') || (! is_object($langs) && $langs == 'es_MX')) && $numorcurrency == 'currency')

From 4804cc47bde10bf2abf896c36a01671cc1bd8c76 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2017 15:16:53 +0100
Subject: [PATCH 0309/1163] Clean and uniformize code

---
 htdocs/accountancy/admin/accountmodel.php |  8 ++--
 htdocs/comm/card.php                      | 13 +++---
 htdocs/fourn/card.php                     | 53 +++++++++++++----------
 3 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index ba2643a04b8..75d3be10444 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -736,11 +736,11 @@ if ($id)
         {
         	if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates' && $action == 'edit')
         	{
-				fieldList($fieldlist,$obj,$tabname[$id],'hide');
+				fieldListAccountModel($fieldlist,$obj,$tabname[$id],'hide');
         	}
         	else
         	{
-        		fieldList($fieldlist,$obj,$tabname[$id],'add');
+        		fieldListAccountModel($fieldlist,$obj,$tabname[$id],'add');
         	}
         }
 
@@ -928,7 +928,7 @@ if ($id)
                     $reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
                     $error=$hookmanager->error; $errors=$hookmanager->errors;
 
-                    if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
+                    if (empty($reshook)) fieldListAccountModel($fieldlist,$obj,$tabname[$id],'edit');
 
                     print '<td colspan="3" align="right"><a name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
                     print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
@@ -1252,7 +1252,7 @@ $db->close();
  *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *	@return		void
  */
-function fieldList($fieldlist, $obj='', $tabname='', $context='')
+function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='')
 {
 	global $conf,$langs,$db;
 	global $form;
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index bfd90b6909b..126c3fe0f62 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -1039,6 +1039,11 @@ if ($id > 0)
 
     if (empty($reshook))
     {
+        if ($object->status != 1)
+        {
+            print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
+        }
+        
     	if (! empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status==1)
     	{
     		$langs->load("propal");
@@ -1072,16 +1077,12 @@ if ($id > 0)
     			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddTrip").'</a></div>';
     		}
     
-    		if (! empty($conf->facture->enabled))
+    		if (! empty($conf->facture->enabled) && $object->status==1)
     		{
     			if (empty($user->rights->facture->creer))
     			{
     			    print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
     			}
-    			else if ($object->status != 1)
-    			{
-    			    print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-    			}
     			else
     			{
     				$langs->load("bills");
@@ -1101,7 +1102,7 @@ if ($id > 0)
     	}
     
     	// Add action
-    	if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+    	if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status==1)
     	{
     		if ($user->rights->agenda->myactions->create)
     		{
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 29d2a421b2b..f731fac1684 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -708,32 +708,37 @@ if ($object->id > 0)
 	// modified by hook
 	if (empty($reshook))
 	{
-		if ($conf->supplier_proposal->enabled && $user->rights->supplier_proposal->creer)
+	    if ($object->status != 1)
+        {
+            print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
+        }
+	    
+		if ($conf->supplier_proposal->enabled && $user->rights->supplier_proposal->creer && $object->status==1)
 		{
 			$langs->load("supplier_proposal");
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddSupplierProposal").'</a>';
 		}
 
-	    if ($user->rights->fournisseur->commande->creer)
+	    if ($user->rights->fournisseur->commande->creer && $object->status==1)
 		{
 			$langs->load("orders");
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
 		}
 
-		if ($user->rights->fournisseur->facture->creer)
+		if ($user->rights->fournisseur->facture->creer && $object->status==1)
 		{
 			$langs->load("bills");
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
 		}
 
-		if ($user->rights->fournisseur->facture->creer)
+		if ($user->rights->fournisseur->facture->creer && $object->status==1)
 		{
 			if (! empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
 			else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
 		}
 
     	// Add action
-    	if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+    	if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status==1)
     	{
         	if ($user->rights->agenda->myactions->create)
         	{
@@ -750,29 +755,29 @@ if ($object->id > 0)
 	
 	print '<br>';
 
-    	if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
-    	{
-        	print '<br>';
-        	// List of contacts
-        	show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-    	}
+	if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
+	{
+    	print '<br>';
+    	// List of contacts
+    	show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+	}
 
-    	// Addresses list
-    	if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
-    	{
-    		$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-    	}
+	// Addresses list
+	if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
+	{
+		$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+	}
 
-    	if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
-    	{
-        	print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
+	if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+	{
+    	print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
 
-        	// List of todo actions
-        	show_actions_todo($conf,$langs,$db,$object);
+    	// List of todo actions
+    	show_actions_todo($conf,$langs,$db,$object);
 
-        	// List of done actions
-        	show_actions_done($conf,$langs,$db,$object);
-    	}
+    	// List of done actions
+    	show_actions_done($conf,$langs,$db,$object);
+	}
 }
 else
 {

From 1ef899dacc93d01d0c49d92c5b548e3209126ef7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2017 15:22:32 +0100
Subject: [PATCH 0310/1163] Prepare database to follow supplier discounts

---
 htdocs/core/class/discount.class.php          | 78 ++++++++++++++-----
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  9 +++
 .../tables/llx_societe_remise_except.key.sql  |  6 +-
 .../tables/llx_societe_remise_except.sql      |  3 +
 4 files changed, 75 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index f426f800d29..387c662baad 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -335,23 +335,25 @@ class DiscountAbsolute
 
 
     /**
-     *  Renvoie montant TTC des reductions/avoirs en cours disponibles pour une société, un user ou autre
+     *  Return amount (with tax) of discounts currently available for a company, user or other criteria
      *
      *	@param		Societe		$company	Object third party for filter
      *	@param		User		$user		Filtre sur un user auteur des remises
      * 	@param		string		$filter		Filtre autre
      * 	@param		int			$maxvalue	Filter on max value for discount
+     *  @param      string      $mode       'customer' = discounts the customer has, 'supplier' = discount i have at this supplier
      * 	@return		int						<0 if KO, amount otherwise
      */
-    function getAvailableDiscounts($company='', $user='',$filter='', $maxvalue=0)
+    function getAvailableDiscounts($company='', $user='',$filter='', $maxvalue=0, $mode='customer')
     {
     	global $conf;
 
         $sql  = "SELECT SUM(rc.amount_ttc) as amount";
-        //        $sql  = "SELECT rc.amount_ttc as amount";
+        //$sql  = "SELECT rc.amount_ttc as amount";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
         $sql.= " WHERE rc.entity = " . $conf->entity;
-        $sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)";	// Available
+        if ($mode != 'supplier') $sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)";	// Available
+        else $sql.= " AND (rc.fk_suppler_invoice IS NULL AND rc.fk_supplier_invoice IS NULL)";	        // Available
         if (is_object($company)) $sql.= " AND rc.fk_soc = ".$company->id;
         if (is_object($user))    $sql.= " AND rc.fk_user = ".$user->id;
         if ($filter)   $sql.=' AND ('.$filter.')';
@@ -377,18 +379,35 @@ class DiscountAbsolute
      *  Return amount (with tax) of all deposits invoices used by invoice as a payment.
      *  Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
      *
-     *	@param		Facture		$invoice		Object invoice
-	 *  @param 		int 		$multicurrency 	Return multicurrency_amount instead of amount
-     *	@return		int							<0 if KO, Sum of credit notes and deposits amount otherwise
+     *	@param		CommonInvoice	$invoice		Object invoice (customer of supplier)
+	 *  @param 		int 		    $multicurrency 	Return multicurrency_amount instead of amount
+     *	@return		int				     			<0 if KO, Sum of credit notes and deposits amount otherwise
      */
     function getSumDepositsUsed($invoice, $multicurrency=0)
     {
-        $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-        $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-        $sql.= ' AND f.type = 3';
-
         dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
+        
+        if ($invoice->element == 'facture' || $invoice->element == 'invoice')
+        {
+            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
+            $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
+            $sql.= ' AND f.type = 3';
+        }
+        else if ($invoice->element == 'invoice_supplier')
+        {
+            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
+            $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
+            $sql.= ' AND f.type = 3';
+        }
+        else
+        {
+            $this->error=get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
+            dol_print_error($this->error);
+            return -1;
+        }
+        
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -398,6 +417,7 @@ class DiscountAbsolute
         }
         else
         {
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }
@@ -405,18 +425,35 @@ class DiscountAbsolute
     /**
      *  Return amount (with tax) of all credit notes and deposits invoices used by invoice as a payment
      *
-     *	@param		Facture		$invoice		Object invoice
-	 *	@param		int			$multicurrency	Return multicurrency_amount instead of amount
-     *	@return		int							<0 if KO, Sum of credit notes and deposits amount otherwise
+     *	@param		CommonInvoice	  $invoice	    	Object invoice
+	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
+     *	@return		int					        		<0 if KO, Sum of credit notes and deposits amount otherwise
      */
     function getSumCreditNotesUsed($invoice, $multicurrency=0)
     {
-        $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-        $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-        $sql.= ' AND f.type = 2';
-
         dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
+        
+        if ($invoice->element == 'facture' || $invoice->element == 'invoice')
+        {
+            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
+            $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
+            $sql.= ' AND f.type = 2';
+        }
+        else if ($invoice->element == 'invoice_supplier')
+        {
+            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
+            $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
+            $sql.= ' AND f.type = 2';
+        }
+        else
+        {
+            $this->error=get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
+            dol_print_error($this->error);
+            return -1;
+        }
+            
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -426,6 +463,7 @@ class DiscountAbsolute
         }
         else
         {
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index e7803281e67..5cb53447b97 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -100,3 +100,12 @@ CREATE TABLE llx_product_attribute_combination
 
 ALTER TABLE llx_paiementfourn ADD COLUMN model_pdf varchar(255);
 
+
+ALTER TABLE llx_societe_remise_except ADD COLUMN fk_invoice_supplier_line	integer;
+ALTER TABLE llx_societe_remise_except ADD COLUMN fk_invoice_supplier		integer;
+ALTER TABLE llx_societe_remise_except ADD COLUMN fk_invoice_supplier_source	integer;
+
+ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_soc_remise_fk_invoice_supplier_line       FOREIGN KEY (fk_invoice_supplier_line) REFERENCES llx_facture_fourn_det (rowid);
+ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoice_supplier        FOREIGN KEY (fk_invoice_supplier)      REFERENCES llx_facture_fourn (rowid);
+ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoice_supplier_source FOREIGN KEY (fk_invoice_supplier)      REFERENCES llx_facture_fourn (rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
index 0b66e7984d9..148a8777915 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
@@ -30,9 +30,13 @@ ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_fac
 
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_user    FOREIGN KEY (fk_user)    REFERENCES llx_user (rowid);
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_soc_remise_fk_soc     FOREIGN KEY (fk_soc)     REFERENCES llx_societe (rowid);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_soc_remise_fk_facture_line   FOREIGN KEY (fk_facture_line) REFERENCES llx_facturedet (rowid);
+
+ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_soc_remise_fk_facture_line       FOREIGN KEY (fk_facture_line) REFERENCES llx_facturedet (rowid);
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture        FOREIGN KEY (fk_facture)        REFERENCES llx_facture (rowid);
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture_source FOREIGN KEY (fk_facture_source) REFERENCES llx_facture (rowid);
 
+ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_soc_remise_fk_invoice_supplier_line       FOREIGN KEY (fk_invoice_supplier_line) REFERENCES llx_facture_fourn_det (rowid);
+ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoice_supplier        FOREIGN KEY (fk_invoice_supplier)      REFERENCES llx_facture_fourn (rowid);
+ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoice_supplier_source FOREIGN KEY (fk_invoice_supplier)      REFERENCES llx_facture_fourn (rowid);
 
 
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
index 4c55e34425c..3a19a026ca9 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
@@ -33,6 +33,9 @@ create table llx_societe_remise_except
   fk_facture_line			integer,
   fk_facture				integer,
   fk_facture_source			integer,
+  fk_invoice_supplier_line	integer,
+  fk_invoice_supplier		integer,
+  fk_invoice_supplier_source integer,
   description				text NOT NULL,
   multicurrency_amount_ht	double(24,8) DEFAULT 0 NOT NULL,
   multicurrency_amount_tva	double(24,8) DEFAULT 0 NOT NULL,

From 29578a38bde4897353b7bfe37f3d6ccaa718c6df Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2017 16:19:00 +0100
Subject: [PATCH 0311/1163] Keep previous behaviour if new option not set

---
 htdocs/compta/facture.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 51a3efa40eb..66ed06e53e2 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1139,7 +1139,7 @@ if (empty($reshook))
 							
 							$diff = $object->total_ttc - $amount_ttc_diff;
 							
-							if ($diff != 0)
+							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0)
 							{
 								$object->fetch_lines();
 								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx);

From 63bee0c2d028b523a4df380a4a17f683818e572c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2017 16:23:43 +0100
Subject: [PATCH 0312/1163] Doxygen

---
 htdocs/core/modules/modAccounting.class.php    | 3 +--
 htdocs/core/modules/modExpenseReport.class.php | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 92e63d8bf7c..87506217838 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -27,8 +27,7 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 /**
- * \class	modAccounting
- * \brief	Description and activation class for module accounting expert
+ * Description and activation class for module accounting expert
  */
 class modAccounting extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index 96b30d92467..0d9b808fb6a 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -19,9 +19,6 @@
 /**
  * 		\defgroup   expensereport	Module expensereport
  *      \brief      Module to manage expense report. Replace old module Deplacement.
- */
-
-/**
  *      \file       htdocs/core/modules/modExpenseReport.class.php
  *      \ingroup    expensereport
  *      \brief      Description and activation file for module ExpenseReport

From bf591f5f916ae06102913a7b9fcb5d239956b402 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2017 21:13:40 +0100
Subject: [PATCH 0313/1163] Work on module website

---
 htdocs/core/lib/functions.lib.php  |  1 +
 htdocs/core/lib/website.lib.php    | 51 ++++++++++++++++++++++++++
 htdocs/core/search_page.php        |  2 +-
 htdocs/ecm/index.php               | 24 +++----------
 htdocs/ecm/index_auto.php          | 22 +++---------
 htdocs/langs/en_US/website.lang    |  2 +-
 htdocs/main.inc.php                | 10 +++---
 htdocs/public/test/test_arrays.php |  3 +-
 htdocs/public/websites/index.php   |  2 +-
 htdocs/theme/eldy/style.css.php    | 15 ++++++--
 htdocs/websites/index.php          | 57 +++++++++++++++++++-----------
 11 files changed, 117 insertions(+), 72 deletions(-)
 create mode 100644 htdocs/core/lib/website.lib.php

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e7a1c6e6a76..c178bf0fd7e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5538,6 +5538,7 @@ function printCommonFooter($zone='private')
     	{
         	print '<!-- Set handler to switch left menu page -->'."\n";
         	print 'jQuery(".menuhider").click(function() {';
+        	print '  console.log("We click on .menuhider");'."\n";
         	print "  $('.side-nav').toggle();";
         	if ($conf->theme == 'md') print "  $('.login_block').toggle();";
         	print '});'."\n";
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
new file mode 100644
index 00000000000..ebbd261984e
--- /dev/null
+++ b/htdocs/core/lib/website.lib.php
@@ -0,0 +1,51 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur	<eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/core/lib/website.lib.php
+ *      \ingroup    website
+ *      \brief      Library for website module
+ */
+
+
+/**
+ * Render a string of an HTML content and output it.
+ *
+ * @param   string  $content    Content string
+ * @return  void
+ */
+function dolWebsiteOutput($content)
+{
+    global $db, $langs, $conf, $user;
+
+    dol_syslog("dolWebsiteOutput start");
+    
+    if (! defined('USEDOLIBARRSERVER'))
+    {
+        // Replace link of Dolibarr medias with direct link for virtual server
+        
+        
+        
+        
+        
+    }
+    
+    dol_syslog("dolWebsiteOutput end");
+    
+    print $content;
+}
+
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 09b37f4bb8a..ffbad81a30f 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -111,7 +111,7 @@ else $searchform=$hookmanager->resPrint;
 
 print "\n";
 print "<!-- Begin SearchForm -->\n";
-print '<div class="center" data-role="page" align="center"><div align="center" style="padding: 6px;">';
+print '<div class="center" align="center"><div align="center" style="padding: 6px;">';
 print '<style>.menu_titre { padding-top: 7px; }</style>';
 //print '<div id="distance"></div><div id="container" class="center">';
 print '<div id="blockvmenusearch">'."\n";
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 5ca14fe5dff..be0520e9298 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -371,7 +371,8 @@ dol_fiche_head($head, 'index', $langs->trans("ECMArea").' - '.$langs->trans("ECM
 
 // Start container of all panels
 ?>
-<div id="containerlayout"> <!-- begin div id="containerlayout" -->
+<!-- Begin div id="containerlayout" -->
+<div id="containerlayout">
 <div id="ecm-layout-north" class="toolbar largebutton">
 <?php
 
@@ -429,23 +430,6 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
 
 	// Manual section
 	$htmltooltip=$langs->trans("ECMAreaDesc2");
-
-
-	// Root of manual section
-	/*
-	print '<tr class="ecmroot">';
-	print '<td class="ecmroot">';
-	print img_picto_common('','treemenu/base.gif','class="inline-block valignmiddle"');
-	$txt=$langs->trans("ECMRoot").' ('.$langs->trans("ECMSectionsManual").')';
-	print $form->textwithpicto($txt, $htmltooltip, 1, 'info');
-	print '</td>';
-	print '<td class="ecmroot"></td>';
-	print '<td class="ecmroot">&nbsp;</td>';
-	print '<td class="ecmroot">&nbsp;</td>';
-	print '<td class="ecmroot">&nbsp;</td>';
-	print '<td class="ecmroot"></td>';
-	print '</tr>';
-    */
 	
     if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
     {
@@ -677,12 +661,12 @@ else print '&nbsp;';
 ?>
 </div>
 </div>
-</div> <!-- end div id="containerlayout" -->
+</div> <!-- End div id="containerlayout" -->
 <?php
 // End of page
 
 
-dol_fiche_end();
+dol_fiche_end(1);
 
 
 if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 23a96e4367b..065d14b4593 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -401,7 +401,8 @@ dol_fiche_head($head, 'index_auto', $langs->trans("ECMArea").' - '.$langs->trans
 
 // Start container of all panels
 ?>
-<div id="containerlayout"> <!-- begin div id="containerlayout" -->
+<!-- Begin div id="containerlayout" -->
+<div id="containerlayout">
 <div id="ecm-layout-north" class="toolbar largebutton">
 <?php
 
@@ -448,21 +449,6 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
 	{
 		$htmltooltip=$langs->trans("ECMAreaDesc2");
 
-		// Root title line (Automatic section)
-		/*print '<tr class="ecmroot">';
-		print '<td class="ecmroot">';
-		print img_picto_common('','treemenu/base.gif','class="inline-block valignmiddle"');
-		$txt=$langs->trans("ECMRoot").' ('.$langs->trans("ECMSectionsAuto").')';
-		print $form->textwithpicto($txt, $htmltooltip, 1, 0);
-		print '</td>';
-		print '<td class="ecmroot">&nbsp;</td>';
-		print '<td class="ecmroot">&nbsp;</td>';
-		print '<td class="ecmroot">&nbsp;</td>';
-		print '<td class="ecmroot">&nbsp;</td>';
-		print '<td class="ecmroot"></td>';
-		print '</tr>';
-        */
-		
 		$sectionauto=dol_sort_array($sectionauto,'label','ASC',true,false);
 
 		print '<tr>';
@@ -532,12 +518,12 @@ include_once DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';
 </div>
 
 </div>
-</div> <!-- end div id="containerlayout" -->
+</div> <!-- End div id="containerlayout" -->
 <?php
 // End of page
 
 
-dol_fiche_end();
+dol_fiche_end(1);
 
 
 if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 463d1c9e81e..fcb09c8d5c1 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -25,4 +25,4 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
 PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 5801f7a51e0..5cb73be28e7 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1500,7 +1500,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
         print "<!-- End top horizontal menu -->\n\n";
     }
 
-    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
+    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
 }
 
 
@@ -1533,7 +1533,7 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
 	    // Instantiate hooks of thirdparty module
 	    $hookmanager->initHooks(array('searchform','leftblock'));
 
-		print "\n".'<!-- Begin id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
+		print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
 	    print "\n";
 
@@ -1697,7 +1697,7 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
 	    $reshook=$hookmanager->executeHooks('printLeftBlock',$parameters);    // Note that $action and $object may have been modified by some hooks
 	    print $hookmanager->resPrint;
 
-	    print '</div></div> <!-- end id-left -->';	// End div id="id-left"
+	    print '</div></div> <!-- End side-nav id-left -->';	// End div id="side-nav" div id="id-left"
     }
 
     print "\n";
@@ -1721,8 +1721,7 @@ function main_area($title='')
 
     print "\n";
 
-    if (! empty($conf->dol_use_jmobile)) print '<div data-role="page">';
-    print '<div class="fiche"> <!-- begin div class="fiche" -->'."\n";
+    print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
     if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
 }
 
@@ -1861,7 +1860,6 @@ if (! function_exists("llxFooter"))
 
         print "\n\n";
         print '</div> <!-- End div class="fiche" -->'."\n";
-        if (! empty($conf->dol_use_jmobile)) print '</div>';	// end data-role="page"
 
 		if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'; // End div id-right
 
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 175352f404b..3de7196a696 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -48,7 +48,6 @@ if (empty($usedolheader))
 
 	<body style="padding: 10px;">
 
-	<div data-role="page">
 
 	<?php
 }
@@ -350,7 +349,7 @@ if (! empty($usedolheader))
 {
 	llxFooter();
 } else { ?>
-</div>
+
 </body>
 <?php } ?>
 
diff --git a/htdocs/public/websites/index.php b/htdocs/public/websites/index.php
index 44789409058..4c2eec0edc5 100644
--- a/htdocs/public/websites/index.php
+++ b/htdocs/public/websites/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2016-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index be2e7465067..bdb60c23ee6 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -740,6 +740,7 @@ div.fiche>form>div.div-table-responsive {
      }
 
     .hideonsmartphone { display: none; }
+    .hideonsmartphoneimp { display: none !important; }
     .noenlargeonsmartphone { width : 50px !important; display: inline !important; }
     .maxwidthonsmartphone, #search_newcompany.ui-autocomplete-input { max-width: 100px; }
     .maxwidth50onsmartphone { max-width: 40px; }
@@ -868,6 +869,8 @@ div.vmenu, td.vmenu {
 .side-nav {
 	border-bottom: 1px solid #BBB;
 	background: #FFF;
+	padding-left: 20px;
+	padding-right: 20px;
 }
 .side-nav {
 	position: absolute;
@@ -3250,6 +3253,7 @@ td.hidden {
 .websitebar {
 	border-bottom: 1px solid #888;
 	background: #eee;
+	display: inline-block;
 }
 .websitebar .button, .websitebar .buttonDelete
 {
@@ -3261,11 +3265,15 @@ td.hidden {
 	display: inline-block;
 	padding-left: 10px;
 	vertical-align: middle;
-	line-height: 29px;
+	/* line-height: 29px; */
 }
 .websitetools {
 	float: right;
-	height: 28px;
+	/* height: 28px; */
+}
+.websiteselection, .websitetools {
+	padding-top: 3px;
+	padding-bottom: 3px;
 }
 .websiteinputurl {
     display: inline-block;
@@ -3274,6 +3282,9 @@ td.hidden {
 .websiteiframenoborder {
 	border: 0px;
 }
+a.websitebuttonsitepreview {
+	vertical-align: middle;
+}
 a.websitebuttonsitepreview img {
 	width: 26px;
 	display: inline-block;
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index 0a7eb94cca2..e6bfec0d84a 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -60,6 +60,7 @@ function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0,
 
     // main area
     //main_area($title);
+    print '<!-- Begin div class="fiche" -->'."\n".'<div class="fichebutwithotherclass">'."\n";
 }
 
 
@@ -76,7 +77,10 @@ $langs->load("website");
 
 if (! $user->admin) accessforbidden();
 
-$conf->dol_hide_leftmenu = 1;
+if (! ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)))
+{
+    $conf->dol_hide_leftmenu = 1;   // Force hide of left menu.
+}
 
 $error=0;
 $website=GETPOST('website', 'alpha');
@@ -239,7 +243,8 @@ if ($action == 'updatecss')
        $db->rollback();
     }*/
     
-    $csscontent = '<!-- START DOLIBARR-WEBSITE-ADDED-HEADER -->'."\n";
+    $csscontent = '<!-- BEGIN DOLIBARR-WEBSITE-ADDED-HEADER -->'."\n";
+    $csscontent.= '<!-- File generated to wrap the css file - DO NOT MODIFY - It is just a copy of database css content -->'."\n";
     $csscontent.= '<?php '."\n";
     $csscontent.= "header('Content-type: text/css');\n";
     $csscontent.= "?>"."\n";
@@ -291,7 +296,7 @@ if ($action == 'setashome')
         dol_delete_file($fileindex);
 
         $indexcontent = '<?php'."\n";
-        $indexcontent.= '// File generated to wrap the home page'."\n";
+        $indexcontent.= '// File generated to wrap the home page - DO NOT MODIFY - It is just an include'."\n";
         $indexcontent.= "include_once './".basename($filetpl)."'\n";
         $indexcontent.= '?>'."\n";
         $result = file_put_contents($fileindex, $indexcontent);
@@ -350,7 +355,7 @@ if ($action == 'updatemeta')
             dol_delete_file($filemaster);
             
             $mastercontent = '<?php'."\n";
-            $mastercontent.= '// File generated to link to the master file'."\n";
+            $mastercontent.= '// File generated to link to the master file - DO NOT MODIFY - It is just an include'."\n";
             $mastercontent.= "if (! defined('USEDOLIBARRSERVER')) require '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
             $mastercontent.= '?>'."\n";
             $result = file_put_contents($filemaster, $mastercontent);
@@ -368,7 +373,7 @@ if ($action == 'updatemeta')
             }
             
             $aliascontent = '<?php'."\n";
-            $aliascontent.= '// File generated to wrap the alias page'."\n";
+            $aliascontent.= '// File generated to wrap the page - DO NOT MODIFY - It is just an include'."\n";
             $aliascontent.= "include_once './page".$objectpage->id.".tpl.php';\n";
             $aliascontent.= '?>'."\n";
             $result = file_put_contents($filealias, $aliascontent);
@@ -390,6 +395,7 @@ if ($action == 'updatemeta')
             $tplcontent.= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
             $tplcontent.= '<meta name="robots" content="index, follow" />'."\n";
             $tplcontent.= '<meta name="viewport" content="width=device-width, initial-scale=0.8">'."\n";
+            $tplcontent.= '<link rel="canonical" href="'.$objectpage->pageurl.'">'."\n";
             $tplcontent.= '<meta name="keywords" content="'.join(', ', explode(',',$objectpage->keywords)).'" />'."\n";
             $tplcontent.= '<meta name="title" content="'.dol_escape_htmltag($objectpage->title).'" />'."\n";
             $tplcontent.= '<meta name="description" content="'.dol_escape_htmltag($objectpage->description).'" />'."\n";
@@ -485,7 +491,7 @@ if ($action == 'updatecontent')
             }
             
 		    $aliascontent = '<?php'."\n";
-		    $aliascontent.= '// File generated to wrap the alias page'."\n";
+		    $aliascontent.= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a copy of database page content\n";
 		    $aliascontent.= "include_once './page".$objectpage->id.".tpl.php';\n";
 		    $aliascontent.= '?>'."\n";
 		    $result = file_put_contents($filealias, $aliascontent);
@@ -495,12 +501,15 @@ if ($action == 'updatecontent')
             if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
 		
     		        
-    	    // Now create the .tpl file
-    	    // TODO Keep a one time generate file or include a dynamicaly generated content ? 
+    	    // Now create the .tpl file with code to be able to make dynamic changes
     	    dol_delete_file($filetpl);
 
             $tplcontent ='';
-            $tplcontent.= "<?php if (! defined('USEDOLIBARRSERVER')) require './master.inc.php'; ?>"."\n";
+            $tplcontent.= "<?php // BEGIN PHP\n";
+            $tplcontent.= "if (! defined('USEDOLIBARRSERVER')) { require './master.inc.php'; } // Not already loaded"."\n";
+            $tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+            $tplcontent.= "ob_start();\n";
+            $tplcontent.= "// END PHP ?>\n";
     	    $tplcontent.= '<html>'."\n";
     	    $tplcontent.= '<header>'."\n";
     	    $tplcontent.= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
@@ -517,6 +526,11 @@ if ($action == 'updatecontent')
     	    $tplcontent.= '<body>'."\n";
     	    $tplcontent.= $objectpage->content."\n";
     	    $tplcontent.= '</body>'."\n";
+    	    
+    	    $tplcontent.= '<?php // BEGIN PHP'."\n";
+    	    $tplcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
+    	    $tplcontent.= "// END PHP ?>"."\n";
+    	    
             //var_dump($filetpl);exit;	    
     	    $result = file_put_contents($filetpl, $tplcontent);
     	    if (! empty($conf->global->MAIN_UMASK))
@@ -596,14 +610,14 @@ if (count($object->records) > 0)
 {
     // ***** Part for web sites
     
-    print '<div class="websiteselection">';
+    print '<div class="websiteselection hideonsmartphoneimp">';
     print $langs->trans("Website").': ';
     print '</div>';
 
     // List of websites
     print '<div class="websiteselection">';
     $out='';
-    $out.='<select name="website">';
+    $out.='<select name="website" id="website">';
     if (empty($object->records)) $out.='<option value="-1">&nbsp;</option>';
     // Loop on each sites
     $i=0;
@@ -619,6 +633,7 @@ if (count($object->records) > 0)
         $i++;
     }
     $out.='</select>';
+    $out.=ajax_combobox('website');
     print $out;
     print '<input type="submit" class="button" name="refreshsite" value="'.$langs->trans("Load").'">';
 
@@ -688,7 +703,7 @@ if (count($object->records) > 0)
         $atleastonepage=(is_array($array) && count($array) > 0);
         
         print '<div class="centpercent websitebar"'.($style?' style="'.$style.'"':'').'">';
-        print '<div class="websiteselection">';
+        print '<div class="websiteselection hideonsmartphoneimp">';
         print $langs->trans("Page").': ';
         print '</div>';
         print '<div class="websiteselection">';
@@ -696,7 +711,7 @@ if (count($object->records) > 0)
         if ($action != 'add')
         {
             $out='';
-            $out.='<select name="pageid">';
+            $out.='<select name="pageid" id="pageid" class="minwidth200">';
             if ($atleastonepage)
             {
                 if (empty($pageid) && $action != 'create')      // Page id is not defined, we try to take one
@@ -722,6 +737,7 @@ if (count($object->records) > 0)
             }
             else $out.='<option value="-1">&nbsp;</option>';
             $out.='</select>';
+            $out.=ajax_combobox('pageid');
             print $out;
         }
         else
@@ -853,8 +869,8 @@ if ($action == 'editcss')
     print '<br>';
 
     $csscontent = @file_get_contents($filecss);
-    // Clean php css file to get only css part
-    $csscontent = preg_replace('/<!-- START DOLIBARR.*END -->/s', '', $csscontent); 
+    // Clean the php css file to remove php code and get only css part
+    $csscontent = preg_replace('/<!-- BEGIN DOLIBARR.*END -->/s', '', $csscontent); 
     
     dol_fiche_head();
 
@@ -992,15 +1008,12 @@ if ($action == 'preview')
     {
         $objectpage->fetch($pageid);
 
-        print "\n".'<!-- Page content '.$filetpl.' : Div with (CSS + Page content from database) -->'."\n";
-
-        
-        $csscontent = @file_get_contents($filecss);
-        
-        $out='';
+        $out = "\n".'<!-- Page content '.$filetpl.' : Div with (CSS + Page content from database) -->'."\n";
         
         $out.='<div id="websitecontent" class="websitecontent">'."\n";
         
+        $csscontent = @file_get_contents($filecss);
+        
         $out.='<style scoped>'."\n";        // "scoped" means "apply to parent element only". Not yet supported by browsers
         $out.=$csscontent;
         $out.='</style>'."\n";
@@ -1009,6 +1022,8 @@ if ($action == 'preview')
         
         $out.='</div>';
         
+        $out.= "\n".'<!-- End page content '.$filetpl.' -->'."\n\n";
+        
         print $out;
         
         /*file_put_contents($filetpl, $out);

From 320da17c78e5f6a22e3aca6c8d3dbe69836afa3c Mon Sep 17 00:00:00 2001
From: Ion <ion@agorria.com>
Date: Sun, 26 Feb 2017 03:42:42 +0100
Subject: [PATCH 0314/1163] Add object extrafields to mail form

---
 htdocs/core/class/html.formmail.class.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index bdae838f61e..e960b3d6909 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1032,7 +1032,14 @@ class FormMail extends Form
 		$this->substit['__SIGNATURE__'] = $user->signature;
 		$this->substit['__PERSONALIZED__'] = '';
 		$this->substit['__CONTACTCIVNAME__'] = '';	// Will be replace just before sending
-        
+
+        // Create dinamic tags for __EXTRAFIELD_FIELD__
+        $extrafields = new ExtraFields($this->db);
+        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element, true);
+        $object->fetch_optionals($object->id, $extralabels);
+        foreach ($extrafields->attribute_label as $key => $label) {
+            $this->substit['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
+        }
 		
         //Fill substit_lines with each object lines content
         if (is_array($object->lines))

From 3aaf9dae11928571db0e07f81cf4110f28525bb1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2017 00:12:48 +0100
Subject: [PATCH 0315/1163] Fix parameter to cal cron method

---
 htdocs/compta/facture.php           | 5 +++--
 htdocs/cron/class/cronjob.class.php | 2 +-
 htdocs/theme/eldy/style.css.php     | 2 ++
 htdocs/theme/md/style.css.php       | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 66ed06e53e2..6c311224ba0 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1121,8 +1121,9 @@ if (empty($reshook))
 										0, 						// remise_percent
 										0, 						// date_start
 										0, 						// date_end
-										0, $lines[$i]->info_bits, // info_bits
-										0, 						// info_bits
+										0, 
+								        $lines[$i]->info_bits,  // info_bits
+										0,
 										'HT',
 										0,
 										0, 						// product_type
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index e532f1e23e0..59a3d025386 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -959,7 +959,7 @@ class Cronjob extends CommonObject
 				// Create Object for the call module
 				$object = new $this->objectname($this->db);
 	
-				$params_arr = explode(", ",$this->params);
+				$params_arr = array_map('trim', explode(",",$this->params));
 				if (!is_array($params_arr))
 				{
 					$result = call_user_func(array($object, $this->methodename), $this->params);
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index bdb60c23ee6..fa884d2d74a 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -632,6 +632,8 @@ div.myavailability {
 .div-table-responsive, .div-table-responsive-no-min {
     overflow-x: auto;
     min-height: 0.01%;
+}
+.div-table-responsive {
     line-height: 100%;
 }
 /* Style used for full page tables with field selector and no content after table (priority before previous for such tables) */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3a06d1ee256..e8439a7ab8c 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -609,6 +609,8 @@ div.myavailability {
 .div-table-responsive, .div-table-responsive-no-min {
     overflow-x: auto;
     min-height: 0.01%;
+}
+.div-table-responsive {
     line-height: 100%;
 }
 /* Style used for full page tables with field selector and no content after table (priority before previous for such tables) */

From 170ad1a265f72a984debd0313988014924ca74cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2017 00:56:44 +0100
Subject: [PATCH 0316/1163] Depreciate a class not really used

---
 htdocs/product/class/product.class.php | 32 +++++++++++++++-----------
 htdocs/product/class/service.class.php |  2 ++
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index c9e6bab9922..9726f822636 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -132,7 +132,7 @@ class Product extends CommonObject
 	public $tva_tx;
 	
 	//! French VAT NPR (0 or 1)
-    	public $tva_npr=0;
+    public $tva_npr=0;
 	
 	//! Other local taxes
 	public $localtax1_tx;
@@ -248,7 +248,7 @@ class Product extends CommonObject
 	public $stats_commande=array();
 	public $stats_contrat=array();
 	public $stats_facture=array();
-    	public $stats_commande_fournisseur=array();
+    public $stats_commande_fournisseur=array();
 
 	public $multilangs=array();
 
@@ -272,7 +272,7 @@ class Product extends CommonObject
 
 	public $oldcopy;
 
-    	public $fk_price_expression;
+    public $fk_price_expression;
 
 	/**
 	 * @deprecated
@@ -302,6 +302,7 @@ class Product extends CommonObject
 	 */
 	public $price_autogen = 0;
 
+	
 	/**
 	 * Regular product
 	 */
@@ -319,6 +320,7 @@ class Product extends CommonObject
 	 */
 	const TYPE_STOCKKIT = 3;
 
+	
 	/**
 	 *  Constructor
 	 *
@@ -3635,17 +3637,17 @@ class Product extends CommonObject
 	}
 
 	/**
-	 *    Load information about stock of a product into stock_reel, stock_warehouse[] (including stock_warehouse[idwarehouse]->detail_batch for batch products)
-	 *    This function need a lot of load. If you use it on list, use a cache to execute it one for each product id. 
+	 *    Load information about stock of a product into ->stock_reel, ->stock_warehouse[] (including stock_warehouse[idwarehouse]->detail_batch for batch products)
+	 *    This function need a lot of load. If you use it on list, use a cache to execute it once for each product id. 
 	 *    If ENTREPOT_EXTRA_STATUS set, filtering on warehouse status possible.
 	 *
 	 *    @param      string   $option 		'' = Load all stock info, also from closed and internal warehouses, 
 	 *										'nobatch' = Do not load batch information, 
 	 *										'novirtual' = Do not load virtual stock,
-	 *										'warehouseopen' = Load stock from open warehouses,
-	 *										'warehouseclosed' = Load stock from closed warehouses, 
-	 *										'warehouseinternal' = Load stock from warehouses for internal correct/transfer only
-	 *    @return     int                  < 0 if KO, > 0 if OK
+	 *										'warehouseopen' = Load stock from open warehouses only,
+	 *										'warehouseclosed' = Load stock from closed warehouses only, 
+	 *										'warehouseinternal' = Load stock from warehouses for internal correction/transfer only
+	 *    @return     int                   < 0 if KO, > 0 if OK
 	 *    @see		  load_virtual_stock, getBatchInfo
 	 */
 	function load_stock($option='')
@@ -4223,9 +4225,10 @@ class Product extends CommonObject
 	/**
 	 *  Charge indicateurs this->nb de tableau de bord
 	 *
-	 *  @return     int         <0 si ko, >0 si ok
+	 *  @param     int     $type       0=Product, 1=Service
+	 *  @return    int                 <0 if KO, >0 if OK
 	 */
-	function load_state_board()
+	function load_state_board($type=0)
 	{
 		global $conf, $user;
 
@@ -4234,14 +4237,16 @@ class Product extends CommonObject
 		$sql = "SELECT count(p.rowid) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 		$sql.= ' WHERE p.entity IN ('.getEntity($this->element, 1).')';
-		$sql.= " AND p.fk_product_type <> 1";
+		if ($type == 1) $sql.= " AND p.fk_product_type = 1";
+		else $sql.= " AND p.fk_product_type <> 1";
 
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
 			while ($obj=$this->db->fetch_object($resql))
 			{
-				$this->nb["products"]=$obj->nb;
+				if ($type == 1) $this->nb["services"]=$obj->nb;
+				else $this->nb["products"]=$obj->nb;
 			}
             $this->db->free($resql);
 			return 1;
@@ -4608,4 +4613,5 @@ class Product extends CommonObject
             dol_print_error($this->db);
         }
     }
+    
 }
diff --git a/htdocs/product/class/service.class.php b/htdocs/product/class/service.class.php
index cd3656c2142..40e8d39488b 100644
--- a/htdocs/product/class/service.class.php
+++ b/htdocs/product/class/service.class.php
@@ -26,6 +26,8 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
 
 /**
  *	Class to manage predefined services
+ *
+ *  @deprecated     Use class Product compatible for both product and services
  */
 class Service extends CommonObject
 {

From 04044df36aaee4f0900d02c07d5787b7f456aeed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2017 01:23:21 +0100
Subject: [PATCH 0317/1163] Fix merge

---
 htdocs/expensereport/class/api_expensereports.class.php | 2 +-
 htdocs/expensereport/class/expensereport.class.php      | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 94d41e432f3..03ecb51de79 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -396,7 +396,7 @@ class ExpenseReports extends DolibarrApi
             $this->expensereport->$field = $value;
         }
         
-        if($this->expensereport->update($id, DolibarrApiAccess::$user,1,'','','update'))
+        if($this->expensereport->update(DolibarrApiAccess::$user))
             return $this->get($id);
         
         return false;
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 417aa4a370d..f1c5978a8be 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -324,18 +324,11 @@ class ExpenseReport extends CommonObject
      * update
      *
      * @param   User    $user       User making change
-<<<<<<< HEAD
 	 * @param   int     $notrigger  Disable triggers
-=======
      * @param   User    $newuser    New user we want to have the expense report on.
->>>>>>> branch '5.0' of git@github.com:Dolibarr/dolibarr.git
      * @return  int                 <0 if KO, >0 if OK
      */
-<<<<<<< HEAD
-    function update($user, $notrigger = 0)
-=======
-    function update($user, $userofexpensereport=null)
->>>>>>> branch '5.0' of git@github.com:Dolibarr/dolibarr.git
+    function update($user, $notrigger = 0, $userofexpensereport=null)
     {
         global $langs;
 

From 74e8fb9c19b8f2d69af507f92f76ca3ebd1697d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2017 02:04:25 +0100
Subject: [PATCH 0318/1163] NEW Can set number of dump to keep with job "local
 database backup"

---
 ChangeLog                               |  7 +++++++
 htdocs/admin/tools/dolibarr_export.php  |  9 +++++----
 htdocs/core/class/hookmanager.class.php |  1 +
 htdocs/core/class/utils.class.php       | 14 ++++++++++++++
 htdocs/theme/eldy/style.css.php         |  2 +-
 htdocs/theme/md/style.css.php           |  1 +
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d8387c6a0e3..06ac1181c17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,14 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 5.0.0 compared to 4.0.* *****
 
+WARNING: 
+
+Following changes may create regression for some external modules, but were necessary to make Dolibarr better:
+* The hook getNodeList has been replaced by a normalized 'addreplace' hook getDirList.
+
+ 
 
 ***** ChangeLog for 5.0.0 compared to 4.0.* *****
 For users:
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 8f1e0110ec1..df5dafa43af 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -111,8 +111,9 @@ jQuery(document).ready(function() {
 <?php
 
 print load_fiche_titre($langs->trans("Backup"),'','title_setup');
+//print_barre_liste($langs->trans("Backup"), '', '', '', '', '', $langs->trans("BackupDesc",DOL_DATA_ROOT), 0, 0, 'title_setup');
 
-print $langs->trans("BackupDesc",DOL_DATA_ROOT).'<br><br>';
+print '<div class="center">'.$langs->trans("BackupDesc",DOL_DATA_ROOT).'</div><br><br>';
 
 ?>
 
@@ -121,7 +122,7 @@ print $langs->trans("BackupDesc",DOL_DATA_ROOT).'<br><br>';
 	name="token" value="<?php echo $_SESSION['newtoken']; ?>" /> <input
 	type="hidden" name="export_type" value="server" />
 
-<fieldset id="fieldsetexport"><legend style="font-size: 3em">1</legend>
+<fieldset id="fieldsetexport"><legend class="legendforfieldsetstep" style="font-size: 3em">1</legend>
 
 <?php
 print $langs->trans("BackupDesc3",$dolibarr_main_db_name).'<br>';
@@ -468,7 +469,7 @@ print '</td></tr></table>';
 ?>
 
 </div>
-<div id="backupdatabaseright" class="fichehalfright" style="height:400px; overflow: auto;">
+<div id="backupdatabaseright" class="fichehalfright" style="height:480px; overflow: auto;">
 <div class="ficheaddleft">
 
 <?php
@@ -484,7 +485,7 @@ print '<br>';
 
 <br>
 
-<fieldset><legend style="font-size: 3em">2</legend>
+<fieldset><legend class="legendforfieldsetstep" style="font-size: 3em">2</legend>
 <?php
 print $langs->trans("BackupDesc2",DOL_DATA_ROOT).'<br>';
 print $langs->trans("BackupDescX").'<br><br>';
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 2456005428e..a4d84f008db 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -145,6 +145,7 @@ class HookManager
 			    'formatNotificationMessage',
 			    'getFormMail',
 			    'getIdProfUrl',
+			    'getDirList',
 				'moveUploadedFile',
 			    'pdf_build_address',
 				'pdf_writelinedesc',
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 3f1afa003a3..4e3cf7a0928 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -153,6 +153,7 @@ class Utils
 	{
 		global $db, $conf, $langs, $dolibarr_main_data_root;
 		global $dolibarr_main_db_name, $dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_port, $dolibarr_main_db_pass;
+
 		
 		$langs->load("admin");
 		
@@ -405,6 +406,19 @@ class Utils
 		    $this->output = "";
 		    $this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => $command." ".$paramcrypted);
 		}
+
+		// Clean old files
+		if ($keeplastnfiles > 0)
+		{
+		    $tmpfiles = dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '(\.err|\.old|\.sav)$', 'date', SORT_DESC);
+		    $i=0;
+		    foreach($tmpfiles as $key => $val)
+		    {
+		        $i++;
+		        if ($i <= $keeplastnfiles) continue;
+		        dol_delete_file($val['fullname']);
+		    }
+		}
 		
 		
 		return 0;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index fa884d2d74a..2f248488afe 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -378,7 +378,7 @@ input:-webkit-autofill {
 input:-moz-placeholder { color:#ccc; }
 
 fieldset { border: 1px solid #AAAAAA !important; }
-
+.legendforfieldsetstep { padding-bottom: 10px; }
 
 .button, .buttonDelete, input[name="sbmtConnexion"] {
     font-family: <?php print $fontlist ?>;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e8439a7ab8c..ca1b6d2171c 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -355,6 +355,7 @@ input:-webkit-autofill {
 input:-moz-placeholder { color:#ccc; }
 
 fieldset { border: 1px solid #AAAAAA !important; }
+.legendforfieldsetstep { padding-bottom: 10px; }
 
 
 .button, sbmtConnexion {

From d12caab69adb64441cd86cd5009d1444a0681e1c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2017 02:04:47 +0100
Subject: [PATCH 0319/1163] The hook getNodeList has been replaced by a
 normalized 'addreplace' hook getDirList.

---
 htdocs/core/lib/files.lib.php | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index c5016d9150a..a2d6da7bdc5 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -68,6 +68,11 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 	$path=preg_replace('/([\\/]+)$/i','',$path);
 	$newpath=dol_osencode($path);
 
+	$reshook = 0;
+	$file_list = array();
+	
+	$hookmanager->resArray=array();
+	
 	if (! $nohook)
 	{
 		$hookmanager->initHooks(array('fileslib'));
@@ -84,17 +89,11 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 				'loadsize' => $loadsize,
 				'mode' => $mode
 		);
-		$reshook=$hookmanager->executeHooks('getNodesList', $parameters, $object);
+		$reshook=$hookmanager->executeHooks('getDirList', $parameters, $object);
 	}
 
-	// $reshook may contain returns stacked by other modules
-	// $reshook is always empty with an array to not lose returns stacked with other modules
 	// $hookmanager->resArray may contain array stacked by other modules
-	if (! $nohook && ! empty($hookmanager->resArray)) // forced to use $hookmanager->resArray even if $hookmanager->resArray['nodes'] is empty
-	{
-		return $hookmanager->resArray['nodes'];
-	}
-	else
+	if (empty($reshook))
 	{
 		if (! is_dir($newpath)) return array();
 
@@ -102,7 +101,6 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 		{
 			$filedate='';
 			$filesize='';
-			$file_list = array();
 
 			while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
 			{
@@ -195,14 +193,12 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 				// Sort the data
 				if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
 			}
-
-			return $file_list;
-		}
-		else
-		{
-			return array();
 		}
 	}
+	
+	$file_list = array_merge($file_list, $hookmanager->resArray);
+	
+	return $file_list;
 }
 
 

From 3b85a419911f370d9e257d705903e3703fe36659 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2017 02:14:37 +0100
Subject: [PATCH 0320/1163] Fix PHPCS

---
 htdocs/expensereport/class/expensereport.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index f1c5978a8be..5d2c4a4aaa0 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -323,10 +323,10 @@ class ExpenseReport extends CommonObject
     /**
      * update
      *
-     * @param   User    $user       User making change
-	 * @param   int     $notrigger  Disable triggers
-     * @param   User    $newuser    New user we want to have the expense report on.
-     * @return  int                 <0 if KO, >0 if OK
+     * @param   User    $user                   User making change
+	 * @param   int     $notrigger              Disable triggers
+     * @param   User    $userofexpensereport    New user we want to have the expense report on.
+     * @return  int                             <0 if KO, >0 if OK
      */
     function update($user, $notrigger = 0, $userofexpensereport=null)
     {

From d9ba06e2240758717b922a782d8fde3a3a00e838 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2017 11:42:11 +0100
Subject: [PATCH 0321/1163] Fix bad table

---
 htdocs/compta/bank/class/account.class.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 0e9b25c39a8..63876af6700 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -472,12 +472,10 @@ class Account extends CommonObject
 		if ($accline->insert() > 0) {
 
 			if ($categorie) {
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (";
-				$sql .= "lineid";
-				$sql .= ", fk_categ";
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_account (";
+				$sql .= "fk_account, fk_categorie";
 				$sql .= ") VALUES (";
-				$sql .= "'".$accline->id."'";
-				$sql .= ", '".$categorie."'";
+				$sql .= " ".$accline->id.", ".$categorie;
 				$sql .= ")";
 
 				$result = $this->db->query($sql);

From 0f22beb77485d5f37ee58da34ca414f51fa79612 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2017 10:49:58 +0100
Subject: [PATCH 0322/1163] Upgrade to ckeditor 4.6.2.

---
 dev/dolibarr_changes.txt                      |   10 +-
 htdocs/admin/fckeditor.php                    |    2 +-
 htdocs/core/class/doleditor.class.php         |    2 +-
 htdocs/core/lib/doleditor.lib.php             |    2 +-
 htdocs/core/modules/modFckeditor.class.php    |    2 +-
 htdocs/includes/ckeditor/ckeditor/CHANGES.md  |  141 +-
 htdocs/includes/ckeditor/ckeditor/LICENSE.md  |    4 +-
 htdocs/includes/ckeditor/ckeditor/README.md   |   81 +-
 .../ckeditor/ckeditor/adapters/jquery.js      |    2 +-
 htdocs/includes/ckeditor/ckeditor/bower.json  |   10 -
 .../ckeditor/ckeditor/build-config.js         |   13 +-
 htdocs/includes/ckeditor/ckeditor/ckeditor.js | 1263 +++++++++--------
 .../includes/ckeditor/ckeditor/composer.json  |   20 -
 htdocs/includes/ckeditor/ckeditor/config.js   |    2 +-
 .../includes/ckeditor/ckeditor/contents.css   |   75 +-
 htdocs/includes/ckeditor/ckeditor/lang/af.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/ar.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/az.js  |    5 +
 htdocs/includes/ckeditor/ckeditor/lang/bg.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/bn.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/bs.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/ca.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/cs.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/cy.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/da.js  |    6 +-
 .../includes/ckeditor/ckeditor/lang/de-ch.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/de.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/el.js  |    6 +-
 .../includes/ckeditor/ckeditor/lang/en-au.js  |    6 +-
 .../includes/ckeditor/ckeditor/lang/en-ca.js  |    6 +-
 .../includes/ckeditor/ckeditor/lang/en-gb.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/en.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/eo.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/es.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/et.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/eu.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/fa.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/fi.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/fo.js  |    6 +-
 .../includes/ckeditor/ckeditor/lang/fr-ca.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/fr.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/gl.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/gu.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/he.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/hi.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/hr.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/hu.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/id.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/is.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/it.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/ja.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/ka.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/km.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/ko.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/ku.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/lt.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/lv.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/mk.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/mn.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/ms.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/nb.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/nl.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/no.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/oc.js  |    5 +
 htdocs/includes/ckeditor/ckeditor/lang/pl.js  |    6 +-
 .../includes/ckeditor/ckeditor/lang/pt-br.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/pt.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/ro.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/ru.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/si.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/sk.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/sl.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/sq.js  |    6 +-
 .../ckeditor/ckeditor/lang/sr-latn.js         |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/sr.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/sv.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/th.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/tr.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/tt.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/ug.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/uk.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/vi.js  |    6 +-
 .../includes/ckeditor/ckeditor/lang/zh-cn.js  |    6 +-
 htdocs/includes/ckeditor/ckeditor/lang/zh.js  |    6 +-
 .../includes/ckeditor/ckeditor/package.json   |   26 -
 .../plugins/a11yhelp/dialogs/a11yhelp.js      |   12 +-
 .../dialogs/lang/_translationstatus.txt       |    2 +-
 .../plugins/a11yhelp/dialogs/lang/af.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/ar.js       |    7 +-
 .../plugins/a11yhelp/dialogs/lang/az.js       |   11 +
 .../plugins/a11yhelp/dialogs/lang/bg.js       |    7 +-
 .../plugins/a11yhelp/dialogs/lang/ca.js       |   16 +-
 .../plugins/a11yhelp/dialogs/lang/cs.js       |   10 +-
 .../plugins/a11yhelp/dialogs/lang/cy.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/da.js       |   14 +-
 .../plugins/a11yhelp/dialogs/lang/de-ch.js    |    9 +-
 .../plugins/a11yhelp/dialogs/lang/de.js       |    9 +-
 .../plugins/a11yhelp/dialogs/lang/el.js       |    9 +-
 .../plugins/a11yhelp/dialogs/lang/en-gb.js    |    7 +-
 .../plugins/a11yhelp/dialogs/lang/en.js       |    7 +-
 .../plugins/a11yhelp/dialogs/lang/eo.js       |    9 +-
 .../plugins/a11yhelp/dialogs/lang/es.js       |   15 +-
 .../plugins/a11yhelp/dialogs/lang/et.js       |    7 +-
 .../plugins/a11yhelp/dialogs/lang/eu.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/fa.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/fi.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/fo.js       |    7 +-
 .../plugins/a11yhelp/dialogs/lang/fr-ca.js    |    8 +-
 .../plugins/a11yhelp/dialogs/lang/fr.js       |   19 +-
 .../plugins/a11yhelp/dialogs/lang/gl.js       |    9 +-
 .../plugins/a11yhelp/dialogs/lang/gu.js       |    7 +-
 .../plugins/a11yhelp/dialogs/lang/he.js       |    7 +-
 .../plugins/a11yhelp/dialogs/lang/hi.js       |    7 +-
 .../plugins/a11yhelp/dialogs/lang/hr.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/hu.js       |    9 +-
 .../plugins/a11yhelp/dialogs/lang/id.js       |   16 +-
 .../plugins/a11yhelp/dialogs/lang/it.js       |   10 +-
 .../plugins/a11yhelp/dialogs/lang/ja.js       |    6 +-
 .../plugins/a11yhelp/dialogs/lang/km.js       |    7 +-
 .../plugins/a11yhelp/dialogs/lang/ko.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/ku.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/lt.js       |    7 +-
 .../plugins/a11yhelp/dialogs/lang/lv.js       |    7 +-
 .../plugins/a11yhelp/dialogs/lang/mk.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/mn.js       |    7 +-
 .../plugins/a11yhelp/dialogs/lang/nb.js       |    9 +-
 .../plugins/a11yhelp/dialogs/lang/nl.js       |   15 +-
 .../plugins/a11yhelp/dialogs/lang/no.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/oc.js       |   12 +
 .../plugins/a11yhelp/dialogs/lang/pl.js       |   10 +-
 .../plugins/a11yhelp/dialogs/lang/pt-br.js    |    9 +-
 .../plugins/a11yhelp/dialogs/lang/pt.js       |   16 +-
 .../plugins/a11yhelp/dialogs/lang/ro.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/ru.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/si.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/sk.js       |   10 +-
 .../plugins/a11yhelp/dialogs/lang/sl.js       |   12 +-
 .../plugins/a11yhelp/dialogs/lang/sq.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/sr-latn.js  |    7 +-
 .../plugins/a11yhelp/dialogs/lang/sr.js       |    7 +-
 .../plugins/a11yhelp/dialogs/lang/sv.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/th.js       |    7 +-
 .../plugins/a11yhelp/dialogs/lang/tr.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/tt.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/ug.js       |    9 +-
 .../plugins/a11yhelp/dialogs/lang/uk.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/vi.js       |    8 +-
 .../plugins/a11yhelp/dialogs/lang/zh-cn.js    |    8 +-
 .../plugins/a11yhelp/dialogs/lang/zh.js       |    8 +-
 .../ckeditor/plugins/about/dialogs/about.js   |    7 +-
 .../plugins/clipboard/dialogs/paste.js        |    2 +-
 .../colordialog/dialogs/colordialog.css       |    2 +-
 .../colordialog/dialogs/colordialog.js        |    2 +-
 .../cursors/cursor-disabled.svg               |   25 +
 .../plugins/copyformatting/cursors/cursor.svg |   14 +
 .../copyformatting/styles/copyformatting.css  |   45 +
 .../plugins/dialog/dialogDefinition.js        |    2 +-
 .../ckeditor/plugins/find/dialogs/find.js     |   18 +-
 .../ckeditor/plugins/flash/dialogs/flash.js   |   24 +-
 .../ckeditor/plugins/forms/dialogs/button.js  |    2 +-
 .../plugins/forms/dialogs/checkbox.js         |    2 +-
 .../ckeditor/plugins/forms/dialogs/form.js    |    2 +-
 .../plugins/forms/dialogs/hiddenfield.js      |    2 +-
 .../ckeditor/plugins/forms/dialogs/radio.js   |    2 +-
 .../ckeditor/plugins/forms/dialogs/select.js  |   22 +-
 .../plugins/forms/dialogs/textarea.js         |    2 +-
 .../plugins/forms/dialogs/textfield.js        |    2 +-
 .../ckeditor/ckeditor/plugins/icons.png       |  Bin 20634 -> 12421 bytes
 .../ckeditor/ckeditor/plugins/icons_hidpi.png |  Bin 67753 -> 40265 bytes
 .../ckeditor/plugins/iframe/dialogs/iframe.js |    2 +-
 .../ckeditor/plugins/image/dialogs/image.js   |   56 +-
 .../ckeditor/plugins/link/dialogs/anchor.js   |    2 +-
 .../ckeditor/plugins/link/dialogs/link.js     |   48 +-
 .../ckeditor/plugins/link/images/anchor.png   |  Bin 589 -> 752 bytes
 .../plugins/link/images/hidpi/anchor.png      |  Bin 1379 -> 1109 bytes
 .../plugins/liststyle/dialogs/liststyle.js    |    2 +-
 .../plugins/pastefromword/filter/default.js   |   69 +-
 .../ckeditor/plugins/scayt/dialogs/options.js |   38 +-
 .../plugins/scayt/skins/moono-lisa/scayt.css  |   20 +
 .../ckeditor/plugins/smiley/dialogs/smiley.js |    2 +-
 .../dialogs/lang/_translationstatus.txt       |    2 +-
 .../plugins/specialchar/dialogs/lang/af.js    |    4 +-
 .../plugins/specialchar/dialogs/lang/ar.js    |    4 +-
 .../plugins/specialchar/dialogs/lang/az.js    |   10 +
 .../plugins/specialchar/dialogs/lang/bg.js    |    4 +-
 .../plugins/specialchar/dialogs/lang/ca.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/cs.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/cy.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/da.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/de-ch.js |    2 +-
 .../plugins/specialchar/dialogs/lang/de.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/el.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/en-gb.js |    2 +-
 .../plugins/specialchar/dialogs/lang/en.js    |    4 +-
 .../plugins/specialchar/dialogs/lang/eo.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/es.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/et.js    |    4 +-
 .../plugins/specialchar/dialogs/lang/eu.js    |   10 +-
 .../plugins/specialchar/dialogs/lang/fa.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/fi.js    |    4 +-
 .../plugins/specialchar/dialogs/lang/fr-ca.js |    2 +-
 .../plugins/specialchar/dialogs/lang/fr.js    |   17 +-
 .../plugins/specialchar/dialogs/lang/gl.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/he.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/hr.js    |    4 +-
 .../plugins/specialchar/dialogs/lang/hu.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/id.js    |    4 +-
 .../plugins/specialchar/dialogs/lang/it.js    |    4 +-
 .../plugins/specialchar/dialogs/lang/ja.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/km.js    |    4 +-
 .../plugins/specialchar/dialogs/lang/ko.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/ku.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/lt.js    |    4 +-
 .../plugins/specialchar/dialogs/lang/lv.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/nb.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/nl.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/no.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/oc.js    |   12 +
 .../plugins/specialchar/dialogs/lang/pl.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/pt-br.js |    2 +-
 .../plugins/specialchar/dialogs/lang/pt.js    |   20 +-
 .../plugins/specialchar/dialogs/lang/ru.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/si.js    |    4 +-
 .../plugins/specialchar/dialogs/lang/sk.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/sl.js    |   18 +-
 .../plugins/specialchar/dialogs/lang/sq.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/sv.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/th.js    |    4 +-
 .../plugins/specialchar/dialogs/lang/tr.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/tt.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/ug.js    |    4 +-
 .../plugins/specialchar/dialogs/lang/uk.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/vi.js    |    2 +-
 .../plugins/specialchar/dialogs/lang/zh-cn.js |    2 +-
 .../plugins/specialchar/dialogs/lang/zh.js    |    2 +-
 .../specialchar/dialogs/specialchar.js        |    2 +-
 .../ckeditor/plugins/table/dialogs/table.js   |    2 +-
 .../plugins/tabletools/dialogs/tableCell.js   |    2 +-
 .../plugins/templates/dialogs/templates.css   |    2 +-
 .../plugins/templates/dialogs/templates.js    |    2 +-
 .../plugins/templates/templates/default.js    |    4 +-
 .../templates/templates/images/template1.gif  |  Bin 375 -> 539 bytes
 .../templates/templates/images/template2.gif  |  Bin 333 -> 497 bytes
 .../templates/templates/images/template3.gif  |  Bin 422 -> 557 bytes
 .../ckeditor/plugins/wsc/dialogs/wsc.js       |   18 +-
 .../plugins/wsc/skins/moono-lisa/wsc.css      |   43 +
 .../ckeditor/ckeditor/samples/css/samples.css |   62 +-
 .../ckeditor/ckeditor/samples/index.html      |    4 +-
 .../ckeditor/ckeditor/samples/js/sample.js    |    4 +-
 .../ckeditor/ckeditor/samples/js/sf.js        |    2 +-
 .../ckeditor/ckeditor/samples/old/ajax.html   |    4 +-
 .../ckeditor/ckeditor/samples/old/api.html    |    4 +-
 .../ckeditor/samples/old/appendto.html        |    4 +-
 .../old/assets/outputxhtml/outputxhtml.css    |    2 +-
 .../samples/old/assets/posteddata.php         |    4 +-
 .../old/assets/uilanguages/languages.js       |    8 +-
 .../ckeditor/samples/old/datafiltering.html   |    8 +-
 .../samples/old/dialog/assets/my_dialog.js    |    4 +-
 .../ckeditor/samples/old/dialog/dialog.html   |    4 +-
 .../ckeditor/samples/old/divreplace.html      |    4 +-
 .../samples/old/enterkey/enterkey.html        |    4 +-
 .../old/htmlwriter/outputforflash.html        |    4 +-
 .../samples/old/htmlwriter/outputhtml.html    |    4 +-
 .../ckeditor/ckeditor/samples/old/index.html  |    4 +-
 .../ckeditor/samples/old/inlineall.html       |    4 +-
 .../ckeditor/samples/old/inlinebycode.html    |    4 +-
 .../ckeditor/samples/old/inlinetextarea.html  |    4 +-
 .../ckeditor/ckeditor/samples/old/jquery.html |    4 +-
 .../samples/old/magicline/magicline.html      |    4 +-
 .../ckeditor/samples/old/readonly.html        |    4 +-
 .../ckeditor/samples/old/replacebyclass.html  |    4 +-
 .../ckeditor/samples/old/replacebycode.html   |    4 +-
 .../ckeditor/ckeditor/samples/old/sample.css  |    2 +-
 .../ckeditor/ckeditor/samples/old/sample.js   |    4 +-
 .../samples/old/sample_posteddata.php         |    2 +-
 .../ckeditor/samples/old/tabindex.html        |    4 +-
 .../ckeditor/samples/old/toolbar/toolbar.html |    4 +-
 .../ckeditor/samples/old/uicolor.html         |    4 +-
 .../ckeditor/samples/old/uilanguages.html     |    4 +-
 .../samples/old/wysiwygarea/fullpage.html     |    4 +-
 .../ckeditor/samples/old/xhtmlstyle.html      |    4 +-
 .../samples/toolbarconfigurator/index.html    |    4 +-
 .../ckeditor/skins/moono-lisa/dialog.css      |    5 +
 .../ckeditor/skins/moono-lisa/dialog_ie.css   |    5 +
 .../ckeditor/skins/moono-lisa/dialog_ie8.css  |    5 +
 .../skins/moono-lisa/dialog_iequirks.css      |    5 +
 .../ckeditor/skins/moono-lisa/editor.css      |    5 +
 .../skins/moono-lisa/editor_gecko.css         |    5 +
 .../ckeditor/skins/moono-lisa/editor_ie.css   |    5 +
 .../ckeditor/skins/moono-lisa/editor_ie8.css  |    5 +
 .../skins/moono-lisa/editor_iequirks.css      |    5 +
 .../ckeditor/skins/moono-lisa/icons.png       |  Bin 0 -> 12421 bytes
 .../ckeditor/skins/moono-lisa/icons_hidpi.png |  Bin 0 -> 40265 bytes
 .../{moono => moono-lisa}/images/arrow.png    |  Bin
 .../skins/moono-lisa/images/close.png         |  Bin 0 -> 615 bytes
 .../skins/moono-lisa/images/hidpi/close.png   |  Bin 0 -> 1238 bytes
 .../moono-lisa/images/hidpi/lock-open.png     |  Bin 0 -> 1071 bytes
 .../skins/moono-lisa/images/hidpi/lock.png    |  Bin 0 -> 1062 bytes
 .../skins/moono-lisa/images/hidpi/refresh.png |  Bin 0 -> 1623 bytes
 .../skins/moono-lisa/images/lock-open.png     |  Bin 0 -> 511 bytes
 .../ckeditor/skins/moono-lisa/images/lock.png |  Bin 0 -> 506 bytes
 .../skins/moono-lisa/images/refresh.png       |  Bin 0 -> 757 bytes
 .../{moono => moono-lisa}/images/spinner.gif  |  Bin
 .../skins/{moono => moono-lisa}/readme.md     |   21 +-
 .../ckeditor/ckeditor/skins/moono/dialog.css  |    5 -
 .../ckeditor/skins/moono/dialog_ie.css        |    5 -
 .../ckeditor/skins/moono/dialog_ie7.css       |    5 -
 .../ckeditor/skins/moono/dialog_ie8.css       |    5 -
 .../ckeditor/skins/moono/dialog_iequirks.css  |    5 -
 .../ckeditor/ckeditor/skins/moono/editor.css  |    5 -
 .../ckeditor/skins/moono/editor_gecko.css     |    5 -
 .../ckeditor/skins/moono/editor_ie.css        |    5 -
 .../ckeditor/skins/moono/editor_ie7.css       |    5 -
 .../ckeditor/skins/moono/editor_ie8.css       |    5 -
 .../ckeditor/skins/moono/editor_iequirks.css  |    5 -
 .../ckeditor/ckeditor/skins/moono/icons.png   |  Bin 20634 -> 0 bytes
 .../ckeditor/skins/moono/icons_hidpi.png      |  Bin 67753 -> 0 bytes
 .../ckeditor/skins/moono/images/close.png     |  Bin 468 -> 0 bytes
 .../skins/moono/images/hidpi/close.png        |  Bin 1271 -> 0 bytes
 .../skins/moono/images/hidpi/lock-open.png    |  Bin 1329 -> 0 bytes
 .../skins/moono/images/hidpi/lock.png         |  Bin 1299 -> 0 bytes
 .../skins/moono/images/hidpi/refresh.png      |  Bin 1842 -> 0 bytes
 .../ckeditor/skins/moono/images/lock-open.png |  Bin 349 -> 0 bytes
 .../ckeditor/skins/moono/images/lock.png      |  Bin 475 -> 0 bytes
 .../ckeditor/skins/moono/images/refresh.png   |  Bin 422 -> 0 bytes
 htdocs/includes/ckeditor/ckeditor/styles.js   |   60 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |    3 +
 htdocs/theme/eldy/ckeditor/config.js          |    7 +-
 htdocs/theme/eldy/style.css.php               |    7 +-
 htdocs/theme/md/style.css.php                 |    7 +-
 330 files changed, 2065 insertions(+), 1688 deletions(-)
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/bower.json
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/composer.json
 create mode 100644 htdocs/includes/ckeditor/ckeditor/lang/az.js
 create mode 100644 htdocs/includes/ckeditor/ckeditor/lang/oc.js
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/package.json
 create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/az.js
 create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js
 create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/cursors/cursor-disabled.svg
 create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/cursors/cursor.svg
 create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/styles/copyformatting.css
 create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/scayt/skins/moono-lisa/scayt.css
 create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/az.js
 create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/oc.js
 create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/wsc/skins/moono-lisa/wsc.css
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog.css
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie.css
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie8.css
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_iequirks.css
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor.css
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_gecko.css
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie.css
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie8.css
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_iequirks.css
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/icons.png
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/icons_hidpi.png
 rename htdocs/includes/ckeditor/ckeditor/skins/{moono => moono-lisa}/images/arrow.png (100%)
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/close.png
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/hidpi/close.png
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/hidpi/lock.png
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/hidpi/refresh.png
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/lock-open.png
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/lock.png
 create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/refresh.png
 rename htdocs/includes/ckeditor/ckeditor/skins/{moono => moono-lisa}/images/spinner.gif (100%)
 rename htdocs/includes/ckeditor/ckeditor/skins/{moono => moono-lisa}/readme.md (72%)
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/dialog.css
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/editor.css
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie.css
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/icons.png
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/icons_hidpi.png
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/images/close.png
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/close.png
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.png
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/images/lock-open.png
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/images/lock.png
 delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/images/refresh.png

diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index b4a4d29dce9..9b82bd05b2a 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -8,13 +8,13 @@ ALL:
 Check "DOL_CHANGE"
 
 
-CKEDITOR:
----------
+CKEDITOR (4.6.2):
+-----------------
 * In ckeditor/ckeditor/contents.css
 Replace:
-	margin: 20px;
+	body { ... margin: 20px;
 With
-	margin: 5px;
+	body { ... margin: 5px;
 
 
 
@@ -39,7 +39,7 @@ define('QR_FIND_FROM_RANDOM', 2);
 with
 define('QR_FIND_FROM_RANDOM', false);
 
-* Removed useless directories (examples, tools)
+* Removed useless directories ("examples", "tools")
 
 * Fix
  	// initialize subsetchars
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 54990b45913..23ff67f92e7 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -189,7 +189,7 @@ else
     show_skin(null,1);
     print '<br>'."\n";
     
-    $listofmodes=array('dolibarr_mailings','dolibarr_notes','dolibarr_details','Full');
+    $listofmodes=array('dolibarr_mailings','dolibarr_notes','dolibarr_details','dolibarr_readonly','Full');
     $linkstomode='';
     foreach($listofmodes as $newmode)
     {
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 73b085169b0..5d30ab3b839 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -178,7 +178,7 @@ class DolEditor
             	if (! empty($conf->global->FCKEDITOR_SKIN)) {
 					$skin = $conf->global->FCKEDITOR_SKIN;
 				} else {
-					$skin = 'moono'; // default with ckeditor 4 : moono
+					$skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
 				}
 
             	$htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false';
diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
index 5be16a4c471..5ba8570ab57 100644
--- a/htdocs/core/lib/doleditor.lib.php
+++ b/htdocs/core/lib/doleditor.lib.php
@@ -52,7 +52,7 @@ function show_skin($fuser,$edit=0)
 	// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
 
     $selected_theme='';
-    if (empty($conf->global->FCKEDITOR_SKIN)) $selected_theme='moono';
+    if (empty($conf->global->FCKEDITOR_SKIN)) $selected_theme='moono-lisa';
     else $selected_theme=$conf->global->FCKEDITOR_SKIN;
 
     $colspan=2;
diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
index ec7ce4dda14..8752c553a77 100644
--- a/htdocs/core/modules/modFckeditor.class.php
+++ b/htdocs/core/modules/modFckeditor.class.php
@@ -75,7 +75,7 @@ class modFckeditor extends DolibarrModules
         $this->const[3]  = array("FCKEDITOR_ENABLE_DETAILS","yesno","1","WYSIWIG for products details lines for all entities");
         $this->const[4]  = array("FCKEDITOR_ENABLE_USERSIGN","yesno","1","WYSIWIG for user signature");
         $this->const[5]  = array("FCKEDITOR_ENABLE_MAIL","yesno","1","WYSIWIG for products details lines for all entities");
-		$this->const[6]  = array("FCKEDITOR_SKIN","string","moono","Skin by default for fckeditor");
+		$this->const[6]  = array("FCKEDITOR_SKIN","string","moono-lisa","Skin by default for fckeditor");
 
 		// Boxes
 		$this->boxes = array();
diff --git a/htdocs/includes/ckeditor/ckeditor/CHANGES.md b/htdocs/includes/ckeditor/ckeditor/CHANGES.md
index f1fb5c7a31d..72c579805b4 100644
--- a/htdocs/includes/ckeditor/ckeditor/CHANGES.md
+++ b/htdocs/includes/ckeditor/ckeditor/CHANGES.md
@@ -1,6 +1,146 @@
 CKEditor 4 Changelog
 ====================
 
+## CKEditor 4.6.2
+
+New Features:
+
+* [#16733](http://dev.ckeditor.com/ticket/16733): Added a new pastel color palette for the [Color Button](http://ckeditor.com/addon/colorbutton) plugin and a new [`config.colorButton_colorsPerRow`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-colorButton_colorsPerRow) configuration option for setting the number of rows in the color selector.
+* [#16752](http://dev.ckeditor.com/ticket/16752): Added a new Azerbaijani localization. Thanks to the [Azerbaijani language team](https://www.transifex.com/ckeditor/teams/11143/az/)!
+* [#13818](http://dev.ckeditor.com/ticket/13818): It is now possible to group [Widget](http://ckeditor.com/addon/widget) [style definitions](http://docs.ckeditor.com/#!/guide/dev_styles-section-widget-styles), so applying one style disables the other.
+
+Fixed Issues:
+
+* [#13446](http://dev.ckeditor.com/ticket/13446): [Chrome] Fixed: It is possible to type in an unfocused inline editor.
+* [#14856](http://dev.ckeditor.com/ticket/14856): Fixed: [Font size and font family](http://ckeditor.com/addon/font) reset each other when modified at certain positions.
+* [#16745](http://dev.ckeditor.com/ticket/16745): [Edge] Fixed: List items are lost when [pasted from Word](http://ckeditor.com/addon/pastefromword).
+* [#16682](http://dev.ckeditor.com/ticket/16682): [Edge] Fixed: A list gets [pasted from Word](http://ckeditor.com/addon/pastefromword) as a set of paragraphs. Added the [`config.pasteFromWord_heuristicsEdgeList`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWord_heuristicsEdgeList) configuration option.
+* [#10373](http://dev.ckeditor.com/ticket/10373): Fixed: Context menu items can be dragged into the editor.
+* [#16728](http://dev.ckeditor.com/ticket/16728): [IE] Fixed: [Copy Formatting](http://ckeditor.com/addon/copyformatting) breaks the editor in Quirks Mode.
+* [#16795](http://dev.ckeditor.com/ticket/16795): [IE] Fixed: [Copy Formatting](http://ckeditor.com/addon/copyformatting) breaks the editor in Compatibility Mode.
+* [#16675](http://dev.ckeditor.com/ticket/16675): Fixed: Styles applied with [Copy Formatting](http://ckeditor.com/addon/copyformatting) to a single table cell are applied to the whole table.
+* [#16753](http://dev.ckeditor.com/ticket/16753): Fixed: [`element.setSize`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-setSize) sets incorrect editor dimensions if the border width is represented as a fraction of pixels.
+* [#16705](http://dev.ckeditor.com/ticket/16705): [Firefox] Fixed: Unable to paste images as Base64 strings when using [Clipboard](http://ckeditor.com/addon/clipboard).
+* [#14869](http://dev.ckeditor.com/ticket/14869): Fixed: JavaScript error is thrown when trying to use [Find](http://ckeditor.com/addon/find) in a [`<div>`-based editor](http://ckeditor.com/addon/divarea).
+
+## CKEditor 4.6.1
+
+New Features:
+
+* [#16639](http://dev.ckeditor.com/ticket/16639): The `callback` parameter in the [CKEDITOR.ajax.post](http://docs.ckeditor.com/#!/api/CKEDITOR.ajax-method-post) method became optional.
+
+Fixed Issues:
+
+* [#11064](http://dev.ckeditor.com/ticket/11064): [Blink, WebKit] Fixed: Cannot select all editor content when a widget or a non-editable element is the first or last element of the content. Also fixes this issue in the [Select All](http://ckeditor.com/addon/selectall) plugin.
+* [#14755](http://dev.ckeditor.com/ticket/14755): [Blink, WebKit, IE8] Fixed: Browser hangs when a table is inserted in the place of a selected list with an empty last item.
+* [#16624](http://dev.ckeditor.com/ticket/16624): Fixed: Improved the [Color Button](http://ckeditor.com/addon/colorbutton) plugin which will now normalize the CSS `background` property if it only contains a color value. This fixes missing background colors when using [Paste from Word](http://ckeditor.com/addon/pastefromword).
+* [#16600](http://dev.ckeditor.com/ticket/16600): [Blink, WebKit] Fixed: Error thrown occasionally by an uninitialized editable for multiple CKEditor instances on the same page.
+
+## CKEditor 4.6
+
+New Features:
+
+* [#14569](http://dev.ckeditor.com/ticket/14569): Added a new, flat, default CKEditor skin called [Moono-Lisa](http://ckeditor.com/addon/moono-lisa). Refreshed default colors available in the [Color Button](http://ckeditor.com/addon/colorbutton) plugin ([Text Color and Background Color](http://docs.ckeditor.com/#!/guide/dev_colorbutton) feature).
+* [#14707](http://dev.ckeditor.com/ticket/14707): Added a new [Copy Formatting](http://ckeditor.com/addon/copyformatting) feature to enable easy copying of styles between your document parts.
+* Introduced the completely rewritten [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin:
+	* Backward incompatibility: The [`config.pasteFromWordRemoveFontStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveFontStyles) option now defaults to `false`. This option will be deprecated in the future. Use [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_acf) to replicate the effect of setting it to `true`.
+	* Backward incompatibility: The [`config.pasteFromWordNumberedHeadingToList`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordNumberedHeadingToList) and [`config.pasteFromWordRemoveStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveStyles) options were dropped and no longer have any effect on pasted content.
+	* Major improvements in preservation of list numbering, styling and indentation (nested lists with multiple levels).
+	* Major improvements in document structure parsing that fix plenty of issues with distorted or missing content after paste.
+* Added new translation: Occitan. Thanks to [Cédric Valmary](https://totenoc.eu/)!
+* [#10015](http://dev.ckeditor.com/ticket/10015): Keyboard shortcuts (relevant to the operating system in use) will now be displayed in tooltips and context menus.
+* [#13794](http://dev.ckeditor.com/ticket/13794): The [Upload Image](http://ckeditor.com/addon/uploadimage) feature now uses `uploaded.width/height` if set.
+* [#12541](http://dev.ckeditor.com/ticket/12541): Added the [Upload File](http://ckeditor.com/addon/uploadfile) plugin that lets you upload a file by drag&amp;dropping it into the editor content.
+* [#14449](http://dev.ckeditor.com/ticket/14449): Introduced the [Balloon Panel](http://ckeditor.com/addon/balloonpanel) plugin that lets you create stylish floating UI elements for the editor.
+* [#12077](https://dev.ckeditor.com/ticket/12077): Added support for the HTML5 `download` attribute in link (`<a>`) elements. Selecting the "Force Download" checkbox in the [Link](http://ckeditor.com/addon/link) dialog will cause the linked file to be downloaded automatically. Thanks to [sbusse](https://github.com/sbusse)!
+* [#13518](http://dev.ckeditor.com/ticket/13518): Introduced the [`additionalRequestParameters`](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadWidgetDefinition-property-additionalRequestParameters) property for file uploads to make it possible to send additional information about the uploaded file to the server.
+* [#14889](http://dev.ckeditor.com/ticket/14889): Added the [`config.image2_altRequired`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_altRequired) option for the [Enhanced Image](http://ckeditor.com/addon/image2) plugin to allow making alternative text a mandatory field. Thanks to [Andrey Fedoseev](https://github.com/andreyfedoseev)!
+
+Fixed Issues:
+
+* [#9991](http://dev.ckeditor.com/ticket/9991): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) should only normalize input data.
+* [#7209](http://dev.ckeditor.com/ticket/7209): Fixed: Lists with 3 levels not [pasted from Word](http://ckeditor.com/addon/pastefromword) correctly.
+* [#14335](http://dev.ckeditor.com/ticket/14335): Fixed: Pasting a numbered list starting with a value different from "1" from Microsoft Word does not work correctly.
+* [#14542](http://dev.ckeditor.com/ticket/14542): Fixed: Copying a numbered list from Microsoft Word does not preserve list formatting.
+* [#14544](http://dev.ckeditor.com/ticket/14544): Fixed: Copying a nested list from Microsoft Word results in an empty list.
+* [#14660](http://dev.ckeditor.com/ticket/14660): Fixed: [Pasting text from  Word](http://ckeditor.com/addon/pastefromword) breaks the styling in some cases.
+* [#14867](http://dev.ckeditor.com/ticket/14867): [Firefox] Fixed: Text gets stripped when [pasting content from Word](http://ckeditor.com/addon/pastefromword).
+* [#2507](http://dev.ckeditor.com/ticket/2507): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) does not detect pasting a part of a paragraph.
+* [#3336](http://dev.ckeditor.com/ticket/3336): Fixed: Extra blank row added on top of the content [pasted from Word](http://ckeditor.com/addon/pastefromword).
+* [#6115](http://dev.ckeditor.com/ticket/6115): Fixed: When Right-to-Left text direction is applied to a table [pasted from Word](http://ckeditor.com/addon/pastefromword), borders are missing on one side.
+* [#6342](http://dev.ckeditor.com/ticket/6342): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filters out a basic text style when it is [configured to use attributes](http://docs.ckeditor.com/#!/guide/dev_basicstyles-section-custom-basic-text-style-definition).
+* [#6457](http://dev.ckeditor.com/ticket/6457): [IE] Fixed: [Pasting from Word](http://ckeditor.com/addon/pastefromword) is extremely slow.
+* [#6789](http://dev.ckeditor.com/ticket/6789): Fixed: The `mso-list: ignore` style is not handled properly when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#7262](http://dev.ckeditor.com/ticket/7262): Fixed: Lists in preformatted body disappear when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#7662](http://dev.ckeditor.com/ticket/7662): [Opera] Fixed: Extra empty number/bullet shown in the editor body when editing a multi-level list [pasted from Word](http://ckeditor.com/addon/pastefromword).
+* [#7807](http://dev.ckeditor.com/ticket/7807): Fixed: Last item in a list not converted to a `<li>` element after [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#7950](http://dev.ckeditor.com/ticket/7950): [IE] Fixed: Content [from Word pasted](http://ckeditor.com/addon/pastefromword) differently than in other browsers.
+* [#7982](http://dev.ckeditor.com/ticket/7982): Fixed: Multi-level lists get split into smaller ones when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#8231](http://dev.ckeditor.com/ticket/8231): [WebKit, Opera] Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) inserts empty paragraphs.
+* [#8266](http://dev.ckeditor.com/ticket/8266): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) inserts a blank line at the top.
+* [#8341](http://dev.ckeditor.com/ticket/8341), [#7646](http://dev.ckeditor.com/ticket/7646): Fixed: Faulty removal of empty `<span>` elements in [Paste from Word](http://ckeditor.com/addon/pastefromword) content cleanup breaking content formatting.
+* [#8754](http://dev.ckeditor.com/ticket/8754): [Firefox] Fixed: Incorrect pasting of multiple nested lists in [Paste from Word](http://ckeditor.com/addon/pastefromword).
+* [#8983](http://dev.ckeditor.com/ticket/8983): Fixed: Alignment lost when [pasting from Word](http://ckeditor.com/addon/pastefromword) with [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) set to [`CKEDITOR.ENTER_BR`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-ENTER_BR).
+* [#9331](http://dev.ckeditor.com/ticket/9331): [IE] Fixed: [Pasting text from Word](http://ckeditor.com/addon/pastefromword) creates a simple Caesar cipher.
+* [#9422](http://dev.ckeditor.com/ticket/9422): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) leaves an unwanted `color:windowtext` style.
+* [#10011](http://dev.ckeditor.com/ticket/10011): [IE9-10] Fixed: [`config.pasteFromWordRemoveFontStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveFontStyles) is ignored under certain conditions.
+* [#10643](http://dev.ckeditor.com/ticket/10643): Fixed: Differences between using <kbd>Ctrl+V</kbd> and pasting from the [Paste from Word](http://ckeditor.com/addon/pastefromword) dialog.
+* [#10784](http://dev.ckeditor.com/ticket/10784): Fixed: Lines missing when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#11294](http://dev.ckeditor.com/ticket/11294): [IE10] Fixed: Font size is not preserved when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#11627](http://dev.ckeditor.com/ticket/11627): Fixed: Missing words when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#12784](http://dev.ckeditor.com/ticket/12784): Fixed: Bulleted list with custom bullets gets changed to a numbered list when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#13174](http://dev.ckeditor.com/ticket/13174): Fixed: Data loss after [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#13828](http://dev.ckeditor.com/ticket/13828): Fixed: Widget classes should be added to the wrapper rather than the widget element.
+* [#13829](http://dev.ckeditor.com/ticket/13829): Fixed: No class in [Widget](http://ckeditor.com/addon/widget) wrapper to identify the widget type.
+* [#13519](http://dev.ckeditor.com/ticket/13519): Server response received when uploading files should be more flexible.
+
+Other Changes:
+
+* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type) and [WebSpellChecker](http://ckeditor.com/addon/wsc) plugins:
+ 	* Support for the new default Moono-Lisa skin.
+ 	* [#121](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/121): Fixed: [Basic Styles](http://ckeditor.com/addon/basicstyles) do not work when SCAYT is enabled.
+ 	* [#125](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/125): Fixed: Inline styles are not continued when writing multiple lines of styled text with SCAYT enabled.
+ 	* [#127](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/127): Fixed: Uncaught TypeError after enabling SCAYT in the CKEditor `<div>` element.
+ 	* [#128](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/128): Fixed: Error thrown after enabling SCAYT caused by conflicts with RequireJS.
+
+## CKEditor 4.5.11
+
+**Security Updates:**
+
+* [Severity: minor] Fixed the `target="_blank"` vulnerability reported by James Gaskell.
+
+	Issue summary: If a victim had access to a spoofed version of ckeditor.com via HTTP (e.g. due to DNS spoofing, using a hacked public network or mailicious hotspot), then when using a link to the ckeditor.com website it was possible for the attacker to change the current URL of the opening page, even if the opening page was protected with SSL.
+
+  An upgrade is recommended.
+
+New Features:
+
+* [#14747](http://dev.ckeditor.com/ticket/14747): The [Enhanced Image](http://ckeditor.com/addon/image2) caption now supports the link `target` attribute.
+* [#7154](http://dev.ckeditor.com/ticket/7154): Added support for the "Display Text" field to the [Link](http://ckeditor.com/addon/link) dialog. Thanks to [Ryan Guill](https://github.com/ryanguill)!
+
+Fixed Issues:
+
+* [#13362](http://dev.ckeditor.com/ticket/13362): [Blink, WebKit] Fixed: Active widget element is not cached when it is losing focus and it is inside an editable element.
+* [#13755](http://dev.ckeditor.com/ticket/13755): [Edge] Fixed: Pasting images does not work.
+* [#13548](http://dev.ckeditor.com/ticket/13548): [IE] Fixed: Clicking the [elements path](http://ckeditor.com/addon/elementspath) disables Cut and Copy icons.
+* [#13812](http://dev.ckeditor.com/ticket/13812): Fixed: When aborting file upload the placeholder for image is left.
+* [#14659](http://dev.ckeditor.com/ticket/14659): [Blink] Fixed: Content scrolled to the top after closing the dialog in a [`<div>`-based editor](http://ckeditor.com/addon/divarea).
+* [#14825](http://dev.ckeditor.com/ticket/14825): [Edge] Fixed: Focusing the editor causes unwanted scrolling due to dropped support for the `setActive` method.
+
+## CKEditor 4.5.10
+
+Fixed Issues:
+
+* [#10750](http://dev.ckeditor.com/ticket/10750): Fixed: The editor does not escape the `font-style` family property correctly, removing quotes and whitespace from font names.
+* [#14413](http://dev.ckeditor.com/ticket/14413): Fixed: The [Auto Grow](http://ckeditor.com/addon/autogrow) plugin with the [`config.autoGrow_onStartup`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-autoGrow_onStartup) option set to `true` does not work properly for an editor that is not visible.
+* [#14451](http://dev.ckeditor.com/ticket/14451): Fixed: Numeric element ID not escaped properly. Thanks to [Jakub Chalupa](https://github.com/chaluja7)!
+* [#14590](http://dev.ckeditor.com/ticket/14590): Fixed: Additional line break appearing after inline elements when switching modes. Thanks to [dpidcock](https://github.com/dpidcock)!
+* [#14539](https://dev.ckeditor.com/ticket/14539): Fixed: JAWS reads "selected Blank" instead of "selected <widget name>" when selecting a widget.
+* [#14701](http://dev.ckeditor.com/ticket/14701): Fixed: More precise labels for [Enhanced Image](http://ckeditor.com/addon/image2) and [Placeholder](http://ckeditor.com/addon/placeholder) widgets.
+* [#14667](http://dev.ckeditor.com/ticket/14667): [IE] Fixed: Removing background color from selected text removes background color from the whole paragraph.
+* [#14252](http://dev.ckeditor.com/ticket/14252): [IE] Fixed: Styles drop-down list does not always reflect the current style of the text line.
+* [#14275](http://dev.ckeditor.com/ticket/14275): [IE9+] Fixed: `onerror` and `onload` events are not used in browsers it could have been used when loading scripts dynamically.
+
 ## CKEditor 4.5.9
 
 Fixed Issues:
@@ -14,7 +154,6 @@ Fixed Issues:
 * [#11697](http://dev.ckeditor.com/ticket/11697): Fixed: Content is replaced ignoring the letter case setting in the [Find and Replace](http://ckeditor.com/addon/find) dialog window.
 * [#13886](http://dev.ckeditor.com/ticket/13886): Fixed: Invalid handling of the [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) instance with the `styles` property by [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter).
 * [#14535](http://dev.ckeditor.com/ticket/14535): Fixed: CSS syntax corrections. Thanks to [mdjdenormandie](https://github.com/mdjdenormandie)!
-* [#14312](http://dev.ckeditor.com/ticket/14312): [IE] Fixed: Artifact is visible after pasting any text.
 
 ## CKEditor 4.5.8
 
diff --git a/htdocs/includes/ckeditor/ckeditor/LICENSE.md b/htdocs/includes/ckeditor/ckeditor/LICENSE.md
index 55be53afa12..d6f58ca440e 100644
--- a/htdocs/includes/ckeditor/ckeditor/LICENSE.md
+++ b/htdocs/includes/ckeditor/ckeditor/LICENSE.md
@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 CKEditor - The text editor for Internet - http://ckeditor.com
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 
 Licensed under the terms of any of the following licenses at your
 choice:
@@ -37,7 +37,7 @@ done by developers outside of CKSource with their express permission.
 
 The following libraries are included in CKEditor under the MIT license (see Appendix D):
 
-* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2016, CKSource - Frederico Knabben.
+* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2017, CKSource - Frederico Knabben.
 * PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
 * CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.
 
diff --git a/htdocs/includes/ckeditor/ckeditor/README.md b/htdocs/includes/ckeditor/ckeditor/README.md
index d6b5e2af515..d18d4a108e2 100644
--- a/htdocs/includes/ckeditor/ckeditor/README.md
+++ b/htdocs/includes/ckeditor/ckeditor/README.md
@@ -1,82 +1,39 @@
-CKEditor 4 - Releases
-=====================
+CKEditor 4
+==========
 
-## Releases Code
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+http://ckeditor.com - See LICENSE.md for license information.
 
-This repository contains the official release versions of [CKEditor](http://ckeditor.com).
-
-There are four versions for each release &mdash; `standard-all`, `basic`, `standard`, and `full`.
-They differ in the number of plugins that are compiled into the main `ckeditor.js` file as well as the toolbar configuration.
-
-See the [comparison](http://ckeditor.com/presets) of the `basic`, `standard`, and `full` installation presets for more details.
-
-The `standard-all` build includes all official CKSource plugins with only those from the `standard` installation preset compiled into the `ckeditor.js` file and enabled in the configuration. 
-
-All versions available in this repository were built using [CKBuilder](http://ckeditor.com/builder), so they are optimized and ready to be used in a production environment.
+CKEditor is a text editor to be used inside web pages. It's not a replacement
+for desktop text editors like Word or OpenOffice, but a component to be used as
+part of web applications and websites.
 
 ## Documentation
 
-Developer documentation for CKEditor is available online at: <http://docs.ckeditor.com>.
+The full editor documentation is available online at the following address:
+http://docs.ckeditor.com
 
 ## Installation
 
-### Git clone
+Installing CKEditor is an easy task. Just follow these simple steps:
 
-To install one of the available releases, just clone this repository and switch to the respective branch (see next section):
+ 1. **Download** the latest version from the CKEditor website:
+    http://ckeditor.com. You should have already completed this step, but be
+    sure you have the very latest version.
+ 2. **Extract** (decompress) the downloaded file into the root of your website.
 
-	git clone -b <release branch> git://github.com/ckeditor/ckeditor-releases.git
-	
-### Git submodule
-
-If you are using git for your project and you want to integrate CKEditor, we recommend to add this repository as a
-[submodule](http://git-scm.com/book/en/Git-Tools-Submodules).
-
-	git submodule add -b <release branch> git://github.com/ckeditor/ckeditor-releases.git <clone dir>
-	git commit -m "Added CKEditor submodule in <clone dir> directory."
-
-### Using Package Managers
-
-See the [Installing CKEditor with Package Managers](http://docs.ckeditor.com/#!/guide/dev_package_managers) article for more details about installing CKEditor with Bower and Composer.
-
-## Repository Structure
-
-### Branches
-
-This repository contains the following branches:
-
-  - `master` and `latest` &ndash; the latest release of the `standard-all` preset (including betas).
-  - `stable` &ndash; the latest stable release of the `standard-all` preset (non-beta).
-  - `A.B.x` (e.g. `4.3.x`) &ndash; the latest release of the `standard-all` preset in the `A.B` branch.
-  - `(basic|standard|full)/stable` &ndash; the latest stable release tag point (non-beta).
-  - `(basic|standard|full)/latest` &ndash; the latest release tag point (including betas).
-  - `(basic|standard|full)/A.B.x` (e.g. `basic/4.0.x`) &ndash; the latest releases in the `A.B` branch.
-
-### Tags
-
-**Since version 4.3.3** this repository uses the following tag naming rules:
-
-  - `x.y.z` &ndash; contains the `standard-all` editor build, e.g. `4.3.3`, `4.4.0` etc.
-  - `(basic|standard|full)/x.y.z` &ndash; contains the editor build with a given preset, e.g. `basic/4.3.3`.
-
-The version numbers follow the [Semantic Versioning 2.0.0](http://semver.org/) scheme.
-
-Up to version **4.3.2** the tags were released in the following form `x.y[.z]/(basic|standard|full)`.
-For example: `4.0/basic`, `4.0.1/standard`. This convention was changed in CKEditor 4.3.3 to conform to the Semantic Versioning scheme.
+**Note:** CKEditor is by default installed in the `ckeditor` folder. You can
+place the files in whichever you want though.
 
 ## Checking Your Installation
 
-The editor comes with a few sample pages that can be used to verify if the installation succeeded. Take a look at the `samples` directory.
+The editor comes with a few sample pages that can be used to verify that
+installation proceeded properly. Take a look at the `samples` directory.
 
-To test your installation, just call the following page for your website:
+To test your installation, just call the following page at your website:
 
 	http://<your site>/<CKEditor installation path>/samples/index.html
 
 For example:
 
 	http://www.example.com/ckeditor/samples/index.html
-
-### License
-
-Licensed under the GPL, LGPL, and MPL licenses, at your choice.
-
-Please check the `LICENSE.md` file for more information about the license.
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/adapters/jquery.js b/htdocs/includes/ckeditor/ckeditor/adapters/jquery.js
index 9a99b650f87..86cb458bcfe 100644
--- a/htdocs/includes/ckeditor/ckeditor/adapters/jquery.js
+++ b/htdocs/includes/ckeditor/ckeditor/adapters/jquery.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 (function(a){if("undefined"==typeof a)throw Error("jQuery should be loaded before CKEditor jQuery adapter.");if("undefined"==typeof CKEDITOR)throw Error("CKEditor should be loaded before CKEditor jQuery adapter.");CKEDITOR.config.jqueryOverrideVal="undefined"==typeof CKEDITOR.config.jqueryOverrideVal?!0:CKEDITOR.config.jqueryOverrideVal;a.extend(a.fn,{ckeditorGet:function(){var a=this.eq(0).data("ckeditorInstance");if(!a)throw"CKEditor is not initialized yet, use ckeditor() with a callback.";return a},
diff --git a/htdocs/includes/ckeditor/ckeditor/bower.json b/htdocs/includes/ckeditor/ckeditor/bower.json
deleted file mode 100644
index 1adf76eff5f..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/bower.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"name": "ckeditor",
-	"description": "JavaScript WYSIWYG web text editor.",
-	"keywords": [ "ckeditor", "fckeditor", "editor", "wysiwyg", "html", "richtext", "text", "javascript" ],
-	"authors": "CKSource (http://cksource.com/)",
-	"license": "For licensing, see LICENSE.md or http://ckeditor.com/license.",
-	"homepage": "http://ckeditor.com",
-	"main": "./ckeditor.js",
-	"moduleType": "globals"
-}
diff --git a/htdocs/includes/ckeditor/ckeditor/build-config.js b/htdocs/includes/ckeditor/ckeditor/build-config.js
index 26859b96e8e..fa45146cc6d 100644
--- a/htdocs/includes/ckeditor/ckeditor/build-config.js
+++ b/htdocs/includes/ckeditor/ckeditor/build-config.js
@@ -1,5 +1,5 @@
-/**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/**
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md or http://ckeditor.com/license
  */
 
@@ -13,10 +13,10 @@
  * (1) http://ckeditor.com/builder
  *     Visit online builder to build CKEditor from scratch.
  *
- * (2) http://ckeditor.com/builder/9112f95de78a7f2c3576c61a29c8fc5b
+ * (2) http://ckeditor.com/builder/50877b4c1fcbadd4a2c7659a7907c067
  *     Visit online builder to build CKEditor, starting with the same setup as before.
  *
- * (3) http://ckeditor.com/builder/download/9112f95de78a7f2c3576c61a29c8fc5b
+ * (3) http://ckeditor.com/builder/download/50877b4c1fcbadd4a2c7659a7907c067
  *     Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
  *
  * NOTE:
@@ -25,7 +25,7 @@
  */
 
 var CKBUILDER_CONFIG = {
-	skin: 'moono',
+	skin: 'moono-lisa',
 	preset: 'full',
 	ignore: [
 		'.bender',
@@ -59,6 +59,7 @@ var CKBUILDER_CONFIG = {
 		'colorbutton' : 1,
 		'colordialog' : 1,
 		'contextmenu' : 1,
+		'copyformatting' : 1,
 		'dialogadvtab' : 1,
 		'div' : 1,
 		'elementspath' : 1,
@@ -113,6 +114,7 @@ var CKBUILDER_CONFIG = {
 	languages : {
 		'af' : 1,
 		'ar' : 1,
+		'az' : 1,
 		'bg' : 1,
 		'bn' : 1,
 		'bs' : 1,
@@ -158,6 +160,7 @@ var CKBUILDER_CONFIG = {
 		'nb' : 1,
 		'nl' : 1,
 		'no' : 1,
+		'oc' : 1,
 		'pl' : 1,
 		'pt' : 1,
 		'pt-br' : 1,
diff --git a/htdocs/includes/ckeditor/ckeditor/ckeditor.js b/htdocs/includes/ckeditor/ckeditor/ckeditor.js
index 0f453150da9..d2584b26e0e 100644
--- a/htdocs/includes/ckeditor/ckeditor/ckeditor.js
+++ b/htdocs/includes/ckeditor/ckeditor/ckeditor.js
@@ -1,15 +1,15 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,d={timestamp:"G4CD",version:"4.5.9",revision:"a35abfe",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var b=window.CKEDITOR_BASEPATH||"";if(!b)for(var c=document.getElementsByTagName("script"),d=0;d<c.length;d++){var k=c[d].src.match(a);if(k){b=k[1];break}}-1==b.indexOf(":/")&&"//"!=b.slice(0,2)&&(b=0===b.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+
+(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,d={timestamp:"H0CG",version:"4.6.2",revision:"20af917",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var b=window.CKEDITOR_BASEPATH||"";if(!b)for(var c=document.getElementsByTagName("script"),d=0;d<c.length;d++){var h=c[d].src.match(a);if(h){b=h[1];break}}-1==b.indexOf(":/")&&"//"!=b.slice(0,2)&&(b=0===b.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+
 b:location.href.match(/^[^\?]*\/(?:)/)[0]+b);if(!b)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return b}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&"/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a)&&(a+=(0<=a.indexOf("?")?"\x26":"?")+"t\x3d"+this.timestamp);return a},domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",
 a,!1),b()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),b())}catch(c){}}function b(){for(var a;a=c.shift();)a()}var c=[];return function(b){function d(){try{document.documentElement.doScroll("left")}catch(f){setTimeout(d,1);return}a()}c.push(b);"complete"===document.readyState&&setTimeout(a,1);if(1==c.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",
-a);window.attachEvent("onload",a);b=!1;try{b=!window.frameElement}catch(w){}document.documentElement.doScroll&&b&&d()}}}()},b=window.CKEDITOR_GETURL;if(b){var c=d.getUrl;d.getUrl=function(a){return b.call(d,a)||c.call(d,a)}}return d}());
+a);window.attachEvent("onload",a);b=!1;try{b=!window.frameElement}catch(r){}document.documentElement.doScroll&&b&&d()}}}()},b=window.CKEDITOR_GETURL;if(b){var c=d.getUrl;d.getUrl=function(a){return b.call(d,a)||c.call(d,a)}}return d}());
 CKEDITOR.event||(CKEDITOR.event=function(){},CKEDITOR.event.implementOn=function(a){var d=CKEDITOR.event.prototype,b;for(b in d)null==a[b]&&(a[b]=d[b])},CKEDITOR.event.prototype=function(){function a(a){var e=d(this);return e[a]||(e[a]=new b(a))}var d=function(a){a=a.getPrivate&&a.getPrivate()||a._||(a._={});return a.events||(a.events={})},b=function(a){this.name=a;this.listeners=[]};b.prototype={getListenerIndex:function(a){for(var b=0,d=this.listeners;b<d.length;b++)if(d[b].fn==a)return b;return-1}};
-return{define:function(b,d){var g=a.call(this,b);CKEDITOR.tools.extend(g,d,!0)},on:function(b,d,g,l,k){function q(a,f,y,k){a={name:b,sender:this,editor:a,data:f,listenerData:l,stop:y,cancel:k,removeListener:w};return!1===d.call(g,a)?!1:a.data}function w(){y.removeListener(b,d)}var f=a.call(this,b);if(0>f.getListenerIndex(d)){f=f.listeners;g||(g=this);isNaN(k)&&(k=10);var y=this;q.fn=d;q.priority=k;for(var A=f.length-1;0<=A;A--)if(f[A].priority<=k)return f.splice(A+1,0,q),{removeListener:w};f.unshift(q)}return{removeListener:w}},
-once:function(){var a=Array.prototype.slice.call(arguments),b=a[1];a[1]=function(a){a.removeListener();return b.apply(this,arguments)};return this.on.apply(this,a)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,b=function(){a=1},g=0,l=function(){g=1};return function(k,q,w){var f=d(this)[k];k=a;var y=g;a=g=0;if(f){var A=f.listeners;if(A.length)for(var A=A.slice(0),t,D=0;D<A.length;D++){if(f.errorProof)try{t=
-A[D].call(this,w,q,b,l)}catch(p){}else t=A[D].call(this,w,q,b,l);!1===t?g=1:"undefined"!=typeof t&&(q=t);if(a||g)break}}q=g?!1:"undefined"==typeof q?!0:q;a=k;g=y;return q}}(),fireOnce:function(a,b,g){b=this.fire(a,b,g);delete d(this)[a];return b},removeListener:function(a,b){var g=d(this)[a];if(g){var l=g.getListenerIndex(b);0<=l&&g.listeners.splice(l,1)}},removeAllListeners:function(){var a=d(this),b;for(b in a)delete a[b]},hasListeners:function(a){return(a=d(this)[a])&&0<a.listeners.length}}}());
+return{define:function(b,d){var g=a.call(this,b);CKEDITOR.tools.extend(g,d,!0)},on:function(b,d,g,k,h){function p(a,f,B,h){a={name:b,sender:this,editor:a,data:f,listenerData:k,stop:B,cancel:h,removeListener:r};return!1===d.call(g,a)?!1:a.data}function r(){B.removeListener(b,d)}var f=a.call(this,b);if(0>f.getListenerIndex(d)){f=f.listeners;g||(g=this);isNaN(h)&&(h=10);var B=this;p.fn=d;p.priority=h;for(var u=f.length-1;0<=u;u--)if(f[u].priority<=h)return f.splice(u+1,0,p),{removeListener:r};f.unshift(p)}return{removeListener:r}},
+once:function(){var a=Array.prototype.slice.call(arguments),b=a[1];a[1]=function(a){a.removeListener();return b.apply(this,arguments)};return this.on.apply(this,a)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,b=function(){a=1},g=0,k=function(){g=1};return function(h,p,r){var f=d(this)[h];h=a;var B=g;a=g=0;if(f){var u=f.listeners;if(u.length)for(var u=u.slice(0),z,y=0;y<u.length;y++){if(f.errorProof)try{z=
+u[y].call(this,r,p,b,k)}catch(m){}else z=u[y].call(this,r,p,b,k);!1===z?g=1:"undefined"!=typeof z&&(p=z);if(a||g)break}}p=g?!1:"undefined"==typeof p?!0:p;a=h;g=B;return p}}(),fireOnce:function(a,b,g){b=this.fire(a,b,g);delete d(this)[a];return b},removeListener:function(a,b){var g=d(this)[a];if(g){var k=g.getListenerIndex(b);0<=k&&g.listeners.splice(k,1)}},removeAllListeners:function(){var a=d(this),b;for(b in a)delete a[b]},hasListeners:function(a){return(a=d(this)[a])&&0<a.listeners.length}}}());
 CKEDITOR.editor||(CKEDITOR.editor=function(){CKEDITOR._.pending.push([this,arguments]);CKEDITOR.event.call(this)},CKEDITOR.editor.prototype.fire=function(a,d){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fire.call(this,a,d,this)},CKEDITOR.editor.prototype.fireOnce=function(a,d){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fireOnce.call(this,a,d,this)},CKEDITOR.event.implementOn(CKEDITOR.editor.prototype));
 CKEDITOR.env||(CKEDITOR.env=function(){var a=navigator.userAgent.toLowerCase(),d=a.match(/edge[ \/](\d+.?\d*)/),b=-1<a.indexOf("trident/"),b=!(!d&&!b),b={ie:b,edge:!!d,webkit:!b&&-1<a.indexOf(" applewebkit/"),air:-1<a.indexOf(" adobeair/"),mac:-1<a.indexOf("macintosh"),quirks:"BackCompat"==document.compatMode&&(!document.documentMode||10>document.documentMode),mobile:-1<a.indexOf("mobile"),iOS:/(ipad|iphone|ipod)/.test(a),isCustomDomain:function(){if(!this.ie)return!1;var a=document.domain,b=window.location.hostname;
 return a!=b&&a!="["+b+"]"},secure:"https:"==location.protocol};b.gecko="Gecko"==navigator.product&&!b.webkit&&!b.ie;b.webkit&&(-1<a.indexOf("chrome")?b.chrome=!0:b.safari=!0);var c=0;b.ie&&(c=d?parseFloat(d[1]):b.quirks||!document.documentMode?parseFloat(a.match(/msie (\d+)/)[1]):document.documentMode,b.ie9Compat=9==c,b.ie8Compat=8==c,b.ie7Compat=7==c,b.ie6Compat=7>c||b.quirks);b.gecko&&(d=a.match(/rv:([\d\.]+)/))&&(d=d[1].split("."),c=1E4*d[0]+100*(d[1]||0)+1*(d[2]||0));b.air&&(c=parseFloat(a.match(/ adobeair\/(\d+)/)[1]));
@@ -19,29 +19,39 @@ b.iOS&&(b.cssClass+=" cke_browser_ios");b.hidpi&&(b.cssClass+=" cke_hidpi");retu
 CKEDITOR.loadFullCore,d=CKEDITOR.loadFullCoreTimeout;a&&(CKEDITOR.status="basic_ready",a&&a._load?a():d&&setTimeout(function(){CKEDITOR.loadFullCore&&CKEDITOR.loadFullCore()},1E3*d))})})();CKEDITOR.status="basic_loaded"}();"use strict";CKEDITOR.VERBOSITY_WARN=1;CKEDITOR.VERBOSITY_ERROR=2;CKEDITOR.verbosity=CKEDITOR.VERBOSITY_WARN|CKEDITOR.VERBOSITY_ERROR;CKEDITOR.warn=function(a,d){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_WARN&&CKEDITOR.fire("log",{type:"warn",errorCode:a,additionalData:d})};
 CKEDITOR.error=function(a,d){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_ERROR&&CKEDITOR.fire("log",{type:"error",errorCode:a,additionalData:d})};
 CKEDITOR.on("log",function(a){if(window.console&&window.console.log){var d=console[a.data.type]?a.data.type:"log",b=a.data.errorCode;if(a=a.data.additionalData)console[d]("[CKEDITOR] Error code: "+b+".",a);else console[d]("[CKEDITOR] Error code: "+b+".");console[d]("[CKEDITOR] For more information about this error go to http://docs.ckeditor.com/#!/guide/dev_errors-section-"+b)}},null,null,999);CKEDITOR.dom={};
-(function(){var a=[],d=CKEDITOR.env.gecko?"-moz-":CKEDITOR.env.webkit?"-webkit-":CKEDITOR.env.ie?"-ms-":"",b=/&/g,c=/>/g,e=/</g,g=/"/g,l=/&(lt|gt|amp|quot|nbsp|shy|#\d{1,5});/g,k={lt:"\x3c",gt:"\x3e",amp:"\x26",quot:'"',nbsp:" ",shy:"­"},q=function(a,f){return"#"==f[0]?String.fromCharCode(parseInt(f.slice(1),10)):k[f]};CKEDITOR.on("reset",function(){a=[]});CKEDITOR.tools={arrayCompare:function(a,f){if(!a&&!f)return!0;if(!a||!f||a.length!=f.length)return!1;for(var b=0;b<a.length;b++)if(a[b]!=f[b])return!1;
+(function(){var a=[],d=CKEDITOR.env.gecko?"-moz-":CKEDITOR.env.webkit?"-webkit-":CKEDITOR.env.ie?"-ms-":"",b=/&/g,c=/>/g,e=/</g,g=/"/g,k=/&(lt|gt|amp|quot|nbsp|shy|#\d{1,5});/g,h={lt:"\x3c",gt:"\x3e",amp:"\x26",quot:'"',nbsp:" ",shy:"­"},p=function(a,f){return"#"==f[0]?String.fromCharCode(parseInt(f.slice(1),10)):h[f]};CKEDITOR.on("reset",function(){a=[]});CKEDITOR.tools={arrayCompare:function(a,f){if(!a&&!f)return!0;if(!a||!f||a.length!=f.length)return!1;for(var b=0;b<a.length;b++)if(a[b]!=f[b])return!1;
 return!0},getIndex:function(a,f){for(var b=0;b<a.length;++b)if(f(a[b]))return b;return-1},clone:function(a){var f;if(a&&a instanceof Array){f=[];for(var b=0;b<a.length;b++)f[b]=CKEDITOR.tools.clone(a[b]);return f}if(null===a||"object"!=typeof a||a instanceof String||a instanceof Number||a instanceof Boolean||a instanceof Date||a instanceof RegExp||a.nodeType||a.window===a)return a;f=new a.constructor;for(b in a)f[b]=CKEDITOR.tools.clone(a[b]);return f},capitalize:function(a,f){return a.charAt(0).toUpperCase()+
-(f?a.slice(1):a.slice(1).toLowerCase())},extend:function(a){var f=arguments.length,b,c;"boolean"==typeof(b=arguments[f-1])?f--:"boolean"==typeof(b=arguments[f-2])&&(c=arguments[f-1],f-=2);for(var k=1;k<f;k++){var d=arguments[k],p;for(p in d)if(!0===b||null==a[p])if(!c||p in c)a[p]=d[p]}return a},prototypedCopy:function(a){var f=function(){};f.prototype=a;return new f},copy:function(a){var f={},b;for(b in a)f[b]=a[b];return f},isArray:function(a){return"[object Array]"==Object.prototype.toString.call(a)},
+(f?a.slice(1):a.slice(1).toLowerCase())},extend:function(a){var f=arguments.length,b,c;"boolean"==typeof(b=arguments[f-1])?f--:"boolean"==typeof(b=arguments[f-2])&&(c=arguments[f-1],f-=2);for(var h=1;h<f;h++){var d=arguments[h],m;for(m in d)if(!0===b||null==a[m])if(!c||m in c)a[m]=d[m]}return a},prototypedCopy:function(a){var f=function(){};f.prototype=a;return new f},copy:function(a){var f={},b;for(b in a)f[b]=a[b];return f},isArray:function(a){return"[object Array]"==Object.prototype.toString.call(a)},
 isEmpty:function(a){for(var f in a)if(a.hasOwnProperty(f))return!1;return!0},cssVendorPrefix:function(a,f,b){if(b)return d+a+":"+f+";"+a+":"+f;b={};b[a]=f;b[d+a]=f;return b},cssStyleToDomStyle:function(){var a=document.createElement("div").style,f="undefined"!=typeof a.cssFloat?"cssFloat":"undefined"!=typeof a.styleFloat?"styleFloat":"float";return function(a){return"float"==a?f:a.replace(/-./g,function(a){return a.substr(1).toUpperCase()})}}(),buildStyleHtml:function(a){a=[].concat(a);for(var f,
-b=[],c=0;c<a.length;c++)if(f=a[c])/@import|[{}]/.test(f)?b.push("\x3cstyle\x3e"+f+"\x3c/style\x3e"):b.push('\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+f+'"\x3e');return b.join("")},htmlEncode:function(a){return void 0===a||null===a?"":String(a).replace(b,"\x26amp;").replace(c,"\x26gt;").replace(e,"\x26lt;")},htmlDecode:function(a){return a.replace(l,q)},htmlEncodeAttr:function(a){return CKEDITOR.tools.htmlEncode(a).replace(g,"\x26quot;")},htmlDecodeAttr:function(a){return CKEDITOR.tools.htmlDecode(a)},
-transformPlainTextToHtml:function(a,f){var b=f==CKEDITOR.ENTER_BR,c=this.htmlEncode(a.replace(/\r\n/g,"\n")),c=c.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;"),k=f==CKEDITOR.ENTER_P?"p":"div";if(!b){var d=/\n{2}/g;if(d.test(c))var p="\x3c"+k+"\x3e",q="\x3c/"+k+"\x3e",c=p+c.replace(d,function(){return q+p})+q}c=c.replace(/\n/g,"\x3cbr\x3e");b||(c=c.replace(new RegExp("\x3cbr\x3e(?\x3d\x3c/"+k+"\x3e)"),function(a){return CKEDITOR.tools.repeat(a,2)}));c=c.replace(/^ | $/g,"\x26nbsp;");return c=c.replace(/(>|\s) /g,
-function(a,f){return f+"\x26nbsp;"}).replace(/ (?=<)/g,"\x26nbsp;")},getNextNumber:function(){var a=0;return function(){return++a}}(),getNextId:function(){return"cke_"+this.getNextNumber()},getUniqueId:function(){for(var a="e",f=0;8>f;f++)a+=Math.floor(65536*(1+Math.random())).toString(16).substring(1);return a},override:function(a,f){var b=f(a);b.prototype=a.prototype;return b},setTimeout:function(a,f,b,c,k){k||(k=window);b||(b=k);return k.setTimeout(function(){c?a.apply(b,[].concat(c)):a.apply(b)},
+b=[],c=0;c<a.length;c++)if(f=a[c])/@import|[{}]/.test(f)?b.push("\x3cstyle\x3e"+f+"\x3c/style\x3e"):b.push('\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+f+'"\x3e');return b.join("")},htmlEncode:function(a){return void 0===a||null===a?"":String(a).replace(b,"\x26amp;").replace(c,"\x26gt;").replace(e,"\x26lt;")},htmlDecode:function(a){return a.replace(k,p)},htmlEncodeAttr:function(a){return CKEDITOR.tools.htmlEncode(a).replace(g,"\x26quot;")},htmlDecodeAttr:function(a){return CKEDITOR.tools.htmlDecode(a)},
+transformPlainTextToHtml:function(a,f){var b=f==CKEDITOR.ENTER_BR,c=this.htmlEncode(a.replace(/\r\n/g,"\n")),c=c.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;"),h=f==CKEDITOR.ENTER_P?"p":"div";if(!b){var d=/\n{2}/g;if(d.test(c))var m="\x3c"+h+"\x3e",p="\x3c/"+h+"\x3e",c=m+c.replace(d,function(){return p+m})+p}c=c.replace(/\n/g,"\x3cbr\x3e");b||(c=c.replace(new RegExp("\x3cbr\x3e(?\x3d\x3c/"+h+"\x3e)"),function(a){return CKEDITOR.tools.repeat(a,2)}));c=c.replace(/^ | $/g,"\x26nbsp;");return c=c.replace(/(>|\s) /g,
+function(a,f){return f+"\x26nbsp;"}).replace(/ (?=<)/g,"\x26nbsp;")},getNextNumber:function(){var a=0;return function(){return++a}}(),getNextId:function(){return"cke_"+this.getNextNumber()},getUniqueId:function(){for(var a="e",f=0;8>f;f++)a+=Math.floor(65536*(1+Math.random())).toString(16).substring(1);return a},override:function(a,f){var b=f(a);b.prototype=a.prototype;return b},setTimeout:function(a,f,b,c,h){h||(h=window);b||(b=h);return h.setTimeout(function(){c?a.apply(b,[].concat(c)):a.apply(b)},
 f||0)},trim:function(){var a=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;return function(f){return f.replace(a,"")}}(),ltrim:function(){var a=/^[ \t\n\r]+/g;return function(f){return f.replace(a,"")}}(),rtrim:function(){var a=/[ \t\n\r]+$/g;return function(f){return f.replace(a,"")}}(),indexOf:function(a,f){if("function"==typeof f)for(var b=0,c=a.length;b<c;b++){if(f(a[b]))return b}else{if(a.indexOf)return a.indexOf(f);b=0;for(c=a.length;b<c;b++)if(a[b]===f)return b}return-1},search:function(a,f){var b=CKEDITOR.tools.indexOf(a,
-f);return 0<=b?a[b]:null},bind:function(a,f){return function(){return a.apply(f,arguments)}},createClass:function(a){var f=a.$,b=a.base,c=a.privates||a._,k=a.proto;a=a.statics;!f&&(f=function(){b&&this.base.apply(this,arguments)});if(c)var d=f,f=function(){var a=this._||(this._={}),b;for(b in c){var f=c[b];a[b]="function"==typeof f?CKEDITOR.tools.bind(f,this):f}d.apply(this,arguments)};b&&(f.prototype=this.prototypedCopy(b.prototype),f.prototype.constructor=f,f.base=b,f.baseProto=b.prototype,f.prototype.base=
-function(){this.base=b.prototype.base;b.apply(this,arguments);this.base=arguments.callee});k&&this.extend(f.prototype,k,!0);a&&this.extend(f,a,!0);return f},addFunction:function(b,f){return a.push(function(){return b.apply(f||this,arguments)})-1},removeFunction:function(b){a[b]=null},callFunction:function(b){var f=a[b];return f&&f.apply(window,Array.prototype.slice.call(arguments,1))},cssLength:function(){var a=/^-?\d+\.?\d*px$/,b;return function(c){b=CKEDITOR.tools.trim(c+"")+"px";return a.test(b)?
-b:c||""}}(),convertToPx:function(){var a;return function(b){a||(a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"position:absolute;left:-9999px;top:-9999px;margin:0px;padding:0px;border:0px;"\x3e\x3c/div\x3e',CKEDITOR.document),CKEDITOR.document.getBody().append(a));return/%$/.test(b)?b:(a.setStyle("width",b),a.$.clientWidth)}}(),repeat:function(a,b){return Array(b+1).join(a)},tryThese:function(){for(var a,b=0,c=arguments.length;b<c;b++){var k=arguments[b];try{a=k();break}catch(d){}}return a},
-genKey:function(){return Array.prototype.slice.call(arguments).join("-")},defer:function(a){return function(){var b=arguments,c=this;window.setTimeout(function(){a.apply(c,b)},0)}},normalizeCssText:function(a,b){var c=[],k,d=CKEDITOR.tools.parseCssText(a,!0,b);for(k in d)c.push(k+":"+d[k]);c.sort();return c.length?c.join(";")+";":""},convertRgbToHex:function(a){return a.replace(/(?:rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\))/gi,function(a,b,c,k){a=[b,c,k];for(b=0;3>b;b++)a[b]=("0"+parseInt(a[b],10).toString(16)).slice(-2);
-return"#"+a.join("")})},parseCssText:function(a,b,c){var k={};c&&(c=new CKEDITOR.dom.element("span"),c.setAttribute("style",a),a=CKEDITOR.tools.convertRgbToHex(c.getAttribute("style")||""));if(!a||";"==a)return k;a.replace(/&quot;/g,'"').replace(/\s*([^:;\s]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(a,c,d){b&&(c=c.toLowerCase(),"font-family"==c&&(d=d.toLowerCase().replace(/["']/g,"").replace(/\s*,\s*/g,",")),d=CKEDITOR.tools.trim(d));k[c]=d});return k},writeCssText:function(a,b){var c,k=[];for(c in a)k.push(c+
-":"+a[c]);b&&k.sort();return k.join("; ")},objectCompare:function(a,b,c){var k;if(!a&&!b)return!0;if(!a||!b)return!1;for(k in a)if(a[k]!=b[k])return!1;if(!c)for(k in b)if(a[k]!=b[k])return!1;return!0},objectKeys:function(a){var b=[],c;for(c in a)b.push(c);return b},convertArrayToObject:function(a,b){var c={};1==arguments.length&&(b=!0);for(var k=0,d=a.length;k<d;++k)c[a[k]]=b;return c},fixDomain:function(){for(var a;;)try{a=window.parent.document.domain;break}catch(b){a=a?a.replace(/.+?(?:\.|$)/,
-""):document.domain;if(!a)break;document.domain=a}return!!a},eventsBuffer:function(a,b,c){function k(){q=(new Date).getTime();d=!1;c?b.call(c):b()}var d,q=0;return{input:function(){if(!d){var b=(new Date).getTime()-q;b<a?d=setTimeout(k,a-b):k()}},reset:function(){d&&clearTimeout(d);d=q=0}}},enableHtml5Elements:function(a,b){for(var c="abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video".split(" "),
-k=c.length,d;k--;)d=a.createElement(c[k]),b&&a.appendChild(d)},checkIfAnyArrayItemMatches:function(a,b){for(var c=0,k=a.length;c<k;++c)if(a[c].match(b))return!0;return!1},checkIfAnyObjectPropertyMatches:function(a,b){for(var c in a)if(c.match(b))return!0;return!1},transparentImageData:"data:image/gif;base64,R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw\x3d\x3d",getCookie:function(a){a=a.toLowerCase();for(var b=document.cookie.split(";"),c,k,d=0;d<b.length;d++)if(c=b[d].split("\x3d"),
-k=decodeURIComponent(CKEDITOR.tools.trim(c[0]).toLowerCase()),k===a)return decodeURIComponent(1<c.length?c[1]:"");return null},setCookie:function(a,b){document.cookie=encodeURIComponent(a)+"\x3d"+encodeURIComponent(b)+";path\x3d/"},getCsrfToken:function(){var a=CKEDITOR.tools.getCookie("ckCsrfToken");if(!a||40!=a.length){var a=[],b="";if(window.crypto&&window.crypto.getRandomValues)a=new Uint8Array(40),window.crypto.getRandomValues(a);else for(var c=0;40>c;c++)a.push(Math.floor(256*Math.random()));
-for(c=0;c<a.length;c++)var k="abcdefghijklmnopqrstuvwxyz0123456789".charAt(a[c]%36),b=b+(.5<Math.random()?k.toUpperCase():k);a=b;CKEDITOR.tools.setCookie("ckCsrfToken",a)}return a}}})();
-CKEDITOR.dtd=function(){var a=CKEDITOR.tools.extend,d=function(a,b){for(var c=CKEDITOR.tools.clone(a),k=1;k<arguments.length;k++){b=arguments[k];for(var d in b)delete c[d]}return c},b={},c={},e={address:1,article:1,aside:1,blockquote:1,details:1,div:1,dl:1,fieldset:1,figure:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,hr:1,main:1,menu:1,nav:1,ol:1,p:1,pre:1,section:1,table:1,ul:1},g={command:1,link:1,meta:1,noscript:1,script:1,style:1},l={},k={"#":1},q={center:1,dir:1,noframes:1};
-a(b,{a:1,abbr:1,area:1,audio:1,b:1,bdi:1,bdo:1,br:1,button:1,canvas:1,cite:1,code:1,command:1,datalist:1,del:1,dfn:1,em:1,embed:1,i:1,iframe:1,img:1,input:1,ins:1,kbd:1,keygen:1,label:1,map:1,mark:1,meter:1,noscript:1,object:1,output:1,progress:1,q:1,ruby:1,s:1,samp:1,script:1,select:1,small:1,span:1,strong:1,sub:1,sup:1,textarea:1,time:1,u:1,"var":1,video:1,wbr:1},k,{acronym:1,applet:1,basefont:1,big:1,font:1,isindex:1,strike:1,style:1,tt:1});a(c,e,b,q);d={a:d(b,{a:1,button:1}),abbr:b,address:c,
-area:l,article:c,aside:c,audio:a({source:1,track:1},c),b:b,base:l,bdi:b,bdo:b,blockquote:c,body:c,br:l,button:d(b,{a:1,button:1}),canvas:b,caption:c,cite:b,code:b,col:l,colgroup:{col:1},command:l,datalist:a({option:1},b),dd:c,del:b,details:a({summary:1},c),dfn:b,div:c,dl:{dt:1,dd:1},dt:c,em:b,embed:l,fieldset:a({legend:1},c),figcaption:c,figure:a({figcaption:1},c),footer:c,form:c,h1:b,h2:b,h3:b,h4:b,h5:b,h6:b,head:a({title:1,base:1},g),header:c,hgroup:{h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},hr:l,html:a({head:1,
-body:1},c,g),i:b,iframe:k,img:l,input:l,ins:b,kbd:b,keygen:l,label:b,legend:b,li:c,link:l,main:c,map:c,mark:b,menu:a({li:1},c),meta:l,meter:d(b,{meter:1}),nav:c,noscript:a({link:1,meta:1,style:1},b),object:a({param:1},b),ol:{li:1},optgroup:{option:1},option:k,output:b,p:b,param:l,pre:b,progress:d(b,{progress:1}),q:b,rp:b,rt:b,ruby:a({rp:1,rt:1},b),s:b,samp:b,script:k,section:c,select:{optgroup:1,option:1},small:b,source:l,span:b,strong:b,style:k,sub:b,summary:a({h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},b),
-sup:b,table:{caption:1,colgroup:1,thead:1,tfoot:1,tbody:1,tr:1},tbody:{tr:1},td:c,textarea:k,tfoot:{tr:1},th:c,thead:{tr:1},time:d(b,{time:1}),title:k,tr:{th:1,td:1},track:l,u:b,ul:{li:1},"var":b,video:a({source:1,track:1},c),wbr:l,acronym:b,applet:a({param:1},c),basefont:l,big:b,center:c,dialog:l,dir:{li:1},font:b,isindex:l,noframes:c,strike:b,tt:b};a(d,{$block:a({audio:1,dd:1,dt:1,figcaption:1,li:1,video:1},e,q),$blockLimit:{article:1,aside:1,audio:1,body:1,caption:1,details:1,dir:1,div:1,dl:1,
+f);return 0<=b?a[b]:null},bind:function(a,f){return function(){return a.apply(f,arguments)}},createClass:function(a){var f=a.$,b=a.base,c=a.privates||a._,h=a.proto;a=a.statics;!f&&(f=function(){b&&this.base.apply(this,arguments)});if(c)var d=f,f=function(){var a=this._||(this._={}),f;for(f in c){var b=c[f];a[f]="function"==typeof b?CKEDITOR.tools.bind(b,this):b}d.apply(this,arguments)};b&&(f.prototype=this.prototypedCopy(b.prototype),f.prototype.constructor=f,f.base=b,f.baseProto=b.prototype,f.prototype.base=
+function(){this.base=b.prototype.base;b.apply(this,arguments);this.base=arguments.callee});h&&this.extend(f.prototype,h,!0);a&&this.extend(f,a,!0);return f},addFunction:function(b,f){return a.push(function(){return b.apply(f||this,arguments)})-1},removeFunction:function(b){a[b]=null},callFunction:function(b){var f=a[b];return f&&f.apply(window,Array.prototype.slice.call(arguments,1))},cssLength:function(){var a=/^-?\d+\.?\d*px$/,f;return function(b){f=CKEDITOR.tools.trim(b+"")+"px";return a.test(f)?
+f:b||""}}(),convertToPx:function(){var a;return function(f){a||(a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"position:absolute;left:-9999px;top:-9999px;margin:0px;padding:0px;border:0px;"\x3e\x3c/div\x3e',CKEDITOR.document),CKEDITOR.document.getBody().append(a));return/%$/.test(f)?f:(a.setStyle("width",f),a.$.clientWidth)}}(),repeat:function(a,f){return Array(f+1).join(a)},tryThese:function(){for(var a,f=0,b=arguments.length;f<b;f++){var c=arguments[f];try{a=c();break}catch(h){}}return a},
+genKey:function(){return Array.prototype.slice.call(arguments).join("-")},defer:function(a){return function(){var f=arguments,b=this;window.setTimeout(function(){a.apply(b,f)},0)}},normalizeCssText:function(a,f){var b=[],c,h=CKEDITOR.tools.parseCssText(a,!0,f);for(c in h)b.push(c+":"+h[c]);b.sort();return b.length?b.join(";")+";":""},convertRgbToHex:function(a){return a.replace(/(?:rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\))/gi,function(a,b,c,h){a=[b,c,h];for(b=0;3>b;b++)a[b]=("0"+parseInt(a[b],10).toString(16)).slice(-2);
+return"#"+a.join("")})},normalizeHex:function(a){return a.replace(/#(([0-9a-f]{3}){1,2})($|;|\s+)/gi,function(a,b,c,h){a=b.toLowerCase();3==a.length&&(a=a.split(""),a=[a[0],a[0],a[1],a[1],a[2],a[2]].join(""));return"#"+a+h})},parseCssText:function(a,f,b){var c={};b&&(a=(new CKEDITOR.dom.element("span")).setAttribute("style",a).getAttribute("style")||"");a&&(a=CKEDITOR.tools.normalizeHex(CKEDITOR.tools.convertRgbToHex(a)));if(!a||";"==a)return c;a.replace(/&quot;/g,'"').replace(/\s*([^:;\s]+)\s*:\s*([^;]+)\s*(?=;|$)/g,
+function(a,b,h){f&&(b=b.toLowerCase(),"font-family"==b&&(h=h.replace(/\s*,\s*/g,",")),h=CKEDITOR.tools.trim(h));c[b]=h});return c},writeCssText:function(a,b){var c,h=[];for(c in a)h.push(c+":"+a[c]);b&&h.sort();return h.join("; ")},objectCompare:function(a,b,c){var h;if(!a&&!b)return!0;if(!a||!b)return!1;for(h in a)if(a[h]!=b[h])return!1;if(!c)for(h in b)if(a[h]!=b[h])return!1;return!0},objectKeys:function(a){var b=[],c;for(c in a)b.push(c);return b},convertArrayToObject:function(a,b){var c={};1==
+arguments.length&&(b=!0);for(var h=0,d=a.length;h<d;++h)c[a[h]]=b;return c},fixDomain:function(){for(var a;;)try{a=window.parent.document.domain;break}catch(b){a=a?a.replace(/.+?(?:\.|$)/,""):document.domain;if(!a)break;document.domain=a}return!!a},eventsBuffer:function(a,b,c){function h(){p=(new Date).getTime();d=!1;c?b.call(c):b()}var d,p=0;return{input:function(){if(!d){var b=(new Date).getTime()-p;b<a?d=setTimeout(h,a-b):h()}},reset:function(){d&&clearTimeout(d);d=p=0}}},enableHtml5Elements:function(a,
+b){for(var c="abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video".split(" "),h=c.length,d;h--;)d=a.createElement(c[h]),b&&a.appendChild(d)},checkIfAnyArrayItemMatches:function(a,b){for(var c=0,h=a.length;c<h;++c)if(a[c].match(b))return!0;return!1},checkIfAnyObjectPropertyMatches:function(a,b){for(var c in a)if(c.match(b))return!0;return!1},keystrokeToString:function(a,b){var c=b&16711680,h=
+b&65535,d=CKEDITOR.env.mac,p=[],m=[];c&CKEDITOR.CTRL&&(p.push(d?"⌘":a[17]),m.push(d?a[224]:a[17]));c&CKEDITOR.ALT&&(p.push(d?"⌥":a[18]),m.push(a[18]));c&CKEDITOR.SHIFT&&(p.push(d?"⇧":a[16]),m.push(a[16]));h&&(a[h]?(p.push(a[h]),m.push(a[h])):(p.push(String.fromCharCode(h)),m.push(String.fromCharCode(h))));return{display:p.join("+"),aria:m.join("+")}},transparentImageData:"data:image/gif;base64,R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw\x3d\x3d",getCookie:function(a){a=a.toLowerCase();
+for(var b=document.cookie.split(";"),c,h,d=0;d<b.length;d++)if(c=b[d].split("\x3d"),h=decodeURIComponent(CKEDITOR.tools.trim(c[0]).toLowerCase()),h===a)return decodeURIComponent(1<c.length?c[1]:"");return null},setCookie:function(a,b){document.cookie=encodeURIComponent(a)+"\x3d"+encodeURIComponent(b)+";path\x3d/"},getCsrfToken:function(){var a=CKEDITOR.tools.getCookie("ckCsrfToken");if(!a||40!=a.length){var a=[],b="";if(window.crypto&&window.crypto.getRandomValues)a=new Uint8Array(40),window.crypto.getRandomValues(a);
+else for(var c=0;40>c;c++)a.push(Math.floor(256*Math.random()));for(c=0;c<a.length;c++)var h="abcdefghijklmnopqrstuvwxyz0123456789".charAt(a[c]%36),b=b+(.5<Math.random()?h.toUpperCase():h);a=b;CKEDITOR.tools.setCookie("ckCsrfToken",a)}return a},escapeCss:function(a){return a?window.CSS&&CSS.escape?CSS.escape(a):isNaN(parseInt(a.charAt(0),10))?a:"\\3"+a.charAt(0)+" "+a.substring(1,a.length):""},style:{parse:{_colors:{aliceblue:"#F0F8FF",antiquewhite:"#FAEBD7",aqua:"#00FFFF",aquamarine:"#7FFFD4",azure:"#F0FFFF",
+beige:"#F5F5DC",bisque:"#FFE4C4",black:"#000000",blanchedalmond:"#FFEBCD",blue:"#0000FF",blueviolet:"#8A2BE2",brown:"#A52A2A",burlywood:"#DEB887",cadetblue:"#5F9EA0",chartreuse:"#7FFF00",chocolate:"#D2691E",coral:"#FF7F50",cornflowerblue:"#6495ED",cornsilk:"#FFF8DC",crimson:"#DC143C",cyan:"#00FFFF",darkblue:"#00008B",darkcyan:"#008B8B",darkgoldenrod:"#B8860B",darkgray:"#A9A9A9",darkgreen:"#006400",darkgrey:"#A9A9A9",darkkhaki:"#BDB76B",darkmagenta:"#8B008B",darkolivegreen:"#556B2F",darkorange:"#FF8C00",
+darkorchid:"#9932CC",darkred:"#8B0000",darksalmon:"#E9967A",darkseagreen:"#8FBC8F",darkslateblue:"#483D8B",darkslategray:"#2F4F4F",darkslategrey:"#2F4F4F",darkturquoise:"#00CED1",darkviolet:"#9400D3",deeppink:"#FF1493",deepskyblue:"#00BFFF",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1E90FF",firebrick:"#B22222",floralwhite:"#FFFAF0",forestgreen:"#228B22",fuchsia:"#FF00FF",gainsboro:"#DCDCDC",ghostwhite:"#F8F8FF",gold:"#FFD700",goldenrod:"#DAA520",gray:"#808080",green:"#008000",greenyellow:"#ADFF2F",
+grey:"#808080",honeydew:"#F0FFF0",hotpink:"#FF69B4",indianred:"#CD5C5C",indigo:"#4B0082",ivory:"#FFFFF0",khaki:"#F0E68C",lavender:"#E6E6FA",lavenderblush:"#FFF0F5",lawngreen:"#7CFC00",lemonchiffon:"#FFFACD",lightblue:"#ADD8E6",lightcoral:"#F08080",lightcyan:"#E0FFFF",lightgoldenrodyellow:"#FAFAD2",lightgray:"#D3D3D3",lightgreen:"#90EE90",lightgrey:"#D3D3D3",lightpink:"#FFB6C1",lightsalmon:"#FFA07A",lightseagreen:"#20B2AA",lightskyblue:"#87CEFA",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#B0C4DE",
+lightyellow:"#FFFFE0",lime:"#00FF00",limegreen:"#32CD32",linen:"#FAF0E6",magenta:"#FF00FF",maroon:"#800000",mediumaquamarine:"#66CDAA",mediumblue:"#0000CD",mediumorchid:"#BA55D3",mediumpurple:"#9370DB",mediumseagreen:"#3CB371",mediumslateblue:"#7B68EE",mediumspringgreen:"#00FA9A",mediumturquoise:"#48D1CC",mediumvioletred:"#C71585",midnightblue:"#191970",mintcream:"#F5FFFA",mistyrose:"#FFE4E1",moccasin:"#FFE4B5",navajowhite:"#FFDEAD",navy:"#000080",oldlace:"#FDF5E6",olive:"#808000",olivedrab:"#6B8E23",
+orange:"#FFA500",orangered:"#FF4500",orchid:"#DA70D6",palegoldenrod:"#EEE8AA",palegreen:"#98FB98",paleturquoise:"#AFEEEE",palevioletred:"#DB7093",papayawhip:"#FFEFD5",peachpuff:"#FFDAB9",peru:"#CD853F",pink:"#FFC0CB",plum:"#DDA0DD",powderblue:"#B0E0E6",purple:"#800080",rebeccapurple:"#663399",red:"#FF0000",rosybrown:"#BC8F8F",royalblue:"#4169E1",saddlebrown:"#8B4513",salmon:"#FA8072",sandybrown:"#F4A460",seagreen:"#2E8B57",seashell:"#FFF5EE",sienna:"#A0522D",silver:"#C0C0C0",skyblue:"#87CEEB",slateblue:"#6A5ACD",
+slategray:"#708090",slategrey:"#708090",snow:"#FFFAFA",springgreen:"#00FF7F",steelblue:"#4682B4",tan:"#D2B48C",teal:"#008080",thistle:"#D8BFD8",tomato:"#FF6347",turquoise:"#40E0D0",violet:"#EE82EE",wheat:"#F5DEB3",white:"#FFFFFF",whitesmoke:"#F5F5F5",yellow:"#FFFF00",yellowgreen:"#9ACD32"},_rgbaRegExp:/rgba?\(\s*\d+%?\s*,\s*\d+%?\s*,\s*\d+%?\s*(?:,\s*[0-9.]+\s*)?\)/gi,_hslaRegExp:/hsla?\(\s*[0-9.]+\s*,\s*\d+%\s*,\s*\d+%\s*(?:,\s*[0-9.]+\s*)?\)/gi,background:function(a){var b=[],c=[],c=this._findColor(a);
+c.length&&(b.color=c[0],CKEDITOR.tools.array.forEach(c,function(b){a=a.replace(b,"")}));if(a=CKEDITOR.tools.trim(a))b.unprocessed=a;return b},margin:function(a){function b(a){c.top=h[a[0]];c.right=h[a[1]];c.bottom=h[a[2]];c.left=h[a[3]]}var c={},h=a.match(/(?:\-?[\.\d]+(?:%|\w*)|auto|inherit|initial|unset)/g)||["0px"];switch(h.length){case 1:b([0,0,0,0]);break;case 2:b([0,1,0,1]);break;case 3:b([0,1,2,1]);break;case 4:b([0,1,2,3])}return c},_findColor:function(a){var b=[],c=CKEDITOR.tools.array,b=
+b.concat(a.match(this._rgbaRegExp)||[]),b=b.concat(a.match(this._hslaRegExp)||[]);return b=b.concat(c.filter(a.split(/\s+/),function(a){return a.match(/^\#[a-f0-9]{3}(?:[a-f0-9]{3})?$/gi)?!0:a.toLowerCase()in CKEDITOR.tools.style.parse._colors}))}}},array:{filter:function(a,b,c){var h=[];this.forEach(a,function(d,p){b.call(c,d,p,a)&&h.push(d)});return h},forEach:function(a,b,c){var h=a.length,d;for(d=0;d<h;d++)b.call(c,a[d],d,a)},map:function(a,b,c){for(var h=[],d=0;d<a.length;d++)h.push(b.call(c,
+a[d],d,a));return h},reduce:function(a,b,c,h){for(var d=0;d<a.length;d++)c=b.call(h,c,a[d],d,a);return c}}};CKEDITOR.tools.array.indexOf=CKEDITOR.tools.indexOf;CKEDITOR.tools.array.isArray=CKEDITOR.tools.isArray})();
+CKEDITOR.dtd=function(){var a=CKEDITOR.tools.extend,d=function(a,b){for(var c=CKEDITOR.tools.clone(a),h=1;h<arguments.length;h++){b=arguments[h];for(var d in b)delete c[d]}return c},b={},c={},e={address:1,article:1,aside:1,blockquote:1,details:1,div:1,dl:1,fieldset:1,figure:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,hr:1,main:1,menu:1,nav:1,ol:1,p:1,pre:1,section:1,table:1,ul:1},g={command:1,link:1,meta:1,noscript:1,script:1,style:1},k={},h={"#":1},p={center:1,dir:1,noframes:1};
+a(b,{a:1,abbr:1,area:1,audio:1,b:1,bdi:1,bdo:1,br:1,button:1,canvas:1,cite:1,code:1,command:1,datalist:1,del:1,dfn:1,em:1,embed:1,i:1,iframe:1,img:1,input:1,ins:1,kbd:1,keygen:1,label:1,map:1,mark:1,meter:1,noscript:1,object:1,output:1,progress:1,q:1,ruby:1,s:1,samp:1,script:1,select:1,small:1,span:1,strong:1,sub:1,sup:1,textarea:1,time:1,u:1,"var":1,video:1,wbr:1},h,{acronym:1,applet:1,basefont:1,big:1,font:1,isindex:1,strike:1,style:1,tt:1});a(c,e,b,p);d={a:d(b,{a:1,button:1}),abbr:b,address:c,
+area:k,article:c,aside:c,audio:a({source:1,track:1},c),b:b,base:k,bdi:b,bdo:b,blockquote:c,body:c,br:k,button:d(b,{a:1,button:1}),canvas:b,caption:c,cite:b,code:b,col:k,colgroup:{col:1},command:k,datalist:a({option:1},b),dd:c,del:b,details:a({summary:1},c),dfn:b,div:c,dl:{dt:1,dd:1},dt:c,em:b,embed:k,fieldset:a({legend:1},c),figcaption:c,figure:a({figcaption:1},c),footer:c,form:c,h1:b,h2:b,h3:b,h4:b,h5:b,h6:b,head:a({title:1,base:1},g),header:c,hgroup:{h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},hr:k,html:a({head:1,
+body:1},c,g),i:b,iframe:h,img:k,input:k,ins:b,kbd:b,keygen:k,label:b,legend:b,li:c,link:k,main:c,map:c,mark:b,menu:a({li:1},c),meta:k,meter:d(b,{meter:1}),nav:c,noscript:a({link:1,meta:1,style:1},b),object:a({param:1},b),ol:{li:1},optgroup:{option:1},option:h,output:b,p:b,param:k,pre:b,progress:d(b,{progress:1}),q:b,rp:b,rt:b,ruby:a({rp:1,rt:1},b),s:b,samp:b,script:h,section:c,select:{optgroup:1,option:1},small:b,source:k,span:b,strong:b,style:h,sub:b,summary:a({h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},b),
+sup:b,table:{caption:1,colgroup:1,thead:1,tfoot:1,tbody:1,tr:1},tbody:{tr:1},td:c,textarea:h,tfoot:{tr:1},th:c,thead:{tr:1},time:d(b,{time:1}),title:h,tr:{th:1,td:1},track:k,u:b,ul:{li:1},"var":b,video:a({source:1,track:1},c),wbr:k,acronym:b,applet:a({param:1},c),basefont:k,big:b,center:c,dialog:k,dir:{li:1},font:b,isindex:k,noframes:c,strike:b,tt:b};a(d,{$block:a({audio:1,dd:1,dt:1,figcaption:1,li:1,video:1},e,p),$blockLimit:{article:1,aside:1,audio:1,body:1,caption:1,details:1,dir:1,div:1,dl:1,
 fieldset:1,figcaption:1,figure:1,footer:1,form:1,header:1,hgroup:1,main:1,menu:1,nav:1,ol:1,section:1,table:1,td:1,th:1,tr:1,ul:1,video:1},$cdata:{script:1,style:1},$editable:{address:1,article:1,aside:1,blockquote:1,body:1,details:1,div:1,fieldset:1,figcaption:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,main:1,nav:1,p:1,pre:1,section:1},$empty:{area:1,base:1,basefont:1,br:1,col:1,command:1,dialog:1,embed:1,hr:1,img:1,input:1,isindex:1,keygen:1,link:1,meta:1,param:1,source:1,
 track:1,wbr:1},$inline:b,$list:{dl:1,ol:1,ul:1},$listItem:{dd:1,dt:1,li:1},$nonBodyContent:a({body:1,head:1,html:1},d.head),$nonEditable:{applet:1,audio:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,param:1,script:1,textarea:1,video:1},$object:{applet:1,audio:1,button:1,hr:1,iframe:1,img:1,input:1,object:1,select:1,table:1,textarea:1,video:1},$removeEmpty:{abbr:1,acronym:1,b:1,bdi:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,mark:1,meter:1,output:1,q:1,ruby:1,
 s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,time:1,tt:1,u:1,"var":1},$tabIndex:{a:1,area:1,button:1,input:1,object:1,select:1,textarea:1},$tableContent:{caption:1,col:1,colgroup:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1},$transparent:{a:1,audio:1,canvas:1,del:1,ins:1,map:1,noscript:1,object:1,video:1},$intermediate:{caption:1,colgroup:1,dd:1,dt:1,figcaption:1,legend:1,li:1,optgroup:1,option:1,rp:1,rt:1,summary:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1}});return d}();
@@ -58,8 +68,8 @@ CKEDITOR.dom.node=function(a){return a?new CKEDITOR.dom[a.nodeType==CKEDITOR.NOD
 CKEDITOR.POSITION_IDENTICAL=0;CKEDITOR.POSITION_DISCONNECTED=1;CKEDITOR.POSITION_FOLLOWING=2;CKEDITOR.POSITION_PRECEDING=4;CKEDITOR.POSITION_IS_CONTAINED=8;CKEDITOR.POSITION_CONTAINS=16;
 CKEDITOR.tools.extend(CKEDITOR.dom.node.prototype,{appendTo:function(a,d){a.append(this,d);return a},clone:function(a,d){function b(c){c["data-cke-expando"]&&(c["data-cke-expando"]=!1);if(c.nodeType==CKEDITOR.NODE_ELEMENT||c.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)if(d||c.nodeType!=CKEDITOR.NODE_ELEMENT||c.removeAttribute("id",!1),a){c=c.childNodes;for(var e=0;e<c.length;e++)b(c[e])}}function c(b){if(b.type==CKEDITOR.NODE_ELEMENT||b.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT){if(b.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var d=
 b.getName();":"==d[0]&&b.renameNode(d.substring(1))}if(a)for(d=0;d<b.getChildCount();d++)c(b.getChild(d))}}var e=this.$.cloneNode(a);b(e);e=new CKEDITOR.dom.node(e);CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(this.type==CKEDITOR.NODE_ELEMENT||this.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)&&c(e);return e},hasPrevious:function(){return!!this.$.previousSibling},hasNext:function(){return!!this.$.nextSibling},insertAfter:function(a){a.$.parentNode.insertBefore(this.$,a.$.nextSibling);return a},insertBefore:function(a){a.$.parentNode.insertBefore(this.$,
-a.$);return a},insertBeforeMe:function(a){this.$.parentNode.insertBefore(a.$,this.$);return a},getAddress:function(a){for(var d=[],b=this.getDocument().$.documentElement,c=this.$;c&&c!=b;){var e=c.parentNode;e&&d.unshift(this.getIndex.call({$:c},a));c=e}return d},getDocument:function(){return new CKEDITOR.dom.document(this.$.ownerDocument||this.$.parentNode.ownerDocument)},getIndex:function(a){function d(a,c){var q=c?a.nextSibling:a.previousSibling;return q&&q.nodeType==CKEDITOR.NODE_TEXT?b(q)?d(q,
-c):q:null}function b(a){return!a.nodeValue||a.nodeValue==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE}var c=this.$,e=-1,g;if(!this.$.parentNode||a&&c.nodeType==CKEDITOR.NODE_TEXT&&b(c)&&!d(c)&&!d(c,!0))return-1;do a&&c!=this.$&&c.nodeType==CKEDITOR.NODE_TEXT&&(g||b(c))||(e++,g=c.nodeType==CKEDITOR.NODE_TEXT);while(c=c.previousSibling);return e},getNextSourceNode:function(a,d,b){if(b&&!b.call){var c=b;b=function(a){return!a.equals(c)}}a=!a&&this.getFirst&&this.getFirst();var e;if(!a){if(this.type==
+a.$);return a},insertBeforeMe:function(a){this.$.parentNode.insertBefore(a.$,this.$);return a},getAddress:function(a){for(var d=[],b=this.getDocument().$.documentElement,c=this.$;c&&c!=b;){var e=c.parentNode;e&&d.unshift(this.getIndex.call({$:c},a));c=e}return d},getDocument:function(){return new CKEDITOR.dom.document(this.$.ownerDocument||this.$.parentNode.ownerDocument)},getIndex:function(a){function d(a,c){var p=c?a.nextSibling:a.previousSibling;return p&&p.nodeType==CKEDITOR.NODE_TEXT?b(p)?d(p,
+c):p:null}function b(a){return!a.nodeValue||a.nodeValue==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE}var c=this.$,e=-1,g;if(!this.$.parentNode||a&&c.nodeType==CKEDITOR.NODE_TEXT&&b(c)&&!d(c)&&!d(c,!0))return-1;do a&&c!=this.$&&c.nodeType==CKEDITOR.NODE_TEXT&&(g||b(c))||(e++,g=c.nodeType==CKEDITOR.NODE_TEXT);while(c=c.previousSibling);return e},getNextSourceNode:function(a,d,b){if(b&&!b.call){var c=b;b=function(a){return!a.equals(c)}}a=!a&&this.getFirst&&this.getFirst();var e;if(!a){if(this.type==
 CKEDITOR.NODE_ELEMENT&&b&&!1===b(this,!0))return null;a=this.getNext()}for(;!a&&(e=(e||this).getParent());){if(b&&!1===b(e,!0))return null;a=e.getNext()}return!a||b&&!1===b(a)?null:d&&d!=a.type?a.getNextSourceNode(!1,d,b):a},getPreviousSourceNode:function(a,d,b){if(b&&!b.call){var c=b;b=function(a){return!a.equals(c)}}a=!a&&this.getLast&&this.getLast();var e;if(!a){if(this.type==CKEDITOR.NODE_ELEMENT&&b&&!1===b(this,!0))return null;a=this.getPrevious()}for(;!a&&(e=(e||this).getParent());){if(b&&!1===
 b(e,!0))return null;a=e.getPrevious()}return!a||b&&!1===b(a)?null:d&&a.type!=d?a.getPreviousSourceNode(!1,d,b):a},getPrevious:function(a){var d=this.$,b;do b=(d=d.previousSibling)&&10!=d.nodeType&&new CKEDITOR.dom.node(d);while(b&&a&&!a(b));return b},getNext:function(a){var d=this.$,b;do b=(d=d.nextSibling)&&new CKEDITOR.dom.node(d);while(b&&a&&!a(b));return b},getParent:function(a){var d=this.$.parentNode;return d&&(d.nodeType==CKEDITOR.NODE_ELEMENT||a&&d.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)?
 new CKEDITOR.dom.node(d):null},getParents:function(a){var d=this,b=[];do b[a?"push":"unshift"](d);while(d=d.getParent());return b},getCommonAncestor:function(a){if(a.equals(this))return this;if(a.contains&&a.contains(this))return a;var d=this.contains?this:this.getParent();do if(d.contains(a))return d;while(d=d.getParent());return null},getPosition:function(a){var d=this.$,b=a.$;if(d.compareDocumentPosition)return d.compareDocumentPosition(b);if(d==b)return CKEDITOR.POSITION_IDENTICAL;if(this.type==
@@ -73,192 +83,198 @@ CKEDITOR.tools.extend(CKEDITOR.dom.window.prototype,{focus:function(){this.$.foc
 a.body.scrollTop||0}},getFrame:function(){var a=this.$.frameElement;return a?new CKEDITOR.dom.element.get(a):null}});CKEDITOR.dom.document=function(a){CKEDITOR.dom.domObject.call(this,a)};CKEDITOR.dom.document.prototype=new CKEDITOR.dom.domObject;
 CKEDITOR.tools.extend(CKEDITOR.dom.document.prototype,{type:CKEDITOR.NODE_DOCUMENT,appendStyleSheet:function(a){if(this.$.createStyleSheet)this.$.createStyleSheet(a);else{var d=new CKEDITOR.dom.element("link");d.setAttributes({rel:"stylesheet",type:"text/css",href:a});this.getHead().append(d)}},appendStyleText:function(a){if(this.$.createStyleSheet){var d=this.$.createStyleSheet("");d.cssText=a}else{var b=new CKEDITOR.dom.element("style",this);b.append(new CKEDITOR.dom.text(a,this));this.getHead().append(b)}return d||
 b.$.sheet},createElement:function(a,d){var b=new CKEDITOR.dom.element(a,this);d&&(d.attributes&&b.setAttributes(d.attributes),d.styles&&b.setStyles(d.styles));return b},createText:function(a){return new CKEDITOR.dom.text(a,this)},focus:function(){this.getWindow().focus()},getActive:function(){var a;try{a=this.$.activeElement}catch(d){return null}return new CKEDITOR.dom.element(a)},getById:function(a){return(a=this.$.getElementById(a))?new CKEDITOR.dom.element(a):null},getByAddress:function(a,d){for(var b=
-this.$.documentElement,c=0;b&&c<a.length;c++){var e=a[c];if(d)for(var g=-1,l=0;l<b.childNodes.length;l++){var k=b.childNodes[l];if(!0!==d||3!=k.nodeType||!k.previousSibling||3!=k.previousSibling.nodeType)if(g++,g==e){b=k;break}}else b=b.childNodes[e]}return b?new CKEDITOR.dom.node(b):null},getElementsByTag:function(a,d){CKEDITOR.env.ie&&8>=document.documentMode||!d||(a=d+":"+a);return new CKEDITOR.dom.nodeList(this.$.getElementsByTagName(a))},getHead:function(){var a=this.$.getElementsByTagName("head")[0];
+this.$.documentElement,c=0;b&&c<a.length;c++){var e=a[c];if(d)for(var g=-1,k=0;k<b.childNodes.length;k++){var h=b.childNodes[k];if(!0!==d||3!=h.nodeType||!h.previousSibling||3!=h.previousSibling.nodeType)if(g++,g==e){b=h;break}}else b=b.childNodes[e]}return b?new CKEDITOR.dom.node(b):null},getElementsByTag:function(a,d){CKEDITOR.env.ie&&8>=document.documentMode||!d||(a=d+":"+a);return new CKEDITOR.dom.nodeList(this.$.getElementsByTagName(a))},getHead:function(){var a=this.$.getElementsByTagName("head")[0];
 return a=a?new CKEDITOR.dom.element(a):this.getDocumentElement().append(new CKEDITOR.dom.element("head"),!0)},getBody:function(){return new CKEDITOR.dom.element(this.$.body)},getDocumentElement:function(){return new CKEDITOR.dom.element(this.$.documentElement)},getWindow:function(){return new CKEDITOR.dom.window(this.$.parentWindow||this.$.defaultView)},write:function(a){this.$.open("text/html","replace");CKEDITOR.env.ie&&(a=a.replace(/(?:^\s*<!DOCTYPE[^>]*?>)|^/i,'$\x26\n\x3cscript data-cke-temp\x3d"1"\x3e('+
 CKEDITOR.tools.fixDomain+")();\x3c/script\x3e"));this.$.write(a);this.$.close()},find:function(a){return new CKEDITOR.dom.nodeList(this.$.querySelectorAll(a))},findOne:function(a){return(a=this.$.querySelector(a))?new CKEDITOR.dom.element(a):null},_getHtml5ShivFrag:function(){var a=this.getCustomData("html5ShivFrag");a||(a=this.$.createDocumentFragment(),CKEDITOR.tools.enableHtml5Elements(a,!0),this.setCustomData("html5ShivFrag",a));return a}});CKEDITOR.dom.nodeList=function(a){this.$=a};
 CKEDITOR.dom.nodeList.prototype={count:function(){return this.$.length},getItem:function(a){return 0>a||a>=this.$.length?null:(a=this.$[a])?new CKEDITOR.dom.node(a):null}};CKEDITOR.dom.element=function(a,d){"string"==typeof a&&(a=(d?d.$:document).createElement(a));CKEDITOR.dom.domObject.call(this,a)};CKEDITOR.dom.element.get=function(a){return(a="string"==typeof a?document.getElementById(a)||document.getElementsByName(a)[0]:a)&&(a.$?a:new CKEDITOR.dom.element(a))};CKEDITOR.dom.element.prototype=new CKEDITOR.dom.node;
 CKEDITOR.dom.element.createFromHtml=function(a,d){var b=new CKEDITOR.dom.element("div",d);b.setHtml(a);return b.getFirst().remove()};CKEDITOR.dom.element.setMarker=function(a,d,b,c){var e=d.getCustomData("list_marker_id")||d.setCustomData("list_marker_id",CKEDITOR.tools.getNextNumber()).getCustomData("list_marker_id"),g=d.getCustomData("list_marker_names")||d.setCustomData("list_marker_names",{}).getCustomData("list_marker_names");a[e]=d;g[b]=1;return d.setCustomData(b,c)};
 CKEDITOR.dom.element.clearAllMarkers=function(a){for(var d in a)CKEDITOR.dom.element.clearMarkers(a,a[d],1)};CKEDITOR.dom.element.clearMarkers=function(a,d,b){var c=d.getCustomData("list_marker_names"),e=d.getCustomData("list_marker_id"),g;for(g in c)d.removeCustomData(g);d.removeCustomData("list_marker_names");b&&(d.removeCustomData("list_marker_id"),delete a[e])};
-(function(){function a(a,b){return-1<(" "+a+" ").replace(g," ").indexOf(" "+b+" ")}function d(a){var b=!0;a.$.id||(a.$.id="cke_tmp_"+CKEDITOR.tools.getNextNumber(),b=!1);return function(){b||a.removeAttribute("id")}}function b(a,b){return"#"+a.$.id+" "+b.split(/,\s*/).join(", #"+a.$.id+" ")}function c(a){for(var b=0,c=0,f=l[a].length;c<f;c++)b+=parseInt(this.getComputedStyle(l[a][c])||0,10)||0;return b}var e=document.createElement("_").classList,e="undefined"!==typeof e&&null!==String(e.add).match(/\[Native code\]/gi),
-g=/[\n\t\r]/g;CKEDITOR.tools.extend(CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_ELEMENT,addClass:e?function(a){this.$.classList.add(a);return this}:function(b){var c=this.$.className;c&&(a(c,b)||(c+=" "+b));this.$.className=c||b;return this},removeClass:e?function(a){var b=this.$;b.classList.remove(a);b.className||b.removeAttribute("class");return this}:function(b){var c=this.getAttribute("class");c&&a(c,b)&&((c=c.replace(new RegExp("(?:^|\\s+)"+b+"(?\x3d\\s|$)"),"").replace(/^\s+/,""))?this.setAttribute("class",
-c):this.removeAttribute("class"));return this},hasClass:function(b){return a(this.$.className,b)},append:function(a,b){"string"==typeof a&&(a=this.getDocument().createElement(a));b?this.$.insertBefore(a.$,this.$.firstChild):this.$.appendChild(a.$);return a},appendHtml:function(a){if(this.$.childNodes.length){var b=new CKEDITOR.dom.element("div",this.getDocument());b.setHtml(a);b.moveChildren(this)}else this.setHtml(a)},appendText:function(a){null!=this.$.text&&CKEDITOR.env.ie&&9>CKEDITOR.env.version?
-this.$.text+=a:this.append(new CKEDITOR.dom.text(a))},appendBogus:function(a){if(a||CKEDITOR.env.needsBrFiller){for(a=this.getLast();a&&a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.rtrim(a.getText());)a=a.getPrevious();a&&a.is&&a.is("br")||(a=this.getDocument().createElement("br"),CKEDITOR.env.gecko&&a.setAttribute("type","_moz"),this.append(a))}},breakParent:function(a,b){var c=new CKEDITOR.dom.range(this.getDocument());c.setStartAfter(this);c.setEndAfter(a);var f=c.extractContents(!1,b||!1);c.insertNode(this.remove());
-f.insertAfterNode(this)},contains:document.compareDocumentPosition?function(a){return!!(this.$.compareDocumentPosition(a.$)&16)}:function(a){var b=this.$;return a.type!=CKEDITOR.NODE_ELEMENT?b.contains(a.getParent().$):b!=a.$&&b.contains(a.$)},focus:function(){function a(){try{this.$.focus()}catch(b){}}return function(b){b?CKEDITOR.tools.setTimeout(a,100,this):a.call(this)}}(),getHtml:function(){var a=this.$.innerHTML;return CKEDITOR.env.ie?a.replace(/<\?[^>]*>/g,""):a},getOuterHtml:function(){if(this.$.outerHTML)return this.$.outerHTML.replace(/<\?[^>]*>/,
-"");var a=this.$.ownerDocument.createElement("div");a.appendChild(this.$.cloneNode(!0));return a.innerHTML},getClientRect:function(){var a=CKEDITOR.tools.extend({},this.$.getBoundingClientRect());!a.width&&(a.width=a.right-a.left);!a.height&&(a.height=a.bottom-a.top);return a},setHtml:CKEDITOR.env.ie&&9>CKEDITOR.env.version?function(a){try{var b=this.$;if(this.getParent())return b.innerHTML=a;var c=this.getDocument()._getHtml5ShivFrag();c.appendChild(b);b.innerHTML=a;c.removeChild(b);return a}catch(f){this.$.innerHTML=
-"";b=new CKEDITOR.dom.element("body",this.getDocument());b.$.innerHTML=a;for(b=b.getChildren();b.count();)this.append(b.getItem(0));return a}}:function(a){return this.$.innerHTML=a},setText:function(){var a=document.createElement("p");a.innerHTML="x";a=a.textContent;return function(b){this.$[a?"textContent":"innerText"]=b}}(),getAttribute:function(){var a=function(a){return this.$.getAttribute(a,2)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){switch(a){case "class":a=
-"className";break;case "http-equiv":a="httpEquiv";break;case "name":return this.$.name;case "tabindex":return a=this.$.getAttribute(a,2),0!==a&&0===this.$.tabIndex&&(a=null),a;case "checked":return a=this.$.attributes.getNamedItem(a),(a.specified?a.nodeValue:this.$.checked)?"checked":null;case "hspace":case "value":return this.$[a];case "style":return this.$.style.cssText;case "contenteditable":case "contentEditable":return this.$.attributes.getNamedItem("contentEditable").specified?this.$.getAttribute("contentEditable"):
-null}return this.$.getAttribute(a,2)}:a}(),getAttributes:function(a){var b={},c=this.$.attributes,f;a=CKEDITOR.tools.isArray(a)?a:[];for(f=0;f<c.length;f++)-1===CKEDITOR.tools.indexOf(a,c[f].name)&&(b[c[f].name]=c[f].value);return b},getChildren:function(){return new CKEDITOR.dom.nodeList(this.$.childNodes)},getComputedStyle:document.defaultView&&document.defaultView.getComputedStyle?function(a){var b=this.getWindow().$.getComputedStyle(this.$,null);return b?b.getPropertyValue(a):""}:function(a){return this.$.currentStyle[CKEDITOR.tools.cssStyleToDomStyle(a)]},
-getDtd:function(){var a=CKEDITOR.dtd[this.getName()];this.getDtd=function(){return a};return a},getElementsByTag:CKEDITOR.dom.document.prototype.getElementsByTag,getTabIndex:function(){var a=this.$.tabIndex;return 0!==a||CKEDITOR.dtd.$tabIndex[this.getName()]||0===parseInt(this.getAttribute("tabindex"),10)?a:-1},getText:function(){return this.$.textContent||this.$.innerText||""},getWindow:function(){return this.getDocument().getWindow()},getId:function(){return this.$.id||null},getNameAtt:function(){return this.$.name||
-null},getName:function(){var a=this.$.nodeName.toLowerCase();if(CKEDITOR.env.ie&&8>=document.documentMode){var b=this.$.scopeName;"HTML"!=b&&(a=b.toLowerCase()+":"+a)}this.getName=function(){return a};return this.getName()},getValue:function(){return this.$.value},getFirst:function(a){var b=this.$.firstChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getNext(a));return b},getLast:function(a){var b=this.$.lastChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getPrevious(a));return b},getStyle:function(a){return this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]},
+(function(){function a(a,b){return-1<(" "+a+" ").replace(g," ").indexOf(" "+b+" ")}function d(a){var b=!0;a.$.id||(a.$.id="cke_tmp_"+CKEDITOR.tools.getNextNumber(),b=!1);return function(){b||a.removeAttribute("id")}}function b(a,b){var c=CKEDITOR.tools.escapeCss(a.$.id);return"#"+c+" "+b.split(/,\s*/).join(", #"+c+" ")}function c(a){for(var b=0,c=0,f=k[a].length;c<f;c++)b+=parseFloat(this.getComputedStyle(k[a][c])||0,10)||0;return b}var e=document.createElement("_").classList,e="undefined"!==typeof e&&
+null!==String(e.add).match(/\[Native code\]/gi),g=/[\n\t\r]/g;CKEDITOR.tools.extend(CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_ELEMENT,addClass:e?function(a){this.$.classList.add(a);return this}:function(b){var c=this.$.className;c&&(a(c,b)||(c+=" "+b));this.$.className=c||b;return this},removeClass:e?function(a){var b=this.$;b.classList.remove(a);b.className||b.removeAttribute("class");return this}:function(b){var c=this.getAttribute("class");c&&a(c,b)&&((c=c.replace(new RegExp("(?:^|\\s+)"+
+b+"(?\x3d\\s|$)"),"").replace(/^\s+/,""))?this.setAttribute("class",c):this.removeAttribute("class"));return this},hasClass:function(b){return a(this.$.className,b)},append:function(a,b){"string"==typeof a&&(a=this.getDocument().createElement(a));b?this.$.insertBefore(a.$,this.$.firstChild):this.$.appendChild(a.$);return a},appendHtml:function(a){if(this.$.childNodes.length){var b=new CKEDITOR.dom.element("div",this.getDocument());b.setHtml(a);b.moveChildren(this)}else this.setHtml(a)},appendText:function(a){null!=
+this.$.text&&CKEDITOR.env.ie&&9>CKEDITOR.env.version?this.$.text+=a:this.append(new CKEDITOR.dom.text(a))},appendBogus:function(a){if(a||CKEDITOR.env.needsBrFiller){for(a=this.getLast();a&&a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.rtrim(a.getText());)a=a.getPrevious();a&&a.is&&a.is("br")||(a=this.getDocument().createElement("br"),CKEDITOR.env.gecko&&a.setAttribute("type","_moz"),this.append(a))}},breakParent:function(a,b){var c=new CKEDITOR.dom.range(this.getDocument());c.setStartAfter(this);c.setEndAfter(a);
+var f=c.extractContents(!1,b||!1),d;c.insertNode(this.remove());if(CKEDITOR.env.ie&&!CKEDITOR.env.edge){for(c=new CKEDITOR.dom.element("div");d=f.getFirst();)d.$.style.backgroundColor&&(d.$.style.backgroundColor=d.$.style.backgroundColor),c.append(d);c.insertAfter(this);c.remove(!0)}else f.insertAfterNode(this)},contains:document.compareDocumentPosition?function(a){return!!(this.$.compareDocumentPosition(a.$)&16)}:function(a){var b=this.$;return a.type!=CKEDITOR.NODE_ELEMENT?b.contains(a.getParent().$):
+b!=a.$&&b.contains(a.$)},focus:function(){function a(){try{this.$.focus()}catch(b){}}return function(b){b?CKEDITOR.tools.setTimeout(a,100,this):a.call(this)}}(),getHtml:function(){var a=this.$.innerHTML;return CKEDITOR.env.ie?a.replace(/<\?[^>]*>/g,""):a},getOuterHtml:function(){if(this.$.outerHTML)return this.$.outerHTML.replace(/<\?[^>]*>/,"");var a=this.$.ownerDocument.createElement("div");a.appendChild(this.$.cloneNode(!0));return a.innerHTML},getClientRect:function(){var a=CKEDITOR.tools.extend({},
+this.$.getBoundingClientRect());!a.width&&(a.width=a.right-a.left);!a.height&&(a.height=a.bottom-a.top);return a},setHtml:CKEDITOR.env.ie&&9>CKEDITOR.env.version?function(a){try{var b=this.$;if(this.getParent())return b.innerHTML=a;var c=this.getDocument()._getHtml5ShivFrag();c.appendChild(b);b.innerHTML=a;c.removeChild(b);return a}catch(f){this.$.innerHTML="";b=new CKEDITOR.dom.element("body",this.getDocument());b.$.innerHTML=a;for(b=b.getChildren();b.count();)this.append(b.getItem(0));return a}}:
+function(a){return this.$.innerHTML=a},setText:function(){var a=document.createElement("p");a.innerHTML="x";a=a.textContent;return function(b){this.$[a?"textContent":"innerText"]=b}}(),getAttribute:function(){var a=function(a){return this.$.getAttribute(a,2)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){switch(a){case "class":a="className";break;case "http-equiv":a="httpEquiv";break;case "name":return this.$.name;case "tabindex":return a=this.$.getAttribute(a,
+2),0!==a&&0===this.$.tabIndex&&(a=null),a;case "checked":return a=this.$.attributes.getNamedItem(a),(a.specified?a.nodeValue:this.$.checked)?"checked":null;case "hspace":case "value":return this.$[a];case "style":return this.$.style.cssText;case "contenteditable":case "contentEditable":return this.$.attributes.getNamedItem("contentEditable").specified?this.$.getAttribute("contentEditable"):null}return this.$.getAttribute(a,2)}:a}(),getAttributes:function(a){var b={},c=this.$.attributes,f;a=CKEDITOR.tools.isArray(a)?
+a:[];for(f=0;f<c.length;f++)-1===CKEDITOR.tools.indexOf(a,c[f].name)&&(b[c[f].name]=c[f].value);return b},getChildren:function(){return new CKEDITOR.dom.nodeList(this.$.childNodes)},getComputedStyle:document.defaultView&&document.defaultView.getComputedStyle?function(a){var b=this.getWindow().$.getComputedStyle(this.$,null);return b?b.getPropertyValue(a):""}:function(a){return this.$.currentStyle[CKEDITOR.tools.cssStyleToDomStyle(a)]},getDtd:function(){var a=CKEDITOR.dtd[this.getName()];this.getDtd=
+function(){return a};return a},getElementsByTag:CKEDITOR.dom.document.prototype.getElementsByTag,getTabIndex:function(){var a=this.$.tabIndex;return 0!==a||CKEDITOR.dtd.$tabIndex[this.getName()]||0===parseInt(this.getAttribute("tabindex"),10)?a:-1},getText:function(){return this.$.textContent||this.$.innerText||""},getWindow:function(){return this.getDocument().getWindow()},getId:function(){return this.$.id||null},getNameAtt:function(){return this.$.name||null},getName:function(){var a=this.$.nodeName.toLowerCase();
+if(CKEDITOR.env.ie&&8>=document.documentMode){var b=this.$.scopeName;"HTML"!=b&&(a=b.toLowerCase()+":"+a)}this.getName=function(){return a};return this.getName()},getValue:function(){return this.$.value},getFirst:function(a){var b=this.$.firstChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getNext(a));return b},getLast:function(a){var b=this.$.lastChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getPrevious(a));return b},getStyle:function(a){return this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]},
 is:function(){var a=this.getName();if("object"==typeof arguments[0])return!!arguments[0][a];for(var b=0;b<arguments.length;b++)if(arguments[b]==a)return!0;return!1},isEditable:function(a){var b=this.getName();return this.isReadOnly()||"none"==this.getComputedStyle("display")||"hidden"==this.getComputedStyle("visibility")||CKEDITOR.dtd.$nonEditable[b]||CKEDITOR.dtd.$empty[b]||this.is("a")&&(this.data("cke-saved-name")||this.hasAttribute("name"))&&!this.getChildCount()?!1:!1!==a?(a=CKEDITOR.dtd[b]||
 CKEDITOR.dtd.span,!(!a||!a["#"])):!0},isIdentical:function(a){var b=this.clone(0,1);a=a.clone(0,1);b.removeAttributes(["_moz_dirty","data-cke-expando","data-cke-saved-href","data-cke-saved-name"]);a.removeAttributes(["_moz_dirty","data-cke-expando","data-cke-saved-href","data-cke-saved-name"]);if(b.$.isEqualNode)return b.$.style.cssText=CKEDITOR.tools.normalizeCssText(b.$.style.cssText),a.$.style.cssText=CKEDITOR.tools.normalizeCssText(a.$.style.cssText),b.$.isEqualNode(a.$);b=b.getOuterHtml();a=
 a.getOuterHtml();if(CKEDITOR.env.ie&&9>CKEDITOR.env.version&&this.is("a")){var c=this.getParent();c.type==CKEDITOR.NODE_ELEMENT&&(c=c.clone(),c.setHtml(b),b=c.getHtml(),c.setHtml(a),a=c.getHtml())}return b==a},isVisible:function(){var a=(this.$.offsetHeight||this.$.offsetWidth)&&"hidden"!=this.getComputedStyle("visibility"),b,c;a&&CKEDITOR.env.webkit&&(b=this.getWindow(),!b.equals(CKEDITOR.document.getWindow())&&(c=b.$.frameElement)&&(a=(new CKEDITOR.dom.element(c)).isVisible()));return!!a},isEmptyInlineRemoveable:function(){if(!CKEDITOR.dtd.$removeEmpty[this.getName()])return!1;
 for(var a=this.getChildren(),b=0,c=a.count();b<c;b++){var f=a.getItem(b);if(f.type!=CKEDITOR.NODE_ELEMENT||!f.data("cke-bookmark"))if(f.type==CKEDITOR.NODE_ELEMENT&&!f.isEmptyInlineRemoveable()||f.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(f.getText()))return!1}return!0},hasAttributes:CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(){for(var a=this.$.attributes,b=0;b<a.length;b++){var c=a[b];switch(c.nodeName){case "class":if(this.getAttribute("class"))return!0;case "data-cke-expando":continue;
 default:if(c.specified)return!0}}return!1}:function(){var a=this.$.attributes,b=a.length,c={"data-cke-expando":1,_moz_dirty:1};return 0<b&&(2<b||!c[a[0].nodeName]||2==b&&!c[a[1].nodeName])},hasAttribute:function(){function a(b){var c=this.$.attributes.getNamedItem(b);if("input"==this.getName())switch(b){case "class":return 0<this.$.className.length;case "checked":return!!this.$.checked;case "value":return b=this.getAttribute("type"),"checkbox"==b||"radio"==b?"on"!=this.$.value:!!this.$.value}return c?
 c.specified:!1}return CKEDITOR.env.ie?8>CKEDITOR.env.version?function(b){return"name"==b?!!this.$.name:a.call(this,b)}:a:function(a){return!!this.$.attributes.getNamedItem(a)}}(),hide:function(){this.setStyle("display","none")},moveChildren:function(a,b){var c=this.$;a=a.$;if(c!=a){var f;if(b)for(;f=c.lastChild;)a.insertBefore(c.removeChild(f),a.firstChild);else for(;f=c.firstChild;)a.appendChild(c.removeChild(f))}},mergeSiblings:function(){function a(b,c,f){if(c&&c.type==CKEDITOR.NODE_ELEMENT){for(var d=
-[];c.data("cke-bookmark")||c.isEmptyInlineRemoveable();)if(d.push(c),c=f?c.getNext():c.getPrevious(),!c||c.type!=CKEDITOR.NODE_ELEMENT)return;if(b.isIdentical(c)){for(var k=f?b.getLast():b.getFirst();d.length;)d.shift().move(b,!f);c.moveChildren(b,!f);c.remove();k&&k.type==CKEDITOR.NODE_ELEMENT&&k.mergeSiblings()}}}return function(b){if(!1===b||CKEDITOR.dtd.$removeEmpty[this.getName()]||this.is("a"))a(this,this.getNext(),!0),a(this,this.getPrevious())}}(),show:function(){this.setStyles({display:"",
+[];c.data("cke-bookmark")||c.isEmptyInlineRemoveable();)if(d.push(c),c=f?c.getNext():c.getPrevious(),!c||c.type!=CKEDITOR.NODE_ELEMENT)return;if(b.isIdentical(c)){for(var h=f?b.getLast():b.getFirst();d.length;)d.shift().move(b,!f);c.moveChildren(b,!f);c.remove();h&&h.type==CKEDITOR.NODE_ELEMENT&&h.mergeSiblings()}}}return function(b){if(!1===b||CKEDITOR.dtd.$removeEmpty[this.getName()]||this.is("a"))a(this,this.getNext(),!0),a(this,this.getPrevious())}}(),show:function(){this.setStyles({display:"",
 visibility:""})},setAttribute:function(){var a=function(a,b){this.$.setAttribute(a,b);return this};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(b,c){"class"==b?this.$.className=c:"style"==b?this.$.style.cssText=c:"tabindex"==b?this.$.tabIndex=c:"checked"==b?this.$.checked=c:"contenteditable"==b?a.call(this,"contentEditable",c):a.apply(this,arguments);return this}:CKEDITOR.env.ie8Compat&&CKEDITOR.env.secure?function(b,c){if("src"==b&&c.match(/^http:\/\//))try{a.apply(this,
 arguments)}catch(f){}else a.apply(this,arguments);return this}:a}(),setAttributes:function(a){for(var b in a)this.setAttribute(b,a[b]);return this},setValue:function(a){this.$.value=a;return this},removeAttribute:function(){var a=function(a){this.$.removeAttribute(a)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){"class"==a?a="className":"tabindex"==a?a="tabIndex":"contenteditable"==a&&(a="contentEditable");this.$.removeAttribute(a)}:a}(),removeAttributes:function(a){if(CKEDITOR.tools.isArray(a))for(var b=
-0;b<a.length;b++)this.removeAttribute(a[b]);else for(b in a=a||this.getAttributes(),a)a.hasOwnProperty(b)&&this.removeAttribute(b)},removeStyle:function(a){var b=this.$.style;if(b.removeProperty||"border"!=a&&"margin"!=a&&"padding"!=a)b.removeProperty?b.removeProperty(a):b.removeAttribute(CKEDITOR.tools.cssStyleToDomStyle(a)),this.$.style.cssText||this.removeAttribute("style");else{var c=["top","left","right","bottom"],f;"border"==a&&(f=["color","style","width"]);for(var b=[],d=0;d<c.length;d++)if(f)for(var e=
-0;e<f.length;e++)b.push([a,c[d],f[e]].join("-"));else b.push([a,c[d]].join("-"));for(a=0;a<b.length;a++)this.removeStyle(b[a])}},setStyle:function(a,b){this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]=b;return this},setStyles:function(a){for(var b in a)this.setStyle(b,a[b]);return this},setOpacity:function(a){CKEDITOR.env.ie&&9>CKEDITOR.env.version?(a=Math.round(100*a),this.setStyle("filter",100<=a?"":"progid:DXImageTransform.Microsoft.Alpha(opacity\x3d"+a+")")):this.setStyle("opacity",a)},unselectable:function(){this.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select",
-"none"));if(CKEDITOR.env.ie){this.setAttribute("unselectable","on");for(var a,b=this.getElementsByTag("*"),c=0,f=b.count();c<f;c++)a=b.getItem(c),a.setAttribute("unselectable","on")}},getPositionedAncestor:function(){for(var a=this;"html"!=a.getName();){if("static"!=a.getComputedStyle("position"))return a;a=a.getParent()}return null},getDocumentPosition:function(a){var b=0,c=0,f=this.getDocument(),d=f.getBody(),e="BackCompat"==f.$.compatMode;if(document.documentElement.getBoundingClientRect){var t=
-this.$.getBoundingClientRect(),g=f.$.documentElement,p=g.clientTop||d.$.clientTop||0,x=g.clientLeft||d.$.clientLeft||0,l=!0;CKEDITOR.env.ie&&(l=f.getDocumentElement().contains(this),f=f.getBody().contains(this),l=e&&f||!e&&l);l&&(CKEDITOR.env.webkit||CKEDITOR.env.ie&&12<=CKEDITOR.env.version?(b=d.$.scrollLeft||g.scrollLeft,c=d.$.scrollTop||g.scrollTop):(c=e?d.$:g,b=c.scrollLeft,c=c.scrollTop),b=t.left+b-x,c=t.top+c-p)}else for(p=this,x=null;p&&"body"!=p.getName()&&"html"!=p.getName();){b+=p.$.offsetLeft-
-p.$.scrollLeft;c+=p.$.offsetTop-p.$.scrollTop;p.equals(this)||(b+=p.$.clientLeft||0,c+=p.$.clientTop||0);for(;x&&!x.equals(p);)b-=x.$.scrollLeft,c-=x.$.scrollTop,x=x.getParent();x=p;p=(t=p.$.offsetParent)?new CKEDITOR.dom.element(t):null}a&&(t=this.getWindow(),p=a.getWindow(),!t.equals(p)&&t.$.frameElement&&(a=(new CKEDITOR.dom.element(t.$.frameElement)).getDocumentPosition(a),b+=a.x,c+=a.y));document.documentElement.getBoundingClientRect||!CKEDITOR.env.gecko||e||(b+=this.$.clientLeft?1:0,c+=this.$.clientTop?
-1:0);return{x:b,y:c}},scrollIntoView:function(a){var b=this.getParent();if(b){do if((b.$.clientWidth&&b.$.clientWidth<b.$.scrollWidth||b.$.clientHeight&&b.$.clientHeight<b.$.scrollHeight)&&!b.is("body")&&this.scrollIntoParent(b,a,1),b.is("html")){var c=b.getWindow();try{var f=c.$.frameElement;f&&(b=new CKEDITOR.dom.element(f))}catch(d){}}while(b=b.getParent())}},scrollIntoParent:function(a,b,c){var f,d,e,t;function g(b,c){/body|html/.test(a.getName())?a.getWindow().$.scrollBy(b,c):(a.$.scrollLeft+=
-b,a.$.scrollTop+=c)}function p(a,b){var c={x:0,y:0};if(!a.is(l?"body":"html")){var f=a.$.getBoundingClientRect();c.x=f.left;c.y=f.top}f=a.getWindow();f.equals(b)||(f=p(CKEDITOR.dom.element.get(f.$.frameElement),b),c.x+=f.x,c.y+=f.y);return c}function x(a,b){return parseInt(a.getComputedStyle("margin-"+b)||0,10)||0}!a&&(a=this.getWindow());e=a.getDocument();var l="BackCompat"==e.$.compatMode;a instanceof CKEDITOR.dom.window&&(a=l?e.getBody():e.getDocumentElement());e=a.getWindow();d=p(this,e);var u=
-p(a,e),r=this.$.offsetHeight;f=this.$.offsetWidth;var h=a.$.clientHeight,n=a.$.clientWidth;e=d.x-x(this,"left")-u.x||0;t=d.y-x(this,"top")-u.y||0;f=d.x+f+x(this,"right")-(u.x+n)||0;d=d.y+r+x(this,"bottom")-(u.y+h)||0;(0>t||0<d)&&g(0,!0===b?t:!1===b?d:0>t?t:d);c&&(0>e||0<f)&&g(0>e?e:f,0)},setState:function(a,b,c){b=b||"cke";switch(a){case CKEDITOR.TRISTATE_ON:this.addClass(b+"_on");this.removeClass(b+"_off");this.removeClass(b+"_disabled");c&&this.setAttribute("aria-pressed",!0);c&&this.removeAttribute("aria-disabled");
-break;case CKEDITOR.TRISTATE_DISABLED:this.addClass(b+"_disabled");this.removeClass(b+"_off");this.removeClass(b+"_on");c&&this.setAttribute("aria-disabled",!0);c&&this.removeAttribute("aria-pressed");break;default:this.addClass(b+"_off"),this.removeClass(b+"_on"),this.removeClass(b+"_disabled"),c&&this.removeAttribute("aria-pressed"),c&&this.removeAttribute("aria-disabled")}},getFrameDocument:function(){var a=this.$;try{a.contentWindow.document}catch(b){a.src=a.src}return a&&new CKEDITOR.dom.document(a.contentWindow.document)},
-copyAttributes:function(a,b){var c=this.$.attributes;b=b||{};for(var f=0;f<c.length;f++){var d=c[f],e=d.nodeName.toLowerCase(),t;if(!(e in b))if("checked"==e&&(t=this.getAttribute(e)))a.setAttribute(e,t);else if(!CKEDITOR.env.ie||this.hasAttribute(e))t=this.getAttribute(e),null===t&&(t=d.nodeValue),a.setAttribute(e,t)}""!==this.$.style.cssText&&(a.$.style.cssText=this.$.style.cssText)},renameNode:function(a){if(this.getName()!=a){var b=this.getDocument();a=new CKEDITOR.dom.element(a,b);this.copyAttributes(a);
-this.moveChildren(a);this.getParent(!0)&&this.$.parentNode.replaceChild(a.$,this.$);a.$["data-cke-expando"]=this.$["data-cke-expando"];this.$=a.$;delete this.getName}},getChild:function(){function a(b,c){var f=b.childNodes;if(0<=c&&c<f.length)return f[c]}return function(b){var c=this.$;if(b.slice)for(b=b.slice();0<b.length&&c;)c=a(c,b.shift());else c=a(c,b);return c?new CKEDITOR.dom.node(c):null}}(),getChildCount:function(){return this.$.childNodes.length},disableContextMenu:function(){function a(b){return b.type==
-CKEDITOR.NODE_ELEMENT&&b.hasClass("cke_enable_context_menu")}this.on("contextmenu",function(b){b.data.getTarget().getAscendant(a,!0)||b.data.preventDefault()})},getDirection:function(a){return a?this.getComputedStyle("direction")||this.getDirection()||this.getParent()&&this.getParent().getDirection(1)||this.getDocument().$.dir||"ltr":this.getStyle("direction")||this.getAttribute("dir")},data:function(a,b){a="data-"+a;if(void 0===b)return this.getAttribute(a);!1===b?this.removeAttribute(a):this.setAttribute(a,
-b);return null},getEditor:function(){var a=CKEDITOR.instances,b,c;for(b in a)if(c=a[b],c.element.equals(this)&&c.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO)return c;return null},find:function(a){var c=d(this);a=new CKEDITOR.dom.nodeList(this.$.querySelectorAll(b(this,a)));c();return a},findOne:function(a){var c=d(this);a=this.$.querySelector(b(this,a));c();return a?new CKEDITOR.dom.element(a):null},forEach:function(a,b,c){if(!(c||b&&this.type!=b))var f=a(this);if(!1!==f){c=this.getChildren();for(var d=
-0;d<c.count();d++)f=c.getItem(d),f.type==CKEDITOR.NODE_ELEMENT?f.forEach(a,b):b&&f.type!=b||a(f)}}});var l={width:["border-left-width","border-right-width","padding-left","padding-right"],height:["border-top-width","border-bottom-width","padding-top","padding-bottom"]};CKEDITOR.dom.element.prototype.setSize=function(a,b,d){"number"==typeof b&&(!d||CKEDITOR.env.ie&&CKEDITOR.env.quirks||(b-=c.call(this,a)),this.setStyle(a,b+"px"))};CKEDITOR.dom.element.prototype.getSize=function(a,b){var d=Math.max(this.$["offset"+
-CKEDITOR.tools.capitalize(a)],this.$["client"+CKEDITOR.tools.capitalize(a)])||0;b&&(d-=c.call(this,a));return d}})();CKEDITOR.dom.documentFragment=function(a){a=a||CKEDITOR.document;this.$=a.type==CKEDITOR.NODE_DOCUMENT?a.$.createDocumentFragment():a};
+0;b<a.length;b++)this.removeAttribute(a[b]);else for(b in a=a||this.getAttributes(),a)a.hasOwnProperty(b)&&this.removeAttribute(b)},removeStyle:function(a){var b=this.$.style;if(b.removeProperty||"border"!=a&&"margin"!=a&&"padding"!=a)b.removeProperty?b.removeProperty(a):b.removeAttribute(CKEDITOR.tools.cssStyleToDomStyle(a)),this.$.style.cssText||this.removeAttribute("style");else{var c=["top","left","right","bottom"],f;"border"==a&&(f=["color","style","width"]);for(var b=[],d=0;d<c.length;d++)if(f)for(var u=
+0;u<f.length;u++)b.push([a,c[d],f[u]].join("-"));else b.push([a,c[d]].join("-"));for(a=0;a<b.length;a++)this.removeStyle(b[a])}},setStyle:function(a,b){this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]=b;return this},setStyles:function(a){for(var b in a)this.setStyle(b,a[b]);return this},setOpacity:function(a){CKEDITOR.env.ie&&9>CKEDITOR.env.version?(a=Math.round(100*a),this.setStyle("filter",100<=a?"":"progid:DXImageTransform.Microsoft.Alpha(opacity\x3d"+a+")")):this.setStyle("opacity",a)},unselectable:function(){this.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select",
+"none"));if(CKEDITOR.env.ie){this.setAttribute("unselectable","on");for(var a,b=this.getElementsByTag("*"),c=0,f=b.count();c<f;c++)a=b.getItem(c),a.setAttribute("unselectable","on")}},getPositionedAncestor:function(){for(var a=this;"html"!=a.getName();){if("static"!=a.getComputedStyle("position"))return a;a=a.getParent()}return null},getDocumentPosition:function(a){var b=0,c=0,f=this.getDocument(),d=f.getBody(),u="BackCompat"==f.$.compatMode;if(document.documentElement.getBoundingClientRect&&(CKEDITOR.env.ie?
+8!==CKEDITOR.env.version:1)){var e=this.$.getBoundingClientRect(),g=f.$.documentElement,m=g.clientTop||d.$.clientTop||0,x=g.clientLeft||d.$.clientLeft||0,k=!0;CKEDITOR.env.ie&&(k=f.getDocumentElement().contains(this),f=f.getBody().contains(this),k=u&&f||!u&&k);k&&(CKEDITOR.env.webkit||CKEDITOR.env.ie&&12<=CKEDITOR.env.version?(b=d.$.scrollLeft||g.scrollLeft,c=d.$.scrollTop||g.scrollTop):(c=u?d.$:g,b=c.scrollLeft,c=c.scrollTop),b=e.left+b-x,c=e.top+c-m)}else for(m=this,x=null;m&&"body"!=m.getName()&&
+"html"!=m.getName();){b+=m.$.offsetLeft-m.$.scrollLeft;c+=m.$.offsetTop-m.$.scrollTop;m.equals(this)||(b+=m.$.clientLeft||0,c+=m.$.clientTop||0);for(;x&&!x.equals(m);)b-=x.$.scrollLeft,c-=x.$.scrollTop,x=x.getParent();x=m;m=(e=m.$.offsetParent)?new CKEDITOR.dom.element(e):null}a&&(e=this.getWindow(),m=a.getWindow(),!e.equals(m)&&e.$.frameElement&&(a=(new CKEDITOR.dom.element(e.$.frameElement)).getDocumentPosition(a),b+=a.x,c+=a.y));document.documentElement.getBoundingClientRect||!CKEDITOR.env.gecko||
+u||(b+=this.$.clientLeft?1:0,c+=this.$.clientTop?1:0);return{x:b,y:c}},scrollIntoView:function(a){var b=this.getParent();if(b){do if((b.$.clientWidth&&b.$.clientWidth<b.$.scrollWidth||b.$.clientHeight&&b.$.clientHeight<b.$.scrollHeight)&&!b.is("body")&&this.scrollIntoParent(b,a,1),b.is("html")){var c=b.getWindow();try{var f=c.$.frameElement;f&&(b=new CKEDITOR.dom.element(f))}catch(d){}}while(b=b.getParent())}},scrollIntoParent:function(a,b,c){var f,d,e,z;function g(b,c){/body|html/.test(a.getName())?
+a.getWindow().$.scrollBy(b,c):(a.$.scrollLeft+=b,a.$.scrollTop+=c)}function m(a,b){var c={x:0,y:0};if(!a.is(k?"body":"html")){var f=a.$.getBoundingClientRect();c.x=f.left;c.y=f.top}f=a.getWindow();f.equals(b)||(f=m(CKEDITOR.dom.element.get(f.$.frameElement),b),c.x+=f.x,c.y+=f.y);return c}function x(a,b){return parseInt(a.getComputedStyle("margin-"+b)||0,10)||0}!a&&(a=this.getWindow());e=a.getDocument();var k="BackCompat"==e.$.compatMode;a instanceof CKEDITOR.dom.window&&(a=k?e.getBody():e.getDocumentElement());
+CKEDITOR.env.webkit&&(e=this.getEditor(!1))&&(e._.previousScrollTop=null);e=a.getWindow();d=m(this,e);var w=m(a,e),F=this.$.offsetHeight;f=this.$.offsetWidth;var l=a.$.clientHeight,q=a.$.clientWidth;e=d.x-x(this,"left")-w.x||0;z=d.y-x(this,"top")-w.y||0;f=d.x+f+x(this,"right")-(w.x+q)||0;d=d.y+F+x(this,"bottom")-(w.y+l)||0;(0>z||0<d)&&g(0,!0===b?z:!1===b?d:0>z?z:d);c&&(0>e||0<f)&&g(0>e?e:f,0)},setState:function(a,b,c){b=b||"cke";switch(a){case CKEDITOR.TRISTATE_ON:this.addClass(b+"_on");this.removeClass(b+
+"_off");this.removeClass(b+"_disabled");c&&this.setAttribute("aria-pressed",!0);c&&this.removeAttribute("aria-disabled");break;case CKEDITOR.TRISTATE_DISABLED:this.addClass(b+"_disabled");this.removeClass(b+"_off");this.removeClass(b+"_on");c&&this.setAttribute("aria-disabled",!0);c&&this.removeAttribute("aria-pressed");break;default:this.addClass(b+"_off"),this.removeClass(b+"_on"),this.removeClass(b+"_disabled"),c&&this.removeAttribute("aria-pressed"),c&&this.removeAttribute("aria-disabled")}},
+getFrameDocument:function(){var a=this.$;try{a.contentWindow.document}catch(b){a.src=a.src}return a&&new CKEDITOR.dom.document(a.contentWindow.document)},copyAttributes:function(a,b){var c=this.$.attributes;b=b||{};for(var f=0;f<c.length;f++){var d=c[f],e=d.nodeName.toLowerCase(),g;if(!(e in b))if("checked"==e&&(g=this.getAttribute(e)))a.setAttribute(e,g);else if(!CKEDITOR.env.ie||this.hasAttribute(e))g=this.getAttribute(e),null===g&&(g=d.nodeValue),a.setAttribute(e,g)}""!==this.$.style.cssText&&
+(a.$.style.cssText=this.$.style.cssText)},renameNode:function(a){if(this.getName()!=a){var b=this.getDocument();a=new CKEDITOR.dom.element(a,b);this.copyAttributes(a);this.moveChildren(a);this.getParent(!0)&&this.$.parentNode.replaceChild(a.$,this.$);a.$["data-cke-expando"]=this.$["data-cke-expando"];this.$=a.$;delete this.getName}},getChild:function(){function a(b,c){var f=b.childNodes;if(0<=c&&c<f.length)return f[c]}return function(b){var c=this.$;if(b.slice)for(b=b.slice();0<b.length&&c;)c=a(c,
+b.shift());else c=a(c,b);return c?new CKEDITOR.dom.node(c):null}}(),getChildCount:function(){return this.$.childNodes.length},disableContextMenu:function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT&&b.hasClass("cke_enable_context_menu")}this.on("contextmenu",function(b){b.data.getTarget().getAscendant(a,!0)||b.data.preventDefault()})},getDirection:function(a){return a?this.getComputedStyle("direction")||this.getDirection()||this.getParent()&&this.getParent().getDirection(1)||this.getDocument().$.dir||
+"ltr":this.getStyle("direction")||this.getAttribute("dir")},data:function(a,b){a="data-"+a;if(void 0===b)return this.getAttribute(a);!1===b?this.removeAttribute(a):this.setAttribute(a,b);return null},getEditor:function(a){var b=CKEDITOR.instances,c,f,d;a=a||void 0===a;for(c in b)if(f=b[c],f.element.equals(this)&&f.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||!a&&(d=f.editable())&&(d.equals(this)||d.contains(this)))return f;return null},find:function(a){var c=d(this);a=new CKEDITOR.dom.nodeList(this.$.querySelectorAll(b(this,
+a)));c();return a},findOne:function(a){var c=d(this);a=this.$.querySelector(b(this,a));c();return a?new CKEDITOR.dom.element(a):null},forEach:function(a,b,c){if(!(c||b&&this.type!=b))var f=a(this);if(!1!==f){c=this.getChildren();for(var d=0;d<c.count();d++)f=c.getItem(d),f.type==CKEDITOR.NODE_ELEMENT?f.forEach(a,b):b&&f.type!=b||a(f)}}});var k={width:["border-left-width","border-right-width","padding-left","padding-right"],height:["border-top-width","border-bottom-width","padding-top","padding-bottom"]};
+CKEDITOR.dom.element.prototype.setSize=function(a,b,d){"number"==typeof b&&(!d||CKEDITOR.env.ie&&CKEDITOR.env.quirks||(b-=c.call(this,a)),this.setStyle(a,b+"px"))};CKEDITOR.dom.element.prototype.getSize=function(a,b){var d=Math.max(this.$["offset"+CKEDITOR.tools.capitalize(a)],this.$["client"+CKEDITOR.tools.capitalize(a)])||0;b&&(d-=c.call(this,a));return d}})();CKEDITOR.dom.documentFragment=function(a){a=a||CKEDITOR.document;this.$=a.type==CKEDITOR.NODE_DOCUMENT?a.$.createDocumentFragment():a};
 CKEDITOR.tools.extend(CKEDITOR.dom.documentFragment.prototype,CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,insertAfterNode:function(a){a=a.$;a.parentNode.insertBefore(this.$,a.nextSibling)},getHtml:function(){var a=new CKEDITOR.dom.element("div");this.clone(1,1).appendTo(a);return a.getHtml().replace(/\s*data-cke-expando=".*?"/g,"")}},!0,{append:1,appendBogus:1,clone:1,getFirst:1,getHtml:1,getLast:1,getParent:1,getNext:1,getPrevious:1,appendTo:1,moveChildren:1,insertBefore:1,
 insertAfterNode:1,replace:1,trim:1,type:1,ltrim:1,rtrim:1,getDocument:1,getChildCount:1,getChild:1,getChildren:1});
-(function(){function a(a,b){var c=this.range;if(this._.end)return null;if(!this._.start){this._.start=1;if(c.collapsed)return this.end(),null;c.optimize()}var f,d=c.startContainer;f=c.endContainer;var e=c.startOffset,y=c.endOffset,r,h=this.guard,n=this.type,m=a?"getPreviousSourceNode":"getNextSourceNode";if(!a&&!this._.guardLTR){var z=f.type==CKEDITOR.NODE_ELEMENT?f:f.getParent(),B=f.type==CKEDITOR.NODE_ELEMENT?f.getChild(y):f.getNext();this._.guardLTR=function(a,b){return(!b||!z.equals(a))&&(!B||
-!a.equals(B))&&(a.type!=CKEDITOR.NODE_ELEMENT||!b||!a.equals(c.root))}}if(a&&!this._.guardRTL){var E=d.type==CKEDITOR.NODE_ELEMENT?d:d.getParent(),g=d.type==CKEDITOR.NODE_ELEMENT?e?d.getChild(e-1):null:d.getPrevious();this._.guardRTL=function(a,b){return(!b||!E.equals(a))&&(!g||!a.equals(g))&&(a.type!=CKEDITOR.NODE_ELEMENT||!b||!a.equals(c.root))}}var l=a?this._.guardRTL:this._.guardLTR;r=h?function(a,b){return!1===l(a,b)?!1:h(a,b)}:l;this.current?f=this.current[m](!1,n,r):(a?f.type==CKEDITOR.NODE_ELEMENT&&
-(f=0<y?f.getChild(y-1):!1===r(f,!0)?null:f.getPreviousSourceNode(!0,n,r)):(f=d,f.type==CKEDITOR.NODE_ELEMENT&&((f=f.getChild(e))||(f=!1===r(d,!0)?null:d.getNextSourceNode(!0,n,r)))),f&&!1===r(f)&&(f=null));for(;f&&!this._.end;){this.current=f;if(!this.evaluator||!1!==this.evaluator(f)){if(!b)return f}else if(b&&this.evaluator)return!1;f=f[m](!1,n,r)}this.end();return this.current=null}function d(b){for(var c,f=null;c=a.call(this,b);)f=c;return f}CKEDITOR.dom.walker=CKEDITOR.tools.createClass({$:function(a){this.range=
+(function(){function a(a,b){var c=this.range;if(this._.end)return null;if(!this._.start){this._.start=1;if(c.collapsed)return this.end(),null;c.optimize()}var f,d=c.startContainer;f=c.endContainer;var e=c.startOffset,B=c.endOffset,g,l=this.guard,q=this.type,n=a?"getPreviousSourceNode":"getNextSourceNode";if(!a&&!this._.guardLTR){var t=f.type==CKEDITOR.NODE_ELEMENT?f:f.getParent(),A=f.type==CKEDITOR.NODE_ELEMENT?f.getChild(B):f.getNext();this._.guardLTR=function(a,b){return(!b||!t.equals(a))&&(!A||
+!a.equals(A))&&(a.type!=CKEDITOR.NODE_ELEMENT||!b||!a.equals(c.root))}}if(a&&!this._.guardRTL){var C=d.type==CKEDITOR.NODE_ELEMENT?d:d.getParent(),h=d.type==CKEDITOR.NODE_ELEMENT?e?d.getChild(e-1):null:d.getPrevious();this._.guardRTL=function(a,b){return(!b||!C.equals(a))&&(!h||!a.equals(h))&&(a.type!=CKEDITOR.NODE_ELEMENT||!b||!a.equals(c.root))}}var k=a?this._.guardRTL:this._.guardLTR;g=l?function(a,b){return!1===k(a,b)?!1:l(a,b)}:k;this.current?f=this.current[n](!1,q,g):(a?f.type==CKEDITOR.NODE_ELEMENT&&
+(f=0<B?f.getChild(B-1):!1===g(f,!0)?null:f.getPreviousSourceNode(!0,q,g)):(f=d,f.type==CKEDITOR.NODE_ELEMENT&&((f=f.getChild(e))||(f=!1===g(d,!0)?null:d.getNextSourceNode(!0,q,g)))),f&&!1===g(f)&&(f=null));for(;f&&!this._.end;){this.current=f;if(!this.evaluator||!1!==this.evaluator(f)){if(!b)return f}else if(b&&this.evaluator)return!1;f=f[n](!1,q,g)}this.end();return this.current=null}function d(b){for(var c,f=null;c=a.call(this,b);)f=c;return f}CKEDITOR.dom.walker=CKEDITOR.tools.createClass({$:function(a){this.range=
 a;this._={}},proto:{end:function(){this._.end=1},next:function(){return a.call(this)},previous:function(){return a.call(this,1)},checkForward:function(){return!1!==a.call(this,0,1)},checkBackward:function(){return!1!==a.call(this,1,1)},lastForward:function(){return d.call(this)},lastBackward:function(){return d.call(this,1)},reset:function(){delete this.current;this._={}}}});var b={block:1,"list-item":1,table:1,"table-row-group":1,"table-header-group":1,"table-footer-group":1,"table-row":1,"table-column-group":1,
 "table-column":1,"table-cell":1,"table-caption":1},c={absolute:1,fixed:1};CKEDITOR.dom.element.prototype.isBlockBoundary=function(a){return"none"!=this.getComputedStyle("float")||this.getComputedStyle("position")in c||!b[this.getComputedStyle("display")]?!!(this.is(CKEDITOR.dtd.$block)||a&&this.is(a)):!0};CKEDITOR.dom.walker.blockBoundary=function(a){return function(b){return!(b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary(a))}};CKEDITOR.dom.walker.listItemBoundary=function(){return this.blockBoundary({br:1})};
 CKEDITOR.dom.walker.bookmark=function(a,b){function c(a){return a&&a.getName&&"span"==a.getName()&&a.data("cke-bookmark")}return function(f){var d,e;d=f&&f.type!=CKEDITOR.NODE_ELEMENT&&(e=f.getParent())&&c(e);d=a?d:d||c(f);return!!(b^d)}};CKEDITOR.dom.walker.whitespaces=function(a){return function(b){var c;b&&b.type==CKEDITOR.NODE_TEXT&&(c=!CKEDITOR.tools.trim(b.getText())||CKEDITOR.env.webkit&&b.getText()==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE);return!!(a^c)}};CKEDITOR.dom.walker.invisible=
-function(a){var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.env.webkit?1:0;return function(f){b(f)?f=1:(f.type==CKEDITOR.NODE_TEXT&&(f=f.getParent()),f=f.$.offsetWidth<=c);return!!(a^f)}};CKEDITOR.dom.walker.nodeType=function(a,b){return function(c){return!!(b^c.type==a)}};CKEDITOR.dom.walker.bogus=function(a){function b(a){return!g(a)&&!l(a)}return function(c){var f=CKEDITOR.env.needsBrFiller?c.is&&c.is("br"):c.getText&&e.test(c.getText());f&&(f=c.getParent(),c=c.getNext(b),f=f.isBlockBoundary()&&
-(!c||c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary()));return!!(a^f)}};CKEDITOR.dom.walker.temp=function(a){return function(b){b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());b=b&&b.hasAttribute("data-cke-temp");return!!(a^b)}};var e=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,g=CKEDITOR.dom.walker.whitespaces(),l=CKEDITOR.dom.walker.bookmark(),k=CKEDITOR.dom.walker.temp(),q=function(a){return l(a)||g(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.is(CKEDITOR.dtd.$inline)&&!a.is(CKEDITOR.dtd.$empty)};CKEDITOR.dom.walker.ignored=
-function(a){return function(b){b=g(b)||l(b)||k(b);return!!(a^b)}};var w=CKEDITOR.dom.walker.ignored();CKEDITOR.dom.walker.empty=function(a){return function(b){for(var c=0,f=b.getChildCount();c<f;++c)if(!w(b.getChild(c)))return!!a;return!a}};var f=CKEDITOR.dom.walker.empty(),y=CKEDITOR.dom.walker.validEmptyBlockContainers=CKEDITOR.tools.extend(function(a){var b={},c;for(c in a)CKEDITOR.dtd[c]["#"]&&(b[c]=1);return b}(CKEDITOR.dtd.$block),{caption:1,td:1,th:1});CKEDITOR.dom.walker.editable=function(a){return function(b){b=
-w(b)?!1:b.type==CKEDITOR.NODE_TEXT||b.type==CKEDITOR.NODE_ELEMENT&&(b.is(CKEDITOR.dtd.$inline)||b.is("hr")||"false"==b.getAttribute("contenteditable")||!CKEDITOR.env.needsBrFiller&&b.is(y)&&f(b))?!0:!1;return!!(a^b)}};CKEDITOR.dom.element.prototype.getBogus=function(){var a=this;do a=a.getPreviousSourceNode();while(q(a));return a&&(CKEDITOR.env.needsBrFiller?a.is&&a.is("br"):a.getText&&e.test(a.getText()))?a:!1}})();
+function(a){var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.env.webkit?1:0;return function(f){b(f)?f=1:(f.type==CKEDITOR.NODE_TEXT&&(f=f.getParent()),f=f.$.offsetWidth<=c);return!!(a^f)}};CKEDITOR.dom.walker.nodeType=function(a,b){return function(c){return!!(b^c.type==a)}};CKEDITOR.dom.walker.bogus=function(a){function b(a){return!g(a)&&!k(a)}return function(c){var f=CKEDITOR.env.needsBrFiller?c.is&&c.is("br"):c.getText&&e.test(c.getText());f&&(f=c.getParent(),c=c.getNext(b),f=f.isBlockBoundary()&&
+(!c||c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary()));return!!(a^f)}};CKEDITOR.dom.walker.temp=function(a){return function(b){b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());b=b&&b.hasAttribute("data-cke-temp");return!!(a^b)}};var e=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,g=CKEDITOR.dom.walker.whitespaces(),k=CKEDITOR.dom.walker.bookmark(),h=CKEDITOR.dom.walker.temp(),p=function(a){return k(a)||g(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.is(CKEDITOR.dtd.$inline)&&!a.is(CKEDITOR.dtd.$empty)};CKEDITOR.dom.walker.ignored=
+function(a){return function(b){b=g(b)||k(b)||h(b);return!!(a^b)}};var r=CKEDITOR.dom.walker.ignored();CKEDITOR.dom.walker.empty=function(a){return function(b){for(var c=0,f=b.getChildCount();c<f;++c)if(!r(b.getChild(c)))return!!a;return!a}};var f=CKEDITOR.dom.walker.empty(),B=CKEDITOR.dom.walker.validEmptyBlockContainers=CKEDITOR.tools.extend(function(a){var b={},c;for(c in a)CKEDITOR.dtd[c]["#"]&&(b[c]=1);return b}(CKEDITOR.dtd.$block),{caption:1,td:1,th:1});CKEDITOR.dom.walker.editable=function(a){return function(b){b=
+r(b)?!1:b.type==CKEDITOR.NODE_TEXT||b.type==CKEDITOR.NODE_ELEMENT&&(b.is(CKEDITOR.dtd.$inline)||b.is("hr")||"false"==b.getAttribute("contenteditable")||!CKEDITOR.env.needsBrFiller&&b.is(B)&&f(b))?!0:!1;return!!(a^b)}};CKEDITOR.dom.element.prototype.getBogus=function(){var a=this;do a=a.getPreviousSourceNode();while(p(a));return a&&(CKEDITOR.env.needsBrFiller?a.is&&a.is("br"):a.getText&&e.test(a.getText()))?a:!1}})();
 CKEDITOR.dom.range=function(a){this.endOffset=this.endContainer=this.startOffset=this.startContainer=null;this.collapsed=!0;var d=a instanceof CKEDITOR.dom.document;this.document=d?a:a.getDocument();this.root=d?a.getBody():a};
-(function(){function a(a){a.collapsed=a.startContainer&&a.endContainer&&a.startContainer.equals(a.endContainer)&&a.startOffset==a.endOffset}function d(a,b,c,d,e){function p(a,b,c,f){var d=c?a.getPrevious():a.getNext();if(f&&k)return d;h||f?b.append(a.clone(!0,e),c):(a.remove(),r&&b.append(a));return d}function g(){var a,b,c,f=Math.min(v.length,I.length);for(a=0;a<f;a++)if(b=v[a],c=I[a],!b.equals(c))return a;return a-1}function l(){var b=J-1,c=H&&w&&!n.equals(m);b<F-1||b<L-1||c?(c?a.moveToPosition(m,
-CKEDITOR.POSITION_BEFORE_START):L==b+1&&C?a.moveToPosition(I[b],CKEDITOR.POSITION_BEFORE_END):a.moveToPosition(I[b+1],CKEDITOR.POSITION_BEFORE_START),d&&(b=v[b+1])&&b.type==CKEDITOR.NODE_ELEMENT&&(c=CKEDITOR.dom.element.createFromHtml('\x3cspan data-cke-bookmark\x3d"1" style\x3d"display:none"\x3e\x26nbsp;\x3c/span\x3e',a.document),c.insertAfter(b),b.mergeSiblings(!1),a.moveToBookmark({startNode:c}))):a.collapse(!0)}a.optimizeBookmark();var k=0===b,r=1==b,h=2==b;b=h||r;var n=a.startContainer,m=a.endContainer,
-z=a.startOffset,B=a.endOffset,E,C,H,w,q,Q;if(h&&m.type==CKEDITOR.NODE_TEXT&&n.equals(m))n=a.document.createText(n.substring(z,B)),c.append(n);else{m.type==CKEDITOR.NODE_TEXT?h?Q=!0:m=m.split(B):0<m.getChildCount()?B>=m.getChildCount()?(m=m.getChild(B-1),C=!0):m=m.getChild(B):w=C=!0;n.type==CKEDITOR.NODE_TEXT?h?q=!0:n.split(z):0<n.getChildCount()?0===z?(n=n.getChild(z),E=!0):n=n.getChild(z-1):H=E=!0;for(var v=n.getParents(),I=m.getParents(),J=g(),F=v.length-1,L=I.length-1,K=c,ba,Z,V,fa=-1,N=J;N<=F;N++){Z=
-v[N];V=Z.getNext();for(N!=F||Z.equals(I[N])&&F<L?b&&(ba=K.append(Z.clone(0,e))):E?p(Z,K,!1,H):q&&K.append(a.document.createText(Z.substring(z)));V;){if(V.equals(I[N])){fa=N;break}V=p(V,K)}K=ba}K=c;for(N=J;N<=L;N++)if(c=I[N],V=c.getPrevious(),c.equals(v[N]))b&&(K=K.getChild(0));else{N!=L||c.equals(v[N])&&L<F?b&&(ba=K.append(c.clone(0,e))):C?p(c,K,!1,w):Q&&K.append(a.document.createText(c.substring(0,B)));if(N>fa)for(;V;)V=p(V,K,!0);K=ba}h||l()}}function b(){var a=!1,b=CKEDITOR.dom.walker.whitespaces(),
-c=CKEDITOR.dom.walker.bookmark(!0),d=CKEDITOR.dom.walker.bogus();return function(e){return c(e)||b(e)?!0:d(e)&&!a?a=!0:e.type==CKEDITOR.NODE_TEXT&&(e.hasAscendant("pre")||CKEDITOR.tools.trim(e.getText()).length)||e.type==CKEDITOR.NODE_ELEMENT&&!e.is(g)?!1:!0}}function c(a){var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(1);return function(d){return c(d)||b(d)?!0:!a&&l(d)||d.type==CKEDITOR.NODE_ELEMENT&&d.is(CKEDITOR.dtd.$removeEmpty)}}function e(a){return function(){var b;return this[a?
-"getPreviousNode":"getNextNode"](function(a){!b&&w(a)&&(b=a);return q(a)&&!(l(a)&&a.equals(b))})}}var g={abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,"var":1},l=CKEDITOR.dom.walker.bogus(),k=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,q=CKEDITOR.dom.walker.editable(),w=CKEDITOR.dom.walker.ignored(!0);CKEDITOR.dom.range.prototype={clone:function(){var a=new CKEDITOR.dom.range(this.root);a._setStartContainer(this.startContainer);
+(function(){function a(a){a.collapsed=a.startContainer&&a.endContainer&&a.startContainer.equals(a.endContainer)&&a.startOffset==a.endOffset}function d(a,b,c,d,e){function m(a,b,c,f){var d=c?a.getPrevious():a.getNext();if(f&&k)return d;l||f?b.append(a.clone(!0,e),c):(a.remove(),r&&b.append(a));return d}function g(){var a,b,c,f=Math.min(P.length,v.length);for(a=0;a<f;a++)if(b=P[a],c=v[a],!b.equals(c))return a;return a-1}function h(){var b=G-1,c=M&&H&&!q.equals(n);b<E-1||b<I-1||c?(c?a.moveToPosition(n,
+CKEDITOR.POSITION_BEFORE_START):I==b+1&&D?a.moveToPosition(v[b],CKEDITOR.POSITION_BEFORE_END):a.moveToPosition(v[b+1],CKEDITOR.POSITION_BEFORE_START),d&&(b=P[b+1])&&b.type==CKEDITOR.NODE_ELEMENT&&(c=CKEDITOR.dom.element.createFromHtml('\x3cspan data-cke-bookmark\x3d"1" style\x3d"display:none"\x3e\x26nbsp;\x3c/span\x3e',a.document),c.insertAfter(b),b.mergeSiblings(!1),a.moveToBookmark({startNode:c}))):a.collapse(!0)}a.optimizeBookmark();var k=0===b,r=1==b,l=2==b;b=l||r;var q=a.startContainer,n=a.endContainer,
+t=a.startOffset,A=a.endOffset,C,D,M,H,p,Q;if(l&&n.type==CKEDITOR.NODE_TEXT&&q.equals(n))q=a.document.createText(q.substring(t,A)),c.append(q);else{n.type==CKEDITOR.NODE_TEXT?l?Q=!0:n=n.split(A):0<n.getChildCount()?A>=n.getChildCount()?(n=n.getChild(A-1),D=!0):n=n.getChild(A):H=D=!0;q.type==CKEDITOR.NODE_TEXT?l?p=!0:q.split(t):0<q.getChildCount()?0===t?(q=q.getChild(t),C=!0):q=q.getChild(t-1):M=C=!0;for(var P=q.getParents(),v=n.getParents(),G=g(),E=P.length-1,I=v.length-1,K=c,L,Z,X,fa=-1,S=G;S<=E;S++){Z=
+P[S];X=Z.getNext();for(S!=E||Z.equals(v[S])&&E<I?b&&(L=K.append(Z.clone(0,e))):C?m(Z,K,!1,M):p&&K.append(a.document.createText(Z.substring(t)));X;){if(X.equals(v[S])){fa=S;break}X=m(X,K)}K=L}K=c;for(S=G;S<=I;S++)if(c=v[S],X=c.getPrevious(),c.equals(P[S]))b&&(K=K.getChild(0));else{S!=I||c.equals(P[S])&&I<E?b&&(L=K.append(c.clone(0,e))):D?m(c,K,!1,H):Q&&K.append(a.document.createText(c.substring(0,A)));if(S>fa)for(;X;)X=m(X,K,!0);K=L}l||h()}}function b(){var a=!1,b=CKEDITOR.dom.walker.whitespaces(),
+c=CKEDITOR.dom.walker.bookmark(!0),d=CKEDITOR.dom.walker.bogus();return function(e){return c(e)||b(e)?!0:d(e)&&!a?a=!0:e.type==CKEDITOR.NODE_TEXT&&(e.hasAscendant("pre")||CKEDITOR.tools.trim(e.getText()).length)||e.type==CKEDITOR.NODE_ELEMENT&&!e.is(g)?!1:!0}}function c(a){var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(1);return function(d){return c(d)||b(d)?!0:!a&&k(d)||d.type==CKEDITOR.NODE_ELEMENT&&d.is(CKEDITOR.dtd.$removeEmpty)}}function e(a){return function(){var b;return this[a?
+"getPreviousNode":"getNextNode"](function(a){!b&&r(a)&&(b=a);return p(a)&&!(k(a)&&a.equals(b))})}}var g={abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,"var":1},k=CKEDITOR.dom.walker.bogus(),h=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,p=CKEDITOR.dom.walker.editable(),r=CKEDITOR.dom.walker.ignored(!0);CKEDITOR.dom.range.prototype={clone:function(){var a=new CKEDITOR.dom.range(this.root);a._setStartContainer(this.startContainer);
 a.startOffset=this.startOffset;a._setEndContainer(this.endContainer);a.endOffset=this.endOffset;a.collapsed=this.collapsed;return a},collapse:function(a){a?(this._setEndContainer(this.startContainer),this.endOffset=this.startOffset):(this._setStartContainer(this.endContainer),this.startOffset=this.endOffset);this.collapsed=!0},cloneContents:function(a){var b=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||d(this,2,b,!1,"undefined"==typeof a?!0:a);return b},deleteContents:function(a){this.collapsed||
-d(this,0,null,a)},extractContents:function(a,b){var c=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||d(this,1,c,a,"undefined"==typeof b?!0:b);return c},createBookmark:function(a){var b,c,d,e,p=this.collapsed;b=this.document.createElement("span");b.data("cke-bookmark",1);b.setStyle("display","none");b.setHtml("\x26nbsp;");a&&(d="cke_bm_"+CKEDITOR.tools.getNextNumber(),b.setAttribute("id",d+(p?"C":"S")));p||(c=b.clone(),c.setHtml("\x26nbsp;"),a&&c.setAttribute("id",d+"E"),e=this.clone(),
-e.collapse(),e.insertNode(c));e=this.clone();e.collapse(!0);e.insertNode(b);c?(this.setStartAfter(b),this.setEndBefore(c)):this.moveToPosition(b,CKEDITOR.POSITION_AFTER_END);return{startNode:a?d+(p?"C":"S"):b,endNode:a?d+"E":c,serializable:a,collapsed:p}},createBookmark2:function(){function a(b){var f=b.container,d=b.offset,e;e=f;var g=d;e=e.type!=CKEDITOR.NODE_ELEMENT||0===g||g==e.getChildCount()?0:e.getChild(g-1).type==CKEDITOR.NODE_TEXT&&e.getChild(g).type==CKEDITOR.NODE_TEXT;e&&(f=f.getChild(d-
+d(this,0,null,a)},extractContents:function(a,b){var c=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||d(this,1,c,a,"undefined"==typeof b?!0:b);return c},createBookmark:function(a){var b,c,d,e,m=this.collapsed;b=this.document.createElement("span");b.data("cke-bookmark",1);b.setStyle("display","none");b.setHtml("\x26nbsp;");a&&(d="cke_bm_"+CKEDITOR.tools.getNextNumber(),b.setAttribute("id",d+(m?"C":"S")));m||(c=b.clone(),c.setHtml("\x26nbsp;"),a&&c.setAttribute("id",d+"E"),e=this.clone(),
+e.collapse(),e.insertNode(c));e=this.clone();e.collapse(!0);e.insertNode(b);c?(this.setStartAfter(b),this.setEndBefore(c)):this.moveToPosition(b,CKEDITOR.POSITION_AFTER_END);return{startNode:a?d+(m?"C":"S"):b,endNode:a?d+"E":c,serializable:a,collapsed:m}},createBookmark2:function(){function a(b){var f=b.container,d=b.offset,e;e=f;var g=d;e=e.type!=CKEDITOR.NODE_ELEMENT||0===g||g==e.getChildCount()?0:e.getChild(g-1).type==CKEDITOR.NODE_TEXT&&e.getChild(g).type==CKEDITOR.NODE_TEXT;e&&(f=f.getChild(d-
 1),d=f.getLength());if(f.type==CKEDITOR.NODE_ELEMENT&&0<d){a:{for(e=f;d--;)if(g=e.getChild(d).getIndex(!0),0<=g){d=g;break a}d=-1}d+=1}if(f.type==CKEDITOR.NODE_TEXT){e=f;for(g=0;(e=e.getPrevious())&&e.type==CKEDITOR.NODE_TEXT;)g+=e.getText().replace(CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE,"").length;e=g;f.getText()?d+=e:(g=f.getPrevious(c),e?(d=e,f=g?g.getNext():f.getParent().getFirst()):(f=f.getParent(),d=g?g.getIndex(!0)+1:0))}b.container=f;b.offset=d}function b(a,c){var f=c.getCustomData("cke-fillingChar");
 if(f){var d=a.container;f.equals(d)&&(a.offset-=CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE.length,0>=a.offset&&(a.offset=d.getIndex(),a.container=d.getParent()))}}var c=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_TEXT,!0);return function(c){var d=this.collapsed,e={container:this.startContainer,offset:this.startOffset},g={container:this.endContainer,offset:this.endOffset};c&&(a(e),b(e,this.root),d||(a(g),b(g,this.root)));return{start:e.container.getAddress(c),end:d?null:g.container.getAddress(c),
 startOffset:e.offset,endOffset:g.offset,normalized:c,collapsed:d,is2:!0}}}(),moveToBookmark:function(a){if(a.is2){var b=this.document.getByAddress(a.start,a.normalized),c=a.startOffset,d=a.end&&this.document.getByAddress(a.end,a.normalized);a=a.endOffset;this.setStart(b,c);d?this.setEnd(d,a):this.collapse(!0)}else b=(c=a.serializable)?this.document.getById(a.startNode):a.startNode,a=c?this.document.getById(a.endNode):a.endNode,this.setStartBefore(b),b.remove(),a?(this.setEndBefore(a),a.remove()):
 this.collapse(!0)},getBoundaryNodes:function(){var a=this.startContainer,b=this.endContainer,c=this.startOffset,d=this.endOffset,e;if(a.type==CKEDITOR.NODE_ELEMENT)if(e=a.getChildCount(),e>c)a=a.getChild(c);else if(1>e)a=a.getPreviousSourceNode();else{for(a=a.$;a.lastChild;)a=a.lastChild;a=new CKEDITOR.dom.node(a);a=a.getNextSourceNode()||a}if(b.type==CKEDITOR.NODE_ELEMENT)if(e=b.getChildCount(),e>d)b=b.getChild(d).getPreviousSourceNode(!0);else if(1>e)b=b.getPreviousSourceNode();else{for(b=b.$;b.lastChild;)b=
 b.lastChild;b=new CKEDITOR.dom.node(b)}a.getPosition(b)&CKEDITOR.POSITION_FOLLOWING&&(a=b);return{startNode:a,endNode:b}},getCommonAncestor:function(a,b){var c=this.startContainer,d=this.endContainer,c=c.equals(d)?a&&c.type==CKEDITOR.NODE_ELEMENT&&this.startOffset==this.endOffset-1?c.getChild(this.startOffset):c:c.getCommonAncestor(d);return b&&!c.is?c.getParent():c},optimize:function(){var a=this.startContainer,b=this.startOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setStartAfter(a):
 this.setStartBefore(a));a=this.endContainer;b=this.endOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setEndAfter(a):this.setEndBefore(a))},optimizeBookmark:function(){var a=this.startContainer,b=this.endContainer;a.is&&a.is("span")&&a.data("cke-bookmark")&&this.setStartAt(a,CKEDITOR.POSITION_BEFORE_START);b&&b.is&&b.is("span")&&b.data("cke-bookmark")&&this.setEndAt(b,CKEDITOR.POSITION_AFTER_END)},trim:function(a,b){var c=this.startContainer,d=this.startOffset,e=this.collapsed;if((!a||
-e)&&c&&c.type==CKEDITOR.NODE_TEXT){if(d)if(d>=c.getLength())d=c.getIndex()+1,c=c.getParent();else{var p=c.split(d),d=c.getIndex()+1,c=c.getParent();this.startContainer.equals(this.endContainer)?this.setEnd(p,this.endOffset-this.startOffset):c.equals(this.endContainer)&&(this.endOffset+=1)}else d=c.getIndex(),c=c.getParent();this.setStart(c,d);if(e){this.collapse(!0);return}}c=this.endContainer;d=this.endOffset;b||e||!c||c.type!=CKEDITOR.NODE_TEXT||(d?(d>=c.getLength()||c.split(d),d=c.getIndex()+1):
-d=c.getIndex(),c=c.getParent(),this.setEnd(c,d))},enlarge:function(a,b){function c(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("contenteditable")?null:a}var d=new RegExp(/[^\s\ufeff]/);switch(a){case CKEDITOR.ENLARGE_INLINE:var e=1;case CKEDITOR.ENLARGE_ELEMENT:var p=function(a,b){var c=new CKEDITOR.dom.range(l);c.setStart(a,b);c.setEndAt(l,CKEDITOR.POSITION_BEFORE_END);var c=new CKEDITOR.dom.walker(c),f;for(c.guard=function(a){return!(a.type==CKEDITOR.NODE_ELEMENT&&a.isBlockBoundary())};f=
-c.next();){if(f.type!=CKEDITOR.NODE_TEXT)return!1;E=f!=a?f.getText():f.substring(b);if(d.test(E))return!1}return!0};if(this.collapsed)break;var g=this.getCommonAncestor(),l=this.root,k,r,h,n,m,z=!1,B,E;B=this.startContainer;var C=this.startOffset;B.type==CKEDITOR.NODE_TEXT?(C&&(B=!CKEDITOR.tools.trim(B.substring(0,C)).length&&B,z=!!B),B&&((n=B.getPrevious())||(h=B.getParent()))):(C&&(n=B.getChild(C-1)||B.getLast()),n||(h=B));for(h=c(h);h||n;){if(h&&!n){!m&&h.equals(g)&&(m=!0);if(e?h.isBlockBoundary():
-!l.contains(h))break;z&&"inline"==h.getComputedStyle("display")||(z=!1,m?k=h:this.setStartBefore(h));n=h.getPrevious()}for(;n;)if(B=!1,n.type==CKEDITOR.NODE_COMMENT)n=n.getPrevious();else{if(n.type==CKEDITOR.NODE_TEXT)E=n.getText(),d.test(E)&&(n=null),B=/[\s\ufeff]$/.test(E);else if((n.$.offsetWidth>(CKEDITOR.env.webkit?1:0)||b&&n.is("br"))&&!n.data("cke-bookmark"))if(z&&CKEDITOR.dtd.$removeEmpty[n.getName()]){E=n.getText();if(d.test(E))n=null;else for(var C=n.$.getElementsByTagName("*"),H=0,w;w=
-C[H++];)if(!CKEDITOR.dtd.$removeEmpty[w.nodeName.toLowerCase()]){n=null;break}n&&(B=!!E.length)}else n=null;B&&(z?m?k=h:h&&this.setStartBefore(h):z=!0);if(n){B=n.getPrevious();if(!h&&!B){h=n;n=null;break}n=B}else h=null}h&&(h=c(h.getParent()))}B=this.endContainer;C=this.endOffset;h=n=null;m=z=!1;B.type==CKEDITOR.NODE_TEXT?CKEDITOR.tools.trim(B.substring(C)).length?z=!0:(z=!B.getLength(),C==B.getLength()?(n=B.getNext())||(h=B.getParent()):p(B,C)&&(h=B.getParent())):(n=B.getChild(C))||(h=B);for(;h||
-n;){if(h&&!n){!m&&h.equals(g)&&(m=!0);if(e?h.isBlockBoundary():!l.contains(h))break;z&&"inline"==h.getComputedStyle("display")||(z=!1,m?r=h:h&&this.setEndAfter(h));n=h.getNext()}for(;n;){B=!1;if(n.type==CKEDITOR.NODE_TEXT)E=n.getText(),p(n,0)||(n=null),B=/^[\s\ufeff]/.test(E);else if(n.type==CKEDITOR.NODE_ELEMENT){if((0<n.$.offsetWidth||b&&n.is("br"))&&!n.data("cke-bookmark"))if(z&&CKEDITOR.dtd.$removeEmpty[n.getName()]){E=n.getText();if(d.test(E))n=null;else for(C=n.$.getElementsByTagName("*"),H=
-0;w=C[H++];)if(!CKEDITOR.dtd.$removeEmpty[w.nodeName.toLowerCase()]){n=null;break}n&&(B=!!E.length)}else n=null}else B=1;B&&z&&(m?r=h:this.setEndAfter(h));if(n){B=n.getNext();if(!h&&!B){h=n;n=null;break}n=B}else h=null}h&&(h=c(h.getParent()))}k&&r&&(g=k.contains(r)?r:k,this.setStartBefore(g),this.setEndAfter(g));break;case CKEDITOR.ENLARGE_BLOCK_CONTENTS:case CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:h=new CKEDITOR.dom.range(this.root);l=this.root;h.setStartAt(l,CKEDITOR.POSITION_AFTER_START);h.setEnd(this.startContainer,
-this.startOffset);h=new CKEDITOR.dom.walker(h);var q,Q,v=CKEDITOR.dom.walker.blockBoundary(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?{br:1}:null),I=null,J=function(a){if(a.type==CKEDITOR.NODE_ELEMENT&&"false"==a.getAttribute("contenteditable"))if(I){if(I.equals(a)){I=null;return}}else I=a;else if(I)return;var b=v(a);b||(q=a);return b},e=function(a){var b=J(a);!b&&a.is&&a.is("br")&&(Q=a);return b};h.guard=J;h=h.lastBackward();q=q||l;this.setStartAt(q,!q.is("br")&&(!h&&this.checkStartOfBlock()||h&&q.contains(h))?
-CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_AFTER_END);if(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS){h=this.clone();h=new CKEDITOR.dom.walker(h);var F=CKEDITOR.dom.walker.whitespaces(),L=CKEDITOR.dom.walker.bookmark();h.evaluator=function(a){return!F(a)&&!L(a)};if((h=h.previous())&&h.type==CKEDITOR.NODE_ELEMENT&&h.is("br"))break}h=this.clone();h.collapse();h.setEndAt(l,CKEDITOR.POSITION_BEFORE_END);h=new CKEDITOR.dom.walker(h);h.guard=a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?e:J;q=I=Q=null;h=h.lastForward();
-q=q||l;this.setEndAt(q,!h&&this.checkEndOfBlock()||h&&q.contains(h)?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_BEFORE_START);Q&&this.setEndAfter(Q)}},shrink:function(a,b,c){if(!this.collapsed){a=a||CKEDITOR.SHRINK_TEXT;var d=this.clone(),e=this.startContainer,p=this.endContainer,g=this.startOffset,l=this.endOffset,k=1,r=1;e&&e.type==CKEDITOR.NODE_TEXT&&(g?g>=e.getLength()?d.setStartAfter(e):(d.setStartBefore(e),k=0):d.setStartBefore(e));p&&p.type==CKEDITOR.NODE_TEXT&&(l?l>=p.getLength()?d.setEndAfter(p):
-(d.setEndAfter(p),r=0):d.setEndBefore(p));var d=new CKEDITOR.dom.walker(d),h=CKEDITOR.dom.walker.bookmark();d.evaluator=function(b){return b.type==(a==CKEDITOR.SHRINK_ELEMENT?CKEDITOR.NODE_ELEMENT:CKEDITOR.NODE_TEXT)};var n;d.guard=function(b,d){if(h(b))return!0;if(a==CKEDITOR.SHRINK_ELEMENT&&b.type==CKEDITOR.NODE_TEXT||d&&b.equals(n)||!1===c&&b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()||b.type==CKEDITOR.NODE_ELEMENT&&b.hasAttribute("contenteditable"))return!1;d||b.type!=CKEDITOR.NODE_ELEMENT||
-(n=b);return!0};k&&(e=d[a==CKEDITOR.SHRINK_ELEMENT?"lastForward":"next"]())&&this.setStartAt(e,b?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_START);r&&(d.reset(),(d=d[a==CKEDITOR.SHRINK_ELEMENT?"lastBackward":"previous"]())&&this.setEndAt(d,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_END));return!(!k&&!r)}},insertNode:function(a){this.optimizeBookmark();this.trim(!1,!0);var b=this.startContainer,c=b.getChild(this.startOffset);c?a.insertBefore(c):b.append(a);a.getParent()&&a.getParent().equals(this.endContainer)&&
+e)&&c&&c.type==CKEDITOR.NODE_TEXT){if(d)if(d>=c.getLength())d=c.getIndex()+1,c=c.getParent();else{var m=c.split(d),d=c.getIndex()+1,c=c.getParent();this.startContainer.equals(this.endContainer)?this.setEnd(m,this.endOffset-this.startOffset):c.equals(this.endContainer)&&(this.endOffset+=1)}else d=c.getIndex(),c=c.getParent();this.setStart(c,d);if(e){this.collapse(!0);return}}c=this.endContainer;d=this.endOffset;b||e||!c||c.type!=CKEDITOR.NODE_TEXT||(d?(d>=c.getLength()||c.split(d),d=c.getIndex()+1):
+d=c.getIndex(),c=c.getParent(),this.setEnd(c,d))},enlarge:function(a,b){function c(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("contenteditable")?null:a}var d=new RegExp(/[^\s\ufeff]/);switch(a){case CKEDITOR.ENLARGE_INLINE:var e=1;case CKEDITOR.ENLARGE_ELEMENT:var m=function(a,b){var c=new CKEDITOR.dom.range(h);c.setStart(a,b);c.setEndAt(h,CKEDITOR.POSITION_BEFORE_END);var c=new CKEDITOR.dom.walker(c),f;for(c.guard=function(a){return!(a.type==CKEDITOR.NODE_ELEMENT&&a.isBlockBoundary())};f=
+c.next();){if(f.type!=CKEDITOR.NODE_TEXT)return!1;C=f!=a?f.getText():f.substring(b);if(d.test(C))return!1}return!0};if(this.collapsed)break;var g=this.getCommonAncestor(),h=this.root,k,r,l,q,n,t=!1,A,C;A=this.startContainer;var D=this.startOffset;A.type==CKEDITOR.NODE_TEXT?(D&&(A=!CKEDITOR.tools.trim(A.substring(0,D)).length&&A,t=!!A),A&&((q=A.getPrevious())||(l=A.getParent()))):(D&&(q=A.getChild(D-1)||A.getLast()),q||(l=A));for(l=c(l);l||q;){if(l&&!q){!n&&l.equals(g)&&(n=!0);if(e?l.isBlockBoundary():
+!h.contains(l))break;t&&"inline"==l.getComputedStyle("display")||(t=!1,n?k=l:this.setStartBefore(l));q=l.getPrevious()}for(;q;)if(A=!1,q.type==CKEDITOR.NODE_COMMENT)q=q.getPrevious();else{if(q.type==CKEDITOR.NODE_TEXT)C=q.getText(),d.test(C)&&(q=null),A=/[\s\ufeff]$/.test(C);else if((q.$.offsetWidth>(CKEDITOR.env.webkit?1:0)||b&&q.is("br"))&&!q.data("cke-bookmark"))if(t&&CKEDITOR.dtd.$removeEmpty[q.getName()]){C=q.getText();if(d.test(C))q=null;else for(var D=q.$.getElementsByTagName("*"),M=0,H;H=
+D[M++];)if(!CKEDITOR.dtd.$removeEmpty[H.nodeName.toLowerCase()]){q=null;break}q&&(A=!!C.length)}else q=null;A&&(t?n?k=l:l&&this.setStartBefore(l):t=!0);if(q){A=q.getPrevious();if(!l&&!A){l=q;q=null;break}q=A}else l=null}l&&(l=c(l.getParent()))}A=this.endContainer;D=this.endOffset;l=q=null;n=t=!1;A.type==CKEDITOR.NODE_TEXT?CKEDITOR.tools.trim(A.substring(D)).length?t=!0:(t=!A.getLength(),D==A.getLength()?(q=A.getNext())||(l=A.getParent()):m(A,D)&&(l=A.getParent())):(q=A.getChild(D))||(l=A);for(;l||
+q;){if(l&&!q){!n&&l.equals(g)&&(n=!0);if(e?l.isBlockBoundary():!h.contains(l))break;t&&"inline"==l.getComputedStyle("display")||(t=!1,n?r=l:l&&this.setEndAfter(l));q=l.getNext()}for(;q;){A=!1;if(q.type==CKEDITOR.NODE_TEXT)C=q.getText(),m(q,0)||(q=null),A=/^[\s\ufeff]/.test(C);else if(q.type==CKEDITOR.NODE_ELEMENT){if((0<q.$.offsetWidth||b&&q.is("br"))&&!q.data("cke-bookmark"))if(t&&CKEDITOR.dtd.$removeEmpty[q.getName()]){C=q.getText();if(d.test(C))q=null;else for(D=q.$.getElementsByTagName("*"),M=
+0;H=D[M++];)if(!CKEDITOR.dtd.$removeEmpty[H.nodeName.toLowerCase()]){q=null;break}q&&(A=!!C.length)}else q=null}else A=1;A&&t&&(n?r=l:this.setEndAfter(l));if(q){A=q.getNext();if(!l&&!A){l=q;q=null;break}q=A}else l=null}l&&(l=c(l.getParent()))}k&&r&&(g=k.contains(r)?r:k,this.setStartBefore(g),this.setEndAfter(g));break;case CKEDITOR.ENLARGE_BLOCK_CONTENTS:case CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:l=new CKEDITOR.dom.range(this.root);h=this.root;l.setStartAt(h,CKEDITOR.POSITION_AFTER_START);l.setEnd(this.startContainer,
+this.startOffset);l=new CKEDITOR.dom.walker(l);var p,Q,P=CKEDITOR.dom.walker.blockBoundary(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?{br:1}:null),v=null,G=function(a){if(a.type==CKEDITOR.NODE_ELEMENT&&"false"==a.getAttribute("contenteditable"))if(v){if(v.equals(a)){v=null;return}}else v=a;else if(v)return;var b=P(a);b||(p=a);return b},e=function(a){var b=G(a);!b&&a.is&&a.is("br")&&(Q=a);return b};l.guard=G;l=l.lastBackward();p=p||h;this.setStartAt(p,!p.is("br")&&(!l&&this.checkStartOfBlock()||l&&p.contains(l))?
+CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_AFTER_END);if(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS){l=this.clone();l=new CKEDITOR.dom.walker(l);var E=CKEDITOR.dom.walker.whitespaces(),I=CKEDITOR.dom.walker.bookmark();l.evaluator=function(a){return!E(a)&&!I(a)};if((l=l.previous())&&l.type==CKEDITOR.NODE_ELEMENT&&l.is("br"))break}l=this.clone();l.collapse();l.setEndAt(h,CKEDITOR.POSITION_BEFORE_END);l=new CKEDITOR.dom.walker(l);l.guard=a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?e:G;p=v=Q=null;l=l.lastForward();
+p=p||h;this.setEndAt(p,!l&&this.checkEndOfBlock()||l&&p.contains(l)?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_BEFORE_START);Q&&this.setEndAfter(Q)}},shrink:function(a,b,c){if(!this.collapsed){a=a||CKEDITOR.SHRINK_TEXT;var d=this.clone(),e=this.startContainer,m=this.endContainer,g=this.startOffset,h=this.endOffset,k=1,r=1;e&&e.type==CKEDITOR.NODE_TEXT&&(g?g>=e.getLength()?d.setStartAfter(e):(d.setStartBefore(e),k=0):d.setStartBefore(e));m&&m.type==CKEDITOR.NODE_TEXT&&(h?h>=m.getLength()?d.setEndAfter(m):
+(d.setEndAfter(m),r=0):d.setEndBefore(m));var d=new CKEDITOR.dom.walker(d),l=CKEDITOR.dom.walker.bookmark();d.evaluator=function(b){return b.type==(a==CKEDITOR.SHRINK_ELEMENT?CKEDITOR.NODE_ELEMENT:CKEDITOR.NODE_TEXT)};var q;d.guard=function(b,d){if(l(b))return!0;if(a==CKEDITOR.SHRINK_ELEMENT&&b.type==CKEDITOR.NODE_TEXT||d&&b.equals(q)||!1===c&&b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()||b.type==CKEDITOR.NODE_ELEMENT&&b.hasAttribute("contenteditable"))return!1;d||b.type!=CKEDITOR.NODE_ELEMENT||
+(q=b);return!0};k&&(e=d[a==CKEDITOR.SHRINK_ELEMENT?"lastForward":"next"]())&&this.setStartAt(e,b?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_START);r&&(d.reset(),(d=d[a==CKEDITOR.SHRINK_ELEMENT?"lastBackward":"previous"]())&&this.setEndAt(d,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_END));return!(!k&&!r)}},insertNode:function(a){this.optimizeBookmark();this.trim(!1,!0);var b=this.startContainer,c=b.getChild(this.startOffset);c?a.insertBefore(c):b.append(a);a.getParent()&&a.getParent().equals(this.endContainer)&&
 this.endOffset++;this.setStartBefore(a)},moveToPosition:function(a,b){this.setStartAt(a,b);this.collapse(!0)},moveToRange:function(a){this.setStart(a.startContainer,a.startOffset);this.setEnd(a.endContainer,a.endOffset)},selectNodeContents:function(a){this.setStart(a,0);this.setEnd(a,a.type==CKEDITOR.NODE_TEXT?a.getLength():a.getChildCount())},setStart:function(b,c){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(c=b.getIndex(),b=b.getParent());this._setStartContainer(b);this.startOffset=
 c;this.endContainer||(this._setEndContainer(b),this.endOffset=c);a(this)},setEnd:function(b,c){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(c=b.getIndex()+1,b=b.getParent());this._setEndContainer(b);this.endOffset=c;this.startContainer||(this._setStartContainer(b),this.startOffset=c);a(this)},setStartAfter:function(a){this.setStart(a.getParent(),a.getIndex()+1)},setStartBefore:function(a){this.setStart(a.getParent(),a.getIndex())},setEndAfter:function(a){this.setEnd(a.getParent(),
 a.getIndex()+1)},setEndBefore:function(a){this.setEnd(a.getParent(),a.getIndex())},setStartAt:function(b,c){switch(c){case CKEDITOR.POSITION_AFTER_START:this.setStart(b,0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setStart(b,b.getLength()):this.setStart(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setStartBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setStartAfter(b)}a(this)},setEndAt:function(b,c){switch(c){case CKEDITOR.POSITION_AFTER_START:this.setEnd(b,
 0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setEnd(b,b.getLength()):this.setEnd(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setEndBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setEndAfter(b)}a(this)},fixBlock:function(a,b){var c=this.createBookmark(),d=this.document.createElement(b);this.collapse(a);this.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS);this.extractContents().appendTo(d);d.trim();this.insertNode(d);var e=d.getBogus();e&&e.remove();
-d.appendBogus();this.moveToBookmark(c);return d},splitBlock:function(a,b){var c=new CKEDITOR.dom.elementPath(this.startContainer,this.root),d=new CKEDITOR.dom.elementPath(this.endContainer,this.root),e=c.block,p=d.block,g=null;if(!c.blockLimit.equals(d.blockLimit))return null;"br"!=a&&(e||(e=this.fixBlock(!0,a),p=(new CKEDITOR.dom.elementPath(this.endContainer,this.root)).block),p||(p=this.fixBlock(!1,a)));c=e&&this.checkStartOfBlock();d=p&&this.checkEndOfBlock();this.deleteContents();e&&e.equals(p)&&
-(d?(g=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(p,CKEDITOR.POSITION_AFTER_END),p=null):c?(g=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START),e=null):(p=this.splitElement(e,b||!1),e.is("ul","ol")||e.appendBogus()));return{previousBlock:e,nextBlock:p,wasStartOfBlock:c,wasEndOfBlock:d,elementPath:g}},splitElement:function(a,b){if(!this.collapsed)return null;this.setEndAt(a,CKEDITOR.POSITION_BEFORE_END);
+d.appendBogus();this.moveToBookmark(c);return d},splitBlock:function(a,b){var c=new CKEDITOR.dom.elementPath(this.startContainer,this.root),d=new CKEDITOR.dom.elementPath(this.endContainer,this.root),e=c.block,m=d.block,g=null;if(!c.blockLimit.equals(d.blockLimit))return null;"br"!=a&&(e||(e=this.fixBlock(!0,a),m=(new CKEDITOR.dom.elementPath(this.endContainer,this.root)).block),m||(m=this.fixBlock(!1,a)));c=e&&this.checkStartOfBlock();d=m&&this.checkEndOfBlock();this.deleteContents();e&&e.equals(m)&&
+(d?(g=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(m,CKEDITOR.POSITION_AFTER_END),m=null):c?(g=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START),e=null):(m=this.splitElement(e,b||!1),e.is("ul","ol")||e.appendBogus()));return{previousBlock:e,nextBlock:m,wasStartOfBlock:c,wasEndOfBlock:d,elementPath:g}},splitElement:function(a,b){if(!this.collapsed)return null;this.setEndAt(a,CKEDITOR.POSITION_BEFORE_END);
 var c=this.extractContents(!1,b||!1),d=a.clone(!1,b||!1);c.appendTo(d);d.insertAfter(a);this.moveToPosition(a,CKEDITOR.POSITION_AFTER_END);return d},removeEmptyBlocksAtEnd:function(){function a(d){return function(a){return b(a)||c(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.isEmptyInlineRemoveable()||d.is("table")&&a.is("caption")?!1:!0}}var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(!1);return function(b){for(var c=this.createBookmark(),d=this[b?"endPath":"startPath"](),e=d.block||
 d.blockLimit,g;e&&!e.equals(d.root)&&!e.getFirst(a(e));)g=e.getParent(),this[b?"setEndAt":"setStartAt"](e,CKEDITOR.POSITION_AFTER_END),e.remove(1),e=g;this.moveToBookmark(c)}}(),startPath:function(){return new CKEDITOR.dom.elementPath(this.startContainer,this.root)},endPath:function(){return new CKEDITOR.dom.elementPath(this.endContainer,this.root)},checkBoundaryOfElement:function(a,b){var d=b==CKEDITOR.START,e=this.clone();e.collapse(d);e[d?"setStartAt":"setEndAt"](a,d?CKEDITOR.POSITION_AFTER_START:
-CKEDITOR.POSITION_BEFORE_END);e=new CKEDITOR.dom.walker(e);e.evaluator=c(d);return e[d?"checkBackward":"checkForward"]()},checkStartOfBlock:function(){var a=this.startContainer,c=this.startOffset;CKEDITOR.env.ie&&c&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.ltrim(a.substring(0,c)),k.test(a)&&this.trim(0,1));this.trim();a=new CKEDITOR.dom.elementPath(this.startContainer,this.root);c=this.clone();c.collapse(!0);c.setStartAt(a.block||a.blockLimit,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(c);
-a.evaluator=b();return a.checkBackward()},checkEndOfBlock:function(){var a=this.endContainer,c=this.endOffset;CKEDITOR.env.ie&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.rtrim(a.substring(c)),k.test(a)&&this.trim(1,0));this.trim();a=new CKEDITOR.dom.elementPath(this.endContainer,this.root);c=this.clone();c.collapse(!1);c.setEndAt(a.block||a.blockLimit,CKEDITOR.POSITION_BEFORE_END);a=new CKEDITOR.dom.walker(c);a.evaluator=b();return a.checkForward()},getPreviousNode:function(a,b,c){var d=this.clone();
+CKEDITOR.POSITION_BEFORE_END);e=new CKEDITOR.dom.walker(e);e.evaluator=c(d);return e[d?"checkBackward":"checkForward"]()},checkStartOfBlock:function(){var a=this.startContainer,c=this.startOffset;CKEDITOR.env.ie&&c&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.ltrim(a.substring(0,c)),h.test(a)&&this.trim(0,1));this.trim();a=new CKEDITOR.dom.elementPath(this.startContainer,this.root);c=this.clone();c.collapse(!0);c.setStartAt(a.block||a.blockLimit,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(c);
+a.evaluator=b();return a.checkBackward()},checkEndOfBlock:function(){var a=this.endContainer,c=this.endOffset;CKEDITOR.env.ie&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.rtrim(a.substring(c)),h.test(a)&&this.trim(1,0));this.trim();a=new CKEDITOR.dom.elementPath(this.endContainer,this.root);c=this.clone();c.collapse(!1);c.setEndAt(a.block||a.blockLimit,CKEDITOR.POSITION_BEFORE_END);a=new CKEDITOR.dom.walker(c);a.evaluator=b();return a.checkForward()},getPreviousNode:function(a,b,c){var d=this.clone();
 d.collapse(1);d.setStartAt(c||this.root,CKEDITOR.POSITION_AFTER_START);c=new CKEDITOR.dom.walker(d);c.evaluator=a;c.guard=b;return c.previous()},getNextNode:function(a,b,c){var d=this.clone();d.collapse();d.setEndAt(c||this.root,CKEDITOR.POSITION_BEFORE_END);c=new CKEDITOR.dom.walker(d);c.evaluator=a;c.guard=b;return c.next()},checkReadOnly:function(){function a(b,c){for(;b;){if(b.type==CKEDITOR.NODE_ELEMENT){if("false"==b.getAttribute("contentEditable")&&!b.data("cke-editable"))return 0;if(b.is("html")||
-"true"==b.getAttribute("contentEditable")&&(b.contains(c)||b.equals(c)))break}b=b.getParent()}return 1}return function(){var b=this.startContainer,c=this.endContainer;return!(a(b,c)&&a(c,b))}}(),moveToElementEditablePosition:function(a,b){if(a.type==CKEDITOR.NODE_ELEMENT&&!a.isEditable(!1))return this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START),!0;for(var c=0;a;){if(a.type==CKEDITOR.NODE_TEXT){b&&this.endContainer&&this.checkEndOfBlock()&&k.test(a.getText())?this.moveToPosition(a,
+"true"==b.getAttribute("contentEditable")&&(b.contains(c)||b.equals(c)))break}b=b.getParent()}return 1}return function(){var b=this.startContainer,c=this.endContainer;return!(a(b,c)&&a(c,b))}}(),moveToElementEditablePosition:function(a,b){if(a.type==CKEDITOR.NODE_ELEMENT&&!a.isEditable(!1))return this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START),!0;for(var c=0;a;){if(a.type==CKEDITOR.NODE_TEXT){b&&this.endContainer&&this.checkEndOfBlock()&&h.test(a.getText())?this.moveToPosition(a,
 CKEDITOR.POSITION_BEFORE_START):this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START);c=1;break}if(a.type==CKEDITOR.NODE_ELEMENT)if(a.isEditable())this.moveToPosition(a,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_START),c=1;else if(b&&a.is("br")&&this.endContainer&&this.checkEndOfBlock())this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START);else if("false"==a.getAttribute("contenteditable")&&a.is(CKEDITOR.dtd.$block))return this.setStartBefore(a),this.setEndAfter(a),
-!0;var d=a,e=c,p=void 0;d.type==CKEDITOR.NODE_ELEMENT&&d.isEditable(!1)&&(p=d[b?"getLast":"getFirst"](w));e||p||(p=d[b?"getPrevious":"getNext"](w));a=p}return!!c},moveToClosestEditablePosition:function(a,b){var c,d=0,e,p,g=[CKEDITOR.POSITION_AFTER_END,CKEDITOR.POSITION_BEFORE_START];a?(c=new CKEDITOR.dom.range(this.root),c.moveToPosition(a,g[b?0:1])):c=this.clone();if(a&&!a.is(CKEDITOR.dtd.$block))d=1;else if(e=c[b?"getNextEditableNode":"getPreviousEditableNode"]())d=1,(p=e.type==CKEDITOR.NODE_ELEMENT)&&
-e.is(CKEDITOR.dtd.$block)&&"false"==e.getAttribute("contenteditable")?(c.setStartAt(e,CKEDITOR.POSITION_BEFORE_START),c.setEndAt(e,CKEDITOR.POSITION_AFTER_END)):!CKEDITOR.env.needsBrFiller&&p&&e.is(CKEDITOR.dom.walker.validEmptyBlockContainers)?(c.setEnd(e,0),c.collapse()):c.moveToPosition(e,g[b?1:0]);d&&this.moveToRange(c);return!!d},moveToElementEditStart:function(a){return this.moveToElementEditablePosition(a)},moveToElementEditEnd:function(a){return this.moveToElementEditablePosition(a,!0)},getEnclosedNode:function(){var a=
+!0;var d=a,e=c,m=void 0;d.type==CKEDITOR.NODE_ELEMENT&&d.isEditable(!1)&&(m=d[b?"getLast":"getFirst"](r));e||m||(m=d[b?"getPrevious":"getNext"](r));a=m}return!!c},moveToClosestEditablePosition:function(a,b){var c,d=0,e,m,g=[CKEDITOR.POSITION_AFTER_END,CKEDITOR.POSITION_BEFORE_START];a?(c=new CKEDITOR.dom.range(this.root),c.moveToPosition(a,g[b?0:1])):c=this.clone();if(a&&!a.is(CKEDITOR.dtd.$block))d=1;else if(e=c[b?"getNextEditableNode":"getPreviousEditableNode"]())d=1,(m=e.type==CKEDITOR.NODE_ELEMENT)&&
+e.is(CKEDITOR.dtd.$block)&&"false"==e.getAttribute("contenteditable")?(c.setStartAt(e,CKEDITOR.POSITION_BEFORE_START),c.setEndAt(e,CKEDITOR.POSITION_AFTER_END)):!CKEDITOR.env.needsBrFiller&&m&&e.is(CKEDITOR.dom.walker.validEmptyBlockContainers)?(c.setEnd(e,0),c.collapse()):c.moveToPosition(e,g[b?1:0]);d&&this.moveToRange(c);return!!d},moveToElementEditStart:function(a){return this.moveToElementEditablePosition(a)},moveToElementEditEnd:function(a){return this.moveToElementEditablePosition(a,!0)},getEnclosedNode:function(){var a=
 this.clone();a.optimize();if(a.startContainer.type!=CKEDITOR.NODE_ELEMENT||a.endContainer.type!=CKEDITOR.NODE_ELEMENT)return null;var a=new CKEDITOR.dom.walker(a),b=CKEDITOR.dom.walker.bookmark(!1,!0),c=CKEDITOR.dom.walker.whitespaces(!0);a.evaluator=function(a){return c(a)&&b(a)};var d=a.next();a.reset();return d&&d.equals(a.previous())?d:null},getTouchedStartNode:function(){var a=this.startContainer;return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.startOffset)||a},getTouchedEndNode:function(){var a=
 this.endContainer;return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.endOffset-1)||a},getNextEditableNode:e(),getPreviousEditableNode:e(1),scrollIntoView:function(){var a=new CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",this.document),b,c,d,e=this.clone();e.optimize();(d=e.startContainer.type==CKEDITOR.NODE_TEXT)?(c=e.startContainer.getText(),b=e.startContainer.split(e.startOffset),a.insertAfter(e.startContainer)):e.insertNode(a);a.scrollIntoView();
-d&&(e.startContainer.setText(c),b.remove());a.remove()},_setStartContainer:function(a){this.startContainer=a},_setEndContainer:function(a){this.endContainer=a}}})();CKEDITOR.POSITION_AFTER_START=1;CKEDITOR.POSITION_BEFORE_END=2;CKEDITOR.POSITION_BEFORE_START=3;CKEDITOR.POSITION_AFTER_END=4;CKEDITOR.ENLARGE_ELEMENT=1;CKEDITOR.ENLARGE_BLOCK_CONTENTS=2;CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS=3;CKEDITOR.ENLARGE_INLINE=4;CKEDITOR.START=1;CKEDITOR.END=2;CKEDITOR.SHRINK_ELEMENT=1;CKEDITOR.SHRINK_TEXT=2;"use strict";
-(function(){function a(a){1>arguments.length||(this.range=a,this.forceBrBreak=0,this.enlargeBr=1,this.enforceRealBlocks=0,this._||(this._={}))}function d(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function b(a,c,e,g){a:{null==g&&(g=d(e));for(var l;l=g.shift();)if(l.getDtd().p){g={element:l,remaining:g};break a}g=null}if(!g)return 0;if((l=CKEDITOR.filter.instances[g.element.data("cke-filter")])&&!l.check(c))return b(a,
-c,e,g.remaining);c=new CKEDITOR.dom.range(g.element);c.selectNodeContents(g.element);c=c.createIterator();c.enlargeBr=a.enlargeBr;c.enforceRealBlocks=a.enforceRealBlocks;c.activeFilter=c.filter=l;a._.nestedEditable={element:g.element,container:e,remaining:g.remaining,iterator:c};return 1}function c(a,b,c){if(!b)return!1;a=a.clone();a.collapse(!c);return a.checkBoundaryOfElement(b,c?CKEDITOR.START:CKEDITOR.END)}var e=/^[\r\n\t ]+$/,g=CKEDITOR.dom.walker.bookmark(!1,!0),l=CKEDITOR.dom.walker.whitespaces(!0),
-k=function(a){return g(a)&&l(a)},q={dd:1,dt:1,li:1};a.prototype={getNextParagraph:function(a){var d,l,A,t,D;a=a||"p";if(this._.nestedEditable){if(d=this._.nestedEditable.iterator.getNextParagraph(a))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,d;this.activeFilter=this.filter;if(b(this,a,this._.nestedEditable.container,this._.nestedEditable.remaining))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,this._.nestedEditable.iterator.getNextParagraph(a);this._.nestedEditable=
-null}if(!this.range.root.getDtd()[a])return null;if(!this._.started){var p=this.range.clone();l=p.startPath();var x=p.endPath(),G=!p.collapsed&&c(p,l.block),u=!p.collapsed&&c(p,x.block,1);p.shrink(CKEDITOR.SHRINK_ELEMENT,!0);G&&p.setStartAt(l.block,CKEDITOR.POSITION_BEFORE_END);u&&p.setEndAt(x.block,CKEDITOR.POSITION_AFTER_START);l=p.endContainer.hasAscendant("pre",!0)||p.startContainer.hasAscendant("pre",!0);p.enlarge(this.forceBrBreak&&!l||!this.enlargeBr?CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:CKEDITOR.ENLARGE_BLOCK_CONTENTS);
-p.collapsed||(l=new CKEDITOR.dom.walker(p.clone()),x=CKEDITOR.dom.walker.bookmark(!0,!0),l.evaluator=x,this._.nextNode=l.next(),l=new CKEDITOR.dom.walker(p.clone()),l.evaluator=x,l=l.previous(),this._.lastNode=l.getNextSourceNode(!0,null,p.root),this._.lastNode&&this._.lastNode.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(this._.lastNode.getText())&&this._.lastNode.getParent().isBlockBoundary()&&(x=this.range.clone(),x.moveToPosition(this._.lastNode,CKEDITOR.POSITION_AFTER_END),x.checkEndOfBlock()&&
-(x=new CKEDITOR.dom.elementPath(x.endContainer,x.root),this._.lastNode=(x.block||x.blockLimit).getNextSourceNode(!0))),this._.lastNode&&p.root.contains(this._.lastNode)||(this._.lastNode=this._.docEndMarker=p.document.createText(""),this._.lastNode.insertAfter(l)),p=null);this._.started=1;l=p}x=this._.nextNode;p=this._.lastNode;for(this._.nextNode=null;x;){var G=0,u=x.hasAscendant("pre"),r=x.type!=CKEDITOR.NODE_ELEMENT,h=0;if(r)x.type==CKEDITOR.NODE_TEXT&&e.test(x.getText())&&(r=0);else{var n=x.getName();
-if(CKEDITOR.dtd.$block[n]&&"false"==x.getAttribute("contenteditable")){d=x;b(this,a,d);break}else if(x.isBlockBoundary(this.forceBrBreak&&!u&&{br:1})){if("br"==n)r=1;else if(!l&&!x.getChildCount()&&"hr"!=n){d=x;A=x.equals(p);break}l&&(l.setEndAt(x,CKEDITOR.POSITION_BEFORE_START),"br"!=n&&(this._.nextNode=x));G=1}else{if(x.getFirst()){l||(l=this.range.clone(),l.setStartAt(x,CKEDITOR.POSITION_BEFORE_START));x=x.getFirst();continue}r=1}}r&&!l&&(l=this.range.clone(),l.setStartAt(x,CKEDITOR.POSITION_BEFORE_START));
-A=(!G||r)&&x.equals(p);if(l&&!G)for(;!x.getNext(k)&&!A;){n=x.getParent();if(n.isBlockBoundary(this.forceBrBreak&&!u&&{br:1})){G=1;r=0;A||n.equals(p);l.setEndAt(n,CKEDITOR.POSITION_BEFORE_END);break}x=n;r=1;A=x.equals(p);h=1}r&&l.setEndAt(x,CKEDITOR.POSITION_AFTER_END);x=this._getNextSourceNode(x,h,p);if((A=!x)||G&&l)break}if(!d){if(!l)return this._.docEndMarker&&this._.docEndMarker.remove(),this._.nextNode=null;d=new CKEDITOR.dom.elementPath(l.startContainer,l.root);x=d.blockLimit;G={div:1,th:1,td:1};
-d=d.block;!d&&x&&!this.enforceRealBlocks&&G[x.getName()]&&l.checkStartOfBlock()&&l.checkEndOfBlock()&&!x.equals(l.root)?d=x:!d||this.enforceRealBlocks&&d.is(q)?(d=this.range.document.createElement(a),l.extractContents().appendTo(d),d.trim(),l.insertNode(d),t=D=!0):"li"!=d.getName()?l.checkStartOfBlock()&&l.checkEndOfBlock()||(d=d.clone(!1),l.extractContents().appendTo(d),d.trim(),D=l.splitBlock(),t=!D.wasStartOfBlock,D=!D.wasEndOfBlock,l.insertNode(d)):A||(this._.nextNode=d.equals(p)?null:this._getNextSourceNode(l.getBoundaryNodes().endNode,
-1,p))}t&&(t=d.getPrevious())&&t.type==CKEDITOR.NODE_ELEMENT&&("br"==t.getName()?t.remove():t.getLast()&&"br"==t.getLast().$.nodeName.toLowerCase()&&t.getLast().remove());D&&(t=d.getLast())&&t.type==CKEDITOR.NODE_ELEMENT&&"br"==t.getName()&&(!CKEDITOR.env.needsBrFiller||t.getPrevious(g)||t.getNext(g))&&t.remove();this._.nextNode||(this._.nextNode=A||d.equals(p)||!p?null:this._getNextSourceNode(d,1,p));return d},_getNextSourceNode:function(a,b,c){function d(a){return!(a.equals(c)||a.equals(e))}var e=
+d&&(e.startContainer.setText(c),b.remove());a.remove()},_setStartContainer:function(a){this.startContainer=a},_setEndContainer:function(a){this.endContainer=a},_find:function(a,b){var c=this.getCommonAncestor(),d=this.getBoundaryNodes(),e=[],m,g,h,k;if(c&&c.find)for(g=c.find(a),m=0;m<g.count();m++)if(c=g.getItem(m),b||!c.isReadOnly())h=c.getPosition(d.startNode)&CKEDITOR.POSITION_FOLLOWING||d.startNode.equals(c),k=c.getPosition(d.endNode)&CKEDITOR.POSITION_PRECEDING+CKEDITOR.POSITION_IS_CONTAINED,
+h&&k&&e.push(c);return e}}})();CKEDITOR.POSITION_AFTER_START=1;CKEDITOR.POSITION_BEFORE_END=2;CKEDITOR.POSITION_BEFORE_START=3;CKEDITOR.POSITION_AFTER_END=4;CKEDITOR.ENLARGE_ELEMENT=1;CKEDITOR.ENLARGE_BLOCK_CONTENTS=2;CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS=3;CKEDITOR.ENLARGE_INLINE=4;CKEDITOR.START=1;CKEDITOR.END=2;CKEDITOR.SHRINK_ELEMENT=1;CKEDITOR.SHRINK_TEXT=2;"use strict";
+(function(){function a(a){1>arguments.length||(this.range=a,this.forceBrBreak=0,this.enlargeBr=1,this.enforceRealBlocks=0,this._||(this._={}))}function d(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function b(a,c,e,g){a:{null==g&&(g=d(e));for(var h;h=g.shift();)if(h.getDtd().p){g={element:h,remaining:g};break a}g=null}if(!g)return 0;if((h=CKEDITOR.filter.instances[g.element.data("cke-filter")])&&!h.check(c))return b(a,
+c,e,g.remaining);c=new CKEDITOR.dom.range(g.element);c.selectNodeContents(g.element);c=c.createIterator();c.enlargeBr=a.enlargeBr;c.enforceRealBlocks=a.enforceRealBlocks;c.activeFilter=c.filter=h;a._.nestedEditable={element:g.element,container:e,remaining:g.remaining,iterator:c};return 1}function c(a,b,c){if(!b)return!1;a=a.clone();a.collapse(!c);return a.checkBoundaryOfElement(b,c?CKEDITOR.START:CKEDITOR.END)}var e=/^[\r\n\t ]+$/,g=CKEDITOR.dom.walker.bookmark(!1,!0),k=CKEDITOR.dom.walker.whitespaces(!0),
+h=function(a){return g(a)&&k(a)},p={dd:1,dt:1,li:1};a.prototype={getNextParagraph:function(a){var d,k,u,z,y;a=a||"p";if(this._.nestedEditable){if(d=this._.nestedEditable.iterator.getNextParagraph(a))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,d;this.activeFilter=this.filter;if(b(this,a,this._.nestedEditable.container,this._.nestedEditable.remaining))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,this._.nestedEditable.iterator.getNextParagraph(a);this._.nestedEditable=
+null}if(!this.range.root.getDtd()[a])return null;if(!this._.started){var m=this.range.clone();k=m.startPath();var x=m.endPath(),J=!m.collapsed&&c(m,k.block),w=!m.collapsed&&c(m,x.block,1);m.shrink(CKEDITOR.SHRINK_ELEMENT,!0);J&&m.setStartAt(k.block,CKEDITOR.POSITION_BEFORE_END);w&&m.setEndAt(x.block,CKEDITOR.POSITION_AFTER_START);k=m.endContainer.hasAscendant("pre",!0)||m.startContainer.hasAscendant("pre",!0);m.enlarge(this.forceBrBreak&&!k||!this.enlargeBr?CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:CKEDITOR.ENLARGE_BLOCK_CONTENTS);
+m.collapsed||(k=new CKEDITOR.dom.walker(m.clone()),x=CKEDITOR.dom.walker.bookmark(!0,!0),k.evaluator=x,this._.nextNode=k.next(),k=new CKEDITOR.dom.walker(m.clone()),k.evaluator=x,k=k.previous(),this._.lastNode=k.getNextSourceNode(!0,null,m.root),this._.lastNode&&this._.lastNode.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(this._.lastNode.getText())&&this._.lastNode.getParent().isBlockBoundary()&&(x=this.range.clone(),x.moveToPosition(this._.lastNode,CKEDITOR.POSITION_AFTER_END),x.checkEndOfBlock()&&
+(x=new CKEDITOR.dom.elementPath(x.endContainer,x.root),this._.lastNode=(x.block||x.blockLimit).getNextSourceNode(!0))),this._.lastNode&&m.root.contains(this._.lastNode)||(this._.lastNode=this._.docEndMarker=m.document.createText(""),this._.lastNode.insertAfter(k)),m=null);this._.started=1;k=m}x=this._.nextNode;m=this._.lastNode;for(this._.nextNode=null;x;){var J=0,w=x.hasAscendant("pre"),F=x.type!=CKEDITOR.NODE_ELEMENT,l=0;if(F)x.type==CKEDITOR.NODE_TEXT&&e.test(x.getText())&&(F=0);else{var q=x.getName();
+if(CKEDITOR.dtd.$block[q]&&"false"==x.getAttribute("contenteditable")){d=x;b(this,a,d);break}else if(x.isBlockBoundary(this.forceBrBreak&&!w&&{br:1})){if("br"==q)F=1;else if(!k&&!x.getChildCount()&&"hr"!=q){d=x;u=x.equals(m);break}k&&(k.setEndAt(x,CKEDITOR.POSITION_BEFORE_START),"br"!=q&&(this._.nextNode=x));J=1}else{if(x.getFirst()){k||(k=this.range.clone(),k.setStartAt(x,CKEDITOR.POSITION_BEFORE_START));x=x.getFirst();continue}F=1}}F&&!k&&(k=this.range.clone(),k.setStartAt(x,CKEDITOR.POSITION_BEFORE_START));
+u=(!J||F)&&x.equals(m);if(k&&!J)for(;!x.getNext(h)&&!u;){q=x.getParent();if(q.isBlockBoundary(this.forceBrBreak&&!w&&{br:1})){J=1;F=0;u||q.equals(m);k.setEndAt(q,CKEDITOR.POSITION_BEFORE_END);break}x=q;F=1;u=x.equals(m);l=1}F&&k.setEndAt(x,CKEDITOR.POSITION_AFTER_END);x=this._getNextSourceNode(x,l,m);if((u=!x)||J&&k)break}if(!d){if(!k)return this._.docEndMarker&&this._.docEndMarker.remove(),this._.nextNode=null;d=new CKEDITOR.dom.elementPath(k.startContainer,k.root);x=d.blockLimit;J={div:1,th:1,td:1};
+d=d.block;!d&&x&&!this.enforceRealBlocks&&J[x.getName()]&&k.checkStartOfBlock()&&k.checkEndOfBlock()&&!x.equals(k.root)?d=x:!d||this.enforceRealBlocks&&d.is(p)?(d=this.range.document.createElement(a),k.extractContents().appendTo(d),d.trim(),k.insertNode(d),z=y=!0):"li"!=d.getName()?k.checkStartOfBlock()&&k.checkEndOfBlock()||(d=d.clone(!1),k.extractContents().appendTo(d),d.trim(),y=k.splitBlock(),z=!y.wasStartOfBlock,y=!y.wasEndOfBlock,k.insertNode(d)):u||(this._.nextNode=d.equals(m)?null:this._getNextSourceNode(k.getBoundaryNodes().endNode,
+1,m))}z&&(z=d.getPrevious())&&z.type==CKEDITOR.NODE_ELEMENT&&("br"==z.getName()?z.remove():z.getLast()&&"br"==z.getLast().$.nodeName.toLowerCase()&&z.getLast().remove());y&&(z=d.getLast())&&z.type==CKEDITOR.NODE_ELEMENT&&"br"==z.getName()&&(!CKEDITOR.env.needsBrFiller||z.getPrevious(g)||z.getNext(g))&&z.remove();this._.nextNode||(this._.nextNode=u||d.equals(m)||!m?null:this._getNextSourceNode(d,1,m));return d},_getNextSourceNode:function(a,b,c){function d(a){return!(a.equals(c)||a.equals(e))}var e=
 this.range.root;for(a=a.getNextSourceNode(b,null,d);!g(a);)a=a.getNextSourceNode(b,null,d);return a}};CKEDITOR.dom.range.prototype.createIterator=function(){return new a(this)}})();
 CKEDITOR.command=function(a,d){this.uiItems=[];this.exec=function(b){if(this.state==CKEDITOR.TRISTATE_DISABLED||!this.checkAllowed())return!1;this.editorFocus&&a.focus();return!1===this.fire("exec")?!0:!1!==d.exec.call(this,a,b)};this.refresh=function(a,b){if(!this.readOnly&&a.readOnly)return!0;if(this.context&&!b.isContextFor(this.context)||!this.checkAllowed(!0))return this.disable(),!0;this.startDisabled||this.enable();this.modes&&!this.modes[a.mode]&&this.disable();return!1===this.fire("refresh",
 {editor:a,path:b})?!0:d.refresh&&!1!==d.refresh.apply(this,arguments)};var b;this.checkAllowed=function(c){return c||"boolean"!=typeof b?b=a.activeFilter.checkFeature(this):b};CKEDITOR.tools.extend(this,d,{modes:{wysiwyg:1},editorFocus:1,contextSensitive:!!d.context,state:CKEDITOR.TRISTATE_DISABLED});CKEDITOR.event.call(this)};
 CKEDITOR.command.prototype={enable:function(){this.state==CKEDITOR.TRISTATE_DISABLED&&this.checkAllowed()&&this.setState(this.preserveState&&"undefined"!=typeof this.previousState?this.previousState:CKEDITOR.TRISTATE_OFF)},disable:function(){this.setState(CKEDITOR.TRISTATE_DISABLED)},setState:function(a){if(this.state==a||a!=CKEDITOR.TRISTATE_DISABLED&&!this.checkAllowed())return!1;this.previousState=this.state;this.state=a;this.fire("state");return!0},toggleState:function(){this.state==CKEDITOR.TRISTATE_OFF?
 this.setState(CKEDITOR.TRISTATE_ON):this.state==CKEDITOR.TRISTATE_ON&&this.setState(CKEDITOR.TRISTATE_OFF)}};CKEDITOR.event.implementOn(CKEDITOR.command.prototype);CKEDITOR.ENTER_P=1;CKEDITOR.ENTER_BR=2;CKEDITOR.ENTER_DIV=3;
 CKEDITOR.config={customConfig:"config.js",autoUpdateElement:!0,language:"",defaultLanguage:"en",contentsLangDirection:"",enterMode:CKEDITOR.ENTER_P,forceEnterMode:!1,shiftEnterMode:CKEDITOR.ENTER_BR,docType:"\x3c!DOCTYPE html\x3e",bodyId:"",bodyClass:"",fullPage:!1,height:200,contentsCss:CKEDITOR.getUrl("contents.css"),extraPlugins:"",removePlugins:"",protectedSource:[],tabIndex:0,width:"",baseFloatZIndex:1E4,blockedKeystrokes:[CKEDITOR.CTRL+66,CKEDITOR.CTRL+73,CKEDITOR.CTRL+85]};
-(function(){function a(a,b,c,d,e){var h,n;a=[];for(h in b){n=b[h];n="boolean"==typeof n?{}:"function"==typeof n?{match:n}:H(n);"$"!=h.charAt(0)&&(n.elements=h);c&&(n.featureName=c.toLowerCase());var m=n;m.elements=l(m.elements,/\s+/)||null;m.propertiesOnly=m.propertiesOnly||!0===m.elements;var f=/\s*,\s*/,p=void 0;for(p in Q){m[p]=l(m[p],f)||null;var F=m,r=v[p],g=l(m[v[p]],f),z=m[p],E=[],B=!0,L=void 0;g?B=!1:g={};for(L in z)"!"==L.charAt(0)&&(L=L.slice(1),E.push(L),g[L]=!0,B=!1);for(;L=E.pop();)z[L]=
-z["!"+L],delete z["!"+L];F[r]=(B?!1:g)||null}m.match=m.match||null;d.push(n);a.push(n)}b=e.elements;e=e.generic;var k;c=0;for(d=a.length;c<d;++c){h=H(a[c]);n=!0===h.classes||!0===h.styles||!0===h.attributes;m=h;p=r=f=void 0;for(f in Q)m[f]=G(m[f]);F=!0;for(p in v){f=v[p];r=m[f];g=[];z=void 0;for(z in r)-1<z.indexOf("*")?g.push(new RegExp("^"+z.replace(/\*/g,".*")+"$")):g.push(z);r=g;r.length&&(m[f]=r,F=!1)}m.nothingRequired=F;m.noProperties=!(m.attributes||m.classes||m.styles);if(!0===h.elements||
-null===h.elements)e[n?"unshift":"push"](h);else for(k in m=h.elements,delete h.elements,m)if(b[k])b[k][n?"unshift":"push"](h);else b[k]=[h]}}function d(a,c,d,h){if(!a.match||a.match(c))if(h||k(a,c))if(a.propertiesOnly||(d.valid=!0),d.allAttributes||(d.allAttributes=b(a.attributes,c.attributes,d.validAttributes)),d.allStyles||(d.allStyles=b(a.styles,c.styles,d.validStyles)),!d.allClasses){a=a.classes;c=c.classes;h=d.validClasses;if(a)if(!0===a)a=!0;else{for(var n=0,e=c.length,m;n<e;++n)m=c[n],h[m]||
-(h[m]=a(m));a=!1}else a=!1;d.allClasses=a}}function b(a,b,c){if(!a)return!1;if(!0===a)return!0;for(var d in b)c[d]||(c[d]=a(d));return!1}function c(a,b,c){if(!a.match||a.match(b)){if(a.noProperties)return!1;c.hadInvalidAttribute=e(a.attributes,b.attributes)||c.hadInvalidAttribute;c.hadInvalidStyle=e(a.styles,b.styles)||c.hadInvalidStyle;a=a.classes;b=b.classes;if(a){for(var d=!1,h=!0===a,n=b.length;n--;)if(h||a(b[n]))b.splice(n,1),d=!0;a=d}else a=!1;c.hadInvalidClass=a||c.hadInvalidClass}}function e(a,
-b){if(!a)return!1;var c=!1,d=!0===a,h;for(h in b)if(d||a(h))delete b[h],c=!0;return c}function g(a,b,c){if(a.disabled||a.customConfig&&!c||!b)return!1;a._.cachedChecks={};return!0}function l(a,b){if(!a)return!1;if(!0===a)return a;if("string"==typeof a)return a=R(a),"*"==a?!0:CKEDITOR.tools.convertArrayToObject(a.split(b));if(CKEDITOR.tools.isArray(a))return a.length?CKEDITOR.tools.convertArrayToObject(a):!1;var c={},d=0,h;for(h in a)c[h]=a[h],d++;return d?c:!1}function k(a,b){if(a.nothingRequired)return!0;
-var c,d,h,n;if(h=a.requiredClasses)for(n=b.classes,c=0;c<h.length;++c)if(d=h[c],"string"==typeof d){if(-1==CKEDITOR.tools.indexOf(n,d))return!1}else if(!CKEDITOR.tools.checkIfAnyArrayItemMatches(n,d))return!1;return q(b.styles,a.requiredStyles)&&q(b.attributes,a.requiredAttributes)}function q(a,b){if(!b)return!0;for(var c=0,d;c<b.length;++c)if(d=b[c],"string"==typeof d){if(!(d in a))return!1}else if(!CKEDITOR.tools.checkIfAnyObjectPropertyMatches(a,d))return!1;return!0}function w(a){if(!a)return{};
-a=a.split(/\s*,\s*/).sort();for(var b={};a.length;)b[a.shift()]="cke-test";return b}function f(a){var b,c,d,h,n={},e=1;for(a=R(a);b=a.match(I);)(c=b[2])?(d=y(c,"styles"),h=y(c,"attrs"),c=y(c,"classes")):d=h=c=null,n["$"+e++]={elements:b[1],classes:c,styles:d,attributes:h},a=a.slice(b[0].length);return n}function y(a,b){var c=a.match(J[b]);return c?R(c[1]):null}function A(a){var b=a.styleBackup=a.attributes.style,c=a.classBackup=a.attributes["class"];a.styles||(a.styles=CKEDITOR.tools.parseCssText(b||
-"",1));a.classes||(a.classes=c?c.split(/\s+/):[])}function t(a,b,h,e){var m=0,f;e.toHtml&&(b.name=b.name.replace(F,"$1"));if(e.doCallbacks&&a.elementCallbacks){a:{f=a.elementCallbacks;for(var g=0,r=f.length,z;g<r;++g)if(z=f[g](b)){f=z;break a}f=void 0}if(f)return f}if(e.doTransform&&(f=a._.transformations[b.name])){A(b);for(g=0;g<f.length;++g)n(a,b,f[g]);p(b)}if(e.doFilter){a:{g=b.name;r=a._;a=r.allowedRules.elements[g];f=r.allowedRules.generic;g=r.disallowedRules.elements[g];r=r.disallowedRules.generic;
-z=e.skipRequired;var E={valid:!1,validAttributes:{},validClasses:{},validStyles:{},allAttributes:!1,allClasses:!1,allStyles:!1,hadInvalidAttribute:!1,hadInvalidClass:!1,hadInvalidStyle:!1},v,l;if(a||f){A(b);if(g)for(v=0,l=g.length;v<l;++v)if(!1===c(g[v],b,E)){a=null;break a}if(r)for(v=0,l=r.length;v<l;++v)c(r[v],b,E);if(a)for(v=0,l=a.length;v<l;++v)d(a[v],b,E,z);if(f)for(v=0,l=f.length;v<l;++v)d(f[v],b,E,z);a=E}else a=null}if(!a||!a.valid)return h.push(b),1;l=a.validAttributes;var B=a.validStyles;
-f=a.validClasses;var g=b.attributes,k=b.styles,r=b.classes;z=b.classBackup;var J=b.styleBackup,C,I,K=[],E=[],H=/^data-cke-/;v=!1;delete g.style;delete g["class"];delete b.classBackup;delete b.styleBackup;if(!a.allAttributes)for(C in g)l[C]||(H.test(C)?C==(I=C.replace(/^data-cke-saved-/,""))||l[I]||(delete g[C],v=!0):(delete g[C],v=!0));if(!a.allStyles||a.hadInvalidStyle){for(C in k)a.allStyles||B[C]?K.push(C+":"+k[C]):v=!0;K.length&&(g.style=K.sort().join("; "))}else J&&(g.style=J);if(!a.allClasses||
-a.hadInvalidClass){for(C=0;C<r.length;++C)(a.allClasses||f[r[C]])&&E.push(r[C]);E.length&&(g["class"]=E.sort().join(" "));z&&E.length<z.split(/\s+/).length&&(v=!0)}else z&&(g["class"]=z);v&&(m=1);if(!e.skipFinalValidation&&!x(b))return h.push(b),1}e.toHtml&&(b.name=b.name.replace(L,"cke:$1"));return m}function D(a){var b=[],c;for(c in a)-1<c.indexOf("*")&&b.push(c.replace(/\*/g,".*"));return b.length?new RegExp("^(?:"+b.join("|")+")$"):null}function p(a){var b=a.attributes,c;delete b.style;delete b["class"];
-if(c=CKEDITOR.tools.writeCssText(a.styles,!0))b.style=c;a.classes.length&&(b["class"]=a.classes.sort().join(" "))}function x(a){switch(a.name){case "a":if(!(a.children.length||a.attributes.name||a.attributes.id))return!1;break;case "img":if(!a.attributes.src)return!1}return!0}function G(a){if(!a)return!1;if(!0===a)return!0;var b=D(a);return function(c){return c in a||b&&c.match(b)}}function u(){return new CKEDITOR.htmlParser.element("br")}function r(a){return a.type==CKEDITOR.NODE_ELEMENT&&("br"==
-a.name||C.$block[a.name])}function h(a,b,c){var d=a.name;if(C.$empty[d]||!a.children.length)"hr"==d&&"br"==b?a.replaceWith(u()):(a.parent&&c.push({check:"it",el:a.parent}),a.remove());else if(C.$block[d]||"tr"==d)if("br"==b)a.previous&&!r(a.previous)&&(b=u(),b.insertBefore(a)),a.next&&!r(a.next)&&(b=u(),b.insertAfter(a)),a.replaceWithChildren();else{var d=a.children,h;b:{h=C[b];for(var n=0,e=d.length,m;n<e;++n)if(m=d[n],m.type==CKEDITOR.NODE_ELEMENT&&!h[m.name]){h=!1;break b}h=!0}if(h)a.name=b,a.attributes=
-{},c.push({check:"parent-down",el:a});else{h=a.parent;for(var n=h.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||"body"==h.name,f,g,e=d.length;0<e;)m=d[--e],n&&(m.type==CKEDITOR.NODE_TEXT||m.type==CKEDITOR.NODE_ELEMENT&&C.$inline[m.name])?(f||(f=new CKEDITOR.htmlParser.element(b),f.insertAfter(a),c.push({check:"parent-down",el:f})),f.add(m,0)):(f=null,g=C[h.name]||C.span,m.insertAfter(a),h.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||m.type!=CKEDITOR.NODE_ELEMENT||g[m.name]||c.push({check:"el-up",el:m}));a.remove()}}else d in
-{style:1,script:1}?a.remove():(a.parent&&c.push({check:"it",el:a.parent}),a.replaceWithChildren())}function n(a,b,c){var d,h;for(d=0;d<c.length;++d)if(h=c[d],!(h.check&&!a.check(h.check,!1)||h.left&&!h.left(b))){h.right(b,K);break}}function m(a,b){var c=b.getDefinition(),d=c.attributes,h=c.styles,n,e,m,f;if(a.name!=c.element)return!1;for(n in d)if("class"==n)for(c=d[n].split(/\s+/),m=a.classes.join("|");f=c.pop();){if(-1==m.indexOf(f))return!1}else if(a.attributes[n]!=d[n])return!1;for(e in h)if(a.styles[e]!=
-h[e])return!1;return!0}function z(a,b){var c,d;"string"==typeof a?c=a:a instanceof CKEDITOR.style?d=a:(c=a[0],d=a[1]);return[{element:c,left:d,right:function(a,c){c.transform(a,b)}}]}function B(a){return function(b){return m(b,a)}}function E(a){return function(b,c){c[a](b)}}var C=CKEDITOR.dtd,H=CKEDITOR.tools.copy,R=CKEDITOR.tools.trim,T=["","p","br","div"];CKEDITOR.FILTER_SKIP_TREE=2;CKEDITOR.filter=function(a){this.allowedContent=[];this.disallowedContent=[];this.elementCallbacks=null;this.disabled=
-!1;this.editor=null;this.id=CKEDITOR.tools.getNextNumber();this._={allowedRules:{elements:{},generic:[]},disallowedRules:{elements:{},generic:[]},transformations:{},cachedTests:{}};CKEDITOR.filter.instances[this.id]=this;if(a instanceof CKEDITOR.editor){a=this.editor=a;this.customConfig=!0;var b=a.config.allowedContent;!0===b?this.disabled=!0:(b||(this.customConfig=!1),this.allow(b,"config",1),this.allow(a.config.extraAllowedContent,"extra",1),this.allow(T[a.enterMode]+" "+T[a.shiftEnterMode],"default",
-1),this.disallow(a.config.disallowedContent))}else this.customConfig=!1,this.allow(a,"default",1)};CKEDITOR.filter.instances={};CKEDITOR.filter.prototype={allow:function(b,c,d){if(!g(this,b,d))return!1;var h,n;if("string"==typeof b)b=f(b);else if(b instanceof CKEDITOR.style){if(b.toAllowedContentRules)return this.allow(b.toAllowedContentRules(this.editor),c,d);h=b.getDefinition();b={};d=h.attributes;b[h.element]=h={styles:h.styles,requiredStyles:h.styles&&CKEDITOR.tools.objectKeys(h.styles)};d&&(d=
-H(d),h.classes=d["class"]?d["class"].split(/\s+/):null,h.requiredClasses=h.classes,delete d["class"],h.attributes=d,h.requiredAttributes=d&&CKEDITOR.tools.objectKeys(d))}else if(CKEDITOR.tools.isArray(b)){for(h=0;h<b.length;++h)n=this.allow(b[h],c,d);return n}a(this,b,c,this.allowedContent,this._.allowedRules);return!0},applyTo:function(a,b,c,d){if(this.disabled)return!1;var n=this,e=[],m=this.editor&&this.editor.config.protectedSource,f,g=!1,p={doFilter:!c,doTransform:!0,doCallbacks:!0,toHtml:b};
-a.forEach(function(a){if(a.type==CKEDITOR.NODE_ELEMENT){if("off"==a.attributes["data-cke-filter"])return!1;if(!b||"span"!=a.name||!~CKEDITOR.tools.objectKeys(a.attributes).join("|").indexOf("data-cke-"))if(f=t(n,a,e,p),f&1)g=!0;else if(f&2)return!1}else if(a.type==CKEDITOR.NODE_COMMENT&&a.value.match(/^\{cke_protected\}(?!\{C\})/)){var c;a:{var d=decodeURIComponent(a.value.replace(/^\{cke_protected\}/,""));c=[];var h,r,z;if(m)for(r=0;r<m.length;++r)if((z=d.match(m[r]))&&z[0].length==d.length){c=!0;
-break a}d=CKEDITOR.htmlParser.fragment.fromHtml(d);1==d.children.length&&(h=d.children[0]).type==CKEDITOR.NODE_ELEMENT&&t(n,h,c,p);c=!c.length}c||e.push(a)}},null,!0);e.length&&(g=!0);var r;a=[];d=T[d||(this.editor?this.editor.enterMode:CKEDITOR.ENTER_P)];for(var z;c=e.pop();)c.type==CKEDITOR.NODE_ELEMENT?h(c,d,a):c.remove();for(;r=a.pop();)if(c=r.el,c.parent)switch(z=C[c.parent.name]||C.span,r.check){case "it":C.$removeEmpty[c.name]&&!c.children.length?h(c,d,a):x(c)||h(c,d,a);break;case "el-up":c.parent.type==
-CKEDITOR.NODE_DOCUMENT_FRAGMENT||z[c.name]||h(c,d,a);break;case "parent-down":c.parent.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||z[c.name]||h(c.parent,d,a)}return g},checkFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));return!a.requiredContent||this.check(a.requiredContent)},disable:function(){this.disabled=!0},disallow:function(b){if(!g(this,b,!0))return!1;"string"==typeof b&&(b=f(b));a(this,b,null,this.disallowedContent,this._.disallowedRules);return!0},
-addContentForms:function(a){if(!this.disabled&&a){var b,c,d=[],h;for(b=0;b<a.length&&!h;++b)c=a[b],("string"==typeof c||c instanceof CKEDITOR.style)&&this.check(c)&&(h=c);if(h){for(b=0;b<a.length;++b)d.push(z(a[b],h));this.addTransformations(d)}}},addElementCallback:function(a){this.elementCallbacks||(this.elementCallbacks=[]);this.elementCallbacks.push(a)},addFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));this.allow(a.allowedContent,a.name);this.addTransformations(a.contentTransformations);
-this.addContentForms(a.contentForms);return a.requiredContent&&(this.customConfig||this.disallowedContent.length)?this.check(a.requiredContent):!0},addTransformations:function(a){var b,c;if(!this.disabled&&a){var d=this._.transformations,h;for(h=0;h<a.length;++h){b=a[h];var n=void 0,e=void 0,m=void 0,f=void 0,g=void 0,r=void 0;c=[];for(e=0;e<b.length;++e)m=b[e],"string"==typeof m?(m=m.split(/\s*:\s*/),f=m[0],g=null,r=m[1]):(f=m.check,g=m.left,r=m.right),n||(n=m,n=n.element?n.element:f?f.match(/^([a-z0-9]+)/i)[0]:
-n.left.getDefinition().element),g instanceof CKEDITOR.style&&(g=B(g)),c.push({check:f==n?null:f,left:g,right:"string"==typeof r?E(r):r});b=n;d[b]||(d[b]=[]);d[b].push(c)}}},check:function(a,b,c){if(this.disabled)return!0;if(CKEDITOR.tools.isArray(a)){for(var d=a.length;d--;)if(this.check(a[d],b,c))return!0;return!1}var h,e;if("string"==typeof a){e=a+"\x3c"+(!1===b?"0":"1")+(c?"1":"0")+"\x3e";if(e in this._.cachedChecks)return this._.cachedChecks[e];d=f(a).$1;h=d.styles;var m=d.classes;d.name=d.elements;
-d.classes=m=m?m.split(/\s*,\s*/):[];d.styles=w(h);d.attributes=w(d.attributes);d.children=[];m.length&&(d.attributes["class"]=m.join(" "));h&&(d.attributes.style=CKEDITOR.tools.writeCssText(d.styles));h=d}else d=a.getDefinition(),h=d.styles,m=d.attributes||{},h&&!CKEDITOR.tools.isEmpty(h)?(h=H(h),m.style=CKEDITOR.tools.writeCssText(h,!0)):h={},h={name:d.element,attributes:m,classes:m["class"]?m["class"].split(/\s+/):[],styles:h,children:[]};var m=CKEDITOR.tools.clone(h),g=[],r;if(!1!==b&&(r=this._.transformations[h.name])){for(d=
-0;d<r.length;++d)n(this,h,r[d]);p(h)}t(this,m,g,{doFilter:!0,doTransform:!1!==b,skipRequired:!c,skipFinalValidation:!c});b=0<g.length?!1:CKEDITOR.tools.objectCompare(h.attributes,m.attributes,!0)?!0:!1;"string"==typeof a&&(this._.cachedChecks[e]=b);return b},getAllowedEnterMode:function(){var a=["p","div","br"],b={p:CKEDITOR.ENTER_P,div:CKEDITOR.ENTER_DIV,br:CKEDITOR.ENTER_BR};return function(c,d){var h=a.slice(),n;if(this.check(T[c]))return c;for(d||(h=h.reverse());n=h.pop();)if(this.check(n))return b[n];
-return CKEDITOR.ENTER_BR}}(),destroy:function(){delete CKEDITOR.filter.instances[this.id];delete this._;delete this.allowedContent;delete this.disallowedContent}};var Q={styles:1,attributes:1,classes:1},v={styles:"requiredStyles",attributes:"requiredAttributes",classes:"requiredClasses"},I=/^([a-z0-9\-*\s]+)((?:\s*\{[!\w\-,\s\*]+\}\s*|\s*\[[!\w\-,\s\*]+\]\s*|\s*\([!\w\-,\s\*]+\)\s*){0,3})(?:;\s*|$)/i,J={styles:/{([^}]+)}/,attrs:/\[([^\]]+)\]/,classes:/\(([^\)]+)\)/},F=/^cke:(object|embed|param)$/,
-L=/^(object|embed|param)$/,K;K=CKEDITOR.filter.transformationsTools={sizeToStyle:function(a){this.lengthToStyle(a,"width");this.lengthToStyle(a,"height")},sizeToAttribute:function(a){this.lengthToAttribute(a,"width");this.lengthToAttribute(a,"height")},lengthToStyle:function(a,b,c){c=c||b;if(!(c in a.styles)){var d=a.attributes[b];d&&(/^\d+$/.test(d)&&(d+="px"),a.styles[c]=d)}delete a.attributes[b]},lengthToAttribute:function(a,b,c){c=c||b;if(!(c in a.attributes)){var d=a.styles[b],h=d&&d.match(/^(\d+)(?:\.\d*)?px$/);
-h?a.attributes[c]=h[1]:"cke-test"==d&&(a.attributes[c]="cke-test")}delete a.styles[b]},alignmentToStyle:function(a){if(!("float"in a.styles)){var b=a.attributes.align;if("left"==b||"right"==b)a.styles["float"]=b}delete a.attributes.align},alignmentToAttribute:function(a){if(!("align"in a.attributes)){var b=a.styles["float"];if("left"==b||"right"==b)a.attributes.align=b}delete a.styles["float"]},matchesStyle:m,transform:function(a,b){if("string"==typeof b)a.name=b;else{var c=b.getDefinition(),d=c.styles,
-h=c.attributes,n,m,e,f;a.name=c.element;for(n in h)if("class"==n)for(c=a.classes.join("|"),e=h[n].split(/\s+/);f=e.pop();)-1==c.indexOf(f)&&a.classes.push(f);else a.attributes[n]=h[n];for(m in d)a.styles[m]=d[m]}}}})();
+(function(){function a(a,b,c,d,l){var e,q;a=[];for(e in b){q=b[e];q="boolean"==typeof q?{}:"function"==typeof q?{match:q}:M(q);"$"!=e.charAt(0)&&(q.elements=e);c&&(q.featureName=c.toLowerCase());var n=q;n.elements=k(n.elements,/\s+/)||null;n.propertiesOnly=n.propertiesOnly||!0===n.elements;var f=/\s*,\s*/,t=void 0;for(t in Q){n[t]=k(n[t],f)||null;var m=n,g=P[t],E=k(n[P[t]],f),v=n[t],A=[],I=!0,C=void 0;E?I=!1:E={};for(C in v)"!"==C.charAt(0)&&(C=C.slice(1),A.push(C),E[C]=!0,I=!1);for(;C=A.pop();)v[C]=
+v["!"+C],delete v["!"+C];m[g]=(I?!1:E)||null}n.match=n.match||null;d.push(q);a.push(q)}b=l.elements;l=l.generic;var h;c=0;for(d=a.length;c<d;++c){e=M(a[c]);q=!0===e.classes||!0===e.styles||!0===e.attributes;n=e;t=g=f=void 0;for(f in Q)n[f]=J(n[f]);m=!0;for(t in P){f=P[t];g=n[f];E=[];v=void 0;for(v in g)-1<v.indexOf("*")?E.push(new RegExp("^"+v.replace(/\*/g,".*")+"$")):E.push(v);g=E;g.length&&(n[f]=g,m=!1)}n.nothingRequired=m;n.noProperties=!(n.attributes||n.classes||n.styles);if(!0===e.elements||
+null===e.elements)l[q?"unshift":"push"](e);else for(h in n=e.elements,delete e.elements,n)if(b[h])b[h][q?"unshift":"push"](e);else b[h]=[e]}}function d(a,c,d,l){if(!a.match||a.match(c))if(l||h(a,c))if(a.propertiesOnly||(d.valid=!0),d.allAttributes||(d.allAttributes=b(a.attributes,c.attributes,d.validAttributes)),d.allStyles||(d.allStyles=b(a.styles,c.styles,d.validStyles)),!d.allClasses){a=a.classes;c=c.classes;l=d.validClasses;if(a)if(!0===a)a=!0;else{for(var e=0,q=c.length,n;e<q;++e)n=c[e],l[n]||
+(l[n]=a(n));a=!1}else a=!1;d.allClasses=a}}function b(a,b,c){if(!a)return!1;if(!0===a)return!0;for(var d in b)c[d]||(c[d]=a(d));return!1}function c(a,b,c){if(!a.match||a.match(b)){if(a.noProperties)return!1;c.hadInvalidAttribute=e(a.attributes,b.attributes)||c.hadInvalidAttribute;c.hadInvalidStyle=e(a.styles,b.styles)||c.hadInvalidStyle;a=a.classes;b=b.classes;if(a){for(var d=!1,l=!0===a,q=b.length;q--;)if(l||a(b[q]))b.splice(q,1),d=!0;a=d}else a=!1;c.hadInvalidClass=a||c.hadInvalidClass}}function e(a,
+b){if(!a)return!1;var c=!1,d=!0===a,l;for(l in b)if(d||a(l))delete b[l],c=!0;return c}function g(a,b,c){if(a.disabled||a.customConfig&&!c||!b)return!1;a._.cachedChecks={};return!0}function k(a,b){if(!a)return!1;if(!0===a)return a;if("string"==typeof a)return a=H(a),"*"==a?!0:CKEDITOR.tools.convertArrayToObject(a.split(b));if(CKEDITOR.tools.isArray(a))return a.length?CKEDITOR.tools.convertArrayToObject(a):!1;var c={},d=0,l;for(l in a)c[l]=a[l],d++;return d?c:!1}function h(a,b){if(a.nothingRequired)return!0;
+var c,d,l,e;if(l=a.requiredClasses)for(e=b.classes,c=0;c<l.length;++c)if(d=l[c],"string"==typeof d){if(-1==CKEDITOR.tools.indexOf(e,d))return!1}else if(!CKEDITOR.tools.checkIfAnyArrayItemMatches(e,d))return!1;return p(b.styles,a.requiredStyles)&&p(b.attributes,a.requiredAttributes)}function p(a,b){if(!b)return!0;for(var c=0,d;c<b.length;++c)if(d=b[c],"string"==typeof d){if(!(d in a))return!1}else if(!CKEDITOR.tools.checkIfAnyObjectPropertyMatches(a,d))return!1;return!0}function r(a){if(!a)return{};
+a=a.split(/\s*,\s*/).sort();for(var b={};a.length;)b[a.shift()]="cke-test";return b}function f(a){var b,c,d,l,e={},q=1;for(a=H(a);b=a.match(v);)(c=b[2])?(d=B(c,"styles"),l=B(c,"attrs"),c=B(c,"classes")):d=l=c=null,e["$"+q++]={elements:b[1],classes:c,styles:d,attributes:l},a=a.slice(b[0].length);return e}function B(a,b){var c=a.match(G[b]);return c?H(c[1]):null}function u(a){var b=a.styleBackup=a.attributes.style,c=a.classBackup=a.attributes["class"];a.styles||(a.styles=CKEDITOR.tools.parseCssText(b||
+"",1));a.classes||(a.classes=c?c.split(/\s+/):[])}function z(a,b,l,e){var n=0,f;e.toHtml&&(b.name=b.name.replace(E,"$1"));if(e.doCallbacks&&a.elementCallbacks){a:{f=a.elementCallbacks;for(var t=0,g=f.length,v;t<g;++t)if(v=f[t](b)){f=v;break a}f=void 0}if(f)return f}if(e.doTransform&&(f=a._.transformations[b.name])){u(b);for(t=0;t<f.length;++t)q(a,b,f[t]);m(b)}if(e.doFilter){a:{t=b.name;g=a._;a=g.allowedRules.elements[t];f=g.allowedRules.generic;t=g.disallowedRules.elements[t];g=g.disallowedRules.generic;
+v=e.skipRequired;var A={valid:!1,validAttributes:{},validClasses:{},validStyles:{},allAttributes:!1,allClasses:!1,allStyles:!1,hadInvalidAttribute:!1,hadInvalidClass:!1,hadInvalidStyle:!1},k,C;if(a||f){u(b);if(t)for(k=0,C=t.length;k<C;++k)if(!1===c(t[k],b,A)){a=null;break a}if(g)for(k=0,C=g.length;k<C;++k)c(g[k],b,A);if(a)for(k=0,C=a.length;k<C;++k)d(a[k],b,A,v);if(f)for(k=0,C=f.length;k<C;++k)d(f[k],b,A,v);a=A}else a=null}if(!a||!a.valid)return l.push(b),1;C=a.validAttributes;var h=a.validStyles;
+f=a.validClasses;var t=b.attributes,M=b.styles,g=b.classes;v=b.classBackup;var K=b.styleBackup,G,D,p=[],A=[],H=/^data-cke-/;k=!1;delete t.style;delete t["class"];delete b.classBackup;delete b.styleBackup;if(!a.allAttributes)for(G in t)C[G]||(H.test(G)?G==(D=G.replace(/^data-cke-saved-/,""))||C[D]||(delete t[G],k=!0):(delete t[G],k=!0));if(!a.allStyles||a.hadInvalidStyle){for(G in M)a.allStyles||h[G]?p.push(G+":"+M[G]):k=!0;p.length&&(t.style=p.sort().join("; "))}else K&&(t.style=K);if(!a.allClasses||
+a.hadInvalidClass){for(G=0;G<g.length;++G)(a.allClasses||f[g[G]])&&A.push(g[G]);A.length&&(t["class"]=A.sort().join(" "));v&&A.length<v.split(/\s+/).length&&(k=!0)}else v&&(t["class"]=v);k&&(n=1);if(!e.skipFinalValidation&&!x(b))return l.push(b),1}e.toHtml&&(b.name=b.name.replace(I,"cke:$1"));return n}function y(a){var b=[],c;for(c in a)-1<c.indexOf("*")&&b.push(c.replace(/\*/g,".*"));return b.length?new RegExp("^(?:"+b.join("|")+")$"):null}function m(a){var b=a.attributes,c;delete b.style;delete b["class"];
+if(c=CKEDITOR.tools.writeCssText(a.styles,!0))b.style=c;a.classes.length&&(b["class"]=a.classes.sort().join(" "))}function x(a){switch(a.name){case "a":if(!(a.children.length||a.attributes.name||a.attributes.id))return!1;break;case "img":if(!a.attributes.src)return!1}return!0}function J(a){if(!a)return!1;if(!0===a)return!0;var b=y(a);return function(c){return c in a||b&&c.match(b)}}function w(){return new CKEDITOR.htmlParser.element("br")}function F(a){return a.type==CKEDITOR.NODE_ELEMENT&&("br"==
+a.name||D.$block[a.name])}function l(a,b,c){var d=a.name;if(D.$empty[d]||!a.children.length)"hr"==d&&"br"==b?a.replaceWith(w()):(a.parent&&c.push({check:"it",el:a.parent}),a.remove());else if(D.$block[d]||"tr"==d)if("br"==b)a.previous&&!F(a.previous)&&(b=w(),b.insertBefore(a)),a.next&&!F(a.next)&&(b=w(),b.insertAfter(a)),a.replaceWithChildren();else{var d=a.children,l;b:{l=D[b];for(var e=0,q=d.length,n;e<q;++e)if(n=d[e],n.type==CKEDITOR.NODE_ELEMENT&&!l[n.name]){l=!1;break b}l=!0}if(l)a.name=b,a.attributes=
+{},c.push({check:"parent-down",el:a});else{l=a.parent;for(var e=l.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||"body"==l.name,t,f,q=d.length;0<q;)n=d[--q],e&&(n.type==CKEDITOR.NODE_TEXT||n.type==CKEDITOR.NODE_ELEMENT&&D.$inline[n.name])?(t||(t=new CKEDITOR.htmlParser.element(b),t.insertAfter(a),c.push({check:"parent-down",el:t})),t.add(n,0)):(t=null,f=D[l.name]||D.span,n.insertAfter(a),l.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||n.type!=CKEDITOR.NODE_ELEMENT||f[n.name]||c.push({check:"el-up",el:n}));a.remove()}}else d in
+{style:1,script:1}?a.remove():(a.parent&&c.push({check:"it",el:a.parent}),a.replaceWithChildren())}function q(a,b,c){var d,l;for(d=0;d<c.length;++d)if(l=c[d],!(l.check&&!a.check(l.check,!1)||l.left&&!l.left(b))){l.right(b,K);break}}function n(a,b){var c=b.getDefinition(),d=c.attributes,l=c.styles,e,q,n,t;if(a.name!=c.element)return!1;for(e in d)if("class"==e)for(c=d[e].split(/\s+/),n=a.classes.join("|");t=c.pop();){if(-1==n.indexOf(t))return!1}else if(a.attributes[e]!=d[e])return!1;for(q in l)if(a.styles[q]!=
+l[q])return!1;return!0}function t(a,b){var c,d;"string"==typeof a?c=a:a instanceof CKEDITOR.style?d=a:(c=a[0],d=a[1]);return[{element:c,left:d,right:function(a,c){c.transform(a,b)}}]}function A(a){return function(b){return n(b,a)}}function C(a){return function(b,c){c[a](b)}}var D=CKEDITOR.dtd,M=CKEDITOR.tools.copy,H=CKEDITOR.tools.trim,R=["","p","br","div"];CKEDITOR.FILTER_SKIP_TREE=2;CKEDITOR.filter=function(a){this.allowedContent=[];this.disallowedContent=[];this.elementCallbacks=null;this.disabled=
+!1;this.editor=null;this.id=CKEDITOR.tools.getNextNumber();this._={allowedRules:{elements:{},generic:[]},disallowedRules:{elements:{},generic:[]},transformations:{},cachedTests:{}};CKEDITOR.filter.instances[this.id]=this;if(a instanceof CKEDITOR.editor){a=this.editor=a;this.customConfig=!0;var b=a.config.allowedContent;!0===b?this.disabled=!0:(b||(this.customConfig=!1),this.allow(b,"config",1),this.allow(a.config.extraAllowedContent,"extra",1),this.allow(R[a.enterMode]+" "+R[a.shiftEnterMode],"default",
+1),this.disallow(a.config.disallowedContent))}else this.customConfig=!1,this.allow(a,"default",1)};CKEDITOR.filter.instances={};CKEDITOR.filter.prototype={allow:function(b,c,d){if(!g(this,b,d))return!1;var l,e;if("string"==typeof b)b=f(b);else if(b instanceof CKEDITOR.style){if(b.toAllowedContentRules)return this.allow(b.toAllowedContentRules(this.editor),c,d);l=b.getDefinition();b={};d=l.attributes;b[l.element]=l={styles:l.styles,requiredStyles:l.styles&&CKEDITOR.tools.objectKeys(l.styles)};d&&(d=
+M(d),l.classes=d["class"]?d["class"].split(/\s+/):null,l.requiredClasses=l.classes,delete d["class"],l.attributes=d,l.requiredAttributes=d&&CKEDITOR.tools.objectKeys(d))}else if(CKEDITOR.tools.isArray(b)){for(l=0;l<b.length;++l)e=this.allow(b[l],c,d);return e}a(this,b,c,this.allowedContent,this._.allowedRules);return!0},applyTo:function(a,b,c,d){if(this.disabled)return!1;var e=this,q=[],n=this.editor&&this.editor.config.protectedSource,t,f=!1,g={doFilter:!c,doTransform:!0,doCallbacks:!0,toHtml:b};
+a.forEach(function(a){if(a.type==CKEDITOR.NODE_ELEMENT){if("off"==a.attributes["data-cke-filter"])return!1;if(!b||"span"!=a.name||!~CKEDITOR.tools.objectKeys(a.attributes).join("|").indexOf("data-cke-"))if(t=z(e,a,q,g),t&1)f=!0;else if(t&2)return!1}else if(a.type==CKEDITOR.NODE_COMMENT&&a.value.match(/^\{cke_protected\}(?!\{C\})/)){var c;a:{var d=decodeURIComponent(a.value.replace(/^\{cke_protected\}/,""));c=[];var l,m,E;if(n)for(m=0;m<n.length;++m)if((E=d.match(n[m]))&&E[0].length==d.length){c=!0;
+break a}d=CKEDITOR.htmlParser.fragment.fromHtml(d);1==d.children.length&&(l=d.children[0]).type==CKEDITOR.NODE_ELEMENT&&z(e,l,c,g);c=!c.length}c||q.push(a)}},null,!0);q.length&&(f=!0);var m;a=[];d=R[d||(this.editor?this.editor.enterMode:CKEDITOR.ENTER_P)];for(var E;c=q.pop();)c.type==CKEDITOR.NODE_ELEMENT?l(c,d,a):c.remove();for(;m=a.pop();)if(c=m.el,c.parent)switch(E=D[c.parent.name]||D.span,m.check){case "it":D.$removeEmpty[c.name]&&!c.children.length?l(c,d,a):x(c)||l(c,d,a);break;case "el-up":c.parent.type==
+CKEDITOR.NODE_DOCUMENT_FRAGMENT||E[c.name]||l(c,d,a);break;case "parent-down":c.parent.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||E[c.name]||l(c.parent,d,a)}return f},checkFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));return!a.requiredContent||this.check(a.requiredContent)},disable:function(){this.disabled=!0},disallow:function(b){if(!g(this,b,!0))return!1;"string"==typeof b&&(b=f(b));a(this,b,null,this.disallowedContent,this._.disallowedRules);return!0},
+addContentForms:function(a){if(!this.disabled&&a){var b,c,d=[],l;for(b=0;b<a.length&&!l;++b)c=a[b],("string"==typeof c||c instanceof CKEDITOR.style)&&this.check(c)&&(l=c);if(l){for(b=0;b<a.length;++b)d.push(t(a[b],l));this.addTransformations(d)}}},addElementCallback:function(a){this.elementCallbacks||(this.elementCallbacks=[]);this.elementCallbacks.push(a)},addFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));this.allow(a.allowedContent,a.name);this.addTransformations(a.contentTransformations);
+this.addContentForms(a.contentForms);return a.requiredContent&&(this.customConfig||this.disallowedContent.length)?this.check(a.requiredContent):!0},addTransformations:function(a){var b,c;if(!this.disabled&&a){var d=this._.transformations,l;for(l=0;l<a.length;++l){b=a[l];var e=void 0,q=void 0,n=void 0,t=void 0,f=void 0,g=void 0;c=[];for(q=0;q<b.length;++q)n=b[q],"string"==typeof n?(n=n.split(/\s*:\s*/),t=n[0],f=null,g=n[1]):(t=n.check,f=n.left,g=n.right),e||(e=n,e=e.element?e.element:t?t.match(/^([a-z0-9]+)/i)[0]:
+e.left.getDefinition().element),f instanceof CKEDITOR.style&&(f=A(f)),c.push({check:t==e?null:t,left:f,right:"string"==typeof g?C(g):g});b=e;d[b]||(d[b]=[]);d[b].push(c)}}},check:function(a,b,c){if(this.disabled)return!0;if(CKEDITOR.tools.isArray(a)){for(var d=a.length;d--;)if(this.check(a[d],b,c))return!0;return!1}var l,e;if("string"==typeof a){e=a+"\x3c"+(!1===b?"0":"1")+(c?"1":"0")+"\x3e";if(e in this._.cachedChecks)return this._.cachedChecks[e];d=f(a).$1;l=d.styles;var n=d.classes;d.name=d.elements;
+d.classes=n=n?n.split(/\s*,\s*/):[];d.styles=r(l);d.attributes=r(d.attributes);d.children=[];n.length&&(d.attributes["class"]=n.join(" "));l&&(d.attributes.style=CKEDITOR.tools.writeCssText(d.styles));l=d}else d=a.getDefinition(),l=d.styles,n=d.attributes||{},l&&!CKEDITOR.tools.isEmpty(l)?(l=M(l),n.style=CKEDITOR.tools.writeCssText(l,!0)):l={},l={name:d.element,attributes:n,classes:n["class"]?n["class"].split(/\s+/):[],styles:l,children:[]};var n=CKEDITOR.tools.clone(l),t=[],g;if(!1!==b&&(g=this._.transformations[l.name])){for(d=
+0;d<g.length;++d)q(this,l,g[d]);m(l)}z(this,n,t,{doFilter:!0,doTransform:!1!==b,skipRequired:!c,skipFinalValidation:!c});b=0<t.length?!1:CKEDITOR.tools.objectCompare(l.attributes,n.attributes,!0)?!0:!1;"string"==typeof a&&(this._.cachedChecks[e]=b);return b},getAllowedEnterMode:function(){var a=["p","div","br"],b={p:CKEDITOR.ENTER_P,div:CKEDITOR.ENTER_DIV,br:CKEDITOR.ENTER_BR};return function(c,d){var l=a.slice(),e;if(this.check(R[c]))return c;for(d||(l=l.reverse());e=l.pop();)if(this.check(e))return b[e];
+return CKEDITOR.ENTER_BR}}(),destroy:function(){delete CKEDITOR.filter.instances[this.id];delete this._;delete this.allowedContent;delete this.disallowedContent}};var Q={styles:1,attributes:1,classes:1},P={styles:"requiredStyles",attributes:"requiredAttributes",classes:"requiredClasses"},v=/^([a-z0-9\-*\s]+)((?:\s*\{[!\w\-,\s\*]+\}\s*|\s*\[[!\w\-,\s\*]+\]\s*|\s*\([!\w\-,\s\*]+\)\s*){0,3})(?:;\s*|$)/i,G={styles:/{([^}]+)}/,attrs:/\[([^\]]+)\]/,classes:/\(([^\)]+)\)/},E=/^cke:(object|embed|param)$/,
+I=/^(object|embed|param)$/,K;K=CKEDITOR.filter.transformationsTools={sizeToStyle:function(a){this.lengthToStyle(a,"width");this.lengthToStyle(a,"height")},sizeToAttribute:function(a){this.lengthToAttribute(a,"width");this.lengthToAttribute(a,"height")},lengthToStyle:function(a,b,c){c=c||b;if(!(c in a.styles)){var d=a.attributes[b];d&&(/^\d+$/.test(d)&&(d+="px"),a.styles[c]=d)}delete a.attributes[b]},lengthToAttribute:function(a,b,c){c=c||b;if(!(c in a.attributes)){var d=a.styles[b],l=d&&d.match(/^(\d+)(?:\.\d*)?px$/);
+l?a.attributes[c]=l[1]:"cke-test"==d&&(a.attributes[c]="cke-test")}delete a.styles[b]},alignmentToStyle:function(a){if(!("float"in a.styles)){var b=a.attributes.align;if("left"==b||"right"==b)a.styles["float"]=b}delete a.attributes.align},alignmentToAttribute:function(a){if(!("align"in a.attributes)){var b=a.styles["float"];if("left"==b||"right"==b)a.attributes.align=b}delete a.styles["float"]},splitBorderShorthand:function(a){function b(d){a.styles["border-top-width"]=c[d[0]];a.styles["border-right-width"]=
+c[d[1]];a.styles["border-bottom-width"]=c[d[2]];a.styles["border-left-width"]=c[d[3]]}if(a.styles.border){var c=a.styles.border.match(/([\.\d]+\w+)/g)||["0px"];switch(c.length){case 1:a.styles["border-width"]=c[0];break;case 2:b([0,1,0,1]);break;case 3:b([0,1,2,1]);break;case 4:b([0,1,2,3])}a.styles["border-style"]=a.styles["border-style"]||(a.styles.border.match(/(none|hidden|dotted|dashed|solid|double|groove|ridge|inset|outset|initial|inherit)/)||[])[0];a.styles["border-style"]||delete a.styles["border-style"];
+delete a.styles.border}},listTypeToStyle:function(a){if(a.attributes.type)switch(a.attributes.type){case "a":a.styles["list-style-type"]="lower-alpha";break;case "A":a.styles["list-style-type"]="upper-alpha";break;case "i":a.styles["list-style-type"]="lower-roman";break;case "I":a.styles["list-style-type"]="upper-roman";break;case "1":a.styles["list-style-type"]="decimal";break;default:a.styles["list-style-type"]=a.attributes.type}},splitMarginShorthand:function(a){function b(d){a.styles["margin-top"]=
+c[d[0]];a.styles["margin-right"]=c[d[1]];a.styles["margin-bottom"]=c[d[2]];a.styles["margin-left"]=c[d[3]]}if(a.styles.margin){var c=a.styles.margin.match(/(\-?[\.\d]+\w+)/g)||["0px"];switch(c.length){case 1:a.styles.margin=c[0];break;case 2:b([0,1,0,1]);break;case 3:b([0,1,2,1]);break;case 4:b([0,1,2,3])}delete a.styles.margin}},matchesStyle:n,transform:function(a,b){if("string"==typeof b)a.name=b;else{var c=b.getDefinition(),d=c.styles,l=c.attributes,e,q,n,t;a.name=c.element;for(e in l)if("class"==
+e)for(c=a.classes.join("|"),n=l[e].split(/\s+/);t=n.pop();)-1==c.indexOf(t)&&a.classes.push(t);else a.attributes[e]=l[e];for(q in d)a.styles[q]=d[q]}}}})();
 (function(){CKEDITOR.focusManager=function(a){if(a.focusManager)return a.focusManager;this.hasFocus=!1;this.currentActive=null;this._={editor:a};return this};CKEDITOR.focusManager._={blurDelay:200};CKEDITOR.focusManager.prototype={focus:function(a){this._.timer&&clearTimeout(this._.timer);a&&(this.currentActive=a);this.hasFocus||this._.locked||((a=CKEDITOR.currentInstance)&&a.focusManager.blur(1),this.hasFocus=!0,(a=this._.editor.container)&&a.addClass("cke_focus"),this._.editor.fire("focus"))},lock:function(){this._.locked=
-1},unlock:function(){delete this._.locked},blur:function(a){function d(){if(this.hasFocus){this.hasFocus=!1;var a=this._.editor.container;a&&a.removeClass("cke_focus");this._.editor.fire("blur")}}if(!this._.locked){this._.timer&&clearTimeout(this._.timer);var b=CKEDITOR.focusManager._.blurDelay;a||!b?d.call(this):this._.timer=CKEDITOR.tools.setTimeout(function(){delete this._.timer;d.call(this)},b,this)}},add:function(a,d){var b=a.getCustomData("focusmanager");if(!b||b!=this){b&&b.remove(a);var b=
-"focus",c="blur";d&&(CKEDITOR.env.ie?(b="focusin",c="focusout"):CKEDITOR.event.useCapture=1);var e={blur:function(){a.equals(this.currentActive)&&this.blur()},focus:function(){this.focus(a)}};a.on(b,e.focus,this);a.on(c,e.blur,this);d&&(CKEDITOR.event.useCapture=0);a.setCustomData("focusmanager",this);a.setCustomData("focusmanager_handlers",e)}},remove:function(a){a.removeCustomData("focusmanager");var d=a.removeCustomData("focusmanager_handlers");a.removeListener("blur",d.blur);a.removeListener("focus",
-d.focus)}}})();CKEDITOR.keystrokeHandler=function(a){if(a.keystrokeHandler)return a.keystrokeHandler;this.keystrokes={};this.blockedKeystrokes={};this._={editor:a};return this};
-(function(){var a,d=function(b){b=b.data;var d=b.getKeystroke(),g=this.keystrokes[d],l=this._.editor;a=!1===l.fire("key",{keyCode:d,domEvent:b});a||(g&&(a=!1!==l.execCommand(g,{from:"keystrokeHandler"})),a||(a=!!this.blockedKeystrokes[d]));a&&b.preventDefault(!0);return!a},b=function(b){a&&(a=!1,b.data.preventDefault(!0))};CKEDITOR.keystrokeHandler.prototype={attach:function(a){a.on("keydown",d,this);if(CKEDITOR.env.gecko&&CKEDITOR.env.mac)a.on("keypress",b,this)}}})();
-(function(){CKEDITOR.lang={languages:{af:1,ar:1,bg:1,bn:1,bs:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,"en-au":1,"en-ca":1,"en-gb":1,en:1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,"fr-ca":1,fr:1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,is:1,it:1,ja:1,ka:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,ms:1,nb:1,nl:1,no:1,pl:1,"pt-br":1,pt:1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,"sr-latn":1,sr:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,"zh-cn":1,zh:1},rtl:{ar:1,fa:1,he:1,ku:1,ug:1},load:function(a,d,b){a&&CKEDITOR.lang.languages[a]||(a=
-this.detect(d,a));var c=this;d=function(){c[a].dir=c.rtl[a]?"rtl":"ltr";b(a,c[a])};this[a]?d():CKEDITOR.scriptLoader.load(CKEDITOR.getUrl("lang/"+a+".js"),d,this)},detect:function(a,d){var b=this.languages;d=d||navigator.userLanguage||navigator.language||a;var c=d.toLowerCase().match(/([a-z]+)(?:-([a-z]+))?/),e=c[1],c=c[2];b[e+"-"+c]?e=e+"-"+c:b[e]||(e=null);CKEDITOR.lang.detect=e?function(){return e}:function(a){return a};return e||a}}})();
-CKEDITOR.scriptLoader=function(){var a={},d={};return{load:function(b,c,e,g){var l="string"==typeof b;l&&(b=[b]);e||(e=CKEDITOR);var k=b.length,q=[],w=[],f=function(a){c&&(l?c.call(e,a):c.call(e,q,w))};if(0===k)f(!0);else{var y=function(a,b){(b?q:w).push(a);0>=--k&&(g&&CKEDITOR.document.getDocumentElement().removeStyle("cursor"),f(b))},A=function(b,c){a[b]=1;var e=d[b];delete d[b];for(var f=0;f<e.length;f++)e[f](b,c)},t=function(b){if(a[b])y(b,!0);else{var e=d[b]||(d[b]=[]);e.push(y);if(!(1<e.length)){var f=
-new CKEDITOR.dom.element("script");f.setAttributes({type:"text/javascript",src:b});c&&(CKEDITOR.env.ie&&11>CKEDITOR.env.version?f.$.onreadystatechange=function(){if("loaded"==f.$.readyState||"complete"==f.$.readyState)f.$.onreadystatechange=null,A(b,!0)}:(f.$.onload=function(){setTimeout(function(){A(b,!0)},0)},f.$.onerror=function(){A(b,!1)}));f.appendTo(CKEDITOR.document.getHead())}}};g&&CKEDITOR.document.getDocumentElement().setStyle("cursor","wait");for(var D=0;D<k;D++)t(b[D])}},queue:function(){function a(){var b;
-(b=c[0])&&this.load(b.scriptUrl,b.callback,CKEDITOR,0)}var c=[];return function(d,g){var l=this;c.push({scriptUrl:d,callback:function(){g&&g.apply(this,arguments);c.shift();a.call(l)}});1==c.length&&a.call(this)}}()}}();CKEDITOR.resourceManager=function(a,d){this.basePath=a;this.fileName=d;this.registered={};this.loaded={};this.externals={};this._={waitingList:{}}};
+1},unlock:function(){delete this._.locked},blur:function(a){function d(){var a=this._.editor;this.hasFocus&&(this.hasFocus=!1,CKEDITOR.env.chrome&&a.editable().isInline()&&a.window.$.getSelection().removeAllRanges(),(a=this._.editor.container)&&a.removeClass("cke_focus"),this._.editor.fire("blur"))}if(!this._.locked){this._.timer&&clearTimeout(this._.timer);var b=CKEDITOR.focusManager._.blurDelay;a||!b?d.call(this):this._.timer=CKEDITOR.tools.setTimeout(function(){delete this._.timer;d.call(this)},
+b,this)}},add:function(a,d){var b=a.getCustomData("focusmanager");if(!b||b!=this){b&&b.remove(a);var b="focus",c="blur";d&&(CKEDITOR.env.ie?(b="focusin",c="focusout"):CKEDITOR.event.useCapture=1);var e={blur:function(){a.equals(this.currentActive)&&this.blur()},focus:function(){this.focus(a)}};a.on(b,e.focus,this);a.on(c,e.blur,this);d&&(CKEDITOR.event.useCapture=0);a.setCustomData("focusmanager",this);a.setCustomData("focusmanager_handlers",e)}},remove:function(a){a.removeCustomData("focusmanager");
+var d=a.removeCustomData("focusmanager_handlers");a.removeListener("blur",d.blur);a.removeListener("focus",d.focus)}}})();CKEDITOR.keystrokeHandler=function(a){if(a.keystrokeHandler)return a.keystrokeHandler;this.keystrokes={};this.blockedKeystrokes={};this._={editor:a};return this};
+(function(){var a,d=function(b){b=b.data;var d=b.getKeystroke(),g=this.keystrokes[d],k=this._.editor;a=!1===k.fire("key",{keyCode:d,domEvent:b});a||(g&&(a=!1!==k.execCommand(g,{from:"keystrokeHandler"})),a||(a=!!this.blockedKeystrokes[d]));a&&b.preventDefault(!0);return!a},b=function(b){a&&(a=!1,b.data.preventDefault(!0))};CKEDITOR.keystrokeHandler.prototype={attach:function(a){a.on("keydown",d,this);if(CKEDITOR.env.gecko&&CKEDITOR.env.mac)a.on("keypress",b,this)}}})();
+(function(){CKEDITOR.lang={languages:{af:1,ar:1,az:1,bg:1,bn:1,bs:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,"en-au":1,"en-ca":1,"en-gb":1,en:1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,"fr-ca":1,fr:1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,is:1,it:1,ja:1,ka:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,ms:1,nb:1,nl:1,no:1,oc:1,pl:1,"pt-br":1,pt:1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,"sr-latn":1,sr:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,"zh-cn":1,zh:1},rtl:{ar:1,fa:1,he:1,ku:1,ug:1},load:function(a,d,b){a&&CKEDITOR.lang.languages[a]||
+(a=this.detect(d,a));var c=this;d=function(){c[a].dir=c.rtl[a]?"rtl":"ltr";b(a,c[a])};this[a]?d():CKEDITOR.scriptLoader.load(CKEDITOR.getUrl("lang/"+a+".js"),d,this)},detect:function(a,d){var b=this.languages;d=d||navigator.userLanguage||navigator.language||a;var c=d.toLowerCase().match(/([a-z]+)(?:-([a-z]+))?/),e=c[1],c=c[2];b[e+"-"+c]?e=e+"-"+c:b[e]||(e=null);CKEDITOR.lang.detect=e?function(){return e}:function(a){return a};return e||a}}})();
+CKEDITOR.scriptLoader=function(){var a={},d={};return{load:function(b,c,e,g){var k="string"==typeof b;k&&(b=[b]);e||(e=CKEDITOR);var h=b.length,p=[],r=[],f=function(a){c&&(k?c.call(e,a):c.call(e,p,r))};if(0===h)f(!0);else{var B=function(a,b){(b?p:r).push(a);0>=--h&&(g&&CKEDITOR.document.getDocumentElement().removeStyle("cursor"),f(b))},u=function(b,c){a[b]=1;var e=d[b];delete d[b];for(var f=0;f<e.length;f++)e[f](b,c)},z=function(b){if(a[b])B(b,!0);else{var e=d[b]||(d[b]=[]);e.push(B);if(!(1<e.length)){var f=
+new CKEDITOR.dom.element("script");f.setAttributes({type:"text/javascript",src:b});c&&(CKEDITOR.env.ie&&(8>=CKEDITOR.env.version||CKEDITOR.env.ie9Compat)?f.$.onreadystatechange=function(){if("loaded"==f.$.readyState||"complete"==f.$.readyState)f.$.onreadystatechange=null,u(b,!0)}:(f.$.onload=function(){setTimeout(function(){u(b,!0)},0)},f.$.onerror=function(){u(b,!1)}));f.appendTo(CKEDITOR.document.getHead())}}};g&&CKEDITOR.document.getDocumentElement().setStyle("cursor","wait");for(var y=0;y<h;y++)z(b[y])}},
+queue:function(){function a(){var b;(b=c[0])&&this.load(b.scriptUrl,b.callback,CKEDITOR,0)}var c=[];return function(d,g){var k=this;c.push({scriptUrl:d,callback:function(){g&&g.apply(this,arguments);c.shift();a.call(k)}});1==c.length&&a.call(this)}}()}}();CKEDITOR.resourceManager=function(a,d){this.basePath=a;this.fileName=d;this.registered={};this.loaded={};this.externals={};this._={waitingList:{}}};
 CKEDITOR.resourceManager.prototype={add:function(a,d){if(this.registered[a])throw Error('[CKEDITOR.resourceManager.add] The resource name "'+a+'" is already registered.');var b=this.registered[a]=d||{};b.name=a;b.path=this.getPath(a);CKEDITOR.fire(a+CKEDITOR.tools.capitalize(this.fileName)+"Ready",b);return this.get(a)},get:function(a){return this.registered[a]||null},getPath:function(a){var d=this.externals[a];return CKEDITOR.getUrl(d&&d.dir||this.basePath+a+"/")},getFilePath:function(a){var d=this.externals[a];
-return CKEDITOR.getUrl(this.getPath(a)+(d?d.file:this.fileName+".js"))},addExternal:function(a,d,b){a=a.split(",");for(var c=0;c<a.length;c++){var e=a[c];b||(d=d.replace(/[^\/]+$/,function(a){b=a;return""}));this.externals[e]={dir:d,file:b||this.fileName+".js"}}},load:function(a,d,b){CKEDITOR.tools.isArray(a)||(a=a?[a]:[]);for(var c=this.loaded,e=this.registered,g=[],l={},k={},q=0;q<a.length;q++){var w=a[q];if(w)if(c[w]||e[w])k[w]=this.get(w);else{var f=this.getFilePath(w);g.push(f);f in l||(l[f]=
-[]);l[f].push(w)}}CKEDITOR.scriptLoader.load(g,function(a,e){if(e.length)throw Error('[CKEDITOR.resourceManager.load] Resource name "'+l[e[0]].join(",")+'" was not found at "'+e[0]+'".');for(var f=0;f<a.length;f++)for(var g=l[a[f]],p=0;p<g.length;p++){var x=g[p];k[x]=this.get(x);c[x]=1}d.call(b,k)},this)}};CKEDITOR.plugins=new CKEDITOR.resourceManager("plugins/","plugin");
-CKEDITOR.plugins.load=CKEDITOR.tools.override(CKEDITOR.plugins.load,function(a){var d={};return function(b,c,e){var g={},l=function(b){a.call(this,b,function(a){CKEDITOR.tools.extend(g,a);var b=[],f;for(f in a){var k=a[f],A=k&&k.requires;if(!d[f]){if(k.icons)for(var t=k.icons.split(","),D=t.length;D--;)CKEDITOR.skin.addIcon(t[D],k.path+"icons/"+(CKEDITOR.env.hidpi&&k.hidpi?"hidpi/":"")+t[D]+".png");d[f]=1}if(A)for(A.split&&(A=A.split(",")),k=0;k<A.length;k++)g[A[k]]||b.push(A[k])}if(b.length)l.call(this,
-b);else{for(f in g)k=g[f],k.onLoad&&!k.onLoad._called&&(!1===k.onLoad()&&delete g[f],k.onLoad._called=1);c&&c.call(e||window,g)}},this)};l.call(this,b)}});CKEDITOR.plugins.setLang=function(a,d,b){var c=this.get(a);a=c.langEntries||(c.langEntries={});c=c.lang||(c.lang=[]);c.split&&(c=c.split(","));-1==CKEDITOR.tools.indexOf(c,d)&&c.push(d);a[d]=b};CKEDITOR.ui=function(a){if(a.ui)return a.ui;this.items={};this.instances={};this.editor=a;this._={handlers:{}};return this};
+return CKEDITOR.getUrl(this.getPath(a)+(d?d.file:this.fileName+".js"))},addExternal:function(a,d,b){a=a.split(",");for(var c=0;c<a.length;c++){var e=a[c];b||(d=d.replace(/[^\/]+$/,function(a){b=a;return""}));this.externals[e]={dir:d,file:b||this.fileName+".js"}}},load:function(a,d,b){CKEDITOR.tools.isArray(a)||(a=a?[a]:[]);for(var c=this.loaded,e=this.registered,g=[],k={},h={},p=0;p<a.length;p++){var r=a[p];if(r)if(c[r]||e[r])h[r]=this.get(r);else{var f=this.getFilePath(r);g.push(f);f in k||(k[f]=
+[]);k[f].push(r)}}CKEDITOR.scriptLoader.load(g,function(a,e){if(e.length)throw Error('[CKEDITOR.resourceManager.load] Resource name "'+k[e[0]].join(",")+'" was not found at "'+e[0]+'".');for(var f=0;f<a.length;f++)for(var g=k[a[f]],m=0;m<g.length;m++){var x=g[m];h[x]=this.get(x);c[x]=1}d.call(b,h)},this)}};CKEDITOR.plugins=new CKEDITOR.resourceManager("plugins/","plugin");
+CKEDITOR.plugins.load=CKEDITOR.tools.override(CKEDITOR.plugins.load,function(a){var d={};return function(b,c,e){var g={},k=function(b){a.call(this,b,function(a){CKEDITOR.tools.extend(g,a);var b=[],f;for(f in a){var h=a[f],u=h&&h.requires;if(!d[f]){if(h.icons)for(var z=h.icons.split(","),y=z.length;y--;)CKEDITOR.skin.addIcon(z[y],h.path+"icons/"+(CKEDITOR.env.hidpi&&h.hidpi?"hidpi/":"")+z[y]+".png");d[f]=1}if(u)for(u.split&&(u=u.split(",")),h=0;h<u.length;h++)g[u[h]]||b.push(u[h])}if(b.length)k.call(this,
+b);else{for(f in g)h=g[f],h.onLoad&&!h.onLoad._called&&(!1===h.onLoad()&&delete g[f],h.onLoad._called=1);c&&c.call(e||window,g)}},this)};k.call(this,b)}});CKEDITOR.plugins.setLang=function(a,d,b){var c=this.get(a);a=c.langEntries||(c.langEntries={});c=c.lang||(c.lang=[]);c.split&&(c=c.split(","));-1==CKEDITOR.tools.indexOf(c,d)&&c.push(d);a[d]=b};CKEDITOR.ui=function(a){if(a.ui)return a.ui;this.items={};this.instances={};this.editor=a;this._={handlers:{}};return this};
 CKEDITOR.ui.prototype={add:function(a,d,b){b.name=a.toLowerCase();var c=this.items[a]={type:d,command:b.command||null,args:Array.prototype.slice.call(arguments,2)};CKEDITOR.tools.extend(c,b)},get:function(a){return this.instances[a]},create:function(a){var d=this.items[a],b=d&&this._.handlers[d.type],c=d&&d.command&&this.editor.getCommand(d.command),b=b&&b.create.apply(this,d.args);this.instances[a]=b;c&&c.uiItems.push(b);b&&!b.type&&(b.type=d.type);return b},addHandler:function(a,d){this._.handlers[a]=
 d},space:function(a){return CKEDITOR.document.getById(this.spaceId(a))},spaceId:function(a){return this.editor.id+"_"+a}};CKEDITOR.event.implementOn(CKEDITOR.ui);
 (function(){function a(a,e,f){CKEDITOR.event.call(this);a=a&&CKEDITOR.tools.clone(a);if(void 0!==e){if(!(e instanceof CKEDITOR.dom.element))throw Error("Expect element of type CKEDITOR.dom.element.");if(!f)throw Error("One of the element modes must be specified.");if(CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f==CKEDITOR.ELEMENT_MODE_INLINE)throw Error("Inline element mode is not supported on IE quirks.");if(!b(e,f))throw Error('The specified element mode is not supported on element: "'+e.getName()+'".');
 this.element=e;this.elementMode=f;this.name=this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO&&(e.getId()||e.getNameAtt())}else this.elementMode=CKEDITOR.ELEMENT_MODE_NONE;this._={};this.commands={};this.templates={};this.name=this.name||d();this.id=CKEDITOR.tools.getNextId();this.status="unloaded";this.config=CKEDITOR.tools.prototypedCopy(CKEDITOR.config);this.ui=new CKEDITOR.ui(this);this.focusManager=new CKEDITOR.focusManager(this);this.keystrokeHandler=new CKEDITOR.keystrokeHandler(this);this.on("readOnly",
-c);this.on("selectionChange",function(a){g(this,a.data.path)});this.on("activeFilterChange",function(){g(this,this.elementPath(),!0)});this.on("mode",c);this.on("instanceReady",function(){this.config.startupFocus&&this.focus()});CKEDITOR.fire("instanceCreated",null,this);CKEDITOR.add(this);CKEDITOR.tools.setTimeout(function(){"destroyed"!==this.status?k(this,a):CKEDITOR.warn("editor-incorrect-destroy")},0,this)}function d(){do var a="editor"+ ++t;while(CKEDITOR.instances[a]);return a}function b(a,
-b){return b==CKEDITOR.ELEMENT_MODE_INLINE?a.is(CKEDITOR.dtd.$editable)||a.is("textarea"):b==CKEDITOR.ELEMENT_MODE_REPLACE?!a.is(CKEDITOR.dtd.$nonBodyContent):1}function c(){var a=this.commands,b;for(b in a)e(this,a[b])}function e(a,b){b[b.startDisabled?"disable":a.readOnly&&!b.readOnly?"disable":b.modes[a.mode]?"enable":"disable"]()}function g(a,b,c){if(b){var d,e,h=a.commands;for(e in h)d=h[e],(c||d.contextSensitive)&&d.refresh(a,b)}}function l(a){var b=a.config.customConfig;if(!b)return!1;var b=
-CKEDITOR.getUrl(b),c=D[b]||(D[b]={});c.fn?(c.fn.call(a,a.config),CKEDITOR.getUrl(a.config.customConfig)!=b&&l(a)||a.fireOnce("customConfigLoaded")):CKEDITOR.scriptLoader.queue(b,function(){c.fn=CKEDITOR.editorConfig?CKEDITOR.editorConfig:function(){};l(a)});return!0}function k(a,b){a.on("customConfigLoaded",function(){if(b){if(b.on)for(var c in b.on)a.on(c,b.on[c]);CKEDITOR.tools.extend(a.config,b,!0);delete a.config.on}c=a.config;a.readOnly=c.readOnly?!0:a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?
+c);this.on("selectionChange",function(a){g(this,a.data.path)});this.on("activeFilterChange",function(){g(this,this.elementPath(),!0)});this.on("mode",c);this.on("instanceReady",function(){this.config.startupFocus&&this.focus()});CKEDITOR.fire("instanceCreated",null,this);CKEDITOR.add(this);CKEDITOR.tools.setTimeout(function(){"destroyed"!==this.status?h(this,a):CKEDITOR.warn("editor-incorrect-destroy")},0,this)}function d(){do var a="editor"+ ++z;while(CKEDITOR.instances[a]);return a}function b(a,
+b){return b==CKEDITOR.ELEMENT_MODE_INLINE?a.is(CKEDITOR.dtd.$editable)||a.is("textarea"):b==CKEDITOR.ELEMENT_MODE_REPLACE?!a.is(CKEDITOR.dtd.$nonBodyContent):1}function c(){var a=this.commands,b;for(b in a)e(this,a[b])}function e(a,b){b[b.startDisabled?"disable":a.readOnly&&!b.readOnly?"disable":b.modes[a.mode]?"enable":"disable"]()}function g(a,b,c){if(b){var d,e,l=a.commands;for(e in l)d=l[e],(c||d.contextSensitive)&&d.refresh(a,b)}}function k(a){var b=a.config.customConfig;if(!b)return!1;var b=
+CKEDITOR.getUrl(b),c=y[b]||(y[b]={});c.fn?(c.fn.call(a,a.config),CKEDITOR.getUrl(a.config.customConfig)!=b&&k(a)||a.fireOnce("customConfigLoaded")):CKEDITOR.scriptLoader.queue(b,function(){c.fn=CKEDITOR.editorConfig?CKEDITOR.editorConfig:function(){};k(a)});return!0}function h(a,b){a.on("customConfigLoaded",function(){if(b){if(b.on)for(var c in b.on)a.on(c,b.on[c]);CKEDITOR.tools.extend(a.config,b,!0);delete a.config.on}c=a.config;a.readOnly=c.readOnly?!0:a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?
 a.element.is("textarea")?a.element.hasAttribute("disabled")||a.element.hasAttribute("readonly"):a.element.isReadOnly():a.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.element.hasAttribute("disabled")||a.element.hasAttribute("readonly"):!1;a.blockless=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?!(a.element.is("textarea")||CKEDITOR.dtd[a.element.getName()].p):!1;a.tabIndex=c.tabIndex||a.element&&a.element.getAttribute("tabindex")||0;a.activeEnterMode=a.enterMode=a.blockless?CKEDITOR.ENTER_BR:c.enterMode;
-a.activeShiftEnterMode=a.shiftEnterMode=a.blockless?CKEDITOR.ENTER_BR:c.shiftEnterMode;c.skin&&(CKEDITOR.skinName=c.skin);a.fireOnce("configLoaded");a.dataProcessor=new CKEDITOR.htmlDataProcessor(a);a.filter=a.activeFilter=new CKEDITOR.filter(a);q(a)});b&&null!=b.customConfig&&(a.config.customConfig=b.customConfig);l(a)||a.fireOnce("customConfigLoaded")}function q(a){CKEDITOR.skin.loadPart("editor",function(){w(a)})}function w(a){CKEDITOR.lang.load(a.config.language,a.config.defaultLanguage,function(b,
-c){var d=a.config.title;a.langCode=b;a.lang=CKEDITOR.tools.prototypedCopy(c);a.title="string"==typeof d||!1===d?d:[a.lang.editor,a.name].join(", ");a.config.contentsLangDirection||(a.config.contentsLangDirection=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.element.getDirection(1):a.lang.dir);a.fire("langLoaded");f(a)})}function f(a){a.getStylesSet(function(b){a.once("loaded",function(){a.fire("stylesSet",{styles:b})},null,null,1);y(a)})}function y(a){var b=a.config,c=b.plugins,d=b.extraPlugins,e=
-b.removePlugins;if(d)var h=new RegExp("(?:^|,)(?:"+d.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),c=c.replace(h,""),c=c+(","+d);if(e)var n=new RegExp("(?:^|,)(?:"+e.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),c=c.replace(n,"");CKEDITOR.env.air&&(c+=",adobeair");CKEDITOR.plugins.load(c.split(","),function(c){var d=[],h=[],e=[];a.plugins=c;for(var f in c){var g=c[f],r=g.lang,l=null,k=g.requires,v;CKEDITOR.tools.isArray(k)&&(k=k.join(","));if(k&&(v=k.match(n)))for(;k=v.pop();)CKEDITOR.error("editor-plugin-required",
-{plugin:k.replace(",",""),requiredBy:f});r&&!a.lang[f]&&(r.split&&(r=r.split(",")),0<=CKEDITOR.tools.indexOf(r,a.langCode)?l=a.langCode:(l=a.langCode.replace(/-.*/,""),l=l!=a.langCode&&0<=CKEDITOR.tools.indexOf(r,l)?l:0<=CKEDITOR.tools.indexOf(r,"en")?"en":r[0]),g.langEntries&&g.langEntries[l]?(a.lang[f]=g.langEntries[l],l=null):e.push(CKEDITOR.getUrl(g.path+"lang/"+l+".js")));h.push(l);d.push(g)}CKEDITOR.scriptLoader.load(e,function(){for(var c=["beforeInit","init","afterInit"],e=0;e<c.length;e++)for(var n=
-0;n<d.length;n++){var m=d[n];0===e&&h[n]&&m.lang&&m.langEntries&&(a.lang[m.name]=m.langEntries[h[n]]);if(m[c[e]])m[c[e]](a)}a.fireOnce("pluginsLoaded");b.keystrokes&&a.setKeystroke(a.config.keystrokes);for(n=0;n<a.config.blockedKeystrokes.length;n++)a.keystrokeHandler.blockedKeystrokes[a.config.blockedKeystrokes[n]]=1;a.status="loaded";a.fireOnce("loaded");CKEDITOR.fire("instanceLoaded",null,a)})})}function A(){var a=this.element;if(a&&this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO){var b=this.getData();
-this.config.htmlEncodeOutput&&(b=CKEDITOR.tools.htmlEncode(b));a.is("textarea")?a.setValue(b):a.setHtml(b);return!0}return!1}a.prototype=CKEDITOR.editor.prototype;CKEDITOR.editor=a;var t=0,D={};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{addCommand:function(a,b){b.name=a.toLowerCase();var c=new CKEDITOR.command(this,b);this.mode&&e(this,c);return this.commands[a]=c},_attachToForm:function(){function a(b){c.updateElement();c._.required&&!d.getValue()&&!1===c.fire("required")&&b.data.preventDefault()}
-function b(a){return!!(a&&a.call&&a.apply)}var c=this,d=c.element,e=new CKEDITOR.dom.element(d.$.form);d.is("textarea")&&e&&(e.on("submit",a),b(e.$.submit)&&(e.$.submit=CKEDITOR.tools.override(e.$.submit,function(b){return function(){a();b.apply?b.apply(this):b()}})),c.on("destroy",function(){e.removeListener("submit",a)}))},destroy:function(a){this.fire("beforeDestroy");!a&&A.call(this);this.editable(null);this.filter&&(this.filter.destroy(),delete this.filter);delete this.activeFilter;this.status=
+a.activeShiftEnterMode=a.shiftEnterMode=a.blockless?CKEDITOR.ENTER_BR:c.shiftEnterMode;c.skin&&(CKEDITOR.skinName=c.skin);a.fireOnce("configLoaded");a.dataProcessor=new CKEDITOR.htmlDataProcessor(a);a.filter=a.activeFilter=new CKEDITOR.filter(a);p(a)});b&&null!=b.customConfig&&(a.config.customConfig=b.customConfig);k(a)||a.fireOnce("customConfigLoaded")}function p(a){CKEDITOR.skin.loadPart("editor",function(){r(a)})}function r(a){CKEDITOR.lang.load(a.config.language,a.config.defaultLanguage,function(b,
+c){var d=a.config.title;a.langCode=b;a.lang=CKEDITOR.tools.prototypedCopy(c);a.title="string"==typeof d||!1===d?d:[a.lang.editor,a.name].join(", ");a.config.contentsLangDirection||(a.config.contentsLangDirection=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.element.getDirection(1):a.lang.dir);a.fire("langLoaded");f(a)})}function f(a){a.getStylesSet(function(b){a.once("loaded",function(){a.fire("stylesSet",{styles:b})},null,null,1);B(a)})}function B(a){var b=a.config,c=b.plugins,d=b.extraPlugins,e=
+b.removePlugins;if(d)var l=new RegExp("(?:^|,)(?:"+d.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),c=c.replace(l,""),c=c+(","+d);if(e)var q=new RegExp("(?:^|,)(?:"+e.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),c=c.replace(q,"");CKEDITOR.env.air&&(c+=",adobeair");CKEDITOR.plugins.load(c.split(","),function(c){var d=[],l=[],e=[];a.plugins=c;for(var f in c){var g=c[f],k=g.lang,h=null,p=g.requires,r;CKEDITOR.tools.isArray(p)&&(p=p.join(","));if(p&&(r=p.match(q)))for(;p=r.pop();)CKEDITOR.error("editor-plugin-required",
+{plugin:p.replace(",",""),requiredBy:f});k&&!a.lang[f]&&(k.split&&(k=k.split(",")),0<=CKEDITOR.tools.indexOf(k,a.langCode)?h=a.langCode:(h=a.langCode.replace(/-.*/,""),h=h!=a.langCode&&0<=CKEDITOR.tools.indexOf(k,h)?h:0<=CKEDITOR.tools.indexOf(k,"en")?"en":k[0]),g.langEntries&&g.langEntries[h]?(a.lang[f]=g.langEntries[h],h=null):e.push(CKEDITOR.getUrl(g.path+"lang/"+h+".js")));l.push(h);d.push(g)}CKEDITOR.scriptLoader.load(e,function(){for(var c=["beforeInit","init","afterInit"],e=0;e<c.length;e++)for(var q=
+0;q<d.length;q++){var n=d[q];0===e&&l[q]&&n.lang&&n.langEntries&&(a.lang[n.name]=n.langEntries[l[q]]);if(n[c[e]])n[c[e]](a)}a.fireOnce("pluginsLoaded");b.keystrokes&&a.setKeystroke(a.config.keystrokes);for(q=0;q<a.config.blockedKeystrokes.length;q++)a.keystrokeHandler.blockedKeystrokes[a.config.blockedKeystrokes[q]]=1;a.status="loaded";a.fireOnce("loaded");CKEDITOR.fire("instanceLoaded",null,a)})})}function u(){var a=this.element;if(a&&this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO){var b=this.getData();
+this.config.htmlEncodeOutput&&(b=CKEDITOR.tools.htmlEncode(b));a.is("textarea")?a.setValue(b):a.setHtml(b);return!0}return!1}a.prototype=CKEDITOR.editor.prototype;CKEDITOR.editor=a;var z=0,y={};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{addCommand:function(a,b){b.name=a.toLowerCase();var c=new CKEDITOR.command(this,b);this.mode&&e(this,c);return this.commands[a]=c},_attachToForm:function(){function a(b){c.updateElement();c._.required&&!d.getValue()&&!1===c.fire("required")&&b.data.preventDefault()}
+function b(a){return!!(a&&a.call&&a.apply)}var c=this,d=c.element,e=new CKEDITOR.dom.element(d.$.form);d.is("textarea")&&e&&(e.on("submit",a),b(e.$.submit)&&(e.$.submit=CKEDITOR.tools.override(e.$.submit,function(b){return function(){a();b.apply?b.apply(this):b()}})),c.on("destroy",function(){e.removeListener("submit",a)}))},destroy:function(a){this.fire("beforeDestroy");!a&&u.call(this);this.editable(null);this.filter&&(this.filter.destroy(),delete this.filter);delete this.activeFilter;this.status=
 "destroyed";this.fire("destroy");this.removeAllListeners();CKEDITOR.remove(this);CKEDITOR.fire("instanceDestroyed",null,this)},elementPath:function(a){if(!a){a=this.getSelection();if(!a)return null;a=a.getStartElement()}return a?new CKEDITOR.dom.elementPath(a,this.editable()):null},createRange:function(){var a=this.editable();return a?new CKEDITOR.dom.range(a):null},execCommand:function(a,b){var c=this.getCommand(a),d={name:a,commandData:b,command:c};return c&&c.state!=CKEDITOR.TRISTATE_DISABLED&&
 !1!==this.fire("beforeCommandExec",d)&&(d.returnValue=c.exec(d.commandData),!c.async&&!1!==this.fire("afterCommandExec",d))?d.returnValue:!1},getCommand:function(a){return this.commands[a]},getData:function(a){!a&&this.fire("beforeGetData");var b=this._.data;"string"!=typeof b&&(b=(b=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?b.is("textarea")?b.getValue():b.getHtml():"");b={dataValue:b};!a&&this.fire("getData",b);return b.dataValue},getSnapshot:function(){var a=this.fire("getSnapshot");
 "string"!=typeof a&&(a=(a=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.is("textarea")?a.getValue():a.getHtml():"");return a},loadSnapshot:function(a){this.fire("loadSnapshot",a)},setData:function(a,b,c){var d=!0,e=b;b&&"object"==typeof b&&(c=b.internal,e=b.callback,d=!b.noSnapshot);!c&&d&&this.fire("saveSnapshot");if(e||!c)this.once("dataReady",function(a){!c&&d&&this.fire("saveSnapshot");e&&e.call(a.editor)});a={dataValue:a};!c&&this.fire("setData",a);this._.data=a.dataValue;
 !c&&this.fire("afterSetData",a)},setReadOnly:function(a){a=null==a||a;this.readOnly!=a&&(this.readOnly=a,this.keystrokeHandler.blockedKeystrokes[8]=+a,this.editable().setReadOnly(a),this.fire("readOnly"))},insertHtml:function(a,b,c){this.fire("insertHtml",{dataValue:a,mode:b,range:c})},insertText:function(a){this.fire("insertText",a)},insertElement:function(a){this.fire("insertElement",a)},getSelectedHtml:function(a){var b=this.editable(),c=this.getSelection(),c=c&&c.getRanges();if(!b||!c||0===c.length)return null;
-for(var d=new CKEDITOR.dom.documentFragment,e,h,n,m=0;m<c.length;m++){var f=c[m],g=f.startContainer;g.getName&&"tr"==g.getName()?(e||(e=g.getAscendant("table").clone(),e.append(g.getAscendant("tbody").clone()),d.append(e),e=e.findOne("tbody")),h&&h.equals(g)||(h=g,n=g.clone(),e.append(n)),n.append(f.cloneContents())):d.append(f.cloneContents())}b=e?d:b.getHtmlFromRange(c[0]);return a?b.getHtml():b},extractSelectedHtml:function(a,b){var c=this.editable(),d=this.getSelection().getRanges();if(!c||0===
-d.length)return null;d=d[0];c=c.extractHtmlFromRange(d,b);b||this.getSelection().selectRanges([d]);return a?c.getHtml():c},focus:function(){this.fire("beforeFocus")},checkDirty:function(){return"ready"==this.status&&this._.previousValue!==this.getSnapshot()},resetDirty:function(){this._.previousValue=this.getSnapshot()},updateElement:function(){return A.call(this)},setKeystroke:function(){for(var a=this.keystrokeHandler.keystrokes,b=CKEDITOR.tools.isArray(arguments[0])?arguments[0]:[[].slice.call(arguments,
-0)],c,d,e=b.length;e--;)c=b[e],d=0,CKEDITOR.tools.isArray(c)&&(d=c[1],c=c[0]),d?a[c]=d:delete a[c]},addFeature:function(a){return this.filter.addFeature(a)},setActiveFilter:function(a){a||(a=this.filter);this.activeFilter!==a&&(this.activeFilter=a,this.fire("activeFilterChange"),a===this.filter?this.setActiveEnterMode(null,null):this.setActiveEnterMode(a.getAllowedEnterMode(this.enterMode),a.getAllowedEnterMode(this.shiftEnterMode,!0)))},setActiveEnterMode:function(a,b){a=a?this.blockless?CKEDITOR.ENTER_BR:
-a:this.enterMode;b=b?this.blockless?CKEDITOR.ENTER_BR:b:this.shiftEnterMode;if(this.activeEnterMode!=a||this.activeShiftEnterMode!=b)this.activeEnterMode=a,this.activeShiftEnterMode=b,this.fire("activeEnterModeChange")},showNotification:function(a){alert(a)}})})();CKEDITOR.ELEMENT_MODE_NONE=0;CKEDITOR.ELEMENT_MODE_REPLACE=1;CKEDITOR.ELEMENT_MODE_APPENDTO=2;CKEDITOR.ELEMENT_MODE_INLINE=3;CKEDITOR.htmlParser=function(){this._={htmlPartsRegex:/<(?:(?:\/([^>]+)>)|(?:!--([\S|\s]*?)--\x3e)|(?:([^\/\s>]+)((?:\s+[\w\-:.]+(?:\s*=\s*?(?:(?:"[^"]*")|(?:'[^']*')|[^\s"'\/>]+))?)*)[\S\s]*?(\/?)>))/g}};
-(function(){var a=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,d={checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};CKEDITOR.htmlParser.prototype={onTagOpen:function(){},onTagClose:function(){},onText:function(){},onCDATA:function(){},onComment:function(){},parse:function(b){for(var c,e,g=0,l;c=this._.htmlPartsRegex.exec(b);){e=c.index;if(e>g)if(g=b.substring(g,e),l)l.push(g);else this.onText(g);
-g=this._.htmlPartsRegex.lastIndex;if(e=c[1])if(e=e.toLowerCase(),l&&CKEDITOR.dtd.$cdata[e]&&(this.onCDATA(l.join("")),l=null),!l){this.onTagClose(e);continue}if(l)l.push(c[0]);else if(e=c[3]){if(e=e.toLowerCase(),!/="/.test(e)){var k={},q,w=c[4];c=!!c[5];if(w)for(;q=a.exec(w);){var f=q[1].toLowerCase();q=q[2]||q[3]||q[4]||"";k[f]=!q&&d[f]?f:CKEDITOR.tools.htmlDecodeAttr(q)}this.onTagOpen(e,k,c);!l&&CKEDITOR.dtd.$cdata[e]&&(l=[])}}else if(e=c[2])this.onComment(e)}if(b.length>g)this.onText(b.substring(g,
+for(var d=new CKEDITOR.dom.documentFragment,e,l,q,n=0;n<c.length;n++){var f=c[n],g=f.startContainer;g.getName&&"tr"==g.getName()?(e||(e=g.getAscendant("table").clone(),e.append(g.getAscendant("tbody").clone()),d.append(e),e=e.findOne("tbody")),l&&l.equals(g)||(l=g,q=g.clone(),e.append(q)),q.append(f.cloneContents())):d.append(f.cloneContents())}b=e?d:b.getHtmlFromRange(c[0]);return a?b.getHtml():b},extractSelectedHtml:function(a,b){var c=this.editable(),d=this.getSelection().getRanges();if(!c||0===
+d.length)return null;d=d[0];c=c.extractHtmlFromRange(d,b);b||this.getSelection().selectRanges([d]);return a?c.getHtml():c},focus:function(){this.fire("beforeFocus")},checkDirty:function(){return"ready"==this.status&&this._.previousValue!==this.getSnapshot()},resetDirty:function(){this._.previousValue=this.getSnapshot()},updateElement:function(){return u.call(this)},setKeystroke:function(){for(var a=this.keystrokeHandler.keystrokes,b=CKEDITOR.tools.isArray(arguments[0])?arguments[0]:[[].slice.call(arguments,
+0)],c,d,e=b.length;e--;)c=b[e],d=0,CKEDITOR.tools.isArray(c)&&(d=c[1],c=c[0]),d?a[c]=d:delete a[c]},getCommandKeystroke:function(a){var b=a.name,c=this.keystrokeHandler.keystrokes,d;if(a.fakeKeystroke)return a.fakeKeystroke;for(d in c)if(c.hasOwnProperty(d)&&c[d]==b)return d;return null},addFeature:function(a){return this.filter.addFeature(a)},setActiveFilter:function(a){a||(a=this.filter);this.activeFilter!==a&&(this.activeFilter=a,this.fire("activeFilterChange"),a===this.filter?this.setActiveEnterMode(null,
+null):this.setActiveEnterMode(a.getAllowedEnterMode(this.enterMode),a.getAllowedEnterMode(this.shiftEnterMode,!0)))},setActiveEnterMode:function(a,b){a=a?this.blockless?CKEDITOR.ENTER_BR:a:this.enterMode;b=b?this.blockless?CKEDITOR.ENTER_BR:b:this.shiftEnterMode;if(this.activeEnterMode!=a||this.activeShiftEnterMode!=b)this.activeEnterMode=a,this.activeShiftEnterMode=b,this.fire("activeEnterModeChange")},showNotification:function(a){alert(a)}})})();CKEDITOR.ELEMENT_MODE_NONE=0;
+CKEDITOR.ELEMENT_MODE_REPLACE=1;CKEDITOR.ELEMENT_MODE_APPENDTO=2;CKEDITOR.ELEMENT_MODE_INLINE=3;CKEDITOR.htmlParser=function(){this._={htmlPartsRegex:/<(?:(?:\/([^>]+)>)|(?:!--([\S|\s]*?)--\x3e)|(?:([^\/\s>]+)((?:\s+[\w\-:.]+(?:\s*=\s*?(?:(?:"[^"]*")|(?:'[^']*')|[^\s"'\/>]+))?)*)[\S\s]*?(\/?)>))/g}};
+(function(){var a=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,d={checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};CKEDITOR.htmlParser.prototype={onTagOpen:function(){},onTagClose:function(){},onText:function(){},onCDATA:function(){},onComment:function(){},parse:function(b){for(var c,e,g=0,k;c=this._.htmlPartsRegex.exec(b);){e=c.index;if(e>g)if(g=b.substring(g,e),k)k.push(g);else this.onText(g);
+g=this._.htmlPartsRegex.lastIndex;if(e=c[1])if(e=e.toLowerCase(),k&&CKEDITOR.dtd.$cdata[e]&&(this.onCDATA(k.join("")),k=null),!k){this.onTagClose(e);continue}if(k)k.push(c[0]);else if(e=c[3]){if(e=e.toLowerCase(),!/="/.test(e)){var h={},p,r=c[4];c=!!c[5];if(r)for(;p=a.exec(r);){var f=p[1].toLowerCase();p=p[2]||p[3]||p[4]||"";h[f]=!p&&d[f]?f:CKEDITOR.tools.htmlDecodeAttr(p)}this.onTagOpen(e,h,c);!k&&CKEDITOR.dtd.$cdata[e]&&(k=[])}}else if(e=c[2])this.onComment(e)}if(b.length>g)this.onText(b.substring(g,
 b.length))}}})();
 CKEDITOR.htmlParser.basicWriter=CKEDITOR.tools.createClass({$:function(){this._={output:[]}},proto:{openTag:function(a){this._.output.push("\x3c",a)},openTagClose:function(a,d){d?this._.output.push(" /\x3e"):this._.output.push("\x3e")},attribute:function(a,d){"string"==typeof d&&(d=CKEDITOR.tools.htmlEncodeAttr(d));this._.output.push(" ",a,'\x3d"',d,'"')},closeTag:function(a){this._.output.push("\x3c/",a,"\x3e")},text:function(a){this._.output.push(a)},comment:function(a){this._.output.push("\x3c!--",a,
 "--\x3e")},write:function(a){this._.output.push(a)},reset:function(){this._.output=[];this._.indent=!1},getHtml:function(a){var d=this._.output.join("");a&&this.reset();return d}}});"use strict";
@@ -269,234 +285,235 @@ CKEDITOR.htmlParser.comment.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlPar
 (function(){CKEDITOR.htmlParser.text=function(a){this.value=a;this._={isBlockLike:!1}};CKEDITOR.htmlParser.text.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(a,d){if(!(this.value=a.onText(d,this.value,this)))return this.remove(),!1},writeHtml:function(a,d){d&&this.filter(d);a.text(this.value)}})})();"use strict";
 (function(){CKEDITOR.htmlParser.cdata=function(a){this.value=a};CKEDITOR.htmlParser.cdata.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(){},writeHtml:function(a){a.write(this.value)}})})();"use strict";CKEDITOR.htmlParser.fragment=function(){this.children=[];this.parent=null;this._={isBlockLike:!0,hasInlineStarted:!1}};
 (function(){function a(a){return a.attributes["data-cke-survive"]?!1:"a"==a.name&&a.attributes.href||CKEDITOR.dtd.$removeEmpty[a.name]}var d=CKEDITOR.tools.extend({table:1,ul:1,ol:1,dl:1},CKEDITOR.dtd.table,CKEDITOR.dtd.ul,CKEDITOR.dtd.ol,CKEDITOR.dtd.dl),b={ol:1,ul:1},c=CKEDITOR.tools.extend({},{html:1},CKEDITOR.dtd.html,CKEDITOR.dtd.body,CKEDITOR.dtd.head,{style:1,script:1}),e={ul:"li",ol:"li",dl:"dd",table:"tbody",tbody:"tr",thead:"tr",tfoot:"tr",tr:"td"};CKEDITOR.htmlParser.fragment.fromHtml=
-function(g,l,k){function q(a){var b;if(0<x.length)for(var c=0;c<x.length;c++){var d=x[c],h=d.name,e=CKEDITOR.dtd[h],f=u.name&&CKEDITOR.dtd[u.name];f&&!f[h]||a&&e&&!e[a]&&CKEDITOR.dtd[a]?h==u.name&&(y(u,u.parent,1),c--):(b||(w(),b=1),d=d.clone(),d.parent=u,u=d,x.splice(c,1),c--)}}function w(){for(;G.length;)y(G.shift(),u)}function f(a){if(a._.isBlockLike&&"pre"!=a.name&&"textarea"!=a.name){var b=a.children.length,c=a.children[b-1],d;c&&c.type==CKEDITOR.NODE_TEXT&&((d=CKEDITOR.tools.rtrim(c.value))?
-c.value=d:a.children.length=b-1)}}function y(b,c,d){c=c||u||p;var e=u;void 0===b.previous&&(A(c,b)&&(u=c,D.onTagOpen(k,{}),b.returnPoint=c=u),f(b),a(b)&&!b.children.length||c.add(b),"pre"==b.name&&(h=!1),"textarea"==b.name&&(r=!1));b.returnPoint?(u=b.returnPoint,delete b.returnPoint):u=d?c:e}function A(a,b){if((a==p||"body"==a.name)&&k&&(!a.name||CKEDITOR.dtd[a.name][k])){var c,d;return(c=b.attributes&&(d=b.attributes["data-cke-real-element-type"])?d:b.name)&&c in CKEDITOR.dtd.$inline&&!(c in CKEDITOR.dtd.head)&&
-!b.isOrphan||b.type==CKEDITOR.NODE_TEXT}}function t(a,b){return a in CKEDITOR.dtd.$listItem||a in CKEDITOR.dtd.$tableContent?a==b||"dt"==a&&"dd"==b||"dd"==a&&"dt"==b:!1}var D=new CKEDITOR.htmlParser,p=l instanceof CKEDITOR.htmlParser.element?l:"string"==typeof l?new CKEDITOR.htmlParser.element(l):new CKEDITOR.htmlParser.fragment,x=[],G=[],u=p,r="textarea"==p.name,h="pre"==p.name;D.onTagOpen=function(e,m,f,g){m=new CKEDITOR.htmlParser.element(e,m);m.isUnknown&&f&&(m.isEmpty=!0);m.isOptionalClose=g;
-if(a(m))x.push(m);else{if("pre"==e)h=!0;else{if("br"==e&&h){u.add(new CKEDITOR.htmlParser.text("\n"));return}"textarea"==e&&(r=!0)}if("br"==e)G.push(m);else{for(;!(g=(f=u.name)?CKEDITOR.dtd[f]||(u._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):c,m.isUnknown||u.isUnknown||g[e]);)if(u.isOptionalClose)D.onTagClose(f);else if(e in b&&f in b)f=u.children,(f=f[f.length-1])&&"li"==f.name||y(f=new CKEDITOR.htmlParser.element("li"),u),!m.returnPoint&&(m.returnPoint=u),u=f;else if(e in CKEDITOR.dtd.$listItem&&
-!t(e,f))D.onTagOpen("li"==e?"ul":"dl",{},0,1);else if(f in d&&!t(e,f))!m.returnPoint&&(m.returnPoint=u),u=u.parent;else if(f in CKEDITOR.dtd.$inline&&x.unshift(u),u.parent)y(u,u.parent,1);else{m.isOrphan=1;break}q(e);w();m.parent=u;m.isEmpty?y(m):u=m}}};D.onTagClose=function(a){for(var b=x.length-1;0<=b;b--)if(a==x[b].name){x.splice(b,1);return}for(var c=[],d=[],h=u;h!=p&&h.name!=a;)h._.isBlockLike||d.unshift(h),c.push(h),h=h.returnPoint||h.parent;if(h!=p){for(b=0;b<c.length;b++){var e=c[b];y(e,e.parent)}u=
-h;h._.isBlockLike&&w();y(h,h.parent);h==u&&(u=u.parent);x=x.concat(d)}"body"==a&&(k=!1)};D.onText=function(a){if(!(u._.hasInlineStarted&&!G.length||h||r)&&(a=CKEDITOR.tools.ltrim(a),0===a.length))return;var b=u.name,f=b?CKEDITOR.dtd[b]||(u._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):c;if(!r&&!f["#"]&&b in d)D.onTagOpen(e[b]||""),D.onText(a);else{w();q();h||r||(a=a.replace(/[\t\r\n ]{2,}|[\t\r\n]/g," "));a=new CKEDITOR.htmlParser.text(a);if(A(u,a))this.onTagOpen(k,{},0,1);u.add(a)}};D.onCDATA=
-function(a){u.add(new CKEDITOR.htmlParser.cdata(a))};D.onComment=function(a){w();q();u.add(new CKEDITOR.htmlParser.comment(a))};D.parse(g);for(w();u!=p;)y(u,u.parent,1);f(p);return p};CKEDITOR.htmlParser.fragment.prototype={type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,add:function(a,b){isNaN(b)&&(b=this.children.length);var c=0<b?this.children[b-1]:null;if(c){if(a._.isBlockLike&&c.type==CKEDITOR.NODE_TEXT&&(c.value=CKEDITOR.tools.rtrim(c.value),0===c.value.length)){this.children.pop();this.add(a);return}c.next=
+function(g,k,h){function p(a){var b;if(0<x.length)for(var c=0;c<x.length;c++){var d=x[c],l=d.name,e=CKEDITOR.dtd[l],f=w.name&&CKEDITOR.dtd[w.name];f&&!f[l]||a&&e&&!e[a]&&CKEDITOR.dtd[a]?l==w.name&&(B(w,w.parent,1),c--):(b||(r(),b=1),d=d.clone(),d.parent=w,w=d,x.splice(c,1),c--)}}function r(){for(;J.length;)B(J.shift(),w)}function f(a){if(a._.isBlockLike&&"pre"!=a.name&&"textarea"!=a.name){var b=a.children.length,c=a.children[b-1],d;c&&c.type==CKEDITOR.NODE_TEXT&&((d=CKEDITOR.tools.rtrim(c.value))?
+c.value=d:a.children.length=b-1)}}function B(b,c,d){c=c||w||m;var e=w;void 0===b.previous&&(u(c,b)&&(w=c,y.onTagOpen(h,{}),b.returnPoint=c=w),f(b),a(b)&&!b.children.length||c.add(b),"pre"==b.name&&(l=!1),"textarea"==b.name&&(F=!1));b.returnPoint?(w=b.returnPoint,delete b.returnPoint):w=d?c:e}function u(a,b){if((a==m||"body"==a.name)&&h&&(!a.name||CKEDITOR.dtd[a.name][h])){var c,d;return(c=b.attributes&&(d=b.attributes["data-cke-real-element-type"])?d:b.name)&&c in CKEDITOR.dtd.$inline&&!(c in CKEDITOR.dtd.head)&&
+!b.isOrphan||b.type==CKEDITOR.NODE_TEXT}}function z(a,b){return a in CKEDITOR.dtd.$listItem||a in CKEDITOR.dtd.$tableContent?a==b||"dt"==a&&"dd"==b||"dd"==a&&"dt"==b:!1}var y=new CKEDITOR.htmlParser,m=k instanceof CKEDITOR.htmlParser.element?k:"string"==typeof k?new CKEDITOR.htmlParser.element(k):new CKEDITOR.htmlParser.fragment,x=[],J=[],w=m,F="textarea"==m.name,l="pre"==m.name;y.onTagOpen=function(e,n,f,g){n=new CKEDITOR.htmlParser.element(e,n);n.isUnknown&&f&&(n.isEmpty=!0);n.isOptionalClose=g;
+if(a(n))x.push(n);else{if("pre"==e)l=!0;else{if("br"==e&&l){w.add(new CKEDITOR.htmlParser.text("\n"));return}"textarea"==e&&(F=!0)}if("br"==e)J.push(n);else{for(;!(g=(f=w.name)?CKEDITOR.dtd[f]||(w._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):c,n.isUnknown||w.isUnknown||g[e]);)if(w.isOptionalClose)y.onTagClose(f);else if(e in b&&f in b)f=w.children,(f=f[f.length-1])&&"li"==f.name||B(f=new CKEDITOR.htmlParser.element("li"),w),!n.returnPoint&&(n.returnPoint=w),w=f;else if(e in CKEDITOR.dtd.$listItem&&
+!z(e,f))y.onTagOpen("li"==e?"ul":"dl",{},0,1);else if(f in d&&!z(e,f))!n.returnPoint&&(n.returnPoint=w),w=w.parent;else if(f in CKEDITOR.dtd.$inline&&x.unshift(w),w.parent)B(w,w.parent,1);else{n.isOrphan=1;break}p(e);r();n.parent=w;n.isEmpty?B(n):w=n}}};y.onTagClose=function(a){for(var b=x.length-1;0<=b;b--)if(a==x[b].name){x.splice(b,1);return}for(var c=[],d=[],l=w;l!=m&&l.name!=a;)l._.isBlockLike||d.unshift(l),c.push(l),l=l.returnPoint||l.parent;if(l!=m){for(b=0;b<c.length;b++){var e=c[b];B(e,e.parent)}w=
+l;l._.isBlockLike&&r();B(l,l.parent);l==w&&(w=w.parent);x=x.concat(d)}"body"==a&&(h=!1)};y.onText=function(a){if(!(w._.hasInlineStarted&&!J.length||l||F)&&(a=CKEDITOR.tools.ltrim(a),0===a.length))return;var b=w.name,f=b?CKEDITOR.dtd[b]||(w._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):c;if(!F&&!f["#"]&&b in d)y.onTagOpen(e[b]||""),y.onText(a);else{r();p();l||F||(a=a.replace(/[\t\r\n ]{2,}|[\t\r\n]/g," "));a=new CKEDITOR.htmlParser.text(a);if(u(w,a))this.onTagOpen(h,{},0,1);w.add(a)}};y.onCDATA=
+function(a){w.add(new CKEDITOR.htmlParser.cdata(a))};y.onComment=function(a){r();p();w.add(new CKEDITOR.htmlParser.comment(a))};y.parse(g);for(r();w!=m;)B(w,w.parent,1);f(m);return m};CKEDITOR.htmlParser.fragment.prototype={type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,add:function(a,b){isNaN(b)&&(b=this.children.length);var c=0<b?this.children[b-1]:null;if(c){if(a._.isBlockLike&&c.type==CKEDITOR.NODE_TEXT&&(c.value=CKEDITOR.tools.rtrim(c.value),0===c.value.length)){this.children.pop();this.add(a);return}c.next=
 a}a.previous=c;a.parent=this;this.children.splice(b,0,a);this._.hasInlineStarted||(this._.hasInlineStarted=a.type==CKEDITOR.NODE_TEXT||a.type==CKEDITOR.NODE_ELEMENT&&!a._.isBlockLike)},filter:function(a,b){b=this.getFilterContext(b);a.onRoot(b,this);this.filterChildren(a,!1,b)},filterChildren:function(a,b,c){if(this.childrenFilteredBy!=a.id){c=this.getFilterContext(c);if(b&&!this.parent)a.onRoot(c,this);this.childrenFilteredBy=a.id;for(b=0;b<this.children.length;b++)!1===this.children[b].filter(a,
 c)&&b--}},writeHtml:function(a,b){b&&this.filter(b);this.writeChildrenHtml(a)},writeChildrenHtml:function(a,b,c){var d=this.getFilterContext();if(c&&!this.parent&&b)b.onRoot(d,this);b&&this.filterChildren(b,!1,d);b=0;c=this.children;for(d=c.length;b<d;b++)c[b].writeHtml(a)},forEach:function(a,b,c){if(!(c||b&&this.type!=b))var d=a(this);if(!1!==d){c=this.children;for(var e=0;e<c.length;e++)d=c[e],d.type==CKEDITOR.NODE_ELEMENT?d.forEach(a,b):b&&d.type!=b||a(d)}},getFilterContext:function(a){return a||
 {}}}})();"use strict";
-(function(){function a(){this.rules=[]}function d(b,c,d,g){var l,k;for(l in c)(k=b[l])||(k=b[l]=new a),k.add(c[l],d,g)}CKEDITOR.htmlParser.filter=CKEDITOR.tools.createClass({$:function(b){this.id=CKEDITOR.tools.getNextNumber();this.elementNameRules=new a;this.attributeNameRules=new a;this.elementsRules={};this.attributesRules={};this.textRules=new a;this.commentRules=new a;this.rootRules=new a;b&&this.addRules(b,10)},proto:{addRules:function(a,c){var e;"number"==typeof c?e=c:c&&"priority"in c&&(e=
+(function(){function a(){this.rules=[]}function d(b,c,d,g){var k,h;for(k in c)(h=b[k])||(h=b[k]=new a),h.add(c[k],d,g)}CKEDITOR.htmlParser.filter=CKEDITOR.tools.createClass({$:function(b){this.id=CKEDITOR.tools.getNextNumber();this.elementNameRules=new a;this.attributeNameRules=new a;this.elementsRules={};this.attributesRules={};this.textRules=new a;this.commentRules=new a;this.rootRules=new a;b&&this.addRules(b,10)},proto:{addRules:function(a,c){var e;"number"==typeof c?e=c:c&&"priority"in c&&(e=
 c.priority);"number"!=typeof e&&(e=10);"object"!=typeof c&&(c={});a.elementNames&&this.elementNameRules.addMany(a.elementNames,e,c);a.attributeNames&&this.attributeNameRules.addMany(a.attributeNames,e,c);a.elements&&d(this.elementsRules,a.elements,e,c);a.attributes&&d(this.attributesRules,a.attributes,e,c);a.text&&this.textRules.add(a.text,e,c);a.comment&&this.commentRules.add(a.comment,e,c);a.root&&this.rootRules.add(a.root,e,c)},applyTo:function(a){a.filter(this)},onElementName:function(a,c){return this.elementNameRules.execOnName(a,
-c)},onAttributeName:function(a,c){return this.attributeNameRules.execOnName(a,c)},onText:function(a,c,d){return this.textRules.exec(a,c,d)},onComment:function(a,c,d){return this.commentRules.exec(a,c,d)},onRoot:function(a,c){return this.rootRules.exec(a,c)},onElement:function(a,c){for(var d=[this.elementsRules["^"],this.elementsRules[c.name],this.elementsRules.$],g,l=0;3>l;l++)if(g=d[l]){g=g.exec(a,c,this);if(!1===g)return null;if(g&&g!=c)return this.onNode(a,g);if(c.parent&&!c.name)break}return c},
+c)},onAttributeName:function(a,c){return this.attributeNameRules.execOnName(a,c)},onText:function(a,c,d){return this.textRules.exec(a,c,d)},onComment:function(a,c,d){return this.commentRules.exec(a,c,d)},onRoot:function(a,c){return this.rootRules.exec(a,c)},onElement:function(a,c){for(var d=[this.elementsRules["^"],this.elementsRules[c.name],this.elementsRules.$],g,k=0;3>k;k++)if(g=d[k]){g=g.exec(a,c,this);if(!1===g)return null;if(g&&g!=c)return this.onNode(a,g);if(c.parent&&!c.name)break}return c},
 onNode:function(a,c){var d=c.type;return d==CKEDITOR.NODE_ELEMENT?this.onElement(a,c):d==CKEDITOR.NODE_TEXT?new CKEDITOR.htmlParser.text(this.onText(a,c.value)):d==CKEDITOR.NODE_COMMENT?new CKEDITOR.htmlParser.comment(this.onComment(a,c.value)):null},onAttribute:function(a,c,d,g){return(d=this.attributesRules[d])?d.exec(a,g,c,this):g}}});CKEDITOR.htmlParser.filterRulesGroup=a;a.prototype={add:function(a,c,d){this.rules.splice(this.findIndex(c),0,{value:a,priority:c,options:d})},addMany:function(a,
-c,d){for(var g=[this.findIndex(c),0],l=0,k=a.length;l<k;l++)g.push({value:a[l],priority:c,options:d});this.rules.splice.apply(this.rules,g)},findIndex:function(a){for(var c=this.rules,d=c.length-1;0<=d&&a<c[d].priority;)d--;return d+1},exec:function(a,c){var d=c instanceof CKEDITOR.htmlParser.node||c instanceof CKEDITOR.htmlParser.fragment,g=Array.prototype.slice.call(arguments,1),l=this.rules,k=l.length,q,w,f,y;for(y=0;y<k;y++)if(d&&(q=c.type,w=c.name),f=l[y],!(a.nonEditable&&!f.options.applyToAll||
-a.nestedEditable&&f.options.excludeNestedEditable)){f=f.value.apply(null,g);if(!1===f||d&&f&&(f.name!=w||f.type!=q))return f;null!=f&&(g[0]=c=f)}return c},execOnName:function(a,c){for(var d=0,g=this.rules,l=g.length,k;c&&d<l;d++)k=g[d],a.nonEditable&&!k.options.applyToAll||a.nestedEditable&&k.options.excludeNestedEditable||(c=c.replace(k.value[0],k.value[1]));return c}}})();
-(function(){function a(a,d){function m(a){return a||CKEDITOR.env.needsNbspFiller?new CKEDITOR.htmlParser.text(" "):new CKEDITOR.htmlParser.element("br",{"data-cke-bogus":1})}function n(a,d){return function(h){if(h.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var e=[],n=b(h),r,F;if(n)for(f(n,1)&&e.push(n);n;)g(n)&&(r=c(n))&&f(r)&&((F=c(r))&&!g(F)?e.push(r):(m(v).insertAfter(r),r.remove())),n=n.previous;for(n=0;n<e.length;n++)e[n].remove();if(e=!a||!1!==("function"==typeof d?d(h):d))v||CKEDITOR.env.needsBrFiller||
-h.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT?v||CKEDITOR.env.needsBrFiller||!(7<document.documentMode||h.name in CKEDITOR.dtd.tr||h.name in CKEDITOR.dtd.$listItem)?(e=b(h),e=!e||"form"==h.name&&"input"==e.name):e=!1:e=!1;e&&h.add(m(a))}}}function f(a,b){if((!v||CKEDITOR.env.needsBrFiller)&&a.type==CKEDITOR.NODE_ELEMENT&&"br"==a.name&&!a.attributes["data-cke-eol"])return!0;var c;return a.type==CKEDITOR.NODE_TEXT&&(c=a.value.match(x))&&(c.index&&((new CKEDITOR.htmlParser.text(a.value.substring(0,c.index))).insertBefore(a),
-a.value=c[0]),!CKEDITOR.env.needsBrFiller&&v&&(!b||a.parent.name in z)||!v&&((c=a.previous)&&"br"==c.name||!c||g(c)))?!0:!1}var r={elements:{}},v="html"==d,z=CKEDITOR.tools.extend({},h),E;for(E in z)"#"in u[E]||delete z[E];for(E in z)r.elements[E]=n(v,a.config.fillEmptyBlocks);r.root=n(v,!1);r.elements.br=function(a){return function(b){if(b.parent.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var d=b.attributes;if("data-cke-bogus"in d||"data-cke-eol"in d)delete d["data-cke-bogus"];else{for(d=b.next;d&&e(d);)d=
-d.next;var h=c(b);!d&&g(b.parent)?l(b.parent,m(a)):g(d)&&h&&!g(h)&&m(a).insertBefore(d)}}}}(v);return r}function d(a,b){return a!=CKEDITOR.ENTER_BR&&!1!==b?a==CKEDITOR.ENTER_DIV?"div":"p":!1}function b(a){for(a=a.children[a.children.length-1];a&&e(a);)a=a.previous;return a}function c(a){for(a=a.previous;a&&e(a);)a=a.previous;return a}function e(a){return a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(a.value)||a.type==CKEDITOR.NODE_ELEMENT&&a.attributes["data-cke-bookmark"]}function g(a){return a&&
-(a.type==CKEDITOR.NODE_ELEMENT&&a.name in h||a.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)}function l(a,b){var c=a.children[a.children.length-1];a.children.push(b);b.parent=a;c&&(c.next=b,b.previous=c)}function k(a){a=a.attributes;"false"!=a.contenteditable&&(a["data-cke-editable"]=a.contenteditable?"true":1);a.contenteditable="false"}function q(a){a=a.attributes;switch(a["data-cke-editable"]){case "true":a.contenteditable="true";break;case "1":delete a.contenteditable}}function w(a){return a.replace(E,
-function(a,b,c){return"\x3c"+b+c.replace(C,function(a,b){return H.test(b)&&-1==c.indexOf("data-cke-saved-"+b)?" data-cke-saved-"+a+" data-cke-"+CKEDITOR.rnd+"-"+a:a})+"\x3e"})}function f(a,b){return a.replace(b,function(a,b,c){0===a.indexOf("\x3ctextarea")&&(a=b+t(c).replace(/</g,"\x26lt;").replace(/>/g,"\x26gt;")+"\x3c/textarea\x3e");return"\x3ccke:encoded\x3e"+encodeURIComponent(a)+"\x3c/cke:encoded\x3e"})}function y(a){return a.replace(Q,function(a,b){return decodeURIComponent(b)})}function A(a){return a.replace(/\x3c!--(?!{cke_protected})[\s\S]+?--\x3e/g,
-function(a){return"\x3c!--"+G+"{C}"+encodeURIComponent(a).replace(/--/g,"%2D%2D")+"--\x3e"})}function t(a){return a.replace(/\x3c!--\{cke_protected\}\{C\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)})}function D(a,b){var c=b._.dataStore;return a.replace(/\x3c!--\{cke_protected\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)}).replace(/\{cke_protected_(\d+)\}/g,function(a,b){return c&&c[b]||""})}function p(a,b){var c=[],d=b.config.protectedSource,h=b._.dataStore||(b._.dataStore=
-{id:1}),e=/<\!--\{cke_temp(comment)?\}(\d*?)--\x3e/g,d=[/<script[\s\S]*?(<\/script>|$)/gi,/<noscript[\s\S]*?<\/noscript>/gi,/<meta[\s\S]*?\/?>/gi].concat(d);a=a.replace(/\x3c!--[\s\S]*?--\x3e/g,function(a){return"\x3c!--{cke_tempcomment}"+(c.push(a)-1)+"--\x3e"});for(var m=0;m<d.length;m++)a=a.replace(d[m],function(a){a=a.replace(e,function(a,b,d){return c[d]});return/cke_temp(comment)?/.test(a)?a:"\x3c!--{cke_temp}"+(c.push(a)-1)+"--\x3e"});a=a.replace(e,function(a,b,d){return"\x3c!--"+G+(b?"{C}":
-"")+encodeURIComponent(c[d]).replace(/--/g,"%2D%2D")+"--\x3e"});a=a.replace(/<\w+(?:\s+(?:(?:[^\s=>]+\s*=\s*(?:[^'"\s>]+|'[^']*'|"[^"]*"))|[^\s=\/>]+))+\s*\/?>/g,function(a){return a.replace(/\x3c!--\{cke_protected\}([^>]*)--\x3e/g,function(a,b){h[h.id]=decodeURIComponent(b);return"{cke_protected_"+h.id++ +"}"})});return a=a.replace(/<(title|iframe|textarea)([^>]*)>([\s\S]*?)<\/\1>/g,function(a,c,d,h){return"\x3c"+c+d+"\x3e"+D(t(h),b)+"\x3c/"+c+"\x3e"})}CKEDITOR.htmlDataProcessor=function(b){var c,
-h,e=this;this.editor=b;this.dataFilter=c=new CKEDITOR.htmlParser.filter;this.htmlFilter=h=new CKEDITOR.htmlParser.filter;this.writer=new CKEDITOR.htmlParser.basicWriter;c.addRules(n);c.addRules(m,{applyToAll:!0});c.addRules(a(b,"data"),{applyToAll:!0});h.addRules(z);h.addRules(B,{applyToAll:!0});h.addRules(a(b,"html"),{applyToAll:!0});b.on("toHtml",function(a){a=a.data;var c=a.dataValue,h,c=p(c,b),c=f(c,T),c=w(c),c=f(c,R),c=c.replace(v,"$1cke:$2"),c=c.replace(J,"\x3ccke:$1$2\x3e\x3c/cke:$1\x3e"),
-c=c.replace(/(<pre\b[^>]*>)(\r\n|\n)/g,"$1$2$2"),c=c.replace(/([^a-z0-9<\-])(on\w{3,})(?!>)/gi,"$1data-cke-"+CKEDITOR.rnd+"-$2");h=a.context||b.editable().getName();var e;CKEDITOR.env.ie&&9>CKEDITOR.env.version&&"pre"==h&&(h="div",c="\x3cpre\x3e"+c+"\x3c/pre\x3e",e=1);h=b.document.createElement(h);h.setHtml("a"+c);c=h.getHtml().substr(1);c=c.replace(new RegExp("data-cke-"+CKEDITOR.rnd+"-","ig"),"");e&&(c=c.replace(/^<pre>|<\/pre>$/gi,""));c=c.replace(I,"$1$2");c=y(c);c=t(c);h=!1===a.fixForBody?!1:
-d(a.enterMode,b.config.autoParagraph);c=CKEDITOR.htmlParser.fragment.fromHtml(c,a.context,h);h&&(e=c,!e.children.length&&CKEDITOR.dtd[e.name][h]&&(h=new CKEDITOR.htmlParser.element(h),e.add(h)));a.dataValue=c},null,null,5);b.on("toHtml",function(a){a.data.filter.applyTo(a.data.dataValue,!0,a.data.dontFilter,a.data.enterMode)&&b.fire("dataFiltered")},null,null,6);b.on("toHtml",function(a){a.data.dataValue.filterChildren(e.dataFilter,!0)},null,null,10);b.on("toHtml",function(a){a=a.data;var b=a.dataValue,
-c=new CKEDITOR.htmlParser.basicWriter;b.writeChildrenHtml(c);b=c.getHtml(!0);a.dataValue=A(b)},null,null,15);b.on("toDataFormat",function(a){var c=a.data.dataValue;a.data.enterMode!=CKEDITOR.ENTER_BR&&(c=c.replace(/^<br *\/?>/i,""));a.data.dataValue=CKEDITOR.htmlParser.fragment.fromHtml(c,a.data.context,d(a.data.enterMode,b.config.autoParagraph))},null,null,5);b.on("toDataFormat",function(a){a.data.dataValue.filterChildren(e.htmlFilter,!0)},null,null,10);b.on("toDataFormat",function(a){a.data.filter.applyTo(a.data.dataValue,
-!1,!0)},null,null,11);b.on("toDataFormat",function(a){var c=a.data.dataValue,d=e.writer;d.reset();c.writeChildrenHtml(d);c=d.getHtml(!0);c=t(c);c=D(c,b);a.data.dataValue=c},null,null,15)};CKEDITOR.htmlDataProcessor.prototype={toHtml:function(a,b,c,d){var h=this.editor,e,m,n,f;b&&"object"==typeof b?(e=b.context,c=b.fixForBody,d=b.dontFilter,m=b.filter,n=b.enterMode,f=b.protectedWhitespaces):e=b;e||null===e||(e=h.editable().getName());return h.fire("toHtml",{dataValue:a,context:e,fixForBody:c,dontFilter:d,
-filter:m||h.filter,enterMode:n||h.enterMode,protectedWhitespaces:f}).dataValue},toDataFormat:function(a,b){var c,d,h;b&&(c=b.context,d=b.filter,h=b.enterMode);c||null===c||(c=this.editor.editable().getName());return this.editor.fire("toDataFormat",{dataValue:a,filter:d||this.editor.filter,context:c,enterMode:h||this.editor.enterMode}).dataValue}};var x=/(?:&nbsp;|\xa0)$/,G="{cke_protected}",u=CKEDITOR.dtd,r="caption colgroup col thead tfoot tbody".split(" "),h=CKEDITOR.tools.extend({},u.$blockLimit,
-u.$block),n={elements:{input:k,textarea:k}},m={attributeNames:[[/^on/,"data-cke-pa-on"],[/^data-cke-expando$/,""]]},z={elements:{embed:function(a){var b=a.parent;if(b&&"object"==b.name){var c=b.attributes.width,b=b.attributes.height;c&&(a.attributes.width=c);b&&(a.attributes.height=b)}},a:function(a){var b=a.attributes;if(!(a.children.length||b.name||b.id||a.attributes["data-cke-saved-name"]))return!1}}},B={elementNames:[[/^cke:/,""],[/^\?xml:namespace$/,""]],attributeNames:[[/^data-cke-(saved|pa)-/,
-""],[/^data-cke-.*/,""],["hidefocus",""]],elements:{$:function(a){var b=a.attributes;if(b){if(b["data-cke-temp"])return!1;for(var c=["name","href","src"],d,h=0;h<c.length;h++)d="data-cke-saved-"+c[h],d in b&&delete b[c[h]]}return a},table:function(a){a.children.slice(0).sort(function(a,b){var c,d;a.type==CKEDITOR.NODE_ELEMENT&&b.type==a.type&&(c=CKEDITOR.tools.indexOf(r,a.name),d=CKEDITOR.tools.indexOf(r,b.name));-1<c&&-1<d&&c!=d||(c=a.parent?a.getIndex():-1,d=b.parent?b.getIndex():-1);return c>d?
-1:-1})},param:function(a){a.children=[];a.isEmpty=!0;return a},span:function(a){"Apple-style-span"==a.attributes["class"]&&delete a.name},html:function(a){delete a.attributes.contenteditable;delete a.attributes["class"]},body:function(a){delete a.attributes.spellcheck;delete a.attributes.contenteditable},style:function(a){var b=a.children[0];b&&b.value&&(b.value=CKEDITOR.tools.trim(b.value));a.attributes.type||(a.attributes.type="text/css")},title:function(a){var b=a.children[0];!b&&l(a,b=new CKEDITOR.htmlParser.text);
-b.value=a.attributes["data-cke-title"]||""},input:q,textarea:q},attributes:{"class":function(a){return CKEDITOR.tools.ltrim(a.replace(/(?:^|\s+)cke_[^\s]*/g,""))||!1}}};CKEDITOR.env.ie&&(B.attributes.style=function(a){return a.replace(/(^|;)([^\:]+)/g,function(a){return a.toLowerCase()})});var E=/<(a|area|img|input|source)\b([^>]*)>/gi,C=/([\w-:]+)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,H=/^(href|src|name)$/i,R=/(?:<style(?=[ >])[^>]*>[\s\S]*?<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,
-T=/(<textarea(?=[ >])[^>]*>)([\s\S]*?)(?:<\/textarea>)/gi,Q=/<cke:encoded>([^<]*)<\/cke:encoded>/gi,v=/(<\/?)((?:object|embed|param|html|body|head|title)[^>]*>)/gi,I=/(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi,J=/<cke:(param|embed)([^>]*?)\/?>(?!\s*<\/cke:\1)/gi})();"use strict";
+c,d){for(var g=[this.findIndex(c),0],k=0,h=a.length;k<h;k++)g.push({value:a[k],priority:c,options:d});this.rules.splice.apply(this.rules,g)},findIndex:function(a){for(var c=this.rules,d=c.length-1;0<=d&&a<c[d].priority;)d--;return d+1},exec:function(a,c){var d=c instanceof CKEDITOR.htmlParser.node||c instanceof CKEDITOR.htmlParser.fragment,g=Array.prototype.slice.call(arguments,1),k=this.rules,h=k.length,p,r,f,B;for(B=0;B<h;B++)if(d&&(p=c.type,r=c.name),f=k[B],!(a.nonEditable&&!f.options.applyToAll||
+a.nestedEditable&&f.options.excludeNestedEditable)){f=f.value.apply(null,g);if(!1===f||d&&f&&(f.name!=r||f.type!=p))return f;null!=f&&(g[0]=c=f)}return c},execOnName:function(a,c){for(var d=0,g=this.rules,k=g.length,h;c&&d<k;d++)h=g[d],a.nonEditable&&!h.options.applyToAll||a.nestedEditable&&h.options.excludeNestedEditable||(c=c.replace(h.value[0],h.value[1]));return c}}})();
+(function(){function a(a,d){function f(a){return a||CKEDITOR.env.needsNbspFiller?new CKEDITOR.htmlParser.text(" "):new CKEDITOR.htmlParser.element("br",{"data-cke-bogus":1})}function n(a,d){return function(l){if(l.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var e=[],n=b(l),t,E;if(n)for(q(n,1)&&e.push(n);n;)g(n)&&(t=c(n))&&q(t)&&((E=c(t))&&!g(E)?e.push(t):(f(v).insertAfter(t),t.remove())),n=n.previous;for(n=0;n<e.length;n++)e[n].remove();if(e=!a||!1!==("function"==typeof d?d(l):d))v||CKEDITOR.env.needsBrFiller||
+l.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT?v||CKEDITOR.env.needsBrFiller||!(7<document.documentMode||l.name in CKEDITOR.dtd.tr||l.name in CKEDITOR.dtd.$listItem)?(e=b(l),e=!e||"form"==l.name&&"input"==e.name):e=!1:e=!1;e&&l.add(f(a))}}}function q(a,b){if((!v||CKEDITOR.env.needsBrFiller)&&a.type==CKEDITOR.NODE_ELEMENT&&"br"==a.name&&!a.attributes["data-cke-eol"])return!0;var c;return a.type==CKEDITOR.NODE_TEXT&&(c=a.value.match(x))&&(c.index&&((new CKEDITOR.htmlParser.text(a.value.substring(0,c.index))).insertBefore(a),
+a.value=c[0]),!CKEDITOR.env.needsBrFiller&&v&&(!b||a.parent.name in h)||!v&&((c=a.previous)&&"br"==c.name||!c||g(c)))?!0:!1}var t={elements:{}},v="html"==d,h=CKEDITOR.tools.extend({},l),A;for(A in h)"#"in w[A]||delete h[A];for(A in h)t.elements[A]=n(v,a.config.fillEmptyBlocks);t.root=n(v,!1);t.elements.br=function(a){return function(b){if(b.parent.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var d=b.attributes;if("data-cke-bogus"in d||"data-cke-eol"in d)delete d["data-cke-bogus"];else{for(d=b.next;d&&e(d);)d=
+d.next;var l=c(b);!d&&g(b.parent)?k(b.parent,f(a)):g(d)&&l&&!g(l)&&f(a).insertBefore(d)}}}}(v);return t}function d(a,b){return a!=CKEDITOR.ENTER_BR&&!1!==b?a==CKEDITOR.ENTER_DIV?"div":"p":!1}function b(a){for(a=a.children[a.children.length-1];a&&e(a);)a=a.previous;return a}function c(a){for(a=a.previous;a&&e(a);)a=a.previous;return a}function e(a){return a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(a.value)||a.type==CKEDITOR.NODE_ELEMENT&&a.attributes["data-cke-bookmark"]}function g(a){return a&&
+(a.type==CKEDITOR.NODE_ELEMENT&&a.name in l||a.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)}function k(a,b){var c=a.children[a.children.length-1];a.children.push(b);b.parent=a;c&&(c.next=b,b.previous=c)}function h(a){a=a.attributes;"false"!=a.contenteditable&&(a["data-cke-editable"]=a.contenteditable?"true":1);a.contenteditable="false"}function p(a){a=a.attributes;switch(a["data-cke-editable"]){case "true":a.contenteditable="true";break;case "1":delete a.contenteditable}}function r(a){return a.replace(C,
+function(a,b,c){return"\x3c"+b+c.replace(D,function(a,b){return M.test(b)&&-1==c.indexOf("data-cke-saved-"+b)?" data-cke-saved-"+a+" data-cke-"+CKEDITOR.rnd+"-"+a:a})+"\x3e"})}function f(a,b){return a.replace(b,function(a,b,c){0===a.indexOf("\x3ctextarea")&&(a=b+z(c).replace(/</g,"\x26lt;").replace(/>/g,"\x26gt;")+"\x3c/textarea\x3e");return"\x3ccke:encoded\x3e"+encodeURIComponent(a)+"\x3c/cke:encoded\x3e"})}function B(a){return a.replace(Q,function(a,b){return decodeURIComponent(b)})}function u(a){return a.replace(/\x3c!--(?!{cke_protected})[\s\S]+?--\x3e/g,
+function(a){return"\x3c!--"+J+"{C}"+encodeURIComponent(a).replace(/--/g,"%2D%2D")+"--\x3e"})}function z(a){return a.replace(/\x3c!--\{cke_protected\}\{C\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)})}function y(a,b){var c=b._.dataStore;return a.replace(/\x3c!--\{cke_protected\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)}).replace(/\{cke_protected_(\d+)\}/g,function(a,b){return c&&c[b]||""})}function m(a,b){var c=[],d=b.config.protectedSource,l=b._.dataStore||(b._.dataStore=
+{id:1}),e=/<\!--\{cke_temp(comment)?\}(\d*?)--\x3e/g,d=[/<script[\s\S]*?(<\/script>|$)/gi,/<noscript[\s\S]*?<\/noscript>/gi,/<meta[\s\S]*?\/?>/gi].concat(d);a=a.replace(/\x3c!--[\s\S]*?--\x3e/g,function(a){return"\x3c!--{cke_tempcomment}"+(c.push(a)-1)+"--\x3e"});for(var f=0;f<d.length;f++)a=a.replace(d[f],function(a){a=a.replace(e,function(a,b,d){return c[d]});return/cke_temp(comment)?/.test(a)?a:"\x3c!--{cke_temp}"+(c.push(a)-1)+"--\x3e"});a=a.replace(e,function(a,b,d){return"\x3c!--"+J+(b?"{C}":
+"")+encodeURIComponent(c[d]).replace(/--/g,"%2D%2D")+"--\x3e"});a=a.replace(/<\w+(?:\s+(?:(?:[^\s=>]+\s*=\s*(?:[^'"\s>]+|'[^']*'|"[^"]*"))|[^\s=\/>]+))+\s*\/?>/g,function(a){return a.replace(/\x3c!--\{cke_protected\}([^>]*)--\x3e/g,function(a,b){l[l.id]=decodeURIComponent(b);return"{cke_protected_"+l.id++ +"}"})});return a=a.replace(/<(title|iframe|textarea)([^>]*)>([\s\S]*?)<\/\1>/g,function(a,c,d,l){return"\x3c"+c+d+"\x3e"+y(z(l),b)+"\x3c/"+c+"\x3e"})}CKEDITOR.htmlDataProcessor=function(b){var c,
+l,e=this;this.editor=b;this.dataFilter=c=new CKEDITOR.htmlParser.filter;this.htmlFilter=l=new CKEDITOR.htmlParser.filter;this.writer=new CKEDITOR.htmlParser.basicWriter;c.addRules(q);c.addRules(n,{applyToAll:!0});c.addRules(a(b,"data"),{applyToAll:!0});l.addRules(t);l.addRules(A,{applyToAll:!0});l.addRules(a(b,"html"),{applyToAll:!0});b.on("toHtml",function(a){a=a.data;var c=a.dataValue,l,c=m(c,b),c=f(c,R),c=r(c),c=f(c,H),c=c.replace(P,"$1cke:$2"),c=c.replace(G,"\x3ccke:$1$2\x3e\x3c/cke:$1\x3e"),
+c=c.replace(/(<pre\b[^>]*>)(\r\n|\n)/g,"$1$2$2"),c=c.replace(/([^a-z0-9<\-])(on\w{3,})(?!>)/gi,"$1data-cke-"+CKEDITOR.rnd+"-$2");l=a.context||b.editable().getName();var e;CKEDITOR.env.ie&&9>CKEDITOR.env.version&&"pre"==l&&(l="div",c="\x3cpre\x3e"+c+"\x3c/pre\x3e",e=1);l=b.document.createElement(l);l.setHtml("a"+c);c=l.getHtml().substr(1);c=c.replace(new RegExp("data-cke-"+CKEDITOR.rnd+"-","ig"),"");e&&(c=c.replace(/^<pre>|<\/pre>$/gi,""));c=c.replace(v,"$1$2");c=B(c);c=z(c);l=!1===a.fixForBody?!1:
+d(a.enterMode,b.config.autoParagraph);c=CKEDITOR.htmlParser.fragment.fromHtml(c,a.context,l);l&&(e=c,!e.children.length&&CKEDITOR.dtd[e.name][l]&&(l=new CKEDITOR.htmlParser.element(l),e.add(l)));a.dataValue=c},null,null,5);b.on("toHtml",function(a){a.data.filter.applyTo(a.data.dataValue,!0,a.data.dontFilter,a.data.enterMode)&&b.fire("dataFiltered")},null,null,6);b.on("toHtml",function(a){a.data.dataValue.filterChildren(e.dataFilter,!0)},null,null,10);b.on("toHtml",function(a){a=a.data;var b=a.dataValue,
+c=new CKEDITOR.htmlParser.basicWriter;b.writeChildrenHtml(c);b=c.getHtml(!0);a.dataValue=u(b)},null,null,15);b.on("toDataFormat",function(a){var c=a.data.dataValue;a.data.enterMode!=CKEDITOR.ENTER_BR&&(c=c.replace(/^<br *\/?>/i,""));a.data.dataValue=CKEDITOR.htmlParser.fragment.fromHtml(c,a.data.context,d(a.data.enterMode,b.config.autoParagraph))},null,null,5);b.on("toDataFormat",function(a){a.data.dataValue.filterChildren(e.htmlFilter,!0)},null,null,10);b.on("toDataFormat",function(a){a.data.filter.applyTo(a.data.dataValue,
+!1,!0)},null,null,11);b.on("toDataFormat",function(a){var c=a.data.dataValue,d=e.writer;d.reset();c.writeChildrenHtml(d);c=d.getHtml(!0);c=z(c);c=y(c,b);a.data.dataValue=c},null,null,15)};CKEDITOR.htmlDataProcessor.prototype={toHtml:function(a,b,c,d){var l=this.editor,e,f,n,q;b&&"object"==typeof b?(e=b.context,c=b.fixForBody,d=b.dontFilter,f=b.filter,n=b.enterMode,q=b.protectedWhitespaces):e=b;e||null===e||(e=l.editable().getName());return l.fire("toHtml",{dataValue:a,context:e,fixForBody:c,dontFilter:d,
+filter:f||l.filter,enterMode:n||l.enterMode,protectedWhitespaces:q}).dataValue},toDataFormat:function(a,b){var c,d,l;b&&(c=b.context,d=b.filter,l=b.enterMode);c||null===c||(c=this.editor.editable().getName());return this.editor.fire("toDataFormat",{dataValue:a,filter:d||this.editor.filter,context:c,enterMode:l||this.editor.enterMode}).dataValue}};var x=/(?:&nbsp;|\xa0)$/,J="{cke_protected}",w=CKEDITOR.dtd,F="caption colgroup col thead tfoot tbody".split(" "),l=CKEDITOR.tools.extend({},w.$blockLimit,
+w.$block),q={elements:{input:h,textarea:h}},n={attributeNames:[[/^on/,"data-cke-pa-on"],[/^data-cke-expando$/,""]]},t={elements:{embed:function(a){var b=a.parent;if(b&&"object"==b.name){var c=b.attributes.width,b=b.attributes.height;c&&(a.attributes.width=c);b&&(a.attributes.height=b)}},a:function(a){var b=a.attributes;if(!(a.children.length||b.name||b.id||a.attributes["data-cke-saved-name"]))return!1}}},A={elementNames:[[/^cke:/,""],[/^\?xml:namespace$/,""]],attributeNames:[[/^data-cke-(saved|pa)-/,
+""],[/^data-cke-.*/,""],["hidefocus",""]],elements:{$:function(a){var b=a.attributes;if(b){if(b["data-cke-temp"])return!1;for(var c=["name","href","src"],d,l=0;l<c.length;l++)d="data-cke-saved-"+c[l],d in b&&delete b[c[l]]}return a},table:function(a){a.children.slice(0).sort(function(a,b){var c,d;a.type==CKEDITOR.NODE_ELEMENT&&b.type==a.type&&(c=CKEDITOR.tools.indexOf(F,a.name),d=CKEDITOR.tools.indexOf(F,b.name));-1<c&&-1<d&&c!=d||(c=a.parent?a.getIndex():-1,d=b.parent?b.getIndex():-1);return c>d?
+1:-1})},param:function(a){a.children=[];a.isEmpty=!0;return a},span:function(a){"Apple-style-span"==a.attributes["class"]&&delete a.name},html:function(a){delete a.attributes.contenteditable;delete a.attributes["class"]},body:function(a){delete a.attributes.spellcheck;delete a.attributes.contenteditable},style:function(a){var b=a.children[0];b&&b.value&&(b.value=CKEDITOR.tools.trim(b.value));a.attributes.type||(a.attributes.type="text/css")},title:function(a){var b=a.children[0];!b&&k(a,b=new CKEDITOR.htmlParser.text);
+b.value=a.attributes["data-cke-title"]||""},input:p,textarea:p},attributes:{"class":function(a){return CKEDITOR.tools.ltrim(a.replace(/(?:^|\s+)cke_[^\s]*/g,""))||!1}}};CKEDITOR.env.ie&&(A.attributes.style=function(a){return a.replace(/(^|;)([^\:]+)/g,function(a){return a.toLowerCase()})});var C=/<(a|area|img|input|source)\b([^>]*)>/gi,D=/([\w-:]+)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,M=/^(href|src|name)$/i,H=/(?:<style(?=[ >])[^>]*>[\s\S]*?<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,
+R=/(<textarea(?=[ >])[^>]*>)([\s\S]*?)(?:<\/textarea>)/gi,Q=/<cke:encoded>([^<]*)<\/cke:encoded>/gi,P=/(<\/?)((?:object|embed|param|html|body|head|title)[^>]*>)/gi,v=/(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi,G=/<cke:(param|embed)([^>]*?)\/?>(?!\s*<\/cke:\1)/gi})();"use strict";
 CKEDITOR.htmlParser.element=function(a,d){this.name=a;this.attributes=d||{};this.children=[];var b=a||"",c=b.match(/^cke:(.*)/);c&&(b=c[1]);b=!!(CKEDITOR.dtd.$nonBodyContent[b]||CKEDITOR.dtd.$block[b]||CKEDITOR.dtd.$listItem[b]||CKEDITOR.dtd.$tableContent[b]||CKEDITOR.dtd.$nonEditable[b]||"br"==b);this.isEmpty=!!CKEDITOR.dtd.$empty[a];this.isUnknown=!CKEDITOR.dtd[a];this._={isBlockLike:b,hasInlineStarted:this.isEmpty||!b}};
 CKEDITOR.htmlParser.cssStyle=function(a){var d={};((a instanceof CKEDITOR.htmlParser.element?a.attributes.style:a)||"").replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(a,c,e){"font-family"==c&&(e=e.replace(/["']/g,""));d[c.toLowerCase()]=e});return{rules:d,populate:function(a){var c=this.toString();c&&(a instanceof CKEDITOR.dom.element?a.setAttribute("style",c):a instanceof CKEDITOR.htmlParser.element?a.attributes.style=c:a.style=c)},toString:function(){var a=[],c;
 for(c in d)d[c]&&a.push(c,":",d[c],";");return a.join("")}}};
-(function(){function a(a){return function(b){return b.type==CKEDITOR.NODE_ELEMENT&&("string"==typeof a?b.name==a:b.name in a)}}var d=function(a,b){a=a[0];b=b[0];return a<b?-1:a>b?1:0},b=CKEDITOR.htmlParser.fragment.prototype;CKEDITOR.htmlParser.element.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_ELEMENT,add:b.add,clone:function(){return new CKEDITOR.htmlParser.element(this.name,this.attributes)},filter:function(a,b){var d=this,l,k;b=d.getFilterContext(b);if(b.off)return!0;
-if(!d.parent)a.onRoot(b,d);for(;;){l=d.name;if(!(k=a.onElementName(b,l)))return this.remove(),!1;d.name=k;if(!(d=a.onElement(b,d)))return this.remove(),!1;if(d!==this)return this.replaceWith(d),!1;if(d.name==l)break;if(d.type!=CKEDITOR.NODE_ELEMENT)return this.replaceWith(d),!1;if(!d.name)return this.replaceWithChildren(),!1}l=d.attributes;var q,w;for(q in l){for(k=l[q];;)if(w=a.onAttributeName(b,q))if(w!=q)delete l[q],q=w;else break;else{delete l[q];break}w&&(!1===(k=a.onAttribute(b,d,w,k))?delete l[w]:
-l[w]=k)}d.isEmpty||this.filterChildren(a,!1,b);return!0},filterChildren:b.filterChildren,writeHtml:function(a,b){b&&this.filter(b);var g=this.name,l=[],k=this.attributes,q,w;a.openTag(g,k);for(q in k)l.push([q,k[q]]);a.sortAttributes&&l.sort(d);q=0;for(w=l.length;q<w;q++)k=l[q],a.attribute(k[0],k[1]);a.openTagClose(g,this.isEmpty);this.writeChildrenHtml(a);this.isEmpty||a.closeTag(g)},writeChildrenHtml:b.writeChildrenHtml,replaceWithChildren:function(){for(var a=this.children,b=a.length;b;)a[--b].insertAfter(this);
+(function(){function a(a){return function(b){return b.type==CKEDITOR.NODE_ELEMENT&&("string"==typeof a?b.name==a:b.name in a)}}var d=function(a,b){a=a[0];b=b[0];return a<b?-1:a>b?1:0},b=CKEDITOR.htmlParser.fragment.prototype;CKEDITOR.htmlParser.element.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_ELEMENT,add:b.add,clone:function(){return new CKEDITOR.htmlParser.element(this.name,this.attributes)},filter:function(a,b){var d=this,k,h;b=d.getFilterContext(b);if(b.off)return!0;
+if(!d.parent)a.onRoot(b,d);for(;;){k=d.name;if(!(h=a.onElementName(b,k)))return this.remove(),!1;d.name=h;if(!(d=a.onElement(b,d)))return this.remove(),!1;if(d!==this)return this.replaceWith(d),!1;if(d.name==k)break;if(d.type!=CKEDITOR.NODE_ELEMENT)return this.replaceWith(d),!1;if(!d.name)return this.replaceWithChildren(),!1}k=d.attributes;var p,r;for(p in k){for(h=k[p];;)if(r=a.onAttributeName(b,p))if(r!=p)delete k[p],p=r;else break;else{delete k[p];break}r&&(!1===(h=a.onAttribute(b,d,r,h))?delete k[r]:
+k[r]=h)}d.isEmpty||this.filterChildren(a,!1,b);return!0},filterChildren:b.filterChildren,writeHtml:function(a,b){b&&this.filter(b);var g=this.name,k=[],h=this.attributes,p,r;a.openTag(g,h);for(p in h)k.push([p,h[p]]);a.sortAttributes&&k.sort(d);p=0;for(r=k.length;p<r;p++)h=k[p],a.attribute(h[0],h[1]);a.openTagClose(g,this.isEmpty);this.writeChildrenHtml(a);this.isEmpty||a.closeTag(g)},writeChildrenHtml:b.writeChildrenHtml,replaceWithChildren:function(){for(var a=this.children,b=a.length;b;)a[--b].insertAfter(this);
 this.remove()},forEach:b.forEach,getFirst:function(b){if(!b)return this.children.length?this.children[0]:null;"function"!=typeof b&&(b=a(b));for(var d=0,g=this.children.length;d<g;++d)if(b(this.children[d]))return this.children[d];return null},getHtml:function(){var a=new CKEDITOR.htmlParser.basicWriter;this.writeChildrenHtml(a);return a.getHtml()},setHtml:function(a){a=this.children=CKEDITOR.htmlParser.fragment.fromHtml(a).children;for(var b=0,d=a.length;b<d;++b)a[b].parent=this},getOuterHtml:function(){var a=
-new CKEDITOR.htmlParser.basicWriter;this.writeHtml(a);return a.getHtml()},split:function(a){for(var b=this.children.splice(a,this.children.length-a),d=this.clone(),l=0;l<b.length;++l)b[l].parent=d;d.children=b;b[0]&&(b[0].previous=null);0<a&&(this.children[a-1].next=null);this.parent.add(d,this.getIndex()+1);return d},addClass:function(a){if(!this.hasClass(a)){var b=this.attributes["class"]||"";this.attributes["class"]=b+(b?" ":"")+a}},removeClass:function(a){var b=this.attributes["class"];b&&((b=
-CKEDITOR.tools.trim(b.replace(new RegExp("(?:\\s+|^)"+a+"(?:\\s+|$)")," ")))?this.attributes["class"]=b:delete this.attributes["class"])},hasClass:function(a){var b=this.attributes["class"];return b?(new RegExp("(?:^|\\s)"+a+"(?\x3d\\s|$)")).test(b):!1},getFilterContext:function(a){var b=[];a||(a={off:!1,nonEditable:!1,nestedEditable:!1});a.off||"off"!=this.attributes["data-cke-processor"]||b.push("off",!0);a.nonEditable||"false"!=this.attributes.contenteditable?a.nonEditable&&!a.nestedEditable&&
-"true"==this.attributes.contenteditable&&b.push("nestedEditable",!0):b.push("nonEditable",!0);if(b.length){a=CKEDITOR.tools.copy(a);for(var d=0;d<b.length;d+=2)a[b[d]]=b[d+1]}return a}},!0)})();
-(function(){var a={},d=/{([^}]+)}/g,b=/([\\'])/g,c=/\n/g,e=/\r/g;CKEDITOR.template=function(g){if(a[g])this.output=a[g];else{var l=g.replace(b,"\\$1").replace(c,"\\n").replace(e,"\\r").replace(d,function(a,b){return"',data['"+b+"']\x3d\x3dundefined?'{"+b+"}':data['"+b+"'],'"});this.output=a[g]=Function("data","buffer","return buffer?buffer.push('"+l+"'):['"+l+"'].join('');")}}})();delete CKEDITOR.loadFullCore;CKEDITOR.instances={};CKEDITOR.document=new CKEDITOR.dom.document(document);
+new CKEDITOR.htmlParser.basicWriter;this.writeHtml(a);return a.getHtml()},split:function(a){for(var b=this.children.splice(a,this.children.length-a),d=this.clone(),k=0;k<b.length;++k)b[k].parent=d;d.children=b;b[0]&&(b[0].previous=null);0<a&&(this.children[a-1].next=null);this.parent.add(d,this.getIndex()+1);return d},find:function(a,b){void 0===b&&(b=!1);var d=[],k;for(k=0;k<this.children.length;k++){var h=this.children[k];"function"==typeof a&&a(h)?d.push(h):"string"==typeof a&&h.name===a&&d.push(h);
+b&&h.find&&(d=d.concat(h.find(a,b)))}return d},addClass:function(a){if(!this.hasClass(a)){var b=this.attributes["class"]||"";this.attributes["class"]=b+(b?" ":"")+a}},removeClass:function(a){var b=this.attributes["class"];b&&((b=CKEDITOR.tools.trim(b.replace(new RegExp("(?:\\s+|^)"+a+"(?:\\s+|$)")," ")))?this.attributes["class"]=b:delete this.attributes["class"])},hasClass:function(a){var b=this.attributes["class"];return b?(new RegExp("(?:^|\\s)"+a+"(?\x3d\\s|$)")).test(b):!1},getFilterContext:function(a){var b=
+[];a||(a={off:!1,nonEditable:!1,nestedEditable:!1});a.off||"off"!=this.attributes["data-cke-processor"]||b.push("off",!0);a.nonEditable||"false"!=this.attributes.contenteditable?a.nonEditable&&!a.nestedEditable&&"true"==this.attributes.contenteditable&&b.push("nestedEditable",!0):b.push("nonEditable",!0);if(b.length){a=CKEDITOR.tools.copy(a);for(var d=0;d<b.length;d+=2)a[b[d]]=b[d+1]}return a}},!0)})();
+(function(){var a={},d=/{([^}]+)}/g,b=/([\\'])/g,c=/\n/g,e=/\r/g;CKEDITOR.template=function(g){if(a[g])this.output=a[g];else{var k=g.replace(b,"\\$1").replace(c,"\\n").replace(e,"\\r").replace(d,function(a,b){return"',data['"+b+"']\x3d\x3dundefined?'{"+b+"}':data['"+b+"'],'"});this.output=a[g]=Function("data","buffer","return buffer?buffer.push('"+k+"'):['"+k+"'].join('');")}}})();delete CKEDITOR.loadFullCore;CKEDITOR.instances={};CKEDITOR.document=new CKEDITOR.dom.document(document);
 CKEDITOR.add=function(a){CKEDITOR.instances[a.name]=a;a.on("focus",function(){CKEDITOR.currentInstance!=a&&(CKEDITOR.currentInstance=a,CKEDITOR.fire("currentInstance"))});a.on("blur",function(){CKEDITOR.currentInstance==a&&(CKEDITOR.currentInstance=null,CKEDITOR.fire("currentInstance"))});CKEDITOR.fire("instance",null,a)};CKEDITOR.remove=function(a){delete CKEDITOR.instances[a.name]};
 (function(){var a={};CKEDITOR.addTemplate=function(d,b){var c=a[d];if(c)return c;c={name:d,source:b};CKEDITOR.fire("template",c);return a[d]=new CKEDITOR.template(c.source)};CKEDITOR.getTemplate=function(d){return a[d]}})();(function(){var a=[];CKEDITOR.addCss=function(d){a.push(d)};CKEDITOR.getCss=function(){return a.join("\n")}})();CKEDITOR.on("instanceDestroyed",function(){CKEDITOR.tools.isEmpty(this.instances)&&CKEDITOR.fire("reset")});CKEDITOR.TRISTATE_ON=1;CKEDITOR.TRISTATE_OFF=2;
 CKEDITOR.TRISTATE_DISABLED=0;
 (function(){CKEDITOR.inline=function(a,d){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var b=new CKEDITOR.editor(d,a,CKEDITOR.ELEMENT_MODE_INLINE),c=a.is("textarea")?a:null;c?(b.setData(c.getValue(),null,!0),a=CKEDITOR.dom.element.createFromHtml('\x3cdiv contenteditable\x3d"'+!!b.readOnly+'" class\x3d"cke_textarea_inline"\x3e'+c.getValue()+"\x3c/div\x3e",CKEDITOR.document),
 a.insertAfter(c),c.hide(),c.$.form&&b._attachToForm()):b.setData(a.getHtml(),null,!0);b.on("loaded",function(){b.fire("uiReady");b.editable(a);b.container=a;b.ui.contentsElement=a;b.setData(b.getData(1));b.resetDirty();b.fire("contentDom");b.mode="wysiwyg";b.fire("mode");b.status="ready";b.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,b)},null,null,1E4);b.on("destroy",function(){c&&(b.container.clearCustomData(),b.container.remove(),c.show());b.element.clearCustomData();delete b.element});
 return b};CKEDITOR.inlineAll=function(){var a,d,b;for(b in CKEDITOR.dtd.$editable)for(var c=CKEDITOR.document.getElementsByTag(b),e=0,g=c.count();e<g;e++)a=c.getItem(e),"true"==a.getAttribute("contenteditable")&&(d={element:a,config:{}},!1!==CKEDITOR.fire("inline",d)&&CKEDITOR.inline(a,d.config))};CKEDITOR.domReady(function(){!CKEDITOR.disableAutoInline&&CKEDITOR.inlineAll()})})();CKEDITOR.replaceClass="ckeditor";
-(function(){function a(a,e,g,l){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var k=new CKEDITOR.editor(e,a,l);l==CKEDITOR.ELEMENT_MODE_REPLACE&&(a.setStyle("visibility","hidden"),k._.required=a.hasAttribute("required"),a.removeAttribute("required"));g&&k.setData(g,null,!0);k.on("loaded",function(){b(k);l==CKEDITOR.ELEMENT_MODE_REPLACE&&k.config.autoUpdateElement&&
-a.$.form&&k._attachToForm();k.setMode(k.config.startupMode,function(){k.resetDirty();k.status="ready";k.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,k)})});k.on("destroy",d);return k}function d(){var a=this.container,b=this.element;a&&(a.clearCustomData(),a.remove());b&&(b.clearCustomData(),this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&(b.show(),this._.required&&b.setAttribute("required","required")),delete this.element)}function b(a){var b=a.name,d=a.element,l=a.elementMode,k=
-a.fire("uiSpace",{space:"top",html:""}).html,q=a.fire("uiSpace",{space:"bottom",html:""}).html,w=new CKEDITOR.template('\x3c{outerEl} id\x3d"cke_{name}" class\x3d"{id} cke cke_reset cke_chrome cke_editor_{name} cke_{langDir} '+CKEDITOR.env.cssClass+'"  dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"application"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':"")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':"")+'\x3c{outerEl} class\x3d"cke_inner cke_reset" role\x3d"presentation"\x3e{topHtml}\x3c{outerEl} id\x3d"{contentId}" class\x3d"cke_contents cke_reset" role\x3d"presentation"\x3e\x3c/{outerEl}\x3e{bottomHtml}\x3c/{outerEl}\x3e\x3c/{outerEl}\x3e'),
-b=CKEDITOR.dom.element.createFromHtml(w.output({id:a.id,name:b,langDir:a.lang.dir,langCode:a.langCode,voiceLabel:a.title,topHtml:k?'\x3cspan id\x3d"'+a.ui.spaceId("top")+'" class\x3d"cke_top cke_reset_all" role\x3d"presentation" style\x3d"height:auto"\x3e'+k+"\x3c/span\x3e":"",contentId:a.ui.spaceId("contents"),bottomHtml:q?'\x3cspan id\x3d"'+a.ui.spaceId("bottom")+'" class\x3d"cke_bottom cke_reset_all" role\x3d"presentation"\x3e'+q+"\x3c/span\x3e":"",outerEl:CKEDITOR.env.ie?"span":"div"}));l==CKEDITOR.ELEMENT_MODE_REPLACE?
-(d.hide(),b.insertAfter(d)):d.append(b);a.container=b;a.ui.contentsElement=a.ui.space("contents");k&&a.ui.space("top").unselectable();q&&a.ui.space("bottom").unselectable();d=a.config.width;l=a.config.height;d&&b.setStyle("width",CKEDITOR.tools.cssLength(d));l&&a.ui.space("contents").setStyle("height",CKEDITOR.tools.cssLength(l));b.disableContextMenu();CKEDITOR.env.webkit&&b.on("focus",function(){a.focus()});a.fireOnce("uiReady")}CKEDITOR.replace=function(b,d){return a(b,d,null,CKEDITOR.ELEMENT_MODE_REPLACE)};
-CKEDITOR.appendTo=function(b,d,g){return a(b,d,g,CKEDITOR.ELEMENT_MODE_APPENDTO)};CKEDITOR.replaceAll=function(){for(var a=document.getElementsByTagName("textarea"),b=0;b<a.length;b++){var d=null,l=a[b];if(l.name||l.id){if("string"==typeof arguments[0]){if(!(new RegExp("(?:^|\\s)"+arguments[0]+"(?:$|\\s)")).test(l.className))continue}else if("function"==typeof arguments[0]&&(d={},!1===arguments[0](l,d)))continue;this.replace(l,d)}}};CKEDITOR.editor.prototype.addMode=function(a,b){(this._.modes||(this._.modes=
-{}))[a]=b};CKEDITOR.editor.prototype.setMode=function(a,b){var d=this,l=this._.modes;if(a!=d.mode&&l&&l[a]){d.fire("beforeSetMode",a);if(d.mode){var k=d.checkDirty(),l=d._.previousModeData,q,w=0;d.fire("beforeModeUnload");d.editable(0);d._.previousMode=d.mode;d._.previousModeData=q=d.getData(1);"source"==d.mode&&l==q&&(d.fire("lockSnapshot",{forceUpdate:!0}),w=1);d.ui.space("contents").setHtml("");d.mode=""}else d._.previousModeData=d.getData(1);this._.modes[a](function(){d.mode=a;void 0!==k&&!k&&
-d.resetDirty();w?d.fire("unlockSnapshot"):"wysiwyg"==a&&d.fire("saveSnapshot");setTimeout(function(){d.fire("mode");b&&b.call(d)},0)})}};CKEDITOR.editor.prototype.resize=function(a,b,d,l){var k=this.container,q=this.ui.space("contents"),w=CKEDITOR.env.webkit&&this.document&&this.document.getWindow().$.frameElement;l=l?this.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}):k;l.setSize("width",a,!0);w&&(w.style.width="1%");var f=(l.$.offsetHeight||0)-(q.$.clientHeight||
-0),k=Math.max(b-(d?0:f),0);b=d?b+f:b;q.setStyle("height",k+"px");w&&(w.style.width="100%");this.fire("resize",{outerHeight:b,contentsHeight:k,outerWidth:a||l.getSize("width")})};CKEDITOR.editor.prototype.getResizable=function(a){return a?this.ui.space("contents"):this.container};CKEDITOR.domReady(function(){CKEDITOR.replaceClass&&CKEDITOR.replaceAll(CKEDITOR.replaceClass)})})();CKEDITOR.config.startupMode="wysiwyg";
-(function(){function a(a){var b=a.editor,e=a.data.path,m=e.blockLimit,f=a.data.selection,g=f.getRanges()[0],E;if(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller)if(f=d(f,e))f.appendBogus(),E=CKEDITOR.env.ie;l(b,e.block,m)&&g.collapsed&&!g.getCommonAncestor().isReadOnly()&&(e=g.clone(),e.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS),m=new CKEDITOR.dom.walker(e),m.guard=function(a){return!c(a)||a.type==CKEDITOR.NODE_COMMENT||a.isReadOnly()},!m.checkForward()||e.checkStartOfBlock()&&e.checkEndOfBlock())&&
-(b=g.fixBlock(!0,b.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p"),CKEDITOR.env.needsBrFiller||(b=b.getFirst(c))&&b.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(b.getText()).match(/^(?:&nbsp;|\xa0)$/)&&b.remove(),E=1,a.cancel());E&&g.select()}function d(a,b){if(a.isFake)return 0;var d=b.block||b.blockLimit,e=d&&d.getLast(c);if(!(!d||!d.isBlockBoundary()||e&&e.type==CKEDITOR.NODE_ELEMENT&&e.isBlockBoundary()||d.is("pre")||d.getBogus()))return d}function b(a){var b=a.data.getTarget();b.is("input")&&
-(b=b.getAttribute("type"),"submit"!=b&&"reset"!=b||a.data.preventDefault())}function c(a){return f(a)&&y(a)}function e(a,b){return function(c){var d=c.data.$.toElement||c.data.$.fromElement||c.data.$.relatedTarget;(d=d&&d.nodeType==CKEDITOR.NODE_ELEMENT?new CKEDITOR.dom.element(d):null)&&(b.equals(d)||b.contains(d))||a.call(this,c)}}function g(a){function b(a){return function(b,h){h&&b.type==CKEDITOR.NODE_ELEMENT&&b.is(f)&&(d=b);if(!(h||!c(b)||a&&t(b)))return!1}}var d,e=a.getRanges()[0];a=a.root;
-var f={table:1,ul:1,ol:1,dl:1};if(e.startPath().contains(f)){var g=e.clone();g.collapse(1);g.setStartAt(a,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(g);a.guard=b();a.checkBackward();if(d)return g=e.clone(),g.collapse(),g.setEndAt(d,CKEDITOR.POSITION_AFTER_END),a=new CKEDITOR.dom.walker(g),a.guard=b(!0),d=!1,a.checkForward(),d}return null}function l(a,b,c){return!1!==a.config.autoParagraph&&a.activeEnterMode!=CKEDITOR.ENTER_BR&&(a.editable().equals(c)&&!b||b&&"true"==b.getAttribute("contenteditable"))}
-function k(a){return a.activeEnterMode!=CKEDITOR.ENTER_BR&&!1!==a.config.autoParagraph?a.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p":!1}function q(a){var b=a.editor;b.getSelection().scrollIntoView();setTimeout(function(){b.fire("saveSnapshot")},0)}function w(a,b,c){var d=a.getCommonAncestor(b);for(b=a=c?b:a;(a=a.getParent())&&!d.equals(a)&&1==a.getChildCount();)b=a;b.remove()}var f,y,A,t,D,p,x,G,u;CKEDITOR.editable=CKEDITOR.tools.createClass({base:CKEDITOR.dom.element,$:function(a,b){this.base(b.$||
-b);this.editor=a;this.status="unloaded";this.hasFocus=!1;this.setup()},proto:{focus:function(){var a;if(CKEDITOR.env.webkit&&!this.hasFocus&&(a=this.editor._.previousActive||this.getDocument().getActive(),this.contains(a))){a.focus();return}try{this.$[CKEDITOR.env.ie&&this.getDocument().equals(CKEDITOR.document)?"setActive":"focus"]()}catch(b){if(!CKEDITOR.env.ie)throw b;}CKEDITOR.env.safari&&!this.isInline()&&(a=CKEDITOR.document.getActive(),a.equals(this.getWindow().getFrame())||this.getWindow().focus())},
-on:function(a,b){var c=Array.prototype.slice.call(arguments,0);CKEDITOR.env.ie&&/^focus|blur$/.exec(a)&&(a="focus"==a?"focusin":"focusout",b=e(b,this),c[0]=a,c[1]=b);return CKEDITOR.dom.element.prototype.on.apply(this,c)},attachListener:function(a){!this._.listeners&&(this._.listeners=[]);var b=Array.prototype.slice.call(arguments,1),b=a.on.apply(a,b);this._.listeners.push(b);return b},clearListeners:function(){var a=this._.listeners;try{for(;a.length;)a.pop().removeListener()}catch(b){}},restoreAttrs:function(){var a=
-this._.attrChanges,b,c;for(c in a)a.hasOwnProperty(c)&&(b=a[c],null!==b?this.setAttribute(c,b):this.removeAttribute(c))},attachClass:function(a){var b=this.getCustomData("classes");this.hasClass(a)||(!b&&(b=[]),b.push(a),this.setCustomData("classes",b),this.addClass(a))},changeAttr:function(a,b){var c=this.getAttribute(a);b!==c&&(!this._.attrChanges&&(this._.attrChanges={}),a in this._.attrChanges||(this._.attrChanges[a]=c),this.setAttribute(a,b))},insertText:function(a){this.editor.focus();this.insertHtml(this.transformPlainTextToHtml(a),
-"text")},transformPlainTextToHtml:function(a){var b=this.editor.getSelection().getStartElement().hasAscendant("pre",!0)?CKEDITOR.ENTER_BR:this.editor.activeEnterMode;return CKEDITOR.tools.transformPlainTextToHtml(a,b)},insertHtml:function(a,b,c){var d=this.editor;d.focus();d.fire("saveSnapshot");c||(c=d.getSelection().getRanges()[0]);p(this,b||"html",a,c);c.select();q(this);this.editor.fire("afterInsertHtml",{})},insertHtmlIntoRange:function(a,b,c){p(this,c||"html",a,b);this.editor.fire("afterInsertHtml",
-{intoRange:b})},insertElement:function(a,b){var d=this.editor;d.focus();d.fire("saveSnapshot");var e=d.activeEnterMode,d=d.getSelection(),f=a.getName(),f=CKEDITOR.dtd.$block[f];b||(b=d.getRanges()[0]);this.insertElementIntoRange(a,b)&&(b.moveToPosition(a,CKEDITOR.POSITION_AFTER_END),f&&((f=a.getNext(function(a){return c(a)&&!t(a)}))&&f.type==CKEDITOR.NODE_ELEMENT&&f.is(CKEDITOR.dtd.$block)?f.getDtd()["#"]?b.moveToElementEditStart(f):b.moveToElementEditEnd(a):f||e==CKEDITOR.ENTER_BR||(f=b.fixBlock(!0,
-e==CKEDITOR.ENTER_DIV?"div":"p"),b.moveToElementEditStart(f))));d.selectRanges([b]);q(this)},insertElementIntoSelection:function(a){this.insertElement(a)},insertElementIntoRange:function(a,b){var c=this.editor,d=c.config.enterMode,e=a.getName(),f=CKEDITOR.dtd.$block[e];if(b.checkReadOnly())return!1;b.deleteContents(1);b.startContainer.type==CKEDITOR.NODE_ELEMENT&&b.startContainer.is({tr:1,table:1,tbody:1,thead:1,tfoot:1})&&x(b);var g,l;if(f)for(;(g=b.getCommonAncestor(0,1))&&(l=CKEDITOR.dtd[g.getName()])&&
-(!l||!l[e]);)g.getName()in CKEDITOR.dtd.span?b.splitElement(g):b.checkStartOfBlock()&&b.checkEndOfBlock()?(b.setStartBefore(g),b.collapse(!0),g.remove()):b.splitBlock(d==CKEDITOR.ENTER_DIV?"div":"p",c.editable());b.insertNode(a);return!0},setData:function(a,b){b||(a=this.editor.dataProcessor.toHtml(a));this.setHtml(a);this.fixInitialSelection();"unloaded"==this.status&&(this.status="ready");this.editor.fire("dataReady")},getData:function(a){var b=this.getHtml();a||(b=this.editor.dataProcessor.toDataFormat(b));
-return b},setReadOnly:function(a){this.setAttribute("contenteditable",!a)},detach:function(){this.removeClass("cke_editable");this.status="detached";var a=this.editor;this._.detach();delete a.document;delete a.window},isInline:function(){return this.getDocument().equals(CKEDITOR.document)},fixInitialSelection:function(){function a(){var b=c.getDocument().$,d=b.getSelection(),h;a:if(d.anchorNode&&d.anchorNode==c.$)h=!0;else{if(CKEDITOR.env.webkit&&(h=c.getDocument().getActive())&&h.equals(c)&&!d.anchorNode){h=
-!0;break a}h=void 0}h&&(h=new CKEDITOR.dom.range(c),h.moveToElementEditStart(c),b=b.createRange(),b.setStart(h.startContainer.$,h.startOffset),b.collapse(!0),d.removeAllRanges(),d.addRange(b))}function b(){var a=c.getDocument().$,d=a.selection,h=c.getDocument().getActive();"None"==d.type&&h.equals(c)&&(d=new CKEDITOR.dom.range(c),a=a.body.createTextRange(),d.moveToElementEditStart(c),d=d.startContainer,d.type!=CKEDITOR.NODE_ELEMENT&&(d=d.getParent()),a.moveToElementText(d.$),a.collapse(!0),a.select())}
-var c=this;if(CKEDITOR.env.ie&&(9>CKEDITOR.env.version||CKEDITOR.env.quirks))this.hasFocus&&(this.focus(),b());else if(this.hasFocus)this.focus(),a();else this.once("focus",function(){a()},null,null,-999)},getHtmlFromRange:function(a){if(a.collapsed)return new CKEDITOR.dom.documentFragment(a.document);a={doc:this.getDocument(),range:a.clone()};G.eol.detect(a,this);G.bogus.exclude(a);G.cell.shrink(a);a.fragment=a.range.cloneContents();G.tree.rebuild(a,this);G.eol.fix(a,this);return new CKEDITOR.dom.documentFragment(a.fragment.$)},
-extractHtmlFromRange:function(a,b){var c=u,d={range:a,doc:a.document},e=this.getHtmlFromRange(a);if(a.collapsed)return a.optimize(),e;a.enlarge(CKEDITOR.ENLARGE_INLINE,1);c.table.detectPurge(d);d.bookmark=a.createBookmark();delete d.range;var f=this.editor.createRange();f.moveToPosition(d.bookmark.startNode,CKEDITOR.POSITION_BEFORE_START);d.targetBookmark=f.createBookmark();c.list.detectMerge(d,this);c.table.detectRanges(d,this);c.block.detectMerge(d,this);d.tableContentsRanges?(c.table.deleteRanges(d),
-a.moveToBookmark(d.bookmark),d.range=a):(a.moveToBookmark(d.bookmark),d.range=a,a.extractContents(c.detectExtractMerge(d)));a.moveToBookmark(d.targetBookmark);a.optimize();c.fixUneditableRangePosition(a);c.list.merge(d,this);c.table.purge(d,this);c.block.merge(d,this);if(b){c=a.startPath();if(d=a.checkStartOfBlock()&&a.checkEndOfBlock()&&c.block&&!a.root.equals(c.block)){a:{var d=c.block.getElementsByTag("span"),f=0,g;if(d)for(;g=d.getItem(f++);)if(!y(g)){d=!0;break a}d=!1}d=!d}d&&(a.moveToPosition(c.block,
-CKEDITOR.POSITION_BEFORE_START),c.block.remove())}else c.autoParagraph(this.editor,a),A(a.startContainer)&&a.startContainer.appendBogus();a.startContainer.mergeSiblings();return e},setup:function(){var a=this.editor;this.attachListener(a,"beforeGetData",function(){var b=this.getData();this.is("textarea")||!1!==a.config.ignoreEmptyParagraph&&(b=b.replace(D,function(a,b){return b}));a.setData(b,null,1)},this);this.attachListener(a,"getSnapshot",function(a){a.data=this.getData(1)},this);this.attachListener(a,
-"afterSetData",function(){this.setData(a.getData(1))},this);this.attachListener(a,"loadSnapshot",function(a){this.setData(a.data,1)},this);this.attachListener(a,"beforeFocus",function(){var b=a.getSelection();(b=b&&b.getNative())&&"Control"==b.type||this.focus()},this);this.attachListener(a,"insertHtml",function(a){this.insertHtml(a.data.dataValue,a.data.mode,a.data.range)},this);this.attachListener(a,"insertElement",function(a){this.insertElement(a.data)},this);this.attachListener(a,"insertText",
-function(a){this.insertText(a.data)},this);this.setReadOnly(a.readOnly);this.attachClass("cke_editable");a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?this.attachClass("cke_editable_inline"):a.elementMode!=CKEDITOR.ELEMENT_MODE_REPLACE&&a.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||this.attachClass("cke_editable_themed");this.attachClass("cke_contents_"+a.config.contentsLangDirection);a.keystrokeHandler.blockedKeystrokes[8]=+a.readOnly;a.keystrokeHandler.attach(this);this.on("blur",function(){this.hasFocus=
-!1},null,null,-1);this.on("focus",function(){this.hasFocus=!0},null,null,-1);a.focusManager.add(this);this.equals(CKEDITOR.document.getActive())&&(this.hasFocus=!0,a.once("contentDom",function(){a.focusManager.focus(this)},this));this.isInline()&&this.changeAttr("tabindex",a.tabIndex);if(!this.is("textarea")){a.document=this.getDocument();a.window=this.getWindow();var d=a.document;this.changeAttr("spellcheck",!a.config.disableNativeSpellChecker);var e=a.config.contentsLangDirection;this.getDirection(1)!=
-e&&this.changeAttr("dir",e);var m=CKEDITOR.getCss();if(m){var e=d.getHead(),l=e.getCustomData("stylesheet");l?m!=l.getText()&&(CKEDITOR.env.ie&&9>CKEDITOR.env.version?l.$.styleSheet.cssText=m:l.setText(m)):(m=d.appendStyleText(m),m=new CKEDITOR.dom.element(m.ownerNode||m.owningElement),e.setCustomData("stylesheet",m),m.data("cke-temp",1))}e=d.getCustomData("stylesheet_ref")||0;d.setCustomData("stylesheet_ref",e+1);this.setCustomData("cke_includeReadonly",!a.config.disableReadonlyStyling);this.attachListener(this,
-"click",function(a){a=a.data;var b=(new CKEDITOR.dom.elementPath(a.getTarget(),this)).contains("a");b&&2!=a.$.button&&b.isReadOnly()&&a.preventDefault()});var k={8:1,46:1};this.attachListener(a,"key",function(b){if(a.readOnly)return!0;var c=b.data.domEvent.getKey(),d;if(c in k){b=a.getSelection();var h,e=b.getRanges()[0],m=e.startPath(),n,l,z,c=8==c;CKEDITOR.env.ie&&11>CKEDITOR.env.version&&(h=b.getSelectedElement())||(h=g(b))?(a.fire("saveSnapshot"),e.moveToPosition(h,CKEDITOR.POSITION_BEFORE_START),
-h.remove(),e.select(),a.fire("saveSnapshot"),d=1):e.collapsed&&((n=m.block)&&(z=n[c?"getPrevious":"getNext"](f))&&z.type==CKEDITOR.NODE_ELEMENT&&z.is("table")&&e[c?"checkStartOfBlock":"checkEndOfBlock"]()?(a.fire("saveSnapshot"),e[c?"checkEndOfBlock":"checkStartOfBlock"]()&&n.remove(),e["moveToElementEdit"+(c?"End":"Start")](z),e.select(),a.fire("saveSnapshot"),d=1):m.blockLimit&&m.blockLimit.is("td")&&(l=m.blockLimit.getAscendant("table"))&&e.checkBoundaryOfElement(l,c?CKEDITOR.START:CKEDITOR.END)&&
-(z=l[c?"getPrevious":"getNext"](f))?(a.fire("saveSnapshot"),e["moveToElementEdit"+(c?"End":"Start")](z),e.checkStartOfBlock()&&e.checkEndOfBlock()?z.remove():e.select(),a.fire("saveSnapshot"),d=1):(l=m.contains(["td","th","caption"]))&&e.checkBoundaryOfElement(l,c?CKEDITOR.START:CKEDITOR.END)&&(d=1))}return!d});a.blockless&&CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller&&this.attachListener(this,"keyup",function(b){b.data.getKeystroke()in k&&!this.getFirst(c)&&(this.appendBogus(),b=a.createRange(),b.moveToPosition(this,
-CKEDITOR.POSITION_AFTER_START),b.select())});this.attachListener(this,"dblclick",function(b){if(a.readOnly)return!1;b={element:b.data.getTarget()};a.fire("doubleclick",b)});CKEDITOR.env.ie&&this.attachListener(this,"click",b);CKEDITOR.env.ie&&!CKEDITOR.env.edge||this.attachListener(this,"mousedown",function(b){var c=b.data.getTarget();c.is("img","hr","input","textarea","select")&&!c.isReadOnly()&&(a.getSelection().selectElement(c),c.is("input","textarea","select")&&b.data.preventDefault())});CKEDITOR.env.edge&&
-this.attachListener(this,"mouseup",function(b){(b=b.data.getTarget())&&b.is("img")&&a.getSelection().selectElement(b)});CKEDITOR.env.gecko&&this.attachListener(this,"mouseup",function(b){if(2==b.data.$.button&&(b=b.data.getTarget(),!b.getOuterHtml().replace(D,""))){var c=a.createRange();c.moveToElementEditStart(b);c.select(!0)}});CKEDITOR.env.webkit&&(this.attachListener(this,"click",function(a){a.data.getTarget().is("input","select")&&a.data.preventDefault()}),this.attachListener(this,"mouseup",
-function(a){a.data.getTarget().is("input","textarea")&&a.data.preventDefault()}));CKEDITOR.env.webkit&&this.attachListener(a,"key",function(b){if(a.readOnly)return!0;b=b.data.domEvent.getKey();if(b in k){var c=8==b,d=a.getSelection().getRanges()[0];b=d.startPath();if(d.collapsed)a:{var h=b.block;if(h&&d[c?"checkStartOfBlock":"checkEndOfBlock"]()&&d.moveToClosestEditablePosition(h,!c)&&d.collapsed){if(d.startContainer.type==CKEDITOR.NODE_ELEMENT){var e=d.startContainer.getChild(d.startOffset-(c?1:
-0));if(e&&e.type==CKEDITOR.NODE_ELEMENT&&e.is("hr")){a.fire("saveSnapshot");e.remove();b=!0;break a}}d=d.startPath().block;if(!d||d&&d.contains(h))b=void 0;else{a.fire("saveSnapshot");var f;(f=(c?d:h).getBogus())&&f.remove();f=a.getSelection();e=f.createBookmarks();(c?h:d).moveChildren(c?d:h,!1);b.lastElement.mergeSiblings();w(h,d,!c);f.selectBookmarks(e);b=!0}}else b=!1}else c=d,f=b.block,d=c.endPath().block,f&&d&&!f.equals(d)?(a.fire("saveSnapshot"),(h=f.getBogus())&&h.remove(),c.enlarge(CKEDITOR.ENLARGE_INLINE),
-c.deleteContents(),d.getParent()&&(d.moveChildren(f,!1),b.lastElement.mergeSiblings(),w(f,d,!0)),c=a.getSelection().getRanges()[0],c.collapse(1),c.optimize(),""===c.startContainer.getHtml()&&c.startContainer.appendBogus(),c.select(),b=!0):b=!1;if(!b)return;a.getSelection().scrollIntoView();a.fire("saveSnapshot");return!1}},this,null,100)}}},_:{detach:function(){this.editor.setData(this.editor.getData(),0,1);this.clearListeners();this.restoreAttrs();var a;if(a=this.removeCustomData("classes"))for(;a.length;)this.removeClass(a.pop());
-if(!this.is("textarea")){a=this.getDocument();var b=a.getHead();if(b.getCustomData("stylesheet")){var c=a.getCustomData("stylesheet_ref");--c?a.setCustomData("stylesheet_ref",c):(a.removeCustomData("stylesheet_ref"),b.removeCustomData("stylesheet").remove())}}this.editor.fire("contentDomUnload");delete this.editor}}});CKEDITOR.editor.prototype.editable=function(a){var b=this._.editable;if(b&&a)return 0;arguments.length&&(b=this._.editable=a?a instanceof CKEDITOR.editable?a:new CKEDITOR.editable(this,
-a):(b&&b.detach(),null));return b};CKEDITOR.on("instanceLoaded",function(b){var c=b.editor;c.on("insertElement",function(a){a=a.data;a.type==CKEDITOR.NODE_ELEMENT&&(a.is("input")||a.is("textarea"))&&("false"!=a.getAttribute("contentEditable")&&a.data("cke-editable",a.hasAttribute("contenteditable")?"true":"1"),a.setAttribute("contentEditable",!1))});c.on("selectionChange",function(b){if(!c.readOnly){var d=c.getSelection();d&&!d.isLocked&&(d=c.checkDirty(),c.fire("lockSnapshot"),a(b),c.fire("unlockSnapshot"),
-!d&&c.resetDirty())}})});CKEDITOR.on("instanceCreated",function(a){var b=a.editor;b.on("mode",function(){var a=b.editable();if(a&&a.isInline()){var c=b.title;a.changeAttr("role","textbox");a.changeAttr("aria-label",c);c&&a.changeAttr("title",c);var d=b.fire("ariaEditorHelpLabel",{}).label;if(d&&(c=this.ui.space(this.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?"top":"contents"))){var e=CKEDITOR.tools.getNextId(),d=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+e+'" class\x3d"cke_voice_label"\x3e'+
-d+"\x3c/span\x3e");c.append(d);a.changeAttr("aria-describedby",e)}}})});CKEDITOR.addCss(".cke_editable{cursor:text}.cke_editable img,.cke_editable input,.cke_editable textarea{cursor:default}");f=CKEDITOR.dom.walker.whitespaces(!0);y=CKEDITOR.dom.walker.bookmark(!1,!0);A=CKEDITOR.dom.walker.empty();t=CKEDITOR.dom.walker.bogus();D=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;p=function(){function a(b){return b.type==
-CKEDITOR.NODE_ELEMENT}function b(c,d){var e,f,m,n,g=[],l=d.range.startContainer;e=d.range.startPath();for(var l=C[l.getName()],z=0,k=c.getChildren(),E=k.count(),B=-1,p=-1,q=0,w=e.contains(C.$list);z<E;++z)e=k.getItem(z),a(e)?(m=e.getName(),w&&m in CKEDITOR.dtd.$list?g=g.concat(b(e,d)):(n=!!l[m],"br"!=m||!e.data("cke-eol")||z&&z!=E-1||(q=(f=z?g[z-1].node:k.getItem(z+1))&&(!a(f)||!f.is("br")),f=f&&a(f)&&C.$block[f.getName()]),-1!=B||n||(B=z),n||(p=z),g.push({isElement:1,isLineBreak:q,isBlock:e.isBlockBoundary(),
-hasBlockSibling:f,node:e,name:m,allowed:n}),f=q=0)):g.push({isElement:0,node:e,allowed:1});-1<B&&(g[B].firstNotAllowed=1);-1<p&&(g[p].lastNotAllowed=1);return g}function d(b,c){var e=[],h=b.getChildren(),f=h.count(),m,g=0,l=C[c],z=!b.is(C.$inline)||b.is("br");for(z&&e.push(" ");g<f;g++)m=h.getItem(g),a(m)&&!m.is(l)?e=e.concat(d(m,c)):e.push(m);z&&e.push(" ");return e}function e(b){return a(b.startContainer)&&b.startContainer.getChild(b.startOffset-1)}function f(b){return b&&a(b)&&(b.is(C.$removeEmpty)||
-b.is("a")&&!b.isBlockBoundary())}function g(b,c,d,e){var h=b.clone(),f,m;h.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);(f=(new CKEDITOR.dom.walker(h)).next())&&a(f)&&p[f.getName()]&&(m=f.getPrevious())&&a(m)&&!m.getParent().equals(b.startContainer)&&d.contains(m)&&e.contains(f)&&f.isIdentical(m)&&(f.moveChildren(m),f.remove(),g(b,c,d,e))}function E(b,c){function d(b,c){if(c.isBlock&&c.isElement&&!c.node.is("br")&&a(b)&&b.is("br"))return b.remove(),1}var e=c.endContainer.getChild(c.endOffset),h=c.endContainer.getChild(c.endOffset-
-1);e&&d(e,b[b.length-1]);h&&d(h,b[0])&&(c.setEnd(c.endContainer,c.endOffset-1),c.collapse())}var C=CKEDITOR.dtd,p={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,ul:1,ol:1,li:1,pre:1,dl:1,blockquote:1},q={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},w=CKEDITOR.tools.extend({},C.$inline);delete w.br;return function(p,v,I,J){var F=p.editor,L=!1;"unfiltered_html"==v&&(v="html",L=!0);if(!J.checkReadOnly()){var K=(new CKEDITOR.dom.elementPath(J.startContainer,J.root)).blockLimit||J.root;p={type:v,dontFilter:L,editable:p,
-editor:F,range:J,blockLimit:K,mergeCandidates:[],zombies:[]};v=p.range;J=p.mergeCandidates;var H,t;"text"==p.type&&v.shrink(CKEDITOR.SHRINK_ELEMENT,!0,!1)&&(H=CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",v.document),v.insertNode(H),v.setStartAfter(H));L=new CKEDITOR.dom.elementPath(v.startContainer);p.endPath=K=new CKEDITOR.dom.elementPath(v.endContainer);if(!v.collapsed){var F=K.block||K.blockLimit,x=v.getCommonAncestor();F&&!F.equals(x)&&!F.contains(x)&&v.checkEndOfBlock()&&
-p.zombies.push(F);v.deleteContents()}for(;(t=e(v))&&a(t)&&t.isBlockBoundary()&&L.contains(t);)v.moveToPosition(t,CKEDITOR.POSITION_BEFORE_END);g(v,p.blockLimit,L,K);H&&(v.setEndBefore(H),v.collapse(),H.remove());H=v.startPath();if(F=H.contains(f,!1,1))v.splitElement(F),p.inlineStylesRoot=F,p.inlineStylesPeak=H.lastElement;H=v.createBookmark();(F=H.startNode.getPrevious(c))&&a(F)&&f(F)&&J.push(F);(F=H.startNode.getNext(c))&&a(F)&&f(F)&&J.push(F);for(F=H.startNode;(F=F.getParent())&&f(F);)J.push(F);
-v.moveToBookmark(H);if(H=I){H=p.range;if("text"==p.type&&p.inlineStylesRoot){t=p.inlineStylesPeak;v=t.getDocument().createText("{cke-peak}");for(J=p.inlineStylesRoot.getParent();!t.equals(J);)v=v.appendTo(t.clone()),t=t.getParent();I=v.getOuterHtml().split("{cke-peak}").join(I)}t=p.blockLimit.getName();if(/^\s+|\s+$/.test(I)&&"span"in CKEDITOR.dtd[t]){var A='\x3cspan data-cke-marker\x3d"1"\x3e\x26nbsp;\x3c/span\x3e';I=A+I+A}I=p.editor.dataProcessor.toHtml(I,{context:null,fixForBody:!1,protectedWhitespaces:!!A,
-dontFilter:p.dontFilter,filter:p.editor.activeFilter,enterMode:p.editor.activeEnterMode});t=H.document.createElement("body");t.setHtml(I);A&&(t.getFirst().remove(),t.getLast().remove());if((A=H.startPath().block)&&(1!=A.getChildCount()||!A.getBogus()))a:{var y;if(1==t.getChildCount()&&a(y=t.getFirst())&&y.is(q)&&!y.hasAttribute("contenteditable")){A=y.getElementsByTag("*");H=0;for(J=A.count();H<J;H++)if(v=A.getItem(H),!v.is(w))break a;y.moveChildren(y.getParent(1));y.remove()}}p.dataWrapper=t;H=I}if(H){y=
-p.range;H=y.document;var u;t=p.blockLimit;J=0;var D,A=[],M,G;I=F=0;var P,W;v=y.startContainer;var L=p.endPath.elements[0],X,K=L.getPosition(v),x=!!L.getCommonAncestor(v)&&K!=CKEDITOR.POSITION_IDENTICAL&&!(K&CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED);v=b(p.dataWrapper,p);for(E(v,y);J<v.length;J++){K=v[J];if(u=K.isLineBreak){u=y;P=t;var S=void 0,aa=void 0;K.hasBlockSibling?u=1:(S=u.startContainer.getAscendant(C.$block,1))&&S.is({div:1,p:1})?(aa=S.getPosition(P),aa==CKEDITOR.POSITION_IDENTICAL||
-aa==CKEDITOR.POSITION_CONTAINS?u=0:(P=u.splitElement(S),u.moveToPosition(P,CKEDITOR.POSITION_AFTER_START),u=1)):u=0}if(u)I=0<J;else{u=y.startPath();!K.isBlock&&l(p.editor,u.block,u.blockLimit)&&(G=k(p.editor))&&(G=H.createElement(G),G.appendBogus(),y.insertNode(G),CKEDITOR.env.needsBrFiller&&(D=G.getBogus())&&D.remove(),y.moveToPosition(G,CKEDITOR.POSITION_BEFORE_END));if((u=y.startPath().block)&&!u.equals(M)){if(D=u.getBogus())D.remove(),A.push(u);M=u}K.firstNotAllowed&&(F=1);if(F&&K.isElement){u=
-y.startContainer;for(P=null;u&&!C[u.getName()][K.name];){if(u.equals(t)){u=null;break}P=u;u=u.getParent()}if(u)P&&(W=y.splitElement(P),p.zombies.push(W),p.zombies.push(P));else{P=t.getName();X=!J;u=J==v.length-1;P=d(K.node,P);for(var S=[],aa=P.length,ca=0,ea=void 0,Y=0,U=-1;ca<aa;ca++)ea=P[ca]," "==ea?(Y||X&&!ca||(S.push(new CKEDITOR.dom.text(" ")),U=S.length),Y=1):(S.push(ea),Y=0);u&&U==S.length&&S.pop();X=S}}if(X){for(;u=X.pop();)y.insertNode(u);X=0}else y.insertNode(K.node);K.lastNotAllowed&&J<
-v.length-1&&((W=x?L:W)&&y.setEndAt(W,CKEDITOR.POSITION_AFTER_START),F=0);y.collapse()}}1!=v.length?D=!1:(D=v[0],D=D.isElement&&"false"==D.node.getAttribute("contenteditable"));D&&(I=!0,u=v[0].node,y.setStartAt(u,CKEDITOR.POSITION_BEFORE_START),y.setEndAt(u,CKEDITOR.POSITION_AFTER_END));p.dontMoveCaret=I;p.bogusNeededBlocks=A}D=p.range;var O;W=p.bogusNeededBlocks;for(X=D.createBookmark();M=p.zombies.pop();)M.getParent()&&(G=D.clone(),G.moveToElementEditStart(M),G.removeEmptyBlocksAtEnd());if(W)for(;M=
-W.pop();)CKEDITOR.env.needsBrFiller?M.appendBogus():M.append(D.document.createText(" "));for(;M=p.mergeCandidates.pop();)M.mergeSiblings();D.moveToBookmark(X);if(!p.dontMoveCaret){for(M=e(D);M&&a(M)&&!M.is(C.$empty);){if(M.isBlockBoundary())D.moveToPosition(M,CKEDITOR.POSITION_BEFORE_END);else{if(f(M)&&M.getHtml().match(/(\s|&nbsp;)$/g)){O=null;break}O=D.clone();O.moveToPosition(M,CKEDITOR.POSITION_BEFORE_END)}M=M.getLast(c)}O&&D.moveToRange(O)}}}}();x=function(){function a(b){b=new CKEDITOR.dom.walker(b);
-b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$tableContent)};b.evaluator=function(a){return a.type==CKEDITOR.NODE_ELEMENT};return b}function b(a,c,d){c=a.getDocument().createElement(c);a.append(c,d);return c}function c(a){var b=a.count(),d;for(b;0<b--;)d=a.getItem(b),CKEDITOR.tools.trim(d.getHtml())||(d.appendBogus(),CKEDITOR.env.ie&&9>CKEDITOR.env.version&&d.getChildCount()&&d.getFirst().remove())}return function(d){var e=d.startContainer,f=e.getAscendant("table",
-1),g=!1;c(f.getElementsByTag("td"));c(f.getElementsByTag("th"));f=d.clone();f.setStart(e,0);f=a(f).lastBackward();f||(f=d.clone(),f.setEndAt(e,CKEDITOR.POSITION_BEFORE_END),f=a(f).lastForward(),g=!0);f||(f=e);f.is("table")?(d.setStartAt(f,CKEDITOR.POSITION_BEFORE_START),d.collapse(!0),f.remove()):(f.is({tbody:1,thead:1,tfoot:1})&&(f=b(f,"tr",g)),f.is("tr")&&(f=b(f,f.getParent().is("thead")?"th":"td",g)),(e=f.getBogus())&&e.remove(),d.moveToPosition(f,g?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END))}}();
-G={eol:{detect:function(a,b){var c=a.range,d=c.clone(),e=c.clone(),f=new CKEDITOR.dom.elementPath(c.startContainer,b),g=new CKEDITOR.dom.elementPath(c.endContainer,b);d.collapse(1);e.collapse();f.block&&d.checkBoundaryOfElement(f.block,CKEDITOR.END)&&(c.setStartAfter(f.block),a.prependEolBr=1);g.block&&e.checkBoundaryOfElement(g.block,CKEDITOR.START)&&(c.setEndBefore(g.block),a.appendEolBr=1)},fix:function(a,b){var c=b.getDocument(),d;a.appendEolBr&&(d=this.createEolBr(c),a.fragment.append(d));!a.prependEolBr||
-d&&!d.getPrevious()||a.fragment.append(this.createEolBr(c),1)},createEolBr:function(a){return a.createElement("br",{attributes:{"data-cke-eol":1}})}},bogus:{exclude:function(a){var b=a.range.getBoundaryNodes(),c=b.startNode,b=b.endNode;!b||!t(b)||c&&c.equals(b)||a.range.setEndBefore(b)}},tree:{rebuild:function(a,b){var c=a.range,d=c.getCommonAncestor(),e=new CKEDITOR.dom.elementPath(d,b),f=new CKEDITOR.dom.elementPath(c.startContainer,b),c=new CKEDITOR.dom.elementPath(c.endContainer,b),g;d.type==
-CKEDITOR.NODE_TEXT&&(d=d.getParent());if(e.blockLimit.is({tr:1,table:1})){var l=e.contains("table").getParent();g=function(a){return!a.equals(l)}}else if(e.block&&e.block.is(CKEDITOR.dtd.$listItem)&&(f=f.contains(CKEDITOR.dtd.$list),c=c.contains(CKEDITOR.dtd.$list),!f.equals(c))){var k=e.contains(CKEDITOR.dtd.$list).getParent();g=function(a){return!a.equals(k)}}g||(g=function(a){return!a.equals(e.block)&&!a.equals(e.blockLimit)});this.rebuildFragment(a,b,d,g)},rebuildFragment:function(a,b,c,d){for(var e;c&&
-!c.equals(b)&&d(c);)e=c.clone(0,1),a.fragment.appendTo(e),a.fragment=e,c=c.getParent()}},cell:{shrink:function(a){a=a.range;var b=a.startContainer,c=a.endContainer,d=a.startOffset,e=a.endOffset;b.type==CKEDITOR.NODE_ELEMENT&&b.equals(c)&&b.is("tr")&&++d==e&&a.shrink(CKEDITOR.SHRINK_TEXT)}}};u=function(){function a(b,c){var d=b.getParent();if(d.is(CKEDITOR.dtd.$inline))b[c?"insertBefore":"insertAfter"](d)}function b(c,d,e){a(d);a(e,1);for(var f;f=e.getNext();)f.insertAfter(d),d=f;A(c)&&c.remove()}
-function c(a,b){var d=new CKEDITOR.dom.range(a);d.setStartAfter(b.startNode);d.setEndBefore(b.endNode);return d}return{list:{detectMerge:function(a,b){var d=c(b,a.bookmark),e=d.startPath(),f=d.endPath(),h=e.contains(CKEDITOR.dtd.$list),g=f.contains(CKEDITOR.dtd.$list);a.mergeList=h&&g&&h.getParent().equals(g.getParent())&&!h.equals(g);a.mergeListItems=e.block&&f.block&&e.block.is(CKEDITOR.dtd.$listItem)&&f.block.is(CKEDITOR.dtd.$listItem);if(a.mergeList||a.mergeListItems)d=d.clone(),d.setStartBefore(a.bookmark.startNode),
-d.setEndAfter(a.bookmark.endNode),a.mergeListBookmark=d.createBookmark()},merge:function(a,c){if(a.mergeListBookmark){var d=a.mergeListBookmark.startNode,e=a.mergeListBookmark.endNode,f=new CKEDITOR.dom.elementPath(d,c),g=new CKEDITOR.dom.elementPath(e,c);if(a.mergeList){var n=f.contains(CKEDITOR.dtd.$list),l=g.contains(CKEDITOR.dtd.$list);n.equals(l)||(l.moveChildren(n),l.remove())}a.mergeListItems&&(f=f.contains(CKEDITOR.dtd.$listItem),g=g.contains(CKEDITOR.dtd.$listItem),f.equals(g)||b(g,d,e));
-d.remove();e.remove()}}},block:{detectMerge:function(a,b){if(!a.tableContentsRanges&&!a.mergeListBookmark){var c=new CKEDITOR.dom.range(b);c.setStartBefore(a.bookmark.startNode);c.setEndAfter(a.bookmark.endNode);a.mergeBlockBookmark=c.createBookmark()}},merge:function(a,c){if(a.mergeBlockBookmark&&!a.purgeTableBookmark){var d=a.mergeBlockBookmark.startNode,e=a.mergeBlockBookmark.endNode,f=new CKEDITOR.dom.elementPath(d,c),g=new CKEDITOR.dom.elementPath(e,c),f=f.block,g=g.block;f&&g&&!f.equals(g)&&
-b(g,d,e);d.remove();e.remove()}}},table:function(){function a(c){var e=[],f,h=new CKEDITOR.dom.walker(c),g=c.startPath().contains(d),m=c.endPath().contains(d),n={};h.guard=function(a,h){if(a.type==CKEDITOR.NODE_ELEMENT){var l="visited_"+(h?"out":"in");if(a.getCustomData(l))return;CKEDITOR.dom.element.setMarker(n,a,l,1)}if(h&&g&&a.equals(g))f=c.clone(),f.setEndAt(g,CKEDITOR.POSITION_BEFORE_END),e.push(f);else if(!h&&m&&a.equals(m))f=c.clone(),f.setStartAt(m,CKEDITOR.POSITION_AFTER_START),e.push(f);
-else{if(l=!h)l=a.type==CKEDITOR.NODE_ELEMENT&&a.is(d)&&(!g||b(a,g))&&(!m||b(a,m));l&&(f=c.clone(),f.selectNodeContents(a),e.push(f))}};h.lastForward();CKEDITOR.dom.element.clearAllMarkers(n);return e}function b(a,c){var d=CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED,e=a.getPosition(c);return e===CKEDITOR.POSITION_IDENTICAL?!1:0===(e&d)}var d={td:1,th:1,caption:1};return{detectPurge:function(a){var b=a.range,c=b.clone();c.enlarge(CKEDITOR.ENLARGE_ELEMENT);var c=new CKEDITOR.dom.walker(c),
-e=0;c.evaluator=function(a){a.type==CKEDITOR.NODE_ELEMENT&&a.is(d)&&++e};c.checkForward();if(1<e){var c=b.startPath().contains("table"),f=b.endPath().contains("table");c&&f&&b.checkBoundaryOfElement(c,CKEDITOR.START)&&b.checkBoundaryOfElement(f,CKEDITOR.END)&&(b=a.range.clone(),b.setStartBefore(c),b.setEndAfter(f),a.purgeTableBookmark=b.createBookmark())}},detectRanges:function(e,f){var h=c(f,e.bookmark),g=h.clone(),l,k,v=h.getCommonAncestor();v.is(CKEDITOR.dtd.$tableContent)&&!v.is(d)&&(v=v.getAscendant("table",
-!0));k=v;v=new CKEDITOR.dom.elementPath(h.startContainer,k);k=new CKEDITOR.dom.elementPath(h.endContainer,k);v=v.contains("table");k=k.contains("table");if(v||k)v&&k&&b(v,k)?(e.tableSurroundingRange=g,g.setStartAt(v,CKEDITOR.POSITION_AFTER_END),g.setEndAt(k,CKEDITOR.POSITION_BEFORE_START),g=h.clone(),g.setEndAt(v,CKEDITOR.POSITION_AFTER_END),l=h.clone(),l.setStartAt(k,CKEDITOR.POSITION_BEFORE_START),l=a(g).concat(a(l))):v?k||(e.tableSurroundingRange=g,g.setStartAt(v,CKEDITOR.POSITION_AFTER_END),h.setEndAt(v,
-CKEDITOR.POSITION_AFTER_END)):(e.tableSurroundingRange=g,g.setEndAt(k,CKEDITOR.POSITION_BEFORE_START),h.setStartAt(k,CKEDITOR.POSITION_AFTER_START)),e.tableContentsRanges=l?l:a(h)},deleteRanges:function(a){for(var b;b=a.tableContentsRanges.pop();)b.extractContents(),A(b.startContainer)&&b.startContainer.appendBogus();a.tableSurroundingRange&&a.tableSurroundingRange.extractContents()},purge:function(a){if(a.purgeTableBookmark){var b=a.doc,c=a.range.clone(),b=b.createElement("p");b.insertBefore(a.purgeTableBookmark.startNode);
-c.moveToBookmark(a.purgeTableBookmark);c.deleteContents();a.range.moveToPosition(b,CKEDITOR.POSITION_AFTER_START)}}}}(),detectExtractMerge:function(a){return!(a.range.startPath().contains(CKEDITOR.dtd.$listItem)&&a.range.endPath().contains(CKEDITOR.dtd.$listItem))},fixUneditableRangePosition:function(a){a.startContainer.getDtd()["#"]||a.moveToClosestEditablePosition(null,!0)},autoParagraph:function(a,b){var c=b.startPath(),d;l(a,c.block,c.blockLimit)&&(d=k(a))&&(d=b.document.createElement(d),d.appendBogus(),
-b.insertNode(d),b.moveToPosition(d,CKEDITOR.POSITION_AFTER_START))}}}()})();
-(function(){function a(){var a=this._.fakeSelection,b;a&&(b=this.getSelection(1),b&&b.isHidden()||(a.reset(),a=0));if(!a&&(a=b||this.getSelection(1),!a||a.getType()==CKEDITOR.SELECTION_NONE))return;this.fire("selectionCheck",a);b=this.elementPath();b.compare(this._.selectionPreviousPath)||(CKEDITOR.env.webkit&&(this._.previousActive=this.document.getActive()),this._.selectionPreviousPath=b,this.fire("selectionChange",{selection:a,path:b}))}function d(){A=!0;y||(b.call(this),y=CKEDITOR.tools.setTimeout(b,
-200,this))}function b(){y=null;A&&(CKEDITOR.tools.setTimeout(a,0,this),A=!1)}function c(a){return t(a)||a.type==CKEDITOR.NODE_ELEMENT&&!a.is(CKEDITOR.dtd.$empty)?!0:!1}function e(a){function b(c,d){return c&&c.type!=CKEDITOR.NODE_TEXT?a.clone()["moveToElementEdit"+(d?"End":"Start")](c):!1}if(!(a.root instanceof CKEDITOR.editable))return!1;var d=a.startContainer,e=a.getPreviousNode(c,null,d),f=a.getNextNode(c,null,d);return b(e)||b(f,1)||!(e||f||d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary()&&
-d.getBogus())?!0:!1}function g(a){l(a,!1);var b=a.getDocument().createText(u);a.setCustomData("cke-fillingChar",b);return b}function l(a,b){var c=a&&a.removeCustomData("cke-fillingChar");if(c){if(!1!==b){var d=a.getDocument().getSelection().getNative(),e=d&&"None"!=d.type&&d.getRangeAt(0),f=u.length;if(c.getLength()>f&&e&&e.intersectsNode(c.$)){var g=[{node:d.anchorNode,offset:d.anchorOffset},{node:d.focusNode,offset:d.focusOffset}];d.anchorNode==c.$&&d.anchorOffset>f&&(g[0].offset-=f);d.focusNode==
-c.$&&d.focusOffset>f&&(g[1].offset-=f)}}c.setText(k(c.getText(),1));g&&(c=a.getDocument().$,d=c.getSelection(),c=c.createRange(),c.setStart(g[0].node,g[0].offset),c.collapse(!0),d.removeAllRanges(),d.addRange(c),d.extend(g[1].node,g[1].offset))}}function k(a,b){return b?a.replace(r,function(a,b){return b?" ":""}):a.replace(u,"")}function q(a){var b=CKEDITOR.dom.element.createFromHtml('\x3cdiv data-cke-hidden-sel\x3d"1" data-cke-temp\x3d"1" style\x3d"'+(CKEDITOR.env.ie?"display:none":"position:fixed;top:0;left:-1000px")+
-'"\x3e\x26nbsp;\x3c/div\x3e',a.document);a.fire("lockSnapshot");a.editable().append(b);var c=a.getSelection(1),d=a.createRange(),e=c.root.on("selectionchange",function(a){a.cancel()},null,null,0);d.setStartAt(b,CKEDITOR.POSITION_AFTER_START);d.setEndAt(b,CKEDITOR.POSITION_BEFORE_END);c.selectRanges([d]);e.removeListener();a.fire("unlockSnapshot");a._.hiddenSelectionContainer=b}function w(a){var b={37:1,39:1,8:1,46:1};return function(c){var d=c.data.getKeystroke();if(b[d]){var e=a.getSelection().getRanges(),
-f=e[0];1==e.length&&f.collapsed&&(d=f[38>d?"getPreviousEditableNode":"getNextEditableNode"]())&&d.type==CKEDITOR.NODE_ELEMENT&&"false"==d.getAttribute("contenteditable")&&(a.getSelection().fake(d),c.data.preventDefault(),c.cancel())}}}function f(a){for(var b=0;b<a.length;b++){var c=a[b];c.getCommonAncestor().isReadOnly()&&a.splice(b,1);if(!c.collapsed){if(c.startContainer.isReadOnly())for(var d=c.startContainer,e;d&&!((e=d.type==CKEDITOR.NODE_ELEMENT)&&d.is("body")||!d.isReadOnly());)e&&"false"==
-d.getAttribute("contentEditable")&&c.setStartAfter(d),d=d.getParent();d=c.startContainer;e=c.endContainer;var f=c.startOffset,g=c.endOffset,l=c.clone();d&&d.type==CKEDITOR.NODE_TEXT&&(f>=d.getLength()?l.setStartAfter(d):l.setStartBefore(d));e&&e.type==CKEDITOR.NODE_TEXT&&(g?l.setEndAfter(e):l.setEndBefore(e));d=new CKEDITOR.dom.walker(l);d.evaluator=function(d){if(d.type==CKEDITOR.NODE_ELEMENT&&d.isReadOnly()){var e=c.clone();c.setEndBefore(d);c.collapsed&&a.splice(b--,1);d.getPosition(l.endContainer)&
-CKEDITOR.POSITION_CONTAINS||(e.setStartAfter(d),e.collapsed||a.splice(b+1,0,e));return!0}return!1};d.next()}}return a}var y,A,t=CKEDITOR.dom.walker.invisible(1),D=function(){function a(b){return function(a){var c=a.editor.createRange();c.moveToClosestEditablePosition(a.selected,b)&&a.editor.getSelection().selectRanges([c]);return!1}}function b(a){return function(b){var c=b.editor,d=c.createRange(),e;(e=d.moveToClosestEditablePosition(b.selected,a))||(e=d.moveToClosestEditablePosition(b.selected,!a));
-e&&c.getSelection().selectRanges([d]);c.fire("saveSnapshot");b.selected.remove();e||(d.moveToElementEditablePosition(c.editable()),c.getSelection().selectRanges([d]));c.fire("saveSnapshot");return!1}}var c=a(),d=a(1);return{37:c,38:c,39:d,40:d,8:b(),46:b(1)}}();CKEDITOR.on("instanceCreated",function(b){function c(){var a=e.getSelection();a&&a.removeAllRanges()}var e=b.editor;e.on("contentDom",function(){function b(){I=new CKEDITOR.dom.selection(e.getSelection());I.lock()}function c(){h.removeListener("mouseup",
-c);k.removeListener("mouseup",c);var a=CKEDITOR.document.$.selection,b=a.createRange();"None"!=a.type&&b.parentElement().ownerDocument==f.$&&b.select()}var f=e.document,h=CKEDITOR.document,g=e.editable(),n=f.getBody(),k=f.getDocumentElement(),q=g.isInline(),v,I;CKEDITOR.env.gecko&&g.attachListener(g,"focus",function(a){a.removeListener();0!==v&&(a=e.getSelection().getNative())&&a.isCollapsed&&a.anchorNode==g.$&&(a=e.createRange(),a.moveToElementEditStart(g),a.select())},null,null,-2);g.attachListener(g,
-CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){v&&CKEDITOR.env.webkit&&(v=e._.previousActive&&e._.previousActive.equals(f.getActive()));e.unlockSelection(v);v=0},null,null,-1);g.attachListener(g,"mousedown",function(){v=0});if(CKEDITOR.env.ie||q)p?g.attachListener(g,"beforedeactivate",b,null,null,-1):g.attachListener(e,"selectionCheck",b,null,null,-1),g.attachListener(g,CKEDITOR.env.webkit?"DOMFocusOut":"blur",function(){e.lockSelection(I);v=1},null,null,-1),g.attachListener(g,"mousedown",function(){v=
-0});if(CKEDITOR.env.ie&&!q){var J;g.attachListener(g,"mousedown",function(a){2==a.data.$.button&&((a=e.document.getSelection())&&a.getType()!=CKEDITOR.SELECTION_NONE||(J=e.window.getScrollPosition()))});g.attachListener(g,"mouseup",function(a){2==a.data.$.button&&J&&(e.document.$.documentElement.scrollLeft=J.x,e.document.$.documentElement.scrollTop=J.y);J=null});if("BackCompat"!=f.$.compatMode){if(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)k.on("mousedown",function(a){function b(a){a=a.data.$;
-if(d){var c=n.$.createTextRange();try{c.moveToPoint(a.clientX,a.clientY)}catch(e){}d.setEndPoint(0>f.compareEndPoints("StartToStart",c)?"EndToEnd":"StartToStart",c);d.select()}}function c(){k.removeListener("mousemove",b);h.removeListener("mouseup",c);k.removeListener("mouseup",c);d.select()}a=a.data;if(a.getTarget().is("html")&&a.$.y<k.$.clientHeight&&a.$.x<k.$.clientWidth){var d=n.$.createTextRange();try{d.moveToPoint(a.$.clientX,a.$.clientY)}catch(e){}var f=d.duplicate();k.on("mousemove",b);h.on("mouseup",
-c);k.on("mouseup",c)}});if(7<CKEDITOR.env.version&&11>CKEDITOR.env.version)k.on("mousedown",function(a){a.data.getTarget().is("html")&&(h.on("mouseup",c),k.on("mouseup",c))})}}g.attachListener(g,"selectionchange",a,e);g.attachListener(g,"keyup",d,e);g.attachListener(g,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){e.forceNextSelectionCheck();e.selectionChange(1)});if(q&&(CKEDITOR.env.webkit||CKEDITOR.env.gecko)){var F;g.attachListener(g,"mousedown",function(){F=1});g.attachListener(f.getDocumentElement(),
-"mouseup",function(){F&&d.call(e);F=0})}else g.attachListener(CKEDITOR.env.ie?g:f.getDocumentElement(),"mouseup",d,e);CKEDITOR.env.webkit&&g.attachListener(f,"keydown",function(a){switch(a.data.getKey()){case 13:case 33:case 34:case 35:case 36:case 37:case 39:case 8:case 45:case 46:l(g)}},null,null,-1);g.attachListener(g,"keydown",w(e),null,null,-1)});e.on("setData",function(){e.unlockSelection();CKEDITOR.env.webkit&&c()});e.on("contentDomUnload",function(){e.unlockSelection()});if(CKEDITOR.env.ie9Compat)e.on("beforeDestroy",
-c,null,null,9);e.on("dataReady",function(){delete e._.fakeSelection;delete e._.hiddenSelectionContainer;e.selectionChange(1)});e.on("loadSnapshot",function(){var a=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT),b=e.editable().getLast(a);b&&b.hasAttribute("data-cke-hidden-sel")&&(b.remove(),CKEDITOR.env.gecko&&(a=e.editable().getFirst(a))&&a.is("br")&&a.getAttribute("_moz_editor_bogus_node")&&a.remove())},null,null,100);e.on("key",function(a){if("wysiwyg"==e.mode){var b=e.getSelection();if(b.isFake){var c=
-D[a.data.keyCode];if(c)return c({editor:e,selected:b.getSelectedElement(),selection:b,keyEvent:a})}}})});if(CKEDITOR.env.webkit)CKEDITOR.on("instanceReady",function(a){var b=a.editor;b.on("selectionChange",function(){var a=b.editable(),c=a.getCustomData("cke-fillingChar");c&&(c.getCustomData("ready")?l(a):c.setCustomData("ready",1))},null,null,-1);b.on("beforeSetMode",function(){l(b.editable())},null,null,-1);b.on("getSnapshot",function(a){a.data&&(a.data=k(a.data))},b,null,20);b.on("toDataFormat",
-function(a){a.data.dataValue=k(a.data.dataValue)},null,null,0)});CKEDITOR.editor.prototype.selectionChange=function(b){(b?a:d).call(this)};CKEDITOR.editor.prototype.getSelection=function(a){return!this._.savedSelection&&!this._.fakeSelection||a?(a=this.editable())&&"wysiwyg"==this.mode?new CKEDITOR.dom.selection(a):null:this._.savedSelection||this._.fakeSelection};CKEDITOR.editor.prototype.lockSelection=function(a){a=a||this.getSelection(1);return a.getType()!=CKEDITOR.SELECTION_NONE?(!a.isLocked&&
-a.lock(),this._.savedSelection=a,!0):!1};CKEDITOR.editor.prototype.unlockSelection=function(a){var b=this._.savedSelection;return b?(b.unlock(a),delete this._.savedSelection,!0):!1};CKEDITOR.editor.prototype.forceNextSelectionCheck=function(){delete this._.selectionPreviousPath};CKEDITOR.dom.document.prototype.getSelection=function(){return new CKEDITOR.dom.selection(this)};CKEDITOR.dom.range.prototype.select=function(){var a=this.root instanceof CKEDITOR.editable?this.root.editor.getSelection():
-new CKEDITOR.dom.selection(this.root);a.selectRanges([this]);return a};CKEDITOR.SELECTION_NONE=1;CKEDITOR.SELECTION_TEXT=2;CKEDITOR.SELECTION_ELEMENT=3;var p="function"!=typeof window.getSelection,x=1;CKEDITOR.dom.selection=function(a){if(a instanceof CKEDITOR.dom.selection){var b=a;a=a.root}var c=a instanceof CKEDITOR.dom.element;this.rev=b?b.rev:x++;this.document=a instanceof CKEDITOR.dom.document?a:a.getDocument();this.root=c?a:this.document.getBody();this.isLocked=0;this._={cache:{}};if(b)return CKEDITOR.tools.extend(this._.cache,
-b._.cache),this.isFake=b.isFake,this.isLocked=b.isLocked,this;a=this.getNative();var d,e;if(a)if(a.getRangeAt)d=(e=a.rangeCount&&a.getRangeAt(0))&&new CKEDITOR.dom.node(e.commonAncestorContainer);else{try{e=a.createRange()}catch(f){}d=e&&CKEDITOR.dom.element.get(e.item&&e.item(0)||e.parentElement())}if(!d||d.type!=CKEDITOR.NODE_ELEMENT&&d.type!=CKEDITOR.NODE_TEXT||!this.root.equals(d)&&!this.root.contains(d))this._.cache.type=CKEDITOR.SELECTION_NONE,this._.cache.startElement=null,this._.cache.selectedElement=
-null,this._.cache.selectedText="",this._.cache.ranges=new CKEDITOR.dom.rangeList;return this};var G={img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1,a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,thead:1,tfoot:1},u=CKEDITOR.tools.repeat("​",7),r=new RegExp(u+"( )?","g");CKEDITOR.tools.extend(CKEDITOR.dom.selection,{_removeFillingCharSequenceString:k,_createFillingCharSequenceNode:g,FILLING_CHAR_SEQUENCE:u});CKEDITOR.dom.selection.prototype={getNative:function(){return void 0!==
-this._.cache.nativeSel?this._.cache.nativeSel:this._.cache.nativeSel=p?this.document.$.selection:this.document.getWindow().$.getSelection()},getType:p?function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_NONE;try{var c=this.getNative(),d=c.type;"Text"==d&&(b=CKEDITOR.SELECTION_TEXT);"Control"==d&&(b=CKEDITOR.SELECTION_ELEMENT);c.createRange().parentElement()&&(b=CKEDITOR.SELECTION_TEXT)}catch(e){}return a.type=b}:function(){var a=this._.cache;if(a.type)return a.type;var b=
-CKEDITOR.SELECTION_TEXT,c=this.getNative();if(!c||!c.rangeCount)b=CKEDITOR.SELECTION_NONE;else if(1==c.rangeCount){var c=c.getRangeAt(0),d=c.startContainer;d==c.endContainer&&1==d.nodeType&&1==c.endOffset-c.startOffset&&G[d.childNodes[c.startOffset].nodeName.toLowerCase()]&&(b=CKEDITOR.SELECTION_ELEMENT)}return a.type=b},getRanges:function(){var a=p?function(){function a(b){return(new CKEDITOR.dom.node(b)).getIndex()}var b=function(b,c){b=b.duplicate();b.collapse(c);var d=b.parentElement();if(!d.hasChildNodes())return{container:d,
-offset:0};for(var e=d.children,f,h,g=b.duplicate(),l=0,v=e.length-1,k=-1,m,p;l<=v;)if(k=Math.floor((l+v)/2),f=e[k],g.moveToElementText(f),m=g.compareEndPoints("StartToStart",b),0<m)v=k-1;else if(0>m)l=k+1;else return{container:d,offset:a(f)};if(-1==k||k==e.length-1&&0>m){g.moveToElementText(d);g.setEndPoint("StartToStart",b);g=g.text.replace(/(\r\n|\r)/g,"\n").length;e=d.childNodes;if(!g)return f=e[e.length-1],f.nodeType!=CKEDITOR.NODE_TEXT?{container:d,offset:e.length}:{container:f,offset:f.nodeValue.length};
-for(d=e.length;0<g&&0<d;)h=e[--d],h.nodeType==CKEDITOR.NODE_TEXT&&(p=h,g-=h.nodeValue.length);return{container:p,offset:-g}}g.collapse(0<m?!0:!1);g.setEndPoint(0<m?"StartToStart":"EndToStart",b);g=g.text.replace(/(\r\n|\r)/g,"\n").length;if(!g)return{container:d,offset:a(f)+(0<m?0:1)};for(;0<g;)try{h=f[0<m?"previousSibling":"nextSibling"],h.nodeType==CKEDITOR.NODE_TEXT&&(g-=h.nodeValue.length,p=h),f=h}catch(q){return{container:d,offset:a(f)}}return{container:p,offset:0<m?-g:p.nodeValue.length+g}};
-return function(){var a=this.getNative(),c=a&&a.createRange(),d=this.getType();if(!a)return[];if(d==CKEDITOR.SELECTION_TEXT)return a=new CKEDITOR.dom.range(this.root),d=b(c,!0),a.setStart(new CKEDITOR.dom.node(d.container),d.offset),d=b(c),a.setEnd(new CKEDITOR.dom.node(d.container),d.offset),a.endContainer.getPosition(a.startContainer)&CKEDITOR.POSITION_PRECEDING&&a.endOffset<=a.startContainer.getIndex()&&a.collapse(),[a];if(d==CKEDITOR.SELECTION_ELEMENT){for(var d=[],e=0;e<c.length;e++){for(var f=
-c.item(e),h=f.parentNode,g=0,a=new CKEDITOR.dom.range(this.root);g<h.childNodes.length&&h.childNodes[g]!=f;g++);a.setStart(new CKEDITOR.dom.node(h),g);a.setEnd(new CKEDITOR.dom.node(h),g+1);d.push(a)}return d}return[]}}():function(){var a=[],b,c=this.getNative();if(!c)return a;for(var d=0;d<c.rangeCount;d++){var e=c.getRangeAt(d);b=new CKEDITOR.dom.range(this.root);b.setStart(new CKEDITOR.dom.node(e.startContainer),e.startOffset);b.setEnd(new CKEDITOR.dom.node(e.endContainer),e.endOffset);a.push(b)}return a};
-return function(b){var c=this._.cache,d=c.ranges;d||(c.ranges=d=new CKEDITOR.dom.rangeList(a.call(this)));return b?f(new CKEDITOR.dom.rangeList(d.slice())):d}}(),getStartElement:function(){var a=this._.cache;if(void 0!==a.startElement)return a.startElement;var b;switch(this.getType()){case CKEDITOR.SELECTION_ELEMENT:return this.getSelectedElement();case CKEDITOR.SELECTION_TEXT:var c=this.getRanges()[0];if(c){if(c.collapsed)b=c.startContainer,b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());else{for(c.optimize();b=
-c.startContainer,c.startOffset==(b.getChildCount?b.getChildCount():b.getLength())&&!b.isBlockBoundary();)c.setStartAfter(b);b=c.startContainer;if(b.type!=CKEDITOR.NODE_ELEMENT)return b.getParent();if((b=b.getChild(c.startOffset))&&b.type==CKEDITOR.NODE_ELEMENT)for(c=b.getFirst();c&&c.type==CKEDITOR.NODE_ELEMENT;)b=c,c=c.getFirst();else b=c.startContainer}b=b.$}}return a.startElement=b?new CKEDITOR.dom.element(b):null},getSelectedElement:function(){var a=this._.cache;if(void 0!==a.selectedElement)return a.selectedElement;
-var b=this,c=CKEDITOR.tools.tryThese(function(){return b.getNative().createRange().item(0)},function(){for(var a=b.getRanges()[0].clone(),c,d,e=2;e&&!((c=a.getEnclosedNode())&&c.type==CKEDITOR.NODE_ELEMENT&&G[c.getName()]&&(d=c));e--)a.shrink(CKEDITOR.SHRINK_ELEMENT);return d&&d.$});return a.selectedElement=c?new CKEDITOR.dom.element(c):null},getSelectedText:function(){var a=this._.cache;if(void 0!==a.selectedText)return a.selectedText;var b=this.getNative(),b=p?"Control"==b.type?"":b.createRange().text:
-b.toString();return a.selectedText=b},lock:function(){this.getRanges();this.getStartElement();this.getSelectedElement();this.getSelectedText();this._.cache.nativeSel=null;this.isLocked=1},unlock:function(a){if(this.isLocked){if(a)var b=this.getSelectedElement(),c=!b&&this.getRanges(),d=this.isFake;this.isLocked=0;this.reset();a&&(a=b||c[0]&&c[0].getCommonAncestor())&&a.getAscendant("body",1)&&(d?this.fake(b):b?this.selectElement(b):this.selectRanges(c))}},reset:function(){this._.cache={};this.isFake=
-0;var a=this.root.editor;if(a&&a._.fakeSelection)if(this.rev==a._.fakeSelection.rev){delete a._.fakeSelection;var b=a._.hiddenSelectionContainer;if(b){var c=a.checkDirty();a.fire("lockSnapshot");b.remove();a.fire("unlockSnapshot");!c&&a.resetDirty()}delete a._.hiddenSelectionContainer}else CKEDITOR.warn("selection-fake-reset");this.rev=x++},selectElement:function(a){var b=new CKEDITOR.dom.range(this.root);b.setStartBefore(a);b.setEndAfter(a);this.selectRanges([b])},selectRanges:function(a){var b=
-this.root.editor,b=b&&b._.hiddenSelectionContainer;this.reset();if(b)for(var b=this.root,c,d=0;d<a.length;++d)c=a[d],c.endContainer.equals(b)&&(c.endOffset=Math.min(c.endOffset,b.getChildCount()));if(a.length)if(this.isLocked){var f=CKEDITOR.document.getActive();this.unlock();this.selectRanges(a);this.lock();f&&!f.equals(this.root)&&f.focus()}else{var k;a:{var q,w;if(1==a.length&&!(w=a[0]).collapsed&&(k=w.getEnclosedNode())&&k.type==CKEDITOR.NODE_ELEMENT&&(w=w.clone(),w.shrink(CKEDITOR.SHRINK_ELEMENT,
-!0),(q=w.getEnclosedNode())&&q.type==CKEDITOR.NODE_ELEMENT&&(k=q),"false"==k.getAttribute("contenteditable")))break a;k=void 0}if(k)this.fake(k);else{if(p){w=CKEDITOR.dom.walker.whitespaces(!0);q=/\ufeff|\u00a0/;b={table:1,tbody:1,tr:1};1<a.length&&(k=a[a.length-1],a[0].setEnd(k.endContainer,k.endOffset));k=a[0];a=k.collapsed;var t,u,r;if((c=k.getEnclosedNode())&&c.type==CKEDITOR.NODE_ELEMENT&&c.getName()in G&&(!c.is("a")||!c.getText()))try{r=c.$.createControlRange();r.addElement(c.$);r.select();
-return}catch(v){}if(k.startContainer.type==CKEDITOR.NODE_ELEMENT&&k.startContainer.getName()in b||k.endContainer.type==CKEDITOR.NODE_ELEMENT&&k.endContainer.getName()in b)k.shrink(CKEDITOR.NODE_ELEMENT,!0),a=k.collapsed;r=k.createBookmark();b=r.startNode;a||(f=r.endNode);r=k.document.$.body.createTextRange();r.moveToElementText(b.$);r.moveStart("character",1);f?(q=k.document.$.body.createTextRange(),q.moveToElementText(f.$),r.setEndPoint("EndToEnd",q),r.moveEnd("character",-1)):(t=b.getNext(w),u=
-b.hasAscendant("pre"),t=!(t&&t.getText&&t.getText().match(q))&&(u||!b.hasPrevious()||b.getPrevious().is&&b.getPrevious().is("br")),u=k.document.createElement("span"),u.setHtml("\x26#65279;"),u.insertBefore(b),t&&k.document.createText("").insertBefore(b));k.setStartBefore(b);b.remove();a?(t?(r.moveStart("character",-1),r.select(),k.document.$.selection.clear()):r.select(),k.moveToPosition(u,CKEDITOR.POSITION_BEFORE_START),u.remove()):(k.setEndBefore(f),f.remove(),r.select())}else{f=this.getNative();
-if(!f)return;this.removeAllRanges();for(r=0;r<a.length;r++){if(r<a.length-1&&(t=a[r],u=a[r+1],q=t.clone(),q.setStart(t.endContainer,t.endOffset),q.setEnd(u.startContainer,u.startOffset),!q.collapsed&&(q.shrink(CKEDITOR.NODE_ELEMENT,!0),k=q.getCommonAncestor(),q=q.getEnclosedNode(),k.isReadOnly()||q&&q.isReadOnly()))){u.setStart(t.startContainer,t.startOffset);a.splice(r--,1);continue}k=a[r];u=this.document.$.createRange();k.collapsed&&CKEDITOR.env.webkit&&e(k)&&(q=g(this.root),k.insertNode(q),(t=
-q.getNext())&&!q.getPrevious()&&t.type==CKEDITOR.NODE_ELEMENT&&"br"==t.getName()?(l(this.root),k.moveToPosition(t,CKEDITOR.POSITION_BEFORE_START)):k.moveToPosition(q,CKEDITOR.POSITION_AFTER_END));u.setStart(k.startContainer.$,k.startOffset);try{u.setEnd(k.endContainer.$,k.endOffset)}catch(I){if(0<=I.toString().indexOf("NS_ERROR_ILLEGAL_VALUE"))k.collapse(1),u.setEnd(k.endContainer.$,k.endOffset);else throw I;}f.addRange(u)}}this.reset();this.root.fire("selectionchange")}}},fake:function(a){var b=
-this.root.editor;this.reset();q(b);var c=this._.cache,d=new CKEDITOR.dom.range(this.root);d.setStartBefore(a);d.setEndAfter(a);c.ranges=new CKEDITOR.dom.rangeList(d);c.selectedElement=c.startElement=a;c.type=CKEDITOR.SELECTION_ELEMENT;c.selectedText=c.nativeSel=null;this.isFake=1;this.rev=x++;b._.fakeSelection=this;this.root.fire("selectionchange")},isHidden:function(){var a=this.getCommonAncestor();a&&a.type==CKEDITOR.NODE_TEXT&&(a=a.getParent());return!(!a||!a.data("cke-hidden-sel"))},createBookmarks:function(a){a=
-this.getRanges().createBookmarks(a);this.isFake&&(a.isFake=1);return a},createBookmarks2:function(a){a=this.getRanges().createBookmarks2(a);this.isFake&&(a.isFake=1);return a},selectBookmarks:function(a){for(var b=[],c,d=0;d<a.length;d++){var e=new CKEDITOR.dom.range(this.root);e.moveToBookmark(a[d]);b.push(e)}a.isFake&&(c=b[0].getEnclosedNode(),c&&c.type==CKEDITOR.NODE_ELEMENT||(CKEDITOR.warn("selection-not-fake"),a.isFake=0));a.isFake?this.fake(c):this.selectRanges(b);return this},getCommonAncestor:function(){var a=
-this.getRanges();return a.length?a[0].startContainer.getCommonAncestor(a[a.length-1].endContainer):null},scrollIntoView:function(){this.type!=CKEDITOR.SELECTION_NONE&&this.getRanges()[0].scrollIntoView()},removeAllRanges:function(){if(this.getType()!=CKEDITOR.SELECTION_NONE){var a=this.getNative();try{a&&a[p?"empty":"removeAllRanges"]()}catch(b){}this.reset()}}}})();"use strict";CKEDITOR.STYLE_BLOCK=1;CKEDITOR.STYLE_INLINE=2;CKEDITOR.STYLE_OBJECT=3;
-(function(){function a(a,b){for(var c,d;(a=a.getParent())&&!a.equals(b);)if(a.getAttribute("data-nostyle"))c=a;else if(!d){var e=a.getAttribute("contentEditable");"false"==e?c=a:"true"==e&&(d=1)}return c}function d(a,b,c,d){return(a.getPosition(b)|d)==d&&(!c.childRule||c.childRule(a))}function b(c){var f=c.document;if(c.collapsed)f=G(this,f),c.insertNode(f),c.moveToPosition(f,CKEDITOR.POSITION_BEFORE_END);else{var g=this.element,h=this._.definition,l,k=h.ignoreReadonly,m=k||h.includeReadonly;null==
-m&&(m=c.root.getCustomData("cke_includeReadonly"));var n=CKEDITOR.dtd[g];n||(l=!0,n=CKEDITOR.dtd.span);c.enlarge(CKEDITOR.ENLARGE_INLINE,1);c.trim();var p=c.createBookmark(),q=p.startNode,w=p.endNode,t=q,r;if(!k){var u=c.getCommonAncestor(),k=a(q,u),u=a(w,u);k&&(t=k.getNextSourceNode(!0));u&&(w=u)}for(t.getPosition(w)==CKEDITOR.POSITION_FOLLOWING&&(t=0);t;){k=!1;if(t.equals(w))t=null,k=!0;else{var y=t.type==CKEDITOR.NODE_ELEMENT?t.getName():null,u=y&&"false"==t.getAttribute("contentEditable"),x=y&&
-t.getAttribute("data-nostyle");if(y&&t.data("cke-bookmark")){t=t.getNextSourceNode(!0);continue}if(u&&m&&CKEDITOR.dtd.$block[y])for(var A=t,z=e(A),B=void 0,C=z.length,E=0,A=C&&new CKEDITOR.dom.range(A.getDocument());E<C;++E){var B=z[E],R=CKEDITOR.filter.instances[B.data("cke-filter")];if(R?R.check(this):1)A.selectNodeContents(B),b.call(this,A)}z=y?!n[y]||x?0:u&&!m?0:d(t,w,h,T):1;if(z)if(B=t.getParent(),z=h,C=g,E=l,!B||!(B.getDtd()||CKEDITOR.dtd.span)[C]&&!E||z.parentRule&&!z.parentRule(B))k=!0;else{if(r||
-y&&CKEDITOR.dtd.$removeEmpty[y]&&(t.getPosition(w)|T)!=T||(r=c.clone(),r.setStartBefore(t)),y=t.type,y==CKEDITOR.NODE_TEXT||u||y==CKEDITOR.NODE_ELEMENT&&!t.getChildCount()){for(var y=t,Y;(k=!y.getNext(H))&&(Y=y.getParent(),n[Y.getName()])&&d(Y,q,h,Q);)y=Y;r.setEndAfter(y)}}else k=!0;t=t.getNextSourceNode(x||u)}if(k&&r&&!r.collapsed){for(var k=G(this,f),u=k.hasAttributes(),x=r.getCommonAncestor(),y={},z={},B={},C={},U,O,da;k&&x;){if(x.getName()==g){for(U in h.attributes)!C[U]&&(da=x.getAttribute(O))&&
-(k.getAttribute(U)==da?z[U]=1:C[U]=1);for(O in h.styles)!B[O]&&(da=x.getStyle(O))&&(k.getStyle(O)==da?y[O]=1:B[O]=1)}x=x.getParent()}for(U in z)k.removeAttribute(U);for(O in y)k.removeStyle(O);u&&!k.hasAttributes()&&(k=null);k?(r.extractContents().appendTo(k),r.insertNode(k),D.call(this,k),k.mergeSiblings(),CKEDITOR.env.ie||k.$.normalize()):(k=new CKEDITOR.dom.element("span"),r.extractContents().appendTo(k),r.insertNode(k),D.call(this,k),k.remove(!0));r=null}}c.moveToBookmark(p);c.shrink(CKEDITOR.SHRINK_TEXT);
-c.shrink(CKEDITOR.NODE_ELEMENT,!0)}}function c(a){function b(){for(var a=new CKEDITOR.dom.elementPath(d.getParent()),c=new CKEDITOR.dom.elementPath(m.getParent()),e=null,f=null,g=0;g<a.elements.length;g++){var h=a.elements[g];if(h==a.block||h==a.blockLimit)break;n.checkElementRemovable(h,!0)&&(e=h)}for(g=0;g<c.elements.length;g++){h=c.elements[g];if(h==c.block||h==c.blockLimit)break;n.checkElementRemovable(h,!0)&&(f=h)}f&&m.breakParent(f);e&&d.breakParent(e)}a.enlarge(CKEDITOR.ENLARGE_INLINE,1);var c=
-a.createBookmark(),d=c.startNode;if(a.collapsed){for(var e=new CKEDITOR.dom.elementPath(d.getParent(),a.root),f,g=0,k;g<e.elements.length&&(k=e.elements[g])&&k!=e.block&&k!=e.blockLimit;g++)if(this.checkElementRemovable(k)){var l;a.collapsed&&(a.checkBoundaryOfElement(k,CKEDITOR.END)||(l=a.checkBoundaryOfElement(k,CKEDITOR.START)))?(f=k,f.match=l?"start":"end"):(k.mergeSiblings(),k.is(this.element)?t.call(this,k):p(k,h(this)[k.getName()]))}if(f){k=d;for(g=0;;g++){l=e.elements[g];if(l.equals(f))break;
-else if(l.match)continue;else l=l.clone();l.append(k);k=l}k["start"==f.match?"insertBefore":"insertAfter"](f)}}else{var m=c.endNode,n=this;b();for(e=d;!e.equals(m);)f=e.getNextSourceNode(),e.type==CKEDITOR.NODE_ELEMENT&&this.checkElementRemovable(e)&&(e.getName()==this.element?t.call(this,e):p(e,h(this)[e.getName()]),f.type==CKEDITOR.NODE_ELEMENT&&f.contains(d)&&(b(),f=d.getNext())),e=f}a.moveToBookmark(c);a.shrink(CKEDITOR.NODE_ELEMENT,!0)}function e(a){var b=[];a.forEach(function(a){if("true"==
-a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function g(a){var b=a.getEnclosedNode()||a.getCommonAncestor(!1,!0);(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1))&&!a.isReadOnly()&&u(a,this)}function l(a){var b=a.getCommonAncestor(!0,!0);if(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1)){var b=this._.definition,c=b.attributes;if(c)for(var d in c)a.removeAttribute(d,c[d]);if(b.styles)for(var e in b.styles)b.styles.hasOwnProperty(e)&&
-a.removeStyle(e)}}function k(a){var b=a.createBookmark(!0),c=a.createIterator();c.enforceRealBlocks=!0;this._.enterMode&&(c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR);for(var d,e=a.document,f;d=c.getNextParagraph();)!d.isReadOnly()&&(c.activeFilter?c.activeFilter.check(this):1)&&(f=G(this,e,d),w(d,f));a.moveToBookmark(b)}function q(a){var b=a.createBookmark(1),c=a.createIterator();c.enforceRealBlocks=!0;c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR;for(var d,e;d=c.getNextParagraph();)this.checkElementRemovable(d)&&
-(d.is("pre")?((e=this._.enterMode==CKEDITOR.ENTER_BR?null:a.document.createElement(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))&&d.copyAttributes(e),w(d,e)):t.call(this,d));a.moveToBookmark(b)}function w(a,b){var c=!b;c&&(b=a.getDocument().createElement("div"),a.copyAttributes(b));var d=b&&b.is("pre"),e=a.is("pre"),g=!d&&e;if(d&&!e){e=b;(g=a.getBogus())&&g.remove();g=a.getHtml();g=y(g,/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,"");g=g.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,"$1");g=g.replace(/([ \t\n\r]+|&nbsp;)/g,
-" ");g=g.replace(/<br\b[^>]*>/gi,"\n");if(CKEDITOR.env.ie){var h=a.getDocument().createElement("div");h.append(e);e.$.outerHTML="\x3cpre\x3e"+g+"\x3c/pre\x3e";e.copyAttributes(h.getFirst());e=h.getFirst().remove()}else e.setHtml(g);b=e}else g?b=A(c?[a.getHtml()]:f(a),b):a.moveChildren(b);b.replace(a);if(d){var c=b,k;(k=c.getPrevious(R))&&k.type==CKEDITOR.NODE_ELEMENT&&k.is("pre")&&(d=y(k.getHtml(),/\n$/,"")+"\n\n"+y(c.getHtml(),/^\n/,""),CKEDITOR.env.ie?c.$.outerHTML="\x3cpre\x3e"+d+"\x3c/pre\x3e":
-c.setHtml(d),k.remove())}else c&&x(b)}function f(a){var b=[];y(a.getOuterHtml(),/(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,function(a,b,c){return b+"\x3c/pre\x3e"+c+"\x3cpre\x3e"}).replace(/<pre\b.*?>([\s\S]*?)<\/pre>/gi,function(a,c){b.push(c)});return b}function y(a,b,c){var d="",e="";a=a.replace(/(^<span[^>]+data-cke-bookmark.*?\/span>)|(<span[^>]+data-cke-bookmark.*?\/span>$)/gi,function(a,b,c){b&&(d=b);c&&(e=c);return""});return d+a.replace(b,c)+e}function A(a,b){var c;
-1<a.length&&(c=new CKEDITOR.dom.documentFragment(b.getDocument()));for(var d=0;d<a.length;d++){var e=a[d],e=e.replace(/(\r\n|\r)/g,"\n"),e=y(e,/^[ \t]*\n/,""),e=y(e,/\n$/,""),e=y(e,/^[ \t]+|[ \t]+$/g,function(a,b){return 1==a.length?"\x26nbsp;":b?" "+CKEDITOR.tools.repeat("\x26nbsp;",a.length-1):CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "}),e=e.replace(/\n/g,"\x3cbr\x3e"),e=e.replace(/[ \t]{2,}/g,function(a){return CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "});if(c){var f=b.clone();f.setHtml(e);
-c.append(f)}else b.setHtml(e)}return c||b}function t(a,b){var c=this._.definition,d=c.attributes,c=c.styles,e=h(this)[a.getName()],f=CKEDITOR.tools.isEmpty(d)&&CKEDITOR.tools.isEmpty(c),g;for(g in d)if("class"!=g&&!this._.definition.fullMatch||a.getAttribute(g)==n(g,d[g]))b&&"data-"==g.slice(0,5)||(f=a.hasAttribute(g),a.removeAttribute(g));for(var k in c)this._.definition.fullMatch&&a.getStyle(k)!=n(k,c[k],!0)||(f=f||!!a.getStyle(k),a.removeStyle(k));p(a,e,z[a.getName()]);f&&(this._.definition.alwaysRemoveElement?
-x(a,1):!CKEDITOR.dtd.$block[a.getName()]||this._.enterMode==CKEDITOR.ENTER_BR&&!a.hasAttributes()?x(a):a.renameNode(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))}function D(a){for(var b=h(this),c=a.getElementsByTag(this.element),d,e=c.count();0<=--e;)d=c.getItem(e),d.isReadOnly()||t.call(this,d,!0);for(var f in b)if(f!=this.element)for(c=a.getElementsByTag(f),e=c.count()-1;0<=e;e--)d=c.getItem(e),d.isReadOnly()||p(d,b[f])}function p(a,b,c){if(b=b&&b.attributes)for(var d=0;d<b.length;d++){var e=b[d][0],
+(function(){function a(a,e,g,k){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var h=new CKEDITOR.editor(e,a,k);k==CKEDITOR.ELEMENT_MODE_REPLACE&&(a.setStyle("visibility","hidden"),h._.required=a.hasAttribute("required"),a.removeAttribute("required"));g&&h.setData(g,null,!0);h.on("loaded",function(){b(h);k==CKEDITOR.ELEMENT_MODE_REPLACE&&h.config.autoUpdateElement&&
+a.$.form&&h._attachToForm();h.setMode(h.config.startupMode,function(){h.resetDirty();h.status="ready";h.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,h)})});h.on("destroy",d);return h}function d(){var a=this.container,b=this.element;a&&(a.clearCustomData(),a.remove());b&&(b.clearCustomData(),this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&(b.show(),this._.required&&b.setAttribute("required","required")),delete this.element)}function b(a){var b=a.name,d=a.element,k=a.elementMode,h=
+a.fire("uiSpace",{space:"top",html:""}).html,p=a.fire("uiSpace",{space:"bottom",html:""}).html,r=new CKEDITOR.template('\x3c{outerEl} id\x3d"cke_{name}" class\x3d"{id} cke cke_reset cke_chrome cke_editor_{name} cke_{langDir} '+CKEDITOR.env.cssClass+'"  dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"application"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':"")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':"")+'\x3c{outerEl} class\x3d"cke_inner cke_reset" role\x3d"presentation"\x3e{topHtml}\x3c{outerEl} id\x3d"{contentId}" class\x3d"cke_contents cke_reset" role\x3d"presentation"\x3e\x3c/{outerEl}\x3e{bottomHtml}\x3c/{outerEl}\x3e\x3c/{outerEl}\x3e'),
+b=CKEDITOR.dom.element.createFromHtml(r.output({id:a.id,name:b,langDir:a.lang.dir,langCode:a.langCode,voiceLabel:a.title,topHtml:h?'\x3cspan id\x3d"'+a.ui.spaceId("top")+'" class\x3d"cke_top cke_reset_all" role\x3d"presentation" style\x3d"height:auto"\x3e'+h+"\x3c/span\x3e":"",contentId:a.ui.spaceId("contents"),bottomHtml:p?'\x3cspan id\x3d"'+a.ui.spaceId("bottom")+'" class\x3d"cke_bottom cke_reset_all" role\x3d"presentation"\x3e'+p+"\x3c/span\x3e":"",outerEl:CKEDITOR.env.ie?"span":"div"}));k==CKEDITOR.ELEMENT_MODE_REPLACE?
+(d.hide(),b.insertAfter(d)):d.append(b);a.container=b;a.ui.contentsElement=a.ui.space("contents");h&&a.ui.space("top").unselectable();p&&a.ui.space("bottom").unselectable();d=a.config.width;k=a.config.height;d&&b.setStyle("width",CKEDITOR.tools.cssLength(d));k&&a.ui.space("contents").setStyle("height",CKEDITOR.tools.cssLength(k));b.disableContextMenu();CKEDITOR.env.webkit&&b.on("focus",function(){a.focus()});a.fireOnce("uiReady")}CKEDITOR.replace=function(b,d){return a(b,d,null,CKEDITOR.ELEMENT_MODE_REPLACE)};
+CKEDITOR.appendTo=function(b,d,g){return a(b,d,g,CKEDITOR.ELEMENT_MODE_APPENDTO)};CKEDITOR.replaceAll=function(){for(var a=document.getElementsByTagName("textarea"),b=0;b<a.length;b++){var d=null,k=a[b];if(k.name||k.id){if("string"==typeof arguments[0]){if(!(new RegExp("(?:^|\\s)"+arguments[0]+"(?:$|\\s)")).test(k.className))continue}else if("function"==typeof arguments[0]&&(d={},!1===arguments[0](k,d)))continue;this.replace(k,d)}}};CKEDITOR.editor.prototype.addMode=function(a,b){(this._.modes||(this._.modes=
+{}))[a]=b};CKEDITOR.editor.prototype.setMode=function(a,b){var d=this,k=this._.modes;if(a!=d.mode&&k&&k[a]){d.fire("beforeSetMode",a);if(d.mode){var h=d.checkDirty(),k=d._.previousModeData,p,r=0;d.fire("beforeModeUnload");d.editable(0);d._.previousMode=d.mode;d._.previousModeData=p=d.getData(1);"source"==d.mode&&k==p&&(d.fire("lockSnapshot",{forceUpdate:!0}),r=1);d.ui.space("contents").setHtml("");d.mode=""}else d._.previousModeData=d.getData(1);this._.modes[a](function(){d.mode=a;void 0!==h&&!h&&
+d.resetDirty();r?d.fire("unlockSnapshot"):"wysiwyg"==a&&d.fire("saveSnapshot");setTimeout(function(){d.fire("mode");b&&b.call(d)},0)})}};CKEDITOR.editor.prototype.resize=function(a,b,d,k){var h=this.container,p=this.ui.space("contents"),r=CKEDITOR.env.webkit&&this.document&&this.document.getWindow().$.frameElement;k=k?this.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}):h;k.setSize("width",a,!0);r&&(r.style.width="1%");var f=(k.$.offsetHeight||0)-(p.$.clientHeight||
+0),h=Math.max(b-(d?0:f),0);b=d?b+f:b;p.setStyle("height",h+"px");r&&(r.style.width="100%");this.fire("resize",{outerHeight:b,contentsHeight:h,outerWidth:a||k.getSize("width")})};CKEDITOR.editor.prototype.getResizable=function(a){return a?this.ui.space("contents"):this.container};CKEDITOR.domReady(function(){CKEDITOR.replaceClass&&CKEDITOR.replaceAll(CKEDITOR.replaceClass)})})();CKEDITOR.config.startupMode="wysiwyg";
+(function(){function a(a){var b=a.editor,e=a.data.path,f=e.blockLimit,g=a.data.selection,h=g.getRanges()[0],D;if(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller)if(g=d(g,e))g.appendBogus(),D=CKEDITOR.env.ie;k(b,e.block,f)&&h.collapsed&&!h.getCommonAncestor().isReadOnly()&&(e=h.clone(),e.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS),f=new CKEDITOR.dom.walker(e),f.guard=function(a){return!c(a)||a.type==CKEDITOR.NODE_COMMENT||a.isReadOnly()},!f.checkForward()||e.checkStartOfBlock()&&e.checkEndOfBlock())&&
+(b=h.fixBlock(!0,b.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p"),CKEDITOR.env.needsBrFiller||(b=b.getFirst(c))&&b.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(b.getText()).match(/^(?:&nbsp;|\xa0)$/)&&b.remove(),D=1,a.cancel());D&&h.select()}function d(a,b){if(a.isFake)return 0;var d=b.block||b.blockLimit,e=d&&d.getLast(c);if(!(!d||!d.isBlockBoundary()||e&&e.type==CKEDITOR.NODE_ELEMENT&&e.isBlockBoundary()||d.is("pre")||d.getBogus()))return d}function b(a){var b=a.data.getTarget();b.is("input")&&
+(b=b.getAttribute("type"),"submit"!=b&&"reset"!=b||a.data.preventDefault())}function c(a){return f(a)&&B(a)}function e(a,b){return function(c){var d=c.data.$.toElement||c.data.$.fromElement||c.data.$.relatedTarget;(d=d&&d.nodeType==CKEDITOR.NODE_ELEMENT?new CKEDITOR.dom.element(d):null)&&(b.equals(d)||b.contains(d))||a.call(this,c)}}function g(a){function b(a){return function(b,l){l&&b.type==CKEDITOR.NODE_ELEMENT&&b.is(f)&&(d=b);if(!(l||!c(b)||a&&z(b)))return!1}}var d,e=a.getRanges()[0];a=a.root;
+var f={table:1,ul:1,ol:1,dl:1};if(e.startPath().contains(f)){var g=e.clone();g.collapse(1);g.setStartAt(a,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(g);a.guard=b();a.checkBackward();if(d)return g=e.clone(),g.collapse(),g.setEndAt(d,CKEDITOR.POSITION_AFTER_END),a=new CKEDITOR.dom.walker(g),a.guard=b(!0),d=!1,a.checkForward(),d}return null}function k(a,b,c){return!1!==a.config.autoParagraph&&a.activeEnterMode!=CKEDITOR.ENTER_BR&&(a.editable().equals(c)&&!b||b&&"true"==b.getAttribute("contenteditable"))}
+function h(a){return a.activeEnterMode!=CKEDITOR.ENTER_BR&&!1!==a.config.autoParagraph?a.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p":!1}function p(a){var b=a.editor;b.getSelection().scrollIntoView();setTimeout(function(){b.fire("saveSnapshot")},0)}function r(a,b,c){var d=a.getCommonAncestor(b);for(b=a=c?b:a;(a=a.getParent())&&!d.equals(a)&&1==a.getChildCount();)b=a;b.remove()}var f,B,u,z,y,m,x,J,w,F;CKEDITOR.editable=CKEDITOR.tools.createClass({base:CKEDITOR.dom.element,$:function(a,b){this.base(b.$||
+b);this.editor=a;this.status="unloaded";this.hasFocus=!1;this.setup()},proto:{focus:function(){var a;if(CKEDITOR.env.webkit&&!this.hasFocus&&(a=this.editor._.previousActive||this.getDocument().getActive(),this.contains(a))){a.focus();return}CKEDITOR.env.edge&&14<CKEDITOR.env.version&&!this.hasFocus&&this.getDocument().equals(CKEDITOR.document)&&(this.editor._.previousScrollTop=this.$.scrollTop);try{!CKEDITOR.env.ie||CKEDITOR.env.edge&&14<CKEDITOR.env.version||!this.getDocument().equals(CKEDITOR.document)?
+this.$.focus():this.$.setActive()}catch(b){if(!CKEDITOR.env.ie)throw b;}CKEDITOR.env.safari&&!this.isInline()&&(a=CKEDITOR.document.getActive(),a.equals(this.getWindow().getFrame())||this.getWindow().focus())},on:function(a,b){var c=Array.prototype.slice.call(arguments,0);CKEDITOR.env.ie&&/^focus|blur$/.exec(a)&&(a="focus"==a?"focusin":"focusout",b=e(b,this),c[0]=a,c[1]=b);return CKEDITOR.dom.element.prototype.on.apply(this,c)},attachListener:function(a){!this._.listeners&&(this._.listeners=[]);var b=
+Array.prototype.slice.call(arguments,1),b=a.on.apply(a,b);this._.listeners.push(b);return b},clearListeners:function(){var a=this._.listeners;try{for(;a.length;)a.pop().removeListener()}catch(b){}},restoreAttrs:function(){var a=this._.attrChanges,b,c;for(c in a)a.hasOwnProperty(c)&&(b=a[c],null!==b?this.setAttribute(c,b):this.removeAttribute(c))},attachClass:function(a){var b=this.getCustomData("classes");this.hasClass(a)||(!b&&(b=[]),b.push(a),this.setCustomData("classes",b),this.addClass(a))},changeAttr:function(a,
+b){var c=this.getAttribute(a);b!==c&&(!this._.attrChanges&&(this._.attrChanges={}),a in this._.attrChanges||(this._.attrChanges[a]=c),this.setAttribute(a,b))},insertText:function(a){this.editor.focus();this.insertHtml(this.transformPlainTextToHtml(a),"text")},transformPlainTextToHtml:function(a){var b=this.editor.getSelection().getStartElement().hasAscendant("pre",!0)?CKEDITOR.ENTER_BR:this.editor.activeEnterMode;return CKEDITOR.tools.transformPlainTextToHtml(a,b)},insertHtml:function(a,b,c){var d=
+this.editor;d.focus();d.fire("saveSnapshot");c||(c=d.getSelection().getRanges()[0]);m(this,b||"html",a,c);c.select();p(this);this.editor.fire("afterInsertHtml",{})},insertHtmlIntoRange:function(a,b,c){m(this,c||"html",a,b);this.editor.fire("afterInsertHtml",{intoRange:b})},insertElement:function(a,b){var d=this.editor;d.focus();d.fire("saveSnapshot");var e=d.activeEnterMode,d=d.getSelection(),f=a.getName(),f=CKEDITOR.dtd.$block[f];b||(b=d.getRanges()[0]);this.insertElementIntoRange(a,b)&&(b.moveToPosition(a,
+CKEDITOR.POSITION_AFTER_END),f&&((f=a.getNext(function(a){return c(a)&&!z(a)}))&&f.type==CKEDITOR.NODE_ELEMENT&&f.is(CKEDITOR.dtd.$block)?f.getDtd()["#"]?b.moveToElementEditStart(f):b.moveToElementEditEnd(a):f||e==CKEDITOR.ENTER_BR||(f=b.fixBlock(!0,e==CKEDITOR.ENTER_DIV?"div":"p"),b.moveToElementEditStart(f))));d.selectRanges([b]);p(this)},insertElementIntoSelection:function(a){this.insertElement(a)},insertElementIntoRange:function(a,b){var c=this.editor,d=c.config.enterMode,e=a.getName(),f=CKEDITOR.dtd.$block[e];
+if(b.checkReadOnly())return!1;b.deleteContents(1);b.startContainer.type==CKEDITOR.NODE_ELEMENT&&(b.startContainer.is({tr:1,table:1,tbody:1,thead:1,tfoot:1})?x(b):b.startContainer.is(CKEDITOR.dtd.$list)&&J(b));var g,k;if(f)for(;(g=b.getCommonAncestor(0,1))&&(k=CKEDITOR.dtd[g.getName()])&&(!k||!k[e]);)g.getName()in CKEDITOR.dtd.span?b.splitElement(g):b.checkStartOfBlock()&&b.checkEndOfBlock()?(b.setStartBefore(g),b.collapse(!0),g.remove()):b.splitBlock(d==CKEDITOR.ENTER_DIV?"div":"p",c.editable());
+b.insertNode(a);return!0},setData:function(a,b){b||(a=this.editor.dataProcessor.toHtml(a));this.setHtml(a);this.fixInitialSelection();"unloaded"==this.status&&(this.status="ready");this.editor.fire("dataReady")},getData:function(a){var b=this.getHtml();a||(b=this.editor.dataProcessor.toDataFormat(b));return b},setReadOnly:function(a){this.setAttribute("contenteditable",!a)},detach:function(){this.removeClass("cke_editable");this.status="detached";var a=this.editor;this._.detach();delete a.document;
+delete a.window},isInline:function(){return this.getDocument().equals(CKEDITOR.document)},fixInitialSelection:function(){function a(){var b=c.getDocument().$,d=b.getSelection(),l;a:if(d.anchorNode&&d.anchorNode==c.$)l=!0;else{if(CKEDITOR.env.webkit&&(l=c.getDocument().getActive())&&l.equals(c)&&!d.anchorNode){l=!0;break a}l=void 0}l&&(l=new CKEDITOR.dom.range(c),l.moveToElementEditStart(c),b=b.createRange(),b.setStart(l.startContainer.$,l.startOffset),b.collapse(!0),d.removeAllRanges(),d.addRange(b))}
+function b(){var a=c.getDocument().$,d=a.selection,l=c.getDocument().getActive();"None"==d.type&&l.equals(c)&&(d=new CKEDITOR.dom.range(c),a=a.body.createTextRange(),d.moveToElementEditStart(c),d=d.startContainer,d.type!=CKEDITOR.NODE_ELEMENT&&(d=d.getParent()),a.moveToElementText(d.$),a.collapse(!0),a.select())}var c=this;if(CKEDITOR.env.ie&&(9>CKEDITOR.env.version||CKEDITOR.env.quirks))this.hasFocus&&(this.focus(),b());else if(this.hasFocus)this.focus(),a();else this.once("focus",function(){a()},
+null,null,-999)},getHtmlFromRange:function(a){if(a.collapsed)return new CKEDITOR.dom.documentFragment(a.document);a={doc:this.getDocument(),range:a.clone()};w.eol.detect(a,this);w.bogus.exclude(a);w.cell.shrink(a);a.fragment=a.range.cloneContents();w.tree.rebuild(a,this);w.eol.fix(a,this);return new CKEDITOR.dom.documentFragment(a.fragment.$)},extractHtmlFromRange:function(a,b){var c=F,d={range:a,doc:a.document},e=this.getHtmlFromRange(a);if(a.collapsed)return a.optimize(),e;a.enlarge(CKEDITOR.ENLARGE_INLINE,
+1);c.table.detectPurge(d);d.bookmark=a.createBookmark();delete d.range;var f=this.editor.createRange();f.moveToPosition(d.bookmark.startNode,CKEDITOR.POSITION_BEFORE_START);d.targetBookmark=f.createBookmark();c.list.detectMerge(d,this);c.table.detectRanges(d,this);c.block.detectMerge(d,this);d.tableContentsRanges?(c.table.deleteRanges(d),a.moveToBookmark(d.bookmark),d.range=a):(a.moveToBookmark(d.bookmark),d.range=a,a.extractContents(c.detectExtractMerge(d)));a.moveToBookmark(d.targetBookmark);a.optimize();
+c.fixUneditableRangePosition(a);c.list.merge(d,this);c.table.purge(d,this);c.block.merge(d,this);if(b){c=a.startPath();if(d=a.checkStartOfBlock()&&a.checkEndOfBlock()&&c.block&&!a.root.equals(c.block)){a:{var d=c.block.getElementsByTag("span"),f=0,g;if(d)for(;g=d.getItem(f++);)if(!B(g)){d=!0;break a}d=!1}d=!d}d&&(a.moveToPosition(c.block,CKEDITOR.POSITION_BEFORE_START),c.block.remove())}else c.autoParagraph(this.editor,a),u(a.startContainer)&&a.startContainer.appendBogus();a.startContainer.mergeSiblings();
+return e},setup:function(){var a=this.editor;this.attachListener(a,"beforeGetData",function(){var b=this.getData();this.is("textarea")||!1!==a.config.ignoreEmptyParagraph&&(b=b.replace(y,function(a,b){return b}));a.setData(b,null,1)},this);this.attachListener(a,"getSnapshot",function(a){a.data=this.getData(1)},this);this.attachListener(a,"afterSetData",function(){this.setData(a.getData(1))},this);this.attachListener(a,"loadSnapshot",function(a){this.setData(a.data,1)},this);this.attachListener(a,
+"beforeFocus",function(){var b=a.getSelection();(b=b&&b.getNative())&&"Control"==b.type||this.focus()},this);this.attachListener(a,"insertHtml",function(a){this.insertHtml(a.data.dataValue,a.data.mode,a.data.range)},this);this.attachListener(a,"insertElement",function(a){this.insertElement(a.data)},this);this.attachListener(a,"insertText",function(a){this.insertText(a.data)},this);this.setReadOnly(a.readOnly);this.attachClass("cke_editable");a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?this.attachClass("cke_editable_inline"):
+a.elementMode!=CKEDITOR.ELEMENT_MODE_REPLACE&&a.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||this.attachClass("cke_editable_themed");this.attachClass("cke_contents_"+a.config.contentsLangDirection);a.keystrokeHandler.blockedKeystrokes[8]=+a.readOnly;a.keystrokeHandler.attach(this);this.on("blur",function(){this.hasFocus=!1},null,null,-1);this.on("focus",function(){this.hasFocus=!0},null,null,-1);if(CKEDITOR.env.webkit)this.on("scroll",function(){a._.previousScrollTop=a.editable().$.scrollTop},null,
+null,-1);if(CKEDITOR.env.edge&&14<CKEDITOR.env.version){var d=function(){var b=a.editable();null!=a._.previousScrollTop&&b.getDocument().equals(CKEDITOR.document)&&(b.$.scrollTop=a._.previousScrollTop,a._.previousScrollTop=null,this.removeListener("scroll",d))};this.on("scroll",d)}a.focusManager.add(this);this.equals(CKEDITOR.document.getActive())&&(this.hasFocus=!0,a.once("contentDom",function(){a.focusManager.focus(this)},this));this.isInline()&&this.changeAttr("tabindex",a.tabIndex);if(!this.is("textarea")){a.document=
+this.getDocument();a.window=this.getWindow();var e=a.document;this.changeAttr("spellcheck",!a.config.disableNativeSpellChecker);var t=a.config.contentsLangDirection;this.getDirection(1)!=t&&this.changeAttr("dir",t);var k=CKEDITOR.getCss();if(k){var t=e.getHead(),h=t.getCustomData("stylesheet");h?k!=h.getText()&&(CKEDITOR.env.ie&&9>CKEDITOR.env.version?h.$.styleSheet.cssText=k:h.setText(k)):(k=e.appendStyleText(k),k=new CKEDITOR.dom.element(k.ownerNode||k.owningElement),t.setCustomData("stylesheet",
+k),k.data("cke-temp",1))}t=e.getCustomData("stylesheet_ref")||0;e.setCustomData("stylesheet_ref",t+1);this.setCustomData("cke_includeReadonly",!a.config.disableReadonlyStyling);this.attachListener(this,"click",function(a){a=a.data;var b=(new CKEDITOR.dom.elementPath(a.getTarget(),this)).contains("a");b&&2!=a.$.button&&b.isReadOnly()&&a.preventDefault()});var D={8:1,46:1};this.attachListener(a,"key",function(b){if(a.readOnly)return!0;var c=b.data.domEvent.getKey(),d;if(c in D){b=a.getSelection();var e,
+n=b.getRanges()[0],q=n.startPath(),t,k,h,c=8==c;CKEDITOR.env.ie&&11>CKEDITOR.env.version&&(e=b.getSelectedElement())||(e=g(b))?(a.fire("saveSnapshot"),n.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START),e.remove(),n.select(),a.fire("saveSnapshot"),d=1):n.collapsed&&((t=q.block)&&(h=t[c?"getPrevious":"getNext"](f))&&h.type==CKEDITOR.NODE_ELEMENT&&h.is("table")&&n[c?"checkStartOfBlock":"checkEndOfBlock"]()?(a.fire("saveSnapshot"),n[c?"checkEndOfBlock":"checkStartOfBlock"]()&&t.remove(),n["moveToElementEdit"+
+(c?"End":"Start")](h),n.select(),a.fire("saveSnapshot"),d=1):q.blockLimit&&q.blockLimit.is("td")&&(k=q.blockLimit.getAscendant("table"))&&n.checkBoundaryOfElement(k,c?CKEDITOR.START:CKEDITOR.END)&&(h=k[c?"getPrevious":"getNext"](f))?(a.fire("saveSnapshot"),n["moveToElementEdit"+(c?"End":"Start")](h),n.checkStartOfBlock()&&n.checkEndOfBlock()?h.remove():n.select(),a.fire("saveSnapshot"),d=1):(k=q.contains(["td","th","caption"]))&&n.checkBoundaryOfElement(k,c?CKEDITOR.START:CKEDITOR.END)&&(d=1))}return!d});
+a.blockless&&CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller&&this.attachListener(this,"keyup",function(b){b.data.getKeystroke()in D&&!this.getFirst(c)&&(this.appendBogus(),b=a.createRange(),b.moveToPosition(this,CKEDITOR.POSITION_AFTER_START),b.select())});this.attachListener(this,"dblclick",function(b){if(a.readOnly)return!1;b={element:b.data.getTarget()};a.fire("doubleclick",b)});CKEDITOR.env.ie&&this.attachListener(this,"click",b);CKEDITOR.env.ie&&!CKEDITOR.env.edge||this.attachListener(this,"mousedown",
+function(b){var c=b.data.getTarget();c.is("img","hr","input","textarea","select")&&!c.isReadOnly()&&(a.getSelection().selectElement(c),c.is("input","textarea","select")&&b.data.preventDefault())});CKEDITOR.env.edge&&this.attachListener(this,"mouseup",function(b){(b=b.data.getTarget())&&b.is("img")&&a.getSelection().selectElement(b)});CKEDITOR.env.gecko&&this.attachListener(this,"mouseup",function(b){if(2==b.data.$.button&&(b=b.data.getTarget(),!b.getOuterHtml().replace(y,""))){var c=a.createRange();
+c.moveToElementEditStart(b);c.select(!0)}});CKEDITOR.env.webkit&&(this.attachListener(this,"click",function(a){a.data.getTarget().is("input","select")&&a.data.preventDefault()}),this.attachListener(this,"mouseup",function(a){a.data.getTarget().is("input","textarea")&&a.data.preventDefault()}));CKEDITOR.env.webkit&&this.attachListener(a,"key",function(b){if(a.readOnly)return!0;b=b.data.domEvent.getKey();if(b in D){var c=8==b,d=a.getSelection().getRanges()[0];b=d.startPath();if(d.collapsed)a:{var e=
+b.block;if(e&&d[c?"checkStartOfBlock":"checkEndOfBlock"]()&&d.moveToClosestEditablePosition(e,!c)&&d.collapsed){if(d.startContainer.type==CKEDITOR.NODE_ELEMENT){var f=d.startContainer.getChild(d.startOffset-(c?1:0));if(f&&f.type==CKEDITOR.NODE_ELEMENT&&f.is("hr")){a.fire("saveSnapshot");f.remove();b=!0;break a}}d=d.startPath().block;if(!d||d&&d.contains(e))b=void 0;else{a.fire("saveSnapshot");var n;(n=(c?d:e).getBogus())&&n.remove();n=a.getSelection();f=n.createBookmarks();(c?e:d).moveChildren(c?
+d:e,!1);b.lastElement.mergeSiblings();r(e,d,!c);n.selectBookmarks(f);b=!0}}else b=!1}else c=d,n=b.block,d=c.endPath().block,n&&d&&!n.equals(d)?(a.fire("saveSnapshot"),(e=n.getBogus())&&e.remove(),c.enlarge(CKEDITOR.ENLARGE_INLINE),c.deleteContents(),d.getParent()&&(d.moveChildren(n,!1),b.lastElement.mergeSiblings(),r(n,d,!0)),c=a.getSelection().getRanges()[0],c.collapse(1),c.optimize(),""===c.startContainer.getHtml()&&c.startContainer.appendBogus(),c.select(),b=!0):b=!1;if(!b)return;a.getSelection().scrollIntoView();
+a.fire("saveSnapshot");return!1}},this,null,100)}}},_:{detach:function(){this.editor.setData(this.editor.getData(),0,1);this.clearListeners();this.restoreAttrs();var a;if(a=this.removeCustomData("classes"))for(;a.length;)this.removeClass(a.pop());if(!this.is("textarea")){a=this.getDocument();var b=a.getHead();if(b.getCustomData("stylesheet")){var c=a.getCustomData("stylesheet_ref");--c?a.setCustomData("stylesheet_ref",c):(a.removeCustomData("stylesheet_ref"),b.removeCustomData("stylesheet").remove())}}this.editor.fire("contentDomUnload");
+delete this.editor}}});CKEDITOR.editor.prototype.editable=function(a){var b=this._.editable;if(b&&a)return 0;arguments.length&&(b=this._.editable=a?a instanceof CKEDITOR.editable?a:new CKEDITOR.editable(this,a):(b&&b.detach(),null));return b};CKEDITOR.on("instanceLoaded",function(b){var c=b.editor;c.on("insertElement",function(a){a=a.data;a.type==CKEDITOR.NODE_ELEMENT&&(a.is("input")||a.is("textarea"))&&("false"!=a.getAttribute("contentEditable")&&a.data("cke-editable",a.hasAttribute("contenteditable")?
+"true":"1"),a.setAttribute("contentEditable",!1))});c.on("selectionChange",function(b){if(!c.readOnly){var d=c.getSelection();d&&!d.isLocked&&(d=c.checkDirty(),c.fire("lockSnapshot"),a(b),c.fire("unlockSnapshot"),!d&&c.resetDirty())}})});CKEDITOR.on("instanceCreated",function(a){var b=a.editor;b.on("mode",function(){var a=b.editable();if(a&&a.isInline()){var c=b.title;a.changeAttr("role","textbox");a.changeAttr("aria-label",c);c&&a.changeAttr("title",c);var d=b.fire("ariaEditorHelpLabel",{}).label;
+if(d&&(c=this.ui.space(this.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?"top":"contents"))){var e=CKEDITOR.tools.getNextId(),d=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+e+'" class\x3d"cke_voice_label"\x3e'+d+"\x3c/span\x3e");c.append(d);a.changeAttr("aria-describedby",e)}}})});CKEDITOR.addCss(".cke_editable{cursor:text}.cke_editable img,.cke_editable input,.cke_editable textarea{cursor:default}");f=CKEDITOR.dom.walker.whitespaces(!0);B=CKEDITOR.dom.walker.bookmark(!1,!0);u=CKEDITOR.dom.walker.empty();
+z=CKEDITOR.dom.walker.bogus();y=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;m=function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT}function b(c,d){var e,f,n,t,g=[],k=d.range.startContainer;e=d.range.startPath();for(var k=p[k.getName()],h=0,C=c.getChildren(),A=C.count(),D=-1,m=-1,r=0,H=e.contains(p.$list);h<A;++h)e=C.getItem(h),a(e)?(n=e.getName(),H&&n in CKEDITOR.dtd.$list?g=g.concat(b(e,d)):(t=!!k[n],
+"br"!=n||!e.data("cke-eol")||h&&h!=A-1||(r=(f=h?g[h-1].node:C.getItem(h+1))&&(!a(f)||!f.is("br")),f=f&&a(f)&&p.$block[f.getName()]),-1!=D||t||(D=h),t||(m=h),g.push({isElement:1,isLineBreak:r,isBlock:e.isBlockBoundary(),hasBlockSibling:f,node:e,name:n,allowed:t}),f=r=0)):g.push({isElement:0,node:e,allowed:1});-1<D&&(g[D].firstNotAllowed=1);-1<m&&(g[m].lastNotAllowed=1);return g}function d(b,c){var e=[],f=b.getChildren(),q=f.count(),g,t=0,k=p[c],h=!b.is(p.$inline)||b.is("br");for(h&&e.push(" ");t<q;t++)g=
+f.getItem(t),a(g)&&!g.is(k)?e=e.concat(d(g,c)):e.push(g);h&&e.push(" ");return e}function e(b){return a(b.startContainer)&&b.startContainer.getChild(b.startOffset-1)}function f(b){return b&&a(b)&&(b.is(p.$removeEmpty)||b.is("a")&&!b.isBlockBoundary())}function g(b,c,d,e){var f=b.clone(),n,q;f.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);(n=(new CKEDITOR.dom.walker(f)).next())&&a(n)&&m[n.getName()]&&(q=n.getPrevious())&&a(q)&&!q.getParent().equals(b.startContainer)&&d.contains(q)&&e.contains(n)&&n.isIdentical(q)&&
+(n.moveChildren(q),n.remove(),g(b,c,d,e))}function D(b,c){function d(b,c){if(c.isBlock&&c.isElement&&!c.node.is("br")&&a(b)&&b.is("br"))return b.remove(),1}var e=c.endContainer.getChild(c.endOffset),f=c.endContainer.getChild(c.endOffset-1);e&&d(e,b[b.length-1]);f&&d(f,b[0])&&(c.setEnd(c.endContainer,c.endOffset-1),c.collapse())}var p=CKEDITOR.dtd,m={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,ul:1,ol:1,li:1,pre:1,dl:1,blockquote:1},r={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},x=CKEDITOR.tools.extend({},
+p.$inline);delete x.br;return function(m,v,G,E){var I=m.editor,K=!1;"unfiltered_html"==v&&(v="html",K=!0);if(!E.checkReadOnly()){var L=(new CKEDITOR.dom.elementPath(E.startContainer,E.root)).blockLimit||E.root;m={type:v,dontFilter:K,editable:m,editor:I,range:E,blockLimit:L,mergeCandidates:[],zombies:[]};v=m.range;E=m.mergeCandidates;var H,u;"text"==m.type&&v.shrink(CKEDITOR.SHRINK_ELEMENT,!0,!1)&&(H=CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",v.document),v.insertNode(H),
+v.setStartAfter(H));K=new CKEDITOR.dom.elementPath(v.startContainer);m.endPath=L=new CKEDITOR.dom.elementPath(v.endContainer);if(!v.collapsed){var I=L.block||L.blockLimit,B=v.getCommonAncestor();I&&!I.equals(B)&&!I.contains(B)&&v.checkEndOfBlock()&&m.zombies.push(I);v.deleteContents()}for(;(u=e(v))&&a(u)&&u.isBlockBoundary()&&K.contains(u);)v.moveToPosition(u,CKEDITOR.POSITION_BEFORE_END);g(v,m.blockLimit,K,L);H&&(v.setEndBefore(H),v.collapse(),H.remove());H=v.startPath();if(I=H.contains(f,!1,1))v.splitElement(I),
+m.inlineStylesRoot=I,m.inlineStylesPeak=H.lastElement;H=v.createBookmark();(I=H.startNode.getPrevious(c))&&a(I)&&f(I)&&E.push(I);(I=H.startNode.getNext(c))&&a(I)&&f(I)&&E.push(I);for(I=H.startNode;(I=I.getParent())&&f(I);)E.push(I);v.moveToBookmark(H);if(H=G){H=m.range;if("text"==m.type&&m.inlineStylesRoot){u=m.inlineStylesPeak;v=u.getDocument().createText("{cke-peak}");for(E=m.inlineStylesRoot.getParent();!u.equals(E);)v=v.appendTo(u.clone()),u=u.getParent();G=v.getOuterHtml().split("{cke-peak}").join(G)}u=
+m.blockLimit.getName();if(/^\s+|\s+$/.test(G)&&"span"in CKEDITOR.dtd[u]){var z='\x3cspan data-cke-marker\x3d"1"\x3e\x26nbsp;\x3c/span\x3e';G=z+G+z}G=m.editor.dataProcessor.toHtml(G,{context:null,fixForBody:!1,protectedWhitespaces:!!z,dontFilter:m.dontFilter,filter:m.editor.activeFilter,enterMode:m.editor.activeEnterMode});u=H.document.createElement("body");u.setHtml(G);z&&(u.getFirst().remove(),u.getLast().remove());if((z=H.startPath().block)&&(1!=z.getChildCount()||!z.getBogus()))a:{var w;if(1==
+u.getChildCount()&&a(w=u.getFirst())&&w.is(r)&&!w.hasAttribute("contenteditable")){z=w.getElementsByTag("*");H=0;for(E=z.count();H<E;H++)if(v=z.getItem(H),!v.is(x))break a;w.moveChildren(w.getParent(1));w.remove()}}m.dataWrapper=u;H=G}if(H){w=m.range;H=w.document;var y;u=m.blockLimit;E=0;var O,z=[],N,V;G=I=0;var F,J;v=w.startContainer;var K=m.endPath.elements[0],Y,L=K.getPosition(v),B=!!K.getCommonAncestor(v)&&L!=CKEDITOR.POSITION_IDENTICAL&&!(L&CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED);
+v=b(m.dataWrapper,m);for(D(v,w);E<v.length;E++){L=v[E];if(y=L.isLineBreak){y=w;F=u;var U=void 0,aa=void 0;L.hasBlockSibling?y=1:(U=y.startContainer.getAscendant(p.$block,1))&&U.is({div:1,p:1})?(aa=U.getPosition(F),aa==CKEDITOR.POSITION_IDENTICAL||aa==CKEDITOR.POSITION_CONTAINS?y=0:(F=y.splitElement(U),y.moveToPosition(F,CKEDITOR.POSITION_AFTER_START),y=1)):y=0}if(y)G=0<E;else{y=w.startPath();!L.isBlock&&k(m.editor,y.block,y.blockLimit)&&(V=h(m.editor))&&(V=H.createElement(V),V.appendBogus(),w.insertNode(V),
+CKEDITOR.env.needsBrFiller&&(O=V.getBogus())&&O.remove(),w.moveToPosition(V,CKEDITOR.POSITION_BEFORE_END));if((y=w.startPath().block)&&!y.equals(N)){if(O=y.getBogus())O.remove(),z.push(y);N=y}L.firstNotAllowed&&(I=1);if(I&&L.isElement){y=w.startContainer;for(F=null;y&&!p[y.getName()][L.name];){if(y.equals(u)){y=null;break}F=y;y=y.getParent()}if(y)F&&(J=w.splitElement(F),m.zombies.push(J),m.zombies.push(F));else{F=u.getName();Y=!E;y=E==v.length-1;F=d(L.node,F);for(var U=[],aa=F.length,ba=0,da=void 0,
+ea=0,W=-1;ba<aa;ba++)da=F[ba]," "==da?(ea||Y&&!ba||(U.push(new CKEDITOR.dom.text(" ")),W=U.length),ea=1):(U.push(da),ea=0);y&&W==U.length&&U.pop();Y=U}}if(Y){for(;y=Y.pop();)w.insertNode(y);Y=0}else w.insertNode(L.node);L.lastNotAllowed&&E<v.length-1&&((J=B?K:J)&&w.setEndAt(J,CKEDITOR.POSITION_AFTER_START),I=0);w.collapse()}}1!=v.length?O=!1:(O=v[0],O=O.isElement&&"false"==O.node.getAttribute("contenteditable"));O&&(G=!0,y=v[0].node,w.setStartAt(y,CKEDITOR.POSITION_BEFORE_START),w.setEndAt(y,CKEDITOR.POSITION_AFTER_END));
+m.dontMoveCaret=G;m.bogusNeededBlocks=z}O=m.range;var T;J=m.bogusNeededBlocks;for(Y=O.createBookmark();N=m.zombies.pop();)N.getParent()&&(V=O.clone(),V.moveToElementEditStart(N),V.removeEmptyBlocksAtEnd());if(J)for(;N=J.pop();)CKEDITOR.env.needsBrFiller?N.appendBogus():N.append(O.document.createText(" "));for(;N=m.mergeCandidates.pop();)N.mergeSiblings();O.moveToBookmark(Y);if(!m.dontMoveCaret){for(N=e(O);N&&a(N)&&!N.is(p.$empty);){if(N.isBlockBoundary())O.moveToPosition(N,CKEDITOR.POSITION_BEFORE_END);
+else{if(f(N)&&N.getHtml().match(/(\s|&nbsp;)$/g)){T=null;break}T=O.clone();T.moveToPosition(N,CKEDITOR.POSITION_BEFORE_END)}N=N.getLast(c)}T&&O.moveToRange(T)}}}}();x=function(){function a(b){b=new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$tableContent)};b.evaluator=function(a){return a.type==CKEDITOR.NODE_ELEMENT};return b}function b(a,c,d){c=a.getDocument().createElement(c);a.append(c,d);return c}function c(a){var b=a.count(),
+d;for(b;0<b--;)d=a.getItem(b),CKEDITOR.tools.trim(d.getHtml())||(d.appendBogus(),CKEDITOR.env.ie&&9>CKEDITOR.env.version&&d.getChildCount()&&d.getFirst().remove())}return function(d){var e=d.startContainer,f=e.getAscendant("table",1),g=!1;c(f.getElementsByTag("td"));c(f.getElementsByTag("th"));f=d.clone();f.setStart(e,0);f=a(f).lastBackward();f||(f=d.clone(),f.setEndAt(e,CKEDITOR.POSITION_BEFORE_END),f=a(f).lastForward(),g=!0);f||(f=e);f.is("table")?(d.setStartAt(f,CKEDITOR.POSITION_BEFORE_START),
+d.collapse(!0),f.remove()):(f.is({tbody:1,thead:1,tfoot:1})&&(f=b(f,"tr",g)),f.is("tr")&&(f=b(f,f.getParent().is("thead")?"th":"td",g)),(e=f.getBogus())&&e.remove(),d.moveToPosition(f,g?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END))}}();J=function(){function a(b){b=new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$list)||a.is(CKEDITOR.dtd.$listItem)};b.evaluator=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&
+a.is(CKEDITOR.dtd.$listItem)};return b}return function(b){var c=b.startContainer,d=!1,e;e=b.clone();e.setStart(c,0);e=a(e).lastBackward();e||(e=b.clone(),e.setEndAt(c,CKEDITOR.POSITION_BEFORE_END),e=a(e).lastForward(),d=!0);e||(e=c);e.is(CKEDITOR.dtd.$list)?(b.setStartAt(e,CKEDITOR.POSITION_BEFORE_START),b.collapse(!0),e.remove()):((c=e.getBogus())&&c.remove(),b.moveToPosition(e,d?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END),b.select())}}();w={eol:{detect:function(a,b){var c=a.range,
+d=c.clone(),e=c.clone(),f=new CKEDITOR.dom.elementPath(c.startContainer,b),g=new CKEDITOR.dom.elementPath(c.endContainer,b);d.collapse(1);e.collapse();f.block&&d.checkBoundaryOfElement(f.block,CKEDITOR.END)&&(c.setStartAfter(f.block),a.prependEolBr=1);g.block&&e.checkBoundaryOfElement(g.block,CKEDITOR.START)&&(c.setEndBefore(g.block),a.appendEolBr=1)},fix:function(a,b){var c=b.getDocument(),d;a.appendEolBr&&(d=this.createEolBr(c),a.fragment.append(d));!a.prependEolBr||d&&!d.getPrevious()||a.fragment.append(this.createEolBr(c),
+1)},createEolBr:function(a){return a.createElement("br",{attributes:{"data-cke-eol":1}})}},bogus:{exclude:function(a){var b=a.range.getBoundaryNodes(),c=b.startNode,b=b.endNode;!b||!z(b)||c&&c.equals(b)||a.range.setEndBefore(b)}},tree:{rebuild:function(a,b){var c=a.range,d=c.getCommonAncestor(),e=new CKEDITOR.dom.elementPath(d,b),f=new CKEDITOR.dom.elementPath(c.startContainer,b),c=new CKEDITOR.dom.elementPath(c.endContainer,b),g;d.type==CKEDITOR.NODE_TEXT&&(d=d.getParent());if(e.blockLimit.is({tr:1,
+table:1})){var k=e.contains("table").getParent();g=function(a){return!a.equals(k)}}else if(e.block&&e.block.is(CKEDITOR.dtd.$listItem)&&(f=f.contains(CKEDITOR.dtd.$list),c=c.contains(CKEDITOR.dtd.$list),!f.equals(c))){var h=e.contains(CKEDITOR.dtd.$list).getParent();g=function(a){return!a.equals(h)}}g||(g=function(a){return!a.equals(e.block)&&!a.equals(e.blockLimit)});this.rebuildFragment(a,b,d,g)},rebuildFragment:function(a,b,c,d){for(var e;c&&!c.equals(b)&&d(c);)e=c.clone(0,1),a.fragment.appendTo(e),
+a.fragment=e,c=c.getParent()}},cell:{shrink:function(a){a=a.range;var b=a.startContainer,c=a.endContainer,d=a.startOffset,e=a.endOffset;b.type==CKEDITOR.NODE_ELEMENT&&b.equals(c)&&b.is("tr")&&++d==e&&a.shrink(CKEDITOR.SHRINK_TEXT)}}};F=function(){function a(b,c){var d=b.getParent();if(d.is(CKEDITOR.dtd.$inline))b[c?"insertBefore":"insertAfter"](d)}function b(c,d,e){a(d);a(e,1);for(var f;f=e.getNext();)f.insertAfter(d),d=f;u(c)&&c.remove()}function c(a,b){var d=new CKEDITOR.dom.range(a);d.setStartAfter(b.startNode);
+d.setEndBefore(b.endNode);return d}return{list:{detectMerge:function(a,b){var d=c(b,a.bookmark),e=d.startPath(),f=d.endPath(),l=e.contains(CKEDITOR.dtd.$list),g=f.contains(CKEDITOR.dtd.$list);a.mergeList=l&&g&&l.getParent().equals(g.getParent())&&!l.equals(g);a.mergeListItems=e.block&&f.block&&e.block.is(CKEDITOR.dtd.$listItem)&&f.block.is(CKEDITOR.dtd.$listItem);if(a.mergeList||a.mergeListItems)d=d.clone(),d.setStartBefore(a.bookmark.startNode),d.setEndAfter(a.bookmark.endNode),a.mergeListBookmark=
+d.createBookmark()},merge:function(a,c){if(a.mergeListBookmark){var d=a.mergeListBookmark.startNode,e=a.mergeListBookmark.endNode,f=new CKEDITOR.dom.elementPath(d,c),l=new CKEDITOR.dom.elementPath(e,c);if(a.mergeList){var g=f.contains(CKEDITOR.dtd.$list),n=l.contains(CKEDITOR.dtd.$list);g.equals(n)||(n.moveChildren(g),n.remove())}a.mergeListItems&&(f=f.contains(CKEDITOR.dtd.$listItem),l=l.contains(CKEDITOR.dtd.$listItem),f.equals(l)||b(l,d,e));d.remove();e.remove()}}},block:{detectMerge:function(a,
+b){if(!a.tableContentsRanges&&!a.mergeListBookmark){var c=new CKEDITOR.dom.range(b);c.setStartBefore(a.bookmark.startNode);c.setEndAfter(a.bookmark.endNode);a.mergeBlockBookmark=c.createBookmark()}},merge:function(a,c){if(a.mergeBlockBookmark&&!a.purgeTableBookmark){var d=a.mergeBlockBookmark.startNode,e=a.mergeBlockBookmark.endNode,f=new CKEDITOR.dom.elementPath(d,c),l=new CKEDITOR.dom.elementPath(e,c),f=f.block,l=l.block;f&&l&&!f.equals(l)&&b(l,d,e);d.remove();e.remove()}}},table:function(){function a(c){var e=
+[],f,l=new CKEDITOR.dom.walker(c),g=c.startPath().contains(d),n=c.endPath().contains(d),k={};l.guard=function(a,l){if(a.type==CKEDITOR.NODE_ELEMENT){var h="visited_"+(l?"out":"in");if(a.getCustomData(h))return;CKEDITOR.dom.element.setMarker(k,a,h,1)}if(l&&g&&a.equals(g))f=c.clone(),f.setEndAt(g,CKEDITOR.POSITION_BEFORE_END),e.push(f);else if(!l&&n&&a.equals(n))f=c.clone(),f.setStartAt(n,CKEDITOR.POSITION_AFTER_START),e.push(f);else{if(h=!l)h=a.type==CKEDITOR.NODE_ELEMENT&&a.is(d)&&(!g||b(a,g))&&(!n||
+b(a,n));h&&(f=c.clone(),f.selectNodeContents(a),e.push(f))}};l.lastForward();CKEDITOR.dom.element.clearAllMarkers(k);return e}function b(a,c){var d=CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED,e=a.getPosition(c);return e===CKEDITOR.POSITION_IDENTICAL?!1:0===(e&d)}var d={td:1,th:1,caption:1};return{detectPurge:function(a){var b=a.range,c=b.clone();c.enlarge(CKEDITOR.ENLARGE_ELEMENT);var c=new CKEDITOR.dom.walker(c),e=0;c.evaluator=function(a){a.type==CKEDITOR.NODE_ELEMENT&&a.is(d)&&++e};
+c.checkForward();if(1<e){var c=b.startPath().contains("table"),f=b.endPath().contains("table");c&&f&&b.checkBoundaryOfElement(c,CKEDITOR.START)&&b.checkBoundaryOfElement(f,CKEDITOR.END)&&(b=a.range.clone(),b.setStartBefore(c),b.setEndAfter(f),a.purgeTableBookmark=b.createBookmark())}},detectRanges:function(e,f){var l=c(f,e.bookmark),g=l.clone(),k,h,v=l.getCommonAncestor();v.is(CKEDITOR.dtd.$tableContent)&&!v.is(d)&&(v=v.getAscendant("table",!0));h=v;v=new CKEDITOR.dom.elementPath(l.startContainer,
+h);h=new CKEDITOR.dom.elementPath(l.endContainer,h);v=v.contains("table");h=h.contains("table");if(v||h)v&&h&&b(v,h)?(e.tableSurroundingRange=g,g.setStartAt(v,CKEDITOR.POSITION_AFTER_END),g.setEndAt(h,CKEDITOR.POSITION_BEFORE_START),g=l.clone(),g.setEndAt(v,CKEDITOR.POSITION_AFTER_END),k=l.clone(),k.setStartAt(h,CKEDITOR.POSITION_BEFORE_START),k=a(g).concat(a(k))):v?h||(e.tableSurroundingRange=g,g.setStartAt(v,CKEDITOR.POSITION_AFTER_END),l.setEndAt(v,CKEDITOR.POSITION_AFTER_END)):(e.tableSurroundingRange=
+g,g.setEndAt(h,CKEDITOR.POSITION_BEFORE_START),l.setStartAt(h,CKEDITOR.POSITION_AFTER_START)),e.tableContentsRanges=k?k:a(l)},deleteRanges:function(a){for(var b;b=a.tableContentsRanges.pop();)b.extractContents(),u(b.startContainer)&&b.startContainer.appendBogus();a.tableSurroundingRange&&a.tableSurroundingRange.extractContents()},purge:function(a){if(a.purgeTableBookmark){var b=a.doc,c=a.range.clone(),b=b.createElement("p");b.insertBefore(a.purgeTableBookmark.startNode);c.moveToBookmark(a.purgeTableBookmark);
+c.deleteContents();a.range.moveToPosition(b,CKEDITOR.POSITION_AFTER_START)}}}}(),detectExtractMerge:function(a){return!(a.range.startPath().contains(CKEDITOR.dtd.$listItem)&&a.range.endPath().contains(CKEDITOR.dtd.$listItem))},fixUneditableRangePosition:function(a){a.startContainer.getDtd()["#"]||a.moveToClosestEditablePosition(null,!0)},autoParagraph:function(a,b){var c=b.startPath(),d;k(a,c.block,c.blockLimit)&&(d=h(a))&&(d=b.document.createElement(d),d.appendBogus(),b.insertNode(d),b.moveToPosition(d,
+CKEDITOR.POSITION_AFTER_START))}}}()})();
+(function(){function a(){var a=this._.fakeSelection,b;a&&(b=this.getSelection(1),b&&b.isHidden()||(a.reset(),a=0));if(!a&&(a=b||this.getSelection(1),!a||a.getType()==CKEDITOR.SELECTION_NONE))return;this.fire("selectionCheck",a);b=this.elementPath();if(!b.compare(this._.selectionPreviousPath)){var c=this._.selectionPreviousPath&&this._.selectionPreviousPath.blockLimit.equals(b.blockLimit);CKEDITOR.env.webkit&&!c&&(this._.previousActive=this.document.getActive());this._.selectionPreviousPath=b;this.fire("selectionChange",
+{selection:a,path:b})}}function d(){x=!0;m||(b.call(this),m=CKEDITOR.tools.setTimeout(b,200,this))}function b(){m=null;x&&(CKEDITOR.tools.setTimeout(a,0,this),x=!1)}function c(a){return J(a)||a.type==CKEDITOR.NODE_ELEMENT&&!a.is(CKEDITOR.dtd.$empty)?!0:!1}function e(a){function b(c,d){return c&&c.type!=CKEDITOR.NODE_TEXT?a.clone()["moveToElementEdit"+(d?"End":"Start")](c):!1}if(!(a.root instanceof CKEDITOR.editable))return!1;var d=a.startContainer,e=a.getPreviousNode(c,null,d),f=a.getNextNode(c,null,
+d);return b(e)||b(f,1)||!(e||f||d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary()&&d.getBogus())?!0:!1}function g(a){k(a,!1);var b=a.getDocument().createText(z);a.setCustomData("cke-fillingChar",b);return b}function k(a,b){var c=a&&a.removeCustomData("cke-fillingChar");if(c){if(!1!==b){var d=a.getDocument().getSelection().getNative(),e=d&&"None"!=d.type&&d.getRangeAt(0),f=z.length;if(c.getLength()>f&&e&&e.intersectsNode(c.$)){var g=[{node:d.anchorNode,offset:d.anchorOffset},{node:d.focusNode,offset:d.focusOffset}];
+d.anchorNode==c.$&&d.anchorOffset>f&&(g[0].offset-=f);d.focusNode==c.$&&d.focusOffset>f&&(g[1].offset-=f)}}c.setText(h(c.getText(),1));g&&(c=a.getDocument().$,d=c.getSelection(),c=c.createRange(),c.setStart(g[0].node,g[0].offset),c.collapse(!0),d.removeAllRanges(),d.addRange(c),d.extend(g[1].node,g[1].offset))}}function h(a,b){return b?a.replace(y,function(a,b){return b?" ":""}):a.replace(z,"")}function p(a,b){var c=CKEDITOR.dom.element.createFromHtml('\x3cdiv data-cke-hidden-sel\x3d"1" data-cke-temp\x3d"1" style\x3d"'+
+(CKEDITOR.env.ie&&14>CKEDITOR.env.version?"display:none":"position:fixed;top:0;left:-1000px")+'"\x3e'+(b||"\x26nbsp;")+"\x3c/div\x3e",a.document);a.fire("lockSnapshot");a.editable().append(c);var d=a.getSelection(1),e=a.createRange(),f=d.root.on("selectionchange",function(a){a.cancel()},null,null,0);e.setStartAt(c,CKEDITOR.POSITION_AFTER_START);e.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);d.selectRanges([e]);f.removeListener();a.fire("unlockSnapshot");a._.hiddenSelectionContainer=c}function r(a){var b=
+{37:1,39:1,8:1,46:1};return function(c){var d=c.data.getKeystroke();if(b[d]){var e=a.getSelection().getRanges(),f=e[0];1==e.length&&f.collapsed&&(d=f[38>d?"getPreviousEditableNode":"getNextEditableNode"]())&&d.type==CKEDITOR.NODE_ELEMENT&&"false"==d.getAttribute("contenteditable")&&(a.getSelection().fake(d),c.data.preventDefault(),c.cancel())}}}function f(a){for(var b=0;b<a.length;b++){var c=a[b];c.getCommonAncestor().isReadOnly()&&a.splice(b,1);if(!c.collapsed){if(c.startContainer.isReadOnly())for(var d=
+c.startContainer,e;d&&!((e=d.type==CKEDITOR.NODE_ELEMENT)&&d.is("body")||!d.isReadOnly());)e&&"false"==d.getAttribute("contentEditable")&&c.setStartAfter(d),d=d.getParent();d=c.startContainer;e=c.endContainer;var f=c.startOffset,g=c.endOffset,h=c.clone();d&&d.type==CKEDITOR.NODE_TEXT&&(f>=d.getLength()?h.setStartAfter(d):h.setStartBefore(d));e&&e.type==CKEDITOR.NODE_TEXT&&(g?h.setEndAfter(e):h.setEndBefore(e));d=new CKEDITOR.dom.walker(h);d.evaluator=function(d){if(d.type==CKEDITOR.NODE_ELEMENT&&
+d.isReadOnly()){var e=c.clone();c.setEndBefore(d);c.collapsed&&a.splice(b--,1);d.getPosition(h.endContainer)&CKEDITOR.POSITION_CONTAINS||(e.setStartAfter(d),e.collapsed||a.splice(b+1,0,e));return!0}return!1};d.next()}}return a}var B="function"!=typeof window.getSelection,u=1,z=CKEDITOR.tools.repeat("​",7),y=new RegExp(z+"( )?","g"),m,x,J=CKEDITOR.dom.walker.invisible(1),w=function(){function a(b){return function(a){var c=a.editor.createRange();c.moveToClosestEditablePosition(a.selected,b)&&a.editor.getSelection().selectRanges([c]);
+return!1}}function b(a){return function(b){var c=b.editor,d=c.createRange(),e;(e=d.moveToClosestEditablePosition(b.selected,a))||(e=d.moveToClosestEditablePosition(b.selected,!a));e&&c.getSelection().selectRanges([d]);c.fire("saveSnapshot");b.selected.remove();e||(d.moveToElementEditablePosition(c.editable()),c.getSelection().selectRanges([d]));c.fire("saveSnapshot");return!1}}var c=a(),d=a(1);return{37:c,38:c,39:d,40:d,8:b(),46:b(1)}}();CKEDITOR.on("instanceCreated",function(b){function c(){var a=
+e.getSelection();a&&a.removeAllRanges()}var e=b.editor;e.on("contentDom",function(){function b(){v=new CKEDITOR.dom.selection(e.getSelection());v.lock()}function c(){l.removeListener("mouseup",c);q.removeListener("mouseup",c);var a=CKEDITOR.document.$.selection,b=a.createRange();"None"!=a.type&&b.parentElement().ownerDocument==f.$&&b.select()}var f=e.document,l=CKEDITOR.document,g=e.editable(),h=f.getBody(),q=f.getDocumentElement(),m=g.isInline(),p,v;CKEDITOR.env.gecko&&g.attachListener(g,"focus",
+function(a){a.removeListener();0!==p&&(a=e.getSelection().getNative())&&a.isCollapsed&&a.anchorNode==g.$&&(a=e.createRange(),a.moveToElementEditStart(g),a.select())},null,null,-2);g.attachListener(g,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){p&&CKEDITOR.env.webkit&&(p=e._.previousActive&&e._.previousActive.equals(f.getActive()))&&null!=e._.previousScrollTop&&e._.previousScrollTop!=g.$.scrollTop&&(g.$.scrollTop=e._.previousScrollTop);e.unlockSelection(p);p=0},null,null,-1);g.attachListener(g,
+"mousedown",function(){p=0});if(CKEDITOR.env.ie||m)B?g.attachListener(g,"beforedeactivate",b,null,null,-1):g.attachListener(e,"selectionCheck",b,null,null,-1),g.attachListener(g,CKEDITOR.env.webkit?"DOMFocusOut":"blur",function(){e.lockSelection(v);p=1},null,null,-1),g.attachListener(g,"mousedown",function(){p=0});if(CKEDITOR.env.ie&&!m){var G;g.attachListener(g,"mousedown",function(a){2==a.data.$.button&&((a=e.document.getSelection())&&a.getType()!=CKEDITOR.SELECTION_NONE||(G=e.window.getScrollPosition()))});
+g.attachListener(g,"mouseup",function(a){2==a.data.$.button&&G&&(e.document.$.documentElement.scrollLeft=G.x,e.document.$.documentElement.scrollTop=G.y);G=null});if("BackCompat"!=f.$.compatMode){if(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat){var E,I;q.on("mousedown",function(a){function b(a){a=a.data.$;if(E){var c=h.$.createTextRange();try{c.moveToPoint(a.clientX,a.clientY)}catch(d){}E.setEndPoint(0>I.compareEndPoints("StartToStart",c)?"EndToEnd":"StartToStart",c);E.select()}}function c(){q.removeListener("mousemove",
+b);l.removeListener("mouseup",c);q.removeListener("mouseup",c);E.select()}a=a.data;if(a.getTarget().is("html")&&a.$.y<q.$.clientHeight&&a.$.x<q.$.clientWidth){E=h.$.createTextRange();try{E.moveToPoint(a.$.clientX,a.$.clientY)}catch(d){}I=E.duplicate();q.on("mousemove",b);l.on("mouseup",c);q.on("mouseup",c)}})}if(7<CKEDITOR.env.version&&11>CKEDITOR.env.version)q.on("mousedown",function(a){a.data.getTarget().is("html")&&(l.on("mouseup",c),q.on("mouseup",c))})}}g.attachListener(g,"selectionchange",a,
+e);g.attachListener(g,"keyup",d,e);g.attachListener(g,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){e.forceNextSelectionCheck();e.selectionChange(1)});if(m&&(CKEDITOR.env.webkit||CKEDITOR.env.gecko)){var K;g.attachListener(g,"mousedown",function(){K=1});g.attachListener(f.getDocumentElement(),"mouseup",function(){K&&d.call(e);K=0})}else g.attachListener(CKEDITOR.env.ie?g:f.getDocumentElement(),"mouseup",d,e);CKEDITOR.env.webkit&&g.attachListener(f,"keydown",function(a){switch(a.data.getKey()){case 13:case 33:case 34:case 35:case 36:case 37:case 39:case 8:case 45:case 46:k(g)}},
+null,null,-1);g.attachListener(g,"keydown",r(e),null,null,-1)});e.on("setData",function(){e.unlockSelection();CKEDITOR.env.webkit&&c()});e.on("contentDomUnload",function(){e.unlockSelection()});if(CKEDITOR.env.ie9Compat)e.on("beforeDestroy",c,null,null,9);e.on("dataReady",function(){delete e._.fakeSelection;delete e._.hiddenSelectionContainer;e.selectionChange(1)});e.on("loadSnapshot",function(){var a=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT),b=e.editable().getLast(a);b&&b.hasAttribute("data-cke-hidden-sel")&&
+(b.remove(),CKEDITOR.env.gecko&&(a=e.editable().getFirst(a))&&a.is("br")&&a.getAttribute("_moz_editor_bogus_node")&&a.remove())},null,null,100);e.on("key",function(a){if("wysiwyg"==e.mode){var b=e.getSelection();if(b.isFake){var c=w[a.data.keyCode];if(c)return c({editor:e,selected:b.getSelectedElement(),selection:b,keyEvent:a})}}})});if(CKEDITOR.env.webkit)CKEDITOR.on("instanceReady",function(a){var b=a.editor;b.on("selectionChange",function(){var a=b.editable(),c=a.getCustomData("cke-fillingChar");
+c&&(c.getCustomData("ready")?k(a):c.setCustomData("ready",1))},null,null,-1);b.on("beforeSetMode",function(){k(b.editable())},null,null,-1);b.on("getSnapshot",function(a){a.data&&(a.data=h(a.data))},b,null,20);b.on("toDataFormat",function(a){a.data.dataValue=h(a.data.dataValue)},null,null,0)});CKEDITOR.editor.prototype.selectionChange=function(b){(b?a:d).call(this)};CKEDITOR.editor.prototype.getSelection=function(a){return!this._.savedSelection&&!this._.fakeSelection||a?(a=this.editable())&&"wysiwyg"==
+this.mode?new CKEDITOR.dom.selection(a):null:this._.savedSelection||this._.fakeSelection};CKEDITOR.editor.prototype.lockSelection=function(a){a=a||this.getSelection(1);return a.getType()!=CKEDITOR.SELECTION_NONE?(!a.isLocked&&a.lock(),this._.savedSelection=a,!0):!1};CKEDITOR.editor.prototype.unlockSelection=function(a){var b=this._.savedSelection;return b?(b.unlock(a),delete this._.savedSelection,!0):!1};CKEDITOR.editor.prototype.forceNextSelectionCheck=function(){delete this._.selectionPreviousPath};
+CKEDITOR.dom.document.prototype.getSelection=function(){return new CKEDITOR.dom.selection(this)};CKEDITOR.dom.range.prototype.select=function(){var a=this.root instanceof CKEDITOR.editable?this.root.editor.getSelection():new CKEDITOR.dom.selection(this.root);a.selectRanges([this]);return a};CKEDITOR.SELECTION_NONE=1;CKEDITOR.SELECTION_TEXT=2;CKEDITOR.SELECTION_ELEMENT=3;CKEDITOR.dom.selection=function(a){if(a instanceof CKEDITOR.dom.selection){var b=a;a=a.root}var c=a instanceof CKEDITOR.dom.element;
+this.rev=b?b.rev:u++;this.document=a instanceof CKEDITOR.dom.document?a:a.getDocument();this.root=c?a:this.document.getBody();this.isLocked=0;this._={cache:{}};if(b)return CKEDITOR.tools.extend(this._.cache,b._.cache),this.isFake=b.isFake,this.isLocked=b.isLocked,this;a=this.getNative();var d,e;if(a)if(a.getRangeAt)d=(e=a.rangeCount&&a.getRangeAt(0))&&new CKEDITOR.dom.node(e.commonAncestorContainer);else{try{e=a.createRange()}catch(f){}d=e&&CKEDITOR.dom.element.get(e.item&&e.item(0)||e.parentElement())}if(!d||
+d.type!=CKEDITOR.NODE_ELEMENT&&d.type!=CKEDITOR.NODE_TEXT||!this.root.equals(d)&&!this.root.contains(d))this._.cache.type=CKEDITOR.SELECTION_NONE,this._.cache.startElement=null,this._.cache.selectedElement=null,this._.cache.selectedText="",this._.cache.ranges=new CKEDITOR.dom.rangeList;return this};var F={img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1,a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,thead:1,tfoot:1};CKEDITOR.tools.extend(CKEDITOR.dom.selection,{_removeFillingCharSequenceString:h,
+_createFillingCharSequenceNode:g,FILLING_CHAR_SEQUENCE:z});CKEDITOR.dom.selection.prototype={getNative:function(){return void 0!==this._.cache.nativeSel?this._.cache.nativeSel:this._.cache.nativeSel=B?this.document.$.selection:this.document.getWindow().$.getSelection()},getType:B?function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_NONE;try{var c=this.getNative(),d=c.type;"Text"==d&&(b=CKEDITOR.SELECTION_TEXT);"Control"==d&&(b=CKEDITOR.SELECTION_ELEMENT);c.createRange().parentElement()&&
+(b=CKEDITOR.SELECTION_TEXT)}catch(e){}return a.type=b}:function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_TEXT,c=this.getNative();if(!c||!c.rangeCount)b=CKEDITOR.SELECTION_NONE;else if(1==c.rangeCount){var c=c.getRangeAt(0),d=c.startContainer;d==c.endContainer&&1==d.nodeType&&1==c.endOffset-c.startOffset&&F[d.childNodes[c.startOffset].nodeName.toLowerCase()]&&(b=CKEDITOR.SELECTION_ELEMENT)}return a.type=b},getRanges:function(){var a=B?function(){function a(b){return(new CKEDITOR.dom.node(b)).getIndex()}
+var b=function(b,c){b=b.duplicate();b.collapse(c);var d=b.parentElement();if(!d.hasChildNodes())return{container:d,offset:0};for(var e=d.children,f,l,g=b.duplicate(),h=0,k=e.length-1,v=-1,n,m;h<=k;)if(v=Math.floor((h+k)/2),f=e[v],g.moveToElementText(f),n=g.compareEndPoints("StartToStart",b),0<n)k=v-1;else if(0>n)h=v+1;else return{container:d,offset:a(f)};if(-1==v||v==e.length-1&&0>n){g.moveToElementText(d);g.setEndPoint("StartToStart",b);g=g.text.replace(/(\r\n|\r)/g,"\n").length;e=d.childNodes;if(!g)return f=
+e[e.length-1],f.nodeType!=CKEDITOR.NODE_TEXT?{container:d,offset:e.length}:{container:f,offset:f.nodeValue.length};for(d=e.length;0<g&&0<d;)l=e[--d],l.nodeType==CKEDITOR.NODE_TEXT&&(m=l,g-=l.nodeValue.length);return{container:m,offset:-g}}g.collapse(0<n?!0:!1);g.setEndPoint(0<n?"StartToStart":"EndToStart",b);g=g.text.replace(/(\r\n|\r)/g,"\n").length;if(!g)return{container:d,offset:a(f)+(0<n?0:1)};for(;0<g;)try{l=f[0<n?"previousSibling":"nextSibling"],l.nodeType==CKEDITOR.NODE_TEXT&&(g-=l.nodeValue.length,
+m=l),f=l}catch(p){return{container:d,offset:a(f)}}return{container:m,offset:0<n?-g:m.nodeValue.length+g}};return function(){var a=this.getNative(),c=a&&a.createRange(),d=this.getType();if(!a)return[];if(d==CKEDITOR.SELECTION_TEXT)return a=new CKEDITOR.dom.range(this.root),d=b(c,!0),a.setStart(new CKEDITOR.dom.node(d.container),d.offset),d=b(c),a.setEnd(new CKEDITOR.dom.node(d.container),d.offset),a.endContainer.getPosition(a.startContainer)&CKEDITOR.POSITION_PRECEDING&&a.endOffset<=a.startContainer.getIndex()&&
+a.collapse(),[a];if(d==CKEDITOR.SELECTION_ELEMENT){for(var d=[],e=0;e<c.length;e++){for(var f=c.item(e),g=f.parentNode,l=0,a=new CKEDITOR.dom.range(this.root);l<g.childNodes.length&&g.childNodes[l]!=f;l++);a.setStart(new CKEDITOR.dom.node(g),l);a.setEnd(new CKEDITOR.dom.node(g),l+1);d.push(a)}return d}return[]}}():function(){var a=[],b,c=this.getNative();if(!c)return a;for(var d=0;d<c.rangeCount;d++){var e=c.getRangeAt(d);b=new CKEDITOR.dom.range(this.root);b.setStart(new CKEDITOR.dom.node(e.startContainer),
+e.startOffset);b.setEnd(new CKEDITOR.dom.node(e.endContainer),e.endOffset);a.push(b)}return a};return function(b){var c=this._.cache,d=c.ranges;d||(c.ranges=d=new CKEDITOR.dom.rangeList(a.call(this)));return b?f(new CKEDITOR.dom.rangeList(d.slice())):d}}(),getStartElement:function(){var a=this._.cache;if(void 0!==a.startElement)return a.startElement;var b;switch(this.getType()){case CKEDITOR.SELECTION_ELEMENT:return this.getSelectedElement();case CKEDITOR.SELECTION_TEXT:var c=this.getRanges()[0];
+if(c){if(c.collapsed)b=c.startContainer,b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());else{for(c.optimize();b=c.startContainer,c.startOffset==(b.getChildCount?b.getChildCount():b.getLength())&&!b.isBlockBoundary();)c.setStartAfter(b);b=c.startContainer;if(b.type!=CKEDITOR.NODE_ELEMENT)return b.getParent();if((b=b.getChild(c.startOffset))&&b.type==CKEDITOR.NODE_ELEMENT)for(c=b.getFirst();c&&c.type==CKEDITOR.NODE_ELEMENT;)b=c,c=c.getFirst();else b=c.startContainer}b=b.$}}return a.startElement=b?
+new CKEDITOR.dom.element(b):null},getSelectedElement:function(){var a=this._.cache;if(void 0!==a.selectedElement)return a.selectedElement;var b=this,c=CKEDITOR.tools.tryThese(function(){return b.getNative().createRange().item(0)},function(){for(var a=b.getRanges()[0].clone(),c,d,e=2;e&&!((c=a.getEnclosedNode())&&c.type==CKEDITOR.NODE_ELEMENT&&F[c.getName()]&&(d=c));e--)a.shrink(CKEDITOR.SHRINK_ELEMENT);return d&&d.$});return a.selectedElement=c?new CKEDITOR.dom.element(c):null},getSelectedText:function(){var a=
+this._.cache;if(void 0!==a.selectedText)return a.selectedText;var b=this.getNative(),b=B?"Control"==b.type?"":b.createRange().text:b.toString();return a.selectedText=b},lock:function(){this.getRanges();this.getStartElement();this.getSelectedElement();this.getSelectedText();this._.cache.nativeSel=null;this.isLocked=1},unlock:function(a){if(this.isLocked){if(a)var b=this.getSelectedElement(),c=!b&&this.getRanges(),d=this.isFake;this.isLocked=0;this.reset();a&&(a=b||c[0]&&c[0].getCommonAncestor())&&
+a.getAscendant("body",1)&&(d?this.fake(b):b?this.selectElement(b):this.selectRanges(c))}},reset:function(){this._.cache={};this.isFake=0;var a=this.root.editor;if(a&&a._.fakeSelection)if(this.rev==a._.fakeSelection.rev){delete a._.fakeSelection;var b=a._.hiddenSelectionContainer;if(b){var c=a.checkDirty();a.fire("lockSnapshot");b.remove();a.fire("unlockSnapshot");!c&&a.resetDirty()}delete a._.hiddenSelectionContainer}else CKEDITOR.warn("selection-fake-reset");this.rev=u++},selectElement:function(a){var b=
+new CKEDITOR.dom.range(this.root);b.setStartBefore(a);b.setEndAfter(a);this.selectRanges([b])},selectRanges:function(a){var b=this.root.editor,b=b&&b._.hiddenSelectionContainer;this.reset();if(b)for(var b=this.root,c,d=0;d<a.length;++d)c=a[d],c.endContainer.equals(b)&&(c.endOffset=Math.min(c.endOffset,b.getChildCount()));if(a.length)if(this.isLocked){var f=CKEDITOR.document.getActive();this.unlock();this.selectRanges(a);this.lock();f&&!f.equals(this.root)&&f.focus()}else{var h;a:{var m,p;if(1==a.length&&
+!(p=a[0]).collapsed&&(h=p.getEnclosedNode())&&h.type==CKEDITOR.NODE_ELEMENT&&(p=p.clone(),p.shrink(CKEDITOR.SHRINK_ELEMENT,!0),(m=p.getEnclosedNode())&&m.type==CKEDITOR.NODE_ELEMENT&&(h=m),"false"==h.getAttribute("contenteditable")))break a;h=void 0}if(h)this.fake(h);else{if(B){p=CKEDITOR.dom.walker.whitespaces(!0);m=/\ufeff|\u00a0/;b={table:1,tbody:1,tr:1};1<a.length&&(h=a[a.length-1],a[0].setEnd(h.endContainer,h.endOffset));h=a[0];a=h.collapsed;var r,u,y;if((c=h.getEnclosedNode())&&c.type==CKEDITOR.NODE_ELEMENT&&
+c.getName()in F&&(!c.is("a")||!c.getText()))try{y=c.$.createControlRange();y.addElement(c.$);y.select();return}catch(w){}if(h.startContainer.type==CKEDITOR.NODE_ELEMENT&&h.startContainer.getName()in b||h.endContainer.type==CKEDITOR.NODE_ELEMENT&&h.endContainer.getName()in b)h.shrink(CKEDITOR.NODE_ELEMENT,!0),a=h.collapsed;y=h.createBookmark();b=y.startNode;a||(f=y.endNode);y=h.document.$.body.createTextRange();y.moveToElementText(b.$);y.moveStart("character",1);f?(m=h.document.$.body.createTextRange(),
+m.moveToElementText(f.$),y.setEndPoint("EndToEnd",m),y.moveEnd("character",-1)):(r=b.getNext(p),u=b.hasAscendant("pre"),r=!(r&&r.getText&&r.getText().match(m))&&(u||!b.hasPrevious()||b.getPrevious().is&&b.getPrevious().is("br")),u=h.document.createElement("span"),u.setHtml("\x26#65279;"),u.insertBefore(b),r&&h.document.createText("").insertBefore(b));h.setStartBefore(b);b.remove();a?(r?(y.moveStart("character",-1),y.select(),h.document.$.selection.clear()):y.select(),h.moveToPosition(u,CKEDITOR.POSITION_BEFORE_START),
+u.remove()):(h.setEndBefore(f),f.remove(),y.select())}else{f=this.getNative();if(!f)return;this.removeAllRanges();for(y=0;y<a.length;y++){if(y<a.length-1&&(r=a[y],u=a[y+1],m=r.clone(),m.setStart(r.endContainer,r.endOffset),m.setEnd(u.startContainer,u.startOffset),!m.collapsed&&(m.shrink(CKEDITOR.NODE_ELEMENT,!0),h=m.getCommonAncestor(),m=m.getEnclosedNode(),h.isReadOnly()||m&&m.isReadOnly()))){u.setStart(r.startContainer,r.startOffset);a.splice(y--,1);continue}h=a[y];u=this.document.$.createRange();
+h.collapsed&&CKEDITOR.env.webkit&&e(h)&&(m=g(this.root),h.insertNode(m),(r=m.getNext())&&!m.getPrevious()&&r.type==CKEDITOR.NODE_ELEMENT&&"br"==r.getName()?(k(this.root),h.moveToPosition(r,CKEDITOR.POSITION_BEFORE_START)):h.moveToPosition(m,CKEDITOR.POSITION_AFTER_END));u.setStart(h.startContainer.$,h.startOffset);try{u.setEnd(h.endContainer.$,h.endOffset)}catch(v){if(0<=v.toString().indexOf("NS_ERROR_ILLEGAL_VALUE"))h.collapse(1),u.setEnd(h.endContainer.$,h.endOffset);else throw v;}f.addRange(u)}}this.reset();
+this.root.fire("selectionchange")}}},fake:function(a,b){var c=this.root.editor;void 0===b&&a.hasAttribute("aria-label")&&(b=a.getAttribute("aria-label"));this.reset();p(c,b);var d=this._.cache,e=new CKEDITOR.dom.range(this.root);e.setStartBefore(a);e.setEndAfter(a);d.ranges=new CKEDITOR.dom.rangeList(e);d.selectedElement=d.startElement=a;d.type=CKEDITOR.SELECTION_ELEMENT;d.selectedText=d.nativeSel=null;this.isFake=1;this.rev=u++;c._.fakeSelection=this;this.root.fire("selectionchange")},isHidden:function(){var a=
+this.getCommonAncestor();a&&a.type==CKEDITOR.NODE_TEXT&&(a=a.getParent());return!(!a||!a.data("cke-hidden-sel"))},createBookmarks:function(a){a=this.getRanges().createBookmarks(a);this.isFake&&(a.isFake=1);return a},createBookmarks2:function(a){a=this.getRanges().createBookmarks2(a);this.isFake&&(a.isFake=1);return a},selectBookmarks:function(a){for(var b=[],c,d=0;d<a.length;d++){var e=new CKEDITOR.dom.range(this.root);e.moveToBookmark(a[d]);b.push(e)}a.isFake&&(c=b[0].getEnclosedNode(),c&&c.type==
+CKEDITOR.NODE_ELEMENT||(CKEDITOR.warn("selection-not-fake"),a.isFake=0));a.isFake?this.fake(c):this.selectRanges(b);return this},getCommonAncestor:function(){var a=this.getRanges();return a.length?a[0].startContainer.getCommonAncestor(a[a.length-1].endContainer):null},scrollIntoView:function(){this.type!=CKEDITOR.SELECTION_NONE&&this.getRanges()[0].scrollIntoView()},removeAllRanges:function(){if(this.getType()!=CKEDITOR.SELECTION_NONE){var a=this.getNative();try{a&&a[B?"empty":"removeAllRanges"]()}catch(b){}this.reset()}}}})();
+"use strict";CKEDITOR.STYLE_BLOCK=1;CKEDITOR.STYLE_INLINE=2;CKEDITOR.STYLE_OBJECT=3;
+(function(){function a(a,b){for(var c,d;(a=a.getParent())&&!a.equals(b);)if(a.getAttribute("data-nostyle"))c=a;else if(!d){var e=a.getAttribute("contentEditable");"false"==e?c=a:"true"==e&&(d=1)}return c}function d(a,b,c,d){return(a.getPosition(b)|d)==d&&(!c.childRule||c.childRule(a))}function b(c){var f=c.document;if(c.collapsed)f=J(this,f),c.insertNode(f),c.moveToPosition(f,CKEDITOR.POSITION_BEFORE_END);else{var g=this.element,h=this._.definition,l,k=h.ignoreReadonly,m=k||h.includeReadonly;null==
+m&&(m=c.root.getCustomData("cke_includeReadonly"));var n=CKEDITOR.dtd[g];n||(l=!0,n=CKEDITOR.dtd.span);c.enlarge(CKEDITOR.ENLARGE_INLINE,1);c.trim();var p=c.createBookmark(),q=p.startNode,r=p.endNode,u=q,t;if(!k){var w=c.getCommonAncestor(),k=a(q,w),w=a(r,w);k&&(u=k.getNextSourceNode(!0));w&&(r=w)}for(u.getPosition(r)==CKEDITOR.POSITION_FOLLOWING&&(u=0);u;){k=!1;if(u.equals(r))u=null,k=!0;else{var z=u.type==CKEDITOR.NODE_ELEMENT?u.getName():null,w=z&&"false"==u.getAttribute("contentEditable"),x=z&&
+u.getAttribute("data-nostyle");if(z&&u.data("cke-bookmark")){u=u.getNextSourceNode(!0);continue}if(w&&m&&CKEDITOR.dtd.$block[z])for(var B=u,A=e(B),C=void 0,D=A.length,F=0,B=D&&new CKEDITOR.dom.range(B.getDocument());F<D;++F){var C=A[F],M=CKEDITOR.filter.instances[C.data("cke-filter")];if(M?M.check(this):1)B.selectNodeContents(C),b.call(this,B)}A=z?!n[z]||x?0:w&&!m?0:d(u,r,h,Q):1;if(A)if(C=u.getParent(),A=h,D=g,F=l,!C||!(C.getDtd()||CKEDITOR.dtd.span)[D]&&!F||A.parentRule&&!A.parentRule(C))k=!0;else{if(t||
+z&&CKEDITOR.dtd.$removeEmpty[z]&&(u.getPosition(r)|Q)!=Q||(t=c.clone(),t.setStartBefore(u)),z=u.type,z==CKEDITOR.NODE_TEXT||w||z==CKEDITOR.NODE_ELEMENT&&!u.getChildCount()){for(var z=u,R;(k=!z.getNext(H))&&(R=z.getParent(),n[R.getName()])&&d(R,q,h,P);)z=R;t.setEndAfter(z)}}else k=!0;u=u.getNextSourceNode(x||w)}if(k&&t&&!t.collapsed){for(var k=J(this,f),w=k.hasAttributes(),x=t.getCommonAncestor(),z={},A={},C={},D={},W,T,ca;k&&x;){if(x.getName()==g){for(W in h.attributes)!D[W]&&(ca=x.getAttribute(T))&&
+(k.getAttribute(W)==ca?A[W]=1:D[W]=1);for(T in h.styles)!C[T]&&(ca=x.getStyle(T))&&(k.getStyle(T)==ca?z[T]=1:C[T]=1)}x=x.getParent()}for(W in A)k.removeAttribute(W);for(T in z)k.removeStyle(T);w&&!k.hasAttributes()&&(k=null);k?(t.extractContents().appendTo(k),t.insertNode(k),y.call(this,k),k.mergeSiblings(),CKEDITOR.env.ie||k.$.normalize()):(k=new CKEDITOR.dom.element("span"),t.extractContents().appendTo(k),t.insertNode(k),y.call(this,k),k.remove(!0));t=null}}c.moveToBookmark(p);c.shrink(CKEDITOR.SHRINK_TEXT);
+c.shrink(CKEDITOR.NODE_ELEMENT,!0)}}function c(a){function b(){for(var a=new CKEDITOR.dom.elementPath(d.getParent()),c=new CKEDITOR.dom.elementPath(n.getParent()),e=null,f=null,g=0;g<a.elements.length;g++){var h=a.elements[g];if(h==a.block||h==a.blockLimit)break;p.checkElementRemovable(h,!0)&&(e=h)}for(g=0;g<c.elements.length;g++){h=c.elements[g];if(h==c.block||h==c.blockLimit)break;p.checkElementRemovable(h,!0)&&(f=h)}f&&n.breakParent(f);e&&d.breakParent(e)}a.enlarge(CKEDITOR.ENLARGE_INLINE,1);var c=
+a.createBookmark(),d=c.startNode;if(a.collapsed){for(var e=new CKEDITOR.dom.elementPath(d.getParent(),a.root),f,g=0,h;g<e.elements.length&&(h=e.elements[g])&&h!=e.block&&h!=e.blockLimit;g++)if(this.checkElementRemovable(h)){var k;a.collapsed&&(a.checkBoundaryOfElement(h,CKEDITOR.END)||(k=a.checkBoundaryOfElement(h,CKEDITOR.START)))?(f=h,f.match=k?"start":"end"):(h.mergeSiblings(),h.is(this.element)?z.call(this,h):m(h,l(this)[h.getName()]))}if(f){h=d;for(g=0;;g++){k=e.elements[g];if(k.equals(f))break;
+else if(k.match)continue;else k=k.clone();k.append(h);h=k}h["start"==f.match?"insertBefore":"insertAfter"](f)}}else{var n=c.endNode,p=this;b();for(e=d;!e.equals(n);)f=e.getNextSourceNode(),e.type==CKEDITOR.NODE_ELEMENT&&this.checkElementRemovable(e)&&(e.getName()==this.element?z.call(this,e):m(e,l(this)[e.getName()]),f.type==CKEDITOR.NODE_ELEMENT&&f.contains(d)&&(b(),f=d.getNext())),e=f}a.moveToBookmark(c);a.shrink(CKEDITOR.NODE_ELEMENT,!0)}function e(a){var b=[];a.forEach(function(a){if("true"==
+a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function g(a){var b=a.getEnclosedNode()||a.getCommonAncestor(!1,!0);(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1))&&!a.isReadOnly()&&w(a,this)}function k(a){var b=a.getCommonAncestor(!0,!0);if(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1)){var b=this._.definition,c=b.attributes;if(c)for(var d in c)a.removeAttribute(d,c[d]);if(b.styles)for(var e in b.styles)b.styles.hasOwnProperty(e)&&
+a.removeStyle(e)}}function h(a){var b=a.createBookmark(!0),c=a.createIterator();c.enforceRealBlocks=!0;this._.enterMode&&(c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR);for(var d,e=a.document,f;d=c.getNextParagraph();)!d.isReadOnly()&&(c.activeFilter?c.activeFilter.check(this):1)&&(f=J(this,e,d),r(d,f));a.moveToBookmark(b)}function p(a){var b=a.createBookmark(1),c=a.createIterator();c.enforceRealBlocks=!0;c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR;for(var d,e;d=c.getNextParagraph();)this.checkElementRemovable(d)&&
+(d.is("pre")?((e=this._.enterMode==CKEDITOR.ENTER_BR?null:a.document.createElement(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))&&d.copyAttributes(e),r(d,e)):z.call(this,d));a.moveToBookmark(b)}function r(a,b){var c=!b;c&&(b=a.getDocument().createElement("div"),a.copyAttributes(b));var d=b&&b.is("pre"),e=a.is("pre"),g=!d&&e;if(d&&!e){e=b;(g=a.getBogus())&&g.remove();g=a.getHtml();g=B(g,/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,"");g=g.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,"$1");g=g.replace(/([ \t\n\r]+|&nbsp;)/g,
+" ");g=g.replace(/<br\b[^>]*>/gi,"\n");if(CKEDITOR.env.ie){var h=a.getDocument().createElement("div");h.append(e);e.$.outerHTML="\x3cpre\x3e"+g+"\x3c/pre\x3e";e.copyAttributes(h.getFirst());e=h.getFirst().remove()}else e.setHtml(g);b=e}else g?b=u(c?[a.getHtml()]:f(a),b):a.moveChildren(b);b.replace(a);if(d){var c=b,k;(k=c.getPrevious(R))&&k.type==CKEDITOR.NODE_ELEMENT&&k.is("pre")&&(d=B(k.getHtml(),/\n$/,"")+"\n\n"+B(c.getHtml(),/^\n/,""),CKEDITOR.env.ie?c.$.outerHTML="\x3cpre\x3e"+d+"\x3c/pre\x3e":
+c.setHtml(d),k.remove())}else c&&x(b)}function f(a){var b=[];B(a.getOuterHtml(),/(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,function(a,b,c){return b+"\x3c/pre\x3e"+c+"\x3cpre\x3e"}).replace(/<pre\b.*?>([\s\S]*?)<\/pre>/gi,function(a,c){b.push(c)});return b}function B(a,b,c){var d="",e="";a=a.replace(/(^<span[^>]+data-cke-bookmark.*?\/span>)|(<span[^>]+data-cke-bookmark.*?\/span>$)/gi,function(a,b,c){b&&(d=b);c&&(e=c);return""});return d+a.replace(b,c)+e}function u(a,b){var c;
+1<a.length&&(c=new CKEDITOR.dom.documentFragment(b.getDocument()));for(var d=0;d<a.length;d++){var e=a[d],e=e.replace(/(\r\n|\r)/g,"\n"),e=B(e,/^[ \t]*\n/,""),e=B(e,/\n$/,""),e=B(e,/^[ \t]+|[ \t]+$/g,function(a,b){return 1==a.length?"\x26nbsp;":b?" "+CKEDITOR.tools.repeat("\x26nbsp;",a.length-1):CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "}),e=e.replace(/\n/g,"\x3cbr\x3e"),e=e.replace(/[ \t]{2,}/g,function(a){return CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "});if(c){var f=b.clone();f.setHtml(e);
+c.append(f)}else b.setHtml(e)}return c||b}function z(a,b){var c=this._.definition,d=c.attributes,c=c.styles,e=l(this)[a.getName()],f=CKEDITOR.tools.isEmpty(d)&&CKEDITOR.tools.isEmpty(c),g;for(g in d)if("class"!=g&&!this._.definition.fullMatch||a.getAttribute(g)==q(g,d[g]))b&&"data-"==g.slice(0,5)||(f=a.hasAttribute(g),a.removeAttribute(g));for(var h in c)this._.definition.fullMatch&&a.getStyle(h)!=q(h,c[h],!0)||(f=f||!!a.getStyle(h),a.removeStyle(h));m(a,e,A[a.getName()]);f&&(this._.definition.alwaysRemoveElement?
+x(a,1):!CKEDITOR.dtd.$block[a.getName()]||this._.enterMode==CKEDITOR.ENTER_BR&&!a.hasAttributes()?x(a):a.renameNode(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))}function y(a){for(var b=l(this),c=a.getElementsByTag(this.element),d,e=c.count();0<=--e;)d=c.getItem(e),d.isReadOnly()||z.call(this,d,!0);for(var f in b)if(f!=this.element)for(c=a.getElementsByTag(f),e=c.count()-1;0<=e;e--)d=c.getItem(e),d.isReadOnly()||m(d,b[f])}function m(a,b,c){if(b=b&&b.attributes)for(var d=0;d<b.length;d++){var e=b[d][0],
 f;if(f=a.getAttribute(e)){var g=b[d][1];(null===g||g.test&&g.test(f)||"string"==typeof g&&f==g)&&a.removeAttribute(e)}}c||x(a)}function x(a,b){if(!a.hasAttributes()||b)if(CKEDITOR.dtd.$block[a.getName()]){var c=a.getPrevious(R),d=a.getNext(R);!c||c.type!=CKEDITOR.NODE_TEXT&&c.isBlockBoundary({br:1})||a.append("br",1);!d||d.type!=CKEDITOR.NODE_TEXT&&d.isBlockBoundary({br:1})||a.append("br");a.remove(!0)}else c=a.getFirst(),d=a.getLast(),a.remove(!0),c&&(c.type==CKEDITOR.NODE_ELEMENT&&c.mergeSiblings(),
-d&&!c.equals(d)&&d.type==CKEDITOR.NODE_ELEMENT&&d.mergeSiblings())}function G(a,b,c){var d;d=a.element;"*"==d&&(d="span");d=new CKEDITOR.dom.element(d,b);c&&c.copyAttributes(d);d=u(d,a);b.getCustomData("doc_processing_style")&&d.hasAttribute("id")?d.removeAttribute("id"):b.setCustomData("doc_processing_style",1);return d}function u(a,b){var c=b._.definition,d=c.attributes,c=CKEDITOR.style.getStyleText(c);if(d)for(var e in d)a.setAttribute(e,d[e]);c&&a.setAttribute("style",c);return a}function r(a,
-b){for(var c in a)a[c]=a[c].replace(C,function(a,c){return b[c]})}function h(a){if(a._.overrides)return a._.overrides;var b=a._.overrides={},c=a._.definition.overrides;if(c){CKEDITOR.tools.isArray(c)||(c=[c]);for(var d=0;d<c.length;d++){var e=c[d],f,g;"string"==typeof e?f=e.toLowerCase():(f=e.element?e.element.toLowerCase():a.element,g=e.attributes);e=b[f]||(b[f]={});if(g){var e=e.attributes=e.attributes||[],h;for(h in g)e.push([h.toLowerCase(),g[h]])}}}return b}function n(a,b,c){var d=new CKEDITOR.dom.element("span");
-d[c?"setStyle":"setAttribute"](a,b);return d[c?"getStyle":"getAttribute"](a)}function m(a,b,c){var d=a.document,e=a.getRanges();b=b?this.removeFromRange:this.applyToRange;for(var f,g=e.createIterator();f=g.getNextRange();)b.call(this,f,c);a.selectRanges(e);d.removeCustomData("doc_processing_style")}var z={address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,
-details:1,datagrid:1,datalist:1},B={a:1,blockquote:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,th:1,ul:1,dl:1,dt:1,dd:1,form:1,audio:1,video:1},E=/\s*(?:;\s*|$)/,C=/#\((.+?)\)/g,H=CKEDITOR.dom.walker.bookmark(0,1),R=CKEDITOR.dom.walker.whitespaces(1);CKEDITOR.style=function(a,b){if("string"==typeof a.type)return new CKEDITOR.style.customHandlers[a.type](a);var c=a.attributes;c&&c.style&&(a.styles=CKEDITOR.tools.extend({},a.styles,CKEDITOR.tools.parseCssText(c.style)),delete c.style);
-b&&(a=CKEDITOR.tools.clone(a),r(a.attributes,b),r(a.styles,b));c=this.element=a.element?"string"==typeof a.element?a.element.toLowerCase():a.element:"*";this.type=a.type||(z[c]?CKEDITOR.STYLE_BLOCK:B[c]?CKEDITOR.STYLE_OBJECT:CKEDITOR.STYLE_INLINE);"object"==typeof this.element&&(this.type=CKEDITOR.STYLE_OBJECT);this._={definition:a}};CKEDITOR.style.prototype={apply:function(a){if(a instanceof CKEDITOR.dom.document)return m.call(this,a.getSelection());if(this.checkApplicable(a.elementPath(),a)){var b=
-this._.enterMode;b||(this._.enterMode=a.activeEnterMode);m.call(this,a.getSelection(),0,a);this._.enterMode=b}},remove:function(a){if(a instanceof CKEDITOR.dom.document)return m.call(this,a.getSelection(),1);if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);m.call(this,a.getSelection(),1,a);this._.enterMode=b}},applyToRange:function(a){this.applyToRange=this.type==CKEDITOR.STYLE_INLINE?b:this.type==CKEDITOR.STYLE_BLOCK?k:this.type==CKEDITOR.STYLE_OBJECT?
-g:null;return this.applyToRange(a)},removeFromRange:function(a){this.removeFromRange=this.type==CKEDITOR.STYLE_INLINE?c:this.type==CKEDITOR.STYLE_BLOCK?q:this.type==CKEDITOR.STYLE_OBJECT?l:null;return this.removeFromRange(a)},applyToObject:function(a){u(a,this)},checkActive:function(a,b){switch(this.type){case CKEDITOR.STYLE_BLOCK:return this.checkElementRemovable(a.block||a.blockLimit,!0,b);case CKEDITOR.STYLE_OBJECT:case CKEDITOR.STYLE_INLINE:for(var c=a.elements,d=0,e;d<c.length;d++)if(e=c[d],
-this.type!=CKEDITOR.STYLE_INLINE||e!=a.block&&e!=a.blockLimit){if(this.type==CKEDITOR.STYLE_OBJECT){var f=e.getName();if(!("string"==typeof this.element?f==this.element:f in this.element))continue}if(this.checkElementRemovable(e,!0,b))return!0}}return!1},checkApplicable:function(a,b,c){b&&b instanceof CKEDITOR.filter&&(c=b);if(c&&!c.check(this))return!1;switch(this.type){case CKEDITOR.STYLE_OBJECT:return!!a.contains(this.element);case CKEDITOR.STYLE_BLOCK:return!!a.blockLimit.getDtd()[this.element]}return!0},
-checkElementMatch:function(a,b){var c=this._.definition;if(!a||!c.ignoreReadonly&&a.isReadOnly())return!1;var d=a.getName();if("string"==typeof this.element?d==this.element:d in this.element){if(!b&&!a.hasAttributes())return!0;if(d=c._AC)c=d;else{var d={},e=0,f=c.attributes;if(f)for(var g in f)e++,d[g]=f[g];if(g=CKEDITOR.style.getStyleText(c))d.style||e++,d.style=g;d._length=e;c=c._AC=d}if(c._length){for(var h in c)if("_length"!=h){e=a.getAttribute(h)||"";if("style"==h)a:{d=c[h];"string"==typeof d&&
-(d=CKEDITOR.tools.parseCssText(d));"string"==typeof e&&(e=CKEDITOR.tools.parseCssText(e,!0));g=void 0;for(g in d)if(!(g in e)||e[g]!=d[g]&&"inherit"!=d[g]&&"inherit"!=e[g]){d=!1;break a}d=!0}else d=c[h]==e;if(d){if(!b)return!0}else if(b)return!1}if(b)return!0}else return!0}return!1},checkElementRemovable:function(a,b,c){if(this.checkElementMatch(a,b,c))return!0;if(b=h(this)[a.getName()]){var d;if(!(b=b.attributes))return!0;for(c=0;c<b.length;c++)if(d=b[c][0],d=a.getAttribute(d)){var e=b[c][1];if(null===
-e)return!0;if("string"==typeof e){if(d==e)return!0}else if(e.test(d))return!0}}return!1},buildPreview:function(a){var b=this._.definition,c=[],d=b.element;"bdo"==d&&(d="span");var c=["\x3c",d],e=b.attributes;if(e)for(var f in e)c.push(" ",f,'\x3d"',e[f],'"');(e=CKEDITOR.style.getStyleText(b))&&c.push(' style\x3d"',e,'"');c.push("\x3e",a||b.name,"\x3c/",d,"\x3e");return c.join("")},getDefinition:function(){return this._.definition}};CKEDITOR.style.getStyleText=function(a){var b=a._ST;if(b)return b;
-var b=a.styles,c=a.attributes&&a.attributes.style||"",d="";c.length&&(c=c.replace(E,";"));for(var e in b){var f=b[e],g=(e+":"+f).replace(E,";");"inherit"==f?d+=g:c+=g}c.length&&(c=CKEDITOR.tools.normalizeCssText(c,!0));return a._ST=c+d};CKEDITOR.style.customHandlers={};CKEDITOR.style.addCustomHandler=function(a){var b=function(a){this._={definition:a};this.setup&&this.setup(a)};b.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.style.prototype),{assignedTo:CKEDITOR.STYLE_OBJECT},
-a,!0);return this.customHandlers[a.type]=b};var T=CKEDITOR.POSITION_PRECEDING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED,Q=CKEDITOR.POSITION_FOLLOWING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED})();CKEDITOR.styleCommand=function(a,d){this.requiredContent=this.allowedContent=this.style=a;CKEDITOR.tools.extend(this,d,!0)};
+d&&!c.equals(d)&&d.type==CKEDITOR.NODE_ELEMENT&&d.mergeSiblings())}function J(a,b,c){var d;d=a.element;"*"==d&&(d="span");d=new CKEDITOR.dom.element(d,b);c&&c.copyAttributes(d);d=w(d,a);b.getCustomData("doc_processing_style")&&d.hasAttribute("id")?d.removeAttribute("id"):b.setCustomData("doc_processing_style",1);return d}function w(a,b){var c=b._.definition,d=c.attributes,c=CKEDITOR.style.getStyleText(c);if(d)for(var e in d)a.setAttribute(e,d[e]);c&&a.setAttribute("style",c);return a}function F(a,
+b){for(var c in a)a[c]=a[c].replace(M,function(a,c){return b[c]})}function l(a){if(a._.overrides)return a._.overrides;var b=a._.overrides={},c=a._.definition.overrides;if(c){CKEDITOR.tools.isArray(c)||(c=[c]);for(var d=0;d<c.length;d++){var e=c[d],f,g;"string"==typeof e?f=e.toLowerCase():(f=e.element?e.element.toLowerCase():a.element,g=e.attributes);e=b[f]||(b[f]={});if(g){var e=e.attributes=e.attributes||[],h;for(h in g)e.push([h.toLowerCase(),g[h]])}}}return b}function q(a,b,c){var d=new CKEDITOR.dom.element("span");
+d[c?"setStyle":"setAttribute"](a,b);return d[c?"getStyle":"getAttribute"](a)}function n(a,b){function c(a,b){return"font-family"==b.toLowerCase()?a.replace(/["']/g,""):a}"string"==typeof a&&(a=CKEDITOR.tools.parseCssText(a));"string"==typeof b&&(b=CKEDITOR.tools.parseCssText(b,!0));for(var d in a)if(!(d in b)||c(b[d],d)!=c(a[d],d)&&"inherit"!=a[d]&&"inherit"!=b[d])return!1;return!0}function t(a,b,c){var d=a.document,e=a.getRanges();b=b?this.removeFromRange:this.applyToRange;for(var f,g=e.createIterator();f=
+g.getNextRange();)b.call(this,f,c);a.selectRanges(e);d.removeCustomData("doc_processing_style")}var A={address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,details:1,datagrid:1,datalist:1},C={a:1,blockquote:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,th:1,ul:1,dl:1,dt:1,dd:1,form:1,audio:1,video:1},D=/\s*(?:;\s*|$)/,M=/#\((.+?)\)/g,H=CKEDITOR.dom.walker.bookmark(0,
+1),R=CKEDITOR.dom.walker.whitespaces(1);CKEDITOR.style=function(a,b){if("string"==typeof a.type)return new CKEDITOR.style.customHandlers[a.type](a);var c=a.attributes;c&&c.style&&(a.styles=CKEDITOR.tools.extend({},a.styles,CKEDITOR.tools.parseCssText(c.style)),delete c.style);b&&(a=CKEDITOR.tools.clone(a),F(a.attributes,b),F(a.styles,b));c=this.element=a.element?"string"==typeof a.element?a.element.toLowerCase():a.element:"*";this.type=a.type||(A[c]?CKEDITOR.STYLE_BLOCK:C[c]?CKEDITOR.STYLE_OBJECT:
+CKEDITOR.STYLE_INLINE);"object"==typeof this.element&&(this.type=CKEDITOR.STYLE_OBJECT);this._={definition:a}};CKEDITOR.style.prototype={apply:function(a){if(a instanceof CKEDITOR.dom.document)return t.call(this,a.getSelection());if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);t.call(this,a.getSelection(),0,a);this._.enterMode=b}},remove:function(a){if(a instanceof CKEDITOR.dom.document)return t.call(this,a.getSelection(),1);if(this.checkApplicable(a.elementPath(),
+a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);t.call(this,a.getSelection(),1,a);this._.enterMode=b}},applyToRange:function(a){this.applyToRange=this.type==CKEDITOR.STYLE_INLINE?b:this.type==CKEDITOR.STYLE_BLOCK?h:this.type==CKEDITOR.STYLE_OBJECT?g:null;return this.applyToRange(a)},removeFromRange:function(a){this.removeFromRange=this.type==CKEDITOR.STYLE_INLINE?c:this.type==CKEDITOR.STYLE_BLOCK?p:this.type==CKEDITOR.STYLE_OBJECT?k:null;return this.removeFromRange(a)},applyToObject:function(a){w(a,
+this)},checkActive:function(a,b){switch(this.type){case CKEDITOR.STYLE_BLOCK:return this.checkElementRemovable(a.block||a.blockLimit,!0,b);case CKEDITOR.STYLE_OBJECT:case CKEDITOR.STYLE_INLINE:for(var c=a.elements,d=0,e;d<c.length;d++)if(e=c[d],this.type!=CKEDITOR.STYLE_INLINE||e!=a.block&&e!=a.blockLimit){if(this.type==CKEDITOR.STYLE_OBJECT){var f=e.getName();if(!("string"==typeof this.element?f==this.element:f in this.element))continue}if(this.checkElementRemovable(e,!0,b))return!0}}return!1},checkApplicable:function(a,
+b,c){b&&b instanceof CKEDITOR.filter&&(c=b);if(c&&!c.check(this))return!1;switch(this.type){case CKEDITOR.STYLE_OBJECT:return!!a.contains(this.element);case CKEDITOR.STYLE_BLOCK:return!!a.blockLimit.getDtd()[this.element]}return!0},checkElementMatch:function(a,b){var c=this._.definition;if(!a||!c.ignoreReadonly&&a.isReadOnly())return!1;var d=a.getName();if("string"==typeof this.element?d==this.element:d in this.element){if(!b&&!a.hasAttributes())return!0;if(d=c._AC)c=d;else{var d={},e=0,f=c.attributes;
+if(f)for(var g in f)e++,d[g]=f[g];if(g=CKEDITOR.style.getStyleText(c))d.style||e++,d.style=g;d._length=e;c=c._AC=d}if(c._length){for(var h in c)if("_length"!=h)if(d=a.getAttribute(h)||"","style"==h?n(c[h],d):c[h]==d){if(!b)return!0}else if(b)return!1;if(b)return!0}else return!0}return!1},checkElementRemovable:function(a,b,c){if(this.checkElementMatch(a,b,c))return!0;if(b=l(this)[a.getName()]){var d;if(!(b=b.attributes))return!0;for(c=0;c<b.length;c++)if(d=b[c][0],d=a.getAttribute(d)){var e=b[c][1];
+if(null===e)return!0;if("string"==typeof e){if(d==e)return!0}else if(e.test(d))return!0}}return!1},buildPreview:function(a){var b=this._.definition,c=[],d=b.element;"bdo"==d&&(d="span");var c=["\x3c",d],e=b.attributes;if(e)for(var f in e)c.push(" ",f,'\x3d"',e[f],'"');(e=CKEDITOR.style.getStyleText(b))&&c.push(' style\x3d"',e,'"');c.push("\x3e",a||b.name,"\x3c/",d,"\x3e");return c.join("")},getDefinition:function(){return this._.definition}};CKEDITOR.style.getStyleText=function(a){var b=a._ST;if(b)return b;
+var b=a.styles,c=a.attributes&&a.attributes.style||"",d="";c.length&&(c=c.replace(D,";"));for(var e in b){var f=b[e],g=(e+":"+f).replace(D,";");"inherit"==f?d+=g:c+=g}c.length&&(c=CKEDITOR.tools.normalizeCssText(c,!0));return a._ST=c+d};CKEDITOR.style.customHandlers={};CKEDITOR.style.addCustomHandler=function(a){var b=function(a){this._={definition:a};this.setup&&this.setup(a)};b.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.style.prototype),{assignedTo:CKEDITOR.STYLE_OBJECT},
+a,!0);return this.customHandlers[a.type]=b};var Q=CKEDITOR.POSITION_PRECEDING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED,P=CKEDITOR.POSITION_FOLLOWING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED})();CKEDITOR.styleCommand=function(a,d){this.requiredContent=this.allowedContent=this.style=a;CKEDITOR.tools.extend(this,d,!0)};
 CKEDITOR.styleCommand.prototype.exec=function(a){a.focus();this.state==CKEDITOR.TRISTATE_OFF?a.applyStyle(this.style):this.state==CKEDITOR.TRISTATE_ON&&a.removeStyle(this.style)};CKEDITOR.stylesSet=new CKEDITOR.resourceManager("","stylesSet");CKEDITOR.addStylesSet=CKEDITOR.tools.bind(CKEDITOR.stylesSet.add,CKEDITOR.stylesSet);CKEDITOR.loadStylesSet=function(a,d,b){CKEDITOR.stylesSet.addExternal(a,d,"");CKEDITOR.stylesSet.load(a,b)};
-CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{attachStyleStateChange:function(a,d){var b=this._.styleStateChangeCallbacks;b||(b=this._.styleStateChangeCallbacks=[],this.on("selectionChange",function(a){for(var d=0;d<b.length;d++){var g=b[d],l=g.style.checkActive(a.data.path,this)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF;g.fn.call(this,l)}}));b.push({style:a,fn:d})},applyStyle:function(a){a.apply(this)},removeStyle:function(a){a.remove(this)},getStylesSet:function(a){if(this._.stylesDefinitions)a(this._.stylesDefinitions);
+CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{attachStyleStateChange:function(a,d){var b=this._.styleStateChangeCallbacks;b||(b=this._.styleStateChangeCallbacks=[],this.on("selectionChange",function(a){for(var d=0;d<b.length;d++){var g=b[d],k=g.style.checkActive(a.data.path,this)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF;g.fn.call(this,k)}}));b.push({style:a,fn:d})},applyStyle:function(a){a.apply(this)},removeStyle:function(a){a.remove(this)},getStylesSet:function(a){if(this._.stylesDefinitions)a(this._.stylesDefinitions);
 else{var d=this,b=d.config.stylesCombo_stylesSet||d.config.stylesSet;if(!1===b)a(null);else if(b instanceof Array)d._.stylesDefinitions=b,a(b);else{b||(b="default");var b=b.split(":"),c=b[0];CKEDITOR.stylesSet.addExternal(c,b[1]?b.slice(1).join(":"):CKEDITOR.getUrl("styles.js"),"");CKEDITOR.stylesSet.load(c,function(b){d._.stylesDefinitions=b[c];a(d._.stylesDefinitions)})}}}});
 CKEDITOR.dom.comment=function(a,d){"string"==typeof a&&(a=(d?d.$:document).createComment(a));CKEDITOR.dom.domObject.call(this,a)};CKEDITOR.dom.comment.prototype=new CKEDITOR.dom.node;CKEDITOR.tools.extend(CKEDITOR.dom.comment.prototype,{type:CKEDITOR.NODE_COMMENT,getOuterHtml:function(){return"\x3c!--"+this.$.nodeValue+"--\x3e"}});"use strict";
-(function(){var a={},d={},b;for(b in CKEDITOR.dtd.$blockLimit)b in CKEDITOR.dtd.$list||(a[b]=1);for(b in CKEDITOR.dtd.$block)b in CKEDITOR.dtd.$blockLimit||b in CKEDITOR.dtd.$empty||(d[b]=1);CKEDITOR.dom.elementPath=function(b,e){var g=null,l=null,k=[],q=b,w;e=e||b.getDocument().getBody();do if(q.type==CKEDITOR.NODE_ELEMENT){k.push(q);if(!this.lastElement&&(this.lastElement=q,q.is(CKEDITOR.dtd.$object)||"false"==q.getAttribute("contenteditable")))continue;if(q.equals(e))break;if(!l&&(w=q.getName(),
-"true"==q.getAttribute("contenteditable")?l=q:!g&&d[w]&&(g=q),a[w])){if(w=!g&&"div"==w){a:{w=q.getChildren();for(var f=0,y=w.count();f<y;f++){var A=w.getItem(f);if(A.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$block[A.getName()]){w=!0;break a}}w=!1}w=!w}w?g=q:l=q}}while(q=q.getParent());l||(l=e);this.block=g;this.blockLimit=l;this.root=e;this.elements=k}})();
+(function(){var a={},d={},b;for(b in CKEDITOR.dtd.$blockLimit)b in CKEDITOR.dtd.$list||(a[b]=1);for(b in CKEDITOR.dtd.$block)b in CKEDITOR.dtd.$blockLimit||b in CKEDITOR.dtd.$empty||(d[b]=1);CKEDITOR.dom.elementPath=function(b,e){var g=null,k=null,h=[],p=b,r;e=e||b.getDocument().getBody();do if(p.type==CKEDITOR.NODE_ELEMENT){h.push(p);if(!this.lastElement&&(this.lastElement=p,p.is(CKEDITOR.dtd.$object)||"false"==p.getAttribute("contenteditable")))continue;if(p.equals(e))break;if(!k&&(r=p.getName(),
+"true"==p.getAttribute("contenteditable")?k=p:!g&&d[r]&&(g=p),a[r])){if(r=!g&&"div"==r){a:{r=p.getChildren();for(var f=0,B=r.count();f<B;f++){var u=r.getItem(f);if(u.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$block[u.getName()]){r=!0;break a}}r=!1}r=!r}r?g=p:k=p}}while(p=p.getParent());k||(k=e);this.block=g;this.blockLimit=k;this.root=e;this.elements=h}})();
 CKEDITOR.dom.elementPath.prototype={compare:function(a){var d=this.elements;a=a&&a.elements;if(!a||d.length!=a.length)return!1;for(var b=0;b<d.length;b++)if(!d[b].equals(a[b]))return!1;return!0},contains:function(a,d,b){var c;"string"==typeof a&&(c=function(b){return b.getName()==a});a instanceof CKEDITOR.dom.element?c=function(b){return b.equals(a)}:CKEDITOR.tools.isArray(a)?c=function(b){return-1<CKEDITOR.tools.indexOf(a,b.getName())}:"function"==typeof a?c=a:"object"==typeof a&&(c=function(b){return b.getName()in
 a});var e=this.elements,g=e.length;d&&g--;b&&(e=Array.prototype.slice.call(e,0),e.reverse());for(d=0;d<g;d++)if(c(e[d]))return e[d];return null},isContextFor:function(a){var d;return a in CKEDITOR.dtd.$block?(d=this.contains(CKEDITOR.dtd.$intermediate)||this.root.equals(this.block)&&this.block||this.blockLimit,!!d.getDtd()[a]):!0},direction:function(){return(this.block||this.blockLimit||this.root).getDirection(1)}};
 CKEDITOR.dom.text=function(a,d){"string"==typeof a&&(a=(d?d.$:document).createTextNode(a));this.$=a};CKEDITOR.dom.text.prototype=new CKEDITOR.dom.node;
 CKEDITOR.tools.extend(CKEDITOR.dom.text.prototype,{type:CKEDITOR.NODE_TEXT,getLength:function(){return this.$.nodeValue.length},getText:function(){return this.$.nodeValue},setText:function(a){this.$.nodeValue=a},split:function(a){var d=this.$.parentNode,b=d.childNodes.length,c=this.getLength(),e=this.getDocument(),g=new CKEDITOR.dom.text(this.$.splitText(a),e);d.childNodes.length==b&&(a>=c?(g=e.createText(""),g.insertAfter(this)):(a=e.createText(""),a.insertAfter(g),a.remove()));return g},substring:function(a,
 d){return"number"!=typeof d?this.$.nodeValue.substr(a):this.$.nodeValue.substring(a,d)}});
-(function(){function a(a,c,d){var g=a.serializable,l=c[d?"endContainer":"startContainer"],k=d?"endOffset":"startOffset",q=g?c.document.getById(a.startNode):a.startNode;a=g?c.document.getById(a.endNode):a.endNode;l.equals(q.getPrevious())?(c.startOffset=c.startOffset-l.getLength()-a.getPrevious().getLength(),l=a.getNext()):l.equals(a.getPrevious())&&(c.startOffset-=l.getLength(),l=a.getNext());l.equals(q.getParent())&&c[k]++;l.equals(a.getParent())&&c[k]++;c[d?"endContainer":"startContainer"]=l;return c}
-CKEDITOR.dom.rangeList=function(a){if(a instanceof CKEDITOR.dom.rangeList)return a;a?a instanceof CKEDITOR.dom.range&&(a=[a]):a=[];return CKEDITOR.tools.extend(a,d)};var d={createIterator:function(){var a=this,c=CKEDITOR.dom.walker.bookmark(),d=[],g;return{getNextRange:function(l){g=void 0===g?0:g+1;var k=a[g];if(k&&1<a.length){if(!g)for(var q=a.length-1;0<=q;q--)d.unshift(a[q].createBookmark(!0));if(l)for(var w=0;a[g+w+1];){var f=k.document;l=0;q=f.getById(d[w].endNode);for(f=f.getById(d[w+1].startNode);;){q=
-q.getNextSourceNode(!1);if(f.equals(q))l=1;else if(c(q)||q.type==CKEDITOR.NODE_ELEMENT&&q.isBlockBoundary())continue;break}if(!l)break;w++}for(k.moveToBookmark(d.shift());w--;)q=a[++g],q.moveToBookmark(d.shift()),k.setEnd(q.endContainer,q.endOffset)}return k}}},createBookmarks:function(b){for(var c=[],d,g=0;g<this.length;g++){c.push(d=this[g].createBookmark(b,!0));for(var l=g+1;l<this.length;l++)this[l]=a(d,this[l]),this[l]=a(d,this[l],!0)}return c},createBookmarks2:function(a){for(var c=[],d=0;d<
+(function(){function a(a,c,d){var g=a.serializable,k=c[d?"endContainer":"startContainer"],h=d?"endOffset":"startOffset",p=g?c.document.getById(a.startNode):a.startNode;a=g?c.document.getById(a.endNode):a.endNode;k.equals(p.getPrevious())?(c.startOffset=c.startOffset-k.getLength()-a.getPrevious().getLength(),k=a.getNext()):k.equals(a.getPrevious())&&(c.startOffset-=k.getLength(),k=a.getNext());k.equals(p.getParent())&&c[h]++;k.equals(a.getParent())&&c[h]++;c[d?"endContainer":"startContainer"]=k;return c}
+CKEDITOR.dom.rangeList=function(a){if(a instanceof CKEDITOR.dom.rangeList)return a;a?a instanceof CKEDITOR.dom.range&&(a=[a]):a=[];return CKEDITOR.tools.extend(a,d)};var d={createIterator:function(){var a=this,c=CKEDITOR.dom.walker.bookmark(),d=[],g;return{getNextRange:function(k){g=void 0===g?0:g+1;var h=a[g];if(h&&1<a.length){if(!g)for(var p=a.length-1;0<=p;p--)d.unshift(a[p].createBookmark(!0));if(k)for(var r=0;a[g+r+1];){var f=h.document;k=0;p=f.getById(d[r].endNode);for(f=f.getById(d[r+1].startNode);;){p=
+p.getNextSourceNode(!1);if(f.equals(p))k=1;else if(c(p)||p.type==CKEDITOR.NODE_ELEMENT&&p.isBlockBoundary())continue;break}if(!k)break;r++}for(h.moveToBookmark(d.shift());r--;)p=a[++g],p.moveToBookmark(d.shift()),h.setEnd(p.endContainer,p.endOffset)}return h}}},createBookmarks:function(b){for(var c=[],d,g=0;g<this.length;g++){c.push(d=this[g].createBookmark(b,!0));for(var k=g+1;k<this.length;k++)this[k]=a(d,this[k]),this[k]=a(d,this[k],!0)}return c},createBookmarks2:function(a){for(var c=[],d=0;d<
 this.length;d++)c.push(this[d].createBookmark2(a));return c},moveToBookmarks:function(a){for(var c=0;c<this.length;c++)this[c].moveToBookmark(a[c])}}})();
 (function(){function a(){return CKEDITOR.getUrl(CKEDITOR.skinName.split(",")[1]||"skins/"+CKEDITOR.skinName.split(",")[0]+"/")}function d(b){var c=CKEDITOR.skin["ua_"+b],d=CKEDITOR.env;if(c)for(var c=c.split(",").sort(function(a,b){return a>b?-1:1}),e=0,g;e<c.length;e++)if(g=c[e],d.ie&&(g.replace(/^ie/,"")==d.version||d.quirks&&"iequirks"==g)&&(g="ie"),d[g]){b+="_"+c[e];break}return CKEDITOR.getUrl(a()+b+".css")}function b(a,b){g[a]||(CKEDITOR.document.appendStyleSheet(d(a)),g[a]=1);b&&b()}function c(a){var b=
-a.getById(l);b||(b=a.getHead().append("style"),b.setAttribute("id",l),b.setAttribute("type","text/css"));return b}function e(a,b,c){var d,e,g;if(CKEDITOR.env.webkit)for(b=b.split("}").slice(0,-1),e=0;e<b.length;e++)b[e]=b[e].split("{");for(var k=0;k<a.length;k++)if(CKEDITOR.env.webkit)for(e=0;e<b.length;e++){g=b[e][1];for(d=0;d<c.length;d++)g=g.replace(c[d][0],c[d][1]);a[k].$.sheet.addRule(b[e][0],g)}else{g=b;for(d=0;d<c.length;d++)g=g.replace(c[d][0],c[d][1]);CKEDITOR.env.ie&&11>CKEDITOR.env.version?
-a[k].$.styleSheet.cssText+=g:a[k].$.innerHTML+=g}}var g={};CKEDITOR.skin={path:a,loadPart:function(c,d){CKEDITOR.skin.name!=CKEDITOR.skinName.split(",")[0]?CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(a()+"skin.js"),function(){b(c,d)}):b(c,d)},getPath:function(a){return CKEDITOR.getUrl(d(a))},icons:{},addIcon:function(a,b,c,d){a=a.toLowerCase();this.icons[a]||(this.icons[a]={path:b,offset:c||0,bgsize:d||"16px"})},getIconStyle:function(a,b,c,d,e){var g;a&&(a=a.toLowerCase(),b&&(g=this.icons[a+"-rtl"]),
+a.getById(k);b||(b=a.getHead().append("style"),b.setAttribute("id",k),b.setAttribute("type","text/css"));return b}function e(a,b,c){var d,e,g;if(CKEDITOR.env.webkit)for(b=b.split("}").slice(0,-1),e=0;e<b.length;e++)b[e]=b[e].split("{");for(var h=0;h<a.length;h++)if(CKEDITOR.env.webkit)for(e=0;e<b.length;e++){g=b[e][1];for(d=0;d<c.length;d++)g=g.replace(c[d][0],c[d][1]);a[h].$.sheet.addRule(b[e][0],g)}else{g=b;for(d=0;d<c.length;d++)g=g.replace(c[d][0],c[d][1]);CKEDITOR.env.ie&&11>CKEDITOR.env.version?
+a[h].$.styleSheet.cssText+=g:a[h].$.innerHTML+=g}}var g={};CKEDITOR.skin={path:a,loadPart:function(c,d){CKEDITOR.skin.name!=CKEDITOR.skinName.split(",")[0]?CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(a()+"skin.js"),function(){b(c,d)}):b(c,d)},getPath:function(a){return CKEDITOR.getUrl(d(a))},icons:{},addIcon:function(a,b,c,d){a=a.toLowerCase();this.icons[a]||(this.icons[a]={path:b,offset:c||0,bgsize:d||"16px"})},getIconStyle:function(a,b,c,d,e){var g;a&&(a=a.toLowerCase(),b&&(g=this.icons[a+"-rtl"]),
 g||(g=this.icons[a]));a=c||g&&g.path||"";d=d||g&&g.offset;e=e||g&&g.bgsize||"16px";a&&(a=a.replace(/'/g,"\\'"));return a&&"background-image:url('"+CKEDITOR.getUrl(a)+"');background-position:0 "+d+"px;background-size:"+e+";"}};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{getUiColor:function(){return this.uiColor},setUiColor:function(a){var b=c(CKEDITOR.document);return(this.setUiColor=function(a){this.uiColor=a;var c=CKEDITOR.skin.chameleon,d="",g="";"function"==typeof c&&(d=c(this,"editor"),g=
-c(this,"panel"));a=[[q,a]];e([b],d,a);e(k,g,a)}).call(this,a)}});var l="cke_ui_color",k=[],q=/\$color/g;CKEDITOR.on("instanceLoaded",function(a){if(!CKEDITOR.env.ie||!CKEDITOR.env.quirks){var b=a.editor;a=function(a){a=(a.data[0]||a.data).element.getElementsByTag("iframe").getItem(0).getFrameDocument();if(!a.getById("cke_ui_color")){a=c(a);k.push(a);var d=b.getUiColor();d&&e([a],CKEDITOR.skin.chameleon(b,"panel"),[[q,d]])}};b.on("panelShow",a);b.on("menuShow",a);b.config.uiColor&&b.setUiColor(b.config.uiColor)}})})();
+c(this,"panel"));a=[[p,a]];e([b],d,a);e(h,g,a)}).call(this,a)}});var k="cke_ui_color",h=[],p=/\$color/g;CKEDITOR.on("instanceLoaded",function(a){if(!CKEDITOR.env.ie||!CKEDITOR.env.quirks){var b=a.editor;a=function(a){a=(a.data[0]||a.data).element.getElementsByTag("iframe").getItem(0).getFrameDocument();if(!a.getById("cke_ui_color")){a=c(a);h.push(a);var d=b.getUiColor();d&&e([a],CKEDITOR.skin.chameleon(b,"panel"),[[p,d]])}};b.on("panelShow",a);b.on("menuShow",a);b.config.uiColor&&b.setUiColor(b.config.uiColor)}})})();
 (function(){if(CKEDITOR.env.webkit)CKEDITOR.env.hc=!1;else{var a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"width:0;height:0;position:absolute;left:-10000px;border:1px solid;border-color:red blue"\x3e\x3c/div\x3e',CKEDITOR.document);a.appendTo(CKEDITOR.document.getHead());try{var d=a.getComputedStyle("border-top-color"),b=a.getComputedStyle("border-right-color");CKEDITOR.env.hc=!(!d||d!=b)}catch(c){CKEDITOR.env.hc=!1}a.remove()}CKEDITOR.env.hc&&(CKEDITOR.env.cssClass+=" cke_hc");CKEDITOR.document.appendStyleText(".cke{visibility:hidden;}");
 CKEDITOR.status="loaded";CKEDITOR.fireOnce("loaded");if(a=CKEDITOR._.pending)for(delete CKEDITOR._.pending,d=0;d<a.length;d++)CKEDITOR.editor.prototype.constructor.apply(a[d][0],a[d][1]),CKEDITOR.add(a[d][0])})();/*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.skin.name="moono";CKEDITOR.skin.ua_editor="ie,iequirks,ie7,ie8,gecko";CKEDITOR.skin.ua_dialog="ie,iequirks,ie7,ie8";
-CKEDITOR.skin.chameleon=function(){var b=function(){return function(b,e){for(var a=b.match(/[^#]./g),c=0;3>c;c++){var f=c,d;d=parseInt(a[c],16);d=("0"+(0>e?0|d*(1+e):0|d+(255-d)*e).toString(16)).slice(-2);a[f]=d}return"#"+a.join("")}}(),c=function(){var b=new CKEDITOR.template("background:#{to};background-image:linear-gradient(to bottom,{from},{to});filter:progid:DXImageTransform.Microsoft.gradient(gradientType\x3d0,startColorstr\x3d'{from}',endColorstr\x3d'{to}');");return function(c,a){return b.output({from:c,
-to:a})}}(),f={editor:new CKEDITOR.template("{id}.cke_chrome [border-color:{defaultBorder};] {id} .cke_top [ {defaultGradient}border-bottom-color:{defaultBorder};] {id} .cke_bottom [{defaultGradient}border-top-color:{defaultBorder};] {id} .cke_resizer [border-right-color:{ckeResizer}] {id} .cke_dialog_title [{defaultGradient}border-bottom-color:{defaultBorder};] {id} .cke_dialog_footer [{defaultGradient}outline-color:{defaultBorder};border-top-color:{defaultBorder};] {id} .cke_dialog_tab [{lightGradient}border-color:{defaultBorder};] {id} .cke_dialog_tab:hover [{mediumGradient}] {id} .cke_dialog_contents [border-top-color:{defaultBorder};] {id} .cke_dialog_tab_selected, {id} .cke_dialog_tab_selected:hover [background:{dialogTabSelected};border-bottom-color:{dialogTabSelectedBorder};] {id} .cke_dialog_body [background:{dialogBody};border-color:{defaultBorder};] {id} .cke_toolgroup [{lightGradient}border-color:{defaultBorder};] {id} a.cke_button_off:hover, {id} a.cke_button_off:focus, {id} a.cke_button_off:active [{mediumGradient}] {id} .cke_button_on [{ckeButtonOn}] {id} .cke_toolbar_separator [background-color: {ckeToolbarSeparator};] {id} .cke_combo_button [border-color:{defaultBorder};{lightGradient}] {id} a.cke_combo_button:hover, {id} a.cke_combo_button:focus, {id} .cke_combo_on a.cke_combo_button [border-color:{defaultBorder};{mediumGradient}] {id} .cke_path_item [color:{elementsPathColor};] {id} a.cke_path_item:hover, {id} a.cke_path_item:focus, {id} a.cke_path_item:active [background-color:{elementsPathBg};] {id}.cke_panel [border-color:{defaultBorder};] "),
-panel:new CKEDITOR.template(".cke_panel_grouptitle [{lightGradient}border-color:{defaultBorder};] .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menubutton:hover .cke_menubutton_icon, .cke_menubutton:focus .cke_menubutton_icon, .cke_menubutton:active .cke_menubutton_icon [background-color:{menubuttonIconHover};] .cke_menuseparator [background-color:{menubuttonIcon};] a:hover.cke_colorbox, a:focus.cke_colorbox, a:active.cke_colorbox [border-color:{defaultBorder};] a:hover.cke_colorauto, a:hover.cke_colormore, a:focus.cke_colorauto, a:focus.cke_colormore, a:active.cke_colorauto, a:active.cke_colormore [background-color:{ckeColorauto};border-color:{defaultBorder};] ")};
-return function(g,e){var a=g.uiColor,a={id:"."+g.id,defaultBorder:b(a,-.1),defaultGradient:c(b(a,.9),a),lightGradient:c(b(a,1),b(a,.7)),mediumGradient:c(b(a,.8),b(a,.5)),ckeButtonOn:c(b(a,.6),b(a,.7)),ckeResizer:b(a,-.4),ckeToolbarSeparator:b(a,.5),ckeColorauto:b(a,.8),dialogBody:b(a,.7),dialogTabSelected:c("#FFFFFF","#FFFFFF"),dialogTabSelectedBorder:"#FFF",elementsPathColor:b(a,-.6),elementsPathBg:a,menubuttonIcon:b(a,.5),menubuttonIconHover:b(a,.3)};return f[e].output(a).replace(/\[/g,"{").replace(/\]/g,
-"}")}}();CKEDITOR.plugins.add("dialogui",{onLoad:function(){var h=function(b){this._||(this._={});this._["default"]=this._.initValue=b["default"]||"";this._.required=b.required||!1;for(var a=[this._],d=1;d<arguments.length;d++)a.push(arguments[d]);a.push(!0);CKEDITOR.tools.extend.apply(CKEDITOR.tools,a);return this._},v={build:function(b,a,d){return new CKEDITOR.ui.dialog.textInput(b,a,d)}},n={build:function(b,a,d){return new CKEDITOR.ui.dialog[a.type](b,a,d)}},q={isChanged:function(){return this.getValue()!=
+CKEDITOR.skin.name="moono-lisa";CKEDITOR.skin.ua_editor="ie,iequirks,ie8,gecko";CKEDITOR.skin.ua_dialog="ie,iequirks,ie8";
+CKEDITOR.skin.chameleon=function(){var b=function(){return function(b,d){for(var a=b.match(/[^#]./g),e=0;3>e;e++){var f=e,c;c=parseInt(a[e],16);c=("0"+(0>d?0|c*(1+d):0|c+(255-c)*d).toString(16)).slice(-2);a[f]=c}return"#"+a.join("")}}(),f={editor:new CKEDITOR.template("{id}.cke_chrome [border-color:{defaultBorder};] {id} .cke_top [ background-color:{defaultBackground};border-bottom-color:{defaultBorder};] {id} .cke_bottom [background-color:{defaultBackground};border-top-color:{defaultBorder};] {id} .cke_resizer [border-right-color:{ckeResizer}] {id} .cke_dialog_title [background-color:{defaultBackground};border-bottom-color:{defaultBorder};] {id} .cke_dialog_footer [background-color:{defaultBackground};outline-color:{defaultBorder};] {id} .cke_dialog_tab [background-color:{dialogTab};border-color:{defaultBorder};] {id} .cke_dialog_tab:hover [background-color:{lightBackground};] {id} .cke_dialog_contents [border-top-color:{defaultBorder};] {id} .cke_dialog_tab_selected, {id} .cke_dialog_tab_selected:hover [background:{dialogTabSelected};border-bottom-color:{dialogTabSelectedBorder};] {id} .cke_dialog_body [background:{dialogBody};border-color:{defaultBorder};] {id} a.cke_button_off:hover,{id} a.cke_button_off:focus,{id} a.cke_button_off:active [background-color:{darkBackground};border-color:{toolbarElementsBorder};] {id} .cke_button_on [background-color:{ckeButtonOn};border-color:{toolbarElementsBorder};] {id} .cke_toolbar_separator,{id} .cke_toolgroup a.cke_button:last-child:after,{id} .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after [background-color: {toolbarElementsBorder};border-color: {toolbarElementsBorder};] {id} a.cke_combo_button:hover,{id} a.cke_combo_button:focus,{id} .cke_combo_on a.cke_combo_button [border-color:{toolbarElementsBorder};background-color:{darkBackground};] {id} .cke_combo:after [border-color:{toolbarElementsBorder};] {id} .cke_path_item [color:{elementsPathColor};] {id} a.cke_path_item:hover,{id} a.cke_path_item:focus,{id} a.cke_path_item:active [background-color:{darkBackground};] {id}.cke_panel [border-color:{defaultBorder};] "),panel:new CKEDITOR.template(".cke_panel_grouptitle [background-color:{lightBackground};border-color:{defaultBorder};] .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active [background-color:{menubuttonHover};] .cke_menubutton:hover .cke_menubutton_icon, .cke_menubutton:focus .cke_menubutton_icon, .cke_menubutton:active .cke_menubutton_icon [background-color:{menubuttonIconHover};] .cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menuseparator [background-color:{menubuttonIcon};] a:hover.cke_colorbox, a:active.cke_colorbox [border-color:{defaultBorder};] a:hover.cke_colorauto, a:hover.cke_colormore, a:active.cke_colorauto, a:active.cke_colormore [background-color:{ckeColorauto};border-color:{defaultBorder};] ")};
+return function(g,d){var a=b(g.uiColor,.4),a={id:"."+g.id,defaultBorder:b(a,-.2),toolbarElementsBorder:b(a,-.25),defaultBackground:a,lightBackground:b(a,.8),darkBackground:b(a,-.15),ckeButtonOn:b(a,.4),ckeResizer:b(a,-.4),ckeColorauto:b(a,.8),dialogBody:b(a,.7),dialogTab:b(a,.65),dialogTabSelected:"#FFF",dialogTabSelectedBorder:"#FFF",elementsPathColor:b(a,-.6),menubuttonHover:b(a,.1),menubuttonIcon:b(a,.5),menubuttonIconHover:b(a,.3)};return f[d].output(a).replace(/\[/g,"{").replace(/\]/g,"}")}}();CKEDITOR.plugins.add("dialogui",{onLoad:function(){var h=function(b){this._||(this._={});this._["default"]=this._.initValue=b["default"]||"";this._.required=b.required||!1;for(var a=[this._],d=1;d<arguments.length;d++)a.push(arguments[d]);a.push(!0);CKEDITOR.tools.extend.apply(CKEDITOR.tools,a);return this._},v={build:function(b,a,d){return new CKEDITOR.ui.dialog.textInput(b,a,d)}},n={build:function(b,a,d){return new CKEDITOR.ui.dialog[a.type](b,a,d)}},q={isChanged:function(){return this.getValue()!=
 this.getInitValue()},reset:function(b){this.setValue(this.getInitValue(),b)},setInitValue:function(){this._.initValue=this.getValue()},resetInitValue:function(){this._.initValue=this._["default"]},getInitValue:function(){return this._.initValue}},r=CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onChange:function(b,a){this._.domOnChangeRegistered||(b.on("load",function(){this.getInputElement().on("change",function(){b.parts.dialog.isVisible()&&this.fire("change",{value:this.getValue()})},
 this)},this),this._.domOnChangeRegistered=!0);this.on("change",a)}},!0),x=/^on([A-Z]\w+)/,t=function(b){for(var a in b)(x.test(a)||"title"==a||"type"==a)&&delete b[a];return b},w=function(b){b=b.data.getKeystroke();b==CKEDITOR.SHIFT+CKEDITOR.ALT+36?this.setDirectionMarker("ltr"):b==CKEDITOR.SHIFT+CKEDITOR.ALT+35&&this.setDirectionMarker("rtl")};CKEDITOR.tools.extend(CKEDITOR.ui.dialog,{labeledElement:function(b,a,d,f){if(!(4>arguments.length)){var c=h.call(this,a);c.labelId=CKEDITOR.tools.getNextId()+
 "_label";this._.children=[];var e={role:a.role||"presentation"};a.includeLabel&&(e["aria-labelledby"]=c.labelId);CKEDITOR.ui.dialog.uiElement.call(this,b,a,d,"div",null,e,function(){var e=[],g=a.required?" cke_required":"";"horizontal"!=a.labelLayout?e.push('\x3clabel class\x3d"cke_dialog_ui_labeled_label'+g+'" ',' id\x3d"'+c.labelId+'"',c.inputId?' for\x3d"'+c.inputId+'"':"",(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e",a.label,"\x3c/label\x3e",'\x3cdiv class\x3d"cke_dialog_ui_labeled_content"',
@@ -534,77 +551,77 @@ CKEDITOR.tools.removeFunction(m)}));CKEDITOR.env.gecko?setTimeout(b,500):b()},ge
 new CKEDITOR.ui.dialog.button;CKEDITOR.ui.dialog.fieldset.prototype=CKEDITOR.tools.clone(CKEDITOR.ui.dialog.hbox.prototype);CKEDITOR.dialog.addUIElement("text",v);CKEDITOR.dialog.addUIElement("password",v);CKEDITOR.dialog.addUIElement("textarea",n);CKEDITOR.dialog.addUIElement("checkbox",n);CKEDITOR.dialog.addUIElement("radio",n);CKEDITOR.dialog.addUIElement("button",n);CKEDITOR.dialog.addUIElement("select",n);CKEDITOR.dialog.addUIElement("file",n);CKEDITOR.dialog.addUIElement("fileButton",n);CKEDITOR.dialog.addUIElement("html",
 n);CKEDITOR.dialog.addUIElement("fieldset",{build:function(b,a,d){for(var f=a.children,c,e=[],h=[],g=0;g<f.length&&(c=f[g]);g++){var k=[];e.push(k);h.push(CKEDITOR.dialog._.uiElementBuilders[c.type].build(b,c,k))}return new CKEDITOR.ui.dialog[a.type](b,h,e,d,a)}})}});CKEDITOR.DIALOG_RESIZE_NONE=0;CKEDITOR.DIALOG_RESIZE_WIDTH=1;CKEDITOR.DIALOG_RESIZE_HEIGHT=2;CKEDITOR.DIALOG_RESIZE_BOTH=3;CKEDITOR.DIALOG_STATE_IDLE=1;CKEDITOR.DIALOG_STATE_BUSY=2;
 (function(){function x(){for(var a=this._.tabIdList.length,b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId)+a,c=b-1;c>b-a;c--)if(this._.tabs[this._.tabIdList[c%a]][0].$.offsetHeight)return this._.tabIdList[c%a];return null}function A(){for(var a=this._.tabIdList.length,b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId),c=b+1;c<b+a;c++)if(this._.tabs[this._.tabIdList[c%a]][0].$.offsetHeight)return this._.tabIdList[c%a];return null}function K(a,b){for(var c=a.$.getElementsByTagName("input"),
-d=0,e=c.length;d<e;d++){var f=new CKEDITOR.dom.element(c[d]);"text"==f.getAttribute("type").toLowerCase()&&(b?(f.setAttribute("value",f.getCustomData("fake_value")||""),f.removeCustomData("fake_value")):(f.setCustomData("fake_value",f.getAttribute("value")),f.setAttribute("value","")))}}function T(a,b){var c=this.getInputElement();c&&(a?c.removeAttribute("aria-invalid"):c.setAttribute("aria-invalid",!0));a||(this.select?this.select():this.focus());b&&alert(b);this.fire("validated",{valid:a,msg:b})}
-function U(){var a=this.getInputElement();a&&a.removeAttribute("aria-invalid")}function V(a){var b=CKEDITOR.dom.element.createFromHtml(CKEDITOR.addTemplate("dialog",W).output({id:CKEDITOR.tools.getNextNumber(),editorId:a.id,langDir:a.lang.dir,langCode:a.langCode,editorDialogClass:"cke_editor_"+a.name.replace(/\./g,"\\.")+"_dialog",closeTitle:a.lang.common.close,hidpi:CKEDITOR.env.hidpi?"cke_hidpi":""})),c=b.getChild([0,0,0,0,0]),d=c.getChild(0),e=c.getChild(1);a.plugins.clipboard&&CKEDITOR.plugins.clipboard.preventDefaultDropOnElement(c);
-!CKEDITOR.env.ie||CKEDITOR.env.quirks||CKEDITOR.env.edge||(a="javascript:void(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"}())",CKEDITOR.dom.element.createFromHtml('\x3ciframe frameBorder\x3d"0" class\x3d"cke_iframe_shim" src\x3d"'+a+'" tabIndex\x3d"-1"\x3e\x3c/iframe\x3e').appendTo(c.getParent()));d.unselectable();e.unselectable();return{element:b,parts:{dialog:b.getChild(0),title:d,close:e,tabs:c.getChild(2),contents:c.getChild([3,0,0,0]),
+e=0,d=c.length;e<d;e++){var f=new CKEDITOR.dom.element(c[e]);"text"==f.getAttribute("type").toLowerCase()&&(b?(f.setAttribute("value",f.getCustomData("fake_value")||""),f.removeCustomData("fake_value")):(f.setCustomData("fake_value",f.getAttribute("value")),f.setAttribute("value","")))}}function T(a,b){var c=this.getInputElement();c&&(a?c.removeAttribute("aria-invalid"):c.setAttribute("aria-invalid",!0));a||(this.select?this.select():this.focus());b&&alert(b);this.fire("validated",{valid:a,msg:b})}
+function U(){var a=this.getInputElement();a&&a.removeAttribute("aria-invalid")}function V(a){var b=CKEDITOR.dom.element.createFromHtml(CKEDITOR.addTemplate("dialog",W).output({id:CKEDITOR.tools.getNextNumber(),editorId:a.id,langDir:a.lang.dir,langCode:a.langCode,editorDialogClass:"cke_editor_"+a.name.replace(/\./g,"\\.")+"_dialog",closeTitle:a.lang.common.close,hidpi:CKEDITOR.env.hidpi?"cke_hidpi":""})),c=b.getChild([0,0,0,0,0]),e=c.getChild(0),d=c.getChild(1);a.plugins.clipboard&&CKEDITOR.plugins.clipboard.preventDefaultDropOnElement(c);
+!CKEDITOR.env.ie||CKEDITOR.env.quirks||CKEDITOR.env.edge||(a="javascript:void(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"}())",CKEDITOR.dom.element.createFromHtml('\x3ciframe frameBorder\x3d"0" class\x3d"cke_iframe_shim" src\x3d"'+a+'" tabIndex\x3d"-1"\x3e\x3c/iframe\x3e').appendTo(c.getParent()));e.unselectable();d.unselectable();return{element:b,parts:{dialog:b.getChild(0),title:e,close:d,tabs:c.getChild(2),contents:c.getChild([3,0,0,0]),
 footer:c.getChild([3,0,1,0])}}}function L(a,b,c){this.element=b;this.focusIndex=c;this.tabIndex=0;this.isFocusable=function(){return!b.getAttribute("disabled")&&b.isVisible()};this.focus=function(){a._.currentFocusIndex=this.focusIndex;this.element.focus()};b.on("keydown",function(a){a.data.getKeystroke()in{32:1,13:1}&&this.fire("click")});b.on("focus",function(){this.fire("mouseover")});b.on("blur",function(){this.fire("mouseout")})}function X(a){function b(){a.layout()}var c=CKEDITOR.document.getWindow();
-c.on("resize",b);a.on("hide",function(){c.removeListener("resize",b)})}function M(a,b){this._={dialog:a};CKEDITOR.tools.extend(this,b)}function Y(a){function b(b){var c=a.getSize(),k=CKEDITOR.document.getWindow().getViewPaneSize(),q=b.data.$.screenX,n=b.data.$.screenY,r=q-d.x,l=n-d.y;d={x:q,y:n};e.x+=r;e.y+=l;a.move(e.x+h[3]<g?-h[3]:e.x-h[1]>k.width-c.width-g?k.width-c.width+("rtl"==f.lang.dir?0:h[1]):e.x,e.y+h[0]<g?-h[0]:e.y-h[2]>k.height-c.height-g?k.height-c.height+h[2]:e.y,1);b.data.preventDefault()}
-function c(){CKEDITOR.document.removeListener("mousemove",b);CKEDITOR.document.removeListener("mouseup",c);if(CKEDITOR.env.ie6Compat){var a=u.getChild(0).getFrameDocument();a.removeListener("mousemove",b);a.removeListener("mouseup",c)}}var d=null,e=null,f=a.getParentEditor(),g=f.config.dialog_magnetDistance,h=CKEDITOR.skin.margins||[0,0,0,0];"undefined"==typeof g&&(g=20);a.parts.title.on("mousedown",function(g){d={x:g.data.$.screenX,y:g.data.$.screenY};CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",
-c);e=a.getPosition();if(CKEDITOR.env.ie6Compat){var f=u.getChild(0).getFrameDocument();f.on("mousemove",b);f.on("mouseup",c)}g.data.preventDefault()},a)}function Z(a){function b(b){var c="rtl"==f.lang.dir,n=k.width,q=k.height,G=n+(b.data.$.screenX-m.x)*(c?-1:1)*(a._.moved?1:2),H=q+(b.data.$.screenY-m.y)*(a._.moved?1:2),B=a._.element.getFirst(),B=c&&B.getComputedStyle("right"),C=a.getPosition();C.y+H>p.height&&(H=p.height-C.y);(c?B:C.x)+G>p.width&&(G=p.width-(c?B:C.x));if(e==CKEDITOR.DIALOG_RESIZE_WIDTH||
-e==CKEDITOR.DIALOG_RESIZE_BOTH)n=Math.max(d.minWidth||0,G-g);if(e==CKEDITOR.DIALOG_RESIZE_HEIGHT||e==CKEDITOR.DIALOG_RESIZE_BOTH)q=Math.max(d.minHeight||0,H-h);a.resize(n,q);a._.moved||a.layout();b.data.preventDefault()}function c(){CKEDITOR.document.removeListener("mouseup",c);CKEDITOR.document.removeListener("mousemove",b);q&&(q.remove(),q=null);if(CKEDITOR.env.ie6Compat){var a=u.getChild(0).getFrameDocument();a.removeListener("mouseup",c);a.removeListener("mousemove",b)}}var d=a.definition,e=d.resizable;
-if(e!=CKEDITOR.DIALOG_RESIZE_NONE){var f=a.getParentEditor(),g,h,p,m,k,q,n=CKEDITOR.tools.addFunction(function(e){k=a.getSize();var d=a.parts.contents;d.$.getElementsByTagName("iframe").length&&(q=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_dialog_resize_cover" style\x3d"height: 100%; position: absolute; width: 100%;"\x3e\x3c/div\x3e'),d.append(q));h=k.height-a.parts.contents.getSize("height",!(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.quirks));g=k.width-a.parts.contents.getSize("width",
-1);m={x:e.screenX,y:e.screenY};p=CKEDITOR.document.getWindow().getViewPaneSize();CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",c);CKEDITOR.env.ie6Compat&&(d=u.getChild(0).getFrameDocument(),d.on("mousemove",b),d.on("mouseup",c));e.preventDefault&&e.preventDefault()});a.on("load",function(){var b="";e==CKEDITOR.DIALOG_RESIZE_WIDTH?b=" cke_resizer_horizontal":e==CKEDITOR.DIALOG_RESIZE_HEIGHT&&(b=" cke_resizer_vertical");b=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_resizer'+
-b+" cke_resizer_"+f.lang.dir+'" title\x3d"'+CKEDITOR.tools.htmlEncode(f.lang.common.resize)+'" onmousedown\x3d"CKEDITOR.tools.callFunction('+n+', event )"\x3e'+("ltr"==f.lang.dir?"◢":"◣")+"\x3c/div\x3e");a.parts.footer.append(b,1)});f.on("destroy",function(){CKEDITOR.tools.removeFunction(n)})}}function I(a){a.data.preventDefault(1)}function N(a){var b=CKEDITOR.document.getWindow(),c=a.config,d=c.dialog_backgroundCoverColor||"white",e=c.dialog_backgroundCoverOpacity,f=c.baseFloatZIndex,c=CKEDITOR.tools.genKey(d,
-e,f),g=z[c];g?g.show():(f=['\x3cdiv tabIndex\x3d"-1" style\x3d"position: ',CKEDITOR.env.ie6Compat?"absolute":"fixed","; z-index: ",f,"; top: 0px; left: 0px; ",CKEDITOR.env.ie6Compat?"":"background-color: "+d,'" class\x3d"cke_dialog_background_cover"\x3e'],CKEDITOR.env.ie6Compat&&(d="\x3chtml\x3e\x3cbody style\x3d\\'background-color:"+d+";\\'\x3e\x3c/body\x3e\x3c/html\x3e",f.push('\x3ciframe hidefocus\x3d"true" frameborder\x3d"0" id\x3d"cke_dialog_background_iframe" src\x3d"javascript:'),f.push("void((function(){"+
-encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.write( '"+d+"' );document.close();")+"})())"),f.push('" style\x3d"position:absolute;left:0;top:0;width:100%;height: 100%;filter: progid:DXImageTransform.Microsoft.Alpha(opacity\x3d0)"\x3e\x3c/iframe\x3e')),f.push("\x3c/div\x3e"),g=CKEDITOR.dom.element.createFromHtml(f.join("")),g.setOpacity(void 0!==e?e:.5),g.on("keydown",I),g.on("keypress",I),g.on("keyup",I),g.appendTo(CKEDITOR.document.getBody()),z[c]=g);a.focusManager.add(g);
-u=g;a=function(){var a=b.getViewPaneSize();g.setStyles({width:a.width+"px",height:a.height+"px"})};var h=function(){var a=b.getScrollPosition(),c=CKEDITOR.dialog._.currentTop;g.setStyles({left:a.x+"px",top:a.y+"px"});if(c){do a=c.getPosition(),c.move(a.x,a.y);while(c=c._.parentDialog)}};J=a;b.on("resize",a);a();CKEDITOR.env.mac&&CKEDITOR.env.webkit||g.focus();if(CKEDITOR.env.ie6Compat){var p=function(){h();arguments.callee.prevScrollHandler.apply(this,arguments)};b.$.setTimeout(function(){p.prevScrollHandler=
+c.on("resize",b);a.on("hide",function(){c.removeListener("resize",b)})}function M(a,b){this._={dialog:a};CKEDITOR.tools.extend(this,b)}function Y(a){function b(b){var c=a.getSize(),k=CKEDITOR.document.getWindow().getViewPaneSize(),q=b.data.$.screenX,n=b.data.$.screenY,r=q-e.x,l=n-e.y;e={x:q,y:n};d.x+=r;d.y+=l;a.move(d.x+h[3]<g?-h[3]:d.x-h[1]>k.width-c.width-g?k.width-c.width+("rtl"==f.lang.dir?0:h[1]):d.x,d.y+h[0]<g?-h[0]:d.y-h[2]>k.height-c.height-g?k.height-c.height+h[2]:d.y,1);b.data.preventDefault()}
+function c(){CKEDITOR.document.removeListener("mousemove",b);CKEDITOR.document.removeListener("mouseup",c);if(CKEDITOR.env.ie6Compat){var a=u.getChild(0).getFrameDocument();a.removeListener("mousemove",b);a.removeListener("mouseup",c)}}var e=null,d=null,f=a.getParentEditor(),g=f.config.dialog_magnetDistance,h=CKEDITOR.skin.margins||[0,0,0,0];"undefined"==typeof g&&(g=20);a.parts.title.on("mousedown",function(g){e={x:g.data.$.screenX,y:g.data.$.screenY};CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",
+c);d=a.getPosition();if(CKEDITOR.env.ie6Compat){var f=u.getChild(0).getFrameDocument();f.on("mousemove",b);f.on("mouseup",c)}g.data.preventDefault()},a)}function Z(a){function b(b){var c="rtl"==f.lang.dir,n=k.width,q=k.height,G=n+(b.data.$.screenX-m.x)*(c?-1:1)*(a._.moved?1:2),H=q+(b.data.$.screenY-m.y)*(a._.moved?1:2),B=a._.element.getFirst(),B=c&&B.getComputedStyle("right"),C=a.getPosition();C.y+H>p.height&&(H=p.height-C.y);(c?B:C.x)+G>p.width&&(G=p.width-(c?B:C.x));if(d==CKEDITOR.DIALOG_RESIZE_WIDTH||
+d==CKEDITOR.DIALOG_RESIZE_BOTH)n=Math.max(e.minWidth||0,G-g);if(d==CKEDITOR.DIALOG_RESIZE_HEIGHT||d==CKEDITOR.DIALOG_RESIZE_BOTH)q=Math.max(e.minHeight||0,H-h);a.resize(n,q);a._.moved||a.layout();b.data.preventDefault()}function c(){CKEDITOR.document.removeListener("mouseup",c);CKEDITOR.document.removeListener("mousemove",b);q&&(q.remove(),q=null);if(CKEDITOR.env.ie6Compat){var a=u.getChild(0).getFrameDocument();a.removeListener("mouseup",c);a.removeListener("mousemove",b)}}var e=a.definition,d=e.resizable;
+if(d!=CKEDITOR.DIALOG_RESIZE_NONE){var f=a.getParentEditor(),g,h,p,m,k,q,n=CKEDITOR.tools.addFunction(function(d){k=a.getSize();var e=a.parts.contents;e.$.getElementsByTagName("iframe").length&&(q=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_dialog_resize_cover" style\x3d"height: 100%; position: absolute; width: 100%;"\x3e\x3c/div\x3e'),e.append(q));h=k.height-a.parts.contents.getSize("height",!(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.quirks));g=k.width-a.parts.contents.getSize("width",
+1);m={x:d.screenX,y:d.screenY};p=CKEDITOR.document.getWindow().getViewPaneSize();CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",c);CKEDITOR.env.ie6Compat&&(e=u.getChild(0).getFrameDocument(),e.on("mousemove",b),e.on("mouseup",c));d.preventDefault&&d.preventDefault()});a.on("load",function(){var b="";d==CKEDITOR.DIALOG_RESIZE_WIDTH?b=" cke_resizer_horizontal":d==CKEDITOR.DIALOG_RESIZE_HEIGHT&&(b=" cke_resizer_vertical");b=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_resizer'+
+b+" cke_resizer_"+f.lang.dir+'" title\x3d"'+CKEDITOR.tools.htmlEncode(f.lang.common.resize)+'" onmousedown\x3d"CKEDITOR.tools.callFunction('+n+', event )"\x3e'+("ltr"==f.lang.dir?"◢":"◣")+"\x3c/div\x3e");a.parts.footer.append(b,1)});f.on("destroy",function(){CKEDITOR.tools.removeFunction(n)})}}function I(a){a.data.preventDefault(1)}function N(a){var b=CKEDITOR.document.getWindow(),c=a.config,e=CKEDITOR.skinName||a.config.skin,d=c.dialog_backgroundCoverColor||("moono-lisa"==e?"black":"white"),e=c.dialog_backgroundCoverOpacity,
+f=c.baseFloatZIndex,c=CKEDITOR.tools.genKey(d,e,f),g=z[c];g?g.show():(f=['\x3cdiv tabIndex\x3d"-1" style\x3d"position: ',CKEDITOR.env.ie6Compat?"absolute":"fixed","; z-index: ",f,"; top: 0px; left: 0px; ",CKEDITOR.env.ie6Compat?"":"background-color: "+d,'" class\x3d"cke_dialog_background_cover"\x3e'],CKEDITOR.env.ie6Compat&&(d="\x3chtml\x3e\x3cbody style\x3d\\'background-color:"+d+";\\'\x3e\x3c/body\x3e\x3c/html\x3e",f.push('\x3ciframe hidefocus\x3d"true" frameborder\x3d"0" id\x3d"cke_dialog_background_iframe" src\x3d"javascript:'),
+f.push("void((function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.write( '"+d+"' );document.close();")+"})())"),f.push('" style\x3d"position:absolute;left:0;top:0;width:100%;height: 100%;filter: progid:DXImageTransform.Microsoft.Alpha(opacity\x3d0)"\x3e\x3c/iframe\x3e')),f.push("\x3c/div\x3e"),g=CKEDITOR.dom.element.createFromHtml(f.join("")),g.setOpacity(void 0!==e?e:.5),g.on("keydown",I),g.on("keypress",I),g.on("keyup",I),g.appendTo(CKEDITOR.document.getBody()),
+z[c]=g);a.focusManager.add(g);u=g;a=function(){var a=b.getViewPaneSize();g.setStyles({width:a.width+"px",height:a.height+"px"})};var h=function(){var a=b.getScrollPosition(),c=CKEDITOR.dialog._.currentTop;g.setStyles({left:a.x+"px",top:a.y+"px"});if(c){do a=c.getPosition(),c.move(a.x,a.y);while(c=c._.parentDialog)}};J=a;b.on("resize",a);a();CKEDITOR.env.mac&&CKEDITOR.env.webkit||g.focus();if(CKEDITOR.env.ie6Compat){var p=function(){h();arguments.callee.prevScrollHandler.apply(this,arguments)};b.$.setTimeout(function(){p.prevScrollHandler=
 window.onscroll||function(){};window.onscroll=p},0);h()}}function O(a){u&&(a.focusManager.remove(u),a=CKEDITOR.document.getWindow(),u.hide(),a.removeListener("resize",J),CKEDITOR.env.ie6Compat&&a.$.setTimeout(function(){window.onscroll=window.onscroll&&window.onscroll.prevScrollHandler||null},0),J=null)}var v=CKEDITOR.tools.cssLength,W='\x3cdiv class\x3d"cke_reset_all {editorId} {editorDialogClass} {hidpi}" dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"dialog" aria-labelledby\x3d"cke_dialog_title_{id}"\x3e\x3ctable class\x3d"cke_dialog '+
 CKEDITOR.env.cssClass+' cke_{langDir}" style\x3d"position:absolute" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd role\x3d"presentation"\x3e\x3cdiv class\x3d"cke_dialog_body" role\x3d"presentation"\x3e\x3cdiv id\x3d"cke_dialog_title_{id}" class\x3d"cke_dialog_title" role\x3d"presentation"\x3e\x3c/div\x3e\x3ca id\x3d"cke_dialog_close_button_{id}" class\x3d"cke_dialog_close_button" href\x3d"javascript:void(0)" title\x3d"{closeTitle}" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3eX\x3c/span\x3e\x3c/a\x3e\x3cdiv id\x3d"cke_dialog_tabs_{id}" class\x3d"cke_dialog_tabs" role\x3d"tablist"\x3e\x3c/div\x3e\x3ctable class\x3d"cke_dialog_contents" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_contents_{id}" class\x3d"cke_dialog_contents_body" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_footer_{id}" class\x3d"cke_dialog_footer" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e';
-CKEDITOR.dialog=function(a,b){function c(){var a=l._.focusList;a.sort(function(a,b){return a.tabIndex!=b.tabIndex?b.tabIndex-a.tabIndex:a.focusIndex-b.focusIndex});for(var b=a.length,c=0;c<b;c++)a[c].focusIndex=c}function d(a){var b=l._.focusList;a=a||0;if(!(1>b.length)){var c=l._.currentFocusIndex;l._.tabBarMode&&0>a&&(c=0);try{b[c].getInputElement().$.blur()}catch(e){}var d=c,g=1<l._.pageCount;do{d+=a;if(g&&!l._.tabBarMode&&(d==b.length||-1==d)){l._.tabBarMode=!0;l._.tabs[l._.currentTabId][0].focus();
-l._.currentFocusIndex=-1;return}d=(d+b.length)%b.length;if(d==c)break}while(a&&!b[d].isFocusable());b[d].focus();"text"==b[d].type&&b[d].select()}}function e(b){if(l==CKEDITOR.dialog._.currentTop){var c=b.data.getKeystroke(),e="rtl"==a.lang.dir,g=[37,38,39,40];q=n=0;if(9==c||c==CKEDITOR.SHIFT+9)d(c==CKEDITOR.SHIFT+9?-1:1),q=1;else if(c==CKEDITOR.ALT+121&&!l._.tabBarMode&&1<l.getPageCount())l._.tabBarMode=!0,l._.tabs[l._.currentTabId][0].focus(),l._.currentFocusIndex=-1,q=1;else if(-1!=CKEDITOR.tools.indexOf(g,
-c)&&l._.tabBarMode)c=-1!=CKEDITOR.tools.indexOf([e?39:37,38],c)?x.call(l):A.call(l),l.selectPage(c),l._.tabs[c][0].focus(),q=1;else if(13!=c&&32!=c||!l._.tabBarMode)if(13==c)c=b.data.getTarget(),c.is("a","button","select","textarea")||c.is("input")&&"button"==c.$.type||((c=this.getButton("ok"))&&CKEDITOR.tools.setTimeout(c.click,0,c),q=1),n=1;else if(27==c)(c=this.getButton("cancel"))?CKEDITOR.tools.setTimeout(c.click,0,c):!1!==this.fire("cancel",{hide:!0}).hide&&this.hide(),n=1;else return;else this.selectPage(this._.currentTabId),
-this._.tabBarMode=!1,this._.currentFocusIndex=-1,d(1),q=1;f(b)}}function f(a){q?a.data.preventDefault(1):n&&a.data.stopPropagation()}var g=CKEDITOR.dialog._.dialogDefinitions[b],h=CKEDITOR.tools.clone(aa),p=a.config.dialog_buttonsOrder||"OS",m=a.lang.dir,k={},q,n;("OS"==p&&CKEDITOR.env.mac||"rtl"==p&&"ltr"==m||"ltr"==p&&"rtl"==m)&&h.buttons.reverse();g=CKEDITOR.tools.extend(g(a),h);g=CKEDITOR.tools.clone(g);g=new P(this,g);h=V(a);this._={editor:a,element:h.element,name:b,contentSize:{width:0,height:0},
+CKEDITOR.dialog=function(a,b){function c(){var a=l._.focusList;a.sort(function(a,b){return a.tabIndex!=b.tabIndex?b.tabIndex-a.tabIndex:a.focusIndex-b.focusIndex});for(var b=a.length,c=0;c<b;c++)a[c].focusIndex=c}function e(a){var b=l._.focusList;a=a||0;if(!(1>b.length)){var c=l._.currentFocusIndex;l._.tabBarMode&&0>a&&(c=0);try{b[c].getInputElement().$.blur()}catch(d){}var e=c,g=1<l._.pageCount;do{e+=a;if(g&&!l._.tabBarMode&&(e==b.length||-1==e)){l._.tabBarMode=!0;l._.tabs[l._.currentTabId][0].focus();
+l._.currentFocusIndex=-1;return}e=(e+b.length)%b.length;if(e==c)break}while(a&&!b[e].isFocusable());b[e].focus();"text"==b[e].type&&b[e].select()}}function d(b){if(l==CKEDITOR.dialog._.currentTop){var c=b.data.getKeystroke(),d="rtl"==a.lang.dir,g=[37,38,39,40];q=n=0;if(9==c||c==CKEDITOR.SHIFT+9)e(c==CKEDITOR.SHIFT+9?-1:1),q=1;else if(c==CKEDITOR.ALT+121&&!l._.tabBarMode&&1<l.getPageCount())l._.tabBarMode=!0,l._.tabs[l._.currentTabId][0].focus(),l._.currentFocusIndex=-1,q=1;else if(-1!=CKEDITOR.tools.indexOf(g,
+c)&&l._.tabBarMode)c=-1!=CKEDITOR.tools.indexOf([d?39:37,38],c)?x.call(l):A.call(l),l.selectPage(c),l._.tabs[c][0].focus(),q=1;else if(13!=c&&32!=c||!l._.tabBarMode)if(13==c)c=b.data.getTarget(),c.is("a","button","select","textarea")||c.is("input")&&"button"==c.$.type||((c=this.getButton("ok"))&&CKEDITOR.tools.setTimeout(c.click,0,c),q=1),n=1;else if(27==c)(c=this.getButton("cancel"))?CKEDITOR.tools.setTimeout(c.click,0,c):!1!==this.fire("cancel",{hide:!0}).hide&&this.hide(),n=1;else return;else this.selectPage(this._.currentTabId),
+this._.tabBarMode=!1,this._.currentFocusIndex=-1,e(1),q=1;f(b)}}function f(a){q?a.data.preventDefault(1):n&&a.data.stopPropagation()}var g=CKEDITOR.dialog._.dialogDefinitions[b],h=CKEDITOR.tools.clone(aa),p=a.config.dialog_buttonsOrder||"OS",m=a.lang.dir,k={},q,n;("OS"==p&&CKEDITOR.env.mac||"rtl"==p&&"ltr"==m||"ltr"==p&&"rtl"==m)&&h.buttons.reverse();g=CKEDITOR.tools.extend(g(a),h);g=CKEDITOR.tools.clone(g);g=new P(this,g);h=V(a);this._={editor:a,element:h.element,name:b,contentSize:{width:0,height:0},
 size:{width:0,height:0},contents:{},buttons:{},accessKeyMap:{},tabs:{},tabIdList:[],currentTabId:null,currentTabIndex:null,pageCount:0,lastTab:null,tabBarMode:!1,focusList:[],currentFocusIndex:0,hasFocus:!1};this.parts=h.parts;CKEDITOR.tools.setTimeout(function(){a.fire("ariaWidget",this.parts.contents)},0,this);h={position:CKEDITOR.env.ie6Compat?"absolute":"fixed",top:0,visibility:"hidden"};h["rtl"==m?"right":"left"]=0;this.parts.dialog.setStyles(h);CKEDITOR.event.call(this);this.definition=g=CKEDITOR.fire("dialogDefinition",
 {name:b,definition:g},a).definition;if(!("removeDialogTabs"in a._)&&a.config.removeDialogTabs){h=a.config.removeDialogTabs.split(";");for(m=0;m<h.length;m++)if(p=h[m].split(":"),2==p.length){var r=p[0];k[r]||(k[r]=[]);k[r].push(p[1])}a._.removeDialogTabs=k}if(a._.removeDialogTabs&&(k=a._.removeDialogTabs[b]))for(m=0;m<k.length;m++)g.removeContents(k[m]);if(g.onLoad)this.on("load",g.onLoad);if(g.onShow)this.on("show",g.onShow);if(g.onHide)this.on("hide",g.onHide);if(g.onOk)this.on("ok",function(b){a.fire("saveSnapshot");
 setTimeout(function(){a.fire("saveSnapshot")},0);!1===g.onOk.call(this,b)&&(b.data.hide=!1)});this.state=CKEDITOR.DIALOG_STATE_IDLE;if(g.onCancel)this.on("cancel",function(a){!1===g.onCancel.call(this,a)&&(a.data.hide=!1)});var l=this,t=function(a){var b=l._.contents,c=!1,d;for(d in b)for(var e in b[d])if(c=a.call(this,b[d][e]))return};this.on("ok",function(a){t(function(b){if(b.validate){var c=b.validate(this),d="string"==typeof c||!1===c;d&&(a.data.hide=!1,a.stop());T.call(b,!d,"string"==typeof c?
-c:void 0);return d}})},this,null,0);this.on("cancel",function(b){t(function(c){if(c.isChanged())return a.config.dialog_noConfirmCancel||confirm(a.lang.common.confirmCancel)||(b.data.hide=!1),!0})},this,null,0);this.parts.close.on("click",function(a){!1!==this.fire("cancel",{hide:!0}).hide&&this.hide();a.data.preventDefault()},this);this.changeFocus=d;var y=this._.element;a.focusManager.add(y,1);this.on("show",function(){y.on("keydown",e,this);if(CKEDITOR.env.gecko)y.on("keypress",f,this)});this.on("hide",
-function(){y.removeListener("keydown",e);CKEDITOR.env.gecko&&y.removeListener("keypress",f);t(function(a){U.apply(a)})});this.on("iframeAdded",function(a){(new CKEDITOR.dom.document(a.data.iframe.$.contentWindow.document)).on("keydown",e,this,null,0)});this.on("show",function(){c();var b=1<l._.pageCount;a.config.dialog_startupFocusTab&&b?(l._.tabBarMode=!0,l._.tabs[l._.currentTabId][0].focus(),l._.currentFocusIndex=-1):this._.hasFocus||(this._.currentFocusIndex=b?-1:this._.focusList.length-1,g.onFocus?
-(b=g.onFocus.call(this))&&b.focus():d(1))},this,null,4294967295);if(CKEDITOR.env.ie6Compat)this.on("load",function(){var a=this.getElement(),b=a.getFirst();b.remove();b.appendTo(a)},this);Y(this);Z(this);(new CKEDITOR.dom.text(g.title,CKEDITOR.document)).appendTo(this.parts.title);for(m=0;m<g.contents.length;m++)(k=g.contents[m])&&this.addPage(k);this.parts.tabs.on("click",function(a){var b=a.data.getTarget();b.hasClass("cke_dialog_tab")&&(b=b.$.id,this.selectPage(b.substring(4,b.lastIndexOf("_"))),
-this._.tabBarMode&&(this._.tabBarMode=!1,this._.currentFocusIndex=-1,d(1)),a.data.preventDefault())},this);m=[];k=CKEDITOR.dialog._.uiElementBuilders.hbox.build(this,{type:"hbox",className:"cke_dialog_footer_buttons",widths:[],children:g.buttons},m).getChild();this.parts.footer.setHtml(m.join(""));for(m=0;m<k.length;m++)this._.buttons[k[m].id]=k[m]};CKEDITOR.dialog.prototype={destroy:function(){this.hide();this._.element.remove()},resize:function(){return function(a,b){this._.contentSize&&this._.contentSize.width==
+c:void 0);return d}})},this,null,0);this.on("cancel",function(b){t(function(c){if(c.isChanged())return a.config.dialog_noConfirmCancel||confirm(a.lang.common.confirmCancel)||(b.data.hide=!1),!0})},this,null,0);this.parts.close.on("click",function(a){!1!==this.fire("cancel",{hide:!0}).hide&&this.hide();a.data.preventDefault()},this);this.changeFocus=e;var y=this._.element;a.focusManager.add(y,1);this.on("show",function(){y.on("keydown",d,this);if(CKEDITOR.env.gecko)y.on("keypress",f,this)});this.on("hide",
+function(){y.removeListener("keydown",d);CKEDITOR.env.gecko&&y.removeListener("keypress",f);t(function(a){U.apply(a)})});this.on("iframeAdded",function(a){(new CKEDITOR.dom.document(a.data.iframe.$.contentWindow.document)).on("keydown",d,this,null,0)});this.on("show",function(){c();var b=1<l._.pageCount;a.config.dialog_startupFocusTab&&b?(l._.tabBarMode=!0,l._.tabs[l._.currentTabId][0].focus(),l._.currentFocusIndex=-1):this._.hasFocus||(this._.currentFocusIndex=b?-1:this._.focusList.length-1,g.onFocus?
+(b=g.onFocus.call(this))&&b.focus():e(1))},this,null,4294967295);if(CKEDITOR.env.ie6Compat)this.on("load",function(){var a=this.getElement(),b=a.getFirst();b.remove();b.appendTo(a)},this);Y(this);Z(this);(new CKEDITOR.dom.text(g.title,CKEDITOR.document)).appendTo(this.parts.title);for(m=0;m<g.contents.length;m++)(k=g.contents[m])&&this.addPage(k);this.parts.tabs.on("click",function(a){var b=a.data.getTarget();b.hasClass("cke_dialog_tab")&&(b=b.$.id,this.selectPage(b.substring(4,b.lastIndexOf("_"))),
+this._.tabBarMode&&(this._.tabBarMode=!1,this._.currentFocusIndex=-1,e(1)),a.data.preventDefault())},this);m=[];k=CKEDITOR.dialog._.uiElementBuilders.hbox.build(this,{type:"hbox",className:"cke_dialog_footer_buttons",widths:[],children:g.buttons},m).getChild();this.parts.footer.setHtml(m.join(""));for(m=0;m<k.length;m++)this._.buttons[k[m].id]=k[m]};CKEDITOR.dialog.prototype={destroy:function(){this.hide();this._.element.remove()},resize:function(){return function(a,b){this._.contentSize&&this._.contentSize.width==
 a&&this._.contentSize.height==b||(CKEDITOR.dialog.fire("resize",{dialog:this,width:a,height:b},this._.editor),this.fire("resize",{width:a,height:b},this._.editor),this.parts.contents.setStyles({width:a+"px",height:b+"px"}),"rtl"==this._.editor.lang.dir&&this._.position&&(this._.position.x=CKEDITOR.document.getWindow().getViewPaneSize().width-this._.contentSize.width-parseInt(this._.element.getFirst().getStyle("right"),10)),this._.contentSize={width:a,height:b})}}(),getSize:function(){var a=this._.element.getFirst();
-return{width:a.$.offsetWidth||0,height:a.$.offsetHeight||0}},move:function(a,b,c){var d=this._.element.getFirst(),e="rtl"==this._.editor.lang.dir,f="fixed"==d.getComputedStyle("position");CKEDITOR.env.ie&&d.setStyle("zoom","100%");f&&this._.position&&this._.position.x==a&&this._.position.y==b||(this._.position={x:a,y:b},f||(f=CKEDITOR.document.getWindow().getScrollPosition(),a+=f.x,b+=f.y),e&&(f=this.getSize(),a=CKEDITOR.document.getWindow().getViewPaneSize().width-f.width-a),b={top:(0<b?b:0)+"px"},
-b[e?"right":"left"]=(0<a?a:0)+"px",d.setStyles(b),c&&(this._.moved=1))},getPosition:function(){return CKEDITOR.tools.extend({},this._.position)},show:function(){var a=this._.element,b=this.definition;a.getParent()&&a.getParent().equals(CKEDITOR.document.getBody())?a.setStyle("display","block"):a.appendTo(CKEDITOR.document.getBody());this.resize(this._.contentSize&&this._.contentSize.width||b.width||b.minWidth,this._.contentSize&&this._.contentSize.height||b.height||b.minHeight);this.reset();this.selectPage(this.definition.contents[0].id);
+return{width:a.$.offsetWidth||0,height:a.$.offsetHeight||0}},move:function(a,b,c){var e=this._.element.getFirst(),d="rtl"==this._.editor.lang.dir,f="fixed"==e.getComputedStyle("position");CKEDITOR.env.ie&&e.setStyle("zoom","100%");f&&this._.position&&this._.position.x==a&&this._.position.y==b||(this._.position={x:a,y:b},f||(f=CKEDITOR.document.getWindow().getScrollPosition(),a+=f.x,b+=f.y),d&&(f=this.getSize(),a=CKEDITOR.document.getWindow().getViewPaneSize().width-f.width-a),b={top:(0<b?b:0)+"px"},
+b[d?"right":"left"]=(0<a?a:0)+"px",e.setStyles(b),c&&(this._.moved=1))},getPosition:function(){return CKEDITOR.tools.extend({},this._.position)},show:function(){var a=this._.element,b=this.definition;a.getParent()&&a.getParent().equals(CKEDITOR.document.getBody())?a.setStyle("display","block"):a.appendTo(CKEDITOR.document.getBody());this.resize(this._.contentSize&&this._.contentSize.width||b.width||b.minWidth,this._.contentSize&&this._.contentSize.height||b.height||b.minHeight);this.reset();this.selectPage(this.definition.contents[0].id);
 null===CKEDITOR.dialog._.currentZIndex&&(CKEDITOR.dialog._.currentZIndex=this._.editor.config.baseFloatZIndex);this._.element.getFirst().setStyle("z-index",CKEDITOR.dialog._.currentZIndex+=10);null===CKEDITOR.dialog._.currentTop?(CKEDITOR.dialog._.currentTop=this,this._.parentDialog=null,N(this._.editor)):(this._.parentDialog=CKEDITOR.dialog._.currentTop,this._.parentDialog.getElement().getFirst().$.style.zIndex-=Math.floor(this._.editor.config.baseFloatZIndex/2),CKEDITOR.dialog._.currentTop=this);
-a.on("keydown",Q);a.on("keyup",R);this._.hasFocus=!1;for(var c in b.contents)if(b.contents[c]){var a=b.contents[c],d=this._.tabs[a.id],e=a.requiredContent,f=0;if(d){for(var g in this._.contents[a.id]){var h=this._.contents[a.id][g];"hbox"!=h.type&&"vbox"!=h.type&&h.getInputElement()&&(h.requiredContent&&!this._.editor.activeFilter.check(h.requiredContent)?h.disable():(h.enable(),f++))}!f||e&&!this._.editor.activeFilter.check(e)?d[0].addClass("cke_dialog_tab_disabled"):d[0].removeClass("cke_dialog_tab_disabled")}}CKEDITOR.tools.setTimeout(function(){this.layout();
-X(this);this.parts.dialog.setStyle("visibility","");this.fireOnce("load",{});CKEDITOR.ui.fire("ready",this);this.fire("show",{});this._.editor.fire("dialogShow",this);this._.parentDialog||this._.editor.focusManager.lock();this.foreach(function(a){a.setInitValue&&a.setInitValue()})},100,this)},layout:function(){var a=this.parts.dialog,b=this.getSize(),c=CKEDITOR.document.getWindow().getViewPaneSize(),d=(c.width-b.width)/2,e=(c.height-b.height)/2;CKEDITOR.env.ie6Compat||(b.height+(0<e?e:0)>c.height||
-b.width+(0<d?d:0)>c.width?a.setStyle("position","absolute"):a.setStyle("position","fixed"));this.move(this._.moved?this._.position.x:d,this._.moved?this._.position.y:e)},foreach:function(a){for(var b in this._.contents)for(var c in this._.contents[b])a.call(this,this._.contents[b][c]);return this},reset:function(){var a=function(a){a.reset&&a.reset(1)};return function(){this.foreach(a);return this}}(),setupContent:function(){var a=arguments;this.foreach(function(b){b.setup&&b.setup.apply(b,a)})},
+a.on("keydown",Q);a.on("keyup",R);this._.hasFocus=!1;for(var c in b.contents)if(b.contents[c]){var a=b.contents[c],e=this._.tabs[a.id],d=a.requiredContent,f=0;if(e){for(var g in this._.contents[a.id]){var h=this._.contents[a.id][g];"hbox"!=h.type&&"vbox"!=h.type&&h.getInputElement()&&(h.requiredContent&&!this._.editor.activeFilter.check(h.requiredContent)?h.disable():(h.enable(),f++))}!f||d&&!this._.editor.activeFilter.check(d)?e[0].addClass("cke_dialog_tab_disabled"):e[0].removeClass("cke_dialog_tab_disabled")}}CKEDITOR.tools.setTimeout(function(){this.layout();
+X(this);this.parts.dialog.setStyle("visibility","");this.fireOnce("load",{});CKEDITOR.ui.fire("ready",this);this.fire("show",{});this._.editor.fire("dialogShow",this);this._.parentDialog||this._.editor.focusManager.lock();this.foreach(function(a){a.setInitValue&&a.setInitValue()})},100,this)},layout:function(){var a=this.parts.dialog,b=this.getSize(),c=CKEDITOR.document.getWindow().getViewPaneSize(),e=(c.width-b.width)/2,d=(c.height-b.height)/2;CKEDITOR.env.ie6Compat||(b.height+(0<d?d:0)>c.height||
+b.width+(0<e?e:0)>c.width?a.setStyle("position","absolute"):a.setStyle("position","fixed"));this.move(this._.moved?this._.position.x:e,this._.moved?this._.position.y:d)},foreach:function(a){for(var b in this._.contents)for(var c in this._.contents[b])a.call(this,this._.contents[b][c]);return this},reset:function(){var a=function(a){a.reset&&a.reset(1)};return function(){this.foreach(a);return this}}(),setupContent:function(){var a=arguments;this.foreach(function(b){b.setup&&b.setup.apply(b,a)})},
 commitContent:function(){var a=arguments;this.foreach(function(b){CKEDITOR.env.ie&&this._.currentFocusIndex==b.focusIndex&&b.getInputElement().$.blur();b.commit&&b.commit.apply(b,a)})},hide:function(){if(this.parts.dialog.isVisible()){this.fire("hide",{});this._.editor.fire("dialogHide",this);this.selectPage(this._.tabIdList[0]);var a=this._.element;a.setStyle("display","none");this.parts.dialog.setStyle("visibility","hidden");for(ba(this);CKEDITOR.dialog._.currentTop!=this;)CKEDITOR.dialog._.currentTop.hide();
 if(this._.parentDialog){var b=this._.parentDialog.getElement().getFirst();b.setStyle("z-index",parseInt(b.$.style.zIndex,10)+Math.floor(this._.editor.config.baseFloatZIndex/2))}else O(this._.editor);if(CKEDITOR.dialog._.currentTop=this._.parentDialog)CKEDITOR.dialog._.currentZIndex-=10;else{CKEDITOR.dialog._.currentZIndex=null;a.removeListener("keydown",Q);a.removeListener("keyup",R);var c=this._.editor;c.focus();setTimeout(function(){c.focusManager.unlock();CKEDITOR.env.iOS&&c.window.focus()},0)}delete this._.parentDialog;
-this.foreach(function(a){a.resetInitValue&&a.resetInitValue()});this.setState(CKEDITOR.DIALOG_STATE_IDLE)}},addPage:function(a){if(!a.requiredContent||this._.editor.filter.check(a.requiredContent)){for(var b=[],c=a.label?' title\x3d"'+CKEDITOR.tools.htmlEncode(a.label)+'"':"",d=CKEDITOR.dialog._.uiElementBuilders.vbox.build(this,{type:"vbox",className:"cke_dialog_page_contents",children:a.elements,expand:!!a.expand,padding:a.padding,style:a.style||"width: 100%;"},b),e=this._.contents[a.id]={},f=d.getChild(),
-g=0;d=f.shift();)d.notAllowed||"hbox"==d.type||"vbox"==d.type||g++,e[d.id]=d,"function"==typeof d.getChild&&f.push.apply(f,d.getChild());g||(a.hidden=!0);b=CKEDITOR.dom.element.createFromHtml(b.join(""));b.setAttribute("role","tabpanel");d=CKEDITOR.env;e="cke_"+a.id+"_"+CKEDITOR.tools.getNextNumber();c=CKEDITOR.dom.element.createFromHtml(['\x3ca class\x3d"cke_dialog_tab"',0<this._.pageCount?" cke_last":"cke_first",c,a.hidden?' style\x3d"display:none"':"",' id\x3d"',e,'"',d.gecko&&!d.hc?"":' href\x3d"javascript:void(0)"',
-' tabIndex\x3d"-1" hidefocus\x3d"true" role\x3d"tab"\x3e',a.label,"\x3c/a\x3e"].join(""));b.setAttribute("aria-labelledby",e);this._.tabs[a.id]=[c,b];this._.tabIdList.push(a.id);!a.hidden&&this._.pageCount++;this._.lastTab=c;this.updateStyle();b.setAttribute("name",a.id);b.appendTo(this.parts.contents);c.unselectable();this.parts.tabs.append(c);a.accessKey&&(S(this,this,"CTRL+"+a.accessKey,ca,da),this._.accessKeyMap["CTRL+"+a.accessKey]=a.id)}},selectPage:function(a){if(this._.currentTabId!=a&&!this._.tabs[a][0].hasClass("cke_dialog_tab_disabled")&&
-!1!==this.fire("selectPage",{page:a,currentPage:this._.currentTabId})){for(var b in this._.tabs){var c=this._.tabs[b][0],d=this._.tabs[b][1];b!=a&&(c.removeClass("cke_dialog_tab_selected"),d.hide());d.setAttribute("aria-hidden",b!=a)}var e=this._.tabs[a];e[0].addClass("cke_dialog_tab_selected");CKEDITOR.env.ie6Compat||CKEDITOR.env.ie7Compat?(K(e[1]),e[1].show(),setTimeout(function(){K(e[1],1)},0)):e[1].show();this._.currentTabId=a;this._.currentTabIndex=CKEDITOR.tools.indexOf(this._.tabIdList,a)}},
+this.foreach(function(a){a.resetInitValue&&a.resetInitValue()});this.setState(CKEDITOR.DIALOG_STATE_IDLE)}},addPage:function(a){if(!a.requiredContent||this._.editor.filter.check(a.requiredContent)){for(var b=[],c=a.label?' title\x3d"'+CKEDITOR.tools.htmlEncode(a.label)+'"':"",e=CKEDITOR.dialog._.uiElementBuilders.vbox.build(this,{type:"vbox",className:"cke_dialog_page_contents",children:a.elements,expand:!!a.expand,padding:a.padding,style:a.style||"width: 100%;"},b),d=this._.contents[a.id]={},f=e.getChild(),
+g=0;e=f.shift();)e.notAllowed||"hbox"==e.type||"vbox"==e.type||g++,d[e.id]=e,"function"==typeof e.getChild&&f.push.apply(f,e.getChild());g||(a.hidden=!0);b=CKEDITOR.dom.element.createFromHtml(b.join(""));b.setAttribute("role","tabpanel");e=CKEDITOR.env;d="cke_"+a.id+"_"+CKEDITOR.tools.getNextNumber();c=CKEDITOR.dom.element.createFromHtml(['\x3ca class\x3d"cke_dialog_tab"',0<this._.pageCount?" cke_last":"cke_first",c,a.hidden?' style\x3d"display:none"':"",' id\x3d"',d,'"',e.gecko&&!e.hc?"":' href\x3d"javascript:void(0)"',
+' tabIndex\x3d"-1" hidefocus\x3d"true" role\x3d"tab"\x3e',a.label,"\x3c/a\x3e"].join(""));b.setAttribute("aria-labelledby",d);this._.tabs[a.id]=[c,b];this._.tabIdList.push(a.id);!a.hidden&&this._.pageCount++;this._.lastTab=c;this.updateStyle();b.setAttribute("name",a.id);b.appendTo(this.parts.contents);c.unselectable();this.parts.tabs.append(c);a.accessKey&&(S(this,this,"CTRL+"+a.accessKey,ca,da),this._.accessKeyMap["CTRL+"+a.accessKey]=a.id)}},selectPage:function(a){if(this._.currentTabId!=a&&!this._.tabs[a][0].hasClass("cke_dialog_tab_disabled")&&
+!1!==this.fire("selectPage",{page:a,currentPage:this._.currentTabId})){for(var b in this._.tabs){var c=this._.tabs[b][0],e=this._.tabs[b][1];b!=a&&(c.removeClass("cke_dialog_tab_selected"),e.hide());e.setAttribute("aria-hidden",b!=a)}var d=this._.tabs[a];d[0].addClass("cke_dialog_tab_selected");CKEDITOR.env.ie6Compat||CKEDITOR.env.ie7Compat?(K(d[1]),d[1].show(),setTimeout(function(){K(d[1],1)},0)):d[1].show();this._.currentTabId=a;this._.currentTabIndex=CKEDITOR.tools.indexOf(this._.tabIdList,a)}},
 updateStyle:function(){this.parts.dialog[(1===this._.pageCount?"add":"remove")+"Class"]("cke_single_page")},hidePage:function(a){var b=this._.tabs[a]&&this._.tabs[a][0];b&&1!=this._.pageCount&&b.isVisible()&&(a==this._.currentTabId&&this.selectPage(x.call(this)),b.hide(),this._.pageCount--,this.updateStyle())},showPage:function(a){if(a=this._.tabs[a]&&this._.tabs[a][0])a.show(),this._.pageCount++,this.updateStyle()},getElement:function(){return this._.element},getName:function(){return this._.name},
 getContentElement:function(a,b){var c=this._.contents[a];return c&&c[b]},getValueOf:function(a,b){return this.getContentElement(a,b).getValue()},setValueOf:function(a,b,c){return this.getContentElement(a,b).setValue(c)},getButton:function(a){return this._.buttons[a]},click:function(a){return this._.buttons[a].click()},disableButton:function(a){return this._.buttons[a].disable()},enableButton:function(a){return this._.buttons[a].enable()},getPageCount:function(){return this._.pageCount},getParentEditor:function(){return this._.editor},
 getSelectedElement:function(){return this.getParentEditor().getSelection().getSelectedElement()},addFocusable:function(a,b){if("undefined"==typeof b)b=this._.focusList.length,this._.focusList.push(new L(this,a,b));else{this._.focusList.splice(b,0,new L(this,a,b));for(var c=b+1;c<this._.focusList.length;c++)this._.focusList[c].focusIndex++}},setState:function(a){if(this.state!=a){this.state=a;if(a==CKEDITOR.DIALOG_STATE_BUSY){if(!this.parts.spinner){var b=this.getParentEditor().lang.dir,c={attributes:{"class":"cke_dialog_spinner"},
 styles:{"float":"rtl"==b?"right":"left"}};c.styles["margin-"+("rtl"==b?"left":"right")]="8px";this.parts.spinner=CKEDITOR.document.createElement("div",c);this.parts.spinner.setHtml("\x26#8987;");this.parts.spinner.appendTo(this.parts.title,1)}this.parts.spinner.show();this.getButton("ok").disable()}else a==CKEDITOR.DIALOG_STATE_IDLE&&(this.parts.spinner&&this.parts.spinner.hide(),this.getButton("ok").enable());this.fire("state",a)}}};CKEDITOR.tools.extend(CKEDITOR.dialog,{add:function(a,b){this._.dialogDefinitions[a]&&
 "function"!=typeof b||(this._.dialogDefinitions[a]=b)},exists:function(a){return!!this._.dialogDefinitions[a]},getCurrent:function(){return CKEDITOR.dialog._.currentTop},isTabEnabled:function(a,b,c){a=a.config.removeDialogTabs;return!(a&&a.match(new RegExp("(?:^|;)"+b+":"+c+"(?:$|;)","i")))},okButton:function(){var a=function(a,c){c=c||{};return CKEDITOR.tools.extend({id:"ok",type:"button",label:a.lang.common.ok,"class":"cke_dialog_ui_button_ok",onClick:function(a){a=a.data.dialog;!1!==a.fire("ok",
 {hide:!0}).hide&&a.hide()}},c,!0)};a.type="button";a.override=function(b){return CKEDITOR.tools.extend(function(c){return a(c,b)},{type:"button"},!0)};return a}(),cancelButton:function(){var a=function(a,c){c=c||{};return CKEDITOR.tools.extend({id:"cancel",type:"button",label:a.lang.common.cancel,"class":"cke_dialog_ui_button_cancel",onClick:function(a){a=a.data.dialog;!1!==a.fire("cancel",{hide:!0}).hide&&a.hide()}},c,!0)};a.type="button";a.override=function(b){return CKEDITOR.tools.extend(function(c){return a(c,
-b)},{type:"button"},!0)};return a}(),addUIElement:function(a,b){this._.uiElementBuilders[a]=b}});CKEDITOR.dialog._={uiElementBuilders:{},dialogDefinitions:{},currentTop:null,currentZIndex:null};CKEDITOR.event.implementOn(CKEDITOR.dialog);CKEDITOR.event.implementOn(CKEDITOR.dialog.prototype);var aa={resizable:CKEDITOR.DIALOG_RESIZE_BOTH,minWidth:600,minHeight:400,buttons:[CKEDITOR.dialog.okButton,CKEDITOR.dialog.cancelButton]},D=function(a,b,c){for(var d=0,e;e=a[d];d++)if(e.id==b||c&&e[c]&&(e=D(e[c],
-b,c)))return e;return null},E=function(a,b,c,d,e){if(c){for(var f=0,g;g=a[f];f++){if(g.id==c)return a.splice(f,0,b),b;if(d&&g[d]&&(g=E(g[d],b,c,d,!0)))return g}if(e)return null}a.push(b);return b},F=function(a,b,c){for(var d=0,e;e=a[d];d++){if(e.id==b)return a.splice(d,1);if(c&&e[c]&&(e=F(e[c],b,c)))return e}return null},P=function(a,b){this.dialog=a;for(var c=b.contents,d=0,e;e=c[d];d++)c[d]=e&&new M(a,e);CKEDITOR.tools.extend(this,b)};P.prototype={getContents:function(a){return D(this.contents,
+b)},{type:"button"},!0)};return a}(),addUIElement:function(a,b){this._.uiElementBuilders[a]=b}});CKEDITOR.dialog._={uiElementBuilders:{},dialogDefinitions:{},currentTop:null,currentZIndex:null};CKEDITOR.event.implementOn(CKEDITOR.dialog);CKEDITOR.event.implementOn(CKEDITOR.dialog.prototype);var aa={resizable:CKEDITOR.DIALOG_RESIZE_BOTH,minWidth:600,minHeight:400,buttons:[CKEDITOR.dialog.okButton,CKEDITOR.dialog.cancelButton]},D=function(a,b,c){for(var e=0,d;d=a[e];e++)if(d.id==b||c&&d[c]&&(d=D(d[c],
+b,c)))return d;return null},E=function(a,b,c,e,d){if(c){for(var f=0,g;g=a[f];f++){if(g.id==c)return a.splice(f,0,b),b;if(e&&g[e]&&(g=E(g[e],b,c,e,!0)))return g}if(d)return null}a.push(b);return b},F=function(a,b,c){for(var e=0,d;d=a[e];e++){if(d.id==b)return a.splice(e,1);if(c&&d[c]&&(d=F(d[c],b,c)))return d}return null},P=function(a,b){this.dialog=a;for(var c=b.contents,e=0,d;d=c[e];e++)c[e]=d&&new M(a,d);CKEDITOR.tools.extend(this,b)};P.prototype={getContents:function(a){return D(this.contents,
 a)},getButton:function(a){return D(this.buttons,a)},addContents:function(a,b){return E(this.contents,a,b)},addButton:function(a,b){return E(this.buttons,a,b)},removeContents:function(a){F(this.contents,a)},removeButton:function(a){F(this.buttons,a)}};M.prototype={get:function(a){return D(this.elements,a,"children")},add:function(a,b){return E(this.elements,a,b,"children")},remove:function(a){F(this.elements,a,"children")}};var J,z={},u,w={},Q=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,c=
-a.data.$.altKey,d=a.data.$.shiftKey,e=String.fromCharCode(a.data.$.keyCode);(b=w[(b?"CTRL+":"")+(c?"ALT+":"")+(d?"SHIFT+":"")+e])&&b.length&&(b=b[b.length-1],b.keydown&&b.keydown.call(b.uiElement,b.dialog,b.key),a.data.preventDefault())},R=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,c=a.data.$.altKey,d=a.data.$.shiftKey,e=String.fromCharCode(a.data.$.keyCode);(b=w[(b?"CTRL+":"")+(c?"ALT+":"")+(d?"SHIFT+":"")+e])&&b.length&&(b=b[b.length-1],b.keyup&&(b.keyup.call(b.uiElement,b.dialog,b.key),
-a.data.preventDefault()))},S=function(a,b,c,d,e){(w[c]||(w[c]=[])).push({uiElement:a,dialog:b,key:c,keyup:e||a.accessKeyUp,keydown:d||a.accessKeyDown})},ba=function(a){for(var b in w){for(var c=w[b],d=c.length-1;0<=d;d--)c[d].dialog!=a&&c[d].uiElement!=a||c.splice(d,1);0===c.length&&delete w[b]}},da=function(a,b){a._.accessKeyMap[b]&&a.selectPage(a._.accessKeyMap[b])},ca=function(){};(function(){CKEDITOR.ui.dialog={uiElement:function(a,b,c,d,e,f,g){if(!(4>arguments.length)){var h=(d.call?d(b):d)||
-"div",p=["\x3c",h," "],m=(e&&e.call?e(b):e)||{},k=(f&&f.call?f(b):f)||{},q=(g&&g.call?g.call(this,a,b):g)||"",n=this.domId=k.id||CKEDITOR.tools.getNextId()+"_uiElement";b.requiredContent&&!a.getParentEditor().filter.check(b.requiredContent)&&(m.display="none",this.notAllowed=!0);k.id=n;var r={};b.type&&(r["cke_dialog_ui_"+b.type]=1);b.className&&(r[b.className]=1);b.disabled&&(r.cke_disabled=1);for(var l=k["class"]&&k["class"].split?k["class"].split(" "):[],n=0;n<l.length;n++)l[n]&&(r[l[n]]=1);l=
+a.data.$.altKey,e=a.data.$.shiftKey,d=String.fromCharCode(a.data.$.keyCode);(b=w[(b?"CTRL+":"")+(c?"ALT+":"")+(e?"SHIFT+":"")+d])&&b.length&&(b=b[b.length-1],b.keydown&&b.keydown.call(b.uiElement,b.dialog,b.key),a.data.preventDefault())},R=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,c=a.data.$.altKey,e=a.data.$.shiftKey,d=String.fromCharCode(a.data.$.keyCode);(b=w[(b?"CTRL+":"")+(c?"ALT+":"")+(e?"SHIFT+":"")+d])&&b.length&&(b=b[b.length-1],b.keyup&&(b.keyup.call(b.uiElement,b.dialog,b.key),
+a.data.preventDefault()))},S=function(a,b,c,e,d){(w[c]||(w[c]=[])).push({uiElement:a,dialog:b,key:c,keyup:d||a.accessKeyUp,keydown:e||a.accessKeyDown})},ba=function(a){for(var b in w){for(var c=w[b],e=c.length-1;0<=e;e--)c[e].dialog!=a&&c[e].uiElement!=a||c.splice(e,1);0===c.length&&delete w[b]}},da=function(a,b){a._.accessKeyMap[b]&&a.selectPage(a._.accessKeyMap[b])},ca=function(){};(function(){CKEDITOR.ui.dialog={uiElement:function(a,b,c,e,d,f,g){if(!(4>arguments.length)){var h=(e.call?e(b):e)||
+"div",p=["\x3c",h," "],m=(d&&d.call?d(b):d)||{},k=(f&&f.call?f(b):f)||{},q=(g&&g.call?g.call(this,a,b):g)||"",n=this.domId=k.id||CKEDITOR.tools.getNextId()+"_uiElement";b.requiredContent&&!a.getParentEditor().filter.check(b.requiredContent)&&(m.display="none",this.notAllowed=!0);k.id=n;var r={};b.type&&(r["cke_dialog_ui_"+b.type]=1);b.className&&(r[b.className]=1);b.disabled&&(r.cke_disabled=1);for(var l=k["class"]&&k["class"].split?k["class"].split(" "):[],n=0;n<l.length;n++)l[n]&&(r[l[n]]=1);l=
 [];for(n in r)l.push(n);k["class"]=l.join(" ");b.title&&(k.title=b.title);r=(b.style||"").split(";");b.align&&(l=b.align,m["margin-left"]="left"==l?0:"auto",m["margin-right"]="right"==l?0:"auto");for(n in m)r.push(n+":"+m[n]);b.hidden&&r.push("display:none");for(n=r.length-1;0<=n;n--)""===r[n]&&r.splice(n,1);0<r.length&&(k.style=(k.style?k.style+"; ":"")+r.join("; "));for(n in k)p.push(n+'\x3d"'+CKEDITOR.tools.htmlEncode(k[n])+'" ');p.push("\x3e",q,"\x3c/",h,"\x3e");c.push(p.join(""));(this._||(this._=
 {})).dialog=a;"boolean"==typeof b.isChanged&&(this.isChanged=function(){return b.isChanged});"function"==typeof b.isChanged&&(this.isChanged=b.isChanged);"function"==typeof b.setValue&&(this.setValue=CKEDITOR.tools.override(this.setValue,function(a){return function(c){a.call(this,b.setValue.call(this,c))}}));"function"==typeof b.getValue&&(this.getValue=CKEDITOR.tools.override(this.getValue,function(a){return function(){return b.getValue.call(this,a.call(this))}}));CKEDITOR.event.implementOn(this);
 this.registerEvents(b);this.accessKeyUp&&this.accessKeyDown&&b.accessKey&&S(this,a,"CTRL+"+b.accessKey);var t=this;a.on("load",function(){var b=t.getInputElement();if(b){var c=t.type in{checkbox:1,ratio:1}&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?"cke_dialog_ui_focused":"";b.on("focus",function(){a._.tabBarMode=!1;a._.hasFocus=!0;t.fire("focus");c&&this.addClass(c)});b.on("blur",function(){t.fire("blur");c&&this.removeClass(c)})}});CKEDITOR.tools.extend(this,b);this.keyboardFocusable&&(this.tabIndex=
-b.tabIndex||0,this.focusIndex=a._.focusList.push(this)-1,this.on("focus",function(){a._.currentFocusIndex=t.focusIndex}))}},hbox:function(a,b,c,d,e){if(!(4>arguments.length)){this._||(this._={});var f=this._.children=b,g=e&&e.widths||null,h=e&&e.height||null,p,m={role:"presentation"};e&&e.align&&(m.align=e.align);CKEDITOR.ui.dialog.uiElement.call(this,a,e||{type:"hbox"},d,"table",{},m,function(){var a=['\x3ctbody\x3e\x3ctr class\x3d"cke_dialog_ui_hbox"\x3e'];for(p=0;p<c.length;p++){var b="cke_dialog_ui_hbox_child",
-d=[];0===p&&(b="cke_dialog_ui_hbox_first");p==c.length-1&&(b="cke_dialog_ui_hbox_last");a.push('\x3ctd class\x3d"',b,'" role\x3d"presentation" ');g?g[p]&&d.push("width:"+v(g[p])):d.push("width:"+Math.floor(100/c.length)+"%");h&&d.push("height:"+v(h));e&&void 0!==e.padding&&d.push("padding:"+v(e.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f[p].align&&d.push("text-align:"+f[p].align);0<d.length&&a.push('style\x3d"'+d.join("; ")+'" ');a.push("\x3e",c[p],"\x3c/td\x3e")}a.push("\x3c/tr\x3e\x3c/tbody\x3e");
-return a.join("")})}},vbox:function(a,b,c,d,e){if(!(3>arguments.length)){this._||(this._={});var f=this._.children=b,g=e&&e.width||null,h=e&&e.heights||null;CKEDITOR.ui.dialog.uiElement.call(this,a,e||{type:"vbox"},d,"div",null,{role:"presentation"},function(){var b=['\x3ctable role\x3d"presentation" cellspacing\x3d"0" border\x3d"0" '];b.push('style\x3d"');e&&e.expand&&b.push("height:100%;");b.push("width:"+v(g||"100%"),";");CKEDITOR.env.webkit&&b.push("float:none;");b.push('"');b.push('align\x3d"',
-CKEDITOR.tools.htmlEncode(e&&e.align||("ltr"==a.getParentEditor().lang.dir?"left":"right")),'" ');b.push("\x3e\x3ctbody\x3e");for(var d=0;d<c.length;d++){var k=[];b.push('\x3ctr\x3e\x3ctd role\x3d"presentation" ');g&&k.push("width:"+v(g||"100%"));h?k.push("height:"+v(h[d])):e&&e.expand&&k.push("height:"+Math.floor(100/c.length)+"%");e&&void 0!==e.padding&&k.push("padding:"+v(e.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f[d].align&&k.push("text-align:"+f[d].align);0<k.length&&b.push('style\x3d"',
-k.join("; "),'" ');b.push(' class\x3d"cke_dialog_ui_vbox_child"\x3e',c[d],"\x3c/td\x3e\x3c/tr\x3e")}b.push("\x3c/tbody\x3e\x3c/table\x3e");return b.join("")})}}}})();CKEDITOR.ui.dialog.uiElement.prototype={getElement:function(){return CKEDITOR.document.getById(this.domId)},getInputElement:function(){return this.getElement()},getDialog:function(){return this._.dialog},setValue:function(a,b){this.getInputElement().setValue(a);!b&&this.fire("change",{value:a});return this},getValue:function(){return this.getInputElement().getValue()},
-isChanged:function(){return!1},selectParentTab:function(){for(var a=this.getInputElement();(a=a.getParent())&&-1==a.$.className.search("cke_dialog_page_contents"););if(!a)return this;a=a.getAttribute("name");this._.dialog._.currentTabId!=a&&this._.dialog.selectPage(a);return this},focus:function(){this.selectParentTab().getInputElement().focus();return this},registerEvents:function(a){var b=/^on([A-Z]\w+)/,c,d=function(a,b,c,d){b.on("load",function(){a.getInputElement().on(c,d,a)})},e;for(e in a)if(c=
-e.match(b))this.eventProcessors[e]?this.eventProcessors[e].call(this,this._.dialog,a[e]):d(this,this._.dialog,c[1].toLowerCase(),a[e]);return this},eventProcessors:{onLoad:function(a,b){a.on("load",b,this)},onShow:function(a,b){a.on("show",b,this)},onHide:function(a,b){a.on("hide",b,this)}},accessKeyDown:function(){this.focus()},accessKeyUp:function(){},disable:function(){var a=this.getElement();this.getInputElement().setAttribute("disabled","true");a.addClass("cke_disabled")},enable:function(){var a=
+b.tabIndex||0,this.focusIndex=a._.focusList.push(this)-1,this.on("focus",function(){a._.currentFocusIndex=t.focusIndex}))}},hbox:function(a,b,c,e,d){if(!(4>arguments.length)){this._||(this._={});var f=this._.children=b,g=d&&d.widths||null,h=d&&d.height||null,p,m={role:"presentation"};d&&d.align&&(m.align=d.align);CKEDITOR.ui.dialog.uiElement.call(this,a,d||{type:"hbox"},e,"table",{},m,function(){var a=['\x3ctbody\x3e\x3ctr class\x3d"cke_dialog_ui_hbox"\x3e'];for(p=0;p<c.length;p++){var b="cke_dialog_ui_hbox_child",
+e=[];0===p&&(b="cke_dialog_ui_hbox_first");p==c.length-1&&(b="cke_dialog_ui_hbox_last");a.push('\x3ctd class\x3d"',b,'" role\x3d"presentation" ');g?g[p]&&e.push("width:"+v(g[p])):e.push("width:"+Math.floor(100/c.length)+"%");h&&e.push("height:"+v(h));d&&void 0!==d.padding&&e.push("padding:"+v(d.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f[p].align&&e.push("text-align:"+f[p].align);0<e.length&&a.push('style\x3d"'+e.join("; ")+'" ');a.push("\x3e",c[p],"\x3c/td\x3e")}a.push("\x3c/tr\x3e\x3c/tbody\x3e");
+return a.join("")})}},vbox:function(a,b,c,e,d){if(!(3>arguments.length)){this._||(this._={});var f=this._.children=b,g=d&&d.width||null,h=d&&d.heights||null;CKEDITOR.ui.dialog.uiElement.call(this,a,d||{type:"vbox"},e,"div",null,{role:"presentation"},function(){var b=['\x3ctable role\x3d"presentation" cellspacing\x3d"0" border\x3d"0" '];b.push('style\x3d"');d&&d.expand&&b.push("height:100%;");b.push("width:"+v(g||"100%"),";");CKEDITOR.env.webkit&&b.push("float:none;");b.push('"');b.push('align\x3d"',
+CKEDITOR.tools.htmlEncode(d&&d.align||("ltr"==a.getParentEditor().lang.dir?"left":"right")),'" ');b.push("\x3e\x3ctbody\x3e");for(var e=0;e<c.length;e++){var k=[];b.push('\x3ctr\x3e\x3ctd role\x3d"presentation" ');g&&k.push("width:"+v(g||"100%"));h?k.push("height:"+v(h[e])):d&&d.expand&&k.push("height:"+Math.floor(100/c.length)+"%");d&&void 0!==d.padding&&k.push("padding:"+v(d.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f[e].align&&k.push("text-align:"+f[e].align);0<k.length&&b.push('style\x3d"',
+k.join("; "),'" ');b.push(' class\x3d"cke_dialog_ui_vbox_child"\x3e',c[e],"\x3c/td\x3e\x3c/tr\x3e")}b.push("\x3c/tbody\x3e\x3c/table\x3e");return b.join("")})}}}})();CKEDITOR.ui.dialog.uiElement.prototype={getElement:function(){return CKEDITOR.document.getById(this.domId)},getInputElement:function(){return this.getElement()},getDialog:function(){return this._.dialog},setValue:function(a,b){this.getInputElement().setValue(a);!b&&this.fire("change",{value:a});return this},getValue:function(){return this.getInputElement().getValue()},
+isChanged:function(){return!1},selectParentTab:function(){for(var a=this.getInputElement();(a=a.getParent())&&-1==a.$.className.search("cke_dialog_page_contents"););if(!a)return this;a=a.getAttribute("name");this._.dialog._.currentTabId!=a&&this._.dialog.selectPage(a);return this},focus:function(){this.selectParentTab().getInputElement().focus();return this},registerEvents:function(a){var b=/^on([A-Z]\w+)/,c,e=function(a,b,c,d){b.on("load",function(){a.getInputElement().on(c,d,a)})},d;for(d in a)if(c=
+d.match(b))this.eventProcessors[d]?this.eventProcessors[d].call(this,this._.dialog,a[d]):e(this,this._.dialog,c[1].toLowerCase(),a[d]);return this},eventProcessors:{onLoad:function(a,b){a.on("load",b,this)},onShow:function(a,b){a.on("show",b,this)},onHide:function(a,b){a.on("hide",b,this)}},accessKeyDown:function(){this.focus()},accessKeyUp:function(){},disable:function(){var a=this.getElement();this.getInputElement().setAttribute("disabled","true");a.addClass("cke_disabled")},enable:function(){var a=
 this.getElement();this.getInputElement().removeAttribute("disabled");a.removeClass("cke_disabled")},isEnabled:function(){return!this.getElement().hasClass("cke_disabled")},isVisible:function(){return this.getInputElement().isVisible()},isFocusable:function(){return this.isEnabled()&&this.isVisible()?!0:!1}};CKEDITOR.ui.dialog.hbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getChild:function(a){if(1>arguments.length)return this._.children.concat();a.splice||(a=[a]);return 2>
-a.length?this._.children[a[0]]:this._.children[a[0]]&&this._.children[a[0]].getChild?this._.children[a[0]].getChild(a.slice(1,a.length)):null}},!0);CKEDITOR.ui.dialog.vbox.prototype=new CKEDITOR.ui.dialog.hbox;(function(){var a={build:function(a,c,d){for(var e=c.children,f,g=[],h=[],p=0;p<e.length&&(f=e[p]);p++){var m=[];g.push(m);h.push(CKEDITOR.dialog._.uiElementBuilders[f.type].build(a,f,m))}return new CKEDITOR.ui.dialog[c.type](a,h,g,d,c)}};CKEDITOR.dialog.addUIElement("hbox",a);CKEDITOR.dialog.addUIElement("vbox",
-a)})();CKEDITOR.dialogCommand=function(a,b){this.dialogName=a;CKEDITOR.tools.extend(this,b,!0)};CKEDITOR.dialogCommand.prototype={exec:function(a){a.openDialog(this.dialogName)},canUndo:!1,editorFocus:1};(function(){var a=/^([a]|[^a])+$/,b=/^\d*$/,c=/^\d*(?:\.\d+)?$/,d=/^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/,e=/^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i,f=/^(\s*[\w-]+\s*:\s*[^:;]+(?:;|$))*$/;CKEDITOR.VALIDATE_OR=1;CKEDITOR.VALIDATE_AND=2;CKEDITOR.dialog.validate={functions:function(){var a=
+a.length?this._.children[a[0]]:this._.children[a[0]]&&this._.children[a[0]].getChild?this._.children[a[0]].getChild(a.slice(1,a.length)):null}},!0);CKEDITOR.ui.dialog.vbox.prototype=new CKEDITOR.ui.dialog.hbox;(function(){var a={build:function(a,c,e){for(var d=c.children,f,g=[],h=[],p=0;p<d.length&&(f=d[p]);p++){var m=[];g.push(m);h.push(CKEDITOR.dialog._.uiElementBuilders[f.type].build(a,f,m))}return new CKEDITOR.ui.dialog[c.type](a,h,g,e,c)}};CKEDITOR.dialog.addUIElement("hbox",a);CKEDITOR.dialog.addUIElement("vbox",
+a)})();CKEDITOR.dialogCommand=function(a,b){this.dialogName=a;CKEDITOR.tools.extend(this,b,!0)};CKEDITOR.dialogCommand.prototype={exec:function(a){a.openDialog(this.dialogName)},canUndo:!1,editorFocus:1};(function(){var a=/^([a]|[^a])+$/,b=/^\d*$/,c=/^\d*(?:\.\d+)?$/,e=/^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/,d=/^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i,f=/^(\s*[\w-]+\s*:\s*[^:;]+(?:;|$))*$/;CKEDITOR.VALIDATE_OR=1;CKEDITOR.VALIDATE_AND=2;CKEDITOR.dialog.validate={functions:function(){var a=
 arguments;return function(){var b=this&&this.getValue?this.getValue():a[0],c,d=CKEDITOR.VALIDATE_AND,e=[],f;for(f=0;f<a.length;f++)if("function"==typeof a[f])e.push(a[f]);else break;f<a.length&&"string"==typeof a[f]&&(c=a[f],f++);f<a.length&&"number"==typeof a[f]&&(d=a[f]);var n=d==CKEDITOR.VALIDATE_AND?!0:!1;for(f=0;f<e.length;f++)n=d==CKEDITOR.VALIDATE_AND?n&&e[f](b):n||e[f](b);return n?!0:c}},regex:function(a,b){return function(c){c=this&&this.getValue?this.getValue():c;return a.test(c)?!0:b}},
-notEmpty:function(b){return this.regex(a,b)},integer:function(a){return this.regex(b,a)},number:function(a){return this.regex(c,a)},cssLength:function(a){return this.functions(function(a){return e.test(CKEDITOR.tools.trim(a))},a)},htmlLength:function(a){return this.functions(function(a){return d.test(CKEDITOR.tools.trim(a))},a)},inlineStyle:function(a){return this.functions(function(a){return f.test(CKEDITOR.tools.trim(a))},a)},equals:function(a,b){return this.functions(function(b){return b==a},b)},
-notEqual:function(a,b){return this.functions(function(b){return b!=a},b)}};CKEDITOR.on("instanceDestroyed",function(a){if(CKEDITOR.tools.isEmpty(CKEDITOR.instances)){for(var b;b=CKEDITOR.dialog._.currentTop;)b.hide();for(var c in z)z[c].remove();z={}}a=a.editor._.storedDialogs;for(var d in a)a[d].destroy()})})();CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{openDialog:function(a,b){var c=null,d=CKEDITOR.dialog._.dialogDefinitions[a];null===CKEDITOR.dialog._.currentTop&&N(this);if("function"==typeof d)c=
-this._.storedDialogs||(this._.storedDialogs={}),c=c[a]||(c[a]=new CKEDITOR.dialog(this,a)),b&&b.call(c,c),c.show();else{if("failed"==d)throw O(this),Error('[CKEDITOR.dialog.openDialog] Dialog "'+a+'" failed when loading definition.');"string"==typeof d&&CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(d),function(){"function"!=typeof CKEDITOR.dialog._.dialogDefinitions[a]&&(CKEDITOR.dialog._.dialogDefinitions[a]="failed");this.openDialog(a,b)},this,0,1)}CKEDITOR.skin.loadPart("dialog");return c}})})();
-CKEDITOR.plugins.add("dialog",{requires:"dialogui",init:function(x){x.on("doubleclick",function(A){A.data.dialog&&x.openDialog(A.data.dialog)},null,null,999)}});CKEDITOR.plugins.add("about",{requires:"dialog",init:function(a){var b=a.addCommand("about",new CKEDITOR.dialogCommand("about"));b.modes={wysiwyg:1,source:1};b.canUndo=!1;b.readOnly=1;a.ui.addButton&&a.ui.addButton("About",{label:a.lang.about.title,command:"about",toolbar:"about"});CKEDITOR.dialog.add("about",this.path+"dialogs/about.js")}});(function(){CKEDITOR.plugins.add("a11yhelp",{requires:"dialog",availableLangs:{af:1,ar:1,bg:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,en:1,"en-gb":1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,fr:1,"fr-ca":1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,it:1,ja:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,nb:1,nl:1,no:1,pl:1,pt:1,"pt-br":1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,sr:1,"sr-latn":1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},init:function(b){var c=this;b.addCommand("a11yHelp",{exec:function(){var a=b.langCode,a=c.availableLangs[a]?
-a:c.availableLangs[a.replace(/-.*/,"")]?a.replace(/-.*/,""):"en";CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(c.path+"dialogs/lang/"+a+".js"),function(){b.lang.a11yhelp=c.langEntries[a];b.openDialog("a11yHelp")})},modes:{wysiwyg:1,source:1},readOnly:1,canUndo:!1});b.setKeystroke(CKEDITOR.ALT+48,"a11yHelp");CKEDITOR.dialog.add("a11yHelp",this.path+"dialogs/a11yhelp.js");b.on("ariaEditorHelpLabel",function(a){a.data.label=b.lang.common.editorHelp})}})})();(function(){function f(c){var a=this.att;c=c&&c.hasAttribute(a)&&c.getAttribute(a)||"";void 0!==c&&this.setValue(c)}function g(){for(var c,a=0;a<arguments.length;a++)if(arguments[a]instanceof CKEDITOR.dom.element){c=arguments[a];break}if(c){var a=this.att,b=this.getValue();b?c.setAttribute(a,b):c.removeAttribute(a,b)}}var k={id:1,dir:1,classes:1,styles:1};CKEDITOR.plugins.add("dialogadvtab",{requires:"dialog",allowedContent:function(c){c||(c=k);var a=[];c.id&&a.push("id");c.dir&&a.push("dir");var b=
+notEmpty:function(b){return this.regex(a,b)},integer:function(a){return this.regex(b,a)},number:function(a){return this.regex(c,a)},cssLength:function(a){return this.functions(function(a){return d.test(CKEDITOR.tools.trim(a))},a)},htmlLength:function(a){return this.functions(function(a){return e.test(CKEDITOR.tools.trim(a))},a)},inlineStyle:function(a){return this.functions(function(a){return f.test(CKEDITOR.tools.trim(a))},a)},equals:function(a,b){return this.functions(function(b){return b==a},b)},
+notEqual:function(a,b){return this.functions(function(b){return b!=a},b)}};CKEDITOR.on("instanceDestroyed",function(a){if(CKEDITOR.tools.isEmpty(CKEDITOR.instances)){for(var b;b=CKEDITOR.dialog._.currentTop;)b.hide();for(var c in z)z[c].remove();z={}}a=a.editor._.storedDialogs;for(var d in a)a[d].destroy()})})();CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{openDialog:function(a,b){var c=null,e=CKEDITOR.dialog._.dialogDefinitions[a];null===CKEDITOR.dialog._.currentTop&&N(this);if("function"==typeof e)c=
+this._.storedDialogs||(this._.storedDialogs={}),c=c[a]||(c[a]=new CKEDITOR.dialog(this,a)),b&&b.call(c,c),c.show();else{if("failed"==e)throw O(this),Error('[CKEDITOR.dialog.openDialog] Dialog "'+a+'" failed when loading definition.');"string"==typeof e&&CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(e),function(){"function"!=typeof CKEDITOR.dialog._.dialogDefinitions[a]&&(CKEDITOR.dialog._.dialogDefinitions[a]="failed");this.openDialog(a,b)},this,0,1)}CKEDITOR.skin.loadPart("dialog");return c}})})();
+CKEDITOR.plugins.add("dialog",{requires:"dialogui",init:function(x){x.on("doubleclick",function(A){A.data.dialog&&x.openDialog(A.data.dialog)},null,null,999)}});CKEDITOR.plugins.add("about",{requires:"dialog",init:function(a){var b=a.addCommand("about",new CKEDITOR.dialogCommand("about"));b.modes={wysiwyg:1,source:1};b.canUndo=!1;b.readOnly=1;a.ui.addButton&&a.ui.addButton("About",{label:a.lang.about.title,command:"about",toolbar:"about"});CKEDITOR.dialog.add("about",this.path+"dialogs/about.js")}});(function(){CKEDITOR.plugins.add("a11yhelp",{requires:"dialog",availableLangs:{af:1,ar:1,az:1,bg:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,en:1,"en-gb":1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,fr:1,"fr-ca":1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,it:1,ja:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,nb:1,nl:1,no:1,oc:1,pl:1,pt:1,"pt-br":1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,sr:1,"sr-latn":1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},init:function(b){var c=this;b.addCommand("a11yHelp",{exec:function(){var a=b.langCode,
+a=c.availableLangs[a]?a:c.availableLangs[a.replace(/-.*/,"")]?a.replace(/-.*/,""):"en";CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(c.path+"dialogs/lang/"+a+".js"),function(){b.lang.a11yhelp=c.langEntries[a];b.openDialog("a11yHelp")})},modes:{wysiwyg:1,source:1},readOnly:1,canUndo:!1});b.setKeystroke(CKEDITOR.ALT+48,"a11yHelp");CKEDITOR.dialog.add("a11yHelp",this.path+"dialogs/a11yhelp.js");b.on("ariaEditorHelpLabel",function(a){a.data.label=b.lang.common.editorHelp})}})})();(function(){function f(c){var a=this.att;c=c&&c.hasAttribute(a)&&c.getAttribute(a)||"";void 0!==c&&this.setValue(c)}function g(){for(var c,a=0;a<arguments.length;a++)if(arguments[a]instanceof CKEDITOR.dom.element){c=arguments[a];break}if(c){var a=this.att,b=this.getValue();b?c.setAttribute(a,b):c.removeAttribute(a,b)}}var k={id:1,dir:1,classes:1,styles:1};CKEDITOR.plugins.add("dialogadvtab",{requires:"dialog",allowedContent:function(c){c||(c=k);var a=[];c.id&&a.push("id");c.dir&&a.push("dir");var b=
 "";a.length&&(b+="["+a.join(",")+"]");c.classes&&(b+="(*)");c.styles&&(b+="{*}");return b},createAdvancedTab:function(c,a,b){a||(a=k);var d=c.lang.common,h={id:"advanced",label:d.advancedTab,title:d.advancedTab,elements:[{type:"vbox",padding:1,children:[]}]},e=[];if(a.id||a.dir)a.id&&e.push({id:"advId",att:"id",type:"text",requiredContent:b?b+"[id]":null,label:d.id,setup:f,commit:g}),a.dir&&e.push({id:"advLangDir",att:"dir",type:"select",requiredContent:b?b+"[dir]":null,label:d.langDir,"default":"",
 style:"width:100%",items:[[d.notSet,""],[d.langDirLTR,"ltr"],[d.langDirRTL,"rtl"]],setup:f,commit:g}),h.elements[0].children.push({type:"hbox",widths:["50%","50%"],children:[].concat(e)});if(a.styles||a.classes)e=[],a.styles&&e.push({id:"advStyles",att:"style",type:"text",requiredContent:b?b+"{cke-xyz}":null,label:d.styles,"default":"",validate:CKEDITOR.dialog.validate.inlineStyle(d.invalidInlineStyle),onChange:function(){},getStyle:function(a,c){var b=this.getValue().match(new RegExp("(?:^|;)\\s*"+
 a+"\\s*:\\s*([^;]*)","i"));return b?b[1]:c},updateStyle:function(a,b){var d=this.getValue(),e=c.document.createElement("span");e.setAttribute("style",d);e.setStyle(a,b);d=CKEDITOR.tools.normalizeCssText(e.getAttribute("style"));this.setValue(d,1)},setup:f,commit:g}),a.classes&&e.push({type:"hbox",widths:["45%","55%"],children:[{id:"advCSSClasses",att:"class",type:"text",requiredContent:b?b+"(cke-xyz)":null,label:d.cssClasses,"default":"",setup:f,commit:g}]}),h.elements[0].children.push({type:"hbox",
@@ -625,55 +642,58 @@ tr:1,ol:1,ul:1};a[d.getName()];)d=d.getParent();for(b=null;0<e.length;){for(a=e.
 for(d={};a=f.getNextParagraph();){for(e=c=null;a.getParent();){if("blockquote"==a.getParent().getName()){c=a.getParent();e=a;break}a=a.getParent()}c&&e&&!e.getCustomData("blockquote_moveout")&&(b.push(e),CKEDITOR.dom.element.setMarker(d,e,"blockquote_moveout",!0))}CKEDITOR.dom.element.clearAllMarkers(d);a=[];e=[];for(d={};0<b.length;)f=b.shift(),c=f.getParent(),f.getPrevious()?f.getNext()?(f.breakParent(f.getParent()),e.push(f.getNext())):f.remove().insertAfter(c):f.remove().insertBefore(c),c.getCustomData("blockquote_processed")||
 (e.push(c),CKEDITOR.dom.element.setMarker(d,c,"blockquote_processed",!0)),a.push(f);CKEDITOR.dom.element.clearAllMarkers(d);for(b=e.length-1;0<=b;b--){c=e[b];a:{d=c;for(var f=0,m=d.getChildCount(),l=void 0;f<m&&(l=d.getChild(f));f++)if(l.type==CKEDITOR.NODE_ELEMENT&&l.isBlockBoundary()){d=!1;break a}d=!0}d&&c.remove()}if(g.config.enterMode==CKEDITOR.ENTER_BR)for(c=!0;a.length;)if(f=a.shift(),"div"==f.getName()){b=new CKEDITOR.dom.documentFragment(g.document);!c||!f.getPrevious()||f.getPrevious().type==
 CKEDITOR.NODE_ELEMENT&&f.getPrevious().isBlockBoundary()||b.append(g.document.createElement("br"));for(c=f.getNext()&&!(f.getNext().type==CKEDITOR.NODE_ELEMENT&&f.getNext().isBlockBoundary());f.getFirst();)f.getFirst().remove().appendTo(b);c&&b.append(g.document.createElement("br"));b.replace(f);c=!1}}k.selectBookmarks(h);g.focus()}},refresh:function(g,a){this.setState(g.elementPath(a.block||a.blockLimit).contains("blockquote",1)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)},context:"blockquote",allowedContent:"blockquote",
-requiredContent:"blockquote"};CKEDITOR.plugins.add("blockquote",{init:function(g){g.blockless||(g.addCommand("blockquote",m),g.ui.addButton&&g.ui.addButton("Blockquote",{label:g.lang.blockquote.toolbar,command:"blockquote",toolbar:"blocks,10"}))}})})();(function(){function r(b,a,c){a.type||(a.type="auto");if(c&&!1===b.fire("beforePaste",a)||!a.dataValue&&a.dataTransfer.isEmpty())return!1;a.dataValue||(a.dataValue="");if(CKEDITOR.env.gecko&&"drop"==a.method&&b.toolbox)b.once("afterPaste",function(){b.toolbox.focus()});return b.fire("paste",a)}function y(b){function a(){var a=b.editable();if(CKEDITOR.plugins.clipboard.isCustomCopyCutSupported){var d=function(a){b.readOnly&&"cut"==a.name||n.initPasteDataTransfer(a,b);a.data.preventDefault()};a.on("copy",
-d);a.on("cut",d);a.on("cut",function(){b.readOnly||b.extractSelectedHtml()},null,null,999)}a.on(n.mainPasteEvent,function(b){"beforepaste"==n.mainPasteEvent&&p||k(b)});"beforepaste"==n.mainPasteEvent&&(a.on("paste",function(a){v||(e(),a.data.preventDefault(),k(a),f("paste")||b.openDialog("paste"))}),a.on("contextmenu",g,null,null,0),a.on("beforepaste",function(b){!b.data||b.data.$.ctrlKey||b.data.$.shiftKey||g()},null,null,0));a.on("beforecut",function(){!p&&h(b)});var c;a.attachListener(CKEDITOR.env.ie?
-a:b.document.getDocumentElement(),"mouseup",function(){c=setTimeout(function(){t()},0)});b.on("destroy",function(){clearTimeout(c)});a.on("keyup",t)}function c(a){return{type:a,canUndo:"cut"==a,startDisabled:!0,exec:function(){"cut"==this.type&&h();var a;var d=this.type;if(CKEDITOR.env.ie)a=f(d);else try{a=b.document.$.execCommand(d,!1,null)}catch(c){a=!1}a||b.showNotification(b.lang.clipboard[this.type+"Error"]);return a}}}function d(){return{canUndo:!1,async:!0,exec:function(b,a){var d=this,c=function(a,
-c){a&&r(b,a,!!c);b.fire("afterCommandExec",{name:"paste",command:d,returnValue:!!a})};"string"==typeof a?c({dataValue:a,method:"paste",dataTransfer:n.initPasteDataTransfer()},1):b.getClipboardData(c)}}}function e(){v=1;setTimeout(function(){v=0},100)}function g(){p=1;setTimeout(function(){p=0},10)}function f(a){var d=b.document,c=d.getBody(),e=!1,f=function(){e=!0};c.on(a,f);7<CKEDITOR.env.version?d.$.execCommand(a):d.$.selection.createRange().execCommand(a);c.removeListener(a,f);return e}function h(){if(CKEDITOR.env.ie&&
-!CKEDITOR.env.quirks){var a=b.getSelection(),d,c,e;a.getType()==CKEDITOR.SELECTION_ELEMENT&&(d=a.getSelectedElement())&&(c=a.getRanges()[0],e=b.document.createText(""),e.insertBefore(d),c.setStartBefore(e),c.setEndAfter(d),a.selectRanges([c]),setTimeout(function(){d.getParent()&&(e.remove(),a.selectElement(d))},0))}}function l(a,d){var c=b.document,e=b.editable(),f=function(b){b.cancel()},q;if(!c.getById("cke_pastebin")){var g=b.getSelection(),h=g.createBookmarks();CKEDITOR.env.ie&&g.root.fire("selectionchange");
-var m=new CKEDITOR.dom.element(!CKEDITOR.env.webkit&&!e.is("body")||CKEDITOR.env.ie?"div":"body",c);m.setAttributes({id:"cke_pastebin","data-cke-temp":"1"});var k=0,c=c.getWindow();CKEDITOR.env.webkit?(e.append(m),m.addClass("cke_editable"),e.is("body")||(k="static"!=e.getComputedStyle("position")?e:CKEDITOR.dom.element.get(e.$.offsetParent),k=k.getDocumentPosition().y)):e.getAscendant(CKEDITOR.env.ie?"body":"html",1).append(m);m.setStyles({position:"absolute",top:c.getScrollPosition().y-k+10+"px",
-width:"1px",height:Math.max(1,c.getViewPaneSize().height-20)+"px",overflow:"hidden",margin:0,padding:0});CKEDITOR.env.safari&&m.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select","text"));(k=m.getParent().isReadOnly())?(m.setOpacity(0),m.setAttribute("contenteditable",!0)):m.setStyle("ltr"==b.config.contentsLangDirection?"left":"right","-10000px");b.on("selectionChange",f,null,null,0);if(CKEDITOR.env.webkit||CKEDITOR.env.gecko)q=e.once("blur",f,null,null,-100);k&&m.focus();k=new CKEDITOR.dom.range(m);
-k.selectNodeContents(m);var t=k.select();CKEDITOR.env.ie&&(q=e.once("blur",function(){b.lockSelection(t)}));var l=CKEDITOR.document.getWindow().getScrollPosition().y;setTimeout(function(){CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=l);q&&q.removeListener();CKEDITOR.env.ie&&e.focus();g.selectBookmarks(h);m.remove();var a;CKEDITOR.env.webkit&&(a=m.getFirst())&&a.is&&a.hasClass("Apple-style-span")&&(m=a);b.removeListener("selectionChange",f);d(m.getHtml())},0)}}function z(){if("paste"==
-n.mainPasteEvent)return b.fire("beforePaste",{type:"auto",method:"paste"}),!1;b.focus();e();var a=b.focusManager;a.lock();if(b.editable().fire(n.mainPasteEvent)&&!f("paste"))return a.unlock(),!1;a.unlock();return!0}function q(a){if("wysiwyg"==b.mode)switch(a.data.keyCode){case CKEDITOR.CTRL+86:case CKEDITOR.SHIFT+45:a=b.editable();e();"paste"==n.mainPasteEvent&&a.fire("beforepaste");break;case CKEDITOR.CTRL+88:case CKEDITOR.SHIFT+46:b.fire("saveSnapshot"),setTimeout(function(){b.fire("saveSnapshot")},
-50)}}function k(a){var d={type:"auto",method:"paste",dataTransfer:n.initPasteDataTransfer(a)};d.dataTransfer.cacheData();var c=!1!==b.fire("beforePaste",d);c&&n.canClipboardApiBeTrusted(d.dataTransfer,b)?(a.data.preventDefault(),setTimeout(function(){r(b,d)},0)):l(a,function(a){d.dataValue=a.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,"");c&&r(b,d)})}function t(){if("wysiwyg"==b.mode){var a=u("paste");b.getCommand("cut").setState(u("cut"));b.getCommand("copy").setState(u("copy"));b.getCommand("paste").setState(a);
-b.fire("pasteState",a)}}function u(a){if(w&&a in{paste:1,cut:1})return CKEDITOR.TRISTATE_DISABLED;if("paste"==a)return CKEDITOR.TRISTATE_OFF;a=b.getSelection();var d=a.getRanges();return a.getType()==CKEDITOR.SELECTION_NONE||1==d.length&&d[0].collapsed?CKEDITOR.TRISTATE_DISABLED:CKEDITOR.TRISTATE_OFF}var n=CKEDITOR.plugins.clipboard,p=0,v=0,w=0;(function(){b.on("key",q);b.on("contentDom",a);b.on("selectionChange",function(b){w=b.data.selection.getRanges()[0].checkReadOnly();t()});b.contextMenu&&b.contextMenu.addListener(function(b,
-a){w=a.getRanges()[0].checkReadOnly();return{cut:u("cut"),copy:u("copy"),paste:u("paste")}})})();(function(){function a(d,c,e,f,q){var g=b.lang.clipboard[c];b.addCommand(c,e);b.ui.addButton&&b.ui.addButton(d,{label:g,command:c,toolbar:"clipboard,"+f});b.addMenuItems&&b.addMenuItem(c,{label:g,command:c,group:"clipboard",order:q})}a("Cut","cut",c("cut"),10,1);a("Copy","copy",c("copy"),20,4);a("Paste","paste",d(),30,8)})();b.getClipboardData=function(a,d){function c(a){a.removeListener();a.cancel();
-d(a.data)}function e(a){a.removeListener();a.cancel();k=!0;d({type:g,dataValue:a.data.dataValue,dataTransfer:a.data.dataTransfer,method:"paste"})}function f(){this.customTitle=a&&a.title}var q=!1,g="auto",k=!1;d||(d=a,a=null);b.on("paste",c,null,null,0);b.on("beforePaste",function(a){a.removeListener();q=!0;g=a.data.type},null,null,1E3);!1===z()&&(b.removeListener("paste",c),q&&b.fire("pasteDialog",f)?(b.on("pasteDialogCommit",e),b.on("dialogHide",function(a){a.removeListener();a.data.removeListener("pasteDialogCommit",
-e);setTimeout(function(){k||d(null)},10)})):d(null))}}function A(b){if(CKEDITOR.env.webkit){if(!b.match(/^[^<]*$/g)&&!b.match(/^(<div><br( ?\/)?><\/div>|<div>[^<]*<\/div>)*$/gi))return"html"}else if(CKEDITOR.env.ie){if(!b.match(/^([^<]|<br( ?\/)?>)*$/gi)&&!b.match(/^(<p>([^<]|<br( ?\/)?>)*<\/p>|(\r\n))*$/gi))return"html"}else if(CKEDITOR.env.gecko){if(!b.match(/^([^<]|<br( ?\/)?>)*$/gi))return"html"}else return"html";return"htmlifiedtext"}function B(b,a){function c(a){return CKEDITOR.tools.repeat("\x3c/p\x3e\x3cp\x3e",
-~~(a/2))+(1==a%2?"\x3cbr\x3e":"")}a=a.replace(/\s+/g," ").replace(/> +</g,"\x3e\x3c").replace(/<br ?\/>/gi,"\x3cbr\x3e");a=a.replace(/<\/?[A-Z]+>/g,function(a){return a.toLowerCase()});if(a.match(/^[^<]$/))return a;CKEDITOR.env.webkit&&-1<a.indexOf("\x3cdiv\x3e")&&(a=a.replace(/^(<div>(<br>|)<\/div>)(?!$|(<div>(<br>|)<\/div>))/g,"\x3cbr\x3e").replace(/^(<div>(<br>|)<\/div>){2}(?!$)/g,"\x3cdiv\x3e\x3c/div\x3e"),a.match(/<div>(<br>|)<\/div>/)&&(a="\x3cp\x3e"+a.replace(/(<div>(<br>|)<\/div>)+/g,function(a){return c(a.split("\x3c/div\x3e\x3cdiv\x3e").length+
-1)})+"\x3c/p\x3e"),a=a.replace(/<\/div><div>/g,"\x3cbr\x3e"),a=a.replace(/<\/?div>/g,""));CKEDITOR.env.gecko&&b.enterMode!=CKEDITOR.ENTER_BR&&(CKEDITOR.env.gecko&&(a=a.replace(/^<br><br>$/,"\x3cbr\x3e")),-1<a.indexOf("\x3cbr\x3e\x3cbr\x3e")&&(a="\x3cp\x3e"+a.replace(/(<br>){2,}/g,function(a){return c(a.length/4)})+"\x3c/p\x3e"));return C(b,a)}function D(){function b(){var a={},b;for(b in CKEDITOR.dtd)"$"!=b.charAt(0)&&"div"!=b&&"span"!=b&&(a[b]=1);return a}var a={};return{get:function(c){return"plain-text"==
-c?a.plainText||(a.plainText=new CKEDITOR.filter("br")):"semantic-content"==c?((c=a.semanticContent)||(c=new CKEDITOR.filter,c.allow({$1:{elements:b(),attributes:!0,styles:!1,classes:!1}}),c=a.semanticContent=c),c):c?new CKEDITOR.filter(c):null}}}function x(b,a,c){a=CKEDITOR.htmlParser.fragment.fromHtml(a);var d=new CKEDITOR.htmlParser.basicWriter;c.applyTo(a,!0,!1,b.activeEnterMode);a.writeHtml(d);return d.getHtml()}function C(b,a){b.enterMode==CKEDITOR.ENTER_BR?a=a.replace(/(<\/p><p>)+/g,function(a){return CKEDITOR.tools.repeat("\x3cbr\x3e",
-a.length/7*2)}).replace(/<\/?p>/g,""):b.enterMode==CKEDITOR.ENTER_DIV&&(a=a.replace(/<(\/)?p>/g,"\x3c$1div\x3e"));return a}function E(b){b.data.preventDefault();b.data.$.dataTransfer.dropEffect="none"}function F(b){var a=CKEDITOR.plugins.clipboard;b.on("contentDom",function(){function c(a,d,c){d.select();r(b,{dataTransfer:c,method:"drop"},1);c.sourceEditor.fire("saveSnapshot");c.sourceEditor.editable().extractHtmlFromRange(a);c.sourceEditor.getSelection().selectRanges([a]);c.sourceEditor.fire("saveSnapshot")}
-function d(d,c){d.select();r(b,{dataTransfer:c,method:"drop"},1);a.resetDragDataTransfer()}function e(a,d,c){var e={$:a.data.$,target:a.data.getTarget()};d&&(e.dragRange=d);c&&(e.dropRange=c);!1===b.fire(a.name,e)&&a.data.preventDefault()}function g(a){a.type!=CKEDITOR.NODE_ELEMENT&&(a=a.getParent());return a.getChildCount()}var f=b.editable(),h=CKEDITOR.plugins.clipboard.getDropTarget(b),l=b.ui.space("top"),p=b.ui.space("bottom");a.preventDefaultDropOnElement(l);a.preventDefaultDropOnElement(p);
-f.attachListener(h,"dragstart",e);f.attachListener(b,"dragstart",a.resetDragDataTransfer,a,null,1);f.attachListener(b,"dragstart",function(d){a.initDragDataTransfer(d,b)},null,null,2);f.attachListener(b,"dragstart",function(){var d=a.dragRange=b.getSelection().getRanges()[0];CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(a.dragStartContainerChildCount=d?g(d.startContainer):null,a.dragEndContainerChildCount=d?g(d.endContainer):null)},null,null,100);f.attachListener(h,"dragend",e);f.attachListener(b,"dragend",
-a.initDragDataTransfer,a,null,1);f.attachListener(b,"dragend",a.resetDragDataTransfer,a,null,100);f.attachListener(h,"dragover",function(a){var b=a.data.getTarget();b&&b.is&&b.is("html")?a.data.preventDefault():CKEDITOR.env.ie&&CKEDITOR.plugins.clipboard.isFileApiSupported&&a.data.$.dataTransfer.types.contains("Files")&&a.data.preventDefault()});f.attachListener(h,"drop",function(d){if(!d.data.$.defaultPrevented){d.data.preventDefault();var c=d.data.getTarget();if(!c.isReadOnly()||c.type==CKEDITOR.NODE_ELEMENT&&
-c.is("html")){var c=a.getRangeAtDropPosition(d,b),f=a.dragRange;c&&e(d,f,c)}}},null,null,9999);f.attachListener(b,"drop",a.initDragDataTransfer,a,null,1);f.attachListener(b,"drop",function(e){if(e=e.data){var f=e.dropRange,g=e.dragRange,h=e.dataTransfer;h.getTransferType(b)==CKEDITOR.DATA_TRANSFER_INTERNAL?setTimeout(function(){a.internalDrop(g,f,h,b)},0):h.getTransferType(b)==CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?c(g,f,h):d(f,h)}},null,null,9999)})}CKEDITOR.plugins.add("clipboard",{requires:"dialog",
-init:function(b){var a,c=D();b.config.forcePasteAsPlainText?a="plain-text":b.config.pasteFilter?a=b.config.pasteFilter:!CKEDITOR.env.webkit||"pasteFilter"in b.config||(a="semantic-content");b.pasteFilter=c.get(a);y(b);F(b);CKEDITOR.dialog.add("paste",CKEDITOR.getUrl(this.path+"dialogs/paste.js"));b.on("paste",function(a){a.data.dataTransfer||(a.data.dataTransfer=new CKEDITOR.plugins.clipboard.dataTransfer);if(!a.data.dataValue){var c=a.data.dataTransfer,g=c.getData("text/html");if(g)a.data.dataValue=
-g,a.data.type="html";else if(g=c.getData("text/plain"))a.data.dataValue=b.editable().transformPlainTextToHtml(g),a.data.type="text"}},null,null,1);b.on("paste",function(a){var b=a.data.dataValue,c=CKEDITOR.dtd.$block;-1<b.indexOf("Apple-")&&(b=b.replace(/<span class="Apple-converted-space">&nbsp;<\/span>/gi," "),"html"!=a.data.type&&(b=b.replace(/<span class="Apple-tab-span"[^>]*>([^<]*)<\/span>/gi,function(a,b){return b.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;")})),-1<b.indexOf('\x3cbr class\x3d"Apple-interchange-newline"\x3e')&&
-(a.data.startsWithEOL=1,a.data.preSniffing="html",b=b.replace(/<br class="Apple-interchange-newline">/,"")),b=b.replace(/(<[^>]+) class="Apple-[^"]*"/gi,"$1"));if(b.match(/^<[^<]+cke_(editable|contents)/i)){var f,h,l=new CKEDITOR.dom.element("div");for(l.setHtml(b);1==l.getChildCount()&&(f=l.getFirst())&&f.type==CKEDITOR.NODE_ELEMENT&&(f.hasClass("cke_editable")||f.hasClass("cke_contents"));)l=h=f;h&&(b=h.getHtml().replace(/<br>$/i,""))}CKEDITOR.env.ie?b=b.replace(/^&nbsp;(?: |\r\n)?<(\w+)/g,function(b,
-f){return f.toLowerCase()in c?(a.data.preSniffing="html","\x3c"+f):b}):CKEDITOR.env.webkit?b=b.replace(/<\/(\w+)><div><br><\/div>$/,function(b,f){return f in c?(a.data.endsWithEOL=1,"\x3c/"+f+"\x3e"):b}):CKEDITOR.env.gecko&&(b=b.replace(/(\s)<br>$/,"$1"));a.data.dataValue=b},null,null,3);b.on("paste",function(a){a=a.data;var e=a.type,g=a.dataValue,f,h=b.config.clipboard_defaultContentType||"html",l=a.dataTransfer.getTransferType(b);f="html"==e||"html"==a.preSniffing?"html":A(g);"htmlifiedtext"==f&&
-(g=B(b.config,g));"text"==e&&"html"==f?g=x(b,g,c.get("plain-text")):l==CKEDITOR.DATA_TRANSFER_EXTERNAL&&b.pasteFilter&&!a.dontFilter&&(g=x(b,g,b.pasteFilter));a.startsWithEOL&&(g='\x3cbr data-cke-eol\x3d"1"\x3e'+g);a.endsWithEOL&&(g+='\x3cbr data-cke-eol\x3d"1"\x3e');"auto"==e&&(e="html"==f||"html"==h?"html":"text");a.type=e;a.dataValue=g;delete a.preSniffing;delete a.startsWithEOL;delete a.endsWithEOL},null,null,6);b.on("paste",function(a){a=a.data;a.dataValue&&(b.insertHtml(a.dataValue,a.type,a.range),
-setTimeout(function(){b.fire("afterPaste")},0))},null,null,1E3);b.on("pasteDialog",function(a){setTimeout(function(){b.openDialog("paste",a.data)},0)})}});CKEDITOR.plugins.clipboard={isCustomCopyCutSupported:!CKEDITOR.env.ie&&!CKEDITOR.env.iOS,isCustomDataTypesSupported:!CKEDITOR.env.ie,isFileApiSupported:!CKEDITOR.env.ie||9<CKEDITOR.env.version,mainPasteEvent:CKEDITOR.env.ie&&!CKEDITOR.env.edge?"beforepaste":"paste",canClipboardApiBeTrusted:function(b,a){return b.getTransferType(a)!=CKEDITOR.DATA_TRANSFER_EXTERNAL||
-CKEDITOR.env.chrome&&!b.isEmpty()||CKEDITOR.env.gecko&&(b.getData("text/html")||b.getFilesCount())?!0:!1},getDropTarget:function(b){var a=b.editable();return CKEDITOR.env.ie&&9>CKEDITOR.env.version||a.isInline()?a:b.document},fixSplitNodesAfterDrop:function(b,a,c,d){function e(b,c,d){var e=b;e.type==CKEDITOR.NODE_TEXT&&(e=b.getParent());if(e.equals(c)&&d!=c.getChildCount())return b=a.startContainer.getChild(a.startOffset-1),c=a.startContainer.getChild(a.startOffset),b&&b.type==CKEDITOR.NODE_TEXT&&
-c&&c.type==CKEDITOR.NODE_TEXT&&(d=b.getLength(),b.setText(b.getText()+c.getText()),c.remove(),a.setStart(b,d),a.collapse(!0)),!0}var g=a.startContainer;"number"==typeof d&&"number"==typeof c&&g.type==CKEDITOR.NODE_ELEMENT&&(e(b.startContainer,g,c)||e(b.endContainer,g,d))},isDropRangeAffectedByDragRange:function(b,a){var c=a.startContainer,d=a.endOffset;return b.endContainer.equals(c)&&b.endOffset<=d||b.startContainer.getParent().equals(c)&&b.startContainer.getIndex()<d||b.endContainer.getParent().equals(c)&&
-b.endContainer.getIndex()<d?!0:!1},internalDrop:function(b,a,c,d){var e=CKEDITOR.plugins.clipboard,g=d.editable(),f,h;d.fire("saveSnapshot");d.fire("lockSnapshot",{dontUpdate:1});CKEDITOR.env.ie&&10>CKEDITOR.env.version&&this.fixSplitNodesAfterDrop(b,a,e.dragStartContainerChildCount,e.dragEndContainerChildCount);(h=this.isDropRangeAffectedByDragRange(b,a))||(f=b.createBookmark(!1));e=a.clone().createBookmark(!1);h&&(f=b.createBookmark(!1));b=f.startNode;a=f.endNode;h=e.startNode;a&&b.getPosition(h)&
-CKEDITOR.POSITION_PRECEDING&&a.getPosition(h)&CKEDITOR.POSITION_FOLLOWING&&h.insertBefore(b);b=d.createRange();b.moveToBookmark(f);g.extractHtmlFromRange(b,1);a=d.createRange();a.moveToBookmark(e);r(d,{dataTransfer:c,method:"drop",range:a},1);d.fire("unlockSnapshot")},getRangeAtDropPosition:function(b,a){var c=b.data.$,d=c.clientX,e=c.clientY,g=a.getSelection(!0).getRanges()[0],f=a.createRange();if(b.data.testRange)return b.data.testRange;if(document.caretRangeFromPoint)c=a.document.$.caretRangeFromPoint(d,
-e),f.setStart(CKEDITOR.dom.node(c.startContainer),c.startOffset),f.collapse(!0);else if(c.rangeParent)f.setStart(CKEDITOR.dom.node(c.rangeParent),c.rangeOffset),f.collapse(!0);else{if(CKEDITOR.env.ie&&8<CKEDITOR.env.version&&g&&a.editable().hasFocus)return g;if(document.body.createTextRange){a.focus();c=a.document.getBody().$.createTextRange();try{for(var h=!1,l=0;20>l&&!h;l++){if(!h)try{c.moveToPoint(d,e-l),h=!0}catch(p){}if(!h)try{c.moveToPoint(d,e+l),h=!0}catch(q){}}if(h){var k="cke-temp-"+(new Date).getTime();
-c.pasteHTML('\x3cspan id\x3d"'+k+'"\x3e​\x3c/span\x3e');var t=a.document.getById(k);f.moveToPosition(t,CKEDITOR.POSITION_BEFORE_START);t.remove()}else{var u=a.document.$.elementFromPoint(d,e),n=new CKEDITOR.dom.element(u),r;if(n.equals(a.editable())||"html"==n.getName())return g&&g.startContainer&&!g.startContainer.equals(a.editable())?g:null;r=n.getClientRect();d<r.left?f.setStartAt(n,CKEDITOR.POSITION_AFTER_START):f.setStartAt(n,CKEDITOR.POSITION_BEFORE_END);f.collapse(!0)}}catch(v){return null}}else return null}return f},
-initDragDataTransfer:function(b,a){var c=b.data.$?b.data.$.dataTransfer:null,d=new this.dataTransfer(c,a);c?this.dragData&&d.id==this.dragData.id?d=this.dragData:this.dragData=d:this.dragData?d=this.dragData:this.dragData=d;b.data.dataTransfer=d},resetDragDataTransfer:function(){this.dragData=null},initPasteDataTransfer:function(b,a){if(this.isCustomCopyCutSupported&&b&&b.data&&b.data.$){var c=new this.dataTransfer(b.data.$.clipboardData,a);this.copyCutData&&c.id==this.copyCutData.id?(c=this.copyCutData,
-c.$=b.data.$.clipboardData):this.copyCutData=c;return c}return new this.dataTransfer(null,a)},preventDefaultDropOnElement:function(b){b&&b.on("dragover",E)}};var p=CKEDITOR.plugins.clipboard.isCustomDataTypesSupported?"cke/id":"Text";CKEDITOR.plugins.clipboard.dataTransfer=function(b,a){b&&(this.$=b);this._={metaRegExp:/^<meta.*?>/i,bodyRegExp:/<body(?:[\s\S]*?)>([\s\S]*)<\/body>/i,fragmentRegExp:/\x3c!--(?:Start|End)Fragment--\x3e/g,data:{},files:[],normalizeType:function(a){a=a.toLowerCase();return"text"==
-a||"text/plain"==a?"Text":"url"==a?"URL":a}};this.id=this.getData(p);this.id||(this.id="Text"==p?"":"cke-"+CKEDITOR.tools.getUniqueId());if("Text"!=p)try{this.$.setData(p,this.id)}catch(c){}a&&(this.sourceEditor=a,this.setData("text/html",a.getSelectedHtml(1)),"Text"==p||this.getData("text/plain")||this.setData("text/plain",a.getSelection().getSelectedText()))};CKEDITOR.DATA_TRANSFER_INTERNAL=1;CKEDITOR.DATA_TRANSFER_CROSS_EDITORS=2;CKEDITOR.DATA_TRANSFER_EXTERNAL=3;CKEDITOR.plugins.clipboard.dataTransfer.prototype=
-{getData:function(b){b=this._.normalizeType(b);var a=this._.data[b];if(void 0===a||null===a||""===a)try{a=this.$.getData(b)}catch(c){}if(void 0===a||null===a||""===a)a="";"text/html"==b?(a=a.replace(this._.metaRegExp,""),(b=this._.bodyRegExp.exec(a))&&b.length&&(a=b[1],a=a.replace(this._.fragmentRegExp,""))):"Text"==b&&CKEDITOR.env.gecko&&this.getFilesCount()&&"file://"==a.substring(0,7)&&(a="");return a},setData:function(b,a){b=this._.normalizeType(b);this._.data[b]=a;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported||
-"URL"==b||"Text"==b){"Text"==p&&"Text"==b&&(this.id=a);try{this.$.setData(b,a)}catch(c){}}},getTransferType:function(b){return this.sourceEditor?this.sourceEditor==b?CKEDITOR.DATA_TRANSFER_INTERNAL:CKEDITOR.DATA_TRANSFER_CROSS_EDITORS:CKEDITOR.DATA_TRANSFER_EXTERNAL},cacheData:function(){function b(b){b=a._.normalizeType(b);var c=a.getData(b);c&&(a._.data[b]=c)}if(this.$){var a=this,c,d;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(c=0;c<this.$.types.length;c++)b(this.$.types[c])}else b("Text"),
-b("URL");d=this._getImageFromClipboard();if(this.$&&this.$.files||d){this._.files=[];for(c=0;c<this.$.files.length;c++)this._.files.push(this.$.files[c]);0===this._.files.length&&d&&this._.files.push(d)}}},getFilesCount:function(){return this._.files.length?this._.files.length:this.$&&this.$.files&&this.$.files.length?this.$.files.length:this._getImageFromClipboard()?1:0},getFile:function(b){return this._.files.length?this._.files[b]:this.$&&this.$.files&&this.$.files.length?this.$.files[b]:0===b?
-this._getImageFromClipboard():void 0},isEmpty:function(){var b={},a;if(this.getFilesCount())return!1;for(a in this._.data)b[a]=1;if(this.$)if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(var c=0;c<this.$.types.length;c++)b[this.$.types[c]]=1}else b.Text=1,b.URL=1;"Text"!=p&&(b[p]=0);for(a in b)if(b[a]&&""!==this.getData(a))return!1;return!0},_getImageFromClipboard:function(){var b;if(this.$&&this.$.items&&this.$.items[0])try{if((b=this.$.items[0].getAsFile())&&b.type)return b}catch(a){}}}})();(function(){var c='\x3ca id\x3d"{id}" class\x3d"cke_button cke_button__{name} cke_button_{state} {cls}"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' title\x3d"{title}" tabindex\x3d"-1" hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-haspopup\x3d"{hasArrow}" aria-disabled\x3d"{ariaDisabled}"';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(c+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(c+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');
-var c=c+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{style}"'),c=c+'\x3e\x26nbsp;\x3c/span\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_button_label cke_button__{name}_label" aria-hidden\x3d"false"\x3e{label}\x3c/span\x3e{arrowHtml}\x3c/a\x3e',
-r=CKEDITOR.addTemplate("buttonArrow",'\x3cspan class\x3d"cke_button_arrow"\x3e'+(CKEDITOR.env.hc?"\x26#9660;":"")+"\x3c/span\x3e"),t=CKEDITOR.addTemplate("button",c);CKEDITOR.plugins.add("button",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_BUTTON,CKEDITOR.ui.button.handler)}});CKEDITOR.UI_BUTTON="button";CKEDITOR.ui.button=function(a){CKEDITOR.tools.extend(this,a,{title:a.label,click:a.click||function(b){b.execCommand(a.command)}});this._={}};CKEDITOR.ui.button.handler={create:function(a){return new CKEDITOR.ui.button(a)}};
-CKEDITOR.ui.button.prototype={render:function(a,b){function c(){var e=a.mode;e&&(e=this.modes[e]?void 0!==k[e]?k[e]:CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,e=a.readOnly&&!this.readOnly?CKEDITOR.TRISTATE_DISABLED:e,this.setState(e),this.refresh&&this.refresh())}var l=CKEDITOR.env,m=this._.id=CKEDITOR.tools.getNextId(),f="",g=this.command,n;this._.editor=a;var d={id:m,button:this,editor:a,focus:function(){CKEDITOR.document.getById(m).focus()},execute:function(){this.button.click(a)},attach:function(a){this.button.attach(a)}},
-u=CKEDITOR.tools.addFunction(function(a){if(d.onkey)return a=new CKEDITOR.dom.event(a),!1!==d.onkey(d,a.getKeystroke())}),v=CKEDITOR.tools.addFunction(function(a){var b;d.onfocus&&(b=!1!==d.onfocus(d,new CKEDITOR.dom.event(a)));return b}),p=0;d.clickFn=n=CKEDITOR.tools.addFunction(function(){p&&(a.unlockSelection(1),p=0);d.execute();l.iOS&&a.focus()});if(this.modes){var k={};a.on("beforeModeUnload",function(){a.mode&&this._.state!=CKEDITOR.TRISTATE_DISABLED&&(k[a.mode]=this._.state)},this);a.on("activeFilterChange",
-c,this);a.on("mode",c,this);!this.readOnly&&a.on("readOnly",c,this)}else g&&(g=a.getCommand(g))&&(g.on("state",function(){this.setState(g.state)},this),f+=g.state==CKEDITOR.TRISTATE_ON?"on":g.state==CKEDITOR.TRISTATE_DISABLED?"disabled":"off");if(this.directional)a.on("contentDirChanged",function(b){var c=CKEDITOR.document.getById(this._.id),d=c.getFirst();b=b.data;b!=a.lang.dir?c.addClass("cke_"+b):c.removeClass("cke_ltr").removeClass("cke_rtl");d.setAttribute("style",CKEDITOR.skin.getIconStyle(h,
-"rtl"==b,this.icon,this.iconOffset))},this);g||(f+="off");var q=this.name||this.command,h=q;this.icon&&!/\./.test(this.icon)&&(h=this.icon,this.icon=null);f={id:m,name:q,iconName:h,label:this.label,cls:this.className||"",state:f,ariaDisabled:"disabled"==f?"true":"false",title:this.title,titleJs:l.gecko&&!l.hc?"":(this.title||"").replace("'",""),hasArrow:this.hasArrow?"true":"false",keydownFn:u,focusFn:v,clickFn:n,style:CKEDITOR.skin.getIconStyle(h,"rtl"==a.lang.dir,this.icon,this.iconOffset),arrowHtml:this.hasArrow?
-r.output():""};t.output(f,b);if(this.onRender)this.onRender();return d},setState:function(a){if(this._.state==a)return!1;this._.state=a;var b=CKEDITOR.document.getById(this._.id);return b?(b.setState(a,"cke_button"),a==CKEDITOR.TRISTATE_DISABLED?b.setAttribute("aria-disabled",!0):b.removeAttribute("aria-disabled"),this.hasArrow?(a=a==CKEDITOR.TRISTATE_ON?this._.editor.lang.button.selectedLabel.replace(/%1/g,this.label):this.label,CKEDITOR.document.getById(this._.id+"_label").setText(a)):a==CKEDITOR.TRISTATE_ON?
-b.setAttribute("aria-pressed",!0):b.removeAttribute("aria-pressed"),!0):!1},getState:function(){return this._.state},toFeature:function(a){if(this._.feature)return this._.feature;var b=this;this.allowedContent||this.requiredContent||!this.command||(b=a.getCommand(this.command)||b);return this._.feature=b}};CKEDITOR.ui.prototype.addButton=function(a,b){this.add(a,CKEDITOR.UI_BUTTON,b)}})();CKEDITOR.plugins.add("panelbutton",{requires:"button",onLoad:function(){function e(c){var a=this._;a.state!=CKEDITOR.TRISTATE_DISABLED&&(this.createPanel(c),a.on?a.panel.hide():a.panel.showBlock(this._.id,this.document.getById(this._.id),4))}CKEDITOR.ui.panelButton=CKEDITOR.tools.createClass({base:CKEDITOR.ui.button,$:function(c){var a=c.panel||{};delete c.panel;this.base(c);this.document=a.parent&&a.parent.getDocument()||CKEDITOR.document;a.block={attributes:a.attributes};this.hasArrow=a.toolbarRelated=
+requiredContent:"blockquote"};CKEDITOR.plugins.add("blockquote",{init:function(g){g.blockless||(g.addCommand("blockquote",m),g.ui.addButton&&g.ui.addButton("Blockquote",{label:g.lang.blockquote.toolbar,command:"blockquote",toolbar:"blocks,10"}))}})})();(function(){function q(b,a,c){a.type||(a.type="auto");if(c&&!1===b.fire("beforePaste",a)||!a.dataValue&&a.dataTransfer.isEmpty())return!1;a.dataValue||(a.dataValue="");if(CKEDITOR.env.gecko&&"drop"==a.method&&b.toolbox)b.once("afterPaste",function(){b.toolbox.focus()});return b.fire("paste",a)}function z(b){function a(){var a=b.editable();if(CKEDITOR.plugins.clipboard.isCustomCopyCutSupported){var c=function(a){b.readOnly&&"cut"==a.name||m.initPasteDataTransfer(a,b);a.data.preventDefault()};a.on("copy",
+c);a.on("cut",c);a.on("cut",function(){b.readOnly||b.extractSelectedHtml()},null,null,999)}a.on(m.mainPasteEvent,function(b){"beforepaste"==m.mainPasteEvent&&p||u(b)});"beforepaste"==m.mainPasteEvent&&(a.on("paste",function(a){v||(f(),a.data.preventDefault(),u(a),d("paste")||b.openDialog("paste"))}),a.on("contextmenu",g,null,null,0),a.on("beforepaste",function(b){!b.data||b.data.$.ctrlKey||b.data.$.shiftKey||g()},null,null,0));a.on("beforecut",function(){!p&&h(b)});var e;a.attachListener(CKEDITOR.env.ie?
+a:b.document.getDocumentElement(),"mouseup",function(){e=setTimeout(function(){r()},0)});b.on("destroy",function(){clearTimeout(e)});a.on("keyup",r)}function c(a){return{type:a,canUndo:"cut"==a,startDisabled:!0,fakeKeystroke:"cut"==a?CKEDITOR.CTRL+88:CKEDITOR.CTRL+67,exec:function(){"cut"==this.type&&h();var a;var c=this.type;if(CKEDITOR.env.ie)a=d(c);else try{a=b.document.$.execCommand(c,!1,null)}catch(g){a=!1}a||b.showNotification(b.lang.clipboard[this.type+"Error"]);return a}}}function e(){return{canUndo:!1,
+async:!0,fakeKeystroke:CKEDITOR.CTRL+86,exec:function(b,a){var c=this,d=function(a,d){a&&q(b,a,!!d);b.fire("afterCommandExec",{name:"paste",command:c,returnValue:!!a})};"string"==typeof a?d({dataValue:a,method:"paste",dataTransfer:m.initPasteDataTransfer()},1):b.getClipboardData(d)}}}function f(){v=1;setTimeout(function(){v=0},100)}function g(){p=1;setTimeout(function(){p=0},10)}function d(a){var c=b.document,d=c.getBody(),g=!1,e=function(){g=!0};d.on(a,e);7<CKEDITOR.env.version?c.$.execCommand(a):
+c.$.selection.createRange().execCommand(a);d.removeListener(a,e);return g}function h(){if(CKEDITOR.env.ie&&!CKEDITOR.env.quirks){var a=b.getSelection(),c,d,g;a.getType()==CKEDITOR.SELECTION_ELEMENT&&(c=a.getSelectedElement())&&(d=a.getRanges()[0],g=b.document.createText(""),g.insertBefore(c),d.setStartBefore(g),d.setEndAfter(c),a.selectRanges([d]),setTimeout(function(){c.getParent()&&(g.remove(),a.selectElement(c))},0))}}function n(a,c){var d=b.document,g=b.editable(),e=function(b){b.cancel()},h;
+if(!d.getById("cke_pastebin")){var k=b.getSelection(),u=k.createBookmarks();CKEDITOR.env.ie&&k.root.fire("selectionchange");var l=new CKEDITOR.dom.element(!CKEDITOR.env.webkit&&!g.is("body")||CKEDITOR.env.ie?"div":"body",d);l.setAttributes({id:"cke_pastebin","data-cke-temp":"1"});var f=0,d=d.getWindow();CKEDITOR.env.webkit?(g.append(l),l.addClass("cke_editable"),g.is("body")||(f="static"!=g.getComputedStyle("position")?g:CKEDITOR.dom.element.get(g.$.offsetParent),f=f.getDocumentPosition().y)):g.getAscendant(CKEDITOR.env.ie?
+"body":"html",1).append(l);l.setStyles({position:"absolute",top:d.getScrollPosition().y-f+10+"px",width:"1px",height:Math.max(1,d.getViewPaneSize().height-20)+"px",overflow:"hidden",margin:0,padding:0});CKEDITOR.env.safari&&l.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select","text"));(f=l.getParent().isReadOnly())?(l.setOpacity(0),l.setAttribute("contenteditable",!0)):l.setStyle("ltr"==b.config.contentsLangDirection?"left":"right","-10000px");b.on("selectionChange",e,null,null,0);if(CKEDITOR.env.webkit||
+CKEDITOR.env.gecko)h=g.once("blur",e,null,null,-100);f&&l.focus();f=new CKEDITOR.dom.range(l);f.selectNodeContents(l);var n=f.select();CKEDITOR.env.ie&&(h=g.once("blur",function(){b.lockSelection(n)}));var r=CKEDITOR.document.getWindow().getScrollPosition().y;setTimeout(function(){CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=r);h&&h.removeListener();CKEDITOR.env.ie&&g.focus();k.selectBookmarks(u);l.remove();var a;CKEDITOR.env.webkit&&(a=l.getFirst())&&a.is&&a.hasClass("Apple-style-span")&&
+(l=a);b.removeListener("selectionChange",e);c(l.getHtml())},0)}}function w(){if("paste"==m.mainPasteEvent)return b.fire("beforePaste",{type:"auto",method:"paste"}),!1;b.focus();f();var a=b.focusManager;a.lock();if(b.editable().fire(m.mainPasteEvent)&&!d("paste"))return a.unlock(),!1;a.unlock();return!0}function k(a){if("wysiwyg"==b.mode)switch(a.data.keyCode){case CKEDITOR.CTRL+86:case CKEDITOR.SHIFT+45:a=b.editable();f();"paste"==m.mainPasteEvent&&a.fire("beforepaste");break;case CKEDITOR.CTRL+88:case CKEDITOR.SHIFT+
+46:b.fire("saveSnapshot"),setTimeout(function(){b.fire("saveSnapshot")},50)}}function u(a){var c={type:"auto",method:"paste",dataTransfer:m.initPasteDataTransfer(a)};c.dataTransfer.cacheData();var d=!1!==b.fire("beforePaste",c);d&&m.canClipboardApiBeTrusted(c.dataTransfer,b)?(a.data.preventDefault(),setTimeout(function(){q(b,c)},0)):n(a,function(a){c.dataValue=a.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,"");d&&q(b,c)})}function r(){if("wysiwyg"==b.mode){var a=t("paste");b.getCommand("cut").setState(t("cut"));
+b.getCommand("copy").setState(t("copy"));b.getCommand("paste").setState(a);b.fire("pasteState",a)}}function t(a){if(x&&a in{paste:1,cut:1})return CKEDITOR.TRISTATE_DISABLED;if("paste"==a)return CKEDITOR.TRISTATE_OFF;a=b.getSelection();var c=a.getRanges();return a.getType()==CKEDITOR.SELECTION_NONE||1==c.length&&c[0].collapsed?CKEDITOR.TRISTATE_DISABLED:CKEDITOR.TRISTATE_OFF}var m=CKEDITOR.plugins.clipboard,p=0,v=0,x=0;(function(){b.on("key",k);b.on("contentDom",a);b.on("selectionChange",function(b){x=
+b.data.selection.getRanges()[0].checkReadOnly();r()});b.contextMenu&&b.contextMenu.addListener(function(b,a){x=a.getRanges()[0].checkReadOnly();return{cut:t("cut"),copy:t("copy"),paste:t("paste")}})})();(function(){function a(c,d,g,e,h){var k=b.lang.clipboard[d];b.addCommand(d,g);b.ui.addButton&&b.ui.addButton(c,{label:k,command:d,toolbar:"clipboard,"+e});b.addMenuItems&&b.addMenuItem(d,{label:k,command:d,group:"clipboard",order:h})}a("Cut","cut",c("cut"),10,1);a("Copy","copy",c("copy"),20,4);a("Paste",
+"paste",e(),30,8)})();b.getClipboardData=function(a,c){function d(a){a.removeListener();a.cancel();c(a.data)}function g(a){a.removeListener();a.cancel();f=!0;c({type:k,dataValue:a.data.dataValue,dataTransfer:a.data.dataTransfer,method:"paste"})}function e(){this.customTitle=a&&a.title}var h=!1,k="auto",f=!1;c||(c=a,a=null);b.on("paste",d,null,null,0);b.on("beforePaste",function(a){a.removeListener();h=!0;k=a.data.type},null,null,1E3);!1===w()&&(b.removeListener("paste",d),h&&b.fire("pasteDialog",
+e)?(b.on("pasteDialogCommit",g),b.on("dialogHide",function(a){a.removeListener();a.data.removeListener("pasteDialogCommit",g);setTimeout(function(){f||c(null)},10)})):c(null))}}function A(b){if(CKEDITOR.env.webkit){if(!b.match(/^[^<]*$/g)&&!b.match(/^(<div><br( ?\/)?><\/div>|<div>[^<]*<\/div>)*$/gi))return"html"}else if(CKEDITOR.env.ie){if(!b.match(/^([^<]|<br( ?\/)?>)*$/gi)&&!b.match(/^(<p>([^<]|<br( ?\/)?>)*<\/p>|(\r\n))*$/gi))return"html"}else if(CKEDITOR.env.gecko){if(!b.match(/^([^<]|<br( ?\/)?>)*$/gi))return"html"}else return"html";
+return"htmlifiedtext"}function B(b,a){function c(a){return CKEDITOR.tools.repeat("\x3c/p\x3e\x3cp\x3e",~~(a/2))+(1==a%2?"\x3cbr\x3e":"")}a=a.replace(/\s+/g," ").replace(/> +</g,"\x3e\x3c").replace(/<br ?\/>/gi,"\x3cbr\x3e");a=a.replace(/<\/?[A-Z]+>/g,function(a){return a.toLowerCase()});if(a.match(/^[^<]$/))return a;CKEDITOR.env.webkit&&-1<a.indexOf("\x3cdiv\x3e")&&(a=a.replace(/^(<div>(<br>|)<\/div>)(?!$|(<div>(<br>|)<\/div>))/g,"\x3cbr\x3e").replace(/^(<div>(<br>|)<\/div>){2}(?!$)/g,"\x3cdiv\x3e\x3c/div\x3e"),
+a.match(/<div>(<br>|)<\/div>/)&&(a="\x3cp\x3e"+a.replace(/(<div>(<br>|)<\/div>)+/g,function(a){return c(a.split("\x3c/div\x3e\x3cdiv\x3e").length+1)})+"\x3c/p\x3e"),a=a.replace(/<\/div><div>/g,"\x3cbr\x3e"),a=a.replace(/<\/?div>/g,""));CKEDITOR.env.gecko&&b.enterMode!=CKEDITOR.ENTER_BR&&(CKEDITOR.env.gecko&&(a=a.replace(/^<br><br>$/,"\x3cbr\x3e")),-1<a.indexOf("\x3cbr\x3e\x3cbr\x3e")&&(a="\x3cp\x3e"+a.replace(/(<br>){2,}/g,function(a){return c(a.length/4)})+"\x3c/p\x3e"));return C(b,a)}function D(){function b(){var a=
+{},b;for(b in CKEDITOR.dtd)"$"!=b.charAt(0)&&"div"!=b&&"span"!=b&&(a[b]=1);return a}var a={};return{get:function(c){return"plain-text"==c?a.plainText||(a.plainText=new CKEDITOR.filter("br")):"semantic-content"==c?((c=a.semanticContent)||(c=new CKEDITOR.filter,c.allow({$1:{elements:b(),attributes:!0,styles:!1,classes:!1}}),c=a.semanticContent=c),c):c?new CKEDITOR.filter(c):null}}}function y(b,a,c){a=CKEDITOR.htmlParser.fragment.fromHtml(a);var e=new CKEDITOR.htmlParser.basicWriter;c.applyTo(a,!0,!1,
+b.activeEnterMode);a.writeHtml(e);return e.getHtml()}function C(b,a){b.enterMode==CKEDITOR.ENTER_BR?a=a.replace(/(<\/p><p>)+/g,function(a){return CKEDITOR.tools.repeat("\x3cbr\x3e",a.length/7*2)}).replace(/<\/?p>/g,""):b.enterMode==CKEDITOR.ENTER_DIV&&(a=a.replace(/<(\/)?p>/g,"\x3c$1div\x3e"));return a}function E(b){b.data.preventDefault();b.data.$.dataTransfer.dropEffect="none"}function F(b){var a=CKEDITOR.plugins.clipboard;b.on("contentDom",function(){function c(a,c,d){c.select();q(b,{dataTransfer:d,
+method:"drop"},1);d.sourceEditor.fire("saveSnapshot");d.sourceEditor.editable().extractHtmlFromRange(a);d.sourceEditor.getSelection().selectRanges([a]);d.sourceEditor.fire("saveSnapshot")}function e(d,c){d.select();q(b,{dataTransfer:c,method:"drop"},1);a.resetDragDataTransfer()}function f(a,d,c){var g={$:a.data.$,target:a.data.getTarget()};d&&(g.dragRange=d);c&&(g.dropRange=c);!1===b.fire(a.name,g)&&a.data.preventDefault()}function g(a){a.type!=CKEDITOR.NODE_ELEMENT&&(a=a.getParent());return a.getChildCount()}
+var d=b.editable(),h=CKEDITOR.plugins.clipboard.getDropTarget(b),n=b.ui.space("top"),w=b.ui.space("bottom");a.preventDefaultDropOnElement(n);a.preventDefaultDropOnElement(w);d.attachListener(h,"dragstart",f);d.attachListener(b,"dragstart",a.resetDragDataTransfer,a,null,1);d.attachListener(b,"dragstart",function(d){a.initDragDataTransfer(d,b)},null,null,2);d.attachListener(b,"dragstart",function(){var d=a.dragRange=b.getSelection().getRanges()[0];CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(a.dragStartContainerChildCount=
+d?g(d.startContainer):null,a.dragEndContainerChildCount=d?g(d.endContainer):null)},null,null,100);d.attachListener(h,"dragend",f);d.attachListener(b,"dragend",a.initDragDataTransfer,a,null,1);d.attachListener(b,"dragend",a.resetDragDataTransfer,a,null,100);d.attachListener(h,"dragover",function(a){var b=a.data.getTarget();b&&b.is&&b.is("html")?a.data.preventDefault():CKEDITOR.env.ie&&CKEDITOR.plugins.clipboard.isFileApiSupported&&a.data.$.dataTransfer.types.contains("Files")&&a.data.preventDefault()});
+d.attachListener(h,"drop",function(d){if(!d.data.$.defaultPrevented){d.data.preventDefault();var c=d.data.getTarget();if(!c.isReadOnly()||c.type==CKEDITOR.NODE_ELEMENT&&c.is("html")){var c=a.getRangeAtDropPosition(d,b),g=a.dragRange;c&&f(d,g,c)}}},null,null,9999);d.attachListener(b,"drop",a.initDragDataTransfer,a,null,1);d.attachListener(b,"drop",function(d){if(d=d.data){var g=d.dropRange,h=d.dragRange,f=d.dataTransfer;f.getTransferType(b)==CKEDITOR.DATA_TRANSFER_INTERNAL?setTimeout(function(){a.internalDrop(h,
+g,f,b)},0):f.getTransferType(b)==CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?c(h,g,f):e(g,f)}},null,null,9999)})}CKEDITOR.plugins.add("clipboard",{requires:"dialog",init:function(b){var a,c=D();b.config.forcePasteAsPlainText?a="plain-text":b.config.pasteFilter?a=b.config.pasteFilter:!CKEDITOR.env.webkit||"pasteFilter"in b.config||(a="semantic-content");b.pasteFilter=c.get(a);z(b);F(b);CKEDITOR.dialog.add("paste",CKEDITOR.getUrl(this.path+"dialogs/paste.js"));if(CKEDITOR.env.gecko){var e=["image/png","image/jpeg",
+"image/gif"],f;b.on("paste",function(a){var d=a.data,c=d.dataTransfer;if(!d.dataValue&&"paste"==d.method&&c&&1==c.getFilesCount()&&f!=c.id&&(c=c.getFile(0),-1!=CKEDITOR.tools.indexOf(e,c.type))){var n=new FileReader;n.addEventListener("load",function(){a.data.dataValue='\x3cimg src\x3d"'+n.result+'" /\x3e';b.fire("paste",a.data)},!1);n.addEventListener("abort",function(){b.fire("paste",a.data)},!1);n.addEventListener("error",function(){b.fire("paste",a.data)},!1);n.readAsDataURL(c);f=d.dataTransfer.id;
+a.stop()}},null,null,1)}b.on("paste",function(a){a.data.dataTransfer||(a.data.dataTransfer=new CKEDITOR.plugins.clipboard.dataTransfer);if(!a.data.dataValue){var d=a.data.dataTransfer,c=d.getData("text/html");if(c)a.data.dataValue=c,a.data.type="html";else if(c=d.getData("text/plain"))a.data.dataValue=b.editable().transformPlainTextToHtml(c),a.data.type="text"}},null,null,1);b.on("paste",function(a){var b=a.data.dataValue,c=CKEDITOR.dtd.$block;-1<b.indexOf("Apple-")&&(b=b.replace(/<span class="Apple-converted-space">&nbsp;<\/span>/gi,
+" "),"html"!=a.data.type&&(b=b.replace(/<span class="Apple-tab-span"[^>]*>([^<]*)<\/span>/gi,function(a,b){return b.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;")})),-1<b.indexOf('\x3cbr class\x3d"Apple-interchange-newline"\x3e')&&(a.data.startsWithEOL=1,a.data.preSniffing="html",b=b.replace(/<br class="Apple-interchange-newline">/,"")),b=b.replace(/(<[^>]+) class="Apple-[^"]*"/gi,"$1"));if(b.match(/^<[^<]+cke_(editable|contents)/i)){var e,f,k=new CKEDITOR.dom.element("div");for(k.setHtml(b);1==k.getChildCount()&&
+(e=k.getFirst())&&e.type==CKEDITOR.NODE_ELEMENT&&(e.hasClass("cke_editable")||e.hasClass("cke_contents"));)k=f=e;f&&(b=f.getHtml().replace(/<br>$/i,""))}CKEDITOR.env.ie?b=b.replace(/^&nbsp;(?: |\r\n)?<(\w+)/g,function(b,d){return d.toLowerCase()in c?(a.data.preSniffing="html","\x3c"+d):b}):CKEDITOR.env.webkit?b=b.replace(/<\/(\w+)><div><br><\/div>$/,function(b,d){return d in c?(a.data.endsWithEOL=1,"\x3c/"+d+"\x3e"):b}):CKEDITOR.env.gecko&&(b=b.replace(/(\s)<br>$/,"$1"));a.data.dataValue=b},null,
+null,3);b.on("paste",function(a){a=a.data;var d=a.type,e=a.dataValue,f,p=b.config.clipboard_defaultContentType||"html",k=a.dataTransfer.getTransferType(b);f="html"==d||"html"==a.preSniffing?"html":A(e);"htmlifiedtext"==f&&(e=B(b.config,e));"text"==d&&"html"==f?e=y(b,e,c.get("plain-text")):k==CKEDITOR.DATA_TRANSFER_EXTERNAL&&b.pasteFilter&&!a.dontFilter&&(e=y(b,e,b.pasteFilter));a.startsWithEOL&&(e='\x3cbr data-cke-eol\x3d"1"\x3e'+e);a.endsWithEOL&&(e+='\x3cbr data-cke-eol\x3d"1"\x3e');"auto"==d&&
+(d="html"==f||"html"==p?"html":"text");a.type=d;a.dataValue=e;delete a.preSniffing;delete a.startsWithEOL;delete a.endsWithEOL},null,null,6);b.on("paste",function(a){a=a.data;a.dataValue&&(b.insertHtml(a.dataValue,a.type,a.range),setTimeout(function(){b.fire("afterPaste")},0))},null,null,1E3);b.on("pasteDialog",function(a){setTimeout(function(){b.openDialog("paste",a.data)},0)})}});CKEDITOR.plugins.clipboard={isCustomCopyCutSupported:!CKEDITOR.env.ie&&!CKEDITOR.env.iOS,isCustomDataTypesSupported:!CKEDITOR.env.ie,
+isFileApiSupported:!CKEDITOR.env.ie||9<CKEDITOR.env.version,mainPasteEvent:CKEDITOR.env.ie&&!CKEDITOR.env.edge?"beforepaste":"paste",canClipboardApiBeTrusted:function(b,a){return b.getTransferType(a)!=CKEDITOR.DATA_TRANSFER_EXTERNAL||CKEDITOR.env.chrome&&!b.isEmpty()||CKEDITOR.env.gecko&&(b.getData("text/html")||b.getFilesCount())?!0:!1},getDropTarget:function(b){var a=b.editable();return CKEDITOR.env.ie&&9>CKEDITOR.env.version||a.isInline()?a:b.document},fixSplitNodesAfterDrop:function(b,a,c,e){function f(b,
+c,e){var f=b;f.type==CKEDITOR.NODE_TEXT&&(f=b.getParent());if(f.equals(c)&&e!=c.getChildCount())return b=a.startContainer.getChild(a.startOffset-1),c=a.startContainer.getChild(a.startOffset),b&&b.type==CKEDITOR.NODE_TEXT&&c&&c.type==CKEDITOR.NODE_TEXT&&(e=b.getLength(),b.setText(b.getText()+c.getText()),c.remove(),a.setStart(b,e),a.collapse(!0)),!0}var g=a.startContainer;"number"==typeof e&&"number"==typeof c&&g.type==CKEDITOR.NODE_ELEMENT&&(f(b.startContainer,g,c)||f(b.endContainer,g,e))},isDropRangeAffectedByDragRange:function(b,
+a){var c=a.startContainer,e=a.endOffset;return b.endContainer.equals(c)&&b.endOffset<=e||b.startContainer.getParent().equals(c)&&b.startContainer.getIndex()<e||b.endContainer.getParent().equals(c)&&b.endContainer.getIndex()<e?!0:!1},internalDrop:function(b,a,c,e){var f=CKEDITOR.plugins.clipboard,g=e.editable(),d,h;e.fire("saveSnapshot");e.fire("lockSnapshot",{dontUpdate:1});CKEDITOR.env.ie&&10>CKEDITOR.env.version&&this.fixSplitNodesAfterDrop(b,a,f.dragStartContainerChildCount,f.dragEndContainerChildCount);
+(h=this.isDropRangeAffectedByDragRange(b,a))||(d=b.createBookmark(!1));f=a.clone().createBookmark(!1);h&&(d=b.createBookmark(!1));b=d.startNode;a=d.endNode;h=f.startNode;a&&b.getPosition(h)&CKEDITOR.POSITION_PRECEDING&&a.getPosition(h)&CKEDITOR.POSITION_FOLLOWING&&h.insertBefore(b);b=e.createRange();b.moveToBookmark(d);g.extractHtmlFromRange(b,1);a=e.createRange();a.moveToBookmark(f);q(e,{dataTransfer:c,method:"drop",range:a},1);e.fire("unlockSnapshot")},getRangeAtDropPosition:function(b,a){var c=
+b.data.$,e=c.clientX,f=c.clientY,g=a.getSelection(!0).getRanges()[0],d=a.createRange();if(b.data.testRange)return b.data.testRange;if(document.caretRangeFromPoint)c=a.document.$.caretRangeFromPoint(e,f),d.setStart(CKEDITOR.dom.node(c.startContainer),c.startOffset),d.collapse(!0);else if(c.rangeParent)d.setStart(CKEDITOR.dom.node(c.rangeParent),c.rangeOffset),d.collapse(!0);else{if(CKEDITOR.env.ie&&8<CKEDITOR.env.version&&g&&a.editable().hasFocus)return g;if(document.body.createTextRange){a.focus();
+c=a.document.getBody().$.createTextRange();try{for(var h=!1,n=0;20>n&&!h;n++){if(!h)try{c.moveToPoint(e,f-n),h=!0}catch(p){}if(!h)try{c.moveToPoint(e,f+n),h=!0}catch(k){}}if(h){var u="cke-temp-"+(new Date).getTime();c.pasteHTML('\x3cspan id\x3d"'+u+'"\x3e​\x3c/span\x3e');var r=a.document.getById(u);d.moveToPosition(r,CKEDITOR.POSITION_BEFORE_START);r.remove()}else{var t=a.document.$.elementFromPoint(e,f),m=new CKEDITOR.dom.element(t),q;if(m.equals(a.editable())||"html"==m.getName())return g&&g.startContainer&&
+!g.startContainer.equals(a.editable())?g:null;q=m.getClientRect();e<q.left?d.setStartAt(m,CKEDITOR.POSITION_AFTER_START):d.setStartAt(m,CKEDITOR.POSITION_BEFORE_END);d.collapse(!0)}}catch(v){return null}}else return null}return d},initDragDataTransfer:function(b,a){var c=b.data.$?b.data.$.dataTransfer:null,e=new this.dataTransfer(c,a);c?this.dragData&&e.id==this.dragData.id?e=this.dragData:this.dragData=e:this.dragData?e=this.dragData:this.dragData=e;b.data.dataTransfer=e},resetDragDataTransfer:function(){this.dragData=
+null},initPasteDataTransfer:function(b,a){if(this.isCustomCopyCutSupported){if(b&&b.data&&b.data.$){var c=new this.dataTransfer(b.data.$.clipboardData,a);this.copyCutData&&c.id==this.copyCutData.id?(c=this.copyCutData,c.$=b.data.$.clipboardData):this.copyCutData=c;return c}return new this.dataTransfer(null,a)}return new this.dataTransfer(CKEDITOR.env.edge&&b&&b.data.$&&b.data.$.clipboardData||null,a)},preventDefaultDropOnElement:function(b){b&&b.on("dragover",E)}};var p=CKEDITOR.plugins.clipboard.isCustomDataTypesSupported?
+"cke/id":"Text";CKEDITOR.plugins.clipboard.dataTransfer=function(b,a){b&&(this.$=b);this._={metaRegExp:/^<meta.*?>/i,bodyRegExp:/<body(?:[\s\S]*?)>([\s\S]*)<\/body>/i,fragmentRegExp:/\x3c!--(?:Start|End)Fragment--\x3e/g,data:{},files:[],normalizeType:function(a){a=a.toLowerCase();return"text"==a||"text/plain"==a?"Text":"url"==a?"URL":a}};this.id=this.getData(p);this.id||(this.id="Text"==p?"":"cke-"+CKEDITOR.tools.getUniqueId());if("Text"!=p)try{this.$.setData(p,this.id)}catch(c){}a&&(this.sourceEditor=
+a,this.setData("text/html",a.getSelectedHtml(1)),"Text"==p||this.getData("text/plain")||this.setData("text/plain",a.getSelection().getSelectedText()))};CKEDITOR.DATA_TRANSFER_INTERNAL=1;CKEDITOR.DATA_TRANSFER_CROSS_EDITORS=2;CKEDITOR.DATA_TRANSFER_EXTERNAL=3;CKEDITOR.plugins.clipboard.dataTransfer.prototype={getData:function(b){b=this._.normalizeType(b);var a=this._.data[b];if(void 0===a||null===a||""===a)try{a=this.$.getData(b)}catch(c){}if(void 0===a||null===a||""===a)a="";"text/html"==b?(a=a.replace(this._.metaRegExp,
+""),(b=this._.bodyRegExp.exec(a))&&b.length&&(a=b[1],a=a.replace(this._.fragmentRegExp,""))):"Text"==b&&CKEDITOR.env.gecko&&this.getFilesCount()&&"file://"==a.substring(0,7)&&(a="");return a},setData:function(b,a){b=this._.normalizeType(b);this._.data[b]=a;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported||"URL"==b||"Text"==b){"Text"==p&&"Text"==b&&(this.id=a);try{this.$.setData(b,a)}catch(c){}}},getTransferType:function(b){return this.sourceEditor?this.sourceEditor==b?CKEDITOR.DATA_TRANSFER_INTERNAL:
+CKEDITOR.DATA_TRANSFER_CROSS_EDITORS:CKEDITOR.DATA_TRANSFER_EXTERNAL},cacheData:function(){function b(b){b=a._.normalizeType(b);var c=a.getData(b);c&&(a._.data[b]=c)}if(this.$){var a=this,c,e;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(c=0;c<this.$.types.length;c++)b(this.$.types[c])}else b("Text"),b("URL");e=this._getImageFromClipboard();if(this.$&&this.$.files||e){this._.files=[];if(this.$.files&&this.$.files.length)for(c=0;c<this.$.files.length;c++)this._.files.push(this.$.files[c]);
+0===this._.files.length&&e&&this._.files.push(e)}}},getFilesCount:function(){return this._.files.length?this._.files.length:this.$&&this.$.files&&this.$.files.length?this.$.files.length:this._getImageFromClipboard()?1:0},getFile:function(b){return this._.files.length?this._.files[b]:this.$&&this.$.files&&this.$.files.length?this.$.files[b]:0===b?this._getImageFromClipboard():void 0},isEmpty:function(){var b={},a;if(this.getFilesCount())return!1;for(a in this._.data)b[a]=1;if(this.$)if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(var c=
+0;c<this.$.types.length;c++)b[this.$.types[c]]=1}else b.Text=1,b.URL=1;"Text"!=p&&(b[p]=0);for(a in b)if(b[a]&&""!==this.getData(a))return!1;return!0},_getImageFromClipboard:function(){var b;if(this.$&&this.$.items&&this.$.items[0])try{if((b=this.$.items[0].getAsFile())&&b.type)return b}catch(a){}}}})();(function(){var c='\x3ca id\x3d"{id}" class\x3d"cke_button cke_button__{name} cke_button_{state} {cls}"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' title\x3d"{title}" tabindex\x3d"-1" hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-describedby\x3d"{id}_description" aria-haspopup\x3d"{hasArrow}" aria-disabled\x3d"{ariaDisabled}"';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(c+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(c+=
+' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var c=c+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{style}"'),c=c+'\x3e\x26nbsp;\x3c/span\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_button_label cke_button__{name}_label" aria-hidden\x3d"false"\x3e{label}\x3c/span\x3e\x3cspan id\x3d"{id}_description" class\x3d"cke_button_label" aria-hidden\x3d"false"\x3e{ariaShortcut}\x3c/span\x3e{arrowHtml}\x3c/a\x3e',
+t=CKEDITOR.addTemplate("buttonArrow",'\x3cspan class\x3d"cke_button_arrow"\x3e'+(CKEDITOR.env.hc?"\x26#9660;":"")+"\x3c/span\x3e"),u=CKEDITOR.addTemplate("button",c);CKEDITOR.plugins.add("button",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_BUTTON,CKEDITOR.ui.button.handler)}});CKEDITOR.UI_BUTTON="button";CKEDITOR.ui.button=function(a){CKEDITOR.tools.extend(this,a,{title:a.label,click:a.click||function(b){b.execCommand(a.command)}});this._={}};CKEDITOR.ui.button.handler={create:function(a){return new CKEDITOR.ui.button(a)}};
+CKEDITOR.ui.button.prototype={render:function(a,b){function c(){var f=a.mode;f&&(f=this.modes[f]?void 0!==m[f]?m[f]:CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,f=a.readOnly&&!this.readOnly?CKEDITOR.TRISTATE_DISABLED:f,this.setState(f),this.refresh&&this.refresh())}var n=CKEDITOR.env,p=this._.id=CKEDITOR.tools.getNextId(),g="",d=this.command,q,k,h;this._.editor=a;var e={id:p,button:this,editor:a,focus:function(){CKEDITOR.document.getById(p).focus()},execute:function(){this.button.click(a)},attach:function(a){this.button.attach(a)}},
+v=CKEDITOR.tools.addFunction(function(a){if(e.onkey)return a=new CKEDITOR.dom.event(a),!1!==e.onkey(e,a.getKeystroke())}),w=CKEDITOR.tools.addFunction(function(a){var b;e.onfocus&&(b=!1!==e.onfocus(e,new CKEDITOR.dom.event(a)));return b}),r=0;e.clickFn=q=CKEDITOR.tools.addFunction(function(){r&&(a.unlockSelection(1),r=0);e.execute();n.iOS&&a.focus()});if(this.modes){var m={};a.on("beforeModeUnload",function(){a.mode&&this._.state!=CKEDITOR.TRISTATE_DISABLED&&(m[a.mode]=this._.state)},this);a.on("activeFilterChange",
+c,this);a.on("mode",c,this);!this.readOnly&&a.on("readOnly",c,this)}else d&&(d=a.getCommand(d))&&(d.on("state",function(){this.setState(d.state)},this),g+=d.state==CKEDITOR.TRISTATE_ON?"on":d.state==CKEDITOR.TRISTATE_DISABLED?"disabled":"off");if(this.directional)a.on("contentDirChanged",function(b){var c=CKEDITOR.document.getById(this._.id),d=c.getFirst();b=b.data;b!=a.lang.dir?c.addClass("cke_"+b):c.removeClass("cke_ltr").removeClass("cke_rtl");d.setAttribute("style",CKEDITOR.skin.getIconStyle(l,
+"rtl"==b,this.icon,this.iconOffset))},this);d?(k=a.getCommandKeystroke(d))&&(h=CKEDITOR.tools.keystrokeToString(a.lang.common.keyboard,k)):g+="off";var l=k=this.name||this.command;this.icon&&!/\./.test(this.icon)&&(l=this.icon,this.icon=null);g={id:p,name:k,iconName:l,label:this.label,cls:this.className||"",state:g,ariaDisabled:"disabled"==g?"true":"false",title:this.title+(h?" ("+h.display+")":""),ariaShortcut:h?a.lang.common.keyboardShortcut+" "+h.aria:"",titleJs:n.gecko&&!n.hc?"":(this.title||
+"").replace("'",""),hasArrow:this.hasArrow?"true":"false",keydownFn:v,focusFn:w,clickFn:q,style:CKEDITOR.skin.getIconStyle(l,"rtl"==a.lang.dir,this.icon,this.iconOffset),arrowHtml:this.hasArrow?t.output():""};u.output(g,b);if(this.onRender)this.onRender();return e},setState:function(a){if(this._.state==a)return!1;this._.state=a;var b=CKEDITOR.document.getById(this._.id);return b?(b.setState(a,"cke_button"),a==CKEDITOR.TRISTATE_DISABLED?b.setAttribute("aria-disabled",!0):b.removeAttribute("aria-disabled"),
+this.hasArrow?(a=a==CKEDITOR.TRISTATE_ON?this._.editor.lang.button.selectedLabel.replace(/%1/g,this.label):this.label,CKEDITOR.document.getById(this._.id+"_label").setText(a)):a==CKEDITOR.TRISTATE_ON?b.setAttribute("aria-pressed",!0):b.removeAttribute("aria-pressed"),!0):!1},getState:function(){return this._.state},toFeature:function(a){if(this._.feature)return this._.feature;var b=this;this.allowedContent||this.requiredContent||!this.command||(b=a.getCommand(this.command)||b);return this._.feature=
+b}};CKEDITOR.ui.prototype.addButton=function(a,b){this.add(a,CKEDITOR.UI_BUTTON,b)}})();CKEDITOR.plugins.add("panelbutton",{requires:"button",onLoad:function(){function e(c){var a=this._;a.state!=CKEDITOR.TRISTATE_DISABLED&&(this.createPanel(c),a.on?a.panel.hide():a.panel.showBlock(this._.id,this.document.getById(this._.id),4))}CKEDITOR.ui.panelButton=CKEDITOR.tools.createClass({base:CKEDITOR.ui.button,$:function(c){var a=c.panel||{};delete c.panel;this.base(c);this.document=a.parent&&a.parent.getDocument()||CKEDITOR.document;a.block={attributes:a.attributes};this.hasArrow=a.toolbarRelated=
 !0;this.click=e;this._={panelDefinition:a}},statics:{handler:{create:function(c){return new CKEDITOR.ui.panelButton(c)}}},proto:{createPanel:function(c){var a=this._;if(!a.panel){var f=this._.panelDefinition,e=this._.panelDefinition.block,g=f.parent||CKEDITOR.document.getBody(),d=this._.panel=new CKEDITOR.ui.floatPanel(c,g,f),f=d.addBlock(a.id,e),b=this;d.onShow=function(){b.className&&this.element.addClass(b.className+"_panel");b.setState(CKEDITOR.TRISTATE_ON);a.on=1;b.editorFocus&&c.focus();if(b.onOpen)b.onOpen()};
 d.onHide=function(d){b.className&&this.element.getFirst().removeClass(b.className+"_panel");b.setState(b.modes&&b.modes[c.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);a.on=0;if(!d&&b.onClose)b.onClose()};d.onEscape=function(){d.hide(1);b.document.getById(a.id).focus()};if(this.onBlock)this.onBlock(d,f);f.onHide=function(){a.on=0;b.setState(CKEDITOR.TRISTATE_OFF)}}}}})},beforeInit:function(e){e.ui.addHandler(CKEDITOR.UI_PANELBUTTON,CKEDITOR.ui.panelButton.handler)}});
 CKEDITOR.UI_PANELBUTTON="panelbutton";(function(){CKEDITOR.plugins.add("panel",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_PANEL,CKEDITOR.ui.panel.handler)}});CKEDITOR.UI_PANEL="panel";CKEDITOR.ui.panel=function(a,b){b&&CKEDITOR.tools.extend(this,b);CKEDITOR.tools.extend(this,{className:"",css:[]});this.id=CKEDITOR.tools.getNextId();this.document=a;this.isFramed=this.forceIFrame||this.css.length;this._={blocks:{}}};CKEDITOR.ui.panel.handler={create:function(a){return new CKEDITOR.ui.panel(a)}};var f=CKEDITOR.addTemplate("panel",
@@ -697,60 +717,85 @@ this);k.setStyles({top:n+"px",left:d+"px"});k.setOpacity(1);g&&g()},this);m.isLo
 this.visible&&this._.showBlockParams&&(this.hide(),this.showBlock.apply(this,a))},focus:function(){if(CKEDITOR.env.webkit){var a=CKEDITOR.document.getActive();a&&!a.equals(this._.iframe)&&a.$.blur()}(this._.lastFocused||this._.iframe.getFrameDocument().getWindow()).focus()},blur:function(){var a=this._.iframe.getFrameDocument().getActive();a&&a.is("a")&&(this._.lastFocused=a)},hide:function(a){if(this.visible&&(!this.onHide||!0!==this.onHide.call(this))){this.hideChild();CKEDITOR.env.gecko&&this._.iframe.getFrameDocument().$.activeElement.blur();
 this.element.setStyle("display","none");this.visible=0;this.element.getFirst().removeCustomData("activePanel");if(a=a&&this._.returnFocus)CKEDITOR.env.webkit&&a.type&&a.getWindow().$.focus(),a.focus();delete this._.lastFocused;this._.showBlockParams=null;this._.editor.fire("panelHide",this)}},allowBlur:function(a){var b=this._.panel;void 0!==a&&(b.allowBlur=a);return b.allowBlur},showAsChild:function(a,b,c,f,h,g){if(this._.activeChild!=a||a._.panel._.offsetParentId!=c.getId())this.hideChild(),a.onHide=
 CKEDITOR.tools.bind(function(){CKEDITOR.tools.setTimeout(function(){this._.focused||this.hide()},0,this)},this),this._.activeChild=a,this._.focused=!1,a.showBlock(b,c,f,h,g),this.blur(),(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)&&setTimeout(function(){a.element.getChild(0).$.style.cssText+=""},100)},hideChild:function(a){var b=this._.activeChild;b&&(delete b.onHide,delete this._.activeChild,b.hide(),a&&this.focus())}}});CKEDITOR.on("instanceDestroyed",function(){var a=CKEDITOR.tools.isEmpty(CKEDITOR.instances),
-b;for(b in f){var c=f[b];a?c.destroy():c.element.hide()}a&&(f={})})})();CKEDITOR.plugins.add("colorbutton",{requires:"panelbutton,floatpanel",init:function(c){function r(p,h,e,f){var l=new CKEDITOR.style(k["colorButton_"+h+"Style"]),m=CKEDITOR.tools.getNextId()+"_colorBox";c.ui.add(p,CKEDITOR.UI_PANELBUTTON,{label:e,title:e,modes:{wysiwyg:1},editorFocus:0,toolbar:"colors,"+f,allowedContent:l,requiredContent:l,panel:{css:CKEDITOR.skin.getPath("editor"),attributes:{role:"listbox","aria-label":g.panelTitle}},onBlock:function(a,b){b.autoSize=!0;b.element.addClass("cke_colorblock");
-b.element.setHtml(u(a,h,m));b.element.getDocument().getBody().setStyle("overflow","hidden");CKEDITOR.ui.fire("ready",this);var d=b.keys,e="rtl"==c.lang.dir;d[e?37:39]="next";d[40]="next";d[9]="next";d[e?39:37]="prev";d[38]="prev";d[CKEDITOR.SHIFT+9]="prev";d[32]="click"},refresh:function(){c.activeFilter.check(l)||this.setState(CKEDITOR.TRISTATE_DISABLED)},onOpen:function(){var a=c.getSelection(),a=a&&a.getStartElement(),a=c.elementPath(a),b;if(a){a=a.block||a.blockLimit||c.document.getBody();do b=
-a&&a.getComputedStyle("back"==h?"background-color":"color")||"transparent";while("back"==h&&"transparent"==b&&a&&(a=a.getParent()));b&&"transparent"!=b||(b="#ffffff");!1!==k.colorButton_enableAutomatic&&this._.panel._.iframe.getFrameDocument().getById(m).setStyle("background-color",b);return b}}})}function u(p,h,e){var f=[],l=k.colorButton_colors.split(","),m=c.plugins.colordialog&&!1!==k.colorButton_enableMore,a=l.length+(m?2:1),b=CKEDITOR.tools.addFunction(function(a,b){function d(a){this.removeListener("ok",
-d);this.removeListener("cancel",d);"ok"==a.name&&e(this.getContentElement("picker","selectedColor").getValue(),b)}var e=arguments.callee;if("?"==a)c.openDialog("colordialog",function(){this.on("ok",d);this.on("cancel",d)});else{c.focus();p.hide();c.fire("saveSnapshot");c.removeStyle(new CKEDITOR.style(k["colorButton_"+b+"Style"],{color:"inherit"}));if(a){var f=k["colorButton_"+b+"Style"];f.childRule="back"==b?function(a){return t(a)}:function(a){return!(a.is("a")||a.getElementsByTag("a").count())||
-t(a)};c.applyStyle(new CKEDITOR.style(f,{color:a}))}c.fire("saveSnapshot")}});!1!==k.colorButton_enableAutomatic&&f.push('\x3ca class\x3d"cke_colorauto" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',g.auto,'" onclick\x3d"CKEDITOR.tools.callFunction(',b,",null,'",h,"');return false;\" href\x3d\"javascript:void('",g.auto,'\')" role\x3d"option" aria-posinset\x3d"1" aria-setsize\x3d"',a,'"\x3e\x3ctable role\x3d"presentation" cellspacing\x3d0 cellpadding\x3d0 width\x3d"100%"\x3e\x3ctr\x3e\x3ctd\x3e\x3cspan class\x3d"cke_colorbox" id\x3d"',
-e,'"\x3e\x3c/span\x3e\x3c/td\x3e\x3ctd colspan\x3d7 align\x3dcenter\x3e',g.auto,"\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/a\x3e");f.push('\x3ctable role\x3d"presentation" cellspacing\x3d0 cellpadding\x3d0 width\x3d"100%"\x3e');for(e=0;e<l.length;e++){0===e%8&&f.push("\x3c/tr\x3e\x3ctr\x3e");var d=l[e].split("/"),n=d[0],q=d[1]||n;d[1]||(n="#"+n.replace(/^(.)(.)(.)$/,"$1$1$2$2$3$3"));d=c.lang.colorbutton.colors[q]||q;f.push('\x3ctd\x3e\x3ca class\x3d"cke_colorbox" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',
-d,'" onclick\x3d"CKEDITOR.tools.callFunction(',b,",'",n,"','",h,"'); return false;\" href\x3d\"javascript:void('",d,'\')" role\x3d"option" aria-posinset\x3d"',e+2,'" aria-setsize\x3d"',a,'"\x3e\x3cspan class\x3d"cke_colorbox" style\x3d"background-color:#',q,'"\x3e\x3c/span\x3e\x3c/a\x3e\x3c/td\x3e')}m&&f.push('\x3c/tr\x3e\x3ctr\x3e\x3ctd colspan\x3d8 align\x3dcenter\x3e\x3ca class\x3d"cke_colormore" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',g.more,'" onclick\x3d"CKEDITOR.tools.callFunction(',
-b,",'?','",h,"');return false;\" href\x3d\"javascript:void('",g.more,"')\"",' role\x3d"option" aria-posinset\x3d"',a,'" aria-setsize\x3d"',a,'"\x3e',g.more,"\x3c/a\x3e\x3c/td\x3e");f.push("\x3c/tr\x3e\x3c/table\x3e");return f.join("")}function t(c){return"false"==c.getAttribute("contentEditable")||c.getAttribute("data-nostyle")}var k=c.config,g=c.lang.colorbutton;CKEDITOR.env.hc||(r("TextColor","fore",g.textColorTitle,10),r("BGColor","back",g.bgColorTitle,20))}});
-CKEDITOR.config.colorButton_colors="000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,B22222,A52A2A,DAA520,006400,40E0D0,0000CD,800080,808080,F00,FF8C00,FFD700,008000,0FF,00F,EE82EE,A9A9A9,FFA07A,FFA500,FFFF00,00FF00,AFEEEE,ADD8E6,DDA0DD,D3D3D3,FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF";CKEDITOR.config.colorButton_foreStyle={element:"span",styles:{color:"#(color)"},overrides:[{element:"font",attributes:{color:null}}]};CKEDITOR.config.colorButton_backStyle={element:"span",styles:{"background-color":"#(color)"}};CKEDITOR.plugins.colordialog={requires:"dialog",init:function(b){var c=new CKEDITOR.dialogCommand("colordialog");c.editorFocus=!1;b.addCommand("colordialog",c);CKEDITOR.dialog.add("colordialog",this.path+"dialogs/colordialog.js");b.getColorFromDialog=function(c,f){var d=function(a){this.removeListener("ok",d);this.removeListener("cancel",d);a="ok"==a.name?this.getValueOf("picker","selectedColor"):null;c.call(f,a)},e=function(a){a.on("ok",d);a.on("cancel",d)};b.execCommand("colordialog");if(b._.storedDialogs&&
+b;for(b in f){var c=f[b];a?c.destroy():c.element.hide()}a&&(f={})})})();CKEDITOR.plugins.add("colorbutton",{requires:"panelbutton,floatpanel",init:function(e){function t(a,c,f,g,l){var m=new CKEDITOR.style(k["colorButton_"+c+"Style"]),n=CKEDITOR.tools.getNextId()+"_colorBox";l=l||{};e.ui.add(a,CKEDITOR.UI_PANELBUTTON,{label:f,title:f,modes:{wysiwyg:1},editorFocus:0,toolbar:"colors,"+g,allowedContent:m,requiredContent:m,contentTransformations:l.contentTransformations,panel:{css:CKEDITOR.skin.getPath("editor"),attributes:{role:"listbox","aria-label":h.panelTitle}},onBlock:function(a,
+b){b.autoSize=!0;b.element.addClass("cke_colorblock");b.element.setHtml(x(a,c,n));b.element.getDocument().getBody().setStyle("overflow","hidden");CKEDITOR.ui.fire("ready",this);var d=b.keys,f="rtl"==e.lang.dir;d[f?37:39]="next";d[40]="next";d[9]="next";d[f?39:37]="prev";d[38]="prev";d[CKEDITOR.SHIFT+9]="prev";d[32]="click"},refresh:function(){e.activeFilter.check(m)||this.setState(CKEDITOR.TRISTATE_DISABLED)},onOpen:function(){var a=e.getSelection(),a=a&&a.getStartElement(),a=e.elementPath(a),b;if(a){a=
+a.block||a.blockLimit||e.document.getBody();do b=a&&a.getComputedStyle("back"==c?"background-color":"color")||"transparent";while("back"==c&&"transparent"==b&&a&&(a=a.getParent()));b&&"transparent"!=b||(b="#ffffff");!1!==k.colorButton_enableAutomatic&&this._.panel._.iframe.getFrameDocument().getById(n).setStyle("background-color",b);return b}}})}function x(a,c,f){var g=[],l=k.colorButton_colors.split(","),m=k.colorButton_colorsPerRow||6,n=e.plugins.colordialog&&!1!==k.colorButton_enableMore,p=l.length+
+(n?2:1),b=CKEDITOR.tools.addFunction(function(b,c){function d(a){this.removeListener("ok",d);this.removeListener("cancel",d);"ok"==a.name&&f(this.getContentElement("picker","selectedColor").getValue(),c)}var f=arguments.callee;if("?"==b)e.openDialog("colordialog",function(){this.on("ok",d);this.on("cancel",d)});else{e.focus();a.hide();e.fire("saveSnapshot");e.removeStyle(new CKEDITOR.style(k["colorButton_"+c+"Style"],{color:"inherit"}));if(b){var g=k["colorButton_"+c+"Style"];g.childRule="back"==
+c?function(a){return u(a)}:function(a){return!(a.is("a")||a.getElementsByTag("a").count())||u(a)};e.applyStyle(new CKEDITOR.style(g,{color:b}))}e.fire("saveSnapshot")}});!1!==k.colorButton_enableAutomatic&&g.push('\x3ca class\x3d"cke_colorauto" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',h.auto,'" onclick\x3d"CKEDITOR.tools.callFunction(',b,",null,'",c,"');return false;\" href\x3d\"javascript:void('",h.auto,'\')" role\x3d"option" aria-posinset\x3d"1" aria-setsize\x3d"',p,'"\x3e\x3ctable role\x3d"presentation" cellspacing\x3d0 cellpadding\x3d0 width\x3d"100%"\x3e\x3ctr\x3e\x3ctd colspan\x3d"'+
+m+'" align\x3d"center"\x3e\x3cspan class\x3d"cke_colorbox" id\x3d"',f,'"\x3e\x3c/span\x3e',h.auto,"\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/a\x3e");g.push('\x3ctable role\x3d"presentation" cellspacing\x3d0 cellpadding\x3d0 width\x3d"100%"\x3e');for(f=0;f<l.length;f++){0===f%m&&g.push("\x3c/tr\x3e\x3ctr\x3e");var d=l[f].split("/"),q=d[0],r=d[1]||q;d[1]||(q="#"+q.replace(/^(.)(.)(.)$/,"$1$1$2$2$3$3"));d=e.lang.colorbutton.colors[r]||r;g.push('\x3ctd\x3e\x3ca class\x3d"cke_colorbox" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',
+d,'" onclick\x3d"CKEDITOR.tools.callFunction(',b,",'",q,"','",c,"'); return false;\" href\x3d\"javascript:void('",d,'\')" role\x3d"option" aria-posinset\x3d"',f+2,'" aria-setsize\x3d"',p,'"\x3e\x3cspan class\x3d"cke_colorbox" style\x3d"background-color:#',r,'"\x3e\x3c/span\x3e\x3c/a\x3e\x3c/td\x3e')}n&&g.push('\x3c/tr\x3e\x3ctr\x3e\x3ctd colspan\x3d"'+m+'" align\x3d"center"\x3e\x3ca class\x3d"cke_colormore" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',h.more,'" onclick\x3d"CKEDITOR.tools.callFunction(',
+b,",'?','",c,"');return false;\" href\x3d\"javascript:void('",h.more,"')\"",' role\x3d"option" aria-posinset\x3d"',p,'" aria-setsize\x3d"',p,'"\x3e',h.more,"\x3c/a\x3e\x3c/td\x3e");g.push("\x3c/tr\x3e\x3c/table\x3e");return g.join("")}function u(a){return"false"==a.getAttribute("contentEditable")||a.getAttribute("data-nostyle")}var k=e.config,h=e.lang.colorbutton;if(!CKEDITOR.env.hc){t("TextColor","fore",h.textColorTitle,10,{contentTransformations:[[{element:"font",check:"span{color}",left:function(a){return!!a.attributes.color},
+right:function(a){a.name="span";a.attributes.color&&(a.styles.color=a.attributes.color);delete a.attributes.color}}]]});var v={},w=e.config.colorButton_normalizeBackground;if(void 0===w||w)v.contentTransformations=[[{element:"span",left:function(a){var c=CKEDITOR.tools;if("span"!=a.name||!a.styles||!a.styles.background)return!1;a=c.style.parse.background(a.styles.background);return a.color&&1===c.objectKeys(a).length},right:function(a){var c=(new CKEDITOR.style(e.config.colorButton_backStyle,{color:a.styles.background})).getDefinition();
+a.name=c.element;a.styles=c.styles;a.attributes=c.attributes||{};return a}}]];t("BGColor","back",h.bgColorTitle,20,v)}}});CKEDITOR.config.colorButton_colors="1ABC9C,2ECC71,3498DB,9B59B6,4E5F70,F1C40F,16A085,27AE60,2980B9,8E44AD,2C3E50,F39C12,E67E22,E74C3C,ECF0F1,95A5A6,DDD,FFF,D35400,C0392B,BDC3C7,7F8C8D,999,000";CKEDITOR.config.colorButton_foreStyle={element:"span",styles:{color:"#(color)"},overrides:[{element:"font",attributes:{color:null}}]};
+CKEDITOR.config.colorButton_backStyle={element:"span",styles:{"background-color":"#(color)"}};CKEDITOR.plugins.colordialog={requires:"dialog",init:function(b){var c=new CKEDITOR.dialogCommand("colordialog");c.editorFocus=!1;b.addCommand("colordialog",c);CKEDITOR.dialog.add("colordialog",this.path+"dialogs/colordialog.js");b.getColorFromDialog=function(c,f){var d=function(a){this.removeListener("ok",d);this.removeListener("cancel",d);a="ok"==a.name?this.getValueOf("picker","selectedColor"):null;c.call(f,a)},e=function(a){a.on("ok",d);a.on("cancel",d)};b.execCommand("colordialog");if(b._.storedDialogs&&
 b._.storedDialogs.colordialog)e(b._.storedDialogs.colordialog);else CKEDITOR.on("dialogDefinition",function(a){if("colordialog"==a.data.name){var b=a.data.definition;a.removeListener();b.onLoad=CKEDITOR.tools.override(b.onLoad,function(a){return function(){e(this);b.onLoad=a;"function"==typeof a&&a.call(this)}})}})}}};CKEDITOR.plugins.add("colordialog",CKEDITOR.plugins.colordialog);(function(){CKEDITOR.plugins.add("templates",{requires:"dialog",init:function(a){CKEDITOR.dialog.add("templates",CKEDITOR.getUrl(this.path+"dialogs/templates.js"));a.addCommand("templates",new CKEDITOR.dialogCommand("templates"));a.ui.addButton&&a.ui.addButton("Templates",{label:a.lang.templates.button,command:"templates",toolbar:"doctools,10"})}});var c={},f={};CKEDITOR.addTemplates=function(a,d){c[a]=d};CKEDITOR.getTemplates=function(a){return c[a]};CKEDITOR.loadTemplates=function(a,d){for(var e=
-[],b=0,c=a.length;b<c;b++)f[a[b]]||(e.push(a[b]),f[a[b]]=1);e.length?CKEDITOR.scriptLoader.load(e,d):setTimeout(d,0)}})();CKEDITOR.config.templates_files=[CKEDITOR.getUrl("plugins/templates/templates/default.js")];CKEDITOR.config.templates_replaceContent=!0;CKEDITOR.plugins.add("menu",{requires:"floatpanel",beforeInit:function(g){for(var h=g.config.menu_groups.split(","),p=g._.menuGroups={},n=g._.menuItems={},a=0;a<h.length;a++)p[h[a]]=a+1;g.addMenuGroup=function(b,a){p[b]=a||100};g.addMenuItem=function(a,c){p[c.group]&&(n[a]=new CKEDITOR.menuItem(this,a,c))};g.addMenuItems=function(a){for(var c in a)this.addMenuItem(c,a[c])};g.getMenuItem=function(a){return n[a]};g.removeMenuItem=function(a){delete n[a]}}});
-(function(){function g(a){a.sort(function(a,c){return a.group<c.group?-1:a.group>c.group?1:a.order<c.order?-1:a.order>c.order?1:0})}var h='\x3cspan class\x3d"cke_menuitem"\x3e\x3ca id\x3d"{id}" class\x3d"cke_menubutton cke_menubutton__{name} cke_menubutton_{state} {cls}" href\x3d"{href}" title\x3d"{title}" tabindex\x3d"-1"_cke_focus\x3d1 hidefocus\x3d"true" role\x3d"{role}" aria-haspopup\x3d"{hasPopup}" aria-disabled\x3d"{disabled}" {ariaChecked}';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(h+=' onkeypress\x3d"return false;"');
-CKEDITOR.env.gecko&&(h+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var h=h+(' onmouseover\x3d"CKEDITOR.tools.callFunction({hoverFn},{index});" onmouseout\x3d"CKEDITOR.tools.callFunction({moveOutFn},{index});" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},{index}); return false;"\x3e'),p=CKEDITOR.addTemplate("menuItem",h+'\x3cspan class\x3d"cke_menubutton_inner"\x3e\x3cspan class\x3d"cke_menubutton_icon"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{iconStyle}"\x3e\x3c/span\x3e\x3c/span\x3e\x3cspan class\x3d"cke_menubutton_label"\x3e{label}\x3c/span\x3e{arrowHtml}\x3c/span\x3e\x3c/a\x3e\x3c/span\x3e'),
-n=CKEDITOR.addTemplate("menuArrow",'\x3cspan class\x3d"cke_menuarrow"\x3e\x3cspan\x3e{label}\x3c/span\x3e\x3c/span\x3e');CKEDITOR.menu=CKEDITOR.tools.createClass({$:function(a,b){b=this._.definition=b||{};this.id=CKEDITOR.tools.getNextId();this.editor=a;this.items=[];this._.listeners=[];this._.level=b.level||1;var c=CKEDITOR.tools.extend({},b.panel,{css:[CKEDITOR.skin.getPath("editor")],level:this._.level-1,block:{}}),m=c.block.attributes=c.attributes||{};!m.role&&(m.role="menu");this._.panelDefinition=
-c},_:{onShow:function(){var a=this.editor.getSelection(),b=a&&a.getStartElement(),c=this.editor.elementPath(),m=this._.listeners;this.removeAll();for(var e=0;e<m.length;e++){var l=m[e](b,a,c);if(l)for(var k in l){var f=this.editor.getMenuItem(k);!f||f.command&&!this.editor.getCommand(f.command).state||(f.state=l[k],this.add(f))}}},onClick:function(a){this.hide();if(a.onClick)a.onClick();else a.command&&this.editor.execCommand(a.command)},onEscape:function(a){var b=this.parent;b?b._.panel.hideChild(1):
-27==a&&this.hide(1);return!1},onHide:function(){this.onHide&&this.onHide()},showSubMenu:function(a){var b=this._.subMenu,c=this.items[a];if(c=c.getItems&&c.getItems()){b?b.removeAll():(b=this._.subMenu=new CKEDITOR.menu(this.editor,CKEDITOR.tools.extend({},this._.definition,{level:this._.level+1},!0)),b.parent=this,b._.onClick=CKEDITOR.tools.bind(this._.onClick,this));for(var m in c){var e=this.editor.getMenuItem(m);e&&(e.state=c[m],b.add(e))}var l=this._.panel.getBlock(this.id).element.getDocument().getById(this.id+
-String(a));setTimeout(function(){b.show(l,2)},0)}else this._.panel.hideChild(1)}},proto:{add:function(a){a.order||(a.order=this.items.length);this.items.push(a)},removeAll:function(){this.items=[]},show:function(a,b,c,m){if(!this.parent&&(this._.onShow(),!this.items.length))return;b=b||("rtl"==this.editor.lang.dir?2:1);var e=this.items,l=this.editor,k=this._.panel,f=this._.element;if(!k){k=this._.panel=new CKEDITOR.ui.floatPanel(this.editor,CKEDITOR.document.getBody(),this._.panelDefinition,this._.level);
-k.onEscape=CKEDITOR.tools.bind(function(a){if(!1===this._.onEscape(a))return!1},this);k.onShow=function(){k._.panel.getHolderElement().getParent().addClass("cke").addClass("cke_reset_all")};k.onHide=CKEDITOR.tools.bind(function(){this._.onHide&&this._.onHide()},this);f=k.addBlock(this.id,this._.panelDefinition.block);f.autoSize=!0;var d=f.keys;d[40]="next";d[9]="next";d[38]="prev";d[CKEDITOR.SHIFT+9]="prev";d["rtl"==l.lang.dir?37:39]=CKEDITOR.env.ie?"mouseup":"click";d[32]=CKEDITOR.env.ie?"mouseup":
-"click";CKEDITOR.env.ie&&(d[13]="mouseup");f=this._.element=f.element;d=f.getDocument();d.getBody().setStyle("overflow","hidden");d.getElementsByTag("html").getItem(0).setStyle("overflow","hidden");this._.itemOverFn=CKEDITOR.tools.addFunction(function(a){clearTimeout(this._.showSubTimeout);this._.showSubTimeout=CKEDITOR.tools.setTimeout(this._.showSubMenu,l.config.menu_subMenuDelay||400,this,[a])},this);this._.itemOutFn=CKEDITOR.tools.addFunction(function(){clearTimeout(this._.showSubTimeout)},this);
-this._.itemClickFn=CKEDITOR.tools.addFunction(function(a){var b=this.items[a];if(b.state==CKEDITOR.TRISTATE_DISABLED)this.hide(1);else if(b.getItems)this._.showSubMenu(a);else this._.onClick(b)},this)}g(e);for(var d=l.elementPath(),d=['\x3cdiv class\x3d"cke_menu'+(d&&d.direction()!=l.lang.dir?" cke_mixed_dir_content":"")+'" role\x3d"presentation"\x3e'],h=e.length,p=h&&e[0].group,n=0;n<h;n++){var q=e[n];p!=q.group&&(d.push('\x3cdiv class\x3d"cke_menuseparator" role\x3d"separator"\x3e\x3c/div\x3e'),
-p=q.group);q.render(this,n,d)}d.push("\x3c/div\x3e");f.setHtml(d.join(""));CKEDITOR.ui.fire("ready",this);this.parent?this.parent._.panel.showAsChild(k,this.id,a,b,c,m):k.showBlock(this.id,a,b,c,m);l.fire("menuShow",[k])},addListener:function(a){this._.listeners.push(a)},hide:function(a){this._.onHide&&this._.onHide();this._.panel&&this._.panel.hide(a)}}});CKEDITOR.menuItem=CKEDITOR.tools.createClass({$:function(a,b,c){CKEDITOR.tools.extend(this,c,{order:0,className:"cke_menubutton__"+b});this.group=
-a._.menuGroups[this.group];this.editor=a;this.name=b},proto:{render:function(a,b,c){var h=a.id+String(b),e="undefined"==typeof this.state?CKEDITOR.TRISTATE_OFF:this.state,l="",k=e==CKEDITOR.TRISTATE_ON?"on":e==CKEDITOR.TRISTATE_DISABLED?"disabled":"off";this.role in{menuitemcheckbox:1,menuitemradio:1}&&(l=' aria-checked\x3d"'+(e==CKEDITOR.TRISTATE_ON?"true":"false")+'"');var f=this.getItems,d="\x26#"+("rtl"==this.editor.lang.dir?"9668":"9658")+";",g=this.name;this.icon&&!/\./.test(this.icon)&&(g=
-this.icon);a={id:h,name:this.name,iconName:g,label:this.label,cls:this.className||"",state:k,hasPopup:f?"true":"false",disabled:e==CKEDITOR.TRISTATE_DISABLED,title:this.label,href:"javascript:void('"+(this.label||"").replace("'")+"')",hoverFn:a._.itemOverFn,moveOutFn:a._.itemOutFn,clickFn:a._.itemClickFn,index:b,iconStyle:CKEDITOR.skin.getIconStyle(g,"rtl"==this.editor.lang.dir,g==this.icon?null:this.icon,this.iconOffset),arrowHtml:f?n.output({label:d}):"",role:this.role?this.role:"menuitem",ariaChecked:l};
-p.output(a,c)}}})})();CKEDITOR.config.menu_groups="clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div";CKEDITOR.plugins.add("contextmenu",{requires:"menu",onLoad:function(){CKEDITOR.plugins.contextMenu=CKEDITOR.tools.createClass({base:CKEDITOR.menu,$:function(a){this.base.call(this,a,{panel:{className:"cke_menu_panel",attributes:{"aria-label":a.lang.contextmenu.options}}})},proto:{addTarget:function(a,e){a.on("contextmenu",function(a){a=a.data;var c=CKEDITOR.env.webkit?f:CKEDITOR.env.mac?a.$.metaKey:a.$.ctrlKey;if(!e||!c){a.preventDefault();if(CKEDITOR.env.mac&&CKEDITOR.env.webkit){var c=this.editor,
+[],b=0,c=a.length;b<c;b++)f[a[b]]||(e.push(a[b]),f[a[b]]=1);e.length?CKEDITOR.scriptLoader.load(e,d):setTimeout(d,0)}})();CKEDITOR.config.templates_files=[CKEDITOR.getUrl("plugins/templates/templates/default.js")];CKEDITOR.config.templates_replaceContent=!0;CKEDITOR.plugins.add("menu",{requires:"floatpanel",beforeInit:function(l){for(var h=l.config.menu_groups.split(","),r=l._.menuGroups={},t=l._.menuItems={},n=0;n<h.length;n++)r[h[n]]=n+1;l.addMenuGroup=function(a,b){r[a]=b||100};l.addMenuItem=function(a,b){r[b.group]&&(t[a]=new CKEDITOR.menuItem(this,a,b))};l.addMenuItems=function(a){for(var b in a)this.addMenuItem(b,a[b])};l.getMenuItem=function(a){return t[a]};l.removeMenuItem=function(a){delete t[a]}}});
+(function(){function l(a){a.sort(function(a,d){return a.group<d.group?-1:a.group>d.group?1:a.order<d.order?-1:a.order>d.order?1:0})}var h='\x3cspan class\x3d"cke_menuitem"\x3e\x3ca id\x3d"{id}" class\x3d"cke_menubutton cke_menubutton__{name} cke_menubutton_{state} {cls}" href\x3d"{href}" title\x3d"{title}" tabindex\x3d"-1" _cke_focus\x3d1 hidefocus\x3d"true" role\x3d"{role}" aria-label\x3d"{label}" aria-describedby\x3d"{id}_description" aria-haspopup\x3d"{hasPopup}" aria-disabled\x3d"{disabled}" {ariaChecked} draggable\x3d"false"';
+CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(h+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(h+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;" ondragstart\x3d"return false;"');var h=h+(' onmouseover\x3d"CKEDITOR.tools.callFunction({hoverFn},{index});" onmouseout\x3d"CKEDITOR.tools.callFunction({moveOutFn},{index});" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},{index}); return false;"\x3e'),r=CKEDITOR.addTemplate("menuItem",
+h+'\x3cspan class\x3d"cke_menubutton_inner"\x3e\x3cspan class\x3d"cke_menubutton_icon"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{iconStyle}"\x3e\x3c/span\x3e\x3c/span\x3e\x3cspan class\x3d"cke_menubutton_label"\x3e{label}\x3c/span\x3e{shortcutHtml}{arrowHtml}\x3c/span\x3e\x3c/a\x3e\x3cspan id\x3d"{id}_description" class\x3d"cke_voice_label" aria-hidden\x3d"false"\x3e{ariaShortcut}\x3c/span\x3e\x3c/span\x3e'),t=CKEDITOR.addTemplate("menuArrow",'\x3cspan class\x3d"cke_menuarrow"\x3e\x3cspan\x3e{label}\x3c/span\x3e\x3c/span\x3e'),
+n=CKEDITOR.addTemplate("menuShortcut",'\x3cspan class\x3d"cke_menubutton_label cke_menubutton_shortcut"\x3e{shortcut}\x3c/span\x3e');CKEDITOR.menu=CKEDITOR.tools.createClass({$:function(a,b){b=this._.definition=b||{};this.id=CKEDITOR.tools.getNextId();this.editor=a;this.items=[];this._.listeners=[];this._.level=b.level||1;var d=CKEDITOR.tools.extend({},b.panel,{css:[CKEDITOR.skin.getPath("editor")],level:this._.level-1,block:{}}),m=d.block.attributes=d.attributes||{};!m.role&&(m.role="menu");this._.panelDefinition=
+d},_:{onShow:function(){var a=this.editor.getSelection(),b=a&&a.getStartElement(),d=this.editor.elementPath(),m=this._.listeners;this.removeAll();for(var g=0;g<m.length;g++){var k=m[g](b,a,d);if(k)for(var e in k){var f=this.editor.getMenuItem(e);!f||f.command&&!this.editor.getCommand(f.command).state||(f.state=k[e],this.add(f))}}},onClick:function(a){this.hide();if(a.onClick)a.onClick();else a.command&&this.editor.execCommand(a.command)},onEscape:function(a){var b=this.parent;b?b._.panel.hideChild(1):
+27==a&&this.hide(1);return!1},onHide:function(){this.onHide&&this.onHide()},showSubMenu:function(a){var b=this._.subMenu,d=this.items[a];if(d=d.getItems&&d.getItems()){b?b.removeAll():(b=this._.subMenu=new CKEDITOR.menu(this.editor,CKEDITOR.tools.extend({},this._.definition,{level:this._.level+1},!0)),b.parent=this,b._.onClick=CKEDITOR.tools.bind(this._.onClick,this));for(var m in d){var g=this.editor.getMenuItem(m);g&&(g.state=d[m],b.add(g))}var k=this._.panel.getBlock(this.id).element.getDocument().getById(this.id+
+String(a));setTimeout(function(){b.show(k,2)},0)}else this._.panel.hideChild(1)}},proto:{add:function(a){a.order||(a.order=this.items.length);this.items.push(a)},removeAll:function(){this.items=[]},show:function(a,b,d,m){if(!this.parent&&(this._.onShow(),!this.items.length))return;b=b||("rtl"==this.editor.lang.dir?2:1);var g=this.items,k=this.editor,e=this._.panel,f=this._.element;if(!e){e=this._.panel=new CKEDITOR.ui.floatPanel(this.editor,CKEDITOR.document.getBody(),this._.panelDefinition,this._.level);
+e.onEscape=CKEDITOR.tools.bind(function(a){if(!1===this._.onEscape(a))return!1},this);e.onShow=function(){e._.panel.getHolderElement().getParent().addClass("cke").addClass("cke_reset_all")};e.onHide=CKEDITOR.tools.bind(function(){this._.onHide&&this._.onHide()},this);f=e.addBlock(this.id,this._.panelDefinition.block);f.autoSize=!0;var c=f.keys;c[40]="next";c[9]="next";c[38]="prev";c[CKEDITOR.SHIFT+9]="prev";c["rtl"==k.lang.dir?37:39]=CKEDITOR.env.ie?"mouseup":"click";c[32]=CKEDITOR.env.ie?"mouseup":
+"click";CKEDITOR.env.ie&&(c[13]="mouseup");f=this._.element=f.element;c=f.getDocument();c.getBody().setStyle("overflow","hidden");c.getElementsByTag("html").getItem(0).setStyle("overflow","hidden");this._.itemOverFn=CKEDITOR.tools.addFunction(function(a){clearTimeout(this._.showSubTimeout);this._.showSubTimeout=CKEDITOR.tools.setTimeout(this._.showSubMenu,k.config.menu_subMenuDelay||400,this,[a])},this);this._.itemOutFn=CKEDITOR.tools.addFunction(function(){clearTimeout(this._.showSubTimeout)},this);
+this._.itemClickFn=CKEDITOR.tools.addFunction(function(a){var b=this.items[a];if(b.state==CKEDITOR.TRISTATE_DISABLED)this.hide(1);else if(b.getItems)this._.showSubMenu(a);else this._.onClick(b)},this)}l(g);for(var c=k.elementPath(),c=['\x3cdiv class\x3d"cke_menu'+(c&&c.direction()!=k.lang.dir?" cke_mixed_dir_content":"")+'" role\x3d"presentation"\x3e'],h=g.length,n=h&&g[0].group,q=0;q<h;q++){var p=g[q];n!=p.group&&(c.push('\x3cdiv class\x3d"cke_menuseparator" role\x3d"separator"\x3e\x3c/div\x3e'),
+n=p.group);p.render(this,q,c)}c.push("\x3c/div\x3e");f.setHtml(c.join(""));CKEDITOR.ui.fire("ready",this);this.parent?this.parent._.panel.showAsChild(e,this.id,a,b,d,m):e.showBlock(this.id,a,b,d,m);k.fire("menuShow",[e])},addListener:function(a){this._.listeners.push(a)},hide:function(a){this._.onHide&&this._.onHide();this._.panel&&this._.panel.hide(a)}}});CKEDITOR.menuItem=CKEDITOR.tools.createClass({$:function(a,b,d){CKEDITOR.tools.extend(this,d,{order:0,className:"cke_menubutton__"+b});this.group=
+a._.menuGroups[this.group];this.editor=a;this.name=b},proto:{render:function(a,b,d){var h=a.id+String(b),g="undefined"==typeof this.state?CKEDITOR.TRISTATE_OFF:this.state,k="",e=this.editor,f,c,l=g==CKEDITOR.TRISTATE_ON?"on":g==CKEDITOR.TRISTATE_DISABLED?"disabled":"off";this.role in{menuitemcheckbox:1,menuitemradio:1}&&(k=' aria-checked\x3d"'+(g==CKEDITOR.TRISTATE_ON?"true":"false")+'"');var u=this.getItems,q="\x26#"+("rtl"==this.editor.lang.dir?"9668":"9658")+";",p=this.name;this.icon&&!/\./.test(this.icon)&&
+(p=this.icon);this.command&&(f=e.getCommand(this.command),(f=e.getCommandKeystroke(f))&&(c=CKEDITOR.tools.keystrokeToString(e.lang.common.keyboard,f)));a={id:h,name:this.name,iconName:p,label:this.label,cls:this.className||"",state:l,hasPopup:u?"true":"false",disabled:g==CKEDITOR.TRISTATE_DISABLED,title:this.label+(c?" ("+c.display+")":""),ariaShortcut:c?e.lang.common.keyboardShortcut+" "+c.aria:"",href:"javascript:void('"+(this.label||"").replace("'")+"')",hoverFn:a._.itemOverFn,moveOutFn:a._.itemOutFn,
+clickFn:a._.itemClickFn,index:b,iconStyle:CKEDITOR.skin.getIconStyle(p,"rtl"==this.editor.lang.dir,p==this.icon?null:this.icon,this.iconOffset),shortcutHtml:c?n.output({shortcut:c.display}):"",arrowHtml:u?t.output({label:q}):"",role:this.role?this.role:"menuitem",ariaChecked:k};r.output(a,d)}}})})();CKEDITOR.config.menu_groups="clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div";CKEDITOR.plugins.add("contextmenu",{requires:"menu",onLoad:function(){CKEDITOR.plugins.contextMenu=CKEDITOR.tools.createClass({base:CKEDITOR.menu,$:function(a){this.base.call(this,a,{panel:{className:"cke_menu_panel",attributes:{"aria-label":a.lang.contextmenu.options}}})},proto:{addTarget:function(a,e){a.on("contextmenu",function(a){a=a.data;var c=CKEDITOR.env.webkit?f:CKEDITOR.env.mac?a.$.metaKey:a.$.ctrlKey;if(!e||!c){a.preventDefault();if(CKEDITOR.env.mac&&CKEDITOR.env.webkit){var c=this.editor,
 b=(new CKEDITOR.dom.elementPath(a.getTarget(),c.editable())).contains(function(a){return a.hasAttribute("contenteditable")},!0);b&&"false"==b.getAttribute("contenteditable")&&c.getSelection().fake(b)}var b=a.getTarget().getDocument(),d=a.getTarget().getDocument().getDocumentElement(),c=!b.equals(CKEDITOR.document),b=b.getWindow().getScrollPosition(),g=c?a.$.clientX:a.$.pageX||b.x+a.$.clientX,h=c?a.$.clientY:a.$.pageY||b.y+a.$.clientY;CKEDITOR.tools.setTimeout(function(){this.open(d,null,g,h)},CKEDITOR.env.ie?
 200:0,this)}},this);if(CKEDITOR.env.webkit){var f,d=function(){f=0};a.on("keydown",function(a){f=CKEDITOR.env.mac?a.data.$.metaKey:a.data.$.ctrlKey});a.on("keyup",d);a.on("contextmenu",d)}},open:function(a,e,f,d){this.editor.focus();a=a||CKEDITOR.document.getDocumentElement();this.editor.selectionChange(1);this.show(a,e,f,d)}}})},beforeInit:function(a){var e=a.contextMenu=new CKEDITOR.plugins.contextMenu(a);a.on("contentDom",function(){e.addTarget(a.editable(),!1!==a.config.browserContextMenuOnCtrl)});
-a.addCommand("contextMenu",{exec:function(){a.contextMenu.open(a.document.getBody())}});a.setKeystroke(CKEDITOR.SHIFT+121,"contextMenu");a.setKeystroke(CKEDITOR.CTRL+CKEDITOR.SHIFT+121,"contextMenu")}});(function(){CKEDITOR.plugins.add("div",{requires:"dialog",init:function(a){if(!a.blockless){var c=a.lang.div,b="div(*)";CKEDITOR.dialog.isTabEnabled(a,"editdiv","advanced")&&(b+=";div[dir,id,lang,title]{*}");a.addCommand("creatediv",new CKEDITOR.dialogCommand("creatediv",{allowedContent:b,requiredContent:"div",contextSensitive:!0,refresh:function(a,c){this.setState("div"in(a.config.div_wrapTable?c.root:c.blockLimit).getDtd()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)}}));a.addCommand("editdiv",
-new CKEDITOR.dialogCommand("editdiv",{requiredContent:"div"}));a.addCommand("removediv",{requiredContent:"div",exec:function(a){function c(b){(b=CKEDITOR.plugins.div.getSurroundDiv(a,b))&&!b.data("cke-div-added")&&(f.push(b),b.data("cke-div-added"))}for(var b=a.getSelection(),g=b&&b.getRanges(),e,h=b.createBookmarks(),f=[],d=0;d<g.length;d++)e=g[d],e.collapsed?c(b.getStartElement()):(e=new CKEDITOR.dom.walker(e),e.evaluator=c,e.lastForward());for(d=0;d<f.length;d++)f[d].remove(!0);b.selectBookmarks(h)}});
-a.ui.addButton&&a.ui.addButton("CreateDiv",{label:c.toolbar,command:"creatediv",toolbar:"blocks,50"});a.addMenuItems&&(a.addMenuItems({editdiv:{label:c.edit,command:"editdiv",group:"div",order:1},removediv:{label:c.remove,command:"removediv",group:"div",order:5}}),a.contextMenu&&a.contextMenu.addListener(function(b){return!b||b.isReadOnly()?null:CKEDITOR.plugins.div.getSurroundDiv(a)?{editdiv:CKEDITOR.TRISTATE_OFF,removediv:CKEDITOR.TRISTATE_OFF}:null}));CKEDITOR.dialog.add("creatediv",this.path+
-"dialogs/div.js");CKEDITOR.dialog.add("editdiv",this.path+"dialogs/div.js")}}});CKEDITOR.plugins.div={getSurroundDiv:function(a,c){var b=a.elementPath(c);return a.elementPath(b.blockLimit).contains(function(a){return a.is("div")&&!a.isReadOnly()},1)}}})();CKEDITOR.plugins.add("resize",{init:function(b){function f(d){var e=c.width,m=c.height,f=e+(d.data.$.screenX-n.x)*("rtl"==g?-1:1);d=m+(d.data.$.screenY-n.y);h&&(e=Math.max(a.resize_minWidth,Math.min(f,a.resize_maxWidth)));p&&(m=Math.max(a.resize_minHeight,Math.min(d,a.resize_maxHeight)));b.resize(h?e:null,m)}function k(){CKEDITOR.document.removeListener("mousemove",f);CKEDITOR.document.removeListener("mouseup",k);b.document&&(b.document.removeListener("mousemove",f),b.document.removeListener("mouseup",
+a.addCommand("contextMenu",{exec:function(){a.contextMenu.open(a.document.getBody())}});a.setKeystroke(CKEDITOR.SHIFT+121,"contextMenu");a.setKeystroke(CKEDITOR.CTRL+CKEDITOR.SHIFT+121,"contextMenu")}});(function(){function r(a){var b=(a=a.data)&&a.$;return a&&b?CKEDITOR.env.ie&&9>CKEDITOR.env.version?1===b.button:0===b.button:!1}function k(a,b,e,d){var c=new CKEDITOR.dom.walker(a);if(a=a.startContainer.getAscendant(b,!0)||a.endContainer.getAscendant(b,!0))if(e(a),d)return;for(;a=c.next();)if(a=a.getAscendant(b,!0))if(e(a),d)break}function u(a,b){var e={ul:"ol",ol:"ul"};return-1!==l(b,function(b){return b.element===a||b.element===e[a]})}function q(a){this.styles=null;this.sticky=!1;this.editor=a;
+this.filter=new CKEDITOR.filter(a.config.copyFormatting_allowRules);!0===a.config.copyFormatting_allowRules&&(this.filter.disabled=!0);a.config.copyFormatting_disallowRules&&this.filter.disallow(a.config.copyFormatting_disallowRules)}var l=CKEDITOR.tools.indexOf,t=!1;CKEDITOR.plugins.add("copyformatting",{lang:"en",icons:"copyformatting",hidpi:!0,init:function(a){var b=CKEDITOR.plugins.copyformatting;b._addScreenReaderContainer();t||(CKEDITOR.document.appendStyleSheet(this.path+"styles/copyformatting.css"),
+t=!0);a.addContentsCss&&a.addContentsCss(this.path+"styles/copyformatting.css");a.copyFormatting=new b.state(a);a.addCommand("copyFormatting",b.commands.copyFormatting);a.addCommand("applyFormatting",b.commands.applyFormatting);a.ui.addButton("CopyFormatting",{label:a.lang.copyformatting.label,command:"copyFormatting",toolbar:"cleanup,0"});a.on("contentDom",function(){var e=a.editable(),b=e.isInline()?e:a.document,c=a.ui.get("CopyFormatting");e.attachListener(b,"mouseup",function(b){r(b)&&a.execCommand("applyFormatting")});
+e.attachListener(CKEDITOR.document,"mouseup",function(b){var d=a.getCommand("copyFormatting");r(b)&&d.state===CKEDITOR.TRISTATE_ON&&!e.contains(b.data.getTarget())&&a.execCommand("copyFormatting")});c&&(b=CKEDITOR.document.getById(c._.id),e.attachListener(b,"dblclick",function(){a.execCommand("copyFormatting",{sticky:!0})}),e.attachListener(b,"mouseup",function(a){a.data.stopPropagation()}))});a.config.copyFormatting_keystrokeCopy&&a.setKeystroke(a.config.copyFormatting_keystrokeCopy,"copyFormatting");
+a.config.copyFormatting_keystrokePaste&&a.setKeystroke(a.config.copyFormatting_keystrokePaste,"applyFormatting");a.on("key",function(b){var d=a.getCommand("copyFormatting");b=b.data.domEvent;b.getKeystroke&&27===b.getKeystroke()&&d.state===CKEDITOR.TRISTATE_ON&&a.execCommand("copyFormatting")});a.copyFormatting.on("extractFormatting",function(e){var d=e.data.element;if(d.contains(a.editable())||d.equals(a.editable()))return e.cancel();d=b._convertElementToStyleDef(d);if(!a.copyFormatting.filter.check(new CKEDITOR.style(d),
+!0,!0))return e.cancel();e.data.styleDef=d});a.copyFormatting.on("applyFormatting",function(e){if(!e.data.preventFormatStripping){var d=e.data.range,c=b._extractStylesFromRange(a,d),f=b._determineContext(d),g,h;if(a.copyFormatting._isContextAllowed(f))for(h=0;h<c.length;h++)f=c[h],g=d.createBookmark(),-1===l(b.preservedElements,f.element)?CKEDITOR.env.webkit&&!CKEDITOR.env.chrome?c[h].removeFromRange(e.data.range,e.editor):c[h].remove(e.editor):u(f.element,e.data.styles)&&b._removeStylesFromElementInRange(d,
+f.element),d.moveToBookmark(g)}});a.copyFormatting.on("applyFormatting",function(b){var d=CKEDITOR.plugins.copyformatting,c=d._determineContext(b.data.range);"list"===c&&a.copyFormatting._isContextAllowed("list")?d._applyStylesToListContext(b.editor,b.data.range,b.data.styles):"table"===c&&a.copyFormatting._isContextAllowed("table")?d._applyStylesToTableContext(b.editor,b.data.range,b.data.styles):a.copyFormatting._isContextAllowed("text")&&d._applyStylesToTextContext(b.editor,b.data.range,b.data.styles)},
+null,null,999)}});q.prototype._isContextAllowed=function(a){var b=this.editor.config.copyFormatting_allowedContexts;return!0===b||-1!==l(b,a)};CKEDITOR.event.implementOn(q.prototype);CKEDITOR.plugins.copyformatting={state:q,inlineBoundary:"h1 h2 h3 h4 h5 h6 p div".split(" "),excludedAttributes:["id","style","href","data-cke-saved-href","dir"],elementsForInlineTransform:["li"],excludedElementsFromInlineTransform:["table","thead","tbody","ul","ol"],excludedAttributesFromInlineTransform:["value","type"],
+preservedElements:"ul ol li td th tr thead tbody table".split(" "),breakOnElements:["ul","ol","table"],commands:{copyFormatting:{exec:function(a,b){var e=CKEDITOR.plugins.copyformatting,d=a.copyFormatting,c=b?"keystrokeHandler"==b.from:!1,f=b?b.sticky||c:!1,g=e._getCursorContainer(a),h=CKEDITOR.document.getDocumentElement();if(this.state===CKEDITOR.TRISTATE_ON)return d.styles=null,d.sticky=!1,g.removeClass("cke_copyformatting_active"),h.removeClass("cke_copyformatting_disabled"),h.removeClass("cke_copyformatting_tableresize_cursor"),
+e._putScreenReaderMessage(a,"canceled"),this.setState(CKEDITOR.TRISTATE_OFF);d.styles=e._extractStylesFromElement(a,a.elementPath().lastElement);this.setState(CKEDITOR.TRISTATE_ON);c||(g.addClass("cke_copyformatting_active"),h.addClass("cke_copyformatting_tableresize_cursor"),a.config.copyFormatting_outerCursor&&h.addClass("cke_copyformatting_disabled"));d.sticky=f;e._putScreenReaderMessage(a,"copied")}},applyFormatting:{exec:function(a,b){var e=a.getCommand("copyFormatting"),d=b?"keystrokeHandler"==
+b.from:!1,c=CKEDITOR.plugins.copyformatting,f=a.copyFormatting,g=c._getCursorContainer(a),h=CKEDITOR.document.getDocumentElement();if(d||e.state===CKEDITOR.TRISTATE_ON){if(d&&!f.styles)return c._putScreenReaderMessage(a,"failed");d=c._applyFormat(a,f.styles);f.sticky||(f.styles=null,g.removeClass("cke_copyformatting_active"),h.removeClass("cke_copyformatting_disabled"),h.removeClass("cke_copyformatting_tableresize_cursor"),e.setState(CKEDITOR.TRISTATE_OFF));c._putScreenReaderMessage(a,d?"applied":
+"canceled")}}}},_getCursorContainer:function(a){return a.elementMode===CKEDITOR.ELEMENT_MODE_INLINE?a.editable():a.editable().getParent()},_convertElementToStyleDef:function(a){var b=CKEDITOR.tools,e=a.getAttributes(CKEDITOR.plugins.copyformatting.excludedAttributes),b=b.parseCssText(a.getAttribute("style"),!0,!0);return{element:a.getName(),type:CKEDITOR.STYLE_INLINE,attributes:e,styles:b}},_extractStylesFromElement:function(a,b){var e={},d=[];do if(b.type===CKEDITOR.NODE_ELEMENT&&!b.hasAttribute("data-cke-bookmark")&&
+(e.element=b,a.copyFormatting.fire("extractFormatting",e,a)&&e.styleDef&&d.push(new CKEDITOR.style(e.styleDef)),b.getName&&-1!==l(CKEDITOR.plugins.copyformatting.breakOnElements,b.getName())))break;while((b=b.getParent())&&b.type===CKEDITOR.NODE_ELEMENT);return d},_extractStylesFromRange:function(a,b){for(var e=[],d=new CKEDITOR.dom.walker(b),c;c=d.next();)e=e.concat(CKEDITOR.plugins.copyformatting._extractStylesFromElement(a,c));return e},_removeStylesFromElementInRange:function(a,b){for(var e=-1!==
+l(["ol","ul","table"],b),d=new CKEDITOR.dom.walker(a),c;c=d.next();)if(c=c.getAscendant(b,!0))if(c.removeAttributes(c.getAttributes()),e)break},_getSelectedWordOffset:function(a){function b(a,b){return a[b?"getPrevious":"getNext"](function(a){return a.type!==CKEDITOR.NODE_COMMENT})}function e(a){return a.type==CKEDITOR.NODE_ELEMENT?(a=a.getHtml().replace(/<span.*?>&nbsp;<\/span>/g,""),a.replace(/<.*?>/g,"")):a.getText()}function d(a,c){var f=a,g=/\s/g,h="p br ol ul li td th div caption body".split(" "),
+m=!1,k=!1,p,n;do{for(p=b(f,c);!p&&f.getParent();){f=f.getParent();if(-1!==l(h,f.getName())){k=m=!0;break}p=b(f,c)}if(p&&p.getName&&-1!==l(h,p.getName())){m=!0;break}f=p}while(f&&f.getStyle&&("none"==f.getStyle("display")||!f.getText()));for(f||(f=a);f.type!==CKEDITOR.NODE_TEXT;)f=!m||c||k?f.getChild(0):f.getChild(f.getChildCount()-1);for(h=e(f);null!=(k=g.exec(h))&&(n=k.index,c););if("number"!==typeof n&&!m)return d(f,c);if(m)c?n=0:(g=/([\.\b]*$)/,n=(k=g.exec(h))?k.index:h.length);else if(c&&(n+=
+1,n>h.length))return d(f);return{node:f,offset:n}}var c=/\b\w+\b/ig,f,g,h,m,k;h=m=k=a.startContainer;for(f=e(h);null!=(g=c.exec(f));)if(g.index+g[0].length>=a.startOffset)return a=g.index,c=g.index+g[0].length,0===g.index&&(g=d(h,!0),m=g.node,a=g.offset),c>=f.length&&(f=d(h),k=f.node,c=f.offset),{startNode:m,startOffset:a,endNode:k,endOffset:c};return null},_filterStyles:function(a){var b=CKEDITOR.tools.isEmpty,e=[],d,c;for(c=0;c<a.length;c++)d=a[c]._.definition,-1!==CKEDITOR.tools.indexOf(CKEDITOR.plugins.copyformatting.inlineBoundary,
+d.element)&&(d.element=a[c].element="span"),"span"===d.element&&b(d.attributes)&&b(d.styles)||e.push(a[c]);return e},_determineContext:function(a){function b(b){var d=new CKEDITOR.dom.walker(a),c;if(a.startContainer.getAscendant(b,!0)||a.endContainer.getAscendant(b,!0))return!0;for(;c=d.next();)if(c.getAscendant(b,!0))return!0}return b({ul:1,ol:1})?"list":b("table")?"table":"text"},_applyStylesToTextContext:function(a,b,e){var d=CKEDITOR.plugins.copyformatting,c=d.excludedAttributesFromInlineTransform,
+f,g;CKEDITOR.env.webkit&&!CKEDITOR.env.chrome&&a.getSelection().selectRanges([b]);for(f=0;f<e.length;f++)if(b=e[f],-1===l(d.excludedElementsFromInlineTransform,b.element)){if(-1!==l(d.elementsForInlineTransform,b.element))for(b.element=b._.definition.element="span",g=0;g<c.length;g++)b._.definition.attributes[c[g]]&&delete b._.definition.attributes[c[g]];b.apply(a)}},_applyStylesToListContext:function(a,b,e){var d,c,f;for(f=0;f<e.length;f++)d=e[f],c=b.createBookmark(),"ol"===d.element||"ul"===d.element?
+k(b,{ul:1,ol:1},function(a){var b=d;a.getName()!==b.element&&a.renameNode(b.element);b.applyToObject(a)},!0):"li"===d.element?k(b,"li",function(a){d.applyToObject(a)}):CKEDITOR.plugins.copyformatting._applyStylesToTextContext(a,b,[d]),b.moveToBookmark(c)},_applyStylesToTableContext:function(a,b,e){function d(a,b){a.getName()!==b.element&&(b=b.getDefinition(),b.element=a.getName(),b=new CKEDITOR.style(b));b.applyToObject(a)}var c,f,g;for(g=0;g<e.length;g++)c=e[g],f=b.createBookmark(),-1!==l(["table",
+"tr"],c.element)?k(b,c.element,function(a){c.applyToObject(a)}):-1!==l(["td","th"],c.element)?k(b,{td:1,th:1},function(a){d(a,c)}):-1!==l(["thead","tbody"],c.element)?k(b,{thead:1,tbody:1},function(a){d(a,c)}):CKEDITOR.plugins.copyformatting._applyStylesToTextContext(a,b,[c]),b.moveToBookmark(f)},_applyFormat:function(a,b){var e=a.getSelection().getRanges()[0],d=CKEDITOR.plugins.copyformatting,c,f;if(!e)return!1;if(e.collapsed){f=a.getSelection().createBookmarks();if(!(c=d._getSelectedWordOffset(e)))return;
+e=a.createRange();e.setStart(c.startNode,c.startOffset);e.setEnd(c.endNode,c.endOffset);e.select()}b=d._filterStyles(b);if(!a.copyFormatting.fire("applyFormatting",{styles:b,range:e,preventFormatStripping:!1},a))return!1;f&&a.getSelection().selectBookmarks(f);return!0},_putScreenReaderMessage:function(a,b){var e=this._getScreenReaderContainer();e&&e.setText(a.lang.copyformatting.notification[b])},_addScreenReaderContainer:function(){if(this._getScreenReaderContainer())return this._getScreenReaderContainer();
+if(!CKEDITOR.env.ie6Compat&&!CKEDITOR.env.ie7Compat)return CKEDITOR.document.getBody().append(CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_screen_reader_only cke_copyformatting_notification"\x3e\x3cdiv aria-live\x3d"polite"\x3e\x3c/div\x3e\x3c/div\x3e')).getChild(0)},_getScreenReaderContainer:function(){if(!CKEDITOR.env.ie6Compat&&!CKEDITOR.env.ie7Compat)return CKEDITOR.document.getBody().findOne(".cke_copyformatting_notification div[aria-live]")}};CKEDITOR.config.copyFormatting_outerCursor=
+!0;CKEDITOR.config.copyFormatting_allowRules="b s u i em strong span p div td th ol ul li(*)[*]{*}";CKEDITOR.config.copyFormatting_disallowRules="*[data-cke-widget*,data-widget*,data-cke-realelement](cke_widget*)";CKEDITOR.config.copyFormatting_allowedContexts=!0;CKEDITOR.config.copyFormatting_keystrokeCopy=CKEDITOR.CTRL+CKEDITOR.SHIFT+67;CKEDITOR.config.copyFormatting_keystrokePaste=CKEDITOR.CTRL+CKEDITOR.SHIFT+86})();(function(){CKEDITOR.plugins.add("div",{requires:"dialog",init:function(a){if(!a.blockless){var c=a.lang.div,b="div(*)";CKEDITOR.dialog.isTabEnabled(a,"editdiv","advanced")&&(b+=";div[dir,id,lang,title]{*}");a.addCommand("creatediv",new CKEDITOR.dialogCommand("creatediv",{allowedContent:b,requiredContent:"div",contextSensitive:!0,contentTransformations:[["div: alignmentToStyle"]],refresh:function(a,c){this.setState("div"in(a.config.div_wrapTable?c.root:c.blockLimit).getDtd()?CKEDITOR.TRISTATE_OFF:
+CKEDITOR.TRISTATE_DISABLED)}}));a.addCommand("editdiv",new CKEDITOR.dialogCommand("editdiv",{requiredContent:"div"}));a.addCommand("removediv",{requiredContent:"div",exec:function(a){function c(b){(b=CKEDITOR.plugins.div.getSurroundDiv(a,b))&&!b.data("cke-div-added")&&(f.push(b),b.data("cke-div-added"))}for(var b=a.getSelection(),g=b&&b.getRanges(),e,h=b.createBookmarks(),f=[],d=0;d<g.length;d++)e=g[d],e.collapsed?c(b.getStartElement()):(e=new CKEDITOR.dom.walker(e),e.evaluator=c,e.lastForward());
+for(d=0;d<f.length;d++)f[d].remove(!0);b.selectBookmarks(h)}});a.ui.addButton&&a.ui.addButton("CreateDiv",{label:c.toolbar,command:"creatediv",toolbar:"blocks,50"});a.addMenuItems&&(a.addMenuItems({editdiv:{label:c.edit,command:"editdiv",group:"div",order:1},removediv:{label:c.remove,command:"removediv",group:"div",order:5}}),a.contextMenu&&a.contextMenu.addListener(function(b){return!b||b.isReadOnly()?null:CKEDITOR.plugins.div.getSurroundDiv(a)?{editdiv:CKEDITOR.TRISTATE_OFF,removediv:CKEDITOR.TRISTATE_OFF}:
+null}));CKEDITOR.dialog.add("creatediv",this.path+"dialogs/div.js");CKEDITOR.dialog.add("editdiv",this.path+"dialogs/div.js")}}});CKEDITOR.plugins.div={getSurroundDiv:function(a,c){var b=a.elementPath(c);return a.elementPath(b.blockLimit).contains(function(a){return a.is("div")&&!a.isReadOnly()},1)}}})();CKEDITOR.plugins.add("resize",{init:function(b){function f(d){var e=c.width,m=c.height,f=e+(d.data.$.screenX-n.x)*("rtl"==g?-1:1);d=m+(d.data.$.screenY-n.y);h&&(e=Math.max(a.resize_minWidth,Math.min(f,a.resize_maxWidth)));p&&(m=Math.max(a.resize_minHeight,Math.min(d,a.resize_maxHeight)));b.resize(h?e:null,m)}function k(){CKEDITOR.document.removeListener("mousemove",f);CKEDITOR.document.removeListener("mouseup",k);b.document&&(b.document.removeListener("mousemove",f),b.document.removeListener("mouseup",
 k))}var a=b.config,r=b.ui.spaceId("resizer"),g=b.element?b.element.getDirection(1):"ltr";!a.resize_dir&&(a.resize_dir="vertical");void 0===a.resize_maxWidth&&(a.resize_maxWidth=3E3);void 0===a.resize_maxHeight&&(a.resize_maxHeight=3E3);void 0===a.resize_minWidth&&(a.resize_minWidth=750);void 0===a.resize_minHeight&&(a.resize_minHeight=250);if(!1!==a.resize_enabled){var l=null,n,c,h=("both"==a.resize_dir||"horizontal"==a.resize_dir)&&a.resize_minWidth!=a.resize_maxWidth,p=("both"==a.resize_dir||"vertical"==
 a.resize_dir)&&a.resize_minHeight!=a.resize_maxHeight,q=CKEDITOR.tools.addFunction(function(d){l||(l=b.getResizable());c={width:l.$.offsetWidth||0,height:l.$.offsetHeight||0};n={x:d.screenX,y:d.screenY};a.resize_minWidth>c.width&&(a.resize_minWidth=c.width);a.resize_minHeight>c.height&&(a.resize_minHeight=c.height);CKEDITOR.document.on("mousemove",f);CKEDITOR.document.on("mouseup",k);b.document&&(b.document.on("mousemove",f),b.document.on("mouseup",k));d.preventDefault&&d.preventDefault()});b.on("destroy",
 function(){CKEDITOR.tools.removeFunction(q)});b.on("uiSpace",function(a){if("bottom"==a.data.space){var e="";h&&!p&&(e=" cke_resizer_horizontal");!h&&p&&(e=" cke_resizer_vertical");var c='\x3cspan id\x3d"'+r+'" class\x3d"cke_resizer'+e+" cke_resizer_"+g+'" title\x3d"'+CKEDITOR.tools.htmlEncode(b.lang.common.resize)+'" onmousedown\x3d"CKEDITOR.tools.callFunction('+q+', event)"\x3e'+("ltr"==g?"◢":"◣")+"\x3c/span\x3e";"ltr"==g&&"ltr"==e?a.data.html+=c:a.data.html=c+a.data.html}},b,null,100);b.on("maximize",
-function(a){b.ui.space("resizer")[a.data==CKEDITOR.TRISTATE_ON?"hide":"show"]()})}}});(function(){function B(a){function d(){for(var b=g(),e=CKEDITOR.tools.clone(a.config.toolbarGroups)||q(a),f=0;f<e.length;f++){var l=e[f];if("/"!=l){"string"==typeof l&&(l=e[f]={name:l});var m,d=l.groups;if(d)for(var h=0;h<d.length;h++)m=d[h],(m=b[m])&&c(l,m);(m=b[l.name])&&c(l,m)}}return e}function g(){var b={},c,f,e;for(c in a.ui.items)f=a.ui.items[c],e=f.toolbar||"others",e=e.split(","),f=e[0],e=parseInt(e[1]||-1,10),b[f]||(b[f]=[]),b[f].push({name:c,order:e});for(f in b)b[f]=b[f].sort(function(b,
+function(a){b.ui.space("resizer")[a.data==CKEDITOR.TRISTATE_ON?"hide":"show"]()})}}});(function(){function D(a){function d(){for(var b=g(),e=CKEDITOR.tools.clone(a.config.toolbarGroups)||v(a),f=0;f<e.length;f++){var m=e[f];if("/"!=m){"string"==typeof m&&(m=e[f]={name:m});var l,d=m.groups;if(d)for(var h=0;h<d.length;h++)l=d[h],(l=b[l])&&c(m,l);(l=b[m.name])&&c(m,l)}}return e}function g(){var b={},c,f,e;for(c in a.ui.items)f=a.ui.items[c],e=f.toolbar||"others",e=e.split(","),f=e[0],e=parseInt(e[1]||-1,10),b[f]||(b[f]=[]),b[f].push({name:c,order:e});for(f in b)b[f]=b[f].sort(function(b,
 a){return b.order==a.order?0:0>a.order?-1:0>b.order?1:b.order<a.order?-1:1});return b}function c(c,e){if(e.length){c.items?c.items.push(a.ui.create("-")):c.items=[];for(var f;f=e.shift();)f="string"==typeof f?f:f.name,b&&-1!=CKEDITOR.tools.indexOf(b,f)||(f=a.ui.create(f))&&a.addFeature(f)&&c.items.push(f)}}function h(b){var a=[],e,d,h;for(e=0;e<b.length;++e)d=b[e],h={},"/"==d?a.push(d):CKEDITOR.tools.isArray(d)?(c(h,CKEDITOR.tools.clone(d)),a.push(h)):d.items&&(c(h,CKEDITOR.tools.clone(d.items)),
-h.name=d.name,a.push(h));return a}var b=a.config.removeButtons,b=b&&b.split(","),e=a.config.toolbar;"string"==typeof e&&(e=a.config["toolbar_"+e]);return a.toolbar=e?h(e):d()}function q(a){return a._.toolbarGroups||(a._.toolbarGroups=[{name:"document",groups:["mode","document","doctools"]},{name:"clipboard",groups:["clipboard","undo"]},{name:"editing",groups:["find","selection","spellchecker"]},{name:"forms"},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list",
-"indent","blocks","align","bidi"]},{name:"links"},{name:"insert"},"/",{name:"styles"},{name:"colors"},{name:"tools"},{name:"others"},{name:"about"}])}var y=function(){this.toolbars=[];this.focusCommandExecuted=!1};y.prototype.focus=function(){for(var a=0,d;d=this.toolbars[a++];)for(var g=0,c;c=d.items[g++];)if(c.focus){c.focus();return}};var C={modes:{wysiwyg:1,source:1},readOnly:1,exec:function(a){a.toolbox&&(a.toolbox.focusCommandExecuted=!0,CKEDITOR.env.ie||CKEDITOR.env.air?setTimeout(function(){a.toolbox.focus()},
-100):a.toolbox.focus())}};CKEDITOR.plugins.add("toolbar",{requires:"button",init:function(a){var d,g=function(c,h){var b,e="rtl"==a.lang.dir,k=a.config.toolbarGroupCycling,r=e?37:39,e=e?39:37,k=void 0===k||k;switch(h){case 9:case CKEDITOR.SHIFT+9:for(;!b||!b.items.length;)if(b=9==h?(b?b.next:c.toolbar.next)||a.toolbox.toolbars[0]:(b?b.previous:c.toolbar.previous)||a.toolbox.toolbars[a.toolbox.toolbars.length-1],b.items.length)for(c=b.items[d?b.items.length-1:0];c&&!c.focus;)(c=d?c.previous:c.next)||
-(b=0);c&&c.focus();return!1;case r:b=c;do b=b.next,!b&&k&&(b=c.toolbar.items[0]);while(b&&!b.focus);b?b.focus():g(c,9);return!1;case 40:return c.button&&c.button.hasArrow?(a.once("panelShow",function(b){b.data._.panel._.currentBlock.onKeyDown(40)}),c.execute()):g(c,40==h?r:e),!1;case e:case 38:b=c;do b=b.previous,!b&&k&&(b=c.toolbar.items[c.toolbar.items.length-1]);while(b&&!b.focus);b?b.focus():(d=1,g(c,CKEDITOR.SHIFT+9),d=0);return!1;case 27:return a.focus(),!1;case 13:case 32:return c.execute(),
-!1}return!0};a.on("uiSpace",function(c){if(c.data.space==a.config.toolbarLocation){c.removeListener();a.toolbox=new y;var d=CKEDITOR.tools.getNextId(),b=['\x3cspan id\x3d"',d,'" class\x3d"cke_voice_label"\x3e',a.lang.toolbar.toolbars,"\x3c/span\x3e",'\x3cspan id\x3d"'+a.ui.spaceId("toolbox")+'" class\x3d"cke_toolbox" role\x3d"group" aria-labelledby\x3d"',d,'" onmousedown\x3d"return false;"\x3e'],d=!1!==a.config.toolbarStartupExpanded,e,k;a.config.toolbarCanCollapse&&a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&
-b.push('\x3cspan class\x3d"cke_toolbox_main"'+(d?"\x3e":' style\x3d"display:none"\x3e'));for(var r=a.toolbox.toolbars,f=B(a),l=0;l<f.length;l++){var m,n=0,v,p=f[l],w;if(p)if(e&&(b.push("\x3c/span\x3e"),k=e=0),"/"===p)b.push('\x3cspan class\x3d"cke_toolbar_break"\x3e\x3c/span\x3e');else{w=p.items||p;for(var x=0;x<w.length;x++){var t=w[x],q;if(t){var z=function(c){c=c.render(a,b);u=n.items.push(c)-1;0<u&&(c.previous=n.items[u-1],c.previous.next=c);c.toolbar=n;c.onkey=g;c.onfocus=function(){a.toolbox.focusCommandExecuted||
-a.focus()}};if(t.type==CKEDITOR.UI_SEPARATOR)k=e&&t;else{q=!1!==t.canGroup;if(!n){m=CKEDITOR.tools.getNextId();n={id:m,items:[]};v=p.name&&(a.lang.toolbar.toolbarGroups[p.name]||p.name);b.push('\x3cspan id\x3d"',m,'" class\x3d"cke_toolbar"',v?' aria-labelledby\x3d"'+m+'_label"':"",' role\x3d"toolbar"\x3e');v&&b.push('\x3cspan id\x3d"',m,'_label" class\x3d"cke_voice_label"\x3e',v,"\x3c/span\x3e");b.push('\x3cspan class\x3d"cke_toolbar_start"\x3e\x3c/span\x3e');var u=r.push(n)-1;0<u&&(n.previous=r[u-
-1],n.previous.next=n)}q?e||(b.push('\x3cspan class\x3d"cke_toolgroup" role\x3d"presentation"\x3e'),e=1):e&&(b.push("\x3c/span\x3e"),e=0);k&&(z(k),k=0);z(t)}}}e&&(b.push("\x3c/span\x3e"),k=e=0);n&&b.push('\x3cspan class\x3d"cke_toolbar_end"\x3e\x3c/span\x3e\x3c/span\x3e')}}a.config.toolbarCanCollapse&&b.push("\x3c/span\x3e");if(a.config.toolbarCanCollapse&&a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var A=CKEDITOR.tools.addFunction(function(){a.execCommand("toolbarCollapse")});a.on("destroy",function(){CKEDITOR.tools.removeFunction(A)});
-a.addCommand("toolbarCollapse",{readOnly:1,exec:function(b){var a=b.ui.space("toolbar_collapser"),c=a.getPrevious(),e=b.ui.space("contents"),d=c.getParent(),f=parseInt(e.$.style.height,10),h=d.$.offsetHeight,g=a.hasClass("cke_toolbox_collapser_min");g?(c.show(),a.removeClass("cke_toolbox_collapser_min"),a.setAttribute("title",b.lang.toolbar.toolbarCollapse)):(c.hide(),a.addClass("cke_toolbox_collapser_min"),a.setAttribute("title",b.lang.toolbar.toolbarExpand));a.getFirst().setText(g?"▲":"◀");e.setStyle("height",
-f-(d.$.offsetHeight-h)+"px");b.fire("resize",{outerHeight:b.container.$.offsetHeight,contentsHeight:e.$.offsetHeight,outerWidth:b.container.$.offsetWidth})},modes:{wysiwyg:1,source:1}});a.setKeystroke(CKEDITOR.ALT+(CKEDITOR.env.ie||CKEDITOR.env.webkit?189:109),"toolbarCollapse");b.push('\x3ca title\x3d"'+(d?a.lang.toolbar.toolbarCollapse:a.lang.toolbar.toolbarExpand)+'" id\x3d"'+a.ui.spaceId("toolbar_collapser")+'" tabIndex\x3d"-1" class\x3d"cke_toolbox_collapser');d||b.push(" cke_toolbox_collapser_min");
-b.push('" onclick\x3d"CKEDITOR.tools.callFunction('+A+')"\x3e','\x3cspan class\x3d"cke_arrow"\x3e\x26#9650;\x3c/span\x3e',"\x3c/a\x3e")}b.push("\x3c/span\x3e");c.data.html+=b.join("")}});a.on("destroy",function(){if(this.toolbox){var a,d=0,b,e,g;for(a=this.toolbox.toolbars;d<a.length;d++)for(e=a[d].items,b=0;b<e.length;b++)g=e[b],g.clickFn&&CKEDITOR.tools.removeFunction(g.clickFn),g.keyDownFn&&CKEDITOR.tools.removeFunction(g.keyDownFn)}});a.on("uiReady",function(){var c=a.ui.space("toolbox");c&&a.focusManager.add(c,
-1)});a.addCommand("toolbarFocus",C);a.setKeystroke(CKEDITOR.ALT+121,"toolbarFocus");a.ui.add("-",CKEDITOR.UI_SEPARATOR,{});a.ui.addHandler(CKEDITOR.UI_SEPARATOR,{create:function(){return{render:function(a,d){d.push('\x3cspan class\x3d"cke_toolbar_separator" role\x3d"separator"\x3e\x3c/span\x3e');return{}}}}})}});CKEDITOR.ui.prototype.addToolbarGroup=function(a,d,g){var c=q(this.editor),h=0===d,b={name:a};if(g){if(g=CKEDITOR.tools.search(c,function(a){return a.name==g})){!g.groups&&(g.groups=[]);if(d&&
-(d=CKEDITOR.tools.indexOf(g.groups,d),0<=d)){g.groups.splice(d+1,0,a);return}h?g.groups.splice(0,0,a):g.groups.push(a);return}d=null}d&&(d=CKEDITOR.tools.indexOf(c,function(a){return a.name==d}));h?c.splice(0,0,a):"number"==typeof d?c.splice(d+1,0,b):c.push(a)}})();CKEDITOR.UI_SEPARATOR="separator";CKEDITOR.config.toolbarLocation="top";(function(){function q(a,d){function l(c){c=k.list[c];if(c.equals(a.editable())||"true"==c.getAttribute("contenteditable")){var e=a.createRange();e.selectNodeContents(c);e.select()}else a.getSelection().selectElement(c);a.focus()}function m(){n&&n.setHtml('\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e');delete k.list}var p=a.ui.spaceId("path"),n,k=a._.elementsPath,q=k.idBase;d.html+='\x3cspan id\x3d"'+p+'_label" class\x3d"cke_voice_label"\x3e'+a.lang.elementspath.eleLabel+'\x3c/span\x3e\x3cspan id\x3d"'+
-p+'" class\x3d"cke_path" role\x3d"group" aria-labelledby\x3d"'+p+'_label"\x3e\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e\x3c/span\x3e';a.on("uiReady",function(){var c=a.ui.space("path");c&&a.focusManager.add(c,1)});k.onClick=l;var v=CKEDITOR.tools.addFunction(l),w=CKEDITOR.tools.addFunction(function(c,e){var g=k.idBase,b;e=new CKEDITOR.dom.event(e);b="rtl"==a.lang.dir;switch(e.getKeystroke()){case b?39:37:case 9:return(b=CKEDITOR.document.getById(g+(c+1)))||(b=CKEDITOR.document.getById(g+
-"0")),b.focus(),!1;case b?37:39:case CKEDITOR.SHIFT+9:return(b=CKEDITOR.document.getById(g+(c-1)))||(b=CKEDITOR.document.getById(g+(k.list.length-1))),b.focus(),!1;case 27:return a.focus(),!1;case 13:case 32:return l(c),!1}return!0});a.on("selectionChange",function(){for(var c=[],e=k.list=[],g=[],b=k.filters,d=!0,l=a.elementPath().elements,f,u=l.length;u--;){var h=l[u],r=0;f=h.data("cke-display-name")?h.data("cke-display-name"):h.data("cke-real-element-type")?h.data("cke-real-element-type"):h.getName();
-(d=h.hasAttribute("contenteditable")?"true"==h.getAttribute("contenteditable"):d)||h.hasAttribute("contenteditable")||(r=1);for(var t=0;t<b.length;t++){var m=b[t](h,f);if(!1===m){r=1;break}f=m||f}r||(e.unshift(h),g.unshift(f))}e=e.length;for(b=0;b<e;b++)f=g[b],d=a.lang.elementspath.eleTitle.replace(/%1/,f),f=x.output({id:q+b,label:d,text:f,jsTitle:"javascript:void('"+f+"')",index:b,keyDownFn:w,clickFn:v}),c.unshift(f);n||(n=CKEDITOR.document.getById(p));g=n;g.setHtml(c.join("")+'\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e');
-a.fire("elementsPathUpdate",{space:g})});a.on("readOnly",m);a.on("contentDomUnload",m);a.addCommand("elementsPathFocus",y.toolbarFocus);a.setKeystroke(CKEDITOR.ALT+122,"elementsPathFocus")}var y={toolbarFocus:{editorFocus:!1,readOnly:1,exec:function(a){(a=CKEDITOR.document.getById(a._.elementsPath.idBase+"0"))&&a.focus(CKEDITOR.env.ie||CKEDITOR.env.air)}}},d="";CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(d+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(d+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');
-var x=CKEDITOR.addTemplate("pathItem",'\x3ca id\x3d"{id}" href\x3d"{jsTitle}" tabindex\x3d"-1" class\x3d"cke_path_item" title\x3d"{label}"'+d+' hidefocus\x3d"true"  onkeydown\x3d"return CKEDITOR.tools.callFunction({keyDownFn},{index}, event );" onclick\x3d"CKEDITOR.tools.callFunction({clickFn},{index}); return false;" role\x3d"button" aria-label\x3d"{label}"\x3e{text}\x3c/a\x3e');CKEDITOR.plugins.add("elementspath",{init:function(a){a._.elementsPath={idBase:"cke_elementspath_"+CKEDITOR.tools.getNextNumber()+
-"_",filters:[]};a.on("uiSpace",function(d){"bottom"==d.data.space&&q(a,d.data)})}})})();(function(){function q(b,d,a){a=b.config.forceEnterMode||a;"wysiwyg"==b.mode&&(d||(d=b.activeEnterMode),b.elementPath().isContextFor("p")||(d=CKEDITOR.ENTER_BR,a=1),b.fire("saveSnapshot"),d==CKEDITOR.ENTER_BR?t(b,d,null,a):u(b,d,null,a),b.fire("saveSnapshot"))}function v(b){b=b.getSelection().getRanges(!0);for(var d=b.length-1;0<d;d--)b[d].deleteContents();return b[0]}function y(b){var d=b.startContainer.getAscendant(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&"true"==a.getAttribute("contenteditable")},
+h.name=d.name,a.push(h));return a}var b=a.config.removeButtons,b=b&&b.split(","),e=a.config.toolbar;"string"==typeof e&&(e=a.config["toolbar_"+e]);return a.toolbar=e?h(e):d()}function v(a){return a._.toolbarGroups||(a._.toolbarGroups=[{name:"document",groups:["mode","document","doctools"]},{name:"clipboard",groups:["clipboard","undo"]},{name:"editing",groups:["find","selection","spellchecker"]},{name:"forms"},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list",
+"indent","blocks","align","bidi"]},{name:"links"},{name:"insert"},"/",{name:"styles"},{name:"colors"},{name:"tools"},{name:"others"},{name:"about"}])}var z=function(){this.toolbars=[];this.focusCommandExecuted=!1};z.prototype.focus=function(){for(var a=0,d;d=this.toolbars[a++];)for(var g=0,c;c=d.items[g++];)if(c.focus){c.focus();return}};var E={modes:{wysiwyg:1,source:1},readOnly:1,exec:function(a){a.toolbox&&(a.toolbox.focusCommandExecuted=!0,CKEDITOR.env.ie||CKEDITOR.env.air?setTimeout(function(){a.toolbox.focus()},
+100):a.toolbox.focus())}};CKEDITOR.plugins.add("toolbar",{requires:"button",init:function(a){var d,g=function(c,h){var b,e="rtl"==a.lang.dir,k=a.config.toolbarGroupCycling,q=e?37:39,e=e?39:37,k=void 0===k||k;switch(h){case 9:case CKEDITOR.SHIFT+9:for(;!b||!b.items.length;)if(b=9==h?(b?b.next:c.toolbar.next)||a.toolbox.toolbars[0]:(b?b.previous:c.toolbar.previous)||a.toolbox.toolbars[a.toolbox.toolbars.length-1],b.items.length)for(c=b.items[d?b.items.length-1:0];c&&!c.focus;)(c=d?c.previous:c.next)||
+(b=0);c&&c.focus();return!1;case q:b=c;do b=b.next,!b&&k&&(b=c.toolbar.items[0]);while(b&&!b.focus);b?b.focus():g(c,9);return!1;case 40:return c.button&&c.button.hasArrow?(a.once("panelShow",function(b){b.data._.panel._.currentBlock.onKeyDown(40)}),c.execute()):g(c,40==h?q:e),!1;case e:case 38:b=c;do b=b.previous,!b&&k&&(b=c.toolbar.items[c.toolbar.items.length-1]);while(b&&!b.focus);b?b.focus():(d=1,g(c,CKEDITOR.SHIFT+9),d=0);return!1;case 27:return a.focus(),!1;case 13:case 32:return c.execute(),
+!1}return!0};a.on("uiSpace",function(c){if(c.data.space==a.config.toolbarLocation){c.removeListener();a.toolbox=new z;var d=CKEDITOR.tools.getNextId(),b=['\x3cspan id\x3d"',d,'" class\x3d"cke_voice_label"\x3e',a.lang.toolbar.toolbars,"\x3c/span\x3e",'\x3cspan id\x3d"'+a.ui.spaceId("toolbox")+'" class\x3d"cke_toolbox" role\x3d"group" aria-labelledby\x3d"',d,'" onmousedown\x3d"return false;"\x3e'],d=!1!==a.config.toolbarStartupExpanded,e,k;a.config.toolbarCanCollapse&&a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&
+b.push('\x3cspan class\x3d"cke_toolbox_main"'+(d?"\x3e":' style\x3d"display:none"\x3e'));for(var q=a.toolbox.toolbars,f=D(a),m=f.length,l=0;l<m;l++){var r,n=0,w,p=f[l],v="/"!==p&&("/"===f[l+1]||l==m-1),x;if(p)if(e&&(b.push("\x3c/span\x3e"),k=e=0),"/"===p)b.push('\x3cspan class\x3d"cke_toolbar_break"\x3e\x3c/span\x3e');else{x=p.items||p;for(var y=0;y<x.length;y++){var t=x[y],A;if(t){var B=function(c){c=c.render(a,b);u=n.items.push(c)-1;0<u&&(c.previous=n.items[u-1],c.previous.next=c);c.toolbar=n;c.onkey=
+g;c.onfocus=function(){a.toolbox.focusCommandExecuted||a.focus()}};if(t.type==CKEDITOR.UI_SEPARATOR)k=e&&t;else{A=!1!==t.canGroup;if(!n){r=CKEDITOR.tools.getNextId();n={id:r,items:[]};w=p.name&&(a.lang.toolbar.toolbarGroups[p.name]||p.name);b.push('\x3cspan id\x3d"',r,'" class\x3d"cke_toolbar'+(v?' cke_toolbar_last"':'"'),w?' aria-labelledby\x3d"'+r+'_label"':"",' role\x3d"toolbar"\x3e');w&&b.push('\x3cspan id\x3d"',r,'_label" class\x3d"cke_voice_label"\x3e',w,"\x3c/span\x3e");b.push('\x3cspan class\x3d"cke_toolbar_start"\x3e\x3c/span\x3e');
+var u=q.push(n)-1;0<u&&(n.previous=q[u-1],n.previous.next=n)}A?e||(b.push('\x3cspan class\x3d"cke_toolgroup" role\x3d"presentation"\x3e'),e=1):e&&(b.push("\x3c/span\x3e"),e=0);k&&(B(k),k=0);B(t)}}}e&&(b.push("\x3c/span\x3e"),k=e=0);n&&b.push('\x3cspan class\x3d"cke_toolbar_end"\x3e\x3c/span\x3e\x3c/span\x3e')}}a.config.toolbarCanCollapse&&b.push("\x3c/span\x3e");if(a.config.toolbarCanCollapse&&a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var C=CKEDITOR.tools.addFunction(function(){a.execCommand("toolbarCollapse")});
+a.on("destroy",function(){CKEDITOR.tools.removeFunction(C)});a.addCommand("toolbarCollapse",{readOnly:1,exec:function(b){var a=b.ui.space("toolbar_collapser"),c=a.getPrevious(),e=b.ui.space("contents"),d=c.getParent(),f=parseInt(e.$.style.height,10),h=d.$.offsetHeight,g=a.hasClass("cke_toolbox_collapser_min");g?(c.show(),a.removeClass("cke_toolbox_collapser_min"),a.setAttribute("title",b.lang.toolbar.toolbarCollapse)):(c.hide(),a.addClass("cke_toolbox_collapser_min"),a.setAttribute("title",b.lang.toolbar.toolbarExpand));
+a.getFirst().setText(g?"▲":"◀");e.setStyle("height",f-(d.$.offsetHeight-h)+"px");b.fire("resize",{outerHeight:b.container.$.offsetHeight,contentsHeight:e.$.offsetHeight,outerWidth:b.container.$.offsetWidth})},modes:{wysiwyg:1,source:1}});a.setKeystroke(CKEDITOR.ALT+(CKEDITOR.env.ie||CKEDITOR.env.webkit?189:109),"toolbarCollapse");b.push('\x3ca title\x3d"'+(d?a.lang.toolbar.toolbarCollapse:a.lang.toolbar.toolbarExpand)+'" id\x3d"'+a.ui.spaceId("toolbar_collapser")+'" tabIndex\x3d"-1" class\x3d"cke_toolbox_collapser');
+d||b.push(" cke_toolbox_collapser_min");b.push('" onclick\x3d"CKEDITOR.tools.callFunction('+C+')"\x3e','\x3cspan class\x3d"cke_arrow"\x3e\x26#9650;\x3c/span\x3e',"\x3c/a\x3e")}b.push("\x3c/span\x3e");c.data.html+=b.join("")}});a.on("destroy",function(){if(this.toolbox){var a,d=0,b,e,g;for(a=this.toolbox.toolbars;d<a.length;d++)for(e=a[d].items,b=0;b<e.length;b++)g=e[b],g.clickFn&&CKEDITOR.tools.removeFunction(g.clickFn),g.keyDownFn&&CKEDITOR.tools.removeFunction(g.keyDownFn)}});a.on("uiReady",function(){var c=
+a.ui.space("toolbox");c&&a.focusManager.add(c,1)});a.addCommand("toolbarFocus",E);a.setKeystroke(CKEDITOR.ALT+121,"toolbarFocus");a.ui.add("-",CKEDITOR.UI_SEPARATOR,{});a.ui.addHandler(CKEDITOR.UI_SEPARATOR,{create:function(){return{render:function(a,d){d.push('\x3cspan class\x3d"cke_toolbar_separator" role\x3d"separator"\x3e\x3c/span\x3e');return{}}}}})}});CKEDITOR.ui.prototype.addToolbarGroup=function(a,d,g){var c=v(this.editor),h=0===d,b={name:a};if(g){if(g=CKEDITOR.tools.search(c,function(a){return a.name==
+g})){!g.groups&&(g.groups=[]);if(d&&(d=CKEDITOR.tools.indexOf(g.groups,d),0<=d)){g.groups.splice(d+1,0,a);return}h?g.groups.splice(0,0,a):g.groups.push(a);return}d=null}d&&(d=CKEDITOR.tools.indexOf(c,function(a){return a.name==d}));h?c.splice(0,0,a):"number"==typeof d?c.splice(d+1,0,b):c.push(a)}})();CKEDITOR.UI_SEPARATOR="separator";CKEDITOR.config.toolbarLocation="top";(function(){function q(a,e){function l(c){c=k.list[c];var d;c.equals(a.editable())||"true"==c.getAttribute("contenteditable")?(d=a.createRange(),d.selectNodeContents(c),d=d.select()):(d=a.getSelection(),d.selectElement(c));CKEDITOR.env.ie&&a.fire("selectionChange",{selection:d,path:new CKEDITOR.dom.elementPath(c)});a.focus()}function m(){n&&n.setHtml('\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e');delete k.list}var p=a.ui.spaceId("path"),n,k=a._.elementsPath,q=k.idBase;e.html+='\x3cspan id\x3d"'+
+p+'_label" class\x3d"cke_voice_label"\x3e'+a.lang.elementspath.eleLabel+'\x3c/span\x3e\x3cspan id\x3d"'+p+'" class\x3d"cke_path" role\x3d"group" aria-labelledby\x3d"'+p+'_label"\x3e\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e\x3c/span\x3e';a.on("uiReady",function(){var c=a.ui.space("path");c&&a.focusManager.add(c,1)});k.onClick=l;var v=CKEDITOR.tools.addFunction(l),w=CKEDITOR.tools.addFunction(function(c,d){var g=k.idBase,b;d=new CKEDITOR.dom.event(d);b="rtl"==a.lang.dir;switch(d.getKeystroke()){case b?
+39:37:case 9:return(b=CKEDITOR.document.getById(g+(c+1)))||(b=CKEDITOR.document.getById(g+"0")),b.focus(),!1;case b?37:39:case CKEDITOR.SHIFT+9:return(b=CKEDITOR.document.getById(g+(c-1)))||(b=CKEDITOR.document.getById(g+(k.list.length-1))),b.focus(),!1;case 27:return a.focus(),!1;case 13:case 32:return l(c),!1}return!0});a.on("selectionChange",function(){for(var c=[],d=k.list=[],g=[],b=k.filters,e=!0,l=a.elementPath().elements,f,u=l.length;u--;){var h=l[u],r=0;f=h.data("cke-display-name")?h.data("cke-display-name"):
+h.data("cke-real-element-type")?h.data("cke-real-element-type"):h.getName();(e=h.hasAttribute("contenteditable")?"true"==h.getAttribute("contenteditable"):e)||h.hasAttribute("contenteditable")||(r=1);for(var t=0;t<b.length;t++){var m=b[t](h,f);if(!1===m){r=1;break}f=m||f}r||(d.unshift(h),g.unshift(f))}d=d.length;for(b=0;b<d;b++)f=g[b],e=a.lang.elementspath.eleTitle.replace(/%1/,f),f=x.output({id:q+b,label:e,text:f,jsTitle:"javascript:void('"+f+"')",index:b,keyDownFn:w,clickFn:v}),c.unshift(f);n||
+(n=CKEDITOR.document.getById(p));g=n;g.setHtml(c.join("")+'\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e');a.fire("elementsPathUpdate",{space:g})});a.on("readOnly",m);a.on("contentDomUnload",m);a.addCommand("elementsPathFocus",y.toolbarFocus);a.setKeystroke(CKEDITOR.ALT+122,"elementsPathFocus")}var y={toolbarFocus:{editorFocus:!1,readOnly:1,exec:function(a){(a=CKEDITOR.document.getById(a._.elementsPath.idBase+"0"))&&a.focus(CKEDITOR.env.ie||CKEDITOR.env.air)}}},e="";CKEDITOR.env.gecko&&
+CKEDITOR.env.mac&&(e+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(e+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var x=CKEDITOR.addTemplate("pathItem",'\x3ca id\x3d"{id}" href\x3d"{jsTitle}" tabindex\x3d"-1" class\x3d"cke_path_item" title\x3d"{label}"'+e+' hidefocus\x3d"true"  onkeydown\x3d"return CKEDITOR.tools.callFunction({keyDownFn},{index}, event );" onclick\x3d"CKEDITOR.tools.callFunction({clickFn},{index}); return false;" role\x3d"button" aria-label\x3d"{label}"\x3e{text}\x3c/a\x3e');
+CKEDITOR.plugins.add("elementspath",{init:function(a){a._.elementsPath={idBase:"cke_elementspath_"+CKEDITOR.tools.getNextNumber()+"_",filters:[]};a.on("uiSpace",function(e){"bottom"==e.data.space&&q(a,e.data)})}})})();(function(){function q(b,d,a){a=b.config.forceEnterMode||a;"wysiwyg"==b.mode&&(d||(d=b.activeEnterMode),b.elementPath().isContextFor("p")||(d=CKEDITOR.ENTER_BR,a=1),b.fire("saveSnapshot"),d==CKEDITOR.ENTER_BR?t(b,d,null,a):u(b,d,null,a),b.fire("saveSnapshot"))}function v(b){b=b.getSelection().getRanges(!0);for(var d=b.length-1;0<d;d--)b[d].deleteContents();return b[0]}function y(b){var d=b.startContainer.getAscendant(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&"true"==a.getAttribute("contenteditable")},
 !0);if(b.root.equals(d))return b;d=new CKEDITOR.dom.range(d);d.moveToRange(b);return d}CKEDITOR.plugins.add("enterkey",{init:function(b){b.addCommand("enter",{modes:{wysiwyg:1},editorFocus:!1,exec:function(b){q(b)}});b.addCommand("shiftEnter",{modes:{wysiwyg:1},editorFocus:!1,exec:function(b){q(b,b.activeShiftEnterMode,1)}});b.setKeystroke([[13,"enter"],[CKEDITOR.SHIFT+13,"shiftEnter"]])}});var z=CKEDITOR.dom.walker.whitespaces(),A=CKEDITOR.dom.walker.bookmark();CKEDITOR.plugins.enterkey={enterBlock:function(b,
 d,a,h){if(a=a||v(b)){a=y(a);var f=a.document,k=a.checkStartOfBlock(),m=a.checkEndOfBlock(),l=b.elementPath(a.startContainer),c=l.block,n=d==CKEDITOR.ENTER_DIV?"div":"p",e;if(k&&m){if(c&&(c.is("li")||c.getParent().is("li"))){c.is("li")||(c=c.getParent());a=c.getParent();e=a.getParent();h=!c.hasPrevious();var p=!c.hasNext(),n=b.getSelection(),g=n.createBookmarks(),k=c.getDirection(1),m=c.getAttribute("class"),r=c.getAttribute("style"),q=e.getDirection(1)!=k;b=b.enterMode!=CKEDITOR.ENTER_BR||q||r||m;
 if(e.is("li"))h||p?(h&&p&&a.remove(),c[p?"insertAfter":"insertBefore"](e)):c.breakParent(e);else{if(b)if(l.block.is("li")?(e=f.createElement(d==CKEDITOR.ENTER_P?"p":"div"),q&&e.setAttribute("dir",k),r&&e.setAttribute("style",r),m&&e.setAttribute("class",m),c.moveChildren(e)):e=l.block,h||p)e[h?"insertBefore":"insertAfter"](a);else c.breakParent(a),e.insertAfter(a);else if(c.appendBogus(!0),h||p)for(;f=c[h?"getFirst":"getLast"]();)f[h?"insertBefore":"insertAfter"](a);else for(c.breakParent(a);f=c.getLast();)f.insertAfter(a);
@@ -802,11 +847,12 @@ title:this.title,cls:this.className||"",titleJs:d.gecko&&!d.hc?"":(this.title||"
 c._.on=1;c.editorFocus&&!a.focusManager.hasFocus&&a.focus();if(c.onOpen)c.onOpen();a.once("panelShow",function(){f.focus(!f.multiSelect&&c.getValue())})};e.onHide=function(b){this.element.removeClass(h);c.setState(c.modes&&c.modes[a.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);c._.on=0;if(!b&&c.onClose)c.onClose()};e.onEscape=function(){e.hide(1)};f.onClick=function(a,b){c.onClick&&c.onClick.call(c,a,b);e.hide()};this._.panel=e;this._.list=f;e.getBlock(this.id).onHide=function(){c._.on=
 0;c.setState(CKEDITOR.TRISTATE_OFF)};this.init&&this.init()}},setValue:function(a,b){this._.value=a;var d=this.document.getById("cke_"+this.id+"_text");d&&(a||b?d.removeClass("cke_combo_inlinelabel"):(b=this.label,d.addClass("cke_combo_inlinelabel")),d.setText("undefined"!=typeof b?b:a))},getValue:function(){return this._.value||""},unmarkAll:function(){this._.list.unmarkAll()},mark:function(a){this._.list.mark(a)},hideItem:function(a){this._.list.hideItem(a)},hideGroup:function(a){this._.list.hideGroup(a)},
 showAll:function(){this._.list.showAll()},add:function(a,b,d){this._.items[a]=d||a;this._.list.add(a,b,d)},startGroup:function(a){this._.list.startGroup(a)},commit:function(){this._.committed||(this._.list.commit(),this._.committed=1,CKEDITOR.ui.fire("ready",this));this._.committed=1},setState:function(a){if(this._.state!=a){var b=this.document.getById("cke_"+this.id);b.setState(a,"cke_combo");a==CKEDITOR.TRISTATE_DISABLED?b.setAttribute("aria-disabled",!0):b.removeAttribute("aria-disabled");this._.state=
-a}},getState:function(){return this._.state},enable:function(){this._.state==CKEDITOR.TRISTATE_DISABLED&&this.setState(this._.lastState)},disable:function(){this._.state!=CKEDITOR.TRISTATE_DISABLED&&(this._.lastState=this._.state,this.setState(CKEDITOR.TRISTATE_DISABLED))}},statics:{handler:{create:function(a){return new CKEDITOR.ui.richCombo(a)}}}});CKEDITOR.ui.prototype.addRichCombo=function(a,b){this.add(a,CKEDITOR.UI_RICHCOMBO,b)}})();(function(){function l(a,b,c,f,p,l,t,v){var w=a.config,q=new CKEDITOR.style(t),k=p.split(";");p=[];for(var m={},d=0;d<k.length;d++){var h=k[d];if(h){var h=h.split("/"),u={},n=k[d]=h[0];u[c]=p[d]=h[1]||n;m[n]=new CKEDITOR.style(t,u);m[n]._.definition.name=n}else k.splice(d--,1)}a.ui.addRichCombo(b,{label:f.label,title:f.panelTitle,toolbar:"styles,"+v,allowedContent:q,requiredContent:q,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(w.contentsCss),multiSelect:!1,attributes:{"aria-label":f.panelTitle}},
-init:function(){this.startGroup(f.panelTitle);for(var a=0;a<k.length;a++){var b=k[a];this.add(b,m[b].buildPreview(),b)}},onClick:function(b){a.focus();a.fire("saveSnapshot");var c=this.getValue(),f=m[b];if(c&&b!=c){var k=m[c],e=a.getSelection().getRanges()[0];if(e.collapsed){var d=a.elementPath(),g=d.contains(function(a){return k.checkElementRemovable(a)});if(g){var h=e.checkBoundaryOfElement(g,CKEDITOR.START),l=e.checkBoundaryOfElement(g,CKEDITOR.END);if(h&&l){for(h=e.createBookmark();d=g.getFirst();)d.insertBefore(g);
-g.remove();e.moveToBookmark(h)}else h?e.moveToPosition(g,CKEDITOR.POSITION_BEFORE_START):l?e.moveToPosition(g,CKEDITOR.POSITION_AFTER_END):(e.splitElement(g),e.moveToPosition(g,CKEDITOR.POSITION_AFTER_END),r(e,d.elements.slice(),g));a.getSelection().selectRanges([e])}}else a.removeStyle(k)}a[c==b?"removeStyle":"applyStyle"](f);a.fire("saveSnapshot")},onRender:function(){a.on("selectionChange",function(b){var c=this.getValue();b=b.data.path.elements;for(var d=0,f;d<b.length;d++){f=b[d];for(var e in m)if(m[e].checkElementMatch(f,
-!0,a)){e!=c&&this.setValue(e);return}}this.setValue("",l)},this)},refresh:function(){a.activeFilter.check(q)||this.setState(CKEDITOR.TRISTATE_DISABLED)}})}function r(a,b,c){var f=b.pop();if(f){if(c)return r(a,b,f.equals(c)?null:c);c=f.clone();a.insertNode(c);a.moveToPosition(c,CKEDITOR.POSITION_AFTER_START);r(a,b)}}CKEDITOR.plugins.add("font",{requires:"richcombo",init:function(a){var b=a.config;l(a,"Font","family",a.lang.font,b.font_names,b.font_defaultLabel,b.font_style,30);l(a,"FontSize","size",
-a.lang.font.fontSize,b.fontSize_sizes,b.fontSize_defaultLabel,b.fontSize_style,40)}})})();CKEDITOR.config.font_names="Arial/Arial, Helvetica, sans-serif;Comic Sans MS/Comic Sans MS, cursive;Courier New/Courier New, Courier, monospace;Georgia/Georgia, serif;Lucida Sans Unicode/Lucida Sans Unicode, Lucida Grande, sans-serif;Tahoma/Tahoma, Geneva, sans-serif;Times New Roman/Times New Roman, Times, serif;Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;Verdana/Verdana, Geneva, sans-serif";
+a}},getState:function(){return this._.state},enable:function(){this._.state==CKEDITOR.TRISTATE_DISABLED&&this.setState(this._.lastState)},disable:function(){this._.state!=CKEDITOR.TRISTATE_DISABLED&&(this._.lastState=this._.state,this.setState(CKEDITOR.TRISTATE_DISABLED))}},statics:{handler:{create:function(a){return new CKEDITOR.ui.richCombo(a)}}}});CKEDITOR.ui.prototype.addRichCombo=function(a,b){this.add(a,CKEDITOR.UI_RICHCOMBO,b)}})();(function(){function n(a,c,h,e,q,n,u,w){var x=a.config,r=new CKEDITOR.style(u),g=q.split(";");q=[];for(var m={},d=0;d<g.length;d++){var l=g[d];if(l){var l=l.split("/"),v={},p=g[d]=l[0];v[h]=q[d]=l[1]||p;m[p]=new CKEDITOR.style(u,v);m[p]._.definition.name=p}else g.splice(d--,1)}a.ui.addRichCombo(c,{label:e.label,title:e.panelTitle,toolbar:"styles,"+w,allowedContent:r,requiredContent:r,contentTransformations:[[{element:"font",check:"span",left:function(b){return!!b.attributes.size||!!b.attributes.align||
+!!b.attributes.face},right:function(b){var a=" x-small small medium large x-large xx-large 48px".split(" ");b.name="span";b.attributes.size&&(b.styles["font-size"]=a[b.attributes.size],delete b.attributes.size);b.attributes.align&&(b.styles["text-align"]=b.attributes.align,delete b.attributes.align);b.attributes.face&&(b.styles["font-family"]=b.attributes.face,delete b.attributes.face)}}]],panel:{css:[CKEDITOR.skin.getPath("editor")].concat(x.contentsCss),multiSelect:!1,attributes:{"aria-label":e.panelTitle}},
+init:function(){this.startGroup(e.panelTitle);for(var b=0;b<g.length;b++){var a=g[b];this.add(a,m[a].buildPreview(),a)}},onClick:function(b){a.focus();a.fire("saveSnapshot");var c=this.getValue(),h=m[b];if(c&&b!=c){var e=m[c],f=a.getSelection().getRanges()[0];if(f.collapsed){var g=a.elementPath(),k=g.contains(function(a){return e.checkElementRemovable(a)});if(k){var d=f.checkBoundaryOfElement(k,CKEDITOR.START),l=f.checkBoundaryOfElement(k,CKEDITOR.END);if(d&&l){for(d=f.createBookmark();g=k.getFirst();)g.insertBefore(k);
+k.remove();f.moveToBookmark(d)}else d||l?f.moveToPosition(k,d?CKEDITOR.POSITION_BEFORE_START:CKEDITOR.POSITION_AFTER_END):(f.splitElement(k),f.moveToPosition(k,CKEDITOR.POSITION_AFTER_END)),t(f,g.elements.slice(),k);a.getSelection().selectRanges([f])}}else a.removeStyle(e)}a[c==b?"removeStyle":"applyStyle"](h);a.fire("saveSnapshot")},onRender:function(){a.on("selectionChange",function(b){var c=this.getValue();b=b.data.path.elements;for(var d=0,e;d<b.length;d++){e=b[d];for(var f in m)if(m[f].checkElementMatch(e,
+!0,a)){f!=c&&this.setValue(f);return}}this.setValue("",n)},this)},refresh:function(){a.activeFilter.check(r)||this.setState(CKEDITOR.TRISTATE_DISABLED)}})}function t(a,c,h){var e=c.pop();if(e){if(h)return t(a,c,e.equals(h)?null:h);h=e.clone();a.insertNode(h);a.moveToPosition(h,CKEDITOR.POSITION_AFTER_START);t(a,c)}}CKEDITOR.plugins.add("font",{requires:"richcombo",init:function(a){var c=a.config;n(a,"Font","family",a.lang.font,c.font_names,c.font_defaultLabel,c.font_style,30);n(a,"FontSize","size",
+a.lang.font.fontSize,c.fontSize_sizes,c.fontSize_defaultLabel,c.fontSize_style,40)}})})();CKEDITOR.config.font_names="Arial/Arial, Helvetica, sans-serif;Comic Sans MS/Comic Sans MS, cursive;Courier New/Courier New, Courier, monospace;Georgia/Georgia, serif;Lucida Sans Unicode/Lucida Sans Unicode, Lucida Grande, sans-serif;Tahoma/Tahoma, Geneva, sans-serif;Times New Roman/Times New Roman, Times, serif;Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;Verdana/Verdana, Geneva, sans-serif";
 CKEDITOR.config.font_defaultLabel="";CKEDITOR.config.font_style={element:"span",styles:{"font-family":"#(family)"},overrides:[{element:"font",attributes:{face:null}}]};CKEDITOR.config.fontSize_sizes="8/8px;9/9px;10/10px;11/11px;12/12px;14/14px;16/16px;18/18px;20/20px;22/22px;24/24px;26/26px;28/28px;36/36px;48/48px;72/72px";CKEDITOR.config.fontSize_defaultLabel="";CKEDITOR.config.fontSize_style={element:"span",styles:{"font-size":"#(size)"},overrides:[{element:"font",attributes:{size:null}}]};CKEDITOR.plugins.add("forms",{requires:"dialog,fakeobjects",onLoad:function(){CKEDITOR.addCss(".cke_editable form{border: 1px dotted #FF0000;padding: 2px;}\n");CKEDITOR.addCss("img.cke_hidden{background-image: url("+CKEDITOR.getUrl(this.path+"images/hiddenfield.gif")+");background-position: center center;background-repeat: no-repeat;border: 1px solid #a9a9a9;width: 16px !important;height: 16px !important;}")},init:function(a){var b=a.lang,g=0,h={email:1,password:1,search:1,tel:1,text:1,url:1},l={checkbox:"input[type,name,checked,required]",
 radio:"input[type,name,checked,required]",textfield:"input[type,name,value,size,maxlength,required]",textarea:"textarea[cols,rows,name,required]",select:"select[name,size,multiple,required]; option[value,selected]",button:"input[type,name,value]",form:"form[action,name,id,enctype,target,method]",hiddenfield:"input[type,name,value]",imagebutton:"input[type,alt,src]{width,height,border,border-width,border-style,margin,float}"},m={checkbox:"input",radio:"input",textfield:"input",textarea:"textarea",
 select:"select",button:"input",form:"form",hiddenfield:"input",imagebutton:"input"},e=function(d,c,e){var h={allowedContent:l[c],requiredContent:m[c]};"form"==c&&(h.context="form");a.addCommand(c,new CKEDITOR.dialogCommand(c,h));a.ui.addButton&&a.ui.addButton(d,{label:b.common[d.charAt(0).toLowerCase()+d.slice(1)],command:c,toolbar:"forms,"+(g+=10)});CKEDITOR.dialog.add(c,e)},f=this.path+"dialogs/";!a.blockless&&e("Form","form",f+"form.js");e("Checkbox","checkbox",f+"checkbox.js");e("Radio","radio",
@@ -823,18 +869,19 @@ CKEDITOR.htmlWriter=CKEDITOR.tools.createClass({base:CKEDITOR.htmlParser.basicWr
 b.$block&&!(a in{li:1,dt:1,dd:1})});this.setRules("br",{breakAfterOpen:1});this.setRules("title",{indent:0,breakAfterOpen:0});this.setRules("style",{indent:0,breakBeforeClose:1});this.setRules("pre",{breakAfterOpen:1,indent:0})},proto:{openTag:function(b){var a=this._.rules[b];this._.afterCloser&&a&&a.needsSpace&&this._.needsSpace&&this._.output.push("\n");this._.indent?this.indentation():a&&a.breakBeforeOpen&&(this.lineBreak(),this.indentation());this._.output.push("\x3c",b);this._.afterCloser=0},
 openTagClose:function(b,a){var c=this._.rules[b];a?(this._.output.push(this.selfClosingEnd),c&&c.breakAfterClose&&(this._.needsSpace=c.needsSpace)):(this._.output.push("\x3e"),c&&c.indent&&(this._.indentation+=this.indentationChars));c&&c.breakAfterOpen&&this.lineBreak();"pre"==b&&(this._.inPre=1)},attribute:function(b,a){"string"==typeof a&&(this.forceSimpleAmpersand&&(a=a.replace(/&amp;/g,"\x26")),a=CKEDITOR.tools.htmlEncodeAttr(a));this._.output.push(" ",b,'\x3d"',a,'"')},closeTag:function(b){var a=
 this._.rules[b];a&&a.indent&&(this._.indentation=this._.indentation.substr(this.indentationChars.length));this._.indent?this.indentation():a&&a.breakBeforeClose&&(this.lineBreak(),this.indentation());this._.output.push("\x3c/",b,"\x3e");"pre"==b&&(this._.inPre=0);a&&a.breakAfterClose&&(this.lineBreak(),this._.needsSpace=a.needsSpace);this._.afterCloser=1},text:function(b){this._.indent&&(this.indentation(),!this._.inPre&&(b=CKEDITOR.tools.ltrim(b)));this._.output.push(b)},comment:function(b){this._.indent&&
-this.indentation();this._.output.push("\x3c!--",b,"--\x3e")},lineBreak:function(){!this._.inPre&&0<this._.output.length&&this._.output.push(this.lineBreakChars);this._.indent=1},indentation:function(){!this._.inPre&&this._.indentation&&this._.output.push(this._.indentation);this._.indent=0},reset:function(){this._.output=[];this._.indent=0;this._.indentation="";this._.afterCloser=0;this._.inPre=0},setRules:function(b,a){var c=this._.rules[b];c?CKEDITOR.tools.extend(c,a,!0):this._.rules[b]=a}}});(function(){CKEDITOR.plugins.add("iframe",{requires:"dialog,fakeobjects",onLoad:function(){CKEDITOR.addCss("img.cke_iframe{background-image: url("+CKEDITOR.getUrl(this.path+"images/placeholder.png")+");background-position: center center;background-repeat: no-repeat;border: 1px solid #a9a9a9;width: 80px;height: 80px;}")},init:function(a){var b=a.lang.iframe,c="iframe[align,longdesc,frameborder,height,name,scrolling,src,title,width]";a.plugins.dialogadvtab&&(c+=";iframe"+a.plugins.dialogadvtab.allowedContent({id:1,
+this.indentation();this._.output.push("\x3c!--",b,"--\x3e")},lineBreak:function(){!this._.inPre&&0<this._.output.length&&this._.output.push(this.lineBreakChars);this._.indent=1},indentation:function(){!this._.inPre&&this._.indentation&&this._.output.push(this._.indentation);this._.indent=0},reset:function(){this._.output=[];this._.indent=0;this._.indentation="";this._.afterCloser=0;this._.inPre=0;this._.needsSpace=0},setRules:function(b,a){var c=this._.rules[b];c?CKEDITOR.tools.extend(c,a,!0):this._.rules[b]=
+a}}});(function(){CKEDITOR.plugins.add("iframe",{requires:"dialog,fakeobjects",onLoad:function(){CKEDITOR.addCss("img.cke_iframe{background-image: url("+CKEDITOR.getUrl(this.path+"images/placeholder.png")+");background-position: center center;background-repeat: no-repeat;border: 1px solid #a9a9a9;width: 80px;height: 80px;}")},init:function(a){var b=a.lang.iframe,c="iframe[align,longdesc,frameborder,height,name,scrolling,src,title,width]";a.plugins.dialogadvtab&&(c+=";iframe"+a.plugins.dialogadvtab.allowedContent({id:1,
 classes:1,styles:1}));CKEDITOR.dialog.add("iframe",this.path+"dialogs/iframe.js");a.addCommand("iframe",new CKEDITOR.dialogCommand("iframe",{allowedContent:c,requiredContent:"iframe"}));a.ui.addButton&&a.ui.addButton("Iframe",{label:b.toolbar,command:"iframe",toolbar:"insert,80"});a.on("doubleclick",function(a){var b=a.data.element;b.is("img")&&"iframe"==b.data("cke-real-element-type")&&(a.data.dialog="iframe")});a.addMenuItems&&a.addMenuItems({iframe:{label:b.title,command:"iframe",group:"image"}});
-a.contextMenu&&a.contextMenu.addListener(function(a){if(a&&a.is("img")&&"iframe"==a.data("cke-real-element-type"))return{iframe:CKEDITOR.TRISTATE_OFF}})},afterInit:function(a){var b=a.dataProcessor;(b=b&&b.dataFilter)&&b.addRules({elements:{iframe:function(b){return a.createFakeParserElement(b,"cke_iframe","iframe",!0)}}})}})})();(function(){function m(a){function f(a){var b=!1;g.attachListener(g,"keydown",function(){var d=c.getBody().getElementsByTag(a);if(!b){for(var e=0;e<d.count();e++)d.getItem(e).setCustomData("retain",!0);b=!0}},null,null,1);g.attachListener(g,"keyup",function(){var d=c.getElementsByTag(a);b&&(1!=d.count()||d.getItem(0).getCustomData("retain")||d.getItem(0).remove(1),b=!1)})}var b=this.editor,c=a.document,d=c.body,e=c.getElementById("cke_actscrpt");e&&e.parentNode.removeChild(e);(e=c.getElementById("cke_shimscrpt"))&&
-e.parentNode.removeChild(e);(e=c.getElementById("cke_basetagscrpt"))&&e.parentNode.removeChild(e);d.contentEditable=!0;CKEDITOR.env.ie&&(d.hideFocus=!0,d.disabled=!0,d.removeAttribute("disabled"));delete this._.isLoadingData;this.$=d;c=new CKEDITOR.dom.document(c);this.setup();this.fixInitialSelection();var g=this;CKEDITOR.env.ie&&!CKEDITOR.env.edge&&c.getDocumentElement().addClass(c.$.compatMode);CKEDITOR.env.ie&&!CKEDITOR.env.edge&&b.enterMode!=CKEDITOR.ENTER_P?f("p"):CKEDITOR.env.edge&&b.enterMode!=
-CKEDITOR.ENTER_DIV&&f("div");if(CKEDITOR.env.webkit||CKEDITOR.env.ie&&10<CKEDITOR.env.version)c.getDocumentElement().on("mousedown",function(a){a.data.getTarget().is("html")&&setTimeout(function(){b.editable().focus()})});n(b);try{b.document.$.execCommand("2D-position",!1,!0)}catch(h){}(CKEDITOR.env.gecko||CKEDITOR.env.ie&&"CSS1Compat"==b.document.$.compatMode)&&this.attachListener(this,"keydown",function(a){var c=a.data.getKeystroke();if(33==c||34==c)if(CKEDITOR.env.ie)setTimeout(function(){b.getSelection().scrollIntoView()},
+a.contextMenu&&a.contextMenu.addListener(function(a){if(a&&a.is("img")&&"iframe"==a.data("cke-real-element-type"))return{iframe:CKEDITOR.TRISTATE_OFF}})},afterInit:function(a){var b=a.dataProcessor;(b=b&&b.dataFilter)&&b.addRules({elements:{iframe:function(b){return a.createFakeParserElement(b,"cke_iframe","iframe",!0)}}})}})})();(function(){function m(a){function f(a){var b=!1;g.attachListener(g,"keydown",function(){var d=c.getBody().getElementsByTag(a);if(!b){for(var e=0;e<d.count();e++)d.getItem(e).setCustomData("retain",!0);b=!0}},null,null,1);g.attachListener(g,"keyup",function(){var d=c.getElementsByTag(a);b&&(1!=d.count()||d.getItem(0).getCustomData("retain")||d.getItem(0).hasAttribute("data-cke-temp")||d.getItem(0).remove(1),b=!1)})}var b=this.editor,c=a.document,d=c.body,e=c.getElementById("cke_actscrpt");e&&e.parentNode.removeChild(e);
+(e=c.getElementById("cke_shimscrpt"))&&e.parentNode.removeChild(e);(e=c.getElementById("cke_basetagscrpt"))&&e.parentNode.removeChild(e);d.contentEditable=!0;CKEDITOR.env.ie&&(d.hideFocus=!0,d.disabled=!0,d.removeAttribute("disabled"));delete this._.isLoadingData;this.$=d;c=new CKEDITOR.dom.document(c);this.setup();this.fixInitialSelection();var g=this;CKEDITOR.env.ie&&!CKEDITOR.env.edge&&c.getDocumentElement().addClass(c.$.compatMode);CKEDITOR.env.ie&&!CKEDITOR.env.edge&&b.enterMode!=CKEDITOR.ENTER_P?
+f("p"):CKEDITOR.env.edge&&b.enterMode!=CKEDITOR.ENTER_DIV&&f("div");if(CKEDITOR.env.webkit||CKEDITOR.env.ie&&10<CKEDITOR.env.version)c.getDocumentElement().on("mousedown",function(a){a.data.getTarget().is("html")&&setTimeout(function(){b.editable().focus()})});n(b);try{b.document.$.execCommand("2D-position",!1,!0)}catch(h){}(CKEDITOR.env.gecko||CKEDITOR.env.ie&&"CSS1Compat"==b.document.$.compatMode)&&this.attachListener(this,"keydown",function(a){var c=a.data.getKeystroke();if(33==c||34==c)if(CKEDITOR.env.ie)setTimeout(function(){b.getSelection().scrollIntoView()},
 0);else if(b.window.$.innerHeight>this.$.offsetHeight){var d=b.createRange();d[33==c?"moveToElementEditStart":"moveToElementEditEnd"](this);d.select();a.data.preventDefault()}});CKEDITOR.env.ie&&this.attachListener(c,"blur",function(){try{c.$.selection.empty()}catch(a){}});CKEDITOR.env.iOS&&this.attachListener(c,"touchend",function(){a.focus()});d=b.document.getElementsByTag("title").getItem(0);d.data("cke-title",d.getText());CKEDITOR.env.ie&&(b.document.$.title=this._.docTitle);CKEDITOR.tools.setTimeout(function(){"unloaded"==
 this.status&&(this.status="ready");b.fire("contentDom");this._.isPendingFocus&&(b.focus(),this._.isPendingFocus=!1);setTimeout(function(){b.fire("dataReady")},0)},0,this)}function n(a){function f(){var c;a.editable().attachListener(a,"selectionChange",function(){var d=a.getSelection().getSelectedElement();d&&(c&&(c.detachEvent("onresizestart",b),c=null),d.$.attachEvent("onresizestart",b),c=d.$)})}function b(a){a.returnValue=!1}if(CKEDITOR.env.gecko)try{var c=a.document.$;c.execCommand("enableObjectResizing",
 !1,!a.config.disableObjectResizing);c.execCommand("enableInlineTableEditing",!1,!a.config.disableNativeTableHandles)}catch(d){}else CKEDITOR.env.ie&&11>CKEDITOR.env.version&&a.config.disableObjectResizing&&f(a)}function p(){var a=[];if(8<=CKEDITOR.document.$.documentMode){a.push("html.CSS1Compat [contenteditable\x3dfalse]{min-height:0 !important}");var f=[],b;for(b in CKEDITOR.dtd.$removeEmpty)f.push("html.CSS1Compat "+b+"[contenteditable\x3dfalse]");a.push(f.join(",")+"{display:inline-block}")}else CKEDITOR.env.gecko&&
-(a.push("html{height:100% !important}"),a.push("img:-moz-broken{-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}"));a.push("html{cursor:text;*cursor:auto}");a.push("img,input,textarea{cursor:default}");return a.join("\n")}CKEDITOR.plugins.add("wysiwygarea",{init:function(a){a.config.fullPage&&a.addFeature({allowedContent:"html head title; style [media,type]; body (*)[id]; meta link [*]",requiredContent:"body"});a.addMode("wysiwyg",function(f){function b(b){b&&b.removeListener();a.editable(new l(a,
-d.$.contentWindow.document.body));a.setData(a.getData(1),f)}var c="document.open();"+(CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+")();":"")+"document.close();",c=CKEDITOR.env.air?"javascript:void(0)":CKEDITOR.env.ie&&!CKEDITOR.env.edge?"javascript:void(function(){"+encodeURIComponent(c)+"}())":"",d=CKEDITOR.dom.element.createFromHtml('\x3ciframe src\x3d"'+c+'" frameBorder\x3d"0"\x3e\x3c/iframe\x3e');d.setStyles({width:"100%",height:"100%"});d.addClass("cke_wysiwyg_frame").addClass("cke_reset");
+(a.push("html{height:100% !important}"),a.push("img:-moz-broken{-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}"));a.push("html{cursor:text;*cursor:auto}");a.push("img,input,textarea{cursor:default}");return a.join("\n")}var l;CKEDITOR.plugins.add("wysiwygarea",{init:function(a){a.config.fullPage&&a.addFeature({allowedContent:"html head title; style [media,type]; body (*)[id]; meta link [*]",requiredContent:"body"});a.addMode("wysiwyg",function(f){function b(b){b&&b.removeListener();
+a.editable(new l(a,d.$.contentWindow.document.body));a.setData(a.getData(1),f)}var c="document.open();"+(CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+")();":"")+"document.close();",c=CKEDITOR.env.air?"javascript:void(0)":CKEDITOR.env.ie&&!CKEDITOR.env.edge?"javascript:void(function(){"+encodeURIComponent(c)+"}())":"",d=CKEDITOR.dom.element.createFromHtml('\x3ciframe src\x3d"'+c+'" frameBorder\x3d"0"\x3e\x3c/iframe\x3e');d.setStyles({width:"100%",height:"100%"});d.addClass("cke_wysiwyg_frame").addClass("cke_reset");
 c=a.ui.space("contents");c.append(d);var e=CKEDITOR.env.ie&&!CKEDITOR.env.edge||CKEDITOR.env.gecko;if(e)d.on("load",b);var g=a.title,h=a.fire("ariaEditorHelpLabel",{}).label;g&&(CKEDITOR.env.ie&&h&&(g+=", "+h),d.setAttribute("title",g));if(h){var g=CKEDITOR.tools.getNextId(),k=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+g+'" class\x3d"cke_voice_label"\x3e'+h+"\x3c/span\x3e");c.append(k,1);d.setAttribute("aria-describedby",g)}a.on("beforeModeUnload",function(a){a.removeListener();k&&k.remove()});
-d.setAttributes({tabIndex:a.tabIndex,allowTransparency:"true"});!e&&b();a.fire("ariaWidget",d)})}});CKEDITOR.editor.prototype.addContentsCss=function(a){var f=this.config,b=f.contentsCss;CKEDITOR.tools.isArray(b)||(f.contentsCss=b?[b]:[]);f.contentsCss.push(a)};var l=CKEDITOR.tools.createClass({$:function(){this.base.apply(this,arguments);this._.frameLoadedHandler=CKEDITOR.tools.addFunction(function(a){CKEDITOR.tools.setTimeout(m,0,this,a)},this);this._.docTitle=this.getWindow().getFrame().getAttribute("title")},
+d.setAttributes({tabIndex:a.tabIndex,allowTransparency:"true"});!e&&b();a.fire("ariaWidget",d)})}});CKEDITOR.editor.prototype.addContentsCss=function(a){var f=this.config,b=f.contentsCss;CKEDITOR.tools.isArray(b)||(f.contentsCss=b?[b]:[]);f.contentsCss.push(a)};l=CKEDITOR.tools.createClass({$:function(){this.base.apply(this,arguments);this._.frameLoadedHandler=CKEDITOR.tools.addFunction(function(a){CKEDITOR.tools.setTimeout(m,0,this,a)},this);this._.docTitle=this.getWindow().getFrame().getAttribute("title")},
 base:CKEDITOR.editable,proto:{setData:function(a,f){var b=this.editor;if(f)this.setHtml(a),this.fixInitialSelection(),b.fire("dataReady");else{this._.isLoadingData=!0;b._.dataStore={id:1};var c=b.config,d=c.fullPage,e=c.docType,g=CKEDITOR.tools.buildStyleHtml(p()).replace(/<style>/,'\x3cstyle data-cke-temp\x3d"1"\x3e');d||(g+=CKEDITOR.tools.buildStyleHtml(b.config.contentsCss));var h=c.baseHref?'\x3cbase href\x3d"'+c.baseHref+'" data-cke-temp\x3d"1" /\x3e':"";d&&(a=a.replace(/<!DOCTYPE[^>]*>/i,function(a){b.docType=
 e=a;return""}).replace(/<\?xml\s[^\?]*\?>/i,function(a){b.xmlDeclaration=a;return""}));a=b.dataProcessor.toHtml(a);d?(/<body[\s|>]/.test(a)||(a="\x3cbody\x3e"+a),/<html[\s|>]/.test(a)||(a="\x3chtml\x3e"+a+"\x3c/html\x3e"),/<head[\s|>]/.test(a)?/<title[\s|>]/.test(a)||(a=a.replace(/<head[^>]*>/,"$\x26\x3ctitle\x3e\x3c/title\x3e")):a=a.replace(/<html[^>]*>/,"$\x26\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e"),h&&(a=a.replace(/<head[^>]*?>/,"$\x26"+h)),a=a.replace(/<\/head\s*>/,g+"$\x26"),a=
 e+a):a=c.docType+'\x3chtml dir\x3d"'+c.contentsLangDirection+'" lang\x3d"'+(c.contentsLanguage||b.langCode)+'"\x3e\x3chead\x3e\x3ctitle\x3e'+this._.docTitle+"\x3c/title\x3e"+h+g+"\x3c/head\x3e\x3cbody"+(c.bodyId?' id\x3d"'+c.bodyId+'"':"")+(c.bodyClass?' class\x3d"'+c.bodyClass+'"':"")+"\x3e"+a+"\x3c/body\x3e\x3c/html\x3e";CKEDITOR.env.gecko&&(a=a.replace(/<body/,'\x3cbody contenteditable\x3d"true" '),2E4>CKEDITOR.env.version&&(a=a.replace(/<body[^>]*>/,"$\x26\x3c!-- cke-content-start --\x3e")));
@@ -851,9 +898,10 @@ this.startDisabled=!this.isIndent},specificDefinition:function(a,b,e){this.name=
 !0),a.fire("unlockSnapshot"),CKEDITOR.dom.element.clearAllMarkers(b.database))},this,null,c),e.on("refresh",function(d){d.data.states||(d.data.states={});d.data.states[b.name+"@"+c]=b.refreshJob(a,c,d.data.path)},this,null,c);a.addFeature(b)})(this,b[a])})}};CKEDITOR.plugins.indent.genericDefinition.prototype={context:"p",exec:function(){}};CKEDITOR.plugins.indent.specificDefinition.prototype={execJob:function(a,b){var e=this.jobs[b];if(e.state!=k)return e.exec.call(this,a)},refreshJob:function(a,
 b,e){b=this.jobs[b];a.activeFilter.checkFeature(this)?b.state=b.refresh.call(this,a,e):b.state=k;return b.state},getContext:function(a){return a.contains(this.context)}}})();(function(){function f(b,c,a){if(!b.getCustomData("indent_processed")){var d=this.editor,l=this.isIndent;if(c){d=b.$.className.match(this.classNameRegex);a=0;d&&(d=d[1],a=CKEDITOR.tools.indexOf(c,d)+1);if(0>(a+=l?1:-1))return;a=Math.min(a,c.length);a=Math.max(a,0);b.$.className=CKEDITOR.tools.ltrim(b.$.className.replace(this.classNameRegex,""));0<a&&b.addClass(c[a-1])}else{c=m(b,a);a=parseInt(b.getStyle(c),10);var g=d.config.indentOffset||40;isNaN(a)&&(a=0);a+=(l?1:-1)*g;if(0>a)return;a=Math.max(a,
 0);a=Math.ceil(a/g)*g;b.setStyle(c,a?a+(d.config.indentUnit||"px"):"");""===b.getAttribute("style")&&b.removeAttribute("style")}CKEDITOR.dom.element.setMarker(this.database,b,"indent_processed",1)}}function m(b,c){return"ltr"==(c||b.getComputedStyle("direction"))?"margin-left":"margin-right"}var h=CKEDITOR.dtd.$listItem,p=CKEDITOR.dtd.$list,k=CKEDITOR.TRISTATE_DISABLED,n=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indentblock",{requires:"indent",init:function(b){function c(){a.specificDefinition.apply(this,
-arguments);this.allowedContent={"div h1 h2 h3 h4 h5 h6 ol p pre ul":{propertiesOnly:!0,styles:d?null:"margin-left,margin-right",classes:d||null}};this.enterBr&&(this.allowedContent.div=!0);this.requiredContent=(this.enterBr?"div":"p")+(d?"("+d.join(",")+")":"{margin-left}");this.jobs={20:{refresh:function(a,b){var e=b.block||b.blockLimit;if(!e.is(h))var c=e.getAscendant(h),e=c&&b.contains(c)||e;e.is(h)&&(e=e.getParent());if(this.enterBr||this.getContext(b)){if(d){var c=d,e=e.$.className.match(this.classNameRegex),
-f=this.isIndent,c=e?f?e[1]!=c.slice(-1):!0:f;return c?n:k}return this.isIndent?n:e?CKEDITOR[0>=(parseInt(e.getStyle(m(e)),10)||0)?"TRISTATE_DISABLED":"TRISTATE_OFF"]:k}return k},exec:function(a){var b=a.getSelection(),b=b&&b.getRanges()[0],c;if(c=a.elementPath().contains(p))f.call(this,c,d);else for(b=b.createIterator(),a=a.config.enterMode,b.enforceRealBlocks=!0,b.enlargeBr=a!=CKEDITOR.ENTER_BR;c=b.getNextParagraph(a==CKEDITOR.ENTER_P?"p":"div");)c.isReadOnly()||f.call(this,c,d);return!0}}}}var a=
-CKEDITOR.plugins.indent,d=b.config.indentClasses;a.registerCommands(b,{indentblock:new c(b,"indentblock",!0),outdentblock:new c(b,"outdentblock")});CKEDITOR.tools.extend(c.prototype,a.specificDefinition.prototype,{context:{div:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,ul:1,ol:1,p:1,pre:1,table:1},classNameRegex:d?new RegExp("(?:^|\\s+)("+d.join("|")+")(?\x3d$|\\s)"):null})}})})();(function(){function w(c){function f(b){for(var e=d.startContainer,a=d.endContainer;e&&!e.getParent().equals(b);)e=e.getParent();for(;a&&!a.getParent().equals(b);)a=a.getParent();if(!e||!a)return!1;for(var g=e,e=[],k=!1;!k;)g.equals(a)&&(k=!0),e.push(g),g=g.getNext();if(1>e.length)return!1;g=b.getParents(!0);for(a=0;a<g.length;a++)if(g[a].getName&&p[g[a].getName()]){b=g[a];break}for(var g=l.isIndent?1:-1,a=e[0],e=e[e.length-1],k=CKEDITOR.plugins.list.listToArray(b,q),n=k[e.getCustomData("listarray_index")].indent,
+arguments);this.allowedContent={"div h1 h2 h3 h4 h5 h6 ol p pre ul":{propertiesOnly:!0,styles:d?null:"margin-left,margin-right",classes:d||null}};this.contentTransformations=[["div: splitMarginShorthand"],["h1: splitMarginShorthand"],["h2: splitMarginShorthand"],["h3: splitMarginShorthand"],["h4: splitMarginShorthand"],["h5: splitMarginShorthand"],["h6: splitMarginShorthand"],["ol: splitMarginShorthand"],["p: splitMarginShorthand"],["pre: splitMarginShorthand"],["ul: splitMarginShorthand"]];this.enterBr&&
+(this.allowedContent.div=!0);this.requiredContent=(this.enterBr?"div":"p")+(d?"("+d.join(",")+")":"{margin-left}");this.jobs={20:{refresh:function(a,b){var e=b.block||b.blockLimit;if(!e.is(h))var c=e.getAscendant(h),e=c&&b.contains(c)||e;e.is(h)&&(e=e.getParent());if(this.enterBr||this.getContext(b)){if(d){var c=d,e=e.$.className.match(this.classNameRegex),f=this.isIndent,c=e?f?e[1]!=c.slice(-1):!0:f;return c?n:k}return this.isIndent?n:e?CKEDITOR[0>=(parseInt(e.getStyle(m(e)),10)||0)?"TRISTATE_DISABLED":
+"TRISTATE_OFF"]:k}return k},exec:function(a){var b=a.getSelection(),b=b&&b.getRanges()[0],c;if(c=a.elementPath().contains(p))f.call(this,c,d);else for(b=b.createIterator(),a=a.config.enterMode,b.enforceRealBlocks=!0,b.enlargeBr=a!=CKEDITOR.ENTER_BR;c=b.getNextParagraph(a==CKEDITOR.ENTER_P?"p":"div");)c.isReadOnly()||f.call(this,c,d);return!0}}}}var a=CKEDITOR.plugins.indent,d=b.config.indentClasses;a.registerCommands(b,{indentblock:new c(b,"indentblock",!0),outdentblock:new c(b,"outdentblock")});
+CKEDITOR.tools.extend(c.prototype,a.specificDefinition.prototype,{context:{div:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,ul:1,ol:1,p:1,pre:1,table:1},classNameRegex:d?new RegExp("(?:^|\\s+)("+d.join("|")+")(?\x3d$|\\s)"):null})}})})();(function(){function w(c){function f(b){for(var e=d.startContainer,a=d.endContainer;e&&!e.getParent().equals(b);)e=e.getParent();for(;a&&!a.getParent().equals(b);)a=a.getParent();if(!e||!a)return!1;for(var g=e,e=[],k=!1;!k;)g.equals(a)&&(k=!0),e.push(g),g=g.getNext();if(1>e.length)return!1;g=b.getParents(!0);for(a=0;a<g.length;a++)if(g[a].getName&&p[g[a].getName()]){b=g[a];break}for(var g=l.isIndent?1:-1,a=e[0],e=e[e.length-1],k=CKEDITOR.plugins.list.listToArray(b,q),n=k[e.getCustomData("listarray_index")].indent,
 a=a.getCustomData("listarray_index");a<=e.getCustomData("listarray_index");a++)if(k[a].indent+=g,0<g){var h=k[a].parent;k[a].parent=new CKEDITOR.dom.element(h.getName(),h.getDocument())}for(a=e.getCustomData("listarray_index")+1;a<k.length&&k[a].indent>n;a++)k[a].indent+=g;e=CKEDITOR.plugins.list.arrayToList(k,q,null,c.config.enterMode,b.getDirection());if(!l.isIndent){var f;if((f=b.getParent())&&f.is("li"))for(var g=e.listNode.getChildren(),r=[],m,a=g.count()-1;0<=a;a--)(m=g.getItem(a))&&m.is&&m.is("li")&&
 r.push(m)}e&&e.listNode.replace(b);if(r&&r.length)for(a=0;a<r.length;a++){for(m=b=r[a];(m=m.getNext())&&m.is&&m.getName()in p;)CKEDITOR.env.needsNbspFiller&&!b.getFirst(x)&&b.append(d.document.createText(" ")),b.append(m);b.insertAfter(f)}e&&c.fire("contentDomInvalidated");return!0}for(var l=this,q=this.database,p=this.context,n=c.getSelection(),n=(n&&n.getRanges()).createIterator(),d;d=n.getNextRange();){for(var b=d.getCommonAncestor();b&&(b.type!=CKEDITOR.NODE_ELEMENT||!p[b.getName()]);){if(c.editable().equals(b)){b=
 !1;break}b=b.getParent()}b||(b=d.startPath().contains(p))&&d.setEndAt(b,CKEDITOR.POSITION_BEFORE_END);if(!b){var h=d.getEnclosedNode();h&&h.type==CKEDITOR.NODE_ELEMENT&&h.getName()in p&&(d.setStartAt(h,CKEDITOR.POSITION_AFTER_START),d.setEndAt(h,CKEDITOR.POSITION_BEFORE_END),b=h)}b&&d.startContainer.type==CKEDITOR.NODE_ELEMENT&&d.startContainer.getName()in p&&(h=new CKEDITOR.dom.walker(d),h.evaluator=t,d.startContainer=h.next());b&&d.endContainer.type==CKEDITOR.NODE_ELEMENT&&d.endContainer.getName()in
@@ -873,23 +921,24 @@ CKEDITOR.TRISTATE_OFF)}});for(f=0;f<b.length;f++)g=b[f].split(":"),h=g[0],k="lan
 b&&a.execCommand("language",b.getAttribute("lang"))}};a.addMenuGroup("language",1);a.addMenuGroup("language_remove");a.addMenuItems(e);a.ui.add("Language",CKEDITOR.UI_MENUBUTTON,{label:d.button,allowedContent:"span[!lang,!dir]",requiredContent:"span[lang,dir]",toolbar:"bidi,30",command:"language",onMenu:function(){var b={},d=c.getCurrentLangElement(a),f;for(f in e)b[f]=CKEDITOR.TRISTATE_OFF;b.language_remove=d?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED;d&&(b["language_"+d.getAttribute("lang")]=
 CKEDITOR.TRISTATE_ON);return b}})},getCurrentLangElement:function(a){var b=a.elementPath();a=b&&b.elements;var c;if(b)for(var d=0;d<a.length;d++)b=a[d],!c&&"span"==b.getName()&&b.hasAttribute("dir")&&b.hasAttribute("lang")&&(c=b);return c}})})();(function(){function p(c){return c.replace(/'/g,"\\$\x26")}function q(c){for(var b,a=c.length,f=[],e=0;e<a;e++)b=c.charCodeAt(e),f.push(b);return"String.fromCharCode("+f.join(",")+")"}function r(c,b){var a=c.plugins.link,f=a.compiledProtectionFunction.params,e,d;d=[a.compiledProtectionFunction.name,"("];for(var g=0;g<f.length;g++)a=f[g].toLowerCase(),e=b[a],0<g&&d.push(","),d.push("'",e?p(encodeURIComponent(b[a])):"","'");d.push(")");return d.join("")}function n(c){c=c.config.emailProtection||"";
 var b;c&&"encode"!=c&&(b={},c.replace(/^([^(]+)\(([^)]+)\)$/,function(a,c,e){b.name=c;b.params=[];e.replace(/[^,\s]+/g,function(a){b.params.push(a)})}));return b}CKEDITOR.plugins.add("link",{requires:"dialog,fakeobjects",onLoad:function(){function c(b){return a.replace(/%1/g,"rtl"==b?"right":"left").replace(/%2/g,"cke_contents_"+b)}var b="background:url("+CKEDITOR.getUrl(this.path+"images"+(CKEDITOR.env.hidpi?"/hidpi":"")+"/anchor.png")+") no-repeat %1 center;border:1px dotted #00f;background-size:16px;",
-a=".%2 a.cke_anchor,.%2 a.cke_anchor_empty,.cke_editable.%2 a[name],.cke_editable.%2 a[data-cke-saved-name]{"+b+"padding-%1:18px;cursor:auto;}.%2 img.cke_anchor{"+b+"width:16px;min-height:15px;height:1.15em;vertical-align:text-bottom;}";CKEDITOR.addCss(c("ltr")+c("rtl"))},init:function(c){var b="a[!href]";CKEDITOR.dialog.isTabEnabled(c,"link","advanced")&&(b=b.replace("]",",accesskey,charset,dir,id,lang,name,rel,tabindex,title,type]{*}(*)"));CKEDITOR.dialog.isTabEnabled(c,"link","target")&&(b=b.replace("]",
-",target,onclick]"));c.addCommand("link",new CKEDITOR.dialogCommand("link",{allowedContent:b,requiredContent:"a[href]"}));c.addCommand("anchor",new CKEDITOR.dialogCommand("anchor",{allowedContent:"a[!name,id]",requiredContent:"a[name]"}));c.addCommand("unlink",new CKEDITOR.unlinkCommand);c.addCommand("removeAnchor",new CKEDITOR.removeAnchorCommand);c.setKeystroke(CKEDITOR.CTRL+76,"link");c.ui.addButton&&(c.ui.addButton("Link",{label:c.lang.link.toolbar,command:"link",toolbar:"links,10"}),c.ui.addButton("Unlink",
-{label:c.lang.link.unlink,command:"unlink",toolbar:"links,20"}),c.ui.addButton("Anchor",{label:c.lang.link.anchor.toolbar,command:"anchor",toolbar:"links,30"}));CKEDITOR.dialog.add("link",this.path+"dialogs/link.js");CKEDITOR.dialog.add("anchor",this.path+"dialogs/anchor.js");c.on("doubleclick",function(a){var b=CKEDITOR.plugins.link.getSelectedLink(c)||a.data.element;b.isReadOnly()||(b.is("a")?(a.data.dialog=!b.getAttribute("name")||b.getAttribute("href")&&b.getChildCount()?"link":"anchor",a.data.link=
-b):CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,b)&&(a.data.dialog="anchor"))},null,null,0);c.on("doubleclick",function(a){a.data.dialog in{link:1,anchor:1}&&a.data.link&&c.getSelection().selectElement(a.data.link)},null,null,20);c.addMenuItems&&c.addMenuItems({anchor:{label:c.lang.link.anchor.menu,command:"anchor",group:"anchor",order:1},removeAnchor:{label:c.lang.link.anchor.remove,command:"removeAnchor",group:"anchor",order:5},link:{label:c.lang.link.menu,command:"link",group:"link",order:1},unlink:{label:c.lang.link.unlink,
-command:"unlink",group:"link",order:5}});c.contextMenu&&c.contextMenu.addListener(function(a){if(!a||a.isReadOnly())return null;a=CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,a);if(!a&&!(a=CKEDITOR.plugins.link.getSelectedLink(c)))return null;var b={};a.getAttribute("href")&&a.getChildCount()&&(b={link:CKEDITOR.TRISTATE_OFF,unlink:CKEDITOR.TRISTATE_OFF});a&&a.hasAttribute("name")&&(b.anchor=b.removeAnchor=CKEDITOR.TRISTATE_OFF);return b});this.compiledProtectionFunction=n(c)},afterInit:function(c){c.dataProcessor.dataFilter.addRules({elements:{a:function(a){return a.attributes.name?
-a.children.length?null:c.createFakeParserElement(a,"cke_anchor","anchor"):null}}});var b=c._.elementsPath&&c._.elementsPath.filters;b&&b.push(function(a,b){if("a"==b&&(CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,a)||a.getAttribute("name")&&(!a.getAttribute("href")||!a.getChildCount())))return"anchor"})}});var t=/^javascript:/,u=/^mailto:([^?]+)(?:\?(.+))?$/,v=/subject=([^;?:@&=$,\/]*)/i,w=/body=([^;?:@&=$,\/]*)/i,x=/^#(.*)$/,y=/^((?:http|https|ftp|news):\/\/)?(.*)$/,z=/^(_(?:self|top|parent|blank))$/,
-A=/^javascript:void\(location\.href='mailto:'\+String\.fromCharCode\(([^)]+)\)(?:\+'(.*)')?\)$/,B=/^javascript:([^(]+)\(([^)]+)\)$/,C=/\s*window.open\(\s*this\.href\s*,\s*(?:'([^']*)'|null)\s*,\s*'([^']*)'\s*\)\s*;\s*return\s*false;*\s*/,D=/(?:^|,)([^=]+)=(\d+|yes|no)/gi,m={id:"advId",dir:"advLangDir",accessKey:"advAccessKey",name:"advName",lang:"advLangCode",tabindex:"advTabIndex",title:"advTitle",type:"advContentType","class":"advCSSClasses",charset:"advCharset",style:"advStyles",rel:"advRel"};
-CKEDITOR.plugins.link={getSelectedLink:function(c){var b=c.getSelection(),a=b.getSelectedElement();return a&&a.is("a")?a:(b=b.getRanges()[0])?(b.shrink(CKEDITOR.SHRINK_TEXT),c.elementPath(b.getCommonAncestor()).contains("a",1)):null},getEditorAnchors:function(c){for(var b=c.editable(),a=b.isInline()&&!c.plugins.divarea?c.document:b,b=a.getElementsByTag("a"),a=a.getElementsByTag("img"),f=[],e=0,d;d=b.getItem(e++);)(d.data("cke-saved-name")||d.hasAttribute("name"))&&f.push({name:d.data("cke-saved-name")||
-d.getAttribute("name"),id:d.getAttribute("id")});for(e=0;d=a.getItem(e++);)(d=this.tryRestoreFakeAnchor(c,d))&&f.push({name:d.getAttribute("name"),id:d.getAttribute("id")});return f},fakeAnchor:!0,tryRestoreFakeAnchor:function(c,b){if(b&&b.data("cke-real-element-type")&&"anchor"==b.data("cke-real-element-type")){var a=c.restoreRealElement(b);if(a.data("cke-saved-name"))return a}},parseLinkAttributes:function(c,b){var a=b&&(b.data("cke-saved-href")||b.getAttribute("href"))||"",f=c.plugins.link.compiledProtectionFunction,
-e=c.config.emailProtection,d,g={};a.match(t)&&("encode"==e?a=a.replace(A,function(a,b,c){c=c||"";return"mailto:"+String.fromCharCode.apply(String,b.split(","))+c.replace(/\\'/g,"'")}):e&&a.replace(B,function(a,b,c){if(b==f.name){g.type="email";a=g.email={};b=/(^')|('$)/g;c=c.match(/[^,\s]+/g);for(var d=c.length,e,h,k=0;k<d;k++)e=decodeURIComponent,h=c[k].replace(b,"").replace(/\\'/g,"'"),h=e(h),e=f.params[k].toLowerCase(),a[e]=h;a.address=[a.name,a.domain].join("@")}}));if(!g.type)if(e=a.match(x))g.type=
-"anchor",g.anchor={},g.anchor.name=g.anchor.id=e[1];else if(e=a.match(u)){d=a.match(v);a=a.match(w);g.type="email";var k=g.email={};k.address=e[1];d&&(k.subject=decodeURIComponent(d[1]));a&&(k.body=decodeURIComponent(a[1]))}else a&&(d=a.match(y))&&(g.type="url",g.url={},g.url.protocol=d[1],g.url.url=d[2]);if(b){if(a=b.getAttribute("target"))g.target={type:a.match(z)?a:"frame",name:a};else if(a=(a=b.data("cke-pa-onclick")||b.getAttribute("onclick"))&&a.match(C))for(g.target={type:"popup",name:a[1]};e=
-D.exec(a[2]);)"yes"!=e[2]&&"1"!=e[2]||e[1]in{height:1,width:1,top:1,left:1}?isFinite(e[2])&&(g.target[e[1]]=e[2]):g.target[e[1]]=!0;var a={},h;for(h in m)(e=b.getAttribute(h))&&(a[m[h]]=e);if(h=b.data("cke-saved-name")||a.advName)a.advName=h;CKEDITOR.tools.isEmpty(a)||(g.advanced=a)}return g},getLinkAttributes:function(c,b){var a=c.config.emailProtection||"",f={};switch(b.type){case "url":var a=b.url&&void 0!==b.url.protocol?b.url.protocol:"http://",e=b.url&&CKEDITOR.tools.trim(b.url.url)||"";f["data-cke-saved-href"]=
-0===e.indexOf("/")?e:a+e;break;case "anchor":a=b.anchor&&b.anchor.id;f["data-cke-saved-href"]="#"+(b.anchor&&b.anchor.name||a||"");break;case "email":var d=b.email,e=d.address;switch(a){case "":case "encode":var g=encodeURIComponent(d.subject||""),k=encodeURIComponent(d.body||""),d=[];g&&d.push("subject\x3d"+g);k&&d.push("body\x3d"+k);d=d.length?"?"+d.join("\x26"):"";"encode"==a?(a=["javascript:void(location.href\x3d'mailto:'+",q(e)],d&&a.push("+'",p(d),"'"),a.push(")")):a=["mailto:",e,d];break;default:a=
-e.split("@",2),d.name=a[0],d.domain=a[1],a=["javascript:",r(c,d)]}f["data-cke-saved-href"]=a.join("")}if(b.target)if("popup"==b.target.type){for(var a=["window.open(this.href, '",b.target.name||"","', '"],h="resizable status location toolbar menubar fullscreen scrollbars dependent".split(" "),e=h.length,g=function(a){b.target[a]&&h.push(a+"\x3d"+b.target[a])},d=0;d<e;d++)h[d]+=b.target[h[d]]?"\x3dyes":"\x3dno";g("width");g("left");g("height");g("top");a.push(h.join(","),"'); return false;");f["data-cke-pa-onclick"]=
-a.join("")}else"notSet"!=b.target.type&&b.target.name&&(f.target=b.target.name);if(b.advanced){for(var l in m)(a=b.advanced[m[l]])&&(f[l]=a);f.name&&(f["data-cke-saved-name"]=f.name)}f["data-cke-saved-href"]&&(f.href=f["data-cke-saved-href"]);l={target:1,onclick:1,"data-cke-pa-onclick":1,"data-cke-saved-name":1};b.advanced&&CKEDITOR.tools.extend(l,m);for(var n in f)delete l[n];return{set:f,removed:CKEDITOR.tools.objectKeys(l)}}};CKEDITOR.unlinkCommand=function(){};CKEDITOR.unlinkCommand.prototype=
-{exec:function(c){var b=new CKEDITOR.style({element:"a",type:CKEDITOR.STYLE_INLINE,alwaysRemoveElement:1});c.removeStyle(b)},refresh:function(c,b){var a=b.lastElement&&b.lastElement.getAscendant("a",!0);a&&"a"==a.getName()&&a.getAttribute("href")&&a.getChildCount()?this.setState(CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_DISABLED)},contextSensitive:1,startDisabled:1,requiredContent:"a[href]"};CKEDITOR.removeAnchorCommand=function(){};CKEDITOR.removeAnchorCommand.prototype={exec:function(c){var b=
-c.getSelection(),a=b.createBookmarks(),f;if(b&&(f=b.getSelectedElement())&&(f.getChildCount()?f.is("a"):CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,f)))f.remove(1);else if(f=CKEDITOR.plugins.link.getSelectedLink(c))f.hasAttribute("href")?(f.removeAttributes({name:1,"data-cke-saved-name":1}),f.removeClass("cke_anchor")):f.remove(1);b.selectBookmarks(a)},requiredContent:"a[name]"};CKEDITOR.tools.extend(CKEDITOR.config,{linkShowAdvancedTab:!0,linkShowTargetTab:!0})})();(function(){function I(b,m,e){function c(c){if(!(!(a=d[c?"getFirst":"getLast"]())||a.is&&a.isBlockBoundary()||!(p=m.root[c?"getPrevious":"getNext"](CKEDITOR.dom.walker.invisible(!0)))||p.is&&p.isBlockBoundary({br:1})))b.document.createElement("br")[c?"insertBefore":"insertAfter"](a)}for(var f=CKEDITOR.plugins.list.listToArray(m.root,e),g=[],k=0;k<m.contents.length;k++){var h=m.contents[k];(h=h.getAscendant("li",!0))&&!h.getCustomData("list_item_processed")&&(g.push(h),CKEDITOR.dom.element.setMarker(e,
+a=".%2 a.cke_anchor,.%2 a.cke_anchor_empty,.cke_editable.%2 a[name],.cke_editable.%2 a[data-cke-saved-name]{"+b+"padding-%1:18px;cursor:auto;}.%2 img.cke_anchor{"+b+"width:16px;min-height:15px;height:1.15em;vertical-align:text-bottom;}";CKEDITOR.addCss(c("ltr")+c("rtl"))},init:function(c){var b="a[!href]";CKEDITOR.dialog.isTabEnabled(c,"link","advanced")&&(b=b.replace("]",",accesskey,charset,dir,id,lang,name,rel,tabindex,title,type,download]{*}(*)"));CKEDITOR.dialog.isTabEnabled(c,"link","target")&&
+(b=b.replace("]",",target,onclick]"));c.addCommand("link",new CKEDITOR.dialogCommand("link",{allowedContent:b,requiredContent:"a[href]"}));c.addCommand("anchor",new CKEDITOR.dialogCommand("anchor",{allowedContent:"a[!name,id]",requiredContent:"a[name]"}));c.addCommand("unlink",new CKEDITOR.unlinkCommand);c.addCommand("removeAnchor",new CKEDITOR.removeAnchorCommand);c.setKeystroke(CKEDITOR.CTRL+76,"link");c.ui.addButton&&(c.ui.addButton("Link",{label:c.lang.link.toolbar,command:"link",toolbar:"links,10"}),
+c.ui.addButton("Unlink",{label:c.lang.link.unlink,command:"unlink",toolbar:"links,20"}),c.ui.addButton("Anchor",{label:c.lang.link.anchor.toolbar,command:"anchor",toolbar:"links,30"}));CKEDITOR.dialog.add("link",this.path+"dialogs/link.js");CKEDITOR.dialog.add("anchor",this.path+"dialogs/anchor.js");c.on("doubleclick",function(a){var b=CKEDITOR.plugins.link.getSelectedLink(c)||a.data.element;b.isReadOnly()||(b.is("a")?(a.data.dialog=!b.getAttribute("name")||b.getAttribute("href")&&b.getChildCount()?
+"link":"anchor",a.data.link=b):CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,b)&&(a.data.dialog="anchor"))},null,null,0);c.on("doubleclick",function(a){a.data.dialog in{link:1,anchor:1}&&a.data.link&&c.getSelection().selectElement(a.data.link)},null,null,20);c.addMenuItems&&c.addMenuItems({anchor:{label:c.lang.link.anchor.menu,command:"anchor",group:"anchor",order:1},removeAnchor:{label:c.lang.link.anchor.remove,command:"removeAnchor",group:"anchor",order:5},link:{label:c.lang.link.menu,command:"link",
+group:"link",order:1},unlink:{label:c.lang.link.unlink,command:"unlink",group:"link",order:5}});c.contextMenu&&c.contextMenu.addListener(function(a){if(!a||a.isReadOnly())return null;a=CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,a);if(!a&&!(a=CKEDITOR.plugins.link.getSelectedLink(c)))return null;var b={};a.getAttribute("href")&&a.getChildCount()&&(b={link:CKEDITOR.TRISTATE_OFF,unlink:CKEDITOR.TRISTATE_OFF});a&&a.hasAttribute("name")&&(b.anchor=b.removeAnchor=CKEDITOR.TRISTATE_OFF);return b});this.compiledProtectionFunction=
+n(c)},afterInit:function(c){c.dataProcessor.dataFilter.addRules({elements:{a:function(a){return a.attributes.name?a.children.length?null:c.createFakeParserElement(a,"cke_anchor","anchor"):null}}});var b=c._.elementsPath&&c._.elementsPath.filters;b&&b.push(function(a,b){if("a"==b&&(CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,a)||a.getAttribute("name")&&(!a.getAttribute("href")||!a.getChildCount())))return"anchor"})}});var t=/^javascript:/,u=/^mailto:([^?]+)(?:\?(.+))?$/,v=/subject=([^;?:@&=$,\/]*)/i,
+w=/body=([^;?:@&=$,\/]*)/i,x=/^#(.*)$/,y=/^((?:http|https|ftp|news):\/\/)?(.*)$/,z=/^(_(?:self|top|parent|blank))$/,A=/^javascript:void\(location\.href='mailto:'\+String\.fromCharCode\(([^)]+)\)(?:\+'(.*)')?\)$/,B=/^javascript:([^(]+)\(([^)]+)\)$/,C=/\s*window.open\(\s*this\.href\s*,\s*(?:'([^']*)'|null)\s*,\s*'([^']*)'\s*\)\s*;\s*return\s*false;*\s*/,D=/(?:^|,)([^=]+)=(\d+|yes|no)/gi,m={id:"advId",dir:"advLangDir",accessKey:"advAccessKey",name:"advName",lang:"advLangCode",tabindex:"advTabIndex",
+title:"advTitle",type:"advContentType","class":"advCSSClasses",charset:"advCharset",style:"advStyles",rel:"advRel"};CKEDITOR.plugins.link={getSelectedLink:function(c){var b=c.getSelection(),a=b.getSelectedElement();return a&&a.is("a")?a:(b=b.getRanges()[0])?(b.shrink(CKEDITOR.SHRINK_TEXT),c.elementPath(b.getCommonAncestor()).contains("a",1)):null},getEditorAnchors:function(c){for(var b=c.editable(),a=b.isInline()&&!c.plugins.divarea?c.document:b,b=a.getElementsByTag("a"),a=a.getElementsByTag("img"),
+f=[],e=0,d;d=b.getItem(e++);)(d.data("cke-saved-name")||d.hasAttribute("name"))&&f.push({name:d.data("cke-saved-name")||d.getAttribute("name"),id:d.getAttribute("id")});for(e=0;d=a.getItem(e++);)(d=this.tryRestoreFakeAnchor(c,d))&&f.push({name:d.getAttribute("name"),id:d.getAttribute("id")});return f},fakeAnchor:!0,tryRestoreFakeAnchor:function(c,b){if(b&&b.data("cke-real-element-type")&&"anchor"==b.data("cke-real-element-type")){var a=c.restoreRealElement(b);if(a.data("cke-saved-name"))return a}},
+parseLinkAttributes:function(c,b){var a=b&&(b.data("cke-saved-href")||b.getAttribute("href"))||"",f=c.plugins.link.compiledProtectionFunction,e=c.config.emailProtection,d,g={};a.match(t)&&("encode"==e?a=a.replace(A,function(a,b,c){c=c||"";return"mailto:"+String.fromCharCode.apply(String,b.split(","))+c.replace(/\\'/g,"'")}):e&&a.replace(B,function(a,b,c){if(b==f.name){g.type="email";a=g.email={};b=/(^')|('$)/g;c=c.match(/[^,\s]+/g);for(var d=c.length,e,h,k=0;k<d;k++)e=decodeURIComponent,h=c[k].replace(b,
+"").replace(/\\'/g,"'"),h=e(h),e=f.params[k].toLowerCase(),a[e]=h;a.address=[a.name,a.domain].join("@")}}));if(!g.type)if(e=a.match(x))g.type="anchor",g.anchor={},g.anchor.name=g.anchor.id=e[1];else if(e=a.match(u)){d=a.match(v);a=a.match(w);g.type="email";var k=g.email={};k.address=e[1];d&&(k.subject=decodeURIComponent(d[1]));a&&(k.body=decodeURIComponent(a[1]))}else a&&(d=a.match(y))&&(g.type="url",g.url={},g.url.protocol=d[1],g.url.url=d[2]);if(b){if(a=b.getAttribute("target"))g.target={type:a.match(z)?
+a:"frame",name:a};else if(a=(a=b.data("cke-pa-onclick")||b.getAttribute("onclick"))&&a.match(C))for(g.target={type:"popup",name:a[1]};e=D.exec(a[2]);)"yes"!=e[2]&&"1"!=e[2]||e[1]in{height:1,width:1,top:1,left:1}?isFinite(e[2])&&(g.target[e[1]]=e[2]):g.target[e[1]]=!0;null!==b.getAttribute("download")&&(g.download=!0);var a={},h;for(h in m)(e=b.getAttribute(h))&&(a[m[h]]=e);if(h=b.data("cke-saved-name")||a.advName)a.advName=h;CKEDITOR.tools.isEmpty(a)||(g.advanced=a)}return g},getLinkAttributes:function(c,
+b){var a=c.config.emailProtection||"",f={};switch(b.type){case "url":var a=b.url&&void 0!==b.url.protocol?b.url.protocol:"http://",e=b.url&&CKEDITOR.tools.trim(b.url.url)||"";f["data-cke-saved-href"]=0===e.indexOf("/")?e:a+e;break;case "anchor":a=b.anchor&&b.anchor.id;f["data-cke-saved-href"]="#"+(b.anchor&&b.anchor.name||a||"");break;case "email":var d=b.email,e=d.address;switch(a){case "":case "encode":var g=encodeURIComponent(d.subject||""),k=encodeURIComponent(d.body||""),d=[];g&&d.push("subject\x3d"+
+g);k&&d.push("body\x3d"+k);d=d.length?"?"+d.join("\x26"):"";"encode"==a?(a=["javascript:void(location.href\x3d'mailto:'+",q(e)],d&&a.push("+'",p(d),"'"),a.push(")")):a=["mailto:",e,d];break;default:a=e.split("@",2),d.name=a[0],d.domain=a[1],a=["javascript:",r(c,d)]}f["data-cke-saved-href"]=a.join("")}if(b.target)if("popup"==b.target.type){for(var a=["window.open(this.href, '",b.target.name||"","', '"],h="resizable status location toolbar menubar fullscreen scrollbars dependent".split(" "),e=h.length,
+g=function(a){b.target[a]&&h.push(a+"\x3d"+b.target[a])},d=0;d<e;d++)h[d]+=b.target[h[d]]?"\x3dyes":"\x3dno";g("width");g("left");g("height");g("top");a.push(h.join(","),"'); return false;");f["data-cke-pa-onclick"]=a.join("")}else"notSet"!=b.target.type&&b.target.name&&(f.target=b.target.name);b.download&&(f.download="");if(b.advanced){for(var l in m)(a=b.advanced[m[l]])&&(f[l]=a);f.name&&(f["data-cke-saved-name"]=f.name)}f["data-cke-saved-href"]&&(f.href=f["data-cke-saved-href"]);l={target:1,onclick:1,
+"data-cke-pa-onclick":1,"data-cke-saved-name":1,download:1};b.advanced&&CKEDITOR.tools.extend(l,m);for(var n in f)delete l[n];return{set:f,removed:CKEDITOR.tools.objectKeys(l)}},showDisplayTextForElement:function(c,b){var a={img:1,table:1,tbody:1,thead:1,tfoot:1,input:1,select:1,textarea:1};return b.widgets&&b.widgets.focused?!1:!c||!c.getName||!c.is(a)}};CKEDITOR.unlinkCommand=function(){};CKEDITOR.unlinkCommand.prototype={exec:function(c){var b=new CKEDITOR.style({element:"a",type:CKEDITOR.STYLE_INLINE,
+alwaysRemoveElement:1});c.removeStyle(b)},refresh:function(c,b){var a=b.lastElement&&b.lastElement.getAscendant("a",!0);a&&"a"==a.getName()&&a.getAttribute("href")&&a.getChildCount()?this.setState(CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_DISABLED)},contextSensitive:1,startDisabled:1,requiredContent:"a[href]"};CKEDITOR.removeAnchorCommand=function(){};CKEDITOR.removeAnchorCommand.prototype={exec:function(c){var b=c.getSelection(),a=b.createBookmarks(),f;if(b&&(f=b.getSelectedElement())&&
+(f.getChildCount()?f.is("a"):CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,f)))f.remove(1);else if(f=CKEDITOR.plugins.link.getSelectedLink(c))f.hasAttribute("href")?(f.removeAttributes({name:1,"data-cke-saved-name":1}),f.removeClass("cke_anchor")):f.remove(1);b.selectBookmarks(a)},requiredContent:"a[name]"};CKEDITOR.tools.extend(CKEDITOR.config,{linkShowAdvancedTab:!0,linkShowTargetTab:!0})})();(function(){function I(b,m,e){function c(c){if(!(!(a=d[c?"getFirst":"getLast"]())||a.is&&a.isBlockBoundary()||!(p=m.root[c?"getPrevious":"getNext"](CKEDITOR.dom.walker.invisible(!0)))||p.is&&p.isBlockBoundary({br:1})))b.document.createElement("br")[c?"insertBefore":"insertAfter"](a)}for(var f=CKEDITOR.plugins.list.listToArray(m.root,e),g=[],k=0;k<m.contents.length;k++){var h=m.contents[k];(h=h.getAscendant("li",!0))&&!h.getCustomData("list_item_processed")&&(g.push(h),CKEDITOR.dom.element.setMarker(e,
 h,"list_item_processed",!0))}h=null;for(k=0;k<g.length;k++)h=g[k].getCustomData("listarray_index"),f[h].indent=-1;for(k=h+1;k<f.length;k++)if(f[k].indent>f[k-1].indent+1){g=f[k-1].indent+1-f[k].indent;for(h=f[k].indent;f[k]&&f[k].indent>=h;)f[k].indent+=g,k++;k--}var d=CKEDITOR.plugins.list.arrayToList(f,e,null,b.config.enterMode,m.root.getAttribute("dir")).listNode,a,p;c(!0);c();d.replace(m.root);b.fire("contentDomInvalidated")}function B(b,m){this.name=b;this.context=this.type=m;this.allowedContent=
 m+" li";this.requiredContent=m}function E(b,m,e,c){for(var f,g;f=b[c?"getLast":"getFirst"](J);)(g=f.getDirection(1))!==m.getDirection(1)&&f.setAttribute("dir",g),f.remove(),e?f[c?"insertBefore":"insertAfter"](e):m.append(f,c)}function F(b){function m(e){var c=b[e?"getPrevious":"getNext"](u);c&&c.type==CKEDITOR.NODE_ELEMENT&&c.is(b.getName())&&(E(b,c,null,!e),b.remove(),b=c)}m();m(1)}function G(b){return b.type==CKEDITOR.NODE_ELEMENT&&(b.getName()in CKEDITOR.dtd.$block||b.getName()in CKEDITOR.dtd.$listItem)&&
 CKEDITOR.dtd[b.getName()]["#"]}function C(b,m,e){b.fire("saveSnapshot");e.enlarge(CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS);var c=e.extractContents();m.trim(!1,!0);var f=m.createBookmark(),g=new CKEDITOR.dom.elementPath(m.startContainer),k=g.block,g=g.lastElement.getAscendant("li",1)||k,h=new CKEDITOR.dom.elementPath(e.startContainer),d=h.contains(CKEDITOR.dtd.$listItem),h=h.contains(CKEDITOR.dtd.$list);k?(k=k.getBogus())&&k.remove():h&&(k=h.getPrevious(u))&&z(k)&&k.remove();(k=c.getLast())&&k.type==CKEDITOR.NODE_ELEMENT&&
@@ -913,9 +962,9 @@ for(n=0;n<q.length;n++)F(q[n]);CKEDITOR.dom.element.clearAllMarkers(k);e.selectB
 !z(a)};d.guard=function(a,b){return!(b&&a.type==CKEDITOR.NODE_ELEMENT&&a.is("table"))};e=f.clone();if(k){var a;(a=g.contains(v))&&f.checkBoundaryOfElement(a,CKEDITOR.START)&&(a=a.getParent())&&a.is("li")&&(a=A(a))?(c=a,a=a.getPrevious(u),e.moveToPosition(a&&z(a)?a:c,CKEDITOR.POSITION_BEFORE_START)):(d.range.setStartAt(h,CKEDITOR.POSITION_AFTER_START),d.range.setEnd(f.startContainer,f.startOffset),(a=d.previous())&&a.type==CKEDITOR.NODE_ELEMENT&&(a.getName()in v||a.is("li"))&&(a.is("li")||(d.range.selectNodeContents(a),
 d.reset(),d.evaluator=G,a=d.previous()),c=a,e.moveToElementEditEnd(c),e.moveToPosition(e.endPath().block,CKEDITOR.POSITION_BEFORE_END)));if(c)C(b,e,f),m.cancel();else{var p=g.contains(v);p&&f.checkBoundaryOfElement(p,CKEDITOR.START)&&(c=p.getFirst(u),f.checkBoundaryOfElement(c,CKEDITOR.START)&&(a=p.getPrevious(u),A(c)?a&&(f.moveToElementEditEnd(a),f.select()):b.execCommand("outdent"),m.cancel()))}}else if(c=g.contains("li")){if(d.range.setEndAt(h,CKEDITOR.POSITION_BEFORE_END),k=(h=c.getLast(u))&&
 G(h)?h:c,g=0,(a=d.next())&&a.type==CKEDITOR.NODE_ELEMENT&&a.getName()in v&&a.equals(h)?(g=1,a=d.next()):f.checkBoundaryOfElement(k,CKEDITOR.END)&&(g=2),g&&a){f=f.clone();f.moveToElementEditStart(a);if(1==g&&(e.optimize(),!e.startContainer.equals(c))){for(c=e.startContainer;c.is(CKEDITOR.dtd.$inline);)p=c,c=c.getParent();p&&e.moveToPosition(p,CKEDITOR.POSITION_AFTER_END)}2==g&&(e.moveToPosition(e.endPath().block,CKEDITOR.POSITION_BEFORE_END),f.endPath().block&&f.moveToPosition(f.endPath().block,CKEDITOR.POSITION_AFTER_START));
-C(b,e,f);m.cancel()}}else d.range.setEndAt(h,CKEDITOR.POSITION_BEFORE_END),(a=d.next())&&a.type==CKEDITOR.NODE_ELEMENT&&a.is(v)&&(a=a.getFirst(u),g.block&&f.checkStartOfBlock()&&f.checkEndOfBlock()?(g.block.remove(),f.moveToElementEditStart(a),f.select()):A(a)?(f.moveToElementEditStart(a),f.select()):(f=f.clone(),f.moveToElementEditStart(a),C(b,e,f)),m.cancel());setTimeout(function(){b.selectionChange(1)})}}}))}})})();(function(){CKEDITOR.plugins.liststyle={requires:"dialog,contextmenu",init:function(a){if(!a.blockless){var b;b=new CKEDITOR.dialogCommand("numberedListStyle",{requiredContent:"ol",allowedContent:"ol{list-style-type}[start]"});b=a.addCommand("numberedListStyle",b);a.addFeature(b);CKEDITOR.dialog.add("numberedListStyle",this.path+"dialogs/liststyle.js");b=new CKEDITOR.dialogCommand("bulletedListStyle",{requiredContent:"ul",allowedContent:"ul{list-style-type}"});b=a.addCommand("bulletedListStyle",b);
-a.addFeature(b);CKEDITOR.dialog.add("bulletedListStyle",this.path+"dialogs/liststyle.js");a.addMenuGroup("list",108);a.addMenuItems({numberedlist:{label:a.lang.liststyle.numberedTitle,group:"list",command:"numberedListStyle"},bulletedlist:{label:a.lang.liststyle.bulletedTitle,group:"list",command:"bulletedListStyle"}});a.contextMenu.addListener(function(a){if(!a||a.isReadOnly())return null;for(;a;){var b=a.getName();if("ol"==b)return{numberedlist:CKEDITOR.TRISTATE_OFF};if("ul"==b)return{bulletedlist:CKEDITOR.TRISTATE_OFF};
-a=a.getParent()}return null})}}};CKEDITOR.plugins.add("liststyle",CKEDITOR.plugins.liststyle)})();(function(){function V(a,c,d){return n(c)&&n(d)&&d.equals(c.getNext(function(a){return!(E(a)||F(a)||u(a))}))}function z(a){this.upper=a[0];this.lower=a[1];this.set.apply(this,a.slice(2))}function O(a){var c=a.element;if(c&&n(c)&&(c=c.getAscendant(a.triggers,!0))&&a.editable.contains(c)){var d=P(c);if("true"==d.getAttribute("contenteditable"))return c;if(d.is(a.triggers))return d}return null}function ka(a,c,d){r(a,c);r(a,d);a=c.size.bottom;d=d.size.top;return a&&d?0|(a+d)/2:a||d}function w(a,c,d){return c=
+C(b,e,f);m.cancel()}}else d.range.setEndAt(h,CKEDITOR.POSITION_BEFORE_END),(a=d.next())&&a.type==CKEDITOR.NODE_ELEMENT&&a.is(v)&&(a=a.getFirst(u),g.block&&f.checkStartOfBlock()&&f.checkEndOfBlock()?(g.block.remove(),f.moveToElementEditStart(a),f.select()):A(a)?(f.moveToElementEditStart(a),f.select()):(f=f.clone(),f.moveToElementEditStart(a),C(b,e,f)),m.cancel());setTimeout(function(){b.selectionChange(1)})}}}))}})})();(function(){CKEDITOR.plugins.liststyle={requires:"dialog,contextmenu",init:function(a){if(!a.blockless){var b;b=new CKEDITOR.dialogCommand("numberedListStyle",{requiredContent:"ol",allowedContent:"ol{list-style-type}[start]; li{list-style-type}[value]",contentTransformations:[["ol: listTypeToStyle"]]});b=a.addCommand("numberedListStyle",b);a.addFeature(b);CKEDITOR.dialog.add("numberedListStyle",this.path+"dialogs/liststyle.js");b=new CKEDITOR.dialogCommand("bulletedListStyle",{requiredContent:"ul",
+allowedContent:"ul{list-style-type}",contentTransformations:[["ul: listTypeToStyle"]]});b=a.addCommand("bulletedListStyle",b);a.addFeature(b);CKEDITOR.dialog.add("bulletedListStyle",this.path+"dialogs/liststyle.js");a.addMenuGroup("list",108);a.addMenuItems({numberedlist:{label:a.lang.liststyle.numberedTitle,group:"list",command:"numberedListStyle"},bulletedlist:{label:a.lang.liststyle.bulletedTitle,group:"list",command:"bulletedListStyle"}});a.contextMenu.addListener(function(a){if(!a||a.isReadOnly())return null;
+for(;a;){var b=a.getName();if("ol"==b)return{numberedlist:CKEDITOR.TRISTATE_OFF};if("ul"==b)return{bulletedlist:CKEDITOR.TRISTATE_OFF};a=a.getParent()}return null})}}};CKEDITOR.plugins.add("liststyle",CKEDITOR.plugins.liststyle)})();(function(){function V(a,c,d){return n(c)&&n(d)&&d.equals(c.getNext(function(a){return!(E(a)||F(a)||u(a))}))}function z(a){this.upper=a[0];this.lower=a[1];this.set.apply(this,a.slice(2))}function O(a){var c=a.element;if(c&&n(c)&&(c=c.getAscendant(a.triggers,!0))&&a.editable.contains(c)){var d=P(c);if("true"==d.getAttribute("contenteditable"))return c;if(d.is(a.triggers))return d}return null}function ka(a,c,d){r(a,c);r(a,d);a=c.size.bottom;d=d.size.top;return a&&d?0|(a+d)/2:a||d}function w(a,c,d){return c=
 c[d?"getPrevious":"getNext"](function(b){return b&&b.type==CKEDITOR.NODE_TEXT&&!E(b)||n(b)&&!u(b)&&!A(a,b)})}function q(a,c,d){return a>c&&a<d}function P(a,c){if(a.data("cke-editable"))return null;for(c||(a=a.getParent());a&&!a.data("cke-editable");){if(a.hasAttribute("contenteditable"))return a;a=a.getParent()}return null}function la(a){var c=a.doc,d=G('\x3cspan contenteditable\x3d"false" style\x3d"'+Q+"position:absolute;border-top:1px dashed "+a.boxColor+'"\x3e\x3c/span\x3e',c),b=CKEDITOR.getUrl(this.path+
 "images/"+(t.hidpi?"hidpi/":"")+"icon"+(a.rtl?"-rtl":"")+".png");v(d,{attach:function(){this.wrap.getParent()||this.wrap.appendTo(a.editable,!0);return this},lineChildren:[v(G('\x3cspan title\x3d"'+a.editor.lang.magicline.title+'" contenteditable\x3d"false"\x3e\x26#8629;\x3c/span\x3e',c),{base:Q+"height:17px;width:17px;"+(a.rtl?"left":"right")+":17px;background:url("+b+") center no-repeat "+a.boxColor+";cursor:pointer;"+(t.hc?"font-size: 15px;line-height:14px;border:1px solid #fff;text-align:center;":
 "")+(t.hidpi?"background-size: 9px 10px;":""),looks:["top:-8px; border-radius: 2px;","top:-17px; border-radius: 2px 2px 0px 0px;","top:-1px; border-radius: 0px 0px 2px 2px;"]}),v(G(W,c),{base:X+"left:0px;border-left-color:"+a.boxColor+";",looks:["border-width:8px 0 8px 8px;top:-8px","border-width:8px 0 0 8px;top:-8px","border-width:0 0 8px 8px;top:0px"]}),v(G(W,c),{base:X+"right:0px;border-right-color:"+a.boxColor+";",looks:["border-width:8px 8px 8px 0;top:-8px","border-width:8px 8px 0 0;top:-8px",
@@ -957,9 +1006,9 @@ CKEDITOR.TRISTATE_DISABLED?CKEDITOR.TRISTATE_DISABLED:n)},null,null,100)}}})})()
 e(a.lang.pagebreak.alt),!0);f.children.length=0}var c=a.dataProcessor,g=c&&c.dataFilter,c=c&&c.htmlFilter,h=/page-break-after\s*:\s*always/i,k=/display\s*:\s*none/i;c&&c.addRules({attributes:{"class":function(a,b){var c=a.replace("cke_pagebreak","");if(c!=a){var d=CKEDITOR.htmlParser.fragment.fromHtml('\x3cspan style\x3d"display: none;"\x3e\x26nbsp;\x3c/span\x3e').children[0];b.children.length=0;b.add(d);d=b.attributes;delete d["aria-label"];delete d.contenteditable;delete d.title}return c}}},{applyToAll:!0,
 priority:5});g&&g.addRules({elements:{div:function(a){if(a.attributes["data-cke-pagebreak"])b(a);else if(h.test(a.attributes.style)){var c=a.children[0];c&&"span"==c.name&&k.test(c.attributes.style)&&b(a)}}}})}});CKEDITOR.plugins.pagebreakCmd={exec:function(a){var b=a.document.createElement("div",{attributes:e(a.lang.pagebreak.alt)});a.insertElement(b)},context:"div",allowedContent:{div:{styles:"!page-break-after"},span:{match:function(a){return(a=a.parent)&&"div"==a.name&&a.styles&&a.styles["page-break-after"]},
 styles:"display"}},requiredContent:"div{page-break-after}"}})();(function(){var c={canUndo:!1,async:!0,exec:function(a){a.getClipboardData({title:a.lang.pastetext.title},function(b){b&&a.fire("paste",{type:"text",dataValue:b.dataValue,method:"paste",dataTransfer:CKEDITOR.plugins.clipboard.initPasteDataTransfer()});a.fire("afterCommandExec",{name:"pastetext",command:c,returnValue:!!b})})}};CKEDITOR.plugins.add("pastetext",{requires:"clipboard",init:function(a){a.addCommand("pastetext",c);a.ui.addButton&&a.ui.addButton("PasteText",{label:a.lang.pastetext.button,
-command:"pastetext",toolbar:"clipboard,40"});if(a.config.forcePasteAsPlainText)a.on("beforePaste",function(a){"html"!=a.data.type&&(a.data.type="text")});a.on("pasteState",function(b){a.getCommand("pastetext").setState(b.data)})}})})();(function(){function h(a,d,f){var b=CKEDITOR.cleanWord;b?f():(a=CKEDITOR.getUrl(a.config.pasteFromWordCleanupFile||d+"filter/default.js"),CKEDITOR.scriptLoader.load(a,f,null,!0));return!b}function k(a){a.data.type="html"}CKEDITOR.plugins.add("pastefromword",{requires:"clipboard",init:function(a){var d=0,f=this.path;a.addCommand("pastefromword",{canUndo:!1,async:!0,exec:function(a){var e=this;d=1;a.once("beforePaste",k);a.getClipboardData({title:a.lang.pastefromword.title},function(c){c&&a.fire("paste",
-{type:"html",dataValue:c.dataValue,method:"paste",dataTransfer:CKEDITOR.plugins.clipboard.initPasteDataTransfer()});a.fire("afterCommandExec",{name:"pastefromword",command:e,returnValue:!!c})})}});a.ui.addButton&&a.ui.addButton("PasteFromWord",{label:a.lang.pastefromword.toolbar,command:"pastefromword",toolbar:"clipboard,50"});a.on("pasteState",function(b){a.getCommand("pastefromword").setState(b.data)});a.on("paste",function(b){var e=b.data,c=e.dataValue;if(c&&(d||/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(c))){e.dontFilter=
-!0;var g=h(a,f,function(){if(g)a.fire("paste",e);else if(!a.config.pasteFromWordPromptCleanup||d||confirm(a.lang.pastefromword.confirmCleanup))e.dataValue=CKEDITOR.cleanWord(c,a);d=0});g&&b.cancel()}},null,null,3)}})})();(function(){var h,k={modes:{wysiwyg:1,source:1},canUndo:!1,readOnly:1,exec:function(a){var g,b=a.config,f=b.baseHref?'\x3cbase href\x3d"'+b.baseHref+'"/\x3e':"";if(b.fullPage)g=a.getData().replace(/<head>/,"$\x26"+f).replace(/[^>]*(?=<\/title>)/,"$\x26 \x26mdash; "+a.lang.preview.preview);else{var b="\x3cbody ",d=a.document&&a.document.getBody();d&&(d.getAttribute("id")&&(b+='id\x3d"'+d.getAttribute("id")+'" '),d.getAttribute("class")&&(b+='class\x3d"'+d.getAttribute("class")+'" '));b+="\x3e";g=a.config.docType+
+command:"pastetext",toolbar:"clipboard,40"});if(a.config.forcePasteAsPlainText)a.on("beforePaste",function(a){"html"!=a.data.type&&(a.data.type="text")});a.on("pasteState",function(b){a.getCommand("pastetext").setState(b.data)})}})})();(function(){function l(a,b,f){var d=CKEDITOR.cleanWord;d?f():(a=CKEDITOR.getUrl(a.config.pasteFromWordCleanupFile||b+"filter/default.js"),CKEDITOR.scriptLoader.load(a,f,null,!0));return!d}function g(a){a.data.type="html"}CKEDITOR.plugins.add("pastefromword",{requires:"clipboard",init:function(a){var b=0,f=this.path;a.addCommand("pastefromword",{canUndo:!1,async:!0,exec:function(a){var c=this;b=1;a.once("beforePaste",g);a.getClipboardData({title:a.lang.pastefromword.title},function(b){b&&a.fire("paste",
+{type:"html",dataValue:b.dataValue,method:"paste",dataTransfer:CKEDITOR.plugins.clipboard.initPasteDataTransfer()});a.fire("afterCommandExec",{name:"pastefromword",command:c,returnValue:!!b})})}});a.ui.addButton&&a.ui.addButton("PasteFromWord",{label:a.lang.pastefromword.toolbar,command:"pastefromword",toolbar:"clipboard,50"});a.on("pasteState",function(b){a.getCommand("pastefromword").setState(b.data)});a.on("paste",function(d){var c=d.data,h=c.dataValue,g=/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument|<o:\w+>|<\/font>)/,
+e={dataValue:h};if(h&&(b||g.test(h))&&(!1!==a.fire("pasteFromWord",e)||b)){c.dontFilter=!0;var k=l(a,f,function(){if(k)a.fire("paste",c);else if(!a.config.pasteFromWordPromptCleanup||b||confirm(a.lang.pastefromword.confirmCleanup))e.dataValue=CKEDITOR.cleanWord(e.dataValue,a),a.fire("afterPasteFromWord",e),c.dataValue=e.dataValue;b=0});k&&d.cancel()}},null,null,3)}})})();(function(){var h,k={modes:{wysiwyg:1,source:1},canUndo:!1,readOnly:1,exec:function(a){var g,b=a.config,f=b.baseHref?'\x3cbase href\x3d"'+b.baseHref+'"/\x3e':"";if(b.fullPage)g=a.getData().replace(/<head>/,"$\x26"+f).replace(/[^>]*(?=<\/title>)/,"$\x26 \x26mdash; "+a.lang.preview.preview);else{var b="\x3cbody ",d=a.document&&a.document.getBody();d&&(d.getAttribute("id")&&(b+='id\x3d"'+d.getAttribute("id")+'" '),d.getAttribute("class")&&(b+='class\x3d"'+d.getAttribute("class")+'" '));b+="\x3e";g=a.config.docType+
 '\x3chtml dir\x3d"'+a.config.contentsLangDirection+'"\x3e\x3chead\x3e'+f+"\x3ctitle\x3e"+a.lang.preview.preview+"\x3c/title\x3e"+CKEDITOR.tools.buildStyleHtml(a.config.contentsCss)+"\x3c/head\x3e"+b+a.getData()+"\x3c/body\x3e\x3c/html\x3e"}f=640;b=420;d=80;try{var c=window.screen,f=Math.round(.8*c.width),b=Math.round(.7*c.height),d=Math.round(.1*c.width)}catch(k){}if(!1===a.fire("contentPreview",a={dataValue:g}))return!1;var c="",e;CKEDITOR.env.ie&&(window._cke_htmlToLoad=a.dataValue,e="javascript:void( (function(){document.open();"+
 ("("+CKEDITOR.tools.fixDomain+")();").replace(/\/\/.*?\n/g,"").replace(/parent\./g,"window.opener.")+"document.write( window.opener._cke_htmlToLoad );document.close();window.opener._cke_htmlToLoad \x3d null;})() )",c="");CKEDITOR.env.gecko&&(window._cke_htmlToLoad=a.dataValue,c=CKEDITOR.getUrl(h+"preview.html"));c=window.open(c,null,"toolbar\x3dyes,location\x3dno,status\x3dyes,menubar\x3dyes,scrollbars\x3dyes,resizable\x3dyes,width\x3d"+f+",height\x3d"+b+",left\x3d"+d);CKEDITOR.env.ie&&c&&(c.location=
 e);CKEDITOR.env.ie||CKEDITOR.env.gecko||(e=c.document,e.open(),e.write(a.dataValue),e.close());return!0}};CKEDITOR.plugins.add("preview",{init:function(a){a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&(h=this.path,a.addCommand("preview",k),a.ui.addButton&&a.ui.addButton("Preview",{label:a.lang.preview.preview,command:"preview",toolbar:"document,40"}))}})})();CKEDITOR.plugins.add("print",{init:function(a){a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&(a.addCommand("print",CKEDITOR.plugins.print),a.ui.addButton&&a.ui.addButton("Print",{label:a.lang.print.toolbar,command:"print",toolbar:"document,50"}))}});CKEDITOR.plugins.print={exec:function(a){CKEDITOR.env.gecko?a.window.$.print():a.document.$.execCommand("Print")},canUndo:!1,readOnly:1,modes:{wysiwyg:1}};CKEDITOR.plugins.add("removeformat",{init:function(a){a.addCommand("removeFormat",CKEDITOR.plugins.removeformat.commands.removeformat);a.ui.addButton&&a.ui.addButton("RemoveFormat",{label:a.lang.removeformat.toolbar,command:"removeFormat",toolbar:"cleanup,10"})}});
@@ -978,66 +1027,67 @@ arguments);this.setValue(this.getValue().replace(/cke_show_border/,""))}}),a.com
 "99%":"100%",height:"100%",resize:"none",outline:"none","text-align":"left"},CKEDITOR.tools.cssVendorPrefix("tab-size",a.config.sourceAreaTabSize||4)));b.setAttribute("dir","ltr");b.addClass("cke_source").addClass("cke_reset").addClass("cke_enable_context_menu");a.ui.space("contents").append(b);b=a.editable(new c(a,b));b.setData(a.getData(1));CKEDITOR.env.ie&&(b.attachListener(a,"resize",d,b),b.attachListener(CKEDITOR.document.getWindow(),"resize",d,b),CKEDITOR.tools.setTimeout(d,0,b));a.fire("ariaWidget",
 this);e()});a.addCommand("source",f.commands.source);a.ui.addButton&&a.ui.addButton("Source",{label:a.lang.sourcearea.toolbar,command:"source",toolbar:"mode,10"});a.on("mode",function(){a.getCommand("source").setState("source"==a.mode?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)});var e=CKEDITOR.env.ie&&9==CKEDITOR.env.version}}});var c=CKEDITOR.tools.createClass({base:CKEDITOR.editable,proto:{setData:function(a){this.setValue(a);this.status="ready";this.editor.fire("dataReady")},getData:function(){return this.getValue()},
 insertHtml:function(){},insertElement:function(){},insertText:function(){},setReadOnly:function(a){this[(a?"set":"remove")+"Attribute"]("readOnly","readonly")},detach:function(){c.baseProto.detach.call(this);this.clearCustomData();this.remove()}}})})();
-CKEDITOR.plugins.sourcearea={commands:{source:{modes:{wysiwyg:1,source:1},editorFocus:!1,readOnly:1,exec:function(c){"wysiwyg"==c.mode&&c.fire("saveSnapshot");c.getCommand("source").setState(CKEDITOR.TRISTATE_DISABLED);c.setMode("source"==c.mode?"wysiwyg":"source")},canUndo:!1}}};CKEDITOR.plugins.add("specialchar",{availableLangs:{af:1,ar:1,bg:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,en:1,"en-gb":1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fr:1,"fr-ca":1,gl:1,he:1,hr:1,hu:1,id:1,it:1,ja:1,km:1,ko:1,ku:1,lt:1,lv:1,nb:1,nl:1,no:1,pl:1,pt:1,"pt-br":1,ru:1,si:1,sk:1,sl:1,sq:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},requires:"dialog",init:function(a){var c=this;CKEDITOR.dialog.add("specialchar",this.path+"dialogs/specialchar.js");a.addCommand("specialchar",{exec:function(){var b=
-a.langCode,b=c.availableLangs[b]?b:c.availableLangs[b.replace(/-.*/,"")]?b.replace(/-.*/,""):"en";CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(c.path+"dialogs/lang/"+b+".js"),function(){CKEDITOR.tools.extend(a.lang.specialchar,c.langEntries[b]);a.openDialog("specialchar")})},modes:{wysiwyg:1},canUndo:!1});a.ui.addButton&&a.ui.addButton("SpecialChar",{label:a.lang.specialchar.toolbar,command:"specialchar",toolbar:"insert,50"})}});CKEDITOR.config.specialChars="! \x26quot; # $ % \x26amp; ' ( ) * + - . / 0 1 2 3 4 5 6 7 8 9 : ; \x26lt; \x3d \x26gt; ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ \x26euro; \x26lsquo; \x26rsquo; \x26ldquo; \x26rdquo; \x26ndash; \x26mdash; \x26iexcl; \x26cent; \x26pound; \x26curren; \x26yen; \x26brvbar; \x26sect; \x26uml; \x26copy; \x26ordf; \x26laquo; \x26not; \x26reg; \x26macr; \x26deg; \x26sup2; \x26sup3; \x26acute; \x26micro; \x26para; \x26middot; \x26cedil; \x26sup1; \x26ordm; \x26raquo; \x26frac14; \x26frac12; \x26frac34; \x26iquest; \x26Agrave; \x26Aacute; \x26Acirc; \x26Atilde; \x26Auml; \x26Aring; \x26AElig; \x26Ccedil; \x26Egrave; \x26Eacute; \x26Ecirc; \x26Euml; \x26Igrave; \x26Iacute; \x26Icirc; \x26Iuml; \x26ETH; \x26Ntilde; \x26Ograve; \x26Oacute; \x26Ocirc; \x26Otilde; \x26Ouml; \x26times; \x26Oslash; \x26Ugrave; \x26Uacute; \x26Ucirc; \x26Uuml; \x26Yacute; \x26THORN; \x26szlig; \x26agrave; \x26aacute; \x26acirc; \x26atilde; \x26auml; \x26aring; \x26aelig; \x26ccedil; \x26egrave; \x26eacute; \x26ecirc; \x26euml; \x26igrave; \x26iacute; \x26icirc; \x26iuml; \x26eth; \x26ntilde; \x26ograve; \x26oacute; \x26ocirc; \x26otilde; \x26ouml; \x26divide; \x26oslash; \x26ugrave; \x26uacute; \x26ucirc; \x26uuml; \x26yacute; \x26thorn; \x26yuml; \x26OElig; \x26oelig; \x26#372; \x26#374 \x26#373 \x26#375; \x26sbquo; \x26#8219; \x26bdquo; \x26hellip; \x26trade; \x26#9658; \x26bull; \x26rarr; \x26rArr; \x26hArr; \x26diams; \x26asymp;".split(" ");CKEDITOR.plugins.add("scayt",{requires:"menubutton,dialog",tabToOpen:null,dialogName:"scaytDialog",init:function(a){var c=this,d=CKEDITOR.plugins.scayt;this.bindEvents(a);this.parseConfig(a);this.addRule(a);CKEDITOR.dialog.add(this.dialogName,CKEDITOR.getUrl(this.path+"dialogs/options.js"));this.addMenuItems(a);var b=a.lang.scayt,e=CKEDITOR.env;a.ui.add("Scayt",CKEDITOR.UI_MENUBUTTON,{label:b.text_title,title:a.plugins.wsc?a.lang.wsc.title:b.text_title,modes:{wysiwyg:!(e.ie&&(8>e.version||e.quirks))},
-toolbar:"spellchecker,20",refresh:function(){var b=a.ui.instances.Scayt.getState();a.scayt&&(b=d.state.scayt[a.name]?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF);a.fire("scaytButtonState",b)},onRender:function(){var b=this;a.on("scaytButtonState",function(a){void 0!==typeof a.data&&b.setState(a.data)})},onMenu:function(){var b=a.scayt;a.getMenuItem("scaytToggle").label=a.lang.scayt[b&&d.state.scayt[a.name]?"btn_disable":"btn_enable"];b={scaytToggle:CKEDITOR.TRISTATE_OFF,scaytOptions:b?CKEDITOR.TRISTATE_OFF:
-CKEDITOR.TRISTATE_DISABLED,scaytLangs:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,scaytDict:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,scaytAbout:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,WSC:a.plugins.wsc?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED};a.config.scayt_uiTabs[0]||delete b.scaytOptions;a.config.scayt_uiTabs[1]||delete b.scaytLangs;a.config.scayt_uiTabs[2]||delete b.scaytDict;return b}});a.contextMenu&&a.addMenuItems&&(a.contextMenu.addListener(function(b,d){var e=
-a.scayt,k,l;e&&(l=e.getSelectionNode())&&(k=c.menuGenerator(a,l),e.showBanner("."+a.contextMenu._.definition.panel.className.split(" ").join(" .")));return k}),a.contextMenu._.onHide=CKEDITOR.tools.override(a.contextMenu._.onHide,function(b){return function(){var d=a.scayt;d&&d.hideBanner();return b.apply(this)}}))},addMenuItems:function(a){var c=this,d=CKEDITOR.plugins.scayt;a.addMenuGroup("scaytButton");for(var b=a.config.scayt_contextMenuItemsOrder.split("|"),e=0;e<b.length;e++)b[e]="scayt_"+b[e];
-if((b=["grayt_description","grayt_suggest","grayt_control"].concat(b))&&b.length)for(e=0;e<b.length;e++)a.addMenuGroup(b[e],e-10);a.addCommand("scaytToggle",{exec:function(a){var b=a.scayt;d.state.scayt[a.name]=!d.state.scayt[a.name];!0===d.state.scayt[a.name]?b||d.createScayt(a):b&&d.destroy(a)}});a.addCommand("scaytAbout",{exec:function(a){a.scayt.tabToOpen="about";a.lockSelection();a.openDialog(c.dialogName)}});a.addCommand("scaytOptions",{exec:function(a){a.scayt.tabToOpen="options";a.lockSelection();
-a.openDialog(c.dialogName)}});a.addCommand("scaytLangs",{exec:function(a){a.scayt.tabToOpen="langs";a.lockSelection();a.openDialog(c.dialogName)}});a.addCommand("scaytDict",{exec:function(a){a.scayt.tabToOpen="dictionaries";a.lockSelection();a.openDialog(c.dialogName)}});b={scaytToggle:{label:a.lang.scayt.btn_enable,group:"scaytButton",command:"scaytToggle"},scaytAbout:{label:a.lang.scayt.btn_about,group:"scaytButton",command:"scaytAbout"},scaytOptions:{label:a.lang.scayt.btn_options,group:"scaytButton",
-command:"scaytOptions"},scaytLangs:{label:a.lang.scayt.btn_langs,group:"scaytButton",command:"scaytLangs"},scaytDict:{label:a.lang.scayt.btn_dictionaries,group:"scaytButton",command:"scaytDict"}};a.plugins.wsc&&(b.WSC={label:a.lang.wsc.toolbar,group:"scaytButton",onClick:function(){var b=CKEDITOR.plugins.scayt,d=a.scayt,c=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.container.getText():a.document.getBody().getText();(c=c.replace(/\s/g,""))?(d&&b.state.scayt[a.name]&&d.setMarkupPaused&&d.setMarkupPaused(!0),
-a.lockSelection(),a.execCommand("checkspell")):alert("Nothing to check!")}});a.addMenuItems(b)},bindEvents:function(a){var c=CKEDITOR.plugins.scayt,d=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE,b=function(){c.destroy(a)},e=function(){!c.state.scayt[a.name]||a.readOnly||a.scayt||c.createScayt(a)},f=function(){var b=a.editable();b.attachListener(b,"focus",function(b){CKEDITOR.plugins.scayt&&!a.scayt&&setTimeout(e,0);b=CKEDITOR.plugins.scayt&&CKEDITOR.plugins.scayt.state.scayt[a.name]&&a.scayt;var c,
-h;if((d||b)&&a._.savedSelection){b=a._.savedSelection.getSelectedElement();b=!b&&a._.savedSelection.getRanges();for(var f=0;f<b.length;f++)h=b[f],"string"===typeof h.startContainer.$.nodeValue&&(c=h.startContainer.getText().length,(c<h.startOffset||c<h.endOffset)&&a.unlockSelection(!1))}},this,null,-10)},g=function(){d?a.config.scayt_inlineModeImmediateMarkup?e():(a.on("blur",function(){setTimeout(b,0)}),a.on("focus",e),a.focusManager.hasFocus&&e()):e();f();var c=a.editable();c.attachListener(c,"mousedown",
-function(b){b=b.data.getTarget();var d=a.widgets&&a.widgets.getByElement(b);d&&(d.wrapper=b.getAscendant(function(a){return a.hasAttribute("data-cke-widget-wrapper")},!0))},this,null,-10)};a.on("contentDom",g);a.on("beforeCommandExec",function(b){var d=a.scayt,e=null,f=!1,g=!0;b.data.name in c.options.disablingCommandExec&&"wysiwyg"==a.mode?d&&(c.destroy(a),a.fire("scaytButtonState",CKEDITOR.TRISTATE_DISABLED)):"bold"!==b.data.name&&"italic"!==b.data.name&&"underline"!==b.data.name&&"strike"!==b.data.name&&
-"subscript"!==b.data.name&&"superscript"!==b.data.name&&"enter"!==b.data.name&&"cut"!==b.data.name&&"language"!==b.data.name||!d||("cut"===b.data.name&&(g=!1,f=!0),"language"===b.data.name&&(e=(e=a.plugins.language.getCurrentLangElement(a))&&e.$,f=!0),a.fire("reloadMarkupScayt",{removeOptions:{removeInside:g,forceBookmark:f,selectionNode:e},timeout:0}))});a.on("beforeSetMode",function(b){if("source"==b.data){if(b=a.scayt)c.destroy(a),a.fire("scaytButtonState",CKEDITOR.TRISTATE_DISABLED);a.document&&
-a.document.getBody().removeAttribute("_jquid")}});a.on("afterCommandExec",function(b){"wysiwyg"!=a.mode||"undo"!=b.data.name&&"redo"!=b.data.name||setTimeout(function(){var b=a.scayt,d=b&&b.getScaytLangList();d&&d.ltr&&d.rtl&&b.fire("startSpellCheck, startGrammarCheck")},250)});a.on("readOnly",function(b){var d;b&&(d=a.scayt,!0===b.editor.readOnly?d&&d.fire("removeMarkupInDocument",{}):d?d.fire("startSpellCheck, startGrammarCheck"):"wysiwyg"==b.editor.mode&&!0===c.state.scayt[b.editor.name]&&(c.createScayt(a),
-b.editor.fire("scaytButtonState",CKEDITOR.TRISTATE_ON)))});a.on("beforeDestroy",b);a.on("setData",function(){b();(a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE||a.plugins.divarea)&&g()},this,null,50);a.on("reloadMarkupScayt",function(b){var d=b.data&&b.data.removeOptions;setTimeout(function(){var b=a.scayt,c=b&&b.getScaytLangList();c&&c.ltr&&c.rtl&&(a.document.fire("keydown",new CKEDITOR.dom.event({keyCode:37})),b.removeMarkupInSelectionNode(d),b.fire("startSpellCheck, startGrammarCheck"))},b.data&&
-b.data.timeout||0)});a.on("insertElement",function(){a.fire("reloadMarkupScayt",{removeOptions:{forceBookmark:!0}})},this,null,50);a.on("insertHtml",function(){a.fire("reloadMarkupScayt")},this,null,50);a.on("insertText",function(){a.fire("reloadMarkupScayt")},this,null,50);a.on("scaytDialogShown",function(b){b.data.selectPage(a.scayt.tabToOpen)})},parseConfig:function(a){var c=CKEDITOR.plugins.scayt;c.replaceOldOptionsNames(a.config);"boolean"!==typeof a.config.scayt_autoStartup&&(a.config.scayt_autoStartup=
-!1);c.state.scayt[a.name]=a.config.scayt_autoStartup;"boolean"!==typeof a.config.grayt_autoStartup&&(a.config.grayt_autoStartup=!1);"boolean"!==typeof a.config.scayt_inlineModeImmediateMarkup&&(a.config.scayt_inlineModeImmediateMarkup=!1);c.state.grayt[a.name]=a.config.grayt_autoStartup;a.config.scayt_contextCommands||(a.config.scayt_contextCommands="ignore|ignoreall|add");a.config.scayt_contextMenuItemsOrder||(a.config.scayt_contextMenuItemsOrder="suggest|moresuggest|control");a.config.scayt_sLang||
-(a.config.scayt_sLang="en_US");if(void 0===a.config.scayt_maxSuggestions||"number"!=typeof a.config.scayt_maxSuggestions||0>a.config.scayt_maxSuggestions)a.config.scayt_maxSuggestions=5;if(void 0===a.config.scayt_minWordLength||"number"!=typeof a.config.scayt_minWordLength||1>a.config.scayt_minWordLength)a.config.scayt_minWordLength=4;if(void 0===a.config.scayt_customDictionaryIds||"string"!==typeof a.config.scayt_customDictionaryIds)a.config.scayt_customDictionaryIds="";if(void 0===a.config.scayt_userDictionaryName||
-"string"!==typeof a.config.scayt_userDictionaryName)a.config.scayt_userDictionaryName=null;if("string"===typeof a.config.scayt_uiTabs&&3===a.config.scayt_uiTabs.split(",").length){var d=[],b=[];a.config.scayt_uiTabs=a.config.scayt_uiTabs.split(",");CKEDITOR.tools.search(a.config.scayt_uiTabs,function(a){1===Number(a)||0===Number(a)?(b.push(!0),d.push(Number(a))):b.push(!1)});null===CKEDITOR.tools.search(b,!1)?a.config.scayt_uiTabs=d:a.config.scayt_uiTabs=[1,1,1]}else a.config.scayt_uiTabs=[1,1,1];
-"string"!=typeof a.config.scayt_serviceProtocol&&(a.config.scayt_serviceProtocol=null);"string"!=typeof a.config.scayt_serviceHost&&(a.config.scayt_serviceHost=null);"string"!=typeof a.config.scayt_servicePort&&(a.config.scayt_servicePort=null);"string"!=typeof a.config.scayt_servicePath&&(a.config.scayt_servicePath=null);a.config.scayt_moreSuggestions||(a.config.scayt_moreSuggestions="on");"string"!==typeof a.config.scayt_customerId&&(a.config.scayt_customerId="1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2");
-"string"!==typeof a.config.scayt_srcUrl&&(c=document.location.protocol,c=-1!=c.search(/https?:/)?c:"http:",a.config.scayt_srcUrl=c+"//svc.webspellchecker.net/spellcheck31/lf/scayt3/ckscayt/ckscayt.js");"boolean"!==typeof CKEDITOR.config.scayt_handleCheckDirty&&(CKEDITOR.config.scayt_handleCheckDirty=!0);"boolean"!==typeof CKEDITOR.config.scayt_handleUndoRedo&&(CKEDITOR.config.scayt_handleUndoRedo=!0);CKEDITOR.config.scayt_handleUndoRedo=CKEDITOR.plugins.undo?CKEDITOR.config.scayt_handleUndoRedo:!1;
-"boolean"!==typeof a.config.scayt_multiLanguageMode&&(a.config.scayt_multiLanguageMode=!1);"object"!==typeof a.config.scayt_multiLanguageStyles&&(a.config.scayt_multiLanguageStyles={});a.config.scayt_ignoreAllCapsWords&&"boolean"!==typeof a.config.scayt_ignoreAllCapsWords&&(a.config.scayt_ignoreAllCapsWords=!1);a.config.scayt_ignoreDomainNames&&"boolean"!==typeof a.config.scayt_ignoreDomainNames&&(a.config.scayt_ignoreDomainNames=!1);a.config.scayt_ignoreWordsWithMixedCases&&"boolean"!==typeof a.config.scayt_ignoreWordsWithMixedCases&&
-(a.config.scayt_ignoreWordsWithMixedCases=!1);a.config.scayt_ignoreWordsWithNumbers&&"boolean"!==typeof a.config.scayt_ignoreWordsWithNumbers&&(a.config.scayt_ignoreWordsWithNumbers=!1);if(a.config.scayt_disableOptionsStorage){var c=CKEDITOR.tools.isArray(a.config.scayt_disableOptionsStorage)?a.config.scayt_disableOptionsStorage:"string"===typeof a.config.scayt_disableOptionsStorage?[a.config.scayt_disableOptionsStorage]:void 0,e="all options lang ignore-all-caps-words ignore-domain-names ignore-words-with-mixed-cases ignore-words-with-numbers".split(" "),
-f=["lang","ignore-all-caps-words","ignore-domain-names","ignore-words-with-mixed-cases","ignore-words-with-numbers"],g=CKEDITOR.tools.search,h=CKEDITOR.tools.indexOf;a.config.scayt_disableOptionsStorage=function(a){for(var b=[],d=0;d<a.length;d++){var c=a[d],m=!!g(a,"options");if(!g(e,c)||m&&g(f,function(a){if("lang"===a)return!1}))return;g(f,c)&&f.splice(h(f,c),1);if("all"===c||m&&g(a,"lang"))return[];"options"===c&&(f=["lang"])}return b=b.concat(f)}(c)}},addRule:function(a){var c=CKEDITOR.plugins.scayt,
-d=a.dataProcessor,b=d&&d.htmlFilter,e=a._.elementsPath&&a._.elementsPath.filters,d=d&&d.dataFilter,f=a.addRemoveFormatFilter,g=function(b){if(a.scayt&&(b.hasAttribute(c.options.data_attribute_name)||b.hasAttribute(c.options.problem_grammar_data_attribute)))return!1},h=function(b){var d=!0;a.scayt&&(b.hasAttribute(c.options.data_attribute_name)||b.hasAttribute(c.options.problem_grammar_data_attribute))&&(d=!1);return d};e&&e.push(g);d&&d.addRules({elements:{span:function(a){var b=a.hasClass(c.options.misspelled_word_class)&&
-a.attributes[c.options.data_attribute_name],d=a.hasClass(c.options.problem_grammar_class)&&a.attributes[c.options.problem_grammar_data_attribute];c&&(b||d)&&delete a.name;return a}}});b&&b.addRules({elements:{span:function(a){var b=a.hasClass(c.options.misspelled_word_class)&&a.attributes[c.options.data_attribute_name],d=a.hasClass(c.options.problem_grammar_class)&&a.attributes[c.options.problem_grammar_data_attribute];c&&(b||d)&&delete a.name;return a}}});f&&f.call(a,h)},scaytMenuDefinition:function(a){var c=
-this;a=a.scayt;return{scayt:{scayt_ignore:{label:a.getLocal("btn_ignore"),group:"scayt_control",order:1,exec:function(a){a.scayt.ignoreWord()}},scayt_ignoreall:{label:a.getLocal("btn_ignoreAll"),group:"scayt_control",order:2,exec:function(a){a.scayt.ignoreAllWords()}},scayt_add:{label:a.getLocal("btn_addWord"),group:"scayt_control",order:3,exec:function(a){var b=a.scayt;setTimeout(function(){b.addWordToUserDictionary()},10)}},scayt_option:{label:a.getLocal("btn_options"),group:"scayt_control",order:4,
-exec:function(a){a.scayt.tabToOpen="options";a.lockSelection();a.openDialog(c.dialogName)},verification:function(a){return 1==a.config.scayt_uiTabs[0]?!0:!1}},scayt_language:{label:a.getLocal("btn_langs"),group:"scayt_control",order:5,exec:function(a){a.scayt.tabToOpen="langs";a.lockSelection();a.openDialog(c.dialogName)},verification:function(a){return 1==a.config.scayt_uiTabs[1]?!0:!1}},scayt_dictionary:{label:a.getLocal("btn_dictionaries"),group:"scayt_control",order:6,exec:function(a){a.scayt.tabToOpen=
-"dictionaries";a.lockSelection();a.openDialog(c.dialogName)},verification:function(a){return 1==a.config.scayt_uiTabs[2]?!0:!1}},scayt_about:{label:a.getLocal("btn_about"),group:"scayt_control",order:7,exec:function(a){a.scayt.tabToOpen="about";a.lockSelection();a.openDialog(c.dialogName)}}},grayt:{grayt_problemdescription:{label:"Grammar problem description",group:"grayt_description",order:1,state:CKEDITOR.TRISTATE_DISABLED,exec:function(a){}},grayt_ignore:{label:a.getLocal("btn_ignore"),group:"grayt_control",
-order:2,exec:function(a){a.scayt.ignorePhrase()}}}}},buildSuggestionMenuItems:function(a,c,d){var b={},e={},f=d?"word":"phrase",g=d?"startGrammarCheck":"startSpellCheck",h=a.scayt;if(0<c.length&&"no_any_suggestions"!==c[0])if(d)for(d=0;d<c.length;d++){var k="scayt_suggest_"+CKEDITOR.plugins.scayt.suggestions[d].replace(" ","_");a.addCommand(k,this.createCommand(CKEDITOR.plugins.scayt.suggestions[d],f,g));d<a.config.scayt_maxSuggestions?(a.addMenuItem(k,{label:c[d],command:k,group:"scayt_suggest",
-order:d+1}),b[k]=CKEDITOR.TRISTATE_OFF):(a.addMenuItem(k,{label:c[d],command:k,group:"scayt_moresuggest",order:d+1}),e[k]=CKEDITOR.TRISTATE_OFF,"on"===a.config.scayt_moreSuggestions&&(a.addMenuItem("scayt_moresuggest",{label:h.getLocal("btn_moreSuggestions"),group:"scayt_moresuggest",order:10,getItems:function(){return e}}),b.scayt_moresuggest=CKEDITOR.TRISTATE_OFF))}else for(d=0;d<c.length;d++)k="grayt_suggest_"+CKEDITOR.plugins.scayt.suggestions[d].replace(" ","_"),a.addCommand(k,this.createCommand(CKEDITOR.plugins.scayt.suggestions[d],
-f,g)),a.addMenuItem(k,{label:c[d],command:k,group:"grayt_suggest",order:d+1}),b[k]=CKEDITOR.TRISTATE_OFF;else b.no_scayt_suggest=CKEDITOR.TRISTATE_DISABLED,a.addCommand("no_scayt_suggest",{exec:function(){}}),a.addMenuItem("no_scayt_suggest",{label:h.getLocal("btn_noSuggestions")||"no_scayt_suggest",command:"no_scayt_suggest",group:"scayt_suggest",order:0});return b},menuGenerator:function(a,c){var d=a.scayt,b=this.scaytMenuDefinition(a),e={},f=a.config.scayt_contextCommands.split("|"),g=c.getAttribute(d.getLangAttribute())||
-d.getLang(),h,k;h=d.isScaytNode(c);k=d.isGraytNode(c);h?(b=b.scayt,e=c.getAttribute(d.getScaytNodeAttributeName()),d.fire("getSuggestionsList",{lang:g,word:e}),e=this.buildSuggestionMenuItems(a,CKEDITOR.plugins.scayt.suggestions,h)):k&&(b=b.grayt,e=c.getAttribute(d.getGraytNodeAttributeName()),k=d.getProblemDescriptionText(e,g),b.grayt_problemdescription&&k&&(b.grayt_problemdescription.label=k),d.fire("getGrammarSuggestionsList",{lang:g,phrase:e}),e=this.buildSuggestionMenuItems(a,CKEDITOR.plugins.scayt.suggestions,
-h));if(h&&"off"==a.config.scayt_contextCommands)return e;for(var l in b)h&&-1==CKEDITOR.tools.indexOf(f,l.replace("scayt_",""))&&"all"!=a.config.scayt_contextCommands||(e[l]="undefined"!=typeof b[l].state?b[l].state:CKEDITOR.TRISTATE_OFF,"function"!==typeof b[l].verification||b[l].verification(a)||delete e[l],a.addCommand(l,{exec:b[l].exec}),a.addMenuItem(l,{label:a.lang.scayt[b[l].label]||b[l].label,command:l,group:b[l].group,order:b[l].order}));return e},createCommand:function(a,c,d){return{exec:function(b){b=
-b.scayt;var e={};e[c]=a;b.replaceSelectionNode(e);"startGrammarCheck"===d&&b.removeMarkupInSelectionNode({grammarOnly:!0});b.fire(d)}}}});
-CKEDITOR.plugins.scayt={state:{scayt:{},grayt:{}},suggestions:[],loadingHelper:{loadOrder:[]},isLoading:!1,options:{disablingCommandExec:{source:!0,newpage:!0,templates:!0},data_attribute_name:"data-scayt-word",misspelled_word_class:"scayt-misspell-word",problem_grammar_data_attribute:"data-grayt-phrase",problem_grammar_class:"gramm-problem"},backCompatibilityMap:{scayt_service_protocol:"scayt_serviceProtocol",scayt_service_host:"scayt_serviceHost",scayt_service_port:"scayt_servicePort",scayt_service_path:"scayt_servicePath",
-scayt_customerid:"scayt_customerId"},replaceOldOptionsNames:function(a){for(var c in a)c in this.backCompatibilityMap&&(a[this.backCompatibilityMap[c]]=a[c],delete a[c])},createScayt:function(a){var c=this,d=CKEDITOR.plugins.scayt;this.loadScaytLibrary(a,function(a){var e=a.window&&a.window.getFrame()||a.editable();e?(e={lang:a.config.scayt_sLang,container:e.$,customDictionary:a.config.scayt_customDictionaryIds,userDictionaryName:a.config.scayt_userDictionaryName,localization:a.langCode,customer_id:a.config.scayt_customerId,
-debug:a.config.scayt_debug,data_attribute_name:c.options.data_attribute_name,misspelled_word_class:c.options.misspelled_word_class,problem_grammar_data_attribute:c.options.problem_grammar_data_attribute,problem_grammar_class:c.options.problem_grammar_class,"options-to-restore":a.config.scayt_disableOptionsStorage,focused:a.editable().hasFocus,ignoreElementsRegex:a.config.scayt_elementsToIgnore,minWordLength:a.config.scayt_minWordLength,multiLanguageMode:a.config.scayt_multiLanguageMode,multiLanguageStyles:a.config.scayt_multiLanguageStyles,
-graytAutoStartup:d.state.grayt[a.name]},a.config.scayt_serviceProtocol&&(e.service_protocol=a.config.scayt_serviceProtocol),a.config.scayt_serviceHost&&(e.service_host=a.config.scayt_serviceHost),a.config.scayt_servicePort&&(e.service_port=a.config.scayt_servicePort),a.config.scayt_servicePath&&(e.service_path=a.config.scayt_servicePath),"boolean"===typeof a.config.scayt_ignoreAllCapsWords&&(e["ignore-all-caps-words"]=a.config.scayt_ignoreAllCapsWords),"boolean"===typeof a.config.scayt_ignoreDomainNames&&
-(e["ignore-domain-names"]=a.config.scayt_ignoreDomainNames),"boolean"===typeof a.config.scayt_ignoreWordsWithMixedCases&&(e["ignore-words-with-mixed-cases"]=a.config.scayt_ignoreWordsWithMixedCases),"boolean"===typeof a.config.scayt_ignoreWordsWithNumbers&&(e["ignore-words-with-numbers"]=a.config.scayt_ignoreWordsWithNumbers),e=new SCAYT.CKSCAYT(e,function(){},function(){}),e.subscribe("suggestionListSend",function(a){for(var b={},d=[],c=0;c<a.suggestionList.length;c++)b["word_"+a.suggestionList[c]]||
-(b["word_"+a.suggestionList[c]]=a.suggestionList[c],d.push(a.suggestionList[c]));CKEDITOR.plugins.scayt.suggestions=d}),e.subscribe("selectionIsChanged",function(d){a.getSelection().isLocked&&a.lockSelection()}),e.subscribe("graytStateChanged",function(c){d.state.grayt[a.name]=c.state}),a.scayt=e,a.fire("scaytButtonState",a.readOnly?CKEDITOR.TRISTATE_DISABLED:CKEDITOR.TRISTATE_ON)):d.state.scayt[a.name]=!1})},destroy:function(a){a.scayt&&a.scayt.destroy();delete a.scayt;a.fire("scaytButtonState",
-CKEDITOR.TRISTATE_OFF)},loadScaytLibrary:function(a,c){var d=this,b,e;this.loadingHelper[a.name]||("undefined"===typeof window.SCAYT||"function"!==typeof window.SCAYT.CKSCAYT?(this.loadingHelper[a.name]=c,this.loadingHelper.loadOrder.push(a.name),b=new Date,b=b.getTime(),e=a.config.scayt_srcUrl,e+=0<=e.indexOf("?")?"":"?"+b,this.loadingHelper.ckscaytLoading||(CKEDITOR.scriptLoader.load(e,function(a){if(a){CKEDITOR.fireOnce("scaytReady");for(var b=0;b<d.loadingHelper.loadOrder.length;b++){a=d.loadingHelper.loadOrder[b];
-if("function"===typeof d.loadingHelper[a])d.loadingHelper[a](CKEDITOR.instances[a]);delete d.loadingHelper[a]}d.loadingHelper.loadOrder=[]}}),this.loadingHelper.ckscaytLoading=!0)):window.SCAYT&&"function"===typeof window.SCAYT.CKSCAYT&&(CKEDITOR.fireOnce("scaytReady"),a.scayt||"function"===typeof c&&c(a)))}};
+CKEDITOR.plugins.sourcearea={commands:{source:{modes:{wysiwyg:1,source:1},editorFocus:!1,readOnly:1,exec:function(c){"wysiwyg"==c.mode&&c.fire("saveSnapshot");c.getCommand("source").setState(CKEDITOR.TRISTATE_DISABLED);c.setMode("source"==c.mode?"wysiwyg":"source")},canUndo:!1}}};CKEDITOR.plugins.add("specialchar",{availableLangs:{af:1,ar:1,az:1,bg:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,en:1,"en-gb":1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fr:1,"fr-ca":1,gl:1,he:1,hr:1,hu:1,id:1,it:1,ja:1,km:1,ko:1,ku:1,lt:1,lv:1,nb:1,nl:1,no:1,oc:1,pl:1,pt:1,"pt-br":1,ru:1,si:1,sk:1,sl:1,sq:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},requires:"dialog",init:function(a){var c=this;CKEDITOR.dialog.add("specialchar",this.path+"dialogs/specialchar.js");a.addCommand("specialchar",{exec:function(){var b=
+a.langCode,b=c.availableLangs[b]?b:c.availableLangs[b.replace(/-.*/,"")]?b.replace(/-.*/,""):"en";CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(c.path+"dialogs/lang/"+b+".js"),function(){CKEDITOR.tools.extend(a.lang.specialchar,c.langEntries[b]);a.openDialog("specialchar")})},modes:{wysiwyg:1},canUndo:!1});a.ui.addButton&&a.ui.addButton("SpecialChar",{label:a.lang.specialchar.toolbar,command:"specialchar",toolbar:"insert,50"})}});CKEDITOR.config.specialChars="! \x26quot; # $ % \x26amp; ' ( ) * + - . / 0 1 2 3 4 5 6 7 8 9 : ; \x26lt; \x3d \x26gt; ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ \x26euro; \x26lsquo; \x26rsquo; \x26ldquo; \x26rdquo; \x26ndash; \x26mdash; \x26iexcl; \x26cent; \x26pound; \x26curren; \x26yen; \x26brvbar; \x26sect; \x26uml; \x26copy; \x26ordf; \x26laquo; \x26not; \x26reg; \x26macr; \x26deg; \x26sup2; \x26sup3; \x26acute; \x26micro; \x26para; \x26middot; \x26cedil; \x26sup1; \x26ordm; \x26raquo; \x26frac14; \x26frac12; \x26frac34; \x26iquest; \x26Agrave; \x26Aacute; \x26Acirc; \x26Atilde; \x26Auml; \x26Aring; \x26AElig; \x26Ccedil; \x26Egrave; \x26Eacute; \x26Ecirc; \x26Euml; \x26Igrave; \x26Iacute; \x26Icirc; \x26Iuml; \x26ETH; \x26Ntilde; \x26Ograve; \x26Oacute; \x26Ocirc; \x26Otilde; \x26Ouml; \x26times; \x26Oslash; \x26Ugrave; \x26Uacute; \x26Ucirc; \x26Uuml; \x26Yacute; \x26THORN; \x26szlig; \x26agrave; \x26aacute; \x26acirc; \x26atilde; \x26auml; \x26aring; \x26aelig; \x26ccedil; \x26egrave; \x26eacute; \x26ecirc; \x26euml; \x26igrave; \x26iacute; \x26icirc; \x26iuml; \x26eth; \x26ntilde; \x26ograve; \x26oacute; \x26ocirc; \x26otilde; \x26ouml; \x26divide; \x26oslash; \x26ugrave; \x26uacute; \x26ucirc; \x26uuml; \x26yacute; \x26thorn; \x26yuml; \x26OElig; \x26oelig; \x26#372; \x26#374 \x26#373 \x26#375; \x26sbquo; \x26#8219; \x26bdquo; \x26hellip; \x26trade; \x26#9658; \x26bull; \x26rarr; \x26rArr; \x26hArr; \x26diams; \x26asymp;".split(" ");CKEDITOR.plugins.add("scayt",{requires:"menubutton,dialog",tabToOpen:null,dialogName:"scaytDialog",onLoad:function(a){CKEDITOR.plugins.scayt.onLoadTimestamp=(new Date).getTime();"moono-lisa"==(CKEDITOR.skinName||a.config.skin)&&CKEDITOR.document.appendStyleSheet(this.path+"skins/"+CKEDITOR.skin.name+"/scayt.css")},init:function(a){var c=this,d=CKEDITOR.plugins.scayt;this.bindEvents(a);this.parseConfig(a);this.addRule(a);CKEDITOR.dialog.add(this.dialogName,CKEDITOR.getUrl(this.path+"dialogs/options.js"));
+this.addMenuItems(a);var b=a.lang.scayt,e=CKEDITOR.env;a.ui.add("Scayt",CKEDITOR.UI_MENUBUTTON,{label:b.text_title,title:a.plugins.wsc?a.lang.wsc.title:b.text_title,modes:{wysiwyg:!(e.ie&&(8>e.version||e.quirks))},toolbar:"spellchecker,20",refresh:function(){var b=a.ui.instances.Scayt.getState();a.scayt&&(b=d.state.scayt[a.name]?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF);a.fire("scaytButtonState",b)},onRender:function(){var b=this;a.on("scaytButtonState",function(a){void 0!==typeof a.data&&b.setState(a.data)})},
+onMenu:function(){var b=a.scayt;a.getMenuItem("scaytToggle").label=a.lang.scayt[b&&d.state.scayt[a.name]?"btn_disable":"btn_enable"];b={scaytToggle:CKEDITOR.TRISTATE_OFF,scaytOptions:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,scaytLangs:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,scaytDict:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,scaytAbout:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,WSC:a.plugins.wsc?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED};a.config.scayt_uiTabs[0]||
+delete b.scaytOptions;a.config.scayt_uiTabs[1]||delete b.scaytLangs;a.config.scayt_uiTabs[2]||delete b.scaytDict;return b}});a.contextMenu&&a.addMenuItems&&(a.contextMenu.addListener(function(b,d){var h=a.scayt,k,e;h&&(e=h.getSelectionNode())&&(k=c.menuGenerator(a,e),h.showBanner("."+a.contextMenu._.definition.panel.className.split(" ").join(" .")));return k}),a.contextMenu._.onHide=CKEDITOR.tools.override(a.contextMenu._.onHide,function(b){return function(){var d=a.scayt;d&&d.hideBanner();return b.apply(this)}}))},
+addMenuItems:function(a){var c=this,d=CKEDITOR.plugins.scayt;a.addMenuGroup("scaytButton");for(var b=a.config.scayt_contextMenuItemsOrder.split("|"),e=0;e<b.length;e++)b[e]="scayt_"+b[e];if((b=["grayt_description","grayt_suggest","grayt_control"].concat(b))&&b.length)for(e=0;e<b.length;e++)a.addMenuGroup(b[e],e-10);a.addCommand("scaytToggle",{exec:function(a){var b=a.scayt;d.state.scayt[a.name]=!d.state.scayt[a.name];!0===d.state.scayt[a.name]?b||d.createScayt(a):b&&d.destroy(a)}});a.addCommand("scaytAbout",
+{exec:function(a){a.scayt.tabToOpen="about";a.lockSelection();a.openDialog(c.dialogName)}});a.addCommand("scaytOptions",{exec:function(a){a.scayt.tabToOpen="options";a.lockSelection();a.openDialog(c.dialogName)}});a.addCommand("scaytLangs",{exec:function(a){a.scayt.tabToOpen="langs";a.lockSelection();a.openDialog(c.dialogName)}});a.addCommand("scaytDict",{exec:function(a){a.scayt.tabToOpen="dictionaries";a.lockSelection();a.openDialog(c.dialogName)}});b={scaytToggle:{label:a.lang.scayt.btn_enable,
+group:"scaytButton",command:"scaytToggle"},scaytAbout:{label:a.lang.scayt.btn_about,group:"scaytButton",command:"scaytAbout"},scaytOptions:{label:a.lang.scayt.btn_options,group:"scaytButton",command:"scaytOptions"},scaytLangs:{label:a.lang.scayt.btn_langs,group:"scaytButton",command:"scaytLangs"},scaytDict:{label:a.lang.scayt.btn_dictionaries,group:"scaytButton",command:"scaytDict"}};a.plugins.wsc&&(b.WSC={label:a.lang.wsc.toolbar,group:"scaytButton",onClick:function(){var b=CKEDITOR.plugins.scayt,
+d=a.scayt,c=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.container.getText():a.document.getBody().getText();(c=c.replace(/\s/g,""))?(d&&b.state.scayt[a.name]&&d.setMarkupPaused&&d.setMarkupPaused(!0),a.lockSelection(),a.execCommand("checkspell")):alert("Nothing to check!")}});a.addMenuItems(b)},bindEvents:function(a){var c=CKEDITOR.plugins.scayt,d=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE,b=function(){c.destroy(a)},e=function(){!c.state.scayt[a.name]||a.readOnly||a.scayt||c.createScayt(a)},f=function(){var b=
+a.editable();b.attachListener(b,"focus",function(b){CKEDITOR.plugins.scayt&&!a.scayt&&setTimeout(e,0);b=CKEDITOR.plugins.scayt&&CKEDITOR.plugins.scayt.state.scayt[a.name]&&a.scayt;var c,h;if((d||b)&&a._.savedSelection){b=a._.savedSelection.getSelectedElement();b=!b&&a._.savedSelection.getRanges();for(var f=0;f<b.length;f++)h=b[f],"string"===typeof h.startContainer.$.nodeValue&&(c=h.startContainer.getText().length,(c<h.startOffset||c<h.endOffset)&&a.unlockSelection(!1))}},this,null,-10)},g=function(){d?
+a.config.scayt_inlineModeImmediateMarkup?e():(a.on("blur",function(){setTimeout(b,0)}),a.on("focus",e),a.focusManager.hasFocus&&e()):e();f();var c=a.editable();c.attachListener(c,"mousedown",function(b){b=b.data.getTarget();var d=a.widgets&&a.widgets.getByElement(b);d&&(d.wrapper=b.getAscendant(function(a){return a.hasAttribute("data-cke-widget-wrapper")},!0))},this,null,-10)};a.on("contentDom",g);a.on("beforeCommandExec",function(b){var d=a.scayt,e=null,f=!1,g=!0;b.data.name in c.options.disablingCommandExec&&
+"wysiwyg"==a.mode?d&&(c.destroy(a),a.fire("scaytButtonState",CKEDITOR.TRISTATE_DISABLED)):"bold"!==b.data.name&&"italic"!==b.data.name&&"underline"!==b.data.name&&"strike"!==b.data.name&&"subscript"!==b.data.name&&"superscript"!==b.data.name&&"enter"!==b.data.name&&"cut"!==b.data.name&&"language"!==b.data.name||!d||("cut"===b.data.name&&(g=!1,f=!0),"language"===b.data.name&&(e=(e=a.plugins.language.getCurrentLangElement(a))&&e.$,f=!0),a.fire("reloadMarkupScayt",{removeOptions:{removeInside:g,forceBookmark:f,
+selectionNode:e},timeout:0}))});a.on("beforeSetMode",function(b){if("source"==b.data){if(b=a.scayt)c.destroy(a),a.fire("scaytButtonState",CKEDITOR.TRISTATE_DISABLED);a.document&&a.document.getBody().removeAttribute("_jquid")}});a.on("afterCommandExec",function(b){"wysiwyg"!=a.mode||"undo"!=b.data.name&&"redo"!=b.data.name||setTimeout(function(){c.reloadMarkup(a.scayt)},250)});a.on("readOnly",function(b){var d;b&&(d=a.scayt,!0===b.editor.readOnly?d&&d.fire("removeMarkupInDocument",{}):d?c.reloadMarkup(d):
+"wysiwyg"==b.editor.mode&&!0===c.state.scayt[b.editor.name]&&(c.createScayt(a),b.editor.fire("scaytButtonState",CKEDITOR.TRISTATE_ON)))});a.on("beforeDestroy",b);a.on("setData",function(){b();(a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE||a.plugins.divarea)&&g()},this,null,50);a.on("reloadMarkupScayt",function(b){var d=b.data&&b.data.removeOptions;b=b.data&&b.data.timeout;var e=a.scayt;e&&setTimeout(function(){e.removeMarkupInSelectionNode(d);c.reloadMarkup(e)},b||0)});a.on("insertElement",function(){a.fire("reloadMarkupScayt",
+{removeOptions:{forceBookmark:!0}})},this,null,50);a.on("insertHtml",function(){a.fire("reloadMarkupScayt")},this,null,50);a.on("insertText",function(){a.fire("reloadMarkupScayt")},this,null,50);a.on("scaytDialogShown",function(b){b.data.selectPage(a.scayt.tabToOpen)})},parseConfig:function(a){var c=CKEDITOR.plugins.scayt;c.replaceOldOptionsNames(a.config);"boolean"!==typeof a.config.scayt_autoStartup&&(a.config.scayt_autoStartup=!1);c.state.scayt[a.name]=a.config.scayt_autoStartup;"boolean"!==typeof a.config.grayt_autoStartup&&
+(a.config.grayt_autoStartup=!1);"boolean"!==typeof a.config.scayt_inlineModeImmediateMarkup&&(a.config.scayt_inlineModeImmediateMarkup=!1);c.state.grayt[a.name]=a.config.grayt_autoStartup;a.config.scayt_contextCommands||(a.config.scayt_contextCommands="ignore|ignoreall|add");a.config.scayt_contextMenuItemsOrder||(a.config.scayt_contextMenuItemsOrder="suggest|moresuggest|control");a.config.scayt_sLang||(a.config.scayt_sLang="en_US");if(void 0===a.config.scayt_maxSuggestions||"number"!=typeof a.config.scayt_maxSuggestions||
+0>a.config.scayt_maxSuggestions)a.config.scayt_maxSuggestions=5;if(void 0===a.config.scayt_minWordLength||"number"!=typeof a.config.scayt_minWordLength||1>a.config.scayt_minWordLength)a.config.scayt_minWordLength=4;if(void 0===a.config.scayt_customDictionaryIds||"string"!==typeof a.config.scayt_customDictionaryIds)a.config.scayt_customDictionaryIds="";if(void 0===a.config.scayt_userDictionaryName||"string"!==typeof a.config.scayt_userDictionaryName)a.config.scayt_userDictionaryName=null;if("string"===
+typeof a.config.scayt_uiTabs&&3===a.config.scayt_uiTabs.split(",").length){var d=[],b=[];a.config.scayt_uiTabs=a.config.scayt_uiTabs.split(",");CKEDITOR.tools.search(a.config.scayt_uiTabs,function(a){1===Number(a)||0===Number(a)?(b.push(!0),d.push(Number(a))):b.push(!1)});null===CKEDITOR.tools.search(b,!1)?a.config.scayt_uiTabs=d:a.config.scayt_uiTabs=[1,1,1]}else a.config.scayt_uiTabs=[1,1,1];"string"!=typeof a.config.scayt_serviceProtocol&&(a.config.scayt_serviceProtocol=null);"string"!=typeof a.config.scayt_serviceHost&&
+(a.config.scayt_serviceHost=null);"string"!=typeof a.config.scayt_servicePort&&(a.config.scayt_servicePort=null);"string"!=typeof a.config.scayt_servicePath&&(a.config.scayt_servicePath=null);a.config.scayt_moreSuggestions||(a.config.scayt_moreSuggestions="on");"string"!==typeof a.config.scayt_customerId&&(a.config.scayt_customerId="1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2");"string"!==typeof a.config.scayt_srcUrl&&(c=document.location.protocol,c=-1!=c.search(/https?:/)?
+c:"http:",a.config.scayt_srcUrl=c+"//svc.webspellchecker.net/spellcheck31/lf/scayt3/ckscayt/ckscayt.js");"boolean"!==typeof CKEDITOR.config.scayt_handleCheckDirty&&(CKEDITOR.config.scayt_handleCheckDirty=!0);"boolean"!==typeof CKEDITOR.config.scayt_handleUndoRedo&&(CKEDITOR.config.scayt_handleUndoRedo=!0);CKEDITOR.config.scayt_handleUndoRedo=CKEDITOR.plugins.undo?CKEDITOR.config.scayt_handleUndoRedo:!1;"boolean"!==typeof a.config.scayt_multiLanguageMode&&(a.config.scayt_multiLanguageMode=!1);"object"!==
+typeof a.config.scayt_multiLanguageStyles&&(a.config.scayt_multiLanguageStyles={});a.config.scayt_ignoreAllCapsWords&&"boolean"!==typeof a.config.scayt_ignoreAllCapsWords&&(a.config.scayt_ignoreAllCapsWords=!1);a.config.scayt_ignoreDomainNames&&"boolean"!==typeof a.config.scayt_ignoreDomainNames&&(a.config.scayt_ignoreDomainNames=!1);a.config.scayt_ignoreWordsWithMixedCases&&"boolean"!==typeof a.config.scayt_ignoreWordsWithMixedCases&&(a.config.scayt_ignoreWordsWithMixedCases=!1);a.config.scayt_ignoreWordsWithNumbers&&
+"boolean"!==typeof a.config.scayt_ignoreWordsWithNumbers&&(a.config.scayt_ignoreWordsWithNumbers=!1);if(a.config.scayt_disableOptionsStorage){var c=CKEDITOR.tools.isArray(a.config.scayt_disableOptionsStorage)?a.config.scayt_disableOptionsStorage:"string"===typeof a.config.scayt_disableOptionsStorage?[a.config.scayt_disableOptionsStorage]:void 0,e="all options lang ignore-all-caps-words ignore-domain-names ignore-words-with-mixed-cases ignore-words-with-numbers".split(" "),f=["lang","ignore-all-caps-words",
+"ignore-domain-names","ignore-words-with-mixed-cases","ignore-words-with-numbers"],g=CKEDITOR.tools.search,h=CKEDITOR.tools.indexOf;a.config.scayt_disableOptionsStorage=function(a){for(var b=[],d=0;d<a.length;d++){var c=a[d],m=!!g(a,"options");if(!g(e,c)||m&&g(f,function(a){if("lang"===a)return!1}))return;g(f,c)&&f.splice(h(f,c),1);if("all"===c||m&&g(a,"lang"))return[];"options"===c&&(f=["lang"])}return b=b.concat(f)}(c)}},addRule:function(a){var c=CKEDITOR.plugins.scayt,d=a.dataProcessor,b=d&&d.htmlFilter,
+e=a._.elementsPath&&a._.elementsPath.filters,d=d&&d.dataFilter,f=a.addRemoveFormatFilter,g=function(b){if(a.scayt&&(b.hasAttribute(c.options.data_attribute_name)||b.hasAttribute(c.options.problem_grammar_data_attribute)))return!1},h=function(b){var d=!0;a.scayt&&(b.hasAttribute(c.options.data_attribute_name)||b.hasAttribute(c.options.problem_grammar_data_attribute))&&(d=!1);return d};e&&e.push(g);d&&d.addRules({elements:{span:function(a){var b=a.hasClass(c.options.misspelled_word_class)&&a.attributes[c.options.data_attribute_name],
+d=a.hasClass(c.options.problem_grammar_class)&&a.attributes[c.options.problem_grammar_data_attribute];c&&(b||d)&&delete a.name;return a}}});b&&b.addRules({elements:{span:function(a){var b=a.hasClass(c.options.misspelled_word_class)&&a.attributes[c.options.data_attribute_name],d=a.hasClass(c.options.problem_grammar_class)&&a.attributes[c.options.problem_grammar_data_attribute];c&&(b||d)&&delete a.name;return a}}});f&&f.call(a,h)},scaytMenuDefinition:function(a){var c=this;a=a.scayt;return{scayt:{scayt_ignore:{label:a.getLocal("btn_ignore"),
+group:"scayt_control",order:1,exec:function(a){a.scayt.ignoreWord()}},scayt_ignoreall:{label:a.getLocal("btn_ignoreAll"),group:"scayt_control",order:2,exec:function(a){a.scayt.ignoreAllWords()}},scayt_add:{label:a.getLocal("btn_addWord"),group:"scayt_control",order:3,exec:function(a){var b=a.scayt;setTimeout(function(){b.addWordToUserDictionary()},10)}},scayt_option:{label:a.getLocal("btn_options"),group:"scayt_control",order:4,exec:function(a){a.scayt.tabToOpen="options";a.lockSelection();a.openDialog(c.dialogName)},
+verification:function(a){return 1==a.config.scayt_uiTabs[0]?!0:!1}},scayt_language:{label:a.getLocal("btn_langs"),group:"scayt_control",order:5,exec:function(a){a.scayt.tabToOpen="langs";a.lockSelection();a.openDialog(c.dialogName)},verification:function(a){return 1==a.config.scayt_uiTabs[1]?!0:!1}},scayt_dictionary:{label:a.getLocal("btn_dictionaries"),group:"scayt_control",order:6,exec:function(a){a.scayt.tabToOpen="dictionaries";a.lockSelection();a.openDialog(c.dialogName)},verification:function(a){return 1==
+a.config.scayt_uiTabs[2]?!0:!1}},scayt_about:{label:a.getLocal("btn_about"),group:"scayt_control",order:7,exec:function(a){a.scayt.tabToOpen="about";a.lockSelection();a.openDialog(c.dialogName)}}},grayt:{grayt_problemdescription:{label:"Grammar problem description",group:"grayt_description",order:1,state:CKEDITOR.TRISTATE_DISABLED,exec:function(a){}},grayt_ignore:{label:a.getLocal("btn_ignore"),group:"grayt_control",order:2,exec:function(a){a.scayt.ignorePhrase()}}}}},buildSuggestionMenuItems:function(a,
+c,d){var b={},e={},f=d?"word":"phrase",g=d?"startGrammarCheck":"startSpellCheck",h=a.scayt;if(0<c.length&&"no_any_suggestions"!==c[0])if(d)for(d=0;d<c.length;d++){var k="scayt_suggest_"+CKEDITOR.plugins.scayt.suggestions[d].replace(" ","_");a.addCommand(k,this.createCommand(CKEDITOR.plugins.scayt.suggestions[d],f,g));d<a.config.scayt_maxSuggestions?(a.addMenuItem(k,{label:c[d],command:k,group:"scayt_suggest",order:d+1}),b[k]=CKEDITOR.TRISTATE_OFF):(a.addMenuItem(k,{label:c[d],command:k,group:"scayt_moresuggest",
+order:d+1}),e[k]=CKEDITOR.TRISTATE_OFF,"on"===a.config.scayt_moreSuggestions&&(a.addMenuItem("scayt_moresuggest",{label:h.getLocal("btn_moreSuggestions"),group:"scayt_moresuggest",order:10,getItems:function(){return e}}),b.scayt_moresuggest=CKEDITOR.TRISTATE_OFF))}else for(d=0;d<c.length;d++)k="grayt_suggest_"+CKEDITOR.plugins.scayt.suggestions[d].replace(" ","_"),a.addCommand(k,this.createCommand(CKEDITOR.plugins.scayt.suggestions[d],f,g)),a.addMenuItem(k,{label:c[d],command:k,group:"grayt_suggest",
+order:d+1}),b[k]=CKEDITOR.TRISTATE_OFF;else b.no_scayt_suggest=CKEDITOR.TRISTATE_DISABLED,a.addCommand("no_scayt_suggest",{exec:function(){}}),a.addMenuItem("no_scayt_suggest",{label:h.getLocal("btn_noSuggestions")||"no_scayt_suggest",command:"no_scayt_suggest",group:"scayt_suggest",order:0});return b},menuGenerator:function(a,c){var d=a.scayt,b=this.scaytMenuDefinition(a),e={},f=a.config.scayt_contextCommands.split("|"),g=c.getAttribute(d.getLangAttribute())||d.getLang(),h,k;h=d.isScaytNode(c);k=
+d.isGraytNode(c);h?(b=b.scayt,e=c.getAttribute(d.getScaytNodeAttributeName()),d.fire("getSuggestionsList",{lang:g,word:e}),e=this.buildSuggestionMenuItems(a,CKEDITOR.plugins.scayt.suggestions,h)):k&&(b=b.grayt,e=c.getAttribute(d.getGraytNodeAttributeName()),k=d.getProblemDescriptionText(e,g),b.grayt_problemdescription&&k&&(b.grayt_problemdescription.label=k),d.fire("getGrammarSuggestionsList",{lang:g,phrase:e}),e=this.buildSuggestionMenuItems(a,CKEDITOR.plugins.scayt.suggestions,h));if(h&&"off"==
+a.config.scayt_contextCommands)return e;for(var l in b)h&&-1==CKEDITOR.tools.indexOf(f,l.replace("scayt_",""))&&"all"!=a.config.scayt_contextCommands||(e[l]="undefined"!=typeof b[l].state?b[l].state:CKEDITOR.TRISTATE_OFF,"function"!==typeof b[l].verification||b[l].verification(a)||delete e[l],a.addCommand(l,{exec:b[l].exec}),a.addMenuItem(l,{label:a.lang.scayt[b[l].label]||b[l].label,command:l,group:b[l].group,order:b[l].order}));return e},createCommand:function(a,c,d){return{exec:function(b){b=b.scayt;
+var e={};e[c]=a;b.replaceSelectionNode(e);"startGrammarCheck"===d&&b.removeMarkupInSelectionNode({grammarOnly:!0});b.fire(d)}}}});
+CKEDITOR.plugins.scayt={charsToObserve:[{charName:"cke-fillingChar",charCode:function(){var a=CKEDITOR.version.match(/^\d(\.\d*)*/),a=a&&a[0],c;if(a){c="4.5.7";var d,a=a.replace(/\./g,"");c=c.replace(/\./g,"");d=a.length-c.length;d=0<=d?d:0;c=parseInt(a)>=parseInt(c)*Math.pow(10,d)}return c?Array(7).join(String.fromCharCode(8203)):String.fromCharCode(8203)}()}],onLoadTimestamp:"",state:{scayt:{},grayt:{}},warningCounter:0,suggestions:[],options:{disablingCommandExec:{source:!0,newpage:!0,templates:!0},
+data_attribute_name:"data-scayt-word",misspelled_word_class:"scayt-misspell-word",problem_grammar_data_attribute:"data-grayt-phrase",problem_grammar_class:"gramm-problem"},backCompatibilityMap:{scayt_service_protocol:"scayt_serviceProtocol",scayt_service_host:"scayt_serviceHost",scayt_service_port:"scayt_servicePort",scayt_service_path:"scayt_servicePath",scayt_customerid:"scayt_customerId"},alarmCompatibilityMessage:function(){5>this.warningCounter&&(console.warn("Note: You are using latest version of SCAYT plug-in. It is recommended to upgrade WebSpellChecker.net application to version v4.8.3.Contact us by e-mail at support@webspellchecker.net."),
+this.warningCounter+=1)},reloadMarkup:function(a){var c;a&&(c=a.getScaytLangList(),a.reloadMarkup?a.reloadMarkup():(this.alarmCompatibilityMessage(),c&&c.ltr&&c.rtl&&a.fire("startSpellCheck, startGrammarCheck")))},replaceOldOptionsNames:function(a){for(var c in a)c in this.backCompatibilityMap&&(a[this.backCompatibilityMap[c]]=a[c],delete a[c])},createScayt:function(a){var c=this,d=CKEDITOR.plugins.scayt;this.loadScaytLibrary(a,function(a){function e(a){return new SCAYT.CKSCAYT(a,function(){},function(){})}
+var f=a.window&&a.window.getFrame()||a.editable();if(f){f={lang:a.config.scayt_sLang,container:f.$,customDictionary:a.config.scayt_customDictionaryIds,userDictionaryName:a.config.scayt_userDictionaryName,localization:a.langCode,customer_id:a.config.scayt_customerId,debug:a.config.scayt_debug,data_attribute_name:c.options.data_attribute_name,misspelled_word_class:c.options.misspelled_word_class,problem_grammar_data_attribute:c.options.problem_grammar_data_attribute,problem_grammar_class:c.options.problem_grammar_class,
+"options-to-restore":a.config.scayt_disableOptionsStorage,focused:a.editable().hasFocus,ignoreElementsRegex:a.config.scayt_elementsToIgnore,minWordLength:a.config.scayt_minWordLength,multiLanguageMode:a.config.scayt_multiLanguageMode,multiLanguageStyles:a.config.scayt_multiLanguageStyles,graytAutoStartup:d.state.grayt[a.name],charsToObserve:d.charsToObserve};a.config.scayt_serviceProtocol&&(f.service_protocol=a.config.scayt_serviceProtocol);a.config.scayt_serviceHost&&(f.service_host=a.config.scayt_serviceHost);
+a.config.scayt_servicePort&&(f.service_port=a.config.scayt_servicePort);a.config.scayt_servicePath&&(f.service_path=a.config.scayt_servicePath);"boolean"===typeof a.config.scayt_ignoreAllCapsWords&&(f["ignore-all-caps-words"]=a.config.scayt_ignoreAllCapsWords);"boolean"===typeof a.config.scayt_ignoreDomainNames&&(f["ignore-domain-names"]=a.config.scayt_ignoreDomainNames);"boolean"===typeof a.config.scayt_ignoreWordsWithMixedCases&&(f["ignore-words-with-mixed-cases"]=a.config.scayt_ignoreWordsWithMixedCases);
+"boolean"===typeof a.config.scayt_ignoreWordsWithNumbers&&(f["ignore-words-with-numbers"]=a.config.scayt_ignoreWordsWithNumbers);var g;try{g=e(f)}catch(h){c.alarmCompatibilityMessage(),delete f.charsToObserve,g=e(f)}g.subscribe("suggestionListSend",function(a){for(var b={},d=[],c=0;c<a.suggestionList.length;c++)b["word_"+a.suggestionList[c]]||(b["word_"+a.suggestionList[c]]=a.suggestionList[c],d.push(a.suggestionList[c]));CKEDITOR.plugins.scayt.suggestions=d});g.subscribe("selectionIsChanged",function(d){a.getSelection().isLocked&&
+a.lockSelection()});g.subscribe("graytStateChanged",function(c){d.state.grayt[a.name]=c.state});g.addMarkupHandler&&g.addMarkupHandler(function(c){var d=a.editable(),e=d.getCustomData(c.charName);e&&(e.$=c.node,d.setCustomData(c.charName,e))});a.scayt=g;a.fire("scaytButtonState",a.readOnly?CKEDITOR.TRISTATE_DISABLED:CKEDITOR.TRISTATE_ON)}else d.state.scayt[a.name]=!1})},destroy:function(a){a.scayt&&a.scayt.destroy();delete a.scayt;a.fire("scaytButtonState",CKEDITOR.TRISTATE_OFF)},loadScaytLibrary:function(a,
+c){var d,b=function(){CKEDITOR.fireOnce("scaytReady");a.scayt||"function"===typeof c&&c(a)};"undefined"===typeof window.SCAYT||"function"!==typeof window.SCAYT.CKSCAYT?(d=a.config.scayt_srcUrl+"?"+this.onLoadTimestamp,CKEDITOR.scriptLoader.load(d,function(a){a&&b()})):window.SCAYT&&"function"===typeof window.SCAYT.CKSCAYT&&b()}};
 CKEDITOR.on("dialogDefinition",function(a){var c=a.data.name;a=a.data.definition.dialog;if("scaytDialog"===c)a.on("cancel",function(a){return!1},this,null,-1);if("checkspell"===c)a.on("cancel",function(a){a=a.sender&&a.sender.getParentEditor();var b=CKEDITOR.plugins.scayt,c=a.scayt;c&&b.state.scayt[a.name]&&c.setMarkupPaused&&c.setMarkupPaused(!1);a.unlockSelection()},this,null,-2);if("link"===c)a.on("ok",function(a){var b=a.sender&&a.sender.getParentEditor();b&&setTimeout(function(){b.fire("reloadMarkupScayt",
 {removeOptions:{removeInside:!0,forceBookmark:!0},timeout:0})},0)})});
 CKEDITOR.on("scaytReady",function(){if(!0===CKEDITOR.config.scayt_handleCheckDirty){var a=CKEDITOR.editor.prototype;a.checkDirty=CKEDITOR.tools.override(a.checkDirty,function(a){return function(){var b=null,c=this.scayt;if(CKEDITOR.plugins.scayt&&CKEDITOR.plugins.scayt.state.scayt[this.name]&&this.scayt){if(b="ready"==this.status)var f=c.removeMarkupFromString(this.getSnapshot()),c=c.removeMarkupFromString(this._.previousValue),b=b&&c!==f}else b=a.call(this);return b}});a.resetDirty=CKEDITOR.tools.override(a.resetDirty,
 function(a){return function(){var b=this.scayt;CKEDITOR.plugins.scayt&&CKEDITOR.plugins.scayt.state.scayt[this.name]&&this.scayt?this._.previousValue=b.removeMarkupFromString(this.getSnapshot()):a.call(this)}})}if(!0===CKEDITOR.config.scayt_handleUndoRedo){var a=CKEDITOR.plugins.undo.Image.prototype,c="function"==typeof a.equalsContent?"equalsContent":"equals";a[c]=CKEDITOR.tools.override(a[c],function(a){return function(b){var c=b.editor.scayt,f=this.contents,g=b.contents,h=null;CKEDITOR.plugins.scayt&&
-CKEDITOR.plugins.scayt.state.scayt[b.editor.name]&&b.editor.scayt&&(this.contents=c.removeMarkupFromString(f)||"",b.contents=c.removeMarkupFromString(g)||"");h=a.apply(this,arguments);this.contents=f;b.contents=g;return h}})}});(function(){CKEDITOR.plugins.add("stylescombo",{requires:"richcombo",init:function(c){var l=c.config,g=c.lang.stylescombo,f={},k=[],m=[];c.on("stylesSet",function(b){if(b=b.data.styles){for(var a,h,d,e=0,n=b.length;e<n;e++)(a=b[e],c.blockless&&a.element in CKEDITOR.dtd.$block||(h=a.name,a=new CKEDITOR.style(a),c.filter.customConfig&&!c.filter.check(a)))||(a._name=h,a._.enterMode=l.enterMode,a._.type=d=a.assignedTo||a.type,a._.weight=e+1E3*(d==CKEDITOR.STYLE_OBJECT?1:d==CKEDITOR.STYLE_BLOCK?2:3),f[h]=
-a,k.push(a),m.push(a));k.sort(function(a,b){return a._.weight-b._.weight})}});c.ui.addRichCombo("Styles",{label:g.label,title:g.panelTitle,toolbar:"styles,10",allowedContent:m,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(l.contentsCss),multiSelect:!0,attributes:{"aria-label":g.panelTitle}},init:function(){var b,a,c,d,e,f;e=0;for(f=k.length;e<f;e++)b=k[e],a=b._name,d=b._.type,d!=c&&(this.startGroup(g["panelTitle"+String(d)]),c=d),this.add(a,b.type==CKEDITOR.STYLE_OBJECT?a:b.buildPreview(),a);
-this.commit()},onClick:function(b){c.focus();c.fire("saveSnapshot");b=f[b];var a=c.elementPath();c[b.checkActive(a,c)?"removeStyle":"applyStyle"](b);c.fire("saveSnapshot")},onRender:function(){c.on("selectionChange",function(b){var a=this.getValue();b=b.data.path.elements;for(var h=0,d=b.length,e;h<d;h++){e=b[h];for(var g in f)if(f[g].checkElementRemovable(e,!0,c)){g!=a&&this.setValue(g);return}}this.setValue("")},this)},onOpen:function(){var b=c.getSelection().getSelectedElement(),b=c.elementPath(b),
-a=[0,0,0,0];this.showAll();this.unmarkAll();for(var h in f){var d=f[h],e=d._.type;d.checkApplicable(b,c,c.activeFilter)?a[e]++:this.hideItem(h);d.checkActive(b,c)&&this.mark(h)}a[CKEDITOR.STYLE_BLOCK]||this.hideGroup(g["panelTitle"+String(CKEDITOR.STYLE_BLOCK)]);a[CKEDITOR.STYLE_INLINE]||this.hideGroup(g["panelTitle"+String(CKEDITOR.STYLE_INLINE)]);a[CKEDITOR.STYLE_OBJECT]||this.hideGroup(g["panelTitle"+String(CKEDITOR.STYLE_OBJECT)])},refresh:function(){var b=c.elementPath();if(b){for(var a in f)if(f[a].checkApplicable(b,
-c,c.activeFilter))return;this.setState(CKEDITOR.TRISTATE_DISABLED)}},reset:function(){f={};k=[]}})}})})();(function(){function k(c){return{editorFocus:!1,canUndo:!1,modes:{wysiwyg:1},exec:function(d){if(d.editable().hasFocus){var e=d.getSelection(),b;if(b=(new CKEDITOR.dom.elementPath(e.getCommonAncestor(),e.root)).contains({td:1,th:1},1)){var e=d.createRange(),a=CKEDITOR.tools.tryThese(function(){var a=b.getParent().$.cells[b.$.cellIndex+(c?-1:1)];a.parentNode.parentNode;return a},function(){var a=b.getParent(),a=a.getAscendant("table").$.rows[a.$.rowIndex+(c?-1:1)];return a.cells[c?a.cells.length-1:
+CKEDITOR.plugins.scayt.state.scayt[b.editor.name]&&b.editor.scayt&&(this.contents=c.removeMarkupFromString(f)||"",b.contents=c.removeMarkupFromString(g)||"");h=a.apply(this,arguments);this.contents=f;b.contents=g;return h}})}});(function(){CKEDITOR.plugins.add("stylescombo",{requires:"richcombo",init:function(c){var l=c.config,g=c.lang.stylescombo,f={},k=[],m=[];c.on("stylesSet",function(b){if(b=b.data.styles){for(var a,h,d,e=0,n=b.length;e<n;e++)(a=b[e],c.blockless&&a.element in CKEDITOR.dtd.$block||"string"==typeof a.type&&!CKEDITOR.style.customHandlers[a.type]||(h=a.name,a=new CKEDITOR.style(a),c.filter.customConfig&&!c.filter.check(a)))||(a._name=h,a._.enterMode=l.enterMode,a._.type=d=a.assignedTo||a.type,a._.weight=
+e+1E3*(d==CKEDITOR.STYLE_OBJECT?1:d==CKEDITOR.STYLE_BLOCK?2:3),f[h]=a,k.push(a),m.push(a));k.sort(function(a,b){return a._.weight-b._.weight})}});c.ui.addRichCombo("Styles",{label:g.label,title:g.panelTitle,toolbar:"styles,10",allowedContent:m,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(l.contentsCss),multiSelect:!0,attributes:{"aria-label":g.panelTitle}},init:function(){var b,a,c,d,e,f;e=0;for(f=k.length;e<f;e++)b=k[e],a=b._name,d=b._.type,d!=c&&(this.startGroup(g["panelTitle"+String(d)]),
+c=d),this.add(a,b.type==CKEDITOR.STYLE_OBJECT?a:b.buildPreview(),a);this.commit()},onClick:function(b){c.focus();c.fire("saveSnapshot");b=f[b];var a=c.elementPath();if(b.group&&b.removeStylesFromSameGroup(c))c.applyStyle(b);else c[b.checkActive(a,c)?"removeStyle":"applyStyle"](b);c.fire("saveSnapshot")},onRender:function(){c.on("selectionChange",function(b){var a=this.getValue();b=b.data.path.elements;for(var h=0,d=b.length,e;h<d;h++){e=b[h];for(var g in f)if(f[g].checkElementRemovable(e,!0,c)){g!=
+a&&this.setValue(g);return}}this.setValue("")},this)},onOpen:function(){var b=c.getSelection().getSelectedElement(),b=c.elementPath(b),a=[0,0,0,0];this.showAll();this.unmarkAll();for(var h in f){var d=f[h],e=d._.type;d.checkApplicable(b,c,c.activeFilter)?a[e]++:this.hideItem(h);d.checkActive(b,c)&&this.mark(h)}a[CKEDITOR.STYLE_BLOCK]||this.hideGroup(g["panelTitle"+String(CKEDITOR.STYLE_BLOCK)]);a[CKEDITOR.STYLE_INLINE]||this.hideGroup(g["panelTitle"+String(CKEDITOR.STYLE_INLINE)]);a[CKEDITOR.STYLE_OBJECT]||
+this.hideGroup(g["panelTitle"+String(CKEDITOR.STYLE_OBJECT)])},refresh:function(){var b=c.elementPath();if(b){for(var a in f)if(f[a].checkApplicable(b,c,c.activeFilter))return;this.setState(CKEDITOR.TRISTATE_DISABLED)}},reset:function(){f={};k=[]}})}})})();(function(){function k(c){return{editorFocus:!1,canUndo:!1,modes:{wysiwyg:1},exec:function(d){if(d.editable().hasFocus){var e=d.getSelection(),b;if(b=(new CKEDITOR.dom.elementPath(e.getCommonAncestor(),e.root)).contains({td:1,th:1},1)){var e=d.createRange(),a=CKEDITOR.tools.tryThese(function(){var a=b.getParent().$.cells[b.$.cellIndex+(c?-1:1)];a.parentNode.parentNode;return a},function(){var a=b.getParent(),a=a.getAscendant("table").$.rows[a.$.rowIndex+(c?-1:1)];return a.cells[c?a.cells.length-1:
 0]});if(a||c)if(a)a=new CKEDITOR.dom.element(a),e.moveToElementEditStart(a),e.checkStartOfBlock()&&e.checkEndOfBlock()||e.selectNodeContents(a);else return!0;else{for(var f=b.getAscendant("table").$,a=b.getParent().$.cells,f=new CKEDITOR.dom.element(f.insertRow(-1),d.document),g=0,h=a.length;g<h;g++)f.append((new CKEDITOR.dom.element(a[g],d.document)).clone(!1,!1)).appendBogus();e.moveToElementEditStart(f)}e.select(!0);return!0}}return!1}}}var h={editorFocus:!1,modes:{wysiwyg:1,source:1}},g={exec:function(c){c.container.focusNext(!0,
 c.tabIndex)}},f={exec:function(c){c.container.focusPrevious(!0,c.tabIndex)}};CKEDITOR.plugins.add("tab",{init:function(c){for(var d=!1!==c.config.enableTabKeyTools,e=c.config.tabSpaces||0,b="";e--;)b+=" ";if(b)c.on("key",function(a){9==a.data.keyCode&&(c.insertText(b),a.cancel())});if(d)c.on("key",function(a){(9==a.data.keyCode&&c.execCommand("selectNextCell")||a.data.keyCode==CKEDITOR.SHIFT+9&&c.execCommand("selectPreviousCell"))&&a.cancel()});c.addCommand("blur",CKEDITOR.tools.extend(g,h));c.addCommand("blurBack",
 CKEDITOR.tools.extend(f,h));c.addCommand("selectNextCell",k());c.addCommand("selectPreviousCell",k(!0))}})})();
 CKEDITOR.dom.element.prototype.focusNext=function(k,h){var g=void 0===h?this.getTabIndex():h,f,c,d,e,b,a;if(0>=g)for(b=this.getNextSourceNode(k,CKEDITOR.NODE_ELEMENT);b;){if(b.isVisible()&&0===b.getTabIndex()){d=b;break}b=b.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT)}else for(b=this.getDocument().getBody().getFirst();b=b.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT);){if(!f)if(!c&&b.equals(this)){if(c=!0,k){if(!(b=b.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT)))break;f=1}}else c&&!this.contains(b)&&
 (f=1);if(b.isVisible()&&!(0>(a=b.getTabIndex()))){if(f&&a==g){d=b;break}a>g&&(!d||!e||a<e)?(d=b,e=a):d||0!==a||(d=b,e=a)}}d&&d.focus()};
-CKEDITOR.dom.element.prototype.focusPrevious=function(k,h){for(var g=void 0===h?this.getTabIndex():h,f,c,d,e=0,b,a=this.getDocument().getBody().getLast();a=a.getPreviousSourceNode(!1,CKEDITOR.NODE_ELEMENT);){if(!f)if(!c&&a.equals(this)){if(c=!0,k){if(!(a=a.getPreviousSourceNode(!0,CKEDITOR.NODE_ELEMENT)))break;f=1}}else c&&!this.contains(a)&&(f=1);if(a.isVisible()&&!(0>(b=a.getTabIndex())))if(0>=g){if(f&&0===b){d=a;break}b>e&&(d=a,e=b)}else{if(f&&b==g){d=a;break}b<g&&(!d||b>e)&&(d=a,e=b)}}d&&d.focus()};CKEDITOR.plugins.add("table",{requires:"dialog",init:function(a){function e(a){return CKEDITOR.tools.extend(a||{},{contextSensitive:1,refresh:function(a,f){this.setState(f.contains("table",1)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)}})}if(!a.blockless){var c=a.lang.table;a.addCommand("table",new CKEDITOR.dialogCommand("table",{context:"table",allowedContent:"table{width,height}[align,border,cellpadding,cellspacing,summary];caption tbody thead tfoot;th td tr[scope];"+(a.plugins.dialogadvtab?
-"table"+a.plugins.dialogadvtab.allowedContent():""),requiredContent:"table",contentTransformations:[["table{width}: sizeToStyle","table[width]: sizeToAttribute"]]}));a.addCommand("tableProperties",new CKEDITOR.dialogCommand("tableProperties",e()));a.addCommand("tableDelete",e({exec:function(a){var b=a.elementPath().contains("table",1);if(b){var d=b.getParent(),c=a.editable();1!=d.getChildCount()||d.is("td","th")||d.equals(c)||(b=d);a=a.createRange();a.moveToPosition(b,CKEDITOR.POSITION_BEFORE_START);
-b.remove();a.select()}}}));a.ui.addButton&&a.ui.addButton("Table",{label:c.toolbar,command:"table",toolbar:"insert,30"});CKEDITOR.dialog.add("table",this.path+"dialogs/table.js");CKEDITOR.dialog.add("tableProperties",this.path+"dialogs/table.js");a.addMenuItems&&a.addMenuItems({table:{label:c.menu,command:"tableProperties",group:"table",order:5},tabledelete:{label:c.deleteTable,command:"tableDelete",group:"table",order:1}});a.on("doubleclick",function(a){a.data.element.is("table")&&(a.data.dialog=
-"tableProperties")});a.contextMenu&&a.contextMenu.addListener(function(){return{tabledelete:CKEDITOR.TRISTATE_OFF,table:CKEDITOR.TRISTATE_OFF}})}}});(function(){function t(e){function d(a){0<b.length||a.type!=CKEDITOR.NODE_ELEMENT||!C.test(a.getName())||a.getCustomData("selected_cell")||(CKEDITOR.dom.element.setMarker(c,a,"selected_cell",!0),b.push(a))}e=e.getRanges();for(var b=[],c={},a=0;a<e.length;a++){var f=e[a];if(f.collapsed)f=f.getCommonAncestor(),(f=f.getAscendant("td",!0)||f.getAscendant("th",!0))&&b.push(f);else{var f=new CKEDITOR.dom.walker(f),g;for(f.guard=d;g=f.next();)g.type==CKEDITOR.NODE_ELEMENT&&g.is(CKEDITOR.dtd.table)||(g=g.getAscendant("td",
+CKEDITOR.dom.element.prototype.focusPrevious=function(k,h){for(var g=void 0===h?this.getTabIndex():h,f,c,d,e=0,b,a=this.getDocument().getBody().getLast();a=a.getPreviousSourceNode(!1,CKEDITOR.NODE_ELEMENT);){if(!f)if(!c&&a.equals(this)){if(c=!0,k){if(!(a=a.getPreviousSourceNode(!0,CKEDITOR.NODE_ELEMENT)))break;f=1}}else c&&!this.contains(a)&&(f=1);if(a.isVisible()&&!(0>(b=a.getTabIndex())))if(0>=g){if(f&&0===b){d=a;break}b>e&&(d=a,e=b)}else{if(f&&b==g){d=a;break}b<g&&(!d||b>e)&&(d=a,e=b)}}d&&d.focus()};CKEDITOR.plugins.add("table",{requires:"dialog",init:function(a){function e(b){return CKEDITOR.tools.extend(b||{},{contextSensitive:1,refresh:function(b,a){this.setState(a.contains("table",1)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)}})}if(!a.blockless){var c=a.lang.table;a.addCommand("table",new CKEDITOR.dialogCommand("table",{context:"table",allowedContent:"table{width,height}[align,border,cellpadding,cellspacing,summary];caption tbody thead tfoot;th td tr[scope];"+(a.plugins.dialogadvtab?
+"table"+a.plugins.dialogadvtab.allowedContent():""),requiredContent:"table",contentTransformations:[["table{width}: sizeToStyle","table[width]: sizeToAttribute"],["td: splitBorderShorthand"],[{element:"table",right:function(b){b.styles&&(b.styles.border&&b.styles.border.match(/solid/)&&(b.attributes.border=1),"collapse"==b.styles["border-collapse"]&&(b.attributes.cellspacing=0))}}]]}));a.addCommand("tableProperties",new CKEDITOR.dialogCommand("tableProperties",e()));a.addCommand("tableDelete",e({exec:function(b){var a=
+b.elementPath().contains("table",1);if(a){var d=a.getParent(),c=b.editable();1!=d.getChildCount()||d.is("td","th")||d.equals(c)||(a=d);b=b.createRange();b.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START);a.remove();b.select()}}}));a.ui.addButton&&a.ui.addButton("Table",{label:c.toolbar,command:"table",toolbar:"insert,30"});CKEDITOR.dialog.add("table",this.path+"dialogs/table.js");CKEDITOR.dialog.add("tableProperties",this.path+"dialogs/table.js");a.addMenuItems&&a.addMenuItems({table:{label:c.menu,
+command:"tableProperties",group:"table",order:5},tabledelete:{label:c.deleteTable,command:"tableDelete",group:"table",order:1}});a.on("doubleclick",function(a){a.data.element.is("table")&&(a.data.dialog="tableProperties")});a.contextMenu&&a.contextMenu.addListener(function(){return{tabledelete:CKEDITOR.TRISTATE_OFF,table:CKEDITOR.TRISTATE_OFF}})}}});(function(){function t(e){function d(a){0<b.length||a.type!=CKEDITOR.NODE_ELEMENT||!C.test(a.getName())||a.getCustomData("selected_cell")||(CKEDITOR.dom.element.setMarker(c,a,"selected_cell",!0),b.push(a))}e=e.getRanges();for(var b=[],c={},a=0;a<e.length;a++){var f=e[a];if(f.collapsed)f=f.getCommonAncestor(),(f=f.getAscendant("td",!0)||f.getAscendant("th",!0))&&b.push(f);else{var f=new CKEDITOR.dom.walker(f),g;for(f.guard=d;g=f.next();)g.type==CKEDITOR.NODE_ELEMENT&&g.is(CKEDITOR.dtd.table)||(g=g.getAscendant("td",
 !0)||g.getAscendant("th",!0))&&!g.getCustomData("selected_cell")&&(CKEDITOR.dom.element.setMarker(c,g,"selected_cell",!0),b.push(g))}}CKEDITOR.dom.element.clearAllMarkers(c);return b}function p(e,d){for(var b=t(e),c=b[0],a=c.getAscendant("table"),c=c.getDocument(),f=b[0].getParent(),g=f.$.rowIndex,b=b[b.length-1],h=b.getParent().$.rowIndex+b.$.rowSpan-1,b=new CKEDITOR.dom.element(a.$.rows[h]),g=d?g:h,f=d?f:b,b=CKEDITOR.tools.buildTableMap(a),a=b[g],g=d?b[g-1]:b[g+1],b=b[0].length,c=c.createElement("tr"),
 h=0;a[h]&&h<b;h++){var k;1<a[h].rowSpan&&g&&a[h]==g[h]?(k=a[h],k.rowSpan+=1):(k=(new CKEDITOR.dom.element(a[h])).clone(),k.removeAttribute("rowSpan"),k.appendBogus(),c.append(k),k=k.$);h+=k.colSpan-1}d?c.insertBefore(f):c.insertAfter(f)}function u(e){if(e instanceof CKEDITOR.dom.selection){var d=t(e),b=d[0].getAscendant("table"),c=CKEDITOR.tools.buildTableMap(b);e=d[0].getParent().$.rowIndex;for(var d=d[d.length-1],a=d.getParent().$.rowIndex+d.$.rowSpan-1,d=[],f=e;f<=a;f++){for(var g=c[f],h=new CKEDITOR.dom.element(b.$.rows[f]),
 k=0;k<g.length;k++){var l=new CKEDITOR.dom.element(g[k]),n=l.getParent().$.rowIndex;1==l.$.rowSpan?l.remove():(--l.$.rowSpan,n==f&&(n=c[f+1],n[k-1]?l.insertAfter(new CKEDITOR.dom.element(n[k-1])):(new CKEDITOR.dom.element(b.$.rows[f+1])).append(l,1)));k+=l.$.colSpan-1}d.push(h)}c=b.$.rows;b=new CKEDITOR.dom.element(c[a+1]||(0<e?c[e-1]:null)||b.$.parentNode);for(f=d.length;0<=f;f--)u(d[f]);return b}e instanceof CKEDITOR.dom.element&&(b=e.getAscendant("table"),1==b.$.rows.length?b.remove():e.remove());
@@ -1051,17 +1101,18 @@ q==w;u.moveChildren(e);e.appendBogus();q>=k?e.removeAttribute("rowSpan"):e.$.row
 2),c=g+l,a=new CKEDITOR.dom.element(a.$.rows[c]),f=z(f,c),n,c=b.clone(),g=0;g<f.length;g++)if(n=f[g],n.parentNode==a.$&&g>h){c.insertBefore(new CKEDITOR.dom.element(n));break}else n=null;n||a.append(c)}else for(k=l=1,a=c.clone(),a.insertAfter(c),a.append(c=b.clone()),n=z(f,g),h=0;h<n.length;h++)n[h].rowSpan++;c.appendBogus();b.$.rowSpan=l;c.$.rowSpan=k;1==l&&b.removeAttribute("rowSpan");1==k&&c.removeAttribute("rowSpan");return c}function B(e,d){var b=t(e);if(1<b.length)return!1;if(d)return!0;var b=
 b[0],c=b.getParent(),a=c.getAscendant("table"),a=CKEDITOR.tools.buildTableMap(a),f=z(a,c.$.rowIndex,b),g=b.$.colSpan;if(1<g)c=Math.ceil(g/2),g=Math.floor(g/2);else{for(var g=c=1,h=[],k=0;k<a.length;k++){var l=a[k];h.push(l[f]);1<l[f].rowSpan&&(k+=l[f].rowSpan-1)}for(a=0;a<h.length;a++)h[a].colSpan++}a=b.clone();a.insertAfter(b);a.appendBogus();b.$.colSpan=c;a.$.colSpan=g;1==c&&b.removeAttribute("colSpan");1==g&&a.removeAttribute("colSpan");return a}var C=/^(?:td|th)$/;CKEDITOR.plugins.tabletools=
 {requires:"table,dialog,contextmenu",init:function(e){function d(a){return CKEDITOR.tools.extend(a||{},{contextSensitive:1,refresh:function(a,b){this.setState(b.contains({td:1,th:1},1)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)}})}function b(a,b){var c=e.addCommand(a,b);e.addFeature(c)}var c=e.lang.table;b("cellProperties",new CKEDITOR.dialogCommand("cellProperties",d({allowedContent:"td th{width,height,border-color,background-color,white-space,vertical-align,text-align}[colspan,rowspan]",
-requiredContent:"table"})));CKEDITOR.dialog.add("cellProperties",this.path+"dialogs/tableCell.js");b("rowDelete",d({requiredContent:"table",exec:function(a){a=a.getSelection();q(u(a))}}));b("rowInsertBefore",d({requiredContent:"table",exec:function(a){a=a.getSelection();p(a,!0)}}));b("rowInsertAfter",d({requiredContent:"table",exec:function(a){a=a.getSelection();p(a)}}));b("columnDelete",d({requiredContent:"table",exec:function(a){a=a.getSelection();a=t(a);var b=a[0],c=a[a.length-1];a=b.getAscendant("table");
-for(var d=CKEDITOR.tools.buildTableMap(a),e,l,n=[],r=0,p=d.length;r<p;r++)for(var m=0,u=d[r].length;m<u;m++)d[r][m]==b.$&&(e=m),d[r][m]==c.$&&(l=m);for(r=e;r<=l;r++)for(m=0;m<d.length;m++)c=d[m],b=new CKEDITOR.dom.element(a.$.rows[m]),c=new CKEDITOR.dom.element(c[r]),c.$&&(1==c.$.colSpan?c.remove():--c.$.colSpan,m+=c.$.rowSpan-1,b.$.cells.length||n.push(b));l=a.$.rows[0]&&a.$.rows[0].cells;e=new CKEDITOR.dom.element(l[e]||(e?l[e-1]:a.$.parentNode));n.length==p&&a.remove();e&&q(e,!0)}}));b("columnInsertBefore",
-d({requiredContent:"table",exec:function(a){a=a.getSelection();m(a,!0)}}));b("columnInsertAfter",d({requiredContent:"table",exec:function(a){a=a.getSelection();m(a)}}));b("cellDelete",d({requiredContent:"table",exec:function(a){a=a.getSelection();x(a)}}));b("cellMerge",d({allowedContent:"td[colspan,rowspan]",requiredContent:"td[colspan,rowspan]",exec:function(a){q(w(a.getSelection()),!0)}}));b("cellMergeRight",d({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a){q(w(a.getSelection(),
-"right"),!0)}}));b("cellMergeDown",d({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a){q(w(a.getSelection(),"down"),!0)}}));b("cellVerticalSplit",d({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a){q(B(a.getSelection()))}}));b("cellHorizontalSplit",d({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a){q(A(a.getSelection()))}}));b("cellInsertBefore",d({requiredContent:"table",exec:function(a){a=a.getSelection();y(a,!0)}}));
-b("cellInsertAfter",d({requiredContent:"table",exec:function(a){a=a.getSelection();y(a)}}));e.addMenuItems&&e.addMenuItems({tablecell:{label:c.cell.menu,group:"tablecell",order:1,getItems:function(){var a=e.getSelection(),b=t(a);return{tablecell_insertBefore:CKEDITOR.TRISTATE_OFF,tablecell_insertAfter:CKEDITOR.TRISTATE_OFF,tablecell_delete:CKEDITOR.TRISTATE_OFF,tablecell_merge:w(a,null,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_merge_right:w(a,"right",!0)?CKEDITOR.TRISTATE_OFF:
-CKEDITOR.TRISTATE_DISABLED,tablecell_merge_down:w(a,"down",!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_vertical:B(a,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_horizontal:A(a,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_properties:0<b.length?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED}}},tablecell_insertBefore:{label:c.cell.insertBefore,group:"tablecell",command:"cellInsertBefore",order:5},tablecell_insertAfter:{label:c.cell.insertAfter,
-group:"tablecell",command:"cellInsertAfter",order:10},tablecell_delete:{label:c.cell.deleteCell,group:"tablecell",command:"cellDelete",order:15},tablecell_merge:{label:c.cell.merge,group:"tablecell",command:"cellMerge",order:16},tablecell_merge_right:{label:c.cell.mergeRight,group:"tablecell",command:"cellMergeRight",order:17},tablecell_merge_down:{label:c.cell.mergeDown,group:"tablecell",command:"cellMergeDown",order:18},tablecell_split_horizontal:{label:c.cell.splitHorizontal,group:"tablecell",
-command:"cellHorizontalSplit",order:19},tablecell_split_vertical:{label:c.cell.splitVertical,group:"tablecell",command:"cellVerticalSplit",order:20},tablecell_properties:{label:c.cell.title,group:"tablecellproperties",command:"cellProperties",order:21},tablerow:{label:c.row.menu,group:"tablerow",order:1,getItems:function(){return{tablerow_insertBefore:CKEDITOR.TRISTATE_OFF,tablerow_insertAfter:CKEDITOR.TRISTATE_OFF,tablerow_delete:CKEDITOR.TRISTATE_OFF}}},tablerow_insertBefore:{label:c.row.insertBefore,
-group:"tablerow",command:"rowInsertBefore",order:5},tablerow_insertAfter:{label:c.row.insertAfter,group:"tablerow",command:"rowInsertAfter",order:10},tablerow_delete:{label:c.row.deleteRow,group:"tablerow",command:"rowDelete",order:15},tablecolumn:{label:c.column.menu,group:"tablecolumn",order:1,getItems:function(){return{tablecolumn_insertBefore:CKEDITOR.TRISTATE_OFF,tablecolumn_insertAfter:CKEDITOR.TRISTATE_OFF,tablecolumn_delete:CKEDITOR.TRISTATE_OFF}}},tablecolumn_insertBefore:{label:c.column.insertBefore,
-group:"tablecolumn",command:"columnInsertBefore",order:5},tablecolumn_insertAfter:{label:c.column.insertAfter,group:"tablecolumn",command:"columnInsertAfter",order:10},tablecolumn_delete:{label:c.column.deleteColumn,group:"tablecolumn",command:"columnDelete",order:15}});e.contextMenu&&e.contextMenu.addListener(function(a,b,c){return(a=c.contains({td:1,th:1},1))&&!a.isReadOnly()?{tablecell:CKEDITOR.TRISTATE_OFF,tablerow:CKEDITOR.TRISTATE_OFF,tablecolumn:CKEDITOR.TRISTATE_OFF}:null})},getSelectedCells:t};
-CKEDITOR.plugins.add("tabletools",CKEDITOR.plugins.tabletools)})();CKEDITOR.tools.buildTableMap=function(t){t=t.$.rows;for(var p=-1,u=[],v=0;v<t.length;v++){p++;!u[p]&&(u[p]=[]);for(var m=-1,y=0;y<t[v].cells.length;y++){var x=t[v].cells[y];for(m++;u[p][m];)m++;for(var q=isNaN(x.colSpan)?1:x.colSpan,x=isNaN(x.rowSpan)?1:x.rowSpan,z=0;z<x;z++){u[p+z]||(u[p+z]=[]);for(var w=0;w<q;w++)u[p+z][m+w]=t[v].cells[y]}m+=q-1}}return u};(function(){var g=[CKEDITOR.CTRL+90,CKEDITOR.CTRL+89,CKEDITOR.CTRL+CKEDITOR.SHIFT+90],n={8:1,46:1};CKEDITOR.plugins.add("undo",{init:function(a){function b(a){d.enabled&&!1!==a.data.command.canUndo&&d.save()}function c(){d.enabled=a.readOnly?!1:"wysiwyg"==a.mode;d.onChange()}var d=a.undoManager=new e(a),l=d.editingHandler=new k(d),f=a.addCommand("undo",{exec:function(){d.undo()&&(a.selectionChange(),this.fire("afterUndo"))},startDisabled:!0,canUndo:!1}),h=a.addCommand("redo",{exec:function(){d.redo()&&
+requiredContent:"table",contentTransformations:[[{element:"td",left:function(a){return a.styles.background&&a.styles.background.match(/^(#[a-fA-F0-9]{3,6}|rgb\([\d, ]+\)|\w+)$/)},right:function(a){a.styles["background-color"]=a.styles.background}}]]})));CKEDITOR.dialog.add("cellProperties",this.path+"dialogs/tableCell.js");b("rowDelete",d({requiredContent:"table",exec:function(a){a=a.getSelection();q(u(a))}}));b("rowInsertBefore",d({requiredContent:"table",exec:function(a){a=a.getSelection();p(a,
+!0)}}));b("rowInsertAfter",d({requiredContent:"table",exec:function(a){a=a.getSelection();p(a)}}));b("columnDelete",d({requiredContent:"table",exec:function(a){a=a.getSelection();a=t(a);var b=a[0],c=a[a.length-1];a=b.getAscendant("table");for(var d=CKEDITOR.tools.buildTableMap(a),e,l,n=[],r=0,p=d.length;r<p;r++)for(var m=0,u=d[r].length;m<u;m++)d[r][m]==b.$&&(e=m),d[r][m]==c.$&&(l=m);for(r=e;r<=l;r++)for(m=0;m<d.length;m++)c=d[m],b=new CKEDITOR.dom.element(a.$.rows[m]),c=new CKEDITOR.dom.element(c[r]),
+c.$&&(1==c.$.colSpan?c.remove():--c.$.colSpan,m+=c.$.rowSpan-1,b.$.cells.length||n.push(b));l=a.$.rows[0]&&a.$.rows[0].cells;e=new CKEDITOR.dom.element(l[e]||(e?l[e-1]:a.$.parentNode));n.length==p&&a.remove();e&&q(e,!0)}}));b("columnInsertBefore",d({requiredContent:"table",exec:function(a){a=a.getSelection();m(a,!0)}}));b("columnInsertAfter",d({requiredContent:"table",exec:function(a){a=a.getSelection();m(a)}}));b("cellDelete",d({requiredContent:"table",exec:function(a){a=a.getSelection();x(a)}}));
+b("cellMerge",d({allowedContent:"td[colspan,rowspan]",requiredContent:"td[colspan,rowspan]",exec:function(a){q(w(a.getSelection()),!0)}}));b("cellMergeRight",d({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a){q(w(a.getSelection(),"right"),!0)}}));b("cellMergeDown",d({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a){q(w(a.getSelection(),"down"),!0)}}));b("cellVerticalSplit",d({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a){q(B(a.getSelection()))}}));
+b("cellHorizontalSplit",d({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a){q(A(a.getSelection()))}}));b("cellInsertBefore",d({requiredContent:"table",exec:function(a){a=a.getSelection();y(a,!0)}}));b("cellInsertAfter",d({requiredContent:"table",exec:function(a){a=a.getSelection();y(a)}}));e.addMenuItems&&e.addMenuItems({tablecell:{label:c.cell.menu,group:"tablecell",order:1,getItems:function(){var a=e.getSelection(),b=t(a);return{tablecell_insertBefore:CKEDITOR.TRISTATE_OFF,
+tablecell_insertAfter:CKEDITOR.TRISTATE_OFF,tablecell_delete:CKEDITOR.TRISTATE_OFF,tablecell_merge:w(a,null,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_merge_right:w(a,"right",!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_merge_down:w(a,"down",!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_vertical:B(a,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_horizontal:A(a,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_properties:0<
+b.length?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED}}},tablecell_insertBefore:{label:c.cell.insertBefore,group:"tablecell",command:"cellInsertBefore",order:5},tablecell_insertAfter:{label:c.cell.insertAfter,group:"tablecell",command:"cellInsertAfter",order:10},tablecell_delete:{label:c.cell.deleteCell,group:"tablecell",command:"cellDelete",order:15},tablecell_merge:{label:c.cell.merge,group:"tablecell",command:"cellMerge",order:16},tablecell_merge_right:{label:c.cell.mergeRight,group:"tablecell",
+command:"cellMergeRight",order:17},tablecell_merge_down:{label:c.cell.mergeDown,group:"tablecell",command:"cellMergeDown",order:18},tablecell_split_horizontal:{label:c.cell.splitHorizontal,group:"tablecell",command:"cellHorizontalSplit",order:19},tablecell_split_vertical:{label:c.cell.splitVertical,group:"tablecell",command:"cellVerticalSplit",order:20},tablecell_properties:{label:c.cell.title,group:"tablecellproperties",command:"cellProperties",order:21},tablerow:{label:c.row.menu,group:"tablerow",
+order:1,getItems:function(){return{tablerow_insertBefore:CKEDITOR.TRISTATE_OFF,tablerow_insertAfter:CKEDITOR.TRISTATE_OFF,tablerow_delete:CKEDITOR.TRISTATE_OFF}}},tablerow_insertBefore:{label:c.row.insertBefore,group:"tablerow",command:"rowInsertBefore",order:5},tablerow_insertAfter:{label:c.row.insertAfter,group:"tablerow",command:"rowInsertAfter",order:10},tablerow_delete:{label:c.row.deleteRow,group:"tablerow",command:"rowDelete",order:15},tablecolumn:{label:c.column.menu,group:"tablecolumn",order:1,
+getItems:function(){return{tablecolumn_insertBefore:CKEDITOR.TRISTATE_OFF,tablecolumn_insertAfter:CKEDITOR.TRISTATE_OFF,tablecolumn_delete:CKEDITOR.TRISTATE_OFF}}},tablecolumn_insertBefore:{label:c.column.insertBefore,group:"tablecolumn",command:"columnInsertBefore",order:5},tablecolumn_insertAfter:{label:c.column.insertAfter,group:"tablecolumn",command:"columnInsertAfter",order:10},tablecolumn_delete:{label:c.column.deleteColumn,group:"tablecolumn",command:"columnDelete",order:15}});e.contextMenu&&
+e.contextMenu.addListener(function(a,b,c){return(a=c.contains({td:1,th:1},1))&&!a.isReadOnly()?{tablecell:CKEDITOR.TRISTATE_OFF,tablerow:CKEDITOR.TRISTATE_OFF,tablecolumn:CKEDITOR.TRISTATE_OFF}:null})},getSelectedCells:t};CKEDITOR.plugins.add("tabletools",CKEDITOR.plugins.tabletools)})();
+CKEDITOR.tools.buildTableMap=function(t){t=t.$.rows;for(var p=-1,u=[],v=0;v<t.length;v++){p++;!u[p]&&(u[p]=[]);for(var m=-1,y=0;y<t[v].cells.length;y++){var x=t[v].cells[y];for(m++;u[p][m];)m++;for(var q=isNaN(x.colSpan)?1:x.colSpan,x=isNaN(x.rowSpan)?1:x.rowSpan,z=0;z<x;z++){u[p+z]||(u[p+z]=[]);for(var w=0;w<q;w++)u[p+z][m+w]=t[v].cells[y]}m+=q-1}}return u};(function(){var g=[CKEDITOR.CTRL+90,CKEDITOR.CTRL+89,CKEDITOR.CTRL+CKEDITOR.SHIFT+90],n={8:1,46:1};CKEDITOR.plugins.add("undo",{init:function(a){function b(a){d.enabled&&!1!==a.data.command.canUndo&&d.save()}function c(){d.enabled=a.readOnly?!1:"wysiwyg"==a.mode;d.onChange()}var d=a.undoManager=new e(a),l=d.editingHandler=new k(d),f=a.addCommand("undo",{exec:function(){d.undo()&&(a.selectionChange(),this.fire("afterUndo"))},startDisabled:!0,canUndo:!1}),h=a.addCommand("redo",{exec:function(){d.redo()&&
 (a.selectionChange(),this.fire("afterRedo"))},startDisabled:!0,canUndo:!1});a.setKeystroke([[g[0],"undo"],[g[1],"redo"],[g[2],"redo"]]);d.onChange=function(){f.setState(d.undoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);h.setState(d.redoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)};a.on("beforeCommandExec",b);a.on("afterCommandExec",b);a.on("saveSnapshot",function(a){d.save(a.data&&a.data.contentOnly)});a.on("contentDom",l.attachListeners,l);a.on("instanceReady",function(){a.fire("saveSnapshot")});
 a.on("beforeModeUnload",function(){"wysiwyg"==a.mode&&d.save(!0)});a.on("mode",c);a.on("readOnly",c);a.ui.addButton&&(a.ui.addButton("Undo",{label:a.lang.undo.undo,command:"undo",toolbar:"undo,10"}),a.ui.addButton("Redo",{label:a.lang.undo.redo,command:"redo",toolbar:"undo,20"}));a.resetUndo=function(){d.reset();a.fire("saveSnapshot")};a.on("updateSnapshot",function(){d.currentImage&&d.update()});a.on("lockSnapshot",function(a){a=a.data;d.lock(a&&a.dontUpdate,a&&a.forceUpdate)});a.on("unlockSnapshot",
 d.unlock,d)}});CKEDITOR.plugins.undo={};var e=CKEDITOR.plugins.undo.UndoManager=function(a){this.strokesRecorded=[0,0];this.locked=null;this.previousKeyGroup=-1;this.limit=a.config.undoStackSize||20;this.strokesLimit=25;this.editor=a;this.reset()};e.prototype={type:function(a,b){var c=e.getKeyGroup(a),d=this.strokesRecorded[c]+1;b=b||d>=this.strokesLimit;this.typing||(this.hasUndo=this.typing=!0,this.hasRedo=!1,this.onChange());b?(d=0,this.editor.fire("saveSnapshot")):this.editor.fire("change");this.strokesRecorded[c]=
@@ -1079,6 +1130,6 @@ a=a.data.getKey();var c=this.keyEventsStack.getTotalInputs();this.keyEventsStack
 b=a.editable(),c=this;b.attachListener(b,"keydown",function(a){c.onKeydown(a);if(e.ieFunctionalKeysBug(a.data.getKey()))c.onInput()},null,null,999);b.attachListener(b,CKEDITOR.env.ie?"keypress":"input",c.onInput,c,null,999);b.attachListener(b,"keyup",c.onKeyup,c,null,999);b.attachListener(b,"paste",c.ignoreInputEventListener,c,null,999);b.attachListener(b,"drop",c.ignoreInputEventListener,c,null,999);b.attachListener(b.isInline()?b:a.document.getDocumentElement(),"click",function(){c.onNavigationKey()},
 null,null,999);b.attachListener(this.undoManager.editor,"blur",function(){c.keyEventsStack.remove(9)},null,null,999)}};var m=CKEDITOR.plugins.undo.KeyEventsStack=function(){this.stack=[]};m.prototype={push:function(a){a=this.stack.push({keyCode:a,inputs:0});return this.stack[a-1]},getLastIndex:function(a){if("number"!=typeof a)return this.stack.length-1;for(var b=this.stack.length;b--;)if(this.stack[b].keyCode==a)return b;return-1},getLast:function(a){a=this.getLastIndex(a);return-1!=a?this.stack[a]:
 null},increment:function(a){this.getLast(a).inputs++},remove:function(a){a=this.getLastIndex(a);-1!=a&&this.stack.splice(a,1)},resetInputs:function(a){if("number"==typeof a)this.getLast(a).inputs=0;else for(a=this.stack.length;a--;)this.stack[a].inputs=0},getTotalInputs:function(){for(var a=this.stack.length,b=0;a--;)b+=this.stack[a].inputs;return b},cleanUp:function(a){a=a.data.$;a.ctrlKey||a.metaKey||this.remove(17);a.shiftKey||this.remove(16);a.altKey||this.remove(18)}}})();CKEDITOR.plugins.add("wsc",{requires:"dialog",parseApi:function(a){a.config.wsc_onFinish="function"===typeof a.config.wsc_onFinish?a.config.wsc_onFinish:function(){};a.config.wsc_onClose="function"===typeof a.config.wsc_onClose?a.config.wsc_onClose:function(){}},parseConfig:function(a){a.config.wsc_customerId=a.config.wsc_customerId||CKEDITOR.config.wsc_customerId||"1:ua3xw1-2XyGJ3-GWruD3-6OFNT1-oXcuB1-nR6Bp4-hgQHc-EcYng3-sdRXG3-NOfFk";a.config.wsc_customDictionaryIds=a.config.wsc_customDictionaryIds||
-CKEDITOR.config.wsc_customDictionaryIds||"";a.config.wsc_userDictionaryName=a.config.wsc_userDictionaryName||CKEDITOR.config.wsc_userDictionaryName||"";a.config.wsc_customLoaderScript=a.config.wsc_customLoaderScript||CKEDITOR.config.wsc_customLoaderScript;CKEDITOR.config.wsc_cmd=a.config.wsc_cmd||CKEDITOR.config.wsc_cmd||"spell";CKEDITOR.config.wsc_version="v4.3.0-master-d769233";CKEDITOR.config.wsc_removeGlobalVariable=!0},init:function(a){var b=CKEDITOR.env;this.parseConfig(a);this.parseApi(a);
-a.addCommand("checkspell",new CKEDITOR.dialogCommand("checkspell")).modes={wysiwyg:!CKEDITOR.env.opera&&!CKEDITOR.env.air&&document.domain==window.location.hostname&&!(b.ie&&(8>b.version||b.quirks))};"undefined"==typeof a.plugins.scayt&&a.ui.addButton&&a.ui.addButton("SpellChecker",{label:a.lang.wsc.toolbar,click:function(a){var b=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.container.getText():a.document.getBody().getText();(b=b.replace(/\s/g,""))?a.execCommand("checkspell"):alert("Nothing to check!")},
-toolbar:"spellchecker,10"});CKEDITOR.dialog.add("checkspell",this.path+(CKEDITOR.env.ie&&7>=CKEDITOR.env.version?"dialogs/wsc_ie.js":window.postMessage?"dialogs/wsc.js":"dialogs/wsc_ie.js"))}});CKEDITOR.config.plugins='dialogui,dialog,about,a11yhelp,dialogadvtab,basicstyles,bidi,blockquote,clipboard,button,panelbutton,panel,floatpanel,colorbutton,colordialog,templates,menu,contextmenu,div,resize,toolbar,elementspath,enterkey,entities,popup,filebrowser,find,fakeobjects,flash,floatingspace,listblock,richcombo,font,forms,format,horizontalrule,htmlwriter,iframe,wysiwygarea,image,indent,indentblock,indentlist,smiley,justify,menubutton,language,link,list,liststyle,magicline,maximize,newpage,pagebreak,pastetext,pastefromword,preview,print,removeformat,save,selectall,showblocks,showborders,sourcearea,specialchar,scayt,stylescombo,tab,table,tabletools,undo,wsc';CKEDITOR.config.skin='moono';(function() {var setIcons = function(icons, strip) {var path = CKEDITOR.getUrl( 'plugins/' + strip );icons = icons.split( ',' );for ( var i = 0; i < icons.length; i++ )CKEDITOR.skin.icons[ icons[ i ] ] = { path: path, offset: -icons[ ++i ], bgsize : icons[ ++i ] };};if (CKEDITOR.env.hidpi) setIcons('about,0,,bold,24,,italic,48,,strike,72,,subscript,96,,superscript,120,,underline,144,,bidiltr,168,,bidirtl,192,,blockquote,216,,copy-rtl,240,,copy,264,,cut-rtl,288,,cut,312,,paste-rtl,336,,paste,360,,bgcolor,384,,textcolor,408,,templates-rtl,432,,templates,456,,creatediv,480,,find-rtl,504,,find,528,,replace,552,,flash,576,,button,600,,checkbox,624,,form,648,,hiddenfield,672,,imagebutton,696,,radio,720,,select-rtl,744,,select,768,,textarea-rtl,792,,textarea,816,,textfield-rtl,840,,textfield,864,,horizontalrule,888,,iframe,912,,image,936,,indent-rtl,960,,indent,984,,outdent-rtl,1008,,outdent,1032,,smiley,1056,,justifyblock,1080,,justifycenter,1104,,justifyleft,1128,,justifyright,1152,,language,1176,,anchor-rtl,1200,,anchor,1224,,link,1248,,unlink,1272,,bulletedlist-rtl,1296,,bulletedlist,1320,,numberedlist-rtl,1344,,numberedlist,1368,,maximize,1392,,newpage-rtl,1416,,newpage,1440,,pagebreak-rtl,1464,,pagebreak,1488,,pastetext-rtl,1512,,pastetext,1536,,pastefromword-rtl,1560,,pastefromword,1584,,preview-rtl,1608,,preview,1632,,print,1656,,removeformat,1680,,save,1704,,selectall,1728,,showblocks-rtl,1752,,showblocks,1776,,source-rtl,1800,,source,1824,,specialchar,1848,,scayt,1872,,table,1896,,redo-rtl,1920,,redo,1944,,undo-rtl,1968,,undo,1992,,spellchecker,2016,','icons_hidpi.png');else setIcons('about,0,auto,bold,24,auto,italic,48,auto,strike,72,auto,subscript,96,auto,superscript,120,auto,underline,144,auto,bidiltr,168,auto,bidirtl,192,auto,blockquote,216,auto,copy-rtl,240,auto,copy,264,auto,cut-rtl,288,auto,cut,312,auto,paste-rtl,336,auto,paste,360,auto,bgcolor,384,auto,textcolor,408,auto,templates-rtl,432,auto,templates,456,auto,creatediv,480,auto,find-rtl,504,auto,find,528,auto,replace,552,auto,flash,576,auto,button,600,auto,checkbox,624,auto,form,648,auto,hiddenfield,672,auto,imagebutton,696,auto,radio,720,auto,select-rtl,744,auto,select,768,auto,textarea-rtl,792,auto,textarea,816,auto,textfield-rtl,840,auto,textfield,864,auto,horizontalrule,888,auto,iframe,912,auto,image,936,auto,indent-rtl,960,auto,indent,984,auto,outdent-rtl,1008,auto,outdent,1032,auto,smiley,1056,auto,justifyblock,1080,auto,justifycenter,1104,auto,justifyleft,1128,auto,justifyright,1152,auto,language,1176,auto,anchor-rtl,1200,auto,anchor,1224,auto,link,1248,auto,unlink,1272,auto,bulletedlist-rtl,1296,auto,bulletedlist,1320,auto,numberedlist-rtl,1344,auto,numberedlist,1368,auto,maximize,1392,auto,newpage-rtl,1416,auto,newpage,1440,auto,pagebreak-rtl,1464,auto,pagebreak,1488,auto,pastetext-rtl,1512,auto,pastetext,1536,auto,pastefromword-rtl,1560,auto,pastefromword,1584,auto,preview-rtl,1608,auto,preview,1632,auto,print,1656,auto,removeformat,1680,auto,save,1704,auto,selectall,1728,auto,showblocks-rtl,1752,auto,showblocks,1776,auto,source-rtl,1800,auto,source,1824,auto,specialchar,1848,auto,scayt,1872,auto,table,1896,auto,redo-rtl,1920,auto,redo,1944,auto,undo-rtl,1968,auto,undo,1992,auto,spellchecker,2016,auto','icons.png');})();CKEDITOR.lang.languages={"af":1,"sq":1,"ar":1,"eu":1,"bn":1,"bs":1,"bg":1,"ca":1,"zh-cn":1,"zh":1,"hr":1,"cs":1,"da":1,"nl":1,"en":1,"en-au":1,"en-ca":1,"en-gb":1,"eo":1,"et":1,"fo":1,"fi":1,"fr":1,"fr-ca":1,"gl":1,"ka":1,"de":1,"de-ch":1,"el":1,"gu":1,"he":1,"hi":1,"hu":1,"is":1,"id":1,"it":1,"ja":1,"km":1,"ko":1,"ku":1,"lv":1,"lt":1,"mk":1,"ms":1,"mn":1,"no":1,"nb":1,"fa":1,"pl":1,"pt-br":1,"pt":1,"ro":1,"ru":1,"sr":1,"sr-latn":1,"si":1,"sk":1,"sl":1,"es":1,"sv":1,"tt":1,"th":1,"tr":1,"ug":1,"uk":1,"vi":1,"cy":1};}());
\ No newline at end of file
+CKEDITOR.config.wsc_customDictionaryIds||"";a.config.wsc_userDictionaryName=a.config.wsc_userDictionaryName||CKEDITOR.config.wsc_userDictionaryName||"";a.config.wsc_customLoaderScript=a.config.wsc_customLoaderScript||CKEDITOR.config.wsc_customLoaderScript;a.config.wsc_interfaceLang=a.config.wsc_interfaceLang;CKEDITOR.config.wsc_cmd=a.config.wsc_cmd||CKEDITOR.config.wsc_cmd||"spell";CKEDITOR.config.wsc_version="v4.3.0-master-d769233";CKEDITOR.config.wsc_removeGlobalVariable=!0},onLoad:function(a){"moono-lisa"==
+(CKEDITOR.skinName||a.config.skin)&&CKEDITOR.document.appendStyleSheet(this.path+"skins/"+CKEDITOR.skin.name+"/wsc.css")},init:function(a){var b=CKEDITOR.env;this.parseConfig(a);this.parseApi(a);a.addCommand("checkspell",new CKEDITOR.dialogCommand("checkspell")).modes={wysiwyg:!CKEDITOR.env.opera&&!CKEDITOR.env.air&&document.domain==window.location.hostname&&!(b.ie&&(8>b.version||b.quirks))};"undefined"==typeof a.plugins.scayt&&a.ui.addButton&&a.ui.addButton("SpellChecker",{label:a.lang.wsc.toolbar,
+click:function(a){var b=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.container.getText():a.document.getBody().getText();(b=b.replace(/\s/g,""))?a.execCommand("checkspell"):alert("Nothing to check!")},toolbar:"spellchecker,10"});CKEDITOR.dialog.add("checkspell",this.path+(CKEDITOR.env.ie&&7>=CKEDITOR.env.version?"dialogs/wsc_ie.js":window.postMessage?"dialogs/wsc.js":"dialogs/wsc_ie.js"))}});CKEDITOR.config.plugins='dialogui,dialog,about,a11yhelp,dialogadvtab,basicstyles,bidi,blockquote,clipboard,button,panelbutton,panel,floatpanel,colorbutton,colordialog,templates,menu,contextmenu,copyformatting,div,resize,toolbar,elementspath,enterkey,entities,popup,filebrowser,find,fakeobjects,flash,floatingspace,listblock,richcombo,font,forms,format,horizontalrule,htmlwriter,iframe,wysiwygarea,image,indent,indentblock,indentlist,smiley,justify,menubutton,language,link,list,liststyle,magicline,maximize,newpage,pagebreak,pastetext,pastefromword,preview,print,removeformat,save,selectall,showblocks,showborders,sourcearea,specialchar,scayt,stylescombo,tab,table,tabletools,undo,wsc';CKEDITOR.config.skin='moono-lisa';(function() {var setIcons = function(icons, strip) {var path = CKEDITOR.getUrl( 'plugins/' + strip );icons = icons.split( ',' );for ( var i = 0; i < icons.length; i++ )CKEDITOR.skin.icons[ icons[ i ] ] = { path: path, offset: -icons[ ++i ], bgsize : icons[ ++i ] };};if (CKEDITOR.env.hidpi) setIcons('about,0,,bold,24,,italic,48,,strike,72,,subscript,96,,superscript,120,,underline,144,,bidiltr,168,,bidirtl,192,,blockquote,216,,copy-rtl,240,,copy,264,,cut-rtl,288,,cut,312,,paste-rtl,336,,paste,360,,bgcolor,384,,textcolor,408,,templates-rtl,432,,templates,456,,copyformatting,480,,creatediv,504,,find-rtl,528,,find,552,,replace,576,,flash,600,,button,624,,checkbox,648,,form,672,,hiddenfield,696,,imagebutton,720,,radio,744,,select-rtl,768,,select,792,,textarea-rtl,816,,textarea,840,,textfield-rtl,864,,textfield,888,,horizontalrule,912,,iframe,936,,image,960,,indent-rtl,984,,indent,1008,,outdent-rtl,1032,,outdent,1056,,smiley,1080,,justifyblock,1104,,justifycenter,1128,,justifyleft,1152,,justifyright,1176,,language,1200,,anchor-rtl,1224,,anchor,1248,,link,1272,,unlink,1296,,bulletedlist-rtl,1320,,bulletedlist,1344,,numberedlist-rtl,1368,,numberedlist,1392,,maximize,1416,,newpage-rtl,1440,,newpage,1464,,pagebreak-rtl,1488,,pagebreak,1512,,pastetext-rtl,1536,,pastetext,1560,,pastefromword-rtl,1584,,pastefromword,1608,,preview-rtl,1632,,preview,1656,,print,1680,,removeformat,1704,,save,1728,,selectall,1752,,showblocks-rtl,1776,,showblocks,1800,,source-rtl,1824,,source,1848,,specialchar,1872,,scayt,1896,,table,1920,,redo-rtl,1944,,redo,1968,,undo-rtl,1992,,undo,2016,,spellchecker,2040,','icons_hidpi.png');else setIcons('about,0,auto,bold,24,auto,italic,48,auto,strike,72,auto,subscript,96,auto,superscript,120,auto,underline,144,auto,bidiltr,168,auto,bidirtl,192,auto,blockquote,216,auto,copy-rtl,240,auto,copy,264,auto,cut-rtl,288,auto,cut,312,auto,paste-rtl,336,auto,paste,360,auto,bgcolor,384,auto,textcolor,408,auto,templates-rtl,432,auto,templates,456,auto,copyformatting,480,auto,creatediv,504,auto,find-rtl,528,auto,find,552,auto,replace,576,auto,flash,600,auto,button,624,auto,checkbox,648,auto,form,672,auto,hiddenfield,696,auto,imagebutton,720,auto,radio,744,auto,select-rtl,768,auto,select,792,auto,textarea-rtl,816,auto,textarea,840,auto,textfield-rtl,864,auto,textfield,888,auto,horizontalrule,912,auto,iframe,936,auto,image,960,auto,indent-rtl,984,auto,indent,1008,auto,outdent-rtl,1032,auto,outdent,1056,auto,smiley,1080,auto,justifyblock,1104,auto,justifycenter,1128,auto,justifyleft,1152,auto,justifyright,1176,auto,language,1200,auto,anchor-rtl,1224,auto,anchor,1248,auto,link,1272,auto,unlink,1296,auto,bulletedlist-rtl,1320,auto,bulletedlist,1344,auto,numberedlist-rtl,1368,auto,numberedlist,1392,auto,maximize,1416,auto,newpage-rtl,1440,auto,newpage,1464,auto,pagebreak-rtl,1488,auto,pagebreak,1512,auto,pastetext-rtl,1536,auto,pastetext,1560,auto,pastefromword-rtl,1584,auto,pastefromword,1608,auto,preview-rtl,1632,auto,preview,1656,auto,print,1680,auto,removeformat,1704,auto,save,1728,auto,selectall,1752,auto,showblocks-rtl,1776,auto,showblocks,1800,auto,source-rtl,1824,auto,source,1848,auto,specialchar,1872,auto,scayt,1896,auto,table,1920,auto,redo-rtl,1944,auto,redo,1968,auto,undo-rtl,1992,auto,undo,2016,auto,spellchecker,2040,auto','icons.png');})();CKEDITOR.lang.languages={"af":1,"sq":1,"ar":1,"az":1,"eu":1,"bn":1,"bs":1,"bg":1,"ca":1,"zh-cn":1,"zh":1,"hr":1,"cs":1,"da":1,"nl":1,"en":1,"en-au":1,"en-ca":1,"en-gb":1,"eo":1,"et":1,"fo":1,"fi":1,"fr":1,"fr-ca":1,"gl":1,"ka":1,"de":1,"de-ch":1,"el":1,"gu":1,"he":1,"hi":1,"hu":1,"is":1,"id":1,"it":1,"ja":1,"km":1,"ko":1,"ku":1,"lv":1,"lt":1,"mk":1,"ms":1,"mn":1,"no":1,"nb":1,"oc":1,"fa":1,"pl":1,"pt-br":1,"pt":1,"ro":1,"ru":1,"sr":1,"sr-latn":1,"si":1,"sk":1,"sl":1,"es":1,"sv":1,"tt":1,"th":1,"tr":1,"ug":1,"uk":1,"vi":1,"cy":1};}());
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/composer.json b/htdocs/includes/ckeditor/ckeditor/composer.json
deleted file mode 100644
index dc3a40d1733..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/composer.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"name": "ckeditor/ckeditor",
-	"description": "JavaScript WYSIWYG web text editor.",
-	"type": "library",
-	"keywords": [ "ckeditor", "fckeditor", "editor", "wysiwyg", "html", "richtext", "text", "javascript" ],
-	"homepage": "http://ckeditor.com",
-	"license": [ "GPL-2.0+", "LGPL-2.1+", "MPL-1.1+" ],
-	"authors": [
-		{
-			"name":  "CKSource",
-			"homepage": "http://cksource.com"
-		}
-	],
-	"support": {
-		"issues": "http://dev.ckeditor.com",
-		"forum": "http://ckeditor.com/forums",
-		"wiki": "http://docs.ckeditor.com",
-		"source": "http://github.com/ckeditor/ckeditor-dev"
-	}
-}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/config.js b/htdocs/includes/ckeditor/ckeditor/config.js
index 06159c0c5b3..01a391a25b4 100644
--- a/htdocs/includes/ckeditor/ckeditor/config.js
+++ b/htdocs/includes/ckeditor/ckeditor/config.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md or http://ckeditor.com/license
  */
 
diff --git a/htdocs/includes/ckeditor/ckeditor/contents.css b/htdocs/includes/ckeditor/ckeditor/contents.css
index 7e990756288..e39f91b21c5 100644
--- a/htdocs/includes/ckeditor/ckeditor/contents.css
+++ b/htdocs/includes/ckeditor/ckeditor/contents.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 
@@ -133,3 +133,76 @@ a > img {
 	border: none;
 	outline: 1px solid #0782C1;
 }
+
+/* Widget Styles */
+.code-featured
+{
+	border: 5px solid red;
+}
+
+.math-featured
+{
+	padding: 20px;
+	box-shadow: 0 0 2px rgba(200, 0, 0, 1);
+	background-color: rgba(255, 0, 0, 0.05);
+	margin: 10px;
+}
+
+.image-clean
+{
+	border: 0;
+	background: none;
+	padding: 0;
+}
+
+.image-clean > figcaption
+{
+	font-size: .9em;
+	text-align: right;
+}
+
+.image-grayscale
+{
+	background-color: white;
+	color: #666;
+}
+
+.image-grayscale img, img.image-grayscale
+{
+	filter: grayscale(100%);
+}
+
+.embed-240p
+{
+	max-width: 426px;
+	max-height: 240px;
+	margin:0 auto;
+}
+
+.embed-360p
+{
+	max-width: 640px;
+	max-height: 360px;
+	margin:0 auto;
+}
+
+.embed-480p
+{
+	max-width: 854px;
+	max-height: 480px;
+	margin:0 auto;
+}
+
+.embed-720p
+{
+	max-width: 1280px;
+	max-height: 720px;
+	margin:0 auto;
+}
+
+.embed-1080p
+{
+	max-width: 1920px;
+	max-height: 1080px;
+	margin:0 auto;
+}
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/af.js b/htdocs/includes/ckeditor/ckeditor/lang/af.js
index 156c9ee48ad..e55ae34150f 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/af.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/af.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['af']={"editor":"Woordverwerker","editorPanel":"Woordverwerkerpaneel","common":{"editorHelp":"Druk op ALT 0 vir hulp","browseServer":"Blaai op bediener","url":"URL","protocol":"Protokol","upload":"Oplaai","uploadSubmit":"Stuur aan die bediener","image":"Beeld","flash":"Flash","form":"Vorm","checkbox":"Merkhokkie","radio":"Radioknoppie","textField":"Teksveld","textarea":"Teksarea","hiddenField":"Versteekteveld","button":"Knop","select":"Keuseveld","imageButton":"Beeldknop","notSet":"<geen instelling>","id":"Id","name":"Naam","langDir":"Skryfrigting","langDirLtr":"Links na regs (LTR)","langDirRtl":"Regs na links (RTL)","langCode":"Taalkode","longDescr":"Lang beskrywing URL","cssClass":"CSS klasse","advisoryTitle":"Aanbevole titel","cssStyle":"Styl","ok":"OK","cancel":"Kanselleer","close":"Sluit","preview":"Voorbeeld","resize":"Skalierung","generalTab":"Algemeen","advancedTab":"Gevorderd","validateNumberFailed":"Hierdie waarde is nie 'n nommer nie.","confirmNewPage":"Alle wysiginge sal verlore gaan. Is jy seker dat jy 'n nuwe bladsy wil laai?","confirmCancel":"Sommige opsies is gewysig. Is jy seker dat jy hierdie dialoogvenster wil sluit?","options":"Opsies","target":"Teiken","targetNew":"Nuwe venster (_blank)","targetTop":"Boonste venster (_top)","targetSelf":"Selfde venster (_self)","targetParent":"Oorspronklike venster (_parent)","langDirLTR":"Links na Regs (LTR)","langDirRTL":"Regs na Links (RTL)","styles":"Styl","cssClasses":"CSS klasse","width":"Breedte","height":"Hoogte","align":"Orienteerung","alignLeft":"Links","alignRight":"Regs","alignCenter":"Middel","alignJustify":"Eweredig","alignTop":"Bo","alignMiddle":"Middel","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde","invalidHeight":"Hoogte moet 'n getal wees","invalidWidth":"Breedte moet 'n getal wees.","invalidCssLength":"Die waarde vir die \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","invalidHtmlLength":"Die waarde vir die  \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige HTML eenheid (px of %).","invalidInlineStyle":"Ongeldige CSS. Formaat is een of meer sleutel-wert paare, \"naam : wert\" met kommapunte gesky.","cssLengthTooltip":"Voeg 'n getal wert in pixel in, of 'n waarde met geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, nie beskikbaar nie</span>"},"about":{"copy":"Kopiereg &copy; $1. Alle regte voorbehou.","dlgTitle":"Meer oor CKEditor","help":"Slaan $1 na vir hulp.","moreInfo":"Vir lisensie-informasie, besoek asb. ons webwerf:","title":"Meer oor CKEditor","userGuide":"CKEditor Gebruikers gits"},"basicstyles":{"bold":"Vet","italic":"Skuins","strike":"Deurgestreep","subscript":"Onderskrif","superscript":"Bo-skrif","underline":"Onderstreep"},"bidi":{"ltr":"Skryfrigting van links na regs","rtl":"Skryfrigting van regs na links"},"blockquote":{"toolbar":"Sitaatblok"},"clipboard":{"copy":"Kopiëer","copyError":"U blaaier se sekuriteitsinstelling belet die kopiëringsaksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+C).","cut":"Knip","cutError":"U blaaier se sekuriteitsinstelling belet die outomatiese knip-aksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+X).","paste":"Plak","pasteArea":"Plak-area","pasteMsg":"Plak die teks in die volgende teks-area met die sleutelbordkombinasie (<STRONG>Ctrl/Cmd+V</STRONG>) en druk <STRONG>OK</STRONG>.","securityMsg":"Weens u blaaier se sekuriteitsinstelling is data op die knipbord nie toeganklik nie. U kan dit eers weer in hierdie venster plak.","title":"Byvoeg"},"button":{"selectedLabel":"%1 uitgekies"},"colorbutton":{"auto":"Outomaties","bgColorTitle":"Agtergrondkleur","colors":{"000":"Swart","800000":"Meroen","8B4513":"Sjokoladebruin","2F4F4F":"Donkerleisteengrys","008080":"Blougroen","000080":"Vlootblou","4B0082":"Indigo","696969":"Donkergrys","B22222":"Rooibaksteen","A52A2A":"Bruin","DAA520":"Donkergeel","006400":"Donkergroen","40E0D0":"Turkoois","0000CD":"Middelblou","800080":"Pers","808080":"Grys","F00":"Rooi","FF8C00":"Donkeroranje","FFD700":"Goud","008000":"Groen","0FF":"Siaan","00F":"Blou","EE82EE":"Viooltjieblou","A9A9A9":"Donkergrys","FFA07A":"Ligsalm","FFA500":"Oranje","FFFF00":"Geel","00FF00":"Lemmetjie","AFEEEE":"Ligturkoois","ADD8E6":"Ligblou","DDA0DD":"Pruim","D3D3D3":"Liggrys","FFF0F5":"Linne","FAEBD7":"Ivoor","FFFFE0":"Liggeel","F0FFF0":"Heuningdou","F0FFFF":"Asuur","F0F8FF":"Ligte hemelsblou","E6E6FA":"Laventel","FFF":"Wit"},"more":"Meer Kleure...","panelTitle":"Kleure","textColorTitle":"Tekskleur"},"colordialog":{"clear":"Herstel","highlight":"Aktief","options":"Kleuropsies","selected":"Geselekteer","title":"Kies kleur"},"templates":{"button":"Sjablone","emptyListMsg":"(Geen sjablone gedefineer nie)","insertOption":"Vervang huidige inhoud","options":"Sjabloon opsies","selectPromptMsg":"Kies die sjabloon om te gebruik in die redigeerder (huidige inhoud gaan verlore):","title":"Inhoud Sjablone"},"contextmenu":{"options":"Konteks Spyskaart-opsies"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Aanbevole Titel","cssClassInputLabel":"CSS klasse","edit":"Wysig Div","inlineStyleInputLabel":"Inlyn Styl","langDirLTRLabel":"Links na regs (LTR)","langDirLabel":"Skryfrigting","langDirRTLLabel":"Regs na links (RTL)","languageCodeInputLabel":" Taalkode","remove":"Verwyder Div","styleSelectLabel":"Styl","title":"Skep Div houer","toolbar":"Skep Div houer"},"toolbar":{"toolbarCollapse":"Verklein werkbalk","toolbarExpand":"Vergroot werkbalk","toolbarGroups":{"document":"Dokument","clipboard":"Knipbord/Undo","editing":"Verander","forms":"Vorms","basicstyles":"Eenvoudige Styl","paragraph":"Paragraaf","links":"Skakels","insert":"Toevoeg","styles":"Style","colors":"Kleure","tools":"Gereedskap"},"toolbars":"Werkbalke"},"elementspath":{"eleLabel":"Elemente-pad","eleTitle":"%1 element"},"find":{"find":"Soek","findOptions":"Find Options","findWhat":"Soek na:","matchCase":"Hoof/kleinletter sensitief","matchCyclic":"Soek deurlopend","matchWord":"Hele woord moet voorkom","notFoundMsg":"Teks nie gevind nie.","replace":"Vervang","replaceAll":"Vervang alles","replaceSuccessMsg":"%1 voorkoms(te) vervang.","replaceWith":"Vervang met:","title":"Soek en vervang"},"fakeobjects":{"anchor":"Anker","flash":"Flash animasie","hiddenfield":"Verborge veld","iframe":"IFrame","unknown":"Onbekende objek"},"flash":{"access":"Skrip toegang","accessAlways":"Altyd","accessNever":"Nooit","accessSameDomain":"Selfde domeinnaam","alignAbsBottom":"Absoluut-onder","alignAbsMiddle":"Absoluut-middel","alignBaseline":"Basislyn","alignTextTop":"Teks bo","bgcolor":"Agtergrondkleur","chkFull":"Laat volledige skerm toe","chkLoop":"Herhaal","chkMenu":"Flash spyskaart aan","chkPlay":"Speel outomaties","flashvars":"Veranderlikes vir Flash","hSpace":"HSpasie","properties":"Flash eienskappe","propertiesTab":"Eienskappe","quality":"Kwaliteit","qualityAutoHigh":"Outomaties hoog","qualityAutoLow":"Outomaties laag","qualityBest":"Beste","qualityHigh":"Hoog","qualityLow":"Laag","qualityMedium":"Gemiddeld","scale":"Skaal","scaleAll":"Wys alles","scaleFit":"Presiese pas","scaleNoBorder":"Geen rand","title":"Flash eienskappe","vSpace":"VSpasie","validateHSpace":"HSpasie moet 'n heelgetal wees.","validateSrc":"Voeg die URL in","validateVSpace":"VSpasie moet 'n heelgetal wees.","windowMode":"Venster modus","windowModeOpaque":"Ondeursigtig","windowModeTransparent":"Deursigtig","windowModeWindow":"Venster"},"font":{"fontSize":{"label":"Grootte","voiceLabel":"Fontgrootte","panelTitle":"Fontgrootte"},"label":"Font","panelTitle":"Fontnaam","voiceLabel":"Font"},"forms":{"button":{"title":"Knop eienskappe","text":"Teks (Waarde)","type":"Soort","typeBtn":"Knop","typeSbm":"Stuur","typeRst":"Maak leeg"},"checkboxAndRadio":{"checkboxTitle":"Merkhokkie eienskappe","radioTitle":"Radioknoppie eienskappe","value":"Waarde","selected":"Geselekteer","required":"Required"},"form":{"title":"Vorm eienskappe","menu":"Vorm eienskappe","action":"Aksie","method":"Metode","encoding":"Kodering"},"hidden":{"title":"Verborge veld eienskappe","name":"Naam","value":"Waarde"},"select":{"title":"Keuseveld eienskappe","selectInfo":"Info","opAvail":"Beskikbare opsies","value":"Waarde","size":"Grootte","lines":"Lyne","chkMulti":"Laat meer as een keuse toe","required":"Required","opText":"Teks","opValue":"Waarde","btnAdd":"Byvoeg","btnModify":"Wysig","btnUp":"Op","btnDown":"Af","btnSetValue":"Stel as geselekteerde waarde","btnDelete":"Verwyder"},"textarea":{"title":"Teks-area eienskappe","cols":"Kolomme","rows":"Rye"},"textfield":{"title":"Teksveld eienskappe","name":"Naam","value":"Waarde","charWidth":"Breedte (karakters)","maxChars":"Maksimum karakters","required":"Required","type":"Soort","typeText":"Teks","typePass":"Wagwoord","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Opskrif 1","tag_h2":"Opskrif 2","tag_h3":"Opskrif 3","tag_h4":"Opskrif 4","tag_h5":"Opskrif 5","tag_h6":"Opskrif 6","tag_p":"Normaal","tag_pre":"Opgemaak"},"horizontalrule":{"toolbar":"Horisontale lyn invoeg"},"iframe":{"border":"Wys rand van raam","noUrl":"Gee die iframe URL","scrolling":"Skuifbalke aan","title":"IFrame Eienskappe","toolbar":"IFrame"},"image":{"alt":"Alternatiewe teks","border":"Rand","btnUpload":"Stuur na bediener","button2Img":"Wil u die geselekteerde afbeeldingsknop vervang met 'n eenvoudige afbeelding?","hSpace":"HSpasie","img2Button":"Wil u die geselekteerde afbeelding vervang met 'n afbeeldingsknop?","infoTab":"Afbeelding informasie","linkTab":"Skakel","lockRatio":"Vaste proporsie","menu":"Afbeelding eienskappe","resetSize":"Herstel grootte","title":"Afbeelding eienskappe","titleButton":"Afbeeldingsknop eienskappe","upload":"Oplaai","urlMissing":"Die URL na die afbeelding ontbreek.","vSpace":"VSpasie","validateBorder":"Rand moet 'n heelgetal wees.","validateHSpace":"HSpasie moet 'n heelgetal wees.","validateVSpace":"VSpasie moet 'n heelgetal wees."},"indent":{"indent":"Vergroot inspring","outdent":"Verklein inspring"},"smiley":{"options":"Lagbekkie opsies","title":"Voeg lagbekkie by","toolbar":"Lagbekkie"},"justify":{"block":"Uitvul","center":"Sentreer","left":"Links oplyn","right":"Regs oplyn"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Toegangsleutel","advanced":"Gevorderd","advisoryContentType":"Aanbevole inhoudstipe","advisoryTitle":"Aanbevole titel","anchor":{"toolbar":"Anker byvoeg/verander","menu":"Anker-eienskappe","title":"Anker-eienskappe","name":"Ankernaam","errorName":"Voltooi die ankernaam asseblief","remove":"Remove Anchor"},"anchorId":"Op element Id","anchorName":"Op ankernaam","charset":"Karakterstel van geskakelde bron","cssClasses":"CSS klasse","emailAddress":"E-posadres","emailBody":"Berig-inhoud","emailSubject":"Berig-onderwerp","id":"Id","info":"Skakel informasie","langCode":"Taalkode","langDir":"Skryfrigting","langDirLTR":"Links na regs (LTR)","langDirRTL":"Regs na links (RTL)","menu":"Wysig skakel","name":"Naam","noAnchors":"(Geen ankers beskikbaar in dokument)","noEmail":"Gee die e-posadres","noUrl":"Gee die skakel se URL","other":"<ander>","popupDependent":"Afhanklik (Netscape)","popupFeatures":"Eienskappe van opspringvenster","popupFullScreen":"Volskerm (IE)","popupLeft":"Posisie links","popupLocationBar":"Adresbalk","popupMenuBar":"Spyskaartbalk","popupResizable":"Herskaalbaar","popupScrollBars":"Skuifbalke","popupStatusBar":"Statusbalk","popupToolbar":"Werkbalk","popupTop":"Posisie bo","rel":"Relationship","selectAnchor":"Kies 'n anker","styles":"Styl","tabIndex":"Tab indeks","target":"Doel","targetFrame":"<raam>","targetFrameName":"Naam van doelraam","targetPopup":"<opspringvenster>","targetPopupName":"Naam van opspringvenster","title":"Skakel","toAnchor":"Anker in bladsy","toEmail":"E-pos","toUrl":"URL","toolbar":"Skakel invoeg/wysig","type":"Skakelsoort","unlink":"Verwyder skakel","upload":"Oplaai"},"list":{"bulletedlist":"Ongenommerde lys","numberedlist":"Genommerde lys"},"liststyle":{"armenian":"Armeense nommering","bulletedTitle":"Eienskappe van ongenommerde lys","circle":"Sirkel","decimal":"Desimale syfers (1, 2, 3, ens.)","decimalLeadingZero":"Desimale syfers met voorloopnul (01, 02, 03, ens.)","disc":"Skyf","georgian":"Georgiese nommering (an, ban, gan, ens.)","lowerAlpha":"Kleinletters (a, b, c, d, e, ens.)","lowerGreek":"Griekse kleinletters (alpha, beta, gamma, ens.)","lowerRoman":"Romeinse kleinletters (i, ii, iii, iv, v, ens.)","none":"Geen","notset":"<nie ingestel nie>","numberedTitle":"Eienskappe van genommerde lys","square":"Vierkant","start":"Begin","type":"Tipe","upperAlpha":"Hoofletters (A, B, C, D, E, ens.)","upperRoman":"Romeinse hoofletters (I, II, III, IV, V, ens.)","validateStartNumber":"Beginnommer van lys moet 'n heelgetal wees."},"magicline":{"title":"Voeg paragraaf hier in"},"maximize":{"maximize":"Maksimaliseer","minimize":"Minimaliseer"},"newpage":{"toolbar":"Nuwe bladsy"},"pagebreak":{"alt":"Bladsy-einde","toolbar":"Bladsy-einde invoeg"},"pastetext":{"button":"Plak as eenvoudige teks","title":"Plak as eenvoudige teks"},"pastefromword":{"confirmCleanup":"Die teks wat u wil plak lyk asof dit uit Word gekopiëer is. Wil u dit eers skoonmaak voordat dit geplak word?","error":"Die geplakte teks kon nie skoongemaak word nie, weens 'n interne fout","title":"Plak vanuit Word","toolbar":"Plak vanuit Word"},"preview":{"preview":"Voorbeeld"},"print":{"toolbar":"Druk"},"removeformat":{"toolbar":"Verwyder opmaak"},"save":{"toolbar":"Bewaar"},"selectall":{"toolbar":"Selekteer alles"},"showblocks":{"toolbar":"Toon blokke"},"sourcearea":{"toolbar":"Bron"},"specialchar":{"options":"Spesiale karakter-opsies","title":"Kies spesiale karakter","toolbar":"Voeg spesiaale karakter in"},"scayt":{"btn_about":"SCAYT info","btn_dictionaries":"Woordeboeke","btn_disable":"SCAYT af","btn_enable":"SCAYT aan","btn_langs":"Tale","btn_options":"Opsies","text_title":"Speltoets terwyl u tik"},"stylescombo":{"label":"Styl","panelTitle":"Vormaat style","panelTitle1":"Blok style","panelTitle2":"Inlyn style","panelTitle3":"Objek style"},"table":{"border":"Randbreedte","caption":"Naam","cell":{"menu":"Sel","insertBefore":"Voeg sel in voor","insertAfter":"Voeg sel in na","deleteCell":"Verwyder sel","merge":"Voeg selle saam","mergeRight":"Voeg saam na regs","mergeDown":"Voeg saam ondertoe","splitHorizontal":"Splits sel horisontaal","splitVertical":"Splits sel vertikaal","title":"Sel eienskappe","cellType":"Sel tipe","rowSpan":"Omspan rye","colSpan":"Omspan kolomme","wordWrap":"Woord terugloop","hAlign":"Horisontale oplyning","vAlign":"Vertikale oplyning","alignBaseline":"Basislyn","bgColor":"Agtergrondkleur","borderColor":"Randkleur","data":"Inhoud","header":"Opskrif","yes":"Ja","no":"Nee","invalidWidth":"Selbreedte moet 'n getal wees.","invalidHeight":"Selhoogte moet 'n getal wees.","invalidRowSpan":"Omspan rye moet 'n heelgetal wees.","invalidColSpan":"Omspan kolomme moet 'n heelgetal wees.","chooseColor":"Kies"},"cellPad":"Sel-spasie","cellSpace":"Sel-afstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Verwyder kolom"},"columns":"Kolomme","deleteTable":"Verwyder tabel","headers":"Opskrifte","headersBoth":"Beide    ","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste ry","invalidBorder":"Randbreedte moet 'n getal wees.","invalidCellPadding":"Sel-spasie moet 'n getal wees.","invalidCellSpacing":"Sel-afstand moet 'n getal wees.","invalidCols":"Aantal kolomme moet 'n getal groter as 0 wees.","invalidHeight":"Tabelhoogte moet 'n getal wees.","invalidRows":"Aantal rye moet 'n getal groter as 0 wees.","invalidWidth":"Tabelbreedte moet 'n getal wees.","menu":"Tabel eienskappe","row":{"menu":"Ry","insertBefore":"Voeg ry in voor","insertAfter":"Voeg ry in na","deleteRow":"Verwyder ry"},"rows":"Rye","summary":"Opsomming","title":"Tabel eienskappe","toolbar":"Tabel","widthPc":"persent","widthPx":"piksels","widthUnit":"breedte-eenheid"},"undo":{"redo":"Oordoen","undo":"Ontdoen"},"wsc":{"btnIgnore":"Ignoreer","btnIgnoreAll":"Ignoreer alles","btnReplace":"Vervang","btnReplaceAll":"vervang alles","btnUndo":"Ontdoen","changeTo":"Verander na","errorLoading":"Fout by inlaai van diens: %s.","ieSpellDownload":"Speltoetser is nie geïnstalleer nie. Wil u dit nou aflaai?","manyChanges":"Klaar met speltoets: %1 woorde verander","noChanges":"Klaar met speltoets: Geen woorde verander nie","noMispell":"Klaar met speltoets: Geen foute nie","noSuggestions":"- Geen voorstel -","notAvailable":"Jammer, hierdie diens is nie nou beskikbaar nie.","notInDic":"Nie in woordeboek nie","oneChange":"Klaar met speltoets: Een woord verander","progress":"Spelling word getoets...","title":"Speltoetser","toolbar":"Speltoets"}};
\ No newline at end of file
+CKEDITOR.lang['af']={"editor":"Woordverwerker","editorPanel":"Woordverwerkerpaneel","common":{"editorHelp":"Druk op ALT 0 vir hulp","browseServer":"Blaai op bediener","url":"URL","protocol":"Protokol","upload":"Oplaai","uploadSubmit":"Stuur aan die bediener","image":"Beeld","flash":"Flash","form":"Vorm","checkbox":"Merkhokkie","radio":"Radioknoppie","textField":"Teksveld","textarea":"Teksarea","hiddenField":"Versteekteveld","button":"Knop","select":"Keuseveld","imageButton":"Beeldknop","notSet":"<geen instelling>","id":"Id","name":"Naam","langDir":"Skryfrigting","langDirLtr":"Links na regs (LTR)","langDirRtl":"Regs na links (RTL)","langCode":"Taalkode","longDescr":"Lang beskrywing URL","cssClass":"CSS klasse","advisoryTitle":"Aanbevole titel","cssStyle":"Styl","ok":"OK","cancel":"Kanselleer","close":"Sluit","preview":"Voorbeeld","resize":"Skalierung","generalTab":"Algemeen","advancedTab":"Gevorderd","validateNumberFailed":"Hierdie waarde is nie 'n nommer nie.","confirmNewPage":"Alle wysiginge sal verlore gaan. Is jy seker dat jy 'n nuwe bladsy wil laai?","confirmCancel":"Sommige opsies is gewysig. Is jy seker dat jy hierdie dialoogvenster wil sluit?","options":"Opsies","target":"Teiken","targetNew":"Nuwe venster (_blank)","targetTop":"Boonste venster (_top)","targetSelf":"Selfde venster (_self)","targetParent":"Oorspronklike venster (_parent)","langDirLTR":"Links na Regs (LTR)","langDirRTL":"Regs na Links (RTL)","styles":"Styl","cssClasses":"CSS klasse","width":"Breedte","height":"Hoogte","align":"Orienteerung","alignLeft":"Links","alignRight":"Regs","alignCenter":"Middel","alignJustify":"Eweredig","alignTop":"Bo","alignMiddle":"Middel","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde","invalidHeight":"Hoogte moet 'n getal wees","invalidWidth":"Breedte moet 'n getal wees.","invalidCssLength":"Die waarde vir die \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","invalidHtmlLength":"Die waarde vir die  \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige HTML eenheid (px of %).","invalidInlineStyle":"Ongeldige CSS. Formaat is een of meer sleutel-wert paare, \"naam : wert\" met kommapunte gesky.","cssLengthTooltip":"Voeg 'n getal wert in pixel in, of 'n waarde met geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, nie beskikbaar nie</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"Einde","36":"Tuis","46":"Verwyder","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Kopiereg &copy; $1. Alle regte voorbehou.","dlgTitle":"Meer oor CKEditor","help":"Slaan $1 na vir hulp.","moreInfo":"Vir lisensie-informasie, besoek asb. ons webwerf:","title":"Meer oor CKEditor","userGuide":"CKEditor Gebruikers gits"},"basicstyles":{"bold":"Vet","italic":"Skuins","strike":"Deurgestreep","subscript":"Onderskrif","superscript":"Bo-skrif","underline":"Onderstreep"},"bidi":{"ltr":"Skryfrigting van links na regs","rtl":"Skryfrigting van regs na links"},"blockquote":{"toolbar":"Sitaatblok"},"clipboard":{"copy":"Kopiëer","copyError":"U blaaier se sekuriteitsinstelling belet die kopiëringsaksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+C).","cut":"Knip","cutError":"U blaaier se sekuriteitsinstelling belet die outomatiese knip-aksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+X).","paste":"Plak","pasteArea":"Plak-area","pasteMsg":"Plak die teks in die volgende teks-area met die sleutelbordkombinasie (<STRONG>Ctrl/Cmd+V</STRONG>) en druk <STRONG>OK</STRONG>.","securityMsg":"Weens u blaaier se sekuriteitsinstelling is data op die knipbord nie toeganklik nie. U kan dit eers weer in hierdie venster plak.","title":"Byvoeg"},"button":{"selectedLabel":"%1 uitgekies"},"colorbutton":{"auto":"Outomaties","bgColorTitle":"Agtergrondkleur","colors":{"000":"Swart","800000":"Meroen","8B4513":"Sjokoladebruin","2F4F4F":"Donkerleisteengrys","008080":"Blougroen","000080":"Vlootblou","4B0082":"Indigo","696969":"Donkergrys","B22222":"Rooibaksteen","A52A2A":"Bruin","DAA520":"Donkergeel","006400":"Donkergroen","40E0D0":"Turkoois","0000CD":"Middelblou","800080":"Pers","808080":"Grys","F00":"Rooi","FF8C00":"Donkeroranje","FFD700":"Goud","008000":"Groen","0FF":"Siaan","00F":"Blou","EE82EE":"Viooltjieblou","A9A9A9":"Donkergrys","FFA07A":"Ligsalm","FFA500":"Oranje","FFFF00":"Geel","00FF00":"Lemmetjie","AFEEEE":"Ligturkoois","ADD8E6":"Ligblou","DDA0DD":"Pruim","D3D3D3":"Liggrys","FFF0F5":"Linne","FAEBD7":"Ivoor","FFFFE0":"Liggeel","F0FFF0":"Heuningdou","F0FFFF":"Asuur","F0F8FF":"Ligte hemelsblou","E6E6FA":"Laventel","FFF":"Wit","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Meer Kleure...","panelTitle":"Kleure","textColorTitle":"Tekskleur"},"colordialog":{"clear":"Herstel","highlight":"Aktief","options":"Kleuropsies","selected":"Geselekteer","title":"Kies kleur"},"templates":{"button":"Sjablone","emptyListMsg":"(Geen sjablone gedefineer nie)","insertOption":"Vervang huidige inhoud","options":"Sjabloon opsies","selectPromptMsg":"Kies die sjabloon om te gebruik in die redigeerder (huidige inhoud gaan verlore):","title":"Inhoud Sjablone"},"contextmenu":{"options":"Konteks Spyskaart-opsies"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Aanbevole Titel","cssClassInputLabel":"CSS klasse","edit":"Wysig Div","inlineStyleInputLabel":"Inlyn Styl","langDirLTRLabel":"Links na regs (LTR)","langDirLabel":"Skryfrigting","langDirRTLLabel":"Regs na links (RTL)","languageCodeInputLabel":" Taalkode","remove":"Verwyder Div","styleSelectLabel":"Styl","title":"Skep Div houer","toolbar":"Skep Div houer"},"toolbar":{"toolbarCollapse":"Verklein werkbalk","toolbarExpand":"Vergroot werkbalk","toolbarGroups":{"document":"Dokument","clipboard":"Knipbord/Undo","editing":"Verander","forms":"Vorms","basicstyles":"Eenvoudige Styl","paragraph":"Paragraaf","links":"Skakels","insert":"Toevoeg","styles":"Style","colors":"Kleure","tools":"Gereedskap"},"toolbars":"Werkbalke"},"elementspath":{"eleLabel":"Elemente-pad","eleTitle":"%1 element"},"find":{"find":"Soek","findOptions":"Find Options","findWhat":"Soek na:","matchCase":"Hoof/kleinletter sensitief","matchCyclic":"Soek deurlopend","matchWord":"Hele woord moet voorkom","notFoundMsg":"Teks nie gevind nie.","replace":"Vervang","replaceAll":"Vervang alles","replaceSuccessMsg":"%1 voorkoms(te) vervang.","replaceWith":"Vervang met:","title":"Soek en vervang"},"fakeobjects":{"anchor":"Anker","flash":"Flash animasie","hiddenfield":"Verborge veld","iframe":"IFrame","unknown":"Onbekende objek"},"flash":{"access":"Skrip toegang","accessAlways":"Altyd","accessNever":"Nooit","accessSameDomain":"Selfde domeinnaam","alignAbsBottom":"Absoluut-onder","alignAbsMiddle":"Absoluut-middel","alignBaseline":"Basislyn","alignTextTop":"Teks bo","bgcolor":"Agtergrondkleur","chkFull":"Laat volledige skerm toe","chkLoop":"Herhaal","chkMenu":"Flash spyskaart aan","chkPlay":"Speel outomaties","flashvars":"Veranderlikes vir Flash","hSpace":"HSpasie","properties":"Flash eienskappe","propertiesTab":"Eienskappe","quality":"Kwaliteit","qualityAutoHigh":"Outomaties hoog","qualityAutoLow":"Outomaties laag","qualityBest":"Beste","qualityHigh":"Hoog","qualityLow":"Laag","qualityMedium":"Gemiddeld","scale":"Skaal","scaleAll":"Wys alles","scaleFit":"Presiese pas","scaleNoBorder":"Geen rand","title":"Flash eienskappe","vSpace":"VSpasie","validateHSpace":"HSpasie moet 'n heelgetal wees.","validateSrc":"Voeg die URL in","validateVSpace":"VSpasie moet 'n heelgetal wees.","windowMode":"Venster modus","windowModeOpaque":"Ondeursigtig","windowModeTransparent":"Deursigtig","windowModeWindow":"Venster"},"font":{"fontSize":{"label":"Grootte","voiceLabel":"Fontgrootte","panelTitle":"Fontgrootte"},"label":"Font","panelTitle":"Fontnaam","voiceLabel":"Font"},"forms":{"button":{"title":"Knop eienskappe","text":"Teks (Waarde)","type":"Soort","typeBtn":"Knop","typeSbm":"Stuur","typeRst":"Maak leeg"},"checkboxAndRadio":{"checkboxTitle":"Merkhokkie eienskappe","radioTitle":"Radioknoppie eienskappe","value":"Waarde","selected":"Geselekteer","required":"Required"},"form":{"title":"Vorm eienskappe","menu":"Vorm eienskappe","action":"Aksie","method":"Metode","encoding":"Kodering"},"hidden":{"title":"Verborge veld eienskappe","name":"Naam","value":"Waarde"},"select":{"title":"Keuseveld eienskappe","selectInfo":"Info","opAvail":"Beskikbare opsies","value":"Waarde","size":"Grootte","lines":"Lyne","chkMulti":"Laat meer as een keuse toe","required":"Required","opText":"Teks","opValue":"Waarde","btnAdd":"Byvoeg","btnModify":"Wysig","btnUp":"Op","btnDown":"Af","btnSetValue":"Stel as geselekteerde waarde","btnDelete":"Verwyder"},"textarea":{"title":"Teks-area eienskappe","cols":"Kolomme","rows":"Rye"},"textfield":{"title":"Teksveld eienskappe","name":"Naam","value":"Waarde","charWidth":"Breedte (karakters)","maxChars":"Maksimum karakters","required":"Required","type":"Soort","typeText":"Teks","typePass":"Wagwoord","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Opskrif 1","tag_h2":"Opskrif 2","tag_h3":"Opskrif 3","tag_h4":"Opskrif 4","tag_h5":"Opskrif 5","tag_h6":"Opskrif 6","tag_p":"Normaal","tag_pre":"Opgemaak"},"horizontalrule":{"toolbar":"Horisontale lyn invoeg"},"iframe":{"border":"Wys rand van raam","noUrl":"Gee die iframe URL","scrolling":"Skuifbalke aan","title":"IFrame Eienskappe","toolbar":"IFrame"},"image":{"alt":"Alternatiewe teks","border":"Rand","btnUpload":"Stuur na bediener","button2Img":"Wil u die geselekteerde afbeeldingsknop vervang met 'n eenvoudige afbeelding?","hSpace":"HSpasie","img2Button":"Wil u die geselekteerde afbeelding vervang met 'n afbeeldingsknop?","infoTab":"Afbeelding informasie","linkTab":"Skakel","lockRatio":"Vaste proporsie","menu":"Afbeelding eienskappe","resetSize":"Herstel grootte","title":"Afbeelding eienskappe","titleButton":"Afbeeldingsknop eienskappe","upload":"Oplaai","urlMissing":"Die URL na die afbeelding ontbreek.","vSpace":"VSpasie","validateBorder":"Rand moet 'n heelgetal wees.","validateHSpace":"HSpasie moet 'n heelgetal wees.","validateVSpace":"VSpasie moet 'n heelgetal wees."},"indent":{"indent":"Vergroot inspring","outdent":"Verklein inspring"},"smiley":{"options":"Lagbekkie opsies","title":"Voeg lagbekkie by","toolbar":"Lagbekkie"},"justify":{"block":"Uitvul","center":"Sentreer","left":"Links oplyn","right":"Regs oplyn"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Toegangsleutel","advanced":"Gevorderd","advisoryContentType":"Aanbevole inhoudstipe","advisoryTitle":"Aanbevole titel","anchor":{"toolbar":"Anker byvoeg/verander","menu":"Anker-eienskappe","title":"Anker-eienskappe","name":"Ankernaam","errorName":"Voltooi die ankernaam asseblief","remove":"Remove Anchor"},"anchorId":"Op element Id","anchorName":"Op ankernaam","charset":"Karakterstel van geskakelde bron","cssClasses":"CSS klasse","download":"Force Download","displayText":"Display Text","emailAddress":"E-posadres","emailBody":"Berig-inhoud","emailSubject":"Berig-onderwerp","id":"Id","info":"Skakel informasie","langCode":"Taalkode","langDir":"Skryfrigting","langDirLTR":"Links na regs (LTR)","langDirRTL":"Regs na links (RTL)","menu":"Wysig skakel","name":"Naam","noAnchors":"(Geen ankers beskikbaar in dokument)","noEmail":"Gee die e-posadres","noUrl":"Gee die skakel se URL","other":"<ander>","popupDependent":"Afhanklik (Netscape)","popupFeatures":"Eienskappe van opspringvenster","popupFullScreen":"Volskerm (IE)","popupLeft":"Posisie links","popupLocationBar":"Adresbalk","popupMenuBar":"Spyskaartbalk","popupResizable":"Herskaalbaar","popupScrollBars":"Skuifbalke","popupStatusBar":"Statusbalk","popupToolbar":"Werkbalk","popupTop":"Posisie bo","rel":"Relationship","selectAnchor":"Kies 'n anker","styles":"Styl","tabIndex":"Tab indeks","target":"Doel","targetFrame":"<raam>","targetFrameName":"Naam van doelraam","targetPopup":"<opspringvenster>","targetPopupName":"Naam van opspringvenster","title":"Skakel","toAnchor":"Anker in bladsy","toEmail":"E-pos","toUrl":"URL","toolbar":"Skakel invoeg/wysig","type":"Skakelsoort","unlink":"Verwyder skakel","upload":"Oplaai"},"list":{"bulletedlist":"Ongenommerde lys","numberedlist":"Genommerde lys"},"liststyle":{"armenian":"Armeense nommering","bulletedTitle":"Eienskappe van ongenommerde lys","circle":"Sirkel","decimal":"Desimale syfers (1, 2, 3, ens.)","decimalLeadingZero":"Desimale syfers met voorloopnul (01, 02, 03, ens.)","disc":"Skyf","georgian":"Georgiese nommering (an, ban, gan, ens.)","lowerAlpha":"Kleinletters (a, b, c, d, e, ens.)","lowerGreek":"Griekse kleinletters (alpha, beta, gamma, ens.)","lowerRoman":"Romeinse kleinletters (i, ii, iii, iv, v, ens.)","none":"Geen","notset":"<nie ingestel nie>","numberedTitle":"Eienskappe van genommerde lys","square":"Vierkant","start":"Begin","type":"Tipe","upperAlpha":"Hoofletters (A, B, C, D, E, ens.)","upperRoman":"Romeinse hoofletters (I, II, III, IV, V, ens.)","validateStartNumber":"Beginnommer van lys moet 'n heelgetal wees."},"magicline":{"title":"Voeg paragraaf hier in"},"maximize":{"maximize":"Maksimaliseer","minimize":"Minimaliseer"},"newpage":{"toolbar":"Nuwe bladsy"},"pagebreak":{"alt":"Bladsy-einde","toolbar":"Bladsy-einde invoeg"},"pastetext":{"button":"Plak as eenvoudige teks","title":"Plak as eenvoudige teks"},"pastefromword":{"confirmCleanup":"Die teks wat u wil plak lyk asof dit uit Word gekopiëer is. Wil u dit eers skoonmaak voordat dit geplak word?","error":"Die geplakte teks kon nie skoongemaak word nie, weens 'n interne fout","title":"Plak vanuit Word","toolbar":"Plak vanuit Word"},"preview":{"preview":"Voorbeeld"},"print":{"toolbar":"Druk"},"removeformat":{"toolbar":"Verwyder opmaak"},"save":{"toolbar":"Bewaar"},"selectall":{"toolbar":"Selekteer alles"},"showblocks":{"toolbar":"Toon blokke"},"sourcearea":{"toolbar":"Bron"},"specialchar":{"options":"Spesiale karakter-opsies","title":"Kies spesiale karakter","toolbar":"Voeg spesiaale karakter in"},"scayt":{"btn_about":"SCAYT info","btn_dictionaries":"Woordeboeke","btn_disable":"SCAYT af","btn_enable":"SCAYT aan","btn_langs":"Tale","btn_options":"Opsies","text_title":"Speltoets terwyl u tik"},"stylescombo":{"label":"Styl","panelTitle":"Vormaat style","panelTitle1":"Blok style","panelTitle2":"Inlyn style","panelTitle3":"Objek style"},"table":{"border":"Randbreedte","caption":"Naam","cell":{"menu":"Sel","insertBefore":"Voeg sel in voor","insertAfter":"Voeg sel in na","deleteCell":"Verwyder sel","merge":"Voeg selle saam","mergeRight":"Voeg saam na regs","mergeDown":"Voeg saam ondertoe","splitHorizontal":"Splits sel horisontaal","splitVertical":"Splits sel vertikaal","title":"Sel eienskappe","cellType":"Sel tipe","rowSpan":"Omspan rye","colSpan":"Omspan kolomme","wordWrap":"Woord terugloop","hAlign":"Horisontale oplyning","vAlign":"Vertikale oplyning","alignBaseline":"Basislyn","bgColor":"Agtergrondkleur","borderColor":"Randkleur","data":"Inhoud","header":"Opskrif","yes":"Ja","no":"Nee","invalidWidth":"Selbreedte moet 'n getal wees.","invalidHeight":"Selhoogte moet 'n getal wees.","invalidRowSpan":"Omspan rye moet 'n heelgetal wees.","invalidColSpan":"Omspan kolomme moet 'n heelgetal wees.","chooseColor":"Kies"},"cellPad":"Sel-spasie","cellSpace":"Sel-afstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Verwyder kolom"},"columns":"Kolomme","deleteTable":"Verwyder tabel","headers":"Opskrifte","headersBoth":"Beide    ","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste ry","invalidBorder":"Randbreedte moet 'n getal wees.","invalidCellPadding":"Sel-spasie moet 'n getal wees.","invalidCellSpacing":"Sel-afstand moet 'n getal wees.","invalidCols":"Aantal kolomme moet 'n getal groter as 0 wees.","invalidHeight":"Tabelhoogte moet 'n getal wees.","invalidRows":"Aantal rye moet 'n getal groter as 0 wees.","invalidWidth":"Tabelbreedte moet 'n getal wees.","menu":"Tabel eienskappe","row":{"menu":"Ry","insertBefore":"Voeg ry in voor","insertAfter":"Voeg ry in na","deleteRow":"Verwyder ry"},"rows":"Rye","summary":"Opsomming","title":"Tabel eienskappe","toolbar":"Tabel","widthPc":"persent","widthPx":"piksels","widthUnit":"breedte-eenheid"},"undo":{"redo":"Oordoen","undo":"Ontdoen"},"wsc":{"btnIgnore":"Ignoreer","btnIgnoreAll":"Ignoreer alles","btnReplace":"Vervang","btnReplaceAll":"vervang alles","btnUndo":"Ontdoen","changeTo":"Verander na","errorLoading":"Fout by inlaai van diens: %s.","ieSpellDownload":"Speltoetser is nie geïnstalleer nie. Wil u dit nou aflaai?","manyChanges":"Klaar met speltoets: %1 woorde verander","noChanges":"Klaar met speltoets: Geen woorde verander nie","noMispell":"Klaar met speltoets: Geen foute nie","noSuggestions":"- Geen voorstel -","notAvailable":"Jammer, hierdie diens is nie nou beskikbaar nie.","notInDic":"Nie in woordeboek nie","oneChange":"Klaar met speltoets: Een woord verander","progress":"Spelling word getoets...","title":"Speltoetser","toolbar":"Speltoets"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/lang/ar.js
index 45ee4c56246..44de2f00104 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/ar.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ar.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ar']={"editor":"محرر النص الغني","editorPanel":"لائحة محرر النص المنسق","common":{"editorHelp":"إضغط على ALT + 0 للحصول على المساعدة.","browseServer":"تصفح","url":"الرابط","protocol":"البروتوكول","upload":"رفع","uploadSubmit":"أرسل","image":"صورة","flash":"فلاش","form":"نموذج","checkbox":"خانة إختيار","radio":"زر اختيار","textField":"مربع نص","textarea":"مساحة نصية","hiddenField":"إدراج حقل خفي","button":"زر ضغط","select":"اختار","imageButton":"زر صورة","notSet":"<بدون تحديد>","id":"الرقم","name":"إسم","langDir":"إتجاه النص","langDirLtr":"اليسار لليمين (LTR)","langDirRtl":"اليمين لليسار (RTL)","langCode":"رمز اللغة","longDescr":"الوصف التفصيلى","cssClass":"فئات التنسيق","advisoryTitle":"عنوان التقرير","cssStyle":"نمط","ok":"موافق","cancel":"إلغاء الأمر","close":"أغلق","preview":"استعراض","resize":"تغيير الحجم","generalTab":"عام","advancedTab":"متقدم","validateNumberFailed":"لايوجد نتيجة","confirmNewPage":"ستفقد أي متغييرات اذا لم تقم بحفظها اولا. هل أنت متأكد أنك تريد صفحة جديدة؟","confirmCancel":"بعض الخيارات قد تغيرت. هل أنت متأكد من إغلاق مربع النص؟","options":"خيارات","target":"هدف الرابط","targetNew":"نافذة جديدة","targetTop":"النافذة الأعلى","targetSelf":"داخل النافذة","targetParent":"النافذة الأم","langDirLTR":"اليسار لليمين (LTR)","langDirRTL":"اليمين لليسار (RTL)","styles":"نمط","cssClasses":"فئات التنسيق","width":"العرض","height":"الإرتفاع","align":"محاذاة","alignLeft":"يسار","alignRight":"يمين","alignCenter":"وسط","alignJustify":"ضبط","alignTop":"أعلى","alignMiddle":"وسط","alignBottom":"أسفل","alignNone":"None","invalidValue":"قيمة غير مفبولة.","invalidHeight":"الارتفاع يجب أن يكون عدداً.","invalidWidth":"العرض يجب أن يكون عدداً.","invalidCssLength":"قيمة الخانة المخصصة لـ \"%1\" يجب أن تكون رقما موجبا، باستخدام أو من غير استخدام وحدة CSS قياس مقبولة (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"قيمة الخانة المخصصة لـ \"%1\" يجب أن تكون رقما موجبا، باستخدام أو من غير استخدام وحدة HTML قياس مقبولة (px or %).","invalidInlineStyle":"قيمة الخانة المخصصة لـ  Inline Style يجب أن تختوي على مجموع واحد أو أكثر بالشكل التالي: \"name : value\", مفصولة بفاصلة منقزطة.","cssLengthTooltip":"أدخل رقما للقيمة بالبكسل أو رقما بوحدة CSS مقبولة (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, غير متاح</span>"},"about":{"copy":"حقوق النشر &copy; $1. جميع الحقوق محفوظة.","dlgTitle":"عن CKEditor","help":"راجع $1 من أجل المساعدة","moreInfo":"للحصول على معلومات الترخيص ، يرجى زيارة موقعنا:","title":"عن CKEditor","userGuide":"دليل مستخدم CKEditor."},"basicstyles":{"bold":"عريض","italic":"مائل","strike":"يتوسطه خط","subscript":"منخفض","superscript":"مرتفع","underline":"تسطير"},"bidi":{"ltr":"إتجاه النص من اليسار إلى اليمين","rtl":"إتجاه النص من اليمين إلى اليسار"},"blockquote":{"toolbar":"اقتباس"},"clipboard":{"copy":"نسخ","copyError":"الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع عمليات النسخ التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl/Cmd+C).","cut":"قص","cutError":"الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع القص التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl/Cmd+X).","paste":"لصق","pasteArea":"منطقة اللصق","pasteMsg":"الصق داخل الصندوق بإستخدام زرائر (<STRONG>Ctrl/Cmd+V</STRONG>) في لوحة المفاتيح، ثم اضغط زر  <STRONG>موافق</STRONG>.","securityMsg":"نظراً لإعدادات الأمان الخاصة بمتصفحك، لن يتمكن هذا المحرر من الوصول لمحتوى حافظتك، لذلك يجب عليك لصق المحتوى مرة أخرى في هذه النافذة.","title":"لصق"},"button":{"selectedLabel":"%1 (محدد)"},"colorbutton":{"auto":"تلقائي","bgColorTitle":"لون الخلفية","colors":{"000":"أسود","800000":"كستنائي","8B4513":"بني فاتح","2F4F4F":"رمادي أردوازي غامق","008080":"أزرق مخضر","000080":"أزرق داكن","4B0082":"كحلي","696969":"رمادي داكن","B22222":"طوبي","A52A2A":"بني","DAA520":"ذهبي داكن","006400":"أخضر داكن","40E0D0":"فيروزي","0000CD":"أزرق متوسط","800080":"بنفسجي غامق","808080":"رمادي","F00":"أحمر","FF8C00":"برتقالي داكن","FFD700":"ذهبي","008000":"أخضر","0FF":"تركواز","00F":"أزرق","EE82EE":"بنفسجي","A9A9A9":"رمادي شاحب","FFA07A":"برتقالي وردي","FFA500":"برتقالي","FFFF00":"أصفر","00FF00":"ليموني","AFEEEE":"فيروزي شاحب","ADD8E6":"أزرق فاتح","DDA0DD":"بنفسجي فاتح","D3D3D3":"رمادي فاتح","FFF0F5":"وردي فاتح","FAEBD7":"أبيض عتيق","FFFFE0":"أصفر فاتح","F0FFF0":"أبيض مائل للأخضر","F0FFFF":"سماوي","F0F8FF":"لبني","E6E6FA":"أرجواني","FFF":"أبيض"},"more":"ألوان إضافية...","panelTitle":"Colors","textColorTitle":"لون النص"},"colordialog":{"clear":"مسح","highlight":"تحديد","options":"اختيارات الألوان","selected":"اللون المختار","title":"اختر اللون"},"templates":{"button":"القوالب","emptyListMsg":"(لم يتم تعريف أي قالب)","insertOption":"استبدال المحتوى","options":"خصائص القوالب","selectPromptMsg":"اختر القالب الذي تود وضعه في المحرر","title":"قوالب المحتوى"},"contextmenu":{"options":"خصائص قائمة السياق"},"div":{"IdInputLabel":"هوية","advisoryTitleInputLabel":"عنوان التقرير","cssClassInputLabel":"فئات التنسيق","edit":"تحرير Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"اليسار لليمين (LTR)","langDirLabel":"إتجاه النص","langDirRTLLabel":"اليمين لليسار (RTL)","languageCodeInputLabel":"رمز اللغة","remove":"إزالة Div","styleSelectLabel":"نمط","title":"إحداث Div Container","toolbar":"إحداث Div Container"},"toolbar":{"toolbarCollapse":"تقليص شريط الأدوت","toolbarExpand":"تمديد شريط الأدوات","toolbarGroups":{"document":"مستند","clipboard":"الحافظة/الرجوع","editing":"تحرير","forms":"نماذج","basicstyles":"نمط بسيط","paragraph":"فقرة","links":"روابط","insert":"إدراج","styles":"أنماط","colors":"ألوان","tools":"أدوات"},"toolbars":"أشرطة أدوات المحرر"},"elementspath":{"eleLabel":"مسار العنصر","eleTitle":"عنصر 1%"},"find":{"find":"بحث","findOptions":"Find Options","findWhat":"البحث بـ:","matchCase":"مطابقة حالة الأحرف","matchCyclic":"مطابقة دورية","matchWord":"مطابقة بالكامل","notFoundMsg":"لم يتم العثور على النص المحدد.","replace":"إستبدال","replaceAll":"إستبدال الكل","replaceSuccessMsg":"تم استبدال 1% من الحالات ","replaceWith":"إستبدال بـ:","title":"بحث واستبدال"},"fakeobjects":{"anchor":"إرساء","flash":"رسم متحرك بالفلاش","hiddenfield":"إدراج حقل خفي","iframe":"iframe","unknown":"عنصر غير معروف"},"flash":{"access":"دخول النص البرمجي","accessAlways":"دائماً","accessNever":"مطلقاً","accessSameDomain":"نفس النطاق","alignAbsBottom":"أسفل النص","alignAbsMiddle":"وسط السطر","alignBaseline":"على السطر","alignTextTop":"أعلى النص","bgcolor":"لون الخلفية","chkFull":"ملء الشاشة","chkLoop":"تكرار","chkMenu":"تمكين قائمة فيلم الفلاش","chkPlay":"تشغيل تلقائي","flashvars":"متغيرات الفلاش","hSpace":"تباعد أفقي","properties":"خصائص الفلاش","propertiesTab":"الخصائص","quality":"جودة","qualityAutoHigh":"عالية تلقائياً","qualityAutoLow":"منخفضة تلقائياً","qualityBest":"أفضل","qualityHigh":"عالية","qualityLow":"منخفضة","qualityMedium":"متوسطة","scale":"الحجم","scaleAll":"إظهار الكل","scaleFit":"ضبط تام","scaleNoBorder":"بلا حدود","title":"خصائص فيلم الفلاش","vSpace":"تباعد عمودي","validateHSpace":"HSpace يجب أن يكون عدداً.","validateSrc":"فضلاً أدخل عنوان الموقع الذي يشير إليه الرابط","validateVSpace":"VSpace يجب أن يكون عدداً.","windowMode":"وضع النافذة","windowModeOpaque":"غير شفاف","windowModeTransparent":"شفاف","windowModeWindow":"نافذة"},"font":{"fontSize":{"label":"حجم الخط","voiceLabel":"حجم الخط","panelTitle":"حجم الخط"},"label":"خط","panelTitle":"حجم الخط","voiceLabel":"حجم الخط"},"forms":{"button":{"title":"خصائص زر الضغط","text":"القيمة/التسمية","type":"نوع الزر","typeBtn":"زر","typeSbm":"إرسال","typeRst":"إعادة تعيين"},"checkboxAndRadio":{"checkboxTitle":"خصائص خانة الإختيار","radioTitle":"خصائص زر الخيار","value":"القيمة","selected":"محدد","required":"Required"},"form":{"title":"خصائص النموذج","menu":"خصائص النموذج","action":"اسم الملف","method":"الأسلوب","encoding":"تشفير"},"hidden":{"title":"خصائص الحقل المخفي","name":"الاسم","value":"القيمة"},"select":{"title":"خصائص اختيار الحقل","selectInfo":"اختار معلومات","opAvail":"الخيارات المتاحة","value":"القيمة","size":"الحجم","lines":"الأسطر","chkMulti":"السماح بتحديدات متعددة","required":"Required","opText":"النص","opValue":"القيمة","btnAdd":"إضافة","btnModify":"تعديل","btnUp":"أعلى","btnDown":"أسفل","btnSetValue":"إجعلها محددة","btnDelete":"إزالة"},"textarea":{"title":"خصائص مساحة النص","cols":"الأعمدة","rows":"الصفوف"},"textfield":{"title":"خصائص مربع النص","name":"الاسم","value":"القيمة","charWidth":"عرض السمات","maxChars":"اقصى عدد للسمات","required":"Required","type":"نوع المحتوى","typeText":"نص","typePass":"كلمة مرور","typeEmail":"بريد إلكتروني","typeSearch":"بحث","typeTel":"رقم الهاتف","typeUrl":"الرابط"}},"format":{"label":"تنسيق","panelTitle":"تنسيق الفقرة","tag_address":"عنوان","tag_div":"عادي (DIV)","tag_h1":"العنوان 1","tag_h2":"العنوان  2","tag_h3":"العنوان  3","tag_h4":"العنوان  4","tag_h5":"العنوان  5","tag_h6":"العنوان  6","tag_p":"عادي","tag_pre":"منسّق"},"horizontalrule":{"toolbar":"خط فاصل"},"iframe":{"border":"إظهار حدود الإطار","noUrl":"فضلا أكتب رابط الـ iframe","scrolling":"تفعيل أشرطة الإنتقال","title":"خصائص iframe","toolbar":"iframe"},"image":{"alt":"عنوان الصورة","border":"سمك الحدود","btnUpload":"أرسلها للخادم","button2Img":"هل تريد تحويل زر الصورة المختار إلى صورة بسيطة؟","hSpace":"تباعد أفقي","img2Button":"هل تريد تحويل الصورة المختارة إلى زر صورة؟","infoTab":"معلومات الصورة","linkTab":"الرابط","lockRatio":"تناسق الحجم","menu":"خصائص الصورة","resetSize":"إستعادة الحجم الأصلي","title":"خصائص الصورة","titleButton":"خصائص زر الصورة","upload":"رفع","urlMissing":"عنوان مصدر الصورة مفقود","vSpace":"تباعد عمودي","validateBorder":"الإطار يجب أن يكون عددا","validateHSpace":"HSpace يجب أن يكون عدداً.","validateVSpace":"VSpace يجب أن يكون عدداً."},"indent":{"indent":"زيادة المسافة البادئة","outdent":"إنقاص المسافة البادئة"},"smiley":{"options":"خصائص الإبتسامات","title":"إدراج ابتسامات","toolbar":"ابتسامات"},"justify":{"block":"ضبط","center":"توسيط","left":"محاذاة إلى اليسار","right":"محاذاة إلى اليمين"},"language":{"button":"حدد اللغة","remove":"حذف اللغة"},"link":{"acccessKey":"مفاتيح الإختصار","advanced":"متقدم","advisoryContentType":"نوع التقرير","advisoryTitle":"عنوان التقرير","anchor":{"toolbar":"إشارة مرجعية","menu":"تحرير الإشارة المرجعية","title":"خصائص الإشارة المرجعية","name":"اسم الإشارة المرجعية","errorName":"الرجاء كتابة اسم الإشارة المرجعية","remove":"إزالة الإشارة المرجعية"},"anchorId":"حسب رقم العنصر","anchorName":"حسب إسم الإشارة المرجعية","charset":"ترميز المادة المطلوبة","cssClasses":"فئات التنسيق","emailAddress":"البريد الإلكتروني","emailBody":"محتوى الرسالة","emailSubject":"موضوع الرسالة","id":"هوية","info":"معلومات الرابط","langCode":"رمز اللغة","langDir":"إتجاه نص اللغة","langDirLTR":"اليسار لليمين (LTR)","langDirRTL":"اليمين لليسار (RTL)","menu":"تحرير الرابط","name":"إسم","noAnchors":"(لا توجد علامات مرجعية في هذا المستند)","noEmail":"الرجاء كتابة الريد الإلكتروني","noUrl":"الرجاء كتابة رابط الموقع","other":"<أخرى>","popupDependent":"تابع (Netscape)","popupFeatures":"خصائص النافذة المنبثقة","popupFullScreen":"ملئ الشاشة (IE)","popupLeft":"التمركز لليسار","popupLocationBar":"شريط العنوان","popupMenuBar":"القوائم الرئيسية","popupResizable":"قابلة التشكيل","popupScrollBars":"أشرطة التمرير","popupStatusBar":"شريط الحالة","popupToolbar":"شريط الأدوات","popupTop":"التمركز للأعلى","rel":"العلاقة","selectAnchor":"اختر علامة مرجعية","styles":"نمط","tabIndex":"الترتيب","target":"هدف الرابط","targetFrame":"<إطار>","targetFrameName":"اسم الإطار المستهدف","targetPopup":"<نافذة منبثقة>","targetPopupName":"اسم النافذة المنبثقة","title":"رابط","toAnchor":"مكان في هذا المستند","toEmail":"بريد إلكتروني","toUrl":"الرابط","toolbar":"رابط","type":"نوع الربط","unlink":"إزالة رابط","upload":"رفع"},"list":{"bulletedlist":"ادخال/حذف تعداد نقطي","numberedlist":"ادخال/حذف تعداد رقمي"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"إدراج فقرة هنا"},"maximize":{"maximize":"تكبير","minimize":"تصغير"},"newpage":{"toolbar":"صفحة جديدة"},"pagebreak":{"alt":"فاصل الصفحة","toolbar":"إدخال صفحة جديدة"},"pastetext":{"button":"لصق كنص بسيط","title":"لصق كنص بسيط"},"pastefromword":{"confirmCleanup":"يبدو أن النص المراد لصقه منسوخ من برنامج وورد. هل تود تنظيفه قبل الشروع في عملية اللصق؟","error":"لم يتم مسح المعلومات الملصقة لخلل داخلي","title":"لصق من وورد","toolbar":"لصق من وورد"},"preview":{"preview":"معاينة الصفحة"},"print":{"toolbar":"طباعة"},"removeformat":{"toolbar":"إزالة التنسيقات"},"save":{"toolbar":"حفظ"},"selectall":{"toolbar":"تحديد الكل"},"showblocks":{"toolbar":"مخطط تفصيلي"},"sourcearea":{"toolbar":"المصدر"},"specialchar":{"options":"خيارات الأحرف الخاصة","title":"اختر حرف خاص","toolbar":"إدراج  حرف خاص"},"scayt":{"btn_about":"عن SCAYT","btn_dictionaries":"قواميس","btn_disable":"تعطيل SCAYT","btn_enable":"تفعيل SCAYT","btn_langs":"لغات","btn_options":"خيارات","text_title":"تدقيق إملائي أثناء الكتابة"},"stylescombo":{"label":"أنماط","panelTitle":"أنماط التنسيق","panelTitle1":"أنماط الفقرة","panelTitle2":"أنماط مضمنة","panelTitle3":"أنماط الكائن"},"table":{"border":"الحدود","caption":"الوصف","cell":{"menu":"خلية","insertBefore":"إدراج خلية قبل","insertAfter":"إدراج خلية بعد","deleteCell":"حذف خلية","merge":"دمج خلايا","mergeRight":"دمج لليمين","mergeDown":"دمج للأسفل","splitHorizontal":"تقسيم الخلية أفقياً","splitVertical":"تقسيم الخلية عمودياً","title":"خصائص الخلية","cellType":"نوع الخلية","rowSpan":"امتداد الصفوف","colSpan":"امتداد الأعمدة","wordWrap":"التفاف النص","hAlign":"محاذاة أفقية","vAlign":"محاذاة رأسية","alignBaseline":"خط القاعدة","bgColor":"لون الخلفية","borderColor":"لون الحدود","data":"بيانات","header":"عنوان","yes":"نعم","no":"لا","invalidWidth":"عرض الخلية يجب أن يكون عدداً.","invalidHeight":"ارتفاع الخلية يجب أن يكون عدداً.","invalidRowSpan":"امتداد الصفوف يجب أن يكون عدداً صحيحاً.","invalidColSpan":"امتداد الأعمدة يجب أن يكون عدداً صحيحاً.","chooseColor":"اختر"},"cellPad":"المسافة البادئة","cellSpace":"تباعد الخلايا","column":{"menu":"عمود","insertBefore":"إدراج عمود قبل","insertAfter":"إدراج عمود بعد","deleteColumn":"حذف أعمدة"},"columns":"أعمدة","deleteTable":"حذف الجدول","headers":"العناوين","headersBoth":"كلاهما","headersColumn":"العمود الأول","headersNone":"بدون","headersRow":"الصف الأول","invalidBorder":"حجم الحد يجب أن يكون عدداً.","invalidCellPadding":"المسافة البادئة يجب أن تكون عدداً","invalidCellSpacing":"المسافة بين الخلايا يجب أن تكون عدداً.","invalidCols":"عدد الأعمدة يجب أن يكون عدداً أكبر من صفر.","invalidHeight":"ارتفاع الجدول يجب أن يكون عدداً.","invalidRows":"عدد الصفوف يجب أن يكون عدداً أكبر من صفر.","invalidWidth":"عرض الجدول يجب أن يكون عدداً.","menu":"خصائص الجدول","row":{"menu":"صف","insertBefore":"إدراج صف قبل","insertAfter":"إدراج صف بعد","deleteRow":"حذف صفوف"},"rows":"صفوف","summary":"الخلاصة","title":"خصائص الجدول","toolbar":"جدول","widthPc":"بالمئة","widthPx":"بكسل","widthUnit":"وحدة العرض"},"undo":{"redo":"إعادة","undo":"تراجع"},"wsc":{"btnIgnore":"تجاهل","btnIgnoreAll":"تجاهل الكل","btnReplace":"تغيير","btnReplaceAll":"تغيير الكل","btnUndo":"تراجع","changeTo":"التغيير إلى","errorLoading":"خطأ في تحميل تطبيق خدمة الاستضافة: %s.","ieSpellDownload":"المدقق الإملائي (الإنجليزي) غير مثبّت. هل تود تحميله الآن؟","manyChanges":"تم إكمال التدقيق الإملائي: تم تغيير %1 من كلمات","noChanges":"تم التدقيق الإملائي: لم يتم تغيير أي كلمة","noMispell":"تم التدقيق الإملائي: لم يتم العثور على أي أخطاء إملائية","noSuggestions":"- لا توجد إقتراحات -","notAvailable":"عفواً، ولكن هذه الخدمة غير متاحة الان","notInDic":"ليست في القاموس","oneChange":"تم التدقيق الإملائي: تم تغيير كلمة واحدة فقط","progress":"جاري التدقيق الاملائى","title":"التدقيق الإملائي","toolbar":"تدقيق إملائي"}};
\ No newline at end of file
+CKEDITOR.lang['ar']={"editor":"محرر النص الغني","editorPanel":"لائحة محرر النص المنسق","common":{"editorHelp":"إضغط على ALT + 0 للحصول على المساعدة.","browseServer":"تصفح","url":"الرابط","protocol":"البروتوكول","upload":"رفع","uploadSubmit":"أرسل","image":"صورة","flash":"فلاش","form":"نموذج","checkbox":"خانة إختيار","radio":"زر اختيار","textField":"مربع نص","textarea":"مساحة نصية","hiddenField":"إدراج حقل خفي","button":"زر ضغط","select":"اختار","imageButton":"زر صورة","notSet":"<بدون تحديد>","id":"الرقم","name":"إسم","langDir":"إتجاه النص","langDirLtr":"اليسار لليمين (LTR)","langDirRtl":"اليمين لليسار (RTL)","langCode":"رمز اللغة","longDescr":"الوصف التفصيلى","cssClass":"فئات التنسيق","advisoryTitle":"عنوان التقرير","cssStyle":"نمط","ok":"موافق","cancel":"إلغاء الأمر","close":"أغلق","preview":"استعراض","resize":"تغيير الحجم","generalTab":"عام","advancedTab":"متقدم","validateNumberFailed":"لايوجد نتيجة","confirmNewPage":"ستفقد أي متغييرات اذا لم تقم بحفظها اولا. هل أنت متأكد أنك تريد صفحة جديدة؟","confirmCancel":"بعض الخيارات قد تغيرت. هل أنت متأكد من إغلاق مربع النص؟","options":"خيارات","target":"هدف الرابط","targetNew":"نافذة جديدة","targetTop":"النافذة الأعلى","targetSelf":"داخل النافذة","targetParent":"النافذة الأم","langDirLTR":"اليسار لليمين (LTR)","langDirRTL":"اليمين لليسار (RTL)","styles":"نمط","cssClasses":"فئات التنسيق","width":"العرض","height":"الإرتفاع","align":"محاذاة","alignLeft":"يسار","alignRight":"يمين","alignCenter":"وسط","alignJustify":"ضبط","alignTop":"أعلى","alignMiddle":"وسط","alignBottom":"أسفل","alignNone":"None","invalidValue":"قيمة غير مفبولة.","invalidHeight":"الارتفاع يجب أن يكون عدداً.","invalidWidth":"العرض يجب أن يكون عدداً.","invalidCssLength":"قيمة الخانة المخصصة لـ \"%1\" يجب أن تكون رقما موجبا، باستخدام أو من غير استخدام وحدة CSS قياس مقبولة (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"قيمة الخانة المخصصة لـ \"%1\" يجب أن تكون رقما موجبا، باستخدام أو من غير استخدام وحدة HTML قياس مقبولة (px or %).","invalidInlineStyle":"قيمة الخانة المخصصة لـ  Inline Style يجب أن تختوي على مجموع واحد أو أكثر بالشكل التالي: \"name : value\", مفصولة بفاصلة منقزطة.","cssLengthTooltip":"أدخل رقما للقيمة بالبكسل أو رقما بوحدة CSS مقبولة (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, غير متاح</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"حقوق النشر &copy; $1. جميع الحقوق محفوظة.","dlgTitle":"عن CKEditor","help":"راجع $1 من أجل المساعدة","moreInfo":"للحصول على معلومات الترخيص ، يرجى زيارة موقعنا:","title":"عن CKEditor","userGuide":"دليل مستخدم CKEditor."},"basicstyles":{"bold":"عريض","italic":"مائل","strike":"يتوسطه خط","subscript":"منخفض","superscript":"مرتفع","underline":"تسطير"},"bidi":{"ltr":"إتجاه النص من اليسار إلى اليمين","rtl":"إتجاه النص من اليمين إلى اليسار"},"blockquote":{"toolbar":"اقتباس"},"clipboard":{"copy":"نسخ","copyError":"الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع عمليات النسخ التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl/Cmd+C).","cut":"قص","cutError":"الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع القص التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl/Cmd+X).","paste":"لصق","pasteArea":"منطقة اللصق","pasteMsg":"الصق داخل الصندوق بإستخدام زرائر (<STRONG>Ctrl/Cmd+V</STRONG>) في لوحة المفاتيح، ثم اضغط زر  <STRONG>موافق</STRONG>.","securityMsg":"نظراً لإعدادات الأمان الخاصة بمتصفحك، لن يتمكن هذا المحرر من الوصول لمحتوى حافظتك، لذلك يجب عليك لصق المحتوى مرة أخرى في هذه النافذة.","title":"لصق"},"button":{"selectedLabel":"%1 (محدد)"},"colorbutton":{"auto":"تلقائي","bgColorTitle":"لون الخلفية","colors":{"000":"أسود","800000":"كستنائي","8B4513":"بني فاتح","2F4F4F":"رمادي أردوازي غامق","008080":"أزرق مخضر","000080":"أزرق داكن","4B0082":"كحلي","696969":"رمادي داكن","B22222":"طوبي","A52A2A":"بني","DAA520":"ذهبي داكن","006400":"أخضر داكن","40E0D0":"فيروزي","0000CD":"أزرق متوسط","800080":"بنفسجي غامق","808080":"رمادي","F00":"أحمر","FF8C00":"برتقالي داكن","FFD700":"ذهبي","008000":"أخضر","0FF":"تركواز","00F":"أزرق","EE82EE":"بنفسجي","A9A9A9":"رمادي شاحب","FFA07A":"برتقالي وردي","FFA500":"برتقالي","FFFF00":"أصفر","00FF00":"ليموني","AFEEEE":"فيروزي شاحب","ADD8E6":"أزرق فاتح","DDA0DD":"بنفسجي فاتح","D3D3D3":"رمادي فاتح","FFF0F5":"وردي فاتح","FAEBD7":"أبيض عتيق","FFFFE0":"أصفر فاتح","F0FFF0":"أبيض مائل للأخضر","F0FFFF":"سماوي","F0F8FF":"لبني","E6E6FA":"أرجواني","FFF":"أبيض","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"ألوان إضافية...","panelTitle":"Colors","textColorTitle":"لون النص"},"colordialog":{"clear":"مسح","highlight":"تحديد","options":"اختيارات الألوان","selected":"اللون المختار","title":"اختر اللون"},"templates":{"button":"القوالب","emptyListMsg":"(لم يتم تعريف أي قالب)","insertOption":"استبدال المحتوى","options":"خصائص القوالب","selectPromptMsg":"اختر القالب الذي تود وضعه في المحرر","title":"قوالب المحتوى"},"contextmenu":{"options":"خصائص قائمة السياق"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"هوية","advisoryTitleInputLabel":"عنوان التقرير","cssClassInputLabel":"فئات التنسيق","edit":"تحرير Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"اليسار لليمين (LTR)","langDirLabel":"إتجاه النص","langDirRTLLabel":"اليمين لليسار (RTL)","languageCodeInputLabel":"رمز اللغة","remove":"إزالة Div","styleSelectLabel":"نمط","title":"إحداث Div Container","toolbar":"إحداث Div Container"},"toolbar":{"toolbarCollapse":"تقليص شريط الأدوت","toolbarExpand":"تمديد شريط الأدوات","toolbarGroups":{"document":"مستند","clipboard":"الحافظة/الرجوع","editing":"تحرير","forms":"نماذج","basicstyles":"نمط بسيط","paragraph":"فقرة","links":"روابط","insert":"إدراج","styles":"أنماط","colors":"ألوان","tools":"أدوات"},"toolbars":"أشرطة أدوات المحرر"},"elementspath":{"eleLabel":"مسار العنصر","eleTitle":"عنصر 1%"},"find":{"find":"بحث","findOptions":"Find Options","findWhat":"البحث بـ:","matchCase":"مطابقة حالة الأحرف","matchCyclic":"مطابقة دورية","matchWord":"مطابقة بالكامل","notFoundMsg":"لم يتم العثور على النص المحدد.","replace":"إستبدال","replaceAll":"إستبدال الكل","replaceSuccessMsg":"تم استبدال 1% من الحالات ","replaceWith":"إستبدال بـ:","title":"بحث واستبدال"},"fakeobjects":{"anchor":"إرساء","flash":"رسم متحرك بالفلاش","hiddenfield":"إدراج حقل خفي","iframe":"iframe","unknown":"عنصر غير معروف"},"flash":{"access":"دخول النص البرمجي","accessAlways":"دائماً","accessNever":"مطلقاً","accessSameDomain":"نفس النطاق","alignAbsBottom":"أسفل النص","alignAbsMiddle":"وسط السطر","alignBaseline":"على السطر","alignTextTop":"أعلى النص","bgcolor":"لون الخلفية","chkFull":"ملء الشاشة","chkLoop":"تكرار","chkMenu":"تمكين قائمة فيلم الفلاش","chkPlay":"تشغيل تلقائي","flashvars":"متغيرات الفلاش","hSpace":"تباعد أفقي","properties":"خصائص الفلاش","propertiesTab":"الخصائص","quality":"جودة","qualityAutoHigh":"عالية تلقائياً","qualityAutoLow":"منخفضة تلقائياً","qualityBest":"أفضل","qualityHigh":"عالية","qualityLow":"منخفضة","qualityMedium":"متوسطة","scale":"الحجم","scaleAll":"إظهار الكل","scaleFit":"ضبط تام","scaleNoBorder":"بلا حدود","title":"خصائص فيلم الفلاش","vSpace":"تباعد عمودي","validateHSpace":"HSpace يجب أن يكون عدداً.","validateSrc":"فضلاً أدخل عنوان الموقع الذي يشير إليه الرابط","validateVSpace":"VSpace يجب أن يكون عدداً.","windowMode":"وضع النافذة","windowModeOpaque":"غير شفاف","windowModeTransparent":"شفاف","windowModeWindow":"نافذة"},"font":{"fontSize":{"label":"حجم الخط","voiceLabel":"حجم الخط","panelTitle":"حجم الخط"},"label":"خط","panelTitle":"حجم الخط","voiceLabel":"حجم الخط"},"forms":{"button":{"title":"خصائص زر الضغط","text":"القيمة/التسمية","type":"نوع الزر","typeBtn":"زر","typeSbm":"إرسال","typeRst":"إعادة تعيين"},"checkboxAndRadio":{"checkboxTitle":"خصائص خانة الإختيار","radioTitle":"خصائص زر الخيار","value":"القيمة","selected":"محدد","required":"Required"},"form":{"title":"خصائص النموذج","menu":"خصائص النموذج","action":"اسم الملف","method":"الأسلوب","encoding":"تشفير"},"hidden":{"title":"خصائص الحقل المخفي","name":"الاسم","value":"القيمة"},"select":{"title":"خصائص اختيار الحقل","selectInfo":"اختار معلومات","opAvail":"الخيارات المتاحة","value":"القيمة","size":"الحجم","lines":"الأسطر","chkMulti":"السماح بتحديدات متعددة","required":"Required","opText":"النص","opValue":"القيمة","btnAdd":"إضافة","btnModify":"تعديل","btnUp":"أعلى","btnDown":"أسفل","btnSetValue":"إجعلها محددة","btnDelete":"إزالة"},"textarea":{"title":"خصائص مساحة النص","cols":"الأعمدة","rows":"الصفوف"},"textfield":{"title":"خصائص مربع النص","name":"الاسم","value":"القيمة","charWidth":"عرض السمات","maxChars":"اقصى عدد للسمات","required":"Required","type":"نوع المحتوى","typeText":"نص","typePass":"كلمة مرور","typeEmail":"بريد إلكتروني","typeSearch":"بحث","typeTel":"رقم الهاتف","typeUrl":"الرابط"}},"format":{"label":"تنسيق","panelTitle":"تنسيق الفقرة","tag_address":"عنوان","tag_div":"عادي (DIV)","tag_h1":"العنوان 1","tag_h2":"العنوان  2","tag_h3":"العنوان  3","tag_h4":"العنوان  4","tag_h5":"العنوان  5","tag_h6":"العنوان  6","tag_p":"عادي","tag_pre":"منسّق"},"horizontalrule":{"toolbar":"خط فاصل"},"iframe":{"border":"إظهار حدود الإطار","noUrl":"فضلا أكتب رابط الـ iframe","scrolling":"تفعيل أشرطة الإنتقال","title":"خصائص iframe","toolbar":"iframe"},"image":{"alt":"عنوان الصورة","border":"سمك الحدود","btnUpload":"أرسلها للخادم","button2Img":"هل تريد تحويل زر الصورة المختار إلى صورة بسيطة؟","hSpace":"تباعد أفقي","img2Button":"هل تريد تحويل الصورة المختارة إلى زر صورة؟","infoTab":"معلومات الصورة","linkTab":"الرابط","lockRatio":"تناسق الحجم","menu":"خصائص الصورة","resetSize":"إستعادة الحجم الأصلي","title":"خصائص الصورة","titleButton":"خصائص زر الصورة","upload":"رفع","urlMissing":"عنوان مصدر الصورة مفقود","vSpace":"تباعد عمودي","validateBorder":"الإطار يجب أن يكون عددا","validateHSpace":"HSpace يجب أن يكون عدداً.","validateVSpace":"VSpace يجب أن يكون عدداً."},"indent":{"indent":"زيادة المسافة البادئة","outdent":"إنقاص المسافة البادئة"},"smiley":{"options":"خصائص الإبتسامات","title":"إدراج ابتسامات","toolbar":"ابتسامات"},"justify":{"block":"ضبط","center":"توسيط","left":"محاذاة إلى اليسار","right":"محاذاة إلى اليمين"},"language":{"button":"حدد اللغة","remove":"حذف اللغة"},"link":{"acccessKey":"مفاتيح الإختصار","advanced":"متقدم","advisoryContentType":"نوع التقرير","advisoryTitle":"عنوان التقرير","anchor":{"toolbar":"إشارة مرجعية","menu":"تحرير الإشارة المرجعية","title":"خصائص الإشارة المرجعية","name":"اسم الإشارة المرجعية","errorName":"الرجاء كتابة اسم الإشارة المرجعية","remove":"إزالة الإشارة المرجعية"},"anchorId":"حسب رقم العنصر","anchorName":"حسب إسم الإشارة المرجعية","charset":"ترميز المادة المطلوبة","cssClasses":"فئات التنسيق","download":"Force Download","displayText":"Display Text","emailAddress":"البريد الإلكتروني","emailBody":"محتوى الرسالة","emailSubject":"موضوع الرسالة","id":"هوية","info":"معلومات الرابط","langCode":"رمز اللغة","langDir":"إتجاه نص اللغة","langDirLTR":"اليسار لليمين (LTR)","langDirRTL":"اليمين لليسار (RTL)","menu":"تحرير الرابط","name":"إسم","noAnchors":"(لا توجد علامات مرجعية في هذا المستند)","noEmail":"الرجاء كتابة الريد الإلكتروني","noUrl":"الرجاء كتابة رابط الموقع","other":"<أخرى>","popupDependent":"تابع (Netscape)","popupFeatures":"خصائص النافذة المنبثقة","popupFullScreen":"ملئ الشاشة (IE)","popupLeft":"التمركز لليسار","popupLocationBar":"شريط العنوان","popupMenuBar":"القوائم الرئيسية","popupResizable":"قابلة التشكيل","popupScrollBars":"أشرطة التمرير","popupStatusBar":"شريط الحالة","popupToolbar":"شريط الأدوات","popupTop":"التمركز للأعلى","rel":"العلاقة","selectAnchor":"اختر علامة مرجعية","styles":"نمط","tabIndex":"الترتيب","target":"هدف الرابط","targetFrame":"<إطار>","targetFrameName":"اسم الإطار المستهدف","targetPopup":"<نافذة منبثقة>","targetPopupName":"اسم النافذة المنبثقة","title":"رابط","toAnchor":"مكان في هذا المستند","toEmail":"بريد إلكتروني","toUrl":"الرابط","toolbar":"رابط","type":"نوع الربط","unlink":"إزالة رابط","upload":"رفع"},"list":{"bulletedlist":"ادخال/حذف تعداد نقطي","numberedlist":"ادخال/حذف تعداد رقمي"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"إدراج فقرة هنا"},"maximize":{"maximize":"تكبير","minimize":"تصغير"},"newpage":{"toolbar":"صفحة جديدة"},"pagebreak":{"alt":"فاصل الصفحة","toolbar":"إدخال صفحة جديدة"},"pastetext":{"button":"لصق كنص بسيط","title":"لصق كنص بسيط"},"pastefromword":{"confirmCleanup":"يبدو أن النص المراد لصقه منسوخ من برنامج وورد. هل تود تنظيفه قبل الشروع في عملية اللصق؟","error":"لم يتم مسح المعلومات الملصقة لخلل داخلي","title":"لصق من وورد","toolbar":"لصق من وورد"},"preview":{"preview":"معاينة الصفحة"},"print":{"toolbar":"طباعة"},"removeformat":{"toolbar":"إزالة التنسيقات"},"save":{"toolbar":"حفظ"},"selectall":{"toolbar":"تحديد الكل"},"showblocks":{"toolbar":"مخطط تفصيلي"},"sourcearea":{"toolbar":"المصدر"},"specialchar":{"options":"خيارات الأحرف الخاصة","title":"اختر حرف خاص","toolbar":"إدراج  حرف خاص"},"scayt":{"btn_about":"عن SCAYT","btn_dictionaries":"قواميس","btn_disable":"تعطيل SCAYT","btn_enable":"تفعيل SCAYT","btn_langs":"لغات","btn_options":"خيارات","text_title":"تدقيق إملائي أثناء الكتابة"},"stylescombo":{"label":"أنماط","panelTitle":"أنماط التنسيق","panelTitle1":"أنماط الفقرة","panelTitle2":"أنماط مضمنة","panelTitle3":"أنماط الكائن"},"table":{"border":"الحدود","caption":"الوصف","cell":{"menu":"خلية","insertBefore":"إدراج خلية قبل","insertAfter":"إدراج خلية بعد","deleteCell":"حذف خلية","merge":"دمج خلايا","mergeRight":"دمج لليمين","mergeDown":"دمج للأسفل","splitHorizontal":"تقسيم الخلية أفقياً","splitVertical":"تقسيم الخلية عمودياً","title":"خصائص الخلية","cellType":"نوع الخلية","rowSpan":"امتداد الصفوف","colSpan":"امتداد الأعمدة","wordWrap":"التفاف النص","hAlign":"محاذاة أفقية","vAlign":"محاذاة رأسية","alignBaseline":"خط القاعدة","bgColor":"لون الخلفية","borderColor":"لون الحدود","data":"بيانات","header":"عنوان","yes":"نعم","no":"لا","invalidWidth":"عرض الخلية يجب أن يكون عدداً.","invalidHeight":"ارتفاع الخلية يجب أن يكون عدداً.","invalidRowSpan":"امتداد الصفوف يجب أن يكون عدداً صحيحاً.","invalidColSpan":"امتداد الأعمدة يجب أن يكون عدداً صحيحاً.","chooseColor":"اختر"},"cellPad":"المسافة البادئة","cellSpace":"تباعد الخلايا","column":{"menu":"عمود","insertBefore":"إدراج عمود قبل","insertAfter":"إدراج عمود بعد","deleteColumn":"حذف أعمدة"},"columns":"أعمدة","deleteTable":"حذف الجدول","headers":"العناوين","headersBoth":"كلاهما","headersColumn":"العمود الأول","headersNone":"بدون","headersRow":"الصف الأول","invalidBorder":"حجم الحد يجب أن يكون عدداً.","invalidCellPadding":"المسافة البادئة يجب أن تكون عدداً","invalidCellSpacing":"المسافة بين الخلايا يجب أن تكون عدداً.","invalidCols":"عدد الأعمدة يجب أن يكون عدداً أكبر من صفر.","invalidHeight":"ارتفاع الجدول يجب أن يكون عدداً.","invalidRows":"عدد الصفوف يجب أن يكون عدداً أكبر من صفر.","invalidWidth":"عرض الجدول يجب أن يكون عدداً.","menu":"خصائص الجدول","row":{"menu":"صف","insertBefore":"إدراج صف قبل","insertAfter":"إدراج صف بعد","deleteRow":"حذف صفوف"},"rows":"صفوف","summary":"الخلاصة","title":"خصائص الجدول","toolbar":"جدول","widthPc":"بالمئة","widthPx":"بكسل","widthUnit":"وحدة العرض"},"undo":{"redo":"إعادة","undo":"تراجع"},"wsc":{"btnIgnore":"تجاهل","btnIgnoreAll":"تجاهل الكل","btnReplace":"تغيير","btnReplaceAll":"تغيير الكل","btnUndo":"تراجع","changeTo":"التغيير إلى","errorLoading":"خطأ في تحميل تطبيق خدمة الاستضافة: %s.","ieSpellDownload":"المدقق الإملائي (الإنجليزي) غير مثبّت. هل تود تحميله الآن؟","manyChanges":"تم إكمال التدقيق الإملائي: تم تغيير %1 من كلمات","noChanges":"تم التدقيق الإملائي: لم يتم تغيير أي كلمة","noMispell":"تم التدقيق الإملائي: لم يتم العثور على أي أخطاء إملائية","noSuggestions":"- لا توجد إقتراحات -","notAvailable":"عفواً، ولكن هذه الخدمة غير متاحة الان","notInDic":"ليست في القاموس","oneChange":"تم التدقيق الإملائي: تم تغيير كلمة واحدة فقط","progress":"جاري التدقيق الاملائى","title":"التدقيق الإملائي","toolbar":"تدقيق إملائي"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/az.js b/htdocs/includes/ckeditor/ckeditor/lang/az.js
new file mode 100644
index 00000000000..b119baf0e01
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/az.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+CKEDITOR.lang['az']={"editor":"Mətn Redaktoru","editorPanel":"Mətn Redaktorun Paneli","common":{"editorHelp":"Yardım üçün ALT 0 düymələrini basın","browseServer":"Fayların siyahı","url":"URL","protocol":"Protokol","upload":"Serverə yüklə","uploadSubmit":"Göndər","image":"Şəkil","flash":"Flash","form":"Forma","checkbox":"Çekboks","radio":"Radio düyməsi","textField":"Mətn xanası","textarea":"Mətn","hiddenField":"Gizli xana","button":"Düymə","select":"Opsiyaların seçilməsi","imageButton":"Şəkil tipli düymə","notSet":"<seçilməmiş>","id":"Id","name":"Ad","langDir":"Yaziların istiqaməti","langDirLtr":"Soldan sağa (LTR)","langDirRtl":"Sağdan sola (RTL)","langCode":"Dilin kodu","longDescr":"URL-ın ətraflı izahı","cssClass":"CSS klassları","advisoryTitle":"Başlıq","cssStyle":"CSS","ok":"Tədbiq et","cancel":"İmtina et","close":"Bağla","preview":"Baxış","resize":"Eni dəyiş","generalTab":"Əsas","advancedTab":"Əlavə","validateNumberFailed":"Rəqəm deyil.","confirmNewPage":"Yadda saxlanılmamış dəyişikliklər itiriləcək. Davam etmək istədiyinizə əminsinizmi?","confirmCancel":"Dəyişikliklər edilib. Pəncərəni bağlamaq istəyirsizə əminsinizmi?","options":"Seçimlər","target":"Hədəf çərçivə","targetNew":"Yeni pəncərə (_blank)","targetTop":"Əsas pəncərə (_top)","targetSelf":"Carı pəncərə (_self)","targetParent":"Ana pəncərə (_parent)","langDirLTR":"Soldan sağa (LTR)","langDirRTL":"Sağdan sola (RTL)","styles":"Üslub","cssClasses":"Üslub klası","width":"En","height":"Uzunluq","align":"Yerləşmə","alignLeft":"Sol","alignRight":"Sağ","alignCenter":"Mərkəz","alignJustify":"Eninə görə","alignTop":"Yuxarı","alignMiddle":"Orta","alignBottom":"Aşağı","alignNone":"Yoxdur","invalidValue":"Yanlışdır.","invalidHeight":"Hündürlük rəqəm olmalıdır.","invalidWidth":"En rəqəm olmalıdır.","invalidCssLength":"\"%1\" xanasında göstərilən məzmun tam və müsbət olmalıdır, CSS-də olan ölçü vahidlərin (px, %, in, cm, mm, em, ex, pt, or pc) istifadısinə icazə verilir.","invalidHtmlLength":"\"%1\" xanasında göstərilən məzmun tam və müsbət olmalıdır HTML-də olan ölçü vahidlərin (px və ya %) istifadısinə icazə verilir.","invalidInlineStyle":"Teq içində olan üslub \"ad :  məzmun\" şəklidə, nöqtə-verqül işarəsi ilə bitməlidir","cssLengthTooltip":"Piksel sayı və ya digər CSS ölçü vahidləri (px, %, in, cm, mm, em, ex, pt, or pc) daxil edin.","unavailable":"%1<span class=\"cke_accessibility\">, mövcud deyil</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Boşluq","35":"Son","36":"Evə","46":"Sil","224":"Əmr"},"keyboardShortcut":"Qısayol düymələri"},"about":{"copy":"Copyright &copy; $1. Bütün hüquqlar qorunur.","dlgTitle":"CKEditor haqqında","help":"Kömək üçün  $1 seçin","moreInfo":"Lisenziya informasiyası üçün zəhmət olmasa saytımızı ziyarət edin:","title":"CKEditor haqqında","userGuide":"CKEditor İstifadəçilər üçün kitabça"},"basicstyles":{"bold":"Qalın","italic":"Kursiv","strike":"Üstüxətli","subscript":"Aşağı indeks","superscript":"Yuxarı indeks","underline":"Altdan xətt"},"bidi":{"ltr":"Mətnin istiqaməti - soldan sağa","rtl":"Mətnin istiqaməti - sağdan sola"},"blockquote":{"toolbar":"Sitat bloku"},"clipboard":{"copy":"Köçür","copyError":"Avtomatik köçürülməsi mümkün deyil. Ctrl+C basın.","cut":"Kəs","cutError":"Avtomatik kəsmə mümkün deyil. Ctrl+X basın.","paste":"Əlavə et","pasteArea":"Əlavəetmə sahəsi","pasteMsg":"Bu sahəyə əlavə edin (<strong>Ctrl+V</strong>)","securityMsg":"Mübadilə buferi açmaq mümkün deyil. Bu pəncərədə yenidən əlavə edin.","title":"Əlavə et"},"button":{"selectedLabel":"%1 (seçilib)"},"colorbutton":{"auto":"Avtomatik","bgColorTitle":"Doldurma rəngi","colors":{"000":"Qara","800000":"Şabalıdı","8B4513":"Açıq şabalı","2F4F4F":"Açıq boz","008080":"Firuzəyi göy","000080":"Tünd göy","4B0082":"İndigo","696969":"Tünd boz","B22222":"Kərpiç","A52A2A":"Şabalıdı","DAA520":"Qızıl ağcaqayın","006400":"Tünd yaşıl","40E0D0":"Firuzəyi","0000CD":"Göy","800080":"Bənövşəyi","808080":"Boz","F00":"Qırmızı","FF8C00":"Tünd narıncı","FFD700":"Qızıl","008000":"Yaşıl","0FF":"Mavi","00F":"Göy","EE82EE":"Açıq bənövşəyi","A9A9A9":"Asfalt rəngi","FFA07A":"Qızılbalıq","FFA500":"Narıncı","FFFF00":"Sarı","00FF00":"Laym","AFEEEE":"Acıq firuzəyi","ADD8E6":"Acıq göy","DDA0DD":"Gavalı","D3D3D3":"Acıq boz","FFF0F5":"Yasəmən","FAEBD7":"Kağız","FFFFE0":"Acıq sarı","F0FFF0":"Bal","F0FFFF":"Gömgöy","F0F8FF":"Solğun göy","E6E6FA":"Lavanda","FFF":"Ağ","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Digər rənglər...","panelTitle":"Rənglər","textColorTitle":"Mətnin rəngi"},"colordialog":{"clear":"Təmizlə","highlight":"Ayırmaq","options":"Rəng seçimləri","selected":"Seçilmiş rəng","title":"Rəngi seç"},"templates":{"button":"Şablon","emptyListMsg":"(Heç bir şablon təyin edilməyib)","insertOption":"Həqiqi içindəkiləri əvəz et","options":"Şablonun seçimləri","selectPromptMsg":"Redaktor ilə açmaq üçün şablonu seçin","title":"İçindəkinin şablonu"},"contextmenu":{"options":"Əlavə əməliyyatlar"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Məsləhətli başlıq","cssClassInputLabel":"Üslub klassları","edit":"DİV eıementini redaktə et","inlineStyleInputLabel":"Sözlərin üslubları","langDirLTRLabel":"Soldan sağa (LTR)","langDirLabel":"Yaziların istiqaməti","langDirRTLLabel":"Sağdan sola (RTL)","languageCodeInputLabel":"Dilin kodu","remove":"DİV elementini sil","styleSelectLabel":"Üslub","title":"DİV ilə əhatələməni yarat","toolbar":"DİV ilə əhatələməni yarat"},"toolbar":{"toolbarCollapse":"Paneli gizlət","toolbarExpand":"Paneli göstər","toolbarGroups":{"document":"Mətn","clipboard":"Mübadilə buferi/İmtina et","editing":"Redaktə edilməsi","forms":"Formalar","basicstyles":"Əsas üslublar","paragraph":"Abzas","links":"Link","insert":"Əlavə et","styles":"Üslublar","colors":"Rənqlər","tools":"Alətləri"},"toolbars":"Redaktorun panelləri"},"elementspath":{"eleLabel":"Elementin izləri","eleTitle":"%1 element"},"find":{"find":"Tap","findOptions":"Axtarışın seçimləri","findWhat":"Nəyi axtarmaq","matchCase":"Reqistr nəzərə alınmaqla","matchCyclic":"Dövrəvi axtar","matchWord":"Tam sözünə uyğun","notFoundMsg":"Daxil etdiyiniz sorğu ilə heç bir nəticə tapılmayıb","replace":"Əvəz et","replaceAll":"Hamısını əvəz et","replaceSuccessMsg":"%1 daxiletmə(lər) əvəz edilib","replaceWith":"Əvəz etdirici mətn:","title":"Tap və əvəz et"},"fakeobjects":{"anchor":"Lövbər","flash":"Flash animasiya","hiddenfield":"Gizli xana","iframe":"IFrame","unknown":"Tanımamış obyekt"},"flash":{"access":"Skript tərəfindən müraciətlərin icazəsi","accessAlways":"Həmişə","accessNever":"Heç vaxt","accessSameDomain":"Eyni domen adından","alignAbsBottom":"Aşağıda","alignAbsMiddle":"Ortada","alignBaseline":"Əsas xətt","alignTextTop":"Mətnin yuxarıda","bgcolor":"Doldurma rəngi","chkFull":"Tam pəncərəyə aça bilər","chkLoop":"Dövrələmə","chkMenu":"Flash menyunu göstər","chkPlay":"Birbaşa oynat","flashvars":"Flash üçün dəyişənlər","hSpace":"Üfüqi boşluq","properties":"Flash xüsusiyyətləri","propertiesTab":"Xüsusiyyətlər","quality":"Keyfiyyət","qualityAutoHigh":"Avtomatik yüksək","qualityAutoLow":"Avtomatik aşağı","qualityBest":"Mükəmməl","qualityHigh":"Yüksək","qualityLow":"Aşağı","qualityMedium":"Orta","scale":"Dəyişkən","scaleAll":"Hamısını göstər","scaleFit":"Həqiqi ölçülər","scaleNoBorder":"Sərhədsiz","title":"Flash xüsusiyyətləri","vSpace":"Şaquli boşluq","validateHSpace":"Üfüqi boşluq rəqəm olmalıdır.","validateSrc":"Link boş ola bilməz","validateVSpace":"Şaquli boşluq rəqəm olmalıdır.","windowMode":"Pəncərənin rejimi","windowModeOpaque":"Görünən","windowModeTransparent":"Şəffaf","windowModeWindow":"Pəncərə"},"font":{"fontSize":{"label":"Şrift ölçüsü","voiceLabel":"Şrift ölçüsü","panelTitle":"Şrift ölçüsü"},"label":"Şrift","panelTitle":"Şrift","voiceLabel":"Şrift"},"forms":{"button":{"title":"Düymənin xüsusiyyətləri","text":"Mətn (kəmiyyət)","type":"Növ","typeBtn":"Düymə","typeSbm":"Təsdiq et","typeRst":"Dəyişiklikləri imtina et"},"checkboxAndRadio":{"checkboxTitle":"Qutucuqun xüsusiyyətləri","radioTitle":"Radio düyməsinin xüsusiyyətləri","value":"Kəmiyyət","selected":"Seçilmiş","required":"Tələb olunur"},"form":{"title":"Formanın xüsusiyyətləri","menu":"Formanın xüsusiyyətləri","action":"Emal edən ünvan","method":"Göndərilmə üsulu","encoding":"Kodlaşdırma"},"hidden":{"title":"Gizli xanasının xüsusiyyətləri","name":"Ad","value":"Kəmiyyət"},"select":{"title":"SELECT elementinin xüsusiyyətləri","selectInfo":"SELECT elementinin haqqında məlumat","opAvail":"Mövcud olan seçimləri","value":"Kəmiyyət","size":"Ölçülər","lines":"xəttlər","chkMulti":"Çox kəmiyyətli xana","required":"Tələb olunur","opText":"Mətn","opValue":"Kəmiyyət","btnAdd":"Əıavə et","btnModify":"Redaktə et","btnUp":"Yuxarı","btnDown":"Aşağı","btnSetValue":"Susmaya görə kəmiyyəti kimi seç","btnDelete":"Sil"},"textarea":{"title":"Mətn xanasının xüsusiyyətləri","cols":"Sütunlar","rows":"Sətirlər"},"textfield":{"title":"Mətn xanasının xüsusiyyətləri","name":"Ad","value":"Kəmiyyət","charWidth":"İşarənin eni","maxChars":"İşarələrin hüdudu","required":"Tələb olunur","type":"Növ","typeText":"Mətn","typePass":"Şifrə","typeEmail":"E-poçt","typeSearch":"Axtarış","typeTel":"Telefon nömrəsi","typeUrl":"Link"}},"format":{"label":"Format","panelTitle":"Abzasın formatı","tag_address":"Ünvan","tag_div":"Normal (DIV)","tag_h1":"Başlıq 1","tag_h2":"Başlıq 2","tag_h3":"Başlıq 3","tag_h4":"Başlıq 4","tag_h5":"Başlıq 5","tag_h6":"Başlıq 6","tag_p":"Normal","tag_pre":"Formatı saxla"},"horizontalrule":{"toolbar":"Sərhəd xətti yarat"},"iframe":{"border":"Çərçivə sərhədlərini göstər","noUrl":"Çərçivənin ünvanı daxil edin","scrolling":"Şürüşdürmələri əlavə et","title":"İFRAME elementinin alətləri","toolbar":"İFRAME"},"image":{"alt":"Alternativ mətn","border":"Sərhəd","btnUpload":"Serverə yüklə","button2Img":"Şəkil tipli düyməni şəklə çevirmək istədiyinizə əminsinizmi?","hSpace":"Üfüqi boşluq","img2Button":"Şəkli şəkil tipli düyməyə çevirmək istədiyinizə əminsinizmi?","infoTab":"Şəkil haqqında məlumat","linkTab":"Link","lockRatio":"Ölçülərin uyğunluğu saxla","menu":"Şəklin seçimləri","resetSize":"Ölçüləri qaytar","title":"Şəklin seçimləri","titleButton":"Şəkil tipli düyməsinin seçimləri","upload":"Serverə yüklə","urlMissing":"Şəklin ünvanı yanlışdır.","vSpace":"Şaquli boşluq","validateBorder":"Sərhədin eni rəqəm olmalıdır.","validateHSpace":"Üfüqi boşluq rəqəm olmalıdır.","validateVSpace":"Şaquli boşluq rəqəm olmalıdır."},"indent":{"indent":"Sol boşluqu artır","outdent":"Sol boşluqu azalt"},"smiley":{"options":"Smayli-nin seçimləri","title":"Smayli-ni daxil et","toolbar":"Smayli"},"justify":{"block":"Eninə görə","center":"Mərkəz","left":"Soldan düzləndir","right":"Sağdan düzləndir"},"language":{"button":"Dilini təyin et","remove":"Dilini sil"},"link":{"acccessKey":"Qısayol düyməsi","advanced":"Geniş seçimləri","advisoryContentType":"Məsləhətli məzmunun növü","advisoryTitle":"Məsləhətli başlıq","anchor":{"toolbar":"Xeş","menu":"Xeşi redaktə et","title":"Xeşin seçimləri","name":"Xeşin adı","errorName":"Xeşin adı yanlışdır","remove":"Xeşin adı sil"},"anchorId":"ID görə","anchorName":"Xeşin adına görə","charset":"Hədəfin kodlaşdırması","cssClasses":"Üslub klası","download":"Məcburi yükləmə","displayText":"Göstərilən mətn","emailAddress":"E-poçt ünvanı","emailBody":"Mesajın məzmunu","emailSubject":"Mesajın başlığı","id":"ID","info":"Linkin xüsusiyyətləri","langCode":"Dilin kodu","langDir":"Yaziların istiqaməti","langDirLTR":"Soldan sağa (LTR)","langDirRTL":"Sağdan sola (RTL)","menu":"Linki redaktə et","name":"Ad","noAnchors":"(heç bir xeş tapılmayıb)","noEmail":"E-poçt ünvanı daxil edin","noUrl":"Linkin URL-ı daxil edin","other":"<digər>","popupDependent":"Asılı (Netscape)","popupFeatures":"Pəncərənin xüsusiyyətləri","popupFullScreen":"Tam ekran rejimi (IE)","popupLeft":"Solda","popupLocationBar":"Ünvan paneli","popupMenuBar":"Menyu paneli","popupResizable":"Olçülər dəyişilir","popupScrollBars":"Sürüşdürmələr göstər","popupStatusBar":"Bildirişlərin paneli","popupToolbar":"Alətlərin paneli","popupTop":"Yuxarıda","rel":"Münasibət","selectAnchor":"Xeşi seçin","styles":"Üslub","tabIndex":"Tabın nömrəsi","target":"Hədəf çərçivə","targetFrame":"<freym>","targetFrameName":"Freymin adı","targetPopup":"<yeni pəncərə>","targetPopupName":"Pəncərənin adı","title":"Link","toAnchor":"Xeş","toEmail":"E-poçt","toUrl":"URL","toolbar":"Link","type":"Linkin növü","unlink":"Linki sil","upload":"Serverə yüklə"},"list":{"bulletedlist":"Markerlənmiş siyahını başlat/sil","numberedlist":"Nömrələnmiş siyahını başlat/sil"},"liststyle":{"armenian":"Erməni nömrələmə","bulletedTitle":"Markerlənmiş siyahının xüsusiyyətləri","circle":"Dəirəcik","decimal":"Rəqəm (1, 2, 3 və s.)","decimalLeadingZero":"Aparıcı sıfır olan rəqəm (01, 02, 03 və s.)","disc":"Disk","georgian":"Gürcü nömrələmə (an, ban, gan, və s.)","lowerAlpha":"Kiçik hərflər (a, b, c, d, e və s.)","lowerGreek":"Kiçik Yunan hərfləri (alfa, beta, qamma və s.)","lowerRoman":"Rum rəqəmləri (i, ii, iii, iv, v və s.)","none":"Yoxdur","notset":"<seçilməmiş>","numberedTitle":"Nömrəli siyahının xüsusiyyətləri","square":"Dördbucaq","start":"Başlanğıc","type":"Növ","upperAlpha":"Böyük hərflər (a, b, c, d, e və s.)","upperRoman":"Böyük Rum rəqəmləri (I, II, III, IV, V və s.)","validateStartNumber":"Siyahının başlanğıc nömrəsi tam və müsbət rəqəm olmalıdır."},"magicline":{"title":"Abzası burada əlavə et"},"maximize":{"maximize":"Aşkarla","minimize":"Gizlət"},"newpage":{"toolbar":"Yeni səhifə"},"pagebreak":{"alt":"Vərəq ayırıcı nişanı","toolbar":"Vərəqin çapı üçün ayırıcı nişanı qoy"},"pastetext":{"button":"Yalnız mətni saxla","title":"Adi mətn kimi əlavə et"},"pastefromword":{"confirmCleanup":"Əlavə edilən mətn Word-dan köçürülənə oxşayır. Təmizləmək istəyirsinizmi?","error":"Daxili səhvə görə əlavə edilən məlumatların təmizlənməsi mümkün deyil","title":"Word-dan əlavəetmə","toolbar":"Word-dan əlavəetmə"},"preview":{"preview":"Öncədən baxılması"},"print":{"toolbar":"Çap et"},"removeformat":{"toolbar":"Formatı sil"},"save":{"toolbar":"Yadda saxla"},"selectall":{"toolbar":"Hamısını seç"},"showblocks":{"toolbar":"Blokları göstər"},"sourcearea":{"toolbar":"HTML mənbəyini göstər"},"specialchar":{"options":"Xüsusi simvolların seçimləri","title":"Xüsusi simvolu seç","toolbar":"Xüsusi simvolu daxil et"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Üslub","panelTitle":"Format üslubları","panelTitle1":"Blokların üslubları","panelTitle2":"Sözlərin üslubları","panelTitle3":"Obyektlərin üslubları"},"table":{"border":"Sərhədlərin eni","caption":"Cədvəlin başlığı","cell":{"menu":"Xana","insertBefore":"Burdan əvvələ xanası çək","insertAfter":"Burdan sonra xanası çək","deleteCell":"Xanaları sil","merge":"Xanaları birləşdir","mergeRight":"Sağdan birləşdir","mergeDown":"Soldan birləşdir","splitHorizontal":"Üfüqi böl","splitVertical":"Şaquli böl","title":"Xanaların seçimləri","cellType":"Xana növü","rowSpan":"Sətirləri birləşdir","colSpan":"Sütunları birləşdir","wordWrap":"Sətirlərin sınması","hAlign":"Üfüqi düzləndirmə","vAlign":"Şaquli düzləndirmə","alignBaseline":"Mətn xətti","bgColor":"Doldurma rəngi","borderColor":"Sərhədin rəngi","data":"Məlumatlar","header":"Başlıq","yes":"Bəli","no":"Xeyr","invalidWidth":"Xanasın eni rəqəm olmalıdır.","invalidHeight":"Xanasın hündürlüyü rəqəm olmalıdır.","invalidRowSpan":"Birləşdirdiyiniz sütun xanaların sayı tam və müsbət rəqəm olmalıdır.","invalidColSpan":"Birləşdirdiyiniz sətir xanaların sayı tam və müsbət rəqəm olmalıdır.","chooseColor":"Seç"},"cellPad":"Xanalardakı kənar boşluqlar","cellSpace":"Xanalararası interval","column":{"menu":"Sütun","insertBefore":"Sola sütun əlavə et","insertAfter":"Sağa sütun əlavə et","deleteColumn":"Sütunları sil"},"columns":"Sütunlar","deleteTable":"Cədvəli sil","headers":"Başlıqlar","headersBoth":"Hər ikisi","headersColumn":"Birinci sütun","headersNone":"yox","headersRow":"Birinci sətir","invalidBorder":"Sərhədlərin eni müsbət rəqəm olmalıdır.","invalidCellPadding":"Xanalardakı kənar boşluqlar müsbət rəqəm olmalıdır.","invalidCellSpacing":"Xanalararası interval müsbət rəqəm olmalıdır.","invalidCols":"Sütunlarin sayı tam və müsbət olmalıdır.","invalidHeight":"Cədvəlin hündürlüyü rəqəm olmalıdır.","invalidRows":"Sətirlətin sayı tam və müsbət olmalıdır.","invalidWidth":"Cədvəlin eni rəqəm olmalıdır.","menu":"Cədvəl alətləri","row":{"menu":"Sətir","insertBefore":"Yuxarıya sətir əlavə et","insertAfter":"Aşağıya sətir əlavə et","deleteRow":"Sətirləri sil"},"rows":"Sətirlər","summary":"Xülasə","title":"Cədvəl alətləri","toolbar":"Cədvəl","widthPc":"faiz","widthPx":"piksel","widthUnit":"en vahidi"},"undo":{"redo":"Təkrar et","undo":"İmtina et"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/lang/bg.js
index e85e1da39ad..b3141bb3a92 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/bg.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/bg.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['bg']={"editor":"Текстов редактор за форматиран текст","editorPanel":"Панел на текстовия редактор","common":{"editorHelp":"натиснете ALT 0 за помощ","browseServer":"Избор от сървъра","url":"URL","protocol":"Протокол","upload":"Качване","uploadSubmit":"Изпращане към сървъра","image":"Снимка","flash":"Флаш","form":"Форма","checkbox":"Поле за избор","radio":"Радио бутон","textField":"Текстово поле","textarea":"Текстова зона","hiddenField":"Скрито поле","button":"Бутон","select":"Поле за избор","imageButton":"Бутон за снимка","notSet":"<не е избрано>","id":"ID","name":"Име","langDir":"Посока на езика","langDirLtr":"Ляво на дясно (ЛнД)","langDirRtl":"Дясно на ляво (ДнЛ)","langCode":"Код на езика","longDescr":"Уеб адрес за дълго описание","cssClass":"Класове за CSS","advisoryTitle":"Препоръчително заглавие","cssStyle":"Стил","ok":"ОК","cancel":"Отказ","close":"Затвори","preview":"Преглед","resize":"Влачете за да оразмерите","generalTab":"Общи","advancedTab":"Разширено","validateNumberFailed":"Тази стойност не е число","confirmNewPage":"Всички незапазени промени ще бъдат изгубени. Сигурни ли сте, че желаете да заредите нова страница?","confirmCancel":"Някои от опциите са променени. Сигурни ли сте, че желаете да затворите прозореца?","options":"Опции","target":"Цел","targetNew":"Нов прозорец (_blank)","targetTop":"Горна позиция (_top)","targetSelf":"Текущия прозорец (_self)","targetParent":"Основен прозорец (_parent)","langDirLTR":"Ляво на дясно (ЛнД)","langDirRTL":"Дясно на ляво (ДнЛ)","styles":"Стил","cssClasses":"Класове за CSS","width":"Ширина","height":"Височина","align":"Подравняване","alignLeft":"Ляво","alignRight":"Дясно","alignCenter":"Център","alignJustify":"Двустранно подравняване","alignTop":"Горе","alignMiddle":"По средата","alignBottom":"Долу","alignNone":"Без подравняване","invalidValue":"Невалидна стойност.","invalidHeight":"Височината трябва да е число.","invalidWidth":"Ширина требе да е число.","invalidCssLength":"Стойността на полето \"%1\" трябва да бъде положително число с или без валидна CSS измервателна единица (px, %, in, cm, mm, em, ex, pt, или pc).","invalidHtmlLength":"Стойността на полето \"%1\" трябва да бъде положително число с или без валидна HTML измервателна единица (px или %).","invalidInlineStyle":"Стойността на стилa трябва да съдържат една или повече двойки във формат \"name : value\", разделени с двоеточие.","cssLengthTooltip":"Въведете числена стойност в пиксели или друга валидна CSS единица (px, %, in, cm, mm, em, ex, pt, или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недостъпно</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Относно CKEditor","help":"Проверете $1 за помощ.","moreInfo":"За лицензионна информация моля посетете сайта ни:","title":"Относно CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Удебелен","italic":"Наклонен","strike":"Зачертан текст","subscript":"Индексиран текст","superscript":"Суперскрипт","underline":"Подчертан"},"bidi":{"ltr":"Посока на текста от ляво на дясно","rtl":"Посока на текста от дясно на ляво"},"blockquote":{"toolbar":"Блок за цитат"},"clipboard":{"copy":"Копирай","copyError":"Настройките за сигурност на вашия бразуър не разрешават на редактора да изпълни запаметяването. За целта използвайте клавиатурата (Ctrl/Cmd+C).","cut":"Отрежи","cutError":"Настройките за сигурност на Вашия браузър не позволяват на редактора автоматично да изъплни действията за отрязване. Моля ползвайте клавиатурните команди за целта (ctrl+x).","paste":"Вмъкни","pasteArea":"Зона за вмъкване","pasteMsg":"Вмъкнете тук съдъжанието с клавиатуарата (<STRONG>Ctrl/Cmd+V</STRONG>) и натиснете <STRONG>OK</STRONG>.","securityMsg":"Заради настройките за сигурност на Вашия браузър, редакторът не може да прочете данните от клипборда коректно.","title":"Вмъкни"},"button":{"selectedLabel":"%1 (Избрано)"},"colorbutton":{"auto":"Автоматично","bgColorTitle":"Фонов цвят","colors":{"000":"Черно","800000":"Кестеняво","8B4513":"Светлокафяво","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Индиго","696969":"Тъмно сиво","B22222":"Огнено червено","A52A2A":"Кафяво","DAA520":"Златисто","006400":"Тъмно зелено","40E0D0":"Тюркуазено","0000CD":"Средно синьо","800080":"Пурпурно","808080":"Сиво","F00":"Червено","FF8C00":"Тъмно оранжево","FFD700":"Златно","008000":"Зелено","0FF":"Светло синьо","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"Още цветове","panelTitle":"Цветове","textColorTitle":"Цвят на шрифт"},"colordialog":{"clear":"Изчистване","highlight":"Осветяване","options":"Цветови опции","selected":"Изберете цвят","title":"Изберете цвят"},"templates":{"button":"Шаблони","emptyListMsg":"(Няма дефинирани шаблони)","insertOption":"Препокрива актуалното съдържание","options":"Опции за шаблона","selectPromptMsg":"Изберете шаблон <br>(текущото съдържание на редактора ще бъде загубено):","title":"Шаблони"},"contextmenu":{"options":"Опции на контекстното меню"},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Препоръчително заглавие","cssClassInputLabel":"Класове за CSS","edit":"Промяна на Div","inlineStyleInputLabel":"В редица","langDirLTRLabel":"Ляво на Дясно (ЛнД)","langDirLabel":"Посока на езика","langDirRTLLabel":"Дясно на Ляво (ДнЛ)","languageCodeInputLabel":" Код на езика","remove":"Премахване на Div","styleSelectLabel":"Стил","title":"Създай Div блок","toolbar":"Създаване на Div контейнер"},"toolbar":{"toolbarCollapse":"Свиване на лентата с инструменти","toolbarExpand":"Разширяване на лентата с инструменти","toolbarGroups":{"document":"Документ","clipboard":"Клипборд/Отмяна","editing":"Промяна","forms":"Форми","basicstyles":"Базови стилове","paragraph":"Параграф","links":"Връзки","insert":"Вмъкване","styles":"Стилове","colors":"Цветове","tools":"Инструменти"},"toolbars":"Ленти с инструменти"},"elementspath":{"eleLabel":"Път за елементите","eleTitle":"%1 елемент"},"find":{"find":"Търсене","findOptions":"Find Options","findWhat":"Търси за:","matchCase":"Съвпадение","matchCyclic":"Циклично съвпадение","matchWord":"Съвпадение с дума","notFoundMsg":"Указаният текст не е намерен.","replace":"Препокриване","replaceAll":"Препокрий всички","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Препокрива с:","title":"Търсене и препокриване"},"fakeobjects":{"anchor":"Кука","flash":"Флаш анимация","hiddenfield":"Скрито поле","iframe":"IFrame","unknown":"Неизвестен обект"},"flash":{"access":"Достъп до скрипт","accessAlways":"Винаги","accessNever":"Никога","accessSameDomain":"Същият домейн","alignAbsBottom":"Най-долу","alignAbsMiddle":"Точно по средата","alignBaseline":"Базова линия","alignTextTop":"Върху текста","bgcolor":"Цвят на фона","chkFull":"Включи на цял екран","chkLoop":"Цикъл","chkMenu":"Разрешено Flash меню","chkPlay":"Авто. пускане","flashvars":"Променливи за Флаш","hSpace":"Хоризонтален отстъп","properties":"Настройки за флаш","propertiesTab":"Настройки","quality":"Качество","qualityAutoHigh":"Авто. високо","qualityAutoLow":"Авто. ниско","qualityBest":"Отлично","qualityHigh":"Високо","qualityLow":"Ниско","qualityMedium":"Средно","scale":"Оразмеряване","scaleAll":"Показва всичко","scaleFit":"Според мястото","scaleNoBorder":"Без рамка","title":"Настройки за флаш","vSpace":"Вертикален отстъп","validateHSpace":"HSpace трябва да е число.","validateSrc":"Уеб адреса не трябва да е празен.","validateVSpace":"VSpace трябва да е число.","windowMode":"Режим на прозореца","windowModeOpaque":"Плътност","windowModeTransparent":"Прозрачност","windowModeWindow":"Прозорец"},"font":{"fontSize":{"label":"Размер","voiceLabel":"Размер на шрифт","panelTitle":"Размер на шрифт"},"label":"Шрифт","panelTitle":"Име на шрифт","voiceLabel":"Шрифт"},"forms":{"button":{"title":"Настройки на бутона","text":"Текст (стойност)","type":"Тип","typeBtn":"Бутон","typeSbm":"Добави","typeRst":"Нулиране"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Настройки на радиобутон","value":"Стойност","selected":"Избрано","required":"Required"},"form":{"title":"Настройки на формата","menu":"Настройки на формата","action":"Действие","method":"Метод","encoding":"Кодиране"},"hidden":{"title":"Настройки за скрито поле","name":"Име","value":"Стойност"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Налични опции","value":"Стойност","size":"Размер","lines":"линии","chkMulti":"Allow multiple selections","required":"Required","opText":"Текст","opValue":"Стойност","btnAdd":"Добави","btnModify":"Промени","btnUp":"На горе","btnDown":"На долу","btnSetValue":"Set as selected value","btnDelete":"Изтриване"},"textarea":{"title":"Опции за текстовата зона","cols":"Колони","rows":"Редове"},"textfield":{"title":"Настройки за текстово поле","name":"Име","value":"Стойност","charWidth":"Ширина на знаците","maxChars":"Макс. знаци","required":"Required","type":"Тип","typeText":"Текст","typePass":"Парола","typeEmail":"Email","typeSearch":"Търсене","typeTel":"Телефонен номер","typeUrl":"Уеб адрес"}},"format":{"label":"Формат","panelTitle":"Формат","tag_address":"Адрес","tag_div":"Параграф (DIV)","tag_h1":"Заглавие 1","tag_h2":"Заглавие 2","tag_h3":"Заглавие 3","tag_h4":"Заглавие 4","tag_h5":"Заглавие 5","tag_h6":"Заглавие 6","tag_p":"Нормален","tag_pre":"Форматиран"},"horizontalrule":{"toolbar":"Вмъкване на хоризонтална линия"},"iframe":{"border":"Показва рамка на карето","noUrl":"Моля въведете URL за iFrame","scrolling":"Вкл. скролбаровете","title":"IFrame настройки","toolbar":"IFrame"},"image":{"alt":"Алтернативен текст","border":"Рамка","btnUpload":"Изпрати я на сървъра","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Хоризонтален отстъп","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Инфо за снимка","linkTab":"Връзка","lockRatio":"Заключване на съотношението","menu":"Настройки за снимка","resetSize":"Нулиране на размер","title":"Настройки за снимка","titleButton":"Настойки за бутон за снимка","upload":"Качване","urlMissing":"Image source URL is missing.","vSpace":"Вертикален отстъп","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Увеличаване на отстъпа","outdent":"Намаляване на отстъпа"},"smiley":{"options":"Опции за усмивката","title":"Вмъкване на усмивка","toolbar":"Усмивка"},"justify":{"block":"Двустранно подравняване","center":"Център","left":"Подравни в ляво","right":"Подравни в дясно"},"language":{"button":"Задай език","remove":"Премахни език"},"link":{"acccessKey":"Ключ за достъп","advanced":"Разширено","advisoryContentType":"Препоръчителен тип на съдържанието","advisoryTitle":"Препоръчително заглавие","anchor":{"toolbar":"Котва","menu":"Промяна на котва","title":"Настройки на котва","name":"Име на котва","errorName":"Моля въведете име на котвата","remove":"Премахване на котва"},"anchorId":"По ID на елемент","anchorName":"По име на котва","charset":"Тип на свързания ресурс","cssClasses":"Класове за CSS","emailAddress":"E-mail aдрес","emailBody":"Съдържание","emailSubject":"Тема","id":"ID","info":"Инфо за връзката","langCode":"Код за езика","langDir":"Посока на езика","langDirLTR":"Ляво на Дясно (ЛнД)","langDirRTL":"Дясно на Ляво (ДнЛ)","menu":"Промяна на връзка","name":"Име","noAnchors":"(Няма котви в текущия документ)","noEmail":"Моля въведете e-mail aдрес","noUrl":"Моля въведете URL адреса","other":"<друго>","popupDependent":"Зависимост (Netscape)","popupFeatures":"Функции на изкачащ прозорец","popupFullScreen":"Цял екран (IE)","popupLeft":"Лява позиция","popupLocationBar":"Лента с локацията","popupMenuBar":"Лента за меню","popupResizable":"Оразмеряем","popupScrollBars":"Скролери","popupStatusBar":"Статусна лента","popupToolbar":"Лента с инструменти","popupTop":"Горна позиция","rel":"Връзка","selectAnchor":"Изберете котва","styles":"Стил","tabIndex":"Ред на достъп","target":"Цел","targetFrame":"<frame>","targetFrameName":"Име на целевият прозорец","targetPopup":"<изкачащ прозорец>","targetPopupName":"Име на изкачащ прозорец","title":"Връзка","toAnchor":"Връзка към котва в текста","toEmail":"E-mail","toUrl":"Уеб адрес","toolbar":"Връзка","type":"Тип на връзката","unlink":"Премахни връзката","upload":"Качване"},"list":{"bulletedlist":"Вмъкване/Премахване на точков списък","numberedlist":"Вмъкване/Премахване на номериран списък"},"liststyle":{"armenian":"Арменско номериране","bulletedTitle":"Bulleted List Properties","circle":"Кръг","decimal":"Числа (1, 2, 3 и др.)","decimalLeadingZero":"Числа с водеща нула (01, 02, 03 и т.н.)","disc":"Диск","georgian":"Грузинско номериране (an, ban, gan, и т.н.)","lowerAlpha":"Малки букви (а, б, в, г, д и т.н.)","lowerGreek":"Малки гръцки букви (алфа, бета, гама и т.н.)","lowerRoman":"Малки римски числа (i, ii, iii, iv, v и т.н.)","none":"Няма","notset":"<не е указано>","numberedTitle":"Numbered List Properties","square":"Квадрат","start":"Старт","type":"Тип","upperAlpha":"Големи букви (А, Б, В, Г, Д и т.н.)","upperRoman":"Големи римски числа (I, II, III, IV, V и т.н.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Вмъкнете параграф тук"},"maximize":{"maximize":"Максимизиране","minimize":"Минимизиране"},"newpage":{"toolbar":"Нова страница"},"pagebreak":{"alt":"Разделяне на страници","toolbar":"Вмъкване на нова страница при печат"},"pastetext":{"button":"Вмъкни като чист текст","title":"Вмъкни като чист текст"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Вмъкни от MS Word","toolbar":"Вмъкни от MS Word"},"preview":{"preview":"Преглед"},"print":{"toolbar":"Печат"},"removeformat":{"toolbar":"Премахване на форматирането"},"save":{"toolbar":"Запис"},"selectall":{"toolbar":"Избери всичко"},"showblocks":{"toolbar":"Показва блокове"},"sourcearea":{"toolbar":"Изходен код"},"specialchar":{"options":"Опции за специален знак","title":"Избор на специален знак","toolbar":"Вмъкване на специален знак"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Речници","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Стилове","panelTitle":"Стилове за форматиране","panelTitle1":"Блокови стилове","panelTitle2":"Вътрешни стилове","panelTitle3":"Обектни стилове"},"table":{"border":"Размер на рамката","caption":"Заглавие","cell":{"menu":"Клетка","insertBefore":"Вмъкване на клетка преди","insertAfter":"Вмъкване на клетка след","deleteCell":"Изтриване на клетки","merge":"Сливане на клетки","mergeRight":"Сливане в дясно","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Настройки на клетката","cellType":"Тип на клетката","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Авто. пренос","hAlign":"Хоризонтално подравняване","vAlign":"Вертикално подравняване","alignBaseline":"Базова линия","bgColor":"Фон","borderColor":"Цвят на рамката","data":"Данни","header":"Хедър","yes":"Да","no":"Не","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Изберете"},"cellPad":"Отделяне на клетките","cellSpace":"Разтояние между клетките","column":{"menu":"Колона","insertBefore":"Вмъкване на колона преди","insertAfter":"Вмъкване на колона след","deleteColumn":"Изтриване на колони"},"columns":"Колони","deleteTable":"Изтриване на таблица","headers":"Хедъри","headersBoth":"Заедно","headersColumn":"Първа колона","headersNone":"Няма","headersRow":"Първи ред","invalidBorder":"Размерът на рамката трябва да е число.","invalidCellPadding":"Отстоянието на клетките трябва да е позитивно число.","invalidCellSpacing":"Интервала в клетките трябва да е позитивно число.","invalidCols":"Броят колони трябва да е по-голям от 0.","invalidHeight":"Височината на таблицата трябва да е число.","invalidRows":"Броят редове трябва да е по-голям от 0.","invalidWidth":"Ширината на таблицата трябва да е число.","menu":"Настройки на таблицата","row":{"menu":"Ред","insertBefore":"Вмъкване на ред преди","insertAfter":"Вмъкване на ред след","deleteRow":"Изтриване на редове"},"rows":"Редове","summary":"Обща информация","title":"Настройки на таблицата","toolbar":"Таблица","widthPc":"процент","widthPx":"пиксела","widthUnit":"единица за ширина"},"undo":{"redo":"Връщане на предишен статус","undo":"Възтанови"},"wsc":{"btnIgnore":"Игнорирай","btnIgnoreAll":"Игнорирай всичко","btnReplace":"Препокриване","btnReplaceAll":"Препокрий всичко","btnUndo":"Възтанови","changeTo":"Промени на","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- Няма препоръчани -","notAvailable":"Съжаляваме, но услугата не е достъпна за момента","notInDic":"Не е в речника","oneChange":"Spell check complete: One word changed","progress":"Проверява се правописа...","title":"Проверка на правопис","toolbar":"Проверка на правопис"}};
\ No newline at end of file
+CKEDITOR.lang['bg']={"editor":"Текстов редактор за форматиран текст","editorPanel":"Панел на текстовия редактор","common":{"editorHelp":"натиснете ALT 0 за помощ","browseServer":"Избор от сървъра","url":"URL","protocol":"Протокол","upload":"Качване","uploadSubmit":"Изпращане към сървъра","image":"Снимка","flash":"Флаш","form":"Форма","checkbox":"Поле за избор","radio":"Радио бутон","textField":"Текстово поле","textarea":"Текстова зона","hiddenField":"Скрито поле","button":"Бутон","select":"Поле за избор","imageButton":"Бутон за снимка","notSet":"<не е избрано>","id":"ID","name":"Име","langDir":"Посока на езика","langDirLtr":"Ляво на дясно (ЛнД)","langDirRtl":"Дясно на ляво (ДнЛ)","langCode":"Код на езика","longDescr":"Уеб адрес за дълго описание","cssClass":"Класове за CSS","advisoryTitle":"Препоръчително заглавие","cssStyle":"Стил","ok":"ОК","cancel":"Отказ","close":"Затвори","preview":"Преглед","resize":"Влачете за да оразмерите","generalTab":"Общи","advancedTab":"Разширено","validateNumberFailed":"Тази стойност не е число","confirmNewPage":"Всички незапазени промени ще бъдат изгубени. Сигурни ли сте, че желаете да заредите нова страница?","confirmCancel":"Някои от опциите са променени. Сигурни ли сте, че желаете да затворите прозореца?","options":"Опции","target":"Цел","targetNew":"Нов прозорец (_blank)","targetTop":"Горна позиция (_top)","targetSelf":"Текущия прозорец (_self)","targetParent":"Основен прозорец (_parent)","langDirLTR":"Ляво на дясно (ЛнД)","langDirRTL":"Дясно на ляво (ДнЛ)","styles":"Стил","cssClasses":"Класове за CSS","width":"Ширина","height":"Височина","align":"Подравняване","alignLeft":"Ляво","alignRight":"Дясно","alignCenter":"Център","alignJustify":"Двустранно подравняване","alignTop":"Горе","alignMiddle":"По средата","alignBottom":"Долу","alignNone":"Без подравняване","invalidValue":"Невалидна стойност.","invalidHeight":"Височината трябва да е число.","invalidWidth":"Ширина требе да е число.","invalidCssLength":"Стойността на полето \"%1\" трябва да бъде положително число с или без валидна CSS измервателна единица (px, %, in, cm, mm, em, ex, pt, или pc).","invalidHtmlLength":"Стойността на полето \"%1\" трябва да бъде положително число с или без валидна HTML измервателна единица (px или %).","invalidInlineStyle":"Стойността на стилa трябва да съдържат една или повече двойки във формат \"name : value\", разделени с двоеточие.","cssLengthTooltip":"Въведете числена стойност в пиксели или друга валидна CSS единица (px, %, in, cm, mm, em, ex, pt, или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недостъпно</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Относно CKEditor","help":"Проверете $1 за помощ.","moreInfo":"За лицензионна информация моля посетете сайта ни:","title":"Относно CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Удебелен","italic":"Наклонен","strike":"Зачертан текст","subscript":"Индексиран текст","superscript":"Суперскрипт","underline":"Подчертан"},"bidi":{"ltr":"Посока на текста от ляво на дясно","rtl":"Посока на текста от дясно на ляво"},"blockquote":{"toolbar":"Блок за цитат"},"clipboard":{"copy":"Копирай","copyError":"Настройките за сигурност на вашия бразуър не разрешават на редактора да изпълни запаметяването. За целта използвайте клавиатурата (Ctrl/Cmd+C).","cut":"Отрежи","cutError":"Настройките за сигурност на Вашия браузър не позволяват на редактора автоматично да изъплни действията за отрязване. Моля ползвайте клавиатурните команди за целта (ctrl+x).","paste":"Вмъкни","pasteArea":"Зона за вмъкване","pasteMsg":"Вмъкнете тук съдъжанието с клавиатуарата (<STRONG>Ctrl/Cmd+V</STRONG>) и натиснете <STRONG>OK</STRONG>.","securityMsg":"Заради настройките за сигурност на Вашия браузър, редакторът не може да прочете данните от клипборда коректно.","title":"Вмъкни"},"button":{"selectedLabel":"%1 (Избрано)"},"colorbutton":{"auto":"Автоматично","bgColorTitle":"Фонов цвят","colors":{"000":"Черно","800000":"Кестеняво","8B4513":"Светлокафяво","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Индиго","696969":"Тъмно сиво","B22222":"Огнено червено","A52A2A":"Кафяво","DAA520":"Златисто","006400":"Тъмно зелено","40E0D0":"Тюркуазено","0000CD":"Средно синьо","800080":"Пурпурно","808080":"Сиво","F00":"Червено","FF8C00":"Тъмно оранжево","FFD700":"Златно","008000":"Зелено","0FF":"Светло синьо","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Още цветове","panelTitle":"Цветове","textColorTitle":"Цвят на шрифт"},"colordialog":{"clear":"Изчистване","highlight":"Осветяване","options":"Цветови опции","selected":"Изберете цвят","title":"Изберете цвят"},"templates":{"button":"Шаблони","emptyListMsg":"(Няма дефинирани шаблони)","insertOption":"Препокрива актуалното съдържание","options":"Опции за шаблона","selectPromptMsg":"Изберете шаблон <br>(текущото съдържание на редактора ще бъде загубено):","title":"Шаблони"},"contextmenu":{"options":"Опции на контекстното меню"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Препоръчително заглавие","cssClassInputLabel":"Класове за CSS","edit":"Промяна на Div","inlineStyleInputLabel":"В редица","langDirLTRLabel":"Ляво на Дясно (ЛнД)","langDirLabel":"Посока на езика","langDirRTLLabel":"Дясно на Ляво (ДнЛ)","languageCodeInputLabel":" Код на езика","remove":"Премахване на Div","styleSelectLabel":"Стил","title":"Създай Div блок","toolbar":"Създаване на Div контейнер"},"toolbar":{"toolbarCollapse":"Свиване на лентата с инструменти","toolbarExpand":"Разширяване на лентата с инструменти","toolbarGroups":{"document":"Документ","clipboard":"Клипборд/Отмяна","editing":"Промяна","forms":"Форми","basicstyles":"Базови стилове","paragraph":"Параграф","links":"Връзки","insert":"Вмъкване","styles":"Стилове","colors":"Цветове","tools":"Инструменти"},"toolbars":"Ленти с инструменти"},"elementspath":{"eleLabel":"Път за елементите","eleTitle":"%1 елемент"},"find":{"find":"Търсене","findOptions":"Find Options","findWhat":"Търси за:","matchCase":"Съвпадение","matchCyclic":"Циклично съвпадение","matchWord":"Съвпадение с дума","notFoundMsg":"Указаният текст не е намерен.","replace":"Препокриване","replaceAll":"Препокрий всички","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Препокрива с:","title":"Търсене и препокриване"},"fakeobjects":{"anchor":"Кука","flash":"Флаш анимация","hiddenfield":"Скрито поле","iframe":"IFrame","unknown":"Неизвестен обект"},"flash":{"access":"Достъп до скрипт","accessAlways":"Винаги","accessNever":"Никога","accessSameDomain":"Същият домейн","alignAbsBottom":"Най-долу","alignAbsMiddle":"Точно по средата","alignBaseline":"Базова линия","alignTextTop":"Върху текста","bgcolor":"Цвят на фона","chkFull":"Включи на цял екран","chkLoop":"Цикъл","chkMenu":"Разрешено Flash меню","chkPlay":"Авто. пускане","flashvars":"Променливи за Флаш","hSpace":"Хоризонтален отстъп","properties":"Настройки за флаш","propertiesTab":"Настройки","quality":"Качество","qualityAutoHigh":"Авто. високо","qualityAutoLow":"Авто. ниско","qualityBest":"Отлично","qualityHigh":"Високо","qualityLow":"Ниско","qualityMedium":"Средно","scale":"Оразмеряване","scaleAll":"Показва всичко","scaleFit":"Според мястото","scaleNoBorder":"Без рамка","title":"Настройки за флаш","vSpace":"Вертикален отстъп","validateHSpace":"HSpace трябва да е число.","validateSrc":"Уеб адреса не трябва да е празен.","validateVSpace":"VSpace трябва да е число.","windowMode":"Режим на прозореца","windowModeOpaque":"Плътност","windowModeTransparent":"Прозрачност","windowModeWindow":"Прозорец"},"font":{"fontSize":{"label":"Размер","voiceLabel":"Размер на шрифт","panelTitle":"Размер на шрифт"},"label":"Шрифт","panelTitle":"Име на шрифт","voiceLabel":"Шрифт"},"forms":{"button":{"title":"Настройки на бутона","text":"Текст (стойност)","type":"Тип","typeBtn":"Бутон","typeSbm":"Добави","typeRst":"Нулиране"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Настройки на радиобутон","value":"Стойност","selected":"Избрано","required":"Required"},"form":{"title":"Настройки на формата","menu":"Настройки на формата","action":"Действие","method":"Метод","encoding":"Кодиране"},"hidden":{"title":"Настройки за скрито поле","name":"Име","value":"Стойност"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Налични опции","value":"Стойност","size":"Размер","lines":"линии","chkMulti":"Allow multiple selections","required":"Required","opText":"Текст","opValue":"Стойност","btnAdd":"Добави","btnModify":"Промени","btnUp":"На горе","btnDown":"На долу","btnSetValue":"Set as selected value","btnDelete":"Изтриване"},"textarea":{"title":"Опции за текстовата зона","cols":"Колони","rows":"Редове"},"textfield":{"title":"Настройки за текстово поле","name":"Име","value":"Стойност","charWidth":"Ширина на знаците","maxChars":"Макс. знаци","required":"Required","type":"Тип","typeText":"Текст","typePass":"Парола","typeEmail":"Email","typeSearch":"Търсене","typeTel":"Телефонен номер","typeUrl":"Уеб адрес"}},"format":{"label":"Формат","panelTitle":"Формат","tag_address":"Адрес","tag_div":"Параграф (DIV)","tag_h1":"Заглавие 1","tag_h2":"Заглавие 2","tag_h3":"Заглавие 3","tag_h4":"Заглавие 4","tag_h5":"Заглавие 5","tag_h6":"Заглавие 6","tag_p":"Нормален","tag_pre":"Форматиран"},"horizontalrule":{"toolbar":"Вмъкване на хоризонтална линия"},"iframe":{"border":"Показва рамка на карето","noUrl":"Моля въведете URL за iFrame","scrolling":"Вкл. скролбаровете","title":"IFrame настройки","toolbar":"IFrame"},"image":{"alt":"Алтернативен текст","border":"Рамка","btnUpload":"Изпрати я на сървъра","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Хоризонтален отстъп","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Инфо за снимка","linkTab":"Връзка","lockRatio":"Заключване на съотношението","menu":"Настройки за снимка","resetSize":"Нулиране на размер","title":"Настройки за снимка","titleButton":"Настойки за бутон за снимка","upload":"Качване","urlMissing":"Image source URL is missing.","vSpace":"Вертикален отстъп","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Увеличаване на отстъпа","outdent":"Намаляване на отстъпа"},"smiley":{"options":"Опции за усмивката","title":"Вмъкване на усмивка","toolbar":"Усмивка"},"justify":{"block":"Двустранно подравняване","center":"Център","left":"Подравни в ляво","right":"Подравни в дясно"},"language":{"button":"Задай език","remove":"Премахни език"},"link":{"acccessKey":"Ключ за достъп","advanced":"Разширено","advisoryContentType":"Препоръчителен тип на съдържанието","advisoryTitle":"Препоръчително заглавие","anchor":{"toolbar":"Котва","menu":"Промяна на котва","title":"Настройки на котва","name":"Име на котва","errorName":"Моля въведете име на котвата","remove":"Премахване на котва"},"anchorId":"По ID на елемент","anchorName":"По име на котва","charset":"Тип на свързания ресурс","cssClasses":"Класове за CSS","download":"Force Download","displayText":"Display Text","emailAddress":"E-mail aдрес","emailBody":"Съдържание","emailSubject":"Тема","id":"ID","info":"Инфо за връзката","langCode":"Код за езика","langDir":"Посока на езика","langDirLTR":"Ляво на Дясно (ЛнД)","langDirRTL":"Дясно на Ляво (ДнЛ)","menu":"Промяна на връзка","name":"Име","noAnchors":"(Няма котви в текущия документ)","noEmail":"Моля въведете e-mail aдрес","noUrl":"Моля въведете URL адреса","other":"<друго>","popupDependent":"Зависимост (Netscape)","popupFeatures":"Функции на изкачащ прозорец","popupFullScreen":"Цял екран (IE)","popupLeft":"Лява позиция","popupLocationBar":"Лента с локацията","popupMenuBar":"Лента за меню","popupResizable":"Оразмеряем","popupScrollBars":"Скролери","popupStatusBar":"Статусна лента","popupToolbar":"Лента с инструменти","popupTop":"Горна позиция","rel":"Връзка","selectAnchor":"Изберете котва","styles":"Стил","tabIndex":"Ред на достъп","target":"Цел","targetFrame":"<frame>","targetFrameName":"Име на целевият прозорец","targetPopup":"<изкачащ прозорец>","targetPopupName":"Име на изкачащ прозорец","title":"Връзка","toAnchor":"Връзка към котва в текста","toEmail":"E-mail","toUrl":"Уеб адрес","toolbar":"Връзка","type":"Тип на връзката","unlink":"Премахни връзката","upload":"Качване"},"list":{"bulletedlist":"Вмъкване/Премахване на точков списък","numberedlist":"Вмъкване/Премахване на номериран списък"},"liststyle":{"armenian":"Арменско номериране","bulletedTitle":"Bulleted List Properties","circle":"Кръг","decimal":"Числа (1, 2, 3 и др.)","decimalLeadingZero":"Числа с водеща нула (01, 02, 03 и т.н.)","disc":"Диск","georgian":"Грузинско номериране (an, ban, gan, и т.н.)","lowerAlpha":"Малки букви (а, б, в, г, д и т.н.)","lowerGreek":"Малки гръцки букви (алфа, бета, гама и т.н.)","lowerRoman":"Малки римски числа (i, ii, iii, iv, v и т.н.)","none":"Няма","notset":"<не е указано>","numberedTitle":"Numbered List Properties","square":"Квадрат","start":"Старт","type":"Тип","upperAlpha":"Големи букви (А, Б, В, Г, Д и т.н.)","upperRoman":"Големи римски числа (I, II, III, IV, V и т.н.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Вмъкнете параграф тук"},"maximize":{"maximize":"Максимизиране","minimize":"Минимизиране"},"newpage":{"toolbar":"Нова страница"},"pagebreak":{"alt":"Разделяне на страници","toolbar":"Вмъкване на нова страница при печат"},"pastetext":{"button":"Вмъкни като чист текст","title":"Вмъкни като чист текст"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Вмъкни от MS Word","toolbar":"Вмъкни от MS Word"},"preview":{"preview":"Преглед"},"print":{"toolbar":"Печат"},"removeformat":{"toolbar":"Премахване на форматирането"},"save":{"toolbar":"Запис"},"selectall":{"toolbar":"Избери всичко"},"showblocks":{"toolbar":"Показва блокове"},"sourcearea":{"toolbar":"Изходен код"},"specialchar":{"options":"Опции за специален знак","title":"Избор на специален знак","toolbar":"Вмъкване на специален знак"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Речници","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Стилове","panelTitle":"Стилове за форматиране","panelTitle1":"Блокови стилове","panelTitle2":"Вътрешни стилове","panelTitle3":"Обектни стилове"},"table":{"border":"Размер на рамката","caption":"Заглавие","cell":{"menu":"Клетка","insertBefore":"Вмъкване на клетка преди","insertAfter":"Вмъкване на клетка след","deleteCell":"Изтриване на клетки","merge":"Сливане на клетки","mergeRight":"Сливане в дясно","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Настройки на клетката","cellType":"Тип на клетката","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Авто. пренос","hAlign":"Хоризонтално подравняване","vAlign":"Вертикално подравняване","alignBaseline":"Базова линия","bgColor":"Фон","borderColor":"Цвят на рамката","data":"Данни","header":"Хедър","yes":"Да","no":"Не","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Изберете"},"cellPad":"Отделяне на клетките","cellSpace":"Разтояние между клетките","column":{"menu":"Колона","insertBefore":"Вмъкване на колона преди","insertAfter":"Вмъкване на колона след","deleteColumn":"Изтриване на колони"},"columns":"Колони","deleteTable":"Изтриване на таблица","headers":"Хедъри","headersBoth":"Заедно","headersColumn":"Първа колона","headersNone":"Няма","headersRow":"Първи ред","invalidBorder":"Размерът на рамката трябва да е число.","invalidCellPadding":"Отстоянието на клетките трябва да е позитивно число.","invalidCellSpacing":"Интервала в клетките трябва да е позитивно число.","invalidCols":"Броят колони трябва да е по-голям от 0.","invalidHeight":"Височината на таблицата трябва да е число.","invalidRows":"Броят редове трябва да е по-голям от 0.","invalidWidth":"Ширината на таблицата трябва да е число.","menu":"Настройки на таблицата","row":{"menu":"Ред","insertBefore":"Вмъкване на ред преди","insertAfter":"Вмъкване на ред след","deleteRow":"Изтриване на редове"},"rows":"Редове","summary":"Обща информация","title":"Настройки на таблицата","toolbar":"Таблица","widthPc":"процент","widthPx":"пиксела","widthUnit":"единица за ширина"},"undo":{"redo":"Връщане на предишен статус","undo":"Възтанови"},"wsc":{"btnIgnore":"Игнорирай","btnIgnoreAll":"Игнорирай всичко","btnReplace":"Препокриване","btnReplaceAll":"Препокрий всичко","btnUndo":"Възтанови","changeTo":"Промени на","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- Няма препоръчани -","notAvailable":"Съжаляваме, но услугата не е достъпна за момента","notInDic":"Не е в речника","oneChange":"Spell check complete: One word changed","progress":"Проверява се правописа...","title":"Проверка на правопис","toolbar":"Проверка на правопис"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/lang/bn.js
index 7a8c912c995..5eedb6a95b8 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/bn.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/bn.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['bn']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"ব্রাউজ সার্ভার","url":"URL","protocol":"প্রোটোকল","upload":"আপলোড","uploadSubmit":"ইহাকে সার্ভারে প্রেরন কর","image":"ছবির লেবেল যুক্ত কর","flash":"ফ্লাশ লেবেল যুক্ত কর","form":"ফর্ম","checkbox":"চেক বাক্স","radio":"রেডিও বাটন","textField":"টেক্সট ফীল্ড","textarea":"টেক্সট এরিয়া","hiddenField":"গুপ্ত ফীল্ড","button":"বাটন","select":"বাছাই ফীল্ড","imageButton":"ছবির বাটন","notSet":"<সেট নেই>","id":"আইডি","name":"নাম","langDir":"ভাষা লেখার দিক","langDirLtr":"বাম থেকে ডান (LTR)","langDirRtl":"ডান থেকে বাম (RTL)","langCode":"ভাষা কোড","longDescr":"URL এর লম্বা বর্ণনা","cssClass":"স্টাইল-শীট ক্লাস","advisoryTitle":"পরামর্শ শীর্ষক","cssStyle":"স্টাইল","ok":"ওকে","cancel":"বাতিল","close":"Close","preview":"প্রিভিউ","resize":"Resize","generalTab":"General","advancedTab":"এডভান্সড","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"টার্গেট","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"বাম থেকে ডান (LTR)","langDirRTL":"ডান থেকে বাম (RTL)","styles":"স্টাইল","cssClasses":"স্টাইল-শীট ক্লাস","width":"প্রস্থ","height":"দৈর্ঘ্য","align":"এলাইন","alignLeft":"বামে","alignRight":"ডানে","alignCenter":"মাঝখানে","alignJustify":"ব্লক জাস্টিফাই","alignTop":"উপর","alignMiddle":"মধ্য","alignBottom":"নীচে","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"বোল্ড","italic":"বাঁকা","strike":"স্ট্রাইক থ্রু","subscript":"অধোলেখ","superscript":"অভিলেখ","underline":"আন্ডারলাইন"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"কপি","copyError":"আপনার ব্রাউজারের নিরাপত্তা সেটিংসমূহ এডিটরকে স্বয়ংক্রিয়ভাবে কপি করার প্রক্রিয়া চালনা করার অনুমতি দেয় না। অনুগ্রহপূর্বক এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+C)।","cut":"কাট","cutError":"আপনার ব্রাউজারের সুরক্ষা সেটিংস এডিটরকে অটোমেটিক কাট করার অনুমতি দেয়নি। দয়া করে এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+X)।","paste":"পেস্ট","pasteArea":"Paste Area","pasteMsg":"অনুগ্রহ করে নীচের বাক্সে কিবোর্ড ব্যবহার করে (<STRONG>Ctrl/Cmd+V</STRONG>) পেস্ট করুন এবং <STRONG>OK</STRONG> চাপ দিন","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"পেস্ট"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"স্বয়ংক্রিয়ভাবে","bgColorTitle":"পৃষ্ঠতলের রং","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"আরও রং...","panelTitle":"Colors","textColorTitle":"টেক্স্ট রং"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"টেমপ্লেট","emptyListMsg":"(কোন টেমপ্লেট ডিফাইন করা নেই)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"অনুগ্রহ করে এডিটরে ওপেন করার জন্য টেমপ্লেট বাছাই করুন<br>(আসল কনটেন্ট হারিয়ে যাবে):","title":"কনটেন্ট টেমপ্লেট"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"খুজিঁ","findOptions":"Find Options","findWhat":"যা খুঁজতে হবে:","matchCase":"কেস মিলাও","matchCyclic":"Match cyclic","matchWord":"পুরা শব্দ মেলাও","notFoundMsg":"আপনার উল্লেখিত টেকস্ট পাওয়া যায়নি","replace":"রিপ্লেস","replaceAll":"সব বদলে দাও","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"যার সাথে বদলাতে হবে:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs নীচে","alignAbsMiddle":"Abs উপর","alignBaseline":"মূল রেখা","alignTextTop":"টেক্সট উপর","bgcolor":"পৃষ্ঠতলের রং","chkFull":"Allow Fullscreen","chkLoop":"লূপ","chkMenu":"ফ্ল্যাশ মেনু এনাবল কর","chkPlay":"অটো প্লে","flashvars":"Variables for Flash","hSpace":"হরাইজন্টাল স্পেস","properties":"ফ্লাশ প্রোপার্টি","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"স্কেল","scaleAll":"সব দেখাও","scaleFit":"নিখুঁত ফিট","scaleNoBorder":"কোনো বর্ডার নেই","title":"ফ্ল্যাশ প্রোপার্টি","vSpace":"ভার্টিকেল স্পেস","validateHSpace":"HSpace must be a number.","validateSrc":"অনুগ্রহ করে URL লিংক টাইপ করুন","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"সাইজ","voiceLabel":"Font Size","panelTitle":"সাইজ"},"label":"ফন্ট","panelTitle":"ফন্ট","voiceLabel":"ফন্ট"},"forms":{"button":{"title":"বাটন সম্বন্ধীয়","text":"টেক্সট (ভ্যালু)","type":"প্রকার","typeBtn":"বাটন","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"চেক বক্স প্রোপার্টি","radioTitle":"রেডিও বাটন সম্বন্ধীয়","value":"ভ্যালু","selected":"সিলেক্টেড","required":"Required"},"form":{"title":"ফর্ম প্রোপার্টি","menu":"ফর্ম প্রোপার্টি","action":"একশ্যন","method":"পদ্ধতি","encoding":"Encoding"},"hidden":{"title":"গুপ্ত ফীল্ড প্রোপার্টি","name":"নাম","value":"ভ্যালু"},"select":{"title":"বাছাই ফীল্ড প্রোপার্টি","selectInfo":"তথ্য","opAvail":"অন্যান্য বিকল্প","value":"ভ্যালু","size":"সাইজ","lines":"লাইন সমূহ","chkMulti":"একাধিক সিলেকশন এলাউ কর","required":"Required","opText":"টেক্সট","opValue":"ভ্যালু","btnAdd":"যুক্ত","btnModify":"বদলে দাও","btnUp":"উপর","btnDown":"নীচে","btnSetValue":"বাছাই করা ভ্যালু হিসেবে সেট কর","btnDelete":"ডিলীট"},"textarea":{"title":"টেক্সট এরিয়া প্রোপার্টি","cols":"কলাম","rows":"রো"},"textfield":{"title":"টেক্সট ফীল্ড প্রোপার্টি","name":"নাম","value":"ভ্যালু","charWidth":"ক্যারেক্টার প্রশস্ততা","maxChars":"সর্বাধিক ক্যারেক্টার","required":"Required","type":"টাইপ","typeText":"টেক্সট","typePass":"পাসওয়ার্ড","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"ধরন-প্রকৃতি","panelTitle":"ফন্ট ফরমেট","tag_address":"ঠিকানা","tag_div":"শীর্ষক (DIV)","tag_h1":"শীর্ষক ১","tag_h2":"শীর্ষক ২","tag_h3":"শীর্ষক ৩","tag_h4":"শীর্ষক ৪","tag_h5":"শীর্ষক ৫","tag_h6":"শীর্ষক ৬","tag_p":"সাধারণ","tag_pre":"ফর্মেটেড"},"horizontalrule":{"toolbar":"অনুভূমিক লাইন যোগ করি"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"বিকল্প টেক্সট","border":"বর্ডার","btnUpload":"ইহাকে সার্ভারে প্রেরন কর","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"হরাইজন্টাল স্পেস","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"ছবির তথ্য","linkTab":"লিংক","lockRatio":"অনুপাত লক কর","menu":"ছবির প্রোপার্টি","resetSize":"সাইজ পূর্বাবস্থায় ফিরিয়ে দাও","title":"ছবির প্রোপার্টি","titleButton":"ছবির বাটন সম্বন্ধীয়","upload":"আপলোড","urlMissing":"Image source URL is missing.","vSpace":"ভার্টিকেল স্পেস","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"ইনডেন্ট বাড়াই","outdent":"ইনডেন্ট কমাও"},"smiley":{"options":"Smiley Options","title":"স্মাইলী যুক্ত কর","toolbar":"স্মাইলী"},"justify":{"block":"যাচাই করি","center":"মাঝ বরাবর ঘেষা","left":"বা দিকে ঘেঁষা","right":"ডান দিকে ঘেঁষা"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"প্রবেশ কী","advanced":"এডভান্সড","advisoryContentType":"পরামর্শ কন্টেন্টের প্রকার","advisoryTitle":"পরামর্শ শীর্ষক","anchor":{"toolbar":"নোঙ্গর","menu":"নোঙর প্রোপার্টি","title":"নোঙর প্রোপার্টি","name":"নোঙরের নাম","errorName":"নোঙরের নাম টাইপ করুন","remove":"Remove Anchor"},"anchorId":"নোঙরের আইডি দিয়ে","anchorName":"নোঙরের নাম দিয়ে","charset":"লিংক রিসোর্স ক্যারেক্টর সেট","cssClasses":"স্টাইল-শীট ক্লাস","emailAddress":"ইমেইল ঠিকানা","emailBody":"মেসেজের দেহ","emailSubject":"মেসেজের বিষয়","id":"আইডি","info":"লিংক তথ্য","langCode":"ভাষা লেখার দিক","langDir":"ভাষা লেখার দিক","langDirLTR":"বাম থেকে ডান (LTR)","langDirRTL":"ডান থেকে বাম (RTL)","menu":"লিংক সম্পাদন","name":"নাম","noAnchors":"(No anchors available in the document)","noEmail":"অনুগ্রহ করে ইমেইল এড্রেস টাইপ করুন","noUrl":"অনুগ্রহ করে URL লিংক টাইপ করুন","other":"<other>","popupDependent":"ডিপেন্ডেন্ট (Netscape)","popupFeatures":"পপআপ উইন্ডো ফীচার সমূহ","popupFullScreen":"পূর্ণ পর্দা জুড়ে (IE)","popupLeft":"বামের পজিশন","popupLocationBar":"লোকেশন বার","popupMenuBar":"মেন্যু বার","popupResizable":"Resizable","popupScrollBars":"স্ক্রল বার","popupStatusBar":"স্ট্যাটাস বার","popupToolbar":"টুল বার","popupTop":"ডানের পজিশন","rel":"Relationship","selectAnchor":"নোঙর বাছাই","styles":"স্টাইল","tabIndex":"ট্যাব ইন্ডেক্স","target":"টার্গেট","targetFrame":"<ফ্রেম>","targetFrameName":"টার্গেট ফ্রেমের নাম","targetPopup":"<পপআপ উইন্ডো>","targetPopupName":"পপআপ উইন্ডোর নাম","title":"লিংক","toAnchor":"এই পেজে নোঙর কর","toEmail":"ইমেইল","toUrl":"URL","toolbar":"লিংক যুক্ত কর","type":"লিংক প্রকার","unlink":"লিংক সরাও","upload":"আপলোড"},"list":{"bulletedlist":"বুলেটেড তালিকা প্রবেশ/অপসারন করি","numberedlist":"সাংখ্যিক লিস্টের লেবেল"},"liststyle":{"armenian":"আর্মেনিয়ান সংখ্যাক্রমে বিন্যাস","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"নতুন পৃষ্ঠা"},"pagebreak":{"alt":"Page Break","toolbar":"পেজ ব্রেক"},"pastetext":{"button":"সাধারণ টেক্সট হিসেবে পেইস্ট করি","title":"সাদা টেক্সট হিসেবে পেস্ট কর"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"পেস্ট (শব্দ)","toolbar":"পেস্ট (শব্দ)"},"preview":{"preview":"প্রাকদর্শন"},"print":{"toolbar":"প্রিন্ট করি"},"removeformat":{"toolbar":"ধরন-প্রকৃতি অপসারণ করি"},"save":{"toolbar":"সংরক্ষন করি"},"selectall":{"toolbar":"সব সিলেক্ট করি"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"উৎস"},"specialchar":{"options":"Special Character Options","title":"বিশেষ ক্যারেক্টার বাছাই কর","toolbar":"বিশেষ অক্ষর যুক্ত কর"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"ধরন","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"বর্ডারের সাইজ","caption":"শীর্ষক","cell":{"menu":"সেল","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"সেল মুছে দাও","merge":"সেল জোড়া দাও","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"পৃষ্ঠতলের রং","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"সেল প্যাডিং","cellSpace":"সেল স্পেস","column":{"menu":"কলাম","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"কলাম মুছে দাও"},"columns":"কলাম","deleteTable":"টেবিল ডিলীট কর","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"টেবিল প্রোপার্টি","row":{"menu":"রো","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"রো মুছে দাও"},"rows":"রো","summary":"সারাংশ","title":"টেবিল প্রোপার্টি","toolbar":"টেবিলের লেবেল যুক্ত কর","widthPc":"শতকরা","widthPx":"পিক্সেল","widthUnit":"width unit"},"undo":{"redo":"পুনরায়  করি","undo":"আনডু"},"wsc":{"btnIgnore":"ইগনোর কর","btnIgnoreAll":"সব ইগনোর কর","btnReplace":"বদলে দাও","btnReplaceAll":"সব বদলে দাও","btnUndo":"আন্ডু","changeTo":"এতে বদলাও","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"বানান পরীক্ষক ইনস্টল করা নেই। আপনি কি এখনই এটা ডাউনলোড করতে চান?","manyChanges":"বানান পরীক্ষা শেষ: %1 গুলো শব্দ বদলে গ্যাছে","noChanges":"বানান পরীক্ষা শেষ: কোন শব্দ পরিবর্তন করা হয়নি","noMispell":"বানান পরীক্ষা শেষ: কোন ভুল বানান পাওয়া যায়নি","noSuggestions":"- কোন সাজেশন নেই -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"শব্দকোষে নেই","oneChange":"বানান পরীক্ষা শেষ: একটি মাত্র শব্দ পরিবর্তন করা হয়েছে","progress":"বানান পরীক্ষা চলছে...","title":"Spell Checker","toolbar":"বানান চেক"}};
\ No newline at end of file
+CKEDITOR.lang['bn']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"ব্রাউজ সার্ভার","url":"URL","protocol":"প্রোটোকল","upload":"আপলোড","uploadSubmit":"ইহাকে সার্ভারে প্রেরন কর","image":"ছবির লেবেল যুক্ত কর","flash":"ফ্লাশ লেবেল যুক্ত কর","form":"ফর্ম","checkbox":"চেক বাক্স","radio":"রেডিও বাটন","textField":"টেক্সট ফীল্ড","textarea":"টেক্সট এরিয়া","hiddenField":"গুপ্ত ফীল্ড","button":"বাটন","select":"বাছাই ফীল্ড","imageButton":"ছবির বাটন","notSet":"<সেট নেই>","id":"আইডি","name":"নাম","langDir":"ভাষা লেখার দিক","langDirLtr":"বাম থেকে ডান (LTR)","langDirRtl":"ডান থেকে বাম (RTL)","langCode":"ভাষা কোড","longDescr":"URL এর লম্বা বর্ণনা","cssClass":"স্টাইল-শীট ক্লাস","advisoryTitle":"পরামর্শ শীর্ষক","cssStyle":"স্টাইল","ok":"ওকে","cancel":"বাতিল","close":"Close","preview":"প্রিভিউ","resize":"Resize","generalTab":"General","advancedTab":"এডভান্সড","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"টার্গেট","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"বাম থেকে ডান (LTR)","langDirRTL":"ডান থেকে বাম (RTL)","styles":"স্টাইল","cssClasses":"স্টাইল-শীট ক্লাস","width":"প্রস্থ","height":"দৈর্ঘ্য","align":"এলাইন","alignLeft":"বামে","alignRight":"ডানে","alignCenter":"মাঝখানে","alignJustify":"ব্লক জাস্টিফাই","alignTop":"উপর","alignMiddle":"মধ্য","alignBottom":"নীচে","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"বোল্ড","italic":"বাঁকা","strike":"স্ট্রাইক থ্রু","subscript":"অধোলেখ","superscript":"অভিলেখ","underline":"আন্ডারলাইন"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"কপি","copyError":"আপনার ব্রাউজারের নিরাপত্তা সেটিংসমূহ এডিটরকে স্বয়ংক্রিয়ভাবে কপি করার প্রক্রিয়া চালনা করার অনুমতি দেয় না। অনুগ্রহপূর্বক এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+C)।","cut":"কাট","cutError":"আপনার ব্রাউজারের সুরক্ষা সেটিংস এডিটরকে অটোমেটিক কাট করার অনুমতি দেয়নি। দয়া করে এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+X)।","paste":"পেস্ট","pasteArea":"Paste Area","pasteMsg":"অনুগ্রহ করে নীচের বাক্সে কিবোর্ড ব্যবহার করে (<STRONG>Ctrl/Cmd+V</STRONG>) পেস্ট করুন এবং <STRONG>OK</STRONG> চাপ দিন","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"পেস্ট"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"স্বয়ংক্রিয়ভাবে","bgColorTitle":"পৃষ্ঠতলের রং","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"আরও রং...","panelTitle":"Colors","textColorTitle":"টেক্স্ট রং"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"টেমপ্লেট","emptyListMsg":"(কোন টেমপ্লেট ডিফাইন করা নেই)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"অনুগ্রহ করে এডিটরে ওপেন করার জন্য টেমপ্লেট বাছাই করুন<br>(আসল কনটেন্ট হারিয়ে যাবে):","title":"কনটেন্ট টেমপ্লেট"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"খুজিঁ","findOptions":"Find Options","findWhat":"যা খুঁজতে হবে:","matchCase":"কেস মিলাও","matchCyclic":"Match cyclic","matchWord":"পুরা শব্দ মেলাও","notFoundMsg":"আপনার উল্লেখিত টেকস্ট পাওয়া যায়নি","replace":"রিপ্লেস","replaceAll":"সব বদলে দাও","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"যার সাথে বদলাতে হবে:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs নীচে","alignAbsMiddle":"Abs উপর","alignBaseline":"মূল রেখা","alignTextTop":"টেক্সট উপর","bgcolor":"পৃষ্ঠতলের রং","chkFull":"Allow Fullscreen","chkLoop":"লূপ","chkMenu":"ফ্ল্যাশ মেনু এনাবল কর","chkPlay":"অটো প্লে","flashvars":"Variables for Flash","hSpace":"হরাইজন্টাল স্পেস","properties":"ফ্লাশ প্রোপার্টি","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"স্কেল","scaleAll":"সব দেখাও","scaleFit":"নিখুঁত ফিট","scaleNoBorder":"কোনো বর্ডার নেই","title":"ফ্ল্যাশ প্রোপার্টি","vSpace":"ভার্টিকেল স্পেস","validateHSpace":"HSpace must be a number.","validateSrc":"অনুগ্রহ করে URL লিংক টাইপ করুন","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"সাইজ","voiceLabel":"Font Size","panelTitle":"সাইজ"},"label":"ফন্ট","panelTitle":"ফন্ট","voiceLabel":"ফন্ট"},"forms":{"button":{"title":"বাটন সম্বন্ধীয়","text":"টেক্সট (ভ্যালু)","type":"প্রকার","typeBtn":"বাটন","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"চেক বক্স প্রোপার্টি","radioTitle":"রেডিও বাটন সম্বন্ধীয়","value":"ভ্যালু","selected":"সিলেক্টেড","required":"Required"},"form":{"title":"ফর্ম প্রোপার্টি","menu":"ফর্ম প্রোপার্টি","action":"একশ্যন","method":"পদ্ধতি","encoding":"Encoding"},"hidden":{"title":"গুপ্ত ফীল্ড প্রোপার্টি","name":"নাম","value":"ভ্যালু"},"select":{"title":"বাছাই ফীল্ড প্রোপার্টি","selectInfo":"তথ্য","opAvail":"অন্যান্য বিকল্প","value":"ভ্যালু","size":"সাইজ","lines":"লাইন সমূহ","chkMulti":"একাধিক সিলেকশন এলাউ কর","required":"Required","opText":"টেক্সট","opValue":"ভ্যালু","btnAdd":"যুক্ত","btnModify":"বদলে দাও","btnUp":"উপর","btnDown":"নীচে","btnSetValue":"বাছাই করা ভ্যালু হিসেবে সেট কর","btnDelete":"ডিলীট"},"textarea":{"title":"টেক্সট এরিয়া প্রোপার্টি","cols":"কলাম","rows":"রো"},"textfield":{"title":"টেক্সট ফীল্ড প্রোপার্টি","name":"নাম","value":"ভ্যালু","charWidth":"ক্যারেক্টার প্রশস্ততা","maxChars":"সর্বাধিক ক্যারেক্টার","required":"Required","type":"টাইপ","typeText":"টেক্সট","typePass":"পাসওয়ার্ড","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"ধরন-প্রকৃতি","panelTitle":"ফন্ট ফরমেট","tag_address":"ঠিকানা","tag_div":"শীর্ষক (DIV)","tag_h1":"শীর্ষক ১","tag_h2":"শীর্ষক ২","tag_h3":"শীর্ষক ৩","tag_h4":"শীর্ষক ৪","tag_h5":"শীর্ষক ৫","tag_h6":"শীর্ষক ৬","tag_p":"সাধারণ","tag_pre":"ফর্মেটেড"},"horizontalrule":{"toolbar":"অনুভূমিক লাইন যোগ করি"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"বিকল্প টেক্সট","border":"বর্ডার","btnUpload":"ইহাকে সার্ভারে প্রেরন কর","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"হরাইজন্টাল স্পেস","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"ছবির তথ্য","linkTab":"লিংক","lockRatio":"অনুপাত লক কর","menu":"ছবির প্রোপার্টি","resetSize":"সাইজ পূর্বাবস্থায় ফিরিয়ে দাও","title":"ছবির প্রোপার্টি","titleButton":"ছবির বাটন সম্বন্ধীয়","upload":"আপলোড","urlMissing":"Image source URL is missing.","vSpace":"ভার্টিকেল স্পেস","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"ইনডেন্ট বাড়াই","outdent":"ইনডেন্ট কমাও"},"smiley":{"options":"Smiley Options","title":"স্মাইলী যুক্ত কর","toolbar":"স্মাইলী"},"justify":{"block":"যাচাই করি","center":"মাঝ বরাবর ঘেষা","left":"বা দিকে ঘেঁষা","right":"ডান দিকে ঘেঁষা"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"প্রবেশ কী","advanced":"এডভান্সড","advisoryContentType":"পরামর্শ কন্টেন্টের প্রকার","advisoryTitle":"পরামর্শ শীর্ষক","anchor":{"toolbar":"নোঙ্গর","menu":"নোঙর প্রোপার্টি","title":"নোঙর প্রোপার্টি","name":"নোঙরের নাম","errorName":"নোঙরের নাম টাইপ করুন","remove":"Remove Anchor"},"anchorId":"নোঙরের আইডি দিয়ে","anchorName":"নোঙরের নাম দিয়ে","charset":"লিংক রিসোর্স ক্যারেক্টর সেট","cssClasses":"স্টাইল-শীট ক্লাস","download":"Force Download","displayText":"Display Text","emailAddress":"ইমেইল ঠিকানা","emailBody":"মেসেজের দেহ","emailSubject":"মেসেজের বিষয়","id":"আইডি","info":"লিংক তথ্য","langCode":"ভাষা লেখার দিক","langDir":"ভাষা লেখার দিক","langDirLTR":"বাম থেকে ডান (LTR)","langDirRTL":"ডান থেকে বাম (RTL)","menu":"লিংক সম্পাদন","name":"নাম","noAnchors":"(No anchors available in the document)","noEmail":"অনুগ্রহ করে ইমেইল এড্রেস টাইপ করুন","noUrl":"অনুগ্রহ করে URL লিংক টাইপ করুন","other":"<other>","popupDependent":"ডিপেন্ডেন্ট (Netscape)","popupFeatures":"পপআপ উইন্ডো ফীচার সমূহ","popupFullScreen":"পূর্ণ পর্দা জুড়ে (IE)","popupLeft":"বামের পজিশন","popupLocationBar":"লোকেশন বার","popupMenuBar":"মেন্যু বার","popupResizable":"Resizable","popupScrollBars":"স্ক্রল বার","popupStatusBar":"স্ট্যাটাস বার","popupToolbar":"টুল বার","popupTop":"ডানের পজিশন","rel":"Relationship","selectAnchor":"নোঙর বাছাই","styles":"স্টাইল","tabIndex":"ট্যাব ইন্ডেক্স","target":"টার্গেট","targetFrame":"<ফ্রেম>","targetFrameName":"টার্গেট ফ্রেমের নাম","targetPopup":"<পপআপ উইন্ডো>","targetPopupName":"পপআপ উইন্ডোর নাম","title":"লিংক","toAnchor":"এই পেজে নোঙর কর","toEmail":"ইমেইল","toUrl":"URL","toolbar":"লিংক যুক্ত কর","type":"লিংক প্রকার","unlink":"লিংক সরাও","upload":"আপলোড"},"list":{"bulletedlist":"বুলেটেড তালিকা প্রবেশ/অপসারন করি","numberedlist":"সাংখ্যিক লিস্টের লেবেল"},"liststyle":{"armenian":"আর্মেনিয়ান সংখ্যাক্রমে বিন্যাস","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"নতুন পৃষ্ঠা"},"pagebreak":{"alt":"Page Break","toolbar":"পেজ ব্রেক"},"pastetext":{"button":"সাধারণ টেক্সট হিসেবে পেইস্ট করি","title":"সাদা টেক্সট হিসেবে পেস্ট কর"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"পেস্ট (শব্দ)","toolbar":"পেস্ট (শব্দ)"},"preview":{"preview":"প্রাকদর্শন"},"print":{"toolbar":"প্রিন্ট করি"},"removeformat":{"toolbar":"ধরন-প্রকৃতি অপসারণ করি"},"save":{"toolbar":"সংরক্ষন করি"},"selectall":{"toolbar":"সব সিলেক্ট করি"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"উৎস"},"specialchar":{"options":"Special Character Options","title":"বিশেষ ক্যারেক্টার বাছাই কর","toolbar":"বিশেষ অক্ষর যুক্ত কর"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"ধরন","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"বর্ডারের সাইজ","caption":"শীর্ষক","cell":{"menu":"সেল","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"সেল মুছে দাও","merge":"সেল জোড়া দাও","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"পৃষ্ঠতলের রং","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"সেল প্যাডিং","cellSpace":"সেল স্পেস","column":{"menu":"কলাম","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"কলাম মুছে দাও"},"columns":"কলাম","deleteTable":"টেবিল ডিলীট কর","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"টেবিল প্রোপার্টি","row":{"menu":"রো","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"রো মুছে দাও"},"rows":"রো","summary":"সারাংশ","title":"টেবিল প্রোপার্টি","toolbar":"টেবিলের লেবেল যুক্ত কর","widthPc":"শতকরা","widthPx":"পিক্সেল","widthUnit":"width unit"},"undo":{"redo":"পুনরায়  করি","undo":"আনডু"},"wsc":{"btnIgnore":"ইগনোর কর","btnIgnoreAll":"সব ইগনোর কর","btnReplace":"বদলে দাও","btnReplaceAll":"সব বদলে দাও","btnUndo":"আন্ডু","changeTo":"এতে বদলাও","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"বানান পরীক্ষক ইনস্টল করা নেই। আপনি কি এখনই এটা ডাউনলোড করতে চান?","manyChanges":"বানান পরীক্ষা শেষ: %1 গুলো শব্দ বদলে গ্যাছে","noChanges":"বানান পরীক্ষা শেষ: কোন শব্দ পরিবর্তন করা হয়নি","noMispell":"বানান পরীক্ষা শেষ: কোন ভুল বানান পাওয়া যায়নি","noSuggestions":"- কোন সাজেশন নেই -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"শব্দকোষে নেই","oneChange":"বানান পরীক্ষা শেষ: একটি মাত্র শব্দ পরিবর্তন করা হয়েছে","progress":"বানান পরীক্ষা চলছে...","title":"Spell Checker","toolbar":"বানান চেক"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/lang/bs.js
index 66d4d13c181..cbcb0033eff 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/bs.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/bs.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['bs']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Šalji","uploadSubmit":"Šalji na server","image":"Slika","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije podešeno>","id":"Id","name":"Naziv","langDir":"Smjer pisanja","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Jezièni kôd","longDescr":"Dugaèki opis URL-a","cssClass":"Klase CSS stilova","advisoryTitle":"Advisory title","cssStyle":"Stil","ok":"OK","cancel":"Odustani","close":"Close","preview":"Prikaži","resize":"Resize","generalTab":"General","advancedTab":"Naprednije","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Prozor","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase CSS stilova","width":"Širina","height":"Visina","align":"Poravnanje","alignLeft":"Lijevo","alignRight":"Desno","alignCenter":"Centar","alignJustify":"Puno poravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dno","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Boldiraj","italic":"Ukosi","strike":"Precrtaj","subscript":"Subscript","superscript":"Superscript","underline":"Podvuci"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživaèa ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke vašeg pretraživaèa ne dozvoljavaju operacije automatskog rezanja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+X).","paste":"Zalijepi","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Zalijepi"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatska","bgColorTitle":"Boja pozadine","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"Više boja...","panelTitle":"Colors","textColorTitle":"Boja teksta"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory title","cssClassInputLabel":"Klase CSS stilova","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"S lijeva na desno (LTR)","langDirLabel":"Smjer pisanja","langDirRTLLabel":"S desna na lijevo (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Stil","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Naði","findOptions":"Find Options","findWhat":"Naði šta:","matchCase":"Uporeðuj velika/mala slova","matchCyclic":"Match cyclic","matchWord":"Uporeðuj samo cijelu rijeè","notFoundMsg":"Traženi tekst nije pronaðen.","replace":"Zamjeni","replaceAll":"Zamjeni sve","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Zamjeni sa:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs dole","alignAbsMiddle":"Abs sredina","alignBaseline":"Bazno","alignTextTop":"Vrh teksta","bgcolor":"Boja pozadine","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"Molimo ukucajte URL link","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Velièina","voiceLabel":"Font Size","panelTitle":"Velièina"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Ubaci horizontalnu liniju"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Tekst na slici","border":"Okvir","btnUpload":"Šalji na server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Info slike","linkTab":"Link","lockRatio":"Zakljuèaj odnos","menu":"Svojstva slike","resetSize":"Resetuj dimenzije","title":"Svojstva slike","titleButton":"Image Button Properties","upload":"Šalji","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Poveæaj uvod","outdent":"Smanji uvod"},"smiley":{"options":"Smiley Options","title":"Ubaci smješka","toolbar":"Smješko"},"justify":{"block":"Puno poravnanje","center":"Centralno poravnanje","left":"Lijevo poravnanje","right":"Desno poravnanje"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Pristupna tipka","advanced":"Naprednije","advisoryContentType":"Advisory vrsta sadržaja","advisoryTitle":"Advisory title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"Po Id-u elementa","anchorName":"Po nazivu sidra","charset":"Linked Resource Charset","cssClasses":"Klase CSS stilova","emailAddress":"E-Mail Adresa","emailBody":"Poruka","emailSubject":"Subjekt poruke","id":"Id","info":"Link info","langCode":"Smjer pisanja","langDir":"Smjer pisanja","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","menu":"Izmjeni link","name":"Naziv","noAnchors":"(Nema dostupnih sidra na stranici)","noEmail":"Molimo ukucajte e-mail adresu","noUrl":"Molimo ukucajte URL link","other":"<other>","popupDependent":"Ovisno (Netscape)","popupFeatures":"Moguænosti popup prozora","popupFullScreen":"Cijeli ekran (IE)","popupLeft":"Lijeva pozicija","popupLocationBar":"Traka za lokaciju","popupMenuBar":"Izborna traka","popupResizable":"Resizable","popupScrollBars":"Scroll traka","popupStatusBar":"Statusna traka","popupToolbar":"Traka sa alatima","popupTop":"Gornja pozicija","rel":"Relationship","selectAnchor":"Izaberi sidro","styles":"Stil","tabIndex":"Tab indeks","target":"Prozor","targetFrame":"<frejm>","targetFrameName":"Target Frame Name","targetPopup":"<popup prozor>","targetPopupName":"Naziv popup prozora","title":"Link","toAnchor":"Sidro na ovoj stranici","toEmail":"E-Mail","toUrl":"URL","toolbar":"Ubaci/Izmjeni link","type":"Tip linka","unlink":"Izbriši link","upload":"Šalji"},"list":{"bulletedlist":"Lista","numberedlist":"Numerisana lista"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"Novi dokument"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Zalijepi kao obièan tekst","title":"Zalijepi kao obièan tekst"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Zalijepi iz Word-a","toolbar":"Zalijepi iz Word-a"},"preview":{"preview":"Prikaži"},"print":{"toolbar":"Štampaj"},"removeformat":{"toolbar":"Poništi format"},"save":{"toolbar":"Snimi"},"selectall":{"toolbar":"Selektuj sve"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"HTML kôd"},"specialchar":{"options":"Special Character Options","title":"Izaberi specijalni karakter","toolbar":"Ubaci specijalni karater"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stil","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Okvir","caption":"Naslov","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Briši æelije","merge":"Spoji æelije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Uvod æelija","cellSpace":"Razmak æelija","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Briši kolone"},"columns":"Kolona","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Svojstva tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Briši redove"},"rows":"Redova","summary":"Summary","title":"Svojstva tabele","toolbar":"Tabela","widthPc":"posto","widthPx":"piksela","widthUnit":"width unit"},"undo":{"redo":"Ponovi","undo":"Vrati"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
+CKEDITOR.lang['bs']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Šalji","uploadSubmit":"Šalji na server","image":"Slika","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije podešeno>","id":"Id","name":"Naziv","langDir":"Smjer pisanja","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Jezièni kôd","longDescr":"Dugaèki opis URL-a","cssClass":"Klase CSS stilova","advisoryTitle":"Advisory title","cssStyle":"Stil","ok":"OK","cancel":"Odustani","close":"Close","preview":"Prikaži","resize":"Resize","generalTab":"General","advancedTab":"Naprednije","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Prozor","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase CSS stilova","width":"Širina","height":"Visina","align":"Poravnanje","alignLeft":"Lijevo","alignRight":"Desno","alignCenter":"Centar","alignJustify":"Puno poravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dno","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Boldiraj","italic":"Ukosi","strike":"Precrtaj","subscript":"Subscript","superscript":"Superscript","underline":"Podvuci"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživaèa ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke vašeg pretraživaèa ne dozvoljavaju operacije automatskog rezanja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+X).","paste":"Zalijepi","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Zalijepi"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatska","bgColorTitle":"Boja pozadine","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Više boja...","panelTitle":"Colors","textColorTitle":"Boja teksta"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory title","cssClassInputLabel":"Klase CSS stilova","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"S lijeva na desno (LTR)","langDirLabel":"Smjer pisanja","langDirRTLLabel":"S desna na lijevo (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Stil","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Naði","findOptions":"Find Options","findWhat":"Naði šta:","matchCase":"Uporeðuj velika/mala slova","matchCyclic":"Match cyclic","matchWord":"Uporeðuj samo cijelu rijeè","notFoundMsg":"Traženi tekst nije pronaðen.","replace":"Zamjeni","replaceAll":"Zamjeni sve","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Zamjeni sa:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs dole","alignAbsMiddle":"Abs sredina","alignBaseline":"Bazno","alignTextTop":"Vrh teksta","bgcolor":"Boja pozadine","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"Molimo ukucajte URL link","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Velièina","voiceLabel":"Font Size","panelTitle":"Velièina"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Ubaci horizontalnu liniju"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Tekst na slici","border":"Okvir","btnUpload":"Šalji na server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Info slike","linkTab":"Link","lockRatio":"Zakljuèaj odnos","menu":"Svojstva slike","resetSize":"Resetuj dimenzije","title":"Svojstva slike","titleButton":"Image Button Properties","upload":"Šalji","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Poveæaj uvod","outdent":"Smanji uvod"},"smiley":{"options":"Smiley Options","title":"Ubaci smješka","toolbar":"Smješko"},"justify":{"block":"Puno poravnanje","center":"Centralno poravnanje","left":"Lijevo poravnanje","right":"Desno poravnanje"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Pristupna tipka","advanced":"Naprednije","advisoryContentType":"Advisory vrsta sadržaja","advisoryTitle":"Advisory title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"Po Id-u elementa","anchorName":"Po nazivu sidra","charset":"Linked Resource Charset","cssClasses":"Klase CSS stilova","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Adresa","emailBody":"Poruka","emailSubject":"Subjekt poruke","id":"Id","info":"Link info","langCode":"Smjer pisanja","langDir":"Smjer pisanja","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","menu":"Izmjeni link","name":"Naziv","noAnchors":"(Nema dostupnih sidra na stranici)","noEmail":"Molimo ukucajte e-mail adresu","noUrl":"Molimo ukucajte URL link","other":"<other>","popupDependent":"Ovisno (Netscape)","popupFeatures":"Moguænosti popup prozora","popupFullScreen":"Cijeli ekran (IE)","popupLeft":"Lijeva pozicija","popupLocationBar":"Traka za lokaciju","popupMenuBar":"Izborna traka","popupResizable":"Resizable","popupScrollBars":"Scroll traka","popupStatusBar":"Statusna traka","popupToolbar":"Traka sa alatima","popupTop":"Gornja pozicija","rel":"Relationship","selectAnchor":"Izaberi sidro","styles":"Stil","tabIndex":"Tab indeks","target":"Prozor","targetFrame":"<frejm>","targetFrameName":"Target Frame Name","targetPopup":"<popup prozor>","targetPopupName":"Naziv popup prozora","title":"Link","toAnchor":"Sidro na ovoj stranici","toEmail":"E-Mail","toUrl":"URL","toolbar":"Ubaci/Izmjeni link","type":"Tip linka","unlink":"Izbriši link","upload":"Šalji"},"list":{"bulletedlist":"Lista","numberedlist":"Numerisana lista"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"Novi dokument"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Zalijepi kao obièan tekst","title":"Zalijepi kao obièan tekst"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Zalijepi iz Word-a","toolbar":"Zalijepi iz Word-a"},"preview":{"preview":"Prikaži"},"print":{"toolbar":"Štampaj"},"removeformat":{"toolbar":"Poništi format"},"save":{"toolbar":"Snimi"},"selectall":{"toolbar":"Selektuj sve"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"HTML kôd"},"specialchar":{"options":"Special Character Options","title":"Izaberi specijalni karakter","toolbar":"Ubaci specijalni karater"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stil","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Okvir","caption":"Naslov","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Briši æelije","merge":"Spoji æelije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Uvod æelija","cellSpace":"Razmak æelija","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Briši kolone"},"columns":"Kolona","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Svojstva tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Briši redove"},"rows":"Redova","summary":"Summary","title":"Svojstva tabele","toolbar":"Tabela","widthPc":"posto","widthPx":"piksela","widthUnit":"width unit"},"undo":{"redo":"Ponovi","undo":"Vrati"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/lang/ca.js
index b3c95a08c49..aa20455921c 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/ca.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ca.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ca']={"editor":"Editor de text enriquit","editorPanel":"Panell de l'editor de text enriquit","common":{"editorHelp":"Premeu ALT 0 per ajuda","browseServer":"Veure servidor","url":"URL","protocol":"Protocol","upload":"Puja","uploadSubmit":"Envia-la al servidor","image":"Imatge","flash":"Flash","form":"Formulari","checkbox":"Casella de verificació","radio":"Botó d'opció","textField":"Camp de text","textarea":"Àrea de text","hiddenField":"Camp ocult","button":"Botó","select":"Camp de selecció","imageButton":"Botó d'imatge","notSet":"<no definit>","id":"Id","name":"Nom","langDir":"Direcció de l'idioma","langDirLtr":"D'esquerra a dreta (LTR)","langDirRtl":"De dreta a esquerra (RTL)","langCode":"Codi d'idioma","longDescr":"Descripció llarga de la URL","cssClass":"Classes del full d'estil","advisoryTitle":"Títol consultiu","cssStyle":"Estil","ok":"D'acord","cancel":"Cancel·la","close":"Tanca","preview":"Previsualitza","resize":"Arrossegueu per redimensionar","generalTab":"General","advancedTab":"Avançat","validateNumberFailed":"Aquest valor no és un número.","confirmNewPage":"Els canvis en aquest contingut que no es desin es perdran. Esteu segur que voleu carregar una pàgina nova?","confirmCancel":"Algunes opcions s'han canviat. Esteu segur que voleu tancar el quadre de diàleg?","options":"Opcions","target":"Destí","targetNew":"Nova finestra (_blank)","targetTop":"Finestra superior (_top)","targetSelf":"Mateixa finestra (_self)","targetParent":"Finestra pare (_parent)","langDirLTR":"D'esquerra a dreta (LTR)","langDirRTL":"De dreta a esquerra (RTL)","styles":"Estil","cssClasses":"Classes del full d'estil","width":"Amplada","height":"Alçada","align":"Alineació","alignLeft":"Ajusta a l'esquerra","alignRight":"Ajusta a la dreta","alignCenter":"Centre","alignJustify":"Justificat","alignTop":"Superior","alignMiddle":"Centre","alignBottom":"Inferior","alignNone":"None","invalidValue":"Valor no vàlid.","invalidHeight":"L'alçada ha de ser un número.","invalidWidth":"L'amplada ha de ser un número.","invalidCssLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","invalidHtmlLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida d'HTML (px o %).","invalidInlineStyle":"El valor especificat per l'estil en línia ha de constar d'una o més tuples amb el format \"name: value\", separats per punt i coma.","cssLengthTooltip":"Introduïu un número per un valor en píxels o un número amb una unitat vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>"},"about":{"copy":"Copyright &copy; $1. Tots els drets reservats.","dlgTitle":"Quant al CKEditor","help":"Premi $1 per obtenir ajuda.","moreInfo":"Per informació sobre llicències visiteu el nostre lloc web:","title":"Quant al CKEditor","userGuide":"Manual d'usuari de CKEditor"},"basicstyles":{"bold":"Negreta","italic":"Cursiva","strike":"Ratllat","subscript":"Subíndex","superscript":"Superíndex","underline":"Subratllat"},"bidi":{"ltr":"Direcció del text d'esquerra a dreta","rtl":"Direcció del text de dreta a esquerra"},"blockquote":{"toolbar":"Bloc de cita"},"clipboard":{"copy":"Copiar","copyError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de copiar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+C).","cut":"Retallar","cutError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de retallar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+X).","paste":"Enganxar","pasteArea":"Àrea d'enganxat","pasteMsg":"Si us plau, enganxi dins del següent camp utilitzant el teclat (<strong>Ctrl/Cmd+V</strong>) i premi OK.","securityMsg":"A causa de la configuració de seguretat del vostre navegador, l'editor no pot accedir a les dades del porta-retalls directament. Enganxeu-ho un altre cop en aquesta finestra.","title":"Enganxar"},"button":{"selectedLabel":"%1 (Seleccionat)"},"colorbutton":{"auto":"Automàtic","bgColorTitle":"Color de Fons","colors":{"000":"Negre","800000":"Grana","8B4513":"Marró sella","2F4F4F":"Gris pissarra fosca","008080":"Blau xarxet","000080":"Blau marí","4B0082":"Indi","696969":"Gris Fosc","B22222":"Foc Maó","A52A2A":"Marró","DAA520":"Solidago","006400":"Verd Fosc","40E0D0":"Turquesa","0000CD":"Blau 1/2","800080":"Lila","808080":"Gris","F00":"Vermell","FF8C00":"Taronja Fosc","FFD700":"Or","008000":"Verd","0FF":"Cian","00F":"Blau","EE82EE":"Violat","A9A9A9":"Gris clar","FFA07A":"Salmó clar","FFA500":"Taronja","FFFF00":"Groc","00FF00":"Verd Llima","AFEEEE":"Turquesa Pàl·lid","ADD8E6":"Blau Clar","DDA0DD":"Pruna","D3D3D3":"Gris Clar","FFF0F5":"Lavanda rosat","FAEBD7":"Blanc Antic","FFFFE0":"Groc Clar","F0FFF0":"Verd Pàl·lid","F0FFFF":"Atzur","F0F8FF":"Cian pàlid","E6E6FA":"Lavanda","FFF":"Blanc"},"more":"Més Colors...","panelTitle":"Colors","textColorTitle":"Color del Text"},"colordialog":{"clear":"Neteja","highlight":"Destacat","options":"Opcions del color","selected":"Color Seleccionat","title":"Seleccioni el color"},"templates":{"button":"Plantilles","emptyListMsg":"(No hi ha plantilles definides)","insertOption":"Reemplaça el contingut actual","options":"Opcions de plantilla","selectPromptMsg":"Seleccioneu una plantilla per usar a l'editor<br>(per defecte s'elimina el contingut actual):","title":"Plantilles de contingut"},"contextmenu":{"options":"Opcions del menú contextual"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Títol de guia","cssClassInputLabel":"Classes de la fulla d'estils","edit":"Edita la Capa","inlineStyleInputLabel":"Estil en línia","langDirLTRLabel":"D'esquerra a dreta (LTR)","langDirLabel":"Direcció de l'idioma","langDirRTLLabel":"De dreta a esquerra (RTL)","languageCodeInputLabel":" Codi d'idioma","remove":"Elimina la Capa","styleSelectLabel":"Estil","title":"Crea una Capa Contenidora","toolbar":"Crea una Capa Contenidora"},"toolbar":{"toolbarCollapse":"Redueix la barra d'eines","toolbarExpand":"Amplia la barra d'eines","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor de barra d'eines"},"elementspath":{"eleLabel":"Ruta dels elements","eleTitle":"%1 element"},"find":{"find":"Cerca","findOptions":"Opcions de Cerca","findWhat":"Cerca el:","matchCase":"Distingeix majúscules/minúscules","matchCyclic":"Coincidència cíclica","matchWord":"Només paraules completes","notFoundMsg":"El text especificat no s'ha trobat.","replace":"Reemplaça","replaceAll":"Reemplaça-ho tot","replaceSuccessMsg":"%1 ocurrència/es reemplaçada/es.","replaceWith":"Reemplaça amb:","title":"Cerca i reemplaça"},"fakeobjects":{"anchor":"Àncora","flash":"Animació Flash","hiddenfield":"Camp ocult","iframe":"IFrame","unknown":"Objecte desconegut"},"flash":{"access":"Accés a scripts","accessAlways":"Sempre","accessNever":"Mai","accessSameDomain":"El mateix domini","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Baseline","alignTextTop":"Text Superior","bgcolor":"Color de Fons","chkFull":"Permetre la pantalla completa","chkLoop":"Bucle","chkMenu":"Habilita menú Flash","chkPlay":"Reprodució automàtica","flashvars":"Variables de Flash","hSpace":"Espaiat horitzontal","properties":"Propietats del Flash","propertiesTab":"Propietats","quality":"Qualitat","qualityAutoHigh":"Alta automàtica","qualityAutoLow":"Baixa automàtica","qualityBest":"La millor","qualityHigh":"Alta","qualityLow":"Baixa","qualityMedium":"Mitjana","scale":"Escala","scaleAll":"Mostra-ho tot","scaleFit":"Mida exacta","scaleNoBorder":"Sense vores","title":"Propietats del Flash","vSpace":"Espaiat vertical","validateHSpace":"L'espaiat horitzontal ha de ser un número.","validateSrc":"La URL no pot estar buida.","validateVSpace":"L'espaiat vertical ha de ser un número.","windowMode":"Mode de la finestra","windowModeOpaque":"Opaca","windowModeTransparent":"Transparent","windowModeWindow":"Finestra"},"font":{"fontSize":{"label":"Mida","voiceLabel":"Mida de la lletra","panelTitle":"Mida de la lletra"},"label":"Tipus de lletra","panelTitle":"Tipus de lletra","voiceLabel":"Tipus de lletra"},"forms":{"button":{"title":"Propietats del botó","text":"Text (Valor)","type":"Tipus","typeBtn":"Botó","typeSbm":"Transmet formulari","typeRst":"Reinicia formulari"},"checkboxAndRadio":{"checkboxTitle":"Propietats de la casella de verificació","radioTitle":"Propietats del botó d'opció","value":"Valor","selected":"Seleccionat","required":"Required"},"form":{"title":"Propietats del formulari","menu":"Propietats del formulari","action":"Acció","method":"Mètode","encoding":"Codificació"},"hidden":{"title":"Propietats del camp ocult","name":"Nom","value":"Valor"},"select":{"title":"Propietats del camp de selecció","selectInfo":"Info","opAvail":"Opcions disponibles","value":"Valor","size":"Mida","lines":"Línies","chkMulti":"Permet múltiples seleccions","required":"Required","opText":"Text","opValue":"Valor","btnAdd":"Afegeix","btnModify":"Modifica","btnUp":"Amunt","btnDown":"Avall","btnSetValue":"Selecciona per defecte","btnDelete":"Elimina"},"textarea":{"title":"Propietats de l'àrea de text","cols":"Columnes","rows":"Files"},"textfield":{"title":"Propietats del camp de text","name":"Nom","value":"Valor","charWidth":"Amplada","maxChars":"Nombre màxim de caràcters","required":"Required","type":"Tipus","typeText":"Text","typePass":"Contrasenya","typeEmail":"Correu electrònic","typeSearch":"Cercar","typeTel":"Número de telèfon","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adreça","tag_div":"Normal (DIV)","tag_h1":"Encapçalament 1","tag_h2":"Encapçalament 2","tag_h3":"Encapçalament 3","tag_h4":"Encapçalament 4","tag_h5":"Encapçalament 5","tag_h6":"Encapçalament 6","tag_p":"Normal","tag_pre":"Formatejat"},"horizontalrule":{"toolbar":"Insereix línia horitzontal"},"iframe":{"border":"Mostra la vora del marc","noUrl":"Si us plau, introdueixi la URL de l'iframe","scrolling":"Activa les barres de desplaçament","title":"Propietats de l'IFrame","toolbar":"IFrame"},"image":{"alt":"Text alternatiu","border":"Vora","btnUpload":"Envia-la al servidor","button2Img":"Voleu transformar el botó d'imatge seleccionat en una simple imatge?","hSpace":"Espaiat horit.","img2Button":"Voleu transformar la imatge seleccionada en un botó d'imatge?","infoTab":"Informació de la imatge","linkTab":"Enllaç","lockRatio":"Bloqueja les proporcions","menu":"Propietats de la imatge","resetSize":"Restaura la mida","title":"Propietats de la imatge","titleButton":"Propietats del botó d'imatge","upload":"Puja","urlMissing":"Falta la URL de la imatge.","vSpace":"Espaiat vert.","validateBorder":"La vora ha de ser un nombre enter.","validateHSpace":"HSpace ha de ser un nombre enter.","validateVSpace":"VSpace ha de ser un nombre enter."},"indent":{"indent":"Augmenta el sagnat","outdent":"Redueix el sagnat"},"smiley":{"options":"Opcions d'emoticones","title":"Insereix una icona","toolbar":"Icona"},"justify":{"block":"Justificat","center":"Centrat","left":"Alinea a l'esquerra","right":"Alinea a la dreta"},"language":{"button":"Definir l'idioma","remove":"Eliminar idioma"},"link":{"acccessKey":"Clau d'accés","advanced":"Avançat","advisoryContentType":"Tipus de contingut consultiu","advisoryTitle":"Títol consultiu","anchor":{"toolbar":"Insereix/Edita àncora","menu":"Propietats de l'àncora","title":"Propietats de l'àncora","name":"Nom de l'àncora","errorName":"Si us plau, escriviu el nom de l'ancora","remove":"Remove Anchor"},"anchorId":"Per Id d'element","anchorName":"Per nom d'àncora","charset":"Conjunt de caràcters font enllaçat","cssClasses":"Classes del full d'estil","emailAddress":"Adreça de correu electrònic","emailBody":"Cos del missatge","emailSubject":"Assumpte del missatge","id":"Id","info":"Informació de l'enllaç","langCode":"Direcció de l'idioma","langDir":"Direcció de l'idioma","langDirLTR":"D'esquerra a dreta (LTR)","langDirRTL":"De dreta a esquerra (RTL)","menu":"Edita l'enllaç","name":"Nom","noAnchors":"(No hi ha àncores disponibles en aquest document)","noEmail":"Si us plau, escrigui l'adreça correu electrònic","noUrl":"Si us plau, escrigui l'enllaç URL","other":"<altre>","popupDependent":"Depenent (Netscape)","popupFeatures":"Característiques finestra popup","popupFullScreen":"Pantalla completa (IE)","popupLeft":"Posició esquerra","popupLocationBar":"Barra d'adreça","popupMenuBar":"Barra de menú","popupResizable":"Redimensionable","popupScrollBars":"Barres d'scroll","popupStatusBar":"Barra d'estat","popupToolbar":"Barra d'eines","popupTop":"Posició dalt","rel":"Relació","selectAnchor":"Selecciona una àncora","styles":"Estil","tabIndex":"Index de Tab","target":"Destí","targetFrame":"<marc>","targetFrameName":"Nom del marc de destí","targetPopup":"<finestra emergent>","targetPopupName":"Nom finestra popup","title":"Enllaç","toAnchor":"Àncora en aquesta pàgina","toEmail":"Correu electrònic","toUrl":"URL","toolbar":"Insereix/Edita enllaç","type":"Tipus d'enllaç","unlink":"Elimina l'enllaç","upload":"Puja"},"list":{"bulletedlist":"Llista de pics","numberedlist":"Llista numerada"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insereix el paràgraf aquí"},"maximize":{"maximize":"Maximitza","minimize":"Minimitza"},"newpage":{"toolbar":"Nova pàgina"},"pagebreak":{"alt":"Salt de pàgina","toolbar":"Insereix salt de pàgina"},"pastetext":{"button":"Enganxa com a text no formatat","title":"Enganxa com a text no formatat"},"pastefromword":{"confirmCleanup":"El text que voleu enganxar sembla provenir de Word. Voleu netejar aquest text abans que sigui enganxat?","error":"No ha estat possible netejar les dades enganxades degut a un error intern","title":"Enganxa des del Word","toolbar":"Enganxa des del Word"},"preview":{"preview":"Visualització prèvia"},"print":{"toolbar":"Imprimeix"},"removeformat":{"toolbar":"Elimina Format"},"save":{"toolbar":"Desa"},"selectall":{"toolbar":"Selecciona-ho tot"},"showblocks":{"toolbar":"Mostra els blocs"},"sourcearea":{"toolbar":"Codi font"},"specialchar":{"options":"Opcions de caràcters especials","title":"Selecciona el caràcter especial","toolbar":"Insereix caràcter especial"},"scayt":{"btn_about":"Quant a l'SCAYT","btn_dictionaries":"Diccionaris","btn_disable":"Deshabilita SCAYT","btn_enable":"Habilitat l'SCAYT","btn_langs":"Idiomes","btn_options":"Opcions","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Estil","panelTitle":"Estils de format","panelTitle1":"Estils de bloc","panelTitle2":"Estils incrustats","panelTitle3":"Estils d'objecte"},"table":{"border":"Mida vora","caption":"Títol","cell":{"menu":"Cel·la","insertBefore":"Insereix abans","insertAfter":"Insereix després","deleteCell":"Suprimeix","merge":"Fusiona","mergeRight":"Fusiona a la dreta","mergeDown":"Fusiona avall","splitHorizontal":"Divideix horitzontalment","splitVertical":"Divideix verticalment","title":"Propietats de la cel·la","cellType":"Tipus de cel·la","rowSpan":"Expansió de files","colSpan":"Expansió de columnes","wordWrap":"Ajustar al contingut","hAlign":"Alineació Horizontal","vAlign":"Alineació Vertical","alignBaseline":"A la línia base","bgColor":"Color de fons","borderColor":"Color de la vora","data":"Dades","header":"Capçalera","yes":"Sí","no":"No","invalidWidth":"L'amplada de cel·la ha de ser un nombre.","invalidHeight":"L'alçada de cel·la ha de ser un nombre.","invalidRowSpan":"L'expansió de files ha de ser un nombre enter.","invalidColSpan":"L'expansió de columnes ha de ser un nombre enter.","chooseColor":"Trieu"},"cellPad":"Encoixinament de cel·les","cellSpace":"Espaiat de cel·les","column":{"menu":"Columna","insertBefore":"Insereix columna abans de","insertAfter":"Insereix columna darrera","deleteColumn":"Suprimeix una columna"},"columns":"Columnes","deleteTable":"Suprimeix la taula","headers":"Capçaleres","headersBoth":"Ambdues","headersColumn":"Primera columna","headersNone":"Cap","headersRow":"Primera fila","invalidBorder":"El gruix de la vora ha de ser un nombre.","invalidCellPadding":"L'encoixinament de cel·la  ha de ser un nombre.","invalidCellSpacing":"L'espaiat de cel·la  ha de ser un nombre.","invalidCols":"El nombre de columnes ha de ser un nombre major que 0.","invalidHeight":"L'alçada de la taula  ha de ser un nombre.","invalidRows":"El nombre de files ha de ser un nombre major que 0.","invalidWidth":"L'amplada de la taula  ha de ser un nombre.","menu":"Propietats de la taula","row":{"menu":"Fila","insertBefore":"Insereix fila abans de","insertAfter":"Insereix fila darrera","deleteRow":"Suprimeix una fila"},"rows":"Files","summary":"Resum","title":"Propietats de la taula","toolbar":"Taula","widthPc":"percentatge","widthPx":"píxels","widthUnit":"unitat d'amplada"},"undo":{"redo":"Refés","undo":"Desfés"},"wsc":{"btnIgnore":"Ignora","btnIgnoreAll":"Ignora-les totes","btnReplace":"Canvia","btnReplaceAll":"Canvia-les totes","btnUndo":"Desfés","changeTo":"Reemplaça amb","errorLoading":"Error carregant el servidor: %s.","ieSpellDownload":"Verificació ortogràfica no instal·lada. Voleu descarregar-ho ara?","manyChanges":"Verificació ortogràfica: s'han canviat %1 paraules","noChanges":"Verificació ortogràfica: no s'ha canviat cap paraula","noMispell":"Verificació ortogràfica acabada: no hi ha cap paraula mal escrita","noSuggestions":"Cap suggeriment","notAvailable":"El servei no es troba disponible ara.","notInDic":"No és al diccionari","oneChange":"Verificació ortogràfica: s'ha canviat una paraula","progress":"Verificació ortogràfica en curs...","title":"Comprova l'ortografia","toolbar":"Revisa l'ortografia"}};
\ No newline at end of file
+CKEDITOR.lang['ca']={"editor":"Editor de text enriquit","editorPanel":"Panell de l'editor de text enriquit","common":{"editorHelp":"Premeu ALT 0 per ajuda","browseServer":"Veure servidor","url":"URL","protocol":"Protocol","upload":"Puja","uploadSubmit":"Envia-la al servidor","image":"Imatge","flash":"Flash","form":"Formulari","checkbox":"Casella de verificació","radio":"Botó d'opció","textField":"Camp de text","textarea":"Àrea de text","hiddenField":"Camp ocult","button":"Botó","select":"Camp de selecció","imageButton":"Botó d'imatge","notSet":"<no definit>","id":"Id","name":"Nom","langDir":"Direcció de l'idioma","langDirLtr":"D'esquerra a dreta (LTR)","langDirRtl":"De dreta a esquerra (RTL)","langCode":"Codi d'idioma","longDescr":"Descripció llarga de la URL","cssClass":"Classes del full d'estil","advisoryTitle":"Títol consultiu","cssStyle":"Estil","ok":"D'acord","cancel":"Cancel·la","close":"Tanca","preview":"Previsualitza","resize":"Arrossegueu per redimensionar","generalTab":"General","advancedTab":"Avançat","validateNumberFailed":"Aquest valor no és un número.","confirmNewPage":"Els canvis en aquest contingut que no es desin es perdran. Esteu segur que voleu carregar una pàgina nova?","confirmCancel":"Algunes opcions s'han canviat. Esteu segur que voleu tancar el quadre de diàleg?","options":"Opcions","target":"Destí","targetNew":"Nova finestra (_blank)","targetTop":"Finestra superior (_top)","targetSelf":"Mateixa finestra (_self)","targetParent":"Finestra pare (_parent)","langDirLTR":"D'esquerra a dreta (LTR)","langDirRTL":"De dreta a esquerra (RTL)","styles":"Estil","cssClasses":"Classes del full d'estil","width":"Amplada","height":"Alçada","align":"Alineació","alignLeft":"Ajusta a l'esquerra","alignRight":"Ajusta a la dreta","alignCenter":"Centre","alignJustify":"Justificat","alignTop":"Superior","alignMiddle":"Centre","alignBottom":"Inferior","alignNone":"Cap","invalidValue":"Valor no vàlid.","invalidHeight":"L'alçada ha de ser un número.","invalidWidth":"L'amplada ha de ser un número.","invalidCssLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","invalidHtmlLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida d'HTML (px o %).","invalidInlineStyle":"El valor especificat per l'estil en línia ha de constar d'una o més tuples amb el format \"name: value\", separats per punt i coma.","cssLengthTooltip":"Introduïu un número per un valor en píxels o un número amb una unitat vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>","keyboard":{"8":"Retrocés","13":"Intro","16":"Majúscules","17":"Ctrl","18":"Alt","32":"Space","35":"Fi","36":"Inici","46":"Eliminar","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Tots els drets reservats.","dlgTitle":"Quant al CKEditor","help":"Premi $1 per obtenir ajuda.","moreInfo":"Per informació sobre llicències visiteu el nostre lloc web:","title":"Quant al CKEditor","userGuide":"Manual d'usuari de CKEditor"},"basicstyles":{"bold":"Negreta","italic":"Cursiva","strike":"Ratllat","subscript":"Subíndex","superscript":"Superíndex","underline":"Subratllat"},"bidi":{"ltr":"Direcció del text d'esquerra a dreta","rtl":"Direcció del text de dreta a esquerra"},"blockquote":{"toolbar":"Bloc de cita"},"clipboard":{"copy":"Copiar","copyError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de copiar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+C).","cut":"Retallar","cutError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de retallar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+X).","paste":"Enganxar","pasteArea":"Àrea d'enganxat","pasteMsg":"Si us plau, enganxi dins del següent camp utilitzant el teclat (<strong>Ctrl/Cmd+V</strong>) i premi OK.","securityMsg":"A causa de la configuració de seguretat del vostre navegador, l'editor no pot accedir a les dades del porta-retalls directament. Enganxeu-ho un altre cop en aquesta finestra.","title":"Enganxar"},"button":{"selectedLabel":"%1 (Seleccionat)"},"colorbutton":{"auto":"Automàtic","bgColorTitle":"Color de Fons","colors":{"000":"Negre","800000":"Grana","8B4513":"Marró sella","2F4F4F":"Gris pissarra fosca","008080":"Blau xarxet","000080":"Blau marí","4B0082":"Indi","696969":"Gris Fosc","B22222":"Foc Maó","A52A2A":"Marró","DAA520":"Solidago","006400":"Verd Fosc","40E0D0":"Turquesa","0000CD":"Blau 1/2","800080":"Lila","808080":"Gris","F00":"Vermell","FF8C00":"Taronja Fosc","FFD700":"Or","008000":"Verd","0FF":"Cian","00F":"Blau","EE82EE":"Violat","A9A9A9":"Gris clar","FFA07A":"Salmó clar","FFA500":"Taronja","FFFF00":"Groc","00FF00":"Verd Llima","AFEEEE":"Turquesa Pàl·lid","ADD8E6":"Blau Clar","DDA0DD":"Pruna","D3D3D3":"Gris Clar","FFF0F5":"Lavanda rosat","FAEBD7":"Blanc Antic","FFFFE0":"Groc Clar","F0FFF0":"Verd Pàl·lid","F0FFFF":"Atzur","F0F8FF":"Cian pàlid","E6E6FA":"Lavanda","FFF":"Blanc","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Més Colors...","panelTitle":"Colors","textColorTitle":"Color del Text"},"colordialog":{"clear":"Neteja","highlight":"Destacat","options":"Opcions del color","selected":"Color Seleccionat","title":"Seleccioni el color"},"templates":{"button":"Plantilles","emptyListMsg":"(No hi ha plantilles definides)","insertOption":"Reemplaça el contingut actual","options":"Opcions de plantilla","selectPromptMsg":"Seleccioneu una plantilla per usar a l'editor<br>(per defecte s'elimina el contingut actual):","title":"Plantilles de contingut"},"contextmenu":{"options":"Opcions del menú contextual"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Títol de guia","cssClassInputLabel":"Classes de la fulla d'estils","edit":"Edita la Capa","inlineStyleInputLabel":"Estil en línia","langDirLTRLabel":"D'esquerra a dreta (LTR)","langDirLabel":"Direcció de l'idioma","langDirRTLLabel":"De dreta a esquerra (RTL)","languageCodeInputLabel":" Codi d'idioma","remove":"Elimina la Capa","styleSelectLabel":"Estil","title":"Crea una Capa Contenidora","toolbar":"Crea una Capa Contenidora"},"toolbar":{"toolbarCollapse":"Redueix la barra d'eines","toolbarExpand":"Amplia la barra d'eines","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor de barra d'eines"},"elementspath":{"eleLabel":"Ruta dels elements","eleTitle":"%1 element"},"find":{"find":"Cerca","findOptions":"Opcions de Cerca","findWhat":"Cerca el:","matchCase":"Distingeix majúscules/minúscules","matchCyclic":"Coincidència cíclica","matchWord":"Només paraules completes","notFoundMsg":"El text especificat no s'ha trobat.","replace":"Reemplaça","replaceAll":"Reemplaça-ho tot","replaceSuccessMsg":"%1 ocurrència/es reemplaçada/es.","replaceWith":"Reemplaça amb:","title":"Cerca i reemplaça"},"fakeobjects":{"anchor":"Àncora","flash":"Animació Flash","hiddenfield":"Camp ocult","iframe":"IFrame","unknown":"Objecte desconegut"},"flash":{"access":"Accés a scripts","accessAlways":"Sempre","accessNever":"Mai","accessSameDomain":"El mateix domini","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Baseline","alignTextTop":"Text Superior","bgcolor":"Color de Fons","chkFull":"Permetre la pantalla completa","chkLoop":"Bucle","chkMenu":"Habilita menú Flash","chkPlay":"Reprodució automàtica","flashvars":"Variables de Flash","hSpace":"Espaiat horitzontal","properties":"Propietats del Flash","propertiesTab":"Propietats","quality":"Qualitat","qualityAutoHigh":"Alta automàtica","qualityAutoLow":"Baixa automàtica","qualityBest":"La millor","qualityHigh":"Alta","qualityLow":"Baixa","qualityMedium":"Mitjana","scale":"Escala","scaleAll":"Mostra-ho tot","scaleFit":"Mida exacta","scaleNoBorder":"Sense vores","title":"Propietats del Flash","vSpace":"Espaiat vertical","validateHSpace":"L'espaiat horitzontal ha de ser un número.","validateSrc":"La URL no pot estar buida.","validateVSpace":"L'espaiat vertical ha de ser un número.","windowMode":"Mode de la finestra","windowModeOpaque":"Opaca","windowModeTransparent":"Transparent","windowModeWindow":"Finestra"},"font":{"fontSize":{"label":"Mida","voiceLabel":"Mida de la lletra","panelTitle":"Mida de la lletra"},"label":"Tipus de lletra","panelTitle":"Tipus de lletra","voiceLabel":"Tipus de lletra"},"forms":{"button":{"title":"Propietats del botó","text":"Text (Valor)","type":"Tipus","typeBtn":"Botó","typeSbm":"Transmet formulari","typeRst":"Reinicia formulari"},"checkboxAndRadio":{"checkboxTitle":"Propietats de la casella de verificació","radioTitle":"Propietats del botó d'opció","value":"Valor","selected":"Seleccionat","required":"Necessari"},"form":{"title":"Propietats del formulari","menu":"Propietats del formulari","action":"Acció","method":"Mètode","encoding":"Codificació"},"hidden":{"title":"Propietats del camp ocult","name":"Nom","value":"Valor"},"select":{"title":"Propietats del camp de selecció","selectInfo":"Info","opAvail":"Opcions disponibles","value":"Valor","size":"Mida","lines":"Línies","chkMulti":"Permet múltiples seleccions","required":"Necessari","opText":"Text","opValue":"Valor","btnAdd":"Afegeix","btnModify":"Modifica","btnUp":"Amunt","btnDown":"Avall","btnSetValue":"Selecciona per defecte","btnDelete":"Elimina"},"textarea":{"title":"Propietats de l'àrea de text","cols":"Columnes","rows":"Files"},"textfield":{"title":"Propietats del camp de text","name":"Nom","value":"Valor","charWidth":"Amplada","maxChars":"Nombre màxim de caràcters","required":"Necessari","type":"Tipus","typeText":"Text","typePass":"Contrasenya","typeEmail":"Correu electrònic","typeSearch":"Cercar","typeTel":"Número de telèfon","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adreça","tag_div":"Normal (DIV)","tag_h1":"Encapçalament 1","tag_h2":"Encapçalament 2","tag_h3":"Encapçalament 3","tag_h4":"Encapçalament 4","tag_h5":"Encapçalament 5","tag_h6":"Encapçalament 6","tag_p":"Normal","tag_pre":"Formatejat"},"horizontalrule":{"toolbar":"Insereix línia horitzontal"},"iframe":{"border":"Mostra la vora del marc","noUrl":"Si us plau, introdueixi la URL de l'iframe","scrolling":"Activa les barres de desplaçament","title":"Propietats de l'IFrame","toolbar":"IFrame"},"image":{"alt":"Text alternatiu","border":"Vora","btnUpload":"Envia-la al servidor","button2Img":"Voleu transformar el botó d'imatge seleccionat en una simple imatge?","hSpace":"Espaiat horit.","img2Button":"Voleu transformar la imatge seleccionada en un botó d'imatge?","infoTab":"Informació de la imatge","linkTab":"Enllaç","lockRatio":"Bloqueja les proporcions","menu":"Propietats de la imatge","resetSize":"Restaura la mida","title":"Propietats de la imatge","titleButton":"Propietats del botó d'imatge","upload":"Puja","urlMissing":"Falta la URL de la imatge.","vSpace":"Espaiat vert.","validateBorder":"La vora ha de ser un nombre enter.","validateHSpace":"HSpace ha de ser un nombre enter.","validateVSpace":"VSpace ha de ser un nombre enter."},"indent":{"indent":"Augmenta el sagnat","outdent":"Redueix el sagnat"},"smiley":{"options":"Opcions d'emoticones","title":"Insereix una icona","toolbar":"Icona"},"justify":{"block":"Justificat","center":"Centrat","left":"Alinea a l'esquerra","right":"Alinea a la dreta"},"language":{"button":"Definir l'idioma","remove":"Eliminar idioma"},"link":{"acccessKey":"Clau d'accés","advanced":"Avançat","advisoryContentType":"Tipus de contingut consultiu","advisoryTitle":"Títol consultiu","anchor":{"toolbar":"Insereix/Edita àncora","menu":"Propietats de l'àncora","title":"Propietats de l'àncora","name":"Nom de l'àncora","errorName":"Si us plau, escriviu el nom de l'ancora","remove":"Remove Anchor"},"anchorId":"Per Id d'element","anchorName":"Per nom d'àncora","charset":"Conjunt de caràcters font enllaçat","cssClasses":"Classes del full d'estil","download":"Force Download","displayText":"Text a mostrar","emailAddress":"Adreça de correu electrònic","emailBody":"Cos del missatge","emailSubject":"Assumpte del missatge","id":"Id","info":"Informació de l'enllaç","langCode":"Direcció de l'idioma","langDir":"Direcció de l'idioma","langDirLTR":"D'esquerra a dreta (LTR)","langDirRTL":"De dreta a esquerra (RTL)","menu":"Edita l'enllaç","name":"Nom","noAnchors":"(No hi ha àncores disponibles en aquest document)","noEmail":"Si us plau, escrigui l'adreça correu electrònic","noUrl":"Si us plau, escrigui l'enllaç URL","other":"<altre>","popupDependent":"Depenent (Netscape)","popupFeatures":"Característiques finestra popup","popupFullScreen":"Pantalla completa (IE)","popupLeft":"Posició esquerra","popupLocationBar":"Barra d'adreça","popupMenuBar":"Barra de menú","popupResizable":"Redimensionable","popupScrollBars":"Barres d'scroll","popupStatusBar":"Barra d'estat","popupToolbar":"Barra d'eines","popupTop":"Posició dalt","rel":"Relació","selectAnchor":"Selecciona una àncora","styles":"Estil","tabIndex":"Index de Tab","target":"Destí","targetFrame":"<marc>","targetFrameName":"Nom del marc de destí","targetPopup":"<finestra emergent>","targetPopupName":"Nom finestra popup","title":"Enllaç","toAnchor":"Àncora en aquesta pàgina","toEmail":"Correu electrònic","toUrl":"URL","toolbar":"Insereix/Edita enllaç","type":"Tipus d'enllaç","unlink":"Elimina l'enllaç","upload":"Puja"},"list":{"bulletedlist":"Llista de pics","numberedlist":"Llista numerada"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insereix el paràgraf aquí"},"maximize":{"maximize":"Maximitza","minimize":"Minimitza"},"newpage":{"toolbar":"Nova pàgina"},"pagebreak":{"alt":"Salt de pàgina","toolbar":"Insereix salt de pàgina"},"pastetext":{"button":"Enganxa com a text no formatat","title":"Enganxa com a text no formatat"},"pastefromword":{"confirmCleanup":"El text que voleu enganxar sembla provenir de Word. Voleu netejar aquest text abans que sigui enganxat?","error":"No ha estat possible netejar les dades enganxades degut a un error intern","title":"Enganxa des del Word","toolbar":"Enganxa des del Word"},"preview":{"preview":"Visualització prèvia"},"print":{"toolbar":"Imprimeix"},"removeformat":{"toolbar":"Elimina Format"},"save":{"toolbar":"Desa"},"selectall":{"toolbar":"Selecciona-ho tot"},"showblocks":{"toolbar":"Mostra els blocs"},"sourcearea":{"toolbar":"Codi font"},"specialchar":{"options":"Opcions de caràcters especials","title":"Selecciona el caràcter especial","toolbar":"Insereix caràcter especial"},"scayt":{"btn_about":"Quant a l'SCAYT","btn_dictionaries":"Diccionaris","btn_disable":"Deshabilita SCAYT","btn_enable":"Habilitat l'SCAYT","btn_langs":"Idiomes","btn_options":"Opcions","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Estil","panelTitle":"Estils de format","panelTitle1":"Estils de bloc","panelTitle2":"Estils incrustats","panelTitle3":"Estils d'objecte"},"table":{"border":"Mida vora","caption":"Títol","cell":{"menu":"Cel·la","insertBefore":"Insereix abans","insertAfter":"Insereix després","deleteCell":"Suprimeix","merge":"Fusiona","mergeRight":"Fusiona a la dreta","mergeDown":"Fusiona avall","splitHorizontal":"Divideix horitzontalment","splitVertical":"Divideix verticalment","title":"Propietats de la cel·la","cellType":"Tipus de cel·la","rowSpan":"Expansió de files","colSpan":"Expansió de columnes","wordWrap":"Ajustar al contingut","hAlign":"Alineació Horizontal","vAlign":"Alineació Vertical","alignBaseline":"A la línia base","bgColor":"Color de fons","borderColor":"Color de la vora","data":"Dades","header":"Capçalera","yes":"Sí","no":"No","invalidWidth":"L'amplada de cel·la ha de ser un nombre.","invalidHeight":"L'alçada de cel·la ha de ser un nombre.","invalidRowSpan":"L'expansió de files ha de ser un nombre enter.","invalidColSpan":"L'expansió de columnes ha de ser un nombre enter.","chooseColor":"Trieu"},"cellPad":"Encoixinament de cel·les","cellSpace":"Espaiat de cel·les","column":{"menu":"Columna","insertBefore":"Insereix columna abans de","insertAfter":"Insereix columna darrera","deleteColumn":"Suprimeix una columna"},"columns":"Columnes","deleteTable":"Suprimeix la taula","headers":"Capçaleres","headersBoth":"Ambdues","headersColumn":"Primera columna","headersNone":"Cap","headersRow":"Primera fila","invalidBorder":"El gruix de la vora ha de ser un nombre.","invalidCellPadding":"L'encoixinament de cel·la  ha de ser un nombre.","invalidCellSpacing":"L'espaiat de cel·la  ha de ser un nombre.","invalidCols":"El nombre de columnes ha de ser un nombre major que 0.","invalidHeight":"L'alçada de la taula  ha de ser un nombre.","invalidRows":"El nombre de files ha de ser un nombre major que 0.","invalidWidth":"L'amplada de la taula  ha de ser un nombre.","menu":"Propietats de la taula","row":{"menu":"Fila","insertBefore":"Insereix fila abans de","insertAfter":"Insereix fila darrera","deleteRow":"Suprimeix una fila"},"rows":"Files","summary":"Resum","title":"Propietats de la taula","toolbar":"Taula","widthPc":"percentatge","widthPx":"píxels","widthUnit":"unitat d'amplada"},"undo":{"redo":"Refés","undo":"Desfés"},"wsc":{"btnIgnore":"Ignora","btnIgnoreAll":"Ignora-les totes","btnReplace":"Canvia","btnReplaceAll":"Canvia-les totes","btnUndo":"Desfés","changeTo":"Reemplaça amb","errorLoading":"Error carregant el servidor: %s.","ieSpellDownload":"Verificació ortogràfica no instal·lada. Voleu descarregar-ho ara?","manyChanges":"Verificació ortogràfica: s'han canviat %1 paraules","noChanges":"Verificació ortogràfica: no s'ha canviat cap paraula","noMispell":"Verificació ortogràfica acabada: no hi ha cap paraula mal escrita","noSuggestions":"Cap suggeriment","notAvailable":"El servei no es troba disponible ara.","notInDic":"No és al diccionari","oneChange":"Verificació ortogràfica: s'ha canviat una paraula","progress":"Verificació ortogràfica en curs...","title":"Comprova l'ortografia","toolbar":"Revisa l'ortografia"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/lang/cs.js
index e282d3f620e..5810fc92ed2 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/cs.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/cs.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['cs']={"editor":"Textový editor","editorPanel":"Panel textového editoru","common":{"editorHelp":"Stiskněte ALT 0 pro nápovědu","browseServer":"Vybrat na serveru","url":"URL","protocol":"Protokol","upload":"Odeslat","uploadSubmit":"Odeslat na server","image":"Obrázek","flash":"Flash","form":"Formulář","checkbox":"Zaškrtávací políčko","radio":"Přepínač","textField":"Textové pole","textarea":"Textová oblast","hiddenField":"Skryté pole","button":"Tlačítko","select":"Seznam","imageButton":"Obrázkové tlačítko","notSet":"<nenastaveno>","id":"Id","name":"Jméno","langDir":"Směr jazyka","langDirLtr":"Zleva doprava (LTR)","langDirRtl":"Zprava doleva (RTL)","langCode":"Kód jazyka","longDescr":"Dlouhý popis URL","cssClass":"Třída stylu","advisoryTitle":"Pomocný titulek","cssStyle":"Styl","ok":"OK","cancel":"Zrušit","close":"Zavřít","preview":"Náhled","resize":"Uchopit pro změnu velikosti","generalTab":"Obecné","advancedTab":"Rozšířené","validateNumberFailed":"Zadaná hodnota není číselná.","confirmNewPage":"Jakékoliv neuložené změny obsahu budou ztraceny. Skutečně chcete otevřít novou stránku?","confirmCancel":"Některá z nastavení byla změněna. Skutečně chcete zavřít dialogové okno?","options":"Nastavení","target":"Cíl","targetNew":"Nové okno (_blank)","targetTop":"Okno nejvyšší úrovně (_top)","targetSelf":"Stejné okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zleva doprava (LTR)","langDirRTL":"Zprava doleva (RTL)","styles":"Styly","cssClasses":"Třídy stylů","width":"Šířka","height":"Výška","align":"Zarovnání","alignLeft":"Vlevo","alignRight":"Vpravo","alignCenter":"Na střed","alignJustify":"Zarovnat do bloku","alignTop":"Nahoru","alignMiddle":"Na střed","alignBottom":"Dolů","alignNone":"Žádné","invalidValue":"Neplatná hodnota.","invalidHeight":"Zadaná výška musí být číslo.","invalidWidth":"Šířka musí být číslo.","invalidCssLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry CSS (px, %, in, cm, mm, em, ex, pt, nebo pc).","invalidHtmlLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry HTML (px nebo %).","invalidInlineStyle":"Hodnota určená pro řádkový styl se musí skládat z jedné nebo více n-tic ve formátu \"název : hodnota\", oddělené středníky","cssLengthTooltip":"Zadejte číslo jako hodnotu v pixelech nebo číslo s platnou jednotkou CSS (px, %, v cm, mm, em, ex, pt, nebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupné</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O aplikaci CKEditor","help":"Prohlédněte si $1 pro nápovědu.","moreInfo":"Pro informace o lincenci navštivte naši webovou stránku:","title":"O aplikaci CKEditor","userGuide":"Uživatelská příručka CKEditor"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Přeškrtnuté","subscript":"Dolní index","superscript":"Horní index","underline":"Podtržené"},"bidi":{"ltr":"Směr textu zleva doprava","rtl":"Směr textu zprava doleva"},"blockquote":{"toolbar":"Citace"},"clipboard":{"copy":"Kopírovat","copyError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro kopírování zvoleného textu do schránky. Prosím zkopírujte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+C).","cut":"Vyjmout","cutError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro vyjmutí zvoleného textu do schránky. Prosím vyjměte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+X).","paste":"Vložit","pasteArea":"Oblast vkládání","pasteMsg":"Do následujícího pole vložte požadovaný obsah pomocí klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) a stiskněte <STRONG>OK</STRONG>.","securityMsg":"Z důvodů nastavení bezpečnosti vašeho prohlížeče nemůže editor přistupovat přímo do schránky. Obsah schránky prosím vložte znovu do tohoto okna.","title":"Vložit"},"button":{"selectedLabel":"%1 (Vybráno)"},"colorbutton":{"auto":"Automaticky","bgColorTitle":"Barva pozadí","colors":{"000":"Černá","800000":"Kaštanová","8B4513":"Sedlová hněď","2F4F4F":"Tmavě bledě šedá","008080":"Čírka","000080":"Námořnická modř","4B0082":"Inkoustová","696969":"Tmavě šedá","B22222":"Pálená cihla","A52A2A":"Hnědá","DAA520":"Zlatý prut","006400":"Tmavě zelená","40E0D0":"Tyrkisová","0000CD":"Středně modrá","800080":"Purpurová","808080":"Šedá","F00":"Červená","FF8C00":"Tmavě oranžová","FFD700":"Zlatá","008000":"Zelená","0FF":"Azurová","00F":"Modrá","EE82EE":"Fialová","A9A9A9":"Kalně šedá","FFA07A":"Světle lososová","FFA500":"Oranžová","FFFF00":"Žlutá","00FF00":"Limetková","AFEEEE":"Bledě tyrkisová","ADD8E6":"Světle modrá","DDA0DD":"Švestková","D3D3D3":"Světle šedá","FFF0F5":"Levandulově ruměnná","FAEBD7":"Antická bílá","FFFFE0":"Světle žlutá","F0FFF0":"Medová rosa","F0FFFF":"Azurová","F0F8FF":"Alenčina modrá","E6E6FA":"Levandulová","FFF":"Bílá"},"more":"Více barev...","panelTitle":"Barvy","textColorTitle":"Barva textu"},"colordialog":{"clear":"Vyčistit","highlight":"Zvýraznit","options":"Nastavení barvy","selected":"Vybráno","title":"Výběr barvy"},"templates":{"button":"Šablony","emptyListMsg":"(Není definována žádná šablona)","insertOption":"Nahradit aktuální obsah","options":"Nastavení šablon","selectPromptMsg":"Prosím zvolte šablonu pro otevření v editoru<br>(aktuální obsah editoru bude ztracen):","title":"Šablony obsahu"},"contextmenu":{"options":"Nastavení kontextové nabídky"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Nápovědní titulek","cssClassInputLabel":"Třídy stylů","edit":"Změnit Div","inlineStyleInputLabel":"Vnitřní styly","langDirLTRLabel":"Zleva doprava (LTR)","langDirLabel":"Směr jazyka","langDirRTLLabel":"Zprava doleva (RTL)","languageCodeInputLabel":" Kód jazyka","remove":"Odstranit Div","styleSelectLabel":"Styly","title":"Vytvořit Div kontejner","toolbar":"Vytvořit Div kontejner"},"toolbar":{"toolbarCollapse":"Skrýt panel nástrojů","toolbarExpand":"Zobrazit panel nástrojů","toolbarGroups":{"document":"Dokument","clipboard":"Schránka/Zpět","editing":"Úpravy","forms":"Formuláře","basicstyles":"Základní styly","paragraph":"Odstavec","links":"Odkazy","insert":"Vložit","styles":"Styly","colors":"Barvy","tools":"Nástroje"},"toolbars":"Panely nástrojů editoru"},"elementspath":{"eleLabel":"Cesta objektu","eleTitle":"%1 objekt"},"find":{"find":"Hledat","findOptions":"Možnosti hledání","findWhat":"Co hledat:","matchCase":"Rozlišovat velikost písma","matchCyclic":"Procházet opakovaně","matchWord":"Pouze celá slova","notFoundMsg":"Hledaný text nebyl nalezen.","replace":"Nahradit","replaceAll":"Nahradit vše","replaceSuccessMsg":"%1 nahrazení.","replaceWith":"Čím nahradit:","title":"Najít a nahradit"},"fakeobjects":{"anchor":"Záložka","flash":"Flash animace","hiddenfield":"Skryté pole","iframe":"IFrame","unknown":"Neznámý objekt"},"flash":{"access":"Přístup ke skriptu","accessAlways":"Vždy","accessNever":"Nikdy","accessSameDomain":"Ve stejné doméně","alignAbsBottom":"Zcela dolů","alignAbsMiddle":"Doprostřed","alignBaseline":"Na účaří","alignTextTop":"Na horní okraj textu","bgcolor":"Barva pozadí","chkFull":"Povolit celoobrazovkový režim","chkLoop":"Opakování","chkMenu":"Nabídka Flash","chkPlay":"Automatické spuštění","flashvars":"Proměnné pro Flash","hSpace":"Horizontální mezera","properties":"Vlastnosti Flashe","propertiesTab":"Vlastnosti","quality":"Kvalita","qualityAutoHigh":"Vysoká - auto","qualityAutoLow":"Nízká - auto","qualityBest":"Nejlepší","qualityHigh":"Vysoká","qualityLow":"Nejnižší","qualityMedium":"Střední","scale":"Zobrazit","scaleAll":"Zobrazit vše","scaleFit":"Přizpůsobit","scaleNoBorder":"Bez okraje","title":"Vlastnosti Flashe","vSpace":"Vertikální mezera","validateHSpace":"Zadaná horizontální mezera musí být číslo.","validateSrc":"Zadejte prosím URL odkazu","validateVSpace":"Zadaná vertikální mezera musí být číslo.","windowMode":"Režim okna","windowModeOpaque":"Neprůhledné","windowModeTransparent":"Průhledné","windowModeWindow":"Okno"},"font":{"fontSize":{"label":"Velikost","voiceLabel":"Velikost písma","panelTitle":"Velikost"},"label":"Písmo","panelTitle":"Písmo","voiceLabel":"Písmo"},"forms":{"button":{"title":"Vlastnosti tlačítka","text":"Popisek","type":"Typ","typeBtn":"Tlačítko","typeSbm":"Odeslat","typeRst":"Obnovit"},"checkboxAndRadio":{"checkboxTitle":"Vlastnosti zaškrtávacího políčka","radioTitle":"Vlastnosti přepínače","value":"Hodnota","selected":"Zaškrtnuto","required":"Vyžadováno"},"form":{"title":"Vlastnosti formuláře","menu":"Vlastnosti formuláře","action":"Akce","method":"Metoda","encoding":"Kódování"},"hidden":{"title":"Vlastnosti skrytého pole","name":"Název","value":"Hodnota"},"select":{"title":"Vlastnosti seznamu","selectInfo":"Info","opAvail":"Dostupná nastavení","value":"Hodnota","size":"Velikost","lines":"Řádků","chkMulti":"Povolit mnohonásobné výběry","required":"Vyžadováno","opText":"Text","opValue":"Hodnota","btnAdd":"Přidat","btnModify":"Změnit","btnUp":"Nahoru","btnDown":"Dolů","btnSetValue":"Nastavit jako vybranou hodnotu","btnDelete":"Smazat"},"textarea":{"title":"Vlastnosti textové oblasti","cols":"Sloupců","rows":"Řádků"},"textfield":{"title":"Vlastnosti textového pole","name":"Název","value":"Hodnota","charWidth":"Šířka ve znacích","maxChars":"Maximální počet znaků","required":"Vyžadováno","type":"Typ","typeText":"Text","typePass":"Heslo","typeEmail":"Email","typeSearch":"Hledat","typeTel":"Telefonní číslo","typeUrl":"URL"}},"format":{"label":"Formát","panelTitle":"Formát","tag_address":"Adresa","tag_div":"Normální (DIV)","tag_h1":"Nadpis 1","tag_h2":"Nadpis 2","tag_h3":"Nadpis 3","tag_h4":"Nadpis 4","tag_h5":"Nadpis 5","tag_h6":"Nadpis 6","tag_p":"Normální","tag_pre":"Naformátováno"},"horizontalrule":{"toolbar":"Vložit vodorovnou linku"},"iframe":{"border":"Zobrazit okraj","noUrl":"Zadejte prosím URL obsahu pro IFrame","scrolling":"Zapnout posuvníky","title":"Vlastnosti IFrame","toolbar":"IFrame"},"image":{"alt":"Alternativní text","border":"Okraje","btnUpload":"Odeslat na server","button2Img":"Skutečně chcete převést zvolené obrázkové tlačítko na obyčejný obrázek?","hSpace":"Horizontální mezera","img2Button":"Skutečně chcete převést zvolený obrázek na obrázkové tlačítko?","infoTab":"Informace o obrázku","linkTab":"Odkaz","lockRatio":"Zámek","menu":"Vlastnosti obrázku","resetSize":"Původní velikost","title":"Vlastnosti obrázku","titleButton":"Vlastností obrázkového tlačítka","upload":"Odeslat","urlMissing":"Zadané URL zdroje obrázku nebylo nalezeno.","vSpace":"Vertikální mezera","validateBorder":"Okraj musí být nastaven v celých číslech.","validateHSpace":"Horizontální mezera musí být nastavena v celých číslech.","validateVSpace":"Vertikální mezera musí být nastavena v celých číslech."},"indent":{"indent":"Zvětšit odsazení","outdent":"Zmenšit odsazení"},"smiley":{"options":"Nastavení smajlíků","title":"Vkládání smajlíků","toolbar":"Smajlíci"},"justify":{"block":"Zarovnat do bloku","center":"Zarovnat na střed","left":"Zarovnat vlevo","right":"Zarovnat vpravo"},"language":{"button":"Nastavit jazyk","remove":"Odstranit jazyk"},"link":{"acccessKey":"Přístupový klíč","advanced":"Rozšířené","advisoryContentType":"Pomocný typ obsahu","advisoryTitle":"Pomocný titulek","anchor":{"toolbar":"Záložka","menu":"Vlastnosti záložky","title":"Vlastnosti záložky","name":"Název záložky","errorName":"Zadejte prosím název záložky","remove":"Odstranit záložku"},"anchorId":"Podle Id objektu","anchorName":"Podle jména kotvy","charset":"Přiřazená znaková sada","cssClasses":"Třída stylu","emailAddress":"E-mailová adresa","emailBody":"Tělo zprávy","emailSubject":"Předmět zprávy","id":"Id","info":"Informace o odkazu","langCode":"Kód jazyka","langDir":"Směr jazyka","langDirLTR":"Zleva doprava (LTR)","langDirRTL":"Zprava doleva (RTL)","menu":"Změnit odkaz","name":"Jméno","noAnchors":"(Ve stránce není definována žádná kotva!)","noEmail":"Zadejte prosím e-mailovou adresu","noUrl":"Zadejte prosím URL odkazu","other":"<jiný>","popupDependent":"Závislost (Netscape)","popupFeatures":"Vlastnosti vyskakovacího okna","popupFullScreen":"Celá obrazovka (IE)","popupLeft":"Levý okraj","popupLocationBar":"Panel umístění","popupMenuBar":"Panel nabídky","popupResizable":"Umožňující měnit velikost","popupScrollBars":"Posuvníky","popupStatusBar":"Stavový řádek","popupToolbar":"Panel nástrojů","popupTop":"Horní okraj","rel":"Vztah","selectAnchor":"Vybrat kotvu","styles":"Styl","tabIndex":"Pořadí prvku","target":"Cíl","targetFrame":"<rámec>","targetFrameName":"Název cílového rámu","targetPopup":"<vyskakovací okno>","targetPopupName":"Název vyskakovacího okna","title":"Odkaz","toAnchor":"Kotva v této stránce","toEmail":"E-mail","toUrl":"URL","toolbar":"Odkaz","type":"Typ odkazu","unlink":"Odstranit odkaz","upload":"Odeslat"},"list":{"bulletedlist":"Odrážky","numberedlist":"Číslování"},"liststyle":{"armenian":"Arménské","bulletedTitle":"Vlastnosti odrážek","circle":"Kroužky","decimal":"Arabská čísla (1, 2, 3, atd.)","decimalLeadingZero":"Arabská čísla uvozená nulou (01, 02, 03, atd.)","disc":"Kolečka","georgian":"Gruzínské (an, ban, gan, atd.)","lowerAlpha":"Malá latinka (a, b, c, d, e, atd.)","lowerGreek":"Malé řecké (alpha, beta, gamma, atd.)","lowerRoman":"Malé římské (i, ii, iii, iv, v, atd.)","none":"Nic","notset":"<nenastaveno>","numberedTitle":"Vlastnosti číslování","square":"Čtverce","start":"Počátek","type":"Typ","upperAlpha":"Velká latinka (A, B, C, D, E, atd.)","upperRoman":"Velké římské (I, II, III, IV, V, atd.)","validateStartNumber":"Číslování musí začínat celým číslem."},"magicline":{"title":"zde vložit odstavec"},"maximize":{"maximize":"Maximalizovat","minimize":"Minimalizovat"},"newpage":{"toolbar":"Nová stránka"},"pagebreak":{"alt":"Konec stránky","toolbar":"Vložit konec stránky"},"pastetext":{"button":"Vložit jako čistý text","title":"Vložit jako čistý text"},"pastefromword":{"confirmCleanup":"Jak je vidět, vkládaný text je kopírován z Wordu. Chcete jej před vložením vyčistit?","error":"Z důvodu vnitřní chyby nebylo možné provést vyčištění vkládaného textu.","title":"Vložit z Wordu","toolbar":"Vložit z Wordu"},"preview":{"preview":"Náhled"},"print":{"toolbar":"Tisk"},"removeformat":{"toolbar":"Odstranit formátování"},"save":{"toolbar":"Uložit"},"selectall":{"toolbar":"Vybrat vše"},"showblocks":{"toolbar":"Ukázat bloky"},"sourcearea":{"toolbar":"Zdroj"},"specialchar":{"options":"Nastavení speciálních znaků","title":"Výběr speciálního znaku","toolbar":"Vložit speciální znaky"},"scayt":{"btn_about":"O aplikaci SCAYT","btn_dictionaries":"Slovníky","btn_disable":"Vypnout SCAYT","btn_enable":"Zapnout SCAYT","btn_langs":"Jazyky","btn_options":"Nastavení","text_title":"Kontrola pravopisu během psaní (SCAYT)"},"stylescombo":{"label":"Styl","panelTitle":"Formátovací styly","panelTitle1":"Blokové styly","panelTitle2":"Řádkové styly","panelTitle3":"Objektové styly"},"table":{"border":"Ohraničení","caption":"Popis","cell":{"menu":"Buňka","insertBefore":"Vložit buňku před","insertAfter":"Vložit buňku za","deleteCell":"Smazat buňky","merge":"Sloučit buňky","mergeRight":"Sloučit doprava","mergeDown":"Sloučit dolů","splitHorizontal":"Rozdělit buňky vodorovně","splitVertical":"Rozdělit buňky svisle","title":"Vlastnosti buňky","cellType":"Typ buňky","rowSpan":"Spojit řádky","colSpan":"Spojit sloupce","wordWrap":"Zalamování","hAlign":"Vodorovné zarovnání","vAlign":"Svislé zarovnání","alignBaseline":"Na účaří","bgColor":"Barva pozadí","borderColor":"Barva okraje","data":"Data","header":"Hlavička","yes":"Ano","no":"Ne","invalidWidth":"Šířka buňky musí být číslo.","invalidHeight":"Zadaná výška buňky musí být číslená.","invalidRowSpan":"Zadaný počet sloučených řádků musí být celé číslo.","invalidColSpan":"Zadaný počet sloučených sloupců musí být celé číslo.","chooseColor":"Výběr"},"cellPad":"Odsazení obsahu v buňce","cellSpace":"Vzdálenost buněk","column":{"menu":"Sloupec","insertBefore":"Vložit sloupec před","insertAfter":"Vložit sloupec za","deleteColumn":"Smazat sloupec"},"columns":"Sloupce","deleteTable":"Smazat tabulku","headers":"Záhlaví","headersBoth":"Obojí","headersColumn":"První sloupec","headersNone":"Žádné","headersRow":"První řádek","invalidBorder":"Zdaná velikost okraje musí být číselná.","invalidCellPadding":"Zadané odsazení obsahu v buňce musí být číselné.","invalidCellSpacing":"Zadaná vzdálenost buněk musí být číselná.","invalidCols":"Počet sloupců musí být číslo větší než 0.","invalidHeight":"Zadaná výška tabulky musí být číselná.","invalidRows":"Počet řádků musí být číslo větší než 0.","invalidWidth":"Šířka tabulky musí být číslo.","menu":"Vlastnosti tabulky","row":{"menu":"Řádek","insertBefore":"Vložit řádek před","insertAfter":"Vložit řádek za","deleteRow":"Smazat řádky"},"rows":"Řádky","summary":"Souhrn","title":"Vlastnosti tabulky","toolbar":"Tabulka","widthPc":"procent","widthPx":"bodů","widthUnit":"jednotka šířky"},"undo":{"redo":"Znovu","undo":"Zpět"},"wsc":{"btnIgnore":"Přeskočit","btnIgnoreAll":"Přeskakovat vše","btnReplace":"Zaměnit","btnReplaceAll":"Zaměňovat vše","btnUndo":"Zpět","changeTo":"Změnit na","errorLoading":"Chyba nahrávání služby aplikace z: %s.","ieSpellDownload":"Kontrola pravopisu není nainstalována. Chcete ji nyní stáhnout?","manyChanges":"Kontrola pravopisu dokončena: %1 slov změněno","noChanges":"Kontrola pravopisu dokončena: Beze změn","noMispell":"Kontrola pravopisu dokončena: Žádné pravopisné chyby nenalezeny","noSuggestions":"- žádné návrhy -","notAvailable":"Omlouváme se, ale služba nyní není dostupná.","notInDic":"Není ve slovníku","oneChange":"Kontrola pravopisu dokončena: Jedno slovo změněno","progress":"Probíhá kontrola pravopisu...","title":"Kontrola pravopisu","toolbar":"Zkontrolovat pravopis"}};
\ No newline at end of file
+CKEDITOR.lang['cs']={"editor":"Textový editor","editorPanel":"Panel textového editoru","common":{"editorHelp":"Stiskněte ALT 0 pro nápovědu","browseServer":"Vybrat na serveru","url":"URL","protocol":"Protokol","upload":"Odeslat","uploadSubmit":"Odeslat na server","image":"Obrázek","flash":"Flash","form":"Formulář","checkbox":"Zaškrtávací políčko","radio":"Přepínač","textField":"Textové pole","textarea":"Textová oblast","hiddenField":"Skryté pole","button":"Tlačítko","select":"Seznam","imageButton":"Obrázkové tlačítko","notSet":"<nenastaveno>","id":"Id","name":"Jméno","langDir":"Směr jazyka","langDirLtr":"Zleva doprava (LTR)","langDirRtl":"Zprava doleva (RTL)","langCode":"Kód jazyka","longDescr":"Dlouhý popis URL","cssClass":"Třída stylu","advisoryTitle":"Pomocný titulek","cssStyle":"Styl","ok":"OK","cancel":"Zrušit","close":"Zavřít","preview":"Náhled","resize":"Uchopit pro změnu velikosti","generalTab":"Obecné","advancedTab":"Rozšířené","validateNumberFailed":"Zadaná hodnota není číselná.","confirmNewPage":"Jakékoliv neuložené změny obsahu budou ztraceny. Skutečně chcete otevřít novou stránku?","confirmCancel":"Některá z nastavení byla změněna. Skutečně chcete zavřít dialogové okno?","options":"Nastavení","target":"Cíl","targetNew":"Nové okno (_blank)","targetTop":"Okno nejvyšší úrovně (_top)","targetSelf":"Stejné okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zleva doprava (LTR)","langDirRTL":"Zprava doleva (RTL)","styles":"Styly","cssClasses":"Třídy stylů","width":"Šířka","height":"Výška","align":"Zarovnání","alignLeft":"Vlevo","alignRight":"Vpravo","alignCenter":"Na střed","alignJustify":"Zarovnat do bloku","alignTop":"Nahoru","alignMiddle":"Na střed","alignBottom":"Dolů","alignNone":"Žádné","invalidValue":"Neplatná hodnota.","invalidHeight":"Zadaná výška musí být číslo.","invalidWidth":"Šířka musí být číslo.","invalidCssLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry CSS (px, %, in, cm, mm, em, ex, pt, nebo pc).","invalidHtmlLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry HTML (px nebo %).","invalidInlineStyle":"Hodnota určená pro řádkový styl se musí skládat z jedné nebo více n-tic ve formátu \"název : hodnota\", oddělené středníky","cssLengthTooltip":"Zadejte číslo jako hodnotu v pixelech nebo číslo s platnou jednotkou CSS (px, %, v cm, mm, em, ex, pt, nebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupné</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"Konec","36":"Domů","46":"Smazat","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O aplikaci CKEditor","help":"Prohlédněte si $1 pro nápovědu.","moreInfo":"Pro informace o lincenci navštivte naši webovou stránku:","title":"O aplikaci CKEditor","userGuide":"Uživatelská příručka CKEditor"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Přeškrtnuté","subscript":"Dolní index","superscript":"Horní index","underline":"Podtržené"},"bidi":{"ltr":"Směr textu zleva doprava","rtl":"Směr textu zprava doleva"},"blockquote":{"toolbar":"Citace"},"clipboard":{"copy":"Kopírovat","copyError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro kopírování zvoleného textu do schránky. Prosím zkopírujte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+C).","cut":"Vyjmout","cutError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro vyjmutí zvoleného textu do schránky. Prosím vyjměte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+X).","paste":"Vložit","pasteArea":"Oblast vkládání","pasteMsg":"Do následujícího pole vložte požadovaný obsah pomocí klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) a stiskněte <STRONG>OK</STRONG>.","securityMsg":"Z důvodů nastavení bezpečnosti vašeho prohlížeče nemůže editor přistupovat přímo do schránky. Obsah schránky prosím vložte znovu do tohoto okna.","title":"Vložit"},"button":{"selectedLabel":"%1 (Vybráno)"},"colorbutton":{"auto":"Automaticky","bgColorTitle":"Barva pozadí","colors":{"000":"Černá","800000":"Kaštanová","8B4513":"Sedlová hněď","2F4F4F":"Tmavě bledě šedá","008080":"Čírka","000080":"Námořnická modř","4B0082":"Inkoustová","696969":"Tmavě šedá","B22222":"Pálená cihla","A52A2A":"Hnědá","DAA520":"Zlatý prut","006400":"Tmavě zelená","40E0D0":"Tyrkisová","0000CD":"Středně modrá","800080":"Purpurová","808080":"Šedá","F00":"Červená","FF8C00":"Tmavě oranžová","FFD700":"Zlatá","008000":"Zelená","0FF":"Azurová","00F":"Modrá","EE82EE":"Fialová","A9A9A9":"Kalně šedá","FFA07A":"Světle lososová","FFA500":"Oranžová","FFFF00":"Žlutá","00FF00":"Limetková","AFEEEE":"Bledě tyrkisová","ADD8E6":"Světle modrá","DDA0DD":"Švestková","D3D3D3":"Světle šedá","FFF0F5":"Levandulově ruměnná","FAEBD7":"Antická bílá","FFFFE0":"Světle žlutá","F0FFF0":"Medová rosa","F0FFFF":"Azurová","F0F8FF":"Alenčina modrá","E6E6FA":"Levandulová","FFF":"Bílá","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Více barev...","panelTitle":"Barvy","textColorTitle":"Barva textu"},"colordialog":{"clear":"Vyčistit","highlight":"Zvýraznit","options":"Nastavení barvy","selected":"Vybráno","title":"Výběr barvy"},"templates":{"button":"Šablony","emptyListMsg":"(Není definována žádná šablona)","insertOption":"Nahradit aktuální obsah","options":"Nastavení šablon","selectPromptMsg":"Prosím zvolte šablonu pro otevření v editoru<br>(aktuální obsah editoru bude ztracen):","title":"Šablony obsahu"},"contextmenu":{"options":"Nastavení kontextové nabídky"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Nápovědní titulek","cssClassInputLabel":"Třídy stylů","edit":"Změnit Div","inlineStyleInputLabel":"Vnitřní styly","langDirLTRLabel":"Zleva doprava (LTR)","langDirLabel":"Směr jazyka","langDirRTLLabel":"Zprava doleva (RTL)","languageCodeInputLabel":" Kód jazyka","remove":"Odstranit Div","styleSelectLabel":"Styly","title":"Vytvořit Div kontejner","toolbar":"Vytvořit Div kontejner"},"toolbar":{"toolbarCollapse":"Skrýt panel nástrojů","toolbarExpand":"Zobrazit panel nástrojů","toolbarGroups":{"document":"Dokument","clipboard":"Schránka/Zpět","editing":"Úpravy","forms":"Formuláře","basicstyles":"Základní styly","paragraph":"Odstavec","links":"Odkazy","insert":"Vložit","styles":"Styly","colors":"Barvy","tools":"Nástroje"},"toolbars":"Panely nástrojů editoru"},"elementspath":{"eleLabel":"Cesta objektu","eleTitle":"%1 objekt"},"find":{"find":"Hledat","findOptions":"Možnosti hledání","findWhat":"Co hledat:","matchCase":"Rozlišovat velikost písma","matchCyclic":"Procházet opakovaně","matchWord":"Pouze celá slova","notFoundMsg":"Hledaný text nebyl nalezen.","replace":"Nahradit","replaceAll":"Nahradit vše","replaceSuccessMsg":"%1 nahrazení.","replaceWith":"Čím nahradit:","title":"Najít a nahradit"},"fakeobjects":{"anchor":"Záložka","flash":"Flash animace","hiddenfield":"Skryté pole","iframe":"IFrame","unknown":"Neznámý objekt"},"flash":{"access":"Přístup ke skriptu","accessAlways":"Vždy","accessNever":"Nikdy","accessSameDomain":"Ve stejné doméně","alignAbsBottom":"Zcela dolů","alignAbsMiddle":"Doprostřed","alignBaseline":"Na účaří","alignTextTop":"Na horní okraj textu","bgcolor":"Barva pozadí","chkFull":"Povolit celoobrazovkový režim","chkLoop":"Opakování","chkMenu":"Nabídka Flash","chkPlay":"Automatické spuštění","flashvars":"Proměnné pro Flash","hSpace":"Horizontální mezera","properties":"Vlastnosti Flashe","propertiesTab":"Vlastnosti","quality":"Kvalita","qualityAutoHigh":"Vysoká - auto","qualityAutoLow":"Nízká - auto","qualityBest":"Nejlepší","qualityHigh":"Vysoká","qualityLow":"Nejnižší","qualityMedium":"Střední","scale":"Zobrazit","scaleAll":"Zobrazit vše","scaleFit":"Přizpůsobit","scaleNoBorder":"Bez okraje","title":"Vlastnosti Flashe","vSpace":"Vertikální mezera","validateHSpace":"Zadaná horizontální mezera musí být číslo.","validateSrc":"Zadejte prosím URL odkazu","validateVSpace":"Zadaná vertikální mezera musí být číslo.","windowMode":"Režim okna","windowModeOpaque":"Neprůhledné","windowModeTransparent":"Průhledné","windowModeWindow":"Okno"},"font":{"fontSize":{"label":"Velikost","voiceLabel":"Velikost písma","panelTitle":"Velikost"},"label":"Písmo","panelTitle":"Písmo","voiceLabel":"Písmo"},"forms":{"button":{"title":"Vlastnosti tlačítka","text":"Popisek","type":"Typ","typeBtn":"Tlačítko","typeSbm":"Odeslat","typeRst":"Obnovit"},"checkboxAndRadio":{"checkboxTitle":"Vlastnosti zaškrtávacího políčka","radioTitle":"Vlastnosti přepínače","value":"Hodnota","selected":"Zaškrtnuto","required":"Vyžadováno"},"form":{"title":"Vlastnosti formuláře","menu":"Vlastnosti formuláře","action":"Akce","method":"Metoda","encoding":"Kódování"},"hidden":{"title":"Vlastnosti skrytého pole","name":"Název","value":"Hodnota"},"select":{"title":"Vlastnosti seznamu","selectInfo":"Info","opAvail":"Dostupná nastavení","value":"Hodnota","size":"Velikost","lines":"Řádků","chkMulti":"Povolit mnohonásobné výběry","required":"Vyžadováno","opText":"Text","opValue":"Hodnota","btnAdd":"Přidat","btnModify":"Změnit","btnUp":"Nahoru","btnDown":"Dolů","btnSetValue":"Nastavit jako vybranou hodnotu","btnDelete":"Smazat"},"textarea":{"title":"Vlastnosti textové oblasti","cols":"Sloupců","rows":"Řádků"},"textfield":{"title":"Vlastnosti textového pole","name":"Název","value":"Hodnota","charWidth":"Šířka ve znacích","maxChars":"Maximální počet znaků","required":"Vyžadováno","type":"Typ","typeText":"Text","typePass":"Heslo","typeEmail":"Email","typeSearch":"Hledat","typeTel":"Telefonní číslo","typeUrl":"URL"}},"format":{"label":"Formát","panelTitle":"Formát","tag_address":"Adresa","tag_div":"Normální (DIV)","tag_h1":"Nadpis 1","tag_h2":"Nadpis 2","tag_h3":"Nadpis 3","tag_h4":"Nadpis 4","tag_h5":"Nadpis 5","tag_h6":"Nadpis 6","tag_p":"Normální","tag_pre":"Naformátováno"},"horizontalrule":{"toolbar":"Vložit vodorovnou linku"},"iframe":{"border":"Zobrazit okraj","noUrl":"Zadejte prosím URL obsahu pro IFrame","scrolling":"Zapnout posuvníky","title":"Vlastnosti IFrame","toolbar":"IFrame"},"image":{"alt":"Alternativní text","border":"Okraje","btnUpload":"Odeslat na server","button2Img":"Skutečně chcete převést zvolené obrázkové tlačítko na obyčejný obrázek?","hSpace":"Horizontální mezera","img2Button":"Skutečně chcete převést zvolený obrázek na obrázkové tlačítko?","infoTab":"Informace o obrázku","linkTab":"Odkaz","lockRatio":"Zámek","menu":"Vlastnosti obrázku","resetSize":"Původní velikost","title":"Vlastnosti obrázku","titleButton":"Vlastností obrázkového tlačítka","upload":"Odeslat","urlMissing":"Zadané URL zdroje obrázku nebylo nalezeno.","vSpace":"Vertikální mezera","validateBorder":"Okraj musí být nastaven v celých číslech.","validateHSpace":"Horizontální mezera musí být nastavena v celých číslech.","validateVSpace":"Vertikální mezera musí být nastavena v celých číslech."},"indent":{"indent":"Zvětšit odsazení","outdent":"Zmenšit odsazení"},"smiley":{"options":"Nastavení smajlíků","title":"Vkládání smajlíků","toolbar":"Smajlíci"},"justify":{"block":"Zarovnat do bloku","center":"Zarovnat na střed","left":"Zarovnat vlevo","right":"Zarovnat vpravo"},"language":{"button":"Nastavit jazyk","remove":"Odstranit jazyk"},"link":{"acccessKey":"Přístupový klíč","advanced":"Rozšířené","advisoryContentType":"Pomocný typ obsahu","advisoryTitle":"Pomocný titulek","anchor":{"toolbar":"Záložka","menu":"Vlastnosti záložky","title":"Vlastnosti záložky","name":"Název záložky","errorName":"Zadejte prosím název záložky","remove":"Odstranit záložku"},"anchorId":"Podle Id objektu","anchorName":"Podle jména kotvy","charset":"Přiřazená znaková sada","cssClasses":"Třída stylu","download":"Force Download","displayText":"Zobrazit text","emailAddress":"E-mailová adresa","emailBody":"Tělo zprávy","emailSubject":"Předmět zprávy","id":"Id","info":"Informace o odkazu","langCode":"Kód jazyka","langDir":"Směr jazyka","langDirLTR":"Zleva doprava (LTR)","langDirRTL":"Zprava doleva (RTL)","menu":"Změnit odkaz","name":"Jméno","noAnchors":"(Ve stránce není definována žádná kotva!)","noEmail":"Zadejte prosím e-mailovou adresu","noUrl":"Zadejte prosím URL odkazu","other":"<jiný>","popupDependent":"Závislost (Netscape)","popupFeatures":"Vlastnosti vyskakovacího okna","popupFullScreen":"Celá obrazovka (IE)","popupLeft":"Levý okraj","popupLocationBar":"Panel umístění","popupMenuBar":"Panel nabídky","popupResizable":"Umožňující měnit velikost","popupScrollBars":"Posuvníky","popupStatusBar":"Stavový řádek","popupToolbar":"Panel nástrojů","popupTop":"Horní okraj","rel":"Vztah","selectAnchor":"Vybrat kotvu","styles":"Styl","tabIndex":"Pořadí prvku","target":"Cíl","targetFrame":"<rámec>","targetFrameName":"Název cílového rámu","targetPopup":"<vyskakovací okno>","targetPopupName":"Název vyskakovacího okna","title":"Odkaz","toAnchor":"Kotva v této stránce","toEmail":"E-mail","toUrl":"URL","toolbar":"Odkaz","type":"Typ odkazu","unlink":"Odstranit odkaz","upload":"Odeslat"},"list":{"bulletedlist":"Odrážky","numberedlist":"Číslování"},"liststyle":{"armenian":"Arménské","bulletedTitle":"Vlastnosti odrážek","circle":"Kroužky","decimal":"Arabská čísla (1, 2, 3, atd.)","decimalLeadingZero":"Arabská čísla uvozená nulou (01, 02, 03, atd.)","disc":"Kolečka","georgian":"Gruzínské (an, ban, gan, atd.)","lowerAlpha":"Malá latinka (a, b, c, d, e, atd.)","lowerGreek":"Malé řecké (alpha, beta, gamma, atd.)","lowerRoman":"Malé římské (i, ii, iii, iv, v, atd.)","none":"Nic","notset":"<nenastaveno>","numberedTitle":"Vlastnosti číslování","square":"Čtverce","start":"Počátek","type":"Typ","upperAlpha":"Velká latinka (A, B, C, D, E, atd.)","upperRoman":"Velké římské (I, II, III, IV, V, atd.)","validateStartNumber":"Číslování musí začínat celým číslem."},"magicline":{"title":"zde vložit odstavec"},"maximize":{"maximize":"Maximalizovat","minimize":"Minimalizovat"},"newpage":{"toolbar":"Nová stránka"},"pagebreak":{"alt":"Konec stránky","toolbar":"Vložit konec stránky"},"pastetext":{"button":"Vložit jako čistý text","title":"Vložit jako čistý text"},"pastefromword":{"confirmCleanup":"Jak je vidět, vkládaný text je kopírován z Wordu. Chcete jej před vložením vyčistit?","error":"Z důvodu vnitřní chyby nebylo možné provést vyčištění vkládaného textu.","title":"Vložit z Wordu","toolbar":"Vložit z Wordu"},"preview":{"preview":"Náhled"},"print":{"toolbar":"Tisk"},"removeformat":{"toolbar":"Odstranit formátování"},"save":{"toolbar":"Uložit"},"selectall":{"toolbar":"Vybrat vše"},"showblocks":{"toolbar":"Ukázat bloky"},"sourcearea":{"toolbar":"Zdroj"},"specialchar":{"options":"Nastavení speciálních znaků","title":"Výběr speciálního znaku","toolbar":"Vložit speciální znaky"},"scayt":{"btn_about":"O aplikaci SCAYT","btn_dictionaries":"Slovníky","btn_disable":"Vypnout SCAYT","btn_enable":"Zapnout SCAYT","btn_langs":"Jazyky","btn_options":"Nastavení","text_title":"Kontrola pravopisu během psaní (SCAYT)"},"stylescombo":{"label":"Styl","panelTitle":"Formátovací styly","panelTitle1":"Blokové styly","panelTitle2":"Řádkové styly","panelTitle3":"Objektové styly"},"table":{"border":"Ohraničení","caption":"Popis","cell":{"menu":"Buňka","insertBefore":"Vložit buňku před","insertAfter":"Vložit buňku za","deleteCell":"Smazat buňky","merge":"Sloučit buňky","mergeRight":"Sloučit doprava","mergeDown":"Sloučit dolů","splitHorizontal":"Rozdělit buňky vodorovně","splitVertical":"Rozdělit buňky svisle","title":"Vlastnosti buňky","cellType":"Typ buňky","rowSpan":"Spojit řádky","colSpan":"Spojit sloupce","wordWrap":"Zalamování","hAlign":"Vodorovné zarovnání","vAlign":"Svislé zarovnání","alignBaseline":"Na účaří","bgColor":"Barva pozadí","borderColor":"Barva okraje","data":"Data","header":"Hlavička","yes":"Ano","no":"Ne","invalidWidth":"Šířka buňky musí být číslo.","invalidHeight":"Zadaná výška buňky musí být číslená.","invalidRowSpan":"Zadaný počet sloučených řádků musí být celé číslo.","invalidColSpan":"Zadaný počet sloučených sloupců musí být celé číslo.","chooseColor":"Výběr"},"cellPad":"Odsazení obsahu v buňce","cellSpace":"Vzdálenost buněk","column":{"menu":"Sloupec","insertBefore":"Vložit sloupec před","insertAfter":"Vložit sloupec za","deleteColumn":"Smazat sloupec"},"columns":"Sloupce","deleteTable":"Smazat tabulku","headers":"Záhlaví","headersBoth":"Obojí","headersColumn":"První sloupec","headersNone":"Žádné","headersRow":"První řádek","invalidBorder":"Zdaná velikost okraje musí být číselná.","invalidCellPadding":"Zadané odsazení obsahu v buňce musí být číselné.","invalidCellSpacing":"Zadaná vzdálenost buněk musí být číselná.","invalidCols":"Počet sloupců musí být číslo větší než 0.","invalidHeight":"Zadaná výška tabulky musí být číselná.","invalidRows":"Počet řádků musí být číslo větší než 0.","invalidWidth":"Šířka tabulky musí být číslo.","menu":"Vlastnosti tabulky","row":{"menu":"Řádek","insertBefore":"Vložit řádek před","insertAfter":"Vložit řádek za","deleteRow":"Smazat řádky"},"rows":"Řádky","summary":"Souhrn","title":"Vlastnosti tabulky","toolbar":"Tabulka","widthPc":"procent","widthPx":"bodů","widthUnit":"jednotka šířky"},"undo":{"redo":"Znovu","undo":"Zpět"},"wsc":{"btnIgnore":"Přeskočit","btnIgnoreAll":"Přeskakovat vše","btnReplace":"Zaměnit","btnReplaceAll":"Zaměňovat vše","btnUndo":"Zpět","changeTo":"Změnit na","errorLoading":"Chyba nahrávání služby aplikace z: %s.","ieSpellDownload":"Kontrola pravopisu není nainstalována. Chcete ji nyní stáhnout?","manyChanges":"Kontrola pravopisu dokončena: %1 slov změněno","noChanges":"Kontrola pravopisu dokončena: Beze změn","noMispell":"Kontrola pravopisu dokončena: Žádné pravopisné chyby nenalezeny","noSuggestions":"- žádné návrhy -","notAvailable":"Omlouváme se, ale služba nyní není dostupná.","notInDic":"Není ve slovníku","oneChange":"Kontrola pravopisu dokončena: Jedno slovo změněno","progress":"Probíhá kontrola pravopisu...","title":"Kontrola pravopisu","toolbar":"Zkontrolovat pravopis"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/lang/cy.js
index a40963abf2e..25d6210af20 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/cy.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/cy.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['cy']={"editor":"Golygydd Testun Cyfoethog","editorPanel":"Panel Golygydd Testun Cyfoethog","common":{"editorHelp":"Gwasgwch ALT 0 am gymorth","browseServer":"Pori'r Gweinydd","url":"URL","protocol":"Protocol","upload":"Lanlwytho","uploadSubmit":"Anfon i'r Gweinydd","image":"Delwedd","flash":"Flash","form":"Ffurflen","checkbox":"Blwch ticio","radio":"Botwm Radio","textField":"Maes Testun","textarea":"Ardal Testun","hiddenField":"Maes Cudd","button":"Botwm","select":"Maes Dewis","imageButton":"Botwm Delwedd","notSet":"<heb osod>","id":"Id","name":"Name","langDir":"Cyfeiriad Iaith","langDirLtr":"Chwith i'r Dde (LTR)","langDirRtl":"Dde i'r Chwith (RTL)","langCode":"Cod Iaith","longDescr":"URL Disgrifiad Hir","cssClass":"Dosbarthiadau Dalen Arddull","advisoryTitle":"Teitl Cynghorol","cssStyle":"Arddull","ok":"Iawn","cancel":"Diddymu","close":"Cau","preview":"Rhagolwg","resize":"Ailfeintio","generalTab":"Cyffredinol","advancedTab":"Uwch","validateNumberFailed":"'Dyw'r gwerth hwn ddim yn rhif.","confirmNewPage":"Byddwch chi'n colli unrhyw newidiadau i'r cynnwys sydd heb eu cadw. Ydych am barhau i lwytho tudalen newydd?","confirmCancel":"Cafodd rhai o'r opsiynau eu newid. Ydych chi wir am gau'r deialog?","options":"Opsiynau","target":"Targed","targetNew":"Ffenest Newydd (_blank)","targetTop":"Ffenest ar y Brig (_top)","targetSelf":"Yr un Ffenest (_self)","targetParent":"Ffenest y Rhiant (_parent)","langDirLTR":"Chwith i'r Dde (LTR)","langDirRTL":"Dde i'r Chwith (RTL)","styles":"Arddull","cssClasses":"Dosbarthiadau Dalen Arddull","width":"Lled","height":"Uchder","align":"Alinio","alignLeft":"Chwith","alignRight":"Dde","alignCenter":"Canol","alignJustify":"Unioni","alignTop":"Brig","alignMiddle":"Canol","alignBottom":"Gwaelod","alignNone":"None","invalidValue":"Gwerth annilys.","invalidHeight":"Mae'n rhaid i'r uchder fod yn rhif.","invalidWidth":"Mae'n rhaid i'r lled fod yn rhif.","invalidCssLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad CSS dilys (px, %, in, cm, mm, em, ex, pt, neu pc).","invalidHtmlLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad HTML dilys (px neu %).","invalidInlineStyle":"Mae'n rhaid i'r gwerth ar gyfer arddull mewn-llinell gynnwys un set neu fwy ar y fformat \"enw : gwerth\", wedi'u gwahanu gyda hanner colon.","cssLengthTooltip":"Rhowch rif am werth mewn picsel neu rhif gydag uned CSS dilys (px, %, in, cm, mm, em, pt neu pc).","unavailable":"%1<span class=\"cke_accessibility\">, ddim ar gael</span>"},"about":{"copy":"Hawlfraint &copy; $1. Cedwir pob hawl.","dlgTitle":"Ynghylch CKEditor","help":"Gwirio $1 am gymorth.","moreInfo":"Am wybodaeth ynghylch trwyddedau, ewch i'n gwefan:","title":"Ynghylch CKEditor","userGuide":"Canllawiau Defnyddiwr CKEditor"},"basicstyles":{"bold":"Bras","italic":"Italig","strike":"Llinell Trwyddo","subscript":"Is-sgript","superscript":"Uwchsgript","underline":"Tanlinellu"},"bidi":{"ltr":"Cyfeiriad testun o'r chwith i'r dde","rtl":"Cyfeiriad testun o'r dde i'r chwith"},"blockquote":{"toolbar":"Dyfyniad bloc"},"clipboard":{"copy":"Copïo","copyError":"'Dyw gosodiadau diogelwch eich porwr ddim yn caniatàu'r golygydd i gynnal 'gweithredoedd copïo' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+C).","cut":"Torri","cutError":"Nid yw gosodiadau diogelwch eich porwr yn caniatàu'r golygydd i gynnal 'gweithredoedd torri' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+X).","paste":"Gludo","pasteArea":"Ardal Gludo","pasteMsg":"Gludwch i mewn i'r blwch canlynol gan ddefnyddio'r bysellfwrdd (<strong>Ctrl/Cmd+V</strong>) a phwyso <strong>Iawn</strong>.","securityMsg":"Oherwydd gosodiadau diogelwch eich porwr, 'dyw'r porwr ddim yn gallu ennill mynediad i'r data ar y clipfwrdd yn uniongyrchol. Mae angen i chi ei ludo eto i'r ffenestr hon.","title":"Gludo"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Awtomatig","bgColorTitle":"Lliw Cefndir","colors":{"000":"Du","800000":"Marwn","8B4513":"Brown Cyfrwy","2F4F4F":"Llechen Tywyll","008080":"Corhwyad","000080":"Nefi","4B0082":"Indigo","696969":"Llwyd Tywyll","B22222":"Bric Tân","A52A2A":"Brown","DAA520":"Rhoden Aur","006400":"Gwyrdd Tywyll","40E0D0":"Gwyrddlas","0000CD":"Glas Canolig","800080":"Porffor","808080":"Llwyd","F00":"Coch","FF8C00":"Oren Tywyll","FFD700":"Aur","008000":"Gwyrdd","0FF":"Cyan","00F":"Glas","EE82EE":"Fioled","A9A9A9":"Llwyd Pwl","FFA07A":"Samwn Golau","FFA500":"Oren","FFFF00":"Melyn","00FF00":"Leim","AFEEEE":"Gwyrddlas Golau","ADD8E6":"Glas Golau","DDA0DD":"Eirinen","D3D3D3":"Llwyd Golau","FFF0F5":"Gwrid Lafant","FAEBD7":"Gwyn Hynafol","FFFFE0":"Melyn Golau","F0FFF0":"Melwn Gwyrdd Golau","F0FFFF":"Aswr","F0F8FF":"Glas Alys","E6E6FA":"Lafant","FFF":"Gwyn"},"more":"Mwy o Liwiau...","panelTitle":"Lliwiau","textColorTitle":"Lliw Testun"},"colordialog":{"clear":"Clirio","highlight":"Uwcholeuo","options":"Opsiynau Lliw","selected":"Lliw a Ddewiswyd","title":"Dewis lliw"},"templates":{"button":"Templedi","emptyListMsg":"(Dim templedi wedi'u diffinio)","insertOption":"Amnewid y cynnwys go iawn","options":"Opsiynau Templedi","selectPromptMsg":"Dewiswch dempled i'w agor yn y golygydd","title":"Templedi Cynnwys"},"contextmenu":{"options":"Opsiynau Dewislen Cyd-destun"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Teitl Cynghorol","cssClassInputLabel":"Dosbarthiadau Ffeil Arddull","edit":"Golygu Div","inlineStyleInputLabel":"Arddull Mewn Llinell","langDirLTRLabel":"Chwith i'r Dde (LTR)","langDirLabel":"Cyfeiriad yr Iaith","langDirRTLLabel":"Dde i'r Chwith (RTL)","languageCodeInputLabel":" Cod Iaith","remove":"Tynnu Div","styleSelectLabel":"Arddull","title":"Creu Cynhwysydd Div","toolbar":"Creu Cynhwysydd Div"},"toolbar":{"toolbarCollapse":"Cyfangu'r Bar Offer","toolbarExpand":"Ehangu'r Bar Offer","toolbarGroups":{"document":"Dogfen","clipboard":"Clipfwrdd/Dadwneud","editing":"Golygu","forms":"Ffurflenni","basicstyles":"Arddulliau Sylfaenol","paragraph":"Paragraff","links":"Dolenni","insert":"Mewnosod","styles":"Arddulliau","colors":"Lliwiau","tools":"Offer"},"toolbars":"Bariau offer y golygydd"},"elementspath":{"eleLabel":"Llwybr elfennau","eleTitle":"Elfen %1"},"find":{"find":"Chwilio","findOptions":"Opsiynau Chwilio","findWhat":"Chwilio'r term:","matchCase":"Cydweddu'r cas","matchCyclic":"Cydweddu'n gylchol","matchWord":"Cydweddu gair cyfan","notFoundMsg":"Nid oedd y testun wedi'i ddarganfod.","replace":"Amnewid Un","replaceAll":"Amnewid Pob","replaceSuccessMsg":"Amnewidiwyd %1 achlysur.","replaceWith":"Amnewid gyda:","title":"Chwilio ac Amnewid"},"fakeobjects":{"anchor":"Angor","flash":"Animeiddiant Flash","hiddenfield":"Maes Cudd","iframe":"IFrame","unknown":"Gwrthrych Anhysbys"},"flash":{"access":"Mynediad Sgript","accessAlways":"Pob amser","accessNever":"Byth","accessSameDomain":"R'un parth","alignAbsBottom":"Gwaelod Abs","alignAbsMiddle":"Canol Abs","alignBaseline":"Baslinell","alignTextTop":"Testun Top","bgcolor":"Lliw cefndir","chkFull":"Caniatàu Sgrin Llawn","chkLoop":"Lwpio","chkMenu":"Galluogi Dewislen Flash","chkPlay":"AwtoChwarae","flashvars":"Newidynnau ar gyfer Flash","hSpace":"BwlchLl","properties":"Priodweddau Flash","propertiesTab":"Priodweddau","quality":"Ansawdd","qualityAutoHigh":"Uchel Awto","qualityAutoLow":"Isel Awto","qualityBest":"Gorau","qualityHigh":"Uchel","qualityLow":"Isel","qualityMedium":"Canolig","scale":"Graddfa","scaleAll":"Dangos pob","scaleFit":"Ffit Union","scaleNoBorder":"Dim Ymyl","title":"Priodweddau Flash","vSpace":"BwlchF","validateHSpace":"Rhaid i'r BwlchLl fod yn rhif.","validateSrc":"Ni all yr URL fod yn wag.","validateVSpace":"Rhaid i'r BwlchF fod yn rhif.","windowMode":"Modd ffenestr","windowModeOpaque":"Afloyw","windowModeTransparent":"Tryloyw","windowModeWindow":"Ffenestr"},"font":{"fontSize":{"label":"Maint","voiceLabel":"Maint y Ffont","panelTitle":"Maint y Ffont"},"label":"Ffont","panelTitle":"Enw'r Ffont","voiceLabel":"Ffont"},"forms":{"button":{"title":"Priodweddau Botymau","text":"Testun (Gwerth)","type":"Math","typeBtn":"Botwm","typeSbm":"Anfon","typeRst":"Ailosod"},"checkboxAndRadio":{"checkboxTitle":"Priodweddau Blwch Ticio","radioTitle":"Priodweddau Botwm Radio","value":"Gwerth","selected":"Dewiswyd","required":"Required"},"form":{"title":"Priodweddau Ffurflen","menu":"Priodweddau Ffurflen","action":"Gweithred","method":"Dull","encoding":"Amgodio"},"hidden":{"title":"Priodweddau Maes Cudd","name":"Enw","value":"Gwerth"},"select":{"title":"Priodweddau Maes Dewis","selectInfo":"Gwyb Dewis","opAvail":"Opsiynau ar Gael","value":"Gwerth","size":"Maint","lines":"llinellau","chkMulti":"Caniatàu aml-ddewisiadau","required":"Required","opText":"Testun","opValue":"Gwerth","btnAdd":"Ychwanegu","btnModify":"Newid","btnUp":"Lan","btnDown":"Lawr","btnSetValue":"Gosod fel gwerth a ddewiswyd","btnDelete":"Dileu"},"textarea":{"title":"Priodweddau Ardal Testun","cols":"Colofnau","rows":"Rhesi"},"textfield":{"title":"Priodweddau Maes Testun","name":"Enw","value":"Gwerth","charWidth":"Lled Nod","maxChars":"Uchafswm y Nodau","required":"Required","type":"Math","typeText":"Testun","typePass":"Cyfrinair","typeEmail":"Ebost","typeSearch":"Chwilio","typeTel":"Rhif Ffôn","typeUrl":"URL"}},"format":{"label":"Fformat","panelTitle":"Fformat Paragraff","tag_address":"Cyfeiriad","tag_div":"Normal (DIV)","tag_h1":"Pennawd 1","tag_h2":"Pennawd 2","tag_h3":"Pennawd 3","tag_h4":"Pennawd 4","tag_h5":"Pennawd 5","tag_h6":"Pennawd 6","tag_p":"Normal","tag_pre":"Wedi'i Fformatio"},"horizontalrule":{"toolbar":"Mewnosod Llinell Lorweddol"},"iframe":{"border":"Dangos ymyl y ffrâm","noUrl":"Rhowch URL yr iframe","scrolling":"Galluogi bariau sgrolio","title":"Priodweddau IFrame","toolbar":"IFrame"},"image":{"alt":"Testun Amgen","border":"Ymyl","btnUpload":"Anfon i'r Gweinydd","button2Img":"Ydych am drawsffurfio'r botwm ddelwedd hwn ar ddelwedd syml?","hSpace":"BwlchLl","img2Button":"Ydych am drawsffurfio'r ddelwedd hon ar fotwm delwedd?","infoTab":"Gwyb Delwedd","linkTab":"Dolen","lockRatio":"Cloi Cymhareb","menu":"Priodweddau Delwedd","resetSize":"Ailosod Maint","title":"Priodweddau Delwedd","titleButton":"Priodweddau Botwm Delwedd","upload":"Lanlwytho","urlMissing":"URL gwreiddiol y ddelwedd ar goll.","vSpace":"BwlchF","validateBorder":"Rhaid i'r ymyl fod yn gyfanrif.","validateHSpace":"Rhaid i'r HSpace fod yn gyfanrif.","validateVSpace":"Rhaid i'r VSpace fod yn gyfanrif."},"indent":{"indent":"Cynyddu'r Mewnoliad","outdent":"Lleihau'r Mewnoliad"},"smiley":{"options":"Opsiynau Gwenogluniau","title":"Mewnosod Gwenoglun","toolbar":"Gwenoglun"},"justify":{"block":"Unioni","center":"Alinio i'r Canol","left":"Alinio i'r Chwith","right":"Alinio i'r Dde"},"language":{"button":"Gosod iaith","remove":"Tynnu iaith"},"link":{"acccessKey":"Allwedd Mynediad","advanced":"Uwch","advisoryContentType":"Math y Cynnwys Cynghorol","advisoryTitle":"Teitl Cynghorol","anchor":{"toolbar":"Angor","menu":"Golygu'r Angor","title":"Priodweddau'r Angor","name":"Enw'r Angor","errorName":"Teipiwch enw'r angor","remove":"Tynnwch yr Angor"},"anchorId":"Gan Id yr Elfen","anchorName":"Gan Enw'r Angor","charset":"Set Nodau'r Adnodd Cysylltiedig","cssClasses":"Dosbarthiadau Dalen Arddull","emailAddress":"Cyfeiriad E-Bost","emailBody":"Corff y Neges","emailSubject":"Testun y Neges","id":"Id","info":"Gwyb y Ddolen","langCode":"Cod Iaith","langDir":"Cyfeiriad Iaith","langDirLTR":"Chwith i'r Dde (LTR)","langDirRTL":"Dde i'r Chwith (RTL)","menu":"Golygu Dolen","name":"Enw","noAnchors":"(Dim angorau ar gael yn y ddogfen)","noEmail":"Teipiwch gyfeiriad yr e-bost","noUrl":"Teipiwch URL y ddolen","other":"<eraill>","popupDependent":"Dibynnol (Netscape)","popupFeatures":"Nodweddion Ffenestr Bop","popupFullScreen":"Sgrin Llawn (IE)","popupLeft":"Safle Chwith","popupLocationBar":"Bar Safle","popupMenuBar":"Dewislen","popupResizable":"Ailfeintiol","popupScrollBars":"Barrau Sgrolio","popupStatusBar":"Bar Statws","popupToolbar":"Bar Offer","popupTop":"Safle Top","rel":"Perthynas","selectAnchor":"Dewiswch Angor","styles":"Arddull","tabIndex":"Indecs Tab","target":"Targed","targetFrame":"<ffrâm>","targetFrameName":"Enw Ffrâm y Targed","targetPopup":"<ffenestr bop>","targetPopupName":"Enw Ffenestr Bop","title":"Dolen","toAnchor":"Dolen at angor yn y testun","toEmail":"E-bost","toUrl":"URL","toolbar":"Dolen","type":"Math y Ddolen","unlink":"Datgysylltu","upload":"Lanlwytho"},"list":{"bulletedlist":"Mewnosod/Tynnu Rhestr Bwled","numberedlist":"Mewnosod/Tynnu Rhestr Rhifol"},"liststyle":{"armenian":"Rhifo Armeneg","bulletedTitle":"Priodweddau Rhestr Fwled","circle":"Cylch","decimal":"Degol (1, 2, 3, ayyb.)","decimalLeadingZero":"Degol â sero arweiniol (01, 02, 03, ayyb.)","disc":"Disg","georgian":"Rhifau Sioraidd (an, ban, gan, ayyb.)","lowerAlpha":"Alffa Is (a, b, c, d, e, ayyb.)","lowerGreek":"Groeg Is (alpha, beta, gamma, ayyb.)","lowerRoman":"Rhufeinig Is (i, ii, iii, iv, v, ayyb.)","none":"Dim","notset":"<heb osod>","numberedTitle":"Priodweddau Rhestr Rifol","square":"Sgwâr","start":"Dechrau","type":"Math","upperAlpha":"Alffa Uwch (A, B, C, D, E, ayyb.)","upperRoman":"Rhufeinig Uwch (I, II, III, IV, V, ayyb.)","validateStartNumber":"Rhaid bod y rhif cychwynnol yn gyfanrif."},"magicline":{"title":"Mewnosod paragraff yma"},"maximize":{"maximize":"Mwyhau","minimize":"Lleihau"},"newpage":{"toolbar":"Tudalen Newydd"},"pagebreak":{"alt":"Toriad Tudalen","toolbar":"Mewnosod Toriad Tudalen i Argraffu"},"pastetext":{"button":"Gludo fel testun plaen","title":"Gludo fel Testun Plaen"},"pastefromword":{"confirmCleanup":"Mae'r testun rydych chi am ludo wedi'i gopïo o Word. Ydych chi am ei lanhau cyn ei ludo?","error":"Doedd dim modd glanhau y data a ludwyd oherwydd gwall mewnol","title":"Gludo o Word","toolbar":"Gludo o Word"},"preview":{"preview":"Rhagolwg"},"print":{"toolbar":"Argraffu"},"removeformat":{"toolbar":"Tynnu Fformat"},"save":{"toolbar":"Cadw"},"selectall":{"toolbar":"Dewis Popeth"},"showblocks":{"toolbar":"Dangos Blociau"},"sourcearea":{"toolbar":"HTML"},"specialchar":{"options":"Opsiynau Nodau Arbennig","title":"Dewis Nod Arbennig","toolbar":"Mewnosod Nod Arbennig"},"scayt":{"btn_about":"Ynghylch SCAYT","btn_dictionaries":"Geiriaduron","btn_disable":"Analluogi SCAYT","btn_enable":"Galluogi SCAYT","btn_langs":"Ieithoedd","btn_options":"Opsiynau","text_title":"Gwirio'r Sillafu Wrth Deipio"},"stylescombo":{"label":"Arddulliau","panelTitle":"Arddulliau Fformatio","panelTitle1":"Arddulliau Bloc","panelTitle2":"Arddulliau Mewnol","panelTitle3":"Arddulliau Gwrthrych"},"table":{"border":"Maint yr Ymyl","caption":"Pennawd","cell":{"menu":"Cell","insertBefore":"Mewnosod Cell Cyn","insertAfter":"Mewnosod Cell Ar Ôl","deleteCell":"Dileu Celloedd","merge":"Cyfuno Celloedd","mergeRight":"Cyfuno i'r Dde","mergeDown":"Cyfuno i Lawr","splitHorizontal":"Hollti'r Gell yn Lorweddol","splitVertical":"Hollti'r Gell yn Fertigol","title":"Priodweddau'r Gell","cellType":"Math y Gell","rowSpan":"Rhychwant Rhesi","colSpan":"Rhychwant Colofnau","wordWrap":"Lapio Geiriau","hAlign":"Aliniad Llorweddol","vAlign":"Aliniad Fertigol","alignBaseline":"Baslinell","bgColor":"Lliw Cefndir","borderColor":"Lliw Ymyl","data":"Data","header":"Pennyn","yes":"Ie","no":"Na","invalidWidth":"Mae'n rhaid i led y gell fod yn rhif.","invalidHeight":"Mae'n rhaid i uchder y gell fod yn rhif.","invalidRowSpan":"Mae'n rhaid i rychwant y rhesi fod yn gyfanrif.","invalidColSpan":"Mae'n rhaid i rychwant y colofnau fod yn gyfanrif.","chooseColor":"Dewis"},"cellPad":"Padio'r gell","cellSpace":"Bylchiad y gell","column":{"menu":"Colofn","insertBefore":"Mewnosod Colofn Cyn","insertAfter":"Mewnosod Colofn Ar Ôl","deleteColumn":"Dileu Colofnau"},"columns":"Colofnau","deleteTable":"Dileu Tabl","headers":"Penynnau","headersBoth":"Y Ddau","headersColumn":"Colofn gyntaf","headersNone":"Dim","headersRow":"Rhes gyntaf","invalidBorder":"Mae'n rhaid i faint yr ymyl fod yn rhif.","invalidCellPadding":"Mae'n rhaid i badiad y gell fod yn rhif positif.","invalidCellSpacing":"Mae'n rhaid i fylchiad y gell fod yn rhif positif.","invalidCols":"Mae'n rhaid cael o leiaf un golofn.","invalidHeight":"Mae'n rhaid i uchder y tabl fod yn rhif.","invalidRows":"Mae'n rhaid cael o leiaf un rhes.","invalidWidth":"Mae'n rhaid i led y tabl fod yn rhif.","menu":"Priodweddau'r Tabl","row":{"menu":"Rhes","insertBefore":"Mewnosod Rhes Cyn","insertAfter":"Mewnosod Rhes Ar Ôl","deleteRow":"Dileu Rhesi"},"rows":"Rhesi","summary":"Crynodeb","title":"Priodweddau'r Tabl","toolbar":"Tabl","widthPc":"y cant","widthPx":"picsel","widthUnit":"uned lled"},"undo":{"redo":"Ailwneud","undo":"Dadwneud"},"wsc":{"btnIgnore":"Anwybyddu Un","btnIgnoreAll":"Anwybyddu Pob","btnReplace":"Amnewid Un","btnReplaceAll":"Amnewid Pob","btnUndo":"Dadwneud","changeTo":"Newid i","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Gwirydd sillafu heb ei arsefydlu. A ydych am ei lawrlwytho nawr?","manyChanges":"Gwirio sillafu wedi gorffen: Newidiwyd %1 gair","noChanges":"Gwirio sillafu wedi gorffen: Dim newidiadau","noMispell":"Gwirio sillafu wedi gorffen: Dim camsillaf.","noSuggestions":"- Dim awgrymiadau -","notAvailable":"Nid yw'r gwasanaeth hwn ar gael yn bresennol.","notInDic":"Nid i'w gael yn y geiriadur","oneChange":"Gwirio sillafu wedi gorffen: Newidiwyd 1 gair","progress":"Gwirio sillafu yn ar y gweill...","title":"Gwirio Sillafu","toolbar":"Gwirio Sillafu"}};
\ No newline at end of file
+CKEDITOR.lang['cy']={"editor":"Golygydd Testun Cyfoethog","editorPanel":"Panel Golygydd Testun Cyfoethog","common":{"editorHelp":"Gwasgwch ALT 0 am gymorth","browseServer":"Pori'r Gweinydd","url":"URL","protocol":"Protocol","upload":"Lanlwytho","uploadSubmit":"Anfon i'r Gweinydd","image":"Delwedd","flash":"Flash","form":"Ffurflen","checkbox":"Blwch ticio","radio":"Botwm Radio","textField":"Maes Testun","textarea":"Ardal Testun","hiddenField":"Maes Cudd","button":"Botwm","select":"Maes Dewis","imageButton":"Botwm Delwedd","notSet":"<heb osod>","id":"Id","name":"Name","langDir":"Cyfeiriad Iaith","langDirLtr":"Chwith i'r Dde (LTR)","langDirRtl":"Dde i'r Chwith (RTL)","langCode":"Cod Iaith","longDescr":"URL Disgrifiad Hir","cssClass":"Dosbarthiadau Dalen Arddull","advisoryTitle":"Teitl Cynghorol","cssStyle":"Arddull","ok":"Iawn","cancel":"Diddymu","close":"Cau","preview":"Rhagolwg","resize":"Ailfeintio","generalTab":"Cyffredinol","advancedTab":"Uwch","validateNumberFailed":"'Dyw'r gwerth hwn ddim yn rhif.","confirmNewPage":"Byddwch chi'n colli unrhyw newidiadau i'r cynnwys sydd heb eu cadw. Ydych am barhau i lwytho tudalen newydd?","confirmCancel":"Cafodd rhai o'r opsiynau eu newid. Ydych chi wir am gau'r deialog?","options":"Opsiynau","target":"Targed","targetNew":"Ffenest Newydd (_blank)","targetTop":"Ffenest ar y Brig (_top)","targetSelf":"Yr un Ffenest (_self)","targetParent":"Ffenest y Rhiant (_parent)","langDirLTR":"Chwith i'r Dde (LTR)","langDirRTL":"Dde i'r Chwith (RTL)","styles":"Arddull","cssClasses":"Dosbarthiadau Dalen Arddull","width":"Lled","height":"Uchder","align":"Alinio","alignLeft":"Chwith","alignRight":"Dde","alignCenter":"Canol","alignJustify":"Unioni","alignTop":"Brig","alignMiddle":"Canol","alignBottom":"Gwaelod","alignNone":"None","invalidValue":"Gwerth annilys.","invalidHeight":"Mae'n rhaid i'r uchder fod yn rhif.","invalidWidth":"Mae'n rhaid i'r lled fod yn rhif.","invalidCssLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad CSS dilys (px, %, in, cm, mm, em, ex, pt, neu pc).","invalidHtmlLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad HTML dilys (px neu %).","invalidInlineStyle":"Mae'n rhaid i'r gwerth ar gyfer arddull mewn-llinell gynnwys un set neu fwy ar y fformat \"enw : gwerth\", wedi'u gwahanu gyda hanner colon.","cssLengthTooltip":"Rhowch rif am werth mewn picsel neu rhif gydag uned CSS dilys (px, %, in, cm, mm, em, pt neu pc).","unavailable":"%1<span class=\"cke_accessibility\">, ddim ar gael</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Hawlfraint &copy; $1. Cedwir pob hawl.","dlgTitle":"Ynghylch CKEditor","help":"Gwirio $1 am gymorth.","moreInfo":"Am wybodaeth ynghylch trwyddedau, ewch i'n gwefan:","title":"Ynghylch CKEditor","userGuide":"Canllawiau Defnyddiwr CKEditor"},"basicstyles":{"bold":"Bras","italic":"Italig","strike":"Llinell Trwyddo","subscript":"Is-sgript","superscript":"Uwchsgript","underline":"Tanlinellu"},"bidi":{"ltr":"Cyfeiriad testun o'r chwith i'r dde","rtl":"Cyfeiriad testun o'r dde i'r chwith"},"blockquote":{"toolbar":"Dyfyniad bloc"},"clipboard":{"copy":"Copïo","copyError":"'Dyw gosodiadau diogelwch eich porwr ddim yn caniatàu'r golygydd i gynnal 'gweithredoedd copïo' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+C).","cut":"Torri","cutError":"Nid yw gosodiadau diogelwch eich porwr yn caniatàu'r golygydd i gynnal 'gweithredoedd torri' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+X).","paste":"Gludo","pasteArea":"Ardal Gludo","pasteMsg":"Gludwch i mewn i'r blwch canlynol gan ddefnyddio'r bysellfwrdd (<strong>Ctrl/Cmd+V</strong>) a phwyso <strong>Iawn</strong>.","securityMsg":"Oherwydd gosodiadau diogelwch eich porwr, 'dyw'r porwr ddim yn gallu ennill mynediad i'r data ar y clipfwrdd yn uniongyrchol. Mae angen i chi ei ludo eto i'r ffenestr hon.","title":"Gludo"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Awtomatig","bgColorTitle":"Lliw Cefndir","colors":{"000":"Du","800000":"Marwn","8B4513":"Brown Cyfrwy","2F4F4F":"Llechen Tywyll","008080":"Corhwyad","000080":"Nefi","4B0082":"Indigo","696969":"Llwyd Tywyll","B22222":"Bric Tân","A52A2A":"Brown","DAA520":"Rhoden Aur","006400":"Gwyrdd Tywyll","40E0D0":"Gwyrddlas","0000CD":"Glas Canolig","800080":"Porffor","808080":"Llwyd","F00":"Coch","FF8C00":"Oren Tywyll","FFD700":"Aur","008000":"Gwyrdd","0FF":"Cyan","00F":"Glas","EE82EE":"Fioled","A9A9A9":"Llwyd Pwl","FFA07A":"Samwn Golau","FFA500":"Oren","FFFF00":"Melyn","00FF00":"Leim","AFEEEE":"Gwyrddlas Golau","ADD8E6":"Glas Golau","DDA0DD":"Eirinen","D3D3D3":"Llwyd Golau","FFF0F5":"Gwrid Lafant","FAEBD7":"Gwyn Hynafol","FFFFE0":"Melyn Golau","F0FFF0":"Melwn Gwyrdd Golau","F0FFFF":"Aswr","F0F8FF":"Glas Alys","E6E6FA":"Lafant","FFF":"Gwyn","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Mwy o Liwiau...","panelTitle":"Lliwiau","textColorTitle":"Lliw Testun"},"colordialog":{"clear":"Clirio","highlight":"Uwcholeuo","options":"Opsiynau Lliw","selected":"Lliw a Ddewiswyd","title":"Dewis lliw"},"templates":{"button":"Templedi","emptyListMsg":"(Dim templedi wedi'u diffinio)","insertOption":"Amnewid y cynnwys go iawn","options":"Opsiynau Templedi","selectPromptMsg":"Dewiswch dempled i'w agor yn y golygydd","title":"Templedi Cynnwys"},"contextmenu":{"options":"Opsiynau Dewislen Cyd-destun"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Teitl Cynghorol","cssClassInputLabel":"Dosbarthiadau Ffeil Arddull","edit":"Golygu Div","inlineStyleInputLabel":"Arddull Mewn Llinell","langDirLTRLabel":"Chwith i'r Dde (LTR)","langDirLabel":"Cyfeiriad yr Iaith","langDirRTLLabel":"Dde i'r Chwith (RTL)","languageCodeInputLabel":" Cod Iaith","remove":"Tynnu Div","styleSelectLabel":"Arddull","title":"Creu Cynhwysydd Div","toolbar":"Creu Cynhwysydd Div"},"toolbar":{"toolbarCollapse":"Cyfangu'r Bar Offer","toolbarExpand":"Ehangu'r Bar Offer","toolbarGroups":{"document":"Dogfen","clipboard":"Clipfwrdd/Dadwneud","editing":"Golygu","forms":"Ffurflenni","basicstyles":"Arddulliau Sylfaenol","paragraph":"Paragraff","links":"Dolenni","insert":"Mewnosod","styles":"Arddulliau","colors":"Lliwiau","tools":"Offer"},"toolbars":"Bariau offer y golygydd"},"elementspath":{"eleLabel":"Llwybr elfennau","eleTitle":"Elfen %1"},"find":{"find":"Chwilio","findOptions":"Opsiynau Chwilio","findWhat":"Chwilio'r term:","matchCase":"Cydweddu'r cas","matchCyclic":"Cydweddu'n gylchol","matchWord":"Cydweddu gair cyfan","notFoundMsg":"Nid oedd y testun wedi'i ddarganfod.","replace":"Amnewid Un","replaceAll":"Amnewid Pob","replaceSuccessMsg":"Amnewidiwyd %1 achlysur.","replaceWith":"Amnewid gyda:","title":"Chwilio ac Amnewid"},"fakeobjects":{"anchor":"Angor","flash":"Animeiddiant Flash","hiddenfield":"Maes Cudd","iframe":"IFrame","unknown":"Gwrthrych Anhysbys"},"flash":{"access":"Mynediad Sgript","accessAlways":"Pob amser","accessNever":"Byth","accessSameDomain":"R'un parth","alignAbsBottom":"Gwaelod Abs","alignAbsMiddle":"Canol Abs","alignBaseline":"Baslinell","alignTextTop":"Testun Top","bgcolor":"Lliw cefndir","chkFull":"Caniatàu Sgrin Llawn","chkLoop":"Lwpio","chkMenu":"Galluogi Dewislen Flash","chkPlay":"AwtoChwarae","flashvars":"Newidynnau ar gyfer Flash","hSpace":"BwlchLl","properties":"Priodweddau Flash","propertiesTab":"Priodweddau","quality":"Ansawdd","qualityAutoHigh":"Uchel Awto","qualityAutoLow":"Isel Awto","qualityBest":"Gorau","qualityHigh":"Uchel","qualityLow":"Isel","qualityMedium":"Canolig","scale":"Graddfa","scaleAll":"Dangos pob","scaleFit":"Ffit Union","scaleNoBorder":"Dim Ymyl","title":"Priodweddau Flash","vSpace":"BwlchF","validateHSpace":"Rhaid i'r BwlchLl fod yn rhif.","validateSrc":"Ni all yr URL fod yn wag.","validateVSpace":"Rhaid i'r BwlchF fod yn rhif.","windowMode":"Modd ffenestr","windowModeOpaque":"Afloyw","windowModeTransparent":"Tryloyw","windowModeWindow":"Ffenestr"},"font":{"fontSize":{"label":"Maint","voiceLabel":"Maint y Ffont","panelTitle":"Maint y Ffont"},"label":"Ffont","panelTitle":"Enw'r Ffont","voiceLabel":"Ffont"},"forms":{"button":{"title":"Priodweddau Botymau","text":"Testun (Gwerth)","type":"Math","typeBtn":"Botwm","typeSbm":"Anfon","typeRst":"Ailosod"},"checkboxAndRadio":{"checkboxTitle":"Priodweddau Blwch Ticio","radioTitle":"Priodweddau Botwm Radio","value":"Gwerth","selected":"Dewiswyd","required":"Required"},"form":{"title":"Priodweddau Ffurflen","menu":"Priodweddau Ffurflen","action":"Gweithred","method":"Dull","encoding":"Amgodio"},"hidden":{"title":"Priodweddau Maes Cudd","name":"Enw","value":"Gwerth"},"select":{"title":"Priodweddau Maes Dewis","selectInfo":"Gwyb Dewis","opAvail":"Opsiynau ar Gael","value":"Gwerth","size":"Maint","lines":"llinellau","chkMulti":"Caniatàu aml-ddewisiadau","required":"Required","opText":"Testun","opValue":"Gwerth","btnAdd":"Ychwanegu","btnModify":"Newid","btnUp":"Lan","btnDown":"Lawr","btnSetValue":"Gosod fel gwerth a ddewiswyd","btnDelete":"Dileu"},"textarea":{"title":"Priodweddau Ardal Testun","cols":"Colofnau","rows":"Rhesi"},"textfield":{"title":"Priodweddau Maes Testun","name":"Enw","value":"Gwerth","charWidth":"Lled Nod","maxChars":"Uchafswm y Nodau","required":"Required","type":"Math","typeText":"Testun","typePass":"Cyfrinair","typeEmail":"Ebost","typeSearch":"Chwilio","typeTel":"Rhif Ffôn","typeUrl":"URL"}},"format":{"label":"Fformat","panelTitle":"Fformat Paragraff","tag_address":"Cyfeiriad","tag_div":"Normal (DIV)","tag_h1":"Pennawd 1","tag_h2":"Pennawd 2","tag_h3":"Pennawd 3","tag_h4":"Pennawd 4","tag_h5":"Pennawd 5","tag_h6":"Pennawd 6","tag_p":"Normal","tag_pre":"Wedi'i Fformatio"},"horizontalrule":{"toolbar":"Mewnosod Llinell Lorweddol"},"iframe":{"border":"Dangos ymyl y ffrâm","noUrl":"Rhowch URL yr iframe","scrolling":"Galluogi bariau sgrolio","title":"Priodweddau IFrame","toolbar":"IFrame"},"image":{"alt":"Testun Amgen","border":"Ymyl","btnUpload":"Anfon i'r Gweinydd","button2Img":"Ydych am drawsffurfio'r botwm ddelwedd hwn ar ddelwedd syml?","hSpace":"BwlchLl","img2Button":"Ydych am drawsffurfio'r ddelwedd hon ar fotwm delwedd?","infoTab":"Gwyb Delwedd","linkTab":"Dolen","lockRatio":"Cloi Cymhareb","menu":"Priodweddau Delwedd","resetSize":"Ailosod Maint","title":"Priodweddau Delwedd","titleButton":"Priodweddau Botwm Delwedd","upload":"Lanlwytho","urlMissing":"URL gwreiddiol y ddelwedd ar goll.","vSpace":"BwlchF","validateBorder":"Rhaid i'r ymyl fod yn gyfanrif.","validateHSpace":"Rhaid i'r HSpace fod yn gyfanrif.","validateVSpace":"Rhaid i'r VSpace fod yn gyfanrif."},"indent":{"indent":"Cynyddu'r Mewnoliad","outdent":"Lleihau'r Mewnoliad"},"smiley":{"options":"Opsiynau Gwenogluniau","title":"Mewnosod Gwenoglun","toolbar":"Gwenoglun"},"justify":{"block":"Unioni","center":"Alinio i'r Canol","left":"Alinio i'r Chwith","right":"Alinio i'r Dde"},"language":{"button":"Gosod iaith","remove":"Tynnu iaith"},"link":{"acccessKey":"Allwedd Mynediad","advanced":"Uwch","advisoryContentType":"Math y Cynnwys Cynghorol","advisoryTitle":"Teitl Cynghorol","anchor":{"toolbar":"Angor","menu":"Golygu'r Angor","title":"Priodweddau'r Angor","name":"Enw'r Angor","errorName":"Teipiwch enw'r angor","remove":"Tynnwch yr Angor"},"anchorId":"Gan Id yr Elfen","anchorName":"Gan Enw'r Angor","charset":"Set Nodau'r Adnodd Cysylltiedig","cssClasses":"Dosbarthiadau Dalen Arddull","download":"Force Download","displayText":"Display Text","emailAddress":"Cyfeiriad E-Bost","emailBody":"Corff y Neges","emailSubject":"Testun y Neges","id":"Id","info":"Gwyb y Ddolen","langCode":"Cod Iaith","langDir":"Cyfeiriad Iaith","langDirLTR":"Chwith i'r Dde (LTR)","langDirRTL":"Dde i'r Chwith (RTL)","menu":"Golygu Dolen","name":"Enw","noAnchors":"(Dim angorau ar gael yn y ddogfen)","noEmail":"Teipiwch gyfeiriad yr e-bost","noUrl":"Teipiwch URL y ddolen","other":"<eraill>","popupDependent":"Dibynnol (Netscape)","popupFeatures":"Nodweddion Ffenestr Bop","popupFullScreen":"Sgrin Llawn (IE)","popupLeft":"Safle Chwith","popupLocationBar":"Bar Safle","popupMenuBar":"Dewislen","popupResizable":"Ailfeintiol","popupScrollBars":"Barrau Sgrolio","popupStatusBar":"Bar Statws","popupToolbar":"Bar Offer","popupTop":"Safle Top","rel":"Perthynas","selectAnchor":"Dewiswch Angor","styles":"Arddull","tabIndex":"Indecs Tab","target":"Targed","targetFrame":"<ffrâm>","targetFrameName":"Enw Ffrâm y Targed","targetPopup":"<ffenestr bop>","targetPopupName":"Enw Ffenestr Bop","title":"Dolen","toAnchor":"Dolen at angor yn y testun","toEmail":"E-bost","toUrl":"URL","toolbar":"Dolen","type":"Math y Ddolen","unlink":"Datgysylltu","upload":"Lanlwytho"},"list":{"bulletedlist":"Mewnosod/Tynnu Rhestr Bwled","numberedlist":"Mewnosod/Tynnu Rhestr Rhifol"},"liststyle":{"armenian":"Rhifo Armeneg","bulletedTitle":"Priodweddau Rhestr Fwled","circle":"Cylch","decimal":"Degol (1, 2, 3, ayyb.)","decimalLeadingZero":"Degol â sero arweiniol (01, 02, 03, ayyb.)","disc":"Disg","georgian":"Rhifau Sioraidd (an, ban, gan, ayyb.)","lowerAlpha":"Alffa Is (a, b, c, d, e, ayyb.)","lowerGreek":"Groeg Is (alpha, beta, gamma, ayyb.)","lowerRoman":"Rhufeinig Is (i, ii, iii, iv, v, ayyb.)","none":"Dim","notset":"<heb osod>","numberedTitle":"Priodweddau Rhestr Rifol","square":"Sgwâr","start":"Dechrau","type":"Math","upperAlpha":"Alffa Uwch (A, B, C, D, E, ayyb.)","upperRoman":"Rhufeinig Uwch (I, II, III, IV, V, ayyb.)","validateStartNumber":"Rhaid bod y rhif cychwynnol yn gyfanrif."},"magicline":{"title":"Mewnosod paragraff yma"},"maximize":{"maximize":"Mwyhau","minimize":"Lleihau"},"newpage":{"toolbar":"Tudalen Newydd"},"pagebreak":{"alt":"Toriad Tudalen","toolbar":"Mewnosod Toriad Tudalen i Argraffu"},"pastetext":{"button":"Gludo fel testun plaen","title":"Gludo fel Testun Plaen"},"pastefromword":{"confirmCleanup":"Mae'r testun rydych chi am ludo wedi'i gopïo o Word. Ydych chi am ei lanhau cyn ei ludo?","error":"Doedd dim modd glanhau y data a ludwyd oherwydd gwall mewnol","title":"Gludo o Word","toolbar":"Gludo o Word"},"preview":{"preview":"Rhagolwg"},"print":{"toolbar":"Argraffu"},"removeformat":{"toolbar":"Tynnu Fformat"},"save":{"toolbar":"Cadw"},"selectall":{"toolbar":"Dewis Popeth"},"showblocks":{"toolbar":"Dangos Blociau"},"sourcearea":{"toolbar":"HTML"},"specialchar":{"options":"Opsiynau Nodau Arbennig","title":"Dewis Nod Arbennig","toolbar":"Mewnosod Nod Arbennig"},"scayt":{"btn_about":"Ynghylch SCAYT","btn_dictionaries":"Geiriaduron","btn_disable":"Analluogi SCAYT","btn_enable":"Galluogi SCAYT","btn_langs":"Ieithoedd","btn_options":"Opsiynau","text_title":"Gwirio'r Sillafu Wrth Deipio"},"stylescombo":{"label":"Arddulliau","panelTitle":"Arddulliau Fformatio","panelTitle1":"Arddulliau Bloc","panelTitle2":"Arddulliau Mewnol","panelTitle3":"Arddulliau Gwrthrych"},"table":{"border":"Maint yr Ymyl","caption":"Pennawd","cell":{"menu":"Cell","insertBefore":"Mewnosod Cell Cyn","insertAfter":"Mewnosod Cell Ar Ôl","deleteCell":"Dileu Celloedd","merge":"Cyfuno Celloedd","mergeRight":"Cyfuno i'r Dde","mergeDown":"Cyfuno i Lawr","splitHorizontal":"Hollti'r Gell yn Lorweddol","splitVertical":"Hollti'r Gell yn Fertigol","title":"Priodweddau'r Gell","cellType":"Math y Gell","rowSpan":"Rhychwant Rhesi","colSpan":"Rhychwant Colofnau","wordWrap":"Lapio Geiriau","hAlign":"Aliniad Llorweddol","vAlign":"Aliniad Fertigol","alignBaseline":"Baslinell","bgColor":"Lliw Cefndir","borderColor":"Lliw Ymyl","data":"Data","header":"Pennyn","yes":"Ie","no":"Na","invalidWidth":"Mae'n rhaid i led y gell fod yn rhif.","invalidHeight":"Mae'n rhaid i uchder y gell fod yn rhif.","invalidRowSpan":"Mae'n rhaid i rychwant y rhesi fod yn gyfanrif.","invalidColSpan":"Mae'n rhaid i rychwant y colofnau fod yn gyfanrif.","chooseColor":"Dewis"},"cellPad":"Padio'r gell","cellSpace":"Bylchiad y gell","column":{"menu":"Colofn","insertBefore":"Mewnosod Colofn Cyn","insertAfter":"Mewnosod Colofn Ar Ôl","deleteColumn":"Dileu Colofnau"},"columns":"Colofnau","deleteTable":"Dileu Tabl","headers":"Penynnau","headersBoth":"Y Ddau","headersColumn":"Colofn gyntaf","headersNone":"Dim","headersRow":"Rhes gyntaf","invalidBorder":"Mae'n rhaid i faint yr ymyl fod yn rhif.","invalidCellPadding":"Mae'n rhaid i badiad y gell fod yn rhif positif.","invalidCellSpacing":"Mae'n rhaid i fylchiad y gell fod yn rhif positif.","invalidCols":"Mae'n rhaid cael o leiaf un golofn.","invalidHeight":"Mae'n rhaid i uchder y tabl fod yn rhif.","invalidRows":"Mae'n rhaid cael o leiaf un rhes.","invalidWidth":"Mae'n rhaid i led y tabl fod yn rhif.","menu":"Priodweddau'r Tabl","row":{"menu":"Rhes","insertBefore":"Mewnosod Rhes Cyn","insertAfter":"Mewnosod Rhes Ar Ôl","deleteRow":"Dileu Rhesi"},"rows":"Rhesi","summary":"Crynodeb","title":"Priodweddau'r Tabl","toolbar":"Tabl","widthPc":"y cant","widthPx":"picsel","widthUnit":"uned lled"},"undo":{"redo":"Ailwneud","undo":"Dadwneud"},"wsc":{"btnIgnore":"Anwybyddu Un","btnIgnoreAll":"Anwybyddu Pob","btnReplace":"Amnewid Un","btnReplaceAll":"Amnewid Pob","btnUndo":"Dadwneud","changeTo":"Newid i","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Gwirydd sillafu heb ei arsefydlu. A ydych am ei lawrlwytho nawr?","manyChanges":"Gwirio sillafu wedi gorffen: Newidiwyd %1 gair","noChanges":"Gwirio sillafu wedi gorffen: Dim newidiadau","noMispell":"Gwirio sillafu wedi gorffen: Dim camsillaf.","noSuggestions":"- Dim awgrymiadau -","notAvailable":"Nid yw'r gwasanaeth hwn ar gael yn bresennol.","notInDic":"Nid i'w gael yn y geiriadur","oneChange":"Gwirio sillafu wedi gorffen: Newidiwyd 1 gair","progress":"Gwirio sillafu yn ar y gweill...","title":"Gwirio Sillafu","toolbar":"Gwirio Sillafu"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/da.js b/htdocs/includes/ckeditor/ckeditor/lang/da.js
index c8ccde9eea7..6f8eb0c4c02 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/da.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/da.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['da']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tryk ALT 0 for hjælp","browseServer":"Gennemse...","url":"URL","protocol":"Protokol","upload":"Upload","uploadSubmit":"Upload","image":"Indsæt billede","flash":"Indsæt Flash","form":"Indsæt formular","checkbox":"Indsæt afkrydsningsfelt","radio":"Indsæt alternativknap","textField":"Indsæt tekstfelt","textarea":"Indsæt tekstboks","hiddenField":"Indsæt skjult felt","button":"Indsæt knap","select":"Indsæt liste","imageButton":"Indsæt billedknap","notSet":"<intet valgt>","id":"Id","name":"Navn","langDir":"Tekstretning","langDirLtr":"Fra venstre mod højre (LTR)","langDirRtl":"Fra højre mod venstre (RTL)","langCode":"Sprogkode","longDescr":"Udvidet beskrivelse","cssClass":"Typografiark (CSS)","advisoryTitle":"Titel","cssStyle":"Typografi (CSS)","ok":"OK","cancel":"Annullér","close":"Luk","preview":"Forhåndsvisning","resize":"Træk for at skalere","generalTab":"Generelt","advancedTab":"Avanceret","validateNumberFailed":"Værdien er ikke et tal.","confirmNewPage":"Alt indhold, der ikke er blevet gemt, vil gå tabt. Er du sikker på, at du vil indlæse en ny side?","confirmCancel":"Nogle af indstillingerne er blevet ændret. Er du sikker på, at du vil lukke vinduet?","options":"Vis muligheder","target":"Mål","targetNew":"Nyt vindue (_blank)","targetTop":"Øverste vindue (_top)","targetSelf":"Samme vindue (_self)","targetParent":"Samme vindue (_parent)","langDirLTR":"Venstre til højre (LTR)","langDirRTL":"Højre til venstre (RTL)","styles":"Style","cssClasses":"Stylesheetklasser","width":"Bredde","height":"Højde","align":"Justering","alignLeft":"Venstre","alignRight":"Højre","alignCenter":"Centreret","alignJustify":"Lige margener","alignTop":"Øverst","alignMiddle":"Centreret","alignBottom":"Nederst","alignNone":"Ingen","invalidValue":"Ugyldig værdi.","invalidHeight":"Højde skal være et tal.","invalidWidth":"Bredde skal være et tal.","invalidCssLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px eller %).","invalidInlineStyle":"Værdien specificeret for inline style skal indeholde en eller flere elementer med et format som \"name:value\", separeret af semikoloner","cssLengthTooltip":"Indsæt en numerisk værdi i pixel eller nummer med en gyldig CSS værdi (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikke tilgængelig</span>"},"about":{"copy":"Copyright &copy; $1. Alle rettigheder forbeholdes.","dlgTitle":"Om CKEditor","help":"Se $1 for at få hjælp.","moreInfo":"For informationer omkring licens, se venligst vores hjemmeside (på engelsk):","title":"Om CKEditor","userGuide":"CKEditor-brugermanual"},"basicstyles":{"bold":"Fed","italic":"Kursiv","strike":"Gennemstreget","subscript":"Sænket skrift","superscript":"Hævet skrift","underline":"Understreget"},"bidi":{"ltr":"Tekstretning fra venstre til højre","rtl":"Tekstretning fra højre til venstre"},"blockquote":{"toolbar":"Blokcitat"},"clipboard":{"copy":"Kopiér","copyError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at kopiere teksten (Ctrl/Cmd+C).","cut":"Klip","cutError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at klippe teksten (Ctrl/Cmd+X).","paste":"Indsæt","pasteArea":"Indsæt område","pasteMsg":"Indsæt i feltet herunder (<STRONG>Ctrl/Cmd+V</STRONG>) og klik på <STRONG>OK</STRONG>.","securityMsg":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Du skal indsætte udklipsholderens indhold i dette vindue igen.","title":"Indsæt"},"button":{"selectedLabel":"%1 (Valgt)"},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Baggrundsfarve","colors":{"000":"Sort","800000":"Mørkerød","8B4513":"Mørk orange","2F4F4F":"Dark Slate Grå","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Mørkegrå","B22222":"Scarlet / Rød","A52A2A":"Brun","DAA520":"Guld","006400":"Mørkegrøn","40E0D0":"Tyrkis","0000CD":"Mellemblå","800080":"Lilla","808080":"Grå","F00":"Rød","FF8C00":"Mørk orange","FFD700":"Guld","008000":"Grøn","0FF":"Cyan","00F":"Blå","EE82EE":"Violet","A9A9A9":"Matgrå","FFA07A":"Laksefarve","FFA500":"Orange","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Mat tyrkis","ADD8E6":"Lyseblå","DDA0DD":"Plum","D3D3D3":"Lysegrå","FFF0F5":"Lavender Blush","FAEBD7":"Antikhvid","FFFFE0":"Lysegul","F0FFF0":"Gul / Beige","F0FFFF":"Himmeblå","F0F8FF":"Alice blue","E6E6FA":"Lavendel","FFF":"Hvid"},"more":"Flere farver...","panelTitle":"Farver","textColorTitle":"Tekstfarve"},"colordialog":{"clear":"Nulstil","highlight":"Markér","options":"Farvemuligheder","selected":"Valgt farve","title":"Vælg farve"},"templates":{"button":"Skabeloner","emptyListMsg":"(Der er ikke defineret nogen skabelon)","insertOption":"Erstat det faktiske indhold","options":"Skabelon muligheder","selectPromptMsg":"Vælg den skabelon, som skal åbnes i editoren (nuværende indhold vil blive overskrevet):","title":"Indholdsskabeloner"},"contextmenu":{"options":"Muligheder for hjælpemenu"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Vejledende titel","cssClassInputLabel":"Typografiark","edit":"Rediger Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Venstre til højre (LTR)","langDirLabel":"Sprogretning","langDirRTLLabel":"Højre til venstre (RTL)","languageCodeInputLabel":" Sprogkode","remove":"Slet Div","styleSelectLabel":"Style","title":"Opret Div Container","toolbar":"Opret Div Container"},"toolbar":{"toolbarCollapse":"Sammenklap værktøjslinje","toolbarExpand":"Udvid værktøjslinje","toolbarGroups":{"document":"Dokument","clipboard":"Udklipsholder/Fortryd","editing":"Redigering","forms":"Formularer","basicstyles":"Basis styles","paragraph":"Paragraf","links":"Links","insert":"Indsæt","styles":"Typografier","colors":"Farver","tools":"Værktøjer"},"toolbars":"Editors værktøjslinjer"},"elementspath":{"eleLabel":"Sti på element","eleTitle":"%1 element"},"find":{"find":"Søg","findOptions":"Find muligheder","findWhat":"Søg efter:","matchCase":"Forskel på store og små bogstaver","matchCyclic":"Match cyklisk","matchWord":"Kun hele ord","notFoundMsg":"Søgeteksten blev ikke fundet","replace":"Erstat","replaceAll":"Erstat alle","replaceSuccessMsg":"%1 forekomst(er) erstattet.","replaceWith":"Erstat med:","title":"Søg og erstat"},"fakeobjects":{"anchor":"Anker","flash":"Flashanimation","hiddenfield":"Skjult felt","iframe":"Iframe","unknown":"Ukendt objekt"},"flash":{"access":"Scriptadgang","accessAlways":"Altid","accessNever":"Aldrig","accessSameDomain":"Samme domæne","alignAbsBottom":"Absolut nederst","alignAbsMiddle":"Absolut centreret","alignBaseline":"Grundlinje","alignTextTop":"Toppen af teksten","bgcolor":"Baggrundsfarve","chkFull":"Tillad fuldskærm","chkLoop":"Gentagelse","chkMenu":"Vis Flash-menu","chkPlay":"Automatisk afspilning","flashvars":"Variabler for Flash","hSpace":"Vandret margen","properties":"Egenskaber for Flash","propertiesTab":"Egenskaber","quality":"Kvalitet","qualityAutoHigh":"Auto høj","qualityAutoLow":"Auto lav","qualityBest":"Bedste","qualityHigh":"Høj","qualityLow":"Lav","qualityMedium":"Medium","scale":"Skalér","scaleAll":"Vis alt","scaleFit":"Tilpas størrelse","scaleNoBorder":"Ingen ramme","title":"Egenskaber for Flash","vSpace":"Lodret margen","validateHSpace":"Vandret margen skal være et tal.","validateSrc":"Indtast hyperlink URL!","validateVSpace":"Lodret margen skal være et tal.","windowMode":"Vinduestilstand","windowModeOpaque":"Gennemsigtig (opaque)","windowModeTransparent":"Transparent","windowModeWindow":"Vindue"},"font":{"fontSize":{"label":"Skriftstørrelse","voiceLabel":"Skriftstørrelse","panelTitle":"Skriftstørrelse"},"label":"Skrifttype","panelTitle":"Skrifttype","voiceLabel":"Skrifttype"},"forms":{"button":{"title":"Egenskaber for knap","text":"Tekst","type":"Type","typeBtn":"Knap","typeSbm":"Send","typeRst":"Nulstil"},"checkboxAndRadio":{"checkboxTitle":"Egenskaber for afkrydsningsfelt","radioTitle":"Egenskaber for alternativknap","value":"Værdi","selected":"Valgt","required":"Påkrævet"},"form":{"title":"Egenskaber for formular","menu":"Egenskaber for formular","action":"Handling","method":"Metode","encoding":"Kodning (encoding)"},"hidden":{"title":"Egenskaber for skjult felt","name":"Navn","value":"Værdi"},"select":{"title":"Egenskaber for liste","selectInfo":"Generelt","opAvail":"Valgmuligheder","value":"Værdi","size":"Størrelse","lines":"Linjer","chkMulti":"Tillad flere valg","required":"Påkrævet","opText":"Tekst","opValue":"Værdi","btnAdd":"Tilføj","btnModify":"Redigér","btnUp":"Op","btnDown":"Ned","btnSetValue":"Sæt som valgt","btnDelete":"Slet"},"textarea":{"title":"Egenskaber for tekstboks","cols":"Kolonner","rows":"Rækker"},"textfield":{"title":"Egenskaber for tekstfelt","name":"Navn","value":"Værdi","charWidth":"Bredde (tegn)","maxChars":"Max. antal tegn","required":"Påkrævet","type":"Type","typeText":"Tekst","typePass":"Adgangskode","typeEmail":"E-mail","typeSearch":"Søg","typeTel":"Telefon nummer","typeUrl":"URL"}},"format":{"label":"Formatering","panelTitle":"Formatering","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formateret"},"horizontalrule":{"toolbar":"Indsæt vandret streg"},"iframe":{"border":"Vis kant på rammen","noUrl":"Venligst indsæt URL på iframen","scrolling":"Aktiver scrollbars","title":"Iframe egenskaber","toolbar":"Iframe"},"image":{"alt":"Alternativ tekst","border":"Ramme","btnUpload":"Upload fil til serveren","button2Img":"Vil du lave billedknappen om til et almindeligt billede?","hSpace":"Vandret margen","img2Button":"Vil du lave billedet om til en billedknap?","infoTab":"Generelt","linkTab":"Hyperlink","lockRatio":"Lås størrelsesforhold","menu":"Egenskaber for billede","resetSize":"Nulstil størrelse","title":"Egenskaber for billede","titleButton":"Egenskaber for billedknap","upload":"Upload","urlMissing":"Kilde på billed-URL mangler","vSpace":"Lodret margen","validateBorder":"Kant skal være et helt nummer.","validateHSpace":"HSpace skal være et helt nummer.","validateVSpace":"VSpace skal være et helt nummer."},"indent":{"indent":"Forøg indrykning","outdent":"Formindsk indrykning"},"smiley":{"options":"Smileymuligheder","title":"Vælg smiley","toolbar":"Smiley"},"justify":{"block":"Lige margener","center":"Centreret","left":"Venstrestillet","right":"Højrestillet"},"language":{"button":"Vælg sprog","remove":"Fjern sprog"},"link":{"acccessKey":"Genvejstast","advanced":"Avanceret","advisoryContentType":"Indholdstype","advisoryTitle":"Titel","anchor":{"toolbar":"Indsæt/redigér bogmærke","menu":"Egenskaber for bogmærke","title":"Egenskaber for bogmærke","name":"Bogmærkenavn","errorName":"Indtast bogmærkenavn","remove":"Fjern bogmærke"},"anchorId":"Efter element-Id","anchorName":"Efter ankernavn","charset":"Tegnsæt","cssClasses":"Typografiark","emailAddress":"E-mailadresse","emailBody":"Besked","emailSubject":"Emne","id":"Id","info":"Generelt","langCode":"Tekstretning","langDir":"Tekstretning","langDirLTR":"Fra venstre mod højre (LTR)","langDirRTL":"Fra højre mod venstre (RTL)","menu":"Redigér hyperlink","name":"Navn","noAnchors":"(Ingen bogmærker i dokumentet)","noEmail":"Indtast e-mailadresse!","noUrl":"Indtast hyperlink-URL!","other":"<anden>","popupDependent":"Koblet/dependent (Netscape)","popupFeatures":"Egenskaber for popup","popupFullScreen":"Fuld skærm (IE)","popupLeft":"Position fra venstre","popupLocationBar":"Adresselinje","popupMenuBar":"Menulinje","popupResizable":"Justérbar","popupScrollBars":"Scrollbar","popupStatusBar":"Statuslinje","popupToolbar":"Værktøjslinje","popupTop":"Position fra toppen","rel":"Relation","selectAnchor":"Vælg et anker","styles":"Typografi","tabIndex":"Tabulatorindeks","target":"Mål","targetFrame":"<ramme>","targetFrameName":"Destinationsvinduets navn","targetPopup":"<popup vindue>","targetPopupName":"Popupvinduets navn","title":"Egenskaber for hyperlink","toAnchor":"Bogmærke på denne side","toEmail":"E-mail","toUrl":"URL","toolbar":"Indsæt/redigér hyperlink","type":"Type","unlink":"Fjern hyperlink","upload":"Upload"},"list":{"bulletedlist":"Punktopstilling","numberedlist":"Talopstilling"},"liststyle":{"armenian":"Armensk nummering","bulletedTitle":"Værdier for cirkelpunktopstilling","circle":"Cirkel","decimal":"Decimal (1, 2, 3, osv.)","decimalLeadingZero":"Decimaler med 0 først (01, 02, 03, etc.)","disc":"Værdier for diskpunktopstilling","georgian":"Georgiansk nummering (an, ban, gan, etc.)","lowerAlpha":"Små alfabet (a, b, c, d, e, etc.)","lowerGreek":"Små græsk (alpha, beta, gamma, etc.)","lowerRoman":"Små romerske (i, ii, iii, iv, v, etc.)","none":"Ingen","notset":"<ikke defineret>","numberedTitle":"Egenskaber for nummereret liste","square":"Firkant","start":"Start","type":"Type","upperAlpha":"Store alfabet (A, B, C, D, E, etc.)","upperRoman":"Store romerske (I, II, III, IV, V, etc.)","validateStartNumber":"Den nummererede liste skal starte med et rundt nummer"},"magicline":{"title":"Indsæt afsnit"},"maximize":{"maximize":"Maksimér","minimize":"Minimér"},"newpage":{"toolbar":"Ny side"},"pagebreak":{"alt":"Sideskift","toolbar":"Indsæt sideskift"},"pastetext":{"button":"Indsæt som ikke-formateret tekst","title":"Indsæt som ikke-formateret tekst"},"pastefromword":{"confirmCleanup":"Den tekst du forsøger at indsætte ser ud til at komme fra Word. Vil du rense teksten før den indsættes?","error":"Det var ikke muligt at fjerne formatteringen på den indsatte tekst grundet en intern fejl","title":"Indsæt fra Word","toolbar":"Indsæt fra Word"},"preview":{"preview":"Vis eksempel"},"print":{"toolbar":"Udskriv"},"removeformat":{"toolbar":"Fjern formatering"},"save":{"toolbar":"Gem"},"selectall":{"toolbar":"Vælg alt"},"showblocks":{"toolbar":"Vis afsnitsmærker"},"sourcearea":{"toolbar":"Kilde"},"specialchar":{"options":"Muligheder for specialkarakterer","title":"Vælg symbol","toolbar":"Indsæt symbol"},"scayt":{"btn_about":"Om SCAYT","btn_dictionaries":"Ordbøger","btn_disable":"Deaktivér SCAYT","btn_enable":"Aktivér SCAYT","btn_langs":"Sprog","btn_options":"Indstillinger","text_title":"Stavekontrol mens du skriver"},"stylescombo":{"label":"Typografi","panelTitle":"Formattering på stylesheet","panelTitle1":"Block typografi","panelTitle2":"Inline typografi","panelTitle3":"Object typografi"},"table":{"border":"Rammebredde","caption":"Titel","cell":{"menu":"Celle","insertBefore":"Indsæt celle før","insertAfter":"Indsæt celle efter","deleteCell":"Slet celle","merge":"Flet celler","mergeRight":"Flet til højre","mergeDown":"Flet nedad","splitHorizontal":"Del celle vandret","splitVertical":"Del celle lodret","title":"Celleegenskaber","cellType":"Celletype","rowSpan":"Række span (rows span)","colSpan":"Kolonne span (columns span)","wordWrap":"Tekstombrydning","hAlign":"Vandret justering","vAlign":"Lodret justering","alignBaseline":"Grundlinje","bgColor":"Baggrundsfarve","borderColor":"Rammefarve","data":"Data","header":"Hoved","yes":"Ja","no":"Nej","invalidWidth":"Cellebredde skal være et tal.","invalidHeight":"Cellehøjde skal være et tal.","invalidRowSpan":"Række span skal være et heltal.","invalidColSpan":"Kolonne span skal være et heltal.","chooseColor":"Vælg"},"cellPad":"Cellemargen","cellSpace":"Celleafstand","column":{"menu":"Kolonne","insertBefore":"Indsæt kolonne før","insertAfter":"Indsæt kolonne efter","deleteColumn":"Slet kolonne"},"columns":"Kolonner","deleteTable":"Slet tabel","headers":"Hoved","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første række","invalidBorder":"Rammetykkelse skal være et tal.","invalidCellPadding":"Cellemargen skal være et tal.","invalidCellSpacing":"Celleafstand skal være et tal.","invalidCols":"Antallet af kolonner skal være større end 0.","invalidHeight":"Tabelhøjde skal være et tal.","invalidRows":"Antallet af rækker skal være større end 0.","invalidWidth":"Tabelbredde skal være et tal.","menu":"Egenskaber for tabel","row":{"menu":"Række","insertBefore":"Indsæt række før","insertAfter":"Indsæt række efter","deleteRow":"Slet række"},"rows":"Rækker","summary":"Resumé","title":"Egenskaber for tabel","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"Bredde på enhed"},"undo":{"redo":"Annullér fortryd","undo":"Fortryd"},"wsc":{"btnIgnore":"Ignorér","btnIgnoreAll":"Ignorér alle","btnReplace":"Erstat","btnReplaceAll":"Erstat alle","btnUndo":"Tilbage","changeTo":"Forslag","errorLoading":"Fejl ved indlæsning af host: %s.","ieSpellDownload":"Stavekontrol ikke installeret. Vil du installere den nu?","manyChanges":"Stavekontrol færdig: %1 ord ændret","noChanges":"Stavekontrol færdig: Ingen ord ændret","noMispell":"Stavekontrol færdig: Ingen fejl fundet","noSuggestions":"(ingen forslag)","notAvailable":"Stavekontrol er desværre ikke tilgængelig.","notInDic":"Ikke i ordbogen","oneChange":"Stavekontrol færdig: Et ord ændret","progress":"Stavekontrollen arbejder...","title":"Stavekontrol","toolbar":"Stavekontrol"}};
\ No newline at end of file
+CKEDITOR.lang['da']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tryk ALT 0 for hjælp","browseServer":"Gennemse...","url":"URL","protocol":"Protokol","upload":"Upload","uploadSubmit":"Upload","image":"Indsæt billede","flash":"Indsæt Flash","form":"Indsæt formular","checkbox":"Indsæt afkrydsningsfelt","radio":"Indsæt alternativknap","textField":"Indsæt tekstfelt","textarea":"Indsæt tekstboks","hiddenField":"Indsæt skjult felt","button":"Indsæt knap","select":"Indsæt liste","imageButton":"Indsæt billedknap","notSet":"<intet valgt>","id":"Id","name":"Navn","langDir":"Tekstretning","langDirLtr":"Fra venstre mod højre (LTR)","langDirRtl":"Fra højre mod venstre (RTL)","langCode":"Sprogkode","longDescr":"Udvidet beskrivelse","cssClass":"Typografiark (CSS)","advisoryTitle":"Titel","cssStyle":"Typografi (CSS)","ok":"OK","cancel":"Annullér","close":"Luk","preview":"Forhåndsvisning","resize":"Træk for at skalere","generalTab":"Generelt","advancedTab":"Avanceret","validateNumberFailed":"Værdien er ikke et tal.","confirmNewPage":"Alt indhold, der ikke er blevet gemt, vil gå tabt. Er du sikker på, at du vil indlæse en ny side?","confirmCancel":"Nogle af indstillingerne er blevet ændret. Er du sikker på, at du vil lukke vinduet?","options":"Vis muligheder","target":"Mål","targetNew":"Nyt vindue (_blank)","targetTop":"Øverste vindue (_top)","targetSelf":"Samme vindue (_self)","targetParent":"Samme vindue (_parent)","langDirLTR":"Venstre til højre (LTR)","langDirRTL":"Højre til venstre (RTL)","styles":"Style","cssClasses":"Stylesheetklasser","width":"Bredde","height":"Højde","align":"Justering","alignLeft":"Venstre","alignRight":"Højre","alignCenter":"Centreret","alignJustify":"Lige margener","alignTop":"Øverst","alignMiddle":"Centreret","alignBottom":"Nederst","alignNone":"Ingen","invalidValue":"Ugyldig værdi.","invalidHeight":"Højde skal være et tal.","invalidWidth":"Bredde skal være et tal.","invalidCssLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px eller %).","invalidInlineStyle":"Værdien specificeret for inline style skal indeholde en eller flere elementer med et format som \"name:value\", separeret af semikoloner","cssLengthTooltip":"Indsæt en numerisk værdi i pixel eller nummer med en gyldig CSS værdi (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikke tilgængelig</span>","keyboard":{"8":"Backspace","13":"Retur","16":"Shift","17":"Ctrl","18":"Alt","32":"Mellemrum","35":"End","36":"Home","46":"Slet","224":"Command"},"keyboardShortcut":"Tastatur genvej"},"about":{"copy":"Copyright &copy; $1. Alle rettigheder forbeholdes.","dlgTitle":"Om CKEditor","help":"Se $1 for at få hjælp.","moreInfo":"For informationer omkring licens, se venligst vores hjemmeside (på engelsk):","title":"Om CKEditor","userGuide":"CKEditor-brugermanual"},"basicstyles":{"bold":"Fed","italic":"Kursiv","strike":"Gennemstreget","subscript":"Sænket skrift","superscript":"Hævet skrift","underline":"Understreget"},"bidi":{"ltr":"Tekstretning fra venstre til højre","rtl":"Tekstretning fra højre til venstre"},"blockquote":{"toolbar":"Blokcitat"},"clipboard":{"copy":"Kopiér","copyError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at kopiere teksten (Ctrl/Cmd+C).","cut":"Klip","cutError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at klippe teksten (Ctrl/Cmd+X).","paste":"Indsæt","pasteArea":"Indsæt område","pasteMsg":"Indsæt i feltet herunder (<STRONG>Ctrl/Cmd+V</STRONG>) og klik på <STRONG>OK</STRONG>.","securityMsg":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Du skal indsætte udklipsholderens indhold i dette vindue igen.","title":"Indsæt"},"button":{"selectedLabel":"%1 (Valgt)"},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Baggrundsfarve","colors":{"000":"Sort","800000":"Mørkerød","8B4513":"Mørk orange","2F4F4F":"Dark Slate Grå","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Mørkegrå","B22222":"Scarlet / Rød","A52A2A":"Brun","DAA520":"Guld","006400":"Mørkegrøn","40E0D0":"Tyrkis","0000CD":"Mellemblå","800080":"Lilla","808080":"Grå","F00":"Rød","FF8C00":"Mørk orange","FFD700":"Guld","008000":"Grøn","0FF":"Cyan","00F":"Blå","EE82EE":"Violet","A9A9A9":"Matgrå","FFA07A":"Laksefarve","FFA500":"Orange","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Mat tyrkis","ADD8E6":"Lyseblå","DDA0DD":"Plum","D3D3D3":"Lysegrå","FFF0F5":"Lavender Blush","FAEBD7":"Antikhvid","FFFFE0":"Lysegul","F0FFF0":"Gul / Beige","F0FFFF":"Himmeblå","F0F8FF":"Alice blue","E6E6FA":"Lavendel","FFF":"Hvid","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Flere farver...","panelTitle":"Farver","textColorTitle":"Tekstfarve"},"colordialog":{"clear":"Nulstil","highlight":"Markér","options":"Farvemuligheder","selected":"Valgt farve","title":"Vælg farve"},"templates":{"button":"Skabeloner","emptyListMsg":"(Der er ikke defineret nogen skabelon)","insertOption":"Erstat det faktiske indhold","options":"Skabelon muligheder","selectPromptMsg":"Vælg den skabelon, som skal åbnes i editoren (nuværende indhold vil blive overskrevet):","title":"Indholdsskabeloner"},"contextmenu":{"options":"Muligheder for hjælpemenu"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Vejledende titel","cssClassInputLabel":"Typografiark","edit":"Rediger Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Venstre til højre (LTR)","langDirLabel":"Sprogretning","langDirRTLLabel":"Højre til venstre (RTL)","languageCodeInputLabel":" Sprogkode","remove":"Slet Div","styleSelectLabel":"Style","title":"Opret Div Container","toolbar":"Opret Div Container"},"toolbar":{"toolbarCollapse":"Sammenklap værktøjslinje","toolbarExpand":"Udvid værktøjslinje","toolbarGroups":{"document":"Dokument","clipboard":"Udklipsholder/Fortryd","editing":"Redigering","forms":"Formularer","basicstyles":"Basis styles","paragraph":"Paragraf","links":"Links","insert":"Indsæt","styles":"Typografier","colors":"Farver","tools":"Værktøjer"},"toolbars":"Editors værktøjslinjer"},"elementspath":{"eleLabel":"Sti på element","eleTitle":"%1 element"},"find":{"find":"Søg","findOptions":"Find muligheder","findWhat":"Søg efter:","matchCase":"Forskel på store og små bogstaver","matchCyclic":"Match cyklisk","matchWord":"Kun hele ord","notFoundMsg":"Søgeteksten blev ikke fundet","replace":"Erstat","replaceAll":"Erstat alle","replaceSuccessMsg":"%1 forekomst(er) erstattet.","replaceWith":"Erstat med:","title":"Søg og erstat"},"fakeobjects":{"anchor":"Anker","flash":"Flashanimation","hiddenfield":"Skjult felt","iframe":"Iframe","unknown":"Ukendt objekt"},"flash":{"access":"Scriptadgang","accessAlways":"Altid","accessNever":"Aldrig","accessSameDomain":"Samme domæne","alignAbsBottom":"Absolut nederst","alignAbsMiddle":"Absolut centreret","alignBaseline":"Grundlinje","alignTextTop":"Toppen af teksten","bgcolor":"Baggrundsfarve","chkFull":"Tillad fuldskærm","chkLoop":"Gentagelse","chkMenu":"Vis Flash-menu","chkPlay":"Automatisk afspilning","flashvars":"Variabler for Flash","hSpace":"Vandret margen","properties":"Egenskaber for Flash","propertiesTab":"Egenskaber","quality":"Kvalitet","qualityAutoHigh":"Auto høj","qualityAutoLow":"Auto lav","qualityBest":"Bedste","qualityHigh":"Høj","qualityLow":"Lav","qualityMedium":"Medium","scale":"Skalér","scaleAll":"Vis alt","scaleFit":"Tilpas størrelse","scaleNoBorder":"Ingen ramme","title":"Egenskaber for Flash","vSpace":"Lodret margen","validateHSpace":"Vandret margen skal være et tal.","validateSrc":"Indtast hyperlink URL!","validateVSpace":"Lodret margen skal være et tal.","windowMode":"Vinduestilstand","windowModeOpaque":"Gennemsigtig (opaque)","windowModeTransparent":"Transparent","windowModeWindow":"Vindue"},"font":{"fontSize":{"label":"Skriftstørrelse","voiceLabel":"Skriftstørrelse","panelTitle":"Skriftstørrelse"},"label":"Skrifttype","panelTitle":"Skrifttype","voiceLabel":"Skrifttype"},"forms":{"button":{"title":"Egenskaber for knap","text":"Tekst","type":"Type","typeBtn":"Knap","typeSbm":"Send","typeRst":"Nulstil"},"checkboxAndRadio":{"checkboxTitle":"Egenskaber for afkrydsningsfelt","radioTitle":"Egenskaber for alternativknap","value":"Værdi","selected":"Valgt","required":"Påkrævet"},"form":{"title":"Egenskaber for formular","menu":"Egenskaber for formular","action":"Handling","method":"Metode","encoding":"Kodning (encoding)"},"hidden":{"title":"Egenskaber for skjult felt","name":"Navn","value":"Værdi"},"select":{"title":"Egenskaber for liste","selectInfo":"Generelt","opAvail":"Valgmuligheder","value":"Værdi","size":"Størrelse","lines":"Linjer","chkMulti":"Tillad flere valg","required":"Påkrævet","opText":"Tekst","opValue":"Værdi","btnAdd":"Tilføj","btnModify":"Redigér","btnUp":"Op","btnDown":"Ned","btnSetValue":"Sæt som valgt","btnDelete":"Slet"},"textarea":{"title":"Egenskaber for tekstboks","cols":"Kolonner","rows":"Rækker"},"textfield":{"title":"Egenskaber for tekstfelt","name":"Navn","value":"Værdi","charWidth":"Bredde (tegn)","maxChars":"Max. antal tegn","required":"Påkrævet","type":"Type","typeText":"Tekst","typePass":"Adgangskode","typeEmail":"E-mail","typeSearch":"Søg","typeTel":"Telefon nummer","typeUrl":"URL"}},"format":{"label":"Formatering","panelTitle":"Formatering","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formateret"},"horizontalrule":{"toolbar":"Indsæt vandret streg"},"iframe":{"border":"Vis kant på rammen","noUrl":"Venligst indsæt URL på iframen","scrolling":"Aktiver scrollbars","title":"Iframe egenskaber","toolbar":"Iframe"},"image":{"alt":"Alternativ tekst","border":"Ramme","btnUpload":"Upload fil til serveren","button2Img":"Vil du lave billedknappen om til et almindeligt billede?","hSpace":"Vandret margen","img2Button":"Vil du lave billedet om til en billedknap?","infoTab":"Generelt","linkTab":"Hyperlink","lockRatio":"Lås størrelsesforhold","menu":"Egenskaber for billede","resetSize":"Nulstil størrelse","title":"Egenskaber for billede","titleButton":"Egenskaber for billedknap","upload":"Upload","urlMissing":"Kilde på billed-URL mangler","vSpace":"Lodret margen","validateBorder":"Kant skal være et helt nummer.","validateHSpace":"HSpace skal være et helt nummer.","validateVSpace":"VSpace skal være et helt nummer."},"indent":{"indent":"Forøg indrykning","outdent":"Formindsk indrykning"},"smiley":{"options":"Smileymuligheder","title":"Vælg smiley","toolbar":"Smiley"},"justify":{"block":"Lige margener","center":"Centreret","left":"Venstrestillet","right":"Højrestillet"},"language":{"button":"Vælg sprog","remove":"Fjern sprog"},"link":{"acccessKey":"Genvejstast","advanced":"Avanceret","advisoryContentType":"Indholdstype","advisoryTitle":"Titel","anchor":{"toolbar":"Indsæt/redigér bogmærke","menu":"Egenskaber for bogmærke","title":"Egenskaber for bogmærke","name":"Bogmærkenavn","errorName":"Indtast bogmærkenavn","remove":"Fjern bogmærke"},"anchorId":"Efter element-Id","anchorName":"Efter ankernavn","charset":"Tegnsæt","cssClasses":"Typografiark","download":"Force Download","displayText":"Display Text","emailAddress":"E-mailadresse","emailBody":"Besked","emailSubject":"Emne","id":"Id","info":"Generelt","langCode":"Tekstretning","langDir":"Tekstretning","langDirLTR":"Fra venstre mod højre (LTR)","langDirRTL":"Fra højre mod venstre (RTL)","menu":"Redigér hyperlink","name":"Navn","noAnchors":"(Ingen bogmærker i dokumentet)","noEmail":"Indtast e-mailadresse!","noUrl":"Indtast hyperlink-URL!","other":"<anden>","popupDependent":"Koblet/dependent (Netscape)","popupFeatures":"Egenskaber for popup","popupFullScreen":"Fuld skærm (IE)","popupLeft":"Position fra venstre","popupLocationBar":"Adresselinje","popupMenuBar":"Menulinje","popupResizable":"Justérbar","popupScrollBars":"Scrollbar","popupStatusBar":"Statuslinje","popupToolbar":"Værktøjslinje","popupTop":"Position fra toppen","rel":"Relation","selectAnchor":"Vælg et anker","styles":"Typografi","tabIndex":"Tabulatorindeks","target":"Mål","targetFrame":"<ramme>","targetFrameName":"Destinationsvinduets navn","targetPopup":"<popup vindue>","targetPopupName":"Popupvinduets navn","title":"Egenskaber for hyperlink","toAnchor":"Bogmærke på denne side","toEmail":"E-mail","toUrl":"URL","toolbar":"Indsæt/redigér hyperlink","type":"Type","unlink":"Fjern hyperlink","upload":"Upload"},"list":{"bulletedlist":"Punktopstilling","numberedlist":"Talopstilling"},"liststyle":{"armenian":"Armensk nummering","bulletedTitle":"Værdier for cirkelpunktopstilling","circle":"Cirkel","decimal":"Decimal (1, 2, 3, osv.)","decimalLeadingZero":"Decimaler med 0 først (01, 02, 03, etc.)","disc":"Værdier for diskpunktopstilling","georgian":"Georgiansk nummering (an, ban, gan, etc.)","lowerAlpha":"Små alfabet (a, b, c, d, e, etc.)","lowerGreek":"Små græsk (alpha, beta, gamma, etc.)","lowerRoman":"Små romerske (i, ii, iii, iv, v, etc.)","none":"Ingen","notset":"<ikke defineret>","numberedTitle":"Egenskaber for nummereret liste","square":"Firkant","start":"Start","type":"Type","upperAlpha":"Store alfabet (A, B, C, D, E, etc.)","upperRoman":"Store romerske (I, II, III, IV, V, etc.)","validateStartNumber":"Den nummererede liste skal starte med et rundt nummer"},"magicline":{"title":"Indsæt afsnit"},"maximize":{"maximize":"Maksimér","minimize":"Minimér"},"newpage":{"toolbar":"Ny side"},"pagebreak":{"alt":"Sideskift","toolbar":"Indsæt sideskift"},"pastetext":{"button":"Indsæt som ikke-formateret tekst","title":"Indsæt som ikke-formateret tekst"},"pastefromword":{"confirmCleanup":"Den tekst du forsøger at indsætte ser ud til at komme fra Word. Vil du rense teksten før den indsættes?","error":"Det var ikke muligt at fjerne formatteringen på den indsatte tekst grundet en intern fejl","title":"Indsæt fra Word","toolbar":"Indsæt fra Word"},"preview":{"preview":"Vis eksempel"},"print":{"toolbar":"Udskriv"},"removeformat":{"toolbar":"Fjern formatering"},"save":{"toolbar":"Gem"},"selectall":{"toolbar":"Vælg alt"},"showblocks":{"toolbar":"Vis afsnitsmærker"},"sourcearea":{"toolbar":"Kilde"},"specialchar":{"options":"Muligheder for specialkarakterer","title":"Vælg symbol","toolbar":"Indsæt symbol"},"scayt":{"btn_about":"Om SCAYT","btn_dictionaries":"Ordbøger","btn_disable":"Deaktivér SCAYT","btn_enable":"Aktivér SCAYT","btn_langs":"Sprog","btn_options":"Indstillinger","text_title":"Stavekontrol mens du skriver"},"stylescombo":{"label":"Typografi","panelTitle":"Formattering på stylesheet","panelTitle1":"Block typografi","panelTitle2":"Inline typografi","panelTitle3":"Object typografi"},"table":{"border":"Rammebredde","caption":"Titel","cell":{"menu":"Celle","insertBefore":"Indsæt celle før","insertAfter":"Indsæt celle efter","deleteCell":"Slet celle","merge":"Flet celler","mergeRight":"Flet til højre","mergeDown":"Flet nedad","splitHorizontal":"Del celle vandret","splitVertical":"Del celle lodret","title":"Celleegenskaber","cellType":"Celletype","rowSpan":"Række span (rows span)","colSpan":"Kolonne span (columns span)","wordWrap":"Tekstombrydning","hAlign":"Vandret justering","vAlign":"Lodret justering","alignBaseline":"Grundlinje","bgColor":"Baggrundsfarve","borderColor":"Rammefarve","data":"Data","header":"Hoved","yes":"Ja","no":"Nej","invalidWidth":"Cellebredde skal være et tal.","invalidHeight":"Cellehøjde skal være et tal.","invalidRowSpan":"Række span skal være et heltal.","invalidColSpan":"Kolonne span skal være et heltal.","chooseColor":"Vælg"},"cellPad":"Cellemargen","cellSpace":"Celleafstand","column":{"menu":"Kolonne","insertBefore":"Indsæt kolonne før","insertAfter":"Indsæt kolonne efter","deleteColumn":"Slet kolonne"},"columns":"Kolonner","deleteTable":"Slet tabel","headers":"Hoved","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første række","invalidBorder":"Rammetykkelse skal være et tal.","invalidCellPadding":"Cellemargen skal være et tal.","invalidCellSpacing":"Celleafstand skal være et tal.","invalidCols":"Antallet af kolonner skal være større end 0.","invalidHeight":"Tabelhøjde skal være et tal.","invalidRows":"Antallet af rækker skal være større end 0.","invalidWidth":"Tabelbredde skal være et tal.","menu":"Egenskaber for tabel","row":{"menu":"Række","insertBefore":"Indsæt række før","insertAfter":"Indsæt række efter","deleteRow":"Slet række"},"rows":"Rækker","summary":"Resumé","title":"Egenskaber for tabel","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"Bredde på enhed"},"undo":{"redo":"Annullér fortryd","undo":"Fortryd"},"wsc":{"btnIgnore":"Ignorér","btnIgnoreAll":"Ignorér alle","btnReplace":"Erstat","btnReplaceAll":"Erstat alle","btnUndo":"Tilbage","changeTo":"Forslag","errorLoading":"Fejl ved indlæsning af host: %s.","ieSpellDownload":"Stavekontrol ikke installeret. Vil du installere den nu?","manyChanges":"Stavekontrol færdig: %1 ord ændret","noChanges":"Stavekontrol færdig: Ingen ord ændret","noMispell":"Stavekontrol færdig: Ingen fejl fundet","noSuggestions":"(ingen forslag)","notAvailable":"Stavekontrol er desværre ikke tilgængelig.","notInDic":"Ikke i ordbogen","oneChange":"Stavekontrol færdig: Et ord ændret","progress":"Stavekontrollen arbejder...","title":"Stavekontrol","toolbar":"Stavekontrol"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/de-ch.js b/htdocs/includes/ckeditor/ckeditor/lang/de-ch.js
index 49a57586ab4..6408051bdbb 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/de-ch.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/de-ch.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['de-ch']={"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schliessen","preview":"Vorschau","resize":"Grösse ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schliessen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor","help":"Prüfen Sie $1 für Hilfe.","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:","title":"Über CKEditor","userGuide":"CKEditor Benutzerhandbuch"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"bidi":{"ltr":"Leserichtung von Links nach Rechts","rtl":"Leserichtung von Rechts nach Links"},"blockquote":{"toolbar":"Zitatblock"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteArea":"Einfügebereich","pasteMsg":"Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.","securityMsg":"Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.","title":"Einfügen"},"button":{"selectedLabel":"%1 (Ausgewählt)"},"colorbutton":{"auto":"Automatisch","bgColorTitle":"Hintergrundfarbe","colors":{"000":"Schwarz","800000":"Kastanienbraun","8B4513":"Braun","2F4F4F":"Dunkles Schiefergrau","008080":"Blaugrün","000080":"Marineblau","4B0082":"Indigo","696969":"Dunkelgrau","B22222":"Ziegelrot","A52A2A":"Braun","DAA520":"Goldgelb","006400":"Dunkelgrün","40E0D0":"Türkis","0000CD":"Mittelblau","800080":"Lila","808080":"Grau","F00":"Rot","FF8C00":"Dunkelorange","FFD700":"Gold","008000":"Grün","0FF":"Cyan","00F":"Blau","EE82EE":"Violett","A9A9A9":"Dunkelgrau","FFA07A":"Helles Lachsrosa","FFA500":"Orange","FFFF00":"Gelb","00FF00":"Lime","AFEEEE":"Blasstürkis","ADD8E6":"Hellblau","DDA0DD":"Pflaumenblau","D3D3D3":"Hellgrau","FFF0F5":"Lavendel","FAEBD7":"Antik Weiss","FFFFE0":"Hellgelb","F0FFF0":"Honigtau","F0FFFF":"Azurblau","F0F8FF":"Alice Blau","E6E6FA":"Lavendel","FFF":"Weiss"},"more":"Weitere Farben...","panelTitle":"Farben","textColorTitle":"Textfarbe"},"colordialog":{"clear":"Entfernen","highlight":"Hervorheben","options":"Farboptionen","selected":"Ausgewählte Farbe","title":"Farbe auswählen"},"templates":{"button":"Vorlagen","emptyListMsg":"(Keine Vorlagen definiert)","insertOption":"Aktuelle Inhalte ersetzen","options":"Vorlagenoptionen","selectPromptMsg":"Klicken Sie auf eine Vorlage, um sie im Editor zu öffnen","title":"Inhaltsvorlagen"},"contextmenu":{"options":"Kontextmenüoptionen"},"div":{"IdInputLabel":"Kennung","advisoryTitleInputLabel":"Tooltip","cssClassInputLabel":"Formatvorlagenklasse","edit":"Div bearbeiten","inlineStyleInputLabel":"Inline Stil","langDirLTRLabel":"Links nach Rechs (LTR)","langDirLabel":"Sprachrichtung","langDirRTLLabel":"Rechs nach Links (RTL)","languageCodeInputLabel":"Sprachcode","remove":"Div entfernen","styleSelectLabel":"Stil","title":"Div Container erzeugen","toolbar":"Div Container erzeugen"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"elementspath":{"eleLabel":"Elementepfad","eleTitle":"%1 Element"},"find":{"find":"Suchen","findOptions":"Suchoptionen","findWhat":"Suche nach:","matchCase":"Gross-/Kleinschreibung beachten","matchCyclic":"Zyklische Suche","matchWord":"Nur ganze Worte suchen","notFoundMsg":"Der angegebene Text wurde nicht gefunden.","replace":"Ersetzen","replaceAll":"Alle ersetzen","replaceSuccessMsg":"%1 Vorkommen ersetzt.","replaceWith":"Ersetze mit:","title":"Suchen und Ersetzen"},"fakeobjects":{"anchor":"Anker","flash":"Flash-Animation","hiddenfield":"Verstecktes Feld","iframe":"IFrame","unknown":"Unbekanntes Objekt"},"flash":{"access":"Skriptzugriff","accessAlways":"Immer","accessNever":"Nie","accessSameDomain":"Gleiche Domain","alignAbsBottom":"Abs Unten","alignAbsMiddle":"Abs Mitte","alignBaseline":"Basislinie","alignTextTop":"Text oben","bgcolor":"Hintergrundfarbe","chkFull":"Vollbildmodus erlauben","chkLoop":"Endlosschleife","chkMenu":"Flash-Menü aktivieren","chkPlay":"Automatisch Abspielen","flashvars":"Variablen für Flash","hSpace":"Horizontal-Abstand","properties":"Flash-Eigenschaften","propertiesTab":"Eigenschaften","quality":"Qualität","qualityAutoHigh":"Auto Hoch","qualityAutoLow":"Auto Niedrig","qualityBest":"Beste","qualityHigh":"Hoch","qualityLow":"Niedrig","qualityMedium":"Mittel","scale":"Skalierung","scaleAll":"Alles anzeigen","scaleFit":"Passgenau","scaleNoBorder":"Ohne Rand","title":"Flash-Eigenschaften","vSpace":"Vertikal-Abstand","validateHSpace":"HSpace muss eine Zahl sein.","validateSrc":"URL darf nicht leer sein.","validateVSpace":"VSpace muss eine Zahl sein.","windowMode":"Fenstermodus","windowModeOpaque":"Deckend","windowModeTransparent":"Transparent","windowModeWindow":"Fenster"},"font":{"fontSize":{"label":"Grösse","voiceLabel":"Schrifgrösse","panelTitle":"Schriftgrösse"},"label":"Schriftart","panelTitle":"Schriftartname","voiceLabel":"Schriftart"},"forms":{"button":{"title":"Schaltflächeneigenschaften","text":"Text (Wert)","type":"Typ","typeBtn":"Button","typeSbm":"Absenden","typeRst":"Zurücksetzen"},"checkboxAndRadio":{"checkboxTitle":"Kontrollboxeigenschaften","radioTitle":"Optionsfeldeigenschaften","value":"Wert","selected":"Ausgewählt","required":"Erforderlich"},"form":{"title":"Formulareigenschaften","menu":"Formulareigenschaften","action":"Aktion","method":"Methode","encoding":"Kodierung"},"hidden":{"title":"Versteckte Feldeigenschaften","name":"Name","value":"Wert"},"select":{"title":"Auswahlfeldeigenschaften","selectInfo":"Info auswählen","opAvail":"Verfügbare Optionen","value":"Wert","size":"Grösse","lines":"Linien","chkMulti":"Mehrfachauswahl erlauben","required":"Erforderlich","opText":"Text","opValue":"Wert","btnAdd":"Hinzufügen","btnModify":"Ändern","btnUp":"Hoch","btnDown":"Runter","btnSetValue":"Als ausgewählten Wert festlegen","btnDelete":"Entfernen"},"textarea":{"title":"Textfeldeigenschaften","cols":"Spalten","rows":"Reihen"},"textfield":{"title":"Textfeldeigenschaften","name":"Name","value":"Wert","charWidth":"Zeichenbreite","maxChars":"Max. Zeichen","required":"Erforderlich","type":"Typ","typeText":"Text","typePass":"Passwort","typeEmail":"E-mail","typeSearch":"Suche","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Absatzformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Überschrift 1","tag_h2":"Überschrift 2","tag_h3":"Überschrift 3","tag_h4":"Überschrift 4","tag_h5":"Überschrift 5","tag_h6":"Überschrift 6","tag_p":"Normal","tag_pre":"Formatiert"},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"iframe":{"border":"Rahmen anzeigen","noUrl":"Bitte geben Sie die IFrame-URL an","scrolling":"Rollbalken anzeigen","title":"IFrame-Eigenschaften","toolbar":"IFrame"},"image":{"alt":"Alternativer Text","border":"Rahmen","btnUpload":"Zum Server senden","button2Img":"Möchten Sie die ausgewählte Bildschaltfläche in ein einfaches Bild umwandeln?","hSpace":"Horizontal-Abstand","img2Button":"Möchten Sie das ausgewählte Bild in eine Bildschaltfläche umwandeln?","infoTab":"Bildinfo","linkTab":"Link","lockRatio":"Grössenverhältnis beibehalten","menu":"Bildeigenschaften","resetSize":"Grösse zurücksetzen","title":"Bildeigenschaften","titleButton":"Bildschaltflächeneigenschaften","upload":"Hochladen","urlMissing":"Bildquellen-URL fehlt.","vSpace":"Vertikal-Abstand","validateBorder":"Rahmen muss eine ganze Zahl sein.","validateHSpace":"Horizontal-Abstand muss eine ganze Zahl sein.","validateVSpace":"Vertikal-Abstand muss eine ganze Zahl sein."},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"smiley":{"options":"Smiley-Optionen","title":"Smiley auswählen","toolbar":"Smiley"},"justify":{"block":"Blocksatz","center":"Zentriert","left":"Linksbündig","right":"Rechtsbündig"},"language":{"button":"Sprache festlegen","remove":"Sprache entfernen"},"link":{"acccessKey":"Zugriffstaste","advanced":"Erweitert","advisoryContentType":"Inhaltstyp","advisoryTitle":"Titel Beschreibung","anchor":{"toolbar":"Anker","menu":"Anker bearbeiten","title":"Ankereigenschaften","name":"Ankername","errorName":"Bitte geben Sie den Namen des Ankers ein","remove":"Anker entfernen"},"anchorId":"Nach Elementkennung","anchorName":"Nach Ankername","charset":"Verknüpfter Ressourcenzeichensatz","cssClasses":"Formatvorlagenklasse","emailAddress":"E-Mail-Adresse","emailBody":"Nachrichtentext","emailSubject":"Betreffzeile","id":"Kennung","info":"Linkinfo","langCode":"Sprachcode","langDir":"Schreibrichtung","langDirLTR":"Links nach Rechts (LTR)","langDirRTL":"Rechts nach Links (RTL)","menu":"Link bearbeiten","name":"Name","noAnchors":"(Keine Anker im Dokument vorhanden)","noEmail":"Bitte geben Sie E-Mail-Adresse an","noUrl":"Bitte geben Sie die Link-URL an","other":"<andere>","popupDependent":"Abhängig (Netscape)","popupFeatures":"Pop-up Fenstereigenschaften","popupFullScreen":"Vollbild (IE)","popupLeft":"Linke Position","popupLocationBar":"Adressleiste","popupMenuBar":"Menüleiste","popupResizable":"Grösse änderbar","popupScrollBars":"Rollbalken","popupStatusBar":"Statusleiste","popupToolbar":"Werkzeugleiste","popupTop":"Obere Position","rel":"Beziehung","selectAnchor":"Anker auswählen","styles":"Style","tabIndex":"Tab-Index","target":"Zielseite","targetFrame":"<Frame>","targetFrameName":"Ziel-Fenster-Name","targetPopup":"<Pop-up Fenster>","targetPopupName":"Pop-up Fenster-Name","title":"Link","toAnchor":"Anker in dieser Seite","toEmail":"E-Mail","toUrl":"URL","toolbar":"Link einfügen/editieren","type":"Link-Typ","unlink":"Link entfernen","upload":"Hochladen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"liststyle":{"armenian":"Armenische Nummerierung","bulletedTitle":"Aufzählungslisteneigenschaften","circle":"Ring","decimal":"Dezimal (1, 2, 3, etc.)","decimalLeadingZero":"Dezimal mit führender Null (01, 02, 03, usw.)","disc":"Kreis","georgian":"Georgische Nummerierung (an, ban, gan, usw.)","lowerAlpha":"Klein Alpha (a, b, c, d, e, usw.)","lowerGreek":"Klein griechisch (alpha, beta, gamma, usw.)","lowerRoman":"Klein römisch (i, ii, iii, iv, v, usw.)","none":"Keine","notset":"<nicht festgelegt>","numberedTitle":"Nummerierte Listeneigenschaften","square":"Quadrat","start":"Start","type":"Typ","upperAlpha":"Gross alpha (A, B, C, D, E, etc.)","upperRoman":"Gross römisch (I, II, III, IV, V, usw.)","validateStartNumber":"Listenstartnummer muss eine ganze Zahl sein."},"magicline":{"title":"Absatz hier einfügen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"newpage":{"toolbar":"Neue Seite"},"pagebreak":{"alt":"Seitenumbruch","toolbar":"Seitenumbruch zum Drucken einfügen"},"pastetext":{"button":"Als Klartext einfügen","title":"Als Klartext einfügen"},"pastefromword":{"confirmCleanup":"Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?","error":"Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen","title":"Aus Word einfügen","toolbar":"Aus Word einfügen"},"preview":{"preview":"Vorschau"},"print":{"toolbar":"Drucken"},"removeformat":{"toolbar":"Formatierung entfernen"},"save":{"toolbar":"Speichern"},"selectall":{"toolbar":"Alles auswählen"},"showblocks":{"toolbar":"Blöcke anzeigen"},"sourcearea":{"toolbar":"Quellcode"},"specialchar":{"options":"Sonderzeichenoptionen","title":"Sonderzeichen auswählen","toolbar":"Sonderzeichen einfügen"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stil","panelTitle":"Formatierungsstile","panelTitle1":"Blockstile","panelTitle2":"Inline Stilart","panelTitle3":"Objektstile"},"table":{"border":"Rahmengrösse","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand aussen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","invalidBorder":"Die Rahmenbreite muss eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muss eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand aussen muss eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß grösser als 0 sein..","invalidHeight":"Die Tabellenbreite muss eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß grösser als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
+CKEDITOR.lang['de-ch']={"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schliessen","preview":"Vorschau","resize":"Grösse ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schliessen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>","keyboard":{"8":"Rücktaste","13":"Eingabe","16":"Umschalt","17":"Strg","18":"Alt","32":"Space","35":"Ende","36":"Pos1","46":"Entfernen","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor","help":"Prüfen Sie $1 für Hilfe.","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:","title":"Über CKEditor","userGuide":"CKEditor Benutzerhandbuch"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"bidi":{"ltr":"Leserichtung von Links nach Rechts","rtl":"Leserichtung von Rechts nach Links"},"blockquote":{"toolbar":"Zitatblock"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteArea":"Einfügebereich","pasteMsg":"Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.","securityMsg":"Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.","title":"Einfügen"},"button":{"selectedLabel":"%1 (Ausgewählt)"},"colorbutton":{"auto":"Automatisch","bgColorTitle":"Hintergrundfarbe","colors":{"000":"Schwarz","800000":"Kastanienbraun","8B4513":"Braun","2F4F4F":"Dunkles Schiefergrau","008080":"Blaugrün","000080":"Marineblau","4B0082":"Indigo","696969":"Dunkelgrau","B22222":"Ziegelrot","A52A2A":"Braun","DAA520":"Goldgelb","006400":"Dunkelgrün","40E0D0":"Türkis","0000CD":"Mittelblau","800080":"Lila","808080":"Grau","F00":"Rot","FF8C00":"Dunkelorange","FFD700":"Gold","008000":"Grün","0FF":"Cyan","00F":"Blau","EE82EE":"Violett","A9A9A9":"Dunkelgrau","FFA07A":"Helles Lachsrosa","FFA500":"Orange","FFFF00":"Gelb","00FF00":"Lime","AFEEEE":"Blasstürkis","ADD8E6":"Hellblau","DDA0DD":"Pflaumenblau","D3D3D3":"Hellgrau","FFF0F5":"Lavendel","FAEBD7":"Antik Weiss","FFFFE0":"Hellgelb","F0FFF0":"Honigtau","F0FFFF":"Azurblau","F0F8FF":"Alice Blau","E6E6FA":"Lavendel","FFF":"Weiss","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Weitere Farben...","panelTitle":"Farben","textColorTitle":"Textfarbe"},"colordialog":{"clear":"Entfernen","highlight":"Hervorheben","options":"Farboptionen","selected":"Ausgewählte Farbe","title":"Farbe auswählen"},"templates":{"button":"Vorlagen","emptyListMsg":"(Keine Vorlagen definiert)","insertOption":"Aktuelle Inhalte ersetzen","options":"Vorlagenoptionen","selectPromptMsg":"Klicken Sie auf eine Vorlage, um sie im Editor zu öffnen","title":"Inhaltsvorlagen"},"contextmenu":{"options":"Kontextmenüoptionen"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Kennung","advisoryTitleInputLabel":"Tooltip","cssClassInputLabel":"Formatvorlagenklasse","edit":"Div bearbeiten","inlineStyleInputLabel":"Inline Stil","langDirLTRLabel":"Links nach Rechs (LTR)","langDirLabel":"Sprachrichtung","langDirRTLLabel":"Rechs nach Links (RTL)","languageCodeInputLabel":"Sprachcode","remove":"Div entfernen","styleSelectLabel":"Stil","title":"Div Container erzeugen","toolbar":"Div Container erzeugen"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"elementspath":{"eleLabel":"Elementepfad","eleTitle":"%1 Element"},"find":{"find":"Suchen","findOptions":"Suchoptionen","findWhat":"Suche nach:","matchCase":"Gross-/Kleinschreibung beachten","matchCyclic":"Zyklische Suche","matchWord":"Nur ganze Worte suchen","notFoundMsg":"Der angegebene Text wurde nicht gefunden.","replace":"Ersetzen","replaceAll":"Alle ersetzen","replaceSuccessMsg":"%1 Vorkommen ersetzt.","replaceWith":"Ersetze mit:","title":"Suchen und Ersetzen"},"fakeobjects":{"anchor":"Anker","flash":"Flash-Animation","hiddenfield":"Verstecktes Feld","iframe":"IFrame","unknown":"Unbekanntes Objekt"},"flash":{"access":"Skriptzugriff","accessAlways":"Immer","accessNever":"Nie","accessSameDomain":"Gleiche Domain","alignAbsBottom":"Abs Unten","alignAbsMiddle":"Abs Mitte","alignBaseline":"Basislinie","alignTextTop":"Text oben","bgcolor":"Hintergrundfarbe","chkFull":"Vollbildmodus erlauben","chkLoop":"Endlosschleife","chkMenu":"Flash-Menü aktivieren","chkPlay":"Automatisch Abspielen","flashvars":"Variablen für Flash","hSpace":"Horizontal-Abstand","properties":"Flash-Eigenschaften","propertiesTab":"Eigenschaften","quality":"Qualität","qualityAutoHigh":"Auto Hoch","qualityAutoLow":"Auto Niedrig","qualityBest":"Beste","qualityHigh":"Hoch","qualityLow":"Niedrig","qualityMedium":"Mittel","scale":"Skalierung","scaleAll":"Alles anzeigen","scaleFit":"Passgenau","scaleNoBorder":"Ohne Rand","title":"Flash-Eigenschaften","vSpace":"Vertikal-Abstand","validateHSpace":"HSpace muss eine Zahl sein.","validateSrc":"URL darf nicht leer sein.","validateVSpace":"VSpace muss eine Zahl sein.","windowMode":"Fenstermodus","windowModeOpaque":"Deckend","windowModeTransparent":"Transparent","windowModeWindow":"Fenster"},"font":{"fontSize":{"label":"Grösse","voiceLabel":"Schrifgrösse","panelTitle":"Schriftgrösse"},"label":"Schriftart","panelTitle":"Schriftartname","voiceLabel":"Schriftart"},"forms":{"button":{"title":"Schaltflächeneigenschaften","text":"Text (Wert)","type":"Typ","typeBtn":"Button","typeSbm":"Absenden","typeRst":"Zurücksetzen"},"checkboxAndRadio":{"checkboxTitle":"Kontrollboxeigenschaften","radioTitle":"Optionsfeldeigenschaften","value":"Wert","selected":"Ausgewählt","required":"Erforderlich"},"form":{"title":"Formulareigenschaften","menu":"Formulareigenschaften","action":"Aktion","method":"Methode","encoding":"Kodierung"},"hidden":{"title":"Versteckte Feldeigenschaften","name":"Name","value":"Wert"},"select":{"title":"Auswahlfeldeigenschaften","selectInfo":"Info auswählen","opAvail":"Verfügbare Optionen","value":"Wert","size":"Grösse","lines":"Linien","chkMulti":"Mehrfachauswahl erlauben","required":"Erforderlich","opText":"Text","opValue":"Wert","btnAdd":"Hinzufügen","btnModify":"Ändern","btnUp":"Hoch","btnDown":"Runter","btnSetValue":"Als ausgewählten Wert festlegen","btnDelete":"Entfernen"},"textarea":{"title":"Textfeldeigenschaften","cols":"Spalten","rows":"Reihen"},"textfield":{"title":"Textfeldeigenschaften","name":"Name","value":"Wert","charWidth":"Zeichenbreite","maxChars":"Max. Zeichen","required":"Erforderlich","type":"Typ","typeText":"Text","typePass":"Passwort","typeEmail":"E-mail","typeSearch":"Suche","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Absatzformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Überschrift 1","tag_h2":"Überschrift 2","tag_h3":"Überschrift 3","tag_h4":"Überschrift 4","tag_h5":"Überschrift 5","tag_h6":"Überschrift 6","tag_p":"Normal","tag_pre":"Formatiert"},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"iframe":{"border":"Rahmen anzeigen","noUrl":"Bitte geben Sie die IFrame-URL an","scrolling":"Rollbalken anzeigen","title":"IFrame-Eigenschaften","toolbar":"IFrame"},"image":{"alt":"Alternativer Text","border":"Rahmen","btnUpload":"Zum Server senden","button2Img":"Möchten Sie die ausgewählte Bildschaltfläche in ein einfaches Bild umwandeln?","hSpace":"Horizontal-Abstand","img2Button":"Möchten Sie das ausgewählte Bild in eine Bildschaltfläche umwandeln?","infoTab":"Bildinfo","linkTab":"Link","lockRatio":"Grössenverhältnis beibehalten","menu":"Bildeigenschaften","resetSize":"Grösse zurücksetzen","title":"Bildeigenschaften","titleButton":"Bildschaltflächeneigenschaften","upload":"Hochladen","urlMissing":"Bildquellen-URL fehlt.","vSpace":"Vertikal-Abstand","validateBorder":"Rahmen muss eine ganze Zahl sein.","validateHSpace":"Horizontal-Abstand muss eine ganze Zahl sein.","validateVSpace":"Vertikal-Abstand muss eine ganze Zahl sein."},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"smiley":{"options":"Smiley-Optionen","title":"Smiley auswählen","toolbar":"Smiley"},"justify":{"block":"Blocksatz","center":"Zentriert","left":"Linksbündig","right":"Rechtsbündig"},"language":{"button":"Sprache festlegen","remove":"Sprache entfernen"},"link":{"acccessKey":"Zugriffstaste","advanced":"Erweitert","advisoryContentType":"Inhaltstyp","advisoryTitle":"Titel Beschreibung","anchor":{"toolbar":"Anker","menu":"Anker bearbeiten","title":"Ankereigenschaften","name":"Ankername","errorName":"Bitte geben Sie den Namen des Ankers ein","remove":"Anker entfernen"},"anchorId":"Nach Elementkennung","anchorName":"Nach Ankername","charset":"Verknüpfter Ressourcenzeichensatz","cssClasses":"Formatvorlagenklasse","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail-Adresse","emailBody":"Nachrichtentext","emailSubject":"Betreffzeile","id":"Kennung","info":"Linkinfo","langCode":"Sprachcode","langDir":"Schreibrichtung","langDirLTR":"Links nach Rechts (LTR)","langDirRTL":"Rechts nach Links (RTL)","menu":"Link bearbeiten","name":"Name","noAnchors":"(Keine Anker im Dokument vorhanden)","noEmail":"Bitte geben Sie E-Mail-Adresse an","noUrl":"Bitte geben Sie die Link-URL an","other":"<andere>","popupDependent":"Abhängig (Netscape)","popupFeatures":"Pop-up Fenstereigenschaften","popupFullScreen":"Vollbild (IE)","popupLeft":"Linke Position","popupLocationBar":"Adressleiste","popupMenuBar":"Menüleiste","popupResizable":"Grösse änderbar","popupScrollBars":"Rollbalken","popupStatusBar":"Statusleiste","popupToolbar":"Werkzeugleiste","popupTop":"Obere Position","rel":"Beziehung","selectAnchor":"Anker auswählen","styles":"Style","tabIndex":"Tab-Index","target":"Zielseite","targetFrame":"<Frame>","targetFrameName":"Ziel-Fenster-Name","targetPopup":"<Pop-up Fenster>","targetPopupName":"Pop-up Fenster-Name","title":"Link","toAnchor":"Anker in dieser Seite","toEmail":"E-Mail","toUrl":"URL","toolbar":"Link einfügen/editieren","type":"Link-Typ","unlink":"Link entfernen","upload":"Hochladen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"liststyle":{"armenian":"Armenische Nummerierung","bulletedTitle":"Aufzählungslisteneigenschaften","circle":"Ring","decimal":"Dezimal (1, 2, 3, etc.)","decimalLeadingZero":"Dezimal mit führender Null (01, 02, 03, usw.)","disc":"Kreis","georgian":"Georgische Nummerierung (an, ban, gan, usw.)","lowerAlpha":"Klein Alpha (a, b, c, d, e, usw.)","lowerGreek":"Klein griechisch (alpha, beta, gamma, usw.)","lowerRoman":"Klein römisch (i, ii, iii, iv, v, usw.)","none":"Keine","notset":"<nicht festgelegt>","numberedTitle":"Nummerierte Listeneigenschaften","square":"Quadrat","start":"Start","type":"Typ","upperAlpha":"Gross alpha (A, B, C, D, E, etc.)","upperRoman":"Gross römisch (I, II, III, IV, V, usw.)","validateStartNumber":"Listenstartnummer muss eine ganze Zahl sein."},"magicline":{"title":"Absatz hier einfügen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"newpage":{"toolbar":"Neue Seite"},"pagebreak":{"alt":"Seitenumbruch","toolbar":"Seitenumbruch zum Drucken einfügen"},"pastetext":{"button":"Als Klartext einfügen","title":"Als Klartext einfügen"},"pastefromword":{"confirmCleanup":"Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?","error":"Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen","title":"Aus Word einfügen","toolbar":"Aus Word einfügen"},"preview":{"preview":"Vorschau"},"print":{"toolbar":"Drucken"},"removeformat":{"toolbar":"Formatierung entfernen"},"save":{"toolbar":"Speichern"},"selectall":{"toolbar":"Alles auswählen"},"showblocks":{"toolbar":"Blöcke anzeigen"},"sourcearea":{"toolbar":"Quellcode"},"specialchar":{"options":"Sonderzeichenoptionen","title":"Sonderzeichen auswählen","toolbar":"Sonderzeichen einfügen"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stil","panelTitle":"Formatierungsstile","panelTitle1":"Blockstile","panelTitle2":"Inline Stilart","panelTitle3":"Objektstile"},"table":{"border":"Rahmengrösse","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand aussen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","invalidBorder":"Die Rahmenbreite muss eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muss eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand aussen muss eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß grösser als 0 sein..","invalidHeight":"Die Tabellenbreite muss eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß grösser als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/de.js b/htdocs/includes/ckeditor/ckeditor/lang/de.js
index ac0399f74e1..7fc13e0b763 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/de.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/de.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['de']={"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schließen","preview":"Vorschau","resize":"Größe ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schließen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor","help":"Prüfen Sie $1 für Hilfe.","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:","title":"Über CKEditor","userGuide":"CKEditor Benutzerhandbuch"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"bidi":{"ltr":"Leserichtung von Links nach Rechts","rtl":"Leserichtung von Rechts nach Links"},"blockquote":{"toolbar":"Zitatblock"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteArea":"Einfügebereich","pasteMsg":"Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.","securityMsg":"Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.","title":"Einfügen"},"button":{"selectedLabel":"%1 (Ausgewählt)"},"colorbutton":{"auto":"Automatisch","bgColorTitle":"Hintergrundfarbe","colors":{"000":"Schwarz","800000":"Kastanienbraun","8B4513":"Braun","2F4F4F":"Dunkles Schiefergrau","008080":"Blaugrün","000080":"Marineblau","4B0082":"Indigo","696969":"Dunkelgrau","B22222":"Ziegelrot","A52A2A":"Braun","DAA520":"Goldgelb","006400":"Dunkelgrün","40E0D0":"Türkis","0000CD":"Mittelblau","800080":"Lila","808080":"Grau","F00":"Rot","FF8C00":"Dunkelorange","FFD700":"Gold","008000":"Grün","0FF":"Cyan","00F":"Blau","EE82EE":"Violett","A9A9A9":"Dunkelgrau","FFA07A":"Helles Lachsrosa","FFA500":"Orange","FFFF00":"Gelb","00FF00":"Lime","AFEEEE":"Blasstürkis","ADD8E6":"Hellblau","DDA0DD":"Pflaumenblau","D3D3D3":"Hellgrau","FFF0F5":"Lavendel","FAEBD7":"Antik Weiß","FFFFE0":"Hellgelb","F0FFF0":"Honigtau","F0FFFF":"Azurblau","F0F8FF":"Alice Blau","E6E6FA":"Lavendel","FFF":"Weiß"},"more":"Weitere Farben...","panelTitle":"Farben","textColorTitle":"Textfarbe"},"colordialog":{"clear":"Entfernen","highlight":"Hervorheben","options":"Farboptionen","selected":"Ausgewählte Farbe","title":"Farbe auswählen"},"templates":{"button":"Vorlagen","emptyListMsg":"(Keine Vorlagen definiert)","insertOption":"Aktuelle Inhalte ersetzen","options":"Vorlagenoptionen","selectPromptMsg":"Klicken Sie auf eine Vorlage, um sie im Editor zu öffnen","title":"Inhaltsvorlagen"},"contextmenu":{"options":"Kontextmenüoptionen"},"div":{"IdInputLabel":"Kennung","advisoryTitleInputLabel":"Tooltip","cssClassInputLabel":"Formatvorlagenklasse","edit":"Div bearbeiten","inlineStyleInputLabel":"Inline Stil","langDirLTRLabel":"Links nach Rechs (LTR)","langDirLabel":"Sprachrichtung","langDirRTLLabel":"Rechs nach Links (RTL)","languageCodeInputLabel":"Sprachcode","remove":"Div entfernen","styleSelectLabel":"Stil","title":"Div Container erzeugen","toolbar":"Div Container erzeugen"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"elementspath":{"eleLabel":"Elementepfad","eleTitle":"%1 Element"},"find":{"find":"Suchen","findOptions":"Suchoptionen","findWhat":"Suche nach:","matchCase":"Groß-/Kleinschreibung beachten","matchCyclic":"Zyklische Suche","matchWord":"Nur ganze Worte suchen","notFoundMsg":"Der angegebene Text wurde nicht gefunden.","replace":"Ersetzen","replaceAll":"Alle ersetzen","replaceSuccessMsg":"%1 Vorkommen ersetzt.","replaceWith":"Ersetze mit:","title":"Suchen und Ersetzen"},"fakeobjects":{"anchor":"Anker","flash":"Flash-Animation","hiddenfield":"Verstecktes Feld","iframe":"IFrame","unknown":"Unbekanntes Objekt"},"flash":{"access":"Skriptzugriff","accessAlways":"Immer","accessNever":"Nie","accessSameDomain":"Gleiche Domain","alignAbsBottom":"Abs Unten","alignAbsMiddle":"Abs Mitte","alignBaseline":"Basislinie","alignTextTop":"Text oben","bgcolor":"Hintergrundfarbe","chkFull":"Vollbildmodus erlauben","chkLoop":"Endlosschleife","chkMenu":"Flash-Menü aktivieren","chkPlay":"Automatisch Abspielen","flashvars":"Variablen für Flash","hSpace":"Horizontal-Abstand","properties":"Flash-Eigenschaften","propertiesTab":"Eigenschaften","quality":"Qualität","qualityAutoHigh":"Auto Hoch","qualityAutoLow":"Auto Niedrig","qualityBest":"Beste","qualityHigh":"Hoch","qualityLow":"Niedrig","qualityMedium":"Mittel","scale":"Skalierung","scaleAll":"Alles anzeigen","scaleFit":"Passgenau","scaleNoBorder":"Ohne Rand","title":"Flash-Eigenschaften","vSpace":"Vertikal-Abstand","validateHSpace":"HSpace muss eine Zahl sein.","validateSrc":"URL darf nicht leer sein.","validateVSpace":"VSpace muss eine Zahl sein.","windowMode":"Fenstermodus","windowModeOpaque":"Deckend","windowModeTransparent":"Transparent","windowModeWindow":"Fenster"},"font":{"fontSize":{"label":"Größe","voiceLabel":"Schrifgröße","panelTitle":"Schriftgröße"},"label":"Schriftart","panelTitle":"Schriftartname","voiceLabel":"Schriftart"},"forms":{"button":{"title":"Schaltflächeneigenschaften","text":"Text (Wert)","type":"Typ","typeBtn":"Button","typeSbm":"Absenden","typeRst":"Zurücksetzen"},"checkboxAndRadio":{"checkboxTitle":"Kontrollboxeigenschaften","radioTitle":"Optionsfeldeigenschaften","value":"Wert","selected":"Ausgewählt","required":"Erforderlich"},"form":{"title":"Formulareigenschaften","menu":"Formulareigenschaften","action":"Aktion","method":"Methode","encoding":"Kodierung"},"hidden":{"title":"Versteckte Feldeigenschaften","name":"Name","value":"Wert"},"select":{"title":"Auswahlfeldeigenschaften","selectInfo":"Info auswählen","opAvail":"Verfügbare Optionen","value":"Wert","size":"Größe","lines":"Linien","chkMulti":"Mehrfachauswahl erlauben","required":"Erforderlich","opText":"Text","opValue":"Wert","btnAdd":"Hinzufügen","btnModify":"Ändern","btnUp":"Hoch","btnDown":"Runter","btnSetValue":"Als ausgewählten Wert festlegen","btnDelete":"Entfernen"},"textarea":{"title":"Textfeldeigenschaften","cols":"Spalten","rows":"Reihen"},"textfield":{"title":"Textfeldeigenschaften","name":"Name","value":"Wert","charWidth":"Zeichenbreite","maxChars":"Max. Zeichen","required":"Erforderlich","type":"Typ","typeText":"Text","typePass":"Passwort","typeEmail":"E-mail","typeSearch":"Suche","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Absatzformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Überschrift 1","tag_h2":"Überschrift 2","tag_h3":"Überschrift 3","tag_h4":"Überschrift 4","tag_h5":"Überschrift 5","tag_h6":"Überschrift 6","tag_p":"Normal","tag_pre":"Formatiert"},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"iframe":{"border":"Rahmen anzeigen","noUrl":"Bitte geben Sie die IFrame-URL an","scrolling":"Rollbalken anzeigen","title":"IFrame-Eigenschaften","toolbar":"IFrame"},"image":{"alt":"Alternativer Text","border":"Rahmen","btnUpload":"Zum Server senden","button2Img":"Möchten Sie die ausgewählte Bildschaltfläche in ein einfaches Bild umwandeln?","hSpace":"Horizontal-Abstand","img2Button":"Möchten Sie das ausgewählte Bild in eine Bildschaltfläche umwandeln?","infoTab":"Bildinfo","linkTab":"Link","lockRatio":"Größenverhältnis beibehalten","menu":"Bildeigenschaften","resetSize":"Größe zurücksetzen","title":"Bildeigenschaften","titleButton":"Bildschaltflächeneigenschaften","upload":"Hochladen","urlMissing":"Bildquellen-URL fehlt.","vSpace":"Vertikal-Abstand","validateBorder":"Rahmen muss eine ganze Zahl sein.","validateHSpace":"Horizontal-Abstand muss eine ganze Zahl sein.","validateVSpace":"Vertikal-Abstand muss eine ganze Zahl sein."},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"smiley":{"options":"Smiley-Optionen","title":"Smiley auswählen","toolbar":"Smiley"},"justify":{"block":"Blocksatz","center":"Zentriert","left":"Linksbündig","right":"Rechtsbündig"},"language":{"button":"Sprache festlegen","remove":"Sprache entfernen"},"link":{"acccessKey":"Zugriffstaste","advanced":"Erweitert","advisoryContentType":"Inhaltstyp","advisoryTitle":"Titel Beschreibung","anchor":{"toolbar":"Anker","menu":"Anker bearbeiten","title":"Ankereigenschaften","name":"Ankername","errorName":"Bitte geben Sie den Namen des Ankers ein","remove":"Anker entfernen"},"anchorId":"Nach Elementkennung","anchorName":"Nach Ankername","charset":"Verknüpfter Ressourcenzeichensatz","cssClasses":"Formatvorlagenklasse","emailAddress":"E-Mail-Adresse","emailBody":"Nachrichtentext","emailSubject":"Betreffzeile","id":"Kennung","info":"Linkinfo","langCode":"Sprachcode","langDir":"Schreibrichtung","langDirLTR":"Links nach Rechts (LTR)","langDirRTL":"Rechts nach Links (RTL)","menu":"Link bearbeiten","name":"Name","noAnchors":"(Keine Anker im Dokument vorhanden)","noEmail":"Bitte geben Sie E-Mail-Adresse an","noUrl":"Bitte geben Sie die Link-URL an","other":"<andere>","popupDependent":"Abhängig (Netscape)","popupFeatures":"Pop-up Fenstereigenschaften","popupFullScreen":"Vollbild (IE)","popupLeft":"Linke Position","popupLocationBar":"Adressleiste","popupMenuBar":"Menüleiste","popupResizable":"Größe änderbar","popupScrollBars":"Rollbalken","popupStatusBar":"Statusleiste","popupToolbar":"Werkzeugleiste","popupTop":"Obere Position","rel":"Beziehung","selectAnchor":"Anker auswählen","styles":"Style","tabIndex":"Tab-Index","target":"Zielseite","targetFrame":"<Frame>","targetFrameName":"Ziel-Fenster-Name","targetPopup":"<Pop-up Fenster>","targetPopupName":"Pop-up Fenster-Name","title":"Link","toAnchor":"Anker in dieser Seite","toEmail":"E-Mail","toUrl":"URL","toolbar":"Link einfügen/editieren","type":"Link-Typ","unlink":"Link entfernen","upload":"Hochladen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"liststyle":{"armenian":"Armenische Nummerierung","bulletedTitle":"Aufzählungslisteneigenschaften","circle":"Ring","decimal":"Dezimal (1, 2, 3, etc.)","decimalLeadingZero":"Dezimal mit führender Null (01, 02, 03, usw.)","disc":"Kreis","georgian":"Georgische Nummerierung (an, ban, gan, usw.)","lowerAlpha":"Klein Alpha (a, b, c, d, e, usw.)","lowerGreek":"Klein griechisch (alpha, beta, gamma, usw.)","lowerRoman":"Klein römisch (i, ii, iii, iv, v, usw.)","none":"Keine","notset":"<nicht festgelegt>","numberedTitle":"Nummerierte Listeneigenschaften","square":"Quadrat","start":"Start","type":"Typ","upperAlpha":"Groß alpha (A, B, C, D, E, etc.)","upperRoman":"Groß römisch (I, II, III, IV, V, usw.)","validateStartNumber":"Listenstartnummer muss eine ganze Zahl sein."},"magicline":{"title":"Absatz hier einfügen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"newpage":{"toolbar":"Neue Seite"},"pagebreak":{"alt":"Seitenumbruch","toolbar":"Seitenumbruch zum Drucken einfügen"},"pastetext":{"button":"Als Klartext einfügen","title":"Als Klartext einfügen"},"pastefromword":{"confirmCleanup":"Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?","error":"Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen","title":"Aus Word einfügen","toolbar":"Aus Word einfügen"},"preview":{"preview":"Vorschau"},"print":{"toolbar":"Drucken"},"removeformat":{"toolbar":"Formatierung entfernen"},"save":{"toolbar":"Speichern"},"selectall":{"toolbar":"Alles auswählen"},"showblocks":{"toolbar":"Blöcke anzeigen"},"sourcearea":{"toolbar":"Quellcode"},"specialchar":{"options":"Sonderzeichenoptionen","title":"Sonderzeichen auswählen","toolbar":"Sonderzeichen einfügen"},"scayt":{"btn_about":"Über SCAYT","btn_dictionaries":"Wörterbücher","btn_disable":"SCAYT ausschalten","btn_enable":"SCAYT einschalten","btn_langs":"Sprachen","btn_options":"Optionen","text_title":"Rechtschreibprüfung während der Texteingabe (SCAYT)"},"stylescombo":{"label":"Stil","panelTitle":"Formatierungsstile","panelTitle1":"Blockstile","panelTitle2":"Inline Stilart","panelTitle3":"Objektstile"},"table":{"border":"Rahmengröße","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand außen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","invalidBorder":"Die Rahmenbreite muß eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muß eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand außen muß eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß größer als 0 sein..","invalidHeight":"Die Tabellenbreite muß eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß größer als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"wsc":{"btnIgnore":"Ignorieren","btnIgnoreAll":"Alle Ignorieren","btnReplace":"Ersetzen","btnReplaceAll":"Alle Ersetzen","btnUndo":"Rückgängig","changeTo":"Ändern in","errorLoading":"Fehler beim laden des Dienstanbieters: %s.","ieSpellDownload":"Rechtschreibprüfung nicht installiert. Möchten Sie sie jetzt herunterladen?","manyChanges":"Rechtschreibprüfung abgeschlossen - %1 Wörter geändert","noChanges":"Rechtschreibprüfung abgeschlossen - keine Worte geändert","noMispell":"Rechtschreibprüfung abgeschlossen - keine Fehler gefunden","noSuggestions":" - keine Vorschläge - ","notAvailable":"Entschuldigung, aber dieser Dienst steht im Moment nicht zur Verfügung.","notInDic":"Nicht im Wörterbuch","oneChange":"Rechtschreibprüfung abgeschlossen - ein Wort geändert","progress":"Rechtschreibprüfung läuft...","title":"Rechtschreibprüfung","toolbar":"Rechtschreibprüfung"}};
\ No newline at end of file
+CKEDITOR.lang['de']={"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schließen","preview":"Vorschau","resize":"Größe ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schließen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>","keyboard":{"8":"Rücktaste","13":"Eingabe","16":"Umschalt","17":"Strg","18":"Alt","32":"Leer","35":"Ende","36":"Pos1","46":"Entfernen","224":"Befehl"},"keyboardShortcut":"Tastaturkürzel"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor","help":"Prüfen Sie $1 für Hilfe.","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:","title":"Über CKEditor","userGuide":"CKEditor Benutzerhandbuch"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"bidi":{"ltr":"Leserichtung von Links nach Rechts","rtl":"Leserichtung von Rechts nach Links"},"blockquote":{"toolbar":"Zitatblock"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteArea":"Einfügebereich","pasteMsg":"Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.","securityMsg":"Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.","title":"Einfügen"},"button":{"selectedLabel":"%1 (Ausgewählt)"},"colorbutton":{"auto":"Automatisch","bgColorTitle":"Hintergrundfarbe","colors":{"000":"Schwarz","800000":"Kastanienbraun","8B4513":"Braun","2F4F4F":"Dunkles Schiefergrau","008080":"Blaugrün","000080":"Marineblau","4B0082":"Indigo","696969":"Dunkelgrau","B22222":"Ziegelrot","A52A2A":"Braun","DAA520":"Goldgelb","006400":"Dunkelgrün","40E0D0":"Türkis","0000CD":"Mittelblau","800080":"Lila","808080":"Grau","F00":"Rot","FF8C00":"Dunkelorange","FFD700":"Gold","008000":"Grün","0FF":"Cyan","00F":"Blau","EE82EE":"Violett","A9A9A9":"Dunkelgrau","FFA07A":"Helles Lachsrosa","FFA500":"Orange","FFFF00":"Gelb","00FF00":"Lime","AFEEEE":"Blasstürkis","ADD8E6":"Hellblau","DDA0DD":"Pflaumenblau","D3D3D3":"Hellgrau","FFF0F5":"Lavendel","FAEBD7":"Antik Weiß","FFFFE0":"Hellgelb","F0FFF0":"Honigtau","F0FFFF":"Azurblau","F0F8FF":"Alice Blau","E6E6FA":"Lavendel","FFF":"Weiß","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Weitere Farben...","panelTitle":"Farben","textColorTitle":"Textfarbe"},"colordialog":{"clear":"Entfernen","highlight":"Hervorheben","options":"Farboptionen","selected":"Ausgewählte Farbe","title":"Farbe auswählen"},"templates":{"button":"Vorlagen","emptyListMsg":"(Keine Vorlagen definiert)","insertOption":"Aktuelle Inhalte ersetzen","options":"Vorlagenoptionen","selectPromptMsg":"Klicken Sie auf eine Vorlage, um sie im Editor zu öffnen","title":"Inhaltsvorlagen"},"contextmenu":{"options":"Kontextmenüoptionen"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Kennung","advisoryTitleInputLabel":"Tooltip","cssClassInputLabel":"Formatvorlagenklasse","edit":"Div bearbeiten","inlineStyleInputLabel":"Inline Stil","langDirLTRLabel":"Links nach Rechs (LTR)","langDirLabel":"Sprachrichtung","langDirRTLLabel":"Rechs nach Links (RTL)","languageCodeInputLabel":"Sprachcode","remove":"Div entfernen","styleSelectLabel":"Stil","title":"Div Container erzeugen","toolbar":"Div Container erzeugen"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"elementspath":{"eleLabel":"Elementepfad","eleTitle":"%1 Element"},"find":{"find":"Suchen","findOptions":"Suchoptionen","findWhat":"Suchen nach:","matchCase":"Groß-/Kleinschreibung beachten","matchCyclic":"Zyklische Suche","matchWord":"Nur ganzes Wort suchen","notFoundMsg":"Der angegebene Text wurde nicht gefunden.","replace":"Ersetzen","replaceAll":"Alle ersetzen","replaceSuccessMsg":"%1 Vorkommen ersetzt.","replaceWith":"Ersetzen mit:","title":"Suchen und Ersetzen"},"fakeobjects":{"anchor":"Anker","flash":"Flash-Animation","hiddenfield":"Verstecktes Feld","iframe":"IFrame","unknown":"Unbekanntes Objekt"},"flash":{"access":"Skriptzugriff","accessAlways":"Immer","accessNever":"Nie","accessSameDomain":"Gleiche Domain","alignAbsBottom":"Abs Unten","alignAbsMiddle":"Abs Mitte","alignBaseline":"Basislinie","alignTextTop":"Text oben","bgcolor":"Hintergrundfarbe","chkFull":"Vollbildmodus erlauben","chkLoop":"Endlosschleife","chkMenu":"Flash-Menü aktivieren","chkPlay":"Automatisch Abspielen","flashvars":"Variablen für Flash","hSpace":"Horizontal-Abstand","properties":"Flash-Eigenschaften","propertiesTab":"Eigenschaften","quality":"Qualität","qualityAutoHigh":"Auto Hoch","qualityAutoLow":"Auto Niedrig","qualityBest":"Beste","qualityHigh":"Hoch","qualityLow":"Niedrig","qualityMedium":"Mittel","scale":"Skalierung","scaleAll":"Alles anzeigen","scaleFit":"Passgenau","scaleNoBorder":"Ohne Rand","title":"Flash-Eigenschaften","vSpace":"Vertikal-Abstand","validateHSpace":"HSpace muss eine Zahl sein.","validateSrc":"URL darf nicht leer sein.","validateVSpace":"VSpace muss eine Zahl sein.","windowMode":"Fenstermodus","windowModeOpaque":"Deckend","windowModeTransparent":"Transparent","windowModeWindow":"Fenster"},"font":{"fontSize":{"label":"Größe","voiceLabel":"Schrifgröße","panelTitle":"Schriftgröße"},"label":"Schriftart","panelTitle":"Schriftartname","voiceLabel":"Schriftart"},"forms":{"button":{"title":"Schaltflächeneigenschaften","text":"Text (Wert)","type":"Typ","typeBtn":"Button","typeSbm":"Absenden","typeRst":"Zurücksetzen"},"checkboxAndRadio":{"checkboxTitle":"Kontrollboxeigenschaften","radioTitle":"Optionsfeldeigenschaften","value":"Wert","selected":"Ausgewählt","required":"Erforderlich"},"form":{"title":"Formulareigenschaften","menu":"Formulareigenschaften","action":"Aktion","method":"Methode","encoding":"Kodierung"},"hidden":{"title":"Versteckte Feldeigenschaften","name":"Name","value":"Wert"},"select":{"title":"Auswahlfeldeigenschaften","selectInfo":"Info auswählen","opAvail":"Verfügbare Optionen","value":"Wert","size":"Größe","lines":"Linien","chkMulti":"Mehrfachauswahl erlauben","required":"Erforderlich","opText":"Text","opValue":"Wert","btnAdd":"Hinzufügen","btnModify":"Ändern","btnUp":"Hoch","btnDown":"Runter","btnSetValue":"Als ausgewählten Wert festlegen","btnDelete":"Entfernen"},"textarea":{"title":"Textfeldeigenschaften","cols":"Spalten","rows":"Reihen"},"textfield":{"title":"Textfeldeigenschaften","name":"Name","value":"Wert","charWidth":"Zeichenbreite","maxChars":"Max. Zeichen","required":"Erforderlich","type":"Typ","typeText":"Text","typePass":"Passwort","typeEmail":"E-mail","typeSearch":"Suche","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Absatzformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Überschrift 1","tag_h2":"Überschrift 2","tag_h3":"Überschrift 3","tag_h4":"Überschrift 4","tag_h5":"Überschrift 5","tag_h6":"Überschrift 6","tag_p":"Normal","tag_pre":"Formatiert"},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"iframe":{"border":"Rahmen anzeigen","noUrl":"Bitte geben Sie die IFrame-URL an","scrolling":"Rollbalken anzeigen","title":"IFrame-Eigenschaften","toolbar":"IFrame"},"image":{"alt":"Alternativer Text","border":"Rahmen","btnUpload":"Zum Server senden","button2Img":"Möchten Sie die ausgewählte Bildschaltfläche in ein einfaches Bild umwandeln?","hSpace":"Horizontal-Abstand","img2Button":"Möchten Sie das ausgewählte Bild in eine Bildschaltfläche umwandeln?","infoTab":"Bildinfo","linkTab":"Link","lockRatio":"Größenverhältnis beibehalten","menu":"Bildeigenschaften","resetSize":"Größe zurücksetzen","title":"Bildeigenschaften","titleButton":"Bildschaltflächeneigenschaften","upload":"Hochladen","urlMissing":"Bildquellen-URL fehlt.","vSpace":"Vertikal-Abstand","validateBorder":"Rahmen muss eine ganze Zahl sein.","validateHSpace":"Horizontal-Abstand muss eine ganze Zahl sein.","validateVSpace":"Vertikal-Abstand muss eine ganze Zahl sein."},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"smiley":{"options":"Smiley-Optionen","title":"Smiley auswählen","toolbar":"Smiley"},"justify":{"block":"Blocksatz","center":"Zentriert","left":"Linksbündig","right":"Rechtsbündig"},"language":{"button":"Sprache festlegen","remove":"Sprache entfernen"},"link":{"acccessKey":"Zugriffstaste","advanced":"Erweitert","advisoryContentType":"Inhaltstyp","advisoryTitle":"Titel Beschreibung","anchor":{"toolbar":"Anker","menu":"Anker bearbeiten","title":"Ankereigenschaften","name":"Ankername","errorName":"Bitte geben Sie den Namen des Ankers ein","remove":"Anker entfernen"},"anchorId":"Nach Elementkennung","anchorName":"Nach Ankername","charset":"Verknüpfter Ressourcenzeichensatz","cssClasses":"Formatvorlagenklasse","download":"Herunterladen erzwingen","displayText":"Anzeigetext","emailAddress":"E-Mail-Adresse","emailBody":"Nachrichtentext","emailSubject":"Betreffzeile","id":"Kennung","info":"Linkinfo","langCode":"Sprachcode","langDir":"Schreibrichtung","langDirLTR":"Links nach Rechts (LTR)","langDirRTL":"Rechts nach Links (RTL)","menu":"Link bearbeiten","name":"Name","noAnchors":"(Keine Anker im Dokument vorhanden)","noEmail":"Bitte geben Sie E-Mail-Adresse an","noUrl":"Bitte geben Sie die Link-URL an","other":"<andere>","popupDependent":"Abhängig (Netscape)","popupFeatures":"Pop-up Fenstereigenschaften","popupFullScreen":"Vollbild (IE)","popupLeft":"Linke Position","popupLocationBar":"Adressleiste","popupMenuBar":"Menüleiste","popupResizable":"Größe änderbar","popupScrollBars":"Rollbalken","popupStatusBar":"Statusleiste","popupToolbar":"Werkzeugleiste","popupTop":"Obere Position","rel":"Beziehung","selectAnchor":"Anker auswählen","styles":"Style","tabIndex":"Tab-Index","target":"Zielseite","targetFrame":"<Frame>","targetFrameName":"Ziel-Fenster-Name","targetPopup":"<Pop-up Fenster>","targetPopupName":"Pop-up Fenster-Name","title":"Link","toAnchor":"Anker in dieser Seite","toEmail":"E-Mail","toUrl":"URL","toolbar":"Link einfügen/editieren","type":"Link-Typ","unlink":"Link entfernen","upload":"Hochladen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"liststyle":{"armenian":"Armenische Nummerierung","bulletedTitle":"Aufzählungslisteneigenschaften","circle":"Ring","decimal":"Dezimal (1, 2, 3, etc.)","decimalLeadingZero":"Dezimal mit führender Null (01, 02, 03, usw.)","disc":"Kreis","georgian":"Georgische Nummerierung (an, ban, gan, usw.)","lowerAlpha":"Klein Alpha (a, b, c, d, e, usw.)","lowerGreek":"Klein griechisch (alpha, beta, gamma, usw.)","lowerRoman":"Klein römisch (i, ii, iii, iv, v, usw.)","none":"Keine","notset":"<nicht festgelegt>","numberedTitle":"Nummerierte Listeneigenschaften","square":"Quadrat","start":"Start","type":"Typ","upperAlpha":"Groß alpha (A, B, C, D, E, etc.)","upperRoman":"Groß römisch (I, II, III, IV, V, usw.)","validateStartNumber":"Listenstartnummer muss eine ganze Zahl sein."},"magicline":{"title":"Absatz hier einfügen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"newpage":{"toolbar":"Neue Seite"},"pagebreak":{"alt":"Seitenumbruch","toolbar":"Seitenumbruch zum Drucken einfügen"},"pastetext":{"button":"Als Klartext einfügen","title":"Als Klartext einfügen"},"pastefromword":{"confirmCleanup":"Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?","error":"Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen","title":"Aus Word einfügen","toolbar":"Aus Word einfügen"},"preview":{"preview":"Vorschau"},"print":{"toolbar":"Drucken"},"removeformat":{"toolbar":"Formatierung entfernen"},"save":{"toolbar":"Speichern"},"selectall":{"toolbar":"Alles auswählen"},"showblocks":{"toolbar":"Blöcke anzeigen"},"sourcearea":{"toolbar":"Quellcode"},"specialchar":{"options":"Sonderzeichenoptionen","title":"Sonderzeichen auswählen","toolbar":"Sonderzeichen einfügen"},"scayt":{"btn_about":"Über SCAYT","btn_dictionaries":"Wörterbücher","btn_disable":"SCAYT ausschalten","btn_enable":"SCAYT einschalten","btn_langs":"Sprachen","btn_options":"Optionen","text_title":"Rechtschreibprüfung während der Texteingabe (SCAYT)"},"stylescombo":{"label":"Stil","panelTitle":"Formatierungsstile","panelTitle1":"Blockstile","panelTitle2":"Inline Stilart","panelTitle3":"Objektstile"},"table":{"border":"Rahmengröße","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand außen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","invalidBorder":"Die Rahmenbreite muß eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muß eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand außen muß eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß größer als 0 sein..","invalidHeight":"Die Tabellenbreite muß eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß größer als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"wsc":{"btnIgnore":"Ignorieren","btnIgnoreAll":"Alle Ignorieren","btnReplace":"Ersetzen","btnReplaceAll":"Alle Ersetzen","btnUndo":"Rückgängig","changeTo":"Ändern in","errorLoading":"Fehler beim laden des Dienstanbieters: %s.","ieSpellDownload":"Rechtschreibprüfung nicht installiert. Möchten Sie sie jetzt herunterladen?","manyChanges":"Rechtschreibprüfung abgeschlossen - %1 Wörter geändert","noChanges":"Rechtschreibprüfung abgeschlossen - keine Worte geändert","noMispell":"Rechtschreibprüfung abgeschlossen - keine Fehler gefunden","noSuggestions":" - keine Vorschläge - ","notAvailable":"Entschuldigung, aber dieser Dienst steht im Moment nicht zur Verfügung.","notInDic":"Nicht im Wörterbuch","oneChange":"Rechtschreibprüfung abgeschlossen - ein Wort geändert","progress":"Rechtschreibprüfung läuft...","title":"Rechtschreibprüfung","toolbar":"Rechtschreibprüfung"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/el.js b/htdocs/includes/ckeditor/ckeditor/lang/el.js
index 31d14b36fd3..ec62cda47ab 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/el.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/el.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['el']={"editor":"Επεξεργαστής Πλούσιου Κειμένου","editorPanel":"Πίνακας Επεξεργαστή Πλούσιου Κειμένου","common":{"editorHelp":"Πατήστε το ALT 0 για βοήθεια","browseServer":"Εξερεύνηση Διακομιστή","url":"URL","protocol":"Πρωτόκολλο","upload":"Αποστολή","uploadSubmit":"Αποστολή στον Διακομιστή","image":"Εικόνα","flash":"Flash","form":"Φόρμα","checkbox":"Κουτί Επιλογής","radio":"Κουμπί Επιλογής","textField":"Πεδίο Κειμένου","textarea":"Περιοχή Κειμένου","hiddenField":"Κρυφό Πεδίο","button":"Κουμπί","select":"Πεδίο Επιλογής","imageButton":"Κουμπί Εικόνας","notSet":"<δεν έχει ρυθμιστεί>","id":"Id","name":"Όνομα","langDir":"Κατεύθυνση Κειμένου","langDirLtr":"Αριστερά προς Δεξιά (LTR)","langDirRtl":"Δεξιά προς Αριστερά (RTL)","langCode":"Κωδικός Γλώσσας","longDescr":"Αναλυτική Περιγραφή URL","cssClass":"Κλάσεις Φύλλων Στυλ","advisoryTitle":"Ενδεικτικός Τίτλος","cssStyle":"Μορφή Κειμένου","ok":"OK","cancel":"Ακύρωση","close":"Κλείσιμο","preview":"Προεπισκόπηση","resize":"Αλλαγή Μεγέθους","generalTab":"Γενικά","advancedTab":"Για Προχωρημένους","validateNumberFailed":"Αυτή η τιμή δεν είναι αριθμός.","confirmNewPage":"Οι όποιες αλλαγές στο περιεχόμενο θα χαθούν. Είσαστε σίγουροι ότι θέλετε να φορτώσετε μια νέα σελίδα;","confirmCancel":"Μερικές επιλογές έχουν αλλάξει. Είσαστε σίγουροι ότι θέλετε να κλείσετε το παράθυρο διαλόγου;","options":"Επιλογές","target":"Προορισμός","targetNew":"Νέο Παράθυρο (_blank)","targetTop":"Αρχική Περιοχή (_top)","targetSelf":"Ίδιο Παράθυρο (_self)","targetParent":"Γονεϊκό Παράθυρο (_parent)","langDirLTR":"Αριστερά προς Δεξιά (LTR)","langDirRTL":"Δεξιά προς Αριστερά (RTL)","styles":"Μορφή","cssClasses":"Κλάσεις Φύλλων Στυλ","width":"Πλάτος","height":"Ύψος","align":"Στοίχιση","alignLeft":"Αριστερά","alignRight":"Δεξιά","alignCenter":"Κέντρο","alignJustify":"Πλήρης Στοίχιση","alignTop":"Πάνω","alignMiddle":"Μέση","alignBottom":"Κάτω","alignNone":"Χωρίς","invalidValue":"Μη έγκυρη τιμή.","invalidHeight":"Το ύψος πρέπει να είναι ένας αριθμός.","invalidWidth":"Το πλάτος πρέπει να είναι ένας αριθμός.","invalidCssLength":"Η τιμή που ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκυρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","invalidHtmlLength":"Η τιμή που ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκυρη μονάδα μέτρησης HTML (px ή %).","invalidInlineStyle":"Η τιμή για το εν σειρά στυλ πρέπει να περιέχει ένα ή περισσότερα ζεύγη με την μορφή \"όνομα: τιμή\" διαχωρισμένα με Ελληνικό ερωτηματικό.","cssLengthTooltip":"Εισάγεται μια τιμή σε pixel ή έναν αριθμό μαζί με μια έγκυρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","unavailable":"%1<span class=\"cke_accessibility\">, δεν είναι διαθέσιμο</span>"},"about":{"copy":"Πνευματικά δικαιώματα &copy; $1 Με επιφύλαξη παντός δικαιώματος.","dlgTitle":"Περί του CKEditor","help":"Ελέγξτε τις $1 για βοήθεια.","moreInfo":"Για πληροφορίες σχετικές με την άδεια χρήσης, παρακαλούμε επισκεφθείτε την ιστοσελίδα μας:","title":"Περί του CKEditor","userGuide":"Οδηγίες Χρήστη CKEditor"},"basicstyles":{"bold":"Έντονη","italic":"Πλάγια","strike":"Διακριτή Διαγραφή","subscript":"Δείκτης","superscript":"Εκθέτης","underline":"Υπογράμμιση"},"bidi":{"ltr":"Διεύθυνση κειμένου από αριστερά στα δεξιά","rtl":"Διεύθυνση κειμένου από δεξιά στα αριστερά"},"blockquote":{"toolbar":"Περιοχή Παράθεσης"},"clipboard":{"copy":"Αντιγραφή","copyError":"Οι ρυθμίσεις ασφαλείας του περιηγητή σας δεν επιτρέπουν την επιλεγμένη εργασία αντιγραφής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+C).","cut":"Αποκοπή","cutError":"Οι ρυθμίσεις ασφαλείας του περιηγητή σας δεν επιτρέπουν την επιλεγμένη εργασία αποκοπής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+X).","paste":"Επικόλληση","pasteArea":"Περιοχή Επικόλλησης","pasteMsg":"Παρακαλώ επικολλήστε στο ακόλουθο κουτί χρησιμοποιώντας το πληκτρολόγιο (<strong>Ctrl/Cmd+V</strong>) και πατήστε OK.","securityMsg":"Λόγων των ρυθμίσεων ασφάλειας του περιηγητή σας, ο επεξεργαστής δεν μπορεί να έχει πρόσβαση στην μνήμη επικόλλησης. Χρειάζεται να επικολλήσετε ξανά σε αυτό το παράθυρο.","title":"Επικόλληση"},"button":{"selectedLabel":"%1 (Επιλεγμένο)"},"colorbutton":{"auto":"Αυτόματα","bgColorTitle":"Χρώμα Φόντου","colors":{"000":"Μαύρο","800000":"Καστανέρυθρο","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Βαθυκύανο","000080":"Μπλε μαρέν","4B0082":"Ινδικό","696969":"Σκούρο Γκρι","B22222":"Ανοικτό Κόκκινο","A52A2A":"Καφέ","DAA520":"Golden Rod","006400":"Σκούρο Πράσινο","40E0D0":"Τυρκουάζ","0000CD":"Medium Blue","800080":"Μοβ","808080":"Γκρι","F00":"Κόκκινο","FF8C00":"Σκούρο Πορτοκαλί","FFD700":"Χρυσαφί","008000":"Πράσινο","0FF":"Κυανό","00F":"Μπλε","EE82EE":"Μενεξεδί","A9A9A9":"Ποντικί","FFA07A":"Ανοικτό Σομόν","FFA500":"Πορτοκαλί","FFFF00":"Κίτρινο","00FF00":"Μοσχολέμονο","AFEEEE":"Pale Turquoise","ADD8E6":"Γαλάζιο","DDA0DD":"Δαμασκηνί","D3D3D3":"Ανοικτό Γκρι","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Ανοικτό Κίτρινο","F0FFF0":"Honeydew","F0FFFF":"Γαλανό","F0F8FF":"Alice Blue","E6E6FA":"Ελαφρός Ιώδες","FFF":"Λευκό"},"more":"Περισσότερα Χρώματα…","panelTitle":"Χρώματα","textColorTitle":"Χρώμα Κειμένου"},"colordialog":{"clear":"Εκκαθάριση","highlight":"Σήμανση","options":"Επιλογές Χρωμάτων","selected":"Επιλεγμένο Χρώμα","title":"Επιλογή χρώματος"},"templates":{"button":"Πρότυπα","emptyListMsg":"(Δεν έχουν καθοριστεί πρότυπα)","insertOption":"Αντικατάσταση υπάρχοντων περιεχομένων","options":"Επιλογές Προτύπου","selectPromptMsg":"Παρακαλώ επιλέξτε πρότυπο για εισαγωγή στο πρόγραμμα","title":"Πρότυπα Περιεχομένου"},"contextmenu":{"options":"Επιλογές Αναδυόμενου Μενού"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Ενδεικτικός Τίτλος","cssClassInputLabel":"Κλάσεις Φύλλων Στυλ","edit":"Επεξεργασία Div","inlineStyleInputLabel":"Στυλ Εν Σειρά","langDirLTRLabel":"Αριστερά προς Δεξιά (LTR)","langDirLabel":"Κατεύθυνση Κειμένου","langDirRTLLabel":"Δεξιά προς Αριστερά (RTL)","languageCodeInputLabel":"Κωδικός Γλώσσας","remove":"Διαγραφή Div","styleSelectLabel":"Μορφή","title":"Δημιουργία Div","toolbar":"Δημιουργία Div"},"toolbar":{"toolbarCollapse":"Σύμπτυξη Εργαλειοθήκης","toolbarExpand":"Ανάπτυξη Εργαλειοθήκης","toolbarGroups":{"document":"Έγγραφο","clipboard":"Πρόχειρο/Αναίρεση","editing":"Επεξεργασία","forms":"Φόρμες","basicstyles":"Βασικά Στυλ","paragraph":"Παράγραφος","links":"Σύνδεσμοι","insert":"Εισαγωγή","styles":"Στυλ","colors":"Χρώματα","tools":"Εργαλεία"},"toolbars":"Εργαλειοθήκες επεξεργαστή"},"elementspath":{"eleLabel":"Διαδρομή Στοιχείων","eleTitle":"Στοιχείο %1"},"find":{"find":"Εύρεση","findOptions":"Επιλογές Εύρεσης","findWhat":"Εύρεση για:","matchCase":"Ταίριασμα πεζών/κεφαλαίων","matchCyclic":"Αναδρομική εύρεση","matchWord":"Εύρεση μόνο πλήρων λέξεων","notFoundMsg":"Το κείμενο δεν βρέθηκε.","replace":"Αντικατάσταση","replaceAll":"Αντικατάσταση Όλων","replaceSuccessMsg":"Ο(ι) όρος(-οι) αντικαταστήθηκε(-αν) %1 φορές.","replaceWith":"Αντικατάσταση με:","title":"Εύρεση και Αντικατάσταση"},"fakeobjects":{"anchor":"Άγκυρα","flash":"Ταινία Flash","hiddenfield":"Κρυφό Πεδίο","iframe":"IFrame","unknown":"Άγνωστο Αντικείμενο"},"flash":{"access":"Πρόσβαση Script","accessAlways":"Πάντα","accessNever":"Ποτέ","accessSameDomain":"Ίδιο όνομα τομέα","alignAbsBottom":"Απόλυτα Κάτω","alignAbsMiddle":"Απόλυτα στη Μέση","alignBaseline":"Γραμμή Βάσης","alignTextTop":"Κορυφή Κειμένου","bgcolor":"Χρώμα Υποβάθρου","chkFull":"Να Επιτρέπεται η Προβολή σε Πλήρη Οθόνη","chkLoop":"Επανάληψη","chkMenu":"Ενεργοποίηση Flash Menu","chkPlay":"Αυτόματη Εκτέλεση","flashvars":"Μεταβλητές για Flash","hSpace":"Οριζόντιο Διάστημα","properties":"Ιδιότητες Flash","propertiesTab":"Ιδιότητες","quality":"Ποιότητα","qualityAutoHigh":"Αυτόματη Υψηλή","qualityAutoLow":"Αυτόματη Χαμηλή","qualityBest":"Καλύτερη","qualityHigh":"Υψηλή","qualityLow":"Χαμηλή","qualityMedium":"Μεσαία","scale":"Μεγέθυνση","scaleAll":"Εμφάνιση όλων","scaleFit":"Ακριβές Μέγεθος","scaleNoBorder":"Χωρίς Περίγραμμα","title":"Ιδιότητες Flash","vSpace":"Κάθετο Διάστημα","validateHSpace":"Το HSpace πρέπει να είναι αριθμός.","validateSrc":"Εισάγετε την τοποθεσία (URL) του υπερσυνδέσμου (Link)","validateVSpace":"Το VSpace πρέπει να είναι αριθμός.","windowMode":"Τρόπος λειτουργίας παραθύρου","windowModeOpaque":"Συμπαγές","windowModeTransparent":"Διάφανο","windowModeWindow":"Παράθυρο"},"font":{"fontSize":{"label":"Μέγεθος","voiceLabel":"Μέγεθος Γραμματοσειράς","panelTitle":"Μέγεθος Γραμματοσειράς"},"label":"Γραμματοσειρά","panelTitle":"Όνομα Γραμματοσειράς","voiceLabel":"Γραμματοσειρά"},"forms":{"button":{"title":"Ιδιότητες Κουμπιού","text":"Κείμενο (Τιμή)","type":"Τύπος","typeBtn":"Κουμπί","typeSbm":"Υποβολή","typeRst":"Επαναφορά"},"checkboxAndRadio":{"checkboxTitle":"Ιδιότητες Κουτιού Επιλογής","radioTitle":"Ιδιότητες Κουμπιού Επιλογής","value":"Τιμή","selected":"Επιλεγμένο","required":"Required"},"form":{"title":"Ιδιότητες Φόρμας","menu":"Ιδιότητες Φόρμας","action":"Ενέργεια","method":"Μέθοδος","encoding":"Κωδικοποίηση"},"hidden":{"title":"Ιδιότητες Κρυφού Πεδίου","name":"Όνομα","value":"Τιμή"},"select":{"title":"Ιδιότητες Πεδίου Επιλογής","selectInfo":"Πληροφορίες Πεδίου Επιλογής","opAvail":"Διαθέσιμες Επιλογές","value":"Τιμή","size":"Μέγεθος","lines":"γραμμές","chkMulti":"Να επιτρέπονται οι πολλαπλές επιλογές","required":"Required","opText":"Κείμενο","opValue":"Τιμή","btnAdd":"Προσθήκη","btnModify":"Τροποποίηση","btnUp":"Πάνω","btnDown":"Κάτω","btnSetValue":"Θέση ως προεπιλογή","btnDelete":"Διαγραφή"},"textarea":{"title":"Ιδιότητες Περιοχής Κειμένου","cols":"Στήλες","rows":"Σειρές"},"textfield":{"title":"Ιδιότητες Πεδίου Κειμένου","name":"Όνομα","value":"Τιμή","charWidth":"Πλάτος Χαρακτήρων","maxChars":"Μέγιστοι χαρακτήρες","required":"Required","type":"Τύπος","typeText":"Κείμενο","typePass":"Κωδικός","typeEmail":"Email","typeSearch":"Αναζήτηση","typeTel":"Αριθμός Τηλεφώνου","typeUrl":"URL"}},"format":{"label":"Μορφοποίηση","panelTitle":"Μορφοποίηση Παραγράφου","tag_address":"Διεύθυνση","tag_div":"Κανονική (DIV)","tag_h1":"Κεφαλίδα 1","tag_h2":"Κεφαλίδα 2","tag_h3":"Κεφαλίδα 3","tag_h4":"Κεφαλίδα 4","tag_h5":"Κεφαλίδα 5","tag_h6":"Κεφαλίδα 6","tag_p":"Κανονική","tag_pre":"Προ-μορφοποιημένη"},"horizontalrule":{"toolbar":"Εισαγωγή Οριζόντιας Γραμμής"},"iframe":{"border":"Προβολή περιγράμματος πλαισίου","noUrl":"Παρακαλούμε εισάγεται το URL του iframe","scrolling":"Ενεργοποίηση μπαρών κύλισης","title":"Ιδιότητες IFrame","toolbar":"IFrame"},"image":{"alt":"Εναλλακτικό Κείμενο","border":"Περίγραμμα","btnUpload":"Αποστολή στον Διακομιστή","button2Img":"Θέλετε να μετατρέψετε το επιλεγμένο κουμπί εικόνας σε απλή εικόνα;","hSpace":"HSpace","img2Button":"Θέλετε να μεταμορφώσετε την επιλεγμένη εικόνα που είναι πάνω σε ένα κουμπί;","infoTab":"Πληροφορίες Εικόνας","linkTab":"Σύνδεσμος","lockRatio":"Κλείδωμα Αναλογίας","menu":"Ιδιότητες Εικόνας","resetSize":"Επαναφορά Αρχικού Μεγέθους","title":"Ιδιότητες Εικόνας","titleButton":"Ιδιότητες Κουμπιού Εικόνας","upload":"Αποστολή","urlMissing":"Το URL πηγής για την εικόνα λείπει.","vSpace":"VSpace","validateBorder":"Το περίγραμμα πρέπει να είναι ένας ακέραιος αριθμός.","validateHSpace":"Το HSpace πρέπει να είναι ένας ακέραιος αριθμός.","validateVSpace":"Το VSpace πρέπει να είναι ένας ακέραιος αριθμός."},"indent":{"indent":"Αύξηση Εσοχής","outdent":"Μείωση Εσοχής"},"smiley":{"options":"Επιλογές Φατσούλων","title":"Εισάγετε μια Φατσούλα","toolbar":"Φατσούλα"},"justify":{"block":"Πλήρης Στοίχιση","center":"Στο Κέντρο","left":"Στοίχιση Αριστερά","right":"Στοίχιση Δεξιά"},"language":{"button":"Θέση γλώσσας","remove":"Αφαίρεση γλώσσας"},"link":{"acccessKey":"Συντόμευση","advanced":"Για Προχωρημένους","advisoryContentType":"Ενδεικτικός Τύπος Περιεχομένου","advisoryTitle":"Ενδεικτικός Τίτλος","anchor":{"toolbar":"Εισαγωγή/επεξεργασία Άγκυρας","menu":"Ιδιότητες άγκυρας","title":"Ιδιότητες άγκυρας","name":"Όνομα άγκυρας","errorName":"Παρακαλούμε εισάγετε όνομα άγκυρας","remove":"Αφαίρεση Άγκυρας"},"anchorId":"Βάσει του Element Id","anchorName":"Βάσει του Ονόματος Άγκυρας","charset":"Κωδικοποίηση Χαρακτήρων Προσαρτημένης Πηγής","cssClasses":"Κλάσεις Φύλλων Στυλ","emailAddress":"Διεύθυνση E-mail","emailBody":"Κείμενο Μηνύματος","emailSubject":"Θέμα Μηνύματος","id":"Id","info":"Πληροφορίες Συνδέσμου","langCode":"Κατεύθυνση Κειμένου","langDir":"Κατεύθυνση Κειμένου","langDirLTR":"Αριστερά προς Δεξιά (LTR)","langDirRTL":"Δεξιά προς Αριστερά (RTL)","menu":"Επεξεργασία Συνδέσμου","name":"Όνομα","noAnchors":"(Δεν υπάρχουν άγκυρες στο κείμενο)","noEmail":"Εισάγετε τη διεύθυνση ηλεκτρονικού ταχυδρομείου","noUrl":"Εισάγετε την τοποθεσία (URL) του συνδέσμου","other":"<άλλο>","popupDependent":"Εξαρτημένο (Netscape)","popupFeatures":"Επιλογές Αναδυόμενου Παραθύρου","popupFullScreen":"Πλήρης Οθόνη (IE)","popupLeft":"Θέση Αριστερά","popupLocationBar":"Γραμμή Τοποθεσίας","popupMenuBar":"Γραμμή Επιλογών","popupResizable":"Προσαρμοζόμενο Μέγεθος","popupScrollBars":"Μπάρες Κύλισης","popupStatusBar":"Γραμμή Κατάστασης","popupToolbar":"Εργαλειοθήκη","popupTop":"Θέση Πάνω","rel":"Σχέση","selectAnchor":"Επιλέξτε μια Άγκυρα","styles":"Μορφή","tabIndex":"Σειρά Μεταπήδησης","target":"Παράθυρο Προορισμού","targetFrame":"<πλαίσιο>","targetFrameName":"Όνομα Πλαισίου Προορισμού","targetPopup":"<αναδυόμενο παράθυρο>","targetPopupName":"Όνομα Αναδυόμενου Παραθύρου","title":"Σύνδεσμος","toAnchor":"Άγκυρα σε αυτήν τη σελίδα","toEmail":"E-Mail","toUrl":"URL","toolbar":"Σύνδεσμος","type":"Τύπος Συνδέσμου","unlink":"Αφαίρεση Συνδέσμου","upload":"Αποστολή"},"list":{"bulletedlist":"Εισαγωγή/Απομάκρυνση Λίστας Κουκκίδων","numberedlist":"Εισαγωγή/Απομάκρυνση Αριθμημένης Λίστας"},"liststyle":{"armenian":"Αρμενική αρίθμηση","bulletedTitle":"Ιδιότητες Λίστας Σημείων","circle":"Κύκλος","decimal":"Δεκαδική (1, 2, 3, κτλ)","decimalLeadingZero":"Δεκαδική με αρχικό μηδεν (01, 02, 03, κτλ)","disc":"Δίσκος","georgian":"Γεωργιανή αρίθμηση (ა, ბ, გ, κτλ)","lowerAlpha":"Μικρά Λατινικά (a, b, c, d, e, κτλ.)","lowerGreek":"Μικρά Ελληνικά (α, β, γ, κτλ)","lowerRoman":"Μικρά Ρωμαϊκά (i, ii, iii, iv, v, κτλ)","none":"Καμία","notset":"<δεν έχει οριστεί>","numberedTitle":"Ιδιότητες Αριθμημένης Λίστας ","square":"Τετράγωνο","start":"Εκκίνηση","type":"Τύπος","upperAlpha":"Κεφαλαία Λατινικά (A, B, C, D, E, κτλ)","upperRoman":"Κεφαλαία Ρωμαϊκά (I, II, III, IV, V, κτλ)","validateStartNumber":"Ο αριθμός εκκίνησης της αρίθμησης πρέπει να είναι ακέραιος αριθμός."},"magicline":{"title":"Εισάγετε παράγραφο εδώ"},"maximize":{"maximize":"Μεγιστοποίηση","minimize":"Ελαχιστοποίηση"},"newpage":{"toolbar":"Νέα Σελίδα"},"pagebreak":{"alt":"Αλλαγή Σελίδας","toolbar":"Εισαγωγή Τέλους Σελίδας για Εκτύπωση"},"pastetext":{"button":"Επικόλληση ως απλό κείμενο","title":"Επικόλληση ως απλό κείμενο"},"pastefromword":{"confirmCleanup":"Το κείμενο που επικολλάται φαίνεται να είναι αντιγραμμένο από το Word. Μήπως θα θέλατε να καθαριστεί προτού επικολληθεί;","error":"Δεν ήταν δυνατό να καθαριστούν τα δεδομένα λόγω ενός εσωτερικού σφάλματος","title":"Επικόλληση από το Word","toolbar":"Επικόλληση από το Word"},"preview":{"preview":"Προεπισκόπιση"},"print":{"toolbar":"Εκτύπωση"},"removeformat":{"toolbar":"Εκκαθάριση Μορφοποίησης"},"save":{"toolbar":"Αποθήκευση"},"selectall":{"toolbar":"Επιλογή όλων"},"showblocks":{"toolbar":"Προβολή Τμημάτων"},"sourcearea":{"toolbar":"Κώδικας"},"specialchar":{"options":"Επιλογές Ειδικών Χαρακτήρων","title":"Επιλέξτε Έναν Ειδικό Χαρακτήρα","toolbar":"Εισαγωγή Ειδικού Χαρακτήρα"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Λεξικά","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Γλώσσες","btn_options":"Επιλογές","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Μορφές","panelTitle":"Στυλ Μορφοποίησης","panelTitle1":"Στυλ Τμημάτων","panelTitle2":"Στυλ Εν Σειρά","panelTitle3":"Στυλ Αντικειμένων"},"table":{"border":"Πάχος Περιγράμματος","caption":"Λεζάντα","cell":{"menu":"Κελί","insertBefore":"Εισαγωγή Κελιού Πριν","insertAfter":"Εισαγωγή Κελιού Μετά","deleteCell":"Διαγραφή Κελιών","merge":"Ενοποίηση Κελιών","mergeRight":"Συγχώνευση Με Δεξιά","mergeDown":"Συγχώνευση Με Κάτω","splitHorizontal":"Οριζόντια Διαίρεση Κελιού","splitVertical":"Κατακόρυφη Διαίρεση Κελιού","title":"Ιδιότητες Κελιού","cellType":"Τύπος Κελιού","rowSpan":"Εύρος Γραμμών","colSpan":"Εύρος Στηλών","wordWrap":"Αναδίπλωση Λέξεων","hAlign":"Οριζόντια Στοίχιση","vAlign":"Κάθετη Στοίχιση","alignBaseline":"Γραμμή Βάσης","bgColor":"Χρώμα Φόντου","borderColor":"Χρώμα Περιγράμματος","data":"Δεδομένα","header":"Κεφαλίδα","yes":"Ναι","no":"Όχι","invalidWidth":"Το πλάτος του κελιού πρέπει να είναι αριθμός.","invalidHeight":"Το ύψος του κελιού πρέπει να είναι αριθμός.","invalidRowSpan":"Το εύρος των γραμμών πρέπει να είναι ακέραιος αριθμός.","invalidColSpan":"Το εύρος των στηλών πρέπει να είναι ακέραιος αριθμός.","chooseColor":"Επιλέξτε"},"cellPad":"Αναπλήρωση κελιών","cellSpace":"Απόσταση κελιών","column":{"menu":"Στήλη","insertBefore":"Εισαγωγή Στήλης Πριν","insertAfter":"Εισαγωγή Στήλης Μετά","deleteColumn":"Διαγραφή Στηλών"},"columns":"Στήλες","deleteTable":"Διαγραφή Πίνακα","headers":"Κεφαλίδες","headersBoth":"Και τα δύο","headersColumn":"Πρώτη στήλη","headersNone":"Κανένα","headersRow":"Πρώτη Γραμμή","invalidBorder":"Το πάχος του περιγράμματος πρέπει να είναι ένας αριθμός.","invalidCellPadding":"Η αναπλήρωση των κελιών πρέπει να είναι θετικός αριθμός.","invalidCellSpacing":"Η απόσταση μεταξύ των κελιών πρέπει να είναι ένας θετικός αριθμός.","invalidCols":"Ο αριθμός των στηλών πρέπει να είναι μεγαλύτερος από 0.","invalidHeight":"Το ύψος του πίνακα πρέπει να είναι αριθμός.","invalidRows":"Ο αριθμός των σειρών πρέπει να είναι μεγαλύτερος από 0.","invalidWidth":"Το πλάτος του πίνακα πρέπει να είναι ένας αριθμός.","menu":"Ιδιότητες Πίνακα","row":{"menu":"Γραμμή","insertBefore":"Εισαγωγή Γραμμής Πριν","insertAfter":"Εισαγωγή Γραμμής Μετά","deleteRow":"Διαγραφή Γραμμών"},"rows":"Γραμμές","summary":"Περίληψη","title":"Ιδιότητες Πίνακα","toolbar":"Πίνακας","widthPc":"τοις εκατό","widthPx":"pixel","widthUnit":"μονάδα πλάτους"},"undo":{"redo":"Επανάληψη","undo":"Αναίρεση"},"wsc":{"btnIgnore":"Αγνόηση","btnIgnoreAll":"Αγνόηση όλων","btnReplace":"Αντικατάσταση","btnReplaceAll":"Αντικατάσταση όλων","btnUndo":"Αναίρεση","changeTo":"Αλλαγή σε","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Δεν υπάρχει εγκατεστημένος ορθογράφος. Θέλετε να τον κατεβάσετε τώρα;","manyChanges":"Ο ορθογραφικός έλεγχος ολοκληρώθηκε: Άλλαξαν %1 λέξεις","noChanges":"Ο ορθογραφικός έλεγχος ολοκληρώθηκε: Δεν άλλαξαν λέξεις","noMispell":"Ο ορθογραφικός έλεγχος ολοκληρώθηκε: Δεν βρέθηκαν λάθη","noSuggestions":"- Δεν υπάρχουν προτάσεις -","notAvailable":"Η υπηρεσία δεν είναι διαθέσιμη αυτήν την στιγμή.","notInDic":"Δεν υπάρχει στο λεξικό","oneChange":"Ο ορθογραφικός έλεγχος ολοκληρώθηκε: Άλλαξε μια λέξη","progress":"Γίνεται ορθογραφικός έλεγχος...","title":"Ορθογραφικός Έλεγχος","toolbar":"Ορθογραφικός Έλεγχος"}};
\ No newline at end of file
+CKEDITOR.lang['el']={"editor":"Επεξεργαστής Πλούσιου Κειμένου","editorPanel":"Πίνακας Επεξεργαστή Πλούσιου Κειμένου","common":{"editorHelp":"Πατήστε το ALT 0 για βοήθεια","browseServer":"Εξερεύνηση Διακομιστή","url":"URL","protocol":"Πρωτόκολλο","upload":"Αποστολή","uploadSubmit":"Αποστολή στον Διακομιστή","image":"Εικόνα","flash":"Flash","form":"Φόρμα","checkbox":"Κουτί Επιλογής","radio":"Κουμπί Επιλογής","textField":"Πεδίο Κειμένου","textarea":"Περιοχή Κειμένου","hiddenField":"Κρυφό Πεδίο","button":"Κουμπί","select":"Πεδίο Επιλογής","imageButton":"Κουμπί Εικόνας","notSet":"<δεν έχει ρυθμιστεί>","id":"Id","name":"Όνομα","langDir":"Κατεύθυνση Κειμένου","langDirLtr":"Αριστερά προς Δεξιά (LTR)","langDirRtl":"Δεξιά προς Αριστερά (RTL)","langCode":"Κωδικός Γλώσσας","longDescr":"Αναλυτική Περιγραφή URL","cssClass":"Κλάσεις Φύλλων Στυλ","advisoryTitle":"Ενδεικτικός Τίτλος","cssStyle":"Μορφή Κειμένου","ok":"OK","cancel":"Ακύρωση","close":"Κλείσιμο","preview":"Προεπισκόπηση","resize":"Αλλαγή Μεγέθους","generalTab":"Γενικά","advancedTab":"Για Προχωρημένους","validateNumberFailed":"Αυτή η τιμή δεν είναι αριθμός.","confirmNewPage":"Οι όποιες αλλαγές στο περιεχόμενο θα χαθούν. Είσαστε σίγουροι ότι θέλετε να φορτώσετε μια νέα σελίδα;","confirmCancel":"Μερικές επιλογές έχουν αλλάξει. Είσαστε σίγουροι ότι θέλετε να κλείσετε το παράθυρο διαλόγου;","options":"Επιλογές","target":"Προορισμός","targetNew":"Νέο Παράθυρο (_blank)","targetTop":"Αρχική Περιοχή (_top)","targetSelf":"Ίδιο Παράθυρο (_self)","targetParent":"Γονεϊκό Παράθυρο (_parent)","langDirLTR":"Αριστερά προς Δεξιά (LTR)","langDirRTL":"Δεξιά προς Αριστερά (RTL)","styles":"Μορφή","cssClasses":"Κλάσεις Φύλλων Στυλ","width":"Πλάτος","height":"Ύψος","align":"Στοίχιση","alignLeft":"Αριστερά","alignRight":"Δεξιά","alignCenter":"Κέντρο","alignJustify":"Πλήρης Στοίχιση","alignTop":"Πάνω","alignMiddle":"Μέση","alignBottom":"Κάτω","alignNone":"Χωρίς","invalidValue":"Μη έγκυρη τιμή.","invalidHeight":"Το ύψος πρέπει να είναι ένας αριθμός.","invalidWidth":"Το πλάτος πρέπει να είναι ένας αριθμός.","invalidCssLength":"Η τιμή που ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκυρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","invalidHtmlLength":"Η τιμή που ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκυρη μονάδα μέτρησης HTML (px ή %).","invalidInlineStyle":"Η τιμή για το εν σειρά στυλ πρέπει να περιέχει ένα ή περισσότερα ζεύγη με την μορφή \"όνομα: τιμή\" διαχωρισμένα με Ελληνικό ερωτηματικό.","cssLengthTooltip":"Εισάγεται μια τιμή σε pixel ή έναν αριθμό μαζί με μια έγκυρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","unavailable":"%1<span class=\"cke_accessibility\">, δεν είναι διαθέσιμο</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Πνευματικά δικαιώματα &copy; $1 Με επιφύλαξη παντός δικαιώματος.","dlgTitle":"Περί του CKEditor","help":"Ελέγξτε τις $1 για βοήθεια.","moreInfo":"Για πληροφορίες σχετικές με την άδεια χρήσης, παρακαλούμε επισκεφθείτε την ιστοσελίδα μας:","title":"Περί του CKEditor","userGuide":"Οδηγίες Χρήστη CKEditor"},"basicstyles":{"bold":"Έντονη","italic":"Πλάγια","strike":"Διακριτή Διαγραφή","subscript":"Δείκτης","superscript":"Εκθέτης","underline":"Υπογράμμιση"},"bidi":{"ltr":"Διεύθυνση κειμένου από αριστερά στα δεξιά","rtl":"Διεύθυνση κειμένου από δεξιά στα αριστερά"},"blockquote":{"toolbar":"Περιοχή Παράθεσης"},"clipboard":{"copy":"Αντιγραφή","copyError":"Οι ρυθμίσεις ασφαλείας του περιηγητή σας δεν επιτρέπουν την επιλεγμένη εργασία αντιγραφής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+C).","cut":"Αποκοπή","cutError":"Οι ρυθμίσεις ασφαλείας του περιηγητή σας δεν επιτρέπουν την επιλεγμένη εργασία αποκοπής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+X).","paste":"Επικόλληση","pasteArea":"Περιοχή Επικόλλησης","pasteMsg":"Παρακαλώ επικολλήστε στο ακόλουθο κουτί χρησιμοποιώντας το πληκτρολόγιο (<strong>Ctrl/Cmd+V</strong>) και πατήστε OK.","securityMsg":"Λόγων των ρυθμίσεων ασφάλειας του περιηγητή σας, ο επεξεργαστής δεν μπορεί να έχει πρόσβαση στην μνήμη επικόλλησης. Χρειάζεται να επικολλήσετε ξανά σε αυτό το παράθυρο.","title":"Επικόλληση"},"button":{"selectedLabel":"%1 (Επιλεγμένο)"},"colorbutton":{"auto":"Αυτόματα","bgColorTitle":"Χρώμα Φόντου","colors":{"000":"Μαύρο","800000":"Καστανέρυθρο","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Βαθυκύανο","000080":"Μπλε μαρέν","4B0082":"Ινδικό","696969":"Σκούρο Γκρι","B22222":"Ανοικτό Κόκκινο","A52A2A":"Καφέ","DAA520":"Golden Rod","006400":"Σκούρο Πράσινο","40E0D0":"Τυρκουάζ","0000CD":"Medium Blue","800080":"Μοβ","808080":"Γκρι","F00":"Κόκκινο","FF8C00":"Σκούρο Πορτοκαλί","FFD700":"Χρυσαφί","008000":"Πράσινο","0FF":"Κυανό","00F":"Μπλε","EE82EE":"Μενεξεδί","A9A9A9":"Ποντικί","FFA07A":"Ανοικτό Σομόν","FFA500":"Πορτοκαλί","FFFF00":"Κίτρινο","00FF00":"Μοσχολέμονο","AFEEEE":"Pale Turquoise","ADD8E6":"Γαλάζιο","DDA0DD":"Δαμασκηνί","D3D3D3":"Ανοικτό Γκρι","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Ανοικτό Κίτρινο","F0FFF0":"Honeydew","F0FFFF":"Γαλανό","F0F8FF":"Alice Blue","E6E6FA":"Ελαφρός Ιώδες","FFF":"Λευκό","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Περισσότερα Χρώματα…","panelTitle":"Χρώματα","textColorTitle":"Χρώμα Κειμένου"},"colordialog":{"clear":"Εκκαθάριση","highlight":"Σήμανση","options":"Επιλογές Χρωμάτων","selected":"Επιλεγμένο Χρώμα","title":"Επιλογή χρώματος"},"templates":{"button":"Πρότυπα","emptyListMsg":"(Δεν έχουν καθοριστεί πρότυπα)","insertOption":"Αντικατάσταση υπάρχοντων περιεχομένων","options":"Επιλογές Προτύπου","selectPromptMsg":"Παρακαλώ επιλέξτε πρότυπο για εισαγωγή στο πρόγραμμα","title":"Πρότυπα Περιεχομένου"},"contextmenu":{"options":"Επιλογές Αναδυόμενου Μενού"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Ενδεικτικός Τίτλος","cssClassInputLabel":"Κλάσεις Φύλλων Στυλ","edit":"Επεξεργασία Div","inlineStyleInputLabel":"Στυλ Εν Σειρά","langDirLTRLabel":"Αριστερά προς Δεξιά (LTR)","langDirLabel":"Κατεύθυνση Κειμένου","langDirRTLLabel":"Δεξιά προς Αριστερά (RTL)","languageCodeInputLabel":"Κωδικός Γλώσσας","remove":"Διαγραφή Div","styleSelectLabel":"Μορφή","title":"Δημιουργία Div","toolbar":"Δημιουργία Div"},"toolbar":{"toolbarCollapse":"Σύμπτυξη Εργαλειοθήκης","toolbarExpand":"Ανάπτυξη Εργαλειοθήκης","toolbarGroups":{"document":"Έγγραφο","clipboard":"Πρόχειρο/Αναίρεση","editing":"Επεξεργασία","forms":"Φόρμες","basicstyles":"Βασικά Στυλ","paragraph":"Παράγραφος","links":"Σύνδεσμοι","insert":"Εισαγωγή","styles":"Στυλ","colors":"Χρώματα","tools":"Εργαλεία"},"toolbars":"Εργαλειοθήκες επεξεργαστή"},"elementspath":{"eleLabel":"Διαδρομή Στοιχείων","eleTitle":"Στοιχείο %1"},"find":{"find":"Εύρεση","findOptions":"Επιλογές Εύρεσης","findWhat":"Εύρεση για:","matchCase":"Ταίριασμα πεζών/κεφαλαίων","matchCyclic":"Αναδρομική εύρεση","matchWord":"Εύρεση μόνο πλήρων λέξεων","notFoundMsg":"Το κείμενο δεν βρέθηκε.","replace":"Αντικατάσταση","replaceAll":"Αντικατάσταση Όλων","replaceSuccessMsg":"Ο(ι) όρος(-οι) αντικαταστήθηκε(-αν) %1 φορές.","replaceWith":"Αντικατάσταση με:","title":"Εύρεση και Αντικατάσταση"},"fakeobjects":{"anchor":"Άγκυρα","flash":"Ταινία Flash","hiddenfield":"Κρυφό Πεδίο","iframe":"IFrame","unknown":"Άγνωστο Αντικείμενο"},"flash":{"access":"Πρόσβαση Script","accessAlways":"Πάντα","accessNever":"Ποτέ","accessSameDomain":"Ίδιο όνομα τομέα","alignAbsBottom":"Απόλυτα Κάτω","alignAbsMiddle":"Απόλυτα στη Μέση","alignBaseline":"Γραμμή Βάσης","alignTextTop":"Κορυφή Κειμένου","bgcolor":"Χρώμα Υποβάθρου","chkFull":"Να Επιτρέπεται η Προβολή σε Πλήρη Οθόνη","chkLoop":"Επανάληψη","chkMenu":"Ενεργοποίηση Flash Menu","chkPlay":"Αυτόματη Εκτέλεση","flashvars":"Μεταβλητές για Flash","hSpace":"Οριζόντιο Διάστημα","properties":"Ιδιότητες Flash","propertiesTab":"Ιδιότητες","quality":"Ποιότητα","qualityAutoHigh":"Αυτόματη Υψηλή","qualityAutoLow":"Αυτόματη Χαμηλή","qualityBest":"Καλύτερη","qualityHigh":"Υψηλή","qualityLow":"Χαμηλή","qualityMedium":"Μεσαία","scale":"Μεγέθυνση","scaleAll":"Εμφάνιση όλων","scaleFit":"Ακριβές Μέγεθος","scaleNoBorder":"Χωρίς Περίγραμμα","title":"Ιδιότητες Flash","vSpace":"Κάθετο Διάστημα","validateHSpace":"Το HSpace πρέπει να είναι αριθμός.","validateSrc":"Εισάγετε την τοποθεσία (URL) του υπερσυνδέσμου (Link)","validateVSpace":"Το VSpace πρέπει να είναι αριθμός.","windowMode":"Τρόπος λειτουργίας παραθύρου","windowModeOpaque":"Συμπαγές","windowModeTransparent":"Διάφανο","windowModeWindow":"Παράθυρο"},"font":{"fontSize":{"label":"Μέγεθος","voiceLabel":"Μέγεθος Γραμματοσειράς","panelTitle":"Μέγεθος Γραμματοσειράς"},"label":"Γραμματοσειρά","panelTitle":"Όνομα Γραμματοσειράς","voiceLabel":"Γραμματοσειρά"},"forms":{"button":{"title":"Ιδιότητες Κουμπιού","text":"Κείμενο (Τιμή)","type":"Τύπος","typeBtn":"Κουμπί","typeSbm":"Υποβολή","typeRst":"Επαναφορά"},"checkboxAndRadio":{"checkboxTitle":"Ιδιότητες Κουτιού Επιλογής","radioTitle":"Ιδιότητες Κουμπιού Επιλογής","value":"Τιμή","selected":"Επιλεγμένο","required":"Required"},"form":{"title":"Ιδιότητες Φόρμας","menu":"Ιδιότητες Φόρμας","action":"Ενέργεια","method":"Μέθοδος","encoding":"Κωδικοποίηση"},"hidden":{"title":"Ιδιότητες Κρυφού Πεδίου","name":"Όνομα","value":"Τιμή"},"select":{"title":"Ιδιότητες Πεδίου Επιλογής","selectInfo":"Πληροφορίες Πεδίου Επιλογής","opAvail":"Διαθέσιμες Επιλογές","value":"Τιμή","size":"Μέγεθος","lines":"γραμμές","chkMulti":"Να επιτρέπονται οι πολλαπλές επιλογές","required":"Required","opText":"Κείμενο","opValue":"Τιμή","btnAdd":"Προσθήκη","btnModify":"Τροποποίηση","btnUp":"Πάνω","btnDown":"Κάτω","btnSetValue":"Θέση ως προεπιλογή","btnDelete":"Διαγραφή"},"textarea":{"title":"Ιδιότητες Περιοχής Κειμένου","cols":"Στήλες","rows":"Σειρές"},"textfield":{"title":"Ιδιότητες Πεδίου Κειμένου","name":"Όνομα","value":"Τιμή","charWidth":"Πλάτος Χαρακτήρων","maxChars":"Μέγιστοι χαρακτήρες","required":"Required","type":"Τύπος","typeText":"Κείμενο","typePass":"Κωδικός","typeEmail":"Email","typeSearch":"Αναζήτηση","typeTel":"Αριθμός Τηλεφώνου","typeUrl":"URL"}},"format":{"label":"Μορφοποίηση","panelTitle":"Μορφοποίηση Παραγράφου","tag_address":"Διεύθυνση","tag_div":"Κανονική (DIV)","tag_h1":"Κεφαλίδα 1","tag_h2":"Κεφαλίδα 2","tag_h3":"Κεφαλίδα 3","tag_h4":"Κεφαλίδα 4","tag_h5":"Κεφαλίδα 5","tag_h6":"Κεφαλίδα 6","tag_p":"Κανονική","tag_pre":"Προ-μορφοποιημένη"},"horizontalrule":{"toolbar":"Εισαγωγή Οριζόντιας Γραμμής"},"iframe":{"border":"Προβολή περιγράμματος πλαισίου","noUrl":"Παρακαλούμε εισάγεται το URL του iframe","scrolling":"Ενεργοποίηση μπαρών κύλισης","title":"Ιδιότητες IFrame","toolbar":"IFrame"},"image":{"alt":"Εναλλακτικό Κείμενο","border":"Περίγραμμα","btnUpload":"Αποστολή στον Διακομιστή","button2Img":"Θέλετε να μετατρέψετε το επιλεγμένο κουμπί εικόνας σε απλή εικόνα;","hSpace":"HSpace","img2Button":"Θέλετε να μεταμορφώσετε την επιλεγμένη εικόνα που είναι πάνω σε ένα κουμπί;","infoTab":"Πληροφορίες Εικόνας","linkTab":"Σύνδεσμος","lockRatio":"Κλείδωμα Αναλογίας","menu":"Ιδιότητες Εικόνας","resetSize":"Επαναφορά Αρχικού Μεγέθους","title":"Ιδιότητες Εικόνας","titleButton":"Ιδιότητες Κουμπιού Εικόνας","upload":"Αποστολή","urlMissing":"Το URL πηγής για την εικόνα λείπει.","vSpace":"VSpace","validateBorder":"Το περίγραμμα πρέπει να είναι ένας ακέραιος αριθμός.","validateHSpace":"Το HSpace πρέπει να είναι ένας ακέραιος αριθμός.","validateVSpace":"Το VSpace πρέπει να είναι ένας ακέραιος αριθμός."},"indent":{"indent":"Αύξηση Εσοχής","outdent":"Μείωση Εσοχής"},"smiley":{"options":"Επιλογές Φατσούλων","title":"Εισάγετε μια Φατσούλα","toolbar":"Φατσούλα"},"justify":{"block":"Πλήρης Στοίχιση","center":"Στο Κέντρο","left":"Στοίχιση Αριστερά","right":"Στοίχιση Δεξιά"},"language":{"button":"Θέση γλώσσας","remove":"Αφαίρεση γλώσσας"},"link":{"acccessKey":"Συντόμευση","advanced":"Για Προχωρημένους","advisoryContentType":"Ενδεικτικός Τύπος Περιεχομένου","advisoryTitle":"Ενδεικτικός Τίτλος","anchor":{"toolbar":"Εισαγωγή/επεξεργασία Άγκυρας","menu":"Ιδιότητες άγκυρας","title":"Ιδιότητες άγκυρας","name":"Όνομα άγκυρας","errorName":"Παρακαλούμε εισάγετε όνομα άγκυρας","remove":"Αφαίρεση Άγκυρας"},"anchorId":"Βάσει του Element Id","anchorName":"Βάσει του Ονόματος Άγκυρας","charset":"Κωδικοποίηση Χαρακτήρων Προσαρτημένης Πηγής","cssClasses":"Κλάσεις Φύλλων Στυλ","download":"Force Download","displayText":"Display Text","emailAddress":"Διεύθυνση E-mail","emailBody":"Κείμενο Μηνύματος","emailSubject":"Θέμα Μηνύματος","id":"Id","info":"Πληροφορίες Συνδέσμου","langCode":"Κατεύθυνση Κειμένου","langDir":"Κατεύθυνση Κειμένου","langDirLTR":"Αριστερά προς Δεξιά (LTR)","langDirRTL":"Δεξιά προς Αριστερά (RTL)","menu":"Επεξεργασία Συνδέσμου","name":"Όνομα","noAnchors":"(Δεν υπάρχουν άγκυρες στο κείμενο)","noEmail":"Εισάγετε τη διεύθυνση ηλεκτρονικού ταχυδρομείου","noUrl":"Εισάγετε την τοποθεσία (URL) του συνδέσμου","other":"<άλλο>","popupDependent":"Εξαρτημένο (Netscape)","popupFeatures":"Επιλογές Αναδυόμενου Παραθύρου","popupFullScreen":"Πλήρης Οθόνη (IE)","popupLeft":"Θέση Αριστερά","popupLocationBar":"Γραμμή Τοποθεσίας","popupMenuBar":"Γραμμή Επιλογών","popupResizable":"Προσαρμοζόμενο Μέγεθος","popupScrollBars":"Μπάρες Κύλισης","popupStatusBar":"Γραμμή Κατάστασης","popupToolbar":"Εργαλειοθήκη","popupTop":"Θέση Πάνω","rel":"Σχέση","selectAnchor":"Επιλέξτε μια Άγκυρα","styles":"Μορφή","tabIndex":"Σειρά Μεταπήδησης","target":"Παράθυρο Προορισμού","targetFrame":"<πλαίσιο>","targetFrameName":"Όνομα Πλαισίου Προορισμού","targetPopup":"<αναδυόμενο παράθυρο>","targetPopupName":"Όνομα Αναδυόμενου Παραθύρου","title":"Σύνδεσμος","toAnchor":"Άγκυρα σε αυτήν τη σελίδα","toEmail":"E-Mail","toUrl":"URL","toolbar":"Σύνδεσμος","type":"Τύπος Συνδέσμου","unlink":"Αφαίρεση Συνδέσμου","upload":"Αποστολή"},"list":{"bulletedlist":"Εισαγωγή/Απομάκρυνση Λίστας Κουκκίδων","numberedlist":"Εισαγωγή/Απομάκρυνση Αριθμημένης Λίστας"},"liststyle":{"armenian":"Αρμενική αρίθμηση","bulletedTitle":"Ιδιότητες Λίστας Σημείων","circle":"Κύκλος","decimal":"Δεκαδική (1, 2, 3, κτλ)","decimalLeadingZero":"Δεκαδική με αρχικό μηδεν (01, 02, 03, κτλ)","disc":"Δίσκος","georgian":"Γεωργιανή αρίθμηση (ა, ბ, გ, κτλ)","lowerAlpha":"Μικρά Λατινικά (a, b, c, d, e, κτλ.)","lowerGreek":"Μικρά Ελληνικά (α, β, γ, κτλ)","lowerRoman":"Μικρά Ρωμαϊκά (i, ii, iii, iv, v, κτλ)","none":"Καμία","notset":"<δεν έχει οριστεί>","numberedTitle":"Ιδιότητες Αριθμημένης Λίστας ","square":"Τετράγωνο","start":"Εκκίνηση","type":"Τύπος","upperAlpha":"Κεφαλαία Λατινικά (A, B, C, D, E, κτλ)","upperRoman":"Κεφαλαία Ρωμαϊκά (I, II, III, IV, V, κτλ)","validateStartNumber":"Ο αριθμός εκκίνησης της αρίθμησης πρέπει να είναι ακέραιος αριθμός."},"magicline":{"title":"Εισάγετε παράγραφο εδώ"},"maximize":{"maximize":"Μεγιστοποίηση","minimize":"Ελαχιστοποίηση"},"newpage":{"toolbar":"Νέα Σελίδα"},"pagebreak":{"alt":"Αλλαγή Σελίδας","toolbar":"Εισαγωγή Τέλους Σελίδας για Εκτύπωση"},"pastetext":{"button":"Επικόλληση ως απλό κείμενο","title":"Επικόλληση ως απλό κείμενο"},"pastefromword":{"confirmCleanup":"Το κείμενο που επικολλάται φαίνεται να είναι αντιγραμμένο από το Word. Μήπως θα θέλατε να καθαριστεί προτού επικολληθεί;","error":"Δεν ήταν δυνατό να καθαριστούν τα δεδομένα λόγω ενός εσωτερικού σφάλματος","title":"Επικόλληση από το Word","toolbar":"Επικόλληση από το Word"},"preview":{"preview":"Προεπισκόπιση"},"print":{"toolbar":"Εκτύπωση"},"removeformat":{"toolbar":"Εκκαθάριση Μορφοποίησης"},"save":{"toolbar":"Αποθήκευση"},"selectall":{"toolbar":"Επιλογή όλων"},"showblocks":{"toolbar":"Προβολή Τμημάτων"},"sourcearea":{"toolbar":"Κώδικας"},"specialchar":{"options":"Επιλογές Ειδικών Χαρακτήρων","title":"Επιλέξτε Έναν Ειδικό Χαρακτήρα","toolbar":"Εισαγωγή Ειδικού Χαρακτήρα"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Λεξικά","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Γλώσσες","btn_options":"Επιλογές","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Μορφές","panelTitle":"Στυλ Μορφοποίησης","panelTitle1":"Στυλ Τμημάτων","panelTitle2":"Στυλ Εν Σειρά","panelTitle3":"Στυλ Αντικειμένων"},"table":{"border":"Πάχος Περιγράμματος","caption":"Λεζάντα","cell":{"menu":"Κελί","insertBefore":"Εισαγωγή Κελιού Πριν","insertAfter":"Εισαγωγή Κελιού Μετά","deleteCell":"Διαγραφή Κελιών","merge":"Ενοποίηση Κελιών","mergeRight":"Συγχώνευση Με Δεξιά","mergeDown":"Συγχώνευση Με Κάτω","splitHorizontal":"Οριζόντια Διαίρεση Κελιού","splitVertical":"Κατακόρυφη Διαίρεση Κελιού","title":"Ιδιότητες Κελιού","cellType":"Τύπος Κελιού","rowSpan":"Εύρος Γραμμών","colSpan":"Εύρος Στηλών","wordWrap":"Αναδίπλωση Λέξεων","hAlign":"Οριζόντια Στοίχιση","vAlign":"Κάθετη Στοίχιση","alignBaseline":"Γραμμή Βάσης","bgColor":"Χρώμα Φόντου","borderColor":"Χρώμα Περιγράμματος","data":"Δεδομένα","header":"Κεφαλίδα","yes":"Ναι","no":"Όχι","invalidWidth":"Το πλάτος του κελιού πρέπει να είναι αριθμός.","invalidHeight":"Το ύψος του κελιού πρέπει να είναι αριθμός.","invalidRowSpan":"Το εύρος των γραμμών πρέπει να είναι ακέραιος αριθμός.","invalidColSpan":"Το εύρος των στηλών πρέπει να είναι ακέραιος αριθμός.","chooseColor":"Επιλέξτε"},"cellPad":"Αναπλήρωση κελιών","cellSpace":"Απόσταση κελιών","column":{"menu":"Στήλη","insertBefore":"Εισαγωγή Στήλης Πριν","insertAfter":"Εισαγωγή Στήλης Μετά","deleteColumn":"Διαγραφή Στηλών"},"columns":"Στήλες","deleteTable":"Διαγραφή Πίνακα","headers":"Κεφαλίδες","headersBoth":"Και τα δύο","headersColumn":"Πρώτη στήλη","headersNone":"Κανένα","headersRow":"Πρώτη Γραμμή","invalidBorder":"Το πάχος του περιγράμματος πρέπει να είναι ένας αριθμός.","invalidCellPadding":"Η αναπλήρωση των κελιών πρέπει να είναι θετικός αριθμός.","invalidCellSpacing":"Η απόσταση μεταξύ των κελιών πρέπει να είναι ένας θετικός αριθμός.","invalidCols":"Ο αριθμός των στηλών πρέπει να είναι μεγαλύτερος από 0.","invalidHeight":"Το ύψος του πίνακα πρέπει να είναι αριθμός.","invalidRows":"Ο αριθμός των σειρών πρέπει να είναι μεγαλύτερος από 0.","invalidWidth":"Το πλάτος του πίνακα πρέπει να είναι ένας αριθμός.","menu":"Ιδιότητες Πίνακα","row":{"menu":"Γραμμή","insertBefore":"Εισαγωγή Γραμμής Πριν","insertAfter":"Εισαγωγή Γραμμής Μετά","deleteRow":"Διαγραφή Γραμμών"},"rows":"Γραμμές","summary":"Περίληψη","title":"Ιδιότητες Πίνακα","toolbar":"Πίνακας","widthPc":"τοις εκατό","widthPx":"pixel","widthUnit":"μονάδα πλάτους"},"undo":{"redo":"Επανάληψη","undo":"Αναίρεση"},"wsc":{"btnIgnore":"Αγνόηση","btnIgnoreAll":"Αγνόηση όλων","btnReplace":"Αντικατάσταση","btnReplaceAll":"Αντικατάσταση όλων","btnUndo":"Αναίρεση","changeTo":"Αλλαγή σε","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Δεν υπάρχει εγκατεστημένος ορθογράφος. Θέλετε να τον κατεβάσετε τώρα;","manyChanges":"Ο ορθογραφικός έλεγχος ολοκληρώθηκε: Άλλαξαν %1 λέξεις","noChanges":"Ο ορθογραφικός έλεγχος ολοκληρώθηκε: Δεν άλλαξαν λέξεις","noMispell":"Ο ορθογραφικός έλεγχος ολοκληρώθηκε: Δεν βρέθηκαν λάθη","noSuggestions":"- Δεν υπάρχουν προτάσεις -","notAvailable":"Η υπηρεσία δεν είναι διαθέσιμη αυτήν την στιγμή.","notInDic":"Δεν υπάρχει στο λεξικό","oneChange":"Ο ορθογραφικός έλεγχος ολοκληρώθηκε: Άλλαξε μια λέξη","progress":"Γίνεται ορθογραφικός έλεγχος...","title":"Ορθογραφικός Έλεγχος","toolbar":"Ορθογραφικός Έλεγχος"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/lang/en-au.js
index 123456b6b61..0dd88f94ed4 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/en-au.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/en-au.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['en-au']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Colour","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"More Colours...","panelTitle":"Colors","textColorTitle":"Text Colour"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"Replace","replaceAll":"Replace All","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Baseline","alignTextTop":"Text Top","bgcolor":"Background colour","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"URL must not be empty.","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
+CKEDITOR.lang['en-au']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Colour","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colours...","panelTitle":"Colors","textColorTitle":"Text Colour"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"Replace","replaceAll":"Replace All","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Baseline","alignTextTop":"Text Top","bgcolor":"Background colour","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"URL must not be empty.","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/lang/en-ca.js
index 41ea8beccbe..e8cd1a140ed 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/en-ca.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/en-ca.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['en-ca']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Colour","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"More Colours...","panelTitle":"Colors","textColorTitle":"Text Colour"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"Replace","replaceAll":"Replace All","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Baseline","alignTextTop":"Text Top","bgcolor":"Background colour","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"URL must not be empty.","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
+CKEDITOR.lang['en-ca']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Colour","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colours...","panelTitle":"Colors","textColorTitle":"Text Colour"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"Replace","replaceAll":"Replace All","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Baseline","alignTextTop":"Text Top","bgcolor":"Background colour","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"URL must not be empty.","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/lang/en-gb.js
index 0a2302fbd23..0ead4405370 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/en-gb.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/en-gb.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['en-gb']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Drag to resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialogue window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Colour","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Grey","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Grey","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Grey","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Grey","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"More Colours...","panelTitle":"Colours","textColorTitle":"Text Colour"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Colour Options","selected":"Selected Colour","title":"Select colour"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"Replace","replaceAll":"Replace All","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Baseline","alignTextTop":"Text Top","bgcolor":"Background colour","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"URL must not be empty.","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"E-mail","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximise","minimize":"Minimise"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
+CKEDITOR.lang['en-gb']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Drag to resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialogue window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Colour","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Grey","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Grey","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Grey","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Grey","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colours...","panelTitle":"Colours","textColorTitle":"Text Colour"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Colour Options","selected":"Selected Colour","title":"Select colour"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"Replace","replaceAll":"Replace All","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Baseline","alignTextTop":"Text Top","bgcolor":"Background colour","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"URL must not be empty.","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"E-mail","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximise","minimize":"Minimise"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/en.js b/htdocs/includes/ckeditor/ckeditor/lang/en.js
index e4426615ff6..fb647fef993 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/en.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/en.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['en']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Alignment","alignLeft":"Left","alignRight":"Right","alignCenter":"Center","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Color","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"More Colors...","panelTitle":"Colors","textColorTitle":"Text Color"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"Replace","replaceAll":"Replace All","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Baseline","alignTextTop":"Text Top","bgcolor":"Background color","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"URL must not be empty.","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"justify":{"block":"Justify","center":"Center","left":"Align Left","right":"Align Right"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
+CKEDITOR.lang['en']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Alignment","alignLeft":"Left","alignRight":"Right","alignCenter":"Center","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Color","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colors...","panelTitle":"Colors","textColorTitle":"Text Color"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"Replace","replaceAll":"Replace All","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Baseline","alignTextTop":"Text Top","bgcolor":"Background color","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"URL must not be empty.","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"justify":{"block":"Justify","center":"Center","left":"Align Left","right":"Align Right"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/lang/eo.js
index 4d9ed22fbe8..a862326dab1 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/eo.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/eo.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['eo']={"editor":"RiĉTeksta Redaktilo","editorPanel":"Panelo de la RiĉTeksta Redaktilo","common":{"editorHelp":"Premu ALT 0 por helpilo","browseServer":"Foliumi en la Servilo","url":"URL","protocol":"Protokolo","upload":"Alŝuti","uploadSubmit":"Sendu al Servilo","image":"Bildo","flash":"Flaŝo","form":"Formularo","checkbox":"Markobutono","radio":"Radiobutono","textField":"Teksta kampo","textarea":"Teksta Areo","hiddenField":"Kaŝita Kampo","button":"Butono","select":"Elekta Kampo","imageButton":"Bildbutono","notSet":"<Defaŭlta>","id":"Id","name":"Nomo","langDir":"Skribdirekto","langDirLtr":"De maldekstro dekstren (LTR)","langDirRtl":"De dekstro maldekstren (RTL)","langCode":"Lingva Kodo","longDescr":"URL de Longa Priskribo","cssClass":"Klasoj de Stilfolioj","advisoryTitle":"Priskriba Titolo","cssStyle":"Stilo","ok":"Akcepti","cancel":"Rezigni","close":"Fermi","preview":"Vidigi Aspekton","resize":"Movigi por ŝanĝi la grandon","generalTab":"Ĝenerala","advancedTab":"Speciala","validateNumberFailed":"Tiu valoro ne estas nombro.","confirmNewPage":"La neregistritaj ŝanĝoj estas perdotaj. Ĉu vi certas, ke vi volas ŝargi novan paĝon?","confirmCancel":"Iuj opcioj esta ŝanĝitaj. Ĉu vi certas, ke vi volas fermi la dialogon?","options":"Opcioj","target":"Celo","targetNew":"Nova Fenestro (_blank)","targetTop":"Supra Fenestro (_top)","targetSelf":"Sama Fenestro (_self)","targetParent":"Patra Fenestro (_parent)","langDirLTR":"De maldekstro dekstren (LTR)","langDirRTL":"De dekstro maldekstren (RTL)","styles":"Stilo","cssClasses":"Stilfoliaj Klasoj","width":"Larĝo","height":"Alto","align":"Ĝisrandigo","alignLeft":"Maldekstre","alignRight":"Dekstre","alignCenter":"Centre","alignJustify":"Ĝisrandigi Ambaŭflanke","alignTop":"Supre","alignMiddle":"Centre","alignBottom":"Malsupre","alignNone":"Neniu","invalidValue":"Nevalida Valoro","invalidHeight":"Alto devas esti nombro.","invalidWidth":"Larĝo devas esti nombro.","invalidCssLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida CSSmezurunuo (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida HTMLmezurunuo (px or %).","invalidInlineStyle":"La valoro indikita por la enlinia stilo devas konsisti el unu aŭ pluraj elementoj kun la formato de \"nomo : valoro\", apartigitaj per punktokomoj.","cssLengthTooltip":"Entajpu nombron por rastrumera valoro aŭ nombron kun valida CSSunuo (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, nehavebla</span>"},"about":{"copy":"Copyright &copy; $1. Ĉiuj rajtoj rezervitaj.","dlgTitle":"Pri CKEditor","help":"Kontroli $1 por helpo.","moreInfo":"Por informoj pri licenco, bonvolu viziti nian retpaĝaron:","title":"Pri CKEditor","userGuide":"CKEditor Uzindikoj"},"basicstyles":{"bold":"Grasa","italic":"Kursiva","strike":"Trastreko","subscript":"Suba indico","superscript":"Supra indico","underline":"Substreko"},"bidi":{"ltr":"Tekstdirekto de maldekstre dekstren","rtl":"Tekstdirekto de dekstre maldekstren"},"blockquote":{"toolbar":"Citaĵo"},"clipboard":{"copy":"Kopii","copyError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras kopiajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-C).","cut":"Eltondi","cutError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras eltondajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-X).","paste":"Interglui","pasteArea":"Intergluoareo","pasteMsg":"Bonvolu glui la tekston en la jenan areon per uzado de la klavaro (<strong>Ctrl/Cmd+V</strong>) kaj premu OK","securityMsg":"Pro la sekurecagordo de via TTT-legilo, la redaktilo ne povas rekte atingi viajn datenojn en la poŝo. Bonvolu denove interglui la datenojn en tiun fenestron.","title":"Interglui"},"button":{"selectedLabel":"%1 (Selektita)"},"colorbutton":{"auto":"Aŭtomata","bgColorTitle":"Fona Koloro","colors":{"000":"Nigra","800000":"Kaŝtankolora","8B4513":"Mezbruna","2F4F4F":"Ardezgriza","008080":"Marĉanaskolora","000080":"Maristblua","4B0082":"Indigokolora","696969":"Malhelgriza","B22222":"Brikruĝa","A52A2A":"Bruna","DAA520":"Senbrilorkolora","006400":"Malhelverda","40E0D0":"Turkisblua","0000CD":"Reĝblua","800080":"Purpura","808080":"Griza","F00":"Ruĝa","FF8C00":"Malheloranĝkolora","FFD700":"Orkolora","008000":"Verda","0FF":"Verdblua","00F":"Blua","EE82EE":"Viola","A9A9A9":"Mezgriza","FFA07A":"Salmokolora","FFA500":"Oranĝkolora","FFFF00":"Flava","00FF00":"Limetkolora","AFEEEE":"Helturkiskolora","ADD8E6":"Helblua","DDA0DD":"Prunkolora","D3D3D3":"Helgriza","FFF0F5":"Lavendkolora vangoŝminko","FAEBD7":"Antikvablanka","FFFFE0":"Helflava","F0FFF0":"Vintromelonkolora","F0FFFF":"Lazura","F0F8FF":"Aliceblua","E6E6FA":"Lavendkolora","FFF":"Blanka"},"more":"Pli da Koloroj...","panelTitle":"Koloroj","textColorTitle":"Teksta Koloro"},"colordialog":{"clear":"Forigi","highlight":"Detaloj","options":"Opcioj pri koloroj","selected":"Selektita koloro","title":"Selekti koloron"},"templates":{"button":"Ŝablonoj","emptyListMsg":"(Neniu ŝablono difinita)","insertOption":"Anstataŭigi la nunan enhavon","options":"Opcioj pri ŝablonoj","selectPromptMsg":"Bonvolu selekti la ŝablonon por malfermi ĝin en la redaktilo","title":"Enhavo de ŝablonoj"},"contextmenu":{"options":"Opcioj de Kunteksta Menuo"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Priskriba Titolo","cssClassInputLabel":"Stilfolioklasoj","edit":"Redakti Div","inlineStyleInputLabel":"Enlinia stilo","langDirLTRLabel":"Maldekstre dekstren (angle LTR)","langDirLabel":"Skribdirekto","langDirRTLLabel":"Dekstre maldekstren (angle RTL)","languageCodeInputLabel":" Lingvokodo","remove":"Forigi Div","styleSelectLabel":"Stilo","title":"Krei DIV ujon","toolbar":"Krei DIV ujon"},"toolbar":{"toolbarCollapse":"Faldi la ilbreton","toolbarExpand":"Malfaldi la ilbreton","toolbarGroups":{"document":"Dokumento","clipboard":"Poŝo/Malfari","editing":"Redaktado","forms":"Formularoj","basicstyles":"Bazaj stiloj","paragraph":"Paragrafo","links":"Ligiloj","insert":"Enmeti","styles":"Stiloj","colors":"Koloroj","tools":"Iloj"},"toolbars":"Ilobretoj de la redaktilo"},"elementspath":{"eleLabel":"Vojo al Elementoj","eleTitle":"%1 elementoj"},"find":{"find":"Serĉi","findOptions":"Opcioj pri Serĉado","findWhat":"Serĉi:","matchCase":"Kongruigi Usklecon","matchCyclic":"Cikla Serĉado","matchWord":"Tuta Vorto","notFoundMsg":"La celteksto ne estas trovita.","replace":"Anstataŭigi","replaceAll":"Anstataŭigi Ĉion","replaceSuccessMsg":"%1 anstataŭigita(j) apero(j).","replaceWith":"Anstataŭigi per:","title":"Serĉi kaj Anstataŭigi"},"fakeobjects":{"anchor":"Ankro","flash":"FlaŝAnimacio","hiddenfield":"Kaŝita kampo","iframe":"Enlinia Kadro (IFrame)","unknown":"Nekonata objekto"},"flash":{"access":"Atingi skriptojn","accessAlways":"Ĉiam","accessNever":"Neniam","accessSameDomain":"Sama domajno","alignAbsBottom":"Absoluta Malsupro","alignAbsMiddle":"Absoluta Centro","alignBaseline":"TekstoMalsupro","alignTextTop":"TekstoSupro","bgcolor":"Fona Koloro","chkFull":"Permesi tutekranon","chkLoop":"Iteracio","chkMenu":"Ebligi flaŝmenuon","chkPlay":"Aŭtomata legado","flashvars":"Variabloj por Flaŝo","hSpace":"Horizontala Spaco","properties":"Flaŝatributoj","propertiesTab":"Atributoj","quality":"Kvalito","qualityAutoHigh":"Aŭtomate alta","qualityAutoLow":"Aŭtomate malalta","qualityBest":"Plej bona","qualityHigh":"Alta","qualityLow":"Malalta","qualityMedium":"Meza","scale":"Skalo","scaleAll":"Montri ĉion","scaleFit":"Origina grando","scaleNoBorder":"Neniu bordero","title":"Flaŝatributoj","vSpace":"Vertikala Spaco","validateHSpace":"Horizontala Spaco devas esti nombro.","validateSrc":"Bonvolu entajpi la retadreson (URL)","validateVSpace":"Vertikala Spaco devas esti nombro.","windowMode":"Fenestra reĝimo","windowModeOpaque":"Opaka","windowModeTransparent":"Travidebla","windowModeWindow":"Fenestro"},"font":{"fontSize":{"label":"Grado","voiceLabel":"Tipara grado","panelTitle":"Tipara grado"},"label":"Tiparo","panelTitle":"Tipara nomo","voiceLabel":"Tiparo"},"forms":{"button":{"title":"Butonaj atributoj","text":"Teksto (Valoro)","type":"Tipo","typeBtn":"Butono","typeSbm":"Validigi (submit)","typeRst":"Remeti en la originstaton (Reset)"},"checkboxAndRadio":{"checkboxTitle":"Markobutonaj Atributoj","radioTitle":"Radiobutonaj Atributoj","value":"Valoro","selected":"Selektita","required":"Postulata"},"form":{"title":"Formularaj Atributoj","menu":"Formularaj Atributoj","action":"Ago","method":"Metodo","encoding":"Kodoprezento"},"hidden":{"title":"Atributoj de Kaŝita Kampo","name":"Nomo","value":"Valoro"},"select":{"title":"Atributoj de Elekta Kampo","selectInfo":"Informoj pri la rulummenuo","opAvail":"Elektoj Disponeblaj","value":"Valoro","size":"Grando","lines":"Linioj","chkMulti":"Permesi Plurajn Elektojn","required":"Postulata","opText":"Teksto","opValue":"Valoro","btnAdd":"Aldoni","btnModify":"Modifi","btnUp":"Supren","btnDown":"Malsupren","btnSetValue":"Agordi kiel Elektitan Valoron","btnDelete":"Forigi"},"textarea":{"title":"Atributoj de Teksta Areo","cols":"Kolumnoj","rows":"Linioj"},"textfield":{"title":"Atributoj de Teksta Kampo","name":"Nomo","value":"Valoro","charWidth":"Signolarĝo","maxChars":"Maksimuma Nombro da Signoj","required":"Postulata","type":"Tipo","typeText":"Teksto","typePass":"Pasvorto","typeEmail":"retpoŝtadreso","typeSearch":"Serĉi","typeTel":"Telefonnumero","typeUrl":"URL"}},"format":{"label":"Formato","panelTitle":"ParagrafFormato","tag_address":"Adreso","tag_div":"Normala (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normala","tag_pre":"Formatita"},"horizontalrule":{"toolbar":"Enmeti Horizontalan Linion"},"iframe":{"border":"Montri borderon de kadro (frame)","noUrl":"Bonvolu entajpi la retadreson de la ligilo al la enlinia kadro (IFrame)","scrolling":"Ebligi rulumskalon","title":"Atributoj de la enlinia kadro (IFrame)","toolbar":"Enlinia kadro (IFrame)"},"image":{"alt":"Anstataŭiga Teksto","border":"Bordero","btnUpload":"Sendu al Servilo","button2Img":"Ĉu vi volas transformi la selektitan bildbutonon en simplan bildon?","hSpace":"Horizontala Spaco","img2Button":"Ĉu vi volas transformi la selektitan bildon en bildbutonon?","infoTab":"Informoj pri Bildo","linkTab":"Ligilo","lockRatio":"Konservi Proporcion","menu":"Atributoj de Bildo","resetSize":"Origina Grando","title":"Atributoj de Bildo","titleButton":"Bildbutonaj Atributoj","upload":"Alŝuti","urlMissing":"La fontretadreso de la bildo mankas.","vSpace":"Vertikala Spaco","validateBorder":"La bordero devas esti entjera nombro.","validateHSpace":"La horizontala spaco devas esti entjera nombro.","validateVSpace":"La vertikala spaco devas esti entjera nombro."},"indent":{"indent":"Pligrandigi Krommarĝenon","outdent":"Malpligrandigi Krommarĝenon"},"smiley":{"options":"Opcioj pri mienvinjetoj","title":"Enmeti Mienvinjeton","toolbar":"Mienvinjeto"},"justify":{"block":"Ĝisrandigi Ambaŭflanke","center":"Centrigi","left":"Ĝisrandigi maldekstren","right":"Ĝisrandigi dekstren"},"language":{"button":"Instali lingvon","remove":"Forigi lingvon"},"link":{"acccessKey":"Fulmoklavo","advanced":"Speciala","advisoryContentType":"Enhavotipo","advisoryTitle":"Priskriba Titolo","anchor":{"toolbar":"Ankro","menu":"Enmeti/Ŝanĝi Ankron","title":"Ankraj Atributoj","name":"Ankra Nomo","errorName":"Bv entajpi la ankran nomon","remove":"Forigi Ankron"},"anchorId":"Per Elementidentigilo","anchorName":"Per Ankronomo","charset":"Signaro de la Ligita Rimedo","cssClasses":"Klasoj de Stilfolioj","emailAddress":"Retpoŝto","emailBody":"Mesaĝa korpo","emailSubject":"Mesaĝa Temo","id":"Id","info":"Informoj pri la Ligilo","langCode":"Lingva Kodo","langDir":"Skribdirekto","langDirLTR":"De maldekstro dekstren (LTR)","langDirRTL":"De dekstro maldekstren (RTL)","menu":"Ŝanĝi Ligilon","name":"Nomo","noAnchors":"<Ne disponeblas ankroj en la dokumento>","noEmail":"Bonvolu entajpi la retpoŝtadreson","noUrl":"Bonvolu entajpi la URL-on","other":"<alia>","popupDependent":"Dependa (Netscape)","popupFeatures":"Atributoj de la Ŝprucfenestro","popupFullScreen":"Tutekrane (IE)","popupLeft":"Maldekstra Pozicio","popupLocationBar":"Adresobreto","popupMenuBar":"Menubreto","popupResizable":"Dimensiŝanĝebla","popupScrollBars":"Rulumskaloj","popupStatusBar":"Statobreto","popupToolbar":"Ilobreto","popupTop":"Supra Pozicio","rel":"Rilato","selectAnchor":"Elekti Ankron","styles":"Stilo","tabIndex":"Taba Indekso","target":"Celo","targetFrame":"<kadro>","targetFrameName":"Nomo de CelKadro","targetPopup":"<ŝprucfenestro>","targetPopupName":"Nomo de Ŝprucfenestro","title":"Ligilo","toAnchor":"Ankri en tiu ĉi paĝo","toEmail":"Retpoŝto","toUrl":"URL","toolbar":"Enmeti/Ŝanĝi Ligilon","type":"Tipo de Ligilo","unlink":"Forigi Ligilon","upload":"Alŝuti"},"list":{"bulletedlist":"Bula Listo","numberedlist":"Numera Listo"},"liststyle":{"armenian":"Armena nombrado","bulletedTitle":"Atributoj de Bula Listo","circle":"Cirklo","decimal":"Dekumaj Nombroj (1, 2, 3, ktp.)","decimalLeadingZero":"Dekumaj Nombroj malantaŭ nulo (01, 02, 03, ktp.)","disc":"Disko","georgian":"Gruza nombrado (an, ban, gan, ktp.)","lowerAlpha":"Minusklaj Literoj (a, b, c, d, e, ktp.)","lowerGreek":"Grekaj Minusklaj Literoj (alpha, beta, gamma, ktp.)","lowerRoman":"Minusklaj Romanaj Nombroj (i, ii, iii, iv, v, ktp.)","none":"Neniu","notset":"<Defaŭlta>","numberedTitle":"Atributoj de Numera Listo","square":"kvadrato","start":"Komenco","type":"Tipo","upperAlpha":"Majusklaj Literoj (A, B, C, D, E, ktp.)","upperRoman":"Majusklaj Romanaj Nombroj (I, II, III, IV, V, ktp.)","validateStartNumber":"La unua listero devas esti entjera nombro."},"magicline":{"title":"Enmeti paragrafon ĉi-tien"},"maximize":{"maximize":"Pligrandigi","minimize":"Malgrandigi"},"newpage":{"toolbar":"Nova Paĝo"},"pagebreak":{"alt":"Paĝavanco","toolbar":"Enmeti Paĝavancon por Presado"},"pastetext":{"button":"Interglui kiel platan tekston","title":"Interglui kiel platan tekston"},"pastefromword":{"confirmCleanup":"La teksto, kiun vi volas interglui, ŝajnas esti kopiita el Word. Ĉu vi deziras purigi ĝin antaŭ intergluo?","error":"Ne eblis purigi la intergluitajn datenojn pro interna eraro","title":"Interglui el Word","toolbar":"Interglui el Word"},"preview":{"preview":"Vidigi Aspekton"},"print":{"toolbar":"Presi"},"removeformat":{"toolbar":"Forigi Formaton"},"save":{"toolbar":"Konservi"},"selectall":{"toolbar":"Elekti ĉion"},"showblocks":{"toolbar":"Montri la blokojn"},"sourcearea":{"toolbar":"Fonto"},"specialchar":{"options":"Opcioj pri Specialaj Signoj","title":"Selekti Specialan Signon","toolbar":"Enmeti Specialan Signon"},"scayt":{"btn_about":"Pri OKDVT","btn_dictionaries":"Vortaroj","btn_disable":"Malebligi OKDVT","btn_enable":"Ebligi OKDVT","btn_langs":"Lingvoj","btn_options":"Opcioj","text_title":"OrtografiKontrolado Dum Vi Tajpas (OKDVT)"},"stylescombo":{"label":"Stiloj","panelTitle":"Stiloj pri enpaĝigo","panelTitle1":"Stiloj de blokoj","panelTitle2":"Enliniaj Stiloj","panelTitle3":"Stiloj de objektoj"},"table":{"border":"Bordero","caption":"Tabeltitolo","cell":{"menu":"Ĉelo","insertBefore":"Enmeti Ĉelon Antaŭ","insertAfter":"Enmeti Ĉelon Post","deleteCell":"Forigi la Ĉelojn","merge":"Kunfandi la Ĉelojn","mergeRight":"Kunfandi dekstren","mergeDown":"Kunfandi malsupren ","splitHorizontal":"Horizontale dividi","splitVertical":"Vertikale dividi","title":"Ĉelatributoj","cellType":"Ĉeltipo","rowSpan":"Kunfando de linioj","colSpan":"Kunfando de kolumnoj","wordWrap":"Cezuro","hAlign":"Horizontala ĝisrandigo","vAlign":"Vertikala ĝisrandigo","alignBaseline":"Malsupro de la teksto","bgColor":"Fonkoloro","borderColor":"Borderkoloro","data":"Datenoj","header":"Supra paĝotitolo","yes":"Jes","no":"No","invalidWidth":"Ĉellarĝo devas esti nombro.","invalidHeight":"Ĉelalto devas esti nombro.","invalidRowSpan":"Kunfando de linioj devas esti entjera nombro.","invalidColSpan":"Kunfando de kolumnoj devas esti entjera nombro.","chooseColor":"Elektu"},"cellPad":"Interna Marĝeno de la ĉeloj","cellSpace":"Spaco inter la Ĉeloj","column":{"menu":"Kolumno","insertBefore":"Enmeti kolumnon antaŭ","insertAfter":"Enmeti kolumnon post","deleteColumn":"Forigi Kolumnojn"},"columns":"Kolumnoj","deleteTable":"Forigi Tabelon","headers":"Supraj Paĝotitoloj","headersBoth":"Ambaŭ","headersColumn":"Unua kolumno","headersNone":"Neniu","headersRow":"Unua linio","invalidBorder":"La bordergrando devas esti nombro.","invalidCellPadding":"La interna marĝeno en la ĉeloj devas esti pozitiva nombro.","invalidCellSpacing":"La spaco inter la ĉeloj devas esti pozitiva nombro.","invalidCols":"La nombro de la kolumnoj devas superi 0.","invalidHeight":"La tabelalto devas esti nombro.","invalidRows":"La nombro de la linioj devas superi 0.","invalidWidth":"La tabellarĝo devas esti nombro.","menu":"Atributoj de Tabelo","row":{"menu":"Linio","insertBefore":"Enmeti linion antaŭ","insertAfter":"Enmeti linion post","deleteRow":"Forigi Liniojn"},"rows":"Linioj","summary":"Resumo","title":"Atributoj de Tabelo","toolbar":"Tabelo","widthPc":"elcentoj","widthPx":"Rastrumeroj","widthUnit":"unuo de larĝo"},"undo":{"redo":"Refari","undo":"Malfari"},"wsc":{"btnIgnore":"Ignori","btnIgnoreAll":"Ignori Ĉion","btnReplace":"Anstataŭigi","btnReplaceAll":"Anstataŭigi Ĉion","btnUndo":"Malfari","changeTo":"Ŝanĝi al","errorLoading":"Eraro en la servoelŝuto el la gastiga komputiko: %s.","ieSpellDownload":"Ortografikontrolilo ne instalita. Ĉu vi volas elŝuti ĝin nun?","manyChanges":"Ortografikontrolado finita: %1 vortoj korektitaj","noChanges":"Ortografikontrolado finita: neniu vorto korektita","noMispell":"Ortografikontrolado finita: neniu eraro trovita","noSuggestions":"- Neniu propono -","notAvailable":"Bedaŭrinde la servo ne funkcias nuntempe.","notInDic":"Ne trovita en la vortaro","oneChange":"Ortografikontrolado finita: unu vorto korektita","progress":"La ortografio estas kontrolata...","title":"Kontroli la ortografion","toolbar":"Kontroli la ortografion"}};
\ No newline at end of file
+CKEDITOR.lang['eo']={"editor":"RiĉTeksta Redaktilo","editorPanel":"Panelo de la RiĉTeksta Redaktilo","common":{"editorHelp":"Premu ALT 0 por helpilo","browseServer":"Foliumi en la Servilo","url":"URL","protocol":"Protokolo","upload":"Alŝuti","uploadSubmit":"Sendu al Servilo","image":"Bildo","flash":"Flaŝo","form":"Formularo","checkbox":"Markobutono","radio":"Radiobutono","textField":"Teksta kampo","textarea":"Teksta Areo","hiddenField":"Kaŝita Kampo","button":"Butono","select":"Elekta Kampo","imageButton":"Bildbutono","notSet":"<Defaŭlta>","id":"Id","name":"Nomo","langDir":"Skribdirekto","langDirLtr":"De maldekstro dekstren (LTR)","langDirRtl":"De dekstro maldekstren (RTL)","langCode":"Lingva Kodo","longDescr":"URL de Longa Priskribo","cssClass":"Klasoj de Stilfolioj","advisoryTitle":"Priskriba Titolo","cssStyle":"Stilo","ok":"Akcepti","cancel":"Rezigni","close":"Fermi","preview":"Vidigi Aspekton","resize":"Movigi por ŝanĝi la grandon","generalTab":"Ĝenerala","advancedTab":"Speciala","validateNumberFailed":"Tiu valoro ne estas nombro.","confirmNewPage":"La neregistritaj ŝanĝoj estas perdotaj. Ĉu vi certas, ke vi volas ŝargi novan paĝon?","confirmCancel":"Iuj opcioj esta ŝanĝitaj. Ĉu vi certas, ke vi volas fermi la dialogon?","options":"Opcioj","target":"Celo","targetNew":"Nova Fenestro (_blank)","targetTop":"Supra Fenestro (_top)","targetSelf":"Sama Fenestro (_self)","targetParent":"Patra Fenestro (_parent)","langDirLTR":"De maldekstro dekstren (LTR)","langDirRTL":"De dekstro maldekstren (RTL)","styles":"Stilo","cssClasses":"Stilfoliaj Klasoj","width":"Larĝo","height":"Alto","align":"Ĝisrandigo","alignLeft":"Maldekstre","alignRight":"Dekstre","alignCenter":"Centre","alignJustify":"Ĝisrandigi Ambaŭflanke","alignTop":"Supre","alignMiddle":"Centre","alignBottom":"Malsupre","alignNone":"Neniu","invalidValue":"Nevalida Valoro","invalidHeight":"Alto devas esti nombro.","invalidWidth":"Larĝo devas esti nombro.","invalidCssLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida CSSmezurunuo (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida HTMLmezurunuo (px or %).","invalidInlineStyle":"La valoro indikita por la enlinia stilo devas konsisti el unu aŭ pluraj elementoj kun la formato de \"nomo : valoro\", apartigitaj per punktokomoj.","cssLengthTooltip":"Entajpu nombron por rastrumera valoro aŭ nombron kun valida CSSunuo (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, nehavebla</span>","keyboard":{"8":"Retropaŝo","13":"Enigi","16":"Registrumo","17":"Stirklavo","18":"Alt-klavo","32":"Space","35":"Fino","36":"Hejmo","46":"Forigi","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Ĉiuj rajtoj rezervitaj.","dlgTitle":"Pri CKEditor","help":"Kontroli $1 por helpo.","moreInfo":"Por informoj pri licenco, bonvolu viziti nian retpaĝaron:","title":"Pri CKEditor","userGuide":"CKEditor Uzindikoj"},"basicstyles":{"bold":"Grasa","italic":"Kursiva","strike":"Trastreko","subscript":"Suba indico","superscript":"Supra indico","underline":"Substreko"},"bidi":{"ltr":"Tekstdirekto de maldekstre dekstren","rtl":"Tekstdirekto de dekstre maldekstren"},"blockquote":{"toolbar":"Citaĵo"},"clipboard":{"copy":"Kopii","copyError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras kopiajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-C).","cut":"Eltondi","cutError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras eltondajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-X).","paste":"Interglui","pasteArea":"Intergluoareo","pasteMsg":"Bonvolu glui la tekston en la jenan areon per uzado de la klavaro (<strong>Ctrl/Cmd+V</strong>) kaj premu OK","securityMsg":"Pro la sekurecagordo de via TTT-legilo, la redaktilo ne povas rekte atingi viajn datenojn en la poŝo. Bonvolu denove interglui la datenojn en tiun fenestron.","title":"Interglui"},"button":{"selectedLabel":"%1 (Selektita)"},"colorbutton":{"auto":"Aŭtomata","bgColorTitle":"Fona Koloro","colors":{"000":"Nigra","800000":"Kaŝtankolora","8B4513":"Mezbruna","2F4F4F":"Ardezgriza","008080":"Marĉanaskolora","000080":"Maristblua","4B0082":"Indigokolora","696969":"Malhelgriza","B22222":"Brikruĝa","A52A2A":"Bruna","DAA520":"Senbrilorkolora","006400":"Malhelverda","40E0D0":"Turkisblua","0000CD":"Reĝblua","800080":"Purpura","808080":"Griza","F00":"Ruĝa","FF8C00":"Malheloranĝkolora","FFD700":"Orkolora","008000":"Verda","0FF":"Verdblua","00F":"Blua","EE82EE":"Viola","A9A9A9":"Mezgriza","FFA07A":"Salmokolora","FFA500":"Oranĝkolora","FFFF00":"Flava","00FF00":"Limetkolora","AFEEEE":"Helturkiskolora","ADD8E6":"Helblua","DDA0DD":"Prunkolora","D3D3D3":"Helgriza","FFF0F5":"Lavendkolora vangoŝminko","FAEBD7":"Antikvablanka","FFFFE0":"Helflava","F0FFF0":"Vintromelonkolora","F0FFFF":"Lazura","F0F8FF":"Aliceblua","E6E6FA":"Lavendkolora","FFF":"Blanka","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Pli da Koloroj...","panelTitle":"Koloroj","textColorTitle":"Teksta Koloro"},"colordialog":{"clear":"Forigi","highlight":"Detaloj","options":"Opcioj pri koloroj","selected":"Selektita koloro","title":"Selekti koloron"},"templates":{"button":"Ŝablonoj","emptyListMsg":"(Neniu ŝablono difinita)","insertOption":"Anstataŭigi la nunan enhavon","options":"Opcioj pri ŝablonoj","selectPromptMsg":"Bonvolu selekti la ŝablonon por malfermi ĝin en la redaktilo","title":"Enhavo de ŝablonoj"},"contextmenu":{"options":"Opcioj de Kunteksta Menuo"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Priskriba Titolo","cssClassInputLabel":"Stilfolioklasoj","edit":"Redakti Div","inlineStyleInputLabel":"Enlinia stilo","langDirLTRLabel":"Maldekstre dekstren (angle LTR)","langDirLabel":"Skribdirekto","langDirRTLLabel":"Dekstre maldekstren (angle RTL)","languageCodeInputLabel":" Lingvokodo","remove":"Forigi Div","styleSelectLabel":"Stilo","title":"Krei DIV ujon","toolbar":"Krei DIV ujon"},"toolbar":{"toolbarCollapse":"Faldi la ilbreton","toolbarExpand":"Malfaldi la ilbreton","toolbarGroups":{"document":"Dokumento","clipboard":"Poŝo/Malfari","editing":"Redaktado","forms":"Formularoj","basicstyles":"Bazaj stiloj","paragraph":"Paragrafo","links":"Ligiloj","insert":"Enmeti","styles":"Stiloj","colors":"Koloroj","tools":"Iloj"},"toolbars":"Ilobretoj de la redaktilo"},"elementspath":{"eleLabel":"Vojo al Elementoj","eleTitle":"%1 elementoj"},"find":{"find":"Serĉi","findOptions":"Opcioj pri Serĉado","findWhat":"Serĉi:","matchCase":"Kongruigi Usklecon","matchCyclic":"Cikla Serĉado","matchWord":"Tuta Vorto","notFoundMsg":"La celteksto ne estas trovita.","replace":"Anstataŭigi","replaceAll":"Anstataŭigi Ĉion","replaceSuccessMsg":"%1 anstataŭigita(j) apero(j).","replaceWith":"Anstataŭigi per:","title":"Serĉi kaj Anstataŭigi"},"fakeobjects":{"anchor":"Ankro","flash":"FlaŝAnimacio","hiddenfield":"Kaŝita kampo","iframe":"Enlinia Kadro (IFrame)","unknown":"Nekonata objekto"},"flash":{"access":"Atingi skriptojn","accessAlways":"Ĉiam","accessNever":"Neniam","accessSameDomain":"Sama domajno","alignAbsBottom":"Absoluta Malsupro","alignAbsMiddle":"Absoluta Centro","alignBaseline":"TekstoMalsupro","alignTextTop":"TekstoSupro","bgcolor":"Fona Koloro","chkFull":"Permesi tutekranon","chkLoop":"Iteracio","chkMenu":"Ebligi flaŝmenuon","chkPlay":"Aŭtomata legado","flashvars":"Variabloj por Flaŝo","hSpace":"Horizontala Spaco","properties":"Flaŝatributoj","propertiesTab":"Atributoj","quality":"Kvalito","qualityAutoHigh":"Aŭtomate alta","qualityAutoLow":"Aŭtomate malalta","qualityBest":"Plej bona","qualityHigh":"Alta","qualityLow":"Malalta","qualityMedium":"Meza","scale":"Skalo","scaleAll":"Montri ĉion","scaleFit":"Origina grando","scaleNoBorder":"Neniu bordero","title":"Flaŝatributoj","vSpace":"Vertikala Spaco","validateHSpace":"Horizontala Spaco devas esti nombro.","validateSrc":"Bonvolu entajpi la retadreson (URL)","validateVSpace":"Vertikala Spaco devas esti nombro.","windowMode":"Fenestra reĝimo","windowModeOpaque":"Opaka","windowModeTransparent":"Travidebla","windowModeWindow":"Fenestro"},"font":{"fontSize":{"label":"Grado","voiceLabel":"Tipara grado","panelTitle":"Tipara grado"},"label":"Tiparo","panelTitle":"Tipara nomo","voiceLabel":"Tiparo"},"forms":{"button":{"title":"Butonaj atributoj","text":"Teksto (Valoro)","type":"Tipo","typeBtn":"Butono","typeSbm":"Validigi (submit)","typeRst":"Remeti en la originstaton (Reset)"},"checkboxAndRadio":{"checkboxTitle":"Markobutonaj Atributoj","radioTitle":"Radiobutonaj Atributoj","value":"Valoro","selected":"Selektita","required":"Postulata"},"form":{"title":"Formularaj Atributoj","menu":"Formularaj Atributoj","action":"Ago","method":"Metodo","encoding":"Kodoprezento"},"hidden":{"title":"Atributoj de Kaŝita Kampo","name":"Nomo","value":"Valoro"},"select":{"title":"Atributoj de Elekta Kampo","selectInfo":"Informoj pri la rulummenuo","opAvail":"Elektoj Disponeblaj","value":"Valoro","size":"Grando","lines":"Linioj","chkMulti":"Permesi Plurajn Elektojn","required":"Postulata","opText":"Teksto","opValue":"Valoro","btnAdd":"Aldoni","btnModify":"Modifi","btnUp":"Supren","btnDown":"Malsupren","btnSetValue":"Agordi kiel Elektitan Valoron","btnDelete":"Forigi"},"textarea":{"title":"Atributoj de Teksta Areo","cols":"Kolumnoj","rows":"Linioj"},"textfield":{"title":"Atributoj de Teksta Kampo","name":"Nomo","value":"Valoro","charWidth":"Signolarĝo","maxChars":"Maksimuma Nombro da Signoj","required":"Postulata","type":"Tipo","typeText":"Teksto","typePass":"Pasvorto","typeEmail":"retpoŝtadreso","typeSearch":"Serĉi","typeTel":"Telefonnumero","typeUrl":"URL"}},"format":{"label":"Formato","panelTitle":"ParagrafFormato","tag_address":"Adreso","tag_div":"Normala (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normala","tag_pre":"Formatita"},"horizontalrule":{"toolbar":"Enmeti Horizontalan Linion"},"iframe":{"border":"Montri borderon de kadro (frame)","noUrl":"Bonvolu entajpi la retadreson de la ligilo al la enlinia kadro (IFrame)","scrolling":"Ebligi rulumskalon","title":"Atributoj de la enlinia kadro (IFrame)","toolbar":"Enlinia kadro (IFrame)"},"image":{"alt":"Anstataŭiga Teksto","border":"Bordero","btnUpload":"Sendu al Servilo","button2Img":"Ĉu vi volas transformi la selektitan bildbutonon en simplan bildon?","hSpace":"Horizontala Spaco","img2Button":"Ĉu vi volas transformi la selektitan bildon en bildbutonon?","infoTab":"Informoj pri Bildo","linkTab":"Ligilo","lockRatio":"Konservi Proporcion","menu":"Atributoj de Bildo","resetSize":"Origina Grando","title":"Atributoj de Bildo","titleButton":"Bildbutonaj Atributoj","upload":"Alŝuti","urlMissing":"La fontretadreso de la bildo mankas.","vSpace":"Vertikala Spaco","validateBorder":"La bordero devas esti entjera nombro.","validateHSpace":"La horizontala spaco devas esti entjera nombro.","validateVSpace":"La vertikala spaco devas esti entjera nombro."},"indent":{"indent":"Pligrandigi Krommarĝenon","outdent":"Malpligrandigi Krommarĝenon"},"smiley":{"options":"Opcioj pri mienvinjetoj","title":"Enmeti Mienvinjeton","toolbar":"Mienvinjeto"},"justify":{"block":"Ĝisrandigi Ambaŭflanke","center":"Centrigi","left":"Ĝisrandigi maldekstren","right":"Ĝisrandigi dekstren"},"language":{"button":"Instali lingvon","remove":"Forigi lingvon"},"link":{"acccessKey":"Fulmoklavo","advanced":"Speciala","advisoryContentType":"Enhavotipo","advisoryTitle":"Priskriba Titolo","anchor":{"toolbar":"Ankro","menu":"Enmeti/Ŝanĝi Ankron","title":"Ankraj Atributoj","name":"Ankra Nomo","errorName":"Bv entajpi la ankran nomon","remove":"Forigi Ankron"},"anchorId":"Per Elementidentigilo","anchorName":"Per Ankronomo","charset":"Signaro de la Ligita Rimedo","cssClasses":"Klasoj de Stilfolioj","download":"Force Download","displayText":"Display Text","emailAddress":"Retpoŝto","emailBody":"Mesaĝa korpo","emailSubject":"Mesaĝa Temo","id":"Id","info":"Informoj pri la Ligilo","langCode":"Lingva Kodo","langDir":"Skribdirekto","langDirLTR":"De maldekstro dekstren (LTR)","langDirRTL":"De dekstro maldekstren (RTL)","menu":"Ŝanĝi Ligilon","name":"Nomo","noAnchors":"<Ne disponeblas ankroj en la dokumento>","noEmail":"Bonvolu entajpi la retpoŝtadreson","noUrl":"Bonvolu entajpi la URL-on","other":"<alia>","popupDependent":"Dependa (Netscape)","popupFeatures":"Atributoj de la Ŝprucfenestro","popupFullScreen":"Tutekrane (IE)","popupLeft":"Maldekstra Pozicio","popupLocationBar":"Adresobreto","popupMenuBar":"Menubreto","popupResizable":"Dimensiŝanĝebla","popupScrollBars":"Rulumskaloj","popupStatusBar":"Statobreto","popupToolbar":"Ilobreto","popupTop":"Supra Pozicio","rel":"Rilato","selectAnchor":"Elekti Ankron","styles":"Stilo","tabIndex":"Taba Indekso","target":"Celo","targetFrame":"<kadro>","targetFrameName":"Nomo de CelKadro","targetPopup":"<ŝprucfenestro>","targetPopupName":"Nomo de Ŝprucfenestro","title":"Ligilo","toAnchor":"Ankri en tiu ĉi paĝo","toEmail":"Retpoŝto","toUrl":"URL","toolbar":"Enmeti/Ŝanĝi Ligilon","type":"Tipo de Ligilo","unlink":"Forigi Ligilon","upload":"Alŝuti"},"list":{"bulletedlist":"Bula Listo","numberedlist":"Numera Listo"},"liststyle":{"armenian":"Armena nombrado","bulletedTitle":"Atributoj de Bula Listo","circle":"Cirklo","decimal":"Dekumaj Nombroj (1, 2, 3, ktp.)","decimalLeadingZero":"Dekumaj Nombroj malantaŭ nulo (01, 02, 03, ktp.)","disc":"Disko","georgian":"Gruza nombrado (an, ban, gan, ktp.)","lowerAlpha":"Minusklaj Literoj (a, b, c, d, e, ktp.)","lowerGreek":"Grekaj Minusklaj Literoj (alpha, beta, gamma, ktp.)","lowerRoman":"Minusklaj Romanaj Nombroj (i, ii, iii, iv, v, ktp.)","none":"Neniu","notset":"<Defaŭlta>","numberedTitle":"Atributoj de Numera Listo","square":"kvadrato","start":"Komenco","type":"Tipo","upperAlpha":"Majusklaj Literoj (A, B, C, D, E, ktp.)","upperRoman":"Majusklaj Romanaj Nombroj (I, II, III, IV, V, ktp.)","validateStartNumber":"La unua listero devas esti entjera nombro."},"magicline":{"title":"Enmeti paragrafon ĉi-tien"},"maximize":{"maximize":"Pligrandigi","minimize":"Malgrandigi"},"newpage":{"toolbar":"Nova Paĝo"},"pagebreak":{"alt":"Paĝavanco","toolbar":"Enmeti Paĝavancon por Presado"},"pastetext":{"button":"Interglui kiel platan tekston","title":"Interglui kiel platan tekston"},"pastefromword":{"confirmCleanup":"La teksto, kiun vi volas interglui, ŝajnas esti kopiita el Word. Ĉu vi deziras purigi ĝin antaŭ intergluo?","error":"Ne eblis purigi la intergluitajn datenojn pro interna eraro","title":"Interglui el Word","toolbar":"Interglui el Word"},"preview":{"preview":"Vidigi Aspekton"},"print":{"toolbar":"Presi"},"removeformat":{"toolbar":"Forigi Formaton"},"save":{"toolbar":"Konservi"},"selectall":{"toolbar":"Elekti ĉion"},"showblocks":{"toolbar":"Montri la blokojn"},"sourcearea":{"toolbar":"Fonto"},"specialchar":{"options":"Opcioj pri Specialaj Signoj","title":"Selekti Specialan Signon","toolbar":"Enmeti Specialan Signon"},"scayt":{"btn_about":"Pri OKDVT","btn_dictionaries":"Vortaroj","btn_disable":"Malebligi OKDVT","btn_enable":"Ebligi OKDVT","btn_langs":"Lingvoj","btn_options":"Opcioj","text_title":"OrtografiKontrolado Dum Vi Tajpas (OKDVT)"},"stylescombo":{"label":"Stiloj","panelTitle":"Stiloj pri enpaĝigo","panelTitle1":"Stiloj de blokoj","panelTitle2":"Enliniaj Stiloj","panelTitle3":"Stiloj de objektoj"},"table":{"border":"Bordero","caption":"Tabeltitolo","cell":{"menu":"Ĉelo","insertBefore":"Enmeti Ĉelon Antaŭ","insertAfter":"Enmeti Ĉelon Post","deleteCell":"Forigi la Ĉelojn","merge":"Kunfandi la Ĉelojn","mergeRight":"Kunfandi dekstren","mergeDown":"Kunfandi malsupren ","splitHorizontal":"Horizontale dividi","splitVertical":"Vertikale dividi","title":"Ĉelatributoj","cellType":"Ĉeltipo","rowSpan":"Kunfando de linioj","colSpan":"Kunfando de kolumnoj","wordWrap":"Cezuro","hAlign":"Horizontala ĝisrandigo","vAlign":"Vertikala ĝisrandigo","alignBaseline":"Malsupro de la teksto","bgColor":"Fonkoloro","borderColor":"Borderkoloro","data":"Datenoj","header":"Supra paĝotitolo","yes":"Jes","no":"No","invalidWidth":"Ĉellarĝo devas esti nombro.","invalidHeight":"Ĉelalto devas esti nombro.","invalidRowSpan":"Kunfando de linioj devas esti entjera nombro.","invalidColSpan":"Kunfando de kolumnoj devas esti entjera nombro.","chooseColor":"Elektu"},"cellPad":"Interna Marĝeno de la ĉeloj","cellSpace":"Spaco inter la Ĉeloj","column":{"menu":"Kolumno","insertBefore":"Enmeti kolumnon antaŭ","insertAfter":"Enmeti kolumnon post","deleteColumn":"Forigi Kolumnojn"},"columns":"Kolumnoj","deleteTable":"Forigi Tabelon","headers":"Supraj Paĝotitoloj","headersBoth":"Ambaŭ","headersColumn":"Unua kolumno","headersNone":"Neniu","headersRow":"Unua linio","invalidBorder":"La bordergrando devas esti nombro.","invalidCellPadding":"La interna marĝeno en la ĉeloj devas esti pozitiva nombro.","invalidCellSpacing":"La spaco inter la ĉeloj devas esti pozitiva nombro.","invalidCols":"La nombro de la kolumnoj devas superi 0.","invalidHeight":"La tabelalto devas esti nombro.","invalidRows":"La nombro de la linioj devas superi 0.","invalidWidth":"La tabellarĝo devas esti nombro.","menu":"Atributoj de Tabelo","row":{"menu":"Linio","insertBefore":"Enmeti linion antaŭ","insertAfter":"Enmeti linion post","deleteRow":"Forigi Liniojn"},"rows":"Linioj","summary":"Resumo","title":"Atributoj de Tabelo","toolbar":"Tabelo","widthPc":"elcentoj","widthPx":"Rastrumeroj","widthUnit":"unuo de larĝo"},"undo":{"redo":"Refari","undo":"Malfari"},"wsc":{"btnIgnore":"Ignori","btnIgnoreAll":"Ignori Ĉion","btnReplace":"Anstataŭigi","btnReplaceAll":"Anstataŭigi Ĉion","btnUndo":"Malfari","changeTo":"Ŝanĝi al","errorLoading":"Eraro en la servoelŝuto el la gastiga komputiko: %s.","ieSpellDownload":"Ortografikontrolilo ne instalita. Ĉu vi volas elŝuti ĝin nun?","manyChanges":"Ortografikontrolado finita: %1 vortoj korektitaj","noChanges":"Ortografikontrolado finita: neniu vorto korektita","noMispell":"Ortografikontrolado finita: neniu eraro trovita","noSuggestions":"- Neniu propono -","notAvailable":"Bedaŭrinde la servo ne funkcias nuntempe.","notInDic":"Ne trovita en la vortaro","oneChange":"Ortografikontrolado finita: unu vorto korektita","progress":"La ortografio estas kontrolata...","title":"Kontroli la ortografion","toolbar":"Kontroli la ortografion"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/es.js b/htdocs/includes/ckeditor/ckeditor/lang/es.js
index 35e7e9e36d4..af192c9e4bf 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/es.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/es.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['es']={"editor":"Editor de texto enriquecido","editorPanel":"Panel del Editor de Texto Enriquecido","common":{"editorHelp":"Pulse ALT 0 para ayuda","browseServer":"Ver Servidor","url":"URL","protocol":"Protocolo","upload":"Cargar","uploadSubmit":"Enviar al Servidor","image":"Imagen","flash":"Flash","form":"Formulario","checkbox":"Casilla de Verificación","radio":"Botones de Radio","textField":"Campo de Texto","textarea":"Area de Texto","hiddenField":"Campo Oculto","button":"Botón","select":"Campo de Selección","imageButton":"Botón Imagen","notSet":"<No definido>","id":"Id","name":"Nombre","langDir":"Orientación","langDirLtr":"Izquierda a Derecha (LTR)","langDirRtl":"Derecha a Izquierda (RTL)","langCode":"Cód. de idioma","longDescr":"Descripción larga URL","cssClass":"Clases de hojas de estilo","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Cerrar","preview":"Previsualización","resize":"Arrastre para redimensionar","generalTab":"General","advancedTab":"Avanzado","validateNumberFailed":"El valor no es un número.","confirmNewPage":"Cualquier cambio que no se haya guardado se perderá.\r\n¿Está seguro de querer crear una nueva página?","confirmCancel":"Algunas de las opciones se han cambiado.\r\n¿Está seguro de querer cerrar el diálogo?","options":"Opciones","target":"Destino","targetNew":"Nueva ventana (_blank)","targetTop":"Ventana principal (_top)","targetSelf":"Misma ventana (_self)","targetParent":"Ventana padre (_parent)","langDirLTR":"Izquierda a derecha (LTR)","langDirRTL":"Derecha a izquierda (RTL)","styles":"Estilos","cssClasses":"Clase de la hoja de estilos","width":"Anchura","height":"Altura","align":"Alineación","alignLeft":"Izquierda","alignRight":"Derecha","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Tope","alignMiddle":"Centro","alignBottom":"Pie","alignNone":"Ninguno","invalidValue":"Valor no válido","invalidHeight":"Altura debe ser un número.","invalidWidth":"Anchura debe ser un número.","invalidCssLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida HTML válida (px o %).","invalidInlineStyle":"El valor especificado para el estilo debe consistir en uno o más pares con el formato \"nombre: valor\", separados por punto y coma.","cssLengthTooltip":"Introduca un número para el valor en pixels o un número con una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>"},"about":{"copy":"Copyright &copy; $1. Todos los derechos reservados.","dlgTitle":"Acerca de CKEditor","help":"Lea la  $1 para resolver sus dudas.","moreInfo":"Para información de licencia, por favor visite nuestro sitio web:","title":"Acerca de CKEditor","userGuide":"Guía de usuario de CKEditor"},"basicstyles":{"bold":"Negrita","italic":"Cursiva","strike":"Tachado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subrayado"},"bidi":{"ltr":"Dirección del texto de izquierda a derecha","rtl":"Dirección del texto de derecha a izquierda"},"blockquote":{"toolbar":"Cita"},"clipboard":{"copy":"Copiar","copyError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado.\r\nPor favor use el teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado.\r\nPor favor use el teclado (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Zona de pegado","pasteMsg":"Por favor pegue dentro del cuadro utilizando el teclado (<STRONG>Ctrl/Cmd+V</STRONG>);\r\nluego presione <STRONG>Aceptar</STRONG>.","securityMsg":"Debido a la configuración de seguridad de su navegador, el editor no tiene acceso al portapapeles.\r\nEs necesario que lo pegue de nuevo en esta ventana.","title":"Pegar"},"button":{"selectedLabel":"%1 (Seleccionado)"},"colorbutton":{"auto":"Automático","bgColorTitle":"Color de Fondo","colors":{"000":"Negro","800000":"Marrón oscuro","8B4513":"Marrón tierra","2F4F4F":"Pizarra Oscuro","008080":"Azul verdoso","000080":"Azul marino","4B0082":"Añil","696969":"Gris oscuro","B22222":"Ladrillo","A52A2A":"Marrón","DAA520":"Oro oscuro","006400":"Verde oscuro","40E0D0":"Turquesa","0000CD":"Azul medio-oscuro","800080":"Púrpura","808080":"Gris","F00":"Rojo","FF8C00":"Naranja oscuro","FFD700":"Oro","008000":"Verde","0FF":"Cian","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Gris medio","FFA07A":"Salmón claro","FFA500":"Naranja","FFFF00":"Amarillo","00FF00":"Lima","AFEEEE":"Turquesa claro","ADD8E6":"Azul claro","DDA0DD":"Violeta claro","D3D3D3":"Gris claro","FFF0F5":"Lavanda rojizo","FAEBD7":"Blanco antiguo","FFFFE0":"Amarillo claro","F0FFF0":"Miel","F0FFFF":"Azul celeste","F0F8FF":"Azul pálido","E6E6FA":"Lavanda","FFF":"Blanco"},"more":"Más Colores...","panelTitle":"Colores","textColorTitle":"Color de Texto"},"colordialog":{"clear":"Borrar","highlight":"Muestra","options":"Opciones de colores","selected":"Elegido","title":"Elegir color"},"templates":{"button":"Plantillas","emptyListMsg":"(No hay plantillas definidas)","insertOption":"Reemplazar el contenido actual","options":"Opciones de plantillas","selectPromptMsg":"Por favor selecciona la plantilla a abrir en el editor<br>(el contenido actual se perderá):","title":"Contenido de Plantillas"},"contextmenu":{"options":"Opciones del menú contextual"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Título","cssClassInputLabel":"Clase de hoja de estilos","edit":"Editar Div","inlineStyleInputLabel":"Estilo","langDirLTRLabel":"Izquierda a Derecha (LTR)","langDirLabel":"Orientación","langDirRTLLabel":"Derecha a Izquierda (RTL)","languageCodeInputLabel":" Codigo de idioma","remove":"Quitar Div","styleSelectLabel":"Estilo","title":"Crear contenedor DIV","toolbar":"Crear contenedor DIV"},"toolbar":{"toolbarCollapse":"Contraer barra de herramientas","toolbarExpand":"Expandir barra de herramientas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeles/Deshacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Párrafo","links":"Enlaces","insert":"Insertar","styles":"Estilos","colors":"Colores","tools":"Herramientas"},"toolbars":"Barras de herramientas del editor"},"elementspath":{"eleLabel":"Ruta de los elementos","eleTitle":"%1 elemento"},"find":{"find":"Buscar","findOptions":"Opciones de búsqueda","findWhat":"Texto a buscar:","matchCase":"Coincidir may/min","matchCyclic":"Buscar en todo el contenido","matchWord":"Coincidir toda la palabra","notFoundMsg":"El texto especificado no ha sido encontrado.","replace":"Reemplazar","replaceAll":"Reemplazar Todo","replaceSuccessMsg":"La expresión buscada ha sido reemplazada %1 veces.","replaceWith":"Reemplazar con:","title":"Buscar y Reemplazar"},"fakeobjects":{"anchor":"Ancla","flash":"Animación flash","hiddenfield":"Campo oculto","iframe":"IFrame","unknown":"Objeto desconocido"},"flash":{"access":"Acceso de scripts","accessAlways":"Siempre","accessNever":"Nunca","accessSameDomain":"Mismo dominio","alignAbsBottom":"Abs inferior","alignAbsMiddle":"Abs centro","alignBaseline":"Línea de base","alignTextTop":"Tope del texto","bgcolor":"Color de Fondo","chkFull":"Permitir pantalla completa","chkLoop":"Repetir","chkMenu":"Activar Menú Flash","chkPlay":"Autoejecución","flashvars":"Opciones","hSpace":"Esp.Horiz","properties":"Propiedades de Flash","propertiesTab":"Propiedades","quality":"Calidad","qualityAutoHigh":"Auto Alta","qualityAutoLow":"Auto Baja","qualityBest":"La mejor","qualityHigh":"Alta","qualityLow":"Baja","qualityMedium":"Media","scale":"Escala","scaleAll":"Mostrar todo","scaleFit":"Ajustado","scaleNoBorder":"Sin Borde","title":"Propiedades de Flash","vSpace":"Esp.Vert","validateHSpace":"Esp.Horiz debe ser un número.","validateSrc":"Por favor escriba el vínculo URL","validateVSpace":"Esp.Vert debe ser un número.","windowMode":"WindowMode","windowModeOpaque":"Opaco","windowModeTransparent":"Transparente","windowModeWindow":"Ventana"},"font":{"fontSize":{"label":"Tamaño","voiceLabel":"Tamaño de fuente","panelTitle":"Tamaño"},"label":"Fuente","panelTitle":"Fuente","voiceLabel":"Fuente"},"forms":{"button":{"title":"Propiedades de Botón","text":"Texto (Valor)","type":"Tipo","typeBtn":"Boton","typeSbm":"Enviar","typeRst":"Reestablecer"},"checkboxAndRadio":{"checkboxTitle":"Propiedades de Casilla","radioTitle":"Propiedades de Botón de Radio","value":"Valor","selected":"Seleccionado","required":"Required"},"form":{"title":"Propiedades de Formulario","menu":"Propiedades de Formulario","action":"Acción","method":"Método","encoding":"Codificación"},"hidden":{"title":"Propiedades de Campo Oculto","name":"Nombre","value":"Valor"},"select":{"title":"Propiedades de Campo de Selección","selectInfo":"Información","opAvail":"Opciones disponibles","value":"Valor","size":"Tamaño","lines":"Lineas","chkMulti":"Permitir múltiple selección","required":"Required","opText":"Texto","opValue":"Valor","btnAdd":"Agregar","btnModify":"Modificar","btnUp":"Subir","btnDown":"Bajar","btnSetValue":"Establecer como predeterminado","btnDelete":"Eliminar"},"textarea":{"title":"Propiedades de Area de Texto","cols":"Columnas","rows":"Filas"},"textfield":{"title":"Propiedades de Campo de Texto","name":"Nombre","value":"Valor","charWidth":"Caracteres de ancho","maxChars":"Máximo caracteres","required":"Required","type":"Tipo","typeText":"Texto","typePass":"Contraseña","typeEmail":"Correo electrónico","typeSearch":"Buscar","typeTel":"Número de teléfono","typeUrl":"URL"}},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Dirección","tag_div":"Normal (DIV)","tag_h1":"Encabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Con formato"},"horizontalrule":{"toolbar":"Insertar Línea Horizontal"},"iframe":{"border":"Mostrar borde del marco","noUrl":"Por favor, escriba la dirección del iframe","scrolling":"Activar barras de desplazamiento","title":"Propiedades de iframe","toolbar":"IFrame"},"image":{"alt":"Texto Alternativo","border":"Borde","btnUpload":"Enviar al Servidor","button2Img":"¿Desea convertir el botón de imagen en una simple imagen?","hSpace":"Esp.Horiz","img2Button":"¿Desea convertir la imagen en un botón de imagen?","infoTab":"Información de Imagen","linkTab":"Vínculo","lockRatio":"Proporcional","menu":"Propiedades de Imagen","resetSize":"Tamaño Original","title":"Propiedades de Imagen","titleButton":"Propiedades de Botón de Imagen","upload":"Cargar","urlMissing":"Debe indicar la URL de la imagen.","vSpace":"Esp.Vert","validateBorder":"El borde debe ser un número.","validateHSpace":"El espaciado horizontal debe ser un número.","validateVSpace":"El espaciado vertical debe ser un número."},"indent":{"indent":"Aumentar Sangría","outdent":"Disminuir Sangría"},"smiley":{"options":"Opciones de emoticonos","title":"Insertar un Emoticon","toolbar":"Emoticonos"},"justify":{"block":"Justificado","center":"Centrar","left":"Alinear a Izquierda","right":"Alinear a Derecha"},"language":{"button":"Fijar lenguaje","remove":"Quitar lenguaje"},"link":{"acccessKey":"Tecla de Acceso","advanced":"Avanzado","advisoryContentType":"Tipo de Contenido","advisoryTitle":"Título","anchor":{"toolbar":"Referencia","menu":"Propiedades de Referencia","title":"Propiedades de Referencia","name":"Nombre de la Referencia","errorName":"Por favor, complete el nombre de la Referencia","remove":"Quitar Referencia"},"anchorId":"Por ID de elemento","anchorName":"Por Nombre de Referencia","charset":"Fuente de caracteres vinculado","cssClasses":"Clases de hojas de estilo","emailAddress":"Dirección de E-Mail","emailBody":"Cuerpo del Mensaje","emailSubject":"Título del Mensaje","id":"Id","info":"Información de Vínculo","langCode":"Código idioma","langDir":"Orientación","langDirLTR":"Izquierda a Derecha (LTR)","langDirRTL":"Derecha a Izquierda (RTL)","menu":"Editar Vínculo","name":"Nombre","noAnchors":"(No hay referencias disponibles en el documento)","noEmail":"Por favor escriba la dirección de e-mail","noUrl":"Por favor escriba el vínculo URL","other":"<otro>","popupDependent":"Dependiente (Netscape)","popupFeatures":"Características de Ventana Emergente","popupFullScreen":"Pantalla Completa (IE)","popupLeft":"Posición Izquierda","popupLocationBar":"Barra de ubicación","popupMenuBar":"Barra de Menú","popupResizable":"Redimensionable","popupScrollBars":"Barras de desplazamiento","popupStatusBar":"Barra de Estado","popupToolbar":"Barra de Herramientas","popupTop":"Posición Derecha","rel":"Relación","selectAnchor":"Seleccionar una referencia","styles":"Estilo","tabIndex":"Indice de tabulación","target":"Destino","targetFrame":"<marco>","targetFrameName":"Nombre del Marco Destino","targetPopup":"<ventana emergente>","targetPopupName":"Nombre de Ventana Emergente","title":"Vínculo","toAnchor":"Referencia en esta página","toEmail":"E-Mail","toUrl":"URL","toolbar":"Insertar/Editar Vínculo","type":"Tipo de vínculo","unlink":"Eliminar Vínculo","upload":"Cargar"},"list":{"bulletedlist":"Viñetas","numberedlist":"Numeración"},"liststyle":{"armenian":"Numeración armenia","bulletedTitle":"Propiedades de viñetas","circle":"Círculo","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal con cero inicial (01, 02, 03, etc.)","disc":"Disco","georgian":"Numeración georgiana (an, ban, gan, etc.)","lowerAlpha":"Alfabeto en minúsculas (a, b, c, d, e, etc.)","lowerGreek":"Letras griegas (alpha, beta, gamma, etc.)","lowerRoman":"Números romanos en minúsculas (i, ii, iii, iv, v, etc.)","none":"Ninguno","notset":"<sin establecer>","numberedTitle":"Propiedades de lista numerada","square":"Cuadrado","start":"Inicio","type":"Tipo","upperAlpha":"Alfabeto en mayúsculas  (A, B, C, D, E, etc.)","upperRoman":"Números romanos en mayúsculas (I, II, III, IV, V, etc.)","validateStartNumber":"El Inicio debe ser un número entero."},"magicline":{"title":"Insertar párrafo aquí"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"newpage":{"toolbar":"Nueva Página"},"pagebreak":{"alt":"Salto de página","toolbar":"Insertar Salto de Página"},"pastetext":{"button":"Pegar como Texto Plano","title":"Pegar como Texto Plano"},"pastefromword":{"confirmCleanup":"El texto que desea parece provenir de Word.\r\n¿Desea depurarlo antes de pegarlo?","error":"No ha sido posible limpiar los datos debido a un error interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"preview":{"preview":"Vista Previa"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Eliminar Formato"},"save":{"toolbar":"Guardar"},"selectall":{"toolbar":"Seleccionar Todo"},"showblocks":{"toolbar":"Mostrar bloques"},"sourcearea":{"toolbar":"Fuente HTML"},"specialchar":{"options":"Opciones de caracteres especiales","title":"Seleccione un caracter especial","toolbar":"Insertar Caracter Especial"},"scayt":{"btn_about":"Acerca de Corrector","btn_dictionaries":"Diccionarios","btn_disable":"Desactivar Corrector","btn_enable":"Activar Corrector","btn_langs":"Idiomas","btn_options":"Opciones","text_title":"Comprobar Ortografía Mientras Escribe"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos para formatear","panelTitle1":"Estilos de párrafo","panelTitle2":"Estilos de carácter","panelTitle3":"Estilos de objeto"},"table":{"border":"Tamaño de Borde","caption":"Título","cell":{"menu":"Celda","insertBefore":"Insertar celda a la izquierda","insertAfter":"Insertar celda a la derecha","deleteCell":"Eliminar Celdas","merge":"Combinar Celdas","mergeRight":"Combinar a la derecha","mergeDown":"Combinar hacia abajo","splitHorizontal":"Dividir la celda horizontalmente","splitVertical":"Dividir la celda verticalmente","title":"Propiedades de celda","cellType":"Tipo de Celda","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Ajustar al contenido","hAlign":"Alineación Horizontal","vAlign":"Alineación Vertical","alignBaseline":"Linea de base","bgColor":"Color de fondo","borderColor":"Color de borde","data":"Datos","header":"Encabezado","yes":"Sí","no":"No","invalidWidth":"La anchura de celda debe ser un número.","invalidHeight":"La altura de celda debe ser un número.","invalidRowSpan":"La expansión de filas debe ser un número entero.","invalidColSpan":"La expansión de columnas debe ser un número entero.","chooseColor":"Elegir"},"cellPad":"Esp. interior","cellSpace":"Esp. e/celdas","column":{"menu":"Columna","insertBefore":"Insertar columna a la izquierda","insertAfter":"Insertar columna a la derecha","deleteColumn":"Eliminar Columnas"},"columns":"Columnas","deleteTable":"Eliminar Tabla","headers":"Encabezados","headersBoth":"Ambas","headersColumn":"Primera columna","headersNone":"Ninguno","headersRow":"Primera fila","invalidBorder":"El tamaño del borde debe ser un número.","invalidCellPadding":"El espaciado interior debe ser un número.","invalidCellSpacing":"El espaciado entre celdas debe ser un número.","invalidCols":"El número de columnas debe ser un número mayor que 0.","invalidHeight":"La altura de tabla debe ser un número.","invalidRows":"El número de filas debe ser un número mayor que 0.","invalidWidth":"La anchura de tabla debe ser un número.","menu":"Propiedades de Tabla","row":{"menu":"Fila","insertBefore":"Insertar fila en la parte superior","insertAfter":"Insertar fila en la parte inferior","deleteRow":"Eliminar Filas"},"rows":"Filas","summary":"Síntesis","title":"Propiedades de Tabla","toolbar":"Tabla","widthPc":"porcentaje","widthPx":"pixeles","widthUnit":"unidad de la anchura"},"undo":{"redo":"Rehacer","undo":"Deshacer"},"wsc":{"btnIgnore":"Ignorar","btnIgnoreAll":"Ignorar Todo","btnReplace":"Reemplazar","btnReplaceAll":"Reemplazar Todo","btnUndo":"Deshacer","changeTo":"Cambiar a","errorLoading":"Error cargando la aplicación del servidor: %s.","ieSpellDownload":"Módulo de Control de Ortografía no instalado.\r\n¿Desea descargarlo ahora?","manyChanges":"Control finalizado: se ha cambiado %1 palabras","noChanges":"Control finalizado: no se ha cambiado ninguna palabra","noMispell":"Control finalizado: no se encontraron errores","noSuggestions":"- No hay sugerencias -","notAvailable":"Lo sentimos pero el servicio no está disponible.","notInDic":"No se encuentra en el Diccionario","oneChange":"Control finalizado: se ha cambiado una palabra","progress":"Control de Ortografía en progreso...","title":"Comprobar ortografía","toolbar":"Ortografía"}};
\ No newline at end of file
+CKEDITOR.lang['es']={"editor":"Editor de texto enriquecido","editorPanel":"Panel del Editor de Texto Enriquecido","common":{"editorHelp":"Pulse ALT 0 para ayuda","browseServer":"Ver Servidor","url":"URL","protocol":"Protocolo","upload":"Cargar","uploadSubmit":"Enviar al Servidor","image":"Imagen","flash":"Flash","form":"Formulario","checkbox":"Casilla de Verificación","radio":"Botones de Radio","textField":"Campo de Texto","textarea":"Area de Texto","hiddenField":"Campo Oculto","button":"Botón","select":"Campo de Selección","imageButton":"Botón Imagen","notSet":"<No definido>","id":"Id","name":"Nombre","langDir":"Orientación","langDirLtr":"Izquierda a Derecha (LTR)","langDirRtl":"Derecha a Izquierda (RTL)","langCode":"Cód. de idioma","longDescr":"Descripción larga URL","cssClass":"Clases de hojas de estilo","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Cerrar","preview":"Previsualización","resize":"Arrastre para redimensionar","generalTab":"General","advancedTab":"Avanzado","validateNumberFailed":"El valor no es un número.","confirmNewPage":"Cualquier cambio que no se haya guardado se perderá.\r\n¿Está seguro de querer crear una nueva página?","confirmCancel":"Algunas de las opciones se han cambiado.\r\n¿Está seguro de querer cerrar el diálogo?","options":"Opciones","target":"Destino","targetNew":"Nueva ventana (_blank)","targetTop":"Ventana principal (_top)","targetSelf":"Misma ventana (_self)","targetParent":"Ventana padre (_parent)","langDirLTR":"Izquierda a derecha (LTR)","langDirRTL":"Derecha a izquierda (RTL)","styles":"Estilos","cssClasses":"Clase de la hoja de estilos","width":"Anchura","height":"Altura","align":"Alineación","alignLeft":"Izquierda","alignRight":"Derecha","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Tope","alignMiddle":"Centro","alignBottom":"Pie","alignNone":"Ninguno","invalidValue":"Valor no válido","invalidHeight":"Altura debe ser un número.","invalidWidth":"Anchura debe ser un número.","invalidCssLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida HTML válida (px o %).","invalidInlineStyle":"El valor especificado para el estilo debe consistir en uno o más pares con el formato \"nombre: valor\", separados por punto y coma.","cssLengthTooltip":"Introduca un número para el valor en pixels o un número con una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>","keyboard":{"8":"Retroceso","13":"Ingresar","16":"Mayús.","17":"Ctrl","18":"Alt","32":"Space","35":"Fin","36":"Inicio","46":"Suprimir","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Todos los derechos reservados.","dlgTitle":"Acerca de CKEditor","help":"Lea la  $1 para resolver sus dudas.","moreInfo":"Para información de licencia, por favor visite nuestro sitio web:","title":"Acerca de CKEditor","userGuide":"Guía de usuario de CKEditor"},"basicstyles":{"bold":"Negrita","italic":"Cursiva","strike":"Tachado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subrayado"},"bidi":{"ltr":"Dirección del texto de izquierda a derecha","rtl":"Dirección del texto de derecha a izquierda"},"blockquote":{"toolbar":"Cita"},"clipboard":{"copy":"Copiar","copyError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado.\r\nPor favor use el teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado.\r\nPor favor use el teclado (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Zona de pegado","pasteMsg":"Por favor pegue dentro del cuadro utilizando el teclado (<STRONG>Ctrl/Cmd+V</STRONG>);\r\nluego presione <STRONG>Aceptar</STRONG>.","securityMsg":"Debido a la configuración de seguridad de su navegador, el editor no tiene acceso al portapapeles.\r\nEs necesario que lo pegue de nuevo en esta ventana.","title":"Pegar"},"button":{"selectedLabel":"%1 (Seleccionado)"},"colorbutton":{"auto":"Automático","bgColorTitle":"Color de Fondo","colors":{"000":"Negro","800000":"Marrón oscuro","8B4513":"Marrón tierra","2F4F4F":"Pizarra Oscuro","008080":"Azul verdoso","000080":"Azul marino","4B0082":"Añil","696969":"Gris oscuro","B22222":"Ladrillo","A52A2A":"Marrón","DAA520":"Oro oscuro","006400":"Verde oscuro","40E0D0":"Turquesa","0000CD":"Azul medio-oscuro","800080":"Púrpura","808080":"Gris","F00":"Rojo","FF8C00":"Naranja oscuro","FFD700":"Oro","008000":"Verde","0FF":"Cian","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Gris medio","FFA07A":"Salmón claro","FFA500":"Naranja","FFFF00":"Amarillo","00FF00":"Lima","AFEEEE":"Turquesa claro","ADD8E6":"Azul claro","DDA0DD":"Violeta claro","D3D3D3":"Gris claro","FFF0F5":"Lavanda rojizo","FAEBD7":"Blanco antiguo","FFFFE0":"Amarillo claro","F0FFF0":"Miel","F0FFFF":"Azul celeste","F0F8FF":"Azul pálido","E6E6FA":"Lavanda","FFF":"Blanco","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Más Colores...","panelTitle":"Colores","textColorTitle":"Color de Texto"},"colordialog":{"clear":"Borrar","highlight":"Muestra","options":"Opciones de colores","selected":"Elegido","title":"Elegir color"},"templates":{"button":"Plantillas","emptyListMsg":"(No hay plantillas definidas)","insertOption":"Reemplazar el contenido actual","options":"Opciones de plantillas","selectPromptMsg":"Por favor selecciona la plantilla a abrir en el editor<br>(el contenido actual se perderá):","title":"Contenido de Plantillas"},"contextmenu":{"options":"Opciones del menú contextual"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Título","cssClassInputLabel":"Clase de hoja de estilos","edit":"Editar Div","inlineStyleInputLabel":"Estilo","langDirLTRLabel":"Izquierda a Derecha (LTR)","langDirLabel":"Orientación","langDirRTLLabel":"Derecha a Izquierda (RTL)","languageCodeInputLabel":" Codigo de idioma","remove":"Quitar Div","styleSelectLabel":"Estilo","title":"Crear contenedor DIV","toolbar":"Crear contenedor DIV"},"toolbar":{"toolbarCollapse":"Contraer barra de herramientas","toolbarExpand":"Expandir barra de herramientas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeles/Deshacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Párrafo","links":"Enlaces","insert":"Insertar","styles":"Estilos","colors":"Colores","tools":"Herramientas"},"toolbars":"Barras de herramientas del editor"},"elementspath":{"eleLabel":"Ruta de los elementos","eleTitle":"%1 elemento"},"find":{"find":"Buscar","findOptions":"Opciones de búsqueda","findWhat":"Texto a buscar:","matchCase":"Coincidir may/min","matchCyclic":"Buscar en todo el contenido","matchWord":"Coincidir toda la palabra","notFoundMsg":"El texto especificado no ha sido encontrado.","replace":"Reemplazar","replaceAll":"Reemplazar Todo","replaceSuccessMsg":"La expresión buscada ha sido reemplazada %1 veces.","replaceWith":"Reemplazar con:","title":"Buscar y Reemplazar"},"fakeobjects":{"anchor":"Ancla","flash":"Animación flash","hiddenfield":"Campo oculto","iframe":"IFrame","unknown":"Objeto desconocido"},"flash":{"access":"Acceso de scripts","accessAlways":"Siempre","accessNever":"Nunca","accessSameDomain":"Mismo dominio","alignAbsBottom":"Abs inferior","alignAbsMiddle":"Abs centro","alignBaseline":"Línea de base","alignTextTop":"Tope del texto","bgcolor":"Color de Fondo","chkFull":"Permitir pantalla completa","chkLoop":"Repetir","chkMenu":"Activar Menú Flash","chkPlay":"Autoejecución","flashvars":"Opciones","hSpace":"Esp.Horiz","properties":"Propiedades de Flash","propertiesTab":"Propiedades","quality":"Calidad","qualityAutoHigh":"Auto Alta","qualityAutoLow":"Auto Baja","qualityBest":"La mejor","qualityHigh":"Alta","qualityLow":"Baja","qualityMedium":"Media","scale":"Escala","scaleAll":"Mostrar todo","scaleFit":"Ajustado","scaleNoBorder":"Sin Borde","title":"Propiedades de Flash","vSpace":"Esp.Vert","validateHSpace":"Esp.Horiz debe ser un número.","validateSrc":"Por favor escriba el vínculo URL","validateVSpace":"Esp.Vert debe ser un número.","windowMode":"WindowMode","windowModeOpaque":"Opaco","windowModeTransparent":"Transparente","windowModeWindow":"Ventana"},"font":{"fontSize":{"label":"Tamaño","voiceLabel":"Tamaño de fuente","panelTitle":"Tamaño"},"label":"Fuente","panelTitle":"Fuente","voiceLabel":"Fuente"},"forms":{"button":{"title":"Propiedades de Botón","text":"Texto (Valor)","type":"Tipo","typeBtn":"Boton","typeSbm":"Enviar","typeRst":"Reestablecer"},"checkboxAndRadio":{"checkboxTitle":"Propiedades de Casilla","radioTitle":"Propiedades de Botón de Radio","value":"Valor","selected":"Seleccionado","required":"Requerido"},"form":{"title":"Propiedades de Formulario","menu":"Propiedades de Formulario","action":"Acción","method":"Método","encoding":"Codificación"},"hidden":{"title":"Propiedades de Campo Oculto","name":"Nombre","value":"Valor"},"select":{"title":"Propiedades de Campo de Selección","selectInfo":"Información","opAvail":"Opciones disponibles","value":"Valor","size":"Tamaño","lines":"Lineas","chkMulti":"Permitir múltiple selección","required":"Requerido","opText":"Texto","opValue":"Valor","btnAdd":"Agregar","btnModify":"Modificar","btnUp":"Subir","btnDown":"Bajar","btnSetValue":"Establecer como predeterminado","btnDelete":"Eliminar"},"textarea":{"title":"Propiedades de Area de Texto","cols":"Columnas","rows":"Filas"},"textfield":{"title":"Propiedades de Campo de Texto","name":"Nombre","value":"Valor","charWidth":"Caracteres de ancho","maxChars":"Máximo caracteres","required":"Requerido","type":"Tipo","typeText":"Texto","typePass":"Contraseña","typeEmail":"Correo electrónico","typeSearch":"Buscar","typeTel":"Número de teléfono","typeUrl":"URL"}},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Dirección","tag_div":"Normal (DIV)","tag_h1":"Encabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Con formato"},"horizontalrule":{"toolbar":"Insertar Línea Horizontal"},"iframe":{"border":"Mostrar borde del marco","noUrl":"Por favor, escriba la dirección del iframe","scrolling":"Activar barras de desplazamiento","title":"Propiedades de iframe","toolbar":"IFrame"},"image":{"alt":"Texto Alternativo","border":"Borde","btnUpload":"Enviar al Servidor","button2Img":"¿Desea convertir el botón de imagen en una simple imagen?","hSpace":"Esp.Horiz","img2Button":"¿Desea convertir la imagen en un botón de imagen?","infoTab":"Información de Imagen","linkTab":"Vínculo","lockRatio":"Proporcional","menu":"Propiedades de Imagen","resetSize":"Tamaño Original","title":"Propiedades de Imagen","titleButton":"Propiedades de Botón de Imagen","upload":"Cargar","urlMissing":"Debe indicar la URL de la imagen.","vSpace":"Esp.Vert","validateBorder":"El borde debe ser un número.","validateHSpace":"El espaciado horizontal debe ser un número.","validateVSpace":"El espaciado vertical debe ser un número."},"indent":{"indent":"Aumentar Sangría","outdent":"Disminuir Sangría"},"smiley":{"options":"Opciones de emoticonos","title":"Insertar un Emoticon","toolbar":"Emoticonos"},"justify":{"block":"Justificado","center":"Centrar","left":"Alinear a Izquierda","right":"Alinear a Derecha"},"language":{"button":"Fijar lenguaje","remove":"Quitar lenguaje"},"link":{"acccessKey":"Tecla de Acceso","advanced":"Avanzado","advisoryContentType":"Tipo de Contenido","advisoryTitle":"Título","anchor":{"toolbar":"Referencia","menu":"Propiedades de Referencia","title":"Propiedades de Referencia","name":"Nombre de la Referencia","errorName":"Por favor, complete el nombre de la Referencia","remove":"Quitar Referencia"},"anchorId":"Por ID de elemento","anchorName":"Por Nombre de Referencia","charset":"Fuente de caracteres vinculado","cssClasses":"Clases de hojas de estilo","download":"Force Download","displayText":"Display Text","emailAddress":"Dirección de E-Mail","emailBody":"Cuerpo del Mensaje","emailSubject":"Título del Mensaje","id":"Id","info":"Información de Vínculo","langCode":"Código idioma","langDir":"Orientación","langDirLTR":"Izquierda a Derecha (LTR)","langDirRTL":"Derecha a Izquierda (RTL)","menu":"Editar Vínculo","name":"Nombre","noAnchors":"(No hay referencias disponibles en el documento)","noEmail":"Por favor escriba la dirección de e-mail","noUrl":"Por favor escriba el vínculo URL","other":"<otro>","popupDependent":"Dependiente (Netscape)","popupFeatures":"Características de Ventana Emergente","popupFullScreen":"Pantalla Completa (IE)","popupLeft":"Posición Izquierda","popupLocationBar":"Barra de ubicación","popupMenuBar":"Barra de Menú","popupResizable":"Redimensionable","popupScrollBars":"Barras de desplazamiento","popupStatusBar":"Barra de Estado","popupToolbar":"Barra de Herramientas","popupTop":"Posición Derecha","rel":"Relación","selectAnchor":"Seleccionar una referencia","styles":"Estilo","tabIndex":"Indice de tabulación","target":"Destino","targetFrame":"<marco>","targetFrameName":"Nombre del Marco Destino","targetPopup":"<ventana emergente>","targetPopupName":"Nombre de Ventana Emergente","title":"Vínculo","toAnchor":"Referencia en esta página","toEmail":"E-Mail","toUrl":"URL","toolbar":"Insertar/Editar Vínculo","type":"Tipo de vínculo","unlink":"Eliminar Vínculo","upload":"Cargar"},"list":{"bulletedlist":"Viñetas","numberedlist":"Numeración"},"liststyle":{"armenian":"Numeración armenia","bulletedTitle":"Propiedades de viñetas","circle":"Círculo","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal con cero inicial (01, 02, 03, etc.)","disc":"Disco","georgian":"Numeración georgiana (an, ban, gan, etc.)","lowerAlpha":"Alfabeto en minúsculas (a, b, c, d, e, etc.)","lowerGreek":"Letras griegas (alpha, beta, gamma, etc.)","lowerRoman":"Números romanos en minúsculas (i, ii, iii, iv, v, etc.)","none":"Ninguno","notset":"<sin establecer>","numberedTitle":"Propiedades de lista numerada","square":"Cuadrado","start":"Inicio","type":"Tipo","upperAlpha":"Alfabeto en mayúsculas  (A, B, C, D, E, etc.)","upperRoman":"Números romanos en mayúsculas (I, II, III, IV, V, etc.)","validateStartNumber":"El Inicio debe ser un número entero."},"magicline":{"title":"Insertar párrafo aquí"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"newpage":{"toolbar":"Nueva Página"},"pagebreak":{"alt":"Salto de página","toolbar":"Insertar Salto de Página"},"pastetext":{"button":"Pegar como Texto Plano","title":"Pegar como Texto Plano"},"pastefromword":{"confirmCleanup":"El texto que desea parece provenir de Word.\r\n¿Desea depurarlo antes de pegarlo?","error":"No ha sido posible limpiar los datos debido a un error interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"preview":{"preview":"Vista Previa"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Eliminar Formato"},"save":{"toolbar":"Guardar"},"selectall":{"toolbar":"Seleccionar Todo"},"showblocks":{"toolbar":"Mostrar bloques"},"sourcearea":{"toolbar":"Fuente HTML"},"specialchar":{"options":"Opciones de caracteres especiales","title":"Seleccione un caracter especial","toolbar":"Insertar Caracter Especial"},"scayt":{"btn_about":"Acerca de Corrector","btn_dictionaries":"Diccionarios","btn_disable":"Desactivar Corrector","btn_enable":"Activar Corrector","btn_langs":"Idiomas","btn_options":"Opciones","text_title":"Comprobar Ortografía Mientras Escribe"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos para formatear","panelTitle1":"Estilos de párrafo","panelTitle2":"Estilos de carácter","panelTitle3":"Estilos de objeto"},"table":{"border":"Tamaño de Borde","caption":"Título","cell":{"menu":"Celda","insertBefore":"Insertar celda a la izquierda","insertAfter":"Insertar celda a la derecha","deleteCell":"Eliminar Celdas","merge":"Combinar Celdas","mergeRight":"Combinar a la derecha","mergeDown":"Combinar hacia abajo","splitHorizontal":"Dividir la celda horizontalmente","splitVertical":"Dividir la celda verticalmente","title":"Propiedades de celda","cellType":"Tipo de Celda","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Ajustar al contenido","hAlign":"Alineación Horizontal","vAlign":"Alineación Vertical","alignBaseline":"Linea de base","bgColor":"Color de fondo","borderColor":"Color de borde","data":"Datos","header":"Encabezado","yes":"Sí","no":"No","invalidWidth":"La anchura de celda debe ser un número.","invalidHeight":"La altura de celda debe ser un número.","invalidRowSpan":"La expansión de filas debe ser un número entero.","invalidColSpan":"La expansión de columnas debe ser un número entero.","chooseColor":"Elegir"},"cellPad":"Esp. interior","cellSpace":"Esp. e/celdas","column":{"menu":"Columna","insertBefore":"Insertar columna a la izquierda","insertAfter":"Insertar columna a la derecha","deleteColumn":"Eliminar Columnas"},"columns":"Columnas","deleteTable":"Eliminar Tabla","headers":"Encabezados","headersBoth":"Ambas","headersColumn":"Primera columna","headersNone":"Ninguno","headersRow":"Primera fila","invalidBorder":"El tamaño del borde debe ser un número.","invalidCellPadding":"El espaciado interior debe ser un número.","invalidCellSpacing":"El espaciado entre celdas debe ser un número.","invalidCols":"El número de columnas debe ser un número mayor que 0.","invalidHeight":"La altura de tabla debe ser un número.","invalidRows":"El número de filas debe ser un número mayor que 0.","invalidWidth":"La anchura de tabla debe ser un número.","menu":"Propiedades de Tabla","row":{"menu":"Fila","insertBefore":"Insertar fila en la parte superior","insertAfter":"Insertar fila en la parte inferior","deleteRow":"Eliminar Filas"},"rows":"Filas","summary":"Síntesis","title":"Propiedades de Tabla","toolbar":"Tabla","widthPc":"porcentaje","widthPx":"pixeles","widthUnit":"unidad de la anchura"},"undo":{"redo":"Rehacer","undo":"Deshacer"},"wsc":{"btnIgnore":"Ignorar","btnIgnoreAll":"Ignorar Todo","btnReplace":"Reemplazar","btnReplaceAll":"Reemplazar Todo","btnUndo":"Deshacer","changeTo":"Cambiar a","errorLoading":"Error cargando la aplicación del servidor: %s.","ieSpellDownload":"Módulo de Control de Ortografía no instalado.\r\n¿Desea descargarlo ahora?","manyChanges":"Control finalizado: se ha cambiado %1 palabras","noChanges":"Control finalizado: no se ha cambiado ninguna palabra","noMispell":"Control finalizado: no se encontraron errores","noSuggestions":"- No hay sugerencias -","notAvailable":"Lo sentimos pero el servicio no está disponible.","notInDic":"No se encuentra en el Diccionario","oneChange":"Control finalizado: se ha cambiado una palabra","progress":"Control de Ortografía en progreso...","title":"Comprobar ortografía","toolbar":"Ortografía"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/et.js b/htdocs/includes/ckeditor/ckeditor/lang/et.js
index 91c2d9783fe..571ad171e30 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/et.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/et.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['et']={"editor":"Rikkalik tekstiredaktor","editorPanel":"Rikkaliku tekstiredaktori paneel","common":{"editorHelp":"Abi saamiseks vajuta ALT 0","browseServer":"Serveri sirvimine","url":"URL","protocol":"Protokoll","upload":"Laadi üles","uploadSubmit":"Saada serverisse","image":"Pilt","flash":"Flash","form":"Vorm","checkbox":"Märkeruut","radio":"Raadionupp","textField":"Tekstilahter","textarea":"Tekstiala","hiddenField":"Varjatud lahter","button":"Nupp","select":"Valiklahter","imageButton":"Piltnupp","notSet":"<määramata>","id":"ID","name":"Nimi","langDir":"Keele suund","langDirLtr":"Vasakult paremale (LTR)","langDirRtl":"Paremalt vasakule (RTL)","langCode":"Keele kood","longDescr":"Pikk kirjeldus URL","cssClass":"Stiilistiku klassid","advisoryTitle":"Soovituslik pealkiri","cssStyle":"Laad","ok":"Olgu","cancel":"Loobu","close":"Sulge","preview":"Eelvaade","resize":"Suuruse muutmiseks lohista","generalTab":"Üldine","advancedTab":"Täpsemalt","validateNumberFailed":"See väärtus pole number.","confirmNewPage":"Kõik salvestamata muudatused lähevad kaotsi. Kas oled kindel, et tahad laadida uue lehe?","confirmCancel":"Mõned valikud on muudetud. Kas oled kindel, et tahad dialoogi sulgeda?","options":"Valikud","target":"Sihtkoht","targetNew":"Uus aken (_blank)","targetTop":"Kõige ülemine aken (_top)","targetSelf":"Sama aken (_self)","targetParent":"Vanemaken (_parent)","langDirLTR":"Vasakult paremale (LTR)","langDirRTL":"Paremalt vasakule (RTL)","styles":"Stiili","cssClasses":"Stiililehe klassid","width":"Laius","height":"Kõrgus","align":"Joondus","alignLeft":"Vasak","alignRight":"Paremale","alignCenter":"Kesk","alignJustify":"Rööpjoondus","alignTop":"Üles","alignMiddle":"Keskele","alignBottom":"Alla","alignNone":"None","invalidValue":"Vigane väärtus.","invalidHeight":"Kõrgus peab olema number.","invalidWidth":"Laius peab olema number.","invalidCssLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv CSS ühikuga (px, %, in, cm, mm, em, ex, pt või pc) või ilma.","invalidHtmlLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv HTML ühikuga (px või %) või ilma.","invalidInlineStyle":"Reasisese stiili määrangud peavad koosnema paarisväärtustest (tuples), mis on semikoolonitega eraldatult järgnevas vormingus: \"nimi : väärtus\".","cssLengthTooltip":"Sisesta väärtus pikslites või number koos sobiva CSS-i ühikuga (px, %, in, cm, mm, em, ex, pt või pc).","unavailable":"%1<span class=\"cke_accessibility\">, pole saadaval</span>"},"about":{"copy":"Copyright &copy; $1. Kõik õigused kaitstud.","dlgTitle":"CKEditorist","help":"Abi jaoks vaata $1.","moreInfo":"Litsentsi andmed leiab meie veebilehelt:","title":"CKEditorist","userGuide":"CKEditori kasutusjuhendit"},"basicstyles":{"bold":"Paks","italic":"Kursiiv","strike":"Läbijoonitud","subscript":"Allindeks","superscript":"Ülaindeks","underline":"Allajoonitud"},"bidi":{"ltr":"Teksti suund vasakult paremale","rtl":"Teksti suund paremalt vasakule"},"blockquote":{"toolbar":"Blokktsitaat"},"clipboard":{"copy":"Kopeeri","copyError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+C).","cut":"Lõika","cutError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt lõigata. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+X).","paste":"Aseta","pasteArea":"Asetamise ala","pasteMsg":"Palun aseta tekst järgnevasse kasti kasutades klaviatuuri klahvikombinatsiooni (<STRONG>Ctrl/Cmd+V</STRONG>) ja vajuta seejärel <STRONG>OK</STRONG>.","securityMsg":"Sinu veebisirvija turvaseadete tõttu ei oma redaktor otsest ligipääsu lõikelaua andmetele. Sa pead asetama need uuesti siia aknasse.","title":"Asetamine"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automaatne","bgColorTitle":"Tausta värv","colors":{"000":"Must","800000":"Kastanpruun","8B4513":"Sadulapruun","2F4F4F":"Tume paehall","008080":"Sinakasroheline","000080":"Meresinine","4B0082":"Indigosinine","696969":"Tumehall","B22222":"Šamottkivi","A52A2A":"Pruun","DAA520":"Kuldkollane","006400":"Tumeroheline","40E0D0":"Türkiissinine","0000CD":"Keskmine sinine","800080":"Lilla","808080":"Hall","F00":"Punanae","FF8C00":"Tumeoranž","FFD700":"Kuldne","008000":"Roheline","0FF":"Tsüaniidsinine","00F":"Sinine","EE82EE":"Violetne","A9A9A9":"Tuhm hall","FFA07A":"Hele lõhe","FFA500":"Oranž","FFFF00":"Kollane","00FF00":"Lubja hall","AFEEEE":"Kahvatu türkiis","ADD8E6":"Helesinine","DDA0DD":"Ploomililla","D3D3D3":"Helehall","FFF0F5":"Lavendlipunane","FAEBD7":"Antiikvalge","FFFFE0":"Helekollane","F0FFF0":"Meloniroheline","F0FFFF":"Taevasinine","F0F8FF":"Beebisinine","E6E6FA":"Lavendel","FFF":"Valge"},"more":"Rohkem värve...","panelTitle":"Värvid","textColorTitle":"Teksti värv"},"colordialog":{"clear":"Eemalda","highlight":"Näidis","options":"Värvi valikud","selected":"Valitud värv","title":"Värvi valimine"},"templates":{"button":"Mall","emptyListMsg":"(Ühtegi malli ei ole defineeritud)","insertOption":"Praegune sisu asendatakse","options":"Malli valikud","selectPromptMsg":"Palun vali mall, mis avada redaktoris<br />(praegune sisu läheb kaotsi):","title":"Sisumallid"},"contextmenu":{"options":"Kontekstimenüü valikud"},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Soovitatav pealkiri","cssClassInputLabel":"Stiililehe klassid","edit":"Muuda Div","inlineStyleInputLabel":"Reasisene stiil","langDirLTRLabel":"Vasakult paremale (LTR)","langDirLabel":"Keele suund","langDirRTLLabel":"Paremalt vasakule (RTL)","languageCodeInputLabel":" Keelekood","remove":"Eemalda Div","styleSelectLabel":"Stiil","title":"Div-konteineri loomine","toolbar":"Div-konteineri loomine"},"toolbar":{"toolbarCollapse":"Tööriistariba peitmine","toolbarExpand":"Tööriistariba näitamine","toolbarGroups":{"document":"Dokument","clipboard":"Lõikelaud/tagasivõtmine","editing":"Muutmine","forms":"Vormid","basicstyles":"Põhistiilid","paragraph":"Lõik","links":"Lingid","insert":"Sisesta","styles":"Stiilid","colors":"Värvid","tools":"Tööriistad"},"toolbars":"Redaktori tööriistaribad"},"elementspath":{"eleLabel":"Elementide asukoht","eleTitle":"%1 element"},"find":{"find":"Otsi","findOptions":"Otsingu valikud","findWhat":"Otsitav:","matchCase":"Suur- ja väiketähtede eristamine","matchCyclic":"Jätkatakse algusest","matchWord":"Ainult terved sõnad","notFoundMsg":"Otsitud teksti ei leitud.","replace":"Asenda","replaceAll":"Asenda kõik","replaceSuccessMsg":"%1 vastet asendati.","replaceWith":"Asendus:","title":"Otsimine ja asendamine"},"fakeobjects":{"anchor":"Ankur","flash":"Flashi animatsioon","hiddenfield":"Varjatud väli","iframe":"IFrame","unknown":"Tundmatu objekt"},"flash":{"access":"Skriptide ligipääs","accessAlways":"Kõigile","accessNever":"Mitte ühelegi","accessSameDomain":"Samalt domeenilt","alignAbsBottom":"Abs alla","alignAbsMiddle":"Abs keskele","alignBaseline":"Baasjoonele","alignTextTop":"Tekstist üles","bgcolor":"Tausta värv","chkFull":"Täisekraan lubatud","chkLoop":"Korduv","chkMenu":"Flashi menüü lubatud","chkPlay":"Automaatne start ","flashvars":"Flashi muutujad","hSpace":"H. vaheruum","properties":"Flashi omadused","propertiesTab":"Omadused","quality":"Kvaliteet","qualityAutoHigh":"Automaatne kõrge","qualityAutoLow":"Automaatne madal","qualityBest":"Parim","qualityHigh":"Kõrge","qualityLow":"Madal","qualityMedium":"Keskmine","scale":"Mastaap","scaleAll":"Näidatakse kõike","scaleFit":"Täpne sobivus","scaleNoBorder":"Äärist ei ole","title":"Flashi omadused","vSpace":"V. vaheruum","validateHSpace":"H. vaheruum peab olema number.","validateSrc":"Palun kirjuta lingi URL","validateVSpace":"V. vaheruum peab olema number.","windowMode":"Akna režiim","windowModeOpaque":"Läbipaistmatu","windowModeTransparent":"Läbipaistev","windowModeWindow":"Aken"},"font":{"fontSize":{"label":"Suurus","voiceLabel":"Kirja suurus","panelTitle":"Suurus"},"label":"Kiri","panelTitle":"Kiri","voiceLabel":"Kiri"},"forms":{"button":{"title":"Nupu omadused","text":"Tekst (väärtus)","type":"Liik","typeBtn":"Nupp","typeSbm":"Saada","typeRst":"Lähtesta"},"checkboxAndRadio":{"checkboxTitle":"Märkeruudu omadused","radioTitle":"Raadionupu omadused","value":"Väärtus","selected":"Märgitud","required":"Required"},"form":{"title":"Vormi omadused","menu":"Vormi omadused","action":"Toiming","method":"Meetod","encoding":"Kodeering"},"hidden":{"title":"Varjatud lahtri omadused","name":"Nimi","value":"Väärtus"},"select":{"title":"Valiklahtri omadused","selectInfo":"Info","opAvail":"Võimalikud valikud:","value":"Väärtus","size":"Suurus","lines":"ridu","chkMulti":"Võimalik mitu valikut","required":"Required","opText":"Tekst","opValue":"Väärtus","btnAdd":"Lisa","btnModify":"Muuda","btnUp":"Üles","btnDown":"Alla","btnSetValue":"Määra vaikimisi","btnDelete":"Kustuta"},"textarea":{"title":"Tekstiala omadused","cols":"Veerge","rows":"Ridu"},"textfield":{"title":"Tekstilahtri omadused","name":"Nimi","value":"Väärtus","charWidth":"Laius (tähemärkides)","maxChars":"Maksimaalselt tähemärke","required":"Required","type":"Liik","typeText":"Tekst","typePass":"Parool","typeEmail":"E-mail","typeSearch":"Otsi","typeTel":"Telefon","typeUrl":"URL"}},"format":{"label":"Vorming","panelTitle":"Vorming","tag_address":"Aadress","tag_div":"Tavaline (DIV)","tag_h1":"Pealkiri 1","tag_h2":"Pealkiri 2","tag_h3":"Pealkiri 3","tag_h4":"Pealkiri 4","tag_h5":"Pealkiri 5","tag_h6":"Pealkiri 6","tag_p":"Tavaline","tag_pre":"Vormindatud"},"horizontalrule":{"toolbar":"Horisontaaljoone sisestamine"},"iframe":{"border":"Raami äärise näitamine","noUrl":"Vali iframe URLi liik","scrolling":"Kerimisribade lubamine","title":"IFrame omadused","toolbar":"IFrame"},"image":{"alt":"Alternatiivne tekst","border":"Joon","btnUpload":"Saada serverisse","button2Img":"Kas tahad teisendada valitud pildiga nupu tavaliseks pildiks?","hSpace":"H. vaheruum","img2Button":"Kas tahad teisendada valitud tavalise pildi pildiga nupuks?","infoTab":"Pildi info","linkTab":"Link","lockRatio":"Lukusta kuvasuhe","menu":"Pildi omadused","resetSize":"Lähtesta suurus","title":"Pildi omadused","titleButton":"Piltnupu omadused","upload":"Lae üles","urlMissing":"Pildi lähte-URL on puudu.","vSpace":"V. vaheruum","validateBorder":"Äärise laius peab olema täisarv.","validateHSpace":"Horisontaalne vaheruum peab olema täisarv.","validateVSpace":"Vertikaalne vaheruum peab olema täisarv."},"indent":{"indent":"Taande suurendamine","outdent":"Taande vähendamine"},"smiley":{"options":"Emotikonide valikud","title":"Sisesta emotikon","toolbar":"Emotikon"},"justify":{"block":"Rööpjoondus","center":"Keskjoondus","left":"Vasakjoondus","right":"Paremjoondus"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Juurdepääsu võti","advanced":"Täpsemalt","advisoryContentType":"Juhendava sisu tüüp","advisoryTitle":"Juhendav tiitel","anchor":{"toolbar":"Ankru sisestamine/muutmine","menu":"Ankru omadused","title":"Ankru omadused","name":"Ankru nimi","errorName":"Palun sisesta ankru nimi","remove":"Eemalda ankur"},"anchorId":"Elemendi id järgi","anchorName":"Ankru nime järgi","charset":"Lingitud ressursi märgistik","cssClasses":"Stiilistiku klassid","emailAddress":"E-posti aadress","emailBody":"Sõnumi tekst","emailSubject":"Sõnumi teema","id":"ID","info":"Lingi info","langCode":"Keele suund","langDir":"Keele suund","langDirLTR":"Vasakult paremale (LTR)","langDirRTL":"Paremalt vasakule (RTL)","menu":"Muuda linki","name":"Nimi","noAnchors":"(Selles dokumendis pole ankruid)","noEmail":"Palun kirjuta e-posti aadress","noUrl":"Palun kirjuta lingi URL","other":"<muu>","popupDependent":"Sõltuv (Netscape)","popupFeatures":"Hüpikakna omadused","popupFullScreen":"Täisekraan (IE)","popupLeft":"Vasak asukoht","popupLocationBar":"Aadressiriba","popupMenuBar":"Menüüriba","popupResizable":"Suurust saab muuta","popupScrollBars":"Kerimisribad","popupStatusBar":"Olekuriba","popupToolbar":"Tööriistariba","popupTop":"Ülemine asukoht","rel":"Suhe","selectAnchor":"Vali ankur","styles":"Laad","tabIndex":"Tab indeks","target":"Sihtkoht","targetFrame":"<raam>","targetFrameName":"Sihtmärk raami nimi","targetPopup":"<hüpikaken>","targetPopupName":"Hüpikakna nimi","title":"Link","toAnchor":"Ankur sellel lehel","toEmail":"E-post","toUrl":"URL","toolbar":"Lingi lisamine/muutmine","type":"Lingi liik","unlink":"Lingi eemaldamine","upload":"Lae üles"},"list":{"bulletedlist":"Punktloend","numberedlist":"Numberloend"},"liststyle":{"armenian":"Armeenia numbrid","bulletedTitle":"Punktloendi omadused","circle":"Ring","decimal":"Numbrid (1, 2, 3, jne)","decimalLeadingZero":"Numbrid algusnulliga (01, 02, 03, jne)","disc":"Täpp","georgian":"Gruusia numbrid (an, ban, gan, jne)","lowerAlpha":"Väiketähed (a, b, c, d, e, jne)","lowerGreek":"Kreeka väiketähed (alpha, beta, gamma, jne)","lowerRoman":"Väiksed rooma numbrid (i, ii, iii, iv, v, jne)","none":"Puudub","notset":"<pole määratud>","numberedTitle":"Numberloendi omadused","square":"Ruut","start":"Algus","type":"Liik","upperAlpha":"Suurtähed (A, B, C, D, E, jne)","upperRoman":"Suured rooma numbrid (I, II, III, IV, V, jne)","validateStartNumber":"Loendi algusnumber peab olema täisarv."},"magicline":{"title":"Sisesta siia lõigu tekst"},"maximize":{"maximize":"Maksimeerimine","minimize":"Minimeerimine"},"newpage":{"toolbar":"Uus leht"},"pagebreak":{"alt":"Lehevahetuskoht","toolbar":"Lehevahetuskoha sisestamine"},"pastetext":{"button":"Asetamine tavalise tekstina","title":"Asetamine tavalise tekstina"},"pastefromword":{"confirmCleanup":"Tekst, mida tahad asetada näib pärinevat Wordist. Kas tahad selle enne asetamist puhastada?","error":"Asetatud andmete puhastamine ei olnud sisemise vea tõttu võimalik","title":"Asetamine Wordist","toolbar":"Asetamine Wordist"},"preview":{"preview":"Eelvaade"},"print":{"toolbar":"Printimine"},"removeformat":{"toolbar":"Vormingu eemaldamine"},"save":{"toolbar":"Salvestamine"},"selectall":{"toolbar":"Kõige valimine"},"showblocks":{"toolbar":"Blokkide näitamine"},"sourcearea":{"toolbar":"Lähtekood"},"specialchar":{"options":"Erimärkide valikud","title":"Erimärgi valimine","toolbar":"Erimärgi sisestamine"},"scayt":{"btn_about":"SCAYT-ist lähemalt","btn_dictionaries":"Sõnaraamatud","btn_disable":"SCAYT keelatud","btn_enable":"SCAYT lubatud","btn_langs":"Keeled","btn_options":"Valikud","text_title":"Õigekirjakontroll kirjutamise ajal"},"stylescombo":{"label":"Stiil","panelTitle":"Vormindusstiilid","panelTitle1":"Blokkstiilid","panelTitle2":"Reasisesed stiilid","panelTitle3":"Objektistiilid"},"table":{"border":"Joone suurus","caption":"Tabeli tiitel","cell":{"menu":"Lahter","insertBefore":"Sisesta lahter enne","insertAfter":"Sisesta lahter peale","deleteCell":"Eemalda lahtrid","merge":"Ühenda lahtrid","mergeRight":"Ühenda paremale","mergeDown":"Ühenda alla","splitHorizontal":"Poolita lahter horisontaalselt","splitVertical":"Poolita lahter vertikaalselt","title":"Lahtri omadused","cellType":"Lahtri liik","rowSpan":"Ridade vahe","colSpan":"Tulpade vahe","wordWrap":"Sõnade murdmine","hAlign":"Horisontaalne joondus","vAlign":"Vertikaalne joondus","alignBaseline":"Baasjoon","bgColor":"Tausta värv","borderColor":"Äärise värv","data":"Andmed","header":"Päis","yes":"Jah","no":"Ei","invalidWidth":"Lahtri laius peab olema number.","invalidHeight":"Lahtri kõrgus peab olema number.","invalidRowSpan":"Ridade vahe peab olema täisarv.","invalidColSpan":"Tulpade vahe peab olema täisarv.","chooseColor":"Vali"},"cellPad":"Lahtri täidis","cellSpace":"Lahtri vahe","column":{"menu":"Veerg","insertBefore":"Sisesta veerg enne","insertAfter":"Sisesta veerg peale","deleteColumn":"Eemalda veerud"},"columns":"Veerud","deleteTable":"Kustuta tabel","headers":"Päised","headersBoth":"Mõlemad","headersColumn":"Esimene tulp","headersNone":"Puudub","headersRow":"Esimene rida","invalidBorder":"Äärise suurus peab olema number.","invalidCellPadding":"Lahtrite polsterdus (padding) peab olema positiivne arv.","invalidCellSpacing":"Lahtrite vahe peab olema positiivne arv.","invalidCols":"Tulpade arv peab olema nullist suurem.","invalidHeight":"Tabeli kõrgus peab olema number.","invalidRows":"Ridade arv peab olema nullist suurem.","invalidWidth":"Tabeli laius peab olema number.","menu":"Tabeli omadused","row":{"menu":"Rida","insertBefore":"Sisesta rida enne","insertAfter":"Sisesta rida peale","deleteRow":"Eemalda read"},"rows":"Read","summary":"Kokkuvõte","title":"Tabeli omadused","toolbar":"Tabel","widthPc":"protsenti","widthPx":"pikslit","widthUnit":"laiuse ühik"},"undo":{"redo":"Toimingu kordamine","undo":"Tagasivõtmine"},"wsc":{"btnIgnore":"Ignoreeri","btnIgnoreAll":"Ignoreeri kõiki","btnReplace":"Asenda","btnReplaceAll":"Asenda kõik","btnUndo":"Võta tagasi","changeTo":"Muuda","errorLoading":"Viga rakenduse teenushosti laadimisel: %s.","ieSpellDownload":"Õigekirja kontrollija ei ole paigaldatud. Soovid sa selle alla laadida?","manyChanges":"Õigekirja kontroll sooritatud: %1 sõna muudetud","noChanges":"Õigekirja kontroll sooritatud: ühtegi sõna ei muudetud","noMispell":"Õigekirja kontroll sooritatud: õigekirjuvigu ei leitud","noSuggestions":"- Soovitused puuduvad -","notAvailable":"Kahjuks ei ole teenus praegu saadaval.","notInDic":"Puudub sõnastikust","oneChange":"Õigekirja kontroll sooritatud: üks sõna muudeti","progress":"Toimub õigekirja kontroll...","title":"Õigekirjakontroll","toolbar":"Õigekirjakontroll"}};
\ No newline at end of file
+CKEDITOR.lang['et']={"editor":"Rikkalik tekstiredaktor","editorPanel":"Rikkaliku tekstiredaktori paneel","common":{"editorHelp":"Abi saamiseks vajuta ALT 0","browseServer":"Serveri sirvimine","url":"URL","protocol":"Protokoll","upload":"Laadi üles","uploadSubmit":"Saada serverisse","image":"Pilt","flash":"Flash","form":"Vorm","checkbox":"Märkeruut","radio":"Raadionupp","textField":"Tekstilahter","textarea":"Tekstiala","hiddenField":"Varjatud lahter","button":"Nupp","select":"Valiklahter","imageButton":"Piltnupp","notSet":"<määramata>","id":"ID","name":"Nimi","langDir":"Keele suund","langDirLtr":"Vasakult paremale (LTR)","langDirRtl":"Paremalt vasakule (RTL)","langCode":"Keele kood","longDescr":"Pikk kirjeldus URL","cssClass":"Stiilistiku klassid","advisoryTitle":"Soovituslik pealkiri","cssStyle":"Laad","ok":"Olgu","cancel":"Loobu","close":"Sulge","preview":"Eelvaade","resize":"Suuruse muutmiseks lohista","generalTab":"Üldine","advancedTab":"Täpsemalt","validateNumberFailed":"See väärtus pole number.","confirmNewPage":"Kõik salvestamata muudatused lähevad kaotsi. Kas oled kindel, et tahad laadida uue lehe?","confirmCancel":"Mõned valikud on muudetud. Kas oled kindel, et tahad dialoogi sulgeda?","options":"Valikud","target":"Sihtkoht","targetNew":"Uus aken (_blank)","targetTop":"Kõige ülemine aken (_top)","targetSelf":"Sama aken (_self)","targetParent":"Vanemaken (_parent)","langDirLTR":"Vasakult paremale (LTR)","langDirRTL":"Paremalt vasakule (RTL)","styles":"Stiili","cssClasses":"Stiililehe klassid","width":"Laius","height":"Kõrgus","align":"Joondus","alignLeft":"Vasak","alignRight":"Paremale","alignCenter":"Kesk","alignJustify":"Rööpjoondus","alignTop":"Üles","alignMiddle":"Keskele","alignBottom":"Alla","alignNone":"None","invalidValue":"Vigane väärtus.","invalidHeight":"Kõrgus peab olema number.","invalidWidth":"Laius peab olema number.","invalidCssLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv CSS ühikuga (px, %, in, cm, mm, em, ex, pt või pc) või ilma.","invalidHtmlLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv HTML ühikuga (px või %) või ilma.","invalidInlineStyle":"Reasisese stiili määrangud peavad koosnema paarisväärtustest (tuples), mis on semikoolonitega eraldatult järgnevas vormingus: \"nimi : väärtus\".","cssLengthTooltip":"Sisesta väärtus pikslites või number koos sobiva CSS-i ühikuga (px, %, in, cm, mm, em, ex, pt või pc).","unavailable":"%1<span class=\"cke_accessibility\">, pole saadaval</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Kõik õigused kaitstud.","dlgTitle":"CKEditorist","help":"Abi jaoks vaata $1.","moreInfo":"Litsentsi andmed leiab meie veebilehelt:","title":"CKEditorist","userGuide":"CKEditori kasutusjuhendit"},"basicstyles":{"bold":"Paks","italic":"Kursiiv","strike":"Läbijoonitud","subscript":"Allindeks","superscript":"Ülaindeks","underline":"Allajoonitud"},"bidi":{"ltr":"Teksti suund vasakult paremale","rtl":"Teksti suund paremalt vasakule"},"blockquote":{"toolbar":"Blokktsitaat"},"clipboard":{"copy":"Kopeeri","copyError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+C).","cut":"Lõika","cutError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt lõigata. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+X).","paste":"Aseta","pasteArea":"Asetamise ala","pasteMsg":"Palun aseta tekst järgnevasse kasti kasutades klaviatuuri klahvikombinatsiooni (<STRONG>Ctrl/Cmd+V</STRONG>) ja vajuta seejärel <STRONG>OK</STRONG>.","securityMsg":"Sinu veebisirvija turvaseadete tõttu ei oma redaktor otsest ligipääsu lõikelaua andmetele. Sa pead asetama need uuesti siia aknasse.","title":"Asetamine"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automaatne","bgColorTitle":"Tausta värv","colors":{"000":"Must","800000":"Kastanpruun","8B4513":"Sadulapruun","2F4F4F":"Tume paehall","008080":"Sinakasroheline","000080":"Meresinine","4B0082":"Indigosinine","696969":"Tumehall","B22222":"Šamottkivi","A52A2A":"Pruun","DAA520":"Kuldkollane","006400":"Tumeroheline","40E0D0":"Türkiissinine","0000CD":"Keskmine sinine","800080":"Lilla","808080":"Hall","F00":"Punanae","FF8C00":"Tumeoranž","FFD700":"Kuldne","008000":"Roheline","0FF":"Tsüaniidsinine","00F":"Sinine","EE82EE":"Violetne","A9A9A9":"Tuhm hall","FFA07A":"Hele lõhe","FFA500":"Oranž","FFFF00":"Kollane","00FF00":"Lubja hall","AFEEEE":"Kahvatu türkiis","ADD8E6":"Helesinine","DDA0DD":"Ploomililla","D3D3D3":"Helehall","FFF0F5":"Lavendlipunane","FAEBD7":"Antiikvalge","FFFFE0":"Helekollane","F0FFF0":"Meloniroheline","F0FFFF":"Taevasinine","F0F8FF":"Beebisinine","E6E6FA":"Lavendel","FFF":"Valge","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Rohkem värve...","panelTitle":"Värvid","textColorTitle":"Teksti värv"},"colordialog":{"clear":"Eemalda","highlight":"Näidis","options":"Värvi valikud","selected":"Valitud värv","title":"Värvi valimine"},"templates":{"button":"Mall","emptyListMsg":"(Ühtegi malli ei ole defineeritud)","insertOption":"Praegune sisu asendatakse","options":"Malli valikud","selectPromptMsg":"Palun vali mall, mis avada redaktoris<br />(praegune sisu läheb kaotsi):","title":"Sisumallid"},"contextmenu":{"options":"Kontekstimenüü valikud"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Soovitatav pealkiri","cssClassInputLabel":"Stiililehe klassid","edit":"Muuda Div","inlineStyleInputLabel":"Reasisene stiil","langDirLTRLabel":"Vasakult paremale (LTR)","langDirLabel":"Keele suund","langDirRTLLabel":"Paremalt vasakule (RTL)","languageCodeInputLabel":" Keelekood","remove":"Eemalda Div","styleSelectLabel":"Stiil","title":"Div-konteineri loomine","toolbar":"Div-konteineri loomine"},"toolbar":{"toolbarCollapse":"Tööriistariba peitmine","toolbarExpand":"Tööriistariba näitamine","toolbarGroups":{"document":"Dokument","clipboard":"Lõikelaud/tagasivõtmine","editing":"Muutmine","forms":"Vormid","basicstyles":"Põhistiilid","paragraph":"Lõik","links":"Lingid","insert":"Sisesta","styles":"Stiilid","colors":"Värvid","tools":"Tööriistad"},"toolbars":"Redaktori tööriistaribad"},"elementspath":{"eleLabel":"Elementide asukoht","eleTitle":"%1 element"},"find":{"find":"Otsi","findOptions":"Otsingu valikud","findWhat":"Otsitav:","matchCase":"Suur- ja väiketähtede eristamine","matchCyclic":"Jätkatakse algusest","matchWord":"Ainult terved sõnad","notFoundMsg":"Otsitud teksti ei leitud.","replace":"Asenda","replaceAll":"Asenda kõik","replaceSuccessMsg":"%1 vastet asendati.","replaceWith":"Asendus:","title":"Otsimine ja asendamine"},"fakeobjects":{"anchor":"Ankur","flash":"Flashi animatsioon","hiddenfield":"Varjatud väli","iframe":"IFrame","unknown":"Tundmatu objekt"},"flash":{"access":"Skriptide ligipääs","accessAlways":"Kõigile","accessNever":"Mitte ühelegi","accessSameDomain":"Samalt domeenilt","alignAbsBottom":"Abs alla","alignAbsMiddle":"Abs keskele","alignBaseline":"Baasjoonele","alignTextTop":"Tekstist üles","bgcolor":"Tausta värv","chkFull":"Täisekraan lubatud","chkLoop":"Korduv","chkMenu":"Flashi menüü lubatud","chkPlay":"Automaatne start ","flashvars":"Flashi muutujad","hSpace":"H. vaheruum","properties":"Flashi omadused","propertiesTab":"Omadused","quality":"Kvaliteet","qualityAutoHigh":"Automaatne kõrge","qualityAutoLow":"Automaatne madal","qualityBest":"Parim","qualityHigh":"Kõrge","qualityLow":"Madal","qualityMedium":"Keskmine","scale":"Mastaap","scaleAll":"Näidatakse kõike","scaleFit":"Täpne sobivus","scaleNoBorder":"Äärist ei ole","title":"Flashi omadused","vSpace":"V. vaheruum","validateHSpace":"H. vaheruum peab olema number.","validateSrc":"Palun kirjuta lingi URL","validateVSpace":"V. vaheruum peab olema number.","windowMode":"Akna režiim","windowModeOpaque":"Läbipaistmatu","windowModeTransparent":"Läbipaistev","windowModeWindow":"Aken"},"font":{"fontSize":{"label":"Suurus","voiceLabel":"Kirja suurus","panelTitle":"Suurus"},"label":"Kiri","panelTitle":"Kiri","voiceLabel":"Kiri"},"forms":{"button":{"title":"Nupu omadused","text":"Tekst (väärtus)","type":"Liik","typeBtn":"Nupp","typeSbm":"Saada","typeRst":"Lähtesta"},"checkboxAndRadio":{"checkboxTitle":"Märkeruudu omadused","radioTitle":"Raadionupu omadused","value":"Väärtus","selected":"Märgitud","required":"Required"},"form":{"title":"Vormi omadused","menu":"Vormi omadused","action":"Toiming","method":"Meetod","encoding":"Kodeering"},"hidden":{"title":"Varjatud lahtri omadused","name":"Nimi","value":"Väärtus"},"select":{"title":"Valiklahtri omadused","selectInfo":"Info","opAvail":"Võimalikud valikud:","value":"Väärtus","size":"Suurus","lines":"ridu","chkMulti":"Võimalik mitu valikut","required":"Required","opText":"Tekst","opValue":"Väärtus","btnAdd":"Lisa","btnModify":"Muuda","btnUp":"Üles","btnDown":"Alla","btnSetValue":"Määra vaikimisi","btnDelete":"Kustuta"},"textarea":{"title":"Tekstiala omadused","cols":"Veerge","rows":"Ridu"},"textfield":{"title":"Tekstilahtri omadused","name":"Nimi","value":"Väärtus","charWidth":"Laius (tähemärkides)","maxChars":"Maksimaalselt tähemärke","required":"Required","type":"Liik","typeText":"Tekst","typePass":"Parool","typeEmail":"E-mail","typeSearch":"Otsi","typeTel":"Telefon","typeUrl":"URL"}},"format":{"label":"Vorming","panelTitle":"Vorming","tag_address":"Aadress","tag_div":"Tavaline (DIV)","tag_h1":"Pealkiri 1","tag_h2":"Pealkiri 2","tag_h3":"Pealkiri 3","tag_h4":"Pealkiri 4","tag_h5":"Pealkiri 5","tag_h6":"Pealkiri 6","tag_p":"Tavaline","tag_pre":"Vormindatud"},"horizontalrule":{"toolbar":"Horisontaaljoone sisestamine"},"iframe":{"border":"Raami äärise näitamine","noUrl":"Vali iframe URLi liik","scrolling":"Kerimisribade lubamine","title":"IFrame omadused","toolbar":"IFrame"},"image":{"alt":"Alternatiivne tekst","border":"Joon","btnUpload":"Saada serverisse","button2Img":"Kas tahad teisendada valitud pildiga nupu tavaliseks pildiks?","hSpace":"H. vaheruum","img2Button":"Kas tahad teisendada valitud tavalise pildi pildiga nupuks?","infoTab":"Pildi info","linkTab":"Link","lockRatio":"Lukusta kuvasuhe","menu":"Pildi omadused","resetSize":"Lähtesta suurus","title":"Pildi omadused","titleButton":"Piltnupu omadused","upload":"Lae üles","urlMissing":"Pildi lähte-URL on puudu.","vSpace":"V. vaheruum","validateBorder":"Äärise laius peab olema täisarv.","validateHSpace":"Horisontaalne vaheruum peab olema täisarv.","validateVSpace":"Vertikaalne vaheruum peab olema täisarv."},"indent":{"indent":"Taande suurendamine","outdent":"Taande vähendamine"},"smiley":{"options":"Emotikonide valikud","title":"Sisesta emotikon","toolbar":"Emotikon"},"justify":{"block":"Rööpjoondus","center":"Keskjoondus","left":"Vasakjoondus","right":"Paremjoondus"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Juurdepääsu võti","advanced":"Täpsemalt","advisoryContentType":"Juhendava sisu tüüp","advisoryTitle":"Juhendav tiitel","anchor":{"toolbar":"Ankru sisestamine/muutmine","menu":"Ankru omadused","title":"Ankru omadused","name":"Ankru nimi","errorName":"Palun sisesta ankru nimi","remove":"Eemalda ankur"},"anchorId":"Elemendi id järgi","anchorName":"Ankru nime järgi","charset":"Lingitud ressursi märgistik","cssClasses":"Stiilistiku klassid","download":"Force Download","displayText":"Display Text","emailAddress":"E-posti aadress","emailBody":"Sõnumi tekst","emailSubject":"Sõnumi teema","id":"ID","info":"Lingi info","langCode":"Keele suund","langDir":"Keele suund","langDirLTR":"Vasakult paremale (LTR)","langDirRTL":"Paremalt vasakule (RTL)","menu":"Muuda linki","name":"Nimi","noAnchors":"(Selles dokumendis pole ankruid)","noEmail":"Palun kirjuta e-posti aadress","noUrl":"Palun kirjuta lingi URL","other":"<muu>","popupDependent":"Sõltuv (Netscape)","popupFeatures":"Hüpikakna omadused","popupFullScreen":"Täisekraan (IE)","popupLeft":"Vasak asukoht","popupLocationBar":"Aadressiriba","popupMenuBar":"Menüüriba","popupResizable":"Suurust saab muuta","popupScrollBars":"Kerimisribad","popupStatusBar":"Olekuriba","popupToolbar":"Tööriistariba","popupTop":"Ülemine asukoht","rel":"Suhe","selectAnchor":"Vali ankur","styles":"Laad","tabIndex":"Tab indeks","target":"Sihtkoht","targetFrame":"<raam>","targetFrameName":"Sihtmärk raami nimi","targetPopup":"<hüpikaken>","targetPopupName":"Hüpikakna nimi","title":"Link","toAnchor":"Ankur sellel lehel","toEmail":"E-post","toUrl":"URL","toolbar":"Lingi lisamine/muutmine","type":"Lingi liik","unlink":"Lingi eemaldamine","upload":"Lae üles"},"list":{"bulletedlist":"Punktloend","numberedlist":"Numberloend"},"liststyle":{"armenian":"Armeenia numbrid","bulletedTitle":"Punktloendi omadused","circle":"Ring","decimal":"Numbrid (1, 2, 3, jne)","decimalLeadingZero":"Numbrid algusnulliga (01, 02, 03, jne)","disc":"Täpp","georgian":"Gruusia numbrid (an, ban, gan, jne)","lowerAlpha":"Väiketähed (a, b, c, d, e, jne)","lowerGreek":"Kreeka väiketähed (alpha, beta, gamma, jne)","lowerRoman":"Väiksed rooma numbrid (i, ii, iii, iv, v, jne)","none":"Puudub","notset":"<pole määratud>","numberedTitle":"Numberloendi omadused","square":"Ruut","start":"Algus","type":"Liik","upperAlpha":"Suurtähed (A, B, C, D, E, jne)","upperRoman":"Suured rooma numbrid (I, II, III, IV, V, jne)","validateStartNumber":"Loendi algusnumber peab olema täisarv."},"magicline":{"title":"Sisesta siia lõigu tekst"},"maximize":{"maximize":"Maksimeerimine","minimize":"Minimeerimine"},"newpage":{"toolbar":"Uus leht"},"pagebreak":{"alt":"Lehevahetuskoht","toolbar":"Lehevahetuskoha sisestamine"},"pastetext":{"button":"Asetamine tavalise tekstina","title":"Asetamine tavalise tekstina"},"pastefromword":{"confirmCleanup":"Tekst, mida tahad asetada näib pärinevat Wordist. Kas tahad selle enne asetamist puhastada?","error":"Asetatud andmete puhastamine ei olnud sisemise vea tõttu võimalik","title":"Asetamine Wordist","toolbar":"Asetamine Wordist"},"preview":{"preview":"Eelvaade"},"print":{"toolbar":"Printimine"},"removeformat":{"toolbar":"Vormingu eemaldamine"},"save":{"toolbar":"Salvestamine"},"selectall":{"toolbar":"Kõige valimine"},"showblocks":{"toolbar":"Blokkide näitamine"},"sourcearea":{"toolbar":"Lähtekood"},"specialchar":{"options":"Erimärkide valikud","title":"Erimärgi valimine","toolbar":"Erimärgi sisestamine"},"scayt":{"btn_about":"SCAYT-ist lähemalt","btn_dictionaries":"Sõnaraamatud","btn_disable":"SCAYT keelatud","btn_enable":"SCAYT lubatud","btn_langs":"Keeled","btn_options":"Valikud","text_title":"Õigekirjakontroll kirjutamise ajal"},"stylescombo":{"label":"Stiil","panelTitle":"Vormindusstiilid","panelTitle1":"Blokkstiilid","panelTitle2":"Reasisesed stiilid","panelTitle3":"Objektistiilid"},"table":{"border":"Joone suurus","caption":"Tabeli tiitel","cell":{"menu":"Lahter","insertBefore":"Sisesta lahter enne","insertAfter":"Sisesta lahter peale","deleteCell":"Eemalda lahtrid","merge":"Ühenda lahtrid","mergeRight":"Ühenda paremale","mergeDown":"Ühenda alla","splitHorizontal":"Poolita lahter horisontaalselt","splitVertical":"Poolita lahter vertikaalselt","title":"Lahtri omadused","cellType":"Lahtri liik","rowSpan":"Ridade vahe","colSpan":"Tulpade vahe","wordWrap":"Sõnade murdmine","hAlign":"Horisontaalne joondus","vAlign":"Vertikaalne joondus","alignBaseline":"Baasjoon","bgColor":"Tausta värv","borderColor":"Äärise värv","data":"Andmed","header":"Päis","yes":"Jah","no":"Ei","invalidWidth":"Lahtri laius peab olema number.","invalidHeight":"Lahtri kõrgus peab olema number.","invalidRowSpan":"Ridade vahe peab olema täisarv.","invalidColSpan":"Tulpade vahe peab olema täisarv.","chooseColor":"Vali"},"cellPad":"Lahtri täidis","cellSpace":"Lahtri vahe","column":{"menu":"Veerg","insertBefore":"Sisesta veerg enne","insertAfter":"Sisesta veerg peale","deleteColumn":"Eemalda veerud"},"columns":"Veerud","deleteTable":"Kustuta tabel","headers":"Päised","headersBoth":"Mõlemad","headersColumn":"Esimene tulp","headersNone":"Puudub","headersRow":"Esimene rida","invalidBorder":"Äärise suurus peab olema number.","invalidCellPadding":"Lahtrite polsterdus (padding) peab olema positiivne arv.","invalidCellSpacing":"Lahtrite vahe peab olema positiivne arv.","invalidCols":"Tulpade arv peab olema nullist suurem.","invalidHeight":"Tabeli kõrgus peab olema number.","invalidRows":"Ridade arv peab olema nullist suurem.","invalidWidth":"Tabeli laius peab olema number.","menu":"Tabeli omadused","row":{"menu":"Rida","insertBefore":"Sisesta rida enne","insertAfter":"Sisesta rida peale","deleteRow":"Eemalda read"},"rows":"Read","summary":"Kokkuvõte","title":"Tabeli omadused","toolbar":"Tabel","widthPc":"protsenti","widthPx":"pikslit","widthUnit":"laiuse ühik"},"undo":{"redo":"Toimingu kordamine","undo":"Tagasivõtmine"},"wsc":{"btnIgnore":"Ignoreeri","btnIgnoreAll":"Ignoreeri kõiki","btnReplace":"Asenda","btnReplaceAll":"Asenda kõik","btnUndo":"Võta tagasi","changeTo":"Muuda","errorLoading":"Viga rakenduse teenushosti laadimisel: %s.","ieSpellDownload":"Õigekirja kontrollija ei ole paigaldatud. Soovid sa selle alla laadida?","manyChanges":"Õigekirja kontroll sooritatud: %1 sõna muudetud","noChanges":"Õigekirja kontroll sooritatud: ühtegi sõna ei muudetud","noMispell":"Õigekirja kontroll sooritatud: õigekirjuvigu ei leitud","noSuggestions":"- Soovitused puuduvad -","notAvailable":"Kahjuks ei ole teenus praegu saadaval.","notInDic":"Puudub sõnastikust","oneChange":"Õigekirja kontroll sooritatud: üks sõna muudeti","progress":"Toimub õigekirja kontroll...","title":"Õigekirjakontroll","toolbar":"Õigekirjakontroll"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/lang/eu.js
index 0bd8a4753e5..a132742d0fe 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/eu.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/eu.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['eu']={"editor":"Testu aberastuaren editorea","editorPanel":"Testu aberastuaren editorearen panela","common":{"editorHelp":"Sakatu ALT 0 laguntza jasotzeko","browseServer":"Arakatu zerbitzaria","url":"URLa","protocol":"Protokoloa","upload":"Kargatu","uploadSubmit":"Bidali zerbitzarira","image":"Irudia","flash":"Flash","form":"Formularioa","checkbox":"Kontrol-laukia","radio":"Aukera-botoia","textField":"Testu-eremua","textarea":"Testu-area","hiddenField":"Ezkutuko eremua","button":"Botoia","select":"Hautespen-eremua","imageButton":"Irudi-botoia","notSet":"<ezarri gabe>","id":"Id","name":"Izena","langDir":"Hizkuntzaren norabidea","langDirLtr":"Ezkerretik eskuinera (LTR)","langDirRtl":"Eskuinetik ezkerrera (RTL)","langCode":"Hizkuntzaren kodea","longDescr":"URLaren deskribapen luzea","cssClass":"Estilo-orriko klaseak","advisoryTitle":"Aholkatutako izenburua","cssStyle":"Estiloa","ok":"Ados","cancel":"Utzi","close":"Itxi","preview":"Aurrebista","resize":"Aldatu tamainaz","generalTab":"Orokorra","advancedTab":"Aurreratua","validateNumberFailed":"Balio hau ez da zenbaki bat.","confirmNewPage":"Eduki honetan gorde gabe dauden aldaketak galduko dira. Ziur zaude orri berri bat kargatu nahi duzula?","confirmCancel":"Aukera batzuk aldatu dituzu. Ziur zaude elkarrizketa-koadroa itxi nahi duzula?","options":"Aukerak","target":"Helburua","targetNew":"Leiho berria (_blank)","targetTop":"Goieneko leihoan (_top)","targetSelf":"Leiho berean (_self)","targetParent":"Leiho gurasoan (_parent)","langDirLTR":"Ezkerretik eskuinera (LTR)","langDirRTL":"Eskuinetik ezkerrera (RTL)","styles":"Estiloa","cssClasses":"Estilo-orriko klaseak","width":"Zabalera","height":"Altuera","align":"Lerrokatzea","alignLeft":"Ezkerrean","alignRight":"Eskuinean","alignCenter":"Erdian","alignJustify":"Justifikatu","alignTop":"Goian","alignMiddle":"Erdian","alignBottom":"Behean","alignNone":"Bat ere ez","invalidValue":"Balio desegokia.","invalidHeight":"Altuera zenbaki bat izan behar da.","invalidWidth":"Zabalera zenbaki bat izan behar da.","invalidCssLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, CSS neurri unitate batekin edo gabe (px, %, in, cm, mm, em, ex, pt edo pc).","invalidHtmlLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, HTML neurri unitate batekin edo gabe (px edo %).","invalidInlineStyle":"Lineako estiloan zehaztutako balioak \"izen : balio\" formatuko tupla bat edo gehiago izan behar dira, komaz bereiztuak.","cssLengthTooltip":"Sartu zenbaki bat edo zenbaki bat baliozko CSS unitate batekin (px, %, in, cm, mm, em, ex, pt, edo pc).","unavailable":"%1<span class=\"cke_accessibility\">, erabilezina</span>"},"about":{"copy":"Copyright &copy; $1. Eskubide guztiak erreserbaturik.","dlgTitle":"CKEditor-i buruz","help":"Begiratu $1 laguntzarako.","moreInfo":"Lizentziari buruzko informazioa gure webgunean:","title":"CKEditor-i buruz","userGuide":"CKEditor-en erabiltzaile-gida"},"basicstyles":{"bold":"Lodia","italic":"Etzana","strike":"Marratua","subscript":"Azpi-indizea","superscript":"Goi-indizea","underline":"Azpimarratu"},"bidi":{"ltr":"Testuaren norantza ezkerretik eskuinera","rtl":"Testuaren norantza eskuinetik ezkerrera"},"blockquote":{"toolbar":"Aipamen blokea"},"clipboard":{"copy":"Kopiatu","copyError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki kopiatzea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+C).","cut":"Ebaki","cutError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki moztea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+X).","paste":"Itsatsi","pasteArea":"Itsasteko area","pasteMsg":"Mesedez teklatua erabiliz (<strong>Ctrl/Cmd+V</strong>) ondorengo eremuan testua itsatsi eta sakatu <strong>Ados</strong>.","securityMsg":"Nabigatzailearen segurtasun ezarpenak direla eta, editoreak ezin du arbela zuzenean erabili. Leiho honetan berriro itsatsi behar duzu.","title":"Itsatsi"},"button":{"selectedLabel":"%1 (hautatuta)"},"colorbutton":{"auto":"Automatikoa","bgColorTitle":"Atzeko planoko kolorea","colors":{"000":"Beltza","800000":"Granatea","8B4513":"Zela marroia","2F4F4F":"Arbel gris iluna","008080":"Urdin berdexka","000080":"Urdin iluna","4B0082":"Indigoa","696969":"Gris iluna","B22222":"Adreilu erregogorra","A52A2A":"Marroia","DAA520":"Urrezko makila","006400":"Berde iluna","40E0D0":"Turkesa","0000CD":"Urdin ertaina","800080":"Morea","808080":"Grisa","F00":"Gorria","FF8C00":"Laranja iluna","FFD700":"Urrea","008000":"Berdea","0FF":"Ziana","00F":"Urdina","EE82EE":"Bioleta","A9A9A9":"Gris ahula","FFA07A":"Izokin-kolore argia","FFA500":"Laranja","FFFF00":"Horia","00FF00":"Lima","AFEEEE":"Turkesa argia","ADD8E6":"Urdin argia","DDA0DD":"Aran-kolorea","D3D3D3":"Gris argia","FFF0F5":"Izpiliku-gorrixka","FAEBD7":"Zuri zaharra","FFFFE0":"Hori argia","F0FFF0":"Ezti-ihintza","F0FFFF":"Zeru-urdina","F0F8FF":"Alizia urdina","E6E6FA":"Izpilikua","FFF":"Zuria"},"more":"Kolore gehiago...","panelTitle":"Koloreak","textColorTitle":"Testu-kolorea"},"colordialog":{"clear":"Garbitu","highlight":"Nabarmendu","options":"Kolore aukerak","selected":"Hautatutako kolorea","title":"Hautatu kolorea"},"templates":{"button":"Txantiloiak","emptyListMsg":"(Ez dago txantiloirik definituta)","insertOption":"Ordeztu uneko edukiak","options":"Txantiloi aukerak","selectPromptMsg":"Mesedez hautatu txantiloia editorean irekitzeko","title":"Eduki txantiloiak"},"contextmenu":{"options":"Testuinguru-menuaren aukerak"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Aholkatutako izenburua","cssClassInputLabel":"Estilo-orriko klaseak","edit":"Editatu Div-a","inlineStyleInputLabel":"Lineako estiloa","langDirLTRLabel":"Ezkerretik eskuinera (LTR)","langDirLabel":"Hizkuntzaren norabidea","langDirRTLLabel":"Eskuinetik ezkerrera (RTL)","languageCodeInputLabel":"Hizkuntzaren kodea","remove":"Kendu Div-a","styleSelectLabel":"Estiloa","title":"Sortu Div edukiontzia","toolbar":"Sortu Div edukiontzia"},"toolbar":{"toolbarCollapse":"Tolestu tresna-barra","toolbarExpand":"Zabaldu tresna-barra","toolbarGroups":{"document":"Dokumentua","clipboard":"Arbela/Desegin","editing":"Editatu","forms":"Formularioak","basicstyles":"Oinarrizko estiloak","paragraph":"Paragrafoa","links":"Estekak","insert":"Txertatu","styles":"Estiloak","colors":"Koloreak","tools":"Tresnak"},"toolbars":"Editorearen tresna-barrak"},"elementspath":{"eleLabel":"Elementuen bidea","eleTitle":"%1 elementua"},"find":{"find":"Bilatu","findOptions":"Bilaketaren aukerak","findWhat":"Bilatu hau:","matchCase":"Maiuskula/minuskula","matchCyclic":"Bilaketa ziklikoa","matchWord":"Bilatu hitz osoa","notFoundMsg":"Ez da aurkitu zehazturiko testua.","replace":"Ordezkatu","replaceAll":"Ordezkatu guztiak","replaceSuccessMsg":"%1 aldiz ordezkatua.","replaceWith":"Ordezkatu honekin:","title":"Bilatu eta ordezkatu"},"fakeobjects":{"anchor":"Aingura","flash":"Flash animazioa","hiddenfield":"Ezkutuko eremua","iframe":"IFrame-a","unknown":"Objektu ezezaguna"},"flash":{"access":"Script atzipena","accessAlways":"Beti","accessNever":"Inoiz ere ez","accessSameDomain":"Domeinu berekoak","alignAbsBottom":"Abs behean","alignAbsMiddle":"Abs erdian","alignBaseline":"Oinean","alignTextTop":"Testua goian","bgcolor":"Atzeko planoko kolorea","chkFull":"Onartu pantaila osoa","chkLoop":"Begizta","chkMenu":"Gaitu Flash-en menua","chkPlay":"Erreproduzitu automatikoki","flashvars":"Flash-en aldagaiak","hSpace":"HSpace","properties":"Flash-en propietateak","propertiesTab":"Propietateak","quality":"Kalitatea","qualityAutoHigh":"Auto altua","qualityAutoLow":"Auto baxua","qualityBest":"Hoberena","qualityHigh":"Altua","qualityLow":"Baxua","qualityMedium":"Ertaina","scale":"Eskalatu","scaleAll":"Erakutsi dena","scaleFit":"Doitu","scaleNoBorder":"Ertzik gabe","title":"Flash-en propietateak","vSpace":"VSpace","validateHSpace":"HSpace zenbaki bat izan behar da.","validateSrc":"URLak ezin du hutsik egon.","validateVSpace":"VSpace zenbaki bat izan behar da.","windowMode":"Leiho-modua","windowModeOpaque":"Opakoa","windowModeTransparent":"Gardena","windowModeWindow":"Leihoa"},"font":{"fontSize":{"label":"Tamaina","voiceLabel":"Letra-tamaina","panelTitle":"Letra-tamaina"},"label":"Letra-tipoa","panelTitle":"Letra-tipoaren izena","voiceLabel":"Letra-tipoa"},"forms":{"button":{"title":"Botoiaren ezaugarriak","text":"Testua (balioa)","type":"Mota","typeBtn":"Botoia","typeSbm":"Bidali","typeRst":"Berrezarri"},"checkboxAndRadio":{"checkboxTitle":"Kontrol-laukiaren propietateak","radioTitle":"Aukera-botoiaren propietateak","value":"Balioa","selected":"Hautatuta","required":"Beharrezkoa"},"form":{"title":"Formularioaren propietateak","menu":"Formularioaren propietateak","action":"Ekintza","method":"Metodoa","encoding":"Kodeketa"},"hidden":{"title":"Ezkutuko eremuaren propietateak","name":"Izena","value":"Balioa"},"select":{"title":"Hautespen eremuaren propietateak","selectInfo":"Hautatu informazioa","opAvail":"Erabilgarri dauden aukerak","value":"Balioa","size":"Tamaina","lines":"lerro kopurua","chkMulti":"baimendu hautapen anitzak","required":"Beharrezkoa","opText":"Testua","opValue":"Balioa","btnAdd":"Gehitu","btnModify":"Aldatu","btnUp":"Gora","btnDown":"Behera","btnSetValue":"Ezarri hautatutako balio bezala","btnDelete":"Ezabatu"},"textarea":{"title":"Testu-arearen propietateak","cols":"Zutabeak","rows":"Errenkadak"},"textfield":{"title":"Testu-eremuaren propietateak","name":"Izena","value":"Balioa","charWidth":"Karaktere-zabalera","maxChars":"Gehienezko karaktereak","required":"Beharrezkoa","type":"Mota","typeText":"Testua","typePass":"Pasahitza","typeEmail":"E-posta","typeSearch":"Bilatu","typeTel":"Telefono zenbakia","typeUrl":"URLa"}},"format":{"label":"Formatua","panelTitle":"Paragrafoaren formatua","tag_address":"Helbidea","tag_div":"Normala (DIV)","tag_h1":"Izenburua 1","tag_h2":"Izenburua 2","tag_h3":"Izenburua 3","tag_h4":"Izenburua 4","tag_h5":"Izenburua 5","tag_h6":"Izenburua 6","tag_p":"Normala","tag_pre":"Formatuduna"},"horizontalrule":{"toolbar":"Txertatu marra horizontala"},"iframe":{"border":"Erakutsi markoaren ertza","noUrl":"Idatzi iframe-aren URLa, mesedez.","scrolling":"Gaitu korritze-barrak","title":"IFrame-aren propietateak","toolbar":"IFrame-a"},"image":{"alt":"Ordezko testua","border":"Ertza","btnUpload":"Bidali zerbitzarira","button2Img":"Hautatutako irudi-botoia irudi arrunt bihurtu nahi duzu?","hSpace":"HSpace","img2Button":"Hautatutako irudia irudi-botoi bihurtu nahi duzu?","infoTab":"Irudiaren informazioa","linkTab":"Esteka","lockRatio":"Blokeatu erlazioa","menu":"Irudiaren propietateak","resetSize":"Berrezarri tamaina","title":"Irudiaren propietateak","titleButton":"Irudi-botoiaren propietateak","upload":"Kargatu","urlMissing":"Irudiaren iturburuaren URLa falta da.","vSpace":"VSpace","validateBorder":"Ertza zenbaki oso bat izan behar da.","validateHSpace":"HSpace zenbaki oso bat izan behar da.","validateVSpace":"VSpace zenbaki oso bat izan behar da."},"indent":{"indent":"Handitu koska","outdent":"Txikitu koska"},"smiley":{"options":"Aurpegieren aukerak","title":"Txertatu aurpegiera","toolbar":"Aurpegierak"},"justify":{"block":"Justifikatu","center":"Erdian","left":"Lerrokatu ezkerrean","right":"Lerrokatu eskuinean"},"language":{"button":"Ezarri hizkuntza","remove":"Kendu hizkuntza"},"link":{"acccessKey":"Sarbide-tekla","advanced":"Aurreratua","advisoryContentType":"Aholkatutako eduki-mota","advisoryTitle":"Aholkatutako izenburua","anchor":{"toolbar":"Aingura","menu":"Editatu aingura","title":"Ainguraren propietateak","name":"Ainguraren izena","errorName":"Idatzi ainguraren izena","remove":"Kendu aingura"},"anchorId":"Elementuaren Id-aren arabera","anchorName":"Aingura-izenaren arabera","charset":"Estekatutako baliabide karaktere-jokoa","cssClasses":"Estilo-orriko klaseak","emailAddress":"E-posta helbidea","emailBody":"Mezuaren gorputza","emailSubject":"Mezuaren gaia","id":"Id","info":"Estekaren informazioa","langCode":"Hizkuntzaren kodea","langDir":"Hizkuntzaren norabidea","langDirLTR":"Ezkerretik eskuinera (LTR)","langDirRTL":"Eskuinetik ezkerrera (RTL)","menu":"Editatu esteka","name":"Izena","noAnchors":"(Ez dago aingurarik erabilgarri dokumentuan)","noEmail":"Mesedez idatzi e-posta helbidea","noUrl":"Mesedez idatzi estekaren URLa","other":"<bestelakoa>","popupDependent":"Menpekoa (Netscape)","popupFeatures":"Laster-leihoaren ezaugarriak","popupFullScreen":"Pantaila osoa (IE)","popupLeft":"Ezkerreko posizioa","popupLocationBar":"Kokaleku-barra","popupMenuBar":"Menu-barra","popupResizable":"Tamaina aldakorra","popupScrollBars":"Korritze-barrak","popupStatusBar":"Egoera-barra","popupToolbar":"Tresna-barra","popupTop":"Goiko posizioa","rel":"Erlazioa","selectAnchor":"Hautatu aingura","styles":"Estiloa","tabIndex":"Tabulazio indizea","target":"Helburua","targetFrame":"<frame>","targetFrameName":"Helburuko markoaren izena","targetPopup":"<laster-leihoa>","targetPopupName":"Laster-leihoaren izena","title":"Esteka","toAnchor":"Estekatu testuko aingurara","toEmail":"E-posta","toUrl":"URLa","toolbar":"Esteka","type":"Esteka-mota","unlink":"Kendu esteka","upload":"Kargatu"},"list":{"bulletedlist":"Buletdun Zerrenda","numberedlist":"Zenbakidun Zerrenda"},"liststyle":{"armenian":"Zenbakitze armeniarra","bulletedTitle":"Buletadun zerrendaren propietateak","circle":"Zirkulua","decimal":"Hamartarra (1, 2, 3...)","decimalLeadingZero":"Aurretik zeroa duen hamartarra (01, 02, 03...)","disc":"Diskoa","georgian":"Zenbakitze georgiarra (an, ban, gan...)","lowerAlpha":"Alfabetoa minuskulaz (a, b, c, d, e...)","lowerGreek":"Greziera minuskulaz (alpha, beta, gamma...)","lowerRoman":"Erromatarra minuskulaz (i, ii, iii, iv, v...)","none":"Bat ere ez","notset":"<ezarri gabea>","numberedTitle":"Zenbakidun zerrendaren propietateak","square":"Karratua","start":"Hasi","type":"Mota","upperAlpha":"Alfabetoa maiuskulaz (A, B, C, D, E...)","upperRoman":"Erromatarra maiuskulaz (I, II, III, IV, V, etc.)","validateStartNumber":"Zerrendaren hasierako zenbakiak zenbaki osoa izan behar du."},"magicline":{"title":"Txertatu paragrafoa hemen"},"maximize":{"maximize":"Maximizatu","minimize":"Minimizatu"},"newpage":{"toolbar":"Orrialde berria"},"pagebreak":{"alt":"Orrialde-jauzia","toolbar":"Txertatu orrialde-jauzia inprimatzean"},"pastetext":{"button":"Itsatsi testu arrunta bezala","title":"Itsatsi testu arrunta bezala"},"pastefromword":{"confirmCleanup":"Itsatsi nahi duzun testua Word-etik kopiatua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?","error":"Barne-errore bat dela eta ezin izan da itsatsitako testua garbitu","title":"Itsatsi Word-etik","toolbar":"Itsatsi Word-etik"},"preview":{"preview":"Aurrebista"},"print":{"toolbar":"Inprimatu"},"removeformat":{"toolbar":"Kendu formatua"},"save":{"toolbar":"Gorde"},"selectall":{"toolbar":"Hautatu dena"},"showblocks":{"toolbar":"Erakutsi blokeak"},"sourcearea":{"toolbar":"Iturburua"},"specialchar":{"options":"Karaktere berezien aukerak","title":"Hautatu karaktere berezia","toolbar":"Txertatu karaktere berezia"},"scayt":{"btn_about":"SCAYTi buruz","btn_dictionaries":"Hiztegiak","btn_disable":"Desgaitu SCAYT","btn_enable":"Gaitu SCAYT","btn_langs":"Hizkuntzak","btn_options":"Aukerak","text_title":"Ortografia Zuzenketa Idatzi Ahala (SCAYT)"},"stylescombo":{"label":"Estiloak","panelTitle":"Formatu estiloak","panelTitle1":"Bloke estiloak","panelTitle2":"Lineako estiloak","panelTitle3":"Objektu estiloak"},"table":{"border":"Ertzaren zabalera","caption":"Epigrafea","cell":{"menu":"Gelaxka","insertBefore":"Txertatu gelaxka aurretik","insertAfter":"Txertatu gelaxka ondoren","deleteCell":"Ezabatu gelaxkak","merge":"Batu gelaxkak","mergeRight":"Batu eskuinetara","mergeDown":"Batu behera","splitHorizontal":"Banatu gelaxka horizontalki","splitVertical":"Banatu gelaxka bertikalki","title":"Gelaxkaren propietateak","cellType":"Gelaxka-mota","rowSpan":"Errenkaden hedadura","colSpan":"Zutabeen hedadura","wordWrap":"Itzulbira","hAlign":"Lerrokatze horizontala","vAlign":"Lerrokatze bertikala","alignBaseline":"Oinarri-lerroan","bgColor":"Atzeko planoaren kolorea","borderColor":"Ertzaren kolorea","data":"Data","header":"Goiburua","yes":"Bai","no":"Ez","invalidWidth":"Gelaxkaren zabalera zenbaki bat izan behar da.","invalidHeight":"Gelaxkaren altuera zenbaki bat izan behar da.","invalidRowSpan":"Errenkaden hedadura zenbaki osoa izan behar da.","invalidColSpan":"Zutabeen hedadura zenbaki osoa izan behar da.","chooseColor":"Aukeratu"},"cellPad":"Gelaxken betegarria","cellSpace":"Gelaxka arteko tartea","column":{"menu":"Zutabea","insertBefore":"Txertatu zutabea aurretik","insertAfter":"Txertatu zutabea ondoren","deleteColumn":"Ezabatu zutabeak"},"columns":"Zutabeak","deleteTable":"Ezabatu taula","headers":"Goiburuak","headersBoth":"Biak","headersColumn":"Lehen zutabea","headersNone":"Bat ere ez","headersRow":"Lehen errenkada","invalidBorder":"Ertzaren tamaina zenbaki bat izan behar da.","invalidCellPadding":"Gelaxken betegarria zenbaki bat izan behar da.","invalidCellSpacing":"Gelaxka arteko tartea zenbaki bat izan behar da.","invalidCols":"Zutabe kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidHeight":"Taularen altuera zenbaki bat izan behar da.","invalidRows":"Errenkada kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidWidth":"Taularen zabalera zenbaki bat izan behar da.","menu":"Taularen propietateak","row":{"menu":"Errenkada","insertBefore":"Txertatu errenkada aurretik","insertAfter":"Txertatu errenkada ondoren","deleteRow":"Ezabatu errenkadak"},"rows":"Errenkadak","summary":"Laburpena","title":"Taularen propietateak","toolbar":"Taula","widthPc":"ehuneko","widthPx":"pixel","widthUnit":"zabalera unitatea"},"undo":{"redo":"Berregin","undo":"Desegin"},"wsc":{"btnIgnore":"Ezikusi","btnIgnoreAll":"Denak Ezikusi","btnReplace":"Ordezkatu","btnReplaceAll":"Denak Ordezkatu","btnUndo":"Desegin","changeTo":"Honekin ordezkatu","errorLoading":"Errorea gertatu da aplikazioa zerbitzaritik kargatzean: %s.","ieSpellDownload":"Zuzentzaile ortografikoa ez dago instalatuta. Deskargatu nahi duzu?","manyChanges":"Zuzenketa ortografikoa bukatuta: %1 hitz aldatu dira","noChanges":"Zuzenketa ortografikoa bukatuta: Ez da ezer aldatu","noMispell":"Zuzenketa ortografikoa bukatuta: Akatsik ez","noSuggestions":"- Iradokizunik ez -","notAvailable":"Barkatu baina momentu honetan zerbitzua ez dago erabilgarri.","notInDic":"Ez dago hiztegian","oneChange":"Zuzenketa ortografikoa bukatuta: Hitz bat aldatu da","progress":"Zuzenketa ortografikoa martxan...","title":"Ortografia zuzenketa","toolbar":"Ortografia"}};
\ No newline at end of file
+CKEDITOR.lang['eu']={"editor":"Testu aberastuaren editorea","editorPanel":"Testu aberastuaren editorearen panela","common":{"editorHelp":"Sakatu ALT 0 laguntza jasotzeko","browseServer":"Arakatu zerbitzaria","url":"URLa","protocol":"Protokoloa","upload":"Kargatu","uploadSubmit":"Bidali zerbitzarira","image":"Irudia","flash":"Flash","form":"Formularioa","checkbox":"Kontrol-laukia","radio":"Aukera-botoia","textField":"Testu-eremua","textarea":"Testu-area","hiddenField":"Ezkutuko eremua","button":"Botoia","select":"Hautespen-eremua","imageButton":"Irudi-botoia","notSet":"<ezarri gabe>","id":"Id","name":"Izena","langDir":"Hizkuntzaren norabidea","langDirLtr":"Ezkerretik eskuinera (LTR)","langDirRtl":"Eskuinetik ezkerrera (RTL)","langCode":"Hizkuntzaren kodea","longDescr":"URLaren deskribapen luzea","cssClass":"Estilo-orriko klaseak","advisoryTitle":"Aholkatutako izenburua","cssStyle":"Estiloa","ok":"Ados","cancel":"Utzi","close":"Itxi","preview":"Aurrebista","resize":"Aldatu tamainaz","generalTab":"Orokorra","advancedTab":"Aurreratua","validateNumberFailed":"Balio hau ez da zenbaki bat.","confirmNewPage":"Eduki honetan gorde gabe dauden aldaketak galduko dira. Ziur zaude orri berri bat kargatu nahi duzula?","confirmCancel":"Aukera batzuk aldatu dituzu. Ziur zaude elkarrizketa-koadroa itxi nahi duzula?","options":"Aukerak","target":"Helburua","targetNew":"Leiho berria (_blank)","targetTop":"Goieneko leihoan (_top)","targetSelf":"Leiho berean (_self)","targetParent":"Leiho gurasoan (_parent)","langDirLTR":"Ezkerretik eskuinera (LTR)","langDirRTL":"Eskuinetik ezkerrera (RTL)","styles":"Estiloa","cssClasses":"Estilo-orriko klaseak","width":"Zabalera","height":"Altuera","align":"Lerrokatzea","alignLeft":"Ezkerrean","alignRight":"Eskuinean","alignCenter":"Erdian","alignJustify":"Justifikatu","alignTop":"Goian","alignMiddle":"Erdian","alignBottom":"Behean","alignNone":"Bat ere ez","invalidValue":"Balio desegokia.","invalidHeight":"Altuera zenbaki bat izan behar da.","invalidWidth":"Zabalera zenbaki bat izan behar da.","invalidCssLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, CSS neurri unitate batekin edo gabe (px, %, in, cm, mm, em, ex, pt edo pc).","invalidHtmlLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, HTML neurri unitate batekin edo gabe (px edo %).","invalidInlineStyle":"Lineako estiloan zehaztutako balioak \"izen : balio\" formatuko tupla bat edo gehiago izan behar dira, komaz bereiztuak.","cssLengthTooltip":"Sartu zenbaki bat edo zenbaki bat baliozko CSS unitate batekin (px, %, in, cm, mm, em, ex, pt, edo pc).","unavailable":"%1<span class=\"cke_accessibility\">, erabilezina</span>","keyboard":{"8":"Backspace","13":"Sartu","16":"Maius","17":"Ktrl","18":"Alt","32":"Space","35":"Buka","36":"Etxea","46":"Ezabatu","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Eskubide guztiak erreserbaturik.","dlgTitle":"CKEditor-i buruz","help":"Begiratu $1 laguntzarako.","moreInfo":"Lizentziari buruzko informazioa gure webgunean:","title":"CKEditor-i buruz","userGuide":"CKEditor-en erabiltzaile-gida"},"basicstyles":{"bold":"Lodia","italic":"Etzana","strike":"Marratua","subscript":"Azpi-indizea","superscript":"Goi-indizea","underline":"Azpimarratu"},"bidi":{"ltr":"Testuaren norantza ezkerretik eskuinera","rtl":"Testuaren norantza eskuinetik ezkerrera"},"blockquote":{"toolbar":"Aipamen blokea"},"clipboard":{"copy":"Kopiatu","copyError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki kopiatzea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+C).","cut":"Ebaki","cutError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki moztea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+X).","paste":"Itsatsi","pasteArea":"Itsasteko area","pasteMsg":"Mesedez teklatua erabiliz (<strong>Ctrl/Cmd+V</strong>) ondorengo eremuan testua itsatsi eta sakatu <strong>Ados</strong>.","securityMsg":"Nabigatzailearen segurtasun ezarpenak direla eta, editoreak ezin du arbela zuzenean erabili. Leiho honetan berriro itsatsi behar duzu.","title":"Itsatsi"},"button":{"selectedLabel":"%1 (hautatuta)"},"colorbutton":{"auto":"Automatikoa","bgColorTitle":"Atzeko planoko kolorea","colors":{"000":"Beltza","800000":"Granatea","8B4513":"Zela marroia","2F4F4F":"Arbel gris iluna","008080":"Urdin berdexka","000080":"Urdin iluna","4B0082":"Indigoa","696969":"Gris iluna","B22222":"Adreilu erregogorra","A52A2A":"Marroia","DAA520":"Urrezko makila","006400":"Berde iluna","40E0D0":"Turkesa","0000CD":"Urdin ertaina","800080":"Morea","808080":"Grisa","F00":"Gorria","FF8C00":"Laranja iluna","FFD700":"Urrea","008000":"Berdea","0FF":"Ziana","00F":"Urdina","EE82EE":"Bioleta","A9A9A9":"Gris ahula","FFA07A":"Izokin-kolore argia","FFA500":"Laranja","FFFF00":"Horia","00FF00":"Lima","AFEEEE":"Turkesa argia","ADD8E6":"Urdin argia","DDA0DD":"Aran-kolorea","D3D3D3":"Gris argia","FFF0F5":"Izpiliku-gorrixka","FAEBD7":"Zuri zaharra","FFFFE0":"Hori argia","F0FFF0":"Ezti-ihintza","F0FFFF":"Zeru-urdina","F0F8FF":"Alizia urdina","E6E6FA":"Izpilikua","FFF":"Zuria","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Kolore gehiago...","panelTitle":"Koloreak","textColorTitle":"Testu-kolorea"},"colordialog":{"clear":"Garbitu","highlight":"Nabarmendu","options":"Kolore aukerak","selected":"Hautatutako kolorea","title":"Hautatu kolorea"},"templates":{"button":"Txantiloiak","emptyListMsg":"(Ez dago txantiloirik definituta)","insertOption":"Ordeztu uneko edukiak","options":"Txantiloi aukerak","selectPromptMsg":"Mesedez hautatu txantiloia editorean irekitzeko","title":"Eduki txantiloiak"},"contextmenu":{"options":"Testuinguru-menuaren aukerak"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Aholkatutako izenburua","cssClassInputLabel":"Estilo-orriko klaseak","edit":"Editatu Div-a","inlineStyleInputLabel":"Lineako estiloa","langDirLTRLabel":"Ezkerretik eskuinera (LTR)","langDirLabel":"Hizkuntzaren norabidea","langDirRTLLabel":"Eskuinetik ezkerrera (RTL)","languageCodeInputLabel":"Hizkuntzaren kodea","remove":"Kendu Div-a","styleSelectLabel":"Estiloa","title":"Sortu Div edukiontzia","toolbar":"Sortu Div edukiontzia"},"toolbar":{"toolbarCollapse":"Tolestu tresna-barra","toolbarExpand":"Zabaldu tresna-barra","toolbarGroups":{"document":"Dokumentua","clipboard":"Arbela/Desegin","editing":"Editatu","forms":"Formularioak","basicstyles":"Oinarrizko estiloak","paragraph":"Paragrafoa","links":"Estekak","insert":"Txertatu","styles":"Estiloak","colors":"Koloreak","tools":"Tresnak"},"toolbars":"Editorearen tresna-barrak"},"elementspath":{"eleLabel":"Elementuen bidea","eleTitle":"%1 elementua"},"find":{"find":"Bilatu","findOptions":"Bilaketaren aukerak","findWhat":"Bilatu hau:","matchCase":"Maiuskula/minuskula","matchCyclic":"Bilaketa ziklikoa","matchWord":"Bilatu hitz osoa","notFoundMsg":"Ez da aurkitu zehazturiko testua.","replace":"Ordezkatu","replaceAll":"Ordezkatu guztiak","replaceSuccessMsg":"%1 aldiz ordezkatua.","replaceWith":"Ordezkatu honekin:","title":"Bilatu eta ordezkatu"},"fakeobjects":{"anchor":"Aingura","flash":"Flash animazioa","hiddenfield":"Ezkutuko eremua","iframe":"IFrame-a","unknown":"Objektu ezezaguna"},"flash":{"access":"Script atzipena","accessAlways":"Beti","accessNever":"Inoiz ere ez","accessSameDomain":"Domeinu berekoak","alignAbsBottom":"Abs behean","alignAbsMiddle":"Abs erdian","alignBaseline":"Oinean","alignTextTop":"Testua goian","bgcolor":"Atzeko planoko kolorea","chkFull":"Onartu pantaila osoa","chkLoop":"Begizta","chkMenu":"Gaitu Flash-en menua","chkPlay":"Erreproduzitu automatikoki","flashvars":"Flash-en aldagaiak","hSpace":"HSpace","properties":"Flash-en propietateak","propertiesTab":"Propietateak","quality":"Kalitatea","qualityAutoHigh":"Auto altua","qualityAutoLow":"Auto baxua","qualityBest":"Hoberena","qualityHigh":"Altua","qualityLow":"Baxua","qualityMedium":"Ertaina","scale":"Eskalatu","scaleAll":"Erakutsi dena","scaleFit":"Doitu","scaleNoBorder":"Ertzik gabe","title":"Flash-en propietateak","vSpace":"VSpace","validateHSpace":"HSpace zenbaki bat izan behar da.","validateSrc":"URLak ezin du hutsik egon.","validateVSpace":"VSpace zenbaki bat izan behar da.","windowMode":"Leiho-modua","windowModeOpaque":"Opakoa","windowModeTransparent":"Gardena","windowModeWindow":"Leihoa"},"font":{"fontSize":{"label":"Tamaina","voiceLabel":"Letra-tamaina","panelTitle":"Letra-tamaina"},"label":"Letra-tipoa","panelTitle":"Letra-tipoaren izena","voiceLabel":"Letra-tipoa"},"forms":{"button":{"title":"Botoiaren ezaugarriak","text":"Testua (balioa)","type":"Mota","typeBtn":"Botoia","typeSbm":"Bidali","typeRst":"Berrezarri"},"checkboxAndRadio":{"checkboxTitle":"Kontrol-laukiaren propietateak","radioTitle":"Aukera-botoiaren propietateak","value":"Balioa","selected":"Hautatuta","required":"Beharrezkoa"},"form":{"title":"Formularioaren propietateak","menu":"Formularioaren propietateak","action":"Ekintza","method":"Metodoa","encoding":"Kodeketa"},"hidden":{"title":"Ezkutuko eremuaren propietateak","name":"Izena","value":"Balioa"},"select":{"title":"Hautespen eremuaren propietateak","selectInfo":"Hautatu informazioa","opAvail":"Erabilgarri dauden aukerak","value":"Balioa","size":"Tamaina","lines":"lerro kopurua","chkMulti":"baimendu hautapen anitzak","required":"Beharrezkoa","opText":"Testua","opValue":"Balioa","btnAdd":"Gehitu","btnModify":"Aldatu","btnUp":"Gora","btnDown":"Behera","btnSetValue":"Ezarri hautatutako balio bezala","btnDelete":"Ezabatu"},"textarea":{"title":"Testu-arearen propietateak","cols":"Zutabeak","rows":"Errenkadak"},"textfield":{"title":"Testu-eremuaren propietateak","name":"Izena","value":"Balioa","charWidth":"Karaktere-zabalera","maxChars":"Gehienezko karaktereak","required":"Beharrezkoa","type":"Mota","typeText":"Testua","typePass":"Pasahitza","typeEmail":"E-posta","typeSearch":"Bilatu","typeTel":"Telefono zenbakia","typeUrl":"URLa"}},"format":{"label":"Formatua","panelTitle":"Paragrafoaren formatua","tag_address":"Helbidea","tag_div":"Normala (DIV)","tag_h1":"Izenburua 1","tag_h2":"Izenburua 2","tag_h3":"Izenburua 3","tag_h4":"Izenburua 4","tag_h5":"Izenburua 5","tag_h6":"Izenburua 6","tag_p":"Normala","tag_pre":"Formatuduna"},"horizontalrule":{"toolbar":"Txertatu marra horizontala"},"iframe":{"border":"Erakutsi markoaren ertza","noUrl":"Idatzi iframe-aren URLa, mesedez.","scrolling":"Gaitu korritze-barrak","title":"IFrame-aren propietateak","toolbar":"IFrame-a"},"image":{"alt":"Ordezko testua","border":"Ertza","btnUpload":"Bidali zerbitzarira","button2Img":"Hautatutako irudi-botoia irudi arrunt bihurtu nahi duzu?","hSpace":"HSpace","img2Button":"Hautatutako irudia irudi-botoi bihurtu nahi duzu?","infoTab":"Irudiaren informazioa","linkTab":"Esteka","lockRatio":"Blokeatu erlazioa","menu":"Irudiaren propietateak","resetSize":"Berrezarri tamaina","title":"Irudiaren propietateak","titleButton":"Irudi-botoiaren propietateak","upload":"Kargatu","urlMissing":"Irudiaren iturburuaren URLa falta da.","vSpace":"VSpace","validateBorder":"Ertza zenbaki oso bat izan behar da.","validateHSpace":"HSpace zenbaki oso bat izan behar da.","validateVSpace":"VSpace zenbaki oso bat izan behar da."},"indent":{"indent":"Handitu koska","outdent":"Txikitu koska"},"smiley":{"options":"Aurpegieren aukerak","title":"Txertatu aurpegiera","toolbar":"Aurpegierak"},"justify":{"block":"Justifikatu","center":"Erdian","left":"Lerrokatu ezkerrean","right":"Lerrokatu eskuinean"},"language":{"button":"Ezarri hizkuntza","remove":"Kendu hizkuntza"},"link":{"acccessKey":"Sarbide-tekla","advanced":"Aurreratua","advisoryContentType":"Aholkatutako eduki-mota","advisoryTitle":"Aholkatutako izenburua","anchor":{"toolbar":"Aingura","menu":"Editatu aingura","title":"Ainguraren propietateak","name":"Ainguraren izena","errorName":"Idatzi ainguraren izena","remove":"Kendu aingura"},"anchorId":"Elementuaren Id-aren arabera","anchorName":"Aingura-izenaren arabera","charset":"Estekatutako baliabide karaktere-jokoa","cssClasses":"Estilo-orriko klaseak","download":"Force Download","displayText":"Bistaratu testua","emailAddress":"E-posta helbidea","emailBody":"Mezuaren gorputza","emailSubject":"Mezuaren gaia","id":"Id","info":"Estekaren informazioa","langCode":"Hizkuntzaren kodea","langDir":"Hizkuntzaren norabidea","langDirLTR":"Ezkerretik eskuinera (LTR)","langDirRTL":"Eskuinetik ezkerrera (RTL)","menu":"Editatu esteka","name":"Izena","noAnchors":"(Ez dago aingurarik erabilgarri dokumentuan)","noEmail":"Mesedez idatzi e-posta helbidea","noUrl":"Mesedez idatzi estekaren URLa","other":"<bestelakoa>","popupDependent":"Menpekoa (Netscape)","popupFeatures":"Laster-leihoaren ezaugarriak","popupFullScreen":"Pantaila osoa (IE)","popupLeft":"Ezkerreko posizioa","popupLocationBar":"Kokaleku-barra","popupMenuBar":"Menu-barra","popupResizable":"Tamaina aldakorra","popupScrollBars":"Korritze-barrak","popupStatusBar":"Egoera-barra","popupToolbar":"Tresna-barra","popupTop":"Goiko posizioa","rel":"Erlazioa","selectAnchor":"Hautatu aingura","styles":"Estiloa","tabIndex":"Tabulazio indizea","target":"Helburua","targetFrame":"<frame>","targetFrameName":"Helburuko markoaren izena","targetPopup":"<laster-leihoa>","targetPopupName":"Laster-leihoaren izena","title":"Esteka","toAnchor":"Estekatu testuko aingurara","toEmail":"E-posta","toUrl":"URLa","toolbar":"Esteka","type":"Esteka-mota","unlink":"Kendu esteka","upload":"Kargatu"},"list":{"bulletedlist":"Buletdun Zerrenda","numberedlist":"Zenbakidun Zerrenda"},"liststyle":{"armenian":"Zenbakitze armeniarra","bulletedTitle":"Buletadun zerrendaren propietateak","circle":"Zirkulua","decimal":"Hamartarra (1, 2, 3...)","decimalLeadingZero":"Aurretik zeroa duen hamartarra (01, 02, 03...)","disc":"Diskoa","georgian":"Zenbakitze georgiarra (an, ban, gan...)","lowerAlpha":"Alfabetoa minuskulaz (a, b, c, d, e...)","lowerGreek":"Greziera minuskulaz (alpha, beta, gamma...)","lowerRoman":"Erromatarra minuskulaz (i, ii, iii, iv, v...)","none":"Bat ere ez","notset":"<ezarri gabea>","numberedTitle":"Zenbakidun zerrendaren propietateak","square":"Karratua","start":"Hasi","type":"Mota","upperAlpha":"Alfabetoa maiuskulaz (A, B, C, D, E...)","upperRoman":"Erromatarra maiuskulaz (I, II, III, IV, V, etc.)","validateStartNumber":"Zerrendaren hasierako zenbakiak zenbaki osoa izan behar du."},"magicline":{"title":"Txertatu paragrafoa hemen"},"maximize":{"maximize":"Maximizatu","minimize":"Minimizatu"},"newpage":{"toolbar":"Orrialde berria"},"pagebreak":{"alt":"Orrialde-jauzia","toolbar":"Txertatu orrialde-jauzia inprimatzean"},"pastetext":{"button":"Itsatsi testu arrunta bezala","title":"Itsatsi testu arrunta bezala"},"pastefromword":{"confirmCleanup":"Itsatsi nahi duzun testua Word-etik kopiatua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?","error":"Barne-errore bat dela eta ezin izan da itsatsitako testua garbitu","title":"Itsatsi Word-etik","toolbar":"Itsatsi Word-etik"},"preview":{"preview":"Aurrebista"},"print":{"toolbar":"Inprimatu"},"removeformat":{"toolbar":"Kendu formatua"},"save":{"toolbar":"Gorde"},"selectall":{"toolbar":"Hautatu dena"},"showblocks":{"toolbar":"Erakutsi blokeak"},"sourcearea":{"toolbar":"Iturburua"},"specialchar":{"options":"Karaktere berezien aukerak","title":"Hautatu karaktere berezia","toolbar":"Txertatu karaktere berezia"},"scayt":{"btn_about":"SCAYTi buruz","btn_dictionaries":"Hiztegiak","btn_disable":"Desgaitu SCAYT","btn_enable":"Gaitu SCAYT","btn_langs":"Hizkuntzak","btn_options":"Aukerak","text_title":"Ortografia Zuzenketa Idatzi Ahala (SCAYT)"},"stylescombo":{"label":"Estiloak","panelTitle":"Formatu estiloak","panelTitle1":"Bloke estiloak","panelTitle2":"Lineako estiloak","panelTitle3":"Objektu estiloak"},"table":{"border":"Ertzaren zabalera","caption":"Epigrafea","cell":{"menu":"Gelaxka","insertBefore":"Txertatu gelaxka aurretik","insertAfter":"Txertatu gelaxka ondoren","deleteCell":"Ezabatu gelaxkak","merge":"Batu gelaxkak","mergeRight":"Batu eskuinetara","mergeDown":"Batu behera","splitHorizontal":"Banatu gelaxka horizontalki","splitVertical":"Banatu gelaxka bertikalki","title":"Gelaxkaren propietateak","cellType":"Gelaxka-mota","rowSpan":"Errenkaden hedadura","colSpan":"Zutabeen hedadura","wordWrap":"Itzulbira","hAlign":"Lerrokatze horizontala","vAlign":"Lerrokatze bertikala","alignBaseline":"Oinarri-lerroan","bgColor":"Atzeko planoaren kolorea","borderColor":"Ertzaren kolorea","data":"Data","header":"Goiburua","yes":"Bai","no":"Ez","invalidWidth":"Gelaxkaren zabalera zenbaki bat izan behar da.","invalidHeight":"Gelaxkaren altuera zenbaki bat izan behar da.","invalidRowSpan":"Errenkaden hedadura zenbaki osoa izan behar da.","invalidColSpan":"Zutabeen hedadura zenbaki osoa izan behar da.","chooseColor":"Aukeratu"},"cellPad":"Gelaxken betegarria","cellSpace":"Gelaxka arteko tartea","column":{"menu":"Zutabea","insertBefore":"Txertatu zutabea aurretik","insertAfter":"Txertatu zutabea ondoren","deleteColumn":"Ezabatu zutabeak"},"columns":"Zutabeak","deleteTable":"Ezabatu taula","headers":"Goiburuak","headersBoth":"Biak","headersColumn":"Lehen zutabea","headersNone":"Bat ere ez","headersRow":"Lehen errenkada","invalidBorder":"Ertzaren tamaina zenbaki bat izan behar da.","invalidCellPadding":"Gelaxken betegarria zenbaki bat izan behar da.","invalidCellSpacing":"Gelaxka arteko tartea zenbaki bat izan behar da.","invalidCols":"Zutabe kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidHeight":"Taularen altuera zenbaki bat izan behar da.","invalidRows":"Errenkada kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidWidth":"Taularen zabalera zenbaki bat izan behar da.","menu":"Taularen propietateak","row":{"menu":"Errenkada","insertBefore":"Txertatu errenkada aurretik","insertAfter":"Txertatu errenkada ondoren","deleteRow":"Ezabatu errenkadak"},"rows":"Errenkadak","summary":"Laburpena","title":"Taularen propietateak","toolbar":"Taula","widthPc":"ehuneko","widthPx":"pixel","widthUnit":"zabalera unitatea"},"undo":{"redo":"Berregin","undo":"Desegin"},"wsc":{"btnIgnore":"Ezikusi","btnIgnoreAll":"Denak Ezikusi","btnReplace":"Ordezkatu","btnReplaceAll":"Denak Ordezkatu","btnUndo":"Desegin","changeTo":"Honekin ordezkatu","errorLoading":"Errorea gertatu da aplikazioa zerbitzaritik kargatzean: %s.","ieSpellDownload":"Zuzentzaile ortografikoa ez dago instalatuta. Deskargatu nahi duzu?","manyChanges":"Zuzenketa ortografikoa bukatuta: %1 hitz aldatu dira","noChanges":"Zuzenketa ortografikoa bukatuta: Ez da ezer aldatu","noMispell":"Zuzenketa ortografikoa bukatuta: Akatsik ez","noSuggestions":"- Iradokizunik ez -","notAvailable":"Barkatu baina momentu honetan zerbitzua ez dago erabilgarri.","notInDic":"Ez dago hiztegian","oneChange":"Zuzenketa ortografikoa bukatuta: Hitz bat aldatu da","progress":"Zuzenketa ortografikoa martxan...","title":"Ortografia zuzenketa","toolbar":"Ortografia"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/lang/fa.js
index 452bec47345..544e454cf0c 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/fa.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/fa.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fa']={"editor":"ویرایش‌گر متن غنی","editorPanel":"پنل ویرایشگر متن غنی","common":{"editorHelp":"کلید Alt+0 را برای راهنمایی بفشارید","browseServer":"فهرست​نمایی سرور","url":"URL","protocol":"قرارداد","upload":"بالاگذاری","uploadSubmit":"به سرور بفرست","image":"تصویر","flash":"فلش","form":"فرم","checkbox":"چک‌باکس","radio":"دکمه‌ی رادیویی","textField":"فیلد متنی","textarea":"ناحیهٴ متنی","hiddenField":"فیلد پنهان","button":"دکمه","select":"فیلد انتخاب چند گزینه​ای","imageButton":"دکمه‌ی تصویری","notSet":"<تعیین‌نشده>","id":"شناسه","name":"نام","langDir":"جهت زبان","langDirLtr":"چپ به راست","langDirRtl":"راست به چپ","langCode":"کد زبان","longDescr":"URL توصیف طولانی","cssClass":"کلاس​های شیوه​نامه (Stylesheet)","advisoryTitle":"عنوان کمکی","cssStyle":"سبک","ok":"پذیرش","cancel":"انصراف","close":"بستن","preview":"پیش‌نمایش","resize":"تغییر اندازه","generalTab":"عمومی","advancedTab":"پیش‌رفته","validateNumberFailed":"این مقدار یک عدد نیست.","confirmNewPage":"هر تغییر ایجاد شده​ی ذخیره نشده از بین خواهد رفت. آیا اطمینان دارید که قصد بارگیری صفحه جدیدی را دارید؟","confirmCancel":"برخی از گزینه‌ها تغییر کرده‌اند. آیا واقعا قصد بستن این پنجره را دارید؟","options":"گزینه​ها","target":"مقصد","targetNew":"پنجره جدید","targetTop":"بالاترین پنجره","targetSelf":"همان پنجره","targetParent":"پنجره والد","langDirLTR":"چپ به راست","langDirRTL":"راست به چپ","styles":"سبک","cssClasses":"کلاس‌های سبک‌نامه","width":"عرض","height":"طول","align":"چینش","alignLeft":"چپ","alignRight":"راست","alignCenter":"وسط","alignJustify":"بلوک چین","alignTop":"بالا","alignMiddle":"میانه","alignBottom":"پائین","alignNone":"هیچ","invalidValue":"مقدار نامعتبر.","invalidHeight":"ارتفاع باید یک عدد باشد.","invalidWidth":"عرض باید یک عدد باشد.","invalidCssLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری CSS معتبر باشد (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری HTML معتبر باشد (px or %).","invalidInlineStyle":"عدد تعیین شده برای سبک درون​خطی -Inline Style- باید دارای یک یا چند چندتایی با شکلی شبیه \"name : value\" که باید با یک \";\" از هم جدا شوند.","cssLengthTooltip":"یک عدد برای یک مقدار بر حسب پیکسل و یا یک عدد با یک واحد CSS معتبر وارد کنید (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">، غیر قابل دسترس</span>"},"about":{"copy":"حق نشر &copy; $1. کلیه حقوق محفوظ است.","dlgTitle":"درباره CKEditor","help":" برای راهنمایی $1 را ملاحظه کنید.","moreInfo":"برای کسب اطلاعات مجوز لطفا به وب سایت ما مراجعه کنید:","title":"درباره CKEditor","userGuide":"راهنمای کاربران CKEditor"},"basicstyles":{"bold":"درشت","italic":"خمیده","strike":"خط‌خورده","subscript":"زیرنویس","superscript":"بالانویس","underline":"زیرخط‌دار"},"bidi":{"ltr":"جهت متن از چپ به راست","rtl":"جهت متن از راست به چپ"},"blockquote":{"toolbar":"بلوک نقل قول"},"clipboard":{"copy":"رونوشت","copyError":"تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای کپی کردن را انجام دهد. لطفا با دکمههای صفحه کلید این کار را انجام دهید (Ctrl/Cmd+C).","cut":"برش","cutError":"تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای برش را انجام دهد. لطفا با دکمههای صفحه کلید این کار را انجام دهید (Ctrl/Cmd+X).","paste":"چسباندن","pasteArea":"محل چسباندن","pasteMsg":"لطفا متن را با کلیدهای (<STRONG>Ctrl/Cmd+V</STRONG>) در این جعبهٴ متنی بچسبانید و <STRONG>پذیرش</STRONG> را بزنید.","securityMsg":"به خاطر تنظیمات امنیتی مرورگر شما، ویرایشگر نمیتواند دسترسی مستقیم به دادههای clipboard داشته باشد. شما باید دوباره آنرا در این پنجره بچسبانید.","title":"چسباندن"},"button":{"selectedLabel":"%1 (انتخاب شده)"},"colorbutton":{"auto":"خودکار","bgColorTitle":"رنگ پس​زمینه","colors":{"000":"سیاه","800000":"خرمایی","8B4513":"قهوه​ای شکلاتی","2F4F4F":"ارغوانی مایل به خاکستری","008080":"آبی مایل به خاکستری","000080":"آبی سیر","4B0082":"نیلی","696969":"خاکستری تیره","B22222":"آتش آجری","A52A2A":"قهوه​ای","DAA520":"میله​ی طلایی","006400":"سبز تیره","40E0D0":"فیروزه​ای","0000CD":"آبی روشن","800080":"ارغوانی","808080":"خاکستری","F00":"قرمز","FF8C00":"نارنجی پررنگ","FFD700":"طلایی","008000":"سبز","0FF":"آبی مایل به سبز","00F":"آبی","EE82EE":"بنفش","A9A9A9":"خاکستری مات","FFA07A":"صورتی کدر روشن","FFA500":"نارنجی","FFFF00":"زرد","00FF00":"فسفری","AFEEEE":"فیروزه​ای رنگ پریده","ADD8E6":"آبی کمرنگ","DDA0DD":"آلویی","D3D3D3":"خاکستری روشن","FFF0F5":"بنفش کمرنگ","FAEBD7":"عتیقه سفید","FFFFE0":"زرد روشن","F0FFF0":"عسلی","F0FFFF":"لاجوردی","F0F8FF":"آبی براق","E6E6FA":"بنفش کمرنگ","FFF":"سفید"},"more":"رنگ​های بیشتر...","panelTitle":"رنگها","textColorTitle":"رنگ متن"},"colordialog":{"clear":"پاک کردن","highlight":"متمایز","options":"گزینه​های رنگ","selected":"رنگ انتخاب شده","title":"انتخاب رنگ"},"templates":{"button":"الگوها","emptyListMsg":"(الگوئی تعریف نشده است)","insertOption":"محتویات کنونی جایگزین شوند","options":"گزینه‌های الگو","selectPromptMsg":"لطفاً الگوی مورد نظر را برای بازکردن در ویرایشگر انتخاب کنید","title":"الگوهای محتویات"},"contextmenu":{"options":"گزینه​های منوی زمینه"},"div":{"IdInputLabel":"شناسه","advisoryTitleInputLabel":"عنوان مشاوره","cssClassInputLabel":"کلاس​های شیوه​نامه","edit":"ویرایش Div","inlineStyleInputLabel":"سبک درون​خطی(Inline Style)","langDirLTRLabel":"چپ به راست (LTR)","langDirLabel":"جهت نوشتاری زبان","langDirRTLLabel":"راست به چپ (RTL)","languageCodeInputLabel":" کد زبان","remove":"حذف Div","styleSelectLabel":"سبک","title":"ایجاد یک محل DIV","toolbar":"ایجاد یک محل DIV"},"toolbar":{"toolbarCollapse":"بستن نوار ابزار","toolbarExpand":"بازکردن نوار ابزار","toolbarGroups":{"document":"سند","clipboard":"حافظه موقت/برگشت","editing":"در حال ویرایش","forms":"فرم​ها","basicstyles":"سبک‌های پایه","paragraph":"بند","links":"پیوندها","insert":"ورود","styles":"سبک‌ها","colors":"رنگ​ها","tools":"ابزارها"},"toolbars":"نوار ابزارهای ویرایش‌گر"},"elementspath":{"eleLabel":"مسیر عناصر","eleTitle":"%1 عنصر"},"find":{"find":"جستجو","findOptions":"گزینه​های جستجو","findWhat":"چه چیز را مییابید:","matchCase":"همسانی در بزرگی و کوچکی نویسه​ها","matchCyclic":"همسانی با چرخه","matchWord":"همسانی با واژهٴ کامل","notFoundMsg":"متن موردنظر یافت نشد.","replace":"جایگزینی","replaceAll":"جایگزینی همهٴ یافته​ها","replaceSuccessMsg":"%1 رخداد جایگزین شد.","replaceWith":"جایگزینی با:","title":"جستجو و جایگزینی"},"fakeobjects":{"anchor":"لنگر","flash":"انیمشن فلش","hiddenfield":"فیلد پنهان","iframe":"IFrame","unknown":"شیء ناشناخته"},"flash":{"access":"دسترسی به اسکریپت","accessAlways":"همیشه","accessNever":"هرگز","accessSameDomain":"همان دامنه","alignAbsBottom":"پائین مطلق","alignAbsMiddle":"وسط مطلق","alignBaseline":"خط پایه","alignTextTop":"متن بالا","bgcolor":"رنگ پس​زمینه","chkFull":"اجازه تمام صفحه","chkLoop":"اجرای پیاپی","chkMenu":"در دسترس بودن منوی فلش","chkPlay":"آغاز خودکار","flashvars":"مقادیر برای فلش","hSpace":"فاصلهٴ افقی","properties":"ویژگی​های فلش","propertiesTab":"ویژگی​ها","quality":"کیفیت","qualityAutoHigh":"بالا - خودکار","qualityAutoLow":"پایین - خودکار","qualityBest":"بهترین","qualityHigh":"بالا","qualityLow":"پایین","qualityMedium":"متوسط","scale":"مقیاس","scaleAll":"نمایش همه","scaleFit":"جایگیری کامل","scaleNoBorder":"بدون کران","title":"ویژگی​های فلش","vSpace":"فاصلهٴ عمودی","validateHSpace":"مقدار فاصله گذاری افقی باید یک عدد باشد.","validateSrc":"لطفا URL پیوند را بنویسید","validateVSpace":"مقدار فاصله گذاری عمودی باید یک عدد باشد.","windowMode":"حالت پنجره","windowModeOpaque":"مات","windowModeTransparent":"شفاف","windowModeWindow":"پنجره"},"font":{"fontSize":{"label":"اندازه","voiceLabel":"اندازه قلم","panelTitle":"اندازه قلم"},"label":"قلم","panelTitle":"نام قلم","voiceLabel":"قلم"},"forms":{"button":{"title":"ویژگی​های دکمه","text":"متن (مقدار)","type":"نوع","typeBtn":"دکمه","typeSbm":"ثبت","typeRst":"بازنشانی (Reset)"},"checkboxAndRadio":{"checkboxTitle":"ویژگی​های خانهٴ گزینه​ای","radioTitle":"ویژگی​های دکمهٴ رادیویی","value":"مقدار","selected":"برگزیده","required":"Required"},"form":{"title":"ویژگی​های فرم","menu":"ویژگی​های فرم","action":"رویداد","method":"متد","encoding":"رمزنگاری"},"hidden":{"title":"ویژگی​های فیلد پنهان","name":"نام","value":"مقدار"},"select":{"title":"ویژگی​های فیلد چندگزینه​ای","selectInfo":"اطلاعات","opAvail":"گزینه​های دردسترس","value":"مقدار","size":"اندازه","lines":"خطوط","chkMulti":"گزینش چندگانه فراهم باشد","required":"Required","opText":"متن","opValue":"مقدار","btnAdd":"افزودن","btnModify":"ویرایش","btnUp":"بالا","btnDown":"پائین","btnSetValue":"تنظیم به عنوان مقدار برگزیده","btnDelete":"پاککردن"},"textarea":{"title":"ویژگی​های ناحیهٴ متنی","cols":"ستون​ها","rows":"سطرها"},"textfield":{"title":"ویژگی​های فیلد متنی","name":"نام","value":"مقدار","charWidth":"پهنای نویسه","maxChars":"بیشینهٴ نویسه​ها","required":"Required","type":"نوع","typeText":"متن","typePass":"گذرواژه","typeEmail":"ایمیل","typeSearch":"جستجو","typeTel":"شماره تلفن","typeUrl":"URL"}},"format":{"label":"قالب","panelTitle":"قالب بند","tag_address":"نشانی","tag_div":"بند","tag_h1":"سرنویس ۱","tag_h2":"سرنویس ۲","tag_h3":"سرنویس ۳","tag_h4":"سرنویس ۴","tag_h5":"سرنویس ۵","tag_h6":"سرنویس ۶","tag_p":"معمولی","tag_pre":"قالب‌دار"},"horizontalrule":{"toolbar":"گنجاندن خط افقی"},"iframe":{"border":"نمایش خطوط frame","noUrl":"لطفا مسیر URL iframe را درج کنید","scrolling":"نمایش خطکشها","title":"ویژگیهای IFrame","toolbar":"IFrame"},"image":{"alt":"متن جایگزین","border":"لبه","btnUpload":"به سرور بفرست","button2Img":"آیا مایلید از یک تصویر ساده روی دکمه تصویری انتخاب شده استفاده کنید؟","hSpace":"فاصلهٴ افقی","img2Button":"آیا مایلید از یک دکمه تصویری روی تصویر انتخاب شده استفاده کنید؟","infoTab":"اطلاعات تصویر","linkTab":"پیوند","lockRatio":"قفل کردن نسبت","menu":"ویژگی​های تصویر","resetSize":"بازنشانی اندازه","title":"ویژگی​های تصویر","titleButton":"ویژگی​های دکمهٴ تصویری","upload":"انتقال به سرور","urlMissing":"آدرس URL اصلی تصویر یافت نشد.","vSpace":"فاصلهٴ عمودی","validateBorder":"مقدار خطوط باید یک عدد باشد.","validateHSpace":"مقدار فاصله گذاری افقی باید یک عدد باشد.","validateVSpace":"مقدار فاصله گذاری عمودی باید یک عدد باشد."},"indent":{"indent":"افزایش تورفتگی","outdent":"کاهش تورفتگی"},"smiley":{"options":"گزینه​های خندانک","title":"گنجاندن خندانک","toolbar":"خندانک"},"justify":{"block":"بلوک چین","center":"میان چین","left":"چپ چین","right":"راست چین"},"language":{"button":"تعیین زبان","remove":"حذف زبان"},"link":{"acccessKey":"کلید دستیابی","advanced":"پیشرفته","advisoryContentType":"نوع محتوای کمکی","advisoryTitle":"عنوان کمکی","anchor":{"toolbar":"گنجاندن/ویرایش لنگر","menu":"ویژگی​های لنگر","title":"ویژگی​های لنگر","name":"نام لنگر","errorName":"لطفا نام لنگر را بنویسید","remove":"حذف لنگر"},"anchorId":"با شناسهٴ المان","anchorName":"با نام لنگر","charset":"نویسه​گان منبع پیوند شده","cssClasses":"کلاس​های شیوه​نامه(Stylesheet)","emailAddress":"نشانی پست الکترونیکی","emailBody":"متن پیام","emailSubject":"موضوع پیام","id":"شناسه","info":"اطلاعات پیوند","langCode":"جهت​نمای زبان","langDir":"جهت​نمای زبان","langDirLTR":"چپ به راست (LTR)","langDirRTL":"راست به چپ (RTL)","menu":"ویرایش پیوند","name":"نام","noAnchors":"(در این سند لنگری دردسترس نیست)","noEmail":"لطفا نشانی پست الکترونیکی را بنویسید","noUrl":"لطفا URL پیوند را بنویسید","other":"<سایر>","popupDependent":"وابسته (Netscape)","popupFeatures":"ویژگی​های پنجرهٴ پاپاپ","popupFullScreen":"تمام صفحه (IE)","popupLeft":"موقعیت چپ","popupLocationBar":"نوار موقعیت","popupMenuBar":"نوار منو","popupResizable":"قابل تغییر اندازه","popupScrollBars":"میله​های پیمایش","popupStatusBar":"نوار وضعیت","popupToolbar":"نوار ابزار","popupTop":"موقعیت بالا","rel":"وابستگی","selectAnchor":"یک لنگر برگزینید","styles":"شیوه (style)","tabIndex":"نمایهٴ دسترسی با برگه","target":"مقصد","targetFrame":"<فریم>","targetFrameName":"نام فریم مقصد","targetPopup":"<پنجرهٴ پاپاپ>","targetPopupName":"نام پنجرهٴ پاپاپ","title":"پیوند","toAnchor":"لنگر در همین صفحه","toEmail":"پست الکترونیکی","toUrl":"URL","toolbar":"گنجاندن/ویرایش پیوند","type":"نوع پیوند","unlink":"برداشتن پیوند","upload":"انتقال به سرور"},"list":{"bulletedlist":"فهرست نقطه​ای","numberedlist":"فهرست شماره​دار"},"liststyle":{"armenian":"شماره‌گذاری ارمنی","bulletedTitle":"خصوصیات فهرست نقطه‌ای","circle":"دایره","decimal":"ده‌دهی (۱، ۲، ۳، ...)","decimalLeadingZero":"دهدهی همراه با صفر (۰۱، ۰۲، ۰۳، ...)","disc":"صفحه گرد","georgian":"شمارهگذاری گریگورین (an, ban, gan, etc.)","lowerAlpha":"پانویس الفبایی (a, b, c, d, e, etc.)","lowerGreek":"پانویس یونانی (alpha, beta, gamma, etc.)","lowerRoman":"پانویس رومی (i, ii, iii, iv, v, etc.)","none":"هیچ","notset":"<تنظیم نشده>","numberedTitle":"ویژگیهای فهرست شمارهدار","square":"چهارگوش","start":"شروع","type":"نوع","upperAlpha":"بالانویس الفبایی (A, B, C, D, E, etc.)","upperRoman":"بالانویس رومی (I, II, III, IV, V, etc.)","validateStartNumber":"فهرست شماره شروع باید یک عدد صحیح باشد."},"magicline":{"title":"قرار دادن بند در اینجا"},"maximize":{"maximize":"بیشنه کردن","minimize":"کمینه کردن"},"newpage":{"toolbar":"برگهٴ تازه"},"pagebreak":{"alt":"شکستن صفحه","toolbar":"گنجاندن شکستگی پایان برگه"},"pastetext":{"button":"چسباندن به عنوان متن ساده","title":"چسباندن به عنوان متن ساده"},"pastefromword":{"confirmCleanup":"متنی که میخواهید بچسبانید به نظر میرسد که از Word کپی شده است. آیا میخواهید قبل از چسباندن آن را پاکسازی کنید؟","error":"به دلیل بروز خطای داخلی امکان پاکسازی اطلاعات بازنشانی شده وجود ندارد.","title":"چسباندن از Word","toolbar":"چسباندن از Word"},"preview":{"preview":"پیشنمایش"},"print":{"toolbar":"چاپ"},"removeformat":{"toolbar":"برداشتن فرمت"},"save":{"toolbar":"ذخیره"},"selectall":{"toolbar":"گزینش همه"},"showblocks":{"toolbar":"نمایش بلوک‌ها"},"sourcearea":{"toolbar":"منبع"},"specialchar":{"options":"گزینه‌های نویسه‌های ویژه","title":"گزینش نویسه‌ی ویژه","toolbar":"گنجاندن نویسه‌ی ویژه"},"scayt":{"btn_about":"درباره SCAYT","btn_dictionaries":"دیکشنریها","btn_disable":"غیرفعالسازی SCAYT","btn_enable":"فعالسازی SCAYT","btn_langs":"زبانها","btn_options":"گزینهها","text_title":"بررسی املای تایپ شما"},"stylescombo":{"label":"سبک","panelTitle":"سبکهای قالببندی","panelTitle1":"سبکهای بلوک","panelTitle2":"سبکهای درونخطی","panelTitle3":"سبکهای شیء"},"table":{"border":"اندازهٴ لبه","caption":"عنوان","cell":{"menu":"سلول","insertBefore":"افزودن سلول قبل از","insertAfter":"افزودن سلول بعد از","deleteCell":"حذف سلولها","merge":"ادغام سلولها","mergeRight":"ادغام به راست","mergeDown":"ادغام به پایین","splitHorizontal":"جدا کردن افقی سلول","splitVertical":"جدا کردن عمودی سلول","title":"ویژگیهای سلول","cellType":"نوع سلول","rowSpan":"محدوده ردیفها","colSpan":"محدوده ستونها","wordWrap":"شکستن کلمه","hAlign":"چینش افقی","vAlign":"چینش عمودی","alignBaseline":"خط مبنا","bgColor":"رنگ زمینه","borderColor":"رنگ خطوط","data":"اطلاعات","header":"سرنویس","yes":"بله","no":"خیر","invalidWidth":"عرض سلول باید یک عدد باشد.","invalidHeight":"ارتفاع سلول باید عدد باشد.","invalidRowSpan":"مقدار محدوده ردیفها باید یک عدد باشد.","invalidColSpan":"مقدار محدوده ستونها باید یک عدد باشد.","chooseColor":"انتخاب"},"cellPad":"فاصلهٴ پرشده در سلول","cellSpace":"فاصلهٴ میان سلولها","column":{"menu":"ستون","insertBefore":"افزودن ستون قبل از","insertAfter":"افزودن ستون بعد از","deleteColumn":"حذف ستونها"},"columns":"ستونها","deleteTable":"پاک کردن جدول","headers":"سرنویسها","headersBoth":"هردو","headersColumn":"اولین ستون","headersNone":"هیچ","headersRow":"اولین ردیف","invalidBorder":"مقدار اندازه خطوط باید یک عدد باشد.","invalidCellPadding":"بالشتک سلول باید یک عدد باشد.","invalidCellSpacing":"مقدار فاصلهگذاری سلول باید یک عدد باشد.","invalidCols":"تعداد ستونها باید یک عدد بزرگتر از 0 باشد.","invalidHeight":"مقدار ارتفاع  جدول باید یک عدد باشد.","invalidRows":"تعداد ردیفها باید یک عدد بزرگتر از 0 باشد.","invalidWidth":"مقدار پهنای جدول باید یک عدد باشد.","menu":"ویژگیهای جدول","row":{"menu":"سطر","insertBefore":"افزودن سطر قبل از","insertAfter":"افزودن سطر بعد از","deleteRow":"حذف سطرها"},"rows":"سطرها","summary":"خلاصه","title":"ویژگیهای جدول","toolbar":"جدول","widthPc":"درصد","widthPx":"پیکسل","widthUnit":"واحد پهنا"},"undo":{"redo":"بازچیدن","undo":"واچیدن"},"wsc":{"btnIgnore":"چشمپوشی","btnIgnoreAll":"چشمپوشی همه","btnReplace":"جایگزینی","btnReplaceAll":"جایگزینی همه","btnUndo":"واچینش","changeTo":"تغییر به","errorLoading":"خطا در بارگیری برنامه خدمات میزبان: %s.","ieSpellDownload":"بررسی کنندهٴ املا نصب نشده است. آیا میخواهید آن را هماکنون دریافت کنید؟","manyChanges":"بررسی املا انجام شد. %1 واژه تغییر یافت","noChanges":"بررسی املا انجام شد. هیچ واژهای تغییر نیافت","noMispell":"بررسی املا انجام شد. هیچ غلط املائی یافت نشد","noSuggestions":"- پیشنهادی نیست -","notAvailable":"با عرض پوزش خدمات الان در دسترس نیستند.","notInDic":"در واژه~نامه یافت نشد","oneChange":"بررسی املا انجام شد. یک واژه تغییر یافت","progress":"بررسی املا در حال انجام...","title":"بررسی املا","toolbar":"بررسی املا"}};
\ No newline at end of file
+CKEDITOR.lang['fa']={"editor":"ویرایش‌گر متن غنی","editorPanel":"پنل ویرایشگر متن غنی","common":{"editorHelp":"کلید Alt+0 را برای راهنمایی بفشارید","browseServer":"فهرست​نمایی سرور","url":"URL","protocol":"قرارداد","upload":"بالاگذاری","uploadSubmit":"به سرور بفرست","image":"تصویر","flash":"فلش","form":"فرم","checkbox":"چک‌باکس","radio":"دکمه‌ی رادیویی","textField":"فیلد متنی","textarea":"ناحیهٴ متنی","hiddenField":"فیلد پنهان","button":"دکمه","select":"فیلد انتخاب چند گزینه​ای","imageButton":"دکمه‌ی تصویری","notSet":"<تعیین‌نشده>","id":"شناسه","name":"نام","langDir":"جهت زبان","langDirLtr":"چپ به راست","langDirRtl":"راست به چپ","langCode":"کد زبان","longDescr":"URL توصیف طولانی","cssClass":"کلاس​های شیوه​نامه (Stylesheet)","advisoryTitle":"عنوان کمکی","cssStyle":"سبک","ok":"پذیرش","cancel":"انصراف","close":"بستن","preview":"پیش‌نمایش","resize":"تغییر اندازه","generalTab":"عمومی","advancedTab":"پیش‌رفته","validateNumberFailed":"این مقدار یک عدد نیست.","confirmNewPage":"هر تغییر ایجاد شده​ی ذخیره نشده از بین خواهد رفت. آیا اطمینان دارید که قصد بارگیری صفحه جدیدی را دارید؟","confirmCancel":"برخی از گزینه‌ها تغییر کرده‌اند. آیا واقعا قصد بستن این پنجره را دارید؟","options":"گزینه​ها","target":"مقصد","targetNew":"پنجره جدید","targetTop":"بالاترین پنجره","targetSelf":"همان پنجره","targetParent":"پنجره والد","langDirLTR":"چپ به راست","langDirRTL":"راست به چپ","styles":"سبک","cssClasses":"کلاس‌های سبک‌نامه","width":"عرض","height":"طول","align":"چینش","alignLeft":"چپ","alignRight":"راست","alignCenter":"وسط","alignJustify":"بلوک چین","alignTop":"بالا","alignMiddle":"میانه","alignBottom":"پائین","alignNone":"هیچ","invalidValue":"مقدار نامعتبر.","invalidHeight":"ارتفاع باید یک عدد باشد.","invalidWidth":"عرض باید یک عدد باشد.","invalidCssLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری CSS معتبر باشد (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری HTML معتبر باشد (px or %).","invalidInlineStyle":"عدد تعیین شده برای سبک درون​خطی -Inline Style- باید دارای یک یا چند چندتایی با شکلی شبیه \"name : value\" که باید با یک \";\" از هم جدا شوند.","cssLengthTooltip":"یک عدد برای یک مقدار بر حسب پیکسل و یا یک عدد با یک واحد CSS معتبر وارد کنید (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">، غیر قابل دسترس</span>","keyboard":{"8":"عقبگرد","13":"ورود","16":"تعویض","17":"کنترل","18":"دگرساز","32":"Space","35":"پایان","36":"خانه","46":"حذف","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"حق نشر &copy; $1. کلیه حقوق محفوظ است.","dlgTitle":"درباره CKEditor","help":" برای راهنمایی $1 را ملاحظه کنید.","moreInfo":"برای کسب اطلاعات مجوز لطفا به وب سایت ما مراجعه کنید:","title":"درباره CKEditor","userGuide":"راهنمای کاربران CKEditor"},"basicstyles":{"bold":"درشت","italic":"خمیده","strike":"خط‌خورده","subscript":"زیرنویس","superscript":"بالانویس","underline":"زیرخط‌دار"},"bidi":{"ltr":"جهت متن از چپ به راست","rtl":"جهت متن از راست به چپ"},"blockquote":{"toolbar":"بلوک نقل قول"},"clipboard":{"copy":"رونوشت","copyError":"تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای کپی کردن را انجام دهد. لطفا با دکمههای صفحه کلید این کار را انجام دهید (Ctrl/Cmd+C).","cut":"برش","cutError":"تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای برش را انجام دهد. لطفا با دکمههای صفحه کلید این کار را انجام دهید (Ctrl/Cmd+X).","paste":"چسباندن","pasteArea":"محل چسباندن","pasteMsg":"لطفا متن را با کلیدهای (<STRONG>Ctrl/Cmd+V</STRONG>) در این جعبهٴ متنی بچسبانید و <STRONG>پذیرش</STRONG> را بزنید.","securityMsg":"به خاطر تنظیمات امنیتی مرورگر شما، ویرایشگر نمیتواند دسترسی مستقیم به دادههای clipboard داشته باشد. شما باید دوباره آنرا در این پنجره بچسبانید.","title":"چسباندن"},"button":{"selectedLabel":"%1 (انتخاب شده)"},"colorbutton":{"auto":"خودکار","bgColorTitle":"رنگ پس​زمینه","colors":{"000":"سیاه","800000":"خرمایی","8B4513":"قهوه​ای شکلاتی","2F4F4F":"ارغوانی مایل به خاکستری","008080":"آبی مایل به خاکستری","000080":"آبی سیر","4B0082":"نیلی","696969":"خاکستری تیره","B22222":"آتش آجری","A52A2A":"قهوه​ای","DAA520":"میله​ی طلایی","006400":"سبز تیره","40E0D0":"فیروزه​ای","0000CD":"آبی روشن","800080":"ارغوانی","808080":"خاکستری","F00":"قرمز","FF8C00":"نارنجی پررنگ","FFD700":"طلایی","008000":"سبز","0FF":"آبی مایل به سبز","00F":"آبی","EE82EE":"بنفش","A9A9A9":"خاکستری مات","FFA07A":"صورتی کدر روشن","FFA500":"نارنجی","FFFF00":"زرد","00FF00":"فسفری","AFEEEE":"فیروزه​ای رنگ پریده","ADD8E6":"آبی کمرنگ","DDA0DD":"آلویی","D3D3D3":"خاکستری روشن","FFF0F5":"بنفش کمرنگ","FAEBD7":"عتیقه سفید","FFFFE0":"زرد روشن","F0FFF0":"عسلی","F0FFFF":"لاجوردی","F0F8FF":"آبی براق","E6E6FA":"بنفش کمرنگ","FFF":"سفید","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"رنگ​های بیشتر...","panelTitle":"رنگها","textColorTitle":"رنگ متن"},"colordialog":{"clear":"پاک کردن","highlight":"متمایز","options":"گزینه​های رنگ","selected":"رنگ انتخاب شده","title":"انتخاب رنگ"},"templates":{"button":"الگوها","emptyListMsg":"(الگوئی تعریف نشده است)","insertOption":"محتویات کنونی جایگزین شوند","options":"گزینه‌های الگو","selectPromptMsg":"لطفاً الگوی مورد نظر را برای بازکردن در ویرایشگر انتخاب کنید","title":"الگوهای محتویات"},"contextmenu":{"options":"گزینه​های منوی زمینه"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"شناسه","advisoryTitleInputLabel":"عنوان مشاوره","cssClassInputLabel":"کلاس​های شیوه​نامه","edit":"ویرایش Div","inlineStyleInputLabel":"سبک درون​خطی(Inline Style)","langDirLTRLabel":"چپ به راست (LTR)","langDirLabel":"جهت نوشتاری زبان","langDirRTLLabel":"راست به چپ (RTL)","languageCodeInputLabel":" کد زبان","remove":"حذف Div","styleSelectLabel":"سبک","title":"ایجاد یک محل DIV","toolbar":"ایجاد یک محل DIV"},"toolbar":{"toolbarCollapse":"بستن نوار ابزار","toolbarExpand":"بازکردن نوار ابزار","toolbarGroups":{"document":"سند","clipboard":"حافظه موقت/برگشت","editing":"در حال ویرایش","forms":"فرم​ها","basicstyles":"سبک‌های پایه","paragraph":"بند","links":"پیوندها","insert":"ورود","styles":"سبک‌ها","colors":"رنگ​ها","tools":"ابزارها"},"toolbars":"نوار ابزارهای ویرایش‌گر"},"elementspath":{"eleLabel":"مسیر عناصر","eleTitle":"%1 عنصر"},"find":{"find":"جستجو","findOptions":"گزینه​های جستجو","findWhat":"چه چیز را مییابید:","matchCase":"همسانی در بزرگی و کوچکی نویسه​ها","matchCyclic":"همسانی با چرخه","matchWord":"همسانی با واژهٴ کامل","notFoundMsg":"متن موردنظر یافت نشد.","replace":"جایگزینی","replaceAll":"جایگزینی همهٴ یافته​ها","replaceSuccessMsg":"%1 رخداد جایگزین شد.","replaceWith":"جایگزینی با:","title":"جستجو و جایگزینی"},"fakeobjects":{"anchor":"لنگر","flash":"انیمشن فلش","hiddenfield":"فیلد پنهان","iframe":"IFrame","unknown":"شیء ناشناخته"},"flash":{"access":"دسترسی به اسکریپت","accessAlways":"همیشه","accessNever":"هرگز","accessSameDomain":"همان دامنه","alignAbsBottom":"پائین مطلق","alignAbsMiddle":"وسط مطلق","alignBaseline":"خط پایه","alignTextTop":"متن بالا","bgcolor":"رنگ پس​زمینه","chkFull":"اجازه تمام صفحه","chkLoop":"اجرای پیاپی","chkMenu":"در دسترس بودن منوی فلش","chkPlay":"آغاز خودکار","flashvars":"مقادیر برای فلش","hSpace":"فاصلهٴ افقی","properties":"ویژگی​های فلش","propertiesTab":"ویژگی​ها","quality":"کیفیت","qualityAutoHigh":"بالا - خودکار","qualityAutoLow":"پایین - خودکار","qualityBest":"بهترین","qualityHigh":"بالا","qualityLow":"پایین","qualityMedium":"متوسط","scale":"مقیاس","scaleAll":"نمایش همه","scaleFit":"جایگیری کامل","scaleNoBorder":"بدون کران","title":"ویژگی​های فلش","vSpace":"فاصلهٴ عمودی","validateHSpace":"مقدار فاصله گذاری افقی باید یک عدد باشد.","validateSrc":"لطفا URL پیوند را بنویسید","validateVSpace":"مقدار فاصله گذاری عمودی باید یک عدد باشد.","windowMode":"حالت پنجره","windowModeOpaque":"مات","windowModeTransparent":"شفاف","windowModeWindow":"پنجره"},"font":{"fontSize":{"label":"اندازه","voiceLabel":"اندازه قلم","panelTitle":"اندازه قلم"},"label":"قلم","panelTitle":"نام قلم","voiceLabel":"قلم"},"forms":{"button":{"title":"ویژگی​های دکمه","text":"متن (مقدار)","type":"نوع","typeBtn":"دکمه","typeSbm":"ثبت","typeRst":"بازنشانی (Reset)"},"checkboxAndRadio":{"checkboxTitle":"ویژگی​های خانهٴ گزینه​ای","radioTitle":"ویژگی​های دکمهٴ رادیویی","value":"مقدار","selected":"برگزیده","required":"Required"},"form":{"title":"ویژگی​های فرم","menu":"ویژگی​های فرم","action":"رویداد","method":"متد","encoding":"رمزنگاری"},"hidden":{"title":"ویژگی​های فیلد پنهان","name":"نام","value":"مقدار"},"select":{"title":"ویژگی​های فیلد چندگزینه​ای","selectInfo":"اطلاعات","opAvail":"گزینه​های دردسترس","value":"مقدار","size":"اندازه","lines":"خطوط","chkMulti":"گزینش چندگانه فراهم باشد","required":"Required","opText":"متن","opValue":"مقدار","btnAdd":"افزودن","btnModify":"ویرایش","btnUp":"بالا","btnDown":"پائین","btnSetValue":"تنظیم به عنوان مقدار برگزیده","btnDelete":"پاککردن"},"textarea":{"title":"ویژگی​های ناحیهٴ متنی","cols":"ستون​ها","rows":"سطرها"},"textfield":{"title":"ویژگی​های فیلد متنی","name":"نام","value":"مقدار","charWidth":"پهنای نویسه","maxChars":"بیشینهٴ نویسه​ها","required":"Required","type":"نوع","typeText":"متن","typePass":"گذرواژه","typeEmail":"ایمیل","typeSearch":"جستجو","typeTel":"شماره تلفن","typeUrl":"URL"}},"format":{"label":"قالب","panelTitle":"قالب بند","tag_address":"نشانی","tag_div":"بند","tag_h1":"سرنویس ۱","tag_h2":"سرنویس ۲","tag_h3":"سرنویس ۳","tag_h4":"سرنویس ۴","tag_h5":"سرنویس ۵","tag_h6":"سرنویس ۶","tag_p":"معمولی","tag_pre":"قالب‌دار"},"horizontalrule":{"toolbar":"گنجاندن خط افقی"},"iframe":{"border":"نمایش خطوط frame","noUrl":"لطفا مسیر URL iframe را درج کنید","scrolling":"نمایش خطکشها","title":"ویژگیهای IFrame","toolbar":"IFrame"},"image":{"alt":"متن جایگزین","border":"لبه","btnUpload":"به سرور بفرست","button2Img":"آیا مایلید از یک تصویر ساده روی دکمه تصویری انتخاب شده استفاده کنید؟","hSpace":"فاصلهٴ افقی","img2Button":"آیا مایلید از یک دکمه تصویری روی تصویر انتخاب شده استفاده کنید؟","infoTab":"اطلاعات تصویر","linkTab":"پیوند","lockRatio":"قفل کردن نسبت","menu":"ویژگی​های تصویر","resetSize":"بازنشانی اندازه","title":"ویژگی​های تصویر","titleButton":"ویژگی​های دکمهٴ تصویری","upload":"انتقال به سرور","urlMissing":"آدرس URL اصلی تصویر یافت نشد.","vSpace":"فاصلهٴ عمودی","validateBorder":"مقدار خطوط باید یک عدد باشد.","validateHSpace":"مقدار فاصله گذاری افقی باید یک عدد باشد.","validateVSpace":"مقدار فاصله گذاری عمودی باید یک عدد باشد."},"indent":{"indent":"افزایش تورفتگی","outdent":"کاهش تورفتگی"},"smiley":{"options":"گزینه​های خندانک","title":"گنجاندن خندانک","toolbar":"خندانک"},"justify":{"block":"بلوک چین","center":"میان چین","left":"چپ چین","right":"راست چین"},"language":{"button":"تعیین زبان","remove":"حذف زبان"},"link":{"acccessKey":"کلید دستیابی","advanced":"پیشرفته","advisoryContentType":"نوع محتوای کمکی","advisoryTitle":"عنوان کمکی","anchor":{"toolbar":"گنجاندن/ویرایش لنگر","menu":"ویژگی​های لنگر","title":"ویژگی​های لنگر","name":"نام لنگر","errorName":"لطفا نام لنگر را بنویسید","remove":"حذف لنگر"},"anchorId":"با شناسهٴ المان","anchorName":"با نام لنگر","charset":"نویسه​گان منبع پیوند شده","cssClasses":"کلاس​های شیوه​نامه(Stylesheet)","download":"Force Download","displayText":"Display Text","emailAddress":"نشانی پست الکترونیکی","emailBody":"متن پیام","emailSubject":"موضوع پیام","id":"شناسه","info":"اطلاعات پیوند","langCode":"جهت​نمای زبان","langDir":"جهت​نمای زبان","langDirLTR":"چپ به راست (LTR)","langDirRTL":"راست به چپ (RTL)","menu":"ویرایش پیوند","name":"نام","noAnchors":"(در این سند لنگری دردسترس نیست)","noEmail":"لطفا نشانی پست الکترونیکی را بنویسید","noUrl":"لطفا URL پیوند را بنویسید","other":"<سایر>","popupDependent":"وابسته (Netscape)","popupFeatures":"ویژگی​های پنجرهٴ پاپاپ","popupFullScreen":"تمام صفحه (IE)","popupLeft":"موقعیت چپ","popupLocationBar":"نوار موقعیت","popupMenuBar":"نوار منو","popupResizable":"قابل تغییر اندازه","popupScrollBars":"میله​های پیمایش","popupStatusBar":"نوار وضعیت","popupToolbar":"نوار ابزار","popupTop":"موقعیت بالا","rel":"وابستگی","selectAnchor":"یک لنگر برگزینید","styles":"شیوه (style)","tabIndex":"نمایهٴ دسترسی با برگه","target":"مقصد","targetFrame":"<فریم>","targetFrameName":"نام فریم مقصد","targetPopup":"<پنجرهٴ پاپاپ>","targetPopupName":"نام پنجرهٴ پاپاپ","title":"پیوند","toAnchor":"لنگر در همین صفحه","toEmail":"پست الکترونیکی","toUrl":"URL","toolbar":"گنجاندن/ویرایش پیوند","type":"نوع پیوند","unlink":"برداشتن پیوند","upload":"انتقال به سرور"},"list":{"bulletedlist":"فهرست نقطه​ای","numberedlist":"فهرست شماره​دار"},"liststyle":{"armenian":"شماره‌گذاری ارمنی","bulletedTitle":"خصوصیات فهرست نقطه‌ای","circle":"دایره","decimal":"ده‌دهی (۱، ۲، ۳، ...)","decimalLeadingZero":"دهدهی همراه با صفر (۰۱، ۰۲، ۰۳، ...)","disc":"صفحه گرد","georgian":"شمارهگذاری گریگورین (an, ban, gan, etc.)","lowerAlpha":"پانویس الفبایی (a, b, c, d, e, etc.)","lowerGreek":"پانویس یونانی (alpha, beta, gamma, etc.)","lowerRoman":"پانویس رومی (i, ii, iii, iv, v, etc.)","none":"هیچ","notset":"<تنظیم نشده>","numberedTitle":"ویژگیهای فهرست شمارهدار","square":"چهارگوش","start":"شروع","type":"نوع","upperAlpha":"بالانویس الفبایی (A, B, C, D, E, etc.)","upperRoman":"بالانویس رومی (I, II, III, IV, V, etc.)","validateStartNumber":"فهرست شماره شروع باید یک عدد صحیح باشد."},"magicline":{"title":"قرار دادن بند در اینجا"},"maximize":{"maximize":"بیشنه کردن","minimize":"کمینه کردن"},"newpage":{"toolbar":"برگهٴ تازه"},"pagebreak":{"alt":"شکستن صفحه","toolbar":"گنجاندن شکستگی پایان برگه"},"pastetext":{"button":"چسباندن به عنوان متن ساده","title":"چسباندن به عنوان متن ساده"},"pastefromword":{"confirmCleanup":"متنی که میخواهید بچسبانید به نظر میرسد که از Word کپی شده است. آیا میخواهید قبل از چسباندن آن را پاکسازی کنید؟","error":"به دلیل بروز خطای داخلی امکان پاکسازی اطلاعات بازنشانی شده وجود ندارد.","title":"چسباندن از Word","toolbar":"چسباندن از Word"},"preview":{"preview":"پیشنمایش"},"print":{"toolbar":"چاپ"},"removeformat":{"toolbar":"برداشتن فرمت"},"save":{"toolbar":"ذخیره"},"selectall":{"toolbar":"گزینش همه"},"showblocks":{"toolbar":"نمایش بلوک‌ها"},"sourcearea":{"toolbar":"منبع"},"specialchar":{"options":"گزینه‌های نویسه‌های ویژه","title":"گزینش نویسه‌ی ویژه","toolbar":"گنجاندن نویسه‌ی ویژه"},"scayt":{"btn_about":"درباره SCAYT","btn_dictionaries":"دیکشنریها","btn_disable":"غیرفعالسازی SCAYT","btn_enable":"فعالسازی SCAYT","btn_langs":"زبانها","btn_options":"گزینهها","text_title":"بررسی املای تایپ شما"},"stylescombo":{"label":"سبک","panelTitle":"سبکهای قالببندی","panelTitle1":"سبکهای بلوک","panelTitle2":"سبکهای درونخطی","panelTitle3":"سبکهای شیء"},"table":{"border":"اندازهٴ لبه","caption":"عنوان","cell":{"menu":"سلول","insertBefore":"افزودن سلول قبل از","insertAfter":"افزودن سلول بعد از","deleteCell":"حذف سلولها","merge":"ادغام سلولها","mergeRight":"ادغام به راست","mergeDown":"ادغام به پایین","splitHorizontal":"جدا کردن افقی سلول","splitVertical":"جدا کردن عمودی سلول","title":"ویژگیهای سلول","cellType":"نوع سلول","rowSpan":"محدوده ردیفها","colSpan":"محدوده ستونها","wordWrap":"شکستن کلمه","hAlign":"چینش افقی","vAlign":"چینش عمودی","alignBaseline":"خط مبنا","bgColor":"رنگ زمینه","borderColor":"رنگ خطوط","data":"اطلاعات","header":"سرنویس","yes":"بله","no":"خیر","invalidWidth":"عرض سلول باید یک عدد باشد.","invalidHeight":"ارتفاع سلول باید عدد باشد.","invalidRowSpan":"مقدار محدوده ردیفها باید یک عدد باشد.","invalidColSpan":"مقدار محدوده ستونها باید یک عدد باشد.","chooseColor":"انتخاب"},"cellPad":"فاصلهٴ پرشده در سلول","cellSpace":"فاصلهٴ میان سلولها","column":{"menu":"ستون","insertBefore":"افزودن ستون قبل از","insertAfter":"افزودن ستون بعد از","deleteColumn":"حذف ستونها"},"columns":"ستونها","deleteTable":"پاک کردن جدول","headers":"سرنویسها","headersBoth":"هردو","headersColumn":"اولین ستون","headersNone":"هیچ","headersRow":"اولین ردیف","invalidBorder":"مقدار اندازه خطوط باید یک عدد باشد.","invalidCellPadding":"بالشتک سلول باید یک عدد باشد.","invalidCellSpacing":"مقدار فاصلهگذاری سلول باید یک عدد باشد.","invalidCols":"تعداد ستونها باید یک عدد بزرگتر از 0 باشد.","invalidHeight":"مقدار ارتفاع  جدول باید یک عدد باشد.","invalidRows":"تعداد ردیفها باید یک عدد بزرگتر از 0 باشد.","invalidWidth":"مقدار پهنای جدول باید یک عدد باشد.","menu":"ویژگیهای جدول","row":{"menu":"سطر","insertBefore":"افزودن سطر قبل از","insertAfter":"افزودن سطر بعد از","deleteRow":"حذف سطرها"},"rows":"سطرها","summary":"خلاصه","title":"ویژگیهای جدول","toolbar":"جدول","widthPc":"درصد","widthPx":"پیکسل","widthUnit":"واحد پهنا"},"undo":{"redo":"بازچیدن","undo":"واچیدن"},"wsc":{"btnIgnore":"چشمپوشی","btnIgnoreAll":"چشمپوشی همه","btnReplace":"جایگزینی","btnReplaceAll":"جایگزینی همه","btnUndo":"واچینش","changeTo":"تغییر به","errorLoading":"خطا در بارگیری برنامه خدمات میزبان: %s.","ieSpellDownload":"بررسی کنندهٴ املا نصب نشده است. آیا میخواهید آن را هماکنون دریافت کنید؟","manyChanges":"بررسی املا انجام شد. %1 واژه تغییر یافت","noChanges":"بررسی املا انجام شد. هیچ واژهای تغییر نیافت","noMispell":"بررسی املا انجام شد. هیچ غلط املائی یافت نشد","noSuggestions":"- پیشنهادی نیست -","notAvailable":"با عرض پوزش خدمات الان در دسترس نیستند.","notInDic":"در واژه~نامه یافت نشد","oneChange":"بررسی املا انجام شد. یک واژه تغییر یافت","progress":"بررسی املا در حال انجام...","title":"بررسی املا","toolbar":"بررسی املا"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/lang/fi.js
index 37b61fc1f91..16ca01f563f 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/fi.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/fi.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fi']={"editor":"Rikastekstieditori","editorPanel":"Rikastekstieditoripaneeli","common":{"editorHelp":"Paina ALT 0 nähdäksesi ohjeen","browseServer":"Selaa palvelinta","url":"Osoite","protocol":"Protokolla","upload":"Lisää tiedosto","uploadSubmit":"Lähetä palvelimelle","image":"Kuva","flash":"Flash-animaatio","form":"Lomake","checkbox":"Valintaruutu","radio":"Radiopainike","textField":"Tekstikenttä","textarea":"Tekstilaatikko","hiddenField":"Piilokenttä","button":"Painike","select":"Valintakenttä","imageButton":"Kuvapainike","notSet":"<ei asetettu>","id":"Tunniste","name":"Nimi","langDir":"Kielen suunta","langDirLtr":"Vasemmalta oikealle (LTR)","langDirRtl":"Oikealta vasemmalle (RTL)","langCode":"Kielikoodi","longDescr":"Pitkän kuvauksen URL","cssClass":"Tyyliluokat","advisoryTitle":"Avustava otsikko","cssStyle":"Tyyli","ok":"OK","cancel":"Peruuta","close":"Sulje","preview":"Esikatselu","resize":"Raahaa muuttaaksesi kokoa","generalTab":"Yleinen","advancedTab":"Lisäominaisuudet","validateNumberFailed":"Arvon pitää olla numero.","confirmNewPage":"Kaikki tallentamattomat muutokset tähän sisältöön menetetään. Oletko varma, että haluat ladata uuden sivun?","confirmCancel":"Jotkut asetuksista on muuttuneet. Oletko varma, että haluat sulkea valintaikkunan?","options":"Asetukset","target":"Kohde","targetNew":"Uusi ikkuna (_blank)","targetTop":"Päällimmäinen ikkuna (_top)","targetSelf":"Sama ikkuna (_self)","targetParent":"Ylemmän tason ikkuna (_parent)","langDirLTR":"Vasemmalta oikealle (LTR)","langDirRTL":"Oikealta vasemmalle (RTL)","styles":"Tyyli","cssClasses":"Tyylitiedoston luokat","width":"Leveys","height":"Korkeus","align":"Kohdistus","alignLeft":"Vasemmalle","alignRight":"Oikealle","alignCenter":"Keskelle","alignJustify":"Tasaa molemmat reunat","alignTop":"Ylös","alignMiddle":"Keskelle","alignBottom":"Alas","alignNone":"Ei asetettu","invalidValue":"Virheellinen arvo.","invalidHeight":"Korkeuden täytyy olla numero.","invalidWidth":"Leveyden täytyy olla numero.","invalidCssLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku CSS mittayksikön (px, %, in, cm, mm, em, ex, pt tai pc) kanssa tai ilman.","invalidHtmlLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku HTML mittayksikön (px tai %) kanssa tai ilman.","invalidInlineStyle":"Tyylille annetun arvon täytyy koostua yhdestä tai useammasta \"nimi : arvo\" parista, jotka ovat eroteltuna toisistaan puolipisteillä.","cssLengthTooltip":"Anna numeroarvo pikseleinä tai numeroarvo CSS mittayksikön kanssa (px, %, in, cm, mm, em, ex, pt, tai pc).","unavailable":"%1<span class=\"cke_accessibility\">, ei saatavissa</span>"},"about":{"copy":"Copyright &copy; $1. Kaikki oikeuden pidätetään.","dlgTitle":"Tietoa CKEditorista","help":"Katso ohjeet: $1.","moreInfo":"Lisenssitiedot löytyvät kotisivuiltamme:","title":"Tietoa CKEditorista","userGuide":"CKEditorin käyttäjäopas"},"basicstyles":{"bold":"Lihavoitu","italic":"Kursivoitu","strike":"Yliviivattu","subscript":"Alaindeksi","superscript":"Yläindeksi","underline":"Alleviivattu"},"bidi":{"ltr":"Tekstin suunta vasemmalta oikealle","rtl":"Tekstin suunta oikealta vasemmalle"},"blockquote":{"toolbar":"Lainaus"},"clipboard":{"copy":"Kopioi","copyError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa kopioimista. Käytä näppäimistöä kopioimiseen (Ctrl+C).","cut":"Leikkaa","cutError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa leikkaamista. Käytä näppäimistöä leikkaamiseen (Ctrl+X).","paste":"Liitä","pasteArea":"Leikealue","pasteMsg":"Liitä painamalla (<STRONG>Ctrl+V</STRONG>) ja painamalla <STRONG>OK</STRONG>.","securityMsg":"Selaimesi turva-asetukset eivät salli editorin käyttää leikepöytää suoraan. Sinun pitää suorittaa liittäminen tässä ikkunassa.","title":"Liitä"},"button":{"selectedLabel":"%1 (Valittu)"},"colorbutton":{"auto":"Automaattinen","bgColorTitle":"Taustaväri","colors":{"000":"Musta","800000":"Kastanjanruskea","8B4513":"Satulanruskea","2F4F4F":"Tumma liuskekivenharmaa","008080":"Sinivihreä","000080":"Laivastonsininen","4B0082":"Indigonsininen","696969":"Tummanharmaa","B22222":"Tiili","A52A2A":"Ruskea","DAA520":"Kultapiisku","006400":"Tummanvihreä","40E0D0":"Turkoosi","0000CD":"Keskisininen","800080":"Purppura","808080":"Harmaa","F00":"Punainen","FF8C00":"Tumma oranssi","FFD700":"Kulta","008000":"Vihreä","0FF":"Syaani","00F":"Sininen","EE82EE":"Violetti","A9A9A9":"Tummanharmaa","FFA07A":"Vaaleanlohenpunainen","FFA500":"Oranssi","FFFF00":"Keltainen","00FF00":"Limetin vihreä","AFEEEE":"Haalea turkoosi","ADD8E6":"Vaaleansininen","DDA0DD":"Luumu","D3D3D3":"Vaaleanharmaa","FFF0F5":"Laventelinpunainen","FAEBD7":"Antiikinvalkoinen","FFFFE0":"Vaaleankeltainen","F0FFF0":"Hunajameloni","F0FFFF":"Asurinsininen","F0F8FF":"Alice Blue -sininen","E6E6FA":"Lavanteli","FFF":"Valkoinen"},"more":"Lisää värejä...","panelTitle":"Värit","textColorTitle":"Tekstiväri"},"colordialog":{"clear":"Poista","highlight":"Korostus","options":"Värin ominaisuudet","selected":"Valittu","title":"Valitse väri"},"templates":{"button":"Pohjat","emptyListMsg":"(Ei määriteltyjä pohjia)","insertOption":"Korvaa koko sisältö","options":"Sisältöpohjan ominaisuudet","selectPromptMsg":"Valitse editoriin avattava pohja","title":"Sisältöpohjat"},"contextmenu":{"options":"Pikavalikon ominaisuudet"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Ohjeistava otsikko","cssClassInputLabel":"Tyylitiedoston luokat","edit":"Muokkaa Diviä","inlineStyleInputLabel":"Sisätyyli","langDirLTRLabel":"Vasemmalta oikealle (LTR)","langDirLabel":"Kielen suunta","langDirRTLLabel":"Oikealta vasemmalle (RTL)","languageCodeInputLabel":" Kielen koodi","remove":"Poista Div","styleSelectLabel":"Tyyli","title":"Luo div-kehikko","toolbar":"Luo div-kehikko"},"toolbar":{"toolbarCollapse":"Kutista työkalupalkki","toolbarExpand":"Laajenna työkalupalkki","toolbarGroups":{"document":"Dokumentti","clipboard":"Leikepöytä/Kumoa","editing":"Muokkaus","forms":"Lomakkeet","basicstyles":"Perustyylit","paragraph":"Kappale","links":"Linkit","insert":"Lisää","styles":"Tyylit","colors":"Värit","tools":"Työkalut"},"toolbars":"Editorin työkalupalkit"},"elementspath":{"eleLabel":"Elementin polku","eleTitle":"%1 elementti"},"find":{"find":"Etsi","findOptions":"Hakuasetukset","findWhat":"Etsi mitä:","matchCase":"Sama kirjainkoko","matchCyclic":"Kierrä ympäri","matchWord":"Koko sana","notFoundMsg":"Etsittyä tekstiä ei löytynyt.","replace":"Korvaa","replaceAll":"Korvaa kaikki","replaceSuccessMsg":"%1 esiintymä(ä) korvattu.","replaceWith":"Korvaa tällä:","title":"Etsi ja korvaa"},"fakeobjects":{"anchor":"Ankkuri","flash":"Flash animaatio","hiddenfield":"Piilokenttä","iframe":"IFrame-kehys","unknown":"Tuntematon objekti"},"flash":{"access":"Skriptien pääsy","accessAlways":"Aina","accessNever":"Ei koskaan","accessSameDomain":"Sama verkkotunnus","alignAbsBottom":"Aivan alas","alignAbsMiddle":"Aivan keskelle","alignBaseline":"Alas (teksti)","alignTextTop":"Ylös (teksti)","bgcolor":"Taustaväri","chkFull":"Salli kokoruututila","chkLoop":"Toisto","chkMenu":"Näytä Flash-valikko","chkPlay":"Automaattinen käynnistys","flashvars":"Muuttujat Flash:lle","hSpace":"Vaakatila","properties":"Flash-ominaisuudet","propertiesTab":"Ominaisuudet","quality":"Laatu","qualityAutoHigh":"Automaattinen korkea","qualityAutoLow":"Automaattinen matala","qualityBest":"Paras","qualityHigh":"Korkea","qualityLow":"Matala","qualityMedium":"Keskitaso","scale":"Levitä","scaleAll":"Näytä kaikki","scaleFit":"Tarkka koko","scaleNoBorder":"Ei rajaa","title":"Flash ominaisuudet","vSpace":"Pystytila","validateHSpace":"Vaakatilan täytyy olla numero.","validateSrc":"Linkille on kirjoitettava URL","validateVSpace":"Pystytilan täytyy olla numero.","windowMode":"Ikkuna tila","windowModeOpaque":"Läpinäkyvyys","windowModeTransparent":"Läpinäkyvä","windowModeWindow":"Ikkuna"},"font":{"fontSize":{"label":"Koko","voiceLabel":"Kirjaisimen koko","panelTitle":"Koko"},"label":"Kirjaisinlaji","panelTitle":"Kirjaisinlaji","voiceLabel":"Kirjaisinlaji"},"forms":{"button":{"title":"Painikkeen ominaisuudet","text":"Teksti (arvo)","type":"Tyyppi","typeBtn":"Painike","typeSbm":"Lähetä","typeRst":"Tyhjennä"},"checkboxAndRadio":{"checkboxTitle":"Valintaruudun ominaisuudet","radioTitle":"Radiopainikkeen ominaisuudet","value":"Arvo","selected":"Valittu","required":"Required"},"form":{"title":"Lomakkeen ominaisuudet","menu":"Lomakkeen ominaisuudet","action":"Toiminto","method":"Tapa","encoding":"Enkoodaus"},"hidden":{"title":"Piilokentän ominaisuudet","name":"Nimi","value":"Arvo"},"select":{"title":"Valintakentän ominaisuudet","selectInfo":"Info","opAvail":"Ominaisuudet","value":"Arvo","size":"Koko","lines":"Rivit","chkMulti":"Salli usea valinta","required":"Required","opText":"Teksti","opValue":"Arvo","btnAdd":"Lisää","btnModify":"Muuta","btnUp":"Ylös","btnDown":"Alas","btnSetValue":"Aseta valituksi","btnDelete":"Poista"},"textarea":{"title":"Tekstilaatikon ominaisuudet","cols":"Sarakkeita","rows":"Rivejä"},"textfield":{"title":"Tekstikentän ominaisuudet","name":"Nimi","value":"Arvo","charWidth":"Leveys","maxChars":"Maksimi merkkimäärä","required":"Required","type":"Tyyppi","typeText":"Teksti","typePass":"Salasana","typeEmail":"Sähköposti","typeSearch":"Haku","typeTel":"Puhelinnumero","typeUrl":"Osoite"}},"format":{"label":"Muotoilu","panelTitle":"Muotoilu","tag_address":"Osoite","tag_div":"Normaali (DIV)","tag_h1":"Otsikko 1","tag_h2":"Otsikko 2","tag_h3":"Otsikko 3","tag_h4":"Otsikko 4","tag_h5":"Otsikko 5","tag_h6":"Otsikko 6","tag_p":"Normaali","tag_pre":"Muotoiltu"},"horizontalrule":{"toolbar":"Lisää murtoviiva"},"iframe":{"border":"Näytä kehyksen reunat","noUrl":"Anna IFrame-kehykselle lähdeosoite (src)","scrolling":"Näytä vierityspalkit","title":"IFrame-kehyksen ominaisuudet","toolbar":"IFrame-kehys"},"image":{"alt":"Vaihtoehtoinen teksti","border":"Kehys","btnUpload":"Lähetä palvelimelle","button2Img":"Haluatko muuntaa valitun kuvanäppäimen kuvaksi?","hSpace":"Vaakatila","img2Button":"Haluatko muuntaa valitun kuvan kuvanäppäimeksi?","infoTab":"Kuvan tiedot","linkTab":"Linkki","lockRatio":"Lukitse suhteet","menu":"Kuvan ominaisuudet","resetSize":"Alkuperäinen koko","title":"Kuvan ominaisuudet","titleButton":"Kuvapainikkeen ominaisuudet","upload":"Lisää kuva","urlMissing":"Kuvan lähdeosoite puuttuu.","vSpace":"Pystytila","validateBorder":"Kehyksen täytyy olla kokonaisluku.","validateHSpace":"HSpace-määrityksen täytyy olla kokonaisluku.","validateVSpace":"VSpace-määrityksen täytyy olla kokonaisluku."},"indent":{"indent":"Suurenna sisennystä","outdent":"Pienennä sisennystä"},"smiley":{"options":"Hymiön ominaisuudet","title":"Lisää hymiö","toolbar":"Hymiö"},"justify":{"block":"Tasaa molemmat reunat","center":"Keskitä","left":"Tasaa vasemmat reunat","right":"Tasaa oikeat reunat"},"language":{"button":"Aseta kieli","remove":"Poista kieli"},"link":{"acccessKey":"Pikanäppäin","advanced":"Lisäominaisuudet","advisoryContentType":"Avustava sisällön tyyppi","advisoryTitle":"Avustava otsikko","anchor":{"toolbar":"Lisää ankkuri/muokkaa ankkuria","menu":"Ankkurin ominaisuudet","title":"Ankkurin ominaisuudet","name":"Nimi","errorName":"Ankkurille on kirjoitettava nimi","remove":"Poista ankkuri"},"anchorId":"Ankkurin ID:n mukaan","anchorName":"Ankkurin nimen mukaan","charset":"Linkitetty kirjaimisto","cssClasses":"Tyyliluokat","emailAddress":"Sähköpostiosoite","emailBody":"Viesti","emailSubject":"Aihe","id":"Tunniste","info":"Linkin tiedot","langCode":"Kielen suunta","langDir":"Kielen suunta","langDirLTR":"Vasemmalta oikealle (LTR)","langDirRTL":"Oikealta vasemmalle (RTL)","menu":"Muokkaa linkkiä","name":"Nimi","noAnchors":"(Ei ankkureita tässä dokumentissa)","noEmail":"Kirjoita sähköpostiosoite","noUrl":"Linkille on kirjoitettava URL","other":"<muu>","popupDependent":"Riippuva (Netscape)","popupFeatures":"Popup ikkunan ominaisuudet","popupFullScreen":"Täysi ikkuna (IE)","popupLeft":"Vasemmalta (px)","popupLocationBar":"Osoiterivi","popupMenuBar":"Valikkorivi","popupResizable":"Venytettävä","popupScrollBars":"Vierityspalkit","popupStatusBar":"Tilarivi","popupToolbar":"Vakiopainikkeet","popupTop":"Ylhäältä (px)","rel":"Suhde","selectAnchor":"Valitse ankkuri","styles":"Tyyli","tabIndex":"Tabulaattori indeksi","target":"Kohde","targetFrame":"<kehys>","targetFrameName":"Kohdekehyksen nimi","targetPopup":"<popup ikkuna>","targetPopupName":"Popup ikkunan nimi","title":"Linkki","toAnchor":"Ankkuri tässä sivussa","toEmail":"Sähköposti","toUrl":"Osoite","toolbar":"Lisää linkki/muokkaa linkkiä","type":"Linkkityyppi","unlink":"Poista linkki","upload":"Lisää tiedosto"},"list":{"bulletedlist":"Luettelomerkit","numberedlist":"Numerointi"},"liststyle":{"armenian":"Armeenialainen numerointi","bulletedTitle":"Numeroimattoman listan ominaisuudet","circle":"Ympyrä","decimal":"Desimaalit (1, 2, 3, jne.)","decimalLeadingZero":"Desimaalit, alussa nolla (01, 02, 03, jne.)","disc":"Levy","georgian":"Georgialainen numerointi (an, ban, gan, etc.)","lowerAlpha":"Pienet aakkoset (a, b, c, d, e, jne.)","lowerGreek":"Pienet kreikkalaiset (alpha, beta, gamma, jne.)","lowerRoman":"Pienet roomalaiset (i, ii, iii, iv, v, jne.)","none":"Ei mikään","notset":"<ei asetettu>","numberedTitle":"Numeroidun listan ominaisuudet","square":"Neliö","start":"Alku","type":"Tyyppi","upperAlpha":"Isot aakkoset (A, B, C, D, E, jne.)","upperRoman":"Isot roomalaiset (I, II, III, IV, V, jne.)","validateStartNumber":"Listan ensimmäisen numeron tulee olla kokonaisluku."},"magicline":{"title":"Lisää kappale tähän."},"maximize":{"maximize":"Suurenna","minimize":"Pienennä"},"newpage":{"toolbar":"Tyhjennä"},"pagebreak":{"alt":"Sivunvaihto","toolbar":"Lisää sivunvaihto"},"pastetext":{"button":"Liitä tekstinä","title":"Liitä tekstinä"},"pastefromword":{"confirmCleanup":"Liittämäsi teksti näyttäisi olevan Word-dokumentista. Haluatko siivota sen ennen liittämistä? (Suositus: Kyllä)","error":"Liitetyn tiedon siivoaminen ei onnistunut sisäisen virheen takia","title":"Liitä Word-dokumentista","toolbar":"Liitä Word-dokumentista"},"preview":{"preview":"Esikatsele"},"print":{"toolbar":"Tulosta"},"removeformat":{"toolbar":"Poista muotoilu"},"save":{"toolbar":"Tallenna"},"selectall":{"toolbar":"Valitse kaikki"},"showblocks":{"toolbar":"Näytä elementit"},"sourcearea":{"toolbar":"Koodi"},"specialchar":{"options":"Erikoismerkin ominaisuudet","title":"Valitse erikoismerkki","toolbar":"Lisää erikoismerkki"},"scayt":{"btn_about":"Tietoja oikoluvusta kirjoitetaessa","btn_dictionaries":"Sanakirjat","btn_disable":"Poista käytöstä oikoluku kirjoitetaessa","btn_enable":"Ota käyttöön oikoluku kirjoitettaessa","btn_langs":"Kielet","btn_options":"Asetukset","text_title":"Oikolue kirjoitettaessa"},"stylescombo":{"label":"Tyyli","panelTitle":"Muotoilujen tyylit","panelTitle1":"Lohkojen tyylit","panelTitle2":"Rivinsisäiset tyylit","panelTitle3":"Objektien tyylit"},"table":{"border":"Rajan paksuus","caption":"Otsikko","cell":{"menu":"Solu","insertBefore":"Lisää solu eteen","insertAfter":"Lisää solu perään","deleteCell":"Poista solut","merge":"Yhdistä solut","mergeRight":"Yhdistä oikealla olevan kanssa","mergeDown":"Yhdistä alla olevan kanssa","splitHorizontal":"Jaa solu vaakasuunnassa","splitVertical":"Jaa solu pystysuunnassa","title":"Solun ominaisuudet","cellType":"Solun tyyppi","rowSpan":"Rivin jatkuvuus","colSpan":"Solun jatkuvuus","wordWrap":"Rivitys","hAlign":"Horisontaali kohdistus","vAlign":"Vertikaali kohdistus","alignBaseline":"Alas (teksti)","bgColor":"Taustan väri","borderColor":"Reunan väri","data":"Data","header":"Ylätunniste","yes":"Kyllä","no":"Ei","invalidWidth":"Solun leveyden täytyy olla numero.","invalidHeight":"Solun korkeuden täytyy olla numero.","invalidRowSpan":"Rivin jatkuvuuden täytyy olla kokonaisluku.","invalidColSpan":"Solun jatkuvuuden täytyy olla kokonaisluku.","chooseColor":"Valitse"},"cellPad":"Solujen sisennys","cellSpace":"Solujen väli","column":{"menu":"Sarake","insertBefore":"Lisää sarake vasemmalle","insertAfter":"Lisää sarake oikealle","deleteColumn":"Poista sarakkeet"},"columns":"Sarakkeet","deleteTable":"Poista taulu","headers":"Ylätunnisteet","headersBoth":"Molemmat","headersColumn":"Ensimmäinen sarake","headersNone":"Ei","headersRow":"Ensimmäinen rivi","invalidBorder":"Reunan koon täytyy olla numero.","invalidCellPadding":"Solujen sisennyksen täytyy olla numero.","invalidCellSpacing":"Solujen välin täytyy olla numero.","invalidCols":"Sarakkeiden määrän täytyy olla suurempi kuin 0.","invalidHeight":"Taulun korkeuden täytyy olla numero.","invalidRows":"Rivien määrän täytyy olla suurempi kuin 0.","invalidWidth":"Taulun leveyden täytyy olla numero.","menu":"Taulun ominaisuudet","row":{"menu":"Rivi","insertBefore":"Lisää rivi yläpuolelle","insertAfter":"Lisää rivi alapuolelle","deleteRow":"Poista rivit"},"rows":"Rivit","summary":"Yhteenveto","title":"Taulun ominaisuudet","toolbar":"Taulu","widthPc":"prosenttia","widthPx":"pikseliä","widthUnit":"leveysyksikkö"},"undo":{"redo":"Toista","undo":"Kumoa"},"wsc":{"btnIgnore":"Jätä huomioimatta","btnIgnoreAll":"Jätä kaikki huomioimatta","btnReplace":"Korvaa","btnReplaceAll":"Korvaa kaikki","btnUndo":"Kumoa","changeTo":"Vaihda","errorLoading":"Virhe ladattaessa oikolukupalvelua isännältä: %s.","ieSpellDownload":"Oikeinkirjoituksen tarkistusta ei ole asennettu. Haluatko ladata sen nyt?","manyChanges":"Tarkistus valmis: %1 sanaa muutettiin","noChanges":"Tarkistus valmis: Yhtään sanaa ei muutettu","noMispell":"Tarkistus valmis: Ei virheitä","noSuggestions":"Ei ehdotuksia","notAvailable":"Valitettavasti oikoluku ei ole käytössä tällä hetkellä.","notInDic":"Ei sanakirjassa","oneChange":"Tarkistus valmis: Yksi sana muutettiin","progress":"Tarkistus käynnissä...","title":"Oikoluku","toolbar":"Tarkista oikeinkirjoitus"}};
\ No newline at end of file
+CKEDITOR.lang['fi']={"editor":"Rikastekstieditori","editorPanel":"Rikastekstieditoripaneeli","common":{"editorHelp":"Paina ALT 0 nähdäksesi ohjeen","browseServer":"Selaa palvelinta","url":"Osoite","protocol":"Protokolla","upload":"Lisää tiedosto","uploadSubmit":"Lähetä palvelimelle","image":"Kuva","flash":"Flash-animaatio","form":"Lomake","checkbox":"Valintaruutu","radio":"Radiopainike","textField":"Tekstikenttä","textarea":"Tekstilaatikko","hiddenField":"Piilokenttä","button":"Painike","select":"Valintakenttä","imageButton":"Kuvapainike","notSet":"<ei asetettu>","id":"Tunniste","name":"Nimi","langDir":"Kielen suunta","langDirLtr":"Vasemmalta oikealle (LTR)","langDirRtl":"Oikealta vasemmalle (RTL)","langCode":"Kielikoodi","longDescr":"Pitkän kuvauksen URL","cssClass":"Tyyliluokat","advisoryTitle":"Avustava otsikko","cssStyle":"Tyyli","ok":"OK","cancel":"Peruuta","close":"Sulje","preview":"Esikatselu","resize":"Raahaa muuttaaksesi kokoa","generalTab":"Yleinen","advancedTab":"Lisäominaisuudet","validateNumberFailed":"Arvon pitää olla numero.","confirmNewPage":"Kaikki tallentamattomat muutokset tähän sisältöön menetetään. Oletko varma, että haluat ladata uuden sivun?","confirmCancel":"Jotkut asetuksista on muuttuneet. Oletko varma, että haluat sulkea valintaikkunan?","options":"Asetukset","target":"Kohde","targetNew":"Uusi ikkuna (_blank)","targetTop":"Päällimmäinen ikkuna (_top)","targetSelf":"Sama ikkuna (_self)","targetParent":"Ylemmän tason ikkuna (_parent)","langDirLTR":"Vasemmalta oikealle (LTR)","langDirRTL":"Oikealta vasemmalle (RTL)","styles":"Tyyli","cssClasses":"Tyylitiedoston luokat","width":"Leveys","height":"Korkeus","align":"Kohdistus","alignLeft":"Vasemmalle","alignRight":"Oikealle","alignCenter":"Keskelle","alignJustify":"Tasaa molemmat reunat","alignTop":"Ylös","alignMiddle":"Keskelle","alignBottom":"Alas","alignNone":"Ei asetettu","invalidValue":"Virheellinen arvo.","invalidHeight":"Korkeuden täytyy olla numero.","invalidWidth":"Leveyden täytyy olla numero.","invalidCssLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku CSS mittayksikön (px, %, in, cm, mm, em, ex, pt tai pc) kanssa tai ilman.","invalidHtmlLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku HTML mittayksikön (px tai %) kanssa tai ilman.","invalidInlineStyle":"Tyylille annetun arvon täytyy koostua yhdestä tai useammasta \"nimi : arvo\" parista, jotka ovat eroteltuna toisistaan puolipisteillä.","cssLengthTooltip":"Anna numeroarvo pikseleinä tai numeroarvo CSS mittayksikön kanssa (px, %, in, cm, mm, em, ex, pt, tai pc).","unavailable":"%1<span class=\"cke_accessibility\">, ei saatavissa</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Kaikki oikeuden pidätetään.","dlgTitle":"Tietoa CKEditorista","help":"Katso ohjeet: $1.","moreInfo":"Lisenssitiedot löytyvät kotisivuiltamme:","title":"Tietoa CKEditorista","userGuide":"CKEditorin käyttäjäopas"},"basicstyles":{"bold":"Lihavoitu","italic":"Kursivoitu","strike":"Yliviivattu","subscript":"Alaindeksi","superscript":"Yläindeksi","underline":"Alleviivattu"},"bidi":{"ltr":"Tekstin suunta vasemmalta oikealle","rtl":"Tekstin suunta oikealta vasemmalle"},"blockquote":{"toolbar":"Lainaus"},"clipboard":{"copy":"Kopioi","copyError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa kopioimista. Käytä näppäimistöä kopioimiseen (Ctrl+C).","cut":"Leikkaa","cutError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa leikkaamista. Käytä näppäimistöä leikkaamiseen (Ctrl+X).","paste":"Liitä","pasteArea":"Leikealue","pasteMsg":"Liitä painamalla (<STRONG>Ctrl+V</STRONG>) ja painamalla <STRONG>OK</STRONG>.","securityMsg":"Selaimesi turva-asetukset eivät salli editorin käyttää leikepöytää suoraan. Sinun pitää suorittaa liittäminen tässä ikkunassa.","title":"Liitä"},"button":{"selectedLabel":"%1 (Valittu)"},"colorbutton":{"auto":"Automaattinen","bgColorTitle":"Taustaväri","colors":{"000":"Musta","800000":"Kastanjanruskea","8B4513":"Satulanruskea","2F4F4F":"Tumma liuskekivenharmaa","008080":"Sinivihreä","000080":"Laivastonsininen","4B0082":"Indigonsininen","696969":"Tummanharmaa","B22222":"Tiili","A52A2A":"Ruskea","DAA520":"Kultapiisku","006400":"Tummanvihreä","40E0D0":"Turkoosi","0000CD":"Keskisininen","800080":"Purppura","808080":"Harmaa","F00":"Punainen","FF8C00":"Tumma oranssi","FFD700":"Kulta","008000":"Vihreä","0FF":"Syaani","00F":"Sininen","EE82EE":"Violetti","A9A9A9":"Tummanharmaa","FFA07A":"Vaaleanlohenpunainen","FFA500":"Oranssi","FFFF00":"Keltainen","00FF00":"Limetin vihreä","AFEEEE":"Haalea turkoosi","ADD8E6":"Vaaleansininen","DDA0DD":"Luumu","D3D3D3":"Vaaleanharmaa","FFF0F5":"Laventelinpunainen","FAEBD7":"Antiikinvalkoinen","FFFFE0":"Vaaleankeltainen","F0FFF0":"Hunajameloni","F0FFFF":"Asurinsininen","F0F8FF":"Alice Blue -sininen","E6E6FA":"Lavanteli","FFF":"Valkoinen","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Lisää värejä...","panelTitle":"Värit","textColorTitle":"Tekstiväri"},"colordialog":{"clear":"Poista","highlight":"Korostus","options":"Värin ominaisuudet","selected":"Valittu","title":"Valitse väri"},"templates":{"button":"Pohjat","emptyListMsg":"(Ei määriteltyjä pohjia)","insertOption":"Korvaa koko sisältö","options":"Sisältöpohjan ominaisuudet","selectPromptMsg":"Valitse editoriin avattava pohja","title":"Sisältöpohjat"},"contextmenu":{"options":"Pikavalikon ominaisuudet"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Ohjeistava otsikko","cssClassInputLabel":"Tyylitiedoston luokat","edit":"Muokkaa Diviä","inlineStyleInputLabel":"Sisätyyli","langDirLTRLabel":"Vasemmalta oikealle (LTR)","langDirLabel":"Kielen suunta","langDirRTLLabel":"Oikealta vasemmalle (RTL)","languageCodeInputLabel":" Kielen koodi","remove":"Poista Div","styleSelectLabel":"Tyyli","title":"Luo div-kehikko","toolbar":"Luo div-kehikko"},"toolbar":{"toolbarCollapse":"Kutista työkalupalkki","toolbarExpand":"Laajenna työkalupalkki","toolbarGroups":{"document":"Dokumentti","clipboard":"Leikepöytä/Kumoa","editing":"Muokkaus","forms":"Lomakkeet","basicstyles":"Perustyylit","paragraph":"Kappale","links":"Linkit","insert":"Lisää","styles":"Tyylit","colors":"Värit","tools":"Työkalut"},"toolbars":"Editorin työkalupalkit"},"elementspath":{"eleLabel":"Elementin polku","eleTitle":"%1 elementti"},"find":{"find":"Etsi","findOptions":"Hakuasetukset","findWhat":"Etsi mitä:","matchCase":"Sama kirjainkoko","matchCyclic":"Kierrä ympäri","matchWord":"Koko sana","notFoundMsg":"Etsittyä tekstiä ei löytynyt.","replace":"Korvaa","replaceAll":"Korvaa kaikki","replaceSuccessMsg":"%1 esiintymä(ä) korvattu.","replaceWith":"Korvaa tällä:","title":"Etsi ja korvaa"},"fakeobjects":{"anchor":"Ankkuri","flash":"Flash animaatio","hiddenfield":"Piilokenttä","iframe":"IFrame-kehys","unknown":"Tuntematon objekti"},"flash":{"access":"Skriptien pääsy","accessAlways":"Aina","accessNever":"Ei koskaan","accessSameDomain":"Sama verkkotunnus","alignAbsBottom":"Aivan alas","alignAbsMiddle":"Aivan keskelle","alignBaseline":"Alas (teksti)","alignTextTop":"Ylös (teksti)","bgcolor":"Taustaväri","chkFull":"Salli kokoruututila","chkLoop":"Toisto","chkMenu":"Näytä Flash-valikko","chkPlay":"Automaattinen käynnistys","flashvars":"Muuttujat Flash:lle","hSpace":"Vaakatila","properties":"Flash-ominaisuudet","propertiesTab":"Ominaisuudet","quality":"Laatu","qualityAutoHigh":"Automaattinen korkea","qualityAutoLow":"Automaattinen matala","qualityBest":"Paras","qualityHigh":"Korkea","qualityLow":"Matala","qualityMedium":"Keskitaso","scale":"Levitä","scaleAll":"Näytä kaikki","scaleFit":"Tarkka koko","scaleNoBorder":"Ei rajaa","title":"Flash ominaisuudet","vSpace":"Pystytila","validateHSpace":"Vaakatilan täytyy olla numero.","validateSrc":"Linkille on kirjoitettava URL","validateVSpace":"Pystytilan täytyy olla numero.","windowMode":"Ikkuna tila","windowModeOpaque":"Läpinäkyvyys","windowModeTransparent":"Läpinäkyvä","windowModeWindow":"Ikkuna"},"font":{"fontSize":{"label":"Koko","voiceLabel":"Kirjaisimen koko","panelTitle":"Koko"},"label":"Kirjaisinlaji","panelTitle":"Kirjaisinlaji","voiceLabel":"Kirjaisinlaji"},"forms":{"button":{"title":"Painikkeen ominaisuudet","text":"Teksti (arvo)","type":"Tyyppi","typeBtn":"Painike","typeSbm":"Lähetä","typeRst":"Tyhjennä"},"checkboxAndRadio":{"checkboxTitle":"Valintaruudun ominaisuudet","radioTitle":"Radiopainikkeen ominaisuudet","value":"Arvo","selected":"Valittu","required":"Required"},"form":{"title":"Lomakkeen ominaisuudet","menu":"Lomakkeen ominaisuudet","action":"Toiminto","method":"Tapa","encoding":"Enkoodaus"},"hidden":{"title":"Piilokentän ominaisuudet","name":"Nimi","value":"Arvo"},"select":{"title":"Valintakentän ominaisuudet","selectInfo":"Info","opAvail":"Ominaisuudet","value":"Arvo","size":"Koko","lines":"Rivit","chkMulti":"Salli usea valinta","required":"Required","opText":"Teksti","opValue":"Arvo","btnAdd":"Lisää","btnModify":"Muuta","btnUp":"Ylös","btnDown":"Alas","btnSetValue":"Aseta valituksi","btnDelete":"Poista"},"textarea":{"title":"Tekstilaatikon ominaisuudet","cols":"Sarakkeita","rows":"Rivejä"},"textfield":{"title":"Tekstikentän ominaisuudet","name":"Nimi","value":"Arvo","charWidth":"Leveys","maxChars":"Maksimi merkkimäärä","required":"Required","type":"Tyyppi","typeText":"Teksti","typePass":"Salasana","typeEmail":"Sähköposti","typeSearch":"Haku","typeTel":"Puhelinnumero","typeUrl":"Osoite"}},"format":{"label":"Muotoilu","panelTitle":"Muotoilu","tag_address":"Osoite","tag_div":"Normaali (DIV)","tag_h1":"Otsikko 1","tag_h2":"Otsikko 2","tag_h3":"Otsikko 3","tag_h4":"Otsikko 4","tag_h5":"Otsikko 5","tag_h6":"Otsikko 6","tag_p":"Normaali","tag_pre":"Muotoiltu"},"horizontalrule":{"toolbar":"Lisää murtoviiva"},"iframe":{"border":"Näytä kehyksen reunat","noUrl":"Anna IFrame-kehykselle lähdeosoite (src)","scrolling":"Näytä vierityspalkit","title":"IFrame-kehyksen ominaisuudet","toolbar":"IFrame-kehys"},"image":{"alt":"Vaihtoehtoinen teksti","border":"Kehys","btnUpload":"Lähetä palvelimelle","button2Img":"Haluatko muuntaa valitun kuvanäppäimen kuvaksi?","hSpace":"Vaakatila","img2Button":"Haluatko muuntaa valitun kuvan kuvanäppäimeksi?","infoTab":"Kuvan tiedot","linkTab":"Linkki","lockRatio":"Lukitse suhteet","menu":"Kuvan ominaisuudet","resetSize":"Alkuperäinen koko","title":"Kuvan ominaisuudet","titleButton":"Kuvapainikkeen ominaisuudet","upload":"Lisää kuva","urlMissing":"Kuvan lähdeosoite puuttuu.","vSpace":"Pystytila","validateBorder":"Kehyksen täytyy olla kokonaisluku.","validateHSpace":"HSpace-määrityksen täytyy olla kokonaisluku.","validateVSpace":"VSpace-määrityksen täytyy olla kokonaisluku."},"indent":{"indent":"Suurenna sisennystä","outdent":"Pienennä sisennystä"},"smiley":{"options":"Hymiön ominaisuudet","title":"Lisää hymiö","toolbar":"Hymiö"},"justify":{"block":"Tasaa molemmat reunat","center":"Keskitä","left":"Tasaa vasemmat reunat","right":"Tasaa oikeat reunat"},"language":{"button":"Aseta kieli","remove":"Poista kieli"},"link":{"acccessKey":"Pikanäppäin","advanced":"Lisäominaisuudet","advisoryContentType":"Avustava sisällön tyyppi","advisoryTitle":"Avustava otsikko","anchor":{"toolbar":"Lisää ankkuri/muokkaa ankkuria","menu":"Ankkurin ominaisuudet","title":"Ankkurin ominaisuudet","name":"Nimi","errorName":"Ankkurille on kirjoitettava nimi","remove":"Poista ankkuri"},"anchorId":"Ankkurin ID:n mukaan","anchorName":"Ankkurin nimen mukaan","charset":"Linkitetty kirjaimisto","cssClasses":"Tyyliluokat","download":"Force Download","displayText":"Display Text","emailAddress":"Sähköpostiosoite","emailBody":"Viesti","emailSubject":"Aihe","id":"Tunniste","info":"Linkin tiedot","langCode":"Kielen suunta","langDir":"Kielen suunta","langDirLTR":"Vasemmalta oikealle (LTR)","langDirRTL":"Oikealta vasemmalle (RTL)","menu":"Muokkaa linkkiä","name":"Nimi","noAnchors":"(Ei ankkureita tässä dokumentissa)","noEmail":"Kirjoita sähköpostiosoite","noUrl":"Linkille on kirjoitettava URL","other":"<muu>","popupDependent":"Riippuva (Netscape)","popupFeatures":"Popup ikkunan ominaisuudet","popupFullScreen":"Täysi ikkuna (IE)","popupLeft":"Vasemmalta (px)","popupLocationBar":"Osoiterivi","popupMenuBar":"Valikkorivi","popupResizable":"Venytettävä","popupScrollBars":"Vierityspalkit","popupStatusBar":"Tilarivi","popupToolbar":"Vakiopainikkeet","popupTop":"Ylhäältä (px)","rel":"Suhde","selectAnchor":"Valitse ankkuri","styles":"Tyyli","tabIndex":"Tabulaattori indeksi","target":"Kohde","targetFrame":"<kehys>","targetFrameName":"Kohdekehyksen nimi","targetPopup":"<popup ikkuna>","targetPopupName":"Popup ikkunan nimi","title":"Linkki","toAnchor":"Ankkuri tässä sivussa","toEmail":"Sähköposti","toUrl":"Osoite","toolbar":"Lisää linkki/muokkaa linkkiä","type":"Linkkityyppi","unlink":"Poista linkki","upload":"Lisää tiedosto"},"list":{"bulletedlist":"Luettelomerkit","numberedlist":"Numerointi"},"liststyle":{"armenian":"Armeenialainen numerointi","bulletedTitle":"Numeroimattoman listan ominaisuudet","circle":"Ympyrä","decimal":"Desimaalit (1, 2, 3, jne.)","decimalLeadingZero":"Desimaalit, alussa nolla (01, 02, 03, jne.)","disc":"Levy","georgian":"Georgialainen numerointi (an, ban, gan, etc.)","lowerAlpha":"Pienet aakkoset (a, b, c, d, e, jne.)","lowerGreek":"Pienet kreikkalaiset (alpha, beta, gamma, jne.)","lowerRoman":"Pienet roomalaiset (i, ii, iii, iv, v, jne.)","none":"Ei mikään","notset":"<ei asetettu>","numberedTitle":"Numeroidun listan ominaisuudet","square":"Neliö","start":"Alku","type":"Tyyppi","upperAlpha":"Isot aakkoset (A, B, C, D, E, jne.)","upperRoman":"Isot roomalaiset (I, II, III, IV, V, jne.)","validateStartNumber":"Listan ensimmäisen numeron tulee olla kokonaisluku."},"magicline":{"title":"Lisää kappale tähän."},"maximize":{"maximize":"Suurenna","minimize":"Pienennä"},"newpage":{"toolbar":"Tyhjennä"},"pagebreak":{"alt":"Sivunvaihto","toolbar":"Lisää sivunvaihto"},"pastetext":{"button":"Liitä tekstinä","title":"Liitä tekstinä"},"pastefromword":{"confirmCleanup":"Liittämäsi teksti näyttäisi olevan Word-dokumentista. Haluatko siivota sen ennen liittämistä? (Suositus: Kyllä)","error":"Liitetyn tiedon siivoaminen ei onnistunut sisäisen virheen takia","title":"Liitä Word-dokumentista","toolbar":"Liitä Word-dokumentista"},"preview":{"preview":"Esikatsele"},"print":{"toolbar":"Tulosta"},"removeformat":{"toolbar":"Poista muotoilu"},"save":{"toolbar":"Tallenna"},"selectall":{"toolbar":"Valitse kaikki"},"showblocks":{"toolbar":"Näytä elementit"},"sourcearea":{"toolbar":"Koodi"},"specialchar":{"options":"Erikoismerkin ominaisuudet","title":"Valitse erikoismerkki","toolbar":"Lisää erikoismerkki"},"scayt":{"btn_about":"Tietoja oikoluvusta kirjoitetaessa","btn_dictionaries":"Sanakirjat","btn_disable":"Poista käytöstä oikoluku kirjoitetaessa","btn_enable":"Ota käyttöön oikoluku kirjoitettaessa","btn_langs":"Kielet","btn_options":"Asetukset","text_title":"Oikolue kirjoitettaessa"},"stylescombo":{"label":"Tyyli","panelTitle":"Muotoilujen tyylit","panelTitle1":"Lohkojen tyylit","panelTitle2":"Rivinsisäiset tyylit","panelTitle3":"Objektien tyylit"},"table":{"border":"Rajan paksuus","caption":"Otsikko","cell":{"menu":"Solu","insertBefore":"Lisää solu eteen","insertAfter":"Lisää solu perään","deleteCell":"Poista solut","merge":"Yhdistä solut","mergeRight":"Yhdistä oikealla olevan kanssa","mergeDown":"Yhdistä alla olevan kanssa","splitHorizontal":"Jaa solu vaakasuunnassa","splitVertical":"Jaa solu pystysuunnassa","title":"Solun ominaisuudet","cellType":"Solun tyyppi","rowSpan":"Rivin jatkuvuus","colSpan":"Solun jatkuvuus","wordWrap":"Rivitys","hAlign":"Horisontaali kohdistus","vAlign":"Vertikaali kohdistus","alignBaseline":"Alas (teksti)","bgColor":"Taustan väri","borderColor":"Reunan väri","data":"Data","header":"Ylätunniste","yes":"Kyllä","no":"Ei","invalidWidth":"Solun leveyden täytyy olla numero.","invalidHeight":"Solun korkeuden täytyy olla numero.","invalidRowSpan":"Rivin jatkuvuuden täytyy olla kokonaisluku.","invalidColSpan":"Solun jatkuvuuden täytyy olla kokonaisluku.","chooseColor":"Valitse"},"cellPad":"Solujen sisennys","cellSpace":"Solujen väli","column":{"menu":"Sarake","insertBefore":"Lisää sarake vasemmalle","insertAfter":"Lisää sarake oikealle","deleteColumn":"Poista sarakkeet"},"columns":"Sarakkeet","deleteTable":"Poista taulu","headers":"Ylätunnisteet","headersBoth":"Molemmat","headersColumn":"Ensimmäinen sarake","headersNone":"Ei","headersRow":"Ensimmäinen rivi","invalidBorder":"Reunan koon täytyy olla numero.","invalidCellPadding":"Solujen sisennyksen täytyy olla numero.","invalidCellSpacing":"Solujen välin täytyy olla numero.","invalidCols":"Sarakkeiden määrän täytyy olla suurempi kuin 0.","invalidHeight":"Taulun korkeuden täytyy olla numero.","invalidRows":"Rivien määrän täytyy olla suurempi kuin 0.","invalidWidth":"Taulun leveyden täytyy olla numero.","menu":"Taulun ominaisuudet","row":{"menu":"Rivi","insertBefore":"Lisää rivi yläpuolelle","insertAfter":"Lisää rivi alapuolelle","deleteRow":"Poista rivit"},"rows":"Rivit","summary":"Yhteenveto","title":"Taulun ominaisuudet","toolbar":"Taulu","widthPc":"prosenttia","widthPx":"pikseliä","widthUnit":"leveysyksikkö"},"undo":{"redo":"Toista","undo":"Kumoa"},"wsc":{"btnIgnore":"Jätä huomioimatta","btnIgnoreAll":"Jätä kaikki huomioimatta","btnReplace":"Korvaa","btnReplaceAll":"Korvaa kaikki","btnUndo":"Kumoa","changeTo":"Vaihda","errorLoading":"Virhe ladattaessa oikolukupalvelua isännältä: %s.","ieSpellDownload":"Oikeinkirjoituksen tarkistusta ei ole asennettu. Haluatko ladata sen nyt?","manyChanges":"Tarkistus valmis: %1 sanaa muutettiin","noChanges":"Tarkistus valmis: Yhtään sanaa ei muutettu","noMispell":"Tarkistus valmis: Ei virheitä","noSuggestions":"Ei ehdotuksia","notAvailable":"Valitettavasti oikoluku ei ole käytössä tällä hetkellä.","notInDic":"Ei sanakirjassa","oneChange":"Tarkistus valmis: Yksi sana muutettiin","progress":"Tarkistus käynnissä...","title":"Oikoluku","toolbar":"Tarkista oikeinkirjoitus"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/lang/fo.js
index bcab38f6f2f..0f7d5da311c 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/fo.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/fo.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fo']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Trýst ALT og 0 fyri vegleiðing","browseServer":"Ambætarakagi","url":"URL","protocol":"Protokoll","upload":"Send til ambætaran","uploadSubmit":"Send til ambætaran","image":"Myndir","flash":"Flash","form":"Formur","checkbox":"Flugubein","radio":"Radioknøttur","textField":"Tekstteigur","textarea":"Tekstumráði","hiddenField":"Fjaldur teigur","button":"Knøttur","select":"Valskrá","imageButton":"Myndaknøttur","notSet":"<ikki sett>","id":"Id","name":"Navn","langDir":"Tekstkós","langDirLtr":"Frá vinstru til høgru (LTR)","langDirRtl":"Frá høgru til vinstru (RTL)","langCode":"Málkoda","longDescr":"Víðkað URL frágreiðing","cssClass":"Typografi klassar","advisoryTitle":"Vegleiðandi heiti","cssStyle":"Typografi","ok":"Góðkent","cancel":"Avlýs","close":"Lat aftur","preview":"Frumsýn","resize":"Drag fyri at broyta stødd","generalTab":"Generelt","advancedTab":"Fjølbroytt","validateNumberFailed":"Hetta er ikki eitt tal.","confirmNewPage":"Allar ikki goymdar broytingar í hesum innihaldið hvørva. Skal nýggj síða lesast kortini?","confirmCancel":"Nakrir valmøguleikar eru broyttir. Ert tú vísur í, at dialogurin skal latast aftur?","options":"Options","target":"Target","targetNew":"Nýtt vindeyga (_blank)","targetTop":"Vindeyga ovast (_top)","targetSelf":"Sama vindeyga (_self)","targetParent":"Upphavligt vindeyga (_parent)","langDirLTR":"Frá vinstru til høgru (LTR)","langDirRTL":"Frá høgru til vinstru (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Breidd","height":"Hædd","align":"Justering","alignLeft":"Vinstra","alignRight":"Høgra","alignCenter":"Miðsett","alignJustify":"Javnir tekstkantar","alignTop":"Ovast","alignMiddle":"Miðja","alignBottom":"Botnur","alignNone":"Eingin","invalidValue":"Invalid value.","invalidHeight":"Hædd má vera eitt tal.","invalidWidth":"Breidd má vera eitt tal.","invalidCssLength":"Virðið sett í \"%1\" feltið má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px, %, in, cm, mm, em, ex, pt, ella pc).","invalidHtmlLength":"Virðið sett í \"%1\" feltiðield má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px ella %).","invalidInlineStyle":"Virði specifiserað fyri inline style má hava eitt ella fleiri pør (tuples) skrivað sum \"name : value\", hvørt parið sundurskilt við semi-colon.","cssLengthTooltip":"Skriva eitt tal fyri eitt virði í pixels ella eitt tal við gyldigum CSS eind (px, %, in, cm, mm, em, ex, pt, ella pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikki tøkt</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Um CKEditor","help":"Kekka $1 fyri hjálp.","moreInfo":"Licens upplýsingar finnast á heimasíðu okkara:","title":"Um CKEditor","userGuide":"CKEditor Brúkaravegleiðing"},"basicstyles":{"bold":"Feit skrift","italic":"Skráskrift","strike":"Yvirstrikað","subscript":"Lækkað skrift","superscript":"Hækkað skrift","underline":"Undirstrikað"},"bidi":{"ltr":"Tekstkós frá vinstru til høgru","rtl":"Tekstkós frá høgru til vinstru"},"blockquote":{"toolbar":"Blockquote"},"clipboard":{"copy":"Avrita","copyError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at avrita tekstin. Vinarliga nýt knappaborðið til at avrita tekstin (Ctrl/Cmd+C).","cut":"Kvett","cutError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at kvetta tekstin. Vinarliga nýt knappaborðið til at kvetta tekstin (Ctrl/Cmd+X).","paste":"Innrita","pasteArea":"Avritingarumráði","pasteMsg":"Vinarliga koyr tekstin í hendan rútin við knappaborðinum (<strong>Ctrl/Cmd+V</strong>) og klikk á <strong>Góðtak</strong>.","securityMsg":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í beinleiðis atgongd til avritingarminnið. Tygum mugu royna aftur í hesum rútinum.","title":"Innrita"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatiskt","bgColorTitle":"Bakgrundslitur","colors":{"000":"Svart","800000":"Maroon","8B4513":"Saðilsbrúnt","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Myrkagrátt","B22222":"Fire Brick","A52A2A":"Brúnt","DAA520":"Gullstavur","006400":"Myrkagrønt","40E0D0":"Turquoise","0000CD":"Meðal blátt","800080":"Purple","808080":"Grátt","F00":"Reytt","FF8C00":"Myrkt appelsingult","FFD700":"Gull","008000":"Grønt","0FF":"Cyan","00F":"Blátt","EE82EE":"Violet","A9A9A9":"Døkt grátt","FFA07A":"Ljósur laksur","FFA500":"Appelsingult","FFFF00":"Gult","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Ljósablátt","DDA0DD":"Plum","D3D3D3":"Ljósagrátt","FFF0F5":"Lavender Blush","FAEBD7":"Klassiskt hvítt","FFFFE0":"Ljósagult","F0FFF0":"Hunangsdøggur","F0FFFF":"Azure","F0F8FF":"Alice Blátt","E6E6FA":"Lavender","FFF":"Hvítt"},"more":"Fleiri litir...","panelTitle":"Litir","textColorTitle":"Tekstlitur"},"colordialog":{"clear":"Strika","highlight":"Framheva","options":"Litmøguleikar","selected":"Valdur litur","title":"Vel lit"},"templates":{"button":"Skabelónir","emptyListMsg":"(Ongar skabelónir tøkar)","insertOption":"Yvirskriva núverandi innihald","options":"Møguleikar fyri Template","selectPromptMsg":"Vinarliga vel ta skabelón, ið skal opnast í tekstviðgeranum<br>(Hetta yvirskrivar núverandi innihald):","title":"Innihaldsskabelónir"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Redigera Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Vinstru til høgru (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Høgru til vinstru (RTL)","languageCodeInputLabel":" Language Code","remove":"Strika Div","styleSelectLabel":"Style","title":"Ger Div Container","toolbar":"Ger Div Container"},"toolbar":{"toolbarCollapse":"Lat Toolbar aftur","toolbarExpand":"Vís Toolbar","toolbarGroups":{"document":"Dokument","clipboard":"Clipboard/Undo","editing":"Editering","forms":"Formar","basicstyles":"Grundleggjandi Styles","paragraph":"Reglubrot","links":"Leinkjur","insert":"Set inn","styles":"Styles","colors":"Litir","tools":"Tól"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Slóð til elementir","eleTitle":"%1 element"},"find":{"find":"Leita","findOptions":"Finn møguleikar","findWhat":"Finn:","matchCase":"Munur á stórum og smáum bókstavum","matchCyclic":"Match cyclic","matchWord":"Bert heil orð","notFoundMsg":"Leititeksturin varð ikki funnin","replace":"Yvirskriva","replaceAll":"Yvirskriva alt","replaceSuccessMsg":"%1 úrslit broytt.","replaceWith":"Yvirskriva við:","title":"Finn og broyt"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Fjaldur teigur","iframe":"IFrame","unknown":"Ókent Object"},"flash":{"access":"Script atgongd","accessAlways":"Altíð","accessNever":"Ongantíð","accessSameDomain":"Sama navnaøki","alignAbsBottom":"Abs botnur","alignAbsMiddle":"Abs miðja","alignBaseline":"Basislinja","alignTextTop":"Tekst toppur","bgcolor":"Bakgrundslitur","chkFull":"Loyv fullan skerm","chkLoop":"Endurspæl","chkMenu":"Ger Flash skrá virkna","chkPlay":"Avspælingin byrjar sjálv","flashvars":"Variablar fyri Flash","hSpace":"Høgri breddi","properties":"Flash eginleikar","propertiesTab":"Eginleikar","quality":"Góðska","qualityAutoHigh":"Auto høg","qualityAutoLow":"Auto Lág","qualityBest":"Besta","qualityHigh":"Høg","qualityLow":"Lág","qualityMedium":"Meðal","scale":"Skalering","scaleAll":"Vís alt","scaleFit":"Neyv skalering","scaleNoBorder":"Eingin bordi","title":"Flash eginleikar","vSpace":"Vinstri breddi","validateHSpace":"HSpace má vera eitt tal.","validateSrc":"Vinarliga skriva tilknýti (URL)","validateVSpace":"VSpace má vera eitt tal.","windowMode":"Slag av rúti","windowModeOpaque":"Ikki transparent","windowModeTransparent":"Transparent","windowModeWindow":"Rútur"},"font":{"fontSize":{"label":"Skriftstødd","voiceLabel":"Skriftstødd","panelTitle":"Skriftstødd"},"label":"Skrift","panelTitle":"Skrift","voiceLabel":"Skrift"},"forms":{"button":{"title":"Eginleikar fyri knøtt","text":"Tekstur","type":"Slag","typeBtn":"Knøttur","typeSbm":"Send","typeRst":"Nullstilla"},"checkboxAndRadio":{"checkboxTitle":"Eginleikar fyri flugubein","radioTitle":"Eginleikar fyri radioknøtt","value":"Virði","selected":"Valt","required":"Required"},"form":{"title":"Eginleikar fyri Form","menu":"Eginleikar fyri Form","action":"Hending","method":"Háttur","encoding":"Encoding"},"hidden":{"title":"Eginleikar fyri fjaldan teig","name":"Navn","value":"Virði"},"select":{"title":"Eginleikar fyri valskrá","selectInfo":"Upplýsingar","opAvail":"Tøkir møguleikar","value":"Virði","size":"Stødd","lines":"Linjur","chkMulti":"Loyv fleiri valmøguleikum samstundis","required":"Required","opText":"Tekstur","opValue":"Virði","btnAdd":"Legg afturat","btnModify":"Broyt","btnUp":"Upp","btnDown":"Niður","btnSetValue":"Set sum valt virði","btnDelete":"Strika"},"textarea":{"title":"Eginleikar fyri tekstumráði","cols":"kolonnur","rows":"røðir"},"textfield":{"title":"Eginleikar fyri tekstteig","name":"Navn","value":"Virði","charWidth":"Breidd (sjónlig tekn)","maxChars":"Mest loyvdu tekn","required":"Required","type":"Slag","typeText":"Tekstur","typePass":"Loyniorð","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Skriftsnið","panelTitle":"Skriftsnið","tag_address":"Adressa","tag_div":"Vanligt (DIV)","tag_h1":"Yvirskrift 1","tag_h2":"Yvirskrift 2","tag_h3":"Yvirskrift 3","tag_h4":"Yvirskrift 4","tag_h5":"Yvirskrift 5","tag_h6":"Yvirskrift 6","tag_p":"Vanligt","tag_pre":"Sniðgivið"},"horizontalrule":{"toolbar":"Ger vatnrætta linju"},"iframe":{"border":"Vís frame kant","noUrl":"Vinarliga skriva URL til iframe","scrolling":"Loyv scrollbars","title":"Møguleikar fyri IFrame","toolbar":"IFrame"},"image":{"alt":"Alternativur tekstur","border":"Bordi","btnUpload":"Send til ambætaran","button2Img":"Skal valdi myndaknøttur gerast til vanliga mynd?","hSpace":"Høgri breddi","img2Button":"Skal valda mynd gerast til myndaknøtt?","infoTab":"Myndaupplýsingar","linkTab":"Tilknýti","lockRatio":"Læs lutfallið","menu":"Myndaeginleikar","resetSize":"Upprunastødd","title":"Myndaeginleikar","titleButton":"Eginleikar fyri myndaknøtt","upload":"Send","urlMissing":"URL til mynd manglar.","vSpace":"Vinstri breddi","validateBorder":"Bordi má vera eitt heiltal.","validateHSpace":"HSpace má vera eitt heiltal.","validateVSpace":"VSpace má vera eitt heiltal."},"indent":{"indent":"Økja reglubrotarinntriv","outdent":"Minka reglubrotarinntriv"},"smiley":{"options":"Møguleikar fyri Smiley","title":"Vel Smiley","toolbar":"Smiley"},"justify":{"block":"Javnir tekstkantar","center":"Miðsett","left":"Vinstrasett","right":"Høgrasett"},"language":{"button":"Velja tungumál","remove":"Remove language"},"link":{"acccessKey":"Snarvegisknöttur","advanced":"Fjølbroytt","advisoryContentType":"Vegleiðandi innihaldsslag","advisoryTitle":"Vegleiðandi heiti","anchor":{"toolbar":"Ger/broyt marknastein","menu":"Eginleikar fyri marknastein","title":"Eginleikar fyri marknastein","name":"Heiti marknasteinsins","errorName":"Vinarliga rita marknasteinsins heiti","remove":"Strika marknastein"},"anchorId":"Eftir element Id","anchorName":"Eftir navni á marknasteini","charset":"Atknýtt teknsett","cssClasses":"Typografi klassar","emailAddress":"Teldupost-adressa","emailBody":"Breyðtekstur","emailSubject":"Evni","id":"Id","info":"Tilknýtis upplýsingar","langCode":"Tekstkós","langDir":"Tekstkós","langDirLTR":"Frá vinstru til høgru (LTR)","langDirRTL":"Frá høgru til vinstru (RTL)","menu":"Broyt tilknýti","name":"Navn","noAnchors":"(Eingir marknasteinar eru í hesum dokumentið)","noEmail":"Vinarliga skriva teldupost-adressu","noUrl":"Vinarliga skriva tilknýti (URL)","other":"<annað>","popupDependent":"Bundið (Netscape)","popupFeatures":"Popup vindeygans víðkaðu eginleikar","popupFullScreen":"Fullur skermur (IE)","popupLeft":"Frástøða frá vinstru","popupLocationBar":"Adressulinja","popupMenuBar":"Skrábjálki","popupResizable":"Stødd kann broytast","popupScrollBars":"Rullibjálki","popupStatusBar":"Støðufrágreiðingarbjálki","popupToolbar":"Amboðsbjálki","popupTop":"Frástøða frá íerva","rel":"Relatión","selectAnchor":"Vel ein marknastein","styles":"Typografi","tabIndex":"Tabulator indeks","target":"Target","targetFrame":"<ramma>","targetFrameName":"Vís navn vindeygans","targetPopup":"<popup vindeyga>","targetPopupName":"Popup vindeygans navn","title":"Tilknýti","toAnchor":"Tilknýti til marknastein í tekstinum","toEmail":"Teldupostur","toUrl":"URL","toolbar":"Ger/broyt tilknýti","type":"Tilknýtisslag","unlink":"Strika tilknýti","upload":"Send til ambætaran"},"list":{"bulletedlist":"Punktmerktur listi","numberedlist":"Talmerktur listi"},"liststyle":{"armenian":"Armensk talskipan","bulletedTitle":"Eginleikar fyri lista við prikkum","circle":"Sirkul","decimal":"Vanlig tøl (1, 2, 3, etc.)","decimalLeadingZero":"Tøl við null frammanfyri (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgisk talskipan (an, ban, gan, osv.)","lowerAlpha":"Lítlir bókstavir (a, b, c, d, e, etc.)","lowerGreek":"Grikskt við lítlum (alpha, beta, gamma, etc.)","lowerRoman":"Lítil rómaratøl (i, ii, iii, iv, v, etc.)","none":"Einki","notset":"<ikki sett>","numberedTitle":"Eginleikar fyri lista við tølum","square":"Fýrkantur","start":"Byrjan","type":"Slag","upperAlpha":"Stórir bókstavir (A, B, C, D, E, etc.)","upperRoman":"Stór rómaratøl (I, II, III, IV, V, etc.)","validateStartNumber":"Byrjunartalið fyri lista má vera eitt heiltal."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maksimera","minimize":"Minimera"},"newpage":{"toolbar":"Nýggj síða"},"pagebreak":{"alt":"Síðuskift","toolbar":"Ger síðuskift"},"pastetext":{"button":"Innrita som reinan tekst","title":"Innrita som reinan tekst"},"pastefromword":{"confirmCleanup":"Teksturin, tú roynir at seta inn, sýnist at stava frá Word. Skal teksturin reinsast fyrst?","error":"Tað eydnaðist ikki at reinsa tekstin vegna ein internan feil","title":"Innrita frá Word","toolbar":"Innrita frá Word"},"preview":{"preview":"Frumsýning"},"print":{"toolbar":"Prenta"},"removeformat":{"toolbar":"Strika sniðgeving"},"save":{"toolbar":"Goym"},"selectall":{"toolbar":"Markera alt"},"showblocks":{"toolbar":"Vís blokkar"},"sourcearea":{"toolbar":"Kelda"},"specialchar":{"options":"Møguleikar við serteknum","title":"Vel sertekn","toolbar":"Set inn sertekn"},"scayt":{"btn_about":"Um SCAYT","btn_dictionaries":"Orðabøkur","btn_disable":"Nokta SCAYT","btn_enable":"Loyv SCAYT","btn_langs":"Tungumál","btn_options":"Uppseting","text_title":"Kanna stavseting, meðan tú skrivar"},"stylescombo":{"label":"Typografi","panelTitle":"Formatterings stílir","panelTitle1":"Blokk stílir","panelTitle2":"Inline stílir","panelTitle3":"Object stílir"},"table":{"border":"Bordabreidd","caption":"Tabellfrágreiðing","cell":{"menu":"Meski","insertBefore":"Set meska inn áðrenn","insertAfter":"Set meska inn aftaná","deleteCell":"Strika meskar","merge":"Flætta meskar","mergeRight":"Flætta meskar til høgru","mergeDown":"Flætta saman","splitHorizontal":"Kloyv meska vatnrætt","splitVertical":"Kloyv meska loddrætt","title":"Mesku eginleikar","cellType":"Mesku slag","rowSpan":"Ræð spenni","colSpan":"Kolonnu spenni","wordWrap":"Orðkloyving","hAlign":"Horisontal plasering","vAlign":"Loddrøtt plasering","alignBaseline":"Basislinja","bgColor":"Bakgrundslitur","borderColor":"Bordalitur","data":"Data","header":"Header","yes":"Ja","no":"Nei","invalidWidth":"Meskubreidd má vera eitt tal.","invalidHeight":"Meskuhædd má vera eitt tal.","invalidRowSpan":"Raðspennið má vera eitt heiltal.","invalidColSpan":"Kolonnuspennið má vera eitt heiltal.","chooseColor":"Vel"},"cellPad":"Meskubreddi","cellSpace":"Fjarstøða millum meskar","column":{"menu":"Kolonna","insertBefore":"Set kolonnu inn áðrenn","insertAfter":"Set kolonnu inn aftaná","deleteColumn":"Strika kolonnur"},"columns":"Kolonnur","deleteTable":"Strika tabell","headers":"Yvirskriftir","headersBoth":"Báðir","headersColumn":"Fyrsta kolonna","headersNone":"Eingin","headersRow":"Fyrsta rað","invalidBorder":"Borda-stødd má vera eitt tal.","invalidCellPadding":"Cell padding má vera eitt tal.","invalidCellSpacing":"Cell spacing má vera eitt tal.","invalidCols":"Talið av kolonnum má vera eitt tal størri enn 0.","invalidHeight":"Tabell-hædd má vera eitt tal.","invalidRows":"Talið av røðum má vera eitt tal størri enn 0.","invalidWidth":"Tabell-breidd má vera eitt tal.","menu":"Eginleikar fyri tabell","row":{"menu":"Rað","insertBefore":"Set rað inn áðrenn","insertAfter":"Set rað inn aftaná","deleteRow":"Strika røðir"},"rows":"Røðir","summary":"Samandráttur","title":"Eginleikar fyri tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"pixels","widthUnit":"breiddar unit"},"undo":{"redo":"Vend aftur","undo":"Angra"},"wsc":{"btnIgnore":"Forfjóna","btnIgnoreAll":"Forfjóna alt","btnReplace":"Yvirskriva","btnReplaceAll":"Yvirskriva alt","btnUndo":"Angra","changeTo":"Broyt til","errorLoading":"Feilur við innlesing av application service host: %s.","ieSpellDownload":"Rættstavarin er ikki tøkur í tekstviðgeranum. Vilt tú heinta hann nú?","manyChanges":"Rættstavarin liðugur: %1 orð broytt","noChanges":"Rættstavarin liðugur: Einki orð varð broytt","noMispell":"Rættstavarin liðugur: Eingin feilur funnin","noSuggestions":"- Einki uppskot -","notAvailable":"Tíverri, ikki tøkt í løtuni.","notInDic":"Finst ikki í orðabókini","oneChange":"Rættstavarin liðugur: Eitt orð er broytt","progress":"Rættstavarin arbeiðir...","title":"Kanna stavseting","toolbar":"Kanna stavseting"}};
\ No newline at end of file
+CKEDITOR.lang['fo']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Trýst ALT og 0 fyri vegleiðing","browseServer":"Ambætarakagi","url":"URL","protocol":"Protokoll","upload":"Send til ambætaran","uploadSubmit":"Send til ambætaran","image":"Myndir","flash":"Flash","form":"Formur","checkbox":"Flugubein","radio":"Radioknøttur","textField":"Tekstteigur","textarea":"Tekstumráði","hiddenField":"Fjaldur teigur","button":"Knøttur","select":"Valskrá","imageButton":"Myndaknøttur","notSet":"<ikki sett>","id":"Id","name":"Navn","langDir":"Tekstkós","langDirLtr":"Frá vinstru til høgru (LTR)","langDirRtl":"Frá høgru til vinstru (RTL)","langCode":"Málkoda","longDescr":"Víðkað URL frágreiðing","cssClass":"Typografi klassar","advisoryTitle":"Vegleiðandi heiti","cssStyle":"Typografi","ok":"Góðkent","cancel":"Avlýs","close":"Lat aftur","preview":"Frumsýn","resize":"Drag fyri at broyta stødd","generalTab":"Generelt","advancedTab":"Fjølbroytt","validateNumberFailed":"Hetta er ikki eitt tal.","confirmNewPage":"Allar ikki goymdar broytingar í hesum innihaldið hvørva. Skal nýggj síða lesast kortini?","confirmCancel":"Nakrir valmøguleikar eru broyttir. Ert tú vísur í, at dialogurin skal latast aftur?","options":"Options","target":"Target","targetNew":"Nýtt vindeyga (_blank)","targetTop":"Vindeyga ovast (_top)","targetSelf":"Sama vindeyga (_self)","targetParent":"Upphavligt vindeyga (_parent)","langDirLTR":"Frá vinstru til høgru (LTR)","langDirRTL":"Frá høgru til vinstru (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Breidd","height":"Hædd","align":"Justering","alignLeft":"Vinstra","alignRight":"Høgra","alignCenter":"Miðsett","alignJustify":"Javnir tekstkantar","alignTop":"Ovast","alignMiddle":"Miðja","alignBottom":"Botnur","alignNone":"Eingin","invalidValue":"Invalid value.","invalidHeight":"Hædd má vera eitt tal.","invalidWidth":"Breidd má vera eitt tal.","invalidCssLength":"Virðið sett í \"%1\" feltið má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px, %, in, cm, mm, em, ex, pt, ella pc).","invalidHtmlLength":"Virðið sett í \"%1\" feltiðield má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px ella %).","invalidInlineStyle":"Virði specifiserað fyri inline style má hava eitt ella fleiri pør (tuples) skrivað sum \"name : value\", hvørt parið sundurskilt við semi-colon.","cssLengthTooltip":"Skriva eitt tal fyri eitt virði í pixels ella eitt tal við gyldigum CSS eind (px, %, in, cm, mm, em, ex, pt, ella pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikki tøkt</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Um CKEditor","help":"Kekka $1 fyri hjálp.","moreInfo":"Licens upplýsingar finnast á heimasíðu okkara:","title":"Um CKEditor","userGuide":"CKEditor Brúkaravegleiðing"},"basicstyles":{"bold":"Feit skrift","italic":"Skráskrift","strike":"Yvirstrikað","subscript":"Lækkað skrift","superscript":"Hækkað skrift","underline":"Undirstrikað"},"bidi":{"ltr":"Tekstkós frá vinstru til høgru","rtl":"Tekstkós frá høgru til vinstru"},"blockquote":{"toolbar":"Blockquote"},"clipboard":{"copy":"Avrita","copyError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at avrita tekstin. Vinarliga nýt knappaborðið til at avrita tekstin (Ctrl/Cmd+C).","cut":"Kvett","cutError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at kvetta tekstin. Vinarliga nýt knappaborðið til at kvetta tekstin (Ctrl/Cmd+X).","paste":"Innrita","pasteArea":"Avritingarumráði","pasteMsg":"Vinarliga koyr tekstin í hendan rútin við knappaborðinum (<strong>Ctrl/Cmd+V</strong>) og klikk á <strong>Góðtak</strong>.","securityMsg":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í beinleiðis atgongd til avritingarminnið. Tygum mugu royna aftur í hesum rútinum.","title":"Innrita"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatiskt","bgColorTitle":"Bakgrundslitur","colors":{"000":"Svart","800000":"Maroon","8B4513":"Saðilsbrúnt","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Myrkagrátt","B22222":"Fire Brick","A52A2A":"Brúnt","DAA520":"Gullstavur","006400":"Myrkagrønt","40E0D0":"Turquoise","0000CD":"Meðal blátt","800080":"Purple","808080":"Grátt","F00":"Reytt","FF8C00":"Myrkt appelsingult","FFD700":"Gull","008000":"Grønt","0FF":"Cyan","00F":"Blátt","EE82EE":"Violet","A9A9A9":"Døkt grátt","FFA07A":"Ljósur laksur","FFA500":"Appelsingult","FFFF00":"Gult","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Ljósablátt","DDA0DD":"Plum","D3D3D3":"Ljósagrátt","FFF0F5":"Lavender Blush","FAEBD7":"Klassiskt hvítt","FFFFE0":"Ljósagult","F0FFF0":"Hunangsdøggur","F0FFFF":"Azure","F0F8FF":"Alice Blátt","E6E6FA":"Lavender","FFF":"Hvítt","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Fleiri litir...","panelTitle":"Litir","textColorTitle":"Tekstlitur"},"colordialog":{"clear":"Strika","highlight":"Framheva","options":"Litmøguleikar","selected":"Valdur litur","title":"Vel lit"},"templates":{"button":"Skabelónir","emptyListMsg":"(Ongar skabelónir tøkar)","insertOption":"Yvirskriva núverandi innihald","options":"Møguleikar fyri Template","selectPromptMsg":"Vinarliga vel ta skabelón, ið skal opnast í tekstviðgeranum<br>(Hetta yvirskrivar núverandi innihald):","title":"Innihaldsskabelónir"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Redigera Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Vinstru til høgru (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Høgru til vinstru (RTL)","languageCodeInputLabel":" Language Code","remove":"Strika Div","styleSelectLabel":"Style","title":"Ger Div Container","toolbar":"Ger Div Container"},"toolbar":{"toolbarCollapse":"Lat Toolbar aftur","toolbarExpand":"Vís Toolbar","toolbarGroups":{"document":"Dokument","clipboard":"Clipboard/Undo","editing":"Editering","forms":"Formar","basicstyles":"Grundleggjandi Styles","paragraph":"Reglubrot","links":"Leinkjur","insert":"Set inn","styles":"Styles","colors":"Litir","tools":"Tól"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Slóð til elementir","eleTitle":"%1 element"},"find":{"find":"Leita","findOptions":"Finn møguleikar","findWhat":"Finn:","matchCase":"Munur á stórum og smáum bókstavum","matchCyclic":"Match cyclic","matchWord":"Bert heil orð","notFoundMsg":"Leititeksturin varð ikki funnin","replace":"Yvirskriva","replaceAll":"Yvirskriva alt","replaceSuccessMsg":"%1 úrslit broytt.","replaceWith":"Yvirskriva við:","title":"Finn og broyt"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Fjaldur teigur","iframe":"IFrame","unknown":"Ókent Object"},"flash":{"access":"Script atgongd","accessAlways":"Altíð","accessNever":"Ongantíð","accessSameDomain":"Sama navnaøki","alignAbsBottom":"Abs botnur","alignAbsMiddle":"Abs miðja","alignBaseline":"Basislinja","alignTextTop":"Tekst toppur","bgcolor":"Bakgrundslitur","chkFull":"Loyv fullan skerm","chkLoop":"Endurspæl","chkMenu":"Ger Flash skrá virkna","chkPlay":"Avspælingin byrjar sjálv","flashvars":"Variablar fyri Flash","hSpace":"Høgri breddi","properties":"Flash eginleikar","propertiesTab":"Eginleikar","quality":"Góðska","qualityAutoHigh":"Auto høg","qualityAutoLow":"Auto Lág","qualityBest":"Besta","qualityHigh":"Høg","qualityLow":"Lág","qualityMedium":"Meðal","scale":"Skalering","scaleAll":"Vís alt","scaleFit":"Neyv skalering","scaleNoBorder":"Eingin bordi","title":"Flash eginleikar","vSpace":"Vinstri breddi","validateHSpace":"HSpace má vera eitt tal.","validateSrc":"Vinarliga skriva tilknýti (URL)","validateVSpace":"VSpace má vera eitt tal.","windowMode":"Slag av rúti","windowModeOpaque":"Ikki transparent","windowModeTransparent":"Transparent","windowModeWindow":"Rútur"},"font":{"fontSize":{"label":"Skriftstødd","voiceLabel":"Skriftstødd","panelTitle":"Skriftstødd"},"label":"Skrift","panelTitle":"Skrift","voiceLabel":"Skrift"},"forms":{"button":{"title":"Eginleikar fyri knøtt","text":"Tekstur","type":"Slag","typeBtn":"Knøttur","typeSbm":"Send","typeRst":"Nullstilla"},"checkboxAndRadio":{"checkboxTitle":"Eginleikar fyri flugubein","radioTitle":"Eginleikar fyri radioknøtt","value":"Virði","selected":"Valt","required":"Required"},"form":{"title":"Eginleikar fyri Form","menu":"Eginleikar fyri Form","action":"Hending","method":"Háttur","encoding":"Encoding"},"hidden":{"title":"Eginleikar fyri fjaldan teig","name":"Navn","value":"Virði"},"select":{"title":"Eginleikar fyri valskrá","selectInfo":"Upplýsingar","opAvail":"Tøkir møguleikar","value":"Virði","size":"Stødd","lines":"Linjur","chkMulti":"Loyv fleiri valmøguleikum samstundis","required":"Required","opText":"Tekstur","opValue":"Virði","btnAdd":"Legg afturat","btnModify":"Broyt","btnUp":"Upp","btnDown":"Niður","btnSetValue":"Set sum valt virði","btnDelete":"Strika"},"textarea":{"title":"Eginleikar fyri tekstumráði","cols":"kolonnur","rows":"røðir"},"textfield":{"title":"Eginleikar fyri tekstteig","name":"Navn","value":"Virði","charWidth":"Breidd (sjónlig tekn)","maxChars":"Mest loyvdu tekn","required":"Required","type":"Slag","typeText":"Tekstur","typePass":"Loyniorð","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Skriftsnið","panelTitle":"Skriftsnið","tag_address":"Adressa","tag_div":"Vanligt (DIV)","tag_h1":"Yvirskrift 1","tag_h2":"Yvirskrift 2","tag_h3":"Yvirskrift 3","tag_h4":"Yvirskrift 4","tag_h5":"Yvirskrift 5","tag_h6":"Yvirskrift 6","tag_p":"Vanligt","tag_pre":"Sniðgivið"},"horizontalrule":{"toolbar":"Ger vatnrætta linju"},"iframe":{"border":"Vís frame kant","noUrl":"Vinarliga skriva URL til iframe","scrolling":"Loyv scrollbars","title":"Møguleikar fyri IFrame","toolbar":"IFrame"},"image":{"alt":"Alternativur tekstur","border":"Bordi","btnUpload":"Send til ambætaran","button2Img":"Skal valdi myndaknøttur gerast til vanliga mynd?","hSpace":"Høgri breddi","img2Button":"Skal valda mynd gerast til myndaknøtt?","infoTab":"Myndaupplýsingar","linkTab":"Tilknýti","lockRatio":"Læs lutfallið","menu":"Myndaeginleikar","resetSize":"Upprunastødd","title":"Myndaeginleikar","titleButton":"Eginleikar fyri myndaknøtt","upload":"Send","urlMissing":"URL til mynd manglar.","vSpace":"Vinstri breddi","validateBorder":"Bordi má vera eitt heiltal.","validateHSpace":"HSpace má vera eitt heiltal.","validateVSpace":"VSpace má vera eitt heiltal."},"indent":{"indent":"Økja reglubrotarinntriv","outdent":"Minka reglubrotarinntriv"},"smiley":{"options":"Møguleikar fyri Smiley","title":"Vel Smiley","toolbar":"Smiley"},"justify":{"block":"Javnir tekstkantar","center":"Miðsett","left":"Vinstrasett","right":"Høgrasett"},"language":{"button":"Velja tungumál","remove":"Remove language"},"link":{"acccessKey":"Snarvegisknöttur","advanced":"Fjølbroytt","advisoryContentType":"Vegleiðandi innihaldsslag","advisoryTitle":"Vegleiðandi heiti","anchor":{"toolbar":"Ger/broyt marknastein","menu":"Eginleikar fyri marknastein","title":"Eginleikar fyri marknastein","name":"Heiti marknasteinsins","errorName":"Vinarliga rita marknasteinsins heiti","remove":"Strika marknastein"},"anchorId":"Eftir element Id","anchorName":"Eftir navni á marknasteini","charset":"Atknýtt teknsett","cssClasses":"Typografi klassar","download":"Force Download","displayText":"Display Text","emailAddress":"Teldupost-adressa","emailBody":"Breyðtekstur","emailSubject":"Evni","id":"Id","info":"Tilknýtis upplýsingar","langCode":"Tekstkós","langDir":"Tekstkós","langDirLTR":"Frá vinstru til høgru (LTR)","langDirRTL":"Frá høgru til vinstru (RTL)","menu":"Broyt tilknýti","name":"Navn","noAnchors":"(Eingir marknasteinar eru í hesum dokumentið)","noEmail":"Vinarliga skriva teldupost-adressu","noUrl":"Vinarliga skriva tilknýti (URL)","other":"<annað>","popupDependent":"Bundið (Netscape)","popupFeatures":"Popup vindeygans víðkaðu eginleikar","popupFullScreen":"Fullur skermur (IE)","popupLeft":"Frástøða frá vinstru","popupLocationBar":"Adressulinja","popupMenuBar":"Skrábjálki","popupResizable":"Stødd kann broytast","popupScrollBars":"Rullibjálki","popupStatusBar":"Støðufrágreiðingarbjálki","popupToolbar":"Amboðsbjálki","popupTop":"Frástøða frá íerva","rel":"Relatión","selectAnchor":"Vel ein marknastein","styles":"Typografi","tabIndex":"Tabulator indeks","target":"Target","targetFrame":"<ramma>","targetFrameName":"Vís navn vindeygans","targetPopup":"<popup vindeyga>","targetPopupName":"Popup vindeygans navn","title":"Tilknýti","toAnchor":"Tilknýti til marknastein í tekstinum","toEmail":"Teldupostur","toUrl":"URL","toolbar":"Ger/broyt tilknýti","type":"Tilknýtisslag","unlink":"Strika tilknýti","upload":"Send til ambætaran"},"list":{"bulletedlist":"Punktmerktur listi","numberedlist":"Talmerktur listi"},"liststyle":{"armenian":"Armensk talskipan","bulletedTitle":"Eginleikar fyri lista við prikkum","circle":"Sirkul","decimal":"Vanlig tøl (1, 2, 3, etc.)","decimalLeadingZero":"Tøl við null frammanfyri (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgisk talskipan (an, ban, gan, osv.)","lowerAlpha":"Lítlir bókstavir (a, b, c, d, e, etc.)","lowerGreek":"Grikskt við lítlum (alpha, beta, gamma, etc.)","lowerRoman":"Lítil rómaratøl (i, ii, iii, iv, v, etc.)","none":"Einki","notset":"<ikki sett>","numberedTitle":"Eginleikar fyri lista við tølum","square":"Fýrkantur","start":"Byrjan","type":"Slag","upperAlpha":"Stórir bókstavir (A, B, C, D, E, etc.)","upperRoman":"Stór rómaratøl (I, II, III, IV, V, etc.)","validateStartNumber":"Byrjunartalið fyri lista má vera eitt heiltal."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maksimera","minimize":"Minimera"},"newpage":{"toolbar":"Nýggj síða"},"pagebreak":{"alt":"Síðuskift","toolbar":"Ger síðuskift"},"pastetext":{"button":"Innrita som reinan tekst","title":"Innrita som reinan tekst"},"pastefromword":{"confirmCleanup":"Teksturin, tú roynir at seta inn, sýnist at stava frá Word. Skal teksturin reinsast fyrst?","error":"Tað eydnaðist ikki at reinsa tekstin vegna ein internan feil","title":"Innrita frá Word","toolbar":"Innrita frá Word"},"preview":{"preview":"Frumsýning"},"print":{"toolbar":"Prenta"},"removeformat":{"toolbar":"Strika sniðgeving"},"save":{"toolbar":"Goym"},"selectall":{"toolbar":"Markera alt"},"showblocks":{"toolbar":"Vís blokkar"},"sourcearea":{"toolbar":"Kelda"},"specialchar":{"options":"Møguleikar við serteknum","title":"Vel sertekn","toolbar":"Set inn sertekn"},"scayt":{"btn_about":"Um SCAYT","btn_dictionaries":"Orðabøkur","btn_disable":"Nokta SCAYT","btn_enable":"Loyv SCAYT","btn_langs":"Tungumál","btn_options":"Uppseting","text_title":"Kanna stavseting, meðan tú skrivar"},"stylescombo":{"label":"Typografi","panelTitle":"Formatterings stílir","panelTitle1":"Blokk stílir","panelTitle2":"Inline stílir","panelTitle3":"Object stílir"},"table":{"border":"Bordabreidd","caption":"Tabellfrágreiðing","cell":{"menu":"Meski","insertBefore":"Set meska inn áðrenn","insertAfter":"Set meska inn aftaná","deleteCell":"Strika meskar","merge":"Flætta meskar","mergeRight":"Flætta meskar til høgru","mergeDown":"Flætta saman","splitHorizontal":"Kloyv meska vatnrætt","splitVertical":"Kloyv meska loddrætt","title":"Mesku eginleikar","cellType":"Mesku slag","rowSpan":"Ræð spenni","colSpan":"Kolonnu spenni","wordWrap":"Orðkloyving","hAlign":"Horisontal plasering","vAlign":"Loddrøtt plasering","alignBaseline":"Basislinja","bgColor":"Bakgrundslitur","borderColor":"Bordalitur","data":"Data","header":"Header","yes":"Ja","no":"Nei","invalidWidth":"Meskubreidd má vera eitt tal.","invalidHeight":"Meskuhædd má vera eitt tal.","invalidRowSpan":"Raðspennið má vera eitt heiltal.","invalidColSpan":"Kolonnuspennið má vera eitt heiltal.","chooseColor":"Vel"},"cellPad":"Meskubreddi","cellSpace":"Fjarstøða millum meskar","column":{"menu":"Kolonna","insertBefore":"Set kolonnu inn áðrenn","insertAfter":"Set kolonnu inn aftaná","deleteColumn":"Strika kolonnur"},"columns":"Kolonnur","deleteTable":"Strika tabell","headers":"Yvirskriftir","headersBoth":"Báðir","headersColumn":"Fyrsta kolonna","headersNone":"Eingin","headersRow":"Fyrsta rað","invalidBorder":"Borda-stødd má vera eitt tal.","invalidCellPadding":"Cell padding má vera eitt tal.","invalidCellSpacing":"Cell spacing má vera eitt tal.","invalidCols":"Talið av kolonnum má vera eitt tal størri enn 0.","invalidHeight":"Tabell-hædd má vera eitt tal.","invalidRows":"Talið av røðum má vera eitt tal størri enn 0.","invalidWidth":"Tabell-breidd má vera eitt tal.","menu":"Eginleikar fyri tabell","row":{"menu":"Rað","insertBefore":"Set rað inn áðrenn","insertAfter":"Set rað inn aftaná","deleteRow":"Strika røðir"},"rows":"Røðir","summary":"Samandráttur","title":"Eginleikar fyri tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"pixels","widthUnit":"breiddar unit"},"undo":{"redo":"Vend aftur","undo":"Angra"},"wsc":{"btnIgnore":"Forfjóna","btnIgnoreAll":"Forfjóna alt","btnReplace":"Yvirskriva","btnReplaceAll":"Yvirskriva alt","btnUndo":"Angra","changeTo":"Broyt til","errorLoading":"Feilur við innlesing av application service host: %s.","ieSpellDownload":"Rættstavarin er ikki tøkur í tekstviðgeranum. Vilt tú heinta hann nú?","manyChanges":"Rættstavarin liðugur: %1 orð broytt","noChanges":"Rættstavarin liðugur: Einki orð varð broytt","noMispell":"Rættstavarin liðugur: Eingin feilur funnin","noSuggestions":"- Einki uppskot -","notAvailable":"Tíverri, ikki tøkt í løtuni.","notInDic":"Finst ikki í orðabókini","oneChange":"Rættstavarin liðugur: Eitt orð er broytt","progress":"Rættstavarin arbeiðir...","title":"Kanna stavseting","toolbar":"Kanna stavseting"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/lang/fr-ca.js
index 4a76063d136..ff544a102fe 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/fr-ca.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/fr-ca.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fr-ca']={"editor":"Éditeur de texte enrichi","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Appuyez sur 0 pour de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Envoyer","uploadSubmit":"Envoyer au serveur","image":"Image","flash":"Animation Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ caché","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton image","notSet":"<Par défaut>","id":"Id","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"De gauche à droite (LTR)","langDirRtl":"De droite à gauche (RTL)","langCode":"Code langue","longDescr":"URL de description longue","cssClass":"Classes CSS","advisoryTitle":"Titre","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous certain de vouloir charger une nouvelle page?","confirmCancel":"Certaines options ont été modifiées.  Êtes-vous certain de vouloir fermer?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieur (_top)","targetSelf":"Cette fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"De gauche à droite (LTR)","langDirRTL":"De droite à gauche (RTL)","styles":"Style","cssClasses":"Classe CSS","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centré","alignJustify":"Justifié","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"None","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style intégré doit être composée d'un ou plusieurs couples de valeur au format \"nom : valeur\", separés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour la valeur en pixel ou un nombre avec une unité CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour l'aide.","moreInfo":"Pour les informations de licence, consulter notre site internet:","title":"À propos de CKEditor","userGuide":"Guide utilisateur de CKEditor"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"bidi":{"ltr":"Direction du texte de gauche à droite","rtl":"Direction du texte de droite à gauche"},"blockquote":{"toolbar":"Citation"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de copier automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de couper automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+X).","paste":"Coller","pasteArea":"Coller la zone","pasteMsg":"Veuillez coller dans la zone ci-dessous en utilisant le clavier (<STRONG>Ctrl/Cmd+V</STRONG>) et appuyer sur <STRONG>OK</STRONG>.","securityMsg":"A cause des paramètres de sécurité de votre navigateur, l'éditeur ne peut accéder au presse-papier directement. Vous devez coller à nouveau le contenu dans cette fenêtre.","title":"Coller"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatique","bgColorTitle":"Couleur de fond","colors":{"000":"Noir","800000":"Marron","8B4513":"Brun foncé","2F4F4F":"Gris ardoise foncé","008080":"Sarcelle","000080":"Marine","4B0082":"Indigo","696969":"Gris foncé","B22222":"Rouge brique","A52A2A":"Brun","DAA520":"Doré","006400":"Vert foncé","40E0D0":"Turquoise","0000CD":"Bleu","800080":"Mauve","808080":"Gris","F00":"Rouge","FF8C00":"Orange foncé","FFD700":"Or","008000":"Vert","0FF":"Cyan","00F":"Bleu","EE82EE":"Violet","A9A9A9":"Gris pâle","FFA07A":"Saumon clair","FFA500":"Orange","FFFF00":"Jaune","00FF00":"Vert lime","AFEEEE":"Turquoise pâle","ADD8E6":"Bleu pâle","DDA0DD":"Prune","D3D3D3":"Gris pâle","FFF0F5":"Bleu lavande","FAEBD7":"Blanc antique","FFFFE0":"Jaune pâle","F0FFF0":"Miel doré","F0FFFF":"Azure","F0F8FF":"Bleu alice","E6E6FA":"Lavande","FFF":"Blanc"},"more":"Plus de couleurs...","panelTitle":"Couleurs","textColorTitle":"Couleur de texte"},"colordialog":{"clear":"Effacer","highlight":"Surligner","options":"Options de couleur","selected":"Couleur sélectionnée","title":"Choisir une couleur"},"templates":{"button":"Modèles","emptyListMsg":"(Aucun modèle disponible)","insertOption":"Remplacer tout le contenu actuel","options":"Options de modèles","selectPromptMsg":"Sélectionner le modèle à ouvrir dans l'éditeur","title":"Modèles de contenu"},"contextmenu":{"options":"Options du menu contextuel"},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Titre","cssClassInputLabel":"Classes CSS","edit":"Modifier le DIV","inlineStyleInputLabel":"Style en ligne","langDirLTRLabel":"De gauche à droite (LTR)","langDirLabel":"Sens d'écriture","langDirRTLLabel":"De droite à gauche (RTL)","languageCodeInputLabel":"Code de langue","remove":"Supprimer le DIV","styleSelectLabel":"Style","title":"Créer un DIV","toolbar":"Créer un DIV"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse papier/Annuler","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barre d'outils de l'éditeur"},"elementspath":{"eleLabel":"Chemin d'éléments","eleTitle":"element %1"},"find":{"find":"Rechercher","findOptions":"Options de recherche","findWhat":"Rechercher:","matchCase":"Respecter la casse","matchCyclic":"Recherche cyclique","matchWord":"Mot entier","notFoundMsg":"Le texte indiqué est introuvable.","replace":"Remplacer","replaceAll":"Tout remplacer","replaceSuccessMsg":"%1 remplacements.","replaceWith":"Remplacer par:","title":"Rechercher et remplacer"},"fakeobjects":{"anchor":"Ancre","flash":"Animation Flash","hiddenfield":"Champ caché","iframe":"IFrame","unknown":"Objet inconnu"},"flash":{"access":"Accès au script","accessAlways":"Toujours","accessNever":"Jamais","accessSameDomain":"Même domaine","alignAbsBottom":"Bas absolu","alignAbsMiddle":"Milieu absolu","alignBaseline":"Bas du texte","alignTextTop":"Haut du texte","bgcolor":"Couleur de fond","chkFull":"Permettre le plein-écran","chkLoop":"Boucle","chkMenu":"Activer le menu Flash","chkPlay":"Lecture automatique","flashvars":"Variables pour Flash","hSpace":"Espacement horizontal","properties":"Propriétés de l'animation Flash","propertiesTab":"Propriétés","quality":"Qualité","qualityAutoHigh":"Haute auto","qualityAutoLow":"Basse auto","qualityBest":"Meilleur","qualityHigh":"Haute","qualityLow":"Basse","qualityMedium":"Moyenne","scale":"Échelle","scaleAll":"Afficher tout","scaleFit":"Ajuster aux dimensions","scaleNoBorder":"Sans bordure","title":"Propriétés de l'animation Flash","vSpace":"Espacement vertical","validateHSpace":"L'espacement horizontal doit être un entier.","validateSrc":"Veuillez saisir l'URL","validateVSpace":"L'espacement vertical doit être un entier.","windowMode":"Mode de fenêtre","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Fenêtre"},"font":{"fontSize":{"label":"Taille","voiceLabel":"Taille","panelTitle":"Taille"},"label":"Police","panelTitle":"Police","voiceLabel":"Police"},"forms":{"button":{"title":"Propriétés du bouton","text":"Texte (Valeur)","type":"Type","typeBtn":"Bouton","typeSbm":"Soumettre","typeRst":"Réinitialiser"},"checkboxAndRadio":{"checkboxTitle":"Propriétés de la case à cocher","radioTitle":"Propriétés du bouton radio","value":"Valeur","selected":"Sélectionné","required":"Required"},"form":{"title":"Propriétés du formulaire","menu":"Propriétés du formulaire","action":"Action","method":"Méthode","encoding":"Encodage"},"hidden":{"title":"Propriétés du champ caché","name":"Nom","value":"Valeur"},"select":{"title":"Propriétés du champ de sélection","selectInfo":"Info","opAvail":"Options disponibles","value":"Valeur","size":"Taille","lines":"lignes","chkMulti":"Permettre les sélections multiples","required":"Required","opText":"Texte","opValue":"Valeur","btnAdd":"Ajouter","btnModify":"Modifier","btnUp":"Monter","btnDown":"Descendre","btnSetValue":"Valeur sélectionnée","btnDelete":"Supprimer"},"textarea":{"title":"Propriétés de la zone de texte","cols":"Colonnes","rows":"Lignes"},"textfield":{"title":"Propriétés du champ texte","name":"Nom","value":"Valeur","charWidth":"Largeur de caractères","maxChars":"Nombre maximum de caractères","required":"Required","type":"Type","typeText":"Texte","typePass":"Mot de passe","typeEmail":"Courriel","typeSearch":"Recherche","typeTel":"Numéro de téléphone","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"En-tête 1","tag_h2":"En-tête 2","tag_h3":"En-tête 3","tag_h4":"En-tête 4","tag_h5":"En-tête 5","tag_h6":"En-tête 6","tag_p":"Normal","tag_pre":"Formaté"},"horizontalrule":{"toolbar":"Insérer un séparateur horizontale"},"iframe":{"border":"Afficher la bordure du cadre","noUrl":"Veuillez entre l'URL du IFrame","scrolling":"Activer les barres de défilement","title":"Propriétés du IFrame","toolbar":"IFrame"},"image":{"alt":"Texte alternatif","border":"Bordure","btnUpload":"Envoyer sur le serveur","button2Img":"Désirez-vous transformer l'image sélectionnée en image simple?","hSpace":"Espacement horizontal","img2Button":"Désirez-vous transformer l'image sélectionnée en bouton image?","infoTab":"Informations sur l'image","linkTab":"Lien","lockRatio":"Verrouiller les proportions","menu":"Propriétés de l'image","resetSize":"Taille originale","title":"Propriétés de l'image","titleButton":"Propriétés du bouton image","upload":"Téléverser","urlMissing":"L'URL de la source de l'image est manquant.","vSpace":"Espacement vertical","validateBorder":"La bordure doit être un entier.","validateHSpace":"L'espacement horizontal doit être un entier.","validateVSpace":"L'espacement vertical doit être un entier."},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"smiley":{"options":"Options d'émoticônes","title":"Insérer un émoticône","toolbar":"Émoticône"},"justify":{"block":"Justifié","center":"Centré","left":"Aligner à gauche","right":"Aligner à Droite"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Touche d'accessibilité","advanced":"Avancé","advisoryContentType":"Type de contenu","advisoryTitle":"Description","anchor":{"toolbar":"Ancre","menu":"Modifier l'ancre","title":"Propriétés de l'ancre","name":"Nom de l'ancre","errorName":"Veuillez saisir le nom de l'ancre","remove":"Supprimer l'ancre"},"anchorId":"Par ID","anchorName":"Par nom","charset":"Encodage de la cible","cssClasses":"Classes CSS","emailAddress":"Courriel","emailBody":"Corps du message","emailSubject":"Objet du message","id":"ID","info":"Informations sur le lien","langCode":"Code de langue","langDir":"Sens d'écriture","langDirLTR":"De gauche à droite (LTR)","langDirRTL":"De droite à gauche (RTL)","menu":"Modifier le lien","name":"Nom","noAnchors":"(Pas d'ancre disponible dans le document)","noEmail":"Veuillez saisir le courriel","noUrl":"Veuillez saisir l'URL","other":"<autre>","popupDependent":"Dépendante (Netscape)","popupFeatures":"Caractéristiques de la fenêtre popup","popupFullScreen":"Plein écran (IE)","popupLeft":"Position de la gauche","popupLocationBar":"Barre d'adresse","popupMenuBar":"Barre de menu","popupResizable":"Redimensionnable","popupScrollBars":"Barres de défilement","popupStatusBar":"Barre d'état","popupToolbar":"Barre d'outils","popupTop":"Position à partir du haut","rel":"Relation","selectAnchor":"Sélectionner une ancre","styles":"Style","tabIndex":"Ordre de tabulation","target":"Destination","targetFrame":"<Cadre>","targetFrameName":"Nom du cadre de destination","targetPopup":"<fenêtre popup>","targetPopupName":"Nom de la fenêtre popup","title":"Lien","toAnchor":"Ancre dans cette page","toEmail":"Courriel","toUrl":"URL","toolbar":"Lien","type":"Type de lien","unlink":"Supprimer le lien","upload":"Téléverser"},"list":{"bulletedlist":"Liste à puces","numberedlist":"Liste numérotée"},"liststyle":{"armenian":"Numération arménienne","bulletedTitle":"Propriété de liste à puce","circle":"Cercle","decimal":"Décimal (1, 2, 3, etc.)","decimalLeadingZero":"Décimal avec zéro (01, 02, 03, etc.)","disc":"Disque","georgian":"Numération géorgienne (an, ban, gan, etc.)","lowerAlpha":"Alphabétique minuscule (a, b, c, d, e, etc.)","lowerGreek":"Grecque minuscule (alpha, beta, gamma, etc.)","lowerRoman":"Romain minuscule (i, ii, iii, iv, v, etc.)","none":"Aucun","notset":"<non défini>","numberedTitle":"Propriété de la liste numérotée","square":"Carré","start":"Début","type":"Type","upperAlpha":"Alphabétique majuscule (A, B, C, D, E, etc.)","upperRoman":"Romain Majuscule (I, II, III, IV, V, etc.)","validateStartNumber":"Le numéro de début de liste doit être un entier."},"magicline":{"title":"Insérer le paragraphe ici"},"maximize":{"maximize":"Maximizer","minimize":"Minimizer"},"newpage":{"toolbar":"Nouvelle page"},"pagebreak":{"alt":"Saut de page","toolbar":"Insérer un saut de page à l'impression"},"pastetext":{"button":"Coller comme texte","title":"Coller comme texte"},"pastefromword":{"confirmCleanup":"Le texte que vous tentez de coller semble provenir de Word.  Désirez vous le nettoyer avant de coller?","error":"Il n'a pas été possible de nettoyer les données collées du à une erreur interne","title":"Coller de Word","toolbar":"Coller de Word"},"preview":{"preview":"Prévisualiser"},"print":{"toolbar":"Imprimer"},"removeformat":{"toolbar":"Supprimer le formatage"},"save":{"toolbar":"Sauvegarder"},"selectall":{"toolbar":"Sélectionner tout"},"showblocks":{"toolbar":"Afficher les blocs"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Option des caractères spéciaux","title":"Sélectionner un caractère spécial","toolbar":"Insérer un caractère spécial"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Styles de formattage","panelTitle1":"Styles de block","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"table":{"border":"Taille de la bordure","caption":"Titre","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer des cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner à droite","mergeDown":"Fusionner en bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Fusion de lignes","colSpan":"Fusion de colonnes","wordWrap":"Retour à la ligne","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Bas du texte","bgColor":"Couleur d'arrière plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de cellule doit être un nombre.","invalidHeight":"La hauteur de cellule doit être un nombre.","invalidRowSpan":"La fusion de lignes doit être un nombre entier.","invalidColSpan":"La fusion de colonnes doit être un nombre entier.","chooseColor":"Sélectionner"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement des cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer des colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux.","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","invalidBorder":"La taille de bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement des cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer des lignes"},"rows":"Lignes","summary":"Résumé","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pourcentage","widthPx":"pixels","widthUnit":"unité de largeur"},"undo":{"redo":"Refaire","undo":"Annuler"},"wsc":{"btnIgnore":"Ignorer","btnIgnoreAll":"Ignorer tout","btnReplace":"Remplacer","btnReplaceAll":"Remplacer tout","btnUndo":"Annuler","changeTo":"Changer en","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Le Correcteur d'orthographe n'est pas installé. Souhaitez-vous le télécharger maintenant?","manyChanges":"Vérification d'orthographe terminée: %1 mots modifiés","noChanges":"Vérification d'orthographe terminée: Pas de modifications","noMispell":"Vérification d'orthographe terminée: pas d'erreur trouvée","noSuggestions":"- Pas de suggestion -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Pas dans le dictionnaire","oneChange":"Vérification d'orthographe terminée: Un mot modifié","progress":"Vérification d'orthographe en cours...","title":"Spell Checker","toolbar":"Orthographe"}};
\ No newline at end of file
+CKEDITOR.lang['fr-ca']={"editor":"Éditeur de texte enrichi","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Appuyez sur 0 pour de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Envoyer","uploadSubmit":"Envoyer au serveur","image":"Image","flash":"Animation Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ caché","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton image","notSet":"<Par défaut>","id":"Id","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"De gauche à droite (LTR)","langDirRtl":"De droite à gauche (RTL)","langCode":"Code langue","longDescr":"URL de description longue","cssClass":"Classes CSS","advisoryTitle":"Titre","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous certain de vouloir charger une nouvelle page?","confirmCancel":"Certaines options ont été modifiées.  Êtes-vous certain de vouloir fermer?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieur (_top)","targetSelf":"Cette fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"De gauche à droite (LTR)","langDirRTL":"De droite à gauche (RTL)","styles":"Style","cssClasses":"Classe CSS","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centré","alignJustify":"Justifié","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"None","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style intégré doit être composée d'un ou plusieurs couples de valeur au format \"nom : valeur\", separés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour la valeur en pixel ou un nombre avec une unité CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour l'aide.","moreInfo":"Pour les informations de licence, consulter notre site internet:","title":"À propos de CKEditor","userGuide":"Guide utilisateur de CKEditor"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"bidi":{"ltr":"Direction du texte de gauche à droite","rtl":"Direction du texte de droite à gauche"},"blockquote":{"toolbar":"Citation"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de copier automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de couper automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+X).","paste":"Coller","pasteArea":"Coller la zone","pasteMsg":"Veuillez coller dans la zone ci-dessous en utilisant le clavier (<STRONG>Ctrl/Cmd+V</STRONG>) et appuyer sur <STRONG>OK</STRONG>.","securityMsg":"A cause des paramètres de sécurité de votre navigateur, l'éditeur ne peut accéder au presse-papier directement. Vous devez coller à nouveau le contenu dans cette fenêtre.","title":"Coller"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatique","bgColorTitle":"Couleur de fond","colors":{"000":"Noir","800000":"Marron","8B4513":"Brun foncé","2F4F4F":"Gris ardoise foncé","008080":"Sarcelle","000080":"Marine","4B0082":"Indigo","696969":"Gris foncé","B22222":"Rouge brique","A52A2A":"Brun","DAA520":"Doré","006400":"Vert foncé","40E0D0":"Turquoise","0000CD":"Bleu","800080":"Mauve","808080":"Gris","F00":"Rouge","FF8C00":"Orange foncé","FFD700":"Or","008000":"Vert","0FF":"Cyan","00F":"Bleu","EE82EE":"Violet","A9A9A9":"Gris pâle","FFA07A":"Saumon clair","FFA500":"Orange","FFFF00":"Jaune","00FF00":"Vert lime","AFEEEE":"Turquoise pâle","ADD8E6":"Bleu pâle","DDA0DD":"Prune","D3D3D3":"Gris pâle","FFF0F5":"Bleu lavande","FAEBD7":"Blanc antique","FFFFE0":"Jaune pâle","F0FFF0":"Miel doré","F0FFFF":"Azure","F0F8FF":"Bleu alice","E6E6FA":"Lavande","FFF":"Blanc","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Plus de couleurs...","panelTitle":"Couleurs","textColorTitle":"Couleur de texte"},"colordialog":{"clear":"Effacer","highlight":"Surligner","options":"Options de couleur","selected":"Couleur sélectionnée","title":"Choisir une couleur"},"templates":{"button":"Modèles","emptyListMsg":"(Aucun modèle disponible)","insertOption":"Remplacer tout le contenu actuel","options":"Options de modèles","selectPromptMsg":"Sélectionner le modèle à ouvrir dans l'éditeur","title":"Modèles de contenu"},"contextmenu":{"options":"Options du menu contextuel"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Titre","cssClassInputLabel":"Classes CSS","edit":"Modifier le DIV","inlineStyleInputLabel":"Style en ligne","langDirLTRLabel":"De gauche à droite (LTR)","langDirLabel":"Sens d'écriture","langDirRTLLabel":"De droite à gauche (RTL)","languageCodeInputLabel":"Code de langue","remove":"Supprimer le DIV","styleSelectLabel":"Style","title":"Créer un DIV","toolbar":"Créer un DIV"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse papier/Annuler","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barre d'outils de l'éditeur"},"elementspath":{"eleLabel":"Chemin d'éléments","eleTitle":"element %1"},"find":{"find":"Rechercher","findOptions":"Options de recherche","findWhat":"Rechercher:","matchCase":"Respecter la casse","matchCyclic":"Recherche cyclique","matchWord":"Mot entier","notFoundMsg":"Le texte indiqué est introuvable.","replace":"Remplacer","replaceAll":"Tout remplacer","replaceSuccessMsg":"%1 remplacements.","replaceWith":"Remplacer par:","title":"Rechercher et remplacer"},"fakeobjects":{"anchor":"Ancre","flash":"Animation Flash","hiddenfield":"Champ caché","iframe":"IFrame","unknown":"Objet inconnu"},"flash":{"access":"Accès au script","accessAlways":"Toujours","accessNever":"Jamais","accessSameDomain":"Même domaine","alignAbsBottom":"Bas absolu","alignAbsMiddle":"Milieu absolu","alignBaseline":"Bas du texte","alignTextTop":"Haut du texte","bgcolor":"Couleur de fond","chkFull":"Permettre le plein-écran","chkLoop":"Boucle","chkMenu":"Activer le menu Flash","chkPlay":"Lecture automatique","flashvars":"Variables pour Flash","hSpace":"Espacement horizontal","properties":"Propriétés de l'animation Flash","propertiesTab":"Propriétés","quality":"Qualité","qualityAutoHigh":"Haute auto","qualityAutoLow":"Basse auto","qualityBest":"Meilleur","qualityHigh":"Haute","qualityLow":"Basse","qualityMedium":"Moyenne","scale":"Échelle","scaleAll":"Afficher tout","scaleFit":"Ajuster aux dimensions","scaleNoBorder":"Sans bordure","title":"Propriétés de l'animation Flash","vSpace":"Espacement vertical","validateHSpace":"L'espacement horizontal doit être un entier.","validateSrc":"Veuillez saisir l'URL","validateVSpace":"L'espacement vertical doit être un entier.","windowMode":"Mode de fenêtre","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Fenêtre"},"font":{"fontSize":{"label":"Taille","voiceLabel":"Taille","panelTitle":"Taille"},"label":"Police","panelTitle":"Police","voiceLabel":"Police"},"forms":{"button":{"title":"Propriétés du bouton","text":"Texte (Valeur)","type":"Type","typeBtn":"Bouton","typeSbm":"Soumettre","typeRst":"Réinitialiser"},"checkboxAndRadio":{"checkboxTitle":"Propriétés de la case à cocher","radioTitle":"Propriétés du bouton radio","value":"Valeur","selected":"Sélectionné","required":"Required"},"form":{"title":"Propriétés du formulaire","menu":"Propriétés du formulaire","action":"Action","method":"Méthode","encoding":"Encodage"},"hidden":{"title":"Propriétés du champ caché","name":"Nom","value":"Valeur"},"select":{"title":"Propriétés du champ de sélection","selectInfo":"Info","opAvail":"Options disponibles","value":"Valeur","size":"Taille","lines":"lignes","chkMulti":"Permettre les sélections multiples","required":"Required","opText":"Texte","opValue":"Valeur","btnAdd":"Ajouter","btnModify":"Modifier","btnUp":"Monter","btnDown":"Descendre","btnSetValue":"Valeur sélectionnée","btnDelete":"Supprimer"},"textarea":{"title":"Propriétés de la zone de texte","cols":"Colonnes","rows":"Lignes"},"textfield":{"title":"Propriétés du champ texte","name":"Nom","value":"Valeur","charWidth":"Largeur de caractères","maxChars":"Nombre maximum de caractères","required":"Required","type":"Type","typeText":"Texte","typePass":"Mot de passe","typeEmail":"Courriel","typeSearch":"Recherche","typeTel":"Numéro de téléphone","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"En-tête 1","tag_h2":"En-tête 2","tag_h3":"En-tête 3","tag_h4":"En-tête 4","tag_h5":"En-tête 5","tag_h6":"En-tête 6","tag_p":"Normal","tag_pre":"Formaté"},"horizontalrule":{"toolbar":"Insérer un séparateur horizontale"},"iframe":{"border":"Afficher la bordure du cadre","noUrl":"Veuillez entre l'URL du IFrame","scrolling":"Activer les barres de défilement","title":"Propriétés du IFrame","toolbar":"IFrame"},"image":{"alt":"Texte alternatif","border":"Bordure","btnUpload":"Envoyer sur le serveur","button2Img":"Désirez-vous transformer l'image sélectionnée en image simple?","hSpace":"Espacement horizontal","img2Button":"Désirez-vous transformer l'image sélectionnée en bouton image?","infoTab":"Informations sur l'image","linkTab":"Lien","lockRatio":"Verrouiller les proportions","menu":"Propriétés de l'image","resetSize":"Taille originale","title":"Propriétés de l'image","titleButton":"Propriétés du bouton image","upload":"Téléverser","urlMissing":"L'URL de la source de l'image est manquant.","vSpace":"Espacement vertical","validateBorder":"La bordure doit être un entier.","validateHSpace":"L'espacement horizontal doit être un entier.","validateVSpace":"L'espacement vertical doit être un entier."},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"smiley":{"options":"Options d'émoticônes","title":"Insérer un émoticône","toolbar":"Émoticône"},"justify":{"block":"Justifié","center":"Centré","left":"Aligner à gauche","right":"Aligner à Droite"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Touche d'accessibilité","advanced":"Avancé","advisoryContentType":"Type de contenu","advisoryTitle":"Description","anchor":{"toolbar":"Ancre","menu":"Modifier l'ancre","title":"Propriétés de l'ancre","name":"Nom de l'ancre","errorName":"Veuillez saisir le nom de l'ancre","remove":"Supprimer l'ancre"},"anchorId":"Par ID","anchorName":"Par nom","charset":"Encodage de la cible","cssClasses":"Classes CSS","download":"Force Download","displayText":"Display Text","emailAddress":"Courriel","emailBody":"Corps du message","emailSubject":"Objet du message","id":"ID","info":"Informations sur le lien","langCode":"Code de langue","langDir":"Sens d'écriture","langDirLTR":"De gauche à droite (LTR)","langDirRTL":"De droite à gauche (RTL)","menu":"Modifier le lien","name":"Nom","noAnchors":"(Pas d'ancre disponible dans le document)","noEmail":"Veuillez saisir le courriel","noUrl":"Veuillez saisir l'URL","other":"<autre>","popupDependent":"Dépendante (Netscape)","popupFeatures":"Caractéristiques de la fenêtre popup","popupFullScreen":"Plein écran (IE)","popupLeft":"Position de la gauche","popupLocationBar":"Barre d'adresse","popupMenuBar":"Barre de menu","popupResizable":"Redimensionnable","popupScrollBars":"Barres de défilement","popupStatusBar":"Barre d'état","popupToolbar":"Barre d'outils","popupTop":"Position à partir du haut","rel":"Relation","selectAnchor":"Sélectionner une ancre","styles":"Style","tabIndex":"Ordre de tabulation","target":"Destination","targetFrame":"<Cadre>","targetFrameName":"Nom du cadre de destination","targetPopup":"<fenêtre popup>","targetPopupName":"Nom de la fenêtre popup","title":"Lien","toAnchor":"Ancre dans cette page","toEmail":"Courriel","toUrl":"URL","toolbar":"Lien","type":"Type de lien","unlink":"Supprimer le lien","upload":"Téléverser"},"list":{"bulletedlist":"Liste à puces","numberedlist":"Liste numérotée"},"liststyle":{"armenian":"Numération arménienne","bulletedTitle":"Propriété de liste à puce","circle":"Cercle","decimal":"Décimal (1, 2, 3, etc.)","decimalLeadingZero":"Décimal avec zéro (01, 02, 03, etc.)","disc":"Disque","georgian":"Numération géorgienne (an, ban, gan, etc.)","lowerAlpha":"Alphabétique minuscule (a, b, c, d, e, etc.)","lowerGreek":"Grecque minuscule (alpha, beta, gamma, etc.)","lowerRoman":"Romain minuscule (i, ii, iii, iv, v, etc.)","none":"Aucun","notset":"<non défini>","numberedTitle":"Propriété de la liste numérotée","square":"Carré","start":"Début","type":"Type","upperAlpha":"Alphabétique majuscule (A, B, C, D, E, etc.)","upperRoman":"Romain Majuscule (I, II, III, IV, V, etc.)","validateStartNumber":"Le numéro de début de liste doit être un entier."},"magicline":{"title":"Insérer le paragraphe ici"},"maximize":{"maximize":"Maximizer","minimize":"Minimizer"},"newpage":{"toolbar":"Nouvelle page"},"pagebreak":{"alt":"Saut de page","toolbar":"Insérer un saut de page à l'impression"},"pastetext":{"button":"Coller comme texte","title":"Coller comme texte"},"pastefromword":{"confirmCleanup":"Le texte que vous tentez de coller semble provenir de Word.  Désirez vous le nettoyer avant de coller?","error":"Il n'a pas été possible de nettoyer les données collées du à une erreur interne","title":"Coller de Word","toolbar":"Coller de Word"},"preview":{"preview":"Prévisualiser"},"print":{"toolbar":"Imprimer"},"removeformat":{"toolbar":"Supprimer le formatage"},"save":{"toolbar":"Sauvegarder"},"selectall":{"toolbar":"Sélectionner tout"},"showblocks":{"toolbar":"Afficher les blocs"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Option des caractères spéciaux","title":"Sélectionner un caractère spécial","toolbar":"Insérer un caractère spécial"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Styles de formattage","panelTitle1":"Styles de block","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"table":{"border":"Taille de la bordure","caption":"Titre","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer des cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner à droite","mergeDown":"Fusionner en bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Fusion de lignes","colSpan":"Fusion de colonnes","wordWrap":"Retour à la ligne","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Bas du texte","bgColor":"Couleur d'arrière plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de cellule doit être un nombre.","invalidHeight":"La hauteur de cellule doit être un nombre.","invalidRowSpan":"La fusion de lignes doit être un nombre entier.","invalidColSpan":"La fusion de colonnes doit être un nombre entier.","chooseColor":"Sélectionner"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement des cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer des colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux.","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","invalidBorder":"La taille de bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement des cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer des lignes"},"rows":"Lignes","summary":"Résumé","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pourcentage","widthPx":"pixels","widthUnit":"unité de largeur"},"undo":{"redo":"Refaire","undo":"Annuler"},"wsc":{"btnIgnore":"Ignorer","btnIgnoreAll":"Ignorer tout","btnReplace":"Remplacer","btnReplaceAll":"Remplacer tout","btnUndo":"Annuler","changeTo":"Changer en","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Le Correcteur d'orthographe n'est pas installé. Souhaitez-vous le télécharger maintenant?","manyChanges":"Vérification d'orthographe terminée: %1 mots modifiés","noChanges":"Vérification d'orthographe terminée: Pas de modifications","noMispell":"Vérification d'orthographe terminée: pas d'erreur trouvée","noSuggestions":"- Pas de suggestion -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Pas dans le dictionnaire","oneChange":"Vérification d'orthographe terminée: Un mot modifié","progress":"Vérification d'orthographe en cours...","title":"Spell Checker","toolbar":"Orthographe"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/lang/fr.js
index b460d1fe82e..d53606c88ab 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/fr.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/fr.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fr']={"editor":"Éditeur de Texte Enrichi","editorPanel":"Tableau de bord de l'éditeur de texte enrichi","common":{"editorHelp":"Appuyez sur ALT-0 pour l'aide","browseServer":"Explorer le serveur","url":"URL","protocol":"Protocole","upload":"Télécharger","uploadSubmit":"Envoyer sur le serveur","image":"Image","flash":"Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton Radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ caché","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton image","notSet":"<non défini>","id":"Id","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"Gauche à droite (LTR)","langDirRtl":"Droite à gauche (RTL)","langCode":"Code de langue","longDescr":"URL de description longue (longdesc => malvoyant)","cssClass":"Classe CSS","advisoryTitle":"Description (title)","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Déplacer pour modifier la taille","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous sûr de vouloir charger une nouvelle page?","confirmCancel":"Certaines options ont été modifiées. Êtes-vous sûr de vouloir fermer?","options":"Options","target":"Cible (Target)","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieure (_top)","targetSelf":"Même fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"Gauche à Droite (LTR)","langDirRTL":"Droite à Gauche (RTL)","styles":"Style","cssClasses":"Classes de style","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centré","alignJustify":"Justifier","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"Aucun","invalidValue":"Valeur incorrecte.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style inline doit être composée d'un ou plusieurs couples de valeur au format \"nom : valeur\", separés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour une valeur en pixels ou un nombre avec une unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, Indisponible</span>"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour l'aide.","moreInfo":"Pour les informations de licence, veuillez visiter notre site web:","title":"À propos de CKEditor","userGuide":"Guide de l'utilisateur CKEditor en anglais"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"bidi":{"ltr":"Direction du texte de la gauche vers la droite","rtl":"Direction du texte de la droite vers la gauche"},"blockquote":{"toolbar":"Citation"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur ne permettent pas à l'éditeur d'exécuter automatiquement des opérations de copie. Veuillez utiliser le raccourci clavier (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur ne permettent pas à l'éditeur d'exécuter automatiquement l'opération \"couper\". Veuillez utiliser le raccourci clavier (Ctrl/Cmd+X).","paste":"Coller","pasteArea":"Coller la zone","pasteMsg":"Veuillez coller le texte dans la zone suivante en utilisant le raccourci clavier (<strong>Ctrl/Cmd+V</strong>) et cliquez sur OK.","securityMsg":"A cause des paramètres de sécurité de votre navigateur, l'éditeur n'est pas en mesure d'accéder directement à vos données contenues dans le presse-papier. Vous devriez réessayer de coller les données dans la fenêtre.","title":"Coller"},"button":{"selectedLabel":"%1 (Sélectionné)"},"colorbutton":{"auto":"Automatique","bgColorTitle":"Couleur d'arrière plan","colors":{"000":"Noir","800000":"Marron","8B4513":"Brun moyen","2F4F4F":"Vert sombre","008080":"Canard","000080":"Bleu marine","4B0082":"Indigo","696969":"Gris foncé","B22222":"Rouge brique","A52A2A":"Brun","DAA520":"Or terni","006400":"Vert foncé","40E0D0":"Turquoise","0000CD":"Bleu royal","800080":"Pourpre","808080":"Gris","F00":"Rouge","FF8C00":"Orange foncé","FFD700":"Or","008000":"Vert","0FF":"Cyan","00F":"Bleu","EE82EE":"Violet","A9A9A9":"Gris moyen","FFA07A":"Saumon","FFA500":"Orange","FFFF00":"Jaune","00FF00":"Lime","AFEEEE":"Turquoise clair","ADD8E6":"Bleu clair","DDA0DD":"Prune","D3D3D3":"Gris clair","FFF0F5":"Fard Lavande","FAEBD7":"Blanc antique","FFFFE0":"Jaune clair","F0FFF0":"Honeydew","F0FFFF":"Azur","F0F8FF":"Bleu Alice","E6E6FA":"Lavande","FFF":"Blanc"},"more":"Plus de couleurs...","panelTitle":"Couleurs","textColorTitle":"Couleur de texte"},"colordialog":{"clear":"Effacer","highlight":"Détails","options":"Option des couleurs","selected":"Couleur choisie","title":"Choisir une couleur"},"templates":{"button":"Modèles","emptyListMsg":"(Aucun modèle disponible)","insertOption":"Remplacer le contenu actuel","options":"Options des modèles","selectPromptMsg":"Veuillez sélectionner le modèle pour l'ouvrir dans l'éditeur","title":"Contenu des modèles"},"contextmenu":{"options":"Options du menu contextuel"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Classe CSS","edit":"Éditer la DIV","inlineStyleInputLabel":"Style en ligne","langDirLTRLabel":"Gauche à droite (LTR)","langDirLabel":"Sens d'écriture","langDirRTLLabel":"Droite à gauche (RTL)","languageCodeInputLabel":"Code de langue","remove":"Enlever la DIV","styleSelectLabel":"Style","title":"Créer un container DIV","toolbar":"Créer un container DIV"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse-papier/Défaire","editing":"Editer","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barre d'outils de l'éditeur"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 éléments"},"find":{"find":"Trouver","findOptions":"Options de recherche","findWhat":"Expression à trouver: ","matchCase":"Respecter la casse","matchCyclic":"Boucler","matchWord":"Mot entier uniquement","notFoundMsg":"Le texte spécifié ne peut être trouvé.","replace":"Remplacer","replaceAll":"Remplacer tout","replaceSuccessMsg":"%1 occurrence(s) replacée(s).","replaceWith":"Remplacer par: ","title":"Trouver et remplacer"},"fakeobjects":{"anchor":"Ancre","flash":"Animation Flash","hiddenfield":"Champ caché","iframe":"IFrame","unknown":"Objet inconnu"},"flash":{"access":"Accès aux scripts","accessAlways":"Toujours","accessNever":"Jamais","accessSameDomain":"Même domaine","alignAbsBottom":"Bas absolu","alignAbsMiddle":"Milieu absolu","alignBaseline":"Bas du texte","alignTextTop":"Haut du texte","bgcolor":"Couleur d'arrière-plan","chkFull":"Permettre le plein écran","chkLoop":"Boucle","chkMenu":"Activer le menu Flash","chkPlay":"Jouer automatiquement","flashvars":"Variables du Flash","hSpace":"Espacement horizontal","properties":"Propriétés du Flash","propertiesTab":"Propriétés","quality":"Qualité","qualityAutoHigh":"Haute Auto","qualityAutoLow":"Basse Auto","qualityBest":"Meilleure","qualityHigh":"Haute","qualityLow":"Basse","qualityMedium":"Moyenne","scale":"Echelle","scaleAll":"Afficher tout","scaleFit":"Taille d'origine","scaleNoBorder":"Pas de bordure","title":"Propriétés du Flash","vSpace":"Espacement vertical","validateHSpace":"L'espacement horizontal doit être un nombre.","validateSrc":"L'adresse ne doit pas être vide.","validateVSpace":"L'espacement vertical doit être un nombre.","windowMode":"Mode fenêtre","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Fenêtre"},"font":{"fontSize":{"label":"Taille","voiceLabel":"Taille de police","panelTitle":"Taille de police"},"label":"Police","panelTitle":"Style de police","voiceLabel":"Police"},"forms":{"button":{"title":"Propriétés du bouton","text":"Texte (Value)","type":"Type","typeBtn":"Bouton","typeSbm":"Validation (submit)","typeRst":"Remise à zéro"},"checkboxAndRadio":{"checkboxTitle":"Propriétés de la case à cocher","radioTitle":"Propriétés du bouton Radio","value":"Valeur","selected":"Sélectionné","required":"Requis"},"form":{"title":"Propriétés du formulaire","menu":"Propriétés du formulaire","action":"Action","method":"Méthode","encoding":"Encodage"},"hidden":{"title":"Propriétés du champ caché","name":"Nom","value":"Valeur"},"select":{"title":"Propriétés du menu déroulant","selectInfo":"Informations sur le menu déroulant","opAvail":"Options disponibles","value":"Valeur","size":"Taille","lines":"Lignes","chkMulti":"Permettre les sélections multiples","required":"Requis","opText":"Texte","opValue":"Valeur","btnAdd":"Ajouter","btnModify":"Modifier","btnUp":"Haut","btnDown":"Bas","btnSetValue":"Définir comme valeur sélectionnée","btnDelete":"Supprimer"},"textarea":{"title":"Propriétés de la zone de texte","cols":"Colonnes","rows":"Lignes"},"textfield":{"title":"Propriétés du champ texte","name":"Nom","value":"Valeur","charWidth":"Taille des caractères","maxChars":"Nombre maximum de caractères","required":"Requis","type":"Type","typeText":"Texte","typePass":"Mot de passe","typeEmail":"E-mail","typeSearch":"Rechercher","typeTel":"Numéro de téléphone","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Titre 1","tag_h2":"Titre 2","tag_h3":"Titre 3","tag_h4":"Titre 4","tag_h5":"Titre 5","tag_h6":"Titre 6","tag_p":"Normal","tag_pre":"Formaté"},"horizontalrule":{"toolbar":"Ligne horizontale"},"iframe":{"border":"Afficher une bordure de la IFrame","noUrl":"Veuillez entrer l'adresse du lien de la IFrame","scrolling":"Permettre à la barre de défilement","title":"Propriétés de la IFrame","toolbar":"IFrame"},"image":{"alt":"Texte de remplacement","border":"Bordure","btnUpload":"Envoyer sur le serveur","button2Img":"Voulez-vous transformer le bouton image sélectionné en simple image?","hSpace":"Espacement horizontal","img2Button":"Voulez-vous transformer l'image en bouton image?","infoTab":"Informations sur l'image","linkTab":"Lien","lockRatio":"Conserver les proportions","menu":"Propriétés de l'image","resetSize":"Taille d'origine","title":"Propriétés de l'image","titleButton":"Propriétés du bouton image","upload":"Envoyer","urlMissing":"L'adresse source de l'image est manquante.","vSpace":"Espacement vertical","validateBorder":"Bordure doit être un entier.","validateHSpace":"HSpace doit être un entier.","validateVSpace":"VSpace doit être un entier."},"indent":{"indent":"Augmenter le retrait (tabulation)","outdent":"Diminuer le retrait (tabulation)"},"smiley":{"options":"Options des émoticones","title":"Insérer un émoticone","toolbar":"Émoticone"},"justify":{"block":"Justifier","center":"Centrer","left":"Aligner à gauche","right":"Aligner à droite"},"language":{"button":"Définir la langue","remove":"Supprimer la langue"},"link":{"acccessKey":"Touche d'accessibilité","advanced":"Avancé","advisoryContentType":"Type de contenu (ex: text/html)","advisoryTitle":"Description (title)","anchor":{"toolbar":"Ancre","menu":"Editer l'ancre","title":"Propriétés de l'ancre","name":"Nom de l'ancre","errorName":"Veuillez entrer le nom de l'ancre.","remove":"Supprimer l'ancre"},"anchorId":"Par ID d'élément","anchorName":"Par nom d'ancre","charset":"Charset de la cible","cssClasses":"Classe CSS","emailAddress":"Adresse E-Mail","emailBody":"Corps du message","emailSubject":"Sujet du message","id":"Id","info":"Infos sur le lien","langCode":"Code de langue","langDir":"Sens d'écriture","langDirLTR":"Gauche à droite","langDirRTL":"Droite à gauche","menu":"Editer le lien","name":"Nom","noAnchors":"(Aucune ancre disponible dans ce document)","noEmail":"Veuillez entrer l'adresse e-mail","noUrl":"Veuillez entrer l'adresse du lien","other":"<autre>","popupDependent":"Dépendante (Netscape)","popupFeatures":"Options de la fenêtre popup","popupFullScreen":"Plein écran (IE)","popupLeft":"Position gauche","popupLocationBar":"Barre d'adresse","popupMenuBar":"Barre de menu","popupResizable":"Redimensionnable","popupScrollBars":"Barres de défilement","popupStatusBar":"Barre de status","popupToolbar":"Barre d'outils","popupTop":"Position haute","rel":"Relation","selectAnchor":"Sélectionner l'ancre","styles":"Style","tabIndex":"Index de tabulation","target":"Cible","targetFrame":"<cadre>","targetFrameName":"Nom du Cadre destination","targetPopup":"<fenêtre popup>","targetPopupName":"Nom de la fenêtre popup","title":"Lien","toAnchor":"Ancre","toEmail":"E-mail","toUrl":"URL","toolbar":"Lien","type":"Type de lien","unlink":"Supprimer le lien","upload":"Envoyer"},"list":{"bulletedlist":"Insérer/Supprimer la liste à puces","numberedlist":"Insérer/Supprimer la liste numérotée"},"liststyle":{"armenian":"Numération arménienne","bulletedTitle":"Propriétés de la liste à puces","circle":"Cercle","decimal":"Décimal (1, 2, 3, etc.)","decimalLeadingZero":"Décimal précédé par un 0 (01, 02, 03, etc.)","disc":"Disque","georgian":"Numération géorgienne (an, ban, gan, etc.)","lowerAlpha":"Alphabétique minuscules (a, b, c, d, e, etc.)","lowerGreek":"Grec minuscule (alpha, beta, gamma, etc.)","lowerRoman":"Nombres romains minuscules (i, ii, iii, iv, v, etc.)","none":"Aucun","notset":"<Non défini>","numberedTitle":"Propriétés de la liste numérotée","square":"Carré","start":"Début","type":"Type","upperAlpha":"Alphabétique majuscules (A, B, C, D, E, etc.)","upperRoman":"Nombres romains majuscules (I, II, III, IV, V, etc.)","validateStartNumber":"Le premier élément de la liste doit être un nombre entier."},"magicline":{"title":"Insérez un paragraphe ici"},"maximize":{"maximize":"Agrandir","minimize":"Minimiser"},"newpage":{"toolbar":"Nouvelle page"},"pagebreak":{"alt":"Saut de page","toolbar":"Saut de page"},"pastetext":{"button":"Coller comme texte sans mise en forme","title":"Coller comme texte sans mise en forme"},"pastefromword":{"confirmCleanup":"Le texte à coller semble provenir de Word. Désirez-vous le nettoyer avant de coller?","error":"Il n'a pas été possible de nettoyer les données collées à la suite d'une erreur interne.","title":"Coller depuis Word","toolbar":"Coller depuis Word"},"preview":{"preview":"Aperçu"},"print":{"toolbar":"Imprimer"},"removeformat":{"toolbar":"Supprimer la mise en forme"},"save":{"toolbar":"Enregistrer"},"selectall":{"toolbar":"Tout sélectionner"},"showblocks":{"toolbar":"Afficher les blocs"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Options des caractères spéciaux","title":"Sélectionnez un caractère","toolbar":"Insérer un caractère spécial"},"scayt":{"btn_about":"A propos de SCAYT","btn_dictionaries":"Dictionnaires","btn_disable":"Désactiver SCAYT","btn_enable":"Activer SCAYT","btn_langs":"Langues","btn_options":"Options","text_title":"Vérification de l'Orthographe en Cours de Frappe (SCAYT)"},"stylescombo":{"label":"Styles","panelTitle":"Styles de mise en page","panelTitle1":"Styles de blocs","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"table":{"border":"Taille de la bordure","caption":"Titre du tableau","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer les cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner à droite","mergeDown":"Fusionner en bas","splitHorizontal":"Fractionner horizontalement","splitVertical":"Fractionner verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Fusion de lignes","colSpan":"Fusion de colonnes","wordWrap":"Césure","hAlign":"Alignement Horizontal","vAlign":"Alignement Vertical","alignBaseline":"Bas du texte","bgColor":"Couleur d'arrière-plan","borderColor":"Couleur de Bordure","data":"Données","header":"Entête","yes":"Oui","no":"Non","invalidWidth":"La Largeur de Cellule doit être un nombre.","invalidHeight":"La Hauteur de Cellule doit être un nombre.","invalidRowSpan":"La fusion de lignes doit être un nombre entier.","invalidColSpan":"La fusion de colonnes doit être un nombre entier.","chooseColor":"Choisissez"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement des cellules","column":{"menu":"Colonnes","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer les colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-Têtes","headersBoth":"Les deux","headersColumn":"Première colonne","headersNone":"Aucunes","headersRow":"Première ligne","invalidBorder":"La taille de la bordure doit être un nombre.","invalidCellPadding":"La marge intérieure des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement des cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer les lignes"},"rows":"Lignes","summary":"Résumé (description)","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"% pourcents","widthPx":"pixels","widthUnit":"unité de largeur"},"undo":{"redo":"Rétablir","undo":"Annuler"},"wsc":{"btnIgnore":"Ignorer","btnIgnoreAll":"Ignorer tout","btnReplace":"Remplacer","btnReplaceAll":"Remplacer tout","btnUndo":"Annuler","changeTo":"Modifier pour","errorLoading":"Erreur du chargement du service depuis l'hôte : %s.","ieSpellDownload":"La vérification d'orthographe n'est pas installée. Voulez-vous la télécharger maintenant?","manyChanges":"Vérification de l'orthographe terminée : %1 mots corrigés.","noChanges":"Vérification de l'orthographe terminée : Aucun mot corrigé.","noMispell":"Vérification de l'orthographe terminée : aucune erreur trouvée.","noSuggestions":"- Aucune suggestion -","notAvailable":"Désolé, le service est indisponible actuellement.","notInDic":"N'existe pas dans le dictionnaire.","oneChange":"Vérification de l'orthographe terminée : Un seul mot corrigé.","progress":"Vérification de l'orthographe en cours...","title":"Vérifier l'orthographe","toolbar":"Vérifier l'orthographe"}};
\ No newline at end of file
+CKEDITOR.lang['fr']={"editor":"Éditeur de texte enrichi","editorPanel":"Tableau de bord de l'éditeur de texte enrichi","common":{"editorHelp":"Utilisez le raccourci Alt-0 pour obtenir de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Téléverser","uploadSubmit":"Envoyer sur le serveur","image":"Image","flash":"Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ invisible","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton avec image","notSet":"<indéfini>","id":"ID","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"Gauche à droite (LTR)","langDirRtl":"Droite à gauche (RTL)","langCode":"Code de langue","longDescr":"URL de description longue","cssClass":"Classes de style","advisoryTitle":"Infobulle","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous sûr de vouloir charger une nouvelle page ?","confirmCancel":"Certaines options ont été modifiées. Êtes-vous sûr de vouloir fermer ?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieure (_top)","targetSelf":"Même fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"Gauche à droite (LTR)","langDirRTL":"Droite à gauche (RTL)","styles":"Style","cssClasses":"Classes de style","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centrer","alignJustify":"Justifier","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"Aucun","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ « %1 » doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ « %1 » doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style en ligne doit être composée d'un ou plusieurs couples au format « nom : valeur », séparés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour une valeur en pixels ou un nombre avec une unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>","keyboard":{"8":"Backspace","13":"Entrée","16":"Majuscule","17":"Ctrl","18":"Alt","32":"Space","35":"Fin","36":"Origine","46":"Supprimer","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour obtenir de l'aide.","moreInfo":"Pour les informations de licence, veuillez visiter notre site web :","title":"À propos de CKEditor","userGuide":"Guide de l'utilisateur CKEditor (en anglais)"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"bidi":{"ltr":"Direction du texte de la gauche vers la droite","rtl":"Direction du texte de la droite vers la gauche"},"blockquote":{"toolbar":"Citation"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur n'autorisent pas l'éditeur à exécuter automatiquement l'opération « Copier ». Veuillez utiliser le raccourci clavier à cet effet (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur n'autorisent pas l'éditeur à exécuter automatiquement l'opération « Couper ». Veuillez utiliser le raccourci clavier à cet effet (Ctrl/Cmd+X).","paste":"Coller","pasteArea":"Coller la zone","pasteMsg":"Veuillez coller le texte dans la zone suivante en utilisant le raccourci clavier (<strong>Ctrl/Cmd+V</strong>) et cliquez sur OK.","securityMsg":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur d'accéder directement aux données du presse-papier. Vous devez les coller à nouveau dans cette fenêtre.","title":"Coller"},"button":{"selectedLabel":"%1 (Sélectionné)"},"colorbutton":{"auto":"Automatique","bgColorTitle":"Couleur d'arrière-plan","colors":{"000":"Noir","800000":"Marron","8B4513":"Brun de selle","2F4F4F":"Gris sombre d'ardoise","008080":"Canard","000080":"Bleu marine","4B0082":"Indigo","696969":"Gris foncé","B22222":"Rouge brique","A52A2A":"Brun","DAA520":"Or terni","006400":"Vert foncé","40E0D0":"Turquoise","0000CD":"Bleu royal","800080":"Violet","808080":"Gris","F00":"Rouge","FF8C00":"Orange foncé","FFD700":"Or","008000":"Vert","0FF":"Cyan","00F":"Bleu","EE82EE":"Violet","A9A9A9":"Gris tamisé","FFA07A":"Saumon clair","FFA500":"Orange","FFFF00":"Jaune","00FF00":"Lime","AFEEEE":"Turquoise clair","ADD8E6":"Bleu clair","DDA0DD":"Prune","D3D3D3":"Gris clair","FFF0F5":"Fard lavande","FAEBD7":"Blanc antique","FFFFE0":"Jaune clair","F0FFF0":"Vert rosée","F0FFFF":"Azur","F0F8FF":"Bleu Alice","E6E6FA":"Lavande","FFF":"Blanc","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Plus de couleurs...","panelTitle":"Couleurs","textColorTitle":"Couleur du texte"},"colordialog":{"clear":"Effacer","highlight":"Pointée","options":"Options de couleur","selected":"Couleur choisie","title":"Sélectionner une couleur"},"templates":{"button":"Modèles","emptyListMsg":"(Aucun modèle disponible)","insertOption":"Remplacer le contenu actuel","options":"Options des modèles","selectPromptMsg":"Veuillez sélectionner le modèle à ouvrir dans l'éditeur","title":"Contenu des modèles"},"contextmenu":{"options":"Options du menu contextuel"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Infobulle","cssClassInputLabel":"Classes de style","edit":"Modifier la division","inlineStyleInputLabel":"Style en ligne","langDirLTRLabel":"Gauche à droite (LTR)","langDirLabel":"Sens d'écriture","langDirRTLLabel":"Droite à gauche (RTL)","languageCodeInputLabel":"Code de langue","remove":"Enlever la division","styleSelectLabel":"Style","title":"Créer une division","toolbar":"Créer une division"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse-papier/Défaire","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barres d'outils de l'éditeur"},"elementspath":{"eleLabel":"Chemin des éléments","eleTitle":"Élément %1"},"find":{"find":"Rechercher","findOptions":"Options de recherche","findWhat":"Rechercher :","matchCase":"Respecter la casse","matchCyclic":"Boucler","matchWord":"Mot entier uniquement","notFoundMsg":"Le texte spécifié ne peut être trouvé.","replace":"Remplacer","replaceAll":"Remplacer tout","replaceSuccessMsg":"%1 occurrence(s) remplacée(s).","replaceWith":"Remplacer par : ","title":"Rechercher et remplacer"},"fakeobjects":{"anchor":"Ancre","flash":"Animation Flash","hiddenfield":"Champ invisible","iframe":"Cadre de contenu incorporé","unknown":"Objet inconnu"},"flash":{"access":"Accès aux scripts","accessAlways":"Toujours","accessNever":"Jamais","accessSameDomain":"Même domaine","alignAbsBottom":"Bas absolu","alignAbsMiddle":"Milieu absolu","alignBaseline":"Ligne de base","alignTextTop":"Haut du texte","bgcolor":"Couleur d'arrière-plan","chkFull":"Permettre le plein écran","chkLoop":"Boucle","chkMenu":"Activer le menu Flash","chkPlay":"Lire automatiquement","flashvars":"Variables Flash","hSpace":"Espacement horizontal","properties":"Propriétés du Flash","propertiesTab":"Propriétés","quality":"Qualité","qualityAutoHigh":"Haute automatique","qualityAutoLow":"Basse automatique","qualityBest":"Maximale","qualityHigh":"Haute","qualityLow":"Basse","qualityMedium":"Moyenne","scale":"Échelle","scaleAll":"Afficher tout","scaleFit":"Adaptation automatique","scaleNoBorder":"Aucune bordure","title":"Propriétés du Flash","vSpace":"Espacement vertical","validateHSpace":"L'espacement horizontal doit être un nombre.","validateSrc":"L'URL doit être indiquée.","validateVSpace":"L'espacement vertical doit être un nombre.","windowMode":"Mode fenêtre","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Fenêtre"},"font":{"fontSize":{"label":"Taille","voiceLabel":"Taille de police","panelTitle":"Taille de police"},"label":"Police","panelTitle":"Style de police","voiceLabel":"Police"},"forms":{"button":{"title":"Propriétés du bouton","text":"Texte","type":"Type","typeBtn":"Bouton","typeSbm":"Validation","typeRst":"Remise à zéro"},"checkboxAndRadio":{"checkboxTitle":"Propriétés de la case à cocher","radioTitle":"Propriétés du bouton radio","value":"Valeur","selected":"Sélectionné","required":"Requis"},"form":{"title":"Propriétés du formulaire","menu":"Propriétés du formulaire","action":"Action","method":"Méthode","encoding":"Encodage"},"hidden":{"title":"Propriétés du champ invisible","name":"Nom","value":"Valeur"},"select":{"title":"Propriétés du menu déroulant","selectInfo":"Informations sur le menu déroulant","opAvail":"Options disponibles","value":"Valeur","size":"Taille","lines":"lignes","chkMulti":"Permettre les sélections multiples","required":"Requis","opText":"Texte","opValue":"Valeur","btnAdd":"Ajouter","btnModify":"Modifier","btnUp":"Haut","btnDown":"Bas","btnSetValue":"Définir comme valeur sélectionnée","btnDelete":"Supprimer"},"textarea":{"title":"Propriétés de la zone de texte","cols":"Colonnes","rows":"Lignes"},"textfield":{"title":"Propriétés du champ texte","name":"Nom","value":"Valeur","charWidth":"Largeur des caractères","maxChars":"Nombre maximum de caractères","required":"Requis","type":"Type","typeText":"Texte","typePass":"Mot de passe","typeEmail":"Courriel","typeSearch":"Rechercher","typeTel":"Numéro de téléphone","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Division","tag_h1":"Titre 1","tag_h2":"Titre 2","tag_h3":"Titre 3","tag_h4":"Titre 4","tag_h5":"Titre 5","tag_h6":"Titre 6","tag_p":"Normal","tag_pre":"Préformaté"},"horizontalrule":{"toolbar":"Ligne horizontale"},"iframe":{"border":"Afficher la bordure du cadre","noUrl":"Veuillez entrer l'URL du contenu du cadre","scrolling":"Activer les barres de défilement","title":"Propriétés du cadre de contenu incorporé","toolbar":"Cadre de contenu incorporé"},"image":{"alt":"Texte alternatif","border":"Bordure","btnUpload":"Envoyer sur le serveur","button2Img":"Voulez-vous transformer le bouton avec image sélectionné en simple image ?","hSpace":"Espacement horizontal","img2Button":"Voulez-vous transformer l'image sélectionnée en bouton avec image ?","infoTab":"Informations sur l'image","linkTab":"Lien","lockRatio":"Conserver les proportions","menu":"Propriétés de l'image","resetSize":"Réinitialiser la taille","title":"Propriétés de l'image","titleButton":"Propriétés du bouton avec image","upload":"Téléverser","urlMissing":"L'URL source de l'image est manquante.","vSpace":"Espacement vertical","validateBorder":"La bordure doit être un nombre entier.","validateHSpace":"L'espacement horizontal doit être un nombre entier.","validateVSpace":"L'espacement vertical doit être un nombre entier."},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"smiley":{"options":"Options des frimousses","title":"Insérer une frimousse","toolbar":"Frimousse"},"justify":{"block":"Justifier","center":"Centrer","left":"Aligner à gauche","right":"Aligner à droite"},"language":{"button":"Définir la langue","remove":"Supprimer la langue"},"link":{"acccessKey":"Touche d'accessibilité","advanced":"Avancé","advisoryContentType":"Type de contenu (indicatif)","advisoryTitle":"Infobulle","anchor":{"toolbar":"Ancre","menu":"Modifier l'ancre","title":"Propriétés de l'ancre","name":"Nom de l'ancre","errorName":"Veuillez entrer le nom de l'ancre.","remove":"Supprimer l'ancre"},"anchorId":"Par ID d'élément","anchorName":"Par nom d'ancre","charset":"Encodage de la ressource liée","cssClasses":"Classes de style","download":"Force Download","displayText":"Display Text","emailAddress":"Adresse électronique","emailBody":"Corps du message","emailSubject":"Sujet du message","id":"ID","info":"Informations sur le lien","langCode":"Code de langue","langDir":"Sens d'écriture","langDirLTR":"Gauche à droite","langDirRTL":"Droite à gauche (RTL)","menu":"Modifier le lien","name":"Nom","noAnchors":"(Aucune ancre disponible dans ce document)","noEmail":"Veuillez entrer l'adresse électronique","noUrl":"Veuillez entrer l'URL du lien","other":"<autre>","popupDependent":"Dépendante (Netscape)","popupFeatures":"Caractéristiques de la fenêtre surgissante","popupFullScreen":"Plein écran (IE)","popupLeft":"À gauche","popupLocationBar":"Barre d'adresse","popupMenuBar":"Barre de menu","popupResizable":"Redimensionnable","popupScrollBars":"Barres de défilement","popupStatusBar":"Barre d'état","popupToolbar":"Barre d'outils","popupTop":"En haut","rel":"Relation","selectAnchor":"Sélectionner une ancre","styles":"Style","tabIndex":"Indice de tabulation","target":"Cible","targetFrame":"<cadre>","targetFrameName":"Nom du cadre affecté","targetPopup":"<fenêtre surgissante>","targetPopupName":"Nom de la fenêtre surgissante","title":"Lien","toAnchor":"Ancre","toEmail":"Courriel","toUrl":"URL","toolbar":"Lien","type":"Type de lien","unlink":"Supprimer le lien","upload":"Téléverser"},"list":{"bulletedlist":"Insérer/Supprimer une liste à puces","numberedlist":"Insérer/Supprimer une liste numérotée"},"liststyle":{"armenian":"Numération arménienne","bulletedTitle":"Propriétés de la liste à puces","circle":"Cercle","decimal":"Décimal (1, 2, 3, etc.)","decimalLeadingZero":"Décimal précédé par un 0 (01, 02, 03, etc.)","disc":"Disque","georgian":"Numération géorgienne (an, ban, gan, etc.)","lowerAlpha":"Lettres minuscules (a, b, c, d, e, etc.)","lowerGreek":"Grec minuscule (alpha, bêta, gamma, etc.)","lowerRoman":"Chiffres romains minuscules (i, ii, iii, iv, v, etc.)","none":"Aucun","notset":"<indéfini>","numberedTitle":"Propriétés de la liste numérotée","square":"Carré","start":"Début","type":"Type","upperAlpha":"Lettres majuscules (A, B, C, D, E, etc.)","upperRoman":"Chiffres romains majuscules (I, II, III, IV, V, etc.)","validateStartNumber":"Le premier élément de la liste doit être un nombre entier."},"magicline":{"title":"Insérer un paragraphe ici"},"maximize":{"maximize":"Agrandir","minimize":"Réduire"},"newpage":{"toolbar":"Nouvelle page"},"pagebreak":{"alt":"Saut de page","toolbar":"Insérer un saut de page pour l'impression"},"pastetext":{"button":"Coller comme texte brut","title":"Coller comme texte brut"},"pastefromword":{"confirmCleanup":"Le texte à coller semble provenir de Word. Désirez-vous le nettoyer avant de coller ?","error":"Les données collées n'ont pas pu être nettoyées à cause d'une erreur interne","title":"Coller depuis Word","toolbar":"Coller depuis Word"},"preview":{"preview":"Aperçu"},"print":{"toolbar":"Imprimer"},"removeformat":{"toolbar":"Supprimer la mise en forme"},"save":{"toolbar":"Enregistrer"},"selectall":{"toolbar":"Tout sélectionner"},"showblocks":{"toolbar":"Afficher les blocs"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Options des caractères spéciaux","title":"Sélectionner un caractère","toolbar":"Insérer un caractère spécial"},"scayt":{"btn_about":"A propos de SCAYT","btn_dictionaries":"Dictionnaires","btn_disable":"Désactiver SCAYT","btn_enable":"Activer SCAYT","btn_langs":"Langues","btn_options":"Options","text_title":"Vérification de l'Orthographe en Cours de Frappe (SCAYT)"},"stylescombo":{"label":"Styles","panelTitle":"Styles de mise en forme","panelTitle1":"Styles de bloc","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"table":{"border":"Taille de la bordure","caption":"Titre du tableau","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer les cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner vers la droite","mergeDown":"Fusionner vers le bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Lignes occupées","colSpan":"Colonnes occupées","wordWrap":"Césure","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Ligne de base","bgColor":"Couleur d'arrière-plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de la cellule doit être un nombre.","invalidHeight":"La hauteur de la cellule doit être un nombre.","invalidRowSpan":"Le nombre de colonnes occupées doit être un nombre entier.","invalidColSpan":"Le nombre de colonnes occupées doit être un nombre entier.","chooseColor":"Choisir"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement entre les cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer les colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","invalidBorder":"La taille de la bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement entre les cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer les lignes"},"rows":"Lignes","summary":"Résumé (description)","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pour cent","widthPx":"pixels","widthUnit":"unité de largeur"},"undo":{"redo":"Rétablir","undo":"Annuler"},"wsc":{"btnIgnore":"Ignorer","btnIgnoreAll":"Ignorer tout","btnReplace":"Remplacer","btnReplaceAll":"Remplacer tout","btnUndo":"Annuler","changeTo":"Modifier pour","errorLoading":"Erreur du chargement du service depuis l'hôte : %s.","ieSpellDownload":"La vérification d'orthographe n'est pas installée. Voulez-vous la télécharger maintenant?","manyChanges":"Vérification de l'orthographe terminée : %1 mots corrigés.","noChanges":"Vérification de l'orthographe terminée : Aucun mot corrigé.","noMispell":"Vérification de l'orthographe terminée : aucune erreur trouvée.","noSuggestions":"- Aucune suggestion -","notAvailable":"Désolé, le service est indisponible actuellement.","notInDic":"N'existe pas dans le dictionnaire.","oneChange":"Vérification de l'orthographe terminée : Un seul mot corrigé.","progress":"Vérification de l'orthographe en cours...","title":"Vérifier l'orthographe","toolbar":"Vérifier l'orthographe"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/lang/gl.js
index 6c2f420c33f..9a753b35408 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/gl.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/gl.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['gl']={"editor":"Editor de texto mellorado","editorPanel":"Panel do editor de texto mellorado","common":{"editorHelp":"Prema ALT 0 para obter axuda","browseServer":"Examinar o servidor","url":"URL","protocol":"Protocolo","upload":"Enviar","uploadSubmit":"Enviar ao servidor","image":"Imaxe","flash":"Flash","form":"Formulario","checkbox":"Caixa de selección","radio":"Botón de opción","textField":"Campo de texto","textarea":"Área de texto","hiddenField":"Campo agochado","button":"Botón","select":"Campo de selección","imageButton":"Botón de imaxe","notSet":"<sen estabelecer>","id":"ID","name":"Nome","langDir":"Dirección de escritura do idioma","langDirLtr":"Esquerda a dereita (LTR)","langDirRtl":"Dereita a esquerda (RTL)","langCode":"Código do idioma","longDescr":"Descrición completa do URL","cssClass":"Clases da folla de estilos","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Pechar","preview":"Vista previa","resize":"Redimensionar","generalTab":"Xeral","advancedTab":"Avanzado","validateNumberFailed":"Este valor non é un número.","confirmNewPage":"Calquera cambio que non gardara neste contido perderase.\r\nConfirma que quere cargar unha páxina nova?","confirmCancel":"Algunhas das opcións foron cambiadas.\r\nConfirma que quere pechar o diálogo?","options":"Opcións","target":"Destino","targetNew":"Nova xanela (_blank)","targetTop":"Xanela principal (_top)","targetSelf":"Mesma xanela (_self)","targetParent":"Xanela superior (_parent)","langDirLTR":"Esquerda a dereita (LTR)","langDirRTL":"Dereita a esquerda (RTL)","styles":"Estilo","cssClasses":"Clases da folla de estilos","width":"Largo","height":"Alto","align":"Aliñamento","alignLeft":"Esquerda","alignRight":"Dereita","alignCenter":"Centro","alignJustify":"Xustificado","alignTop":"Arriba","alignMiddle":"Centro","alignBottom":"Abaixo","alignNone":"Ningún","invalidValue":"Valor incorrecto.","invalidHeight":"O alto debe ser un número.","invalidWidth":"O largo debe ser un número.","invalidCssLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida HTML correcta (px ou %).","invalidInlineStyle":"O valor especificado no estilo en liña debe consistir nunha ou máis tuplas co formato «nome : valor», separadas por punto e coma.","cssLengthTooltip":"Escriba un número para o valor en píxeles ou un número cunha unidade CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, non dispoñíbel</span>"},"about":{"copy":"Copyright &copy; $1. Todos os dereitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Consulte $1 para obter axuda.","moreInfo":"Para obter  información sobre a licenza, visite o noso sitio web:","title":"Sobre o CKEditor","userGuide":"Guía do usuario do CKEditor"},"basicstyles":{"bold":"Negra","italic":"Cursiva","strike":"Riscado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subliñado"},"bidi":{"ltr":"Dirección do texto de esquerda a dereita","rtl":"Dirección do texto de dereita a esquerda"},"blockquote":{"toolbar":"Cita"},"clipboard":{"copy":"Copiar","copyError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de copia. Use o teclado para iso (Ctrl/Cmd+C).","cut":"Cortar","cutError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de corte. Use o teclado para iso (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Zona de pegado","pasteMsg":"Pegue dentro do seguinte cadro usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e prema en Aceptar","securityMsg":"Por mor da configuración de seguranza do seu navegador, o editor non ten acceso ao portapapeis. É necesario pegalo novamente nesta xanela.","title":"Pegar"},"button":{"selectedLabel":"%1 (seleccionado)"},"colorbutton":{"auto":"Automático","bgColorTitle":"Cor do fondo","colors":{"000":"Negro","800000":"Marrón escuro","8B4513":"Ocre","2F4F4F":"Pizarra escuro","008080":"Verde azulado","000080":"Azul mariño","4B0082":"Índigo","696969":"Gris escuro","B22222":"Ladrillo","A52A2A":"Marrón","DAA520":"Dourado escuro","006400":"Verde escuro","40E0D0":"Turquesa","0000CD":"Azul medio","800080":"Púrpura","808080":"Gris","F00":"Vermello","FF8C00":"Laranxa escuro","FFD700":"Dourado","008000":"Verde","0FF":"Cian","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Gris medio","FFA07A":"Salmón claro","FFA500":"Laranxa","FFFF00":"Amarelo","00FF00":"Lima","AFEEEE":"Turquesa pálido","ADD8E6":"Azul claro","DDA0DD":"Violeta pálido","D3D3D3":"Verde claro","FFF0F5":"Lavanda vermello","FAEBD7":"Branco antigo","FFFFE0":"Amarelo claro","F0FFF0":"Mel","F0FFFF":"Azul celeste","F0F8FF":"Azul pálido","E6E6FA":"Lavanda","FFF":"Branco"},"more":"Máis cores...","panelTitle":"Cores","textColorTitle":"Cor do texto"},"colordialog":{"clear":"Limpar","highlight":"Resaltar","options":"Opcións de cor","selected":"Cor seleccionado","title":"Seleccione unha cor"},"templates":{"button":"Modelos","emptyListMsg":"(Non hai modelos definidos)","insertOption":"Substituír o contido actual","options":"Opcións de modelos","selectPromptMsg":"Seleccione o modelo a abrir no editor","title":"Modelos de contido"},"contextmenu":{"options":"Opcións do menú contextual"},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Título informativo","cssClassInputLabel":"Clases da folla de estilos","edit":"Editar Div","inlineStyleInputLabel":"Estilo de liña","langDirLTRLabel":"Esquerda a dereita (LTR)","langDirLabel":"Dirección de escritura do idioma","langDirRTLLabel":"Dereita a esquerda (RTL)","languageCodeInputLabel":"Código do idioma","remove":"Retirar Div","styleSelectLabel":"Estilo","title":"Crear un contedor Div","toolbar":"Crear un contedor Div"},"toolbar":{"toolbarCollapse":"Contraer a barra de ferramentas","toolbarExpand":"Expandir a barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeis/desfacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Paragrafo","links":"Ligazóns","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barras de ferramentas do editor"},"elementspath":{"eleLabel":"Ruta dos elementos","eleTitle":"Elemento %1"},"find":{"find":"Buscar","findOptions":"Buscar opcións","findWhat":"Texto a buscar:","matchCase":"Coincidir Mai./min.","matchCyclic":"Coincidencia cíclica","matchWord":"Coincidencia coa palabra completa","notFoundMsg":"Non se atopou o texto indicado.","replace":"Substituir","replaceAll":"Substituír todo","replaceSuccessMsg":"%1 concorrencia(s) substituída(s).","replaceWith":"Substituír con:","title":"Buscar e substituír"},"fakeobjects":{"anchor":"Ancoraxe","flash":"Animación «Flash»","hiddenfield":"Campo agochado","iframe":"IFrame","unknown":"Obxecto descoñecido"},"flash":{"access":"Acceso de scripts","accessAlways":"Sempre","accessNever":"Nunca","accessSameDomain":"Mesmo dominio","alignAbsBottom":"Abs Inferior","alignAbsMiddle":"Abs centro","alignBaseline":"Liña de base","alignTextTop":"Tope do texto","bgcolor":"Cor do fondo","chkFull":"Permitir pantalla completa","chkLoop":"Repetir","chkMenu":"Activar o menú do «Flash»","chkPlay":"Reprodución auomática","flashvars":"Opcións do «Flash»","hSpace":"Esp. Horiz.","properties":"Propiedades do «Flash»","propertiesTab":"Propiedades","quality":"Calidade","qualityAutoHigh":"Alta, automática","qualityAutoLow":"Baixa, automática","qualityBest":"A mellor","qualityHigh":"Alta","qualityLow":"Baixa","qualityMedium":"Media","scale":"Escalar","scaleAll":"Amosar todo","scaleFit":"Encaixar axustando","scaleNoBorder":"Sen bordo","title":"Propiedades do «Flash»","vSpace":"Esp.Vert.","validateHSpace":"O espazado horizontal debe ser un número.","validateSrc":"O URL non pode estar baleiro.","validateVSpace":"O espazado vertical debe ser un número.","windowMode":"Modo da xanela","windowModeOpaque":"Opaca","windowModeTransparent":"Transparente","windowModeWindow":"Xanela"},"font":{"fontSize":{"label":"Tamaño","voiceLabel":"Tamaño da letra","panelTitle":"Tamaño da letra"},"label":"Tipo de letra","panelTitle":"Nome do tipo de letra","voiceLabel":"Tipo de letra"},"forms":{"button":{"title":"Propiedades do botón","text":"Texto (Valor)","type":"Tipo","typeBtn":"Botón","typeSbm":"Enviar","typeRst":"Restabelever"},"checkboxAndRadio":{"checkboxTitle":"Propiedades da caixa de selección","radioTitle":"Propiedades do botón de opción","value":"Valor","selected":"Seleccionado","required":"Requirido"},"form":{"title":"Propiedades do formulario","menu":"Propiedades do formulario","action":"Acción","method":"Método","encoding":"Codificación"},"hidden":{"title":"Propiedades do campo agochado","name":"Nome","value":"Valor"},"select":{"title":"Propiedades do campo de selección","selectInfo":"Información","opAvail":"Opcións dispoñíbeis","value":"Valor","size":"Tamaño","lines":"liñas","chkMulti":"Permitir múltiplas seleccións","required":"Requirido","opText":"Texto","opValue":"Valor","btnAdd":"Engadir","btnModify":"Modificar","btnUp":"Subir","btnDown":"Baixar","btnSetValue":"Estabelecer como valor seleccionado","btnDelete":"Eliminar"},"textarea":{"title":"Propiedades da área de texto","cols":"Columnas","rows":"Filas"},"textfield":{"title":"Propiedades do campo de texto","name":"Nome","value":"Valor","charWidth":"Largo do carácter","maxChars":"Núm. máximo de caracteres","required":"Requirido","type":"Tipo","typeText":"Texto","typePass":"Contrasinal","typeEmail":"Correo","typeSearch":"Buscar","typeTel":"Número de teléfono","typeUrl":"URL"}},"format":{"label":"Formato","panelTitle":"Formato do parágrafo","tag_address":"Enderezo","tag_div":"Normal  (DIV)","tag_h1":"Enacabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Formatado"},"horizontalrule":{"toolbar":"Inserir unha liña horizontal"},"iframe":{"border":"Amosar o bordo do marco","noUrl":"Escriba o enderezo do iframe","scrolling":"Activar as barras de desprazamento","title":"Propiedades do iFrame","toolbar":"IFrame"},"image":{"alt":"Texto alternativo","border":"Bordo","btnUpload":"Enviar ao servidor","button2Img":"Quere converter o botón da imaxe seleccionada nunha imaxe sinxela?","hSpace":"Esp.Horiz.","img2Button":"Quere converter a imaxe seleccionada nun botón de imaxe?","infoTab":"Información da imaxe","linkTab":"Ligazón","lockRatio":"Proporcional","menu":"Propiedades da imaxe","resetSize":"Tamaño orixinal","title":"Propiedades da imaxe","titleButton":"Propiedades do botón de imaxe","upload":"Cargar","urlMissing":"Non se atopa o URL da imaxe.","vSpace":"Esp.Vert.","validateBorder":"O bordo debe ser un número.","validateHSpace":"O espazado horizontal debe ser un número.","validateVSpace":"O espazado vertical debe ser un número."},"indent":{"indent":"Aumentar a sangría","outdent":"Reducir a sangría"},"smiley":{"options":"Opcións de emoticonas","title":"Inserir unha emoticona","toolbar":"Emoticona"},"justify":{"block":"Xustificado","center":"Centrado","left":"Aliñar á esquerda","right":"Aliñar á dereita"},"language":{"button":"Estabelezer o idioma","remove":"Retirar o idioma"},"link":{"acccessKey":"Chave de acceso","advanced":"Avanzado","advisoryContentType":"Tipo de contido informativo","advisoryTitle":"Título","anchor":{"toolbar":"Ancoraxe","menu":"Editar a ancoraxe","title":"Propiedades da ancoraxe","name":"Nome da ancoraxe","errorName":"Escriba o nome da ancoraxe","remove":"Retirar a ancoraxe"},"anchorId":"Polo ID do elemento","anchorName":"Polo nome da ancoraxe","charset":"Codificación do recurso ligado","cssClasses":"Clases da folla de estilos","emailAddress":"Enderezo de correo","emailBody":"Corpo da mensaxe","emailSubject":"Asunto da mensaxe","id":"ID","info":"Información da ligazón","langCode":"Código do idioma","langDir":"Dirección de escritura do idioma","langDirLTR":"Esquerda a dereita (LTR)","langDirRTL":"Dereita a esquerda (RTL)","menu":"Editar a ligazón","name":"Nome","noAnchors":"(Non hai ancoraxes dispoñíbeis no documento)","noEmail":"Escriba o enderezo de correo","noUrl":"Escriba a ligazón URL","other":"<outro>","popupDependent":"Dependente (Netscape)","popupFeatures":"Características da xanela emerxente","popupFullScreen":"Pantalla completa (IE)","popupLeft":"Posición esquerda","popupLocationBar":"Barra de localización","popupMenuBar":"Barra do menú","popupResizable":"Redimensionábel","popupScrollBars":"Barras de desprazamento","popupStatusBar":"Barra de estado","popupToolbar":"Barra de ferramentas","popupTop":"Posición superior","rel":"Relación","selectAnchor":"Seleccionar unha ancoraxe","styles":"Estilo","tabIndex":"Índice de tabulación","target":"Destino","targetFrame":"<marco>","targetFrameName":"Nome do marco de destino","targetPopup":"<xanela emerxente>","targetPopupName":"Nome da xanela emerxente","title":"Ligazón","toAnchor":"Ligar coa ancoraxe no testo","toEmail":"Correo","toUrl":"URL","toolbar":"Ligazón","type":"Tipo de ligazón","unlink":"Eliminar a ligazón","upload":"Enviar"},"list":{"bulletedlist":"Inserir/retirar lista viñeteada","numberedlist":"Inserir/retirar lista numerada"},"liststyle":{"armenian":"Numeración armenia","bulletedTitle":"Propiedades da lista viñeteada","circle":"Circulo","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal con cero á esquerda (01, 02, 03, etc.)","disc":"Disc","georgian":"Numeración xeorxiana (an, ban, gan, etc.)","lowerAlpha":"Alfabeto en minúsculas (a, b, c, d, e, etc.)","lowerGreek":"Grego en minúsculas (alpha, beta, gamma, etc.)","lowerRoman":"Números romanos en minúsculas (i, ii, iii, iv, v, etc.)","none":"Ningún","notset":"<sen estabelecer>","numberedTitle":"Propiedades da lista numerada","square":"Cadrado","start":"Inicio","type":"Tipo","upperAlpha":"Alfabeto en maiúsculas (A, B, C, D, E, etc.)","upperRoman":"Números romanos en maiúsculas (I, II, III, IV, V, etc.)","validateStartNumber":"O número de inicio da lista debe ser un número enteiro."},"magicline":{"title":"Inserir aquí o parágrafo"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"newpage":{"toolbar":"Páxina nova"},"pagebreak":{"alt":"Quebra de páxina","toolbar":"Inserir quebra de páxina"},"pastetext":{"button":"Pegar como texto simple","title":"Pegar como texto simple"},"pastefromword":{"confirmCleanup":"O texto que quere pegar semella ser copiado desde o Word. Quere depuralo antes de pegalo?","error":"Non foi posíbel depurar os datos pegados por mor dun erro interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"preview":{"preview":"Vista previa"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Retirar o formato"},"save":{"toolbar":"Gardar"},"selectall":{"toolbar":"Seleccionar todo"},"showblocks":{"toolbar":"Amosar os bloques"},"sourcearea":{"toolbar":"Orixe"},"specialchar":{"options":"Opcións de caracteres especiais","title":"Seleccione un carácter especial","toolbar":"Inserir un carácter especial"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de formatando","panelTitle1":"Estilos de bloque","panelTitle2":"Estilos de liña","panelTitle3":"Estilos de obxecto"},"table":{"border":"Tamaño do bordo","caption":"Título","cell":{"menu":"Cela","insertBefore":"Inserir a cela á esquerda","insertAfter":"Inserir a cela á dereita","deleteCell":"Eliminar celas","merge":"Combinar celas","mergeRight":"Combinar á dereita","mergeDown":"Combinar cara abaixo","splitHorizontal":"Dividir a cela en horizontal","splitVertical":"Dividir a cela en vertical","title":"Propiedades da cela","cellType":"Tipo de cela","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Axustar ao contido","hAlign":"Aliñación horizontal","vAlign":"Aliñación vertical","alignBaseline":"Liña de base","bgColor":"Cor do fondo","borderColor":"Cor do bordo","data":"Datos","header":"Cabeceira","yes":"Si","no":"Non","invalidWidth":"O largo da cela debe ser un número.","invalidHeight":"O alto da cela debe ser un número.","invalidRowSpan":"A expansión de filas debe ser un número enteiro.","invalidColSpan":"A expansión de columnas debe ser un número enteiro.","chooseColor":"Escoller"},"cellPad":"Marxe interior da cela","cellSpace":"Marxe entre celas","column":{"menu":"Columna","insertBefore":"Inserir a columna á esquerda","insertAfter":"Inserir a columna á dereita","deleteColumn":"Borrar Columnas"},"columns":"Columnas","deleteTable":"Borrar Táboa","headers":"Cabeceiras","headersBoth":"Ambas","headersColumn":"Primeira columna","headersNone":"Ningún","headersRow":"Primeira fila","invalidBorder":"O tamaño do bordo debe ser un número.","invalidCellPadding":"A marxe interior debe ser un número positivo.","invalidCellSpacing":"A marxe entre celas debe ser un número positivo.","invalidCols":"O número de columnas debe ser un número maior que 0.","invalidHeight":"O alto da táboa debe ser un número.","invalidRows":"O número de filas debe ser un número maior que 0","invalidWidth":"O largo da táboa debe ser un número.","menu":"Propiedades da táboa","row":{"menu":"Fila","insertBefore":"Inserir a fila por riba","insertAfter":"Inserir a fila por baixo","deleteRow":"Eliminar filas"},"rows":"Filas","summary":"Resumo","title":"Propiedades da táboa","toolbar":"Taboa","widthPc":"porcentaxe","widthPx":"píxeles","widthUnit":"unidade do largo"},"undo":{"redo":"Refacer","undo":"Desfacer"},"wsc":{"btnIgnore":"Ignorar","btnIgnoreAll":"Ignorar Todas","btnReplace":"Substituir","btnReplaceAll":"Substituir Todas","btnUndo":"Desfacer","changeTo":"Cambiar a","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"O corrector ortográfico non está instalado. ¿Quere descargalo agora?","manyChanges":"Corrección ortográfica rematada: %1 verbas substituidas","noChanges":"Corrección ortográfica rematada: Non se substituiu nengunha verba","noMispell":"Corrección ortográfica rematada: Non se atoparon erros","noSuggestions":"- Sen candidatos -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Non está no diccionario","oneChange":"Corrección ortográfica rematada: Unha verba substituida","progress":"Corrección ortográfica en progreso...","title":"Spell Checker","toolbar":"Corrección Ortográfica"}};
\ No newline at end of file
+CKEDITOR.lang['gl']={"editor":"Editor de texto mellorado","editorPanel":"Panel do editor de texto mellorado","common":{"editorHelp":"Prema ALT 0 para obter axuda","browseServer":"Examinar o servidor","url":"URL","protocol":"Protocolo","upload":"Enviar","uploadSubmit":"Enviar ao servidor","image":"Imaxe","flash":"Flash","form":"Formulario","checkbox":"Caixa de selección","radio":"Botón de opción","textField":"Campo de texto","textarea":"Área de texto","hiddenField":"Campo agochado","button":"Botón","select":"Campo de selección","imageButton":"Botón de imaxe","notSet":"<sen estabelecer>","id":"ID","name":"Nome","langDir":"Dirección de escritura do idioma","langDirLtr":"Esquerda a dereita (LTR)","langDirRtl":"Dereita a esquerda (RTL)","langCode":"Código do idioma","longDescr":"Descrición completa do URL","cssClass":"Clases da folla de estilos","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Pechar","preview":"Vista previa","resize":"Redimensionar","generalTab":"Xeral","advancedTab":"Avanzado","validateNumberFailed":"Este valor non é un número.","confirmNewPage":"Calquera cambio que non gardara neste contido perderase.\r\nConfirma que quere cargar unha páxina nova?","confirmCancel":"Algunhas das opcións foron cambiadas.\r\nConfirma que quere pechar o diálogo?","options":"Opcións","target":"Destino","targetNew":"Nova xanela (_blank)","targetTop":"Xanela principal (_top)","targetSelf":"Mesma xanela (_self)","targetParent":"Xanela superior (_parent)","langDirLTR":"Esquerda a dereita (LTR)","langDirRTL":"Dereita a esquerda (RTL)","styles":"Estilo","cssClasses":"Clases da folla de estilos","width":"Largo","height":"Alto","align":"Aliñamento","alignLeft":"Esquerda","alignRight":"Dereita","alignCenter":"Centro","alignJustify":"Xustificado","alignTop":"Arriba","alignMiddle":"Centro","alignBottom":"Abaixo","alignNone":"Ningún","invalidValue":"Valor incorrecto.","invalidHeight":"O alto debe ser un número.","invalidWidth":"O largo debe ser un número.","invalidCssLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida HTML correcta (px ou %).","invalidInlineStyle":"O valor especificado no estilo en liña debe consistir nunha ou máis tuplas co formato «nome : valor», separadas por punto e coma.","cssLengthTooltip":"Escriba un número para o valor en píxeles ou un número cunha unidade CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, non dispoñíbel</span>","keyboard":{"8":"Backspace","13":"Intro","16":"Maiús","17":"Ctrl","18":"Alt","32":"Space","35":"Fin","36":"Inicio","46":"Supr","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Todos os dereitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Consulte $1 para obter axuda.","moreInfo":"Para obter  información sobre a licenza, visite o noso sitio web:","title":"Sobre o CKEditor","userGuide":"Guía do usuario do CKEditor"},"basicstyles":{"bold":"Negra","italic":"Cursiva","strike":"Riscado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subliñado"},"bidi":{"ltr":"Dirección do texto de esquerda a dereita","rtl":"Dirección do texto de dereita a esquerda"},"blockquote":{"toolbar":"Cita"},"clipboard":{"copy":"Copiar","copyError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de copia. Use o teclado para iso (Ctrl/Cmd+C).","cut":"Cortar","cutError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de corte. Use o teclado para iso (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Zona de pegado","pasteMsg":"Pegue dentro do seguinte cadro usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e prema en Aceptar","securityMsg":"Por mor da configuración de seguranza do seu navegador, o editor non ten acceso ao portapapeis. É necesario pegalo novamente nesta xanela.","title":"Pegar"},"button":{"selectedLabel":"%1 (seleccionado)"},"colorbutton":{"auto":"Automático","bgColorTitle":"Cor do fondo","colors":{"000":"Negro","800000":"Marrón escuro","8B4513":"Ocre","2F4F4F":"Pizarra escuro","008080":"Verde azulado","000080":"Azul mariño","4B0082":"Índigo","696969":"Gris escuro","B22222":"Ladrillo","A52A2A":"Marrón","DAA520":"Dourado escuro","006400":"Verde escuro","40E0D0":"Turquesa","0000CD":"Azul medio","800080":"Púrpura","808080":"Gris","F00":"Vermello","FF8C00":"Laranxa escuro","FFD700":"Dourado","008000":"Verde","0FF":"Cian","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Gris medio","FFA07A":"Salmón claro","FFA500":"Laranxa","FFFF00":"Amarelo","00FF00":"Lima","AFEEEE":"Turquesa pálido","ADD8E6":"Azul claro","DDA0DD":"Violeta pálido","D3D3D3":"Verde claro","FFF0F5":"Lavanda vermello","FAEBD7":"Branco antigo","FFFFE0":"Amarelo claro","F0FFF0":"Mel","F0FFFF":"Azul celeste","F0F8FF":"Azul pálido","E6E6FA":"Lavanda","FFF":"Branco","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Máis cores...","panelTitle":"Cores","textColorTitle":"Cor do texto"},"colordialog":{"clear":"Limpar","highlight":"Resaltar","options":"Opcións de cor","selected":"Cor seleccionado","title":"Seleccione unha cor"},"templates":{"button":"Modelos","emptyListMsg":"(Non hai modelos definidos)","insertOption":"Substituír o contido actual","options":"Opcións de modelos","selectPromptMsg":"Seleccione o modelo a abrir no editor","title":"Modelos de contido"},"contextmenu":{"options":"Opcións do menú contextual"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Título informativo","cssClassInputLabel":"Clases da folla de estilos","edit":"Editar Div","inlineStyleInputLabel":"Estilo de liña","langDirLTRLabel":"Esquerda a dereita (LTR)","langDirLabel":"Dirección de escritura do idioma","langDirRTLLabel":"Dereita a esquerda (RTL)","languageCodeInputLabel":"Código do idioma","remove":"Retirar Div","styleSelectLabel":"Estilo","title":"Crear un contedor Div","toolbar":"Crear un contedor Div"},"toolbar":{"toolbarCollapse":"Contraer a barra de ferramentas","toolbarExpand":"Expandir a barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeis/desfacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Paragrafo","links":"Ligazóns","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barras de ferramentas do editor"},"elementspath":{"eleLabel":"Ruta dos elementos","eleTitle":"Elemento %1"},"find":{"find":"Buscar","findOptions":"Buscar opcións","findWhat":"Texto a buscar:","matchCase":"Coincidir Mai./min.","matchCyclic":"Coincidencia cíclica","matchWord":"Coincidencia coa palabra completa","notFoundMsg":"Non se atopou o texto indicado.","replace":"Substituir","replaceAll":"Substituír todo","replaceSuccessMsg":"%1 concorrencia(s) substituída(s).","replaceWith":"Substituír con:","title":"Buscar e substituír"},"fakeobjects":{"anchor":"Ancoraxe","flash":"Animación «Flash»","hiddenfield":"Campo agochado","iframe":"IFrame","unknown":"Obxecto descoñecido"},"flash":{"access":"Acceso de scripts","accessAlways":"Sempre","accessNever":"Nunca","accessSameDomain":"Mesmo dominio","alignAbsBottom":"Abs Inferior","alignAbsMiddle":"Abs centro","alignBaseline":"Liña de base","alignTextTop":"Tope do texto","bgcolor":"Cor do fondo","chkFull":"Permitir pantalla completa","chkLoop":"Repetir","chkMenu":"Activar o menú do «Flash»","chkPlay":"Reprodución auomática","flashvars":"Opcións do «Flash»","hSpace":"Esp. Horiz.","properties":"Propiedades do «Flash»","propertiesTab":"Propiedades","quality":"Calidade","qualityAutoHigh":"Alta, automática","qualityAutoLow":"Baixa, automática","qualityBest":"A mellor","qualityHigh":"Alta","qualityLow":"Baixa","qualityMedium":"Media","scale":"Escalar","scaleAll":"Amosar todo","scaleFit":"Encaixar axustando","scaleNoBorder":"Sen bordo","title":"Propiedades do «Flash»","vSpace":"Esp.Vert.","validateHSpace":"O espazado horizontal debe ser un número.","validateSrc":"O URL non pode estar baleiro.","validateVSpace":"O espazado vertical debe ser un número.","windowMode":"Modo da xanela","windowModeOpaque":"Opaca","windowModeTransparent":"Transparente","windowModeWindow":"Xanela"},"font":{"fontSize":{"label":"Tamaño","voiceLabel":"Tamaño da letra","panelTitle":"Tamaño da letra"},"label":"Tipo de letra","panelTitle":"Nome do tipo de letra","voiceLabel":"Tipo de letra"},"forms":{"button":{"title":"Propiedades do botón","text":"Texto (Valor)","type":"Tipo","typeBtn":"Botón","typeSbm":"Enviar","typeRst":"Restabelever"},"checkboxAndRadio":{"checkboxTitle":"Propiedades da caixa de selección","radioTitle":"Propiedades do botón de opción","value":"Valor","selected":"Seleccionado","required":"Requirido"},"form":{"title":"Propiedades do formulario","menu":"Propiedades do formulario","action":"Acción","method":"Método","encoding":"Codificación"},"hidden":{"title":"Propiedades do campo agochado","name":"Nome","value":"Valor"},"select":{"title":"Propiedades do campo de selección","selectInfo":"Información","opAvail":"Opcións dispoñíbeis","value":"Valor","size":"Tamaño","lines":"liñas","chkMulti":"Permitir múltiplas seleccións","required":"Requirido","opText":"Texto","opValue":"Valor","btnAdd":"Engadir","btnModify":"Modificar","btnUp":"Subir","btnDown":"Baixar","btnSetValue":"Estabelecer como valor seleccionado","btnDelete":"Eliminar"},"textarea":{"title":"Propiedades da área de texto","cols":"Columnas","rows":"Filas"},"textfield":{"title":"Propiedades do campo de texto","name":"Nome","value":"Valor","charWidth":"Largo do carácter","maxChars":"Núm. máximo de caracteres","required":"Requirido","type":"Tipo","typeText":"Texto","typePass":"Contrasinal","typeEmail":"Correo","typeSearch":"Buscar","typeTel":"Número de teléfono","typeUrl":"URL"}},"format":{"label":"Formato","panelTitle":"Formato do parágrafo","tag_address":"Enderezo","tag_div":"Normal  (DIV)","tag_h1":"Enacabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Formatado"},"horizontalrule":{"toolbar":"Inserir unha liña horizontal"},"iframe":{"border":"Amosar o bordo do marco","noUrl":"Escriba o enderezo do iframe","scrolling":"Activar as barras de desprazamento","title":"Propiedades do iFrame","toolbar":"IFrame"},"image":{"alt":"Texto alternativo","border":"Bordo","btnUpload":"Enviar ao servidor","button2Img":"Quere converter o botón da imaxe seleccionada nunha imaxe sinxela?","hSpace":"Esp.Horiz.","img2Button":"Quere converter a imaxe seleccionada nun botón de imaxe?","infoTab":"Información da imaxe","linkTab":"Ligazón","lockRatio":"Proporcional","menu":"Propiedades da imaxe","resetSize":"Tamaño orixinal","title":"Propiedades da imaxe","titleButton":"Propiedades do botón de imaxe","upload":"Cargar","urlMissing":"Non se atopa o URL da imaxe.","vSpace":"Esp.Vert.","validateBorder":"O bordo debe ser un número.","validateHSpace":"O espazado horizontal debe ser un número.","validateVSpace":"O espazado vertical debe ser un número."},"indent":{"indent":"Aumentar a sangría","outdent":"Reducir a sangría"},"smiley":{"options":"Opcións de emoticonas","title":"Inserir unha emoticona","toolbar":"Emoticona"},"justify":{"block":"Xustificado","center":"Centrado","left":"Aliñar á esquerda","right":"Aliñar á dereita"},"language":{"button":"Estabelezer o idioma","remove":"Retirar o idioma"},"link":{"acccessKey":"Chave de acceso","advanced":"Avanzado","advisoryContentType":"Tipo de contido informativo","advisoryTitle":"Título","anchor":{"toolbar":"Ancoraxe","menu":"Editar a ancoraxe","title":"Propiedades da ancoraxe","name":"Nome da ancoraxe","errorName":"Escriba o nome da ancoraxe","remove":"Retirar a ancoraxe"},"anchorId":"Polo ID do elemento","anchorName":"Polo nome da ancoraxe","charset":"Codificación do recurso ligado","cssClasses":"Clases da folla de estilos","download":"Force Download","displayText":"Display Text","emailAddress":"Enderezo de correo","emailBody":"Corpo da mensaxe","emailSubject":"Asunto da mensaxe","id":"ID","info":"Información da ligazón","langCode":"Código do idioma","langDir":"Dirección de escritura do idioma","langDirLTR":"Esquerda a dereita (LTR)","langDirRTL":"Dereita a esquerda (RTL)","menu":"Editar a ligazón","name":"Nome","noAnchors":"(Non hai ancoraxes dispoñíbeis no documento)","noEmail":"Escriba o enderezo de correo","noUrl":"Escriba a ligazón URL","other":"<outro>","popupDependent":"Dependente (Netscape)","popupFeatures":"Características da xanela emerxente","popupFullScreen":"Pantalla completa (IE)","popupLeft":"Posición esquerda","popupLocationBar":"Barra de localización","popupMenuBar":"Barra do menú","popupResizable":"Redimensionábel","popupScrollBars":"Barras de desprazamento","popupStatusBar":"Barra de estado","popupToolbar":"Barra de ferramentas","popupTop":"Posición superior","rel":"Relación","selectAnchor":"Seleccionar unha ancoraxe","styles":"Estilo","tabIndex":"Índice de tabulación","target":"Destino","targetFrame":"<marco>","targetFrameName":"Nome do marco de destino","targetPopup":"<xanela emerxente>","targetPopupName":"Nome da xanela emerxente","title":"Ligazón","toAnchor":"Ligar coa ancoraxe no testo","toEmail":"Correo","toUrl":"URL","toolbar":"Ligazón","type":"Tipo de ligazón","unlink":"Eliminar a ligazón","upload":"Enviar"},"list":{"bulletedlist":"Inserir/retirar lista viñeteada","numberedlist":"Inserir/retirar lista numerada"},"liststyle":{"armenian":"Numeración armenia","bulletedTitle":"Propiedades da lista viñeteada","circle":"Circulo","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal con cero á esquerda (01, 02, 03, etc.)","disc":"Disc","georgian":"Numeración xeorxiana (an, ban, gan, etc.)","lowerAlpha":"Alfabeto en minúsculas (a, b, c, d, e, etc.)","lowerGreek":"Grego en minúsculas (alpha, beta, gamma, etc.)","lowerRoman":"Números romanos en minúsculas (i, ii, iii, iv, v, etc.)","none":"Ningún","notset":"<sen estabelecer>","numberedTitle":"Propiedades da lista numerada","square":"Cadrado","start":"Inicio","type":"Tipo","upperAlpha":"Alfabeto en maiúsculas (A, B, C, D, E, etc.)","upperRoman":"Números romanos en maiúsculas (I, II, III, IV, V, etc.)","validateStartNumber":"O número de inicio da lista debe ser un número enteiro."},"magicline":{"title":"Inserir aquí o parágrafo"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"newpage":{"toolbar":"Páxina nova"},"pagebreak":{"alt":"Quebra de páxina","toolbar":"Inserir quebra de páxina"},"pastetext":{"button":"Pegar como texto simple","title":"Pegar como texto simple"},"pastefromword":{"confirmCleanup":"O texto que quere pegar semella ser copiado desde o Word. Quere depuralo antes de pegalo?","error":"Non foi posíbel depurar os datos pegados por mor dun erro interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"preview":{"preview":"Vista previa"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Retirar o formato"},"save":{"toolbar":"Gardar"},"selectall":{"toolbar":"Seleccionar todo"},"showblocks":{"toolbar":"Amosar os bloques"},"sourcearea":{"toolbar":"Orixe"},"specialchar":{"options":"Opcións de caracteres especiais","title":"Seleccione un carácter especial","toolbar":"Inserir un carácter especial"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de formatando","panelTitle1":"Estilos de bloque","panelTitle2":"Estilos de liña","panelTitle3":"Estilos de obxecto"},"table":{"border":"Tamaño do bordo","caption":"Título","cell":{"menu":"Cela","insertBefore":"Inserir a cela á esquerda","insertAfter":"Inserir a cela á dereita","deleteCell":"Eliminar celas","merge":"Combinar celas","mergeRight":"Combinar á dereita","mergeDown":"Combinar cara abaixo","splitHorizontal":"Dividir a cela en horizontal","splitVertical":"Dividir a cela en vertical","title":"Propiedades da cela","cellType":"Tipo de cela","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Axustar ao contido","hAlign":"Aliñación horizontal","vAlign":"Aliñación vertical","alignBaseline":"Liña de base","bgColor":"Cor do fondo","borderColor":"Cor do bordo","data":"Datos","header":"Cabeceira","yes":"Si","no":"Non","invalidWidth":"O largo da cela debe ser un número.","invalidHeight":"O alto da cela debe ser un número.","invalidRowSpan":"A expansión de filas debe ser un número enteiro.","invalidColSpan":"A expansión de columnas debe ser un número enteiro.","chooseColor":"Escoller"},"cellPad":"Marxe interior da cela","cellSpace":"Marxe entre celas","column":{"menu":"Columna","insertBefore":"Inserir a columna á esquerda","insertAfter":"Inserir a columna á dereita","deleteColumn":"Borrar Columnas"},"columns":"Columnas","deleteTable":"Borrar Táboa","headers":"Cabeceiras","headersBoth":"Ambas","headersColumn":"Primeira columna","headersNone":"Ningún","headersRow":"Primeira fila","invalidBorder":"O tamaño do bordo debe ser un número.","invalidCellPadding":"A marxe interior debe ser un número positivo.","invalidCellSpacing":"A marxe entre celas debe ser un número positivo.","invalidCols":"O número de columnas debe ser un número maior que 0.","invalidHeight":"O alto da táboa debe ser un número.","invalidRows":"O número de filas debe ser un número maior que 0","invalidWidth":"O largo da táboa debe ser un número.","menu":"Propiedades da táboa","row":{"menu":"Fila","insertBefore":"Inserir a fila por riba","insertAfter":"Inserir a fila por baixo","deleteRow":"Eliminar filas"},"rows":"Filas","summary":"Resumo","title":"Propiedades da táboa","toolbar":"Taboa","widthPc":"porcentaxe","widthPx":"píxeles","widthUnit":"unidade do largo"},"undo":{"redo":"Refacer","undo":"Desfacer"},"wsc":{"btnIgnore":"Ignorar","btnIgnoreAll":"Ignorar Todas","btnReplace":"Substituir","btnReplaceAll":"Substituir Todas","btnUndo":"Desfacer","changeTo":"Cambiar a","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"O corrector ortográfico non está instalado. ¿Quere descargalo agora?","manyChanges":"Corrección ortográfica rematada: %1 verbas substituidas","noChanges":"Corrección ortográfica rematada: Non se substituiu nengunha verba","noMispell":"Corrección ortográfica rematada: Non se atoparon erros","noSuggestions":"- Sen candidatos -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Non está no diccionario","oneChange":"Corrección ortográfica rematada: Unha verba substituida","progress":"Corrección ortográfica en progreso...","title":"Spell Checker","toolbar":"Corrección Ortográfica"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/lang/gu.js
index 1e97a409d58..20dea62aecb 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/gu.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/gu.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['gu']={"editor":"રીચ ટેક્ષ્ત્ એડીટર","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"પ્રેસ ALT 0 મદદ માટ","browseServer":"સર્વર બ્રાઉઝ કરો","url":"URL","protocol":"પ્રોટોકૉલ","upload":"અપલોડ","uploadSubmit":"આ સર્વરને મોકલવું","image":"ચિત્ર","flash":"ફ્લૅશ","form":"ફૉર્મ/પત્રક","checkbox":"ચેક બોક્સ","radio":"રેડિઓ બટન","textField":"ટેક્સ્ટ ફીલ્ડ, શબ્દ ક્ષેત્ર","textarea":"ટેક્સ્ટ એરિઆ, શબ્દ વિસ્તાર","hiddenField":"ગુપ્ત ક્ષેત્ર","button":"બટન","select":"પસંદગી ક્ષેત્ર","imageButton":"ચિત્ર બટન","notSet":"<સેટ નથી>","id":"Id","name":"નામ","langDir":"ભાષા લેખવાની પદ્ધતિ","langDirLtr":"ડાબે થી જમણે (LTR)","langDirRtl":"જમણે થી ડાબે (RTL)","langCode":"ભાષા કોડ","longDescr":"વધારે માહિતી માટે URL","cssClass":"સ્ટાઇલ-શીટ ક્લાસ","advisoryTitle":"મુખ્ય મથાળું","cssStyle":"સ્ટાઇલ","ok":"ઠીક છે","cancel":"રદ કરવું","close":"બંધ કરવું","preview":"જોવું","resize":"ખેંચી ને યોગ્ય કરવું","generalTab":"જનરલ","advancedTab":"અડ્વાન્સડ","validateNumberFailed":"આ રકમ આકડો નથી.","confirmNewPage":"સવે કાર્ય વગરનું ફકરો ખોવાઈ જશે. તમને ખાતરી છે કે તમને નવું પાનું ખોલવું છે?","confirmCancel":"ઘણા વિકલ્પો બદલાયા છે. તમારે આ બોક્ષ્ બંધ કરવું છે?","options":"વિકલ્પો","target":"લક્ષ્ય","targetNew":"નવી વિન્ડો (_blank)","targetTop":"ઉપરની વિન્ડો (_top)","targetSelf":"એજ વિન્ડો (_self)","targetParent":"પેરનટ વિન્ડો (_parent)","langDirLTR":"ડાબે થી જમણે (LTR)","langDirRTL":"જમણે થી ડાબે (RTL)","styles":"શૈલી","cssClasses":"શૈલી કલાસીસ","width":"પહોળાઈ","height":"ઊંચાઈ","align":"લાઇનદોરીમાં ગોઠવવું","alignLeft":"ડાબી બાજુ ગોઠવવું","alignRight":"જમણી","alignCenter":"મધ્ય સેન્ટર","alignJustify":"બ્લૉક, અંતરાય જસ્ટિફાઇ","alignTop":"ઉપર","alignMiddle":"વચ્ચે","alignBottom":"નીચે","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"ઉંચાઈ એક આંકડો હોવો જોઈએ.","invalidWidth":"પોહળ ઈ એક આંકડો હોવો જોઈએ.","invalidCssLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ અથવા CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc) વગર.","invalidHtmlLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ અથવા HTML measurement unit (px or %) વગર.","invalidInlineStyle":"ઈનલાઈન  સ્ટાઈલ ની વેલ્યુ  \"name : value\" ના ફોર્મેટ માં હોવી જોઈએ, વચ્ચે સેમી-કોલોન જોઈએ.","cssLengthTooltip":"પિક્ષ્લ્ નો આંકડો CSS unit (px, %, in, cm, mm, em, ex, pt, or pc) માં નાખો.","unavailable":"%1<span class=\"cke_accessibility\">, નથી મળતું</span>"},"about":{"copy":"કોપીરાઈટ &copy; $1. ઓલ રાઈટ્સ ","dlgTitle":"CKEditor વિષે","help":"મદદ માટે $1 તપાસો","moreInfo":"લાયસનસની માહિતી માટે અમારી વેબ સાઈટ","title":"CKEditor વિષે","userGuide":"CKEditor યુઝર્સ ગાઈડ"},"basicstyles":{"bold":"બોલ્ડ/સ્પષ્ટ","italic":"ઇટેલિક, ત્રાંસા","strike":"છેકી નાખવું","subscript":"એક ચિહ્નની નીચે કરેલું બીજું ચિહ્ન","superscript":"એક ચિહ્ન ઉપર કરેલું બીજું ચિહ્ન.","underline":"અન્ડર્લાઇન, નીચે લીટી"},"bidi":{"ltr":"ટેક્ષ્ત્ ની દિશા ડાબે થી જમણે","rtl":"ટેક્ષ્ત્ ની દિશા જમણે થી ડાબે"},"blockquote":{"toolbar":"બ્લૉક-કોટ, અવતરણચિહ્નો"},"clipboard":{"copy":"નકલ","copyError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કોપી કરવાની પરવાનગી નથી આપતી.  (Ctrl/Cmd+C) का प्रयोग करें।","cut":"કાપવું","cutError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કટ કરવાની પરવાનગી નથી આપતી. (Ctrl/Cmd+X) નો ઉપયોગ કરો.","paste":"પેસ્ટ","pasteArea":"પેસ્ટ કરવાની જગ્યા","pasteMsg":"Ctrl/Cmd+V નો પ્રયોગ કરી પેસ્ટ કરો","securityMsg":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસના કારણે,એડિટર તમારા કિલ્પબોર્ડ ડેટા ને કોપી નથી કરી શકતો. તમારે આ વિન્ડોમાં ફરીથી પેસ્ટ કરવું પડશે.","title":"પેસ્ટ"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"સ્વચાલિત","bgColorTitle":"બૅકગ્રાઉન્ડ રંગ,","colors":{"000":"કાળો","800000":"મરુન","8B4513":"છીક","2F4F4F":"ડાર્ક સ્લેટ ગ્રે ","008080":"ટીલ","000080":"નેવી","4B0082":"જામલી","696969":"ડાર્ક ગ્રે","B22222":"ઈટ","A52A2A":"બ્રાઉન","DAA520":"ગોલ્ડન રોડ","006400":"ડાર્ક લીલો","40E0D0":"ટ્રકોઈસ","0000CD":"મધ્યમ વાદળી","800080":"પર્પલ","808080":"ગ્રે","F00":"લાલ","FF8C00":"ડાર્ક ઓરંજ","FFD700":"ગોલ્ડ","008000":"ગ્રીન","0FF":"સાયન","00F":"વાદળી","EE82EE":"વાયોલેટ","A9A9A9":"ડીમ ","FFA07A":"લાઈટ સાલમન","FFA500":"ઓરંજ","FFFF00":"પીળો","00FF00":"લાઈમ","AFEEEE":"પેલ કોઈસ","ADD8E6":"લાઈટ બ્લુ","DDA0DD":"પલ્મ","D3D3D3":"લાઈટ ગ્રે","FFF0F5":"લવંડર ","FAEBD7":"એન્ટીક સફેદ","FFFFE0":"લાઈટ પીળો","F0FFF0":"હનીડઉય","F0FFFF":"અઝુરે","F0F8FF":"એલીસ બ્લુ","E6E6FA":"લવંડર","FFF":"સફેદ"},"more":"ઔર રંગ...","panelTitle":"રંગ","textColorTitle":"શબ્દનો રંગ"},"colordialog":{"clear":"સાફ કરવું","highlight":"હાઈઈટ","options":"રંગના વિકલ્પ","selected":"પસંદ કરેલો રંગ","title":"રંગ પસંદ કરો"},"templates":{"button":"ટેમ્પ્લેટ","emptyListMsg":"(કોઈ ટેમ્પ્લેટ ડિફાઇન નથી)","insertOption":"મૂળ શબ્દને બદલો","options":"ટેમ્પ્લેટના વિકલ્પો","selectPromptMsg":"એડિટરમાં ઓપન કરવા ટેમ્પ્લેટ પસંદ કરો (વર્તમાન કન્ટેન્ટ સેવ નહીં થાય):","title":"કન્ટેન્ટ ટેમ્પ્લેટ"},"contextmenu":{"options":"કોન્તેક્ષ્ત્ મેનુના વિકલ્પો"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"એડવાઈઝર શીર્ષક","cssClassInputLabel":"સ્ટાઈલશીટ કલાસીસ","edit":"ડીવીમાં ફેરફાર કરવો","inlineStyleInputLabel":"ઈનલાઈન પદ્ધતિ","langDirLTRLabel":"ડાબે થી જમણે (LTR)","langDirLabel":"ભાષાની દિશા","langDirRTLLabel":"જમણે થી ડાબે (RTL)","languageCodeInputLabel":"ભાષાનો કોડ","remove":"ડીવી કાઢી કાઢવું","styleSelectLabel":"સ્ટાઈલ","title":"Div કન્ટેનર બનાવુંવું","toolbar":"Div કન્ટેનર બનાવુંવું"},"toolbar":{"toolbarCollapse":"ટૂલબાર નાનું કરવું","toolbarExpand":"ટૂલબાર મોટું કરવું","toolbarGroups":{"document":"દસ્તાવેજ","clipboard":"ક્લિપબોર્ડ/અન","editing":"એડીટ કરવું","forms":"ફોર્મ","basicstyles":"બેસિક્ સ્ટાઇલ","paragraph":"ફકરો","links":"લીંક","insert":"ઉમેરવું","styles":"સ્ટાઇલ","colors":"રંગ","tools":"ટૂલ્સ"},"toolbars":"એડીટર ટૂલ બાર"},"elementspath":{"eleLabel":"એલીમેન્ટ્સ નો ","eleTitle":"એલીમેન્ટ %1"},"find":{"find":"શોધવું","findOptions":"વીકલ્પ શોધો","findWhat":"આ શોધો","matchCase":"કેસ સરખા રાખો","matchCyclic":"સરખાવવા બધા","matchWord":"બઘા શબ્દ સરખા રાખો","notFoundMsg":"તમે શોધેલી ટેક્સ્ટ નથી મળી","replace":"રિપ્લેસ/બદલવું","replaceAll":"બઘા બદલી ","replaceSuccessMsg":"%1 ફેરફારો બાદલાયા છે.","replaceWith":"આનાથી બદલો","title":"શોધવું અને બદલવું"},"fakeobjects":{"anchor":"અનકર","flash":"ફ્લેશ ","hiddenfield":"હિડન ","iframe":"IFrame","unknown":"અનનોન ઓબ્જેક્ટ"},"flash":{"access":"સ્ક્રીપ્ટ એક્સેસ","accessAlways":"હમેશાં","accessNever":"નહી","accessSameDomain":"એજ ડોમેન","alignAbsBottom":"Abs નીચે","alignAbsMiddle":"Abs ઉપર","alignBaseline":"આધાર લીટી","alignTextTop":"ટેક્સ્ટ ઉપર","bgcolor":"બૅકગ્રાઉન્ડ રંગ,","chkFull":"ફૂલ સ્ક્રીન કરવું","chkLoop":"લૂપ","chkMenu":"ફ્લૅશ મેન્યૂ નો પ્રયોગ કરો","chkPlay":"ઑટો/સ્વયં પ્લે","flashvars":"ફલેશ ના વિકલ્પો","hSpace":"સમસ્તરીય જગ્યા","properties":"ફ્લૅશના ગુણ","propertiesTab":"ગુણ","quality":"ગુણધર્મ","qualityAutoHigh":"ઓટો ઊંચું","qualityAutoLow":"ઓટો નીચું","qualityBest":"શ્રેષ્ઠ","qualityHigh":"ઊંચું","qualityLow":"નીચું","qualityMedium":"મધ્યમ","scale":"સ્કેલ","scaleAll":"સ્કેલ ઓલ/બધુ બતાવો","scaleFit":"સ્કેલ એકદમ ફીટ","scaleNoBorder":"સ્કેલ બોર્ડર વગર","title":"ફ્લૅશ ગુણ","vSpace":"લંબરૂપ જગ્યા","validateHSpace":"HSpace આંકડો હોવો જોઈએ.","validateSrc":"લિંક  URL ટાઇપ કરો","validateVSpace":"VSpace આંકડો હોવો જોઈએ.","windowMode":"વિન્ડો મોડ","windowModeOpaque":"અપારદર્શક","windowModeTransparent":"પારદર્શક","windowModeWindow":"વિન્ડો"},"font":{"fontSize":{"label":"ફૉન્ટ સાઇઝ/કદ","voiceLabel":"ફોન્ટ સાઈઝ","panelTitle":"ફૉન્ટ સાઇઝ/કદ"},"label":"ફૉન્ટ","panelTitle":"ફૉન્ટ","voiceLabel":"ફોન્ટ"},"forms":{"button":{"title":"બટનના ગુણ","text":"ટેક્સ્ટ (વૅલ્યૂ)","type":"પ્રકાર","typeBtn":"બટન","typeSbm":"સબ્મિટ","typeRst":"રિસેટ"},"checkboxAndRadio":{"checkboxTitle":"ચેક બોક્સ ગુણ","radioTitle":"રેડિઓ બટનના ગુણ","value":"વૅલ્યૂ","selected":"સિલેક્ટેડ","required":"Required"},"form":{"title":"ફૉર્મ/પત્રકના ગુણ","menu":"ફૉર્મ/પત્રકના ગુણ","action":"ક્રિયા","method":"પદ્ધતિ","encoding":"અન્કોડીન્ગ"},"hidden":{"title":"ગુપ્ત ક્ષેત્રના ગુણ","name":"નામ","value":"વૅલ્યૂ"},"select":{"title":"પસંદગી ક્ષેત્રના ગુણ","selectInfo":"સૂચના","opAvail":"ઉપલબ્ધ વિકલ્પ","value":"વૅલ્યૂ","size":"સાઇઝ","lines":"લીટીઓ","chkMulti":"એકથી વધારે પસંદ કરી શકો","required":"Required","opText":"ટેક્સ્ટ","opValue":"વૅલ્યૂ","btnAdd":"ઉમેરવું","btnModify":"બદલવું","btnUp":"ઉપર","btnDown":"નીચે","btnSetValue":"પસંદ કરલી વૅલ્યૂ સેટ કરો","btnDelete":"રદ કરવું"},"textarea":{"title":"ટેક્સ્ટ એઅરિઆ, શબ્દ વિસ્તારના ગુણ","cols":"કૉલમ/ઊભી કટાર","rows":"પંક્તિઓ"},"textfield":{"title":"ટેક્સ્ટ ફીલ્ડ, શબ્દ ક્ષેત્રના ગુણ","name":"નામ","value":"વૅલ્યૂ","charWidth":"કેરેક્ટરની પહોળાઈ","maxChars":"અધિકતમ કેરેક્ટર","required":"Required","type":"ટાઇપ","typeText":"ટેક્સ્ટ","typePass":"પાસવર્ડ","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"ફૉન્ટ ફૉર્મટ, રચનાની શૈલી","panelTitle":"ફૉન્ટ ફૉર્મટ, રચનાની શૈલી","tag_address":"સરનામું","tag_div":"શીર્ષક (DIV)","tag_h1":"શીર્ષક 1","tag_h2":"શીર્ષક 2","tag_h3":"શીર્ષક 3","tag_h4":"શીર્ષક 4","tag_h5":"શીર્ષક 5","tag_h6":"શીર્ષક 6","tag_p":"સામાન્ય","tag_pre":"ફૉર્મટેડ"},"horizontalrule":{"toolbar":"સમસ્તરીય રેખા ઇન્સર્ટ/દાખલ કરવી"},"iframe":{"border":"ફ્રેમ બોર્ડેર બતાવવી","noUrl":"iframe URL ટાઈપ્ કરો","scrolling":"સ્ક્રોલબાર ચાલુ કરવા","title":"IFrame વિકલ્પો","toolbar":"IFrame"},"image":{"alt":"ઑલ્ટર્નટ ટેક્સ્ટ","border":"બોર્ડર","btnUpload":"આ સર્વરને મોકલવું","button2Img":"તમારે ઈમેજ બટનને સાદી ઈમેજમાં બદલવું છે.","hSpace":"સમસ્તરીય જગ્યા","img2Button":"તમારે સાદી ઈમેજને ઈમેજ બટનમાં બદલવું છે.","infoTab":"ચિત્ર ની જાણકારી","linkTab":"લિંક","lockRatio":"લૉક ગુણોત્તર","menu":"ચિત્રના ગુણ","resetSize":"રીસેટ સાઇઝ","title":"ચિત્રના ગુણ","titleButton":"ચિત્ર બટનના ગુણ","upload":"અપલોડ","urlMissing":"ઈમેજની મૂળ URL છે નહી.","vSpace":"લંબરૂપ જગ્યા","validateBorder":"બોર્ડેર આંકડો હોવો જોઈએ.","validateHSpace":"HSpaceઆંકડો હોવો જોઈએ.","validateVSpace":"VSpace આંકડો હોવો જોઈએ. "},"indent":{"indent":"ઇન્ડેન્ટ, લીટીના આરંભમાં જગ્યા વધારવી","outdent":"ઇન્ડેન્ટ લીટીના આરંભમાં જગ્યા ઘટાડવી"},"smiley":{"options":"સમ્ય્લી વિકલ્પો","title":"સ્માઇલી  પસંદ કરો","toolbar":"સ્માઇલી"},"justify":{"block":"બ્લૉક, અંતરાય જસ્ટિફાઇ","center":"સંકેંદ્રણ/સેંટરિંગ","left":"ડાબી બાજુએ/બાજુ તરફ","right":"જમણી બાજુએ/બાજુ તરફ"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"ઍક્સેસ કી","advanced":"અડ્વાન્સડ","advisoryContentType":"મુખ્ય કન્ટેન્ટ પ્રકાર","advisoryTitle":"મુખ્ય મથાળું","anchor":{"toolbar":"ઍંકર ઇન્સર્ટ/દાખલ કરવી","menu":"ઍંકરના ગુણ","title":"ઍંકરના ગુણ","name":"ઍંકરનું નામ","errorName":"ઍંકરનું નામ ટાઈપ કરો","remove":"સ્થિર નકરવું"},"anchorId":"ઍંકર એલિમન્ટ Id થી પસંદ કરો","anchorName":"ઍંકર નામથી પસંદ કરો","charset":"લિંક રિસૉર્સ કૅરિક્ટર સેટ","cssClasses":"સ્ટાઇલ-શીટ ક્લાસ","emailAddress":"ઈ-મેલ સરનામું","emailBody":"સંદેશ","emailSubject":"ઈ-મેલ વિષય","id":"Id","info":"લિંક ઇન્ફૉ ટૅબ","langCode":"ભાષા લેખવાની પદ્ધતિ","langDir":"ભાષા લેખવાની પદ્ધતિ","langDirLTR":"ડાબે થી જમણે (LTR)","langDirRTL":"જમણે થી ડાબે (RTL)","menu":" લિંક એડિટ/માં ફેરફાર કરવો","name":"નામ","noAnchors":"(ડૉક્યુમન્ટમાં ઍંકરની સંખ્યા)","noEmail":"ઈ-મેલ સરનામું ટાઇપ કરો","noUrl":"લિંક  URL ટાઇપ કરો","other":"<other> <અન્ય>","popupDependent":"ડિપેન્ડન્ટ (Netscape)","popupFeatures":"પૉપ-અપ વિન્ડો ફીચરસૅ","popupFullScreen":"ફુલ સ્ક્રીન (IE)","popupLeft":"ડાબી બાજુ","popupLocationBar":"લોકેશન બાર","popupMenuBar":"મેન્યૂ બાર","popupResizable":"રીસાઈઝએબલ","popupScrollBars":"સ્ક્રોલ બાર","popupStatusBar":"સ્ટૅટસ બાર","popupToolbar":"ટૂલ બાર","popupTop":"જમણી બાજુ","rel":"સંબંધની સ્થિતિ","selectAnchor":"ઍંકર પસંદ કરો","styles":"સ્ટાઇલ","tabIndex":"ટૅબ ઇન્ડેક્સ","target":"ટાર્ગેટ/લક્ષ્ય","targetFrame":"<ફ્રેમ>","targetFrameName":"ટાર્ગેટ ફ્રેમ નું નામ","targetPopup":"<પૉપ-અપ વિન્ડો>","targetPopupName":"પૉપ-અપ વિન્ડો નું નામ","title":"લિંક","toAnchor":"આ પેજનો ઍંકર","toEmail":"ઈ-મેલ","toUrl":"URL","toolbar":"લિંક ઇન્સર્ટ/દાખલ કરવી","type":"લિંક પ્રકાર","unlink":"લિંક કાઢવી","upload":"અપલોડ"},"list":{"bulletedlist":"બુલેટ સૂચિ","numberedlist":"સંખ્યાંકન સૂચિ"},"liststyle":{"armenian":"અરમેનિયન આંકડા પદ્ધતિ","bulletedTitle":"બુલેટેડ લીસ્ટના ગુણ","circle":"વર્તુળ","decimal":"આંકડા (1, 2, 3, etc.)","decimalLeadingZero":"સુન્ય આગળ આંકડા (01, 02, 03, etc.)","disc":"ડિસ્ક","georgian":"ગેઓર્ગિયન આંકડા પદ્ધતિ (an, ban, gan, etc.)","lowerAlpha":"આલ્ફા નાના (a, b, c, d, e, etc.)","lowerGreek":"ગ્રીક નાના (alpha, beta, gamma, etc.)","lowerRoman":"રોમન નાના (i, ii, iii, iv, v, etc.)","none":"કસુ ","notset":"<સેટ નથી>","numberedTitle":"આંકડાના લીસ્ટના ગુણ","square":"ચોરસ","start":"શરુ કરવું","type":"પ્રકાર","upperAlpha":"આલ્ફા મોટા (A, B, C, D, E, etc.)","upperRoman":"રોમન મોટા (I, II, III, IV, V, etc.)","validateStartNumber":"લીસ્ટના સરુઆતનો આંકડો પુરો હોવો જોઈએ."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"મોટું કરવું","minimize":"નાનું કરવું"},"newpage":{"toolbar":"નવુ પાનું"},"pagebreak":{"alt":"નવું પાનું","toolbar":"ઇન્સર્ટ પેજબ્રેક/પાનાને અલગ કરવું/દાખલ કરવું"},"pastetext":{"button":"પેસ્ટ (ટેક્સ્ટ)","title":"પેસ્ટ (ટેક્સ્ટ)"},"pastefromword":{"confirmCleanup":"તમે જે ટેક્ષ્ત્ કોપી કરી રહ્યા છો ટે વર્ડ ની છે. કોપી કરતા પેહલા સાફ કરવી છે?","error":"પેસ્ટ કરેલો ડેટા ઇન્ટરનલ એરર ના લીથે સાફ કરી શકાયો નથી.","title":"પેસ્ટ (વડૅ ટેક્સ્ટ)","toolbar":"પેસ્ટ (વડૅ ટેક્સ્ટ)"},"preview":{"preview":"પૂર્વદર્શન"},"print":{"toolbar":"પ્રિન્ટ"},"removeformat":{"toolbar":"ફૉર્મટ કાઢવું"},"save":{"toolbar":"સેવ"},"selectall":{"toolbar":"બઘું પસંદ કરવું"},"showblocks":{"toolbar":"બ્લૉક બતાવવું"},"sourcearea":{"toolbar":"મૂળ કે પ્રાથમિક દસ્તાવેજ"},"specialchar":{"options":"સ્પેશિઅલ કરેક્ટરના વિકલ્પો","title":"સ્પેશિઅલ વિશિષ્ટ અક્ષર પસંદ કરો","toolbar":"વિશિષ્ટ અક્ષર ઇન્સર્ટ/દાખલ કરવું"},"scayt":{"btn_about":"SCAYT વિષે","btn_dictionaries":"શબ્દકોશ","btn_disable":"SCAYT ડિસેબલ કરવું","btn_enable":"SCAYT એનેબલ કરવું","btn_langs":"ભાષાઓ","btn_options":"વિકલ્પો","text_title":"ટાઈપ કરતા સ્પેલ તપાસો"},"stylescombo":{"label":"શૈલી/રીત","panelTitle":"ફોર્મેટ ","panelTitle1":"બ્લોક ","panelTitle2":"ઈનલાઈન ","panelTitle3":"ઓબ્જેક્ટ પદ્ધતિ"},"table":{"border":"કોઠાની બાજુ(બોર્ડર) સાઇઝ","caption":"મથાળું/કૅપ્શન ","cell":{"menu":"કોષના ખાના","insertBefore":"પહેલાં કોષ ઉમેરવો","insertAfter":"પછી કોષ ઉમેરવો","deleteCell":"કોષ ડિલીટ/કાઢી નાખવો","merge":"કોષ ભેગા કરવા","mergeRight":"જમણી બાજુ ભેગા કરવા","mergeDown":"નીચે ભેગા કરવા","splitHorizontal":"કોષને સમસ્તરીય વિભાજન કરવું","splitVertical":"કોષને સીધું ને ઊભું વિભાજન કરવું","title":"સેલના ગુણ","cellType":"સેલનો પ્રકાર","rowSpan":"આડી કટારની જગ્યા","colSpan":"ઊભી કતારની જગ્યા","wordWrap":"વર્ડ રેપ","hAlign":"સપાટ લાઈનદોરી","vAlign":"ઊભી લાઈનદોરી","alignBaseline":"બસે લાઈન","bgColor":"પાછાળનો રંગ","borderColor":"બોર્ડેર રંગ","data":"સ્વીકૃત માહિતી","header":"મથાળું","yes":"હા","no":"ના","invalidWidth":"સેલની પોહલાઈ આંકડો હોવો જોઈએ.","invalidHeight":"સેલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRowSpan":"રો સ્પાન આંકડો હોવો જોઈએ.","invalidColSpan":"કોલમ સ્પાન આંકડો હોવો જોઈએ.","chooseColor":"પસંદ કરવું"},"cellPad":"સેલ પૅડિંગ","cellSpace":"સેલ અંતર","column":{"menu":"કૉલમ/ઊભી કટાર","insertBefore":"પહેલાં કૉલમ/ઊભી કટાર ઉમેરવી","insertAfter":"પછી કૉલમ/ઊભી કટાર ઉમેરવી","deleteColumn":"કૉલમ/ઊભી કટાર ડિલીટ/કાઢી નાખવી"},"columns":"કૉલમ/ઊભી કટાર","deleteTable":"કોઠો ડિલીટ/કાઢી નાખવું","headers":"મથાળા","headersBoth":"બેવું","headersColumn":"પહેલી ઊભી કટાર","headersNone":"નથી ","headersRow":"પહેલી  કટાર","invalidBorder":"બોર્ડર એક આંકડો હોવો જોઈએ","invalidCellPadding":"સેલની અંદરની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCellSpacing":"સેલ વચ્ચેની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCols":"ઉભી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidHeight":"ટેબલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRows":"આડી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidWidth":"ટેબલની પોહલાઈ આંકડો હોવો જોઈએ.","menu":"ટેબલ, કોઠાનું મથાળું","row":{"menu":"પંક્તિના ખાના","insertBefore":"પહેલાં પંક્તિ ઉમેરવી","insertAfter":"પછી પંક્તિ ઉમેરવી","deleteRow":"પંક્તિઓ ડિલીટ/કાઢી નાખવી"},"rows":"પંક્તિના ખાના","summary":"ટૂંકો એહેવાલ","title":"ટેબલ, કોઠાનું મથાળું","toolbar":"ટેબલ, કોઠો","widthPc":"પ્રતિશત","widthPx":"પિકસલ","widthUnit":"પોહાલાઈ એકમ"},"undo":{"redo":"રિડૂ; પછી હતી એવી સ્થિતિ પાછી લાવવી","undo":"રદ કરવું; પહેલાં હતી એવી સ્થિતિ પાછી લાવવી"},"wsc":{"btnIgnore":"ઇગ્નોર/અવગણના કરવી","btnIgnoreAll":"બધાની ઇગ્નોર/અવગણના કરવી","btnReplace":"બદલવું","btnReplaceAll":"બધા બદલી કરો","btnUndo":"અન્ડૂ","changeTo":"આનાથી બદલવું","errorLoading":"સર્વિસ એપ્લીકેશન લોડ નથી થ: %s.","ieSpellDownload":"સ્પેલ-ચેકર ઇન્સ્ટોલ નથી. શું તમે ડાઉનલોડ કરવા માંગો છો?","manyChanges":"શબ્દની જોડણી/સ્પેલ ચેક પૂર્ણ: %1 શબ્દ બદલયા છે","noChanges":"શબ્દની જોડણી/સ્પેલ ચેક પૂર્ણ: એકપણ શબ્દ બદલયો નથી","noMispell":"શબ્દની જોડણી/સ્પેલ ચેક પૂર્ણ: ખોટી જોડણી મળી નથી","noSuggestions":"- કઇ સજેશન નથી -","notAvailable":"માફ કરશો, આ સુવિધા ઉપલબ્ધ નથી","notInDic":"શબ્દકોશમાં નથી","oneChange":"શબ્દની જોડણી/સ્પેલ ચેક પૂર્ણ: એક શબ્દ બદલયો છે","progress":"શબ્દની જોડણી/સ્પેલ ચેક ચાલુ છે...","title":"સ્પેલ ","toolbar":"જોડણી (સ્પેલિંગ) તપાસવી"}};
\ No newline at end of file
+CKEDITOR.lang['gu']={"editor":"રીચ ટેક્ષ્ત્ એડીટર","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"પ્રેસ ALT 0 મદદ માટ","browseServer":"સર્વર બ્રાઉઝ કરો","url":"URL","protocol":"પ્રોટોકૉલ","upload":"અપલોડ","uploadSubmit":"આ સર્વરને મોકલવું","image":"ચિત્ર","flash":"ફ્લૅશ","form":"ફૉર્મ/પત્રક","checkbox":"ચેક બોક્સ","radio":"રેડિઓ બટન","textField":"ટેક્સ્ટ ફીલ્ડ, શબ્દ ક્ષેત્ર","textarea":"ટેક્સ્ટ એરિઆ, શબ્દ વિસ્તાર","hiddenField":"ગુપ્ત ક્ષેત્ર","button":"બટન","select":"પસંદગી ક્ષેત્ર","imageButton":"ચિત્ર બટન","notSet":"<સેટ નથી>","id":"Id","name":"નામ","langDir":"ભાષા લેખવાની પદ્ધતિ","langDirLtr":"ડાબે થી જમણે (LTR)","langDirRtl":"જમણે થી ડાબે (RTL)","langCode":"ભાષા કોડ","longDescr":"વધારે માહિતી માટે URL","cssClass":"સ્ટાઇલ-શીટ ક્લાસ","advisoryTitle":"મુખ્ય મથાળું","cssStyle":"સ્ટાઇલ","ok":"ઠીક છે","cancel":"રદ કરવું","close":"બંધ કરવું","preview":"જોવું","resize":"ખેંચી ને યોગ્ય કરવું","generalTab":"જનરલ","advancedTab":"અડ્વાન્સડ","validateNumberFailed":"આ રકમ આકડો નથી.","confirmNewPage":"સવે કાર્ય વગરનું ફકરો ખોવાઈ જશે. તમને ખાતરી છે કે તમને નવું પાનું ખોલવું છે?","confirmCancel":"ઘણા વિકલ્પો બદલાયા છે. તમારે આ બોક્ષ્ બંધ કરવું છે?","options":"વિકલ્પો","target":"લક્ષ્ય","targetNew":"નવી વિન્ડો (_blank)","targetTop":"ઉપરની વિન્ડો (_top)","targetSelf":"એજ વિન્ડો (_self)","targetParent":"પેરનટ વિન્ડો (_parent)","langDirLTR":"ડાબે થી જમણે (LTR)","langDirRTL":"જમણે થી ડાબે (RTL)","styles":"શૈલી","cssClasses":"શૈલી કલાસીસ","width":"પહોળાઈ","height":"ઊંચાઈ","align":"લાઇનદોરીમાં ગોઠવવું","alignLeft":"ડાબી બાજુ ગોઠવવું","alignRight":"જમણી","alignCenter":"મધ્ય સેન્ટર","alignJustify":"બ્લૉક, અંતરાય જસ્ટિફાઇ","alignTop":"ઉપર","alignMiddle":"વચ્ચે","alignBottom":"નીચે","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"ઉંચાઈ એક આંકડો હોવો જોઈએ.","invalidWidth":"પોહળ ઈ એક આંકડો હોવો જોઈએ.","invalidCssLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ અથવા CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc) વગર.","invalidHtmlLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ અથવા HTML measurement unit (px or %) વગર.","invalidInlineStyle":"ઈનલાઈન  સ્ટાઈલ ની વેલ્યુ  \"name : value\" ના ફોર્મેટ માં હોવી જોઈએ, વચ્ચે સેમી-કોલોન જોઈએ.","cssLengthTooltip":"પિક્ષ્લ્ નો આંકડો CSS unit (px, %, in, cm, mm, em, ex, pt, or pc) માં નાખો.","unavailable":"%1<span class=\"cke_accessibility\">, નથી મળતું</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"કોપીરાઈટ &copy; $1. ઓલ રાઈટ્સ ","dlgTitle":"CKEditor વિષે","help":"મદદ માટે $1 તપાસો","moreInfo":"લાયસનસની માહિતી માટે અમારી વેબ સાઈટ","title":"CKEditor વિષે","userGuide":"CKEditor યુઝર્સ ગાઈડ"},"basicstyles":{"bold":"બોલ્ડ/સ્પષ્ટ","italic":"ઇટેલિક, ત્રાંસા","strike":"છેકી નાખવું","subscript":"એક ચિહ્નની નીચે કરેલું બીજું ચિહ્ન","superscript":"એક ચિહ્ન ઉપર કરેલું બીજું ચિહ્ન.","underline":"અન્ડર્લાઇન, નીચે લીટી"},"bidi":{"ltr":"ટેક્ષ્ત્ ની દિશા ડાબે થી જમણે","rtl":"ટેક્ષ્ત્ ની દિશા જમણે થી ડાબે"},"blockquote":{"toolbar":"બ્લૉક-કોટ, અવતરણચિહ્નો"},"clipboard":{"copy":"નકલ","copyError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કોપી કરવાની પરવાનગી નથી આપતી.  (Ctrl/Cmd+C) का प्रयोग करें।","cut":"કાપવું","cutError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કટ કરવાની પરવાનગી નથી આપતી. (Ctrl/Cmd+X) નો ઉપયોગ કરો.","paste":"પેસ્ટ","pasteArea":"પેસ્ટ કરવાની જગ્યા","pasteMsg":"Ctrl/Cmd+V નો પ્રયોગ કરી પેસ્ટ કરો","securityMsg":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસના કારણે,એડિટર તમારા કિલ્પબોર્ડ ડેટા ને કોપી નથી કરી શકતો. તમારે આ વિન્ડોમાં ફરીથી પેસ્ટ કરવું પડશે.","title":"પેસ્ટ"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"સ્વચાલિત","bgColorTitle":"બૅકગ્રાઉન્ડ રંગ,","colors":{"000":"કાળો","800000":"મરુન","8B4513":"છીક","2F4F4F":"ડાર્ક સ્લેટ ગ્રે ","008080":"ટીલ","000080":"નેવી","4B0082":"જામલી","696969":"ડાર્ક ગ્રે","B22222":"ઈટ","A52A2A":"બ્રાઉન","DAA520":"ગોલ્ડન રોડ","006400":"ડાર્ક લીલો","40E0D0":"ટ્રકોઈસ","0000CD":"મધ્યમ વાદળી","800080":"પર્પલ","808080":"ગ્રે","F00":"લાલ","FF8C00":"ડાર્ક ઓરંજ","FFD700":"ગોલ્ડ","008000":"ગ્રીન","0FF":"સાયન","00F":"વાદળી","EE82EE":"વાયોલેટ","A9A9A9":"ડીમ ","FFA07A":"લાઈટ સાલમન","FFA500":"ઓરંજ","FFFF00":"પીળો","00FF00":"લાઈમ","AFEEEE":"પેલ કોઈસ","ADD8E6":"લાઈટ બ્લુ","DDA0DD":"પલ્મ","D3D3D3":"લાઈટ ગ્રે","FFF0F5":"લવંડર ","FAEBD7":"એન્ટીક સફેદ","FFFFE0":"લાઈટ પીળો","F0FFF0":"હનીડઉય","F0FFFF":"અઝુરે","F0F8FF":"એલીસ બ્લુ","E6E6FA":"લવંડર","FFF":"સફેદ","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"ઔર રંગ...","panelTitle":"રંગ","textColorTitle":"શબ્દનો રંગ"},"colordialog":{"clear":"સાફ કરવું","highlight":"હાઈઈટ","options":"રંગના વિકલ્પ","selected":"પસંદ કરેલો રંગ","title":"રંગ પસંદ કરો"},"templates":{"button":"ટેમ્પ્લેટ","emptyListMsg":"(કોઈ ટેમ્પ્લેટ ડિફાઇન નથી)","insertOption":"મૂળ શબ્દને બદલો","options":"ટેમ્પ્લેટના વિકલ્પો","selectPromptMsg":"એડિટરમાં ઓપન કરવા ટેમ્પ્લેટ પસંદ કરો (વર્તમાન કન્ટેન્ટ સેવ નહીં થાય):","title":"કન્ટેન્ટ ટેમ્પ્લેટ"},"contextmenu":{"options":"કોન્તેક્ષ્ત્ મેનુના વિકલ્પો"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"એડવાઈઝર શીર્ષક","cssClassInputLabel":"સ્ટાઈલશીટ કલાસીસ","edit":"ડીવીમાં ફેરફાર કરવો","inlineStyleInputLabel":"ઈનલાઈન પદ્ધતિ","langDirLTRLabel":"ડાબે થી જમણે (LTR)","langDirLabel":"ભાષાની દિશા","langDirRTLLabel":"જમણે થી ડાબે (RTL)","languageCodeInputLabel":"ભાષાનો કોડ","remove":"ડીવી કાઢી કાઢવું","styleSelectLabel":"સ્ટાઈલ","title":"Div કન્ટેનર બનાવુંવું","toolbar":"Div કન્ટેનર બનાવુંવું"},"toolbar":{"toolbarCollapse":"ટૂલબાર નાનું કરવું","toolbarExpand":"ટૂલબાર મોટું કરવું","toolbarGroups":{"document":"દસ્તાવેજ","clipboard":"ક્લિપબોર્ડ/અન","editing":"એડીટ કરવું","forms":"ફોર્મ","basicstyles":"બેસિક્ સ્ટાઇલ","paragraph":"ફકરો","links":"લીંક","insert":"ઉમેરવું","styles":"સ્ટાઇલ","colors":"રંગ","tools":"ટૂલ્સ"},"toolbars":"એડીટર ટૂલ બાર"},"elementspath":{"eleLabel":"એલીમેન્ટ્સ નો ","eleTitle":"એલીમેન્ટ %1"},"find":{"find":"શોધવું","findOptions":"વીકલ્પ શોધો","findWhat":"આ શોધો","matchCase":"કેસ સરખા રાખો","matchCyclic":"સરખાવવા બધા","matchWord":"બઘા શબ્દ સરખા રાખો","notFoundMsg":"તમે શોધેલી ટેક્સ્ટ નથી મળી","replace":"રિપ્લેસ/બદલવું","replaceAll":"બઘા બદલી ","replaceSuccessMsg":"%1 ફેરફારો બાદલાયા છે.","replaceWith":"આનાથી બદલો","title":"શોધવું અને બદલવું"},"fakeobjects":{"anchor":"અનકર","flash":"ફ્લેશ ","hiddenfield":"હિડન ","iframe":"IFrame","unknown":"અનનોન ઓબ્જેક્ટ"},"flash":{"access":"સ્ક્રીપ્ટ એક્સેસ","accessAlways":"હમેશાં","accessNever":"નહી","accessSameDomain":"એજ ડોમેન","alignAbsBottom":"Abs નીચે","alignAbsMiddle":"Abs ઉપર","alignBaseline":"આધાર લીટી","alignTextTop":"ટેક્સ્ટ ઉપર","bgcolor":"બૅકગ્રાઉન્ડ રંગ,","chkFull":"ફૂલ સ્ક્રીન કરવું","chkLoop":"લૂપ","chkMenu":"ફ્લૅશ મેન્યૂ નો પ્રયોગ કરો","chkPlay":"ઑટો/સ્વયં પ્લે","flashvars":"ફલેશ ના વિકલ્પો","hSpace":"સમસ્તરીય જગ્યા","properties":"ફ્લૅશના ગુણ","propertiesTab":"ગુણ","quality":"ગુણધર્મ","qualityAutoHigh":"ઓટો ઊંચું","qualityAutoLow":"ઓટો નીચું","qualityBest":"શ્રેષ્ઠ","qualityHigh":"ઊંચું","qualityLow":"નીચું","qualityMedium":"મધ્યમ","scale":"સ્કેલ","scaleAll":"સ્કેલ ઓલ/બધુ બતાવો","scaleFit":"સ્કેલ એકદમ ફીટ","scaleNoBorder":"સ્કેલ બોર્ડર વગર","title":"ફ્લૅશ ગુણ","vSpace":"લંબરૂપ જગ્યા","validateHSpace":"HSpace આંકડો હોવો જોઈએ.","validateSrc":"લિંક  URL ટાઇપ કરો","validateVSpace":"VSpace આંકડો હોવો જોઈએ.","windowMode":"વિન્ડો મોડ","windowModeOpaque":"અપારદર્શક","windowModeTransparent":"પારદર્શક","windowModeWindow":"વિન્ડો"},"font":{"fontSize":{"label":"ફૉન્ટ સાઇઝ/કદ","voiceLabel":"ફોન્ટ સાઈઝ","panelTitle":"ફૉન્ટ સાઇઝ/કદ"},"label":"ફૉન્ટ","panelTitle":"ફૉન્ટ","voiceLabel":"ફોન્ટ"},"forms":{"button":{"title":"બટનના ગુણ","text":"ટેક્સ્ટ (વૅલ્યૂ)","type":"પ્રકાર","typeBtn":"બટન","typeSbm":"સબ્મિટ","typeRst":"રિસેટ"},"checkboxAndRadio":{"checkboxTitle":"ચેક બોક્સ ગુણ","radioTitle":"રેડિઓ બટનના ગુણ","value":"વૅલ્યૂ","selected":"સિલેક્ટેડ","required":"Required"},"form":{"title":"ફૉર્મ/પત્રકના ગુણ","menu":"ફૉર્મ/પત્રકના ગુણ","action":"ક્રિયા","method":"પદ્ધતિ","encoding":"અન્કોડીન્ગ"},"hidden":{"title":"ગુપ્ત ક્ષેત્રના ગુણ","name":"નામ","value":"વૅલ્યૂ"},"select":{"title":"પસંદગી ક્ષેત્રના ગુણ","selectInfo":"સૂચના","opAvail":"ઉપલબ્ધ વિકલ્પ","value":"વૅલ્યૂ","size":"સાઇઝ","lines":"લીટીઓ","chkMulti":"એકથી વધારે પસંદ કરી શકો","required":"Required","opText":"ટેક્સ્ટ","opValue":"વૅલ્યૂ","btnAdd":"ઉમેરવું","btnModify":"બદલવું","btnUp":"ઉપર","btnDown":"નીચે","btnSetValue":"પસંદ કરલી વૅલ્યૂ સેટ કરો","btnDelete":"રદ કરવું"},"textarea":{"title":"ટેક્સ્ટ એઅરિઆ, શબ્દ વિસ્તારના ગુણ","cols":"કૉલમ/ઊભી કટાર","rows":"પંક્તિઓ"},"textfield":{"title":"ટેક્સ્ટ ફીલ્ડ, શબ્દ ક્ષેત્રના ગુણ","name":"નામ","value":"વૅલ્યૂ","charWidth":"કેરેક્ટરની પહોળાઈ","maxChars":"અધિકતમ કેરેક્ટર","required":"Required","type":"ટાઇપ","typeText":"ટેક્સ્ટ","typePass":"પાસવર્ડ","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"ફૉન્ટ ફૉર્મટ, રચનાની શૈલી","panelTitle":"ફૉન્ટ ફૉર્મટ, રચનાની શૈલી","tag_address":"સરનામું","tag_div":"શીર્ષક (DIV)","tag_h1":"શીર્ષક 1","tag_h2":"શીર્ષક 2","tag_h3":"શીર્ષક 3","tag_h4":"શીર્ષક 4","tag_h5":"શીર્ષક 5","tag_h6":"શીર્ષક 6","tag_p":"સામાન્ય","tag_pre":"ફૉર્મટેડ"},"horizontalrule":{"toolbar":"સમસ્તરીય રેખા ઇન્સર્ટ/દાખલ કરવી"},"iframe":{"border":"ફ્રેમ બોર્ડેર બતાવવી","noUrl":"iframe URL ટાઈપ્ કરો","scrolling":"સ્ક્રોલબાર ચાલુ કરવા","title":"IFrame વિકલ્પો","toolbar":"IFrame"},"image":{"alt":"ઑલ્ટર્નટ ટેક્સ્ટ","border":"બોર્ડર","btnUpload":"આ સર્વરને મોકલવું","button2Img":"તમારે ઈમેજ બટનને સાદી ઈમેજમાં બદલવું છે.","hSpace":"સમસ્તરીય જગ્યા","img2Button":"તમારે સાદી ઈમેજને ઈમેજ બટનમાં બદલવું છે.","infoTab":"ચિત્ર ની જાણકારી","linkTab":"લિંક","lockRatio":"લૉક ગુણોત્તર","menu":"ચિત્રના ગુણ","resetSize":"રીસેટ સાઇઝ","title":"ચિત્રના ગુણ","titleButton":"ચિત્ર બટનના ગુણ","upload":"અપલોડ","urlMissing":"ઈમેજની મૂળ URL છે નહી.","vSpace":"લંબરૂપ જગ્યા","validateBorder":"બોર્ડેર આંકડો હોવો જોઈએ.","validateHSpace":"HSpaceઆંકડો હોવો જોઈએ.","validateVSpace":"VSpace આંકડો હોવો જોઈએ. "},"indent":{"indent":"ઇન્ડેન્ટ, લીટીના આરંભમાં જગ્યા વધારવી","outdent":"ઇન્ડેન્ટ લીટીના આરંભમાં જગ્યા ઘટાડવી"},"smiley":{"options":"સમ્ય્લી વિકલ્પો","title":"સ્માઇલી  પસંદ કરો","toolbar":"સ્માઇલી"},"justify":{"block":"બ્લૉક, અંતરાય જસ્ટિફાઇ","center":"સંકેંદ્રણ/સેંટરિંગ","left":"ડાબી બાજુએ/બાજુ તરફ","right":"જમણી બાજુએ/બાજુ તરફ"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"ઍક્સેસ કી","advanced":"અડ્વાન્સડ","advisoryContentType":"મુખ્ય કન્ટેન્ટ પ્રકાર","advisoryTitle":"મુખ્ય મથાળું","anchor":{"toolbar":"ઍંકર ઇન્સર્ટ/દાખલ કરવી","menu":"ઍંકરના ગુણ","title":"ઍંકરના ગુણ","name":"ઍંકરનું નામ","errorName":"ઍંકરનું નામ ટાઈપ કરો","remove":"સ્થિર નકરવું"},"anchorId":"ઍંકર એલિમન્ટ Id થી પસંદ કરો","anchorName":"ઍંકર નામથી પસંદ કરો","charset":"લિંક રિસૉર્સ કૅરિક્ટર સેટ","cssClasses":"સ્ટાઇલ-શીટ ક્લાસ","download":"Force Download","displayText":"Display Text","emailAddress":"ઈ-મેલ સરનામું","emailBody":"સંદેશ","emailSubject":"ઈ-મેલ વિષય","id":"Id","info":"લિંક ઇન્ફૉ ટૅબ","langCode":"ભાષા લેખવાની પદ્ધતિ","langDir":"ભાષા લેખવાની પદ્ધતિ","langDirLTR":"ડાબે થી જમણે (LTR)","langDirRTL":"જમણે થી ડાબે (RTL)","menu":" લિંક એડિટ/માં ફેરફાર કરવો","name":"નામ","noAnchors":"(ડૉક્યુમન્ટમાં ઍંકરની સંખ્યા)","noEmail":"ઈ-મેલ સરનામું ટાઇપ કરો","noUrl":"લિંક  URL ટાઇપ કરો","other":"<other> <અન્ય>","popupDependent":"ડિપેન્ડન્ટ (Netscape)","popupFeatures":"પૉપ-અપ વિન્ડો ફીચરસૅ","popupFullScreen":"ફુલ સ્ક્રીન (IE)","popupLeft":"ડાબી બાજુ","popupLocationBar":"લોકેશન બાર","popupMenuBar":"મેન્યૂ બાર","popupResizable":"રીસાઈઝએબલ","popupScrollBars":"સ્ક્રોલ બાર","popupStatusBar":"સ્ટૅટસ બાર","popupToolbar":"ટૂલ બાર","popupTop":"જમણી બાજુ","rel":"સંબંધની સ્થિતિ","selectAnchor":"ઍંકર પસંદ કરો","styles":"સ્ટાઇલ","tabIndex":"ટૅબ ઇન્ડેક્સ","target":"ટાર્ગેટ/લક્ષ્ય","targetFrame":"<ફ્રેમ>","targetFrameName":"ટાર્ગેટ ફ્રેમ નું નામ","targetPopup":"<પૉપ-અપ વિન્ડો>","targetPopupName":"પૉપ-અપ વિન્ડો નું નામ","title":"લિંક","toAnchor":"આ પેજનો ઍંકર","toEmail":"ઈ-મેલ","toUrl":"URL","toolbar":"લિંક ઇન્સર્ટ/દાખલ કરવી","type":"લિંક પ્રકાર","unlink":"લિંક કાઢવી","upload":"અપલોડ"},"list":{"bulletedlist":"બુલેટ સૂચિ","numberedlist":"સંખ્યાંકન સૂચિ"},"liststyle":{"armenian":"અરમેનિયન આંકડા પદ્ધતિ","bulletedTitle":"બુલેટેડ લીસ્ટના ગુણ","circle":"વર્તુળ","decimal":"આંકડા (1, 2, 3, etc.)","decimalLeadingZero":"સુન્ય આગળ આંકડા (01, 02, 03, etc.)","disc":"ડિસ્ક","georgian":"ગેઓર્ગિયન આંકડા પદ્ધતિ (an, ban, gan, etc.)","lowerAlpha":"આલ્ફા નાના (a, b, c, d, e, etc.)","lowerGreek":"ગ્રીક નાના (alpha, beta, gamma, etc.)","lowerRoman":"રોમન નાના (i, ii, iii, iv, v, etc.)","none":"કસુ ","notset":"<સેટ નથી>","numberedTitle":"આંકડાના લીસ્ટના ગુણ","square":"ચોરસ","start":"શરુ કરવું","type":"પ્રકાર","upperAlpha":"આલ્ફા મોટા (A, B, C, D, E, etc.)","upperRoman":"રોમન મોટા (I, II, III, IV, V, etc.)","validateStartNumber":"લીસ્ટના સરુઆતનો આંકડો પુરો હોવો જોઈએ."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"મોટું કરવું","minimize":"નાનું કરવું"},"newpage":{"toolbar":"નવુ પાનું"},"pagebreak":{"alt":"નવું પાનું","toolbar":"ઇન્સર્ટ પેજબ્રેક/પાનાને અલગ કરવું/દાખલ કરવું"},"pastetext":{"button":"પેસ્ટ (ટેક્સ્ટ)","title":"પેસ્ટ (ટેક્સ્ટ)"},"pastefromword":{"confirmCleanup":"તમે જે ટેક્ષ્ત્ કોપી કરી રહ્યા છો ટે વર્ડ ની છે. કોપી કરતા પેહલા સાફ કરવી છે?","error":"પેસ્ટ કરેલો ડેટા ઇન્ટરનલ એરર ના લીથે સાફ કરી શકાયો નથી.","title":"પેસ્ટ (વડૅ ટેક્સ્ટ)","toolbar":"પેસ્ટ (વડૅ ટેક્સ્ટ)"},"preview":{"preview":"પૂર્વદર્શન"},"print":{"toolbar":"પ્રિન્ટ"},"removeformat":{"toolbar":"ફૉર્મટ કાઢવું"},"save":{"toolbar":"સેવ"},"selectall":{"toolbar":"બઘું પસંદ કરવું"},"showblocks":{"toolbar":"બ્લૉક બતાવવું"},"sourcearea":{"toolbar":"મૂળ કે પ્રાથમિક દસ્તાવેજ"},"specialchar":{"options":"સ્પેશિઅલ કરેક્ટરના વિકલ્પો","title":"સ્પેશિઅલ વિશિષ્ટ અક્ષર પસંદ કરો","toolbar":"વિશિષ્ટ અક્ષર ઇન્સર્ટ/દાખલ કરવું"},"scayt":{"btn_about":"SCAYT વિષે","btn_dictionaries":"શબ્દકોશ","btn_disable":"SCAYT ડિસેબલ કરવું","btn_enable":"SCAYT એનેબલ કરવું","btn_langs":"ભાષાઓ","btn_options":"વિકલ્પો","text_title":"ટાઈપ કરતા સ્પેલ તપાસો"},"stylescombo":{"label":"શૈલી/રીત","panelTitle":"ફોર્મેટ ","panelTitle1":"બ્લોક ","panelTitle2":"ઈનલાઈન ","panelTitle3":"ઓબ્જેક્ટ પદ્ધતિ"},"table":{"border":"કોઠાની બાજુ(બોર્ડર) સાઇઝ","caption":"મથાળું/કૅપ્શન ","cell":{"menu":"કોષના ખાના","insertBefore":"પહેલાં કોષ ઉમેરવો","insertAfter":"પછી કોષ ઉમેરવો","deleteCell":"કોષ ડિલીટ/કાઢી નાખવો","merge":"કોષ ભેગા કરવા","mergeRight":"જમણી બાજુ ભેગા કરવા","mergeDown":"નીચે ભેગા કરવા","splitHorizontal":"કોષને સમસ્તરીય વિભાજન કરવું","splitVertical":"કોષને સીધું ને ઊભું વિભાજન કરવું","title":"સેલના ગુણ","cellType":"સેલનો પ્રકાર","rowSpan":"આડી કટારની જગ્યા","colSpan":"ઊભી કતારની જગ્યા","wordWrap":"વર્ડ રેપ","hAlign":"સપાટ લાઈનદોરી","vAlign":"ઊભી લાઈનદોરી","alignBaseline":"બસે લાઈન","bgColor":"પાછાળનો રંગ","borderColor":"બોર્ડેર રંગ","data":"સ્વીકૃત માહિતી","header":"મથાળું","yes":"હા","no":"ના","invalidWidth":"સેલની પોહલાઈ આંકડો હોવો જોઈએ.","invalidHeight":"સેલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRowSpan":"રો સ્પાન આંકડો હોવો જોઈએ.","invalidColSpan":"કોલમ સ્પાન આંકડો હોવો જોઈએ.","chooseColor":"પસંદ કરવું"},"cellPad":"સેલ પૅડિંગ","cellSpace":"સેલ અંતર","column":{"menu":"કૉલમ/ઊભી કટાર","insertBefore":"પહેલાં કૉલમ/ઊભી કટાર ઉમેરવી","insertAfter":"પછી કૉલમ/ઊભી કટાર ઉમેરવી","deleteColumn":"કૉલમ/ઊભી કટાર ડિલીટ/કાઢી નાખવી"},"columns":"કૉલમ/ઊભી કટાર","deleteTable":"કોઠો ડિલીટ/કાઢી નાખવું","headers":"મથાળા","headersBoth":"બેવું","headersColumn":"પહેલી ઊભી કટાર","headersNone":"નથી ","headersRow":"પહેલી  કટાર","invalidBorder":"બોર્ડર એક આંકડો હોવો જોઈએ","invalidCellPadding":"સેલની અંદરની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCellSpacing":"સેલ વચ્ચેની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCols":"ઉભી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidHeight":"ટેબલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRows":"આડી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidWidth":"ટેબલની પોહલાઈ આંકડો હોવો જોઈએ.","menu":"ટેબલ, કોઠાનું મથાળું","row":{"menu":"પંક્તિના ખાના","insertBefore":"પહેલાં પંક્તિ ઉમેરવી","insertAfter":"પછી પંક્તિ ઉમેરવી","deleteRow":"પંક્તિઓ ડિલીટ/કાઢી નાખવી"},"rows":"પંક્તિના ખાના","summary":"ટૂંકો એહેવાલ","title":"ટેબલ, કોઠાનું મથાળું","toolbar":"ટેબલ, કોઠો","widthPc":"પ્રતિશત","widthPx":"પિકસલ","widthUnit":"પોહાલાઈ એકમ"},"undo":{"redo":"રિડૂ; પછી હતી એવી સ્થિતિ પાછી લાવવી","undo":"રદ કરવું; પહેલાં હતી એવી સ્થિતિ પાછી લાવવી"},"wsc":{"btnIgnore":"ઇગ્નોર/અવગણના કરવી","btnIgnoreAll":"બધાની ઇગ્નોર/અવગણના કરવી","btnReplace":"બદલવું","btnReplaceAll":"બધા બદલી કરો","btnUndo":"અન્ડૂ","changeTo":"આનાથી બદલવું","errorLoading":"સર્વિસ એપ્લીકેશન લોડ નથી થ: %s.","ieSpellDownload":"સ્પેલ-ચેકર ઇન્સ્ટોલ નથી. શું તમે ડાઉનલોડ કરવા માંગો છો?","manyChanges":"શબ્દની જોડણી/સ્પેલ ચેક પૂર્ણ: %1 શબ્દ બદલયા છે","noChanges":"શબ્દની જોડણી/સ્પેલ ચેક પૂર્ણ: એકપણ શબ્દ બદલયો નથી","noMispell":"શબ્દની જોડણી/સ્પેલ ચેક પૂર્ણ: ખોટી જોડણી મળી નથી","noSuggestions":"- કઇ સજેશન નથી -","notAvailable":"માફ કરશો, આ સુવિધા ઉપલબ્ધ નથી","notInDic":"શબ્દકોશમાં નથી","oneChange":"શબ્દની જોડણી/સ્પેલ ચેક પૂર્ણ: એક શબ્દ બદલયો છે","progress":"શબ્દની જોડણી/સ્પેલ ચેક ચાલુ છે...","title":"સ્પેલ ","toolbar":"જોડણી (સ્પેલિંગ) તપાસવી"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/he.js b/htdocs/includes/ckeditor/ckeditor/lang/he.js
index a1dd35f2dd9..cc5cdca8608 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/he.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/he.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['he']={"editor":"עורך טקסט עשיר","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"לחץ אלט ALT + 0 לעזרה","browseServer":"סייר השרת","url":"כתובת (URL)","protocol":"פרוטוקול","upload":"העלאה","uploadSubmit":"שליחה לשרת","image":"תמונה","flash":"פלאש","form":"טופס","checkbox":"תיבת סימון","radio":"לחצן אפשרויות","textField":"שדה טקסט","textarea":"איזור טקסט","hiddenField":"שדה חבוי","button":"כפתור","select":"שדה בחירה","imageButton":"כפתור תמונה","notSet":"<לא נקבע>","id":"זיהוי (ID)","name":"שם","langDir":"כיוון שפה","langDirLtr":"שמאל לימין (LTR)","langDirRtl":"ימין לשמאל (RTL)","langCode":"קוד שפה","longDescr":"קישור לתיאור מפורט","cssClass":"מחלקת עיצוב (CSS Class)","advisoryTitle":"כותרת מוצעת","cssStyle":"סגנון","ok":"אישור","cancel":"ביטול","close":"סגירה","preview":"תצוגה מקדימה","resize":"יש לגרור בכדי לשנות את הגודל","generalTab":"כללי","advancedTab":"אפשרויות מתקדמות","validateNumberFailed":"הערך חייב להיות מספרי.","confirmNewPage":"כל השינויים שלא נשמרו יאבדו. האם להעלות דף חדש?","confirmCancel":"חלק מהאפשרויות שונו, האם לסגור את הדיאלוג?","options":"אפשרויות","target":"מטרה","targetNew":"חלון חדש (_blank)","targetTop":"החלון העליון ביותר (_top)","targetSelf":"אותו חלון (_self)","targetParent":"חלון האב (_parent)","langDirLTR":"שמאל לימין (LTR)","langDirRTL":"ימין לשמאל (RTL)","styles":"סגנון","cssClasses":"מחלקות גליונות סגנון","width":"רוחב","height":"גובה","align":"יישור","alignLeft":"לשמאל","alignRight":"לימין","alignCenter":"מרכז","alignJustify":"יישור לשוליים","alignTop":"למעלה","alignMiddle":"לאמצע","alignBottom":"לתחתית","alignNone":"None","invalidValue":"ערך לא חוקי.","invalidHeight":"הגובה חייב להיות מספר.","invalidWidth":"הרוחב חייב להיות מספר.","invalidCssLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של CSS (px, %, in, cm, mm, em, ex, pt, או pc).","invalidHtmlLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של HTML (px או %).","invalidInlineStyle":"הערך שצויין לשדה הסגנון חייב להכיל זוג ערכים אחד או יותר בפורמט \"שם : ערך\", מופרדים על ידי נקודה-פסיק.","cssLengthTooltip":"יש להכניס מספר המייצג פיקסלים או מספר עם יחידת גליונות סגנון תקינה (px, %, in, cm, mm, em, ex, pt, או pc).","unavailable":"%1<span class=\"cke_accessibility\">, לא זמין</span>"},"about":{"copy":"Copyright &copy; $1. כל הזכויות שמורות.","dlgTitle":"אודות CKEditor","help":"היכנסו ל$1 לעזרה.","moreInfo":"למידע נוסף בקרו באתרנו:","title":"אודות CKEditor","userGuide":"מדריך המשתמש של CKEditor"},"basicstyles":{"bold":"מודגש","italic":"נטוי","strike":"כתיב מחוק","subscript":"כתיב תחתון","superscript":"כתיב עליון","underline":"קו תחתון"},"bidi":{"ltr":"כיוון טקסט משמאל לימין (LTR)","rtl":"כיוון טקסט מימין לשמאל (RTL)"},"blockquote":{"toolbar":"בלוק ציטוט"},"clipboard":{"copy":"העתקה","copyError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות העתקה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+C).","cut":"גזירה","cutError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות גזירה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+X).","paste":"הדבקה","pasteArea":"איזור הדבקה","pasteMsg":"נא להדביק בתוך הקופסה באמצעות (<b>Ctrl/Cmd+V</b>) וללחוץ על <b>אישור</b>.","securityMsg":"עקב הגדרות אבטחה בדפדפן, לא ניתן לגשת אל לוח הגזירים (Clipboard) בצורה ישירה. נא להדביק שוב בחלון זה.","title":"הדבקה"},"button":{"selectedLabel":"1% (סומן)"},"colorbutton":{"auto":"אוטומטי","bgColorTitle":"צבע רקע","colors":{"000":"שחור","800000":"סגול כהה","8B4513":"חום בהיר","2F4F4F":"אפור צפחה","008080":"כחול-ירוק","000080":"כחול-סגול","4B0082":"אינדיגו","696969":"אפור מעומעם","B22222":"אדום-חום","A52A2A":"חום","DAA520":"כתום זהב","006400":"ירוק כהה","40E0D0":"טורקיז","0000CD":"כחול בינוני","800080":"סגול","808080":"אפור","F00":"אדום","FF8C00":"כתום כהה","FFD700":"זהב","008000":"ירוק","0FF":"ציאן","00F":"כחול","EE82EE":"סגלגל","A9A9A9":"אפור כהה","FFA07A":"כתום-וורוד","FFA500":"כתום","FFFF00":"צהוב","00FF00":"ליים","AFEEEE":"טורקיז בהיר","ADD8E6":"כחול בהיר","DDA0DD":"שזיף","D3D3D3":"אפור בהיר","FFF0F5":"לבנדר מסמיק","FAEBD7":"לבן עתיק","FFFFE0":"צהוב בהיר","F0FFF0":"טל דבש","F0FFFF":"תכלת","F0F8FF":"כחול טיפת מים","E6E6FA":"לבנדר","FFF":"לבן"},"more":"צבעים נוספים...","panelTitle":"צבעים","textColorTitle":"צבע טקסט"},"colordialog":{"clear":"ניקוי","highlight":"סימון","options":"אפשרויות צבע","selected":"בחירה","title":"בחירת צבע"},"templates":{"button":"תבניות","emptyListMsg":"(לא הוגדרו תבניות)","insertOption":"החלפת תוכן ממשי","options":"אפשרויות התבניות","selectPromptMsg":"יש לבחור תבנית לפתיחה בעורך.<br />התוכן המקורי ימחק:","title":"תביות תוכן"},"contextmenu":{"options":"אפשרויות תפריט ההקשר"},"div":{"IdInputLabel":"מזהה (ID)","advisoryTitleInputLabel":"כותרת מוצעת","cssClassInputLabel":"מחלקת עיצוב","edit":"עריכת מיכל (Div)","inlineStyleInputLabel":"סגנון פנימי","langDirLTRLabel":"שמאל לימין (LTR)","langDirLabel":"כיוון שפה","langDirRTLLabel":"ימין לשמאל (RTL)","languageCodeInputLabel":"קוד שפה","remove":"הסרת מיכל (Div)","styleSelectLabel":"סגנון","title":"יצירת מיכל (Div)","toolbar":"יצירת מיכל (Div)"},"toolbar":{"toolbarCollapse":"מזעור סרגל כלים","toolbarExpand":"הרחבת סרגל כלים","toolbarGroups":{"document":"מסמך","clipboard":"לוח הגזירים (Clipboard)/צעד אחרון","editing":"עריכה","forms":"טפסים","basicstyles":"עיצוב בסיסי","paragraph":"פסקה","links":"קישורים","insert":"הכנסה","styles":"עיצוב","colors":"צבעים","tools":"כלים"},"toolbars":"סרגלי כלים של העורך"},"elementspath":{"eleLabel":"עץ האלמנטים","eleTitle":"%1 אלמנט"},"find":{"find":"חיפוש","findOptions":"אפשרויות חיפוש","findWhat":"חיפוש מחרוזת:","matchCase":"הבחנה בין אותיות רשיות לקטנות (Case)","matchCyclic":"התאמה מחזורית","matchWord":"התאמה למילה המלאה","notFoundMsg":"הטקסט המבוקש לא נמצא.","replace":"החלפה","replaceAll":"החלפה בכל העמוד","replaceSuccessMsg":"%1 טקסטים הוחלפו.","replaceWith":"החלפה במחרוזת:","title":"חיפוש והחלפה"},"fakeobjects":{"anchor":"עוגן","flash":"סרטון פלאש","hiddenfield":"שדה חבוי","iframe":"חלון פנימי (iframe)","unknown":"אובייקט לא ידוע"},"flash":{"access":"גישת סקריפט","accessAlways":"תמיד","accessNever":"אף פעם","accessSameDomain":"דומיין זהה","alignAbsBottom":"לתחתית האבסולוטית","alignAbsMiddle":"מרכוז אבסולוטי","alignBaseline":"לקו התחתית","alignTextTop":"לראש הטקסט","bgcolor":"צבע רקע","chkFull":"אפשר חלון מלא","chkLoop":"לולאה","chkMenu":"אפשר תפריט פלאש","chkPlay":"ניגון אוטומטי","flashvars":"משתנים לפלאש","hSpace":"מרווח אופקי","properties":"מאפייני פלאש","propertiesTab":"מאפיינים","quality":"איכות","qualityAutoHigh":"גבוהה אוטומטית","qualityAutoLow":"נמוכה אוטומטית","qualityBest":"מעולה","qualityHigh":"גבוהה","qualityLow":"נמוכה","qualityMedium":"ממוצעת","scale":"גודל","scaleAll":"הצג הכל","scaleFit":"התאמה מושלמת","scaleNoBorder":"ללא גבולות","title":"מאפיני פלאש","vSpace":"מרווח אנכי","validateHSpace":"המרווח האופקי חייב להיות מספר.","validateSrc":"יש להקליד את כתובת סרטון הפלאש (URL)","validateVSpace":"המרווח האנכי חייב להיות מספר.","windowMode":"מצב חלון","windowModeOpaque":"אטום","windowModeTransparent":"שקוף","windowModeWindow":"חלון"},"font":{"fontSize":{"label":"גודל","voiceLabel":"גודל","panelTitle":"גודל"},"label":"גופן","panelTitle":"גופן","voiceLabel":"גופן"},"forms":{"button":{"title":"מאפייני כפתור","text":"טקסט (ערך)","type":"סוג","typeBtn":"כפתור","typeSbm":"שליחה","typeRst":"איפוס"},"checkboxAndRadio":{"checkboxTitle":"מאפייני תיבת סימון","radioTitle":"מאפייני לחצן אפשרויות","value":"ערך","selected":"מסומן","required":"Required"},"form":{"title":"מאפיני טופס","menu":"מאפיני טופס","action":"שלח אל","method":"סוג שליחה","encoding":"קידוד"},"hidden":{"title":"מאפיני שדה חבוי","name":"שם","value":"ערך"},"select":{"title":"מאפייני שדה בחירה","selectInfo":"מידע","opAvail":"אפשרויות זמינות","value":"ערך","size":"גודל","lines":"שורות","chkMulti":"איפשור בחירות מרובות","required":"Required","opText":"טקסט","opValue":"ערך","btnAdd":"הוספה","btnModify":"שינוי","btnUp":"למעלה","btnDown":"למטה","btnSetValue":"קביעה כברירת מחדל","btnDelete":"מחיקה"},"textarea":{"title":"מאפייני איזור טקסט","cols":"עמודות","rows":"שורות"},"textfield":{"title":"מאפייני שדה טקסט","name":"שם","value":"ערך","charWidth":"רוחב לפי תווים","maxChars":"מקסימום תווים","required":"Required","type":"סוג","typeText":"טקסט","typePass":"סיסמה","typeEmail":"דוא\"ל","typeSearch":"חיפוש","typeTel":"מספר טלפון","typeUrl":"כתובת (URL)"}},"format":{"label":"עיצוב","panelTitle":"עיצוב","tag_address":"כתובת","tag_div":"נורמלי (DIV)","tag_h1":"כותרת","tag_h2":"כותרת 2","tag_h3":"כותרת 3","tag_h4":"כותרת 4","tag_h5":"כותרת 5","tag_h6":"כותרת 6","tag_p":"נורמלי","tag_pre":"קוד"},"horizontalrule":{"toolbar":"הוספת קו אופקי"},"iframe":{"border":"הראה מסגרת לחלון","noUrl":"יש להכניס כתובת לחלון.","scrolling":"אפשר פסי גלילה","title":"מאפייני חלון פנימי (iframe)","toolbar":"חלון פנימי (iframe)"},"image":{"alt":"טקסט חלופי","border":"מסגרת","btnUpload":"שליחה לשרת","button2Img":"האם להפוך את תמונת הכפתור לתמונה פשוטה?","hSpace":"מרווח אופקי","img2Button":"האם להפוך את התמונה לכפתור תמונה?","infoTab":"מידע על התמונה","linkTab":"קישור","lockRatio":"נעילת היחס","menu":"תכונות התמונה","resetSize":"איפוס הגודל","title":"מאפייני התמונה","titleButton":"מאפיני כפתור תמונה","upload":"העלאה","urlMissing":"כתובת התמונה חסרה.","vSpace":"מרווח אנכי","validateBorder":"שדה המסגרת חייב להיות מספר שלם.","validateHSpace":"שדה המרווח האופקי חייב להיות מספר שלם.","validateVSpace":"שדה המרווח האנכי חייב להיות מספר שלם."},"indent":{"indent":"הגדלת הזחה","outdent":"הקטנת הזחה"},"smiley":{"options":"אפשרויות סמיילים","title":"הוספת סמיילי","toolbar":"סמיילי"},"justify":{"block":"יישור לשוליים","center":"מרכוז","left":"יישור לשמאל","right":"יישור לימין"},"language":{"button":"צור שפה","remove":"הסר שפה"},"link":{"acccessKey":"מקש גישה","advanced":"אפשרויות מתקדמות","advisoryContentType":"Content Type מוצע","advisoryTitle":"כותרת מוצעת","anchor":{"toolbar":"הוספת/עריכת נקודת עיגון","menu":"מאפייני נקודת עיגון","title":"מאפייני נקודת עיגון","name":"שם לנקודת עיגון","errorName":"יש להקליד שם לנקודת עיגון","remove":"מחיקת נקודת עיגון"},"anchorId":"עפ\"י זיהוי (ID) האלמנט","anchorName":"עפ\"י שם העוגן","charset":"קידוד המשאב המקושר","cssClasses":"גיליונות עיצוב קבוצות","emailAddress":"כתובת הדוא\"ל","emailBody":"גוף ההודעה","emailSubject":"נושא ההודעה","id":"זיהוי (ID)","info":"מידע על הקישור","langCode":"קוד שפה","langDir":"כיוון שפה","langDirLTR":"שמאל לימין (LTR)","langDirRTL":"ימין לשמאל (RTL)","menu":"מאפייני קישור","name":"שם","noAnchors":"(אין עוגנים זמינים בדף)","noEmail":"יש להקליד את כתובת הדוא\"ל","noUrl":"יש להקליד את כתובת הקישור (URL)","other":"<אחר>","popupDependent":"תלוי (Netscape)","popupFeatures":"תכונות החלון הקופץ","popupFullScreen":"מסך מלא (IE)","popupLeft":"מיקום צד שמאל","popupLocationBar":"סרגל כתובת","popupMenuBar":"סרגל תפריט","popupResizable":"שינוי גודל","popupScrollBars":"ניתן לגלילה","popupStatusBar":"סרגל חיווי","popupToolbar":"סרגל הכלים","popupTop":"מיקום צד עליון","rel":"קשר גומלין","selectAnchor":"בחירת עוגן","styles":"סגנון","tabIndex":"מספר טאב","target":"מטרה","targetFrame":"<מסגרת>","targetFrameName":"שם מסגרת היעד","targetPopup":"<חלון קופץ>","targetPopupName":"שם החלון הקופץ","title":"קישור","toAnchor":"עוגן בעמוד זה","toEmail":"דוא\"ל","toUrl":"כתובת (URL)","toolbar":"הוספת/עריכת קישור","type":"סוג קישור","unlink":"הסרת הקישור","upload":"העלאה"},"list":{"bulletedlist":"רשימת נקודות","numberedlist":"רשימה ממוספרת"},"liststyle":{"armenian":"ספרות ארמניות","bulletedTitle":"תכונות רשימת תבליטים","circle":"עיגול ריק","decimal":"ספרות (1, 2, 3 וכו')","decimalLeadingZero":"ספרות עם 0 בהתחלה (01, 02, 03 וכו')","disc":"עיגול מלא","georgian":"ספרות גיאורגיות (an, ban, gan וכו')","lowerAlpha":"אותיות אנגליות קטנות (a, b, c, d, e וכו')","lowerGreek":"אותיות יווניות קטנות (alpha, beta, gamma וכו')","lowerRoman":"ספירה רומית באותיות קטנות (i, ii, iii, iv, v וכו')","none":"ללא","notset":"<לא נקבע>","numberedTitle":"תכונות רשימה ממוספרת","square":"ריבוע","start":"תחילת מספור","type":"סוג","upperAlpha":"אותיות אנגליות גדולות (A, B, C, D, E וכו')","upperRoman":"ספירה רומיות באותיות גדולות (I, II, III, IV, V וכו')","validateStartNumber":"שדה תחילת המספור חייב להכיל מספר שלם."},"magicline":{"title":"הכנס פסקה כאן"},"maximize":{"maximize":"הגדלה למקסימום","minimize":"הקטנה למינימום"},"newpage":{"toolbar":"דף חדש"},"pagebreak":{"alt":"שבירת דף","toolbar":"הוספת שבירת דף"},"pastetext":{"button":"הדבקה כטקסט פשוט","title":"הדבקה כטקסט פשוט"},"pastefromword":{"confirmCleanup":"נראה הטקסט שבכוונתך להדביק מקורו בקובץ וורד. האם ברצונך לנקות אותו טרם ההדבקה?","error":"לא ניתן היה לנקות את המידע בשל תקלה פנימית.","title":"הדבקה מ-Word","toolbar":"הדבקה מ-Word"},"preview":{"preview":"תצוגה מקדימה"},"print":{"toolbar":"הדפסה"},"removeformat":{"toolbar":"הסרת העיצוב"},"save":{"toolbar":"שמירה"},"selectall":{"toolbar":"בחירת הכל"},"showblocks":{"toolbar":"הצגת בלוקים"},"sourcearea":{"toolbar":"מקור"},"specialchar":{"options":"אפשרויות תווים מיוחדים","title":"בחירת תו מיוחד","toolbar":"הוספת תו מיוחד"},"scayt":{"btn_about":"אודות SCAYT","btn_dictionaries":"מילון","btn_disable":"בטל SCAYT","btn_enable":"אפשר SCAYT","btn_langs":"שפות","btn_options":"אפשרויות","text_title":"בדיקת איות בזמן כתיבה (SCAYT)"},"stylescombo":{"label":"סגנון","panelTitle":"סגנונות פורמט","panelTitle1":"סגנונות בלוק","panelTitle2":"סגנונות רצף","panelTitle3":"סגנונות אובייקט"},"table":{"border":"גודל מסגרת","caption":"כיתוב","cell":{"menu":"מאפייני תא","insertBefore":"הוספת תא לפני","insertAfter":"הוספת תא אחרי","deleteCell":"מחיקת תאים","merge":"מיזוג תאים","mergeRight":"מזג ימינה","mergeDown":"מזג למטה","splitHorizontal":"פיצול תא אופקית","splitVertical":"פיצול תא אנכית","title":"תכונות התא","cellType":"סוג התא","rowSpan":"מתיחת השורות","colSpan":"מתיחת התאים","wordWrap":"מניעת גלישת שורות","hAlign":"יישור אופקי","vAlign":"יישור אנכי","alignBaseline":"שורת בסיס","bgColor":"צבע רקע","borderColor":"צבע מסגרת","data":"מידע","header":"כותרת","yes":"כן","no":"לא","invalidWidth":"שדה רוחב התא חייב להיות מספר.","invalidHeight":"שדה גובה התא חייב להיות מספר.","invalidRowSpan":"שדה מתיחת השורות חייב להיות מספר שלם.","invalidColSpan":"שדה מתיחת העמודות חייב להיות מספר שלם.","chooseColor":"בחר"},"cellPad":"ריפוד תא","cellSpace":"מרווח תא","column":{"menu":"עמודה","insertBefore":"הוספת עמודה לפני","insertAfter":"הוספת עמודה אחרי","deleteColumn":"מחיקת עמודות"},"columns":"עמודות","deleteTable":"מחק טבלה","headers":"כותרות","headersBoth":"שניהם","headersColumn":"עמודה ראשונה","headersNone":"אין","headersRow":"שורה ראשונה","invalidBorder":"שדה גודל המסגרת חייב להיות מספר.","invalidCellPadding":"שדה ריפוד התאים חייב להיות מספר חיובי.","invalidCellSpacing":"שדה ריווח התאים חייב להיות מספר חיובי.","invalidCols":"שדה מספר העמודות חייב להיות מספר גדול מ 0.","invalidHeight":"שדה גובה הטבלה חייב להיות מספר.","invalidRows":"שדה מספר השורות חייב להיות מספר גדול מ 0.","invalidWidth":"שדה רוחב הטבלה חייב להיות מספר.","menu":"מאפייני טבלה","row":{"menu":"שורה","insertBefore":"הוספת שורה לפני","insertAfter":"הוספת שורה אחרי","deleteRow":"מחיקת שורות"},"rows":"שורות","summary":"תקציר","title":"מאפייני טבלה","toolbar":"טבלה","widthPc":"אחוז","widthPx":"פיקסלים","widthUnit":"יחידת רוחב"},"undo":{"redo":"חזרה על צעד אחרון","undo":"ביטול צעד אחרון"},"wsc":{"btnIgnore":"התעלמות","btnIgnoreAll":"התעלמות מהכל","btnReplace":"החלפה","btnReplaceAll":"החלפת הכל","btnUndo":"החזרה","changeTo":"שינוי ל","errorLoading":"שגיאה בהעלאת השירות: %s.","ieSpellDownload":"בודק האיות לא מותקן, האם להורידו?","manyChanges":"בדיקות איות הסתיימה: %1 מילים שונו","noChanges":"בדיקות איות הסתיימה: לא שונתה אף מילה","noMispell":"בדיקות איות הסתיימה: לא נמצאו שגיאות כתיב","noSuggestions":"- אין הצעות -","notAvailable":"לא נמצא שירות זמין.","notInDic":"לא נמצא במילון","oneChange":"בדיקות איות הסתיימה: שונתה מילה אחת","progress":"בודק האיות בתהליך בדיקה....","title":"בדיקת איות","toolbar":"בדיקת איות"}};
\ No newline at end of file
+CKEDITOR.lang['he']={"editor":"עורך טקסט עשיר","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"לחץ אלט ALT + 0 לעזרה","browseServer":"סייר השרת","url":"כתובת (URL)","protocol":"פרוטוקול","upload":"העלאה","uploadSubmit":"שליחה לשרת","image":"תמונה","flash":"פלאש","form":"טופס","checkbox":"תיבת סימון","radio":"לחצן אפשרויות","textField":"שדה טקסט","textarea":"איזור טקסט","hiddenField":"שדה חבוי","button":"כפתור","select":"שדה בחירה","imageButton":"כפתור תמונה","notSet":"<לא נקבע>","id":"זיהוי (ID)","name":"שם","langDir":"כיוון שפה","langDirLtr":"שמאל לימין (LTR)","langDirRtl":"ימין לשמאל (RTL)","langCode":"קוד שפה","longDescr":"קישור לתיאור מפורט","cssClass":"מחלקת עיצוב (CSS Class)","advisoryTitle":"כותרת מוצעת","cssStyle":"סגנון","ok":"אישור","cancel":"ביטול","close":"סגירה","preview":"תצוגה מקדימה","resize":"יש לגרור בכדי לשנות את הגודל","generalTab":"כללי","advancedTab":"אפשרויות מתקדמות","validateNumberFailed":"הערך חייב להיות מספרי.","confirmNewPage":"כל השינויים שלא נשמרו יאבדו. האם להעלות דף חדש?","confirmCancel":"חלק מהאפשרויות שונו, האם לסגור את הדיאלוג?","options":"אפשרויות","target":"מטרה","targetNew":"חלון חדש (_blank)","targetTop":"החלון העליון ביותר (_top)","targetSelf":"אותו חלון (_self)","targetParent":"חלון האב (_parent)","langDirLTR":"שמאל לימין (LTR)","langDirRTL":"ימין לשמאל (RTL)","styles":"סגנון","cssClasses":"מחלקות גליונות סגנון","width":"רוחב","height":"גובה","align":"יישור","alignLeft":"לשמאל","alignRight":"לימין","alignCenter":"מרכז","alignJustify":"יישור לשוליים","alignTop":"למעלה","alignMiddle":"לאמצע","alignBottom":"לתחתית","alignNone":"None","invalidValue":"ערך לא חוקי.","invalidHeight":"הגובה חייב להיות מספר.","invalidWidth":"הרוחב חייב להיות מספר.","invalidCssLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של CSS (px, %, in, cm, mm, em, ex, pt, או pc).","invalidHtmlLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של HTML (px או %).","invalidInlineStyle":"הערך שצויין לשדה הסגנון חייב להכיל זוג ערכים אחד או יותר בפורמט \"שם : ערך\", מופרדים על ידי נקודה-פסיק.","cssLengthTooltip":"יש להכניס מספר המייצג פיקסלים או מספר עם יחידת גליונות סגנון תקינה (px, %, in, cm, mm, em, ex, pt, או pc).","unavailable":"%1<span class=\"cke_accessibility\">, לא זמין</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"מחק","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. כל הזכויות שמורות.","dlgTitle":"אודות CKEditor","help":"היכנסו ל$1 לעזרה.","moreInfo":"למידע נוסף בקרו באתרנו:","title":"אודות CKEditor","userGuide":"מדריך המשתמש של CKEditor"},"basicstyles":{"bold":"מודגש","italic":"נטוי","strike":"כתיב מחוק","subscript":"כתיב תחתון","superscript":"כתיב עליון","underline":"קו תחתון"},"bidi":{"ltr":"כיוון טקסט משמאל לימין (LTR)","rtl":"כיוון טקסט מימין לשמאל (RTL)"},"blockquote":{"toolbar":"בלוק ציטוט"},"clipboard":{"copy":"העתקה","copyError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות העתקה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+C).","cut":"גזירה","cutError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות גזירה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+X).","paste":"הדבקה","pasteArea":"איזור הדבקה","pasteMsg":"נא להדביק בתוך הקופסה באמצעות (<b>Ctrl/Cmd+V</b>) וללחוץ על <b>אישור</b>.","securityMsg":"עקב הגדרות אבטחה בדפדפן, לא ניתן לגשת אל לוח הגזירים (Clipboard) בצורה ישירה. נא להדביק שוב בחלון זה.","title":"הדבקה"},"button":{"selectedLabel":"1% (סומן)"},"colorbutton":{"auto":"אוטומטי","bgColorTitle":"צבע רקע","colors":{"000":"שחור","800000":"סגול כהה","8B4513":"חום בהיר","2F4F4F":"אפור צפחה","008080":"כחול-ירוק","000080":"כחול-סגול","4B0082":"אינדיגו","696969":"אפור מעומעם","B22222":"אדום-חום","A52A2A":"חום","DAA520":"כתום זהב","006400":"ירוק כהה","40E0D0":"טורקיז","0000CD":"כחול בינוני","800080":"סגול","808080":"אפור","F00":"אדום","FF8C00":"כתום כהה","FFD700":"זהב","008000":"ירוק","0FF":"ציאן","00F":"כחול","EE82EE":"סגלגל","A9A9A9":"אפור כהה","FFA07A":"כתום-וורוד","FFA500":"כתום","FFFF00":"צהוב","00FF00":"ליים","AFEEEE":"טורקיז בהיר","ADD8E6":"כחול בהיר","DDA0DD":"שזיף","D3D3D3":"אפור בהיר","FFF0F5":"לבנדר מסמיק","FAEBD7":"לבן עתיק","FFFFE0":"צהוב בהיר","F0FFF0":"טל דבש","F0FFFF":"תכלת","F0F8FF":"כחול טיפת מים","E6E6FA":"לבנדר","FFF":"לבן","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"צבעים נוספים...","panelTitle":"צבעים","textColorTitle":"צבע טקסט"},"colordialog":{"clear":"ניקוי","highlight":"סימון","options":"אפשרויות צבע","selected":"בחירה","title":"בחירת צבע"},"templates":{"button":"תבניות","emptyListMsg":"(לא הוגדרו תבניות)","insertOption":"החלפת תוכן ממשי","options":"אפשרויות התבניות","selectPromptMsg":"יש לבחור תבנית לפתיחה בעורך.<br />התוכן המקורי ימחק:","title":"תביות תוכן"},"contextmenu":{"options":"אפשרויות תפריט ההקשר"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"מזהה (ID)","advisoryTitleInputLabel":"כותרת מוצעת","cssClassInputLabel":"מחלקת עיצוב","edit":"עריכת מיכל (Div)","inlineStyleInputLabel":"סגנון פנימי","langDirLTRLabel":"שמאל לימין (LTR)","langDirLabel":"כיוון שפה","langDirRTLLabel":"ימין לשמאל (RTL)","languageCodeInputLabel":"קוד שפה","remove":"הסרת מיכל (Div)","styleSelectLabel":"סגנון","title":"יצירת מיכל (Div)","toolbar":"יצירת מיכל (Div)"},"toolbar":{"toolbarCollapse":"מזעור סרגל כלים","toolbarExpand":"הרחבת סרגל כלים","toolbarGroups":{"document":"מסמך","clipboard":"לוח הגזירים (Clipboard)/צעד אחרון","editing":"עריכה","forms":"טפסים","basicstyles":"עיצוב בסיסי","paragraph":"פסקה","links":"קישורים","insert":"הכנסה","styles":"עיצוב","colors":"צבעים","tools":"כלים"},"toolbars":"סרגלי כלים של העורך"},"elementspath":{"eleLabel":"עץ האלמנטים","eleTitle":"%1 אלמנט"},"find":{"find":"חיפוש","findOptions":"אפשרויות חיפוש","findWhat":"חיפוש מחרוזת:","matchCase":"הבחנה בין אותיות רשיות לקטנות (Case)","matchCyclic":"התאמה מחזורית","matchWord":"התאמה למילה המלאה","notFoundMsg":"הטקסט המבוקש לא נמצא.","replace":"החלפה","replaceAll":"החלפה בכל העמוד","replaceSuccessMsg":"%1 טקסטים הוחלפו.","replaceWith":"החלפה במחרוזת:","title":"חיפוש והחלפה"},"fakeobjects":{"anchor":"עוגן","flash":"סרטון פלאש","hiddenfield":"שדה חבוי","iframe":"חלון פנימי (iframe)","unknown":"אובייקט לא ידוע"},"flash":{"access":"גישת סקריפט","accessAlways":"תמיד","accessNever":"אף פעם","accessSameDomain":"דומיין זהה","alignAbsBottom":"לתחתית האבסולוטית","alignAbsMiddle":"מרכוז אבסולוטי","alignBaseline":"לקו התחתית","alignTextTop":"לראש הטקסט","bgcolor":"צבע רקע","chkFull":"אפשר חלון מלא","chkLoop":"לולאה","chkMenu":"אפשר תפריט פלאש","chkPlay":"ניגון אוטומטי","flashvars":"משתנים לפלאש","hSpace":"מרווח אופקי","properties":"מאפייני פלאש","propertiesTab":"מאפיינים","quality":"איכות","qualityAutoHigh":"גבוהה אוטומטית","qualityAutoLow":"נמוכה אוטומטית","qualityBest":"מעולה","qualityHigh":"גבוהה","qualityLow":"נמוכה","qualityMedium":"ממוצעת","scale":"גודל","scaleAll":"הצג הכל","scaleFit":"התאמה מושלמת","scaleNoBorder":"ללא גבולות","title":"מאפיני פלאש","vSpace":"מרווח אנכי","validateHSpace":"המרווח האופקי חייב להיות מספר.","validateSrc":"יש להקליד את כתובת סרטון הפלאש (URL)","validateVSpace":"המרווח האנכי חייב להיות מספר.","windowMode":"מצב חלון","windowModeOpaque":"אטום","windowModeTransparent":"שקוף","windowModeWindow":"חלון"},"font":{"fontSize":{"label":"גודל","voiceLabel":"גודל","panelTitle":"גודל"},"label":"גופן","panelTitle":"גופן","voiceLabel":"גופן"},"forms":{"button":{"title":"מאפייני כפתור","text":"טקסט (ערך)","type":"סוג","typeBtn":"כפתור","typeSbm":"שליחה","typeRst":"איפוס"},"checkboxAndRadio":{"checkboxTitle":"מאפייני תיבת סימון","radioTitle":"מאפייני לחצן אפשרויות","value":"ערך","selected":"מסומן","required":"Required"},"form":{"title":"מאפיני טופס","menu":"מאפיני טופס","action":"שלח אל","method":"סוג שליחה","encoding":"קידוד"},"hidden":{"title":"מאפיני שדה חבוי","name":"שם","value":"ערך"},"select":{"title":"מאפייני שדה בחירה","selectInfo":"מידע","opAvail":"אפשרויות זמינות","value":"ערך","size":"גודל","lines":"שורות","chkMulti":"איפשור בחירות מרובות","required":"Required","opText":"טקסט","opValue":"ערך","btnAdd":"הוספה","btnModify":"שינוי","btnUp":"למעלה","btnDown":"למטה","btnSetValue":"קביעה כברירת מחדל","btnDelete":"מחיקה"},"textarea":{"title":"מאפייני איזור טקסט","cols":"עמודות","rows":"שורות"},"textfield":{"title":"מאפייני שדה טקסט","name":"שם","value":"ערך","charWidth":"רוחב לפי תווים","maxChars":"מקסימום תווים","required":"Required","type":"סוג","typeText":"טקסט","typePass":"סיסמה","typeEmail":"דוא\"ל","typeSearch":"חיפוש","typeTel":"מספר טלפון","typeUrl":"כתובת (URL)"}},"format":{"label":"עיצוב","panelTitle":"עיצוב","tag_address":"כתובת","tag_div":"נורמלי (DIV)","tag_h1":"כותרת","tag_h2":"כותרת 2","tag_h3":"כותרת 3","tag_h4":"כותרת 4","tag_h5":"כותרת 5","tag_h6":"כותרת 6","tag_p":"נורמלי","tag_pre":"קוד"},"horizontalrule":{"toolbar":"הוספת קו אופקי"},"iframe":{"border":"הראה מסגרת לחלון","noUrl":"יש להכניס כתובת לחלון.","scrolling":"אפשר פסי גלילה","title":"מאפייני חלון פנימי (iframe)","toolbar":"חלון פנימי (iframe)"},"image":{"alt":"טקסט חלופי","border":"מסגרת","btnUpload":"שליחה לשרת","button2Img":"האם להפוך את תמונת הכפתור לתמונה פשוטה?","hSpace":"מרווח אופקי","img2Button":"האם להפוך את התמונה לכפתור תמונה?","infoTab":"מידע על התמונה","linkTab":"קישור","lockRatio":"נעילת היחס","menu":"תכונות התמונה","resetSize":"איפוס הגודל","title":"מאפייני התמונה","titleButton":"מאפיני כפתור תמונה","upload":"העלאה","urlMissing":"כתובת התמונה חסרה.","vSpace":"מרווח אנכי","validateBorder":"שדה המסגרת חייב להיות מספר שלם.","validateHSpace":"שדה המרווח האופקי חייב להיות מספר שלם.","validateVSpace":"שדה המרווח האנכי חייב להיות מספר שלם."},"indent":{"indent":"הגדלת הזחה","outdent":"הקטנת הזחה"},"smiley":{"options":"אפשרויות סמיילים","title":"הוספת סמיילי","toolbar":"סמיילי"},"justify":{"block":"יישור לשוליים","center":"מרכוז","left":"יישור לשמאל","right":"יישור לימין"},"language":{"button":"צור שפה","remove":"הסר שפה"},"link":{"acccessKey":"מקש גישה","advanced":"אפשרויות מתקדמות","advisoryContentType":"Content Type מוצע","advisoryTitle":"כותרת מוצעת","anchor":{"toolbar":"הוספת/עריכת נקודת עיגון","menu":"מאפייני נקודת עיגון","title":"מאפייני נקודת עיגון","name":"שם לנקודת עיגון","errorName":"יש להקליד שם לנקודת עיגון","remove":"מחיקת נקודת עיגון"},"anchorId":"עפ\"י זיהוי (ID) האלמנט","anchorName":"עפ\"י שם העוגן","charset":"קידוד המשאב המקושר","cssClasses":"גיליונות עיצוב קבוצות","download":"Force Download","displayText":"Display Text","emailAddress":"כתובת הדוא\"ל","emailBody":"גוף ההודעה","emailSubject":"נושא ההודעה","id":"זיהוי (ID)","info":"מידע על הקישור","langCode":"קוד שפה","langDir":"כיוון שפה","langDirLTR":"שמאל לימין (LTR)","langDirRTL":"ימין לשמאל (RTL)","menu":"מאפייני קישור","name":"שם","noAnchors":"(אין עוגנים זמינים בדף)","noEmail":"יש להקליד את כתובת הדוא\"ל","noUrl":"יש להקליד את כתובת הקישור (URL)","other":"<אחר>","popupDependent":"תלוי (Netscape)","popupFeatures":"תכונות החלון הקופץ","popupFullScreen":"מסך מלא (IE)","popupLeft":"מיקום צד שמאל","popupLocationBar":"סרגל כתובת","popupMenuBar":"סרגל תפריט","popupResizable":"שינוי גודל","popupScrollBars":"ניתן לגלילה","popupStatusBar":"סרגל חיווי","popupToolbar":"סרגל הכלים","popupTop":"מיקום צד עליון","rel":"קשר גומלין","selectAnchor":"בחירת עוגן","styles":"סגנון","tabIndex":"מספר טאב","target":"מטרה","targetFrame":"<מסגרת>","targetFrameName":"שם מסגרת היעד","targetPopup":"<חלון קופץ>","targetPopupName":"שם החלון הקופץ","title":"קישור","toAnchor":"עוגן בעמוד זה","toEmail":"דוא\"ל","toUrl":"כתובת (URL)","toolbar":"הוספת/עריכת קישור","type":"סוג קישור","unlink":"הסרת הקישור","upload":"העלאה"},"list":{"bulletedlist":"רשימת נקודות","numberedlist":"רשימה ממוספרת"},"liststyle":{"armenian":"ספרות ארמניות","bulletedTitle":"תכונות רשימת תבליטים","circle":"עיגול ריק","decimal":"ספרות (1, 2, 3 וכו')","decimalLeadingZero":"ספרות עם 0 בהתחלה (01, 02, 03 וכו')","disc":"עיגול מלא","georgian":"ספרות גיאורגיות (an, ban, gan וכו')","lowerAlpha":"אותיות אנגליות קטנות (a, b, c, d, e וכו')","lowerGreek":"אותיות יווניות קטנות (alpha, beta, gamma וכו')","lowerRoman":"ספירה רומית באותיות קטנות (i, ii, iii, iv, v וכו')","none":"ללא","notset":"<לא נקבע>","numberedTitle":"תכונות רשימה ממוספרת","square":"ריבוע","start":"תחילת מספור","type":"סוג","upperAlpha":"אותיות אנגליות גדולות (A, B, C, D, E וכו')","upperRoman":"ספירה רומיות באותיות גדולות (I, II, III, IV, V וכו')","validateStartNumber":"שדה תחילת המספור חייב להכיל מספר שלם."},"magicline":{"title":"הכנס פסקה כאן"},"maximize":{"maximize":"הגדלה למקסימום","minimize":"הקטנה למינימום"},"newpage":{"toolbar":"דף חדש"},"pagebreak":{"alt":"שבירת דף","toolbar":"הוספת שבירת דף"},"pastetext":{"button":"הדבקה כטקסט פשוט","title":"הדבקה כטקסט פשוט"},"pastefromword":{"confirmCleanup":"נראה הטקסט שבכוונתך להדביק מקורו בקובץ וורד. האם ברצונך לנקות אותו טרם ההדבקה?","error":"לא ניתן היה לנקות את המידע בשל תקלה פנימית.","title":"הדבקה מ-Word","toolbar":"הדבקה מ-Word"},"preview":{"preview":"תצוגה מקדימה"},"print":{"toolbar":"הדפסה"},"removeformat":{"toolbar":"הסרת העיצוב"},"save":{"toolbar":"שמירה"},"selectall":{"toolbar":"בחירת הכל"},"showblocks":{"toolbar":"הצגת בלוקים"},"sourcearea":{"toolbar":"מקור"},"specialchar":{"options":"אפשרויות תווים מיוחדים","title":"בחירת תו מיוחד","toolbar":"הוספת תו מיוחד"},"scayt":{"btn_about":"אודות SCAYT","btn_dictionaries":"מילון","btn_disable":"בטל SCAYT","btn_enable":"אפשר SCAYT","btn_langs":"שפות","btn_options":"אפשרויות","text_title":"בדיקת איות בזמן כתיבה (SCAYT)"},"stylescombo":{"label":"סגנון","panelTitle":"סגנונות פורמט","panelTitle1":"סגנונות בלוק","panelTitle2":"סגנונות רצף","panelTitle3":"סגנונות אובייקט"},"table":{"border":"גודל מסגרת","caption":"כיתוב","cell":{"menu":"מאפייני תא","insertBefore":"הוספת תא לפני","insertAfter":"הוספת תא אחרי","deleteCell":"מחיקת תאים","merge":"מיזוג תאים","mergeRight":"מזג ימינה","mergeDown":"מזג למטה","splitHorizontal":"פיצול תא אופקית","splitVertical":"פיצול תא אנכית","title":"תכונות התא","cellType":"סוג התא","rowSpan":"מתיחת השורות","colSpan":"מתיחת התאים","wordWrap":"מניעת גלישת שורות","hAlign":"יישור אופקי","vAlign":"יישור אנכי","alignBaseline":"שורת בסיס","bgColor":"צבע רקע","borderColor":"צבע מסגרת","data":"מידע","header":"כותרת","yes":"כן","no":"לא","invalidWidth":"שדה רוחב התא חייב להיות מספר.","invalidHeight":"שדה גובה התא חייב להיות מספר.","invalidRowSpan":"שדה מתיחת השורות חייב להיות מספר שלם.","invalidColSpan":"שדה מתיחת העמודות חייב להיות מספר שלם.","chooseColor":"בחר"},"cellPad":"ריפוד תא","cellSpace":"מרווח תא","column":{"menu":"עמודה","insertBefore":"הוספת עמודה לפני","insertAfter":"הוספת עמודה אחרי","deleteColumn":"מחיקת עמודות"},"columns":"עמודות","deleteTable":"מחק טבלה","headers":"כותרות","headersBoth":"שניהם","headersColumn":"עמודה ראשונה","headersNone":"אין","headersRow":"שורה ראשונה","invalidBorder":"שדה גודל המסגרת חייב להיות מספר.","invalidCellPadding":"שדה ריפוד התאים חייב להיות מספר חיובי.","invalidCellSpacing":"שדה ריווח התאים חייב להיות מספר חיובי.","invalidCols":"שדה מספר העמודות חייב להיות מספר גדול מ 0.","invalidHeight":"שדה גובה הטבלה חייב להיות מספר.","invalidRows":"שדה מספר השורות חייב להיות מספר גדול מ 0.","invalidWidth":"שדה רוחב הטבלה חייב להיות מספר.","menu":"מאפייני טבלה","row":{"menu":"שורה","insertBefore":"הוספת שורה לפני","insertAfter":"הוספת שורה אחרי","deleteRow":"מחיקת שורות"},"rows":"שורות","summary":"תקציר","title":"מאפייני טבלה","toolbar":"טבלה","widthPc":"אחוז","widthPx":"פיקסלים","widthUnit":"יחידת רוחב"},"undo":{"redo":"חזרה על צעד אחרון","undo":"ביטול צעד אחרון"},"wsc":{"btnIgnore":"התעלמות","btnIgnoreAll":"התעלמות מהכל","btnReplace":"החלפה","btnReplaceAll":"החלפת הכל","btnUndo":"החזרה","changeTo":"שינוי ל","errorLoading":"שגיאה בהעלאת השירות: %s.","ieSpellDownload":"בודק האיות לא מותקן, האם להורידו?","manyChanges":"בדיקות איות הסתיימה: %1 מילים שונו","noChanges":"בדיקות איות הסתיימה: לא שונתה אף מילה","noMispell":"בדיקות איות הסתיימה: לא נמצאו שגיאות כתיב","noSuggestions":"- אין הצעות -","notAvailable":"לא נמצא שירות זמין.","notInDic":"לא נמצא במילון","oneChange":"בדיקות איות הסתיימה: שונתה מילה אחת","progress":"בודק האיות בתהליך בדיקה....","title":"בדיקת איות","toolbar":"בדיקת איות"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/lang/hi.js
index 742aad88fd5..7f3a9621b6b 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/hi.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/hi.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['hi']={"editor":"रिच टेक्स्ट एडिटर","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"मदद के लिये ALT 0 दबाए","browseServer":"सर्वर ब्राउज़ करें","url":"URL","protocol":"प्रोटोकॉल","upload":"अपलोड","uploadSubmit":"इसे सर्वर को भेजें","image":"तस्वीर","flash":"फ़्लैश","form":"फ़ॉर्म","checkbox":"चॅक बॉक्स","radio":"रेडिओ बटन","textField":"टेक्स्ट फ़ील्ड","textarea":"टेक्स्ट एरिया","hiddenField":"गुप्त फ़ील्ड","button":"बटन","select":"चुनाव फ़ील्ड","imageButton":"तस्वीर बटन","notSet":"<सॅट नहीं>","id":"Id","name":"नाम","langDir":"भाषा लिखने की दिशा","langDirLtr":"बायें से दायें (LTR)","langDirRtl":"दायें से बायें (RTL)","langCode":"भाषा कोड","longDescr":"अधिक विवरण के लिए URL","cssClass":"स्टाइल-शीट क्लास","advisoryTitle":"परामर्श शीर्शक","cssStyle":"स्टाइल","ok":"ठीक है","cancel":"रद्द करें","close":"Close","preview":"प्रीव्यू","resize":"Resize","generalTab":"सामान्य","advancedTab":"ऍड्वान्स्ड","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"टार्गेट","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"बायें से दायें (LTR)","langDirRTL":"दायें से बायें (RTL)","styles":"स्टाइल","cssClasses":"स्टाइल-शीट क्लास","width":"चौड़ाई","height":"ऊँचाई","align":"ऍलाइन","alignLeft":"दायें","alignRight":"दायें","alignCenter":"बीच में","alignJustify":"ब्लॉक जस्टीफ़ाई","alignTop":"ऊपर","alignMiddle":"मध्य","alignBottom":"नीचे","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"बोल्ड","italic":"इटैलिक","strike":"स्ट्राइक थ्रू","subscript":"अधोलेख","superscript":"अभिलेख","underline":"रेखांकण"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"ब्लॉक-कोट"},"clipboard":{"copy":"कॉपी","copyError":"आपके ब्राआउज़र की सुरक्षा सॅटिन्ग्स ने कॉपी करने की अनुमति नहीं प्रदान की है। (Ctrl/Cmd+C) का प्रयोग करें।","cut":"कट","cutError":"आपके ब्राउज़र की सुरक्षा सॅटिन्ग्स ने कट करने की अनुमति नहीं प्रदान की है। (Ctrl/Cmd+X) का प्रयोग करें।","paste":"पेस्ट","pasteArea":"Paste Area","pasteMsg":"Ctrl/Cmd+V का प्रयोग करके पेस्ट करें और ठीक है करें.","securityMsg":"आपके ब्राउज़र की सुरक्षा आपके ब्राउज़र की सुरKश सैटिंग के कारण, एडिटर आपके क्लिपबोर्ड डेटा को नहीं पा सकता है. आपको उसे इस विन्डो में दोबारा पेस्ट करना होगा.","title":"पेस्ट"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"स्वचालित","bgColorTitle":"बैक्ग्राउन्ड रंग","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"और रंग...","panelTitle":"Colors","textColorTitle":"टेक्स्ट रंग"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"टॅम्प्लेट","emptyListMsg":"(कोई टॅम्प्लेट डिफ़ाइन नहीं किया गया है)","insertOption":"मूल शब्दों को बदलें","options":"Template Options","selectPromptMsg":"ऍडिटर में ओपन करने हेतु टॅम्प्लेट चुनें(वर्तमान कन्टॅन्ट सेव नहीं होंगे):","title":"कन्टेन्ट टॅम्प्लेट"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"परामर्श शीर्शक","cssClassInputLabel":"स्टाइल-शीट क्लास","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"बायें से दायें (LTR)","langDirLabel":"भाषा लिखने की दिशा","langDirRTLLabel":"दायें से बायें (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"स्टाइल","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"एडिटर टूलबार"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"खोजें","findOptions":"Find Options","findWhat":"यह खोजें:","matchCase":"केस मिलायें","matchCyclic":"Match cyclic","matchWord":"पूरा शब्द मिलायें","notFoundMsg":"आपके द्वारा दिया गया टेक्स्ट नहीं मिला","replace":"रीप्लेस","replaceAll":"सभी रिप्लेस करें","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"इससे रिप्लेस करें:","title":"खोजें और बदलें"},"fakeobjects":{"anchor":"ऐंकर इन्सर्ट/संपादन","flash":"Flash Animation","hiddenfield":"गुप्त फ़ील्ड","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs नीचे","alignAbsMiddle":"Abs ऊपर","alignBaseline":"मूल रेखा","alignTextTop":"टेक्स्ट ऊपर","bgcolor":"बैक्ग्राउन्ड रंग","chkFull":"Allow Fullscreen","chkLoop":"लूप","chkMenu":"फ़्लैश मॅन्यू का प्रयोग करें","chkPlay":"ऑटो प्ले","flashvars":"Variables for Flash","hSpace":"हॉरिज़ॉन्टल स्पेस","properties":"फ़्लैश प्रॉपर्टीज़","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"स्केल","scaleAll":"सभी दिखायें","scaleFit":"बिल्कुल फ़िट","scaleNoBorder":"कोई बॉर्डर नहीं","title":"फ़्लैश प्रॉपर्टीज़","vSpace":"वर्टिकल स्पेस","validateHSpace":"HSpace must be a number.","validateSrc":"लिंक URL टाइप करें","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"साइज़","voiceLabel":"Font Size","panelTitle":"साइज़"},"label":"फ़ॉन्ट","panelTitle":"फ़ॉन्ट","voiceLabel":"फ़ॉन्ट"},"forms":{"button":{"title":"बटन प्रॉपर्टीज़","text":"टेक्स्ट (वैल्यू)","type":"प्रकार","typeBtn":"बटन","typeSbm":"सब्मिट","typeRst":"रिसेट"},"checkboxAndRadio":{"checkboxTitle":"चॅक बॉक्स प्रॉपर्टीज़","radioTitle":"रेडिओ बटन प्रॉपर्टीज़","value":"वैल्यू","selected":"सॅलॅक्टॅड","required":"Required"},"form":{"title":"फ़ॉर्म प्रॉपर्टीज़","menu":"फ़ॉर्म प्रॉपर्टीज़","action":"क्रिया","method":"तरीका","encoding":"Encoding"},"hidden":{"title":"गुप्त फ़ील्ड प्रॉपर्टीज़","name":"नाम","value":"वैल्यू"},"select":{"title":"चुनाव फ़ील्ड प्रॉपर्टीज़","selectInfo":"सूचना","opAvail":"उपलब्ध विकल्प","value":"वैल्यू","size":"साइज़","lines":"पंक्तियाँ","chkMulti":"एक से ज्यादा विकल्प चुनने दें","required":"Required","opText":"टेक्स्ट","opValue":"वैल्यू","btnAdd":"जोड़ें","btnModify":"बदलें","btnUp":"ऊपर","btnDown":"नीचे","btnSetValue":"चुनी गई वैल्यू सॅट करें","btnDelete":"डिलीट"},"textarea":{"title":"टेक्स्त एरिया प्रॉपर्टीज़","cols":"कालम","rows":"पंक्तियां"},"textfield":{"title":"टेक्स्ट फ़ील्ड प्रॉपर्टीज़","name":"नाम","value":"वैल्यू","charWidth":"करॅक्टर की चौढ़ाई","maxChars":"अधिकतम करॅक्टर","required":"Required","type":"टाइप","typeText":"टेक्स्ट","typePass":"पास्वर्ड","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"फ़ॉर्मैट","panelTitle":"फ़ॉर्मैट","tag_address":"पता","tag_div":"शीर्षक (DIV)","tag_h1":"शीर्षक 1","tag_h2":"शीर्षक 2","tag_h3":"शीर्षक 3","tag_h4":"शीर्षक 4","tag_h5":"शीर्षक 5","tag_h6":"शीर्षक 6","tag_p":"साधारण","tag_pre":"फ़ॉर्मैटॅड"},"horizontalrule":{"toolbar":"हॉरिज़ॉन्टल रेखा इन्सर्ट करें"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"वैकल्पिक टेक्स्ट","border":"बॉर्डर","btnUpload":"इसे सर्वर को भेजें","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"हॉरिज़ॉन्टल स्पेस","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"तस्वीर की जानकारी","linkTab":"लिंक","lockRatio":"लॉक अनुपात","menu":"तस्वीर प्रॉपर्टीज़","resetSize":"रीसॅट साइज़","title":"तस्वीर प्रॉपर्टीज़","titleButton":"तस्वीर बटन प्रॉपर्टीज़","upload":"अपलोड","urlMissing":"Image source URL is missing.","vSpace":"वर्टिकल स्पेस","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"इन्डॅन्ट बढ़ायें","outdent":"इन्डॅन्ट कम करें"},"smiley":{"options":"Smiley Options","title":"स्माइली इन्सर्ट करें","toolbar":"स्माइली"},"justify":{"block":"ब्लॉक जस्टीफ़ाई","center":"बीच में","left":"बायीं तरफ","right":"दायीं तरफ"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"ऍक्सॅस की","advanced":"ऍड्वान्स्ड","advisoryContentType":"परामर्श कन्टॅन्ट प्रकार","advisoryTitle":"परामर्श शीर्शक","anchor":{"toolbar":"ऐंकर इन्सर्ट/संपादन","menu":"ऐंकर प्रॉपर्टीज़","title":"ऐंकर प्रॉपर्टीज़","name":"ऐंकर का नाम","errorName":"ऐंकर का नाम टाइप करें","remove":"Remove Anchor"},"anchorId":"ऍलीमॅन्ट Id से","anchorName":"ऐंकर नाम से","charset":"लिंक रिसोर्स करॅक्टर सॅट","cssClasses":"स्टाइल-शीट क्लास","emailAddress":"ई-मेल पता","emailBody":"संदेश","emailSubject":"संदेश विषय","id":"Id","info":"लिंक  ","langCode":"भाषा लिखने की दिशा","langDir":"भाषा लिखने की दिशा","langDirLTR":"बायें से दायें (LTR)","langDirRTL":"दायें से बायें (RTL)","menu":"लिंक संपादन","name":"नाम","noAnchors":"(डॉक्यूमॅन्ट में ऐंकर्स की संख्या)","noEmail":"ई-मेल पता टाइप करें","noUrl":"लिंक URL टाइप करें","other":"<अन्य>","popupDependent":"डिपेन्डॅन्ट (Netscape)","popupFeatures":"पॉप-अप विन्डो फ़ीचर्स","popupFullScreen":"फ़ुल स्क्रीन (IE)","popupLeft":"बायीं तरफ","popupLocationBar":"लोकेशन बार","popupMenuBar":"मॅन्यू बार","popupResizable":"आकार बदलने लायक","popupScrollBars":"स्क्रॉल बार","popupStatusBar":"स्टेटस बार","popupToolbar":"टूल बार","popupTop":"दायीं तरफ","rel":"संबंध","selectAnchor":"ऐंकर चुनें","styles":"स्टाइल","tabIndex":"टैब इन्डॅक्स","target":"टार्गेट","targetFrame":"<फ़्रेम>","targetFrameName":"टार्गेट फ़्रेम का नाम","targetPopup":"<पॉप-अप विन्डो>","targetPopupName":"पॉप-अप विन्डो का नाम","title":"लिंक","toAnchor":"इस पेज का ऐंकर","toEmail":"ई-मेल","toUrl":"URL","toolbar":"लिंक इन्सर्ट/संपादन","type":"लिंक प्रकार","unlink":"लिंक हटायें","upload":"अपलोड"},"list":{"bulletedlist":"बुलॅट सूची","numberedlist":"अंकीय सूची"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"मेक्सिमाईज़","minimize":"मिनिमाईज़"},"newpage":{"toolbar":"नया पेज"},"pagebreak":{"alt":"पेज ब्रेक","toolbar":"पेज ब्रेक इन्सर्ट् करें"},"pastetext":{"button":"पेस्ट (सादा टॅक्स्ट)","title":"पेस्ट (सादा टॅक्स्ट)"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"पेस्ट (वर्ड से)","toolbar":"पेस्ट (वर्ड से)"},"preview":{"preview":"प्रीव्यू"},"print":{"toolbar":"प्रिन्ट"},"removeformat":{"toolbar":"फ़ॉर्मैट हटायें"},"save":{"toolbar":"सेव"},"selectall":{"toolbar":"सब सॅलॅक्ट करें"},"showblocks":{"toolbar":"ब्लॉक दिखायें"},"sourcearea":{"toolbar":"सोर्स"},"specialchar":{"options":"विशेष चरित्र विकल्प","title":"विशेष करॅक्टर चुनें","toolbar":"विशेष करॅक्टर इन्सर्ट करें"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"स्टाइल","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"बॉर्डर साइज़","caption":"शीर्षक","cell":{"menu":"खाना","insertBefore":"पहले सैल डालें","insertAfter":"बाद में सैल डालें","deleteCell":"सैल डिलीट करें","merge":"सैल मिलायें","mergeRight":"बाँया विलय","mergeDown":"नीचे विलय करें","splitHorizontal":"सैल को क्षैतिज स्थिति में विभाजित करें","splitVertical":"सैल को लम्बाकार में विभाजित करें","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"सैल पैडिंग","cellSpace":"सैल अंतर","column":{"menu":"कालम","insertBefore":"पहले कालम डालें","insertAfter":"बाद में कालम डालें","deleteColumn":"कालम डिलीट करें"},"columns":"कालम","deleteTable":"टेबल डिलीट करें","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"टेबल प्रॉपर्टीज़","row":{"menu":"पंक्ति","insertBefore":"पहले पंक्ति डालें","insertAfter":"बाद में पंक्ति डालें","deleteRow":"पंक्तियाँ डिलीट करें"},"rows":"पंक्तियाँ","summary":"सारांश","title":"टेबल प्रॉपर्टीज़","toolbar":"टेबल","widthPc":"प्रतिशत","widthPx":"पिक्सैल","widthUnit":"width unit"},"undo":{"redo":"रीडू","undo":"अन्डू"},"wsc":{"btnIgnore":"इग्नोर","btnIgnoreAll":"सभी इग्नोर करें","btnReplace":"रिप्लेस","btnReplaceAll":"सभी रिप्लेस करें","btnUndo":"अन्डू","changeTo":"इसमें बदलें","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"स्पॅल-चॅकर इन्स्टाल नहीं किया गया है। क्या आप इसे डाउनलोड करना चाहेंगे?","manyChanges":"वर्तनी की जाँच : %1 शब्द बदले गये","noChanges":"वर्तनी की जाँच :कोई शब्द नहीं बदला गया","noMispell":"वर्तनी की जाँच : कोई गलत वर्तनी (स्पॅलिंग) नहीं पाई गई","noSuggestions":"- कोई सुझाव नहीं -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"शब्दकोश में नहीं","oneChange":"वर्तनी की जाँच : एक शब्द बदला गया","progress":"वर्तनी की जाँच (स्पॅल-चॅक) जारी है...","title":"Spell Checker","toolbar":"वर्तनी (स्पेलिंग) जाँच"}};
\ No newline at end of file
+CKEDITOR.lang['hi']={"editor":"रिच टेक्स्ट एडिटर","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"मदद के लिये ALT 0 दबाए","browseServer":"सर्वर ब्राउज़ करें","url":"URL","protocol":"प्रोटोकॉल","upload":"अपलोड","uploadSubmit":"इसे सर्वर को भेजें","image":"तस्वीर","flash":"फ़्लैश","form":"फ़ॉर्म","checkbox":"चॅक बॉक्स","radio":"रेडिओ बटन","textField":"टेक्स्ट फ़ील्ड","textarea":"टेक्स्ट एरिया","hiddenField":"गुप्त फ़ील्ड","button":"बटन","select":"चुनाव फ़ील्ड","imageButton":"तस्वीर बटन","notSet":"<सॅट नहीं>","id":"Id","name":"नाम","langDir":"भाषा लिखने की दिशा","langDirLtr":"बायें से दायें (LTR)","langDirRtl":"दायें से बायें (RTL)","langCode":"भाषा कोड","longDescr":"अधिक विवरण के लिए URL","cssClass":"स्टाइल-शीट क्लास","advisoryTitle":"परामर्श शीर्शक","cssStyle":"स्टाइल","ok":"ठीक है","cancel":"रद्द करें","close":"Close","preview":"प्रीव्यू","resize":"Resize","generalTab":"सामान्य","advancedTab":"ऍड्वान्स्ड","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"टार्गेट","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"बायें से दायें (LTR)","langDirRTL":"दायें से बायें (RTL)","styles":"स्टाइल","cssClasses":"स्टाइल-शीट क्लास","width":"चौड़ाई","height":"ऊँचाई","align":"ऍलाइन","alignLeft":"दायें","alignRight":"दायें","alignCenter":"बीच में","alignJustify":"ब्लॉक जस्टीफ़ाई","alignTop":"ऊपर","alignMiddle":"मध्य","alignBottom":"नीचे","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"बोल्ड","italic":"इटैलिक","strike":"स्ट्राइक थ्रू","subscript":"अधोलेख","superscript":"अभिलेख","underline":"रेखांकण"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"ब्लॉक-कोट"},"clipboard":{"copy":"कॉपी","copyError":"आपके ब्राआउज़र की सुरक्षा सॅटिन्ग्स ने कॉपी करने की अनुमति नहीं प्रदान की है। (Ctrl/Cmd+C) का प्रयोग करें।","cut":"कट","cutError":"आपके ब्राउज़र की सुरक्षा सॅटिन्ग्स ने कट करने की अनुमति नहीं प्रदान की है। (Ctrl/Cmd+X) का प्रयोग करें।","paste":"पेस्ट","pasteArea":"Paste Area","pasteMsg":"Ctrl/Cmd+V का प्रयोग करके पेस्ट करें और ठीक है करें.","securityMsg":"आपके ब्राउज़र की सुरक्षा आपके ब्राउज़र की सुरKश सैटिंग के कारण, एडिटर आपके क्लिपबोर्ड डेटा को नहीं पा सकता है. आपको उसे इस विन्डो में दोबारा पेस्ट करना होगा.","title":"पेस्ट"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"स्वचालित","bgColorTitle":"बैक्ग्राउन्ड रंग","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"और रंग...","panelTitle":"Colors","textColorTitle":"टेक्स्ट रंग"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"टॅम्प्लेट","emptyListMsg":"(कोई टॅम्प्लेट डिफ़ाइन नहीं किया गया है)","insertOption":"मूल शब्दों को बदलें","options":"Template Options","selectPromptMsg":"ऍडिटर में ओपन करने हेतु टॅम्प्लेट चुनें(वर्तमान कन्टॅन्ट सेव नहीं होंगे):","title":"कन्टेन्ट टॅम्प्लेट"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"परामर्श शीर्शक","cssClassInputLabel":"स्टाइल-शीट क्लास","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"बायें से दायें (LTR)","langDirLabel":"भाषा लिखने की दिशा","langDirRTLLabel":"दायें से बायें (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"स्टाइल","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"एडिटर टूलबार"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"खोजें","findOptions":"Find Options","findWhat":"यह खोजें:","matchCase":"केस मिलायें","matchCyclic":"Match cyclic","matchWord":"पूरा शब्द मिलायें","notFoundMsg":"आपके द्वारा दिया गया टेक्स्ट नहीं मिला","replace":"रीप्लेस","replaceAll":"सभी रिप्लेस करें","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"इससे रिप्लेस करें:","title":"खोजें और बदलें"},"fakeobjects":{"anchor":"ऐंकर इन्सर्ट/संपादन","flash":"Flash Animation","hiddenfield":"गुप्त फ़ील्ड","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs नीचे","alignAbsMiddle":"Abs ऊपर","alignBaseline":"मूल रेखा","alignTextTop":"टेक्स्ट ऊपर","bgcolor":"बैक्ग्राउन्ड रंग","chkFull":"Allow Fullscreen","chkLoop":"लूप","chkMenu":"फ़्लैश मॅन्यू का प्रयोग करें","chkPlay":"ऑटो प्ले","flashvars":"Variables for Flash","hSpace":"हॉरिज़ॉन्टल स्पेस","properties":"फ़्लैश प्रॉपर्टीज़","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"स्केल","scaleAll":"सभी दिखायें","scaleFit":"बिल्कुल फ़िट","scaleNoBorder":"कोई बॉर्डर नहीं","title":"फ़्लैश प्रॉपर्टीज़","vSpace":"वर्टिकल स्पेस","validateHSpace":"HSpace must be a number.","validateSrc":"लिंक URL टाइप करें","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"साइज़","voiceLabel":"Font Size","panelTitle":"साइज़"},"label":"फ़ॉन्ट","panelTitle":"फ़ॉन्ट","voiceLabel":"फ़ॉन्ट"},"forms":{"button":{"title":"बटन प्रॉपर्टीज़","text":"टेक्स्ट (वैल्यू)","type":"प्रकार","typeBtn":"बटन","typeSbm":"सब्मिट","typeRst":"रिसेट"},"checkboxAndRadio":{"checkboxTitle":"चॅक बॉक्स प्रॉपर्टीज़","radioTitle":"रेडिओ बटन प्रॉपर्टीज़","value":"वैल्यू","selected":"सॅलॅक्टॅड","required":"Required"},"form":{"title":"फ़ॉर्म प्रॉपर्टीज़","menu":"फ़ॉर्म प्रॉपर्टीज़","action":"क्रिया","method":"तरीका","encoding":"Encoding"},"hidden":{"title":"गुप्त फ़ील्ड प्रॉपर्टीज़","name":"नाम","value":"वैल्यू"},"select":{"title":"चुनाव फ़ील्ड प्रॉपर्टीज़","selectInfo":"सूचना","opAvail":"उपलब्ध विकल्प","value":"वैल्यू","size":"साइज़","lines":"पंक्तियाँ","chkMulti":"एक से ज्यादा विकल्प चुनने दें","required":"Required","opText":"टेक्स्ट","opValue":"वैल्यू","btnAdd":"जोड़ें","btnModify":"बदलें","btnUp":"ऊपर","btnDown":"नीचे","btnSetValue":"चुनी गई वैल्यू सॅट करें","btnDelete":"डिलीट"},"textarea":{"title":"टेक्स्त एरिया प्रॉपर्टीज़","cols":"कालम","rows":"पंक्तियां"},"textfield":{"title":"टेक्स्ट फ़ील्ड प्रॉपर्टीज़","name":"नाम","value":"वैल्यू","charWidth":"करॅक्टर की चौढ़ाई","maxChars":"अधिकतम करॅक्टर","required":"Required","type":"टाइप","typeText":"टेक्स्ट","typePass":"पास्वर्ड","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"फ़ॉर्मैट","panelTitle":"फ़ॉर्मैट","tag_address":"पता","tag_div":"शीर्षक (DIV)","tag_h1":"शीर्षक 1","tag_h2":"शीर्षक 2","tag_h3":"शीर्षक 3","tag_h4":"शीर्षक 4","tag_h5":"शीर्षक 5","tag_h6":"शीर्षक 6","tag_p":"साधारण","tag_pre":"फ़ॉर्मैटॅड"},"horizontalrule":{"toolbar":"हॉरिज़ॉन्टल रेखा इन्सर्ट करें"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"वैकल्पिक टेक्स्ट","border":"बॉर्डर","btnUpload":"इसे सर्वर को भेजें","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"हॉरिज़ॉन्टल स्पेस","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"तस्वीर की जानकारी","linkTab":"लिंक","lockRatio":"लॉक अनुपात","menu":"तस्वीर प्रॉपर्टीज़","resetSize":"रीसॅट साइज़","title":"तस्वीर प्रॉपर्टीज़","titleButton":"तस्वीर बटन प्रॉपर्टीज़","upload":"अपलोड","urlMissing":"Image source URL is missing.","vSpace":"वर्टिकल स्पेस","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"इन्डॅन्ट बढ़ायें","outdent":"इन्डॅन्ट कम करें"},"smiley":{"options":"Smiley Options","title":"स्माइली इन्सर्ट करें","toolbar":"स्माइली"},"justify":{"block":"ब्लॉक जस्टीफ़ाई","center":"बीच में","left":"बायीं तरफ","right":"दायीं तरफ"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"ऍक्सॅस की","advanced":"ऍड्वान्स्ड","advisoryContentType":"परामर्श कन्टॅन्ट प्रकार","advisoryTitle":"परामर्श शीर्शक","anchor":{"toolbar":"ऐंकर इन्सर्ट/संपादन","menu":"ऐंकर प्रॉपर्टीज़","title":"ऐंकर प्रॉपर्टीज़","name":"ऐंकर का नाम","errorName":"ऐंकर का नाम टाइप करें","remove":"Remove Anchor"},"anchorId":"ऍलीमॅन्ट Id से","anchorName":"ऐंकर नाम से","charset":"लिंक रिसोर्स करॅक्टर सॅट","cssClasses":"स्टाइल-शीट क्लास","download":"Force Download","displayText":"Display Text","emailAddress":"ई-मेल पता","emailBody":"संदेश","emailSubject":"संदेश विषय","id":"Id","info":"लिंक  ","langCode":"भाषा लिखने की दिशा","langDir":"भाषा लिखने की दिशा","langDirLTR":"बायें से दायें (LTR)","langDirRTL":"दायें से बायें (RTL)","menu":"लिंक संपादन","name":"नाम","noAnchors":"(डॉक्यूमॅन्ट में ऐंकर्स की संख्या)","noEmail":"ई-मेल पता टाइप करें","noUrl":"लिंक URL टाइप करें","other":"<अन्य>","popupDependent":"डिपेन्डॅन्ट (Netscape)","popupFeatures":"पॉप-अप विन्डो फ़ीचर्स","popupFullScreen":"फ़ुल स्क्रीन (IE)","popupLeft":"बायीं तरफ","popupLocationBar":"लोकेशन बार","popupMenuBar":"मॅन्यू बार","popupResizable":"आकार बदलने लायक","popupScrollBars":"स्क्रॉल बार","popupStatusBar":"स्टेटस बार","popupToolbar":"टूल बार","popupTop":"दायीं तरफ","rel":"संबंध","selectAnchor":"ऐंकर चुनें","styles":"स्टाइल","tabIndex":"टैब इन्डॅक्स","target":"टार्गेट","targetFrame":"<फ़्रेम>","targetFrameName":"टार्गेट फ़्रेम का नाम","targetPopup":"<पॉप-अप विन्डो>","targetPopupName":"पॉप-अप विन्डो का नाम","title":"लिंक","toAnchor":"इस पेज का ऐंकर","toEmail":"ई-मेल","toUrl":"URL","toolbar":"लिंक इन्सर्ट/संपादन","type":"लिंक प्रकार","unlink":"लिंक हटायें","upload":"अपलोड"},"list":{"bulletedlist":"बुलॅट सूची","numberedlist":"अंकीय सूची"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"मेक्सिमाईज़","minimize":"मिनिमाईज़"},"newpage":{"toolbar":"नया पेज"},"pagebreak":{"alt":"पेज ब्रेक","toolbar":"पेज ब्रेक इन्सर्ट् करें"},"pastetext":{"button":"पेस्ट (सादा टॅक्स्ट)","title":"पेस्ट (सादा टॅक्स्ट)"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"पेस्ट (वर्ड से)","toolbar":"पेस्ट (वर्ड से)"},"preview":{"preview":"प्रीव्यू"},"print":{"toolbar":"प्रिन्ट"},"removeformat":{"toolbar":"फ़ॉर्मैट हटायें"},"save":{"toolbar":"सेव"},"selectall":{"toolbar":"सब सॅलॅक्ट करें"},"showblocks":{"toolbar":"ब्लॉक दिखायें"},"sourcearea":{"toolbar":"सोर्स"},"specialchar":{"options":"विशेष चरित्र विकल्प","title":"विशेष करॅक्टर चुनें","toolbar":"विशेष करॅक्टर इन्सर्ट करें"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"स्टाइल","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"बॉर्डर साइज़","caption":"शीर्षक","cell":{"menu":"खाना","insertBefore":"पहले सैल डालें","insertAfter":"बाद में सैल डालें","deleteCell":"सैल डिलीट करें","merge":"सैल मिलायें","mergeRight":"बाँया विलय","mergeDown":"नीचे विलय करें","splitHorizontal":"सैल को क्षैतिज स्थिति में विभाजित करें","splitVertical":"सैल को लम्बाकार में विभाजित करें","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"सैल पैडिंग","cellSpace":"सैल अंतर","column":{"menu":"कालम","insertBefore":"पहले कालम डालें","insertAfter":"बाद में कालम डालें","deleteColumn":"कालम डिलीट करें"},"columns":"कालम","deleteTable":"टेबल डिलीट करें","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"टेबल प्रॉपर्टीज़","row":{"menu":"पंक्ति","insertBefore":"पहले पंक्ति डालें","insertAfter":"बाद में पंक्ति डालें","deleteRow":"पंक्तियाँ डिलीट करें"},"rows":"पंक्तियाँ","summary":"सारांश","title":"टेबल प्रॉपर्टीज़","toolbar":"टेबल","widthPc":"प्रतिशत","widthPx":"पिक्सैल","widthUnit":"width unit"},"undo":{"redo":"रीडू","undo":"अन्डू"},"wsc":{"btnIgnore":"इग्नोर","btnIgnoreAll":"सभी इग्नोर करें","btnReplace":"रिप्लेस","btnReplaceAll":"सभी रिप्लेस करें","btnUndo":"अन्डू","changeTo":"इसमें बदलें","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"स्पॅल-चॅकर इन्स्टाल नहीं किया गया है। क्या आप इसे डाउनलोड करना चाहेंगे?","manyChanges":"वर्तनी की जाँच : %1 शब्द बदले गये","noChanges":"वर्तनी की जाँच :कोई शब्द नहीं बदला गया","noMispell":"वर्तनी की जाँच : कोई गलत वर्तनी (स्पॅलिंग) नहीं पाई गई","noSuggestions":"- कोई सुझाव नहीं -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"शब्दकोश में नहीं","oneChange":"वर्तनी की जाँच : एक शब्द बदला गया","progress":"वर्तनी की जाँच (स्पॅल-चॅक) जारी है...","title":"Spell Checker","toolbar":"वर्तनी (स्पेलिंग) जाँच"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/lang/hr.js
index 511b23b55a5..90598c0067b 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/hr.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/hr.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['hr']={"editor":"Bogati uređivač teksta, %1","editorPanel":"Ploča Bogatog Uređivača Teksta","common":{"editorHelp":"Pritisni ALT 0 za pomoć","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","flash":"Flash","form":"Forma","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smjer jezika","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Kôd jezika","longDescr":"Dugački opis URL","cssClass":"Klase stilova","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Poništi","close":"Zatvori","preview":"Pregledaj","resize":"Povuci za promjenu veličine","generalTab":"Općenito","advancedTab":"Napredno","validateNumberFailed":"Ova vrijednost nije broj.","confirmNewPage":"Sve napravljene promjene će biti izgubljene ukoliko ih niste snimili. Sigurno želite učitati novu stranicu?","confirmCancel":"Neke od opcija su promjenjene. Sigurno želite zatvoriti ovaj prozor?","options":"Opcije","target":"Odredište","targetNew":"Novi prozor (_blank)","targetTop":"Vršni prozor (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Roditeljski prozor (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase stilova","width":"Širina","height":"Visina","align":"Poravnanje","alignLeft":"Lijevo","alignRight":"Desno","alignCenter":"Središnje","alignJustify":"Blok poravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dolje","alignNone":"None","invalidValue":"Neispravna vrijednost.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidCssLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih CSS mjernih jedinica (px, %, in, cm, mm, em, ex, pt ili pc).","invalidHtmlLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih HTML mjernih jedinica (px ili %).","invalidInlineStyle":"Vrijednost za linijski stil mora sadržavati jednu ili više definicija s formatom \"naziv:vrijednost\", odvojenih točka-zarezom.","cssLengthTooltip":"Unesite broj za vrijednost u pikselima ili broj s važećim CSS mjernim jedinicama (px, %, in, cm, mm, em, ex, pt ili pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupno</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O CKEditoru","help":"Provjeri $1 za pomoć.","moreInfo":"Za informacije o licencama posjetite našu web stranicu:","title":"O CKEditoru","userGuide":"Vodič za CKEditor korisnike"},"basicstyles":{"bold":"Podebljaj","italic":"Ukosi","strike":"Precrtano","subscript":"Subscript","superscript":"Superscript","underline":"Potcrtano"},"bidi":{"ltr":"Smjer teksta s lijeva na desno","rtl":"Smjer teksta s desna na lijevo"},"blockquote":{"toolbar":"Blockquote"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog izrezivanja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+X).","paste":"Zalijepi","pasteArea":"Prostor za ljepljenje","pasteMsg":"Molimo zaljepite unutar doljnjeg okvira koristeći tipkovnicu (<STRONG>Ctrl/Cmd+V</STRONG>) i kliknite <STRONG>OK</STRONG>.","securityMsg":"Zbog sigurnosnih postavki Vašeg pretraživača, editor nema direktan pristup Vašem međuspremniku. Potrebno je ponovno zalijepiti tekst u ovaj prozor.","title":"Zalijepi"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatski","bgColorTitle":"Boja pozadine","colors":{"000":"Crna","800000":"Kesten","8B4513":"Smeđa","2F4F4F":"Tamno siva","008080":"Teal","000080":"Mornarska","4B0082":"Indigo","696969":"Tamno siva","B22222":"Vatrena cigla","A52A2A":"Smeđa","DAA520":"Zlatna","006400":"Tamno zelena","40E0D0":"Tirkizna","0000CD":"Srednje plava","800080":"Ljubičasta","808080":"Siva","F00":"Crvena","FF8C00":"Tamno naranđasta","FFD700":"Zlatna","008000":"Zelena","0FF":"Cijan","00F":"Plava","EE82EE":"Ljubičasta","A9A9A9":"Mutno siva","FFA07A":"Svijetli losos","FFA500":"Naranđasto","FFFF00":"Žuto","00FF00":"Limun","AFEEEE":"Blijedo tirkizna","ADD8E6":"Svijetlo plava","DDA0DD":"Šljiva","D3D3D3":"Svijetlo siva","FFF0F5":"Lavanda rumeno","FAEBD7":"Antikno bijela","FFFFE0":"Svijetlo žuta","F0FFF0":"Med","F0FFFF":"Azurna","F0F8FF":"Alice plava","E6E6FA":"Lavanda","FFF":"Bijela"},"more":"Više boja...","panelTitle":"Boje","textColorTitle":"Boja teksta"},"colordialog":{"clear":"Očisti","highlight":"Istaknuto","options":"Opcije boje","selected":"Odabrana boja","title":"Odaberi boju"},"templates":{"button":"Predlošci","emptyListMsg":"(Nema definiranih predložaka)","insertOption":"Zamijeni trenutne sadržaje","options":"Opcije predložaka","selectPromptMsg":"Molimo odaberite predložak koji želite otvoriti<br>(stvarni sadržaj će biti izgubljen):","title":"Predlošci sadržaja"},"contextmenu":{"options":"Opcije izbornika"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Savjetodavni naslov","cssClassInputLabel":"Klase stilova","edit":"Uredi DIV","inlineStyleInputLabel":"Stil u liniji","langDirLTRLabel":"S lijeva na desno (LTR)","langDirLabel":"Smjer jezika","langDirRTLLabel":"S desna na lijevo (RTL)","languageCodeInputLabel":"Jezični kod","remove":"Ukloni DIV","styleSelectLabel":"Stil","title":"Napravi DIV kontejner","toolbar":"Napravi DIV kontejner"},"toolbar":{"toolbarCollapse":"Smanji alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Dokument","clipboard":"Međuspremnik/Poništi","editing":"Uređivanje","forms":"Forme","basicstyles":"Osnovni stilovi","paragraph":"Paragraf","links":"Veze","insert":"Umetni","styles":"Stilovi","colors":"Boje","tools":"Alatke"},"toolbars":"Alatne trake uređivača teksta"},"elementspath":{"eleLabel":"Putanja elemenata","eleTitle":"%1 element"},"find":{"find":"Pronađi","findOptions":"Opcije traženja","findWhat":"Pronađi:","matchCase":"Usporedi mala/velika slova","matchCyclic":"Usporedi kružno","matchWord":"Usporedi cijele riječi","notFoundMsg":"Traženi tekst nije pronađen.","replace":"Zamijeni","replaceAll":"Zamijeni sve","replaceSuccessMsg":"Zamijenjeno %1 pojmova.","replaceWith":"Zamijeni s:","title":"Pronađi i zamijeni"},"fakeobjects":{"anchor":"Sidro","flash":"Flash animacija","hiddenfield":"Sakriveno polje","iframe":"IFrame","unknown":"Nepoznati objekt"},"flash":{"access":"Script Access","accessAlways":"Uvijek","accessNever":"Nikad","accessSameDomain":"Ista domena","alignAbsBottom":"Abs dolje","alignAbsMiddle":"Abs sredina","alignBaseline":"Bazno","alignTextTop":"Vrh teksta","bgcolor":"Boja pozadine","chkFull":"Omogući Fullscreen","chkLoop":"Ponavljaj","chkMenu":"Omogući Flash izbornik","chkPlay":"Auto Play","flashvars":"Varijable za Flash","hSpace":"HSpace","properties":"Flash svojstva","propertiesTab":"Svojstva","quality":"Kvaliteta","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Omjer","scaleAll":"Prikaži sve","scaleFit":"Točna veličina","scaleNoBorder":"Bez okvira","title":"Flash svojstva","vSpace":"VSpace","validateHSpace":"HSpace mora biti broj.","validateSrc":"Molimo upišite URL link","validateVSpace":"VSpace mora biti broj.","windowMode":"Vrsta prozora","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Veličina","voiceLabel":"Veličina slova","panelTitle":"Veličina"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"forms":{"button":{"title":"Button svojstva","text":"Tekst (vrijednost)","type":"Vrsta","typeBtn":"Gumb","typeSbm":"Pošalji","typeRst":"Poništi"},"checkboxAndRadio":{"checkboxTitle":"Checkbox svojstva","radioTitle":"Radio Button svojstva","value":"Vrijednost","selected":"Odabrano","required":"Required"},"form":{"title":"Form svojstva","menu":"Form svojstva","action":"Akcija","method":"Metoda","encoding":"Encoding"},"hidden":{"title":"Hidden Field svojstva","name":"Ime","value":"Vrijednost"},"select":{"title":"Selection svojstva","selectInfo":"Info","opAvail":"Dostupne opcije","value":"Vrijednost","size":"Veličina","lines":"linija","chkMulti":"Dozvoli višestruki odabir","required":"Required","opText":"Tekst","opValue":"Vrijednost","btnAdd":"Dodaj","btnModify":"Promijeni","btnUp":"Gore","btnDown":"Dolje","btnSetValue":"Postavi kao odabranu vrijednost","btnDelete":"Obriši"},"textarea":{"title":"Textarea svojstva","cols":"Kolona","rows":"Redova"},"textfield":{"title":"Text Field svojstva","name":"Ime","value":"Vrijednost","charWidth":"Širina","maxChars":"Najviše karaktera","required":"Required","type":"Vrsta","typeText":"Tekst","typePass":"Šifra","typeEmail":"Email","typeSearch":"Traži","typeTel":"Broj telefona","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatirano"},"horizontalrule":{"toolbar":"Ubaci vodoravnu liniju"},"iframe":{"border":"Prikaži okvir IFrame-a","noUrl":"Unesite URL iframe-a","scrolling":"Omogući trake za skrolanje","title":"IFrame svojstva","toolbar":"IFrame"},"image":{"alt":"Alternativni tekst","border":"Okvir","btnUpload":"Pošalji na server","button2Img":"Želite li promijeniti odabrani gumb u jednostavnu sliku?","hSpace":"HSpace","img2Button":"Želite li promijeniti odabranu sliku u gumb?","infoTab":"Info slike","linkTab":"Link","lockRatio":"Zaključaj odnos","menu":"Svojstva slika","resetSize":"Obriši veličinu","title":"Svojstva slika","titleButton":"Image Button svojstva","upload":"Pošalji","urlMissing":"Nedostaje URL slike.","vSpace":"VSpace","validateBorder":"Okvir mora biti cijeli broj.","validateHSpace":"HSpace mora biti cijeli broj","validateVSpace":"VSpace mora biti cijeli broj."},"indent":{"indent":"Pomakni udesno","outdent":"Pomakni ulijevo"},"smiley":{"options":"Opcije smješka","title":"Ubaci smješka","toolbar":"Smješko"},"justify":{"block":"Blok poravnanje","center":"Središnje poravnanje","left":"Lijevo poravnanje","right":"Desno poravnanje"},"language":{"button":"Namjesti jezik","remove":"Makni jezik"},"link":{"acccessKey":"Pristupna tipka","advanced":"Napredno","advisoryContentType":"Advisory vrsta sadržaja","advisoryTitle":"Advisory naslov","anchor":{"toolbar":"Ubaci/promijeni sidro","menu":"Svojstva sidra","title":"Svojstva sidra","name":"Ime sidra","errorName":"Molimo unesite ime sidra","remove":"Ukloni sidro"},"anchorId":"Po Id elementa","anchorName":"Po nazivu sidra","charset":"Kodna stranica povezanih resursa","cssClasses":"Stylesheet klase","emailAddress":"E-Mail adresa","emailBody":"Sadržaj poruke","emailSubject":"Naslov","id":"Id","info":"Link Info","langCode":"Smjer jezika","langDir":"Smjer jezika","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","menu":"Promijeni link","name":"Naziv","noAnchors":"(Nema dostupnih sidra)","noEmail":"Molimo upišite e-mail adresu","noUrl":"Molimo upišite URL link","other":"<drugi>","popupDependent":"Ovisno (Netscape)","popupFeatures":"Mogućnosti popup prozora","popupFullScreen":"Cijeli ekran (IE)","popupLeft":"Lijeva pozicija","popupLocationBar":"Traka za lokaciju","popupMenuBar":"Izborna traka","popupResizable":"Promjenjiva veličina","popupScrollBars":"Scroll traka","popupStatusBar":"Statusna traka","popupToolbar":"Traka s alatima","popupTop":"Gornja pozicija","rel":"Veza","selectAnchor":"Odaberi sidro","styles":"Stil","tabIndex":"Tab Indeks","target":"Meta","targetFrame":"<okvir>","targetFrameName":"Ime ciljnog okvira","targetPopup":"<popup prozor>","targetPopupName":"Naziv popup prozora","title":"Link","toAnchor":"Sidro na ovoj stranici","toEmail":"E-Mail","toUrl":"URL","toolbar":"Ubaci/promijeni link","type":"Link vrsta","unlink":"Ukloni link","upload":"Pošalji"},"list":{"bulletedlist":"Obična lista","numberedlist":"Brojčana lista"},"liststyle":{"armenian":"Armenijska numeracija","bulletedTitle":"Svojstva liste","circle":"Krug","decimal":"Decimalna numeracija (1, 2, 3, itd.)","decimalLeadingZero":"Decimalna s vodećom nulom (01, 02, 03, itd)","disc":"Disk","georgian":"Gruzijska numeracija(an, ban, gan, etc.)","lowerAlpha":"Znakovi mala slova (a, b, c, d, e, itd.)","lowerGreek":"Grčka numeracija mala slova (alfa, beta, gama, itd).","lowerRoman":"Romanska numeracija mala slova (i, ii, iii, iv, v, itd.)","none":"Bez","notset":"<nije određen>","numberedTitle":"Svojstva brojčane liste","square":"Kvadrat","start":"Početak","type":"Vrsta","upperAlpha":"Znakovi velika slova (A, B, C, D, E, itd.)","upperRoman":"Romanska numeracija velika slova (I, II, III, IV, V, itd.)","validateStartNumber":"Početak brojčane liste mora biti cijeli broj."},"magicline":{"title":"Ubaci paragraf ovdje"},"maximize":{"maximize":"Povećaj","minimize":"Smanji"},"newpage":{"toolbar":"Nova stranica"},"pagebreak":{"alt":"Prijelom stranice","toolbar":"Ubaci prijelom stranice"},"pastetext":{"button":"Zalijepi kao čisti tekst","title":"Zalijepi kao čisti tekst"},"pastefromword":{"confirmCleanup":"Tekst koji želite zalijepiti čini se da je kopiran iz Worda. Želite li prije očistiti tekst?","error":"Nije moguće očistiti podatke za ljepljenje zbog interne greške","title":"Zalijepi iz Worda","toolbar":"Zalijepi iz Worda"},"preview":{"preview":"Pregledaj"},"print":{"toolbar":"Ispiši"},"removeformat":{"toolbar":"Ukloni formatiranje"},"save":{"toolbar":"Snimi"},"selectall":{"toolbar":"Odaberi sve"},"showblocks":{"toolbar":"Prikaži blokove"},"sourcearea":{"toolbar":"Kôd"},"specialchar":{"options":"Opcije specijalnih znakova","title":"Odaberite posebni karakter","toolbar":"Ubaci posebne znakove"},"scayt":{"btn_about":"O SCAYT","btn_dictionaries":"Rječnici","btn_disable":"Onemogući SCAYT","btn_enable":"Omogući SCAYT","btn_langs":"Jezici","btn_options":"Opcije","text_title":"Provjeri pravopis tijekom tipkanja (SCAYT)"},"stylescombo":{"label":"Stil","panelTitle":"Stilovi formatiranja","panelTitle1":"Block stilovi","panelTitle2":"Inline stilovi","panelTitle3":"Object stilovi"},"table":{"border":"Veličina okvira","caption":"Naslov","cell":{"menu":"Ćelija","insertBefore":"Ubaci ćeliju prije","insertAfter":"Ubaci ćeliju poslije","deleteCell":"Izbriši ćelije","merge":"Spoji ćelije","mergeRight":"Spoji desno","mergeDown":"Spoji dolje","splitHorizontal":"Podijeli ćeliju vodoravno","splitVertical":"Podijeli ćeliju okomito","title":"Svojstva ćelije","cellType":"Vrsta ćelije","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Prelazak u novi red","hAlign":"Vodoravno poravnanje","vAlign":"Okomito poravnanje","alignBaseline":"Osnovna linija","bgColor":"Boja pozadine","borderColor":"Boja ruba","data":"Podatak","header":"Zaglavlje","yes":"Da","no":"ne","invalidWidth":"Širina ćelije mora biti broj.","invalidHeight":"Visina ćelije mora biti broj.","invalidRowSpan":"Rows span mora biti cijeli broj.","invalidColSpan":"Columns span mora biti cijeli broj.","chooseColor":"Odaberi"},"cellPad":"Razmak ćelija","cellSpace":"Prostornost ćelija","column":{"menu":"Kolona","insertBefore":"Ubaci kolonu prije","insertAfter":"Ubaci kolonu poslije","deleteColumn":"Izbriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tablicu","headers":"Zaglavlje","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"Ništa","headersRow":"Prvi red","invalidBorder":"Debljina ruba mora biti broj.","invalidCellPadding":"Razmak ćelija mora biti broj.","invalidCellSpacing":"Prostornost ćelija mora biti broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tablice mora biti broj.","invalidRows":"Broj redova mora biti broj veći od 0.","invalidWidth":"Širina tablice mora biti broj.","menu":"Svojstva tablice","row":{"menu":"Red","insertBefore":"Ubaci red prije","insertAfter":"Ubaci red poslije","deleteRow":"Izbriši redove"},"rows":"Redova","summary":"Sažetak","title":"Svojstva tablice","toolbar":"Tablica","widthPc":"postotaka","widthPx":"piksela","widthUnit":"jedinica širine"},"undo":{"redo":"Ponovi","undo":"Poništi"},"wsc":{"btnIgnore":"Zanemari","btnIgnoreAll":"Zanemari sve","btnReplace":"Zamijeni","btnReplaceAll":"Zamijeni sve","btnUndo":"Vrati","changeTo":"Promijeni u","errorLoading":"Greška učitavanja aplikacije: %s.","ieSpellDownload":"Provjera pravopisa nije instalirana. Želite li skinuti provjeru pravopisa?","manyChanges":"Provjera završena: Promijenjeno %1 riječi","noChanges":"Provjera završena: Nije napravljena promjena","noMispell":"Provjera završena: Nema grešaka","noSuggestions":"-Nema preporuke-","notAvailable":"Žao nam je, ali usluga trenutno nije dostupna.","notInDic":"Nije u rječniku","oneChange":"Provjera završena: Jedna riječ promjenjena","progress":"Provjera u tijeku...","title":"Provjera pravopisa","toolbar":"Provjeri pravopis"}};
\ No newline at end of file
+CKEDITOR.lang['hr']={"editor":"Bogati uređivač teksta, %1","editorPanel":"Ploča Bogatog Uređivača Teksta","common":{"editorHelp":"Pritisni ALT 0 za pomoć","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","flash":"Flash","form":"Forma","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smjer jezika","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Kôd jezika","longDescr":"Dugački opis URL","cssClass":"Klase stilova","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Poništi","close":"Zatvori","preview":"Pregledaj","resize":"Povuci za promjenu veličine","generalTab":"Općenito","advancedTab":"Napredno","validateNumberFailed":"Ova vrijednost nije broj.","confirmNewPage":"Sve napravljene promjene će biti izgubljene ukoliko ih niste snimili. Sigurno želite učitati novu stranicu?","confirmCancel":"Neke od opcija su promjenjene. Sigurno želite zatvoriti ovaj prozor?","options":"Opcije","target":"Odredište","targetNew":"Novi prozor (_blank)","targetTop":"Vršni prozor (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Roditeljski prozor (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase stilova","width":"Širina","height":"Visina","align":"Poravnanje","alignLeft":"Lijevo","alignRight":"Desno","alignCenter":"Središnje","alignJustify":"Blok poravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dolje","alignNone":"None","invalidValue":"Neispravna vrijednost.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidCssLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih CSS mjernih jedinica (px, %, in, cm, mm, em, ex, pt ili pc).","invalidHtmlLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih HTML mjernih jedinica (px ili %).","invalidInlineStyle":"Vrijednost za linijski stil mora sadržavati jednu ili više definicija s formatom \"naziv:vrijednost\", odvojenih točka-zarezom.","cssLengthTooltip":"Unesite broj za vrijednost u pikselima ili broj s važećim CSS mjernim jedinicama (px, %, in, cm, mm, em, ex, pt ili pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupno</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O CKEditoru","help":"Provjeri $1 za pomoć.","moreInfo":"Za informacije o licencama posjetite našu web stranicu:","title":"O CKEditoru","userGuide":"Vodič za CKEditor korisnike"},"basicstyles":{"bold":"Podebljaj","italic":"Ukosi","strike":"Precrtano","subscript":"Subscript","superscript":"Superscript","underline":"Potcrtano"},"bidi":{"ltr":"Smjer teksta s lijeva na desno","rtl":"Smjer teksta s desna na lijevo"},"blockquote":{"toolbar":"Blockquote"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog izrezivanja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+X).","paste":"Zalijepi","pasteArea":"Prostor za ljepljenje","pasteMsg":"Molimo zaljepite unutar doljnjeg okvira koristeći tipkovnicu (<STRONG>Ctrl/Cmd+V</STRONG>) i kliknite <STRONG>OK</STRONG>.","securityMsg":"Zbog sigurnosnih postavki Vašeg pretraživača, editor nema direktan pristup Vašem međuspremniku. Potrebno je ponovno zalijepiti tekst u ovaj prozor.","title":"Zalijepi"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatski","bgColorTitle":"Boja pozadine","colors":{"000":"Crna","800000":"Kesten","8B4513":"Smeđa","2F4F4F":"Tamno siva","008080":"Teal","000080":"Mornarska","4B0082":"Indigo","696969":"Tamno siva","B22222":"Vatrena cigla","A52A2A":"Smeđa","DAA520":"Zlatna","006400":"Tamno zelena","40E0D0":"Tirkizna","0000CD":"Srednje plava","800080":"Ljubičasta","808080":"Siva","F00":"Crvena","FF8C00":"Tamno naranđasta","FFD700":"Zlatna","008000":"Zelena","0FF":"Cijan","00F":"Plava","EE82EE":"Ljubičasta","A9A9A9":"Mutno siva","FFA07A":"Svijetli losos","FFA500":"Naranđasto","FFFF00":"Žuto","00FF00":"Limun","AFEEEE":"Blijedo tirkizna","ADD8E6":"Svijetlo plava","DDA0DD":"Šljiva","D3D3D3":"Svijetlo siva","FFF0F5":"Lavanda rumeno","FAEBD7":"Antikno bijela","FFFFE0":"Svijetlo žuta","F0FFF0":"Med","F0FFFF":"Azurna","F0F8FF":"Alice plava","E6E6FA":"Lavanda","FFF":"Bijela","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Više boja...","panelTitle":"Boje","textColorTitle":"Boja teksta"},"colordialog":{"clear":"Očisti","highlight":"Istaknuto","options":"Opcije boje","selected":"Odabrana boja","title":"Odaberi boju"},"templates":{"button":"Predlošci","emptyListMsg":"(Nema definiranih predložaka)","insertOption":"Zamijeni trenutne sadržaje","options":"Opcije predložaka","selectPromptMsg":"Molimo odaberite predložak koji želite otvoriti<br>(stvarni sadržaj će biti izgubljen):","title":"Predlošci sadržaja"},"contextmenu":{"options":"Opcije izbornika"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Savjetodavni naslov","cssClassInputLabel":"Klase stilova","edit":"Uredi DIV","inlineStyleInputLabel":"Stil u liniji","langDirLTRLabel":"S lijeva na desno (LTR)","langDirLabel":"Smjer jezika","langDirRTLLabel":"S desna na lijevo (RTL)","languageCodeInputLabel":"Jezični kod","remove":"Ukloni DIV","styleSelectLabel":"Stil","title":"Napravi DIV kontejner","toolbar":"Napravi DIV kontejner"},"toolbar":{"toolbarCollapse":"Smanji alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Dokument","clipboard":"Međuspremnik/Poništi","editing":"Uređivanje","forms":"Forme","basicstyles":"Osnovni stilovi","paragraph":"Paragraf","links":"Veze","insert":"Umetni","styles":"Stilovi","colors":"Boje","tools":"Alatke"},"toolbars":"Alatne trake uređivača teksta"},"elementspath":{"eleLabel":"Putanja elemenata","eleTitle":"%1 element"},"find":{"find":"Pronađi","findOptions":"Opcije traženja","findWhat":"Pronađi:","matchCase":"Usporedi mala/velika slova","matchCyclic":"Usporedi kružno","matchWord":"Usporedi cijele riječi","notFoundMsg":"Traženi tekst nije pronađen.","replace":"Zamijeni","replaceAll":"Zamijeni sve","replaceSuccessMsg":"Zamijenjeno %1 pojmova.","replaceWith":"Zamijeni s:","title":"Pronađi i zamijeni"},"fakeobjects":{"anchor":"Sidro","flash":"Flash animacija","hiddenfield":"Sakriveno polje","iframe":"IFrame","unknown":"Nepoznati objekt"},"flash":{"access":"Script Access","accessAlways":"Uvijek","accessNever":"Nikad","accessSameDomain":"Ista domena","alignAbsBottom":"Abs dolje","alignAbsMiddle":"Abs sredina","alignBaseline":"Bazno","alignTextTop":"Vrh teksta","bgcolor":"Boja pozadine","chkFull":"Omogući Fullscreen","chkLoop":"Ponavljaj","chkMenu":"Omogući Flash izbornik","chkPlay":"Auto Play","flashvars":"Varijable za Flash","hSpace":"HSpace","properties":"Flash svojstva","propertiesTab":"Svojstva","quality":"Kvaliteta","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Omjer","scaleAll":"Prikaži sve","scaleFit":"Točna veličina","scaleNoBorder":"Bez okvira","title":"Flash svojstva","vSpace":"VSpace","validateHSpace":"HSpace mora biti broj.","validateSrc":"Molimo upišite URL link","validateVSpace":"VSpace mora biti broj.","windowMode":"Vrsta prozora","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Veličina","voiceLabel":"Veličina slova","panelTitle":"Veličina"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"forms":{"button":{"title":"Button svojstva","text":"Tekst (vrijednost)","type":"Vrsta","typeBtn":"Gumb","typeSbm":"Pošalji","typeRst":"Poništi"},"checkboxAndRadio":{"checkboxTitle":"Checkbox svojstva","radioTitle":"Radio Button svojstva","value":"Vrijednost","selected":"Odabrano","required":"Required"},"form":{"title":"Form svojstva","menu":"Form svojstva","action":"Akcija","method":"Metoda","encoding":"Encoding"},"hidden":{"title":"Hidden Field svojstva","name":"Ime","value":"Vrijednost"},"select":{"title":"Selection svojstva","selectInfo":"Info","opAvail":"Dostupne opcije","value":"Vrijednost","size":"Veličina","lines":"linija","chkMulti":"Dozvoli višestruki odabir","required":"Required","opText":"Tekst","opValue":"Vrijednost","btnAdd":"Dodaj","btnModify":"Promijeni","btnUp":"Gore","btnDown":"Dolje","btnSetValue":"Postavi kao odabranu vrijednost","btnDelete":"Obriši"},"textarea":{"title":"Textarea svojstva","cols":"Kolona","rows":"Redova"},"textfield":{"title":"Text Field svojstva","name":"Ime","value":"Vrijednost","charWidth":"Širina","maxChars":"Najviše karaktera","required":"Required","type":"Vrsta","typeText":"Tekst","typePass":"Šifra","typeEmail":"Email","typeSearch":"Traži","typeTel":"Broj telefona","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatirano"},"horizontalrule":{"toolbar":"Ubaci vodoravnu liniju"},"iframe":{"border":"Prikaži okvir IFrame-a","noUrl":"Unesite URL iframe-a","scrolling":"Omogući trake za skrolanje","title":"IFrame svojstva","toolbar":"IFrame"},"image":{"alt":"Alternativni tekst","border":"Okvir","btnUpload":"Pošalji na server","button2Img":"Želite li promijeniti odabrani gumb u jednostavnu sliku?","hSpace":"HSpace","img2Button":"Želite li promijeniti odabranu sliku u gumb?","infoTab":"Info slike","linkTab":"Link","lockRatio":"Zaključaj odnos","menu":"Svojstva slika","resetSize":"Obriši veličinu","title":"Svojstva slika","titleButton":"Image Button svojstva","upload":"Pošalji","urlMissing":"Nedostaje URL slike.","vSpace":"VSpace","validateBorder":"Okvir mora biti cijeli broj.","validateHSpace":"HSpace mora biti cijeli broj","validateVSpace":"VSpace mora biti cijeli broj."},"indent":{"indent":"Pomakni udesno","outdent":"Pomakni ulijevo"},"smiley":{"options":"Opcije smješka","title":"Ubaci smješka","toolbar":"Smješko"},"justify":{"block":"Blok poravnanje","center":"Središnje poravnanje","left":"Lijevo poravnanje","right":"Desno poravnanje"},"language":{"button":"Namjesti jezik","remove":"Makni jezik"},"link":{"acccessKey":"Pristupna tipka","advanced":"Napredno","advisoryContentType":"Advisory vrsta sadržaja","advisoryTitle":"Advisory naslov","anchor":{"toolbar":"Ubaci/promijeni sidro","menu":"Svojstva sidra","title":"Svojstva sidra","name":"Ime sidra","errorName":"Molimo unesite ime sidra","remove":"Ukloni sidro"},"anchorId":"Po Id elementa","anchorName":"Po nazivu sidra","charset":"Kodna stranica povezanih resursa","cssClasses":"Stylesheet klase","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail adresa","emailBody":"Sadržaj poruke","emailSubject":"Naslov","id":"Id","info":"Link Info","langCode":"Smjer jezika","langDir":"Smjer jezika","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","menu":"Promijeni link","name":"Naziv","noAnchors":"(Nema dostupnih sidra)","noEmail":"Molimo upišite e-mail adresu","noUrl":"Molimo upišite URL link","other":"<drugi>","popupDependent":"Ovisno (Netscape)","popupFeatures":"Mogućnosti popup prozora","popupFullScreen":"Cijeli ekran (IE)","popupLeft":"Lijeva pozicija","popupLocationBar":"Traka za lokaciju","popupMenuBar":"Izborna traka","popupResizable":"Promjenjiva veličina","popupScrollBars":"Scroll traka","popupStatusBar":"Statusna traka","popupToolbar":"Traka s alatima","popupTop":"Gornja pozicija","rel":"Veza","selectAnchor":"Odaberi sidro","styles":"Stil","tabIndex":"Tab Indeks","target":"Meta","targetFrame":"<okvir>","targetFrameName":"Ime ciljnog okvira","targetPopup":"<popup prozor>","targetPopupName":"Naziv popup prozora","title":"Link","toAnchor":"Sidro na ovoj stranici","toEmail":"E-Mail","toUrl":"URL","toolbar":"Ubaci/promijeni link","type":"Link vrsta","unlink":"Ukloni link","upload":"Pošalji"},"list":{"bulletedlist":"Obična lista","numberedlist":"Brojčana lista"},"liststyle":{"armenian":"Armenijska numeracija","bulletedTitle":"Svojstva liste","circle":"Krug","decimal":"Decimalna numeracija (1, 2, 3, itd.)","decimalLeadingZero":"Decimalna s vodećom nulom (01, 02, 03, itd)","disc":"Disk","georgian":"Gruzijska numeracija(an, ban, gan, etc.)","lowerAlpha":"Znakovi mala slova (a, b, c, d, e, itd.)","lowerGreek":"Grčka numeracija mala slova (alfa, beta, gama, itd).","lowerRoman":"Romanska numeracija mala slova (i, ii, iii, iv, v, itd.)","none":"Bez","notset":"<nije određen>","numberedTitle":"Svojstva brojčane liste","square":"Kvadrat","start":"Početak","type":"Vrsta","upperAlpha":"Znakovi velika slova (A, B, C, D, E, itd.)","upperRoman":"Romanska numeracija velika slova (I, II, III, IV, V, itd.)","validateStartNumber":"Početak brojčane liste mora biti cijeli broj."},"magicline":{"title":"Ubaci paragraf ovdje"},"maximize":{"maximize":"Povećaj","minimize":"Smanji"},"newpage":{"toolbar":"Nova stranica"},"pagebreak":{"alt":"Prijelom stranice","toolbar":"Ubaci prijelom stranice"},"pastetext":{"button":"Zalijepi kao čisti tekst","title":"Zalijepi kao čisti tekst"},"pastefromword":{"confirmCleanup":"Tekst koji želite zalijepiti čini se da je kopiran iz Worda. Želite li prije očistiti tekst?","error":"Nije moguće očistiti podatke za ljepljenje zbog interne greške","title":"Zalijepi iz Worda","toolbar":"Zalijepi iz Worda"},"preview":{"preview":"Pregledaj"},"print":{"toolbar":"Ispiši"},"removeformat":{"toolbar":"Ukloni formatiranje"},"save":{"toolbar":"Snimi"},"selectall":{"toolbar":"Odaberi sve"},"showblocks":{"toolbar":"Prikaži blokove"},"sourcearea":{"toolbar":"Kôd"},"specialchar":{"options":"Opcije specijalnih znakova","title":"Odaberite posebni karakter","toolbar":"Ubaci posebne znakove"},"scayt":{"btn_about":"O SCAYT","btn_dictionaries":"Rječnici","btn_disable":"Onemogući SCAYT","btn_enable":"Omogući SCAYT","btn_langs":"Jezici","btn_options":"Opcije","text_title":"Provjeri pravopis tijekom tipkanja (SCAYT)"},"stylescombo":{"label":"Stil","panelTitle":"Stilovi formatiranja","panelTitle1":"Block stilovi","panelTitle2":"Inline stilovi","panelTitle3":"Object stilovi"},"table":{"border":"Veličina okvira","caption":"Naslov","cell":{"menu":"Ćelija","insertBefore":"Ubaci ćeliju prije","insertAfter":"Ubaci ćeliju poslije","deleteCell":"Izbriši ćelije","merge":"Spoji ćelije","mergeRight":"Spoji desno","mergeDown":"Spoji dolje","splitHorizontal":"Podijeli ćeliju vodoravno","splitVertical":"Podijeli ćeliju okomito","title":"Svojstva ćelije","cellType":"Vrsta ćelije","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Prelazak u novi red","hAlign":"Vodoravno poravnanje","vAlign":"Okomito poravnanje","alignBaseline":"Osnovna linija","bgColor":"Boja pozadine","borderColor":"Boja ruba","data":"Podatak","header":"Zaglavlje","yes":"Da","no":"ne","invalidWidth":"Širina ćelije mora biti broj.","invalidHeight":"Visina ćelije mora biti broj.","invalidRowSpan":"Rows span mora biti cijeli broj.","invalidColSpan":"Columns span mora biti cijeli broj.","chooseColor":"Odaberi"},"cellPad":"Razmak ćelija","cellSpace":"Prostornost ćelija","column":{"menu":"Kolona","insertBefore":"Ubaci kolonu prije","insertAfter":"Ubaci kolonu poslije","deleteColumn":"Izbriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tablicu","headers":"Zaglavlje","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"Ništa","headersRow":"Prvi red","invalidBorder":"Debljina ruba mora biti broj.","invalidCellPadding":"Razmak ćelija mora biti broj.","invalidCellSpacing":"Prostornost ćelija mora biti broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tablice mora biti broj.","invalidRows":"Broj redova mora biti broj veći od 0.","invalidWidth":"Širina tablice mora biti broj.","menu":"Svojstva tablice","row":{"menu":"Red","insertBefore":"Ubaci red prije","insertAfter":"Ubaci red poslije","deleteRow":"Izbriši redove"},"rows":"Redova","summary":"Sažetak","title":"Svojstva tablice","toolbar":"Tablica","widthPc":"postotaka","widthPx":"piksela","widthUnit":"jedinica širine"},"undo":{"redo":"Ponovi","undo":"Poništi"},"wsc":{"btnIgnore":"Zanemari","btnIgnoreAll":"Zanemari sve","btnReplace":"Zamijeni","btnReplaceAll":"Zamijeni sve","btnUndo":"Vrati","changeTo":"Promijeni u","errorLoading":"Greška učitavanja aplikacije: %s.","ieSpellDownload":"Provjera pravopisa nije instalirana. Želite li skinuti provjeru pravopisa?","manyChanges":"Provjera završena: Promijenjeno %1 riječi","noChanges":"Provjera završena: Nije napravljena promjena","noMispell":"Provjera završena: Nema grešaka","noSuggestions":"-Nema preporuke-","notAvailable":"Žao nam je, ali usluga trenutno nije dostupna.","notInDic":"Nije u rječniku","oneChange":"Provjera završena: Jedna riječ promjenjena","progress":"Provjera u tijeku...","title":"Provjera pravopisa","toolbar":"Provjeri pravopis"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/lang/hu.js
index 54bc8f8ac7e..05c4e7a2432 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/hu.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/hu.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['hu']={"editor":"HTML szerkesztő","editorPanel":"Rich Text szerkesztő panel","common":{"editorHelp":"Segítségért nyomjon ALT 0","browseServer":"Böngészés a szerveren","url":"Hivatkozás","protocol":"Protokoll","upload":"Feltöltés","uploadSubmit":"Küldés a szerverre","image":"Kép","flash":"Flash","form":"Űrlap","checkbox":"Jelölőnégyzet","radio":"Választógomb","textField":"Szövegmező","textarea":"Szövegterület","hiddenField":"Rejtettmező","button":"Gomb","select":"Legördülő lista","imageButton":"Képgomb","notSet":"<nincs beállítva>","id":"Azonosító","name":"Név","langDir":"Írás iránya","langDirLtr":"Balról jobbra","langDirRtl":"Jobbról balra","langCode":"Nyelv kódja","longDescr":"Részletes leírás webcíme","cssClass":"Stíluskészlet","advisoryTitle":"Súgócimke","cssStyle":"Stílus","ok":"Rendben","cancel":"Mégsem","close":"Bezárás","preview":"Előnézet","resize":"Húzza az átméretezéshez","generalTab":"Általános","advancedTab":"További opciók","validateNumberFailed":"A mezőbe csak számokat írhat.","confirmNewPage":"Minden nem mentett változás el fog veszni! Biztosan be szeretné tölteni az oldalt?","confirmCancel":"Az űrlap tartalma megváltozott, ám a változásokat nem rögzítette. Biztosan be szeretné zárni az űrlapot?","options":"Beállítások","target":"Cél","targetNew":"Új ablak (_blank)","targetTop":"Legfelső ablak (_top)","targetSelf":"Aktuális ablakban (_self)","targetParent":"Szülő ablak (_parent)","langDirLTR":"Balról jobbra (LTR)","langDirRTL":"Jobbról balra (RTL)","styles":"Stílus","cssClasses":"Stíluslap osztály","width":"Szélesség","height":"Magasság","align":"Igazítás","alignLeft":"Bal","alignRight":"Jobbra","alignCenter":"Középre","alignJustify":"Sorkizárt","alignTop":"Tetejére","alignMiddle":"Középre","alignBottom":"Aljára","alignNone":"None","invalidValue":"Érvénytelen érték.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidCssLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes CSS egységgel megjelölve(px, %, in, cm, mm, em, ex, pt vagy pc).","invalidHtmlLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes HTML egységgel megjelölve(px vagy %).","invalidInlineStyle":"Az inline stílusnak megadott értéknek tartalmaznia kell egy vagy több rekordot a \"name : value\" formátumban, pontosvesszővel elválasztva.","cssLengthTooltip":"Adjon meg egy számot értéknek pixelekben vagy egy számot érvényes CSS mértékegységben (px, %, in, cm, mm, em, ex, pt, vagy pc).","unavailable":"%1<span class=\"cke_accessibility\">, nem elérhető</span>"},"about":{"copy":"Copyright &copy; $1. Minden jog fenntartva.","dlgTitle":"CKEditor névjegy","help":"Itt találsz segítséget: $1","moreInfo":"Licenszelési információkért kérjük látogassa meg weboldalunkat:","title":"CKEditor névjegy","userGuide":"CKEditor Felhasználói útmutató"},"basicstyles":{"bold":"Félkövér","italic":"Dőlt","strike":"Áthúzott","subscript":"Alsó index","superscript":"Felső index","underline":"Aláhúzott"},"bidi":{"ltr":"Szöveg iránya balról jobbra","rtl":"Szöveg iránya jobbról balra"},"blockquote":{"toolbar":"Idézet blokk"},"clipboard":{"copy":"Másolás","copyError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a másolás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","cut":"Kivágás","cutError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a kivágás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","paste":"Beillesztés","pasteArea":"Beszúrás mező","pasteMsg":"Másolja be az alábbi mezőbe a <STRONG>Ctrl/Cmd+V</STRONG> billentyűk lenyomásával, majd nyomjon <STRONG>Rendben</STRONG>-t.","securityMsg":"A böngésző biztonsági beállításai miatt a szerkesztő nem képes hozzáférni a vágólap adataihoz. Illeszd be újra ebben az ablakban.","title":"Beillesztés"},"button":{"selectedLabel":"%1 (Kiválasztva)"},"colorbutton":{"auto":"Automatikus","bgColorTitle":"Háttérszín","colors":{"000":"Fekete","800000":"Bordó","8B4513":"Barna","2F4F4F":"Sötét türkiz","008080":"Türkiz","000080":"Király kék","4B0082":"Indigó kék","696969":"Szürke","B22222":"Tégla vörös","A52A2A":"Vörös","DAA520":"Arany sárga","006400":"Sötét zöld","40E0D0":"Türkiz","0000CD":"Kék","800080":"Lila","808080":"Szürke","F00":"Piros","FF8C00":"Sötét narancs","FFD700":"Arany","008000":"Zöld","0FF":"Türkiz","00F":"Kék","EE82EE":"Rózsaszín","A9A9A9":"Sötét szürke","FFA07A":"Lazac","FFA500":"Narancs","FFFF00":"Citromsárga","00FF00":"Neon zöld","AFEEEE":"Világos türkiz","ADD8E6":"Világos kék","DDA0DD":"Világos lila","D3D3D3":"Világos szürke","FFF0F5":"Lavender Blush","FAEBD7":"Törtfehér","FFFFE0":"Világos sárga","F0FFF0":"Menta","F0FFFF":"Azúr kék","F0F8FF":"Halvány kék","E6E6FA":"Lavender","FFF":"Fehér"},"more":"További színek...","panelTitle":"Színek","textColorTitle":"Betűszín"},"colordialog":{"clear":"Ürítés","highlight":"Nagyítás","options":"Szín opciók","selected":"Kiválasztott","title":"Válasszon színt"},"templates":{"button":"Sablonok","emptyListMsg":"(Nincs sablon megadva)","insertOption":"Kicseréli a jelenlegi tartalmat","options":"Sablon opciók","selectPromptMsg":"Válassza ki melyik sablon nyíljon meg a szerkesztőben<br>(a jelenlegi tartalom elveszik):","title":"Elérhető sablonok"},"contextmenu":{"options":"Helyi menü opciók"},"div":{"IdInputLabel":"Azonosító","advisoryTitleInputLabel":"Tipp szöveg","cssClassInputLabel":"Stíluslap osztály","edit":"DIV szerkesztése","inlineStyleInputLabel":"Inline stílus","langDirLTRLabel":"Balról jobbra (LTR)","langDirLabel":"Nyelvi irány","langDirRTLLabel":"Jobbról balra (RTL)","languageCodeInputLabel":" Nyelv kódja","remove":"DIV eltávolítása","styleSelectLabel":"Stílus","title":"DIV tároló létrehozása","toolbar":"DIV tároló létrehozása"},"toolbar":{"toolbarCollapse":"Eszköztár összecsukása","toolbarExpand":"Eszköztár szétnyitása","toolbarGroups":{"document":"Dokumentum","clipboard":"Vágólap/Visszavonás","editing":"Szerkesztés","forms":"Űrlapok","basicstyles":"Alapstílusok","paragraph":"Bekezdés","links":"Hivatkozások","insert":"Beszúrás","styles":"Stílusok","colors":"Színek","tools":"Eszközök"},"toolbars":"Szerkesztő Eszköztár"},"elementspath":{"eleLabel":"Elem utak","eleTitle":"%1 elem"},"find":{"find":"Keresés","findOptions":"Beállítások","findWhat":"Keresett szöveg:","matchCase":"Kis- és nagybetű megkülönböztetése","matchCyclic":"Ciklikus keresés","matchWord":"Csak ha ez a teljes szó","notFoundMsg":"A keresett szöveg nem található.","replace":"Csere","replaceAll":"Az összes cseréje","replaceSuccessMsg":"%1 egyezőség cserélve.","replaceWith":"Csere erre:","title":"Keresés és csere"},"fakeobjects":{"anchor":"Horgony","flash":"Flash animáció","hiddenfield":"Rejtett mezõ","iframe":"IFrame","unknown":"Ismeretlen objektum"},"flash":{"access":"Szkript hozzáférés","accessAlways":"Mindig","accessNever":"Soha","accessSameDomain":"Azonos domainről","alignAbsBottom":"Legaljára","alignAbsMiddle":"Közepére","alignBaseline":"Alapvonalhoz","alignTextTop":"Szöveg tetejére","bgcolor":"Háttérszín","chkFull":"Teljes képernyő engedélyezése","chkLoop":"Folyamatosan","chkMenu":"Flash menü engedélyezése","chkPlay":"Automata lejátszás","flashvars":"Flash változók","hSpace":"Vízsz. táv","properties":"Flash tulajdonságai","propertiesTab":"Tulajdonságok","quality":"Minőség","qualityAutoHigh":"Automata jó","qualityAutoLow":"Automata gyenge","qualityBest":"Legjobb","qualityHigh":"Jó","qualityLow":"Gyenge","qualityMedium":"Közepes","scale":"Méretezés","scaleAll":"Mindent mutat","scaleFit":"Teljes kitöltés","scaleNoBorder":"Keret nélkül","title":"Flash tulajdonságai","vSpace":"Függ. táv","validateHSpace":"A vízszintes távolsűág mezőbe csak számokat írhat.","validateSrc":"Adja meg a hivatkozás webcímét","validateVSpace":"A függőleges távolsűág mezőbe csak számokat írhat.","windowMode":"Ablak mód","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Méret","voiceLabel":"Betűméret","panelTitle":"Méret"},"label":"Betűtípus","panelTitle":"Betűtípus","voiceLabel":"Betűtípus"},"forms":{"button":{"title":"Gomb tulajdonságai","text":"Szöveg (Érték)","type":"Típus","typeBtn":"Gomb","typeSbm":"Küldés","typeRst":"Alaphelyzet"},"checkboxAndRadio":{"checkboxTitle":"Jelölőnégyzet tulajdonságai","radioTitle":"Választógomb tulajdonságai","value":"Érték","selected":"Kiválasztott","required":"Required"},"form":{"title":"Űrlap tulajdonságai","menu":"Űrlap tulajdonságai","action":"Adatfeldolgozást végző hivatkozás","method":"Adatküldés módja","encoding":"Kódolás"},"hidden":{"title":"Rejtett mező tulajdonságai","name":"Név","value":"Érték"},"select":{"title":"Legördülő lista tulajdonságai","selectInfo":"Alaptulajdonságok","opAvail":"Elérhető opciók","value":"Érték","size":"Méret","lines":"sor","chkMulti":"több sor is kiválasztható","required":"Required","opText":"Szöveg","opValue":"Érték","btnAdd":"Hozzáad","btnModify":"Módosít","btnUp":"Fel","btnDown":"Le","btnSetValue":"Legyen az alapértelmezett érték","btnDelete":"Töröl"},"textarea":{"title":"Szövegterület tulajdonságai","cols":"Karakterek száma egy sorban","rows":"Sorok száma"},"textfield":{"title":"Szövegmező tulajdonságai","name":"Név","value":"Érték","charWidth":"Megjelenített karakterek száma","maxChars":"Maximális karakterszám","required":"Required","type":"Típus","typeText":"Szöveg","typePass":"Jelszó","typeEmail":"Ímél","typeSearch":"Keresés","typeTel":"Telefonszám","typeUrl":"URL"}},"format":{"label":"Formátum","panelTitle":"Formátum","tag_address":"Címsor","tag_div":"Bekezdés (DIV)","tag_h1":"Fejléc 1","tag_h2":"Fejléc 2","tag_h3":"Fejléc 3","tag_h4":"Fejléc 4","tag_h5":"Fejléc 5","tag_h6":"Fejléc 6","tag_p":"Normál","tag_pre":"Formázott"},"horizontalrule":{"toolbar":"Elválasztóvonal beillesztése"},"iframe":{"border":"Legyen keret","noUrl":"Kérem írja be a iframe URL-t","scrolling":"Gördítősáv bekapcsolása","title":"IFrame Tulajdonságok","toolbar":"IFrame"},"image":{"alt":"Alternatív szöveg","border":"Keret","btnUpload":"Küldés a szerverre","button2Img":"A kiválasztott képgombból sima képet szeretne csinálni?","hSpace":"Vízsz. táv","img2Button":"A kiválasztott képből képgombot szeretne csinálni?","infoTab":"Alaptulajdonságok","linkTab":"Hivatkozás","lockRatio":"Arány megtartása","menu":"Kép tulajdonságai","resetSize":"Eredeti méret","title":"Kép tulajdonságai","titleButton":"Képgomb tulajdonságai","upload":"Feltöltés","urlMissing":"Hiányzik a kép URL-je","vSpace":"Függ. táv","validateBorder":"A keret méretének egész számot kell beírni!","validateHSpace":"Vízszintes távolságnak egész számot kell beírni!","validateVSpace":"Függőleges távolságnak egész számot kell beírni!"},"indent":{"indent":"Behúzás növelése","outdent":"Behúzás csökkentése"},"smiley":{"options":"Hangulatjel opciók","title":"Hangulatjel beszúrása","toolbar":"Hangulatjelek"},"justify":{"block":"Sorkizárt","center":"Középre","left":"Balra","right":"Jobbra"},"language":{"button":"Nyelv beállítása","remove":"Nyelv eltávolítása"},"link":{"acccessKey":"Billentyűkombináció","advanced":"További opciók","advisoryContentType":"Súgó tartalomtípusa","advisoryTitle":"Súgócimke","anchor":{"toolbar":"Horgony beillesztése/szerkesztése","menu":"Horgony tulajdonságai","title":"Horgony tulajdonságai","name":"Horgony neve","errorName":"Kérem adja meg a horgony nevét","remove":"Horgony eltávolítása"},"anchorId":"Azonosító szerint","anchorName":"Horgony név szerint","charset":"Hivatkozott tartalom kódlapja","cssClasses":"Stíluskészlet","emailAddress":"E-Mail cím","emailBody":"Üzenet","emailSubject":"Üzenet tárgya","id":"Id","info":"Alaptulajdonságok","langCode":"Írás iránya","langDir":"Írás iránya","langDirLTR":"Balról jobbra","langDirRTL":"Jobbról balra","menu":"Hivatkozás módosítása","name":"Név","noAnchors":"(Nincs horgony a dokumentumban)","noEmail":"Adja meg az E-Mail címet","noUrl":"Adja meg a hivatkozás webcímét","other":"<más>","popupDependent":"Szülőhöz kapcsolt (csak Netscape)","popupFeatures":"Felugró ablak jellemzői","popupFullScreen":"Teljes képernyő (csak IE)","popupLeft":"Bal pozíció","popupLocationBar":"Címsor","popupMenuBar":"Menü sor","popupResizable":"Átméretezés","popupScrollBars":"Gördítősáv","popupStatusBar":"Állapotsor","popupToolbar":"Eszköztár","popupTop":"Felső pozíció","rel":"Kapcsolat típusa","selectAnchor":"Horgony választása","styles":"Stílus","tabIndex":"Tabulátor index","target":"Tartalom megjelenítése","targetFrame":"<keretben>","targetFrameName":"Keret neve","targetPopup":"<felugró ablakban>","targetPopupName":"Felugró ablak neve","title":"Hivatkozás tulajdonságai","toAnchor":"Horgony az oldalon","toEmail":"E-Mail","toUrl":"URL","toolbar":"Hivatkozás beillesztése/módosítása","type":"Hivatkozás típusa","unlink":"Hivatkozás törlése","upload":"Feltöltés"},"list":{"bulletedlist":"Felsorolás","numberedlist":"Számozás"},"liststyle":{"armenian":"Örmény számozás","bulletedTitle":"Pontozott lista tulajdonságai","circle":"Kör","decimal":"Arab számozás (1, 2, 3, stb.)","decimalLeadingZero":"Számozás bevezető nullákkal (01, 02, 03, stb.)","disc":"Korong","georgian":"Grúz számozás (an, ban, gan, stb.)","lowerAlpha":"Kisbetűs (a, b, c, d, e, stb.)","lowerGreek":"Görög (alpha, beta, gamma, stb.)","lowerRoman":"Római kisbetűs (i, ii, iii, iv, v, stb.)","none":"Nincs","notset":"<Nincs beállítva>","numberedTitle":"Sorszámozott lista tulajdonságai","square":"Négyzet","start":"Kezdőszám","type":"Típus","upperAlpha":"Nagybetűs (A, B, C, D, E, stb.)","upperRoman":"Római nagybetűs (I, II, III, IV, V, stb.)","validateStartNumber":"A kezdőszám nem lehet tört érték."},"magicline":{"title":"Szúrja be a bekezdést ide"},"maximize":{"maximize":"Teljes méret","minimize":"Kis méret"},"newpage":{"toolbar":"Új oldal"},"pagebreak":{"alt":"Oldaltörés","toolbar":"Oldaltörés beillesztése"},"pastetext":{"button":"Beillesztés formázatlan szövegként","title":"Beillesztés formázatlan szövegként"},"pastefromword":{"confirmCleanup":"Úgy tűnik a beillesztett szöveget Word-ből másolt át. Meg szeretné tisztítani a szöveget? (ajánlott)","error":"Egy belső hiba miatt nem sikerült megtisztítani a szöveget","title":"Beillesztés Word-ből","toolbar":"Beillesztés Word-ből"},"preview":{"preview":"Előnézet"},"print":{"toolbar":"Nyomtatás"},"removeformat":{"toolbar":"Formázás eltávolítása"},"save":{"toolbar":"Mentés"},"selectall":{"toolbar":"Mindent kijelöl"},"showblocks":{"toolbar":"Blokkok megjelenítése"},"sourcearea":{"toolbar":"Forráskód"},"specialchar":{"options":"Speciális karakter opciók","title":"Speciális karakter választása","toolbar":"Speciális karakter beillesztése"},"scayt":{"btn_about":"SCAYT névjegy","btn_dictionaries":"Szótár","btn_disable":"SCAYT letiltása","btn_enable":"SCAYT engedélyezése","btn_langs":"Nyelvek","btn_options":"Beállítások","text_title":"Helyesírás ellenőrzés gépelés közben"},"stylescombo":{"label":"Stílus","panelTitle":"Formázási stílusok","panelTitle1":"Blokk stílusok","panelTitle2":"Inline stílusok","panelTitle3":"Objektum stílusok"},"table":{"border":"Szegélyméret","caption":"Felirat","cell":{"menu":"Cella","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteCell":"Cellák törlése","merge":"Cellák egyesítése","mergeRight":"Cellák egyesítése jobbra","mergeDown":"Cellák egyesítése lefelé","splitHorizontal":"Cellák szétválasztása vízszintesen","splitVertical":"Cellák szétválasztása függőlegesen","title":"Cella tulajdonságai","cellType":"Cella típusa","rowSpan":"Függőleges egyesítés","colSpan":"Vízszintes egyesítés","wordWrap":"Hosszú sorok törése","hAlign":"Vízszintes igazítás","vAlign":"Függőleges igazítás","alignBaseline":"Alapvonalra","bgColor":"Háttér színe","borderColor":"Keret színe","data":"Adat","header":"Fejléc","yes":"Igen","no":"Nem","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRowSpan":"A függőleges egyesítés mezőbe csak számokat írhat.","invalidColSpan":"A vízszintes egyesítés mezőbe csak számokat írhat.","chooseColor":"Válasszon"},"cellPad":"Cella belső margó","cellSpace":"Cella térköz","column":{"menu":"Oszlop","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteColumn":"Oszlopok törlése"},"columns":"Oszlopok","deleteTable":"Táblázat törlése","headers":"Fejlécek","headersBoth":"Mindkettő","headersColumn":"Első oszlop","headersNone":"Nincsenek","headersRow":"Első sor","invalidBorder":"A szegélyméret mezőbe csak számokat írhat.","invalidCellPadding":"A cella belső margó mezőbe csak számokat írhat.","invalidCellSpacing":"A cella térköz mezőbe csak számokat írhat.","invalidCols":"Az oszlopok számának nagyobbnak kell lenni mint 0.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRows":"A sorok számának nagyobbnak kell lenni mint 0.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","menu":"Táblázat tulajdonságai","row":{"menu":"Sor","insertBefore":"Beszúrás fölé","insertAfter":"Beszúrás alá","deleteRow":"Sorok törlése"},"rows":"Sorok","summary":"Leírás","title":"Táblázat tulajdonságai","toolbar":"Táblázat","widthPc":"százalék","widthPx":"képpont","widthUnit":"Szélesség egység"},"undo":{"redo":"Ismétlés","undo":"Visszavonás"},"wsc":{"btnIgnore":"Kihagyja","btnIgnoreAll":"Mindet kihagyja","btnReplace":"Csere","btnReplaceAll":"Összes cseréje","btnUndo":"Visszavonás","changeTo":"Módosítás","errorLoading":"Hiba a szolgáltatás host betöltése közben: %s.","ieSpellDownload":"A helyesírás-ellenőrző nincs telepítve. Szeretné letölteni most?","manyChanges":"Helyesírás-ellenőrzés kész: %1 szó cserélve","noChanges":"Helyesírás-ellenőrzés kész: Nincs változtatott szó","noMispell":"Helyesírás-ellenőrzés kész: Nem találtam hibát","noSuggestions":"Nincs javaslat","notAvailable":"Sajnálom, de a szolgáltatás jelenleg nem elérhető.","notInDic":"Nincs a szótárban","oneChange":"Helyesírás-ellenőrzés kész: Egy szó cserélve","progress":"Helyesírás-ellenőrzés folyamatban...","title":"Helyesírás ellenörző","toolbar":"Helyesírás-ellenőrzés"}};
\ No newline at end of file
+CKEDITOR.lang['hu']={"editor":"HTML szerkesztő","editorPanel":"Rich Text szerkesztő panel","common":{"editorHelp":"Segítségért nyomjon ALT 0","browseServer":"Böngészés a szerveren","url":"Hivatkozás","protocol":"Protokoll","upload":"Feltöltés","uploadSubmit":"Küldés a szerverre","image":"Kép","flash":"Flash","form":"Űrlap","checkbox":"Jelölőnégyzet","radio":"Választógomb","textField":"Szövegmező","textarea":"Szövegterület","hiddenField":"Rejtettmező","button":"Gomb","select":"Legördülő lista","imageButton":"Képgomb","notSet":"<nincs beállítva>","id":"Azonosító","name":"Név","langDir":"Írás iránya","langDirLtr":"Balról jobbra","langDirRtl":"Jobbról balra","langCode":"Nyelv kódja","longDescr":"Részletes leírás webcíme","cssClass":"Stíluskészlet","advisoryTitle":"Súgócimke","cssStyle":"Stílus","ok":"Rendben","cancel":"Mégsem","close":"Bezárás","preview":"Előnézet","resize":"Húzza az átméretezéshez","generalTab":"Általános","advancedTab":"További opciók","validateNumberFailed":"A mezőbe csak számokat írhat.","confirmNewPage":"Minden nem mentett változás el fog veszni! Biztosan be szeretné tölteni az oldalt?","confirmCancel":"Az űrlap tartalma megváltozott, ám a változásokat nem rögzítette. Biztosan be szeretné zárni az űrlapot?","options":"Beállítások","target":"Cél","targetNew":"Új ablak (_blank)","targetTop":"Legfelső ablak (_top)","targetSelf":"Aktuális ablakban (_self)","targetParent":"Szülő ablak (_parent)","langDirLTR":"Balról jobbra (LTR)","langDirRTL":"Jobbról balra (RTL)","styles":"Stílus","cssClasses":"Stíluslap osztály","width":"Szélesség","height":"Magasság","align":"Igazítás","alignLeft":"Bal","alignRight":"Jobbra","alignCenter":"Középre","alignJustify":"Sorkizárt","alignTop":"Tetejére","alignMiddle":"Középre","alignBottom":"Aljára","alignNone":"None","invalidValue":"Érvénytelen érték.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidCssLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes CSS egységgel megjelölve(px, %, in, cm, mm, em, ex, pt vagy pc).","invalidHtmlLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes HTML egységgel megjelölve(px vagy %).","invalidInlineStyle":"Az inline stílusnak megadott értéknek tartalmaznia kell egy vagy több rekordot a \"name : value\" formátumban, pontosvesszővel elválasztva.","cssLengthTooltip":"Adjon meg egy számot értéknek pixelekben vagy egy számot érvényes CSS mértékegységben (px, %, in, cm, mm, em, ex, pt, vagy pc).","unavailable":"%1<span class=\"cke_accessibility\">, nem elérhető</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Minden jog fenntartva.","dlgTitle":"CKEditor névjegy","help":"Itt találsz segítséget: $1","moreInfo":"Licenszelési információkért kérjük látogassa meg weboldalunkat:","title":"CKEditor névjegy","userGuide":"CKEditor Felhasználói útmutató"},"basicstyles":{"bold":"Félkövér","italic":"Dőlt","strike":"Áthúzott","subscript":"Alsó index","superscript":"Felső index","underline":"Aláhúzott"},"bidi":{"ltr":"Szöveg iránya balról jobbra","rtl":"Szöveg iránya jobbról balra"},"blockquote":{"toolbar":"Idézet blokk"},"clipboard":{"copy":"Másolás","copyError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a másolás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","cut":"Kivágás","cutError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a kivágás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","paste":"Beillesztés","pasteArea":"Beszúrás mező","pasteMsg":"Másolja be az alábbi mezőbe a <STRONG>Ctrl/Cmd+V</STRONG> billentyűk lenyomásával, majd nyomjon <STRONG>Rendben</STRONG>-t.","securityMsg":"A böngésző biztonsági beállításai miatt a szerkesztő nem képes hozzáférni a vágólap adataihoz. Illeszd be újra ebben az ablakban.","title":"Beillesztés"},"button":{"selectedLabel":"%1 (Kiválasztva)"},"colorbutton":{"auto":"Automatikus","bgColorTitle":"Háttérszín","colors":{"000":"Fekete","800000":"Bordó","8B4513":"Barna","2F4F4F":"Sötét türkiz","008080":"Türkiz","000080":"Király kék","4B0082":"Indigó kék","696969":"Szürke","B22222":"Tégla vörös","A52A2A":"Vörös","DAA520":"Arany sárga","006400":"Sötét zöld","40E0D0":"Türkiz","0000CD":"Kék","800080":"Lila","808080":"Szürke","F00":"Piros","FF8C00":"Sötét narancs","FFD700":"Arany","008000":"Zöld","0FF":"Türkiz","00F":"Kék","EE82EE":"Rózsaszín","A9A9A9":"Sötét szürke","FFA07A":"Lazac","FFA500":"Narancs","FFFF00":"Citromsárga","00FF00":"Neon zöld","AFEEEE":"Világos türkiz","ADD8E6":"Világos kék","DDA0DD":"Világos lila","D3D3D3":"Világos szürke","FFF0F5":"Lavender Blush","FAEBD7":"Törtfehér","FFFFE0":"Világos sárga","F0FFF0":"Menta","F0FFFF":"Azúr kék","F0F8FF":"Halvány kék","E6E6FA":"Lavender","FFF":"Fehér","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"További színek...","panelTitle":"Színek","textColorTitle":"Betűszín"},"colordialog":{"clear":"Ürítés","highlight":"Nagyítás","options":"Szín opciók","selected":"Kiválasztott","title":"Válasszon színt"},"templates":{"button":"Sablonok","emptyListMsg":"(Nincs sablon megadva)","insertOption":"Kicseréli a jelenlegi tartalmat","options":"Sablon opciók","selectPromptMsg":"Válassza ki melyik sablon nyíljon meg a szerkesztőben<br>(a jelenlegi tartalom elveszik):","title":"Elérhető sablonok"},"contextmenu":{"options":"Helyi menü opciók"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Azonosító","advisoryTitleInputLabel":"Tipp szöveg","cssClassInputLabel":"Stíluslap osztály","edit":"DIV szerkesztése","inlineStyleInputLabel":"Inline stílus","langDirLTRLabel":"Balról jobbra (LTR)","langDirLabel":"Nyelvi irány","langDirRTLLabel":"Jobbról balra (RTL)","languageCodeInputLabel":" Nyelv kódja","remove":"DIV eltávolítása","styleSelectLabel":"Stílus","title":"DIV tároló létrehozása","toolbar":"DIV tároló létrehozása"},"toolbar":{"toolbarCollapse":"Eszköztár összecsukása","toolbarExpand":"Eszköztár szétnyitása","toolbarGroups":{"document":"Dokumentum","clipboard":"Vágólap/Visszavonás","editing":"Szerkesztés","forms":"Űrlapok","basicstyles":"Alapstílusok","paragraph":"Bekezdés","links":"Hivatkozások","insert":"Beszúrás","styles":"Stílusok","colors":"Színek","tools":"Eszközök"},"toolbars":"Szerkesztő Eszköztár"},"elementspath":{"eleLabel":"Elem utak","eleTitle":"%1 elem"},"find":{"find":"Keresés","findOptions":"Beállítások","findWhat":"Keresett szöveg:","matchCase":"Kis- és nagybetű megkülönböztetése","matchCyclic":"Ciklikus keresés","matchWord":"Csak ha ez a teljes szó","notFoundMsg":"A keresett szöveg nem található.","replace":"Csere","replaceAll":"Az összes cseréje","replaceSuccessMsg":"%1 egyezőség cserélve.","replaceWith":"Csere erre:","title":"Keresés és csere"},"fakeobjects":{"anchor":"Horgony","flash":"Flash animáció","hiddenfield":"Rejtett mezõ","iframe":"IFrame","unknown":"Ismeretlen objektum"},"flash":{"access":"Szkript hozzáférés","accessAlways":"Mindig","accessNever":"Soha","accessSameDomain":"Azonos domainről","alignAbsBottom":"Legaljára","alignAbsMiddle":"Közepére","alignBaseline":"Alapvonalhoz","alignTextTop":"Szöveg tetejére","bgcolor":"Háttérszín","chkFull":"Teljes képernyő engedélyezése","chkLoop":"Folyamatosan","chkMenu":"Flash menü engedélyezése","chkPlay":"Automata lejátszás","flashvars":"Flash változók","hSpace":"Vízsz. táv","properties":"Flash tulajdonságai","propertiesTab":"Tulajdonságok","quality":"Minőség","qualityAutoHigh":"Automata jó","qualityAutoLow":"Automata gyenge","qualityBest":"Legjobb","qualityHigh":"Jó","qualityLow":"Gyenge","qualityMedium":"Közepes","scale":"Méretezés","scaleAll":"Mindent mutat","scaleFit":"Teljes kitöltés","scaleNoBorder":"Keret nélkül","title":"Flash tulajdonságai","vSpace":"Függ. táv","validateHSpace":"A vízszintes távolsűág mezőbe csak számokat írhat.","validateSrc":"Adja meg a hivatkozás webcímét","validateVSpace":"A függőleges távolsűág mezőbe csak számokat írhat.","windowMode":"Ablak mód","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Méret","voiceLabel":"Betűméret","panelTitle":"Méret"},"label":"Betűtípus","panelTitle":"Betűtípus","voiceLabel":"Betűtípus"},"forms":{"button":{"title":"Gomb tulajdonságai","text":"Szöveg (Érték)","type":"Típus","typeBtn":"Gomb","typeSbm":"Küldés","typeRst":"Alaphelyzet"},"checkboxAndRadio":{"checkboxTitle":"Jelölőnégyzet tulajdonságai","radioTitle":"Választógomb tulajdonságai","value":"Érték","selected":"Kiválasztott","required":"Required"},"form":{"title":"Űrlap tulajdonságai","menu":"Űrlap tulajdonságai","action":"Adatfeldolgozást végző hivatkozás","method":"Adatküldés módja","encoding":"Kódolás"},"hidden":{"title":"Rejtett mező tulajdonságai","name":"Név","value":"Érték"},"select":{"title":"Legördülő lista tulajdonságai","selectInfo":"Alaptulajdonságok","opAvail":"Elérhető opciók","value":"Érték","size":"Méret","lines":"sor","chkMulti":"több sor is kiválasztható","required":"Required","opText":"Szöveg","opValue":"Érték","btnAdd":"Hozzáad","btnModify":"Módosít","btnUp":"Fel","btnDown":"Le","btnSetValue":"Legyen az alapértelmezett érték","btnDelete":"Töröl"},"textarea":{"title":"Szövegterület tulajdonságai","cols":"Karakterek száma egy sorban","rows":"Sorok száma"},"textfield":{"title":"Szövegmező tulajdonságai","name":"Név","value":"Érték","charWidth":"Megjelenített karakterek száma","maxChars":"Maximális karakterszám","required":"Required","type":"Típus","typeText":"Szöveg","typePass":"Jelszó","typeEmail":"Ímél","typeSearch":"Keresés","typeTel":"Telefonszám","typeUrl":"URL"}},"format":{"label":"Formátum","panelTitle":"Formátum","tag_address":"Címsor","tag_div":"Bekezdés (DIV)","tag_h1":"Fejléc 1","tag_h2":"Fejléc 2","tag_h3":"Fejléc 3","tag_h4":"Fejléc 4","tag_h5":"Fejléc 5","tag_h6":"Fejléc 6","tag_p":"Normál","tag_pre":"Formázott"},"horizontalrule":{"toolbar":"Elválasztóvonal beillesztése"},"iframe":{"border":"Legyen keret","noUrl":"Kérem írja be a iframe URL-t","scrolling":"Gördítősáv bekapcsolása","title":"IFrame Tulajdonságok","toolbar":"IFrame"},"image":{"alt":"Alternatív szöveg","border":"Keret","btnUpload":"Küldés a szerverre","button2Img":"A kiválasztott képgombból sima képet szeretne csinálni?","hSpace":"Vízsz. táv","img2Button":"A kiválasztott képből képgombot szeretne csinálni?","infoTab":"Alaptulajdonságok","linkTab":"Hivatkozás","lockRatio":"Arány megtartása","menu":"Kép tulajdonságai","resetSize":"Eredeti méret","title":"Kép tulajdonságai","titleButton":"Képgomb tulajdonságai","upload":"Feltöltés","urlMissing":"Hiányzik a kép URL-je","vSpace":"Függ. táv","validateBorder":"A keret méretének egész számot kell beírni!","validateHSpace":"Vízszintes távolságnak egész számot kell beírni!","validateVSpace":"Függőleges távolságnak egész számot kell beírni!"},"indent":{"indent":"Behúzás növelése","outdent":"Behúzás csökkentése"},"smiley":{"options":"Hangulatjel opciók","title":"Hangulatjel beszúrása","toolbar":"Hangulatjelek"},"justify":{"block":"Sorkizárt","center":"Középre","left":"Balra","right":"Jobbra"},"language":{"button":"Nyelv beállítása","remove":"Nyelv eltávolítása"},"link":{"acccessKey":"Billentyűkombináció","advanced":"További opciók","advisoryContentType":"Súgó tartalomtípusa","advisoryTitle":"Súgócimke","anchor":{"toolbar":"Horgony beillesztése/szerkesztése","menu":"Horgony tulajdonságai","title":"Horgony tulajdonságai","name":"Horgony neve","errorName":"Kérem adja meg a horgony nevét","remove":"Horgony eltávolítása"},"anchorId":"Azonosító szerint","anchorName":"Horgony név szerint","charset":"Hivatkozott tartalom kódlapja","cssClasses":"Stíluskészlet","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail cím","emailBody":"Üzenet","emailSubject":"Üzenet tárgya","id":"Id","info":"Alaptulajdonságok","langCode":"Írás iránya","langDir":"Írás iránya","langDirLTR":"Balról jobbra","langDirRTL":"Jobbról balra","menu":"Hivatkozás módosítása","name":"Név","noAnchors":"(Nincs horgony a dokumentumban)","noEmail":"Adja meg az E-Mail címet","noUrl":"Adja meg a hivatkozás webcímét","other":"<más>","popupDependent":"Szülőhöz kapcsolt (csak Netscape)","popupFeatures":"Felugró ablak jellemzői","popupFullScreen":"Teljes képernyő (csak IE)","popupLeft":"Bal pozíció","popupLocationBar":"Címsor","popupMenuBar":"Menü sor","popupResizable":"Átméretezés","popupScrollBars":"Gördítősáv","popupStatusBar":"Állapotsor","popupToolbar":"Eszköztár","popupTop":"Felső pozíció","rel":"Kapcsolat típusa","selectAnchor":"Horgony választása","styles":"Stílus","tabIndex":"Tabulátor index","target":"Tartalom megjelenítése","targetFrame":"<keretben>","targetFrameName":"Keret neve","targetPopup":"<felugró ablakban>","targetPopupName":"Felugró ablak neve","title":"Hivatkozás tulajdonságai","toAnchor":"Horgony az oldalon","toEmail":"E-Mail","toUrl":"URL","toolbar":"Hivatkozás beillesztése/módosítása","type":"Hivatkozás típusa","unlink":"Hivatkozás törlése","upload":"Feltöltés"},"list":{"bulletedlist":"Felsorolás","numberedlist":"Számozás"},"liststyle":{"armenian":"Örmény számozás","bulletedTitle":"Pontozott lista tulajdonságai","circle":"Kör","decimal":"Arab számozás (1, 2, 3, stb.)","decimalLeadingZero":"Számozás bevezető nullákkal (01, 02, 03, stb.)","disc":"Korong","georgian":"Grúz számozás (an, ban, gan, stb.)","lowerAlpha":"Kisbetűs (a, b, c, d, e, stb.)","lowerGreek":"Görög (alpha, beta, gamma, stb.)","lowerRoman":"Római kisbetűs (i, ii, iii, iv, v, stb.)","none":"Nincs","notset":"<Nincs beállítva>","numberedTitle":"Sorszámozott lista tulajdonságai","square":"Négyzet","start":"Kezdőszám","type":"Típus","upperAlpha":"Nagybetűs (A, B, C, D, E, stb.)","upperRoman":"Római nagybetűs (I, II, III, IV, V, stb.)","validateStartNumber":"A kezdőszám nem lehet tört érték."},"magicline":{"title":"Szúrja be a bekezdést ide"},"maximize":{"maximize":"Teljes méret","minimize":"Kis méret"},"newpage":{"toolbar":"Új oldal"},"pagebreak":{"alt":"Oldaltörés","toolbar":"Oldaltörés beillesztése"},"pastetext":{"button":"Beillesztés formázatlan szövegként","title":"Beillesztés formázatlan szövegként"},"pastefromword":{"confirmCleanup":"Úgy tűnik a beillesztett szöveget Word-ből másolt át. Meg szeretné tisztítani a szöveget? (ajánlott)","error":"Egy belső hiba miatt nem sikerült megtisztítani a szöveget","title":"Beillesztés Word-ből","toolbar":"Beillesztés Word-ből"},"preview":{"preview":"Előnézet"},"print":{"toolbar":"Nyomtatás"},"removeformat":{"toolbar":"Formázás eltávolítása"},"save":{"toolbar":"Mentés"},"selectall":{"toolbar":"Mindent kijelöl"},"showblocks":{"toolbar":"Blokkok megjelenítése"},"sourcearea":{"toolbar":"Forráskód"},"specialchar":{"options":"Speciális karakter opciók","title":"Speciális karakter választása","toolbar":"Speciális karakter beillesztése"},"scayt":{"btn_about":"SCAYT névjegy","btn_dictionaries":"Szótár","btn_disable":"SCAYT letiltása","btn_enable":"SCAYT engedélyezése","btn_langs":"Nyelvek","btn_options":"Beállítások","text_title":"Helyesírás ellenőrzés gépelés közben"},"stylescombo":{"label":"Stílus","panelTitle":"Formázási stílusok","panelTitle1":"Blokk stílusok","panelTitle2":"Inline stílusok","panelTitle3":"Objektum stílusok"},"table":{"border":"Szegélyméret","caption":"Felirat","cell":{"menu":"Cella","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteCell":"Cellák törlése","merge":"Cellák egyesítése","mergeRight":"Cellák egyesítése jobbra","mergeDown":"Cellák egyesítése lefelé","splitHorizontal":"Cellák szétválasztása vízszintesen","splitVertical":"Cellák szétválasztása függőlegesen","title":"Cella tulajdonságai","cellType":"Cella típusa","rowSpan":"Függőleges egyesítés","colSpan":"Vízszintes egyesítés","wordWrap":"Hosszú sorok törése","hAlign":"Vízszintes igazítás","vAlign":"Függőleges igazítás","alignBaseline":"Alapvonalra","bgColor":"Háttér színe","borderColor":"Keret színe","data":"Adat","header":"Fejléc","yes":"Igen","no":"Nem","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRowSpan":"A függőleges egyesítés mezőbe csak számokat írhat.","invalidColSpan":"A vízszintes egyesítés mezőbe csak számokat írhat.","chooseColor":"Válasszon"},"cellPad":"Cella belső margó","cellSpace":"Cella térköz","column":{"menu":"Oszlop","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteColumn":"Oszlopok törlése"},"columns":"Oszlopok","deleteTable":"Táblázat törlése","headers":"Fejlécek","headersBoth":"Mindkettő","headersColumn":"Első oszlop","headersNone":"Nincsenek","headersRow":"Első sor","invalidBorder":"A szegélyméret mezőbe csak számokat írhat.","invalidCellPadding":"A cella belső margó mezőbe csak számokat írhat.","invalidCellSpacing":"A cella térköz mezőbe csak számokat írhat.","invalidCols":"Az oszlopok számának nagyobbnak kell lenni mint 0.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRows":"A sorok számának nagyobbnak kell lenni mint 0.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","menu":"Táblázat tulajdonságai","row":{"menu":"Sor","insertBefore":"Beszúrás fölé","insertAfter":"Beszúrás alá","deleteRow":"Sorok törlése"},"rows":"Sorok","summary":"Leírás","title":"Táblázat tulajdonságai","toolbar":"Táblázat","widthPc":"százalék","widthPx":"képpont","widthUnit":"Szélesség egység"},"undo":{"redo":"Ismétlés","undo":"Visszavonás"},"wsc":{"btnIgnore":"Kihagyja","btnIgnoreAll":"Mindet kihagyja","btnReplace":"Csere","btnReplaceAll":"Összes cseréje","btnUndo":"Visszavonás","changeTo":"Módosítás","errorLoading":"Hiba a szolgáltatás host betöltése közben: %s.","ieSpellDownload":"A helyesírás-ellenőrző nincs telepítve. Szeretné letölteni most?","manyChanges":"Helyesírás-ellenőrzés kész: %1 szó cserélve","noChanges":"Helyesírás-ellenőrzés kész: Nincs változtatott szó","noMispell":"Helyesírás-ellenőrzés kész: Nem találtam hibát","noSuggestions":"Nincs javaslat","notAvailable":"Sajnálom, de a szolgáltatás jelenleg nem elérhető.","notInDic":"Nincs a szótárban","oneChange":"Helyesírás-ellenőrzés kész: Egy szó cserélve","progress":"Helyesírás-ellenőrzés folyamatban...","title":"Helyesírás ellenörző","toolbar":"Helyesírás-ellenőrzés"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/id.js b/htdocs/includes/ckeditor/ckeditor/lang/id.js
index 9e13c07c180..96e0e073077 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/id.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/id.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['id']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tekan ALT 0 untuk bantuan.","browseServer":"Jelajah Server","url":"URL","protocol":"Protokol","upload":"Unggah","uploadSubmit":"Kirim ke Server","image":"Gambar","flash":"Flash","form":"Formulir","checkbox":"Kotak Cek","radio":"Tombol Radio","textField":"Kolom Teks","textarea":"Area Teks","hiddenField":"Kolom Tersembunyi","button":"Tombol","select":"Kolom Seleksi","imageButton":"Tombol Gambar","notSet":"<tidak diatur>","id":"Id","name":"Nama","langDir":"Arah Bahasa","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri","langCode":"Kode Bahasa","longDescr":"Deskripsi URL Panjang","cssClass":"Kelas Stylesheet","advisoryTitle":"Penasehat Judul","cssStyle":"Gaya","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Pratinjau","resize":"Ubah ukuran","generalTab":"Umum","advancedTab":"Advanced","validateNumberFailed":"Nilai ini tidak sebuah angka","confirmNewPage":"Semua perubahan yang tidak disimpan di konten ini akan hilang. Apakah anda yakin ingin memuat halaman baru?","confirmCancel":"Beberapa opsi telah berubah. Apakah anda yakin ingin menutup dialog?","options":"Opsi","target":"Sasaran","targetNew":"Jendela Baru (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Jendela yang Sama (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Gaya","cssClasses":"Kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Penjajaran","alignLeft":"Kiri","alignRight":"Kanan","alignCenter":"Tengah","alignJustify":"Rata kiri-kanan","alignTop":"Atas","alignMiddle":"Tengah","alignBottom":"Bawah","alignNone":"None","invalidValue":"Nilai tidak sah.","invalidHeight":"Tinggi harus sebuah angka.","invalidWidth":"Lebar harus sebuah angka.","invalidCssLength":"Nilai untuk \"%1\" harus sebuah angkat positif dengan atau tanpa pengukuran unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Nilai yang dispesifikasian untuk kolom \"%1\" harus sebuah angka positif dengan atau tanpa sebuah unit pengukuran HTML (px atau %) yang valid.","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Masukkan sebuah angka untuk sebuah nilai dalam pixel atau sebuah angka dengan unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, tidak tersedia</span>"},"about":{"copy":"Hak cipta &copy; $1. All rights reserved.","dlgTitle":"Tentang CKEditor","help":"Cel $1 untuk bantuan.","moreInfo":"Untuk informasi lisensi silahkan kunjungi web site kami:","title":"Tentang CKEditor","userGuide":"Petunjuk Pengguna CKEditor"},"basicstyles":{"bold":"Huruf Tebal","italic":"Huruf Miring","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Garis Bawah"},"bidi":{"ltr":"Arah penulisan dari kiri ke kanan.","rtl":"Arah penulisan dari kanan ke kiri."},"blockquote":{"toolbar":"Kutipan Blok"},"clipboard":{"copy":"Salin","copyError":"Pengaturan keamanan peramban anda tidak mengizinkan editor untuk mengeksekusi operasi menyalin secara otomatis. Mohon gunakan papan tuts (Ctrl/Cmd+C)","cut":"Potong","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Tempel","pasteArea":"Area Tempel","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Karena pengaturan keamanan peramban anda, editor tida dapat mengakses data clipboard anda secara langsung. Anda harus mem-paste kembali pada halaman ini","title":"Tempel"},"button":{"selectedLabel":"%1(Dipilih)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Warna Latar Belakang","colors":{"000":"Hitam","800000":"Merah Tua","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Abu-abu Gelap","B22222":"Merah Bata","A52A2A":"Coklat","DAA520":"Golden Rod","006400":"Hijau Gelap","40E0D0":"Turquoise","0000CD":"Biru Sedang","800080":"Ungu","808080":"Abu-abu","F00":"Merah","FF8C00":"Jingga Gelap","FFD700":"Emas","008000":"Hijau","0FF":"Cyan","00F":"Biru","EE82EE":"Violet","A9A9A9":"Abu-abu Redup","FFA07A":"Salmon Cerah","FFA500":"Jingga","FFFF00":"Kuning","00FF00":"Jeruk Lemon","AFEEEE":"Biru Hijau Pucat","ADD8E6":"Biru Cerah","DDA0DD":"Plum","D3D3D3":"Abu-abu Cerah","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Kuning Cerah","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Putih"},"more":"Warna lainnya...","panelTitle":"Warna","textColorTitle":"Warna Teks"},"colordialog":{"clear":"Hapus","highlight":"Sorot","options":"Pilihan Warna","selected":"Warna Dipilih","title":"Pilih Warna"},"templates":{"button":"Contoh","emptyListMsg":"(Tidak ada contoh didefinisikan)","insertOption":"Ganti konten sebenarnya","options":"Opsi Contoh","selectPromptMsg":"Mohon pilih contoh untuk dibuka di editor","title":"Contoh Konten"},"contextmenu":{"options":"Opsi Konteks Pilihan"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Penasehat Judul","cssClassInputLabel":"Kelas Stylesheet","edit":"Sunting Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Kiri ke Kanan (LTR)","langDirLabel":"Arah Bahasa","langDirRTLLabel":"Kanan ke Kiri (RTL)","languageCodeInputLabel":"Kode Bahasa","remove":"Hapus Div","styleSelectLabel":"Gaya","title":"Ciptakan Wadah Div","toolbar":"Cipatakan Wadah Div"},"toolbar":{"toolbarCollapse":"Ciutkan Toolbar","toolbarExpand":"Bentangkan Toolbar","toolbarGroups":{"document":"Dokumen","clipboard":"Papan klip / Kembalikan perlakuan","editing":"Sunting","forms":"Formulir","basicstyles":"Gaya Dasar","paragraph":"Paragraf","links":"Tautan","insert":"Sisip","styles":"Gaya","colors":"Warna","tools":"Alat"},"toolbars":"Toolbar Penyunting"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Temukan","findOptions":"Opsi menemukan","findWhat":"Temukan apa:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"Teks yang dipilih tidak ditemukan","replace":"Ganti","replaceAll":"Ganti Semua","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Ganti dengan:","title":"Temukan dan Ganti"},"fakeobjects":{"anchor":"Anchor","flash":"Animasi Flash","hiddenfield":"Kolom Tersembunyi","iframe":"IFrame","unknown":"Obyek Tak Dikenal"},"flash":{"access":"Script Access","accessAlways":"Selalu","accessNever":"Tidak Pernah","accessSameDomain":"Domain yang sama","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Dasar","alignTextTop":"Text Top","bgcolor":"Warna Latar Belakang","chkFull":"Izinkan Layar Penuh","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Mainkan Otomatis","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Flash Properties","propertiesTab":"Properti","quality":"Kualitas","qualityAutoHigh":"Tinggi Otomatis","qualityAutoLow":"Rendah Otomatis","qualityBest":"Terbaik","qualityHigh":"Tinggi","qualityLow":"Rendah","qualityMedium":"Sedang","scale":"Scale","scaleAll":"Perlihatkan semua","scaleFit":"Exact Fit","scaleNoBorder":"Tanpa Batas","title":"Flash Properties","vSpace":"VSpace","validateHSpace":"HSpace harus sebuah angka","validateSrc":"URL tidak boleh kosong","validateVSpace":"VSpace harus sebuah angka","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparan","windowModeWindow":"Jendela"},"font":{"fontSize":{"label":"Ukuran","voiceLabel":"Ukuran Huruf","panelTitle":"Ukuran Huruf"},"label":"Huruf","panelTitle":"Font Name","voiceLabel":"Huruf"},"forms":{"button":{"title":"Properti Tombol","text":"Teks (Nilai)","type":"Tipe","typeBtn":"Tombol","typeSbm":"Menyerahkan","typeRst":"Atur Ulang"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Nilai","selected":"Terpilih","required":"Wajib"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Aksi","method":"Metode","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Nama","value":"Nilai"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Nilai","size":"Ukuran","lines":"garis","chkMulti":"Izinkan pemilihan ganda","required":"Wajib","opText":"Teks","opValue":"Nilai","btnAdd":"Tambah","btnModify":"Modifikasi","btnUp":"Atas","btnDown":"Bawah","btnSetValue":"Atur sebagai nilai yang dipilih","btnDelete":"Hapus"},"textarea":{"title":"Textarea Properties","cols":"Kolom","rows":"Baris"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Nilai","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Wajib","type":"Tipe","typeText":"Teks","typePass":"Kata kunci","typeEmail":"Surel","typeSearch":"Cari","typeTel":"Nomor Telepon","typeUrl":"URL"}},"format":{"label":"Bentuk","panelTitle":"Bentuk Paragraf","tag_address":"Alamat","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Membentuk"},"horizontalrule":{"toolbar":"Sisip Garis Horisontal"},"iframe":{"border":"Tampilkan Batas Bingkai","noUrl":"Please type the iframe URL","scrolling":"Aktifkan Scrollbar","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Teks alternatif","border":"Batas","btnUpload":"Kirim ke Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Apakah anda ingin mengubah gambar yang dipilih pada tombol gambar?","infoTab":"Info Gambar","linkTab":"Tautan","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Atur Ulang Ukuran","title":"Image Properties","titleButton":"Image Button Properties","upload":"Unggah","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border harus berupa angka","validateHSpace":"HSpace harus berupa angka","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Tingkatkan Lekuk","outdent":"Kurangi Lekuk"},"smiley":{"options":"Opsi Smiley","title":"Sisip sebuah Smiley","toolbar":"Smiley"},"justify":{"block":"Rata kiri-kanan","center":"Pusat","left":"Align Left","right":"Align Right"},"language":{"button":"Atur Bahasa","remove":"Hapus Bahasa"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Penasehat Judul","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Kelas Stylesheet","emailAddress":"Alamat E-mail","emailBody":"Message Body","emailSubject":"Judul Pesan","id":"Id","info":"Link Info","langCode":"Kode Bahasa","langDir":"Arah Bahasa","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","menu":"Sunting Tautan","name":"Nama","noAnchors":"(No anchors available in the document)","noEmail":"Silahkan ketikkan alamat e-mail","noUrl":"Silahkan ketik URL tautan","other":"<lainnya>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Hubungan","selectAnchor":"Select an Anchor","styles":"Gaya","tabIndex":"Tab Index","target":"Sasaran","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Tautan","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Tautan","type":"Link Type","unlink":"Unlink","upload":"Unggah"},"list":{"bulletedlist":"Sisip/Hapus Daftar Bullet","numberedlist":"Sisip/Hapus Daftar Bernomor"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Lingkaran","decimal":"Desimal (1, 2, 3, dst.)","decimalLeadingZero":"Desimal diawali angka nol (01, 02, 03, dst.)","disc":"Cakram","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Huruf Kecil (a, b, c, d, e, dst.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Angka Romawi (i, ii, iii, iv, v, dst.)","none":"Tidak ada","notset":"<tidak diatur>","numberedTitle":"Numbered List Properties","square":"Persegi","start":"Mulai","type":"Tipe","upperAlpha":"Huruf Besar (A, B, C, D, E, dst.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Masukkan paragraf disini"},"maximize":{"maximize":"Memperbesar","minimize":"Memperkecil"},"newpage":{"toolbar":"Halaman Baru"},"pagebreak":{"alt":"Halaman Istirahat","toolbar":"Sisip Halaman Istirahat untuk Pencetakan "},"pastetext":{"button":"Tempel sebagai teks polos","title":"Tempel sebagai Teks Polos"},"pastefromword":{"confirmCleanup":"Teks yang ingin anda tempel sepertinya di salin dari Word. Apakah anda mau membersihkannya sebelum menempel?","error":"Tidak mungkin membersihkan data yang ditempel dikerenakan kesalahan internal","title":"Tempel dari Word","toolbar":"Tempel dari Word"},"preview":{"preview":"Pratinjau"},"print":{"toolbar":"Cetak"},"removeformat":{"toolbar":"Hapus Format"},"save":{"toolbar":"Simpan"},"selectall":{"toolbar":"Pilih Semua"},"showblocks":{"toolbar":"Perlihatkan Blok"},"sourcearea":{"toolbar":"Sumber"},"specialchar":{"options":"Opsi spesial karakter","title":"Pilih spesial karakter","toolbar":"Sisipkan spesial karakter"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Gaya","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Ukuran batas","caption":"Judul halaman","cell":{"menu":"Sel","insertBefore":"Sisip Sel Sebelum","insertAfter":"Sisip Sel Setelah","deleteCell":"Hapus Sel","merge":"Gabungkan Sel","mergeRight":"Gabungkan ke Kanan","mergeDown":"Gabungkan ke Bawah","splitHorizontal":"Pisahkan Sel Secara Horisontal","splitVertical":"Pisahkan Sel Secara Vertikal","title":"Properti Sel","cellType":"Tipe Sel","rowSpan":"Rentang antar baris","colSpan":"Rentang antar kolom","wordWrap":"Word Wrap","hAlign":"Jajaran Horisontal","vAlign":"Jajaran Vertikal","alignBaseline":"Dasar","bgColor":"Warna Latar Belakang","borderColor":"Warna Batasan","data":"Data","header":"Header","yes":"Ya","no":"Tidak","invalidWidth":"Lebar sel harus sebuah angka.","invalidHeight":"Tinggi sel harus sebuah angka","invalidRowSpan":"Rentang antar baris harus angka seluruhnya.","invalidColSpan":"Rentang antar kolom harus angka seluruhnya","chooseColor":"Pilih"},"cellPad":"Sel spasi dalam","cellSpace":"Spasi antar sel","column":{"menu":"Kolom","insertBefore":"Sisip Kolom Sebelum","insertAfter":"Sisip Kolom Sesudah","deleteColumn":"Hapus Kolom"},"columns":"Kolom","deleteTable":"Hapus Tabel","headers":"Headers","headersBoth":"Keduanya","headersColumn":"Kolom pertama","headersNone":"Tidak ada","headersRow":"Baris Pertama","invalidBorder":"Ukuran batasan harus sebuah angka","invalidCellPadding":"'Spasi dalam' sel harus angka positif.","invalidCellSpacing":"Spasi antar sel harus angka positif.","invalidCols":"Jumlah kolom harus sebuah angka lebih besar dari 0","invalidHeight":"Tinggi tabel harus sebuah angka.","invalidRows":"Jumlah barus harus sebuah angka dan lebih besar dari 0.","invalidWidth":"Lebar tabel harus sebuah angka.","menu":"Properti Tabel","row":{"menu":"Baris","insertBefore":"Sisip Baris Sebelum","insertAfter":"Sisip Baris Sesudah","deleteRow":"Hapus Baris"},"rows":"Baris","summary":"Intisari","title":"Properti Tabel","toolbar":"Tabe","widthPc":"persen","widthPx":"piksel","widthUnit":"lebar satuan"},"undo":{"redo":"Kembali lakukan","undo":"Batalkan perlakuan"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
+CKEDITOR.lang['id']={"editor":"Rich Text Editor","editorPanel":"Panel Rich Text Editor","common":{"editorHelp":"Tekan ALT 0 untuk bantuan.","browseServer":"Jelajah Server","url":"URL","protocol":"Protokol","upload":"Unggah","uploadSubmit":"Kirim ke Server","image":"Gambar","flash":"Flash","form":"Formulir","checkbox":"Kotak Cek","radio":"Tombol Radio","textField":"Kolom Teks","textarea":"Area Teks","hiddenField":"Kolom Tersembunyi","button":"Tombol","select":"Kolom Seleksi","imageButton":"Tombol Gambar","notSet":"<tidak diatur>","id":"Id","name":"Nama","langDir":"Arah Bahasa","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri","langCode":"Kode Bahasa","longDescr":"Deskripsi URL Panjang","cssClass":"Kelas Stylesheet","advisoryTitle":"Penasehat Judul","cssStyle":"Gaya","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Pratinjau","resize":"Ubah ukuran","generalTab":"Umum","advancedTab":"Lebih Lanjut","validateNumberFailed":"Nilai ini tidak sebuah angka","confirmNewPage":"Semua perubahan yang tidak disimpan di konten ini akan hilang. Apakah anda yakin ingin memuat halaman baru?","confirmCancel":"Beberapa opsi telah berubah. Apakah anda yakin ingin menutup dialog?","options":"Opsi","target":"Sasaran","targetNew":"Jendela Baru (_blank)","targetTop":"Laman Atas (_top)","targetSelf":"Jendela yang Sama (_self)","targetParent":"Jendela Induk (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Gaya","cssClasses":"Kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Penjajaran","alignLeft":"Kiri","alignRight":"Kanan","alignCenter":"Tengah","alignJustify":"Rata kiri-kanan","alignTop":"Atas","alignMiddle":"Tengah","alignBottom":"Bawah","alignNone":"Tidak ada","invalidValue":"Nilai tidak sah.","invalidHeight":"Tinggi harus sebuah angka.","invalidWidth":"Lebar harus sebuah angka.","invalidCssLength":"Nilai untuk \"%1\" harus sebuah angkat positif dengan atau tanpa pengukuran unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Nilai yang dispesifikasian untuk kolom \"%1\" harus sebuah angka positif dengan atau tanpa sebuah unit pengukuran HTML (px atau %) yang valid.","invalidInlineStyle":"Nilai pada inline style merupakan pasangan nama dan nilai dengan format \"nama : nilai\", yang dipisahkan dengan titik dua.","cssLengthTooltip":"Masukkan sebuah angka untuk sebuah nilai dalam pixel atau sebuah angka dengan unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, tidak tersedia</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Spasi","35":"End","36":"Home","46":"Hapus","224":"Command"},"keyboardShortcut":"Pintasan Keyboard"},"about":{"copy":"Hak cipta &copy; $1. All rights reserved.","dlgTitle":"Tentang CKEditor","help":"Cel $1 untuk bantuan.","moreInfo":"Untuk informasi lisensi silahkan kunjungi web site kami:","title":"Tentang CKEditor","userGuide":"Petunjuk Pengguna CKEditor"},"basicstyles":{"bold":"Huruf Tebal","italic":"Huruf Miring","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Garis Bawah"},"bidi":{"ltr":"Arah penulisan dari kiri ke kanan.","rtl":"Arah penulisan dari kanan ke kiri."},"blockquote":{"toolbar":"Kutipan Blok"},"clipboard":{"copy":"Salin","copyError":"Pengaturan keamanan peramban anda tidak mengizinkan editor untuk mengeksekusi operasi menyalin secara otomatis. Mohon gunakan papan tuts (Ctrl/Cmd+C)","cut":"Potong","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Tempel","pasteArea":"Area Tempel","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Karena pengaturan keamanan peramban anda, editor tida dapat mengakses data clipboard anda secara langsung. Anda harus mem-paste kembali pada halaman ini","title":"Tempel"},"button":{"selectedLabel":"%1(Dipilih)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Warna Latar Belakang","colors":{"000":"Hitam","800000":"Merah Tua","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Abu-abu Gelap","B22222":"Merah Bata","A52A2A":"Coklat","DAA520":"Golden Rod","006400":"Hijau Gelap","40E0D0":"Turquoise","0000CD":"Biru Sedang","800080":"Ungu","808080":"Abu-abu","F00":"Merah","FF8C00":"Jingga Gelap","FFD700":"Emas","008000":"Hijau","0FF":"Cyan","00F":"Biru","EE82EE":"Violet","A9A9A9":"Abu-abu Redup","FFA07A":"Salmon Cerah","FFA500":"Jingga","FFFF00":"Kuning","00FF00":"Jeruk Lemon","AFEEEE":"Biru Hijau Pucat","ADD8E6":"Biru Cerah","DDA0DD":"Plum","D3D3D3":"Abu-abu Cerah","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Kuning Cerah","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Putih","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Warna lainnya...","panelTitle":"Warna","textColorTitle":"Warna Teks"},"colordialog":{"clear":"Hapus","highlight":"Sorot","options":"Pilihan Warna","selected":"Warna Dipilih","title":"Pilih Warna"},"templates":{"button":"Contoh","emptyListMsg":"(Tidak ada contoh didefinisikan)","insertOption":"Ganti konten sebenarnya","options":"Opsi Contoh","selectPromptMsg":"Mohon pilih contoh untuk dibuka di editor","title":"Contoh Konten"},"contextmenu":{"options":"Opsi Konteks Pilihan"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Penasehat Judul","cssClassInputLabel":"Kelas Stylesheet","edit":"Sunting Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Kiri ke Kanan (LTR)","langDirLabel":"Arah Bahasa","langDirRTLLabel":"Kanan ke Kiri (RTL)","languageCodeInputLabel":"Kode Bahasa","remove":"Hapus Div","styleSelectLabel":"Gaya","title":"Ciptakan Wadah Div","toolbar":"Cipatakan Wadah Div"},"toolbar":{"toolbarCollapse":"Ciutkan Toolbar","toolbarExpand":"Bentangkan Toolbar","toolbarGroups":{"document":"Dokumen","clipboard":"Papan klip / Kembalikan perlakuan","editing":"Sunting","forms":"Formulir","basicstyles":"Gaya Dasar","paragraph":"Paragraf","links":"Tautan","insert":"Sisip","styles":"Gaya","colors":"Warna","tools":"Alat"},"toolbars":"Toolbar Penyunting"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Temukan","findOptions":"Opsi menemukan","findWhat":"Temukan apa:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"Teks yang dipilih tidak ditemukan","replace":"Ganti","replaceAll":"Ganti Semua","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Ganti dengan:","title":"Temukan dan Ganti"},"fakeobjects":{"anchor":"Anchor","flash":"Animasi Flash","hiddenfield":"Kolom Tersembunyi","iframe":"IFrame","unknown":"Obyek Tak Dikenal"},"flash":{"access":"Script Access","accessAlways":"Selalu","accessNever":"Tidak Pernah","accessSameDomain":"Domain yang sama","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Dasar","alignTextTop":"Text Top","bgcolor":"Warna Latar Belakang","chkFull":"Izinkan Layar Penuh","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Mainkan Otomatis","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Flash Properties","propertiesTab":"Properti","quality":"Kualitas","qualityAutoHigh":"Tinggi Otomatis","qualityAutoLow":"Rendah Otomatis","qualityBest":"Terbaik","qualityHigh":"Tinggi","qualityLow":"Rendah","qualityMedium":"Sedang","scale":"Scale","scaleAll":"Perlihatkan semua","scaleFit":"Exact Fit","scaleNoBorder":"Tanpa Batas","title":"Flash Properties","vSpace":"VSpace","validateHSpace":"HSpace harus sebuah angka","validateSrc":"URL tidak boleh kosong","validateVSpace":"VSpace harus sebuah angka","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparan","windowModeWindow":"Jendela"},"font":{"fontSize":{"label":"Ukuran","voiceLabel":"Ukuran Huruf","panelTitle":"Ukuran Huruf"},"label":"Huruf","panelTitle":"Font Name","voiceLabel":"Huruf"},"forms":{"button":{"title":"Properti Tombol","text":"Teks (Nilai)","type":"Tipe","typeBtn":"Tombol","typeSbm":"Menyerahkan","typeRst":"Atur Ulang"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Nilai","selected":"Terpilih","required":"Wajib"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Aksi","method":"Metode","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Nama","value":"Nilai"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Nilai","size":"Ukuran","lines":"garis","chkMulti":"Izinkan pemilihan ganda","required":"Wajib","opText":"Teks","opValue":"Nilai","btnAdd":"Tambah","btnModify":"Modifikasi","btnUp":"Atas","btnDown":"Bawah","btnSetValue":"Atur sebagai nilai yang dipilih","btnDelete":"Hapus"},"textarea":{"title":"Textarea Properties","cols":"Kolom","rows":"Baris"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Nilai","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Wajib","type":"Tipe","typeText":"Teks","typePass":"Kata kunci","typeEmail":"Surel","typeSearch":"Cari","typeTel":"Nomor Telepon","typeUrl":"URL"}},"format":{"label":"Bentuk","panelTitle":"Bentuk Paragraf","tag_address":"Alamat","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Membentuk"},"horizontalrule":{"toolbar":"Sisip Garis Horisontal"},"iframe":{"border":"Tampilkan Batas Bingkai","noUrl":"Please type the iframe URL","scrolling":"Aktifkan Scrollbar","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Teks alternatif","border":"Batas","btnUpload":"Kirim ke Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Apakah anda ingin mengubah gambar yang dipilih pada tombol gambar?","infoTab":"Info Gambar","linkTab":"Tautan","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Atur Ulang Ukuran","title":"Image Properties","titleButton":"Image Button Properties","upload":"Unggah","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border harus berupa angka","validateHSpace":"HSpace harus berupa angka","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Tingkatkan Lekuk","outdent":"Kurangi Lekuk"},"smiley":{"options":"Opsi Smiley","title":"Sisip sebuah Smiley","toolbar":"Smiley"},"justify":{"block":"Rata kiri-kanan","center":"Pusat","left":"Align Left","right":"Align Right"},"language":{"button":"Atur Bahasa","remove":"Hapus Bahasa"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Penasehat Judul","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Kelas Stylesheet","download":"Force Download","displayText":"Display Text","emailAddress":"Alamat E-mail","emailBody":"Message Body","emailSubject":"Judul Pesan","id":"Id","info":"Link Info","langCode":"Kode Bahasa","langDir":"Arah Bahasa","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","menu":"Sunting Tautan","name":"Nama","noAnchors":"(No anchors available in the document)","noEmail":"Silahkan ketikkan alamat e-mail","noUrl":"Silahkan ketik URL tautan","other":"<lainnya>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Hubungan","selectAnchor":"Select an Anchor","styles":"Gaya","tabIndex":"Tab Index","target":"Sasaran","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Tautan","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Tautan","type":"Link Type","unlink":"Unlink","upload":"Unggah"},"list":{"bulletedlist":"Sisip/Hapus Daftar Bullet","numberedlist":"Sisip/Hapus Daftar Bernomor"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Lingkaran","decimal":"Desimal (1, 2, 3, dst.)","decimalLeadingZero":"Desimal diawali angka nol (01, 02, 03, dst.)","disc":"Cakram","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Huruf Kecil (a, b, c, d, e, dst.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Angka Romawi (i, ii, iii, iv, v, dst.)","none":"Tidak ada","notset":"<tidak diatur>","numberedTitle":"Numbered List Properties","square":"Persegi","start":"Mulai","type":"Tipe","upperAlpha":"Huruf Besar (A, B, C, D, E, dst.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Masukkan paragraf disini"},"maximize":{"maximize":"Memperbesar","minimize":"Memperkecil"},"newpage":{"toolbar":"Halaman Baru"},"pagebreak":{"alt":"Halaman Istirahat","toolbar":"Sisip Halaman Istirahat untuk Pencetakan "},"pastetext":{"button":"Tempel sebagai teks polos","title":"Tempel sebagai Teks Polos"},"pastefromword":{"confirmCleanup":"Teks yang ingin anda tempel sepertinya di salin dari Word. Apakah anda mau membersihkannya sebelum menempel?","error":"Tidak mungkin membersihkan data yang ditempel dikerenakan kesalahan internal","title":"Tempel dari Word","toolbar":"Tempel dari Word"},"preview":{"preview":"Pratinjau"},"print":{"toolbar":"Cetak"},"removeformat":{"toolbar":"Hapus Format"},"save":{"toolbar":"Simpan"},"selectall":{"toolbar":"Pilih Semua"},"showblocks":{"toolbar":"Perlihatkan Blok"},"sourcearea":{"toolbar":"Sumber"},"specialchar":{"options":"Opsi spesial karakter","title":"Pilih spesial karakter","toolbar":"Sisipkan spesial karakter"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Gaya","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Ukuran batas","caption":"Judul halaman","cell":{"menu":"Sel","insertBefore":"Sisip Sel Sebelum","insertAfter":"Sisip Sel Setelah","deleteCell":"Hapus Sel","merge":"Gabungkan Sel","mergeRight":"Gabungkan ke Kanan","mergeDown":"Gabungkan ke Bawah","splitHorizontal":"Pisahkan Sel Secara Horisontal","splitVertical":"Pisahkan Sel Secara Vertikal","title":"Properti Sel","cellType":"Tipe Sel","rowSpan":"Rentang antar baris","colSpan":"Rentang antar kolom","wordWrap":"Word Wrap","hAlign":"Jajaran Horisontal","vAlign":"Jajaran Vertikal","alignBaseline":"Dasar","bgColor":"Warna Latar Belakang","borderColor":"Warna Batasan","data":"Data","header":"Header","yes":"Ya","no":"Tidak","invalidWidth":"Lebar sel harus sebuah angka.","invalidHeight":"Tinggi sel harus sebuah angka","invalidRowSpan":"Rentang antar baris harus angka seluruhnya.","invalidColSpan":"Rentang antar kolom harus angka seluruhnya","chooseColor":"Pilih"},"cellPad":"Sel spasi dalam","cellSpace":"Spasi antar sel","column":{"menu":"Kolom","insertBefore":"Sisip Kolom Sebelum","insertAfter":"Sisip Kolom Sesudah","deleteColumn":"Hapus Kolom"},"columns":"Kolom","deleteTable":"Hapus Tabel","headers":"Headers","headersBoth":"Keduanya","headersColumn":"Kolom pertama","headersNone":"Tidak ada","headersRow":"Baris Pertama","invalidBorder":"Ukuran batasan harus sebuah angka","invalidCellPadding":"'Spasi dalam' sel harus angka positif.","invalidCellSpacing":"Spasi antar sel harus angka positif.","invalidCols":"Jumlah kolom harus sebuah angka lebih besar dari 0","invalidHeight":"Tinggi tabel harus sebuah angka.","invalidRows":"Jumlah barus harus sebuah angka dan lebih besar dari 0.","invalidWidth":"Lebar tabel harus sebuah angka.","menu":"Properti Tabel","row":{"menu":"Baris","insertBefore":"Sisip Baris Sebelum","insertAfter":"Sisip Baris Sesudah","deleteRow":"Hapus Baris"},"rows":"Baris","summary":"Intisari","title":"Properti Tabel","toolbar":"Tabe","widthPc":"persen","widthPx":"piksel","widthUnit":"lebar satuan"},"undo":{"redo":"Kembali lakukan","undo":"Batalkan perlakuan"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/is.js b/htdocs/includes/ckeditor/ckeditor/lang/is.js
index 18689dc17f0..a8cf47eb6b6 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/is.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/is.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['is']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Fletta í skjalasafni","url":"Vefslóð","protocol":"Samskiptastaðall","upload":"Senda upp","uploadSubmit":"Hlaða upp","image":"Setja inn mynd","flash":"Flash","form":"Setja inn innsláttarform","checkbox":"Setja inn hökunarreit","radio":"Setja inn valhnapp","textField":"Setja inn textareit","textarea":"Setja inn textasvæði","hiddenField":"Setja inn falið svæði","button":"Setja inn hnapp","select":"Setja inn lista","imageButton":"Setja inn myndahnapp","notSet":"<ekkert valið>","id":"Auðkenni","name":"Nafn","langDir":"Lesstefna","langDirLtr":"Frá vinstri til hægri (LTR)","langDirRtl":"Frá hægri til vinstri (RTL)","langCode":"Tungumálakóði","longDescr":"Nánari lýsing","cssClass":"Stílsniðsflokkur","advisoryTitle":"Titill","cssStyle":"Stíll","ok":"Í lagi","cancel":"Hætta við","close":"Close","preview":"Forskoða","resize":"Resize","generalTab":"Almennt","advancedTab":"Tæknilegt","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Mark","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Frá vinstri til hægri (LTR)","langDirRTL":"Frá hægri til vinstri (RTL)","styles":"Stíll","cssClasses":"Stílsniðsflokkur","width":"Breidd","height":"Hæð","align":"Jöfnun","alignLeft":"Vinstri","alignRight":"Hægri","alignCenter":"Miðjað","alignJustify":"Jafna báðum megin","alignTop":"Efst","alignMiddle":"Miðjuð","alignBottom":"Neðst","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Feitletrað","italic":"Skáletrað","strike":"Yfirstrikað","subscript":"Niðurskrifað","superscript":"Uppskrifað","underline":"Undirstrikað"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Inndráttur"},"clipboard":{"copy":"Afrita","copyError":"Öryggisstillingar vafrans þíns leyfa ekki afritun texta með músaraðgerð. Notaðu lyklaborðið í afrita (Ctrl/Cmd+C).","cut":"Klippa","cutError":"Öryggisstillingar vafrans þíns leyfa ekki klippingu texta með músaraðgerð. Notaðu lyklaborðið í klippa (Ctrl/Cmd+X).","paste":"Líma","pasteArea":"Paste Area","pasteMsg":"Límdu í svæðið hér að neðan og (<STRONG>Ctrl/Cmd+V</STRONG>) og smelltu á <STRONG>OK</STRONG>.","securityMsg":"Vegna öryggisstillinga í vafranum þínum fær ritillinn ekki beinan aðgang að klippuborðinu. Þú verður að líma innihaldið aftur inn í þennan glugga.","title":"Líma"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Sjálfval","bgColorTitle":"Bakgrunnslitur","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"Fleiri liti...","panelTitle":"Colors","textColorTitle":"Litur texta"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Sniðmát","emptyListMsg":"(Ekkert sniðmát er skilgreint!)","insertOption":"Skipta út raunverulegu innihaldi","options":"Template Options","selectPromptMsg":"Veldu sniðmát til að opna í ritlinum.<br>(Núverandi innihald víkur fyrir því!):","title":"Innihaldssniðmát"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Leita","findOptions":"Find Options","findWhat":"Leita að:","matchCase":"Gera greinarmun á¡ há¡- og lágstöfum","matchCyclic":"Match cyclic","matchWord":"Aðeins heil orð","notFoundMsg":"Leitartexti fannst ekki!","replace":"Skipta út","replaceAll":"Skipta út allsstaðar","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Skipta út fyrir:","title":"Finna og skipta"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs neðst","alignAbsMiddle":"Abs miðjuð","alignBaseline":"Grunnlína","alignTextTop":"Efri brún texta","bgcolor":"Bakgrunnslitur","chkFull":"Allow Fullscreen","chkLoop":"Endurtekning","chkMenu":"Sýna Flash-valmynd","chkPlay":"Sjálfvirk spilun","flashvars":"Variables for Flash","hSpace":"Vinstri bil","properties":"Eigindi Flash","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Skali","scaleAll":"Sýna allt","scaleFit":"Fella skala að stærð","scaleNoBorder":"Án ramma","title":"Eigindi Flash","vSpace":"Hægri bil","validateHSpace":"HSpace must be a number.","validateSrc":"Sláðu inn veffang stiklunnar!","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Leturstærð ","voiceLabel":"Font Size","panelTitle":"Leturstærð "},"label":"Leturgerð ","panelTitle":"Leturgerð ","voiceLabel":"Leturgerð "},"forms":{"button":{"title":"Eigindi hnapps","text":"Texti","type":"Gerð","typeBtn":"Hnappur","typeSbm":"Staðfesta","typeRst":"Hreinsa"},"checkboxAndRadio":{"checkboxTitle":"Eigindi markreits","radioTitle":"Eigindi valhnapps","value":"Gildi","selected":"Valið","required":"Required"},"form":{"title":"Eigindi innsláttarforms","menu":"Eigindi innsláttarforms","action":"Aðgerð","method":"Aðferð","encoding":"Encoding"},"hidden":{"title":"Eigindi falins svæðis","name":"Nafn","value":"Gildi"},"select":{"title":"Eigindi lista","selectInfo":"Upplýsingar","opAvail":"Kostir","value":"Gildi","size":"Stærð","lines":"línur","chkMulti":"Leyfa fleiri kosti","required":"Required","opText":"Texti","opValue":"Gildi","btnAdd":"Bæta við","btnModify":"Breyta","btnUp":"Upp","btnDown":"Niður","btnSetValue":"Merkja sem valið","btnDelete":"Eyða"},"textarea":{"title":"Eigindi textasvæðis","cols":"Dálkar","rows":"Línur"},"textfield":{"title":"Eigindi textareits","name":"Nafn","value":"Gildi","charWidth":"Breidd (leturtákn)","maxChars":"Hámarksfjöldi leturtákna","required":"Required","type":"Gerð","typeText":"Texti","typePass":"Lykilorð","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"Vefslóð"}},"format":{"label":"Stílsnið","panelTitle":"Stílsnið","tag_address":"Vistfang","tag_div":"Venjulegt (DIV)","tag_h1":"Fyrirsögn 1","tag_h2":"Fyrirsögn 2","tag_h3":"Fyrirsögn 3","tag_h4":"Fyrirsögn 4","tag_h5":"Fyrirsögn 5","tag_h6":"Fyrirsögn 6","tag_p":"Venjulegt letur","tag_pre":"Forsniðið"},"horizontalrule":{"toolbar":"Lóðrétt lína"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Baklægur texti","border":"Rammi","btnUpload":"Hlaða upp","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Vinstri bil","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Almennt","linkTab":"Stikla","lockRatio":"Festa stærðarhlutfall","menu":"Eigindi myndar","resetSize":"Reikna stærð","title":"Eigindi myndar","titleButton":"Eigindi myndahnapps","upload":"Hlaða upp","urlMissing":"Image source URL is missing.","vSpace":"Hægri bil","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Minnka inndrátt","outdent":"Auka inndrátt"},"smiley":{"options":"Smiley Options","title":"Velja svip","toolbar":"Svipur"},"justify":{"block":"Jafna báðum megin","center":"Miðja texta","left":"Vinstrijöfnun","right":"Hægrijöfnun"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Skammvalshnappur","advanced":"Tæknilegt","advisoryContentType":"Tegund innihalds","advisoryTitle":"Titill","anchor":{"toolbar":"Stofna/breyta kaflamerki","menu":"Eigindi kaflamerkis","title":"Eigindi kaflamerkis","name":"Nafn bókamerkis","errorName":"Sláðu inn nafn bókamerkis!","remove":"Remove Anchor"},"anchorId":"Eftir auðkenni einingar","anchorName":"Eftir akkerisnafni","charset":"Táknróf","cssClasses":"Stílsniðsflokkur","emailAddress":"Netfang","emailBody":"Meginmál","emailSubject":"Efni","id":"Auðkenni","info":"Almennt","langCode":"Lesstefna","langDir":"Lesstefna","langDirLTR":"Frá vinstri til hægri (LTR)","langDirRTL":"Frá hægri til vinstri (RTL)","menu":"Breyta stiklu","name":"Nafn","noAnchors":"<Engin bókamerki á skrá>","noEmail":"Sláðu inn netfang!","noUrl":"Sláðu inn veffang stiklunnar!","other":"<annar>","popupDependent":"Háð venslum (Netscape)","popupFeatures":"Eigindi sprettiglugga","popupFullScreen":"Heilskjár (IE)","popupLeft":"Fjarlægð frá vinstri","popupLocationBar":"Fanglína","popupMenuBar":"Vallína","popupResizable":"Resizable","popupScrollBars":"Skrunstikur","popupStatusBar":"Stöðustika","popupToolbar":"Verkfærastika","popupTop":"Fjarlægð frá efri brún","rel":"Relationship","selectAnchor":"Veldu akkeri","styles":"Stíll","tabIndex":"Raðnúmer innsláttarreits","target":"Mark","targetFrame":"<rammi>","targetFrameName":"Nafn markglugga","targetPopup":"<sprettigluggi>","targetPopupName":"Nafn sprettiglugga","title":"Stikla","toAnchor":"Bókamerki á þessari síðu","toEmail":"Netfang","toUrl":"Vefslóð","toolbar":"Stofna/breyta stiklu","type":"Stikluflokkur","unlink":"Fjarlægja stiklu","upload":"Senda upp"},"list":{"bulletedlist":"Punktalisti","numberedlist":"Númeraður listi"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"Ný síða"},"pagebreak":{"alt":"Page Break","toolbar":"Setja inn síðuskil"},"pastetext":{"button":"Líma sem ósniðinn texta","title":"Líma sem ósniðinn texta"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Líma úr Word","toolbar":"Líma úr Word"},"preview":{"preview":"Forskoða"},"print":{"toolbar":"Prenta"},"removeformat":{"toolbar":"Fjarlægja snið"},"save":{"toolbar":"Vista"},"selectall":{"toolbar":"Velja allt"},"showblocks":{"toolbar":"Sýna blokkir"},"sourcearea":{"toolbar":"Kóði"},"specialchar":{"options":"Special Character Options","title":"Velja tákn","toolbar":"Setja inn merki"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stílflokkur","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Breidd ramma","caption":"Titill","cell":{"menu":"Reitur","insertBefore":"Skjóta inn reiti fyrir aftan","insertAfter":"Skjóta inn reiti fyrir framan","deleteCell":"Fella reit","merge":"Sameina reiti","mergeRight":"Sameina til hægri","mergeDown":"Sameina niður á við","splitHorizontal":"Kljúfa reit lárétt","splitVertical":"Kljúfa reit lóðrétt","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Reitaspássía","cellSpace":"Bil milli reita","column":{"menu":"Dálkur","insertBefore":"Skjóta inn dálki vinstra megin","insertAfter":"Skjóta inn dálki hægra megin","deleteColumn":"Fella dálk"},"columns":"Dálkar","deleteTable":"Fella töflu","headers":"Fyrirsagnir","headersBoth":"Hvort tveggja","headersColumn":"Fyrsti dálkur","headersNone":"Engar","headersRow":"Fyrsta röð","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Eigindi töflu","row":{"menu":"Röð","insertBefore":"Skjóta inn röð fyrir ofan","insertAfter":"Skjóta inn röð fyrir neðan","deleteRow":"Eyða röð"},"rows":"Raðir","summary":"Áfram","title":"Eigindi töflu","toolbar":"Tafla","widthPc":"prósent","widthPx":"myndeindir","widthUnit":"width unit"},"undo":{"redo":"Hætta við afturköllun","undo":"Afturkalla"},"wsc":{"btnIgnore":"Hunsa","btnIgnoreAll":"Hunsa allt","btnReplace":"Skipta","btnReplaceAll":"Skipta öllu","btnUndo":"Til baka","changeTo":"Tillaga","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Villuleit ekki sett upp.<br>Viltu setja hana upp?","manyChanges":"Villuleit lokið: %1 orðum breytt","noChanges":"Villuleit lokið: Engu orði breytt","noMispell":"Villuleit lokið: Engin villa fannst","noSuggestions":"- engar tillögur -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Ekki í orðabókinni","oneChange":"Villuleit lokið: Einu orði breytt","progress":"Villuleit í gangi...","title":"Spell Checker","toolbar":"Villuleit"}};
\ No newline at end of file
+CKEDITOR.lang['is']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Fletta í skjalasafni","url":"Vefslóð","protocol":"Samskiptastaðall","upload":"Senda upp","uploadSubmit":"Hlaða upp","image":"Setja inn mynd","flash":"Flash","form":"Setja inn innsláttarform","checkbox":"Setja inn hökunarreit","radio":"Setja inn valhnapp","textField":"Setja inn textareit","textarea":"Setja inn textasvæði","hiddenField":"Setja inn falið svæði","button":"Setja inn hnapp","select":"Setja inn lista","imageButton":"Setja inn myndahnapp","notSet":"<ekkert valið>","id":"Auðkenni","name":"Nafn","langDir":"Lesstefna","langDirLtr":"Frá vinstri til hægri (LTR)","langDirRtl":"Frá hægri til vinstri (RTL)","langCode":"Tungumálakóði","longDescr":"Nánari lýsing","cssClass":"Stílsniðsflokkur","advisoryTitle":"Titill","cssStyle":"Stíll","ok":"Í lagi","cancel":"Hætta við","close":"Close","preview":"Forskoða","resize":"Resize","generalTab":"Almennt","advancedTab":"Tæknilegt","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Mark","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Frá vinstri til hægri (LTR)","langDirRTL":"Frá hægri til vinstri (RTL)","styles":"Stíll","cssClasses":"Stílsniðsflokkur","width":"Breidd","height":"Hæð","align":"Jöfnun","alignLeft":"Vinstri","alignRight":"Hægri","alignCenter":"Miðjað","alignJustify":"Jafna báðum megin","alignTop":"Efst","alignMiddle":"Miðjuð","alignBottom":"Neðst","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Feitletrað","italic":"Skáletrað","strike":"Yfirstrikað","subscript":"Niðurskrifað","superscript":"Uppskrifað","underline":"Undirstrikað"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Inndráttur"},"clipboard":{"copy":"Afrita","copyError":"Öryggisstillingar vafrans þíns leyfa ekki afritun texta með músaraðgerð. Notaðu lyklaborðið í afrita (Ctrl/Cmd+C).","cut":"Klippa","cutError":"Öryggisstillingar vafrans þíns leyfa ekki klippingu texta með músaraðgerð. Notaðu lyklaborðið í klippa (Ctrl/Cmd+X).","paste":"Líma","pasteArea":"Paste Area","pasteMsg":"Límdu í svæðið hér að neðan og (<STRONG>Ctrl/Cmd+V</STRONG>) og smelltu á <STRONG>OK</STRONG>.","securityMsg":"Vegna öryggisstillinga í vafranum þínum fær ritillinn ekki beinan aðgang að klippuborðinu. Þú verður að líma innihaldið aftur inn í þennan glugga.","title":"Líma"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Sjálfval","bgColorTitle":"Bakgrunnslitur","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Fleiri liti...","panelTitle":"Colors","textColorTitle":"Litur texta"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Sniðmát","emptyListMsg":"(Ekkert sniðmát er skilgreint!)","insertOption":"Skipta út raunverulegu innihaldi","options":"Template Options","selectPromptMsg":"Veldu sniðmát til að opna í ritlinum.<br>(Núverandi innihald víkur fyrir því!):","title":"Innihaldssniðmát"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Leita","findOptions":"Find Options","findWhat":"Leita að:","matchCase":"Gera greinarmun á¡ há¡- og lágstöfum","matchCyclic":"Match cyclic","matchWord":"Aðeins heil orð","notFoundMsg":"Leitartexti fannst ekki!","replace":"Skipta út","replaceAll":"Skipta út allsstaðar","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Skipta út fyrir:","title":"Finna og skipta"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs neðst","alignAbsMiddle":"Abs miðjuð","alignBaseline":"Grunnlína","alignTextTop":"Efri brún texta","bgcolor":"Bakgrunnslitur","chkFull":"Allow Fullscreen","chkLoop":"Endurtekning","chkMenu":"Sýna Flash-valmynd","chkPlay":"Sjálfvirk spilun","flashvars":"Variables for Flash","hSpace":"Vinstri bil","properties":"Eigindi Flash","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Skali","scaleAll":"Sýna allt","scaleFit":"Fella skala að stærð","scaleNoBorder":"Án ramma","title":"Eigindi Flash","vSpace":"Hægri bil","validateHSpace":"HSpace must be a number.","validateSrc":"Sláðu inn veffang stiklunnar!","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Leturstærð ","voiceLabel":"Font Size","panelTitle":"Leturstærð "},"label":"Leturgerð ","panelTitle":"Leturgerð ","voiceLabel":"Leturgerð "},"forms":{"button":{"title":"Eigindi hnapps","text":"Texti","type":"Gerð","typeBtn":"Hnappur","typeSbm":"Staðfesta","typeRst":"Hreinsa"},"checkboxAndRadio":{"checkboxTitle":"Eigindi markreits","radioTitle":"Eigindi valhnapps","value":"Gildi","selected":"Valið","required":"Required"},"form":{"title":"Eigindi innsláttarforms","menu":"Eigindi innsláttarforms","action":"Aðgerð","method":"Aðferð","encoding":"Encoding"},"hidden":{"title":"Eigindi falins svæðis","name":"Nafn","value":"Gildi"},"select":{"title":"Eigindi lista","selectInfo":"Upplýsingar","opAvail":"Kostir","value":"Gildi","size":"Stærð","lines":"línur","chkMulti":"Leyfa fleiri kosti","required":"Required","opText":"Texti","opValue":"Gildi","btnAdd":"Bæta við","btnModify":"Breyta","btnUp":"Upp","btnDown":"Niður","btnSetValue":"Merkja sem valið","btnDelete":"Eyða"},"textarea":{"title":"Eigindi textasvæðis","cols":"Dálkar","rows":"Línur"},"textfield":{"title":"Eigindi textareits","name":"Nafn","value":"Gildi","charWidth":"Breidd (leturtákn)","maxChars":"Hámarksfjöldi leturtákna","required":"Required","type":"Gerð","typeText":"Texti","typePass":"Lykilorð","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"Vefslóð"}},"format":{"label":"Stílsnið","panelTitle":"Stílsnið","tag_address":"Vistfang","tag_div":"Venjulegt (DIV)","tag_h1":"Fyrirsögn 1","tag_h2":"Fyrirsögn 2","tag_h3":"Fyrirsögn 3","tag_h4":"Fyrirsögn 4","tag_h5":"Fyrirsögn 5","tag_h6":"Fyrirsögn 6","tag_p":"Venjulegt letur","tag_pre":"Forsniðið"},"horizontalrule":{"toolbar":"Lóðrétt lína"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Baklægur texti","border":"Rammi","btnUpload":"Hlaða upp","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Vinstri bil","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Almennt","linkTab":"Stikla","lockRatio":"Festa stærðarhlutfall","menu":"Eigindi myndar","resetSize":"Reikna stærð","title":"Eigindi myndar","titleButton":"Eigindi myndahnapps","upload":"Hlaða upp","urlMissing":"Image source URL is missing.","vSpace":"Hægri bil","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Minnka inndrátt","outdent":"Auka inndrátt"},"smiley":{"options":"Smiley Options","title":"Velja svip","toolbar":"Svipur"},"justify":{"block":"Jafna báðum megin","center":"Miðja texta","left":"Vinstrijöfnun","right":"Hægrijöfnun"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Skammvalshnappur","advanced":"Tæknilegt","advisoryContentType":"Tegund innihalds","advisoryTitle":"Titill","anchor":{"toolbar":"Stofna/breyta kaflamerki","menu":"Eigindi kaflamerkis","title":"Eigindi kaflamerkis","name":"Nafn bókamerkis","errorName":"Sláðu inn nafn bókamerkis!","remove":"Remove Anchor"},"anchorId":"Eftir auðkenni einingar","anchorName":"Eftir akkerisnafni","charset":"Táknróf","cssClasses":"Stílsniðsflokkur","download":"Force Download","displayText":"Display Text","emailAddress":"Netfang","emailBody":"Meginmál","emailSubject":"Efni","id":"Auðkenni","info":"Almennt","langCode":"Lesstefna","langDir":"Lesstefna","langDirLTR":"Frá vinstri til hægri (LTR)","langDirRTL":"Frá hægri til vinstri (RTL)","menu":"Breyta stiklu","name":"Nafn","noAnchors":"<Engin bókamerki á skrá>","noEmail":"Sláðu inn netfang!","noUrl":"Sláðu inn veffang stiklunnar!","other":"<annar>","popupDependent":"Háð venslum (Netscape)","popupFeatures":"Eigindi sprettiglugga","popupFullScreen":"Heilskjár (IE)","popupLeft":"Fjarlægð frá vinstri","popupLocationBar":"Fanglína","popupMenuBar":"Vallína","popupResizable":"Resizable","popupScrollBars":"Skrunstikur","popupStatusBar":"Stöðustika","popupToolbar":"Verkfærastika","popupTop":"Fjarlægð frá efri brún","rel":"Relationship","selectAnchor":"Veldu akkeri","styles":"Stíll","tabIndex":"Raðnúmer innsláttarreits","target":"Mark","targetFrame":"<rammi>","targetFrameName":"Nafn markglugga","targetPopup":"<sprettigluggi>","targetPopupName":"Nafn sprettiglugga","title":"Stikla","toAnchor":"Bókamerki á þessari síðu","toEmail":"Netfang","toUrl":"Vefslóð","toolbar":"Stofna/breyta stiklu","type":"Stikluflokkur","unlink":"Fjarlægja stiklu","upload":"Senda upp"},"list":{"bulletedlist":"Punktalisti","numberedlist":"Númeraður listi"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"Ný síða"},"pagebreak":{"alt":"Page Break","toolbar":"Setja inn síðuskil"},"pastetext":{"button":"Líma sem ósniðinn texta","title":"Líma sem ósniðinn texta"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Líma úr Word","toolbar":"Líma úr Word"},"preview":{"preview":"Forskoða"},"print":{"toolbar":"Prenta"},"removeformat":{"toolbar":"Fjarlægja snið"},"save":{"toolbar":"Vista"},"selectall":{"toolbar":"Velja allt"},"showblocks":{"toolbar":"Sýna blokkir"},"sourcearea":{"toolbar":"Kóði"},"specialchar":{"options":"Special Character Options","title":"Velja tákn","toolbar":"Setja inn merki"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stílflokkur","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Breidd ramma","caption":"Titill","cell":{"menu":"Reitur","insertBefore":"Skjóta inn reiti fyrir aftan","insertAfter":"Skjóta inn reiti fyrir framan","deleteCell":"Fella reit","merge":"Sameina reiti","mergeRight":"Sameina til hægri","mergeDown":"Sameina niður á við","splitHorizontal":"Kljúfa reit lárétt","splitVertical":"Kljúfa reit lóðrétt","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Reitaspássía","cellSpace":"Bil milli reita","column":{"menu":"Dálkur","insertBefore":"Skjóta inn dálki vinstra megin","insertAfter":"Skjóta inn dálki hægra megin","deleteColumn":"Fella dálk"},"columns":"Dálkar","deleteTable":"Fella töflu","headers":"Fyrirsagnir","headersBoth":"Hvort tveggja","headersColumn":"Fyrsti dálkur","headersNone":"Engar","headersRow":"Fyrsta röð","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Eigindi töflu","row":{"menu":"Röð","insertBefore":"Skjóta inn röð fyrir ofan","insertAfter":"Skjóta inn röð fyrir neðan","deleteRow":"Eyða röð"},"rows":"Raðir","summary":"Áfram","title":"Eigindi töflu","toolbar":"Tafla","widthPc":"prósent","widthPx":"myndeindir","widthUnit":"width unit"},"undo":{"redo":"Hætta við afturköllun","undo":"Afturkalla"},"wsc":{"btnIgnore":"Hunsa","btnIgnoreAll":"Hunsa allt","btnReplace":"Skipta","btnReplaceAll":"Skipta öllu","btnUndo":"Til baka","changeTo":"Tillaga","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Villuleit ekki sett upp.<br>Viltu setja hana upp?","manyChanges":"Villuleit lokið: %1 orðum breytt","noChanges":"Villuleit lokið: Engu orði breytt","noMispell":"Villuleit lokið: Engin villa fannst","noSuggestions":"- engar tillögur -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Ekki í orðabókinni","oneChange":"Villuleit lokið: Einu orði breytt","progress":"Villuleit í gangi...","title":"Spell Checker","toolbar":"Villuleit"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/it.js b/htdocs/includes/ckeditor/ckeditor/lang/it.js
index 7cc9bacba4b..346d30c275c 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/it.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/it.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['it']={"editor":"Rich Text Editor","editorPanel":"Pannello Rich Text Editor","common":{"editorHelp":"Premi ALT 0 per aiuto","browseServer":"Cerca sul server","url":"URL","protocol":"Protocollo","upload":"Carica","uploadSubmit":"Invia al server","image":"Immagine","flash":"Oggetto Flash","form":"Modulo","checkbox":"Checkbox","radio":"Radio Button","textField":"Campo di testo","textarea":"Area di testo","hiddenField":"Campo nascosto","button":"Bottone","select":"Menu di selezione","imageButton":"Bottone immagine","notSet":"<non impostato>","id":"Id","name":"Nome","langDir":"Direzione scrittura","langDirLtr":"Da Sinistra a Destra (LTR)","langDirRtl":"Da Destra a Sinistra (RTL)","langCode":"Codice Lingua","longDescr":"URL descrizione estesa","cssClass":"Nome classe CSS","advisoryTitle":"Titolo","cssStyle":"Stile","ok":"OK","cancel":"Annulla","close":"Chiudi","preview":"Anteprima","resize":"Trascina per ridimensionare","generalTab":"Generale","advancedTab":"Avanzate","validateNumberFailed":"Il valore inserito non è un numero.","confirmNewPage":"Ogni modifica non salvata sarà persa. Sei sicuro di voler caricare una nuova pagina?","confirmCancel":"Alcune delle opzioni sono state cambiate. Sei sicuro di voler chiudere la finestra di dialogo?","options":"Opzioni","target":"Destinazione","targetNew":"Nuova finestra (_blank)","targetTop":"Finestra in primo piano (_top)","targetSelf":"Stessa finestra (_self)","targetParent":"Finestra Padre (_parent)","langDirLTR":"Da sinistra a destra (LTR)","langDirRTL":"Da destra a sinistra (RTL)","styles":"Stile","cssClasses":"Classi di stile","width":"Larghezza","height":"Altezza","align":"Allineamento","alignLeft":"Sinistra","alignRight":"Destra","alignCenter":"Centrato","alignJustify":"Giustifica","alignTop":"In Alto","alignMiddle":"Centrato","alignBottom":"In Basso","alignNone":"Nessuno","invalidValue":"Valore non valido.","invalidHeight":"L'altezza dev'essere un numero","invalidWidth":"La Larghezza dev'essere un numero","invalidCssLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le classi CSS (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le pagine HTML (px o %).","invalidInlineStyle":"Il valore specificato per lo stile inline deve consistere in una o più tuple con il formato di \"name : value\", separati da semicolonne.","cssLengthTooltip":"Inserisci un numero per il valore in pixel oppure un numero con una valida unità CSS (px, %, in, cm, mm, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, non disponibile</span>"},"about":{"copy":"Copyright &copy; $1. Tutti i diritti riservati.","dlgTitle":"Riguardo CKEditor","help":"Vedi $1 per l'aiuto.","moreInfo":"Per le informazioni sulla licenza si prega di visitare il nostro sito:","title":"Riguardo CKEditor","userGuide":"Guida Utente CKEditor"},"basicstyles":{"bold":"Grassetto","italic":"Corsivo","strike":"Barrato","subscript":"Pedice","superscript":"Apice","underline":"Sottolineato"},"bidi":{"ltr":"Direzione del testo da sinistra verso destra","rtl":"Direzione del testo da destra verso sinistra"},"blockquote":{"toolbar":"Citazione"},"clipboard":{"copy":"Copia","copyError":"Le impostazioni di sicurezza del browser non permettono di copiare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+C).","cut":"Taglia","cutError":"Le impostazioni di sicurezza del browser non permettono di tagliare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+X).","paste":"Incolla","pasteArea":"Incolla","pasteMsg":"Incolla il testo all'interno dell'area sottostante usando la scorciatoia di tastiere (<STRONG>Ctrl/Cmd+V</STRONG>) e premi <STRONG>OK</STRONG>.","securityMsg":"A causa delle impostazioni di sicurezza del browser,l'editor non è in grado di accedere direttamente agli appunti. E' pertanto necessario incollarli di nuovo in questa finestra.","title":"Incolla"},"button":{"selectedLabel":"%1 (selezionato)"},"colorbutton":{"auto":"Automatico","bgColorTitle":"Colore sfondo","colors":{"000":"Nero","800000":"Marrone Castagna","8B4513":"Marrone Cuoio","2F4F4F":"Grigio Fumo di Londra","008080":"Acquamarina","000080":"Blu Oceano","4B0082":"Indigo","696969":"Grigio Scuro","B22222":"Giallo Fiamma","A52A2A":"Marrone","DAA520":"Giallo Mimosa","006400":"Verde Scuro","40E0D0":"Turchese","0000CD":"Blue Scuro","800080":"Viola","808080":"Grigio","F00":"Rosso","FF8C00":"Arancio Scuro","FFD700":"Oro","008000":"Verde","0FF":"Ciano","00F":"Blu","EE82EE":"Violetto","A9A9A9":"Grigio Scuro","FFA07A":"Salmone","FFA500":"Arancio","FFFF00":"Giallo","00FF00":"Lime","AFEEEE":"Turchese Chiaro","ADD8E6":"Blu Chiaro","DDA0DD":"Rosso Ciliegia","D3D3D3":"Grigio Chiaro","FFF0F5":"Lavanda Chiara","FAEBD7":"Bianco Antico","FFFFE0":"Giallo Chiaro","F0FFF0":"Verde Mela","F0FFFF":"Azzurro","F0F8FF":"Celeste","E6E6FA":"Lavanda","FFF":"Bianco"},"more":"Altri colori...","panelTitle":"Colori","textColorTitle":"Colore testo"},"colordialog":{"clear":"cancella","highlight":"Evidenzia","options":"Opzioni colore","selected":"Seleziona il colore","title":"Selezionare il colore"},"templates":{"button":"Modelli","emptyListMsg":"(Nessun modello definito)","insertOption":"Cancella il contenuto corrente","options":"Opzioni del Modello","selectPromptMsg":"Seleziona il modello da aprire nell'editor","title":"Contenuto dei modelli"},"contextmenu":{"options":"Opzioni del menù contestuale"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Titolo Avviso","cssClassInputLabel":"Classi di stile","edit":"Modifica DIV","inlineStyleInputLabel":"Stile Inline","langDirLTRLabel":"Da sinistra a destra (LTR)","langDirLabel":"Direzione di scrittura","langDirRTLLabel":"Da destra a sinistra (RTL)","languageCodeInputLabel":"Codice lingua","remove":"Rimuovi DIV","styleSelectLabel":"Stile","title":"Crea DIV contenitore","toolbar":"Crea DIV contenitore"},"toolbar":{"toolbarCollapse":"Minimizza Toolbar","toolbarExpand":"Espandi Toolbar","toolbarGroups":{"document":"Documento","clipboard":"Copia negli appunti/Annulla","editing":"Modifica","forms":"Form","basicstyles":"Stili di base","paragraph":"Paragrafo","links":"Link","insert":"Inserisci","styles":"Stili","colors":"Colori","tools":"Strumenti"},"toolbars":"Editor toolbar"},"elementspath":{"eleLabel":"Percorso degli elementi","eleTitle":"%1 elemento"},"find":{"find":"Trova","findOptions":"Opzioni di ricerca","findWhat":"Trova:","matchCase":"Maiuscole/minuscole","matchCyclic":"Ricerca ciclica","matchWord":"Solo parole intere","notFoundMsg":"L'elemento cercato non è stato trovato.","replace":"Sostituisci","replaceAll":"Sostituisci tutto","replaceSuccessMsg":"%1 occorrenza(e) sostituite.","replaceWith":"Sostituisci con:","title":"Cerca e Sostituisci"},"fakeobjects":{"anchor":"Ancora","flash":"Animazione Flash","hiddenfield":"Campo Nascosto","iframe":"IFrame","unknown":"Oggetto sconosciuto"},"flash":{"access":"Accesso Script","accessAlways":"Sempre","accessNever":"Mai","accessSameDomain":"Solo stesso dominio","alignAbsBottom":"In basso assoluto","alignAbsMiddle":"Centrato assoluto","alignBaseline":"Linea base","alignTextTop":"In alto al testo","bgcolor":"Colore sfondo","chkFull":"Permetti la modalità tutto schermo","chkLoop":"Riavvio automatico","chkMenu":"Abilita Menu di Flash","chkPlay":"Avvio Automatico","flashvars":"Variabili per Flash","hSpace":"HSpace","properties":"Proprietà Oggetto Flash","propertiesTab":"Proprietà","quality":"Qualità","qualityAutoHigh":"Alta Automatica","qualityAutoLow":"Bassa Automatica","qualityBest":"Massima","qualityHigh":"Alta","qualityLow":"Bassa","qualityMedium":"Intermedia","scale":"Ridimensiona","scaleAll":"Mostra Tutto","scaleFit":"Dimensione Esatta","scaleNoBorder":"Senza Bordo","title":"Proprietà Oggetto Flash","vSpace":"VSpace","validateHSpace":"L'HSpace dev'essere un numero.","validateSrc":"Devi inserire l'URL del collegamento","validateVSpace":"Il VSpace dev'essere un numero.","windowMode":"Modalità finestra","windowModeOpaque":"Opaca","windowModeTransparent":"Trasparente","windowModeWindow":"Finestra"},"font":{"fontSize":{"label":"Dimensione","voiceLabel":"Dimensione Carattere","panelTitle":"Dimensione"},"label":"Carattere","panelTitle":"Carattere","voiceLabel":"Carattere"},"forms":{"button":{"title":"Proprietà bottone","text":"Testo (Valore)","type":"Tipo","typeBtn":"Bottone","typeSbm":"Invio","typeRst":"Annulla"},"checkboxAndRadio":{"checkboxTitle":"Proprietà checkbox","radioTitle":"Proprietà radio button","value":"Valore","selected":"Selezionato","required":"Richiesto"},"form":{"title":"Proprietà modulo","menu":"Proprietà modulo","action":"Azione","method":"Metodo","encoding":"Codifica"},"hidden":{"title":"Proprietà campo nascosto","name":"Nome","value":"Valore"},"select":{"title":"Proprietà menu di selezione","selectInfo":"Info","opAvail":"Opzioni disponibili","value":"Valore","size":"Dimensione","lines":"righe","chkMulti":"Permetti selezione multipla","required":"Richiesto","opText":"Testo","opValue":"Valore","btnAdd":"Aggiungi","btnModify":"Modifica","btnUp":"Su","btnDown":"Gi","btnSetValue":"Imposta come predefinito","btnDelete":"Rimuovi"},"textarea":{"title":"Proprietà area di testo","cols":"Colonne","rows":"Righe"},"textfield":{"title":"Proprietà campo di testo","name":"Nome","value":"Valore","charWidth":"Larghezza","maxChars":"Numero massimo di caratteri","required":"Richiesto","type":"Tipo","typeText":"Testo","typePass":"Password","typeEmail":"Email","typeSearch":"Cerca","typeTel":"Numero di telefono","typeUrl":"URL"}},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Indirizzo","tag_div":"Paragrafo (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normale","tag_pre":"Formattato"},"horizontalrule":{"toolbar":"Inserisci riga orizzontale"},"iframe":{"border":"Mostra il bordo","noUrl":"Inserire l'URL del campo IFrame","scrolling":"Abilita scrollbar","title":"Proprietà IFrame","toolbar":"IFrame"},"image":{"alt":"Testo alternativo","border":"Bordo","btnUpload":"Invia al server","button2Img":"Vuoi trasformare il bottone immagine selezionato in un'immagine semplice?","hSpace":"HSpace","img2Button":"Vuoi trasferomare l'immagine selezionata in un bottone immagine?","infoTab":"Informazioni immagine","linkTab":"Collegamento","lockRatio":"Blocca rapporto","menu":"Proprietà immagine","resetSize":"Reimposta dimensione","title":"Proprietà immagine","titleButton":"Proprietà bottone immagine","upload":"Carica","urlMissing":"Manca l'URL dell'immagine.","vSpace":"VSpace","validateBorder":"Il campo Bordo deve essere un numero intero.","validateHSpace":"Il campo HSpace deve essere un numero intero.","validateVSpace":"Il campo VSpace deve essere un numero intero."},"indent":{"indent":"Aumenta rientro","outdent":"Riduci rientro"},"smiley":{"options":"Opzioni Smiley","title":"Inserisci emoticon","toolbar":"Emoticon"},"justify":{"block":"Giustifica","center":"Centra","left":"Allinea a sinistra","right":"Allinea a destra"},"language":{"button":"Imposta lingua","remove":"Rimuovi lingua"},"link":{"acccessKey":"Scorciatoia da tastiera","advanced":"Avanzate","advisoryContentType":"Tipo della risorsa collegata","advisoryTitle":"Titolo","anchor":{"toolbar":"Inserisci/Modifica Ancora","menu":"Proprietà ancora","title":"Proprietà ancora","name":"Nome ancora","errorName":"Inserici il nome dell'ancora","remove":"Rimuovi l'ancora"},"anchorId":"Per id elemento","anchorName":"Per Nome","charset":"Set di caretteri della risorsa collegata","cssClasses":"Nome classe CSS","emailAddress":"Indirizzo E-Mail","emailBody":"Corpo del messaggio","emailSubject":"Oggetto del messaggio","id":"Id","info":"Informazioni collegamento","langCode":"Direzione scrittura","langDir":"Direzione scrittura","langDirLTR":"Da Sinistra a Destra (LTR)","langDirRTL":"Da Destra a Sinistra (RTL)","menu":"Modifica collegamento","name":"Nome","noAnchors":"(Nessuna ancora disponibile nel documento)","noEmail":"Devi inserire un'indirizzo e-mail","noUrl":"Devi inserire l'URL del collegamento","other":"<altro>","popupDependent":"Dipendente (Netscape)","popupFeatures":"Caratteristiche finestra popup","popupFullScreen":"A tutto schermo (IE)","popupLeft":"Posizione da sinistra","popupLocationBar":"Barra degli indirizzi","popupMenuBar":"Barra del menu","popupResizable":"Ridimensionabile","popupScrollBars":"Barre di scorrimento","popupStatusBar":"Barra di stato","popupToolbar":"Barra degli strumenti","popupTop":"Posizione dall'alto","rel":"Relazioni","selectAnchor":"Scegli Ancora","styles":"Stile","tabIndex":"Ordine di tabulazione","target":"Destinazione","targetFrame":"<riquadro>","targetFrameName":"Nome del riquadro di destinazione","targetPopup":"<finestra popup>","targetPopupName":"Nome finestra popup","title":"Collegamento","toAnchor":"Ancora nel testo","toEmail":"E-Mail","toUrl":"URL","toolbar":"Collegamento","type":"Tipo di Collegamento","unlink":"Elimina collegamento","upload":"Carica"},"list":{"bulletedlist":"Inserisci/Rimuovi Elenco Puntato","numberedlist":"Inserisci/Rimuovi Elenco Numerato"},"liststyle":{"armenian":"Numerazione Armena","bulletedTitle":"Proprietà liste puntate","circle":"Cerchio","decimal":"Decimale (1, 2, 3, ecc.)","decimalLeadingZero":"Decimale preceduto da 0 (01, 02, 03, ecc.)","disc":"Disco","georgian":"Numerazione Georgiana (an, ban, gan, ecc.)","lowerAlpha":"Alfabetico minuscolo (a, b, c, d, e, ecc.)","lowerGreek":"Greco minuscolo (alpha, beta, gamma, ecc.)","lowerRoman":"Numerazione Romana minuscola (i, ii, iii, iv, v, ecc.)","none":"Nessuno","notset":"<non impostato>","numberedTitle":"Proprietà liste numerate","square":"Quadrato","start":"Inizio","type":"Tipo","upperAlpha":"Alfabetico maiuscolo (A, B, C, D, E, ecc.)","upperRoman":"Numerazione Romana maiuscola (I, II, III, IV, V, ecc.)","validateStartNumber":"Il numero di inizio di una lista numerata deve essere un numero intero."},"magicline":{"title":"Inserisci paragrafo qui"},"maximize":{"maximize":"Massimizza","minimize":"Minimizza"},"newpage":{"toolbar":"Nuova pagina"},"pagebreak":{"alt":"Interruzione di pagina","toolbar":"Inserisci interruzione di pagina per la stampa"},"pastetext":{"button":"Incolla come testo semplice","title":"Incolla come testo semplice"},"pastefromword":{"confirmCleanup":"Il testo da incollare sembra provenire da Word. Desideri pulirlo prima di incollare?","error":"Non è stato possibile eliminare il testo incollato a causa di un errore interno.","title":"Incolla da Word","toolbar":"Incolla da Word"},"preview":{"preview":"Anteprima"},"print":{"toolbar":"Stampa"},"removeformat":{"toolbar":"Elimina formattazione"},"save":{"toolbar":"Salva"},"selectall":{"toolbar":"Seleziona tutto"},"showblocks":{"toolbar":"Visualizza Blocchi"},"sourcearea":{"toolbar":"Sorgente"},"specialchar":{"options":"Opzioni carattere speciale","title":"Seleziona carattere speciale","toolbar":"Inserisci carattere speciale"},"scayt":{"btn_about":"About COMS","btn_dictionaries":"Dizionari","btn_disable":"Disabilita COMS","btn_enable":"Abilita COMS","btn_langs":"Lingue","btn_options":"Opzioni","text_title":"Controllo Ortografico Mentre Scrivi"},"stylescombo":{"label":"Stili","panelTitle":"Stili di formattazione","panelTitle1":"Stili per blocchi","panelTitle2":"Stili in linea","panelTitle3":"Stili per oggetti"},"table":{"border":"Dimensione bordo","caption":"Intestazione","cell":{"menu":"Cella","insertBefore":"Inserisci Cella Prima","insertAfter":"Inserisci Cella Dopo","deleteCell":"Elimina celle","merge":"Unisce celle","mergeRight":"Unisci a Destra","mergeDown":"Unisci in Basso","splitHorizontal":"Dividi Cella Orizzontalmente","splitVertical":"Dividi Cella Verticalmente","title":"Proprietà della cella","cellType":"Tipo di cella","rowSpan":"Su più righe","colSpan":"Su più colonne","wordWrap":"Ritorno a capo","hAlign":"Allineamento orizzontale","vAlign":"Allineamento verticale","alignBaseline":"Linea Base","bgColor":"Colore di Sfondo","borderColor":"Colore del Bordo","data":"Dati","header":"Intestazione","yes":"Si","no":"No","invalidWidth":"La larghezza della cella dev'essere un numero.","invalidHeight":"L'altezza della cella dev'essere un numero.","invalidRowSpan":"Il numero di righe dev'essere un numero intero.","invalidColSpan":"Il numero di colonne dev'essere un numero intero.","chooseColor":"Scegli"},"cellPad":"Padding celle","cellSpace":"Spaziatura celle","column":{"menu":"Colonna","insertBefore":"Inserisci Colonna Prima","insertAfter":"Inserisci Colonna Dopo","deleteColumn":"Elimina colonne"},"columns":"Colonne","deleteTable":"Cancella Tabella","headers":"Intestazione","headersBoth":"Entrambe","headersColumn":"Prima Colonna","headersNone":"Nessuna","headersRow":"Prima Riga","invalidBorder":"La dimensione del bordo dev'essere un numero.","invalidCellPadding":"Il paging delle celle dev'essere un numero","invalidCellSpacing":"La spaziatura tra le celle dev'essere un numero.","invalidCols":"Il numero di colonne dev'essere un numero maggiore di 0.","invalidHeight":"L'altezza della tabella dev'essere un numero.","invalidRows":"Il numero di righe dev'essere un numero maggiore di 0.","invalidWidth":"La larghezza della tabella dev'essere un numero.","menu":"Proprietà tabella","row":{"menu":"Riga","insertBefore":"Inserisci Riga Prima","insertAfter":"Inserisci Riga Dopo","deleteRow":"Elimina righe"},"rows":"Righe","summary":"Indice","title":"Proprietà tabella","toolbar":"Tabella","widthPc":"percento","widthPx":"pixel","widthUnit":"unità larghezza"},"undo":{"redo":"Ripristina","undo":"Annulla"},"wsc":{"btnIgnore":"Ignora","btnIgnoreAll":"Ignora tutto","btnReplace":"Cambia","btnReplaceAll":"Cambia tutto","btnUndo":"Annulla","changeTo":"Cambia in","errorLoading":"Errore nel caricamento dell'host col servizio applicativo: %s.","ieSpellDownload":"Contollo ortografico non installato. Lo vuoi scaricare ora?","manyChanges":"Controllo ortografico completato: %1 parole cambiate","noChanges":"Controllo ortografico completato: nessuna parola cambiata","noMispell":"Controllo ortografico completato: nessun errore trovato","noSuggestions":"- Nessun suggerimento -","notAvailable":"Il servizio non è momentaneamente disponibile.","notInDic":"Non nel dizionario","oneChange":"Controllo ortografico completato: 1 parola cambiata","progress":"Controllo ortografico in corso","title":"Controllo ortografico","toolbar":"Correttore ortografico"}};
\ No newline at end of file
+CKEDITOR.lang['it']={"editor":"Rich Text Editor","editorPanel":"Pannello Rich Text Editor","common":{"editorHelp":"Premi ALT 0 per aiuto","browseServer":"Cerca sul server","url":"URL","protocol":"Protocollo","upload":"Carica","uploadSubmit":"Invia al server","image":"Immagine","flash":"Oggetto Flash","form":"Modulo","checkbox":"Checkbox","radio":"Radio Button","textField":"Campo di testo","textarea":"Area di testo","hiddenField":"Campo nascosto","button":"Bottone","select":"Menu di selezione","imageButton":"Bottone immagine","notSet":"<non impostato>","id":"Id","name":"Nome","langDir":"Direzione scrittura","langDirLtr":"Da Sinistra a Destra (LTR)","langDirRtl":"Da Destra a Sinistra (RTL)","langCode":"Codice Lingua","longDescr":"URL descrizione estesa","cssClass":"Nome classe CSS","advisoryTitle":"Titolo","cssStyle":"Stile","ok":"OK","cancel":"Annulla","close":"Chiudi","preview":"Anteprima","resize":"Trascina per ridimensionare","generalTab":"Generale","advancedTab":"Avanzate","validateNumberFailed":"Il valore inserito non è un numero.","confirmNewPage":"Ogni modifica non salvata sarà persa. Sei sicuro di voler caricare una nuova pagina?","confirmCancel":"Alcune delle opzioni sono state cambiate. Sei sicuro di voler chiudere la finestra di dialogo?","options":"Opzioni","target":"Destinazione","targetNew":"Nuova finestra (_blank)","targetTop":"Finestra in primo piano (_top)","targetSelf":"Stessa finestra (_self)","targetParent":"Finestra Padre (_parent)","langDirLTR":"Da sinistra a destra (LTR)","langDirRTL":"Da destra a sinistra (RTL)","styles":"Stile","cssClasses":"Classi di stile","width":"Larghezza","height":"Altezza","align":"Allineamento","alignLeft":"Sinistra","alignRight":"Destra","alignCenter":"Centrato","alignJustify":"Giustifica","alignTop":"In Alto","alignMiddle":"Centrato","alignBottom":"In Basso","alignNone":"Nessuno","invalidValue":"Valore non valido.","invalidHeight":"L'altezza dev'essere un numero","invalidWidth":"La Larghezza dev'essere un numero","invalidCssLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le classi CSS (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le pagine HTML (px o %).","invalidInlineStyle":"Il valore specificato per lo stile inline deve consistere in una o più tuple con il formato di \"name : value\", separati da semicolonne.","cssLengthTooltip":"Inserisci un numero per il valore in pixel oppure un numero con una valida unità CSS (px, %, in, cm, mm, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, non disponibile</span>","keyboard":{"8":"Backspace","13":"Invio","16":"Maiusc","17":"Ctrl","18":"Alt","32":"Spazio","35":"Fine","36":"Inizio","46":"Canc","224":"Comando"},"keyboardShortcut":"Scorciatoia da tastiera"},"about":{"copy":"Copyright &copy; $1. Tutti i diritti riservati.","dlgTitle":"Riguardo CKEditor","help":"Vedi $1 per l'aiuto.","moreInfo":"Per le informazioni sulla licenza si prega di visitare il nostro sito:","title":"Riguardo CKEditor","userGuide":"Guida Utente CKEditor"},"basicstyles":{"bold":"Grassetto","italic":"Corsivo","strike":"Barrato","subscript":"Pedice","superscript":"Apice","underline":"Sottolineato"},"bidi":{"ltr":"Direzione del testo da sinistra verso destra","rtl":"Direzione del testo da destra verso sinistra"},"blockquote":{"toolbar":"Citazione"},"clipboard":{"copy":"Copia","copyError":"Le impostazioni di sicurezza del browser non permettono di copiare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+C).","cut":"Taglia","cutError":"Le impostazioni di sicurezza del browser non permettono di tagliare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+X).","paste":"Incolla","pasteArea":"Incolla","pasteMsg":"Incolla il testo all'interno dell'area sottostante usando la scorciatoia di tastiere (<STRONG>Ctrl/Cmd+V</STRONG>) e premi <STRONG>OK</STRONG>.","securityMsg":"A causa delle impostazioni di sicurezza del browser,l'editor non è in grado di accedere direttamente agli appunti. E' pertanto necessario incollarli di nuovo in questa finestra.","title":"Incolla"},"button":{"selectedLabel":"%1 (selezionato)"},"colorbutton":{"auto":"Automatico","bgColorTitle":"Colore sfondo","colors":{"000":"Nero","800000":"Marrone Castagna","8B4513":"Marrone Cuoio","2F4F4F":"Grigio Fumo di Londra","008080":"Acquamarina","000080":"Blu Oceano","4B0082":"Indigo","696969":"Grigio Scuro","B22222":"Giallo Fiamma","A52A2A":"Marrone","DAA520":"Giallo Mimosa","006400":"Verde Scuro","40E0D0":"Turchese","0000CD":"Blue Scuro","800080":"Viola","808080":"Grigio","F00":"Rosso","FF8C00":"Arancio Scuro","FFD700":"Oro","008000":"Verde","0FF":"Ciano","00F":"Blu","EE82EE":"Violetto","A9A9A9":"Grigio Scuro","FFA07A":"Salmone","FFA500":"Arancio","FFFF00":"Giallo","00FF00":"Lime","AFEEEE":"Turchese Chiaro","ADD8E6":"Blu Chiaro","DDA0DD":"Rosso Ciliegia","D3D3D3":"Grigio Chiaro","FFF0F5":"Lavanda Chiara","FAEBD7":"Bianco Antico","FFFFE0":"Giallo Chiaro","F0FFF0":"Verde Mela","F0FFFF":"Azzurro","F0F8FF":"Celeste","E6E6FA":"Lavanda","FFF":"Bianco","1ABC9C":"Ciano intenso","2ECC71":"Smeraldo","3498DB":"Blu luminoso","9B59B6":"Ametista","4E5F70":"Blu grigiastro","F1C40F":"Giallo vivido","16A085":"Ciano scuro","27AE60":"Smeraldo scuro","2980B9":"Blu intenso","8E44AD":"Viola scuro","2C3E50":"Blu desaturato","F39C12":"Arancio","E67E22":"Carota","E74C3C":"Rosso pallido","ECF0F1":"Argento luminoso","95A5A6":"Ciano grigiastro chiaro","DDD":"Grigio chiaro","D35400":"Zucca","C0392B":"Rosso intenso","BDC3C7":"Argento","7F8C8D":"Ciano grigiastro","999":"Grigio scuro"},"more":"Altri colori...","panelTitle":"Colori","textColorTitle":"Colore testo"},"colordialog":{"clear":"cancella","highlight":"Evidenzia","options":"Opzioni colore","selected":"Seleziona il colore","title":"Selezionare il colore"},"templates":{"button":"Modelli","emptyListMsg":"(Nessun modello definito)","insertOption":"Cancella il contenuto corrente","options":"Opzioni del Modello","selectPromptMsg":"Seleziona il modello da aprire nell'editor","title":"Contenuto dei modelli"},"contextmenu":{"options":"Opzioni del menù contestuale"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Titolo Avviso","cssClassInputLabel":"Classi di stile","edit":"Modifica DIV","inlineStyleInputLabel":"Stile Inline","langDirLTRLabel":"Da sinistra a destra (LTR)","langDirLabel":"Direzione di scrittura","langDirRTLLabel":"Da destra a sinistra (RTL)","languageCodeInputLabel":"Codice lingua","remove":"Rimuovi DIV","styleSelectLabel":"Stile","title":"Crea DIV contenitore","toolbar":"Crea DIV contenitore"},"toolbar":{"toolbarCollapse":"Minimizza Toolbar","toolbarExpand":"Espandi Toolbar","toolbarGroups":{"document":"Documento","clipboard":"Copia negli appunti/Annulla","editing":"Modifica","forms":"Form","basicstyles":"Stili di base","paragraph":"Paragrafo","links":"Link","insert":"Inserisci","styles":"Stili","colors":"Colori","tools":"Strumenti"},"toolbars":"Editor toolbar"},"elementspath":{"eleLabel":"Percorso degli elementi","eleTitle":"%1 elemento"},"find":{"find":"Trova","findOptions":"Opzioni di ricerca","findWhat":"Trova:","matchCase":"Maiuscole/minuscole","matchCyclic":"Ricerca ciclica","matchWord":"Solo parole intere","notFoundMsg":"L'elemento cercato non è stato trovato.","replace":"Sostituisci","replaceAll":"Sostituisci tutto","replaceSuccessMsg":"%1 occorrenza(e) sostituite.","replaceWith":"Sostituisci con:","title":"Cerca e Sostituisci"},"fakeobjects":{"anchor":"Ancora","flash":"Animazione Flash","hiddenfield":"Campo Nascosto","iframe":"IFrame","unknown":"Oggetto sconosciuto"},"flash":{"access":"Accesso Script","accessAlways":"Sempre","accessNever":"Mai","accessSameDomain":"Solo stesso dominio","alignAbsBottom":"In basso assoluto","alignAbsMiddle":"Centrato assoluto","alignBaseline":"Linea base","alignTextTop":"In alto al testo","bgcolor":"Colore sfondo","chkFull":"Permetti la modalità tutto schermo","chkLoop":"Riavvio automatico","chkMenu":"Abilita Menu di Flash","chkPlay":"Avvio Automatico","flashvars":"Variabili per Flash","hSpace":"HSpace","properties":"Proprietà Oggetto Flash","propertiesTab":"Proprietà","quality":"Qualità","qualityAutoHigh":"Alta Automatica","qualityAutoLow":"Bassa Automatica","qualityBest":"Massima","qualityHigh":"Alta","qualityLow":"Bassa","qualityMedium":"Intermedia","scale":"Ridimensiona","scaleAll":"Mostra Tutto","scaleFit":"Dimensione Esatta","scaleNoBorder":"Senza Bordo","title":"Proprietà Oggetto Flash","vSpace":"VSpace","validateHSpace":"L'HSpace dev'essere un numero.","validateSrc":"Devi inserire l'URL del collegamento","validateVSpace":"Il VSpace dev'essere un numero.","windowMode":"Modalità finestra","windowModeOpaque":"Opaca","windowModeTransparent":"Trasparente","windowModeWindow":"Finestra"},"font":{"fontSize":{"label":"Dimensione","voiceLabel":"Dimensione Carattere","panelTitle":"Dimensione"},"label":"Carattere","panelTitle":"Carattere","voiceLabel":"Carattere"},"forms":{"button":{"title":"Proprietà bottone","text":"Testo (Valore)","type":"Tipo","typeBtn":"Bottone","typeSbm":"Invio","typeRst":"Annulla"},"checkboxAndRadio":{"checkboxTitle":"Proprietà checkbox","radioTitle":"Proprietà radio button","value":"Valore","selected":"Selezionato","required":"Richiesto"},"form":{"title":"Proprietà modulo","menu":"Proprietà modulo","action":"Azione","method":"Metodo","encoding":"Codifica"},"hidden":{"title":"Proprietà campo nascosto","name":"Nome","value":"Valore"},"select":{"title":"Proprietà menu di selezione","selectInfo":"Info","opAvail":"Opzioni disponibili","value":"Valore","size":"Dimensione","lines":"righe","chkMulti":"Permetti selezione multipla","required":"Richiesto","opText":"Testo","opValue":"Valore","btnAdd":"Aggiungi","btnModify":"Modifica","btnUp":"Su","btnDown":"Gi","btnSetValue":"Imposta come predefinito","btnDelete":"Rimuovi"},"textarea":{"title":"Proprietà area di testo","cols":"Colonne","rows":"Righe"},"textfield":{"title":"Proprietà campo di testo","name":"Nome","value":"Valore","charWidth":"Larghezza","maxChars":"Numero massimo di caratteri","required":"Richiesto","type":"Tipo","typeText":"Testo","typePass":"Password","typeEmail":"Email","typeSearch":"Cerca","typeTel":"Numero di telefono","typeUrl":"URL"}},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Indirizzo","tag_div":"Paragrafo (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normale","tag_pre":"Formattato"},"horizontalrule":{"toolbar":"Inserisci riga orizzontale"},"iframe":{"border":"Mostra il bordo","noUrl":"Inserire l'URL del campo IFrame","scrolling":"Abilita scrollbar","title":"Proprietà IFrame","toolbar":"IFrame"},"image":{"alt":"Testo alternativo","border":"Bordo","btnUpload":"Invia al server","button2Img":"Vuoi trasformare il bottone immagine selezionato in un'immagine semplice?","hSpace":"HSpace","img2Button":"Vuoi trasferomare l'immagine selezionata in un bottone immagine?","infoTab":"Informazioni immagine","linkTab":"Collegamento","lockRatio":"Blocca rapporto","menu":"Proprietà immagine","resetSize":"Reimposta dimensione","title":"Proprietà immagine","titleButton":"Proprietà bottone immagine","upload":"Carica","urlMissing":"Manca l'URL dell'immagine.","vSpace":"VSpace","validateBorder":"Il campo Bordo deve essere un numero intero.","validateHSpace":"Il campo HSpace deve essere un numero intero.","validateVSpace":"Il campo VSpace deve essere un numero intero."},"indent":{"indent":"Aumenta rientro","outdent":"Riduci rientro"},"smiley":{"options":"Opzioni Smiley","title":"Inserisci emoticon","toolbar":"Emoticon"},"justify":{"block":"Giustifica","center":"Centra","left":"Allinea a sinistra","right":"Allinea a destra"},"language":{"button":"Imposta lingua","remove":"Rimuovi lingua"},"link":{"acccessKey":"Scorciatoia da tastiera","advanced":"Avanzate","advisoryContentType":"Tipo della risorsa collegata","advisoryTitle":"Titolo","anchor":{"toolbar":"Inserisci/Modifica Ancora","menu":"Proprietà ancora","title":"Proprietà ancora","name":"Nome ancora","errorName":"Inserici il nome dell'ancora","remove":"Rimuovi l'ancora"},"anchorId":"Per id elemento","anchorName":"Per Nome","charset":"Set di caretteri della risorsa collegata","cssClasses":"Nome classe CSS","download":"Forza scaricamento","displayText":"Mostra testo","emailAddress":"Indirizzo E-Mail","emailBody":"Corpo del messaggio","emailSubject":"Oggetto del messaggio","id":"Id","info":"Informazioni collegamento","langCode":"Direzione scrittura","langDir":"Direzione scrittura","langDirLTR":"Da Sinistra a Destra (LTR)","langDirRTL":"Da Destra a Sinistra (RTL)","menu":"Modifica collegamento","name":"Nome","noAnchors":"(Nessuna ancora disponibile nel documento)","noEmail":"Devi inserire un'indirizzo e-mail","noUrl":"Devi inserire l'URL del collegamento","other":"<altro>","popupDependent":"Dipendente (Netscape)","popupFeatures":"Caratteristiche finestra popup","popupFullScreen":"A tutto schermo (IE)","popupLeft":"Posizione da sinistra","popupLocationBar":"Barra degli indirizzi","popupMenuBar":"Barra del menu","popupResizable":"Ridimensionabile","popupScrollBars":"Barre di scorrimento","popupStatusBar":"Barra di stato","popupToolbar":"Barra degli strumenti","popupTop":"Posizione dall'alto","rel":"Relazioni","selectAnchor":"Scegli Ancora","styles":"Stile","tabIndex":"Ordine di tabulazione","target":"Destinazione","targetFrame":"<riquadro>","targetFrameName":"Nome del riquadro di destinazione","targetPopup":"<finestra popup>","targetPopupName":"Nome finestra popup","title":"Collegamento","toAnchor":"Ancora nel testo","toEmail":"E-Mail","toUrl":"URL","toolbar":"Collegamento","type":"Tipo di Collegamento","unlink":"Elimina collegamento","upload":"Carica"},"list":{"bulletedlist":"Inserisci/Rimuovi Elenco Puntato","numberedlist":"Inserisci/Rimuovi Elenco Numerato"},"liststyle":{"armenian":"Numerazione Armena","bulletedTitle":"Proprietà liste puntate","circle":"Cerchio","decimal":"Decimale (1, 2, 3, ecc.)","decimalLeadingZero":"Decimale preceduto da 0 (01, 02, 03, ecc.)","disc":"Disco","georgian":"Numerazione Georgiana (an, ban, gan, ecc.)","lowerAlpha":"Alfabetico minuscolo (a, b, c, d, e, ecc.)","lowerGreek":"Greco minuscolo (alpha, beta, gamma, ecc.)","lowerRoman":"Numerazione Romana minuscola (i, ii, iii, iv, v, ecc.)","none":"Nessuno","notset":"<non impostato>","numberedTitle":"Proprietà liste numerate","square":"Quadrato","start":"Inizio","type":"Tipo","upperAlpha":"Alfabetico maiuscolo (A, B, C, D, E, ecc.)","upperRoman":"Numerazione Romana maiuscola (I, II, III, IV, V, ecc.)","validateStartNumber":"Il numero di inizio di una lista numerata deve essere un numero intero."},"magicline":{"title":"Inserisci paragrafo qui"},"maximize":{"maximize":"Massimizza","minimize":"Minimizza"},"newpage":{"toolbar":"Nuova pagina"},"pagebreak":{"alt":"Interruzione di pagina","toolbar":"Inserisci interruzione di pagina per la stampa"},"pastetext":{"button":"Incolla come testo semplice","title":"Incolla come testo semplice"},"pastefromword":{"confirmCleanup":"Il testo da incollare sembra provenire da Word. Desideri pulirlo prima di incollare?","error":"Non è stato possibile eliminare il testo incollato a causa di un errore interno.","title":"Incolla da Word","toolbar":"Incolla da Word"},"preview":{"preview":"Anteprima"},"print":{"toolbar":"Stampa"},"removeformat":{"toolbar":"Elimina formattazione"},"save":{"toolbar":"Salva"},"selectall":{"toolbar":"Seleziona tutto"},"showblocks":{"toolbar":"Visualizza Blocchi"},"sourcearea":{"toolbar":"Sorgente"},"specialchar":{"options":"Opzioni carattere speciale","title":"Seleziona carattere speciale","toolbar":"Inserisci carattere speciale"},"scayt":{"btn_about":"About COMS","btn_dictionaries":"Dizionari","btn_disable":"Disabilita COMS","btn_enable":"Abilita COMS","btn_langs":"Lingue","btn_options":"Opzioni","text_title":"Controllo Ortografico Mentre Scrivi"},"stylescombo":{"label":"Stili","panelTitle":"Stili di formattazione","panelTitle1":"Stili per blocchi","panelTitle2":"Stili in linea","panelTitle3":"Stili per oggetti"},"table":{"border":"Dimensione bordo","caption":"Intestazione","cell":{"menu":"Cella","insertBefore":"Inserisci Cella Prima","insertAfter":"Inserisci Cella Dopo","deleteCell":"Elimina celle","merge":"Unisce celle","mergeRight":"Unisci a Destra","mergeDown":"Unisci in Basso","splitHorizontal":"Dividi Cella Orizzontalmente","splitVertical":"Dividi Cella Verticalmente","title":"Proprietà della cella","cellType":"Tipo di cella","rowSpan":"Su più righe","colSpan":"Su più colonne","wordWrap":"Ritorno a capo","hAlign":"Allineamento orizzontale","vAlign":"Allineamento verticale","alignBaseline":"Linea Base","bgColor":"Colore di Sfondo","borderColor":"Colore del Bordo","data":"Dati","header":"Intestazione","yes":"Si","no":"No","invalidWidth":"La larghezza della cella dev'essere un numero.","invalidHeight":"L'altezza della cella dev'essere un numero.","invalidRowSpan":"Il numero di righe dev'essere un numero intero.","invalidColSpan":"Il numero di colonne dev'essere un numero intero.","chooseColor":"Scegli"},"cellPad":"Padding celle","cellSpace":"Spaziatura celle","column":{"menu":"Colonna","insertBefore":"Inserisci Colonna Prima","insertAfter":"Inserisci Colonna Dopo","deleteColumn":"Elimina colonne"},"columns":"Colonne","deleteTable":"Cancella Tabella","headers":"Intestazione","headersBoth":"Entrambe","headersColumn":"Prima Colonna","headersNone":"Nessuna","headersRow":"Prima Riga","invalidBorder":"La dimensione del bordo dev'essere un numero.","invalidCellPadding":"Il paging delle celle dev'essere un numero","invalidCellSpacing":"La spaziatura tra le celle dev'essere un numero.","invalidCols":"Il numero di colonne dev'essere un numero maggiore di 0.","invalidHeight":"L'altezza della tabella dev'essere un numero.","invalidRows":"Il numero di righe dev'essere un numero maggiore di 0.","invalidWidth":"La larghezza della tabella dev'essere un numero.","menu":"Proprietà tabella","row":{"menu":"Riga","insertBefore":"Inserisci Riga Prima","insertAfter":"Inserisci Riga Dopo","deleteRow":"Elimina righe"},"rows":"Righe","summary":"Indice","title":"Proprietà tabella","toolbar":"Tabella","widthPc":"percento","widthPx":"pixel","widthUnit":"unità larghezza"},"undo":{"redo":"Ripristina","undo":"Annulla"},"wsc":{"btnIgnore":"Ignora","btnIgnoreAll":"Ignora tutto","btnReplace":"Cambia","btnReplaceAll":"Cambia tutto","btnUndo":"Annulla","changeTo":"Cambia in","errorLoading":"Errore nel caricamento dell'host col servizio applicativo: %s.","ieSpellDownload":"Contollo ortografico non installato. Lo vuoi scaricare ora?","manyChanges":"Controllo ortografico completato: %1 parole cambiate","noChanges":"Controllo ortografico completato: nessuna parola cambiata","noMispell":"Controllo ortografico completato: nessun errore trovato","noSuggestions":"- Nessun suggerimento -","notAvailable":"Il servizio non è momentaneamente disponibile.","notInDic":"Non nel dizionario","oneChange":"Controllo ortografico completato: 1 parola cambiata","progress":"Controllo ortografico in corso","title":"Controllo ortografico","toolbar":"Correttore ortografico"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/lang/ja.js
index 594833b4c16..188377356d1 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/ja.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ja.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ja']={"editor":"リッチテキストエディタ","editorPanel":"リッチテキストエディタパネル","common":{"editorHelp":"ヘルプは ALT 0 を押してください","browseServer":"サーバブラウザ","url":"URL","protocol":"プロトコル","upload":"アップロード","uploadSubmit":"サーバーに送信","image":"イメージ","flash":"Flash","form":"フォーム","checkbox":"チェックボックス","radio":"ラジオボタン","textField":"１行テキスト","textarea":"テキストエリア","hiddenField":"不可視フィールド","button":"ボタン","select":"選択フィールド","imageButton":"画像ボタン","notSet":"<なし>","id":"Id","name":"Name属性","langDir":"文字表記の方向","langDirLtr":"左から右 (LTR)","langDirRtl":"右から左 (RTL)","langCode":"言語コード","longDescr":"longdesc属性(長文説明)","cssClass":"スタイルシートクラス","advisoryTitle":"Title属性","cssStyle":"スタイルシート","ok":"OK","cancel":"キャンセル","close":"閉じる","preview":"プレビュー","resize":"ドラッグしてリサイズ","generalTab":"全般","advancedTab":"高度な設定","validateNumberFailed":"値が数ではありません","confirmNewPage":"変更内容を保存せず、 新しいページを開いてもよろしいでしょうか？","confirmCancel":"オプション設定を変更しました。ダイアログを閉じてもよろしいでしょうか？","options":"オプション","target":"ターゲット","targetNew":"新しいウインドウ (_blank)","targetTop":"最上部ウィンドウ (_top)","targetSelf":"同じウィンドウ (_self)","targetParent":"親ウィンドウ (_parent)","langDirLTR":"左から右 (LTR)","langDirRTL":"右から左 (RTL)","styles":"スタイル","cssClasses":"スタイルシートクラス","width":"幅","height":"高さ","align":"行揃え","alignLeft":"左","alignRight":"右","alignCenter":"中央","alignJustify":"両端揃え","alignTop":"上","alignMiddle":"中央","alignBottom":"下","alignNone":"なし","invalidValue":"不正な値です。","invalidHeight":"高さは数値で入力してください。","invalidWidth":"幅は数値で入力してください。","invalidCssLength":"入力された \"%1\" 項目の値は、CSSの大きさ(px, %, in, cm, mm, em, ex, pt, または pc)が正しいものである/ないに関わらず、正の値である必要があります。","invalidHtmlLength":"入力された \"%1\" 項目の値は、HTMLの大きさ(px または %)が正しいものである/ないに関わらず、正の値である必要があります。","invalidInlineStyle":"入力されたインラインスタイルの値は、\"名前 : 値\" のフォーマットのセットで、複数の場合はセミコロンで区切られている形式である必要があります。","cssLengthTooltip":"ピクセル数もしくはCSSにセットできる数値を入力してください。(px,%,in,cm,mm,em,ex,pt,or pc)","unavailable":"%1<span class=\"cke_accessibility\">, 利用不可能</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"CKEditorについて","help":"$1 のヘルプを見てください。","moreInfo":"ライセンス情報の詳細はウェブサイトにて確認してください:","title":"CKEditorについて","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"太字","italic":"斜体","strike":"打ち消し線","subscript":"下付き","superscript":"上付き","underline":"下線"},"bidi":{"ltr":"テキストの向き : 左から右へ","rtl":"テキストの向き : 右から左へ"},"blockquote":{"toolbar":"ブロック引用文"},"clipboard":{"copy":"コピー","copyError":"ブラウザーのセキュリティ設定によりエディタのコピー操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+C)を使用してください。","cut":"切り取り","cutError":"ブラウザーのセキュリティ設定によりエディタの切り取り操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+X)を使用してください。","paste":"貼り付け","pasteArea":"貼り付け場所","pasteMsg":"キーボード(<STRONG>Ctrl/Cmd+V</STRONG>)を使用して、次の入力エリア内で貼り付けて、<STRONG>OK</STRONG>を押してください。","securityMsg":"ブラウザのセキュリティ設定により、エディタはクリップボードデータに直接アクセスすることができません。このウィンドウは貼り付け操作を行う度に表示されます。","title":"貼り付け"},"button":{"selectedLabel":"%1 (選択中)"},"colorbutton":{"auto":"自動","bgColorTitle":"背景色","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"その他の色...","panelTitle":"色","textColorTitle":"文字色"},"colordialog":{"clear":"クリア","highlight":"ハイライト","options":"カラーオプション","selected":"選択された色","title":"色選択"},"templates":{"button":"テンプレート","emptyListMsg":"(テンプレートが定義されていません)","insertOption":"現在のエディタの内容と置き換えます","options":"テンプレートオプション","selectPromptMsg":"エディターで使用するテンプレートを選択してください。<br>(現在のエディタの内容は失われます):","title":"内容テンプレート"},"contextmenu":{"options":"コンテキストメニューオプション"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Title属性","cssClassInputLabel":"スタイルシートクラス","edit":"Divコンテナを編集","inlineStyleInputLabel":"インラインスタイル","langDirLTRLabel":"左から右 (LTR)","langDirLabel":"文字表記の方向","langDirRTLLabel":"右から左 (RTL)","languageCodeInputLabel":" 言語コード","remove":"Divコンテナを削除","styleSelectLabel":"スタイル","title":"Divコンテナ","toolbar":"Divコンテナ"},"toolbar":{"toolbarCollapse":"ツールバーを閉じる","toolbarExpand":"ツールバーを開く","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"編集ツールバー"},"elementspath":{"eleLabel":"要素パス","eleTitle":"%1 要素"},"find":{"find":"検索","findOptions":"検索オプション","findWhat":"検索する文字列:","matchCase":"大文字と小文字を区別する","matchCyclic":"末尾に逹したら先頭に戻る","matchWord":"単語単位で探す","notFoundMsg":"指定された文字列は見つかりませんでした。","replace":"置換","replaceAll":"すべて置換","replaceSuccessMsg":"%1 個置換しました。","replaceWith":"置換後の文字列:","title":"検索と置換"},"fakeobjects":{"anchor":"アンカー","flash":"Flash Animation","hiddenfield":"不可視フィールド","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"スクリプトアクセス(AllowScriptAccess)","accessAlways":"すべての場合に通信可能(Always)","accessNever":"すべての場合に通信不可能(Never)","accessSameDomain":"同一ドメインのみに通信可能(Same domain)","alignAbsBottom":"下部(絶対的)","alignAbsMiddle":"中央(絶対的)","alignBaseline":"ベースライン","alignTextTop":"テキスト上部","bgcolor":"背景色","chkFull":"フルスクリーン許可","chkLoop":"ループ再生","chkMenu":"Flashメニュー可能","chkPlay":"再生","flashvars":"フラッシュに渡す変数(FlashVars)","hSpace":"横間隔","properties":"Flash プロパティ","propertiesTab":"プロパティ","quality":"画質","qualityAutoHigh":"自動/高","qualityAutoLow":"自動/低","qualityBest":"品質優先","qualityHigh":"高","qualityLow":"低","qualityMedium":"中","scale":"拡大縮小設定","scaleAll":"すべて表示","scaleFit":"上下左右にフィット","scaleNoBorder":"外が見えない様に拡大","title":"Flash プロパティ","vSpace":"縦間隔","validateHSpace":"横間隔は数値で入力してください。","validateSrc":"リンクURLを入力してください。","validateVSpace":"縦間隔は数値で入力してください。","windowMode":"ウィンドウモード","windowModeOpaque":"背景を不透明設定","windowModeTransparent":"背景を透過設定","windowModeWindow":"標準"},"font":{"fontSize":{"label":"サイズ","voiceLabel":"フォントサイズ","panelTitle":"フォントサイズ"},"label":"フォント","panelTitle":"フォント","voiceLabel":"フォント"},"forms":{"button":{"title":"ボタン プロパティ","text":"テキスト (値)","type":"タイプ","typeBtn":"ボタン","typeSbm":"送信","typeRst":"リセット"},"checkboxAndRadio":{"checkboxTitle":"チェックボックスのプロパティ","radioTitle":"ラジオボタンのプロパティ","value":"値","selected":"選択済み","required":"Required"},"form":{"title":"フォームのプロパティ","menu":"フォームのプロパティ","action":"アクション (action)","method":"メソッド (method)","encoding":"エンコード方式 (encoding)"},"hidden":{"title":"不可視フィールド プロパティ","name":"名前 (name)","value":"値 (value)"},"select":{"title":"選択フィールドのプロパティ","selectInfo":"情報","opAvail":"利用可能なオプション","value":"選択項目値","size":"サイズ","lines":"行","chkMulti":"複数選択を許可","required":"Required","opText":"選択項目名","opValue":"値","btnAdd":"追加","btnModify":"編集","btnUp":"上へ","btnDown":"下へ","btnSetValue":"選択した値を設定","btnDelete":"削除"},"textarea":{"title":"テキストエリア プロパティ","cols":"列","rows":"行"},"textfield":{"title":"１行テキスト プロパティ","name":"名前","value":"値","charWidth":"サイズ","maxChars":"最大長","required":"Required","type":"タイプ","typeText":"テキスト","typePass":"パスワード入力","typeEmail":"メール","typeSearch":"検索","typeTel":"電話番号","typeUrl":"URL"}},"format":{"label":"書式","panelTitle":"段落の書式","tag_address":"アドレス","tag_div":"標準 (DIV)","tag_h1":"見出し 1","tag_h2":"見出し 2","tag_h3":"見出し 3","tag_h4":"見出し 4","tag_h5":"見出し 5","tag_h6":"見出し 6","tag_p":"標準","tag_pre":"書式付き"},"horizontalrule":{"toolbar":"水平線"},"iframe":{"border":"フレームの枠を表示","noUrl":"iframeのURLを入力してください。","scrolling":"スクロールバーの表示を許可","title":"iFrameのプロパティ","toolbar":"IFrame"},"image":{"alt":"代替テキスト","border":"枠線の幅","btnUpload":"サーバーに送信","button2Img":"選択した画像ボタンを画像に変換しますか？","hSpace":"水平間隔","img2Button":"選択した画像を画像ボタンに変換しますか？","infoTab":"画像情報","linkTab":"リンク","lockRatio":"比率を固定","menu":"画像のプロパティ","resetSize":"サイズをリセット","title":"画像のプロパティ","titleButton":"画像ボタンのプロパティ","upload":"アップロード","urlMissing":"画像のURLを入力してください。","vSpace":"垂直間隔","validateBorder":"枠線の幅は数値で入力してください。","validateHSpace":"水平間隔は数値で入力してください。","validateVSpace":"垂直間隔は数値で入力してください。"},"indent":{"indent":"インデント","outdent":"インデント解除"},"smiley":{"options":"絵文字オプション","title":"顔文字挿入","toolbar":"絵文字"},"justify":{"block":"両端揃え","center":"中央揃え","left":"左揃え","right":"右揃え"},"language":{"button":"言語を設定","remove":"言語を削除"},"link":{"acccessKey":"アクセスキー","advanced":"高度な設定","advisoryContentType":"Content Type属性","advisoryTitle":"Title属性","anchor":{"toolbar":"アンカー挿入/編集","menu":"アンカーの編集","title":"アンカーのプロパティ","name":"アンカー名","errorName":"アンカー名を入力してください。","remove":"アンカーを削除"},"anchorId":"エレメントID","anchorName":"アンカー名","charset":"リンク先のcharset","cssClasses":"スタイルシートクラス","emailAddress":"E-Mail アドレス","emailBody":"本文","emailSubject":"件名","id":"Id","info":"ハイパーリンク情報","langCode":"言語コード","langDir":"文字表記の方向","langDirLTR":"左から右 (LTR)","langDirRTL":"右から左 (RTL)","menu":"リンクを編集","name":"Name属性","noAnchors":"(このドキュメント内にアンカーはありません)","noEmail":"メールアドレスを入力してください。","noUrl":"リンクURLを入力してください。","other":"<その他の>","popupDependent":"開いたウィンドウに連動して閉じる (Netscape)","popupFeatures":"ポップアップウィンドウ特徴","popupFullScreen":"全画面モード(IE)","popupLeft":"左端からの座標で指定","popupLocationBar":"ロケーションバー","popupMenuBar":"メニューバー","popupResizable":"サイズ可変","popupScrollBars":"スクロールバー","popupStatusBar":"ステータスバー","popupToolbar":"ツールバー","popupTop":"上端からの座標で指定","rel":"関連リンク","selectAnchor":"アンカーを選択","styles":"スタイルシート","tabIndex":"タブインデックス","target":"ターゲット","targetFrame":"<フレーム>","targetFrameName":"ターゲットのフレーム名","targetPopup":"<ポップアップウィンドウ>","targetPopupName":"ポップアップウィンドウ名","title":"ハイパーリンク","toAnchor":"ページ内のアンカー","toEmail":"E-Mail","toUrl":"URL","toolbar":"リンク挿入/編集","type":"リンクタイプ","unlink":"リンクを削除","upload":"アップロード"},"list":{"bulletedlist":"番号無しリスト","numberedlist":"番号付きリスト"},"liststyle":{"armenian":"アルメニア数字","bulletedTitle":"箇条書きのプロパティ","circle":"白丸","decimal":"数字 (1, 2, 3, etc.)","decimalLeadingZero":"0付きの数字 (01, 02, 03, etc.)","disc":"黒丸","georgian":"グルジア数字 (an, ban, gan, etc.)","lowerAlpha":"小文字アルファベット (a, b, c, d, e, etc.)","lowerGreek":"小文字ギリシャ文字 (alpha, beta, gamma, etc.)","lowerRoman":"小文字ローマ数字 (i, ii, iii, iv, v, etc.)","none":"なし","notset":"<なし>","numberedTitle":"番号付きリストのプロパティ","square":"四角","start":"開始","type":"種類","upperAlpha":"大文字アルファベット (A, B, C, D, E, etc.)","upperRoman":"大文字ローマ数字 (I, II, III, IV, V, etc.)","validateStartNumber":"リストの開始番号は数値で入力してください。"},"magicline":{"title":"ここに段落を挿入"},"maximize":{"maximize":"最大化","minimize":"最小化"},"newpage":{"toolbar":"新しいページ"},"pagebreak":{"alt":"改ページ","toolbar":"印刷の為に改ページ挿入"},"pastetext":{"button":"プレーンテキストとして貼り付け","title":"プレーンテキストとして貼り付け"},"pastefromword":{"confirmCleanup":"貼り付けを行うテキストはワード文章からコピーされようとしています。貼り付ける前にクリーニングを行いますか？","error":"内部エラーにより貼り付けたデータをクリアできませんでした","title":"ワード文章から貼り付け","toolbar":"ワード文章から貼り付け"},"preview":{"preview":"プレビュー"},"print":{"toolbar":"印刷"},"removeformat":{"toolbar":"書式を解除"},"save":{"toolbar":"保存"},"selectall":{"toolbar":"すべて選択"},"showblocks":{"toolbar":"ブロック表示"},"sourcearea":{"toolbar":"ソース"},"specialchar":{"options":"特殊文字オプション","title":"特殊文字の選択","toolbar":"特殊文字を挿入"},"scayt":{"btn_about":"SCAYTﾊﾞｰｼﾞｮﾝ","btn_dictionaries":"辞書","btn_disable":"SCAYT無効","btn_enable":"SCAYT有効","btn_langs":"言語","btn_options":"オプション","text_title":"スペルチェック設定(SCAYT)"},"stylescombo":{"label":"スタイル","panelTitle":"スタイル","panelTitle1":"ブロックスタイル","panelTitle2":"インラインスタイル","panelTitle3":"オブジェクトスタイル"},"table":{"border":"枠線の幅","caption":"キャプション","cell":{"menu":"セル","insertBefore":"セルを前に挿入","insertAfter":"セルを後に挿入","deleteCell":"セルを削除","merge":"セルを結合","mergeRight":"右に結合","mergeDown":"下に結合","splitHorizontal":"セルを水平方向に分割","splitVertical":"セルを垂直方向に分割","title":"セルのプロパティ","cellType":"セルの種類","rowSpan":"行の結合数","colSpan":"列の結合数","wordWrap":"単語の折り返し","hAlign":"水平方向の配置","vAlign":"垂直方向の配置","alignBaseline":"ベースライン","bgColor":"背景色","borderColor":"ボーダーカラー","data":"テーブルデータ (td)","header":"ヘッダ","yes":"はい","no":"いいえ","invalidWidth":"セル幅は数値で入力してください。","invalidHeight":"セル高さは数値で入力してください。","invalidRowSpan":"縦幅(行数)は数値で入力してください。","invalidColSpan":"横幅(列数)は数値で入力してください。","chooseColor":"色の選択"},"cellPad":"セル内間隔","cellSpace":"セル内余白","column":{"menu":"列","insertBefore":"列を左に挿入","insertAfter":"列を右に挿入","deleteColumn":"列を削除"},"columns":"列数","deleteTable":"表を削除","headers":"ヘッダ (th)","headersBoth":"両方","headersColumn":"最初の列のみ","headersNone":"なし","headersRow":"最初の行のみ","invalidBorder":"枠線の幅は数値で入力してください。","invalidCellPadding":"セル内余白は数値で入力してください。","invalidCellSpacing":"セル間余白は数値で入力してください。","invalidCols":"列数は0より大きな数値を入力してください。","invalidHeight":"高さは数値で入力してください。","invalidRows":"行数は0より大きな数値を入力してください。","invalidWidth":"幅は数値で入力してください。","menu":"表のプロパティ","row":{"menu":"行","insertBefore":"行を上に挿入","insertAfter":"行を下に挿入","deleteRow":"行を削除"},"rows":"行数","summary":"表の概要","title":"表のプロパティ","toolbar":"表","widthPc":"パーセント","widthPx":"ピクセル","widthUnit":"幅の単位"},"undo":{"redo":"やり直す","undo":"元に戻す"},"wsc":{"btnIgnore":"無視","btnIgnoreAll":"すべて無視","btnReplace":"置換","btnReplaceAll":"すべて置換","btnUndo":"やり直し","changeTo":"変更","errorLoading":"アプリケーションサービスホスト読込みエラー: %s.","ieSpellDownload":"スペルチェッカーがインストールされていません。今すぐダウンロードしますか?","manyChanges":"スペルチェック完了: %1 語句変更されました","noChanges":"スペルチェック完了: 語句は変更されませんでした","noMispell":"スペルチェック完了: スペルの誤りはありませんでした","noSuggestions":"- 該当なし -","notAvailable":"申し訳ありません、現在サービスを利用することができません","notInDic":"辞書にありません","oneChange":"スペルチェック完了: １語句変更されました","progress":"スペルチェック処理中...","title":"スペルチェック","toolbar":"スペルチェック"}};
\ No newline at end of file
+CKEDITOR.lang['ja']={"editor":"リッチテキストエディタ","editorPanel":"リッチテキストエディタパネル","common":{"editorHelp":"ヘルプは ALT 0 を押してください","browseServer":"サーバブラウザ","url":"URL","protocol":"プロトコル","upload":"アップロード","uploadSubmit":"サーバーに送信","image":"イメージ","flash":"Flash","form":"フォーム","checkbox":"チェックボックス","radio":"ラジオボタン","textField":"１行テキスト","textarea":"テキストエリア","hiddenField":"不可視フィールド","button":"ボタン","select":"選択フィールド","imageButton":"画像ボタン","notSet":"<なし>","id":"Id","name":"Name属性","langDir":"文字表記の方向","langDirLtr":"左から右 (LTR)","langDirRtl":"右から左 (RTL)","langCode":"言語コード","longDescr":"longdesc属性(長文説明)","cssClass":"スタイルシートクラス","advisoryTitle":"Title属性","cssStyle":"スタイルシート","ok":"OK","cancel":"キャンセル","close":"閉じる","preview":"プレビュー","resize":"ドラッグしてリサイズ","generalTab":"全般","advancedTab":"高度な設定","validateNumberFailed":"値が数ではありません","confirmNewPage":"変更内容を保存せず、 新しいページを開いてもよろしいでしょうか？","confirmCancel":"オプション設定を変更しました。ダイアログを閉じてもよろしいでしょうか？","options":"オプション","target":"ターゲット","targetNew":"新しいウインドウ (_blank)","targetTop":"最上部ウィンドウ (_top)","targetSelf":"同じウィンドウ (_self)","targetParent":"親ウィンドウ (_parent)","langDirLTR":"左から右 (LTR)","langDirRTL":"右から左 (RTL)","styles":"スタイル","cssClasses":"スタイルシートクラス","width":"幅","height":"高さ","align":"行揃え","alignLeft":"左","alignRight":"右","alignCenter":"中央","alignJustify":"両端揃え","alignTop":"上","alignMiddle":"中央","alignBottom":"下","alignNone":"なし","invalidValue":"不正な値です。","invalidHeight":"高さは数値で入力してください。","invalidWidth":"幅は数値で入力してください。","invalidCssLength":"入力された \"%1\" 項目の値は、CSSの大きさ(px, %, in, cm, mm, em, ex, pt, または pc)が正しいものである/ないに関わらず、正の値である必要があります。","invalidHtmlLength":"入力された \"%1\" 項目の値は、HTMLの大きさ(px または %)が正しいものである/ないに関わらず、正の値である必要があります。","invalidInlineStyle":"入力されたインラインスタイルの値は、\"名前 : 値\" のフォーマットのセットで、複数の場合はセミコロンで区切られている形式である必要があります。","cssLengthTooltip":"ピクセル数もしくはCSSにセットできる数値を入力してください。(px,%,in,cm,mm,em,ex,pt,or pc)","unavailable":"%1<span class=\"cke_accessibility\">, 利用不可能</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"キーボードショートカット"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"CKEditorについて","help":"$1 のヘルプを見てください。","moreInfo":"ライセンス情報の詳細はウェブサイトにて確認してください:","title":"CKEditorについて","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"太字","italic":"斜体","strike":"打ち消し線","subscript":"下付き","superscript":"上付き","underline":"下線"},"bidi":{"ltr":"テキストの向き : 左から右へ","rtl":"テキストの向き : 右から左へ"},"blockquote":{"toolbar":"ブロック引用文"},"clipboard":{"copy":"コピー","copyError":"ブラウザーのセキュリティ設定によりエディタのコピー操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+C)を使用してください。","cut":"切り取り","cutError":"ブラウザーのセキュリティ設定によりエディタの切り取り操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+X)を使用してください。","paste":"貼り付け","pasteArea":"貼り付け場所","pasteMsg":"キーボード(<STRONG>Ctrl/Cmd+V</STRONG>)を使用して、次の入力エリア内で貼り付けて、<STRONG>OK</STRONG>を押してください。","securityMsg":"ブラウザのセキュリティ設定により、エディタはクリップボードデータに直接アクセスすることができません。このウィンドウは貼り付け操作を行う度に表示されます。","title":"貼り付け"},"button":{"selectedLabel":"%1 (選択中)"},"colorbutton":{"auto":"自動","bgColorTitle":"背景色","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"その他の色...","panelTitle":"色","textColorTitle":"文字色"},"colordialog":{"clear":"クリア","highlight":"ハイライト","options":"カラーオプション","selected":"選択された色","title":"色選択"},"templates":{"button":"テンプレート","emptyListMsg":"(テンプレートが定義されていません)","insertOption":"現在のエディタの内容と置き換えます","options":"テンプレートオプション","selectPromptMsg":"エディターで使用するテンプレートを選択してください。<br>(現在のエディタの内容は失われます):","title":"内容テンプレート"},"contextmenu":{"options":"コンテキストメニューオプション"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Title属性","cssClassInputLabel":"スタイルシートクラス","edit":"Divコンテナを編集","inlineStyleInputLabel":"インラインスタイル","langDirLTRLabel":"左から右 (LTR)","langDirLabel":"文字表記の方向","langDirRTLLabel":"右から左 (RTL)","languageCodeInputLabel":" 言語コード","remove":"Divコンテナを削除","styleSelectLabel":"スタイル","title":"Divコンテナ","toolbar":"Divコンテナ"},"toolbar":{"toolbarCollapse":"ツールバーを閉じる","toolbarExpand":"ツールバーを開く","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"編集ツールバー"},"elementspath":{"eleLabel":"要素パス","eleTitle":"%1 要素"},"find":{"find":"検索","findOptions":"検索オプション","findWhat":"検索する文字列:","matchCase":"大文字と小文字を区別する","matchCyclic":"末尾に逹したら先頭に戻る","matchWord":"単語単位で探す","notFoundMsg":"指定された文字列は見つかりませんでした。","replace":"置換","replaceAll":"すべて置換","replaceSuccessMsg":"%1 個置換しました。","replaceWith":"置換後の文字列:","title":"検索と置換"},"fakeobjects":{"anchor":"アンカー","flash":"Flash Animation","hiddenfield":"不可視フィールド","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"スクリプトアクセス(AllowScriptAccess)","accessAlways":"すべての場合に通信可能(Always)","accessNever":"すべての場合に通信不可能(Never)","accessSameDomain":"同一ドメインのみに通信可能(Same domain)","alignAbsBottom":"下部(絶対的)","alignAbsMiddle":"中央(絶対的)","alignBaseline":"ベースライン","alignTextTop":"テキスト上部","bgcolor":"背景色","chkFull":"フルスクリーン許可","chkLoop":"ループ再生","chkMenu":"Flashメニュー可能","chkPlay":"再生","flashvars":"フラッシュに渡す変数(FlashVars)","hSpace":"横間隔","properties":"Flash プロパティ","propertiesTab":"プロパティ","quality":"画質","qualityAutoHigh":"自動/高","qualityAutoLow":"自動/低","qualityBest":"品質優先","qualityHigh":"高","qualityLow":"低","qualityMedium":"中","scale":"拡大縮小設定","scaleAll":"すべて表示","scaleFit":"上下左右にフィット","scaleNoBorder":"外が見えない様に拡大","title":"Flash プロパティ","vSpace":"縦間隔","validateHSpace":"横間隔は数値で入力してください。","validateSrc":"リンクURLを入力してください。","validateVSpace":"縦間隔は数値で入力してください。","windowMode":"ウィンドウモード","windowModeOpaque":"背景を不透明設定","windowModeTransparent":"背景を透過設定","windowModeWindow":"標準"},"font":{"fontSize":{"label":"サイズ","voiceLabel":"フォントサイズ","panelTitle":"フォントサイズ"},"label":"フォント","panelTitle":"フォント","voiceLabel":"フォント"},"forms":{"button":{"title":"ボタン プロパティ","text":"テキスト (値)","type":"タイプ","typeBtn":"ボタン","typeSbm":"送信","typeRst":"リセット"},"checkboxAndRadio":{"checkboxTitle":"チェックボックスのプロパティ","radioTitle":"ラジオボタンのプロパティ","value":"値","selected":"選択済み","required":"Required"},"form":{"title":"フォームのプロパティ","menu":"フォームのプロパティ","action":"アクション (action)","method":"メソッド (method)","encoding":"エンコード方式 (encoding)"},"hidden":{"title":"不可視フィールド プロパティ","name":"名前 (name)","value":"値 (value)"},"select":{"title":"選択フィールドのプロパティ","selectInfo":"情報","opAvail":"利用可能なオプション","value":"選択項目値","size":"サイズ","lines":"行","chkMulti":"複数選択を許可","required":"Required","opText":"選択項目名","opValue":"値","btnAdd":"追加","btnModify":"編集","btnUp":"上へ","btnDown":"下へ","btnSetValue":"選択した値を設定","btnDelete":"削除"},"textarea":{"title":"テキストエリア プロパティ","cols":"列","rows":"行"},"textfield":{"title":"１行テキスト プロパティ","name":"名前","value":"値","charWidth":"サイズ","maxChars":"最大長","required":"Required","type":"タイプ","typeText":"テキスト","typePass":"パスワード入力","typeEmail":"メール","typeSearch":"検索","typeTel":"電話番号","typeUrl":"URL"}},"format":{"label":"書式","panelTitle":"段落の書式","tag_address":"アドレス","tag_div":"標準 (DIV)","tag_h1":"見出し 1","tag_h2":"見出し 2","tag_h3":"見出し 3","tag_h4":"見出し 4","tag_h5":"見出し 5","tag_h6":"見出し 6","tag_p":"標準","tag_pre":"書式付き"},"horizontalrule":{"toolbar":"水平線"},"iframe":{"border":"フレームの枠を表示","noUrl":"iframeのURLを入力してください。","scrolling":"スクロールバーの表示を許可","title":"iFrameのプロパティ","toolbar":"IFrame"},"image":{"alt":"代替テキスト","border":"枠線の幅","btnUpload":"サーバーに送信","button2Img":"選択した画像ボタンを画像に変換しますか？","hSpace":"水平間隔","img2Button":"選択した画像を画像ボタンに変換しますか？","infoTab":"画像情報","linkTab":"リンク","lockRatio":"比率を固定","menu":"画像のプロパティ","resetSize":"サイズをリセット","title":"画像のプロパティ","titleButton":"画像ボタンのプロパティ","upload":"アップロード","urlMissing":"画像のURLを入力してください。","vSpace":"垂直間隔","validateBorder":"枠線の幅は数値で入力してください。","validateHSpace":"水平間隔は数値で入力してください。","validateVSpace":"垂直間隔は数値で入力してください。"},"indent":{"indent":"インデント","outdent":"インデント解除"},"smiley":{"options":"絵文字オプション","title":"顔文字挿入","toolbar":"絵文字"},"justify":{"block":"両端揃え","center":"中央揃え","left":"左揃え","right":"右揃え"},"language":{"button":"言語を設定","remove":"言語を削除"},"link":{"acccessKey":"アクセスキー","advanced":"高度な設定","advisoryContentType":"Content Type属性","advisoryTitle":"Title属性","anchor":{"toolbar":"アンカー挿入/編集","menu":"アンカーの編集","title":"アンカーのプロパティ","name":"アンカー名","errorName":"アンカー名を入力してください。","remove":"アンカーを削除"},"anchorId":"エレメントID","anchorName":"アンカー名","charset":"リンク先のcharset","cssClasses":"スタイルシートクラス","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail アドレス","emailBody":"本文","emailSubject":"件名","id":"Id","info":"ハイパーリンク情報","langCode":"言語コード","langDir":"文字表記の方向","langDirLTR":"左から右 (LTR)","langDirRTL":"右から左 (RTL)","menu":"リンクを編集","name":"Name属性","noAnchors":"(このドキュメント内にアンカーはありません)","noEmail":"メールアドレスを入力してください。","noUrl":"リンクURLを入力してください。","other":"<その他の>","popupDependent":"開いたウィンドウに連動して閉じる (Netscape)","popupFeatures":"ポップアップウィンドウ特徴","popupFullScreen":"全画面モード(IE)","popupLeft":"左端からの座標で指定","popupLocationBar":"ロケーションバー","popupMenuBar":"メニューバー","popupResizable":"サイズ可変","popupScrollBars":"スクロールバー","popupStatusBar":"ステータスバー","popupToolbar":"ツールバー","popupTop":"上端からの座標で指定","rel":"関連リンク","selectAnchor":"アンカーを選択","styles":"スタイルシート","tabIndex":"タブインデックス","target":"ターゲット","targetFrame":"<フレーム>","targetFrameName":"ターゲットのフレーム名","targetPopup":"<ポップアップウィンドウ>","targetPopupName":"ポップアップウィンドウ名","title":"ハイパーリンク","toAnchor":"ページ内のアンカー","toEmail":"E-Mail","toUrl":"URL","toolbar":"リンク挿入/編集","type":"リンクタイプ","unlink":"リンクを削除","upload":"アップロード"},"list":{"bulletedlist":"番号無しリスト","numberedlist":"番号付きリスト"},"liststyle":{"armenian":"アルメニア数字","bulletedTitle":"箇条書きのプロパティ","circle":"白丸","decimal":"数字 (1, 2, 3, etc.)","decimalLeadingZero":"0付きの数字 (01, 02, 03, etc.)","disc":"黒丸","georgian":"グルジア数字 (an, ban, gan, etc.)","lowerAlpha":"小文字アルファベット (a, b, c, d, e, etc.)","lowerGreek":"小文字ギリシャ文字 (alpha, beta, gamma, etc.)","lowerRoman":"小文字ローマ数字 (i, ii, iii, iv, v, etc.)","none":"なし","notset":"<なし>","numberedTitle":"番号付きリストのプロパティ","square":"四角","start":"開始","type":"種類","upperAlpha":"大文字アルファベット (A, B, C, D, E, etc.)","upperRoman":"大文字ローマ数字 (I, II, III, IV, V, etc.)","validateStartNumber":"リストの開始番号は数値で入力してください。"},"magicline":{"title":"ここに段落を挿入"},"maximize":{"maximize":"最大化","minimize":"最小化"},"newpage":{"toolbar":"新しいページ"},"pagebreak":{"alt":"改ページ","toolbar":"印刷の為に改ページ挿入"},"pastetext":{"button":"プレーンテキストとして貼り付け","title":"プレーンテキストとして貼り付け"},"pastefromword":{"confirmCleanup":"貼り付けを行うテキストはワード文章からコピーされようとしています。貼り付ける前にクリーニングを行いますか？","error":"内部エラーにより貼り付けたデータをクリアできませんでした","title":"ワード文章から貼り付け","toolbar":"ワード文章から貼り付け"},"preview":{"preview":"プレビュー"},"print":{"toolbar":"印刷"},"removeformat":{"toolbar":"書式を解除"},"save":{"toolbar":"保存"},"selectall":{"toolbar":"すべて選択"},"showblocks":{"toolbar":"ブロック表示"},"sourcearea":{"toolbar":"ソース"},"specialchar":{"options":"特殊文字オプション","title":"特殊文字の選択","toolbar":"特殊文字を挿入"},"scayt":{"btn_about":"SCAYTﾊﾞｰｼﾞｮﾝ","btn_dictionaries":"辞書","btn_disable":"SCAYT無効","btn_enable":"SCAYT有効","btn_langs":"言語","btn_options":"オプション","text_title":"スペルチェック設定(SCAYT)"},"stylescombo":{"label":"スタイル","panelTitle":"スタイル","panelTitle1":"ブロックスタイル","panelTitle2":"インラインスタイル","panelTitle3":"オブジェクトスタイル"},"table":{"border":"枠線の幅","caption":"キャプション","cell":{"menu":"セル","insertBefore":"セルを前に挿入","insertAfter":"セルを後に挿入","deleteCell":"セルを削除","merge":"セルを結合","mergeRight":"右に結合","mergeDown":"下に結合","splitHorizontal":"セルを水平方向に分割","splitVertical":"セルを垂直方向に分割","title":"セルのプロパティ","cellType":"セルの種類","rowSpan":"行の結合数","colSpan":"列の結合数","wordWrap":"単語の折り返し","hAlign":"水平方向の配置","vAlign":"垂直方向の配置","alignBaseline":"ベースライン","bgColor":"背景色","borderColor":"ボーダーカラー","data":"テーブルデータ (td)","header":"ヘッダ","yes":"はい","no":"いいえ","invalidWidth":"セル幅は数値で入力してください。","invalidHeight":"セル高さは数値で入力してください。","invalidRowSpan":"縦幅(行数)は数値で入力してください。","invalidColSpan":"横幅(列数)は数値で入力してください。","chooseColor":"色の選択"},"cellPad":"セル内間隔","cellSpace":"セル内余白","column":{"menu":"列","insertBefore":"列を左に挿入","insertAfter":"列を右に挿入","deleteColumn":"列を削除"},"columns":"列数","deleteTable":"表を削除","headers":"ヘッダ (th)","headersBoth":"両方","headersColumn":"最初の列のみ","headersNone":"なし","headersRow":"最初の行のみ","invalidBorder":"枠線の幅は数値で入力してください。","invalidCellPadding":"セル内余白は数値で入力してください。","invalidCellSpacing":"セル間余白は数値で入力してください。","invalidCols":"列数は0より大きな数値を入力してください。","invalidHeight":"高さは数値で入力してください。","invalidRows":"行数は0より大きな数値を入力してください。","invalidWidth":"幅は数値で入力してください。","menu":"表のプロパティ","row":{"menu":"行","insertBefore":"行を上に挿入","insertAfter":"行を下に挿入","deleteRow":"行を削除"},"rows":"行数","summary":"表の概要","title":"表のプロパティ","toolbar":"表","widthPc":"パーセント","widthPx":"ピクセル","widthUnit":"幅の単位"},"undo":{"redo":"やり直す","undo":"元に戻す"},"wsc":{"btnIgnore":"無視","btnIgnoreAll":"すべて無視","btnReplace":"置換","btnReplaceAll":"すべて置換","btnUndo":"やり直し","changeTo":"変更","errorLoading":"アプリケーションサービスホスト読込みエラー: %s.","ieSpellDownload":"スペルチェッカーがインストールされていません。今すぐダウンロードしますか?","manyChanges":"スペルチェック完了: %1 語句変更されました","noChanges":"スペルチェック完了: 語句は変更されませんでした","noMispell":"スペルチェック完了: スペルの誤りはありませんでした","noSuggestions":"- 該当なし -","notAvailable":"申し訳ありません、現在サービスを利用することができません","notInDic":"辞書にありません","oneChange":"スペルチェック完了: １語句変更されました","progress":"スペルチェック処理中...","title":"スペルチェック","toolbar":"スペルチェック"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/lang/ka.js
index 283aaa0bf44..752d157ab21 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/ka.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ka.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ka']={"editor":"ტექსტის რედაქტორი","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"დააჭირეთ ALT 0-ს დახმარების მისაღებად","browseServer":"სერვერზე დათვალიერება","url":"URL","protocol":"პროტოკოლი","upload":"ატვირთვა","uploadSubmit":"სერვერზე გაგზავნა","image":"სურათი","flash":"Flash","form":"ფორმა","checkbox":"მონიშვნის ღილაკი","radio":"ამორჩევის ღილაკი","textField":"ტექსტური ველი","textarea":"ტექსტური არე","hiddenField":"მალული ველი","button":"ღილაკი","select":"არჩევის ველი","imageButton":"სურათიანი ღილაკი","notSet":"<არაფერი>","id":"Id","name":"სახელი","langDir":"ენის მიმართულება","langDirLtr":"მარცხნიდან მარჯვნივ (LTR)","langDirRtl":"მარჯვნიდან მარცხნივ (RTL)","langCode":"ენის კოდი","longDescr":"დიდი აღწერის URL","cssClass":"CSS კლასი","advisoryTitle":"სათაური","cssStyle":"CSS სტილი","ok":"დიახ","cancel":"გაუქმება","close":"დახურვა","preview":"გადახედვა","resize":"გაწიე ზომის შესაცვლელად","generalTab":"ინფორმაცია","advancedTab":"გაფართოებული","validateNumberFailed":"ეს მნიშვნელობა არაა რიცხვი.","confirmNewPage":"ამ დოკუმენტში ყველა ჩაუწერელი ცვლილება დაიკარგება. დარწმუნებული ხართ რომ ახალი გვერდის ჩატვირთვა გინდათ?","confirmCancel":"ზოგიერთი პარამეტრი შეცვლილია, დარწმუნებულილ ხართ რომ ფანჯრის დახურვა გსურთ?","options":"პარამეტრები","target":"გახსნის ადგილი","targetNew":"ახალი ფანჯარა (_blank)","targetTop":"ზედა ფანჯარა (_top)","targetSelf":"იგივე ფანჯარა (_self)","targetParent":"მშობელი ფანჯარა (_parent)","langDirLTR":"მარცხნიდან მარჯვნივ (LTR)","langDirRTL":"მარჯვნიდან მარცხნივ (RTL)","styles":"სტილი","cssClasses":"CSS კლასი","width":"სიგანე","height":"სიმაღლე","align":"სწორება","alignLeft":"მარცხენა","alignRight":"მარჯვენა","alignCenter":"შუა","alignJustify":"両端揃え","alignTop":"ზემოთა","alignMiddle":"შუა","alignBottom":"ქვემოთა","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidWidth":"სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, მიუწვდომელია</span>"},"about":{"copy":"Copyright &copy; $1. ყველა უფლება დაცულია.","dlgTitle":"CKEditor-ის შესახებ","help":"დახმარებისთვის იხილეთ $1.","moreInfo":"ლიცენზიის ინფორმაციისთვის ეწვიეთ ჩვენს საიტს:","title":"CKEditor-ის შესახებ","userGuide":"CKEditor-ის მომხმარებლის სახელმძღვანელო"},"basicstyles":{"bold":"მსხვილი","italic":"დახრილი","strike":"გადახაზული","subscript":"ინდექსი","superscript":"ხარისხი","underline":"გახაზული"},"bidi":{"ltr":"ტექსტის მიმართულება მარცხნიდან მარჯვნივ","rtl":"ტექსტის მიმართულება მარჯვნიდან მარცხნივ"},"blockquote":{"toolbar":"ციტატა"},"clipboard":{"copy":"ასლი","copyError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ასლის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+C).","cut":"ამოჭრა","cutError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ამოჭრის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+X).","paste":"ჩასმა","pasteArea":"ჩასმის არე","pasteMsg":"ჩასვით ამ არის შიგნით კლავიატურის გამოყენებით (<strong>Ctrl/Cmd+V</strong>) და დააჭირეთ OK-ს","securityMsg":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა clipboard-ის მონაცემების წვდომის უფლებას. კიდევ უნდა ჩასვათ ტექსტი ამ ფანჯარაში.","title":"ჩასმა"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"ავტომატური","bgColorTitle":"ფონის ფერი","colors":{"000":"შავი","800000":"მუქი შინდისფერი","8B4513":"ყავისფერი","2F4F4F":"მოლურჯო ნაცრისფერი","008080":"ჩამქრალი ლურჯი","000080":"მუქი ლურჯი","4B0082":"იასამნისფერი","696969":"მუქი ნაცრისფერი","B22222":"აგურისფერი","A52A2A":"მუქი ყავისფერი","DAA520":"მოყვითალო","006400":"მუქი მწვანე","40E0D0":"ცისფერი","0000CD":"ზომიერად ლურჯი","800080":"იისფერი","808080":"ნაცრისფერი","F00":"წითელი","FF8C00":"მუქი სტაფილოსფერი","FFD700":"ოქროსფერი","008000":"მწვანე","0FF":"ღია ცისფერი","00F":"ლურჯი","EE82EE":"იისფერი","A9A9A9":"ბაცი ნაცრისფერი","FFA07A":"ჩამქრალი ვარდისფერი","FFA500":"სტაფილოსფერი","FFFF00":"ყვითელი","00FF00":"ლურჯი","AFEEEE":"ცისფერი","ADD8E6":"ღია ლურჯი","DDA0DD":"ღია იისფერი","D3D3D3":"ღია ნაცრისფერი","FFF0F5":"ღია ვარდისფერი","FAEBD7":"ღია ყავისფერი","FFFFE0":"ნათელი ყვითელი","F0FFF0":"ღია მწვანე","F0FFFF":"ღია ცისფერი 2","F0F8FF":"ღია ცისფერი 3","E6E6FA":"ღია იისფერი 2","FFF":"თეთრი"},"more":"მეტი ფერი...","panelTitle":"ფერები","textColorTitle":"ტექსტის ფერი"},"colordialog":{"clear":"გასუფთავება","highlight":"ჩვენება","options":"ფერის პარამეტრები","selected":"არჩეული ფერი","title":"ფერის შეცვლა"},"templates":{"button":"თარგები","emptyListMsg":"(თარგი არაა განსაზღვრული)","insertOption":"მიმდინარე შეგთავსის შეცვლა","options":"თარგების პარამეტრები","selectPromptMsg":"აირჩიეთ თარგი რედაქტორისთვის","title":"თარგები"},"contextmenu":{"options":"კონტექსტური მენიუს პარამეტრები"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"სათაური","cssClassInputLabel":"CSS კლასები","edit":"Div-ის რედაქტირება","inlineStyleInputLabel":"თანდართული სტილი","langDirLTRLabel":"მარცხნიდან მარჯვნიც (LTR)","langDirLabel":"ენის მინართულება","langDirRTLLabel":"მარჯვნიდან მარცხნივ (RTL)","languageCodeInputLabel":"ენის კოდი","remove":"Div-ის წაშლა","styleSelectLabel":"სტილი","title":"Div კონტეინერის შექმნა","toolbar":"Div კონტეინერის შექმნა"},"toolbar":{"toolbarCollapse":"ხელსაწყოთა ზოლის შეწევა","toolbarExpand":"ხელსაწყოთა ზოლის გამოწევა","toolbarGroups":{"document":"დოკუმენტი","clipboard":"Clipboard/გაუქმება","editing":"რედაქტირება","forms":"ფორმები","basicstyles":"ძირითადი სტილები","paragraph":"აბზაცი","links":"ბმულები","insert":"ჩასმა","styles":"სტილები","colors":"ფერები","tools":"ხელსაწყოები"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"ელემეტის გზა","eleTitle":"%1 ელემენტი"},"find":{"find":"ძებნა","findOptions":"Find Options","findWhat":"საძიებელი ტექსტი:","matchCase":"დიდი და პატარა ასოების დამთხვევა","matchCyclic":"დოკუმენტის ბოლოში გასვლის მერე თავიდან დაწყება","matchWord":"მთელი სიტყვის დამთხვევა","notFoundMsg":"მითითებული ტექსტი არ მოიძებნა.","replace":"შეცვლა","replaceAll":"ყველას შეცვლა","replaceSuccessMsg":"%1 მოძებნილი შეიცვალა.","replaceWith":"შეცვლის ტექსტი:","title":"ძებნა და შეცვლა"},"fakeobjects":{"anchor":"ღუზა","flash":"Flash ანიმაცია","hiddenfield":"მალული ველი","iframe":"IFrame","unknown":"უცნობი ობიექტი"},"flash":{"access":"სკრიპტის წვდომა","accessAlways":"ყოველთვის","accessNever":"არასდროს","accessSameDomain":"იგივე დომენი","alignAbsBottom":"ჩარჩოს ქვემოთა ნაწილის სწორება ტექსტისთვის","alignAbsMiddle":"ჩარჩოს შუა ნაწილის სწორება ტექსტისთვის","alignBaseline":"საბაზისო ხაზის სწორება","alignTextTop":"ტექსტი ზემოდან","bgcolor":"ფონის ფერი","chkFull":"მთელი ეკრანის დაშვება","chkLoop":"ჩაციკლვა","chkMenu":"Flash-ის მენიუს დაშვება","chkPlay":"ავტო გაშვება","flashvars":"ცვლადები Flash-ისთვის","hSpace":"ჰორიზ. სივრცე","properties":"Flash-ის პარამეტრები","propertiesTab":"პარამეტრები","quality":"ხარისხი","qualityAutoHigh":"მაღალი (ავტომატური)","qualityAutoLow":"ძალიან დაბალი","qualityBest":"საუკეთესო","qualityHigh":"მაღალი","qualityLow":"დაბალი","qualityMedium":"საშუალო","scale":"მასშტაბირება","scaleAll":"ყველაფრის ჩვენება","scaleFit":"ზუსტი ჩასმა","scaleNoBorder":"ჩარჩოს გარეშე","title":"Flash-ის პარამეტრები","vSpace":"ვერტ. სივრცე","validateHSpace":"ჰორიზონტალური სივრცე არ უნდა იყოს ცარიელი.","validateSrc":"URL არ უნდა იყოს ცარიელი.","validateVSpace":"ვერტიკალური სივრცე არ უნდა იყოს ცარიელი.","windowMode":"ფანჯრის რეჟიმი","windowModeOpaque":"გაუმჭვირვალე","windowModeTransparent":"გამჭვირვალე","windowModeWindow":"ფანჯარა"},"font":{"fontSize":{"label":"ზომა","voiceLabel":"ტექსტის ზომა","panelTitle":"ტექსტის ზომა"},"label":"ფონტი","panelTitle":"ფონტის სახელი","voiceLabel":"ფონტი"},"forms":{"button":{"title":"ღილაკის პარამეტრები","text":"ტექსტი","type":"ტიპი","typeBtn":"ღილაკი","typeSbm":"გაგზავნა","typeRst":"გასუფთავება"},"checkboxAndRadio":{"checkboxTitle":"მონიშვნის ღილაკის (Checkbox) პარამეტრები","radioTitle":"ასარჩევი ღილაკის (Radio) პარამეტრები","value":"ტექსტი","selected":"არჩეული","required":"Required"},"form":{"title":"ფორმის პარამეტრები","menu":"ფორმის პარამეტრები","action":"ქმედება","method":"მეთოდი","encoding":"კოდირება"},"hidden":{"title":"მალული ველის პარამეტრები","name":"სახელი","value":"მნიშვნელობა"},"select":{"title":"არჩევის ველის პარამეტრები","selectInfo":"ინფორმაცია","opAvail":"შესაძლებელი ვარიანტები","value":"მნიშვნელობა","size":"ზომა","lines":"ხაზები","chkMulti":"მრავლობითი არჩევანის საშუალება","required":"Required","opText":"ტექსტი","opValue":"მნიშვნელობა","btnAdd":"დამატება","btnModify":"შეცვლა","btnUp":"ზემოთ","btnDown":"ქვემოთ","btnSetValue":"ამორჩეულ მნიშვნელოვნად დაყენება","btnDelete":"წაშლა"},"textarea":{"title":"ტექსტური არის პარამეტრები","cols":"სვეტები","rows":"სტრიქონები"},"textfield":{"title":"ტექსტური ველის პარამეტრები","name":"სახელი","value":"მნიშვნელობა","charWidth":"სიმბოლოს ზომა","maxChars":"ასოების მაქსიმალური ოდენობა","required":"Required","type":"ტიპი","typeText":"ტექსტი","typePass":"პაროლი","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"ფიორმატირება","panelTitle":"ფორმატირება","tag_address":"მისამართი","tag_div":"ჩვეულებრივი (DIV)","tag_h1":"სათაური 1","tag_h2":"სათაური 2","tag_h3":"სათაური 3","tag_h4":"სათაური 4","tag_h5":"სათაური 5","tag_h6":"სათაური 6","tag_p":"ჩვეულებრივი","tag_pre":"ფორმატირებული"},"horizontalrule":{"toolbar":"ჰორიზონტალური ხაზის ჩასმა"},"iframe":{"border":"ჩარჩოს გამოჩენა","noUrl":"აკრიფეთ iframe-ის URL","scrolling":"გადახვევის ზოლების დაშვება","title":"IFrame-ის პარამეტრები","toolbar":"IFrame"},"image":{"alt":"სანაცვლო ტექსტი","border":"ჩარჩო","btnUpload":"სერვერისთვის გაგზავნა","button2Img":"გსურთ არჩეული სურათიანი ღილაკის გადაქცევა ჩვეულებრივ ღილაკად?","hSpace":"ჰორიზონტალური სივრცე","img2Button":"გსურთ არჩეული ჩვეულებრივი ღილაკის გადაქცევა სურათიან ღილაკად?","infoTab":"სურათის ინფორმცია","linkTab":"ბმული","lockRatio":"პროპორციის შენარჩუნება","menu":"სურათის პარამეტრები","resetSize":"ზომის დაბრუნება","title":"სურათის პარამეტრები","titleButton":"სურათიანი ღილაკის პარამეტრები","upload":"ატვირთვა","urlMissing":"სურათის URL არაა შევსებული.","vSpace":"ვერტიკალური სივრცე","validateBorder":"ჩარჩო მთელი რიცხვი უნდა იყოს.","validateHSpace":"ჰორიზონტალური სივრცე მთელი რიცხვი უნდა იყოს.","validateVSpace":"ვერტიკალური სივრცე მთელი რიცხვი უნდა იყოს."},"indent":{"indent":"მეტად შეწევა","outdent":"ნაკლებად შეწევა"},"smiley":{"options":"სიცილაკის პარამეტრები","title":"სიცილაკის ჩასმა","toolbar":"სიცილაკები"},"justify":{"block":"გადასწორება","center":"შუაში სწორება","left":"მარცხნივ სწორება","right":"მარჯვნივ სწორება"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"წვდომის ღილაკი","advanced":"დაწვრილებით","advisoryContentType":"შიგთავსის ტიპი","advisoryTitle":"სათაური","anchor":{"toolbar":"ღუზა","menu":"ღუზის რედაქტირება","title":"ღუზის პარამეტრები","name":"ღუზუს სახელი","errorName":"აკრიფეთ ღუზის სახელი","remove":"Remove Anchor"},"anchorId":"ელემენტის Id-თ","anchorName":"ღუზის სახელით","charset":"კოდირება","cssClasses":"CSS კლასი","emailAddress":"ელფოსტის მისამართები","emailBody":"წერილის ტექსტი","emailSubject":"წერილის სათაური","id":"Id","info":"ბმულის ინფორმაცია","langCode":"ენის კოდი","langDir":"ენის მიმართულება","langDirLTR":"მარცხნიდან მარჯვნივ (LTR)","langDirRTL":"მარჯვნიდან მარცხნივ (RTL)","menu":"ბმულის რედაქტირება","name":"სახელი","noAnchors":"(ამ დოკუმენტში ღუზა არაა)","noEmail":"აკრიფეთ ელფოსტის მისამართი","noUrl":"აკრიფეთ ბმულის URL","other":"<სხვა>","popupDependent":"დამოკიდებული (Netscape)","popupFeatures":"Popup ფანჯრის პარამეტრები","popupFullScreen":"მთელი ეკრანი (IE)","popupLeft":"მარცხენა პოზიცია","popupLocationBar":"ნავიგაციის ზოლი","popupMenuBar":"მენიუს ზოლი","popupResizable":"ცვალებადი ზომით","popupScrollBars":"გადახვევის ზოლები","popupStatusBar":"სტატუსის ზოლი","popupToolbar":"ხელსაწყოთა ზოლი","popupTop":"ზედა პოზიცია","rel":"კავშირი","selectAnchor":"აირჩიეთ ღუზა","styles":"CSS სტილი","tabIndex":"Tab-ის ინდექსი","target":"გახსნის ადგილი","targetFrame":"<frame>","targetFrameName":"Frame-ის სახელი","targetPopup":"<popup ფანჯარა>","targetPopupName":"Popup ფანჯრის სახელი","title":"ბმული","toAnchor":"ბმული ტექსტში ღუზაზე","toEmail":"ელფოსტა","toUrl":"URL","toolbar":"ბმული","type":"ბმულის ტიპი","unlink":"ბმულის მოხსნა","upload":"აქაჩვა"},"list":{"bulletedlist":"ღილიანი სია","numberedlist":"გადანომრილი სია"},"liststyle":{"armenian":"სომხური გადანომრვა","bulletedTitle":"ღილებიანი სიის პარამეტრები","circle":"წრეწირი","decimal":"რიცხვებით (1, 2, 3, ..)","decimalLeadingZero":"ნულით დაწყებული რიცხვებით (01, 02, 03, ..)","disc":"წრე","georgian":"ქართული გადანომრვა (ან, ბან, გან, ..)","lowerAlpha":"პატარა ლათინური ასოებით (a, b, c, d, e, ..)","lowerGreek":"პატარა ბერძნული ასოებით (ალფა, ბეტა, გამა, ..)","lowerRoman":"რომაული გადანომრვცა პატარა ციფრებით (i, ii, iii, iv, v, ..)","none":"არაფერი","notset":"<არაფერი>","numberedTitle":"გადანომრილი სიის პარამეტრები","square":"კვადრატი","start":"საწყისი","type":"ტიპი","upperAlpha":"დიდი ლათინური ასოებით (A, B, C, D, E, ..)","upperRoman":"რომაული გადანომრვა დიდი ციფრებით (I, II, III, IV, V, etc.)","validateStartNumber":"სიის საწყისი მთელი რიცხვი უნდა იყოს."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"გადიდება","minimize":"დაპატარავება"},"newpage":{"toolbar":"ახალი გვერდი"},"pagebreak":{"alt":"გვერდის წყვეტა","toolbar":"გვერდის წყვეტა ბეჭდვისთვის"},"pastetext":{"button":"მხოლოდ ტექსტის ჩასმა","title":"მხოლოდ ტექსტის ჩასმა"},"pastefromword":{"confirmCleanup":"ჩასასმელი ტექსტი ვორდიდან გადმოტანილს გავს - გინდათ მისი წინასწარ გაწმენდა?","error":"შიდა შეცდომის გამო ვერ მოხერხდა ტექსტის გაწმენდა","title":"ვორდიდან ჩასმა","toolbar":"ვორდიდან ჩასმა"},"preview":{"preview":"გადახედვა"},"print":{"toolbar":"ბეჭდვა"},"removeformat":{"toolbar":"ფორმატირების მოხსნა"},"save":{"toolbar":"ჩაწერა"},"selectall":{"toolbar":"ყველაფრის მონიშნვა"},"showblocks":{"toolbar":"არეების ჩვენება"},"sourcearea":{"toolbar":"კოდები"},"specialchar":{"options":"სპეციალური სიმბოლოს პარამეტრები","title":"სპეციალური სიმბოლოს არჩევა","toolbar":"სპეციალური სიმბოლოს ჩასმა"},"scayt":{"btn_about":"SCAYT-ის შესახებ","btn_dictionaries":"ლექსიკონები","btn_disable":"SCAYT-ის გამორთვა","btn_enable":"SCAYT-ის ჩართვა","btn_langs":"ენები","btn_options":"პარამეტრები","text_title":"მართლწერის შემოწმება კრეფისას"},"stylescombo":{"label":"სტილები","panelTitle":"ფორმატირების სტილები","panelTitle1":"არის სტილები","panelTitle2":"თანდართული სტილები","panelTitle3":"ობიექტის სტილები"},"table":{"border":"ჩარჩოს ზომა","caption":"სათაური","cell":{"menu":"უჯრა","insertBefore":"უჯრის ჩასმა მანამდე","insertAfter":"უჯრის ჩასმა მერე","deleteCell":"უჯრების წაშლა","merge":"უჯრების შეერთება","mergeRight":"შეერთება მარჯვენასთან","mergeDown":"შეერთება ქვემოთასთან","splitHorizontal":"გაყოფა ჰორიზონტალურად","splitVertical":"გაყოფა ვერტიკალურად","title":"უჯრის პარამეტრები","cellType":"უჯრის ტიპი","rowSpan":"სტრიქონების ოდენობა","colSpan":"სვეტების ოდენობა","wordWrap":"სტრიქონის გადატანა (Word Wrap)","hAlign":"ჰორიზონტალური სწორება","vAlign":"ვერტიკალური სწორება","alignBaseline":"ძირითადი ხაზის გასწვრივ","bgColor":"ფონის ფერი","borderColor":"ჩარჩოს ფერი","data":"მონაცემები","header":"სათაური","yes":"დიახ","no":"არა","invalidWidth":"უჯრის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidHeight":"უჯრის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRowSpan":"სტრიქონების რაოდენობა მთელი რიცხვი უნდა იყოს.","invalidColSpan":"სვეტების რაოდენობა მთელი რიცხვი უნდა იყოს.","chooseColor":"არჩევა"},"cellPad":"უჯრის კიდე (padding)","cellSpace":"უჯრის სივრცე (spacing)","column":{"menu":"სვეტი","insertBefore":"სვეტის ჩამატება წინ","insertAfter":"სვეტის ჩამატება მერე","deleteColumn":"სვეტების წაშლა"},"columns":"სვეტი","deleteTable":"ცხრილის წაშლა","headers":"სათაურები","headersBoth":"ორივე","headersColumn":"პირველი სვეტი","headersNone":"არაფერი","headersRow":"პირველი სტრიქონი","invalidBorder":"ჩარჩოს ზომა რიცხვით უდნა იყოს წარმოდგენილი.","invalidCellPadding":"უჯრის კიდე (padding) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCellSpacing":"უჯრის სივრცე (spacing) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCols":"სვეტების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidHeight":"ცხრილის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRows":"სტრიქონების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidWidth":"ცხრილის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","menu":"ცხრილის პარამეტრები","row":{"menu":"სტრიქონი","insertBefore":"სტრიქონის ჩამატება წინ","insertAfter":"სტრიქონის ჩამატება მერე","deleteRow":"სტრიქონების წაშლა"},"rows":"სტრიქონი","summary":"შეჯამება","title":"ცხრილის პარამეტრები","toolbar":"ცხრილი","widthPc":"პროცენტი","widthPx":"წერტილი","widthUnit":"საზომი ერთეული"},"undo":{"redo":"გამეორება","undo":"გაუქმება"},"wsc":{"btnIgnore":"უგულებელყოფა","btnIgnoreAll":"ყველას უგულებელყოფა","btnReplace":"შეცვლა","btnReplaceAll":"ყველას შეცვლა","btnUndo":"გაუქმება","changeTo":"შეცვლელი","errorLoading":"სერვისის გამოძახების შეცდომა: %s.","ieSpellDownload":"მართლწერის შემოწმება არაა დაინსტალირებული. ჩამოვქაჩოთ ინტერნეტიდან?","manyChanges":"მართლწერის შემოწმება: %1 სიტყვა შეიცვალა","noChanges":"მართლწერის შემოწმება: არაფერი შეცვლილა","noMispell":"მართლწერის შემოწმება: შეცდომა არ მოიძებნა","noSuggestions":"- არაა შემოთავაზება -","notAvailable":"უკაცრავად, ეს სერვისი ამჟამად მიუწვდომელია.","notInDic":"არაა ლექსიკონში","oneChange":"მართლწერის შემოწმება: ერთი სიტყვა შეიცვალა","progress":"მიმდინარეობს მართლწერის შემოწმება...","title":"მართლწერა","toolbar":"მართლწერა"}};
\ No newline at end of file
+CKEDITOR.lang['ka']={"editor":"ტექსტის რედაქტორი","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"დააჭირეთ ALT 0-ს დახმარების მისაღებად","browseServer":"სერვერზე დათვალიერება","url":"URL","protocol":"პროტოკოლი","upload":"ატვირთვა","uploadSubmit":"სერვერზე გაგზავნა","image":"სურათი","flash":"Flash","form":"ფორმა","checkbox":"მონიშვნის ღილაკი","radio":"ამორჩევის ღილაკი","textField":"ტექსტური ველი","textarea":"ტექსტური არე","hiddenField":"მალული ველი","button":"ღილაკი","select":"არჩევის ველი","imageButton":"სურათიანი ღილაკი","notSet":"<არაფერი>","id":"Id","name":"სახელი","langDir":"ენის მიმართულება","langDirLtr":"მარცხნიდან მარჯვნივ (LTR)","langDirRtl":"მარჯვნიდან მარცხნივ (RTL)","langCode":"ენის კოდი","longDescr":"დიდი აღწერის URL","cssClass":"CSS კლასი","advisoryTitle":"სათაური","cssStyle":"CSS სტილი","ok":"დიახ","cancel":"გაუქმება","close":"დახურვა","preview":"გადახედვა","resize":"გაწიე ზომის შესაცვლელად","generalTab":"ინფორმაცია","advancedTab":"გაფართოებული","validateNumberFailed":"ეს მნიშვნელობა არაა რიცხვი.","confirmNewPage":"ამ დოკუმენტში ყველა ჩაუწერელი ცვლილება დაიკარგება. დარწმუნებული ხართ რომ ახალი გვერდის ჩატვირთვა გინდათ?","confirmCancel":"ზოგიერთი პარამეტრი შეცვლილია, დარწმუნებულილ ხართ რომ ფანჯრის დახურვა გსურთ?","options":"პარამეტრები","target":"გახსნის ადგილი","targetNew":"ახალი ფანჯარა (_blank)","targetTop":"ზედა ფანჯარა (_top)","targetSelf":"იგივე ფანჯარა (_self)","targetParent":"მშობელი ფანჯარა (_parent)","langDirLTR":"მარცხნიდან მარჯვნივ (LTR)","langDirRTL":"მარჯვნიდან მარცხნივ (RTL)","styles":"სტილი","cssClasses":"CSS კლასი","width":"სიგანე","height":"სიმაღლე","align":"სწორება","alignLeft":"მარცხენა","alignRight":"მარჯვენა","alignCenter":"შუა","alignJustify":"両端揃え","alignTop":"ზემოთა","alignMiddle":"შუა","alignBottom":"ქვემოთა","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidWidth":"სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, მიუწვდომელია</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. ყველა უფლება დაცულია.","dlgTitle":"CKEditor-ის შესახებ","help":"დახმარებისთვის იხილეთ $1.","moreInfo":"ლიცენზიის ინფორმაციისთვის ეწვიეთ ჩვენს საიტს:","title":"CKEditor-ის შესახებ","userGuide":"CKEditor-ის მომხმარებლის სახელმძღვანელო"},"basicstyles":{"bold":"მსხვილი","italic":"დახრილი","strike":"გადახაზული","subscript":"ინდექსი","superscript":"ხარისხი","underline":"გახაზული"},"bidi":{"ltr":"ტექსტის მიმართულება მარცხნიდან მარჯვნივ","rtl":"ტექსტის მიმართულება მარჯვნიდან მარცხნივ"},"blockquote":{"toolbar":"ციტატა"},"clipboard":{"copy":"ასლი","copyError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ასლის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+C).","cut":"ამოჭრა","cutError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ამოჭრის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+X).","paste":"ჩასმა","pasteArea":"ჩასმის არე","pasteMsg":"ჩასვით ამ არის შიგნით კლავიატურის გამოყენებით (<strong>Ctrl/Cmd+V</strong>) და დააჭირეთ OK-ს","securityMsg":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა clipboard-ის მონაცემების წვდომის უფლებას. კიდევ უნდა ჩასვათ ტექსტი ამ ფანჯარაში.","title":"ჩასმა"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"ავტომატური","bgColorTitle":"ფონის ფერი","colors":{"000":"შავი","800000":"მუქი შინდისფერი","8B4513":"ყავისფერი","2F4F4F":"მოლურჯო ნაცრისფერი","008080":"ჩამქრალი ლურჯი","000080":"მუქი ლურჯი","4B0082":"იასამნისფერი","696969":"მუქი ნაცრისფერი","B22222":"აგურისფერი","A52A2A":"მუქი ყავისფერი","DAA520":"მოყვითალო","006400":"მუქი მწვანე","40E0D0":"ცისფერი","0000CD":"ზომიერად ლურჯი","800080":"იისფერი","808080":"ნაცრისფერი","F00":"წითელი","FF8C00":"მუქი სტაფილოსფერი","FFD700":"ოქროსფერი","008000":"მწვანე","0FF":"ღია ცისფერი","00F":"ლურჯი","EE82EE":"იისფერი","A9A9A9":"ბაცი ნაცრისფერი","FFA07A":"ჩამქრალი ვარდისფერი","FFA500":"სტაფილოსფერი","FFFF00":"ყვითელი","00FF00":"ლურჯი","AFEEEE":"ცისფერი","ADD8E6":"ღია ლურჯი","DDA0DD":"ღია იისფერი","D3D3D3":"ღია ნაცრისფერი","FFF0F5":"ღია ვარდისფერი","FAEBD7":"ღია ყავისფერი","FFFFE0":"ნათელი ყვითელი","F0FFF0":"ღია მწვანე","F0FFFF":"ღია ცისფერი 2","F0F8FF":"ღია ცისფერი 3","E6E6FA":"ღია იისფერი 2","FFF":"თეთრი","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"მეტი ფერი...","panelTitle":"ფერები","textColorTitle":"ტექსტის ფერი"},"colordialog":{"clear":"გასუფთავება","highlight":"ჩვენება","options":"ფერის პარამეტრები","selected":"არჩეული ფერი","title":"ფერის შეცვლა"},"templates":{"button":"თარგები","emptyListMsg":"(თარგი არაა განსაზღვრული)","insertOption":"მიმდინარე შეგთავსის შეცვლა","options":"თარგების პარამეტრები","selectPromptMsg":"აირჩიეთ თარგი რედაქტორისთვის","title":"თარგები"},"contextmenu":{"options":"კონტექსტური მენიუს პარამეტრები"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"სათაური","cssClassInputLabel":"CSS კლასები","edit":"Div-ის რედაქტირება","inlineStyleInputLabel":"თანდართული სტილი","langDirLTRLabel":"მარცხნიდან მარჯვნიც (LTR)","langDirLabel":"ენის მინართულება","langDirRTLLabel":"მარჯვნიდან მარცხნივ (RTL)","languageCodeInputLabel":"ენის კოდი","remove":"Div-ის წაშლა","styleSelectLabel":"სტილი","title":"Div კონტეინერის შექმნა","toolbar":"Div კონტეინერის შექმნა"},"toolbar":{"toolbarCollapse":"ხელსაწყოთა ზოლის შეწევა","toolbarExpand":"ხელსაწყოთა ზოლის გამოწევა","toolbarGroups":{"document":"დოკუმენტი","clipboard":"Clipboard/გაუქმება","editing":"რედაქტირება","forms":"ფორმები","basicstyles":"ძირითადი სტილები","paragraph":"აბზაცი","links":"ბმულები","insert":"ჩასმა","styles":"სტილები","colors":"ფერები","tools":"ხელსაწყოები"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"ელემეტის გზა","eleTitle":"%1 ელემენტი"},"find":{"find":"ძებნა","findOptions":"Find Options","findWhat":"საძიებელი ტექსტი:","matchCase":"დიდი და პატარა ასოების დამთხვევა","matchCyclic":"დოკუმენტის ბოლოში გასვლის მერე თავიდან დაწყება","matchWord":"მთელი სიტყვის დამთხვევა","notFoundMsg":"მითითებული ტექსტი არ მოიძებნა.","replace":"შეცვლა","replaceAll":"ყველას შეცვლა","replaceSuccessMsg":"%1 მოძებნილი შეიცვალა.","replaceWith":"შეცვლის ტექსტი:","title":"ძებნა და შეცვლა"},"fakeobjects":{"anchor":"ღუზა","flash":"Flash ანიმაცია","hiddenfield":"მალული ველი","iframe":"IFrame","unknown":"უცნობი ობიექტი"},"flash":{"access":"სკრიპტის წვდომა","accessAlways":"ყოველთვის","accessNever":"არასდროს","accessSameDomain":"იგივე დომენი","alignAbsBottom":"ჩარჩოს ქვემოთა ნაწილის სწორება ტექსტისთვის","alignAbsMiddle":"ჩარჩოს შუა ნაწილის სწორება ტექსტისთვის","alignBaseline":"საბაზისო ხაზის სწორება","alignTextTop":"ტექსტი ზემოდან","bgcolor":"ფონის ფერი","chkFull":"მთელი ეკრანის დაშვება","chkLoop":"ჩაციკლვა","chkMenu":"Flash-ის მენიუს დაშვება","chkPlay":"ავტო გაშვება","flashvars":"ცვლადები Flash-ისთვის","hSpace":"ჰორიზ. სივრცე","properties":"Flash-ის პარამეტრები","propertiesTab":"პარამეტრები","quality":"ხარისხი","qualityAutoHigh":"მაღალი (ავტომატური)","qualityAutoLow":"ძალიან დაბალი","qualityBest":"საუკეთესო","qualityHigh":"მაღალი","qualityLow":"დაბალი","qualityMedium":"საშუალო","scale":"მასშტაბირება","scaleAll":"ყველაფრის ჩვენება","scaleFit":"ზუსტი ჩასმა","scaleNoBorder":"ჩარჩოს გარეშე","title":"Flash-ის პარამეტრები","vSpace":"ვერტ. სივრცე","validateHSpace":"ჰორიზონტალური სივრცე არ უნდა იყოს ცარიელი.","validateSrc":"URL არ უნდა იყოს ცარიელი.","validateVSpace":"ვერტიკალური სივრცე არ უნდა იყოს ცარიელი.","windowMode":"ფანჯრის რეჟიმი","windowModeOpaque":"გაუმჭვირვალე","windowModeTransparent":"გამჭვირვალე","windowModeWindow":"ფანჯარა"},"font":{"fontSize":{"label":"ზომა","voiceLabel":"ტექსტის ზომა","panelTitle":"ტექსტის ზომა"},"label":"ფონტი","panelTitle":"ფონტის სახელი","voiceLabel":"ფონტი"},"forms":{"button":{"title":"ღილაკის პარამეტრები","text":"ტექსტი","type":"ტიპი","typeBtn":"ღილაკი","typeSbm":"გაგზავნა","typeRst":"გასუფთავება"},"checkboxAndRadio":{"checkboxTitle":"მონიშვნის ღილაკის (Checkbox) პარამეტრები","radioTitle":"ასარჩევი ღილაკის (Radio) პარამეტრები","value":"ტექსტი","selected":"არჩეული","required":"Required"},"form":{"title":"ფორმის პარამეტრები","menu":"ფორმის პარამეტრები","action":"ქმედება","method":"მეთოდი","encoding":"კოდირება"},"hidden":{"title":"მალული ველის პარამეტრები","name":"სახელი","value":"მნიშვნელობა"},"select":{"title":"არჩევის ველის პარამეტრები","selectInfo":"ინფორმაცია","opAvail":"შესაძლებელი ვარიანტები","value":"მნიშვნელობა","size":"ზომა","lines":"ხაზები","chkMulti":"მრავლობითი არჩევანის საშუალება","required":"Required","opText":"ტექსტი","opValue":"მნიშვნელობა","btnAdd":"დამატება","btnModify":"შეცვლა","btnUp":"ზემოთ","btnDown":"ქვემოთ","btnSetValue":"ამორჩეულ მნიშვნელოვნად დაყენება","btnDelete":"წაშლა"},"textarea":{"title":"ტექსტური არის პარამეტრები","cols":"სვეტები","rows":"სტრიქონები"},"textfield":{"title":"ტექსტური ველის პარამეტრები","name":"სახელი","value":"მნიშვნელობა","charWidth":"სიმბოლოს ზომა","maxChars":"ასოების მაქსიმალური ოდენობა","required":"Required","type":"ტიპი","typeText":"ტექსტი","typePass":"პაროლი","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"ფიორმატირება","panelTitle":"ფორმატირება","tag_address":"მისამართი","tag_div":"ჩვეულებრივი (DIV)","tag_h1":"სათაური 1","tag_h2":"სათაური 2","tag_h3":"სათაური 3","tag_h4":"სათაური 4","tag_h5":"სათაური 5","tag_h6":"სათაური 6","tag_p":"ჩვეულებრივი","tag_pre":"ფორმატირებული"},"horizontalrule":{"toolbar":"ჰორიზონტალური ხაზის ჩასმა"},"iframe":{"border":"ჩარჩოს გამოჩენა","noUrl":"აკრიფეთ iframe-ის URL","scrolling":"გადახვევის ზოლების დაშვება","title":"IFrame-ის პარამეტრები","toolbar":"IFrame"},"image":{"alt":"სანაცვლო ტექსტი","border":"ჩარჩო","btnUpload":"სერვერისთვის გაგზავნა","button2Img":"გსურთ არჩეული სურათიანი ღილაკის გადაქცევა ჩვეულებრივ ღილაკად?","hSpace":"ჰორიზონტალური სივრცე","img2Button":"გსურთ არჩეული ჩვეულებრივი ღილაკის გადაქცევა სურათიან ღილაკად?","infoTab":"სურათის ინფორმცია","linkTab":"ბმული","lockRatio":"პროპორციის შენარჩუნება","menu":"სურათის პარამეტრები","resetSize":"ზომის დაბრუნება","title":"სურათის პარამეტრები","titleButton":"სურათიანი ღილაკის პარამეტრები","upload":"ატვირთვა","urlMissing":"სურათის URL არაა შევსებული.","vSpace":"ვერტიკალური სივრცე","validateBorder":"ჩარჩო მთელი რიცხვი უნდა იყოს.","validateHSpace":"ჰორიზონტალური სივრცე მთელი რიცხვი უნდა იყოს.","validateVSpace":"ვერტიკალური სივრცე მთელი რიცხვი უნდა იყოს."},"indent":{"indent":"მეტად შეწევა","outdent":"ნაკლებად შეწევა"},"smiley":{"options":"სიცილაკის პარამეტრები","title":"სიცილაკის ჩასმა","toolbar":"სიცილაკები"},"justify":{"block":"გადასწორება","center":"შუაში სწორება","left":"მარცხნივ სწორება","right":"მარჯვნივ სწორება"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"წვდომის ღილაკი","advanced":"დაწვრილებით","advisoryContentType":"შიგთავსის ტიპი","advisoryTitle":"სათაური","anchor":{"toolbar":"ღუზა","menu":"ღუზის რედაქტირება","title":"ღუზის პარამეტრები","name":"ღუზუს სახელი","errorName":"აკრიფეთ ღუზის სახელი","remove":"Remove Anchor"},"anchorId":"ელემენტის Id-თ","anchorName":"ღუზის სახელით","charset":"კოდირება","cssClasses":"CSS კლასი","download":"Force Download","displayText":"Display Text","emailAddress":"ელფოსტის მისამართები","emailBody":"წერილის ტექსტი","emailSubject":"წერილის სათაური","id":"Id","info":"ბმულის ინფორმაცია","langCode":"ენის კოდი","langDir":"ენის მიმართულება","langDirLTR":"მარცხნიდან მარჯვნივ (LTR)","langDirRTL":"მარჯვნიდან მარცხნივ (RTL)","menu":"ბმულის რედაქტირება","name":"სახელი","noAnchors":"(ამ დოკუმენტში ღუზა არაა)","noEmail":"აკრიფეთ ელფოსტის მისამართი","noUrl":"აკრიფეთ ბმულის URL","other":"<სხვა>","popupDependent":"დამოკიდებული (Netscape)","popupFeatures":"Popup ფანჯრის პარამეტრები","popupFullScreen":"მთელი ეკრანი (IE)","popupLeft":"მარცხენა პოზიცია","popupLocationBar":"ნავიგაციის ზოლი","popupMenuBar":"მენიუს ზოლი","popupResizable":"ცვალებადი ზომით","popupScrollBars":"გადახვევის ზოლები","popupStatusBar":"სტატუსის ზოლი","popupToolbar":"ხელსაწყოთა ზოლი","popupTop":"ზედა პოზიცია","rel":"კავშირი","selectAnchor":"აირჩიეთ ღუზა","styles":"CSS სტილი","tabIndex":"Tab-ის ინდექსი","target":"გახსნის ადგილი","targetFrame":"<frame>","targetFrameName":"Frame-ის სახელი","targetPopup":"<popup ფანჯარა>","targetPopupName":"Popup ფანჯრის სახელი","title":"ბმული","toAnchor":"ბმული ტექსტში ღუზაზე","toEmail":"ელფოსტა","toUrl":"URL","toolbar":"ბმული","type":"ბმულის ტიპი","unlink":"ბმულის მოხსნა","upload":"აქაჩვა"},"list":{"bulletedlist":"ღილიანი სია","numberedlist":"გადანომრილი სია"},"liststyle":{"armenian":"სომხური გადანომრვა","bulletedTitle":"ღილებიანი სიის პარამეტრები","circle":"წრეწირი","decimal":"რიცხვებით (1, 2, 3, ..)","decimalLeadingZero":"ნულით დაწყებული რიცხვებით (01, 02, 03, ..)","disc":"წრე","georgian":"ქართული გადანომრვა (ან, ბან, გან, ..)","lowerAlpha":"პატარა ლათინური ასოებით (a, b, c, d, e, ..)","lowerGreek":"პატარა ბერძნული ასოებით (ალფა, ბეტა, გამა, ..)","lowerRoman":"რომაული გადანომრვცა პატარა ციფრებით (i, ii, iii, iv, v, ..)","none":"არაფერი","notset":"<არაფერი>","numberedTitle":"გადანომრილი სიის პარამეტრები","square":"კვადრატი","start":"საწყისი","type":"ტიპი","upperAlpha":"დიდი ლათინური ასოებით (A, B, C, D, E, ..)","upperRoman":"რომაული გადანომრვა დიდი ციფრებით (I, II, III, IV, V, etc.)","validateStartNumber":"სიის საწყისი მთელი რიცხვი უნდა იყოს."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"გადიდება","minimize":"დაპატარავება"},"newpage":{"toolbar":"ახალი გვერდი"},"pagebreak":{"alt":"გვერდის წყვეტა","toolbar":"გვერდის წყვეტა ბეჭდვისთვის"},"pastetext":{"button":"მხოლოდ ტექსტის ჩასმა","title":"მხოლოდ ტექსტის ჩასმა"},"pastefromword":{"confirmCleanup":"ჩასასმელი ტექსტი ვორდიდან გადმოტანილს გავს - გინდათ მისი წინასწარ გაწმენდა?","error":"შიდა შეცდომის გამო ვერ მოხერხდა ტექსტის გაწმენდა","title":"ვორდიდან ჩასმა","toolbar":"ვორდიდან ჩასმა"},"preview":{"preview":"გადახედვა"},"print":{"toolbar":"ბეჭდვა"},"removeformat":{"toolbar":"ფორმატირების მოხსნა"},"save":{"toolbar":"ჩაწერა"},"selectall":{"toolbar":"ყველაფრის მონიშნვა"},"showblocks":{"toolbar":"არეების ჩვენება"},"sourcearea":{"toolbar":"კოდები"},"specialchar":{"options":"სპეციალური სიმბოლოს პარამეტრები","title":"სპეციალური სიმბოლოს არჩევა","toolbar":"სპეციალური სიმბოლოს ჩასმა"},"scayt":{"btn_about":"SCAYT-ის შესახებ","btn_dictionaries":"ლექსიკონები","btn_disable":"SCAYT-ის გამორთვა","btn_enable":"SCAYT-ის ჩართვა","btn_langs":"ენები","btn_options":"პარამეტრები","text_title":"მართლწერის შემოწმება კრეფისას"},"stylescombo":{"label":"სტილები","panelTitle":"ფორმატირების სტილები","panelTitle1":"არის სტილები","panelTitle2":"თანდართული სტილები","panelTitle3":"ობიექტის სტილები"},"table":{"border":"ჩარჩოს ზომა","caption":"სათაური","cell":{"menu":"უჯრა","insertBefore":"უჯრის ჩასმა მანამდე","insertAfter":"უჯრის ჩასმა მერე","deleteCell":"უჯრების წაშლა","merge":"უჯრების შეერთება","mergeRight":"შეერთება მარჯვენასთან","mergeDown":"შეერთება ქვემოთასთან","splitHorizontal":"გაყოფა ჰორიზონტალურად","splitVertical":"გაყოფა ვერტიკალურად","title":"უჯრის პარამეტრები","cellType":"უჯრის ტიპი","rowSpan":"სტრიქონების ოდენობა","colSpan":"სვეტების ოდენობა","wordWrap":"სტრიქონის გადატანა (Word Wrap)","hAlign":"ჰორიზონტალური სწორება","vAlign":"ვერტიკალური სწორება","alignBaseline":"ძირითადი ხაზის გასწვრივ","bgColor":"ფონის ფერი","borderColor":"ჩარჩოს ფერი","data":"მონაცემები","header":"სათაური","yes":"დიახ","no":"არა","invalidWidth":"უჯრის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidHeight":"უჯრის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRowSpan":"სტრიქონების რაოდენობა მთელი რიცხვი უნდა იყოს.","invalidColSpan":"სვეტების რაოდენობა მთელი რიცხვი უნდა იყოს.","chooseColor":"არჩევა"},"cellPad":"უჯრის კიდე (padding)","cellSpace":"უჯრის სივრცე (spacing)","column":{"menu":"სვეტი","insertBefore":"სვეტის ჩამატება წინ","insertAfter":"სვეტის ჩამატება მერე","deleteColumn":"სვეტების წაშლა"},"columns":"სვეტი","deleteTable":"ცხრილის წაშლა","headers":"სათაურები","headersBoth":"ორივე","headersColumn":"პირველი სვეტი","headersNone":"არაფერი","headersRow":"პირველი სტრიქონი","invalidBorder":"ჩარჩოს ზომა რიცხვით უდნა იყოს წარმოდგენილი.","invalidCellPadding":"უჯრის კიდე (padding) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCellSpacing":"უჯრის სივრცე (spacing) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCols":"სვეტების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidHeight":"ცხრილის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRows":"სტრიქონების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidWidth":"ცხრილის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","menu":"ცხრილის პარამეტრები","row":{"menu":"სტრიქონი","insertBefore":"სტრიქონის ჩამატება წინ","insertAfter":"სტრიქონის ჩამატება მერე","deleteRow":"სტრიქონების წაშლა"},"rows":"სტრიქონი","summary":"შეჯამება","title":"ცხრილის პარამეტრები","toolbar":"ცხრილი","widthPc":"პროცენტი","widthPx":"წერტილი","widthUnit":"საზომი ერთეული"},"undo":{"redo":"გამეორება","undo":"გაუქმება"},"wsc":{"btnIgnore":"უგულებელყოფა","btnIgnoreAll":"ყველას უგულებელყოფა","btnReplace":"შეცვლა","btnReplaceAll":"ყველას შეცვლა","btnUndo":"გაუქმება","changeTo":"შეცვლელი","errorLoading":"სერვისის გამოძახების შეცდომა: %s.","ieSpellDownload":"მართლწერის შემოწმება არაა დაინსტალირებული. ჩამოვქაჩოთ ინტერნეტიდან?","manyChanges":"მართლწერის შემოწმება: %1 სიტყვა შეიცვალა","noChanges":"მართლწერის შემოწმება: არაფერი შეცვლილა","noMispell":"მართლწერის შემოწმება: შეცდომა არ მოიძებნა","noSuggestions":"- არაა შემოთავაზება -","notAvailable":"უკაცრავად, ეს სერვისი ამჟამად მიუწვდომელია.","notInDic":"არაა ლექსიკონში","oneChange":"მართლწერის შემოწმება: ერთი სიტყვა შეიცვალა","progress":"მიმდინარეობს მართლწერის შემოწმება...","title":"მართლწერა","toolbar":"მართლწერა"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/km.js b/htdocs/includes/ckeditor/ckeditor/lang/km.js
index 5ae7507e328..604c024b964 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/km.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/km.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['km']={"editor":"ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","editorPanel":"ផ្ទាំង​ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","common":{"editorHelp":"ចុច ALT 0 សម្រាប់​ជំនួយ","browseServer":"រក​មើល​ក្នុង​ម៉ាស៊ីន​បម្រើ","url":"URL","protocol":"ពិធីការ","upload":"ផ្ទុក​ឡើង","uploadSubmit":"បញ្ជូនទៅកាន់ម៉ាស៊ីន​បម្រើ","image":"រូបភាព","flash":"Flash","form":"បែបបទ","checkbox":"ប្រអប់​ធីក","radio":"ប៊ូតុង​មូល","textField":"វាល​អត្ថបទ","textarea":"Textarea","hiddenField":"វាល​កំបាំង","button":"ប៊ូតុង","select":"វាល​ជម្រើស","imageButton":"ប៊ូតុង​រូបភាព","notSet":"<មិនកំណត់>","id":"Id","name":"ឈ្មោះ","langDir":"ទិសដៅភាសា","langDirLtr":"ពីឆ្វេងទៅស្តាំ (LTR)","langDirRtl":"ពីស្តាំទៅឆ្វេង (RTL)","langCode":"លេខ​កូដ​ភាសា","longDescr":"URL អធិប្បាយ​វែង","cssClass":"Stylesheet Classes","advisoryTitle":"ចំណង​ជើង​ណែនាំ","cssStyle":"រចនាបថ","ok":"ព្រម","cancel":"បោះបង់","close":"បិទ","preview":"មើល​ជា​មុន","resize":"ប្ដូរ​ទំហំ","generalTab":"ទូទៅ","advancedTab":"កម្រិត​ខ្ពស់","validateNumberFailed":"តម្លៃ​នេះ​ពុំ​មែន​ជា​លេខ​ទេ។","confirmNewPage":"រាល់​បន្លាស់​ប្ដូរ​នានា​ដែល​មិន​ទាន់​រក្សា​ទុក​ក្នុង​មាតិកា​នេះ នឹង​ត្រូវ​បាត់​បង់។ តើ​អ្នក​ពិត​ជា​ចង់​ផ្ទុក​ទំព័រ​ថ្មី​មែនទេ?","confirmCancel":"ការ​កំណត់​មួយ​ចំនួន​ត្រូ​វ​បាន​ផ្លាស់​ប្ដូរ។ តើ​អ្នក​ពិត​ជា​ចង់​បិទ​ប្រអប់​នេះ​មែនទេ?","options":"ការ​កំណត់","target":"គោលដៅ","targetNew":"វីនដូ​ថ្មី (_blank)","targetTop":"វីនដូ​លើ​គេ (_top)","targetSelf":"វីនដូ​ដូច​គ្នា (_self)","targetParent":"វីនដូ​មេ (_parent)","langDirLTR":"ពីឆ្វេងទៅស្តាំ(LTR)","langDirRTL":"ពីស្តាំទៅឆ្វេង(RTL)","styles":"រចនាបថ","cssClasses":"Stylesheet Classes","width":"ទទឹង","height":"កំពស់","align":"កំណត់​ទីតាំង","alignLeft":"ខាងឆ្វង","alignRight":"ខាងស្តាំ","alignCenter":"កណ្តាល","alignJustify":"តំរឹមសងខាង","alignTop":"ខាងលើ","alignMiddle":"កណ្តាល","alignBottom":"ខាងក្រោម","alignNone":"គ្មាន","invalidValue":"តម្លៃ​មិន​ត្រឹម​ត្រូវ។","invalidHeight":"តម្លៃ​កំពស់​ត្រូវ​តែ​ជា​លេខ។","invalidWidth":"តម្លៃ​ទទឹង​ត្រូវ​តែ​ជា​លេខ។","invalidCssLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន​ ដោយ​ភ្ជាប់ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","invalidHtmlLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន ដោយ​ភ្ជាប់​ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ HTML (px ឬ %) ។","invalidInlineStyle":"តម្លៃ​កំណត់​សម្រាប់​រចនាបថ​ក្នុង​តួ ត្រូវ​តែ​មាន​មួយ​ឬ​ធាតុ​ច្រើន​ដោយ​មាន​ទ្រង់ទ្រាយ​ជា \"ឈ្មោះ : តម្លៃ\" ហើយ​ញែក​ចេញ​ពី​គ្នា​ដោយ​ចុច​ក្បៀស។","cssLengthTooltip":"បញ្ចូល​លេខ​សម្រាប់​តម្លៃ​ជា​ភិចសែល ឬ​លេខ​ដែល​មាន​ឯកតា​ត្រឹមត្រូវ​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","unavailable":"%1<span class=\"cke_accessibility\">, មិន​មាន</span>"},"about":{"copy":"រក្សាសិទ្ធិ &copy; $1។ រក្សា​សិទ្ធិ​គ្រប់​បែប​យ៉ាង។","dlgTitle":"អំពី CKEditor","help":"ពិនិត្យ $1 សម្រាប់​ជំនួយ។","moreInfo":"សម្រាប់​ព័ត៌មាន​អំពី​អាជ្ញាបណញណ សូម​មើល​ក្នុង​គេហទំព័រ​របស់​យើង៖","title":"អំពី CKEditor","userGuide":"វិធី​ប្រើ​ប្រាស់ CKEditor"},"basicstyles":{"bold":"ដិត","italic":"ទ្រេត","strike":"គូស​បន្ទាត់​ចំ​កណ្ដាល","subscript":"អក្សរតូចក្រោម","superscript":"អក្សរតូចលើ","underline":"គូស​បន្ទាត់​ក្រោម"},"bidi":{"ltr":"ទិស​ដៅ​អក្សរ​ពី​ឆ្វេង​ទៅ​ស្ដាំ","rtl":"ទិស​ដៅ​អក្សរ​ពី​ស្ដាំ​ទៅ​ឆ្វេង"},"blockquote":{"toolbar":"ប្លក់​ពាក្យ​សម្រង់"},"clipboard":{"copy":"ចម្លង","copyError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ ចំលងអត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ (Ctrl/Cmd+C)។","cut":"កាត់យក","cutError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ កាត់អត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ  (Ctrl/Cmd+X) ។","paste":"បិទ​ភ្ជាប់","pasteArea":"តំបន់​បិទ​ភ្ជាប់","pasteMsg":"សូមចំលងអត្ថបទទៅដាក់ក្នុងប្រអប់ដូចខាងក្រោមដោយប្រើប្រាស់ ឃី ​(<STRONG>Ctrl/Cmd+V</STRONG>) ហើយចុច <STRONG>OK</STRONG> ។","securityMsg":"ព្រោះតែ​ការកំណត់​សុវត្ថិភាព ប្រអប់សរសេរ​មិន​អាចចាប់​យកទិន្នន័យពីក្តារតម្បៀតខ្ទាស់​អ្នក​​ដោយផ្ទាល់​បានទេ។ អ្នក​ត្រូវចំលង​ដាក់វាម្តង​ទៀត ក្នុងផ្ទាំងនេះ។","title":"បិទ​ភ្ជាប់"},"button":{"selectedLabel":"%1 (បាន​ជ្រើស​រើស)"},"colorbutton":{"auto":"ស្វ័យប្រវត្តិ","bgColorTitle":"ពណ៌ផ្ទៃខាងក្រោយ","colors":{"000":"ខ្មៅ","800000":"ត្នោត​ចាស់","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"ខៀវ​ចាស់","4B0082":"ធ្លះ","696969":"ប្រផេះ​ក្រាស់","B22222":"Fire Brick","A52A2A":"ត្នោត","DAA520":"Golden Rod","006400":"បៃតង​ចាស់","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"ប្រផេះ","F00":"ក្រហម","FF8C00":"ទឹក​ក្រូច​ចាស់","FFD700":"មាស","008000":"បៃតង","0FF":"Cyan","00F":"ខៀវ","EE82EE":"ស្វាយ","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"ទឹក​ក្រូច","FFFF00":"លឿង","00FF00":"ក្រូច​ឆ្មារ","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"លឿង​ស្ដើង","F0FFF0":"Honeydew","F0FFFF":"ផ្ទៃមេឃ","F0F8FF":"Alice Blue","E6E6FA":"ឡាវិនដឺ","FFF":"ស"},"more":"ពណ៌​ផ្សេង​ទៀត..","panelTitle":"ពណ៌","textColorTitle":"ពណ៌អក្សរ"},"colordialog":{"clear":"សម្អាត","highlight":"បន្លិច​ពណ៌","options":"ជម្រើស​ពណ៌","selected":"ពណ៌​ដែល​បាន​រើស","title":"រើស​ពណ៌"},"templates":{"button":"ពុម្ព​គំរូ","emptyListMsg":"(មិន​មាន​ពុម្ព​គំរូ​ត្រូវ​បាន​កំណត់)","insertOption":"ជំនួស​ក្នុង​មាតិកា​បច្ចុប្បន្ន","options":"ជម្រើស​ពុម្ព​គំរូ","selectPromptMsg":"សូម​រើស​ពុម្ព​គំរូ​ដើម្បី​បើក​ក្នុង​កម្មវិធី​សរសេរ​អត្ថបទ","title":"ពុម្ព​គំរូ​មាតិកា"},"contextmenu":{"options":"ជម្រើស​ម៉ឺនុយ​បរិបទ"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"ចំណង​ជើង​ប្រឹក្សា","cssClassInputLabel":"Stylesheet Classes","edit":"កែ Div","inlineStyleInputLabel":"ស្ទីល​ក្នុង​បន្ទាត់","langDirLTRLabel":"ពីឆ្វេងទៅស្តាំ(LTR)","langDirLabel":"ទិសដៅភាសា","langDirRTLLabel":"ពីស្តាំទៅឆ្វេង(RTL)","languageCodeInputLabel":"កូដ​ភាសា","remove":"ដក Div ចេញ","styleSelectLabel":"ស្ទីល","title":"បង្កើត​អ្នក​ផ្ទុក Div","toolbar":"បង្កើត​អ្នក​ផ្ទុក Div"},"toolbar":{"toolbarCollapse":"បង្រួម​របារ​ឧបករណ៍","toolbarExpand":"ពង្រីក​របារ​ឧបករណ៍","toolbarGroups":{"document":"ឯកសារ","clipboard":"Clipboard/មិន​ធ្វើ​វិញ","editing":"ការ​កែ​សម្រួល","forms":"បែបបទ","basicstyles":"រចនាបថ​មូលដ្ឋាន","paragraph":"កថាខណ្ឌ","links":"តំណ","insert":"បញ្ចូល","styles":"រចនាបថ","colors":"ពណ៌","tools":"ឧបករណ៍"},"toolbars":"របារ​ឧបករណ៍​កែ​សម្រួល"},"elementspath":{"eleLabel":"ទីតាំង​ធាតុ","eleTitle":"ធាតុ %1"},"find":{"find":"ស្វែងរក","findOptions":"ជម្រើស​ស្វែង​រក","findWhat":"ស្វែងរកអ្វី:","matchCase":"ករណី​ដំណូច","matchCyclic":"ត្រូវ​នឹង cyclic","matchWord":"ដូច​នឹង​ពាក្យ​ទាំង​មូល","notFoundMsg":"រក​មិន​ឃើញ​ពាក្យ​ដែល​បាន​បញ្ជាក់។","replace":"ជំនួស","replaceAll":"ជំនួសទាំងអស់","replaceSuccessMsg":"ការ​ជំនួស​ចំនួន %1 បាន​កើត​ឡើង។","replaceWith":"ជំនួសជាមួយ:","title":"រក​និង​ជំនួស"},"fakeobjects":{"anchor":"យុថ្កា","flash":"Flash មាន​ចលនា","hiddenfield":"វាល​កំបាំង","iframe":"IFrame","unknown":"វត្ថុ​មិន​ស្គាល់"},"flash":{"access":"Script Access","accessAlways":"ជានិច្ច","accessNever":"កុំ","accessSameDomain":"Same domain","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"បន្ទាត់ជាមូលដ្ឋាន","alignTextTop":"លើអត្ថបទ","bgcolor":"ពណ៌ផ្ទៃខាងក្រោយ","chkFull":"អនុញ្ញាត​ឲ្យ​ពេញ​អេក្រង់","chkLoop":"ចំនួនដង","chkMenu":"បង្ហាញ មឺនុយរបស់ Flash","chkPlay":"លេងដោយស្វ័យប្រវត្ត","flashvars":"អថេរ Flash","hSpace":"គំលាតទទឹង","properties":"ការកំណត់ Flash","propertiesTab":"លក្ខណៈ​សម្បត្តិ","quality":"គុណភាព","qualityAutoHigh":"ខ្ពស់​ស្វ័យ​ប្រវត្តិ","qualityAutoLow":"ទាប​ស្វ័យ​ប្រវត្តិ","qualityBest":"ល្អ​បំផុត","qualityHigh":"ខ្ពស់","qualityLow":"ទាប","qualityMedium":"មធ្យម","scale":"ទំហំ","scaleAll":"បង្ហាញទាំងអស់","scaleFit":"ត្រូវល្មម","scaleNoBorder":"មិនបង្ហាញស៊ុម","title":"ការកំណត់ Flash","vSpace":"គំលាតបណ្តោយ","validateHSpace":"HSpace must be a number.","validateSrc":"សូមសរសេរ អាស័យដ្ឋាន URL","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"ភាព​ថ្លា","windowModeWindow":"វីនដូ"},"font":{"fontSize":{"label":"ទំហំ","voiceLabel":"ទំហំ​អក្សរ","panelTitle":"ទំហំ​អក្សរ"},"label":"ពុម្ព​អក្សរ","panelTitle":"ឈ្មោះ​ពុម្ព​អក្សរ","voiceLabel":"ពុម្ព​អក្សរ"},"forms":{"button":{"title":"លក្ខណៈ​ប៊ូតុង","text":"អត្ថបទ (តម្លៃ)","type":"ប្រភេទ","typeBtn":"ប៊ូតុង","typeSbm":"ដាក់ស្នើ","typeRst":"កំណត់​ឡើង​វិញ"},"checkboxAndRadio":{"checkboxTitle":"លក្ខណៈ​ប្រអប់​ធីក","radioTitle":"លក្ខនៈ​ប៊ូតុង​មូល","value":"តម្លៃ","selected":"បាន​ជ្រើស","required":"Required"},"form":{"title":"លក្ខណៈ​បែបបទ","menu":"លក្ខណៈ​បែបបទ","action":"សកម្មភាព","method":"វិធីសាស្ត្រ","encoding":"ការ​អ៊ិនកូដ"},"hidden":{"title":"លក្ខណៈ​វាល​កំបាំង","name":"ឈ្មោះ","value":"តម្លៃ"},"select":{"title":"លក្ខណៈ​វាល​ជម្រើស","selectInfo":"ព័ត៌មាន​ជម្រើស","opAvail":"ជម្រើស​ដែល​មាន","value":"តម្លៃ","size":"ទំហំ","lines":"បន្ទាត់","chkMulti":"អនុញ្ញាត​ពហុ​ជម្រើស","required":"Required","opText":"អត្ថបទ","opValue":"តម្លៃ","btnAdd":"បន្ថែម","btnModify":"ផ្លាស់ប្តូរ","btnUp":"លើ","btnDown":"ក្រោម","btnSetValue":"កំណត់​ជា​តម្លៃ​ដែល​បាន​ជ្រើស","btnDelete":"លុប"},"textarea":{"title":"លក្ខណៈ​ប្រអប់​អត្ថបទ","cols":"ជួរឈរ","rows":"ជួរដេក"},"textfield":{"title":"លក្ខណៈ​វាល​អត្ថបទ","name":"ឈ្មោះ","value":"តម្លៃ","charWidth":"ទទឹង​តួ​អក្សរ","maxChars":"អក្សរអតិបរិមា","required":"Required","type":"ប្រភេទ","typeText":"អត្ថបទ","typePass":"ពាក្យសម្ងាត់","typeEmail":"អ៊ីមែល","typeSearch":"ស្វែង​រក","typeTel":"លេខ​ទូរសព្ទ","typeUrl":"URL"}},"format":{"label":"ទម្រង់","panelTitle":"ទម្រង់​កថាខណ្ឌ","tag_address":"អាសយដ្ឋាន","tag_div":"ធម្មតា (DIV)","tag_h1":"ចំណង​ជើង 1","tag_h2":"ចំណង​ជើង 2","tag_h3":"ចំណង​ជើង 3","tag_h4":"ចំណង​ជើង 4","tag_h5":"ចំណង​ជើង 5","tag_h6":"ចំណង​ជើង 6","tag_p":"ធម្មតា","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"បន្ថែមបន្ទាត់ផ្តេក"},"iframe":{"border":"បង្ហាញ​បន្ទាត់​ស៊ុម","noUrl":"សូម​បញ្ចូល URL របស់ iframe","scrolling":"ប្រើ​របារ​រំកិល","title":"លក្ខណៈ​សម្បត្តិ IFrame","toolbar":"IFrame"},"image":{"alt":"អត្ថបទជំនួស","border":"ស៊ុម","btnUpload":"ផ្ញើ​ទៅ​ម៉ាស៊ីន​បម្រើ","button2Img":"តើ​អ្នក​ចង់​ផ្លាស់​ប្ដូរ​ប៊ូតុង​រូបភាព​ដែល​បាន​ជ្រើស នៅ​លើ​រូបភាព​ធម្មតា​មួយ​មែនទេ?","hSpace":"គម្លាត​ផ្ដេក","img2Button":"តើ​អ្នក​ចង់​ផ្លាស់​ប្ដូរ​រូបភាព​ដែល​បាន​ជ្រើស នៅ​លើ​ប៊ូតុង​រូបភាព​មែនទេ?","infoTab":"ពត៌មានអំពីរូបភាព","linkTab":"តំណ","lockRatio":"ចាក់​សោ​ផល​ធៀប","menu":"លក្ខណៈ​រូបភាព","resetSize":"កំណត់ទំហំឡើងវិញ","title":"លក្ខណៈ​រូបភាព","titleButton":"លក្ខណៈ​ប៊ូតុង​រូបភាព","upload":"ផ្ទុកឡើង","urlMissing":"ខ្វះ URL ប្រភព​រូប​ភាព។","vSpace":"គម្លាត​បញ្ឈរ","validateBorder":"ស៊ុម​ត្រូវ​តែ​ជា​លេខ។","validateHSpace":"គម្លាត​ផ្ដេក​ត្រូវ​តែ​ជា​លេខ។","validateVSpace":"គម្លាត​បញ្ឈរ​ត្រូវ​តែ​ជា​លេខ។"},"indent":{"indent":"បន្ថែមការចូលបន្ទាត់","outdent":"បន្ថយការចូលបន្ទាត់"},"smiley":{"options":"ជម្រើស​រូប​សញ្ញា​អារម្មណ៍","title":"បញ្ចូល​រូប​សញ្ញា​អារម្មណ៍","toolbar":"រូប​សញ្ញ​អារម្មណ៍"},"justify":{"block":"តម្រឹម​ពេញ","center":"កណ្ដាល","left":"តម្រឹម​ឆ្វេង","right":"តម្រឹម​ស្ដាំ"},"language":{"button":"កំណត់​ភាសា","remove":"លុប​ភាសា"},"link":{"acccessKey":"សោរ​ចូល","advanced":"កម្រិត​ខ្ពស់","advisoryContentType":"ប្រភេទអត្ថបទ​ប្រឹក្សា","advisoryTitle":"ចំណងជើង​ប្រឹក្សា","anchor":{"toolbar":"យុថ្កា","menu":"កែ​យុថ្កា","title":"លក្ខណៈ​យុថ្កា","name":"ឈ្មោះ​យុថ្កា","errorName":"សូម​បញ្ចូល​ឈ្មោះ​យុថ្កា","remove":"ដក​យុថ្កា​ចេញ"},"anchorId":"តាម ID ធាតុ","anchorName":"តាម​ឈ្មោះ​យុថ្កា","charset":"លេខកូតអក្សររបស់ឈ្នាប់","cssClasses":"Stylesheet Classes","emailAddress":"អាសយដ្ឋាន​អ៊ីមែល","emailBody":"តួ​អត្ថបទ","emailSubject":"ប្រធានបទ​សារ","id":"Id","info":"ព័ត៌មាន​ពី​តំណ","langCode":"កូដ​ភាសា","langDir":"ទិសដៅភាសា","langDirLTR":"ពីឆ្វេងទៅស្តាំ(LTR)","langDirRTL":"ពីស្តាំទៅឆ្វេង(RTL)","menu":"កែ​តំណ","name":"ឈ្មោះ","noAnchors":"(មិន​មាន​យុថ្កា​នៅ​ក្នុង​ឯកសារ​អត្ថថបទ​ទេ)","noEmail":"សូម​បញ្ចូល​អាសយដ្ឋាន​អ៊ីមែល","noUrl":"សូម​បញ្ចូល​តំណ URL","other":"<ផ្សេង​ទៀត>","popupDependent":"Dependent (Netscape)","popupFeatures":"មុខ​ងារ​ផុស​ផ្ទាំង​វីនដូ​ឡើង","popupFullScreen":"ពេញ​អេក្រង់ (IE)","popupLeft":"ទីតាំងខាងឆ្វេង","popupLocationBar":"របារ​ទីតាំង","popupMenuBar":"របារ​ម៉ឺនុយ","popupResizable":"អាច​ប្ដូរ​ទំហំ","popupScrollBars":"របារ​រំកិល","popupStatusBar":"របារ​ស្ថានភាព","popupToolbar":"របារ​ឧបករណ៍","popupTop":"ទីតាំង​កំពូល","rel":"សម្ពន្ធ​ភាព","selectAnchor":"រើស​យក​យុថ្កា​មួយ","styles":"ស្ទីល","tabIndex":"លេខ Tab","target":"គោលដៅ","targetFrame":"<ស៊ុម>","targetFrameName":"ឈ្មោះ​ស៊ុម​ជា​គោល​ដៅ","targetPopup":"<វីនដូ​ផុស​ឡើង>","targetPopupName":"ឈ្មោះ​វីនដូត​ផុស​ឡើង","title":"តំណ","toAnchor":"ត​ភ្ជាប់​ទៅ​យុថ្កា​ក្នុង​អត្ថបទ","toEmail":"អ៊ីមែល","toUrl":"URL","toolbar":"តំណ","type":"ប្រភេទ​តំណ","unlink":"ផ្ដាច់​តំណ","upload":"ផ្ទុក​ឡើង"},"list":{"bulletedlist":"បញ្ចូល / លុប​បញ្ជី​ជា​ចំណុច​មូល","numberedlist":"បញ្ចូល / លុប​បញ្ជី​ជា​លេខ"},"liststyle":{"armenian":"លេខ​អារមេនី","bulletedTitle":"លក្ខណៈ​សម្បត្តិ​បញ្ជី​ជា​ចំណុច","circle":"រង្វង់​មូល","decimal":"លេខ​ទសភាគ (1, 2, 3, ...)","decimalLeadingZero":"ទសភាគ​ចាប់​ផ្ដើម​ពី​សូន្យ (01, 02, 03, ...)","disc":"ថាស","georgian":"លេខ​ចចជា (an, ban, gan, ...)","lowerAlpha":"ព្យញ្ជនៈ​តូច (a, b, c, d, e, ...)","lowerGreek":"លេខ​ក្រិក​តូច (alpha, beta, gamma, ...)","lowerRoman":"លេខ​រ៉ូម៉ាំង​តូច (i, ii, iii, iv, v, ...)","none":"គ្មាន","notset":"<not set>","numberedTitle":"លក្ខណៈ​សម្បត្តិ​បញ្ជី​ជា​លេខ","square":"ការេ","start":"ចាប់​ផ្ដើម","type":"ប្រភេទ","upperAlpha":"អក្សរ​ធំ (A, B, C, D, E, ...)","upperRoman":"លេខ​រ៉ូម៉ាំង​ធំ (I, II, III, IV, V, ...)","validateStartNumber":"លេខ​ចាប់​ផ្ដើម​បញ្ជី ត្រូវ​តែ​ជា​តួ​លេខ​ពិត​ប្រាកដ។"},"magicline":{"title":"បញ្ចូល​កថាខណ្ឌ​នៅ​ទីនេះ"},"maximize":{"maximize":"ពង្រីក​អតិបរមា","minimize":"បង្រួម​អប្បបរមា"},"newpage":{"toolbar":"ទំព័រ​ថ្មី"},"pagebreak":{"alt":"បំបែក​ទំព័រ","toolbar":"បន្ថែម​ការ​បំបែក​ទំព័រ​មុន​បោះពុម្ព"},"pastetext":{"button":"បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា","title":"បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា"},"pastefromword":{"confirmCleanup":"អត្ថបទ​ដែល​អ្នក​ចង់​បិទ​ភ្ជាប់​នេះ ទំនង​ដូច​ជា​ចម្លង​មក​ពី Word។ តើ​អ្នក​ចង់​សម្អាត​វា​មុន​បិទ​ភ្ជាប់​ទេ?","error":"ដោយ​សារ​មាន​បញ្ហា​ផ្នែក​ក្នុង​ធ្វើ​ឲ្យ​មិន​អាច​សម្អាត​ទិន្នន័យ​ដែល​បាន​បិទ​ភ្ជាប់","title":"បិទ​ភ្ជាប់​ពី Word","toolbar":"បិទ​ភ្ជាប់​ពី Word"},"preview":{"preview":"មើល​ជា​មុន"},"print":{"toolbar":"បោះពុម្ព"},"removeformat":{"toolbar":"ជម្រះ​ទ្រង់​ទ្រាយ"},"save":{"toolbar":"រក្សាទុក"},"selectall":{"toolbar":"រើស​ទាំង​អស់"},"showblocks":{"toolbar":"បង្ហាញ​ប្លក់"},"sourcearea":{"toolbar":"អក្សរ​កូដ"},"specialchar":{"options":"ជម្រើស​តួ​អក្សរ​ពិសេស","title":"រើស​តួអក្សរ​ពិសេស","toolbar":"បន្ថែមអក្សរពិសេស"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"រចនាបថ","panelTitle":"ទ្រង់ទ្រាយ​រចនាបថ","panelTitle1":"រចនាបថ​ប្លក់","panelTitle2":"រចនាបថ​ក្នុង​ជួរ","panelTitle3":"រចនាបថ​វត្ថុ"},"table":{"border":"ទំហំ​បន្ទាត់​ស៊ុម","caption":"ចំណងជើង","cell":{"menu":"ក្រឡា","insertBefore":"បញ្ចូល​ក្រឡា​ពីមុខ","insertAfter":"បញ្ចូល​ក្រឡា​ពី​ក្រោយ","deleteCell":"លុប​ក្រឡា","merge":"បញ្ចូល​ក្រឡា​ចូល​គ្នា","mergeRight":"បញ្ចូល​គ្នា​ខាង​ស្ដាំ","mergeDown":"បញ្ចូល​គ្នា​ចុះ​ក្រោម","splitHorizontal":"ពុះ​ក្រឡា​ផ្ដេក","splitVertical":"ពុះ​ក្រឡា​បញ្ឈរ","title":"លក្ខណៈ​ក្រឡា","cellType":"ប្រភេទ​ក្រឡា","rowSpan":"ចំនួន​ជួរ​ដេក​លាយ​ចូល​គ្នា","colSpan":"ចំនួន​ជួរ​ឈរ​លាយ​ចូល​គ្នា","wordWrap":"រុំ​ពាក្យ","hAlign":"ការ​តម្រឹម​ផ្ដេក","vAlign":"ការ​តម្រឹម​បញ្ឈរ","alignBaseline":"ខ្សែ​បន្ទាត់​គោល","bgColor":"ពណ៌​ផ្ទៃ​ក្រោយ","borderColor":"ពណ៌​បន្ទាត់​ស៊ុម","data":"ទិន្នន័យ","header":"ក្បាល","yes":"ព្រម","no":"ទេ","invalidWidth":"ទទឹង​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidHeight":"កម្ពស់​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidRowSpan":"ចំនួន​ជួរ​ដេក​លាយ​ចូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","invalidColSpan":"ចំនួន​ជួរ​ឈរ​លាយ​ចូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","chooseColor":"រើស"},"cellPad":"ចន្លោះ​ក្រឡា","cellSpace":"គម្លាត​ក្រឡា","column":{"menu":"ជួរ​ឈរ","insertBefore":"បញ្ចូល​ជួរ​ឈរ​ពីមុខ","insertAfter":"បញ្ចូល​ជួរ​ឈរ​ពី​ក្រោយ","deleteColumn":"លុប​ជួរ​ឈរ"},"columns":"ជួរឈរ","deleteTable":"លុប​តារាង","headers":"ក្បាល","headersBoth":"ទាំង​ពីរ","headersColumn":"ជួរ​ឈរ​ដំបូង","headersNone":"មិន​មាន","headersRow":"ជួរ​ដេក​ដំបូង","invalidBorder":"ទំហំ​បន្ទាត់​ស៊ុម​ត្រូវ​តែ​ជា​លេខ។","invalidCellPadding":"ចន្លោះ​ក្រឡា​ត្រូវ​តែជា​លេខ​វិជ្ជមាន។","invalidCellSpacing":"គម្លាត​ក្រឡា​ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន។","invalidCols":"ចំនួន​ជួរ​ឈរ​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidHeight":"កម្ពស់​តារាង​ត្រូវ​តែ​ជា​លេខ","invalidRows":"ចំនួន​ជួរ​ដេក​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidWidth":"ទទឹង​តារាង​ត្រូវ​តែ​ជា​លេខ។","menu":"លក្ខណៈ​តារាង","row":{"menu":"ជួរ​ដេក","insertBefore":"បញ្ចូល​ជួរ​ដេក​ពីមុខ","insertAfter":"បញ្ចូល​ជួរ​ដេក​ពី​ក្រោយ","deleteRow":"លុប​ជួរ​ដេក"},"rows":"ជួរ​ដេក","summary":"សេចក្តី​សង្ខេប","title":"លក្ខណៈ​តារាង","toolbar":"តារាង","widthPc":"ភាគរយ","widthPx":"ភីកសែល","widthUnit":"ឯកតា​ទទឹង"},"undo":{"redo":"ធ្វើ​ឡើង​វិញ","undo":"មិន​ធ្វើ​វិញ"},"wsc":{"btnIgnore":"មិនផ្លាស់ប្តូរ","btnIgnoreAll":"មិនផ្លាស់ប្តូរ ទាំងអស់","btnReplace":"ជំនួស","btnReplaceAll":"ជំនួសទាំងអស់","btnUndo":"សារឡើងវិញ","changeTo":"ផ្លាស់ប្តូរទៅ","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"ពុំមានកម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធ ។ តើចង់ទាញយកពីណា?","manyChanges":"ការពិនិត្យអក្ខរាវិរុទ្ធបានចប់: %1 ពាក្យបានផ្លាស់ប្តូរ","noChanges":"ការពិនិត្យអក្ខរាវិរុទ្ធបានចប់: ពុំមានផ្លាស់ប្តូរ","noMispell":"ការពិនិត្យអក្ខរាវិរុទ្ធបានចប់: គ្មានកំហុស","noSuggestions":"- គ្មានសំណើរ -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"គ្មានក្នុងវចនានុក្រម","oneChange":"ការពិនិត្យអក្ខរាវិរុទ្ធបានចប់: ពាក្យមួយត្រូចបានផ្លាស់ប្តូរ","progress":"កំពុងពិនិត្យអក្ខរាវិរុទ្ធ...","title":"Spell Checker","toolbar":"ពិនិត្យអក្ខរាវិរុទ្ធ"}};
\ No newline at end of file
+CKEDITOR.lang['km']={"editor":"ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","editorPanel":"ផ្ទាំង​ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","common":{"editorHelp":"ចុច ALT 0 សម្រាប់​ជំនួយ","browseServer":"រក​មើល​ក្នុង​ម៉ាស៊ីន​បម្រើ","url":"URL","protocol":"ពិធីការ","upload":"ផ្ទុក​ឡើង","uploadSubmit":"បញ្ជូនទៅកាន់ម៉ាស៊ីន​បម្រើ","image":"រូបភាព","flash":"Flash","form":"បែបបទ","checkbox":"ប្រអប់​ធីក","radio":"ប៊ូតុង​មូល","textField":"វាល​អត្ថបទ","textarea":"Textarea","hiddenField":"វាល​កំបាំង","button":"ប៊ូតុង","select":"វាល​ជម្រើស","imageButton":"ប៊ូតុង​រូបភាព","notSet":"<មិនកំណត់>","id":"Id","name":"ឈ្មោះ","langDir":"ទិសដៅភាសា","langDirLtr":"ពីឆ្វេងទៅស្តាំ (LTR)","langDirRtl":"ពីស្តាំទៅឆ្វេង (RTL)","langCode":"លេខ​កូដ​ភាសា","longDescr":"URL អធិប្បាយ​វែង","cssClass":"Stylesheet Classes","advisoryTitle":"ចំណង​ជើង​ណែនាំ","cssStyle":"រចនាបថ","ok":"ព្រម","cancel":"បោះបង់","close":"បិទ","preview":"មើល​ជា​មុន","resize":"ប្ដូរ​ទំហំ","generalTab":"ទូទៅ","advancedTab":"កម្រិត​ខ្ពស់","validateNumberFailed":"តម្លៃ​នេះ​ពុំ​មែន​ជា​លេខ​ទេ។","confirmNewPage":"រាល់​បន្លាស់​ប្ដូរ​នានា​ដែល​មិន​ទាន់​រក្សា​ទុក​ក្នុង​មាតិកា​នេះ នឹង​ត្រូវ​បាត់​បង់។ តើ​អ្នក​ពិត​ជា​ចង់​ផ្ទុក​ទំព័រ​ថ្មី​មែនទេ?","confirmCancel":"ការ​កំណត់​មួយ​ចំនួន​ត្រូ​វ​បាន​ផ្លាស់​ប្ដូរ។ តើ​អ្នក​ពិត​ជា​ចង់​បិទ​ប្រអប់​នេះ​មែនទេ?","options":"ការ​កំណត់","target":"គោលដៅ","targetNew":"វីនដូ​ថ្មី (_blank)","targetTop":"វីនដូ​លើ​គេ (_top)","targetSelf":"វីនដូ​ដូច​គ្នា (_self)","targetParent":"វីនដូ​មេ (_parent)","langDirLTR":"ពីឆ្វេងទៅស្តាំ(LTR)","langDirRTL":"ពីស្តាំទៅឆ្វេង(RTL)","styles":"រចនាបថ","cssClasses":"Stylesheet Classes","width":"ទទឹង","height":"កំពស់","align":"កំណត់​ទីតាំង","alignLeft":"ខាងឆ្វង","alignRight":"ខាងស្តាំ","alignCenter":"កណ្តាល","alignJustify":"តំរឹមសងខាង","alignTop":"ខាងលើ","alignMiddle":"កណ្តាល","alignBottom":"ខាងក្រោម","alignNone":"គ្មាន","invalidValue":"តម្លៃ​មិន​ត្រឹម​ត្រូវ។","invalidHeight":"តម្លៃ​កំពស់​ត្រូវ​តែ​ជា​លេខ។","invalidWidth":"តម្លៃ​ទទឹង​ត្រូវ​តែ​ជា​លេខ។","invalidCssLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន​ ដោយ​ភ្ជាប់ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","invalidHtmlLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន ដោយ​ភ្ជាប់​ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ HTML (px ឬ %) ។","invalidInlineStyle":"តម្លៃ​កំណត់​សម្រាប់​រចនាបថ​ក្នុង​តួ ត្រូវ​តែ​មាន​មួយ​ឬ​ធាតុ​ច្រើន​ដោយ​មាន​ទ្រង់ទ្រាយ​ជា \"ឈ្មោះ : តម្លៃ\" ហើយ​ញែក​ចេញ​ពី​គ្នា​ដោយ​ចុច​ក្បៀស។","cssLengthTooltip":"បញ្ចូល​លេខ​សម្រាប់​តម្លៃ​ជា​ភិចសែល ឬ​លេខ​ដែល​មាន​ឯកតា​ត្រឹមត្រូវ​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","unavailable":"%1<span class=\"cke_accessibility\">, មិន​មាន</span>","keyboard":{"8":"លុបថយក្រោយ","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"ចុង","36":"ផ្ទះ","46":"លុប","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"រក្សាសិទ្ធិ &copy; $1។ រក្សា​សិទ្ធិ​គ្រប់​បែប​យ៉ាង។","dlgTitle":"អំពី CKEditor","help":"ពិនិត្យ $1 សម្រាប់​ជំនួយ។","moreInfo":"សម្រាប់​ព័ត៌មាន​អំពី​អាជ្ញាបណញណ សូម​មើល​ក្នុង​គេហទំព័រ​របស់​យើង៖","title":"អំពី CKEditor","userGuide":"វិធី​ប្រើ​ប្រាស់ CKEditor"},"basicstyles":{"bold":"ដិត","italic":"ទ្រេត","strike":"គូស​បន្ទាត់​ចំ​កណ្ដាល","subscript":"អក្សរតូចក្រោម","superscript":"អក្សរតូចលើ","underline":"គូស​បន្ទាត់​ក្រោម"},"bidi":{"ltr":"ទិស​ដៅ​អក្សរ​ពី​ឆ្វេង​ទៅ​ស្ដាំ","rtl":"ទិស​ដៅ​អក្សរ​ពី​ស្ដាំ​ទៅ​ឆ្វេង"},"blockquote":{"toolbar":"ប្លក់​ពាក្យ​សម្រង់"},"clipboard":{"copy":"ចម្លង","copyError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ ចំលងអត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ (Ctrl/Cmd+C)។","cut":"កាត់យក","cutError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ កាត់អត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ  (Ctrl/Cmd+X) ។","paste":"បិទ​ភ្ជាប់","pasteArea":"តំបន់​បិទ​ភ្ជាប់","pasteMsg":"សូមចំលងអត្ថបទទៅដាក់ក្នុងប្រអប់ដូចខាងក្រោមដោយប្រើប្រាស់ ឃី ​(<STRONG>Ctrl/Cmd+V</STRONG>) ហើយចុច <STRONG>OK</STRONG> ។","securityMsg":"ព្រោះតែ​ការកំណត់​សុវត្ថិភាព ប្រអប់សរសេរ​មិន​អាចចាប់​យកទិន្នន័យពីក្តារតម្បៀតខ្ទាស់​អ្នក​​ដោយផ្ទាល់​បានទេ។ អ្នក​ត្រូវចំលង​ដាក់វាម្តង​ទៀត ក្នុងផ្ទាំងនេះ។","title":"បិទ​ភ្ជាប់"},"button":{"selectedLabel":"%1 (បាន​ជ្រើស​រើស)"},"colorbutton":{"auto":"ស្វ័យប្រវត្តិ","bgColorTitle":"ពណ៌ផ្ទៃខាងក្រោយ","colors":{"000":"ខ្មៅ","800000":"ត្នោត​ចាស់","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"ខៀវ​ចាស់","4B0082":"ធ្លះ","696969":"ប្រផេះ​ក្រាស់","B22222":"Fire Brick","A52A2A":"ត្នោត","DAA520":"Golden Rod","006400":"បៃតង​ចាស់","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"ប្រផេះ","F00":"ក្រហម","FF8C00":"ទឹក​ក្រូច​ចាស់","FFD700":"មាស","008000":"បៃតង","0FF":"Cyan","00F":"ខៀវ","EE82EE":"ស្វាយ","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"ទឹក​ក្រូច","FFFF00":"លឿង","00FF00":"ក្រូច​ឆ្មារ","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"លឿង​ស្ដើង","F0FFF0":"Honeydew","F0FFFF":"ផ្ទៃមេឃ","F0F8FF":"Alice Blue","E6E6FA":"ឡាវិនដឺ","FFF":"ស","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"ពណ៌​ផ្សេង​ទៀត..","panelTitle":"ពណ៌","textColorTitle":"ពណ៌អក្សរ"},"colordialog":{"clear":"សម្អាត","highlight":"បន្លិច​ពណ៌","options":"ជម្រើស​ពណ៌","selected":"ពណ៌​ដែល​បាន​រើស","title":"រើស​ពណ៌"},"templates":{"button":"ពុម្ព​គំរូ","emptyListMsg":"(មិន​មាន​ពុម្ព​គំរូ​ត្រូវ​បាន​កំណត់)","insertOption":"ជំនួស​ក្នុង​មាតិកា​បច្ចុប្បន្ន","options":"ជម្រើស​ពុម្ព​គំរូ","selectPromptMsg":"សូម​រើស​ពុម្ព​គំរូ​ដើម្បី​បើក​ក្នុង​កម្មវិធី​សរសេរ​អត្ថបទ","title":"ពុម្ព​គំរូ​មាតិកា"},"contextmenu":{"options":"ជម្រើស​ម៉ឺនុយ​បរិបទ"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"ចំណង​ជើង​ប្រឹក្សា","cssClassInputLabel":"Stylesheet Classes","edit":"កែ Div","inlineStyleInputLabel":"ស្ទីល​ក្នុង​បន្ទាត់","langDirLTRLabel":"ពីឆ្វេងទៅស្តាំ(LTR)","langDirLabel":"ទិសដៅភាសា","langDirRTLLabel":"ពីស្តាំទៅឆ្វេង(RTL)","languageCodeInputLabel":"កូដ​ភាសា","remove":"ដក Div ចេញ","styleSelectLabel":"ស្ទីល","title":"បង្កើត​អ្នក​ផ្ទុក Div","toolbar":"បង្កើត​អ្នក​ផ្ទុក Div"},"toolbar":{"toolbarCollapse":"បង្រួម​របារ​ឧបករណ៍","toolbarExpand":"ពង្រីក​របារ​ឧបករណ៍","toolbarGroups":{"document":"ឯកសារ","clipboard":"Clipboard/មិន​ធ្វើ​វិញ","editing":"ការ​កែ​សម្រួល","forms":"បែបបទ","basicstyles":"រចនាបថ​មូលដ្ឋាន","paragraph":"កថាខណ្ឌ","links":"តំណ","insert":"បញ្ចូល","styles":"រចនាបថ","colors":"ពណ៌","tools":"ឧបករណ៍"},"toolbars":"របារ​ឧបករណ៍​កែ​សម្រួល"},"elementspath":{"eleLabel":"ទីតាំង​ធាតុ","eleTitle":"ធាតុ %1"},"find":{"find":"ស្វែងរក","findOptions":"ជម្រើស​ស្វែង​រក","findWhat":"ស្វែងរកអ្វី:","matchCase":"ករណី​ដំណូច","matchCyclic":"ត្រូវ​នឹង cyclic","matchWord":"ដូច​នឹង​ពាក្យ​ទាំង​មូល","notFoundMsg":"រក​មិន​ឃើញ​ពាក្យ​ដែល​បាន​បញ្ជាក់។","replace":"ជំនួស","replaceAll":"ជំនួសទាំងអស់","replaceSuccessMsg":"ការ​ជំនួស​ចំនួន %1 បាន​កើត​ឡើង។","replaceWith":"ជំនួសជាមួយ:","title":"រក​និង​ជំនួស"},"fakeobjects":{"anchor":"យុថ្កា","flash":"Flash មាន​ចលនា","hiddenfield":"វាល​កំបាំង","iframe":"IFrame","unknown":"វត្ថុ​មិន​ស្គាល់"},"flash":{"access":"Script Access","accessAlways":"ជានិច្ច","accessNever":"កុំ","accessSameDomain":"Same domain","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"បន្ទាត់ជាមូលដ្ឋាន","alignTextTop":"លើអត្ថបទ","bgcolor":"ពណ៌ផ្ទៃខាងក្រោយ","chkFull":"អនុញ្ញាត​ឲ្យ​ពេញ​អេក្រង់","chkLoop":"ចំនួនដង","chkMenu":"បង្ហាញ មឺនុយរបស់ Flash","chkPlay":"លេងដោយស្វ័យប្រវត្ត","flashvars":"អថេរ Flash","hSpace":"គំលាតទទឹង","properties":"ការកំណត់ Flash","propertiesTab":"លក្ខណៈ​សម្បត្តិ","quality":"គុណភាព","qualityAutoHigh":"ខ្ពស់​ស្វ័យ​ប្រវត្តិ","qualityAutoLow":"ទាប​ស្វ័យ​ប្រវត្តិ","qualityBest":"ល្អ​បំផុត","qualityHigh":"ខ្ពស់","qualityLow":"ទាប","qualityMedium":"មធ្យម","scale":"ទំហំ","scaleAll":"បង្ហាញទាំងអស់","scaleFit":"ត្រូវល្មម","scaleNoBorder":"មិនបង្ហាញស៊ុម","title":"ការកំណត់ Flash","vSpace":"គំលាតបណ្តោយ","validateHSpace":"HSpace must be a number.","validateSrc":"សូមសរសេរ អាស័យដ្ឋាន URL","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"ភាព​ថ្លា","windowModeWindow":"វីនដូ"},"font":{"fontSize":{"label":"ទំហំ","voiceLabel":"ទំហំ​អក្សរ","panelTitle":"ទំហំ​អក្សរ"},"label":"ពុម្ព​អក្សរ","panelTitle":"ឈ្មោះ​ពុម្ព​អក្សរ","voiceLabel":"ពុម្ព​អក្សរ"},"forms":{"button":{"title":"លក្ខណៈ​ប៊ូតុង","text":"អត្ថបទ (តម្លៃ)","type":"ប្រភេទ","typeBtn":"ប៊ូតុង","typeSbm":"ដាក់ស្នើ","typeRst":"កំណត់​ឡើង​វិញ"},"checkboxAndRadio":{"checkboxTitle":"លក្ខណៈ​ប្រអប់​ធីក","radioTitle":"លក្ខនៈ​ប៊ូតុង​មូល","value":"តម្លៃ","selected":"បាន​ជ្រើស","required":"Required"},"form":{"title":"លក្ខណៈ​បែបបទ","menu":"លក្ខណៈ​បែបបទ","action":"សកម្មភាព","method":"វិធីសាស្ត្រ","encoding":"ការ​អ៊ិនកូដ"},"hidden":{"title":"លក្ខណៈ​វាល​កំបាំង","name":"ឈ្មោះ","value":"តម្លៃ"},"select":{"title":"លក្ខណៈ​វាល​ជម្រើស","selectInfo":"ព័ត៌មាន​ជម្រើស","opAvail":"ជម្រើស​ដែល​មាន","value":"តម្លៃ","size":"ទំហំ","lines":"បន្ទាត់","chkMulti":"អនុញ្ញាត​ពហុ​ជម្រើស","required":"Required","opText":"អត្ថបទ","opValue":"តម្លៃ","btnAdd":"បន្ថែម","btnModify":"ផ្លាស់ប្តូរ","btnUp":"លើ","btnDown":"ក្រោម","btnSetValue":"កំណត់​ជា​តម្លៃ​ដែល​បាន​ជ្រើស","btnDelete":"លុប"},"textarea":{"title":"លក្ខណៈ​ប្រអប់​អត្ថបទ","cols":"ជួរឈរ","rows":"ជួរដេក"},"textfield":{"title":"លក្ខណៈ​វាល​អត្ថបទ","name":"ឈ្មោះ","value":"តម្លៃ","charWidth":"ទទឹង​តួ​អក្សរ","maxChars":"អក្សរអតិបរិមា","required":"Required","type":"ប្រភេទ","typeText":"អត្ថបទ","typePass":"ពាក្យសម្ងាត់","typeEmail":"អ៊ីមែល","typeSearch":"ស្វែង​រក","typeTel":"លេខ​ទូរសព្ទ","typeUrl":"URL"}},"format":{"label":"ទម្រង់","panelTitle":"ទម្រង់​កថាខណ្ឌ","tag_address":"អាសយដ្ឋាន","tag_div":"ធម្មតា (DIV)","tag_h1":"ចំណង​ជើង 1","tag_h2":"ចំណង​ជើង 2","tag_h3":"ចំណង​ជើង 3","tag_h4":"ចំណង​ជើង 4","tag_h5":"ចំណង​ជើង 5","tag_h6":"ចំណង​ជើង 6","tag_p":"ធម្មតា","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"បន្ថែមបន្ទាត់ផ្តេក"},"iframe":{"border":"បង្ហាញ​បន្ទាត់​ស៊ុម","noUrl":"សូម​បញ្ចូល URL របស់ iframe","scrolling":"ប្រើ​របារ​រំកិល","title":"លក្ខណៈ​សម្បត្តិ IFrame","toolbar":"IFrame"},"image":{"alt":"អត្ថបទជំនួស","border":"ស៊ុម","btnUpload":"ផ្ញើ​ទៅ​ម៉ាស៊ីន​បម្រើ","button2Img":"តើ​អ្នក​ចង់​ផ្លាស់​ប្ដូរ​ប៊ូតុង​រូបភាព​ដែល​បាន​ជ្រើស នៅ​លើ​រូបភាព​ធម្មតា​មួយ​មែនទេ?","hSpace":"គម្លាត​ផ្ដេក","img2Button":"តើ​អ្នក​ចង់​ផ្លាស់​ប្ដូរ​រូបភាព​ដែល​បាន​ជ្រើស នៅ​លើ​ប៊ូតុង​រូបភាព​មែនទេ?","infoTab":"ពត៌មានអំពីរូបភាព","linkTab":"តំណ","lockRatio":"ចាក់​សោ​ផល​ធៀប","menu":"លក្ខណៈ​រូបភាព","resetSize":"កំណត់ទំហំឡើងវិញ","title":"លក្ខណៈ​រូបភាព","titleButton":"លក្ខណៈ​ប៊ូតុង​រូបភាព","upload":"ផ្ទុកឡើង","urlMissing":"ខ្វះ URL ប្រភព​រូប​ភាព។","vSpace":"គម្លាត​បញ្ឈរ","validateBorder":"ស៊ុម​ត្រូវ​តែ​ជា​លេខ។","validateHSpace":"គម្លាត​ផ្ដេក​ត្រូវ​តែ​ជា​លេខ។","validateVSpace":"គម្លាត​បញ្ឈរ​ត្រូវ​តែ​ជា​លេខ។"},"indent":{"indent":"បន្ថែមការចូលបន្ទាត់","outdent":"បន្ថយការចូលបន្ទាត់"},"smiley":{"options":"ជម្រើស​រូប​សញ្ញា​អារម្មណ៍","title":"បញ្ចូល​រូប​សញ្ញា​អារម្មណ៍","toolbar":"រូប​សញ្ញ​អារម្មណ៍"},"justify":{"block":"តម្រឹម​ពេញ","center":"កណ្ដាល","left":"តម្រឹម​ឆ្វេង","right":"តម្រឹម​ស្ដាំ"},"language":{"button":"កំណត់​ភាសា","remove":"លុប​ភាសា"},"link":{"acccessKey":"សោរ​ចូល","advanced":"កម្រិត​ខ្ពស់","advisoryContentType":"ប្រភេទអត្ថបទ​ប្រឹក្សា","advisoryTitle":"ចំណងជើង​ប្រឹក្សា","anchor":{"toolbar":"យុថ្កា","menu":"កែ​យុថ្កា","title":"លក្ខណៈ​យុថ្កា","name":"ឈ្មោះ​យុថ្កា","errorName":"សូម​បញ្ចូល​ឈ្មោះ​យុថ្កា","remove":"ដក​យុថ្កា​ចេញ"},"anchorId":"តាម ID ធាតុ","anchorName":"តាម​ឈ្មោះ​យុថ្កា","charset":"លេខកូតអក្សររបស់ឈ្នាប់","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"អាសយដ្ឋាន​អ៊ីមែល","emailBody":"តួ​អត្ថបទ","emailSubject":"ប្រធានបទ​សារ","id":"Id","info":"ព័ត៌មាន​ពី​តំណ","langCode":"កូដ​ភាសា","langDir":"ទិសដៅភាសា","langDirLTR":"ពីឆ្វេងទៅស្តាំ(LTR)","langDirRTL":"ពីស្តាំទៅឆ្វេង(RTL)","menu":"កែ​តំណ","name":"ឈ្មោះ","noAnchors":"(មិន​មាន​យុថ្កា​នៅ​ក្នុង​ឯកសារ​អត្ថថបទ​ទេ)","noEmail":"សូម​បញ្ចូល​អាសយដ្ឋាន​អ៊ីមែល","noUrl":"សូម​បញ្ចូល​តំណ URL","other":"<ផ្សេង​ទៀត>","popupDependent":"Dependent (Netscape)","popupFeatures":"មុខ​ងារ​ផុស​ផ្ទាំង​វីនដូ​ឡើង","popupFullScreen":"ពេញ​អេក្រង់ (IE)","popupLeft":"ទីតាំងខាងឆ្វេង","popupLocationBar":"របារ​ទីតាំង","popupMenuBar":"របារ​ម៉ឺនុយ","popupResizable":"អាច​ប្ដូរ​ទំហំ","popupScrollBars":"របារ​រំកិល","popupStatusBar":"របារ​ស្ថានភាព","popupToolbar":"របារ​ឧបករណ៍","popupTop":"ទីតាំង​កំពូល","rel":"សម្ពន្ធ​ភាព","selectAnchor":"រើស​យក​យុថ្កា​មួយ","styles":"ស្ទីល","tabIndex":"លេខ Tab","target":"គោលដៅ","targetFrame":"<ស៊ុម>","targetFrameName":"ឈ្មោះ​ស៊ុម​ជា​គោល​ដៅ","targetPopup":"<វីនដូ​ផុស​ឡើង>","targetPopupName":"ឈ្មោះ​វីនដូត​ផុស​ឡើង","title":"តំណ","toAnchor":"ត​ភ្ជាប់​ទៅ​យុថ្កា​ក្នុង​អត្ថបទ","toEmail":"អ៊ីមែល","toUrl":"URL","toolbar":"តំណ","type":"ប្រភេទ​តំណ","unlink":"ផ្ដាច់​តំណ","upload":"ផ្ទុក​ឡើង"},"list":{"bulletedlist":"បញ្ចូល / លុប​បញ្ជី​ជា​ចំណុច​មូល","numberedlist":"បញ្ចូល / លុប​បញ្ជី​ជា​លេខ"},"liststyle":{"armenian":"លេខ​អារមេនី","bulletedTitle":"លក្ខណៈ​សម្បត្តិ​បញ្ជី​ជា​ចំណុច","circle":"រង្វង់​មូល","decimal":"លេខ​ទសភាគ (1, 2, 3, ...)","decimalLeadingZero":"ទសភាគ​ចាប់​ផ្ដើម​ពី​សូន្យ (01, 02, 03, ...)","disc":"ថាស","georgian":"លេខ​ចចជា (an, ban, gan, ...)","lowerAlpha":"ព្យញ្ជនៈ​តូច (a, b, c, d, e, ...)","lowerGreek":"លេខ​ក្រិក​តូច (alpha, beta, gamma, ...)","lowerRoman":"លេខ​រ៉ូម៉ាំង​តូច (i, ii, iii, iv, v, ...)","none":"គ្មាន","notset":"<not set>","numberedTitle":"លក្ខណៈ​សម្បត្តិ​បញ្ជី​ជា​លេខ","square":"ការេ","start":"ចាប់​ផ្ដើម","type":"ប្រភេទ","upperAlpha":"អក្សរ​ធំ (A, B, C, D, E, ...)","upperRoman":"លេខ​រ៉ូម៉ាំង​ធំ (I, II, III, IV, V, ...)","validateStartNumber":"លេខ​ចាប់​ផ្ដើម​បញ្ជី ត្រូវ​តែ​ជា​តួ​លេខ​ពិត​ប្រាកដ។"},"magicline":{"title":"បញ្ចូល​កថាខណ្ឌ​នៅ​ទីនេះ"},"maximize":{"maximize":"ពង្រីក​អតិបរមា","minimize":"បង្រួម​អប្បបរមា"},"newpage":{"toolbar":"ទំព័រ​ថ្មី"},"pagebreak":{"alt":"បំបែក​ទំព័រ","toolbar":"បន្ថែម​ការ​បំបែក​ទំព័រ​មុន​បោះពុម្ព"},"pastetext":{"button":"បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា","title":"បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា"},"pastefromword":{"confirmCleanup":"អត្ថបទ​ដែល​អ្នក​ចង់​បិទ​ភ្ជាប់​នេះ ទំនង​ដូច​ជា​ចម្លង​មក​ពី Word។ តើ​អ្នក​ចង់​សម្អាត​វា​មុន​បិទ​ភ្ជាប់​ទេ?","error":"ដោយ​សារ​មាន​បញ្ហា​ផ្នែក​ក្នុង​ធ្វើ​ឲ្យ​មិន​អាច​សម្អាត​ទិន្នន័យ​ដែល​បាន​បិទ​ភ្ជាប់","title":"បិទ​ភ្ជាប់​ពី Word","toolbar":"បិទ​ភ្ជាប់​ពី Word"},"preview":{"preview":"មើល​ជា​មុន"},"print":{"toolbar":"បោះពុម្ព"},"removeformat":{"toolbar":"ជម្រះ​ទ្រង់​ទ្រាយ"},"save":{"toolbar":"រក្សាទុក"},"selectall":{"toolbar":"រើស​ទាំង​អស់"},"showblocks":{"toolbar":"បង្ហាញ​ប្លក់"},"sourcearea":{"toolbar":"អក្សរ​កូដ"},"specialchar":{"options":"ជម្រើស​តួ​អក្សរ​ពិសេស","title":"រើស​តួអក្សរ​ពិសេស","toolbar":"បន្ថែមអក្សរពិសេស"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"រចនាបថ","panelTitle":"ទ្រង់ទ្រាយ​រចនាបថ","panelTitle1":"រចនាបថ​ប្លក់","panelTitle2":"រចនាបថ​ក្នុង​ជួរ","panelTitle3":"រចនាបថ​វត្ថុ"},"table":{"border":"ទំហំ​បន្ទាត់​ស៊ុម","caption":"ចំណងជើង","cell":{"menu":"ក្រឡា","insertBefore":"បញ្ចូល​ក្រឡា​ពីមុខ","insertAfter":"បញ្ចូល​ក្រឡា​ពី​ក្រោយ","deleteCell":"លុប​ក្រឡា","merge":"បញ្ចូល​ក្រឡា​ចូល​គ្នា","mergeRight":"បញ្ចូល​គ្នា​ខាង​ស្ដាំ","mergeDown":"បញ្ចូល​គ្នា​ចុះ​ក្រោម","splitHorizontal":"ពុះ​ក្រឡា​ផ្ដេក","splitVertical":"ពុះ​ក្រឡា​បញ្ឈរ","title":"លក្ខណៈ​ក្រឡា","cellType":"ប្រភេទ​ក្រឡា","rowSpan":"ចំនួន​ជួរ​ដេក​លាយ​ចូល​គ្នា","colSpan":"ចំនួន​ជួរ​ឈរ​លាយ​ចូល​គ្នា","wordWrap":"រុំ​ពាក្យ","hAlign":"ការ​តម្រឹម​ផ្ដេក","vAlign":"ការ​តម្រឹម​បញ្ឈរ","alignBaseline":"ខ្សែ​បន្ទាត់​គោល","bgColor":"ពណ៌​ផ្ទៃ​ក្រោយ","borderColor":"ពណ៌​បន្ទាត់​ស៊ុម","data":"ទិន្នន័យ","header":"ក្បាល","yes":"ព្រម","no":"ទេ","invalidWidth":"ទទឹង​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidHeight":"កម្ពស់​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidRowSpan":"ចំនួន​ជួរ​ដេក​លាយ​ចូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","invalidColSpan":"ចំនួន​ជួរ​ឈរ​លាយ​ចូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","chooseColor":"រើស"},"cellPad":"ចន្លោះ​ក្រឡា","cellSpace":"គម្លាត​ក្រឡា","column":{"menu":"ជួរ​ឈរ","insertBefore":"បញ្ចូល​ជួរ​ឈរ​ពីមុខ","insertAfter":"បញ្ចូល​ជួរ​ឈរ​ពី​ក្រោយ","deleteColumn":"លុប​ជួរ​ឈរ"},"columns":"ជួរឈរ","deleteTable":"លុប​តារាង","headers":"ក្បាល","headersBoth":"ទាំង​ពីរ","headersColumn":"ជួរ​ឈរ​ដំបូង","headersNone":"មិន​មាន","headersRow":"ជួរ​ដេក​ដំបូង","invalidBorder":"ទំហំ​បន្ទាត់​ស៊ុម​ត្រូវ​តែ​ជា​លេខ។","invalidCellPadding":"ចន្លោះ​ក្រឡា​ត្រូវ​តែជា​លេខ​វិជ្ជមាន។","invalidCellSpacing":"គម្លាត​ក្រឡា​ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន។","invalidCols":"ចំនួន​ជួរ​ឈរ​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidHeight":"កម្ពស់​តារាង​ត្រូវ​តែ​ជា​លេខ","invalidRows":"ចំនួន​ជួរ​ដេក​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidWidth":"ទទឹង​តារាង​ត្រូវ​តែ​ជា​លេខ។","menu":"លក្ខណៈ​តារាង","row":{"menu":"ជួរ​ដេក","insertBefore":"បញ្ចូល​ជួរ​ដេក​ពីមុខ","insertAfter":"បញ្ចូល​ជួរ​ដេក​ពី​ក្រោយ","deleteRow":"លុប​ជួរ​ដេក"},"rows":"ជួរ​ដេក","summary":"សេចក្តី​សង្ខេប","title":"លក្ខណៈ​តារាង","toolbar":"តារាង","widthPc":"ភាគរយ","widthPx":"ភីកសែល","widthUnit":"ឯកតា​ទទឹង"},"undo":{"redo":"ធ្វើ​ឡើង​វិញ","undo":"មិន​ធ្វើ​វិញ"},"wsc":{"btnIgnore":"មិនផ្លាស់ប្តូរ","btnIgnoreAll":"មិនផ្លាស់ប្តូរ ទាំងអស់","btnReplace":"ជំនួស","btnReplaceAll":"ជំនួសទាំងអស់","btnUndo":"សារឡើងវិញ","changeTo":"ផ្លាស់ប្តូរទៅ","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"ពុំមានកម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធ ។ តើចង់ទាញយកពីណា?","manyChanges":"ការពិនិត្យអក្ខរាវិរុទ្ធបានចប់: %1 ពាក្យបានផ្លាស់ប្តូរ","noChanges":"ការពិនិត្យអក្ខរាវិរុទ្ធបានចប់: ពុំមានផ្លាស់ប្តូរ","noMispell":"ការពិនិត្យអក្ខរាវិរុទ្ធបានចប់: គ្មានកំហុស","noSuggestions":"- គ្មានសំណើរ -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"គ្មានក្នុងវចនានុក្រម","oneChange":"ការពិនិត្យអក្ខរាវិរុទ្ធបានចប់: ពាក្យមួយត្រូចបានផ្លាស់ប្តូរ","progress":"កំពុងពិនិត្យអក្ខរាវិរុទ្ធ...","title":"Spell Checker","toolbar":"ពិនិត្យអក្ខរាវិរុទ្ធ"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/lang/ko.js
index b2e085a6b68..38ea48f338f 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/ko.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ko.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ko']={"editor":"리치 텍스트 편집기","editorPanel":"리치 텍스트 편집기 패널","common":{"editorHelp":"도움이 필요하면 ALT 0 을 누르세요","browseServer":"서버 보기","url":"URL","protocol":"프로토콜","upload":"업로드","uploadSubmit":"서버로 전송","image":"이미지","flash":"플래시","form":"폼","checkbox":"체크 박스","radio":"라디오 버튼","textField":"한 줄 입력 칸","textarea":"여러 줄 입력 칸","hiddenField":"숨은 입력 칸","button":"버튼","select":"선택 목록","imageButton":"이미지 버튼","notSet":"<설정 안 됨>","id":"ID","name":"이름","langDir":"언어 방향","langDirLtr":"왼쪽에서 오른쪽 (LTR)","langDirRtl":"오른쪽에서 왼쪽 (RTL)","langCode":"언어 코드","longDescr":"웹 주소 설명","cssClass":"스타일 시트 클래스","advisoryTitle":"보조 제목","cssStyle":"스타일","ok":"확인","cancel":"취소","close":"닫기","preview":"미리보기","resize":"크기 조절","generalTab":"일반","advancedTab":"자세히","validateNumberFailed":"이 값은 숫자가 아닙니다.","confirmNewPage":"저장하지 않은 모든 변경사항은 유실됩니다. 정말로 새로운 페이지를 부르겠습니까?","confirmCancel":"일부 옵션이 변경 되었습니다. 정말로 창을 닫겠습니까?","options":"옵션","target":"타겟","targetNew":"새 창 (_blank)","targetTop":"최상위 창 (_top)","targetSelf":"같은 창 (_self)","targetParent":"부모 창 (_parent)","langDirLTR":"왼쪽에서 오른쪽 (LTR)","langDirRTL":"오른쪽에서 왼쪽 (RTL)","styles":"스타일","cssClasses":"스타일 시트 클래스","width":"너비","height":"높이","align":"정렬","alignLeft":"왼쪽","alignRight":"오른쪽","alignCenter":"가운데","alignJustify":"양쪽 맞춤","alignTop":"위","alignMiddle":"중간","alignBottom":"아래","alignNone":"기본","invalidValue":"잘못된 값.","invalidHeight":"높이는 숫자여야 합니다.","invalidWidth":"넓이는 숫자여야 합니다.","invalidCssLength":"\"%1\" 값은 유효한 CSS 측정 단위(px, %, in, cm, mm, em, ex, pt, or pc)를 포함하거나 포함하지 않은 양수 여야 합니다.","invalidHtmlLength":"\"%1\" 값은 유효한 HTML 측정 단위(px or %)를 포함하거나 포함하지 않은 양수여야 합니다.","invalidInlineStyle":"인라인 스타일에 설정된 값은 \"name : value\" 형식을 가진 하나 이상의 투플(tuples)이 세미콜론(;)으로 구분되어 구성되어야 합니다.","cssLengthTooltip":"픽셀 단위의 숫자만 입력하시거나 유효한 CSS 단위(px, %, in, cm, mm, em, ex, pt, or pc)와 함께 숫자를 입력해주세요.","unavailable":"%1<span class=\"cke_accessibility\">, 사용불가</span>"},"about":{"copy":"저작권 &copy; $1 . 판권 소유.","dlgTitle":"CKEditor 에 대하여","help":"도움이 필요하시면 $1 를 확인하세요.","moreInfo":"라이선스에 대한 정보는 저희 웹 사이트를 참고하세요:","title":"CKEditor에 대하여","userGuide":"CKEditor 사용설명서"},"basicstyles":{"bold":"굵게","italic":"기울임꼴","strike":"취소선","subscript":"아래 첨자","superscript":"위 첨자","underline":"밑줄"},"bidi":{"ltr":"텍스트 방향이 왼쪽에서 오른쪽으로 ","rtl":"텍스트 방향이 오른쪽에서 왼쪽으로"},"blockquote":{"toolbar":"인용 단락"},"clipboard":{"copy":"복사","copyError":"브라우저의 보안설정 때문에 복사할 수 없습니다. 키보드(Ctrl/Cmd+C)를 이용해서 복사하십시오.","cut":"잘라내기","cutError":"브라우저의 보안설정 때문에 잘라내기 기능을 실행할 수 없습니다. 키보드(Ctrl/Cmd+X)를 이용해서 잘라내기 하십시오","paste":"붙여넣기","pasteArea":"붙여넣기 범위","pasteMsg":"키보드(<strong>Ctrl/Cmd+V</strong>)를 이용해서 상자안에 붙여넣고 <strong>확인</strong> 를 누르세요.","securityMsg":"브라우저 보안 설정으로 인해, 클립보드에 직접 접근할 수 없습니다. 이 창에 다시 붙여넣기 하십시오.","title":"붙여넣기"},"button":{"selectedLabel":"%1 (선택됨)"},"colorbutton":{"auto":"기본 색상","bgColorTitle":"배경 색상","colors":{"000":"검정","800000":"밤색","8B4513":"새들 브라운","2F4F4F":"다크 슬레이트 그레이","008080":"틸","000080":"네이비","4B0082":"남색","696969":"짙은 회색","B22222":"벽돌색","A52A2A":"갈색","DAA520":"골든 로드","006400":"암록색","40E0D0":"터코이즈","0000CD":"미디엄 블루","800080":"보라","808080":"회색","F00":"빨강","FF8C00":"짙은 주황","FFD700":"금색","008000":"녹색","0FF":"시안","00F":"파랑","EE82EE":"남보라","A9A9A9":"딤 그레이","FFA07A":"라이트 새먼","FFA500":"주황","FFFF00":"노랑","00FF00":"라임","AFEEEE":"패일 터코이즈","ADD8E6":"연한 파랑","DDA0DD":"자두","D3D3D3":"연한 회색","FFF0F5":"라벤더 블러쉬","FAEBD7":"앤틱 화이트","FFFFE0":"연한 노랑","F0FFF0":"허니듀","F0FFFF":"하늘색","F0F8FF":"앨리스 블루","E6E6FA":"라벤더","FFF":"흰색"},"more":"색상 선택...","panelTitle":"색상","textColorTitle":"글자 색상"},"colordialog":{"clear":"비우기","highlight":"강조","options":"색상 옵션","selected":"선택된 색상","title":"색상 선택"},"templates":{"button":"템플릿","emptyListMsg":"(템플릿이 없습니다)","insertOption":"현재 내용 바꾸기","options":"템플릿 옵션","selectPromptMsg":"에디터에서 사용할 템플릿을 선택하십시오","title":"내용 템플릿"},"contextmenu":{"options":"컨텍스트 메뉴 옵션"},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"보조 제목","cssClassInputLabel":"스타일 시트 클래스","edit":"Div 편집","inlineStyleInputLabel":"인라인 스타일","langDirLTRLabel":"왼쪽에서 오른쪽 (LTR)","langDirLabel":"언어 방향","langDirRTLLabel":"오른쪽에서 왼쪽 (RTL)","languageCodeInputLabel":" 언어 코드","remove":"Div 태그 삭제","styleSelectLabel":"스타일","title":"Div 태그 생성","toolbar":"Div 태그 생성"},"toolbar":{"toolbarCollapse":"툴바 줄이기","toolbarExpand":"툴바 확장","toolbarGroups":{"document":"문서","clipboard":"클립보드/실행 취소","editing":"편집","forms":"폼","basicstyles":"기본 스타일","paragraph":"단락","links":"링크","insert":"삽입","styles":"스타일","colors":"색상","tools":"도구"},"toolbars":"에디터 툴바"},"elementspath":{"eleLabel":"요소 경로","eleTitle":"%1 요소"},"find":{"find":"찾기","findOptions":"찾기 조건","findWhat":"찾을 내용:","matchCase":"대소문자 구분","matchCyclic":"되돌이 검색","matchWord":"온전한 단어","notFoundMsg":"문자열을 찾을 수 없습니다.","replace":"바꾸기","replaceAll":"모두 바꾸기","replaceSuccessMsg":"%1개의 항목이 바뀌었습니다.","replaceWith":"바꿀 내용:","title":"찾기 및 바꾸기"},"fakeobjects":{"anchor":"책갈피","flash":"플래시 애니메이션","hiddenfield":"숨은 입력 칸","iframe":"아이프레임","unknown":"알 수 없는 객체"},"flash":{"access":"스크립트 허용","accessAlways":"항상 허용","accessNever":"허용 안함","accessSameDomain":"같은 도메인 허용","alignAbsBottom":"아래","alignAbsMiddle":"중간","alignBaseline":"영문 글꼴 기준선","alignTextTop":"글자 상단","bgcolor":"배경 색상","chkFull":"전체화면 허용","chkLoop":"반복","chkMenu":"플래시 메뉴 활성화","chkPlay":"자동 재생","flashvars":"플래시 변수","hSpace":"가로 여백","properties":"플래시 속성","propertiesTab":"속성","quality":"품질","qualityAutoHigh":"자동 높음","qualityAutoLow":"자동 낮음","qualityBest":"최고","qualityHigh":"높음","qualityLow":"낮음","qualityMedium":"중간","scale":"배율","scaleAll":"모두 보기","scaleFit":"맞춤","scaleNoBorder":"테두리 없음","title":"플래시 속성","vSpace":"세로 여백","validateHSpace":"가로 여백은 숫자여야 합니다.","validateSrc":"링크 주소(URL)를 입력하십시오.","validateVSpace":"세로 여백은 숫자여야 합니다.","windowMode":"윈도우 모드","windowModeOpaque":"불투명","windowModeTransparent":"투명","windowModeWindow":"윈도우"},"font":{"fontSize":{"label":"크기","voiceLabel":"글자 크기","panelTitle":"글자 크기"},"label":"글꼴","panelTitle":"글꼴","voiceLabel":"글꼴"},"forms":{"button":{"title":"버튼 속성","text":"글자 (값)","type":"종류","typeBtn":"버튼","typeSbm":"제출","typeRst":"재설정"},"checkboxAndRadio":{"checkboxTitle":"체크 박스 속성","radioTitle":"라디오 버튼 속성","value":"값","selected":"선택됨","required":"필수 항목"},"form":{"title":"폼 속성","menu":"폼 속성","action":"실행 경로(Action)","method":"방법(Method)","encoding":"인코딩"},"hidden":{"title":"숨은 입력 칸 속성","name":"이름","value":"값"},"select":{"title":"선택 목록 속성","selectInfo":"선택 정보","opAvail":"옵션","value":"값","size":"크기","lines":"줄","chkMulti":"여러 항목 선택 허용","required":"필수 항목","opText":"이름","opValue":"값","btnAdd":"추가","btnModify":"수정","btnUp":"위","btnDown":"아래","btnSetValue":"선택된 것으로 설정","btnDelete":"삭제"},"textarea":{"title":"여러 줄 입력 칸 속성","cols":"칸 수","rows":"줄 수"},"textfield":{"title":"한 줄 입력 칸 속성","name":"이름","value":"값","charWidth":"글자 너비","maxChars":"최대 글자 수","required":"필수 항목","type":"형식","typeText":"문자열","typePass":"비밀번호","typeEmail":"이메일","typeSearch":"검색","typeTel":"전화번호","typeUrl":"웹 주소(URL)"}},"format":{"label":"문단","panelTitle":"문단 형식","tag_address":"글쓴이","tag_div":"기본 (DIV)","tag_h1":"제목 1","tag_h2":"제목 2","tag_h3":"제목 3","tag_h4":"제목 4","tag_h5":"제목 5","tag_h6":"제목 6","tag_p":"본문","tag_pre":"정형 문단"},"horizontalrule":{"toolbar":"가로 줄 삽입"},"iframe":{"border":"프레임 테두리 표시","noUrl":"아이프레임 주소(URL)를 입력해주세요.","scrolling":"스크롤바 사용","title":"아이프레임 속성","toolbar":"아이프레임"},"image":{"alt":"대체 문자열","border":"테두리","btnUpload":"서버로 전송","button2Img":"단순 이미지에서 선택한 이미지 버튼을 변환하시겠습니까?","hSpace":"가로 여백","img2Button":"이미지 버튼에 선택한 이미지를 변환하시겠습니까?","infoTab":"이미지 정보","linkTab":"링크","lockRatio":"비율 유지","menu":"이미지 속성","resetSize":"원래 크기로","title":"이미지 속성","titleButton":"이미지 버튼 속성","upload":"업로드","urlMissing":"이미지 원본 주소(URL)가 없습니다.","vSpace":"세로 여백","validateBorder":"테두리 두께는 정수여야 합니다.","validateHSpace":"가로 길이는 정수여야 합니다.","validateVSpace":"세로 길이는 정수여야 합니다."},"indent":{"indent":"들여쓰기","outdent":"내어쓰기"},"smiley":{"options":"이모티콘 옵션","title":"이모티콘 삽입","toolbar":"이모티콘"},"justify":{"block":"양쪽 맞춤","center":"가운데 정렬","left":"왼쪽 정렬","right":"오른쪽 정렬"},"language":{"button":"언어 설정","remove":"언어 설정 지우기"},"link":{"acccessKey":"액세스 키","advanced":"고급","advisoryContentType":"보조 콘텐츠 유형","advisoryTitle":"보조 제목","anchor":{"toolbar":"책갈피","menu":"책갈피 편집","title":"책갈피 속성","name":"책갈피 이름","errorName":"책갈피 이름을 입력하십시오","remove":"책갈피 제거"},"anchorId":"책갈피 ID","anchorName":"책갈피 이름","charset":"링크된 자료 문자열 인코딩","cssClasses":"스타일시트 클래스","emailAddress":"이메일 주소","emailBody":"메시지 내용","emailSubject":"메시지 제목","id":"ID","info":"링크 정보","langCode":"언어 코드","langDir":"언어 방향","langDirLTR":"왼쪽에서 오른쪽 (LTR)","langDirRTL":"오른쪽에서 왼쪽 (RTL)","menu":"링크 수정","name":"이름","noAnchors":"(문서에 책갈피가 없습니다.)","noEmail":"이메일 주소를 입력하십시오","noUrl":"링크 주소(URL)를 입력하십시오","other":"<기타>","popupDependent":"Dependent (Netscape)","popupFeatures":"팝업창 속성","popupFullScreen":"전체화면 (IE)","popupLeft":"왼쪽 위치","popupLocationBar":"주소 표시줄","popupMenuBar":"메뉴 바","popupResizable":"크기 조절 가능","popupScrollBars":"스크롤 바","popupStatusBar":"상태 바","popupToolbar":"툴바","popupTop":"위쪽 위치","rel":"관계","selectAnchor":"책갈피 선택","styles":"스타일","tabIndex":"탭 순서","target":"타겟","targetFrame":"<프레임>","targetFrameName":"타겟 프레임 이름","targetPopup":"<팝업 창>","targetPopupName":"팝업 창 이름","title":"링크","toAnchor":"책갈피","toEmail":"이메일","toUrl":"주소(URL)","toolbar":"링크 삽입/변경","type":"링크 종류","unlink":"링크 지우기","upload":"업로드"},"list":{"bulletedlist":"순서 없는 목록","numberedlist":"순서 있는 목록"},"liststyle":{"armenian":"아르메니아 숫자","bulletedTitle":"순서 없는 목록 속성","circle":"원","decimal":"수 (1, 2, 3, 등)","decimalLeadingZero":"0이 붙은 수 (01, 02, 03, 등)","disc":"내림차순","georgian":"그루지야 숫자 (an, ban, gan, 등)","lowerAlpha":"영소문자 (a, b, c, d, e, 등)","lowerGreek":"그리스 소문자 (alpha, beta, gamma, 등)","lowerRoman":"로마 소문자 (i, ii, iii, iv, v, 등)","none":"없음","notset":"<설정 없음>","numberedTitle":"순서 있는 목록 속성","square":"사각","start":"시작","type":"유형","upperAlpha":"영대문자 (A, B, C, D, E, 등)","upperRoman":"로마 대문자 (I, II, III, IV, V, 등)","validateStartNumber":"목록 시작 숫자는 정수여야 합니다."},"magicline":{"title":"여기에 단락 삽입"},"maximize":{"maximize":"최대화","minimize":"최소화"},"newpage":{"toolbar":"새 페이지"},"pagebreak":{"alt":"페이지 나누기","toolbar":"인쇄시 페이지 나누기 삽입"},"pastetext":{"button":"텍스트로 붙여넣기","title":"텍스트로 붙여넣기"},"pastefromword":{"confirmCleanup":"붙여 넣을 내용은 MS Word에서 복사 한 것입니다. 붙여 넣기 전에 정리 하시겠습니까?","error":"내부 오류로 붙여 넣은 데이터를 정리 할 수 없습니다.","title":"MS Word 에서 붙여넣기","toolbar":"MS Word 에서 붙여넣기"},"preview":{"preview":"미리보기"},"print":{"toolbar":"인쇄"},"removeformat":{"toolbar":"형식 지우기"},"save":{"toolbar":"저장"},"selectall":{"toolbar":"모두 선택"},"showblocks":{"toolbar":"블록 보기"},"sourcearea":{"toolbar":"소스"},"specialchar":{"options":"특수문자 옵션","title":"특수문자 선택","toolbar":"특수문자 삽입"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"스타일","panelTitle":"전체 구성 스타일","panelTitle1":"블록 스타일","panelTitle2":"인라인 스타일","panelTitle3":"객체 스타일"},"table":{"border":"테두리 두께","caption":"주석","cell":{"menu":"셀","insertBefore":"앞에 셀 삽입","insertAfter":"뒤에 셀 삽입","deleteCell":"셀 삭제","merge":"셀 합치기","mergeRight":"오른쪽 합치기","mergeDown":"왼쪽 합치기","splitHorizontal":"수평 나누기","splitVertical":"수직 나누기","title":"셀 속성","cellType":"셀 종류","rowSpan":"행 간격","colSpan":"열 간격","wordWrap":"줄 끝 단어 줄 바꿈","hAlign":"가로 정렬","vAlign":"세로 정렬","alignBaseline":"영문 글꼴 기준선","bgColor":"배경색","borderColor":"테두리 색","data":"자료","header":"머릿칸","yes":"예","no":"아니오","invalidWidth":"셀 너비는 숫자여야 합니다.","invalidHeight":"셀 높이는 숫자여야 합니다.","invalidRowSpan":"행 간격은 정수여야 합니다.","invalidColSpan":"열 간격은 정수여야 합니다.","chooseColor":"선택"},"cellPad":"셀 여백","cellSpace":"셀 간격","column":{"menu":"열","insertBefore":"왼쪽에 열 삽입","insertAfter":"오른쪽에 열 삽입","deleteColumn":"열 삭제"},"columns":"열","deleteTable":"표 삭제","headers":"머릿칸","headersBoth":"모두","headersColumn":"첫 열","headersNone":"없음","headersRow":"첫 행","invalidBorder":"테두리 두께는 숫자여야 합니다.","invalidCellPadding":"셀 여백은 0 이상이어야 합니다.","invalidCellSpacing":"셀 간격은 0 이상이어야 합니다.","invalidCols":"열 번호는 0보다 커야 합니다.","invalidHeight":"표 높이는 숫자여야 합니다.","invalidRows":"행 번호는 0보다 커야 합니다.","invalidWidth":"표의 너비는 숫자여야 합니다.","menu":"표 속성","row":{"menu":"행","insertBefore":"위에 행 삽입","insertAfter":"아래에 행 삽입","deleteRow":"행 삭제"},"rows":"행","summary":"요약","title":"표 속성","toolbar":"표","widthPc":"백분율","widthPx":"픽셀","widthUnit":"너비 단위"},"undo":{"redo":"다시 실행","undo":"실행 취소"},"wsc":{"btnIgnore":"건너뜀","btnIgnoreAll":"모두 건너뜀","btnReplace":"변경","btnReplaceAll":"모두 변경","btnUndo":"취소","changeTo":"변경할 단어","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"철자 검사기가 철치되지 않았습니다. 지금 다운로드하시겠습니까?","manyChanges":"철자검사 완료: %1 단어가 변경되었습니다.","noChanges":"철자검사 완료: 변경된 단어가 없습니다.","noMispell":"철자검사 완료: 잘못된 철자가 없습니다.","noSuggestions":"- 추천단어 없음 -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"사전에 없는 단어","oneChange":"철자검사 완료: 단어가 변경되었습니다.","progress":"철자검사를 진행중입니다...","title":"Spell Check","toolbar":"철자검사"}};
\ No newline at end of file
+CKEDITOR.lang['ko']={"editor":"리치 텍스트 편집기","editorPanel":"리치 텍스트 편집기 패널","common":{"editorHelp":"도움이 필요하면 ALT 0 을 누르세요","browseServer":"서버 보기","url":"URL","protocol":"프로토콜","upload":"업로드","uploadSubmit":"서버로 전송","image":"이미지","flash":"플래시","form":"폼","checkbox":"체크 박스","radio":"라디오 버튼","textField":"한 줄 입력 칸","textarea":"여러 줄 입력 칸","hiddenField":"숨은 입력 칸","button":"버튼","select":"선택 목록","imageButton":"이미지 버튼","notSet":"<설정 안 됨>","id":"ID","name":"이름","langDir":"언어 방향","langDirLtr":"왼쪽에서 오른쪽 (LTR)","langDirRtl":"오른쪽에서 왼쪽 (RTL)","langCode":"언어 코드","longDescr":"웹 주소 설명","cssClass":"스타일 시트 클래스","advisoryTitle":"보조 제목","cssStyle":"스타일","ok":"확인","cancel":"취소","close":"닫기","preview":"미리보기","resize":"크기 조절","generalTab":"일반","advancedTab":"자세히","validateNumberFailed":"이 값은 숫자가 아닙니다.","confirmNewPage":"저장하지 않은 모든 변경사항은 유실됩니다. 정말로 새로운 페이지를 부르겠습니까?","confirmCancel":"일부 옵션이 변경 되었습니다. 정말로 창을 닫겠습니까?","options":"옵션","target":"타겟","targetNew":"새 창 (_blank)","targetTop":"최상위 창 (_top)","targetSelf":"같은 창 (_self)","targetParent":"부모 창 (_parent)","langDirLTR":"왼쪽에서 오른쪽 (LTR)","langDirRTL":"오른쪽에서 왼쪽 (RTL)","styles":"스타일","cssClasses":"스타일 시트 클래스","width":"너비","height":"높이","align":"정렬","alignLeft":"왼쪽","alignRight":"오른쪽","alignCenter":"가운데","alignJustify":"양쪽 맞춤","alignTop":"위","alignMiddle":"중간","alignBottom":"아래","alignNone":"기본","invalidValue":"잘못된 값.","invalidHeight":"높이는 숫자여야 합니다.","invalidWidth":"넓이는 숫자여야 합니다.","invalidCssLength":"\"%1\" 값은 유효한 CSS 측정 단위(px, %, in, cm, mm, em, ex, pt, or pc)를 포함하거나 포함하지 않은 양수 여야 합니다.","invalidHtmlLength":"\"%1\" 값은 유효한 HTML 측정 단위(px or %)를 포함하거나 포함하지 않은 양수여야 합니다.","invalidInlineStyle":"인라인 스타일에 설정된 값은 \"name : value\" 형식을 가진 하나 이상의 투플(tuples)이 세미콜론(;)으로 구분되어 구성되어야 합니다.","cssLengthTooltip":"픽셀 단위의 숫자만 입력하시거나 유효한 CSS 단위(px, %, in, cm, mm, em, ex, pt, or pc)와 함께 숫자를 입력해주세요.","unavailable":"%1<span class=\"cke_accessibility\">, 사용불가</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"저작권 &copy; $1 . 판권 소유.","dlgTitle":"CKEditor 에 대하여","help":"도움이 필요하시면 $1 를 확인하세요.","moreInfo":"라이선스에 대한 정보는 저희 웹 사이트를 참고하세요:","title":"CKEditor에 대하여","userGuide":"CKEditor 사용설명서"},"basicstyles":{"bold":"굵게","italic":"기울임꼴","strike":"취소선","subscript":"아래 첨자","superscript":"위 첨자","underline":"밑줄"},"bidi":{"ltr":"텍스트 방향이 왼쪽에서 오른쪽으로 ","rtl":"텍스트 방향이 오른쪽에서 왼쪽으로"},"blockquote":{"toolbar":"인용 단락"},"clipboard":{"copy":"복사","copyError":"브라우저의 보안설정 때문에 복사할 수 없습니다. 키보드(Ctrl/Cmd+C)를 이용해서 복사하십시오.","cut":"잘라내기","cutError":"브라우저의 보안설정 때문에 잘라내기 기능을 실행할 수 없습니다. 키보드(Ctrl/Cmd+X)를 이용해서 잘라내기 하십시오","paste":"붙여넣기","pasteArea":"붙여넣기 범위","pasteMsg":"키보드(<strong>Ctrl/Cmd+V</strong>)를 이용해서 상자안에 붙여넣고 <strong>확인</strong> 를 누르세요.","securityMsg":"브라우저 보안 설정으로 인해, 클립보드에 직접 접근할 수 없습니다. 이 창에 다시 붙여넣기 하십시오.","title":"붙여넣기"},"button":{"selectedLabel":"%1 (선택됨)"},"colorbutton":{"auto":"기본 색상","bgColorTitle":"배경 색상","colors":{"000":"검정","800000":"밤색","8B4513":"새들 브라운","2F4F4F":"다크 슬레이트 그레이","008080":"틸","000080":"네이비","4B0082":"남색","696969":"짙은 회색","B22222":"벽돌색","A52A2A":"갈색","DAA520":"골든 로드","006400":"암록색","40E0D0":"터코이즈","0000CD":"미디엄 블루","800080":"보라","808080":"회색","F00":"빨강","FF8C00":"짙은 주황","FFD700":"금색","008000":"녹색","0FF":"시안","00F":"파랑","EE82EE":"남보라","A9A9A9":"딤 그레이","FFA07A":"라이트 새먼","FFA500":"주황","FFFF00":"노랑","00FF00":"라임","AFEEEE":"패일 터코이즈","ADD8E6":"연한 파랑","DDA0DD":"자두","D3D3D3":"연한 회색","FFF0F5":"라벤더 블러쉬","FAEBD7":"앤틱 화이트","FFFFE0":"연한 노랑","F0FFF0":"허니듀","F0FFFF":"하늘색","F0F8FF":"앨리스 블루","E6E6FA":"라벤더","FFF":"흰색","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"색상 선택...","panelTitle":"색상","textColorTitle":"글자 색상"},"colordialog":{"clear":"비우기","highlight":"강조","options":"색상 옵션","selected":"선택된 색상","title":"색상 선택"},"templates":{"button":"템플릿","emptyListMsg":"(템플릿이 없습니다)","insertOption":"현재 내용 바꾸기","options":"템플릿 옵션","selectPromptMsg":"에디터에서 사용할 템플릿을 선택하십시오","title":"내용 템플릿"},"contextmenu":{"options":"컨텍스트 메뉴 옵션"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"보조 제목","cssClassInputLabel":"스타일 시트 클래스","edit":"Div 편집","inlineStyleInputLabel":"인라인 스타일","langDirLTRLabel":"왼쪽에서 오른쪽 (LTR)","langDirLabel":"언어 방향","langDirRTLLabel":"오른쪽에서 왼쪽 (RTL)","languageCodeInputLabel":" 언어 코드","remove":"Div 태그 삭제","styleSelectLabel":"스타일","title":"Div 태그 생성","toolbar":"Div 태그 생성"},"toolbar":{"toolbarCollapse":"툴바 줄이기","toolbarExpand":"툴바 확장","toolbarGroups":{"document":"문서","clipboard":"클립보드/실행 취소","editing":"편집","forms":"폼","basicstyles":"기본 스타일","paragraph":"단락","links":"링크","insert":"삽입","styles":"스타일","colors":"색상","tools":"도구"},"toolbars":"에디터 툴바"},"elementspath":{"eleLabel":"요소 경로","eleTitle":"%1 요소"},"find":{"find":"찾기","findOptions":"찾기 조건","findWhat":"찾을 내용:","matchCase":"대소문자 구분","matchCyclic":"되돌이 검색","matchWord":"온전한 단어","notFoundMsg":"문자열을 찾을 수 없습니다.","replace":"바꾸기","replaceAll":"모두 바꾸기","replaceSuccessMsg":"%1개의 항목이 바뀌었습니다.","replaceWith":"바꿀 내용:","title":"찾기 및 바꾸기"},"fakeobjects":{"anchor":"책갈피","flash":"플래시 애니메이션","hiddenfield":"숨은 입력 칸","iframe":"아이프레임","unknown":"알 수 없는 객체"},"flash":{"access":"스크립트 허용","accessAlways":"항상 허용","accessNever":"허용 안함","accessSameDomain":"같은 도메인 허용","alignAbsBottom":"아래","alignAbsMiddle":"중간","alignBaseline":"영문 글꼴 기준선","alignTextTop":"글자 상단","bgcolor":"배경 색상","chkFull":"전체화면 허용","chkLoop":"반복","chkMenu":"플래시 메뉴 활성화","chkPlay":"자동 재생","flashvars":"플래시 변수","hSpace":"가로 여백","properties":"플래시 속성","propertiesTab":"속성","quality":"품질","qualityAutoHigh":"자동 높음","qualityAutoLow":"자동 낮음","qualityBest":"최고","qualityHigh":"높음","qualityLow":"낮음","qualityMedium":"중간","scale":"배율","scaleAll":"모두 보기","scaleFit":"맞춤","scaleNoBorder":"테두리 없음","title":"플래시 속성","vSpace":"세로 여백","validateHSpace":"가로 여백은 숫자여야 합니다.","validateSrc":"링크 주소(URL)를 입력하십시오.","validateVSpace":"세로 여백은 숫자여야 합니다.","windowMode":"윈도우 모드","windowModeOpaque":"불투명","windowModeTransparent":"투명","windowModeWindow":"윈도우"},"font":{"fontSize":{"label":"크기","voiceLabel":"글자 크기","panelTitle":"글자 크기"},"label":"글꼴","panelTitle":"글꼴","voiceLabel":"글꼴"},"forms":{"button":{"title":"버튼 속성","text":"글자 (값)","type":"종류","typeBtn":"버튼","typeSbm":"제출","typeRst":"재설정"},"checkboxAndRadio":{"checkboxTitle":"체크 박스 속성","radioTitle":"라디오 버튼 속성","value":"값","selected":"선택됨","required":"필수 항목"},"form":{"title":"폼 속성","menu":"폼 속성","action":"실행 경로(Action)","method":"방법(Method)","encoding":"인코딩"},"hidden":{"title":"숨은 입력 칸 속성","name":"이름","value":"값"},"select":{"title":"선택 목록 속성","selectInfo":"선택 정보","opAvail":"옵션","value":"값","size":"크기","lines":"줄","chkMulti":"여러 항목 선택 허용","required":"필수 항목","opText":"이름","opValue":"값","btnAdd":"추가","btnModify":"수정","btnUp":"위","btnDown":"아래","btnSetValue":"선택된 것으로 설정","btnDelete":"삭제"},"textarea":{"title":"여러 줄 입력 칸 속성","cols":"칸 수","rows":"줄 수"},"textfield":{"title":"한 줄 입력 칸 속성","name":"이름","value":"값","charWidth":"글자 너비","maxChars":"최대 글자 수","required":"필수 항목","type":"형식","typeText":"문자열","typePass":"비밀번호","typeEmail":"이메일","typeSearch":"검색","typeTel":"전화번호","typeUrl":"웹 주소(URL)"}},"format":{"label":"문단","panelTitle":"문단 형식","tag_address":"글쓴이","tag_div":"기본 (DIV)","tag_h1":"제목 1","tag_h2":"제목 2","tag_h3":"제목 3","tag_h4":"제목 4","tag_h5":"제목 5","tag_h6":"제목 6","tag_p":"본문","tag_pre":"정형 문단"},"horizontalrule":{"toolbar":"가로 줄 삽입"},"iframe":{"border":"프레임 테두리 표시","noUrl":"아이프레임 주소(URL)를 입력해주세요.","scrolling":"스크롤바 사용","title":"아이프레임 속성","toolbar":"아이프레임"},"image":{"alt":"대체 문자열","border":"테두리","btnUpload":"서버로 전송","button2Img":"단순 이미지에서 선택한 이미지 버튼을 변환하시겠습니까?","hSpace":"가로 여백","img2Button":"이미지 버튼에 선택한 이미지를 변환하시겠습니까?","infoTab":"이미지 정보","linkTab":"링크","lockRatio":"비율 유지","menu":"이미지 속성","resetSize":"원래 크기로","title":"이미지 속성","titleButton":"이미지 버튼 속성","upload":"업로드","urlMissing":"이미지 원본 주소(URL)가 없습니다.","vSpace":"세로 여백","validateBorder":"테두리 두께는 정수여야 합니다.","validateHSpace":"가로 길이는 정수여야 합니다.","validateVSpace":"세로 길이는 정수여야 합니다."},"indent":{"indent":"들여쓰기","outdent":"내어쓰기"},"smiley":{"options":"이모티콘 옵션","title":"이모티콘 삽입","toolbar":"이모티콘"},"justify":{"block":"양쪽 맞춤","center":"가운데 정렬","left":"왼쪽 정렬","right":"오른쪽 정렬"},"language":{"button":"언어 설정","remove":"언어 설정 지우기"},"link":{"acccessKey":"액세스 키","advanced":"고급","advisoryContentType":"보조 콘텐츠 유형","advisoryTitle":"보조 제목","anchor":{"toolbar":"책갈피","menu":"책갈피 편집","title":"책갈피 속성","name":"책갈피 이름","errorName":"책갈피 이름을 입력하십시오","remove":"책갈피 제거"},"anchorId":"책갈피 ID","anchorName":"책갈피 이름","charset":"링크된 자료 문자열 인코딩","cssClasses":"스타일시트 클래스","download":"Force Download","displayText":"Display Text","emailAddress":"이메일 주소","emailBody":"메시지 내용","emailSubject":"메시지 제목","id":"ID","info":"링크 정보","langCode":"언어 코드","langDir":"언어 방향","langDirLTR":"왼쪽에서 오른쪽 (LTR)","langDirRTL":"오른쪽에서 왼쪽 (RTL)","menu":"링크 수정","name":"이름","noAnchors":"(문서에 책갈피가 없습니다.)","noEmail":"이메일 주소를 입력하십시오","noUrl":"링크 주소(URL)를 입력하십시오","other":"<기타>","popupDependent":"Dependent (Netscape)","popupFeatures":"팝업창 속성","popupFullScreen":"전체화면 (IE)","popupLeft":"왼쪽 위치","popupLocationBar":"주소 표시줄","popupMenuBar":"메뉴 바","popupResizable":"크기 조절 가능","popupScrollBars":"스크롤 바","popupStatusBar":"상태 바","popupToolbar":"툴바","popupTop":"위쪽 위치","rel":"관계","selectAnchor":"책갈피 선택","styles":"스타일","tabIndex":"탭 순서","target":"타겟","targetFrame":"<프레임>","targetFrameName":"타겟 프레임 이름","targetPopup":"<팝업 창>","targetPopupName":"팝업 창 이름","title":"링크","toAnchor":"책갈피","toEmail":"이메일","toUrl":"주소(URL)","toolbar":"링크 삽입/변경","type":"링크 종류","unlink":"링크 지우기","upload":"업로드"},"list":{"bulletedlist":"순서 없는 목록","numberedlist":"순서 있는 목록"},"liststyle":{"armenian":"아르메니아 숫자","bulletedTitle":"순서 없는 목록 속성","circle":"원","decimal":"수 (1, 2, 3, 등)","decimalLeadingZero":"0이 붙은 수 (01, 02, 03, 등)","disc":"내림차순","georgian":"그루지야 숫자 (an, ban, gan, 등)","lowerAlpha":"영소문자 (a, b, c, d, e, 등)","lowerGreek":"그리스 소문자 (alpha, beta, gamma, 등)","lowerRoman":"로마 소문자 (i, ii, iii, iv, v, 등)","none":"없음","notset":"<설정 없음>","numberedTitle":"순서 있는 목록 속성","square":"사각","start":"시작","type":"유형","upperAlpha":"영대문자 (A, B, C, D, E, 등)","upperRoman":"로마 대문자 (I, II, III, IV, V, 등)","validateStartNumber":"목록 시작 숫자는 정수여야 합니다."},"magicline":{"title":"여기에 단락 삽입"},"maximize":{"maximize":"최대화","minimize":"최소화"},"newpage":{"toolbar":"새 페이지"},"pagebreak":{"alt":"페이지 나누기","toolbar":"인쇄시 페이지 나누기 삽입"},"pastetext":{"button":"텍스트로 붙여넣기","title":"텍스트로 붙여넣기"},"pastefromword":{"confirmCleanup":"붙여 넣을 내용은 MS Word에서 복사 한 것입니다. 붙여 넣기 전에 정리 하시겠습니까?","error":"내부 오류로 붙여 넣은 데이터를 정리 할 수 없습니다.","title":"MS Word 에서 붙여넣기","toolbar":"MS Word 에서 붙여넣기"},"preview":{"preview":"미리보기"},"print":{"toolbar":"인쇄"},"removeformat":{"toolbar":"형식 지우기"},"save":{"toolbar":"저장"},"selectall":{"toolbar":"모두 선택"},"showblocks":{"toolbar":"블록 보기"},"sourcearea":{"toolbar":"소스"},"specialchar":{"options":"특수문자 옵션","title":"특수문자 선택","toolbar":"특수문자 삽입"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"스타일","panelTitle":"전체 구성 스타일","panelTitle1":"블록 스타일","panelTitle2":"인라인 스타일","panelTitle3":"객체 스타일"},"table":{"border":"테두리 두께","caption":"주석","cell":{"menu":"셀","insertBefore":"앞에 셀 삽입","insertAfter":"뒤에 셀 삽입","deleteCell":"셀 삭제","merge":"셀 합치기","mergeRight":"오른쪽 합치기","mergeDown":"왼쪽 합치기","splitHorizontal":"수평 나누기","splitVertical":"수직 나누기","title":"셀 속성","cellType":"셀 종류","rowSpan":"행 간격","colSpan":"열 간격","wordWrap":"줄 끝 단어 줄 바꿈","hAlign":"가로 정렬","vAlign":"세로 정렬","alignBaseline":"영문 글꼴 기준선","bgColor":"배경색","borderColor":"테두리 색","data":"자료","header":"머릿칸","yes":"예","no":"아니오","invalidWidth":"셀 너비는 숫자여야 합니다.","invalidHeight":"셀 높이는 숫자여야 합니다.","invalidRowSpan":"행 간격은 정수여야 합니다.","invalidColSpan":"열 간격은 정수여야 합니다.","chooseColor":"선택"},"cellPad":"셀 여백","cellSpace":"셀 간격","column":{"menu":"열","insertBefore":"왼쪽에 열 삽입","insertAfter":"오른쪽에 열 삽입","deleteColumn":"열 삭제"},"columns":"열","deleteTable":"표 삭제","headers":"머릿칸","headersBoth":"모두","headersColumn":"첫 열","headersNone":"없음","headersRow":"첫 행","invalidBorder":"테두리 두께는 숫자여야 합니다.","invalidCellPadding":"셀 여백은 0 이상이어야 합니다.","invalidCellSpacing":"셀 간격은 0 이상이어야 합니다.","invalidCols":"열 번호는 0보다 커야 합니다.","invalidHeight":"표 높이는 숫자여야 합니다.","invalidRows":"행 번호는 0보다 커야 합니다.","invalidWidth":"표의 너비는 숫자여야 합니다.","menu":"표 속성","row":{"menu":"행","insertBefore":"위에 행 삽입","insertAfter":"아래에 행 삽입","deleteRow":"행 삭제"},"rows":"행","summary":"요약","title":"표 속성","toolbar":"표","widthPc":"백분율","widthPx":"픽셀","widthUnit":"너비 단위"},"undo":{"redo":"다시 실행","undo":"실행 취소"},"wsc":{"btnIgnore":"건너뜀","btnIgnoreAll":"모두 건너뜀","btnReplace":"변경","btnReplaceAll":"모두 변경","btnUndo":"취소","changeTo":"변경할 단어","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"철자 검사기가 철치되지 않았습니다. 지금 다운로드하시겠습니까?","manyChanges":"철자검사 완료: %1 단어가 변경되었습니다.","noChanges":"철자검사 완료: 변경된 단어가 없습니다.","noMispell":"철자검사 완료: 잘못된 철자가 없습니다.","noSuggestions":"- 추천단어 없음 -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"사전에 없는 단어","oneChange":"철자검사 완료: 단어가 변경되었습니다.","progress":"철자검사를 진행중입니다...","title":"Spell Check","toolbar":"철자검사"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/lang/ku.js
index 38ccdf51297..ded7708bc1d 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/ku.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ku.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ku']={"editor":"سەرنووسەی دەقی تەواو","editorPanel":"بڕگەی سەرنووسەی دەقی تەواو","common":{"editorHelp":"کلیکی ALT لەگەڵ 0 بکه‌ بۆ یارمەتی","browseServer":"هێنانی ڕاژە","url":"ناونیشانی بەستەر","protocol":"پڕۆتۆکۆڵ","upload":"بارکردن","uploadSubmit":"ناردنی بۆ ڕاژە","image":"وێنە","flash":"فلاش","form":"داڕشتە","checkbox":"خانەی نیشانکردن","radio":"جێگرەوەی دوگمە","textField":"خانەی دەق","textarea":"ڕووبەری دەق","hiddenField":"شاردنەوی خانە","button":"دوگمە","select":"هەڵبژاردەی خانە","imageButton":"دوگمەی وێنە","notSet":"<هیچ دانەدراوە>","id":"ناسنامە","name":"ناو","langDir":"ئاراستەی زمان","langDirLtr":"چەپ بۆ ڕاست (LTR)","langDirRtl":"ڕاست بۆ چەپ (RTL)","langCode":"هێمای زمان","longDescr":"پێناسەی درێژی بەستەر","cssClass":"شێوازی چینی په‌ڕە","advisoryTitle":"ڕاوێژکاری سەردێڕ","cssStyle":"شێواز","ok":"باشە","cancel":"پاشگەزبوونەوە","close":"داخستن","preview":"پێشبینین","resize":"گۆڕینی ئەندازە","generalTab":"گشتی","advancedTab":"پەرەسەندوو","validateNumberFailed":"ئەم نرخە ژمارە نیە، تکایە نرخێکی ژمارە بنووسە.","confirmNewPage":"سەرجەم گۆڕانکاریەکان و پێکهاتەکانی ناووەوە لەدەست دەدەی گەر بێتوو پاشکەوتی نەکەی یەکەم جار، تۆ هەر دڵنیایی لەکردنەوەی پەنجەرەکی نوێ؟","confirmCancel":"هەندێك هەڵبژاردە گۆڕدراوە. تۆ دڵنیایی لە داخستنی ئەم دیالۆگە؟","options":"هەڵبژاردەکان","target":"ئامانج","targetNew":"پەنجەرەیەکی نوێ (_blank)","targetTop":"لووتکەی پەنجەرە (_top)","targetSelf":"لەهەمان پەنجەرە (_self)","targetParent":"پەنجەرەی باوان (_parent)","langDirLTR":"چەپ بۆ ڕاست (LTR)","langDirRTL":"ڕاست بۆ چەپ (RTL)","styles":"شێواز","cssClasses":"شێوازی چینی پەڕە","width":"پانی","height":"درێژی","align":"ڕێککەرەوە","alignLeft":"چەپ","alignRight":"ڕاست","alignCenter":"ناوەڕاست","alignJustify":"هاوستوونی","alignTop":"سەرەوە","alignMiddle":"ناوەند","alignBottom":"ژێرەوە","alignNone":"هیچ","invalidValue":"نرخێکی نادرووست.","invalidHeight":"درێژی دەبێت ژمارە بێت.","invalidWidth":"پانی دەبێت ژمارە بێت.","invalidCssLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی (px, %, in, cm, mm, em, ex, pt, یان pc).","invalidHtmlLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی HTML (px یان %).","invalidInlineStyle":"دانەی نرخی شێوازی ناوهێڵ دەبێت پێکهاتبێت لەیەك یان زیاتری داڕشتە \"ناو : نرخ\", جیاکردنەوەی بە فاریزە و خاڵ","cssLengthTooltip":"ژمارەیەك بنووسه‌ بۆ نرخی piksel یان ئامرازێکی درووستی CSS (px, %, in, cm, mm, em, ex, pt, یان pc).","unavailable":"%1<span class=\"cke_accessibility\">, ئامادە نیە</span>"},"about":{"copy":"مافی لەبەرگەرتنەوەی &copy; $1. گشتی پارێزراوه. ورگێڕانی بۆ کوردی لەلایەن هۆژە کۆیی.","dlgTitle":"دەربارەی CKEditor","help":"سەیری $1 بکه بۆ یارمەتی.","moreInfo":"بۆ زانیاری زیاتر دەربارەی مۆڵەتی بەکارهێنان، تکایه سەردانی ماڵپەڕەکەمان بکه:","title":"دەربارەی CKEditor","userGuide":"ڕێپیشاندەری CKEditors"},"basicstyles":{"bold":"قەڵەو","italic":"لار","strike":"لێدان","subscript":"ژێرنووس","superscript":"سەرنووس","underline":"ژێرهێڵ"},"bidi":{"ltr":"ئاراستەی نووسە لە چەپ بۆ ڕاست","rtl":"ئاراستەی نووسە لە ڕاست بۆ چەپ"},"blockquote":{"toolbar":"بەربەستکردنی ووتەی وەرگیراو"},"clipboard":{"copy":"لەبەرگرتنەوە","copyError":"پارێزی وێبگەڕەکەت ڕێگەنادات بەسەرنووسەکە لە لکاندنی دەقی خۆکارارنە. تکایە لەبری ئەمە ئەم فەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+C).","cut":"بڕین","cutError":"پارێزی وێبگەڕەکەت ڕێگەنادات بە سەرنووسەکە لەبڕینی خۆکارانە. تکایە لەبری ئەمە ئەم فەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+X).","paste":"لکاندن","pasteArea":"ناوچەی لکاندن","pasteMsg":"تکایە بیلکێنە لەناوەوەی ئەم سنوقە لەڕێی تەختەکلیلەکەت بە بەکارهێنانی کلیلی (<STRONG>Ctrl/Cmd+V</STRONG>) دووای کلیکی باشە بکە.","securityMsg":"بەهۆی شێوەپێدانی پارێزی وێبگەڕەکەت، سەرنووسەکه ناتوانێت دەستبگەیەنێت بەهەڵگیراوەکە ڕاستەوخۆ. بۆیه پێویسته دووباره بیلکێنیت لەم پەنجەرەیه.","title":"لکاندن"},"button":{"selectedLabel":"%1 (هەڵبژێردراو)"},"colorbutton":{"auto":"خۆکار","bgColorTitle":"ڕەنگی پاشبنەما","colors":{"000":"ڕەش","800000":"سۆرو ماڕوونی","8B4513":"ماڕوونی","2F4F4F":"سەوزی تاریك","008080":"سەوز و شین","000080":"شینی تۆخ","4B0082":"مۆری تۆخ","696969":"ڕەساسی تۆخ","B22222":"سۆری تۆخ","A52A2A":"قاوەیی","DAA520":"قاوەیی بریسکەدار","006400":"سەوزی تۆخ","40E0D0":"شینی ناتۆخی بریسکەدار","0000CD":"شینی مامناوەند","800080":"پەمبەیی","808080":"ڕەساسی","F00":"سۆر","FF8C00":"نارەنجی تۆخ","FFD700":"زەرد","008000":"سەوز","0FF":"شینی ئاسمانی","00F":"شین","EE82EE":"پەمەیی","A9A9A9":"ڕەساسی ناتۆخ","FFA07A":"نارەنجی ناتۆخ","FFA500":"نارەنجی","FFFF00":"زەرد","00FF00":"سەوز","AFEEEE":"شینی ناتۆخ","ADD8E6":"شینی زۆر ناتۆخ","DDA0DD":"پەمەیی ناتۆخ","D3D3D3":"ڕەساسی بریسکەدار","FFF0F5":"جەرگی زۆر ناتۆخ","FAEBD7":"جەرگی ناتۆخ","FFFFE0":"سپی ناتۆخ","F0FFF0":"هەنگوینی ناتۆخ","F0FFFF":"شینێکی زۆر ناتۆخ","F0F8FF":"شینێکی ئاسمانی زۆر ناتۆخ","E6E6FA":"شیری","FFF":"سپی"},"more":"ڕەنگی زیاتر...","panelTitle":"ڕەنگەکان","textColorTitle":"ڕەنگی دەق"},"colordialog":{"clear":"پاکیکەوە","highlight":"نیشانکردن","options":"هەڵبژاردەی ڕەنگەکان","selected":"ڕەنگی هەڵبژێردراو","title":"هەڵبژاردنی ڕەنگ"},"templates":{"button":"ڕووکار","emptyListMsg":"(هیچ ڕووکارێك دیارینەکراوە)","insertOption":"لە شوێن دانانی ئەم پێکهاتانەی ئێستا","options":"هەڵبژاردەکانی ڕووکار","selectPromptMsg":"ڕووکارێك هەڵبژێره بۆ کردنەوەی له سەرنووسەر:","title":"پێکهاتەی ڕووکار"},"contextmenu":{"options":"هەڵبژاردەی لیستەی کلیکی دەستی ڕاست"},"div":{"IdInputLabel":"ناسنامە","advisoryTitleInputLabel":"سەردێڕ","cssClassInputLabel":"شێوازی چینی پەڕه","edit":"چاکسازی Div","inlineStyleInputLabel":"شێوازی ناوهێڵ","langDirLTRLabel":"چەپ بۆ ڕاست (LTR)","langDirLabel":"ئاراستەی زمان","langDirRTLLabel":"ڕاست بۆ چەپ (RTL)","languageCodeInputLabel":"هێمای زمان","remove":"لابردنی Div","styleSelectLabel":"شێواز","title":"دروستکردنی لەخۆگری Div","toolbar":"دروستکردنی لەخۆگری Div"},"toolbar":{"toolbarCollapse":"شاردنەوی هێڵی تووڵامراز","toolbarExpand":"نیشاندانی هێڵی تووڵامراز","toolbarGroups":{"document":"پەڕه","clipboard":"بڕین/پووچکردنەوە","editing":"چاکسازی","forms":"داڕشتە","basicstyles":"شێوازی بنچینەیی","paragraph":"بڕگە","links":"بەستەر","insert":"خستنە ناو","styles":"شێواز","colors":"ڕەنگەکان","tools":"ئامرازەکان"},"toolbars":"تووڵامرازی دەسکاریکەر"},"elementspath":{"eleLabel":"ڕێڕەوی توخمەکان","eleTitle":"%1 توخم"},"find":{"find":"گەڕان","findOptions":"هەڵبژاردەکانی گەڕان","findWhat":"گەڕان بەدووای:","matchCase":"جیاکردنەوه لەنێوان پیتی گەورەو بچووك","matchCyclic":"گەڕان لەهەموو پەڕەکه","matchWord":"تەنەا هەموو وشەکه","notFoundMsg":"هیچ دەقه گەڕانێك نەدۆزراوه.","replace":"لەبریدانان","replaceAll":"لەبریدانانی هەمووی","replaceSuccessMsg":" پێشهاتە(ی) لەبری دانرا. %1","replaceWith":"لەبریدانان به:","title":"گەڕان و لەبریدانان"},"fakeobjects":{"anchor":"لەنگەر","flash":"فلاش","hiddenfield":"شاردنەوەی خانه","iframe":"لەچوارچێوە","unknown":"بەرکارێکی نەناسراو"},"flash":{"access":"دەستپێگەیشتنی نووسراو","accessAlways":"هەمیشه","accessNever":"هەرگیز","accessSameDomain":"هەمان دۆمەین","alignAbsBottom":"له ژێرەوه","alignAbsMiddle":"لەناوەند","alignBaseline":"هێڵەبنەڕەت","alignTextTop":"دەق لەسەرەوه","bgcolor":"ڕەنگی پاشبنەما","chkFull":"ڕێپێدان بە پڕی شاشه","chkLoop":"گرێ","chkMenu":"چالاککردنی لیستەی فلاش","chkPlay":"پێکردنی یان لێدانی خۆکار","flashvars":"گۆڕاوەکان بۆ فلاش","hSpace":"بۆشایی ئاسۆیی","properties":"خاسیەتی فلاش","propertiesTab":"خاسیەت","quality":"جۆرایەتی","qualityAutoHigh":"بەرزی خۆکار","qualityAutoLow":"نزمی خۆکار","qualityBest":"باشترین","qualityHigh":"بەرزی","qualityLow":"نزم","qualityMedium":"مامناوەند","scale":"پێوانه","scaleAll":"نیشاندانی هەموو","scaleFit":"بەوردی بگونجێت","scaleNoBorder":"بێ پەراوێز","title":"خاسیەتی فلاش","vSpace":"بۆشایی ئەستونی","validateHSpace":"بۆشایی ئاسۆیی دەبێت ژمارە بێت.","validateSrc":"ناونیشانی بەستەر نابێت خاڵی بێت","validateVSpace":"بۆشایی ئەستونی دەبێت ژماره بێت.","windowMode":"شێوازی پەنجەره","windowModeOpaque":"ناڕوون","windowModeTransparent":"ڕۆشن","windowModeWindow":"پەنجەره"},"font":{"fontSize":{"label":"گەورەیی","voiceLabel":"گەورەیی فۆنت","panelTitle":"گەورەیی فۆنت"},"label":"فۆنت","panelTitle":"ناوی فۆنت","voiceLabel":"فۆنت"},"forms":{"button":{"title":"خاسیەتی دوگمە","text":"(نرخی) دەق","type":"جۆر","typeBtn":"دوگمە","typeSbm":"بنێرە","typeRst":"ڕێکخستنەوە"},"checkboxAndRadio":{"checkboxTitle":"خاسیەتی چووارگۆشی پشکنین","radioTitle":"خاسیەتی جێگرەوەی دوگمە","value":"نرخ","selected":"هەڵبژاردرا","required":"پێویستە"},"form":{"title":"خاسیەتی داڕشتە","menu":"خاسیەتی داڕشتە","action":"کردار","method":"ڕێگە","encoding":"بەکۆدکەر"},"hidden":{"title":"خاسیەتی خانەی شاردراوە","name":"ناو","value":"نرخ"},"select":{"title":"هەڵبژاردەی خاسیەتی خانە","selectInfo":"زانیاری","opAvail":"هەڵبژاردەی لەبەردەستدابوون","value":"نرخ","size":"گەورەیی","lines":"هێڵەکان","chkMulti":"ڕێدان بەفره هەڵبژارده","required":"پێویستە","opText":"دەق","opValue":"نرخ","btnAdd":"زیادکردن","btnModify":"گۆڕانکاری","btnUp":"سەرەوه","btnDown":"خوارەوە","btnSetValue":"دابنێ وەك نرخێکی هەڵبژێردراو","btnDelete":"سڕینەوه"},"textarea":{"title":"خاسیەتی ڕووبەری دەق","cols":"ستوونەکان","rows":"ڕیزەکان"},"textfield":{"title":"خاسیەتی خانەی دەق","name":"ناو","value":"نرخ","charWidth":"پانی نووسە","maxChars":"ئەوپەڕی نووسە","required":"پێویستە","type":"جۆر","typeText":"دەق","typePass":"پێپەڕەوشە","typeEmail":"ئیمەیل","typeSearch":"گەڕان","typeTel":"ژمارەی تەلەفۆن","typeUrl":"ناونیشانی بەستەر"}},"format":{"label":"ڕازاندنەوە","panelTitle":"بەشی ڕازاندنەوه","tag_address":"ناونیشان","tag_div":"(DIV)-ی ئاسایی","tag_h1":"سەرنووسەی ١","tag_h2":"سەرنووسەی ٢","tag_h3":"سەرنووسەی ٣","tag_h4":"سەرنووسەی ٤","tag_h5":"سەرنووسەی ٥","tag_h6":"سەرنووسەی ٦","tag_p":"ئاسایی","tag_pre":"شێوازکراو"},"horizontalrule":{"toolbar":"دانانی هێلی ئاسۆیی"},"iframe":{"border":"نیشاندانی لاکێشه بە چوواردەوری چووارچێوە","noUrl":"تکایه ناونیشانی بەستەر بنووسه بۆ چووارچێوه","scrolling":"چالاککردنی هاتووچۆپێکردن","title":"دیالۆگی چووارچێوه","toolbar":"چووارچێوه"},"image":{"alt":"جێگرەوەی دەق","border":"پەراوێز","btnUpload":"ناردنی بۆ ڕاژه","button2Img":"تۆ دەتەوێت دوگمەی وێنەی دیاریکراو بگۆڕیت بۆ وێنەیەکی ئاسایی؟","hSpace":"بۆشایی ئاسۆیی","img2Button":"تۆ دەتەوێت وێنەی دیاریکراو بگۆڕیت بۆ دوگمەی وێنه؟","infoTab":"زانیاری وێنه","linkTab":"بەستەر","lockRatio":"داخستنی ڕێژه","menu":"خاسیەتی وێنه","resetSize":"ڕێکخستنەوەی قەباره","title":"خاسیەتی وێنه","titleButton":"خاسیەتی دوگمەی وێنه","upload":"بارکردن","urlMissing":"سەرچاوەی بەستەری وێنه بزره","vSpace":"بۆشایی ئەستونی","validateBorder":"پەراوێز دەبێت بەتەواوی تەنها ژماره بێت.","validateHSpace":"بۆشایی ئاسۆیی دەبێت بەتەواوی تەنها ژمارە بێت.","validateVSpace":"بۆشایی ئەستونی دەبێت بەتەواوی تەنها ژماره بێت."},"indent":{"indent":"زیادکردنی بۆشایی","outdent":"کەمکردنەوەی بۆشایی"},"smiley":{"options":"هەڵبژاردەی زەردەخەنه","title":"دانانی زەردەخەنەیەك","toolbar":"زەردەخەنه"},"justify":{"block":"هاوستوونی","center":"ناوەڕاست","left":"بەهێڵ کردنی چەپ","right":"بەهێڵ کردنی ڕاست"},"language":{"button":"جێگیرکردنی زمان","remove":"لابردنی زمان"},"link":{"acccessKey":"کلیلی دەستپێگەیشتن","advanced":"پێشکەوتوو","advisoryContentType":"جۆری ناوەڕۆکی ڕاویژکار","advisoryTitle":"ڕاوێژکاری سەردێڕ","anchor":{"toolbar":"دانان/چاکسازی لەنگەر","menu":"چاکسازی لەنگەر","title":"خاسیەتی لەنگەر","name":"ناوی لەنگەر","errorName":"تکایه ناوی لەنگەر بنووسه","remove":"لابردنی لەنگەر"},"anchorId":"بەپێی ناسنامەی توخم","anchorName":"بەپێی ناوی لەنگەر","charset":"بەستەری سەرچاوەی نووسە","cssClasses":"شێوازی چینی پەڕه","emailAddress":"ناونیشانی ئیمەیل","emailBody":"ناوەڕۆکی نامە","emailSubject":"بابەتی نامە","id":"ناسنامە","info":"زانیاری بەستەر","langCode":"هێمای زمان","langDir":"ئاراستەی زمان","langDirLTR":"چەپ بۆ ڕاست (LTR)","langDirRTL":"ڕاست بۆ چەپ (RTL)","menu":"چاکسازی بەستەر","name":"ناو","noAnchors":"(هیچ جۆرێکی لەنگەر ئامادە نیە لەم پەڕەیه)","noEmail":"تکایە ناونیشانی ئیمەیل بنووسە","noUrl":"تکایە ناونیشانی بەستەر بنووسە","other":"<هیتر>","popupDependent":"پێوەبەستراو (Netscape)","popupFeatures":"خاسیەتی پەنجەرەی سەرهەڵدەر","popupFullScreen":"پڕ بەپڕی شاشە (IE)","popupLeft":"جێگای چەپ","popupLocationBar":"هێڵی ناونیشانی بەستەر","popupMenuBar":"هێڵی لیسته","popupResizable":"توانای گۆڕینی قەباره","popupScrollBars":"هێڵی هاتووچۆپێکردن","popupStatusBar":"هێڵی دۆخ","popupToolbar":"هێڵی تووڵامراز","popupTop":"جێگای سەرەوە","rel":"پەیوەندی","selectAnchor":"هەڵبژاردنی لەنگەرێك","styles":"شێواز","tabIndex":"بازدەری تابی  ئیندێکس","target":"ئامانج","targetFrame":"<چووارچێوە>","targetFrameName":"ناوی ئامانجی چووارچێوە","targetPopup":"<پەنجەرەی سەرهەڵدەر>","targetPopupName":"ناوی پەنجەرەی سەرهەڵدەر","title":"بەستەر","toAnchor":"بەستەر بۆ لەنگەر له دەق","toEmail":"ئیمەیل","toUrl":"ناونیشانی بەستەر","toolbar":"دانان/ڕێکخستنی بەستەر","type":"جۆری بەستەر","unlink":"لابردنی بەستەر","upload":"بارکردن"},"list":{"bulletedlist":"دانان/لابردنی خاڵی لیست","numberedlist":"دانان/لابردنی ژمارەی لیست"},"liststyle":{"armenian":"ئاراستەی ژمارەی ئەرمەنی","bulletedTitle":"خاسیەتی لیستی خاڵی","circle":"بازنه","decimal":"ژمارە (1, 2, 3, وە هیتر.)","decimalLeadingZero":"ژمارە سفڕی لەپێشەوه (01, 02, 03, وە هیتر.)","disc":"پەپکە","georgian":"ئاراستەی ژمارەی جۆڕجی (an, ban, gan, وە هیتر.)","lowerAlpha":"ئەلفابێی بچووك (a, b, c, d, e, وە هیتر.)","lowerGreek":"یۆنانی بچووك (alpha, beta, gamma, وە هیتر.)","lowerRoman":"ژمارەی ڕۆمی بچووك (i, ii, iii, iv, v, وە هیتر.)","none":"هیچ","notset":"<دانەندراوه>","numberedTitle":"خاسیەتی لیستی ژمارەیی","square":"چووراگۆشە","start":"دەستپێکردن","type":"جۆر","upperAlpha":"ئەلفابێی گەوره (A, B, C, D, E, وە هیتر.)","upperRoman":"ژمارەی ڕۆمی گەوره (I, II, III, IV, V, وە هیتر.)","validateStartNumber":"دەستپێکەری لیستی ژمارەیی دەبێت تەنها ژمارە بێت."},"magicline":{"title":"بڕگە لێرە دابنێ"},"maximize":{"maximize":"ئەوپەڕی گەورەیی","minimize":"ئەوپەڕی بچووکی"},"newpage":{"toolbar":"پەڕەیەکی نوێ"},"pagebreak":{"alt":"پشووی پەڕە","toolbar":"دانانی پشووی پەڕە بۆ چاپکردن"},"pastetext":{"button":"لکاندنی وەك دەقی ڕوون","title":"لکاندنی وەك دەقی ڕوون"},"pastefromword":{"confirmCleanup":"ئەم دەقەی بەتەمای بیلکێنی پێدەچێت له word هێنرابێت. دەتەوێت پاکی بکەیوه پێش ئەوەی بیلکێنی؟","error":"هیچ ڕێگەیەك نەبوو لەلکاندنی دەقەکه بەهۆی هەڵەیەکی ناوەخۆیی","title":"لکاندنی لەلایەن Word","toolbar":"لکاندنی لەڕێی Word"},"preview":{"preview":"پێشبینین"},"print":{"toolbar":"چاپکردن"},"removeformat":{"toolbar":"لابردنی داڕشتەکە"},"save":{"toolbar":"پاشکەوتکردن"},"selectall":{"toolbar":"دیاریکردنی هەمووی"},"showblocks":{"toolbar":"نیشاندانی بەربەستەکان"},"sourcearea":{"toolbar":"سەرچاوە"},"specialchar":{"options":"هەڵبژاردەی نووسەی تایبەتی","title":"هەڵبژاردنی نووسەی تایبەتی","toolbar":"دانانی نووسەی تایبەتی"},"scayt":{"btn_about":"دهربارهی SCAYT","btn_dictionaries":"فهرههنگهکان","btn_disable":"ناچالاککردنی SCAYT","btn_enable":"چالاککردنی SCAYT","btn_langs":"زمانهکان","btn_options":"ههڵبژارده","text_title":"پشکنینی نووسه لهکاتی نووسین"},"stylescombo":{"label":"شێواز","panelTitle":"شێوازی ڕازاندنەوە","panelTitle1":"شێوازی خشت","panelTitle2":"شێوازی ناوهێڵ","panelTitle3":"شێوازی بەرکار"},"table":{"border":"گەورەیی پەراوێز","caption":"سەردێڕ","cell":{"menu":"خانه","insertBefore":"دانانی خانه لەپێش","insertAfter":"دانانی خانه لەپاش","deleteCell":"سڕینەوەی خانه","merge":"تێکەڵکردنی خانە","mergeRight":"تێکەڵکردنی لەگەڵ ڕاست","mergeDown":"تێکەڵکردنی لەگەڵ خوارەوە","splitHorizontal":"دابەشکردنی خانەی ئاسۆیی","splitVertical":"دابەشکردنی خانەی ئەستونی","title":"خاسیەتی خانه","cellType":"جۆری خانه","rowSpan":"ماوەی نێوان ڕیز","colSpan":"بستی ئەستونی","wordWrap":"پێچانەوەی وشە","hAlign":"ڕیزکردنی ئاسۆیی","vAlign":"ڕیزکردنی ئەستونی","alignBaseline":"هێڵەبنەڕەت","bgColor":"ڕەنگی پاشبنەما","borderColor":"ڕەنگی پەراوێز","data":"داتا","header":"سەرپەڕه","yes":"بەڵێ","no":"نەخێر","invalidWidth":"پانی خانه دەبێت بەتەواوی ژماره بێت.","invalidHeight":"درێژی خانه بەتەواوی دەبێت ژمارە بێت.","invalidRowSpan":"ماوەی نێوان ڕیز بەتەواوی دەبێت ژمارە بێت.","invalidColSpan":"ماوەی نێوان ئەستونی بەتەواوی دەبێت ژمارە بێت.","chooseColor":"هەڵبژێرە"},"cellPad":"بۆشایی ناوپۆش","cellSpace":"بۆشایی خانه","column":{"menu":"ئەستون","insertBefore":"دانانی ئەستون لەپێش","insertAfter":"دانانی ئەستوون لەپاش","deleteColumn":"سڕینەوەی ئەستوون"},"columns":"ستوونەکان","deleteTable":"سڕینەوەی خشتە","headers":"سەرپەڕه","headersBoth":"هەردووك","headersColumn":"یەکەم ئەستوون","headersNone":"هیچ","headersRow":"یەکەم ڕیز","invalidBorder":"ژمارەی پەراوێز دەبێت تەنها ژماره بێت.","invalidCellPadding":"ناوپۆشی خانه دەبێت ژمارەکی درووست بێت.","invalidCellSpacing":"بۆشایی خانه دەبێت ژمارەکی درووست بێت.","invalidCols":"ژمارەی ئەستوونی دەبێت گەورەتر بێت لەژمارەی 0.","invalidHeight":"درێژی خشته دهبێت تهنها ژماره بێت.","invalidRows":"ژمارەی ڕیز دەبێت گەورەتر بێت لەژمارەی 0.","invalidWidth":"پانی خشته دەبێت تەنها ژماره بێت.","menu":"خاسیەتی خشتە","row":{"menu":"ڕیز","insertBefore":"دانانی ڕیز لەپێش","insertAfter":"دانانی ڕیز لەپاش","deleteRow":"سڕینەوەی ڕیز"},"rows":"ڕیز","summary":"کورتە","title":"خاسیەتی خشتە","toolbar":"خشتە","widthPc":"لەسەدا","widthPx":"وێنەخاڵ - پیکسل","widthUnit":"پانی یەکە"},"undo":{"redo":"هەڵگەڕاندنەوە","undo":"پووچکردنەوە"},"wsc":{"btnIgnore":"پشتگوێ کردن","btnIgnoreAll":"پشتگوێکردنی ههمووی","btnReplace":"لهبریدانن","btnReplaceAll":"لهبریدانانی ههمووی","btnUndo":"پووچکردنهوه","changeTo":"گۆڕینی بۆ","errorLoading":"ههڵه لههێنانی داخوازینامهی خانهخۆێی ڕاژه: %s.","ieSpellDownload":"پشکنینی ڕێنووس دانهمزراوه. دهتهوێت ئێستا دایبگریت?","manyChanges":"پشکنینی ڕێنووس کۆتای هات: لهسهدا %1 ی وشهکان گۆڕدرا","noChanges":"پشکنینی ڕێنووس کۆتای هات: هیچ وشهیهك نۆگۆڕدرا","noMispell":"پشکنینی ڕێنووس کۆتای هات: هیچ ههڵهیهکی ڕێنووس نهدۆزراوه","noSuggestions":"- هیچ پێشنیارێك -","notAvailable":"ببووره، لهمکاتهدا ڕاژهکه لهبهردهستا نیه.","notInDic":"لهفهرههنگ دانیه","oneChange":"پشکنینی ڕێنووس کۆتای هات: یهك وشه گۆڕدرا","progress":"پشکنینی ڕێنووس لهبهردهوامبوون دایه...","title":"پشکنینی ڕێنووس","toolbar":"پشکنینی ڕێنووس"}};
\ No newline at end of file
+CKEDITOR.lang['ku']={"editor":"سەرنووسەی دەقی تەواو","editorPanel":"بڕگەی سەرنووسەی دەقی تەواو","common":{"editorHelp":"کلیکی ALT لەگەڵ 0 بکه‌ بۆ یارمەتی","browseServer":"هێنانی ڕاژە","url":"ناونیشانی بەستەر","protocol":"پڕۆتۆکۆڵ","upload":"بارکردن","uploadSubmit":"ناردنی بۆ ڕاژە","image":"وێنە","flash":"فلاش","form":"داڕشتە","checkbox":"خانەی نیشانکردن","radio":"جێگرەوەی دوگمە","textField":"خانەی دەق","textarea":"ڕووبەری دەق","hiddenField":"شاردنەوی خانە","button":"دوگمە","select":"هەڵبژاردەی خانە","imageButton":"دوگمەی وێنە","notSet":"<هیچ دانەدراوە>","id":"ناسنامە","name":"ناو","langDir":"ئاراستەی زمان","langDirLtr":"چەپ بۆ ڕاست (LTR)","langDirRtl":"ڕاست بۆ چەپ (RTL)","langCode":"هێمای زمان","longDescr":"پێناسەی درێژی بەستەر","cssClass":"شێوازی چینی په‌ڕە","advisoryTitle":"ڕاوێژکاری سەردێڕ","cssStyle":"شێواز","ok":"باشە","cancel":"پاشگەزبوونەوە","close":"داخستن","preview":"پێشبینین","resize":"گۆڕینی ئەندازە","generalTab":"گشتی","advancedTab":"پەرەسەندوو","validateNumberFailed":"ئەم نرخە ژمارە نیە، تکایە نرخێکی ژمارە بنووسە.","confirmNewPage":"سەرجەم گۆڕانکاریەکان و پێکهاتەکانی ناووەوە لەدەست دەدەی گەر بێتوو پاشکەوتی نەکەی یەکەم جار، تۆ هەر دڵنیایی لەکردنەوەی پەنجەرەکی نوێ؟","confirmCancel":"هەندێك هەڵبژاردە گۆڕدراوە. تۆ دڵنیایی لە داخستنی ئەم دیالۆگە؟","options":"هەڵبژاردەکان","target":"ئامانج","targetNew":"پەنجەرەیەکی نوێ (_blank)","targetTop":"لووتکەی پەنجەرە (_top)","targetSelf":"لەهەمان پەنجەرە (_self)","targetParent":"پەنجەرەی باوان (_parent)","langDirLTR":"چەپ بۆ ڕاست (LTR)","langDirRTL":"ڕاست بۆ چەپ (RTL)","styles":"شێواز","cssClasses":"شێوازی چینی پەڕە","width":"پانی","height":"درێژی","align":"ڕێککەرەوە","alignLeft":"چەپ","alignRight":"ڕاست","alignCenter":"ناوەڕاست","alignJustify":"هاوستوونی","alignTop":"سەرەوە","alignMiddle":"ناوەند","alignBottom":"ژێرەوە","alignNone":"هیچ","invalidValue":"نرخێکی نادرووست.","invalidHeight":"درێژی دەبێت ژمارە بێت.","invalidWidth":"پانی دەبێت ژمارە بێت.","invalidCssLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی (px, %, in, cm, mm, em, ex, pt, یان pc).","invalidHtmlLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی HTML (px یان %).","invalidInlineStyle":"دانەی نرخی شێوازی ناوهێڵ دەبێت پێکهاتبێت لەیەك یان زیاتری داڕشتە \"ناو : نرخ\", جیاکردنەوەی بە فاریزە و خاڵ","cssLengthTooltip":"ژمارەیەك بنووسه‌ بۆ نرخی piksel یان ئامرازێکی درووستی CSS (px, %, in, cm, mm, em, ex, pt, یان pc).","unavailable":"%1<span class=\"cke_accessibility\">, ئامادە نیە</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"مافی لەبەرگەرتنەوەی &copy; $1. گشتی پارێزراوه. ورگێڕانی بۆ کوردی لەلایەن هۆژە کۆیی.","dlgTitle":"دەربارەی CKEditor","help":"سەیری $1 بکه بۆ یارمەتی.","moreInfo":"بۆ زانیاری زیاتر دەربارەی مۆڵەتی بەکارهێنان، تکایه سەردانی ماڵپەڕەکەمان بکه:","title":"دەربارەی CKEditor","userGuide":"ڕێپیشاندەری CKEditors"},"basicstyles":{"bold":"قەڵەو","italic":"لار","strike":"لێدان","subscript":"ژێرنووس","superscript":"سەرنووس","underline":"ژێرهێڵ"},"bidi":{"ltr":"ئاراستەی نووسە لە چەپ بۆ ڕاست","rtl":"ئاراستەی نووسە لە ڕاست بۆ چەپ"},"blockquote":{"toolbar":"بەربەستکردنی ووتەی وەرگیراو"},"clipboard":{"copy":"لەبەرگرتنەوە","copyError":"پارێزی وێبگەڕەکەت ڕێگەنادات بەسەرنووسەکە لە لکاندنی دەقی خۆکارارنە. تکایە لەبری ئەمە ئەم فەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+C).","cut":"بڕین","cutError":"پارێزی وێبگەڕەکەت ڕێگەنادات بە سەرنووسەکە لەبڕینی خۆکارانە. تکایە لەبری ئەمە ئەم فەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+X).","paste":"لکاندن","pasteArea":"ناوچەی لکاندن","pasteMsg":"تکایە بیلکێنە لەناوەوەی ئەم سنوقە لەڕێی تەختەکلیلەکەت بە بەکارهێنانی کلیلی (<STRONG>Ctrl/Cmd+V</STRONG>) دووای کلیکی باشە بکە.","securityMsg":"بەهۆی شێوەپێدانی پارێزی وێبگەڕەکەت، سەرنووسەکه ناتوانێت دەستبگەیەنێت بەهەڵگیراوەکە ڕاستەوخۆ. بۆیه پێویسته دووباره بیلکێنیت لەم پەنجەرەیه.","title":"لکاندن"},"button":{"selectedLabel":"%1 (هەڵبژێردراو)"},"colorbutton":{"auto":"خۆکار","bgColorTitle":"ڕەنگی پاشبنەما","colors":{"000":"ڕەش","800000":"سۆرو ماڕوونی","8B4513":"ماڕوونی","2F4F4F":"سەوزی تاریك","008080":"سەوز و شین","000080":"شینی تۆخ","4B0082":"مۆری تۆخ","696969":"ڕەساسی تۆخ","B22222":"سۆری تۆخ","A52A2A":"قاوەیی","DAA520":"قاوەیی بریسکەدار","006400":"سەوزی تۆخ","40E0D0":"شینی ناتۆخی بریسکەدار","0000CD":"شینی مامناوەند","800080":"پەمبەیی","808080":"ڕەساسی","F00":"سۆر","FF8C00":"نارەنجی تۆخ","FFD700":"زەرد","008000":"سەوز","0FF":"شینی ئاسمانی","00F":"شین","EE82EE":"پەمەیی","A9A9A9":"ڕەساسی ناتۆخ","FFA07A":"نارەنجی ناتۆخ","FFA500":"نارەنجی","FFFF00":"زەرد","00FF00":"سەوز","AFEEEE":"شینی ناتۆخ","ADD8E6":"شینی زۆر ناتۆخ","DDA0DD":"پەمەیی ناتۆخ","D3D3D3":"ڕەساسی بریسکەدار","FFF0F5":"جەرگی زۆر ناتۆخ","FAEBD7":"جەرگی ناتۆخ","FFFFE0":"سپی ناتۆخ","F0FFF0":"هەنگوینی ناتۆخ","F0FFFF":"شینێکی زۆر ناتۆخ","F0F8FF":"شینێکی ئاسمانی زۆر ناتۆخ","E6E6FA":"شیری","FFF":"سپی","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"ڕەنگی زیاتر...","panelTitle":"ڕەنگەکان","textColorTitle":"ڕەنگی دەق"},"colordialog":{"clear":"پاکیکەوە","highlight":"نیشانکردن","options":"هەڵبژاردەی ڕەنگەکان","selected":"ڕەنگی هەڵبژێردراو","title":"هەڵبژاردنی ڕەنگ"},"templates":{"button":"ڕووکار","emptyListMsg":"(هیچ ڕووکارێك دیارینەکراوە)","insertOption":"لە شوێن دانانی ئەم پێکهاتانەی ئێستا","options":"هەڵبژاردەکانی ڕووکار","selectPromptMsg":"ڕووکارێك هەڵبژێره بۆ کردنەوەی له سەرنووسەر:","title":"پێکهاتەی ڕووکار"},"contextmenu":{"options":"هەڵبژاردەی لیستەی کلیکی دەستی ڕاست"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ناسنامە","advisoryTitleInputLabel":"سەردێڕ","cssClassInputLabel":"شێوازی چینی پەڕه","edit":"چاکسازی Div","inlineStyleInputLabel":"شێوازی ناوهێڵ","langDirLTRLabel":"چەپ بۆ ڕاست (LTR)","langDirLabel":"ئاراستەی زمان","langDirRTLLabel":"ڕاست بۆ چەپ (RTL)","languageCodeInputLabel":"هێمای زمان","remove":"لابردنی Div","styleSelectLabel":"شێواز","title":"دروستکردنی لەخۆگری Div","toolbar":"دروستکردنی لەخۆگری Div"},"toolbar":{"toolbarCollapse":"شاردنەوی هێڵی تووڵامراز","toolbarExpand":"نیشاندانی هێڵی تووڵامراز","toolbarGroups":{"document":"پەڕه","clipboard":"بڕین/پووچکردنەوە","editing":"چاکسازی","forms":"داڕشتە","basicstyles":"شێوازی بنچینەیی","paragraph":"بڕگە","links":"بەستەر","insert":"خستنە ناو","styles":"شێواز","colors":"ڕەنگەکان","tools":"ئامرازەکان"},"toolbars":"تووڵامرازی دەسکاریکەر"},"elementspath":{"eleLabel":"ڕێڕەوی توخمەکان","eleTitle":"%1 توخم"},"find":{"find":"گەڕان","findOptions":"هەڵبژاردەکانی گەڕان","findWhat":"گەڕان بەدووای:","matchCase":"جیاکردنەوه لەنێوان پیتی گەورەو بچووك","matchCyclic":"گەڕان لەهەموو پەڕەکه","matchWord":"تەنەا هەموو وشەکه","notFoundMsg":"هیچ دەقه گەڕانێك نەدۆزراوه.","replace":"لەبریدانان","replaceAll":"لەبریدانانی هەمووی","replaceSuccessMsg":" پێشهاتە(ی) لەبری دانرا. %1","replaceWith":"لەبریدانان به:","title":"گەڕان و لەبریدانان"},"fakeobjects":{"anchor":"لەنگەر","flash":"فلاش","hiddenfield":"شاردنەوەی خانه","iframe":"لەچوارچێوە","unknown":"بەرکارێکی نەناسراو"},"flash":{"access":"دەستپێگەیشتنی نووسراو","accessAlways":"هەمیشه","accessNever":"هەرگیز","accessSameDomain":"هەمان دۆمەین","alignAbsBottom":"له ژێرەوه","alignAbsMiddle":"لەناوەند","alignBaseline":"هێڵەبنەڕەت","alignTextTop":"دەق لەسەرەوه","bgcolor":"ڕەنگی پاشبنەما","chkFull":"ڕێپێدان بە پڕی شاشه","chkLoop":"گرێ","chkMenu":"چالاککردنی لیستەی فلاش","chkPlay":"پێکردنی یان لێدانی خۆکار","flashvars":"گۆڕاوەکان بۆ فلاش","hSpace":"بۆشایی ئاسۆیی","properties":"خاسیەتی فلاش","propertiesTab":"خاسیەت","quality":"جۆرایەتی","qualityAutoHigh":"بەرزی خۆکار","qualityAutoLow":"نزمی خۆکار","qualityBest":"باشترین","qualityHigh":"بەرزی","qualityLow":"نزم","qualityMedium":"مامناوەند","scale":"پێوانه","scaleAll":"نیشاندانی هەموو","scaleFit":"بەوردی بگونجێت","scaleNoBorder":"بێ پەراوێز","title":"خاسیەتی فلاش","vSpace":"بۆشایی ئەستونی","validateHSpace":"بۆشایی ئاسۆیی دەبێت ژمارە بێت.","validateSrc":"ناونیشانی بەستەر نابێت خاڵی بێت","validateVSpace":"بۆشایی ئەستونی دەبێت ژماره بێت.","windowMode":"شێوازی پەنجەره","windowModeOpaque":"ناڕوون","windowModeTransparent":"ڕۆشن","windowModeWindow":"پەنجەره"},"font":{"fontSize":{"label":"گەورەیی","voiceLabel":"گەورەیی فۆنت","panelTitle":"گەورەیی فۆنت"},"label":"فۆنت","panelTitle":"ناوی فۆنت","voiceLabel":"فۆنت"},"forms":{"button":{"title":"خاسیەتی دوگمە","text":"(نرخی) دەق","type":"جۆر","typeBtn":"دوگمە","typeSbm":"بنێرە","typeRst":"ڕێکخستنەوە"},"checkboxAndRadio":{"checkboxTitle":"خاسیەتی چووارگۆشی پشکنین","radioTitle":"خاسیەتی جێگرەوەی دوگمە","value":"نرخ","selected":"هەڵبژاردرا","required":"پێویستە"},"form":{"title":"خاسیەتی داڕشتە","menu":"خاسیەتی داڕشتە","action":"کردار","method":"ڕێگە","encoding":"بەکۆدکەر"},"hidden":{"title":"خاسیەتی خانەی شاردراوە","name":"ناو","value":"نرخ"},"select":{"title":"هەڵبژاردەی خاسیەتی خانە","selectInfo":"زانیاری","opAvail":"هەڵبژاردەی لەبەردەستدابوون","value":"نرخ","size":"گەورەیی","lines":"هێڵەکان","chkMulti":"ڕێدان بەفره هەڵبژارده","required":"پێویستە","opText":"دەق","opValue":"نرخ","btnAdd":"زیادکردن","btnModify":"گۆڕانکاری","btnUp":"سەرەوه","btnDown":"خوارەوە","btnSetValue":"دابنێ وەك نرخێکی هەڵبژێردراو","btnDelete":"سڕینەوه"},"textarea":{"title":"خاسیەتی ڕووبەری دەق","cols":"ستوونەکان","rows":"ڕیزەکان"},"textfield":{"title":"خاسیەتی خانەی دەق","name":"ناو","value":"نرخ","charWidth":"پانی نووسە","maxChars":"ئەوپەڕی نووسە","required":"پێویستە","type":"جۆر","typeText":"دەق","typePass":"پێپەڕەوشە","typeEmail":"ئیمەیل","typeSearch":"گەڕان","typeTel":"ژمارەی تەلەفۆن","typeUrl":"ناونیشانی بەستەر"}},"format":{"label":"ڕازاندنەوە","panelTitle":"بەشی ڕازاندنەوه","tag_address":"ناونیشان","tag_div":"(DIV)-ی ئاسایی","tag_h1":"سەرنووسەی ١","tag_h2":"سەرنووسەی ٢","tag_h3":"سەرنووسەی ٣","tag_h4":"سەرنووسەی ٤","tag_h5":"سەرنووسەی ٥","tag_h6":"سەرنووسەی ٦","tag_p":"ئاسایی","tag_pre":"شێوازکراو"},"horizontalrule":{"toolbar":"دانانی هێلی ئاسۆیی"},"iframe":{"border":"نیشاندانی لاکێشه بە چوواردەوری چووارچێوە","noUrl":"تکایه ناونیشانی بەستەر بنووسه بۆ چووارچێوه","scrolling":"چالاککردنی هاتووچۆپێکردن","title":"دیالۆگی چووارچێوه","toolbar":"چووارچێوه"},"image":{"alt":"جێگرەوەی دەق","border":"پەراوێز","btnUpload":"ناردنی بۆ ڕاژه","button2Img":"تۆ دەتەوێت دوگمەی وێنەی دیاریکراو بگۆڕیت بۆ وێنەیەکی ئاسایی؟","hSpace":"بۆشایی ئاسۆیی","img2Button":"تۆ دەتەوێت وێنەی دیاریکراو بگۆڕیت بۆ دوگمەی وێنه؟","infoTab":"زانیاری وێنه","linkTab":"بەستەر","lockRatio":"داخستنی ڕێژه","menu":"خاسیەتی وێنه","resetSize":"ڕێکخستنەوەی قەباره","title":"خاسیەتی وێنه","titleButton":"خاسیەتی دوگمەی وێنه","upload":"بارکردن","urlMissing":"سەرچاوەی بەستەری وێنه بزره","vSpace":"بۆشایی ئەستونی","validateBorder":"پەراوێز دەبێت بەتەواوی تەنها ژماره بێت.","validateHSpace":"بۆشایی ئاسۆیی دەبێت بەتەواوی تەنها ژمارە بێت.","validateVSpace":"بۆشایی ئەستونی دەبێت بەتەواوی تەنها ژماره بێت."},"indent":{"indent":"زیادکردنی بۆشایی","outdent":"کەمکردنەوەی بۆشایی"},"smiley":{"options":"هەڵبژاردەی زەردەخەنه","title":"دانانی زەردەخەنەیەك","toolbar":"زەردەخەنه"},"justify":{"block":"هاوستوونی","center":"ناوەڕاست","left":"بەهێڵ کردنی چەپ","right":"بەهێڵ کردنی ڕاست"},"language":{"button":"جێگیرکردنی زمان","remove":"لابردنی زمان"},"link":{"acccessKey":"کلیلی دەستپێگەیشتن","advanced":"پێشکەوتوو","advisoryContentType":"جۆری ناوەڕۆکی ڕاویژکار","advisoryTitle":"ڕاوێژکاری سەردێڕ","anchor":{"toolbar":"دانان/چاکسازی لەنگەر","menu":"چاکسازی لەنگەر","title":"خاسیەتی لەنگەر","name":"ناوی لەنگەر","errorName":"تکایه ناوی لەنگەر بنووسه","remove":"لابردنی لەنگەر"},"anchorId":"بەپێی ناسنامەی توخم","anchorName":"بەپێی ناوی لەنگەر","charset":"بەستەری سەرچاوەی نووسە","cssClasses":"شێوازی چینی پەڕه","download":"Force Download","displayText":"Display Text","emailAddress":"ناونیشانی ئیمەیل","emailBody":"ناوەڕۆکی نامە","emailSubject":"بابەتی نامە","id":"ناسنامە","info":"زانیاری بەستەر","langCode":"هێمای زمان","langDir":"ئاراستەی زمان","langDirLTR":"چەپ بۆ ڕاست (LTR)","langDirRTL":"ڕاست بۆ چەپ (RTL)","menu":"چاکسازی بەستەر","name":"ناو","noAnchors":"(هیچ جۆرێکی لەنگەر ئامادە نیە لەم پەڕەیه)","noEmail":"تکایە ناونیشانی ئیمەیل بنووسە","noUrl":"تکایە ناونیشانی بەستەر بنووسە","other":"<هیتر>","popupDependent":"پێوەبەستراو (Netscape)","popupFeatures":"خاسیەتی پەنجەرەی سەرهەڵدەر","popupFullScreen":"پڕ بەپڕی شاشە (IE)","popupLeft":"جێگای چەپ","popupLocationBar":"هێڵی ناونیشانی بەستەر","popupMenuBar":"هێڵی لیسته","popupResizable":"توانای گۆڕینی قەباره","popupScrollBars":"هێڵی هاتووچۆپێکردن","popupStatusBar":"هێڵی دۆخ","popupToolbar":"هێڵی تووڵامراز","popupTop":"جێگای سەرەوە","rel":"پەیوەندی","selectAnchor":"هەڵبژاردنی لەنگەرێك","styles":"شێواز","tabIndex":"بازدەری تابی  ئیندێکس","target":"ئامانج","targetFrame":"<چووارچێوە>","targetFrameName":"ناوی ئامانجی چووارچێوە","targetPopup":"<پەنجەرەی سەرهەڵدەر>","targetPopupName":"ناوی پەنجەرەی سەرهەڵدەر","title":"بەستەر","toAnchor":"بەستەر بۆ لەنگەر له دەق","toEmail":"ئیمەیل","toUrl":"ناونیشانی بەستەر","toolbar":"دانان/ڕێکخستنی بەستەر","type":"جۆری بەستەر","unlink":"لابردنی بەستەر","upload":"بارکردن"},"list":{"bulletedlist":"دانان/لابردنی خاڵی لیست","numberedlist":"دانان/لابردنی ژمارەی لیست"},"liststyle":{"armenian":"ئاراستەی ژمارەی ئەرمەنی","bulletedTitle":"خاسیەتی لیستی خاڵی","circle":"بازنه","decimal":"ژمارە (1, 2, 3, وە هیتر.)","decimalLeadingZero":"ژمارە سفڕی لەپێشەوه (01, 02, 03, وە هیتر.)","disc":"پەپکە","georgian":"ئاراستەی ژمارەی جۆڕجی (an, ban, gan, وە هیتر.)","lowerAlpha":"ئەلفابێی بچووك (a, b, c, d, e, وە هیتر.)","lowerGreek":"یۆنانی بچووك (alpha, beta, gamma, وە هیتر.)","lowerRoman":"ژمارەی ڕۆمی بچووك (i, ii, iii, iv, v, وە هیتر.)","none":"هیچ","notset":"<دانەندراوه>","numberedTitle":"خاسیەتی لیستی ژمارەیی","square":"چووراگۆشە","start":"دەستپێکردن","type":"جۆر","upperAlpha":"ئەلفابێی گەوره (A, B, C, D, E, وە هیتر.)","upperRoman":"ژمارەی ڕۆمی گەوره (I, II, III, IV, V, وە هیتر.)","validateStartNumber":"دەستپێکەری لیستی ژمارەیی دەبێت تەنها ژمارە بێت."},"magicline":{"title":"بڕگە لێرە دابنێ"},"maximize":{"maximize":"ئەوپەڕی گەورەیی","minimize":"ئەوپەڕی بچووکی"},"newpage":{"toolbar":"پەڕەیەکی نوێ"},"pagebreak":{"alt":"پشووی پەڕە","toolbar":"دانانی پشووی پەڕە بۆ چاپکردن"},"pastetext":{"button":"لکاندنی وەك دەقی ڕوون","title":"لکاندنی وەك دەقی ڕوون"},"pastefromword":{"confirmCleanup":"ئەم دەقەی بەتەمای بیلکێنی پێدەچێت له word هێنرابێت. دەتەوێت پاکی بکەیوه پێش ئەوەی بیلکێنی؟","error":"هیچ ڕێگەیەك نەبوو لەلکاندنی دەقەکه بەهۆی هەڵەیەکی ناوەخۆیی","title":"لکاندنی لەلایەن Word","toolbar":"لکاندنی لەڕێی Word"},"preview":{"preview":"پێشبینین"},"print":{"toolbar":"چاپکردن"},"removeformat":{"toolbar":"لابردنی داڕشتەکە"},"save":{"toolbar":"پاشکەوتکردن"},"selectall":{"toolbar":"دیاریکردنی هەمووی"},"showblocks":{"toolbar":"نیشاندانی بەربەستەکان"},"sourcearea":{"toolbar":"سەرچاوە"},"specialchar":{"options":"هەڵبژاردەی نووسەی تایبەتی","title":"هەڵبژاردنی نووسەی تایبەتی","toolbar":"دانانی نووسەی تایبەتی"},"scayt":{"btn_about":"دهربارهی SCAYT","btn_dictionaries":"فهرههنگهکان","btn_disable":"ناچالاککردنی SCAYT","btn_enable":"چالاککردنی SCAYT","btn_langs":"زمانهکان","btn_options":"ههڵبژارده","text_title":"پشکنینی نووسه لهکاتی نووسین"},"stylescombo":{"label":"شێواز","panelTitle":"شێوازی ڕازاندنەوە","panelTitle1":"شێوازی خشت","panelTitle2":"شێوازی ناوهێڵ","panelTitle3":"شێوازی بەرکار"},"table":{"border":"گەورەیی پەراوێز","caption":"سەردێڕ","cell":{"menu":"خانه","insertBefore":"دانانی خانه لەپێش","insertAfter":"دانانی خانه لەپاش","deleteCell":"سڕینەوەی خانه","merge":"تێکەڵکردنی خانە","mergeRight":"تێکەڵکردنی لەگەڵ ڕاست","mergeDown":"تێکەڵکردنی لەگەڵ خوارەوە","splitHorizontal":"دابەشکردنی خانەی ئاسۆیی","splitVertical":"دابەشکردنی خانەی ئەستونی","title":"خاسیەتی خانه","cellType":"جۆری خانه","rowSpan":"ماوەی نێوان ڕیز","colSpan":"بستی ئەستونی","wordWrap":"پێچانەوەی وشە","hAlign":"ڕیزکردنی ئاسۆیی","vAlign":"ڕیزکردنی ئەستونی","alignBaseline":"هێڵەبنەڕەت","bgColor":"ڕەنگی پاشبنەما","borderColor":"ڕەنگی پەراوێز","data":"داتا","header":"سەرپەڕه","yes":"بەڵێ","no":"نەخێر","invalidWidth":"پانی خانه دەبێت بەتەواوی ژماره بێت.","invalidHeight":"درێژی خانه بەتەواوی دەبێت ژمارە بێت.","invalidRowSpan":"ماوەی نێوان ڕیز بەتەواوی دەبێت ژمارە بێت.","invalidColSpan":"ماوەی نێوان ئەستونی بەتەواوی دەبێت ژمارە بێت.","chooseColor":"هەڵبژێرە"},"cellPad":"بۆشایی ناوپۆش","cellSpace":"بۆشایی خانه","column":{"menu":"ئەستون","insertBefore":"دانانی ئەستون لەپێش","insertAfter":"دانانی ئەستوون لەپاش","deleteColumn":"سڕینەوەی ئەستوون"},"columns":"ستوونەکان","deleteTable":"سڕینەوەی خشتە","headers":"سەرپەڕه","headersBoth":"هەردووك","headersColumn":"یەکەم ئەستوون","headersNone":"هیچ","headersRow":"یەکەم ڕیز","invalidBorder":"ژمارەی پەراوێز دەبێت تەنها ژماره بێت.","invalidCellPadding":"ناوپۆشی خانه دەبێت ژمارەکی درووست بێت.","invalidCellSpacing":"بۆشایی خانه دەبێت ژمارەکی درووست بێت.","invalidCols":"ژمارەی ئەستوونی دەبێت گەورەتر بێت لەژمارەی 0.","invalidHeight":"درێژی خشته دهبێت تهنها ژماره بێت.","invalidRows":"ژمارەی ڕیز دەبێت گەورەتر بێت لەژمارەی 0.","invalidWidth":"پانی خشته دەبێت تەنها ژماره بێت.","menu":"خاسیەتی خشتە","row":{"menu":"ڕیز","insertBefore":"دانانی ڕیز لەپێش","insertAfter":"دانانی ڕیز لەپاش","deleteRow":"سڕینەوەی ڕیز"},"rows":"ڕیز","summary":"کورتە","title":"خاسیەتی خشتە","toolbar":"خشتە","widthPc":"لەسەدا","widthPx":"وێنەخاڵ - پیکسل","widthUnit":"پانی یەکە"},"undo":{"redo":"هەڵگەڕاندنەوە","undo":"پووچکردنەوە"},"wsc":{"btnIgnore":"پشتگوێ کردن","btnIgnoreAll":"پشتگوێکردنی ههمووی","btnReplace":"لهبریدانن","btnReplaceAll":"لهبریدانانی ههمووی","btnUndo":"پووچکردنهوه","changeTo":"گۆڕینی بۆ","errorLoading":"ههڵه لههێنانی داخوازینامهی خانهخۆێی ڕاژه: %s.","ieSpellDownload":"پشکنینی ڕێنووس دانهمزراوه. دهتهوێت ئێستا دایبگریت?","manyChanges":"پشکنینی ڕێنووس کۆتای هات: لهسهدا %1 ی وشهکان گۆڕدرا","noChanges":"پشکنینی ڕێنووس کۆتای هات: هیچ وشهیهك نۆگۆڕدرا","noMispell":"پشکنینی ڕێنووس کۆتای هات: هیچ ههڵهیهکی ڕێنووس نهدۆزراوه","noSuggestions":"- هیچ پێشنیارێك -","notAvailable":"ببووره، لهمکاتهدا ڕاژهکه لهبهردهستا نیه.","notInDic":"لهفهرههنگ دانیه","oneChange":"پشکنینی ڕێنووس کۆتای هات: یهك وشه گۆڕدرا","progress":"پشکنینی ڕێنووس لهبهردهوامبوون دایه...","title":"پشکنینی ڕێنووس","toolbar":"پشکنینی ڕێنووس"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/lang/lt.js
index 20a31e27bb6..17195111cca 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/lt.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/lt.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['lt']={"editor":"Pilnas redaktorius","editorPanel":"Pilno redagtoriaus skydelis","common":{"editorHelp":"Spauskite ALT 0 dėl pagalbos","browseServer":"Naršyti po serverį","url":"URL","protocol":"Protokolas","upload":"Siųsti","uploadSubmit":"Siųsti į serverį","image":"Vaizdas","flash":"Flash","form":"Forma","checkbox":"Žymimasis langelis","radio":"Žymimoji akutė","textField":"Teksto laukas","textarea":"Teksto sritis","hiddenField":"Nerodomas laukas","button":"Mygtukas","select":"Atrankos laukas","imageButton":"Vaizdinis mygtukas","notSet":"<nėra nustatyta>","id":"Id","name":"Vardas","langDir":"Teksto kryptis","langDirLtr":"Iš kairės į dešinę (LTR)","langDirRtl":"Iš dešinės į kairę (RTL)","langCode":"Kalbos kodas","longDescr":"Ilgas aprašymas URL","cssClass":"Stilių lentelės klasės","advisoryTitle":"Konsultacinė antraštė","cssStyle":"Stilius","ok":"OK","cancel":"Nutraukti","close":"Uždaryti","preview":"Peržiūrėti","resize":"Pavilkite, kad pakeistumėte dydį","generalTab":"Bendros savybės","advancedTab":"Papildomas","validateNumberFailed":"Ši reikšmė nėra skaičius.","confirmNewPage":"Visas neišsaugotas turinys bus prarastas. Ar tikrai norite įkrauti naują puslapį?","confirmCancel":"Kai kurie parametrai pasikeitė. Ar tikrai norite užverti langą?","options":"Parametrai","target":"Tikslinė nuoroda","targetNew":"Naujas langas (_blank)","targetTop":"Viršutinis langas (_top)","targetSelf":"Esamas langas (_self)","targetParent":"Paskutinis langas (_parent)","langDirLTR":"Iš kairės į dešinę (LTR)","langDirRTL":"Iš dešinės į kairę (RTL)","styles":"Stilius","cssClasses":"Stilių klasės","width":"Plotis","height":"Aukštis","align":"Lygiuoti","alignLeft":"Kairę","alignRight":"Dešinę","alignCenter":"Centrą","alignJustify":"Lygiuoti abi puses","alignTop":"Viršūnę","alignMiddle":"Vidurį","alignBottom":"Apačią","alignNone":"Niekas","invalidValue":"Neteisinga reikšmė.","invalidHeight":"Aukštis turi būti nurodytas skaičiais.","invalidWidth":"Plotis turi būti nurodytas skaičiais.","invalidCssLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo CSS matavimo vieneto (px, %, in, cm, mm, em, ex, pt arba pc).","invalidHtmlLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo HTML matavimo vieneto (px arba %).","invalidInlineStyle":"Reikšmė nurodyta vidiniame stiliuje turi būti sudaryta iš vieno šių reikšmių \"vardas : reikšmė\", atskirta kabliataškiais.","cssLengthTooltip":"Įveskite reikšmę pikseliais arba skaičiais su tinkamu CSS vienetu (px, %, in, cm, mm, em, ex, pt arba pc).","unavailable":"%1<span class=\"cke_accessibility\">, netinkamas</span>"},"about":{"copy":"Copyright &copy; $1. Visos teiss saugomos.","dlgTitle":"Apie CKEditor","help":"Patikrinkite $1 dėl pagalbos.","moreInfo":"Dėl licencijavimo apsilankykite mūsų svetainėje:","title":"Apie CKEditor","userGuide":"CKEditor Vartotojo Gidas"},"basicstyles":{"bold":"Pusjuodis","italic":"Kursyvas","strike":"Perbrauktas","subscript":"Apatinis indeksas","superscript":"Viršutinis indeksas","underline":"Pabrauktas"},"bidi":{"ltr":"Tekstas iš kairės į dešinę","rtl":"Tekstas iš dešinės į kairę"},"blockquote":{"toolbar":"Citata"},"clipboard":{"copy":"Kopijuoti","copyError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti kopijavimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+C).","cut":"Iškirpti","cutError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti iškirpimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+X).","paste":"Įdėti","pasteArea":"Įkelti dalį","pasteMsg":"Žemiau esančiame įvedimo lauke įdėkite tekstą, naudodami klaviatūrą (<STRONG>Ctrl/Cmd+V</STRONG>) ir paspauskite mygtuką <STRONG>OK</STRONG>.","securityMsg":"Dėl jūsų naršyklės saugumo nustatymų, redaktorius negali tiesiogiai pasiekti laikinosios atminties. Jums reikia nukopijuoti dar kartą į šį langą.","title":"Įdėti"},"button":{"selectedLabel":"%1 (Pasirinkta)"},"colorbutton":{"auto":"Automatinis","bgColorTitle":"Fono spalva","colors":{"000":"Juoda","800000":"Kaštoninė","8B4513":"Tamsiai ruda","2F4F4F":"Pilka tamsaus šiferio","008080":"Teal","000080":"Karinis","4B0082":"Indigo","696969":"Tamsiai pilka","B22222":"Ugnies","A52A2A":"Ruda","DAA520":"Aukso","006400":"Tamsiai žalia","40E0D0":"Turquoise","0000CD":"Vidutinė mėlyna","800080":"Violetinė","808080":"Pilka","F00":"Raudona","FF8C00":"Tamsiai oranžinė","FFD700":"Auksinė","008000":"Žalia","0FF":"Žydra","00F":"Mėlyna","EE82EE":"Violetinė","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Oranžinė","FFFF00":"Geltona","00FF00":"Citrinų","AFEEEE":"Pale Turquoise","ADD8E6":"Šviesiai mėlyna","DDA0DD":"Plum","D3D3D3":"Šviesiai pilka","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Šviesiai geltona","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Balta"},"more":"Daugiau spalvų...","panelTitle":"Spalva","textColorTitle":"Teksto spalva"},"colordialog":{"clear":"Išvalyti","highlight":"Paryškinti","options":"Spalvos nustatymai","selected":"Pasirinkta spalva","title":"Pasirinkite spalvą"},"templates":{"button":"Šablonai","emptyListMsg":"(Šablonų sąrašas tuščias)","insertOption":"Pakeisti dabartinį turinį pasirinktu šablonu","options":"Template Options","selectPromptMsg":"Pasirinkite norimą šabloną<br>(<b>Dėmesio!</b> esamas turinys bus prarastas):","title":"Turinio šablonai"},"contextmenu":{"options":"Kontekstinio meniu parametrai"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Patariamas pavadinimas","cssClassInputLabel":"Stilių klasės","edit":"Redaguoti Div","inlineStyleInputLabel":"Vidiniai stiliai","langDirLTRLabel":"Iš kairės į dešinę (LTR)","langDirLabel":"Kalbos nurodymai","langDirRTLLabel":"Iš dešinės į kairę (RTL)","languageCodeInputLabel":" Kalbos kodas","remove":"Pašalinti Div","styleSelectLabel":"Stilius","title":"Sukurti Div elementą","toolbar":"Sukurti Div elementą"},"toolbar":{"toolbarCollapse":"Apjungti įrankių juostą","toolbarExpand":"Išplėsti įrankių juostą","toolbarGroups":{"document":"Dokumentas","clipboard":"Atmintinė/Atgal","editing":"Redagavimas","forms":"Formos","basicstyles":"Pagrindiniai stiliai","paragraph":"Paragrafas","links":"Nuorodos","insert":"Įterpti","styles":"Stiliai","colors":"Spalvos","tools":"Įrankiai"},"toolbars":"Redaktoriaus įrankiai"},"elementspath":{"eleLabel":"Elemento kelias","eleTitle":"%1 elementas"},"find":{"find":"Rasti","findOptions":"Paieškos nustatymai","findWhat":"Surasti tekstą:","matchCase":"Skirti didžiąsias ir mažąsias raides","matchCyclic":"Sutampantis cikliškumas","matchWord":"Atitikti pilną žodį","notFoundMsg":"Nurodytas tekstas nerastas.","replace":"Pakeisti","replaceAll":"Pakeisti viską","replaceSuccessMsg":"%1 sutapimas(ų) buvo pakeisti.","replaceWith":"Pakeisti tekstu:","title":"Surasti ir pakeisti"},"fakeobjects":{"anchor":"Žymė","flash":"Flash animacija","hiddenfield":"Paslėptas laukas","iframe":"IFrame","unknown":"Nežinomas objektas"},"flash":{"access":"Skripto priėjimas","accessAlways":"Visada","accessNever":"Niekada","accessSameDomain":"Tas pats domenas","alignAbsBottom":"Absoliučią apačią","alignAbsMiddle":"Absoliutų vidurį","alignBaseline":"Apatinę liniją","alignTextTop":"Teksto viršūnę","bgcolor":"Fono spalva","chkFull":"Leisti per visą ekraną","chkLoop":"Ciklas","chkMenu":"Leisti Flash meniu","chkPlay":"Automatinis paleidimas","flashvars":"Flash kintamieji","hSpace":"Hor.Erdvė","properties":"Flash savybės","propertiesTab":"Nustatymai","quality":"Kokybė","qualityAutoHigh":"Automatiškai Gera","qualityAutoLow":"Automatiškai Žema","qualityBest":"Geriausia","qualityHigh":"Gera","qualityLow":"Žema","qualityMedium":"Vidutinė","scale":"Mastelis","scaleAll":"Rodyti visą","scaleFit":"Tikslus atitikimas","scaleNoBorder":"Be rėmelio","title":"Flash savybės","vSpace":"Vert.Erdvė","validateHSpace":"HSpace turi būti skaičius.","validateSrc":"Prašome įvesti nuorodos URL","validateVSpace":"VSpace turi būti skaičius.","windowMode":"Lango režimas","windowModeOpaque":"Nepermatomas","windowModeTransparent":"Permatomas","windowModeWindow":"Langas"},"font":{"fontSize":{"label":"Šrifto dydis","voiceLabel":"Šrifto dydis","panelTitle":"Šrifto dydis"},"label":"Šriftas","panelTitle":"Šriftas","voiceLabel":"Šriftas"},"forms":{"button":{"title":"Mygtuko savybės","text":"Tekstas (Reikšmė)","type":"Tipas","typeBtn":"Mygtukas","typeSbm":"Siųsti","typeRst":"Išvalyti"},"checkboxAndRadio":{"checkboxTitle":"Žymimojo langelio savybės","radioTitle":"Žymimosios akutės savybės","value":"Reikšmė","selected":"Pažymėtas","required":"Required"},"form":{"title":"Formos savybės","menu":"Formos savybės","action":"Veiksmas","method":"Metodas","encoding":"Kodavimas"},"hidden":{"title":"Nerodomo lauko savybės","name":"Vardas","value":"Reikšmė"},"select":{"title":"Atrankos lauko savybės","selectInfo":"Informacija","opAvail":"Galimos parinktys","value":"Reikšmė","size":"Dydis","lines":"eilučių","chkMulti":"Leisti daugeriopą atranką","required":"Required","opText":"Tekstas","opValue":"Reikšmė","btnAdd":"Įtraukti","btnModify":"Modifikuoti","btnUp":"Aukštyn","btnDown":"Žemyn","btnSetValue":"Laikyti pažymėta reikšme","btnDelete":"Trinti"},"textarea":{"title":"Teksto srities savybės","cols":"Ilgis","rows":"Plotis"},"textfield":{"title":"Teksto lauko savybės","name":"Vardas","value":"Reikšmė","charWidth":"Ilgis simboliais","maxChars":"Maksimalus simbolių skaičius","required":"Required","type":"Tipas","typeText":"Tekstas","typePass":"Slaptažodis","typeEmail":"El. paštas","typeSearch":"Paieška","typeTel":"Telefono numeris","typeUrl":"Nuoroda"}},"format":{"label":"Šrifto formatas","panelTitle":"Šrifto formatas","tag_address":"Kreipinio","tag_div":"Normalus (DIV)","tag_h1":"Antraštinis 1","tag_h2":"Antraštinis 2","tag_h3":"Antraštinis 3","tag_h4":"Antraštinis 4","tag_h5":"Antraštinis 5","tag_h6":"Antraštinis 6","tag_p":"Normalus","tag_pre":"Formuotas"},"horizontalrule":{"toolbar":"Įterpti horizontalią liniją"},"iframe":{"border":"Rodyti rėmelį","noUrl":"Nurodykite iframe nuorodą","scrolling":"Įjungti slankiklius","title":"IFrame nustatymai","toolbar":"IFrame"},"image":{"alt":"Alternatyvus Tekstas","border":"Rėmelis","btnUpload":"Siųsti į serverį","button2Img":"Ar norite mygtuką paversti paprastu paveiksliuku?","hSpace":"Hor.Erdvė","img2Button":"Ar norite paveiksliuką paversti mygtuku?","infoTab":"Vaizdo informacija","linkTab":"Nuoroda","lockRatio":"Išlaikyti proporciją","menu":"Vaizdo savybės","resetSize":"Atstatyti dydį","title":"Vaizdo savybės","titleButton":"Vaizdinio mygtuko savybės","upload":"Nusiųsti","urlMissing":"Paveiksliuko nuorodos nėra.","vSpace":"Vert.Erdvė","validateBorder":"Reikšmė turi būti sveikas skaičius.","validateHSpace":"Reikšmė turi būti sveikas skaičius.","validateVSpace":"Reikšmė turi būti sveikas skaičius."},"indent":{"indent":"Padidinti įtrauką","outdent":"Sumažinti įtrauką"},"smiley":{"options":"Šypsenėlių nustatymai","title":"Įterpti veidelį","toolbar":"Veideliai"},"justify":{"block":"Lygiuoti abi puses","center":"Centruoti","left":"Lygiuoti kairę","right":"Lygiuoti dešinę"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Prieigos raktas","advanced":"Papildomas","advisoryContentType":"Konsultacinio turinio tipas","advisoryTitle":"Konsultacinė antraštė","anchor":{"toolbar":"Įterpti/modifikuoti žymę","menu":"Žymės savybės","title":"Žymės savybės","name":"Žymės vardas","errorName":"Prašome įvesti žymės vardą","remove":"Pašalinti žymę"},"anchorId":"Pagal žymės Id","anchorName":"Pagal žymės vardą","charset":"Susietų išteklių simbolių lentelė","cssClasses":"Stilių lentelės klasės","emailAddress":"El.pašto adresas","emailBody":"Žinutės turinys","emailSubject":"Žinutės tema","id":"Id","info":"Nuorodos informacija","langCode":"Teksto kryptis","langDir":"Teksto kryptis","langDirLTR":"Iš kairės į dešinę (LTR)","langDirRTL":"Iš dešinės į kairę (RTL)","menu":"Taisyti nuorodą","name":"Vardas","noAnchors":"(Šiame dokumente žymių nėra)","noEmail":"Prašome įvesti el.pašto adresą","noUrl":"Prašome įvesti nuorodos URL","other":"<kitas>","popupDependent":"Priklausomas (Netscape)","popupFeatures":"Išskleidžiamo lango savybės","popupFullScreen":"Visas ekranas (IE)","popupLeft":"Kairė pozicija","popupLocationBar":"Adreso juosta","popupMenuBar":"Meniu juosta","popupResizable":"Kintamas dydis","popupScrollBars":"Slinkties juostos","popupStatusBar":"Būsenos juosta","popupToolbar":"Mygtukų juosta","popupTop":"Viršutinė pozicija","rel":"Sąsajos","selectAnchor":"Pasirinkite žymę","styles":"Stilius","tabIndex":"Tabuliavimo indeksas","target":"Paskirties vieta","targetFrame":"<kadras>","targetFrameName":"Paskirties kadro vardas","targetPopup":"<išskleidžiamas langas>","targetPopupName":"Paskirties lango vardas","title":"Nuoroda","toAnchor":"Žymė šiame puslapyje","toEmail":"El.paštas","toUrl":"Nuoroda","toolbar":"Įterpti/taisyti nuorodą","type":"Nuorodos tipas","unlink":"Panaikinti nuorodą","upload":"Siųsti"},"list":{"bulletedlist":"Suženklintas sąrašas","numberedlist":"Numeruotas sąrašas"},"liststyle":{"armenian":"Armėniški skaitmenys","bulletedTitle":"Ženklelinio sąrašo nustatymai","circle":"Apskritimas","decimal":"Dešimtainis (1, 2, 3, t.t)","decimalLeadingZero":"Dešimtainis su nuliu priekyje (01, 02, 03, t.t)","disc":"Diskas","georgian":"Gruziniški skaitmenys (an, ban, gan, t.t)","lowerAlpha":"Mažosios Alpha (a, b, c, d, e, t.t)","lowerGreek":"Mažosios Graikų (alpha, beta, gamma, t.t)","lowerRoman":"Mažosios Romėnų (i, ii, iii, iv, v, t.t)","none":"Niekas","notset":"<nenurodytas>","numberedTitle":"Skaitmeninio sąrašo nustatymai","square":"Kvadratas","start":"Pradžia","type":"Rūšis","upperAlpha":"Didžiosios Alpha (A, B, C, D, E, t.t)","upperRoman":"Didžiosios Romėnų (I, II, III, IV, V, t.t)","validateStartNumber":"Sąrašo pradžios skaitmuo turi būti sveikas skaičius."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Išdidinti","minimize":"Sumažinti"},"newpage":{"toolbar":"Naujas puslapis"},"pagebreak":{"alt":"Puslapio skirtukas","toolbar":"Įterpti puslapių skirtuką"},"pastetext":{"button":"Įdėti kaip gryną tekstą","title":"Įdėti kaip gryną tekstą"},"pastefromword":{"confirmCleanup":"Tekstas, kurį įkeliate yra kopijuojamas iš Word. Ar norite jį išvalyti prieš įkeliant?","error":"Dėl vidinių sutrikimų, nepavyko išvalyti įkeliamo teksto","title":"Įdėti iš Word","toolbar":"Įdėti iš Word"},"preview":{"preview":"Peržiūra"},"print":{"toolbar":"Spausdinti"},"removeformat":{"toolbar":"Panaikinti formatą"},"save":{"toolbar":"Išsaugoti"},"selectall":{"toolbar":"Pažymėti viską"},"showblocks":{"toolbar":"Rodyti blokus"},"sourcearea":{"toolbar":"Šaltinis"},"specialchar":{"options":"Specialaus simbolio nustatymai","title":"Pasirinkite specialų simbolį","toolbar":"Įterpti specialų simbolį"},"scayt":{"btn_about":"Apie SCAYT","btn_dictionaries":"Žodynai","btn_disable":"Išjungti SCAYT","btn_enable":"Įjungti SCAYT","btn_langs":"Kalbos","btn_options":"Parametrai","text_title":"Tikrinti klaidas kai rašoma"},"stylescombo":{"label":"Stilius","panelTitle":"Stilių formatavimas","panelTitle1":"Blokų stiliai","panelTitle2":"Vidiniai stiliai","panelTitle3":"Objektų stiliai"},"table":{"border":"Rėmelio dydis","caption":"Antraštė","cell":{"menu":"Langelis","insertBefore":"Įterpti langelį prieš","insertAfter":"Įterpti langelį po","deleteCell":"Šalinti langelius","merge":"Sujungti langelius","mergeRight":"Sujungti su dešine","mergeDown":"Sujungti su apačia","splitHorizontal":"Skaidyti langelį horizontaliai","splitVertical":"Skaidyti langelį vertikaliai","title":"Cell nustatymai","cellType":"Cell rūšis","rowSpan":"Eilučių Span","colSpan":"Stulpelių Span","wordWrap":"Sutraukti raides","hAlign":"Horizontalus lygiavimas","vAlign":"Vertikalus lygiavimas","alignBaseline":"Apatinė linija","bgColor":"Fono spalva","borderColor":"Rėmelio spalva","data":"Data","header":"Antraštė","yes":"Taip","no":"Ne","invalidWidth":"Reikšmė turi būti skaičius.","invalidHeight":"Reikšmė turi būti skaičius.","invalidRowSpan":"Reikšmė turi būti skaičius.","invalidColSpan":"Reikšmė turi būti skaičius.","chooseColor":"Pasirinkite"},"cellPad":"Tarpas nuo langelio rėmo iki teksto","cellSpace":"Tarpas tarp langelių","column":{"menu":"Stulpelis","insertBefore":"Įterpti stulpelį prieš","insertAfter":"Įterpti stulpelį po","deleteColumn":"Šalinti stulpelius"},"columns":"Stulpeliai","deleteTable":"Šalinti lentelę","headers":"Antraštės","headersBoth":"Abu","headersColumn":"Pirmas stulpelis","headersNone":"Nėra","headersRow":"Pirma eilutė","invalidBorder":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellPadding":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellSpacing":"Reikšmė turi būti nurodyta skaičiumi.","invalidCols":"Skaičius turi būti didesnis nei 0.","invalidHeight":"Reikšmė turi būti nurodyta skaičiumi.","invalidRows":"Skaičius turi būti didesnis nei 0.","invalidWidth":"Reikšmė turi būti nurodyta skaičiumi.","menu":"Lentelės savybės","row":{"menu":"Eilutė","insertBefore":"Įterpti eilutę prieš","insertAfter":"Įterpti eilutę po","deleteRow":"Šalinti eilutes"},"rows":"Eilutės","summary":"Santrauka","title":"Lentelės savybės","toolbar":"Lentelė","widthPc":"procentais","widthPx":"taškais","widthUnit":"pločio vienetas"},"undo":{"redo":"Atstatyti","undo":"Atšaukti"},"wsc":{"btnIgnore":"Ignoruoti","btnIgnoreAll":"Ignoruoti visus","btnReplace":"Pakeisti","btnReplaceAll":"Pakeisti visus","btnUndo":"Atšaukti","changeTo":"Pakeisti į","errorLoading":"Klaida įkraunant servisą: %s.","ieSpellDownload":"Rašybos tikrinimas neinstaliuotas. Ar Jūs norite jį dabar atsisiųsti?","manyChanges":"Rašybos tikrinimas baigtas: Pakeista %1 žodžių","noChanges":"Rašybos tikrinimas baigtas: Nėra pakeistų žodžių","noMispell":"Rašybos tikrinimas baigtas: Nerasta rašybos klaidų","noSuggestions":"- Nėra pasiūlymų -","notAvailable":"Atleiskite, šiuo metu servisas neprieinamas.","notInDic":"Žodyne nerastas","oneChange":"Rašybos tikrinimas baigtas: Vienas žodis pakeistas","progress":"Vyksta rašybos tikrinimas...","title":"Tikrinti klaidas","toolbar":"Rašybos tikrinimas"}};
\ No newline at end of file
+CKEDITOR.lang['lt']={"editor":"Pilnas redaktorius","editorPanel":"Pilno redagtoriaus skydelis","common":{"editorHelp":"Spauskite ALT 0 dėl pagalbos","browseServer":"Naršyti po serverį","url":"URL","protocol":"Protokolas","upload":"Siųsti","uploadSubmit":"Siųsti į serverį","image":"Vaizdas","flash":"Flash","form":"Forma","checkbox":"Žymimasis langelis","radio":"Žymimoji akutė","textField":"Teksto laukas","textarea":"Teksto sritis","hiddenField":"Nerodomas laukas","button":"Mygtukas","select":"Atrankos laukas","imageButton":"Vaizdinis mygtukas","notSet":"<nėra nustatyta>","id":"Id","name":"Vardas","langDir":"Teksto kryptis","langDirLtr":"Iš kairės į dešinę (LTR)","langDirRtl":"Iš dešinės į kairę (RTL)","langCode":"Kalbos kodas","longDescr":"Ilgas aprašymas URL","cssClass":"Stilių lentelės klasės","advisoryTitle":"Konsultacinė antraštė","cssStyle":"Stilius","ok":"OK","cancel":"Nutraukti","close":"Uždaryti","preview":"Peržiūrėti","resize":"Pavilkite, kad pakeistumėte dydį","generalTab":"Bendros savybės","advancedTab":"Papildomas","validateNumberFailed":"Ši reikšmė nėra skaičius.","confirmNewPage":"Visas neišsaugotas turinys bus prarastas. Ar tikrai norite įkrauti naują puslapį?","confirmCancel":"Kai kurie parametrai pasikeitė. Ar tikrai norite užverti langą?","options":"Parametrai","target":"Tikslinė nuoroda","targetNew":"Naujas langas (_blank)","targetTop":"Viršutinis langas (_top)","targetSelf":"Esamas langas (_self)","targetParent":"Paskutinis langas (_parent)","langDirLTR":"Iš kairės į dešinę (LTR)","langDirRTL":"Iš dešinės į kairę (RTL)","styles":"Stilius","cssClasses":"Stilių klasės","width":"Plotis","height":"Aukštis","align":"Lygiuoti","alignLeft":"Kairę","alignRight":"Dešinę","alignCenter":"Centrą","alignJustify":"Lygiuoti abi puses","alignTop":"Viršūnę","alignMiddle":"Vidurį","alignBottom":"Apačią","alignNone":"Niekas","invalidValue":"Neteisinga reikšmė.","invalidHeight":"Aukštis turi būti nurodytas skaičiais.","invalidWidth":"Plotis turi būti nurodytas skaičiais.","invalidCssLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo CSS matavimo vieneto (px, %, in, cm, mm, em, ex, pt arba pc).","invalidHtmlLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo HTML matavimo vieneto (px arba %).","invalidInlineStyle":"Reikšmė nurodyta vidiniame stiliuje turi būti sudaryta iš vieno šių reikšmių \"vardas : reikšmė\", atskirta kabliataškiais.","cssLengthTooltip":"Įveskite reikšmę pikseliais arba skaičiais su tinkamu CSS vienetu (px, %, in, cm, mm, em, ex, pt arba pc).","unavailable":"%1<span class=\"cke_accessibility\">, netinkamas</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Visos teiss saugomos.","dlgTitle":"Apie CKEditor","help":"Patikrinkite $1 dėl pagalbos.","moreInfo":"Dėl licencijavimo apsilankykite mūsų svetainėje:","title":"Apie CKEditor","userGuide":"CKEditor Vartotojo Gidas"},"basicstyles":{"bold":"Pusjuodis","italic":"Kursyvas","strike":"Perbrauktas","subscript":"Apatinis indeksas","superscript":"Viršutinis indeksas","underline":"Pabrauktas"},"bidi":{"ltr":"Tekstas iš kairės į dešinę","rtl":"Tekstas iš dešinės į kairę"},"blockquote":{"toolbar":"Citata"},"clipboard":{"copy":"Kopijuoti","copyError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti kopijavimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+C).","cut":"Iškirpti","cutError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti iškirpimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+X).","paste":"Įdėti","pasteArea":"Įkelti dalį","pasteMsg":"Žemiau esančiame įvedimo lauke įdėkite tekstą, naudodami klaviatūrą (<STRONG>Ctrl/Cmd+V</STRONG>) ir paspauskite mygtuką <STRONG>OK</STRONG>.","securityMsg":"Dėl jūsų naršyklės saugumo nustatymų, redaktorius negali tiesiogiai pasiekti laikinosios atminties. Jums reikia nukopijuoti dar kartą į šį langą.","title":"Įdėti"},"button":{"selectedLabel":"%1 (Pasirinkta)"},"colorbutton":{"auto":"Automatinis","bgColorTitle":"Fono spalva","colors":{"000":"Juoda","800000":"Kaštoninė","8B4513":"Tamsiai ruda","2F4F4F":"Pilka tamsaus šiferio","008080":"Teal","000080":"Karinis","4B0082":"Indigo","696969":"Tamsiai pilka","B22222":"Ugnies","A52A2A":"Ruda","DAA520":"Aukso","006400":"Tamsiai žalia","40E0D0":"Turquoise","0000CD":"Vidutinė mėlyna","800080":"Violetinė","808080":"Pilka","F00":"Raudona","FF8C00":"Tamsiai oranžinė","FFD700":"Auksinė","008000":"Žalia","0FF":"Žydra","00F":"Mėlyna","EE82EE":"Violetinė","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Oranžinė","FFFF00":"Geltona","00FF00":"Citrinų","AFEEEE":"Pale Turquoise","ADD8E6":"Šviesiai mėlyna","DDA0DD":"Plum","D3D3D3":"Šviesiai pilka","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Šviesiai geltona","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Balta","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Daugiau spalvų...","panelTitle":"Spalva","textColorTitle":"Teksto spalva"},"colordialog":{"clear":"Išvalyti","highlight":"Paryškinti","options":"Spalvos nustatymai","selected":"Pasirinkta spalva","title":"Pasirinkite spalvą"},"templates":{"button":"Šablonai","emptyListMsg":"(Šablonų sąrašas tuščias)","insertOption":"Pakeisti dabartinį turinį pasirinktu šablonu","options":"Template Options","selectPromptMsg":"Pasirinkite norimą šabloną<br>(<b>Dėmesio!</b> esamas turinys bus prarastas):","title":"Turinio šablonai"},"contextmenu":{"options":"Kontekstinio meniu parametrai"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Patariamas pavadinimas","cssClassInputLabel":"Stilių klasės","edit":"Redaguoti Div","inlineStyleInputLabel":"Vidiniai stiliai","langDirLTRLabel":"Iš kairės į dešinę (LTR)","langDirLabel":"Kalbos nurodymai","langDirRTLLabel":"Iš dešinės į kairę (RTL)","languageCodeInputLabel":" Kalbos kodas","remove":"Pašalinti Div","styleSelectLabel":"Stilius","title":"Sukurti Div elementą","toolbar":"Sukurti Div elementą"},"toolbar":{"toolbarCollapse":"Apjungti įrankių juostą","toolbarExpand":"Išplėsti įrankių juostą","toolbarGroups":{"document":"Dokumentas","clipboard":"Atmintinė/Atgal","editing":"Redagavimas","forms":"Formos","basicstyles":"Pagrindiniai stiliai","paragraph":"Paragrafas","links":"Nuorodos","insert":"Įterpti","styles":"Stiliai","colors":"Spalvos","tools":"Įrankiai"},"toolbars":"Redaktoriaus įrankiai"},"elementspath":{"eleLabel":"Elemento kelias","eleTitle":"%1 elementas"},"find":{"find":"Rasti","findOptions":"Paieškos nustatymai","findWhat":"Surasti tekstą:","matchCase":"Skirti didžiąsias ir mažąsias raides","matchCyclic":"Sutampantis cikliškumas","matchWord":"Atitikti pilną žodį","notFoundMsg":"Nurodytas tekstas nerastas.","replace":"Pakeisti","replaceAll":"Pakeisti viską","replaceSuccessMsg":"%1 sutapimas(ų) buvo pakeisti.","replaceWith":"Pakeisti tekstu:","title":"Surasti ir pakeisti"},"fakeobjects":{"anchor":"Žymė","flash":"Flash animacija","hiddenfield":"Paslėptas laukas","iframe":"IFrame","unknown":"Nežinomas objektas"},"flash":{"access":"Skripto priėjimas","accessAlways":"Visada","accessNever":"Niekada","accessSameDomain":"Tas pats domenas","alignAbsBottom":"Absoliučią apačią","alignAbsMiddle":"Absoliutų vidurį","alignBaseline":"Apatinę liniją","alignTextTop":"Teksto viršūnę","bgcolor":"Fono spalva","chkFull":"Leisti per visą ekraną","chkLoop":"Ciklas","chkMenu":"Leisti Flash meniu","chkPlay":"Automatinis paleidimas","flashvars":"Flash kintamieji","hSpace":"Hor.Erdvė","properties":"Flash savybės","propertiesTab":"Nustatymai","quality":"Kokybė","qualityAutoHigh":"Automatiškai Gera","qualityAutoLow":"Automatiškai Žema","qualityBest":"Geriausia","qualityHigh":"Gera","qualityLow":"Žema","qualityMedium":"Vidutinė","scale":"Mastelis","scaleAll":"Rodyti visą","scaleFit":"Tikslus atitikimas","scaleNoBorder":"Be rėmelio","title":"Flash savybės","vSpace":"Vert.Erdvė","validateHSpace":"HSpace turi būti skaičius.","validateSrc":"Prašome įvesti nuorodos URL","validateVSpace":"VSpace turi būti skaičius.","windowMode":"Lango režimas","windowModeOpaque":"Nepermatomas","windowModeTransparent":"Permatomas","windowModeWindow":"Langas"},"font":{"fontSize":{"label":"Šrifto dydis","voiceLabel":"Šrifto dydis","panelTitle":"Šrifto dydis"},"label":"Šriftas","panelTitle":"Šriftas","voiceLabel":"Šriftas"},"forms":{"button":{"title":"Mygtuko savybės","text":"Tekstas (Reikšmė)","type":"Tipas","typeBtn":"Mygtukas","typeSbm":"Siųsti","typeRst":"Išvalyti"},"checkboxAndRadio":{"checkboxTitle":"Žymimojo langelio savybės","radioTitle":"Žymimosios akutės savybės","value":"Reikšmė","selected":"Pažymėtas","required":"Required"},"form":{"title":"Formos savybės","menu":"Formos savybės","action":"Veiksmas","method":"Metodas","encoding":"Kodavimas"},"hidden":{"title":"Nerodomo lauko savybės","name":"Vardas","value":"Reikšmė"},"select":{"title":"Atrankos lauko savybės","selectInfo":"Informacija","opAvail":"Galimos parinktys","value":"Reikšmė","size":"Dydis","lines":"eilučių","chkMulti":"Leisti daugeriopą atranką","required":"Required","opText":"Tekstas","opValue":"Reikšmė","btnAdd":"Įtraukti","btnModify":"Modifikuoti","btnUp":"Aukštyn","btnDown":"Žemyn","btnSetValue":"Laikyti pažymėta reikšme","btnDelete":"Trinti"},"textarea":{"title":"Teksto srities savybės","cols":"Ilgis","rows":"Plotis"},"textfield":{"title":"Teksto lauko savybės","name":"Vardas","value":"Reikšmė","charWidth":"Ilgis simboliais","maxChars":"Maksimalus simbolių skaičius","required":"Required","type":"Tipas","typeText":"Tekstas","typePass":"Slaptažodis","typeEmail":"El. paštas","typeSearch":"Paieška","typeTel":"Telefono numeris","typeUrl":"Nuoroda"}},"format":{"label":"Šrifto formatas","panelTitle":"Šrifto formatas","tag_address":"Kreipinio","tag_div":"Normalus (DIV)","tag_h1":"Antraštinis 1","tag_h2":"Antraštinis 2","tag_h3":"Antraštinis 3","tag_h4":"Antraštinis 4","tag_h5":"Antraštinis 5","tag_h6":"Antraštinis 6","tag_p":"Normalus","tag_pre":"Formuotas"},"horizontalrule":{"toolbar":"Įterpti horizontalią liniją"},"iframe":{"border":"Rodyti rėmelį","noUrl":"Nurodykite iframe nuorodą","scrolling":"Įjungti slankiklius","title":"IFrame nustatymai","toolbar":"IFrame"},"image":{"alt":"Alternatyvus Tekstas","border":"Rėmelis","btnUpload":"Siųsti į serverį","button2Img":"Ar norite mygtuką paversti paprastu paveiksliuku?","hSpace":"Hor.Erdvė","img2Button":"Ar norite paveiksliuką paversti mygtuku?","infoTab":"Vaizdo informacija","linkTab":"Nuoroda","lockRatio":"Išlaikyti proporciją","menu":"Vaizdo savybės","resetSize":"Atstatyti dydį","title":"Vaizdo savybės","titleButton":"Vaizdinio mygtuko savybės","upload":"Nusiųsti","urlMissing":"Paveiksliuko nuorodos nėra.","vSpace":"Vert.Erdvė","validateBorder":"Reikšmė turi būti sveikas skaičius.","validateHSpace":"Reikšmė turi būti sveikas skaičius.","validateVSpace":"Reikšmė turi būti sveikas skaičius."},"indent":{"indent":"Padidinti įtrauką","outdent":"Sumažinti įtrauką"},"smiley":{"options":"Šypsenėlių nustatymai","title":"Įterpti veidelį","toolbar":"Veideliai"},"justify":{"block":"Lygiuoti abi puses","center":"Centruoti","left":"Lygiuoti kairę","right":"Lygiuoti dešinę"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Prieigos raktas","advanced":"Papildomas","advisoryContentType":"Konsultacinio turinio tipas","advisoryTitle":"Konsultacinė antraštė","anchor":{"toolbar":"Įterpti/modifikuoti žymę","menu":"Žymės savybės","title":"Žymės savybės","name":"Žymės vardas","errorName":"Prašome įvesti žymės vardą","remove":"Pašalinti žymę"},"anchorId":"Pagal žymės Id","anchorName":"Pagal žymės vardą","charset":"Susietų išteklių simbolių lentelė","cssClasses":"Stilių lentelės klasės","download":"Force Download","displayText":"Display Text","emailAddress":"El.pašto adresas","emailBody":"Žinutės turinys","emailSubject":"Žinutės tema","id":"Id","info":"Nuorodos informacija","langCode":"Teksto kryptis","langDir":"Teksto kryptis","langDirLTR":"Iš kairės į dešinę (LTR)","langDirRTL":"Iš dešinės į kairę (RTL)","menu":"Taisyti nuorodą","name":"Vardas","noAnchors":"(Šiame dokumente žymių nėra)","noEmail":"Prašome įvesti el.pašto adresą","noUrl":"Prašome įvesti nuorodos URL","other":"<kitas>","popupDependent":"Priklausomas (Netscape)","popupFeatures":"Išskleidžiamo lango savybės","popupFullScreen":"Visas ekranas (IE)","popupLeft":"Kairė pozicija","popupLocationBar":"Adreso juosta","popupMenuBar":"Meniu juosta","popupResizable":"Kintamas dydis","popupScrollBars":"Slinkties juostos","popupStatusBar":"Būsenos juosta","popupToolbar":"Mygtukų juosta","popupTop":"Viršutinė pozicija","rel":"Sąsajos","selectAnchor":"Pasirinkite žymę","styles":"Stilius","tabIndex":"Tabuliavimo indeksas","target":"Paskirties vieta","targetFrame":"<kadras>","targetFrameName":"Paskirties kadro vardas","targetPopup":"<išskleidžiamas langas>","targetPopupName":"Paskirties lango vardas","title":"Nuoroda","toAnchor":"Žymė šiame puslapyje","toEmail":"El.paštas","toUrl":"Nuoroda","toolbar":"Įterpti/taisyti nuorodą","type":"Nuorodos tipas","unlink":"Panaikinti nuorodą","upload":"Siųsti"},"list":{"bulletedlist":"Suženklintas sąrašas","numberedlist":"Numeruotas sąrašas"},"liststyle":{"armenian":"Armėniški skaitmenys","bulletedTitle":"Ženklelinio sąrašo nustatymai","circle":"Apskritimas","decimal":"Dešimtainis (1, 2, 3, t.t)","decimalLeadingZero":"Dešimtainis su nuliu priekyje (01, 02, 03, t.t)","disc":"Diskas","georgian":"Gruziniški skaitmenys (an, ban, gan, t.t)","lowerAlpha":"Mažosios Alpha (a, b, c, d, e, t.t)","lowerGreek":"Mažosios Graikų (alpha, beta, gamma, t.t)","lowerRoman":"Mažosios Romėnų (i, ii, iii, iv, v, t.t)","none":"Niekas","notset":"<nenurodytas>","numberedTitle":"Skaitmeninio sąrašo nustatymai","square":"Kvadratas","start":"Pradžia","type":"Rūšis","upperAlpha":"Didžiosios Alpha (A, B, C, D, E, t.t)","upperRoman":"Didžiosios Romėnų (I, II, III, IV, V, t.t)","validateStartNumber":"Sąrašo pradžios skaitmuo turi būti sveikas skaičius."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Išdidinti","minimize":"Sumažinti"},"newpage":{"toolbar":"Naujas puslapis"},"pagebreak":{"alt":"Puslapio skirtukas","toolbar":"Įterpti puslapių skirtuką"},"pastetext":{"button":"Įdėti kaip gryną tekstą","title":"Įdėti kaip gryną tekstą"},"pastefromword":{"confirmCleanup":"Tekstas, kurį įkeliate yra kopijuojamas iš Word. Ar norite jį išvalyti prieš įkeliant?","error":"Dėl vidinių sutrikimų, nepavyko išvalyti įkeliamo teksto","title":"Įdėti iš Word","toolbar":"Įdėti iš Word"},"preview":{"preview":"Peržiūra"},"print":{"toolbar":"Spausdinti"},"removeformat":{"toolbar":"Panaikinti formatą"},"save":{"toolbar":"Išsaugoti"},"selectall":{"toolbar":"Pažymėti viską"},"showblocks":{"toolbar":"Rodyti blokus"},"sourcearea":{"toolbar":"Šaltinis"},"specialchar":{"options":"Specialaus simbolio nustatymai","title":"Pasirinkite specialų simbolį","toolbar":"Įterpti specialų simbolį"},"scayt":{"btn_about":"Apie SCAYT","btn_dictionaries":"Žodynai","btn_disable":"Išjungti SCAYT","btn_enable":"Įjungti SCAYT","btn_langs":"Kalbos","btn_options":"Parametrai","text_title":"Tikrinti klaidas kai rašoma"},"stylescombo":{"label":"Stilius","panelTitle":"Stilių formatavimas","panelTitle1":"Blokų stiliai","panelTitle2":"Vidiniai stiliai","panelTitle3":"Objektų stiliai"},"table":{"border":"Rėmelio dydis","caption":"Antraštė","cell":{"menu":"Langelis","insertBefore":"Įterpti langelį prieš","insertAfter":"Įterpti langelį po","deleteCell":"Šalinti langelius","merge":"Sujungti langelius","mergeRight":"Sujungti su dešine","mergeDown":"Sujungti su apačia","splitHorizontal":"Skaidyti langelį horizontaliai","splitVertical":"Skaidyti langelį vertikaliai","title":"Cell nustatymai","cellType":"Cell rūšis","rowSpan":"Eilučių Span","colSpan":"Stulpelių Span","wordWrap":"Sutraukti raides","hAlign":"Horizontalus lygiavimas","vAlign":"Vertikalus lygiavimas","alignBaseline":"Apatinė linija","bgColor":"Fono spalva","borderColor":"Rėmelio spalva","data":"Data","header":"Antraštė","yes":"Taip","no":"Ne","invalidWidth":"Reikšmė turi būti skaičius.","invalidHeight":"Reikšmė turi būti skaičius.","invalidRowSpan":"Reikšmė turi būti skaičius.","invalidColSpan":"Reikšmė turi būti skaičius.","chooseColor":"Pasirinkite"},"cellPad":"Tarpas nuo langelio rėmo iki teksto","cellSpace":"Tarpas tarp langelių","column":{"menu":"Stulpelis","insertBefore":"Įterpti stulpelį prieš","insertAfter":"Įterpti stulpelį po","deleteColumn":"Šalinti stulpelius"},"columns":"Stulpeliai","deleteTable":"Šalinti lentelę","headers":"Antraštės","headersBoth":"Abu","headersColumn":"Pirmas stulpelis","headersNone":"Nėra","headersRow":"Pirma eilutė","invalidBorder":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellPadding":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellSpacing":"Reikšmė turi būti nurodyta skaičiumi.","invalidCols":"Skaičius turi būti didesnis nei 0.","invalidHeight":"Reikšmė turi būti nurodyta skaičiumi.","invalidRows":"Skaičius turi būti didesnis nei 0.","invalidWidth":"Reikšmė turi būti nurodyta skaičiumi.","menu":"Lentelės savybės","row":{"menu":"Eilutė","insertBefore":"Įterpti eilutę prieš","insertAfter":"Įterpti eilutę po","deleteRow":"Šalinti eilutes"},"rows":"Eilutės","summary":"Santrauka","title":"Lentelės savybės","toolbar":"Lentelė","widthPc":"procentais","widthPx":"taškais","widthUnit":"pločio vienetas"},"undo":{"redo":"Atstatyti","undo":"Atšaukti"},"wsc":{"btnIgnore":"Ignoruoti","btnIgnoreAll":"Ignoruoti visus","btnReplace":"Pakeisti","btnReplaceAll":"Pakeisti visus","btnUndo":"Atšaukti","changeTo":"Pakeisti į","errorLoading":"Klaida įkraunant servisą: %s.","ieSpellDownload":"Rašybos tikrinimas neinstaliuotas. Ar Jūs norite jį dabar atsisiųsti?","manyChanges":"Rašybos tikrinimas baigtas: Pakeista %1 žodžių","noChanges":"Rašybos tikrinimas baigtas: Nėra pakeistų žodžių","noMispell":"Rašybos tikrinimas baigtas: Nerasta rašybos klaidų","noSuggestions":"- Nėra pasiūlymų -","notAvailable":"Atleiskite, šiuo metu servisas neprieinamas.","notInDic":"Žodyne nerastas","oneChange":"Rašybos tikrinimas baigtas: Vienas žodis pakeistas","progress":"Vyksta rašybos tikrinimas...","title":"Tikrinti klaidas","toolbar":"Rašybos tikrinimas"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/lang/lv.js
index 0c73f37c779..2d8b17e5a61 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/lv.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/lv.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['lv']={"editor":"Bagātinātā teksta redaktors","editorPanel":"Bagātinātā teksta redaktora panelis","common":{"editorHelp":"Palīdzībai, nospiediet ALT 0 ","browseServer":"Skatīt servera saturu","url":"URL","protocol":"Protokols","upload":"Augšupielādēt","uploadSubmit":"Nosūtīt serverim","image":"Attēls","flash":"Flash","form":"Forma","checkbox":"Atzīmēšanas kastīte","radio":"Izvēles poga","textField":"Teksta rinda","textarea":"Teksta laukums","hiddenField":"Paslēpta teksta rinda","button":"Poga","select":"Iezīmēšanas lauks","imageButton":"Attēlpoga","notSet":"<nav iestatīts>","id":"Id","name":"Nosaukums","langDir":"Valodas lasīšanas virziens","langDirLtr":"No kreisās uz labo (LTR)","langDirRtl":"No labās uz kreiso (RTL)","langCode":"Valodas kods","longDescr":"Gara apraksta Hipersaite","cssClass":"Stilu saraksta klases","advisoryTitle":"Konsultatīvs virsraksts","cssStyle":"Stils","ok":"Darīts!","cancel":"Atcelt","close":"Aizvērt","preview":"Priekšskatījums","resize":"Mērogot","generalTab":"Vispārīgi","advancedTab":"Izvērstais","validateNumberFailed":"Šī vērtība nav skaitlis","confirmNewPage":"Jebkuras nesaglabātās izmaiņas tiks zaudētas. Vai tiešām vēlaties atvērt jaunu lapu?","confirmCancel":"Daži no uzstādījumiem ir mainīti. Vai tiešām vēlaties aizvērt šo dialogu?","options":"Uzstādījumi","target":"Mērķis","targetNew":"Jauns logs (_blank)","targetTop":"Virsējais logs (_top)","targetSelf":"Tas pats logs (_self)","targetParent":"Avota logs (_parent)","langDirLTR":"Kreisais uz Labo (LTR)","langDirRTL":"Labais uz Kreiso (RTL)","styles":"Stils","cssClasses":"Stilu klases","width":"Platums","height":"Augstums","align":"Nolīdzināt","alignLeft":"Pa kreisi","alignRight":"Pa labi","alignCenter":"Centrēti","alignJustify":"Izlīdzināt malas","alignTop":"Augšā","alignMiddle":"Vertikāli centrēts","alignBottom":"Apakšā","alignNone":"Nekas","invalidValue":"Nekorekta vērtība","invalidHeight":"Augstumam jābūt skaitlim.","invalidWidth":"Platumam jābūt skaitlim","invalidCssLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām CSS mērvienībām (px, %, in, cm, mm, em, ex, pt, vai pc).","invalidHtmlLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām HTML mērvienībām (px vai %).","invalidInlineStyle":"Iekļautajā stilā norādītajai vērtībai jāsastāv no viena vai vairākiem pāriem pēc forma'ta \"nosaukums: vērtība\", atdalītiem ar semikolu.","cssLengthTooltip":"Ievadiet vērtību pikseļos vai skaitli ar derīgu CSS mērvienību (px, %, in, cm, mm, em, ex, pt, vai pc).","unavailable":"%1<span class=\"cke_accessibility\">, nav pieejams</span>"},"about":{"copy":"Kopēšanas tiesības &copy; $1. Visas tiesības rezervētas.","dlgTitle":"Par CKEditor","help":"Pārbaudiet $1 palīdzībai.","moreInfo":"Informācijai par licenzēšanu apmeklējiet mūsu mājas lapu:","title":"Par CKEditor","userGuide":"CKEditor Lietotāja pamācība"},"basicstyles":{"bold":"Treknināts","italic":"Kursīvs","strike":"Pārsvītrots","subscript":"Apakšrakstā","superscript":"Augšrakstā","underline":"Pasvītrots"},"bidi":{"ltr":"Teksta virziens no kreisās uz labo","rtl":"Teksta virziens no labās uz kreiso"},"blockquote":{"toolbar":"Bloka citāts"},"clipboard":{"copy":"Kopēt","copyError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt kopēšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+C), lai veiktu šo darbību.","cut":"Izgriezt","cutError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt izgriezšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+X), lai veiktu šo darbību.","paste":"Ielīmēt","pasteArea":"Ielīmēšanas zona","pasteMsg":"Lūdzu, ievietojiet tekstu šajā laukumā, izmantojot klaviatūru (<STRONG>Ctrl/Cmd+V</STRONG>) un apstipriniet ar <STRONG>Darīts!</STRONG>.","securityMsg":"Jūsu pārlūka drošības uzstādījumu dēļ, nav iespējams tieši piekļūt jūsu starpliktuvei. Jums jāielīmē atkārtoti šajā logā.","title":"Ievietot"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automātiska","bgColorTitle":"Fona krāsa","colors":{"000":"Melns","800000":"Sarkanbrūns","8B4513":"Sedlu brūns","2F4F4F":"Tumšas tāfeles pelēks","008080":"Zili-zaļš","000080":"Jūras","4B0082":"Indigo","696969":"Tumši pelēks","B22222":"Ķieģeļsarkans","A52A2A":"Brūns","DAA520":"Zelta","006400":"Tumši zaļš","40E0D0":"Tirkīzs","0000CD":"Vidēji zils","800080":"Purpurs","808080":"Pelēks","F00":"Sarkans","FF8C00":"Tumši oranžs","FFD700":"Zelta","008000":"Zaļš","0FF":"Tumšzils","00F":"Zils","EE82EE":"Violets","A9A9A9":"Pelēks","FFA07A":"Gaiši laškrāsas","FFA500":"Oranžs","FFFF00":"Dzeltens","00FF00":"Laima","AFEEEE":"Gaiši tirkīza","ADD8E6":"Gaiši zils","DDA0DD":"Plūmju","D3D3D3":"Gaiši pelēks","FFF0F5":"Lavandas sārts","FAEBD7":"Antīki balts","FFFFE0":"Gaiši dzeltens","F0FFF0":"Meduspile","F0FFFF":"Debesszils","F0F8FF":"Alises zils","E6E6FA":"Lavanda","FFF":"Balts"},"more":"Plašāka palete...","panelTitle":"Krāsa","textColorTitle":"Teksta krāsa"},"colordialog":{"clear":"Notīrīt","highlight":"Paraugs","options":"Krāsas uzstādījumi","selected":"Izvēlētā krāsa","title":"Izvēlies krāsu"},"templates":{"button":"Sagataves","emptyListMsg":"(Nav norādītas sagataves)","insertOption":"Aizvietot pašreizējo saturu","options":"Sagataves uzstādījumi","selectPromptMsg":"Lūdzu, norādiet sagatavi, ko atvērt editorā<br>(patreizējie dati tiks zaudēti):","title":"Satura sagataves"},"contextmenu":{"options":"Uznirstošās izvēlnes uzstādījumi"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Konsultatīvs virsraksts","cssClassInputLabel":"Stilu klases","edit":"Labot Div","inlineStyleInputLabel":"Iekļautais stils","langDirLTRLabel":"Kreisais uz Labo (LTR)","langDirLabel":"Valodas virziens","langDirRTLLabel":"Labais uz kreiso (RTL)","languageCodeInputLabel":"Valodas kods","remove":"Noņemt Div","styleSelectLabel":"Stils","title":"Izveidot div konteineri","toolbar":"Izveidot div konteineri"},"toolbar":{"toolbarCollapse":"Aizvērt rīkjoslu","toolbarExpand":"Atvērt rīkjoslu","toolbarGroups":{"document":"Dokuments","clipboard":"Starpliktuve/Atcelt","editing":"Labošana","forms":"Formas","basicstyles":"Pamata stili","paragraph":"Paragrāfs","links":"Saites","insert":"Ievietot","styles":"Stili","colors":"Krāsas","tools":"Rīki"},"toolbars":"Redaktora rīkjoslas"},"elementspath":{"eleLabel":"Elementa ceļš","eleTitle":"%1 elements"},"find":{"find":"Meklēt","findOptions":"Meklēt uzstādījumi","findWhat":"Meklēt:","matchCase":"Reģistrjūtīgs","matchCyclic":"Sakrist cikliski","matchWord":"Jāsakrīt pilnībā","notFoundMsg":"Norādītā frāze netika atrasta.","replace":"Nomainīt","replaceAll":"Aizvietot visu","replaceSuccessMsg":"%1 gadījums(i) aizvietoti","replaceWith":"Nomainīt uz:","title":"Meklēt un aizvietot"},"fakeobjects":{"anchor":"Iezīme","flash":"Flash animācija","hiddenfield":"Slēpts lauks","iframe":"Iframe","unknown":"Nezināms objekts"},"flash":{"access":"Skripta pieeja","accessAlways":"Vienmēr","accessNever":"Nekad","accessSameDomain":"Tas pats domēns","alignAbsBottom":"Absolūti apakšā","alignAbsMiddle":"Absolūti vertikāli centrēts","alignBaseline":"Pamatrindā","alignTextTop":"Teksta augšā","bgcolor":"Fona krāsa","chkFull":"Pilnekrāns","chkLoop":"Nepārtraukti","chkMenu":"Atļaut Flash izvēlni","chkPlay":"Automātiska atskaņošana","flashvars":"Flash mainīgie","hSpace":"Horizontālā telpa","properties":"Flash īpašības","propertiesTab":"Uzstādījumi","quality":"Kvalitāte","qualityAutoHigh":"Automātiski Augsta","qualityAutoLow":"Automātiski Zema","qualityBest":"Labākā","qualityHigh":"Augsta","qualityLow":"Zema","qualityMedium":"Vidēja","scale":"Mainīt izmēru","scaleAll":"Rādīt visu","scaleFit":"Precīzs izmērs","scaleNoBorder":"Bez rāmja","title":"Flash īpašības","vSpace":"Vertikālā telpa","validateHSpace":"Hspace jābūt skaitlim","validateSrc":"Lūdzu norādi hipersaiti","validateVSpace":"Vspace jābūt skaitlim","windowMode":"Loga režīms","windowModeOpaque":"Necaurspīdīgs","windowModeTransparent":"Caurspīdīgs","windowModeWindow":"Logs"},"font":{"fontSize":{"label":"Izmērs","voiceLabel":"Fonta izmeŗs","panelTitle":"Izmērs"},"label":"Šrifts","panelTitle":"Šrifts","voiceLabel":"Fonts"},"forms":{"button":{"title":"Pogas īpašības","text":"Teksts (vērtība)","type":"Tips","typeBtn":"Poga","typeSbm":"Nosūtīt","typeRst":"Atcelt"},"checkboxAndRadio":{"checkboxTitle":"Atzīmēšanas kastītes īpašības","radioTitle":"Izvēles poga īpašības","value":"Vērtība","selected":"Iezīmēts","required":"Required"},"form":{"title":"Formas īpašības","menu":"Formas īpašības","action":"Darbība","method":"Metode","encoding":"Kodējums"},"hidden":{"title":"Paslēptās teksta rindas īpašības","name":"Nosaukums","value":"Vērtība"},"select":{"title":"Iezīmēšanas lauka īpašības","selectInfo":"Informācija","opAvail":"Pieejamās iespējas","value":"Vērtība","size":"Izmērs","lines":"rindas","chkMulti":"Atļaut vairākus iezīmējumus","required":"Required","opText":"Teksts","opValue":"Vērtība","btnAdd":"Pievienot","btnModify":"Veikt izmaiņas","btnUp":"Augšup","btnDown":"Lejup","btnSetValue":"Noteikt kā iezīmēto vērtību","btnDelete":"Dzēst"},"textarea":{"title":"Teksta laukuma īpašības","cols":"Kolonnas","rows":"Rindas"},"textfield":{"title":"Teksta rindas  īpašības","name":"Nosaukums","value":"Vērtība","charWidth":"Simbolu platums","maxChars":"Simbolu maksimālais daudzums","required":"Required","type":"Tips","typeText":"Teksts","typePass":"Parole","typeEmail":"Epasts","typeSearch":"Meklēt","typeTel":"Tālruņa numurs","typeUrl":"Adrese"}},"format":{"label":"Formāts","panelTitle":"Formāts","tag_address":"Adrese","tag_div":"Rindkopa (DIV)","tag_h1":"Virsraksts 1","tag_h2":"Virsraksts 2","tag_h3":"Virsraksts 3","tag_h4":"Virsraksts 4","tag_h5":"Virsraksts 5","tag_h6":"Virsraksts 6","tag_p":"Normāls teksts","tag_pre":"Formatēts teksts"},"horizontalrule":{"toolbar":"Ievietot horizontālu Atdalītājsvītru"},"iframe":{"border":"Rādīt rāmi","noUrl":"Norādiet iframe adresi","scrolling":"Atļaut ritjoslas","title":"IFrame uzstādījumi","toolbar":"IFrame"},"image":{"alt":"Alternatīvais teksts","border":"Rāmis","btnUpload":"Nosūtīt serverim","button2Img":"Vai vēlaties pārveidot izvēlēto attēla pogu uz attēla?","hSpace":"Horizontālā telpa","img2Button":"Vai vēlaties pārveidot izvēlēto attēlu uz attēla pogas?","infoTab":"Informācija par attēlu","linkTab":"Hipersaite","lockRatio":"Nemainīga Augstuma/Platuma attiecība","menu":"Attēla īpašības","resetSize":"Atjaunot sākotnējo izmēru","title":"Attēla īpašības","titleButton":"Attēlpogas īpašības","upload":"Augšupielādēt","urlMissing":"Trūkst attēla atrašanās adrese.","vSpace":"Vertikālā telpa","validateBorder":"Apmalei jābūt veselam skaitlim","validateHSpace":"HSpace jābūt veselam skaitlim","validateVSpace":"VSpace jābūt veselam skaitlim"},"indent":{"indent":"Palielināt atkāpi","outdent":"Samazināt atkāpi"},"smiley":{"options":"Smaidiņu uzstādījumi","title":"Ievietot smaidiņu","toolbar":"Smaidiņi"},"justify":{"block":"Izlīdzināt malas","center":"Izlīdzināt pret centru","left":"Izlīdzināt pa kreisi","right":"Izlīdzināt pa labi"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Pieejas taustiņš","advanced":"Izvērstais","advisoryContentType":"Konsultatīvs satura tips","advisoryTitle":"Konsultatīvs virsraksts","anchor":{"toolbar":"Ievietot/Labot iezīmi","menu":"Labot iezīmi","title":"Iezīmes uzstādījumi","name":"Iezīmes nosaukums","errorName":"Lūdzu norādiet iezīmes nosaukumu","remove":"Noņemt iezīmi"},"anchorId":"Pēc elementa ID","anchorName":"Pēc iezīmes nosaukuma","charset":"Pievienotā resursa kodējums","cssClasses":"Stilu saraksta klases","emailAddress":"E-pasta adrese","emailBody":"Ziņas saturs","emailSubject":"Ziņas tēma","id":"ID","info":"Hipersaites informācija","langCode":"Valodas kods","langDir":"Valodas lasīšanas virziens","langDirLTR":"No kreisās uz labo (LTR)","langDirRTL":"No labās uz kreiso (RTL)","menu":"Labot hipersaiti","name":"Nosaukums","noAnchors":"(Šajā dokumentā nav iezīmju)","noEmail":"Lūdzu norādi e-pasta adresi","noUrl":"Lūdzu norādi hipersaiti","other":"<cits>","popupDependent":"Atkarīgs (Netscape)","popupFeatures":"Uznirstošā loga nosaukums īpašības","popupFullScreen":"Pilnā ekrānā (IE)","popupLeft":"Kreisā koordināte","popupLocationBar":"Atrašanās vietas josla","popupMenuBar":"Izvēlnes josla","popupResizable":"Mērogojams","popupScrollBars":"Ritjoslas","popupStatusBar":"Statusa josla","popupToolbar":"Rīku josla","popupTop":"Augšējā koordināte","rel":"Relācija","selectAnchor":"Izvēlēties iezīmi","styles":"Stils","tabIndex":"Ciļņu indekss","target":"Mērķis","targetFrame":"<ietvars>","targetFrameName":"Mērķa ietvara nosaukums","targetPopup":"<uznirstošā logā>","targetPopupName":"Uznirstošā loga nosaukums","title":"Hipersaite","toAnchor":"Iezīme šajā lapā","toEmail":"E-pasts","toUrl":"Adrese","toolbar":"Ievietot/Labot hipersaiti","type":"Hipersaites tips","unlink":"Noņemt hipersaiti","upload":"Augšupielādēt"},"list":{"bulletedlist":"Pievienot/Noņemt vienkāršu sarakstu","numberedlist":"Numurēts saraksts"},"liststyle":{"armenian":"Armēņu skaitļi","bulletedTitle":"Vienkārša saraksta uzstādījumi","circle":"Aplis","decimal":"Decimālie (1, 2, 3, utt)","decimalLeadingZero":"Decimālie ar nulli (01, 02, 03, utt)","disc":"Disks","georgian":"Gruzīņu skaitļi (an, ban, gan, utt)","lowerAlpha":"Mazie alfabēta (a, b, c, d, e, utt)","lowerGreek":"Mazie grieķu (alfa, beta, gamma, utt)","lowerRoman":"Mazie romāņu (i, ii, iii, iv, v, utt)","none":"Nekas","notset":"<nav norādīts>","numberedTitle":"Numurēta saraksta uzstādījumi","square":"Kvadrāts","start":"Sākt","type":"Tips","upperAlpha":"Lielie alfabēta (A, B, C, D, E, utt)","upperRoman":"Lielie romāņu (I, II, III, IV, V, utt)","validateStartNumber":"Saraksta sākuma numuram jābūt veselam skaitlim"},"magicline":{"title":"Ievietot šeit rindkopu"},"maximize":{"maximize":"Maksimizēt","minimize":"Minimizēt"},"newpage":{"toolbar":"Jauna lapa"},"pagebreak":{"alt":"Lapas pārnesums","toolbar":"Ievietot lapas pārtraukumu drukai"},"pastetext":{"button":"Ievietot kā vienkāršu tekstu","title":"Ievietot kā vienkāršu tekstu"},"pastefromword":{"confirmCleanup":"Teksts, kuru vēlaties ielīmēt, izskatās ir nokopēts no Word. Vai vēlaties to iztīrīt pirms ielīmēšanas?","error":"Iekšējas kļūdas dēļ, neizdevās iztīrīt ielīmētos datus.","title":"Ievietot no Worda","toolbar":"Ievietot no Worda"},"preview":{"preview":"Priekšskatīt"},"print":{"toolbar":"Drukāt"},"removeformat":{"toolbar":"Noņemt stilus"},"save":{"toolbar":"Saglabāt"},"selectall":{"toolbar":"Iezīmēt visu"},"showblocks":{"toolbar":"Parādīt blokus"},"sourcearea":{"toolbar":"HTML kods"},"specialchar":{"options":"Speciālo simbolu uzstādījumi","title":"Ievietot īpašu simbolu","toolbar":"Ievietot speciālo simbolu"},"scayt":{"btn_about":"Par SCAYT","btn_dictionaries":"Vārdnīcas","btn_disable":"Atslēgt SCAYT","btn_enable":"Ieslēgt SCAYT","btn_langs":"Valodas","btn_options":"Uzstādījumi","text_title":"Pārbaudīt gramatiku rakstot"},"stylescombo":{"label":"Stils","panelTitle":"Formatēšanas stili","panelTitle1":"Bloka stili","panelTitle2":"iekļautie stili","panelTitle3":"Objekta stili"},"table":{"border":"Rāmja izmērs","caption":"Leģenda","cell":{"menu":"Šūna","insertBefore":"Pievienot šūnu pirms","insertAfter":"Pievienot šūnu pēc","deleteCell":"Dzēst rūtiņas","merge":"Apvienot rūtiņas","mergeRight":"Apvieno pa labi","mergeDown":"Apvienot uz leju","splitHorizontal":"Sadalīt šūnu horizontāli","splitVertical":"Sadalīt šūnu vertikāli","title":"Šūnas uzstādījumi","cellType":"Šūnas tips","rowSpan":"Apvienotas rindas","colSpan":"Apvienotas kolonas","wordWrap":"Vārdu pārnese","hAlign":"Horizontālais novietojums","vAlign":"Vertikālais novietojums","alignBaseline":"Pamatrinda","bgColor":"Fona krāsa","borderColor":"Rāmja krāsa","data":"Dati","header":"Virsraksts","yes":"Jā","no":"Nē","invalidWidth":"Šūnas platumam jābūt skaitlim","invalidHeight":"Šūnas augstumam jābūt skaitlim","invalidRowSpan":"Apvienojamo rindu skaitam jābūt veselam skaitlim","invalidColSpan":"Apvienojamo kolonu skaitam jābūt veselam skaitlim","chooseColor":"Izvēlēties"},"cellPad":"Rūtiņu nobīde","cellSpace":"Rūtiņu atstatums","column":{"menu":"Kolonna","insertBefore":"Ievietot kolonu pirms","insertAfter":"Ievieto kolonu pēc","deleteColumn":"Dzēst kolonnas"},"columns":"Kolonnas","deleteTable":"Dzēst tabulu","headers":"Virsraksti","headersBoth":"Abi","headersColumn":"Pirmā kolona","headersNone":"Nekas","headersRow":"Pirmā rinda","invalidBorder":"Rāmju izmēram jābūt skaitlim","invalidCellPadding":"Šūnu atkāpēm jābūt pozitīvam skaitlim","invalidCellSpacing":"Šūnu atstarpēm jābūt pozitīvam skaitlim","invalidCols":"Kolonu skaitam jābūt lielākam par 0","invalidHeight":"Tabulas augstumam jābūt skaitlim","invalidRows":"Rindu skaitam jābūt lielākam par 0","invalidWidth":"Tabulas platumam jābūt skaitlim","menu":"Tabulas īpašības","row":{"menu":"Rinda","insertBefore":"Ievietot rindu pirms","insertAfter":"Ievietot rindu pēc","deleteRow":"Dzēst rindas"},"rows":"Rindas","summary":"Anotācija","title":"Tabulas īpašības","toolbar":"Tabula","widthPc":"procentuāli","widthPx":"pikseļos","widthUnit":"platuma mērvienība"},"undo":{"redo":"Atkārtot","undo":"Atcelt"},"wsc":{"btnIgnore":"Ignorēt","btnIgnoreAll":"Ignorēt visu","btnReplace":"Aizvietot","btnReplaceAll":"Aizvietot visu","btnUndo":"Atcelt","changeTo":"Nomainīt uz","errorLoading":"Kļūda ielādējot aplikācijas servisa adresi: %s.","ieSpellDownload":"Pareizrakstības pārbaudītājs nav pievienots. Vai vēlaties to lejupielādēt tagad?","manyChanges":"Pareizrakstības pārbaude pabeigta: %1 vārdi tika mainīti","noChanges":"Pareizrakstības pārbaude pabeigta: nekas netika labots","noMispell":"Pareizrakstības pārbaude pabeigta: kļūdas netika atrastas","noSuggestions":"- Nav ieteikumu -","notAvailable":"Atvainojiet, bet serviss šobrīd nav pieejams.","notInDic":"Netika atrasts vārdnīcā","oneChange":"Pareizrakstības pārbaude pabeigta: 1 vārds izmainīts","progress":"Notiek pareizrakstības pārbaude...","title":"Pārbaudīt gramatiku","toolbar":"Pareizrakstības pārbaude"}};
\ No newline at end of file
+CKEDITOR.lang['lv']={"editor":"Bagātinātā teksta redaktors","editorPanel":"Bagātinātā teksta redaktora panelis","common":{"editorHelp":"Palīdzībai, nospiediet ALT 0 ","browseServer":"Skatīt servera saturu","url":"URL","protocol":"Protokols","upload":"Augšupielādēt","uploadSubmit":"Nosūtīt serverim","image":"Attēls","flash":"Flash","form":"Forma","checkbox":"Atzīmēšanas kastīte","radio":"Izvēles poga","textField":"Teksta rinda","textarea":"Teksta laukums","hiddenField":"Paslēpta teksta rinda","button":"Poga","select":"Iezīmēšanas lauks","imageButton":"Attēlpoga","notSet":"<nav iestatīts>","id":"Id","name":"Nosaukums","langDir":"Valodas lasīšanas virziens","langDirLtr":"No kreisās uz labo (LTR)","langDirRtl":"No labās uz kreiso (RTL)","langCode":"Valodas kods","longDescr":"Gara apraksta Hipersaite","cssClass":"Stilu saraksta klases","advisoryTitle":"Konsultatīvs virsraksts","cssStyle":"Stils","ok":"Darīts!","cancel":"Atcelt","close":"Aizvērt","preview":"Priekšskatījums","resize":"Mērogot","generalTab":"Vispārīgi","advancedTab":"Izvērstais","validateNumberFailed":"Šī vērtība nav skaitlis","confirmNewPage":"Jebkuras nesaglabātās izmaiņas tiks zaudētas. Vai tiešām vēlaties atvērt jaunu lapu?","confirmCancel":"Daži no uzstādījumiem ir mainīti. Vai tiešām vēlaties aizvērt šo dialogu?","options":"Uzstādījumi","target":"Mērķis","targetNew":"Jauns logs (_blank)","targetTop":"Virsējais logs (_top)","targetSelf":"Tas pats logs (_self)","targetParent":"Avota logs (_parent)","langDirLTR":"Kreisais uz Labo (LTR)","langDirRTL":"Labais uz Kreiso (RTL)","styles":"Stils","cssClasses":"Stilu klases","width":"Platums","height":"Augstums","align":"Nolīdzināt","alignLeft":"Pa kreisi","alignRight":"Pa labi","alignCenter":"Centrēti","alignJustify":"Izlīdzināt malas","alignTop":"Augšā","alignMiddle":"Vertikāli centrēts","alignBottom":"Apakšā","alignNone":"Nekas","invalidValue":"Nekorekta vērtība","invalidHeight":"Augstumam jābūt skaitlim.","invalidWidth":"Platumam jābūt skaitlim","invalidCssLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām CSS mērvienībām (px, %, in, cm, mm, em, ex, pt, vai pc).","invalidHtmlLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām HTML mērvienībām (px vai %).","invalidInlineStyle":"Iekļautajā stilā norādītajai vērtībai jāsastāv no viena vai vairākiem pāriem pēc forma'ta \"nosaukums: vērtība\", atdalītiem ar semikolu.","cssLengthTooltip":"Ievadiet vērtību pikseļos vai skaitli ar derīgu CSS mērvienību (px, %, in, cm, mm, em, ex, pt, vai pc).","unavailable":"%1<span class=\"cke_accessibility\">, nav pieejams</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Kopēšanas tiesības &copy; $1. Visas tiesības rezervētas.","dlgTitle":"Par CKEditor","help":"Pārbaudiet $1 palīdzībai.","moreInfo":"Informācijai par licenzēšanu apmeklējiet mūsu mājas lapu:","title":"Par CKEditor","userGuide":"CKEditor Lietotāja pamācība"},"basicstyles":{"bold":"Treknināts","italic":"Kursīvs","strike":"Pārsvītrots","subscript":"Apakšrakstā","superscript":"Augšrakstā","underline":"Pasvītrots"},"bidi":{"ltr":"Teksta virziens no kreisās uz labo","rtl":"Teksta virziens no labās uz kreiso"},"blockquote":{"toolbar":"Bloka citāts"},"clipboard":{"copy":"Kopēt","copyError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt kopēšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+C), lai veiktu šo darbību.","cut":"Izgriezt","cutError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt izgriezšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+X), lai veiktu šo darbību.","paste":"Ielīmēt","pasteArea":"Ielīmēšanas zona","pasteMsg":"Lūdzu, ievietojiet tekstu šajā laukumā, izmantojot klaviatūru (<STRONG>Ctrl/Cmd+V</STRONG>) un apstipriniet ar <STRONG>Darīts!</STRONG>.","securityMsg":"Jūsu pārlūka drošības uzstādījumu dēļ, nav iespējams tieši piekļūt jūsu starpliktuvei. Jums jāielīmē atkārtoti šajā logā.","title":"Ievietot"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automātiska","bgColorTitle":"Fona krāsa","colors":{"000":"Melns","800000":"Sarkanbrūns","8B4513":"Sedlu brūns","2F4F4F":"Tumšas tāfeles pelēks","008080":"Zili-zaļš","000080":"Jūras","4B0082":"Indigo","696969":"Tumši pelēks","B22222":"Ķieģeļsarkans","A52A2A":"Brūns","DAA520":"Zelta","006400":"Tumši zaļš","40E0D0":"Tirkīzs","0000CD":"Vidēji zils","800080":"Purpurs","808080":"Pelēks","F00":"Sarkans","FF8C00":"Tumši oranžs","FFD700":"Zelta","008000":"Zaļš","0FF":"Tumšzils","00F":"Zils","EE82EE":"Violets","A9A9A9":"Pelēks","FFA07A":"Gaiši laškrāsas","FFA500":"Oranžs","FFFF00":"Dzeltens","00FF00":"Laima","AFEEEE":"Gaiši tirkīza","ADD8E6":"Gaiši zils","DDA0DD":"Plūmju","D3D3D3":"Gaiši pelēks","FFF0F5":"Lavandas sārts","FAEBD7":"Antīki balts","FFFFE0":"Gaiši dzeltens","F0FFF0":"Meduspile","F0FFFF":"Debesszils","F0F8FF":"Alises zils","E6E6FA":"Lavanda","FFF":"Balts","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Plašāka palete...","panelTitle":"Krāsa","textColorTitle":"Teksta krāsa"},"colordialog":{"clear":"Notīrīt","highlight":"Paraugs","options":"Krāsas uzstādījumi","selected":"Izvēlētā krāsa","title":"Izvēlies krāsu"},"templates":{"button":"Sagataves","emptyListMsg":"(Nav norādītas sagataves)","insertOption":"Aizvietot pašreizējo saturu","options":"Sagataves uzstādījumi","selectPromptMsg":"Lūdzu, norādiet sagatavi, ko atvērt editorā<br>(patreizējie dati tiks zaudēti):","title":"Satura sagataves"},"contextmenu":{"options":"Uznirstošās izvēlnes uzstādījumi"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Konsultatīvs virsraksts","cssClassInputLabel":"Stilu klases","edit":"Labot Div","inlineStyleInputLabel":"Iekļautais stils","langDirLTRLabel":"Kreisais uz Labo (LTR)","langDirLabel":"Valodas virziens","langDirRTLLabel":"Labais uz kreiso (RTL)","languageCodeInputLabel":"Valodas kods","remove":"Noņemt Div","styleSelectLabel":"Stils","title":"Izveidot div konteineri","toolbar":"Izveidot div konteineri"},"toolbar":{"toolbarCollapse":"Aizvērt rīkjoslu","toolbarExpand":"Atvērt rīkjoslu","toolbarGroups":{"document":"Dokuments","clipboard":"Starpliktuve/Atcelt","editing":"Labošana","forms":"Formas","basicstyles":"Pamata stili","paragraph":"Paragrāfs","links":"Saites","insert":"Ievietot","styles":"Stili","colors":"Krāsas","tools":"Rīki"},"toolbars":"Redaktora rīkjoslas"},"elementspath":{"eleLabel":"Elementa ceļš","eleTitle":"%1 elements"},"find":{"find":"Meklēt","findOptions":"Meklēt uzstādījumi","findWhat":"Meklēt:","matchCase":"Reģistrjūtīgs","matchCyclic":"Sakrist cikliski","matchWord":"Jāsakrīt pilnībā","notFoundMsg":"Norādītā frāze netika atrasta.","replace":"Nomainīt","replaceAll":"Aizvietot visu","replaceSuccessMsg":"%1 gadījums(i) aizvietoti","replaceWith":"Nomainīt uz:","title":"Meklēt un aizvietot"},"fakeobjects":{"anchor":"Iezīme","flash":"Flash animācija","hiddenfield":"Slēpts lauks","iframe":"Iframe","unknown":"Nezināms objekts"},"flash":{"access":"Skripta pieeja","accessAlways":"Vienmēr","accessNever":"Nekad","accessSameDomain":"Tas pats domēns","alignAbsBottom":"Absolūti apakšā","alignAbsMiddle":"Absolūti vertikāli centrēts","alignBaseline":"Pamatrindā","alignTextTop":"Teksta augšā","bgcolor":"Fona krāsa","chkFull":"Pilnekrāns","chkLoop":"Nepārtraukti","chkMenu":"Atļaut Flash izvēlni","chkPlay":"Automātiska atskaņošana","flashvars":"Flash mainīgie","hSpace":"Horizontālā telpa","properties":"Flash īpašības","propertiesTab":"Uzstādījumi","quality":"Kvalitāte","qualityAutoHigh":"Automātiski Augsta","qualityAutoLow":"Automātiski Zema","qualityBest":"Labākā","qualityHigh":"Augsta","qualityLow":"Zema","qualityMedium":"Vidēja","scale":"Mainīt izmēru","scaleAll":"Rādīt visu","scaleFit":"Precīzs izmērs","scaleNoBorder":"Bez rāmja","title":"Flash īpašības","vSpace":"Vertikālā telpa","validateHSpace":"Hspace jābūt skaitlim","validateSrc":"Lūdzu norādi hipersaiti","validateVSpace":"Vspace jābūt skaitlim","windowMode":"Loga režīms","windowModeOpaque":"Necaurspīdīgs","windowModeTransparent":"Caurspīdīgs","windowModeWindow":"Logs"},"font":{"fontSize":{"label":"Izmērs","voiceLabel":"Fonta izmeŗs","panelTitle":"Izmērs"},"label":"Šrifts","panelTitle":"Šrifts","voiceLabel":"Fonts"},"forms":{"button":{"title":"Pogas īpašības","text":"Teksts (vērtība)","type":"Tips","typeBtn":"Poga","typeSbm":"Nosūtīt","typeRst":"Atcelt"},"checkboxAndRadio":{"checkboxTitle":"Atzīmēšanas kastītes īpašības","radioTitle":"Izvēles poga īpašības","value":"Vērtība","selected":"Iezīmēts","required":"Required"},"form":{"title":"Formas īpašības","menu":"Formas īpašības","action":"Darbība","method":"Metode","encoding":"Kodējums"},"hidden":{"title":"Paslēptās teksta rindas īpašības","name":"Nosaukums","value":"Vērtība"},"select":{"title":"Iezīmēšanas lauka īpašības","selectInfo":"Informācija","opAvail":"Pieejamās iespējas","value":"Vērtība","size":"Izmērs","lines":"rindas","chkMulti":"Atļaut vairākus iezīmējumus","required":"Required","opText":"Teksts","opValue":"Vērtība","btnAdd":"Pievienot","btnModify":"Veikt izmaiņas","btnUp":"Augšup","btnDown":"Lejup","btnSetValue":"Noteikt kā iezīmēto vērtību","btnDelete":"Dzēst"},"textarea":{"title":"Teksta laukuma īpašības","cols":"Kolonnas","rows":"Rindas"},"textfield":{"title":"Teksta rindas  īpašības","name":"Nosaukums","value":"Vērtība","charWidth":"Simbolu platums","maxChars":"Simbolu maksimālais daudzums","required":"Required","type":"Tips","typeText":"Teksts","typePass":"Parole","typeEmail":"Epasts","typeSearch":"Meklēt","typeTel":"Tālruņa numurs","typeUrl":"Adrese"}},"format":{"label":"Formāts","panelTitle":"Formāts","tag_address":"Adrese","tag_div":"Rindkopa (DIV)","tag_h1":"Virsraksts 1","tag_h2":"Virsraksts 2","tag_h3":"Virsraksts 3","tag_h4":"Virsraksts 4","tag_h5":"Virsraksts 5","tag_h6":"Virsraksts 6","tag_p":"Normāls teksts","tag_pre":"Formatēts teksts"},"horizontalrule":{"toolbar":"Ievietot horizontālu Atdalītājsvītru"},"iframe":{"border":"Rādīt rāmi","noUrl":"Norādiet iframe adresi","scrolling":"Atļaut ritjoslas","title":"IFrame uzstādījumi","toolbar":"IFrame"},"image":{"alt":"Alternatīvais teksts","border":"Rāmis","btnUpload":"Nosūtīt serverim","button2Img":"Vai vēlaties pārveidot izvēlēto attēla pogu uz attēla?","hSpace":"Horizontālā telpa","img2Button":"Vai vēlaties pārveidot izvēlēto attēlu uz attēla pogas?","infoTab":"Informācija par attēlu","linkTab":"Hipersaite","lockRatio":"Nemainīga Augstuma/Platuma attiecība","menu":"Attēla īpašības","resetSize":"Atjaunot sākotnējo izmēru","title":"Attēla īpašības","titleButton":"Attēlpogas īpašības","upload":"Augšupielādēt","urlMissing":"Trūkst attēla atrašanās adrese.","vSpace":"Vertikālā telpa","validateBorder":"Apmalei jābūt veselam skaitlim","validateHSpace":"HSpace jābūt veselam skaitlim","validateVSpace":"VSpace jābūt veselam skaitlim"},"indent":{"indent":"Palielināt atkāpi","outdent":"Samazināt atkāpi"},"smiley":{"options":"Smaidiņu uzstādījumi","title":"Ievietot smaidiņu","toolbar":"Smaidiņi"},"justify":{"block":"Izlīdzināt malas","center":"Izlīdzināt pret centru","left":"Izlīdzināt pa kreisi","right":"Izlīdzināt pa labi"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Pieejas taustiņš","advanced":"Izvērstais","advisoryContentType":"Konsultatīvs satura tips","advisoryTitle":"Konsultatīvs virsraksts","anchor":{"toolbar":"Ievietot/Labot iezīmi","menu":"Labot iezīmi","title":"Iezīmes uzstādījumi","name":"Iezīmes nosaukums","errorName":"Lūdzu norādiet iezīmes nosaukumu","remove":"Noņemt iezīmi"},"anchorId":"Pēc elementa ID","anchorName":"Pēc iezīmes nosaukuma","charset":"Pievienotā resursa kodējums","cssClasses":"Stilu saraksta klases","download":"Force Download","displayText":"Display Text","emailAddress":"E-pasta adrese","emailBody":"Ziņas saturs","emailSubject":"Ziņas tēma","id":"ID","info":"Hipersaites informācija","langCode":"Valodas kods","langDir":"Valodas lasīšanas virziens","langDirLTR":"No kreisās uz labo (LTR)","langDirRTL":"No labās uz kreiso (RTL)","menu":"Labot hipersaiti","name":"Nosaukums","noAnchors":"(Šajā dokumentā nav iezīmju)","noEmail":"Lūdzu norādi e-pasta adresi","noUrl":"Lūdzu norādi hipersaiti","other":"<cits>","popupDependent":"Atkarīgs (Netscape)","popupFeatures":"Uznirstošā loga nosaukums īpašības","popupFullScreen":"Pilnā ekrānā (IE)","popupLeft":"Kreisā koordināte","popupLocationBar":"Atrašanās vietas josla","popupMenuBar":"Izvēlnes josla","popupResizable":"Mērogojams","popupScrollBars":"Ritjoslas","popupStatusBar":"Statusa josla","popupToolbar":"Rīku josla","popupTop":"Augšējā koordināte","rel":"Relācija","selectAnchor":"Izvēlēties iezīmi","styles":"Stils","tabIndex":"Ciļņu indekss","target":"Mērķis","targetFrame":"<ietvars>","targetFrameName":"Mērķa ietvara nosaukums","targetPopup":"<uznirstošā logā>","targetPopupName":"Uznirstošā loga nosaukums","title":"Hipersaite","toAnchor":"Iezīme šajā lapā","toEmail":"E-pasts","toUrl":"Adrese","toolbar":"Ievietot/Labot hipersaiti","type":"Hipersaites tips","unlink":"Noņemt hipersaiti","upload":"Augšupielādēt"},"list":{"bulletedlist":"Pievienot/Noņemt vienkāršu sarakstu","numberedlist":"Numurēts saraksts"},"liststyle":{"armenian":"Armēņu skaitļi","bulletedTitle":"Vienkārša saraksta uzstādījumi","circle":"Aplis","decimal":"Decimālie (1, 2, 3, utt)","decimalLeadingZero":"Decimālie ar nulli (01, 02, 03, utt)","disc":"Disks","georgian":"Gruzīņu skaitļi (an, ban, gan, utt)","lowerAlpha":"Mazie alfabēta (a, b, c, d, e, utt)","lowerGreek":"Mazie grieķu (alfa, beta, gamma, utt)","lowerRoman":"Mazie romāņu (i, ii, iii, iv, v, utt)","none":"Nekas","notset":"<nav norādīts>","numberedTitle":"Numurēta saraksta uzstādījumi","square":"Kvadrāts","start":"Sākt","type":"Tips","upperAlpha":"Lielie alfabēta (A, B, C, D, E, utt)","upperRoman":"Lielie romāņu (I, II, III, IV, V, utt)","validateStartNumber":"Saraksta sākuma numuram jābūt veselam skaitlim"},"magicline":{"title":"Ievietot šeit rindkopu"},"maximize":{"maximize":"Maksimizēt","minimize":"Minimizēt"},"newpage":{"toolbar":"Jauna lapa"},"pagebreak":{"alt":"Lapas pārnesums","toolbar":"Ievietot lapas pārtraukumu drukai"},"pastetext":{"button":"Ievietot kā vienkāršu tekstu","title":"Ievietot kā vienkāršu tekstu"},"pastefromword":{"confirmCleanup":"Teksts, kuru vēlaties ielīmēt, izskatās ir nokopēts no Word. Vai vēlaties to iztīrīt pirms ielīmēšanas?","error":"Iekšējas kļūdas dēļ, neizdevās iztīrīt ielīmētos datus.","title":"Ievietot no Worda","toolbar":"Ievietot no Worda"},"preview":{"preview":"Priekšskatīt"},"print":{"toolbar":"Drukāt"},"removeformat":{"toolbar":"Noņemt stilus"},"save":{"toolbar":"Saglabāt"},"selectall":{"toolbar":"Iezīmēt visu"},"showblocks":{"toolbar":"Parādīt blokus"},"sourcearea":{"toolbar":"HTML kods"},"specialchar":{"options":"Speciālo simbolu uzstādījumi","title":"Ievietot īpašu simbolu","toolbar":"Ievietot speciālo simbolu"},"scayt":{"btn_about":"Par SCAYT","btn_dictionaries":"Vārdnīcas","btn_disable":"Atslēgt SCAYT","btn_enable":"Ieslēgt SCAYT","btn_langs":"Valodas","btn_options":"Uzstādījumi","text_title":"Pārbaudīt gramatiku rakstot"},"stylescombo":{"label":"Stils","panelTitle":"Formatēšanas stili","panelTitle1":"Bloka stili","panelTitle2":"iekļautie stili","panelTitle3":"Objekta stili"},"table":{"border":"Rāmja izmērs","caption":"Leģenda","cell":{"menu":"Šūna","insertBefore":"Pievienot šūnu pirms","insertAfter":"Pievienot šūnu pēc","deleteCell":"Dzēst rūtiņas","merge":"Apvienot rūtiņas","mergeRight":"Apvieno pa labi","mergeDown":"Apvienot uz leju","splitHorizontal":"Sadalīt šūnu horizontāli","splitVertical":"Sadalīt šūnu vertikāli","title":"Šūnas uzstādījumi","cellType":"Šūnas tips","rowSpan":"Apvienotas rindas","colSpan":"Apvienotas kolonas","wordWrap":"Vārdu pārnese","hAlign":"Horizontālais novietojums","vAlign":"Vertikālais novietojums","alignBaseline":"Pamatrinda","bgColor":"Fona krāsa","borderColor":"Rāmja krāsa","data":"Dati","header":"Virsraksts","yes":"Jā","no":"Nē","invalidWidth":"Šūnas platumam jābūt skaitlim","invalidHeight":"Šūnas augstumam jābūt skaitlim","invalidRowSpan":"Apvienojamo rindu skaitam jābūt veselam skaitlim","invalidColSpan":"Apvienojamo kolonu skaitam jābūt veselam skaitlim","chooseColor":"Izvēlēties"},"cellPad":"Rūtiņu nobīde","cellSpace":"Rūtiņu atstatums","column":{"menu":"Kolonna","insertBefore":"Ievietot kolonu pirms","insertAfter":"Ievieto kolonu pēc","deleteColumn":"Dzēst kolonnas"},"columns":"Kolonnas","deleteTable":"Dzēst tabulu","headers":"Virsraksti","headersBoth":"Abi","headersColumn":"Pirmā kolona","headersNone":"Nekas","headersRow":"Pirmā rinda","invalidBorder":"Rāmju izmēram jābūt skaitlim","invalidCellPadding":"Šūnu atkāpēm jābūt pozitīvam skaitlim","invalidCellSpacing":"Šūnu atstarpēm jābūt pozitīvam skaitlim","invalidCols":"Kolonu skaitam jābūt lielākam par 0","invalidHeight":"Tabulas augstumam jābūt skaitlim","invalidRows":"Rindu skaitam jābūt lielākam par 0","invalidWidth":"Tabulas platumam jābūt skaitlim","menu":"Tabulas īpašības","row":{"menu":"Rinda","insertBefore":"Ievietot rindu pirms","insertAfter":"Ievietot rindu pēc","deleteRow":"Dzēst rindas"},"rows":"Rindas","summary":"Anotācija","title":"Tabulas īpašības","toolbar":"Tabula","widthPc":"procentuāli","widthPx":"pikseļos","widthUnit":"platuma mērvienība"},"undo":{"redo":"Atkārtot","undo":"Atcelt"},"wsc":{"btnIgnore":"Ignorēt","btnIgnoreAll":"Ignorēt visu","btnReplace":"Aizvietot","btnReplaceAll":"Aizvietot visu","btnUndo":"Atcelt","changeTo":"Nomainīt uz","errorLoading":"Kļūda ielādējot aplikācijas servisa adresi: %s.","ieSpellDownload":"Pareizrakstības pārbaudītājs nav pievienots. Vai vēlaties to lejupielādēt tagad?","manyChanges":"Pareizrakstības pārbaude pabeigta: %1 vārdi tika mainīti","noChanges":"Pareizrakstības pārbaude pabeigta: nekas netika labots","noMispell":"Pareizrakstības pārbaude pabeigta: kļūdas netika atrastas","noSuggestions":"- Nav ieteikumu -","notAvailable":"Atvainojiet, bet serviss šobrīd nav pieejams.","notInDic":"Netika atrasts vārdnīcā","oneChange":"Pareizrakstības pārbaude pabeigta: 1 vārds izmainīts","progress":"Notiek pareizrakstības pārbaude...","title":"Pārbaudīt gramatiku","toolbar":"Pareizrakstības pārbaude"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/lang/mk.js
index 98430bb4f48..0cc76a2ce84 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/mk.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/mk.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['mk']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Притисни ALT 0 за помош","browseServer":"Пребарај низ серверот","url":"URL","protocol":"Протокол","upload":"Прикачи","uploadSubmit":"Прикачи на сервер","image":"Слика","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Поле за текст","textarea":"Големо поле за текст","hiddenField":"Скриено поле","button":"Button","select":"Selection Field","imageButton":"Копче-слика","notSet":"<not set>","id":"Id","name":"Name","langDir":"Насока на јазик","langDirLtr":"Лево кон десно","langDirRtl":"Десно кон лево","langCode":"Код на јазик","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Стил","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"Општо","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Опции","target":"Target","targetNew":"Нов прозорец (_blank)","targetTop":"Најгорниот прозорец (_top)","targetSelf":"Истиот прозорец (_self)","targetParent":"Прозорец-родител (_parent)","langDirLTR":"Лево кон десно","langDirRTL":"Десно кон лево","styles":"Стил","cssClasses":"Stylesheet Classes","width":"Широчина","height":"Височина","align":"Alignment","alignLeft":"Лево","alignRight":"Десно","alignCenter":"Во средина","alignJustify":"Justify","alignTop":"Горе","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"Никое","invalidValue":"Невалидна вредност","invalidHeight":"Височината мора да биде број.","invalidWidth":"Широчината мора да биде број.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Авторски права &copy; $1. Сите права се задржани.","dlgTitle":"За CKEditor","help":"Отворете $1 за помош.","moreInfo":"За информации околу лиценцата, ве молиме посетете го нашиот веб-сајт: ","title":"За CKEditor","userGuide":"CKEditor упатство за корисници"},"basicstyles":{"bold":"Здебелено","italic":"Накривено","strike":"Прецртано","subscript":"Долен индекс","superscript":"Горен индекс","underline":"Подвлечено"},"bidi":{"ltr":"Насока на текст: од лево кон десно","rtl":"Насока на текст: од десно кон лево"},"blockquote":{"toolbar":"Одвоен цитат"},"clipboard":{"copy":"Копирај (Copy)","copyError":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот автоматски да изврши копирање. Ве молиме употребете ја тастатурата. (Ctrl/Cmd+C)","cut":"Исечи (Cut)","cutError":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот автоматски да изврши сечење. Ве молиме употребете ја тастатурата. (Ctrl/Cmd+C)","paste":"Залепи (Paste)","pasteArea":"Простор за залепување","pasteMsg":"Ве молиме да залепите во следниот квадрат користејќи ја тастатурата (<string>Ctrl/Cmd+V</string>) и да притиснете OK","securityMsg":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот директно да пристапи до копираните податоци. Потребно е повторно да се обидете во овој прозорец.","title":"Залепи (Paste)"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Color","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"More Colors...","panelTitle":"Colors","textColorTitle":"Text Color"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Контекст-мени опции"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Лево кон десно","langDirLabel":"Насока на јазик","langDirRTLLabel":"Десно кон лево","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Стил","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Пронајди","findOptions":"Опции за пронаоѓање","findWhat":"Што барате:","matchCase":"Се совпаѓа голема/мала буква,","matchCyclic":"Пребарај циклично","matchWord":"Се совпаѓа цел збор","notFoundMsg":"Внесениот текст не беше пронајден.","replace":"Замени","replaceAll":"Замени ги сите","replaceSuccessMsg":"%1 случај/и беа заменети.","replaceWith":"Замени со:","title":"Пронајди и замени"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Скриено поле","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Baseline","alignTextTop":"Text Top","bgcolor":"Background color","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"Хоризонтален простор","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"Вертикален простор","validateHSpace":"HSpace must be a number.","validateSrc":"URL must not be empty.","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Алтернативен текст","border":"Раб","btnUpload":"Прикачи на сервер","button2Img":"Дали сакате да направите сликата-копче да биде само слика?","hSpace":"Хоризонтален простор","img2Button":"Дали сакате да ја претворите сликата во слика-копче?","infoTab":"Информации за сликата","linkTab":"Врска","lockRatio":"Зачувај пропорција","menu":"Својства на сликата","resetSize":"Ресетирај големина","title":"Својства на сликата","titleButton":"Својства на копче-сликата","upload":"Прикачи","urlMissing":"Недостасува URL-то на сликата.","vSpace":"Вертикален простор","validateBorder":"Работ мора да биде цел број.","validateHSpace":"Хор. простор мора да биде цел број.","validateVSpace":"Верт. простор мора да биде цел број."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"justify":{"block":"Justify","center":"Во средина","left":"Align Left","right":"Align Right"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Код на јазик","langDir":"Насока на јазик","langDirLTR":"Лево кон десно","langDirRTL":"Десно кон лево","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Стил","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Врска","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Врска","type":"Link Type","unlink":"Unlink","upload":"Прикачи"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
+CKEDITOR.lang['mk']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Притисни ALT 0 за помош","browseServer":"Пребарај низ серверот","url":"URL","protocol":"Протокол","upload":"Прикачи","uploadSubmit":"Прикачи на сервер","image":"Слика","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Поле за текст","textarea":"Големо поле за текст","hiddenField":"Скриено поле","button":"Button","select":"Selection Field","imageButton":"Копче-слика","notSet":"<not set>","id":"Id","name":"Name","langDir":"Насока на јазик","langDirLtr":"Лево кон десно","langDirRtl":"Десно кон лево","langCode":"Код на јазик","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Стил","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"Општо","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Опции","target":"Target","targetNew":"Нов прозорец (_blank)","targetTop":"Најгорниот прозорец (_top)","targetSelf":"Истиот прозорец (_self)","targetParent":"Прозорец-родител (_parent)","langDirLTR":"Лево кон десно","langDirRTL":"Десно кон лево","styles":"Стил","cssClasses":"Stylesheet Classes","width":"Широчина","height":"Височина","align":"Alignment","alignLeft":"Лево","alignRight":"Десно","alignCenter":"Во средина","alignJustify":"Justify","alignTop":"Горе","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"Никое","invalidValue":"Невалидна вредност","invalidHeight":"Височината мора да биде број.","invalidWidth":"Широчината мора да биде број.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Авторски права &copy; $1. Сите права се задржани.","dlgTitle":"За CKEditor","help":"Отворете $1 за помош.","moreInfo":"За информации околу лиценцата, ве молиме посетете го нашиот веб-сајт: ","title":"За CKEditor","userGuide":"CKEditor упатство за корисници"},"basicstyles":{"bold":"Здебелено","italic":"Накривено","strike":"Прецртано","subscript":"Долен индекс","superscript":"Горен индекс","underline":"Подвлечено"},"bidi":{"ltr":"Насока на текст: од лево кон десно","rtl":"Насока на текст: од десно кон лево"},"blockquote":{"toolbar":"Одвоен цитат"},"clipboard":{"copy":"Копирај (Copy)","copyError":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот автоматски да изврши копирање. Ве молиме употребете ја тастатурата. (Ctrl/Cmd+C)","cut":"Исечи (Cut)","cutError":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот автоматски да изврши сечење. Ве молиме употребете ја тастатурата. (Ctrl/Cmd+C)","paste":"Залепи (Paste)","pasteArea":"Простор за залепување","pasteMsg":"Ве молиме да залепите во следниот квадрат користејќи ја тастатурата (<string>Ctrl/Cmd+V</string>) и да притиснете OK","securityMsg":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот директно да пристапи до копираните податоци. Потребно е повторно да се обидете во овој прозорец.","title":"Залепи (Paste)"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Color","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colors...","panelTitle":"Colors","textColorTitle":"Text Color"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Контекст-мени опции"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Лево кон десно","langDirLabel":"Насока на јазик","langDirRTLLabel":"Десно кон лево","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Стил","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Пронајди","findOptions":"Опции за пронаоѓање","findWhat":"Што барате:","matchCase":"Се совпаѓа голема/мала буква,","matchCyclic":"Пребарај циклично","matchWord":"Се совпаѓа цел збор","notFoundMsg":"Внесениот текст не беше пронајден.","replace":"Замени","replaceAll":"Замени ги сите","replaceSuccessMsg":"%1 случај/и беа заменети.","replaceWith":"Замени со:","title":"Пронајди и замени"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Скриено поле","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Baseline","alignTextTop":"Text Top","bgcolor":"Background color","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"Хоризонтален простор","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"Вертикален простор","validateHSpace":"HSpace must be a number.","validateSrc":"URL must not be empty.","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Алтернативен текст","border":"Раб","btnUpload":"Прикачи на сервер","button2Img":"Дали сакате да направите сликата-копче да биде само слика?","hSpace":"Хоризонтален простор","img2Button":"Дали сакате да ја претворите сликата во слика-копче?","infoTab":"Информации за сликата","linkTab":"Врска","lockRatio":"Зачувај пропорција","menu":"Својства на сликата","resetSize":"Ресетирај големина","title":"Својства на сликата","titleButton":"Својства на копче-сликата","upload":"Прикачи","urlMissing":"Недостасува URL-то на сликата.","vSpace":"Вертикален простор","validateBorder":"Работ мора да биде цел број.","validateHSpace":"Хор. простор мора да биде цел број.","validateVSpace":"Верт. простор мора да биде цел број."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"justify":{"block":"Justify","center":"Во средина","left":"Align Left","right":"Align Right"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Код на јазик","langDir":"Насока на јазик","langDirLTR":"Лево кон десно","langDirRTL":"Десно кон лево","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Стил","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Врска","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Врска","type":"Link Type","unlink":"Unlink","upload":"Прикачи"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/lang/mn.js
index 8e86527d88d..2cbd4f8a971 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/mn.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/mn.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['mn']={"editor":"Хэлбэрт бичвэр боловсруулагч","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Үйлчлэгч тооцоолуур (сервэр)-ийг үзэх","url":"цахим хуудасны хаяг (URL)","protocol":"Протокол","upload":"Илгээж ачаалах","uploadSubmit":"Үүнийг үйлчлэгч тооцоолуур (сервер) лүү илгээх","image":"Зураг","flash":"Флаш хөдөлгөөнтэй зураг","form":"Маягт","checkbox":"Тэмдэглээний нүд","radio":"Радио товчлуур","textField":"Бичвэрийн талбар","textarea":"Бичвэрийн зай","hiddenField":"Далд талбар","button":"Товчлуур","select":"Сонголтын талбар","imageButton":"Зургий товчуур","notSet":"<тохируулаагүй>","id":"Id (техникийн нэр)","name":"Нэр","langDir":"Хэлний чиглэл","langDirLtr":"Зүүнээс баруун (LTR)","langDirRtl":"Баруунаас зүүн (RTL)","langCode":"Хэлний код","longDescr":"Урт тайлбарын вэб хаяг","cssClass":"Хэлбэрийн хуудасны ангиуд","advisoryTitle":"Зөвлөх гарчиг","cssStyle":"Загвар","ok":"За","cancel":"Болих","close":"Хаах","preview":"Урьдчилан харах","resize":"Resize","generalTab":"Ерөнхий","advancedTab":"Гүнзгий","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Сонголт","target":"Бай","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Зүүн талаас баруун тийшээ (LTR)","langDirRTL":"Баруун талаас зүүн тийшээ (RTL)","styles":"Загвар","cssClasses":"Хэлбэрийн хуудасны ангиуд","width":"Өргөн","height":"Өндөр","align":"Эгнээ","alignLeft":"Зүүн","alignRight":"Баруун","alignCenter":"Төвд","alignJustify":"Тэгшлэх","alignTop":"Дээд талд","alignMiddle":"Дунд","alignBottom":"Доод талд","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Өндөр нь тоо байх ёстой.","invalidWidth":"Өргөн нь тоо байх ёстой.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Тод бүдүүн","italic":"Налуу","strike":"Дундуур нь зураастай болгох","subscript":"Суурь болгох","superscript":"Зэрэг болгох","underline":"Доогуур нь зураастай болгох"},"bidi":{"ltr":"Зүүнээс баруун тийш бичлэг","rtl":"Баруунаас зүүн тийш бичлэг"},"blockquote":{"toolbar":"Ишлэл хэсэг"},"clipboard":{"copy":"Хуулах","copyError":"Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хуулах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl/Cmd+C) товчны хослолыг ашиглана уу.","cut":"Хайчлах","cutError":"Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хайчлах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl/Cmd+X) товчны хослолыг ашиглана уу.","paste":"Буулгах","pasteArea":"Paste Area","pasteMsg":"(<strong>Ctrl/Cmd+V</strong>) товчийг ашиглан paste хийнэ үү. Мөн <strong>OK</strong> дар.","securityMsg":"Таны үзүүлэгч/browser/-н хамгаалалтын тохиргооноос болоод editor clipboard өгөгдөлрүү шууд хандах боломжгүй. Энэ цонход дахин paste хийхийг оролд.","title":"Буулгах"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Автоматаар","bgColorTitle":"Дэвсгэр өнгө","colors":{"000":"Хар","800000":"Хүрэн","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Саарал","F00":"Улаан","FF8C00":"Dark Orange","FFD700":"Алт","008000":"Ногоон","0FF":"Цэнхэр","00F":"Хөх","EE82EE":"Ягаан","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Улбар шар","FFFF00":"Шар","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Цайвар саарал","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Цагаан"},"more":"Нэмэлт өнгөнүүд...","panelTitle":"Өнгөнүүд","textColorTitle":"Бичвэрийн өнгө"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Загварууд","emptyListMsg":"(Загвар тодорхойлогдоогүй байна)","insertOption":"Одоогийн агууллагыг дарж бичих","options":"Template Options","selectPromptMsg":"Загварыг нээж editor-рүү сонгож оруулна уу<br />(Одоогийн агууллагыг устаж магадгүй):","title":"Загварын агуулга"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Зөвлөлдөх гарчиг","cssClassInputLabel":"Stylesheet классууд","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Зүүн талаас баруун тишээ (LTR)","langDirLabel":"Хэлний чиглэл","langDirRTLLabel":"Баруун талаас зүүн тишээ (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Загвар","title":"Div гэдэг хэсэг бий болгох","toolbar":"Div гэдэг хэсэг бий болгох"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Холбоосууд","insert":"Оруулах","styles":"Загварууд","colors":"Онгөнүүд","tools":"Хэрэгслүүд"},"toolbars":"Болосруулагчийн хэрэгслийн самбар"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Хайх","findOptions":"Хайх сонголтууд","findWhat":"Хайх үг/үсэг:","matchCase":"Тэнцэх төлөв","matchCyclic":"Match cyclic","matchWord":"Тэнцэх бүтэн үг","notFoundMsg":"Хайсан бичвэрийг олсонгүй.","replace":"Орлуулах","replaceAll":"Бүгдийг нь солих","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Солих үг:","title":"Хайж орлуулах"},"fakeobjects":{"anchor":"Зангуу","flash":"Flash Animation","hiddenfield":"Нууц талбар","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Онцлогууд","accessNever":"Хэзээ ч үгүй","accessSameDomain":"Байнга","alignAbsBottom":"Abs доод талд","alignAbsMiddle":"Abs Дунд талд","alignBaseline":"Baseline","alignTextTop":"Текст дээр","bgcolor":"Дэвсгэр өнгө","chkFull":"Allow Fullscreen","chkLoop":"Давтах","chkMenu":"Флаш цэс идвэхжүүлэх","chkPlay":"Автоматаар тоглох","flashvars":"Variables for Flash","hSpace":"Хөндлөн зай","properties":"Флаш шинж чанар","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Өргөгтгөх","scaleAll":"Бүгдийг харуулах","scaleFit":"Яг тааруулах","scaleNoBorder":"Хүрээгүй","title":"Флаш  шинж чанар","vSpace":"Босоо зай","validateHSpace":"HSpace must be a number.","validateSrc":"Линк URL-ээ төрөлжүүлнэ үү","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Хэмжээ","voiceLabel":"Үсгийн хэмжээ","panelTitle":"Үсгийн хэмжээ"},"label":"Үсгийн хэлбэр","panelTitle":"Үгсийн хэлбэрийн нэр","voiceLabel":"Үгсийн хэлбэр"},"forms":{"button":{"title":"Товчны шинж чанар","text":"Тэкст (Утга)","type":"Төрөл","typeBtn":"Товч","typeSbm":"Submit","typeRst":"Болих"},"checkboxAndRadio":{"checkboxTitle":"Чекбоксны шинж чанар","radioTitle":"Радио товчны шинж чанар","value":"Утга","selected":"Сонгогдсон","required":"Required"},"form":{"title":"Форм шинж чанар","menu":"Форм шинж чанар","action":"Үйлдэл","method":"Арга","encoding":"Encoding"},"hidden":{"title":"Нууц талбарын шинж чанар","name":"Нэр","value":"Утга"},"select":{"title":"Согогч талбарын шинж чанар","selectInfo":"Мэдээлэл","opAvail":"Идвэхтэй сонголт","value":"Утга","size":"Хэмжээ","lines":"Мөр","chkMulti":"Олон зүйл зэрэг сонгохыг зөвшөөрөх","required":"Required","opText":"Тэкст","opValue":"Утга","btnAdd":"Нэмэх","btnModify":"Өөрчлөх","btnUp":"Дээш","btnDown":"Доош","btnSetValue":"Сонгогдсан утга оноох","btnDelete":"Устгах"},"textarea":{"title":"Текст орчны шинж чанар","cols":"Багана","rows":"Мөр"},"textfield":{"title":"Текст талбарын шинж чанар","name":"Нэр","value":"Утга","charWidth":"Тэмдэгтын өргөн","maxChars":"Хамгийн их тэмдэгт","required":"Required","type":"Төрөл","typeText":"Текст","typePass":"Нууц үг","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"цахим хуудасны хаяг (URL)"}},"format":{"label":"Параргафын загвар","panelTitle":"Параргафын загвар","tag_address":"Хаяг","tag_div":"Paragraph (DIV)","tag_h1":"Гарчиг 1","tag_h2":"Гарчиг 2","tag_h3":"Гарчиг 3","tag_h4":"Гарчиг 4","tag_h5":"Гарчиг 5","tag_h6":"Гарчиг 6","tag_p":"Хэвийн","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Хөндлөн зураас оруулах"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Зургийг орлох бичвэр","border":"Хүрээ","btnUpload":"Үүнийг сервэррүү илгээ","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Хөндлөн зай","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Зурагны мэдээлэл","linkTab":"Холбоос","lockRatio":"Радио түгжих","menu":"Зураг","resetSize":"хэмжээ дахин оноох","title":"Зураг","titleButton":"Зурган товчны шинж чанар","upload":"Хуулах","urlMissing":"Зургийн эх сурвалжийн хаяг (URL) байхгүй байна.","vSpace":"Босоо зай","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Догол мөр хасах","outdent":"Догол мөр нэмэх"},"smiley":{"options":"Smiley Options","title":"Тодорхойлолт оруулах","toolbar":"Тодорхойлолт"},"justify":{"block":"Тэгшлэх","center":"Голлуулах","left":"Зүүн талд тулгах","right":"Баруун талд тулгах"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Холбох түлхүүр","advanced":"Нэмэлт","advisoryContentType":"Зөвлөлдөх төрлийн агуулга","advisoryTitle":"Зөвлөлдөх гарчиг","anchor":{"toolbar":"Зангуу","menu":"Зангууг болосруулах","title":"Зангуугийн шинж чанар","name":"Зангуугийн нэр","errorName":"Зангуугийн нэрийг оруулна уу","remove":"Зангууг устгах"},"anchorId":"Элемэнтйн Id нэрээр","anchorName":"Зангуугийн нэрээр","charset":"Тэмдэгт оноох нөөцөд холбогдсон","cssClasses":"Stylesheet классууд","emailAddress":"Э-шуудангийн хаяг","emailBody":"Зурвасны их бие","emailSubject":"Зурвасны гарчиг","id":"Id","info":"Холбоосын тухай мэдээлэл","langCode":"Хэлний код","langDir":"Хэлний чиглэл","langDirLTR":"Зүүнээс баруун (LTR)","langDirRTL":"Баруунаас зүүн (RTL)","menu":"Холбоос засварлах","name":"Нэр","noAnchors":"(Баримт бичиг зангуугүй байна)","noEmail":"Э-шуудангий хаягаа шивнэ үү","noUrl":"Холбоосны URL хаягийг шивнэ үү","other":"<other>","popupDependent":"Хамаатай (Netscape)","popupFeatures":"Popup цонхны онцлог","popupFullScreen":"Цонх дүүргэх (Internet Explorer)","popupLeft":"Зүүн байрлал","popupLocationBar":"Location хэсэг","popupMenuBar":"Цэсний самбар","popupResizable":"Resizable","popupScrollBars":"Скрол хэсэгүүд","popupStatusBar":"Статус хэсэг","popupToolbar":"Багажны самбар","popupTop":"Дээд байрлал","rel":"Relationship","selectAnchor":"Нэг зангууг сонгоно уу","styles":"Загвар","tabIndex":"Tab индекс","target":"Байрлал","targetFrame":"<Агуулах хүрээ>","targetFrameName":"Очих фремын нэр","targetPopup":"<popup цонх>","targetPopupName":"Popup цонхны нэр","title":"Холбоос","toAnchor":"Энэ бичвэр дэх зангуу руу очих холбоос","toEmail":"Э-захиа","toUrl":"цахим хуудасны хаяг (URL)","toolbar":"Холбоос","type":"Линкийн төрөл","unlink":"Холбоос авч хаях","upload":"Хуулах"},"list":{"bulletedlist":"Цэгтэй жагсаалт","numberedlist":"Дугаарлагдсан жагсаалт"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Төрөл","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Дэлгэц дүүргэх","minimize":"Цонхыг багсгаж харуулах"},"newpage":{"toolbar":"Шинэ хуудас"},"pagebreak":{"alt":"Page Break","toolbar":"Хуудас тусгаарлагч оруулах"},"pastetext":{"button":"Энгийн бичвэрээр буулгах","title":"Энгийн бичвэрээр буулгах"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Word-оос буулгах","toolbar":"Word-оос буулгах"},"preview":{"preview":"Уридчлан харах"},"print":{"toolbar":"Хэвлэх"},"removeformat":{"toolbar":"Параргафын загварыг авч хаях"},"save":{"toolbar":"Хадгалах"},"selectall":{"toolbar":"Бүгдийг нь сонгох"},"showblocks":{"toolbar":"Хавтангуудыг харуулах"},"sourcearea":{"toolbar":"Код"},"specialchar":{"options":"Special Character Options","title":"Онцгой тэмдэгт сонгох","toolbar":"Онцгой тэмдэгт оруулах"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Толь бичгүүд","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Хэлүүд","btn_options":"Сонголт","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Загвар","panelTitle":"Загвар хэлбэржүүлэх","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Хүрээний хэмжээ","caption":"Тайлбар","cell":{"menu":"Нүх/зай","insertBefore":"Нүх/зай өмнө нь оруулах","insertAfter":"Нүх/зай дараа нь оруулах","deleteCell":"Нүх устгах","merge":"Нүх нэгтэх","mergeRight":"Баруун тийш нэгтгэх","mergeDown":"Доош нэгтгэх","splitHorizontal":"Нүх/зайг босоогоор нь тусгаарлах","splitVertical":"Нүх/зайг хөндлөнгөөр нь тусгаарлах","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Хэвтээд тэгшлэх арга","vAlign":"Босоод тэгшлэх арга","alignBaseline":"Baseline","bgColor":"Дэвсгэр өнгө","borderColor":"Хүрээний өнгө","data":"Data","header":"Header","yes":"Тийм","no":"Үгүй","invalidWidth":"Нүдний өргөн нь тоо байх ёстой.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сонгох"},"cellPad":"Нүх доторлох(padding)","cellSpace":"Нүх хоорондын зай (spacing)","column":{"menu":"Багана","insertBefore":"Багана өмнө нь оруулах","insertAfter":"Багана дараа нь оруулах","deleteColumn":"Багана устгах"},"columns":"Багана","deleteTable":"Хүснэгт устгах","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Хүснэгтийн өргөн нь тоо байх ёстой.","menu":"Хүснэгт","row":{"menu":"Мөр","insertBefore":"Мөр өмнө нь оруулах","insertAfter":"Мөр дараа нь оруулах","deleteRow":"Мөр устгах"},"rows":"Мөр","summary":"Тайлбар","title":"Хүснэгт","toolbar":"Хүснэгт","widthPc":"хувь","widthPx":"цэг","widthUnit":"өргөний нэгж"},"undo":{"redo":"Өмнөх үйлдлээ сэргээх","undo":"Хүчингүй болгох"},"wsc":{"btnIgnore":"Зөвшөөрөх","btnIgnoreAll":"Бүгдийг зөвшөөрөх","btnReplace":"Солих","btnReplaceAll":"Бүгдийг Дарж бичих","btnUndo":"Буцаах","changeTo":"Өөрчлөх","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Дүрэм шалгагч суугаагүй байна. Татаж авахыг хүсч байна уу?","manyChanges":"Дүрэм шалгаад дууссан: %1 үг өөрчлөгдсөн","noChanges":"Дүрэм шалгаад дууссан: үг өөрчлөгдөөгүй","noMispell":"Дүрэм шалгаад дууссан: Алдаа олдсонгүй","noSuggestions":"- Тайлбаргүй -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Толь бичиггүй","oneChange":"Дүрэм шалгаад дууссан: 1 үг өөрчлөгдсөн","progress":"Дүрэм шалгаж байгаа үйл явц...","title":"Spell Checker","toolbar":"Үгийн дүрэх шалгах"}};
\ No newline at end of file
+CKEDITOR.lang['mn']={"editor":"Хэлбэрт бичвэр боловсруулагч","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Үйлчлэгч тооцоолуур (сервэр)-ийг үзэх","url":"цахим хуудасны хаяг (URL)","protocol":"Протокол","upload":"Илгээж ачаалах","uploadSubmit":"Үүнийг үйлчлэгч тооцоолуур (сервер) лүү илгээх","image":"Зураг","flash":"Флаш хөдөлгөөнтэй зураг","form":"Маягт","checkbox":"Тэмдэглээний нүд","radio":"Радио товчлуур","textField":"Бичвэрийн талбар","textarea":"Бичвэрийн зай","hiddenField":"Далд талбар","button":"Товчлуур","select":"Сонголтын талбар","imageButton":"Зургий товчуур","notSet":"<тохируулаагүй>","id":"Id (техникийн нэр)","name":"Нэр","langDir":"Хэлний чиглэл","langDirLtr":"Зүүнээс баруун (LTR)","langDirRtl":"Баруунаас зүүн (RTL)","langCode":"Хэлний код","longDescr":"Урт тайлбарын вэб хаяг","cssClass":"Хэлбэрийн хуудасны ангиуд","advisoryTitle":"Зөвлөх гарчиг","cssStyle":"Загвар","ok":"За","cancel":"Болих","close":"Хаах","preview":"Урьдчилан харах","resize":"Resize","generalTab":"Ерөнхий","advancedTab":"Гүнзгий","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Сонголт","target":"Бай","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Зүүн талаас баруун тийшээ (LTR)","langDirRTL":"Баруун талаас зүүн тийшээ (RTL)","styles":"Загвар","cssClasses":"Хэлбэрийн хуудасны ангиуд","width":"Өргөн","height":"Өндөр","align":"Эгнээ","alignLeft":"Зүүн","alignRight":"Баруун","alignCenter":"Төвд","alignJustify":"Тэгшлэх","alignTop":"Дээд талд","alignMiddle":"Дунд","alignBottom":"Доод талд","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Өндөр нь тоо байх ёстой.","invalidWidth":"Өргөн нь тоо байх ёстой.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Тод бүдүүн","italic":"Налуу","strike":"Дундуур нь зураастай болгох","subscript":"Суурь болгох","superscript":"Зэрэг болгох","underline":"Доогуур нь зураастай болгох"},"bidi":{"ltr":"Зүүнээс баруун тийш бичлэг","rtl":"Баруунаас зүүн тийш бичлэг"},"blockquote":{"toolbar":"Ишлэл хэсэг"},"clipboard":{"copy":"Хуулах","copyError":"Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хуулах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl/Cmd+C) товчны хослолыг ашиглана уу.","cut":"Хайчлах","cutError":"Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хайчлах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl/Cmd+X) товчны хослолыг ашиглана уу.","paste":"Буулгах","pasteArea":"Paste Area","pasteMsg":"(<strong>Ctrl/Cmd+V</strong>) товчийг ашиглан paste хийнэ үү. Мөн <strong>OK</strong> дар.","securityMsg":"Таны үзүүлэгч/browser/-н хамгаалалтын тохиргооноос болоод editor clipboard өгөгдөлрүү шууд хандах боломжгүй. Энэ цонход дахин paste хийхийг оролд.","title":"Буулгах"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Автоматаар","bgColorTitle":"Дэвсгэр өнгө","colors":{"000":"Хар","800000":"Хүрэн","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Саарал","F00":"Улаан","FF8C00":"Dark Orange","FFD700":"Алт","008000":"Ногоон","0FF":"Цэнхэр","00F":"Хөх","EE82EE":"Ягаан","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Улбар шар","FFFF00":"Шар","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Цайвар саарал","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Цагаан","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Нэмэлт өнгөнүүд...","panelTitle":"Өнгөнүүд","textColorTitle":"Бичвэрийн өнгө"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Загварууд","emptyListMsg":"(Загвар тодорхойлогдоогүй байна)","insertOption":"Одоогийн агууллагыг дарж бичих","options":"Template Options","selectPromptMsg":"Загварыг нээж editor-рүү сонгож оруулна уу<br />(Одоогийн агууллагыг устаж магадгүй):","title":"Загварын агуулга"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Зөвлөлдөх гарчиг","cssClassInputLabel":"Stylesheet классууд","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Зүүн талаас баруун тишээ (LTR)","langDirLabel":"Хэлний чиглэл","langDirRTLLabel":"Баруун талаас зүүн тишээ (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Загвар","title":"Div гэдэг хэсэг бий болгох","toolbar":"Div гэдэг хэсэг бий болгох"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Холбоосууд","insert":"Оруулах","styles":"Загварууд","colors":"Онгөнүүд","tools":"Хэрэгслүүд"},"toolbars":"Болосруулагчийн хэрэгслийн самбар"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Хайх","findOptions":"Хайх сонголтууд","findWhat":"Хайх үг/үсэг:","matchCase":"Тэнцэх төлөв","matchCyclic":"Match cyclic","matchWord":"Тэнцэх бүтэн үг","notFoundMsg":"Хайсан бичвэрийг олсонгүй.","replace":"Орлуулах","replaceAll":"Бүгдийг нь солих","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Солих үг:","title":"Хайж орлуулах"},"fakeobjects":{"anchor":"Зангуу","flash":"Flash Animation","hiddenfield":"Нууц талбар","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Онцлогууд","accessNever":"Хэзээ ч үгүй","accessSameDomain":"Байнга","alignAbsBottom":"Abs доод талд","alignAbsMiddle":"Abs Дунд талд","alignBaseline":"Baseline","alignTextTop":"Текст дээр","bgcolor":"Дэвсгэр өнгө","chkFull":"Allow Fullscreen","chkLoop":"Давтах","chkMenu":"Флаш цэс идвэхжүүлэх","chkPlay":"Автоматаар тоглох","flashvars":"Variables for Flash","hSpace":"Хөндлөн зай","properties":"Флаш шинж чанар","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Өргөгтгөх","scaleAll":"Бүгдийг харуулах","scaleFit":"Яг тааруулах","scaleNoBorder":"Хүрээгүй","title":"Флаш  шинж чанар","vSpace":"Босоо зай","validateHSpace":"HSpace must be a number.","validateSrc":"Линк URL-ээ төрөлжүүлнэ үү","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Хэмжээ","voiceLabel":"Үсгийн хэмжээ","panelTitle":"Үсгийн хэмжээ"},"label":"Үсгийн хэлбэр","panelTitle":"Үгсийн хэлбэрийн нэр","voiceLabel":"Үгсийн хэлбэр"},"forms":{"button":{"title":"Товчны шинж чанар","text":"Тэкст (Утга)","type":"Төрөл","typeBtn":"Товч","typeSbm":"Submit","typeRst":"Болих"},"checkboxAndRadio":{"checkboxTitle":"Чекбоксны шинж чанар","radioTitle":"Радио товчны шинж чанар","value":"Утга","selected":"Сонгогдсон","required":"Required"},"form":{"title":"Форм шинж чанар","menu":"Форм шинж чанар","action":"Үйлдэл","method":"Арга","encoding":"Encoding"},"hidden":{"title":"Нууц талбарын шинж чанар","name":"Нэр","value":"Утга"},"select":{"title":"Согогч талбарын шинж чанар","selectInfo":"Мэдээлэл","opAvail":"Идвэхтэй сонголт","value":"Утга","size":"Хэмжээ","lines":"Мөр","chkMulti":"Олон зүйл зэрэг сонгохыг зөвшөөрөх","required":"Required","opText":"Тэкст","opValue":"Утга","btnAdd":"Нэмэх","btnModify":"Өөрчлөх","btnUp":"Дээш","btnDown":"Доош","btnSetValue":"Сонгогдсан утга оноох","btnDelete":"Устгах"},"textarea":{"title":"Текст орчны шинж чанар","cols":"Багана","rows":"Мөр"},"textfield":{"title":"Текст талбарын шинж чанар","name":"Нэр","value":"Утга","charWidth":"Тэмдэгтын өргөн","maxChars":"Хамгийн их тэмдэгт","required":"Required","type":"Төрөл","typeText":"Текст","typePass":"Нууц үг","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"цахим хуудасны хаяг (URL)"}},"format":{"label":"Параргафын загвар","panelTitle":"Параргафын загвар","tag_address":"Хаяг","tag_div":"Paragraph (DIV)","tag_h1":"Гарчиг 1","tag_h2":"Гарчиг 2","tag_h3":"Гарчиг 3","tag_h4":"Гарчиг 4","tag_h5":"Гарчиг 5","tag_h6":"Гарчиг 6","tag_p":"Хэвийн","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Хөндлөн зураас оруулах"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Зургийг орлох бичвэр","border":"Хүрээ","btnUpload":"Үүнийг сервэррүү илгээ","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Хөндлөн зай","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Зурагны мэдээлэл","linkTab":"Холбоос","lockRatio":"Радио түгжих","menu":"Зураг","resetSize":"хэмжээ дахин оноох","title":"Зураг","titleButton":"Зурган товчны шинж чанар","upload":"Хуулах","urlMissing":"Зургийн эх сурвалжийн хаяг (URL) байхгүй байна.","vSpace":"Босоо зай","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Догол мөр хасах","outdent":"Догол мөр нэмэх"},"smiley":{"options":"Smiley Options","title":"Тодорхойлолт оруулах","toolbar":"Тодорхойлолт"},"justify":{"block":"Тэгшлэх","center":"Голлуулах","left":"Зүүн талд тулгах","right":"Баруун талд тулгах"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Холбох түлхүүр","advanced":"Нэмэлт","advisoryContentType":"Зөвлөлдөх төрлийн агуулга","advisoryTitle":"Зөвлөлдөх гарчиг","anchor":{"toolbar":"Зангуу","menu":"Зангууг болосруулах","title":"Зангуугийн шинж чанар","name":"Зангуугийн нэр","errorName":"Зангуугийн нэрийг оруулна уу","remove":"Зангууг устгах"},"anchorId":"Элемэнтйн Id нэрээр","anchorName":"Зангуугийн нэрээр","charset":"Тэмдэгт оноох нөөцөд холбогдсон","cssClasses":"Stylesheet классууд","download":"Force Download","displayText":"Display Text","emailAddress":"Э-шуудангийн хаяг","emailBody":"Зурвасны их бие","emailSubject":"Зурвасны гарчиг","id":"Id","info":"Холбоосын тухай мэдээлэл","langCode":"Хэлний код","langDir":"Хэлний чиглэл","langDirLTR":"Зүүнээс баруун (LTR)","langDirRTL":"Баруунаас зүүн (RTL)","menu":"Холбоос засварлах","name":"Нэр","noAnchors":"(Баримт бичиг зангуугүй байна)","noEmail":"Э-шуудангий хаягаа шивнэ үү","noUrl":"Холбоосны URL хаягийг шивнэ үү","other":"<other>","popupDependent":"Хамаатай (Netscape)","popupFeatures":"Popup цонхны онцлог","popupFullScreen":"Цонх дүүргэх (Internet Explorer)","popupLeft":"Зүүн байрлал","popupLocationBar":"Location хэсэг","popupMenuBar":"Цэсний самбар","popupResizable":"Resizable","popupScrollBars":"Скрол хэсэгүүд","popupStatusBar":"Статус хэсэг","popupToolbar":"Багажны самбар","popupTop":"Дээд байрлал","rel":"Relationship","selectAnchor":"Нэг зангууг сонгоно уу","styles":"Загвар","tabIndex":"Tab индекс","target":"Байрлал","targetFrame":"<Агуулах хүрээ>","targetFrameName":"Очих фремын нэр","targetPopup":"<popup цонх>","targetPopupName":"Popup цонхны нэр","title":"Холбоос","toAnchor":"Энэ бичвэр дэх зангуу руу очих холбоос","toEmail":"Э-захиа","toUrl":"цахим хуудасны хаяг (URL)","toolbar":"Холбоос","type":"Линкийн төрөл","unlink":"Холбоос авч хаях","upload":"Хуулах"},"list":{"bulletedlist":"Цэгтэй жагсаалт","numberedlist":"Дугаарлагдсан жагсаалт"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Төрөл","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Дэлгэц дүүргэх","minimize":"Цонхыг багсгаж харуулах"},"newpage":{"toolbar":"Шинэ хуудас"},"pagebreak":{"alt":"Page Break","toolbar":"Хуудас тусгаарлагч оруулах"},"pastetext":{"button":"Энгийн бичвэрээр буулгах","title":"Энгийн бичвэрээр буулгах"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Word-оос буулгах","toolbar":"Word-оос буулгах"},"preview":{"preview":"Уридчлан харах"},"print":{"toolbar":"Хэвлэх"},"removeformat":{"toolbar":"Параргафын загварыг авч хаях"},"save":{"toolbar":"Хадгалах"},"selectall":{"toolbar":"Бүгдийг нь сонгох"},"showblocks":{"toolbar":"Хавтангуудыг харуулах"},"sourcearea":{"toolbar":"Код"},"specialchar":{"options":"Special Character Options","title":"Онцгой тэмдэгт сонгох","toolbar":"Онцгой тэмдэгт оруулах"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Толь бичгүүд","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Хэлүүд","btn_options":"Сонголт","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Загвар","panelTitle":"Загвар хэлбэржүүлэх","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Хүрээний хэмжээ","caption":"Тайлбар","cell":{"menu":"Нүх/зай","insertBefore":"Нүх/зай өмнө нь оруулах","insertAfter":"Нүх/зай дараа нь оруулах","deleteCell":"Нүх устгах","merge":"Нүх нэгтэх","mergeRight":"Баруун тийш нэгтгэх","mergeDown":"Доош нэгтгэх","splitHorizontal":"Нүх/зайг босоогоор нь тусгаарлах","splitVertical":"Нүх/зайг хөндлөнгөөр нь тусгаарлах","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Хэвтээд тэгшлэх арга","vAlign":"Босоод тэгшлэх арга","alignBaseline":"Baseline","bgColor":"Дэвсгэр өнгө","borderColor":"Хүрээний өнгө","data":"Data","header":"Header","yes":"Тийм","no":"Үгүй","invalidWidth":"Нүдний өргөн нь тоо байх ёстой.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сонгох"},"cellPad":"Нүх доторлох(padding)","cellSpace":"Нүх хоорондын зай (spacing)","column":{"menu":"Багана","insertBefore":"Багана өмнө нь оруулах","insertAfter":"Багана дараа нь оруулах","deleteColumn":"Багана устгах"},"columns":"Багана","deleteTable":"Хүснэгт устгах","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Хүснэгтийн өргөн нь тоо байх ёстой.","menu":"Хүснэгт","row":{"menu":"Мөр","insertBefore":"Мөр өмнө нь оруулах","insertAfter":"Мөр дараа нь оруулах","deleteRow":"Мөр устгах"},"rows":"Мөр","summary":"Тайлбар","title":"Хүснэгт","toolbar":"Хүснэгт","widthPc":"хувь","widthPx":"цэг","widthUnit":"өргөний нэгж"},"undo":{"redo":"Өмнөх үйлдлээ сэргээх","undo":"Хүчингүй болгох"},"wsc":{"btnIgnore":"Зөвшөөрөх","btnIgnoreAll":"Бүгдийг зөвшөөрөх","btnReplace":"Солих","btnReplaceAll":"Бүгдийг Дарж бичих","btnUndo":"Буцаах","changeTo":"Өөрчлөх","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Дүрэм шалгагч суугаагүй байна. Татаж авахыг хүсч байна уу?","manyChanges":"Дүрэм шалгаад дууссан: %1 үг өөрчлөгдсөн","noChanges":"Дүрэм шалгаад дууссан: үг өөрчлөгдөөгүй","noMispell":"Дүрэм шалгаад дууссан: Алдаа олдсонгүй","noSuggestions":"- Тайлбаргүй -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Толь бичиггүй","oneChange":"Дүрэм шалгаад дууссан: 1 үг өөрчлөгдсөн","progress":"Дүрэм шалгаж байгаа үйл явц...","title":"Spell Checker","toolbar":"Үгийн дүрэх шалгах"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/lang/ms.js
index da0f8f42c6f..f4a4efa698b 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/ms.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ms.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ms']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Muat Naik","uploadSubmit":"Hantar ke Server","image":"Gambar","flash":"Flash","form":"Borang","checkbox":"Checkbox","radio":"Butang Radio","textField":"Text Field","textarea":"Textarea","hiddenField":"Field Tersembunyi","button":"Butang","select":"Field Pilihan","imageButton":"Butang Bergambar","notSet":"<tidak di set>","id":"Id","name":"Nama","langDir":"Arah Tulisan","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri (RTL)","langCode":"Kod Bahasa","longDescr":"Butiran Panjang URL","cssClass":"Kelas-kelas Stylesheet","advisoryTitle":"Tajuk Makluman","cssStyle":"Stail","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Prebiu","resize":"Resize","generalTab":"Umum","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Sasaran","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Stail","cssClasses":"Kelas-kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Jajaran","alignLeft":"Kiri","alignRight":"Kanan","alignCenter":"Tengah","alignJustify":"Jajaran Blok","alignTop":"Atas","alignMiddle":"Pertengahan","alignBottom":"Bawah","alignNone":"None","invalidValue":"Nilai tidak sah.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Salin","copyError":"Keselamatan perisian browser anda tidak membenarkan operasi salinan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+C).","cut":"Potong","cutError":"Keselamatan perisian browser anda tidak membenarkan operasi suntingan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+X).","paste":"Tampal","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Tampal"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Otomatik","bgColorTitle":"Warna Latarbelakang","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"Warna lain-lain...","panelTitle":"Colors","textColorTitle":"Warna Text"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templat","emptyListMsg":"(Tiada Templat Disimpan)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Sila pilih templat untuk dibuka oleh editor<br>(kandungan sebenar akan hilang):","title":"Templat Kandungan"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Cari","findOptions":"Find Options","findWhat":"Perkataan yang dicari:","matchCase":"Padanan case huruf","matchCyclic":"Match cyclic","matchWord":"Padana Keseluruhan perkataan","notFoundMsg":"Text yang dicari tidak dijumpai.","replace":"Ganti","replaceAll":"Ganti semua","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Diganti dengan:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Bawah Mutlak","alignAbsMiddle":"Pertengahan Mutlak","alignBaseline":"Garis Dasar","alignTextTop":"Atas Text","bgcolor":"Warna Latarbelakang","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"Ruang Melintang","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"Ruang Menegak","validateHSpace":"HSpace must be a number.","validateSrc":"Sila taip sambungan URL","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Saiz","voiceLabel":"Font Size","panelTitle":"Saiz"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"forms":{"button":{"title":"Ciri-ciri Butang","text":"Teks (Nilai)","type":"Jenis","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Ciri-ciri Checkbox","radioTitle":"Ciri-ciri Butang Radio","value":"Nilai","selected":"Dipilih","required":"Required"},"form":{"title":"Ciri-ciri Borang","menu":"Ciri-ciri Borang","action":"Tindakan borang","method":"Cara borang dihantar","encoding":"Encoding"},"hidden":{"title":"Ciri-ciri Field Tersembunyi","name":"Nama","value":"Nilai"},"select":{"title":"Ciri-ciri Selection Field","selectInfo":"Select Info","opAvail":"Pilihan sediada","value":"Nilai","size":"Saiz","lines":"garisan","chkMulti":"Benarkan pilihan pelbagai","required":"Required","opText":"Teks","opValue":"Nilai","btnAdd":"Tambah Pilihan","btnModify":"Ubah Pilihan","btnUp":"Naik ke atas","btnDown":"Turun ke bawah","btnSetValue":"Set sebagai nilai terpilih","btnDelete":"Padam"},"textarea":{"title":"Ciri-ciri Textarea","cols":"Lajur","rows":"Baris"},"textfield":{"title":"Ciri-ciri Text Field","name":"Nama","value":"Nilai","charWidth":"Lebar isian","maxChars":"Isian Maksimum","required":"Required","type":"Jenis","typeText":"Teks","typePass":"Kata Laluan","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Alamat","tag_div":"Perenggan (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Telah Diformat"},"horizontalrule":{"toolbar":"Masukkan Garisan Membujur"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Text Alternatif","border":"Border","btnUpload":"Hantar ke Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Ruang Melintang","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Info Imej","linkTab":"Sambungan","lockRatio":"Tetapkan Nisbah","menu":"Ciri-ciri Imej","resetSize":"Saiz Set Semula","title":"Ciri-ciri Imej","titleButton":"Ciri-ciri Butang Bergambar","upload":"Muat Naik","urlMissing":"Image source URL is missing.","vSpace":"Ruang Menegak","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Tambahkan Inden","outdent":"Kurangkan Inden"},"smiley":{"options":"Smiley Options","title":"Masukkan Smiley","toolbar":"Smiley"},"justify":{"block":"Jajaran Blok","center":"Jajaran Tengah","left":"Jajaran Kiri","right":"Jajaran Kanan"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Kunci Akses","advanced":"Advanced","advisoryContentType":"Jenis Kandungan Makluman","advisoryTitle":"Tajuk Makluman","anchor":{"toolbar":"Masukkan/Sunting Pautan","menu":"Ciri-ciri Pautan","title":"Ciri-ciri Pautan","name":"Nama Pautan","errorName":"Sila taip nama pautan","remove":"Remove Anchor"},"anchorId":"dengan menggunakan ID elemen","anchorName":"dengan menggunakan nama pautan","charset":"Linked Resource Charset","cssClasses":"Kelas-kelas Stylesheet","emailAddress":"Alamat E-Mail","emailBody":"Isi Kandungan Mesej","emailSubject":"Subjek Mesej","id":"Id","info":"Butiran Sambungan","langCode":"Arah Tulisan","langDir":"Arah Tulisan","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","menu":"Sunting Sambungan","name":"Nama","noAnchors":"(Tiada pautan terdapat dalam dokumen ini)","noEmail":"Sila taip alamat e-mail","noUrl":"Sila taip sambungan URL","other":"<lain>","popupDependent":"Bergantungan (Netscape)","popupFeatures":"Ciri Tetingkap Popup","popupFullScreen":"Skrin Penuh (IE)","popupLeft":"Posisi Kiri","popupLocationBar":"Bar Lokasi","popupMenuBar":"Bar Menu","popupResizable":"Resizable","popupScrollBars":"Bar-bar skrol","popupStatusBar":"Bar Status","popupToolbar":"Toolbar","popupTop":"Posisi Atas","rel":"Relationship","selectAnchor":"Sila pilih pautan","styles":"Stail","tabIndex":"Indeks Tab ","target":"Sasaran","targetFrame":"<bingkai>","targetFrameName":"Nama Bingkai Sasaran","targetPopup":"<tetingkap popup>","targetPopupName":"Nama Tetingkap Popup","title":"Sambungan","toAnchor":"Pautan dalam muka surat ini","toEmail":"E-Mail","toUrl":"URL","toolbar":"Masukkan/Sunting Sambungan","type":"Jenis Sambungan","unlink":"Buang Sambungan","upload":"Muat Naik"},"list":{"bulletedlist":"Senarai tidak bernombor","numberedlist":"Senarai bernombor"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"Helaian Baru"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Tampal sebagai text biasa","title":"Tampal sebagai text biasa"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Tampal dari Word","toolbar":"Tampal dari Word"},"preview":{"preview":"Prebiu"},"print":{"toolbar":"Cetak"},"removeformat":{"toolbar":"Buang Format"},"save":{"toolbar":"Simpan"},"selectall":{"toolbar":"Pilih Semua"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Sumber"},"specialchar":{"options":"Special Character Options","title":"Sila pilih huruf istimewa","toolbar":"Masukkan Huruf Istimewa"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stail","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Saiz Border","caption":"Keterangan","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Buangkan Sel-sel","merge":"Cantumkan Sel-sel","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Tambahan Ruang Sel","cellSpace":"Ruangan Antara Sel","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Buangkan Lajur"},"columns":"Jaluran","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Ciri-ciri Jadual","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Buangkan Baris"},"rows":"Barisan","summary":"Summary","title":"Ciri-ciri Jadual","toolbar":"Jadual","widthPc":"peratus","widthPx":"piksel-piksel","widthUnit":"width unit"},"undo":{"redo":"Ulangkan","undo":"Batalkan"},"wsc":{"btnIgnore":"Biar","btnIgnoreAll":"Biarkan semua","btnReplace":"Ganti","btnReplaceAll":"Gantikan Semua","btnUndo":"Batalkan","changeTo":"Tukarkan kepada","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Pemeriksa ejaan tidak dipasang. Adakah anda mahu muat turun sekarang?","manyChanges":"Pemeriksaan ejaan siap: %1 perkataan diubah","noChanges":"Pemeriksaan ejaan siap: Tiada perkataan diubah","noMispell":"Pemeriksaan ejaan siap: Tiada salah ejaan","noSuggestions":"- Tiada cadangan -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Tidak terdapat didalam kamus","oneChange":"Pemeriksaan ejaan siap: Satu perkataan telah diubah","progress":"Pemeriksaan ejaan sedang diproses...","title":"Spell Checker","toolbar":"Semak Ejaan"}};
\ No newline at end of file
+CKEDITOR.lang['ms']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Muat Naik","uploadSubmit":"Hantar ke Server","image":"Gambar","flash":"Flash","form":"Borang","checkbox":"Checkbox","radio":"Butang Radio","textField":"Text Field","textarea":"Textarea","hiddenField":"Field Tersembunyi","button":"Butang","select":"Field Pilihan","imageButton":"Butang Bergambar","notSet":"<tidak di set>","id":"Id","name":"Nama","langDir":"Arah Tulisan","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri (RTL)","langCode":"Kod Bahasa","longDescr":"Butiran Panjang URL","cssClass":"Kelas-kelas Stylesheet","advisoryTitle":"Tajuk Makluman","cssStyle":"Stail","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Prebiu","resize":"Resize","generalTab":"Umum","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Sasaran","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Stail","cssClasses":"Kelas-kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Jajaran","alignLeft":"Kiri","alignRight":"Kanan","alignCenter":"Tengah","alignJustify":"Jajaran Blok","alignTop":"Atas","alignMiddle":"Pertengahan","alignBottom":"Bawah","alignNone":"None","invalidValue":"Nilai tidak sah.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Salin","copyError":"Keselamatan perisian browser anda tidak membenarkan operasi salinan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+C).","cut":"Potong","cutError":"Keselamatan perisian browser anda tidak membenarkan operasi suntingan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+X).","paste":"Tampal","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Tampal"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Otomatik","bgColorTitle":"Warna Latarbelakang","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Warna lain-lain...","panelTitle":"Colors","textColorTitle":"Warna Text"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templat","emptyListMsg":"(Tiada Templat Disimpan)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Sila pilih templat untuk dibuka oleh editor<br>(kandungan sebenar akan hilang):","title":"Templat Kandungan"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Cari","findOptions":"Find Options","findWhat":"Perkataan yang dicari:","matchCase":"Padanan case huruf","matchCyclic":"Match cyclic","matchWord":"Padana Keseluruhan perkataan","notFoundMsg":"Text yang dicari tidak dijumpai.","replace":"Ganti","replaceAll":"Ganti semua","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Diganti dengan:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Bawah Mutlak","alignAbsMiddle":"Pertengahan Mutlak","alignBaseline":"Garis Dasar","alignTextTop":"Atas Text","bgcolor":"Warna Latarbelakang","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"Ruang Melintang","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"Ruang Menegak","validateHSpace":"HSpace must be a number.","validateSrc":"Sila taip sambungan URL","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Saiz","voiceLabel":"Font Size","panelTitle":"Saiz"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"forms":{"button":{"title":"Ciri-ciri Butang","text":"Teks (Nilai)","type":"Jenis","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Ciri-ciri Checkbox","radioTitle":"Ciri-ciri Butang Radio","value":"Nilai","selected":"Dipilih","required":"Required"},"form":{"title":"Ciri-ciri Borang","menu":"Ciri-ciri Borang","action":"Tindakan borang","method":"Cara borang dihantar","encoding":"Encoding"},"hidden":{"title":"Ciri-ciri Field Tersembunyi","name":"Nama","value":"Nilai"},"select":{"title":"Ciri-ciri Selection Field","selectInfo":"Select Info","opAvail":"Pilihan sediada","value":"Nilai","size":"Saiz","lines":"garisan","chkMulti":"Benarkan pilihan pelbagai","required":"Required","opText":"Teks","opValue":"Nilai","btnAdd":"Tambah Pilihan","btnModify":"Ubah Pilihan","btnUp":"Naik ke atas","btnDown":"Turun ke bawah","btnSetValue":"Set sebagai nilai terpilih","btnDelete":"Padam"},"textarea":{"title":"Ciri-ciri Textarea","cols":"Lajur","rows":"Baris"},"textfield":{"title":"Ciri-ciri Text Field","name":"Nama","value":"Nilai","charWidth":"Lebar isian","maxChars":"Isian Maksimum","required":"Required","type":"Jenis","typeText":"Teks","typePass":"Kata Laluan","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Alamat","tag_div":"Perenggan (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Telah Diformat"},"horizontalrule":{"toolbar":"Masukkan Garisan Membujur"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Text Alternatif","border":"Border","btnUpload":"Hantar ke Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Ruang Melintang","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Info Imej","linkTab":"Sambungan","lockRatio":"Tetapkan Nisbah","menu":"Ciri-ciri Imej","resetSize":"Saiz Set Semula","title":"Ciri-ciri Imej","titleButton":"Ciri-ciri Butang Bergambar","upload":"Muat Naik","urlMissing":"Image source URL is missing.","vSpace":"Ruang Menegak","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Tambahkan Inden","outdent":"Kurangkan Inden"},"smiley":{"options":"Smiley Options","title":"Masukkan Smiley","toolbar":"Smiley"},"justify":{"block":"Jajaran Blok","center":"Jajaran Tengah","left":"Jajaran Kiri","right":"Jajaran Kanan"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Kunci Akses","advanced":"Advanced","advisoryContentType":"Jenis Kandungan Makluman","advisoryTitle":"Tajuk Makluman","anchor":{"toolbar":"Masukkan/Sunting Pautan","menu":"Ciri-ciri Pautan","title":"Ciri-ciri Pautan","name":"Nama Pautan","errorName":"Sila taip nama pautan","remove":"Remove Anchor"},"anchorId":"dengan menggunakan ID elemen","anchorName":"dengan menggunakan nama pautan","charset":"Linked Resource Charset","cssClasses":"Kelas-kelas Stylesheet","download":"Force Download","displayText":"Display Text","emailAddress":"Alamat E-Mail","emailBody":"Isi Kandungan Mesej","emailSubject":"Subjek Mesej","id":"Id","info":"Butiran Sambungan","langCode":"Arah Tulisan","langDir":"Arah Tulisan","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","menu":"Sunting Sambungan","name":"Nama","noAnchors":"(Tiada pautan terdapat dalam dokumen ini)","noEmail":"Sila taip alamat e-mail","noUrl":"Sila taip sambungan URL","other":"<lain>","popupDependent":"Bergantungan (Netscape)","popupFeatures":"Ciri Tetingkap Popup","popupFullScreen":"Skrin Penuh (IE)","popupLeft":"Posisi Kiri","popupLocationBar":"Bar Lokasi","popupMenuBar":"Bar Menu","popupResizable":"Resizable","popupScrollBars":"Bar-bar skrol","popupStatusBar":"Bar Status","popupToolbar":"Toolbar","popupTop":"Posisi Atas","rel":"Relationship","selectAnchor":"Sila pilih pautan","styles":"Stail","tabIndex":"Indeks Tab ","target":"Sasaran","targetFrame":"<bingkai>","targetFrameName":"Nama Bingkai Sasaran","targetPopup":"<tetingkap popup>","targetPopupName":"Nama Tetingkap Popup","title":"Sambungan","toAnchor":"Pautan dalam muka surat ini","toEmail":"E-Mail","toUrl":"URL","toolbar":"Masukkan/Sunting Sambungan","type":"Jenis Sambungan","unlink":"Buang Sambungan","upload":"Muat Naik"},"list":{"bulletedlist":"Senarai tidak bernombor","numberedlist":"Senarai bernombor"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"Helaian Baru"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Tampal sebagai text biasa","title":"Tampal sebagai text biasa"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Tampal dari Word","toolbar":"Tampal dari Word"},"preview":{"preview":"Prebiu"},"print":{"toolbar":"Cetak"},"removeformat":{"toolbar":"Buang Format"},"save":{"toolbar":"Simpan"},"selectall":{"toolbar":"Pilih Semua"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Sumber"},"specialchar":{"options":"Special Character Options","title":"Sila pilih huruf istimewa","toolbar":"Masukkan Huruf Istimewa"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stail","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Saiz Border","caption":"Keterangan","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Buangkan Sel-sel","merge":"Cantumkan Sel-sel","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Tambahan Ruang Sel","cellSpace":"Ruangan Antara Sel","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Buangkan Lajur"},"columns":"Jaluran","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Ciri-ciri Jadual","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Buangkan Baris"},"rows":"Barisan","summary":"Summary","title":"Ciri-ciri Jadual","toolbar":"Jadual","widthPc":"peratus","widthPx":"piksel-piksel","widthUnit":"width unit"},"undo":{"redo":"Ulangkan","undo":"Batalkan"},"wsc":{"btnIgnore":"Biar","btnIgnoreAll":"Biarkan semua","btnReplace":"Ganti","btnReplaceAll":"Gantikan Semua","btnUndo":"Batalkan","changeTo":"Tukarkan kepada","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Pemeriksa ejaan tidak dipasang. Adakah anda mahu muat turun sekarang?","manyChanges":"Pemeriksaan ejaan siap: %1 perkataan diubah","noChanges":"Pemeriksaan ejaan siap: Tiada perkataan diubah","noMispell":"Pemeriksaan ejaan siap: Tiada salah ejaan","noSuggestions":"- Tiada cadangan -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Tidak terdapat didalam kamus","oneChange":"Pemeriksaan ejaan siap: Satu perkataan telah diubah","progress":"Pemeriksaan ejaan sedang diproses...","title":"Spell Checker","toolbar":"Semak Ejaan"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/lang/nb.js
index d09c399a719..8b9252648db 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/nb.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/nb.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['nb']={"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla gjennom tjener","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","flash":"Flash","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (VTH)","langDirRtl":"Høyre til venstre (HTV)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil gå tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Du har endret noen alternativer. Er du sikker på at du vil lukke dialogvinduet?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vindu (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","alignLeft":"Venstre","alignRight":"Høyre","alignCenter":"Midtjuster","alignJustify":"Blokkjuster","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor","help":"Se $1 for hjelp.","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:","title":"Om CKEditor","userGuide":"CKEditors brukerveiledning"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"bidi":{"ltr":"Tekstretning fra venstre til høyre","rtl":"Tekstretning fra høyre til venstre"},"blockquote":{"toolbar":"Blokksitat"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteArea":"Innlimingsområde","pasteMsg":"Vennligst lim inn i følgende boks med tastaturet (<strong>Ctrl/Cmd+V</strong>) og trykk <strong>OK</strong>.","securityMsg":"Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.","title":"Lim inn"},"button":{"selectedLabel":"%1 (Valgt)"},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Bakgrunnsfarge","colors":{"000":"Svart","800000":"Rødbrun","8B4513":"Salbrun","2F4F4F":"Grønnsvart","008080":"Blågrønn","000080":"Marineblått","4B0082":"Indigo","696969":"Mørk grå","B22222":"Mørkerød","A52A2A":"Brun","DAA520":"Lys brun","006400":"Mørk grønn","40E0D0":"Turkis","0000CD":"Medium blå","800080":"Purpur","808080":"Grå","F00":"Rød","FF8C00":"Mørk oransje","FFD700":"Gull","008000":"Grønn","0FF":"Cyan","00F":"Blå","EE82EE":"Fiolett","A9A9A9":"Svak grå","FFA07A":"Rosa-oransje","FFA500":"Oransje","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Svak turkis","ADD8E6":"Lys Blå","DDA0DD":"Plomme","D3D3D3":"Lys grå","FFF0F5":"Svak lavendelrosa","FAEBD7":"Antikk-hvit","FFFFE0":"Lys gul","F0FFF0":"Honningmelon","F0FFFF":"Svakt asurblått","F0F8FF":"Svak cyan","E6E6FA":"Lavendel","FFF":"Hvit"},"more":"Flere farger...","panelTitle":"Farger","textColorTitle":"Tekstfarge"},"colordialog":{"clear":"Tøm","highlight":"Merk","options":"Alternativer for farge","selected":"Valgt farge","title":"Velg farge"},"templates":{"button":"Maler","emptyListMsg":"(Ingen maler definert)","insertOption":"Erstatt gjeldende innhold","options":"Alternativer for mal","selectPromptMsg":"Velg malen du vil åpne i redigeringsverktøyet:","title":"Innholdsmaler"},"contextmenu":{"options":"Alternativer for høyreklikkmeny"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Tittel","cssClassInputLabel":"Stilark-klasser","edit":"Rediger Div","inlineStyleInputLabel":"Inlinestiler","langDirLTRLabel":"Venstre til høyre (VTH)","langDirLabel":"Språkretning","langDirRTLLabel":"Høyre til venstre (HTV)","languageCodeInputLabel":" Språkkode","remove":"Fjern Div","styleSelectLabel":"Stil","title":"Sett inn Div Container","toolbar":"Sett inn Div Container"},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"elementspath":{"eleLabel":"Element-sti","eleTitle":"%1 element"},"find":{"find":"Søk","findOptions":"Søkealternativer","findWhat":"Søk etter:","matchCase":"Skill mellom store og små bokstaver","matchCyclic":"Søk i hele dokumentet","matchWord":"Bare hele ord","notFoundMsg":"Fant ikke søketeksten.","replace":"Erstatt","replaceAll":"Erstatt alle","replaceSuccessMsg":"%1 tilfelle(r) erstattet.","replaceWith":"Erstatt med:","title":"Søk og erstatt"},"fakeobjects":{"anchor":"Anker","flash":"Flash-animasjon","hiddenfield":"Skjult felt","iframe":"IFrame","unknown":"Ukjent objekt"},"flash":{"access":"Scripttilgang","accessAlways":"Alltid","accessNever":"Aldri","accessSameDomain":"Samme domene","alignAbsBottom":"Abs bunn","alignAbsMiddle":"Abs midten","alignBaseline":"Bunnlinje","alignTextTop":"Tekst topp","bgcolor":"Bakgrunnsfarge","chkFull":"Tillat fullskjerm","chkLoop":"Loop","chkMenu":"Slå på Flash-meny","chkPlay":"Autospill","flashvars":"Variabler for flash","hSpace":"HMarg","properties":"Egenskaper for Flash-objekt","propertiesTab":"Egenskaper","quality":"Kvalitet","qualityAutoHigh":"Auto høy","qualityAutoLow":"Auto lav","qualityBest":"Best","qualityHigh":"Høy","qualityLow":"Lav","qualityMedium":"Medium","scale":"Skaler","scaleAll":"Vis alt","scaleFit":"Skaler til å passe","scaleNoBorder":"Ingen ramme","title":"Flash-egenskaper","vSpace":"VMarg","validateHSpace":"HMarg må være et tall.","validateSrc":"Vennligst skriv inn lenkens url.","validateVSpace":"VMarg må være et tall.","windowMode":"Vindumodus","windowModeOpaque":"Opaque","windowModeTransparent":"Gjennomsiktig","windowModeWindow":"Vindu"},"font":{"fontSize":{"label":"Størrelse","voiceLabel":"Skriftstørrelse","panelTitle":"Skriftstørrelse"},"label":"Skrift","panelTitle":"Skrift","voiceLabel":"Font"},"forms":{"button":{"title":"Egenskaper for knapp","text":"Tekst (verdi)","type":"Type","typeBtn":"Knapp","typeSbm":"Send","typeRst":"Nullstill"},"checkboxAndRadio":{"checkboxTitle":"Egenskaper for avmerkingsboks","radioTitle":"Egenskaper for alternativknapp","value":"Verdi","selected":"Valgt","required":"Påkrevd"},"form":{"title":"Egenskaper for skjema","menu":"Egenskaper for skjema","action":"Handling","method":"Metode","encoding":"Encoding"},"hidden":{"title":"Egenskaper for skjult felt","name":"Navn","value":"Verdi"},"select":{"title":"Egenskaper for rullegardinliste","selectInfo":"Info","opAvail":"Tilgjenglige alternativer","value":"Verdi","size":"Størrelse","lines":"Linjer","chkMulti":"Tillat flervalg","required":"Påkrevd","opText":"Tekst","opValue":"Verdi","btnAdd":"Legg til","btnModify":"Endre","btnUp":"Opp","btnDown":"Ned","btnSetValue":"Sett som valgt","btnDelete":"Slett"},"textarea":{"title":"Egenskaper for tekstområde","cols":"Kolonner","rows":"Rader"},"textfield":{"title":"Egenskaper for tekstfelt","name":"Navn","value":"Verdi","charWidth":"Tegnbredde","maxChars":"Maks antall tegn","required":"Påkrevd","type":"Type","typeText":"Tekst","typePass":"Passord","typeEmail":"Epost","typeSearch":"Søk","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Avsnittsformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formatert"},"horizontalrule":{"toolbar":"Sett inn horisontal linje"},"iframe":{"border":"Vis ramme rundt iframe","noUrl":"Vennligst skriv inn URL for iframe","scrolling":"Aktiver scrollefelt","title":"Egenskaper for IFrame","toolbar":"IFrame"},"image":{"alt":"Alternativ tekst","border":"Ramme","btnUpload":"Send det til serveren","button2Img":"Vil du endre den valgte bildeknappen til et vanlig bilde?","hSpace":"HMarg","img2Button":"Vil du endre det valgte bildet til en bildeknapp?","infoTab":"Bildeinformasjon","linkTab":"Lenke","lockRatio":"Lås forhold","menu":"Bildeegenskaper","resetSize":"Tilbakestill størrelse","title":"Bildeegenskaper","titleButton":"Egenskaper for bildeknapp","upload":"Last opp","urlMissing":"Bildets adresse mangler.","vSpace":"VMarg","validateBorder":"Ramme må være et heltall.","validateHSpace":"HMarg må være et heltall.","validateVSpace":"VMarg må være et heltall."},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"smiley":{"options":"Alternativer for smil","title":"Sett inn smil","toolbar":"Smil"},"justify":{"block":"Blokkjuster","center":"Midtstill","left":"Venstrejuster","right":"Høyrejuster"},"language":{"button":"Sett språk","remove":"Fjern språk"},"link":{"acccessKey":"Aksessknapp","advanced":"Avansert","advisoryContentType":"Type","advisoryTitle":"Tittel","anchor":{"toolbar":"Sett inn/Rediger anker","menu":"Egenskaper for anker","title":"Egenskaper for anker","name":"Ankernavn","errorName":"Vennligst skriv inn ankernavnet","remove":"Fjern anker"},"anchorId":"Element etter ID","anchorName":"Anker etter navn","charset":"Lenket tegnsett","cssClasses":"Stilarkklasser","emailAddress":"E-postadresse","emailBody":"Melding","emailSubject":"Meldingsemne","id":"Id","info":"Lenkeinfo","langCode":"Språkkode","langDir":"Språkretning","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","menu":"Rediger lenke","name":"Navn","noAnchors":"(Ingen anker i dokumentet)","noEmail":"Vennligst skriv inn e-postadressen","noUrl":"Vennligst skriv inn lenkens URL","other":"<annen>","popupDependent":"Avhenging (Netscape)","popupFeatures":"Egenskaper for popup-vindu","popupFullScreen":"Fullskjerm (IE)","popupLeft":"Venstre posisjon","popupLocationBar":"Adresselinje","popupMenuBar":"Menylinje","popupResizable":"Skalerbar","popupScrollBars":"Scrollbar","popupStatusBar":"Statuslinje","popupToolbar":"Verktøylinje","popupTop":"Topp-posisjon","rel":"Relasjon (rel)","selectAnchor":"Velg et anker","styles":"Stil","tabIndex":"Tabindeks","target":"Mål","targetFrame":"<ramme>","targetFrameName":"Målramme","targetPopup":"<popup-vindu>","targetPopupName":"Navn på popup-vindu","title":"Lenke","toAnchor":"Lenke til anker i teksten","toEmail":"E-post","toUrl":"URL","toolbar":"Sett inn/Rediger lenke","type":"Lenketype","unlink":"Fjern lenke","upload":"Last opp"},"list":{"bulletedlist":"Legg til / fjern punktmerket liste","numberedlist":"Legg til / fjern nummerert liste"},"liststyle":{"armenian":"Armensk nummerering","bulletedTitle":"Egenskaper for punktmerket liste","circle":"Sirkel","decimal":"Tall (1, 2, 3, osv.)","decimalLeadingZero":"Tall, med førstesiffer null (01, 02, 03, osv.)","disc":"Disk","georgian":"Georgisk nummerering (an, ban, gan, osv.)","lowerAlpha":"Alfabetisk, små (a, b, c, d, e, osv.)","lowerGreek":"Gresk, små (alpha, beta, gamma, osv.)","lowerRoman":"Romertall, små (i, ii, iii, iv, v, osv.)","none":"Ingen","notset":"<ikke satt>","numberedTitle":"Egenskaper for nummerert liste","square":"Firkant","start":"Start","type":"Type","upperAlpha":"Alfabetisk, store (A, B, C, D, E, osv.)","upperRoman":"Romertall, store (I, II, III, IV, V, osv.)","validateStartNumber":"Starten på listen må være et heltall."},"magicline":{"title":"Sett inn nytt avsnitt her"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"newpage":{"toolbar":"Ny side"},"pagebreak":{"alt":"Sideskift","toolbar":"Sett inn sideskift for utskrift"},"pastetext":{"button":"Lim inn som ren tekst","title":"Lim inn som ren tekst"},"pastefromword":{"confirmCleanup":"Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?","error":"Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil","title":"Lim inn fra Word","toolbar":"Lim inn fra Word"},"preview":{"preview":"Forhåndsvis"},"print":{"toolbar":"Skriv ut"},"removeformat":{"toolbar":"Fjern formatering"},"save":{"toolbar":"Lagre"},"selectall":{"toolbar":"Merk alt"},"showblocks":{"toolbar":"Vis blokker"},"sourcearea":{"toolbar":"Kilde"},"specialchar":{"options":"Alternativer for spesialtegn","title":"Velg spesialtegn","toolbar":"Sett inn spesialtegn"},"scayt":{"btn_about":"Om SCAYT","btn_dictionaries":"Ordbøker","btn_disable":"Slå av SCAYT","btn_enable":"Slå på SCAYT","btn_langs":"Språk","btn_options":"Valg","text_title":"Stavekontroll mens du skriver"},"stylescombo":{"label":"Stil","panelTitle":"Stilformater","panelTitle1":"Blokkstiler","panelTitle2":"Inlinestiler","panelTitle3":"Objektstiler"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"undo":{"redo":"Gjør om","undo":"Angre"},"wsc":{"btnIgnore":"Ignorer","btnIgnoreAll":"Ignorer alle","btnReplace":"Erstatt","btnReplaceAll":"Erstatt alle","btnUndo":"Angre","changeTo":"Endre til","errorLoading":"Feil under lasting av applikasjonstjenestetjener: %s.","ieSpellDownload":"Stavekontroll er ikke installert. Vil du laste den ned nå?","manyChanges":"Stavekontroll fullført: %1 ord endret","noChanges":"Stavekontroll fullført: ingen ord endret","noMispell":"Stavekontroll fullført: ingen feilstavinger funnet","noSuggestions":"- Ingen forslag -","notAvailable":"Beklager, tjenesten er utilgjenglig nå.","notInDic":"Ikke i ordboken","oneChange":"Stavekontroll fullført: Ett ord endret","progress":"Stavekontroll pågår...","title":"Stavekontroll","toolbar":"Stavekontroll"}};
\ No newline at end of file
+CKEDITOR.lang['nb']={"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla gjennom tjener","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","flash":"Flash","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (LTR)","langDirRtl":"Høyre til venstre (RTL)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil gå tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Du har endret noen alternativer. Er du sikker på at du vil lukke dialogvinduet?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vinduet (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","alignLeft":"Venstre","alignRight":"Høyre","alignCenter":"Midtjuster","alignJustify":"Blokkjuster","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Mellomrom","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Tastatursnarvei"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor","help":"Se $1 for hjelp.","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:","title":"Om CKEditor","userGuide":"CKEditors brukerveiledning"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"bidi":{"ltr":"Tekstretning fra venstre til høyre","rtl":"Tekstretning fra høyre til venstre"},"blockquote":{"toolbar":"Blokksitat"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteArea":"Innlimingsområde","pasteMsg":"Vennligst lim inn i følgende boks med tastaturet (<strong>Ctrl/Cmd+V</strong>) og trykk <strong>OK</strong>.","securityMsg":"Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.","title":"Lim inn"},"button":{"selectedLabel":"%1 (Valgt)"},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Bakgrunnsfarge","colors":{"000":"Svart","800000":"Rødbrun","8B4513":"Salbrun","2F4F4F":"Grønnsvart","008080":"Blågrønn","000080":"Marineblå","4B0082":"Indigo","696969":"Mørk grå","B22222":"Mørkerød","A52A2A":"Brun","DAA520":"Lys brun","006400":"Mørk grønn","40E0D0":"Turkis","0000CD":"Medium blå","800080":"Purpur","808080":"Grå","F00":"Rød","FF8C00":"Mørk oransje","FFD700":"Gull","008000":"Grønn","0FF":"Cyan","00F":"Blå","EE82EE":"Fiolett","A9A9A9":"Svak grå","FFA07A":"Rosa-oransje","FFA500":"Oransje","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Svak turkis","ADD8E6":"Lys blå","DDA0DD":"Plomme","D3D3D3":"Lys grå","FFF0F5":"Svak lavendelrosa","FAEBD7":"Antikk-hvit","FFFFE0":"Lys gul","F0FFF0":"Honningmelon","F0FFFF":"Svak asurblå","F0F8FF":"Svak cyan","E6E6FA":"Lavendel","FFF":"Hvit","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Flere farger...","panelTitle":"Farger","textColorTitle":"Tekstfarge"},"colordialog":{"clear":"Tøm","highlight":"Merk","options":"Alternativer for farge","selected":"Valgt farge","title":"Velg farge"},"templates":{"button":"Maler","emptyListMsg":"(Ingen maler definert)","insertOption":"Erstatt gjeldende innhold","options":"Alternativer for mal","selectPromptMsg":"Velg malen du vil åpne i redigeringsverktøyet:","title":"Innholdsmaler"},"contextmenu":{"options":"Alternativer for høyreklikkmeny"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Tittel","cssClassInputLabel":"Stilark-klasser","edit":"Rediger Div","inlineStyleInputLabel":"Inlinestiler","langDirLTRLabel":"Venstre til høyre (LTR)","langDirLabel":"Språkretning","langDirRTLLabel":"Høyre til venstre (RTL)","languageCodeInputLabel":" Språkkode","remove":"Fjern Div","styleSelectLabel":"Stil","title":"Sett inn Div Container","toolbar":"Sett inn Div Container"},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"elementspath":{"eleLabel":"Element-sti","eleTitle":"%1 element"},"find":{"find":"Søk","findOptions":"Søkealternativer","findWhat":"Søk etter:","matchCase":"Skill mellom store og små bokstaver","matchCyclic":"Søk i hele dokumentet","matchWord":"Bare hele ord","notFoundMsg":"Fant ikke søketeksten.","replace":"Erstatt","replaceAll":"Erstatt alle","replaceSuccessMsg":"%1 tilfelle(r) erstattet.","replaceWith":"Erstatt med:","title":"Søk og erstatt"},"fakeobjects":{"anchor":"Anker","flash":"Flash-animasjon","hiddenfield":"Skjult felt","iframe":"IFrame","unknown":"Ukjent objekt"},"flash":{"access":"Scripttilgang","accessAlways":"Alltid","accessNever":"Aldri","accessSameDomain":"Samme domene","alignAbsBottom":"Abs bunn","alignAbsMiddle":"Abs midten","alignBaseline":"Bunnlinje","alignTextTop":"Tekst topp","bgcolor":"Bakgrunnsfarge","chkFull":"Tillat fullskjerm","chkLoop":"Loop","chkMenu":"Slå på Flash-meny","chkPlay":"Autospill","flashvars":"Variabler for flash","hSpace":"HMarg","properties":"Egenskaper for Flash-objekt","propertiesTab":"Egenskaper","quality":"Kvalitet","qualityAutoHigh":"Auto høy","qualityAutoLow":"Auto lav","qualityBest":"Best","qualityHigh":"Høy","qualityLow":"Lav","qualityMedium":"Medium","scale":"Skaler","scaleAll":"Vis alt","scaleFit":"Skaler til å passe","scaleNoBorder":"Ingen ramme","title":"Flash-egenskaper","vSpace":"VMarg","validateHSpace":"HMarg må være et tall.","validateSrc":"Vennligst skriv inn lenkens url.","validateVSpace":"VMarg må være et tall.","windowMode":"Vindumodus","windowModeOpaque":"Opaque","windowModeTransparent":"Gjennomsiktig","windowModeWindow":"Vindu"},"font":{"fontSize":{"label":"Størrelse","voiceLabel":"Skriftstørrelse","panelTitle":"Skriftstørrelse"},"label":"Skrift","panelTitle":"Skrift","voiceLabel":"Font"},"forms":{"button":{"title":"Egenskaper for knapp","text":"Tekst (verdi)","type":"Type","typeBtn":"Knapp","typeSbm":"Send","typeRst":"Nullstill"},"checkboxAndRadio":{"checkboxTitle":"Egenskaper for avmerkingsboks","radioTitle":"Egenskaper for alternativknapp","value":"Verdi","selected":"Valgt","required":"Påkrevd"},"form":{"title":"Egenskaper for skjema","menu":"Egenskaper for skjema","action":"Handling","method":"Metode","encoding":"Encoding"},"hidden":{"title":"Egenskaper for skjult felt","name":"Navn","value":"Verdi"},"select":{"title":"Egenskaper for rullegardinliste","selectInfo":"Info","opAvail":"Tilgjengelige alternativer","value":"Verdi","size":"Størrelse","lines":"Linjer","chkMulti":"Tillat flervalg","required":"Påkrevd","opText":"Tekst","opValue":"Verdi","btnAdd":"Legg til","btnModify":"Endre","btnUp":"Opp","btnDown":"Ned","btnSetValue":"Sett som valgt","btnDelete":"Slett"},"textarea":{"title":"Egenskaper for tekstområde","cols":"Kolonner","rows":"Rader"},"textfield":{"title":"Egenskaper for tekstfelt","name":"Navn","value":"Verdi","charWidth":"Tegnbredde","maxChars":"Maks antall tegn","required":"Påkrevd","type":"Type","typeText":"Tekst","typePass":"Passord","typeEmail":"Epost","typeSearch":"Søk","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Avsnittsformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formatert"},"horizontalrule":{"toolbar":"Sett inn horisontal linje"},"iframe":{"border":"Vis ramme rundt iframe","noUrl":"Vennligst skriv inn URL for iframe","scrolling":"Aktiver scrollefelt","title":"Egenskaper for IFrame","toolbar":"IFrame"},"image":{"alt":"Alternativ tekst","border":"Ramme","btnUpload":"Send det til serveren","button2Img":"Vil du endre den valgte bildeknappen til et vanlig bilde?","hSpace":"HMarg","img2Button":"Vil du endre det valgte bildet til en bildeknapp?","infoTab":"Bildeinformasjon","linkTab":"Lenke","lockRatio":"Lås forhold","menu":"Bildeegenskaper","resetSize":"Tilbakestill størrelse","title":"Bildeegenskaper","titleButton":"Egenskaper for bildeknapp","upload":"Last opp","urlMissing":"Bildets adresse mangler.","vSpace":"VMarg","validateBorder":"Ramme må være et heltall.","validateHSpace":"HMarg må være et heltall.","validateVSpace":"VMarg må være et heltall."},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"smiley":{"options":"Alternativer for smil","title":"Sett inn smil","toolbar":"Smil"},"justify":{"block":"Blokkjuster","center":"Midtstill","left":"Venstrejuster","right":"Høyrejuster"},"language":{"button":"Sett språk","remove":"Fjern språk"},"link":{"acccessKey":"Aksessknapp","advanced":"Avansert","advisoryContentType":"Type","advisoryTitle":"Tittel","anchor":{"toolbar":"Anker","menu":"Rediger anker","title":"Egenskaper for anker","name":"Ankernavn","errorName":"Vennligst skriv inn ankernavnet","remove":"Fjern anker"},"anchorId":"Element etter ID","anchorName":"Anker etter navn","charset":"Lenket tegnsett","cssClasses":"Stilarkklasser","download":"Tving nedlasting","displayText":"Tekst som skal vises","emailAddress":"E-postadresse","emailBody":"Melding","emailSubject":"Meldingsemne","id":"Id","info":"Lenkeinfo","langCode":"Språkkode","langDir":"Språkretning","langDirLTR":"Venstre til høyre (LTR)","langDirRTL":"Høyre til venstre (RTL)","menu":"Rediger lenke","name":"Navn","noAnchors":"(Ingen anker i dokumentet)","noEmail":"Vennligst skriv inn e-postadressen","noUrl":"Vennligst skriv inn lenkens URL","other":"<annen>","popupDependent":"Avhenging (Netscape)","popupFeatures":"Egenskaper for popup-vindu","popupFullScreen":"Fullskjerm (IE)","popupLeft":"Venstre posisjon","popupLocationBar":"Adresselinje","popupMenuBar":"Menylinje","popupResizable":"Skalerbar","popupScrollBars":"Scrollbar","popupStatusBar":"Statuslinje","popupToolbar":"Verktøylinje","popupTop":"Topp-posisjon","rel":"Relasjon (rel)","selectAnchor":"Velg et anker","styles":"Stil","tabIndex":"Tabindeks","target":"Mål","targetFrame":"<ramme>","targetFrameName":"Målramme","targetPopup":"<popup-vindu>","targetPopupName":"Navn på popup-vindu","title":"Lenke","toAnchor":"Lenke til anker i teksten","toEmail":"E-post","toUrl":"URL","toolbar":"Lenke","type":"Lenketype","unlink":"Fjern lenke","upload":"Last opp"},"list":{"bulletedlist":"Legg til / fjern punktliste","numberedlist":"Legg til / fjern nummerert liste"},"liststyle":{"armenian":"Armensk nummerering","bulletedTitle":"Egenskaper for punktliste","circle":"Sirkel","decimal":"Tall (1, 2, 3, osv.)","decimalLeadingZero":"Tall, med førstesiffer null (01, 02, 03, osv.)","disc":"Disk","georgian":"Georgisk nummerering (an, ban, gan, osv.)","lowerAlpha":"Alfabetisk, små (a, b, c, d, e, osv.)","lowerGreek":"Gresk, små (alpha, beta, gamma, osv.)","lowerRoman":"Romertall, små (i, ii, iii, iv, v, osv.)","none":"Ingen","notset":"<ikke satt>","numberedTitle":"Egenskaper for nummerert liste","square":"Firkant","start":"Start","type":"Type","upperAlpha":"Alfabetisk, store (A, B, C, D, E, osv.)","upperRoman":"Romertall, store (I, II, III, IV, V, osv.)","validateStartNumber":"Starten på listen må være et heltall."},"magicline":{"title":"Sett inn nytt avsnitt her"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"newpage":{"toolbar":"Ny side"},"pagebreak":{"alt":"Sideskift","toolbar":"Sett inn sideskift for utskrift"},"pastetext":{"button":"Lim inn som ren tekst","title":"Lim inn som ren tekst"},"pastefromword":{"confirmCleanup":"Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?","error":"Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil","title":"Lim inn fra Word","toolbar":"Lim inn fra Word"},"preview":{"preview":"Forhåndsvis"},"print":{"toolbar":"Skriv ut"},"removeformat":{"toolbar":"Fjern formatering"},"save":{"toolbar":"Lagre"},"selectall":{"toolbar":"Merk alt"},"showblocks":{"toolbar":"Vis blokker"},"sourcearea":{"toolbar":"Kilde"},"specialchar":{"options":"Alternativer for spesialtegn","title":"Velg spesialtegn","toolbar":"Sett inn spesialtegn"},"scayt":{"btn_about":"Om SCAYT","btn_dictionaries":"Ordbøker","btn_disable":"Slå av SCAYT","btn_enable":"Slå på SCAYT","btn_langs":"Språk","btn_options":"Valg","text_title":"Stavekontroll mens du skriver"},"stylescombo":{"label":"Stil","panelTitle":"Stilformater","panelTitle1":"Blokkstiler","panelTitle2":"Inlinestiler","panelTitle3":"Objektstiler"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"undo":{"redo":"Gjør om","undo":"Angre"},"wsc":{"btnIgnore":"Ignorer","btnIgnoreAll":"Ignorer alle","btnReplace":"Erstatt","btnReplaceAll":"Erstatt alle","btnUndo":"Angre","changeTo":"Endre til","errorLoading":"Feil under lasting av applikasjonstjenestetjener: %s.","ieSpellDownload":"Stavekontroll er ikke installert. Vil du laste den ned nå?","manyChanges":"Stavekontroll fullført: %1 ord endret","noChanges":"Stavekontroll fullført: ingen ord endret","noMispell":"Stavekontroll fullført: ingen feilstavinger funnet","noSuggestions":"- Ingen forslag -","notAvailable":"Beklager, tjenesten er utilgjenglig nå.","notInDic":"Ikke i ordboken","oneChange":"Stavekontroll fullført: Ett ord endret","progress":"Stavekontroll pågår...","title":"Stavekontroll","toolbar":"Stavekontroll"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/lang/nl.js
index d6144701a24..26dd4ddc194 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/nl.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/nl.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['nl']={"editor":"Tekstverwerker","editorPanel":"Tekstverwerker beheerpaneel","common":{"editorHelp":"Druk ALT 0 voor hulp","browseServer":"Bladeren op server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Naar server verzenden","image":"Afbeelding","flash":"Flash","form":"Formulier","checkbox":"Selectievinkje","radio":"Keuzerondje","textField":"Tekstveld","textarea":"Tekstvak","hiddenField":"Verborgen veld","button":"Knop","select":"Selectieveld","imageButton":"Afbeeldingsknop","notSet":"<niet ingevuld>","id":"Id","name":"Naam","langDir":"Schrijfrichting","langDirLtr":"Links naar rechts (LTR)","langDirRtl":"Rechts naar links (RTL)","langCode":"Taalcode","longDescr":"Lange URL-omschrijving","cssClass":"Stylesheet-klassen","advisoryTitle":"Adviserende titel","cssStyle":"Stijl","ok":"OK","cancel":"Annuleren","close":"Sluiten","preview":"Voorbeeld","resize":"Sleep om te herschalen","generalTab":"Algemeen","advancedTab":"Geavanceerd","validateNumberFailed":"Deze waarde is geen geldig getal.","confirmNewPage":"Alle aangebrachte wijzigingen gaan verloren. Weet u zeker dat u een nieuwe pagina wilt openen?","confirmCancel":"Enkele opties zijn gewijzigd. Weet u zeker dat u dit dialoogvenster wilt sluiten?","options":"Opties","target":"Doelvenster","targetNew":"Nieuw venster (_blank)","targetTop":"Hele venster (_top)","targetSelf":"Zelfde venster (_self)","targetParent":"Origineel venster (_parent)","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","styles":"Stijl","cssClasses":"Stylesheet-klassen","width":"Breedte","height":"Hoogte","align":"Uitlijning","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Centreren","alignJustify":"Uitvullen","alignTop":"Boven","alignMiddle":"Midden","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde.","invalidHeight":"De hoogte moet een getal zijn.","invalidWidth":"De breedte moet een getal zijn.","invalidCssLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige CSS meeteenheid (px, %, in, cm, mm, em, ex, pt of pc).","invalidHtmlLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige HTML meeteenheid (px of %).","invalidInlineStyle":"Waarde voor de online stijl moet bestaan uit een of meerdere tupels met het formaat \"naam : waarde\", gescheiden door puntkomma's.","cssLengthTooltip":"Geef een nummer in voor een waarde in pixels of geef een nummer in met een geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, niet beschikbaar</span>"},"about":{"copy":"Copyright &copy; $1. Alle rechten voorbehouden.","dlgTitle":"Over CKEditor","help":"Bekijk de $1 voor hulp.","moreInfo":"Bezoek onze website voor licentieinformatie:","title":"Over CKEditor","userGuide":"CKEditor gebruiksaanwijzing"},"basicstyles":{"bold":"Vet","italic":"Cursief","strike":"Doorhalen","subscript":"Subscript","superscript":"Superscript","underline":"Onderstrepen"},"bidi":{"ltr":"Schrijfrichting van links naar rechts","rtl":"Schrijfrichting van rechts naar links"},"blockquote":{"toolbar":"Citaatblok"},"clipboard":{"copy":"Kopiëren","copyError":"De beveiligingsinstelling van de browser verhinderen het automatisch kopiëren. Gebruik de sneltoets Ctrl/Cmd+C van het toetsenbord.","cut":"Knippen","cutError":"De beveiligingsinstelling van de browser verhinderen het automatisch knippen. Gebruik de sneltoets Ctrl/Cmd+X van het toetsenbord.","paste":"Plakken","pasteArea":"Plakgebied","pasteMsg":"Plak de tekst in het volgende vak gebruikmakend van uw toetsenbord (<strong>Ctrl/Cmd+V</strong>) en klik op OK.","securityMsg":"Door de beveiligingsinstellingen van uw browser is het niet mogelijk om direct vanuit het klembord in de editor te plakken. Middels opnieuw plakken in dit venster kunt u de tekst alsnog plakken in de editor.","title":"Plakken"},"button":{"selectedLabel":"%1 (Geselecteerd)"},"colorbutton":{"auto":"Automatisch","bgColorTitle":"Achtergrondkleur","colors":{"000":"Zwart","800000":"Kastanjebruin","8B4513":"Chocoladebruin","2F4F4F":"Donkerleigrijs","008080":"Blauwgroen","000080":"Marine","4B0082":"Indigo","696969":"Donkergrijs","B22222":"Baksteen","A52A2A":"Bruin","DAA520":"Donkergeel","006400":"Donkergroen","40E0D0":"Turquoise","0000CD":"Middenblauw","800080":"Paars","808080":"Grijs","F00":"Rood","FF8C00":"Donkeroranje","FFD700":"Goud","008000":"Groen","0FF":"Cyaan","00F":"Blauw","EE82EE":"Violet","A9A9A9":"Donkergrijs","FFA07A":"Lichtzalm","FFA500":"Oranje","FFFF00":"Geel","00FF00":"Felgroen","AFEEEE":"Lichtturquoise","ADD8E6":"Lichtblauw","DDA0DD":"Pruim","D3D3D3":"Lichtgrijs","FFF0F5":"Linnen","FAEBD7":"Ivoor","FFFFE0":"Lichtgeel","F0FFF0":"Honingdauw","F0FFFF":"Azuur","F0F8FF":"Licht hemelsblauw","E6E6FA":"Lavendel","FFF":"Wit"},"more":"Meer kleuren...","panelTitle":"Kleuren","textColorTitle":"Tekstkleur"},"colordialog":{"clear":"Wissen","highlight":"Actief","options":"Kleuropties","selected":"Geselecteerde kleur","title":"Selecteer kleur"},"templates":{"button":"Sjablonen","emptyListMsg":"(Geen sjablonen gedefinieerd)","insertOption":"Vervang de huidige inhoud","options":"Template opties","selectPromptMsg":"Selecteer het sjabloon dat in de editor geopend moet worden (de actuele inhoud gaat verloren):","title":"Inhoud sjablonen"},"contextmenu":{"options":"Contextmenu opties"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Adviserende titel","cssClassInputLabel":"Stylesheet klassen","edit":"Div wijzigen","inlineStyleInputLabel":"Inline stijl","langDirLTRLabel":"Links naar rechts (LTR)","langDirLabel":"Schrijfrichting","langDirRTLLabel":"Rechts naar links (RTL)","languageCodeInputLabel":" Taalcode","remove":"Div verwijderen","styleSelectLabel":"Stijl","title":"Div aanmaken","toolbar":"Div aanmaken"},"toolbar":{"toolbarCollapse":"Werkbalk inklappen","toolbarExpand":"Werkbalk uitklappen","toolbarGroups":{"document":"Document","clipboard":"Klembord/Ongedaan maken","editing":"Bewerken","forms":"Formulieren","basicstyles":"Basisstijlen","paragraph":"Paragraaf","links":"Links","insert":"Invoegen","styles":"Stijlen","colors":"Kleuren","tools":"Toepassingen"},"toolbars":"Werkbalken"},"elementspath":{"eleLabel":"Elementenpad","eleTitle":"%1 element"},"find":{"find":"Zoeken","findOptions":"Zoekopties","findWhat":"Zoeken naar:","matchCase":"Hoofdlettergevoelig","matchCyclic":"Doorlopend zoeken","matchWord":"Hele woord moet voorkomen","notFoundMsg":"De opgegeven tekst is niet gevonden.","replace":"Vervangen","replaceAll":"Alles vervangen","replaceSuccessMsg":"%1 resultaten vervangen.","replaceWith":"Vervangen met:","title":"Zoeken en vervangen"},"fakeobjects":{"anchor":"Interne link","flash":"Flash animatie","hiddenfield":"Verborgen veld","iframe":"IFrame","unknown":"Onbekend object"},"flash":{"access":"Script toegang","accessAlways":"Altijd","accessNever":"Nooit","accessSameDomain":"Zelfde domeinnaam","alignAbsBottom":"Absoluut-onder","alignAbsMiddle":"Absoluut-midden","alignBaseline":"Basislijn","alignTextTop":"Boven tekst","bgcolor":"Achtergrondkleur","chkFull":"Schermvullend toestaan","chkLoop":"Herhalen","chkMenu":"Flashmenu's inschakelen","chkPlay":"Automatisch afspelen","flashvars":"Variabelen voor Flash","hSpace":"HSpace","properties":"Eigenschappen Flash","propertiesTab":"Eigenschappen","quality":"Kwaliteit","qualityAutoHigh":"Automatisch hoog","qualityAutoLow":"Automatisch laag","qualityBest":"Beste","qualityHigh":"Hoog","qualityLow":"Laag","qualityMedium":"Gemiddeld","scale":"Schaal","scaleAll":"Alles tonen","scaleFit":"Precies passend","scaleNoBorder":"Geen rand","title":"Eigenschappen Flash","vSpace":"VSpace","validateHSpace":"De HSpace moet een getal zijn.","validateSrc":"De URL mag niet leeg zijn.","validateVSpace":"De VSpace moet een getal zijn.","windowMode":"Venster modus","windowModeOpaque":"Ondoorzichtig","windowModeTransparent":"Doorzichtig","windowModeWindow":"Venster"},"font":{"fontSize":{"label":"Lettergrootte","voiceLabel":"Lettergrootte","panelTitle":"Lettergrootte"},"label":"Lettertype","panelTitle":"Lettertype","voiceLabel":"Lettertype"},"forms":{"button":{"title":"Eigenschappen knop","text":"Tekst (waarde)","type":"Soort","typeBtn":"Knop","typeSbm":"Versturen","typeRst":"Leegmaken"},"checkboxAndRadio":{"checkboxTitle":"Eigenschappen aanvinkvakje","radioTitle":"Eigenschappen selectievakje","value":"Waarde","selected":"Geselecteerd","required":"Vereist"},"form":{"title":"Eigenschappen formulier","menu":"Eigenschappen formulier","action":"Actie","method":"Methode","encoding":"Codering"},"hidden":{"title":"Eigenschappen verborgen veld","name":"Naam","value":"Waarde"},"select":{"title":"Eigenschappen selectieveld","selectInfo":"Informatie","opAvail":"Beschikbare opties","value":"Waarde","size":"Grootte","lines":"Regels","chkMulti":"Gecombineerde selecties toestaan","required":"Vereist","opText":"Tekst","opValue":"Waarde","btnAdd":"Toevoegen","btnModify":"Wijzigen","btnUp":"Omhoog","btnDown":"Omlaag","btnSetValue":"Als geselecteerde waarde instellen","btnDelete":"Verwijderen"},"textarea":{"title":"Eigenschappen tekstvak","cols":"Kolommen","rows":"Rijen"},"textfield":{"title":"Eigenschappen tekstveld","name":"Naam","value":"Waarde","charWidth":"Breedte (tekens)","maxChars":"Maximum aantal tekens","required":"Vereist","type":"Soort","typeText":"Tekst","typePass":"Wachtwoord","typeEmail":"E-mail","typeSearch":"Zoeken","typeTel":"Telefoonnummer","typeUrl":"URL"}},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Kop 1","tag_h2":"Kop 2","tag_h3":"Kop 3","tag_h4":"Kop 4","tag_h5":"Kop 5","tag_h6":"Kop 6","tag_p":"Normaal","tag_pre":"Met opmaak"},"horizontalrule":{"toolbar":"Horizontale lijn invoegen"},"iframe":{"border":"Framerand tonen","noUrl":"Vul de IFrame URL in","scrolling":"Scrollbalken inschakelen","title":"IFrame-eigenschappen","toolbar":"IFrame"},"image":{"alt":"Alternatieve tekst","border":"Rand","btnUpload":"Naar server verzenden","button2Img":"Wilt u de geselecteerde afbeeldingsknop vervangen door een eenvoudige afbeelding?","hSpace":"HSpace","img2Button":"Wilt u de geselecteerde afbeelding vervangen door een afbeeldingsknop?","infoTab":"Informatie afbeelding","linkTab":"Link","lockRatio":"Afmetingen vergrendelen","menu":"Eigenschappen afbeelding","resetSize":"Afmetingen resetten","title":"Eigenschappen afbeelding","titleButton":"Eigenschappen afbeeldingsknop","upload":"Upload","urlMissing":"De URL naar de afbeelding ontbreekt.","vSpace":"VSpace","validateBorder":"Rand moet een heel nummer zijn.","validateHSpace":"HSpace moet een heel nummer zijn.","validateVSpace":"VSpace moet een heel nummer zijn."},"indent":{"indent":"Inspringing vergroten","outdent":"Inspringing verkleinen"},"smiley":{"options":"Smiley opties","title":"Smiley invoegen","toolbar":"Smiley"},"justify":{"block":"Uitvullen","center":"Centreren","left":"Links uitlijnen","right":"Rechts uitlijnen"},"language":{"button":"Taal instellen","remove":"Taal verwijderen"},"link":{"acccessKey":"Toegangstoets","advanced":"Geavanceerd","advisoryContentType":"Aanbevolen content-type","advisoryTitle":"Adviserende titel","anchor":{"toolbar":"Interne link","menu":"Eigenschappen interne link","title":"Eigenschappen interne link","name":"Naam interne link","errorName":"Geef de naam van de interne link op","remove":"Interne link verwijderen"},"anchorId":"Op kenmerk interne link","anchorName":"Op naam interne link","charset":"Karakterset van gelinkte bron","cssClasses":"Stylesheet-klassen","emailAddress":"E-mailadres","emailBody":"Inhoud bericht","emailSubject":"Onderwerp bericht","id":"Id","info":"Linkomschrijving","langCode":"Taalcode","langDir":"Schrijfrichting","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","menu":"Link wijzigen","name":"Naam","noAnchors":"(Geen interne links in document gevonden)","noEmail":"Geef een e-mailadres","noUrl":"Geef de link van de URL","other":"<ander>","popupDependent":"Afhankelijk (Netscape)","popupFeatures":"Instellingen popupvenster","popupFullScreen":"Volledig scherm (IE)","popupLeft":"Positie links","popupLocationBar":"Locatiemenu","popupMenuBar":"Menubalk","popupResizable":"Herschaalbaar","popupScrollBars":"Schuifbalken","popupStatusBar":"Statusbalk","popupToolbar":"Werkbalk","popupTop":"Positie boven","rel":"Relatie","selectAnchor":"Kies een interne link","styles":"Stijl","tabIndex":"Tabvolgorde","target":"Doelvenster","targetFrame":"<frame>","targetFrameName":"Naam doelframe","targetPopup":"<popupvenster>","targetPopupName":"Naam popupvenster","title":"Link","toAnchor":"Interne link in pagina","toEmail":"E-mail","toUrl":"URL","toolbar":"Link invoegen/wijzigen","type":"Linktype","unlink":"Link verwijderen","upload":"Upload"},"list":{"bulletedlist":"Opsomming invoegen","numberedlist":"Genummerde lijst invoegen"},"liststyle":{"armenian":"Armeense nummering","bulletedTitle":"Eigenschappen lijst met opsommingstekens","circle":"Cirkel","decimal":"Cijfers (1, 2, 3, etc.)","decimalLeadingZero":"Cijfers beginnen met nul (01, 02, 03, etc.)","disc":"Schijf","georgian":"Georgische nummering (an, ban, gan, etc.)","lowerAlpha":"Kleine letters (a, b, c, d, e, etc.)","lowerGreek":"Grieks kleine letters (alpha, beta, gamma, etc.)","lowerRoman":"Romeins kleine letters (i, ii, iii, iv, v, etc.)","none":"Geen","notset":"<niet gezet>","numberedTitle":"Eigenschappen genummerde lijst","square":"Vierkant","start":"Start","type":"Type","upperAlpha":"Hoofdletters (A, B, C, D, E, etc.)","upperRoman":"Romeinse hoofdletters (I, II, III, IV, V, etc.)","validateStartNumber":"Startnummer van de lijst moet een heel nummer zijn."},"magicline":{"title":"Hier paragraaf invoeren"},"maximize":{"maximize":"Maximaliseren","minimize":"Minimaliseren"},"newpage":{"toolbar":"Nieuwe pagina"},"pagebreak":{"alt":"Pagina-einde","toolbar":"Pagina-einde invoegen"},"pastetext":{"button":"Plakken als platte tekst","title":"Plakken als platte tekst"},"pastefromword":{"confirmCleanup":"De tekst die u wilt plakken lijkt gekopieerd te zijn vanuit Word. Wilt u de tekst opschonen voordat deze geplakt wordt?","error":"Het was niet mogelijk om de geplakte tekst op te schonen door een interne fout","title":"Plakken vanuit Word","toolbar":"Plakken vanuit Word"},"preview":{"preview":"Voorbeeld"},"print":{"toolbar":"Afdrukken"},"removeformat":{"toolbar":"Opmaak verwijderen"},"save":{"toolbar":"Opslaan"},"selectall":{"toolbar":"Alles selecteren"},"showblocks":{"toolbar":"Toon blokken"},"sourcearea":{"toolbar":"Broncode"},"specialchar":{"options":"Speciale tekens opties","title":"Selecteer speciaal teken","toolbar":"Speciaal teken invoegen"},"scayt":{"btn_about":"Over SCAYT","btn_dictionaries":"Woordenboeken","btn_disable":"SCAYT uitschakelen","btn_enable":"SCAYT inschakelen","btn_langs":"Talen","btn_options":"Opties","text_title":"Controleer de spelling tijdens het typen"},"stylescombo":{"label":"Stijl","panelTitle":"Opmaakstijlen","panelTitle1":"Blok stijlen","panelTitle2":"Inline stijlen","panelTitle3":"Object stijlen"},"table":{"border":"Randdikte","caption":"Titel","cell":{"menu":"Cel","insertBefore":"Voeg cel in voor","insertAfter":"Voeg cel in na","deleteCell":"Cellen verwijderen","merge":"Cellen samenvoegen","mergeRight":"Voeg samen naar rechts","mergeDown":"Voeg samen naar beneden","splitHorizontal":"Splits cel horizontaal","splitVertical":"Splits cel vertikaal","title":"Celeigenschappen","cellType":"Celtype","rowSpan":"Rijen samenvoegen","colSpan":"Kolommen samenvoegen","wordWrap":"Automatische terugloop","hAlign":"Horizontale uitlijning","vAlign":"Verticale uitlijning","alignBaseline":"Tekstregel","bgColor":"Achtergrondkleur","borderColor":"Randkleur","data":"Gegevens","header":"Kop","yes":"Ja","no":"Nee","invalidWidth":"De celbreedte moet een getal zijn.","invalidHeight":"De celhoogte moet een getal zijn.","invalidRowSpan":"Rijen samenvoegen moet een heel getal zijn.","invalidColSpan":"Kolommen samenvoegen moet een heel getal zijn.","chooseColor":"Kies"},"cellPad":"Celopvulling","cellSpace":"Celafstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Kolommen verwijderen"},"columns":"Kolommen","deleteTable":"Tabel verwijderen","headers":"Koppen","headersBoth":"Beide","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste rij","invalidBorder":"De randdikte moet een getal zijn.","invalidCellPadding":"Celopvulling moet een getal zijn.","invalidCellSpacing":"Celafstand moet een getal zijn.","invalidCols":"Het aantal kolommen moet een getal zijn groter dan 0.","invalidHeight":"De tabelhoogte moet een getal zijn.","invalidRows":"Het aantal rijen moet een getal zijn groter dan 0.","invalidWidth":"De tabelbreedte moet een getal zijn.","menu":"Tabeleigenschappen","row":{"menu":"Rij","insertBefore":"Voeg rij in voor","insertAfter":"Voeg rij in na","deleteRow":"Rijen verwijderen"},"rows":"Rijen","summary":"Samenvatting","title":"Tabeleigenschappen","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"eenheid breedte"},"undo":{"redo":"Opnieuw uitvoeren","undo":"Ongedaan maken"},"wsc":{"btnIgnore":"Negeren","btnIgnoreAll":"Alles negeren","btnReplace":"Vervangen","btnReplaceAll":"Alles vervangen","btnUndo":"Ongedaan maken","changeTo":"Wijzig in","errorLoading":"Er is een fout opgetreden bij het laden van de dienst: %s.","ieSpellDownload":"De spellingscontrole is niet geïnstalleerd. Wilt u deze nu downloaden?","manyChanges":"Klaar met spellingscontrole: %1 woorden aangepast","noChanges":"Klaar met spellingscontrole: geen woorden aangepast","noMispell":"Klaar met spellingscontrole: geen fouten gevonden","noSuggestions":"- Geen suggesties -","notAvailable":"Excuses, deze dienst is momenteel niet beschikbaar.","notInDic":"Niet in het woordenboek","oneChange":"Klaar met spellingscontrole: één woord aangepast","progress":"Bezig met spellingscontrole...","title":"Spellingscontrole","toolbar":"Spellingscontrole"}};
\ No newline at end of file
+CKEDITOR.lang['nl']={"editor":"Tekstverwerker","editorPanel":"Tekstverwerker beheerpaneel","common":{"editorHelp":"Druk ALT 0 voor hulp","browseServer":"Bladeren op server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Naar server verzenden","image":"Afbeelding","flash":"Flash","form":"Formulier","checkbox":"Selectievinkje","radio":"Keuzerondje","textField":"Tekstveld","textarea":"Tekstvak","hiddenField":"Verborgen veld","button":"Knop","select":"Selectieveld","imageButton":"Afbeeldingsknop","notSet":"<niet ingevuld>","id":"Id","name":"Naam","langDir":"Schrijfrichting","langDirLtr":"Links naar rechts (LTR)","langDirRtl":"Rechts naar links (RTL)","langCode":"Taalcode","longDescr":"Lange URL-omschrijving","cssClass":"Stylesheet-klassen","advisoryTitle":"Adviserende titel","cssStyle":"Stijl","ok":"OK","cancel":"Annuleren","close":"Sluiten","preview":"Voorbeeld","resize":"Sleep om te herschalen","generalTab":"Algemeen","advancedTab":"Geavanceerd","validateNumberFailed":"Deze waarde is geen geldig getal.","confirmNewPage":"Alle aangebrachte wijzigingen gaan verloren. Weet u zeker dat u een nieuwe pagina wilt openen?","confirmCancel":"Enkele opties zijn gewijzigd. Weet u zeker dat u dit dialoogvenster wilt sluiten?","options":"Opties","target":"Doelvenster","targetNew":"Nieuw venster (_blank)","targetTop":"Hele venster (_top)","targetSelf":"Zelfde venster (_self)","targetParent":"Origineel venster (_parent)","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","styles":"Stijl","cssClasses":"Stylesheet-klassen","width":"Breedte","height":"Hoogte","align":"Uitlijning","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Centreren","alignJustify":"Uitvullen","alignTop":"Boven","alignMiddle":"Midden","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde.","invalidHeight":"De hoogte moet een getal zijn.","invalidWidth":"De breedte moet een getal zijn.","invalidCssLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige CSS meeteenheid (px, %, in, cm, mm, em, ex, pt of pc).","invalidHtmlLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige HTML meeteenheid (px of %).","invalidInlineStyle":"Waarde voor de online stijl moet bestaan uit een of meerdere tupels met het formaat \"naam : waarde\", gescheiden door puntkomma's.","cssLengthTooltip":"Geef een nummer in voor een waarde in pixels of geef een nummer in met een geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, niet beschikbaar</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Spatie","35":"End","36":"Home","46":"Verwijderen","224":"Command"},"keyboardShortcut":"Sneltoets"},"about":{"copy":"Copyright &copy; $1. Alle rechten voorbehouden.","dlgTitle":"Over CKEditor","help":"Bekijk de $1 voor hulp.","moreInfo":"Bezoek onze website voor licentieinformatie:","title":"Over CKEditor","userGuide":"CKEditor gebruiksaanwijzing"},"basicstyles":{"bold":"Vet","italic":"Cursief","strike":"Doorhalen","subscript":"Subscript","superscript":"Superscript","underline":"Onderstrepen"},"bidi":{"ltr":"Schrijfrichting van links naar rechts","rtl":"Schrijfrichting van rechts naar links"},"blockquote":{"toolbar":"Citaatblok"},"clipboard":{"copy":"Kopiëren","copyError":"De beveiligingsinstelling van de browser verhinderen het automatisch kopiëren. Gebruik de sneltoets Ctrl/Cmd+C van het toetsenbord.","cut":"Knippen","cutError":"De beveiligingsinstelling van de browser verhinderen het automatisch knippen. Gebruik de sneltoets Ctrl/Cmd+X van het toetsenbord.","paste":"Plakken","pasteArea":"Plakgebied","pasteMsg":"Plak de tekst in het volgende vak gebruikmakend van uw toetsenbord (<strong>Ctrl/Cmd+V</strong>) en klik op OK.","securityMsg":"Door de beveiligingsinstellingen van uw browser is het niet mogelijk om direct vanuit het klembord in de editor te plakken. Middels opnieuw plakken in dit venster kunt u de tekst alsnog plakken in de editor.","title":"Plakken"},"button":{"selectedLabel":"%1 (Geselecteerd)"},"colorbutton":{"auto":"Automatisch","bgColorTitle":"Achtergrondkleur","colors":{"000":"Zwart","800000":"Kastanjebruin","8B4513":"Chocoladebruin","2F4F4F":"Donkerleigrijs","008080":"Blauwgroen","000080":"Marine","4B0082":"Indigo","696969":"Donkergrijs","B22222":"Baksteen","A52A2A":"Bruin","DAA520":"Donkergeel","006400":"Donkergroen","40E0D0":"Turquoise","0000CD":"Middenblauw","800080":"Paars","808080":"Grijs","F00":"Rood","FF8C00":"Donkeroranje","FFD700":"Goud","008000":"Groen","0FF":"Cyaan","00F":"Blauw","EE82EE":"Violet","A9A9A9":"Donkergrijs","FFA07A":"Lichtzalm","FFA500":"Oranje","FFFF00":"Geel","00FF00":"Felgroen","AFEEEE":"Lichtturquoise","ADD8E6":"Lichtblauw","DDA0DD":"Pruim","D3D3D3":"Lichtgrijs","FFF0F5":"Linnen","FAEBD7":"Ivoor","FFFFE0":"Lichtgeel","F0FFF0":"Honingdauw","F0FFFF":"Azuur","F0F8FF":"Licht hemelsblauw","E6E6FA":"Lavendel","FFF":"Wit","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Meer kleuren...","panelTitle":"Kleuren","textColorTitle":"Tekstkleur"},"colordialog":{"clear":"Wissen","highlight":"Actief","options":"Kleuropties","selected":"Geselecteerde kleur","title":"Selecteer kleur"},"templates":{"button":"Sjablonen","emptyListMsg":"(Geen sjablonen gedefinieerd)","insertOption":"Vervang de huidige inhoud","options":"Template opties","selectPromptMsg":"Selecteer het sjabloon dat in de editor geopend moet worden (de actuele inhoud gaat verloren):","title":"Inhoud sjablonen"},"contextmenu":{"options":"Contextmenu opties"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Adviserende titel","cssClassInputLabel":"Stylesheet klassen","edit":"Div wijzigen","inlineStyleInputLabel":"Inline stijl","langDirLTRLabel":"Links naar rechts (LTR)","langDirLabel":"Schrijfrichting","langDirRTLLabel":"Rechts naar links (RTL)","languageCodeInputLabel":" Taalcode","remove":"Div verwijderen","styleSelectLabel":"Stijl","title":"Div aanmaken","toolbar":"Div aanmaken"},"toolbar":{"toolbarCollapse":"Werkbalk inklappen","toolbarExpand":"Werkbalk uitklappen","toolbarGroups":{"document":"Document","clipboard":"Klembord/Ongedaan maken","editing":"Bewerken","forms":"Formulieren","basicstyles":"Basisstijlen","paragraph":"Paragraaf","links":"Links","insert":"Invoegen","styles":"Stijlen","colors":"Kleuren","tools":"Toepassingen"},"toolbars":"Werkbalken"},"elementspath":{"eleLabel":"Elementenpad","eleTitle":"%1 element"},"find":{"find":"Zoeken","findOptions":"Zoekopties","findWhat":"Zoeken naar:","matchCase":"Hoofdlettergevoelig","matchCyclic":"Doorlopend zoeken","matchWord":"Hele woord moet voorkomen","notFoundMsg":"De opgegeven tekst is niet gevonden.","replace":"Vervangen","replaceAll":"Alles vervangen","replaceSuccessMsg":"%1 resultaten vervangen.","replaceWith":"Vervangen met:","title":"Zoeken en vervangen"},"fakeobjects":{"anchor":"Interne link","flash":"Flash animatie","hiddenfield":"Verborgen veld","iframe":"IFrame","unknown":"Onbekend object"},"flash":{"access":"Script toegang","accessAlways":"Altijd","accessNever":"Nooit","accessSameDomain":"Zelfde domeinnaam","alignAbsBottom":"Absoluut-onder","alignAbsMiddle":"Absoluut-midden","alignBaseline":"Basislijn","alignTextTop":"Boven tekst","bgcolor":"Achtergrondkleur","chkFull":"Schermvullend toestaan","chkLoop":"Herhalen","chkMenu":"Flashmenu's inschakelen","chkPlay":"Automatisch afspelen","flashvars":"Variabelen voor Flash","hSpace":"HSpace","properties":"Eigenschappen Flash","propertiesTab":"Eigenschappen","quality":"Kwaliteit","qualityAutoHigh":"Automatisch hoog","qualityAutoLow":"Automatisch laag","qualityBest":"Beste","qualityHigh":"Hoog","qualityLow":"Laag","qualityMedium":"Gemiddeld","scale":"Schaal","scaleAll":"Alles tonen","scaleFit":"Precies passend","scaleNoBorder":"Geen rand","title":"Eigenschappen Flash","vSpace":"VSpace","validateHSpace":"De HSpace moet een getal zijn.","validateSrc":"De URL mag niet leeg zijn.","validateVSpace":"De VSpace moet een getal zijn.","windowMode":"Venster modus","windowModeOpaque":"Ondoorzichtig","windowModeTransparent":"Doorzichtig","windowModeWindow":"Venster"},"font":{"fontSize":{"label":"Lettergrootte","voiceLabel":"Lettergrootte","panelTitle":"Lettergrootte"},"label":"Lettertype","panelTitle":"Lettertype","voiceLabel":"Lettertype"},"forms":{"button":{"title":"Eigenschappen knop","text":"Tekst (waarde)","type":"Soort","typeBtn":"Knop","typeSbm":"Versturen","typeRst":"Leegmaken"},"checkboxAndRadio":{"checkboxTitle":"Eigenschappen aanvinkvakje","radioTitle":"Eigenschappen selectievakje","value":"Waarde","selected":"Geselecteerd","required":"Vereist"},"form":{"title":"Eigenschappen formulier","menu":"Eigenschappen formulier","action":"Actie","method":"Methode","encoding":"Codering"},"hidden":{"title":"Eigenschappen verborgen veld","name":"Naam","value":"Waarde"},"select":{"title":"Eigenschappen selectieveld","selectInfo":"Informatie","opAvail":"Beschikbare opties","value":"Waarde","size":"Grootte","lines":"Regels","chkMulti":"Gecombineerde selecties toestaan","required":"Vereist","opText":"Tekst","opValue":"Waarde","btnAdd":"Toevoegen","btnModify":"Wijzigen","btnUp":"Omhoog","btnDown":"Omlaag","btnSetValue":"Als geselecteerde waarde instellen","btnDelete":"Verwijderen"},"textarea":{"title":"Eigenschappen tekstvak","cols":"Kolommen","rows":"Rijen"},"textfield":{"title":"Eigenschappen tekstveld","name":"Naam","value":"Waarde","charWidth":"Breedte (tekens)","maxChars":"Maximum aantal tekens","required":"Vereist","type":"Soort","typeText":"Tekst","typePass":"Wachtwoord","typeEmail":"E-mail","typeSearch":"Zoeken","typeTel":"Telefoonnummer","typeUrl":"URL"}},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Kop 1","tag_h2":"Kop 2","tag_h3":"Kop 3","tag_h4":"Kop 4","tag_h5":"Kop 5","tag_h6":"Kop 6","tag_p":"Normaal","tag_pre":"Met opmaak"},"horizontalrule":{"toolbar":"Horizontale lijn invoegen"},"iframe":{"border":"Framerand tonen","noUrl":"Vul de IFrame URL in","scrolling":"Scrollbalken inschakelen","title":"IFrame-eigenschappen","toolbar":"IFrame"},"image":{"alt":"Alternatieve tekst","border":"Rand","btnUpload":"Naar server verzenden","button2Img":"Wilt u de geselecteerde afbeeldingsknop vervangen door een eenvoudige afbeelding?","hSpace":"HSpace","img2Button":"Wilt u de geselecteerde afbeelding vervangen door een afbeeldingsknop?","infoTab":"Informatie afbeelding","linkTab":"Link","lockRatio":"Afmetingen vergrendelen","menu":"Eigenschappen afbeelding","resetSize":"Afmetingen resetten","title":"Eigenschappen afbeelding","titleButton":"Eigenschappen afbeeldingsknop","upload":"Upload","urlMissing":"De URL naar de afbeelding ontbreekt.","vSpace":"VSpace","validateBorder":"Rand moet een heel nummer zijn.","validateHSpace":"HSpace moet een heel nummer zijn.","validateVSpace":"VSpace moet een heel nummer zijn."},"indent":{"indent":"Inspringing vergroten","outdent":"Inspringing verkleinen"},"smiley":{"options":"Smiley opties","title":"Smiley invoegen","toolbar":"Smiley"},"justify":{"block":"Uitvullen","center":"Centreren","left":"Links uitlijnen","right":"Rechts uitlijnen"},"language":{"button":"Taal instellen","remove":"Taal verwijderen"},"link":{"acccessKey":"Toegangstoets","advanced":"Geavanceerd","advisoryContentType":"Aanbevolen content-type","advisoryTitle":"Adviserende titel","anchor":{"toolbar":"Interne link","menu":"Eigenschappen interne link","title":"Eigenschappen interne link","name":"Naam interne link","errorName":"Geef de naam van de interne link op","remove":"Interne link verwijderen"},"anchorId":"Op kenmerk interne link","anchorName":"Op naam interne link","charset":"Karakterset van gelinkte bron","cssClasses":"Stylesheet-klassen","download":"Download forceren","displayText":"Weergavetekst","emailAddress":"E-mailadres","emailBody":"Inhoud bericht","emailSubject":"Onderwerp bericht","id":"Id","info":"Linkomschrijving","langCode":"Taalcode","langDir":"Schrijfrichting","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","menu":"Link wijzigen","name":"Naam","noAnchors":"(Geen interne links in document gevonden)","noEmail":"Geef een e-mailadres","noUrl":"Geef de link van de URL","other":"<ander>","popupDependent":"Afhankelijk (Netscape)","popupFeatures":"Instellingen popupvenster","popupFullScreen":"Volledig scherm (IE)","popupLeft":"Positie links","popupLocationBar":"Locatiemenu","popupMenuBar":"Menubalk","popupResizable":"Herschaalbaar","popupScrollBars":"Schuifbalken","popupStatusBar":"Statusbalk","popupToolbar":"Werkbalk","popupTop":"Positie boven","rel":"Relatie","selectAnchor":"Kies een interne link","styles":"Stijl","tabIndex":"Tabvolgorde","target":"Doelvenster","targetFrame":"<frame>","targetFrameName":"Naam doelframe","targetPopup":"<popupvenster>","targetPopupName":"Naam popupvenster","title":"Link","toAnchor":"Interne link in pagina","toEmail":"E-mail","toUrl":"URL","toolbar":"Link invoegen/wijzigen","type":"Linktype","unlink":"Link verwijderen","upload":"Upload"},"list":{"bulletedlist":"Opsomming invoegen","numberedlist":"Genummerde lijst invoegen"},"liststyle":{"armenian":"Armeense nummering","bulletedTitle":"Eigenschappen lijst met opsommingstekens","circle":"Cirkel","decimal":"Cijfers (1, 2, 3, etc.)","decimalLeadingZero":"Cijfers beginnen met nul (01, 02, 03, etc.)","disc":"Schijf","georgian":"Georgische nummering (an, ban, gan, etc.)","lowerAlpha":"Kleine letters (a, b, c, d, e, etc.)","lowerGreek":"Grieks kleine letters (alpha, beta, gamma, etc.)","lowerRoman":"Romeins kleine letters (i, ii, iii, iv, v, etc.)","none":"Geen","notset":"<niet gezet>","numberedTitle":"Eigenschappen genummerde lijst","square":"Vierkant","start":"Start","type":"Type","upperAlpha":"Hoofdletters (A, B, C, D, E, etc.)","upperRoman":"Romeinse hoofdletters (I, II, III, IV, V, etc.)","validateStartNumber":"Startnummer van de lijst moet een heel nummer zijn."},"magicline":{"title":"Hier paragraaf invoeren"},"maximize":{"maximize":"Maximaliseren","minimize":"Minimaliseren"},"newpage":{"toolbar":"Nieuwe pagina"},"pagebreak":{"alt":"Pagina-einde","toolbar":"Pagina-einde invoegen"},"pastetext":{"button":"Plakken als platte tekst","title":"Plakken als platte tekst"},"pastefromword":{"confirmCleanup":"De tekst die u wilt plakken lijkt gekopieerd te zijn vanuit Word. Wilt u de tekst opschonen voordat deze geplakt wordt?","error":"Het was niet mogelijk om de geplakte tekst op te schonen door een interne fout","title":"Plakken vanuit Word","toolbar":"Plakken vanuit Word"},"preview":{"preview":"Voorbeeld"},"print":{"toolbar":"Afdrukken"},"removeformat":{"toolbar":"Opmaak verwijderen"},"save":{"toolbar":"Opslaan"},"selectall":{"toolbar":"Alles selecteren"},"showblocks":{"toolbar":"Toon blokken"},"sourcearea":{"toolbar":"Broncode"},"specialchar":{"options":"Speciale tekens opties","title":"Selecteer speciaal teken","toolbar":"Speciaal teken invoegen"},"scayt":{"btn_about":"Over SCAYT","btn_dictionaries":"Woordenboeken","btn_disable":"SCAYT uitschakelen","btn_enable":"SCAYT inschakelen","btn_langs":"Talen","btn_options":"Opties","text_title":"Controleer de spelling tijdens het typen"},"stylescombo":{"label":"Stijl","panelTitle":"Opmaakstijlen","panelTitle1":"Blok stijlen","panelTitle2":"Inline stijlen","panelTitle3":"Object stijlen"},"table":{"border":"Randdikte","caption":"Titel","cell":{"menu":"Cel","insertBefore":"Voeg cel in voor","insertAfter":"Voeg cel in na","deleteCell":"Cellen verwijderen","merge":"Cellen samenvoegen","mergeRight":"Voeg samen naar rechts","mergeDown":"Voeg samen naar beneden","splitHorizontal":"Splits cel horizontaal","splitVertical":"Splits cel vertikaal","title":"Celeigenschappen","cellType":"Celtype","rowSpan":"Rijen samenvoegen","colSpan":"Kolommen samenvoegen","wordWrap":"Automatische terugloop","hAlign":"Horizontale uitlijning","vAlign":"Verticale uitlijning","alignBaseline":"Tekstregel","bgColor":"Achtergrondkleur","borderColor":"Randkleur","data":"Gegevens","header":"Kop","yes":"Ja","no":"Nee","invalidWidth":"De celbreedte moet een getal zijn.","invalidHeight":"De celhoogte moet een getal zijn.","invalidRowSpan":"Rijen samenvoegen moet een heel getal zijn.","invalidColSpan":"Kolommen samenvoegen moet een heel getal zijn.","chooseColor":"Kies"},"cellPad":"Celopvulling","cellSpace":"Celafstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Kolommen verwijderen"},"columns":"Kolommen","deleteTable":"Tabel verwijderen","headers":"Koppen","headersBoth":"Beide","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste rij","invalidBorder":"De randdikte moet een getal zijn.","invalidCellPadding":"Celopvulling moet een getal zijn.","invalidCellSpacing":"Celafstand moet een getal zijn.","invalidCols":"Het aantal kolommen moet een getal zijn groter dan 0.","invalidHeight":"De tabelhoogte moet een getal zijn.","invalidRows":"Het aantal rijen moet een getal zijn groter dan 0.","invalidWidth":"De tabelbreedte moet een getal zijn.","menu":"Tabeleigenschappen","row":{"menu":"Rij","insertBefore":"Voeg rij in voor","insertAfter":"Voeg rij in na","deleteRow":"Rijen verwijderen"},"rows":"Rijen","summary":"Samenvatting","title":"Tabeleigenschappen","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"eenheid breedte"},"undo":{"redo":"Opnieuw uitvoeren","undo":"Ongedaan maken"},"wsc":{"btnIgnore":"Negeren","btnIgnoreAll":"Alles negeren","btnReplace":"Vervangen","btnReplaceAll":"Alles vervangen","btnUndo":"Ongedaan maken","changeTo":"Wijzig in","errorLoading":"Er is een fout opgetreden bij het laden van de dienst: %s.","ieSpellDownload":"De spellingscontrole is niet geïnstalleerd. Wilt u deze nu downloaden?","manyChanges":"Klaar met spellingscontrole: %1 woorden aangepast","noChanges":"Klaar met spellingscontrole: geen woorden aangepast","noMispell":"Klaar met spellingscontrole: geen fouten gevonden","noSuggestions":"- Geen suggesties -","notAvailable":"Excuses, deze dienst is momenteel niet beschikbaar.","notInDic":"Niet in het woordenboek","oneChange":"Klaar met spellingscontrole: één woord aangepast","progress":"Bezig met spellingscontrole...","title":"Spellingscontrole","toolbar":"Spellingscontrole"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/no.js b/htdocs/includes/ckeditor/ckeditor/lang/no.js
index c3b638d0121..6942f5ac350 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/no.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/no.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['no']={"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla igjennom server","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","flash":"Flash","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (VTH)","langDirRtl":"Høyre til venstre (HTV)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil bli tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Noen av valgene har blitt endret. Er du sikker på at du vil lukke dialogen?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vindu (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","alignLeft":"Venstre","alignRight":"Høyre","alignCenter":"Midtjuster","alignJustify":"Blokkjuster","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor","help":"Se $1 for hjelp.","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:","title":"Om CKEditor","userGuide":"CKEditors brukerveiledning"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"bidi":{"ltr":"Tekstretning fra venstre til høyre","rtl":"Tekstretning fra høyre til venstre"},"blockquote":{"toolbar":"Blokksitat"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk snarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk snarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteArea":"Innlimingsområde","pasteMsg":"Vennligst lim inn i følgende boks med tastaturet (<STRONG>Ctrl/Cmd+V</STRONG>) og trykk <STRONG>OK</STRONG>.","securityMsg":"Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.","title":"Lim inn"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Bakgrunnsfarge","colors":{"000":"Svart","800000":"Rødbrun","8B4513":"Salbrun","2F4F4F":"Grønnsvart","008080":"Blågrønn","000080":"Marineblått","4B0082":"Indigo","696969":"Mørk grå","B22222":"Mørkerød","A52A2A":"Brun","DAA520":"Lys brun","006400":"Mørk grønn","40E0D0":"Turkis","0000CD":"Medium blå","800080":"Purpur","808080":"Grå","F00":"Rød","FF8C00":"Mørk oransje","FFD700":"Gull","008000":"Grønn","0FF":"Cyan","00F":"Blå","EE82EE":"Fiolett","A9A9A9":"Svak grå","FFA07A":"Rosa-oransje","FFA500":"Oransje","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Svak turkis","ADD8E6":"Lys Blå","DDA0DD":"Plomme","D3D3D3":"Lys grå","FFF0F5":"Svak lavendelrosa","FAEBD7":"Antikk-hvit","FFFFE0":"Lys gul","F0FFF0":"Honningmelon","F0FFFF":"Svakt asurblått","F0F8FF":"Svak cyan","E6E6FA":"Lavendel","FFF":"Hvit"},"more":"Flere farger...","panelTitle":"Farger","textColorTitle":"Tekstfarge"},"colordialog":{"clear":"Tøm","highlight":"Merk","options":"Alternativer for farge","selected":"Valgt","title":"Velg farge"},"templates":{"button":"Maler","emptyListMsg":"(Ingen maler definert)","insertOption":"Erstatt gjeldende innhold","options":"Alternativer for mal","selectPromptMsg":"Velg malen du vil åpne i redigeringsverktøyet:","title":"Innholdsmaler"},"contextmenu":{"options":"Alternativer for høyreklikkmeny"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Tittel","cssClassInputLabel":"Stilark-klasser","edit":"Rediger Div","inlineStyleInputLabel":"Inlinestiler","langDirLTRLabel":"Venstre til høyre (VTH)","langDirLabel":"Språkretning","langDirRTLLabel":"Høyre til venstre (HTV)","languageCodeInputLabel":" Språkkode","remove":"Fjern Div","styleSelectLabel":"Stil","title":"Sett inn Div Container","toolbar":"Sett inn Div Container"},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"elementspath":{"eleLabel":"Element-sti","eleTitle":"%1 element"},"find":{"find":"Søk","findOptions":"Søkealternativer","findWhat":"Søk etter:","matchCase":"Skill mellom store og små bokstaver","matchCyclic":"Søk i hele dokumentet","matchWord":"Bare hele ord","notFoundMsg":"Fant ikke søketeksten.","replace":"Erstatt","replaceAll":"Erstatt alle","replaceSuccessMsg":"%1 tilfelle(r) erstattet.","replaceWith":"Erstatt med:","title":"Søk og erstatt"},"fakeobjects":{"anchor":"Anker","flash":"Flash-animasjon","hiddenfield":"Skjult felt","iframe":"IFrame","unknown":"Ukjent objekt"},"flash":{"access":"Scripttilgang","accessAlways":"Alltid","accessNever":"Aldri","accessSameDomain":"Samme domene","alignAbsBottom":"Abs bunn","alignAbsMiddle":"Abs midten","alignBaseline":"Bunnlinje","alignTextTop":"Tekst topp","bgcolor":"Bakgrunnsfarge","chkFull":"Tillat fullskjerm","chkLoop":"Loop","chkMenu":"Slå på Flash-meny","chkPlay":"Autospill","flashvars":"Variabler for flash","hSpace":"HMarg","properties":"Egenskaper for Flash-objekt","propertiesTab":"Egenskaper","quality":"Kvalitet","qualityAutoHigh":"Auto høy","qualityAutoLow":"Auto lav","qualityBest":"Best","qualityHigh":"Høy","qualityLow":"Lav","qualityMedium":"Medium","scale":"Skaler","scaleAll":"Vis alt","scaleFit":"Skaler til å passe","scaleNoBorder":"Ingen ramme","title":"Flash-egenskaper","vSpace":"VMarg","validateHSpace":"HMarg må være et tall.","validateSrc":"Vennligst skriv inn lenkens url.","validateVSpace":"VMarg må være et tall.","windowMode":"Vindumodus","windowModeOpaque":"Opaque","windowModeTransparent":"Gjennomsiktig","windowModeWindow":"Vindu"},"font":{"fontSize":{"label":"Størrelse","voiceLabel":"Font Størrelse","panelTitle":"Størrelse"},"label":"Skrift","panelTitle":"Skrift","voiceLabel":"Font"},"forms":{"button":{"title":"Egenskaper for knapp","text":"Tekst (verdi)","type":"Type","typeBtn":"Knapp","typeSbm":"Send","typeRst":"Nullstill"},"checkboxAndRadio":{"checkboxTitle":"Egenskaper for avmerkingsboks","radioTitle":"Egenskaper for alternativknapp","value":"Verdi","selected":"Valgt","required":"Required"},"form":{"title":"Egenskaper for skjema","menu":"Egenskaper for skjema","action":"Handling","method":"Metode","encoding":"Encoding"},"hidden":{"title":"Egenskaper for skjult felt","name":"Navn","value":"Verdi"},"select":{"title":"Egenskaper for rullegardinliste","selectInfo":"Info","opAvail":"Tilgjenglige alternativer","value":"Verdi","size":"Størrelse","lines":"Linjer","chkMulti":"Tillat flervalg","required":"Required","opText":"Tekst","opValue":"Verdi","btnAdd":"Legg til","btnModify":"Endre","btnUp":"Opp","btnDown":"Ned","btnSetValue":"Sett som valgt","btnDelete":"Slett"},"textarea":{"title":"Egenskaper for tekstområde","cols":"Kolonner","rows":"Rader"},"textfield":{"title":"Egenskaper for tekstfelt","name":"Navn","value":"Verdi","charWidth":"Tegnbredde","maxChars":"Maks antall tegn","required":"Required","type":"Type","typeText":"Tekst","typePass":"Passord","typeEmail":"Epost","typeSearch":"Søk","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Avsnittsformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formatert"},"horizontalrule":{"toolbar":"Sett inn horisontal linje"},"iframe":{"border":"Viss ramme rundt iframe","noUrl":"Vennligst skriv inn URL for iframe","scrolling":"Aktiver scrollefelt","title":"Egenskaper for IFrame","toolbar":"IFrame"},"image":{"alt":"Alternativ tekst","border":"Ramme","btnUpload":"Send det til serveren","button2Img":"Vil du endre den valgte bildeknappen til et vanlig bilde?","hSpace":"HMarg","img2Button":"Vil du endre det valgte bildet til en bildeknapp?","infoTab":"Bildeinformasjon","linkTab":"Lenke","lockRatio":"Lås forhold","menu":"Bildeegenskaper","resetSize":"Tilbakestill størrelse","title":"Bildeegenskaper","titleButton":"Egenskaper for bildeknapp","upload":"Last opp","urlMissing":"Bildets adresse mangler.","vSpace":"VMarg","validateBorder":"Ramme må være et heltall.","validateHSpace":"HMarg må være et heltall.","validateVSpace":"VMarg må være et heltall."},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"smiley":{"options":"Alternativer for smil","title":"Sett inn smil","toolbar":"Smil"},"justify":{"block":"Blokkjuster","center":"Midtstill","left":"Venstrejuster","right":"Høyrejuster"},"language":{"button":"Sett språk","remove":"Fjern språk"},"link":{"acccessKey":"Aksessknapp","advanced":"Avansert","advisoryContentType":"Type","advisoryTitle":"Tittel","anchor":{"toolbar":"Sett inn/Rediger anker","menu":"Egenskaper for anker","title":"Egenskaper for anker","name":"Ankernavn","errorName":"Vennligst skriv inn ankernavnet","remove":"Fjern anker"},"anchorId":"Element etter ID","anchorName":"Anker etter navn","charset":"Lenket tegnsett","cssClasses":"Stilarkklasser","emailAddress":"E-postadresse","emailBody":"Melding","emailSubject":"Meldingsemne","id":"Id","info":"Lenkeinfo","langCode":"Språkkode","langDir":"Språkretning","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","menu":"Rediger lenke","name":"Navn","noAnchors":"(Ingen anker i dokumentet)","noEmail":"Vennligst skriv inn e-postadressen","noUrl":"Vennligst skriv inn lenkens URL","other":"<annen>","popupDependent":"Avhenging (Netscape)","popupFeatures":"Egenskaper for popup-vindu","popupFullScreen":"Fullskjerm (IE)","popupLeft":"Venstre posisjon","popupLocationBar":"Adresselinje","popupMenuBar":"Menylinje","popupResizable":"Skalerbar","popupScrollBars":"Scrollbar","popupStatusBar":"Statuslinje","popupToolbar":"Verktøylinje","popupTop":"Topp-posisjon","rel":"Relasjon (rel)","selectAnchor":"Velg et anker","styles":"Stil","tabIndex":"Tabindeks","target":"Mål","targetFrame":"<ramme>","targetFrameName":"Målramme","targetPopup":"<popup-vindu>","targetPopupName":"Navn på popup-vindu","title":"Lenke","toAnchor":"Lenke til anker i teksten","toEmail":"E-post","toUrl":"URL","toolbar":"Sett inn/Rediger lenke","type":"Lenketype","unlink":"Fjern lenke","upload":"Last opp"},"list":{"bulletedlist":"Legg til/Fjern punktmerket liste","numberedlist":"Legg til/Fjern nummerert liste"},"liststyle":{"armenian":"Armensk nummerering","bulletedTitle":"Egenskaper for punktmerket liste","circle":"Sirkel","decimal":"Tall (1, 2, 3, osv.)","decimalLeadingZero":"Tall, med førstesiffer null (01, 02, 03, osv.)","disc":"Disk","georgian":"Georgisk nummerering (an, ban, gan, osv.)","lowerAlpha":"Alfabetisk, små (a, b, c, d, e, osv.)","lowerGreek":"Gresk, små (alpha, beta, gamma, osv.)","lowerRoman":"Romertall, små (i, ii, iii, iv, v, osv.)","none":"Ingen","notset":"<ikke satt>","numberedTitle":"Egenskaper for nummerert liste","square":"Firkant","start":"Start","type":"Type","upperAlpha":"Alfabetisk, store (A, B, C, D, E, osv.)","upperRoman":"Romertall, store (I, II, III, IV, V, osv.)","validateStartNumber":"Starten på listen må være et heltall."},"magicline":{"title":"Sett inn nytt avsnitt her"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"newpage":{"toolbar":"Ny side"},"pagebreak":{"alt":"Sideskift","toolbar":"Sett inn sideskift for utskrift"},"pastetext":{"button":"Lim inn som ren tekst","title":"Lim inn som ren tekst"},"pastefromword":{"confirmCleanup":"Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?","error":"Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil","title":"Lim inn fra Word","toolbar":"Lim inn fra Word"},"preview":{"preview":"Forhåndsvis"},"print":{"toolbar":"Skriv ut"},"removeformat":{"toolbar":"Fjern formatering"},"save":{"toolbar":"Lagre"},"selectall":{"toolbar":"Merk alt"},"showblocks":{"toolbar":"Vis blokker"},"sourcearea":{"toolbar":"Kilde"},"specialchar":{"options":"Alternativer for spesialtegn","title":"Velg spesialtegn","toolbar":"Sett inn spesialtegn"},"scayt":{"btn_about":"Om SCAYT","btn_dictionaries":"Ordbøker","btn_disable":"Slå av SCAYT","btn_enable":"Slå på SCAYT","btn_langs":"Språk","btn_options":"Valg","text_title":"Stavekontroll mens du skriver"},"stylescombo":{"label":"Stil","panelTitle":"Stilformater","panelTitle1":"Blokkstiler","panelTitle2":"Inlinestiler","panelTitle3":"Objektstiler"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"undo":{"redo":"Gjør om","undo":"Angre"},"wsc":{"btnIgnore":"Ignorer","btnIgnoreAll":"Ignorer alle","btnReplace":"Erstatt","btnReplaceAll":"Erstatt alle","btnUndo":"Angre","changeTo":"Endre til","errorLoading":"Feil under lasting av applikasjonstjenestetjener: %s.","ieSpellDownload":"Stavekontroll er ikke installert. Vil du laste den ned nå?","manyChanges":"Stavekontroll fullført: %1 ord endret","noChanges":"Stavekontroll fullført: ingen ord endret","noMispell":"Stavekontroll fullført: ingen feilstavinger funnet","noSuggestions":"- Ingen forslag -","notAvailable":"Beklager, tjenesten er utilgjenglig nå.","notInDic":"Ikke i ordboken","oneChange":"Stavekontroll fullført: Ett ord endret","progress":"Stavekontroll pågår...","title":"Stavekontroll","toolbar":"Stavekontroll"}};
\ No newline at end of file
+CKEDITOR.lang['no']={"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla igjennom server","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","flash":"Flash","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (VTH)","langDirRtl":"Høyre til venstre (HTV)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil bli tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Noen av valgene har blitt endret. Er du sikker på at du vil lukke dialogen?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vindu (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","alignLeft":"Venstre","alignRight":"Høyre","alignCenter":"Midtjuster","alignJustify":"Blokkjuster","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor","help":"Se $1 for hjelp.","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:","title":"Om CKEditor","userGuide":"CKEditors brukerveiledning"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"bidi":{"ltr":"Tekstretning fra venstre til høyre","rtl":"Tekstretning fra høyre til venstre"},"blockquote":{"toolbar":"Blokksitat"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk snarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk snarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteArea":"Innlimingsområde","pasteMsg":"Vennligst lim inn i følgende boks med tastaturet (<STRONG>Ctrl/Cmd+V</STRONG>) og trykk <STRONG>OK</STRONG>.","securityMsg":"Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.","title":"Lim inn"},"button":{"selectedLabel":"%1 (Valgt)"},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Bakgrunnsfarge","colors":{"000":"Svart","800000":"Rødbrun","8B4513":"Salbrun","2F4F4F":"Grønnsvart","008080":"Blågrønn","000080":"Marineblått","4B0082":"Indigo","696969":"Mørk grå","B22222":"Mørkerød","A52A2A":"Brun","DAA520":"Lys brun","006400":"Mørk grønn","40E0D0":"Turkis","0000CD":"Medium blå","800080":"Purpur","808080":"Grå","F00":"Rød","FF8C00":"Mørk oransje","FFD700":"Gull","008000":"Grønn","0FF":"Cyan","00F":"Blå","EE82EE":"Fiolett","A9A9A9":"Svak grå","FFA07A":"Rosa-oransje","FFA500":"Oransje","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Svak turkis","ADD8E6":"Lys Blå","DDA0DD":"Plomme","D3D3D3":"Lys grå","FFF0F5":"Svak lavendelrosa","FAEBD7":"Antikk-hvit","FFFFE0":"Lys gul","F0FFF0":"Honningmelon","F0FFFF":"Svakt asurblått","F0F8FF":"Svak cyan","E6E6FA":"Lavendel","FFF":"Hvit","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Flere farger...","panelTitle":"Farger","textColorTitle":"Tekstfarge"},"colordialog":{"clear":"Tøm","highlight":"Merk","options":"Alternativer for farge","selected":"Valgt","title":"Velg farge"},"templates":{"button":"Maler","emptyListMsg":"(Ingen maler definert)","insertOption":"Erstatt gjeldende innhold","options":"Alternativer for mal","selectPromptMsg":"Velg malen du vil åpne i redigeringsverktøyet:","title":"Innholdsmaler"},"contextmenu":{"options":"Alternativer for høyreklikkmeny"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Tittel","cssClassInputLabel":"Stilark-klasser","edit":"Rediger Div","inlineStyleInputLabel":"Inlinestiler","langDirLTRLabel":"Venstre til høyre (VTH)","langDirLabel":"Språkretning","langDirRTLLabel":"Høyre til venstre (HTV)","languageCodeInputLabel":" Språkkode","remove":"Fjern Div","styleSelectLabel":"Stil","title":"Sett inn Div Container","toolbar":"Sett inn Div Container"},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"elementspath":{"eleLabel":"Element-sti","eleTitle":"%1 element"},"find":{"find":"Søk","findOptions":"Søkealternativer","findWhat":"Søk etter:","matchCase":"Skill mellom store og små bokstaver","matchCyclic":"Søk i hele dokumentet","matchWord":"Bare hele ord","notFoundMsg":"Fant ikke søketeksten.","replace":"Erstatt","replaceAll":"Erstatt alle","replaceSuccessMsg":"%1 tilfelle(r) erstattet.","replaceWith":"Erstatt med:","title":"Søk og erstatt"},"fakeobjects":{"anchor":"Anker","flash":"Flash-animasjon","hiddenfield":"Skjult felt","iframe":"IFrame","unknown":"Ukjent objekt"},"flash":{"access":"Scripttilgang","accessAlways":"Alltid","accessNever":"Aldri","accessSameDomain":"Samme domene","alignAbsBottom":"Abs bunn","alignAbsMiddle":"Abs midten","alignBaseline":"Bunnlinje","alignTextTop":"Tekst topp","bgcolor":"Bakgrunnsfarge","chkFull":"Tillat fullskjerm","chkLoop":"Loop","chkMenu":"Slå på Flash-meny","chkPlay":"Autospill","flashvars":"Variabler for flash","hSpace":"HMarg","properties":"Egenskaper for Flash-objekt","propertiesTab":"Egenskaper","quality":"Kvalitet","qualityAutoHigh":"Auto høy","qualityAutoLow":"Auto lav","qualityBest":"Best","qualityHigh":"Høy","qualityLow":"Lav","qualityMedium":"Medium","scale":"Skaler","scaleAll":"Vis alt","scaleFit":"Skaler til å passe","scaleNoBorder":"Ingen ramme","title":"Flash-egenskaper","vSpace":"VMarg","validateHSpace":"HMarg må være et tall.","validateSrc":"Vennligst skriv inn lenkens url.","validateVSpace":"VMarg må være et tall.","windowMode":"Vindumodus","windowModeOpaque":"Opaque","windowModeTransparent":"Gjennomsiktig","windowModeWindow":"Vindu"},"font":{"fontSize":{"label":"Størrelse","voiceLabel":"Font Størrelse","panelTitle":"Størrelse"},"label":"Skrift","panelTitle":"Skrift","voiceLabel":"Font"},"forms":{"button":{"title":"Egenskaper for knapp","text":"Tekst (verdi)","type":"Type","typeBtn":"Knapp","typeSbm":"Send","typeRst":"Nullstill"},"checkboxAndRadio":{"checkboxTitle":"Egenskaper for avmerkingsboks","radioTitle":"Egenskaper for alternativknapp","value":"Verdi","selected":"Valgt","required":"Required"},"form":{"title":"Egenskaper for skjema","menu":"Egenskaper for skjema","action":"Handling","method":"Metode","encoding":"Encoding"},"hidden":{"title":"Egenskaper for skjult felt","name":"Navn","value":"Verdi"},"select":{"title":"Egenskaper for rullegardinliste","selectInfo":"Info","opAvail":"Tilgjenglige alternativer","value":"Verdi","size":"Størrelse","lines":"Linjer","chkMulti":"Tillat flervalg","required":"Required","opText":"Tekst","opValue":"Verdi","btnAdd":"Legg til","btnModify":"Endre","btnUp":"Opp","btnDown":"Ned","btnSetValue":"Sett som valgt","btnDelete":"Slett"},"textarea":{"title":"Egenskaper for tekstområde","cols":"Kolonner","rows":"Rader"},"textfield":{"title":"Egenskaper for tekstfelt","name":"Navn","value":"Verdi","charWidth":"Tegnbredde","maxChars":"Maks antall tegn","required":"Required","type":"Type","typeText":"Tekst","typePass":"Passord","typeEmail":"Epost","typeSearch":"Søk","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Avsnittsformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formatert"},"horizontalrule":{"toolbar":"Sett inn horisontal linje"},"iframe":{"border":"Viss ramme rundt iframe","noUrl":"Vennligst skriv inn URL for iframe","scrolling":"Aktiver scrollefelt","title":"Egenskaper for IFrame","toolbar":"IFrame"},"image":{"alt":"Alternativ tekst","border":"Ramme","btnUpload":"Send det til serveren","button2Img":"Vil du endre den valgte bildeknappen til et vanlig bilde?","hSpace":"HMarg","img2Button":"Vil du endre det valgte bildet til en bildeknapp?","infoTab":"Bildeinformasjon","linkTab":"Lenke","lockRatio":"Lås forhold","menu":"Bildeegenskaper","resetSize":"Tilbakestill størrelse","title":"Bildeegenskaper","titleButton":"Egenskaper for bildeknapp","upload":"Last opp","urlMissing":"Bildets adresse mangler.","vSpace":"VMarg","validateBorder":"Ramme må være et heltall.","validateHSpace":"HMarg må være et heltall.","validateVSpace":"VMarg må være et heltall."},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"smiley":{"options":"Alternativer for smil","title":"Sett inn smil","toolbar":"Smil"},"justify":{"block":"Blokkjuster","center":"Midtstill","left":"Venstrejuster","right":"Høyrejuster"},"language":{"button":"Sett språk","remove":"Fjern språk"},"link":{"acccessKey":"Aksessknapp","advanced":"Avansert","advisoryContentType":"Type","advisoryTitle":"Tittel","anchor":{"toolbar":"Sett inn/Rediger anker","menu":"Egenskaper for anker","title":"Egenskaper for anker","name":"Ankernavn","errorName":"Vennligst skriv inn ankernavnet","remove":"Fjern anker"},"anchorId":"Element etter ID","anchorName":"Anker etter navn","charset":"Lenket tegnsett","cssClasses":"Stilarkklasser","download":"Force Download","displayText":"Tekst som skal vises","emailAddress":"E-postadresse","emailBody":"Melding","emailSubject":"Meldingsemne","id":"Id","info":"Lenkeinfo","langCode":"Språkkode","langDir":"Språkretning","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","menu":"Rediger lenke","name":"Navn","noAnchors":"(Ingen anker i dokumentet)","noEmail":"Vennligst skriv inn e-postadressen","noUrl":"Vennligst skriv inn lenkens URL","other":"<annen>","popupDependent":"Avhenging (Netscape)","popupFeatures":"Egenskaper for popup-vindu","popupFullScreen":"Fullskjerm (IE)","popupLeft":"Venstre posisjon","popupLocationBar":"Adresselinje","popupMenuBar":"Menylinje","popupResizable":"Skalerbar","popupScrollBars":"Scrollbar","popupStatusBar":"Statuslinje","popupToolbar":"Verktøylinje","popupTop":"Topp-posisjon","rel":"Relasjon (rel)","selectAnchor":"Velg et anker","styles":"Stil","tabIndex":"Tabindeks","target":"Mål","targetFrame":"<ramme>","targetFrameName":"Målramme","targetPopup":"<popup-vindu>","targetPopupName":"Navn på popup-vindu","title":"Lenke","toAnchor":"Lenke til anker i teksten","toEmail":"E-post","toUrl":"URL","toolbar":"Sett inn/Rediger lenke","type":"Lenketype","unlink":"Fjern lenke","upload":"Last opp"},"list":{"bulletedlist":"Legg til/Fjern punktmerket liste","numberedlist":"Legg til/Fjern nummerert liste"},"liststyle":{"armenian":"Armensk nummerering","bulletedTitle":"Egenskaper for punktmerket liste","circle":"Sirkel","decimal":"Tall (1, 2, 3, osv.)","decimalLeadingZero":"Tall, med førstesiffer null (01, 02, 03, osv.)","disc":"Disk","georgian":"Georgisk nummerering (an, ban, gan, osv.)","lowerAlpha":"Alfabetisk, små (a, b, c, d, e, osv.)","lowerGreek":"Gresk, små (alpha, beta, gamma, osv.)","lowerRoman":"Romertall, små (i, ii, iii, iv, v, osv.)","none":"Ingen","notset":"<ikke satt>","numberedTitle":"Egenskaper for nummerert liste","square":"Firkant","start":"Start","type":"Type","upperAlpha":"Alfabetisk, store (A, B, C, D, E, osv.)","upperRoman":"Romertall, store (I, II, III, IV, V, osv.)","validateStartNumber":"Starten på listen må være et heltall."},"magicline":{"title":"Sett inn nytt avsnitt her"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"newpage":{"toolbar":"Ny side"},"pagebreak":{"alt":"Sideskift","toolbar":"Sett inn sideskift for utskrift"},"pastetext":{"button":"Lim inn som ren tekst","title":"Lim inn som ren tekst"},"pastefromword":{"confirmCleanup":"Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?","error":"Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil","title":"Lim inn fra Word","toolbar":"Lim inn fra Word"},"preview":{"preview":"Forhåndsvis"},"print":{"toolbar":"Skriv ut"},"removeformat":{"toolbar":"Fjern formatering"},"save":{"toolbar":"Lagre"},"selectall":{"toolbar":"Merk alt"},"showblocks":{"toolbar":"Vis blokker"},"sourcearea":{"toolbar":"Kilde"},"specialchar":{"options":"Alternativer for spesialtegn","title":"Velg spesialtegn","toolbar":"Sett inn spesialtegn"},"scayt":{"btn_about":"Om SCAYT","btn_dictionaries":"Ordbøker","btn_disable":"Slå av SCAYT","btn_enable":"Slå på SCAYT","btn_langs":"Språk","btn_options":"Valg","text_title":"Stavekontroll mens du skriver"},"stylescombo":{"label":"Stil","panelTitle":"Stilformater","panelTitle1":"Blokkstiler","panelTitle2":"Inlinestiler","panelTitle3":"Objektstiler"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"undo":{"redo":"Gjør om","undo":"Angre"},"wsc":{"btnIgnore":"Ignorer","btnIgnoreAll":"Ignorer alle","btnReplace":"Erstatt","btnReplaceAll":"Erstatt alle","btnUndo":"Angre","changeTo":"Endre til","errorLoading":"Feil under lasting av applikasjonstjenestetjener: %s.","ieSpellDownload":"Stavekontroll er ikke installert. Vil du laste den ned nå?","manyChanges":"Stavekontroll fullført: %1 ord endret","noChanges":"Stavekontroll fullført: ingen ord endret","noMispell":"Stavekontroll fullført: ingen feilstavinger funnet","noSuggestions":"- Ingen forslag -","notAvailable":"Beklager, tjenesten er utilgjenglig nå.","notInDic":"Ikke i ordboken","oneChange":"Stavekontroll fullført: Ett ord endret","progress":"Stavekontroll pågår...","title":"Stavekontroll","toolbar":"Stavekontroll"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/oc.js b/htdocs/includes/ckeditor/ckeditor/lang/oc.js
new file mode 100644
index 00000000000..e315102e84a
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/oc.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+CKEDITOR.lang['oc']={"editor":"Editor de tèxte enriquit","editorPanel":"Tablèu de bòrd de l'editor de tèxte enriquit","common":{"editorHelp":"Utilisatz l'acorchi Alt-0 per obténer d'ajuda","browseServer":"Percórrer lo servidor","url":"URL","protocol":"Protocòl","upload":"Mandar","uploadSubmit":"Mandar sul servidor","image":"Imatge","flash":"Flash","form":"Formulari","checkbox":"Casa de marcar","radio":"Boton ràdio","textField":"Camp  tèxte","textarea":"Zòna de tèxte","hiddenField":"Camp invisible","button":"Boton","select":"Lista desenrotlanta","imageButton":"Boton amb imatge","notSet":"<indefinit>","id":"Id","name":"Nom","langDir":"Sens d'escritura","langDirLtr":"Esquèrra a dreita (LTR)","langDirRtl":"Dreita a esquèrra (RTL)","langCode":"Còdi de lenga","longDescr":"URL de descripcion longa","cssClass":"Classas d'estil","advisoryTitle":"Infobulla","cssStyle":"Estil","ok":"D'acòrdi","cancel":"Anullar","close":"Tampar","preview":"Previsualizar","resize":"Redimensionar","generalTab":"General","advancedTab":"Avançat","validateNumberFailed":"Aquesta valor es pas un nombre.","confirmNewPage":"Los cambiaments pas salvats seràn perduts. Sètz segur que volètz cargar una novèla pagina ?","confirmCancel":"Certanas opcions son estadas modificadas. Sètz segur que volètz tampar ?","options":"Opcions","target":"Cibla","targetNew":"Novèla fenèstra (_blank)","targetTop":"Fenèstra superiora (_top)","targetSelf":"Meteissa fenèstra (_self)","targetParent":"Fenèstra parent (_parent)","langDirLTR":"Esquèrra a dreita (LTR)","langDirRTL":"Dreita a esquèrra (RTL)","styles":"Estil","cssClasses":"Classas d'estil","width":"Largor","height":"Nautor","align":"Alinhament","alignLeft":"Esquèrra","alignRight":"Dreita","alignCenter":"Centrar","alignJustify":"Justificar","alignTop":"Naut","alignMiddle":"Mitan","alignBottom":"Bas","alignNone":"Pas cap","invalidValue":"Valor invalida.","invalidHeight":"La nautor deu èsser un nombre.","invalidWidth":"La largor deu èsser un nombre.","invalidCssLength":"La valor especificada pel camp « %1 » deu èsser un nombre positiu amb o sens unitat de mesura CSS valid (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"La valor especificada pel camp « %1 » deu èsser un nombre positiu amb o sens unitat de mesura HTML valid (px o %).","invalidInlineStyle":"La valor especificada per l'estil en linha deu èsser compausada d'un o mantun parelh al format « nom : valor », separats per de punts-virgulas.","cssLengthTooltip":"Entrar un nombre per una valor en pixèls o un nombre amb una unitat de mesura CSS valida (px, %, in, cm, mm, em, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>","keyboard":{"8":"Retorn","13":"Entrada","16":"Majuscula","17":"Ctrl","18":"Alt","32":"Espaci","35":"Fin","36":"Origina","46":"Suprimir","224":"Comanda"},"keyboardShortcut":"Acorchi de clavièr"},"about":{"copy":"Copyright &copy; $1. Totes los dreits reservats.","dlgTitle":"A prepaus de CKEditor","help":"Consultar $1 per obténer d'ajuda.","moreInfo":"Per las informacions de licéncia, visitatz nòstre site web :","title":"A prepaus de CKEditor","userGuide":"Guida de l'utilizaire CKEditor (en anglés)"},"basicstyles":{"bold":"Gras","italic":"Italica","strike":"Raiat","subscript":"Indici","superscript":"Exponent","underline":"Solinhat"},"bidi":{"ltr":"Direccion del tèxte d'esquèrra cap a dreita","rtl":"Direccion del tèxte de dreita cap a esquèrra"},"blockquote":{"toolbar":"Citacion"},"clipboard":{"copy":"Copiar","copyError":"Los paramètres de seguretat de vòstre navigador autorizan pas l'editor a executar automaticament l'operacion « Copiar ». Utilizatz l'acorchi de clavièr a aqueste efièit (Ctrl/Cmd+C).","cut":"Talhar","cutError":"Los paramètres de seguretat de vòstre navigador autorizan pas l'editor a executar automaticament l'operacion « Talhar ». Utilizatz l'acorchi de clavièr a aqueste efièit (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Pegar la zòna","pasteMsg":"Pegatz lo tèxte dins la zòna seguenta en utilizant l'acorchi de clavièr (<strong>Ctrl/Cmd+V</strong>) e clicatz sus D'acòrdi.","securityMsg":"Los paramètres de seguretat de vòstre navigador empach l'editor d'accedir dirèctament a las donadas del quichapapièr. Las vos cal pegar tornamai dins aquesta fenèstra.","title":"Pegar"},"button":{"selectedLabel":"%1 (Seleccionat)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Color de rèireplan","colors":{"000":"Negre","800000":"Marron","8B4513":"Brun de sèla","2F4F4F":"Gris escur de lausa","008080":"Guit","000080":"Blau marina","4B0082":"Indigo","696969":"Gris escur","B22222":"Roge teula","A52A2A":"Brun","DAA520":"Aur ternit","006400":"Verd escur","40E0D0":"Turquesa","0000CD":"Blau reial","800080":"Violet","808080":"Gris","F00":"Roge","FF8C00":"Irange escur","FFD700":"Aur","008000":"Verd","0FF":"Cian","00F":"Blau","EE82EE":"Violet","A9A9A9":"Gris tamisat","FFA07A":"Salmon clar","FFA500":"Irange","FFFF00":"Jaune","00FF00":"Lima","AFEEEE":"Turquesa clar","ADD8E6":"Blau clar","DDA0DD":"Pruna","D3D3D3":"Gris clar","FFF0F5":"Fard lavanda","FAEBD7":"Blanc antic","FFFFE0":"Jaune clar","F0FFF0":"Verd rosada","F0FFFF":"Azur","F0F8FF":"Blau Alícia","E6E6FA":"Lavanda","FFF":"Blanc","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Mai de colors...","panelTitle":"Colors","textColorTitle":"Color del tèxte"},"colordialog":{"clear":"Escafar","highlight":"Puntada","options":"Opcions de color","selected":"Color seleccionada","title":"Seleccionar una color"},"templates":{"button":"Modèls","emptyListMsg":"(Cap de modèl pas disponible)","insertOption":"Remplaçar lo contengut actual","options":"Opcions dels modèls","selectPromptMsg":"Seleccionatz lo modèl de dobrir dins l'editor","title":"Contengut dels modèls"},"contextmenu":{"options":"Opcions del menú contextual"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Infobulla","cssClassInputLabel":"Classas d'estil","edit":"Modificar la division","inlineStyleInputLabel":"Estil en linha","langDirLTRLabel":"Esquèrra a dreita (LTR)","langDirLabel":"Sens d'escritura","langDirRTLLabel":"Dreita a esquèrra (RTL)","languageCodeInputLabel":"Còdi de lenga","remove":"Levar la division","styleSelectLabel":"Estil","title":"Crear una division","toolbar":"Crear una division"},"toolbar":{"toolbarCollapse":"Enrotlar la barra d'aisinas","toolbarExpand":"Desenrotlar la barra d'aisinas","toolbarGroups":{"document":"Document","clipboard":"Quichapapièr/Desfar","editing":"Edicion","forms":"Formularis","basicstyles":"Estils de basa","paragraph":"Paragraf","links":"Ligams","insert":"Inserir","styles":"Estils","colors":"Colors","tools":"Aisinas"},"toolbars":"Barras d'aisinas de l'editor"},"elementspath":{"eleLabel":"Camin dels elements","eleTitle":"Element %1"},"find":{"find":"Recercar","findOptions":"Opcions de recèrca","findWhat":"Recercar :","matchCase":"Respectar la cassa","matchCyclic":"Boclar","matchWord":"Mot entièr unicament","notFoundMsg":"Lo tèxte especificat pòt pas èsser trobat.","replace":"Remplaçar","replaceAll":"Remplaçar tot","replaceSuccessMsg":"%1 ocurréncia(s) remplaçada(s).","replaceWith":"Remplaçar per  :","title":"Recercar e remplaçar"},"fakeobjects":{"anchor":"Ancòra","flash":"Animacion Flash","hiddenfield":"Camp invisible","iframe":"Quadre de contengut incorporat","unknown":"Objècte desconegut"},"flash":{"access":"Accès als escripts","accessAlways":"Totjorn","accessNever":"Pas jamai","accessSameDomain":"Meteis domeni","alignAbsBottom":"Bas absolut","alignAbsMiddle":"Mitan absolut","alignBaseline":"Linha de basa","alignTextTop":"Naut del tèxte","bgcolor":"Color de rèireplan","chkFull":"Permetre l'ecran complet","chkLoop":"Bocla","chkMenu":"Activar lo menú Flash","chkPlay":"Legir automaticament","flashvars":"Variablas per Flash","hSpace":"Espaçament orizontal","properties":"Proprietats del Flash","propertiesTab":"Proprietats","quality":"Qualitat","qualityAutoHigh":"Nauta automatica","qualityAutoLow":"Bassa automatica","qualityBest":"Maximala","qualityHigh":"Nauta","qualityLow":"Bassa","qualityMedium":"Mejana","scale":"Escala","scaleAll":"Afichar tot","scaleFit":"Adaptacion automatica","scaleNoBorder":"Pas cap de bordadura","title":"Proprietats del Flash","vSpace":"Espaçament vertical","validateHSpace":"L'espaçament orizontal deu èsser un nombre.","validateSrc":"L'URL deu èsser indicada.","validateVSpace":"L'espaçament vertical deu èsser un nombre.","windowMode":"Mòde fenèstra","windowModeOpaque":"Opac","windowModeTransparent":"Transparent","windowModeWindow":"Fenèstra"},"font":{"fontSize":{"label":"Talha","voiceLabel":"Talha de poliça","panelTitle":"Talha de poliça"},"label":"Poliça","panelTitle":"Estil de poliça","voiceLabel":"Poliça"},"forms":{"button":{"title":"Proprietats del boton","text":"Tèxte","type":"Tipe","typeBtn":"Boton","typeSbm":"Validacion","typeRst":"Remesa a zèro"},"checkboxAndRadio":{"checkboxTitle":"Proprietats de la casa de marcar","radioTitle":"Proprietats del boton ràdio","value":"Valor","selected":"Seleccionat","required":"Requesit"},"form":{"title":"Proprietats del formulari","menu":"Proprietats del formulari","action":"Accion","method":"Metòde","encoding":"Encodatge"},"hidden":{"title":"Proprietats del camp invisible","name":"Nom","value":"Valor"},"select":{"title":"Proprietats del menú desenrotlant","selectInfo":"Informacions sul menú desenrotlant","opAvail":"Opcions disponiblas","value":"Valor","size":"Talha","lines":"linhas","chkMulti":"Permetre las seleccions multiplas","required":"Requesit","opText":"Tèxte","opValue":"Valor","btnAdd":"Apondre","btnModify":"Modificar","btnUp":"Naut","btnDown":"Bas","btnSetValue":"Definir coma valor seleccionada","btnDelete":"Suprimir"},"textarea":{"title":"Proprietats de la zòna de tèxte","cols":"Colomnas","rows":"Linhas"},"textfield":{"title":"Proprietats del camp tèxte","name":"Nom","value":"Valor","charWidth":"Largor dels caractèrs","maxChars":"Nombre maximum de caractèrs","required":"Requesit","type":"Tipe","typeText":"Tèxte","typePass":"Senhal","typeEmail":"Corrièr electronic","typeSearch":"Recercar","typeTel":"Numèro de telefòn","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format de paragraf","tag_address":"Adreça","tag_div":"Division (DIV)","tag_h1":"Títol 1","tag_h2":"Títol 2","tag_h3":"Títol 3","tag_h4":"Títol 4","tag_h5":"Títol 5","tag_h6":"Títol 6","tag_p":"Normal","tag_pre":"Preformatat"},"horizontalrule":{"toolbar":"Inserir una linha orizontala"},"iframe":{"border":"Afichar la bordadura del quadre","noUrl":"Entratz l'URL del contengut del quadre","scrolling":"Activar las barras de desfilament","title":"Proprietats del quadre de contengut incorporat","toolbar":"Quadre de contengut incorporat"},"image":{"alt":"Tèxte alternatiu","border":"Bordadura","btnUpload":"Mandar sul servidor","button2Img":"Volètz transformar lo boton amb imatge seleccionat en imatge simple ?","hSpace":"Espaçament orizontal","img2Button":"Volètz transformar l'imatge seleccionat en boton amb imatge ?","infoTab":"Informacions sus l'imatge","linkTab":"Ligam","lockRatio":"Conservar las proporcions","menu":"Proprietats de l'imatge","resetSize":"Reïnicializar la talha","title":"Proprietats de l'imatge","titleButton":"Proprietats del boton amb imatge","upload":"Mandar","urlMissing":"L'URL font de l'imatge es mancanta.","vSpace":"Espaçament vertical","validateBorder":"La bordadura deu èsser un nombre entièr.","validateHSpace":"L'espaçament orizontal deu èsser un nombre entièr.","validateVSpace":"L'espaçament vertical deu èsser un nombre entièr."},"indent":{"indent":"Aumentar l'alinèa","outdent":"Dmesir l'alinèa"},"smiley":{"options":"Opcions dels morrons","title":"Inserir un morron","toolbar":"Morron"},"justify":{"block":"Justificar","center":"Centrar","left":"Alinhar a esquèrra","right":"Alinhar a dreita"},"language":{"button":"Definir la lenga","remove":"Suprimir la lenga"},"link":{"acccessKey":"Tòca d'accessibilitat","advanced":"Avançat","advisoryContentType":"Tipe de contengut (indicatiu)","advisoryTitle":"Infobulla","anchor":{"toolbar":"Ancòra","menu":"Modificar l'ancòra","title":"Proprietats de l'ancòra","name":"Nom de l'ancòra","errorName":"Entratz lo nom de l'ancòra","remove":"Suprimir l'ancòra"},"anchorId":"Per ID d'element","anchorName":"Per nom d'ancòra","charset":"Encodatge de la ressorsa ligada","cssClasses":"Classas d'estil","download":"Forçar lo telecargament","displayText":"Afichar lo tèxte","emailAddress":"Adreça electronica","emailBody":"Còs del messatge","emailSubject":"Subjècte del messatge","id":"Id","info":"Informacions sul ligam","langCode":"Còdi de lenga","langDir":"Sens d'escritura","langDirLTR":"Esquèrra a dreita (LTR)","langDirRTL":"Dreita a esquèrra (RTL)","menu":"Modificar lo ligam","name":"Nom","noAnchors":"(Cap d'ancòra pas disponibla dins aqueste document)","noEmail":"Entratz l'adreça electronica","noUrl":"Entratz l'URL del ligam","other":"<autre>","popupDependent":"Dependenta (Netscape)","popupFeatures":"Caracteristicas de la fenèstra sorgissenta","popupFullScreen":"Ecran complet (IE)","popupLeft":"A esquèrra","popupLocationBar":"Barra d'adreça","popupMenuBar":"Barra de menú","popupResizable":"Redimensionable","popupScrollBars":"Barras de desfilament","popupStatusBar":"Barra d'estat","popupToolbar":"Barra d'aisinas","popupTop":"Amont","rel":"Relacion","selectAnchor":"Seleccionar una ancòra","styles":"Estil","tabIndex":"Indici de tabulacion","target":"Cibla","targetFrame":"<quadre>","targetFrameName":"Nom del quadre afectat","targetPopup":"<fenèstra sorgissenta>","targetPopupName":"Nom de la fenèstra sorgissenta","title":"Ligam","toAnchor":"Ancòra","toEmail":"Corrièl","toUrl":"URL","toolbar":"Ligam","type":"Tipe de ligam","unlink":"Suprimir lo ligam","upload":"Mandar"},"list":{"bulletedlist":"Inserir/Suprimir una lista amb de piuses","numberedlist":"Inserir/Suprimir una lista numerotada"},"liststyle":{"armenian":"Numerotacion armènia","bulletedTitle":"Proprietats de la lista de piuses","circle":"Cercle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal precedit per un 0 (01, 02, 03, etc.)","disc":"Disc","georgian":"Numeracion georgiana (an, ban, gan, etc.)","lowerAlpha":"Letras minusculas (a, b, c, d, e, etc.)","lowerGreek":"Grèc minuscula (alfa, bèta, gamma, etc.)","lowerRoman":"Chifras romanas minusculas (i, ii, iii, iv, v, etc.)","none":"Pas cap","notset":"<indefinit>","numberedTitle":"Proprietats de la lista numerotada","square":"Carrat","start":"Començament","type":"Tipe","upperAlpha":"Letras majusculas (A, B, C, D, E, etc.)","upperRoman":"Chifras romanas majusculas (I, II, III, IV, V, etc.)","validateStartNumber":"Lo primièr element de la lista deu èsser un nombre entièr."},"magicline":{"title":"Inserir un paragraf aicí"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"newpage":{"toolbar":"Pagina novèla"},"pagebreak":{"alt":"Saut de pagina","toolbar":"Inserir un saut de pagina per l'impression"},"pastetext":{"button":"Pegar coma tèxte brut","title":"Pegar coma tèxte brut"},"pastefromword":{"confirmCleanup":"Sembla que lo tèxte de pegar proven de Word. Lo volètz netejar abans de lo pegar ?","error":"Las donadas pegadas an pas pogut èsser netejadas a causa d'una error intèrna","title":"Pegar dempuèi Word","toolbar":"Pegar dempuèi Word"},"preview":{"preview":"Previsualizar"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Suprimir la mesa en forma"},"save":{"toolbar":"Enregistrar"},"selectall":{"toolbar":"Seleccionar tot"},"showblocks":{"toolbar":"Afichar los blòts"},"sourcearea":{"toolbar":"Font"},"specialchar":{"options":"Opcions dels caractèrs especials","title":"Seleccionar un caractèr","toolbar":"Inserir un caractèr especial"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Estils","panelTitle":"Estils de mesa en pagina","panelTitle1":"Estils de blòt","panelTitle2":"Estils en linha","panelTitle3":"Estils d'objècte"},"table":{"border":"Talha de la bordadura","caption":"Títol del tablèu","cell":{"menu":"Cellula","insertBefore":"Inserir una cellula abans","insertAfter":"Inserir una cellula aprèp","deleteCell":"Suprimir las cellulas","merge":"Fusionar las cellulas","mergeRight":"Fusionar cap a dreita","mergeDown":"Fusionar cap aval","splitHorizontal":"Separar la cellula orizontalament","splitVertical":"Separar la cellula verticalament","title":"Proprietats de la cellula","cellType":"Tipe de cellula","rowSpan":"Linhas ocupadas","colSpan":"Colomnas ocupadas","wordWrap":"Cesura","hAlign":"Alinhament orizontal","vAlign":"Alinhament vertical","alignBaseline":"Linha de basa","bgColor":"Color de rèireplan","borderColor":"Color de bordadura","data":"Donadas","header":"Entèsta","yes":"Òc","no":"Non","invalidWidth":"La largor de la cellula deu èsser un nombre.","invalidHeight":"La nautor de la cellula deu èsser un nombre.","invalidRowSpan":"Lo nombre de linhas ocupadas deu èsser un nombre entièr.","invalidColSpan":"Lo nombre de colomnas ocupadas deu èsser un nombre entièr.","chooseColor":"Causir"},"cellPad":"Marge intèrne de las cellulas","cellSpace":"Espaçament entre las cellulas","column":{"menu":"Colomna","insertBefore":"Inserir una colomna abans","insertAfter":"Inserir una colomna aprèp","deleteColumn":"Suprimir las colomnas"},"columns":"Colomnas","deleteTable":"Suprimir lo tablèu","headers":"Entèstas","headersBoth":"Los dos","headersColumn":"Primièra colomna","headersNone":"Pas cap","headersRow":"Primièra linha","invalidBorder":"La talha de la bordadura deu èsser un nombre.","invalidCellPadding":"Lo marge intèrne de las cellulas deu èsser un nombre positiu.","invalidCellSpacing":"L'espaçament entre las cellulas deu èsser un nombre positiu.","invalidCols":"Lo nombre de colomnas deu èsser superior a 0.","invalidHeight":"La nautor del tablèu deu èsser un nombre.","invalidRows":"Lo nombre de linhas deu èsser superior a 0.","invalidWidth":"La largor del tablèu deu èsser un nombre.","menu":"Proprietats del tablèu","row":{"menu":"Linha","insertBefore":"Inserir una linha abans","insertAfter":"Inserir una linha aprèp","deleteRow":"Suprimir las linhas"},"rows":"Linhas","summary":"Resumit (descripcion)","title":"Proprietats del tablèu","toolbar":"Tablèu","widthPc":"per cent","widthPx":"pixèls","widthUnit":"unitat de largor"},"undo":{"redo":"Refar","undo":"Restablir"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/lang/pl.js
index 1901d127d61..1cb2a3ef78b 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/pl.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/pl.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['pl']={"editor":"Edytor tekstu sformatowanego","editorPanel":"Panel edytora tekstu sformatowanego","common":{"editorHelp":"W celu uzyskania pomocy naciśnij ALT 0","browseServer":"Przeglądaj","url":"Adres URL","protocol":"Protokół","upload":"Wyślij","uploadSubmit":"Wyślij","image":"Obrazek","flash":"Flash","form":"Formularz","checkbox":"Pole wyboru (checkbox)","radio":"Przycisk opcji (radio)","textField":"Pole tekstowe","textarea":"Obszar tekstowy","hiddenField":"Pole ukryte","button":"Przycisk","select":"Lista wyboru","imageButton":"Przycisk graficzny","notSet":"<nie ustawiono>","id":"Id","name":"Nazwa","langDir":"Kierunek tekstu","langDirLtr":"Od lewej do prawej (LTR)","langDirRtl":"Od prawej do lewej (RTL)","langCode":"Kod języka","longDescr":"Adres URL długiego opisu","cssClass":"Nazwa klasy CSS","advisoryTitle":"Opis obiektu docelowego","cssStyle":"Styl","ok":"OK","cancel":"Anuluj","close":"Zamknij","preview":"Podgląd","resize":"Przeciągnij, aby zmienić rozmiar","generalTab":"Ogólne","advancedTab":"Zaawansowane","validateNumberFailed":"Ta wartość nie jest liczbą.","confirmNewPage":"Wszystkie niezapisane zmiany zostaną utracone. Czy na pewno wczytać nową stronę?","confirmCancel":"Pewne opcje zostały zmienione. Czy na pewno zamknąć okno dialogowe?","options":"Opcje","target":"Obiekt docelowy","targetNew":"Nowe okno (_blank)","targetTop":"Okno najwyżej w hierarchii (_top)","targetSelf":"To samo okno (_self)","targetParent":"Okno nadrzędne (_parent)","langDirLTR":"Od lewej do prawej (LTR)","langDirRTL":"Od prawej do lewej (RTL)","styles":"Style","cssClasses":"Klasy arkusza stylów","width":"Szerokość","height":"Wysokość","align":"Wyrównaj","alignLeft":"Do lewej","alignRight":"Do prawej","alignCenter":"Do środka","alignJustify":"Wyjustuj","alignTop":"Do góry","alignMiddle":"Do środka","alignBottom":"Do dołu","alignNone":"Brak","invalidValue":"Nieprawidłowa wartość.","invalidHeight":"Wysokość musi być liczbą.","invalidWidth":"Szerokość musi być liczbą.","invalidCssLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","invalidHtmlLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z HTML (px lub %).","invalidInlineStyle":"Wartość podana dla stylu musi składać się z jednej lub większej liczby krotek w formacie \"nazwa : wartość\", rozdzielonych średnikami.","cssLengthTooltip":"Wpisz liczbę dla wartości w pikselach lub liczbę wraz z jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","unavailable":"%1<span class=\"cke_accessibility\">, niedostępne</span>"},"about":{"copy":"Copyright &copy; $1. Wszelkie prawa zastrzeżone.","dlgTitle":"Informacje o programie CKEditor","help":"Pomoc znajdziesz w $1.","moreInfo":"Informacje na temat licencji można znaleźć na naszej stronie:","title":"Informacje o programie CKEditor","userGuide":"podręczniku użytkownika programu CKEditor"},"basicstyles":{"bold":"Pogrubienie","italic":"Kursywa","strike":"Przekreślenie","subscript":"Indeks dolny","superscript":"Indeks górny","underline":"Podkreślenie"},"bidi":{"ltr":"Kierunek tekstu od lewej strony do prawej","rtl":"Kierunek tekstu od prawej strony do lewej"},"blockquote":{"toolbar":"Cytat"},"clipboard":{"copy":"Kopiuj","copyError":"Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne kopiowanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+C.","cut":"Wytnij","cutError":"Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne wycinanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+X.","paste":"Wklej","pasteArea":"Obszar wklejania","pasteMsg":"Wklej tekst w poniższym polu, używając skrótu klawiaturowego (<STRONG>Ctrl/Cmd+V</STRONG>), i kliknij <STRONG>OK</STRONG>.","securityMsg":"Zabezpieczenia przeglądarki uniemożliwiają wklejenie danych bezpośrednio do edytora. Proszę ponownie wkleić dane w tym oknie.","title":"Wklej"},"button":{"selectedLabel":"%1 (Wybrany)"},"colorbutton":{"auto":"Automatycznie","bgColorTitle":"Kolor tła","colors":{"000":"Czarny","800000":"Kasztanowy","8B4513":"Czekoladowy","2F4F4F":"Ciemnografitowy","008080":"Morski","000080":"Granatowy","4B0082":"Indygo","696969":"Ciemnoszary","B22222":"Czerwień żelazowa","A52A2A":"Brązowy","DAA520":"Ciemnozłoty","006400":"Ciemnozielony","40E0D0":"Turkusowy","0000CD":"Ciemnoniebieski","800080":"Purpurowy","808080":"Szary","F00":"Czerwony","FF8C00":"Ciemnopomarańczowy","FFD700":"Złoty","008000":"Zielony","0FF":"Cyjan","00F":"Niebieski","EE82EE":"Fioletowy","A9A9A9":"Przygaszony szary","FFA07A":"Łososiowy","FFA500":"Pomarańczowy","FFFF00":"Żółty","00FF00":"Limonkowy","AFEEEE":"Bladoturkusowy","ADD8E6":"Jasnoniebieski","DDA0DD":"Śliwkowy","D3D3D3":"Jasnoszary","FFF0F5":"Jasnolawendowy","FAEBD7":"Kremowobiały","FFFFE0":"Jasnożółty","F0FFF0":"Bladozielony","F0FFFF":"Jasnolazurowy","F0F8FF":"Jasnobłękitny","E6E6FA":"Lawendowy","FFF":"Biały"},"more":"Więcej kolorów...","panelTitle":"Kolory","textColorTitle":"Kolor tekstu"},"colordialog":{"clear":"Wyczyść","highlight":"Zaznacz","options":"Opcje koloru","selected":"Wybrany","title":"Wybierz kolor"},"templates":{"button":"Szablony","emptyListMsg":"(Brak zdefiniowanych szablonów)","insertOption":"Zastąp obecną zawartość","options":"Opcje szablonów","selectPromptMsg":"Wybierz szablon do otwarcia w edytorze<br>(obecna zawartość okna edytora zostanie utracona):","title":"Szablony zawartości"},"contextmenu":{"options":"Opcje menu kontekstowego"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Opis obiektu docelowego","cssClassInputLabel":"Klasy arkusza stylów","edit":"Edytuj pojemnik Div","inlineStyleInputLabel":"Style liniowe","langDirLTRLabel":"Od lewej do prawej (LTR)","langDirLabel":"Kierunek tekstu","langDirRTLLabel":"Od prawej do lewej (RTL)","languageCodeInputLabel":"Kod języka","remove":"Usuń pojemnik Div","styleSelectLabel":"Styl","title":"Utwórz pojemnik Div","toolbar":"Utwórz pojemnik Div"},"toolbar":{"toolbarCollapse":"Zwiń pasek narzędzi","toolbarExpand":"Rozwiń pasek narzędzi","toolbarGroups":{"document":"Dokument","clipboard":"Schowek/Wstecz","editing":"Edycja","forms":"Formularze","basicstyles":"Style podstawowe","paragraph":"Akapit","links":"Hiperłącza","insert":"Wstawianie","styles":"Style","colors":"Kolory","tools":"Narzędzia"},"toolbars":"Paski narzędzi edytora"},"elementspath":{"eleLabel":"Ścieżka elementów","eleTitle":"element %1"},"find":{"find":"Znajdź","findOptions":"Opcje wyszukiwania","findWhat":"Znajdź:","matchCase":"Uwzględnij wielkość liter","matchCyclic":"Cykliczne dopasowanie","matchWord":"Całe słowa","notFoundMsg":"Nie znaleziono szukanego hasła.","replace":"Zamień","replaceAll":"Zamień wszystko","replaceSuccessMsg":"%1 wystąpień zastąpionych.","replaceWith":"Zastąp przez:","title":"Znajdź i zamień"},"fakeobjects":{"anchor":"Kotwica","flash":"Animacja Flash","hiddenfield":"Pole ukryte","iframe":"IFrame","unknown":"Nieznany obiekt"},"flash":{"access":"Dostęp skryptów","accessAlways":"Zawsze","accessNever":"Nigdy","accessSameDomain":"Ta sama domena","alignAbsBottom":"Do dołu","alignAbsMiddle":"Do środka w pionie","alignBaseline":"Do linii bazowej","alignTextTop":"Do góry tekstu","bgcolor":"Kolor tła","chkFull":"Zezwól na pełny ekran","chkLoop":"Pętla","chkMenu":"Włącz menu","chkPlay":"Autoodtwarzanie","flashvars":"Zmienne obiektu Flash","hSpace":"Odstęp poziomy","properties":"Właściwości obiektu Flash","propertiesTab":"Właściwości","quality":"Jakość","qualityAutoHigh":"Auto wysoka","qualityAutoLow":"Auto niska","qualityBest":"Najlepsza","qualityHigh":"Wysoka","qualityLow":"Niska","qualityMedium":"Średnia","scale":"Skaluj","scaleAll":"Pokaż wszystko","scaleFit":"Dokładne dopasowanie","scaleNoBorder":"Bez obramowania","title":"Właściwości obiektu Flash","vSpace":"Odstęp pionowy","validateHSpace":"Odstęp poziomy musi być liczbą.","validateSrc":"Podaj adres URL","validateVSpace":"Odstęp pionowy musi być liczbą.","windowMode":"Tryb okna","windowModeOpaque":"Nieprzezroczyste","windowModeTransparent":"Przezroczyste","windowModeWindow":"Okno"},"font":{"fontSize":{"label":"Rozmiar","voiceLabel":"Rozmiar czcionki","panelTitle":"Rozmiar"},"label":"Czcionka","panelTitle":"Czcionka","voiceLabel":"Czcionka"},"forms":{"button":{"title":"Właściwości przycisku","text":"Tekst (Wartość)","type":"Typ","typeBtn":"Przycisk","typeSbm":"Wyślij","typeRst":"Wyczyść"},"checkboxAndRadio":{"checkboxTitle":"Właściwości pola wyboru (checkbox)","radioTitle":"Właściwości przycisku opcji (radio)","value":"Wartość","selected":"Zaznaczone","required":"Wymagane"},"form":{"title":"Właściwości formularza","menu":"Właściwości formularza","action":"Akcja","method":"Metoda","encoding":"Kodowanie"},"hidden":{"title":"Właściwości pola ukrytego","name":"Nazwa","value":"Wartość"},"select":{"title":"Właściwości listy wyboru","selectInfo":"Informacje","opAvail":"Dostępne opcje","value":"Wartość","size":"Rozmiar","lines":"wierszy","chkMulti":"Wielokrotny wybór","required":"Wymagane","opText":"Tekst","opValue":"Wartość","btnAdd":"Dodaj","btnModify":"Zmień","btnUp":"Do góry","btnDown":"Do dołu","btnSetValue":"Ustaw jako zaznaczoną","btnDelete":"Usuń"},"textarea":{"title":"Właściwości obszaru tekstowego","cols":"Liczba kolumn","rows":"Liczba wierszy"},"textfield":{"title":"Właściwości pola tekstowego","name":"Nazwa","value":"Wartość","charWidth":"Szerokość w znakach","maxChars":"Szerokość maksymalna","required":"Wymagane","type":"Typ","typeText":"Tekst","typePass":"Hasło","typeEmail":"Email","typeSearch":"Szukaj","typeTel":"Numer telefonu","typeUrl":"Adres URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adres","tag_div":"Normalny (DIV)","tag_h1":"Nagłówek 1","tag_h2":"Nagłówek 2","tag_h3":"Nagłówek 3","tag_h4":"Nagłówek 4","tag_h5":"Nagłówek 5","tag_h6":"Nagłówek 6","tag_p":"Normalny","tag_pre":"Tekst sformatowany"},"horizontalrule":{"toolbar":"Wstaw poziomą linię"},"iframe":{"border":"Pokaż obramowanie obiektu IFrame","noUrl":"Podaj adres URL elementu IFrame","scrolling":"Włącz paski przewijania","title":"Właściwości elementu IFrame","toolbar":"IFrame"},"image":{"alt":"Tekst zastępczy","border":"Obramowanie","btnUpload":"Wyślij","button2Img":"Czy chcesz przekonwertować zaznaczony przycisk graficzny do zwykłego obrazka?","hSpace":"Odstęp poziomy","img2Button":"Czy chcesz przekonwertować zaznaczony obrazek do przycisku graficznego?","infoTab":"Informacje o obrazku","linkTab":"Hiperłącze","lockRatio":"Zablokuj proporcje","menu":"Właściwości obrazka","resetSize":"Przywróć rozmiar","title":"Właściwości obrazka","titleButton":"Właściwości przycisku graficznego","upload":"Wyślij","urlMissing":"Podaj adres URL obrazka.","vSpace":"Odstęp pionowy","validateBorder":"Wartość obramowania musi być liczbą całkowitą.","validateHSpace":"Wartość odstępu poziomego musi być liczbą całkowitą.","validateVSpace":"Wartość odstępu pionowego musi być liczbą całkowitą."},"indent":{"indent":"Zwiększ wcięcie","outdent":"Zmniejsz wcięcie"},"smiley":{"options":"Opcje emotikonów","title":"Wstaw emotikona","toolbar":"Emotikony"},"justify":{"block":"Wyjustuj","center":"Wyśrodkuj","left":"Wyrównaj do lewej","right":"Wyrównaj do prawej"},"language":{"button":"Ustaw język","remove":"Usuń język"},"link":{"acccessKey":"Klawisz dostępu","advanced":"Zaawansowane","advisoryContentType":"Typ MIME obiektu docelowego","advisoryTitle":"Opis obiektu docelowego","anchor":{"toolbar":"Wstaw/edytuj kotwicę","menu":"Właściwości kotwicy","title":"Właściwości kotwicy","name":"Nazwa kotwicy","errorName":"Wpisz nazwę kotwicy","remove":"Usuń kotwicę"},"anchorId":"Wg identyfikatora","anchorName":"Wg nazwy","charset":"Kodowanie znaków obiektu docelowego","cssClasses":"Nazwa klasy CSS","emailAddress":"Adres e-mail","emailBody":"Treść","emailSubject":"Temat","id":"Id","info":"Informacje ","langCode":"Kod języka","langDir":"Kierunek tekstu","langDirLTR":"Od lewej do prawej (LTR)","langDirRTL":"Od prawej do lewej (RTL)","menu":"Edytuj odnośnik","name":"Nazwa","noAnchors":"(W dokumencie nie zdefiniowano żadnych kotwic)","noEmail":"Podaj adres e-mail","noUrl":"Podaj adres URL","other":"<inny>","popupDependent":"Okno zależne (Netscape)","popupFeatures":"Właściwości wyskakującego okna","popupFullScreen":"Pełny ekran (IE)","popupLeft":"Pozycja w poziomie","popupLocationBar":"Pasek adresu","popupMenuBar":"Pasek menu","popupResizable":"Skalowalny","popupScrollBars":"Paski przewijania","popupStatusBar":"Pasek statusu","popupToolbar":"Pasek narzędzi","popupTop":"Pozycja w pionie","rel":"Relacja","selectAnchor":"Wybierz kotwicę","styles":"Styl","tabIndex":"Indeks kolejności","target":"Obiekt docelowy","targetFrame":"<ramka>","targetFrameName":"Nazwa ramki docelowej","targetPopup":"<wyskakujące okno>","targetPopupName":"Nazwa wyskakującego okna","title":"Odnośnik","toAnchor":"Odnośnik wewnątrz strony (kotwica)","toEmail":"Adres e-mail","toUrl":"Adres URL","toolbar":"Wstaw/edytuj odnośnik","type":"Typ odnośnika","unlink":"Usuń odnośnik","upload":"Wyślij"},"list":{"bulletedlist":"Lista wypunktowana","numberedlist":"Lista numerowana"},"liststyle":{"armenian":"Numerowanie armeńskie","bulletedTitle":"Właściwości list wypunktowanych","circle":"Koło","decimal":"Liczby (1, 2, 3 itd.)","decimalLeadingZero":"Liczby z początkowym zerem (01, 02, 03 itd.)","disc":"Okrąg","georgian":"Numerowanie gruzińskie (an, ban, gan itd.)","lowerAlpha":"Małe litery (a, b, c, d, e itd.)","lowerGreek":"Małe litery greckie (alpha, beta, gamma itd.)","lowerRoman":"Małe cyfry rzymskie (i, ii, iii, iv, v itd.)","none":"Brak","notset":"<nie ustawiono>","numberedTitle":"Właściwości list numerowanych","square":"Kwadrat","start":"Początek","type":"Typ punktora","upperAlpha":"Duże litery (A, B, C, D, E itd.)","upperRoman":"Duże cyfry rzymskie (I, II, III, IV, V itd.)","validateStartNumber":"Listę musi rozpoczynać liczba całkowita."},"magicline":{"title":"Wstaw nowy akapit"},"maximize":{"maximize":"Maksymalizuj","minimize":"Minimalizuj"},"newpage":{"toolbar":"Nowa strona"},"pagebreak":{"alt":"Wstaw podział strony","toolbar":"Wstaw podział strony"},"pastetext":{"button":"Wklej jako czysty tekst","title":"Wklej jako czysty tekst"},"pastefromword":{"confirmCleanup":"Tekst, który chcesz wkleić, prawdopodobnie pochodzi z programu Microsoft Word. Czy chcesz go wyczyścić przed wklejeniem?","error":"Wyczyszczenie wklejonych danych nie było możliwe z powodu wystąpienia błędu.","title":"Wklej z programu MS Word","toolbar":"Wklej z programu MS Word"},"preview":{"preview":"Podgląd"},"print":{"toolbar":"Drukuj"},"removeformat":{"toolbar":"Usuń formatowanie"},"save":{"toolbar":"Zapisz"},"selectall":{"toolbar":"Zaznacz wszystko"},"showblocks":{"toolbar":"Pokaż bloki"},"sourcearea":{"toolbar":"Źródło dokumentu"},"specialchar":{"options":"Opcje znaków specjalnych","title":"Wybierz znak specjalny","toolbar":"Wstaw znak specjalny"},"scayt":{"btn_about":"Informacje o SCAYT","btn_dictionaries":"Słowniki","btn_disable":"Wyłącz SCAYT","btn_enable":"Włącz SCAYT","btn_langs":"Języki","btn_options":"Opcje","text_title":"Sprawdź pisownię podczas pisania (SCAYT)"},"stylescombo":{"label":"Styl","panelTitle":"Style formatujące","panelTitle1":"Style blokowe","panelTitle2":"Style liniowe","panelTitle3":"Style obiektowe"},"table":{"border":"Grubość obramowania","caption":"Tytuł","cell":{"menu":"Komórka","insertBefore":"Wstaw komórkę z lewej","insertAfter":"Wstaw komórkę z prawej","deleteCell":"Usuń komórki","merge":"Połącz komórki","mergeRight":"Połącz z komórką z prawej","mergeDown":"Połącz z komórką poniżej","splitHorizontal":"Podziel komórkę poziomo","splitVertical":"Podziel komórkę pionowo","title":"Właściwości komórki","cellType":"Typ komórki","rowSpan":"Scalenie wierszy","colSpan":"Scalenie komórek","wordWrap":"Zawijanie słów","hAlign":"Wyrównanie poziome","vAlign":"Wyrównanie pionowe","alignBaseline":"Linia bazowa","bgColor":"Kolor tła","borderColor":"Kolor obramowania","data":"Dane","header":"Nagłówek","yes":"Tak","no":"Nie","invalidWidth":"Szerokość komórki musi być liczbą.","invalidHeight":"Wysokość komórki musi być liczbą.","invalidRowSpan":"Scalenie wierszy musi być liczbą całkowitą.","invalidColSpan":"Scalenie komórek musi być liczbą całkowitą.","chooseColor":"Wybierz"},"cellPad":"Dopełnienie komórek","cellSpace":"Odstęp pomiędzy komórkami","column":{"menu":"Kolumna","insertBefore":"Wstaw kolumnę z lewej","insertAfter":"Wstaw kolumnę z prawej","deleteColumn":"Usuń kolumny"},"columns":"Liczba kolumn","deleteTable":"Usuń tabelę","headers":"Nagłówki","headersBoth":"Oba","headersColumn":"Pierwsza kolumna","headersNone":"Brak","headersRow":"Pierwszy wiersz","invalidBorder":"Wartość obramowania musi być liczbą.","invalidCellPadding":"Dopełnienie komórek musi być liczbą dodatnią.","invalidCellSpacing":"Odstęp pomiędzy komórkami musi być liczbą dodatnią.","invalidCols":"Liczba kolumn musi być większa niż 0.","invalidHeight":"Wysokość tabeli musi być liczbą.","invalidRows":"Liczba wierszy musi być większa niż 0.","invalidWidth":"Szerokość tabeli musi być liczbą.","menu":"Właściwości tabeli","row":{"menu":"Wiersz","insertBefore":"Wstaw wiersz powyżej","insertAfter":"Wstaw wiersz poniżej","deleteRow":"Usuń wiersze"},"rows":"Liczba wierszy","summary":"Podsumowanie","title":"Właściwości tabeli","toolbar":"Tabela","widthPc":"%","widthPx":"piksele","widthUnit":"jednostka szerokości"},"undo":{"redo":"Ponów","undo":"Cofnij"},"wsc":{"btnIgnore":"Ignoruj","btnIgnoreAll":"Ignoruj wszystkie","btnReplace":"Zmień","btnReplaceAll":"Zmień wszystkie","btnUndo":"Cofnij","changeTo":"Zmień na","errorLoading":"Błąd wczytywania hosta aplikacji usługi: %s.","ieSpellDownload":"Słownik nie jest zainstalowany. Czy chcesz go pobrać?","manyChanges":"Sprawdzanie zakończone: zmieniono %l słów","noChanges":"Sprawdzanie zakończone: nie zmieniono żadnego słowa","noMispell":"Sprawdzanie zakończone: nie znaleziono błędów","noSuggestions":"- Brak sugestii -","notAvailable":"Przepraszamy, ale usługa jest obecnie niedostępna.","notInDic":"Słowa nie ma w słowniku","oneChange":"Sprawdzanie zakończone: zmieniono jedno słowo","progress":"Trwa sprawdzanie...","title":"Sprawdź pisownię","toolbar":"Sprawdź pisownię"}};
\ No newline at end of file
+CKEDITOR.lang['pl']={"editor":"Edytor tekstu sformatowanego","editorPanel":"Panel edytora tekstu sformatowanego","common":{"editorHelp":"W celu uzyskania pomocy naciśnij ALT 0","browseServer":"Przeglądaj","url":"Adres URL","protocol":"Protokół","upload":"Wyślij","uploadSubmit":"Wyślij","image":"Obrazek","flash":"Flash","form":"Formularz","checkbox":"Pole wyboru (checkbox)","radio":"Przycisk opcji (radio)","textField":"Pole tekstowe","textarea":"Obszar tekstowy","hiddenField":"Pole ukryte","button":"Przycisk","select":"Lista wyboru","imageButton":"Przycisk graficzny","notSet":"<nie ustawiono>","id":"Id","name":"Nazwa","langDir":"Kierunek tekstu","langDirLtr":"Od lewej do prawej (LTR)","langDirRtl":"Od prawej do lewej (RTL)","langCode":"Kod języka","longDescr":"Adres URL długiego opisu","cssClass":"Nazwa klasy CSS","advisoryTitle":"Opis obiektu docelowego","cssStyle":"Styl","ok":"OK","cancel":"Anuluj","close":"Zamknij","preview":"Podgląd","resize":"Przeciągnij, aby zmienić rozmiar","generalTab":"Ogólne","advancedTab":"Zaawansowane","validateNumberFailed":"Ta wartość nie jest liczbą.","confirmNewPage":"Wszystkie niezapisane zmiany zostaną utracone. Czy na pewno wczytać nową stronę?","confirmCancel":"Pewne opcje zostały zmienione. Czy na pewno zamknąć okno dialogowe?","options":"Opcje","target":"Obiekt docelowy","targetNew":"Nowe okno (_blank)","targetTop":"Okno najwyżej w hierarchii (_top)","targetSelf":"To samo okno (_self)","targetParent":"Okno nadrzędne (_parent)","langDirLTR":"Od lewej do prawej (LTR)","langDirRTL":"Od prawej do lewej (RTL)","styles":"Style","cssClasses":"Klasy arkusza stylów","width":"Szerokość","height":"Wysokość","align":"Wyrównaj","alignLeft":"Do lewej","alignRight":"Do prawej","alignCenter":"Do środka","alignJustify":"Wyjustuj","alignTop":"Do góry","alignMiddle":"Do środka","alignBottom":"Do dołu","alignNone":"Brak","invalidValue":"Nieprawidłowa wartość.","invalidHeight":"Wysokość musi być liczbą.","invalidWidth":"Szerokość musi być liczbą.","invalidCssLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","invalidHtmlLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z HTML (px lub %).","invalidInlineStyle":"Wartość podana dla stylu musi składać się z jednej lub większej liczby krotek w formacie \"nazwa : wartość\", rozdzielonych średnikami.","cssLengthTooltip":"Wpisz liczbę dla wartości w pikselach lub liczbę wraz z jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","unavailable":"%1<span class=\"cke_accessibility\">, niedostępne</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"spacja","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Skrót klawiszowy"},"about":{"copy":"Copyright &copy; $1. Wszelkie prawa zastrzeżone.","dlgTitle":"Informacje o programie CKEditor","help":"Pomoc znajdziesz w $1.","moreInfo":"Informacje na temat licencji można znaleźć na naszej stronie:","title":"Informacje o programie CKEditor","userGuide":"podręczniku użytkownika programu CKEditor"},"basicstyles":{"bold":"Pogrubienie","italic":"Kursywa","strike":"Przekreślenie","subscript":"Indeks dolny","superscript":"Indeks górny","underline":"Podkreślenie"},"bidi":{"ltr":"Kierunek tekstu od lewej strony do prawej","rtl":"Kierunek tekstu od prawej strony do lewej"},"blockquote":{"toolbar":"Cytat"},"clipboard":{"copy":"Kopiuj","copyError":"Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne kopiowanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+C.","cut":"Wytnij","cutError":"Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne wycinanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+X.","paste":"Wklej","pasteArea":"Obszar wklejania","pasteMsg":"Wklej tekst w poniższym polu, używając skrótu klawiaturowego (<STRONG>Ctrl/Cmd+V</STRONG>), i kliknij <STRONG>OK</STRONG>.","securityMsg":"Zabezpieczenia przeglądarki uniemożliwiają wklejenie danych bezpośrednio do edytora. Proszę ponownie wkleić dane w tym oknie.","title":"Wklej"},"button":{"selectedLabel":"%1 (Wybrany)"},"colorbutton":{"auto":"Automatycznie","bgColorTitle":"Kolor tła","colors":{"000":"Czarny","800000":"Kasztanowy","8B4513":"Czekoladowy","2F4F4F":"Ciemnografitowy","008080":"Morski","000080":"Granatowy","4B0082":"Indygo","696969":"Ciemnoszary","B22222":"Czerwień żelazowa","A52A2A":"Brązowy","DAA520":"Ciemnozłoty","006400":"Ciemnozielony","40E0D0":"Turkusowy","0000CD":"Ciemnoniebieski","800080":"Purpurowy","808080":"Szary","F00":"Czerwony","FF8C00":"Ciemnopomarańczowy","FFD700":"Złoty","008000":"Zielony","0FF":"Cyjan","00F":"Niebieski","EE82EE":"Fioletowy","A9A9A9":"Przygaszony szary","FFA07A":"Łososiowy","FFA500":"Pomarańczowy","FFFF00":"Żółty","00FF00":"Limonkowy","AFEEEE":"Bladoturkusowy","ADD8E6":"Jasnoniebieski","DDA0DD":"Śliwkowy","D3D3D3":"Jasnoszary","FFF0F5":"Jasnolawendowy","FAEBD7":"Kremowobiały","FFFFE0":"Jasnożółty","F0FFF0":"Bladozielony","F0FFFF":"Jasnolazurowy","F0F8FF":"Jasnobłękitny","E6E6FA":"Lawendowy","FFF":"Biały","1ABC9C":"Cyjan","2ECC71":"Szmaragdowy","3498DB":"Jasnoniebieski","9B59B6":"Ametystowy","4E5F70":"Szaroniebieski","F1C40F":"Żółty","16A085":"Ciemny cyjan","27AE60":"Ciemnoszmaragdowy","2980B9":"Ciemnoniebieski","8E44AD":"Ciemnofioletowy","2C3E50":"Nienasycony niebieski","F39C12":"Pomarańczowy","E67E22":"Marchewkowy","E74C3C":"Bladoczerwony","ECF0F1":"Jasnosrebrny","95A5A6":"Szarocyjanowy","DDD":"Jasnoszary","D35400":"Dyniowy","C0392B":"Ciemnoczerwony","BDC3C7":"Srebrny","7F8C8D":"Szarawy cyjan","999":"Ciemnoszary"},"more":"Więcej kolorów...","panelTitle":"Kolory","textColorTitle":"Kolor tekstu"},"colordialog":{"clear":"Wyczyść","highlight":"Zaznacz","options":"Opcje koloru","selected":"Wybrany","title":"Wybierz kolor"},"templates":{"button":"Szablony","emptyListMsg":"(Brak zdefiniowanych szablonów)","insertOption":"Zastąp obecną zawartość","options":"Opcje szablonów","selectPromptMsg":"Wybierz szablon do otwarcia w edytorze<br>(obecna zawartość okna edytora zostanie utracona):","title":"Szablony zawartości"},"contextmenu":{"options":"Opcje menu kontekstowego"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Opis obiektu docelowego","cssClassInputLabel":"Klasy arkusza stylów","edit":"Edytuj pojemnik Div","inlineStyleInputLabel":"Style liniowe","langDirLTRLabel":"Od lewej do prawej (LTR)","langDirLabel":"Kierunek tekstu","langDirRTLLabel":"Od prawej do lewej (RTL)","languageCodeInputLabel":"Kod języka","remove":"Usuń pojemnik Div","styleSelectLabel":"Styl","title":"Utwórz pojemnik Div","toolbar":"Utwórz pojemnik Div"},"toolbar":{"toolbarCollapse":"Zwiń pasek narzędzi","toolbarExpand":"Rozwiń pasek narzędzi","toolbarGroups":{"document":"Dokument","clipboard":"Schowek/Wstecz","editing":"Edycja","forms":"Formularze","basicstyles":"Style podstawowe","paragraph":"Akapit","links":"Hiperłącza","insert":"Wstawianie","styles":"Style","colors":"Kolory","tools":"Narzędzia"},"toolbars":"Paski narzędzi edytora"},"elementspath":{"eleLabel":"Ścieżka elementów","eleTitle":"element %1"},"find":{"find":"Znajdź","findOptions":"Opcje wyszukiwania","findWhat":"Znajdź:","matchCase":"Uwzględnij wielkość liter","matchCyclic":"Cykliczne dopasowanie","matchWord":"Całe słowa","notFoundMsg":"Nie znaleziono szukanego hasła.","replace":"Zamień","replaceAll":"Zamień wszystko","replaceSuccessMsg":"%1 wystąpień zastąpionych.","replaceWith":"Zastąp przez:","title":"Znajdź i zamień"},"fakeobjects":{"anchor":"Kotwica","flash":"Animacja Flash","hiddenfield":"Pole ukryte","iframe":"IFrame","unknown":"Nieznany obiekt"},"flash":{"access":"Dostęp skryptów","accessAlways":"Zawsze","accessNever":"Nigdy","accessSameDomain":"Ta sama domena","alignAbsBottom":"Do dołu","alignAbsMiddle":"Do środka w pionie","alignBaseline":"Do linii bazowej","alignTextTop":"Do góry tekstu","bgcolor":"Kolor tła","chkFull":"Zezwól na pełny ekran","chkLoop":"Pętla","chkMenu":"Włącz menu","chkPlay":"Autoodtwarzanie","flashvars":"Zmienne obiektu Flash","hSpace":"Odstęp poziomy","properties":"Właściwości obiektu Flash","propertiesTab":"Właściwości","quality":"Jakość","qualityAutoHigh":"Auto wysoka","qualityAutoLow":"Auto niska","qualityBest":"Najlepsza","qualityHigh":"Wysoka","qualityLow":"Niska","qualityMedium":"Średnia","scale":"Skaluj","scaleAll":"Pokaż wszystko","scaleFit":"Dokładne dopasowanie","scaleNoBorder":"Bez obramowania","title":"Właściwości obiektu Flash","vSpace":"Odstęp pionowy","validateHSpace":"Odstęp poziomy musi być liczbą.","validateSrc":"Podaj adres URL","validateVSpace":"Odstęp pionowy musi być liczbą.","windowMode":"Tryb okna","windowModeOpaque":"Nieprzezroczyste","windowModeTransparent":"Przezroczyste","windowModeWindow":"Okno"},"font":{"fontSize":{"label":"Rozmiar","voiceLabel":"Rozmiar czcionki","panelTitle":"Rozmiar"},"label":"Czcionka","panelTitle":"Czcionka","voiceLabel":"Czcionka"},"forms":{"button":{"title":"Właściwości przycisku","text":"Tekst (Wartość)","type":"Typ","typeBtn":"Przycisk","typeSbm":"Wyślij","typeRst":"Wyczyść"},"checkboxAndRadio":{"checkboxTitle":"Właściwości pola wyboru (checkbox)","radioTitle":"Właściwości przycisku opcji (radio)","value":"Wartość","selected":"Zaznaczone","required":"Wymagane"},"form":{"title":"Właściwości formularza","menu":"Właściwości formularza","action":"Akcja","method":"Metoda","encoding":"Kodowanie"},"hidden":{"title":"Właściwości pola ukrytego","name":"Nazwa","value":"Wartość"},"select":{"title":"Właściwości listy wyboru","selectInfo":"Informacje","opAvail":"Dostępne opcje","value":"Wartość","size":"Rozmiar","lines":"wierszy","chkMulti":"Wielokrotny wybór","required":"Wymagane","opText":"Tekst","opValue":"Wartość","btnAdd":"Dodaj","btnModify":"Zmień","btnUp":"Do góry","btnDown":"Do dołu","btnSetValue":"Ustaw jako zaznaczoną","btnDelete":"Usuń"},"textarea":{"title":"Właściwości obszaru tekstowego","cols":"Liczba kolumn","rows":"Liczba wierszy"},"textfield":{"title":"Właściwości pola tekstowego","name":"Nazwa","value":"Wartość","charWidth":"Szerokość w znakach","maxChars":"Szerokość maksymalna","required":"Wymagane","type":"Typ","typeText":"Tekst","typePass":"Hasło","typeEmail":"Email","typeSearch":"Szukaj","typeTel":"Numer telefonu","typeUrl":"Adres URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adres","tag_div":"Normalny (DIV)","tag_h1":"Nagłówek 1","tag_h2":"Nagłówek 2","tag_h3":"Nagłówek 3","tag_h4":"Nagłówek 4","tag_h5":"Nagłówek 5","tag_h6":"Nagłówek 6","tag_p":"Normalny","tag_pre":"Tekst sformatowany"},"horizontalrule":{"toolbar":"Wstaw poziomą linię"},"iframe":{"border":"Pokaż obramowanie obiektu IFrame","noUrl":"Podaj adres URL elementu IFrame","scrolling":"Włącz paski przewijania","title":"Właściwości elementu IFrame","toolbar":"IFrame"},"image":{"alt":"Tekst zastępczy","border":"Obramowanie","btnUpload":"Wyślij","button2Img":"Czy chcesz przekonwertować zaznaczony przycisk graficzny do zwykłego obrazka?","hSpace":"Odstęp poziomy","img2Button":"Czy chcesz przekonwertować zaznaczony obrazek do przycisku graficznego?","infoTab":"Informacje o obrazku","linkTab":"Hiperłącze","lockRatio":"Zablokuj proporcje","menu":"Właściwości obrazka","resetSize":"Przywróć rozmiar","title":"Właściwości obrazka","titleButton":"Właściwości przycisku graficznego","upload":"Wyślij","urlMissing":"Podaj adres URL obrazka.","vSpace":"Odstęp pionowy","validateBorder":"Wartość obramowania musi być liczbą całkowitą.","validateHSpace":"Wartość odstępu poziomego musi być liczbą całkowitą.","validateVSpace":"Wartość odstępu pionowego musi być liczbą całkowitą."},"indent":{"indent":"Zwiększ wcięcie","outdent":"Zmniejsz wcięcie"},"smiley":{"options":"Opcje emotikonów","title":"Wstaw emotikona","toolbar":"Emotikony"},"justify":{"block":"Wyjustuj","center":"Wyśrodkuj","left":"Wyrównaj do lewej","right":"Wyrównaj do prawej"},"language":{"button":"Ustaw język","remove":"Usuń język"},"link":{"acccessKey":"Klawisz dostępu","advanced":"Zaawansowane","advisoryContentType":"Typ MIME obiektu docelowego","advisoryTitle":"Opis obiektu docelowego","anchor":{"toolbar":"Wstaw/edytuj kotwicę","menu":"Właściwości kotwicy","title":"Właściwości kotwicy","name":"Nazwa kotwicy","errorName":"Wpisz nazwę kotwicy","remove":"Usuń kotwicę"},"anchorId":"Wg identyfikatora","anchorName":"Wg nazwy","charset":"Kodowanie znaków obiektu docelowego","cssClasses":"Nazwa klasy CSS","download":"Wymuś pobieranie","displayText":"Wyświetlany tekst","emailAddress":"Adres e-mail","emailBody":"Treść","emailSubject":"Temat","id":"Id","info":"Informacje ","langCode":"Kod języka","langDir":"Kierunek tekstu","langDirLTR":"Od lewej do prawej (LTR)","langDirRTL":"Od prawej do lewej (RTL)","menu":"Edytuj odnośnik","name":"Nazwa","noAnchors":"(W dokumencie nie zdefiniowano żadnych kotwic)","noEmail":"Podaj adres e-mail","noUrl":"Podaj adres URL","other":"<inny>","popupDependent":"Okno zależne (Netscape)","popupFeatures":"Właściwości wyskakującego okna","popupFullScreen":"Pełny ekran (IE)","popupLeft":"Pozycja w poziomie","popupLocationBar":"Pasek adresu","popupMenuBar":"Pasek menu","popupResizable":"Skalowalny","popupScrollBars":"Paski przewijania","popupStatusBar":"Pasek statusu","popupToolbar":"Pasek narzędzi","popupTop":"Pozycja w pionie","rel":"Relacja","selectAnchor":"Wybierz kotwicę","styles":"Styl","tabIndex":"Indeks kolejności","target":"Obiekt docelowy","targetFrame":"<ramka>","targetFrameName":"Nazwa ramki docelowej","targetPopup":"<wyskakujące okno>","targetPopupName":"Nazwa wyskakującego okna","title":"Odnośnik","toAnchor":"Odnośnik wewnątrz strony (kotwica)","toEmail":"Adres e-mail","toUrl":"Adres URL","toolbar":"Wstaw/edytuj odnośnik","type":"Typ odnośnika","unlink":"Usuń odnośnik","upload":"Wyślij"},"list":{"bulletedlist":"Lista wypunktowana","numberedlist":"Lista numerowana"},"liststyle":{"armenian":"Numerowanie armeńskie","bulletedTitle":"Właściwości list wypunktowanych","circle":"Koło","decimal":"Liczby (1, 2, 3 itd.)","decimalLeadingZero":"Liczby z początkowym zerem (01, 02, 03 itd.)","disc":"Okrąg","georgian":"Numerowanie gruzińskie (an, ban, gan itd.)","lowerAlpha":"Małe litery (a, b, c, d, e itd.)","lowerGreek":"Małe litery greckie (alpha, beta, gamma itd.)","lowerRoman":"Małe cyfry rzymskie (i, ii, iii, iv, v itd.)","none":"Brak","notset":"<nie ustawiono>","numberedTitle":"Właściwości list numerowanych","square":"Kwadrat","start":"Początek","type":"Typ punktora","upperAlpha":"Duże litery (A, B, C, D, E itd.)","upperRoman":"Duże cyfry rzymskie (I, II, III, IV, V itd.)","validateStartNumber":"Listę musi rozpoczynać liczba całkowita."},"magicline":{"title":"Wstaw nowy akapit"},"maximize":{"maximize":"Maksymalizuj","minimize":"Minimalizuj"},"newpage":{"toolbar":"Nowa strona"},"pagebreak":{"alt":"Wstaw podział strony","toolbar":"Wstaw podział strony"},"pastetext":{"button":"Wklej jako czysty tekst","title":"Wklej jako czysty tekst"},"pastefromword":{"confirmCleanup":"Tekst, który chcesz wkleić, prawdopodobnie pochodzi z programu Microsoft Word. Czy chcesz go wyczyścić przed wklejeniem?","error":"Wyczyszczenie wklejonych danych nie było możliwe z powodu wystąpienia błędu.","title":"Wklej z programu MS Word","toolbar":"Wklej z programu MS Word"},"preview":{"preview":"Podgląd"},"print":{"toolbar":"Drukuj"},"removeformat":{"toolbar":"Usuń formatowanie"},"save":{"toolbar":"Zapisz"},"selectall":{"toolbar":"Zaznacz wszystko"},"showblocks":{"toolbar":"Pokaż bloki"},"sourcearea":{"toolbar":"Źródło dokumentu"},"specialchar":{"options":"Opcje znaków specjalnych","title":"Wybierz znak specjalny","toolbar":"Wstaw znak specjalny"},"scayt":{"btn_about":"Informacje o SCAYT","btn_dictionaries":"Słowniki","btn_disable":"Wyłącz SCAYT","btn_enable":"Włącz SCAYT","btn_langs":"Języki","btn_options":"Opcje","text_title":"Sprawdź pisownię podczas pisania (SCAYT)"},"stylescombo":{"label":"Styl","panelTitle":"Style formatujące","panelTitle1":"Style blokowe","panelTitle2":"Style liniowe","panelTitle3":"Style obiektowe"},"table":{"border":"Grubość obramowania","caption":"Tytuł","cell":{"menu":"Komórka","insertBefore":"Wstaw komórkę z lewej","insertAfter":"Wstaw komórkę z prawej","deleteCell":"Usuń komórki","merge":"Połącz komórki","mergeRight":"Połącz z komórką z prawej","mergeDown":"Połącz z komórką poniżej","splitHorizontal":"Podziel komórkę poziomo","splitVertical":"Podziel komórkę pionowo","title":"Właściwości komórki","cellType":"Typ komórki","rowSpan":"Scalenie wierszy","colSpan":"Scalenie komórek","wordWrap":"Zawijanie słów","hAlign":"Wyrównanie poziome","vAlign":"Wyrównanie pionowe","alignBaseline":"Linia bazowa","bgColor":"Kolor tła","borderColor":"Kolor obramowania","data":"Dane","header":"Nagłówek","yes":"Tak","no":"Nie","invalidWidth":"Szerokość komórki musi być liczbą.","invalidHeight":"Wysokość komórki musi być liczbą.","invalidRowSpan":"Scalenie wierszy musi być liczbą całkowitą.","invalidColSpan":"Scalenie komórek musi być liczbą całkowitą.","chooseColor":"Wybierz"},"cellPad":"Dopełnienie komórek","cellSpace":"Odstęp pomiędzy komórkami","column":{"menu":"Kolumna","insertBefore":"Wstaw kolumnę z lewej","insertAfter":"Wstaw kolumnę z prawej","deleteColumn":"Usuń kolumny"},"columns":"Liczba kolumn","deleteTable":"Usuń tabelę","headers":"Nagłówki","headersBoth":"Oba","headersColumn":"Pierwsza kolumna","headersNone":"Brak","headersRow":"Pierwszy wiersz","invalidBorder":"Wartość obramowania musi być liczbą.","invalidCellPadding":"Dopełnienie komórek musi być liczbą dodatnią.","invalidCellSpacing":"Odstęp pomiędzy komórkami musi być liczbą dodatnią.","invalidCols":"Liczba kolumn musi być większa niż 0.","invalidHeight":"Wysokość tabeli musi być liczbą.","invalidRows":"Liczba wierszy musi być większa niż 0.","invalidWidth":"Szerokość tabeli musi być liczbą.","menu":"Właściwości tabeli","row":{"menu":"Wiersz","insertBefore":"Wstaw wiersz powyżej","insertAfter":"Wstaw wiersz poniżej","deleteRow":"Usuń wiersze"},"rows":"Liczba wierszy","summary":"Podsumowanie","title":"Właściwości tabeli","toolbar":"Tabela","widthPc":"%","widthPx":"piksele","widthUnit":"jednostka szerokości"},"undo":{"redo":"Ponów","undo":"Cofnij"},"wsc":{"btnIgnore":"Ignoruj","btnIgnoreAll":"Ignoruj wszystkie","btnReplace":"Zmień","btnReplaceAll":"Zmień wszystkie","btnUndo":"Cofnij","changeTo":"Zmień na","errorLoading":"Błąd wczytywania hosta aplikacji usługi: %s.","ieSpellDownload":"Słownik nie jest zainstalowany. Czy chcesz go pobrać?","manyChanges":"Sprawdzanie zakończone: zmieniono %l słów","noChanges":"Sprawdzanie zakończone: nie zmieniono żadnego słowa","noMispell":"Sprawdzanie zakończone: nie znaleziono błędów","noSuggestions":"- Brak sugestii -","notAvailable":"Przepraszamy, ale usługa jest obecnie niedostępna.","notInDic":"Słowa nie ma w słowniku","oneChange":"Sprawdzanie zakończone: zmieniono jedno słowo","progress":"Trwa sprawdzanie...","title":"Sprawdź pisownię","toolbar":"Sprawdź pisownię"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/lang/pt-br.js
index 6f0c364a94f..1e5491327e7 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/pt-br.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/pt-br.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['pt-br']={"editor":"Editor de Rich Text","editorPanel":"Painel do editor de Rich Text","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Localizar no Servidor","url":"URL","protocol":"Protocolo","upload":"Enviar ao Servidor","uploadSubmit":"Enviar para o Servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de Seleção","radio":"Botão de Opção","textField":"Caixa de Texto","textarea":"Área de Texto","hiddenField":"Campo Oculto","button":"Botão","select":"Caixa de Listagem","imageButton":"Botão de Imagem","notSet":"<não ajustado>","id":"Id","name":"Nome","langDir":"Direção do idioma","langDirLtr":"Esquerda para Direita (LTR)","langDirRtl":"Direita para Esquerda (RTL)","langCode":"Idioma","longDescr":"Descrição da URL","cssClass":"Classe de CSS","advisoryTitle":"Título","cssStyle":"Estilos","ok":"OK","cancel":"Cancelar","close":"Fechar","preview":"Visualizar","resize":"Arraste para redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um número.","confirmNewPage":"Todas as mudanças não salvas serão perdidas. Tem certeza de que quer abrir uma nova página?","confirmCancel":"Algumas opções foram alteradas. Tem certeza de que quer fechar a caixa de diálogo?","options":"Opções","target":"Destino","targetNew":"Nova Janela (_blank)","targetTop":"Janela de Cima (_top)","targetSelf":"Mesma Janela (_self)","targetParent":"Janela Pai (_parent)","langDirLTR":"Esquerda para Direita (LTR)","langDirRTL":"Direita para Esquerda (RTL)","styles":"Estilo","cssClasses":"Classes","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centralizado","alignJustify":"Justificar","alignTop":"Superior","alignMiddle":"Centralizado","alignBottom":"Inferior","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura tem que ser um número","invalidWidth":"A largura tem que ser um número.","invalidCssLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","invalidHtmlLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de HTML (px ou %).","invalidInlineStyle":"O valor válido para estilo deve conter uma ou mais tuplas no formato \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para valor em pixels ou um número seguido de uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>"},"about":{"copy":"Copyright &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Verifique o $1 para obter ajuda.","moreInfo":"Para informações sobre a licença por favor visite o nosso site:","title":"Sobre o CKEditor","userGuide":"Guia do Usuário do CKEditor"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Tachado","subscript":"Subscrito","superscript":"Sobrescrito","underline":"Sublinhado"},"bidi":{"ltr":"Direção do texto da esquerda para a direita","rtl":"Direção do texto da direita para a esquerda"},"blockquote":{"toolbar":"Citação"},"clipboard":{"copy":"Copiar","copyError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de copiar automaticamente. Por favor, utilize o teclado para copiar (Ctrl/Cmd+C).","cut":"Recortar","cutError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de recortar automaticamente. Por favor, utilize o teclado para recortar (Ctrl/Cmd+X).","paste":"Colar","pasteArea":"Área para Colar","pasteMsg":"Transfira o link usado na caixa usando o teclado com (<STRONG>Ctrl/Cmd+V</STRONG>) e <STRONG>OK</STRONG>.","securityMsg":"As configurações de segurança do seu navegador não permitem que o editor acesse os dados da área de transferência diretamente. Por favor cole o conteúdo manualmente nesta janela.","title":"Colar"},"button":{"selectedLabel":"%1 (Selecionado)"},"colorbutton":{"auto":"Automático","bgColorTitle":"Cor do Plano de Fundo","colors":{"000":"Preto","800000":"Foquete","8B4513":"Marrom 1","2F4F4F":"Cinza 1","008080":"Cerceta","000080":"Azul Marinho","4B0082":"Índigo","696969":"Cinza 2","B22222":"Tijolo de Fogo","A52A2A":"Marrom 2","DAA520":"Vara Dourada","006400":"Verde Escuro","40E0D0":"Turquesa","0000CD":"Azul Médio","800080":"Roxo","808080":"Cinza 3","F00":"Vermelho","FF8C00":"Laranja Escuro","FFD700":"Dourado","008000":"Verde","0FF":"Ciano","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Cinza Escuro","FFA07A":"Salmão Claro","FFA500":"Laranja","FFFF00":"Amarelo","00FF00":"Lima","AFEEEE":"Turquesa Pálido","ADD8E6":"Azul Claro","DDA0DD":"Ameixa","D3D3D3":"Cinza Claro","FFF0F5":"Lavanda 1","FAEBD7":"Branco Antiguidade","FFFFE0":"Amarelo Claro","F0FFF0":"Orvalho","F0FFFF":"Azure","F0F8FF":"Azul Alice","E6E6FA":"Lavanda 2","FFF":"Branco"},"more":"Mais Cores...","panelTitle":"Cores","textColorTitle":"Cor do Texto"},"colordialog":{"clear":"Limpar","highlight":"Grifar","options":"Opções de Cor","selected":"Cor Selecionada","title":"Selecione uma Cor"},"templates":{"button":"Modelos de layout","emptyListMsg":"(Não foram definidos modelos de layout)","insertOption":"Substituir o conteúdo atual","options":"Opções de Template","selectPromptMsg":"Selecione um modelo de layout para ser aberto no editor<br>(o conteúdo atual será perdido):","title":"Modelo de layout de conteúdo"},"contextmenu":{"options":"Opções Menu de Contexto"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Título Consulta","cssClassInputLabel":"Classes de CSS","edit":"Editar Div","inlineStyleInputLabel":"Estilo Inline","langDirLTRLabel":"Esquerda para Direita (LTR)","langDirLabel":"Direção da Escrita","langDirRTLLabel":"Direita para Esquerda (RTL)","languageCodeInputLabel":"Código de Idioma","remove":"Remover Div","styleSelectLabel":"Estilo","title":"Criar Container de DIV","toolbar":"Criar Container de DIV"},"toolbar":{"toolbarCollapse":"Diminuir Barra de Ferramentas","toolbarExpand":"Aumentar Barra de Ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Clipboard/Desfazer","editing":"Edição","forms":"Formulários","basicstyles":"Estilos Básicos","paragraph":"Paragrafo","links":"Links","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barra de Ferramentas do Editor"},"elementspath":{"eleLabel":"Caminho dos Elementos","eleTitle":"Elemento %1"},"find":{"find":"Localizar","findOptions":"Opções","findWhat":"Procurar por:","matchCase":"Coincidir Maiúsculas/Minúsculas","matchCyclic":"Coincidir cíclico","matchWord":"Coincidir a palavra inteira","notFoundMsg":"O texto especificado não foi encontrado.","replace":"Substituir","replaceAll":"Substituir Tudo","replaceSuccessMsg":"%1 ocorrência(s) substituída(s).","replaceWith":"Substituir por:","title":"Localizar e Substituir"},"fakeobjects":{"anchor":"Âncora","flash":"Animação em Flash","hiddenfield":"Campo Oculto","iframe":"IFrame","unknown":"Objeto desconhecido"},"flash":{"access":"Acesso ao script","accessAlways":"Sempre","accessNever":"Nunca","accessSameDomain":"Acessar Mesmo Domínio","alignAbsBottom":"Inferior Absoluto","alignAbsMiddle":"Centralizado Absoluto","alignBaseline":"Baseline","alignTextTop":"Superior Absoluto","bgcolor":"Cor do Plano de Fundo","chkFull":"Permitir tela cheia","chkLoop":"Tocar Infinitamente","chkMenu":"Habilita Menu Flash","chkPlay":"Tocar Automaticamente","flashvars":"Variáveis do Flash","hSpace":"HSpace","properties":"Propriedades do Flash","propertiesTab":"Propriedades","quality":"Qualidade","qualityAutoHigh":"Qualidade Alta Automática","qualityAutoLow":"Qualidade Baixa Automática","qualityBest":"Qualidade Melhor","qualityHigh":"Qualidade Alta","qualityLow":"Qualidade Baixa","qualityMedium":"Qualidade Média","scale":"Escala","scaleAll":"Mostrar tudo","scaleFit":"Escala Exata","scaleNoBorder":"Sem Borda","title":"Propriedades do Flash","vSpace":"VSpace","validateHSpace":"O HSpace tem que ser um número","validateSrc":"Por favor, digite o endereço do link","validateVSpace":"O VSpace tem que ser um número.","windowMode":"Modo da janela","windowModeOpaque":"Opaca","windowModeTransparent":"Transparente","windowModeWindow":"Janela"},"font":{"fontSize":{"label":"Tamanho","voiceLabel":"Tamanho da fonte","panelTitle":"Tamanho"},"label":"Fonte","panelTitle":"Fonte","voiceLabel":"Fonte"},"forms":{"button":{"title":"Formatar Botão","text":"Texto (Valor)","type":"Tipo","typeBtn":"Botão","typeSbm":"Enviar","typeRst":"Limpar"},"checkboxAndRadio":{"checkboxTitle":"Formatar Caixa de Seleção","radioTitle":"Formatar Botão de Opção","value":"Valor","selected":"Selecionado","required":"Obrigatório"},"form":{"title":"Formatar Formulário","menu":"Formatar Formulário","action":"Ação","method":"Método","encoding":"Codificação"},"hidden":{"title":"Formatar Campo Oculto","name":"Nome","value":"Valor"},"select":{"title":"Formatar Caixa de Listagem","selectInfo":"Informações","opAvail":"Opções disponíveis","value":"Valor","size":"Tamanho","lines":"linhas","chkMulti":"Permitir múltiplas seleções","required":"Obrigatório","opText":"Texto","opValue":"Valor","btnAdd":"Adicionar","btnModify":"Modificar","btnUp":"Para cima","btnDown":"Para baixo","btnSetValue":"Definir como selecionado","btnDelete":"Remover"},"textarea":{"title":"Formatar Área de Texto","cols":"Colunas","rows":"Linhas"},"textfield":{"title":"Formatar Caixa de Texto","name":"Nome","value":"Valor","charWidth":"Comprimento (em caracteres)","maxChars":"Número Máximo de Caracteres","required":"Obrigatório","type":"Tipo","typeText":"Texto","typePass":"Senha","typeEmail":"Email","typeSearch":"Busca","typeTel":"Número de Telefone","typeUrl":"URL"}},"format":{"label":"Formatação","panelTitle":"Formatação","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"horizontalrule":{"toolbar":"Inserir Linha Horizontal"},"iframe":{"border":"Mostra borda do iframe","noUrl":"Insira a URL do iframe","scrolling":"Abilita scrollbars","title":"Propriedade do IFrame","toolbar":"IFrame"},"image":{"alt":"Texto Alternativo","border":"Borda","btnUpload":"Enviar para o Servidor","button2Img":"Deseja transformar o botão de imagem em uma imagem comum?","hSpace":"HSpace","img2Button":"Deseja transformar a imagem em um botão de imagem?","infoTab":"Informações da Imagem","linkTab":"Link","lockRatio":"Travar Proporções","menu":"Formatar Imagem","resetSize":"Redefinir para o Tamanho Original","title":"Formatar Imagem","titleButton":"Formatar Botão de Imagem","upload":"Enviar","urlMissing":"URL da imagem está faltando.","vSpace":"VSpace","validateBorder":"A borda deve ser um número inteiro.","validateHSpace":"O HSpace deve ser um número inteiro.","validateVSpace":"O VSpace deve ser um número inteiro."},"indent":{"indent":"Aumentar Recuo","outdent":"Diminuir Recuo"},"smiley":{"options":"Opções de Emoticons","title":"Inserir Emoticon","toolbar":"Emoticon"},"justify":{"block":"Justificado","center":"Centralizar","left":"Alinhar Esquerda","right":"Alinhar Direita"},"language":{"button":"Configure o Idioma","remove":"Remover Idioma"},"link":{"acccessKey":"Chave de Acesso","advanced":"Avançado","advisoryContentType":"Tipo de Conteúdo","advisoryTitle":"Título","anchor":{"toolbar":"Inserir/Editar Âncora","menu":"Formatar Âncora","title":"Formatar Âncora","name":"Nome da Âncora","errorName":"Por favor, digite o nome da âncora","remove":"Remover Âncora"},"anchorId":"Id da âncora","anchorName":"Nome da âncora","charset":"Charset do Link","cssClasses":"Classe de CSS","emailAddress":"Endereço E-Mail","emailBody":"Corpo da Mensagem","emailSubject":"Assunto da Mensagem","id":"Id","info":"Informações","langCode":"Direção do idioma","langDir":"Direção do idioma","langDirLTR":"Esquerda para Direita (LTR)","langDirRTL":"Direita para Esquerda (RTL)","menu":"Editar Link","name":"Nome","noAnchors":"(Não há âncoras no documento)","noEmail":"Por favor, digite o endereço de e-mail","noUrl":"Por favor, digite o endereço do Link","other":"<outro>","popupDependent":"Dependente (Netscape)","popupFeatures":"Propriedades da Janela Pop-up","popupFullScreen":"Modo Tela Cheia (IE)","popupLeft":"Esquerda","popupLocationBar":"Barra de Endereços","popupMenuBar":"Barra de Menus","popupResizable":"Redimensionável","popupScrollBars":"Barras de Rolagem","popupStatusBar":"Barra de Status","popupToolbar":"Barra de Ferramentas","popupTop":"Topo","rel":"Tipo de Relação","selectAnchor":"Selecione uma âncora","styles":"Estilos","tabIndex":"Índice de Tabulação","target":"Destino","targetFrame":"<frame>","targetFrameName":"Nome do Frame de Destino","targetPopup":"<janela popup>","targetPopupName":"Nome da Janela Pop-up","title":"Editar Link","toAnchor":"Âncora nesta página","toEmail":"E-Mail","toUrl":"URL","toolbar":"Inserir/Editar Link","type":"Tipo de hiperlink","unlink":"Remover Link","upload":"Enviar ao Servidor"},"list":{"bulletedlist":"Lista sem números","numberedlist":"Lista numerada"},"liststyle":{"armenian":"Numeração Armêna","bulletedTitle":"Propriedades da Lista sem Numeros","circle":"Círculo","decimal":"Numeração Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Numeração Decimal com zeros (01, 02, 03, etc.)","disc":"Disco","georgian":"Numeração da Geórgia (an, ban, gan, etc.)","lowerAlpha":"Numeração Alfabética minúscula (a, b, c, d, e, etc.)","lowerGreek":"Numeração Grega minúscula (alpha, beta, gamma, etc.)","lowerRoman":"Numeração Romana minúscula (i, ii, iii, iv, v, etc.)","none":"Nenhum","notset":"<não definido>","numberedTitle":"Propriedades da Lista Numerada","square":"Quadrado","start":"Início","type":"Tipo","upperAlpha":"Numeração Alfabética Maiúscula (A, B, C, D, E, etc.)","upperRoman":"Numeração Romana maiúscula (I, II, III, IV, V, etc.)","validateStartNumber":"O número inicial da lista deve ser um número inteiro."},"magicline":{"title":"Insera um parágrafo aqui"},"maximize":{"maximize":"Maximizar","minimize":"Minimize"},"newpage":{"toolbar":"Novo"},"pagebreak":{"alt":"Quebra de Página","toolbar":"Inserir Quebra de Página"},"pastetext":{"button":"Colar como Texto sem Formatação","title":"Colar como Texto sem Formatação"},"pastefromword":{"confirmCleanup":"O texto que você deseja colar parece ter sido copiado do Word. Você gostaria de remover a formatação antes de colar?","error":"Não foi possível limpar os dados colados devido a um erro interno","title":"Colar do Word","toolbar":"Colar do Word"},"preview":{"preview":"Visualizar"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Remover Formatação"},"save":{"toolbar":"Salvar"},"selectall":{"toolbar":"Selecionar Tudo"},"showblocks":{"toolbar":"Mostrar blocos de código"},"sourcearea":{"toolbar":"Código-Fonte"},"specialchar":{"options":"Opções de Caractere Especial","title":"Selecione um Caractere Especial","toolbar":"Inserir Caractere Especial"},"scayt":{"btn_about":"Sobre a correção ortográfica durante a digitação","btn_dictionaries":"Dicionários","btn_disable":"Desabilitar correção ortográfica durante a digitação","btn_enable":"Habilitar correção ortográfica durante a digitação","btn_langs":"Idiomas","btn_options":"Opções","text_title":"Correção ortográfica durante a digitação"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos de Formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos de texto corrido","panelTitle3":"Estilos de objeto"},"table":{"border":"Borda","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula a esquerda","insertAfter":"Inserir célula a direita","deleteCell":"Remover Células","merge":"Mesclar Células","mergeRight":"Mesclar com célula a direita","mergeDown":"Mesclar com célula abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Linhas cobertas","colSpan":"Colunas cobertas","wordWrap":"Quebra de palavra","hAlign":"Alinhamento horizontal","vAlign":"Alinhamento vertical","alignBaseline":"Patamar de alinhamento","bgColor":"Cor de fundo","borderColor":"Cor das bordas","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula tem que ser um número.","invalidHeight":"A altura da célula tem que ser um número.","invalidRowSpan":"Linhas cobertas tem que ser um número inteiro.","invalidColSpan":"Colunas cobertas tem que ser um número inteiro.","chooseColor":"Escolher"},"cellPad":"Margem interna","cellSpace":"Espaçamento","column":{"menu":"Coluna","insertBefore":"Inserir coluna a esquerda","insertAfter":"Inserir coluna a direita","deleteColumn":"Remover Colunas"},"columns":"Colunas","deleteTable":"Apagar Tabela","headers":"Cabeçalho","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da borda tem que ser um número.","invalidCellPadding":"A margem interna das células tem que ser um número.","invalidCellSpacing":"O espaçamento das células tem que ser um número.","invalidCols":"O número de colunas tem que ser um número maior que 0.","invalidHeight":"A altura da tabela tem que ser um número.","invalidRows":"O número de linhas tem que ser um número maior que 0.","invalidWidth":"A largura da tabela tem que ser um número.","menu":"Formatar Tabela","row":{"menu":"Linha","insertBefore":"Inserir linha acima","insertAfter":"Inserir linha abaixo","deleteRow":"Remover Linhas"},"rows":"Linhas","summary":"Resumo","title":"Formatar Tabela","toolbar":"Tabela","widthPc":"%","widthPx":"pixels","widthUnit":"unidade largura"},"undo":{"redo":"Refazer","undo":"Desfazer"},"wsc":{"btnIgnore":"Ignorar uma vez","btnIgnoreAll":"Ignorar Todas","btnReplace":"Alterar","btnReplaceAll":"Alterar Todas","btnUndo":"Desfazer","changeTo":"Alterar para","errorLoading":"Erro carregando servidor de aplicação: %s.","ieSpellDownload":"A verificação ortográfica não foi instalada. Você gostaria de realizar o download agora?","manyChanges":"Verificação ortográfica encerrada: %1 palavras foram alteradas","noChanges":"Verificação ortográfica encerrada: Não houve alterações","noMispell":"Verificação encerrada: Não foram encontrados erros de ortografia","noSuggestions":"-sem sugestões de ortografia-","notAvailable":"Desculpe, o serviço não está disponível no momento.","notInDic":"Não encontrada","oneChange":"Verificação ortográfica encerrada: Uma palavra foi alterada","progress":"Verificação ortográfica em andamento...","title":"Corretor Ortográfico","toolbar":"Verificar Ortografia"}};
\ No newline at end of file
+CKEDITOR.lang['pt-br']={"editor":"Editor de Rich Text","editorPanel":"Painel do editor de Rich Text","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Localizar no Servidor","url":"URL","protocol":"Protocolo","upload":"Enviar ao Servidor","uploadSubmit":"Enviar para o Servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de Seleção","radio":"Botão de Opção","textField":"Caixa de Texto","textarea":"Área de Texto","hiddenField":"Campo Oculto","button":"Botão","select":"Caixa de Listagem","imageButton":"Botão de Imagem","notSet":"<não ajustado>","id":"Id","name":"Nome","langDir":"Direção do idioma","langDirLtr":"Esquerda para Direita (LTR)","langDirRtl":"Direita para Esquerda (RTL)","langCode":"Idioma","longDescr":"Descrição da URL","cssClass":"Classe de CSS","advisoryTitle":"Título","cssStyle":"Estilos","ok":"OK","cancel":"Cancelar","close":"Fechar","preview":"Visualizar","resize":"Arraste para redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um número.","confirmNewPage":"Todas as mudanças não salvas serão perdidas. Tem certeza de que quer abrir uma nova página?","confirmCancel":"Algumas opções foram alteradas. Tem certeza de que quer fechar a caixa de diálogo?","options":"Opções","target":"Destino","targetNew":"Nova Janela (_blank)","targetTop":"Janela de Cima (_top)","targetSelf":"Mesma Janela (_self)","targetParent":"Janela Pai (_parent)","langDirLTR":"Esquerda para Direita (LTR)","langDirRTL":"Direita para Esquerda (RTL)","styles":"Estilo","cssClasses":"Classes","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centralizado","alignJustify":"Justificar","alignTop":"Superior","alignMiddle":"Centralizado","alignBottom":"Inferior","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura tem que ser um número","invalidWidth":"A largura tem que ser um número.","invalidCssLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","invalidHtmlLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de HTML (px ou %).","invalidInlineStyle":"O valor válido para estilo deve conter uma ou mais tuplas no formato \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para valor em pixels ou um número seguido de uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>","keyboard":{"8":"Tecla Retroceder","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Tecla Espaço","35":"End","36":"Home","46":"Delete","224":"Comando"},"keyboardShortcut":"Atalho do teclado"},"about":{"copy":"Copyright &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Verifique o $1 para obter ajuda.","moreInfo":"Para informações sobre a licença por favor visite o nosso site:","title":"Sobre o CKEditor","userGuide":"Guia do Usuário do CKEditor"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Tachado","subscript":"Subscrito","superscript":"Sobrescrito","underline":"Sublinhado"},"bidi":{"ltr":"Direção do texto da esquerda para a direita","rtl":"Direção do texto da direita para a esquerda"},"blockquote":{"toolbar":"Citação"},"clipboard":{"copy":"Copiar","copyError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de copiar automaticamente. Por favor, utilize o teclado para copiar (Ctrl/Cmd+C).","cut":"Recortar","cutError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de recortar automaticamente. Por favor, utilize o teclado para recortar (Ctrl/Cmd+X).","paste":"Colar","pasteArea":"Área para Colar","pasteMsg":"Transfira o link usado na caixa usando o teclado com (<STRONG>Ctrl/Cmd+V</STRONG>) e <STRONG>OK</STRONG>.","securityMsg":"As configurações de segurança do seu navegador não permitem que o editor acesse os dados da área de transferência diretamente. Por favor cole o conteúdo manualmente nesta janela.","title":"Colar"},"button":{"selectedLabel":"%1 (Selecionado)"},"colorbutton":{"auto":"Automático","bgColorTitle":"Cor do Plano de Fundo","colors":{"000":"Preto","800000":"Foquete","8B4513":"Marrom 1","2F4F4F":"Cinza 1","008080":"Cerceta","000080":"Azul Marinho","4B0082":"Índigo","696969":"Cinza 2","B22222":"Tijolo de Fogo","A52A2A":"Marrom 2","DAA520":"Vara Dourada","006400":"Verde Escuro","40E0D0":"Turquesa","0000CD":"Azul Médio","800080":"Roxo","808080":"Cinza 3","F00":"Vermelho","FF8C00":"Laranja Escuro","FFD700":"Dourado","008000":"Verde","0FF":"Ciano","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Cinza Escuro","FFA07A":"Salmão Claro","FFA500":"Laranja","FFFF00":"Amarelo","00FF00":"Lima","AFEEEE":"Turquesa Pálido","ADD8E6":"Azul Claro","DDA0DD":"Ameixa","D3D3D3":"Cinza Claro","FFF0F5":"Lavanda 1","FAEBD7":"Branco Antiguidade","FFFFE0":"Amarelo Claro","F0FFF0":"Orvalho","F0FFFF":"Azure","F0F8FF":"Azul Alice","E6E6FA":"Lavanda 2","FFF":"Branco","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Mais Cores...","panelTitle":"Cores","textColorTitle":"Cor do Texto"},"colordialog":{"clear":"Limpar","highlight":"Grifar","options":"Opções de Cor","selected":"Cor Selecionada","title":"Selecione uma Cor"},"templates":{"button":"Modelos de layout","emptyListMsg":"(Não foram definidos modelos de layout)","insertOption":"Substituir o conteúdo atual","options":"Opções de Template","selectPromptMsg":"Selecione um modelo de layout para ser aberto no editor<br>(o conteúdo atual será perdido):","title":"Modelo de layout de conteúdo"},"contextmenu":{"options":"Opções Menu de Contexto"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Título Consulta","cssClassInputLabel":"Classes de CSS","edit":"Editar Div","inlineStyleInputLabel":"Estilo Inline","langDirLTRLabel":"Esquerda para Direita (LTR)","langDirLabel":"Direção da Escrita","langDirRTLLabel":"Direita para Esquerda (RTL)","languageCodeInputLabel":"Código de Idioma","remove":"Remover Div","styleSelectLabel":"Estilo","title":"Criar Container de DIV","toolbar":"Criar Container de DIV"},"toolbar":{"toolbarCollapse":"Diminuir Barra de Ferramentas","toolbarExpand":"Aumentar Barra de Ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Clipboard/Desfazer","editing":"Edição","forms":"Formulários","basicstyles":"Estilos Básicos","paragraph":"Paragrafo","links":"Links","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barra de Ferramentas do Editor"},"elementspath":{"eleLabel":"Caminho dos Elementos","eleTitle":"Elemento %1"},"find":{"find":"Localizar","findOptions":"Opções","findWhat":"Procurar por:","matchCase":"Coincidir Maiúsculas/Minúsculas","matchCyclic":"Coincidir cíclico","matchWord":"Coincidir a palavra inteira","notFoundMsg":"O texto especificado não foi encontrado.","replace":"Substituir","replaceAll":"Substituir Tudo","replaceSuccessMsg":"%1 ocorrência(s) substituída(s).","replaceWith":"Substituir por:","title":"Localizar e Substituir"},"fakeobjects":{"anchor":"Âncora","flash":"Animação em Flash","hiddenfield":"Campo Oculto","iframe":"IFrame","unknown":"Objeto desconhecido"},"flash":{"access":"Acesso ao script","accessAlways":"Sempre","accessNever":"Nunca","accessSameDomain":"Acessar Mesmo Domínio","alignAbsBottom":"Inferior Absoluto","alignAbsMiddle":"Centralizado Absoluto","alignBaseline":"Baseline","alignTextTop":"Superior Absoluto","bgcolor":"Cor do Plano de Fundo","chkFull":"Permitir tela cheia","chkLoop":"Tocar Infinitamente","chkMenu":"Habilita Menu Flash","chkPlay":"Tocar Automaticamente","flashvars":"Variáveis do Flash","hSpace":"HSpace","properties":"Propriedades do Flash","propertiesTab":"Propriedades","quality":"Qualidade","qualityAutoHigh":"Qualidade Alta Automática","qualityAutoLow":"Qualidade Baixa Automática","qualityBest":"Qualidade Melhor","qualityHigh":"Qualidade Alta","qualityLow":"Qualidade Baixa","qualityMedium":"Qualidade Média","scale":"Escala","scaleAll":"Mostrar tudo","scaleFit":"Escala Exata","scaleNoBorder":"Sem Borda","title":"Propriedades do Flash","vSpace":"VSpace","validateHSpace":"O HSpace tem que ser um número","validateSrc":"Por favor, digite o endereço do link","validateVSpace":"O VSpace tem que ser um número.","windowMode":"Modo da janela","windowModeOpaque":"Opaca","windowModeTransparent":"Transparente","windowModeWindow":"Janela"},"font":{"fontSize":{"label":"Tamanho","voiceLabel":"Tamanho da fonte","panelTitle":"Tamanho"},"label":"Fonte","panelTitle":"Fonte","voiceLabel":"Fonte"},"forms":{"button":{"title":"Formatar Botão","text":"Texto (Valor)","type":"Tipo","typeBtn":"Botão","typeSbm":"Enviar","typeRst":"Limpar"},"checkboxAndRadio":{"checkboxTitle":"Formatar Caixa de Seleção","radioTitle":"Formatar Botão de Opção","value":"Valor","selected":"Selecionado","required":"Obrigatório"},"form":{"title":"Formatar Formulário","menu":"Formatar Formulário","action":"Ação","method":"Método","encoding":"Codificação"},"hidden":{"title":"Formatar Campo Oculto","name":"Nome","value":"Valor"},"select":{"title":"Formatar Caixa de Listagem","selectInfo":"Informações","opAvail":"Opções disponíveis","value":"Valor","size":"Tamanho","lines":"linhas","chkMulti":"Permitir múltiplas seleções","required":"Obrigatório","opText":"Texto","opValue":"Valor","btnAdd":"Adicionar","btnModify":"Modificar","btnUp":"Para cima","btnDown":"Para baixo","btnSetValue":"Definir como selecionado","btnDelete":"Remover"},"textarea":{"title":"Formatar Área de Texto","cols":"Colunas","rows":"Linhas"},"textfield":{"title":"Formatar Caixa de Texto","name":"Nome","value":"Valor","charWidth":"Comprimento (em caracteres)","maxChars":"Número Máximo de Caracteres","required":"Obrigatório","type":"Tipo","typeText":"Texto","typePass":"Senha","typeEmail":"Email","typeSearch":"Busca","typeTel":"Número de Telefone","typeUrl":"URL"}},"format":{"label":"Formatação","panelTitle":"Formatação","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"horizontalrule":{"toolbar":"Inserir Linha Horizontal"},"iframe":{"border":"Mostra borda do iframe","noUrl":"Insira a URL do iframe","scrolling":"Abilita scrollbars","title":"Propriedade do IFrame","toolbar":"IFrame"},"image":{"alt":"Texto Alternativo","border":"Borda","btnUpload":"Enviar para o Servidor","button2Img":"Deseja transformar o botão de imagem em uma imagem comum?","hSpace":"HSpace","img2Button":"Deseja transformar a imagem em um botão de imagem?","infoTab":"Informações da Imagem","linkTab":"Link","lockRatio":"Travar Proporções","menu":"Formatar Imagem","resetSize":"Redefinir para o Tamanho Original","title":"Formatar Imagem","titleButton":"Formatar Botão de Imagem","upload":"Enviar","urlMissing":"URL da imagem está faltando.","vSpace":"VSpace","validateBorder":"A borda deve ser um número inteiro.","validateHSpace":"O HSpace deve ser um número inteiro.","validateVSpace":"O VSpace deve ser um número inteiro."},"indent":{"indent":"Aumentar Recuo","outdent":"Diminuir Recuo"},"smiley":{"options":"Opções de Emoticons","title":"Inserir Emoticon","toolbar":"Emoticon"},"justify":{"block":"Justificado","center":"Centralizar","left":"Alinhar Esquerda","right":"Alinhar Direita"},"language":{"button":"Configure o Idioma","remove":"Remover Idioma"},"link":{"acccessKey":"Chave de Acesso","advanced":"Avançado","advisoryContentType":"Tipo de Conteúdo","advisoryTitle":"Título","anchor":{"toolbar":"Inserir/Editar Âncora","menu":"Formatar Âncora","title":"Formatar Âncora","name":"Nome da Âncora","errorName":"Por favor, digite o nome da âncora","remove":"Remover Âncora"},"anchorId":"Id da âncora","anchorName":"Nome da âncora","charset":"Charset do Link","cssClasses":"Classe de CSS","download":"Forçar Download","displayText":"Exibir Texto","emailAddress":"Endereço E-Mail","emailBody":"Corpo da Mensagem","emailSubject":"Assunto da Mensagem","id":"Id","info":"Informações","langCode":"Direção do idioma","langDir":"Direção do idioma","langDirLTR":"Esquerda para Direita (LTR)","langDirRTL":"Direita para Esquerda (RTL)","menu":"Editar Link","name":"Nome","noAnchors":"(Não há âncoras no documento)","noEmail":"Por favor, digite o endereço de e-mail","noUrl":"Por favor, digite o endereço do Link","other":"<outro>","popupDependent":"Dependente (Netscape)","popupFeatures":"Propriedades da Janela Pop-up","popupFullScreen":"Modo Tela Cheia (IE)","popupLeft":"Esquerda","popupLocationBar":"Barra de Endereços","popupMenuBar":"Barra de Menus","popupResizable":"Redimensionável","popupScrollBars":"Barras de Rolagem","popupStatusBar":"Barra de Status","popupToolbar":"Barra de Ferramentas","popupTop":"Topo","rel":"Tipo de Relação","selectAnchor":"Selecione uma âncora","styles":"Estilos","tabIndex":"Índice de Tabulação","target":"Destino","targetFrame":"<frame>","targetFrameName":"Nome do Frame de Destino","targetPopup":"<janela popup>","targetPopupName":"Nome da Janela Pop-up","title":"Editar Link","toAnchor":"Âncora nesta página","toEmail":"E-Mail","toUrl":"URL","toolbar":"Inserir/Editar Link","type":"Tipo de hiperlink","unlink":"Remover Link","upload":"Enviar ao Servidor"},"list":{"bulletedlist":"Lista sem números","numberedlist":"Lista numerada"},"liststyle":{"armenian":"Numeração Armêna","bulletedTitle":"Propriedades da Lista sem Numeros","circle":"Círculo","decimal":"Numeração Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Numeração Decimal com zeros (01, 02, 03, etc.)","disc":"Disco","georgian":"Numeração da Geórgia (an, ban, gan, etc.)","lowerAlpha":"Numeração Alfabética minúscula (a, b, c, d, e, etc.)","lowerGreek":"Numeração Grega minúscula (alpha, beta, gamma, etc.)","lowerRoman":"Numeração Romana minúscula (i, ii, iii, iv, v, etc.)","none":"Nenhum","notset":"<não definido>","numberedTitle":"Propriedades da Lista Numerada","square":"Quadrado","start":"Início","type":"Tipo","upperAlpha":"Numeração Alfabética Maiúscula (A, B, C, D, E, etc.)","upperRoman":"Numeração Romana maiúscula (I, II, III, IV, V, etc.)","validateStartNumber":"O número inicial da lista deve ser um número inteiro."},"magicline":{"title":"Insera um parágrafo aqui"},"maximize":{"maximize":"Maximizar","minimize":"Minimize"},"newpage":{"toolbar":"Novo"},"pagebreak":{"alt":"Quebra de Página","toolbar":"Inserir Quebra de Página"},"pastetext":{"button":"Colar como Texto sem Formatação","title":"Colar como Texto sem Formatação"},"pastefromword":{"confirmCleanup":"O texto que você deseja colar parece ter sido copiado do Word. Você gostaria de remover a formatação antes de colar?","error":"Não foi possível limpar os dados colados devido a um erro interno","title":"Colar do Word","toolbar":"Colar do Word"},"preview":{"preview":"Visualizar"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Remover Formatação"},"save":{"toolbar":"Salvar"},"selectall":{"toolbar":"Selecionar Tudo"},"showblocks":{"toolbar":"Mostrar blocos de código"},"sourcearea":{"toolbar":"Código-Fonte"},"specialchar":{"options":"Opções de Caractere Especial","title":"Selecione um Caractere Especial","toolbar":"Inserir Caractere Especial"},"scayt":{"btn_about":"Sobre a correção ortográfica durante a digitação","btn_dictionaries":"Dicionários","btn_disable":"Desabilitar correção ortográfica durante a digitação","btn_enable":"Habilitar correção ortográfica durante a digitação","btn_langs":"Idiomas","btn_options":"Opções","text_title":"Correção ortográfica durante a digitação"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos de Formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos de texto corrido","panelTitle3":"Estilos de objeto"},"table":{"border":"Borda","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula a esquerda","insertAfter":"Inserir célula a direita","deleteCell":"Remover Células","merge":"Mesclar Células","mergeRight":"Mesclar com célula a direita","mergeDown":"Mesclar com célula abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Linhas cobertas","colSpan":"Colunas cobertas","wordWrap":"Quebra de palavra","hAlign":"Alinhamento horizontal","vAlign":"Alinhamento vertical","alignBaseline":"Patamar de alinhamento","bgColor":"Cor de fundo","borderColor":"Cor das bordas","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula tem que ser um número.","invalidHeight":"A altura da célula tem que ser um número.","invalidRowSpan":"Linhas cobertas tem que ser um número inteiro.","invalidColSpan":"Colunas cobertas tem que ser um número inteiro.","chooseColor":"Escolher"},"cellPad":"Margem interna","cellSpace":"Espaçamento","column":{"menu":"Coluna","insertBefore":"Inserir coluna a esquerda","insertAfter":"Inserir coluna a direita","deleteColumn":"Remover Colunas"},"columns":"Colunas","deleteTable":"Apagar Tabela","headers":"Cabeçalho","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da borda tem que ser um número.","invalidCellPadding":"A margem interna das células tem que ser um número.","invalidCellSpacing":"O espaçamento das células tem que ser um número.","invalidCols":"O número de colunas tem que ser um número maior que 0.","invalidHeight":"A altura da tabela tem que ser um número.","invalidRows":"O número de linhas tem que ser um número maior que 0.","invalidWidth":"A largura da tabela tem que ser um número.","menu":"Formatar Tabela","row":{"menu":"Linha","insertBefore":"Inserir linha acima","insertAfter":"Inserir linha abaixo","deleteRow":"Remover Linhas"},"rows":"Linhas","summary":"Resumo","title":"Formatar Tabela","toolbar":"Tabela","widthPc":"%","widthPx":"pixels","widthUnit":"unidade largura"},"undo":{"redo":"Refazer","undo":"Desfazer"},"wsc":{"btnIgnore":"Ignorar uma vez","btnIgnoreAll":"Ignorar Todas","btnReplace":"Alterar","btnReplaceAll":"Alterar Todas","btnUndo":"Desfazer","changeTo":"Alterar para","errorLoading":"Erro carregando servidor de aplicação: %s.","ieSpellDownload":"A verificação ortográfica não foi instalada. Você gostaria de realizar o download agora?","manyChanges":"Verificação ortográfica encerrada: %1 palavras foram alteradas","noChanges":"Verificação ortográfica encerrada: Não houve alterações","noMispell":"Verificação encerrada: Não foram encontrados erros de ortografia","noSuggestions":"-sem sugestões de ortografia-","notAvailable":"Desculpe, o serviço não está disponível no momento.","notInDic":"Não encontrada","oneChange":"Verificação ortográfica encerrada: Uma palavra foi alterada","progress":"Verificação ortográfica em andamento...","title":"Corretor Ortográfico","toolbar":"Verificar Ortografia"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/lang/pt.js
index 93f90f02790..497fcc5f7b3 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/pt.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/pt.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['pt']={"editor":"Editor de texto enriquecido","editorPanel":"Painel do editor de texto enriquecido","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Navegar no servidor","url":"URL","protocol":"Protocolo","upload":"Enviar","uploadSubmit":"Enviar para o servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de Seleção","radio":"Botão","textField":"Campo do Texto","textarea":"Área do Texto","hiddenField":"Campo oculto","button":"Botão","select":"Campo da Seleção","imageButton":"Botão da Imagem","notSet":"<Não definido>","id":"Id.","name":"Nome","langDir":"Direção do Idioma","langDirLtr":"Esquerda para a Direita (EPD)","langDirRtl":"Direita para a Esquerda (DPE)","langCode":"Código do Idioma","longDescr":"Descrição Completa do URL","cssClass":"Classes de Estilo das Folhas","advisoryTitle":"Título Consultivo","cssStyle":"Estilo","ok":"CONFIRMAR","cancel":"Cancelar","close":"Fechar","preview":"Pré-visualização","resize":"Redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um numero.","confirmNewPage":"Irão ser perdidas quaisquer alterações não guardadas. Tem a certeza que deseja carregar a nova página?","confirmCancel":"Foram alteradas algumas das opções. Tem a certeza que deseja fechar a janela?","options":"Opções","target":"Destino","targetNew":"Nova Janela (_blank)","targetTop":"Janela Superior (_top)","targetSelf":"Mesma Janela (_self)","targetParent":"Janela Parente (_parent)","langDirLTR":"Esquerda para a Direita (EPD)","langDirRTL":"Direita para a Esquerda (DPE)","styles":"Estilo","cssClasses":"Classes de folhas de estilo","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Topo","alignMiddle":"Centro","alignBottom":"Base","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura deve ser um número.","invalidWidth":"A largura deve ser um número. ","invalidCssLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida HTML válida (px ou %).","invalidInlineStyle":"O valor especificado para o estilo em linha deve constituir um ou mais conjuntos de valores com o formato de \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para um valor em pontos ou um número com uma unidade CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>"},"about":{"copy":"Direitos de Autor &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Doar $1 para ajudar.","moreInfo":"Para informação sobre licenciamento visite o nosso sítio web:","title":"Sobre o CKEditor","userGuide":"CKEditor - Guia do Utilizador"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Rasurado","subscript":"Superior à linha","superscript":"Inferior à Linha","underline":"Sublinhado"},"bidi":{"ltr":"Direção do texto da esquerda para a direita","rtl":"Direção do texto da direita para a esquerda"},"blockquote":{"toolbar":"Bloco de citação"},"clipboard":{"copy":"Copiar","copyError":"A configuração de segurança do navegador não permite a execução automática de operações de copiar. Por favor use o teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"A configuração de segurança do navegador não permite a execução automática de operações de cortar. Por favor use o teclado (Ctrl/Cmd+X).","paste":"Colar","pasteArea":"Colar área","pasteMsg":"Por favor, cole dentro da seguinte caixa usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e prima <STRONG>OK</STRONG>.","securityMsg":"Devido ás definições de segurança do teu browser, o editor não pode aceder ao clipboard diretamente. É necessário que voltes a colar as informações nesta janela.","title":"Colar"},"button":{"selectedLabel":"%1 (Selecionado)"},"colorbutton":{"auto":"Automático","bgColorTitle":"Cor de Fundo","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Cinza claro","FFF0F5":"Lavender Blush","FAEBD7":"Branco velho","FFFFE0":"Amarelo claro","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Branco"},"more":"Mais cores...","panelTitle":"Cores","textColorTitle":"Cor do texto"},"colordialog":{"clear":"Limpar","highlight":"Realçar","options":"Opções de cor","selected":"Cor selecionada","title":"Selecionar cor"},"templates":{"button":"Modelos","emptyListMsg":"(Sem modelos definidos)","insertOption":"Substituir conteúdos atuais","options":"Opções do modelo","selectPromptMsg":"Por favor, selecione o modelo para abrir no editor","title":"Conteúdo dos Modelos"},"contextmenu":{"options":"Menu de opções de contexto"},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Título","cssClassInputLabel":"Classes de folhas de estilo","edit":"Editar Div","inlineStyleInputLabel":"Estilho em Linha","langDirLTRLabel":"Esquerda à Direita (LTR)","langDirLabel":"Orientação de idioma","langDirRTLLabel":"Direita a Esquerda (RTL)","languageCodeInputLabel":"Codigo do Idioma","remove":"Remover Div","styleSelectLabel":"Estilo","title":"Criar Div","toolbar":"Criar Div"},"toolbar":{"toolbarCollapse":"Ocultar barra de ferramentas","toolbarExpand":"Expandir barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Área de transferência/Anular","editing":"Edição","forms":"Formulários","basicstyles":"Estilos Básicos","paragraph":"Parágrafo","links":"Hiperligações","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Editor de Barras de Ferramentas"},"elementspath":{"eleLabel":"Caminho dos elementos","eleTitle":"Elemento %1"},"find":{"find":"Procurar","findOptions":"Find Options","findWhat":"Texto a procurar:","matchCase":"Maiúsculas/Minúsculas","matchCyclic":"Match cyclic","matchWord":"Coincidir com toda a palavra","notFoundMsg":"O texto especificado não foi encontrado.","replace":"Substituir","replaceAll":"Substituir Tudo","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Substituir por:","title":"Find and Replace"},"fakeobjects":{"anchor":" Inserir/Editar Âncora","flash":"Animação Flash","hiddenfield":"Campo oculto","iframe":"IFrame","unknown":"Objeto Desconhecido"},"flash":{"access":"Acesso ao Script","accessAlways":"Sempre","accessNever":"Nunca","accessSameDomain":"Mesmo dominio","alignAbsBottom":"Abs inferior","alignAbsMiddle":"Abs centro","alignBaseline":"Linha de base","alignTextTop":"Topo do texto","bgcolor":"Cor de Fundo","chkFull":"Permitir Ecrã inteiro","chkLoop":"Loop","chkMenu":"Permitir Menu do Flash","chkPlay":"Reproduzir automaticamente","flashvars":"Variaveis para o Flash","hSpace":"Esp.Horiz","properties":"Propriedades do Flash","propertiesTab":"Propriedades","quality":"Qualidade","qualityAutoHigh":"Alta Automaticamente","qualityAutoLow":"Baixa Automaticamente","qualityBest":"Melhor","qualityHigh":"Alta","qualityLow":"Baixa","qualityMedium":"Média","scale":"Escala","scaleAll":"Mostrar tudo","scaleFit":"Tamanho Exacto","scaleNoBorder":"Sem Limites","title":"Propriedades do Flash","vSpace":"Esp.Vert","validateHSpace":"HSpace tem de ser um numero.","validateSrc":"Por favor introduza a hiperligação URL","validateVSpace":"VSpace tem de ser um numero.","windowMode":"Modo de janela","windowModeOpaque":"Opaco","windowModeTransparent":"Transparente","windowModeWindow":"Janela"},"font":{"fontSize":{"label":"Tamanho","voiceLabel":"Tamanho da letra","panelTitle":"Tamanho da letra"},"label":"Fonte","panelTitle":"Nome do Tipo de Letra","voiceLabel":"Tipo de Letra"},"forms":{"button":{"title":"Propriedades do Botão","text":"Texto (Valor)","type":"Tipo","typeBtn":"Botão","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Propriedades da Caixa de Verificação","radioTitle":"Propriedades do Botão de Opção","value":"Valor","selected":"Seleccionado","required":"Required"},"form":{"title":"Propriedades do Formulário","menu":"Propriedades do Formulário","action":"Acção","method":"Método","encoding":"Encoding"},"hidden":{"title":"Propriedades do Campo Escondido","name":"Nome","value":"Valor"},"select":{"title":"Propriedades da Caixa de Combinação","selectInfo":"Informação","opAvail":"Opções Possíveis","value":"Valor","size":"Tamanho","lines":"linhas","chkMulti":"Permitir selecções múltiplas","required":"Required","opText":"Texto","opValue":"Valor","btnAdd":"Adicionar","btnModify":"Modificar","btnUp":"Para cima","btnDown":"Para baixo","btnSetValue":"Definir um valor por defeito","btnDelete":"Apagar"},"textarea":{"title":"Propriedades da Área de Texto","cols":"Colunas","rows":"Linhas"},"textfield":{"title":"Propriedades do Campo de Texto","name":"Nome","value":"Valor","charWidth":"Tamanho do caracter","maxChars":"Nr. Máximo de Caracteres","required":"Required","type":"Tipo","typeText":"Texto","typePass":"Senha","typeEmail":"Email","typeSearch":"Pesquisar","typeTel":"Telefone","typeUrl":"URL"}},"format":{"label":"Formatar","panelTitle":"Formatar Parágrafo","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"horizontalrule":{"toolbar":"Inserir Linha Horizontal"},"iframe":{"border":"Mostrar a borda da Frame","noUrl":"Por favor, digite o URL da iframe","scrolling":"Ativar barras de rolamento","title":"Propriedades da IFrame","toolbar":"IFrame"},"image":{"alt":"Texto Alternativo","border":"Limite","btnUpload":"Enviar para o servidor","button2Img":"Deseja transformar o botão com imagem selecionado em uma imagem?","hSpace":"Esp.Horiz","img2Button":"Deseja transformar a imagem selecionada em um botão com imagem?","infoTab":"Informação da Imagem","linkTab":"Hiperligação","lockRatio":"Proporcional","menu":"Propriedades da Imagem","resetSize":"Tamanho Original","title":"Propriedades da Imagem","titleButton":"Propriedades do Botão de imagens","upload":"Carregar","urlMissing":"O URL da fonte da imagem está em falta.","vSpace":"Esp.Vert","validateBorder":"A borda tem de ser um numero.","validateHSpace":"HSpace tem de ser um numero.","validateVSpace":"VSpace tem de ser um numero."},"indent":{"indent":"Aumentar Avanço","outdent":"Diminuir Avanço"},"smiley":{"options":"Opções de Emoticons","title":"Inserir um Emoticon","toolbar":"Emoticons"},"justify":{"block":"Justificado","center":"Alinhar ao Centro","left":"Alinhar à esquerda","right":"Alinhar à direita"},"language":{"button":"Definir Idioma","remove":"Remover idioma"},"link":{"acccessKey":"Chave de Acesso","advanced":"Avançado","advisoryContentType":"Tipo de Conteúdo","advisoryTitle":"Título","anchor":{"toolbar":" Inserir/Editar Âncora","menu":"Propriedades da Âncora","title":"Propriedades da Âncora","name":"Nome da Âncora","errorName":"Por favor, introduza o nome da âncora","remove":"Remove Anchor"},"anchorId":"Por ID de elemento","anchorName":"Por Nome de Referência","charset":"Fonte de caracteres vinculado","cssClasses":"Classes de Estilo de Folhas Classes","emailAddress":"Endereço de E-Mail","emailBody":"Corpo da Mensagem","emailSubject":"Título de Mensagem","id":"ID","info":"Informação de Hiperligação","langCode":"Orientação de idioma","langDir":"Orientação de idioma","langDirLTR":"Esquerda à Direita (LTR)","langDirRTL":"Direita a Esquerda (RTL)","menu":"Editar Hiperligação","name":"Nome","noAnchors":"(Não há referências disponíveis no documento)","noEmail":"Por favor introduza o endereço de e-mail","noUrl":"Por favor introduza a hiperligação URL","other":"<outro>","popupDependent":"Dependente (Netscape)","popupFeatures":"Características de Janela de Popup","popupFullScreen":"Janela Completa (IE)","popupLeft":"Posição Esquerda","popupLocationBar":"Barra de localização","popupMenuBar":"Barra de Menu","popupResizable":"Redimensionável","popupScrollBars":"Barras de deslocamento","popupStatusBar":"Barra de Estado","popupToolbar":"Barra de ferramentas","popupTop":"Posição Direita","rel":"Relação","selectAnchor":"Seleccionar una referência","styles":"Estilo","tabIndex":"Índice de tabulação","target":"Alvo","targetFrame":"<frame>","targetFrameName":"Nome do Frame Destino","targetPopup":"<janela de popup>","targetPopupName":"Nome da Janela de Popup","title":"Hiperligação","toAnchor":"Referência a esta página","toEmail":"Email","toUrl":"URL","toolbar":"Inserir/Editar Hiperligação","type":"Tipo de Hiperligação","unlink":"Eliminar Hiperligação","upload":"Carregar"},"list":{"bulletedlist":"Marcas","numberedlist":"Numeração"},"liststyle":{"armenian":"Numeração armênia","bulletedTitle":"Bulleted List Properties","circle":"Círculo","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disco","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"Nenhum","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Quadrado","start":"Iniciar","type":"Tipo","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insira aqui o parágrafo"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"newpage":{"toolbar":"Nova Página"},"pagebreak":{"alt":"Quebra de página","toolbar":"Inserir Quebra de Página"},"pastetext":{"button":"Colar como Texto Simples","title":"Colar como Texto Simples"},"pastefromword":{"confirmCleanup":"O texto que pretende colar parece ter sido copiado do Word. Deseja limpá-lo antes de colar?","error":"Não foi possivel limpar a informação colada decido a um erro interno.","title":"Colar do Word","toolbar":"Colar do Word"},"preview":{"preview":"Pré-visualizar"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Eliminar Formato"},"save":{"toolbar":"Guardar"},"selectall":{"toolbar":"Selecionar tudo"},"showblocks":{"toolbar":"Exibir blocos"},"sourcearea":{"toolbar":"Fonte"},"specialchar":{"options":"Opções de caracteres especiais","title":"Selecione um caracter especial","toolbar":"Inserir carácter especial"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de Formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos de Linha","panelTitle3":"Estilos de Objeto"},"table":{"border":"Tamanho do contorno","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula antes","insertAfter":"Inserir célula depois","deleteCell":"Apagar Células","merge":"Unir Células","mergeRight":"Unir à Direita","mergeDown":"Fundir abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Filas na Célula","colSpan":"Colunas na Célula","wordWrap":"Moldar texto","hAlign":"Alinhamento Horizontal","vAlign":"Alinhamento Vertical","alignBaseline":"Base","bgColor":"Cor de Fundo","borderColor":"Cor da Margem","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula deve ser um número.","invalidHeight":"A altura da célula deve ser um número.","invalidRowSpan":"As filas da célula deve ter um número inteiro.","invalidColSpan":"As colunas da célula deve ter um número inteiro.","chooseColor":"Escolher"},"cellPad":"Espaço interior","cellSpace":"Espaçamento de célula","column":{"menu":"Coluna","insertBefore":"Inserir Coluna Antes","insertAfter":"Inserir coluna depois","deleteColumn":"Apagar colunas"},"columns":"Colunas","deleteTable":"Apagar tabela","headers":"Cabeçalhos","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da margem tem de ser um número.","invalidCellPadding":"A criação do espaço na célula deve ser um número positivo.","invalidCellSpacing":"O espaçamento da célula deve ser um número positivo.","invalidCols":"O número de colunas tem de ser um número maior que 0.","invalidHeight":"A altura da tabela tem de ser um número.","invalidRows":"O número de linhas tem de ser maior que 0.","invalidWidth":"A largura da tabela tem de ser um número.","menu":"Propriedades da Tabela","row":{"menu":"Linha","insertBefore":"Inserir linha antes","insertAfter":"Inserir linha depois","deleteRow":"Apagar linhas"},"rows":"Linhas","summary":"Sumário","title":"Propriedades da Tabela","toolbar":"Tabela","widthPc":"percentagem","widthPx":"pontos","widthUnit":"unidade da largura"},"undo":{"redo":"Refazer","undo":"Anular"},"wsc":{"btnIgnore":"Ignorar","btnIgnoreAll":"Ignorar Tudo","btnReplace":"Substituir","btnReplaceAll":"Substituir Tudo","btnUndo":"Anular","changeTo":"Mudar para","errorLoading":"Error loading application service host: %s.","ieSpellDownload":" Verificação ortográfica não instalada. Quer descarregar agora?","manyChanges":"Verificação ortográfica completa: %1 palavras alteradas","noChanges":"Verificação ortográfica completa: não houve alteração de palavras","noMispell":"Verificação ortográfica completa: não foram encontrados erros","noSuggestions":"- Sem sugestões -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Não está num directório","oneChange":"Verificação ortográfica completa: uma palavra alterada","progress":"Verificação ortográfica em progresso…","title":"Spell Checker","toolbar":"Verificação Ortográfica"}};
\ No newline at end of file
+CKEDITOR.lang['pt']={"editor":"Editor de texto enriquecido","editorPanel":"Painel do editor de texto enriquecido","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Navegar no servidor","url":"URL","protocol":"Protocolo","upload":"Carregar","uploadSubmit":"Enviar para o servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de verificação","radio":"Botão","textField":"Campo de texto","textarea":"Área de texto","hiddenField":"Campo oculto","button":"Botão","select":"Campo de seleção","imageButton":"Botão da imagem","notSet":"<Não definido>","id":"ID","name":"Nome","langDir":"Direção do idioma","langDirLtr":"Esquerda para a Direita (EPD)","langDirRtl":"Direita para a Esquerda (DPE)","langCode":"Código do idioma","longDescr":"Descrição completa do URL","cssClass":"Classes de estilo das folhas","advisoryTitle":"Título consultivo","cssStyle":"Estilo","ok":"CONFIRMAR","cancel":"Cancelar","close":"Fechar","preview":"Pré-visualização","resize":"Redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um numero.","confirmNewPage":"Irão ser perdidas quaisquer alterações não guardadas. Tem a certeza que deseja carregar a nova página?","confirmCancel":"Foram alteradas algumas das opções. Tem a certeza que deseja fechar a janela?","options":"Opções","target":"Destino","targetNew":"Nova janela (_blank)","targetTop":"Janela superior (_top)","targetSelf":"Mesma janela (_self)","targetParent":"Janela dependente (_parent)","langDirLTR":"Esquerda para a Direita (EPD)","langDirRTL":"Direita para a Esquerda (DPE)","styles":"Estilo","cssClasses":"Classes de folhas de estilo","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Topo","alignMiddle":"Centro","alignBottom":"Base","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura deve ser um número.","invalidWidth":"A largura deve ser um número. ","invalidCssLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida HTML válida (px ou %).","invalidInlineStyle":"O valor especificado para o estilo em linha deve constituir um ou mais conjuntos de valores com o formato de \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para um valor em pontos ou um número com uma unidade CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"Fim","36":"Entrada","46":"Eliminar","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Direitos de Autor &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Doar $1 para ajudar.","moreInfo":"Para informação sobre licenciamento visite o nosso sítio web:","title":"Sobre o CKEditor","userGuide":"CKEditor - Guia do utilizador"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Rasurado","subscript":"Superior à linha","superscript":"Superior à linha","underline":"Sublinhado"},"bidi":{"ltr":"Direção do texto da esquerda para a direita","rtl":"Direção do texto da direita para a esquerda"},"blockquote":{"toolbar":"Bloco de citação"},"clipboard":{"copy":"Copiar","copyError":"A configuração de segurança do navegador não permite a execução automática de operações de copiar. Por favor use o teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"A configuração de segurança do navegador não permite a execução automática de operações de cortar. Por favor use o teclado (Ctrl/Cmd+X).","paste":"Colar","pasteArea":"Colar área","pasteMsg":"Por favor, cole dentro da seguinte caixa usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e carregue em <STRONG>OK</STRONG>.","securityMsg":"Devido ás definições de segurança do teu browser, o editor não pode aceder ao clipboard diretamente. É necessário que voltes a colar as informações nesta janela.","title":"Colar"},"button":{"selectedLabel":"%1 (Selecionado)"},"colorbutton":{"auto":"Automático","bgColorTitle":"Cor de fundo","colors":{"000":"Black","800000":"Castanho","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Azul naval","4B0082":"Indigo","696969":"Cinza escuro","B22222":"Vermelho tijolo","A52A2A":"Castanho","DAA520":"Dourado (daa520)","006400":"Verde escuro (006400)","40E0D0":"Turquesa","0000CD":"Azul médio (0000cd)","800080":"Purple","808080":"Cinza","F00":"Vermelho","FF8C00":"Laranja escuro","FFD700":"Dourado","008000":"Verde","0FF":"Ciano","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Cinza fosco","FFA07A":"Salmão claro","FFA500":"Laranja","FFFF00":"Amarelo","00FF00":"Limão (Verde espectro)","AFEEEE":"Turquesa pálida (afeeee)","ADD8E6":"Light Blue","DDA0DD":"Ameixa","D3D3D3":"Cinza claro","FFF0F5":"Lavanda avermelhada","FAEBD7":"Branco velho","FFFFE0":"Amarelo claro","F0FFF0":"Maná (f0fff0)","F0FFFF":"Azul celeste","F0F8FF":"Azul Alice (f0f8ff)","E6E6FA":"Lavanda","FFF":"Branco","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Mais cores...","panelTitle":"Cores","textColorTitle":"Cor do texto"},"colordialog":{"clear":"Limpar","highlight":"Realçar","options":"Opções de cor","selected":"Cor selecionada","title":"Selecionar cor"},"templates":{"button":"Temas","emptyListMsg":"(Sem temas definidos)","insertOption":"Substituir conteúdos atuais","options":"Opções do modelo","selectPromptMsg":"Por favor, selecione o modelo a abrir no editor","title":"Conteúdo dos modelos"},"contextmenu":{"options":"Menu de opções de contexto"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Título","cssClassInputLabel":"Classes de folhas de estilo","edit":"Editar Div","inlineStyleInputLabel":"Estilho em Linha","langDirLTRLabel":"Esquerda para a direita (EPD)","langDirLabel":"Orientação de idioma","langDirRTLLabel":"Direita para a Esquerda (DPE)","languageCodeInputLabel":"Codigo do Idioma","remove":"Remover Div","styleSelectLabel":"Estilo","title":"Criar Div","toolbar":"Criar Div"},"toolbar":{"toolbarCollapse":"Ocultar barra de ferramentas","toolbarExpand":"Expandir barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Área de transferência/Anular","editing":"Edição","forms":"Formulários","basicstyles":"Estilos básicos","paragraph":"Parágrafo","links":"Hiperligações","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Editor de barras de ferramentas"},"elementspath":{"eleLabel":"Caminho dos elementos","eleTitle":"Elemento %1"},"find":{"find":"Pesquisar","findOptions":"Opções de pesquisa","findWhat":"Texto a procurar:","matchCase":"Maiúsculas/Minúsculas","matchCyclic":"Match cyclic","matchWord":"Coincidir com toda a palavra","notFoundMsg":"O texto especificado não foi encontrado.","replace":"Substituir","replaceAll":"Substituir tudo","replaceSuccessMsg":"%1 ocurrências(s) substituídas.","replaceWith":"Substituir por:","title":"Pesquisar e substituir"},"fakeobjects":{"anchor":" Inserir/Editar âncora","flash":"Animação Flash","hiddenfield":"Campo oculto","iframe":"IFrame","unknown":"Objeto desconhecido"},"flash":{"access":"Acesso ao Script","accessAlways":"Sempre","accessNever":"Nunca","accessSameDomain":"Mesmo dominio","alignAbsBottom":"Abs inferior","alignAbsMiddle":"Abs centro","alignBaseline":"Linha de base","alignTextTop":"Topo do texto","bgcolor":"Cor de fundo","chkFull":"Permitir Ecrã inteiro","chkLoop":"Cíclico","chkMenu":"Permitir menu do Flash","chkPlay":"Reproduzir automaticamente","flashvars":"Variaveis para o Flash","hSpace":"Esp. Horiz","properties":"Propriedades do Flash","propertiesTab":"Propriedades","quality":"Qualidade","qualityAutoHigh":"Alta Automaticamente","qualityAutoLow":"Baixa Automaticamente","qualityBest":"Melhor","qualityHigh":"Alta","qualityLow":"Baixa","qualityMedium":"Média","scale":"Escala","scaleAll":"Mostrar tudo","scaleFit":"Tamanho exato","scaleNoBorder":"Sem bordas","title":"Propriedades do Flash","vSpace":"Esp.Vert","validateHSpace":"HSpace tem de ser um numero.","validateSrc":"O URL não pode ficar vazio","validateVSpace":"VSpace tem de ser um numero.","windowMode":"Modo de janela","windowModeOpaque":"Opaco","windowModeTransparent":"Transparente","windowModeWindow":"Janela"},"font":{"fontSize":{"label":"Tamanho","voiceLabel":"Tamanho da letra","panelTitle":"Tamanho da letra"},"label":"Fonte","panelTitle":"Nome do tipo de letra","voiceLabel":"Tipo de letra"},"forms":{"button":{"title":"Propriedades do botão","text":"Texto (valor)","type":"Tipo","typeBtn":"Botão","typeSbm":"Enviar","typeRst":"Repor"},"checkboxAndRadio":{"checkboxTitle":"Propriedades da caixa de verificação","radioTitle":"Propriedades do botão de rádio","value":"Valor","selected":"Selecionado","required":"Obrigatório"},"form":{"title":"Propriedades do formulário","menu":"Propriedades do formulário","action":"Ação","method":"Método","encoding":"Codificação"},"hidden":{"title":"Propriedades do campo oculto","name":"Nome","value":"Valor"},"select":{"title":"Propriedades da caixa de seleção","selectInfo":"Informação","opAvail":"Opções disponíveis","value":"Valor","size":"Tamanho","lines":"linhas","chkMulti":"Permitir seleções múltiplas","required":"Obrigatório","opText":"Texto","opValue":"Valor","btnAdd":"Adicionar","btnModify":"Modificar","btnUp":"Subir","btnDown":"Descer","btnSetValue":"Definir como valor selecionado","btnDelete":"Apagar"},"textarea":{"title":"Propriedades da área de texto","cols":"Colunas","rows":"Linhas"},"textfield":{"title":"Propriedades do campo de texto","name":"Nome","value":"Valor","charWidth":"Tamanho do caracter","maxChars":"Máximo de caracteres","required":"Obrigatório","type":"Tipo","typeText":"Texto","typePass":"Senha","typeEmail":"Email","typeSearch":"Pesquisar","typeTel":"Telefone","typeUrl":"URL"}},"format":{"label":"Formatar","panelTitle":"Formatar Parágrafo","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"horizontalrule":{"toolbar":"Inserir linha horizontal"},"iframe":{"border":"Mostrar a borda da Frame","noUrl":"Por favor, digite o URL da iframe","scrolling":"Ativar barras de rolamento","title":"Propriedades da IFrame","toolbar":"IFrame"},"image":{"alt":"Texto alternativo","border":"Limite","btnUpload":"Enviar para o servidor","button2Img":"Deseja transformar o botão com imagem selecionado em uma imagem?","hSpace":"Esp. Horiz","img2Button":"Deseja transformar a imagem selecionada em um botão com imagem?","infoTab":"Informação da imagem","linkTab":"Hiperligação","lockRatio":"Proporcional","menu":"Propriedades da Imagem","resetSize":"Tamanho original","title":"Propriedades da imagem","titleButton":"Propriedades do botão de imagem","upload":"Carregar","urlMissing":"O URL da fonte da imagem está em falta.","vSpace":"Esp. Vert","validateBorder":"A borda tem de ser um numero.","validateHSpace":"HSpace tem de ser um numero.","validateVSpace":"VSpace tem de ser um numero."},"indent":{"indent":"Aumentar avanço","outdent":"Diminuir avanço"},"smiley":{"options":"Opções de Emoticons","title":"Inserir um Emoticon","toolbar":"Emoticons"},"justify":{"block":"Justificado","center":"Alinhar ao centro","left":"Alinhar à esquerda","right":"Alinhar à direita"},"language":{"button":"Definir Idioma","remove":"Remover idioma"},"link":{"acccessKey":"Chave de acesso","advanced":"Avançado","advisoryContentType":"Tipo de conteúdo","advisoryTitle":"Título","anchor":{"toolbar":" Inserir/Editar âncora","menu":"Propriedades da âncora","title":"Propriedades da âncora","name":"Nome da âncora","errorName":"Por favor, introduza o nome da âncora","remove":"Remover âncora"},"anchorId":"Por ID do elemento","anchorName":"Por Nome de Referência","charset":"Fonte de caracteres vinculado","cssClasses":"Classes de Estilo","download":"Force Download","displayText":"Mostrar texto","emailAddress":"Endereço de email","emailBody":"Corpo da mensagem","emailSubject":"Título de mensagem","id":"ID","info":"Informação da hiperligação","langCode":"Código de idioma","langDir":"Orientação de idioma","langDirLTR":"Esquerda para a Direita (EPD)","langDirRTL":"Direita para a Esquerda (DPE)","menu":"Editar hiperligação","name":"Nome","noAnchors":"(Não existem âncoras no documento)","noEmail":"Por favor, escreva o endereço de email","noUrl":"Por favor, introduza o endereço URL","other":"<outro>","popupDependent":"Dependente (Netscape)","popupFeatures":"Características de janela flutuante","popupFullScreen":"Janela completa (IE)","popupLeft":"Posição esquerda","popupLocationBar":"Barra de localização","popupMenuBar":"Barra de menu","popupResizable":"Redimensionável","popupScrollBars":"Barras de deslocamento","popupStatusBar":"Barra de estado","popupToolbar":"Barra de ferramentas","popupTop":"Posição topo","rel":"Relação","selectAnchor":"Selecionar âncora","styles":"Estilo","tabIndex":"Índice de tabulação","target":"Alvo","targetFrame":"<frame>","targetFrameName":"Nome da janela de destino","targetPopup":"<janela de popup>","targetPopupName":"Nome da janela flutuante","title":"Hiperligação","toAnchor":"Ligar a âncora no texto","toEmail":"Email","toUrl":"URL","toolbar":"Hiperligação","type":"Tipo de hiperligação","unlink":"Eliminar hiperligação","upload":"Carregar"},"list":{"bulletedlist":"Marcas","numberedlist":"Numeração"},"liststyle":{"armenian":"Numeração armênia","bulletedTitle":"Propriedades da lista não numerada","circle":"Círculo","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Zero decimal à esquerda (01, 02, 03, etc.)","disc":"Disco","georgian":"Numeração georgiana (an, ban, gan, etc.)","lowerAlpha":"Minúsculas (a, b, c, d, e, etc.)","lowerGreek":"Grego em minúsculas (alpha, beta, gamma, etc.)","lowerRoman":"Romano em minúsculas (i, ii, iii, iv, v, etc.)","none":"Nenhum","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Quadrado","start":"Iniciar","type":"Tipo","upperAlpha":"Maiúsculas (A, B, C, D, E, etc.)","upperRoman":"Romanos em maiúscula (I, II, III, IV, V, etc.)","validateStartNumber":"A lista tem iniciar por um número inteiro"},"magicline":{"title":"Insira aqui o parágrafo"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"newpage":{"toolbar":"Nova página"},"pagebreak":{"alt":"Quebra de página","toolbar":"Inserir quebra de página"},"pastetext":{"button":"Colar como texto simples","title":"Colar como texto simples"},"pastefromword":{"confirmCleanup":"O texto que pretende colar parece ter sido copiado do Word. Deseja limpá-lo antes de colar?","error":"Não foi possivel limpar a informação colada decido a um erro interno.","title":"Colar do Word","toolbar":"Colar do Word"},"preview":{"preview":"Pré-visualizar"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Limpar formatação"},"save":{"toolbar":"Guardar"},"selectall":{"toolbar":"Selecionar tudo"},"showblocks":{"toolbar":"Exibir blocos"},"sourcearea":{"toolbar":"Fonte"},"specialchar":{"options":"Opções de caracteres especiais","title":"Selecione um caracter especial","toolbar":"Inserir carácter especial"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de Formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos de Linha","panelTitle3":"Estilos de Objeto"},"table":{"border":"Tamanho do contorno","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula antes","insertAfter":"Inserir célula depois","deleteCell":"Apagar células","merge":"Unir células","mergeRight":"Unir à direita","mergeDown":"Fundir abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Linhas na célula","colSpan":"Colunas na célula","wordWrap":"Moldar texto","hAlign":"Alinhamento horizontal","vAlign":"Alinhamento vertical","alignBaseline":"Base","bgColor":"Cor de fundo","borderColor":"Cor da margem","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula deve ser um número.","invalidHeight":"A altura da célula deve ser um número.","invalidRowSpan":"As filas da célula deve ter um número inteiro.","invalidColSpan":"As colunas da célula devem ter um número inteiro.","chooseColor":"Escolher"},"cellPad":"Espaço interior","cellSpace":"Espaçamento de célula","column":{"menu":"Coluna","insertBefore":"Inserir coluna antes","insertAfter":"Inserir coluna depois","deleteColumn":"Apagar colunas"},"columns":"Colunas","deleteTable":"Apagar tabela","headers":"Cabeçalhos","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da margem tem de ser um número.","invalidCellPadding":"A criação do espaço na célula deve ser um número positivo.","invalidCellSpacing":"O espaçamento da célula deve ser um número positivo.","invalidCols":"O número de colunas tem de ser um número maior que 0.","invalidHeight":"A altura da tabela tem de ser um número.","invalidRows":"O número de linhas tem de ser maior que 0.","invalidWidth":"A largura da tabela tem de ser um número.","menu":"Propriedades da tabela","row":{"menu":"Linha","insertBefore":"Inserir linha antes","insertAfter":"Inserir linha depois","deleteRow":"Apagar linhas"},"rows":"Linhas","summary":"Resumo","title":"Propriedades da tabela","toolbar":"Tabela","widthPc":"percentagem","widthPx":"pixéis","widthUnit":"unidade da largura"},"undo":{"redo":"Refazer","undo":"Anular"},"wsc":{"btnIgnore":"Ignorar","btnIgnoreAll":"Ignorar Tudo","btnReplace":"Substituir","btnReplaceAll":"Substituir Tudo","btnUndo":"Anular","changeTo":"Mudar para","errorLoading":"Error loading application service host: %s.","ieSpellDownload":" Verificação ortográfica não instalada. Quer descarregar agora?","manyChanges":"Verificação ortográfica completa: %1 palavras alteradas","noChanges":"Verificação ortográfica completa: não houve alteração de palavras","noMispell":"Verificação ortográfica completa: não foram encontrados erros","noSuggestions":"- Sem sugestões -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Não está num directório","oneChange":"Verificação ortográfica completa: uma palavra alterada","progress":"Verificação ortográfica em progresso…","title":"Spell Checker","toolbar":"Verificação Ortográfica"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/lang/ro.js
index 636d0e5249a..7afaa81b65d 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/ro.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ro.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ro']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Apasă ALT 0 pentru ajutor","browseServer":"Răsfoieşte server","url":"URL","protocol":"Protocol","upload":"Încarcă","uploadSubmit":"Trimite la server","image":"Imagine","flash":"Flash","form":"Formular (Form)","checkbox":"Bifă (Checkbox)","radio":"Buton radio (RadioButton)","textField":"Câmp text (TextField)","textarea":"Suprafaţă text (Textarea)","hiddenField":"Câmp ascuns (HiddenField)","button":"Buton","select":"Câmp selecţie (SelectionField)","imageButton":"Buton imagine (ImageButton)","notSet":"<nesetat>","id":"Id","name":"Nume","langDir":"Direcţia cuvintelor","langDirLtr":"stânga-dreapta (LTR)","langDirRtl":"dreapta-stânga (RTL)","langCode":"Codul limbii","longDescr":"Descrierea lungă URL","cssClass":"Clasele cu stilul paginii (CSS)","advisoryTitle":"Titlul consultativ","cssStyle":"Stil","ok":"OK","cancel":"Anulare","close":"Închide","preview":"Previzualizare","resize":"Trage pentru a redimensiona","generalTab":"General","advancedTab":"Avansat","validateNumberFailed":"Această valoare nu este un număr.","confirmNewPage":"Orice modificări nesalvate ale acestui conținut, vor fi pierdute. Sigur doriți încărcarea unei noi pagini?","confirmCancel":"Câteva opțiuni au fost schimbate. Sigur doriți să închideți dialogul?","options":"Opțiuni","target":"Țintă","targetNew":"Fereastră nouă (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"În aceeași fereastră (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Stânga spre Dreapta (LTR)","langDirRTL":"Dreapta spre Stânga (RTL)","styles":"Stil","cssClasses":"Stylesheet Classes","width":"Lăţime","height":"Înălţime","align":"Aliniere","alignLeft":"Mărește Bara","alignRight":"Dreapta","alignCenter":"Centru","alignJustify":"Aliniere în bloc (Block Justify)","alignTop":"Sus","alignMiddle":"Mijloc","alignBottom":"Jos","alignNone":"None","invalidValue":"Valoare invalidă","invalidHeight":"Înălțimea trebuie să fie un număr.","invalidWidth":"Lățimea trebuie să fie un număr.","invalidCssLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","invalidHtmlLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură HTML (px sau %).","invalidInlineStyle":"Valoarea specificată pentru stil trebuie să conțină una sau mai multe construcții de tipul \"name : value\", separate prin punct și virgulă.","cssLengthTooltip":"Introduceți un număr în pixeli sau un număr cu o unitate de măsură CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","unavailable":"%1<span class=\"cke_accessibility\">, nu este disponibil</span>"},"about":{"copy":"Copyright &copy; $1. Toate drepturile rezervate.","dlgTitle":"Despre CKEeditor","help":"Citește  $1 pentru ajutor.","moreInfo":"Pentru informații despre licență, vă rugăm vizitați web site-ul nostru:","title":"Despre CKEditor","userGuide":"CKEditor Ghid Utilizator"},"basicstyles":{"bold":"Îngroşat (bold)","italic":"Înclinat (italic)","strike":"Tăiat (strike through)","subscript":"Indice (subscript)","superscript":"Putere (superscript)","underline":"Subliniat (underline)"},"bidi":{"ltr":"Direcția textului de la stânga la dreapta","rtl":"Direcția textului de la dreapta la stânga"},"blockquote":{"toolbar":"Citat"},"clipboard":{"copy":"Copiază","copyError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de copiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+C).","cut":"Taie","cutError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de tăiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+X).","paste":"Adaugă","pasteArea":"Suprafața de adăugare","pasteMsg":"Vă rugăm adăugaţi în căsuţa următoare folosind tastatura (<strong>Ctrl/Cmd+V</strong>) şi apăsaţi OK","securityMsg":"Din cauza setărilor de securitate ale programului dvs. cu care navigaţi pe internet (browser), editorul nu poate accesa direct datele din clipboard. Va trebui să adăugaţi din nou datele în această fereastră.","title":"Adaugă"},"button":{"selectedLabel":"%1 (Selectat)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Coloarea fundalului","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"Mai multe culori...","panelTitle":"Colors","textColorTitle":"Culoarea textului"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Template-uri (şabloane)","emptyListMsg":"(Niciun template (şablon) definit)","insertOption":"Înlocuieşte cuprinsul actual","options":"Opțiuni șabloane","selectPromptMsg":"Vă rugăm selectaţi template-ul (şablonul) ce se va deschide în editor<br>(conţinutul actual va fi pierdut):","title":"Template-uri (şabloane) de conţinut"},"contextmenu":{"options":"Opțiuni Meniu Contextual"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Titlul consultativ","cssClassInputLabel":"Clasele cu stilul paginii (CSS)","edit":"Modifică Div-ul","inlineStyleInputLabel":"Stil Inline","langDirLTRLabel":"stânga-dreapta (LTR)","langDirLabel":"Direcţia cuvintelor","langDirRTLLabel":"dreapta-stânga (RTL)","languageCodeInputLabel":"Codul limbii","remove":"Șterge Div-ul","styleSelectLabel":"Stil","title":"Crează un container Div","toolbar":"Crează un container Div"},"toolbar":{"toolbarCollapse":"Micșorează Bara","toolbarExpand":"Mărește Bara","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editează bara de unelte"},"elementspath":{"eleLabel":"Calea elementelor","eleTitle":"%1 element"},"find":{"find":"Găseşte","findOptions":"Find Options","findWhat":"Găseşte:","matchCase":"Deosebeşte majuscule de minuscule (Match case)","matchCyclic":"Potrivește ciclic","matchWord":"Doar cuvintele întregi","notFoundMsg":"Textul specificat nu a fost găsit.","replace":"Înlocuieşte","replaceAll":"Înlocuieşte tot","replaceSuccessMsg":"%1 căutări înlocuite.","replaceWith":"Înlocuieşte cu:","title":"Găseşte şi înlocuieşte"},"fakeobjects":{"anchor":"Inserează/Editează ancoră","flash":"Flash Animation","hiddenfield":"Câmp ascuns (HiddenField)","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Acces script","accessAlways":"Întotdeauna","accessNever":"Niciodată","accessSameDomain":"Același domeniu","alignAbsBottom":"Jos absolut (Abs Bottom)","alignAbsMiddle":"Mijloc absolut (Abs Middle)","alignBaseline":"Linia de jos (Baseline)","alignTextTop":"Text sus","bgcolor":"Coloarea fundalului","chkFull":"Permite pe tot ecranul","chkLoop":"Repetă (Loop)","chkMenu":"Activează meniul flash","chkPlay":"Rulează automat","flashvars":"Variabile pentru flash","hSpace":"HSpace","properties":"Proprietăţile flashului","propertiesTab":"Proprietăți","quality":"Calitate","qualityAutoHigh":"Auto înaltă","qualityAutoLow":"Auto Joasă","qualityBest":"Cea mai bună","qualityHigh":"Înaltă","qualityLow":"Joasă","qualityMedium":"Medie","scale":"Scală","scaleAll":"Arată tot","scaleFit":"Potriveşte","scaleNoBorder":"Fără bordură (No border)","title":"Proprietăţile flashului","vSpace":"VSpace","validateHSpace":"Hspace trebuie să fie un număr.","validateSrc":"Vă rugăm să scrieţi URL-ul","validateVSpace":"VSpace trebuie să fie un număr","windowMode":"Mod fereastră","windowModeOpaque":"Opacă","windowModeTransparent":"Transparentă","windowModeWindow":"Fereastră"},"font":{"fontSize":{"label":"Mărime","voiceLabel":"Font Size","panelTitle":"Mărime"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"forms":{"button":{"title":"Proprietăţi buton","text":"Text (Valoare)","type":"Tip","typeBtn":"Buton","typeSbm":"Trimite","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Proprietăţi bifă (Checkbox)","radioTitle":"Proprietăţi buton radio (Radio Button)","value":"Valoare","selected":"Selectat","required":"Required"},"form":{"title":"Proprietăţi formular (Form)","menu":"Proprietăţi formular (Form)","action":"Acţiune","method":"Metodă","encoding":"Encodare"},"hidden":{"title":"Proprietăţi câmp ascuns (Hidden Field)","name":"Nume","value":"Valoare"},"select":{"title":"Proprietăţi câmp selecţie (Selection Field)","selectInfo":"Informaţii","opAvail":"Opţiuni disponibile","value":"Valoare","size":"Mărime","lines":"linii","chkMulti":"Permite selecţii multiple","required":"Required","opText":"Text","opValue":"Valoare","btnAdd":"Adaugă","btnModify":"Modifică","btnUp":"Sus","btnDown":"Jos","btnSetValue":"Setează ca valoare selectată","btnDelete":"Şterge"},"textarea":{"title":"Proprietăţi suprafaţă text (Textarea)","cols":"Coloane","rows":"Linii"},"textfield":{"title":"Proprietăţi câmp text (Text Field)","name":"Nume","value":"Valoare","charWidth":"Lărgimea caracterului","maxChars":"Caractere maxime","required":"Required","type":"Tip","typeText":"Text","typePass":"Parolă","typeEmail":"Email","typeSearch":"Cauta","typeTel":"Numar de telefon","typeUrl":"URL"}},"format":{"label":"Formatare","panelTitle":"Formatare","tag_address":"Adresă","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatat"},"horizontalrule":{"toolbar":"Inserează linie orizontală"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Text alternativ","border":"Margine","btnUpload":"Trimite la server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Informaţii despre imagine","linkTab":"Link (Legătură web)","lockRatio":"Păstrează proporţiile","menu":"Proprietăţile imaginii","resetSize":"Resetează mărimea","title":"Proprietăţile imaginii","titleButton":"Proprietăţi buton imagine (Image Button)","upload":"Încarcă","urlMissing":"Sursa URL a imaginii lipsește.","vSpace":"VSpace","validateBorder":"Bordura trebuie să fie un număr întreg.","validateHSpace":"Hspace trebuie să fie un număr întreg.","validateVSpace":"Vspace trebuie să fie un număr întreg."},"indent":{"indent":"Creşte indentarea","outdent":"Scade indentarea"},"smiley":{"options":"Opțiuni figuri expresive","title":"Inserează o figură expresivă (Emoticon)","toolbar":"Figură expresivă (Emoticon)"},"justify":{"block":"Aliniere în bloc (Block Justify)","center":"Aliniere centrală","left":"Aliniere la stânga","right":"Aliniere la dreapta"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Tasta de acces","advanced":"Avansat","advisoryContentType":"Tipul consultativ al titlului","advisoryTitle":"Titlul consultativ","anchor":{"toolbar":"Inserează/Editează ancoră","menu":"Proprietăţi ancoră","title":"Proprietăţi ancoră","name":"Numele ancorei","errorName":"Vă rugăm scrieţi numele ancorei","remove":"Elimină ancora"},"anchorId":"după Id-ul elementului","anchorName":"după numele ancorei","charset":"Setul de caractere al resursei legate","cssClasses":"Clasele cu stilul paginii (CSS)","emailAddress":"Adresă de e-mail","emailBody":"Opțiuni Meniu Contextual","emailSubject":"Subiectul mesajului","id":"Id","info":"Informaţii despre link (Legătură web)","langCode":"Direcţia cuvintelor","langDir":"Direcţia cuvintelor","langDirLTR":"stânga-dreapta (LTR)","langDirRTL":"dreapta-stânga (RTL)","menu":"Editează Link","name":"Nume","noAnchors":"(Nicio ancoră disponibilă în document)","noEmail":"Vă rugăm să scrieţi adresa de e-mail","noUrl":"Vă rugăm să scrieţi URL-ul","other":"<alt>","popupDependent":"Dependent (Netscape)","popupFeatures":"Proprietăţile ferestrei popup","popupFullScreen":"Tot ecranul (Full Screen)(IE)","popupLeft":"Poziţia la stânga","popupLocationBar":"Bara de locaţie","popupMenuBar":"Bara de meniu","popupResizable":"Redimensionabil","popupScrollBars":"Bare de derulare","popupStatusBar":"Bara de status","popupToolbar":"Bara de opţiuni","popupTop":"Poziţia la dreapta","rel":"Relație","selectAnchor":"Selectaţi o ancoră","styles":"Stil","tabIndex":"Indexul tabului","target":"Ţintă (Target)","targetFrame":"<frame>","targetFrameName":"Numele frameului ţintă","targetPopup":"<fereastra popup>","targetPopupName":"Numele ferestrei popup","title":"Link (Legătură web)","toAnchor":"Ancoră în această pagină","toEmail":"E-Mail","toUrl":"URL","toolbar":"Inserează/Editează link (legătură web)","type":"Tipul link-ului (al legăturii web)","unlink":"Înlătură link (legătură web)","upload":"Încarcă"},"list":{"bulletedlist":"Inserează / Elimină Listă cu puncte","numberedlist":"Inserează / Elimină Listă numerotată"},"liststyle":{"armenian":"Numerotare armeniană","bulletedTitle":"Proprietățile listei cu simboluri","circle":"Cerc","decimal":"Decimale (1, 2, 3, etc.)","decimalLeadingZero":"Decimale cu zero în față (01, 02, 03, etc.)","disc":"Disc","georgian":"Numerotare georgiană (an, ban, gan, etc.)","lowerAlpha":"Litere mici (a, b, c, d, e, etc.)","lowerGreek":"Litere grecești mici (alpha, beta, gamma, etc.)","lowerRoman":"Cifre romane mici (i, ii, iii, iv, v, etc.)","none":"Nimic","notset":"<nesetat>","numberedTitle":"Proprietățile listei numerotate","square":"Pătrat","start":"Start","type":"Tip","upperAlpha":"Litere mari (A, B, C, D, E, etc.)","upperRoman":"Cifre romane mari (I, II, III, IV, V, etc.)","validateStartNumber":"Începutul listei trebuie să fie un număr întreg."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Mărește","minimize":"Micșorează"},"newpage":{"toolbar":"Pagină nouă"},"pagebreak":{"alt":"Page Break","toolbar":"Inserează separator de pagină (Page Break)"},"pastetext":{"button":"Adaugă ca text simplu (Plain Text)","title":"Adaugă ca text simplu (Plain Text)"},"pastefromword":{"confirmCleanup":"Textul pe care doriți să-l lipiți este din Word. Doriți curățarea textului înante de a-l adăuga?","error":"Nu a fost posibilă curățarea datelor adăugate datorită unei erori interne","title":"Adaugă din Word","toolbar":"Adaugă din Word"},"preview":{"preview":"Previzualizare"},"print":{"toolbar":"Printează"},"removeformat":{"toolbar":"Înlătură formatarea"},"save":{"toolbar":"Salvează"},"selectall":{"toolbar":"Selectează tot"},"showblocks":{"toolbar":"Arată blocurile"},"sourcearea":{"toolbar":"Sursa"},"specialchar":{"options":"Opțiuni caractere speciale","title":"Selectează caracter special","toolbar":"Inserează caracter special"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stil","panelTitle":"Formatarea stilurilor","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Mărimea marginii","caption":"Titlu (Caption)","cell":{"menu":"Celulă","insertBefore":"Inserează celulă înainte","insertAfter":"Inserează celulă după","deleteCell":"Şterge celule","merge":"Uneşte celule","mergeRight":"Uneşte la dreapta","mergeDown":"Uneşte jos","splitHorizontal":"Împarte celula pe orizontală","splitVertical":"Împarte celula pe verticală","title":"Proprietăți celulă","cellType":"Tipul celulei","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Aliniament orizontal","vAlign":"Aliniament vertical","alignBaseline":"Baseline","bgColor":"Culoare fundal","borderColor":"Culoare bordură","data":"Data","header":"Antet","yes":"Da","no":"Nu","invalidWidth":"Lățimea celulei trebuie să fie un număr.","invalidHeight":"Înălțimea celulei trebuie să fie un număr.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Alege"},"cellPad":"Spaţiu în cadrul celulei","cellSpace":"Spaţiu între celule","column":{"menu":"Coloană","insertBefore":"Inserează coloană înainte","insertAfter":"Inserează coloană după","deleteColumn":"Şterge celule"},"columns":"Coloane","deleteTable":"Şterge tabel","headers":"Antente","headersBoth":"Ambele","headersColumn":"Prima coloană","headersNone":"Nimic","headersRow":"Primul rând","invalidBorder":"Dimensiunea bordurii trebuie să aibe un număr.","invalidCellPadding":"Spațierea celulei trebuie sa fie un număr pozitiv","invalidCellSpacing":"Spațierea celului trebuie să fie un număr pozitiv.","invalidCols":"Numărul coloanelor trebuie să fie mai mare decât 0.","invalidHeight":"Inaltimea celulei trebuie sa fie un numar.","invalidRows":"Numărul rândurilor trebuie să fie mai mare decât 0.","invalidWidth":"Lățimea tabelului trebuie să fie un număr.","menu":"Proprietăţile tabelului","row":{"menu":"Rând","insertBefore":"Inserează rând înainte","insertAfter":"Inserează rând după","deleteRow":"Şterge rânduri"},"rows":"Rânduri","summary":"Rezumat","title":"Proprietăţile tabelului","toolbar":"Tabel","widthPc":"procente","widthPx":"pixeli","widthUnit":"unitate lățime"},"undo":{"redo":"Starea ulterioară (redo)","undo":"Starea anterioară (undo)"},"wsc":{"btnIgnore":"Ignoră","btnIgnoreAll":"Ignoră toate","btnReplace":"Înlocuieşte","btnReplaceAll":"Înlocuieşte tot","btnUndo":"Starea anterioară (undo)","changeTo":"Schimbă în","errorLoading":"Eroare în lansarea aplicației service host %s.","ieSpellDownload":"Unealta pentru verificat textul (Spell checker) neinstalată. Doriţi să o descărcaţi acum?","manyChanges":"Verificarea textului terminată: 1% cuvinte modificate","noChanges":"Verificarea textului terminată: Niciun cuvânt modificat","noMispell":"Verificarea textului terminată: Nicio greşeală găsită","noSuggestions":"- Fără sugestii -","notAvailable":"Scuzați, dar serviciul nu este disponibil momentan.","notInDic":"Nu e în dicţionar","oneChange":"Verificarea textului terminată: Un cuvânt modificat","progress":"Verificarea textului în desfăşurare...","title":"Spell Checker","toolbar":"Verifică scrierea textului"}};
\ No newline at end of file
+CKEDITOR.lang['ro']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Apasă ALT 0 pentru ajutor","browseServer":"Răsfoieşte server","url":"URL","protocol":"Protocol","upload":"Încarcă","uploadSubmit":"Trimite la server","image":"Imagine","flash":"Flash","form":"Formular (Form)","checkbox":"Bifă (Checkbox)","radio":"Buton radio (RadioButton)","textField":"Câmp text (TextField)","textarea":"Suprafaţă text (Textarea)","hiddenField":"Câmp ascuns (HiddenField)","button":"Buton","select":"Câmp selecţie (SelectionField)","imageButton":"Buton imagine (ImageButton)","notSet":"<nesetat>","id":"Id","name":"Nume","langDir":"Direcţia cuvintelor","langDirLtr":"stânga-dreapta (LTR)","langDirRtl":"dreapta-stânga (RTL)","langCode":"Codul limbii","longDescr":"Descrierea lungă URL","cssClass":"Clasele cu stilul paginii (CSS)","advisoryTitle":"Titlul consultativ","cssStyle":"Stil","ok":"OK","cancel":"Anulare","close":"Închide","preview":"Previzualizare","resize":"Trage pentru a redimensiona","generalTab":"General","advancedTab":"Avansat","validateNumberFailed":"Această valoare nu este un număr.","confirmNewPage":"Orice modificări nesalvate ale acestui conținut, vor fi pierdute. Sigur doriți încărcarea unei noi pagini?","confirmCancel":"Câteva opțiuni au fost schimbate. Sigur doriți să închideți dialogul?","options":"Opțiuni","target":"Țintă","targetNew":"Fereastră nouă (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"În aceeași fereastră (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Stânga spre Dreapta (LTR)","langDirRTL":"Dreapta spre Stânga (RTL)","styles":"Stil","cssClasses":"Stylesheet Classes","width":"Lăţime","height":"Înălţime","align":"Aliniere","alignLeft":"Mărește Bara","alignRight":"Dreapta","alignCenter":"Centru","alignJustify":"Aliniere în bloc (Block Justify)","alignTop":"Sus","alignMiddle":"Mijloc","alignBottom":"Jos","alignNone":"None","invalidValue":"Valoare invalidă","invalidHeight":"Înălțimea trebuie să fie un număr.","invalidWidth":"Lățimea trebuie să fie un număr.","invalidCssLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","invalidHtmlLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură HTML (px sau %).","invalidInlineStyle":"Valoarea specificată pentru stil trebuie să conțină una sau mai multe construcții de tipul \"name : value\", separate prin punct și virgulă.","cssLengthTooltip":"Introduceți un număr în pixeli sau un număr cu o unitate de măsură CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","unavailable":"%1<span class=\"cke_accessibility\">, nu este disponibil</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Toate drepturile rezervate.","dlgTitle":"Despre CKEeditor","help":"Citește  $1 pentru ajutor.","moreInfo":"Pentru informații despre licență, vă rugăm vizitați web site-ul nostru:","title":"Despre CKEditor","userGuide":"CKEditor Ghid Utilizator"},"basicstyles":{"bold":"Îngroşat (bold)","italic":"Înclinat (italic)","strike":"Tăiat (strike through)","subscript":"Indice (subscript)","superscript":"Putere (superscript)","underline":"Subliniat (underline)"},"bidi":{"ltr":"Direcția textului de la stânga la dreapta","rtl":"Direcția textului de la dreapta la stânga"},"blockquote":{"toolbar":"Citat"},"clipboard":{"copy":"Copiază","copyError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de copiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+C).","cut":"Taie","cutError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de tăiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+X).","paste":"Adaugă","pasteArea":"Suprafața de adăugare","pasteMsg":"Vă rugăm adăugaţi în căsuţa următoare folosind tastatura (<strong>Ctrl/Cmd+V</strong>) şi apăsaţi OK","securityMsg":"Din cauza setărilor de securitate ale programului dvs. cu care navigaţi pe internet (browser), editorul nu poate accesa direct datele din clipboard. Va trebui să adăugaţi din nou datele în această fereastră.","title":"Adaugă"},"button":{"selectedLabel":"%1 (Selectat)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Coloarea fundalului","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Mai multe culori...","panelTitle":"Colors","textColorTitle":"Culoarea textului"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Template-uri (şabloane)","emptyListMsg":"(Niciun template (şablon) definit)","insertOption":"Înlocuieşte cuprinsul actual","options":"Opțiuni șabloane","selectPromptMsg":"Vă rugăm selectaţi template-ul (şablonul) ce se va deschide în editor<br>(conţinutul actual va fi pierdut):","title":"Template-uri (şabloane) de conţinut"},"contextmenu":{"options":"Opțiuni Meniu Contextual"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Titlul consultativ","cssClassInputLabel":"Clasele cu stilul paginii (CSS)","edit":"Modifică Div-ul","inlineStyleInputLabel":"Stil Inline","langDirLTRLabel":"stânga-dreapta (LTR)","langDirLabel":"Direcţia cuvintelor","langDirRTLLabel":"dreapta-stânga (RTL)","languageCodeInputLabel":"Codul limbii","remove":"Șterge Div-ul","styleSelectLabel":"Stil","title":"Crează un container Div","toolbar":"Crează un container Div"},"toolbar":{"toolbarCollapse":"Micșorează Bara","toolbarExpand":"Mărește Bara","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editează bara de unelte"},"elementspath":{"eleLabel":"Calea elementelor","eleTitle":"%1 element"},"find":{"find":"Găseşte","findOptions":"Find Options","findWhat":"Găseşte:","matchCase":"Deosebeşte majuscule de minuscule (Match case)","matchCyclic":"Potrivește ciclic","matchWord":"Doar cuvintele întregi","notFoundMsg":"Textul specificat nu a fost găsit.","replace":"Înlocuieşte","replaceAll":"Înlocuieşte tot","replaceSuccessMsg":"%1 căutări înlocuite.","replaceWith":"Înlocuieşte cu:","title":"Găseşte şi înlocuieşte"},"fakeobjects":{"anchor":"Inserează/Editează ancoră","flash":"Flash Animation","hiddenfield":"Câmp ascuns (HiddenField)","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Acces script","accessAlways":"Întotdeauna","accessNever":"Niciodată","accessSameDomain":"Același domeniu","alignAbsBottom":"Jos absolut (Abs Bottom)","alignAbsMiddle":"Mijloc absolut (Abs Middle)","alignBaseline":"Linia de jos (Baseline)","alignTextTop":"Text sus","bgcolor":"Coloarea fundalului","chkFull":"Permite pe tot ecranul","chkLoop":"Repetă (Loop)","chkMenu":"Activează meniul flash","chkPlay":"Rulează automat","flashvars":"Variabile pentru flash","hSpace":"HSpace","properties":"Proprietăţile flashului","propertiesTab":"Proprietăți","quality":"Calitate","qualityAutoHigh":"Auto înaltă","qualityAutoLow":"Auto Joasă","qualityBest":"Cea mai bună","qualityHigh":"Înaltă","qualityLow":"Joasă","qualityMedium":"Medie","scale":"Scală","scaleAll":"Arată tot","scaleFit":"Potriveşte","scaleNoBorder":"Fără bordură (No border)","title":"Proprietăţile flashului","vSpace":"VSpace","validateHSpace":"Hspace trebuie să fie un număr.","validateSrc":"Vă rugăm să scrieţi URL-ul","validateVSpace":"VSpace trebuie să fie un număr","windowMode":"Mod fereastră","windowModeOpaque":"Opacă","windowModeTransparent":"Transparentă","windowModeWindow":"Fereastră"},"font":{"fontSize":{"label":"Mărime","voiceLabel":"Font Size","panelTitle":"Mărime"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"forms":{"button":{"title":"Proprietăţi buton","text":"Text (Valoare)","type":"Tip","typeBtn":"Buton","typeSbm":"Trimite","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Proprietăţi bifă (Checkbox)","radioTitle":"Proprietăţi buton radio (Radio Button)","value":"Valoare","selected":"Selectat","required":"Required"},"form":{"title":"Proprietăţi formular (Form)","menu":"Proprietăţi formular (Form)","action":"Acţiune","method":"Metodă","encoding":"Encodare"},"hidden":{"title":"Proprietăţi câmp ascuns (Hidden Field)","name":"Nume","value":"Valoare"},"select":{"title":"Proprietăţi câmp selecţie (Selection Field)","selectInfo":"Informaţii","opAvail":"Opţiuni disponibile","value":"Valoare","size":"Mărime","lines":"linii","chkMulti":"Permite selecţii multiple","required":"Required","opText":"Text","opValue":"Valoare","btnAdd":"Adaugă","btnModify":"Modifică","btnUp":"Sus","btnDown":"Jos","btnSetValue":"Setează ca valoare selectată","btnDelete":"Şterge"},"textarea":{"title":"Proprietăţi suprafaţă text (Textarea)","cols":"Coloane","rows":"Linii"},"textfield":{"title":"Proprietăţi câmp text (Text Field)","name":"Nume","value":"Valoare","charWidth":"Lărgimea caracterului","maxChars":"Caractere maxime","required":"Required","type":"Tip","typeText":"Text","typePass":"Parolă","typeEmail":"Email","typeSearch":"Cauta","typeTel":"Numar de telefon","typeUrl":"URL"}},"format":{"label":"Formatare","panelTitle":"Formatare","tag_address":"Adresă","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatat"},"horizontalrule":{"toolbar":"Inserează linie orizontală"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Text alternativ","border":"Margine","btnUpload":"Trimite la server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Informaţii despre imagine","linkTab":"Link (Legătură web)","lockRatio":"Păstrează proporţiile","menu":"Proprietăţile imaginii","resetSize":"Resetează mărimea","title":"Proprietăţile imaginii","titleButton":"Proprietăţi buton imagine (Image Button)","upload":"Încarcă","urlMissing":"Sursa URL a imaginii lipsește.","vSpace":"VSpace","validateBorder":"Bordura trebuie să fie un număr întreg.","validateHSpace":"Hspace trebuie să fie un număr întreg.","validateVSpace":"Vspace trebuie să fie un număr întreg."},"indent":{"indent":"Creşte indentarea","outdent":"Scade indentarea"},"smiley":{"options":"Opțiuni figuri expresive","title":"Inserează o figură expresivă (Emoticon)","toolbar":"Figură expresivă (Emoticon)"},"justify":{"block":"Aliniere în bloc (Block Justify)","center":"Aliniere centrală","left":"Aliniere la stânga","right":"Aliniere la dreapta"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Tasta de acces","advanced":"Avansat","advisoryContentType":"Tipul consultativ al titlului","advisoryTitle":"Titlul consultativ","anchor":{"toolbar":"Inserează/Editează ancoră","menu":"Proprietăţi ancoră","title":"Proprietăţi ancoră","name":"Numele ancorei","errorName":"Vă rugăm scrieţi numele ancorei","remove":"Elimină ancora"},"anchorId":"după Id-ul elementului","anchorName":"după numele ancorei","charset":"Setul de caractere al resursei legate","cssClasses":"Clasele cu stilul paginii (CSS)","download":"Force Download","displayText":"Display Text","emailAddress":"Adresă de e-mail","emailBody":"Opțiuni Meniu Contextual","emailSubject":"Subiectul mesajului","id":"Id","info":"Informaţii despre link (Legătură web)","langCode":"Direcţia cuvintelor","langDir":"Direcţia cuvintelor","langDirLTR":"stânga-dreapta (LTR)","langDirRTL":"dreapta-stânga (RTL)","menu":"Editează Link","name":"Nume","noAnchors":"(Nicio ancoră disponibilă în document)","noEmail":"Vă rugăm să scrieţi adresa de e-mail","noUrl":"Vă rugăm să scrieţi URL-ul","other":"<alt>","popupDependent":"Dependent (Netscape)","popupFeatures":"Proprietăţile ferestrei popup","popupFullScreen":"Tot ecranul (Full Screen)(IE)","popupLeft":"Poziţia la stânga","popupLocationBar":"Bara de locaţie","popupMenuBar":"Bara de meniu","popupResizable":"Redimensionabil","popupScrollBars":"Bare de derulare","popupStatusBar":"Bara de status","popupToolbar":"Bara de opţiuni","popupTop":"Poziţia la dreapta","rel":"Relație","selectAnchor":"Selectaţi o ancoră","styles":"Stil","tabIndex":"Indexul tabului","target":"Ţintă (Target)","targetFrame":"<frame>","targetFrameName":"Numele frameului ţintă","targetPopup":"<fereastra popup>","targetPopupName":"Numele ferestrei popup","title":"Link (Legătură web)","toAnchor":"Ancoră în această pagină","toEmail":"E-Mail","toUrl":"URL","toolbar":"Inserează/Editează link (legătură web)","type":"Tipul link-ului (al legăturii web)","unlink":"Înlătură link (legătură web)","upload":"Încarcă"},"list":{"bulletedlist":"Inserează / Elimină Listă cu puncte","numberedlist":"Inserează / Elimină Listă numerotată"},"liststyle":{"armenian":"Numerotare armeniană","bulletedTitle":"Proprietățile listei cu simboluri","circle":"Cerc","decimal":"Decimale (1, 2, 3, etc.)","decimalLeadingZero":"Decimale cu zero în față (01, 02, 03, etc.)","disc":"Disc","georgian":"Numerotare georgiană (an, ban, gan, etc.)","lowerAlpha":"Litere mici (a, b, c, d, e, etc.)","lowerGreek":"Litere grecești mici (alpha, beta, gamma, etc.)","lowerRoman":"Cifre romane mici (i, ii, iii, iv, v, etc.)","none":"Nimic","notset":"<nesetat>","numberedTitle":"Proprietățile listei numerotate","square":"Pătrat","start":"Start","type":"Tip","upperAlpha":"Litere mari (A, B, C, D, E, etc.)","upperRoman":"Cifre romane mari (I, II, III, IV, V, etc.)","validateStartNumber":"Începutul listei trebuie să fie un număr întreg."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Mărește","minimize":"Micșorează"},"newpage":{"toolbar":"Pagină nouă"},"pagebreak":{"alt":"Page Break","toolbar":"Inserează separator de pagină (Page Break)"},"pastetext":{"button":"Adaugă ca text simplu (Plain Text)","title":"Adaugă ca text simplu (Plain Text)"},"pastefromword":{"confirmCleanup":"Textul pe care doriți să-l lipiți este din Word. Doriți curățarea textului înante de a-l adăuga?","error":"Nu a fost posibilă curățarea datelor adăugate datorită unei erori interne","title":"Adaugă din Word","toolbar":"Adaugă din Word"},"preview":{"preview":"Previzualizare"},"print":{"toolbar":"Printează"},"removeformat":{"toolbar":"Înlătură formatarea"},"save":{"toolbar":"Salvează"},"selectall":{"toolbar":"Selectează tot"},"showblocks":{"toolbar":"Arată blocurile"},"sourcearea":{"toolbar":"Sursa"},"specialchar":{"options":"Opțiuni caractere speciale","title":"Selectează caracter special","toolbar":"Inserează caracter special"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stil","panelTitle":"Formatarea stilurilor","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Mărimea marginii","caption":"Titlu (Caption)","cell":{"menu":"Celulă","insertBefore":"Inserează celulă înainte","insertAfter":"Inserează celulă după","deleteCell":"Şterge celule","merge":"Uneşte celule","mergeRight":"Uneşte la dreapta","mergeDown":"Uneşte jos","splitHorizontal":"Împarte celula pe orizontală","splitVertical":"Împarte celula pe verticală","title":"Proprietăți celulă","cellType":"Tipul celulei","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Aliniament orizontal","vAlign":"Aliniament vertical","alignBaseline":"Baseline","bgColor":"Culoare fundal","borderColor":"Culoare bordură","data":"Data","header":"Antet","yes":"Da","no":"Nu","invalidWidth":"Lățimea celulei trebuie să fie un număr.","invalidHeight":"Înălțimea celulei trebuie să fie un număr.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Alege"},"cellPad":"Spaţiu în cadrul celulei","cellSpace":"Spaţiu între celule","column":{"menu":"Coloană","insertBefore":"Inserează coloană înainte","insertAfter":"Inserează coloană după","deleteColumn":"Şterge celule"},"columns":"Coloane","deleteTable":"Şterge tabel","headers":"Antente","headersBoth":"Ambele","headersColumn":"Prima coloană","headersNone":"Nimic","headersRow":"Primul rând","invalidBorder":"Dimensiunea bordurii trebuie să aibe un număr.","invalidCellPadding":"Spațierea celulei trebuie sa fie un număr pozitiv","invalidCellSpacing":"Spațierea celului trebuie să fie un număr pozitiv.","invalidCols":"Numărul coloanelor trebuie să fie mai mare decât 0.","invalidHeight":"Inaltimea celulei trebuie sa fie un numar.","invalidRows":"Numărul rândurilor trebuie să fie mai mare decât 0.","invalidWidth":"Lățimea tabelului trebuie să fie un număr.","menu":"Proprietăţile tabelului","row":{"menu":"Rând","insertBefore":"Inserează rând înainte","insertAfter":"Inserează rând după","deleteRow":"Şterge rânduri"},"rows":"Rânduri","summary":"Rezumat","title":"Proprietăţile tabelului","toolbar":"Tabel","widthPc":"procente","widthPx":"pixeli","widthUnit":"unitate lățime"},"undo":{"redo":"Starea ulterioară (redo)","undo":"Starea anterioară (undo)"},"wsc":{"btnIgnore":"Ignoră","btnIgnoreAll":"Ignoră toate","btnReplace":"Înlocuieşte","btnReplaceAll":"Înlocuieşte tot","btnUndo":"Starea anterioară (undo)","changeTo":"Schimbă în","errorLoading":"Eroare în lansarea aplicației service host %s.","ieSpellDownload":"Unealta pentru verificat textul (Spell checker) neinstalată. Doriţi să o descărcaţi acum?","manyChanges":"Verificarea textului terminată: 1% cuvinte modificate","noChanges":"Verificarea textului terminată: Niciun cuvânt modificat","noMispell":"Verificarea textului terminată: Nicio greşeală găsită","noSuggestions":"- Fără sugestii -","notAvailable":"Scuzați, dar serviciul nu este disponibil momentan.","notInDic":"Nu e în dicţionar","oneChange":"Verificarea textului terminată: Un cuvânt modificat","progress":"Verificarea textului în desfăşurare...","title":"Spell Checker","toolbar":"Verifică scrierea textului"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/lang/ru.js
index 3a42bd3a9bc..8c67124293c 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/ru.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ru.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ru']={"editor":"Визуальный текстовый редактор","editorPanel":"Визуальный редактор текста","common":{"editorHelp":"Нажмите ALT-0 для открытия справки","browseServer":"Выбор на сервере","url":"Ссылка","protocol":"Протокол","upload":"Загрузка файла","uploadSubmit":"Загрузить на сервер","image":"Изображение","flash":"Flash","form":"Форма","checkbox":"Чекбокс","radio":"Радиокнопка","textField":"Текстовое поле","textarea":"Многострочное текстовое поле","hiddenField":"Скрытое поле","button":"Кнопка","select":"Выпадающий список","imageButton":"Кнопка-изображение","notSet":"<не указано>","id":"Идентификатор","name":"Имя","langDir":"Направление текста","langDirLtr":"Слева направо (LTR)","langDirRtl":"Справа налево (RTL)","langCode":"Код языка","longDescr":"Длинное описание ссылки","cssClass":"Класс CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль","ok":"ОК","cancel":"Отмена","close":"Закрыть","preview":"Предпросмотр","resize":"Перетащите для изменения размера","generalTab":"Основное","advancedTab":"Дополнительно","validateNumberFailed":"Это значение не является числом.","confirmNewPage":"Несохранённые изменения будут потеряны! Вы действительно желаете перейти на другую страницу?","confirmCancel":"Некоторые параметры были изменены. Вы уверены, что желаете закрыть без сохранения?","options":"Параметры","target":"Цель","targetNew":"Новое окно (_blank)","targetTop":"Главное окно (_top)","targetSelf":"Текущее окно (_self)","targetParent":"Родительское окно (_parent)","langDirLTR":"Слева направо (LTR)","langDirRTL":"Справа налево (RTL)","styles":"Стиль","cssClasses":"CSS классы","width":"Ширина","height":"Высота","align":"Выравнивание","alignLeft":"По левому краю","alignRight":"По правому краю","alignCenter":"По центру","alignJustify":"По ширине","alignTop":"Поверху","alignMiddle":"Посередине","alignBottom":"Понизу","alignNone":"Нет","invalidValue":"Недопустимое значение.","invalidHeight":"Высота задается числом.","invalidWidth":"Ширина задается числом.","invalidCssLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","invalidHtmlLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры HTML (px или %).","invalidInlineStyle":"Значение, указанное для стиля элемента, должно состоять из одной или нескольких пар данных в формате \"параметр : значение\", разделённых точкой с запятой.","cssLengthTooltip":"Введите значение в пикселях, либо число с корректной единицей меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недоступно</span>"},"about":{"copy":"Copyright &copy; $1. Все права защищены.","dlgTitle":"О CKEditor","help":"$1 содержит подробную справку по использованию.","moreInfo":"Для получения информации о лицензии, пожалуйста, перейдите на наш сайт:","title":"О CKEditor","userGuide":"Руководство пользователя CKEditor"},"basicstyles":{"bold":"Полужирный","italic":"Курсив","strike":"Зачеркнутый","subscript":"Подстрочный индекс","superscript":"Надстрочный индекс","underline":"Подчеркнутый"},"bidi":{"ltr":"Направление текста слева направо","rtl":"Направление текста справа налево"},"blockquote":{"toolbar":"Цитата"},"clipboard":{"copy":"Копировать","copyError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по копированию текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+C).","cut":"Вырезать","cutError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по вырезке текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+X).","paste":"Вставить","pasteArea":"Зона для вставки","pasteMsg":"Пожалуйста, вставьте текст в зону ниже, используя клавиатуру (<strong>Ctrl/Cmd+V</strong>) и нажмите кнопку \"OK\".","securityMsg":"Настройки безопасности вашего браузера не разрешают редактору напрямую обращаться к буферу обмена. Вы должны вставить текст снова в это окно.","title":"Вставить"},"button":{"selectedLabel":"%1 (Выбрано)"},"colorbutton":{"auto":"Автоматически","bgColorTitle":"Цвет фона","colors":{"000":"Чёрный","800000":"Бордовый","8B4513":"Кожано-коричневый","2F4F4F":"Темный синевато-серый","008080":"Сине-зелёный","000080":"Тёмно-синий","4B0082":"Индиго","696969":"Тёмно-серый","B22222":"Кирпичный","A52A2A":"Коричневый","DAA520":"Золотисто-берёзовый","006400":"Темно-зелёный","40E0D0":"Бирюзовый","0000CD":"Умеренно синий","800080":"Пурпурный","808080":"Серый","F00":"Красный","FF8C00":"Темно-оранжевый","FFD700":"Золотистый","008000":"Зелёный","0FF":"Васильковый","00F":"Синий","EE82EE":"Фиолетовый","A9A9A9":"Тускло-серый","FFA07A":"Светло-лососевый","FFA500":"Оранжевый","FFFF00":"Жёлтый","00FF00":"Лайма","AFEEEE":"Бледно-синий","ADD8E6":"Свелто-голубой","DDA0DD":"Сливовый","D3D3D3":"Светло-серый","FFF0F5":"Розово-лавандовый","FAEBD7":"Античный белый","FFFFE0":"Светло-жёлтый","F0FFF0":"Медвяной росы","F0FFFF":"Лазурный","F0F8FF":"Бледно-голубой","E6E6FA":"Лавандовый","FFF":"Белый"},"more":"Ещё цвета...","panelTitle":"Цвета","textColorTitle":"Цвет текста"},"colordialog":{"clear":"Очистить","highlight":"Под курсором","options":"Настройки цвета","selected":"Выбранный цвет","title":"Выберите цвет"},"templates":{"button":"Шаблоны","emptyListMsg":"(не определено ни одного шаблона)","insertOption":"Заменить текущее содержимое","options":"Параметры шаблона","selectPromptMsg":"Пожалуйста, выберите, какой шаблон следует открыть в редакторе","title":"Шаблоны содержимого"},"contextmenu":{"options":"Параметры контекстного меню"},"div":{"IdInputLabel":"Идентификатор","advisoryTitleInputLabel":"Заголовок","cssClassInputLabel":"Классы CSS","edit":"Редактировать контейнер","inlineStyleInputLabel":"Стиль элемента","langDirLTRLabel":"Слева направо (LTR)","langDirLabel":"Направление текста","langDirRTLLabel":"Справа налево (RTL)","languageCodeInputLabel":"Код языка","remove":"Удалить контейнер","styleSelectLabel":"Стиль","title":"Создать Div-контейнер","toolbar":"Создать Div-контейнер"},"toolbar":{"toolbarCollapse":"Свернуть панель инструментов","toolbarExpand":"Развернуть панель инструментов","toolbarGroups":{"document":"Документ","clipboard":"Буфер обмена / Отмена действий","editing":"Корректировка","forms":"Формы","basicstyles":"Простые стили","paragraph":"Абзац","links":"Ссылки","insert":"Вставка","styles":"Стили","colors":"Цвета","tools":"Инструменты"},"toolbars":"Панели инструментов редактора"},"elementspath":{"eleLabel":"Путь элементов","eleTitle":"Элемент %1"},"find":{"find":"Найти","findOptions":"Опции поиска","findWhat":"Найти:","matchCase":"Учитывать регистр","matchCyclic":"По всему тексту","matchWord":"Только слово целиком","notFoundMsg":"Искомый текст не найден.","replace":"Заменить","replaceAll":"Заменить всё","replaceSuccessMsg":"Успешно заменено %1 раз(а).","replaceWith":"Заменить на:","title":"Поиск и замена"},"fakeobjects":{"anchor":"Якорь","flash":"Flash анимация","hiddenfield":"Скрытое поле","iframe":"iFrame","unknown":"Неизвестный объект"},"flash":{"access":"Доступ к скриптам","accessAlways":"Всегда","accessNever":"Никогда","accessSameDomain":"В том же домене","alignAbsBottom":"По низу текста","alignAbsMiddle":"По середине текста","alignBaseline":"По базовой линии","alignTextTop":"По верху текста","bgcolor":"Цвет фона","chkFull":"Разрешить полноэкранный режим","chkLoop":"Повторять","chkMenu":"Включить меню Flash","chkPlay":"Автоматическое воспроизведение","flashvars":"Переменные для Flash","hSpace":"Гориз. отступ","properties":"Свойства Flash","propertiesTab":"Свойства","quality":"Качество","qualityAutoHigh":"Запуск на высоком","qualityAutoLow":"Запуск на низком","qualityBest":"Лучшее","qualityHigh":"Высокое","qualityLow":"Низкое","qualityMedium":"Среднее","scale":"Масштабировать","scaleAll":"Пропорционально","scaleFit":"Заполнять","scaleNoBorder":"Заходить за границы","title":"Свойства Flash","vSpace":"Вертик. отступ","validateHSpace":"Горизонтальный отступ задается числом.","validateSrc":"Вы должны ввести ссылку","validateVSpace":"Вертикальный отступ задается числом.","windowMode":"Взаимодействие с окном","windowModeOpaque":"Непрозрачный","windowModeTransparent":"Прозрачный","windowModeWindow":"Обычный"},"font":{"fontSize":{"label":"Размер","voiceLabel":"Размер шрифта","panelTitle":"Размер шрифта"},"label":"Шрифт","panelTitle":"Шрифт","voiceLabel":"Шрифт"},"forms":{"button":{"title":"Свойства кнопки","text":"Текст (Значение)","type":"Тип","typeBtn":"Кнопка","typeSbm":"Отправка","typeRst":"Сброс"},"checkboxAndRadio":{"checkboxTitle":"Свойства флаговой кнопки","radioTitle":"Свойства кнопки выбора","value":"Значение","selected":"Выбрано","required":"Обязательное поле"},"form":{"title":"Свойства формы","menu":"Свойства формы","action":"Действие","method":"Метод","encoding":"Кодировка"},"hidden":{"title":"Свойства скрытого поля","name":"Имя","value":"Значение"},"select":{"title":"Свойства списка выбора","selectInfo":"Информация о списке выбора","opAvail":"Доступные варианты","value":"Значение","size":"Размер","lines":"строк(и)","chkMulti":"Разрешить выбор нескольких вариантов","required":"Обязательное поле","opText":"Текст","opValue":"Значение","btnAdd":"Добавить","btnModify":"Изменить","btnUp":"Поднять","btnDown":"Опустить","btnSetValue":"Пометить как выбранное","btnDelete":"Удалить"},"textarea":{"title":"Свойства многострочного текстового поля","cols":"Колонок","rows":"Строк"},"textfield":{"title":"Свойства текстового поля","name":"Имя","value":"Значение","charWidth":"Ширина поля (в символах)","maxChars":"Макс. количество символов","required":"Обязательное поле","type":"Тип содержимого","typeText":"Текст","typePass":"Пароль","typeEmail":"Email","typeSearch":"Поиск","typeTel":"Номер телефона","typeUrl":"Ссылка"}},"format":{"label":"Форматирование","panelTitle":"Форматирование","tag_address":"Адрес","tag_div":"Обычное (div)","tag_h1":"Заголовок 1","tag_h2":"Заголовок 2","tag_h3":"Заголовок 3","tag_h4":"Заголовок 4","tag_h5":"Заголовок 5","tag_h6":"Заголовок 6","tag_p":"Обычное","tag_pre":"Моноширинное"},"horizontalrule":{"toolbar":"Вставить горизонтальную линию"},"iframe":{"border":"Показать границы фрейма","noUrl":"Пожалуйста, введите ссылку фрейма","scrolling":"Отображать полосы прокрутки","title":"Свойства iFrame","toolbar":"iFrame"},"image":{"alt":"Альтернативный текст","border":"Граница","btnUpload":"Загрузить на сервер","button2Img":"Вы желаете преобразовать это изображение-кнопку в обычное изображение?","hSpace":"Гориз. отступ","img2Button":"Вы желаете преобразовать это обычное изображение в изображение-кнопку?","infoTab":"Данные об изображении","linkTab":"Ссылка","lockRatio":"Сохранять пропорции","menu":"Свойства изображения","resetSize":"Вернуть обычные размеры","title":"Свойства изображения","titleButton":"Свойства изображения-кнопки","upload":"Загрузить","urlMissing":"Не указана ссылка на изображение.","vSpace":"Вертик. отступ","validateBorder":"Размер границ должен быть задан числом.","validateHSpace":"Горизонтальный отступ должен быть задан числом.","validateVSpace":"Вертикальный отступ должен быть задан числом."},"indent":{"indent":"Увеличить отступ","outdent":"Уменьшить отступ"},"smiley":{"options":"Выбор смайла","title":"Вставить смайл","toolbar":"Смайлы"},"justify":{"block":"По ширине","center":"По центру","left":"По левому краю","right":"По правому краю"},"language":{"button":"Установка языка","remove":"Удалить язык"},"link":{"acccessKey":"Клавиша доступа","advanced":"Дополнительно","advisoryContentType":"Тип содержимого","advisoryTitle":"Заголовок","anchor":{"toolbar":"Вставить / редактировать якорь","menu":"Изменить якорь","title":"Свойства якоря","name":"Имя якоря","errorName":"Пожалуйста, введите имя якоря","remove":"Удалить якорь"},"anchorId":"По идентификатору","anchorName":"По имени","charset":"Кодировка ресурса","cssClasses":"Классы CSS","emailAddress":"Email адрес","emailBody":"Текст сообщения","emailSubject":"Тема сообщения","id":"Идентификатор","info":"Информация о ссылке","langCode":"Код языка","langDir":"Направление текста","langDirLTR":"Слева направо (LTR)","langDirRTL":"Справа налево (RTL)","menu":"Редактировать ссылку","name":"Имя","noAnchors":"(В документе нет ни одного якоря)","noEmail":"Пожалуйста, введите email адрес","noUrl":"Пожалуйста, введите ссылку","other":"<другой>","popupDependent":"Зависимое (Netscape)","popupFeatures":"Параметры всплывающего окна","popupFullScreen":"Полноэкранное (IE)","popupLeft":"Отступ слева","popupLocationBar":"Панель адреса","popupMenuBar":"Панель меню","popupResizable":"Изменяемый размер","popupScrollBars":"Полосы прокрутки","popupStatusBar":"Строка состояния","popupToolbar":"Панель инструментов","popupTop":"Отступ сверху","rel":"Отношение","selectAnchor":"Выберите якорь","styles":"Стиль","tabIndex":"Последовательность перехода","target":"Цель","targetFrame":"<фрейм>","targetFrameName":"Имя целевого фрейма","targetPopup":"<всплывающее окно>","targetPopupName":"Имя всплывающего окна","title":"Ссылка","toAnchor":"Ссылка на якорь в тексте","toEmail":"Email","toUrl":"Ссылка","toolbar":"Вставить/Редактировать ссылку","type":"Тип ссылки","unlink":"Убрать ссылку","upload":"Загрузка"},"list":{"bulletedlist":"Вставить / удалить маркированный список","numberedlist":"Вставить / удалить нумерованный список"},"liststyle":{"armenian":"Армянская нумерация","bulletedTitle":"Свойства маркированного списка","circle":"Круг","decimal":"Десятичные (1, 2, 3, и т.д.)","decimalLeadingZero":"Десятичные с ведущим нулём (01, 02, 03, и т.д.)","disc":"Окружность","georgian":"Грузинская нумерация (ани, бани, гани, и т.д.)","lowerAlpha":"Строчные латинские (a, b, c, d, e, и т.д.)","lowerGreek":"Строчные греческие (альфа, бета, гамма, и т.д.)","lowerRoman":"Строчные римские (i, ii, iii, iv, v, и т.д.)","none":"Нет","notset":"<не указано>","numberedTitle":"Свойства нумерованного списка","square":"Квадрат","start":"Начиная с","type":"Тип","upperAlpha":"Заглавные латинские (A, B, C, D, E, и т.д.)","upperRoman":"Заглавные римские (I, II, III, IV, V, и т.д.)","validateStartNumber":"Первый номер списка должен быть задан обычным целым числом."},"magicline":{"title":"Вставить здесь параграф"},"maximize":{"maximize":"Развернуть","minimize":"Свернуть"},"newpage":{"toolbar":"Новая страница"},"pagebreak":{"alt":"Разрыв страницы","toolbar":"Вставить разрыв страницы для печати"},"pastetext":{"button":"Вставить только текст","title":"Вставить только текст"},"pastefromword":{"confirmCleanup":"Текст, который вы желаете вставить, по всей видимости, был скопирован из Word. Следует ли очистить его перед вставкой?","error":"Невозможно очистить вставленные данные из-за внутренней ошибки","title":"Вставить из Word","toolbar":"Вставить из Word"},"preview":{"preview":"Предварительный просмотр"},"print":{"toolbar":"Печать"},"removeformat":{"toolbar":"Убрать форматирование"},"save":{"toolbar":"Сохранить"},"selectall":{"toolbar":"Выделить все"},"showblocks":{"toolbar":"Отображать блоки"},"sourcearea":{"toolbar":"Источник"},"specialchar":{"options":"Выбор специального символа","title":"Выберите специальный символ","toolbar":"Вставить специальный символ"},"scayt":{"btn_about":"О SCAYT","btn_dictionaries":"Словари","btn_disable":"Отключить SCAYT","btn_enable":"Включить SCAYT","btn_langs":"Языки","btn_options":"Настройки","text_title":"Проверка орфографии по мере ввода (SCAYT)"},"stylescombo":{"label":"Стили","panelTitle":"Стили форматирования","panelTitle1":"Стили блока","panelTitle2":"Стили элемента","panelTitle3":"Стили объекта"},"table":{"border":"Размер границ","caption":"Заголовок","cell":{"menu":"Ячейка","insertBefore":"Вставить ячейку слева","insertAfter":"Вставить ячейку справа","deleteCell":"Удалить ячейки","merge":"Объединить ячейки","mergeRight":"Объединить с правой","mergeDown":"Объединить с нижней","splitHorizontal":"Разделить ячейку по горизонтали","splitVertical":"Разделить ячейку по вертикали","title":"Свойства ячейки","cellType":"Тип ячейки","rowSpan":"Объединяет строк","colSpan":"Объединяет колонок","wordWrap":"Перенос по словам","hAlign":"Горизонтальное выравнивание","vAlign":"Вертикальное выравнивание","alignBaseline":"По базовой линии","bgColor":"Цвет фона","borderColor":"Цвет границ","data":"Данные","header":"Заголовок","yes":"Да","no":"Нет","invalidWidth":"Ширина ячейки должна быть числом.","invalidHeight":"Высота ячейки должна быть числом.","invalidRowSpan":"Количество объединяемых строк должно быть задано числом.","invalidColSpan":"Количество объединяемых колонок должно быть задано числом.","chooseColor":"Выберите"},"cellPad":"Внутренний отступ ячеек","cellSpace":"Внешний отступ ячеек","column":{"menu":"Колонка","insertBefore":"Вставить колонку слева","insertAfter":"Вставить колонку справа","deleteColumn":"Удалить колонки"},"columns":"Колонки","deleteTable":"Удалить таблицу","headers":"Заголовки","headersBoth":"Сверху и слева","headersColumn":"Левая колонка","headersNone":"Без заголовков","headersRow":"Верхняя строка","invalidBorder":"Размер границ должен быть числом.","invalidCellPadding":"Внутренний отступ ячеек (cellpadding) должен быть числом.","invalidCellSpacing":"Внешний отступ ячеек (cellspacing) должен быть числом.","invalidCols":"Количество столбцов должно быть больше 0.","invalidHeight":"Высота таблицы должна быть числом.","invalidRows":"Количество строк должно быть больше 0.","invalidWidth":"Ширина таблицы должна быть числом.","menu":"Свойства таблицы","row":{"menu":"Строка","insertBefore":"Вставить строку сверху","insertAfter":"Вставить строку снизу","deleteRow":"Удалить строки"},"rows":"Строки","summary":"Итоги","title":"Свойства таблицы","toolbar":"Таблица","widthPc":"процентов","widthPx":"пикселей","widthUnit":"единица измерения"},"undo":{"redo":"Повторить","undo":"Отменить"},"wsc":{"btnIgnore":"Пропустить","btnIgnoreAll":"Пропустить всё","btnReplace":"Заменить","btnReplaceAll":"Заменить всё","btnUndo":"Отменить","changeTo":"Изменить на","errorLoading":"Произошла ошибка при подключении к серверу проверки орфографии: %s.","ieSpellDownload":"Модуль проверки орфографии не установлен. Хотите скачать его?","manyChanges":"Проверка орфографии завершена. Изменено слов: %1","noChanges":"Проверка орфографии завершена. Не изменено ни одного слова","noMispell":"Проверка орфографии завершена. Ошибок не найдено","noSuggestions":"- Варианты отсутствуют -","notAvailable":"Извините, но в данный момент сервис недоступен.","notInDic":"Отсутствует в словаре","oneChange":"Проверка орфографии завершена. Изменено одно слово","progress":"Орфография проверяется...","title":"Проверка орфографии","toolbar":"Проверить орфографию"}};
\ No newline at end of file
+CKEDITOR.lang['ru']={"editor":"Визуальный текстовый редактор","editorPanel":"Визуальный редактор текста","common":{"editorHelp":"Нажмите ALT-0 для открытия справки","browseServer":"Выбор на сервере","url":"Ссылка","protocol":"Протокол","upload":"Загрузка файла","uploadSubmit":"Загрузить на сервер","image":"Изображение","flash":"Flash","form":"Форма","checkbox":"Чекбокс","radio":"Радиокнопка","textField":"Текстовое поле","textarea":"Многострочное текстовое поле","hiddenField":"Скрытое поле","button":"Кнопка","select":"Выпадающий список","imageButton":"Кнопка-изображение","notSet":"<не указано>","id":"Идентификатор","name":"Имя","langDir":"Направление текста","langDirLtr":"Слева направо (LTR)","langDirRtl":"Справа налево (RTL)","langCode":"Код языка","longDescr":"Длинное описание ссылки","cssClass":"Класс CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль","ok":"ОК","cancel":"Отмена","close":"Закрыть","preview":"Предпросмотр","resize":"Перетащите для изменения размера","generalTab":"Основное","advancedTab":"Дополнительно","validateNumberFailed":"Это значение не является числом.","confirmNewPage":"Несохранённые изменения будут потеряны! Вы действительно желаете перейти на другую страницу?","confirmCancel":"Некоторые параметры были изменены. Вы уверены, что желаете закрыть без сохранения?","options":"Параметры","target":"Цель","targetNew":"Новое окно (_blank)","targetTop":"Главное окно (_top)","targetSelf":"Текущее окно (_self)","targetParent":"Родительское окно (_parent)","langDirLTR":"Слева направо (LTR)","langDirRTL":"Справа налево (RTL)","styles":"Стиль","cssClasses":"CSS классы","width":"Ширина","height":"Высота","align":"Выравнивание","alignLeft":"По левому краю","alignRight":"По правому краю","alignCenter":"По центру","alignJustify":"По ширине","alignTop":"Поверху","alignMiddle":"Посередине","alignBottom":"Понизу","alignNone":"Нет","invalidValue":"Недопустимое значение.","invalidHeight":"Высота задается числом.","invalidWidth":"Ширина задается числом.","invalidCssLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","invalidHtmlLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры HTML (px или %).","invalidInlineStyle":"Значение, указанное для стиля элемента, должно состоять из одной или нескольких пар данных в формате \"параметр : значение\", разделённых точкой с запятой.","cssLengthTooltip":"Введите значение в пикселях, либо число с корректной единицей меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недоступно</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Пробел","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Комбинация клавиш"},"about":{"copy":"Copyright &copy; $1. Все права защищены.","dlgTitle":"О CKEditor","help":"$1 содержит подробную справку по использованию.","moreInfo":"Для получения информации о лицензии, пожалуйста, перейдите на наш сайт:","title":"О CKEditor","userGuide":"Руководство пользователя CKEditor"},"basicstyles":{"bold":"Полужирный","italic":"Курсив","strike":"Зачеркнутый","subscript":"Подстрочный индекс","superscript":"Надстрочный индекс","underline":"Подчеркнутый"},"bidi":{"ltr":"Направление текста слева направо","rtl":"Направление текста справа налево"},"blockquote":{"toolbar":"Цитата"},"clipboard":{"copy":"Копировать","copyError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по копированию текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+C).","cut":"Вырезать","cutError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по вырезке текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+X).","paste":"Вставить","pasteArea":"Зона для вставки","pasteMsg":"Пожалуйста, вставьте текст в зону ниже, используя клавиатуру (<strong>Ctrl/Cmd+V</strong>) и нажмите кнопку \"OK\".","securityMsg":"Настройки безопасности вашего браузера не разрешают редактору напрямую обращаться к буферу обмена. Вы должны вставить текст снова в это окно.","title":"Вставить"},"button":{"selectedLabel":"%1 (Выбрано)"},"colorbutton":{"auto":"Автоматически","bgColorTitle":"Цвет фона","colors":{"000":"Чёрный","800000":"Бордовый","8B4513":"Кожано-коричневый","2F4F4F":"Темный синевато-серый","008080":"Сине-зелёный","000080":"Тёмно-синий","4B0082":"Индиго","696969":"Тёмно-серый","B22222":"Кирпичный","A52A2A":"Коричневый","DAA520":"Золотисто-берёзовый","006400":"Темно-зелёный","40E0D0":"Бирюзовый","0000CD":"Умеренно синий","800080":"Пурпурный","808080":"Серый","F00":"Красный","FF8C00":"Темно-оранжевый","FFD700":"Золотистый","008000":"Зелёный","0FF":"Васильковый","00F":"Синий","EE82EE":"Фиолетовый","A9A9A9":"Тускло-серый","FFA07A":"Светло-лососевый","FFA500":"Оранжевый","FFFF00":"Жёлтый","00FF00":"Лайма","AFEEEE":"Бледно-синий","ADD8E6":"Свелто-голубой","DDA0DD":"Сливовый","D3D3D3":"Светло-серый","FFF0F5":"Розово-лавандовый","FAEBD7":"Античный белый","FFFFE0":"Светло-жёлтый","F0FFF0":"Медвяной росы","F0FFFF":"Лазурный","F0F8FF":"Бледно-голубой","E6E6FA":"Лавандовый","FFF":"Белый","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Ещё цвета...","panelTitle":"Цвета","textColorTitle":"Цвет текста"},"colordialog":{"clear":"Очистить","highlight":"Под курсором","options":"Настройки цвета","selected":"Выбранный цвет","title":"Выберите цвет"},"templates":{"button":"Шаблоны","emptyListMsg":"(не определено ни одного шаблона)","insertOption":"Заменить текущее содержимое","options":"Параметры шаблона","selectPromptMsg":"Пожалуйста, выберите, какой шаблон следует открыть в редакторе","title":"Шаблоны содержимого"},"contextmenu":{"options":"Параметры контекстного меню"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Идентификатор","advisoryTitleInputLabel":"Заголовок","cssClassInputLabel":"Классы CSS","edit":"Редактировать контейнер","inlineStyleInputLabel":"Стиль элемента","langDirLTRLabel":"Слева направо (LTR)","langDirLabel":"Направление текста","langDirRTLLabel":"Справа налево (RTL)","languageCodeInputLabel":"Код языка","remove":"Удалить контейнер","styleSelectLabel":"Стиль","title":"Создать Div-контейнер","toolbar":"Создать Div-контейнер"},"toolbar":{"toolbarCollapse":"Свернуть панель инструментов","toolbarExpand":"Развернуть панель инструментов","toolbarGroups":{"document":"Документ","clipboard":"Буфер обмена / Отмена действий","editing":"Корректировка","forms":"Формы","basicstyles":"Простые стили","paragraph":"Абзац","links":"Ссылки","insert":"Вставка","styles":"Стили","colors":"Цвета","tools":"Инструменты"},"toolbars":"Панели инструментов редактора"},"elementspath":{"eleLabel":"Путь элементов","eleTitle":"Элемент %1"},"find":{"find":"Найти","findOptions":"Опции поиска","findWhat":"Найти:","matchCase":"Учитывать регистр","matchCyclic":"По всему тексту","matchWord":"Только слово целиком","notFoundMsg":"Искомый текст не найден.","replace":"Заменить","replaceAll":"Заменить всё","replaceSuccessMsg":"Успешно заменено %1 раз(а).","replaceWith":"Заменить на:","title":"Поиск и замена"},"fakeobjects":{"anchor":"Якорь","flash":"Flash анимация","hiddenfield":"Скрытое поле","iframe":"iFrame","unknown":"Неизвестный объект"},"flash":{"access":"Доступ к скриптам","accessAlways":"Всегда","accessNever":"Никогда","accessSameDomain":"В том же домене","alignAbsBottom":"По низу текста","alignAbsMiddle":"По середине текста","alignBaseline":"По базовой линии","alignTextTop":"По верху текста","bgcolor":"Цвет фона","chkFull":"Разрешить полноэкранный режим","chkLoop":"Повторять","chkMenu":"Включить меню Flash","chkPlay":"Автоматическое воспроизведение","flashvars":"Переменные для Flash","hSpace":"Гориз. отступ","properties":"Свойства Flash","propertiesTab":"Свойства","quality":"Качество","qualityAutoHigh":"Запуск на высоком","qualityAutoLow":"Запуск на низком","qualityBest":"Лучшее","qualityHigh":"Высокое","qualityLow":"Низкое","qualityMedium":"Среднее","scale":"Масштабировать","scaleAll":"Пропорционально","scaleFit":"Заполнять","scaleNoBorder":"Заходить за границы","title":"Свойства Flash","vSpace":"Вертик. отступ","validateHSpace":"Горизонтальный отступ задается числом.","validateSrc":"Вы должны ввести ссылку","validateVSpace":"Вертикальный отступ задается числом.","windowMode":"Взаимодействие с окном","windowModeOpaque":"Непрозрачный","windowModeTransparent":"Прозрачный","windowModeWindow":"Обычный"},"font":{"fontSize":{"label":"Размер","voiceLabel":"Размер шрифта","panelTitle":"Размер шрифта"},"label":"Шрифт","panelTitle":"Шрифт","voiceLabel":"Шрифт"},"forms":{"button":{"title":"Свойства кнопки","text":"Текст (Значение)","type":"Тип","typeBtn":"Кнопка","typeSbm":"Отправка","typeRst":"Сброс"},"checkboxAndRadio":{"checkboxTitle":"Свойства флаговой кнопки","radioTitle":"Свойства кнопки выбора","value":"Значение","selected":"Выбрано","required":"Обязательное поле"},"form":{"title":"Свойства формы","menu":"Свойства формы","action":"Действие","method":"Метод","encoding":"Кодировка"},"hidden":{"title":"Свойства скрытого поля","name":"Имя","value":"Значение"},"select":{"title":"Свойства списка выбора","selectInfo":"Информация о списке выбора","opAvail":"Доступные варианты","value":"Значение","size":"Размер","lines":"строк(и)","chkMulti":"Разрешить выбор нескольких вариантов","required":"Обязательное поле","opText":"Текст","opValue":"Значение","btnAdd":"Добавить","btnModify":"Изменить","btnUp":"Поднять","btnDown":"Опустить","btnSetValue":"Пометить как выбранное","btnDelete":"Удалить"},"textarea":{"title":"Свойства многострочного текстового поля","cols":"Колонок","rows":"Строк"},"textfield":{"title":"Свойства текстового поля","name":"Имя","value":"Значение","charWidth":"Ширина поля (в символах)","maxChars":"Макс. количество символов","required":"Обязательное поле","type":"Тип содержимого","typeText":"Текст","typePass":"Пароль","typeEmail":"Email","typeSearch":"Поиск","typeTel":"Номер телефона","typeUrl":"Ссылка"}},"format":{"label":"Форматирование","panelTitle":"Форматирование","tag_address":"Адрес","tag_div":"Обычное (div)","tag_h1":"Заголовок 1","tag_h2":"Заголовок 2","tag_h3":"Заголовок 3","tag_h4":"Заголовок 4","tag_h5":"Заголовок 5","tag_h6":"Заголовок 6","tag_p":"Обычное","tag_pre":"Моноширинное"},"horizontalrule":{"toolbar":"Вставить горизонтальную линию"},"iframe":{"border":"Показать границы фрейма","noUrl":"Пожалуйста, введите ссылку фрейма","scrolling":"Отображать полосы прокрутки","title":"Свойства iFrame","toolbar":"iFrame"},"image":{"alt":"Альтернативный текст","border":"Граница","btnUpload":"Загрузить на сервер","button2Img":"Вы желаете преобразовать это изображение-кнопку в обычное изображение?","hSpace":"Гориз. отступ","img2Button":"Вы желаете преобразовать это обычное изображение в изображение-кнопку?","infoTab":"Данные об изображении","linkTab":"Ссылка","lockRatio":"Сохранять пропорции","menu":"Свойства изображения","resetSize":"Вернуть обычные размеры","title":"Свойства изображения","titleButton":"Свойства изображения-кнопки","upload":"Загрузить","urlMissing":"Не указана ссылка на изображение.","vSpace":"Вертик. отступ","validateBorder":"Размер границ должен быть задан числом.","validateHSpace":"Горизонтальный отступ должен быть задан числом.","validateVSpace":"Вертикальный отступ должен быть задан числом."},"indent":{"indent":"Увеличить отступ","outdent":"Уменьшить отступ"},"smiley":{"options":"Выбор смайла","title":"Вставить смайл","toolbar":"Смайлы"},"justify":{"block":"По ширине","center":"По центру","left":"По левому краю","right":"По правому краю"},"language":{"button":"Установка языка","remove":"Удалить язык"},"link":{"acccessKey":"Клавиша доступа","advanced":"Дополнительно","advisoryContentType":"Тип содержимого","advisoryTitle":"Заголовок","anchor":{"toolbar":"Вставить / редактировать якорь","menu":"Изменить якорь","title":"Свойства якоря","name":"Имя якоря","errorName":"Пожалуйста, введите имя якоря","remove":"Удалить якорь"},"anchorId":"По идентификатору","anchorName":"По имени","charset":"Кодировка ресурса","cssClasses":"Классы CSS","download":"Force Download","displayText":"Отображаемый текст","emailAddress":"Email адрес","emailBody":"Текст сообщения","emailSubject":"Тема сообщения","id":"Идентификатор","info":"Информация о ссылке","langCode":"Код языка","langDir":"Направление текста","langDirLTR":"Слева направо (LTR)","langDirRTL":"Справа налево (RTL)","menu":"Редактировать ссылку","name":"Имя","noAnchors":"(В документе нет ни одного якоря)","noEmail":"Пожалуйста, введите email адрес","noUrl":"Пожалуйста, введите ссылку","other":"<другой>","popupDependent":"Зависимое (Netscape)","popupFeatures":"Параметры всплывающего окна","popupFullScreen":"Полноэкранное (IE)","popupLeft":"Отступ слева","popupLocationBar":"Панель адреса","popupMenuBar":"Панель меню","popupResizable":"Изменяемый размер","popupScrollBars":"Полосы прокрутки","popupStatusBar":"Строка состояния","popupToolbar":"Панель инструментов","popupTop":"Отступ сверху","rel":"Отношение","selectAnchor":"Выберите якорь","styles":"Стиль","tabIndex":"Последовательность перехода","target":"Цель","targetFrame":"<фрейм>","targetFrameName":"Имя целевого фрейма","targetPopup":"<всплывающее окно>","targetPopupName":"Имя всплывающего окна","title":"Ссылка","toAnchor":"Ссылка на якорь в тексте","toEmail":"Email","toUrl":"Ссылка","toolbar":"Вставить/Редактировать ссылку","type":"Тип ссылки","unlink":"Убрать ссылку","upload":"Загрузка"},"list":{"bulletedlist":"Вставить / удалить маркированный список","numberedlist":"Вставить / удалить нумерованный список"},"liststyle":{"armenian":"Армянская нумерация","bulletedTitle":"Свойства маркированного списка","circle":"Круг","decimal":"Десятичные (1, 2, 3, и т.д.)","decimalLeadingZero":"Десятичные с ведущим нулём (01, 02, 03, и т.д.)","disc":"Окружность","georgian":"Грузинская нумерация (ани, бани, гани, и т.д.)","lowerAlpha":"Строчные латинские (a, b, c, d, e, и т.д.)","lowerGreek":"Строчные греческие (альфа, бета, гамма, и т.д.)","lowerRoman":"Строчные римские (i, ii, iii, iv, v, и т.д.)","none":"Нет","notset":"<не указано>","numberedTitle":"Свойства нумерованного списка","square":"Квадрат","start":"Начиная с","type":"Тип","upperAlpha":"Заглавные латинские (A, B, C, D, E, и т.д.)","upperRoman":"Заглавные римские (I, II, III, IV, V, и т.д.)","validateStartNumber":"Первый номер списка должен быть задан обычным целым числом."},"magicline":{"title":"Вставить здесь параграф"},"maximize":{"maximize":"Развернуть","minimize":"Свернуть"},"newpage":{"toolbar":"Новая страница"},"pagebreak":{"alt":"Разрыв страницы","toolbar":"Вставить разрыв страницы для печати"},"pastetext":{"button":"Вставить только текст","title":"Вставить только текст"},"pastefromword":{"confirmCleanup":"Текст, который вы желаете вставить, по всей видимости, был скопирован из Word. Следует ли очистить его перед вставкой?","error":"Невозможно очистить вставленные данные из-за внутренней ошибки","title":"Вставить из Word","toolbar":"Вставить из Word"},"preview":{"preview":"Предварительный просмотр"},"print":{"toolbar":"Печать"},"removeformat":{"toolbar":"Убрать форматирование"},"save":{"toolbar":"Сохранить"},"selectall":{"toolbar":"Выделить все"},"showblocks":{"toolbar":"Отображать блоки"},"sourcearea":{"toolbar":"Источник"},"specialchar":{"options":"Выбор специального символа","title":"Выберите специальный символ","toolbar":"Вставить специальный символ"},"scayt":{"btn_about":"О SCAYT","btn_dictionaries":"Словари","btn_disable":"Отключить SCAYT","btn_enable":"Включить SCAYT","btn_langs":"Языки","btn_options":"Настройки","text_title":"Проверка орфографии по мере ввода (SCAYT)"},"stylescombo":{"label":"Стили","panelTitle":"Стили форматирования","panelTitle1":"Стили блока","panelTitle2":"Стили элемента","panelTitle3":"Стили объекта"},"table":{"border":"Размер границ","caption":"Заголовок","cell":{"menu":"Ячейка","insertBefore":"Вставить ячейку слева","insertAfter":"Вставить ячейку справа","deleteCell":"Удалить ячейки","merge":"Объединить ячейки","mergeRight":"Объединить с правой","mergeDown":"Объединить с нижней","splitHorizontal":"Разделить ячейку по вертикали","splitVertical":"Разделить ячейку по горизонтали","title":"Свойства ячейки","cellType":"Тип ячейки","rowSpan":"Объединяет строк","colSpan":"Объединяет колонок","wordWrap":"Перенос по словам","hAlign":"Горизонтальное выравнивание","vAlign":"Вертикальное выравнивание","alignBaseline":"По базовой линии","bgColor":"Цвет фона","borderColor":"Цвет границ","data":"Данные","header":"Заголовок","yes":"Да","no":"Нет","invalidWidth":"Ширина ячейки должна быть числом.","invalidHeight":"Высота ячейки должна быть числом.","invalidRowSpan":"Количество объединяемых строк должно быть задано числом.","invalidColSpan":"Количество объединяемых колонок должно быть задано числом.","chooseColor":"Выберите"},"cellPad":"Внутренний отступ ячеек","cellSpace":"Внешний отступ ячеек","column":{"menu":"Колонка","insertBefore":"Вставить колонку слева","insertAfter":"Вставить колонку справа","deleteColumn":"Удалить колонки"},"columns":"Колонки","deleteTable":"Удалить таблицу","headers":"Заголовки","headersBoth":"Сверху и слева","headersColumn":"Левая колонка","headersNone":"Без заголовков","headersRow":"Верхняя строка","invalidBorder":"Размер границ должен быть числом.","invalidCellPadding":"Внутренний отступ ячеек (cellpadding) должен быть числом.","invalidCellSpacing":"Внешний отступ ячеек (cellspacing) должен быть числом.","invalidCols":"Количество столбцов должно быть больше 0.","invalidHeight":"Высота таблицы должна быть числом.","invalidRows":"Количество строк должно быть больше 0.","invalidWidth":"Ширина таблицы должна быть числом.","menu":"Свойства таблицы","row":{"menu":"Строка","insertBefore":"Вставить строку сверху","insertAfter":"Вставить строку снизу","deleteRow":"Удалить строки"},"rows":"Строки","summary":"Итоги","title":"Свойства таблицы","toolbar":"Таблица","widthPc":"процентов","widthPx":"пикселей","widthUnit":"единица измерения"},"undo":{"redo":"Повторить","undo":"Отменить"},"wsc":{"btnIgnore":"Пропустить","btnIgnoreAll":"Пропустить всё","btnReplace":"Заменить","btnReplaceAll":"Заменить всё","btnUndo":"Отменить","changeTo":"Изменить на","errorLoading":"Произошла ошибка при подключении к серверу проверки орфографии: %s.","ieSpellDownload":"Модуль проверки орфографии не установлен. Хотите скачать его?","manyChanges":"Проверка орфографии завершена. Изменено слов: %1","noChanges":"Проверка орфографии завершена. Не изменено ни одного слова","noMispell":"Проверка орфографии завершена. Ошибок не найдено","noSuggestions":"- Варианты отсутствуют -","notAvailable":"Извините, но в данный момент сервис недоступен.","notInDic":"Отсутствует в словаре","oneChange":"Проверка орфографии завершена. Изменено одно слово","progress":"Орфография проверяется...","title":"Проверка орфографии","toolbar":"Проверить орфографию"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/si.js b/htdocs/includes/ckeditor/ckeditor/lang/si.js
index eadc05bb5e2..874b74462d2 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/si.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/si.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['si']={"editor":"පොහොසත් වචන සංස්කරණ","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"උදව් ලබා ගැනීමට  ALT බොත්තම ඔබන්න","browseServer":"සෙවුම් සේවාදායකය","url":"URL","protocol":"මුලාපත්‍රය","upload":"උඩුගතකිරීම","uploadSubmit":"සේවාදායකය වෙත යොමුකිරිම","image":"රුපය","flash":"දීප්තිය","form":"පෝරමය","checkbox":"ලකුණුකිරීමේ කොටුව","radio":"තේරීම් ","textField":"ලියන ප්‍රදේශය","textarea":"අකුරු ","hiddenField":"සැඟවුණු ප්‍රදේශය","button":"බොත්තම","select":"තෝරන්න ","imageButton":"රුප ","notSet":"<යොදා >","id":"අංකය","name":"නම","langDir":"භාෂා දිශාව","langDirLtr":"වමේසිට දකුණුට","langDirRtl":"දකුණේ සිට වමට","langCode":"භාෂා කේතය","longDescr":"සම්පුර්න පැහැදිලි කිරීම","cssClass":"විලාශ පත්‍ර පන්තිය","advisoryTitle":"උපදෙස් ","cssStyle":"විලාසය","ok":"නිරදි","cancel":"අවලංගු කිරීම","close":"වැසීම","preview":"නැවත ","resize":"විශාලත්වය නැවත වෙනස් කිරීම","generalTab":"පොදු කරුණු.","advancedTab":"දීය","validateNumberFailed":"මෙම වටිනාකම අංකයක් නොවේ","confirmNewPage":"ආරක්ෂා නොකළ සියලුම දත්තයන් මැකියනුලැබේ. ඔබට නව පිටුවක් ලබා ගැනීමට අවශ්‍යද?","confirmCancel":"ඇතම් විකල්පයන් වෙනස් කර ඇත. ඔබට මින් නික්මීමට අවශ්‍යද?","options":" විකල්ප","target":"අරමුණ","targetNew":"නව කව්ළුව","targetTop":"වැදගත් කව්ළුව","targetSelf":"එම කව්ළුව(_තම\\\\)","targetParent":"මව් කව්ළුව(_)","langDirLTR":"වමේසිට දකුණුට","langDirRTL":"දකුණේ සිට වමට","styles":"විලාසය","cssClasses":"විලාසපත්‍ර පන්තිය","width":"පළල","height":"උස","align":"ගැලපුම","alignLeft":"වම","alignRight":"දකුණ","alignCenter":"මධ්‍ය","alignJustify":"Justify","alignTop":"ඉ","alignMiddle":"මැද","alignBottom":"පහල","alignNone":"None","invalidValue":"වැරදී වටිනාකමකි","invalidHeight":"උස අංකයක් විය යුතුය","invalidWidth":"පළල අංකයක් විය යුතුය","invalidCssLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  CSS මිනුම් එකක(px, %, in, cm, mm, em, ex, pt, pc)","invalidHtmlLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  HTML මිනුම් එකක (px හෝ %).","invalidInlineStyle":"වටිනාකමක් නිරූපණය කිරීම  පේළි විලාසයයට ආකෘතිය  අනතර්ග විය යුතය  \"නම : වටිනාකම\", තිත් කොමාවකින් වෙන් වෙන ලද.","cssLengthTooltip":"සංක්‍යා ඇතුලත් කිරීමේදී වටිනාකම තිත් ප්‍රමාණය නිවරදි CSS  ඒකක(තිත්, %, අඟල්,සෙමි, mm, em, ex, pt, pc)","unavailable":"%1<span පන්තිය=\"ළඟා වියහැකි ද බලන්න\">, නොමැතිනම්</span>"},"about":{"copy":"පිටපත් අයිතිය සහ පිටපත් කිරීම;$1 .සියලුම හිමිකම් ඇවිරිණි.","dlgTitle":"CKEditor ගැන විස්තර","help":"උදව් සඳහා $1 ","moreInfo":"බලපත්‍ර තොරතුරු සදහා කරුණාකර අපගේ විද්‍යුත් ලිපිනයට පිවිසෙන්න:","title":"CKEditor ගැන විස්තර","userGuide":"CKEditor භාවිතා කිරීම පිළිබඳ "},"basicstyles":{"bold":"තද අකුරින් ලියනලද","italic":"බැධීඅකුරින් ලියන ලද","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"යටින් ඉරි අදින ලද"},"bidi":{"ltr":"වගන්ති දිශාව වමේ සිට දකුණට","rtl":"වගන්ති දිශාව  දකුණේ සිට වමට"},"blockquote":{"toolbar":"උද්ධෘත කොටස"},"clipboard":{"copy":"පිටපත් කරන්න","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"කපාගන්න","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"අලවන්න","pasteArea":"අලවන ප්‍රදේශ","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"අලවන්න"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"පසුබිම් වර්ණය","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"More Colors...","panelTitle":"වර්ණය","textColorTitle":"අක්ෂර වර්ණ"},"colordialog":{"clear":"පැහැදිලි","highlight":"මතුකර පෙන්වන්න","options":"වර්ණ විකල්ප","selected":"තෙරු වර්ණ","title":"වර්ණ තෝරන්න"},"templates":{"button":"අච්චුව","emptyListMsg":"කිසිම අච්චුවක් කලින් තීරණය කර ","insertOption":"සත්‍ය අන්තර්ගතයන් ප්‍රතිස්ථාපනය කරන්න","options":"අච්චු ","selectPromptMsg":"කරුණාකර සංස්කරණය සදහා අච්චුවක් ","title":"අන්තර්ගත් අච්චුන්"},"contextmenu":{"options":"අනතර්ග ලේඛණ  විකල්ප"},"div":{"IdInputLabel":"අංකය","advisoryTitleInputLabel":"උපදේශාත්මක නාමය","cssClassInputLabel":"විලාසපත්‍ර පන්තිය","edit":"වෙනස්කිරීම","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"වමේසිට දකුණුට","langDirLabel":"භාෂා දිශාව","langDirRTLLabel":"දකුණේ සිට වමට","languageCodeInputLabel":"භාෂා ","remove":"ඉවත් කිරීම","styleSelectLabel":"විලාසය","title":"නිර්මාණය ","toolbar":"නිර්මාණය "},"toolbar":{"toolbarCollapse":"මෙවලම් තීරුව හැකුලුම.","toolbarExpand":"මෙවලම් තීරුව දීගහැරුම","toolbarGroups":{"document":"ලිපිය","clipboard":"ඇමිණුම වෙනස් කිරීම","editing":"සංස්කරණය","forms":"පෝරමය","basicstyles":"මුලික විලාසය","paragraph":"චේදය","links":"සබැඳිය","insert":"ඇතුලත් කිරීම","styles":"විලාසය","colors":"වර්ණය","tools":"මෙවලම්"},"toolbars":"සංස්කරණ මෙවලම් තීරුව"},"elementspath":{"eleLabel":"මුලද්‍රව්‍ය මාර්ගය","eleTitle":"%1 මුල"},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"හිලව් කිරීම","replaceAll":"සියල්ලම හිලව් කරන්න","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"fakeobjects":{"anchor":"ආධාරය","flash":"Flash Animation","hiddenfield":"සැඟවුණු ප්‍රදේශය","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"පිටපත් ප්‍රවේශය","accessAlways":"හැමවිටම","accessNever":"කිසිදා නොවේ","accessSameDomain":"එකම වසමේ","alignAbsBottom":"පතුල","alignAbsMiddle":"Abs ","alignBaseline":"පාද රේඛාව","alignTextTop":"වගන්තිය ඉහල","bgcolor":"පසුබිම් වර්ණය","chkFull":"පුර්ණ තිරය සදහා අවසර","chkLoop":"පුඩුව","chkMenu":"සක්‍රිය බබලන මෙනුව","chkPlay":"ස්‌වයංක්‍රිය ක්‍රියාත්මක වීම","flashvars":"වෙනස්වන දත්ත","hSpace":"HSpace","properties":"බබලන ගුණ","propertiesTab":"ගුණ","quality":"තත්වය","qualityAutoHigh":"ස්‌වයංක්‍රිය  ","qualityAutoLow":" ස්‌වයංක්‍රිය   ","qualityBest":"වඩාත් ගැලපෙන","qualityHigh":"ඉහළ","qualityLow":"පහළ","qualityMedium":"මධ්‍ය","scale":"පරිමාණ","scaleAll":"සියල්ල ","scaleFit":"හරියටම ගැලපෙන","scaleNoBorder":"මාඉම් නොමැති","title":"බබලන ","vSpace":"VSpace","validateHSpace":"HSpace සංක්‍යාවක් විය යුතුය.","validateSrc":"URL හිස් නොවිය ","validateVSpace":"VSpace සංක්‍යාවක් විය යුතුය","windowMode":"ජනෙල ක්‍රමය","windowModeOpaque":"විනිවිද පෙනෙන","windowModeTransparent":"විනිවිද පෙනෙන","windowModeWindow":"ජනෙල"},"font":{"fontSize":{"label":"විශාලත්වය","voiceLabel":"අක්ෂර විශාලත්වය","panelTitle":"අක්ෂර විශාලත්වය"},"label":"අක්ෂරය","panelTitle":"අක්ෂර නාමය","voiceLabel":"අක්ෂර"},"forms":{"button":{"title":"බොත්තම් ගුණ","text":"වගන්තිය(වටිනාකම)","type":"වර්ගය","typeBtn":"බොත්තම","typeSbm":"යොමුකරනවා","typeRst":"නැවත ආරම්භකතත්වයට පත් කරනවා"},"checkboxAndRadio":{"checkboxTitle":"ලකුණු කිරීමේ කොටුවේ ලක්ෂණ","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"පෝරමයේ ","menu":"පෝරමයේ ගුණ/","action":"ගන්නා පියවර","method":"ක්‍රමය","encoding":"කේතීකරණය"},"hidden":{"title":"සැඟවුණු ප්‍රදේශයේ ","name":"නම","value":"Value"},"select":{"title":"තේරීම් ප්‍රදේශයේ ","selectInfo":"විස්තර තෝරන්න","opAvail":"ඉතුරුවී ඇති වීකල්ප","value":"Value","size":"විශාලත්වය","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"මකා දැම්ම"},"textarea":{"title":"Textarea Properties","cols":"සිරස් ","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"නම","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"වර්ගය","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"ආකෘතිය","panelTitle":"චේදයේ ","tag_address":"ලිපිනය","tag_div":"සාමාන්‍ය(DIV)","tag_h1":"ශීර්ෂය 1","tag_h2":"ශීර්ෂය 2","tag_h3":"ශීර්ෂය 3","tag_h4":"ශීර්ෂය 4","tag_h5":"ශීර්ෂය 5","tag_h6":"ශීර්ෂය 6","tag_p":"සාමාන්‍ය","tag_pre":"ආකෘතියන්"},"horizontalrule":{"toolbar":"තිරස් රේඛාවක් ඇතුලත් කරන්න"},"iframe":{"border":"සැකිල්ලේ කඩයිම් ","noUrl":"කරුණාකර රුපයේ URL ලියන්න","scrolling":"සක්ක්‍රිය කරන්න","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"විකල්ප ","border":"සීමාවවල ","btnUpload":"සේවාදායකය වෙත යොමුකිරිම","button2Img":"ඔබට තෝරන ලද රුපය පරිවර්තනය කිරීමට අවශ්‍යද?","hSpace":"HSpace","img2Button":"ඔබට තෝරන ලද රුපය පරිවර්තනය කිරීමට අවශ්‍යද?","infoTab":"රුපයේ තොරතුරු","linkTab":"සබැඳිය","lockRatio":"නවතන අනුපාතය ","menu":"රුපයේ ගුණ","resetSize":"නැවතත් විශාලත්වය වෙනස් කිරීම","title":"රුපයේ ","titleButton":"රුප බොත්තමේ ගුණ","upload":"උඩුගතකිරීම","urlMissing":"රුප මුලාශ්‍ර URL නැත.","vSpace":"VSpace","validateBorder":"මාඉම් සම්පුර්ණ සංක්‍යාවක් විය යුතුය.","validateHSpace":"HSpace  සම්පුර්ණ සංක්‍යාවක් විය යුතුය","validateVSpace":"VSpace සම්පුර්ණ සංක්‍යාවක් විය යුතුය."},"indent":{"indent":"අතර පරතරය වැඩිකරන්න","outdent":"අතර පරතරය අඩුකරන්න"},"smiley":{"options":"හාස්‍ය විකල්ප","title":"හාස්‍යන් ඇතුලත් කිරීම","toolbar":"හාස්‍යන්"},"justify":{"block":"Justify","center":"මධ්‍ය","left":"Align Left","right":"Align Right"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"ප්‍රවේශ  යතුර","advanced":"දීය","advisoryContentType":"උපදේශාත්මක අන්තර්ගත ආකාරය","advisoryTitle":"උපදේශාත්මක නාමය","anchor":{"toolbar":"ආධාරය","menu":"ආධාරය වෙනස් කිරීම","title":"ආධාරක ","name":"ආධාරකයේ නාමය","errorName":"කරුණාකර ආධාරකයේ නාමය ඇතුල් කරන්න","remove":"ආධාරකය ඉවත් කිරීම"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"විලාසපත්‍ර පන්තිය","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"අංකය","info":"Link Info","langCode":"භාෂා කේතය","langDir":"භාෂා දිශාව","langDirLTR":"වමේසිට දකුණුට","langDirRTL":"දකුණේ සිට වමට","menu":"Edit Link","name":"නම","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"විලාසය","tabIndex":"Tab Index","target":"අරමුණ","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"සබැඳිය","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"සබැඳිය","type":"Link Type","unlink":"Unlink","upload":"උඩුගතකිරීම"},"list":{"bulletedlist":"ඇතුලත් / ඉවත් කිරීම ලඉස්තුව","numberedlist":"ඇතුලත් / ඉවත් කිරීම අන්න්කිත ලඉස්තුව"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"කිසිවක්ම නොවේ","notset":"<යොදා >","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"වර්ගය","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"චේදය ඇතුලත් කරන්න"},"maximize":{"maximize":"විශාල කිරීම","minimize":"කුඩා කිරීම"},"newpage":{"toolbar":"නව පිටුවක්"},"pagebreak":{"alt":"පිටු බිදුම","toolbar":"මුද්‍රණය සඳහා පිටු බිදුමක් ඇතුලත් කරන්න"},"pastetext":{"button":"සාමාන්‍ය අක්ෂර ලෙස අලවන්න","title":"සාමාන්‍ය අක්ෂර ලෙස අලවන්න"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"වචන වලින් අලවන්න","toolbar":"වචන වලින් අලවන්න"},"preview":{"preview":"නැවත "},"print":{"toolbar":"මුද්‍රණය කරන්න"},"removeformat":{"toolbar":"සැකසීම වෙනස් කරන්න"},"save":{"toolbar":"ආරක්ෂා කරන්න"},"selectall":{"toolbar":"සියල්ලම "},"showblocks":{"toolbar":"කොටස පෙන්නන්න"},"sourcearea":{"toolbar":"මුලාශ්‍රය"},"specialchar":{"options":"විශේෂ  ගුණාංග වීකල්ප","title":"විශේෂ  ගුණාංග ","toolbar":"විශේෂ ගුණාංග ඇතුලත් "},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"විලාසය","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"සීමාවවල විශාලත්වය","caption":"Caption","cell":{"menu":"කොටුව","insertBefore":"පෙර කොටුවක් ඇතුල්කිරිම","insertAfter":"පසුව කොටුවක් ඇතුලත් ","deleteCell":"කොටුව මැකීම","merge":"කොටු එකට යාකිරිම","mergeRight":"දකුණට ","mergeDown":"පහලට ","splitHorizontal":"තිරස්ව කොටු පැතිරීම","splitVertical":"සිරස්ව කොටු පැතිරීම","title":"කොටු ","cellType":"කොටු වර්ගය","rowSpan":"පේළි පළල","colSpan":"සිරස් පළල","wordWrap":"වචන ගැලපුම","hAlign":"තිරස්ව ","vAlign":"සිරස්ව ","alignBaseline":"පාද රේඛාව","bgColor":"පසුබිම් වර්ණය","borderColor":"මායිම් ","data":"Data","header":"ශීර්ෂක","yes":"ඔව්","no":"නැත","invalidWidth":"කොටු පළල සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidHeight":"කොටු උස සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"තෝරන්න"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"සිරස් ","deleteTable":"වගුව මකන්න","headers":"ශීර්ෂක","headersBoth":"දෙකම","headersColumn":"පළමූ සිරස් තීරුව","headersNone":"කිසිවක්ම නොවේ","headersRow":"පළමූ පේළිය","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"නැවත කිරීම","undo":"වෙනස් කිරීම"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
+CKEDITOR.lang['si']={"editor":"පොහොසත් වචන සංස්කරණ","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"උදව් ලබා ගැනීමට  ALT බොත්තම ඔබන්න","browseServer":"සෙවුම් සේවාදායකය","url":"URL","protocol":"මුලාපත්‍රය","upload":"උඩුගතකිරීම","uploadSubmit":"සේවාදායකය වෙත යොමුකිරිම","image":"රුපය","flash":"දීප්තිය","form":"පෝරමය","checkbox":"ලකුණුකිරීමේ කොටුව","radio":"තේරීම් ","textField":"ලියන ප්‍රදේශය","textarea":"අකුරු ","hiddenField":"සැඟවුණු ප්‍රදේශය","button":"බොත්තම","select":"තෝරන්න ","imageButton":"රුප ","notSet":"<යොදා >","id":"අංකය","name":"නම","langDir":"භාෂා දිශාව","langDirLtr":"වමේසිට දකුණුට","langDirRtl":"දකුණේ සිට වමට","langCode":"භාෂා කේතය","longDescr":"සම්පුර්න පැහැදිලි කිරීම","cssClass":"විලාශ පත්‍ර පන්තිය","advisoryTitle":"උපදෙස් ","cssStyle":"විලාසය","ok":"නිරදි","cancel":"අවලංගු කිරීම","close":"වැසීම","preview":"නැවත ","resize":"විශාලත්වය නැවත වෙනස් කිරීම","generalTab":"පොදු කරුණු.","advancedTab":"දීය","validateNumberFailed":"මෙම වටිනාකම අංකයක් නොවේ","confirmNewPage":"ආරක්ෂා නොකළ සියලුම දත්තයන් මැකියනුලැබේ. ඔබට නව පිටුවක් ලබා ගැනීමට අවශ්‍යද?","confirmCancel":"ඇතම් විකල්පයන් වෙනස් කර ඇත. ඔබට මින් නික්මීමට අවශ්‍යද?","options":" විකල්ප","target":"අරමුණ","targetNew":"නව කව්ළුව","targetTop":"වැදගත් කව්ළුව","targetSelf":"එම කව්ළුව(_තම\\\\)","targetParent":"මව් කව්ළුව(_)","langDirLTR":"වමේසිට දකුණුට","langDirRTL":"දකුණේ සිට වමට","styles":"විලාසය","cssClasses":"විලාසපත්‍ර පන්තිය","width":"පළල","height":"උස","align":"ගැලපුම","alignLeft":"වම","alignRight":"දකුණ","alignCenter":"මධ්‍ය","alignJustify":"Justify","alignTop":"ඉ","alignMiddle":"මැද","alignBottom":"පහල","alignNone":"None","invalidValue":"වැරදී වටිනාකමකි","invalidHeight":"උස අංකයක් විය යුතුය","invalidWidth":"පළල අංකයක් විය යුතුය","invalidCssLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  CSS මිනුම් එකක(px, %, in, cm, mm, em, ex, pt, pc)","invalidHtmlLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  HTML මිනුම් එකක (px හෝ %).","invalidInlineStyle":"වටිනාකමක් නිරූපණය කිරීම  පේළි විලාසයයට ආකෘතිය  අනතර්ග විය යුතය  \"නම : වටිනාකම\", තිත් කොමාවකින් වෙන් වෙන ලද.","cssLengthTooltip":"සංක්‍යා ඇතුලත් කිරීමේදී වටිනාකම තිත් ප්‍රමාණය නිවරදි CSS  ඒකක(තිත්, %, අඟල්,සෙමි, mm, em, ex, pt, pc)","unavailable":"%1<span පන්තිය=\"ළඟා වියහැකි ද බලන්න\">, නොමැතිනම්</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"පිටපත් අයිතිය සහ පිටපත් කිරීම;$1 .සියලුම හිමිකම් ඇවිරිණි.","dlgTitle":"CKEditor ගැන විස්තර","help":"උදව් සඳහා $1 ","moreInfo":"බලපත්‍ර තොරතුරු සදහා කරුණාකර අපගේ විද්‍යුත් ලිපිනයට පිවිසෙන්න:","title":"CKEditor ගැන විස්තර","userGuide":"CKEditor භාවිතා කිරීම පිළිබඳ "},"basicstyles":{"bold":"තද අකුරින් ලියනලද","italic":"බැධීඅකුරින් ලියන ලද","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"යටින් ඉරි අදින ලද"},"bidi":{"ltr":"වගන්ති දිශාව වමේ සිට දකුණට","rtl":"වගන්ති දිශාව  දකුණේ සිට වමට"},"blockquote":{"toolbar":"උද්ධෘත කොටස"},"clipboard":{"copy":"පිටපත් කරන්න","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"කපාගන්න","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"අලවන්න","pasteArea":"අලවන ප්‍රදේශ","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"අලවන්න"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"පසුබිම් වර්ණය","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colors...","panelTitle":"වර්ණය","textColorTitle":"අක්ෂර වර්ණ"},"colordialog":{"clear":"පැහැදිලි","highlight":"මතුකර පෙන්වන්න","options":"වර්ණ විකල්ප","selected":"තෙරු වර්ණ","title":"වර්ණ තෝරන්න"},"templates":{"button":"අච්චුව","emptyListMsg":"කිසිම අච්චුවක් කලින් තීරණය කර ","insertOption":"සත්‍ය අන්තර්ගතයන් ප්‍රතිස්ථාපනය කරන්න","options":"අච්චු ","selectPromptMsg":"කරුණාකර සංස්කරණය සදහා අච්චුවක් ","title":"අන්තර්ගත් අච්චුන්"},"contextmenu":{"options":"අනතර්ග ලේඛණ  විකල්ප"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"අංකය","advisoryTitleInputLabel":"උපදේශාත්මක නාමය","cssClassInputLabel":"විලාසපත්‍ර පන්තිය","edit":"වෙනස්කිරීම","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"වමේසිට දකුණුට","langDirLabel":"භාෂා දිශාව","langDirRTLLabel":"දකුණේ සිට වමට","languageCodeInputLabel":"භාෂා ","remove":"ඉවත් කිරීම","styleSelectLabel":"විලාසය","title":"නිර්මාණය ","toolbar":"නිර්මාණය "},"toolbar":{"toolbarCollapse":"මෙවලම් තීරුව හැකුලුම.","toolbarExpand":"මෙවලම් තීරුව දීගහැරුම","toolbarGroups":{"document":"ලිපිය","clipboard":"ඇමිණුම වෙනස් කිරීම","editing":"සංස්කරණය","forms":"පෝරමය","basicstyles":"මුලික විලාසය","paragraph":"චේදය","links":"සබැඳිය","insert":"ඇතුලත් කිරීම","styles":"විලාසය","colors":"වර්ණය","tools":"මෙවලම්"},"toolbars":"සංස්කරණ මෙවලම් තීරුව"},"elementspath":{"eleLabel":"මුලද්‍රව්‍ය මාර්ගය","eleTitle":"%1 මුල"},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"හිලව් කිරීම","replaceAll":"සියල්ලම හිලව් කරන්න","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"fakeobjects":{"anchor":"ආධාරය","flash":"Flash Animation","hiddenfield":"සැඟවුණු ප්‍රදේශය","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"පිටපත් ප්‍රවේශය","accessAlways":"හැමවිටම","accessNever":"කිසිදා නොවේ","accessSameDomain":"එකම වසමේ","alignAbsBottom":"පතුල","alignAbsMiddle":"Abs ","alignBaseline":"පාද රේඛාව","alignTextTop":"වගන්තිය ඉහල","bgcolor":"පසුබිම් වර්ණය","chkFull":"පුර්ණ තිරය සදහා අවසර","chkLoop":"පුඩුව","chkMenu":"සක්‍රිය බබලන මෙනුව","chkPlay":"ස්‌වයංක්‍රිය ක්‍රියාත්මක වීම","flashvars":"වෙනස්වන දත්ත","hSpace":"HSpace","properties":"බබලන ගුණ","propertiesTab":"ගුණ","quality":"තත්වය","qualityAutoHigh":"ස්‌වයංක්‍රිය  ","qualityAutoLow":" ස්‌වයංක්‍රිය   ","qualityBest":"වඩාත් ගැලපෙන","qualityHigh":"ඉහළ","qualityLow":"පහළ","qualityMedium":"මධ්‍ය","scale":"පරිමාණ","scaleAll":"සියල්ල ","scaleFit":"හරියටම ගැලපෙන","scaleNoBorder":"මාඉම් නොමැති","title":"බබලන ","vSpace":"VSpace","validateHSpace":"HSpace සංක්‍යාවක් විය යුතුය.","validateSrc":"URL හිස් නොවිය ","validateVSpace":"VSpace සංක්‍යාවක් විය යුතුය","windowMode":"ජනෙල ක්‍රමය","windowModeOpaque":"විනිවිද පෙනෙන","windowModeTransparent":"විනිවිද පෙනෙන","windowModeWindow":"ජනෙල"},"font":{"fontSize":{"label":"විශාලත්වය","voiceLabel":"අක්ෂර විශාලත්වය","panelTitle":"අක්ෂර විශාලත්වය"},"label":"අක්ෂරය","panelTitle":"අක්ෂර නාමය","voiceLabel":"අක්ෂර"},"forms":{"button":{"title":"බොත්තම් ගුණ","text":"වගන්තිය(වටිනාකම)","type":"වර්ගය","typeBtn":"බොත්තම","typeSbm":"යොමුකරනවා","typeRst":"නැවත ආරම්භකතත්වයට පත් කරනවා"},"checkboxAndRadio":{"checkboxTitle":"ලකුණු කිරීමේ කොටුවේ ලක්ෂණ","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"පෝරමයේ ","menu":"පෝරමයේ ගුණ/","action":"ගන්නා පියවර","method":"ක්‍රමය","encoding":"කේතීකරණය"},"hidden":{"title":"සැඟවුණු ප්‍රදේශයේ ","name":"නම","value":"Value"},"select":{"title":"තේරීම් ප්‍රදේශයේ ","selectInfo":"විස්තර තෝරන්න","opAvail":"ඉතුරුවී ඇති වීකල්ප","value":"Value","size":"විශාලත්වය","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"මකා දැම්ම"},"textarea":{"title":"Textarea Properties","cols":"සිරස් ","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"නම","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"වර්ගය","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"ආකෘතිය","panelTitle":"චේදයේ ","tag_address":"ලිපිනය","tag_div":"සාමාන්‍ය(DIV)","tag_h1":"ශීර්ෂය 1","tag_h2":"ශීර්ෂය 2","tag_h3":"ශීර්ෂය 3","tag_h4":"ශීර්ෂය 4","tag_h5":"ශීර්ෂය 5","tag_h6":"ශීර්ෂය 6","tag_p":"සාමාන්‍ය","tag_pre":"ආකෘතියන්"},"horizontalrule":{"toolbar":"තිරස් රේඛාවක් ඇතුලත් කරන්න"},"iframe":{"border":"සැකිල්ලේ කඩයිම් ","noUrl":"කරුණාකර රුපයේ URL ලියන්න","scrolling":"සක්ක්‍රිය කරන්න","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"විකල්ප ","border":"සීමාවවල ","btnUpload":"සේවාදායකය වෙත යොමුකිරිම","button2Img":"ඔබට තෝරන ලද රුපය පරිවර්තනය කිරීමට අවශ්‍යද?","hSpace":"HSpace","img2Button":"ඔබට තෝරන ලද රුපය පරිවර්තනය කිරීමට අවශ්‍යද?","infoTab":"රුපයේ තොරතුරු","linkTab":"සබැඳිය","lockRatio":"නවතන අනුපාතය ","menu":"රුපයේ ගුණ","resetSize":"නැවතත් විශාලත්වය වෙනස් කිරීම","title":"රුපයේ ","titleButton":"රුප බොත්තමේ ගුණ","upload":"උඩුගතකිරීම","urlMissing":"රුප මුලාශ්‍ර URL නැත.","vSpace":"VSpace","validateBorder":"මාඉම් සම්පුර්ණ සංක්‍යාවක් විය යුතුය.","validateHSpace":"HSpace  සම්පුර්ණ සංක්‍යාවක් විය යුතුය","validateVSpace":"VSpace සම්පුර්ණ සංක්‍යාවක් විය යුතුය."},"indent":{"indent":"අතර පරතරය වැඩිකරන්න","outdent":"අතර පරතරය අඩුකරන්න"},"smiley":{"options":"හාස්‍ය විකල්ප","title":"හාස්‍යන් ඇතුලත් කිරීම","toolbar":"හාස්‍යන්"},"justify":{"block":"Justify","center":"මධ්‍ය","left":"Align Left","right":"Align Right"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"ප්‍රවේශ  යතුර","advanced":"දීය","advisoryContentType":"උපදේශාත්මක අන්තර්ගත ආකාරය","advisoryTitle":"උපදේශාත්මක නාමය","anchor":{"toolbar":"ආධාරය","menu":"ආධාරය වෙනස් කිරීම","title":"ආධාරක ","name":"ආධාරකයේ නාමය","errorName":"කරුණාකර ආධාරකයේ නාමය ඇතුල් කරන්න","remove":"ආධාරකය ඉවත් කිරීම"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"විලාසපත්‍ර පන්තිය","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"අංකය","info":"Link Info","langCode":"භාෂා කේතය","langDir":"භාෂා දිශාව","langDirLTR":"වමේසිට දකුණුට","langDirRTL":"දකුණේ සිට වමට","menu":"Edit Link","name":"නම","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"විලාසය","tabIndex":"Tab Index","target":"අරමුණ","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"සබැඳිය","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"සබැඳිය","type":"Link Type","unlink":"Unlink","upload":"උඩුගතකිරීම"},"list":{"bulletedlist":"ඇතුලත් / ඉවත් කිරීම ලඉස්තුව","numberedlist":"ඇතුලත් / ඉවත් කිරීම අන්න්කිත ලඉස්තුව"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"කිසිවක්ම නොවේ","notset":"<යොදා >","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"වර්ගය","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"චේදය ඇතුලත් කරන්න"},"maximize":{"maximize":"විශාල කිරීම","minimize":"කුඩා කිරීම"},"newpage":{"toolbar":"නව පිටුවක්"},"pagebreak":{"alt":"පිටු බිදුම","toolbar":"මුද්‍රණය සඳහා පිටු බිදුමක් ඇතුලත් කරන්න"},"pastetext":{"button":"සාමාන්‍ය අක්ෂර ලෙස අලවන්න","title":"සාමාන්‍ය අක්ෂර ලෙස අලවන්න"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"වචන වලින් අලවන්න","toolbar":"වචන වලින් අලවන්න"},"preview":{"preview":"නැවත "},"print":{"toolbar":"මුද්‍රණය කරන්න"},"removeformat":{"toolbar":"සැකසීම වෙනස් කරන්න"},"save":{"toolbar":"ආරක්ෂා කරන්න"},"selectall":{"toolbar":"සියල්ලම "},"showblocks":{"toolbar":"කොටස පෙන්නන්න"},"sourcearea":{"toolbar":"මුලාශ්‍රය"},"specialchar":{"options":"විශේෂ  ගුණාංග වීකල්ප","title":"විශේෂ  ගුණාංග ","toolbar":"විශේෂ ගුණාංග ඇතුලත් "},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"විලාසය","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"සීමාවවල විශාලත්වය","caption":"Caption","cell":{"menu":"කොටුව","insertBefore":"පෙර කොටුවක් ඇතුල්කිරිම","insertAfter":"පසුව කොටුවක් ඇතුලත් ","deleteCell":"කොටුව මැකීම","merge":"කොටු එකට යාකිරිම","mergeRight":"දකුණට ","mergeDown":"පහලට ","splitHorizontal":"තිරස්ව කොටු පැතිරීම","splitVertical":"සිරස්ව කොටු පැතිරීම","title":"කොටු ","cellType":"කොටු වර්ගය","rowSpan":"පේළි පළල","colSpan":"සිරස් පළල","wordWrap":"වචන ගැලපුම","hAlign":"තිරස්ව ","vAlign":"සිරස්ව ","alignBaseline":"පාද රේඛාව","bgColor":"පසුබිම් වර්ණය","borderColor":"මායිම් ","data":"Data","header":"ශීර්ෂක","yes":"ඔව්","no":"නැත","invalidWidth":"කොටු පළල සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidHeight":"කොටු උස සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"තෝරන්න"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"සිරස් ","deleteTable":"වගුව මකන්න","headers":"ශීර්ෂක","headersBoth":"දෙකම","headersColumn":"පළමූ සිරස් තීරුව","headersNone":"කිසිවක්ම නොවේ","headersRow":"පළමූ පේළිය","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"නැවත කිරීම","undo":"වෙනස් කිරීම"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/lang/sk.js
index 0bf8be8c341..569515773a0 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/sk.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/sk.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sk']={"editor":"Editor formátovaného textu","editorPanel":"Panel editora formátovaného textu","common":{"editorHelp":"Stlačením ALT 0 spustiť pomocníka","browseServer":"Prehliadať server","url":"URL","protocol":"Protokol","upload":"Odoslať","uploadSubmit":"Odoslať na server","image":"Obrázok","flash":"Flash","form":"Formulár","checkbox":"Zaškrtávacie pole","radio":"Prepínač","textField":"Textové pole","textarea":"Textová oblasť","hiddenField":"Skryté pole","button":"Tlačidlo","select":"Rozbaľovací zoznam","imageButton":"Obrázkové tlačidlo","notSet":"<nenastavené>","id":"Id","name":"Meno","langDir":"Orientácia jazyka","langDirLtr":"Zľava doprava (LTR)","langDirRtl":"Sprava doľava (RTL)","langCode":"Kód jazyka","longDescr":"Dlhý popis URL","cssClass":"Trieda štýlu","advisoryTitle":"Pomocný titulok","cssStyle":"Štýl","ok":"OK","cancel":"Zrušiť","close":"Zatvorit","preview":"Náhľad","resize":"Zmeniť veľkosť","generalTab":"Hlavné","advancedTab":"Rozšírené","validateNumberFailed":"Hodnota nie je číslo.","confirmNewPage":"Prajete si načítat novú stránku? Všetky neuložené zmeny budú stratené. ","confirmCancel":"Niektore možnosti boli zmenené. Naozaj chcete zavrieť okno?","options":"Možnosti","target":"Cieľ","targetNew":"Nové okno (_blank)","targetTop":"Najvrchnejšie okno (_top)","targetSelf":"To isté okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zľava doprava (LTR)","langDirRTL":"Sprava doľava (RTL)","styles":"Štýl","cssClasses":"Triedy štýlu","width":"Šírka","height":"Výška","align":"Zarovnanie","alignLeft":"Vľavo","alignRight":"Vpravo","alignCenter":"Na stred","alignJustify":"Zarovnať do bloku","alignTop":"Nahor","alignMiddle":"Na stred","alignBottom":"Dole","alignNone":"Žiadne","invalidValue":"Neplatná hodnota.","invalidHeight":"Výška musí byť číslo.","invalidWidth":"Šírka musí byť číslo.","invalidCssLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej CSS mernej jednotky (px, %, in, cm, mm, em, ex, pt alebo pc).","invalidHtmlLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej HTML mernej jednotky (px alebo %).","invalidInlineStyle":"Zadaná hodnota pre inline štýl musí pozostávať s jedného, alebo viac dvojíc formátu \"názov: hodnota\", oddelených bodkočiarkou.","cssLengthTooltip":"Vložte číslo pre hodnotu v pixeloch alebo číslo so správnou CSS jednotou (px, %, in, cm, mm, em, ex, pt alebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupný</span>"},"about":{"copy":"Copyright &copy; $1. Všetky práva vyhradené.","dlgTitle":"O CKEditor-e","help":"Zaškrtnite $1 pre pomoc.","moreInfo":"Pre informácie o licenciách, prosíme, navštívte našu web stránku:","title":"O CKEditor-e","userGuide":"Používateľská príručka KCEditor-a"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Prečiarknuté","subscript":"Dolný index","superscript":"Horný index","underline":"Podčiarknuté"},"bidi":{"ltr":"Smer textu zľava doprava","rtl":"Smer textu sprava doľava"},"blockquote":{"toolbar":"Citácia"},"clipboard":{"copy":"Kopírovať","copyError":"Bezpečnostné nastavenia vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu kopírovania. Použite na to klávesnicu (Ctrl/Cmd+C).","cut":"Vystrihnúť","cutError":"Bezpečnostné nastavenia vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu vystrihnutia. Použite na to klávesnicu (Ctrl/Cmd+X).","paste":"Vložiť","pasteArea":"Miesto na vloženie","pasteMsg":"Použitím klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) vložte text do rámčeka a stlačte OK.","securityMsg":"Kvôli bezpečnostným nastaveniam vášho prehliadača editor nemôže pristupovať k schránke na kopírovanie priamo. Vložte to preto do tohto okna.","title":"Vložiť"},"button":{"selectedLabel":"%1 (Vybrané)"},"colorbutton":{"auto":"Automaticky","bgColorTitle":"Farba pozadia","colors":{"000":"Čierna","800000":"Gaštanová","8B4513":"Sedlová hnedá","2F4F4F":"Tmavo bridlicovo sivá","008080":"Modrozelená","000080":"Tmavomodrá","4B0082":"Indigo","696969":"Tmavá sivá","B22222":"Ohňová tehlová","A52A2A":"Hnedá","DAA520":"Zlatobyľ","006400":"Tmavá zelená","40E0D0":"Tyrkysová","0000CD":"Stredná modrá","800080":"Purpurová","808080":"Sivá","F00":"Červená","FF8C00":"Tmavá oranžová","FFD700":"Zlatá","008000":"Zelená","0FF":"Azúrová","00F":"Modrá","EE82EE":"Fialová","A9A9A9":"Tmavá sivá","FFA07A":"Svetlá lososová","FFA500":"Oranžová","FFFF00":"Žltá","00FF00":"Vápenná","AFEEEE":"Svetlá tyrkysová","ADD8E6":"Svetlá modrá","DDA0DD":"Slivková","D3D3D3":"Svetlá sivá","FFF0F5":"Levanduľovo červená","FAEBD7":"Antická biela","FFFFE0":"Svetlá žltá","F0FFF0":"Medová","F0FFFF":"Azúrová","F0F8FF":"Alicovo modrá","E6E6FA":"Levanduľová","FFF":"Biela"},"more":"Viac farieb...","panelTitle":"Farby","textColorTitle":"Farba textu"},"colordialog":{"clear":"Vyčistiť","highlight":"Zvýrazniť","options":"Možnosti farby","selected":"Vybraná farba","title":"Vybrať farbu"},"templates":{"button":"Šablóny","emptyListMsg":"(Žiadne šablóny nedefinované)","insertOption":"Nahradiť aktuálny obsah","options":"Možnosti šablóny","selectPromptMsg":"Prosím vyberte šablónu na otvorenie v editore","title":"Šablóny obsahu"},"contextmenu":{"options":"Možnosti kontextového menu"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Pomocný titulok","cssClassInputLabel":"Triedy štýlu","edit":"Upraviť Div","inlineStyleInputLabel":"Inline štýl","langDirLTRLabel":"Zľava doprava (LTR)","langDirLabel":"Smer jazyka","langDirRTLLabel":"Zprava doľava (RTL)","languageCodeInputLabel":"Kód jazyka","remove":"Odstrániť Div","styleSelectLabel":"Štýl","title":"Vytvoriť Div kontajner","toolbar":"Vytvoriť Div kontajner"},"toolbar":{"toolbarCollapse":"Zbaliť lištu nástrojov","toolbarExpand":"Rozbaliť lištu nástrojov","toolbarGroups":{"document":"Dokument","clipboard":"Schránka pre kopírovanie/Späť","editing":"Upravovanie","forms":"Formuláre","basicstyles":"Základné štýly","paragraph":"Odsek","links":"Odkazy","insert":"Vložiť","styles":"Štýly","colors":"Farby","tools":"Nástroje"},"toolbars":"Lišty nástrojov editora"},"elementspath":{"eleLabel":"Cesta prvkov","eleTitle":"%1 prvok"},"find":{"find":"Vyhľadať","findOptions":"Možnosti vyhľadávania","findWhat":"Čo hľadať:","matchCase":"Rozlišovať malé a veľké písmená","matchCyclic":"Po dosiahnutí konca pokračovať od začiatku","matchWord":"Len celé slová","notFoundMsg":"Hľadaný text nebol nájdený.","replace":"Nahradiť","replaceAll":"Nahradiť všetko","replaceSuccessMsg":"%1 výskyt(ov) nahradených.","replaceWith":"Čím nahradiť:","title":"Vyhľadať a nahradiť"},"fakeobjects":{"anchor":"Kotva","flash":"Flash animácia","hiddenfield":"Skryté pole","iframe":"IFrame","unknown":"Neznámy objekt"},"flash":{"access":"Prístup skriptu","accessAlways":"Vždy","accessNever":"Nikdy","accessSameDomain":"Rovnaká doména","alignAbsBottom":"Úplne dole","alignAbsMiddle":"Do stredu","alignBaseline":"Na základnú čiaru","alignTextTop":"Na horný okraj textu","bgcolor":"Farba pozadia","chkFull":"Povoliť zobrazenie na celú obrazovku (fullscreen)","chkLoop":"Opakovanie","chkMenu":"Povoliť Flash Menu","chkPlay":"Automatické prehrávanie","flashvars":"Premenné pre Flash","hSpace":"H-medzera","properties":"Vlastnosti Flashu","propertiesTab":"Vlastnosti","quality":"Kvalita","qualityAutoHigh":"Automaticky vysoká","qualityAutoLow":"Automaticky nízka","qualityBest":"Najlepšia","qualityHigh":"Vysoká","qualityLow":"Nízka","qualityMedium":"Stredná","scale":"Mierka","scaleAll":"Zobraziť všetko","scaleFit":"Roztiahnuť, aby sedelo presne","scaleNoBorder":"Bez okrajov","title":"Vlastnosti Flashu","vSpace":"V-medzera","validateHSpace":"H-medzera musí byť číslo.","validateSrc":"URL nesmie byť prázdne.","validateVSpace":"V-medzera musí byť číslo","windowMode":"Mód okna","windowModeOpaque":"Nepriehľadný","windowModeTransparent":"Priehľadný","windowModeWindow":"Okno"},"font":{"fontSize":{"label":"Veľkosť","voiceLabel":"Veľkosť písma","panelTitle":"Veľkosť písma"},"label":"Písmo","panelTitle":"Názov písma","voiceLabel":"Písmo"},"forms":{"button":{"title":"Vlastnosti tlačidla","text":"Text (Hodnota)","type":"Typ","typeBtn":"Tlačidlo","typeSbm":"Odoslať","typeRst":"Resetovať"},"checkboxAndRadio":{"checkboxTitle":"Vlastnosti zaškrtávacieho políčka","radioTitle":"Vlastnosti prepínača (radio button)","value":"Hodnota","selected":"Vybrané (selected)","required":"Required"},"form":{"title":"Vlastnosti formulára","menu":"Vlastnosti formulára","action":"Akcia (action)","method":"Metóda (method)","encoding":"Kódovanie (encoding)"},"hidden":{"title":"Vlastnosti skrytého poľa","name":"Názov (name)","value":"Hodnota"},"select":{"title":"Vlastnosti rozbaľovacieho zoznamu","selectInfo":"Informácie o výbere","opAvail":"Dostupné možnosti","value":"Hodnota","size":"Veľkosť","lines":"riadkov","chkMulti":"Povoliť viacnásobný výber","required":"Required","opText":"Text","opValue":"Hodnota","btnAdd":"Pridať","btnModify":"Upraviť","btnUp":"Hore","btnDown":"Dole","btnSetValue":"Nastaviť ako vybranú hodnotu","btnDelete":"Vymazať"},"textarea":{"title":"Vlastnosti textovej oblasti (textarea)","cols":"Stĺpcov","rows":"Riadkov"},"textfield":{"title":"Vlastnosti textového poľa","name":"Názov (name)","value":"Hodnota","charWidth":"Šírka poľa (podľa znakov)","maxChars":"Maximálny počet znakov","required":"Required","type":"Typ","typeText":"Text","typePass":"Heslo","typeEmail":"Email","typeSearch":"Hľadať","typeTel":"Telefónne číslo","typeUrl":"URL"}},"format":{"label":"Formát","panelTitle":"Odsek","tag_address":"Adresa","tag_div":"Normálny (DIV)","tag_h1":"Nadpis 1","tag_h2":"Nadpis 2","tag_h3":"Nadpis 3","tag_h4":"Nadpis 4","tag_h5":"Nadpis 5","tag_h6":"Nadpis 6","tag_p":"Normálny","tag_pre":"Formátovaný"},"horizontalrule":{"toolbar":"Vložiť vodorovnú čiaru"},"iframe":{"border":"Zobraziť rám frame-u","noUrl":"Prosím, vložte URL iframe","scrolling":"Povoliť skrolovanie","title":"Vlastnosti IFrame","toolbar":"IFrame"},"image":{"alt":"Alternatívny text","border":"Rám (border)","btnUpload":"Odoslať to na server","button2Img":"Chcete zmeniť vybrané obrázkové tlačidlo na jednoduchý obrázok?","hSpace":"H-medzera","img2Button":"Chcete zmeniť vybraný obrázok na obrázkové tlačidlo?","infoTab":"Informácie o obrázku","linkTab":"Odkaz","lockRatio":"Pomer zámky","menu":"Vlastnosti obrázka","resetSize":"Pôvodná veľkosť","title":"Vlastnosti obrázka","titleButton":"Vlastnosti obrázkového tlačidla","upload":"Nahrať","urlMissing":"Chýba URL zdroja obrázka.","vSpace":"V-medzera","validateBorder":"Rám (border) musí byť celé číslo.","validateHSpace":"H-medzera musí byť celé číslo.","validateVSpace":"V-medzera musí byť celé číslo."},"indent":{"indent":"Zväčšiť odsadenie","outdent":"Zmenšiť odsadenie"},"smiley":{"options":"Možnosti smajlíkov","title":"Vložiť smajlíka","toolbar":"Smajlíky"},"justify":{"block":"Zarovnať do bloku","center":"Zarovnať na stred","left":"Zarovnať vľavo","right":"Zarovnať vpravo"},"language":{"button":"Nastaviť jazyk","remove":"Odstrániť jazyk"},"link":{"acccessKey":"Prístupový kľúč","advanced":"Rozšírené","advisoryContentType":"Pomocný typ obsahu","advisoryTitle":"Pomocný titulok","anchor":{"toolbar":"Kotva","menu":"Upraviť kotvu","title":"Vlastnosti kotvy","name":"Názov kotvy","errorName":"Zadajte prosím názov kotvy","remove":"Odstrániť kotvu"},"anchorId":"Podľa Id objektu","anchorName":"Podľa mena kotvy","charset":"Priradená znaková sada","cssClasses":"Triedy štýlu","emailAddress":"E-Mailová adresa","emailBody":"Telo správy","emailSubject":"Predmet správy","id":"Id","info":"Informácie o odkaze","langCode":"Orientácia jazyka","langDir":"Orientácia jazyka","langDirLTR":"Zľava doprava (LTR)","langDirRTL":"Sprava doľava (RTL)","menu":"Upraviť odkaz","name":"Názov","noAnchors":"(V dokumente nie sú dostupné žiadne kotvy)","noEmail":"Zadajte prosím e-mailovú adresu","noUrl":"Zadajte prosím URL odkazu","other":"<iný>","popupDependent":"Závislosť (Netscape)","popupFeatures":"Vlastnosti vyskakovacieho okna","popupFullScreen":"Celá obrazovka (IE)","popupLeft":"Ľavý okraj","popupLocationBar":"Panel umiestnenia (location bar)","popupMenuBar":"Panel ponuky (menu bar)","popupResizable":"Meniteľná veľkosť (resizable)","popupScrollBars":"Posuvníky (scroll bars)","popupStatusBar":"Stavový riadok (status bar)","popupToolbar":"Panel nástrojov (toolbar)","popupTop":"Horný okraj","rel":"Vzťah (rel)","selectAnchor":"Vybrať kotvu","styles":"Štýl","tabIndex":"Poradie prvku (tab index)","target":"Cieľ","targetFrame":"<rámec>","targetFrameName":"Názov rámu cieľa","targetPopup":"<vyskakovacie okno>","targetPopupName":"Názov vyskakovacieho okna","title":"Odkaz","toAnchor":"Odkaz na kotvu v texte","toEmail":"E-mail","toUrl":"URL","toolbar":"Odkaz","type":"Typ odkazu","unlink":"Odstrániť odkaz","upload":"Nahrať"},"list":{"bulletedlist":"Vložiť/odstrániť zoznam s odrážkami","numberedlist":"Vložiť/odstrániť číslovaný zoznam"},"liststyle":{"armenian":"Arménske číslovanie","bulletedTitle":"Vlastnosti odrážkového zoznamu","circle":"Kruh","decimal":"Číselné (1, 2, 3, atď.)","decimalLeadingZero":"Číselné s nulou (01, 02, 03, atď.)","disc":"Disk","georgian":"Gruzínske číslovanie (an, ban, gan, atď.)","lowerAlpha":"Malé latinské (a, b, c, d, e, atď.)","lowerGreek":"Malé grécke (alfa, beta, gama, atď.)","lowerRoman":"Malé rímske (i, ii, iii, iv, v, atď.)","none":"Nič","notset":"<nenastavené>","numberedTitle":"Vlastnosti číselného zoznamu","square":"Štvorec","start":"Začiatok","type":"Typ","upperAlpha":"Veľké latinské (A, B, C, D, E, atď.)","upperRoman":"Veľké rímske (I, II, III, IV, V, atď.)","validateStartNumber":"Začiatočné číslo číselného zoznamu musí byť celé číslo."},"magicline":{"title":"Odsek vložiť sem"},"maximize":{"maximize":"Maximalizovať","minimize":"Minimalizovať"},"newpage":{"toolbar":"Nová stránka"},"pagebreak":{"alt":"Zalomenie strany","toolbar":"Vložiť oddeľovač stránky pre tlač"},"pastetext":{"button":"Vložiť ako čistý text","title":"Vložiť ako čistý text"},"pastefromword":{"confirmCleanup":"Zdá sa, že vkladaný text pochádza z programu MS Word. Chcete ho pred vkladaním automaticky vyčistiť?","error":"Kvôli internej chybe nebolo možné vložené dáta vyčistiť","title":"Vložiť z Wordu","toolbar":"Vložiť z Wordu"},"preview":{"preview":"Náhľad"},"print":{"toolbar":"Tlač"},"removeformat":{"toolbar":"Odstrániť formátovanie"},"save":{"toolbar":"Uložiť"},"selectall":{"toolbar":"Vybrať všetko"},"showblocks":{"toolbar":"Ukázať bloky"},"sourcearea":{"toolbar":"Zdroj"},"specialchar":{"options":"Možnosti špeciálneho znaku","title":"Výber špeciálneho znaku","toolbar":"Vložiť špeciálny znak"},"scayt":{"btn_about":"O KPPP (Kontrola pravopisu počas písania)","btn_dictionaries":"Slovníky","btn_disable":"Zakázať  KPPP (Kontrola pravopisu počas písania)","btn_enable":"Povoliť KPPP (Kontrola pravopisu počas písania)","btn_langs":"Jazyky","btn_options":"Možnosti","text_title":"Kontrola pravopisu počas písania"},"stylescombo":{"label":"Štýly","panelTitle":"Formátovanie štýlov","panelTitle1":"Štýly bloku","panelTitle2":"Vnútroriadkové (inline) štýly","panelTitle3":"Štýly objeku"},"table":{"border":"Šírka orámovania","caption":"Popis","cell":{"menu":"Bunka","insertBefore":"Vložiť bunku pred","insertAfter":"Vložiť bunku za","deleteCell":"Vymazať bunky","merge":"Zlúčiť bunky","mergeRight":"Zlúčiť doprava","mergeDown":"Zlúčiť dole","splitHorizontal":"Rozdeliť bunky horizontálne","splitVertical":"Rozdeliť bunky vertikálne","title":"Vlastnosti bunky","cellType":"Typ bunky","rowSpan":"Rozsah riadkov","colSpan":"Rozsah stĺpcov","wordWrap":"Zalamovanie riadkov","hAlign":"Horizontálne zarovnanie","vAlign":"Vertikálne zarovnanie","alignBaseline":"Základná čiara (baseline)","bgColor":"Farba pozadia","borderColor":"Farba orámovania","data":"Dáta","header":"Hlavička","yes":"Áno","no":"Nie","invalidWidth":"Šírka bunky musí byť číslo.","invalidHeight":"Výška bunky musí byť číslo.","invalidRowSpan":"Rozsah riadkov musí byť celé číslo.","invalidColSpan":"Rozsah stĺpcov musí byť celé číslo.","chooseColor":"Vybrať"},"cellPad":"Odsadenie obsahu (cell padding)","cellSpace":"Vzdialenosť buniek (cell spacing)","column":{"menu":"Stĺpec","insertBefore":"Vložiť stĺpec pred","insertAfter":"Vložiť stĺpec po","deleteColumn":"Zmazať stĺpce"},"columns":"Stĺpce","deleteTable":"Vymazať tabuľku","headers":"Hlavička","headersBoth":"Obe","headersColumn":"Prvý stĺpec","headersNone":"Žiadne","headersRow":"Prvý riadok","invalidBorder":"Šírka orámovania musí byť číslo.","invalidCellPadding":"Odsadenie v bunkách (cell padding) musí byť kladné číslo.","invalidCellSpacing":"Medzera mädzi bunkami (cell spacing) musí byť kladné číslo.","invalidCols":"Počet stĺpcov musí byť číslo väčšie ako 0.","invalidHeight":"Výška tabuľky musí byť číslo.","invalidRows":"Počet riadkov musí byť číslo väčšie ako 0.","invalidWidth":"Širka tabuľky musí byť číslo.","menu":"Vlastnosti tabuľky","row":{"menu":"Riadok","insertBefore":"Vložiť riadok pred","insertAfter":"Vložiť riadok po","deleteRow":"Vymazať riadky"},"rows":"Riadky","summary":"Prehľad","title":"Vlastnosti tabuľky","toolbar":"Tabuľka","widthPc":"percent","widthPx":"pixelov","widthUnit":"jednotka šírky"},"undo":{"redo":"Znovu","undo":"Späť"},"wsc":{"btnIgnore":"Ignorovať","btnIgnoreAll":"Ignorovať všetko","btnReplace":"Prepísat","btnReplaceAll":"Prepísat všetko","btnUndo":"Späť","changeTo":"Zmeniť na","errorLoading":"Chyba pri načítaní slovníka z adresy: %s.","ieSpellDownload":"Kontrola pravopisu nie je naištalovaná. Chcete ju teraz stiahnuť?","manyChanges":"Kontrola pravopisu dokončená: Bolo zmenených %1 slov","noChanges":"Kontrola pravopisu dokončená: Neboli zmenené žiadne slová","noMispell":"Kontrola pravopisu dokončená: Neboli nájdené žiadne chyby pravopisu","noSuggestions":"- Žiadny návrh -","notAvailable":"Prepáčte, ale služba je momentálne nedostupná.","notInDic":"Nie je v slovníku","oneChange":"Kontrola pravopisu dokončená: Bolo zmenené jedno slovo","progress":"Prebieha kontrola pravopisu...","title":"Skontrolovať pravopis","toolbar":"Kontrola pravopisu"}};
\ No newline at end of file
+CKEDITOR.lang['sk']={"editor":"Editor formátovaného textu","editorPanel":"Panel editora formátovaného textu","common":{"editorHelp":"Stlačením ALT 0 spustiť pomocníka","browseServer":"Prehliadať server","url":"URL","protocol":"Protokol","upload":"Odoslať","uploadSubmit":"Odoslať na server","image":"Obrázok","flash":"Flash","form":"Formulár","checkbox":"Zaškrtávacie pole","radio":"Prepínač","textField":"Textové pole","textarea":"Textová oblasť","hiddenField":"Skryté pole","button":"Tlačidlo","select":"Rozbaľovací zoznam","imageButton":"Obrázkové tlačidlo","notSet":"<nenastavené>","id":"Id","name":"Meno","langDir":"Orientácia jazyka","langDirLtr":"Zľava doprava (LTR)","langDirRtl":"Sprava doľava (RTL)","langCode":"Kód jazyka","longDescr":"Dlhý popis URL","cssClass":"Trieda štýlu","advisoryTitle":"Pomocný titulok","cssStyle":"Štýl","ok":"OK","cancel":"Zrušiť","close":"Zatvorit","preview":"Náhľad","resize":"Zmeniť veľkosť","generalTab":"Hlavné","advancedTab":"Rozšírené","validateNumberFailed":"Hodnota nie je číslo.","confirmNewPage":"Prajete si načítat novú stránku? Všetky neuložené zmeny budú stratené. ","confirmCancel":"Niektore možnosti boli zmenené. Naozaj chcete zavrieť okno?","options":"Možnosti","target":"Cieľ","targetNew":"Nové okno (_blank)","targetTop":"Najvrchnejšie okno (_top)","targetSelf":"To isté okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zľava doprava (LTR)","langDirRTL":"Sprava doľava (RTL)","styles":"Štýl","cssClasses":"Triedy štýlu","width":"Šírka","height":"Výška","align":"Zarovnanie","alignLeft":"Vľavo","alignRight":"Vpravo","alignCenter":"Na stred","alignJustify":"Zarovnať do bloku","alignTop":"Nahor","alignMiddle":"Na stred","alignBottom":"Dole","alignNone":"Žiadne","invalidValue":"Neplatná hodnota.","invalidHeight":"Výška musí byť číslo.","invalidWidth":"Šírka musí byť číslo.","invalidCssLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej CSS mernej jednotky (px, %, in, cm, mm, em, ex, pt alebo pc).","invalidHtmlLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej HTML mernej jednotky (px alebo %).","invalidInlineStyle":"Zadaná hodnota pre inline štýl musí pozostávať s jedného, alebo viac dvojíc formátu \"názov: hodnota\", oddelených bodkočiarkou.","cssLengthTooltip":"Vložte číslo pre hodnotu v pixeloch alebo číslo so správnou CSS jednotou (px, %, in, cm, mm, em, ex, pt alebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupný</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Medzerník","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Klávesová skratka"},"about":{"copy":"Copyright &copy; $1. Všetky práva vyhradené.","dlgTitle":"O CKEditor-e","help":"Zaškrtnite $1 pre pomoc.","moreInfo":"Pre informácie o licenciách, prosíme, navštívte našu web stránku:","title":"O CKEditor-e","userGuide":"Používateľská príručka KCEditor-a"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Prečiarknuté","subscript":"Dolný index","superscript":"Horný index","underline":"Podčiarknuté"},"bidi":{"ltr":"Smer textu zľava doprava","rtl":"Smer textu sprava doľava"},"blockquote":{"toolbar":"Citácia"},"clipboard":{"copy":"Kopírovať","copyError":"Bezpečnostné nastavenia vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu kopírovania. Použite na to klávesnicu (Ctrl/Cmd+C).","cut":"Vystrihnúť","cutError":"Bezpečnostné nastavenia vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu vystrihnutia. Použite na to klávesnicu (Ctrl/Cmd+X).","paste":"Vložiť","pasteArea":"Miesto na vloženie","pasteMsg":"Použitím klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) vložte text do rámčeka a stlačte OK.","securityMsg":"Kvôli bezpečnostným nastaveniam vášho prehliadača editor nemôže pristupovať k schránke na kopírovanie priamo. Vložte to preto do tohto okna.","title":"Vložiť"},"button":{"selectedLabel":"%1 (Vybrané)"},"colorbutton":{"auto":"Automaticky","bgColorTitle":"Farba pozadia","colors":{"000":"Čierna","800000":"Gaštanová","8B4513":"Sedlová hnedá","2F4F4F":"Tmavo bridlicovo sivá","008080":"Modrozelená","000080":"Tmavomodrá","4B0082":"Indigo","696969":"Tmavá sivá","B22222":"Ohňová tehlová","A52A2A":"Hnedá","DAA520":"Zlatobyľ","006400":"Tmavá zelená","40E0D0":"Tyrkysová","0000CD":"Stredná modrá","800080":"Purpurová","808080":"Sivá","F00":"Červená","FF8C00":"Tmavá oranžová","FFD700":"Zlatá","008000":"Zelená","0FF":"Azúrová","00F":"Modrá","EE82EE":"Fialová","A9A9A9":"Tmavá sivá","FFA07A":"Svetlá lososová","FFA500":"Oranžová","FFFF00":"Žltá","00FF00":"Vápenná","AFEEEE":"Svetlá tyrkysová","ADD8E6":"Svetlá modrá","DDA0DD":"Slivková","D3D3D3":"Svetlá sivá","FFF0F5":"Levanduľovo červená","FAEBD7":"Antická biela","FFFFE0":"Svetlá žltá","F0FFF0":"Medová","F0FFFF":"Azúrová","F0F8FF":"Alicovo modrá","E6E6FA":"Levanduľová","FFF":"Biela","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Viac farieb...","panelTitle":"Farby","textColorTitle":"Farba textu"},"colordialog":{"clear":"Vyčistiť","highlight":"Zvýrazniť","options":"Možnosti farby","selected":"Vybraná farba","title":"Vybrať farbu"},"templates":{"button":"Šablóny","emptyListMsg":"(Žiadne šablóny nedefinované)","insertOption":"Nahradiť aktuálny obsah","options":"Možnosti šablóny","selectPromptMsg":"Prosím vyberte šablónu na otvorenie v editore","title":"Šablóny obsahu"},"contextmenu":{"options":"Možnosti kontextového menu"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Pomocný titulok","cssClassInputLabel":"Triedy štýlu","edit":"Upraviť Div","inlineStyleInputLabel":"Inline štýl","langDirLTRLabel":"Zľava doprava (LTR)","langDirLabel":"Smer jazyka","langDirRTLLabel":"Zprava doľava (RTL)","languageCodeInputLabel":"Kód jazyka","remove":"Odstrániť Div","styleSelectLabel":"Štýl","title":"Vytvoriť Div kontajner","toolbar":"Vytvoriť Div kontajner"},"toolbar":{"toolbarCollapse":"Zbaliť lištu nástrojov","toolbarExpand":"Rozbaliť lištu nástrojov","toolbarGroups":{"document":"Dokument","clipboard":"Schránka pre kopírovanie/Späť","editing":"Upravovanie","forms":"Formuláre","basicstyles":"Základné štýly","paragraph":"Odsek","links":"Odkazy","insert":"Vložiť","styles":"Štýly","colors":"Farby","tools":"Nástroje"},"toolbars":"Lišty nástrojov editora"},"elementspath":{"eleLabel":"Cesta prvkov","eleTitle":"%1 prvok"},"find":{"find":"Vyhľadať","findOptions":"Možnosti vyhľadávania","findWhat":"Čo hľadať:","matchCase":"Rozlišovať malé a veľké písmená","matchCyclic":"Po dosiahnutí konca pokračovať od začiatku","matchWord":"Len celé slová","notFoundMsg":"Hľadaný text nebol nájdený.","replace":"Nahradiť","replaceAll":"Nahradiť všetko","replaceSuccessMsg":"%1 výskyt(ov) nahradených.","replaceWith":"Čím nahradiť:","title":"Vyhľadať a nahradiť"},"fakeobjects":{"anchor":"Kotva","flash":"Flash animácia","hiddenfield":"Skryté pole","iframe":"IFrame","unknown":"Neznámy objekt"},"flash":{"access":"Prístup skriptu","accessAlways":"Vždy","accessNever":"Nikdy","accessSameDomain":"Rovnaká doména","alignAbsBottom":"Úplne dole","alignAbsMiddle":"Do stredu","alignBaseline":"Na základnú čiaru","alignTextTop":"Na horný okraj textu","bgcolor":"Farba pozadia","chkFull":"Povoliť zobrazenie na celú obrazovku (fullscreen)","chkLoop":"Opakovanie","chkMenu":"Povoliť Flash Menu","chkPlay":"Automatické prehrávanie","flashvars":"Premenné pre Flash","hSpace":"H-medzera","properties":"Vlastnosti Flashu","propertiesTab":"Vlastnosti","quality":"Kvalita","qualityAutoHigh":"Automaticky vysoká","qualityAutoLow":"Automaticky nízka","qualityBest":"Najlepšia","qualityHigh":"Vysoká","qualityLow":"Nízka","qualityMedium":"Stredná","scale":"Mierka","scaleAll":"Zobraziť všetko","scaleFit":"Roztiahnuť, aby sedelo presne","scaleNoBorder":"Bez okrajov","title":"Vlastnosti Flashu","vSpace":"V-medzera","validateHSpace":"H-medzera musí byť číslo.","validateSrc":"URL nesmie byť prázdne.","validateVSpace":"V-medzera musí byť číslo","windowMode":"Mód okna","windowModeOpaque":"Nepriehľadný","windowModeTransparent":"Priehľadný","windowModeWindow":"Okno"},"font":{"fontSize":{"label":"Veľkosť","voiceLabel":"Veľkosť písma","panelTitle":"Veľkosť písma"},"label":"Písmo","panelTitle":"Názov písma","voiceLabel":"Písmo"},"forms":{"button":{"title":"Vlastnosti tlačidla","text":"Text (Hodnota)","type":"Typ","typeBtn":"Tlačidlo","typeSbm":"Odoslať","typeRst":"Resetovať"},"checkboxAndRadio":{"checkboxTitle":"Vlastnosti zaškrtávacieho políčka","radioTitle":"Vlastnosti prepínača (radio button)","value":"Hodnota","selected":"Vybrané (selected)","required":"Required"},"form":{"title":"Vlastnosti formulára","menu":"Vlastnosti formulára","action":"Akcia (action)","method":"Metóda (method)","encoding":"Kódovanie (encoding)"},"hidden":{"title":"Vlastnosti skrytého poľa","name":"Názov (name)","value":"Hodnota"},"select":{"title":"Vlastnosti rozbaľovacieho zoznamu","selectInfo":"Informácie o výbere","opAvail":"Dostupné možnosti","value":"Hodnota","size":"Veľkosť","lines":"riadkov","chkMulti":"Povoliť viacnásobný výber","required":"Required","opText":"Text","opValue":"Hodnota","btnAdd":"Pridať","btnModify":"Upraviť","btnUp":"Hore","btnDown":"Dole","btnSetValue":"Nastaviť ako vybranú hodnotu","btnDelete":"Vymazať"},"textarea":{"title":"Vlastnosti textovej oblasti (textarea)","cols":"Stĺpcov","rows":"Riadkov"},"textfield":{"title":"Vlastnosti textového poľa","name":"Názov (name)","value":"Hodnota","charWidth":"Šírka poľa (podľa znakov)","maxChars":"Maximálny počet znakov","required":"Required","type":"Typ","typeText":"Text","typePass":"Heslo","typeEmail":"Email","typeSearch":"Hľadať","typeTel":"Telefónne číslo","typeUrl":"URL"}},"format":{"label":"Formát","panelTitle":"Odsek","tag_address":"Adresa","tag_div":"Normálny (DIV)","tag_h1":"Nadpis 1","tag_h2":"Nadpis 2","tag_h3":"Nadpis 3","tag_h4":"Nadpis 4","tag_h5":"Nadpis 5","tag_h6":"Nadpis 6","tag_p":"Normálny","tag_pre":"Formátovaný"},"horizontalrule":{"toolbar":"Vložiť vodorovnú čiaru"},"iframe":{"border":"Zobraziť rám frame-u","noUrl":"Prosím, vložte URL iframe","scrolling":"Povoliť skrolovanie","title":"Vlastnosti IFrame","toolbar":"IFrame"},"image":{"alt":"Alternatívny text","border":"Rám (border)","btnUpload":"Odoslať to na server","button2Img":"Chcete zmeniť vybrané obrázkové tlačidlo na jednoduchý obrázok?","hSpace":"H-medzera","img2Button":"Chcete zmeniť vybraný obrázok na obrázkové tlačidlo?","infoTab":"Informácie o obrázku","linkTab":"Odkaz","lockRatio":"Pomer zámky","menu":"Vlastnosti obrázka","resetSize":"Pôvodná veľkosť","title":"Vlastnosti obrázka","titleButton":"Vlastnosti obrázkového tlačidla","upload":"Nahrať","urlMissing":"Chýba URL zdroja obrázka.","vSpace":"V-medzera","validateBorder":"Rám (border) musí byť celé číslo.","validateHSpace":"H-medzera musí byť celé číslo.","validateVSpace":"V-medzera musí byť celé číslo."},"indent":{"indent":"Zväčšiť odsadenie","outdent":"Zmenšiť odsadenie"},"smiley":{"options":"Možnosti smajlíkov","title":"Vložiť smajlíka","toolbar":"Smajlíky"},"justify":{"block":"Zarovnať do bloku","center":"Zarovnať na stred","left":"Zarovnať vľavo","right":"Zarovnať vpravo"},"language":{"button":"Nastaviť jazyk","remove":"Odstrániť jazyk"},"link":{"acccessKey":"Prístupový kľúč","advanced":"Rozšírené","advisoryContentType":"Pomocný typ obsahu","advisoryTitle":"Pomocný titulok","anchor":{"toolbar":"Kotva","menu":"Upraviť kotvu","title":"Vlastnosti kotvy","name":"Názov kotvy","errorName":"Zadajte prosím názov kotvy","remove":"Odstrániť kotvu"},"anchorId":"Podľa Id objektu","anchorName":"Podľa mena kotvy","charset":"Priradená znaková sada","cssClasses":"Triedy štýlu","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mailová adresa","emailBody":"Telo správy","emailSubject":"Predmet správy","id":"Id","info":"Informácie o odkaze","langCode":"Orientácia jazyka","langDir":"Orientácia jazyka","langDirLTR":"Zľava doprava (LTR)","langDirRTL":"Sprava doľava (RTL)","menu":"Upraviť odkaz","name":"Názov","noAnchors":"(V dokumente nie sú dostupné žiadne kotvy)","noEmail":"Zadajte prosím e-mailovú adresu","noUrl":"Zadajte prosím URL odkazu","other":"<iný>","popupDependent":"Závislosť (Netscape)","popupFeatures":"Vlastnosti vyskakovacieho okna","popupFullScreen":"Celá obrazovka (IE)","popupLeft":"Ľavý okraj","popupLocationBar":"Panel umiestnenia (location bar)","popupMenuBar":"Panel ponuky (menu bar)","popupResizable":"Meniteľná veľkosť (resizable)","popupScrollBars":"Posuvníky (scroll bars)","popupStatusBar":"Stavový riadok (status bar)","popupToolbar":"Panel nástrojov (toolbar)","popupTop":"Horný okraj","rel":"Vzťah (rel)","selectAnchor":"Vybrať kotvu","styles":"Štýl","tabIndex":"Poradie prvku (tab index)","target":"Cieľ","targetFrame":"<rámec>","targetFrameName":"Názov rámu cieľa","targetPopup":"<vyskakovacie okno>","targetPopupName":"Názov vyskakovacieho okna","title":"Odkaz","toAnchor":"Odkaz na kotvu v texte","toEmail":"E-mail","toUrl":"URL","toolbar":"Odkaz","type":"Typ odkazu","unlink":"Odstrániť odkaz","upload":"Nahrať"},"list":{"bulletedlist":"Vložiť/odstrániť zoznam s odrážkami","numberedlist":"Vložiť/odstrániť číslovaný zoznam"},"liststyle":{"armenian":"Arménske číslovanie","bulletedTitle":"Vlastnosti odrážkového zoznamu","circle":"Kruh","decimal":"Číselné (1, 2, 3, atď.)","decimalLeadingZero":"Číselné s nulou (01, 02, 03, atď.)","disc":"Disk","georgian":"Gruzínske číslovanie (an, ban, gan, atď.)","lowerAlpha":"Malé latinské (a, b, c, d, e, atď.)","lowerGreek":"Malé grécke (alfa, beta, gama, atď.)","lowerRoman":"Malé rímske (i, ii, iii, iv, v, atď.)","none":"Nič","notset":"<nenastavené>","numberedTitle":"Vlastnosti číselného zoznamu","square":"Štvorec","start":"Začiatok","type":"Typ","upperAlpha":"Veľké latinské (A, B, C, D, E, atď.)","upperRoman":"Veľké rímske (I, II, III, IV, V, atď.)","validateStartNumber":"Začiatočné číslo číselného zoznamu musí byť celé číslo."},"magicline":{"title":"Odsek vložiť sem"},"maximize":{"maximize":"Maximalizovať","minimize":"Minimalizovať"},"newpage":{"toolbar":"Nová stránka"},"pagebreak":{"alt":"Zalomenie strany","toolbar":"Vložiť oddeľovač stránky pre tlač"},"pastetext":{"button":"Vložiť ako čistý text","title":"Vložiť ako čistý text"},"pastefromword":{"confirmCleanup":"Zdá sa, že vkladaný text pochádza z programu MS Word. Chcete ho pred vkladaním automaticky vyčistiť?","error":"Kvôli internej chybe nebolo možné vložené dáta vyčistiť","title":"Vložiť z Wordu","toolbar":"Vložiť z Wordu"},"preview":{"preview":"Náhľad"},"print":{"toolbar":"Tlač"},"removeformat":{"toolbar":"Odstrániť formátovanie"},"save":{"toolbar":"Uložiť"},"selectall":{"toolbar":"Vybrať všetko"},"showblocks":{"toolbar":"Ukázať bloky"},"sourcearea":{"toolbar":"Zdroj"},"specialchar":{"options":"Možnosti špeciálneho znaku","title":"Výber špeciálneho znaku","toolbar":"Vložiť špeciálny znak"},"scayt":{"btn_about":"O KPPP (Kontrola pravopisu počas písania)","btn_dictionaries":"Slovníky","btn_disable":"Zakázať  KPPP (Kontrola pravopisu počas písania)","btn_enable":"Povoliť KPPP (Kontrola pravopisu počas písania)","btn_langs":"Jazyky","btn_options":"Možnosti","text_title":"Kontrola pravopisu počas písania"},"stylescombo":{"label":"Štýly","panelTitle":"Formátovanie štýlov","panelTitle1":"Štýly bloku","panelTitle2":"Vnútroriadkové (inline) štýly","panelTitle3":"Štýly objeku"},"table":{"border":"Šírka orámovania","caption":"Popis","cell":{"menu":"Bunka","insertBefore":"Vložiť bunku pred","insertAfter":"Vložiť bunku za","deleteCell":"Vymazať bunky","merge":"Zlúčiť bunky","mergeRight":"Zlúčiť doprava","mergeDown":"Zlúčiť dole","splitHorizontal":"Rozdeliť bunky horizontálne","splitVertical":"Rozdeliť bunky vertikálne","title":"Vlastnosti bunky","cellType":"Typ bunky","rowSpan":"Rozsah riadkov","colSpan":"Rozsah stĺpcov","wordWrap":"Zalamovanie riadkov","hAlign":"Horizontálne zarovnanie","vAlign":"Vertikálne zarovnanie","alignBaseline":"Základná čiara (baseline)","bgColor":"Farba pozadia","borderColor":"Farba orámovania","data":"Dáta","header":"Hlavička","yes":"Áno","no":"Nie","invalidWidth":"Šírka bunky musí byť číslo.","invalidHeight":"Výška bunky musí byť číslo.","invalidRowSpan":"Rozsah riadkov musí byť celé číslo.","invalidColSpan":"Rozsah stĺpcov musí byť celé číslo.","chooseColor":"Vybrať"},"cellPad":"Odsadenie obsahu (cell padding)","cellSpace":"Vzdialenosť buniek (cell spacing)","column":{"menu":"Stĺpec","insertBefore":"Vložiť stĺpec pred","insertAfter":"Vložiť stĺpec po","deleteColumn":"Zmazať stĺpce"},"columns":"Stĺpce","deleteTable":"Vymazať tabuľku","headers":"Hlavička","headersBoth":"Obe","headersColumn":"Prvý stĺpec","headersNone":"Žiadne","headersRow":"Prvý riadok","invalidBorder":"Šírka orámovania musí byť číslo.","invalidCellPadding":"Odsadenie v bunkách (cell padding) musí byť kladné číslo.","invalidCellSpacing":"Medzera mädzi bunkami (cell spacing) musí byť kladné číslo.","invalidCols":"Počet stĺpcov musí byť číslo väčšie ako 0.","invalidHeight":"Výška tabuľky musí byť číslo.","invalidRows":"Počet riadkov musí byť číslo väčšie ako 0.","invalidWidth":"Širka tabuľky musí byť číslo.","menu":"Vlastnosti tabuľky","row":{"menu":"Riadok","insertBefore":"Vložiť riadok pred","insertAfter":"Vložiť riadok po","deleteRow":"Vymazať riadky"},"rows":"Riadky","summary":"Prehľad","title":"Vlastnosti tabuľky","toolbar":"Tabuľka","widthPc":"percent","widthPx":"pixelov","widthUnit":"jednotka šírky"},"undo":{"redo":"Znovu","undo":"Späť"},"wsc":{"btnIgnore":"Ignorovať","btnIgnoreAll":"Ignorovať všetko","btnReplace":"Prepísat","btnReplaceAll":"Prepísat všetko","btnUndo":"Späť","changeTo":"Zmeniť na","errorLoading":"Chyba pri načítaní slovníka z adresy: %s.","ieSpellDownload":"Kontrola pravopisu nie je naištalovaná. Chcete ju teraz stiahnuť?","manyChanges":"Kontrola pravopisu dokončená: Bolo zmenených %1 slov","noChanges":"Kontrola pravopisu dokončená: Neboli zmenené žiadne slová","noMispell":"Kontrola pravopisu dokončená: Neboli nájdené žiadne chyby pravopisu","noSuggestions":"- Žiadny návrh -","notAvailable":"Prepáčte, ale služba je momentálne nedostupná.","notInDic":"Nie je v slovníku","oneChange":"Kontrola pravopisu dokončená: Bolo zmenené jedno slovo","progress":"Prebieha kontrola pravopisu...","title":"Skontrolovať pravopis","toolbar":"Kontrola pravopisu"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/lang/sl.js
index 44005a5cb96..6342e02a41e 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/sl.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/sl.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sl']={"editor":"Bogat Urejevalnik Besedila","editorPanel":"Rich Text Editor plošča","common":{"editorHelp":"Pritisnite ALT 0 za pomoč","browseServer":"Prebrskaj na strežniku","url":"URL","protocol":"Protokol","upload":"Naloži","uploadSubmit":"Pošlji na strežnik","image":"Slika","flash":"Flash","form":"Obrazec","checkbox":"Potrditveno polje","radio":"Izbirno polje","textField":"Vnosno polje","textarea":"Vnosno območje","hiddenField":"Skrito polje","button":"Gumb","select":"Spustno Polje","imageButton":"Slikovni Gumb","notSet":"<ni določen>","id":"Id","name":"Ime","langDir":"Smer jezika","langDirLtr":"Od leve proti desni (LTR)","langDirRtl":"Od desne proti levi (RTL)","langCode":"Koda Jezika","longDescr":"Dolg opis URL-ja","cssClass":"Razred stilne predloge","advisoryTitle":"Predlagani naslov","cssStyle":"Slog","ok":"V redu","cancel":"Prekliči","close":"Zapri","preview":"Predogled","resize":"Potegni za spremembo velikosti","generalTab":"Splošno","advancedTab":"Napredno","validateNumberFailed":"Ta vrednost ni število.","confirmNewPage":"Vse neshranjene spremembe te vsebine bodo izgubljene. Ali res želite naložiti novo stran?","confirmCancel":"Nekaj možnosti je bilo spremenjenih. Ali res želite zapreti okno?","options":"Možnosti","target":"Cilj","targetNew":"Novo Okno (_blank)","targetTop":"Vrhovno Okno (_top)","targetSelf":"Enako Okno (_self)","targetParent":"Matično Okno (_parent)","langDirLTR":"Od leve proti desni (LTR)","langDirRTL":"Od desne proti levi (RTL)","styles":"Slog","cssClasses":"Razred stilne predloge","width":"Širina","height":"Višina","align":"Poravnava","alignLeft":"Levo","alignRight":"Desno","alignCenter":"Sredinsko","alignJustify":"Obojestranska poravnava","alignTop":"Na vrh","alignMiddle":"V sredino","alignBottom":"Na dno","alignNone":"Brez poravnave","invalidValue":"Neveljavna vrednost.","invalidHeight":"Višina mora biti število.","invalidWidth":"Širina mora biti število.","invalidCssLength":"Vrednost določena za \"%1\" polje mora biti pozitivna številka z ali brez veljavne CSS enote za merjenje (px, %, in, cm, mm, em, ex, pt, ali pc).","invalidHtmlLength":"Vrednost določena za \"%1\" polje mora biti pozitivna številka z ali brez veljavne HTML enote za merjenje (px ali %).","invalidInlineStyle":"Vrednost določena za inline slog mora biti sestavljena iz ene ali več tork (tuples) z obliko \"ime : vrednost\", ločenih z podpičji.","cssLengthTooltip":"Vnesite številko za vrednost v slikovnih pikah (pixels) ali številko z veljavno CSS enoto (px, %, in, cm, mm, em, ex, pt, ali pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedosegljiv</span>"},"about":{"copy":"Copyright &copy; $1. Vse pravice pridržane.","dlgTitle":"O programu CKEditor","help":"Preverite $1 za pomoč.","moreInfo":"Za informacijo o licenci prosim obiščite našo spletno stran:","title":"O programu CKEditor","userGuide":"CKEditor Navodila za Uporabo"},"basicstyles":{"bold":"Krepko","italic":"Ležeče","strike":"Prečrtano","subscript":"Podpisano","superscript":"Nadpisano","underline":"Podčrtano"},"bidi":{"ltr":"Smer besedila od leve proti desni","rtl":"Smer besedila od desne proti levi"},"blockquote":{"toolbar":"Citat"},"clipboard":{"copy":"Kopiraj","copyError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega kopiranja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega izrezovanja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+X).","paste":"Prilepi","pasteArea":"Prilepi Prostor","pasteMsg":"Prosim prilepite v sleči okvir s pomočjo tipkovnice (<STRONG>Ctrl/Cmd+V</STRONG>) in pritisnite <STRONG>V redu</STRONG>.","securityMsg":"Zaradi varnostnih nastavitev vašega brskalnika urejevalnik ne more neposredno dostopati do odložišča. Vsebino odložišča ponovno prilepite v to okno.","title":"Prilepi"},"button":{"selectedLabel":"%1 (Izbrano)"},"colorbutton":{"auto":"Samodejno","bgColorTitle":"Barva ozadja","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"Več barv...","panelTitle":"Colors","textColorTitle":"Barva besedila"},"colordialog":{"clear":"Počisti","highlight":"Poudarjeno","options":"Barvne Možnosti","selected":"Izbrano","title":"Izberi barvo"},"templates":{"button":"Predloge","emptyListMsg":"(Ni pripravljenih predlog)","insertOption":"Zamenjaj trenutno vsebino","options":"Možnosti Predloge","selectPromptMsg":"Izberite predlogo, ki jo želite odpreti v urejevalniku<br>(trenutna vsebina bo izgubljena):","title":"Vsebinske predloge"},"contextmenu":{"options":"Možnosti Kontekstnega Menija"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Predlagani naslov","cssClassInputLabel":"Razred stilne predloge","edit":"Uredi Div","inlineStyleInputLabel":"Inline Slog","langDirLTRLabel":"Od leve proti desni (LTR)","langDirLabel":"Smer jezika","langDirRTLLabel":"Od desne proti levi (RTL)","languageCodeInputLabel":"Koda Jezika","remove":"Odstrani Div","styleSelectLabel":"Slog","title":"Ustvari Div Posodo","toolbar":"Ustvari Div Posodo"},"toolbar":{"toolbarCollapse":"Skrči Orodno Vrstico","toolbarExpand":"Razširi Orodno Vrstico","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Urejevalnik orodne vrstice"},"elementspath":{"eleLabel":"Pot elementov","eleTitle":"%1 element"},"find":{"find":"Najdi","findOptions":"Find Options","findWhat":"Najdi:","matchCase":"Razlikuj velike in male črke","matchCyclic":"Primerjaj znake v cirilici","matchWord":"Samo cele besede","notFoundMsg":"Navedeno besedilo ni bilo najdeno.","replace":"Zamenjaj","replaceAll":"Zamenjaj vse","replaceSuccessMsg":"%1 pojavitev je bilo zamenjano.","replaceWith":"Zamenjaj z:","title":"Najdi in zamenjaj"},"fakeobjects":{"anchor":"Sidro","flash":"Flash animacija","hiddenfield":"Skrito polje","iframe":"IFrame","unknown":"Neznan objekt"},"flash":{"access":"Dostop skript","accessAlways":"Vedno","accessNever":"Nikoli","accessSameDomain":"Samo ista domena","alignAbsBottom":"Popolnoma na dno","alignAbsMiddle":"Popolnoma v sredino","alignBaseline":"Na osnovno črto","alignTextTop":"Besedilo na vrh","bgcolor":"Barva ozadja","chkFull":"Dovoli celozaslonski način","chkLoop":"Ponavljanje","chkMenu":"Omogoči Flash Meni","chkPlay":"Samodejno predvajaj","flashvars":"Spremenljivke za Flash","hSpace":"Vodoravni razmik","properties":"Lastnosti Flash","propertiesTab":"Lastnosti","quality":"Kakovost","qualityAutoHigh":"Samodejno visoka","qualityAutoLow":"Samodejno nizka","qualityBest":"Najvišja","qualityHigh":"Visoka","qualityLow":"Nizka","qualityMedium":"Srednja","scale":"Povečava","scaleAll":"Pokaži vse","scaleFit":"Natančno prileganje","scaleNoBorder":"Brez obrobe","title":"Lastnosti Flash","vSpace":"Navpični razmik","validateHSpace":"Vodoravni razmik mora biti število.","validateSrc":"Vnesite URL povezave","validateVSpace":"Navpični razmik mora biti število.","windowMode":"Vrsta okna","windowModeOpaque":"Motno","windowModeTransparent":"Prosojno","windowModeWindow":"Okno"},"font":{"fontSize":{"label":"Velikost","voiceLabel":"Velikost","panelTitle":"Velikost"},"label":"Pisava","panelTitle":"Pisava","voiceLabel":"Pisava"},"forms":{"button":{"title":"Lastnosti gumba","text":"Besedilo (Vrednost)","type":"Tip","typeBtn":"Gumb","typeSbm":"Potrdi","typeRst":"Ponastavi"},"checkboxAndRadio":{"checkboxTitle":"Lastnosti potrditvenega polja","radioTitle":"Lastnosti izbirnega polja","value":"Vrednost","selected":"Izbrano","required":"Required"},"form":{"title":"Lastnosti obrazca","menu":"Lastnosti obrazca","action":"Akcija","method":"Metoda","encoding":"Kodiranje znakov"},"hidden":{"title":"Lastnosti skritega polja","name":"Ime","value":"Vrednost"},"select":{"title":"Lastnosti spustnega seznama","selectInfo":"Podatki","opAvail":"Razpoložljive izbire","value":"Vrednost","size":"Velikost","lines":"vrstic","chkMulti":"Dovoli izbor večih vrstic","required":"Required","opText":"Besedilo","opValue":"Vrednost","btnAdd":"Dodaj","btnModify":"Spremeni","btnUp":"Gor","btnDown":"Dol","btnSetValue":"Postavi kot privzeto izbiro","btnDelete":"Izbriši"},"textarea":{"title":"Lastnosti vnosnega območja","cols":"Stolpcev","rows":"Vrstic"},"textfield":{"title":"Lastnosti vnosnega polja","name":"Ime","value":"Vrednost","charWidth":"Dolžina","maxChars":"Največje število znakov","required":"Required","type":"Tip","typeText":"Besedilo","typePass":"Geslo","typeEmail":"E-pošta","typeSearch":"Iskanje","typeTel":"Telefonska Številka","typeUrl":"URL"}},"format":{"label":"Oblika","panelTitle":"Oblika","tag_address":"Napis","tag_div":"Navaden (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Navaden","tag_pre":"Oblikovan"},"horizontalrule":{"toolbar":"Vstavi vodoravno črto"},"iframe":{"border":"Pokaži mejo okvira","noUrl":"Prosimo, vnesite iframe URL","scrolling":"Omogoči scrollbars","title":"IFrame Lastnosti","toolbar":"IFrame"},"image":{"alt":"Nadomestno besedilo","border":"Obroba","btnUpload":"Pošlji na strežnik","button2Img":"Želiš pretvoriti izbrani gumb s sliko v preprosto sliko?","hSpace":"Vodoravni razmik","img2Button":"Želiš pretvoriti izbrano sliko v gumb s sliko?","infoTab":"Podatki o sliki","linkTab":"Povezava","lockRatio":"Zakleni razmerje","menu":"Lastnosti slike","resetSize":"Ponastavi velikost","title":"Lastnosti slike","titleButton":"Lastnosti gumba s sliko","upload":"Pošlji","urlMissing":"Manjka vir (URL) slike.","vSpace":"Navpični razmik","validateBorder":"Meja mora biti celo število.","validateHSpace":"HSpace mora biti celo število.","validateVSpace":"VSpace mora biti celo število."},"indent":{"indent":"Povečaj zamik","outdent":"Zmanjšaj zamik"},"smiley":{"options":"Možnosti Smeška","title":"Vstavi smeška","toolbar":"Smeško"},"justify":{"block":"Obojestranska poravnava","center":"Sredinska poravnava","left":"Leva poravnava","right":"Desna poravnava"},"language":{"button":"Nastavi jezik","remove":"Odstrani jezik"},"link":{"acccessKey":"Dostopno Geslo","advanced":"Napredno","advisoryContentType":"Predlagani tip vsebine (content-type)","advisoryTitle":"Predlagani naslov","anchor":{"toolbar":"Vstavi/uredi zaznamek","menu":"Lastnosti zaznamka","title":"Lastnosti zaznamka","name":"Ime zaznamka","errorName":"Prosim vnesite ime zaznamka","remove":"Remove Anchor"},"anchorId":"Po ID-ju elementa","anchorName":"Po imenu zaznamka","charset":"Kodna tabela povezanega vira","cssClasses":"Razred stilne predloge","emailAddress":"Elektronski naslov","emailBody":"Vsebina sporočila","emailSubject":"Predmet sporočila","id":"Id","info":"Podatki o povezavi","langCode":"Smer jezika","langDir":"Smer jezika","langDirLTR":"Od leve proti desni (LTR)","langDirRTL":"Od desne proti levi (RTL)","menu":"Uredi povezavo","name":"Ime","noAnchors":"(V tem dokumentu ni zaznamkov)","noEmail":"Vnesite elektronski naslov","noUrl":"Vnesite URL povezave","other":"<drug>","popupDependent":"Podokno (Netscape)","popupFeatures":"Značilnosti pojavnega okna","popupFullScreen":"Celozaslonska slika (IE)","popupLeft":"Lega levo","popupLocationBar":"Naslovna vrstica","popupMenuBar":"Menijska vrstica","popupResizable":"Spremenljive velikosti","popupScrollBars":"Drsniki","popupStatusBar":"Vrstica stanja","popupToolbar":"Orodna vrstica","popupTop":"Lega na vrhu","rel":"Odnos","selectAnchor":"Izberi zaznamek","styles":"Slog","tabIndex":"Številka tabulatorja","target":"Cilj","targetFrame":"<okvir>","targetFrameName":"Ime ciljnega okvirja","targetPopup":"<pojavno okno>","targetPopupName":"Ime pojavnega okna","title":"Povezava","toAnchor":"Zaznamek na tej strani","toEmail":"Elektronski naslov","toUrl":"URL","toolbar":"Vstavi/uredi povezavo","type":"Vrsta povezave","unlink":"Odstrani povezavo","upload":"Prenesi"},"list":{"bulletedlist":"Označen seznam","numberedlist":"Oštevilčen seznam"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Vstavite odstavek tukaj"},"maximize":{"maximize":"Maksimiraj","minimize":"Minimiraj"},"newpage":{"toolbar":"Nova stran"},"pagebreak":{"alt":"Prelom Strani","toolbar":"Vstavi prelom strani"},"pastetext":{"button":"Prilepi kot golo besedilo","title":"Prilepi kot golo besedilo"},"pastefromword":{"confirmCleanup":"Besedilo, ki ga želite prilepiti je kopirano iz Word-a. Ali ga želite očistiti, preden ga prilepite?","error":"Ni bilo mogoče očistiti prilepljenih podatkov zaradi notranje napake","title":"Prilepi iz Worda","toolbar":"Prilepi iz Worda"},"preview":{"preview":"Predogled"},"print":{"toolbar":"Natisni"},"removeformat":{"toolbar":"Odstrani oblikovanje"},"save":{"toolbar":"Shrani"},"selectall":{"toolbar":"Izberi vse"},"showblocks":{"toolbar":"Prikaži ograde"},"sourcearea":{"toolbar":"Izvorna koda"},"specialchar":{"options":"Možnosti Posebnega Znaka","title":"Izberi Posebni Znak","toolbar":"Vstavi posebni znak"},"scayt":{"btn_about":"O storitvi SCAYT","btn_dictionaries":"Slovarji","btn_disable":"Onemogoči SCAYT","btn_enable":"Omogoči SCAYT","btn_langs":"Jeziki","btn_options":"Možnosti","text_title":"Črkovanje med tipkanjem"},"stylescombo":{"label":"Slog","panelTitle":"Oblikovalni Stili","panelTitle1":"Slogi odstavkov","panelTitle2":"Slogi besedila","panelTitle3":"Slogi objektov"},"table":{"border":"Velikost obrobe","caption":"Naslov","cell":{"menu":"Celica","insertBefore":"Vstavi celico pred","insertAfter":"Vstavi celico za","deleteCell":"Izbriši celice","merge":"Združi celice","mergeRight":"Združi desno","mergeDown":"Druži navzdol","splitHorizontal":"Razdeli celico vodoravno","splitVertical":"Razdeli celico navpično","title":"Lastnosti celice","cellType":"Vrsta celice","rowSpan":"Razpon vrstic","colSpan":"Razpon stolpcev","wordWrap":"Prelom besedila","hAlign":"Vodoravna poravnava","vAlign":"Navpična poravnava","alignBaseline":"Osnovnica","bgColor":"Barva ozadja","borderColor":"Barva obrobe","data":"Podatki","header":"Glava","yes":"Da","no":"Ne","invalidWidth":"Širina celice mora biti število.","invalidHeight":"Višina celice mora biti število.","invalidRowSpan":"Razpon vrstic mora biti celo število.","invalidColSpan":"Razpon stolpcev mora biti celo število.","chooseColor":"Izberi"},"cellPad":"Polnilo med celicami","cellSpace":"Razmik med celicami","column":{"menu":"Stolpec","insertBefore":"Vstavi stolpec pred","insertAfter":"Vstavi stolpec za","deleteColumn":"Izbriši stolpce"},"columns":"Stolpci","deleteTable":"Izbriši tabelo","headers":"Glave","headersBoth":"Oboje","headersColumn":"Prvi stolpec","headersNone":"Brez","headersRow":"Prva vrstica","invalidBorder":"Širina obrobe mora biti število.","invalidCellPadding":"Zamik celic mora biti število","invalidCellSpacing":"Razmik med celicami mora biti število.","invalidCols":"Število stolpcev mora biti večje od 0.","invalidHeight":"Višina tabele mora biti število.","invalidRows":"Število vrstic mora biti večje od 0.","invalidWidth":"Širina tabele mora biti število.","menu":"Lastnosti tabele","row":{"menu":"Vrstica","insertBefore":"Vstavi vrstico pred","insertAfter":"Vstavi vrstico za","deleteRow":"Izbriši vrstice"},"rows":"Vrstice","summary":"Povzetek","title":"Lastnosti tabele","toolbar":"Tabela","widthPc":"procentov","widthPx":"pik","widthUnit":"enota širine"},"undo":{"redo":"Ponovi","undo":"Razveljavi"},"wsc":{"btnIgnore":"Prezri","btnIgnoreAll":"Prezri vse","btnReplace":"Zamenjaj","btnReplaceAll":"Zamenjaj vse","btnUndo":"Razveljavi","changeTo":"Spremeni v","errorLoading":"Napaka pri nalaganju storitve programa na naslovu %s.","ieSpellDownload":"Črkovalnik ni nameščen. Ali ga želite prenesti sedaj?","manyChanges":"Črkovanje je končano: Spremenjenih je bilo %1 besed","noChanges":"Črkovanje je končano: Nobena beseda ni bila spremenjena","noMispell":"Črkovanje je končano: Brez napak","noSuggestions":"- Ni predlogov -","notAvailable":"Oprostite, storitev trenutno ni dosegljiva.","notInDic":"Ni v slovarju","oneChange":"Črkovanje je končano: Spremenjena je bila ena beseda","progress":"Preverjanje črkovanja se izvaja...","title":"Črkovalnik","toolbar":"Preveri črkovanje"}};
\ No newline at end of file
+CKEDITOR.lang['sl']={"editor":"Urejevalnik obogatenega besedila","editorPanel":"Plošča urejevalnika obogatenega besedila","common":{"editorHelp":"Pritisnite ALT 0 za pomoč","browseServer":"Prebrskaj na strežniku","url":"URL","protocol":"Protokol","upload":"Naloži","uploadSubmit":"Pošlji na strežnik","image":"Slika","flash":"Flash","form":"Obrazec","checkbox":"Potrditveno polje","radio":"Izbirno polje","textField":"Besedilno polje","textarea":"Besedilno območje","hiddenField":"Skrito polje","button":"Gumb","select":"Spustno polje","imageButton":"Slikovni gumb","notSet":"<ni določen>","id":"Id","name":"Ime","langDir":"Smer jezika","langDirLtr":"Od leve proti desni (LTR)","langDirRtl":"Od desne proti levi (RTL)","langCode":"Koda jezika","longDescr":"Dolg opis URL-ja","cssClass":"Razredi slogovne predloge","advisoryTitle":"Predlagani naslov","cssStyle":"Slog","ok":"V redu","cancel":"Prekliči","close":"Zapri","preview":"Predogled","resize":"Potegni za spremembo velikosti","generalTab":"Splošno","advancedTab":"Napredno","validateNumberFailed":"Vrednost ni število.","confirmNewPage":"Vse neshranjene spremembe vsebine bodo izgubljene. Ali res želite naložiti novo stran?","confirmCancel":"Spremenili ste nekaj možnosti. Ali res želite zapreti okno?","options":"Možnosti","target":"Cilj","targetNew":"Novo okno (_blank)","targetTop":"Vrhovno okno (_top)","targetSelf":"Isto okno (_self)","targetParent":"Starševsko okno (_parent)","langDirLTR":"Od leve proti desni (LTR)","langDirRTL":"Od desne proti levi (RTL)","styles":"Slog","cssClasses":"Razredi slogovne predloge","width":"Širina","height":"Višina","align":"Poravnava","alignLeft":"Levo","alignRight":"Desno","alignCenter":"Sredinsko","alignJustify":"Obojestranska poravnava","alignTop":"Na vrh","alignMiddle":"V sredino","alignBottom":"Na dno","alignNone":"Brez poravnave","invalidValue":"Neveljavna vrednost.","invalidHeight":"Višina mora biti število.","invalidWidth":"Širina mora biti število.","invalidCssLength":"Vrednost, določena za polje »%1«, mora biti pozitivno število z ali brez veljavne CSS-enote za merjenje (px, %, in, cm, mm, em, ex, pt ali pc).","invalidHtmlLength":"Vrednost, določena za polje »%1«, mora biti pozitivno število z ali brez veljavne HTML-enote za merjenje (px ali %).","invalidInlineStyle":"Vrednost, določena za slog v vrstici, mora biti sestavljena iz ene ali več dvojic oblike »ime : vrednost«, ločenih s podpičji.","cssLengthTooltip":"Vnesite število za vrednost v slikovnih pikah ali število z veljavno CSS-enoto (px, %, in, cm, mm, em, ex, pt ali pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedosegljiv</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Vse pravice pridržane.","dlgTitle":"O programu CKEditor","help":"Oglejte si $1 za pomoč.","moreInfo":"Za informacije o licenciranju prosimo obiščite našo spletno stran:","title":"O programu CKEditor","userGuide":"Uporabniški vodnik CKEditor"},"basicstyles":{"bold":"Krepko","italic":"Ležeče","strike":"Prečrtano","subscript":"Podpisano","superscript":"Nadpisano","underline":"Podčrtano"},"bidi":{"ltr":"Smer besedila od leve proti desni","rtl":"Smer besedila od desne proti levi"},"blockquote":{"toolbar":"Citat"},"clipboard":{"copy":"Kopiraj","copyError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega kopiranja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega izrezovanja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+X).","paste":"Prilepi","pasteArea":"Prilepi območje","pasteMsg":"Prosimo, prilepite v sleči okvir s pomočjo tipkovnice (<strong>Ctrl/Cmd+V</strong>) in pritisnite V redu.","securityMsg":"Zaradi varnostnih nastavitev vašega brskalnika urejevalnik ne more neposredno dostopati do odložišča. Vsebino odložišča ponovno prilepite v to okno.","title":"Prilepi"},"button":{"selectedLabel":"%1 (Izbrano)"},"colorbutton":{"auto":"Samodejno","bgColorTitle":"Barva ozadja","colors":{"000":"Črna","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Rjava","DAA520":"Golden Rod","006400":"Temno zelena","40E0D0":"Turkizna","0000CD":"Srednje modra","800080":"Škrlatna","808080":"Siva","F00":"Rdeča","FF8C00":"Temno oranžna","FFD700":"Zlata","008000":"Zelena","0FF":"Sinja","00F":"Modra","EE82EE":"Vijolična","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Oranžna","FFFF00":"Rumena","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Svetlo modra","DDA0DD":"Plum","D3D3D3":"Svetlo siva","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Svetlo rumena","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Bela","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Več barv ...","panelTitle":"Barve","textColorTitle":"Barva besedila"},"colordialog":{"clear":"Počisti","highlight":"Poudarjeno","options":"Možnosti barve","selected":"Izbrana barva","title":"Izberi barvo"},"templates":{"button":"Predloge","emptyListMsg":"(Ni pripravljenih predlog)","insertOption":"Zamenjaj trenutno vsebino","options":"Možnosti Predloge","selectPromptMsg":"Izberite predlogo, ki jo želite odpreti v urejevalniku<br>(trenutna vsebina bo izgubljena):","title":"Vsebinske predloge"},"contextmenu":{"options":"Možnosti kontekstnega menija"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Predlagani naslov","cssClassInputLabel":"Razredi slogovne predloge","edit":"Uredi div","inlineStyleInputLabel":"Slog v vrstici","langDirLTRLabel":"Od leve proti desni (LTR)","langDirLabel":"Smer jezika","langDirRTLLabel":"Od desne proti levi (RTL)","languageCodeInputLabel":"Koda jezika","remove":"Odstrani div","styleSelectLabel":"Slog","title":"Ustvari vsebnik div","toolbar":"Ustvari vsebnik div"},"toolbar":{"toolbarCollapse":"Skrči orodno vrstico","toolbarExpand":"Razširi orodno vrstico","toolbarGroups":{"document":"Dokument","clipboard":"Odložišče/Razveljavi","editing":"Urejanje","forms":"Obrazci","basicstyles":"Osnovni slogi","paragraph":"Odstavek","links":"Povezave","insert":"Vstavi","styles":"Slogi","colors":"Barve","tools":"Orodja"},"toolbars":"Orodne vrstice urejevalnika"},"elementspath":{"eleLabel":"Pot elementov","eleTitle":"Element %1"},"find":{"find":"Najdi","findOptions":"Možnosti iskanja","findWhat":"Najdi:","matchCase":"Razlikuj velike in male črke","matchCyclic":"Primerjaj znake v cirilici","matchWord":"Samo cele besede","notFoundMsg":"Navedenega besedila nismo našli.","replace":"Zamenjaj","replaceAll":"Zamenjaj vse","replaceSuccessMsg":"Zamenjali smo %1 pojavitev.","replaceWith":"Zamenjaj z:","title":"Najdi in zamenjaj"},"fakeobjects":{"anchor":"Sidro","flash":"Animacija flash","hiddenfield":"Skrito polje","iframe":"IFrame","unknown":"Neznan objekt"},"flash":{"access":"Dostop skripta","accessAlways":"Vedno","accessNever":"Nikoli","accessSameDomain":"Samo ista domena","alignAbsBottom":"Popolnoma na dno","alignAbsMiddle":"Popolnoma v sredino","alignBaseline":"Na osnovno črto","alignTextTop":"Besedilo na vrh","bgcolor":"Barva ozadja","chkFull":"Dovoli celozaslonski način","chkLoop":"Ponavljanje","chkMenu":"Omogoči meni flasha","chkPlay":"Samodejno predvajaj","flashvars":"Spremenljivke za flash","hSpace":"Vodoravni odmik","properties":"Lastnosti flasha","propertiesTab":"Lastnosti","quality":"Kakovost","qualityAutoHigh":"Samodejno visoka","qualityAutoLow":"Samodejno nizka","qualityBest":"Najvišja","qualityHigh":"Visoka","qualityLow":"Nizka","qualityMedium":"Srednja","scale":"Povečava","scaleAll":"Pokaži vse","scaleFit":"Natančno prileganje","scaleNoBorder":"Brez obrobe","title":"Lastnosti flasha","vSpace":"Navpični odmik","validateHSpace":"Vodoravni odmik mora biti število.","validateSrc":"Vnesite URL povezave","validateVSpace":"Navpični odmik mora biti število.","windowMode":"Način okna","windowModeOpaque":"Motno","windowModeTransparent":"Prosojno","windowModeWindow":"Okno"},"font":{"fontSize":{"label":"Velikost","voiceLabel":"Velikost pisave","panelTitle":"Velikost pisave"},"label":"Pisava","panelTitle":"Ime pisave","voiceLabel":"Pisava"},"forms":{"button":{"title":"Lastnosti gumba","text":"Besedilo (Vrednost)","type":"Vrsta","typeBtn":"Gumb","typeSbm":"Potrdi","typeRst":"Ponastavi"},"checkboxAndRadio":{"checkboxTitle":"Lastnosti potrditvenega polja","radioTitle":"Lastnosti izbirnega polja","value":"Vrednost","selected":"Izbrano","required":"Zahtevano"},"form":{"title":"Lastnosti obrazca","menu":"Lastnosti obrazca","action":"Dejanje","method":"Metoda","encoding":"Kodiranje znakov"},"hidden":{"title":"Lastnosti skritega polja","name":"Ime","value":"Vrednost"},"select":{"title":"Lastnosti spustnega seznama","selectInfo":"Podatki","opAvail":"Razpoložljive izbire","value":"Vrednost","size":"Velikost","lines":"vrstic","chkMulti":"Dovoli izbor več vrednosti","required":"Zahtevano","opText":"Besedilo","opValue":"Vrednost","btnAdd":"Dodaj","btnModify":"Spremeni","btnUp":"Gor","btnDown":"Dol","btnSetValue":"Določi kot privzeto izbiro","btnDelete":"Izbriši"},"textarea":{"title":"Lastnosti besedilnega območja","cols":"Stolpcev","rows":"Vrstic"},"textfield":{"title":"Lastnosti besedilnega polja","name":"Ime","value":"Vrednost","charWidth":"Širina","maxChars":"Največje število znakov","required":"Zahtevano","type":"Vrsta","typeText":"Besedilo","typePass":"Geslo","typeEmail":"E-pošta","typeSearch":"Iskanje","typeTel":"Telefonska številka","typeUrl":"URL"}},"format":{"label":"Oblika","panelTitle":"Oblika odstavka","tag_address":"Napis","tag_div":"Navaden (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Navaden","tag_pre":"Oblikovan"},"horizontalrule":{"toolbar":"Vstavi vodoravno črto"},"iframe":{"border":"Pokaži obrobo okvirja","noUrl":"Prosimo, vnesite iframe URL","scrolling":"Omogoči drsnike","title":"Lastnosti IFrame","toolbar":"IFrame"},"image":{"alt":"Nadomestno besedilo","border":"Obroba","btnUpload":"Pošlji na strežnik","button2Img":"Želite pretvoriti izbrani gumb s sliko v preprosto sliko?","hSpace":"Vodoravni odmik","img2Button":"Želite pretvoriti izbrano sliko v gumb s sliko?","infoTab":"Podatki o sliki","linkTab":"Povezava","lockRatio":"Zakleni razmerje","menu":"Lastnosti slike","resetSize":"Ponastavi velikost","title":"Lastnosti slike","titleButton":"Lastnosti gumba s sliko","upload":"Naloži","urlMissing":"Manjka URL vira slike.","vSpace":"Navpični odmik","validateBorder":"Meja mora biti celo število.","validateHSpace":"Vodoravni odmik mora biti celo število.","validateVSpace":"VSpace mora biti celo število."},"indent":{"indent":"Povečaj zamik","outdent":"Zmanjšaj zamik"},"smiley":{"options":"Možnosti Smeška","title":"Vstavi smeška","toolbar":"Smeško"},"justify":{"block":"Obojestranska poravnava","center":"Sredinska poravnava","left":"Leva poravnava","right":"Desna poravnava"},"language":{"button":"Nastavi jezik","remove":"Odstrani jezik"},"link":{"acccessKey":"Tipka za dostop","advanced":"Napredno","advisoryContentType":"Predlagana vrsta vsebine","advisoryTitle":"Predlagani naslov","anchor":{"toolbar":"Sidro","menu":"Uredi sidro","title":"Lastnosti sidra","name":"Ime sidra","errorName":"Prosimo, vnesite ime sidra","remove":"Odstrani sidro"},"anchorId":"Po ID-ju elementa","anchorName":"Po imenu sidra","charset":"Nabor znakov povezanega vira","cssClasses":"Razredi slogovne predloge","download":"Force Download","displayText":"Display Text","emailAddress":"E-poštni naslov","emailBody":"Telo sporočila","emailSubject":"Zadeva sporočila","id":"Id","info":"Podatki o povezavi","langCode":"Koda jezika","langDir":"Smer jezika","langDirLTR":"Od leve proti desni (LTR)","langDirRTL":"Od desne proti levi (RTL)","menu":"Uredi povezavo","name":"Ime","noAnchors":"(V tem dokumentu ni sider)","noEmail":"Vnesite e-poštni naslov","noUrl":"Vnesite URL povezave","other":"<drugo>","popupDependent":"Podokno (Netscape)","popupFeatures":"Značilnosti pojavnega okna","popupFullScreen":"Celozaslonsko (IE)","popupLeft":"Lega levo","popupLocationBar":"Naslovna vrstica","popupMenuBar":"Menijska vrstica","popupResizable":"Spremenljive velikosti","popupScrollBars":"Drsniki","popupStatusBar":"Vrstica stanja","popupToolbar":"Orodna vrstica","popupTop":"Lega na vrhu","rel":"Odnos","selectAnchor":"Izberite sidro","styles":"Slog","tabIndex":"Številka tabulatorja","target":"Cilj","targetFrame":"<okvir>","targetFrameName":"Ime ciljnega okvirja","targetPopup":"<pojavno okno>","targetPopupName":"Ime pojavnega okna","title":"Povezava","toAnchor":"Sidro na tej strani","toEmail":"E-pošta","toUrl":"URL","toolbar":"Vstavi/uredi povezavo","type":"Vrsta povezave","unlink":"Odstrani povezavo","upload":"Naloži"},"list":{"bulletedlist":"Vstavi/odstrani neoštevilčen seznam","numberedlist":"Vstavi/odstrani oštevilčen seznam"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Vstavite odstavek tukaj"},"maximize":{"maximize":"Maksimiraj","minimize":"Minimiraj"},"newpage":{"toolbar":"Nova stran"},"pagebreak":{"alt":"Prelom strani","toolbar":"Vstavi prelom strani"},"pastetext":{"button":"Prilepi kot golo besedilo","title":"Prilepi kot golo besedilo"},"pastefromword":{"confirmCleanup":"Besedilo, ki ga želite prilepiti, je kopirano iz Worda. Ali ga želite očistiti, preden ga prilepite?","error":"Ni bilo mogoče očistiti prilepljenih podatkov zaradi notranje napake","title":"Prilepi iz Worda","toolbar":"Prilepi iz Worda"},"preview":{"preview":"Predogled"},"print":{"toolbar":"Natisni"},"removeformat":{"toolbar":"Odstrani oblikovanje"},"save":{"toolbar":"Shrani"},"selectall":{"toolbar":"Izberi vse"},"showblocks":{"toolbar":"Prikaži ograde"},"sourcearea":{"toolbar":"Izvorna koda"},"specialchar":{"options":"Možnosti posebnih znakov","title":"Izberi posebni znak","toolbar":"Vstavi posebni znak"},"scayt":{"btn_about":"O storitvi SCAYT","btn_dictionaries":"Slovarji","btn_disable":"Onemogoči SCAYT","btn_enable":"Omogoči SCAYT","btn_langs":"Jeziki","btn_options":"Možnosti","text_title":"Črkovanje med tipkanjem"},"stylescombo":{"label":"Slog","panelTitle":"Oblikovalni Stili","panelTitle1":"Slogi odstavkov","panelTitle2":"Slogi besedila","panelTitle3":"Slogi objektov"},"table":{"border":"Velikost obrobe","caption":"Napis","cell":{"menu":"Celica","insertBefore":"Vstavi celico pred","insertAfter":"Vstavi celico za","deleteCell":"Izbriši celice","merge":"Združi celice","mergeRight":"Združi desno","mergeDown":"Združi navzdol","splitHorizontal":"Razdeli celico vodoravno","splitVertical":"Razdeli celico navpično","title":"Lastnosti celice","cellType":"Vrsta celice","rowSpan":"Razpon vrstic","colSpan":"Razpon stolpcev","wordWrap":"Prelom besedila","hAlign":"Vodoravna poravnava","vAlign":"Navpična poravnava","alignBaseline":"Osnovnica","bgColor":"Barva ozadja","borderColor":"Barva obrobe","data":"Podatki","header":"Glava","yes":"Da","no":"Ne","invalidWidth":"Širina celice mora biti število.","invalidHeight":"Višina celice mora biti število.","invalidRowSpan":"Razpon vrstic mora biti celo število.","invalidColSpan":"Razpon stolpcev mora biti celo število.","chooseColor":"Izberi"},"cellPad":"Odmik znotraj celic","cellSpace":"Razmik med celicami","column":{"menu":"Stolpec","insertBefore":"Vstavi stolpec pred","insertAfter":"Vstavi stolpec za","deleteColumn":"Izbriši stolpce"},"columns":"Stolpci","deleteTable":"Izbriši tabelo","headers":"Glave","headersBoth":"Oboje","headersColumn":"Prvi stolpec","headersNone":"Brez","headersRow":"Prva vrstica","invalidBorder":"Širina obrobe mora biti število.","invalidCellPadding":"Odmik znotraj celic mora biti pozitivno število.","invalidCellSpacing":"Razmik med celicami mora biti pozitivno število.","invalidCols":"Število stolpcev mora biti večje od 0.","invalidHeight":"Višina tabele mora biti število.","invalidRows":"Število vrstic mora biti večje od 0.","invalidWidth":"Širina tabele mora biti število.","menu":"Lastnosti tabele","row":{"menu":"Vrstica","insertBefore":"Vstavi vrstico pred","insertAfter":"Vstavi vrstico za","deleteRow":"Izbriši vrstice"},"rows":"Vrstice","summary":"Povzetek","title":"Lastnosti tabele","toolbar":"Tabela","widthPc":"odstotkov","widthPx":"pik","widthUnit":"enota širine"},"undo":{"redo":"Uveljavi","undo":"Razveljavi"},"wsc":{"btnIgnore":"Prezri","btnIgnoreAll":"Prezri vse","btnReplace":"Zamenjaj","btnReplaceAll":"Zamenjaj vse","btnUndo":"Razveljavi","changeTo":"Spremeni v","errorLoading":"Napaka pri nalaganju storitve programa na naslovu %s.","ieSpellDownload":"Črkovalnik ni nameščen. Ali ga želite prenesti sedaj?","manyChanges":"Črkovanje je končano: Spremenjenih je bilo %1 besed","noChanges":"Črkovanje je končano: Nobena beseda ni bila spremenjena","noMispell":"Črkovanje je končano: Brez napak","noSuggestions":"- Ni predlogov -","notAvailable":"Oprostite, storitev trenutno ni dosegljiva.","notInDic":"Ni v slovarju","oneChange":"Črkovanje je končano: Spremenjena je bila ena beseda","progress":"Preverjanje črkovanja se izvaja...","title":"Črkovalnik","toolbar":"Preveri črkovanje"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/lang/sq.js
index 6dda8834fe1..e3a91bea3ff 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/sq.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/sq.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sq']={"editor":"Redaktues i Pasur Teksti","editorPanel":"Paneli i redaktuesit të tekstit të plotë","common":{"editorHelp":"Shtyp ALT 0 për ndihmë","browseServer":"Shfleto në Server","url":"URL","protocol":"Protokolli","upload":"Ngarko","uploadSubmit":"Dërgo në server","image":"Imazh","flash":"Objekt flash","form":"Formular","checkbox":"Checkbox","radio":"Buton radio","textField":"Fushë tekst","textarea":"Hapësirë tekst","hiddenField":"Fushë e fshehur","button":"Buton","select":"Menu zgjedhjeje","imageButton":"Buton imazhi","notSet":"<e pazgjedhur>","id":"Id","name":"Emër","langDir":"Kod gjuhe","langDirLtr":"Nga e majta në të djathtë (LTR)","langDirRtl":"Nga e djathta në të majtë (RTL)","langCode":"Kod gjuhe","longDescr":"Përshkrim i hollësishëm","cssClass":"Klasa stili CSS","advisoryTitle":"Titull","cssStyle":"Stil","ok":"OK","cancel":"Anulo","close":"Mbyll","preview":"Parashiko","resize":"Ripërmaso","generalTab":"Të përgjithshme","advancedTab":"Të përparuara","validateNumberFailed":"Vlera e futur nuk është një numër","confirmNewPage":"Çdo ndryshim që nuk është ruajtur do humbasë. Je i sigurtë që dëshiron të krijosh një faqe të re?","confirmCancel":"Disa opsione kanë ndryshuar. Je i sigurtë që dëshiron ta mbyllësh dritaren?","options":"Opsione","target":"Objektivi","targetNew":"Dritare e re (_blank)","targetTop":"Dritare në plan të parë (_top)","targetSelf":"E njëjta dritare (_self)","targetParent":"Dritarja prind (_parent)","langDirLTR":"Nga e majta në të djathë (LTR)","langDirRTL":"Nga e djathta në të majtë (RTL)","styles":"Stil","cssClasses":"Klasa Stili CSS","width":"Gjerësi","height":"Lartësi","align":"Rreshtim","alignLeft":"Majtas","alignRight":"Djathtas","alignCenter":"Qendër","alignJustify":"Zgjero","alignTop":"Lart","alignMiddle":"Në mes","alignBottom":"Poshtë","alignNone":"Asnjë","invalidValue":"Vlerë e pavlefshme","invalidHeight":"Lartësia duhet të jetë një numër","invalidWidth":"Gjerësia duhet të jetë një numër","invalidCssLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme CSS (px, %, in, cm, mm, em, ex, pt ose pc).","invalidHtmlLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme HTML (px ose %)","invalidInlineStyle":"Stili inline duhet të jetë një apo disa vlera të formatit \"emër: vlerë\", ndarë nga pikëpresje.","cssLengthTooltip":"Fut një numër për vlerën në pixel apo një numër me një njësi të vlefshme CSS (px, %, in, cm, mm, ex, pt, ose pc).","unavailable":"%1<span class=\"cke_accessibility\">, i padisponueshëm</span>"},"about":{"copy":"Të drejtat  e kopjimit &copy; $1. Të gjitha të drejtat e rezervuara.","dlgTitle":"Rreth CKEditor","help":"Kontrollo $1 për ndihmë.","moreInfo":"Për informacione rreth licencave shih faqen tonë:","title":"Rreth CKEditor","userGuide":"Udhëzuesi i Shfrytëzuesit të CKEditor"},"basicstyles":{"bold":"Trash","italic":"Pjerrët","strike":"Nëpërmes","subscript":"Nën-skriptë","superscript":"Super-skriptë","underline":"Nënvijëzuar"},"bidi":{"ltr":"Drejtimi i tekstit nga e majta në të djathtë","rtl":"Drejtimi i tekstit nga e djathta në të majtë"},"blockquote":{"toolbar":"Citatet"},"clipboard":{"copy":"Kopjo","copyError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e kopjimit. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+C).","cut":"Preje","cutError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e prerjes. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+X).","paste":"Hidhe","pasteArea":"Hapësira Hedhëse","pasteMsg":"Ju lutemi hidhni brenda kutizës në vijim duke shfrytëzuar tastierën (<strong>Ctrl/Cmd+V</strong>) dhe shtypni Mirë.","securityMsg":"Për shkak të dhënave të sigurisë së shfletuesit tuaj, redaktuesi nuk është në gjendje të i qaset drejtpërdrejtë të dhanve të tabelës suaj të punës. Ju duhet të hidhni atë përsëri në këtë dritare.","title":"Hidhe"},"button":{"selectedLabel":"%1 (Përzgjedhur)"},"colorbutton":{"auto":"Automatik","bgColorTitle":"Ngjyra e Prapavijës","colors":{"000":"E zezë","800000":"Ngjyrë gështenjë","8B4513":"Ngjyrë Shale Kafe","2F4F4F":"Ngjyrë Gri të errët ardëz","008080":"Ngjyrë bajukë","000080":"Ngjyrë Marine","4B0082":"Indigo","696969":"Gri e Errët","B22222":"Tullë në Flakë","A52A2A":"Ngjytë Kafe","DAA520":"Shkop i Artë","006400":"E Gjelbër e Errët","40E0D0":"Ngjyrë e Bruztë","0000CD":"E Kaltër e Mesme","800080":"Vjollcë","808080":"Gri","F00":"E Kuqe","FF8C00":"E Portokalltë e Errët","FFD700":"Ngjyrë Ari","008000":"E Gjelbërt","0FF":"Cyan","00F":"E Kaltër","EE82EE":"Vjollcë","A9A9A9":"Gri e Zbehtë","FFA07A":"Salmon i Ndritur","FFA500":"E Portokalltë","FFFF00":"E Verdhë","00FF00":"Ngjyrë Gëlqere","AFEEEE":"Ngjyrë e Bruztë e Zbehtë","ADD8E6":"E Kaltër e Ndritur","DDA0DD":"Ngjyrë Llokumi","D3D3D3":"Gri e Ndritur","FFF0F5":"Ngjyrë Purpur e Skuqur","FAEBD7":"E Bardhë Antike","FFFFE0":"E verdhë e Ndritur","F0FFF0":"Ngjyrë Nektari","F0FFFF":"Ngjyrë Qielli","F0F8FF":"E Kaltër Alice","E6E6FA":"Ngjyrë Purpur e Zbetë","FFF":"E bardhë"},"more":"Më Shumë Ngjyra...","panelTitle":"Ngjyrat","textColorTitle":"Ngjyra e Tekstit"},"colordialog":{"clear":"Pastro","highlight":"Thekso","options":"Përzgjedhjet e Ngjyrave","selected":"Ngjyra e Përzgjedhur","title":"Përzgjidh një ngjyrë"},"templates":{"button":"Shabllonet","emptyListMsg":"(Asnjë shabllon nuk është paradefinuar)","insertOption":"Zëvendëso përmbajtjen aktuale","options":"Opsionet e Shabllonit","selectPromptMsg":"Përzgjidhni shabllonin për të hapur tek redaktuesi","title":"Përmbajtja e Shabllonit"},"contextmenu":{"options":"Mundësitë e Menysë së Kontekstit"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Titull","cssClassInputLabel":"Klasa stili CSS","edit":"Redakto Div","inlineStyleInputLabel":"Stili i brendshëm","langDirLTRLabel":"Nga e majta në të djathë (LTR)","langDirLabel":"Drejtim teksti","langDirRTLLabel":"Nga e djathta në të majtë (RTL)","languageCodeInputLabel":"Kodi i Gjuhës","remove":"Largo Div","styleSelectLabel":"Stil","title":"Krijo Div Përmbajtës","toolbar":"Krijo Div Përmbajtës"},"toolbar":{"toolbarCollapse":"Zvogëlo Shiritin","toolbarExpand":"Zgjero Shiritin","toolbarGroups":{"document":"Dokument","clipboard":"Tabela Punës/Ribëje","editing":"Duke Redaktuar","forms":"Formular","basicstyles":"Stili Bazë","paragraph":"Paragraf","links":"Nyjet","insert":"Shto","styles":"Stil","colors":"Ngjyrat","tools":"Mjetet"},"toolbars":"Shiritet e Redaktuesit"},"elementspath":{"eleLabel":"Rruga e elementeve","eleTitle":"%1 element"},"find":{"find":"Gjej","findOptions":"Gjejë Alternativat","findWhat":"Gjej çka:","matchCase":"Rasti i përputhjes","matchCyclic":"Përputh ciklikun","matchWord":"Përputh fjalën e tërë","notFoundMsg":"Teksti i caktuar nuk mundej të gjendet.","replace":"Zëvendëso","replaceAll":"Zëvendëso të gjitha","replaceSuccessMsg":"%1 rast(e) u zëvendësua(n).","replaceWith":"Zëvendëso me:","title":"Gjej dhe Zëvendëso"},"fakeobjects":{"anchor":"Spirancë","flash":"Objekt flash","hiddenfield":"Fushë e fshehur","iframe":"IFrame","unknown":"Objekt i Panjohur"},"flash":{"access":"Qasja në Skriptë","accessAlways":"Gjithnjë","accessNever":"Asnjëherë","accessSameDomain":"Fusha e Njëjtë","alignAbsBottom":"Abs në Fund","alignAbsMiddle":"Abs në Mes","alignBaseline":"Baza","alignTextTop":"Koka e Tekstit","bgcolor":"Ngjyra e Prapavijës","chkFull":"Lejo Ekran të Plotë","chkLoop":"Përsëritje","chkMenu":"Lejo Menynë për Flash","chkPlay":"Auto Play","flashvars":"Variablat për Flash","hSpace":"Hapësira Horizontale","properties":"Karakteristikat për Flash","propertiesTab":"Karakteristikat","quality":"Kualiteti","qualityAutoHigh":"Automatikisht i Lartë","qualityAutoLow":"Automatikisht i Ulët","qualityBest":"Më i Miri","qualityHigh":"I Lartë","qualityLow":"Më i Ulti","qualityMedium":"I Mesëm","scale":"Shkalla","scaleAll":"Shfaq të Gjitha","scaleFit":"Përputhje të Plotë","scaleNoBorder":"Pa Kornizë","title":"Rekuizitat për Flash","vSpace":"Hapësira Vertikale","validateHSpace":"Hapësira Horizontale duhet të është numër.","validateSrc":"URL nuk duhet mbetur zbrazur.","validateVSpace":"Hapësira Vertikale duhet të është numër.","windowMode":"Window mode","windowModeOpaque":"Errët","windowModeTransparent":"Tejdukshëm","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Madhësia","voiceLabel":"Madhësia e Shkronjës","panelTitle":"Madhësia e Shkronjës"},"label":"Shkronja","panelTitle":"Emri i Shkronjës","voiceLabel":"Shkronja"},"forms":{"button":{"title":"Rekuizitat e Pullës","text":"Teskti (Vlera)","type":"LLoji","typeBtn":"Buton","typeSbm":"Dërgo","typeRst":"Rikthe"},"checkboxAndRadio":{"checkboxTitle":"Rekuizitat e Kutizë Përzgjedhëse","radioTitle":"Rekuizitat e Pullës","value":"Vlera","selected":"Përzgjedhur","required":"Required"},"form":{"title":"Rekuizitat e Formës","menu":"Rekuizitat e Formës","action":"Veprim","method":"Metoda","encoding":"Kodimi"},"hidden":{"title":"Rekuizitat e Fushës së Fshehur","name":"Emër","value":"Vlera"},"select":{"title":"Rekuizitat e Fushës së Përzgjedhur","selectInfo":"Përzgjidh Informacionin","opAvail":"Opsionet e Mundshme","value":"Vlera","size":"Madhësia","lines":"rreshtat","chkMulti":"Lejo përzgjidhje të shumëfishta","required":"Required","opText":"Teksti","opValue":"Vlera","btnAdd":"Vendos","btnModify":"Ndrysho","btnUp":"Sipër","btnDown":"Poshtë","btnSetValue":"Bëje si vlerë të përzgjedhur","btnDelete":"Grise"},"textarea":{"title":"Rekuzitat e Fushës së Tekstit","cols":"Kolonat","rows":"Rreshtat"},"textfield":{"title":"Rekuizitat e Fushës së Tekstit","name":"Emër","value":"Vlera","charWidth":"Gjerësia e Karakterit","maxChars":"Numri maksimal i karaktereve","required":"Required","type":"LLoji","typeText":"Teksti","typePass":"Fjalëkalimi","typeEmail":"Posta Elektronike","typeSearch":"Kërko","typeTel":"Numri i Telefonit","typeUrl":"URL"}},"format":{"label":"Formati","panelTitle":"Formati i Paragrafit","tag_address":"Adresa","tag_div":"Normal (DIV)","tag_h1":"Titulli 1","tag_h2":"Titulli 2","tag_h3":"Titulli 3","tag_h4":"Titulli 4","tag_h5":"Titulli 5","tag_h6":"Titulli 6","tag_p":"Normal","tag_pre":"Formatuar"},"horizontalrule":{"toolbar":"Vendos Vijë Horizontale"},"iframe":{"border":"Shfaq kufirin e kornizës","noUrl":"Ju lutemi shkruani URL-në e iframe-it","scrolling":"Lejo shiritët zvarritës","title":"Karakteristikat e IFrame","toolbar":"IFrame"},"image":{"alt":"Tekst Alternativ","border":"Korniza","btnUpload":"Dërgo në server","button2Img":"Dëshironi të e ndërroni pullën e fotos së selektuar në një foto të thjeshtë?","hSpace":"HSpace","img2Button":"Dëshironi të ndryshoni foton e përzgjedhur në pullë?","infoTab":"Informacione mbi Fotografinë","linkTab":"Nyja","lockRatio":"Mbyll Racionin","menu":"Karakteristikat e Fotografisë","resetSize":"Rikthe Madhësinë","title":"Karakteristikat e Fotografisë","titleButton":"Karakteristikat e Pullës së Fotografisë","upload":"Ngarko","urlMissing":"Mungon URL e burimit të fotografisë.","vSpace":"Hapësira Vertikale","validateBorder":"Korniza duhet të jetë numër i plotë.","validateHSpace":"Hapësira horizontale duhet të jetë numër i plotë.","validateVSpace":"Hapësira vertikale duhet të jetë numër i plotë."},"indent":{"indent":"Rrite Identin","outdent":"Zvogëlo Identin"},"smiley":{"options":"Opsionet e Ikonave","title":"Vendos Ikonë","toolbar":"Ikona"},"justify":{"block":"Zgjero","center":"Qendër","left":"Rreshto majtas","right":"Rreshto Djathtas"},"language":{"button":"Përzgjidhni gjuhën","remove":"Largoni gjuhën"},"link":{"acccessKey":"Sipas ID-së së Elementit","advanced":"Të përparuara","advisoryContentType":"Lloji i Përmbajtjes Këshillimore","advisoryTitle":"Titull","anchor":{"toolbar":"Spirancë","menu":"Redakto Spirancën","title":"Anchor Properties","name":"Emri i Spirancës","errorName":"Ju lutemi shkruani emrin e spirancës","remove":"Largo Spirancën"},"anchorId":"Sipas ID-së së Elementit","anchorName":"Sipas Emrit të Spirancës","charset":"Seti i Karaktereve të Burimeve të Nëdlidhura","cssClasses":"Klasa stili CSS","emailAddress":"Posta Elektronike","emailBody":"Trupi i Porosisë","emailSubject":"Titulli i Porosisë","id":"Id","info":"Informacione të Nyjes","langCode":"Kod gjuhe","langDir":"Drejtim teksti","langDirLTR":"Nga e majta në të djathë (LTR)","langDirRTL":"Nga e djathta në të majtë (RTL)","menu":"Redakto Nyjen","name":"Emër","noAnchors":"(Nuk ka asnjë spirancë në dokument)","noEmail":"Ju lutemi shkruani postën elektronike","noUrl":"Ju lutemi shkruani URL-në e nyjes","other":"<tjetër>","popupDependent":"E Varur (Netscape)","popupFeatures":"Karakteristikat e Dritares së Dialogut","popupFullScreen":"Ekran i Plotë  (IE)","popupLeft":"Pozita Majtas","popupLocationBar":"Shiriti i Lokacionit","popupMenuBar":"Shiriti i Menysë","popupResizable":"I ndryshueshëm","popupScrollBars":"Shiritat zvarritës","popupStatusBar":"Shiriti i Statutit","popupToolbar":"Shiriti i Mejteve","popupTop":"Top Pozita","rel":"Marrëdhëniet","selectAnchor":"Përzgjidh një Spirancë","styles":"Stil","tabIndex":"Indeksi i fletave","target":"Objektivi","targetFrame":"<frame>","targetFrameName":"Emri i Kornizës së Synuar","targetPopup":"<popup window>","targetPopupName":"Emri i Dritares së Dialogut","title":"Nyja","toAnchor":"Lidhu me spirancën në tekst","toEmail":"Posta Elektronike","toUrl":"URL","toolbar":"Nyja","type":"Lloji i Nyjes","unlink":"Largo Nyjen","upload":"Ngarko"},"list":{"bulletedlist":"Vendos/Largo Listën me Pika","numberedlist":"Vendos/Largo Listën me Numra"},"liststyle":{"armenian":"Numërim armenian","bulletedTitle":"Karakteristikat e Listës me Pulla","circle":"Rreth","decimal":"Decimal (1, 2, 3, etj.)","decimalLeadingZero":"Decimal me zerro udhëheqëse (01, 02, 03, etj.)","disc":"Disk","georgian":"Numërim gjeorgjian (an, ban, gan, etj.)","lowerAlpha":"Të vogla alfa (a, b, c, d, e, etj.)","lowerGreek":"Të vogla greke (alpha, beta, gamma, etj.)","lowerRoman":"Të vogla romake (i, ii, iii, iv, v, etj.)","none":"Asnjë","notset":"<e pazgjedhur>","numberedTitle":"Karakteristikat e Listës me Numra","square":"Katror","start":"Fillimi","type":"LLoji","upperAlpha":"Të mëdha alfa (A, B, C, D, E, etj.)","upperRoman":"Të mëdha romake (I, II, III, IV, V, etj.)","validateStartNumber":"Numri i fillimit të listës duhet të është numër i plotë."},"magicline":{"title":"Vendos paragraf këtu"},"maximize":{"maximize":"Zmadho","minimize":"Zvogëlo"},"newpage":{"toolbar":"Faqe e Re"},"pagebreak":{"alt":"Thyerja e Faqes","toolbar":"Vendos Thyerje Faqeje për Shtyp"},"pastetext":{"button":"Hidhe si tekst të thjeshtë","title":"Hidhe si Tekst të Thjeshtë"},"pastefromword":{"confirmCleanup":"Teksti që dëshironi të e hidhni siç duket është kopjuar nga Word-i. Dëshironi të e pastroni para se të e hidhni?","error":"Nuk ishte e mundur të fshiheshin të dhënat e hedhura për shkak të një gabimi të brendshëm","title":"Hidhe nga Word-i","toolbar":"Hidhe nga Word-i"},"preview":{"preview":"Parashiko"},"print":{"toolbar":"Shtype"},"removeformat":{"toolbar":"Largo Formatin"},"save":{"toolbar":"Ruaje"},"selectall":{"toolbar":"Përzgjidh të Gjitha"},"showblocks":{"toolbar":"Shfaq Blloqet"},"sourcearea":{"toolbar":"Burimi"},"specialchar":{"options":"Mundësitë për Karaktere Speciale","title":"Përzgjidh Karakter Special","toolbar":"Vendos Karakter Special"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stil","panelTitle":"Stilet e Formatimit","panelTitle1":"Stilet e Bllokut","panelTitle2":"Stili i Brendshëm","panelTitle3":"Stilet e Objektit"},"table":{"border":"Madhësia e kornizave","caption":"Titull","cell":{"menu":"Qeli","insertBefore":"Shto Qeli Para","insertAfter":"Shto Qeli Prapa","deleteCell":"Gris Qelitë","merge":"Bashko Qelitë","mergeRight":"Bashko Djathtas","mergeDown":"Bashko Poshtë","splitHorizontal":"Ndaj Qelinë Horizontalisht","splitVertical":"Ndaj Qelinë Vertikalisht","title":"Rekuizitat e Qelisë","cellType":"Lloji i Qelisë","rowSpan":"Bashko Rreshtat","colSpan":"Bashko Kolonat","wordWrap":"Fund i Fjalës","hAlign":"Bashkimi Horizontal","vAlign":"Bashkimi Vertikal","alignBaseline":"Baza","bgColor":"Ngjyra e Prapavijës","borderColor":"Ngjyra e Kornizave","data":"Të dhënat","header":"Koka","yes":"Po","no":"Jo","invalidWidth":"Gjerësia e qelisë duhet të jetë numër.","invalidHeight":"Lartësia e qelisë duhet të jetë numër.","invalidRowSpan":"Hapësira e rreshtave duhet të jetë numër i plotë.","invalidColSpan":"Hapësira e kolonave duhet të jetë numër i plotë.","chooseColor":"Përzgjidh"},"cellPad":"Mbushja e qelisë","cellSpace":"Hapësira e qelisë","column":{"menu":"Kolona","insertBefore":"Vendos Kolonë Para","insertAfter":"Vendos Kolonë Pas","deleteColumn":"Gris Kolonat"},"columns":"Kolonat","deleteTable":"Gris Tabelën","headers":"Kokat","headersBoth":"Së bashku","headersColumn":"Kolona e parë","headersNone":"Asnjë","headersRow":"Rreshti i Parë","invalidBorder":"Madhësia e kufinjve duhet të jetë numër.","invalidCellPadding":"Mbushja e qelisë duhet të jetë numër pozitiv.","invalidCellSpacing":"Hapësira e qelisë duhet të jetë numër pozitiv.","invalidCols":"Numri i kolonave duhet të jetë numër më i madh se 0.","invalidHeight":"Lartësia e tabelës duhet të jetë numër.","invalidRows":"Numri i rreshtave duhet të jetë numër më i madh se 0.","invalidWidth":"Gjerësia e tabelës duhet të jetë numër.","menu":"Karakteristikat e Tabelës","row":{"menu":"Rreshti","insertBefore":"Shto Rresht Para","insertAfter":"Shto Rresht Prapa","deleteRow":"Gris Rreshtat"},"rows":"Rreshtat","summary":"Përmbledhje","title":"Karakteristikat e Tabelës","toolbar":"Tabela","widthPc":"përqind","widthPx":"piksell","widthUnit":"njësia e gjerësisë"},"undo":{"redo":"Ribëje","undo":"Rizhbëje"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
+CKEDITOR.lang['sq']={"editor":"Redaktues i Pasur Teksti","editorPanel":"Paneli i redaktuesit të tekstit të plotë","common":{"editorHelp":"Shtyp ALT 0 për ndihmë","browseServer":"Shfleto në Server","url":"URL","protocol":"Protokolli","upload":"Ngarko","uploadSubmit":"Dërgo në server","image":"Imazh","flash":"Objekt flash","form":"Formular","checkbox":"Checkbox","radio":"Buton radio","textField":"Fushë tekst","textarea":"Hapësirë tekst","hiddenField":"Fushë e fshehur","button":"Buton","select":"Menu zgjedhjeje","imageButton":"Buton imazhi","notSet":"<e pazgjedhur>","id":"Id","name":"Emër","langDir":"Kod gjuhe","langDirLtr":"Nga e majta në të djathtë (LTR)","langDirRtl":"Nga e djathta në të majtë (RTL)","langCode":"Kod gjuhe","longDescr":"Përshkrim i hollësishëm","cssClass":"Klasa stili CSS","advisoryTitle":"Titull","cssStyle":"Stil","ok":"OK","cancel":"Anulo","close":"Mbyll","preview":"Parashiko","resize":"Ripërmaso","generalTab":"Të përgjithshme","advancedTab":"Të përparuara","validateNumberFailed":"Vlera e futur nuk është një numër","confirmNewPage":"Çdo ndryshim që nuk është ruajtur do humbasë. Je i sigurtë që dëshiron të krijosh një faqe të re?","confirmCancel":"Disa opsione kanë ndryshuar. Je i sigurtë që dëshiron ta mbyllësh dritaren?","options":"Opsione","target":"Objektivi","targetNew":"Dritare e re (_blank)","targetTop":"Dritare në plan të parë (_top)","targetSelf":"E njëjta dritare (_self)","targetParent":"Dritarja prind (_parent)","langDirLTR":"Nga e majta në të djathë (LTR)","langDirRTL":"Nga e djathta në të majtë (RTL)","styles":"Stil","cssClasses":"Klasa Stili CSS","width":"Gjerësi","height":"Lartësi","align":"Rreshtim","alignLeft":"Majtas","alignRight":"Djathtas","alignCenter":"Qendër","alignJustify":"Zgjero","alignTop":"Lart","alignMiddle":"Në mes","alignBottom":"Poshtë","alignNone":"Asnjë","invalidValue":"Vlerë e pavlefshme","invalidHeight":"Lartësia duhet të jetë një numër","invalidWidth":"Gjerësia duhet të jetë një numër","invalidCssLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme CSS (px, %, in, cm, mm, em, ex, pt ose pc).","invalidHtmlLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme HTML (px ose %)","invalidInlineStyle":"Stili inline duhet të jetë një apo disa vlera të formatit \"emër: vlerë\", ndarë nga pikëpresje.","cssLengthTooltip":"Fut një numër për vlerën në pixel apo një numër me një njësi të vlefshme CSS (px, %, in, cm, mm, ex, pt, ose pc).","unavailable":"%1<span class=\"cke_accessibility\">, i padisponueshëm</span>","keyboard":{"8":"Prapa","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Grise","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Të drejtat  e kopjimit &copy; $1. Të gjitha të drejtat e rezervuara.","dlgTitle":"Rreth CKEditor","help":"Kontrollo $1 për ndihmë.","moreInfo":"Për informacione rreth licencave shih faqen tonë:","title":"Rreth CKEditor","userGuide":"Udhëzuesi i Shfrytëzuesit të CKEditor"},"basicstyles":{"bold":"Trash","italic":"Pjerrët","strike":"Nëpërmes","subscript":"Nën-skriptë","superscript":"Super-skriptë","underline":"Nënvijëzuar"},"bidi":{"ltr":"Drejtimi i tekstit nga e majta në të djathtë","rtl":"Drejtimi i tekstit nga e djathta në të majtë"},"blockquote":{"toolbar":"Citatet"},"clipboard":{"copy":"Kopjo","copyError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e kopjimit. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+C).","cut":"Preje","cutError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e prerjes. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+X).","paste":"Hidhe","pasteArea":"Hapësira Hedhëse","pasteMsg":"Ju lutemi hidhni brenda kutizës në vijim duke shfrytëzuar tastierën (<strong>Ctrl/Cmd+V</strong>) dhe shtypni Mirë.","securityMsg":"Për shkak të dhënave të sigurisë së shfletuesit tuaj, redaktuesi nuk është në gjendje të i qaset drejtpërdrejtë të dhanve të tabelës suaj të punës. Ju duhet të hidhni atë përsëri në këtë dritare.","title":"Hidhe"},"button":{"selectedLabel":"%1 (Përzgjedhur)"},"colorbutton":{"auto":"Automatik","bgColorTitle":"Ngjyra e Prapavijës","colors":{"000":"E zezë","800000":"Ngjyrë gështenjë","8B4513":"Ngjyrë Shale Kafe","2F4F4F":"Ngjyrë Gri të errët ardëz","008080":"Ngjyrë bajukë","000080":"Ngjyrë Marine","4B0082":"Indigo","696969":"Gri e Errët","B22222":"Tullë në Flakë","A52A2A":"Ngjytë Kafe","DAA520":"Shkop i Artë","006400":"E Gjelbër e Errët","40E0D0":"Ngjyrë e Bruztë","0000CD":"E Kaltër e Mesme","800080":"Vjollcë","808080":"Gri","F00":"E Kuqe","FF8C00":"E Portokalltë e Errët","FFD700":"Ngjyrë Ari","008000":"E Gjelbërt","0FF":"Cyan","00F":"E Kaltër","EE82EE":"Vjollcë","A9A9A9":"Gri e Zbehtë","FFA07A":"Salmon i Ndritur","FFA500":"E Portokalltë","FFFF00":"E Verdhë","00FF00":"Ngjyrë Gëlqere","AFEEEE":"Ngjyrë e Bruztë e Zbehtë","ADD8E6":"E Kaltër e Ndritur","DDA0DD":"Ngjyrë Llokumi","D3D3D3":"Gri e Ndritur","FFF0F5":"Ngjyrë Purpur e Skuqur","FAEBD7":"E Bardhë Antike","FFFFE0":"E verdhë e Ndritur","F0FFF0":"Ngjyrë Nektari","F0FFFF":"Ngjyrë Qielli","F0F8FF":"E Kaltër Alice","E6E6FA":"Ngjyrë Purpur e Zbetë","FFF":"E bardhë","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Më Shumë Ngjyra...","panelTitle":"Ngjyrat","textColorTitle":"Ngjyra e Tekstit"},"colordialog":{"clear":"Pastro","highlight":"Thekso","options":"Përzgjedhjet e Ngjyrave","selected":"Ngjyra e Përzgjedhur","title":"Përzgjidh një ngjyrë"},"templates":{"button":"Shabllonet","emptyListMsg":"(Asnjë shabllon nuk është paradefinuar)","insertOption":"Zëvendëso përmbajtjen aktuale","options":"Opsionet e Shabllonit","selectPromptMsg":"Përzgjidhni shabllonin për të hapur tek redaktuesi","title":"Përmbajtja e Shabllonit"},"contextmenu":{"options":"Mundësitë e Menysë së Kontekstit"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Titull","cssClassInputLabel":"Klasa stili CSS","edit":"Redakto Div","inlineStyleInputLabel":"Stili i brendshëm","langDirLTRLabel":"Nga e majta në të djathë (LTR)","langDirLabel":"Drejtim teksti","langDirRTLLabel":"Nga e djathta në të majtë (RTL)","languageCodeInputLabel":"Kodi i Gjuhës","remove":"Largo Div","styleSelectLabel":"Stil","title":"Krijo Div Përmbajtës","toolbar":"Krijo Div Përmbajtës"},"toolbar":{"toolbarCollapse":"Zvogëlo Shiritin","toolbarExpand":"Zgjero Shiritin","toolbarGroups":{"document":"Dokument","clipboard":"Tabela Punës/Ribëje","editing":"Duke Redaktuar","forms":"Formular","basicstyles":"Stili Bazë","paragraph":"Paragraf","links":"Nyjet","insert":"Shto","styles":"Stil","colors":"Ngjyrat","tools":"Mjetet"},"toolbars":"Shiritet e Redaktuesit"},"elementspath":{"eleLabel":"Rruga e elementeve","eleTitle":"%1 element"},"find":{"find":"Gjej","findOptions":"Gjejë Alternativat","findWhat":"Gjej çka:","matchCase":"Rasti i përputhjes","matchCyclic":"Përputh ciklikun","matchWord":"Përputh fjalën e tërë","notFoundMsg":"Teksti i caktuar nuk mundej të gjendet.","replace":"Zëvendëso","replaceAll":"Zëvendëso të gjitha","replaceSuccessMsg":"%1 rast(e) u zëvendësua(n).","replaceWith":"Zëvendëso me:","title":"Gjej dhe Zëvendëso"},"fakeobjects":{"anchor":"Spirancë","flash":"Objekt flash","hiddenfield":"Fushë e fshehur","iframe":"IFrame","unknown":"Objekt i Panjohur"},"flash":{"access":"Qasja në Skriptë","accessAlways":"Gjithnjë","accessNever":"Asnjëherë","accessSameDomain":"Fusha e Njëjtë","alignAbsBottom":"Abs në Fund","alignAbsMiddle":"Abs në Mes","alignBaseline":"Baza","alignTextTop":"Koka e Tekstit","bgcolor":"Ngjyra e Prapavijës","chkFull":"Lejo Ekran të Plotë","chkLoop":"Përsëritje","chkMenu":"Lejo Menynë për Flash","chkPlay":"Auto Play","flashvars":"Variablat për Flash","hSpace":"Hapësira Horizontale","properties":"Karakteristikat për Flash","propertiesTab":"Karakteristikat","quality":"Kualiteti","qualityAutoHigh":"Automatikisht i Lartë","qualityAutoLow":"Automatikisht i Ulët","qualityBest":"Më i Miri","qualityHigh":"I Lartë","qualityLow":"Më i Ulti","qualityMedium":"I Mesëm","scale":"Shkalla","scaleAll":"Shfaq të Gjitha","scaleFit":"Përputhje të Plotë","scaleNoBorder":"Pa Kornizë","title":"Rekuizitat për Flash","vSpace":"Hapësira Vertikale","validateHSpace":"Hapësira Horizontale duhet të është numër.","validateSrc":"URL nuk duhet mbetur zbrazur.","validateVSpace":"Hapësira Vertikale duhet të është numër.","windowMode":"Window mode","windowModeOpaque":"Errët","windowModeTransparent":"Tejdukshëm","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Madhësia","voiceLabel":"Madhësia e Shkronjës","panelTitle":"Madhësia e Shkronjës"},"label":"Shkronja","panelTitle":"Emri i Shkronjës","voiceLabel":"Shkronja"},"forms":{"button":{"title":"Rekuizitat e Pullës","text":"Teskti (Vlera)","type":"LLoji","typeBtn":"Buton","typeSbm":"Dërgo","typeRst":"Rikthe"},"checkboxAndRadio":{"checkboxTitle":"Rekuizitat e Kutizë Përzgjedhëse","radioTitle":"Rekuizitat e Pullës","value":"Vlera","selected":"Përzgjedhur","required":"Required"},"form":{"title":"Rekuizitat e Formës","menu":"Rekuizitat e Formës","action":"Veprim","method":"Metoda","encoding":"Kodimi"},"hidden":{"title":"Rekuizitat e Fushës së Fshehur","name":"Emër","value":"Vlera"},"select":{"title":"Rekuizitat e Fushës së Përzgjedhur","selectInfo":"Përzgjidh Informacionin","opAvail":"Opsionet e Mundshme","value":"Vlera","size":"Madhësia","lines":"rreshtat","chkMulti":"Lejo përzgjidhje të shumëfishta","required":"Required","opText":"Teksti","opValue":"Vlera","btnAdd":"Vendos","btnModify":"Ndrysho","btnUp":"Sipër","btnDown":"Poshtë","btnSetValue":"Bëje si vlerë të përzgjedhur","btnDelete":"Grise"},"textarea":{"title":"Rekuzitat e Fushës së Tekstit","cols":"Kolonat","rows":"Rreshtat"},"textfield":{"title":"Rekuizitat e Fushës së Tekstit","name":"Emër","value":"Vlera","charWidth":"Gjerësia e Karakterit","maxChars":"Numri maksimal i karaktereve","required":"Required","type":"LLoji","typeText":"Teksti","typePass":"Fjalëkalimi","typeEmail":"Posta Elektronike","typeSearch":"Kërko","typeTel":"Numri i Telefonit","typeUrl":"URL"}},"format":{"label":"Formati","panelTitle":"Formati i Paragrafit","tag_address":"Adresa","tag_div":"Normal (DIV)","tag_h1":"Titulli 1","tag_h2":"Titulli 2","tag_h3":"Titulli 3","tag_h4":"Titulli 4","tag_h5":"Titulli 5","tag_h6":"Titulli 6","tag_p":"Normal","tag_pre":"Formatuar"},"horizontalrule":{"toolbar":"Vendos Vijë Horizontale"},"iframe":{"border":"Shfaq kufirin e kornizës","noUrl":"Ju lutemi shkruani URL-në e iframe-it","scrolling":"Lejo shiritët zvarritës","title":"Karakteristikat e IFrame","toolbar":"IFrame"},"image":{"alt":"Tekst Alternativ","border":"Korniza","btnUpload":"Dërgo në server","button2Img":"Dëshironi të e ndërroni pullën e fotos së selektuar në një foto të thjeshtë?","hSpace":"HSpace","img2Button":"Dëshironi të ndryshoni foton e përzgjedhur në pullë?","infoTab":"Informacione mbi Fotografinë","linkTab":"Nyja","lockRatio":"Mbyll Racionin","menu":"Karakteristikat e Fotografisë","resetSize":"Rikthe Madhësinë","title":"Karakteristikat e Fotografisë","titleButton":"Karakteristikat e Pullës së Fotografisë","upload":"Ngarko","urlMissing":"Mungon URL e burimit të fotografisë.","vSpace":"Hapësira Vertikale","validateBorder":"Korniza duhet të jetë numër i plotë.","validateHSpace":"Hapësira horizontale duhet të jetë numër i plotë.","validateVSpace":"Hapësira vertikale duhet të jetë numër i plotë."},"indent":{"indent":"Rrite Identin","outdent":"Zvogëlo Identin"},"smiley":{"options":"Opsionet e Ikonave","title":"Vendos Ikonë","toolbar":"Ikona"},"justify":{"block":"Zgjero","center":"Qendër","left":"Rreshto majtas","right":"Rreshto Djathtas"},"language":{"button":"Përzgjidhni gjuhën","remove":"Largoni gjuhën"},"link":{"acccessKey":"Sipas ID-së së Elementit","advanced":"Të përparuara","advisoryContentType":"Lloji i Përmbajtjes Këshillimore","advisoryTitle":"Titull","anchor":{"toolbar":"Spirancë","menu":"Redakto Spirancën","title":"Anchor Properties","name":"Emri i Spirancës","errorName":"Ju lutemi shkruani emrin e spirancës","remove":"Largo Spirancën"},"anchorId":"Sipas ID-së së Elementit","anchorName":"Sipas Emrit të Spirancës","charset":"Seti i Karaktereve të Burimeve të Nëdlidhura","cssClasses":"Klasa stili CSS","download":"Force Download","displayText":"Display Text","emailAddress":"Posta Elektronike","emailBody":"Trupi i Porosisë","emailSubject":"Titulli i Porosisë","id":"Id","info":"Informacione të Nyjes","langCode":"Kod gjuhe","langDir":"Drejtim teksti","langDirLTR":"Nga e majta në të djathë (LTR)","langDirRTL":"Nga e djathta në të majtë (RTL)","menu":"Redakto Nyjen","name":"Emër","noAnchors":"(Nuk ka asnjë spirancë në dokument)","noEmail":"Ju lutemi shkruani postën elektronike","noUrl":"Ju lutemi shkruani URL-në e nyjes","other":"<tjetër>","popupDependent":"E Varur (Netscape)","popupFeatures":"Karakteristikat e Dritares së Dialogut","popupFullScreen":"Ekran i Plotë  (IE)","popupLeft":"Pozita Majtas","popupLocationBar":"Shiriti i Lokacionit","popupMenuBar":"Shiriti i Menysë","popupResizable":"I ndryshueshëm","popupScrollBars":"Shiritat zvarritës","popupStatusBar":"Shiriti i Statutit","popupToolbar":"Shiriti i Mejteve","popupTop":"Top Pozita","rel":"Marrëdhëniet","selectAnchor":"Përzgjidh një Spirancë","styles":"Stil","tabIndex":"Indeksi i fletave","target":"Objektivi","targetFrame":"<frame>","targetFrameName":"Emri i Kornizës së Synuar","targetPopup":"<popup window>","targetPopupName":"Emri i Dritares së Dialogut","title":"Nyja","toAnchor":"Lidhu me spirancën në tekst","toEmail":"Posta Elektronike","toUrl":"URL","toolbar":"Nyja","type":"Lloji i Nyjes","unlink":"Largo Nyjen","upload":"Ngarko"},"list":{"bulletedlist":"Vendos/Largo Listën me Pika","numberedlist":"Vendos/Largo Listën me Numra"},"liststyle":{"armenian":"Numërim armenian","bulletedTitle":"Karakteristikat e Listës me Pulla","circle":"Rreth","decimal":"Decimal (1, 2, 3, etj.)","decimalLeadingZero":"Decimal me zerro udhëheqëse (01, 02, 03, etj.)","disc":"Disk","georgian":"Numërim gjeorgjian (an, ban, gan, etj.)","lowerAlpha":"Të vogla alfa (a, b, c, d, e, etj.)","lowerGreek":"Të vogla greke (alpha, beta, gamma, etj.)","lowerRoman":"Të vogla romake (i, ii, iii, iv, v, etj.)","none":"Asnjë","notset":"<e pazgjedhur>","numberedTitle":"Karakteristikat e Listës me Numra","square":"Katror","start":"Fillimi","type":"LLoji","upperAlpha":"Të mëdha alfa (A, B, C, D, E, etj.)","upperRoman":"Të mëdha romake (I, II, III, IV, V, etj.)","validateStartNumber":"Numri i fillimit të listës duhet të është numër i plotë."},"magicline":{"title":"Vendos paragraf këtu"},"maximize":{"maximize":"Zmadho","minimize":"Zvogëlo"},"newpage":{"toolbar":"Faqe e Re"},"pagebreak":{"alt":"Thyerja e Faqes","toolbar":"Vendos Thyerje Faqeje për Shtyp"},"pastetext":{"button":"Hidhe si tekst të thjeshtë","title":"Hidhe si Tekst të Thjeshtë"},"pastefromword":{"confirmCleanup":"Teksti që dëshironi të e hidhni siç duket është kopjuar nga Word-i. Dëshironi të e pastroni para se të e hidhni?","error":"Nuk ishte e mundur të fshiheshin të dhënat e hedhura për shkak të një gabimi të brendshëm","title":"Hidhe nga Word-i","toolbar":"Hidhe nga Word-i"},"preview":{"preview":"Parashiko"},"print":{"toolbar":"Shtype"},"removeformat":{"toolbar":"Largo Formatin"},"save":{"toolbar":"Ruaje"},"selectall":{"toolbar":"Përzgjidh të Gjitha"},"showblocks":{"toolbar":"Shfaq Blloqet"},"sourcearea":{"toolbar":"Burimi"},"specialchar":{"options":"Mundësitë për Karaktere Speciale","title":"Përzgjidh Karakter Special","toolbar":"Vendos Karakter Special"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stil","panelTitle":"Stilet e Formatimit","panelTitle1":"Stilet e Bllokut","panelTitle2":"Stili i Brendshëm","panelTitle3":"Stilet e Objektit"},"table":{"border":"Madhësia e kornizave","caption":"Titull","cell":{"menu":"Qeli","insertBefore":"Shto Qeli Para","insertAfter":"Shto Qeli Prapa","deleteCell":"Gris Qelitë","merge":"Bashko Qelitë","mergeRight":"Bashko Djathtas","mergeDown":"Bashko Poshtë","splitHorizontal":"Ndaj Qelinë Horizontalisht","splitVertical":"Ndaj Qelinë Vertikalisht","title":"Rekuizitat e Qelisë","cellType":"Lloji i Qelisë","rowSpan":"Bashko Rreshtat","colSpan":"Bashko Kolonat","wordWrap":"Fund i Fjalës","hAlign":"Bashkimi Horizontal","vAlign":"Bashkimi Vertikal","alignBaseline":"Baza","bgColor":"Ngjyra e Prapavijës","borderColor":"Ngjyra e Kornizave","data":"Të dhënat","header":"Koka","yes":"Po","no":"Jo","invalidWidth":"Gjerësia e qelisë duhet të jetë numër.","invalidHeight":"Lartësia e qelisë duhet të jetë numër.","invalidRowSpan":"Hapësira e rreshtave duhet të jetë numër i plotë.","invalidColSpan":"Hapësira e kolonave duhet të jetë numër i plotë.","chooseColor":"Përzgjidh"},"cellPad":"Mbushja e qelisë","cellSpace":"Hapësira e qelisë","column":{"menu":"Kolona","insertBefore":"Vendos Kolonë Para","insertAfter":"Vendos Kolonë Pas","deleteColumn":"Gris Kolonat"},"columns":"Kolonat","deleteTable":"Gris Tabelën","headers":"Kokat","headersBoth":"Së bashku","headersColumn":"Kolona e parë","headersNone":"Asnjë","headersRow":"Rreshti i Parë","invalidBorder":"Madhësia e kufinjve duhet të jetë numër.","invalidCellPadding":"Mbushja e qelisë duhet të jetë numër pozitiv.","invalidCellSpacing":"Hapësira e qelisë duhet të jetë numër pozitiv.","invalidCols":"Numri i kolonave duhet të jetë numër më i madh se 0.","invalidHeight":"Lartësia e tabelës duhet të jetë numër.","invalidRows":"Numri i rreshtave duhet të jetë numër më i madh se 0.","invalidWidth":"Gjerësia e tabelës duhet të jetë numër.","menu":"Karakteristikat e Tabelës","row":{"menu":"Rreshti","insertBefore":"Shto Rresht Para","insertAfter":"Shto Rresht Prapa","deleteRow":"Gris Rreshtat"},"rows":"Rreshtat","summary":"Përmbledhje","title":"Karakteristikat e Tabelës","toolbar":"Tabela","widthPc":"përqind","widthPx":"piksell","widthUnit":"njësia e gjerësisë"},"undo":{"redo":"Ribëje","undo":"Rizhbëje"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/lang/sr-latn.js
index 708d262cdd2..40211bcfa90 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/sr-latn.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/sr-latn.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sr-latn']={"editor":"Bogati uređivač teksta","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","flash":"Fleš","form":"Forma","checkbox":"Polje za potvrdu","radio":"Radio-dugme","textField":"Tekstualno polje","textarea":"Zona teksta","hiddenField":"Skriveno polje","button":"Dugme","select":"Izborno polje","imageButton":"Dugme sa slikom","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smer jezika","langDirLtr":"S leva na desno (LTR)","langDirRtl":"S desna na levo (RTL)","langCode":"Kôd jezika","longDescr":"Pun opis URL","cssClass":"Stylesheet klase","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Otkaži","close":"Zatvori","preview":"Izgled stranice","resize":"Resize","generalTab":"Opšte","advancedTab":"Napredni tagovi","validateNumberFailed":"Ova vrednost nije broj.","confirmNewPage":"Nesačuvane promene ovog sadržaja će biti izgubljene. Jeste li sigurni da želita da učitate novu stranu?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Opcije","target":"Meta","targetNew":"Novi prozor (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S leva na desno (LTR)","langDirRTL":"S desna na levo (RTL)","styles":"Stil","cssClasses":"Stylesheet klase","width":"Širina","height":"Visina","align":"Ravnanje","alignLeft":"Levo","alignRight":"Desno","alignCenter":"Sredina","alignJustify":"Obostrano ravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dole","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Podebljano","italic":"Kurziv","strike":"Precrtano","subscript":"Indeks","superscript":"Stepen","underline":"Podvučeno"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+C).","cut":"Iseci","cutError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog isecanja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+X).","paste":"Zalepi","pasteArea":"Prostor za lepljenje","pasteMsg":"Molimo Vas da zalepite unutar donje povrine koristeći tastaturnu prečicu (<STRONG>Ctrl/Cmd+V</STRONG>) i da pritisnete <STRONG>OK</STRONG>.","securityMsg":"Zbog sigurnosnih postavki vašeg pregledača, editor nije u mogućnosti da direktno pristupi podacima u klipbordu. Potrebno je da zalepite još jednom u ovom prozoru.","title":"Zalepi"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatski","bgColorTitle":"Boja pozadine","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"Više boja...","panelTitle":"Colors","textColorTitle":"Boja teksta"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Obrasci","emptyListMsg":"(Nema definisanih obrazaca)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Molimo Vas da odaberete obrazac koji ce biti primenjen na stranicu (trenutni sadržaj ce biti obrisan):","title":"Obrasci za sadržaj"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory naslov","cssClassInputLabel":"Stylesheet klase","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"S leva na desno (LTR)","langDirLabel":"Smer jezika","langDirRTLLabel":"S desna na levo (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Stil","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Suzi alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Alatne trake"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Pretraga","findOptions":"Find Options","findWhat":"Pronadi:","matchCase":"Razlikuj mala i velika slova","matchCyclic":"Match cyclic","matchWord":"Uporedi cele reci","notFoundMsg":"Traženi tekst nije pronađen.","replace":"Zamena","replaceAll":"Zameni sve","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Zameni sa:","title":"Find and Replace"},"fakeobjects":{"anchor":"Unesi/izmeni sidro","flash":"Flash Animation","hiddenfield":"Skriveno polje","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs dole","alignAbsMiddle":"Abs sredina","alignBaseline":"Bazno","alignTextTop":"Vrh teksta","bgcolor":"Boja pozadine","chkFull":"Allow Fullscreen","chkLoop":"Ponavljaj","chkMenu":"Uključi fleš meni","chkPlay":"Automatski start","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Osobine fleša","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Skaliraj","scaleAll":"Prikaži sve","scaleFit":"Popuni površinu","scaleNoBorder":"Bez ivice","title":"Osobine fleša","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"Unesite URL linka","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Veličina fonta","voiceLabel":"Font Size","panelTitle":"Veličina fonta"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"forms":{"button":{"title":"Osobine dugmeta","text":"Tekst (vrednost)","type":"Tip","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Osobine polja za potvrdu","radioTitle":"Osobine radio-dugmeta","value":"Vrednost","selected":"Označeno","required":"Required"},"form":{"title":"Osobine forme","menu":"Osobine forme","action":"Akcija","method":"Metoda","encoding":"Encoding"},"hidden":{"title":"Osobine skrivenog polja","name":"Naziv","value":"Vrednost"},"select":{"title":"Osobine izbornog polja","selectInfo":"Info","opAvail":"Dostupne opcije","value":"Vrednost","size":"Veličina","lines":"linija","chkMulti":"Dozvoli višestruku selekciju","required":"Required","opText":"Tekst","opValue":"Vrednost","btnAdd":"Dodaj","btnModify":"Izmeni","btnUp":"Gore","btnDown":"Dole","btnSetValue":"Podesi kao označenu vrednost","btnDelete":"Obriši"},"textarea":{"title":"Osobine zone teksta","cols":"Broj kolona","rows":"Broj redova"},"textfield":{"title":"Osobine tekstualnog polja","name":"Naziv","value":"Vrednost","charWidth":"Širina (karaktera)","maxChars":"Maksimalno karaktera","required":"Required","type":"Tip","typeText":"Tekst","typePass":"Lozinka","typeEmail":"Email","typeSearch":"Pretraži","typeTel":"Broj telefona","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adresa","tag_div":"Normalno (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Normal","tag_pre":"Formatirano"},"horizontalrule":{"toolbar":"Unesi horizontalnu liniju"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Alternativni tekst","border":"Okvir","btnUpload":"Pošalji na server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Info slike","linkTab":"Link","lockRatio":"Zaključaj odnos","menu":"Osobine slika","resetSize":"Resetuj veličinu","title":"Osobine slika","titleButton":"Osobine dugmeta sa slikom","upload":"Pošalji","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Uvećaj levu marginu","outdent":"Smanji levu marginu"},"smiley":{"options":"Smiley Options","title":"Unesi smajlija","toolbar":"Smajli"},"justify":{"block":"Obostrano ravnanje","center":"Centriran tekst","left":"Levo ravnanje","right":"Desno ravnanje"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Pristupni taster","advanced":"Napredni tagovi","advisoryContentType":"Advisory vrsta sadržaja","advisoryTitle":"Advisory naslov","anchor":{"toolbar":"Unesi/izmeni sidro","menu":"Osobine sidra","title":"Osobine sidra","name":"Naziv sidra","errorName":"Unesite naziv sidra","remove":"Ukloni sidro"},"anchorId":"Po Id-u elementa","anchorName":"Po nazivu sidra","charset":"Linked Resource Charset","cssClasses":"Stylesheet klase","emailAddress":"E-Mail adresa","emailBody":"Sadržaj poruke","emailSubject":"Naslov","id":"Id","info":"Link Info","langCode":"Smer jezika","langDir":"Smer jezika","langDirLTR":"S leva na desno (LTR)","langDirRTL":"S desna na levo (RTL)","menu":"Izmeni link","name":"Naziv","noAnchors":"(Nema dostupnih sidra)","noEmail":"Otkucajte adresu elektronske pote","noUrl":"Unesite URL linka","other":"<остало>","popupDependent":"Zavisno (Netscape)","popupFeatures":"Mogućnosti popup prozora","popupFullScreen":"Prikaz preko celog ekrana (IE)","popupLeft":"Od leve ivice ekrana (px)","popupLocationBar":"Lokacija","popupMenuBar":"Kontekstni meni","popupResizable":"Promenljive veličine","popupScrollBars":"Scroll bar","popupStatusBar":"Statusna linija","popupToolbar":"Toolbar","popupTop":"Od vrha ekrana (px)","rel":"Odnos","selectAnchor":"Odaberi sidro","styles":"Stil","tabIndex":"Tab indeks","target":"Meta","targetFrame":"<okvir>","targetFrameName":"Naziv odredišnog frejma","targetPopup":"<popup prozor>","targetPopupName":"Naziv popup prozora","title":"Link","toAnchor":"Sidro na ovoj stranici","toEmail":"E-Mail","toUrl":"URL","toolbar":"Unesi/izmeni link","type":"Vrsta linka","unlink":"Ukloni link","upload":"Pošalji"},"list":{"bulletedlist":"Nenabrojiva lista","numberedlist":"Nabrojiva lista"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"Nova stranica"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Zalepi kao čist tekst","title":"Zalepi kao čist tekst"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Zalepi iz Worda","toolbar":"Zalepi iz Worda"},"preview":{"preview":"Izgled stranice"},"print":{"toolbar":"Štampa"},"removeformat":{"toolbar":"Ukloni formatiranje"},"save":{"toolbar":"Sačuvaj"},"selectall":{"toolbar":"Označi sve"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Kôd"},"specialchar":{"options":"Special Character Options","title":"Odaberite specijalni karakter","toolbar":"Unesi specijalni karakter"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stil","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Veličina okvira","caption":"Naslov tabele","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Obriši ćelije","merge":"Spoj celije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Razmak ćelija","cellSpace":"Ćelijski prostor","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Obriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tabelu","headers":"Zaglavlja","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"None","headersRow":"Prvi red","invalidBorder":"Veličina okvira mora biti broj.","invalidCellPadding":"Padding polja mora biti pozitivan broj.","invalidCellSpacing":"Razmak između ćelija mora biti pozitivan broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tabele mora biti broj.","invalidRows":"Broj redova mora biti veći od 0.","invalidWidth":"Širina tabele mora biti broj.","menu":"Osobine tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Obriši redove"},"rows":"Redova","summary":"Sažetak","title":"Osobine tabele","toolbar":"Tabela","widthPc":"procenata","widthPx":"piksela","widthUnit":"jedinica za širinu"},"undo":{"redo":"Ponovi akciju","undo":"Poni�ti akciju"},"wsc":{"btnIgnore":"Ignoriši","btnIgnoreAll":"Ignoriši sve","btnReplace":"Zameni","btnReplaceAll":"Zameni sve","btnUndo":"Vrati akciju","changeTo":"Izmeni","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Provera spelovanja nije instalirana. Da li želite da je skinete sa Interneta?","manyChanges":"Provera spelovanja završena: %1 reč(i) je izmenjeno","noChanges":"Provera spelovanja završena: Nije izmenjena nijedna rec","noMispell":"Provera spelovanja završena: greške nisu pronadene","noSuggestions":"- Bez sugestija -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Nije u rečniku","oneChange":"Provera spelovanja završena: Izmenjena je jedna reč","progress":"Provera spelovanja u toku...","title":"Spell Checker","toolbar":"Proveri spelovanje"}};
\ No newline at end of file
+CKEDITOR.lang['sr-latn']={"editor":"Bogati uređivač teksta","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","flash":"Fleš","form":"Forma","checkbox":"Polje za potvrdu","radio":"Radio-dugme","textField":"Tekstualno polje","textarea":"Zona teksta","hiddenField":"Skriveno polje","button":"Dugme","select":"Izborno polje","imageButton":"Dugme sa slikom","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smer jezika","langDirLtr":"S leva na desno (LTR)","langDirRtl":"S desna na levo (RTL)","langCode":"Kôd jezika","longDescr":"Pun opis URL","cssClass":"Stylesheet klase","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Otkaži","close":"Zatvori","preview":"Izgled stranice","resize":"Resize","generalTab":"Opšte","advancedTab":"Napredni tagovi","validateNumberFailed":"Ova vrednost nije broj.","confirmNewPage":"Nesačuvane promene ovog sadržaja će biti izgubljene. Jeste li sigurni da želita da učitate novu stranu?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Opcije","target":"Meta","targetNew":"Novi prozor (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S leva na desno (LTR)","langDirRTL":"S desna na levo (RTL)","styles":"Stil","cssClasses":"Stylesheet klase","width":"Širina","height":"Visina","align":"Ravnanje","alignLeft":"Levo","alignRight":"Desno","alignCenter":"Sredina","alignJustify":"Obostrano ravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dole","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Podebljano","italic":"Kurziv","strike":"Precrtano","subscript":"Indeks","superscript":"Stepen","underline":"Podvučeno"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+C).","cut":"Iseci","cutError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog isecanja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+X).","paste":"Zalepi","pasteArea":"Prostor za lepljenje","pasteMsg":"Molimo Vas da zalepite unutar donje povrine koristeći tastaturnu prečicu (<STRONG>Ctrl/Cmd+V</STRONG>) i da pritisnete <STRONG>OK</STRONG>.","securityMsg":"Zbog sigurnosnih postavki vašeg pregledača, editor nije u mogućnosti da direktno pristupi podacima u klipbordu. Potrebno je da zalepite još jednom u ovom prozoru.","title":"Zalepi"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatski","bgColorTitle":"Boja pozadine","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Više boja...","panelTitle":"Colors","textColorTitle":"Boja teksta"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Obrasci","emptyListMsg":"(Nema definisanih obrazaca)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Molimo Vas da odaberete obrazac koji ce biti primenjen na stranicu (trenutni sadržaj ce biti obrisan):","title":"Obrasci za sadržaj"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory naslov","cssClassInputLabel":"Stylesheet klase","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"S leva na desno (LTR)","langDirLabel":"Smer jezika","langDirRTLLabel":"S desna na levo (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Stil","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Suzi alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Alatne trake"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Pretraga","findOptions":"Find Options","findWhat":"Pronadi:","matchCase":"Razlikuj mala i velika slova","matchCyclic":"Match cyclic","matchWord":"Uporedi cele reci","notFoundMsg":"Traženi tekst nije pronađen.","replace":"Zamena","replaceAll":"Zameni sve","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Zameni sa:","title":"Find and Replace"},"fakeobjects":{"anchor":"Unesi/izmeni sidro","flash":"Flash Animation","hiddenfield":"Skriveno polje","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs dole","alignAbsMiddle":"Abs sredina","alignBaseline":"Bazno","alignTextTop":"Vrh teksta","bgcolor":"Boja pozadine","chkFull":"Allow Fullscreen","chkLoop":"Ponavljaj","chkMenu":"Uključi fleš meni","chkPlay":"Automatski start","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Osobine fleša","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Skaliraj","scaleAll":"Prikaži sve","scaleFit":"Popuni površinu","scaleNoBorder":"Bez ivice","title":"Osobine fleša","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"Unesite URL linka","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Veličina fonta","voiceLabel":"Font Size","panelTitle":"Veličina fonta"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"forms":{"button":{"title":"Osobine dugmeta","text":"Tekst (vrednost)","type":"Tip","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Osobine polja za potvrdu","radioTitle":"Osobine radio-dugmeta","value":"Vrednost","selected":"Označeno","required":"Required"},"form":{"title":"Osobine forme","menu":"Osobine forme","action":"Akcija","method":"Metoda","encoding":"Encoding"},"hidden":{"title":"Osobine skrivenog polja","name":"Naziv","value":"Vrednost"},"select":{"title":"Osobine izbornog polja","selectInfo":"Info","opAvail":"Dostupne opcije","value":"Vrednost","size":"Veličina","lines":"linija","chkMulti":"Dozvoli višestruku selekciju","required":"Required","opText":"Tekst","opValue":"Vrednost","btnAdd":"Dodaj","btnModify":"Izmeni","btnUp":"Gore","btnDown":"Dole","btnSetValue":"Podesi kao označenu vrednost","btnDelete":"Obriši"},"textarea":{"title":"Osobine zone teksta","cols":"Broj kolona","rows":"Broj redova"},"textfield":{"title":"Osobine tekstualnog polja","name":"Naziv","value":"Vrednost","charWidth":"Širina (karaktera)","maxChars":"Maksimalno karaktera","required":"Required","type":"Tip","typeText":"Tekst","typePass":"Lozinka","typeEmail":"Email","typeSearch":"Pretraži","typeTel":"Broj telefona","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adresa","tag_div":"Normalno (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Normal","tag_pre":"Formatirano"},"horizontalrule":{"toolbar":"Unesi horizontalnu liniju"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Alternativni tekst","border":"Okvir","btnUpload":"Pošalji na server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Info slike","linkTab":"Link","lockRatio":"Zaključaj odnos","menu":"Osobine slika","resetSize":"Resetuj veličinu","title":"Osobine slika","titleButton":"Osobine dugmeta sa slikom","upload":"Pošalji","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Uvećaj levu marginu","outdent":"Smanji levu marginu"},"smiley":{"options":"Smiley Options","title":"Unesi smajlija","toolbar":"Smajli"},"justify":{"block":"Obostrano ravnanje","center":"Centriran tekst","left":"Levo ravnanje","right":"Desno ravnanje"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Pristupni taster","advanced":"Napredni tagovi","advisoryContentType":"Advisory vrsta sadržaja","advisoryTitle":"Advisory naslov","anchor":{"toolbar":"Unesi/izmeni sidro","menu":"Osobine sidra","title":"Osobine sidra","name":"Naziv sidra","errorName":"Unesite naziv sidra","remove":"Ukloni sidro"},"anchorId":"Po Id-u elementa","anchorName":"Po nazivu sidra","charset":"Linked Resource Charset","cssClasses":"Stylesheet klase","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail adresa","emailBody":"Sadržaj poruke","emailSubject":"Naslov","id":"Id","info":"Link Info","langCode":"Smer jezika","langDir":"Smer jezika","langDirLTR":"S leva na desno (LTR)","langDirRTL":"S desna na levo (RTL)","menu":"Izmeni link","name":"Naziv","noAnchors":"(Nema dostupnih sidra)","noEmail":"Otkucajte adresu elektronske pote","noUrl":"Unesite URL linka","other":"<остало>","popupDependent":"Zavisno (Netscape)","popupFeatures":"Mogućnosti popup prozora","popupFullScreen":"Prikaz preko celog ekrana (IE)","popupLeft":"Od leve ivice ekrana (px)","popupLocationBar":"Lokacija","popupMenuBar":"Kontekstni meni","popupResizable":"Promenljive veličine","popupScrollBars":"Scroll bar","popupStatusBar":"Statusna linija","popupToolbar":"Toolbar","popupTop":"Od vrha ekrana (px)","rel":"Odnos","selectAnchor":"Odaberi sidro","styles":"Stil","tabIndex":"Tab indeks","target":"Meta","targetFrame":"<okvir>","targetFrameName":"Naziv odredišnog frejma","targetPopup":"<popup prozor>","targetPopupName":"Naziv popup prozora","title":"Link","toAnchor":"Sidro na ovoj stranici","toEmail":"E-Mail","toUrl":"URL","toolbar":"Unesi/izmeni link","type":"Vrsta linka","unlink":"Ukloni link","upload":"Pošalji"},"list":{"bulletedlist":"Nenabrojiva lista","numberedlist":"Nabrojiva lista"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"Nova stranica"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Zalepi kao čist tekst","title":"Zalepi kao čist tekst"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Zalepi iz Worda","toolbar":"Zalepi iz Worda"},"preview":{"preview":"Izgled stranice"},"print":{"toolbar":"Štampa"},"removeformat":{"toolbar":"Ukloni formatiranje"},"save":{"toolbar":"Sačuvaj"},"selectall":{"toolbar":"Označi sve"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Kôd"},"specialchar":{"options":"Special Character Options","title":"Odaberite specijalni karakter","toolbar":"Unesi specijalni karakter"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stil","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Veličina okvira","caption":"Naslov tabele","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Obriši ćelije","merge":"Spoj celije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Razmak ćelija","cellSpace":"Ćelijski prostor","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Obriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tabelu","headers":"Zaglavlja","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"None","headersRow":"Prvi red","invalidBorder":"Veličina okvira mora biti broj.","invalidCellPadding":"Padding polja mora biti pozitivan broj.","invalidCellSpacing":"Razmak između ćelija mora biti pozitivan broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tabele mora biti broj.","invalidRows":"Broj redova mora biti veći od 0.","invalidWidth":"Širina tabele mora biti broj.","menu":"Osobine tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Obriši redove"},"rows":"Redova","summary":"Sažetak","title":"Osobine tabele","toolbar":"Tabela","widthPc":"procenata","widthPx":"piksela","widthUnit":"jedinica za širinu"},"undo":{"redo":"Ponovi akciju","undo":"Poni�ti akciju"},"wsc":{"btnIgnore":"Ignoriši","btnIgnoreAll":"Ignoriši sve","btnReplace":"Zameni","btnReplaceAll":"Zameni sve","btnUndo":"Vrati akciju","changeTo":"Izmeni","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Provera spelovanja nije instalirana. Da li želite da je skinete sa Interneta?","manyChanges":"Provera spelovanja završena: %1 reč(i) je izmenjeno","noChanges":"Provera spelovanja završena: Nije izmenjena nijedna rec","noMispell":"Provera spelovanja završena: greške nisu pronadene","noSuggestions":"- Bez sugestija -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Nije u rečniku","oneChange":"Provera spelovanja završena: Izmenjena je jedna reč","progress":"Provera spelovanja u toku...","title":"Spell Checker","toolbar":"Proveri spelovanje"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/lang/sr.js
index ba9721b48ee..2f6d9b268c9 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/sr.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/sr.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sr']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Претражи сервер","url":"УРЛ","protocol":"Протокол","upload":"Пошаљи","uploadSubmit":"Пошаљи на сервер","image":"Слика","flash":"Флеш елемент","form":"Форма","checkbox":"Поље за потврду","radio":"Радио-дугме","textField":"Текстуално поље","textarea":"Зона текста","hiddenField":"Скривено поље","button":"Дугме","select":"Изборно поље","imageButton":"Дугме са сликом","notSet":"<није постављено>","id":"Ид","name":"Назив","langDir":"Смер језика","langDirLtr":"С лева на десно (LTR)","langDirRtl":"С десна на лево (RTL)","langCode":"Kôд језика","longDescr":"Пун опис УРЛ","cssClass":"Stylesheet класе","advisoryTitle":"Advisory наслов","cssStyle":"Стил","ok":"OK","cancel":"Oткажи","close":"Затвори","preview":"Изглед странице","resize":"Resize","generalTab":"Опште","advancedTab":"Напредни тагови","validateNumberFailed":"Ова вредност није цигра.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Опције","target":"Meтa","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"С лева на десно (LTR)","langDirRTL":"С десна на лево (RTL)","styles":"Стил","cssClasses":"Stylesheet класе","width":"Ширина","height":"Висина","align":"Равнање","alignLeft":"Лево","alignRight":"Десно","alignCenter":"Средина","alignJustify":"Обострано равнање","alignTop":"Врх","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Подебљано","italic":"Курзив","strike":"Прецртано","subscript":"Индекс","superscript":"Степен","underline":"Подвучено"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Копирај","copyError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског копирања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+C).","cut":"Исеци","cutError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског исецања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+X).","paste":"Залепи","pasteArea":"Залепи зону","pasteMsg":"Молимо Вас да залепите унутар доње површине користећи тастатурну пречицу (<STRONG>Ctrl/Cmd+V</STRONG>) и да притиснете <STRONG>OK</STRONG>.","securityMsg":"Због сигурносних подешавања претраживача, едитор не може да приступи оставу. Требате да га поново залепите у овом прозору.","title":"Залепи"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Аутоматски","bgColorTitle":"Боја позадине","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"Више боја...","panelTitle":"Colors","textColorTitle":"Боја текста"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Обрасци","emptyListMsg":"(Нема дефинисаних образаца)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Молимо Вас да одаберете образац који ће бити примењен на страницу (тренутни садржај ће бити обрисан):","title":"Обрасци за садржај"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Склопи алатну траку","toolbarExpand":"Прошири алатну траку","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Едитор алатне траке"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Претрага","findOptions":"Find Options","findWhat":"Пронађи:","matchCase":"Разликуј велика и мала слова","matchCyclic":"Match cyclic","matchWord":"Упореди целе речи","notFoundMsg":"Тражени текст није пронађен.","replace":"Замена","replaceAll":"Замени све","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Замени са:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs доле","alignAbsMiddle":"Abs средина","alignBaseline":"Базно","alignTextTop":"Врх текста","bgcolor":"Боја позадине","chkFull":"Allow Fullscreen","chkLoop":"Понављај","chkMenu":"Укључи флеш мени","chkPlay":"Аутоматски старт","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Особине Флеша","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Скалирај","scaleAll":"Прикажи све","scaleFit":"Попуни површину","scaleNoBorder":"Без ивице","title":"Особине флеша","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"Унесите УРЛ линка","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Величина фонта","voiceLabel":"Font Size","panelTitle":"Величина фонта"},"label":"Фонт","panelTitle":"Фонт","voiceLabel":"Фонт"},"forms":{"button":{"title":"Особине дугмета","text":"Текст (вредност)","type":"Tип","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Особине поља за потврду","radioTitle":"Особине радио-дугмета","value":"Вредност","selected":"Означено","required":"Required"},"form":{"title":"Особине форме","menu":"Особине форме","action":"Aкција","method":"Mетода","encoding":"Encoding"},"hidden":{"title":"Особине скривеног поља","name":"Назив","value":"Вредност"},"select":{"title":"Особине изборног поља","selectInfo":"Инфо","opAvail":"Доступне опције","value":"Вредност","size":"Величина","lines":"линија","chkMulti":"Дозволи вишеструку селекцију","required":"Required","opText":"Текст","opValue":"Вредност","btnAdd":"Додај","btnModify":"Измени","btnUp":"Горе","btnDown":"Доле","btnSetValue":"Подеси као означену вредност","btnDelete":"Обриши"},"textarea":{"title":"Особине зоне текста","cols":"Број колона","rows":"Број редова"},"textfield":{"title":"Особине текстуалног поља","name":"Назив","value":"Вредност","charWidth":"Ширина (карактера)","maxChars":"Максимално карактера","required":"Required","type":"Тип","typeText":"Текст","typePass":"Лозинка","typeEmail":"Е-пошта","typeSearch":"Претрага","typeTel":"Број телефона","typeUrl":"УРЛ"}},"format":{"label":"Формат","panelTitle":"Формат","tag_address":"Adresa","tag_div":"Нормално (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatirano"},"horizontalrule":{"toolbar":"Унеси хоризонталну линију"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Алтернативни текст","border":"Оквир","btnUpload":"Пошаљи на сервер","button2Img":"Да ли желите да промените одабрану слику дугмета као једноставну слику?","hSpace":"HSpace","img2Button":"Да ли желите да промените одабрану слику у слику дугмета?","infoTab":"Инфо слике","linkTab":"Линк","lockRatio":"Закључај однос","menu":"Особине слика","resetSize":"Ресетуј величину","title":"Особине слика","titleButton":"Особине дугмета са сликом","upload":"Пошаљи","urlMissing":"Недостаје УРЛ слике.","vSpace":"VSpace","validateBorder":"Ивица треба да буде цифра.","validateHSpace":"HSpace треба да буде цифра.","validateVSpace":"VSpace треба да буде цифра."},"indent":{"indent":"Увећај леву маргину","outdent":"Смањи леву маргину"},"smiley":{"options":"Smiley Options","title":"Унеси смајлија","toolbar":"Смајли"},"justify":{"block":"Обострано равнање","center":"Центриран текст","left":"Лево равнање","right":"Десно равнање"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Приступни тастер","advanced":"Напредни тагови","advisoryContentType":"Advisory врста садржаја","advisoryTitle":"Advisory наслов","anchor":{"toolbar":"Унеси/измени сидро","menu":"Особине сидра","title":"Особине сидра","name":"Име сидра","errorName":"Молимо Вас да унесете име сидра","remove":"Remove Anchor"},"anchorId":"Пo Ид-jу елемента","anchorName":"По називу сидра","charset":"Linked Resource Charset","cssClasses":"Stylesheet класе","emailAddress":"Адреса електронске поште","emailBody":"Садржај поруке","emailSubject":"Наслов","id":"Ид","info":"Линк инфо","langCode":"Смер језика","langDir":"Смер језика","langDirLTR":"С лева на десно (LTR)","langDirRTL":"С десна на лево (RTL)","menu":"Промени линк","name":"Назив","noAnchors":"(Нема доступних сидра)","noEmail":"Откуцајте адресу електронске поште","noUrl":"Унесите УРЛ линка","other":"<друго>","popupDependent":"Зависно (Netscape)","popupFeatures":"Могућности искачућег прозора","popupFullScreen":"Приказ преко целог екрана (ИE)","popupLeft":"Од леве ивице екрана (пиксела)","popupLocationBar":"Локација","popupMenuBar":"Контекстни мени","popupResizable":"Величина се мења","popupScrollBars":"Скрол бар","popupStatusBar":"Статусна линија","popupToolbar":"Toolbar","popupTop":"Од врха екрана (пиксела)","rel":"Однос","selectAnchor":"Одабери сидро","styles":"Стил","tabIndex":"Таб индекс","target":"Meтa","targetFrame":"<оквир>","targetFrameName":"Назив одредишног фрејма","targetPopup":"<искачући прозор>","targetPopupName":"Назив искачућег прозора","title":"Линк","toAnchor":"Сидро на овој страници","toEmail":"Eлектронска пошта","toUrl":"УРЛ","toolbar":"Унеси/измени линк","type":"Врста линка","unlink":"Уклони линк","upload":"Пошаљи"},"list":{"bulletedlist":"Ненабројива листа","numberedlist":"Набројиву листу"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"Нова страница"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Залепи као чист текст","title":"Залепи као чист текст"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Залепи из Worda","toolbar":"Залепи из Worda"},"preview":{"preview":"Изглед странице"},"print":{"toolbar":"Штампа"},"removeformat":{"toolbar":"Уклони форматирање"},"save":{"toolbar":"Сачувај"},"selectall":{"toolbar":"Означи све"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Kôд"},"specialchar":{"options":"Опције специјалног карактера","title":"Одаберите специјални карактер","toolbar":"Унеси специјални карактер"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Стил","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Величина оквира","caption":"Наслов табеле","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Обриши ћелије","merge":"Спој ћелије","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Размак ћелија","cellSpace":"Ћелијски простор","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Обриши колоне"},"columns":"Kолона","deleteTable":"Обриши таблу","headers":"Поглавља","headersBoth":"Оба","headersColumn":"Прва колона","headersNone":"None","headersRow":"Први ред","invalidBorder":"Величина ивице треба да буде цифра.","invalidCellPadding":"Пуњење ћелије треба да буде позитивна цифра.","invalidCellSpacing":"Размак ћелије треба да буде позитивна цифра.","invalidCols":"Број колона треба да буде цифра већа од 0.","invalidHeight":"Висина табеле треба да буде цифра.","invalidRows":"Број реда треба да буде цифра већа од 0.","invalidWidth":"Ширина табеле треба да буде цифра.","menu":"Особине табеле","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Обриши редове"},"rows":"Редова","summary":"Резиме","title":"Особине табеле","toolbar":"Табела","widthPc":"процената","widthPx":"пиксела","widthUnit":"јединица ширине"},"undo":{"redo":"Понови акцију","undo":"Поништи акцију"},"wsc":{"btnIgnore":"Игнориши","btnIgnoreAll":"Игнориши све","btnReplace":"Замени","btnReplaceAll":"Замени све","btnUndo":"Врати акцију","changeTo":"Измени","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Провера спеловања није инсталирана. Да ли желите да је скинете са Интернета?","manyChanges":"Провера спеловања завршена:  %1 реч(и) је измењено","noChanges":"Провера спеловања завршена: Није измењена ниједна реч","noMispell":"Провера спеловања завршена: грешке нису пронађене","noSuggestions":"- Без сугестија -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Није у речнику","oneChange":"Провера спеловања завршена: Измењена је једна реч","progress":"Провера спеловања у току...","title":"Spell Checker","toolbar":"Провери спеловање"}};
\ No newline at end of file
+CKEDITOR.lang['sr']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Претражи сервер","url":"УРЛ","protocol":"Протокол","upload":"Пошаљи","uploadSubmit":"Пошаљи на сервер","image":"Слика","flash":"Флеш елемент","form":"Форма","checkbox":"Поље за потврду","radio":"Радио-дугме","textField":"Текстуално поље","textarea":"Зона текста","hiddenField":"Скривено поље","button":"Дугме","select":"Изборно поље","imageButton":"Дугме са сликом","notSet":"<није постављено>","id":"Ид","name":"Назив","langDir":"Смер језика","langDirLtr":"С лева на десно (LTR)","langDirRtl":"С десна на лево (RTL)","langCode":"Kôд језика","longDescr":"Пун опис УРЛ","cssClass":"Stylesheet класе","advisoryTitle":"Advisory наслов","cssStyle":"Стил","ok":"OK","cancel":"Oткажи","close":"Затвори","preview":"Изглед странице","resize":"Resize","generalTab":"Опште","advancedTab":"Напредни тагови","validateNumberFailed":"Ова вредност није цигра.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Опције","target":"Meтa","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"С лева на десно (LTR)","langDirRTL":"С десна на лево (RTL)","styles":"Стил","cssClasses":"Stylesheet класе","width":"Ширина","height":"Висина","align":"Равнање","alignLeft":"Лево","alignRight":"Десно","alignCenter":"Средина","alignJustify":"Обострано равнање","alignTop":"Врх","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Подебљано","italic":"Курзив","strike":"Прецртано","subscript":"Индекс","superscript":"Степен","underline":"Подвучено"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"Копирај","copyError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског копирања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+C).","cut":"Исеци","cutError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског исецања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+X).","paste":"Залепи","pasteArea":"Залепи зону","pasteMsg":"Молимо Вас да залепите унутар доње површине користећи тастатурну пречицу (<STRONG>Ctrl/Cmd+V</STRONG>) и да притиснете <STRONG>OK</STRONG>.","securityMsg":"Због сигурносних подешавања претраживача, едитор не може да приступи оставу. Требате да га поново залепите у овом прозору.","title":"Залепи"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Аутоматски","bgColorTitle":"Боја позадине","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Више боја...","panelTitle":"Colors","textColorTitle":"Боја текста"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Обрасци","emptyListMsg":"(Нема дефинисаних образаца)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Молимо Вас да одаберете образац који ће бити примењен на страницу (тренутни садржај ће бити обрисан):","title":"Обрасци за садржај"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Склопи алатну траку","toolbarExpand":"Прошири алатну траку","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Едитор алатне траке"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"Претрага","findOptions":"Find Options","findWhat":"Пронађи:","matchCase":"Разликуј велика и мала слова","matchCyclic":"Match cyclic","matchWord":"Упореди целе речи","notFoundMsg":"Тражени текст није пронађен.","replace":"Замена","replaceAll":"Замени све","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Замени са:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs доле","alignAbsMiddle":"Abs средина","alignBaseline":"Базно","alignTextTop":"Врх текста","bgcolor":"Боја позадине","chkFull":"Allow Fullscreen","chkLoop":"Понављај","chkMenu":"Укључи флеш мени","chkPlay":"Аутоматски старт","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Особине Флеша","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Скалирај","scaleAll":"Прикажи све","scaleFit":"Попуни површину","scaleNoBorder":"Без ивице","title":"Особине флеша","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"Унесите УРЛ линка","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Величина фонта","voiceLabel":"Font Size","panelTitle":"Величина фонта"},"label":"Фонт","panelTitle":"Фонт","voiceLabel":"Фонт"},"forms":{"button":{"title":"Особине дугмета","text":"Текст (вредност)","type":"Tип","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Особине поља за потврду","radioTitle":"Особине радио-дугмета","value":"Вредност","selected":"Означено","required":"Required"},"form":{"title":"Особине форме","menu":"Особине форме","action":"Aкција","method":"Mетода","encoding":"Encoding"},"hidden":{"title":"Особине скривеног поља","name":"Назив","value":"Вредност"},"select":{"title":"Особине изборног поља","selectInfo":"Инфо","opAvail":"Доступне опције","value":"Вредност","size":"Величина","lines":"линија","chkMulti":"Дозволи вишеструку селекцију","required":"Required","opText":"Текст","opValue":"Вредност","btnAdd":"Додај","btnModify":"Измени","btnUp":"Горе","btnDown":"Доле","btnSetValue":"Подеси као означену вредност","btnDelete":"Обриши"},"textarea":{"title":"Особине зоне текста","cols":"Број колона","rows":"Број редова"},"textfield":{"title":"Особине текстуалног поља","name":"Назив","value":"Вредност","charWidth":"Ширина (карактера)","maxChars":"Максимално карактера","required":"Required","type":"Тип","typeText":"Текст","typePass":"Лозинка","typeEmail":"Е-пошта","typeSearch":"Претрага","typeTel":"Број телефона","typeUrl":"УРЛ"}},"format":{"label":"Формат","panelTitle":"Формат","tag_address":"Adresa","tag_div":"Нормално (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatirano"},"horizontalrule":{"toolbar":"Унеси хоризонталну линију"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Алтернативни текст","border":"Оквир","btnUpload":"Пошаљи на сервер","button2Img":"Да ли желите да промените одабрану слику дугмета као једноставну слику?","hSpace":"HSpace","img2Button":"Да ли желите да промените одабрану слику у слику дугмета?","infoTab":"Инфо слике","linkTab":"Линк","lockRatio":"Закључај однос","menu":"Особине слика","resetSize":"Ресетуј величину","title":"Особине слика","titleButton":"Особине дугмета са сликом","upload":"Пошаљи","urlMissing":"Недостаје УРЛ слике.","vSpace":"VSpace","validateBorder":"Ивица треба да буде цифра.","validateHSpace":"HSpace треба да буде цифра.","validateVSpace":"VSpace треба да буде цифра."},"indent":{"indent":"Увећај леву маргину","outdent":"Смањи леву маргину"},"smiley":{"options":"Smiley Options","title":"Унеси смајлија","toolbar":"Смајли"},"justify":{"block":"Обострано равнање","center":"Центриран текст","left":"Лево равнање","right":"Десно равнање"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Приступни тастер","advanced":"Напредни тагови","advisoryContentType":"Advisory врста садржаја","advisoryTitle":"Advisory наслов","anchor":{"toolbar":"Унеси/измени сидро","menu":"Особине сидра","title":"Особине сидра","name":"Име сидра","errorName":"Молимо Вас да унесете име сидра","remove":"Remove Anchor"},"anchorId":"Пo Ид-jу елемента","anchorName":"По називу сидра","charset":"Linked Resource Charset","cssClasses":"Stylesheet класе","download":"Force Download","displayText":"Display Text","emailAddress":"Адреса електронске поште","emailBody":"Садржај поруке","emailSubject":"Наслов","id":"Ид","info":"Линк инфо","langCode":"Смер језика","langDir":"Смер језика","langDirLTR":"С лева на десно (LTR)","langDirRTL":"С десна на лево (RTL)","menu":"Промени линк","name":"Назив","noAnchors":"(Нема доступних сидра)","noEmail":"Откуцајте адресу електронске поште","noUrl":"Унесите УРЛ линка","other":"<друго>","popupDependent":"Зависно (Netscape)","popupFeatures":"Могућности искачућег прозора","popupFullScreen":"Приказ преко целог екрана (ИE)","popupLeft":"Од леве ивице екрана (пиксела)","popupLocationBar":"Локација","popupMenuBar":"Контекстни мени","popupResizable":"Величина се мења","popupScrollBars":"Скрол бар","popupStatusBar":"Статусна линија","popupToolbar":"Toolbar","popupTop":"Од врха екрана (пиксела)","rel":"Однос","selectAnchor":"Одабери сидро","styles":"Стил","tabIndex":"Таб индекс","target":"Meтa","targetFrame":"<оквир>","targetFrameName":"Назив одредишног фрејма","targetPopup":"<искачући прозор>","targetPopupName":"Назив искачућег прозора","title":"Линк","toAnchor":"Сидро на овој страници","toEmail":"Eлектронска пошта","toUrl":"УРЛ","toolbar":"Унеси/измени линк","type":"Врста линка","unlink":"Уклони линк","upload":"Пошаљи"},"list":{"bulletedlist":"Ненабројива листа","numberedlist":"Набројиву листу"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"Нова страница"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Залепи као чист текст","title":"Залепи као чист текст"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Залепи из Worda","toolbar":"Залепи из Worda"},"preview":{"preview":"Изглед странице"},"print":{"toolbar":"Штампа"},"removeformat":{"toolbar":"Уклони форматирање"},"save":{"toolbar":"Сачувај"},"selectall":{"toolbar":"Означи све"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Kôд"},"specialchar":{"options":"Опције специјалног карактера","title":"Одаберите специјални карактер","toolbar":"Унеси специјални карактер"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Стил","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Величина оквира","caption":"Наслов табеле","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Обриши ћелије","merge":"Спој ћелије","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Размак ћелија","cellSpace":"Ћелијски простор","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Обриши колоне"},"columns":"Kолона","deleteTable":"Обриши таблу","headers":"Поглавља","headersBoth":"Оба","headersColumn":"Прва колона","headersNone":"None","headersRow":"Први ред","invalidBorder":"Величина ивице треба да буде цифра.","invalidCellPadding":"Пуњење ћелије треба да буде позитивна цифра.","invalidCellSpacing":"Размак ћелије треба да буде позитивна цифра.","invalidCols":"Број колона треба да буде цифра већа од 0.","invalidHeight":"Висина табеле треба да буде цифра.","invalidRows":"Број реда треба да буде цифра већа од 0.","invalidWidth":"Ширина табеле треба да буде цифра.","menu":"Особине табеле","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Обриши редове"},"rows":"Редова","summary":"Резиме","title":"Особине табеле","toolbar":"Табела","widthPc":"процената","widthPx":"пиксела","widthUnit":"јединица ширине"},"undo":{"redo":"Понови акцију","undo":"Поништи акцију"},"wsc":{"btnIgnore":"Игнориши","btnIgnoreAll":"Игнориши све","btnReplace":"Замени","btnReplaceAll":"Замени све","btnUndo":"Врати акцију","changeTo":"Измени","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Провера спеловања није инсталирана. Да ли желите да је скинете са Интернета?","manyChanges":"Провера спеловања завршена:  %1 реч(и) је измењено","noChanges":"Провера спеловања завршена: Није измењена ниједна реч","noMispell":"Провера спеловања завршена: грешке нису пронађене","noSuggestions":"- Без сугестија -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Није у речнику","oneChange":"Провера спеловања завршена: Измењена је једна реч","progress":"Провера спеловања у току...","title":"Spell Checker","toolbar":"Провери спеловање"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/lang/sv.js
index 5bed15c4b30..e8b164a1a53 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/sv.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/sv.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sv']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tryck ALT 0 för hjälp","browseServer":"Bläddra på server","url":"URL","protocol":"Protokoll","upload":"Ladda upp","uploadSubmit":"Skicka till server","image":"Bild","flash":"Flash","form":"Formulär","checkbox":"Kryssruta","radio":"Alternativknapp","textField":"Textfält","textarea":"Textruta","hiddenField":"Dolt fält","button":"Knapp","select":"Flervalslista","imageButton":"Bildknapp","notSet":"<ej angivet>","id":"Id","name":"Namn","langDir":"Språkriktning","langDirLtr":"Vänster till Höger (VTH)","langDirRtl":"Höger till Vänster (HTV)","langCode":"Språkkod","longDescr":"URL-beskrivning","cssClass":"Stilmall","advisoryTitle":"Titel","cssStyle":"Stilmall","ok":"OK","cancel":"Avbryt","close":"Stäng","preview":"Förhandsgranska","resize":"Dra för att ändra storlek","generalTab":"Allmänt","advancedTab":"Avancerad","validateNumberFailed":"Värdet är inte ett nummer.","confirmNewPage":"Alla ändringar i innehållet kommer att förloras. Är du säker på att du vill ladda en ny sida?","confirmCancel":"Några av alternativen har ändrats. Är du säker på att du vill stänga dialogrutan?","options":"Alternativ","target":"Mål","targetNew":"Nytt fönster (_blank)","targetTop":"Översta fönstret (_top)","targetSelf":"Samma fönster (_self)","targetParent":"Föregående fönster (_parent)","langDirLTR":"Vänster till höger (LTR)","langDirRTL":"Höger till vänster (RTL)","styles":"Stil","cssClasses":"Stilmallar","width":"Bredd","height":"Höjd","align":"Justering","alignLeft":"Vänster","alignRight":"Höger","alignCenter":"Centrerad","alignJustify":"Justera till marginaler","alignTop":"Överkant","alignMiddle":"Mitten","alignBottom":"Nederkant","alignNone":"Ingen","invalidValue":"Felaktigt värde.","invalidHeight":"Höjd måste vara ett nummer.","invalidWidth":"Bredd måste vara ett nummer.","invalidCssLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan CSS-mätenheter (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan godkända HTML-mätenheter (px eller %).","invalidInlineStyle":"Det angivna värdet för style måste innehålla en eller flera tupler separerade med semikolon i följande format: \"name : value\"","cssLengthTooltip":"Ange ett nummer i pixlar eller ett nummer men godkänd CSS-mätenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, Ej tillgänglig</span>"},"about":{"copy":"Copyright &copy; $1. Alla rättigheter reserverade.","dlgTitle":"Om CKEditor","help":"Se $1 för hjälp.","moreInfo":"För information av licensiering besök vår hemsida:","title":"Om CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Genomstruken","subscript":"Nedsänkta tecken","superscript":"Upphöjda tecken","underline":"Understruken"},"bidi":{"ltr":"Text riktning från vänster till höger","rtl":"Text riktning från höger till vänster"},"blockquote":{"toolbar":"Blockcitat"},"clipboard":{"copy":"Kopiera","copyError":"Säkerhetsinställningar i Er webbläsare tillåter inte åtgärden kopiera. Använd (Ctrl/Cmd+C) istället.","cut":"Klipp ut","cutError":"Säkerhetsinställningar i Er webbläsare tillåter inte åtgärden klipp ut. Använd (Ctrl/Cmd+X) istället.","paste":"Klistra in","pasteArea":"Paste Area","pasteMsg":"Var god och klistra in Er text i rutan nedan genom att använda (<strong>Ctrl/Cmd+V</strong>) klicka sen på OK.","securityMsg":"På grund av din webbläsares säkerhetsinställningar kan verktyget inte få åtkomst till urklippsdatan. Var god och använd detta fönster istället.","title":"Klistra in"},"button":{"selectedLabel":"%1 (Vald)"},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Bakgrundsfärg","colors":{"000":"Svart","800000":"Rödbrun","8B4513":"Mörkbrun","2F4F4F":"Skiffergrå","008080":"Kricka","000080":"Marinblå","4B0082":"Indigo","696969":"Mörkgrå","B22222":"Tegelsten","A52A2A":"Brun","DAA520":"Mörk guld","006400":"Mörkgrön","40E0D0":"Turkos","0000CD":"Medium blå","800080":"Lila","808080":"Grå","F00":"Röd","FF8C00":"Mörkorange","FFD700":"Guld","008000":"Grön","0FF":"Turkos","00F":"Blå","EE82EE":"Violett","A9A9A9":"Matt grå","FFA07A":"Laxrosa","FFA500":"Orange","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Ljusturkos","ADD8E6":"Ljusblå","DDA0DD":"Plommon","D3D3D3":"Ljusgrå","FFF0F5":"Ljus lavendel","FAEBD7":"Antikvit","FFFFE0":"Ljusgul","F0FFF0":"Honungsdagg","F0FFFF":"Azurblå","F0F8FF":"Aliceblå","E6E6FA":"Lavendel","FFF":"Vit"},"more":"Fler färger...","panelTitle":"Färger","textColorTitle":"Textfärg"},"colordialog":{"clear":"Rensa","highlight":"Markera","options":"Färgalternativ","selected":"Vald färg","title":"Välj färg"},"templates":{"button":"Sidmallar","emptyListMsg":"(Ingen mall är vald)","insertOption":"Ersätt aktuellt innehåll","options":"Inställningar för mall","selectPromptMsg":"Var god välj en mall att använda med editorn<br>(allt nuvarande innehåll raderas):","title":"Sidmallar"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Rådgivande titel","cssClassInputLabel":"Stilmallar","edit":"Redigera Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Vänster till höger (LTR)","langDirLabel":"Språkriktning","langDirRTLLabel":"Höger till vänster (RTL)","languageCodeInputLabel":" Språkkod","remove":"Ta bort Div","styleSelectLabel":"Stil","title":"Skapa Div container","toolbar":"Skapa Div container"},"toolbar":{"toolbarCollapse":"Dölj verktygsfält","toolbarExpand":"Visa verktygsfält","toolbarGroups":{"document":"Dokument","clipboard":"Urklipp/ångra","editing":"Redigering","forms":"Formulär","basicstyles":"Basstilar","paragraph":"Paragraf","links":"Länkar","insert":"Infoga","styles":"Stilar","colors":"Färger","tools":"Verktyg"},"toolbars":"Redigera verktygsfält"},"elementspath":{"eleLabel":"Elementets sökväg","eleTitle":"%1 element"},"find":{"find":"Sök","findOptions":"Sökalternativ","findWhat":"Sök efter:","matchCase":"Skiftläge","matchCyclic":"Matcha cykliska","matchWord":"Inkludera hela ord","notFoundMsg":"Angiven text kunde ej hittas.","replace":"Ersätt","replaceAll":"Ersätt alla","replaceSuccessMsg":"%1 förekomst(er) ersatta.","replaceWith":"Ersätt med:","title":"Sök och ersätt"},"fakeobjects":{"anchor":"Ankare","flash":"Flashanimation","hiddenfield":"Gömt fält","iframe":"iFrame","unknown":"Okänt objekt"},"flash":{"access":"Script-tillgång","accessAlways":"Alltid","accessNever":"Aldrig","accessSameDomain":"Samma domän","alignAbsBottom":"Absolut nederkant","alignAbsMiddle":"Absolut centrering","alignBaseline":"Baslinje","alignTextTop":"Text överkant","bgcolor":"Bakgrundsfärg","chkFull":"Tillåt helskärm","chkLoop":"Upprepa/Loopa","chkMenu":"Aktivera Flashmeny","chkPlay":"Automatisk uppspelning","flashvars":"Variabler för Flash","hSpace":"Horis. marginal","properties":"Flashegenskaper","propertiesTab":"Egenskaper","quality":"Kvalitet","qualityAutoHigh":"Auto Hög","qualityAutoLow":"Auto Låg","qualityBest":"Bäst","qualityHigh":"Hög","qualityLow":"Låg","qualityMedium":"Medium","scale":"Skala","scaleAll":"Visa allt","scaleFit":"Exakt passning","scaleNoBorder":"Ingen ram","title":"Flashegenskaper","vSpace":"Vert. marginal","validateHSpace":"HSpace måste vara ett nummer.","validateSrc":"Var god ange länkens URL","validateVSpace":"VSpace måste vara ett nummer.","windowMode":"Fönsterläge","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Fönster"},"font":{"fontSize":{"label":"Storlek","voiceLabel":"Teckenstorlek","panelTitle":"Teckenstorlek"},"label":"Typsnitt","panelTitle":"Typsnitt","voiceLabel":"Typsnitt"},"forms":{"button":{"title":"Egenskaper för knapp","text":"Text (värde)","type":"Typ","typeBtn":"Knapp","typeSbm":"Skicka","typeRst":"Återställ"},"checkboxAndRadio":{"checkboxTitle":"Egenskaper för kryssruta","radioTitle":"Egenskaper för alternativknapp","value":"Värde","selected":"Vald","required":"Krävs"},"form":{"title":"Egenskaper för formulär","menu":"Egenskaper för formulär","action":"Funktion","method":"Metod","encoding":"Kodning"},"hidden":{"title":"Egenskaper för dolt fält","name":"Namn","value":"Värde"},"select":{"title":"Egenskaper för flervalslista","selectInfo":"Information","opAvail":"Befintliga val","value":"Värde","size":"Storlek","lines":"Linjer","chkMulti":"Tillåt flerval","required":"Krävs","opText":"Text","opValue":"Värde","btnAdd":"Lägg till","btnModify":"Redigera","btnUp":"Upp","btnDown":"Ner","btnSetValue":"Markera som valt värde","btnDelete":"Radera"},"textarea":{"title":"Egenskaper för textruta","cols":"Kolumner","rows":"Rader"},"textfield":{"title":"Egenskaper för textfält","name":"Namn","value":"Värde","charWidth":"Teckenbredd","maxChars":"Max antal tecken","required":"Krävs","type":"Typ","typeText":"Text","typePass":"Lösenord","typeEmail":"E-post","typeSearch":"Sök","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Teckenformat","panelTitle":"Teckenformat","tag_address":"Adress","tag_div":"Normal (DIV)","tag_h1":"Rubrik 1","tag_h2":"Rubrik 2","tag_h3":"Rubrik 3","tag_h4":"Rubrik 4","tag_h5":"Rubrik 5","tag_h6":"Rubrik 6","tag_p":"Normal","tag_pre":"Formaterad"},"horizontalrule":{"toolbar":"Infoga horisontal linje"},"iframe":{"border":"Visa ramkant","noUrl":"Skriv in URL för iFrame","scrolling":"Aktivera rullningslister","title":"iFrame Egenskaper","toolbar":"iFrame"},"image":{"alt":"Alternativ text","border":"Kant","btnUpload":"Skicka till server","button2Img":"Vill du omvandla den valda bildknappen på en enkel bild?","hSpace":"Horis. marginal","img2Button":"Vill du omvandla den valda bildknappen på en enkel bild?","infoTab":"Bildinformation","linkTab":"Länk","lockRatio":"Lås höjd/bredd förhållanden","menu":"Bildegenskaper","resetSize":"Återställ storlek","title":"Bildegenskaper","titleButton":"Egenskaper för bildknapp","upload":"Ladda upp","urlMissing":"Bildkällans URL saknas.","vSpace":"Vert. marginal","validateBorder":"Kantlinje måste vara ett heltal.","validateHSpace":"HSpace måste vara ett heltal.","validateVSpace":"VSpace måste vara ett heltal."},"indent":{"indent":"Öka indrag","outdent":"Minska indrag"},"smiley":{"options":"Smileyinställningar","title":"Infoga smiley","toolbar":"Smiley"},"justify":{"block":"Justera till marginaler","center":"Centrera","left":"Vänsterjustera","right":"Högerjustera"},"language":{"button":"Sätt språk","remove":"Ta bort språk"},"link":{"acccessKey":"Behörighetsnyckel","advanced":"Avancerad","advisoryContentType":"Innehållstyp","advisoryTitle":"Titel","anchor":{"toolbar":"Infoga/Redigera ankarlänk","menu":"Egenskaper för ankarlänk","title":"Egenskaper för ankarlänk","name":"Ankarnamn","errorName":"Var god ange ett ankarnamn","remove":"Radera ankare"},"anchorId":"Efter element-id","anchorName":"Efter ankarnamn","charset":"Teckenuppställning","cssClasses":"Stilmall","emailAddress":"E-postadress","emailBody":"Innehåll","emailSubject":"Ämne","id":"Id","info":"Länkinformation","langCode":"Språkkod","langDir":"Språkriktning","langDirLTR":"Vänster till höger (VTH)","langDirRTL":"Höger till vänster (HTV)","menu":"Redigera länk","name":"Namn","noAnchors":"(Inga ankare kunde hittas)","noEmail":"Var god ange e-postadress","noUrl":"Var god ange länkens URL","other":"<annan>","popupDependent":"Beroende (endast Netscape)","popupFeatures":"Popup-fönstrets egenskaper","popupFullScreen":"Helskärm (endast IE)","popupLeft":"Position från vänster","popupLocationBar":"Adressfält","popupMenuBar":"Menyfält","popupResizable":"Resizable","popupScrollBars":"Scrolllista","popupStatusBar":"Statusfält","popupToolbar":"Verktygsfält","popupTop":"Position från sidans topp","rel":"Förhållande","selectAnchor":"Välj ett ankare","styles":"Stilmall","tabIndex":"Tabindex","target":"Mål","targetFrame":"<ram>","targetFrameName":"Målets ramnamn","targetPopup":"<popup-fönster>","targetPopupName":"Popup-fönstrets namn","title":"Länk","toAnchor":"Länk till ankare i texten","toEmail":"E-post","toUrl":"URL","toolbar":"Infoga/Redigera länk","type":"Länktyp","unlink":"Radera länk","upload":"Ladda upp"},"list":{"bulletedlist":"Infoga/ta bort punktlista","numberedlist":"Infoga/ta bort numrerad lista"},"liststyle":{"armenian":"Armenisk numrering","bulletedTitle":"Egenskaper för punktlista","circle":"Cirkel","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal nolla (01, 02, 03, etc.)","disc":"Disk","georgian":"Georgisk numrering (an, ban, gan, etc.)","lowerAlpha":"Alpha gemener (a, b, c, d, e, etc.)","lowerGreek":"Grekiska gemener (alpha, beta, gamma, etc.)","lowerRoman":"Romerska gemener (i, ii, iii, iv, v, etc.)","none":"Ingen","notset":"<ej angiven>","numberedTitle":"Egenskaper för punktlista","square":"Fyrkant","start":"Start","type":"Typ","upperAlpha":"Alpha versaler (A, B, C, D, E, etc.)","upperRoman":"Romerska versaler (I, II, III, IV, V, etc.)","validateStartNumber":"Listans startnummer måste vara ett heltal."},"magicline":{"title":"Infoga paragraf här"},"maximize":{"maximize":"Maximera","minimize":"Minimera"},"newpage":{"toolbar":"Ny sida"},"pagebreak":{"alt":"Sidbrytning","toolbar":"Infoga sidbrytning för utskrift"},"pastetext":{"button":"Klistra in som vanlig text","title":"Klistra in som vanlig text"},"pastefromword":{"confirmCleanup":"Texten du vill klistra in verkar vara kopierad från Word. Vill du rensa den innan du klistrar in den?","error":"Det var inte möjligt att städa upp den inklistrade data på grund av ett internt fel","title":"Klistra in från Word","toolbar":"Klistra in från Word"},"preview":{"preview":"Förhandsgranska"},"print":{"toolbar":"Skriv ut"},"removeformat":{"toolbar":"Radera formatering"},"save":{"toolbar":"Spara"},"selectall":{"toolbar":"Markera allt"},"showblocks":{"toolbar":"Visa block"},"sourcearea":{"toolbar":"Källa"},"specialchar":{"options":"Alternativ för utökade tecken","title":"Välj utökat tecken","toolbar":"Klistra in utökat tecken"},"scayt":{"btn_about":"Om SCAYT","btn_dictionaries":"Ordlistor","btn_disable":"Inaktivera SCAYT","btn_enable":"Aktivera SCAYT","btn_langs":"Språk","btn_options":"Inställningar","text_title":"Stavningskontroll medan du skriver"},"stylescombo":{"label":"Anpassad stil","panelTitle":"Formatmallar","panelTitle1":"Blockstil","panelTitle2":"Inbäddad stil","panelTitle3":"Objektets stil"},"table":{"border":"Kantstorlek","caption":"Rubrik","cell":{"menu":"Cell","insertBefore":"Lägg till cell före","insertAfter":"Lägg till cell efter","deleteCell":"Radera celler","merge":"Sammanfoga celler","mergeRight":"Sammanfoga höger","mergeDown":"Sammanfoga ner","splitHorizontal":"Dela cell horisontellt","splitVertical":"Dela cell vertikalt","title":"Egenskaper för cell","cellType":"Celltyp","rowSpan":"Rad spann","colSpan":"Kolumnen spann","wordWrap":"Radbrytning","hAlign":"Horisontell justering","vAlign":"Vertikal justering","alignBaseline":"Baslinje","bgColor":"Bakgrundsfärg","borderColor":"Ramfärg","data":"Data","header":"Rubrik","yes":"Ja","no":"Nej","invalidWidth":"Cellens bredd måste vara ett nummer.","invalidHeight":"Cellens höjd måste vara ett nummer.","invalidRowSpan":"Radutvidgning måste vara ett heltal.","invalidColSpan":"Kolumn måste vara ett heltal.","chooseColor":"Välj"},"cellPad":"Cellutfyllnad","cellSpace":"Cellavstånd","column":{"menu":"Kolumn","insertBefore":"Lägg till kolumn före","insertAfter":"Lägg till kolumn efter","deleteColumn":"Radera kolumn"},"columns":"Kolumner","deleteTable":"Radera tabell","headers":"Rubriker","headersBoth":"Båda","headersColumn":"Första kolumnen","headersNone":"Ingen","headersRow":"Första raden","invalidBorder":"Ram måste vara ett nummer.","invalidCellPadding":"Luft i cell måste vara ett nummer.","invalidCellSpacing":"Luft i cell måste vara ett nummer.","invalidCols":"Antal kolumner måste vara ett nummer större än 0.","invalidHeight":"Tabellens höjd måste vara ett nummer.","invalidRows":"Antal rader måste vara större än 0.","invalidWidth":"Tabell måste vara ett nummer.","menu":"Tabellegenskaper","row":{"menu":"Rad","insertBefore":"Lägg till rad före","insertAfter":"Lägg till rad efter","deleteRow":"Radera rad"},"rows":"Rader","summary":"Sammanfattning","title":"Tabellegenskaper","toolbar":"Tabell","widthPc":"procent","widthPx":"pixlar","widthUnit":"enhet bredd"},"undo":{"redo":"Gör om","undo":"Ångra"},"wsc":{"btnIgnore":"Ignorera","btnIgnoreAll":"Ignorera alla","btnReplace":"Ersätt","btnReplaceAll":"Ersätt alla","btnUndo":"Ångra","changeTo":"Ändra till","errorLoading":"Tjänsten är ej tillgänglig: %s.","ieSpellDownload":"Stavningskontrollen är ej installerad. Vill du göra det nu?","manyChanges":"Stavningskontroll slutförd: %1 ord rättades.","noChanges":"Stavningskontroll slutförd: Inga ord rättades.","noMispell":"Stavningskontroll slutförd: Inga stavfel påträffades.","noSuggestions":"- Förslag saknas -","notAvailable":"Tyvärr är tjänsten ej tillgänglig nu","notInDic":"Saknas i ordlistan","oneChange":"Stavningskontroll slutförd: Ett ord rättades.","progress":"Stavningskontroll pågår...","title":"Kontrollera stavning","toolbar":"Stavningskontroll"}};
\ No newline at end of file
+CKEDITOR.lang['sv']={"editor":"Rich Text-editor","editorPanel":"Panel till Rich Text-editor","common":{"editorHelp":"Tryck ALT 0 för hjälp","browseServer":"Bläddra på server","url":"URL","protocol":"Protokoll","upload":"Ladda upp","uploadSubmit":"Skicka till server","image":"Bild","flash":"Flash","form":"Formulär","checkbox":"Kryssruta","radio":"Alternativknapp","textField":"Textfält","textarea":"Textruta","hiddenField":"Dolt fält","button":"Knapp","select":"Flervalslista","imageButton":"Bildknapp","notSet":"<ej angivet>","id":"Id","name":"Namn","langDir":"Språkriktning","langDirLtr":"Vänster till Höger (VTH)","langDirRtl":"Höger till Vänster (HTV)","langCode":"Språkkod","longDescr":"URL-beskrivning","cssClass":"Stilmall","advisoryTitle":"Titel","cssStyle":"Stilmall","ok":"OK","cancel":"Avbryt","close":"Stäng","preview":"Förhandsgranska","resize":"Dra för att ändra storlek","generalTab":"Allmänt","advancedTab":"Avancerad","validateNumberFailed":"Värdet är inte ett nummer.","confirmNewPage":"Alla ändringar i innehållet kommer att förloras. Är du säker på att du vill ladda en ny sida?","confirmCancel":"Några av alternativen har ändrats. Är du säker på att du vill stänga dialogrutan?","options":"Alternativ","target":"Mål","targetNew":"Nytt fönster (_blank)","targetTop":"Översta fönstret (_top)","targetSelf":"Samma fönster (_self)","targetParent":"Föregående fönster (_parent)","langDirLTR":"Vänster till höger (LTR)","langDirRTL":"Höger till vänster (RTL)","styles":"Stil","cssClasses":"Stilmallar","width":"Bredd","height":"Höjd","align":"Justering","alignLeft":"Vänster","alignRight":"Höger","alignCenter":"Centrerad","alignJustify":"Justera till marginaler","alignTop":"Överkant","alignMiddle":"Mitten","alignBottom":"Nederkant","alignNone":"Ingen","invalidValue":"Felaktigt värde.","invalidHeight":"Höjd måste vara ett nummer.","invalidWidth":"Bredd måste vara ett nummer.","invalidCssLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan CSS-mätenheter (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan godkända HTML-mätenheter (px eller %).","invalidInlineStyle":"Det angivna värdet för style måste innehålla en eller flera tupler separerade med semikolon i följande format: \"name : value\"","cssLengthTooltip":"Ange ett nummer i pixlar eller ett nummer men godkänd CSS-mätenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, Ej tillgänglig</span>","keyboard":{"8":"Backsteg","13":"Retur","16":"Skift","17":"Ctrl","18":"Alt","32":"Mellanslag","35":"Slut","36":"Hem","46":"Radera","224":"Kommando"},"keyboardShortcut":"Kortkommando"},"about":{"copy":"Copyright &copy; $1. Alla rättigheter reserverade.","dlgTitle":"Om CKEditor","help":"Se $1 för hjälp.","moreInfo":"För information om licensiering besök vår hemsida:","title":"Om CKEditor","userGuide":"CKEditor användarmanual"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Genomstruken","subscript":"Nedsänkta tecken","superscript":"Upphöjda tecken","underline":"Understruken"},"bidi":{"ltr":"Text riktning från vänster till höger","rtl":"Text riktning från höger till vänster"},"blockquote":{"toolbar":"Blockcitat"},"clipboard":{"copy":"Kopiera","copyError":"Säkerhetsinställningar i Er webbläsare tillåter inte åtgärden kopiera. Använd (Ctrl/Cmd+C) istället.","cut":"Klipp ut","cutError":"Säkerhetsinställningar i Er webbläsare tillåter inte åtgärden klipp ut. Använd (Ctrl/Cmd+X) istället.","paste":"Klistra in","pasteArea":"Paste Area","pasteMsg":"Var god och klistra in Er text i rutan nedan genom att använda (<strong>Ctrl/Cmd+V</strong>) klicka sen på OK.","securityMsg":"På grund av din webbläsares säkerhetsinställningar kan verktyget inte få åtkomst till urklippsdatan. Var god och använd detta fönster istället.","title":"Klistra in"},"button":{"selectedLabel":"%1 (Vald)"},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Bakgrundsfärg","colors":{"000":"Svart","800000":"Rödbrun","8B4513":"Mörkbrun","2F4F4F":"Skiffergrå","008080":"Kricka","000080":"Marinblå","4B0082":"Indigo","696969":"Mörkgrå","B22222":"Tegelsten","A52A2A":"Brun","DAA520":"Mörk guld","006400":"Mörkgrön","40E0D0":"Turkos","0000CD":"Medium blå","800080":"Lila","808080":"Grå","F00":"Röd","FF8C00":"Mörkorange","FFD700":"Guld","008000":"Grön","0FF":"Turkos","00F":"Blå","EE82EE":"Violett","A9A9A9":"Matt grå","FFA07A":"Laxrosa","FFA500":"Orange","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Ljusturkos","ADD8E6":"Ljusblå","DDA0DD":"Plommon","D3D3D3":"Ljusgrå","FFF0F5":"Ljus lavendel","FAEBD7":"Antikvit","FFFFE0":"Ljusgul","F0FFF0":"Honungsdagg","F0FFFF":"Azurblå","F0F8FF":"Aliceblå","E6E6FA":"Lavendel","FFF":"Vit","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Fler färger...","panelTitle":"Färger","textColorTitle":"Textfärg"},"colordialog":{"clear":"Rensa","highlight":"Markera","options":"Färgalternativ","selected":"Vald färg","title":"Välj färg"},"templates":{"button":"Sidmallar","emptyListMsg":"(Ingen mall är vald)","insertOption":"Ersätt aktuellt innehåll","options":"Inställningar för mall","selectPromptMsg":"Var god välj en mall att använda med editorn<br>(allt nuvarande innehåll raderas):","title":"Sidmallar"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Rådgivande titel","cssClassInputLabel":"Stilmallar","edit":"Redigera Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Vänster till höger (LTR)","langDirLabel":"Språkriktning","langDirRTLLabel":"Höger till vänster (RTL)","languageCodeInputLabel":" Språkkod","remove":"Ta bort Div","styleSelectLabel":"Stil","title":"Skapa Div container","toolbar":"Skapa Div container"},"toolbar":{"toolbarCollapse":"Dölj verktygsfält","toolbarExpand":"Visa verktygsfält","toolbarGroups":{"document":"Dokument","clipboard":"Urklipp/ångra","editing":"Redigering","forms":"Formulär","basicstyles":"Basstilar","paragraph":"Paragraf","links":"Länkar","insert":"Infoga","styles":"Stilar","colors":"Färger","tools":"Verktyg"},"toolbars":"Editorns verktygsfält"},"elementspath":{"eleLabel":"Elementets sökväg","eleTitle":"%1 element"},"find":{"find":"Sök","findOptions":"Sökalternativ","findWhat":"Sök efter:","matchCase":"Skiftläge","matchCyclic":"Matcha cykliska","matchWord":"Inkludera hela ord","notFoundMsg":"Angiven text kunde ej hittas.","replace":"Ersätt","replaceAll":"Ersätt alla","replaceSuccessMsg":"%1 förekomst(er) ersatta.","replaceWith":"Ersätt med:","title":"Sök och ersätt"},"fakeobjects":{"anchor":"Ankare","flash":"Flashanimation","hiddenfield":"Gömt fält","iframe":"iFrame","unknown":"Okänt objekt"},"flash":{"access":"Script-tillgång","accessAlways":"Alltid","accessNever":"Aldrig","accessSameDomain":"Samma domän","alignAbsBottom":"Absolut nederkant","alignAbsMiddle":"Absolut centrering","alignBaseline":"Baslinje","alignTextTop":"Text överkant","bgcolor":"Bakgrundsfärg","chkFull":"Tillåt helskärm","chkLoop":"Upprepa/Loopa","chkMenu":"Aktivera Flashmeny","chkPlay":"Automatisk uppspelning","flashvars":"Variabler för Flash","hSpace":"Horis. marginal","properties":"Flashegenskaper","propertiesTab":"Egenskaper","quality":"Kvalitet","qualityAutoHigh":"Auto Hög","qualityAutoLow":"Auto Låg","qualityBest":"Bäst","qualityHigh":"Hög","qualityLow":"Låg","qualityMedium":"Medium","scale":"Skala","scaleAll":"Visa allt","scaleFit":"Exakt passning","scaleNoBorder":"Ingen ram","title":"Flashegenskaper","vSpace":"Vert. marginal","validateHSpace":"HSpace måste vara ett nummer.","validateSrc":"Var god ange länkens URL","validateVSpace":"VSpace måste vara ett nummer.","windowMode":"Fönsterläge","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Fönster"},"font":{"fontSize":{"label":"Storlek","voiceLabel":"Teckenstorlek","panelTitle":"Teckenstorlek"},"label":"Typsnitt","panelTitle":"Typsnitt","voiceLabel":"Typsnitt"},"forms":{"button":{"title":"Egenskaper för knapp","text":"Text (värde)","type":"Typ","typeBtn":"Knapp","typeSbm":"Skicka","typeRst":"Återställ"},"checkboxAndRadio":{"checkboxTitle":"Egenskaper för kryssruta","radioTitle":"Egenskaper för alternativknapp","value":"Värde","selected":"Vald","required":"Krävs"},"form":{"title":"Egenskaper för formulär","menu":"Egenskaper för formulär","action":"Funktion","method":"Metod","encoding":"Kodning"},"hidden":{"title":"Egenskaper för dolt fält","name":"Namn","value":"Värde"},"select":{"title":"Egenskaper för flervalslista","selectInfo":"Information","opAvail":"Befintliga val","value":"Värde","size":"Storlek","lines":"Linjer","chkMulti":"Tillåt flerval","required":"Krävs","opText":"Text","opValue":"Värde","btnAdd":"Lägg till","btnModify":"Redigera","btnUp":"Upp","btnDown":"Ner","btnSetValue":"Markera som valt värde","btnDelete":"Radera"},"textarea":{"title":"Egenskaper för textruta","cols":"Kolumner","rows":"Rader"},"textfield":{"title":"Egenskaper för textfält","name":"Namn","value":"Värde","charWidth":"Teckenbredd","maxChars":"Max antal tecken","required":"Krävs","type":"Typ","typeText":"Text","typePass":"Lösenord","typeEmail":"E-post","typeSearch":"Sök","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Teckenformat","panelTitle":"Teckenformat","tag_address":"Adress","tag_div":"Normal (DIV)","tag_h1":"Rubrik 1","tag_h2":"Rubrik 2","tag_h3":"Rubrik 3","tag_h4":"Rubrik 4","tag_h5":"Rubrik 5","tag_h6":"Rubrik 6","tag_p":"Normal","tag_pre":"Formaterad"},"horizontalrule":{"toolbar":"Infoga horisontal linje"},"iframe":{"border":"Visa ramkant","noUrl":"Skriv in URL för iFrame","scrolling":"Aktivera rullningslister","title":"iFrame-egenskaper","toolbar":"iFrame"},"image":{"alt":"Alternativ text","border":"Kant","btnUpload":"Skicka till server","button2Img":"Vill du omvandla den valda bildknappen på en enkel bild?","hSpace":"Horis. marginal","img2Button":"Vill du omvandla den valda bildknappen på en enkel bild?","infoTab":"Bildinformation","linkTab":"Länk","lockRatio":"Lås höjd/bredd förhållanden","menu":"Bildegenskaper","resetSize":"Återställ storlek","title":"Bildegenskaper","titleButton":"Egenskaper för bildknapp","upload":"Ladda upp","urlMissing":"Bildkällans URL saknas.","vSpace":"Vert. marginal","validateBorder":"Kantlinje måste vara ett heltal.","validateHSpace":"HSpace måste vara ett heltal.","validateVSpace":"VSpace måste vara ett heltal."},"indent":{"indent":"Öka indrag","outdent":"Minska indrag"},"smiley":{"options":"Smileyinställningar","title":"Infoga smiley","toolbar":"Smiley"},"justify":{"block":"Justera till marginaler","center":"Centrera","left":"Vänsterjustera","right":"Högerjustera"},"language":{"button":"Sätt språk","remove":"Ta bort språk"},"link":{"acccessKey":"Behörighetsnyckel","advanced":"Avancerad","advisoryContentType":"Innehållstyp","advisoryTitle":"Titel","anchor":{"toolbar":"Infoga/Redigera ankarlänk","menu":"Egenskaper för ankarlänk","title":"Egenskaper för ankarlänk","name":"Ankarnamn","errorName":"Var god ange ett ankarnamn","remove":"Radera ankare"},"anchorId":"Efter element-id","anchorName":"Efter ankarnamn","charset":"Teckenuppställning","cssClasses":"Stilmall","download":"Tvinga nerladdning","displayText":"Visningstext","emailAddress":"E-postadress","emailBody":"Innehåll","emailSubject":"Ämne","id":"Id","info":"Länkinformation","langCode":"Språkkod","langDir":"Språkriktning","langDirLTR":"Vänster till höger (VTH)","langDirRTL":"Höger till vänster (HTV)","menu":"Redigera länk","name":"Namn","noAnchors":"(Inga ankare kunde hittas)","noEmail":"Var god ange e-postadress","noUrl":"Var god ange länkens URL","other":"<annan>","popupDependent":"Beroende (endast Netscape)","popupFeatures":"Popup-fönstrets egenskaper","popupFullScreen":"Helskärm (endast IE)","popupLeft":"Position från vänster","popupLocationBar":"Adressfält","popupMenuBar":"Menyfält","popupResizable":"Skalbart","popupScrollBars":"Scrolllista","popupStatusBar":"Statusfält","popupToolbar":"Verktygsfält","popupTop":"Position från sidans topp","rel":"Förhållande","selectAnchor":"Välj ett ankare","styles":"Stilmall","tabIndex":"Tabindex","target":"Mål","targetFrame":"<ram>","targetFrameName":"Målets ramnamn","targetPopup":"<popup-fönster>","targetPopupName":"Popup-fönstrets namn","title":"Länk","toAnchor":"Länk till ankare i texten","toEmail":"E-post","toUrl":"URL","toolbar":"Infoga/Redigera länk","type":"Länktyp","unlink":"Radera länk","upload":"Ladda upp"},"list":{"bulletedlist":"Infoga/ta bort punktlista","numberedlist":"Infoga/ta bort numrerad lista"},"liststyle":{"armenian":"Armenisk numrering","bulletedTitle":"Egenskaper för punktlista","circle":"Cirkel","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal nolla (01, 02, 03, etc.)","disc":"Disk","georgian":"Georgisk numrering (an, ban, gan, etc.)","lowerAlpha":"Alpha gemener (a, b, c, d, e, etc.)","lowerGreek":"Grekiska gemener (alpha, beta, gamma, etc.)","lowerRoman":"Romerska gemener (i, ii, iii, iv, v, etc.)","none":"Ingen","notset":"<ej angiven>","numberedTitle":"Egenskaper för punktlista","square":"Fyrkant","start":"Start","type":"Typ","upperAlpha":"Alpha versaler (A, B, C, D, E, etc.)","upperRoman":"Romerska versaler (I, II, III, IV, V, etc.)","validateStartNumber":"Listans startnummer måste vara ett heltal."},"magicline":{"title":"Infoga paragraf här"},"maximize":{"maximize":"Maximera","minimize":"Minimera"},"newpage":{"toolbar":"Ny sida"},"pagebreak":{"alt":"Sidbrytning","toolbar":"Infoga sidbrytning för utskrift"},"pastetext":{"button":"Klistra in som vanlig text","title":"Klistra in som vanlig text"},"pastefromword":{"confirmCleanup":"Texten du vill klistra in verkar vara kopierad från Word. Vill du rensa den innan du klistrar in den?","error":"Det var inte möjligt att städa upp den inklistrade data på grund av ett internt fel","title":"Klistra in från Word","toolbar":"Klistra in från Word"},"preview":{"preview":"Förhandsgranska"},"print":{"toolbar":"Skriv ut"},"removeformat":{"toolbar":"Radera formatering"},"save":{"toolbar":"Spara"},"selectall":{"toolbar":"Markera allt"},"showblocks":{"toolbar":"Visa block"},"sourcearea":{"toolbar":"Källa"},"specialchar":{"options":"Alternativ för utökade tecken","title":"Välj utökat tecken","toolbar":"Klistra in utökat tecken"},"scayt":{"btn_about":"Om SCAYT","btn_dictionaries":"Ordlistor","btn_disable":"Inaktivera SCAYT","btn_enable":"Aktivera SCAYT","btn_langs":"Språk","btn_options":"Inställningar","text_title":"Stavningskontroll medan du skriver"},"stylescombo":{"label":"Stilar","panelTitle":"Formateringsstilar","panelTitle1":"Blockstilar","panelTitle2":"Inbäddade stilar","panelTitle3":"Objektstilar"},"table":{"border":"Kantstorlek","caption":"Rubrik","cell":{"menu":"Cell","insertBefore":"Lägg till cell före","insertAfter":"Lägg till cell efter","deleteCell":"Radera celler","merge":"Sammanfoga celler","mergeRight":"Sammanfoga höger","mergeDown":"Sammanfoga ner","splitHorizontal":"Dela cell horisontellt","splitVertical":"Dela cell vertikalt","title":"Egenskaper för cell","cellType":"Celltyp","rowSpan":"Rad spann","colSpan":"Kolumnen spann","wordWrap":"Radbrytning","hAlign":"Horisontell justering","vAlign":"Vertikal justering","alignBaseline":"Baslinje","bgColor":"Bakgrundsfärg","borderColor":"Ramfärg","data":"Data","header":"Rubrik","yes":"Ja","no":"Nej","invalidWidth":"Cellens bredd måste vara ett nummer.","invalidHeight":"Cellens höjd måste vara ett nummer.","invalidRowSpan":"Radutvidgning måste vara ett heltal.","invalidColSpan":"Kolumn måste vara ett heltal.","chooseColor":"Välj"},"cellPad":"Cellutfyllnad","cellSpace":"Cellavstånd","column":{"menu":"Kolumn","insertBefore":"Lägg till kolumn före","insertAfter":"Lägg till kolumn efter","deleteColumn":"Radera kolumn"},"columns":"Kolumner","deleteTable":"Radera tabell","headers":"Rubriker","headersBoth":"Båda","headersColumn":"Första kolumnen","headersNone":"Ingen","headersRow":"Första raden","invalidBorder":"Ram måste vara ett nummer.","invalidCellPadding":"Luft i cell måste vara ett nummer.","invalidCellSpacing":"Luft i cell måste vara ett nummer.","invalidCols":"Antal kolumner måste vara ett nummer större än 0.","invalidHeight":"Tabellens höjd måste vara ett nummer.","invalidRows":"Antal rader måste vara större än 0.","invalidWidth":"Tabell måste vara ett nummer.","menu":"Tabellegenskaper","row":{"menu":"Rad","insertBefore":"Lägg till rad före","insertAfter":"Lägg till rad efter","deleteRow":"Radera rad"},"rows":"Rader","summary":"Sammanfattning","title":"Tabellegenskaper","toolbar":"Tabell","widthPc":"procent","widthPx":"pixlar","widthUnit":"enhet bredd"},"undo":{"redo":"Gör om","undo":"Ångra"},"wsc":{"btnIgnore":"Ignorera","btnIgnoreAll":"Ignorera alla","btnReplace":"Ersätt","btnReplaceAll":"Ersätt alla","btnUndo":"Ångra","changeTo":"Ändra till","errorLoading":"Tjänsten är ej tillgänglig: %s.","ieSpellDownload":"Stavningskontrollen är ej installerad. Vill du göra det nu?","manyChanges":"Stavningskontroll slutförd: %1 ord rättades.","noChanges":"Stavningskontroll slutförd: Inga ord rättades.","noMispell":"Stavningskontroll slutförd: Inga stavfel påträffades.","noSuggestions":"- Förslag saknas -","notAvailable":"Tyvärr är tjänsten ej tillgänglig nu","notInDic":"Saknas i ordlistan","oneChange":"Stavningskontroll slutförd: Ett ord rättades.","progress":"Stavningskontroll pågår...","title":"Kontrollera stavning","toolbar":"Stavningskontroll"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/th.js b/htdocs/includes/ckeditor/ckeditor/lang/th.js
index ef5fd1d3a18..63f82ca12fa 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/th.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/th.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['th']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"กด ALT 0 หากต้องการความช่วยเหลือ","browseServer":"เปิดหน้าต่างจัดการไฟล์อัพโหลด","url":"ที่อยู่อ้างอิง URL","protocol":"โปรโตคอล","upload":"อัพโหลดไฟล์","uploadSubmit":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","image":"รูปภาพ","flash":"ไฟล์ Flash","form":"แบบฟอร์ม","checkbox":"เช็คบ๊อก","radio":"เรดิโอบัตตอน","textField":"เท็กซ์ฟิลด์","textarea":"เท็กซ์แอเรีย","hiddenField":"ฮิดเดนฟิลด์","button":"ปุ่ม","select":"แถบตัวเลือก","imageButton":"ปุ่มแบบรูปภาพ","notSet":"<ไม่ระบุ>","id":"ไอดี","name":"ชื่อ","langDir":"การเขียน-อ่านภาษา","langDirLtr":"จากซ้ายไปขวา (LTR)","langDirRtl":"จากขวามาซ้าย (RTL)","langCode":"รหัสภาษา","longDescr":"คำอธิบายประกอบ URL","cssClass":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","advisoryTitle":"คำเกริ่นนำ","cssStyle":"ลักษณะการแสดงผล","ok":"ตกลง","cancel":"ยกเลิก","close":"ปิด","preview":"ดูหน้าเอกสารตัวอย่าง","resize":"ปรับขนาด","generalTab":"ทั่วไป","advancedTab":"ขั้นสูง","validateNumberFailed":"ค่านี้ไม่ใช่ตัวเลข","confirmNewPage":"การเปลี่ยนแปลงใดๆ ในเนื้อหานี้ ที่ไม่ได้ถูกบันทึกไว้ จะสูญหายทั้งหมด คุณแน่ใจว่าจะเรียกหน้าใหม่?","confirmCancel":"ตัวเลือกบางตัวมีการเปลี่ยนแปลง คุณแน่ใจว่าจะปิดกล่องโต้ตอบนี้?","options":"ตัวเลือก","target":"การเปิดหน้าลิงค์","targetNew":"หน้าต่างใหม่ (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"หน้าต่างเดียวกัน (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"จากซ้ายไปขวา (LTR)","langDirRTL":"จากขวามาซ้าย (RTL)","styles":"ลักษณะการแสดงผล","cssClasses":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","width":"ความกว้าง","height":"ความสูง","align":"การจัดวาง","alignLeft":"ชิดซ้าย","alignRight":"ชิดขวา","alignCenter":"กึ่งกลาง","alignJustify":"நியாயப்படுத்தவும்","alignTop":"บนสุด","alignMiddle":"กึ่งกลางแนวตั้ง","alignBottom":"ชิดด้านล่าง","alignNone":"None","invalidValue":"ค่าไม่ถูกต้อง","invalidHeight":"ความสูงต้องเป็นตัวเลข","invalidWidth":"ความกว้างต้องเป็นตัวเลข","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"ตัวหนา","italic":"ตัวเอียง","strike":"ตัวขีดเส้นทับ","subscript":"ตัวห้อย","superscript":"ตัวยก","underline":"ตัวขีดเส้นใต้"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"สำเนา","copyError":"ไม่สามารถสำเนาข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว C พร้อมกัน).","cut":"ตัด","cutError":"ไม่สามารถตัดข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว X พร้อมกัน).","paste":"วาง","pasteArea":"Paste Area","pasteMsg":"กรุณาใช้คีย์บอร์ดเท่านั้น โดยกดปุ๋ม (<strong>Ctrl/Cmd และ V</strong>)พร้อมๆกัน และกด <strong>OK</strong>.","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"วาง"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"สีอัตโนมัติ","bgColorTitle":"สีพื้นหลัง","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White"},"more":"เลือกสีอื่นๆ...","panelTitle":"Colors","textColorTitle":"สีตัวอักษร"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"เทมเพลต","emptyListMsg":"(ยังไม่มีการกำหนดเทมเพลต)","insertOption":"แทนที่เนื้อหาเว็บไซต์ที่เลือก","options":"ตัวเลือกเกี่ยวกับเทมเพลท","selectPromptMsg":"กรุณาเลือก เทมเพลต เพื่อนำไปแก้ไขในอีดิตเตอร์<br />(เนื้อหาส่วนนี้จะหายไป):","title":"เทมเพลตของส่วนเนื้อหาเว็บไซต์"},"contextmenu":{"options":"Context Menu Options"},"div":{"IdInputLabel":"ไอดี","advisoryTitleInputLabel":"คำเกริ่นนำ","cssClassInputLabel":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","edit":"แก้ไข Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"จากซ้ายไปขวา (LTR)","langDirLabel":"การเขียน-อ่านภาษา","langDirRTLLabel":"จากขวามาซ้าย (RTL)","languageCodeInputLabel":"รหัสภาษา","remove":"ลบ Div","styleSelectLabel":"ลักษณะการแสดงผล","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"ซ่อนแถบเครื่องมือ","toolbarExpand":"เปิดแถบเครื่องมือ","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"แถบเครื่องมือช่วยพิมพ์ข้อความ"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"ค้นหา","findOptions":"Find Options","findWhat":"ค้นหาคำว่า:","matchCase":"ตัวโหญ่-เล็ก ต้องตรงกัน","matchCyclic":"Match cyclic","matchWord":"ต้องตรงกันทุกคำ","notFoundMsg":"ไม่พบคำที่ค้นหา.","replace":"ค้นหาและแทนที่","replaceAll":"แทนที่ทั้งหมดที่พบ","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"แทนที่ด้วย:","title":"Find and Replace"},"fakeobjects":{"anchor":"แทรก/แก้ไข Anchor","flash":"ภาพอนิเมชั่นแฟลช","hiddenfield":"ฮิดเดนฟิลด์","iframe":"IFrame","unknown":"วัตถุไม่ทราบชนิด"},"flash":{"access":"การเข้าถึงสคริปต์","accessAlways":"ตลอดไป","accessNever":"ไม่เลย","accessSameDomain":"โดเมนเดียวกัน","alignAbsBottom":"ชิดด้านล่างสุด","alignAbsMiddle":"กึ่งกลาง","alignBaseline":"ชิดบรรทัด","alignTextTop":"ใต้ตัวอักษร","bgcolor":"สีพื้นหลัง","chkFull":"อนุญาตให้แสดงเต็มหน้าจอได้","chkLoop":"เล่นวนรอบ Loop","chkMenu":"ให้ใช้งานเมนูของ Flash","chkPlay":"เล่นอัตโนมัติ Auto Play","flashvars":"ตัวแปรสำหรับ Flas","hSpace":"ระยะแนวนอน","properties":"คุณสมบัติของไฟล์ Flash","propertiesTab":"คุณสมบัติ","quality":"คุณภาพ","qualityAutoHigh":"ปรับคุณภาพสูงอัตโนมัติ","qualityAutoLow":"ปรับคุณภาพต่ำอัตโนมัติ","qualityBest":"ดีที่สุด","qualityHigh":"สูง","qualityLow":"ต่ำ","qualityMedium":"ปานกลาง","scale":"อัตราส่วน Scale","scaleAll":"แสดงให้เห็นทั้งหมด Show all","scaleFit":"แสดงให้พอดีกับพื้นที่ Exact Fit","scaleNoBorder":"ไม่แสดงเส้นขอบ No Border","title":"คุณสมบัติของไฟล์ Flash","vSpace":"ระยะแนวตั้ง","validateHSpace":"HSpace ต้องเป็นจำนวนตัวเลข","validateSrc":"กรุณาระบุที่อยู่อ้างอิงออนไลน์ (URL)","validateVSpace":"VSpace ต้องเป็นจำนวนตัวเลข","windowMode":"โหมดหน้าต่าง","windowModeOpaque":"ความทึบแสง","windowModeTransparent":"ความโปรงแสง","windowModeWindow":"หน้าต่าง"},"font":{"fontSize":{"label":"ขนาด","voiceLabel":"Font Size","panelTitle":"ขนาด"},"label":"แบบอักษร","panelTitle":"แบบอักษร","voiceLabel":"แบบอักษร"},"forms":{"button":{"title":"รายละเอียดของ ปุ่ม","text":"ข้อความ (ค่าตัวแปร)","type":"ข้อความ","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"คุณสมบัติของ เช็คบ๊อก","radioTitle":"คุณสมบัติของ เรดิโอบัตตอน","value":"ค่าตัวแปร","selected":"เลือกเป็นค่าเริ่มต้น","required":"Required"},"form":{"title":"คุณสมบัติของ แบบฟอร์ม","menu":"คุณสมบัติของ แบบฟอร์ม","action":"แอคชั่น","method":"เมธอด","encoding":"Encoding"},"hidden":{"title":"คุณสมบัติของ ฮิดเดนฟิลด์","name":"ชื่อ","value":"ค่าตัวแปร"},"select":{"title":"คุณสมบัติของ แถบตัวเลือก","selectInfo":"อินโฟ","opAvail":"รายการตัวเลือก","value":"ค่าตัวแปร","size":"ขนาด","lines":"บรรทัด","chkMulti":"เลือกหลายค่าได้","required":"Required","opText":"ข้อความ","opValue":"ค่าตัวแปร","btnAdd":"เพิ่ม","btnModify":"แก้ไข","btnUp":"บน","btnDown":"ล่าง","btnSetValue":"เลือกเป็นค่าเริ่มต้น","btnDelete":"ลบ"},"textarea":{"title":"คุณสมบัติของ เท็กแอเรีย","cols":"สดมภ์","rows":"แถว"},"textfield":{"title":"คุณสมบัติของ เท็กซ์ฟิลด์","name":"ชื่อ","value":"ค่าตัวแปร","charWidth":"ความกว้าง","maxChars":"จำนวนตัวอักษรสูงสุด","required":"Required","type":"ชนิด","typeText":"ข้อความ","typePass":"รหัสผ่าน","typeEmail":"อีเมล","typeSearch":"ค้นหาก","typeTel":"หมายเลขโทรศัพท์","typeUrl":"ที่อยู่อ้างอิง URL"}},"format":{"label":"รูปแบบ","panelTitle":"รูปแบบ","tag_address":"Address","tag_div":"Paragraph (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"แทรกเส้นคั่นบรรทัด"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"คำประกอบรูปภาพ","border":"ขนาดขอบรูป","btnUpload":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"ระยะแนวนอน","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"ข้อมูลของรูปภาพ","linkTab":"ลิ้งค์","lockRatio":"กำหนดอัตราส่วน กว้าง-สูง แบบคงที่","menu":"คุณสมบัติของ รูปภาพ","resetSize":"กำหนดรูปเท่าขนาดจริง","title":"คุณสมบัติของ รูปภาพ","titleButton":"คุณสมบัติของ ปุ่มแบบรูปภาพ","upload":"อัพโหลดไฟล์","urlMissing":"Image source URL is missing.","vSpace":"ระยะแนวตั้ง","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"เพิ่มระยะย่อหน้า","outdent":"ลดระยะย่อหน้า"},"smiley":{"options":"ตัวเลือกไอคอนแสดงอารมณ์","title":"แทรกสัญลักษณ์สื่ออารมณ์","toolbar":"รูปสื่ออารมณ์"},"justify":{"block":"จัดพอดีหน้ากระดาษ","center":"จัดกึ่งกลาง","left":"จัดชิดซ้าย","right":"จัดชิดขวา"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"แอคเซส คีย์","advanced":"ขั้นสูง","advisoryContentType":"ชนิดของคำเกริ่นนำ","advisoryTitle":"คำเกริ่นนำ","anchor":{"toolbar":"แทรก/แก้ไข Anchor","menu":"รายละเอียด Anchor","title":"รายละเอียด Anchor","name":"ชื่อ Anchor","errorName":"กรุณาระบุชื่อของ Anchor","remove":"Remove Anchor"},"anchorId":"ไอดี","anchorName":"ชื่อ","charset":"ลิงค์เชื่อมโยงไปยังชุดตัวอักษร","cssClasses":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","emailAddress":"อีเมล์ (E-Mail)","emailBody":"ข้อความ","emailSubject":"หัวเรื่อง","id":"ไอดี","info":"รายละเอียด","langCode":"การเขียน-อ่านภาษา","langDir":"การเขียน-อ่านภาษา","langDirLTR":"จากซ้ายไปขวา (LTR)","langDirRTL":"จากขวามาซ้าย (RTL)","menu":"แก้ไข ลิงค์","name":"ชื่อ","noAnchors":"(ยังไม่มีจุดเชื่อมโยงภายในหน้าเอกสารนี้)","noEmail":"กรุณาระบุอีเมล์ (E-mail)","noUrl":"กรุณาระบุที่อยู่อ้างอิงออนไลน์ (URL)","other":"<อื่น ๆ>","popupDependent":"แสดงเต็มหน้าจอ (Netscape)","popupFeatures":"คุณสมบัติของหน้าจอเล็ก (Pop-up)","popupFullScreen":"แสดงเต็มหน้าจอ (IE5.5++ เท่านั้น)","popupLeft":"พิกัดซ้าย (Left Position)","popupLocationBar":"แสดงที่อยู่ของไฟล์","popupMenuBar":"แสดงแถบเมนู","popupResizable":"สามารถปรับขนาดได้","popupScrollBars":"แสดงแถบเลื่อน","popupStatusBar":"แสดงแถบสถานะ","popupToolbar":"แสดงแถบเครื่องมือ","popupTop":"พิกัดบน (Top Position)","rel":"ความสัมพันธ์","selectAnchor":"ระบุข้อมูลของจุดเชื่อมโยง (Anchor)","styles":"ลักษณะการแสดงผล","tabIndex":"ลำดับของ แท็บ","target":"การเปิดหน้าลิงค์","targetFrame":"<เปิดในเฟรม>","targetFrameName":"ชื่อทาร์เก็ตเฟรม","targetPopup":"<เปิดหน้าจอเล็ก (Pop-up)>","targetPopupName":"ระบุชื่อหน้าจอเล็ก (Pop-up)","title":"ลิงค์เชื่อมโยงเว็บ อีเมล์ รูปภาพ หรือไฟล์อื่นๆ","toAnchor":"จุดเชื่อมโยง (Anchor)","toEmail":"ส่งอีเมล์ (E-Mail)","toUrl":"ที่อยู่อ้างอิง URL","toolbar":"แทรก/แก้ไข ลิงค์","type":"ประเภทของลิงค์","unlink":"ลบ ลิงค์","upload":"อัพโหลดไฟล์"},"list":{"bulletedlist":"ลำดับรายการแบบสัญลักษณ์","numberedlist":"ลำดับรายการแบบตัวเลข"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"ขยายใหญ่","minimize":"ย่อขนาด"},"newpage":{"toolbar":"สร้างหน้าเอกสารใหม่"},"pagebreak":{"alt":"ตัวแบ่งหน้า","toolbar":"แทรกตัวแบ่งหน้า Page Break"},"pastetext":{"button":"วางแบบตัวอักษรธรรมดา","title":"วางแบบตัวอักษรธรรมดา"},"pastefromword":{"confirmCleanup":"ข้อความที่คุณต้องการวางลงไปเป็นข้อความที่คัดลอกมาจากโปรแกรมไมโครซอฟท์เวิร์ด คุณต้องการล้างค่าข้อความดังกล่าวก่อนวางลงไปหรือไม่?","error":"ไม่สามารถล้างข้อมูลที่ต้องการวางได้เนื่องจากเกิดข้อผิดพลาดภายในระบบ","title":"วางสำเนาจากตัวอักษรเวิร์ด","toolbar":"วางสำเนาจากตัวอักษรเวิร์ด"},"preview":{"preview":"ดูหน้าเอกสารตัวอย่าง"},"print":{"toolbar":"สั่งพิมพ์"},"removeformat":{"toolbar":"ล้างรูปแบบ"},"save":{"toolbar":"บันทึก"},"selectall":{"toolbar":"เลือกทั้งหมด"},"showblocks":{"toolbar":"แสดงบล็อคข้อมูล"},"sourcearea":{"toolbar":"ดูรหัส HTML"},"specialchar":{"options":"Special Character Options","title":"แทรกตัวอักษรพิเศษ","toolbar":"แทรกตัวอักษรพิเศษ"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"ลักษณะ","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"ขนาดเส้นขอบ","caption":"หัวเรื่องของตาราง","cell":{"menu":"ช่องตาราง","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"ลบช่อง","merge":"ผสานช่อง","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"ระยะแนวตั้ง","cellSpace":"ระยะแนวนอนน","column":{"menu":"คอลัมน์","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"ลบสดมน์"},"columns":"สดมน์","deleteTable":"ลบตาราง","headers":"ส่วนหัว","headersBoth":"ทั้งสองอย่าง","headersColumn":"คอลัมน์แรก","headersNone":"None","headersRow":"แถวแรก","invalidBorder":"ขนาดเส้นกรอบต้องเป็นจำนวนตัวเลข","invalidCellPadding":"ช่องว่างภายในเซลล์ต้องเลขจำนวนบวก","invalidCellSpacing":"ช่องว่างภายในเซลล์ต้องเป็นเลขจำนวนบวก","invalidCols":"จำนวนคอลัมน์ต้องเป็นจำนวนมากกว่า 0","invalidHeight":"ส่วนสูงของตารางต้องเป็นตัวเลข","invalidRows":"จำนวนของแถวต้องเป็นจำนวนมากกว่า 0","invalidWidth":"ความกว้างตารางต้องเป็นตัวเลข","menu":"คุณสมบัติของ ตาราง","row":{"menu":"แถว","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"ลบแถว"},"rows":"แถว","summary":"สรุปความ","title":"คุณสมบัติของ ตาราง","toolbar":"ตาราง","widthPc":"เปอร์เซ็น","widthPx":"จุดสี","widthUnit":"หน่วยความกว้าง"},"undo":{"redo":"ทำซ้ำคำสั่ง","undo":"ยกเลิกคำสั่ง"},"wsc":{"btnIgnore":"ยกเว้น","btnIgnoreAll":"ยกเว้นทั้งหมด","btnReplace":"แทนที่","btnReplaceAll":"แทนที่ทั้งหมด","btnUndo":"ยกเลิก","changeTo":"แก้ไขเป็น","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"ไม่ได้ติดตั้งระบบตรวจสอบคำสะกด. ต้องการติดตั้งไหมครับ?","manyChanges":"ตรวจสอบคำสะกดเสร็จสิ้น:: แก้ไข %1 คำ","noChanges":"ตรวจสอบคำสะกดเสร็จสิ้น: ไม่มีการแก้คำใดๆ","noMispell":"ตรวจสอบคำสะกดเสร็จสิ้น: ไม่พบคำสะกดผิด","noSuggestions":"- ไม่มีคำแนะนำใดๆ -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"ไม่พบในดิกชันนารี","oneChange":"ตรวจสอบคำสะกดเสร็จสิ้น: แก้ไข1คำ","progress":"กำลังตรวจสอบคำสะกด...","title":"Spell Checker","toolbar":"ตรวจการสะกดคำ"}};
\ No newline at end of file
+CKEDITOR.lang['th']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"กด ALT 0 หากต้องการความช่วยเหลือ","browseServer":"เปิดหน้าต่างจัดการไฟล์อัพโหลด","url":"ที่อยู่อ้างอิง URL","protocol":"โปรโตคอล","upload":"อัพโหลดไฟล์","uploadSubmit":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","image":"รูปภาพ","flash":"ไฟล์ Flash","form":"แบบฟอร์ม","checkbox":"เช็คบ๊อก","radio":"เรดิโอบัตตอน","textField":"เท็กซ์ฟิลด์","textarea":"เท็กซ์แอเรีย","hiddenField":"ฮิดเดนฟิลด์","button":"ปุ่ม","select":"แถบตัวเลือก","imageButton":"ปุ่มแบบรูปภาพ","notSet":"<ไม่ระบุ>","id":"ไอดี","name":"ชื่อ","langDir":"การเขียน-อ่านภาษา","langDirLtr":"จากซ้ายไปขวา (LTR)","langDirRtl":"จากขวามาซ้าย (RTL)","langCode":"รหัสภาษา","longDescr":"คำอธิบายประกอบ URL","cssClass":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","advisoryTitle":"คำเกริ่นนำ","cssStyle":"ลักษณะการแสดงผล","ok":"ตกลง","cancel":"ยกเลิก","close":"ปิด","preview":"ดูหน้าเอกสารตัวอย่าง","resize":"ปรับขนาด","generalTab":"ทั่วไป","advancedTab":"ขั้นสูง","validateNumberFailed":"ค่านี้ไม่ใช่ตัวเลข","confirmNewPage":"การเปลี่ยนแปลงใดๆ ในเนื้อหานี้ ที่ไม่ได้ถูกบันทึกไว้ จะสูญหายทั้งหมด คุณแน่ใจว่าจะเรียกหน้าใหม่?","confirmCancel":"ตัวเลือกบางตัวมีการเปลี่ยนแปลง คุณแน่ใจว่าจะปิดกล่องโต้ตอบนี้?","options":"ตัวเลือก","target":"การเปิดหน้าลิงค์","targetNew":"หน้าต่างใหม่ (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"หน้าต่างเดียวกัน (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"จากซ้ายไปขวา (LTR)","langDirRTL":"จากขวามาซ้าย (RTL)","styles":"ลักษณะการแสดงผล","cssClasses":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","width":"ความกว้าง","height":"ความสูง","align":"การจัดวาง","alignLeft":"ชิดซ้าย","alignRight":"ชิดขวา","alignCenter":"กึ่งกลาง","alignJustify":"நியாயப்படுத்தவும்","alignTop":"บนสุด","alignMiddle":"กึ่งกลางแนวตั้ง","alignBottom":"ชิดด้านล่าง","alignNone":"None","invalidValue":"ค่าไม่ถูกต้อง","invalidHeight":"ความสูงต้องเป็นตัวเลข","invalidWidth":"ความกว้างต้องเป็นตัวเลข","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"ตัวหนา","italic":"ตัวเอียง","strike":"ตัวขีดเส้นทับ","subscript":"ตัวห้อย","superscript":"ตัวยก","underline":"ตัวขีดเส้นใต้"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"clipboard":{"copy":"สำเนา","copyError":"ไม่สามารถสำเนาข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว C พร้อมกัน).","cut":"ตัด","cutError":"ไม่สามารถตัดข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว X พร้อมกัน).","paste":"วาง","pasteArea":"Paste Area","pasteMsg":"กรุณาใช้คีย์บอร์ดเท่านั้น โดยกดปุ๋ม (<strong>Ctrl/Cmd และ V</strong>)พร้อมๆกัน และกด <strong>OK</strong>.","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"วาง"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"สีอัตโนมัติ","bgColorTitle":"สีพื้นหลัง","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"เลือกสีอื่นๆ...","panelTitle":"Colors","textColorTitle":"สีตัวอักษร"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"เทมเพลต","emptyListMsg":"(ยังไม่มีการกำหนดเทมเพลต)","insertOption":"แทนที่เนื้อหาเว็บไซต์ที่เลือก","options":"ตัวเลือกเกี่ยวกับเทมเพลท","selectPromptMsg":"กรุณาเลือก เทมเพลต เพื่อนำไปแก้ไขในอีดิตเตอร์<br />(เนื้อหาส่วนนี้จะหายไป):","title":"เทมเพลตของส่วนเนื้อหาเว็บไซต์"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ไอดี","advisoryTitleInputLabel":"คำเกริ่นนำ","cssClassInputLabel":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","edit":"แก้ไข Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"จากซ้ายไปขวา (LTR)","langDirLabel":"การเขียน-อ่านภาษา","langDirRTLLabel":"จากขวามาซ้าย (RTL)","languageCodeInputLabel":"รหัสภาษา","remove":"ลบ Div","styleSelectLabel":"ลักษณะการแสดงผล","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"ซ่อนแถบเครื่องมือ","toolbarExpand":"เปิดแถบเครื่องมือ","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"แถบเครื่องมือช่วยพิมพ์ข้อความ"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"find":{"find":"ค้นหา","findOptions":"Find Options","findWhat":"ค้นหาคำว่า:","matchCase":"ตัวโหญ่-เล็ก ต้องตรงกัน","matchCyclic":"Match cyclic","matchWord":"ต้องตรงกันทุกคำ","notFoundMsg":"ไม่พบคำที่ค้นหา.","replace":"ค้นหาและแทนที่","replaceAll":"แทนที่ทั้งหมดที่พบ","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"แทนที่ด้วย:","title":"Find and Replace"},"fakeobjects":{"anchor":"แทรก/แก้ไข Anchor","flash":"ภาพอนิเมชั่นแฟลช","hiddenfield":"ฮิดเดนฟิลด์","iframe":"IFrame","unknown":"วัตถุไม่ทราบชนิด"},"flash":{"access":"การเข้าถึงสคริปต์","accessAlways":"ตลอดไป","accessNever":"ไม่เลย","accessSameDomain":"โดเมนเดียวกัน","alignAbsBottom":"ชิดด้านล่างสุด","alignAbsMiddle":"กึ่งกลาง","alignBaseline":"ชิดบรรทัด","alignTextTop":"ใต้ตัวอักษร","bgcolor":"สีพื้นหลัง","chkFull":"อนุญาตให้แสดงเต็มหน้าจอได้","chkLoop":"เล่นวนรอบ Loop","chkMenu":"ให้ใช้งานเมนูของ Flash","chkPlay":"เล่นอัตโนมัติ Auto Play","flashvars":"ตัวแปรสำหรับ Flas","hSpace":"ระยะแนวนอน","properties":"คุณสมบัติของไฟล์ Flash","propertiesTab":"คุณสมบัติ","quality":"คุณภาพ","qualityAutoHigh":"ปรับคุณภาพสูงอัตโนมัติ","qualityAutoLow":"ปรับคุณภาพต่ำอัตโนมัติ","qualityBest":"ดีที่สุด","qualityHigh":"สูง","qualityLow":"ต่ำ","qualityMedium":"ปานกลาง","scale":"อัตราส่วน Scale","scaleAll":"แสดงให้เห็นทั้งหมด Show all","scaleFit":"แสดงให้พอดีกับพื้นที่ Exact Fit","scaleNoBorder":"ไม่แสดงเส้นขอบ No Border","title":"คุณสมบัติของไฟล์ Flash","vSpace":"ระยะแนวตั้ง","validateHSpace":"HSpace ต้องเป็นจำนวนตัวเลข","validateSrc":"กรุณาระบุที่อยู่อ้างอิงออนไลน์ (URL)","validateVSpace":"VSpace ต้องเป็นจำนวนตัวเลข","windowMode":"โหมดหน้าต่าง","windowModeOpaque":"ความทึบแสง","windowModeTransparent":"ความโปรงแสง","windowModeWindow":"หน้าต่าง"},"font":{"fontSize":{"label":"ขนาด","voiceLabel":"Font Size","panelTitle":"ขนาด"},"label":"แบบอักษร","panelTitle":"แบบอักษร","voiceLabel":"แบบอักษร"},"forms":{"button":{"title":"รายละเอียดของ ปุ่ม","text":"ข้อความ (ค่าตัวแปร)","type":"ข้อความ","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"คุณสมบัติของ เช็คบ๊อก","radioTitle":"คุณสมบัติของ เรดิโอบัตตอน","value":"ค่าตัวแปร","selected":"เลือกเป็นค่าเริ่มต้น","required":"Required"},"form":{"title":"คุณสมบัติของ แบบฟอร์ม","menu":"คุณสมบัติของ แบบฟอร์ม","action":"แอคชั่น","method":"เมธอด","encoding":"Encoding"},"hidden":{"title":"คุณสมบัติของ ฮิดเดนฟิลด์","name":"ชื่อ","value":"ค่าตัวแปร"},"select":{"title":"คุณสมบัติของ แถบตัวเลือก","selectInfo":"อินโฟ","opAvail":"รายการตัวเลือก","value":"ค่าตัวแปร","size":"ขนาด","lines":"บรรทัด","chkMulti":"เลือกหลายค่าได้","required":"Required","opText":"ข้อความ","opValue":"ค่าตัวแปร","btnAdd":"เพิ่ม","btnModify":"แก้ไข","btnUp":"บน","btnDown":"ล่าง","btnSetValue":"เลือกเป็นค่าเริ่มต้น","btnDelete":"ลบ"},"textarea":{"title":"คุณสมบัติของ เท็กแอเรีย","cols":"สดมภ์","rows":"แถว"},"textfield":{"title":"คุณสมบัติของ เท็กซ์ฟิลด์","name":"ชื่อ","value":"ค่าตัวแปร","charWidth":"ความกว้าง","maxChars":"จำนวนตัวอักษรสูงสุด","required":"Required","type":"ชนิด","typeText":"ข้อความ","typePass":"รหัสผ่าน","typeEmail":"อีเมล","typeSearch":"ค้นหาก","typeTel":"หมายเลขโทรศัพท์","typeUrl":"ที่อยู่อ้างอิง URL"}},"format":{"label":"รูปแบบ","panelTitle":"รูปแบบ","tag_address":"Address","tag_div":"Paragraph (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"แทรกเส้นคั่นบรรทัด"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"คำประกอบรูปภาพ","border":"ขนาดขอบรูป","btnUpload":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"ระยะแนวนอน","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"ข้อมูลของรูปภาพ","linkTab":"ลิ้งค์","lockRatio":"กำหนดอัตราส่วน กว้าง-สูง แบบคงที่","menu":"คุณสมบัติของ รูปภาพ","resetSize":"กำหนดรูปเท่าขนาดจริง","title":"คุณสมบัติของ รูปภาพ","titleButton":"คุณสมบัติของ ปุ่มแบบรูปภาพ","upload":"อัพโหลดไฟล์","urlMissing":"Image source URL is missing.","vSpace":"ระยะแนวตั้ง","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"เพิ่มระยะย่อหน้า","outdent":"ลดระยะย่อหน้า"},"smiley":{"options":"ตัวเลือกไอคอนแสดงอารมณ์","title":"แทรกสัญลักษณ์สื่ออารมณ์","toolbar":"รูปสื่ออารมณ์"},"justify":{"block":"จัดพอดีหน้ากระดาษ","center":"จัดกึ่งกลาง","left":"จัดชิดซ้าย","right":"จัดชิดขวา"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"แอคเซส คีย์","advanced":"ขั้นสูง","advisoryContentType":"ชนิดของคำเกริ่นนำ","advisoryTitle":"คำเกริ่นนำ","anchor":{"toolbar":"แทรก/แก้ไข Anchor","menu":"รายละเอียด Anchor","title":"รายละเอียด Anchor","name":"ชื่อ Anchor","errorName":"กรุณาระบุชื่อของ Anchor","remove":"Remove Anchor"},"anchorId":"ไอดี","anchorName":"ชื่อ","charset":"ลิงค์เชื่อมโยงไปยังชุดตัวอักษร","cssClasses":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","download":"Force Download","displayText":"Display Text","emailAddress":"อีเมล์ (E-Mail)","emailBody":"ข้อความ","emailSubject":"หัวเรื่อง","id":"ไอดี","info":"รายละเอียด","langCode":"การเขียน-อ่านภาษา","langDir":"การเขียน-อ่านภาษา","langDirLTR":"จากซ้ายไปขวา (LTR)","langDirRTL":"จากขวามาซ้าย (RTL)","menu":"แก้ไข ลิงค์","name":"ชื่อ","noAnchors":"(ยังไม่มีจุดเชื่อมโยงภายในหน้าเอกสารนี้)","noEmail":"กรุณาระบุอีเมล์ (E-mail)","noUrl":"กรุณาระบุที่อยู่อ้างอิงออนไลน์ (URL)","other":"<อื่น ๆ>","popupDependent":"แสดงเต็มหน้าจอ (Netscape)","popupFeatures":"คุณสมบัติของหน้าจอเล็ก (Pop-up)","popupFullScreen":"แสดงเต็มหน้าจอ (IE5.5++ เท่านั้น)","popupLeft":"พิกัดซ้าย (Left Position)","popupLocationBar":"แสดงที่อยู่ของไฟล์","popupMenuBar":"แสดงแถบเมนู","popupResizable":"สามารถปรับขนาดได้","popupScrollBars":"แสดงแถบเลื่อน","popupStatusBar":"แสดงแถบสถานะ","popupToolbar":"แสดงแถบเครื่องมือ","popupTop":"พิกัดบน (Top Position)","rel":"ความสัมพันธ์","selectAnchor":"ระบุข้อมูลของจุดเชื่อมโยง (Anchor)","styles":"ลักษณะการแสดงผล","tabIndex":"ลำดับของ แท็บ","target":"การเปิดหน้าลิงค์","targetFrame":"<เปิดในเฟรม>","targetFrameName":"ชื่อทาร์เก็ตเฟรม","targetPopup":"<เปิดหน้าจอเล็ก (Pop-up)>","targetPopupName":"ระบุชื่อหน้าจอเล็ก (Pop-up)","title":"ลิงค์เชื่อมโยงเว็บ อีเมล์ รูปภาพ หรือไฟล์อื่นๆ","toAnchor":"จุดเชื่อมโยง (Anchor)","toEmail":"ส่งอีเมล์ (E-Mail)","toUrl":"ที่อยู่อ้างอิง URL","toolbar":"แทรก/แก้ไข ลิงค์","type":"ประเภทของลิงค์","unlink":"ลบ ลิงค์","upload":"อัพโหลดไฟล์"},"list":{"bulletedlist":"ลำดับรายการแบบสัญลักษณ์","numberedlist":"ลำดับรายการแบบตัวเลข"},"liststyle":{"armenian":"Armenian numbering","bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","decimalLeadingZero":"Decimal leading zero (01, 02, 03, etc.)","disc":"Disc","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"ขยายใหญ่","minimize":"ย่อขนาด"},"newpage":{"toolbar":"สร้างหน้าเอกสารใหม่"},"pagebreak":{"alt":"ตัวแบ่งหน้า","toolbar":"แทรกตัวแบ่งหน้า Page Break"},"pastetext":{"button":"วางแบบตัวอักษรธรรมดา","title":"วางแบบตัวอักษรธรรมดา"},"pastefromword":{"confirmCleanup":"ข้อความที่คุณต้องการวางลงไปเป็นข้อความที่คัดลอกมาจากโปรแกรมไมโครซอฟท์เวิร์ด คุณต้องการล้างค่าข้อความดังกล่าวก่อนวางลงไปหรือไม่?","error":"ไม่สามารถล้างข้อมูลที่ต้องการวางได้เนื่องจากเกิดข้อผิดพลาดภายในระบบ","title":"วางสำเนาจากตัวอักษรเวิร์ด","toolbar":"วางสำเนาจากตัวอักษรเวิร์ด"},"preview":{"preview":"ดูหน้าเอกสารตัวอย่าง"},"print":{"toolbar":"สั่งพิมพ์"},"removeformat":{"toolbar":"ล้างรูปแบบ"},"save":{"toolbar":"บันทึก"},"selectall":{"toolbar":"เลือกทั้งหมด"},"showblocks":{"toolbar":"แสดงบล็อคข้อมูล"},"sourcearea":{"toolbar":"ดูรหัส HTML"},"specialchar":{"options":"Special Character Options","title":"แทรกตัวอักษรพิเศษ","toolbar":"แทรกตัวอักษรพิเศษ"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"ลักษณะ","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"ขนาดเส้นขอบ","caption":"หัวเรื่องของตาราง","cell":{"menu":"ช่องตาราง","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"ลบช่อง","merge":"ผสานช่อง","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"ระยะแนวตั้ง","cellSpace":"ระยะแนวนอนน","column":{"menu":"คอลัมน์","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"ลบสดมน์"},"columns":"สดมน์","deleteTable":"ลบตาราง","headers":"ส่วนหัว","headersBoth":"ทั้งสองอย่าง","headersColumn":"คอลัมน์แรก","headersNone":"None","headersRow":"แถวแรก","invalidBorder":"ขนาดเส้นกรอบต้องเป็นจำนวนตัวเลข","invalidCellPadding":"ช่องว่างภายในเซลล์ต้องเลขจำนวนบวก","invalidCellSpacing":"ช่องว่างภายในเซลล์ต้องเป็นเลขจำนวนบวก","invalidCols":"จำนวนคอลัมน์ต้องเป็นจำนวนมากกว่า 0","invalidHeight":"ส่วนสูงของตารางต้องเป็นตัวเลข","invalidRows":"จำนวนของแถวต้องเป็นจำนวนมากกว่า 0","invalidWidth":"ความกว้างตารางต้องเป็นตัวเลข","menu":"คุณสมบัติของ ตาราง","row":{"menu":"แถว","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"ลบแถว"},"rows":"แถว","summary":"สรุปความ","title":"คุณสมบัติของ ตาราง","toolbar":"ตาราง","widthPc":"เปอร์เซ็น","widthPx":"จุดสี","widthUnit":"หน่วยความกว้าง"},"undo":{"redo":"ทำซ้ำคำสั่ง","undo":"ยกเลิกคำสั่ง"},"wsc":{"btnIgnore":"ยกเว้น","btnIgnoreAll":"ยกเว้นทั้งหมด","btnReplace":"แทนที่","btnReplaceAll":"แทนที่ทั้งหมด","btnUndo":"ยกเลิก","changeTo":"แก้ไขเป็น","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"ไม่ได้ติดตั้งระบบตรวจสอบคำสะกด. ต้องการติดตั้งไหมครับ?","manyChanges":"ตรวจสอบคำสะกดเสร็จสิ้น:: แก้ไข %1 คำ","noChanges":"ตรวจสอบคำสะกดเสร็จสิ้น: ไม่มีการแก้คำใดๆ","noMispell":"ตรวจสอบคำสะกดเสร็จสิ้น: ไม่พบคำสะกดผิด","noSuggestions":"- ไม่มีคำแนะนำใดๆ -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"ไม่พบในดิกชันนารี","oneChange":"ตรวจสอบคำสะกดเสร็จสิ้น: แก้ไข1คำ","progress":"กำลังตรวจสอบคำสะกด...","title":"Spell Checker","toolbar":"ตรวจการสะกดคำ"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/lang/tr.js
index 280a1c13b4f..424f8d5a59e 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/tr.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/tr.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['tr']={"editor":"Zengin Metin Editörü","editorPanel":"Zengin Metin Editör Paneli","common":{"editorHelp":"Yardım için ALT 0 tuşlarına basın","browseServer":"Sunucuya Gözat","url":"URL","protocol":"Protokol","upload":"Karşıya Yükle","uploadSubmit":"Sunucuya Gönder","image":"Resim","flash":"Flash","form":"Form","checkbox":"Onay Kutusu","radio":"Seçenek Düğmesi","textField":"Metin Kutusu","textarea":"Metin Alanı","hiddenField":"Gizli Alan","button":"Düğme","select":"Seçme Alanı","imageButton":"Resim Düğmesi","notSet":"<tanımlanmamış>","id":"Kimlik","name":"İsim","langDir":"Dil Yönü","langDirLtr":"Soldan Sağa (LTR)","langDirRtl":"Sağdan Sola (RTL)","langCode":"Dil Kodlaması","longDescr":"Uzun Tanımlı URL","cssClass":"Biçem Sayfası Sınıfları","advisoryTitle":"Öneri Başlığı","cssStyle":"Biçem","ok":"Tamam","cancel":"İptal","close":"Kapat","preview":"Önizleme","resize":"Yeniden Boyutlandır","generalTab":"Genel","advancedTab":"Gelişmiş","validateNumberFailed":"Bu değer bir sayı değildir.","confirmNewPage":"Bu içerikle ilgili kaydedilmemiş tüm bilgiler kaybolacaktır. Yeni bir sayfa yüklemek istediğinizden emin misiniz?","confirmCancel":"Bazı seçenekleri değiştirdiniz. İletişim penceresini kapatmak istediğinizden emin misiniz?","options":"Seçenekler","target":"Hedef","targetNew":"Yeni Pencere (_blank)","targetTop":"En Üstteki Pencere (_top)","targetSelf":"Aynı Pencere (_self)","targetParent":"Üst Pencere (_parent)","langDirLTR":"Soldan Sağa (LTR)","langDirRTL":"Sağdan Sola (RTL)","styles":"Biçem","cssClasses":"Biçem Sayfası Sınıfları","width":"Genişlik","height":"Yükseklik","align":"Hizalama","alignLeft":"Sol","alignRight":"Sağ","alignCenter":"Ortala","alignJustify":"İki Kenara Yaslanmış","alignTop":"Üst","alignMiddle":"Orta","alignBottom":"Alt","alignNone":"Hiçbiri","invalidValue":"Geçersiz değer.","invalidHeight":"Yükseklik değeri bir sayı olmalıdır.","invalidWidth":"Genişlik değeri bir sayı olmalıdır.","invalidCssLength":"\"%1\" alanı için verilen değer, geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt, veya pc) içeren veya içermeyen pozitif bir sayı olmalıdır.","invalidHtmlLength":"Belirttiğiniz sayı \"%1\" alanı için pozitif bir sayı HTML birim değeri olmalıdır (px veya %).","invalidInlineStyle":"Satıriçi biçem için verilen değer, \"isim : değer\" biçiminde birbirinden noktalı virgüllerle ayrılan bir veya daha fazla değişkenler grubundan oluşmalıdır.","cssLengthTooltip":"Piksel türünde bir sayı veya geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt veya pc) içeren bir sayı girin.","unavailable":"%1<span class=\"cke_accessibility\">, kullanılamaz</span>"},"about":{"copy":"Copyright &copy; $1. Tüm hakları saklıdır.","dlgTitle":"CKEditor Hakkında","help":"Yardım için $1 kontrol edin.","moreInfo":"Lisanslama hakkında daha fazla bilgi almak için lütfen sitemizi ziyaret edin:","title":"CKEditor Hakkında","userGuide":"CKEditor Kullanıcı Kılavuzu"},"basicstyles":{"bold":"Kalın","italic":"İtalik","strike":"Üstü Çizgili","subscript":"Alt Simge","superscript":"Üst Simge","underline":"Altı Çizgili"},"bidi":{"ltr":"Metin yönü soldan sağa","rtl":"Metin yönü sağdan sola"},"blockquote":{"toolbar":"Blok Oluştur"},"clipboard":{"copy":"Kopyala","copyError":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kopyalama işlemine izin vermiyor. İşlem için (Ctrl/Cmd+C) tuşlarını kullanın.","cut":"Kes","cutError":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kesme işlemine izin vermiyor. İşlem için (Ctrl/Cmd+X) tuşlarını kullanın.","paste":"Yapıştır","pasteArea":"Yapıştırma Alanı","pasteMsg":"Lütfen aşağıdaki kutunun içine yapıştırın. (<STRONG>Ctrl/Cmd+V</STRONG>) ve <STRONG>Tamam</STRONG> butonunu tıklayın.","securityMsg":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin direkt olarak panoya erişimine izin vermiyor. Bu pencere içine tekrar yapıştırmalısınız..","title":"Yapıştır"},"button":{"selectedLabel":"%1 (Seçilmiş)"},"colorbutton":{"auto":"Otomatik","bgColorTitle":"Arka Renk","colors":{"000":"Siyah","800000":"Kestane","8B4513":"Koyu Kahverengi","2F4F4F":"Koyu Kurşuni Gri","008080":"Teal","000080":"Mavi","4B0082":"Çivit Mavisi","696969":"Silik Gri","B22222":"Ateş Tuğlası","A52A2A":"Kahverengi","DAA520":"Altun Sırık","006400":"Koyu Yeşil","40E0D0":"Turkuaz","0000CD":"Orta Mavi","800080":"Pembe","808080":"Gri","F00":"Kırmızı","FF8C00":"Koyu Portakal","FFD700":"Altın","008000":"Yeşil","0FF":"Ciyan","00F":"Mavi","EE82EE":"Menekşe","A9A9A9":"Koyu Gri","FFA07A":"Açık Sarımsı","FFA500":"Portakal","FFFF00":"Sarı","00FF00":"Açık Yeşil","AFEEEE":"Sönük Turkuaz","ADD8E6":"Açık Mavi","DDA0DD":"Mor","D3D3D3":"Açık Gri","FFF0F5":"Eflatun Pembe","FAEBD7":"Antik Beyaz","FFFFE0":"Açık Sarı","F0FFF0":"Balsarısı","F0FFFF":"Gök Mavisi","F0F8FF":"Reha Mavi","E6E6FA":"Eflatun","FFF":"Beyaz"},"more":"Diğer renkler...","panelTitle":"Renkler","textColorTitle":"Yazı Rengi"},"colordialog":{"clear":"Temizle","highlight":"İşaretle","options":"Renk Seçenekleri","selected":"Seçilmiş","title":"Renk seç"},"templates":{"button":"Şablonlar","emptyListMsg":"(Belirli bir şablon seçilmedi)","insertOption":"Mevcut içerik ile değiştir","options":"Şablon Seçenekleri","selectPromptMsg":"Düzenleyicide açmak için lütfen bir şablon seçin.<br>(hali hazırdaki içerik kaybolacaktır.):","title":"İçerik Şablonları"},"contextmenu":{"options":"İçerik Menüsü Seçenekleri"},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Tavsiye Başlığı","cssClassInputLabel":"Stilltipi Sınıfı","edit":"Div Düzenle","inlineStyleInputLabel":"Inline Stili","langDirLTRLabel":"Soldan sağa (LTR)","langDirLabel":"Dil Yönü","langDirRTLLabel":"Sağdan sola (RTL)","languageCodeInputLabel":" Dil Kodu","remove":"Div Kaldır","styleSelectLabel":"Stil","title":"Div İçeriği Oluştur","toolbar":"Div İçeriği Oluştur"},"toolbar":{"toolbarCollapse":"Araç çubuklarını topla","toolbarExpand":"Araç çubuklarını aç","toolbarGroups":{"document":"Belge","clipboard":"Pano/Geri al","editing":"Düzenleme","forms":"Formlar","basicstyles":"Temel Stiller","paragraph":"Paragraf","links":"Bağlantılar","insert":"Ekle","styles":"Stiller","colors":"Renkler","tools":"Araçlar"},"toolbars":"Araç çubukları Editörü"},"elementspath":{"eleLabel":"Elementlerin yolu","eleTitle":"%1 elementi"},"find":{"find":"Bul","findOptions":"Seçenekleri Bul","findWhat":"Aranan:","matchCase":"Büyük/küçük harf duyarlı","matchCyclic":"Eşleşen döngü","matchWord":"Kelimenin tamamı uysun","notFoundMsg":"Belirtilen yazı bulunamadı.","replace":"Değiştir","replaceAll":"Tümünü Değiştir","replaceSuccessMsg":"%1 bulunanlardan değiştirildi.","replaceWith":"Bununla değiştir:","title":"Bul ve Değiştir"},"fakeobjects":{"anchor":"Bağlantı","flash":"Flash Animasyonu","hiddenfield":"Gizli Alan","iframe":"IFrame","unknown":"Bilinmeyen Nesne"},"flash":{"access":"Kod İzni","accessAlways":"Herzaman","accessNever":"Asla","accessSameDomain":"Aynı domain","alignAbsBottom":"Tam Altı","alignAbsMiddle":"Tam Ortası","alignBaseline":"Taban Çizgisi","alignTextTop":"Yazı Tepeye","bgcolor":"Arka Renk","chkFull":"Tam ekrana İzinver","chkLoop":"Döngü","chkMenu":"Flash Menüsünü Kullan","chkPlay":"Otomatik Oynat","flashvars":"Flash Değerleri","hSpace":"Yatay Boşluk","properties":"Flash Özellikleri","propertiesTab":"Özellikler","quality":"Kalite","qualityAutoHigh":"Otomatik Yükseklik","qualityAutoLow":"Otomatik Düşüklük","qualityBest":"En iyi","qualityHigh":"Yüksek","qualityLow":"Düşük","qualityMedium":"Orta","scale":"Boyutlandır","scaleAll":"Hepsini Göster","scaleFit":"Tam Sığdır","scaleNoBorder":"Kenar Yok","title":"Flash Özellikleri","vSpace":"Dikey Boşluk","validateHSpace":"HSpace sayı olmalıdır.","validateSrc":"Lütfen köprü URL'sini yazın","validateVSpace":"VSpace sayı olmalıdır.","windowMode":"Pencere modu","windowModeOpaque":"Opak","windowModeTransparent":"Şeffaf","windowModeWindow":"Pencere"},"font":{"fontSize":{"label":"Boyut","voiceLabel":"Font Size","panelTitle":"Boyut"},"label":"Yazı Türü","panelTitle":"Yazı Türü","voiceLabel":"Font"},"forms":{"button":{"title":"Düğme Özellikleri","text":"Metin (Değer)","type":"Tip","typeBtn":"Düğme","typeSbm":"Gönder","typeRst":"Sıfırla"},"checkboxAndRadio":{"checkboxTitle":"Onay Kutusu Özellikleri","radioTitle":"Seçenek Düğmesi Özellikleri","value":"Değer","selected":"Seçili","required":"Zorunlu"},"form":{"title":"Form Özellikleri","menu":"Form Özellikleri","action":"İşlem","method":"Yöntem","encoding":"Kodlama"},"hidden":{"title":"Gizli Veri Özellikleri","name":"Ad","value":"Değer"},"select":{"title":"Seçim Menüsü Özellikleri","selectInfo":"Bilgi","opAvail":"Mevcut Seçenekler","value":"Değer","size":"Boyut","lines":"satır","chkMulti":"Çoklu seçime izin ver","required":"Zorunlu","opText":"Metin","opValue":"Değer","btnAdd":"Ekle","btnModify":"Düzenle","btnUp":"Yukarı","btnDown":"Aşağı","btnSetValue":"Seçili değer olarak ata","btnDelete":"Sil"},"textarea":{"title":"Çok Satırlı Metin Özellikleri","cols":"Sütunlar","rows":"Satırlar"},"textfield":{"title":"Metin Girişi Özellikleri","name":"Ad","value":"Değer","charWidth":"Karakter Genişliği","maxChars":"En Fazla Karakter","required":"Zorunlu","type":"Tür","typeText":"Metin","typePass":"Şifre","typeEmail":"E-posta","typeSearch":"Ara","typeTel":"Telefon Numarası","typeUrl":"URL"}},"format":{"label":"Biçim","panelTitle":"Biçim","tag_address":"Adres","tag_div":"Paragraf (DIV)","tag_h1":"Başlık 1","tag_h2":"Başlık 2","tag_h3":"Başlık 3","tag_h4":"Başlık 4","tag_h5":"Başlık 5","tag_h6":"Başlık 6","tag_p":"Normal","tag_pre":"Biçimli"},"horizontalrule":{"toolbar":"Yatay Satır Ekle"},"iframe":{"border":"Çerceve sınırlarını göster","noUrl":"Lütfen IFrame köprü (URL) bağlantısını yazın","scrolling":"Kaydırma çubuklarını aktif et","title":"IFrame Özellikleri","toolbar":"IFrame"},"image":{"alt":"Alternatif Yazı","border":"Kenar","btnUpload":"Sunucuya Yolla","button2Img":"Seçili resim butonunu basit resime çevirmek istermisiniz?","hSpace":"Yatay Boşluk","img2Button":"Seçili olan resimi, resimli butona çevirmek istermisiniz?","infoTab":"Resim Bilgisi","linkTab":"Köprü","lockRatio":"Oranı Kilitle","menu":"Resim Özellikleri","resetSize":"Boyutu Başa Döndür","title":"Resim Özellikleri","titleButton":"Resimli Düğme Özellikleri","upload":"Karşıya Yükle","urlMissing":"Resmin URL kaynağı eksiktir.","vSpace":"Dikey Boşluk","validateBorder":"Çerçeve tam sayı olmalıdır.","validateHSpace":"HSpace tam sayı olmalıdır.","validateVSpace":"VSpace tam sayı olmalıdır."},"indent":{"indent":"Sekme Arttır","outdent":"Sekme Azalt"},"smiley":{"options":"İfade Seçenekleri","title":"İfade Ekle","toolbar":"İfade"},"justify":{"block":"İki Kenara Yaslanmış","center":"Ortalanmış","left":"Sola Dayalı","right":"Sağa Dayalı"},"language":{"button":"Dili seç","remove":"Dili kaldır"},"link":{"acccessKey":"Erişim Tuşu","advanced":"Gelişmiş","advisoryContentType":"Danışma İçerik Türü","advisoryTitle":"Danışma Başlığı","anchor":{"toolbar":"Bağlantı Ekle/Düzenle","menu":"Bağlantı Özellikleri","title":"Bağlantı Özellikleri","name":"Bağlantı Adı","errorName":"Lütfen bağlantı için ad giriniz","remove":"Bağlantıyı Kaldır"},"anchorId":"Eleman Kimlik Numarası ile","anchorName":"Bağlantı Adı ile","charset":"Bağlı Kaynak Karakter Gurubu","cssClasses":"Biçem Sayfası Sınıfları","emailAddress":"E-Posta Adresi","emailBody":"İleti Gövdesi","emailSubject":"İleti Konusu","id":"Id","info":"Link Bilgisi","langCode":"Dil Yönü","langDir":"Dil Yönü","langDirLTR":"Soldan Sağa (LTR)","langDirRTL":"Sağdan Sola (RTL)","menu":"Link Düzenle","name":"Ad","noAnchors":"(Bu belgede hiç çapa yok)","noEmail":"Lütfen E-posta adresini yazın","noUrl":"Lütfen Link URL'sini yazın","other":"<diğer>","popupDependent":"Bağımlı (Netscape)","popupFeatures":"Yeni Açılan Pencere Özellikleri","popupFullScreen":"Tam Ekran (IE)","popupLeft":"Sola Göre Konum","popupLocationBar":"Yer Çubuğu","popupMenuBar":"Menü Çubuğu","popupResizable":"Resizable","popupScrollBars":"Kaydırma Çubukları","popupStatusBar":"Durum Çubuğu","popupToolbar":"Araç Çubuğu","popupTop":"Yukarıya Göre Konum","rel":"İlişki","selectAnchor":"Bağlantı Seç","styles":"Biçem","tabIndex":"Sekme İndeksi","target":"Hedef","targetFrame":"<çerçeve>","targetFrameName":"Hedef Çerçeve Adı","targetPopup":"<yeni açılan pencere>","targetPopupName":"Yeni Açılan Pencere Adı","title":"Link","toAnchor":"Bu sayfada çapa","toEmail":"E-Posta","toUrl":"URL","toolbar":"Link Ekle/Düzenle","type":"Link Türü","unlink":"Köprü Kaldır","upload":"Karşıya Yükle"},"list":{"bulletedlist":"Simgeli Liste","numberedlist":"Numaralı Liste"},"liststyle":{"armenian":"Ermenice sayılandırma","bulletedTitle":"Simgeli Liste Özellikleri","circle":"Daire","decimal":"Ondalık (1, 2, 3, vs.)","decimalLeadingZero":"Başı sıfırlı ondalık (01, 02, 03, vs.)","disc":"Disk","georgian":"Gürcüce numaralandırma (an, ban, gan, vs.)","lowerAlpha":"Küçük Alpha (a, b, c, d, e, vs.)","lowerGreek":"Küçük Greek (alpha, beta, gamma, vs.)","lowerRoman":"Küçük Roman (i, ii, iii, iv, v, vs.)","none":"Yok","notset":"<ayarlanmamış>","numberedTitle":"Sayılandırılmış Liste Özellikleri","square":"Kare","start":"Başla","type":"Tipi","upperAlpha":"Büyük Alpha (A, B, C, D, E, vs.)","upperRoman":"Büyük Roman (I, II, III, IV, V, vs.)","validateStartNumber":"Liste başlangıcı tam sayı olmalıdır."},"magicline":{"title":"Parağrafı buraya ekle"},"maximize":{"maximize":"Büyült","minimize":"Küçült"},"newpage":{"toolbar":"Yeni Sayfa"},"pagebreak":{"alt":"Sayfa Sonu","toolbar":"Sayfa Sonu Ekle"},"pastetext":{"button":"Düz Metin Olarak Yapıştır","title":"Düz Metin Olarak Yapıştır"},"pastefromword":{"confirmCleanup":"Yapıştırmaya çalıştığınız metin Word'den kopyalanmıştır. Yapıştırmadan önce silmek istermisiniz?","error":"Yapıştırmadaki veri bilgisi hata düzelene kadar silinmeyecektir","title":"Word'den Yapıştır","toolbar":"Word'den Yapıştır"},"preview":{"preview":"Ön İzleme"},"print":{"toolbar":"Yazdır"},"removeformat":{"toolbar":"Biçimi Kaldır"},"save":{"toolbar":"Kaydet"},"selectall":{"toolbar":"Tümünü Seç"},"showblocks":{"toolbar":"Blokları Göster"},"sourcearea":{"toolbar":"Kaynak"},"specialchar":{"options":"Özel Karakter Seçenekleri","title":"Özel Karakter Seç","toolbar":"Özel Karakter Ekle"},"scayt":{"btn_about":"SCAYT'ı hakkında","btn_dictionaries":"Sözlükler","btn_disable":"SCAYT'ı pasifleştir","btn_enable":"SCAYT'ı etkinleştir","btn_langs":"Diller","btn_options":"Seçenekler","text_title":"Girmiş olduğunuz kelime denetimi"},"stylescombo":{"label":"Biçem","panelTitle":"Stilleri Düzenliyor","panelTitle1":"Blok Stilleri","panelTitle2":"Inline Stilleri","panelTitle3":"Nesne Stilleri"},"table":{"border":"Kenar Kalınlığı","caption":"Başlık","cell":{"menu":"Hücre","insertBefore":"Hücre Ekle - Önce","insertAfter":"Hücre Ekle - Sonra","deleteCell":"Hücre Sil","merge":"Hücreleri Birleştir","mergeRight":"Birleştir - Sağdaki İle ","mergeDown":"Birleştir - Aşağıdaki İle ","splitHorizontal":"Hücreyi Yatay Böl","splitVertical":"Hücreyi Dikey Böl","title":"Hücre Özellikleri","cellType":"Hücre Tipi","rowSpan":"Satırlar Mesafesi (Span)","colSpan":"Sütünlar Mesafesi (Span)","wordWrap":"Kelime Kaydırma","hAlign":"Düşey Hizalama","vAlign":"Yataş Hizalama","alignBaseline":"Tabana","bgColor":"Arkaplan Rengi","borderColor":"Çerçeve Rengi","data":"Veri","header":"Başlık","yes":"Evet","no":"Hayır","invalidWidth":"Hücre genişliği sayı olmalıdır.","invalidHeight":"Hücre yüksekliği sayı olmalıdır.","invalidRowSpan":"Satırların mesafesi tam sayı olmalıdır.","invalidColSpan":"Sütünların mesafesi tam sayı olmalıdır.","chooseColor":"Seçiniz"},"cellPad":"Izgara yazı arası","cellSpace":"Izgara kalınlığı","column":{"menu":"Sütun","insertBefore":"Kolon Ekle - Önce","insertAfter":"Kolon Ekle - Sonra","deleteColumn":"Sütun Sil"},"columns":"Sütunlar","deleteTable":"Tabloyu Sil","headers":"Başlıklar","headersBoth":"Her İkisi","headersColumn":"İlk Sütun","headersNone":"Yok","headersRow":"İlk Satır","invalidBorder":"Çerceve büyüklüklüğü sayı olmalıdır.","invalidCellPadding":"Hücre aralığı (padding) sayı olmalıdır.","invalidCellSpacing":"Hücre boşluğu (spacing) sayı olmalıdır.","invalidCols":"Sütün sayısı 0 sayısından büyük olmalıdır.","invalidHeight":"Tablo yüksekliği sayı olmalıdır.","invalidRows":"Satır sayısı 0 sayısından büyük olmalıdır.","invalidWidth":"Tablo genişliği sayı olmalıdır.","menu":"Tablo Özellikleri","row":{"menu":"Satır","insertBefore":"Satır Ekle - Önce","insertAfter":"Satır Ekle - Sonra","deleteRow":"Satır Sil"},"rows":"Satırlar","summary":"Özet","title":"Tablo Özellikleri","toolbar":"Tablo","widthPc":"yüzde","widthPx":"piksel","widthUnit":"genişlik birimi"},"undo":{"redo":"Tekrarla","undo":"Geri Al"},"wsc":{"btnIgnore":"Yoksay","btnIgnoreAll":"Tümünü Yoksay","btnReplace":"Değiştir","btnReplaceAll":"Tümünü Değiştir","btnUndo":"Geri Al","changeTo":"Şuna değiştir:","errorLoading":"Uygulamada yüklerken hata oluştu: %s.","ieSpellDownload":"Yazım denetimi yüklenmemiş. Şimdi yüklemek ister misiniz?","manyChanges":"Yazım denetimi tamamlandı: %1 kelime değiştirildi","noChanges":"Yazım denetimi tamamlandı: Hiçbir kelime değiştirilmedi","noMispell":"Yazım denetimi tamamlandı: Yanlış yazıma rastlanmadı","noSuggestions":"- Öneri Yok -","notAvailable":"Üzügünüz, bu servis şuanda hizmet dışıdır.","notInDic":"Sözlükte Yok","oneChange":"Yazım denetimi tamamlandı: Bir kelime değiştirildi","progress":"Yazım denetimi işlemde...","title":"Yazımı Denetle","toolbar":"Yazım Denetimi"}};
\ No newline at end of file
+CKEDITOR.lang['tr']={"editor":"Zengin Metin Editörü","editorPanel":"Zengin Metin Editör Paneli","common":{"editorHelp":"Yardım için ALT 0 tuşlarına basın","browseServer":"Sunucuya Gözat","url":"URL","protocol":"Protokol","upload":"Karşıya Yükle","uploadSubmit":"Sunucuya Gönder","image":"Resim","flash":"Flash","form":"Form","checkbox":"Onay Kutusu","radio":"Seçenek Düğmesi","textField":"Metin Kutusu","textarea":"Metin Alanı","hiddenField":"Gizli Alan","button":"Düğme","select":"Seçme Alanı","imageButton":"Resim Düğmesi","notSet":"<tanımlanmamış>","id":"Kimlik","name":"İsim","langDir":"Dil Yönü","langDirLtr":"Soldan Sağa (LTR)","langDirRtl":"Sağdan Sola (RTL)","langCode":"Dil Kodlaması","longDescr":"Uzun Tanımlı URL","cssClass":"Biçem Sayfası Sınıfları","advisoryTitle":"Öneri Başlığı","cssStyle":"Biçem","ok":"Tamam","cancel":"İptal","close":"Kapat","preview":"Önizleme","resize":"Yeniden Boyutlandır","generalTab":"Genel","advancedTab":"Gelişmiş","validateNumberFailed":"Bu değer bir sayı değildir.","confirmNewPage":"Bu içerikle ilgili kaydedilmemiş tüm bilgiler kaybolacaktır. Yeni bir sayfa yüklemek istediğinizden emin misiniz?","confirmCancel":"Bazı seçenekleri değiştirdiniz. İletişim penceresini kapatmak istediğinizden emin misiniz?","options":"Seçenekler","target":"Hedef","targetNew":"Yeni Pencere (_blank)","targetTop":"En Üstteki Pencere (_top)","targetSelf":"Aynı Pencere (_self)","targetParent":"Üst Pencere (_parent)","langDirLTR":"Soldan Sağa (LTR)","langDirRTL":"Sağdan Sola (RTL)","styles":"Biçem","cssClasses":"Biçem Sayfası Sınıfları","width":"Genişlik","height":"Yükseklik","align":"Hizalama","alignLeft":"Sol","alignRight":"Sağ","alignCenter":"Ortala","alignJustify":"İki Kenara Yaslanmış","alignTop":"Üst","alignMiddle":"Orta","alignBottom":"Alt","alignNone":"Hiçbiri","invalidValue":"Geçersiz değer.","invalidHeight":"Yükseklik değeri bir sayı olmalıdır.","invalidWidth":"Genişlik değeri bir sayı olmalıdır.","invalidCssLength":"\"%1\" alanı için verilen değer, geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt, veya pc) içeren veya içermeyen pozitif bir sayı olmalıdır.","invalidHtmlLength":"Belirttiğiniz sayı \"%1\" alanı için pozitif bir sayı HTML birim değeri olmalıdır (px veya %).","invalidInlineStyle":"Satıriçi biçem için verilen değer, \"isim : değer\" biçiminde birbirinden noktalı virgüllerle ayrılan bir veya daha fazla değişkenler grubundan oluşmalıdır.","cssLengthTooltip":"Piksel türünde bir sayı veya geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt veya pc) içeren bir sayı girin.","unavailable":"%1<span class=\"cke_accessibility\">, kullanılamaz</span>","keyboard":{"8":"Silme Tuşu","13":"Giriş Tuşu","16":"Üst Karater Tuşu","17":"Kontrol Tuşu","18":"Alt Tuşu","32":"Boşluk Tuşu","35":"En Sona Tuşu","36":"En Başa Tuşu","46":"Silme Tuşu","224":"Komut Tuşu"},"keyboardShortcut":"Klavye Kısayolu"},"about":{"copy":"Copyright &copy; $1. Tüm hakları saklıdır.","dlgTitle":"CKEditor Hakkında","help":"Yardım için $1 kontrol edin.","moreInfo":"Lisanslama hakkında daha fazla bilgi almak için lütfen sitemizi ziyaret edin:","title":"CKEditor Hakkında","userGuide":"CKEditor Kullanıcı Kılavuzu"},"basicstyles":{"bold":"Kalın","italic":"İtalik","strike":"Üstü Çizgili","subscript":"Alt Simge","superscript":"Üst Simge","underline":"Altı Çizgili"},"bidi":{"ltr":"Metin yönü soldan sağa","rtl":"Metin yönü sağdan sola"},"blockquote":{"toolbar":"Blok Oluştur"},"clipboard":{"copy":"Kopyala","copyError":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kopyalama işlemine izin vermiyor. İşlem için (Ctrl/Cmd+C) tuşlarını kullanın.","cut":"Kes","cutError":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kesme işlemine izin vermiyor. İşlem için (Ctrl/Cmd+X) tuşlarını kullanın.","paste":"Yapıştır","pasteArea":"Yapıştırma Alanı","pasteMsg":"Lütfen aşağıdaki kutunun içine yapıştırın. (<STRONG>Ctrl/Cmd+V</STRONG>) ve <STRONG>Tamam</STRONG> butonunu tıklayın.","securityMsg":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin direkt olarak panoya erişimine izin vermiyor. Bu pencere içine tekrar yapıştırmalısınız..","title":"Yapıştır"},"button":{"selectedLabel":"%1 (Seçilmiş)"},"colorbutton":{"auto":"Otomatik","bgColorTitle":"Arka Renk","colors":{"000":"Siyah","800000":"Kestane","8B4513":"Koyu Kahverengi","2F4F4F":"Koyu Kurşuni Gri","008080":"Teal","000080":"Mavi","4B0082":"Çivit Mavisi","696969":"Silik Gri","B22222":"Ateş Tuğlası","A52A2A":"Kahverengi","DAA520":"Altun Sırık","006400":"Koyu Yeşil","40E0D0":"Turkuaz","0000CD":"Orta Mavi","800080":"Pembe","808080":"Gri","F00":"Kırmızı","FF8C00":"Koyu Portakal","FFD700":"Altın","008000":"Yeşil","0FF":"Ciyan","00F":"Mavi","EE82EE":"Menekşe","A9A9A9":"Koyu Gri","FFA07A":"Açık Sarımsı","FFA500":"Portakal","FFFF00":"Sarı","00FF00":"Açık Yeşil","AFEEEE":"Sönük Turkuaz","ADD8E6":"Açık Mavi","DDA0DD":"Mor","D3D3D3":"Açık Gri","FFF0F5":"Eflatun Pembe","FAEBD7":"Antik Beyaz","FFFFE0":"Açık Sarı","F0FFF0":"Balsarısı","F0FFFF":"Gök Mavisi","F0F8FF":"Reha Mavi","E6E6FA":"Eflatun","FFF":"Beyaz","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Diğer renkler...","panelTitle":"Renkler","textColorTitle":"Yazı Rengi"},"colordialog":{"clear":"Temizle","highlight":"İşaretle","options":"Renk Seçenekleri","selected":"Seçilmiş","title":"Renk seç"},"templates":{"button":"Şablonlar","emptyListMsg":"(Belirli bir şablon seçilmedi)","insertOption":"Mevcut içerik ile değiştir","options":"Şablon Seçenekleri","selectPromptMsg":"Düzenleyicide açmak için lütfen bir şablon seçin.<br>(hali hazırdaki içerik kaybolacaktır.):","title":"İçerik Şablonları"},"contextmenu":{"options":"İçerik Menüsü Seçenekleri"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Tavsiye Başlığı","cssClassInputLabel":"Stilltipi Sınıfı","edit":"Div Düzenle","inlineStyleInputLabel":"Inline Stili","langDirLTRLabel":"Soldan sağa (LTR)","langDirLabel":"Dil Yönü","langDirRTLLabel":"Sağdan sola (RTL)","languageCodeInputLabel":" Dil Kodu","remove":"Div Kaldır","styleSelectLabel":"Stil","title":"Div İçeriği Oluştur","toolbar":"Div İçeriği Oluştur"},"toolbar":{"toolbarCollapse":"Araç çubuklarını topla","toolbarExpand":"Araç çubuklarını aç","toolbarGroups":{"document":"Belge","clipboard":"Pano/Geri al","editing":"Düzenleme","forms":"Formlar","basicstyles":"Temel Stiller","paragraph":"Paragraf","links":"Bağlantılar","insert":"Ekle","styles":"Stiller","colors":"Renkler","tools":"Araçlar"},"toolbars":"Araç çubukları Editörü"},"elementspath":{"eleLabel":"Elementlerin yolu","eleTitle":"%1 elementi"},"find":{"find":"Bul","findOptions":"Seçenekleri Bul","findWhat":"Aranan:","matchCase":"Büyük/küçük harf duyarlı","matchCyclic":"Eşleşen döngü","matchWord":"Kelimenin tamamı uysun","notFoundMsg":"Belirtilen yazı bulunamadı.","replace":"Değiştir","replaceAll":"Tümünü Değiştir","replaceSuccessMsg":"%1 bulunanlardan değiştirildi.","replaceWith":"Bununla değiştir:","title":"Bul ve Değiştir"},"fakeobjects":{"anchor":"Bağlantı","flash":"Flash Animasyonu","hiddenfield":"Gizli Alan","iframe":"IFrame","unknown":"Bilinmeyen Nesne"},"flash":{"access":"Kod İzni","accessAlways":"Herzaman","accessNever":"Asla","accessSameDomain":"Aynı domain","alignAbsBottom":"Tam Altı","alignAbsMiddle":"Tam Ortası","alignBaseline":"Taban Çizgisi","alignTextTop":"Yazı Tepeye","bgcolor":"Arka Renk","chkFull":"Tam ekrana İzinver","chkLoop":"Döngü","chkMenu":"Flash Menüsünü Kullan","chkPlay":"Otomatik Oynat","flashvars":"Flash Değerleri","hSpace":"Yatay Boşluk","properties":"Flash Özellikleri","propertiesTab":"Özellikler","quality":"Kalite","qualityAutoHigh":"Otomatik Yükseklik","qualityAutoLow":"Otomatik Düşüklük","qualityBest":"En iyi","qualityHigh":"Yüksek","qualityLow":"Düşük","qualityMedium":"Orta","scale":"Boyutlandır","scaleAll":"Hepsini Göster","scaleFit":"Tam Sığdır","scaleNoBorder":"Kenar Yok","title":"Flash Özellikleri","vSpace":"Dikey Boşluk","validateHSpace":"HSpace sayı olmalıdır.","validateSrc":"Lütfen köprü URL'sini yazın","validateVSpace":"VSpace sayı olmalıdır.","windowMode":"Pencere modu","windowModeOpaque":"Opak","windowModeTransparent":"Şeffaf","windowModeWindow":"Pencere"},"font":{"fontSize":{"label":"Boyut","voiceLabel":"Font Size","panelTitle":"Boyut"},"label":"Yazı Türü","panelTitle":"Yazı Türü","voiceLabel":"Font"},"forms":{"button":{"title":"Düğme Özellikleri","text":"Metin (Değer)","type":"Tip","typeBtn":"Düğme","typeSbm":"Gönder","typeRst":"Sıfırla"},"checkboxAndRadio":{"checkboxTitle":"Onay Kutusu Özellikleri","radioTitle":"Seçenek Düğmesi Özellikleri","value":"Değer","selected":"Seçili","required":"Zorunlu"},"form":{"title":"Form Özellikleri","menu":"Form Özellikleri","action":"İşlem","method":"Yöntem","encoding":"Kodlama"},"hidden":{"title":"Gizli Veri Özellikleri","name":"Ad","value":"Değer"},"select":{"title":"Seçim Menüsü Özellikleri","selectInfo":"Bilgi","opAvail":"Mevcut Seçenekler","value":"Değer","size":"Boyut","lines":"satır","chkMulti":"Çoklu seçime izin ver","required":"Zorunlu","opText":"Metin","opValue":"Değer","btnAdd":"Ekle","btnModify":"Düzenle","btnUp":"Yukarı","btnDown":"Aşağı","btnSetValue":"Seçili değer olarak ata","btnDelete":"Sil"},"textarea":{"title":"Çok Satırlı Metin Özellikleri","cols":"Sütunlar","rows":"Satırlar"},"textfield":{"title":"Metin Girişi Özellikleri","name":"Ad","value":"Değer","charWidth":"Karakter Genişliği","maxChars":"En Fazla Karakter","required":"Zorunlu","type":"Tür","typeText":"Metin","typePass":"Şifre","typeEmail":"E-posta","typeSearch":"Ara","typeTel":"Telefon Numarası","typeUrl":"URL"}},"format":{"label":"Biçim","panelTitle":"Biçim","tag_address":"Adres","tag_div":"Paragraf (DIV)","tag_h1":"Başlık 1","tag_h2":"Başlık 2","tag_h3":"Başlık 3","tag_h4":"Başlık 4","tag_h5":"Başlık 5","tag_h6":"Başlık 6","tag_p":"Normal","tag_pre":"Biçimli"},"horizontalrule":{"toolbar":"Yatay Satır Ekle"},"iframe":{"border":"Çerceve sınırlarını göster","noUrl":"Lütfen IFrame köprü (URL) bağlantısını yazın","scrolling":"Kaydırma çubuklarını aktif et","title":"IFrame Özellikleri","toolbar":"IFrame"},"image":{"alt":"Alternatif Yazı","border":"Kenar","btnUpload":"Sunucuya Yolla","button2Img":"Seçili resim butonunu basit resime çevirmek istermisiniz?","hSpace":"Yatay Boşluk","img2Button":"Seçili olan resimi, resimli butona çevirmek istermisiniz?","infoTab":"Resim Bilgisi","linkTab":"Köprü","lockRatio":"Oranı Kilitle","menu":"Resim Özellikleri","resetSize":"Boyutu Başa Döndür","title":"Resim Özellikleri","titleButton":"Resimli Düğme Özellikleri","upload":"Karşıya Yükle","urlMissing":"Resmin URL kaynağı eksiktir.","vSpace":"Dikey Boşluk","validateBorder":"Çerçeve tam sayı olmalıdır.","validateHSpace":"HSpace tam sayı olmalıdır.","validateVSpace":"VSpace tam sayı olmalıdır."},"indent":{"indent":"Sekme Arttır","outdent":"Sekme Azalt"},"smiley":{"options":"İfade Seçenekleri","title":"İfade Ekle","toolbar":"İfade"},"justify":{"block":"İki Kenara Yaslanmış","center":"Ortalanmış","left":"Sola Dayalı","right":"Sağa Dayalı"},"language":{"button":"Dili seç","remove":"Dili kaldır"},"link":{"acccessKey":"Erişim Tuşu","advanced":"Gelişmiş","advisoryContentType":"Danışma İçerik Türü","advisoryTitle":"Danışma Başlığı","anchor":{"toolbar":"Bağlantı Ekle/Düzenle","menu":"Bağlantı Özellikleri","title":"Bağlantı Özellikleri","name":"Bağlantı Adı","errorName":"Lütfen bağlantı için ad giriniz","remove":"Bağlantıyı Kaldır"},"anchorId":"Eleman Kimlik Numarası ile","anchorName":"Bağlantı Adı ile","charset":"Bağlı Kaynak Karakter Gurubu","cssClasses":"Biçem Sayfası Sınıfları","download":"İndirmeye Zorla","displayText":"Gösterim Metni","emailAddress":"E-Posta Adresi","emailBody":"İleti Gövdesi","emailSubject":"İleti Konusu","id":"Id","info":"Link Bilgisi","langCode":"Dil Yönü","langDir":"Dil Yönü","langDirLTR":"Soldan Sağa (LTR)","langDirRTL":"Sağdan Sola (RTL)","menu":"Link Düzenle","name":"Ad","noAnchors":"(Bu belgede hiç çapa yok)","noEmail":"Lütfen E-posta adresini yazın","noUrl":"Lütfen Link URL'sini yazın","other":"<diğer>","popupDependent":"Bağımlı (Netscape)","popupFeatures":"Yeni Açılan Pencere Özellikleri","popupFullScreen":"Tam Ekran (IE)","popupLeft":"Sola Göre Konum","popupLocationBar":"Yer Çubuğu","popupMenuBar":"Menü Çubuğu","popupResizable":"Resizable","popupScrollBars":"Kaydırma Çubukları","popupStatusBar":"Durum Çubuğu","popupToolbar":"Araç Çubuğu","popupTop":"Yukarıya Göre Konum","rel":"İlişki","selectAnchor":"Bağlantı Seç","styles":"Biçem","tabIndex":"Sekme İndeksi","target":"Hedef","targetFrame":"<çerçeve>","targetFrameName":"Hedef Çerçeve Adı","targetPopup":"<yeni açılan pencere>","targetPopupName":"Yeni Açılan Pencere Adı","title":"Link","toAnchor":"Bu sayfada çapa","toEmail":"E-Posta","toUrl":"URL","toolbar":"Link Ekle/Düzenle","type":"Link Türü","unlink":"Köprü Kaldır","upload":"Karşıya Yükle"},"list":{"bulletedlist":"Simgeli Liste","numberedlist":"Numaralı Liste"},"liststyle":{"armenian":"Ermenice sayılandırma","bulletedTitle":"Simgeli Liste Özellikleri","circle":"Daire","decimal":"Ondalık (1, 2, 3, vs.)","decimalLeadingZero":"Başı sıfırlı ondalık (01, 02, 03, vs.)","disc":"Disk","georgian":"Gürcüce numaralandırma (an, ban, gan, vs.)","lowerAlpha":"Küçük Alpha (a, b, c, d, e, vs.)","lowerGreek":"Küçük Greek (alpha, beta, gamma, vs.)","lowerRoman":"Küçük Roman (i, ii, iii, iv, v, vs.)","none":"Yok","notset":"<ayarlanmamış>","numberedTitle":"Sayılandırılmış Liste Özellikleri","square":"Kare","start":"Başla","type":"Tipi","upperAlpha":"Büyük Alpha (A, B, C, D, E, vs.)","upperRoman":"Büyük Roman (I, II, III, IV, V, vs.)","validateStartNumber":"Liste başlangıcı tam sayı olmalıdır."},"magicline":{"title":"Parağrafı buraya ekle"},"maximize":{"maximize":"Büyült","minimize":"Küçült"},"newpage":{"toolbar":"Yeni Sayfa"},"pagebreak":{"alt":"Sayfa Sonu","toolbar":"Sayfa Sonu Ekle"},"pastetext":{"button":"Düz Metin Olarak Yapıştır","title":"Düz Metin Olarak Yapıştır"},"pastefromword":{"confirmCleanup":"Yapıştırmaya çalıştığınız metin Word'den kopyalanmıştır. Yapıştırmadan önce silmek istermisiniz?","error":"Yapıştırmadaki veri bilgisi hata düzelene kadar silinmeyecektir","title":"Word'den Yapıştır","toolbar":"Word'den Yapıştır"},"preview":{"preview":"Ön İzleme"},"print":{"toolbar":"Yazdır"},"removeformat":{"toolbar":"Biçimi Kaldır"},"save":{"toolbar":"Kaydet"},"selectall":{"toolbar":"Tümünü Seç"},"showblocks":{"toolbar":"Blokları Göster"},"sourcearea":{"toolbar":"Kaynak"},"specialchar":{"options":"Özel Karakter Seçenekleri","title":"Özel Karakter Seç","toolbar":"Özel Karakter Ekle"},"scayt":{"btn_about":"SCAYT'ı hakkında","btn_dictionaries":"Sözlükler","btn_disable":"SCAYT'ı pasifleştir","btn_enable":"SCAYT'ı etkinleştir","btn_langs":"Diller","btn_options":"Seçenekler","text_title":"Girmiş olduğunuz kelime denetimi"},"stylescombo":{"label":"Biçem","panelTitle":"Stilleri Düzenliyor","panelTitle1":"Blok Stilleri","panelTitle2":"Inline Stilleri","panelTitle3":"Nesne Stilleri"},"table":{"border":"Kenar Kalınlığı","caption":"Başlık","cell":{"menu":"Hücre","insertBefore":"Hücre Ekle - Önce","insertAfter":"Hücre Ekle - Sonra","deleteCell":"Hücre Sil","merge":"Hücreleri Birleştir","mergeRight":"Birleştir - Sağdaki İle ","mergeDown":"Birleştir - Aşağıdaki İle ","splitHorizontal":"Hücreyi Yatay Böl","splitVertical":"Hücreyi Dikey Böl","title":"Hücre Özellikleri","cellType":"Hücre Tipi","rowSpan":"Satırlar Mesafesi (Span)","colSpan":"Sütünlar Mesafesi (Span)","wordWrap":"Kelime Kaydırma","hAlign":"Düşey Hizalama","vAlign":"Yataş Hizalama","alignBaseline":"Tabana","bgColor":"Arkaplan Rengi","borderColor":"Çerçeve Rengi","data":"Veri","header":"Başlık","yes":"Evet","no":"Hayır","invalidWidth":"Hücre genişliği sayı olmalıdır.","invalidHeight":"Hücre yüksekliği sayı olmalıdır.","invalidRowSpan":"Satırların mesafesi tam sayı olmalıdır.","invalidColSpan":"Sütünların mesafesi tam sayı olmalıdır.","chooseColor":"Seçiniz"},"cellPad":"Izgara yazı arası","cellSpace":"Izgara kalınlığı","column":{"menu":"Sütun","insertBefore":"Kolon Ekle - Önce","insertAfter":"Kolon Ekle - Sonra","deleteColumn":"Sütun Sil"},"columns":"Sütunlar","deleteTable":"Tabloyu Sil","headers":"Başlıklar","headersBoth":"Her İkisi","headersColumn":"İlk Sütun","headersNone":"Yok","headersRow":"İlk Satır","invalidBorder":"Çerceve büyüklüklüğü sayı olmalıdır.","invalidCellPadding":"Hücre aralığı (padding) sayı olmalıdır.","invalidCellSpacing":"Hücre boşluğu (spacing) sayı olmalıdır.","invalidCols":"Sütün sayısı 0 sayısından büyük olmalıdır.","invalidHeight":"Tablo yüksekliği sayı olmalıdır.","invalidRows":"Satır sayısı 0 sayısından büyük olmalıdır.","invalidWidth":"Tablo genişliği sayı olmalıdır.","menu":"Tablo Özellikleri","row":{"menu":"Satır","insertBefore":"Satır Ekle - Önce","insertAfter":"Satır Ekle - Sonra","deleteRow":"Satır Sil"},"rows":"Satırlar","summary":"Özet","title":"Tablo Özellikleri","toolbar":"Tablo","widthPc":"yüzde","widthPx":"piksel","widthUnit":"genişlik birimi"},"undo":{"redo":"Tekrarla","undo":"Geri Al"},"wsc":{"btnIgnore":"Yoksay","btnIgnoreAll":"Tümünü Yoksay","btnReplace":"Değiştir","btnReplaceAll":"Tümünü Değiştir","btnUndo":"Geri Al","changeTo":"Şuna değiştir:","errorLoading":"Uygulamada yüklerken hata oluştu: %s.","ieSpellDownload":"Yazım denetimi yüklenmemiş. Şimdi yüklemek ister misiniz?","manyChanges":"Yazım denetimi tamamlandı: %1 kelime değiştirildi","noChanges":"Yazım denetimi tamamlandı: Hiçbir kelime değiştirilmedi","noMispell":"Yazım denetimi tamamlandı: Yanlış yazıma rastlanmadı","noSuggestions":"- Öneri Yok -","notAvailable":"Üzügünüz, bu servis şuanda hizmet dışıdır.","notInDic":"Sözlükte Yok","oneChange":"Yazım denetimi tamamlandı: Bir kelime değiştirildi","progress":"Yazım denetimi işlemde...","title":"Yazımı Denetle","toolbar":"Yazım Denetimi"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/tt.js b/htdocs/includes/ckeditor/ckeditor/lang/tt.js
index 6bf2419eb7e..6fed8c82528 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/tt.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/tt.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['tt']={"editor":"Форматлаулы текст өлкәсе","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Ярдәм өчен ALT 0 басыгыз","browseServer":"Сервер карап чыгу","url":"Сылталама","protocol":"Протокол","upload":"Йөкләү","uploadSubmit":"Серверга җибәрү","image":"Рәсем","flash":"Флеш","form":"Форма","checkbox":"Чекбокс","radio":"Радио төймә","textField":"Текст кыры","textarea":"Текст мәйданы","hiddenField":"Яшерен кыр","button":"Төймə","select":"Сайлау кыры","imageButton":"Рәсемле төймə","notSet":"<билгеләнмәгән>","id":"Id","name":"Исем","langDir":"Язылыш юнəлеше","langDirLtr":"Сулдан уңга язылыш (LTR)","langDirRtl":"Уңнан сулга язылыш (RTL)","langCode":"Тел коды","longDescr":"Җентекле тасвирламага сылталама","cssClass":"Стильләр класслары","advisoryTitle":"Киңәш исем","cssStyle":"Стиль","ok":"Тәмам","cancel":"Баш тарту","close":"Чыгу","preview":"Карап алу","resize":"Зурлыкны үзгәртү","generalTab":"Төп","advancedTab":"Киңәйтелгән көйләүләр","validateNumberFailed":"Әлеге кыйммәт сан түгел.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Үзлекләр","target":"Максат","targetNew":"Яңа тәрәзә (_blank)","targetTop":"Өске тәрәзә (_top)","targetSelf":"Шул үк тәрәзә (_self)","targetParent":"Ана тәрәзә (_parent)","langDirLTR":"Сулдан уңга язылыш (LTR)","langDirRTL":"Уңнан сулга язылыш (RTL)","styles":"Стиль","cssClasses":"Стильләр класслары","width":"Киңлек","height":"Биеклек","align":"Тигезләү","alignLeft":"Сул якка","alignRight":"Уң якка","alignCenter":"Үзәккә","alignJustify":"Киңлеккә карап тигезләү","alignTop":"Өскә","alignMiddle":"Уртага","alignBottom":"Аска","alignNone":"Һичбер","invalidValue":"Дөрес булмаган кыйммәт.","invalidHeight":"Биеклек сан булырга тиеш.","invalidWidth":"Киңлек сан булырга тиеш.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"},"about":{"copy":"Copyright &copy; $1. Бар хокуклар сакланган","dlgTitle":"CKEditor турында","help":"Ярдәм өчен $1 тикшереп карагыз.","moreInfo":"For licensing information please visit our web site:","title":"CKEditor турында","userGuide":"CKEditor кулланмасы"},"basicstyles":{"bold":"Калын","italic":"Курсив","strike":"Сызылган","subscript":"Аскы индекс","superscript":"Өске индекс","underline":"Астына сызылган"},"bidi":{"ltr":"Сулдан уңга язылыш","rtl":"Уңнан сулга язылыш"},"blockquote":{"toolbar":"Өземтә блогы"},"clipboard":{"copy":"Күчермәләү","copyError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","cut":"Кисеп алу","cutError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","paste":"Өстәү","pasteArea":"Өстәү мәйданы","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Өстәү"},"button":{"selectedLabel":"%1 (Сайланган)"},"colorbutton":{"auto":"Автоматик","bgColorTitle":"Фон төсе","colors":{"000":"Кара","800000":"Бордо","8B4513":"Дарчин","2F4F4F":"Аспид соры","008080":"Күкле-яшелле","000080":"Куе күк","4B0082":"Индиго","696969":"Куе соры","B22222":"Кармин","A52A2A":"Чия кызыл","DAA520":"Алтын каен","006400":"Үлән","40E0D0":"Фирәзә","0000CD":"Фарсы күк","800080":"Шәмәхә","808080":"Соры","F00":"Кызыл","FF8C00":"Кабак","FFD700":"Алтын","008000":"Яшел","0FF":"Ачык зәңгәр","00F":"Зәңгәр","EE82EE":"Миләүшә","A9A9A9":"Ачык соры","FFA07A":"Кызгылт сары алсу","FFA500":"Кызгылт сары","FFFF00":"Сары","00FF00":"Лайм","AFEEEE":"Тонык күк","ADD8E6":"Тонык күкбаш","DDA0DD":"Аксыл шәмәхә","D3D3D3":"Ачык соры","FFF0F5":"Ал ала миләүшә","FAEBD7":"Җитен","FFFFE0":"Ачык сары","F0FFF0":"Аксыл көрән","F0FFFF":"Ап-ак","F0F8FF":"Аксыл зәңгәр диңгез","E6E6FA":"Ала миләүшә","FFF":"Ак"},"more":"Башка төсләр...","panelTitle":"Төсләр","textColorTitle":"Текст төсе"},"colordialog":{"clear":"Бушату","highlight":"Билгеләү","options":"Төс көйләүләре","selected":"Сайланган төсләр","title":"Төс сайлау"},"templates":{"button":"Шаблоннар","emptyListMsg":"(Шаблоннар билгеләнмәгән)","insertOption":"Әлеге эчтәлекне алмаштыру","options":"Шаблон үзлекләре","selectPromptMsg":"Please select the template to open in the editor","title":"Эчтәлек шаблоннары"},"contextmenu":{"options":"Контекст меню үзлекләре"},"div":{"IdInputLabel":"Идентификатор","advisoryTitleInputLabel":"Киңәш исем","cssClassInputLabel":"Стильләр класслары","edit":"Edit Div","inlineStyleInputLabel":"Эчке стиль","langDirLTRLabel":"Сулдан уңга язылыш (LTR)","langDirLabel":"Язылыш юнəлеше","langDirRTLLabel":"Уңнан сулга язылыш (RTL)","languageCodeInputLabel":"Тел коды","remove":"Remove Div","styleSelectLabel":"Стиль","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Документ","clipboard":"Алмашу буферы/Кайтару","editing":"Төзәтү","forms":"Формалар","basicstyles":"Төп стильләр","paragraph":"Параграф","links":"Сылталамалар","insert":"Өстәү","styles":"Стильләр","colors":"Төсләр","tools":"Кораллар"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 элемент"},"find":{"find":"Эзләү","findOptions":"Эзләү көйләүләре","findWhat":"Нәрсә эзләргә:","matchCase":"Баш һәм юл хәрефләрен исәпкә алу","matchCyclic":"Кабатлап эзләргә","matchWord":"Сүзләрне тулысынча гына эзләү","notFoundMsg":"Эзләнгән текст табылмады.","replace":"Алмаштыру","replaceAll":"Барысын да алмаштыру","replaceSuccessMsg":"%1 урында(ларда) алмаштырылган.","replaceWith":"Нәрсәгә алмаштыру:","title":"Эзләп табу һәм алмаштыру"},"fakeobjects":{"anchor":"Якорь","flash":"Флеш анимациясы","hiddenfield":"Яшерен кыр","iframe":"IFrame","unknown":"Танылмаган объект"},"flash":{"access":"Script Access","accessAlways":"Һəрвакыт","accessNever":"Беркайчан да","accessSameDomain":"Same domain","alignAbsBottom":"Иң аска","alignAbsMiddle":"Төгәл уртада","alignBaseline":"Таяныч сызыгы","alignTextTop":"Текст өсте","bgcolor":"Фон төсе","chkFull":"Allow Fullscreen","chkLoop":"Әйләнеш","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"Горизонталь ара","properties":"Флеш үзлекләре","propertiesTab":"Үзлекләр","quality":"Сыйфат","qualityAutoHigh":"Авто югары сыйфат","qualityAutoLow":"Авто түбән сыйфат","qualityBest":"Иң югары сыйфат","qualityHigh":"Югары","qualityLow":"Түбəн","qualityMedium":"Уртача","scale":"Зурлык","scaleAll":"Барысын күрсәтү","scaleFit":"Exact Fit","scaleNoBorder":"Чиксез","title":"Флеш үзлекләре","vSpace":"Вертикаль ара","validateHSpace":"Горизонталь ара  сан булырга тиеш.","validateSrc":"URL буш булмаска тиеш.","validateVSpace":"Вертикаль ара  сан булырга тиеш.","windowMode":"Тəрəзə тәртибе","windowModeOpaque":"Үтә күренмәле","windowModeTransparent":"Үтə күренмəле","windowModeWindow":"Тəрəзə"},"font":{"fontSize":{"label":"Зурлык","voiceLabel":"Шрифт зурлыклары","panelTitle":"Шрифт зурлыклары"},"label":"Шрифт","panelTitle":"Шрифт исеме","voiceLabel":"Шрифт"},"forms":{"button":{"title":"Төймә үзлекләре","text":"Текст (күләм)","type":"Төр","typeBtn":"Төймә","typeSbm":"Җибәрү","typeRst":"Кире кайтару"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Радио төймə үзлекләре","value":"Күләм","selected":"Сайланган","required":"Мәҗбүри"},"form":{"title":"Форма үзлекләре","menu":"Форма үзлекләре","action":"Гамәл","method":"Ысул","encoding":"Кодировка"},"hidden":{"title":"Яшерен кыр үзлекләре","name":"Исем","value":"Күләм"},"select":{"title":"Selection Field Properties","selectInfo":"Информацияне сайлау","opAvail":"Мөмкин булган көйләүләр","value":"Күләм","size":"Зурлык","lines":"юллар","chkMulti":"Allow multiple selections","required":"Мәҗбүри","opText":"Текст","opValue":"Күләм","btnAdd":"Кушу","btnModify":"Үзгәртү","btnUp":"Өскә","btnDown":"Аска","btnSetValue":"Сайланган күләм булып билгеләргә","btnDelete":"Бетерү"},"textarea":{"title":"Текст мәйданы үзлекләре","cols":"Баганалар","rows":"Юллар"},"textfield":{"title":"Текст кыры үзлекләре","name":"Исем","value":"Күләм","charWidth":"Символлар киңлеге","maxChars":"Maximum Characters","required":"Мәҗбүри","type":"Төр","typeText":"Текст","typePass":"Сер сүз","typeEmail":"Эл. почта","typeSearch":"Эзләү","typeTel":"Телефон номеры","typeUrl":"Сылталама"}},"format":{"label":"Форматлау","panelTitle":"Параграф форматлавы","tag_address":"Адрес","tag_div":"Гади (DIV)","tag_h1":"Башлам 1","tag_h2":"Башлам 2","tag_h3":"Башлам 3","tag_h4":"Башлам 4","tag_h5":"Башлам 5","tag_h6":"Башлам 6","tag_p":"Гади","tag_pre":"Форматлаулы"},"horizontalrule":{"toolbar":"Ятма сызык өстәү"},"iframe":{"border":"Frame чикләрен күрсәтү","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame үзлекләре","toolbar":"IFrame"},"image":{"alt":"Альтернатив текст","border":"Чик","btnUpload":"Серверга җибәрү","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Горизонталь ара","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Рәсем тасвирламасы","linkTab":"Сылталама","lockRatio":"Lock Ratio","menu":"Рәсем үзлекләре","resetSize":"Баштагы зурлык","title":"Рәсем үзлекләре","titleButton":"Рәсемле төймə үзлекләре","upload":"Йөкләү","urlMissing":"Image source URL is missing.","vSpace":"Вертикаль ара","validateBorder":"Чик киңлеге сан булырга тиеш.","validateHSpace":"Горизонталь ара бөтен сан булырга тиеш.","validateVSpace":"Вертикаль ара бөтен сан булырга тиеш."},"indent":{"indent":"Отступны арттыру","outdent":"Отступны кечерәйтү"},"smiley":{"options":"Смайл көйләүләре","title":"Смайл өстәү","toolbar":"Смайл"},"justify":{"block":"Киңлеккә карап тигезләү","center":"Үзәккә тигезләү","left":"Сул як кырыйдан тигезләү","right":"Уң як кырыйдан тигезләү"},"language":{"button":"Тел сайлау","remove":"Телне бетерү"},"link":{"acccessKey":"Access Key","advanced":"Киңәйтелгән көйләүләр","advisoryContentType":"Advisory Content Type","advisoryTitle":"Киңәш исем","anchor":{"toolbar":"Якорь","menu":"Якорьне үзгәртү","title":"Якорь үзлекләре","name":"Якорь исеме","errorName":"Якорьнең исемен языгыз","remove":"Якорьне бетерү"},"anchorId":"Элемент идентификаторы буенча","anchorName":"Якорь исеме буенча","charset":"Linked Resource Charset","cssClasses":"Стильләр класслары","emailAddress":"Электрон почта адресы","emailBody":"Хат эчтәлеге","emailSubject":"Хат темасы","id":"Идентификатор","info":"Сылталама тасвирламасы","langCode":"Тел коды","langDir":"Язылыш юнəлеше","langDirLTR":"Сулдан уңга язылыш (LTR)","langDirRTL":"Уңнан сулга язылыш (RTL)","menu":"Сылталамаyны үзгәртү","name":"Исем","noAnchors":"(Әлеге документта якорьләр табылмады)","noEmail":"Электрон почта адресын языгыз","noUrl":"Сылталаманы языгыз","other":"<бүтән>","popupDependent":"Бәйле (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Тулы экран (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Бәйләнеш","selectAnchor":"Якорьне сайлау","styles":"Стиль","tabIndex":"Tab Index","target":"Максат","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Попап тәрәзәсе исеме","title":"Сылталама","toAnchor":"Якорьне текст белән бәйләү","toEmail":"Электрон почта","toUrl":"Сылталама","toolbar":"Сылталама","type":"Сылталама төре","unlink":"Сылталаманы бетерү","upload":"Йөкләү"},"list":{"bulletedlist":"Маркерлы тезмә өстәү/бетерү","numberedlist":" Номерланган тезмә өстәү/бетерү"},"liststyle":{"armenian":"Әрмән номерлавы","bulletedTitle":"Маркерлы тезмә үзлекләре","circle":"Түгәрәк","decimal":"Унарлы (1, 2, 3, ...)","decimalLeadingZero":"Ноль белән башланган унарлы (01, 02, 03, ...)","disc":"Диск","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"Һичбер","notset":"<билгеләнмәгән>","numberedTitle":"Номерлы тезмә үзлекләре","square":"Шакмак","start":"Башлау","type":"Төр","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Бирегә параграф өстәү"},"maximize":{"maximize":"Зурайту","minimize":"Кечерәйтү"},"newpage":{"toolbar":"Яңа бит"},"pagebreak":{"alt":"Бит бүлгече","toolbar":"Бастыру өчен бит бүлгечен өстәү"},"pastetext":{"button":"Форматлаусыз текст өстәү","title":"Форматлаусыз текст өстәү"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Word'тан өстәү","toolbar":"Word'тан өстәү"},"preview":{"preview":"Карап алу"},"print":{"toolbar":"Бастыру"},"removeformat":{"toolbar":"Форматлауны бетерү"},"save":{"toolbar":"Саклау"},"selectall":{"toolbar":"Барысын сайлау"},"showblocks":{"toolbar":"Блокларны күрсәтү"},"sourcearea":{"toolbar":"Чыганак"},"specialchar":{"options":"Махсус символ үзлекләре","title":"Махсус символ сайлау","toolbar":"Махсус символ өстәү"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Стильләр","panelTitle":"Форматлау стильләре","panelTitle1":"Блоклар стильләре","panelTitle2":"Эчке стильләр","panelTitle3":"Объектлар стильләре"},"table":{"border":"Чик калынлыгы","caption":"Исем","cell":{"menu":"Күзәнәк","insertBefore":"Алдына күзәнәк өстәү","insertAfter":"Артына күзәнәк өстәү","deleteCell":"Күзәнәкләрне бетерү","merge":"Күзәнәкләрне берләштерү","mergeRight":"Уң яктагы белән берләштерү","mergeDown":"Астагы белән берләштерү","splitHorizontal":"Күзәнәкне юлларга бүлү","splitVertical":"Күзәнәкне баганаларга бүлү","title":"Күзәнәк үзлекләре","cellType":"Күзәнәк төре","rowSpan":"Юлларны берләштерү","colSpan":"Баганаларны берләштерү","wordWrap":"Текстны күчерү","hAlign":"Ятма тигезләү","vAlign":"Асма тигезләү","alignBaseline":"Таяныч сызыгы","bgColor":"Фон төсе","borderColor":"Чик төсе","data":"Мәгълүмат","header":"Башлык","yes":"Әйе","no":"Юк","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сайлау"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Багана","insertBefore":"Сулдан баганалар өстәү","insertAfter":"Уңнан баганалар өстәү","deleteColumn":"Баганаларны бетерү"},"columns":"Баганалар","deleteTable":"Таблицаны бетерү","headers":"Башлыклар","headersBoth":"Икесе дә","headersColumn":"Беренче багана","headersNone":"Һичбер","headersRow":"Беренче юл","invalidBorder":"Чик киңлеге сан булырга тиеш.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Күзәнәкләр аралары уңай сан булырга тиеш.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Таблица биеклеге сан булырга тиеш.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Таблица киңлеге сан булырга тиеш","menu":"Таблица үзлекләре","row":{"menu":"Юл","insertBefore":"Өстән юллар өстәү","insertAfter":"Астан юллар өстәү","deleteRow":"Юлларны бетерү"},"rows":"Юллар","summary":"Йомгаклау","title":"Таблица үзлекләре","toolbar":"Таблица","widthPc":"процент","widthPx":"Нокталар","widthUnit":"киңлек берәмлеге"},"undo":{"redo":"Кабатлау","undo":"Кайтару"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
+CKEDITOR.lang['tt']={"editor":"Форматлаулы текст өлкәсе","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Ярдәм өчен ALT 0 басыгыз","browseServer":"Сервер карап чыгу","url":"Сылталама","protocol":"Протокол","upload":"Йөкләү","uploadSubmit":"Серверга җибәрү","image":"Рәсем","flash":"Флеш","form":"Форма","checkbox":"Чекбокс","radio":"Радио төймә","textField":"Текст кыры","textarea":"Текст мәйданы","hiddenField":"Яшерен кыр","button":"Төймə","select":"Сайлау кыры","imageButton":"Рәсемле төймə","notSet":"<билгеләнмәгән>","id":"Id","name":"Исем","langDir":"Язылыш юнəлеше","langDirLtr":"Сулдан уңга язылыш (LTR)","langDirRtl":"Уңнан сулга язылыш (RTL)","langCode":"Тел коды","longDescr":"Җентекле тасвирламага сылталама","cssClass":"Стильләр класслары","advisoryTitle":"Киңәш исем","cssStyle":"Стиль","ok":"Тәмам","cancel":"Баш тарту","close":"Чыгу","preview":"Карап алу","resize":"Зурлыкны үзгәртү","generalTab":"Төп","advancedTab":"Киңәйтелгән көйләүләр","validateNumberFailed":"Әлеге кыйммәт сан түгел.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Үзлекләр","target":"Максат","targetNew":"Яңа тәрәзә (_blank)","targetTop":"Өске тәрәзә (_top)","targetSelf":"Шул үк тәрәзә (_self)","targetParent":"Ана тәрәзә (_parent)","langDirLTR":"Сулдан уңга язылыш (LTR)","langDirRTL":"Уңнан сулга язылыш (RTL)","styles":"Стиль","cssClasses":"Стильләр класслары","width":"Киңлек","height":"Биеклек","align":"Тигезләү","alignLeft":"Сул якка","alignRight":"Уң якка","alignCenter":"Үзәккә","alignJustify":"Киңлеккә карап тигезләү","alignTop":"Өскә","alignMiddle":"Уртага","alignBottom":"Аска","alignNone":"Һичбер","invalidValue":"Дөрес булмаган кыйммәт.","invalidHeight":"Биеклек сан булырга тиеш.","invalidWidth":"Киңлек сан булырга тиеш.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Кайтару","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Бетерү","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Бар хокуклар сакланган","dlgTitle":"CKEditor турында","help":"Ярдәм өчен $1 тикшереп карагыз.","moreInfo":"For licensing information please visit our web site:","title":"CKEditor турында","userGuide":"CKEditor кулланмасы"},"basicstyles":{"bold":"Калын","italic":"Курсив","strike":"Сызылган","subscript":"Аскы индекс","superscript":"Өске индекс","underline":"Астына сызылган"},"bidi":{"ltr":"Сулдан уңга язылыш","rtl":"Уңнан сулга язылыш"},"blockquote":{"toolbar":"Өземтә блогы"},"clipboard":{"copy":"Күчермәләү","copyError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","cut":"Кисеп алу","cutError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","paste":"Өстәү","pasteArea":"Өстәү мәйданы","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Өстәү"},"button":{"selectedLabel":"%1 (Сайланган)"},"colorbutton":{"auto":"Автоматик","bgColorTitle":"Фон төсе","colors":{"000":"Кара","800000":"Бордо","8B4513":"Дарчин","2F4F4F":"Аспид соры","008080":"Күкле-яшелле","000080":"Куе күк","4B0082":"Индиго","696969":"Куе соры","B22222":"Кармин","A52A2A":"Чия кызыл","DAA520":"Алтын каен","006400":"Үлән","40E0D0":"Фирәзә","0000CD":"Фарсы күк","800080":"Шәмәхә","808080":"Соры","F00":"Кызыл","FF8C00":"Кабак","FFD700":"Алтын","008000":"Яшел","0FF":"Ачык зәңгәр","00F":"Зәңгәр","EE82EE":"Миләүшә","A9A9A9":"Ачык соры","FFA07A":"Кызгылт сары алсу","FFA500":"Кызгылт сары","FFFF00":"Сары","00FF00":"Лайм","AFEEEE":"Тонык күк","ADD8E6":"Тонык күкбаш","DDA0DD":"Аксыл шәмәхә","D3D3D3":"Ачык соры","FFF0F5":"Ал ала миләүшә","FAEBD7":"Җитен","FFFFE0":"Ачык сары","F0FFF0":"Аксыл көрән","F0FFFF":"Ап-ак","F0F8FF":"Аксыл зәңгәр диңгез","E6E6FA":"Ала миләүшә","FFF":"Ак","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Башка төсләр...","panelTitle":"Төсләр","textColorTitle":"Текст төсе"},"colordialog":{"clear":"Бушату","highlight":"Билгеләү","options":"Төс көйләүләре","selected":"Сайланган төсләр","title":"Төс сайлау"},"templates":{"button":"Шаблоннар","emptyListMsg":"(Шаблоннар билгеләнмәгән)","insertOption":"Әлеге эчтәлекне алмаштыру","options":"Шаблон үзлекләре","selectPromptMsg":"Please select the template to open in the editor","title":"Эчтәлек шаблоннары"},"contextmenu":{"options":"Контекст меню үзлекләре"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Идентификатор","advisoryTitleInputLabel":"Киңәш исем","cssClassInputLabel":"Стильләр класслары","edit":"Edit Div","inlineStyleInputLabel":"Эчке стиль","langDirLTRLabel":"Сулдан уңга язылыш (LTR)","langDirLabel":"Язылыш юнəлеше","langDirRTLLabel":"Уңнан сулга язылыш (RTL)","languageCodeInputLabel":"Тел коды","remove":"Remove Div","styleSelectLabel":"Стиль","title":"Create Div Container","toolbar":"Create Div Container"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Документ","clipboard":"Алмашу буферы/Кайтару","editing":"Төзәтү","forms":"Формалар","basicstyles":"Төп стильләр","paragraph":"Параграф","links":"Сылталамалар","insert":"Өстәү","styles":"Стильләр","colors":"Төсләр","tools":"Кораллар"},"toolbars":"Editor toolbars"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 элемент"},"find":{"find":"Эзләү","findOptions":"Эзләү көйләүләре","findWhat":"Нәрсә эзләргә:","matchCase":"Баш һәм юл хәрефләрен исәпкә алу","matchCyclic":"Кабатлап эзләргә","matchWord":"Сүзләрне тулысынча гына эзләү","notFoundMsg":"Эзләнгән текст табылмады.","replace":"Алмаштыру","replaceAll":"Барысын да алмаштыру","replaceSuccessMsg":"%1 урында(ларда) алмаштырылган.","replaceWith":"Нәрсәгә алмаштыру:","title":"Эзләп табу һәм алмаштыру"},"fakeobjects":{"anchor":"Якорь","flash":"Флеш анимациясы","hiddenfield":"Яшерен кыр","iframe":"IFrame","unknown":"Танылмаган объект"},"flash":{"access":"Script Access","accessAlways":"Һəрвакыт","accessNever":"Беркайчан да","accessSameDomain":"Same domain","alignAbsBottom":"Иң аска","alignAbsMiddle":"Төгәл уртада","alignBaseline":"Таяныч сызыгы","alignTextTop":"Текст өсте","bgcolor":"Фон төсе","chkFull":"Allow Fullscreen","chkLoop":"Әйләнеш","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"Горизонталь ара","properties":"Флеш үзлекләре","propertiesTab":"Үзлекләр","quality":"Сыйфат","qualityAutoHigh":"Авто югары сыйфат","qualityAutoLow":"Авто түбән сыйфат","qualityBest":"Иң югары сыйфат","qualityHigh":"Югары","qualityLow":"Түбəн","qualityMedium":"Уртача","scale":"Зурлык","scaleAll":"Барысын күрсәтү","scaleFit":"Exact Fit","scaleNoBorder":"Чиксез","title":"Флеш үзлекләре","vSpace":"Вертикаль ара","validateHSpace":"Горизонталь ара  сан булырга тиеш.","validateSrc":"URL буш булмаска тиеш.","validateVSpace":"Вертикаль ара  сан булырга тиеш.","windowMode":"Тəрəзə тәртибе","windowModeOpaque":"Үтә күренмәле","windowModeTransparent":"Үтə күренмəле","windowModeWindow":"Тəрəзə"},"font":{"fontSize":{"label":"Зурлык","voiceLabel":"Шрифт зурлыклары","panelTitle":"Шрифт зурлыклары"},"label":"Шрифт","panelTitle":"Шрифт исеме","voiceLabel":"Шрифт"},"forms":{"button":{"title":"Төймә үзлекләре","text":"Текст (күләм)","type":"Төр","typeBtn":"Төймә","typeSbm":"Җибәрү","typeRst":"Кире кайтару"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Радио төймə үзлекләре","value":"Күләм","selected":"Сайланган","required":"Мәҗбүри"},"form":{"title":"Форма үзлекләре","menu":"Форма үзлекләре","action":"Гамәл","method":"Ысул","encoding":"Кодировка"},"hidden":{"title":"Яшерен кыр үзлекләре","name":"Исем","value":"Күләм"},"select":{"title":"Selection Field Properties","selectInfo":"Информацияне сайлау","opAvail":"Мөмкин булган көйләүләр","value":"Күләм","size":"Зурлык","lines":"юллар","chkMulti":"Allow multiple selections","required":"Мәҗбүри","opText":"Текст","opValue":"Күләм","btnAdd":"Кушу","btnModify":"Үзгәртү","btnUp":"Өскә","btnDown":"Аска","btnSetValue":"Сайланган күләм булып билгеләргә","btnDelete":"Бетерү"},"textarea":{"title":"Текст мәйданы үзлекләре","cols":"Баганалар","rows":"Юллар"},"textfield":{"title":"Текст кыры үзлекләре","name":"Исем","value":"Күләм","charWidth":"Символлар киңлеге","maxChars":"Maximum Characters","required":"Мәҗбүри","type":"Төр","typeText":"Текст","typePass":"Сер сүз","typeEmail":"Эл. почта","typeSearch":"Эзләү","typeTel":"Телефон номеры","typeUrl":"Сылталама"}},"format":{"label":"Форматлау","panelTitle":"Параграф форматлавы","tag_address":"Адрес","tag_div":"Гади (DIV)","tag_h1":"Башлам 1","tag_h2":"Башлам 2","tag_h3":"Башлам 3","tag_h4":"Башлам 4","tag_h5":"Башлам 5","tag_h6":"Башлам 6","tag_p":"Гади","tag_pre":"Форматлаулы"},"horizontalrule":{"toolbar":"Ятма сызык өстәү"},"iframe":{"border":"Frame чикләрен күрсәтү","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame үзлекләре","toolbar":"IFrame"},"image":{"alt":"Альтернатив текст","border":"Чик","btnUpload":"Серверга җибәрү","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Горизонталь ара","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Рәсем тасвирламасы","linkTab":"Сылталама","lockRatio":"Lock Ratio","menu":"Рәсем үзлекләре","resetSize":"Баштагы зурлык","title":"Рәсем үзлекләре","titleButton":"Рәсемле төймə үзлекләре","upload":"Йөкләү","urlMissing":"Image source URL is missing.","vSpace":"Вертикаль ара","validateBorder":"Чик киңлеге сан булырга тиеш.","validateHSpace":"Горизонталь ара бөтен сан булырга тиеш.","validateVSpace":"Вертикаль ара бөтен сан булырга тиеш."},"indent":{"indent":"Отступны арттыру","outdent":"Отступны кечерәйтү"},"smiley":{"options":"Смайл көйләүләре","title":"Смайл өстәү","toolbar":"Смайл"},"justify":{"block":"Киңлеккә карап тигезләү","center":"Үзәккә тигезләү","left":"Сул як кырыйдан тигезләү","right":"Уң як кырыйдан тигезләү"},"language":{"button":"Тел сайлау","remove":"Телне бетерү"},"link":{"acccessKey":"Access Key","advanced":"Киңәйтелгән көйләүләр","advisoryContentType":"Advisory Content Type","advisoryTitle":"Киңәш исем","anchor":{"toolbar":"Якорь","menu":"Якорьне үзгәртү","title":"Якорь үзлекләре","name":"Якорь исеме","errorName":"Якорьнең исемен языгыз","remove":"Якорьне бетерү"},"anchorId":"Элемент идентификаторы буенча","anchorName":"Якорь исеме буенча","charset":"Linked Resource Charset","cssClasses":"Стильләр класслары","download":"Force Download","displayText":"Display Text","emailAddress":"Электрон почта адресы","emailBody":"Хат эчтәлеге","emailSubject":"Хат темасы","id":"Идентификатор","info":"Сылталама тасвирламасы","langCode":"Тел коды","langDir":"Язылыш юнəлеше","langDirLTR":"Сулдан уңга язылыш (LTR)","langDirRTL":"Уңнан сулга язылыш (RTL)","menu":"Сылталамаyны үзгәртү","name":"Исем","noAnchors":"(Әлеге документта якорьләр табылмады)","noEmail":"Электрон почта адресын языгыз","noUrl":"Сылталаманы языгыз","other":"<бүтән>","popupDependent":"Бәйле (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Тулы экран (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Бәйләнеш","selectAnchor":"Якорьне сайлау","styles":"Стиль","tabIndex":"Tab Index","target":"Максат","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Попап тәрәзәсе исеме","title":"Сылталама","toAnchor":"Якорьне текст белән бәйләү","toEmail":"Электрон почта","toUrl":"Сылталама","toolbar":"Сылталама","type":"Сылталама төре","unlink":"Сылталаманы бетерү","upload":"Йөкләү"},"list":{"bulletedlist":"Маркерлы тезмә өстәү/бетерү","numberedlist":" Номерланган тезмә өстәү/бетерү"},"liststyle":{"armenian":"Әрмән номерлавы","bulletedTitle":"Маркерлы тезмә үзлекләре","circle":"Түгәрәк","decimal":"Унарлы (1, 2, 3, ...)","decimalLeadingZero":"Ноль белән башланган унарлы (01, 02, 03, ...)","disc":"Диск","georgian":"Georgian numbering (an, ban, gan, etc.)","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerGreek":"Lower Greek (alpha, beta, gamma, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"Һичбер","notset":"<билгеләнмәгән>","numberedTitle":"Номерлы тезмә үзлекләре","square":"Шакмак","start":"Башлау","type":"Төр","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Бирегә параграф өстәү"},"maximize":{"maximize":"Зурайту","minimize":"Кечерәйтү"},"newpage":{"toolbar":"Яңа бит"},"pagebreak":{"alt":"Бит бүлгече","toolbar":"Бастыру өчен бит бүлгечен өстәү"},"pastetext":{"button":"Форматлаусыз текст өстәү","title":"Форматлаусыз текст өстәү"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Word'тан өстәү","toolbar":"Word'тан өстәү"},"preview":{"preview":"Карап алу"},"print":{"toolbar":"Бастыру"},"removeformat":{"toolbar":"Форматлауны бетерү"},"save":{"toolbar":"Саклау"},"selectall":{"toolbar":"Барысын сайлау"},"showblocks":{"toolbar":"Блокларны күрсәтү"},"sourcearea":{"toolbar":"Чыганак"},"specialchar":{"options":"Махсус символ үзлекләре","title":"Махсус символ сайлау","toolbar":"Махсус символ өстәү"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Стильләр","panelTitle":"Форматлау стильләре","panelTitle1":"Блоклар стильләре","panelTitle2":"Эчке стильләр","panelTitle3":"Объектлар стильләре"},"table":{"border":"Чик калынлыгы","caption":"Исем","cell":{"menu":"Күзәнәк","insertBefore":"Алдына күзәнәк өстәү","insertAfter":"Артына күзәнәк өстәү","deleteCell":"Күзәнәкләрне бетерү","merge":"Күзәнәкләрне берләштерү","mergeRight":"Уң яктагы белән берләштерү","mergeDown":"Астагы белән берләштерү","splitHorizontal":"Күзәнәкне юлларга бүлү","splitVertical":"Күзәнәкне баганаларга бүлү","title":"Күзәнәк үзлекләре","cellType":"Күзәнәк төре","rowSpan":"Юлларны берләштерү","colSpan":"Баганаларны берләштерү","wordWrap":"Текстны күчерү","hAlign":"Ятма тигезләү","vAlign":"Асма тигезләү","alignBaseline":"Таяныч сызыгы","bgColor":"Фон төсе","borderColor":"Чик төсе","data":"Мәгълүмат","header":"Башлык","yes":"Әйе","no":"Юк","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сайлау"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Багана","insertBefore":"Сулдан баганалар өстәү","insertAfter":"Уңнан баганалар өстәү","deleteColumn":"Баганаларны бетерү"},"columns":"Баганалар","deleteTable":"Таблицаны бетерү","headers":"Башлыклар","headersBoth":"Икесе дә","headersColumn":"Беренче багана","headersNone":"Һичбер","headersRow":"Беренче юл","invalidBorder":"Чик киңлеге сан булырга тиеш.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Күзәнәкләр аралары уңай сан булырга тиеш.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Таблица биеклеге сан булырга тиеш.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Таблица киңлеге сан булырга тиеш","menu":"Таблица үзлекләре","row":{"menu":"Юл","insertBefore":"Өстән юллар өстәү","insertAfter":"Астан юллар өстәү","deleteRow":"Юлларны бетерү"},"rows":"Юллар","summary":"Йомгаклау","title":"Таблица үзлекләре","toolbar":"Таблица","widthPc":"процент","widthPx":"Нокталар","widthUnit":"киңлек берәмлеге"},"undo":{"redo":"Кабатлау","undo":"Кайтару"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/lang/ug.js
index 4fb6ec23b44..282e50626b0 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/ug.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ug.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ug']={"editor":"تەھرىرلىگۈچ","editorPanel":"مول تېكست تەھرىرلىگۈچ تاختىسى","common":{"editorHelp":"ALT+0 نى بېسىپ ياردەمنى كۆرۈڭ","browseServer":"كۆرسىتىش مۇلازىمېتىر","url":"ئەسلى ھۆججەت","protocol":"كېلىشىم","upload":"يۈكلە","uploadSubmit":"مۇلازىمېتىرغا يۈكلە","image":"سۈرەت","flash":"Flash","form":"جەدۋەل","checkbox":"كۆپ تاللاش رامكىسى","radio":"يەككە تاللاش توپچىسى","textField":"يەككە قۇر تېكىست","textarea":"كۆپ قۇر تېكىست","hiddenField":"يوشۇرۇن دائىرە","button":"توپچا","select":"تىزىم/تىزىملىك","imageButton":"سۈرەت دائىرە","notSet":"‹تەڭشەلمىگەن›","id":"ID","name":"ئات","langDir":"تىل يۆنىلىشى","langDirLtr":"سولدىن ئوڭغا (LTR)","langDirRtl":"ئوڭدىن سولغا (RTL)","langCode":"تىل كودى","longDescr":"تەپسىلىي چۈشەندۈرۈش ئادرېسى","cssClass":"ئۇسلۇب خىلىنىڭ ئاتى","advisoryTitle":"ماۋزۇ","cssStyle":"قۇر ئىچىدىكى ئۇسلۇبى","ok":"جەزملە","cancel":"ۋاز كەچ","close":"تاقا","preview":"ئالدىن كۆزەت","resize":"چوڭلۇقىنى ئۆزگەرت","generalTab":"ئادەتتىكى","advancedTab":"ئالىي","validateNumberFailed":"سان پىچىمىدا كىرگۈزۈش زۆرۈر","confirmNewPage":"نۆۋەتتىكى پۈتۈك مەزمۇنى ساقلانمىدى، يېڭى پۈتۈك قۇرامسىز؟","confirmCancel":"قىسمەن ئۆزگەرتىش ساقلانمىدى، بۇ سۆزلەشكۈنى تاقامسىز؟","options":"تاللانما","target":"نىشان كۆزنەك","targetNew":"يېڭى كۆزنەك (_blank)","targetTop":"پۈتۈن بەت (_top)","targetSelf":"مەزكۇر كۆزنەك (_self)","targetParent":"ئاتا كۆزنەك (_parent)","langDirLTR":"سولدىن ئوڭغا (LTR)","langDirRTL":"ئوڭدىن سولغا (RTL)","styles":"ئۇسلۇبلار","cssClasses":"ئۇسلۇب خىللىرى","width":"كەڭلىك","height":"ئېگىزلىك","align":"توغرىلىنىشى","alignLeft":"سول","alignRight":"ئوڭ","alignCenter":"ئوتتۇرا","alignJustify":"ئىككى تەرەپتىن توغرىلا","alignTop":"ئۈستى","alignMiddle":"ئوتتۇرا","alignBottom":"ئاستى","alignNone":"يوق","invalidValue":"ئىناۋەتسىز قىممەت.","invalidHeight":"ئېگىزلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر","invalidWidth":"كەڭلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر","invalidCssLength":"بۇ سۆز بۆلىكى چوقۇم مۇۋاپىق بولغان CSS ئۇزۇنلۇق قىممىتى بولۇشى زۆرۈر، بىرلىكى (px, %, in, cm, mm, em, ex, pt ياكى pc)","invalidHtmlLength":"بۇ سۆز بۆلىكى چوقۇم بىرىكمە HTML ئۇزۇنلۇق قىممىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px ياكى %)","invalidInlineStyle":"ئىچكى باغلانما ئۇسلۇبى چوقۇم چېكىتلىك پەش بىلەن ئايرىلغان بىر ياكى كۆپ «خاسلىق ئاتى:خاسلىق قىممىتى» پىچىمىدا بولۇشى لازىم","cssLengthTooltip":"بۇ سۆز بۆلىكى بىرىكمە CSS ئۇزۇنلۇق قىممىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px, %, in, cm, mm, em, ex, pt ياكى pc)","unavailable":"%1<span class=\\\\\"cke_accessibility\\\\\">، ئىشلەتكىلى بولمايدۇ</span>"},"about":{"copy":"Copyright &copy; $1. نەشر ھوقۇقىغا ئىگە","dlgTitle":"CKEditor ھەققىدە","help":"$1 نى زىيارەت قىلىپ ياردەمگە ئېرىشىڭ","moreInfo":"تور تۇرايىمىزنى زىيارەت قىلىپ كېلىشىمگە ئائىت تېخىمۇ كۆپ ئۇچۇرغا ئېرىشىڭ","title":"CKEditor ھەققىدە","userGuide":"CKEditor ئىشلەتكۈچى قوللانمىسى"},"basicstyles":{"bold":"توم","italic":"يانتۇ","strike":"ئۆچۈرۈش سىزىقى","subscript":"تۆۋەن ئىندېكس","superscript":"يۇقىرى ئىندېكس","underline":"ئاستى سىزىق"},"bidi":{"ltr":"تېكىست يۆنىلىشى سولدىن ئوڭغا","rtl":"تېكىست يۆنىلىشى ئوڭدىن سولغا"},"blockquote":{"toolbar":"بۆلەك نەقىل"},"clipboard":{"copy":"كۆچۈر","copyError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كۆچۈر مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+C) ئارقىلىق تاماملاڭ","cut":"كەس","cutError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كەس مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+X) ئارقىلىق تاماملاڭ","paste":"چاپلا","pasteArea":"چاپلاش دائىرىسى","pasteMsg":"ھەرپتاختا تېز كۇنۇپكا (<STRONG>Ctrl/Cmd+V</STRONG>) نى ئىشلىتىپ مەزمۇننى تۆۋەندىكى رامكىغا كۆچۈرۈڭ، ئاندىن <STRONG>جەزملە</STRONG>نى بېسىڭ","securityMsg":"توركۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى سەۋەبىدىن بۇ تەھرىرلىگۈچ چاپلاش تاختىسىدىكى مەزمۇننى بىۋاستە زىيارەت قىلالمايدۇ، بۇ كۆزنەكتە قايتا بىر قېتىم چاپلىشىڭىز كېرەك.","title":"چاپلا"},"button":{"selectedLabel":"%1 (تاللاندى)"},"colorbutton":{"auto":"ئۆزلۈكىدىن","bgColorTitle":"تەگلىك رەڭگى","colors":{"000":"قارا","800000":"قىزغۇچ سېرىق","8B4513":"توق قوڭۇر","2F4F4F":"قارامتۇل يېشىل","008080":"كۆكۈش يېشىل","000080":"قارامتۇل كۆك","4B0082":"كۆكۈش كۈلرەڭ","696969":"قارامتۇل كۈلرەڭ","B22222":"خىش قىزىل","A52A2A":"قوڭۇر","DAA520":"ئالتۇن سېرىق","006400":"توق يېشىل","40E0D0":"كۆكۈچ يېشىل","0000CD":"ئوتتۇراھال كۆك","800080":"بىنەپشە","808080":"كۈلرەڭ","F00":"قىزىل","FF8C00":"توق قىزغۇچ سېرىق","FFD700":"ئالتۇن","008000":"يېشىل","0FF":"يېشىل كۆك","00F":"كۆك","EE82EE":"قىزغۇچ بىنەپشە","A9A9A9":"توق كۈلرەڭ","FFA07A":"كاۋا چېچىكى سېرىق","FFA500":"قىزغۇچ سېرىق","FFFF00":"سېرىق","00FF00":"Lime","AFEEEE":"سۇس ھاۋا رەڭ","ADD8E6":"ئوچۇق كۆك","DDA0DD":"قىزغۇچ بىنەپشە","D3D3D3":"سۇس كۆكۈچ كۈلرەڭ","FFF0F5":"سۇس قىزغۇچ بىنەپشە","FAEBD7":"Antique White","FFFFE0":"سۇس سېرىق","F0FFF0":"Honeydew","F0FFFF":"ئاسمان كۆكى","F0F8FF":"سۇس كۆك","E6E6FA":"سۇس بىنەپشە","FFF":"ئاق"},"more":"باشقا رەڭ","panelTitle":"رەڭ","textColorTitle":"تېكىست رەڭگى"},"colordialog":{"clear":"تازىلا","highlight":"يورۇت","options":"رەڭ تاللانمىسى","selected":"رەڭ تاللاڭ","title":"رەڭ تاللاڭ"},"templates":{"button":"قېلىپ","emptyListMsg":"(قېلىپ يوق)","insertOption":"نۆۋەتتىكى مەزمۇننى ئالماشتۇر","options":"قېلىپ تاللانمىسى","selectPromptMsg":"تەھرىرلىگۈچنىڭ مەزمۇن قېلىپىنى تاللاڭ:","title":"مەزمۇن قېلىپى"},"contextmenu":{"options":"قىسقا يول تىزىملىك تاللانمىسى"},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"ماۋزۇ","cssClassInputLabel":"ئۇسلۇب تىپىنىڭ ئاتى","edit":"DIV تەھرىر","inlineStyleInputLabel":"قۇر ئىچىدىكى ئۇسلۇبى","langDirLTRLabel":"سولدىن ئوڭغا (LTR)","langDirLabel":"تىل يۆنىلىشى","langDirRTLLabel":"ئوڭدىن سولغا (RTL)","languageCodeInputLabel":"تىل كودى","remove":"DIV چىقىرىۋەت","styleSelectLabel":"ئۇسلۇب","title":"DIV قاچا قۇر","toolbar":"DIV قاچا قۇر"},"toolbar":{"toolbarCollapse":"قورال بالداقنى قاتلا","toolbarExpand":"قورال بالداقنى ياي","toolbarGroups":{"document":"پۈتۈك","clipboard":"چاپلاش تاختىسى/يېنىۋال","editing":"تەھرىر","forms":"جەدۋەل","basicstyles":"ئاساسىي ئۇسلۇب","paragraph":"ئابزاس","links":"ئۇلانما","insert":"قىستۇر","styles":"ئۇسلۇب","colors":"رەڭ","tools":"قورال"},"toolbars":"قورال بالداق"},"elementspath":{"eleLabel":"ئېلېمېنت يولى","eleTitle":"%1 ئېلېمېنت"},"find":{"find":"ئىزدە","findOptions":"ئىزدەش تاللانمىسى","findWhat":"ئىزدە:","matchCase":"چوڭ كىچىك ھەرپنى پەرقلەندۈر","matchCyclic":"ئايلانما ماسلىشىش","matchWord":"پۈتۈن سۆز ماسلىشىش","notFoundMsg":"بەلگىلەنگەن تېكىستنى تاپالمىدى","replace":"ئالماشتۇر","replaceAll":"ھەممىنى ئالماشتۇر","replaceSuccessMsg":"جەمئى %1 جايدىكى ئالماشتۇرۇش تاماملاندى","replaceWith":"ئالماشتۇر:","title":"ئىزدەپ ئالماشتۇر"},"fakeobjects":{"anchor":"لەڭگەرلىك نۇقتا","flash":"Flash جانلاندۇرۇم","hiddenfield":"يوشۇرۇن دائىرە","iframe":"IFrame","unknown":"يوچۇن نەڭ"},"flash":{"access":"قوليازما زىيارەتكە يول قوي","accessAlways":"ھەمىشە","accessNever":"ھەرگىز","accessSameDomain":"ئوخشاش دائىرىدە","alignAbsBottom":"مۇتلەق ئاستى","alignAbsMiddle":"مۇتلەق ئوتتۇرا","alignBaseline":"ئاساسىي سىزىق","alignTextTop":"تېكىست ئۈستىدە","bgcolor":"تەگلىك رەڭگى","chkFull":"پۈتۈن ئېكراننى قوزغات","chkLoop":"دەۋرىي","chkMenu":"Flash تىزىملىكنى قوزغات","chkPlay":"ئۆزلۈكىدىن چال","flashvars":"Flash  ئۆزگەرگۈچى","hSpace":"توغرىسىغا ئارىلىق","properties":"Flash خاسلىق","propertiesTab":"خاسلىق","quality":"سۈپەت","qualityAutoHigh":"يۇقىرى (ئاپتوماتىك)","qualityAutoLow":"تۆۋەن (ئاپتوماتىك)","qualityBest":"ئەڭ ياخشى","qualityHigh":"يۇقىرى","qualityLow":"تۆۋەن","qualityMedium":"ئوتتۇرا (ئاپتوماتىك)","scale":"نىسبىتى","scaleAll":"ھەممىنى كۆرسەت","scaleFit":"قەتئىي ماسلىشىش","scaleNoBorder":"گىرۋەك يوق","title":"ماۋزۇ","vSpace":"بويىغا ئارىلىق","validateHSpace":"توغرىسىغا ئارىلىق چوقۇم سان بولىدۇ","validateSrc":"ئەسلى ھۆججەت ئادرېسىنى كىرگۈزۈڭ","validateVSpace":"بويىغا ئارىلىق چوقۇم سان بولىدۇ","windowMode":"كۆزنەك ھالىتى","windowModeOpaque":"خىرە","windowModeTransparent":"سۈزۈك","windowModeWindow":"كۆزنەك گەۋدىسى"},"font":{"fontSize":{"label":"چوڭلۇقى","voiceLabel":"خەت چوڭلۇقى","panelTitle":"چوڭلۇقى"},"label":"خەت نۇسخا","panelTitle":"خەت نۇسخا","voiceLabel":"خەت نۇسخا"},"forms":{"button":{"title":"توپچا خاسلىقى","text":"بەلگە (قىممەت)","type":"تىپى","typeBtn":"توپچا","typeSbm":"تاپشۇر","typeRst":"ئەسلىگە قايتۇر"},"checkboxAndRadio":{"checkboxTitle":"كۆپ تاللاش خاسلىقى","radioTitle":"تاق تاللاش توپچا خاسلىقى","value":"تاللىغان قىممەت","selected":"تاللانغان","required":"زۆرۈر"},"form":{"title":"جەدۋەل خاسلىقى","menu":"جەدۋەل خاسلىقى","action":"مەشغۇلات","method":"ئۇسۇل","encoding":"جەدۋەل كودلىنىشى"},"hidden":{"title":"يوشۇرۇن دائىرە خاسلىقى","name":"ئات","value":"دەسلەپكى قىممىتى"},"select":{"title":"جەدۋەل/تىزىم خاسلىقى","selectInfo":"ئۇچۇر تاللاڭ","opAvail":"تاللاش تۈرلىرى","value":"قىممەت","size":"ئېگىزلىكى","lines":"قۇر","chkMulti":"كۆپ تاللاشچان","required":"زۆرۈر","opText":"تاللانما تېكىستى","opValue":"تاللانما قىممىتى","btnAdd":"قوش","btnModify":"ئۆزگەرت","btnUp":"ئۈستىگە","btnDown":"ئاستىغا","btnSetValue":"دەسلەپكى تاللانما قىممىتىگە تەڭشە","btnDelete":"ئۆچۈر"},"textarea":{"title":" كۆپ قۇرلۇق تېكىست خاسلىقى","cols":"ھەرپ كەڭلىكى","rows":"قۇر سانى"},"textfield":{"title":"تاق قۇرلۇق تېكىست خاسلىقى","name":"ئات","value":"دەسلەپكى قىممىتى","charWidth":"ھەرپ كەڭلىكى","maxChars":"ئەڭ كۆپ ھەرپ سانى","required":"زۆرۈر","type":"تىپى","typeText":"تېكىست","typePass":"ئىم","typeEmail":"تورخەت","typeSearch":"ئىزدە","typeTel":"تېلېفون نومۇر","typeUrl":"ئادرېس"}},"format":{"label":"پىچىم","panelTitle":"پىچىم","tag_address":"ئادرېس","tag_div":"ئابزاس (DIV)","tag_h1":"ماۋزۇ 1","tag_h2":"ماۋزۇ 2","tag_h3":"ماۋزۇ 3","tag_h4":"ماۋزۇ 4","tag_h5":"ماۋزۇ 5","tag_h6":"ماۋزۇ 6","tag_p":"ئادەتتىكى","tag_pre":"تىزىلغان پىچىم"},"horizontalrule":{"toolbar":"توغرا سىزىق قىستۇر"},"iframe":{"border":"كاندۇك گىرۋەكلىرىنى كۆرسەت","noUrl":"كاندۇكنىڭ ئادرېسى(Url)نى كىرگۈزۈڭ","scrolling":"دومىلىما سۈرگۈچكە يول قوي","title":"IFrame خاسلىق","toolbar":"IFrame "},"image":{"alt":"تېكىست ئالماشتۇر","border":"گىرۋەك چوڭلۇقى","btnUpload":"مۇلازىمېتىرغا يۈكلە","button2Img":"نۆۋەتتىكى توپچىنى سۈرەتكە ئۆزگەرتەمسىز؟","hSpace":"توغرىسىغا ئارىلىقى","img2Button":"نۆۋەتتىكى سۈرەتنى توپچىغا ئۆزگەرتەمسىز؟","infoTab":"سۈرەت","linkTab":"ئۇلانما","lockRatio":"نىسبەتنى قۇلۇپلا","menu":"سۈرەت خاسلىقى","resetSize":"ئەسلى چوڭلۇق","title":"سۈرەت خاسلىقى","titleButton":"سۈرەت دائىرە خاسلىقى","upload":"يۈكلە","urlMissing":"سۈرەتنىڭ ئەسلى ھۆججەت ئادرېسى كەم","vSpace":"بويىغا ئارىلىقى","validateBorder":"گىرۋەك چوڭلۇقى چوقۇم سان بولىدۇ","validateHSpace":"توغرىسىغا ئارىلىق چوقۇم پۈتۈن سان بولىدۇ","validateVSpace":"بويىغا ئارىلىق چوقۇم پۈتۈن سان بولىدۇ"},"indent":{"indent":"تارايت","outdent":"كەڭەيت"},"smiley":{"options":"چىراي ئىپادە سىنبەلگە تاللانمىسى","title":"چىراي ئىپادە سىنبەلگە قىستۇر","toolbar":"چىراي ئىپادە"},"justify":{"block":"ئىككى تەرەپتىن توغرىلا","center":"ئوتتۇرىغا توغرىلا","left":"سولغا توغرىلا","right":"ئوڭغا توغرىلا"},"language":{"button":"تىل تەڭشەك","remove":"تىلنى چىقىرىۋەت"},"link":{"acccessKey":"زىيارەت كۇنۇپكا","advanced":"ئالىي","advisoryContentType":"مەزمۇن تىپى","advisoryTitle":"ماۋزۇ","anchor":{"toolbar":"لەڭگەرلىك نۇقتا ئۇلانمىسى قىستۇر/تەھرىرلە","menu":"لەڭگەرلىك نۇقتا ئۇلانما خاسلىقى","title":"لەڭگەرلىك نۇقتا ئۇلانما خاسلىقى","name":"لەڭگەرلىك نۇقتا ئاتى","errorName":"لەڭگەرلىك نۇقتا ئاتىنى كىرگۈزۈڭ","remove":"لەڭگەرلىك نۇقتا ئۆچۈر"},"anchorId":"لەڭگەرلىك نۇقتا ID سى بويىچە","anchorName":"لەڭگەرلىك نۇقتا ئاتى بويىچە","charset":"ھەرپ كودلىنىشى","cssClasses":"ئۇسلۇب خىلى ئاتى","emailAddress":"ئادرېس","emailBody":"مەزمۇن","emailSubject":"ماۋزۇ","id":"ID","info":"ئۇلانما ئۇچۇرى","langCode":"تىل كودى","langDir":"تىل يۆنىلىشى","langDirLTR":"سولدىن ئوڭغا (LTR)","langDirRTL":"ئوڭدىن سولغا (RTL)","menu":"ئۇلانما تەھرىر","name":"ئات","noAnchors":"(بۇ پۈتۈكتە ئىشلەتكىلى بولىدىغان لەڭگەرلىك نۇقتا يوق)","noEmail":"ئېلخەت ئادرېسىنى كىرگۈزۈڭ","noUrl":"ئۇلانما ئادرېسىنى كىرگۈزۈڭ","other":"‹باشقا›","popupDependent":"تەۋە (NS)","popupFeatures":"قاڭقىش كۆزنەك خاسلىقى","popupFullScreen":"پۈتۈن ئېكران (IE)","popupLeft":"سول","popupLocationBar":"ئادرېس بالداق","popupMenuBar":"تىزىملىك بالداق","popupResizable":"چوڭلۇقى ئۆزگەرتىشچان","popupScrollBars":"دومىلىما سۈرگۈچ","popupStatusBar":"ھالەت بالداق","popupToolbar":"قورال بالداق","popupTop":"ئوڭ","rel":"باغلىنىش","selectAnchor":"بىر لەڭگەرلىك نۇقتا تاللاڭ","styles":"قۇر ئىچىدىكى ئۇسلۇبى","tabIndex":"Tab تەرتىپى","target":"نىشان","targetFrame":"‹كاندۇك›","targetFrameName":"نىشان كاندۇك ئاتى","targetPopup":"‹قاڭقىش كۆزنەك›","targetPopupName":"قاڭقىش كۆزنەك ئاتى","title":"ئۇلانما","toAnchor":"بەت ئىچىدىكى لەڭگەرلىك نۇقتا ئۇلانمىسى","toEmail":"ئېلخەت","toUrl":"ئادرېس","toolbar":"ئۇلانما قىستۇر/تەھرىرلە","type":"ئۇلانما تىپى","unlink":"ئۇلانما بىكار قىل","upload":"يۈكلە"},"list":{"bulletedlist":"تۈر بەلگە تىزىمى","numberedlist":"تەرتىپ نومۇر تىزىمى"},"liststyle":{"armenian":"قەدىمكى ئەرمىنىيە تەرتىپ نومۇرى شەكلى","bulletedTitle":"تۈر بەلگە تىزىم خاسلىقى","circle":"بوش چەمبەر","decimal":"سان (1, 2, 3 قاتارلىق)","decimalLeadingZero":"نۆلدىن باشلانغان سان بەلگە (01, 02, 03 قاتارلىق)","disc":"تولدۇرۇلغان چەمبەر","georgian":"قەدىمكى جورجىيە تەرتىپ نومۇرى شەكلى (an, ban, gan قاتارلىق)","lowerAlpha":"ئىنگلىزچە كىچىك ھەرپ (a, b, c, d, e قاتارلىق)","lowerGreek":"گرېكچە كىچىك ھەرپ (alpha, beta, gamma قاتارلىق)","lowerRoman":"كىچىك ھەرپلىك رىم رەقىمى (i, ii, iii, iv, v قاتارلىق)","none":"بەلگە يوق","notset":"‹تەڭشەلمىگەن›","numberedTitle":"تەرتىپ نومۇر تىزىم خاسلىقى","square":"تولدۇرۇلغان تۆت چاسا","start":"باشلىنىش نومۇرى","type":"بەلگە تىپى","upperAlpha":"ئىنگلىزچە چوڭ ھەرپ (A, B, C, D, E قاتارلىق)","upperRoman":"چوڭ ھەرپلىك رىم رەقىمى (I, II, III, IV, V قاتارلىق)","validateStartNumber":"تىزىم باشلىنىش تەرتىپ نومۇرى چوقۇم پۈتۈن سان پىچىمىدا بولۇشى لازىم"},"magicline":{"title":"بۇ جايغا ئابزاس قىستۇر"},"maximize":{"maximize":"چوڭايت","minimize":"كىچىكلەت"},"newpage":{"toolbar":"يېڭى بەت"},"pagebreak":{"alt":"بەت ئايرىغۇچ","toolbar":"بەت ئايرىغۇچ قىستۇر"},"pastetext":{"button":"پىچىمى يوق تېكىست سۈپىتىدە چاپلا","title":"پىچىمى يوق تېكىست سۈپىتىدە چاپلا"},"pastefromword":{"confirmCleanup":"سىز چاپلىماقچى بولغان مەزمۇن MS Word تىن كەلگەندەك قىلىدۇ، MS Word پىچىمىنى تازىلىۋەتكەندىن كېيىن ئاندىن چاپلامدۇ؟","error":"ئىچكى خاتالىق سەۋەبىدىن چاپلايدىغان سانلىق مەلۇماتنى تازىلىيالمايدۇ","title":"MS Word تىن چاپلا","toolbar":"MS Word تىن چاپلا"},"preview":{"preview":"ئالدىن كۆزەت"},"print":{"toolbar":"باس "},"removeformat":{"toolbar":"پىچىمنى چىقىرىۋەت"},"save":{"toolbar":"ساقلا"},"selectall":{"toolbar":"ھەممىنى تاللا"},"showblocks":{"toolbar":"بۆلەكنى كۆرسەت"},"sourcearea":{"toolbar":"مەنبە"},"specialchar":{"options":"ئالاھىدە ھەرپ تاللانمىسى","title":"ئالاھىدە ھەرپ تاللاڭ","toolbar":"ئالاھىدە ھەرپ قىستۇر"},"scayt":{"btn_about":"شۇئان ئىملا تەكشۈرۈش ھەققىدە","btn_dictionaries":"لۇغەت","btn_disable":"شۇئان ئىملا تەكشۈرۈشنى چەكلە","btn_enable":"شۇئان ئىملا تەكشۈرۈشنى قوزغات","btn_langs":"تىل","btn_options":"تاللانما","text_title":"شۇئان ئىملا تەكشۈر"},"stylescombo":{"label":"ئۇسلۇب","panelTitle":"ئۇسلۇب","panelTitle1":"بۆلەك دەرىجىسىدىكى ئېلېمېنت ئۇسلۇبى","panelTitle2":"ئىچكى باغلانما ئېلېمېنت ئۇسلۇبى","panelTitle3":"نەڭ (Object) ئېلېمېنت ئۇسلۇبى"},"table":{"border":"گىرۋەك","caption":"ماۋزۇ","cell":{"menu":"كاتەكچە","insertBefore":"سولغا كاتەكچە قىستۇر","insertAfter":"ئوڭغا كاتەكچە قىستۇر","deleteCell":"كەتەكچە ئۆچۈر","merge":"كاتەكچە بىرلەشتۈر","mergeRight":"كاتەكچىنى ئوڭغا بىرلەشتۈر","mergeDown":"كاتەكچىنى ئاستىغا بىرلەشتۈر","splitHorizontal":"كاتەكچىنى توغرىسىغا بىرلەشتۈر","splitVertical":"كاتەكچىنى بويىغا بىرلەشتۈر","title":"كاتەكچە خاسلىقى","cellType":"كاتەكچە تىپى","rowSpan":"بويىغا چات ئارىسى قۇر سانى","colSpan":"توغرىسىغا چات ئارىسى ئىستون سانى","wordWrap":"ئۆزلۈكىدىن قۇر قاتلا","hAlign":"توغرىسىغا توغرىلا","vAlign":"بويىغا توغرىلا","alignBaseline":"ئاساسىي سىزىق","bgColor":"تەگلىك رەڭگى","borderColor":"گىرۋەك رەڭگى","data":"سانلىق مەلۇمات","header":"جەدۋەل باشى","yes":"ھەئە","no":"ياق","invalidWidth":"كاتەكچە كەڭلىكى چوقۇم سان بولىدۇ","invalidHeight":"كاتەكچە ئېگىزلىكى چوقۇم سان بولىدۇ","invalidRowSpan":"قۇر چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ ","invalidColSpan":"ئىستون چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ","chooseColor":"تاللاڭ"},"cellPad":"يان ئارىلىق","cellSpace":"ئارىلىق","column":{"menu":"ئىستون","insertBefore":"سولغا ئىستون قىستۇر","insertAfter":"ئوڭغا ئىستون قىستۇر","deleteColumn":"ئىستون ئۆچۈر"},"columns":"ئىستون سانى","deleteTable":"جەدۋەل ئۆچۈر","headers":"ماۋزۇ كاتەكچە","headersBoth":"بىرىنچى ئىستون ۋە بىرىنچى قۇر","headersColumn":"بىرىنچى ئىستون","headersNone":"يوق","headersRow":"بىرىنچى قۇر","invalidBorder":"گىرۋەك توملۇقى چوقۇم سان بولىدۇ","invalidCellPadding":"كاتەكچىگە چوقۇم سان تولدۇرۇلىدۇ","invalidCellSpacing":"كاتەكچە ئارىلىقى چوقۇم سان بولىدۇ","invalidCols":"بەلگىلەنگەن قۇر سانى چوقۇم نۆلدىن چوڭ بولىدۇ","invalidHeight":"جەدۋەل ئېگىزلىكى چوقۇم سان بولىدۇ","invalidRows":"بەلگىلەنگەن ئىستون سانى چوقۇم نۆلدىن چوڭ بولىدۇ","invalidWidth":"جەدۋەل كەڭلىكى چوقۇم سان بولىدۇ","menu":"جەدۋەل خاسلىقى","row":{"menu":"قۇر","insertBefore":"ئۈستىگە قۇر قىستۇر","insertAfter":"ئاستىغا قۇر قىستۇر","deleteRow":"قۇر ئۆچۈر"},"rows":"قۇر سانى","summary":"ئۈزۈندە","title":"جەدۋەل خاسلىقى","toolbar":"جەدۋەل","widthPc":"پىرسەنت","widthPx":"پىكسېل","widthUnit":"كەڭلىك بىرلىكى"},"undo":{"redo":"قايتىلا ","undo":"يېنىۋال"},"wsc":{"btnIgnore":"پەرۋا قىلما","btnIgnoreAll":"ھەممىگە پەرۋا قىلما","btnReplace":"ئالماشتۇر","btnReplaceAll":"ھەممىنى ئالماشتۇر","btnUndo":"يېنىۋال","changeTo":"ئۆزگەرت","errorLoading":"لازىملىق مۇلازىمېتىرنى يۈكلىگەندە خاتالىق كۆرۈلدى: %s.","ieSpellDownload":"ئىملا تەكشۈرۈش قىستۇرمىسى تېخى ئورنىتىلمىغان، ھازىرلا چۈشۈرەمسىز؟","manyChanges":"ئىملا تەكشۈرۈش تامام: %1  سۆزنى ئۆزگەرتتى","noChanges":"ئىملا تەكشۈرۈش تامام: ھېچقانداق سۆزنى ئۆزگەرتمىدى","noMispell":"ئىملا تەكشۈرۈش تامام: ئىملا خاتالىقى بايقالمىدى","noSuggestions":"-تەكلىپ يوق-","notAvailable":"كەچۈرۈڭ، مۇلازىمېتىرنى ۋاقتىنچە ئىشلەتكىلى بولمايدۇ","notInDic":"لۇغەتتە يوق","oneChange":"ئىملا تەكشۈرۈش تامام: بىر سۆزنى ئۆزگەرتتى","progress":"ئىملا تەكشۈرۈۋاتىدۇ…","title":"ئىملا تەكشۈر","toolbar":"ئىملا تەكشۈر"}};
\ No newline at end of file
+CKEDITOR.lang['ug']={"editor":"تەھرىرلىگۈچ","editorPanel":"مول تېكست تەھرىرلىگۈچ تاختىسى","common":{"editorHelp":"ALT+0 نى بېسىپ ياردەمنى كۆرۈڭ","browseServer":"كۆرسىتىش مۇلازىمېتىر","url":"ئەسلى ھۆججەت","protocol":"كېلىشىم","upload":"يۈكلە","uploadSubmit":"مۇلازىمېتىرغا يۈكلە","image":"سۈرەت","flash":"Flash","form":"جەدۋەل","checkbox":"كۆپ تاللاش رامكىسى","radio":"يەككە تاللاش توپچىسى","textField":"يەككە قۇر تېكىست","textarea":"كۆپ قۇر تېكىست","hiddenField":"يوشۇرۇن دائىرە","button":"توپچا","select":"تىزىم/تىزىملىك","imageButton":"سۈرەت دائىرە","notSet":"‹تەڭشەلمىگەن›","id":"ID","name":"ئات","langDir":"تىل يۆنىلىشى","langDirLtr":"سولدىن ئوڭغا (LTR)","langDirRtl":"ئوڭدىن سولغا (RTL)","langCode":"تىل كودى","longDescr":"تەپسىلىي چۈشەندۈرۈش ئادرېسى","cssClass":"ئۇسلۇب خىلىنىڭ ئاتى","advisoryTitle":"ماۋزۇ","cssStyle":"قۇر ئىچىدىكى ئۇسلۇبى","ok":"جەزملە","cancel":"ۋاز كەچ","close":"تاقا","preview":"ئالدىن كۆزەت","resize":"چوڭلۇقىنى ئۆزگەرت","generalTab":"ئادەتتىكى","advancedTab":"ئالىي","validateNumberFailed":"سان پىچىمىدا كىرگۈزۈش زۆرۈر","confirmNewPage":"نۆۋەتتىكى پۈتۈك مەزمۇنى ساقلانمىدى، يېڭى پۈتۈك قۇرامسىز؟","confirmCancel":"قىسمەن ئۆزگەرتىش ساقلانمىدى، بۇ سۆزلەشكۈنى تاقامسىز؟","options":"تاللانما","target":"نىشان كۆزنەك","targetNew":"يېڭى كۆزنەك (_blank)","targetTop":"پۈتۈن بەت (_top)","targetSelf":"مەزكۇر كۆزنەك (_self)","targetParent":"ئاتا كۆزنەك (_parent)","langDirLTR":"سولدىن ئوڭغا (LTR)","langDirRTL":"ئوڭدىن سولغا (RTL)","styles":"ئۇسلۇبلار","cssClasses":"ئۇسلۇب خىللىرى","width":"كەڭلىك","height":"ئېگىزلىك","align":"توغرىلىنىشى","alignLeft":"سول","alignRight":"ئوڭ","alignCenter":"ئوتتۇرا","alignJustify":"ئىككى تەرەپتىن توغرىلا","alignTop":"ئۈستى","alignMiddle":"ئوتتۇرا","alignBottom":"ئاستى","alignNone":"يوق","invalidValue":"ئىناۋەتسىز قىممەت.","invalidHeight":"ئېگىزلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر","invalidWidth":"كەڭلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر","invalidCssLength":"بۇ سۆز بۆلىكى چوقۇم مۇۋاپىق بولغان CSS ئۇزۇنلۇق قىممىتى بولۇشى زۆرۈر، بىرلىكى (px, %, in, cm, mm, em, ex, pt ياكى pc)","invalidHtmlLength":"بۇ سۆز بۆلىكى چوقۇم بىرىكمە HTML ئۇزۇنلۇق قىممىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px ياكى %)","invalidInlineStyle":"ئىچكى باغلانما ئۇسلۇبى چوقۇم چېكىتلىك پەش بىلەن ئايرىلغان بىر ياكى كۆپ «خاسلىق ئاتى:خاسلىق قىممىتى» پىچىمىدا بولۇشى لازىم","cssLengthTooltip":"بۇ سۆز بۆلىكى بىرىكمە CSS ئۇزۇنلۇق قىممىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px, %, in, cm, mm, em, ex, pt ياكى pc)","unavailable":"%1<span class=\\\\\"cke_accessibility\\\\\">، ئىشلەتكىلى بولمايدۇ</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"ئۆچۈر","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. نەشر ھوقۇقىغا ئىگە","dlgTitle":"CKEditor ھەققىدە","help":"$1 نى زىيارەت قىلىپ ياردەمگە ئېرىشىڭ","moreInfo":"تور تۇرايىمىزنى زىيارەت قىلىپ كېلىشىمگە ئائىت تېخىمۇ كۆپ ئۇچۇرغا ئېرىشىڭ","title":"CKEditor ھەققىدە","userGuide":"CKEditor ئىشلەتكۈچى قوللانمىسى"},"basicstyles":{"bold":"توم","italic":"يانتۇ","strike":"ئۆچۈرۈش سىزىقى","subscript":"تۆۋەن ئىندېكس","superscript":"يۇقىرى ئىندېكس","underline":"ئاستى سىزىق"},"bidi":{"ltr":"تېكىست يۆنىلىشى سولدىن ئوڭغا","rtl":"تېكىست يۆنىلىشى ئوڭدىن سولغا"},"blockquote":{"toolbar":"بۆلەك نەقىل"},"clipboard":{"copy":"كۆچۈر","copyError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كۆچۈر مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+C) ئارقىلىق تاماملاڭ","cut":"كەس","cutError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كەس مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+X) ئارقىلىق تاماملاڭ","paste":"چاپلا","pasteArea":"چاپلاش دائىرىسى","pasteMsg":"ھەرپتاختا تېز كۇنۇپكا (<STRONG>Ctrl/Cmd+V</STRONG>) نى ئىشلىتىپ مەزمۇننى تۆۋەندىكى رامكىغا كۆچۈرۈڭ، ئاندىن <STRONG>جەزملە</STRONG>نى بېسىڭ","securityMsg":"توركۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى سەۋەبىدىن بۇ تەھرىرلىگۈچ چاپلاش تاختىسىدىكى مەزمۇننى بىۋاستە زىيارەت قىلالمايدۇ، بۇ كۆزنەكتە قايتا بىر قېتىم چاپلىشىڭىز كېرەك.","title":"چاپلا"},"button":{"selectedLabel":"%1 (تاللاندى)"},"colorbutton":{"auto":"ئۆزلۈكىدىن","bgColorTitle":"تەگلىك رەڭگى","colors":{"000":"قارا","800000":"قىزغۇچ سېرىق","8B4513":"توق قوڭۇر","2F4F4F":"قارامتۇل يېشىل","008080":"كۆكۈش يېشىل","000080":"قارامتۇل كۆك","4B0082":"كۆكۈش كۈلرەڭ","696969":"قارامتۇل كۈلرەڭ","B22222":"خىش قىزىل","A52A2A":"قوڭۇر","DAA520":"ئالتۇن سېرىق","006400":"توق يېشىل","40E0D0":"كۆكۈچ يېشىل","0000CD":"ئوتتۇراھال كۆك","800080":"بىنەپشە","808080":"كۈلرەڭ","F00":"قىزىل","FF8C00":"توق قىزغۇچ سېرىق","FFD700":"ئالتۇن","008000":"يېشىل","0FF":"يېشىل كۆك","00F":"كۆك","EE82EE":"قىزغۇچ بىنەپشە","A9A9A9":"توق كۈلرەڭ","FFA07A":"كاۋا چېچىكى سېرىق","FFA500":"قىزغۇچ سېرىق","FFFF00":"سېرىق","00FF00":"Lime","AFEEEE":"سۇس ھاۋا رەڭ","ADD8E6":"ئوچۇق كۆك","DDA0DD":"قىزغۇچ بىنەپشە","D3D3D3":"سۇس كۆكۈچ كۈلرەڭ","FFF0F5":"سۇس قىزغۇچ بىنەپشە","FAEBD7":"Antique White","FFFFE0":"سۇس سېرىق","F0FFF0":"Honeydew","F0FFFF":"ئاسمان كۆكى","F0F8FF":"سۇس كۆك","E6E6FA":"سۇس بىنەپشە","FFF":"ئاق","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"باشقا رەڭ","panelTitle":"رەڭ","textColorTitle":"تېكىست رەڭگى"},"colordialog":{"clear":"تازىلا","highlight":"يورۇت","options":"رەڭ تاللانمىسى","selected":"رەڭ تاللاڭ","title":"رەڭ تاللاڭ"},"templates":{"button":"قېلىپ","emptyListMsg":"(قېلىپ يوق)","insertOption":"نۆۋەتتىكى مەزمۇننى ئالماشتۇر","options":"قېلىپ تاللانمىسى","selectPromptMsg":"تەھرىرلىگۈچنىڭ مەزمۇن قېلىپىنى تاللاڭ:","title":"مەزمۇن قېلىپى"},"contextmenu":{"options":"قىسقا يول تىزىملىك تاللانمىسى"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"ماۋزۇ","cssClassInputLabel":"ئۇسلۇب تىپىنىڭ ئاتى","edit":"DIV تەھرىر","inlineStyleInputLabel":"قۇر ئىچىدىكى ئۇسلۇبى","langDirLTRLabel":"سولدىن ئوڭغا (LTR)","langDirLabel":"تىل يۆنىلىشى","langDirRTLLabel":"ئوڭدىن سولغا (RTL)","languageCodeInputLabel":"تىل كودى","remove":"DIV چىقىرىۋەت","styleSelectLabel":"ئۇسلۇب","title":"DIV قاچا قۇر","toolbar":"DIV قاچا قۇر"},"toolbar":{"toolbarCollapse":"قورال بالداقنى قاتلا","toolbarExpand":"قورال بالداقنى ياي","toolbarGroups":{"document":"پۈتۈك","clipboard":"چاپلاش تاختىسى/يېنىۋال","editing":"تەھرىر","forms":"جەدۋەل","basicstyles":"ئاساسىي ئۇسلۇب","paragraph":"ئابزاس","links":"ئۇلانما","insert":"قىستۇر","styles":"ئۇسلۇب","colors":"رەڭ","tools":"قورال"},"toolbars":"قورال بالداق"},"elementspath":{"eleLabel":"ئېلېمېنت يولى","eleTitle":"%1 ئېلېمېنت"},"find":{"find":"ئىزدە","findOptions":"ئىزدەش تاللانمىسى","findWhat":"ئىزدە:","matchCase":"چوڭ كىچىك ھەرپنى پەرقلەندۈر","matchCyclic":"ئايلانما ماسلىشىش","matchWord":"پۈتۈن سۆز ماسلىشىش","notFoundMsg":"بەلگىلەنگەن تېكىستنى تاپالمىدى","replace":"ئالماشتۇر","replaceAll":"ھەممىنى ئالماشتۇر","replaceSuccessMsg":"جەمئى %1 جايدىكى ئالماشتۇرۇش تاماملاندى","replaceWith":"ئالماشتۇر:","title":"ئىزدەپ ئالماشتۇر"},"fakeobjects":{"anchor":"لەڭگەرلىك نۇقتا","flash":"Flash جانلاندۇرۇم","hiddenfield":"يوشۇرۇن دائىرە","iframe":"IFrame","unknown":"يوچۇن نەڭ"},"flash":{"access":"قوليازما زىيارەتكە يول قوي","accessAlways":"ھەمىشە","accessNever":"ھەرگىز","accessSameDomain":"ئوخشاش دائىرىدە","alignAbsBottom":"مۇتلەق ئاستى","alignAbsMiddle":"مۇتلەق ئوتتۇرا","alignBaseline":"ئاساسىي سىزىق","alignTextTop":"تېكىست ئۈستىدە","bgcolor":"تەگلىك رەڭگى","chkFull":"پۈتۈن ئېكراننى قوزغات","chkLoop":"دەۋرىي","chkMenu":"Flash تىزىملىكنى قوزغات","chkPlay":"ئۆزلۈكىدىن چال","flashvars":"Flash  ئۆزگەرگۈچى","hSpace":"توغرىسىغا ئارىلىق","properties":"Flash خاسلىق","propertiesTab":"خاسلىق","quality":"سۈپەت","qualityAutoHigh":"يۇقىرى (ئاپتوماتىك)","qualityAutoLow":"تۆۋەن (ئاپتوماتىك)","qualityBest":"ئەڭ ياخشى","qualityHigh":"يۇقىرى","qualityLow":"تۆۋەن","qualityMedium":"ئوتتۇرا (ئاپتوماتىك)","scale":"نىسبىتى","scaleAll":"ھەممىنى كۆرسەت","scaleFit":"قەتئىي ماسلىشىش","scaleNoBorder":"گىرۋەك يوق","title":"ماۋزۇ","vSpace":"بويىغا ئارىلىق","validateHSpace":"توغرىسىغا ئارىلىق چوقۇم سان بولىدۇ","validateSrc":"ئەسلى ھۆججەت ئادرېسىنى كىرگۈزۈڭ","validateVSpace":"بويىغا ئارىلىق چوقۇم سان بولىدۇ","windowMode":"كۆزنەك ھالىتى","windowModeOpaque":"خىرە","windowModeTransparent":"سۈزۈك","windowModeWindow":"كۆزنەك گەۋدىسى"},"font":{"fontSize":{"label":"چوڭلۇقى","voiceLabel":"خەت چوڭلۇقى","panelTitle":"چوڭلۇقى"},"label":"خەت نۇسخا","panelTitle":"خەت نۇسخا","voiceLabel":"خەت نۇسخا"},"forms":{"button":{"title":"توپچا خاسلىقى","text":"بەلگە (قىممەت)","type":"تىپى","typeBtn":"توپچا","typeSbm":"تاپشۇر","typeRst":"ئەسلىگە قايتۇر"},"checkboxAndRadio":{"checkboxTitle":"كۆپ تاللاش خاسلىقى","radioTitle":"تاق تاللاش توپچا خاسلىقى","value":"تاللىغان قىممەت","selected":"تاللانغان","required":"زۆرۈر"},"form":{"title":"جەدۋەل خاسلىقى","menu":"جەدۋەل خاسلىقى","action":"مەشغۇلات","method":"ئۇسۇل","encoding":"جەدۋەل كودلىنىشى"},"hidden":{"title":"يوشۇرۇن دائىرە خاسلىقى","name":"ئات","value":"دەسلەپكى قىممىتى"},"select":{"title":"جەدۋەل/تىزىم خاسلىقى","selectInfo":"ئۇچۇر تاللاڭ","opAvail":"تاللاش تۈرلىرى","value":"قىممەت","size":"ئېگىزلىكى","lines":"قۇر","chkMulti":"كۆپ تاللاشچان","required":"زۆرۈر","opText":"تاللانما تېكىستى","opValue":"تاللانما قىممىتى","btnAdd":"قوش","btnModify":"ئۆزگەرت","btnUp":"ئۈستىگە","btnDown":"ئاستىغا","btnSetValue":"دەسلەپكى تاللانما قىممىتىگە تەڭشە","btnDelete":"ئۆچۈر"},"textarea":{"title":" كۆپ قۇرلۇق تېكىست خاسلىقى","cols":"ھەرپ كەڭلىكى","rows":"قۇر سانى"},"textfield":{"title":"تاق قۇرلۇق تېكىست خاسلىقى","name":"ئات","value":"دەسلەپكى قىممىتى","charWidth":"ھەرپ كەڭلىكى","maxChars":"ئەڭ كۆپ ھەرپ سانى","required":"زۆرۈر","type":"تىپى","typeText":"تېكىست","typePass":"ئىم","typeEmail":"تورخەت","typeSearch":"ئىزدە","typeTel":"تېلېفون نومۇر","typeUrl":"ئادرېس"}},"format":{"label":"پىچىم","panelTitle":"پىچىم","tag_address":"ئادرېس","tag_div":"ئابزاس (DIV)","tag_h1":"ماۋزۇ 1","tag_h2":"ماۋزۇ 2","tag_h3":"ماۋزۇ 3","tag_h4":"ماۋزۇ 4","tag_h5":"ماۋزۇ 5","tag_h6":"ماۋزۇ 6","tag_p":"ئادەتتىكى","tag_pre":"تىزىلغان پىچىم"},"horizontalrule":{"toolbar":"توغرا سىزىق قىستۇر"},"iframe":{"border":"كاندۇك گىرۋەكلىرىنى كۆرسەت","noUrl":"كاندۇكنىڭ ئادرېسى(Url)نى كىرگۈزۈڭ","scrolling":"دومىلىما سۈرگۈچكە يول قوي","title":"IFrame خاسلىق","toolbar":"IFrame "},"image":{"alt":"تېكىست ئالماشتۇر","border":"گىرۋەك چوڭلۇقى","btnUpload":"مۇلازىمېتىرغا يۈكلە","button2Img":"نۆۋەتتىكى توپچىنى سۈرەتكە ئۆزگەرتەمسىز؟","hSpace":"توغرىسىغا ئارىلىقى","img2Button":"نۆۋەتتىكى سۈرەتنى توپچىغا ئۆزگەرتەمسىز؟","infoTab":"سۈرەت","linkTab":"ئۇلانما","lockRatio":"نىسبەتنى قۇلۇپلا","menu":"سۈرەت خاسلىقى","resetSize":"ئەسلى چوڭلۇق","title":"سۈرەت خاسلىقى","titleButton":"سۈرەت دائىرە خاسلىقى","upload":"يۈكلە","urlMissing":"سۈرەتنىڭ ئەسلى ھۆججەت ئادرېسى كەم","vSpace":"بويىغا ئارىلىقى","validateBorder":"گىرۋەك چوڭلۇقى چوقۇم سان بولىدۇ","validateHSpace":"توغرىسىغا ئارىلىق چوقۇم پۈتۈن سان بولىدۇ","validateVSpace":"بويىغا ئارىلىق چوقۇم پۈتۈن سان بولىدۇ"},"indent":{"indent":"تارايت","outdent":"كەڭەيت"},"smiley":{"options":"چىراي ئىپادە سىنبەلگە تاللانمىسى","title":"چىراي ئىپادە سىنبەلگە قىستۇر","toolbar":"چىراي ئىپادە"},"justify":{"block":"ئىككى تەرەپتىن توغرىلا","center":"ئوتتۇرىغا توغرىلا","left":"سولغا توغرىلا","right":"ئوڭغا توغرىلا"},"language":{"button":"تىل تەڭشەك","remove":"تىلنى چىقىرىۋەت"},"link":{"acccessKey":"زىيارەت كۇنۇپكا","advanced":"ئالىي","advisoryContentType":"مەزمۇن تىپى","advisoryTitle":"ماۋزۇ","anchor":{"toolbar":"لەڭگەرلىك نۇقتا ئۇلانمىسى قىستۇر/تەھرىرلە","menu":"لەڭگەرلىك نۇقتا ئۇلانما خاسلىقى","title":"لەڭگەرلىك نۇقتا ئۇلانما خاسلىقى","name":"لەڭگەرلىك نۇقتا ئاتى","errorName":"لەڭگەرلىك نۇقتا ئاتىنى كىرگۈزۈڭ","remove":"لەڭگەرلىك نۇقتا ئۆچۈر"},"anchorId":"لەڭگەرلىك نۇقتا ID سى بويىچە","anchorName":"لەڭگەرلىك نۇقتا ئاتى بويىچە","charset":"ھەرپ كودلىنىشى","cssClasses":"ئۇسلۇب خىلى ئاتى","download":"Force Download","displayText":"Display Text","emailAddress":"ئادرېس","emailBody":"مەزمۇن","emailSubject":"ماۋزۇ","id":"ID","info":"ئۇلانما ئۇچۇرى","langCode":"تىل كودى","langDir":"تىل يۆنىلىشى","langDirLTR":"سولدىن ئوڭغا (LTR)","langDirRTL":"ئوڭدىن سولغا (RTL)","menu":"ئۇلانما تەھرىر","name":"ئات","noAnchors":"(بۇ پۈتۈكتە ئىشلەتكىلى بولىدىغان لەڭگەرلىك نۇقتا يوق)","noEmail":"ئېلخەت ئادرېسىنى كىرگۈزۈڭ","noUrl":"ئۇلانما ئادرېسىنى كىرگۈزۈڭ","other":"‹باشقا›","popupDependent":"تەۋە (NS)","popupFeatures":"قاڭقىش كۆزنەك خاسلىقى","popupFullScreen":"پۈتۈن ئېكران (IE)","popupLeft":"سول","popupLocationBar":"ئادرېس بالداق","popupMenuBar":"تىزىملىك بالداق","popupResizable":"چوڭلۇقى ئۆزگەرتىشچان","popupScrollBars":"دومىلىما سۈرگۈچ","popupStatusBar":"ھالەت بالداق","popupToolbar":"قورال بالداق","popupTop":"ئوڭ","rel":"باغلىنىش","selectAnchor":"بىر لەڭگەرلىك نۇقتا تاللاڭ","styles":"قۇر ئىچىدىكى ئۇسلۇبى","tabIndex":"Tab تەرتىپى","target":"نىشان","targetFrame":"‹كاندۇك›","targetFrameName":"نىشان كاندۇك ئاتى","targetPopup":"‹قاڭقىش كۆزنەك›","targetPopupName":"قاڭقىش كۆزنەك ئاتى","title":"ئۇلانما","toAnchor":"بەت ئىچىدىكى لەڭگەرلىك نۇقتا ئۇلانمىسى","toEmail":"ئېلخەت","toUrl":"ئادرېس","toolbar":"ئۇلانما قىستۇر/تەھرىرلە","type":"ئۇلانما تىپى","unlink":"ئۇلانما بىكار قىل","upload":"يۈكلە"},"list":{"bulletedlist":"تۈر بەلگە تىزىمى","numberedlist":"تەرتىپ نومۇر تىزىمى"},"liststyle":{"armenian":"قەدىمكى ئەرمىنىيە تەرتىپ نومۇرى شەكلى","bulletedTitle":"تۈر بەلگە تىزىم خاسلىقى","circle":"بوش چەمبەر","decimal":"سان (1, 2, 3 قاتارلىق)","decimalLeadingZero":"نۆلدىن باشلانغان سان بەلگە (01, 02, 03 قاتارلىق)","disc":"تولدۇرۇلغان چەمبەر","georgian":"قەدىمكى جورجىيە تەرتىپ نومۇرى شەكلى (an, ban, gan قاتارلىق)","lowerAlpha":"ئىنگلىزچە كىچىك ھەرپ (a, b, c, d, e قاتارلىق)","lowerGreek":"گرېكچە كىچىك ھەرپ (alpha, beta, gamma قاتارلىق)","lowerRoman":"كىچىك ھەرپلىك رىم رەقىمى (i, ii, iii, iv, v قاتارلىق)","none":"بەلگە يوق","notset":"‹تەڭشەلمىگەن›","numberedTitle":"تەرتىپ نومۇر تىزىم خاسلىقى","square":"تولدۇرۇلغان تۆت چاسا","start":"باشلىنىش نومۇرى","type":"بەلگە تىپى","upperAlpha":"ئىنگلىزچە چوڭ ھەرپ (A, B, C, D, E قاتارلىق)","upperRoman":"چوڭ ھەرپلىك رىم رەقىمى (I, II, III, IV, V قاتارلىق)","validateStartNumber":"تىزىم باشلىنىش تەرتىپ نومۇرى چوقۇم پۈتۈن سان پىچىمىدا بولۇشى لازىم"},"magicline":{"title":"بۇ جايغا ئابزاس قىستۇر"},"maximize":{"maximize":"چوڭايت","minimize":"كىچىكلەت"},"newpage":{"toolbar":"يېڭى بەت"},"pagebreak":{"alt":"بەت ئايرىغۇچ","toolbar":"بەت ئايرىغۇچ قىستۇر"},"pastetext":{"button":"پىچىمى يوق تېكىست سۈپىتىدە چاپلا","title":"پىچىمى يوق تېكىست سۈپىتىدە چاپلا"},"pastefromword":{"confirmCleanup":"سىز چاپلىماقچى بولغان مەزمۇن MS Word تىن كەلگەندەك قىلىدۇ، MS Word پىچىمىنى تازىلىۋەتكەندىن كېيىن ئاندىن چاپلامدۇ؟","error":"ئىچكى خاتالىق سەۋەبىدىن چاپلايدىغان سانلىق مەلۇماتنى تازىلىيالمايدۇ","title":"MS Word تىن چاپلا","toolbar":"MS Word تىن چاپلا"},"preview":{"preview":"ئالدىن كۆزەت"},"print":{"toolbar":"باس "},"removeformat":{"toolbar":"پىچىمنى چىقىرىۋەت"},"save":{"toolbar":"ساقلا"},"selectall":{"toolbar":"ھەممىنى تاللا"},"showblocks":{"toolbar":"بۆلەكنى كۆرسەت"},"sourcearea":{"toolbar":"مەنبە"},"specialchar":{"options":"ئالاھىدە ھەرپ تاللانمىسى","title":"ئالاھىدە ھەرپ تاللاڭ","toolbar":"ئالاھىدە ھەرپ قىستۇر"},"scayt":{"btn_about":"شۇئان ئىملا تەكشۈرۈش ھەققىدە","btn_dictionaries":"لۇغەت","btn_disable":"شۇئان ئىملا تەكشۈرۈشنى چەكلە","btn_enable":"شۇئان ئىملا تەكشۈرۈشنى قوزغات","btn_langs":"تىل","btn_options":"تاللانما","text_title":"شۇئان ئىملا تەكشۈر"},"stylescombo":{"label":"ئۇسلۇب","panelTitle":"ئۇسلۇب","panelTitle1":"بۆلەك دەرىجىسىدىكى ئېلېمېنت ئۇسلۇبى","panelTitle2":"ئىچكى باغلانما ئېلېمېنت ئۇسلۇبى","panelTitle3":"نەڭ (Object) ئېلېمېنت ئۇسلۇبى"},"table":{"border":"گىرۋەك","caption":"ماۋزۇ","cell":{"menu":"كاتەكچە","insertBefore":"سولغا كاتەكچە قىستۇر","insertAfter":"ئوڭغا كاتەكچە قىستۇر","deleteCell":"كەتەكچە ئۆچۈر","merge":"كاتەكچە بىرلەشتۈر","mergeRight":"كاتەكچىنى ئوڭغا بىرلەشتۈر","mergeDown":"كاتەكچىنى ئاستىغا بىرلەشتۈر","splitHorizontal":"كاتەكچىنى توغرىسىغا بىرلەشتۈر","splitVertical":"كاتەكچىنى بويىغا بىرلەشتۈر","title":"كاتەكچە خاسلىقى","cellType":"كاتەكچە تىپى","rowSpan":"بويىغا چات ئارىسى قۇر سانى","colSpan":"توغرىسىغا چات ئارىسى ئىستون سانى","wordWrap":"ئۆزلۈكىدىن قۇر قاتلا","hAlign":"توغرىسىغا توغرىلا","vAlign":"بويىغا توغرىلا","alignBaseline":"ئاساسىي سىزىق","bgColor":"تەگلىك رەڭگى","borderColor":"گىرۋەك رەڭگى","data":"سانلىق مەلۇمات","header":"جەدۋەل باشى","yes":"ھەئە","no":"ياق","invalidWidth":"كاتەكچە كەڭلىكى چوقۇم سان بولىدۇ","invalidHeight":"كاتەكچە ئېگىزلىكى چوقۇم سان بولىدۇ","invalidRowSpan":"قۇر چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ ","invalidColSpan":"ئىستون چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ","chooseColor":"تاللاڭ"},"cellPad":"يان ئارىلىق","cellSpace":"ئارىلىق","column":{"menu":"ئىستون","insertBefore":"سولغا ئىستون قىستۇر","insertAfter":"ئوڭغا ئىستون قىستۇر","deleteColumn":"ئىستون ئۆچۈر"},"columns":"ئىستون سانى","deleteTable":"جەدۋەل ئۆچۈر","headers":"ماۋزۇ كاتەكچە","headersBoth":"بىرىنچى ئىستون ۋە بىرىنچى قۇر","headersColumn":"بىرىنچى ئىستون","headersNone":"يوق","headersRow":"بىرىنچى قۇر","invalidBorder":"گىرۋەك توملۇقى چوقۇم سان بولىدۇ","invalidCellPadding":"كاتەكچىگە چوقۇم سان تولدۇرۇلىدۇ","invalidCellSpacing":"كاتەكچە ئارىلىقى چوقۇم سان بولىدۇ","invalidCols":"بەلگىلەنگەن قۇر سانى چوقۇم نۆلدىن چوڭ بولىدۇ","invalidHeight":"جەدۋەل ئېگىزلىكى چوقۇم سان بولىدۇ","invalidRows":"بەلگىلەنگەن ئىستون سانى چوقۇم نۆلدىن چوڭ بولىدۇ","invalidWidth":"جەدۋەل كەڭلىكى چوقۇم سان بولىدۇ","menu":"جەدۋەل خاسلىقى","row":{"menu":"قۇر","insertBefore":"ئۈستىگە قۇر قىستۇر","insertAfter":"ئاستىغا قۇر قىستۇر","deleteRow":"قۇر ئۆچۈر"},"rows":"قۇر سانى","summary":"ئۈزۈندە","title":"جەدۋەل خاسلىقى","toolbar":"جەدۋەل","widthPc":"پىرسەنت","widthPx":"پىكسېل","widthUnit":"كەڭلىك بىرلىكى"},"undo":{"redo":"قايتىلا ","undo":"يېنىۋال"},"wsc":{"btnIgnore":"پەرۋا قىلما","btnIgnoreAll":"ھەممىگە پەرۋا قىلما","btnReplace":"ئالماشتۇر","btnReplaceAll":"ھەممىنى ئالماشتۇر","btnUndo":"يېنىۋال","changeTo":"ئۆزگەرت","errorLoading":"لازىملىق مۇلازىمېتىرنى يۈكلىگەندە خاتالىق كۆرۈلدى: %s.","ieSpellDownload":"ئىملا تەكشۈرۈش قىستۇرمىسى تېخى ئورنىتىلمىغان، ھازىرلا چۈشۈرەمسىز؟","manyChanges":"ئىملا تەكشۈرۈش تامام: %1  سۆزنى ئۆزگەرتتى","noChanges":"ئىملا تەكشۈرۈش تامام: ھېچقانداق سۆزنى ئۆزگەرتمىدى","noMispell":"ئىملا تەكشۈرۈش تامام: ئىملا خاتالىقى بايقالمىدى","noSuggestions":"-تەكلىپ يوق-","notAvailable":"كەچۈرۈڭ، مۇلازىمېتىرنى ۋاقتىنچە ئىشلەتكىلى بولمايدۇ","notInDic":"لۇغەتتە يوق","oneChange":"ئىملا تەكشۈرۈش تامام: بىر سۆزنى ئۆزگەرتتى","progress":"ئىملا تەكشۈرۈۋاتىدۇ…","title":"ئىملا تەكشۈر","toolbar":"ئىملا تەكشۈر"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/lang/uk.js
index 35d4b7cab48..768a938ec92 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/uk.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/uk.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['uk']={"editor":"Текстовий редактор","editorPanel":"Панель текстового редактора","common":{"editorHelp":"натисніть ALT 0 для довідки","browseServer":"Огляд Сервера","url":"URL","protocol":"Протокол","upload":"Надіслати","uploadSubmit":"Надіслати на сервер","image":"Зображення","flash":"Flash","form":"Форма","checkbox":"Галочка","radio":"Кнопка вибору","textField":"Текстове поле","textarea":"Текстова область","hiddenField":"Приховане поле","button":"Кнопка","select":"Список","imageButton":"Кнопка із зображенням","notSet":"<не визначено>","id":"Ідентифікатор","name":"Ім'я","langDir":"Напрямок мови","langDirLtr":"Зліва направо (LTR)","langDirRtl":"Справа наліво (RTL)","langCode":"Код мови","longDescr":"Довгий опис URL","cssClass":"Клас CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль CSS","ok":"ОК","cancel":"Скасувати","close":"Закрити","preview":"Попередній перегляд","resize":"Потягніть для зміни розмірів","generalTab":"Основне","advancedTab":"Додаткове","validateNumberFailed":"Значення не є цілим числом.","confirmNewPage":"Всі незбережені зміни будуть втрачені. Ви впевнені, що хочете завантажити нову сторінку?","confirmCancel":"Деякі опції змінено. Закрити вікно без збереження змін?","options":"Опції","target":"Ціль","targetNew":"Нове вікно (_blank)","targetTop":"Поточне вікно (_top)","targetSelf":"Поточний фрейм/вікно (_self)","targetParent":"Батьківський фрейм/вікно (_parent)","langDirLTR":"Зліва направо (LTR)","langDirRTL":"Справа наліво (RTL)","styles":"Стиль CSS","cssClasses":"Клас CSS","width":"Ширина","height":"Висота","align":"Вирівнювання","alignLeft":"По лівому краю","alignRight":"По правому краю","alignCenter":"По центру","alignJustify":"По ширині","alignTop":"По верхньому краю","alignMiddle":"По середині","alignBottom":"По нижньому краю","alignNone":"Нема","invalidValue":"Невірне значення.","invalidHeight":"Висота повинна бути цілим числом.","invalidWidth":"Ширина повинна бути цілим числом.","invalidCssLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру CSS блоку (px, %, in, cm, mm, em, ex, pt або pc).","invalidHtmlLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру HTML блоку (px або %).","invalidInlineStyle":"Значення, вказане для вбудованого стилю повинне складатися з одного чи кількох кортежів у форматі \"ім'я : значення\", розділених крапкою з комою.","cssLengthTooltip":"Введіть номер значення в пікселях або число з дійсною одиниці CSS (px, %, in, cm, mm, em, ex, pt або pc).","unavailable":"%1<span class=\"cke_accessibility\">, не доступне</span>"},"about":{"copy":"Copyright &copy; $1. Всі права застережено.","dlgTitle":"Про CKEditor","help":"Перевірте $1 для допомоги.","moreInfo":"Щодо інформації з ліцензування завітайте на наш сайт:","title":"Про CKEditor","userGuide":"Інструкція Користувача для CKEditor"},"basicstyles":{"bold":"Жирний","italic":"Курсив","strike":"Закреслений","subscript":"Нижній індекс","superscript":"Верхній індекс","underline":"Підкреслений"},"bidi":{"ltr":"Напрямок тексту зліва направо","rtl":"Напрямок тексту справа наліво"},"blockquote":{"toolbar":"Цитата"},"clipboard":{"copy":"Копіювати","copyError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції копіювання. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+C).","cut":"Вирізати","cutError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції вирізування. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+X)","paste":"Вставити","pasteArea":"Область вставки","pasteMsg":"Будь ласка, вставте інформацію з буфера обміну в цю область, користуючись комбінацією клавіш (<STRONG>Ctrl/Cmd+V</STRONG>), та натисніть <STRONG>OK</STRONG>.","securityMsg":"Редактор не може отримати прямий доступ до буферу обміну у зв'язку з налаштуваннями Вашого браузера. Вам потрібно вставити інформацію в це вікно.","title":"Вставити"},"button":{"selectedLabel":"%1 (Вибрано)"},"colorbutton":{"auto":"Авто","bgColorTitle":"Колір фону","colors":{"000":"Чорний","800000":"Бордовий","8B4513":"Коричневий","2F4F4F":"Темний сіро-зелений","008080":"Морської хвилі","000080":"Сливовий","4B0082":"Індиго","696969":"Темносірий","B22222":"Темночервоний","A52A2A":"Каштановий","DAA520":"Бежевий","006400":"Темнозелений","40E0D0":"Бірюзовий","0000CD":"Темносиній","800080":"Пурпурний","808080":"Сірий","F00":"Червоний","FF8C00":"Темнооранжевий","FFD700":"Жовтий","008000":"Зелений","0FF":"Синьо-зелений","00F":"Синій","EE82EE":"Фіолетовий","A9A9A9":"Світлосірий","FFA07A":"Рожевий","FFA500":"Оранжевий","FFFF00":"Яскравожовтий","00FF00":"Салатовий","AFEEEE":"Світлобірюзовий","ADD8E6":"Блакитний","DDA0DD":"Світлофіолетовий","D3D3D3":"Сріблястий","FFF0F5":"Світлорожевий","FAEBD7":"Світлооранжевий","FFFFE0":"Світложовтий","F0FFF0":"Світлозелений","F0FFFF":"Світлий синьо-зелений","F0F8FF":"Світлоблакитний","E6E6FA":"Лавандовий","FFF":"Білий"},"more":"Кольори...","panelTitle":"Кольори","textColorTitle":"Колір тексту"},"colordialog":{"clear":"Очистити","highlight":"Колір, на який вказує курсор","options":"Опції кольорів","selected":"Обраний колір","title":"Обрати колір"},"templates":{"button":"Шаблони","emptyListMsg":"(Не знайдено жодного шаблону)","insertOption":"Замінити поточний вміст","options":"Опції шаблону","selectPromptMsg":"Оберіть, будь ласка, шаблон для відкриття в редакторі<br>(поточний зміст буде втрачено):","title":"Шаблони змісту"},"contextmenu":{"options":"Опції контекстного меню"},"div":{"IdInputLabel":"Ідентифікатор","advisoryTitleInputLabel":"Зміст випливаючої підказки","cssClassInputLabel":"Клас CSS","edit":"Редагувати блок","inlineStyleInputLabel":"Вписаний стиль","langDirLTRLabel":"Зліва направо (LTR)","langDirLabel":"Напрямок мови","langDirRTLLabel":"Справа наліво (RTL)","languageCodeInputLabel":"Код мови","remove":"Видалити блок","styleSelectLabel":"Стиль CSS","title":"Створити блок-контейнер","toolbar":"Створити блок-контейнер"},"toolbar":{"toolbarCollapse":"Згорнути панель інструментів","toolbarExpand":"Розгорнути панель інструментів","toolbarGroups":{"document":"Документ","clipboard":"Буфер обміну / Скасувати","editing":"Редагування","forms":"Форми","basicstyles":"Основний Стиль","paragraph":"Параграф","links":"Посилання","insert":"Вставити","styles":"Стилі","colors":"Кольори","tools":"Інструменти"},"toolbars":"Панель інструментів редактора"},"elementspath":{"eleLabel":"Шлях","eleTitle":"%1 елемент"},"find":{"find":"Пошук","findOptions":"Параметри Пошуку","findWhat":"Шукати:","matchCase":"Враховувати регістр","matchCyclic":"Циклічна заміна","matchWord":"Збіг цілих слів","notFoundMsg":"Вказаний текст не знайдено.","replace":"Заміна","replaceAll":"Замінити все","replaceSuccessMsg":"%1 співпадінь(ня) замінено.","replaceWith":"Замінити на:","title":"Знайти і замінити"},"fakeobjects":{"anchor":"Якір","flash":"Flash-анімація","hiddenfield":"Приховані Поля","iframe":"IFrame","unknown":"Невідомий об'єкт"},"flash":{"access":"Доступ до скрипта","accessAlways":"Завжди","accessNever":"Ніколи","accessSameDomain":"З того ж домена","alignAbsBottom":"По нижньому краю (abs)","alignAbsMiddle":"По середині (abs)","alignBaseline":"По базовій лінії","alignTextTop":"Текст по верхньому краю","bgcolor":"Колір фону","chkFull":"Дозволити повноекранний перегляд","chkLoop":"Циклічно","chkMenu":"Дозволити меню Flash","chkPlay":"Автопрогравання","flashvars":"Змінні Flash","hSpace":"Гориз. відступ","properties":"Властивості Flash","propertiesTab":"Властивості","quality":"Якість","qualityAutoHigh":"Автом. відмінна","qualityAutoLow":"Автом. низька","qualityBest":"Відмінна","qualityHigh":"Висока","qualityLow":"Низька","qualityMedium":"Середня","scale":"Масштаб","scaleAll":"Показати все","scaleFit":"Поч. розмір","scaleNoBorder":"Без рамки","title":"Властивості Flash","vSpace":"Верт. відступ","validateHSpace":"Гориз. відступ повинен бути цілим числом.","validateSrc":"URL посилання не може бути порожнім.","validateVSpace":"Верт. відступ повинен бути цілим числом.","windowMode":"Віконний режим","windowModeOpaque":"Непрозорість","windowModeTransparent":"Прозорість","windowModeWindow":"Вікно"},"font":{"fontSize":{"label":"Розмір","voiceLabel":"Розмір шрифту","panelTitle":"Розмір"},"label":"Шрифт","panelTitle":"Шрифт","voiceLabel":"Шрифт"},"forms":{"button":{"title":"Властивості кнопки","text":"Значення","type":"Тип","typeBtn":"Кнопка (button)","typeSbm":"Надіслати (submit)","typeRst":"Очистити (reset)"},"checkboxAndRadio":{"checkboxTitle":"Властивості галочки","radioTitle":"Властивості кнопки вибору","value":"Значення","selected":"Обрана","required":"Обов’язкове поле"},"form":{"title":"Властивості форми","menu":"Властивості форми","action":"Дія","method":"Метод","encoding":"Кодування"},"hidden":{"title":"Властивості прихованого поля","name":"Ім'я","value":"Значення"},"select":{"title":"Властивості списку","selectInfo":"Інфо","opAvail":"Доступні варіанти","value":"Значення","size":"Кількість","lines":"видимих позицій у списку","chkMulti":"Список з мультивибором","required":"Обов’язкове поле","opText":"Текст","opValue":"Значення","btnAdd":"Добавити","btnModify":"Змінити","btnUp":"Вгору","btnDown":"Вниз","btnSetValue":"Встановити як обране значення","btnDelete":"Видалити"},"textarea":{"title":"Властивості текстової області","cols":"Стовбці","rows":"Рядки"},"textfield":{"title":"Властивості текстового поля","name":"Ім'я","value":"Значення","charWidth":"Ширина","maxChars":"Макс. к-ть символів","required":"Обов’язкове поле","type":"Тип","typeText":"Текст","typePass":"Пароль","typeEmail":"Пошта","typeSearch":"Пошук","typeTel":"Мобільний","typeUrl":"URL"}},"format":{"label":"Форматування","panelTitle":"Форматування параграфа","tag_address":"Адреса","tag_div":"Нормальний (div)","tag_h1":"Заголовок 1","tag_h2":"Заголовок 2","tag_h3":"Заголовок 3","tag_h4":"Заголовок 4","tag_h5":"Заголовок 5","tag_h6":"Заголовок 6","tag_p":"Нормальний","tag_pre":"Форматований"},"horizontalrule":{"toolbar":"Горизонтальна лінія"},"iframe":{"border":"Показати рамки фрейму","noUrl":"Будь ласка введіть URL посилання для IFrame","scrolling":"Увімкнути прокрутку","title":"Налаштування для IFrame","toolbar":"IFrame"},"image":{"alt":"Альтернативний текст","border":"Рамка","btnUpload":"Надіслати на сервер","button2Img":"Бажаєте перетворити обрану кнопку-зображення на просте зображення?","hSpace":"Гориз. відступ","img2Button":"Бажаєте перетворити обране зображення на кнопку-зображення?","infoTab":"Інформація про зображення","linkTab":"Посилання","lockRatio":"Зберегти пропорції","menu":"Властивості зображення","resetSize":"Очистити поля розмірів","title":"Властивості зображення","titleButton":"Властивості кнопки із зображенням","upload":"Надіслати","urlMissing":"Вкажіть URL зображення.","vSpace":"Верт. відступ","validateBorder":"Ширина рамки повинна бути цілим числом.","validateHSpace":"Гориз. відступ повинен бути цілим числом.","validateVSpace":"Верт. відступ повинен бути цілим числом."},"indent":{"indent":"Збільшити відступ","outdent":"Зменшити відступ"},"smiley":{"options":"Опції смайликів","title":"Вставити смайлик","toolbar":"Смайлик"},"justify":{"block":"По ширині","center":"По центру","left":"По лівому краю","right":"По правому краю"},"language":{"button":"Установити мову","remove":"Вилучити мову"},"link":{"acccessKey":"Гаряча клавіша","advanced":"Додаткове","advisoryContentType":"Тип вмісту","advisoryTitle":"Заголовок","anchor":{"toolbar":"Вставити/Редагувати якір","menu":"Властивості якоря","title":"Властивості якоря","name":"Ім'я якоря","errorName":"Будь ласка, вкажіть ім'я якоря","remove":"Прибрати якір"},"anchorId":"За ідентифікатором елементу","anchorName":"За ім'ям елементу","charset":"Кодування","cssClasses":"Клас CSS","emailAddress":"Адреса ел. пошти","emailBody":"Тіло повідомлення","emailSubject":"Тема листа","id":"Ідентифікатор","info":"Інформація посилання","langCode":"Код мови","langDir":"Напрямок мови","langDirLTR":"Зліва направо (LTR)","langDirRTL":"Справа наліво (RTL)","menu":"Вставити посилання","name":"Ім'я","noAnchors":"(В цьому документі немає якорів)","noEmail":"Будь ласка, вкажіть адрес ел. пошти","noUrl":"Будь ласка, вкажіть URL посилання","other":"<інший>","popupDependent":"Залежний (Netscape)","popupFeatures":"Властивості випливаючого вікна","popupFullScreen":"Повний екран (IE)","popupLeft":"Позиція зліва","popupLocationBar":"Панель локації","popupMenuBar":"Панель меню","popupResizable":"Масштабоване","popupScrollBars":"Стрічки прокрутки","popupStatusBar":"Рядок статусу","popupToolbar":"Панель інструментів","popupTop":"Позиція зверху","rel":"Зв'язок","selectAnchor":"Оберіть якір","styles":"Стиль CSS","tabIndex":"Послідовність переходу","target":"Ціль","targetFrame":"<фрейм>","targetFrameName":"Ім'я цільового фрейму","targetPopup":"<випливаюче вікно>","targetPopupName":"Ім'я випливаючого вікна","title":"Посилання","toAnchor":"Якір на цю сторінку","toEmail":"Ел. пошта","toUrl":"URL","toolbar":"Вставити/Редагувати посилання","type":"Тип посилання","unlink":"Видалити посилання","upload":"Надіслати"},"list":{"bulletedlist":"Маркірований список","numberedlist":"Нумерований список"},"liststyle":{"armenian":"Вірменська нумерація","bulletedTitle":"Опції маркованого списку","circle":"Кільце","decimal":"Десяткові (1, 2, 3 і т.д.)","decimalLeadingZero":"Десяткові з нулем (01, 02, 03 і т.д.)","disc":"Кружечок","georgian":"Грузинська нумерація (an, ban, gan і т.д.)","lowerAlpha":"Малі лат. букви (a, b, c, d, e і т.д.)","lowerGreek":"Малі гр. букви (альфа, бета, гамма і т.д.)","lowerRoman":"Малі римські (i, ii, iii, iv, v і т.д.)","none":"Нема","notset":"<не вказано>","numberedTitle":"Опції нумерованого списку","square":"Квадратик","start":"Почати з...","type":"Тип","upperAlpha":"Великі лат. букви (A, B, C, D, E і т.д.)","upperRoman":"Великі римські (I, II, III, IV, V і т.д.)","validateStartNumber":"Початковий номер списку повинен бути цілим числом."},"magicline":{"title":"Вставити абзац"},"maximize":{"maximize":"Максимізувати","minimize":"Мінімізувати"},"newpage":{"toolbar":"Нова сторінка"},"pagebreak":{"alt":"Розрив Сторінки","toolbar":"Вставити розрив сторінки"},"pastetext":{"button":"Вставити тільки текст","title":"Вставити тільки текст"},"pastefromword":{"confirmCleanup":"Текст, що Ви намагаєтесь вставити, схожий на скопійований з Word. Бажаєте очистити його форматування перед вставлянням?","error":"Неможливо очистити форматування через внутрішню помилку.","title":"Вставити з Word","toolbar":"Вставити з Word"},"preview":{"preview":"Попередній перегляд"},"print":{"toolbar":"Друк"},"removeformat":{"toolbar":"Видалити форматування"},"save":{"toolbar":"Зберегти"},"selectall":{"toolbar":"Виділити все"},"showblocks":{"toolbar":"Показувати блоки"},"sourcearea":{"toolbar":"Джерело"},"specialchar":{"options":"Опції","title":"Оберіть спеціальний символ","toolbar":"Спеціальний символ"},"scayt":{"btn_about":"Про SCAYT","btn_dictionaries":"Словники","btn_disable":"Вимкнути SCAYT","btn_enable":"Ввімкнути SCAYT","btn_langs":"Мови","btn_options":"Опції","text_title":"Перефірка орфографії по мірі набору"},"stylescombo":{"label":"Стиль","panelTitle":"Стилі форматування","panelTitle1":"Блочні стилі","panelTitle2":"Рядкові стилі","panelTitle3":"Об'єктні стилі"},"table":{"border":"Розмір рамки","caption":"Заголовок таблиці","cell":{"menu":"Комірки","insertBefore":"Вставити комірку перед","insertAfter":"Вставити комірку після","deleteCell":"Видалити комірки","merge":"Об'єднати комірки","mergeRight":"Об'єднати справа","mergeDown":"Об'єднати донизу","splitHorizontal":"Розділити комірку по горизонталі","splitVertical":"Розділити комірку по вертикалі","title":"Властивості комірки","cellType":"Тип комірки","rowSpan":"Об'єднання рядків","colSpan":"Об'єднання стовпців","wordWrap":"Автоперенесення тексту","hAlign":"Гориз. вирівнювання","vAlign":"Верт. вирівнювання","alignBaseline":"По базовій лінії","bgColor":"Колір фону","borderColor":"Колір рамки","data":"Дані","header":"Заголовок","yes":"Так","no":"Ні","invalidWidth":"Ширина комірки повинна бути цілим числом.","invalidHeight":"Висота комірки повинна бути цілим числом.","invalidRowSpan":"Кількість об'єднуваних рядків повинна бути цілим числом.","invalidColSpan":"Кількість об'єднуваних стовбців повинна бути цілим числом.","chooseColor":"Обрати"},"cellPad":"Внутр. відступ","cellSpace":"Проміжок","column":{"menu":"Стовбці","insertBefore":"Вставити стовбець перед","insertAfter":"Вставити стовбець після","deleteColumn":"Видалити стовбці"},"columns":"Стовбці","deleteTable":"Видалити таблицю","headers":"Заголовки стовбців/рядків","headersBoth":"Стовбці і рядки","headersColumn":"Стовбці","headersNone":"Без заголовків","headersRow":"Рядки","invalidBorder":"Розмір рамки повинен бути цілим числом.","invalidCellPadding":"Внутр. відступ комірки повинен бути цілим числом.","invalidCellSpacing":"Проміжок між комірками повинен бути цілим числом.","invalidCols":"Кількість стовбців повинна бути більшою 0.","invalidHeight":"Висота таблиці повинна бути цілим числом.","invalidRows":"Кількість рядків повинна бути більшою 0.","invalidWidth":"Ширина таблиці повинна бути цілим числом.","menu":"Властивості таблиці","row":{"menu":"Рядки","insertBefore":"Вставити рядок перед","insertAfter":"Вставити рядок після","deleteRow":"Видалити рядки"},"rows":"Рядки","summary":"Детальний опис заголовку таблиці","title":"Властивості таблиці","toolbar":"Таблиця","widthPc":"відсотків","widthPx":"пікселів","widthUnit":"Одиниці вимір."},"undo":{"redo":"Повторити","undo":"Повернути"},"wsc":{"btnIgnore":"Пропустити","btnIgnoreAll":"Пропустити все","btnReplace":"Замінити","btnReplaceAll":"Замінити все","btnUndo":"Назад","changeTo":"Замінити на","errorLoading":"Помилка завантаження : %s.","ieSpellDownload":"Модуль перевірки орфографії не встановлено. Бажаєте завантажити його зараз?","manyChanges":"Перевірку орфографії завершено: 1% слів(ова) змінено","noChanges":"Перевірку орфографії завершено: жодне слово не змінено","noMispell":"Перевірку орфографії завершено: помилок не знайдено","noSuggestions":"- немає варіантів -","notAvailable":"Вибачте, але сервіс наразі недоступний.","notInDic":"Немає в словнику","oneChange":"Перевірку орфографії завершено: змінено одне слово","progress":"Виконується перевірка орфографії...","title":"Перевірка орфографії","toolbar":"Перевірити орфографію"}};
\ No newline at end of file
+CKEDITOR.lang['uk']={"editor":"Текстовий редактор","editorPanel":"Панель текстового редактора","common":{"editorHelp":"натисніть ALT 0 для довідки","browseServer":"Огляд Сервера","url":"URL","protocol":"Протокол","upload":"Надіслати","uploadSubmit":"Надіслати на сервер","image":"Зображення","flash":"Flash","form":"Форма","checkbox":"Галочка","radio":"Кнопка вибору","textField":"Текстове поле","textarea":"Текстова область","hiddenField":"Приховане поле","button":"Кнопка","select":"Список","imageButton":"Кнопка із зображенням","notSet":"<не визначено>","id":"Ідентифікатор","name":"Ім'я","langDir":"Напрямок мови","langDirLtr":"Зліва направо (LTR)","langDirRtl":"Справа наліво (RTL)","langCode":"Код мови","longDescr":"Довгий опис URL","cssClass":"Клас CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль CSS","ok":"ОК","cancel":"Скасувати","close":"Закрити","preview":"Попередній перегляд","resize":"Потягніть для зміни розмірів","generalTab":"Основне","advancedTab":"Додаткове","validateNumberFailed":"Значення не є цілим числом.","confirmNewPage":"Всі незбережені зміни будуть втрачені. Ви впевнені, що хочете завантажити нову сторінку?","confirmCancel":"Деякі опції змінено. Закрити вікно без збереження змін?","options":"Опції","target":"Ціль","targetNew":"Нове вікно (_blank)","targetTop":"Поточне вікно (_top)","targetSelf":"Поточний фрейм/вікно (_self)","targetParent":"Батьківський фрейм/вікно (_parent)","langDirLTR":"Зліва направо (LTR)","langDirRTL":"Справа наліво (RTL)","styles":"Стиль CSS","cssClasses":"Клас CSS","width":"Ширина","height":"Висота","align":"Вирівнювання","alignLeft":"По лівому краю","alignRight":"По правому краю","alignCenter":"По центру","alignJustify":"По ширині","alignTop":"По верхньому краю","alignMiddle":"По середині","alignBottom":"По нижньому краю","alignNone":"Нема","invalidValue":"Невірне значення.","invalidHeight":"Висота повинна бути цілим числом.","invalidWidth":"Ширина повинна бути цілим числом.","invalidCssLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру CSS блоку (px, %, in, cm, mm, em, ex, pt або pc).","invalidHtmlLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру HTML блоку (px або %).","invalidInlineStyle":"Значення, вказане для вбудованого стилю повинне складатися з одного чи кількох кортежів у форматі \"ім'я : значення\", розділених крапкою з комою.","cssLengthTooltip":"Введіть номер значення в пікселях або число з дійсною одиниці CSS (px, %, in, cm, mm, em, ex, pt або pc).","unavailable":"%1<span class=\"cke_accessibility\">, не доступне</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Видалити","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Всі права застережено.","dlgTitle":"Про CKEditor","help":"Перевірте $1 для допомоги.","moreInfo":"Щодо інформації з ліцензування завітайте на наш сайт:","title":"Про CKEditor","userGuide":"Інструкція Користувача для CKEditor"},"basicstyles":{"bold":"Жирний","italic":"Курсив","strike":"Закреслений","subscript":"Нижній індекс","superscript":"Верхній індекс","underline":"Підкреслений"},"bidi":{"ltr":"Напрямок тексту зліва направо","rtl":"Напрямок тексту справа наліво"},"blockquote":{"toolbar":"Цитата"},"clipboard":{"copy":"Копіювати","copyError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції копіювання. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+C).","cut":"Вирізати","cutError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції вирізування. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+X)","paste":"Вставити","pasteArea":"Область вставки","pasteMsg":"Будь ласка, вставте інформацію з буфера обміну в цю область, користуючись комбінацією клавіш (<STRONG>Ctrl/Cmd+V</STRONG>), та натисніть <STRONG>OK</STRONG>.","securityMsg":"Редактор не може отримати прямий доступ до буферу обміну у зв'язку з налаштуваннями Вашого браузера. Вам потрібно вставити інформацію в це вікно.","title":"Вставити"},"button":{"selectedLabel":"%1 (Вибрано)"},"colorbutton":{"auto":"Авто","bgColorTitle":"Колір фону","colors":{"000":"Чорний","800000":"Бордовий","8B4513":"Коричневий","2F4F4F":"Темний сіро-зелений","008080":"Морської хвилі","000080":"Сливовий","4B0082":"Індиго","696969":"Темносірий","B22222":"Темночервоний","A52A2A":"Каштановий","DAA520":"Бежевий","006400":"Темнозелений","40E0D0":"Бірюзовий","0000CD":"Темносиній","800080":"Пурпурний","808080":"Сірий","F00":"Червоний","FF8C00":"Темнооранжевий","FFD700":"Жовтий","008000":"Зелений","0FF":"Синьо-зелений","00F":"Синій","EE82EE":"Фіолетовий","A9A9A9":"Світлосірий","FFA07A":"Рожевий","FFA500":"Оранжевий","FFFF00":"Яскравожовтий","00FF00":"Салатовий","AFEEEE":"Світлобірюзовий","ADD8E6":"Блакитний","DDA0DD":"Світлофіолетовий","D3D3D3":"Сріблястий","FFF0F5":"Світлорожевий","FAEBD7":"Світлооранжевий","FFFFE0":"Світложовтий","F0FFF0":"Світлозелений","F0FFFF":"Світлий синьо-зелений","F0F8FF":"Світлоблакитний","E6E6FA":"Лавандовий","FFF":"Білий","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Кольори...","panelTitle":"Кольори","textColorTitle":"Колір тексту"},"colordialog":{"clear":"Очистити","highlight":"Колір, на який вказує курсор","options":"Опції кольорів","selected":"Обраний колір","title":"Обрати колір"},"templates":{"button":"Шаблони","emptyListMsg":"(Не знайдено жодного шаблону)","insertOption":"Замінити поточний вміст","options":"Опції шаблону","selectPromptMsg":"Оберіть, будь ласка, шаблон для відкриття в редакторі<br>(поточний зміст буде втрачено):","title":"Шаблони змісту"},"contextmenu":{"options":"Опції контекстного меню"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Ідентифікатор","advisoryTitleInputLabel":"Зміст випливаючої підказки","cssClassInputLabel":"Клас CSS","edit":"Редагувати блок","inlineStyleInputLabel":"Вписаний стиль","langDirLTRLabel":"Зліва направо (LTR)","langDirLabel":"Напрямок мови","langDirRTLLabel":"Справа наліво (RTL)","languageCodeInputLabel":"Код мови","remove":"Видалити блок","styleSelectLabel":"Стиль CSS","title":"Створити блок-контейнер","toolbar":"Створити блок-контейнер"},"toolbar":{"toolbarCollapse":"Згорнути панель інструментів","toolbarExpand":"Розгорнути панель інструментів","toolbarGroups":{"document":"Документ","clipboard":"Буфер обміну / Скасувати","editing":"Редагування","forms":"Форми","basicstyles":"Основний Стиль","paragraph":"Параграф","links":"Посилання","insert":"Вставити","styles":"Стилі","colors":"Кольори","tools":"Інструменти"},"toolbars":"Панель інструментів редактора"},"elementspath":{"eleLabel":"Шлях","eleTitle":"%1 елемент"},"find":{"find":"Пошук","findOptions":"Параметри Пошуку","findWhat":"Шукати:","matchCase":"Враховувати регістр","matchCyclic":"Циклічна заміна","matchWord":"Збіг цілих слів","notFoundMsg":"Вказаний текст не знайдено.","replace":"Заміна","replaceAll":"Замінити все","replaceSuccessMsg":"%1 співпадінь(ня) замінено.","replaceWith":"Замінити на:","title":"Знайти і замінити"},"fakeobjects":{"anchor":"Якір","flash":"Flash-анімація","hiddenfield":"Приховані Поля","iframe":"IFrame","unknown":"Невідомий об'єкт"},"flash":{"access":"Доступ до скрипта","accessAlways":"Завжди","accessNever":"Ніколи","accessSameDomain":"З того ж домена","alignAbsBottom":"По нижньому краю (abs)","alignAbsMiddle":"По середині (abs)","alignBaseline":"По базовій лінії","alignTextTop":"Текст по верхньому краю","bgcolor":"Колір фону","chkFull":"Дозволити повноекранний перегляд","chkLoop":"Циклічно","chkMenu":"Дозволити меню Flash","chkPlay":"Автопрогравання","flashvars":"Змінні Flash","hSpace":"Гориз. відступ","properties":"Властивості Flash","propertiesTab":"Властивості","quality":"Якість","qualityAutoHigh":"Автом. відмінна","qualityAutoLow":"Автом. низька","qualityBest":"Відмінна","qualityHigh":"Висока","qualityLow":"Низька","qualityMedium":"Середня","scale":"Масштаб","scaleAll":"Показати все","scaleFit":"Поч. розмір","scaleNoBorder":"Без рамки","title":"Властивості Flash","vSpace":"Верт. відступ","validateHSpace":"Гориз. відступ повинен бути цілим числом.","validateSrc":"URL посилання не може бути порожнім.","validateVSpace":"Верт. відступ повинен бути цілим числом.","windowMode":"Віконний режим","windowModeOpaque":"Непрозорість","windowModeTransparent":"Прозорість","windowModeWindow":"Вікно"},"font":{"fontSize":{"label":"Розмір","voiceLabel":"Розмір шрифту","panelTitle":"Розмір"},"label":"Шрифт","panelTitle":"Шрифт","voiceLabel":"Шрифт"},"forms":{"button":{"title":"Властивості кнопки","text":"Значення","type":"Тип","typeBtn":"Кнопка (button)","typeSbm":"Надіслати (submit)","typeRst":"Очистити (reset)"},"checkboxAndRadio":{"checkboxTitle":"Властивості галочки","radioTitle":"Властивості кнопки вибору","value":"Значення","selected":"Обрана","required":"Обов’язкове поле"},"form":{"title":"Властивості форми","menu":"Властивості форми","action":"Дія","method":"Метод","encoding":"Кодування"},"hidden":{"title":"Властивості прихованого поля","name":"Ім'я","value":"Значення"},"select":{"title":"Властивості списку","selectInfo":"Інфо","opAvail":"Доступні варіанти","value":"Значення","size":"Кількість","lines":"видимих позицій у списку","chkMulti":"Список з мультивибором","required":"Обов’язкове поле","opText":"Текст","opValue":"Значення","btnAdd":"Добавити","btnModify":"Змінити","btnUp":"Вгору","btnDown":"Вниз","btnSetValue":"Встановити як обране значення","btnDelete":"Видалити"},"textarea":{"title":"Властивості текстової області","cols":"Стовбці","rows":"Рядки"},"textfield":{"title":"Властивості текстового поля","name":"Ім'я","value":"Значення","charWidth":"Ширина","maxChars":"Макс. к-ть символів","required":"Обов’язкове поле","type":"Тип","typeText":"Текст","typePass":"Пароль","typeEmail":"Пошта","typeSearch":"Пошук","typeTel":"Мобільний","typeUrl":"URL"}},"format":{"label":"Форматування","panelTitle":"Форматування параграфа","tag_address":"Адреса","tag_div":"Нормальний (div)","tag_h1":"Заголовок 1","tag_h2":"Заголовок 2","tag_h3":"Заголовок 3","tag_h4":"Заголовок 4","tag_h5":"Заголовок 5","tag_h6":"Заголовок 6","tag_p":"Нормальний","tag_pre":"Форматований"},"horizontalrule":{"toolbar":"Горизонтальна лінія"},"iframe":{"border":"Показати рамки фрейму","noUrl":"Будь ласка введіть URL посилання для IFrame","scrolling":"Увімкнути прокрутку","title":"Налаштування для IFrame","toolbar":"IFrame"},"image":{"alt":"Альтернативний текст","border":"Рамка","btnUpload":"Надіслати на сервер","button2Img":"Бажаєте перетворити обрану кнопку-зображення на просте зображення?","hSpace":"Гориз. відступ","img2Button":"Бажаєте перетворити обране зображення на кнопку-зображення?","infoTab":"Інформація про зображення","linkTab":"Посилання","lockRatio":"Зберегти пропорції","menu":"Властивості зображення","resetSize":"Очистити поля розмірів","title":"Властивості зображення","titleButton":"Властивості кнопки із зображенням","upload":"Надіслати","urlMissing":"Вкажіть URL зображення.","vSpace":"Верт. відступ","validateBorder":"Ширина рамки повинна бути цілим числом.","validateHSpace":"Гориз. відступ повинен бути цілим числом.","validateVSpace":"Верт. відступ повинен бути цілим числом."},"indent":{"indent":"Збільшити відступ","outdent":"Зменшити відступ"},"smiley":{"options":"Опції смайликів","title":"Вставити смайлик","toolbar":"Смайлик"},"justify":{"block":"По ширині","center":"По центру","left":"По лівому краю","right":"По правому краю"},"language":{"button":"Установити мову","remove":"Вилучити мову"},"link":{"acccessKey":"Гаряча клавіша","advanced":"Додаткове","advisoryContentType":"Тип вмісту","advisoryTitle":"Заголовок","anchor":{"toolbar":"Вставити/Редагувати якір","menu":"Властивості якоря","title":"Властивості якоря","name":"Ім'я якоря","errorName":"Будь ласка, вкажіть ім'я якоря","remove":"Прибрати якір"},"anchorId":"За ідентифікатором елементу","anchorName":"За ім'ям елементу","charset":"Кодування","cssClasses":"Клас CSS","download":"Force Download","displayText":"Display Text","emailAddress":"Адреса ел. пошти","emailBody":"Тіло повідомлення","emailSubject":"Тема листа","id":"Ідентифікатор","info":"Інформація посилання","langCode":"Код мови","langDir":"Напрямок мови","langDirLTR":"Зліва направо (LTR)","langDirRTL":"Справа наліво (RTL)","menu":"Вставити посилання","name":"Ім'я","noAnchors":"(В цьому документі немає якорів)","noEmail":"Будь ласка, вкажіть адрес ел. пошти","noUrl":"Будь ласка, вкажіть URL посилання","other":"<інший>","popupDependent":"Залежний (Netscape)","popupFeatures":"Властивості випливаючого вікна","popupFullScreen":"Повний екран (IE)","popupLeft":"Позиція зліва","popupLocationBar":"Панель локації","popupMenuBar":"Панель меню","popupResizable":"Масштабоване","popupScrollBars":"Стрічки прокрутки","popupStatusBar":"Рядок статусу","popupToolbar":"Панель інструментів","popupTop":"Позиція зверху","rel":"Зв'язок","selectAnchor":"Оберіть якір","styles":"Стиль CSS","tabIndex":"Послідовність переходу","target":"Ціль","targetFrame":"<фрейм>","targetFrameName":"Ім'я цільового фрейму","targetPopup":"<випливаюче вікно>","targetPopupName":"Ім'я випливаючого вікна","title":"Посилання","toAnchor":"Якір на цю сторінку","toEmail":"Ел. пошта","toUrl":"URL","toolbar":"Вставити/Редагувати посилання","type":"Тип посилання","unlink":"Видалити посилання","upload":"Надіслати"},"list":{"bulletedlist":"Маркірований список","numberedlist":"Нумерований список"},"liststyle":{"armenian":"Вірменська нумерація","bulletedTitle":"Опції маркованого списку","circle":"Кільце","decimal":"Десяткові (1, 2, 3 і т.д.)","decimalLeadingZero":"Десяткові з нулем (01, 02, 03 і т.д.)","disc":"Кружечок","georgian":"Грузинська нумерація (an, ban, gan і т.д.)","lowerAlpha":"Малі лат. букви (a, b, c, d, e і т.д.)","lowerGreek":"Малі гр. букви (альфа, бета, гамма і т.д.)","lowerRoman":"Малі римські (i, ii, iii, iv, v і т.д.)","none":"Нема","notset":"<не вказано>","numberedTitle":"Опції нумерованого списку","square":"Квадратик","start":"Почати з...","type":"Тип","upperAlpha":"Великі лат. букви (A, B, C, D, E і т.д.)","upperRoman":"Великі римські (I, II, III, IV, V і т.д.)","validateStartNumber":"Початковий номер списку повинен бути цілим числом."},"magicline":{"title":"Вставити абзац"},"maximize":{"maximize":"Максимізувати","minimize":"Мінімізувати"},"newpage":{"toolbar":"Нова сторінка"},"pagebreak":{"alt":"Розрив Сторінки","toolbar":"Вставити розрив сторінки"},"pastetext":{"button":"Вставити тільки текст","title":"Вставити тільки текст"},"pastefromword":{"confirmCleanup":"Текст, що Ви намагаєтесь вставити, схожий на скопійований з Word. Бажаєте очистити його форматування перед вставлянням?","error":"Неможливо очистити форматування через внутрішню помилку.","title":"Вставити з Word","toolbar":"Вставити з Word"},"preview":{"preview":"Попередній перегляд"},"print":{"toolbar":"Друк"},"removeformat":{"toolbar":"Видалити форматування"},"save":{"toolbar":"Зберегти"},"selectall":{"toolbar":"Виділити все"},"showblocks":{"toolbar":"Показувати блоки"},"sourcearea":{"toolbar":"Джерело"},"specialchar":{"options":"Опції","title":"Оберіть спеціальний символ","toolbar":"Спеціальний символ"},"scayt":{"btn_about":"Про SCAYT","btn_dictionaries":"Словники","btn_disable":"Вимкнути SCAYT","btn_enable":"Ввімкнути SCAYT","btn_langs":"Мови","btn_options":"Опції","text_title":"Перефірка орфографії по мірі набору"},"stylescombo":{"label":"Стиль","panelTitle":"Стилі форматування","panelTitle1":"Блочні стилі","panelTitle2":"Рядкові стилі","panelTitle3":"Об'єктні стилі"},"table":{"border":"Розмір рамки","caption":"Заголовок таблиці","cell":{"menu":"Комірки","insertBefore":"Вставити комірку перед","insertAfter":"Вставити комірку після","deleteCell":"Видалити комірки","merge":"Об'єднати комірки","mergeRight":"Об'єднати справа","mergeDown":"Об'єднати донизу","splitHorizontal":"Розділити комірку по горизонталі","splitVertical":"Розділити комірку по вертикалі","title":"Властивості комірки","cellType":"Тип комірки","rowSpan":"Об'єднання рядків","colSpan":"Об'єднання стовпців","wordWrap":"Автоперенесення тексту","hAlign":"Гориз. вирівнювання","vAlign":"Верт. вирівнювання","alignBaseline":"По базовій лінії","bgColor":"Колір фону","borderColor":"Колір рамки","data":"Дані","header":"Заголовок","yes":"Так","no":"Ні","invalidWidth":"Ширина комірки повинна бути цілим числом.","invalidHeight":"Висота комірки повинна бути цілим числом.","invalidRowSpan":"Кількість об'єднуваних рядків повинна бути цілим числом.","invalidColSpan":"Кількість об'єднуваних стовбців повинна бути цілим числом.","chooseColor":"Обрати"},"cellPad":"Внутр. відступ","cellSpace":"Проміжок","column":{"menu":"Стовбці","insertBefore":"Вставити стовбець перед","insertAfter":"Вставити стовбець після","deleteColumn":"Видалити стовбці"},"columns":"Стовбці","deleteTable":"Видалити таблицю","headers":"Заголовки стовбців/рядків","headersBoth":"Стовбці і рядки","headersColumn":"Стовбці","headersNone":"Без заголовків","headersRow":"Рядки","invalidBorder":"Розмір рамки повинен бути цілим числом.","invalidCellPadding":"Внутр. відступ комірки повинен бути цілим числом.","invalidCellSpacing":"Проміжок між комірками повинен бути цілим числом.","invalidCols":"Кількість стовбців повинна бути більшою 0.","invalidHeight":"Висота таблиці повинна бути цілим числом.","invalidRows":"Кількість рядків повинна бути більшою 0.","invalidWidth":"Ширина таблиці повинна бути цілим числом.","menu":"Властивості таблиці","row":{"menu":"Рядки","insertBefore":"Вставити рядок перед","insertAfter":"Вставити рядок після","deleteRow":"Видалити рядки"},"rows":"Рядки","summary":"Детальний опис заголовку таблиці","title":"Властивості таблиці","toolbar":"Таблиця","widthPc":"відсотків","widthPx":"пікселів","widthUnit":"Одиниці вимір."},"undo":{"redo":"Повторити","undo":"Повернути"},"wsc":{"btnIgnore":"Пропустити","btnIgnoreAll":"Пропустити все","btnReplace":"Замінити","btnReplaceAll":"Замінити все","btnUndo":"Назад","changeTo":"Замінити на","errorLoading":"Помилка завантаження : %s.","ieSpellDownload":"Модуль перевірки орфографії не встановлено. Бажаєте завантажити його зараз?","manyChanges":"Перевірку орфографії завершено: 1% слів(ова) змінено","noChanges":"Перевірку орфографії завершено: жодне слово не змінено","noMispell":"Перевірку орфографії завершено: помилок не знайдено","noSuggestions":"- немає варіантів -","notAvailable":"Вибачте, але сервіс наразі недоступний.","notInDic":"Немає в словнику","oneChange":"Перевірку орфографії завершено: змінено одне слово","progress":"Виконується перевірка орфографії...","title":"Перевірка орфографії","toolbar":"Перевірити орфографію"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/lang/vi.js
index d80c294530e..d960f660791 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/vi.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/vi.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['vi']={"editor":"Bộ soạn thảo văn bản có định dạng","editorPanel":"Bảng điều khiển Rich Text Editor","common":{"editorHelp":"Nhấn ALT + 0 để được giúp đỡ","browseServer":"Duyệt máy chủ","url":"URL","protocol":"Giao thức","upload":"Tải lên","uploadSubmit":"Tải lên máy chủ","image":"Hình ảnh","flash":"Flash","form":"Biểu mẫu","checkbox":"Nút kiểm","radio":"Nút chọn","textField":"Trường văn bản","textarea":"Vùng văn bản","hiddenField":"Trường ẩn","button":"Nút","select":"Ô chọn","imageButton":"Nút hình ảnh","notSet":"<không thiết lập>","id":"Định danh","name":"Tên","langDir":"Hướng ngôn ngữ","langDirLtr":"Trái sang phải (LTR)","langDirRtl":"Phải sang trái (RTL)","langCode":"Mã ngôn ngữ","longDescr":"Mô tả URL","cssClass":"Lớp Stylesheet","advisoryTitle":"Nhan đề hướng dẫn","cssStyle":"Kiểu ","ok":"Đồng ý","cancel":"Bỏ qua","close":"Đóng","preview":"Xem trước","resize":"Kéo rê để thay đổi kích cỡ","generalTab":"Tab chung","advancedTab":"Tab mở rộng","validateNumberFailed":"Giá trị này không phải là số.","confirmNewPage":"Mọi thay đổi không được lưu lại, nội dung này sẽ bị mất. Bạn có chắc chắn muốn tải một trang mới?","confirmCancel":"Một vài tùy chọn đã bị thay đổi. Bạn có chắc chắn muốn đóng hộp thoại?","options":"Tùy chọn","target":"Đích đến","targetNew":"Cửa sổ mới (_blank)","targetTop":"Cửa sổ trên cùng (_top)","targetSelf":"Tại trang (_self)","targetParent":"Cửa sổ cha (_parent)","langDirLTR":"Trái sang phải (LTR)","langDirRTL":"Phải sang trái (RTL)","styles":"Kiểu","cssClasses":"Lớp CSS","width":"Chiều rộng","height":"Chiều cao","align":"Vị trí","alignLeft":"Trái","alignRight":"Phải","alignCenter":"Giữa","alignJustify":"Sắp chữ","alignTop":"Trên","alignMiddle":"Giữa","alignBottom":"Dưới","alignNone":"Không","invalidValue":"Giá trị không hợp lệ.","invalidHeight":"Chiều cao phải là số nguyên.","invalidWidth":"Chiều rộng phải là số nguyên.","invalidCssLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","invalidHtmlLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo HTML hợp lệ (px hoặc %).","invalidInlineStyle":"Giá trị quy định cho kiểu nội tuyến phải bao gồm một hoặc nhiều dữ liệu với định dạng \"tên:giá trị\", cách nhau bằng dấu chấm phẩy.","cssLengthTooltip":"Nhập một giá trị theo pixel hoặc một số với một đơn vị CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","unavailable":"%1<span class=\"cke_accessibility\">, không có</span>"},"about":{"copy":"Bản quyền &copy; $1. Giữ toàn quyền.","dlgTitle":"Thông tin về CKEditor","help":"Kiểm tra $1 để được giúp đỡ.","moreInfo":"Vui lòng ghé thăm trang web của chúng tôi để có thông tin về giấy phép:","title":"Thông tin về CKEditor","userGuide":"Hướng dẫn sử dụng CKEditor"},"basicstyles":{"bold":"Đậm","italic":"Nghiêng","strike":"Gạch xuyên ngang","subscript":"Chỉ số dưới","superscript":"Chỉ số trên","underline":"Gạch chân"},"bidi":{"ltr":"Văn bản hướng từ trái sang phải","rtl":"Văn bản hướng từ phải sang trái"},"blockquote":{"toolbar":"Khối trích dẫn"},"clipboard":{"copy":"Sao chép","copyError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh sao chép. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+C).","cut":"Cắt","cutError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh cắt. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+X).","paste":"Dán","pasteArea":"Khu vực dán","pasteMsg":"Hãy dán nội dung vào trong khung bên dưới, sử dụng tổ hợp phím (<STRONG>Ctrl/Cmd+V</STRONG>) và nhấn vào nút <STRONG>Đồng ý</STRONG>.","securityMsg":"Do thiết lập bảo mật của trình duyệt nên trình biên tập không thể truy cập trực tiếp vào nội dung đã sao chép. Bạn cần phải dán lại nội dung vào cửa sổ này.","title":"Dán"},"button":{"selectedLabel":"%1 (Đã chọn)"},"colorbutton":{"auto":"Tự động","bgColorTitle":"Màu nền","colors":{"000":"Đen","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Nâu","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Xám","F00":"Đỏ","FF8C00":"Dark Orange","FFD700":"Vàng","008000":"Xanh lá cây","0FF":"Cyan","00F":"Xanh da trời","EE82EE":"Tím","A9A9A9":"Xám tối","FFA07A":"Light Salmon","FFA500":"Màu cam","FFFF00":"Vàng","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Trắng"},"more":"Màu khác...","panelTitle":"Màu sắc","textColorTitle":"Màu chữ"},"colordialog":{"clear":"Xóa bỏ","highlight":"Màu chọn","options":"Tùy chọn màu","selected":"Màu đã chọn","title":"Chọn màu"},"templates":{"button":"Mẫu dựng sẵn","emptyListMsg":"(Không có mẫu dựng sẵn nào được định nghĩa)","insertOption":"Thay thế nội dung hiện tại","options":"Tùy chọn mẫu dựng sẵn","selectPromptMsg":"Hãy chọn mẫu dựng sẵn để mở trong trình biên tập<br>(nội dung hiện tại sẽ bị mất):","title":"Nội dung Mẫu dựng sẵn"},"contextmenu":{"options":"Tùy chọn menu bổ xung"},"div":{"IdInputLabel":"Định danh (id)","advisoryTitleInputLabel":"Nhan đề hướng dẫn","cssClassInputLabel":"Các lớp CSS","edit":"Chỉnh sửa","inlineStyleInputLabel":"Kiểu nội dòng","langDirLTRLabel":"Trái sang phải (LTR)","langDirLabel":"Hướng ngôn ngữ","langDirRTLLabel":"Phải qua trái (RTL)","languageCodeInputLabel":"Mã ngôn ngữ","remove":"Xóa bỏ","styleSelectLabel":"Kiểu (style)","title":"Tạo khối các thành phần","toolbar":"Tạo khối các thành phần"},"toolbar":{"toolbarCollapse":"Thu gọn thanh công cụ","toolbarExpand":"Mở rộng thnah công cụ","toolbarGroups":{"document":"Tài liệu","clipboard":"Clipboard/Undo","editing":"Chỉnh sửa","forms":"Bảng biểu","basicstyles":"Kiểu cơ bản","paragraph":"Đoạn","links":"Liên kết","insert":"Chèn","styles":"Kiểu","colors":"Màu sắc","tools":"Công cụ"},"toolbars":"Thanh công cụ"},"elementspath":{"eleLabel":"Nhãn thành phần","eleTitle":"%1 thành phần"},"find":{"find":"Tìm kiếm","findOptions":"Tìm tùy chọn","findWhat":"Tìm chuỗi:","matchCase":"Phân biệt chữ hoa/thường","matchCyclic":"Giống một phần","matchWord":"Giống toàn bộ từ","notFoundMsg":"Không tìm thấy chuỗi cần tìm.","replace":"Thay thế","replaceAll":"Thay thế tất cả","replaceSuccessMsg":"%1 vị trí đã được thay thế.","replaceWith":"Thay bằng:","title":"Tìm kiếm và thay thế"},"fakeobjects":{"anchor":"Điểm neo","flash":"Flash","hiddenfield":"Trường ẩn","iframe":"IFrame","unknown":"Đối tượng không rõ ràng"},"flash":{"access":"Truy cập mã","accessAlways":"Luôn luôn","accessNever":"Không bao giờ","accessSameDomain":"Cùng tên miền","alignAbsBottom":"Dưới tuyệt đối","alignAbsMiddle":"Giữa tuyệt đối","alignBaseline":"Đường cơ sở","alignTextTop":"Phía trên chữ","bgcolor":"Màu nền","chkFull":"Cho phép toàn màn hình","chkLoop":"Lặp","chkMenu":"Cho phép bật menu của Flash","chkPlay":"Tự động chạy","flashvars":"Các biến số dành cho Flash","hSpace":"Khoảng đệm ngang","properties":"Thuộc tính Flash","propertiesTab":"Thuộc tính","quality":"Chất lượng","qualityAutoHigh":"Cao tự động","qualityAutoLow":"Thấp tự động","qualityBest":"Tốt nhất","qualityHigh":"Cao","qualityLow":"Thấp","qualityMedium":"Trung bình","scale":"Tỷ lệ","scaleAll":"Hiển thị tất cả","scaleFit":"Vừa vặn","scaleNoBorder":"Không đường viền","title":"Thuộc tính Flash","vSpace":"Khoảng đệm dọc","validateHSpace":"Khoảng đệm ngang phải là số nguyên.","validateSrc":"Hãy đưa vào đường dẫn liên kết","validateVSpace":"Khoảng đệm dọc phải là số nguyên.","windowMode":"Chế độ cửa sổ","windowModeOpaque":"Mờ đục","windowModeTransparent":"Trong suốt","windowModeWindow":"Cửa sổ"},"font":{"fontSize":{"label":"Cỡ chữ","voiceLabel":"Kích cỡ phông","panelTitle":"Cỡ chữ"},"label":"Phông","panelTitle":"Phông","voiceLabel":"Phông"},"forms":{"button":{"title":"Thuộc tính của nút","text":"Chuỗi hiển thị (giá trị)","type":"Kiểu","typeBtn":"Nút bấm","typeSbm":"Nút gửi","typeRst":"Nút nhập lại"},"checkboxAndRadio":{"checkboxTitle":"Thuộc tính nút kiểm","radioTitle":"Thuộc tính nút chọn","value":"Giá trị","selected":"Được chọn","required":"Required"},"form":{"title":"Thuộc tính biểu mẫu","menu":"Thuộc tính biểu mẫu","action":"Hành động","method":"Phương thức","encoding":"Bảng mã"},"hidden":{"title":"Thuộc tính trường ẩn","name":"Tên","value":"Giá trị"},"select":{"title":"Thuộc tính ô chọn","selectInfo":"Thông tin","opAvail":"Các tùy chọn có thể sử dụng","value":"Giá trị","size":"Kích cỡ","lines":"dòng","chkMulti":"Cho phép chọn nhiều","required":"Required","opText":"Văn bản","opValue":"Giá trị","btnAdd":"Thêm","btnModify":"Thay đổi","btnUp":"Lên","btnDown":"Xuống","btnSetValue":"Giá trị được chọn","btnDelete":"Nút xoá"},"textarea":{"title":"Thuộc tính vùng văn bản","cols":"Số cột","rows":"Số hàng"},"textfield":{"title":"Thuộc tính trường văn bản","name":"Tên","value":"Giá trị","charWidth":"Độ rộng của ký tự","maxChars":"Số ký tự tối đa","required":"Required","type":"Kiểu","typeText":"Ký tự","typePass":"Mật khẩu","typeEmail":"Email","typeSearch":"Tìm kiếm","typeTel":"Số điện thoại","typeUrl":"URL"}},"format":{"label":"Định dạng","panelTitle":"Định dạng","tag_address":"Address","tag_div":"Bình thường (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Bình thường (P)","tag_pre":"Đã thiết lập"},"horizontalrule":{"toolbar":"Chèn đường phân cách ngang"},"iframe":{"border":"Hiển thị viền khung","noUrl":"Vui lòng nhập địa chỉ iframe","scrolling":"Kích hoạt thanh cuộn","title":"Thuộc tính iframe","toolbar":"Iframe"},"image":{"alt":"Chú thích ảnh","border":"Đường viền","btnUpload":"Tải lên máy chủ","button2Img":"Bạn có muốn chuyển nút bấm bằng ảnh được chọn thành ảnh?","hSpace":"Khoảng đệm ngang","img2Button":"Bạn có muốn chuyển đổi ảnh được chọn thành nút bấm bằng ảnh?","infoTab":"Thông tin của ảnh","linkTab":"Tab liên kết","lockRatio":"Giữ nguyên tỷ lệ","menu":"Thuộc tính của ảnh","resetSize":"Kích thước gốc","title":"Thuộc tính của ảnh","titleButton":"Thuộc tính nút của ảnh","upload":"Tải lên","urlMissing":"Thiếu đường dẫn hình ảnh","vSpace":"Khoảng đệm dọc","validateBorder":"Chiều rộng của đường viền phải là một số nguyên dương","validateHSpace":"Khoảng đệm ngang phải là một số nguyên dương","validateVSpace":"Khoảng đệm dọc phải là một số nguyên dương"},"indent":{"indent":"Dịch vào trong","outdent":"Dịch ra ngoài"},"smiley":{"options":"Tùy chọn hình  biểu lộ cảm xúc","title":"Chèn hình biểu lộ cảm xúc (mặt cười)","toolbar":"Hình biểu lộ cảm xúc (mặt cười)"},"justify":{"block":"Canh đều","center":"Canh giữa","left":"Canh trái","right":"Canh phải"},"language":{"button":"Thiết lập ngôn ngữ","remove":"Loại bỏ ngôn ngữ"},"link":{"acccessKey":"Phím hỗ trợ truy cập","advanced":"Mở rộng","advisoryContentType":"Nội dung hướng dẫn","advisoryTitle":"Nhan đề hướng dẫn","anchor":{"toolbar":"Chèn/Sửa điểm neo","menu":"Thuộc tính điểm neo","title":"Thuộc tính điểm neo","name":"Tên của điểm neo","errorName":"Hãy nhập vào tên của điểm neo","remove":"Xóa neo"},"anchorId":"Theo định danh thành phần","anchorName":"Theo tên điểm neo","charset":"Bảng mã của tài nguyên được liên kết đến","cssClasses":"Lớp Stylesheet","emailAddress":"Thư điện tử","emailBody":"Nội dung thông điệp","emailSubject":"Tiêu đề thông điệp","id":"Định danh","info":"Thông tin liên kết","langCode":"Mã ngôn ngữ","langDir":"Hướng ngôn ngữ","langDirLTR":"Trái sang phải (LTR)","langDirRTL":"Phải sang trái (RTL)","menu":"Sửa liên kết","name":"Tên","noAnchors":"(Không có điểm neo nào trong tài liệu)","noEmail":"Hãy đưa vào địa chỉ thư điện tử","noUrl":"Hãy đưa vào đường dẫn liên kết (URL)","other":"<khác>","popupDependent":"Phụ thuộc (Netscape)","popupFeatures":"Đặc điểm của cửa sổ Popup","popupFullScreen":"Toàn màn hình (IE)","popupLeft":"Vị trí bên trái","popupLocationBar":"Thanh vị trí","popupMenuBar":"Thanh Menu","popupResizable":"Có thể thay đổi kích cỡ","popupScrollBars":"Thanh cuộn","popupStatusBar":"Thanh trạng thái","popupToolbar":"Thanh công cụ","popupTop":"Vị trí phía trên","rel":"Quan hệ","selectAnchor":"Chọn một điểm neo","styles":"Kiểu (style)","tabIndex":"Chỉ số của Tab","target":"Đích","targetFrame":"<khung>","targetFrameName":"Tên khung đích","targetPopup":"<cửa sổ popup>","targetPopupName":"Tên cửa sổ Popup","title":"Liên kết","toAnchor":"Neo trong trang này","toEmail":"Thư điện tử","toUrl":"URL","toolbar":"Chèn/Sửa liên kết","type":"Kiểu liên kết","unlink":"Xoá liên kết","upload":"Tải lên"},"list":{"bulletedlist":"Chèn/Xoá Danh sách không thứ tự","numberedlist":"Chèn/Xoá Danh sách có thứ tự"},"liststyle":{"armenian":"Số theo kiểu Armenian","bulletedTitle":"Thuộc tính danh sách không thứ tự","circle":"Khuyên tròn","decimal":"Kiểu số (1, 2, 3 ...)","decimalLeadingZero":"Kiểu số (01, 02, 03...)","disc":"Hình đĩa","georgian":"Số theo kiểu Georgian (an, ban, gan...)","lowerAlpha":"Kiểu abc thường (a, b, c, d, e...)","lowerGreek":"Kiểu Hy Lạp (alpha, beta, gamma...)","lowerRoman":"Số La Mã kiểu thường (i, ii, iii, iv, v...)","none":"Không gì cả","notset":"<không thiết lập>","numberedTitle":"Thuộc tính danh sách có thứ tự","square":"Hình vuông","start":"Bắt đầu","type":"Kiểu loại","upperAlpha":"Kiểu ABC HOA (A, B, C, D, E...)","upperRoman":"Số La Mã kiểu HOA (I, II, III, IV, V...)","validateStartNumber":"Số bắt đầu danh sách phải là một số nguyên."},"magicline":{"title":"Chèn đoạn vào đây"},"maximize":{"maximize":"Phóng to tối đa","minimize":"Thu nhỏ"},"newpage":{"toolbar":"Trang mới"},"pagebreak":{"alt":"Ngắt trang","toolbar":"Chèn ngắt trang"},"pastetext":{"button":"Dán theo định dạng văn bản thuần","title":"Dán theo định dạng văn bản thuần"},"pastefromword":{"confirmCleanup":"Văn bản bạn muốn dán có kèm định dạng của Word. Bạn có muốn loại bỏ định dạng Word trước khi dán?","error":"Không thể để làm sạch các dữ liệu dán do một lỗi nội bộ","title":"Dán với định dạng Word","toolbar":"Dán với định dạng Word"},"preview":{"preview":"Xem trước"},"print":{"toolbar":"In"},"removeformat":{"toolbar":"Xoá định dạng"},"save":{"toolbar":"Lưu"},"selectall":{"toolbar":"Chọn tất cả"},"showblocks":{"toolbar":"Hiển thị các khối"},"sourcearea":{"toolbar":"Mã HTML"},"specialchar":{"options":"Tùy chọn các ký tự đặc biệt","title":"Hãy chọn ký tự đặc biệt","toolbar":"Chèn ký tự đặc biệt"},"scayt":{"btn_about":"Thông tin về SCAYT","btn_dictionaries":"Từ điển","btn_disable":"Tắt SCAYT","btn_enable":"Bật SCAYT","btn_langs":"Ngôn ngữ","btn_options":"Tùy chọn","text_title":"Kiểm tra chính tả ngay khi gõ chữ (SCAYT)"},"stylescombo":{"label":"Kiểu","panelTitle":"Phong cách định dạng","panelTitle1":"Kiểu khối","panelTitle2":"Kiểu trực tiếp","panelTitle3":"Kiểu đối tượng"},"table":{"border":"Kích thước đường viền","caption":"Đầu đề","cell":{"menu":"Ô","insertBefore":"Chèn ô Phía trước","insertAfter":"Chèn ô Phía sau","deleteCell":"Xoá ô","merge":"Kết hợp ô","mergeRight":"Kết hợp sang phải","mergeDown":"Kết hợp xuống dưới","splitHorizontal":"Phân tách ô theo chiều ngang","splitVertical":"Phân tách ô theo chiều dọc","title":"Thuộc tính của ô","cellType":"Kiểu của ô","rowSpan":"Kết hợp hàng","colSpan":"Kết hợp cột","wordWrap":"Chữ liền hàng","hAlign":"Canh lề ngang","vAlign":"Canh lề dọc","alignBaseline":"Đường cơ sở","bgColor":"Màu nền","borderColor":"Màu viền","data":"Dữ liệu","header":"Đầu đề","yes":"Có","no":"Không","invalidWidth":"Chiều rộng của ô phải là một số nguyên.","invalidHeight":"Chiều cao của ô phải là một số nguyên.","invalidRowSpan":"Số hàng kết hợp phải là một số nguyên.","invalidColSpan":"Số cột kết hợp phải là một số nguyên.","chooseColor":"Chọn màu"},"cellPad":"Khoảng đệm giữ ô và nội dung","cellSpace":"Khoảng cách giữa các ô","column":{"menu":"Cột","insertBefore":"Chèn cột phía trước","insertAfter":"Chèn cột phía sau","deleteColumn":"Xoá cột"},"columns":"Số cột","deleteTable":"Xóa bảng","headers":"Đầu đề","headersBoth":"Cả hai","headersColumn":"Cột đầu tiên","headersNone":"Không có","headersRow":"Hàng đầu tiên","invalidBorder":"Kích cỡ của đường biên phải là một số nguyên.","invalidCellPadding":"Khoảng đệm giữa ô và nội dung phải là một số nguyên.","invalidCellSpacing":"Khoảng cách giữa các ô phải là một số nguyên.","invalidCols":"Số lượng cột phải là một số lớn hơn 0.","invalidHeight":"Chiều cao của bảng phải là một số nguyên.","invalidRows":"Số lượng hàng phải là một số lớn hơn 0.","invalidWidth":"Chiều rộng của bảng phải là một số nguyên.","menu":"Thuộc tính bảng","row":{"menu":"Hàng","insertBefore":"Chèn hàng phía trước","insertAfter":"Chèn hàng phía sau","deleteRow":"Xoá hàng"},"rows":"Số hàng","summary":"Tóm lược","title":"Thuộc tính bảng","toolbar":"Bảng","widthPc":"Phần trăm (%)","widthPx":"Điểm ảnh (px)","widthUnit":"Đơn vị"},"undo":{"redo":"Làm lại thao tác","undo":"Khôi phục thao tác"},"wsc":{"btnIgnore":"Bỏ qua","btnIgnoreAll":"Bỏ qua tất cả","btnReplace":"Thay thế","btnReplaceAll":"Thay thế tất cả","btnUndo":"Phục hồi lại","changeTo":"Chuyển thành","errorLoading":"Lỗi khi đang nạp dịch vụ ứng dụng: %s.","ieSpellDownload":"Chức năng kiểm tra chính tả chưa được cài đặt. Bạn có muốn tải về ngay bây giờ?","manyChanges":"Hoàn tất kiểm tra chính tả: %1 từ đã được thay đổi","noChanges":"Hoàn tất kiểm tra chính tả: Không có từ nào được thay đổi","noMispell":"Hoàn tất kiểm tra chính tả: Không có lỗi chính tả","noSuggestions":"- Không đưa ra gợi ý về từ -","notAvailable":"Xin lỗi, dịch vụ này hiện tại không có.","notInDic":"Không có trong từ điển","oneChange":"Hoàn tất kiểm tra chính tả: Một từ đã được thay đổi","progress":"Đang tiến hành kiểm tra chính tả...","title":"Kiểm tra chính tả","toolbar":"Kiểm tra chính tả"}};
\ No newline at end of file
+CKEDITOR.lang['vi']={"editor":"Bộ soạn thảo văn bản có định dạng","editorPanel":"Bảng điều khiển Rich Text Editor","common":{"editorHelp":"Nhấn ALT + 0 để được giúp đỡ","browseServer":"Duyệt máy chủ","url":"URL","protocol":"Giao thức","upload":"Tải lên","uploadSubmit":"Tải lên máy chủ","image":"Hình ảnh","flash":"Flash","form":"Biểu mẫu","checkbox":"Nút kiểm","radio":"Nút chọn","textField":"Trường văn bản","textarea":"Vùng văn bản","hiddenField":"Trường ẩn","button":"Nút","select":"Ô chọn","imageButton":"Nút hình ảnh","notSet":"<không thiết lập>","id":"Định danh","name":"Tên","langDir":"Hướng ngôn ngữ","langDirLtr":"Trái sang phải (LTR)","langDirRtl":"Phải sang trái (RTL)","langCode":"Mã ngôn ngữ","longDescr":"Mô tả URL","cssClass":"Lớp Stylesheet","advisoryTitle":"Nhan đề hướng dẫn","cssStyle":"Kiểu ","ok":"Đồng ý","cancel":"Bỏ qua","close":"Đóng","preview":"Xem trước","resize":"Kéo rê để thay đổi kích cỡ","generalTab":"Tab chung","advancedTab":"Tab mở rộng","validateNumberFailed":"Giá trị này không phải là số.","confirmNewPage":"Mọi thay đổi không được lưu lại, nội dung này sẽ bị mất. Bạn có chắc chắn muốn tải một trang mới?","confirmCancel":"Một vài tùy chọn đã bị thay đổi. Bạn có chắc chắn muốn đóng hộp thoại?","options":"Tùy chọn","target":"Đích đến","targetNew":"Cửa sổ mới (_blank)","targetTop":"Cửa sổ trên cùng (_top)","targetSelf":"Tại trang (_self)","targetParent":"Cửa sổ cha (_parent)","langDirLTR":"Trái sang phải (LTR)","langDirRTL":"Phải sang trái (RTL)","styles":"Kiểu","cssClasses":"Lớp CSS","width":"Chiều rộng","height":"Chiều cao","align":"Vị trí","alignLeft":"Trái","alignRight":"Phải","alignCenter":"Giữa","alignJustify":"Sắp chữ","alignTop":"Trên","alignMiddle":"Giữa","alignBottom":"Dưới","alignNone":"Không","invalidValue":"Giá trị không hợp lệ.","invalidHeight":"Chiều cao phải là số nguyên.","invalidWidth":"Chiều rộng phải là số nguyên.","invalidCssLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","invalidHtmlLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo HTML hợp lệ (px hoặc %).","invalidInlineStyle":"Giá trị quy định cho kiểu nội tuyến phải bao gồm một hoặc nhiều dữ liệu với định dạng \"tên:giá trị\", cách nhau bằng dấu chấm phẩy.","cssLengthTooltip":"Nhập một giá trị theo pixel hoặc một số với một đơn vị CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","unavailable":"%1<span class=\"cke_accessibility\">, không có</span>","keyboard":{"8":"Phím Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Xóa","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Bản quyền &copy; $1. Giữ toàn quyền.","dlgTitle":"Thông tin về CKEditor","help":"Kiểm tra $1 để được giúp đỡ.","moreInfo":"Vui lòng ghé thăm trang web của chúng tôi để có thông tin về giấy phép:","title":"Thông tin về CKEditor","userGuide":"Hướng dẫn sử dụng CKEditor"},"basicstyles":{"bold":"Đậm","italic":"Nghiêng","strike":"Gạch xuyên ngang","subscript":"Chỉ số dưới","superscript":"Chỉ số trên","underline":"Gạch chân"},"bidi":{"ltr":"Văn bản hướng từ trái sang phải","rtl":"Văn bản hướng từ phải sang trái"},"blockquote":{"toolbar":"Khối trích dẫn"},"clipboard":{"copy":"Sao chép","copyError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh sao chép. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+C).","cut":"Cắt","cutError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh cắt. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+X).","paste":"Dán","pasteArea":"Khu vực dán","pasteMsg":"Hãy dán nội dung vào trong khung bên dưới, sử dụng tổ hợp phím (<STRONG>Ctrl/Cmd+V</STRONG>) và nhấn vào nút <STRONG>Đồng ý</STRONG>.","securityMsg":"Do thiết lập bảo mật của trình duyệt nên trình biên tập không thể truy cập trực tiếp vào nội dung đã sao chép. Bạn cần phải dán lại nội dung vào cửa sổ này.","title":"Dán"},"button":{"selectedLabel":"%1 (Đã chọn)"},"colorbutton":{"auto":"Tự động","bgColorTitle":"Màu nền","colors":{"000":"Đen","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Nâu","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Xám","F00":"Đỏ","FF8C00":"Dark Orange","FFD700":"Vàng","008000":"Xanh lá cây","0FF":"Cyan","00F":"Xanh da trời","EE82EE":"Tím","A9A9A9":"Xám tối","FFA07A":"Light Salmon","FFA500":"Màu cam","FFFF00":"Vàng","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Trắng","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Màu khác...","panelTitle":"Màu sắc","textColorTitle":"Màu chữ"},"colordialog":{"clear":"Xóa bỏ","highlight":"Màu chọn","options":"Tùy chọn màu","selected":"Màu đã chọn","title":"Chọn màu"},"templates":{"button":"Mẫu dựng sẵn","emptyListMsg":"(Không có mẫu dựng sẵn nào được định nghĩa)","insertOption":"Thay thế nội dung hiện tại","options":"Tùy chọn mẫu dựng sẵn","selectPromptMsg":"Hãy chọn mẫu dựng sẵn để mở trong trình biên tập<br>(nội dung hiện tại sẽ bị mất):","title":"Nội dung Mẫu dựng sẵn"},"contextmenu":{"options":"Tùy chọn menu bổ xung"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Định danh (id)","advisoryTitleInputLabel":"Nhan đề hướng dẫn","cssClassInputLabel":"Các lớp CSS","edit":"Chỉnh sửa","inlineStyleInputLabel":"Kiểu nội dòng","langDirLTRLabel":"Trái sang phải (LTR)","langDirLabel":"Hướng ngôn ngữ","langDirRTLLabel":"Phải qua trái (RTL)","languageCodeInputLabel":"Mã ngôn ngữ","remove":"Xóa bỏ","styleSelectLabel":"Kiểu (style)","title":"Tạo khối các thành phần","toolbar":"Tạo khối các thành phần"},"toolbar":{"toolbarCollapse":"Thu gọn thanh công cụ","toolbarExpand":"Mở rộng thnah công cụ","toolbarGroups":{"document":"Tài liệu","clipboard":"Clipboard/Undo","editing":"Chỉnh sửa","forms":"Bảng biểu","basicstyles":"Kiểu cơ bản","paragraph":"Đoạn","links":"Liên kết","insert":"Chèn","styles":"Kiểu","colors":"Màu sắc","tools":"Công cụ"},"toolbars":"Thanh công cụ"},"elementspath":{"eleLabel":"Nhãn thành phần","eleTitle":"%1 thành phần"},"find":{"find":"Tìm kiếm","findOptions":"Tìm tùy chọn","findWhat":"Tìm chuỗi:","matchCase":"Phân biệt chữ hoa/thường","matchCyclic":"Giống một phần","matchWord":"Giống toàn bộ từ","notFoundMsg":"Không tìm thấy chuỗi cần tìm.","replace":"Thay thế","replaceAll":"Thay thế tất cả","replaceSuccessMsg":"%1 vị trí đã được thay thế.","replaceWith":"Thay bằng:","title":"Tìm kiếm và thay thế"},"fakeobjects":{"anchor":"Điểm neo","flash":"Flash","hiddenfield":"Trường ẩn","iframe":"IFrame","unknown":"Đối tượng không rõ ràng"},"flash":{"access":"Truy cập mã","accessAlways":"Luôn luôn","accessNever":"Không bao giờ","accessSameDomain":"Cùng tên miền","alignAbsBottom":"Dưới tuyệt đối","alignAbsMiddle":"Giữa tuyệt đối","alignBaseline":"Đường cơ sở","alignTextTop":"Phía trên chữ","bgcolor":"Màu nền","chkFull":"Cho phép toàn màn hình","chkLoop":"Lặp","chkMenu":"Cho phép bật menu của Flash","chkPlay":"Tự động chạy","flashvars":"Các biến số dành cho Flash","hSpace":"Khoảng đệm ngang","properties":"Thuộc tính Flash","propertiesTab":"Thuộc tính","quality":"Chất lượng","qualityAutoHigh":"Cao tự động","qualityAutoLow":"Thấp tự động","qualityBest":"Tốt nhất","qualityHigh":"Cao","qualityLow":"Thấp","qualityMedium":"Trung bình","scale":"Tỷ lệ","scaleAll":"Hiển thị tất cả","scaleFit":"Vừa vặn","scaleNoBorder":"Không đường viền","title":"Thuộc tính Flash","vSpace":"Khoảng đệm dọc","validateHSpace":"Khoảng đệm ngang phải là số nguyên.","validateSrc":"Hãy đưa vào đường dẫn liên kết","validateVSpace":"Khoảng đệm dọc phải là số nguyên.","windowMode":"Chế độ cửa sổ","windowModeOpaque":"Mờ đục","windowModeTransparent":"Trong suốt","windowModeWindow":"Cửa sổ"},"font":{"fontSize":{"label":"Cỡ chữ","voiceLabel":"Kích cỡ phông","panelTitle":"Cỡ chữ"},"label":"Phông","panelTitle":"Phông","voiceLabel":"Phông"},"forms":{"button":{"title":"Thuộc tính của nút","text":"Chuỗi hiển thị (giá trị)","type":"Kiểu","typeBtn":"Nút bấm","typeSbm":"Nút gửi","typeRst":"Nút nhập lại"},"checkboxAndRadio":{"checkboxTitle":"Thuộc tính nút kiểm","radioTitle":"Thuộc tính nút chọn","value":"Giá trị","selected":"Được chọn","required":"Bắt buộc"},"form":{"title":"Thuộc tính biểu mẫu","menu":"Thuộc tính biểu mẫu","action":"Hành động","method":"Phương thức","encoding":"Bảng mã"},"hidden":{"title":"Thuộc tính trường ẩn","name":"Tên","value":"Giá trị"},"select":{"title":"Thuộc tính ô chọn","selectInfo":"Thông tin","opAvail":"Các tùy chọn có thể sử dụng","value":"Giá trị","size":"Kích cỡ","lines":"dòng","chkMulti":"Cho phép chọn nhiều","required":"Bắt buộc","opText":"Văn bản","opValue":"Giá trị","btnAdd":"Thêm","btnModify":"Thay đổi","btnUp":"Lên","btnDown":"Xuống","btnSetValue":"Giá trị được chọn","btnDelete":"Nút xoá"},"textarea":{"title":"Thuộc tính vùng văn bản","cols":"Số cột","rows":"Số hàng"},"textfield":{"title":"Thuộc tính trường văn bản","name":"Tên","value":"Giá trị","charWidth":"Độ rộng của ký tự","maxChars":"Số ký tự tối đa","required":"Bắt buộc","type":"Kiểu","typeText":"Ký tự","typePass":"Mật khẩu","typeEmail":"Email","typeSearch":"Tìm kiếm","typeTel":"Số điện thoại","typeUrl":"URL"}},"format":{"label":"Định dạng","panelTitle":"Định dạng","tag_address":"Address","tag_div":"Bình thường (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Bình thường (P)","tag_pre":"Đã thiết lập"},"horizontalrule":{"toolbar":"Chèn đường phân cách ngang"},"iframe":{"border":"Hiển thị viền khung","noUrl":"Vui lòng nhập địa chỉ iframe","scrolling":"Kích hoạt thanh cuộn","title":"Thuộc tính iframe","toolbar":"Iframe"},"image":{"alt":"Chú thích ảnh","border":"Đường viền","btnUpload":"Tải lên máy chủ","button2Img":"Bạn có muốn chuyển nút bấm bằng ảnh được chọn thành ảnh?","hSpace":"Khoảng đệm ngang","img2Button":"Bạn có muốn chuyển đổi ảnh được chọn thành nút bấm bằng ảnh?","infoTab":"Thông tin của ảnh","linkTab":"Tab liên kết","lockRatio":"Giữ nguyên tỷ lệ","menu":"Thuộc tính của ảnh","resetSize":"Kích thước gốc","title":"Thuộc tính của ảnh","titleButton":"Thuộc tính nút của ảnh","upload":"Tải lên","urlMissing":"Thiếu đường dẫn hình ảnh","vSpace":"Khoảng đệm dọc","validateBorder":"Chiều rộng của đường viền phải là một số nguyên dương","validateHSpace":"Khoảng đệm ngang phải là một số nguyên dương","validateVSpace":"Khoảng đệm dọc phải là một số nguyên dương"},"indent":{"indent":"Dịch vào trong","outdent":"Dịch ra ngoài"},"smiley":{"options":"Tùy chọn hình  biểu lộ cảm xúc","title":"Chèn hình biểu lộ cảm xúc (mặt cười)","toolbar":"Hình biểu lộ cảm xúc (mặt cười)"},"justify":{"block":"Canh đều","center":"Canh giữa","left":"Canh trái","right":"Canh phải"},"language":{"button":"Thiết lập ngôn ngữ","remove":"Loại bỏ ngôn ngữ"},"link":{"acccessKey":"Phím hỗ trợ truy cập","advanced":"Mở rộng","advisoryContentType":"Nội dung hướng dẫn","advisoryTitle":"Nhan đề hướng dẫn","anchor":{"toolbar":"Chèn/Sửa điểm neo","menu":"Thuộc tính điểm neo","title":"Thuộc tính điểm neo","name":"Tên của điểm neo","errorName":"Hãy nhập vào tên của điểm neo","remove":"Xóa neo"},"anchorId":"Theo định danh thành phần","anchorName":"Theo tên điểm neo","charset":"Bảng mã của tài nguyên được liên kết đến","cssClasses":"Lớp Stylesheet","download":"Force Download","displayText":"Display Text","emailAddress":"Thư điện tử","emailBody":"Nội dung thông điệp","emailSubject":"Tiêu đề thông điệp","id":"Định danh","info":"Thông tin liên kết","langCode":"Mã ngôn ngữ","langDir":"Hướng ngôn ngữ","langDirLTR":"Trái sang phải (LTR)","langDirRTL":"Phải sang trái (RTL)","menu":"Sửa liên kết","name":"Tên","noAnchors":"(Không có điểm neo nào trong tài liệu)","noEmail":"Hãy đưa vào địa chỉ thư điện tử","noUrl":"Hãy đưa vào đường dẫn liên kết (URL)","other":"<khác>","popupDependent":"Phụ thuộc (Netscape)","popupFeatures":"Đặc điểm của cửa sổ Popup","popupFullScreen":"Toàn màn hình (IE)","popupLeft":"Vị trí bên trái","popupLocationBar":"Thanh vị trí","popupMenuBar":"Thanh Menu","popupResizable":"Có thể thay đổi kích cỡ","popupScrollBars":"Thanh cuộn","popupStatusBar":"Thanh trạng thái","popupToolbar":"Thanh công cụ","popupTop":"Vị trí phía trên","rel":"Quan hệ","selectAnchor":"Chọn một điểm neo","styles":"Kiểu (style)","tabIndex":"Chỉ số của Tab","target":"Đích","targetFrame":"<khung>","targetFrameName":"Tên khung đích","targetPopup":"<cửa sổ popup>","targetPopupName":"Tên cửa sổ Popup","title":"Liên kết","toAnchor":"Neo trong trang này","toEmail":"Thư điện tử","toUrl":"URL","toolbar":"Chèn/Sửa liên kết","type":"Kiểu liên kết","unlink":"Xoá liên kết","upload":"Tải lên"},"list":{"bulletedlist":"Chèn/Xoá Danh sách không thứ tự","numberedlist":"Chèn/Xoá Danh sách có thứ tự"},"liststyle":{"armenian":"Số theo kiểu Armenian","bulletedTitle":"Thuộc tính danh sách không thứ tự","circle":"Khuyên tròn","decimal":"Kiểu số (1, 2, 3 ...)","decimalLeadingZero":"Kiểu số (01, 02, 03...)","disc":"Hình đĩa","georgian":"Số theo kiểu Georgian (an, ban, gan...)","lowerAlpha":"Kiểu abc thường (a, b, c, d, e...)","lowerGreek":"Kiểu Hy Lạp (alpha, beta, gamma...)","lowerRoman":"Số La Mã kiểu thường (i, ii, iii, iv, v...)","none":"Không gì cả","notset":"<không thiết lập>","numberedTitle":"Thuộc tính danh sách có thứ tự","square":"Hình vuông","start":"Bắt đầu","type":"Kiểu loại","upperAlpha":"Kiểu ABC HOA (A, B, C, D, E...)","upperRoman":"Số La Mã kiểu HOA (I, II, III, IV, V...)","validateStartNumber":"Số bắt đầu danh sách phải là một số nguyên."},"magicline":{"title":"Chèn đoạn vào đây"},"maximize":{"maximize":"Phóng to tối đa","minimize":"Thu nhỏ"},"newpage":{"toolbar":"Trang mới"},"pagebreak":{"alt":"Ngắt trang","toolbar":"Chèn ngắt trang"},"pastetext":{"button":"Dán theo định dạng văn bản thuần","title":"Dán theo định dạng văn bản thuần"},"pastefromword":{"confirmCleanup":"Văn bản bạn muốn dán có kèm định dạng của Word. Bạn có muốn loại bỏ định dạng Word trước khi dán?","error":"Không thể để làm sạch các dữ liệu dán do một lỗi nội bộ","title":"Dán với định dạng Word","toolbar":"Dán với định dạng Word"},"preview":{"preview":"Xem trước"},"print":{"toolbar":"In"},"removeformat":{"toolbar":"Xoá định dạng"},"save":{"toolbar":"Lưu"},"selectall":{"toolbar":"Chọn tất cả"},"showblocks":{"toolbar":"Hiển thị các khối"},"sourcearea":{"toolbar":"Mã HTML"},"specialchar":{"options":"Tùy chọn các ký tự đặc biệt","title":"Hãy chọn ký tự đặc biệt","toolbar":"Chèn ký tự đặc biệt"},"scayt":{"btn_about":"Thông tin về SCAYT","btn_dictionaries":"Từ điển","btn_disable":"Tắt SCAYT","btn_enable":"Bật SCAYT","btn_langs":"Ngôn ngữ","btn_options":"Tùy chọn","text_title":"Kiểm tra chính tả ngay khi gõ chữ (SCAYT)"},"stylescombo":{"label":"Kiểu","panelTitle":"Phong cách định dạng","panelTitle1":"Kiểu khối","panelTitle2":"Kiểu trực tiếp","panelTitle3":"Kiểu đối tượng"},"table":{"border":"Kích thước đường viền","caption":"Đầu đề","cell":{"menu":"Ô","insertBefore":"Chèn ô Phía trước","insertAfter":"Chèn ô Phía sau","deleteCell":"Xoá ô","merge":"Kết hợp ô","mergeRight":"Kết hợp sang phải","mergeDown":"Kết hợp xuống dưới","splitHorizontal":"Phân tách ô theo chiều ngang","splitVertical":"Phân tách ô theo chiều dọc","title":"Thuộc tính của ô","cellType":"Kiểu của ô","rowSpan":"Kết hợp hàng","colSpan":"Kết hợp cột","wordWrap":"Chữ liền hàng","hAlign":"Canh lề ngang","vAlign":"Canh lề dọc","alignBaseline":"Đường cơ sở","bgColor":"Màu nền","borderColor":"Màu viền","data":"Dữ liệu","header":"Đầu đề","yes":"Có","no":"Không","invalidWidth":"Chiều rộng của ô phải là một số nguyên.","invalidHeight":"Chiều cao của ô phải là một số nguyên.","invalidRowSpan":"Số hàng kết hợp phải là một số nguyên.","invalidColSpan":"Số cột kết hợp phải là một số nguyên.","chooseColor":"Chọn màu"},"cellPad":"Khoảng đệm giữ ô và nội dung","cellSpace":"Khoảng cách giữa các ô","column":{"menu":"Cột","insertBefore":"Chèn cột phía trước","insertAfter":"Chèn cột phía sau","deleteColumn":"Xoá cột"},"columns":"Số cột","deleteTable":"Xóa bảng","headers":"Đầu đề","headersBoth":"Cả hai","headersColumn":"Cột đầu tiên","headersNone":"Không có","headersRow":"Hàng đầu tiên","invalidBorder":"Kích cỡ của đường biên phải là một số nguyên.","invalidCellPadding":"Khoảng đệm giữa ô và nội dung phải là một số nguyên.","invalidCellSpacing":"Khoảng cách giữa các ô phải là một số nguyên.","invalidCols":"Số lượng cột phải là một số lớn hơn 0.","invalidHeight":"Chiều cao của bảng phải là một số nguyên.","invalidRows":"Số lượng hàng phải là một số lớn hơn 0.","invalidWidth":"Chiều rộng của bảng phải là một số nguyên.","menu":"Thuộc tính bảng","row":{"menu":"Hàng","insertBefore":"Chèn hàng phía trước","insertAfter":"Chèn hàng phía sau","deleteRow":"Xoá hàng"},"rows":"Số hàng","summary":"Tóm lược","title":"Thuộc tính bảng","toolbar":"Bảng","widthPc":"Phần trăm (%)","widthPx":"Điểm ảnh (px)","widthUnit":"Đơn vị"},"undo":{"redo":"Làm lại thao tác","undo":"Khôi phục thao tác"},"wsc":{"btnIgnore":"Bỏ qua","btnIgnoreAll":"Bỏ qua tất cả","btnReplace":"Thay thế","btnReplaceAll":"Thay thế tất cả","btnUndo":"Phục hồi lại","changeTo":"Chuyển thành","errorLoading":"Lỗi khi đang nạp dịch vụ ứng dụng: %s.","ieSpellDownload":"Chức năng kiểm tra chính tả chưa được cài đặt. Bạn có muốn tải về ngay bây giờ?","manyChanges":"Hoàn tất kiểm tra chính tả: %1 từ đã được thay đổi","noChanges":"Hoàn tất kiểm tra chính tả: Không có từ nào được thay đổi","noMispell":"Hoàn tất kiểm tra chính tả: Không có lỗi chính tả","noSuggestions":"- Không đưa ra gợi ý về từ -","notAvailable":"Xin lỗi, dịch vụ này hiện tại không có.","notInDic":"Không có trong từ điển","oneChange":"Hoàn tất kiểm tra chính tả: Một từ đã được thay đổi","progress":"Đang tiến hành kiểm tra chính tả...","title":"Kiểm tra chính tả","toolbar":"Kiểm tra chính tả"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/lang/zh-cn.js
index baddf2324aa..c127ec2d745 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/zh-cn.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/zh-cn.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['zh-cn']={"editor":"所见即所得编辑器","editorPanel":"所见即所得编辑器面板","common":{"editorHelp":"按 ALT+0 获得帮助","browseServer":"浏览服务器","url":"URL","protocol":"协议","upload":"上传","uploadSubmit":"上传到服务器","image":"图像","flash":"Flash","form":"表单","checkbox":"复选框","radio":"单选按钮","textField":"单行文本","textarea":"多行文本","hiddenField":"隐藏域","button":"按钮","select":"列表/菜单","imageButton":"图像按钮","notSet":"<没有设置>","id":"ID","name":"名称","langDir":"语言方向","langDirLtr":"从左到右 (LTR)","langDirRtl":"从右到左 (RTL)","langCode":"语言代码","longDescr":"详细说明 URL","cssClass":"样式类名称","advisoryTitle":"标题","cssStyle":"行内样式","ok":"确定","cancel":"取消","close":"关闭","preview":"预览","resize":"拖拽以改变大小","generalTab":"常规","advancedTab":"高级","validateNumberFailed":"需要输入数字格式","confirmNewPage":"当前文档内容未保存，是否确认新建文档？","confirmCancel":"部分修改尚未保存，是否确认关闭对话框？","options":"选项","target":"目标窗口","targetNew":"新窗口 (_blank)","targetTop":"整页 (_top)","targetSelf":"本窗口 (_self)","targetParent":"父窗口 (_parent)","langDirLTR":"从左到右 (LTR)","langDirRTL":"从右到左 (RTL)","styles":"样式","cssClasses":"样式类","width":"宽度","height":"高度","align":"对齐方式","alignLeft":"左对齐","alignRight":"右对齐","alignCenter":"居中","alignJustify":"两端对齐","alignTop":"顶端","alignMiddle":"居中","alignBottom":"底部","alignNone":"无","invalidValue":"无效的值。","invalidHeight":"高度必须为数字格式","invalidWidth":"宽度必须为数字格式","invalidCssLength":"此“%1”字段的值必须为正数，可以包含或不包含一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)","invalidHtmlLength":"此“%1”字段的值必须为正数，可以包含或不包含一个有效的 HTML 长度单位(px 或 %)","invalidInlineStyle":"内联样式必须为格式是以分号分隔的一个或多个“属性名 : 属性值”。","cssLengthTooltip":"输入一个表示像素值的数字，或加上一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，不可用</span>"},"about":{"copy":"版权所有 &copy; $1。<br />保留所有权利。","dlgTitle":"关于 CKEditor","help":"访问 $1 以获取帮助。","moreInfo":"相关授权许可信息请访问我们的网站：","title":"关于 CKEditor","userGuide":"CKEditor 用户向导"},"basicstyles":{"bold":"加粗","italic":"倾斜","strike":"删除线","subscript":"下标","superscript":"上标","underline":"下划线"},"bidi":{"ltr":"文字方向为从左至右","rtl":"文字方向为从右至左"},"blockquote":{"toolbar":"块引用"},"clipboard":{"copy":"复制","copyError":"您的浏览器安全设置不允许编辑器自动执行复制操作，请使用键盘快捷键(Ctrl/Cmd+C)来完成。","cut":"剪切","cutError":"您的浏览器安全设置不允许编辑器自动执行剪切操作，请使用键盘快捷键(Ctrl/Cmd+X)来完成。","paste":"粘贴","pasteArea":"粘贴区域","pasteMsg":"请使用键盘快捷键(<STRONG>Ctrl/Cmd+V</STRONG>)把内容粘贴到下面的方框里，再按 <STRONG>确定</STRONG>","securityMsg":"因为您的浏览器的安全设置原因，本编辑器不能直接访问您的剪贴板内容，你需要在本窗口重新粘贴一次。","title":"粘贴"},"button":{"selectedLabel":"已选中 %1 项"},"colorbutton":{"auto":"自动","bgColorTitle":"背景颜色","colors":{"000":"黑","800000":"褐红","8B4513":"深褐","2F4F4F":"墨绿","008080":"绿松石","000080":"海军蓝","4B0082":"靛蓝","696969":"暗灰","B22222":"砖红","A52A2A":"褐","DAA520":"金黄","006400":"深绿","40E0D0":"蓝绿","0000CD":"中蓝","800080":"紫","808080":"灰","F00":"红","FF8C00":"深橙","FFD700":"金","008000":"绿","0FF":"青","00F":"蓝","EE82EE":"紫罗兰","A9A9A9":"深灰","FFA07A":"亮橙","FFA500":"橙","FFFF00":"黄","00FF00":"水绿","AFEEEE":"粉蓝","ADD8E6":"亮蓝","DDA0DD":"梅红","D3D3D3":"淡灰","FFF0F5":"淡紫红","FAEBD7":"古董白","FFFFE0":"淡黄","F0FFF0":"蜜白","F0FFFF":"天蓝","F0F8FF":"淡蓝","E6E6FA":"淡紫","FFF":"白"},"more":"其它颜色...","panelTitle":"颜色","textColorTitle":"文本颜色"},"colordialog":{"clear":"清除","highlight":"高亮","options":"颜色选项","selected":"选择颜色","title":"选择颜色"},"templates":{"button":"模板","emptyListMsg":"(没有模板)","insertOption":"替换当前内容","options":"模板选项","selectPromptMsg":"请选择要在编辑器中使用的模板：","title":"内容模板"},"contextmenu":{"options":"快捷菜单选项"},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"标题","cssClassInputLabel":"样式类名称","edit":"编辑 DIV","inlineStyleInputLabel":"行内样式","langDirLTRLabel":"从左到右 (LTR)","langDirLabel":"语言方向","langDirRTLLabel":"从右到左 (RTL)","languageCodeInputLabel":"语言代码","remove":"移除 DIV","styleSelectLabel":"样式","title":"创建 DIV 容器","toolbar":"创建 DIV 容器"},"toolbar":{"toolbarCollapse":"折叠工具栏","toolbarExpand":"展开工具栏","toolbarGroups":{"document":"文档","clipboard":"剪贴板/撤销","editing":"编辑","forms":"表单","basicstyles":"基本格式","paragraph":"段落","links":"链接","insert":"插入","styles":"样式","colors":"颜色","tools":"工具"},"toolbars":"工具栏"},"elementspath":{"eleLabel":"元素路径","eleTitle":"%1 元素"},"find":{"find":"查找","findOptions":"查找选项","findWhat":"查找:","matchCase":"区分大小写","matchCyclic":"循环匹配","matchWord":"全字匹配","notFoundMsg":"指定的文本没有找到。","replace":"替换","replaceAll":"全部替换","replaceSuccessMsg":"共完成 %1 处替换。","replaceWith":"替换:","title":"查找和替换"},"fakeobjects":{"anchor":"锚点","flash":"Flash 动画","hiddenfield":"隐藏域","iframe":"IFrame","unknown":"未知对象"},"flash":{"access":"允许脚本访问","accessAlways":"总是","accessNever":"从不","accessSameDomain":"同域","alignAbsBottom":"绝对底部","alignAbsMiddle":"绝对居中","alignBaseline":"基线","alignTextTop":"文本上方","bgcolor":"背景颜色","chkFull":"启用全屏","chkLoop":"循环","chkMenu":"启用 Flash 菜单","chkPlay":"自动播放","flashvars":"Flash 变量","hSpace":"水平间距","properties":"Flash 属性","propertiesTab":"属性","quality":"质量","qualityAutoHigh":"高(自动)","qualityAutoLow":"低(自动)","qualityBest":"最好","qualityHigh":"高","qualityLow":"低","qualityMedium":"中(自动)","scale":"缩放","scaleAll":"全部显示","scaleFit":"严格匹配","scaleNoBorder":"无边框","title":"标题","vSpace":"垂直间距","validateHSpace":"水平间距必须为数字格式","validateSrc":"请输入源文件地址","validateVSpace":"垂直间距必须为数字格式","windowMode":"窗体模式","windowModeOpaque":"不透明","windowModeTransparent":"透明","windowModeWindow":"窗体"},"font":{"fontSize":{"label":"大小","voiceLabel":"文字大小","panelTitle":"大小"},"label":"字体","panelTitle":"字体","voiceLabel":"字体"},"forms":{"button":{"title":"按钮属性","text":"标签(值)","type":"类型","typeBtn":"按钮","typeSbm":"提交","typeRst":"重设"},"checkboxAndRadio":{"checkboxTitle":"复选框属性","radioTitle":"单选按钮属性","value":"选定值","selected":"已勾选","required":"必选"},"form":{"title":"表单属性","menu":"表单属性","action":"动作","method":"方法","encoding":"表单编码"},"hidden":{"title":"隐藏域属性","name":"名称","value":"初始值"},"select":{"title":"菜单/列表属性","selectInfo":"选择信息","opAvail":"可选项","value":"值","size":"高度","lines":"行","chkMulti":"允许多选","required":"必选","opText":"选项文本","opValue":"选项值","btnAdd":"添加","btnModify":"修改","btnUp":"上移","btnDown":"下移","btnSetValue":"设为初始选定","btnDelete":"删除"},"textarea":{"title":"多行文本属性","cols":"字符宽度","rows":"行数"},"textfield":{"title":"单行文本属性","name":"名称","value":"初始值","charWidth":"字符宽度","maxChars":"最多字符数","required":"必填","type":"类型","typeText":"文本","typePass":"密码","typeEmail":"Email","typeSearch":"搜索","typeTel":"电话号码","typeUrl":"地址"}},"format":{"label":"格式","panelTitle":"格式","tag_address":"地址","tag_div":"段落(DIV)","tag_h1":"标题 1","tag_h2":"标题 2","tag_h3":"标题 3","tag_h4":"标题 4","tag_h5":"标题 5","tag_h6":"标题 6","tag_p":"普通","tag_pre":"已编排格式"},"horizontalrule":{"toolbar":"插入水平线"},"iframe":{"border":"显示框架边框","noUrl":"请输入框架的 URL","scrolling":"允许滚动条","title":"IFrame 属性","toolbar":"IFrame"},"image":{"alt":"替换文本","border":"边框大小","btnUpload":"上传到服务器","button2Img":"确定要把当前图像按钮转换为普通图像吗？","hSpace":"水平间距","img2Button":"确定要把当前图像改变为图像按钮吗？","infoTab":"图像信息","linkTab":"链接","lockRatio":"锁定比例","menu":"图像属性","resetSize":"原始尺寸","title":"图像属性","titleButton":"图像域属性","upload":"上传","urlMissing":"缺少图像源文件地址","vSpace":"垂直间距","validateBorder":"边框大小必须为整数格式","validateHSpace":"水平间距必须为整数格式","validateVSpace":"垂直间距必须为整数格式"},"indent":{"indent":"增加缩进量","outdent":"减少缩进量"},"smiley":{"options":"表情图标选项","title":"插入表情图标","toolbar":"表情符"},"justify":{"block":"两端对齐","center":"居中","left":"左对齐","right":"右对齐"},"language":{"button":"设置语言","remove":"移除语言"},"link":{"acccessKey":"访问键","advanced":"高级","advisoryContentType":"内容类型","advisoryTitle":"标题","anchor":{"toolbar":"插入/编辑锚点链接","menu":"锚点链接属性","title":"锚点链接属性","name":"锚点名称","errorName":"请输入锚点名称","remove":"删除锚点"},"anchorId":"按锚点 ID","anchorName":"按锚点名称","charset":"字符编码","cssClasses":"样式类名称","emailAddress":"地址","emailBody":"内容","emailSubject":"主题","id":"ID","info":"超链接信息","langCode":"语言代码","langDir":"语言方向","langDirLTR":"从左到右 (LTR)","langDirRTL":"从右到左 (RTL)","menu":"编辑超链接","name":"名称","noAnchors":"(此文档没有可用的锚点)","noEmail":"请输入电子邮件地址","noUrl":"请输入超链接地址","other":"<其他>","popupDependent":"依附 (NS)","popupFeatures":"弹出窗口属性","popupFullScreen":"全屏 (IE)","popupLeft":"左","popupLocationBar":"地址栏","popupMenuBar":"菜单栏","popupResizable":"可缩放","popupScrollBars":"滚动条","popupStatusBar":"状态栏","popupToolbar":"工具栏","popupTop":"右","rel":"关联","selectAnchor":"选择一个锚点","styles":"行内样式","tabIndex":"Tab 键次序","target":"目标","targetFrame":"<框架>","targetFrameName":"目标框架名称","targetPopup":"<弹出窗口>","targetPopupName":"弹出窗口名称","title":"超链接","toAnchor":"页内锚点链接","toEmail":"电子邮件","toUrl":"地址","toolbar":"插入/编辑超链接","type":"超链接类型","unlink":"取消超链接","upload":"上传"},"list":{"bulletedlist":"项目列表","numberedlist":"编号列表"},"liststyle":{"armenian":"传统的亚美尼亚编号方式","bulletedTitle":"项目列表属性","circle":"空心圆","decimal":"数字 (1, 2, 3, 等)","decimalLeadingZero":"0开头的数字标记(01, 02, 03, 等)","disc":"实心圆","georgian":"传统的乔治亚编号方式(an, ban, gan, 等)","lowerAlpha":"小写英文字母(a, b, c, d, e, 等)","lowerGreek":"小写希腊字母(alpha, beta, gamma, 等)","lowerRoman":"小写罗马数字(i, ii, iii, iv, v, 等)","none":"无标记","notset":"<没有设置>","numberedTitle":"编号列表属性","square":"实心方块","start":"开始序号","type":"标记类型","upperAlpha":"大写英文字母(A, B, C, D, E, 等)","upperRoman":"大写罗马数字(I, II, III, IV, V, 等)","validateStartNumber":"列表开始序号必须为整数格式"},"magicline":{"title":"在这插入段落"},"maximize":{"maximize":"全屏","minimize":"最小化"},"newpage":{"toolbar":"新建"},"pagebreak":{"alt":"分页符","toolbar":"插入打印分页符"},"pastetext":{"button":"粘贴为无格式文本","title":"粘贴为无格式文本"},"pastefromword":{"confirmCleanup":"您要粘贴的内容好像是来自 MS Word，是否要清除 MS Word 格式后再粘贴？","error":"由于内部错误无法清理要粘贴的数据","title":"从 MS Word 粘贴","toolbar":"从 MS Word 粘贴"},"preview":{"preview":"预览"},"print":{"toolbar":"打印"},"removeformat":{"toolbar":"清除格式"},"save":{"toolbar":"保存"},"selectall":{"toolbar":"全选"},"showblocks":{"toolbar":"显示区块"},"sourcearea":{"toolbar":"源码"},"specialchar":{"options":"特殊符号选项","title":"选择特殊符号","toolbar":"插入特殊符号"},"scayt":{"btn_about":"关于即时拼写检查","btn_dictionaries":"字典","btn_disable":"禁用即时拼写检查","btn_enable":"启用即时拼写检查","btn_langs":"语言","btn_options":"选项","text_title":"即时拼写检查"},"stylescombo":{"label":"样式","panelTitle":"样式","panelTitle1":"块级元素样式","panelTitle2":"内联元素样式","panelTitle3":"对象元素样式"},"table":{"border":"边框","caption":"标题","cell":{"menu":"单元格","insertBefore":"在左侧插入单元格","insertAfter":"在右侧插入单元格","deleteCell":"删除单元格","merge":"合并单元格","mergeRight":"向右合并单元格","mergeDown":"向下合并单元格","splitHorizontal":"水平拆分单元格","splitVertical":"垂直拆分单元格","title":"单元格属性","cellType":"单元格类型","rowSpan":"纵跨行数","colSpan":"横跨列数","wordWrap":"自动换行","hAlign":"水平对齐","vAlign":"垂直对齐","alignBaseline":"基线","bgColor":"背景颜色","borderColor":"边框颜色","data":"数据","header":"表头","yes":"是","no":"否","invalidWidth":"单元格宽度必须为数字格式","invalidHeight":"单元格高度必须为数字格式","invalidRowSpan":"行跨度必须为整数格式","invalidColSpan":"列跨度必须为整数格式","chooseColor":"选择"},"cellPad":"边距","cellSpace":"间距","column":{"menu":"列","insertBefore":"在左侧插入列","insertAfter":"在右侧插入列","deleteColumn":"删除列"},"columns":"列数","deleteTable":"删除表格","headers":"标题单元格","headersBoth":"第一列和第一行","headersColumn":"第一列","headersNone":"无","headersRow":"第一行","invalidBorder":"边框粗细必须为数字格式","invalidCellPadding":"单元格填充必须为数字格式","invalidCellSpacing":"单元格间距必须为数字格式","invalidCols":"指定的行数必须大于零","invalidHeight":"表格高度必须为数字格式","invalidRows":"指定的列数必须大于零","invalidWidth":"表格宽度必须为数字格式","menu":"表格属性","row":{"menu":"行","insertBefore":"在上方插入行","insertAfter":"在下方插入行","deleteRow":"删除行"},"rows":"行数","summary":"摘要","title":"表格属性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"宽度单位"},"undo":{"redo":"重做","undo":"撤消"},"wsc":{"btnIgnore":"忽略","btnIgnoreAll":"全部忽略","btnReplace":"替换","btnReplaceAll":"全部替换","btnUndo":"撤消","changeTo":"更改为","errorLoading":"加载应该服务主机时出错: %s.","ieSpellDownload":"拼写检查插件还没安装, 您是否想现在就下载?","manyChanges":"拼写检查完成: 更改了 %1 个单词","noChanges":"拼写检查完成: 没有更改任何单词","noMispell":"拼写检查完成: 没有发现拼写错误","noSuggestions":"- 没有建议 -","notAvailable":"抱歉, 服务目前暂不可用","notInDic":"没有在字典里","oneChange":"拼写检查完成: 更改了一个单词","progress":"正在进行拼写检查...","title":"拼写检查","toolbar":"拼写检查"}};
\ No newline at end of file
+CKEDITOR.lang['zh-cn']={"editor":"所见即所得编辑器","editorPanel":"所见即所得编辑器面板","common":{"editorHelp":"按 ALT+0 获得帮助","browseServer":"浏览服务器","url":"URL","protocol":"协议","upload":"上传","uploadSubmit":"上传到服务器","image":"图像","flash":"Flash","form":"表单","checkbox":"复选框","radio":"单选按钮","textField":"单行文本","textarea":"多行文本","hiddenField":"隐藏域","button":"按钮","select":"列表/菜单","imageButton":"图像按钮","notSet":"<没有设置>","id":"ID","name":"名称","langDir":"语言方向","langDirLtr":"从左到右 (LTR)","langDirRtl":"从右到左 (RTL)","langCode":"语言代码","longDescr":"详细说明 URL","cssClass":"样式类名称","advisoryTitle":"标题","cssStyle":"行内样式","ok":"确定","cancel":"取消","close":"关闭","preview":"预览","resize":"拖拽以改变大小","generalTab":"常规","advancedTab":"高级","validateNumberFailed":"需要输入数字格式","confirmNewPage":"当前文档内容未保存，是否确认新建文档？","confirmCancel":"部分修改尚未保存，是否确认关闭对话框？","options":"选项","target":"目标窗口","targetNew":"新窗口 (_blank)","targetTop":"整页 (_top)","targetSelf":"本窗口 (_self)","targetParent":"父窗口 (_parent)","langDirLTR":"从左到右 (LTR)","langDirRTL":"从右到左 (RTL)","styles":"样式","cssClasses":"样式类","width":"宽度","height":"高度","align":"对齐方式","alignLeft":"左对齐","alignRight":"右对齐","alignCenter":"居中","alignJustify":"两端对齐","alignTop":"顶端","alignMiddle":"居中","alignBottom":"底部","alignNone":"无","invalidValue":"无效的值。","invalidHeight":"高度必须为数字格式","invalidWidth":"宽度必须为数字格式","invalidCssLength":"此“%1”字段的值必须为正数，可以包含或不包含一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)","invalidHtmlLength":"此“%1”字段的值必须为正数，可以包含或不包含一个有效的 HTML 长度单位(px 或 %)","invalidInlineStyle":"内联样式必须为格式是以分号分隔的一个或多个“属性名 : 属性值”。","cssLengthTooltip":"输入一个表示像素值的数字，或加上一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，不可用</span>","keyboard":{"8":"退格键","13":"回车键","16":"Shift","17":"Ctrl","18":"Alt","32":"空格键","35":"行尾键","36":"行首键","46":"删除键","224":"Command"},"keyboardShortcut":"快捷键"},"about":{"copy":"版权所有 &copy; $1。<br />保留所有权利。","dlgTitle":"关于 CKEditor","help":"访问 $1 以获取帮助。","moreInfo":"相关授权许可信息请访问我们的网站：","title":"关于 CKEditor","userGuide":"CKEditor 用户向导"},"basicstyles":{"bold":"加粗","italic":"倾斜","strike":"删除线","subscript":"下标","superscript":"上标","underline":"下划线"},"bidi":{"ltr":"文字方向为从左至右","rtl":"文字方向为从右至左"},"blockquote":{"toolbar":"块引用"},"clipboard":{"copy":"复制","copyError":"您的浏览器安全设置不允许编辑器自动执行复制操作，请使用键盘快捷键(Ctrl/Cmd+C)来完成。","cut":"剪切","cutError":"您的浏览器安全设置不允许编辑器自动执行剪切操作，请使用键盘快捷键(Ctrl/Cmd+X)来完成。","paste":"粘贴","pasteArea":"粘贴区域","pasteMsg":"请使用键盘快捷键(<STRONG>Ctrl/Cmd+V</STRONG>)把内容粘贴到下面的方框里，再按 <STRONG>确定</STRONG>","securityMsg":"因为您的浏览器的安全设置原因，本编辑器不能直接访问您的剪贴板内容，你需要在本窗口重新粘贴一次。","title":"粘贴"},"button":{"selectedLabel":"已选中 %1 项"},"colorbutton":{"auto":"自动","bgColorTitle":"背景颜色","colors":{"000":"黑","800000":"褐红","8B4513":"深褐","2F4F4F":"墨绿","008080":"绿松石","000080":"海军蓝","4B0082":"靛蓝","696969":"暗灰","B22222":"砖红","A52A2A":"褐","DAA520":"金黄","006400":"深绿","40E0D0":"蓝绿","0000CD":"中蓝","800080":"紫","808080":"灰","F00":"红","FF8C00":"深橙","FFD700":"金","008000":"绿","0FF":"青","00F":"蓝","EE82EE":"紫罗兰","A9A9A9":"深灰","FFA07A":"亮橙","FFA500":"橙","FFFF00":"黄","00FF00":"水绿","AFEEEE":"粉蓝","ADD8E6":"亮蓝","DDA0DD":"梅红","D3D3D3":"淡灰","FFF0F5":"淡紫红","FAEBD7":"古董白","FFFFE0":"淡黄","F0FFF0":"蜜白","F0FFFF":"天蓝","F0F8FF":"淡蓝","E6E6FA":"淡紫","FFF":"白","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"其它颜色...","panelTitle":"颜色","textColorTitle":"文本颜色"},"colordialog":{"clear":"清除","highlight":"高亮","options":"颜色选项","selected":"选择颜色","title":"选择颜色"},"templates":{"button":"模板","emptyListMsg":"(没有模板)","insertOption":"替换当前内容","options":"模板选项","selectPromptMsg":"请选择要在编辑器中使用的模板：","title":"内容模板"},"contextmenu":{"options":"快捷菜单选项"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"标题","cssClassInputLabel":"样式类名称","edit":"编辑 DIV","inlineStyleInputLabel":"行内样式","langDirLTRLabel":"从左到右 (LTR)","langDirLabel":"语言方向","langDirRTLLabel":"从右到左 (RTL)","languageCodeInputLabel":"语言代码","remove":"移除 DIV","styleSelectLabel":"样式","title":"创建 DIV 容器","toolbar":"创建 DIV 容器"},"toolbar":{"toolbarCollapse":"折叠工具栏","toolbarExpand":"展开工具栏","toolbarGroups":{"document":"文档","clipboard":"剪贴板/撤销","editing":"编辑","forms":"表单","basicstyles":"基本格式","paragraph":"段落","links":"链接","insert":"插入","styles":"样式","colors":"颜色","tools":"工具"},"toolbars":"工具栏"},"elementspath":{"eleLabel":"元素路径","eleTitle":"%1 元素"},"find":{"find":"查找","findOptions":"查找选项","findWhat":"查找:","matchCase":"区分大小写","matchCyclic":"循环匹配","matchWord":"全字匹配","notFoundMsg":"指定的文本没有找到。","replace":"替换","replaceAll":"全部替换","replaceSuccessMsg":"共完成 %1 处替换。","replaceWith":"替换:","title":"查找和替换"},"fakeobjects":{"anchor":"锚点","flash":"Flash 动画","hiddenfield":"隐藏域","iframe":"IFrame","unknown":"未知对象"},"flash":{"access":"允许脚本访问","accessAlways":"总是","accessNever":"从不","accessSameDomain":"同域","alignAbsBottom":"绝对底部","alignAbsMiddle":"绝对居中","alignBaseline":"基线","alignTextTop":"文本上方","bgcolor":"背景颜色","chkFull":"启用全屏","chkLoop":"循环","chkMenu":"启用 Flash 菜单","chkPlay":"自动播放","flashvars":"Flash 变量","hSpace":"水平间距","properties":"Flash 属性","propertiesTab":"属性","quality":"质量","qualityAutoHigh":"高(自动)","qualityAutoLow":"低(自动)","qualityBest":"最好","qualityHigh":"高","qualityLow":"低","qualityMedium":"中(自动)","scale":"缩放","scaleAll":"全部显示","scaleFit":"严格匹配","scaleNoBorder":"无边框","title":"标题","vSpace":"垂直间距","validateHSpace":"水平间距必须为数字格式","validateSrc":"请输入源文件地址","validateVSpace":"垂直间距必须为数字格式","windowMode":"窗体模式","windowModeOpaque":"不透明","windowModeTransparent":"透明","windowModeWindow":"窗体"},"font":{"fontSize":{"label":"大小","voiceLabel":"文字大小","panelTitle":"大小"},"label":"字体","panelTitle":"字体","voiceLabel":"字体"},"forms":{"button":{"title":"按钮属性","text":"标签(值)","type":"类型","typeBtn":"按钮","typeSbm":"提交","typeRst":"重设"},"checkboxAndRadio":{"checkboxTitle":"复选框属性","radioTitle":"单选按钮属性","value":"选定值","selected":"已勾选","required":"必选项"},"form":{"title":"表单属性","menu":"表单属性","action":"动作","method":"方法","encoding":"表单编码"},"hidden":{"title":"隐藏域属性","name":"名称","value":"初始值"},"select":{"title":"菜单/列表属性","selectInfo":"选择信息","opAvail":"可选项","value":"值","size":"高度","lines":"行","chkMulti":"允许多选","required":"必选项","opText":"选项文本","opValue":"选项值","btnAdd":"添加","btnModify":"修改","btnUp":"上移","btnDown":"下移","btnSetValue":"设为初始选定","btnDelete":"删除"},"textarea":{"title":"多行文本属性","cols":"字符宽度","rows":"行数"},"textfield":{"title":"单行文本属性","name":"名称","value":"初始值","charWidth":"字符宽度","maxChars":"最多字符数","required":"必填项","type":"类型","typeText":"文本","typePass":"密码","typeEmail":"Email","typeSearch":"搜索","typeTel":"电话号码","typeUrl":"地址"}},"format":{"label":"格式","panelTitle":"格式","tag_address":"地址","tag_div":"段落(DIV)","tag_h1":"标题 1","tag_h2":"标题 2","tag_h3":"标题 3","tag_h4":"标题 4","tag_h5":"标题 5","tag_h6":"标题 6","tag_p":"普通","tag_pre":"已编排格式"},"horizontalrule":{"toolbar":"插入水平线"},"iframe":{"border":"显示框架边框","noUrl":"请输入框架的 URL","scrolling":"允许滚动条","title":"IFrame 属性","toolbar":"IFrame"},"image":{"alt":"替换文本","border":"边框大小","btnUpload":"上传到服务器","button2Img":"确定要把当前图像按钮转换为普通图像吗？","hSpace":"水平间距","img2Button":"确定要把当前图像改变为图像按钮吗？","infoTab":"图像信息","linkTab":"链接","lockRatio":"锁定比例","menu":"图像属性","resetSize":"原始尺寸","title":"图像属性","titleButton":"图像域属性","upload":"上传","urlMissing":"缺少图像源文件地址","vSpace":"垂直间距","validateBorder":"边框大小必须为整数格式","validateHSpace":"水平间距必须为整数格式","validateVSpace":"垂直间距必须为整数格式"},"indent":{"indent":"增加缩进量","outdent":"减少缩进量"},"smiley":{"options":"表情图标选项","title":"插入表情图标","toolbar":"表情符"},"justify":{"block":"两端对齐","center":"居中","left":"左对齐","right":"右对齐"},"language":{"button":"设置语言","remove":"移除语言"},"link":{"acccessKey":"访问键","advanced":"高级","advisoryContentType":"内容类型","advisoryTitle":"标题","anchor":{"toolbar":"插入/编辑锚点链接","menu":"锚点链接属性","title":"锚点链接属性","name":"锚点名称","errorName":"请输入锚点名称","remove":"删除锚点"},"anchorId":"按锚点 ID","anchorName":"按锚点名称","charset":"字符编码","cssClasses":"样式类名称","download":"强制下载","displayText":"显示文本","emailAddress":"地址","emailBody":"内容","emailSubject":"主题","id":"ID","info":"超链接信息","langCode":"语言代码","langDir":"语言方向","langDirLTR":"从左到右 (LTR)","langDirRTL":"从右到左 (RTL)","menu":"编辑超链接","name":"名称","noAnchors":"(此文档没有可用的锚点)","noEmail":"请输入电子邮件地址","noUrl":"请输入超链接地址","other":"<其他>","popupDependent":"依附 (NS)","popupFeatures":"弹出窗口属性","popupFullScreen":"全屏 (IE)","popupLeft":"左","popupLocationBar":"地址栏","popupMenuBar":"菜单栏","popupResizable":"可缩放","popupScrollBars":"滚动条","popupStatusBar":"状态栏","popupToolbar":"工具栏","popupTop":"右","rel":"关联","selectAnchor":"选择一个锚点","styles":"行内样式","tabIndex":"Tab 键次序","target":"目标","targetFrame":"<框架>","targetFrameName":"目标框架名称","targetPopup":"<弹出窗口>","targetPopupName":"弹出窗口名称","title":"超链接","toAnchor":"页内锚点链接","toEmail":"电子邮件","toUrl":"地址","toolbar":"插入/编辑超链接","type":"超链接类型","unlink":"取消超链接","upload":"上传"},"list":{"bulletedlist":"项目列表","numberedlist":"编号列表"},"liststyle":{"armenian":"传统的亚美尼亚编号方式","bulletedTitle":"项目列表属性","circle":"空心圆","decimal":"数字 (1, 2, 3, 等)","decimalLeadingZero":"0开头的数字标记(01, 02, 03, 等)","disc":"实心圆","georgian":"传统的乔治亚编号方式(an, ban, gan, 等)","lowerAlpha":"小写英文字母(a, b, c, d, e, 等)","lowerGreek":"小写希腊字母(alpha, beta, gamma, 等)","lowerRoman":"小写罗马数字(i, ii, iii, iv, v, 等)","none":"无标记","notset":"<没有设置>","numberedTitle":"编号列表属性","square":"实心方块","start":"开始序号","type":"标记类型","upperAlpha":"大写英文字母(A, B, C, D, E, 等)","upperRoman":"大写罗马数字(I, II, III, IV, V, 等)","validateStartNumber":"列表开始序号必须为整数格式"},"magicline":{"title":"在这插入段落"},"maximize":{"maximize":"全屏","minimize":"最小化"},"newpage":{"toolbar":"新建"},"pagebreak":{"alt":"分页符","toolbar":"插入打印分页符"},"pastetext":{"button":"粘贴为无格式文本","title":"粘贴为无格式文本"},"pastefromword":{"confirmCleanup":"您要粘贴的内容好像是来自 MS Word，是否要清除 MS Word 格式后再粘贴？","error":"由于内部错误无法清理要粘贴的数据","title":"从 MS Word 粘贴","toolbar":"从 MS Word 粘贴"},"preview":{"preview":"预览"},"print":{"toolbar":"打印"},"removeformat":{"toolbar":"清除格式"},"save":{"toolbar":"保存"},"selectall":{"toolbar":"全选"},"showblocks":{"toolbar":"显示区块"},"sourcearea":{"toolbar":"源码"},"specialchar":{"options":"特殊符号选项","title":"选择特殊符号","toolbar":"插入特殊符号"},"scayt":{"btn_about":"关于即时拼写检查","btn_dictionaries":"字典","btn_disable":"禁用即时拼写检查","btn_enable":"启用即时拼写检查","btn_langs":"语言","btn_options":"选项","text_title":"即时拼写检查"},"stylescombo":{"label":"样式","panelTitle":"样式","panelTitle1":"块级元素样式","panelTitle2":"内联元素样式","panelTitle3":"对象元素样式"},"table":{"border":"边框","caption":"标题","cell":{"menu":"单元格","insertBefore":"在左侧插入单元格","insertAfter":"在右侧插入单元格","deleteCell":"删除单元格","merge":"合并单元格","mergeRight":"向右合并单元格","mergeDown":"向下合并单元格","splitHorizontal":"水平拆分单元格","splitVertical":"垂直拆分单元格","title":"单元格属性","cellType":"单元格类型","rowSpan":"纵跨行数","colSpan":"横跨列数","wordWrap":"自动换行","hAlign":"水平对齐","vAlign":"垂直对齐","alignBaseline":"基线","bgColor":"背景颜色","borderColor":"边框颜色","data":"数据","header":"表头","yes":"是","no":"否","invalidWidth":"单元格宽度必须为数字格式","invalidHeight":"单元格高度必须为数字格式","invalidRowSpan":"行跨度必须为整数格式","invalidColSpan":"列跨度必须为整数格式","chooseColor":"选择"},"cellPad":"边距","cellSpace":"间距","column":{"menu":"列","insertBefore":"在左侧插入列","insertAfter":"在右侧插入列","deleteColumn":"删除列"},"columns":"列数","deleteTable":"删除表格","headers":"标题单元格","headersBoth":"第一列和第一行","headersColumn":"第一列","headersNone":"无","headersRow":"第一行","invalidBorder":"边框粗细必须为数字格式","invalidCellPadding":"单元格填充必须为数字格式","invalidCellSpacing":"单元格间距必须为数字格式","invalidCols":"指定的行数必须大于零","invalidHeight":"表格高度必须为数字格式","invalidRows":"指定的列数必须大于零","invalidWidth":"表格宽度必须为数字格式","menu":"表格属性","row":{"menu":"行","insertBefore":"在上方插入行","insertAfter":"在下方插入行","deleteRow":"删除行"},"rows":"行数","summary":"摘要","title":"表格属性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"宽度单位"},"undo":{"redo":"重做","undo":"撤消"},"wsc":{"btnIgnore":"忽略","btnIgnoreAll":"全部忽略","btnReplace":"替换","btnReplaceAll":"全部替换","btnUndo":"撤消","changeTo":"更改为","errorLoading":"加载应该服务主机时出错: %s.","ieSpellDownload":"拼写检查插件还没安装, 您是否想现在就下载?","manyChanges":"拼写检查完成: 更改了 %1 个单词","noChanges":"拼写检查完成: 没有更改任何单词","noMispell":"拼写检查完成: 没有发现拼写错误","noSuggestions":"- 没有建议 -","notAvailable":"抱歉, 服务目前暂不可用","notInDic":"没有在字典里","oneChange":"拼写检查完成: 更改了一个单词","progress":"正在进行拼写检查...","title":"拼写检查","toolbar":"拼写检查"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/lang/zh.js
index b7d023ad512..59ee7cf4d89 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/zh.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/zh.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['zh']={"editor":"RTF 編輯器","editorPanel":"RTF 編輯器面板","common":{"editorHelp":"按下 ALT 0 取得說明。","browseServer":"瀏覽伺服器","url":"URL","protocol":"通訊協定","upload":"上傳","uploadSubmit":"傳送至伺服器","image":"圖像","flash":"Flash","form":"表格","checkbox":"核取方塊","radio":"選項按鈕","textField":"文字欄位","textarea":"文字區域","hiddenField":"隱藏欄位","button":"按鈕","select":"選取欄位","imageButton":"影像按鈕","notSet":"<未設定>","id":"ID","name":"名稱","langDir":"語言方向","langDirLtr":"由左至右 (LTR)","langDirRtl":"由右至左 (RTL)","langCode":"語言代碼","longDescr":"完整描述 URL","cssClass":"樣式表類別","advisoryTitle":"標題","cssStyle":"樣式","ok":"確定","cancel":"取消","close":"關閉","preview":"預覽","resize":"調整大小","generalTab":"一般","advancedTab":"進階","validateNumberFailed":"此值不是數值。","confirmNewPage":"現存的修改尚未儲存，要開新檔案？","confirmCancel":"部份選項尚未儲存，要關閉對話框？","options":"選項","target":"目標","targetNew":"開新視窗 (_blank)","targetTop":"最上層視窗 (_top)","targetSelf":"相同視窗 (_self)","targetParent":"父視窗 (_parent)","langDirLTR":"由左至右 (LTR)","langDirRTL":"由右至左 (RTL)","styles":"樣式","cssClasses":"樣式表類別","width":"寬度","height":"高度","align":"對齊方式","alignLeft":"靠左對齊","alignRight":"靠右對齊","alignCenter":"置中對齊","alignJustify":"左右對齊","alignTop":"頂端","alignMiddle":"中間對齊","alignBottom":"底端","alignNone":"無","invalidValue":"無效值。","invalidHeight":"高度必須為數字。","invalidWidth":"寬度必須為數字。","invalidCssLength":"「%1」的值應為正數，並可包含有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","invalidHtmlLength":"「%1」的值應為正數，並可包含有效的 HTML 單位 (px 或 %)。","invalidInlineStyle":"行內樣式的值應包含一個以上的變數值組，其格式如「名稱:值」，並以分號區隔之。","cssLengthTooltip":"請輸入數值，單位是像素或有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，無法使用</span>"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"關於 CKEditor","help":"檢閱 $1 尋求幫助。","moreInfo":"關於授權資訊，請參閱我們的網站：","title":"關於 CKEditor","userGuide":"CKEditor 使用者手冊"},"basicstyles":{"bold":"粗體","italic":"斜體","strike":"刪除線","subscript":"下標","superscript":"上標","underline":"底線"},"bidi":{"ltr":"文字方向從左至右","rtl":"文字方向從右至左"},"blockquote":{"toolbar":"引用段落"},"clipboard":{"copy":"複製","copyError":"瀏覽器的安全性設定不允許編輯器自動執行複製動作。請使用鍵盤快捷鍵 (Ctrl/Cmd+C) 複製。","cut":"剪下","cutError":"瀏覽器的安全性設定不允許編輯器自動執行剪下動作。請使用鏐盤快捷鍵 (Ctrl/Cmd+X) 剪下。","paste":"貼上","pasteArea":"貼上區","pasteMsg":"請使用鍵盤快捷鍵 (<strong>Ctrl/Cmd+V</strong>) 貼到下方區域中並按下「確定」。","securityMsg":"因為瀏覽器的安全性設定，本編輯器無法直接存取您的剪貼簿資料，請您自行在本視窗進行貼上動作。","title":"貼上"},"button":{"selectedLabel":"%1 (已選取)"},"colorbutton":{"auto":"自動","bgColorTitle":"背景顏色","colors":{"000":"黑色","800000":"栗色","8B4513":"鞍褐色","2F4F4F":"暗瓦灰色","008080":"水壓色","000080":"丈青澀","4B0082":"靛青","696969":"深灰色","B22222":"磚紅色","A52A2A":"褐色","DAA520":"金黃色","006400":"深綠色","40E0D0":"青綠色","0000CD":"藍色","800080":"紫色","808080":"灰色","F00":"紅色","FF8C00":"深橘色","FFD700":"金色","008000":"綠色","0FF":"藍綠色","00F":"藍色","EE82EE":"紫色","A9A9A9":"暗灰色","FFA07A":"亮鮭紅","FFA500":"橘色","FFFF00":"黃色","00FF00":"鮮綠色","AFEEEE":"綠松色","ADD8E6":"淺藍色","DDA0DD":"枚紅色","D3D3D3":"淺灰色","FFF0F5":"淺紫色","FAEBD7":"骨董白","FFFFE0":"淺黃色","F0FFF0":"蜜瓜綠","F0FFFF":"天藍色","F0F8FF":"愛麗斯蘭","E6E6FA":"淺紫色","FFF":"白色"},"more":"更多顏色","panelTitle":"顏色","textColorTitle":"文字顏色"},"colordialog":{"clear":"清除","highlight":"高亮","options":"色彩選項","selected":"選取的色彩","title":"選取色彩"},"templates":{"button":"範本","emptyListMsg":"(尚未定義任何範本)","insertOption":"替代實際內容","options":"範本選項","selectPromptMsg":"請選擇要在編輯器中開啟的範本。","title":"內容範本"},"contextmenu":{"options":"內容功能表選項"},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"標題","cssClassInputLabel":"樣式表類別","edit":"編輯 Div","inlineStyleInputLabel":"行內樣式","langDirLTRLabel":"由左至右 (LTR)","langDirLabel":"語言方向","langDirRTLLabel":"由右至左 (RTL)","languageCodeInputLabel":"語言碼","remove":"移除 Div","styleSelectLabel":"樣式","title":"建立 Div 容器","toolbar":"建立 Div 容器"},"toolbar":{"toolbarCollapse":"摺疊工具列","toolbarExpand":"展開工具列","toolbarGroups":{"document":"文件","clipboard":"剪貼簿/復原","editing":"編輯選項","forms":"格式","basicstyles":"基本樣式","paragraph":"段落","links":"連結","insert":"插入","styles":"樣式","colors":"顏色","tools":"工具"},"toolbars":"編輯器工具列"},"elementspath":{"eleLabel":"元件路徑","eleTitle":"%1 個元件"},"find":{"find":"尋找","findOptions":"尋找選項","findWhat":"尋找目標：","matchCase":"大小寫須相符","matchCyclic":"循環搜尋","matchWord":"全字拼寫須相符","notFoundMsg":"找不到指定的文字。","replace":"取代","replaceAll":"全部取代","replaceSuccessMsg":"已取代  %1 個指定項目。","replaceWith":"取代成：","title":"尋找及取代"},"fakeobjects":{"anchor":"錨點","flash":"Flash 動畫","hiddenfield":"隱藏欄位","iframe":"IFrame","unknown":"無法辨識的物件"},"flash":{"access":"腳本存取","accessAlways":"永遠","accessNever":"從不","accessSameDomain":"相同網域","alignAbsBottom":"絕對下方","alignAbsMiddle":"絕對置中","alignBaseline":"基準線","alignTextTop":"上層文字","bgcolor":"背景顏色","chkFull":"允許全螢幕","chkLoop":"重複播放","chkMenu":"啟用 Flash 選單","chkPlay":"自動播放","flashvars":"Flash 變數","hSpace":"HSpace","properties":"Flash 屬性​​","propertiesTab":"屬性","quality":"品質","qualityAutoHigh":"自動高","qualityAutoLow":"自動低","qualityBest":"最佳","qualityHigh":"高","qualityLow":"低","qualityMedium":"中","scale":"縮放比例","scaleAll":"全部顯示","scaleFit":"最適化","scaleNoBorder":"無框線","title":"Flash 屬性​​","vSpace":"VSpace","validateHSpace":"HSpace 必須為數字。","validateSrc":"URL 不可為空白。","validateVSpace":"VSpace  必須為數字。","windowMode":"視窗模式","windowModeOpaque":"不透明","windowModeTransparent":"透明","windowModeWindow":"視窗"},"font":{"fontSize":{"label":"大小","voiceLabel":"字型大小","panelTitle":"字型大小"},"label":"字型","panelTitle":"字型名稱","voiceLabel":"字型"},"forms":{"button":{"title":"按鈕內容","text":"顯示文字 (值)","type":"類型","typeBtn":"按鈕","typeSbm":"送出","typeRst":"重設"},"checkboxAndRadio":{"checkboxTitle":"核取方塊內容","radioTitle":"選項按鈕內容","value":"數值","selected":"已選","required":"必填"},"form":{"title":"表單內容","menu":"表單內容","action":"動作","method":"方式","encoding":"編碼"},"hidden":{"title":"隱藏欄位內容","name":"名稱","value":"數值"},"select":{"title":"選取欄位內容","selectInfo":"選擇資訊","opAvail":"可用選項","value":"數值","size":"大小","lines":"行數","chkMulti":"允許多選","required":"必填","opText":"文字","opValue":"數值","btnAdd":"新增","btnModify":"修改","btnUp":"向上","btnDown":"向下","btnSetValue":"設為已選","btnDelete":"刪除"},"textarea":{"title":"文字區域內容","cols":"列","rows":"行"},"textfield":{"title":"文字欄位內容","name":"名字","value":"數值","charWidth":"字元寬度","maxChars":"最大字元數","required":"必填","type":"類型","typeText":"文字","typePass":"密碼","typeEmail":"電子郵件","typeSearch":"搜尋","typeTel":"電話號碼","typeUrl":"URL"}},"format":{"label":"格式","panelTitle":"段落格式","tag_address":"地址","tag_div":"標準 (DIV)","tag_h1":"標題 1","tag_h2":"標題 2","tag_h3":"標題 3","tag_h4":"標題 4","tag_h5":"標題 5","tag_h6":"標題 6","tag_p":"標準","tag_pre":"格式設定"},"horizontalrule":{"toolbar":"插入水平線"},"iframe":{"border":"顯示框架框線","noUrl":"請輸入 iframe URL","scrolling":"啟用捲軸列","title":"IFrame 屬性","toolbar":"IFrame"},"image":{"alt":"替代文字","border":"框線","btnUpload":"傳送到伺服器","button2Img":"請問您確定要將「圖片按鈕」轉換成「圖片」嗎？","hSpace":"HSpace","img2Button":"請問您確定要將「圖片」轉換成「圖片按鈕」嗎？","infoTab":"影像資訊","linkTab":"連結","lockRatio":"固定比例","menu":"影像屬性","resetSize":"重設大小","title":"影像屬性","titleButton":"影像按鈕屬性","upload":"上傳","urlMissing":"遺失圖片來源之 URL ","vSpace":"VSpace","validateBorder":"框線必須是整數。","validateHSpace":"HSpace 必須是整數。","validateVSpace":"VSpace 必須是整數。"},"indent":{"indent":"增加縮排","outdent":"減少縮排"},"smiley":{"options":"表情符號選項","title":"插入表情符號","toolbar":"表情符號"},"justify":{"block":"左右對齊","center":"置中","left":"靠左對齊","right":"靠右對齊"},"language":{"button":"設定語言","remove":"移除語言"},"link":{"acccessKey":"便捷鍵","advanced":"進階","advisoryContentType":"建議內容類型","advisoryTitle":"標題","anchor":{"toolbar":"錨點","menu":"編輯錨點","title":"錨點內容","name":"錨點名稱","errorName":"請輸入錨點名稱","remove":"移除錨點"},"anchorId":"依元件編號","anchorName":"依錨點名稱","charset":"連結資源的字元集","cssClasses":"樣式表類別","emailAddress":"電子郵件地址","emailBody":"郵件本文","emailSubject":"郵件主旨","id":"ID","info":"連結資訊","langCode":"語言碼","langDir":"語言方向","langDirLTR":"由左至右 (LTR)","langDirRTL":"由右至左 (RTL)","menu":"編輯連結","name":"名稱","noAnchors":"(本文件中無可用之錨點)","noEmail":"請輸入電子郵件","noUrl":"請輸入連結 URL","other":"<其他>","popupDependent":"獨立 (Netscape)","popupFeatures":"快顯視窗功能","popupFullScreen":"全螢幕 (IE)","popupLeft":"左側位置","popupLocationBar":"位置列","popupMenuBar":"功能表列","popupResizable":"可調大小","popupScrollBars":"捲軸","popupStatusBar":"狀態列","popupToolbar":"工具列","popupTop":"頂端位置","rel":"關係","selectAnchor":"選取一個錨點","styles":"樣式","tabIndex":"定位順序","target":"目標","targetFrame":"<框架>","targetFrameName":"目標框架名稱","targetPopup":"<快顯視窗>","targetPopupName":"快顯視窗名稱","title":"連結","toAnchor":"文字中的錨點連結","toEmail":"電子郵件","toUrl":"網址","toolbar":"連結","type":"連結類型","unlink":"取消連結","upload":"上傳"},"list":{"bulletedlist":"插入/移除項目符號清單","numberedlist":"插入/移除編號清單清單"},"liststyle":{"armenian":"亞美尼亞數字","bulletedTitle":"項目符號清單屬性","circle":"圓圈","decimal":"小數點 (1, 2, 3, etc.)","decimalLeadingZero":"前綴 0 十位數字 (01, 02, 03, 等)","disc":"圓點","georgian":"喬治王時代數字 (an, ban, gan, 等)","lowerAlpha":"小寫字母 (a, b, c, d, e 等)","lowerGreek":"小寫希臘字母 (alpha, beta, gamma, 等)","lowerRoman":"小寫羅馬數字 (i, ii, iii, iv, v 等)","none":"無","notset":"<未設定>","numberedTitle":"編號清單屬性","square":"方塊","start":"開始","type":"類型","upperAlpha":"大寫字母 (A, B, C, D, E 等)","upperRoman":"大寫羅馬數字 (I, II, III, IV, V 等)","validateStartNumber":"清單起始號碼須為一完整數字。"},"magicline":{"title":"在此插入段落"},"maximize":{"maximize":"最大化","minimize":"最小化"},"newpage":{"toolbar":"新增網頁"},"pagebreak":{"alt":"換頁","toolbar":"插入換頁符號以便列印"},"pastetext":{"button":"貼成純文字","title":"貼成純文字"},"pastefromword":{"confirmCleanup":"您想貼上的文字似乎是自 Word 複製而來，請問您是否要先清除 Word 的格式後再行貼上？","error":"由於發生內部錯誤，無法清除清除 Word 的格式。","title":"自 Word 貼上","toolbar":"自 Word 貼上"},"preview":{"preview":"預覽"},"print":{"toolbar":"列印"},"removeformat":{"toolbar":"移除格式"},"save":{"toolbar":"儲存"},"selectall":{"toolbar":"全選"},"showblocks":{"toolbar":"顯示區塊"},"sourcearea":{"toolbar":"原始碼"},"specialchar":{"options":"特殊字元選項","title":"選取特殊字元","toolbar":"插入特殊字元"},"scayt":{"btn_about":"關於即時拼寫檢查","btn_dictionaries":"字典","btn_disable":"關閉即時拼寫檢查","btn_enable":"啟用即時拼寫檢查","btn_langs":"語言","btn_options":"選項","text_title":"即時拼寫檢查"},"stylescombo":{"label":"樣式","panelTitle":"格式化樣式","panelTitle1":"區塊樣式","panelTitle2":"內嵌樣式","panelTitle3":"物件樣式"},"table":{"border":"框線大小","caption":"標題","cell":{"menu":"儲存格","insertBefore":"前方插入儲存格","insertAfter":"後方插入儲存格","deleteCell":"刪除儲存格","merge":"合併儲存格","mergeRight":"向右合併","mergeDown":"向下合併","splitHorizontal":"水平分割儲存格","splitVertical":"垂直分割儲存格","title":"儲存格屬性","cellType":"儲存格類型","rowSpan":"列全長","colSpan":"行全長","wordWrap":"自動斷行","hAlign":"水平對齊","vAlign":"垂直對齊","alignBaseline":"基準線","bgColor":"背景顏色","borderColor":"框線顏色","data":"資料","header":"頁首","yes":"是","no":"否","invalidWidth":"儲存格寬度必須為數字。","invalidHeight":"儲存格高度必須為數字。","invalidRowSpan":"列全長必須是整數。","invalidColSpan":"行全長必須是整數。","chooseColor":"選擇"},"cellPad":"儲存格邊距","cellSpace":"儲存格間距","column":{"menu":"行","insertBefore":"左方插入行","insertAfter":"右方插入行","deleteColumn":"刪除行"},"columns":"行","deleteTable":"刪除表格","headers":"頁首","headersBoth":"同時","headersColumn":"第一行","headersNone":"無","headersRow":"第一列","invalidBorder":"框線大小必須是整數。","invalidCellPadding":"儲存格邊距必須為正數。","invalidCellSpacing":"儲存格間距必須為正數。","invalidCols":"行數須為大於 0 的正整數。","invalidHeight":"表格高度必須為數字。","invalidRows":"列數須為大於 0 的正整數。","invalidWidth":"表格寬度必須為數字。","menu":"表格屬性","row":{"menu":"列","insertBefore":"上方插入列","insertAfter":"下方插入列","deleteRow":"刪除列"},"rows":"列","summary":"總結","title":"表格屬性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"寬度單位"},"undo":{"redo":"取消復原","undo":"復原"},"wsc":{"btnIgnore":"忽略","btnIgnoreAll":"全部忽略","btnReplace":"取代","btnReplaceAll":"全部取代","btnUndo":"復原","changeTo":"更改為","errorLoading":"無法聯系侍服器: %s.","ieSpellDownload":"尚未安裝拼字檢查元件。您是否想要現在下載？","manyChanges":"拼字檢查完成：更改了 %1 個單字","noChanges":"拼字檢查完成：未更改任何單字","noMispell":"拼字檢查完成：未發現拼字錯誤","noSuggestions":"- 無建議值 -","notAvailable":"抱歉，服務目前暫不可用","notInDic":"不在字典中","oneChange":"拼字檢查完成：更改了 1 個單字","progress":"進行拼字檢查中…","title":"拼字檢查","toolbar":"拼字檢查"}};
\ No newline at end of file
+CKEDITOR.lang['zh']={"editor":"RTF 編輯器","editorPanel":"RTF 編輯器面板","common":{"editorHelp":"按下 ALT 0 取得說明。","browseServer":"瀏覽伺服器","url":"URL","protocol":"通訊協定","upload":"上傳","uploadSubmit":"傳送至伺服器","image":"圖像","flash":"Flash","form":"表格","checkbox":"核取方塊","radio":"選項按鈕","textField":"文字欄位","textarea":"文字區域","hiddenField":"隱藏欄位","button":"按鈕","select":"選取欄位","imageButton":"影像按鈕","notSet":"<未設定>","id":"ID","name":"名稱","langDir":"語言方向","langDirLtr":"由左至右 (LTR)","langDirRtl":"由右至左 (RTL)","langCode":"語言代碼","longDescr":"完整描述 URL","cssClass":"樣式表類別","advisoryTitle":"標題","cssStyle":"樣式","ok":"確定","cancel":"取消","close":"關閉","preview":"預覽","resize":"調整大小","generalTab":"一般","advancedTab":"進階","validateNumberFailed":"此值不是數值。","confirmNewPage":"現存的修改尚未儲存，要開新檔案？","confirmCancel":"部份選項尚未儲存，要關閉對話框？","options":"選項","target":"目標","targetNew":"開新視窗 (_blank)","targetTop":"最上層視窗 (_top)","targetSelf":"相同視窗 (_self)","targetParent":"父視窗 (_parent)","langDirLTR":"由左至右 (LTR)","langDirRTL":"由右至左 (RTL)","styles":"樣式","cssClasses":"樣式表類別","width":"寬度","height":"高度","align":"對齊方式","alignLeft":"靠左對齊","alignRight":"靠右對齊","alignCenter":"置中對齊","alignJustify":"左右對齊","alignTop":"頂端","alignMiddle":"中間對齊","alignBottom":"底端","alignNone":"無","invalidValue":"無效值。","invalidHeight":"高度必須為數字。","invalidWidth":"寬度必須為數字。","invalidCssLength":"「%1」的值應為正數，並可包含有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","invalidHtmlLength":"「%1」的值應為正數，並可包含有效的 HTML 單位 (px 或 %)。","invalidInlineStyle":"行內樣式的值應包含一個以上的變數值組，其格式如「名稱:值」，並以分號區隔之。","cssLengthTooltip":"請輸入數值，單位是像素或有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，無法使用</span>","keyboard":{"8":"退格鍵","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"空白鍵","35":"End","36":"Home","46":"刪除","224":"Command 鍵"},"keyboardShortcut":"鍵盤快捷鍵"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"關於 CKEditor","help":"檢閱 $1 尋求幫助。","moreInfo":"關於授權資訊，請參閱我們的網站：","title":"關於 CKEditor","userGuide":"CKEditor 使用者手冊"},"basicstyles":{"bold":"粗體","italic":"斜體","strike":"刪除線","subscript":"下標","superscript":"上標","underline":"底線"},"bidi":{"ltr":"文字方向從左至右","rtl":"文字方向從右至左"},"blockquote":{"toolbar":"引用段落"},"clipboard":{"copy":"複製","copyError":"瀏覽器的安全性設定不允許編輯器自動執行複製動作。請使用鍵盤快捷鍵 (Ctrl/Cmd+C) 複製。","cut":"剪下","cutError":"瀏覽器的安全性設定不允許編輯器自動執行剪下動作。請使用鏐盤快捷鍵 (Ctrl/Cmd+X) 剪下。","paste":"貼上","pasteArea":"貼上區","pasteMsg":"請使用鍵盤快捷鍵 (<strong>Ctrl/Cmd+V</strong>) 貼到下方區域中並按下「確定」。","securityMsg":"因為瀏覽器的安全性設定，本編輯器無法直接存取您的剪貼簿資料，請您自行在本視窗進行貼上動作。","title":"貼上"},"button":{"selectedLabel":"%1 (已選取)"},"colorbutton":{"auto":"自動","bgColorTitle":"背景顏色","colors":{"000":"黑色","800000":"栗色","8B4513":"鞍褐色","2F4F4F":"暗瓦灰色","008080":"水壓色","000080":"丈青澀","4B0082":"靛青","696969":"深灰色","B22222":"磚紅色","A52A2A":"褐色","DAA520":"金黃色","006400":"深綠色","40E0D0":"青綠色","0000CD":"藍色","800080":"紫色","808080":"灰色","F00":"紅色","FF8C00":"深橘色","FFD700":"金色","008000":"綠色","0FF":"藍綠色","00F":"藍色","EE82EE":"紫色","A9A9A9":"暗灰色","FFA07A":"亮鮭紅","FFA500":"橘色","FFFF00":"黃色","00FF00":"鮮綠色","AFEEEE":"綠松色","ADD8E6":"淺藍色","DDA0DD":"枚紅色","D3D3D3":"淺灰色","FFF0F5":"淺紫色","FAEBD7":"骨董白","FFFFE0":"淺黃色","F0FFF0":"蜜瓜綠","F0FFFF":"天藍色","F0F8FF":"愛麗斯蘭","E6E6FA":"淺紫色","FFF":"白色","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"更多顏色","panelTitle":"顏色","textColorTitle":"文字顏色"},"colordialog":{"clear":"清除","highlight":"高亮","options":"色彩選項","selected":"選取的色彩","title":"選取色彩"},"templates":{"button":"範本","emptyListMsg":"(尚未定義任何範本)","insertOption":"替代實際內容","options":"範本選項","selectPromptMsg":"請選擇要在編輯器中開啟的範本。","title":"內容範本"},"contextmenu":{"options":"內容功能表選項"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"標題","cssClassInputLabel":"樣式表類別","edit":"編輯 Div","inlineStyleInputLabel":"行內樣式","langDirLTRLabel":"由左至右 (LTR)","langDirLabel":"語言方向","langDirRTLLabel":"由右至左 (RTL)","languageCodeInputLabel":"語言碼","remove":"移除 Div","styleSelectLabel":"樣式","title":"建立 Div 容器","toolbar":"建立 Div 容器"},"toolbar":{"toolbarCollapse":"摺疊工具列","toolbarExpand":"展開工具列","toolbarGroups":{"document":"文件","clipboard":"剪貼簿/復原","editing":"編輯選項","forms":"格式","basicstyles":"基本樣式","paragraph":"段落","links":"連結","insert":"插入","styles":"樣式","colors":"顏色","tools":"工具"},"toolbars":"編輯器工具列"},"elementspath":{"eleLabel":"元件路徑","eleTitle":"%1 個元件"},"find":{"find":"尋找","findOptions":"尋找選項","findWhat":"尋找目標：","matchCase":"大小寫須相符","matchCyclic":"循環搜尋","matchWord":"全字拼寫須相符","notFoundMsg":"找不到指定的文字。","replace":"取代","replaceAll":"全部取代","replaceSuccessMsg":"已取代  %1 個指定項目。","replaceWith":"取代成：","title":"尋找及取代"},"fakeobjects":{"anchor":"錨點","flash":"Flash 動畫","hiddenfield":"隱藏欄位","iframe":"IFrame","unknown":"無法辨識的物件"},"flash":{"access":"腳本存取","accessAlways":"永遠","accessNever":"從不","accessSameDomain":"相同網域","alignAbsBottom":"絕對下方","alignAbsMiddle":"絕對置中","alignBaseline":"基準線","alignTextTop":"上層文字","bgcolor":"背景顏色","chkFull":"允許全螢幕","chkLoop":"重複播放","chkMenu":"啟用 Flash 選單","chkPlay":"自動播放","flashvars":"Flash 變數","hSpace":"HSpace","properties":"Flash 屬性​​","propertiesTab":"屬性","quality":"品質","qualityAutoHigh":"自動高","qualityAutoLow":"自動低","qualityBest":"最佳","qualityHigh":"高","qualityLow":"低","qualityMedium":"中","scale":"縮放比例","scaleAll":"全部顯示","scaleFit":"最適化","scaleNoBorder":"無框線","title":"Flash 屬性​​","vSpace":"VSpace","validateHSpace":"HSpace 必須為數字。","validateSrc":"URL 不可為空白。","validateVSpace":"VSpace  必須為數字。","windowMode":"視窗模式","windowModeOpaque":"不透明","windowModeTransparent":"透明","windowModeWindow":"視窗"},"font":{"fontSize":{"label":"大小","voiceLabel":"字型大小","panelTitle":"字型大小"},"label":"字型","panelTitle":"字型名稱","voiceLabel":"字型"},"forms":{"button":{"title":"按鈕內容","text":"顯示文字 (值)","type":"類型","typeBtn":"按鈕","typeSbm":"送出","typeRst":"重設"},"checkboxAndRadio":{"checkboxTitle":"核取方塊內容","radioTitle":"選項按鈕內容","value":"數值","selected":"已選","required":"必填"},"form":{"title":"表單內容","menu":"表單內容","action":"動作","method":"方式","encoding":"編碼"},"hidden":{"title":"隱藏欄位內容","name":"名稱","value":"數值"},"select":{"title":"選取欄位內容","selectInfo":"選擇資訊","opAvail":"可用選項","value":"數值","size":"大小","lines":"行數","chkMulti":"允許多選","required":"必填","opText":"文字","opValue":"數值","btnAdd":"新增","btnModify":"修改","btnUp":"向上","btnDown":"向下","btnSetValue":"設為已選","btnDelete":"刪除"},"textarea":{"title":"文字區域內容","cols":"列","rows":"行"},"textfield":{"title":"文字欄位內容","name":"名字","value":"數值","charWidth":"字元寬度","maxChars":"最大字元數","required":"必填","type":"類型","typeText":"文字","typePass":"密碼","typeEmail":"電子郵件","typeSearch":"搜尋","typeTel":"電話號碼","typeUrl":"URL"}},"format":{"label":"格式","panelTitle":"段落格式","tag_address":"地址","tag_div":"標準 (DIV)","tag_h1":"標題 1","tag_h2":"標題 2","tag_h3":"標題 3","tag_h4":"標題 4","tag_h5":"標題 5","tag_h6":"標題 6","tag_p":"標準","tag_pre":"格式設定"},"horizontalrule":{"toolbar":"插入水平線"},"iframe":{"border":"顯示框架框線","noUrl":"請輸入 iframe URL","scrolling":"啟用捲軸列","title":"IFrame 屬性","toolbar":"IFrame"},"image":{"alt":"替代文字","border":"框線","btnUpload":"傳送到伺服器","button2Img":"請問您確定要將「圖片按鈕」轉換成「圖片」嗎？","hSpace":"HSpace","img2Button":"請問您確定要將「圖片」轉換成「圖片按鈕」嗎？","infoTab":"影像資訊","linkTab":"連結","lockRatio":"固定比例","menu":"影像屬性","resetSize":"重設大小","title":"影像屬性","titleButton":"影像按鈕屬性","upload":"上傳","urlMissing":"遺失圖片來源之 URL ","vSpace":"VSpace","validateBorder":"框線必須是整數。","validateHSpace":"HSpace 必須是整數。","validateVSpace":"VSpace 必須是整數。"},"indent":{"indent":"增加縮排","outdent":"減少縮排"},"smiley":{"options":"表情符號選項","title":"插入表情符號","toolbar":"表情符號"},"justify":{"block":"左右對齊","center":"置中","left":"靠左對齊","right":"靠右對齊"},"language":{"button":"設定語言","remove":"移除語言"},"link":{"acccessKey":"便捷鍵","advanced":"進階","advisoryContentType":"建議內容類型","advisoryTitle":"標題","anchor":{"toolbar":"錨點","menu":"編輯錨點","title":"錨點內容","name":"錨點名稱","errorName":"請輸入錨點名稱","remove":"移除錨點"},"anchorId":"依元件編號","anchorName":"依錨點名稱","charset":"連結資源的字元集","cssClasses":"樣式表類別","download":"Force Download","displayText":"顯示文字","emailAddress":"電子郵件地址","emailBody":"郵件本文","emailSubject":"郵件主旨","id":"ID","info":"連結資訊","langCode":"語言碼","langDir":"語言方向","langDirLTR":"由左至右 (LTR)","langDirRTL":"由右至左 (RTL)","menu":"編輯連結","name":"名稱","noAnchors":"(本文件中無可用之錨點)","noEmail":"請輸入電子郵件","noUrl":"請輸入連結 URL","other":"<其他>","popupDependent":"獨立 (Netscape)","popupFeatures":"快顯視窗功能","popupFullScreen":"全螢幕 (IE)","popupLeft":"左側位置","popupLocationBar":"位置列","popupMenuBar":"功能表列","popupResizable":"可調大小","popupScrollBars":"捲軸","popupStatusBar":"狀態列","popupToolbar":"工具列","popupTop":"頂端位置","rel":"關係","selectAnchor":"選取一個錨點","styles":"樣式","tabIndex":"定位順序","target":"目標","targetFrame":"<框架>","targetFrameName":"目標框架名稱","targetPopup":"<快顯視窗>","targetPopupName":"快顯視窗名稱","title":"連結","toAnchor":"文字中的錨點連結","toEmail":"電子郵件","toUrl":"網址","toolbar":"連結","type":"連結類型","unlink":"取消連結","upload":"上傳"},"list":{"bulletedlist":"插入/移除項目符號清單","numberedlist":"插入/移除編號清單清單"},"liststyle":{"armenian":"亞美尼亞數字","bulletedTitle":"項目符號清單屬性","circle":"圓圈","decimal":"小數點 (1, 2, 3, etc.)","decimalLeadingZero":"前綴 0 十位數字 (01, 02, 03, 等)","disc":"圓點","georgian":"喬治王時代數字 (an, ban, gan, 等)","lowerAlpha":"小寫字母 (a, b, c, d, e 等)","lowerGreek":"小寫希臘字母 (alpha, beta, gamma, 等)","lowerRoman":"小寫羅馬數字 (i, ii, iii, iv, v 等)","none":"無","notset":"<未設定>","numberedTitle":"編號清單屬性","square":"方塊","start":"開始","type":"類型","upperAlpha":"大寫字母 (A, B, C, D, E 等)","upperRoman":"大寫羅馬數字 (I, II, III, IV, V 等)","validateStartNumber":"清單起始號碼須為一完整數字。"},"magicline":{"title":"在此插入段落"},"maximize":{"maximize":"最大化","minimize":"最小化"},"newpage":{"toolbar":"新增網頁"},"pagebreak":{"alt":"換頁","toolbar":"插入換頁符號以便列印"},"pastetext":{"button":"貼成純文字","title":"貼成純文字"},"pastefromword":{"confirmCleanup":"您想貼上的文字似乎是自 Word 複製而來，請問您是否要先清除 Word 的格式後再行貼上？","error":"由於發生內部錯誤，無法清除清除 Word 的格式。","title":"自 Word 貼上","toolbar":"自 Word 貼上"},"preview":{"preview":"預覽"},"print":{"toolbar":"列印"},"removeformat":{"toolbar":"移除格式"},"save":{"toolbar":"儲存"},"selectall":{"toolbar":"全選"},"showblocks":{"toolbar":"顯示區塊"},"sourcearea":{"toolbar":"原始碼"},"specialchar":{"options":"特殊字元選項","title":"選取特殊字元","toolbar":"插入特殊字元"},"scayt":{"btn_about":"關於即時拼寫檢查","btn_dictionaries":"字典","btn_disable":"關閉即時拼寫檢查","btn_enable":"啟用即時拼寫檢查","btn_langs":"語言","btn_options":"選項","text_title":"即時拼寫檢查"},"stylescombo":{"label":"樣式","panelTitle":"格式化樣式","panelTitle1":"區塊樣式","panelTitle2":"內嵌樣式","panelTitle3":"物件樣式"},"table":{"border":"框線大小","caption":"標題","cell":{"menu":"儲存格","insertBefore":"前方插入儲存格","insertAfter":"後方插入儲存格","deleteCell":"刪除儲存格","merge":"合併儲存格","mergeRight":"向右合併","mergeDown":"向下合併","splitHorizontal":"水平分割儲存格","splitVertical":"垂直分割儲存格","title":"儲存格屬性","cellType":"儲存格類型","rowSpan":"列全長","colSpan":"行全長","wordWrap":"自動斷行","hAlign":"水平對齊","vAlign":"垂直對齊","alignBaseline":"基準線","bgColor":"背景顏色","borderColor":"框線顏色","data":"資料","header":"頁首","yes":"是","no":"否","invalidWidth":"儲存格寬度必須為數字。","invalidHeight":"儲存格高度必須為數字。","invalidRowSpan":"列全長必須是整數。","invalidColSpan":"行全長必須是整數。","chooseColor":"選擇"},"cellPad":"儲存格邊距","cellSpace":"儲存格間距","column":{"menu":"行","insertBefore":"左方插入行","insertAfter":"右方插入行","deleteColumn":"刪除行"},"columns":"行","deleteTable":"刪除表格","headers":"頁首","headersBoth":"同時","headersColumn":"第一行","headersNone":"無","headersRow":"第一列","invalidBorder":"框線大小必須是整數。","invalidCellPadding":"儲存格邊距必須為正數。","invalidCellSpacing":"儲存格間距必須為正數。","invalidCols":"行數須為大於 0 的正整數。","invalidHeight":"表格高度必須為數字。","invalidRows":"列數須為大於 0 的正整數。","invalidWidth":"表格寬度必須為數字。","menu":"表格屬性","row":{"menu":"列","insertBefore":"上方插入列","insertAfter":"下方插入列","deleteRow":"刪除列"},"rows":"列","summary":"總結","title":"表格屬性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"寬度單位"},"undo":{"redo":"取消復原","undo":"復原"},"wsc":{"btnIgnore":"忽略","btnIgnoreAll":"全部忽略","btnReplace":"取代","btnReplaceAll":"全部取代","btnUndo":"復原","changeTo":"更改為","errorLoading":"無法聯系侍服器: %s.","ieSpellDownload":"尚未安裝拼字檢查元件。您是否想要現在下載？","manyChanges":"拼字檢查完成：更改了 %1 個單字","noChanges":"拼字檢查完成：未更改任何單字","noMispell":"拼字檢查完成：未發現拼字錯誤","noSuggestions":"- 無建議值 -","notAvailable":"抱歉，服務目前暫不可用","notInDic":"不在字典中","oneChange":"拼字檢查完成：更改了 1 個單字","progress":"進行拼字檢查中…","title":"拼字檢查","toolbar":"拼字檢查"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/package.json b/htdocs/includes/ckeditor/ckeditor/package.json
deleted file mode 100644
index 982c927e09d..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/package.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "ckeditor",
-  "version": "4.5.9",
-  "description": "JavaScript WYSIWYG web text editor.",
-  "main": "ckeditor.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ckeditor/ckeditor-releases.git"
-  },
-  "keywords": [
-    "ckeditor",
-    "fckeditor",
-    "editor",
-    "wysiwyg",
-    "html",
-    "richtext",
-    "text",
-    "javascript"
-  ],
-  "author": "CKSource (http://cksource.com/)",
-  "license": "For licensing, see LICENSE.md or http://ckeditor.com/license.",
-  "bugs": {
-    "url": "http://dev.ckeditor.com"
-  },
-  "homepage": "http://ckeditor.com"
-}
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
index 4585951e095..6c268cab301 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.dialog.add("a11yHelp",function(l){var a=l.lang.a11yhelp,n=CKEDITOR.tools.getNextId(),e={8:a.backspace,9:a.tab,13:a.enter,16:a.shift,17:a.ctrl,18:a.alt,19:a.pause,20:a.capslock,27:a.escape,33:a.pageUp,34:a.pageDown,35:a.end,36:a.home,37:a.leftArrow,38:a.upArrow,39:a.rightArrow,40:a.downArrow,45:a.insert,46:a["delete"],91:a.leftWindowKey,92:a.rightWindowKey,93:a.selectKey,96:a.numpad0,97:a.numpad1,98:a.numpad2,99:a.numpad3,100:a.numpad4,101:a.numpad5,102:a.numpad6,103:a.numpad7,104:a.numpad8,
-105:a.numpad9,106:a.multiply,107:a.add,109:a.subtract,110:a.decimalPoint,111:a.divide,112:a.f1,113:a.f2,114:a.f3,115:a.f4,116:a.f5,117:a.f6,118:a.f7,119:a.f8,120:a.f9,121:a.f10,122:a.f11,123:a.f12,144:a.numLock,145:a.scrollLock,186:a.semiColon,187:a.equalSign,188:a.comma,189:a.dash,190:a.period,191:a.forwardSlash,192:a.graveAccent,219:a.openBracket,220:a.backSlash,221:a.closeBracket,222:a.singleQuote};e[CKEDITOR.ALT]=a.alt;e[CKEDITOR.SHIFT]=a.shift;e[CKEDITOR.CTRL]=a.ctrl;var f=[CKEDITOR.ALT,CKEDITOR.SHIFT,
-CKEDITOR.CTRL],p=/\$\{(.*?)\}/g,t=function(){var a=l.keystrokeHandler.keystrokes,g={},c;for(c in a)g[a[c]]=c;return function(a,c){var b;if(g[c]){b=g[c];for(var h,k,m=[],d=0;d<f.length;d++)k=f[d],h=b/f[d],1<h&&2>=h&&(b-=k,m.push(e[k]));m.push(e[b]||String.fromCharCode(b));b=m.join("+")}else b=a;return b}}();return{title:a.title,minWidth:600,minHeight:400,contents:[{id:"info",label:l.lang.common.generalTab,expand:!0,elements:[{type:"html",id:"legends",style:"white-space:normal;",focus:function(){this.getElement().focus()},
-html:function(){for(var e='\x3cdiv class\x3d"cke_accessibility_legend" role\x3d"document" aria-labelledby\x3d"'+n+'_arialbl" tabIndex\x3d"-1"\x3e%1\x3c/div\x3e\x3cspan id\x3d"'+n+'_arialbl" class\x3d"cke_voice_label"\x3e'+a.contents+" \x3c/span\x3e",g=[],c=a.legend,l=c.length,f=0;f<l;f++){for(var b=c[f],h=[],k=b.items,m=k.length,d=0;d<m;d++){var q=k[d],r=q.legend.replace(p,t);r.match(p)||h.push("\x3cdt\x3e%1\x3c/dt\x3e\x3cdd\x3e%2\x3c/dd\x3e".replace("%1",q.name).replace("%2",r))}g.push("\x3ch1\x3e%1\x3c/h1\x3e\x3cdl\x3e%2\x3c/dl\x3e".replace("%1",
-b.name).replace("%2",h.join("")))}return e.replace("%1",g.join(""))}()+'\x3cstyle type\x3d"text/css"\x3e.cke_accessibility_legend{width:600px;height:400px;padding-right:5px;overflow-y:auto;overflow-x:hidden;}.cke_browser_quirks .cke_accessibility_legend,{height:390px}.cke_accessibility_legend *{white-space:normal;}.cke_accessibility_legend h1{font-size: 20px;border-bottom: 1px solid #AAA;margin: 5px 0px 15px;}.cke_accessibility_legend dl{margin-left: 5px;}.cke_accessibility_legend dt{font-size: 13px;font-weight: bold;}.cke_accessibility_legend dd{margin:10px}\x3c/style\x3e'}]}],
+CKEDITOR.dialog.add("a11yHelp",function(h){var a=h.lang.a11yhelp,b=h.lang.common.keyboard,n=CKEDITOR.tools.getNextId(),e={8:b[8],9:a.tab,13:b[13],16:b[16],17:b[17],18:b[18],19:a.pause,20:a.capslock,27:a.escape,33:a.pageUp,34:a.pageDown,35:b[35],36:b[36],37:a.leftArrow,38:a.upArrow,39:a.rightArrow,40:a.downArrow,45:a.insert,46:b[46],91:a.leftWindowKey,92:a.rightWindowKey,93:a.selectKey,96:a.numpad0,97:a.numpad1,98:a.numpad2,99:a.numpad3,100:a.numpad4,101:a.numpad5,102:a.numpad6,103:a.numpad7,104:a.numpad8,
+105:a.numpad9,106:a.multiply,107:a.add,109:a.subtract,110:a.decimalPoint,111:a.divide,112:a.f1,113:a.f2,114:a.f3,115:a.f4,116:a.f5,117:a.f6,118:a.f7,119:a.f8,120:a.f9,121:a.f10,122:a.f11,123:a.f12,144:a.numLock,145:a.scrollLock,186:a.semiColon,187:a.equalSign,188:a.comma,189:a.dash,190:a.period,191:a.forwardSlash,192:a.graveAccent,219:a.openBracket,220:a.backSlash,221:a.closeBracket,222:a.singleQuote};e[CKEDITOR.ALT]=b[18];e[CKEDITOR.SHIFT]=b[16];e[CKEDITOR.CTRL]=b[17];var g=[CKEDITOR.ALT,CKEDITOR.SHIFT,
+CKEDITOR.CTRL],p=/\$\{(.*?)\}/g,t=function(){var a=h.keystrokeHandler.keystrokes,b={},d;for(d in a)b[a[d]]=d;return function(a,d){var c;if(b[d]){c=b[d];for(var k,l,m=[],f=0;f<g.length;f++)l=g[f],k=c/g[f],1<k&&2>=k&&(c-=l,m.push(e[l]));m.push(e[c]||String.fromCharCode(c));c=m.join("+")}else c=a;return c}}();return{title:a.title,minWidth:600,minHeight:400,contents:[{id:"info",label:h.lang.common.generalTab,expand:!0,elements:[{type:"html",id:"legends",style:"white-space:normal;",focus:function(){this.getElement().focus()},
+html:function(){for(var b='\x3cdiv class\x3d"cke_accessibility_legend" role\x3d"document" aria-labelledby\x3d"'+n+'_arialbl" tabIndex\x3d"-1"\x3e%1\x3c/div\x3e\x3cspan id\x3d"'+n+'_arialbl" class\x3d"cke_voice_label"\x3e'+a.contents+" \x3c/span\x3e",e=[],d=a.legend,h=d.length,g=0;g<h;g++){for(var c=d[g],k=[],l=c.items,m=l.length,f=0;f<m;f++){var q=l[f],r=q.legend.replace(p,t);r.match(p)||k.push("\x3cdt\x3e%1\x3c/dt\x3e\x3cdd\x3e%2\x3c/dd\x3e".replace("%1",q.name).replace("%2",r))}e.push("\x3ch1\x3e%1\x3c/h1\x3e\x3cdl\x3e%2\x3c/dl\x3e".replace("%1",
+c.name).replace("%2",k.join("")))}return b.replace("%1",e.join(""))}()+'\x3cstyle type\x3d"text/css"\x3e.cke_accessibility_legend{width:600px;height:400px;padding-right:5px;overflow-y:auto;overflow-x:hidden;}.cke_browser_quirks .cke_accessibility_legend,{height:390px}.cke_accessibility_legend *{white-space:normal;}.cke_accessibility_legend h1{font-size: 20px;border-bottom: 1px solid #AAA;margin: 5px 0px 15px;}.cke_accessibility_legend dl{margin-left: 5px;}.cke_accessibility_legend dt{font-size: 13px;font-weight: bold;}.cke_accessibility_legend dd{margin:10px}\x3c/style\x3e'}]}],
 buttons:[CKEDITOR.dialog.cancelButton]}});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
index a60eb8bbf37..58f07c35cf1 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 
 cs.js      Found: 30 Missing: 0
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
index f33c0bbee30..293a69d9e1e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","af",{title:"Toeganglikheid instruksies",contents:"Hulp inhoud. Druk ESC om toe te maak.",legend:[{name:"Algemeen",items:[{name:"Bewerker balk",legend:"Druk ${toolbarFocus} om op die werkbalk te land. Beweeg na die volgende en voorige wekrbalkgroep met TAB and SHIFT+TAB. Beweeg na die volgende en voorige werkbalkknop met die regter of linker pyl. Druk SPASIE of ENTER om die knop te bevestig."},{name:"Bewerker dialoog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Bewerkerinhoudmenu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pouse",capslock:"Hoofletterslot",escape:"Ontsnap",pageUp:"Blaaiop",pageDown:"Blaaiaf",end:"Einde",home:"Tuis",leftArrow:"Linkspyl",upArrow:"Oppyl",rightArrow:"Regterpyl",downArrow:"Afpyl",insert:"Toevoeg","delete":"Verwyder",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Nommerblok 0",numpad1:"Nommerblok 1",
-numpad2:"Nommerblok 2",numpad3:"Nommerblok 3",numpad4:"Nommerblok 4",numpad5:"Nommerblok 5",numpad6:"Nommerblok 6",numpad7:"Nommerblok 7",numpad8:"Nommerblok 8",numpad9:"Nommerblok 9",multiply:"Maal",add:"Plus",subtract:"Minus",decimalPoint:"Desimaalepunt",divide:"Gedeeldeur",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Nommervergrendel",scrollLock:"Rolvergrendel",semiColon:"Kommapunt",equalSign:"Isgelykaan",comma:"Komma",dash:"Koppelteken",
-period:"Punt",forwardSlash:"Skuinsstreep",graveAccent:"Aksentteken",openBracket:"Oopblokhakkie",backSlash:"Trustreep",closeBracket:"Toeblokhakkie",singleQuote:"Enkelaanhaalingsteken"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pouse",capslock:"Hoofletterslot",escape:"Ontsnap",pageUp:"Blaaiop",pageDown:"Blaaiaf",leftArrow:"Linkspyl",upArrow:"Oppyl",rightArrow:"Regterpyl",downArrow:"Afpyl",insert:"Toevoeg",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Nommerblok 0",numpad1:"Nommerblok 1",numpad2:"Nommerblok 2",numpad3:"Nommerblok 3",numpad4:"Nommerblok 4",numpad5:"Nommerblok 5",numpad6:"Nommerblok 6",
+numpad7:"Nommerblok 7",numpad8:"Nommerblok 8",numpad9:"Nommerblok 9",multiply:"Maal",add:"Plus",subtract:"Minus",decimalPoint:"Desimaalepunt",divide:"Gedeeldeur",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Nommervergrendel",scrollLock:"Rolvergrendel",semiColon:"Kommapunt",equalSign:"Isgelykaan",comma:"Komma",dash:"Koppelteken",period:"Punt",forwardSlash:"Skuinsstreep",graveAccent:"Aksentteken",openBracket:"Oopblokhakkie",backSlash:"Trustreep",
+closeBracket:"Toeblokhakkie",singleQuote:"Enkelaanhaalingsteken"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
index 724decb565e..a18ea8a2eaf 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ar",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"عام",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"إضافة",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"تقسيم",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"فاصلة",dash:"Dash",period:"نقطة",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"إضافة",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"تقسيم",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"فاصلة",dash:"Dash",period:"نقطة",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/az.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/az.js
new file mode 100644
index 00000000000..97c8ae63750
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/az.js
@@ -0,0 +1,11 @@
+/*
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang("a11yhelp","az",{title:"Əlillərə dəstək üzrə təlimat",contents:"Kömək. Pəncərəni bağlamaq üçün ESC basın.",legend:[{name:"Əsas",items:[{name:"Düzəliş edənin alətlər çubuğu",legend:"Panelə keçmək üçün ${toolbarFocus} basın. Növbəti panelə TAB, əvvəlki panelə isə SHIFT+TAB düyməsi vasitəsi ilə keçə bilərsiz. Paneldəki düymələr arasında sol və sağ ox düyməsi ilə keçid edə bilərsiz. Seçilmiş düyməsi SPACE və ya ENTER ilə işlədə bilərsiniz."},{name:"Redaktorun pəncərəsi",legend:"Pəncərə içində növbəti element seçmək üçün TAB düyməni basın, əvvəlki isə - SHIFT+TAB. Təsdiq edilməsi üçün ENTER, imtina edilməsi isə ESC diymələri istifadə edin. Pəncərədə bir neçə vərəq olanda olnarın siyahı ALT+F10 ilə aça bilərsiz. Vərəqlərin siyahı fokus altında olanda ox düymələr vasitəsi ilə onların arasında keçid edə bilərsiz."},
+{name:"Redaktorun seçimlərin menyusu",legend:"Seçimləri redaktə etmək üçün ${contextMenu} ya da APPLICATION KEY basın. Növbəti seçimə keçmək üçün TAB ya AŞAĞI OX düyməsini basın, əvvəlki isə - SHIFT+TAB ya YUXARI OX. Seçimi arımaq SPACE ya ENTER düymələri istifadə edin. Alt menyunu açmaq üçün SPACE, ENTER ya SAĞA OX basın. ESC ya SOLA OX ilə geriyə qayıda bilərsiz. Bütün menyunu ESC ilə bağlıyın."},{name:"Düzəliş edənin siyahı qutusu",legend:"Siyahı qutusu içində növbəti bənd seçmək üçün TAB ya AŞAĞI OX, əvvəlki isə SHIFT+TAB ya YUXARI OX basın. Seçimi arımaq SPACE ya ENTER düymələri istifadə edin. Siyahı qutusu ESC ilə bağlıyın."},
+{name:"Redaktor elementin cığır paneli",legend:"Elementin cığır paneli seçmək üçün ${elementsPathFocus} basın. Növbəti element seçmək üçün TAB ya SAĞA OX, əvvəlki isə SHIFT+TAB ya SOLA OX istifadə edin. Elementi arımaq SPACE ya ENTER düymələri mövcuddur."}]},{name:"Əmrlər",items:[{name:"Əmri geri qaytar",legend:"${undo} basın"},{name:"Geri əmri",legend:"${redo} basın"},{name:"Qalın əmri",legend:"${bold}  basın"},{name:"Kursiv əmri",legend:"${italic} basın"},{name:"Altdan xətt əmri",legend:"${underline} basın"},
+{name:"Link əmri",legend:"${link} basın"},{name:"Paneli gizlət əmri",legend:"${toolbarCollapse} basın"},{name:"Əvvəlki fokus sahəsi seç əmrı",legend:"Kursordan əvvəl ən yaxın əlçatmaz yerə dəymək üçün ${accessPreviousSpace} basın, misal üçün: iki dal-badal HR teg. Uzaq yerlərə dəymək üçün bir neçə dəfə basın."},{name:"Növbəti fokus sahəsi seç əmrı",legend:"Kursordan sonra ən yaxın əlçatmaz yerə dəymək üçün ${accessNextSpace} basın, misal üçün: iki dal-badal HR teg. Uzaq yerlərə dəymək üçün bir neçə dəfə basın."},
+{name:"Hərtərəfli Kömək",legend:"${a11yHelp} basın"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Sola ox işarəsi",upArrow:"Yuxarı ox işarəsi",rightArrow:"Sağa ox işarəsi",downArrow:"Aşağı ox işarəsi",insert:"Insert",leftWindowKey:"Soldaki Windows düyməsi",rightWindowKey:"Sağdaki Windows düyməsi",selectKey:"Düyməni seçin",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",
+numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Vurma",add:"Əlavə et",subtract:"Çıxma",decimalPoint:"Onluq kəsri tam ədəddən ayıran nöqtə",divide:"Bölüşdürmə",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Nöqtəli verqül",equalSign:"Barəbərlik işarəsi",comma:"Vergül",dash:"Defis",period:"Nöqtə",forwardSlash:"Çəp xətt",graveAccent:"Vurğu işarəsi",openBracket:"Açılan mötərizə",
+backSlash:"Tərs çəpəki xətt",closeBracket:"Bağlanan mötərizə",singleQuote:"Tək dırnaq"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
index d4a9f93caba..d6db25afc4f 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","bg",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Общо",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
index 11f77ba9350..fc562822f58 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
@@ -1,12 +1,12 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ca",{title:"Instruccions d'Accessibilitat",contents:"Continguts de l'Ajuda. Per tancar aquest quadre de diàleg premi ESC.",legend:[{name:"General",items:[{name:"Editor de barra d'eines",legend:"Premi ${toolbarFocus} per desplaçar-se per la barra d'eines. Vagi en el següent i anterior grup de barra d'eines amb TAB i SHIFT+TAB. Vagi en el següent i anterior botó de la barra d'eines amb RIGHT ARROW i LEFT ARROW. Premi SPACE o ENTER per activar el botó de la barra d'eines."},
-{name:"Editor de quadre de diàleg",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor de menú contextual",legend:"Premi ${contextMenu} o APPLICATION KEY per obrir el menú contextual. Després desplacis a la següent opció del menú amb TAB o DOWN ARROW. Desplacis a l'anterior opció amb SHIFT+TAB o UP ARROW. Premi SPACE o ENTER per seleccionar l'opció del menú. Obri el submenú de l'actual opció utilitzant SPACE o ENTER o RIGHT ARROW. Pot tornar a l'opció del menú pare amb ESC o LEFT ARROW. Tanqui el menú contextual amb ESC."},
-{name:"Editor de caixa de llista",legend:"Dins d'un quadre de llista, desplacis al següent element de la llista amb TAB o DOWN ARROW. Desplacis a l'anterior element de la llista amb SHIFT+TAB o UP ARROW. Premi SPACE o ENTER per seleccionar l'opció de la llista. Premi ESC per tancar el quadre de llista."},{name:"Editor de barra de ruta de l'element",legend:"Premi ${elementsPathFocus} per anar als elements de la barra de ruta. Desplacis al botó de l'element següent amb TAB o RIGHT ARROW. Desplacis a l'anterior botó amb SHIFT+TAB o LEFT ARROW. Premi SPACE o ENTER per seleccionar l'element a l'editor."}]},
-{name:"Ordres",items:[{name:"Desfer ordre",legend:"Premi ${undo}"},{name:"Refer ordre",legend:"Premi ${redo}"},{name:"Ordre negreta",legend:"Premi ${bold}"},{name:"Ordre cursiva",legend:"Premi ${italic}"},{name:"Ordre subratllat",legend:"Premi ${underline}"},{name:"Ordre enllaç",legend:"Premi ${link}"},{name:"Ordre amagar barra d'eines",legend:"Premi ${toolbarCollapse}"},{name:"Ordre per accedir a l'anterior espai enfocat",legend:"Premi ${accessPreviousSpace} per accedir a l'enfocament d'espai més proper inabastable abans del símbol d'intercalació, per exemple: dos elements HR adjacents. Repetiu la combinació de tecles per arribar a enfocaments d'espais distants."},
-{name:"Ordre per accedir al següent espai enfocat",legend:"Premi ${accessNextSpace} per accedir a l'enfocament d'espai més proper inabastable després del símbol d'intercalació, per exemple: dos elements HR adjacents. Repetiu la combinació de tecles per arribar a enfocaments d'espais distants."},{name:"Ajuda d'accessibilitat",legend:"Premi ${a11yHelp}"}]}],backspace:"Retrocés",tab:"Tabulació",enter:"Intro",shift:"Majúscules",ctrl:"Ctrl",alt:"Alt",pause:"Pausa",capslock:"Bloqueig de majúscules",escape:"Escape",
-pageUp:"Pàgina Amunt",pageDown:"Pàgina Avall",end:"Fi",home:"Inici",leftArrow:"Fletxa Esquerra",upArrow:"Fletxa Amunt",rightArrow:"Fletxa Dreta",downArrow:"Fletxa Avall",insert:"Inserir","delete":"Eliminar",leftWindowKey:"Tecla Windows Esquerra",rightWindowKey:"Tecla Windows Dreta",selectKey:"Tecla Seleccionar",numpad0:"Teclat Numèric 0",numpad1:"Teclat Numèric 1",numpad2:"Teclat Numèric 2",numpad3:"Teclat Numèric 3",numpad4:"Teclat Numèric 4",numpad5:"Teclat Numèric 5",numpad6:"Teclat Numèric 6",
-numpad7:"Teclat Numèric 7",numpad8:"Teclat Numèric 8",numpad9:"Teclat Numèric 9",multiply:"Multiplicació",add:"Suma",subtract:"Resta",decimalPoint:"Punt Decimal",divide:"Divisió",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Bloqueig Teclat Numèric",scrollLock:"Bloqueig de Desplaçament",semiColon:"Punt i Coma",equalSign:"Símbol Igual",comma:"Coma",dash:"Guió",period:"Punt",forwardSlash:"Barra Diagonal",graveAccent:"Accent Obert",openBracket:"Claudàtor Obert",
-backSlash:"Barra Invertida",closeBracket:"Claudàtor Tancat",singleQuote:"Cometa Simple"});
\ No newline at end of file
+{name:"Editor de quadre de diàleg",legend:"Dins d'un quadre de diàleg, premi la tecla TAB per desplaçar-se fins al següent element del quadre de diàleg, premi la tecla Shift + TAB per desplaçar-se a l'anterior element del quadre de diàleg, premi la tecla ENTER per confirmar el quadre de diàleg, premi la tecla ESC per cancel·lar el quadre de diàleg. Quan un quadre de diàleg té diverses pestanyes, la llista de pestanyes pot ser assolit ja sigui amb ALT + F10 o TAB, com a part de l'ordre de tabulació del quadre de diàleg. Amb la llista de pestanyes seleccionada, pot anar a la fitxa següent i anterior amb la tecla FLETXA DRETA i ESQUERRA, respectivament."},
+{name:"Editor de menú contextual",legend:"Premi ${contextMenu} o APPLICATION KEY per obrir el menú contextual. Després desplacis a la següent opció del menú amb TAB o DOWN ARROW. Desplacis a l'anterior opció amb SHIFT+TAB o UP ARROW. Premi SPACE o ENTER per seleccionar l'opció del menú. Obri el submenú de l'actual opció utilitzant SPACE o ENTER o RIGHT ARROW. Pot tornar a l'opció del menú pare amb ESC o LEFT ARROW. Tanqui el menú contextual amb ESC."},{name:"Editor de caixa de llista",legend:"Dins d'un quadre de llista, desplacis al següent element de la llista amb TAB o DOWN ARROW. Desplacis a l'anterior element de la llista amb SHIFT+TAB o UP ARROW. Premi SPACE o ENTER per seleccionar l'opció de la llista. Premi ESC per tancar el quadre de llista."},
+{name:"Editor de barra de ruta de l'element",legend:"Premi ${elementsPathFocus} per anar als elements de la barra de ruta. Desplacis al botó de l'element següent amb TAB o RIGHT ARROW. Desplacis a l'anterior botó amb SHIFT+TAB o LEFT ARROW. Premi SPACE o ENTER per seleccionar l'element a l'editor."}]},{name:"Ordres",items:[{name:"Desfer ordre",legend:"Premi ${undo}"},{name:"Refer ordre",legend:"Premi ${redo}"},{name:"Ordre negreta",legend:"Premi ${bold}"},{name:"Ordre cursiva",legend:"Premi ${italic}"},
+{name:"Ordre subratllat",legend:"Premi ${underline}"},{name:"Ordre enllaç",legend:"Premi ${link}"},{name:"Ordre amagar barra d'eines",legend:"Premi ${toolbarCollapse}"},{name:"Ordre per accedir a l'anterior espai enfocat",legend:"Premi ${accessPreviousSpace} per accedir a l'enfocament d'espai més proper inabastable abans del símbol d'intercalació, per exemple: dos elements HR adjacents. Repetiu la combinació de tecles per arribar a enfocaments d'espais distants."},{name:"Ordre per accedir al següent espai enfocat",
+legend:"Premi ${accessNextSpace} per accedir a l'enfocament d'espai més proper inabastable després del símbol d'intercalació, per exemple: dos elements HR adjacents. Repetiu la combinació de tecles per arribar a enfocaments d'espais distants."},{name:"Ajuda d'accessibilitat",legend:"Premi ${a11yHelp}"}]}],tab:"Tabulació",pause:"Pausa",capslock:"Bloqueig de majúscules",escape:"Escape",pageUp:"Pàgina Amunt",pageDown:"Pàgina Avall",leftArrow:"Fletxa Esquerra",upArrow:"Fletxa Amunt",rightArrow:"Fletxa Dreta",
+downArrow:"Fletxa Avall",insert:"Inserir",leftWindowKey:"Tecla Windows Esquerra",rightWindowKey:"Tecla Windows Dreta",selectKey:"Tecla Seleccionar",numpad0:"Teclat Numèric 0",numpad1:"Teclat Numèric 1",numpad2:"Teclat Numèric 2",numpad3:"Teclat Numèric 3",numpad4:"Teclat Numèric 4",numpad5:"Teclat Numèric 5",numpad6:"Teclat Numèric 6",numpad7:"Teclat Numèric 7",numpad8:"Teclat Numèric 8",numpad9:"Teclat Numèric 9",multiply:"Multiplicació",add:"Suma",subtract:"Resta",decimalPoint:"Punt Decimal",divide:"Divisió",
+f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Bloqueig Teclat Numèric",scrollLock:"Bloqueig de Desplaçament",semiColon:"Punt i Coma",equalSign:"Símbol Igual",comma:"Coma",dash:"Guió",period:"Punt",forwardSlash:"Barra Diagonal",graveAccent:"Accent Obert",openBracket:"Claudàtor Obert",backSlash:"Barra Invertida",closeBracket:"Claudàtor Tancat",singleQuote:"Cometa Simple"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
index 88a393c6a8b..de8ef8c1b59 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
@@ -1,12 +1,12 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","cs",{title:"Instrukce pro přístupnost",contents:"Obsah nápovědy. Pro uzavření tohoto dialogu stiskněte klávesu ESC.",legend:[{name:"Obecné",items:[{name:"Panel nástrojů editoru",legend:"Stiskněte${toolbarFocus} k procházení panelu nástrojů. Přejděte na další a předchozí skupiny pomocí TAB a SHIFT+TAB. Přechod na další a předchozí tlačítko panelu nástrojů je pomocí ŠIPKA VPRAVO nebo ŠIPKA VLEVO. Stisknutím mezerníku nebo klávesy ENTER tlačítko aktivujete."},{name:"Dialogové okno editoru",
 legend:"Uvnitř dialogového okna stiskněte TAB pro přesunutí na další prvek okna, stiskněte SHIFT+TAB pro přesun na předchozí prvek okna, stiskněte ENTER pro odeslání dialogu, stiskněte ESC pro jeho zrušení. Pro dialogová okna, která mají mnoho karet stiskněte ALT+F10 pro zaměření seznamu karet, nebo TAB, pro posun podle pořadí karet.Při zaměření seznamu karet se můžete jimi posouvat pomocí ŠIPKY VPRAVO a VLEVO."},{name:"Kontextové menu editoru",legend:"Stiskněte ${contextMenu} nebo klávesu APPLICATION k otevření kontextového menu. Pak se přesuňte na další možnost menu pomocí TAB nebo ŠIPKY DOLŮ. Přesuňte se na předchozí možnost pomocí  SHIFT+TAB nebo ŠIPKY NAHORU. Stiskněte MEZERNÍK nebo ENTER pro zvolení možnosti menu. Podmenu současné možnosti otevřete pomocí MEZERNÍKU nebo ENTER či ŠIPKY DOLEVA. Kontextové menu uzavřete stiskem ESC."},
 {name:"Rámeček seznamu editoru",legend:"Uvnitř rámečku seznamu se přesunete na další položku menu pomocí TAB nebo ŠIPKA DOLŮ. Na předchozí položku se přesunete SHIFT+TAB nebo ŠIPKA NAHORU. Stiskněte MEZERNÍK nebo ENTER pro zvolení možnosti seznamu. Stiskněte ESC pro uzavření seznamu."},{name:"Lišta cesty prvku v editoru",legend:"Stiskněte ${elementsPathFocus} pro procházení lišty cesty prvku. Na další tlačítko prvku se přesunete pomocí TAB nebo ŠIPKA VPRAVO. Na předchozí tlačítko se přesunete pomocí SHIFT+TAB nebo ŠIPKA VLEVO. Stiskněte MEZERNÍK nebo ENTER pro vybrání prvku v editoru."}]},
 {name:"Příkazy",items:[{name:" Příkaz Zpět",legend:"Stiskněte ${undo}"},{name:" Příkaz Znovu",legend:"Stiskněte ${redo}"},{name:" Příkaz Tučné",legend:"Stiskněte ${bold}"},{name:" Příkaz Kurzíva",legend:"Stiskněte ${italic}"},{name:" Příkaz Podtržení",legend:"Stiskněte ${underline}"},{name:" Příkaz Odkaz",legend:"Stiskněte ${link}"},{name:" Příkaz Skrýt panel nástrojů",legend:"Stiskněte ${toolbarCollapse}"},{name:"Příkaz pro přístup k předchozímu prostoru zaměření",legend:"Stiskněte ${accessPreviousSpace} pro přístup k nejbližšímu nedosažitelnému prostoru zaměření před stříškou, například: dva přilehlé prvky HR. Pro dosažení vzdálených prostorů zaměření tuto kombinaci kláves opakujte."},
-{name:"Příkaz pro přístup k dalšímu prostoru zaměření",legend:"Stiskněte ${accessNextSpace} pro přístup k nejbližšímu nedosažitelnému prostoru zaměření po stříšce, například: dva přilehlé prvky HR. Pro dosažení vzdálených prostorů zaměření tuto kombinaci kláves opakujte."},{name:" Nápověda přístupnosti",legend:"Stiskněte ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tabulátor",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pauza",capslock:"Caps lock",escape:"Escape",pageUp:"Stránka nahoru",
-pageDown:"Stránka dolů",end:"Konec",home:"Domů",leftArrow:"Šipka vlevo",upArrow:"Šipka nahoru",rightArrow:"Šipka vpravo",downArrow:"Šipka dolů",insert:"Vložit","delete":"Smazat",leftWindowKey:"Levá klávesa Windows",rightWindowKey:"Pravá klávesa Windows",selectKey:"Vyberte klávesu",numpad0:"Numerická klávesa 0",numpad1:"Numerická klávesa 1",numpad2:"Numerická klávesa 2",numpad3:"Numerická klávesa 3",numpad4:"Numerická klávesa 4",numpad5:"Numerická klávesa 5",numpad6:"Numerická klávesa 6",numpad7:"Numerická klávesa 7",
-numpad8:"Numerická klávesa 8",numpad9:"Numerická klávesa 9",multiply:"Numerická klávesa násobení",add:"Přidat",subtract:"Numerická klávesa odečítání",decimalPoint:"Desetinná tečka",divide:"Numerická klávesa dělení",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num lock",scrollLock:"Scroll lock",semiColon:"Středník",equalSign:"Rovnítko",comma:"Čárka",dash:"Pomlčka",period:"Tečka",forwardSlash:"Lomítko",graveAccent:"Přízvuk",openBracket:"Otevřená hranatá závorka",
-backSlash:"Obrácené lomítko",closeBracket:"Uzavřená hranatá závorka",singleQuote:"Jednoduchá uvozovka"});
\ No newline at end of file
+{name:"Příkaz pro přístup k dalšímu prostoru zaměření",legend:"Stiskněte ${accessNextSpace} pro přístup k nejbližšímu nedosažitelnému prostoru zaměření po stříšce, například: dva přilehlé prvky HR. Pro dosažení vzdálených prostorů zaměření tuto kombinaci kláves opakujte."},{name:" Nápověda přístupnosti",legend:"Stiskněte ${a11yHelp}"}]}],tab:"Tabulátor",pause:"Pauza",capslock:"Caps lock",escape:"Escape",pageUp:"Stránka nahoru",pageDown:"Stránka dolů",leftArrow:"Šipka vlevo",upArrow:"Šipka nahoru",
+rightArrow:"Šipka vpravo",downArrow:"Šipka dolů",insert:"Vložit",leftWindowKey:"Levá klávesa Windows",rightWindowKey:"Pravá klávesa Windows",selectKey:"Vyberte klávesu",numpad0:"Numerická klávesa 0",numpad1:"Numerická klávesa 1",numpad2:"Numerická klávesa 2",numpad3:"Numerická klávesa 3",numpad4:"Numerická klávesa 4",numpad5:"Numerická klávesa 5",numpad6:"Numerická klávesa 6",numpad7:"Numerická klávesa 7",numpad8:"Numerická klávesa 8",numpad9:"Numerická klávesa 9",multiply:"Numerická klávesa násobení",
+add:"Přidat",subtract:"Numerická klávesa odečítání",decimalPoint:"Desetinná tečka",divide:"Numerická klávesa dělení",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num lock",scrollLock:"Scroll lock",semiColon:"Středník",equalSign:"Rovnítko",comma:"Čárka",dash:"Pomlčka",period:"Tečka",forwardSlash:"Lomítko",graveAccent:"Přízvuk",openBracket:"Otevřená hranatá závorka",backSlash:"Obrácené lomítko",closeBracket:"Uzavřená hranatá závorka",
+singleQuote:"Jednoduchá uvozovka"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
index 97fc7117cd1..31e94af26d7 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","cy",{title:"Canllawiau Hygyrchedd",contents:"Cynnwys Cymorth. I gau y deialog hwn, pwyswch ESC.",legend:[{name:"Cyffredinol",items:[{name:"Bar Offer y Golygydd",legend:"Pwyswch $ {toolbarFocus} i fynd at y bar offer. Symudwch i'r grŵp bar offer nesaf a blaenorol gyda TAB a SHIFT+TAB. Symudwch i'r botwm bar offer nesaf a blaenorol gyda SAETH DDE neu SAETH CHWITH. Pwyswch SPACE neu ENTER i wneud botwm y bar offer yn weithredol."},{name:"Deialog y Golygydd",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Dewislen Cyd-destun y Golygydd",legend:"Pwyswch $ {contextMenu} neu'r ALLWEDD 'APPLICATION' i agor y ddewislen cyd-destun. Yna symudwch i'r opsiwn ddewislen nesaf gyda'r TAB neu'r SAETH I LAWR. Symudwch i'r opsiwn blaenorol gyda SHIFT+TAB neu'r SAETH I FYNY. Pwyswch SPACE neu ENTER i ddewis yr opsiwn ddewislen. Agorwch is-dewislen yr opsiwn cyfredol gyda SPACE neu ENTER neu SAETH DDE. Ewch yn ôl i'r eitem ar y ddewislen uwch gydag ESC neu SAETH CHWITH. Ceuwch y ddewislen cyd-destun gydag ESC."},
 {name:"Blwch Rhestr y Golygydd",legend:"Tu mewn y blwch rhestr, ewch i'r eitem rhestr nesaf gyda TAB neu'r SAETH I LAWR. Symudwch i restr eitem flaenorol gyda SHIFT+TAB neu SAETH I FYNY. Pwyswch SPACE neu ENTER i ddewis yr opsiwn o'r rhestr. Pwyswch ESC i gau'r rhestr."},{name:"Bar Llwybr Elfen y Golygydd",legend:"Pwyswch ${elementsPathFocus} i fynd i'r bar llwybr elfennau. Symudwch i fotwm yr elfen nesaf gyda TAB neu SAETH DDE. Symudwch i fotwm blaenorol gyda SHIFT+TAB neu SAETH CHWITH. Pwyswch SPACE neu ENTER i ddewis yr elfen yn y golygydd."}]},
 {name:"Gorchmynion",items:[{name:"Gorchymyn dadwneud",legend:"Pwyswch ${undo}"},{name:"Gorchymyn ailadrodd",legend:"Pwyswch ${redo}"},{name:"Gorchymyn Bras",legend:"Pwyswch ${bold}"},{name:"Gorchymyn italig",legend:"Pwyswch ${italig}"},{name:"Gorchymyn tanlinellu",legend:"Pwyso ${underline}"},{name:"Gorchymyn dolen",legend:"Pwyswch ${link}"},{name:"Gorchymyn Cwympo'r Dewislen",legend:"Pwyswch ${toolbarCollapse}"},{name:"Myned i orchymyn bwlch ffocws blaenorol",legend:"Pwyswch ${accessPreviousSpace} i fyned i'r \"blwch ffocws sydd methu ei gyrraedd\" cyn y caret, er enghraifft: dwy elfen HR drws nesaf i'w gilydd. AIladroddwch y cyfuniad allwedd i gyrraedd bylchau ffocws pell."},
-{name:"Ewch i'r gorchymyn blwch ffocws nesaf",legend:"Pwyswch ${accessNextSpace} i fyned i'r blwch ffocws agosaf nad oes modd ei gyrraedd ar ôl y caret, er enghraifft: dwy elfen HR drws nesaf i'w gilydd. Ailadroddwch y cyfuniad allwedd i gyrraedd blychau ffocws pell."},{name:"Cymorth Hygyrchedd",legend:"Pwyswch ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
-end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",
-divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Ewch i'r gorchymyn blwch ffocws nesaf",legend:"Pwyswch ${accessNextSpace} i fyned i'r blwch ffocws agosaf nad oes modd ei gyrraedd ar ôl y caret, er enghraifft: dwy elfen HR drws nesaf i'w gilydd. Ailadroddwch y cyfuniad allwedd i gyrraedd blychau ffocws pell."},{name:"Cymorth Hygyrchedd",legend:"Pwyswch ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",
+insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",
+scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
index 70bebb0a2d4..c3e4a97c79e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","da",{title:"Tilgængelighedsinstrukser",contents:"Onlinehjælp. For at lukke dette vindue klik ESC",legend:[{name:"Generelt",items:[{name:"Editor værktøjslinje",legend:"Tryk ${toolbarFocus} for at navigere til værktøjslinjen. Flyt til næste eller forrige værktøjsline gruppe ved hjælp af TAB eller SHIFT+TAB. Flyt til næste eller forrige værktøjslinje knap med venstre- eller højre piltast. Tryk på SPACE eller ENTER for at aktivere værktøjslinje knappen."},{name:"Editor dialogboks",
-legend:"Inde i en dialogboks kan du, trykke på TAB for at navigere til næste element, trykke på SHIFT+TAB for at navigere til forrige element, trykke på ENTER for at afsende eller trykke på ESC for at lukke dialogboksen.\r\nNår en dialogboks har flere faner, fanelisten kan tilgås med ALT+F10 eller med TAB. Hvis fanelisten er i fokus kan du skifte til næste eller forrige tab, med højre- og venstre piltast."},{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
-{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
-{name:"Kommandoer",items:[{name:"Fortryd kommando",legend:"Klik på ${undo}"},{name:"Gentag kommando",legend:"Klik ${redo}"},{name:"Fed kommando",legend:"Klik ${bold}"},{name:"Kursiv kommando",legend:"Klik ${italic}"},{name:"Understregnings kommando",legend:"Klik ${underline}"},{name:"Link kommando",legend:"Klik ${link}"},{name:" Toolbar Collapse command",legend:"Klik ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"Tilgængelighedshjælp",legend:"Kilk ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Venstre pil",
-upArrow:"Pil op",rightArrow:"Højre pil",downArrow:"Pil ned",insert:"Insert","delete":"Delete",leftWindowKey:"Venstre Windows tast",rightWindowKey:"Højre Windows tast",selectKey:"Select-knap",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Gange",add:"Plus",subtract:"Minus",decimalPoint:"Komma",divide:"Divider",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",
-f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Lighedstegn",comma:"Komma",dash:"Bindestreg",period:"Punktum",forwardSlash:"Skråstreg",graveAccent:"Accent grave",openBracket:"Start klamme",backSlash:"Omvendt skråstreg",closeBracket:"Slut klamme",singleQuote:"Enkelt citationstegn"});
\ No newline at end of file
+legend:"Inde i en dialogboks kan du, trykke på TAB for at navigere til næste element, trykke på SHIFT+TAB for at navigere til forrige element, trykke på ENTER for at afsende eller trykke på ESC for at lukke dialogboksen.\r\nNår en dialogboks har flere faner, fanelisten kan tilgås med ALT+F10 eller med TAB. Hvis fanelisten er i fokus kan du skifte til næste eller forrige tab, med højre- og venstre piltast."},{name:"Redaktør kontekstmenu",legend:"Tryk ${contextMenu} eller APPLICATION KEY for at åbne kontekstmenuen. Flyt derefter til næste menuvalg med TAB eller PIL NED. Flyt til forrige valg med SHIFT+TAB eller PIL OP. Tryk MELLEMRUM eller RETUR for at vælge menu-muligheder. Åben under-menu af aktuelle valg med MELLEMRUM eller RETUR eller HØJRE PIL. Gå tilbage til overliggende menu-emne med ESC eller VENSTRE PIL. Luk kontekstmenu med ESC."},
+{name:"Redaktør listeboks",legend:"Flyt til næste emne med TAB eller PIL NED inde i en listeboks. Flyt til forrige listeemne med SHIFT+TAB eller PIL OP. Tryk MELLEMRUM eller RETUR for at vælge liste-muligheder. Tryk ESC for at lukke liste-boksen."},{name:"Redaktør elementsti-bar",legend:"Tryk ${elementsPathFocus} for at navigere til elementernes sti-bar. Flyt til næste element-knap med TAB eller HØJRE PIL. Flyt til forrige knap med SHIFT+TAB eller VENSTRE PIL. Klik MELLEMRUM eller RETUR for at vælge element i editoren."}]},
+{name:"Kommandoer",items:[{name:"Fortryd kommando",legend:"Klik på ${undo}"},{name:"Gentag kommando",legend:"Klik ${redo}"},{name:"Fed kommando",legend:"Klik ${bold}"},{name:"Kursiv kommando",legend:"Klik ${italic}"},{name:"Understregnings kommando",legend:"Klik ${underline}"},{name:"Link kommando",legend:"Klik ${link}"},{name:"Klap værktøjslinje sammen kommando ",legend:"Klik ${toolbarCollapse}"},{name:"Adgang til forrige fokusområde kommando",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"Tilgængelighedshjælp",legend:"Kilk ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Venstre pil",upArrow:"Pil op",rightArrow:"Højre pil",downArrow:"Pil ned",insert:"Insert",leftWindowKey:"Venstre Windows tast",
+rightWindowKey:"Højre Windows tast",selectKey:"Select-knap",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Gange",add:"Plus",subtract:"Minus",decimalPoint:"Komma",divide:"Divider",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",
+equalSign:"Lighedstegn",comma:"Komma",dash:"Bindestreg",period:"Punktum",forwardSlash:"Skråstreg",graveAccent:"Accent grave",openBracket:"Start klamme",backSlash:"Omvendt skråstreg",closeBracket:"Slut klamme",singleQuote:"Enkelt citationstegn"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
index 6bdca780673..a09f8821aa4 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
@@ -1,12 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","de-ch",{title:"Barrierefreiheitinformationen",contents:"Hilfeinhalt. Um den Dialog zu schliessen die Taste ESC drücken.",legend:[{name:"Allgemein",items:[{name:"Editorwerkzeugleiste",legend:"Drücken Sie ${toolbarFocus} auf der Symbolleiste. Gehen Sie zur nächsten oder vorherigen Symbolleistengruppe mit TAB und SHIFT+TAB. Gehen Sie zur nächsten oder vorherigen Symbolleiste auf die Schaltfläche mit dem RECHTS- oder LINKS-Pfeil. Drücken Sie die Leertaste oder Eingabetaste, um die Schaltfläche in der Symbolleiste aktivieren."},
 {name:"Editordialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor-Kontextmenü",legend:"Dürcken Sie ${contextMenu} oder die Anwendungstaste um das Kontextmenü zu öffnen. Man kann die Pfeiltasten zum Wechsel benutzen. Mit der Leertaste oder der Enter-Taste kann man den Menüpunkt aufrufen. Schliessen Sie das Kontextmenü mit der ESC-Taste."},
 {name:"Editor-Listenbox",legend:"Innerhalb einer Listenbox kann man mit der TAB-Taste oder den Pfeilrunter-Taste den nächsten Menüeintrag wählen. Mit der SHIFT+TAB Tastenkombination oder der Pfeilhoch-Taste gelangt man zum vorherigen Menüpunkt. Mit der Leertaste oder Enter kann man den Menüpunkt auswählen. Drücken Sie ESC zum Verlassen des Menüs."},{name:"Editor-Elementpfadleiste",legend:"Drücken Sie ${elementsPathFocus} um sich durch die Pfadleiste zu bewegen. Um zum nächsten Element zu gelangen drücken Sie TAB oder die Pfeilrechts-Taste. Zum vorherigen Element gelangen Sie mit der SHIFT+TAB oder der Pfeillinks-Taste. Drücken Sie die Leertaste oder Enter um das Element auszuwählen."}]},
 {name:"Befehle",items:[{name:"Rückgängig-Befehl",legend:"Drücken Sie ${undo}"},{name:"Wiederherstellen-Befehl",legend:"Drücken Sie ${redo}"},{name:"Fettschrift-Befehl",legend:"Drücken Sie ${bold}"},{name:"Kursiv-Befehl",legend:"Drücken Sie ${italic}"},{name:"Unterstreichen-Befehl",legend:"Drücken Sie ${underline}"},{name:"Link-Befehl",legend:"Drücken Sie ${link}"},{name:"Werkzeugleiste einklappen-Befehl",legend:"Drücken Sie ${toolbarCollapse}"},{name:"Zugang bisheriger Fokussierung Raumbefehl ",legend:"Drücken Sie ${accessPreviousSpace}  auf den am nächsten nicht erreichbar Fokus-Abstand vor die Einfügemarke zugreifen: zwei benachbarte HR-Elemente. Wiederholen Sie die Tastenkombination um entfernte Fokusräume zu erreichen. "},
-{name:"Zugang nächster Schwerpunkt Raumbefehl ",legend:"Drücken Sie $ { accessNextSpace }, um den nächsten unerreichbar Fokus Leerzeichen nach dem Cursor zum Beispiel auf: zwei benachbarten HR Elemente. Wiederholen Sie die Tastenkombination zum fernen Fokus Bereiche zu erreichen. "},{name:"Eingabehilfen",legend:"Drücken Sie ${a11yHelp}"}]}],backspace:"Rücktaste",tab:"Tab",enter:"Eingabe",shift:"Umschalt",ctrl:"Strg",alt:"Alt",pause:"Pause",capslock:"Feststell",escape:"Escape",pageUp:"Bild auf",pageDown:"Bild ab",
-end:"Ende",home:"Pos1",leftArrow:"Linke Pfeiltaste",upArrow:"Obere Pfeiltaste",rightArrow:"Rechte Pfeiltaste",downArrow:"Untere Pfeiltaste",insert:"Einfügen","delete":"Entfernen",leftWindowKey:"Linke Windowstaste",rightWindowKey:"Rechte Windowstaste",selectKey:"Taste auswählen",numpad0:"Ziffernblock 0",numpad1:"Ziffernblock 1",numpad2:"Ziffernblock 2",numpad3:"Ziffernblock 3",numpad4:"Ziffernblock 4",numpad5:"Ziffernblock 5",numpad6:"Ziffernblock 6",numpad7:"Ziffernblock 7",numpad8:"Ziffernblock 8",
-numpad9:"Ziffernblock 9",multiply:"Multiplizieren",add:"Addieren",subtract:"Subtrahieren",decimalPoint:"Punkt",divide:"Dividieren",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Ziffernblock feststellen",scrollLock:"Rollen",semiColon:"Semikolon",equalSign:"Gleichheitszeichen",comma:"Komma",dash:"Bindestrich",period:"Punkt",forwardSlash:"Schrägstrich",graveAccent:"Gravis",openBracket:"Öffnende eckige Klammer",backSlash:"Rückwärtsgewandter Schrägstrich",
-closeBracket:"Schliessende eckige Klammer",singleQuote:"Einfaches Anführungszeichen"});
\ No newline at end of file
+{name:"Zugang nächster Schwerpunkt Raumbefehl ",legend:"Drücken Sie $ { accessNextSpace }, um den nächsten unerreichbar Fokus Leerzeichen nach dem Cursor zum Beispiel auf: zwei benachbarten HR Elemente. Wiederholen Sie die Tastenkombination zum fernen Fokus Bereiche zu erreichen. "},{name:"Eingabehilfen",legend:"Drücken Sie ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Feststell",escape:"Escape",pageUp:"Bild auf",pageDown:"Bild ab",leftArrow:"Linke Pfeiltaste",upArrow:"Obere Pfeiltaste",rightArrow:"Rechte Pfeiltaste",
+downArrow:"Untere Pfeiltaste",insert:"Einfügen",leftWindowKey:"Linke Windowstaste",rightWindowKey:"Rechte Windowstaste",selectKey:"Taste auswählen",numpad0:"Ziffernblock 0",numpad1:"Ziffernblock 1",numpad2:"Ziffernblock 2",numpad3:"Ziffernblock 3",numpad4:"Ziffernblock 4",numpad5:"Ziffernblock 5",numpad6:"Ziffernblock 6",numpad7:"Ziffernblock 7",numpad8:"Ziffernblock 8",numpad9:"Ziffernblock 9",multiply:"Multiplizieren",add:"Addieren",subtract:"Subtrahieren",decimalPoint:"Punkt",divide:"Dividieren",
+f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Ziffernblock feststellen",scrollLock:"Rollen",semiColon:"Semikolon",equalSign:"Gleichheitszeichen",comma:"Komma",dash:"Bindestrich",period:"Punkt",forwardSlash:"Schrägstrich",graveAccent:"Gravis",openBracket:"Öffnende eckige Klammer",backSlash:"Rückwärtsgewandter Schrägstrich",closeBracket:"Schliessende eckige Klammer",singleQuote:"Einfaches Anführungszeichen"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
index 24d782a9f71..0a09795ae9d 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
@@ -1,12 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","de",{title:"Barrierefreiheitinformationen",contents:"Hilfeinhalt. Um den Dialog zu schliessen die Taste ESC drücken.",legend:[{name:"Allgemein",items:[{name:"Editorwerkzeugleiste",legend:"Drücken Sie ${toolbarFocus} auf der Symbolleiste. Gehen Sie zur nächsten oder vorherigen Symbolleistengruppe mit TAB und SHIFT+TAB. Gehen Sie zur nächsten oder vorherigen Symbolleiste auf die Schaltfläche mit dem RECHTS- oder LINKS-Pfeil. Drücken Sie die Leertaste oder Eingabetaste, um die Schaltfläche in der Symbolleiste aktivieren."},
 {name:"Editordialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor-Kontextmenü",legend:"Dürcken Sie ${contextMenu} oder die Anwendungstaste um das Kontextmenü zu öffnen. Man kann die Pfeiltasten zum Wechsel benutzen. Mit der Leertaste oder der Enter-Taste kann man den Menüpunkt aufrufen. Schliessen Sie das Kontextmenü mit der ESC-Taste."},
 {name:"Editor-Listenbox",legend:"Innerhalb einer Listenbox kann man mit der TAB-Taste oder den Pfeilrunter-Taste den nächsten Menüeintrag wählen. Mit der SHIFT+TAB Tastenkombination oder der Pfeilhoch-Taste gelangt man zum vorherigen Menüpunkt. Mit der Leertaste oder Enter kann man den Menüpunkt auswählen. Drücken Sie ESC zum Verlassen des Menüs."},{name:"Editor-Elementpfadleiste",legend:"Drücken Sie ${elementsPathFocus} um sich durch die Pfadleiste zu bewegen. Um zum nächsten Element zu gelangen drücken Sie TAB oder die Pfeilrechts-Taste. Zum vorherigen Element gelangen Sie mit der SHIFT+TAB oder der Pfeillinks-Taste. Drücken Sie die Leertaste oder Enter um das Element auszuwählen."}]},
 {name:"Befehle",items:[{name:"Rückgängig-Befehl",legend:"Drücken Sie ${undo}"},{name:"Wiederherstellen-Befehl",legend:"Drücken Sie ${redo}"},{name:"Fettschrift-Befehl",legend:"Drücken Sie ${bold}"},{name:"Kursiv-Befehl",legend:"Drücken Sie ${italic}"},{name:"Unterstreichen-Befehl",legend:"Drücken Sie ${underline}"},{name:"Link-Befehl",legend:"Drücken Sie ${link}"},{name:"Werkzeugleiste einklappen-Befehl",legend:"Drücken Sie ${toolbarCollapse}"},{name:"Zugang bisheriger Fokussierung Raumbefehl ",legend:"Drücken Sie ${accessPreviousSpace}  auf den am nächsten nicht erreichbar Fokus-Abstand vor die Einfügemarke zugreifen: zwei benachbarte HR-Elemente. Wiederholen Sie die Tastenkombination um entfernte Fokusräume zu erreichen. "},
-{name:"Zugang nächster Schwerpunkt Raumbefehl ",legend:"Drücken Sie $ { accessNextSpace }, um den nächsten unerreichbar Fokus Leerzeichen nach dem Cursor zum Beispiel auf: zwei benachbarten HR Elemente. Wiederholen Sie die Tastenkombination zum fernen Fokus Bereiche zu erreichen. "},{name:"Eingabehilfen",legend:"Drücken Sie ${a11yHelp}"}]}],backspace:"Rücktaste",tab:"Tab",enter:"Eingabe",shift:"Umschalt",ctrl:"Strg",alt:"Alt",pause:"Pause",capslock:"Feststell",escape:"Escape",pageUp:"Bild auf",pageDown:"Bild ab",
-end:"Ende",home:"Pos1",leftArrow:"Linke Pfeiltaste",upArrow:"Obere Pfeiltaste",rightArrow:"Rechte Pfeiltaste",downArrow:"Untere Pfeiltaste",insert:"Einfügen","delete":"Entfernen",leftWindowKey:"Linke Windowstaste",rightWindowKey:"Rechte Windowstaste",selectKey:"Taste auswählen",numpad0:"Ziffernblock 0",numpad1:"Ziffernblock 1",numpad2:"Ziffernblock 2",numpad3:"Ziffernblock 3",numpad4:"Ziffernblock 4",numpad5:"Ziffernblock 5",numpad6:"Ziffernblock 6",numpad7:"Ziffernblock 7",numpad8:"Ziffernblock 8",
-numpad9:"Ziffernblock 9",multiply:"Multiplizieren",add:"Addieren",subtract:"Subtrahieren",decimalPoint:"Punkt",divide:"Dividieren",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Ziffernblock feststellen",scrollLock:"Rollen",semiColon:"Semikolon",equalSign:"Gleichheitszeichen",comma:"Komma",dash:"Bindestrich",period:"Punkt",forwardSlash:"Schrägstrich",graveAccent:"Gravis",openBracket:"Öffnende eckige Klammer",backSlash:"Rückwärtsgewandter Schrägstrich",
-closeBracket:"Schließende eckige Klammer",singleQuote:"Einfaches Anführungszeichen"});
\ No newline at end of file
+{name:"Zugang nächster Schwerpunkt Raumbefehl ",legend:"Drücken Sie $ { accessNextSpace }, um den nächsten unerreichbar Fokus Leerzeichen nach dem Cursor zum Beispiel auf: zwei benachbarten HR Elemente. Wiederholen Sie die Tastenkombination zum fernen Fokus Bereiche zu erreichen. "},{name:"Eingabehilfen",legend:"Drücken Sie ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Feststell",escape:"Escape",pageUp:"Bild auf",pageDown:"Bild ab",leftArrow:"Linke Pfeiltaste",upArrow:"Obere Pfeiltaste",rightArrow:"Rechte Pfeiltaste",
+downArrow:"Untere Pfeiltaste",insert:"Einfügen",leftWindowKey:"Linke Windowstaste",rightWindowKey:"Rechte Windowstaste",selectKey:"Taste auswählen",numpad0:"Ziffernblock 0",numpad1:"Ziffernblock 1",numpad2:"Ziffernblock 2",numpad3:"Ziffernblock 3",numpad4:"Ziffernblock 4",numpad5:"Ziffernblock 5",numpad6:"Ziffernblock 6",numpad7:"Ziffernblock 7",numpad8:"Ziffernblock 8",numpad9:"Ziffernblock 9",multiply:"Multiplizieren",add:"Addieren",subtract:"Subtrahieren",decimalPoint:"Punkt",divide:"Dividieren",
+f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Ziffernblock feststellen",scrollLock:"Rollen",semiColon:"Semikolon",equalSign:"Gleichheitszeichen",comma:"Komma",dash:"Bindestrich",period:"Punkt",forwardSlash:"Schrägstrich",graveAccent:"Gravis",openBracket:"Öffnende eckige Klammer",backSlash:"Rückwärtsgewandter Schrägstrich",closeBracket:"Schließende eckige Klammer",singleQuote:"Einfaches Anführungszeichen"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
index ae73cabcd70..19a44b0f4f9 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
@@ -1,12 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","el",{title:"Οδηγίες Προσβασιμότητας",contents:"Περιεχόμενα Βοήθειας. Πατήστε ESC για κλείσιμο.",legend:[{name:"Γενικά",items:[{name:"Εργαλειοθήκη Επεξεργαστή",legend:"Πατήστε ${toolbarFocus} για να περιηγηθείτε στην γραμμή εργαλείων. Μετακινηθείτε ανάμεσα στις ομάδες της γραμμής εργαλείων με TAB και SHIFT+TAB. Μετακινηθείτε ανάμεσα στα κουμπιά εργαλείων με το ΔΕΞΙ ή ΑΡΙΣΤΕΡΟ ΒΕΛΑΚΙ. Πατήστε ΔΙΑΣΤΗΜΑ ή ENTER για να ενεργοποιήσετε το ενεργό κουμπί εργαλείου."},{name:"Παράθυρο Διαλόγου Επεξεργαστή",
 legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Αναδυόμενο Μενού Επεξεργαστή",legend:"Πατήστε ${contextMenu} ή APPLICATION KEY για να ανοίξετε το αναδυόμενο μενού. Μετά μετακινηθείτε στην επόμενη επιλογή του μενού με  TAB ή ΚΑΤΩ ΒΕΛΑΚΙ. Μετακινηθείτε στην προηγούμενη επιλογή με SHIFT+TAB ή το ΠΑΝΩ ΒΕΛΑΚΙ. Πατήστε ΔΙΑΣΤΗΜΑ ή ENTER για να επιλέξτε το τρέχων στοιχείο. Ανοίξτε το αναδυόμενο μενού της τρέχουσας επιλογής με ΔΙΑΣΤΗΜΑ ή ENTER ή το ΔΕΞΙ ΒΕΛΑΚΙ. Μεταβείτε πίσω στο αρχικό στοιχείο μενού με το ESC ή το ΑΡΙΣΤΕΡΟ ΒΕΛΑΚΙ. Κλείστε το αναδυόμενο μενού με ESC."},
 {name:"Κουτί Λίστας Επεξεργαστών",legend:"Μέσα σε ένα κουτί λίστας, μετακινηθείτε στο επόμενο στοιχείο με TAB ή ΚΑΤΩ ΒΕΛΑΚΙ. Μετακινηθείτε στο προηγούμενο στοιχείο με SHIFT+TAB ή το ΠΑΝΩ ΒΕΛΑΚΙ. Πατήστε ΔΙΑΣΤΗΜΑ ή ENTER για να επιλέξετε ένα στοιχείο. Πατήστε ESC για να κλείσετε το κουτί της λίστας."},{name:"Μπάρα Διαδρομών Στοιχείων Επεξεργαστή",legend:"Πατήστε ${elementsPathFocus} για να περιηγηθείτε στην μπάρα διαδρομών στοιχείων του επεξεργαστή. Μετακινηθείτε στο κουμπί του επόμενου στοιχείου με το TAB ή το ΔΕΞΙ ΒΕΛΑΚΙ. Μετακινηθείτε στο κουμπί του προηγούμενου στοιχείου με το SHIFT+TAB ή το ΑΡΙΣΤΕΡΟ ΒΕΛΑΚΙ. Πατήστε ΔΙΑΣΤΗΜΑ ή ENTER για να επιλέξετε το στοιχείο στον επεξεργαστή."}]},
 {name:"Εντολές",items:[{name:"Εντολή αναίρεσης",legend:"Πατήστε ${undo}"},{name:"Εντολή επανάληψης",legend:"Πατήστε ${redo}"},{name:"Εντολή έντονης γραφής",legend:"Πατήστε ${bold}"},{name:"Εντολή πλάγιας γραφής",legend:"Πατήστε ${italic}"},{name:"Εντολή υπογράμμισης",legend:"Πατήστε ${underline}"},{name:"Εντολή συνδέσμου",legend:"Πατήστε ${link}"},{name:"Εντολή Σύμπτηξης Εργαλειοθήκης",legend:"Πατήστε ${toolbarCollapse}"},{name:"Πρόσβαση στην προηγούμενη εντολή του χώρου εστίασης ",legend:"Πατήστε ${accessPreviousSpace} για να έχετε πρόσβαση στον πιο κοντινό χώρο εστίασης πριν το δρομέα, για παράδειγμα: δύο παρακείμενα στοιχεία ΥΕ. Επαναλάβετε το συνδυασμό πλήκτρων για να φθάσετε στους χώρους μακρινής εστίασης. "},
-{name:"Πρόσβαση στην επόμενη εντολή του χώρου εστίασης",legend:"Πατήστε ${accessNextSpace} για να έχετε πρόσβαση στον πιο κοντινό χώρο εστίασης μετά το δρομέα, για παράδειγμα: δύο παρακείμενα στοιχεία ΥΕ. Επαναλάβετε το συνδυασμό πλήκτρων για τους χώρους μακρινής εστίασης. "},{name:"Βοήθεια Προσβασιμότητας",legend:"Πατήστε ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
-end:"End",home:"Home",leftArrow:"Αριστερό Βέλος",upArrow:"Πάνω Βέλος",rightArrow:"Δεξί Βέλος",downArrow:"Κάτω Βέλος",insert:"Insert ","delete":"Delete",leftWindowKey:"Αριστερό Πλήκτρο Windows",rightWindowKey:"Δεξί Πλήκτρο Windows",selectKey:"Πλήκτρο Select",numpad0:"Αριθμητικό πληκτρολόγιο 0",numpad1:"Αριθμητικό Πληκτρολόγιο 1",numpad2:"Αριθμητικό πληκτρολόγιο 2",numpad3:"Αριθμητικό πληκτρολόγιο 3",numpad4:"Αριθμητικό πληκτρολόγιο 4",numpad5:"Αριθμητικό πληκτρολόγιο 5",numpad6:"Αριθμητικό πληκτρολόγιο 6",
-numpad7:"Αριθμητικό πληκτρολόγιο 7",numpad8:"Αριθμητικό πληκτρολόγιο 8",numpad9:"Αριθμητικό πληκτρολόγιο 9",multiply:"Πολλαπλασιασμός",add:"Πρόσθεση",subtract:"Αφαίρεση",decimalPoint:"Υποδιαστολή",divide:"Διαίρεση",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"6",f7:"7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Ερωτηματικό",equalSign:"Σύμβολο Ισότητας",comma:"Κόμμα",dash:"Παύλα",period:"Τελεία",forwardSlash:"Κάθετος",graveAccent:"Βαρεία",openBracket:"Άνοιγμα Παρένθεσης",
-backSlash:"Ανάστροφη Κάθετος",closeBracket:"Κλείσιμο Παρένθεσης",singleQuote:"Απόστροφος"});
\ No newline at end of file
+{name:"Πρόσβαση στην επόμενη εντολή του χώρου εστίασης",legend:"Πατήστε ${accessNextSpace} για να έχετε πρόσβαση στον πιο κοντινό χώρο εστίασης μετά το δρομέα, για παράδειγμα: δύο παρακείμενα στοιχεία ΥΕ. Επαναλάβετε το συνδυασμό πλήκτρων για τους χώρους μακρινής εστίασης. "},{name:"Βοήθεια Προσβασιμότητας",legend:"Πατήστε ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Αριστερό Βέλος",upArrow:"Πάνω Βέλος",rightArrow:"Δεξί Βέλος",
+downArrow:"Κάτω Βέλος",insert:"Insert ",leftWindowKey:"Αριστερό Πλήκτρο Windows",rightWindowKey:"Δεξί Πλήκτρο Windows",selectKey:"Πλήκτρο Select",numpad0:"Αριθμητικό πληκτρολόγιο 0",numpad1:"Αριθμητικό Πληκτρολόγιο 1",numpad2:"Αριθμητικό πληκτρολόγιο 2",numpad3:"Αριθμητικό πληκτρολόγιο 3",numpad4:"Αριθμητικό πληκτρολόγιο 4",numpad5:"Αριθμητικό πληκτρολόγιο 5",numpad6:"Αριθμητικό πληκτρολόγιο 6",numpad7:"Αριθμητικό πληκτρολόγιο 7",numpad8:"Αριθμητικό πληκτρολόγιο 8",numpad9:"Αριθμητικό πληκτρολόγιο 9",
+multiply:"Πολλαπλασιασμός",add:"Πρόσθεση",subtract:"Αφαίρεση",decimalPoint:"Υποδιαστολή",divide:"Διαίρεση",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"6",f7:"7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Ερωτηματικό",equalSign:"Σύμβολο Ισότητας",comma:"Κόμμα",dash:"Παύλα",period:"Τελεία",forwardSlash:"Κάθετος",graveAccent:"Βαρεία",openBracket:"Άνοιγμα Παρένθεσης",backSlash:"Ανάστροφη Κάθετος",closeBracket:"Κλείσιμο Παρένθεσης",singleQuote:"Απόστροφος"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
index a5da9379ec0..26dfdf0bd7d 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","en-gb",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
index 3a62e4ad1f3..52708c937b5 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","en",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
index 8c798a71e02..01edb4d275d 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","eo",{title:"Uzindikoj pri atingeblo",contents:"Helpilenhavo. Por fermi tiun dialogon, premu la ESKAPAN klavon.",legend:[{name:"Ĝeneralaĵoj",items:[{name:"Ilbreto de la redaktilo",legend:"Premu ${toolbarFocus} por atingi la ilbreton. Moviĝu al la sekva aŭ antaŭa grupoj de la ilbreto per la klavoj TABA kaj MAJUSKLIGA+TABA. Moviĝu al la sekva aŭ antaŭa butonoj de la ilbreto per la klavoj SAGO DEKSTREN kaj SAGO MALDEKSTREN. Premu la SPACETklavon aŭ la ENENklavon por aktivigi la ilbretbutonon."},
@@ -7,7 +7,6 @@ CKEDITOR.plugins.setLang("a11yhelp","eo",{title:"Uzindikoj pri atingeblo",conten
 {name:"Kunteksta menuo de la redaktilo",legend:"Premu ${contextMenu} aŭ entajpu la KLAVKOMBINAĴON por malfermi la kuntekstan menuon. Poste moviĝu al la sekva opcio de la menuo per la klavoj TABA aŭ SAGO SUBEN. Moviĝu al la antaŭa opcio per la klavoj MAJUSKLGA + TABA aŭ SAGO SUPREN. Premu la SPACETklavon aŭ ENENklavon por selekti la menuopcion. Malfermu la submenuon de la kuranta opcio per la SPACETklavo aŭ la ENENklavo aŭ la SAGO DEKSTREN. Revenu al la elemento de la patra menuo per la klavoj ESKAPA aŭ SAGO MALDEKSTREN. Fermu la kuntekstan menuon per la ESKAPA klavo."},
 {name:"Fallisto de la redaktilo",legend:"En fallisto, moviĝu al la sekva listelemento per la klavoj TABA aŭ SAGO SUBEN. Moviĝu al la antaŭa listelemento per la klavoj MAJUSKLIGA+TABA aŭ SAGO SUPREN. Premu la SPACETklavon aŭ ENENklavon por selekti la opcion en la listo. Premu la ESKAPAN klavon por fermi la falmenuon."},{name:"Breto indikanta la vojon al la redaktilelementoj",legend:"Premu ${elementsPathFocus} por navigi al la breto indikanta la vojon al la redaktilelementoj. Moviĝu al la butono de la sekva elemento per la klavoj TABA aŭ SAGO DEKSTREN. Moviĝu al la butono de la antaŭa elemento per la klavoj MAJUSKLIGA+TABA aŭ SAGO MALDEKSTREN. Premu la SPACETklavon aŭ ENENklavon por selekti la elementon en la redaktilo."}]},
 {name:"Komandoj",items:[{name:"Komando malfari",legend:"Premu ${undo}"},{name:"Komando refari",legend:"Premu ${redo}"},{name:"Komando grasa",legend:"Premu ${bold}"},{name:"Komando kursiva",legend:"Premu ${italic}"},{name:"Komando substreki",legend:"Premu ${underline}"},{name:"Komando ligilo",legend:"Premu ${link}"},{name:"Komando faldi la ilbreton",legend:"Premu ${toolbarCollapse}"},{name:"Komando por atingi la antaŭan fokusan spacon",legend:"Press ${accessPreviousSpace} por atingi la plej proksiman neatingeblan fokusan spacon antaŭ la kursoro, ekzemple : du kuntuŝiĝajn HR elementojn. Ripetu la klavkombinaĵon por atingi malproksimajn fokusajn spacojn."},
-{name:"Komando por atingi la sekvan fokusan spacon",legend:"Press ${accessNextSpace} por atingi la plej proksiman neatingeblan fokusan spacon post la kursoro, ekzemple : du kuntuŝiĝajn HR elementojn. Ripetu la klavkombinajôn por atingi malproksimajn fokusajn spacojn"},{name:"Helpilo pri atingeblo",legend:"Premu ${a11yHelp}"}]}],backspace:"Retropaŝo",tab:"Tabo",enter:"Enigi",shift:"Registrumo",ctrl:"Stirklavo",alt:"Alt-klavo",pause:"Paŭzo",capslock:"Majuskla baskulo",escape:"Eskapa klavo",pageUp:"Antaŭa Paĝo",
-pageDown:"Sekva Paĝo",end:"Fino",home:"Hejmo",leftArrow:"Sago Maldekstren",upArrow:"Sago Supren",rightArrow:"Sago Dekstren",downArrow:"Sago Suben",insert:"Enmeti","delete":"Forigi",leftWindowKey:"Maldekstra Windows-klavo",rightWindowKey:"Dekstra Windows-klavo",selectKey:"Selektklavo",numpad0:"Nombra Klavaro 0",numpad1:"Nombra Klavaro 1",numpad2:"Nombra Klavaro 2",numpad3:"Nombra Klavaro 3",numpad4:"Nombra Klavaro 4",numpad5:"Nombra Klavaro 5",numpad6:"Nombra Klavaro 6",numpad7:"Nombra Klavaro 7",
-numpad8:"Nombra Klavaro 8",numpad9:"Nombra Klavaro 9",multiply:"Obligi",add:"Almeti",subtract:"Subtrahi",decimalPoint:"Dekuma Punkto",divide:"Dividi",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Nombra Baskulo",scrollLock:"Ruluma Baskulo",semiColon:"Punktokomo",equalSign:"Egalsigno",comma:"Komo",dash:"Haltostreko",period:"Punkto",forwardSlash:"Oblikvo",graveAccent:"Malakuto",openBracket:"Malferma Krampo",backSlash:"Retroklino",closeBracket:"Ferma Krampo",
-singleQuote:"Citilo"});
\ No newline at end of file
+{name:"Komando por atingi la sekvan fokusan spacon",legend:"Press ${accessNextSpace} por atingi la plej proksiman neatingeblan fokusan spacon post la kursoro, ekzemple : du kuntuŝiĝajn HR elementojn. Ripetu la klavkombinajôn por atingi malproksimajn fokusajn spacojn"},{name:"Helpilo pri atingeblo",legend:"Premu ${a11yHelp}"}]}],tab:"Tabo",pause:"Paŭzo",capslock:"Majuskla baskulo",escape:"Eskapa klavo",pageUp:"Antaŭa Paĝo",pageDown:"Sekva Paĝo",leftArrow:"Sago Maldekstren",upArrow:"Sago Supren",rightArrow:"Sago Dekstren",
+downArrow:"Sago Suben",insert:"Enmeti",leftWindowKey:"Maldekstra Windows-klavo",rightWindowKey:"Dekstra Windows-klavo",selectKey:"Selektklavo",numpad0:"Nombra Klavaro 0",numpad1:"Nombra Klavaro 1",numpad2:"Nombra Klavaro 2",numpad3:"Nombra Klavaro 3",numpad4:"Nombra Klavaro 4",numpad5:"Nombra Klavaro 5",numpad6:"Nombra Klavaro 6",numpad7:"Nombra Klavaro 7",numpad8:"Nombra Klavaro 8",numpad9:"Nombra Klavaro 9",multiply:"Obligi",add:"Almeti",subtract:"Subtrahi",decimalPoint:"Dekuma Punkto",divide:"Dividi",
+f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Nombra Baskulo",scrollLock:"Ruluma Baskulo",semiColon:"Punktokomo",equalSign:"Egalsigno",comma:"Komo",dash:"Haltostreko",period:"Punkto",forwardSlash:"Oblikvo",graveAccent:"Malakuto",openBracket:"Malferma Krampo",backSlash:"Retroklino",closeBracket:"Ferma Krampo",singleQuote:"Citilo"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
index e399793eacb..2aa0c5cb0e2 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
@@ -1,12 +1,13 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","es",{title:"Instrucciones de accesibilidad",contents:"Ayuda. Para cerrar presione ESC.",legend:[{name:"General",items:[{name:"Barra de herramientas del editor",legend:'Presiona ${toolbarFocus} para navegar por la barra de herramientas. Para moverse por los distintos grupos de herramientas usa las teclas TAB y MAY+TAB. Para moverse por las distintas herramientas usa FLECHA DERECHA o FECHA IZQUIERDA. Presiona "espacio" o "intro" para activar la herramienta.'},{name:"Editor de diálogo",
-legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor del menú contextual",legend:"Presiona ${contextMenu} o TECLA MENÚ para abrir el menú contextual. Entonces muévete a la siguiente opción del menú con TAB o FLECHA ABAJO. Muévete a la opción previa con SHIFT + TAB o FLECHA ARRIBA. Presiona ESPACIO o ENTER para seleccionar la opción del menú. Abre el submenú de la opción actual con ESPACIO o ENTER o FLECHA DERECHA. Regresa al elemento padre del menú con ESC o FLECHA IZQUIERDA. Cierra el menú contextual con ESC."},
-{name:"Lista del Editor",legend:"Dentro de una lista, te mueves al siguiente elemento de la lista con TAB o FLECHA ABAJO. Te mueves al elemento previo de la lista con SHIFT+TAB o FLECHA ARRIBA. Presiona ESPACIO o ENTER para elegir la opción de la lista. Presiona ESC para cerrar la lista."},{name:"Barra de Ruta del Elemento en el Editor",legend:"Presiona ${elementsPathFocus} para navegar a los elementos de la barra de ruta. Te mueves al siguiente elemento botón con TAB o FLECHA DERECHA. Te mueves al botón previo con SHIFT+TAB o FLECHA IZQUIERDA. Presiona ESPACIO o ENTER para seleccionar el elemento en el editor."}]},
+legend:"Dentro del diálogo, presione TAB para navegar a los siguientes elementos de diálogo, presione SHIFT+TAB para moverse a los anteriores elementos de diálogo, presione ENTER para enviar el diálogo, presiona ESC para cancelar el diálogo. Cuando el diálogo tiene multiples pestañas, la lista de pestañas puede ser abarcada con ALT + F10 or con TAB como parte del orden de pestañas del diálogo. ECon la pestaña enfocada, puede moverse a la siguiente o anterior pestaña con las FLECHAS IZQUIRDA y DERECHA respectivamente."},
+{name:"Editor del menú contextual",legend:"Presiona ${contextMenu} o TECLA MENÚ para abrir el menú contextual. Entonces muévete a la siguiente opción del menú con TAB o FLECHA ABAJO. Muévete a la opción previa con SHIFT + TAB o FLECHA ARRIBA. Presiona ESPACIO o ENTER para seleccionar la opción del menú. Abre el submenú de la opción actual con ESPACIO o ENTER o FLECHA DERECHA. Regresa al elemento padre del menú con ESC o FLECHA IZQUIERDA. Cierra el menú contextual con ESC."},{name:"Lista del Editor",
+legend:"Dentro de una lista, te mueves al siguiente elemento de la lista con TAB o FLECHA ABAJO. Te mueves al elemento previo de la lista con SHIFT+TAB o FLECHA ARRIBA. Presiona ESPACIO o ENTER para elegir la opción de la lista. Presiona ESC para cerrar la lista."},{name:"Barra de Ruta del Elemento en el Editor",legend:"Presiona ${elementsPathFocus} para navegar a los elementos de la barra de ruta. Te mueves al siguiente elemento botón con TAB o FLECHA DERECHA. Te mueves al botón previo con SHIFT+TAB o FLECHA IZQUIERDA. Presiona ESPACIO o ENTER para seleccionar el elemento en el editor."}]},
 {name:"Comandos",items:[{name:"Comando deshacer",legend:"Presiona ${undo}"},{name:"Comando rehacer",legend:"Presiona ${redo}"},{name:"Comando negrita",legend:"Presiona ${bold}"},{name:"Comando itálica",legend:"Presiona ${italic}"},{name:"Comando subrayar",legend:"Presiona ${underline}"},{name:"Comando liga",legend:"Presiona ${liga}"},{name:"Comando colapsar barra de herramientas",legend:"Presiona ${toolbarCollapse}"},{name:"Comando accesar el anterior espacio de foco",legend:"Presiona ${accessPreviousSpace} para accesar el espacio de foco no disponible más cercano anterior al cursor, por ejemplo: dos elementos HR adyacentes. Repite la combinación de teclas para alcanzar espacios de foco distantes."},
-{name:"Comando accesar el siguiente spacio de foco",legend:"Presiona ${accessNextSpace} para accesar el espacio de foco no disponible más cercano después del cursor, por ejemplo: dos elementos HR adyacentes. Repite la combinación de teclas para alcanzar espacios de foco distantes."},{name:"Ayuda de Accesibilidad",legend:"Presiona ${a11yHelp}"}]}],backspace:"Retroceso",tab:"Tabulador",enter:"Ingresar",shift:"Mayús.",ctrl:"Ctrl",alt:"Alt",pause:"Pausa",capslock:"Bloq. Mayús.",escape:"Escape",pageUp:"Regresar Página",
-pageDown:"Avanzar Página",end:"Fin",home:"Inicio",leftArrow:"Flecha Izquierda",upArrow:"Flecha Arriba",rightArrow:"Flecha Derecha",downArrow:"Flecha Abajo",insert:"Insertar","delete":"Suprimir",leftWindowKey:"Tecla Windows Izquierda",rightWindowKey:"Tecla Windows Derecha",selectKey:"Tecla de Selección",numpad0:"Tecla 0 del teclado numérico",numpad1:"Tecla 1 del teclado numérico",numpad2:"Tecla 2 del teclado numérico",numpad3:"Tecla 3 del teclado numérico",numpad4:"Tecla 4 del teclado numérico",numpad5:"Tecla 5 del teclado numérico",
-numpad6:"Tecla 6 del teclado numérico",numpad7:"Tecla 7 del teclado numérico",numpad8:"Tecla 8 del teclado numérico",numpad9:"Tecla 9 del teclado numérico",multiply:"Multiplicar",add:"Sumar",subtract:"Restar",decimalPoint:"Punto Decimal",divide:"Dividir",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Punto y coma",equalSign:"Signo de Igual",comma:"Coma",dash:"Guión",period:"Punto",forwardSlash:"Diagonal",
-graveAccent:"Acento Grave",openBracket:"Abrir llave",backSlash:"Diagonal Invertida",closeBracket:"Cerrar llave",singleQuote:"Comillas simples"});
\ No newline at end of file
+{name:"Comando accesar el siguiente spacio de foco",legend:"Presiona ${accessNextSpace} para accesar el espacio de foco no disponible más cercano después del cursor, por ejemplo: dos elementos HR adyacentes. Repite la combinación de teclas para alcanzar espacios de foco distantes."},{name:"Ayuda de Accesibilidad",legend:"Presiona ${a11yHelp}"}]}],tab:"Tabulador",pause:"Pausa",capslock:"Bloq. Mayús.",escape:"Escape",pageUp:"Regresar Página",pageDown:"Avanzar Página",leftArrow:"Flecha Izquierda",upArrow:"Flecha Arriba",
+rightArrow:"Flecha Derecha",downArrow:"Flecha Abajo",insert:"Insertar",leftWindowKey:"Tecla Windows Izquierda",rightWindowKey:"Tecla Windows Derecha",selectKey:"Tecla de Selección",numpad0:"Tecla 0 del teclado numérico",numpad1:"Tecla 1 del teclado numérico",numpad2:"Tecla 2 del teclado numérico",numpad3:"Tecla 3 del teclado numérico",numpad4:"Tecla 4 del teclado numérico",numpad5:"Tecla 5 del teclado numérico",numpad6:"Tecla 6 del teclado numérico",numpad7:"Tecla 7 del teclado numérico",numpad8:"Tecla 8 del teclado numérico",
+numpad9:"Tecla 9 del teclado numérico",multiply:"Multiplicar",add:"Sumar",subtract:"Restar",decimalPoint:"Punto Decimal",divide:"Dividir",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Punto y coma",equalSign:"Signo de Igual",comma:"Coma",dash:"Guión",period:"Punto",forwardSlash:"Diagonal",graveAccent:"Acento Grave",openBracket:"Abrir llave",backSlash:"Diagonal Invertida",closeBracket:"Cerrar llave",
+singleQuote:"Comillas simples"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
index 9fded4c8898..c5987d4249a 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","et",{title:"Accessibility Instructions",contents:"Abi sisu. Selle dialoogi sulgemiseks vajuta ESC klahvi.",legend:[{name:"Üldine",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
index cfcd553d57c..36cf17774e2 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","eu",{title:"Erabilerraztasunaren argibideak",contents:"Laguntzaren edukiak. Elkarrizketa-koadro hau ixteko sakatu ESC.",legend:[{name:"Orokorra",items:[{name:"Editorearen tresna-barra",legend:"Sakatu ${toolbarFocus} tresna-barrara nabigatzeko. Tresna-barrako aurreko eta hurrengo taldera joateko erabili TAB eta MAIUS+TAB. Tresna-barrako aurreko eta hurrengo botoira joateko erabili ESKUIN-GEZIA eta EZKER-GEZIA. Sakatu ZURIUNEA edo SARTU tresna-barrako botoia aktibatzeko."},
@@ -7,6 +7,6 @@ CKEDITOR.plugins.setLang("a11yhelp","eu",{title:"Erabilerraztasunaren argibideak
 legend:"Sakatu ${contextMenu} edo APLIKAZIO TEKLA testuinguru-menua irekitzeko. Menuko hurrengo aukerara joateko erabili TAB edo BEHERA GEZIA. Aurreko aukerara nabigatzeko erabili MAIUS+TAB edo GORA GEZIA. Sakatu ZURIUNEA edo SARTU menuko aukera hautatzeko. Ireki uneko aukeraren azpi-menua ZURIUNEA edo SARTU edo ESKUIN-GEZIA erabiliz. Menuko aukera gurasora itzultzeko erabili ESC edo EZKER-GEZIA. Testuinguru-menua ixteko sakatu ESC."},{name:"Editorearen zerrenda-koadroa",legend:"Zerrenda-koadro baten barruan, zerrendako hurrengo elementura joateko erabili TAB edo BEHERA GEZIA. Zerrendako aurreko elementura nabigatzeko MAIUS+TAB edo GORA GEZIA. Sakatu ZURIUNEA edo SARTU zerrendako aukera hautatzeko. Sakatu ESC zerrenda-koadroa ixteko."},
 {name:"Editorearen elementuaren bide-barra",legend:"Sakatu ${elementsPathFocus} elementuaren bide-barrara nabigatzeko. Hurrengo elementuaren botoira joateko erabili TAB edo ESKUIN-GEZIA. Aurreko botoira joateko aldiz erabili MAIUS+TAB edo EZKER-GEZIA. Elementua editorean hautatzeko sakatu ZURIUNEA edo SARTU."}]},{name:"Komandoak",items:[{name:"Desegin komandoa",legend:"Sakatu ${undo}"},{name:"Berregin komandoa",legend:"Sakatu ${redo}"},{name:"Lodia komandoa",legend:"Sakatu ${bold}"},{name:"Etzana komandoa",
 legend:"Sakatu ${italic}"},{name:"Azpimarratu komandoa",legend:"Sakatu ${underline}"},{name:"Esteka komandoa",legend:"Sakatu ${link}"},{name:"Tolestu tresna-barra komandoa",legend:"Sakatu ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:"Erabilerraztasunaren laguntza",legend:"Sakatu ${a11yHelp}"}]}],backspace:"Atzera tekla",tab:"Tabuladorea",enter:"Sartu",shift:"Maius",ctrl:"Ktrl",alt:"Alt",pause:"Pausatu",capslock:"Blok Maius",escape:"Ihes",pageUp:"Page Up",pageDown:"Page Down",end:"Buka",home:"Etxea",leftArrow:"Ezker-gezia",upArrow:"Gora gezia",rightArrow:"Eskuin-gezia",downArrow:"Behera gezia",insert:"Txertatu","delete":"Ezabatu",leftWindowKey:"Ezkerreko Windows tekla",rightWindowKey:"Eskuineko Windows tekla",selectKey:"Hautatu tekla",
-numpad0:"Zenbakizko teklatua 0",numpad1:"Zenbakizko teklatua 1",numpad2:"Zenbakizko teklatua 2",numpad3:"Zenbakizko teklatua 3",numpad4:"Zenbakizko teklatua 4",numpad5:"Zenbakizko teklatua 5",numpad6:"Zenbakizko teklatua 6",numpad7:"Zenbakizko teklatua 7",numpad8:"Zenbakizko teklatua 8",numpad9:"Zenbakizko teklatua 9",multiply:"Biderkatu",add:"Gehitu",subtract:"Kendu",decimalPoint:"Koma hamartarra",divide:"Zatitu",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",
-f12:"F12",numLock:"Blok Zenb",scrollLock:"Blok Korr",semiColon:"Puntu eta koma",equalSign:"Berdin zeinua",comma:"Koma",dash:"Marratxoa",period:"Puntua",forwardSlash:"Barra",graveAccent:"Azentu kamutsa",openBracket:"Parentesia ireki",backSlash:"Alderantzizko barra",closeBracket:"Itxi parentesia",singleQuote:"Komatxo bakuna"});
\ No newline at end of file
+{name:"Erabilerraztasunaren laguntza",legend:"Sakatu ${a11yHelp}"}]}],tab:"Tabuladorea",pause:"Pausatu",capslock:"Blok Maius",escape:"Ihes",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Ezker-gezia",upArrow:"Gora gezia",rightArrow:"Eskuin-gezia",downArrow:"Behera gezia",insert:"Txertatu",leftWindowKey:"Ezkerreko Windows tekla",rightWindowKey:"Eskuineko Windows tekla",selectKey:"Hautatu tekla",numpad0:"Zenbakizko teklatua 0",numpad1:"Zenbakizko teklatua 1",numpad2:"Zenbakizko teklatua 2",numpad3:"Zenbakizko teklatua 3",
+numpad4:"Zenbakizko teklatua 4",numpad5:"Zenbakizko teklatua 5",numpad6:"Zenbakizko teklatua 6",numpad7:"Zenbakizko teklatua 7",numpad8:"Zenbakizko teklatua 8",numpad9:"Zenbakizko teklatua 9",multiply:"Biderkatu",add:"Gehitu",subtract:"Kendu",decimalPoint:"Koma hamartarra",divide:"Zatitu",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Blok Zenb",scrollLock:"Blok Korr",semiColon:"Puntu eta koma",equalSign:"Berdin zeinua",comma:"Koma",
+dash:"Marratxoa",period:"Puntua",forwardSlash:"Barra",graveAccent:"Azentu kamutsa",openBracket:"Parentesia ireki",backSlash:"Alderantzizko barra",closeBracket:"Itxi parentesia",singleQuote:"Komatxo bakuna"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
index 12eb0352621..be36987bf62 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fa",{title:"دستورالعمل‌های دسترسی",contents:"راهنمای فهرست مطالب. برای بستن این کادر محاوره‌ای ESC را فشار دهید.",legend:[{name:"عمومی",items:[{name:"نوار ابزار ویرایشگر",legend:"${toolbarFocus} را برای باز کردن نوار ابزار بفشارید. با کلید Tab و Shift+Tab در مجموعه نوار ابزار بعدی و قبلی حرکت کنید. برای حرکت در کلید نوار ابزار قبلی و بعدی با کلید جهت‌نمای راست و چپ جابجا شوید. کلید Space یا Enter را برای فعال کردن کلید نوار ابزار بفشارید."},{name:"پنجره محاورهای ویرایشگر",
 legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"منوی متنی ویرایشگر",legend:"${contextMenu} یا کلید برنامههای کاربردی را برای باز کردن منوی متن را بفشارید. سپس میتوانید برای حرکت به گزینه بعدی منو با کلید Tab و یا کلید جهتنمای پایین جابجا شوید. حرکت به گزینه قبلی با Shift+Tab یا کلید جهتنمای بالا. فشردن Space یا Enter برای انتخاب یک گزینه از منو. باز کردن زیر شاخه گزینه منو جاری با کلید Space یا Enter و یا کلید جهتنمای راست و چپ. بازگشت به منوی والد با کلید Esc یا کلید جهتنمای چپ. بستن منوی متن با Esc."},
 {name:"جعبه فهرست ویرایشگر",legend:"در داخل جعبه لیست، قلم دوم از اقلام لیست بعدی را با TAB و یا Arrow Down حرکت دهید. انتقال به قلم دوم از اقلام لیست قبلی را با SHIFT + TAB یا UP ARROW. کلید Space یا ENTER را برای انتخاب گزینه لیست بفشارید. کلید ESC را برای بستن جعبه لیست بفشارید."},{name:"ویرایشگر عنصر نوار راه",legend:"برای رفتن به مسیر عناصر ${elementsPathFocus} را بفشارید. حرکت به کلید عنصر بعدی با کلید Tab یا کلید جهت‌نمای راست. برگشت به کلید قبلی با Shift+Tab یا کلید جهت‌نمای چپ. فشردن Space یا Enter برای انتخاب یک عنصر در ویرایشگر."}]},
 {name:"فرمان‌ها",items:[{name:"بازگشت به آخرین فرمان",legend:"فشردن ${undo}"},{name:"انجام مجدد فرمان",legend:"فشردن ${redo}"},{name:"فرمان درشت کردن متن",legend:"فشردن ${bold}"},{name:"فرمان کج کردن متن",legend:"فشردن ${italic}"},{name:"فرمان زیرخطدار کردن متن",legend:"فشردن ${underline}"},{name:"فرمان پیوند دادن",legend:"فشردن ${link}"},{name:"بستن نوار ابزار فرمان",legend:"فشردن ${toolbarCollapse}"},{name:"دسترسی به فرمان محل تمرکز قبلی",legend:"فشردن ${accessPreviousSpace} برای دسترسی به نزدیک‌ترین فضای قابل دسترسی تمرکز قبل از هشتک، برای مثال: دو عنصر مجاور HR -خط افقی-. تکرار کلید ترکیبی برای رسیدن به فضاهای تمرکز از راه دور."},
-{name:"دسترسی به فضای دستور بعدی",legend:"برای دسترسی به نزدیک‌ترین فضای تمرکز غیر قابل دسترس، ${accessNextSpace} را پس از علامت هشتک بفشارید، برای مثال:  دو عنصر مجاور HR -خط افقی-. کلید ترکیبی را برای رسیدن به فضای تمرکز تکرار کنید."},{name:"راهنمای دسترسی",legend:"فشردن ${a11yHelp}"}]}],backspace:"عقبگرد",tab:"برگه",enter:"ورود",shift:"تعویض",ctrl:"کنترل",alt:"دگرساز",pause:"توقف",capslock:"Caps Lock",escape:"گریز",pageUp:"صفحه به بالا",pageDown:"صفحه به پایین",end:"پایان",home:"خانه",leftArrow:"پیکان چپ",
-upArrow:"پیکان بالا",rightArrow:"پیکان راست",downArrow:"پیکان پایین",insert:"ورود","delete":"حذف",leftWindowKey:"کلید چپ ویندوز",rightWindowKey:"کلید راست ویندوز",selectKey:"انتخاب کلید",numpad0:"کلید شماره 0",numpad1:"کلید شماره 1",numpad2:"کلید شماره 2",numpad3:"کلید شماره 3",numpad4:"کلید شماره 4",numpad5:"کلید شماره 5",numpad6:"کلید شماره 6",numpad7:"کلید شماره 7",numpad8:"کلید شماره 8",numpad9:"کلید شماره 9",multiply:"ضرب",add:"افزودن",subtract:"تفریق",decimalPoint:"نقطه‌ی اعشار",divide:"جدا کردن",
-f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"علامت تساوی",comma:"کاما",dash:"خط تیره",period:"دوره",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"دسترسی به فضای دستور بعدی",legend:"برای دسترسی به نزدیک‌ترین فضای تمرکز غیر قابل دسترس، ${accessNextSpace} را پس از علامت هشتک بفشارید، برای مثال:  دو عنصر مجاور HR -خط افقی-. کلید ترکیبی را برای رسیدن به فضای تمرکز تکرار کنید."},{name:"راهنمای دسترسی",legend:"فشردن ${a11yHelp}"}]}],tab:"برگه",pause:"توقف",capslock:"Caps Lock",escape:"گریز",pageUp:"صفحه به بالا",pageDown:"صفحه به پایین",leftArrow:"پیکان چپ",upArrow:"پیکان بالا",rightArrow:"پیکان راست",downArrow:"پیکان پایین",insert:"ورود",
+leftWindowKey:"کلید چپ ویندوز",rightWindowKey:"کلید راست ویندوز",selectKey:"انتخاب کلید",numpad0:"کلید شماره 0",numpad1:"کلید شماره 1",numpad2:"کلید شماره 2",numpad3:"کلید شماره 3",numpad4:"کلید شماره 4",numpad5:"کلید شماره 5",numpad6:"کلید شماره 6",numpad7:"کلید شماره 7",numpad8:"کلید شماره 8",numpad9:"کلید شماره 9",multiply:"ضرب",add:"افزودن",subtract:"تفریق",decimalPoint:"نقطه‌ی اعشار",divide:"جدا کردن",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",
+f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"علامت تساوی",comma:"کاما",dash:"خط تیره",period:"دوره",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
index 98f8127c3de..28b5d28d636 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fi",{title:"Saavutettavuus ohjeet",contents:"Ohjeen sisällöt. Sulkeaksesi tämän dialogin paina ESC.",legend:[{name:"Yleinen",items:[{name:"Editorin työkalupalkki",legend:"Paina ${toolbarFocus} siirtyäksesi työkalupalkkiin. Siirry seuraavaan ja edelliseen työkalupalkin ryhmään TAB ja SHIFT+TAB näppäimillä. Siirry seuraavaan ja edelliseen työkalupainikkeeseen käyttämällä NUOLI OIKEALLE tai NUOLI VASEMMALLE näppäimillä. Paina VÄLILYÖNTI tai ENTER näppäintä aktivoidaksesi työkalupainikkeen."},
 {name:"Editorin dialogi",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editorin oheisvalikko",legend:"Paina ${contextMenu} tai SOVELLUSPAINIKETTA avataksesi oheisvalikon. Liiku seuraavaan valikon vaihtoehtoon TAB tai NUOLI ALAS näppäimillä. Siirry edelliseen vaihtoehtoon SHIFT+TAB tai NUOLI YLÖS näppäimillä. Paina VÄLILYÖNTI tai ENTER valitaksesi valikon kohdan. Avataksesi nykyisen kohdan alivalikon paina VÄLILYÖNTI tai ENTER tai NUOLI OIKEALLE painiketta. Siirtyäksesi takaisin valikon ylemmälle tasolle paina ESC tai NUOLI vasemmalle. Oheisvalikko suljetaan ESC painikkeella."},
 {name:"Editorin listalaatikko",legend:"Listalaatikon sisällä siirry seuraavaan listan kohtaan TAB tai NUOLI ALAS painikkeilla. Siirry edelliseen listan kohtaan SHIFT+TAB tai NUOLI YLÖS painikkeilla. Paina VÄLILYÖNTI tai ENTER valitaksesi listan vaihtoehdon. Paina ESC sulkeaksesi listalaatikon."},{name:"Editorin elementtipolun palkki",legend:"Paina ${elementsPathFocus} siirtyäksesi elementtipolun palkkiin. Siirry seuraavaan elementtipainikkeeseen TAB tai NUOLI OIKEALLE painikkeilla. Siirry aiempaan painikkeeseen SHIFT+TAB tai NUOLI VASEMMALLE painikkeilla. Paina VÄLILYÖNTI tai ENTER valitaksesi elementin editorissa."}]},
 {name:"Komennot",items:[{name:"Peruuta komento",legend:"Paina ${undo}"},{name:"Tee uudelleen komento",legend:"Paina ${redo}"},{name:"Lihavoi komento",legend:"Paina ${bold}"},{name:"Kursivoi komento",legend:"Paina ${italic}"},{name:"Alleviivaa komento",legend:"Paina ${underline}"},{name:"Linkki komento",legend:"Paina ${link}"},{name:"Pienennä työkalupalkki komento",legend:"Paina ${toolbarCollapse}"},{name:"Siirry aiempaan fokustilaan komento",legend:"Paina ${accessPreviousSpace} siiryäksesi lähimpään kursorin edellä olevaan saavuttamattomaan fokustilaan, esimerkiksi: kaksi vierekkäistä HR elementtiä. Toista näppäinyhdistelmää päästäksesi kauempana oleviin fokustiloihin."},
-{name:"Siirry seuraavaan fokustilaan komento",legend:"Paina ${accessPreviousSpace} siiryäksesi lähimpään kursorin jälkeen olevaan saavuttamattomaan fokustilaan, esimerkiksi: kaksi vierekkäistä HR elementtiä. Toista näppäinyhdistelmää päästäksesi kauempana oleviin fokustiloihin."},{name:"Saavutettavuus ohjeet",legend:"Paina ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
-end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numeronäppäimistö 0",numpad1:"Numeronäppäimistö 1",numpad2:"Numeronäppäimistö 2",numpad3:"Numeronäppäimistö 3",numpad4:"Numeronäppäimistö 4",numpad5:"Numeronäppäimistö 5",numpad6:"Numeronäppäimistö 6",numpad7:"Numeronäppäimistö 7",numpad8:"Numeronäppäimistö 8",
-numpad9:"Numeronäppäimistö 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Puolipiste",equalSign:"Equal Sign",comma:"Pilkku",dash:"Dash",period:"Piste",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Siirry seuraavaan fokustilaan komento",legend:"Paina ${accessPreviousSpace} siiryäksesi lähimpään kursorin jälkeen olevaan saavuttamattomaan fokustilaan, esimerkiksi: kaksi vierekkäistä HR elementtiä. Toista näppäinyhdistelmää päästäksesi kauempana oleviin fokustiloihin."},{name:"Saavutettavuus ohjeet",legend:"Paina ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",
+downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numeronäppäimistö 0",numpad1:"Numeronäppäimistö 1",numpad2:"Numeronäppäimistö 2",numpad3:"Numeronäppäimistö 3",numpad4:"Numeronäppäimistö 4",numpad5:"Numeronäppäimistö 5",numpad6:"Numeronäppäimistö 6",numpad7:"Numeronäppäimistö 7",numpad8:"Numeronäppäimistö 8",numpad9:"Numeronäppäimistö 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",
+divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Puolipiste",equalSign:"Equal Sign",comma:"Pilkku",dash:"Dash",period:"Piste",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
index f1b05e89007..03e54f1fe65 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fo",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Falda",add:"Pluss",subtract:"Frádráttar",decimalPoint:"Decimal Point",divide:"Býta",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Javnatekn",comma:"Komma",dash:"Dash",period:"Punktum",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Falda",add:"Pluss",subtract:"Frádráttar",decimalPoint:"Decimal Point",divide:"Býta",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Javnatekn",comma:"Komma",dash:"Dash",period:"Punktum",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
index 888804be6f5..5aac06be5a4 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fr-ca",{title:"Instructions d'accessibilité",contents:"Contenu de l'aide.  Pour fermer cette fenêtre, appuyez sur ESC.",legend:[{name:"Général",items:[{name:"Barre d'outil de l'éditeur",legend:"Appuyer sur ${toolbarFocus} pour accéder à la barre d'outils. Se déplacer vers les groupes suivant ou précédent de la barre d'outil avec les touches TAB et SHIFT+TAB. Se déplacer vers les boutons suivant ou précédent de la barre d'outils avec les touches FLECHE DROITE et FLECHE GAUCHE. Appuyer sur la barre d'espace ou la touche ENTRER pour activer le bouton de barre d'outils."},
 {name:"Dialogue de l'éditeur",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Menu contextuel de l'éditeur",legend:"Appuyer sur ${contextMenu} ou entrer le RACCOURCI CLAVIER pour ouvrir le menu contextuel. Puis se déplacer vers l'option suivante du menu avec les touches TAB ou FLECHE BAS. Se déplacer vers l'option précédente avec les touches SHIFT+TAB ou FLECHE HAUT. appuyer sur la BARRE D'ESPACE ou la touche ENTREE pour sélectionner l'option du menu. Oovrir le sous-menu de l'option courante avec la BARRE D'ESPACE ou les touches ENTREE ou FLECHE DROITE. Revenir à l'élément de menu parent avec les touches ESC ou FLECHE GAUCHE. Fermer le menu contextuel avec ESC."},
 {name:"Menu déroulant de l'éditeur",legend:"A l'intérieur d'une liste en menu déroulant, se déplacer vers l'élément suivant de la liste avec les touches TAB ou FLECHE BAS. Se déplacer vers l'élément précédent de la liste avec les touches SHIFT+TAB ou FLECHE HAUT. Appuyer sur la BARRE D'ESPACE ou sur ENTREE pour sélectionner l'option dans la liste. Appuyer sur ESC pour fermer le menu déroulant."},{name:"Barre d'emplacement des éléments de l'éditeur",legend:"Appuyer sur ${elementsPathFocus} pour naviguer vers la barre d'emplacement des éléments de léditeur. Se déplacer vers le bouton d'élément suivant avec les touches TAB ou FLECHE DROITE. Se déplacer vers le bouton d'élément précédent avec les touches SHIFT+TAB ou FLECHE GAUCHE. Appuyer sur la BARRE D'ESPACE ou sur ENTREE pour sélectionner l'élément dans l'éditeur."}]},
 {name:"Commandes",items:[{name:"Annuler",legend:"Appuyer sur ${undo}"},{name:"Refaire",legend:"Appuyer sur ${redo}"},{name:"Gras",legend:"Appuyer sur ${bold}"},{name:"Italique",legend:"Appuyer sur ${italic}"},{name:"Souligné",legend:"Appuyer sur ${underline}"},{name:"Lien",legend:"Appuyer sur ${link}"},{name:"Enrouler la barre d'outils",legend:"Appuyer sur ${toolbarCollapse}"},{name:"Accéder à l'objet de focus précédent",legend:"Appuyer ${accessPreviousSpace} pour accéder au prochain espace disponible avant le curseur, par exemple: deux éléments HR adjacents.  Répéter la combinaison pour joindre les éléments d'espaces distantes."},
-{name:"Accéder au prochain objet de focus",legend:"Appuyer ${accessNextSpace} pour accéder au prochain espace disponible après le curseur, par exemple: deux éléments HR adjacents.  Répéter la combinaison pour joindre les éléments d'espaces distantes."},{name:"Aide d'accessibilité",legend:"Appuyer sur ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",
-leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",
-f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Accéder au prochain objet de focus",legend:"Appuyer ${accessNextSpace} pour accéder au prochain espace disponible après le curseur, par exemple: deux éléments HR adjacents.  Répéter la combinaison pour joindre les éléments d'espaces distantes."},{name:"Aide d'accessibilité",legend:"Appuyer sur ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",
+insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",
+scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
index 8a734d50966..0cf67e8d156 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
@@ -1,12 +1,13 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.plugins.setLang("a11yhelp","fr",{title:"Instructions d'accessibilité",contents:"Contenu de l'aide. Pour fermer ce dialogue, appuyez sur la touche ÉCHAP (Echappement).",legend:[{name:"Général",items:[{name:"Barre d'outils de l'éditeur",legend:"Appuyer sur ${toolbarFocus} pour accéder à la barre d'outils. Se déplacer vers les groupes suivant ou précédent de la barre d'outil avec les touches MAJ et MAJ+TAB. Se déplacer vers les boutons suivant ou précédent de la barre d'outils avec les touches FLÈCHE DROITE et FLÈCHE GAUCHE. Appuyer sur la barre d'espace ou la touche ENTRÉE pour activer le bouton de barre d'outils."},
-{name:"Dialogue de l'éditeur",legend:"Dans un dialogue, appuyer sur TAB pour aller à l'élément suivant du dialogue, appuyer sur MAJ+TAB pour aller à l'élément précédent du dialogue, appuyer sur ECHAP pour annuler le dialogue. Quand un dialogue a de multiples onglets, on peut accéder à la liste des onglets avec ALT+F10 ou avec TAB. Dans la liste des onglets, se déplacer vers le suivant ou le précédent avec les FLECHES DROITE et GAUCHE respectivement."},{name:"Menu contextuel de l'éditeur",legend:"Appuyer sur ${contextMenu} ou entrer le RACCOURCI CLAVIER pour ouvrir le menu contextuel. Puis se déplacer vers l'option suivante du menu avec les touches TAB ou FLÈCHE BAS. Se déplacer vers l'option précédente avec les touches  MAJ+TAB ou FLÈCHE HAUT. appuyer sur la BARRE D'ESPACE ou la touche ENTRÉE pour sélectionner l'option du menu. Oovrir le sous-menu de l'option courante avec la BARRE D'ESPACE ou les touches ENTRÉE ou FLÈCHE DROITE. Revenir à l'élément de menu parent avec les touches ÉCHAP ou FLÈCHE GAUCHE. Fermer le menu contextuel avec ÉCHAP."},
-{name:"Zone de liste de l'éditeur",legend:"Dans la liste en menu déroulant, se déplacer vers l'élément suivant de la liste avec les touches TAB ou FLÈCHE BAS. Se déplacer vers l'élément précédent de la liste avec les touches MAJ+TAB ou FLÈCHE HAUT. Appuyer sur la BARRE D'ESPACE ou sur ENTRÉE pour sélectionner l'option dans la liste. Appuyer sur ÉCHAP pour fermer le menu déroulant."},{name:"Barre d'emplacement des éléments de l'éditeur",legend:"Appuyer sur ${elementsPathFocus} pour naviguer vers la barre d'emplacement des éléments de l'éditeur. Se déplacer vers le bouton d'élément suivant avec les touches TAB ou FLÈCHE DROITE. Se déplacer vers le bouton d'élément précédent avec les touches MAJ+TAB ou FLÈCHE GAUCHE. Appuyer sur la BARRE D'ESPACE ou sur ENTRÉE pour sélectionner l'élément dans l'éditeur."}]},
-{name:"Commandes",items:[{name:" Annuler la commande",legend:"Appuyer sur ${undo}"},{name:"Refaire la commande",legend:"Appuyer sur ${redo}"},{name:" Commande gras",legend:"Appuyer sur ${bold}"},{name:" Commande italique",legend:"Appuyer sur ${italic}"},{name:" Commande souligné",legend:"Appuyer sur ${underline}"},{name:" Commande lien",legend:"Appuyer sur ${link}"},{name:" Commande enrouler la barre d'outils",legend:"Appuyer sur ${toolbarCollapse}"},{name:"Accéder à la précédente commande d'espace de mise au point",
-legend:"Appuyez sur ${accessPreviousSpace} pour accéder à l'espace hors d'atteinte le plus proche avant le caret, par exemple: deux éléments HR adjacents. Répétez la combinaison de touches pour atteindre les espaces de mise au point distants."},{name:"Accès à la prochaine commande de l'espace de mise au point",legend:"Appuyez sur ${accessNextSpace} pour accéder au plus proche espace de mise au point hors d'atteinte après le caret, par exemple: deux éléments HR adjacents. répétez la combinaison de touches pour atteindre les espace de mise au point distants."},
-{name:" Aide Accessibilité",legend:"Appuyer sur ${a11yHelp}"}]}],backspace:"Retour arrière",tab:"Tabulation",enter:"Entrée",shift:"Majuscule",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Verr. Maj.",escape:"Échap",pageUp:"Page supérieure",pageDown:"Page inférieure",end:"Fin",home:"Retour",leftArrow:"Flèche gauche",upArrow:"Flèche haute",rightArrow:"Flèche droite",downArrow:"Flèche basse",insert:"Insertion","delete":"Supprimer",leftWindowKey:"Touche Windows gauche",rightWindowKey:"Touche Windows droite",
-selectKey:"Touche menu",numpad0:"Pavé numérique 0",numpad1:"Pavé numérique 1",numpad2:"Pavé numérique 2",numpad3:"Pavé numérique 3",numpad4:"Pavé numérique 4",numpad5:"Pavé numérique 5",numpad6:"Pavé numérique 6",numpad7:"Pavé numérique 7",numpad8:"Pavé numérique 8",numpad9:"Pavé numérique 9",multiply:"Multiplier",add:"Addition",subtract:"Soustraire",decimalPoint:"Point décimal",divide:"Diviser",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",
-numLock:"Verrouillage numérique",scrollLock:"Arrêt défilement",semiColon:"Point virgule",equalSign:"Signe égal",comma:"Virgule",dash:"Tiret",period:"Point",forwardSlash:"Barre oblique",graveAccent:"Accent grave",openBracket:"Parenthèse ouvrante",backSlash:"Barre oblique inverse",closeBracket:"Parenthèse fermante",singleQuote:"Apostrophe"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","fr",{title:"Instructions d'accessibilité",contents:"Contenu de l'aide. Pour fermer cette fenêtre, appuyez sur la touche Échap.",legend:[{name:"Général",items:[{name:"Barre d'outils de l'éditeur",legend:"Appuyer sur ${toolbarFocus} pour accéder à la barre d'outils. Se déplacer vers le groupe suivant ou précédent de la barre d'outils avec les touches Tab et Maj+Tab. Se déplacer vers le bouton suivant ou précédent de la barre d'outils avec les touches Flèche droite et Flèche gauche. Appuyer sur la barre d'espace ou la touche Entrée pour activer le bouton de barre d'outils."},
+{name:"Fenêtre de l'éditeur",legend:"Dans une boîte de dialogue, appuyer sur Tab pour passer à l'élément suivant, appuyer sur Maj+Tab pour passer à l'élément précédent, appuyer sur Entrée pour valider, appuyer sur Échap pour annuler. Quand une boîte de dialogue possède des onglets, la liste peut être atteinte avec Alt+F10 ou avec Tab. Dans la liste des onglets, se déplacer vers le suivant et le précédent avec les touches Flèche droite et Flèche gauche respectivement."},{name:"Menu contextuel de l'éditeur",
+legend:"Appuyer sur ${contextMenu} ou sur la touche Menu pour ouvrir le menu contextuel. Se déplacer ensuite vers l'option suivante du menu avec les touches Tab ou Flèche bas. Se déplacer vers l'option précédente avec les touches Maj+Tab ou Flèche haut. Appuyer sur la barre d'espace ou la touche Entrée pour sélectionner l'option du menu. Appuyer sur la barre d'espace, la touche Entrée ou Flèche droite pour ouvrir le sous-menu de l'option sélectionnée. Revenir à l'élément de menu parent avec la touche Échap ou Flèche gauche. Fermer le menu contextuel avec Échap."},
+{name:"Zone de liste de l'éditeur",legend:"Dans une liste en menu déroulant, se déplacer vers l'élément suivant de la liste avec les touches Tab ou Flèche bas. Se déplacer vers l'élément précédent de la liste avec les touches Maj+Tab ou Flèche haut. Appuyer sur la barre d'espace ou sur Entrée pour sélectionner l'option dans la liste. Appuyer sur Échap pour fermer le menu déroulant."},{name:"Barre du chemin d'éléments de l'éditeur",legend:"Appuyer sur ${elementsPathFocus} pour naviguer vers la barre du fil d'Ariane des éléments. Se déplacer vers le bouton de l'élément suivant avec les touches Tab ou Flèche droite. Se déplacer vers le bouton précédent avec les touches Maj+Tab ou Flèche gauche. Appuyer sur la barre d'espace ou sur Entrée pour sélectionner l'élément dans l'éditeur."}]},
+{name:"Commandes",items:[{name:" Annuler la commande",legend:"Appuyer sur ${undo}"},{name:"Commande restaurer",legend:"Appuyer sur ${redo}"},{name:" Commande gras",legend:"Appuyer sur ${bold}"},{name:" Commande italique",legend:"Appuyer sur ${italic}"},{name:" Commande souligné",legend:"Appuyer sur ${underline}"},{name:" Commande lien",legend:"Appuyer sur ${link}"},{name:" Commande enrouler la barre d'outils",legend:"Appuyer sur ${toolbarCollapse}"},{name:"Commande d'accès à l'élément sélectionnable précédent",
+legend:"Appuyer sur ${accessNextSpace} pour accéder à l'élément sélectionnable inatteignable le plus proche avant le curseur, par exemple : deux lignes horizontales adjacentes. Répéter la combinaison de touches pour atteindre les éléments sélectionnables précédents."},{name:"Commande d'accès à l'élément sélectionnable suivant",legend:"Appuyer sur ${accessNextSpace} pour accéder à l'élément sélectionnable inatteignable le plus proche après le curseur, par exemple : deux lignes horizontales adjacentes. Répéter la combinaison de touches pour atteindre les éléments sélectionnables suivants."},
+{name:" Aide sur l'accessibilité",legend:"Appuyer sur ${a11yHelp}"}]}],tab:"Tabulation",pause:"Pause",capslock:"Verr. Maj.",escape:"Échap",pageUp:"Page supérieure",pageDown:"Page suivante",leftArrow:"Flèche gauche",upArrow:"Flèche haut",rightArrow:"Flèche droite",downArrow:"Flèche basse",insert:"Inser",leftWindowKey:"Touche Windows gauche",rightWindowKey:"Touche Windows droite",selectKey:"Touche Sélectionner",numpad0:"0 du pavé numérique",numpad1:"1 du pavé numérique",numpad2:"2 du pavé numérique",
+numpad3:"3 du pavé numérique",numpad4:"4 du pavé numérique",numpad5:"5 du pavé numérique",numpad6:"6 du pavé numérique",numpad7:"7 du pavé numérique",numpad8:"Pavé numérique 8",numpad9:"9 du pavé numérique",multiply:"Multiplier",add:"Plus",subtract:"Moins",decimalPoint:"Point décimal",divide:"Diviser",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Verr. Num.",scrollLock:"Arrêt défil.",semiColon:"Point-virgule",equalSign:"Signe égal",
+comma:"Virgule",dash:"Tiret",period:"Point",forwardSlash:"Barre oblique",graveAccent:"Accent grave",openBracket:"Parenthèse ouvrante",backSlash:"Barre oblique inverse",closeBracket:"Parenthèse fermante",singleQuote:"Apostrophe"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
index 6a7c80837de..43dc741d6ca 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
@@ -1,12 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","gl",{title:"Instrucións de accesibilidade",contents:"Axuda. Para pechar este diálogo prema ESC.",legend:[{name:"Xeral",items:[{name:"Barra de ferramentas do editor",legend:"Prema ${toolbarFocus} para navegar pola barra de ferramentas. Para moverse polos distintos grupos de ferramentas use as teclas TAB e MAIÚS+TAB. Para moverse polas distintas ferramentas use FRECHA DEREITA ou FRECHA ESQUERDA. Prema ESPAZO ou INTRO para activar o botón da barra de ferramentas."},
 {name:"Editor de diálogo",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor do menú contextual",legend:"Prema ${contextMenu} ou a TECLA MENÚ para abrir o menú contextual. A seguir móvase á seguinte opción do menú con TAB ou FRECHA ABAIXO. Móvase á opción anterior con MAIÚS + TAB ou FRECHA ARRIBA. Prema ESPAZO ou INTRO para seleccionar a opción do menú. Abra o submenú da opción actual con ESPAZO ou INTRO ou FRECHA DEREITA. Regrese ao elemento principal do menú con ESC ou FRECHA ESQUERDA. Peche o menú contextual con ESC."},
 {name:"Lista do editor",legend:"Dentro dunha lista, móvase ao seguinte elemento da lista con TAB ou FRECHA ABAIXO. Móvase ao elemento anterior da lista con MAIÚS+TAB ou FRECHA ARRIBA. Prema ESPAZO ou INTRO para escoller a opción da lista. Prema ESC para pechar a lista."},{name:"Barra da ruta ao elemento no editor",legend:"Prema ${elementsPathFocus} para navegar ata os elementos da barra de ruta. Móvase ao seguinte elemento botón con TAB ou FRECHA DEREITA. Móvase ao botón anterior con MAIÚS+TAB ou FRECHA ESQUERDA. Prema ESPAZO ou INTRO para seleccionar o elemento no editor."}]},
 {name:"Ordes",items:[{name:"Orde «desfacer»",legend:"Prema ${undo}"},{name:"Orde «refacer»",legend:"Prema ${redo}"},{name:"Orde «negra»",legend:"Prema ${bold}"},{name:"Orde «cursiva»",legend:"Prema ${italic}"},{name:"Orde «subliñar»",legend:"Prema ${underline}"},{name:"Orde «ligazón»",legend:"Prema ${link}"},{name:"Orde «contraer a barra de ferramentas»",legend:"Prema ${toolbarCollapse}"},{name:"Orde «acceder ao anterior espazo en foco»",legend:"Prema ${accessPreviousSpace} para acceder ao espazo máis próximo de foco inalcanzábel anterior ao cursor, por exemplo: dous elementos HR adxacentes. Repita a combinación de teclas para chegar a espazos de foco distantes."},
-{name:"Orde «acceder ao seguinte espazo en foco»",legend:"Prema ${accessNextSpace} para acceder ao espazo máis próximo de foco inalcanzábel posterior ao cursor, por exemplo: dous elementos HR adxacentes. Repita a combinación de teclas para chegar a espazos de foco distantes."},{name:"Axuda da accesibilidade",legend:"Prema ${a11yHelp}"}]}],backspace:"Ir atrás",tab:"Tabulador",enter:"Intro",shift:"Maiús",ctrl:"Ctrl",alt:"Alt",pause:"Pausa",capslock:"Bloq. Maiús",escape:"Escape",pageUp:"Páxina arriba",
-pageDown:"Páxina abaixo",end:"Fin",home:"Inicio",leftArrow:"Frecha esquerda",upArrow:"Frecha arriba",rightArrow:"Frecha dereita",downArrow:"Frecha abaixo",insert:"Inserir","delete":"Supr",leftWindowKey:"Tecla Windows esquerda",rightWindowKey:"Tecla Windows dereita",selectKey:"Escolla a tecla",numpad0:"Tec. numérico 0",numpad1:"Tec. numérico 1",numpad2:"Tec. numérico 2",numpad3:"Tec. numérico 3",numpad4:"Tec. numérico 4",numpad5:"Tec. numérico 5",numpad6:"Tec. numérico 6",numpad7:"Tec. numérico 7",
-numpad8:"Tec. numérico 8",numpad9:"Tec. numérico 9",multiply:"Multiplicar",add:"Sumar",subtract:"Restar",decimalPoint:"Punto decimal",divide:"Dividir",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Bloq. num.",scrollLock:"Bloq. despraz.",semiColon:"Punto e coma",equalSign:"Signo igual",comma:"Coma",dash:"Guión",period:"Punto",forwardSlash:"Barra inclinada",graveAccent:"Acento grave",openBracket:"Abrir corchete",backSlash:"Barra invertida",
-closeBracket:"Pechar corchete",singleQuote:"Comiña simple"});
\ No newline at end of file
+{name:"Orde «acceder ao seguinte espazo en foco»",legend:"Prema ${accessNextSpace} para acceder ao espazo máis próximo de foco inalcanzábel posterior ao cursor, por exemplo: dous elementos HR adxacentes. Repita a combinación de teclas para chegar a espazos de foco distantes."},{name:"Axuda da accesibilidade",legend:"Prema ${a11yHelp}"}]}],tab:"Tabulador",pause:"Pausa",capslock:"Bloq. Maiús",escape:"Escape",pageUp:"Páxina arriba",pageDown:"Páxina abaixo",leftArrow:"Frecha esquerda",upArrow:"Frecha arriba",
+rightArrow:"Frecha dereita",downArrow:"Frecha abaixo",insert:"Inserir",leftWindowKey:"Tecla Windows esquerda",rightWindowKey:"Tecla Windows dereita",selectKey:"Escolla a tecla",numpad0:"Tec. numérico 0",numpad1:"Tec. numérico 1",numpad2:"Tec. numérico 2",numpad3:"Tec. numérico 3",numpad4:"Tec. numérico 4",numpad5:"Tec. numérico 5",numpad6:"Tec. numérico 6",numpad7:"Tec. numérico 7",numpad8:"Tec. numérico 8",numpad9:"Tec. numérico 9",multiply:"Multiplicar",add:"Sumar",subtract:"Restar",decimalPoint:"Punto decimal",
+divide:"Dividir",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Bloq. num.",scrollLock:"Bloq. despraz.",semiColon:"Punto e coma",equalSign:"Signo igual",comma:"Coma",dash:"Guión",period:"Punto",forwardSlash:"Barra inclinada",graveAccent:"Acento grave",openBracket:"Abrir corchete",backSlash:"Barra invertida",closeBracket:"Pechar corchete",singleQuote:"Comiña simple"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
index 54e2ec285f5..f6e83f36ad8 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","gu",{title:"એક્ક્ષેબિલિટી ની વિગતો",contents:"હેલ્પ. આ બંધ કરવા ESC દબાવો.",legend:[{name:"જનરલ",items:[{name:"એડિટર ટૂલબાર",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"એડિટર ડાયલોગ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"કમાંડસ",items:[{name:"અન્ડું કમાંડ",legend:"$ દબાવો {undo}"},{name:"ફરી કરો કમાંડ",legend:"$ દબાવો {redo}"},{name:"બોલ્દનો કમાંડ",legend:"$ દબાવો {bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
index bd63abe2f1d..9c86b8c08a5 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","he",{title:"הוראות נגישות",contents:"הוראות נגישות. לסגירה לחץ אסקייפ (ESC).",legend:[{name:"כללי",items:[{name:"סרגל הכלים",legend:"לחץ על ${toolbarFocus} כדי לנווט לסרגל הכלים. עבור לכפתור הבא עם מקש הטאב (TAB) או חץ שמאלי. עבור לכפתור הקודם עם מקש השיפט (SHIFT) + טאב (TAB) או חץ ימני. לחץ רווח או אנטר (ENTER) כדי להפעיל את הכפתור הנבחר."},{name:"דיאלוגים (חלונות תשאול)",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"תפריט ההקשר (Context Menu)",legend:"לחץ ${contextMenu} או APPLICATION KEYכדי לפתוח את תפריט ההקשר. עבור לאפשרות הבאה עם טאב (TAB) או חץ למטה. עבור לאפשרות הקודמת עם שיפט (SHIFT) + טאב (TAB) או חץ למעלה. לחץ רווח או אנטר (ENTER) כדי לבחור את האפשרות. פתח את תת התפריט (Sub-menu) של האפשרות הנוכחית עם רווח או אנטר (ENTER) או חץ שמאלי. חזור לתפריט האב עם אסקייפ (ESC) או חץ שמאלי. סגור את תפריט ההקשר עם אסקייפ (ESC)."},{name:"תפריטים צפים (List boxes)",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"עץ אלמנטים (Elements Path)",legend:"לחץ ${elementsPathFocus} כדי לנווט לעץ האלמנטים. עבור לפריט הבא עם טאב (TAB) או חץ ימני. עבור לפריט הקודם עם שיפט (SHIFT) + טאב (TAB) או חץ שמאלי. לחץ רווח או אנטר (ENTER) כדי לבחור את האלמנט בעורך."}]},{name:"פקודות",items:[{name:" ביטול צעד אחרון",legend:"לחץ ${undo}"},{name:" חזרה על צעד אחרון",legend:"לחץ ${redo}"},{name:" הדגשה",legend:"לחץ ${bold}"},{name:" הטייה",legend:"לחץ ${italic}"},{name:" הוספת קו תחתון",legend:"לחץ ${underline}"},{name:" הוספת לינק",
 legend:"לחץ ${link}"},{name:" כיווץ סרגל הכלים",legend:"לחץ ${toolbarCollapse}"},{name:"גישה למיקום המיקוד הקודם",legend:"לחץ ${accessPreviousSpace} כדי לגשת למיקום המיקוד הלא-נגיש הקרוב לפני הסמן, למשל בין שני אלמנטים סמוכים מסוג HR. חזור על צירוף מקשים זה כדי להגיע למקומות מיקוד רחוקים יותר."},{name:"גישה למיקום המיקוד הבא",legend:"לחץ ${accessNextSpace} כדי לגשת למיקום המיקוד הלא-נגיש הקרוב אחרי הסמן, למשל בין שני אלמנטים סמוכים מסוג HR. חזור על צירוף מקשים זה כדי להגיע למקומות מיקוד רחוקים יותר."},
-{name:" הוראות נגישות",legend:"לחץ ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"חץ שמאלה",upArrow:"חץ למעלה",rightArrow:"חץ ימינה",downArrow:"חץ למטה",insert:"הכנס","delete":"מחק",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"בחר מקש",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",
-numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"הוסף",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"סלאש",graveAccent:"Grave Accent",
-openBracket:"Open Bracket",backSlash:"סלאש הפוך",closeBracket:"Close Bracket",singleQuote:"ציטוט יחיד"});
\ No newline at end of file
+{name:" הוראות נגישות",legend:"לחץ ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"חץ שמאלה",upArrow:"חץ למעלה",rightArrow:"חץ ימינה",downArrow:"חץ למטה",insert:"הכנס",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"בחר מקש",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",
+numpad9:"Numpad 9",multiply:"Multiply",add:"הוסף",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"סלאש",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"סלאש הפוך",closeBracket:"Close Bracket",singleQuote:"ציטוט יחיד"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
index 9f0d6bea57f..5443d24b6a5 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","hi",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"सामान्य",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
index 92ba672023a..7434d616c23 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","hr",{title:"Upute dostupnosti",contents:"Sadržaj pomoći. Za zatvaranje pritisnite ESC.",legend:[{name:"Općenito",items:[{name:"Alatna traka",legend:"Pritisni ${toolbarFocus} za navigaciju do alatne trake. Pomicanje do prethodne ili sljedeće alatne grupe vrši se pomoću SHIFT+TAB i TAB. Pomicanje do prethodnog ili sljedećeg gumba u alatnoj traci vrši se pomoću lijeve i desne strelice kursora. Pritisnite SPACE ili ENTER za aktivaciju alatne trake."},{name:"Dijalog",
 legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Kontekstni izbornik",legend:"Pritisnite ${contextMenu} ili APPLICATION tipku za otvaranje kontekstnog izbornika. Pomicanje se vrši TAB ili strelicom kursora prema dolje ili SHIFT+TAB ili strelica kursora prema gore. SPACE ili ENTER odabiru opciju izbornika. Otvorite podizbornik trenutne opcije sa  SPACE, ENTER ili desna strelica kursora. Povratak na prethodni izbornik vrši se sa ESC ili lijevom strelicom kursora. Zatvaranje se vrši pritiskom na tipku ESC."},
 {name:"Lista",legend:"Unutar list-boxa, pomicanje na sljedeću stavku vrši se sa TAB ili strelica kursora prema dolje. Na prethodnu sa SHIFT+TAB ili strelica prema gore. Pritiskom na SPACE ili ENTER odabire se stavka ili ESC za zatvaranje."},{name:"Traka putanje elemenata",legend:"Pritisnite ${elementsPathFocus} za navigaciju po putanji elemenata. Pritisnite TAB ili desnu strelicu kursora za pomicanje na sljedeći element ili SHIFT+TAB ili lijeva strelica kursora za pomicanje na prethodni element. Pritiskom na SPACE ili ENTER vrši se odabir elementa."}]},
 {name:"Naredbe",items:[{name:"Vrati naredbu",legend:"Pritisni ${undo}"},{name:"Ponovi naredbu",legend:"Pritisni ${redo}"},{name:"Bold naredba",legend:"Pritisni ${bold}"},{name:"Italic naredba",legend:"Pritisni ${italic}"},{name:"Underline naredba",legend:"Pritisni ${underline}"},{name:"Link naredba",legend:"Pritisni ${link}"},{name:"Smanji alatnu traku naredba",legend:"Pritisni ${toolbarCollapse}"},{name:"Access previous focus space naredba",legend:"Pritisni ${accessPreviousSpace} za pristup najbližem nedostupnom razmaku prije kursora, npr.: dva spojena HR elementa. Ponovnim pritiskom dohvatiti će se sljedeći nedostupni razmak."},
-{name:"Access next focus space naredba",legend:"Pritisni ${accessNextSpace} za pristup najbližem nedostupnom razmaku nakon kursora, npr.: dva spojena HR elementa. Ponovnim pritiskom dohvatiti će se sljedeći nedostupni razmak."},{name:"Pomoć za dostupnost",legend:"Pritisni ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",
-upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",
-f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Access next focus space naredba",legend:"Pritisni ${accessNextSpace} za pristup najbližem nedostupnom razmaku nakon kursora, npr.: dva spojena HR elementa. Ponovnim pritiskom dohvatiti će se sljedeći nedostupni razmak."},{name:"Pomoć za dostupnost",legend:"Pritisni ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",
+rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",
+equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
index 81c48da1964..b547453aef5 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
@@ -1,12 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","hu",{title:"Kisegítő utasítások",contents:"Súgó tartalmak. A párbeszédablak bezárásához nyomjon ESC-et.",legend:[{name:"Általános",items:[{name:"Szerkesztő Eszköztár",legend:"Nyomjon ${toolbarFocus} hogy kijelölje az eszköztárat. A következő és előző eszköztár csoporthoz a TAB és SHIFT+TAB-al juthat el. A következő és előző eszköztár gombhoz a BAL NYÍL vagy JOBB NYÍL gombbal juthat el. Nyomjon SPACE-t vagy ENTER-t hogy aktiválja az eszköztár gombot."},{name:"Szerkesző párbeszéd ablak",
 legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Szerkesztő helyi menü",legend:"Nyomjon ${contextMenu}-t vagy ALKALMAZÁS BILLENTYŰT a helyi menü megnyitásához. Ezután a következő menüpontra léphet a TAB vagy LEFELÉ NYÍLLAL. Az előző opciót a SHIFT+TAB vagy FELFELÉ NYÍLLAL érheti el. Nyomjon SPACE-t vagy ENTER-t a menüpont kiválasztásához. A jelenlegi menüpont almenüjének megnyitásához nyomjon SPACE-t vagy ENTER-t, vagy JOBB NYILAT. A főmenühöz való visszatéréshez nyomjon ESC-et vagy BAL NYILAT. A helyi menü bezárása az ESC billentyűvel lehetséges."},
 {name:"Szerkesztő lista",legend:"A listán belül a következő elemre a TAB vagy LEFELÉ NYÍLLAL mozoghat. Az előző elem kiválasztásához nyomjon SHIFT+TAB-ot vagy FELFELÉ NYILAT. Nyomjon SPACE-t vagy ENTER-t az elem kiválasztásához. Az ESC billentyű megnyomásával bezárhatja a listát."},{name:"Szerkesztő elem utak sáv",legend:"Nyomj ${elementsPathFocus} hogy kijelöld a elemek út sávját. A következő elem gombhoz a TAB-al vagy a JOBB NYÍLLAL juthatsz el. Az előző gombhoz a SHIFT+TAB vagy BAL NYÍLLAL mehetsz. A SPACE vagy ENTER billentyűvel kiválaszthatod az elemet a szerkesztőben."}]},
 {name:"Parancsok",items:[{name:"Parancs visszavonása",legend:"Nyomj ${undo}"},{name:"Parancs megismétlése",legend:"Nyomjon ${redo}"},{name:"Félkövér parancs",legend:"Nyomjon ${bold}"},{name:"Dőlt parancs",legend:"Nyomjon ${italic}"},{name:"Aláhúzott parancs",legend:"Nyomjon ${underline}"},{name:"Link parancs",legend:"Nyomjon ${link}"},{name:"Szerkesztősáv összecsukása parancs",legend:"Nyomjon ${toolbarCollapse}"},{name:"Hozzáférés az előző fókusz helyhez parancs",legend:"Nyomj ${accessNextSpace} hogy hozzáférj a legközelebbi elérhetetlen fókusz helyhez a hiányjel előtt, például: két szomszédos HR elemhez. Ismételd meg a billentyűkombinációt hogy megtaláld a távolabbi fókusz helyeket."},
-{name:"Hozzáférés a következő fókusz helyhez parancs",legend:"Nyomj ${accessNextSpace} hogy hozzáférj a legközelebbi elérhetetlen fókusz helyhez a hiányjel után, például: két szomszédos HR elemhez. Ismételd meg a billentyűkombinációt hogy megtaláld a távolabbi fókusz helyeket."},{name:"Kisegítő súgó",legend:"Nyomjon ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
-end:"End",home:"Home",leftArrow:"balra nyíl",upArrow:"felfelé nyíl",rightArrow:"jobbra nyíl",downArrow:"lefelé nyíl",insert:"Insert","delete":"Delete",leftWindowKey:"bal Windows-billentyű",rightWindowKey:"jobb Windows-billentyű",selectKey:"Billentyű választása",numpad0:"Számbillentyűk 0",numpad1:"Számbillentyűk 1",numpad2:"Számbillentyűk 2",numpad3:"Számbillentyűk 3",numpad4:"Számbillentyűk 4",numpad5:"Számbillentyűk 5",numpad6:"Számbillentyűk 6",numpad7:"Számbillentyűk 7",numpad8:"Számbillentyűk 8",
-numpad9:"Számbillentyűk 9",multiply:"Szorzás",add:"Hozzáadás",subtract:"Kivonás",decimalPoint:"Tizedespont",divide:"Osztás",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Pontosvessző",equalSign:"Egyenlőségjel",comma:"Vessző",dash:"Kötőjel",period:"Pont",forwardSlash:"Perjel",graveAccent:"Visszafelé dőlő ékezet",openBracket:"Nyitó szögletes zárójel",backSlash:"fordított perjel",closeBracket:"Záró szögletes zárójel",
-singleQuote:"szimpla idézőjel"});
\ No newline at end of file
+{name:"Hozzáférés a következő fókusz helyhez parancs",legend:"Nyomj ${accessNextSpace} hogy hozzáférj a legközelebbi elérhetetlen fókusz helyhez a hiányjel után, például: két szomszédos HR elemhez. Ismételd meg a billentyűkombinációt hogy megtaláld a távolabbi fókusz helyeket."},{name:"Kisegítő súgó",legend:"Nyomjon ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"balra nyíl",upArrow:"felfelé nyíl",rightArrow:"jobbra nyíl",
+downArrow:"lefelé nyíl",insert:"Insert",leftWindowKey:"bal Windows-billentyű",rightWindowKey:"jobb Windows-billentyű",selectKey:"Billentyű választása",numpad0:"Számbillentyűk 0",numpad1:"Számbillentyűk 1",numpad2:"Számbillentyűk 2",numpad3:"Számbillentyűk 3",numpad4:"Számbillentyűk 4",numpad5:"Számbillentyűk 5",numpad6:"Számbillentyűk 6",numpad7:"Számbillentyűk 7",numpad8:"Számbillentyűk 8",numpad9:"Számbillentyűk 9",multiply:"Szorzás",add:"Hozzáadás",subtract:"Kivonás",decimalPoint:"Tizedespont",
+divide:"Osztás",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Pontosvessző",equalSign:"Egyenlőségjel",comma:"Vessző",dash:"Kötőjel",period:"Pont",forwardSlash:"Perjel",graveAccent:"Visszafelé dőlő ékezet",openBracket:"Nyitó szögletes zárójel",backSlash:"fordított perjel",closeBracket:"Záró szögletes zárójel",singleQuote:"szimpla idézőjel"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
index c8d5686bac1..8177096a482 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.plugins.setLang("a11yhelp","id",{title:"Accessibility Instructions",contents:"Bantuan. Tekan ESC untuk menutup dialog ini.",legend:[{name:"Umum",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
-{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
-{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
-legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","id",{title:"Instruksi Accessibility",contents:"Bantuan. Tekan ESC untuk menutup dialog ini.",legend:[{name:"Umum",items:[{name:"Toolbar Editor",legend:"Tekan ${toolbarFocus} untuk berpindah ke toolbar. Untuk berpindah ke group toolbar selanjutnya dan sebelumnya gunakan TAB dan SHIFT+TAB. Untuk berpindah ke tombol toolbar selanjutnya dan sebelumnya gunakan RIGHT ARROW atau LEFT ARROW. Tekan SPASI atau ENTER untuk mengaktifkan tombol toolbar."},{name:"Dialog Editor",
+legend:"Pada jendela dialog, tekan TAB untuk berpindah pada elemen dialog selanjutnya, tekan SHIFT+TAB untuk berpindah pada elemen dialog sebelumnya, tekan ENTER untuk submit dialog, tekan ESC untuk membatalkan dialog. Pada dialog dengan multi tab, daftar tab dapat diakses dengan ALT+F10 ataupun dengan tombol TAB sesuai urutan tab pada dialog. Jika daftar tab aktif terpilih, untuk berpindah tab dapat menggunakan RIGHT dan LEFT ARROW."},{name:"Context Menu Editor",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+{name:"List Box Editor",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
+{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",
+rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",
+equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
index 5151f605d36..882487438e0 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","it",{title:"Istruzioni di Accessibilità",contents:"Contenuti di Aiuto. Per chiudere questa finestra premi ESC.",legend:[{name:"Generale",items:[{name:"Barra degli strumenti Editor",legend:"Premere ${toolbarFocus} per passare alla barra degli strumenti. Usare TAB per spostarsi al gruppo successivo, MAIUSC+TAB per spostarsi a quello precedente. Usare FRECCIA DESTRA per spostarsi al pulsante successivo, FRECCIA SINISTRA per spostarsi a quello precedente. Premere SPAZIO o INVIO per attivare il pulsante della barra degli strumenti."},
@@ -7,7 +7,7 @@ CKEDITOR.plugins.setLang("a11yhelp","it",{title:"Istruzioni di Accessibilità",c
 {name:"Menù contestuale Editor",legend:"Premi ${contextMenu} o TASTO APPLICAZIONE per aprire il menu contestuale. Dunque muoviti all'opzione successiva del menu con il tasto TAB o con la Freccia Sotto. Muoviti all'opzione precedente con  MAIUSC+TAB o con Freccia Sopra. Premi SPAZIO o INVIO per scegliere l'opzione di menu. Apri il sottomenu dell'opzione corrente con SPAZIO o INVIO oppure con la Freccia Destra. Torna indietro al menu superiore con ESC oppure Freccia Sinistra. Chiudi il menu contestuale con ESC."},
 {name:"Box Lista Editor",legend:"All'interno di un elenco di opzioni, per spostarsi all'elemento successivo premere TAB oppure FRECCIA GIÙ. Per spostarsi all'elemento precedente usare SHIFT+TAB oppure FRECCIA SU. Premere SPAZIO o INVIO per selezionare l'elemento della lista. Premere ESC per chiudere l'elenco di opzioni."},{name:"Barra percorso elementi editor",legend:"Premere ${elementsPathFocus} per passare agli elementi della barra del percorso. Usare TAB o FRECCIA DESTRA per passare al pulsante successivo. Per passare al pulsante precedente premere MAIUSC+TAB o FRECCIA SINISTRA. Premere SPAZIO o INVIO per selezionare l'elemento nell'editor."}]},
 {name:"Comandi",items:[{name:" Annulla comando",legend:"Premi ${undo}"},{name:" Ripeti comando",legend:"Premi ${redo}"},{name:" Comando Grassetto",legend:"Premi ${bold}"},{name:" Comando Corsivo",legend:"Premi ${italic}"},{name:" Comando Sottolineato",legend:"Premi ${underline}"},{name:" Comando Link",legend:"Premi ${link}"},{name:" Comando riduci barra degli strumenti",legend:"Premi ${toolbarCollapse}"},{name:"Comando di accesso al precedente spazio di focus",legend:"Premi ${accessPreviousSpace} per accedere il più vicino spazio di focus non raggiungibile prima del simbolo caret, per esempio due elementi HR adiacenti. Ripeti la combinazione di tasti per raggiungere spazi di focus distanti."},
-{name:"Comando di accesso al prossimo spazio di focus",legend:"Premi ${accessNextSpace} per accedere il più vicino spazio di focus non raggiungibile dopo il simbolo caret, per esempio due elementi HR adiacenti. Ripeti la combinazione di tasti per raggiungere spazi di focus distanti."},{name:" Aiuto Accessibilità",legend:"Premi ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Invio",shift:"Maiusc",ctrl:"Ctrl",alt:"Alt",pause:"Pausa",capslock:"Bloc Maiusc",escape:"Esc",pageUp:"Pagina sù",pageDown:"Pagina giù",
-end:"Fine",home:"Inizio",leftArrow:"Freccia sinistra",upArrow:"Freccia su",rightArrow:"Freccia destra",downArrow:"Freccia giù",insert:"Ins","delete":"Canc",leftWindowKey:"Tasto di Windows sinistro",rightWindowKey:"Tasto di Windows destro",selectKey:"Tasto di selezione",numpad0:"0 sul tastierino numerico",numpad1:"1 sul tastierino numerico",numpad2:"2 sul tastierino numerico",numpad3:"3 sul tastierino numerico",numpad4:"4 sul tastierino numerico",numpad5:"5 sul tastierino numerico",numpad6:"6 sul tastierino numerico",
-numpad7:"7 sul tastierino numerico",numpad8:"8 sul tastierino numerico",numpad9:"9 sul tastierino numerico",multiply:"Moltiplicazione",add:"Più",subtract:"Sottrazione",decimalPoint:"Punto decimale",divide:"Divisione",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Bloc Num",scrollLock:"Bloc Scorr",semiColon:"Punto-e-virgola",equalSign:"Segno di uguale",comma:"Virgola",dash:"Trattino",period:"Punto",forwardSlash:"Barra",graveAccent:"Accento grave",
-openBracket:"Parentesi quadra aperta",backSlash:"Barra rovesciata",closeBracket:"Parentesi quadra chiusa",singleQuote:"Apostrofo"});
\ No newline at end of file
+{name:"Comando di accesso al prossimo spazio di focus",legend:"Premi ${accessNextSpace} per accedere il più vicino spazio di focus non raggiungibile dopo il simbolo caret, per esempio due elementi HR adiacenti. Ripeti la combinazione di tasti per raggiungere spazi di focus distanti."},{name:" Aiuto Accessibilità",legend:"Premi ${a11yHelp}"}]}],tab:"Tab",pause:"Pausa",capslock:"Bloc Maiusc",escape:"Esc",pageUp:"Pagina sù",pageDown:"Pagina giù",leftArrow:"Freccia sinistra",upArrow:"Freccia su",rightArrow:"Freccia destra",
+downArrow:"Freccia giù",insert:"Ins",leftWindowKey:"Tasto di Windows sinistro",rightWindowKey:"Tasto di Windows destro",selectKey:"Tasto di selezione",numpad0:"0 sul tastierino numerico",numpad1:"1 sul tastierino numerico",numpad2:"2 sul tastierino numerico",numpad3:"3 sul tastierino numerico",numpad4:"4 sul tastierino numerico",numpad5:"5 sul tastierino numerico",numpad6:"6 sul tastierino numerico",numpad7:"7 sul tastierino numerico",numpad8:"8 sul tastierino numerico",numpad9:"9 sul tastierino numerico",
+multiply:"Moltiplicazione",add:"Più",subtract:"Sottrazione",decimalPoint:"Punto decimale",divide:"Divisione",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Bloc Num",scrollLock:"Bloc Scorr",semiColon:"Punto-e-virgola",equalSign:"Segno di uguale",comma:"Virgola",dash:"Trattino",period:"Punto",forwardSlash:"Barra",graveAccent:"Accento grave",openBracket:"Parentesi quadra aperta",backSlash:"Barra rovesciata",closeBracket:"Parentesi quadra chiusa",
+singleQuote:"Apostrofo"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
index ec5ed673cd1..abcca247f7a 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
@@ -1,9 +1,9 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ja",{title:"ユーザー補助の説明",contents:"ヘルプ　このダイアログを閉じるには ESCを押してください。",legend:[{name:"全般",items:[{name:"エディターツールバー",legend:"${toolbarFocus} を押すとツールバーのオン/オフ操作ができます。カーソルをツールバーのグループで移動させるにはTabかSHIFT+Tabを押します。グループ内でカーソルを移動させるには、右カーソルか左カーソルを押します。スペースキーやエンターを押すとボタンを有効/無効にすることができます。"},{name:"編集ダイアログ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"エディターのメニュー",legend:"${contextMenu} キーかAPPLICATION KEYを押すとコンテキストメニューが開きます。Tabか下カーソルでメニューのオプション選択が下に移動します。戻るには、SHIFT+Tabか上カーソルです。スペースもしくはENTERキーでメニューオプションを決定できます。現在選んでいるオプションのサブメニューを開くには、スペース、もしくは右カーソルを押します。サブメニューから親メニューに戻るには、ESCか左カーソルを押してください。ESCでコンテキストメニュー自体をキャンセルできます。"},{name:"エディターリストボックス",legend:"リストボックス内で移動するには、Tabか下カーソルで次のアイテムへ移動します。SHIFT+Tabで前のアイテムに戻ります。リストのオプションを選択するには、スペースもしくは、ENTERを押してください。リストボックスを閉じるには、ESCを押してください。"},{name:"エディター要素パスバー",legend:"${elementsPathFocus} を押すとエレメントパスバーを操作出来ます。Tabか右カーソルで次のエレメントを選択できます。前のエレメントを選択するには、SHIFT+Tabか左カーソルです。スペースもしくは、ENTERでエディタ内の対象エレメントを選択出来ます。"}]},
 {name:"コマンド",items:[{name:"元に戻す",legend:"${undo} をクリック"},{name:"やり直し",legend:"${redo} をクリック"},{name:"太字",legend:"${bold} をクリック"},{name:"斜体 ",legend:"${italic} をクリック"},{name:"下線",legend:"${underline} をクリック"},{name:"リンク",legend:"${link} をクリック"},{name:"ツールバーを縮める",legend:"${toolbarCollapse} をクリック"},{name:"前のカーソル移動のできないポイントへ",legend:"${accessPreviousSpace} を押すとカーソルより前にあるカーソルキーで入り込めないスペースへ移動できます。例えば、HRエレメントが2つ接している場合などです。離れた場所へは、複数回キーを押します。"},{name:"次のカーソル移動のできないポイントへ",legend:"${accessNextSpace} を押すとカーソルより後ろにあるカーソルキーで入り込めないスペースへ移動できます。例えば、HRエレメントが2つ接している場合などです。離れた場所へは、複数回キーを押します。"},
-{name:"ユーザー補助ヘルプ",legend:"${a11yHelp} をクリック"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"左矢印",upArrow:"上矢印",rightArrow:"右矢印",downArrow:"下矢印",insert:"Insert","delete":"Delete",leftWindowKey:"左Windowキー",rightWindowKey:"右のWindowキー",selectKey:"Select",numpad0:"Num 0",numpad1:"Num 1",numpad2:"Num 2",numpad3:"Num 3",numpad4:"Num 4",numpad5:"Num 5",
-numpad6:"Num 6",numpad7:"Num 7",numpad8:"Num 8",numpad9:"Num 9",multiply:"掛ける",add:"足す",subtract:"引く",decimalPoint:"小数点",divide:"割る",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"セミコロン",equalSign:"イコール記号",comma:"カンマ",dash:"ダッシュ",period:"ピリオド",forwardSlash:"フォワードスラッシュ",graveAccent:"グレイヴアクセント",openBracket:"開きカッコ",backSlash:"バックスラッシュ",closeBracket:"閉じカッコ",singleQuote:"シングルクォート"});
\ No newline at end of file
+{name:"ユーザー補助ヘルプ",legend:"${a11yHelp} をクリック"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"左矢印",upArrow:"上矢印",rightArrow:"右矢印",downArrow:"下矢印",insert:"Insert",leftWindowKey:"左Windowキー",rightWindowKey:"右のWindowキー",selectKey:"Select",numpad0:"Num 0",numpad1:"Num 1",numpad2:"Num 2",numpad3:"Num 3",numpad4:"Num 4",numpad5:"Num 5",numpad6:"Num 6",numpad7:"Num 7",numpad8:"Num 8",numpad9:"Num 9",multiply:"掛ける",add:"足す",subtract:"引く",decimalPoint:"小数点",
+divide:"割る",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"セミコロン",equalSign:"イコール記号",comma:"カンマ",dash:"ダッシュ",period:"ピリオド",forwardSlash:"フォワードスラッシュ",graveAccent:"グレイヴアクセント",openBracket:"開きカッコ",backSlash:"バックスラッシュ",closeBracket:"閉じカッコ",singleQuote:"シングルクォート"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
index 6b6e7a928bc..20355121528 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","km",{title:"Accessibility Instructions",contents:"មាតិកា​ជំនួយ។ ដើម្បី​បិទ​ផ្ទាំង​នេះ សូម​ចុច ESC ។",legend:[{name:"ទូទៅ",items:[{name:"របារ​ឧបករណ៍​កម្មវិធី​និពន្ធ",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"ផ្ទាំង​កម្មវិធីនិពន្ធ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"ម៉ីនុយបរិបទអ្នកកែសម្រួល",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"ប្រអប់បញ្ជីអ្នកកែសម្រួល",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"ពាក្យបញ្ជា",items:[{name:"ការ​បញ្ជា​មិនធ្វើវិញ",legend:"ចុច ${undo}"},{name:"ការបញ្ជា​ធ្វើវិញ",legend:"ចុច ${redo}"},{name:"ការបញ្ជា​អក្សរ​ដិត",legend:"ចុច ${bold}"},{name:"ការបញ្ជា​អក្សរ​ទ្រេត",legend:"ចុច ${italic}"},{name:"ពាក្យបញ្ជា​បន្ទាត់​ពីក្រោម",
 legend:"ចុច ${underline}"},{name:"ពាក្យបញ្ជា​តំណ",legend:"ចុច ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:"ជំនួយ​ពី​ភាព​ងាយស្រួល",legend:"ជួយ ${a11yHelp}"}]}],backspace:"លុបថយក្រោយ",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"ផ្អាក",capslock:"Caps Lock",escape:"ចាកចេញ",pageUp:"ទំព័រ​លើ",pageDown:"ទំព័រ​ក្រោម",end:"ចុង",home:"ផ្ទះ",leftArrow:"ព្រួញ​ឆ្វេង",upArrow:"ព្រួញ​លើ",rightArrow:"ព្រួញ​ស្ដាំ",downArrow:"ព្រួញ​ក្រោម",insert:"បញ្ចូល","delete":"លុប",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"ជ្រើស​គ្រាប់​ចុច",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"គុណ",add:"បន្ថែម",subtract:"ដក",decimalPoint:"ចំណុចទសភាគ",divide:"ចែក",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"បិទ​រំកិល",semiColon:"ចុច​ក្បៀស",equalSign:"សញ្ញា​អឺរ៉ូ",comma:"ក្បៀស",dash:"Dash",period:"ចុច",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",
-openBracket:"តង្កៀប​បើក",backSlash:"Backslash",closeBracket:"តង្កៀប​បិទ",singleQuote:"បន្តក់​មួយ"});
\ No newline at end of file
+{name:"ជំនួយ​ពី​ភាព​ងាយស្រួល",legend:"ជួយ ${a11yHelp}"}]}],tab:"Tab",pause:"ផ្អាក",capslock:"Caps Lock",escape:"ចាកចេញ",pageUp:"ទំព័រ​លើ",pageDown:"ទំព័រ​ក្រោម",leftArrow:"ព្រួញ​ឆ្វេង",upArrow:"ព្រួញ​លើ",rightArrow:"ព្រួញ​ស្ដាំ",downArrow:"ព្រួញ​ក្រោម",insert:"បញ្ចូល",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"ជ្រើស​គ្រាប់​ចុច",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"គុណ",add:"បន្ថែម",subtract:"ដក",decimalPoint:"ចំណុចទសភាគ",divide:"ចែក",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"បិទ​រំកិល",semiColon:"ចុច​ក្បៀស",equalSign:"សញ្ញា​អឺរ៉ូ",comma:"ក្បៀស",dash:"Dash",period:"ចុច",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"តង្កៀប​បើក",backSlash:"Backslash",closeBracket:"តង្កៀប​បិទ",singleQuote:"បន្តក់​មួយ"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
index 9b2b0703189..f493dc14147 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ko",{title:"접근성 설명",contents:"도움말. 이 창을 닫으시려면 ESC 를 누르세요.",legend:[{name:"일반",items:[{name:"편집기 툴바",legend:"툴바를 탐색하시려면 ${toolbarFocus} 를 투르세요. 이전/다음 툴바 그룹으로 이동하시려면 TAB 키 또는 SHIFT+TAB 키를 누르세요. 이전/다음 툴바 버튼으로 이동하시려면 오른쪽 화살표 키 또는 왼쪽 화살표 키를 누르세요. 툴바 버튼을 활성화 하려면 SPACE 키 또는 ENTER 키를 누르세요."},{name:"편집기 다이얼로그",legend:"TAB 키를 누르면 다음 대화상자로 이동하고, SHIFT+TAB 키를 누르면 이전 대화상자로 이동합니다. 대화상자를 제출하려면 ENTER 키를 누르고, ESC 키를 누르면 대화상자를 취소합니다. 대화상자에 탭이 여러개 있을 때, ALT+F10 키 또는 TAB 키를 누르면 순서에 따라 탭 목록에 도달할 수 있습니다. 탭 목록에 초점이 맞을 때, 오른쪽과 왼쪽 화살표 키를 이용하면 각각 다음과 이전 탭으로 이동할 수 있습니다."},
 {name:"편집기 환경 메뉴",legend:"${contextMenu} 또는 어플리케이션 키를 누르면 환경-메뉴를 열 수 있습니다. 환경-메뉴에서 TAB 키 또는 아래 화살표 키를 누르면 다음 메뉴 옵션으로 이동할 수 있습니다. 이전 옵션으로 이동은 SHIFT+TAB 키 또는 위 화살표 키를 눌러서 할 수 있습니다. 스페이스 키 또는 ENTER 키를 눌러서 메뉴 옵션을 선택할 수 있습니다. 스페이스 키 또는 ENTER 키 또는 오른쪽 화살표 키를 눌러서 하위 메뉴를 열 수 있습니다. 부모 메뉴 항목으로 돌아가려면 ESC 키 또는 왼쪽 화살표 키를 누릅니다. ESC 키를 눌러서 환경-메뉴를 닫습니다."},{name:"편집기 목록 박스",legend:"리스트-박스 내에서, 목록의 다음 항목으로 이동하려면 TAB 키 또는 아래쪽 화살표 키를 누릅니다. 목록의 이전 항목으로 이동하려면 SHIFT+TAB 키 또는 위쪽 화살표 키를 누릅니다. 스페이스 키 또는 ENTER 키를 누르면 목록의 해당 옵션을 선택합니다. ESC 키를 눌러서 리스트-박스를 닫을 수 있습니다."},
 {name:"편집기 요소 경로 막대",legend:"${elementsPathFocus}를 눌러서 요소 경로 막대를 탐색할 수 있습니다. 다음 요소로 이동하려면 TAB 키 또는 오른쪽 화살표 키를 누릅니다. SHIFT+TAB 키 또는 왼쪽 화살표 키를 누르면 이전 버튼으로 이동할 수 있습니다. 스페이스 키나 ENTER 키를 누르면 편집기의 해당 항목을 선택합니다."}]},{name:"명령",items:[{name:" 명령 실행 취소",legend:"${undo} 누르시오"},{name:" 명령 다시 실행",legend:"${redo} 누르시오"},{name:" 굵게 명령",legend:"${bold} 누르시오"},{name:" 기울임 꼴 명령",legend:"${italic} 누르시오"},{name:" 밑줄 명령",legend:"${underline} 누르시오"},{name:" 링크 명령",legend:"${link} 누르시오"},{name:" 툴바 줄이기 명령",legend:"${toolbarCollapse} 누르시오"},
-{name:" 이전 포커스 공간 접근 명령",legend:"탈자 기호(^) 이전에 ${accessPreviousSpace} 를 누르면, 접근 불가능하면서 가장 가까운 포커스 영역에 접근합니다. 예를 들면, 두 인접한 HR 요소가 있습니다. 키 조합을 반복해서 멀리있는 포커스 영역들에 도달할 수 있습니다."},{name:"다음 포커스 공간 접근 명령",legend:"탈자 기호(^) 다음에 ${accessNextSpace} 를 누르면, 접근 불가능하면서 가장 가까운 포커스 영역에 접근합니다. 예를 들면, 두 인접한 HR 요소가 있습니다. 키 조합을 반복해서 멀리있는 포커스 영역들에 도달할 수 있습니다. "},{name:" 접근성 도움말",legend:"${a11yHelp} 누르시오"}]}],backspace:"Backspace 키",tab:"탭 키",enter:"엔터 키",shift:"시프트 키",ctrl:"컨트롤 키",alt:"알트 키",pause:"일시정지 키",capslock:"캡스 록 키",
-escape:"이스케이프 키",pageUp:"페이지 업 키",pageDown:"페이지 다운 키",end:"엔드 키",home:"홈 키",leftArrow:"왼쪽 화살표 키",upArrow:"위쪽 화살표 키",rightArrow:"오른쪽 화살표 키",downArrow:"아래쪽 화살표 키",insert:"인서트 키","delete":"삭제 키",leftWindowKey:"왼쪽 윈도우 키",rightWindowKey:"오른쪽 윈도우 키",selectKey:"셀렉트 키",numpad0:"숫자 패드 0 키",numpad1:"숫자 패드 1 키",numpad2:"숫자 패드 2 키",numpad3:"숫자 패드 3 키",numpad4:"숫자 패드 4 키",numpad5:"숫자 패드 5 키",numpad6:"숫자 패드 6 키",numpad7:"숫자 패드 7 키",numpad8:"숫자 패드 8 키",numpad9:"숫자 패드 9 키",multiply:"곱셈(*) 키",add:"덧셈(+) 키",subtract:"뺄셈(-) 키",
-decimalPoint:"온점(.) 키",divide:"나눗셈(/) 키",f1:"F1 키",f2:"F2 키",f3:"F3 키",f4:"F4 키",f5:"F5 키",f6:"F6 키",f7:"F7 키",f8:"F8 키",f9:"F9 키",f10:"F10 키",f11:"F11 키",f12:"F12 키",numLock:"Num Lock 키",scrollLock:"Scroll Lock 키",semiColon:"세미콜론(;) 키",equalSign:"등호(\x3d) 키",comma:"쉼표(,) 키",dash:"대시(-) 키",period:"온점(.) 키",forwardSlash:"슬래시(/) 키",graveAccent:"억음 악센트(`) 키",openBracket:"브라켓 열기([) 키",backSlash:"역슬래시(\\\\) 키",closeBracket:"브라켓 닫기(]) 키",singleQuote:"외 따옴표(') 키"});
\ No newline at end of file
+{name:" 이전 포커스 공간 접근 명령",legend:"탈자 기호(^) 이전에 ${accessPreviousSpace} 를 누르면, 접근 불가능하면서 가장 가까운 포커스 영역에 접근합니다. 예를 들면, 두 인접한 HR 요소가 있습니다. 키 조합을 반복해서 멀리있는 포커스 영역들에 도달할 수 있습니다."},{name:"다음 포커스 공간 접근 명령",legend:"탈자 기호(^) 다음에 ${accessNextSpace} 를 누르면, 접근 불가능하면서 가장 가까운 포커스 영역에 접근합니다. 예를 들면, 두 인접한 HR 요소가 있습니다. 키 조합을 반복해서 멀리있는 포커스 영역들에 도달할 수 있습니다. "},{name:" 접근성 도움말",legend:"${a11yHelp} 누르시오"}]}],tab:"탭 키",pause:"일시정지 키",capslock:"캡스 록 키",escape:"이스케이프 키",pageUp:"페이지 업 키",pageDown:"페이지 다운 키",leftArrow:"왼쪽 화살표 키",
+upArrow:"위쪽 화살표 키",rightArrow:"오른쪽 화살표 키",downArrow:"아래쪽 화살표 키",insert:"인서트 키",leftWindowKey:"왼쪽 윈도우 키",rightWindowKey:"오른쪽 윈도우 키",selectKey:"셀렉트 키",numpad0:"숫자 패드 0 키",numpad1:"숫자 패드 1 키",numpad2:"숫자 패드 2 키",numpad3:"숫자 패드 3 키",numpad4:"숫자 패드 4 키",numpad5:"숫자 패드 5 키",numpad6:"숫자 패드 6 키",numpad7:"숫자 패드 7 키",numpad8:"숫자 패드 8 키",numpad9:"숫자 패드 9 키",multiply:"곱셈(*) 키",add:"덧셈(+) 키",subtract:"뺄셈(-) 키",decimalPoint:"온점(.) 키",divide:"나눗셈(/) 키",f1:"F1 키",f2:"F2 키",f3:"F3 키",f4:"F4 키",f5:"F5 키",f6:"F6 키",
+f7:"F7 키",f8:"F8 키",f9:"F9 키",f10:"F10 키",f11:"F11 키",f12:"F12 키",numLock:"Num Lock 키",scrollLock:"Scroll Lock 키",semiColon:"세미콜론(;) 키",equalSign:"등호(\x3d) 키",comma:"쉼표(,) 키",dash:"대시(-) 키",period:"온점(.) 키",forwardSlash:"슬래시(/) 키",graveAccent:"억음 악센트(`) 키",openBracket:"브라켓 열기([) 키",backSlash:"역슬래시(\\\\) 키",closeBracket:"브라켓 닫기(]) 키",singleQuote:"외 따옴표(') 키"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
index e73789b9f8c..9bf5eab7d56 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ku",{title:"ڕێنمای لەبەردەستدابوون",contents:"پێکهاتەی یارمەتی. کلیك ESC بۆ داخستنی ئەم دیالۆگه.",legend:[{name:"گشتی",items:[{name:"تووڵامرازی دەستكاریكەر",legend:"کلیك ${toolbarFocus} بۆ ڕابەری تووڵامراز. بۆ گواستنەوەی پێشوو داهاتووی گرووپی تووڵامرازی داگرتنی کلیلی TAB لەگەڵ‌ SHIFT+TAB. بۆ گواستنەوەی پێشوو داهاتووی دووگمەی تووڵامرازی لەڕێی کلیلی تیری دەستی ڕاست یان کلیلی تیری دەستی چەپ. کلیکی کلیلی SPACE یان ENTER بۆ چالاککردنی دووگمەی تووڵامراز."},{name:"دیالۆگی دەستكاریكەر",
 legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"پێڕستی سەرنووسەر",legend:"کلیك ${contextMenu} یان دوگمەی لیسته‌(Menu) بۆ کردنەوەی لیستەی دەق. بۆ چوونە هەڵبژاردەیەکی تر له‌ لیسته‌ کلیکی کلیلی TAB یان کلیلی تیری ڕوو لەخوارەوه‌ بۆ چوون بۆ هەڵبژاردەی پێشوو کلیکی کلیلی SHIFT+TAB یان کلیلی تیری ڕوو له‌ سەرەوە. داگرتنی کلیلی SPACE یان ENTER بۆ هەڵبژاردنی هەڵبژاردەی لیسته‌. بۆ کردنەوەی لقی ژێر لیسته‌ لەهەڵبژاردەی لیستە کلیکی کلیلی SPACE یان ENTER یان کلیلی تیری دەستی ڕاست. بۆ گەڕانەوه بۆ سەرەوەی لیسته‌ کلیکی کلیلی ESC یان کلیلی تیری دەستی چەپ. بۆ داخستنی لیستە کلیكی کلیلی ESC بکە."},
 {name:"لیستی سنووقی سەرنووسەر",legend:"لەناو سنوقی لیست, چۆن بۆ هەڵنبژاردەی لیستێکی تر کلیکی کلیلی TAB یان کلیلی تیری ڕوو لەخوار. چوون بۆ هەڵبژاردەی لیستی پێشوو کلیکی کلیلی SHIFT+TAB یان کلیلی تیری ڕوو لەسەرەوه‌. کلیکی کلیلی SPACE یان ENTER بۆ دیاریکردنی ‌هەڵبژاردەی لیست. کلیکی کلیلی ESC بۆ داخستنی سنوقی لیست."},{name:"تووڵامرازی توخم",legend:"کلیك ${elementsPathFocus} بۆ ڕابەری تووڵامرازی توخمەکان. چوون بۆ دوگمەی توخمێکی تر کلیکی کلیلی TAB یان کلیلی تیری دەستی ڕاست. چوون بۆ دوگمەی توخمی پێشوو کلیلی SHIFT+TAB یان کلیکی کلیلی تیری دەستی چەپ. داگرتنی کلیلی SPACE یان ENTER بۆ دیاریکردنی توخمەکه‌ لەسەرنووسه."}]},
 {name:"فەرمانەکان",items:[{name:"پووچکردنەوەی فەرمان",legend:"کلیك ${undo}"},{name:"هەڵگەڕانەوەی فەرمان",legend:"کلیك ${redo}"},{name:"فەرمانی دەقی قەڵەو",legend:"کلیك ${bold}"},{name:"فەرمانی دەقی لار",legend:"کلیك ${italic}"},{name:"فەرمانی ژێرهێڵ",legend:"کلیك ${underline}"},{name:"فەرمانی به‌ستەر",legend:"کلیك ${link}"},{name:"شاردەنەوەی تووڵامراز",legend:"کلیك ${toolbarCollapse}"},{name:"چوونەناو سەرنجدانی پێشوی فەرمانی بۆشایی",legend:"کلیک ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:"چوونەناو سەرنجدانی داهاتووی فەرمانی بۆشایی",legend:"کلیک ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"دەستپێگەیشتنی یارمەتی",legend:"کلیك ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",
-upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"پەنجەرەی چەپ",rightWindowKey:"پەنجەرەی ڕاست",selectKey:"Select",numpad0:"Numpad 0",numpad1:"1",numpad2:"2",numpad3:"3",numpad4:"4",numpad5:"5",numpad6:"6",numpad7:"7",numpad8:"8",numpad9:"9",multiply:"*",add:"+",subtract:"-",decimalPoint:".",divide:"/",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",
-semiColon:";",equalSign:"\x3d",comma:",",dash:"-",period:".",forwardSlash:"/",graveAccent:"`",openBracket:"[",backSlash:"\\\\",closeBracket:"}",singleQuote:"'"});
\ No newline at end of file
+{name:"چوونەناو سەرنجدانی داهاتووی فەرمانی بۆشایی",legend:"کلیک ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"دەستپێگەیشتنی یارمەتی",legend:"کلیك ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",
+leftWindowKey:"پەنجەرەی چەپ",rightWindowKey:"پەنجەرەی ڕاست",selectKey:"Select",numpad0:"Numpad 0",numpad1:"1",numpad2:"2",numpad3:"3",numpad4:"4",numpad5:"5",numpad6:"6",numpad7:"7",numpad8:"8",numpad9:"9",multiply:"*",add:"+",subtract:"-",decimalPoint:".",divide:"/",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:";",equalSign:"\x3d",comma:",",dash:"-",period:".",forwardSlash:"/",graveAccent:"`",
+openBracket:"[",backSlash:"\\\\",closeBracket:"}",singleQuote:"'"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
index ffabb15caee..c76623621a8 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","lt",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Bendros savybės",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
index 873f6e4f133..dddea998701 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","lv",{title:"Pieejamības instrukcija",contents:"Palīdzības saturs. Lai aizvērtu ciet šo dialogu nospiediet ESC.",legend:[{name:"Galvenais",items:[{name:"Redaktora rīkjosla",legend:"Nospiediet ${toolbarFocus} lai pārvietotos uz rīkjoslu. Lai pārvietotos uz nākošo vai iepriekšējo rīkjoslas grupu izmantojiet pogu TAB un SHIFT+TAB. Lai pārvietotos uz nākošo vai iepriekšējo rīkjoslas pogu izmantojiet Kreiso vai Labo bultiņu. Nospiediet Atstarpi vai ENTER lai aktivizētu rīkjosla pogu."},
@@ -7,6 +7,5 @@ CKEDITOR.plugins.setLang("a11yhelp","lv",{title:"Pieejamības instrukcija",conte
 {name:"Redaktora saraksta lauks",legend:"Saraksta laukā, lai pārvietotos uz nākošo saraksta elementu nospiediet TAB vai pogu Bultiņa uz leju. Lai pārvietotos uz iepriekšējo saraksta elementu nospiediet SHIFT+TAB vai pogu Bultiņa uz augšu. Nospiediet SPACE vai ENTER lai izvēlētos saraksta opcijas. Nospiediet ESC lai aizvērtu saraksta lauku."},{name:"Redaktora elementa ceļa josla",legend:"Nospiediet ${elementsPathFocus} lai pārvietotos uz elementa ceļa joslu. Lai pārvietotos uz nākošo elementa pogu izmantojiet TAB vai Labo bultiņu. Lai pārvietotos uz iepriekšējo elementa pogu izmantojiet SHIFT+TAB vai Kreiso bultiņu. Nospiediet SPACE vai ENTER lai izvēlētos elementu redaktorā."}]},
 {name:"Komandas",items:[{name:"Komanda atcelt darbību",legend:"Nospiediet ${undo}"},{name:"Komanda atkārtot darbību",legend:"Nospiediet ${redo}"},{name:"Treknraksta komanda",legend:"Nospiediet ${bold}"},{name:"Kursīva komanda",legend:"Nospiediet ${italic}"},{name:"Apakšsvītras komanda ",legend:"Nospiediet ${underline}"},{name:"Hipersaites komanda",legend:"Nospiediet ${link}"},{name:"Rīkjoslas aizvēršanas komanda",legend:"Nospiediet ${toolbarCollapse}"},{name:"Piekļūt iepriekšējai fokusa vietas komandai",
 legend:"Nospiediet ${accessPreviousSpace} lai piekļūtu tuvākajai nepieejamajai fokusa vietai pirms kursora. Piemēram: diviem blakus esošiem līnijas HR elementiem. Atkārtojiet taustiņu kombināciju lai piekļūtu pie tālākām vietām."},{name:"Piekļūt nākošā fokusa apgabala komandai",legend:"Nospiediet ${accessNextSpace} lai piekļūtu tuvākajai nepieejamajai fokusa vietai pēc kursora. Piemēram: diviem blakus esošiem līnijas HR elementiem. Atkārtojiet taustiņu kombināciju lai piekļūtu pie tālākām vietām."},
-{name:"Pieejamības palīdzība",legend:"Nospiediet ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Pieejamības palīdzība",legend:"Nospiediet ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
index ad67570de56..f29427135fe 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","mk",{title:"Инструкции за пристапност",contents:"Содржина на делот за помош. За да го затворите овој дијалог притиснете ESC.",legend:[{name:"Општо",items:[{name:"Мени за уредувачот",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Дијалот за едиторот",
 legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Контекст-мени на уредувачот",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
 {name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
 {name:"Наредби",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Пауза",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Up",end:"End",home:"Home",leftArrow:"Стрелка лево",
-upArrow:"Стрелка горе",rightArrow:"Стрелка десно",downArrow:"Стрелка доле",insert:"Insert","delete":"Delete",leftWindowKey:"Лево Windows копче",rightWindowKey:"Десно Windows копче",selectKey:"Select копче",numpad0:"Нум. таст. 0",numpad1:"Нум. таст. 1",numpad2:"Нум. таст. 2",numpad3:"Нум. таст. 3",numpad4:"Нум. таст. 4",numpad5:"Нум. таст. 5",numpad6:"Нум. таст. 6",numpad7:"Нум. таст. 7",numpad8:"Нум. таст. 8",numpad9:"Нум. таст. 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",
-divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Пауза",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Up",leftArrow:"Стрелка лево",upArrow:"Стрелка горе",rightArrow:"Стрелка десно",downArrow:"Стрелка доле",insert:"Insert",
+leftWindowKey:"Лево Windows копче",rightWindowKey:"Десно Windows копче",selectKey:"Select копче",numpad0:"Нум. таст. 0",numpad1:"Нум. таст. 1",numpad2:"Нум. таст. 2",numpad3:"Нум. таст. 3",numpad4:"Нум. таст. 4",numpad5:"Нум. таст. 5",numpad6:"Нум. таст. 6",numpad7:"Нум. таст. 7",numpad8:"Нум. таст. 8",numpad9:"Нум. таст. 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",
+f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
index c88985748af..1f1af29ca68 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","mn",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Ерөнхий",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
index 819372d0dc1..340d604940e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
@@ -1,12 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","nb",{title:"Instruksjoner for tilgjengelighet",contents:"Innhold for hjelp. Trykk ESC for å lukke denne dialogen.",legend:[{name:"Generelt",items:[{name:"Verktøylinje for editor",legend:"Trykk ${toolbarFocus} for å navigere til verktøylinjen. Flytt til neste og forrige verktøylinjegruppe med TAB og SHIFT+TAB. Flytt til neste og forrige verktøylinjeknapp med HØYRE PILTAST og VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å aktivere verktøylinjeknappen."},{name:"Dialog for editor",
 legend:"Mens du er i en dialog, trykk TAB for å navigere til neste dialogelement, trykk SHIFT+TAB for å flytte til forrige dialogelement, trykk ENTER for å akseptere dialogen, trykk ESC for å avbryte dialogen. Når en dialog har flere faner, kan fanelisten nås med enten ALT+F10 eller med TAB. Når fanelisten er fokusert, går man til neste og forrige fane med henholdsvis HØYRE og VENSTRE PILTAST."},{name:"Kontekstmeny for editor",legend:"Trykk ${contextMenu} eller MENYKNAPP for å åpne kontekstmeny. Gå til neste alternativ i menyen med TAB eller PILTAST NED. Gå til forrige alternativ med SHIFT+TAB eller PILTAST OPP. Trykk MELLOMROM eller ENTER for å velge menyalternativet. Åpne undermenyen på valgt alternativ med MELLOMROM eller ENTER eller HØYRE PILTAST. Gå tilbake til overordnet menyelement med ESC eller VENSTRE PILTAST. Lukk kontekstmenyen med ESC."},
 {name:"Listeboks for editor",legend:"I en listeboks, gå til neste alternativ i listen med TAB eller PILTAST NED. Gå til forrige alternativ i listen med SHIFT+TAB eller PILTAST OPP. Trykk MELLOMROM eller ENTER for å velge alternativet i listen. Trykk ESC for å lukke listeboksen."},{name:"Verktøylinje for elementsti",legend:"Trykk ${elementsPathFocus} for å navigere til verktøylinjen som viser elementsti. Gå til neste elementknapp med TAB eller HØYRE PILTAST. Gå til forrige elementknapp med SHIFT+TAB eller VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å velge elementet i editoren."}]},
 {name:"Hurtigtaster",items:[{name:"Angre",legend:"Trykk ${undo}"},{name:"Gjør om",legend:"Trykk ${redo}"},{name:"Fet tekst",legend:"Trykk ${bold}"},{name:"Kursiv tekst",legend:"Trykk ${italic}"},{name:"Understreking",legend:"Trykk ${underline}"},{name:"Lenke",legend:"Trykk ${link}"},{name:"Skjul verktøylinje",legend:"Trykk ${toolbarCollapse}"},{name:"Gå til forrige fokusområde",legend:"Trykk ${accessPreviousSpace} for å komme til nærmeste fokusområde før skrivemarkøren som ikke kan nås på vanlig måte, for eksempel to tilstøtende HR-elementer. Gjenta tastekombinasjonen for å komme til fokusområder lenger unna i dokumentet."},
-{name:"Gå til neste fokusområde",legend:"Trykk ${accessNextSpace} for å komme til nærmeste fokusområde etter skrivemarkøren som ikke kan nås på vanlig måte, for eksempel to tilstøtende HR-elementer. Gjenta tastekombinasjonen for å komme til fokusområder lenger unna i dokumentet."},{name:"Hjelp for tilgjengelighet",legend:"Trykk ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tabulator",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",
-pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Venstre piltast",upArrow:"Opp-piltast",rightArrow:"Høyre piltast",downArrow:"Ned-piltast",insert:"Insert","delete":"Delete",leftWindowKey:"Venstre Windows-tast",rightWindowKey:"Høyre Windows-tast",selectKey:"Velg nøkkel",numpad0:"Numerisk tastatur 0",numpad1:"Numerisk tastatur 1",numpad2:"Numerisk tastatur 2",numpad3:"Numerisk tastatur 3",numpad4:"Numerisk tastatur 4",numpad5:"Numerisk tastatur 5",numpad6:"Numerisk tastatur 6",numpad7:"Numerisk tastatur 7",
-numpad8:"Numerisk tastatur 8",numpad9:"Numerisk tastatur 9",multiply:"Multipliser",add:"Legg til",subtract:"Trekk fra",decimalPoint:"Desimaltegn",divide:"Divider",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Likhetstegn",comma:"Komma",dash:"Bindestrek",period:"Punktum",forwardSlash:"Forover skråstrek",graveAccent:"Grav aksent",openBracket:"Åpne parentes",backSlash:"Bakover skråstrek",
-closeBracket:"Lukk parentes",singleQuote:"Enkelt sitattegn"});
\ No newline at end of file
+{name:"Gå til neste fokusområde",legend:"Trykk ${accessNextSpace} for å komme til nærmeste fokusområde etter skrivemarkøren som ikke kan nås på vanlig måte, for eksempel to tilstøtende HR-elementer. Gjenta tastekombinasjonen for å komme til fokusområder lenger unna i dokumentet."},{name:"Hjelp for tilgjengelighet",legend:"Trykk ${a11yHelp}"}]}],tab:"Tabulator",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Venstre piltast",upArrow:"Opp-piltast",
+rightArrow:"Høyre piltast",downArrow:"Ned-piltast",insert:"Insert",leftWindowKey:"Venstre Windows-tast",rightWindowKey:"Høyre Windows-tast",selectKey:"Velg nøkkel",numpad0:"Numerisk tastatur 0",numpad1:"Numerisk tastatur 1",numpad2:"Numerisk tastatur 2",numpad3:"Numerisk tastatur 3",numpad4:"Numerisk tastatur 4",numpad5:"Numerisk tastatur 5",numpad6:"Numerisk tastatur 6",numpad7:"Numerisk tastatur 7",numpad8:"Numerisk tastatur 8",numpad9:"Numerisk tastatur 9",multiply:"Multipliser",add:"Legg til",
+subtract:"Trekk fra",decimalPoint:"Desimaltegn",divide:"Divider",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Likhetstegn",comma:"Komma",dash:"Bindestrek",period:"Punktum",forwardSlash:"Forover skråstrek",graveAccent:"Grav aksent",openBracket:"Åpne parentes",backSlash:"Bakover skråstrek",closeBracket:"Lukk parentes",singleQuote:"Enkelt sitattegn"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
index 98e46523011..62df667c522 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
@@ -1,11 +1,12 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","nl",{title:"Toegankelijkheidsinstructies",contents:"Help-inhoud. Druk op ESC om dit dialoog te sluiten.",legend:[{name:"Algemeen",items:[{name:"Werkbalk tekstverwerker",legend:"Druk op ${toolbarFocus} om naar de werkbalk te navigeren. Om te schakelen naar de volgende en vorige werkbalkgroep, gebruik TAB en SHIFT+TAB. Om te schakelen naar de volgende en vorige werkbalkknop, gebruik de PIJL RECHTS en PIJL LINKS. Druk op SPATIE of ENTER om een werkbalkknop te activeren."},
-{name:"Dialoog tekstverwerker",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Contextmenu tekstverwerker",legend:"Druk op ${contextMenu} of APPLICATION KEY om het contextmenu te openen. Schakel naar de volgende menuoptie met TAB of PIJL OMLAAG. Schakel naar de vorige menuoptie met SHIFT+TAB of PIJL OMHOOG. Druk op SPATIE of ENTER om een menuoptie te selecteren. Op een submenu van de huidige optie met SPATIE, ENTER of PIJL RECHTS. Ga terug naar de bovenliggende menuoptie met ESC of PIJL LINKS. Sluit het contextmenu met ESC."},
-{name:"Keuzelijst tekstverwerker",legend:"In een keuzelijst, schakel naar het volgende item met TAB of PIJL OMLAAG. Schakel naar het vorige item met SHIFT+TAB of PIJL OMHOOG. Druk op SPATIE of ENTER om het item te selecteren. Druk op ESC om de keuzelijst te sluiten."},{name:"Elementenpad werkbalk tekstverwerker",legend:"Druk op ${elementsPathFocus} om naar het elementenpad te navigeren. Om te schakelen naar het volgende element, gebruik TAB of PIJL RECHTS. Om te schakelen naar het vorige element, gebruik SHIFT+TAB or PIJL LINKS. Druk op SPATIE of ENTER om een element te selecteren in de tekstverwerker."}]},
-{name:"Opdrachten",items:[{name:"Ongedaan maken opdracht",legend:"Druk op ${undo}"},{name:"Opnieuw uitvoeren opdracht",legend:"Druk op ${redo}"},{name:"Vetgedrukt opdracht",legend:"Druk op ${bold}"},{name:"Cursief opdracht",legend:"Druk op ${italic}"},{name:"Onderstrepen opdracht",legend:"Druk op ${underline}"},{name:"Link opdracht",legend:"Druk op ${link}"},{name:"Werkbalk inklappen opdracht",legend:"Druk op ${toolbarCollapse}"},{name:"Ga naar vorige focus spatie commando",legend:"Druk ${accessPreviousSpace} om toegang te verkrijgen tot de dichtstbijzijnde onbereikbare focus spatie voor de caret, bijvoorbeeld: twee aangrenzende HR elementen. Herhaal de toetscombinatie om de verste focus spatie te bereiken."},
-{name:"Ga naar volgende focus spatie commando",legend:"Druk ${accessNextSpace} om toegang te verkrijgen tot de dichtstbijzijnde onbereikbare focus spatie na de caret, bijvoorbeeld: twee aangrenzende HR elementen. Herhaal de toetscombinatie om de verste focus spatie te bereiken."},{name:"Toegankelijkheidshulp",legend:"Druk op ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
-end:"End",home:"Home",leftArrow:"Pijl naar links",upArrow:"Pijl omhoog",rightArrow:"Pijl naar rechts",downArrow:"Pijl naar beneden",insert:"Invoegen","delete":"Verwijderen",leftWindowKey:"Linker Windows-toets",rightWindowKey:"Rechter Windows-toets",selectKey:"Selecteer toets",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Vermenigvuldigen",add:"Toevoegen",
-subtract:"Aftrekken",decimalPoint:"Decimaalteken",divide:"Delen",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Puntkomma",equalSign:"Is gelijk-teken",comma:"Komma",dash:"Koppelteken",period:"Punt",forwardSlash:"Slash",graveAccent:"Accent grave",openBracket:"Vierkant haakje openen",backSlash:"Backslash",closeBracket:"Vierkant haakje sluiten",singleQuote:"Apostrof"});
\ No newline at end of file
+{name:"Dialoog tekstverwerker",legend:"In een dialoogvenster, druk op TAB om te navigeren naar het volgende veld. Druk op SHIFT+TAB om naar het vorige veld te navigeren. Druk op ENTER om het dialoogvenster te verzenden. Druk op ESC om het dialoogvenster te sluiten. Bij dialoogvensters met meerdere tabbladen kan de tabset bereikt worden met ALT+F10 of met TAB als onderdeel van de tabvolgorde in het dialoogvenster. Als de tabset focus heeft, kun je schakalen naar het volgende en vorige tabblad met respectievelijk PIJL RECHTS en PIJL LINKS."},
+{name:"Contextmenu tekstverwerker",legend:"Druk op ${contextMenu} of APPLICATION KEY om het contextmenu te openen. Schakel naar de volgende menuoptie met TAB of PIJL OMLAAG. Schakel naar de vorige menuoptie met SHIFT+TAB of PIJL OMHOOG. Druk op SPATIE of ENTER om een menuoptie te selecteren. Op een submenu van de huidige optie met SPATIE, ENTER of PIJL RECHTS. Ga terug naar de bovenliggende menuoptie met ESC of PIJL LINKS. Sluit het contextmenu met ESC."},{name:"Keuzelijst tekstverwerker",legend:"In een keuzelijst, schakel naar het volgende item met TAB of PIJL OMLAAG. Schakel naar het vorige item met SHIFT+TAB of PIJL OMHOOG. Druk op SPATIE of ENTER om het item te selecteren. Druk op ESC om de keuzelijst te sluiten."},
+{name:"Elementenpad werkbalk tekstverwerker",legend:"Druk op ${elementsPathFocus} om naar het elementenpad te navigeren. Om te schakelen naar het volgende element, gebruik TAB of PIJL RECHTS. Om te schakelen naar het vorige element, gebruik SHIFT+TAB or PIJL LINKS. Druk op SPATIE of ENTER om een element te selecteren in de tekstverwerker."}]},{name:"Opdrachten",items:[{name:"Ongedaan maken opdracht",legend:"Druk op ${undo}"},{name:"Opnieuw uitvoeren opdracht",legend:"Druk op ${redo}"},{name:"Vetgedrukt opdracht",
+legend:"Druk op ${bold}"},{name:"Cursief opdracht",legend:"Druk op ${italic}"},{name:"Onderstrepen opdracht",legend:"Druk op ${underline}"},{name:"Link opdracht",legend:"Druk op ${link}"},{name:"Werkbalk inklappen opdracht",legend:"Druk op ${toolbarCollapse}"},{name:"Ga naar vorige focus spatie commando",legend:"Druk ${accessPreviousSpace} om toegang te verkrijgen tot de dichtstbijzijnde onbereikbare focus spatie voor de caret, bijvoorbeeld: twee aangrenzende HR elementen. Herhaal de toetscombinatie om de verste focus spatie te bereiken."},
+{name:"Ga naar volgende focus spatie commando",legend:"Druk ${accessNextSpace} om toegang te verkrijgen tot de dichtstbijzijnde onbereikbare focus spatie na de caret, bijvoorbeeld: twee aangrenzende HR elementen. Herhaal de toetscombinatie om de verste focus spatie te bereiken."},{name:"Toegankelijkheidshulp",legend:"Druk op ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Pijl naar links",upArrow:"Pijl omhoog",rightArrow:"Pijl naar rechts",
+downArrow:"Pijl naar beneden",insert:"Invoegen",leftWindowKey:"Linker Windows-toets",rightWindowKey:"Rechter Windows-toets",selectKey:"Selecteer toets",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Vermenigvuldigen",add:"Toevoegen",subtract:"Aftrekken",decimalPoint:"Decimaalteken",divide:"Delen",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",
+f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Puntkomma",equalSign:"Is gelijk-teken",comma:"Komma",dash:"Koppelteken",period:"Punt",forwardSlash:"Slash",graveAccent:"Accent grave",openBracket:"Vierkant haakje openen",backSlash:"Backslash",closeBracket:"Vierkant haakje sluiten",singleQuote:"Apostrof"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
index 4fb70ddea5d..8aa90a48d84 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","no",{title:"Instruksjoner for tilgjengelighet",contents:"Innhold for hjelp. Trykk ESC for å lukke denne dialogen.",legend:[{name:"Generelt",items:[{name:"Verktøylinje for editor",legend:"Trykk ${toolbarFocus} for å navigere til verktøylinjen. Flytt til neste og forrige verktøylinjegruppe med TAB og SHIFT+TAB. Flytt til neste og forrige verktøylinjeknapp med HØYRE PILTAST og VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å aktivere verktøylinjeknappen."},{name:"Dialog for editor",
 legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Kontekstmeny for editor",legend:"Trykk ${contextMenu} eller MENYKNAPP for å åpne kontekstmeny. Gå til neste alternativ i menyen med TAB eller PILTAST NED. Gå til forrige alternativ med SHIFT+TAB eller PILTAST OPP. Trykk MELLOMROM eller ENTER for å velge menyalternativet. Åpne undermenyen på valgt alternativ med MELLOMROM eller ENTER eller HØYRE PILTAST. Gå tilbake til overordnet menyelement med ESC eller VENSTRE PILTAST. Lukk kontekstmenyen med ESC."},
 {name:"Listeboks for editor",legend:"I en listeboks, gå til neste alternativ i listen med TAB eller PILTAST NED. Gå til forrige alternativ i listen med SHIFT+TAB eller PILTAST OPP. Trykk MELLOMROM eller ENTER for å velge alternativet i listen. Trykk ESC for å lukke listeboksen."},{name:"Verktøylinje for elementsti",legend:"Trykk ${elementsPathFocus} for å navigere til verktøylinjen som viser elementsti. Gå til neste elementknapp med TAB eller HØYRE PILTAST. Gå til forrige elementknapp med SHIFT+TAB eller VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å velge elementet i editoren."}]},
 {name:"Kommandoer",items:[{name:"Angre",legend:"Trykk ${undo}"},{name:"Gjør om",legend:"Trykk ${redo}"},{name:"Fet tekst",legend:"Trykk ${bold}"},{name:"Kursiv tekst",legend:"Trykk ${italic}"},{name:"Understreking",legend:"Trykk ${underline}"},{name:"Link",legend:"Trykk ${link}"},{name:"Skjul verktøylinje",legend:"Trykk ${toolbarCollapse}"},{name:"Gå til forrige fokusområde",legend:"Trykk ${accessPreviousSpace} for å komme til nærmeste fokusområde før skrivemarkøren som ikke kan nås på vanlig måte, for eksempel to tilstøtende HR-elementer. Gjenta tastekombinasjonen for å komme til fokusområder lenger unna i dokumentet."},
-{name:"Gå til neste fokusområde",legend:"Trykk ${accessNextSpace} for å komme til nærmeste fokusområde etter skrivemarkøren som ikke kan nås på vanlig måte, for eksempel to tilstøtende HR-elementer. Gjenta tastekombinasjonen for å komme til fokusområder lenger unna i dokumentet."},{name:"Hjelp for tilgjengelighet",legend:"Trykk ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
-end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",
-divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Gå til neste fokusområde",legend:"Trykk ${accessNextSpace} for å komme til nærmeste fokusområde etter skrivemarkøren som ikke kan nås på vanlig måte, for eksempel to tilstøtende HR-elementer. Gjenta tastekombinasjonen for å komme til fokusområder lenger unna i dokumentet."},{name:"Hjelp for tilgjengelighet",legend:"Trykk ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",
+downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",
+f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js
new file mode 100644
index 00000000000..f63c1198b96
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js
@@ -0,0 +1,12 @@
+/*
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang("a11yhelp","oc",{title:"Instruccions d'accessibilitat",contents:"Contengut de l'ajuda. Per tampar aquesta fenèstra, quichatz sus la tòca Escap.",legend:[{name:"General",items:[{name:"Barra d'aisinas de l'editor",legend:"Quichar sus ${toolbarFocus} per accedir a la barra d'aisinas. Se desplaçar cap al groupe seguent o precedent de la barra d'aisinas amb las tòcas Tab e Maj+Tab. Se desplaçar cap al boton seguent o precedent de la barra d'aisinas amb las tòcas Sageta dreita e Sageta esquèrra. Quichar sus la barra d'espaci o la tòca Entrada per activer lo boton de barra d'aisinas."},
+{name:"Fenèstra de l'editor",legend:"Dins una bóstia de dialòg, quichar sus Tab per passar a l'element seguent, quichar sus Maj+Tab per passar a l'element precedent, quichar sus Entrada per validar, quichar sus Escap per anullar. Quand una bóstia de dialòg possedís des onglets, la lista pòt èsser atenta amb Alt+F10 o amb Tab. Dins la lista dels onglets, se desplaçar cap al seguent e lo precedent amb las tòcas Sageta dreita e Sageta esquèrra respectivament."},{name:"Menú contextual de l'editor",legend:"Quichar sus ${contextMenu} o sus la tòca Menú per dobrir lo menú contextual. Se desplaçar ensuite cap a l'opcion seguenta del menú amb las tòcas Tab o Sageta bas. Se desplaçar cap a l'opcion precedenta amb las tòcas Maj+Tab o Sageta naut. Quichar sus la barra d'espaci o la tòca Entrada per seleccionar l'opcion del menu. Quichar sus la barra d'espaci, la tòca Entrada o Sageta dreita per dobrir lo sosmenú de l'opcion seleccionada. Tornar a l'element de menú parent amb la tòca Escap o Sageta esquèrra. Tampar lo menú contextual amb Escap."},
+{name:"Zòna de lista de l'editor",legend:"Dins una lista en menú desenrotlant, se desplaçar cap a l'element seguent de la lista amb las tòcas Tab o Sageta bas. Se desplaçar cap a l'element precedent de la lista amb las tòcas Maj+Tab o Sageta naut. Quichar sus la barra d'espaci o sus Entrada per seleccionar l'opcion dins la lista. Quichar sus Escap per tampar lo menú desenrotlant."},{name:"Barra del camin d'elements de l'editor",legend:"Quichar sus ${elementsPathFocus} per naviguer cap a la barra del fial d'Ariana dels elements. Se desplaçar cap al boton de l'element seguent amb las tòcas Tab o Sageta dreita. Se desplaçar cap al boton precedent amb las tòcas Maj+Tab o Sageta esquèrra. Quichar sus la barra d'espaci o sus Entrada per seleccionar l'element dins l'editor."}]},
+{name:"Comandas",items:[{name:"Anullar la comanda",legend:"Quichar sus ${undo}"},{name:"Comanda restablir",legend:"Quichar sus ${redo}"},{name:" Comanda gras",legend:"Quichar sus ${bold}"},{name:" Comanda italica",legend:"Quichar sus ${italic}"},{name:" Comanda solinhat",legend:"Quichar sus ${underline}"},{name:" Comanda ligam",legend:"Quichar sus ${link}"},{name:"Comanda enrotlar la barra d'aisinas",legend:"Quichar sus ${toolbarCollapse}"},{name:"Comanda d'accès a l'element seleccionable precedent",
+legend:"Quichar sus ${accessNextSpace} per accedir a l'element seleccionable inategnible lo mai pròche abans lo cursor, per exemple : doas linhas orizontalas adjacentas. Repetir la combinason de tòcas per aténher los elements seleccionables precedents."},{name:"Comanda d'accès a l'element seleccionable seguent",legend:"Quichar sus ${accessNextSpace} per accedir a l'element seleccionable inatenhible lo mai pròche aprèp lo cursor, per exemple : doas linhas orizontalas adjacentas. Repetir la combinason de tòcas per aténher los elements seleccionables seguents."},
+{name:" Ajuda sus l'accessibilitat",legend:"Quichar sus ${a11yHelp}"}]}],tab:"Tabulacion",pause:"Pausa",capslock:"Verr. Maj.",escape:"Escap",pageUp:"Pagina superiora",pageDown:"Pagina seguenta",leftArrow:"Sageta esquèrra",upArrow:"Sageta naut",rightArrow:"Sageta dreita",downArrow:"Sageta bassa",insert:"Inser",leftWindowKey:"Tòca Windows esquèrra",rightWindowKey:"Tòca Windows dreita",selectKey:"Tòca Seleccionar",numpad0:"0 del pavat numeric",numpad1:"1 del pavat numeric",numpad2:"2 del pavat numeric",
+numpad3:"3 del pavat numeric",numpad4:"4 del pavat numeric",numpad5:"5 del pavat numeric",numpad6:"6 del pavat numeric",numpad7:"7 del pavat numeric",numpad8:"Pavat numeric 8",numpad9:"9 del pavat numeric",multiply:"Multiplicar",add:"Plus",subtract:"Mens",decimalPoint:"Punt decimal",divide:"Devesir",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Verr. Num.",scrollLock:"Arrèst desfil.",semiColon:"Punt-virgula",equalSign:"Signe egal",comma:"Virgula",
+dash:"Jonhent",period:"Punt",forwardSlash:"Barra oblica",graveAccent:"Accent grèu",openBracket:"Parentèsi dobèrta",backSlash:"Barra oblica invèrsa",closeBracket:"Parentèsi tampanta",singleQuote:"Apostròfa"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
index 33580a23e08..da634dd7529 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","pl",{title:"Instrukcje dotyczące dostępności",contents:"Zawartość pomocy. Wciśnij ESC, aby zamknąć to okno.",legend:[{name:"Informacje ogólne",items:[{name:"Pasek narzędzi edytora",legend:"Naciśnij ${toolbarFocus}, by przejść do paska narzędzi. Przejdź do następnej i poprzedniej grupy narzędzi używając TAB oraz SHIFT+TAB. Przejdź do następnego i poprzedniego przycisku paska narzędzi za pomocą STRZAŁKI W PRAWO lub STRZAŁKI W LEWO. Naciśnij SPACJĘ lub ENTER by aktywować przycisk paska narzędzi."},
@@ -7,7 +7,7 @@ CKEDITOR.plugins.setLang("a11yhelp","pl",{title:"Instrukcje dotyczące dostępno
 {name:"Menu kontekstowe edytora",legend:"Wciśnij ${contextMenu} lub PRZYCISK APLIKACJI aby otworzyć menu kontekstowe. Przejdź do następnej pozycji menu wciskając TAB lub STRZAŁKĘ W DÓŁ. Przejdź do poprzedniej pozycji menu wciskając SHIFT + TAB lub STRZAŁKĘ W GÓRĘ. Wciśnij SPACJĘ lub ENTER aby wygrać pozycję menu. Otwórz pod-menu obecnej pozycji wciskając SPACJĘ lub ENTER lub STRZAŁKĘ W PRAWO. Wróć do pozycji nadrzędnego menu wciskając ESC lub STRZAŁKĘ W LEWO. Zamknij menu wciskając ESC."},{name:"Lista w edytorze",
 legend:"Wewnątrz listy przejdź do kolejnego elementu listy za pomocą przycisku TAB lub STRZAŁKI W DÓŁ. Przejdź do poprzedniego elementu listy za pomocą SHIFT+TAB lub STRZAŁKI W GÓRĘ. Naciśnij SPACJĘ lub ENTER w celu wybrania opcji z listy. Naciśnij ESC, by zamknąć listę."},{name:"Pasek ścieżki elementów edytora",legend:"Naciśnij ${elementsPathFocus} w celu przejścia do paska ścieżki elementów edytora. W celu przejścia do kolejnego elementu naciśnij klawisz TAB lub STRZAŁKI W PRAWO. W celu przejścia do poprzedniego elementu naciśnij klawisze SHIFT+TAB lub STRZAŁKI W LEWO. By wybrać element w edytorze, użyj klawisza SPACJI lub ENTER."}]},
 {name:"Polecenia",items:[{name:"Polecenie Cofnij",legend:"Naciśnij ${undo}"},{name:"Polecenie Ponów",legend:"Naciśnij ${redo}"},{name:"Polecenie Pogrubienie",legend:"Naciśnij ${bold}"},{name:"Polecenie Kursywa",legend:"Naciśnij ${italic}"},{name:"Polecenie Podkreślenie",legend:"Naciśnij ${underline}"},{name:"Polecenie Wstaw/ edytuj odnośnik",legend:"Naciśnij ${link}"},{name:"Polecenie schowaj pasek narzędzi",legend:"Naciśnij ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"Pomoc dotycząca dostępności",legend:"Naciśnij ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Strzałka w lewo",
-upArrow:"Strzałka w górę",rightArrow:"Strzałka w prawo",downArrow:"Strzałka w dół",insert:"Insert","delete":"Delete",leftWindowKey:"Lewy klawisz Windows",rightWindowKey:"Prawy klawisz Windows",selectKey:"Klawisz wyboru",numpad0:"Klawisz 0 na klawiaturze numerycznej",numpad1:"Klawisz 1 na klawiaturze numerycznej",numpad2:"Klawisz 2 na klawiaturze numerycznej",numpad3:"Klawisz 3 na klawiaturze numerycznej",numpad4:"Klawisz 4 na klawiaturze numerycznej",numpad5:"Klawisz 5 na klawiaturze numerycznej",
-numpad6:"Klawisz 6 na klawiaturze numerycznej",numpad7:"Klawisz 7 na klawiaturze numerycznej",numpad8:"Klawisz 8 na klawiaturze numerycznej",numpad9:"Klawisz 9 na klawiaturze numerycznej",multiply:"Przemnóż",add:"Plus",subtract:"Minus",decimalPoint:"Separator dziesiętny",divide:"Podziel",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Średnik",equalSign:"Znak równości",comma:"Przecinek",dash:"Pauza",
-period:"Kropka",forwardSlash:"Ukośnik prawy",graveAccent:"Akcent słaby",openBracket:"Nawias kwadratowy otwierający",backSlash:"Ukośnik lewy",closeBracket:"Nawias kwadratowy zamykający",singleQuote:"Apostrof"});
\ No newline at end of file
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"Pomoc dotycząca dostępności",legend:"Naciśnij ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Strzałka w lewo",upArrow:"Strzałka w górę",rightArrow:"Strzałka w prawo",downArrow:"Strzałka w dół",
+insert:"Insert",leftWindowKey:"Lewy klawisz Windows",rightWindowKey:"Prawy klawisz Windows",selectKey:"Klawisz wyboru",numpad0:"Klawisz 0 na klawiaturze numerycznej",numpad1:"Klawisz 1 na klawiaturze numerycznej",numpad2:"Klawisz 2 na klawiaturze numerycznej",numpad3:"Klawisz 3 na klawiaturze numerycznej",numpad4:"Klawisz 4 na klawiaturze numerycznej",numpad5:"Klawisz 5 na klawiaturze numerycznej",numpad6:"Klawisz 6 na klawiaturze numerycznej",numpad7:"Klawisz 7 na klawiaturze numerycznej",numpad8:"Klawisz 8 na klawiaturze numerycznej",
+numpad9:"Klawisz 9 na klawiaturze numerycznej",multiply:"Przemnóż",add:"Plus",subtract:"Minus",decimalPoint:"Separator dziesiętny",divide:"Podziel",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Średnik",equalSign:"Znak równości",comma:"Przecinek",dash:"Pauza",period:"Kropka",forwardSlash:"Ukośnik prawy",graveAccent:"Akcent słaby",openBracket:"Nawias kwadratowy otwierający",backSlash:"Ukośnik lewy",
+closeBracket:"Nawias kwadratowy zamykający",singleQuote:"Apostrof"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
index 1cf81f779f2..5f0735274d4 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","pt-br",{title:"Instruções de Acessibilidade",contents:"Conteúdo da Ajuda. Para fechar este diálogo pressione ESC.",legend:[{name:"Geral",items:[{name:"Barra de Ferramentas do Editor",legend:"Pressione ${toolbarFocus} para navegar para a barra de ferramentas. Mova para o anterior ou próximo grupo de ferramentas com TAB e SHIFT+TAB. Mova para o anterior ou próximo botão com SETA PARA DIREITA or SETA PARA ESQUERDA. Pressione ESPAÇO ou ENTER para ativar o botão da barra de ferramentas."},
@@ -7,7 +7,6 @@ CKEDITOR.plugins.setLang("a11yhelp","pt-br",{title:"Instruções de Acessibilida
 {name:"Menu de Contexto do Editor",legend:"Pressione ${contextMenu} ou TECLA DE MENU para abrir o menu de contexto, então mova para a próxima opção com TAB ou SETA PARA BAIXO. Mova para a anterior com SHIFT+TAB ou SETA PARA CIMA. Pressione ESPAÇO ou ENTER para selecionar a opção do menu. Abra o submenu da opção atual com ESPAÇO ou ENTER ou SETA PARA DIREITA. Volte para o menu pai com ESC ou SETA PARA ESQUERDA. Feche o menu de contexto com ESC."},{name:"Caixa de Lista do Editor",legend:"Dentro de uma caixa de lista, mova para o próximo item com TAB ou SETA PARA BAIXO. Mova para o item anterior com SHIFT+TAB ou SETA PARA CIMA. Pressione ESPAÇO ou ENTER para selecionar uma opção na lista. Pressione ESC para fechar a caixa de lista."},
 {name:"Barra de Caminho do Elementos do Editor",legend:"Pressione ${elementsPathFocus} para a barra de caminho dos elementos. Mova para o próximo botão de elemento com TAB ou SETA PARA DIREITA. Mova para o botão anterior com SHIFT+TAB ou SETA PARA ESQUERDA. Pressione ESPAÇO ou ENTER para selecionar o elemento no editor."}]},{name:"Comandos",items:[{name:" Comando Desfazer",legend:"Pressione ${undo}"},{name:" Comando Refazer",legend:"Pressione ${redo}"},{name:" Comando Negrito",legend:"Pressione ${bold}"},
 {name:" Comando Itálico",legend:"Pressione ${italic}"},{name:" Comando Sublinhado",legend:"Pressione ${underline}"},{name:" Comando Link",legend:"Pressione ${link}"},{name:" Comando Fechar Barra de Ferramentas",legend:"Pressione ${toolbarCollapse}"},{name:"Acessar o comando anterior de spaço de foco",legend:"Pressione ${accessNextSpace} para acessar o espaço de foco não alcançável mais próximo antes do cursor, por exemplo: dois elementos HR adjacentes. Repita a combinação de teclas para alcançar espaços de foco distantes."},
-{name:"Acessar próximo fomando de spaço de foco",legend:"Pressione ${accessNextSpace} para acessar o espaço de foco não alcançável mais próximo após o cursor, por exemplo: dois elementos HR adjacentes. Repita a combinação de teclas para alcançar espaços de foco distantes."},{name:" Ajuda de Acessibilidade",legend:"Pressione ${a11yHelp}"}]}],backspace:"Tecla Backspace",tab:"Tecla Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",
-pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Seta à Esquerda",upArrow:"Seta à Cima",rightArrow:"Seta à Direita",downArrow:"Seta à Baixo",insert:"Insert","delete":"Delete",leftWindowKey:"Tecla do Windows Esquerda",rightWindowKey:"Tecla do Windows Direita",selectKey:"Tecla Selecionar",numpad0:"0 do Teclado Numérico",numpad1:"1 do Teclado Numérico",numpad2:"2 do Teclado Numérico",numpad3:"3 do Teclado Numérico",numpad4:"4 do Teclado Numérico",numpad5:"5 do Teclado Numérico",numpad6:"6 do Teclado Numérico",
-numpad7:"7 do Teclado Numérico",numpad8:"8 do Teclado Numérico",numpad9:"9 do Teclado Numérico",multiply:"Multiplicar",add:"Mais",subtract:"Subtrair",decimalPoint:"Ponto",divide:"Dividir",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Ponto-e-vírgula",equalSign:"Igual",comma:"Vírgula",dash:"Hífen",period:"Ponto",forwardSlash:"Barra",graveAccent:"Acento Grave",openBracket:"Abrir Conchetes",
-backSlash:"Contra-barra",closeBracket:"Fechar Colchetes",singleQuote:"Aspas Simples"});
\ No newline at end of file
+{name:"Acessar próximo fomando de spaço de foco",legend:"Pressione ${accessNextSpace} para acessar o espaço de foco não alcançável mais próximo após o cursor, por exemplo: dois elementos HR adjacentes. Repita a combinação de teclas para alcançar espaços de foco distantes."},{name:" Ajuda de Acessibilidade",legend:"Pressione ${a11yHelp}"}]}],tab:"Tecla Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Seta à Esquerda",upArrow:"Seta à Cima",rightArrow:"Seta à Direita",
+downArrow:"Seta à Baixo",insert:"Insert",leftWindowKey:"Tecla do Windows Esquerda",rightWindowKey:"Tecla do Windows Direita",selectKey:"Tecla Selecionar",numpad0:"0 do Teclado Numérico",numpad1:"1 do Teclado Numérico",numpad2:"2 do Teclado Numérico",numpad3:"3 do Teclado Numérico",numpad4:"4 do Teclado Numérico",numpad5:"5 do Teclado Numérico",numpad6:"6 do Teclado Numérico",numpad7:"7 do Teclado Numérico",numpad8:"8 do Teclado Numérico",numpad9:"9 do Teclado Numérico",multiply:"Multiplicar",add:"Mais",
+subtract:"Subtrair",decimalPoint:"Ponto",divide:"Dividir",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Ponto-e-vírgula",equalSign:"Igual",comma:"Vírgula",dash:"Hífen",period:"Ponto",forwardSlash:"Barra",graveAccent:"Acento Grave",openBracket:"Abrir Conchetes",backSlash:"Contra-barra",closeBracket:"Fechar Colchetes",singleQuote:"Aspas Simples"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
index 620dcbed925..9d3a27e40ba 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
@@ -1,12 +1,12 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.plugins.setLang("a11yhelp","pt",{title:"Instruções de acessibilidade",contents:"Conteúdo de ajuda. Use a tecla ESC para fechar esta janela.",legend:[{name:"Geral",items:[{name:"Barra de ferramentas do editor",legend:"Clique em ${toolbarFocus} para navegar para a barra de ferramentas. Vá para o grupo da barra de ferramentas anterior e seguinte com TAB e SHIFT+TAB. Vá para o botão da barra de ferramentas anterior com a SETA DIREITA ou ESQUERDA. Pressione ESPAÇO ou ENTER para ativar o botão da barra de ferramentas."},
-{name:"Janela do Editor",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Menu de Contexto do Editor",legend:"Clique em ${contextMenu} ou TECLA APLICAÇÃO para abrir o menu de contexto. Depois vá para a opção do menu seguinte com TAB ou SETA PARA BAIXO. Vá para a opção anterior com  SHIFT+TAB ou SETA PARA CIMA. Pressione ESPAÇO ou ENTER para selecionar a opção do menu.  Abra o submenu da opção atual com ESPAÇO, ENTER ou SETA DIREITA. GVá para o item do menu parente  com ESC ou SETA ESQUERDA. Feche o menu de contexto com ESC."},
-{name:"Editor de caixa em lista",legend:"Dentro da caixa da lista, vá para o itemda lista seguinte com TAB ou SETA PARA BAIXO. Move Vá parao item da lista anterior com SHIFT+TAB ou SETA PARA BAIXO. Pressione ESPAÇO ou ENTER para selecionar a opção da lista. Pressione ESC para fechar a caisa da lista."},{name:"Caminho Barra Elemento Editor",legend:"Clique em ${elementsPathFocus} para navegar para a barra do caminho dos elementos. Vá para o botão do elemento seguinte com TAB ou SETA DIREITA. Vá para o botão anterior com SHIFT+TAB ou SETA ESQUERDA. Pressione ESPAÇO ou ENTER para selecionar o elemento no editor."}]},
-{name:"Comandos",items:[{name:"Comando de Anular",legend:"Carregar ${undo}"},{name:"Comando de Refazer",legend:"Pressione ${redo}"},{name:"Comando de Negrito",legend:"Pressione ${bold}"},{name:"Comando de Itálico",legend:"Pressione ${italic}"},{name:"Comando de Sublinhado",legend:"Pressione ${underline}"},{name:"Comando de Hiperligação",legend:"Pressione ${link}"},{name:"Comando de Ocultar Barra de Ferramentas",legend:"Pressione ${toolbarCollapse}"},{name:"Acesso comando do espaço focus anterior",
+CKEDITOR.plugins.setLang("a11yhelp","pt",{title:"Instruções de acessibilidade",contents:"Conteúdo de ajuda. Use a tecla ESC para fechar esta janela.",legend:[{name:"Geral",items:[{name:"Barra de ferramentas do editor",legend:"Clique em ${toolbarFocus} para navegar na barra de ferramentas. Para navegar entre o grupo da barra de ferramentas anterior e seguinte use TAB e SHIFT+TAB. Para navegar entre o botão da barra de ferramentas seguinte e anterior use a SETA DIREITA ou SETA ESQUERDA. Carregue em ESPAÇO ou ENTER para ativar o botão da barra de ferramentas."},
+{name:"Janela do editor",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Menu de contexto do editor",legend:"Clique em ${contextMenu} ou TECLA APLICAÇÃO para abrir o menu de contexto. Depois vá para a opção do menu seguinte com TAB ou SETA PARA BAIXO. Vá para a opção anterior com  SHIFT+TAB ou SETA PARA CIMA. Pressione ESPAÇO ou ENTER para selecionar a opção do menu.  Abra o submenu da opção atual com ESPAÇO, ENTER ou SETA DIREITA. GVá para o item do menu parente  com ESC ou SETA ESQUERDA. Feche o menu de contexto com ESC."},
+{name:"Editor de caixa em lista",legend:"Dentro de uma lista, para navegar para o item seguinte da lista use TAB ou SETA PARA BAIXO. Para o item anterior da lista use SHIFT+TAB ou SETA PARA BAIXO. Carregue em ESPAÇO ou ENTER para selecionar a opção lista. Carregue em ESC para fechar a caixa da lista."},{name:"Editor da barra de caminho dos elementos",legend:"Clique em ${elementsPathFocus} para navegar na barra de caminho dos elementos. Para o botão do elemento seguinte use TAB ou SETA DIREITA. para o botão anterior use SHIFT+TAB ou SETA ESQUERDA. Carregue em ESPAÇO ou ENTER para selecionar o elemento no editor."}]},
+{name:"Comandos",items:[{name:"Comando de anular",legend:"Carregar ${undo}"},{name:"Comando de refazer",legend:"Clique ${redo}"},{name:"Comando de negrito",legend:"Pressione ${bold}"},{name:"Comando de itálico",legend:"Pressione ${italic}"},{name:"Comando de sublinhado",legend:"Pressione ${underline}"},{name:"Comando de hiperligação",legend:"Pressione ${link}"},{name:"Comando de ocultar barra de ferramentas",legend:"Pressione ${toolbarCollapse}"},{name:"Aceder ao comando espaço de foco anterior",
 legend:"Clique em ${accessPreviousSpace} para aceder ao espaço do focos inalcançável mais perto antes do sinal de omissão, por exemplo: dois elementos HR adjacentes. Repetir a combinação da chave para alcançar os espaços dos focos distantes."},{name:"Acesso comando do espaço focus seguinte",legend:"Pressione ${accessNextSpace} para aceder ao espaço do focos inalcançável mais perto depois do sinal de omissão, por exemplo: dois elementos HR adjacentes. Repetir a combinação da chave para alcançar os espaços dos focos distantes."},
-{name:"Ajuda a acessibilidade",legend:"Pressione ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pausa",capslock:"Maiúsculas",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",end:"Fim",home:"Entrada",leftArrow:"Seta esquerda",upArrow:"Seta para cima",rightArrow:"Seta direita",downArrow:"Seta para baixo",insert:"Inserir","delete":"Eliminar",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",
-numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiplicar",add:"Adicionar",subtract:"Subtrair",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Vírgula",dash:"Dash",period:"Period",
-forwardSlash:"Forward Slash",graveAccent:"Acento grave",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Ajuda a acessibilidade",legend:"Pressione ${a11yHelp}"}]}],tab:"Tab",pause:"Pausa",capslock:"Maiúsculas",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Seta esquerda",upArrow:"Seta para cima",rightArrow:"Seta direita",downArrow:"Seta para baixo",insert:"Inserir",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",
+numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiplicar",add:"Adicionar",subtract:"Subtrair",decimalPoint:"Decimal Point",divide:"Separar",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Vírgula",dash:"Cardinal",period:"Ponto",forwardSlash:"Forward Slash",graveAccent:"Acento grave",openBracket:"Open Bracket",backSlash:"Backslash",
+closeBracket:"Close Bracket",singleQuote:"Plica"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
index a92f60f2232..7a916d29bf0 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ro",{title:"Instrucțiuni de accesibilitate",contents:"Cuprins. Pentru a închide acest dialog, apăsați tasta ESC.",legend:[{name:"General",items:[{name:"Editează bara instrumente.",legend:"Apasă ${toolbarFocus} pentru a naviga prin bara de instrumente. Pentru a te mișca prin grupurile de instrumente folosește tastele TAB și SHIFT+TAB. Pentru a te mișca intre diverse instrumente folosește tastele SĂGEATĂ DREAPTA sau SĂGEATĂ STÂNGA. Apasă butonul SPAȚIU sau ENTER pentru activarea instrumentului."},
 {name:"Dialog editor",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor meniu contextual",legend:"Apasă ${contextMenu} sau TASTA MENIU pentru a deschide meniul contextual. Treci la următoarea opțiune din meniu cu TAB sau SĂGEATĂ JOS. Treci la opțiunea anterioară cu  SHIFT+TAB sau SĂGEATĂ SUS. Apasă SPAȚIU sau ENTER pentru a selecta opțiunea din meniu. Deschide sub-meniul opțiunii curente cu SPAȚIU sau ENTER sau SĂGEATĂ DREAPTA. Revino la elementul din meniul părinte cu ESC sau SĂGEATĂ STÂNGA. Închide meniul de context cu ESC."},
 {name:"Editor Casetă Listă",legend:"În interiorul unei liste, treci la următorull element cu TAB sau SĂGEATĂ JOS. Treci la elementul anterior din listă cu SHIFT+TAB sau SĂGEATĂ SUS. Apasă SPAȚIU sau ENTER pentru a selecta opțiunea din listă. Apasă ESC pentru a închide lista."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
 {name:"Comenzi",items:[{name:" Undo command",legend:"Apasă ${undo}"},{name:"Comanda precedentă",legend:"Apasă ${redo}"},{name:"Comanda Îngroșat",legend:"Apasă ${bold}"},{name:"Comanda Inclinat",legend:"Apasă ${italic}"},{name:"Comanda Subliniere",legend:"Apasă ${underline}"},{name:"Comanda Legatură",legend:"Apasă ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",
-upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",
-f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",
+rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",
+equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
index 667c872d88a..34f5cea9e09 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ru",{title:"Горячие клавиши",contents:"Помощь. Для закрытия этого окна нажмите ESC.",legend:[{name:"Основное",items:[{name:"Панель инструментов",legend:"Нажмите ${toolbarFocus} для перехода к панели инструментов. Для перемещения между группами панели инструментов используйте TAB и SHIFT+TAB. Для перемещения между кнопками панели иструментов используйте кнопки ВПРАВО или ВЛЕВО. Нажмите ПРОБЕЛ или ENTER для запуска кнопки панели инструментов."},{name:"Диалоги",legend:'Внутри диалога, нажмите TAB чтобы перейти к следующему элементу диалога, нажмите SHIFT+TAB чтобы перейти к предыдущему элементу диалога, нажмите ENTER чтобы отправить диалог, нажмите ESC чтобы отменить диалог. Когда диалоговое окно имеет несколько вкладок, получить доступ к панели вкладок как части диалога можно нажатием или сочетания ALT+F10 или TAB, при этом активные элементы диалога будут перебираться с учетом порядка табуляции. При активной панели вкладок, переход к следующей или предыдущей вкладке осуществляется нажатием стрелки "ВПРАВО" или стрелки "ВЛЕВО" соответственно.'},
 {name:"Контекстное меню",legend:'Нажмите ${contextMenu} или клавишу APPLICATION, чтобы открыть контекстное меню. Затем перейдите к следующему пункту меню с помощью TAB или стрелкой "ВНИЗ". Переход к предыдущей опции - SHIFT+TAB или стрелкой "ВВЕРХ". Нажмите SPACE, или ENTER, чтобы задействовать опцию меню. Открыть подменю текущей опции - SPACE или ENTER или стрелкой "ВПРАВО". Возврат к родительскому пункту меню - ESC или стрелкой "ВЛЕВО". Закрытие контекстного меню - ESC.'},{name:"Редактор списка",
 legend:'Внутри окна списка, переход к следующему пункту списка - TAB или стрелкой "ВНИЗ". Переход к предыдущему пункту списка - SHIFT+TAB или стрелкой "ВВЕРХ". Нажмите SPACE, или ENTER, чтобы задействовать опцию списка. Нажмите ESC, чтобы закрыть окно списка.'},{name:"Путь к элементу",legend:'Нажмите ${elementsPathFocus}, чтобы перейти к панели пути элементов. Переход к следующей кнопке элемента - TAB или стрелкой "ВПРАВО". Переход к предыдущей кнопку - SHIFT+TAB или стрелкой "ВЛЕВО". Нажмите SPACE, или ENTER, чтобы выбрать элемент в редакторе.'}]},
 {name:"Команды",items:[{name:"Отменить",legend:"Нажмите ${undo}"},{name:"Повторить",legend:"Нажмите ${redo}"},{name:"Полужирный",legend:"Нажмите ${bold}"},{name:"Курсив",legend:"Нажмите ${italic}"},{name:"Подчеркнутый",legend:"Нажмите ${underline}"},{name:"Гиперссылка",legend:"Нажмите ${link}"},{name:"Свернуть панель инструментов",legend:"Нажмите ${toolbarCollapse}"},{name:"Команды доступа к предыдущему фокусному пространству",legend:'Нажмите ${accessPreviousSpace}, чтобы обратиться к ближайшему недостижимому фокусному пространству перед символом "^", например: два смежных HR элемента. Повторите комбинацию клавиш, чтобы достичь отдаленных фокусных пространств.'},
-{name:"Команды доступа к следующему фокусному пространству",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"Справка по горячим клавишам",legend:"Нажмите ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",end:"End",
-home:"Home",leftArrow:"Стрелка влево",upArrow:"Стрелка вверх",rightArrow:"Стрелка вправо",downArrow:"Стрелка вниз",insert:"Insert","delete":"Delete",leftWindowKey:"Левая клавиша Windows",rightWindowKey:"Правая клавиша Windows",selectKey:"Выбрать",numpad0:"Цифра 0",numpad1:"Цифра 1",numpad2:"Цифра 2",numpad3:"Цифра 3",numpad4:"Цифра 4",numpad5:"Цифра 5",numpad6:"Цифра 6",numpad7:"Цифра 7",numpad8:"Цифра 8",numpad9:"Цифра 9",multiply:"Умножить",add:"Плюс",subtract:"Вычесть",decimalPoint:"Десятичная точка",
-divide:"Делить",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Точка с запятой",equalSign:"Равно",comma:"Запятая",dash:"Тире",period:"Точка",forwardSlash:"Наклонная черта",graveAccent:"Апостроф",openBracket:"Открыть скобку",backSlash:"Обратная наклонная черта",closeBracket:"Закрыть скобку",singleQuote:"Одинарная кавычка"});
\ No newline at end of file
+{name:"Команды доступа к следующему фокусному пространству",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"Справка по горячим клавишам",legend:"Нажмите ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Стрелка влево",upArrow:"Стрелка вверх",rightArrow:"Стрелка вправо",downArrow:"Стрелка вниз",
+insert:"Insert",leftWindowKey:"Левая клавиша Windows",rightWindowKey:"Правая клавиша Windows",selectKey:"Выбрать",numpad0:"Цифра 0",numpad1:"Цифра 1",numpad2:"Цифра 2",numpad3:"Цифра 3",numpad4:"Цифра 4",numpad5:"Цифра 5",numpad6:"Цифра 6",numpad7:"Цифра 7",numpad8:"Цифра 8",numpad9:"Цифра 9",multiply:"Умножить",add:"Плюс",subtract:"Вычесть",decimalPoint:"Десятичная точка",divide:"Делить",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",
+scrollLock:"Scroll Lock",semiColon:"Точка с запятой",equalSign:"Равно",comma:"Запятая",dash:"Тире",period:"Точка",forwardSlash:"Наклонная черта",graveAccent:"Апостроф",openBracket:"Открыть скобку",backSlash:"Обратная наклонная черта",closeBracket:"Закрыть скобку",singleQuote:"Одинарная кавычка"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
index 56b5b92add7..7ca73410c32 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","si",{title:"ළඟා වියහැකි ",contents:"උදව් සඳහා අන්තර්ගතය.නික්මයෙමට ESC බොත්තම ඔබන්න",legend:[{name:"පොදු කරුණු",items:[{name:"සංස්කරණ මෙවලම් ",legend:"ඔබන්න ${මෙවලම් තීරු අවධානය} මෙවලම් තීරුවේ එහා මෙහා යෑමට.ඉදිරියට යෑමට හා ආපසු යෑමට මෙවලම් තීරුකාණ්ඩය හා TAB හා SHIFT+TAB .ඉදිරියට යෑමට හා ආපසු යෑමට මෙවලම් තීරු බොත්තම සමග RIGHT ARROW හෝ LEFT ARROW.මෙවලම් තීරු බොත්තම සක්‍රිය කර ගැනීමට SPACE හෝ ENTER බොත්තම ඔබන්න."},{name:"සංස්කරණ ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"සංස්කරණ අඩංගුවට ",legend:"ඔබන්න ${අන්තර්ගත මෙනුව} හෝ  APPLICATION KEY  අන්තර්ගත-මෙනුව විවුරතකිරීමට. ඊළඟ මෙනුව-ව්කල්පයන්ට යෑමට TAB හෝ DOWN ARROW බොත්තම ද, පෙර විකල්පයන්ටයෑමට SHIFT+TAB හෝ  UP ARROW බොත්තම ද, මෙනුව-ව්කල්පයන් තේරීමට SPACE හෝ ENTER බොත්තම ද,  දැනට විවුර්තව ඇති උප-මෙනුවක වීකල්ප තේරීමට SPACE හෝ ENTER හෝ RIGHT ARROW ද, නැවත පෙර ප්‍රධාන මෙනුවට යෑමට  ESC හෝ LEFT ARROW බොත්තම ද.  අන්තර්ගත-මෙනුව වැසීමට  ESC බොත්තම ද ඔබන්න."},{name:"සංස්කරණ තේරුම් ",legend:"තේරුම් කොටුව තුළ , ඊළඟ අයිතමයට යෑමට TAB හෝ DOWN ARROW , පෙර අයිතමයට යෑමට SHIFT+TAB හෝ UP ARROW . අයිතම විකල්පයන් තේරීමට SPACE හෝ ENTER ,තේරුම් කොටුව වැසීමට ESC බොත්තම් ද ඔබන්න."},
 {name:"සංස්කරණ අංග සහිත ",legend:"ඔබන්න ${මෙවලම් තීරු අවධානය} මෙවලම් තීරුවේ එහා මෙහා යෑමට.ඉදිරියට යෑමට හා ආපසු යෑමට මෙවලම් තීරුකාණ්ඩය හා TAB හා SHIFT+TAB .ඉදිරියට යෑමට හා ආපසු යෑමට මෙවලම් තීරු බොත්තම සමග RIGHT ARROW හෝ LEFT ARROW.මෙවලම් තීරු බොත්තම සක්‍රිය කර ගැනීමට SPACE හෝ ENTER බොත්තම ඔබන්න."}]},{name:"විධාන",items:[{name:"විධානය වෙනස් ",legend:"ඔබන්න ${වෙනස් කිරීම}"},{name:"විධාන නැවත් පෙර පරිදිම වෙනස්කර ගැනීම.",legend:"ඔබන්න ${නැවත් පෙර පරිදිම වෙනස්කර ගැනීම}"},{name:"තද අකුරින් විධාන",legend:"ඔබන්න ${තද }"},
-{name:"බැධී අකුරු විධාන",legend:"ඔබන්න ${බැධී අකුරු }"},{name:"යටින් ඉරි ඇද ඇති විධාන.",legend:"ඔබන්න ${යටින් ඉරි ඇද ඇති}"},{name:"සම්බන්ධිත විධාන",legend:"ඔබන්න ${සම්බන්ධ }"},{name:"මෙවලම් තීරු හැකුලුම් විධාන",legend:"ඔබන්න ${මෙවලම් තීරු හැකුලුම් }"},{name:"යොමුවීමට පෙර  වැදගත්  විධාන",legend:"ඔබන්න ${යොමුවීමට ඊළඟ }"},{name:"යොමුවීමට ඊළග වැදගත්  විධාන",legend:"ඔබන්න ${යොමුවීමට ඊළඟ }"},{name:"ප්‍රවේශ ",legend:"ඔබන්න  ${a11y }"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",
-alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",
-numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"බැධී අකුරු විධාන",legend:"ඔබන්න ${බැධී අකුරු }"},{name:"යටින් ඉරි ඇද ඇති විධාන.",legend:"ඔබන්න ${යටින් ඉරි ඇද ඇති}"},{name:"සම්බන්ධිත විධාන",legend:"ඔබන්න ${සම්බන්ධ }"},{name:"මෙවලම් තීරු හැකුලුම් විධාන",legend:"ඔබන්න ${මෙවලම් තීරු හැකුලුම් }"},{name:"යොමුවීමට පෙර  වැදගත්  විධාන",legend:"ඔබන්න ${යොමුවීමට ඊළඟ }"},{name:"යොමුවීමට ඊළග වැදගත්  විධාන",legend:"ඔබන්න ${යොමුවීමට ඊළඟ }"},{name:"ප්‍රවේශ ",legend:"ඔබන්න  ${a11y }"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",
+pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",
+f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
index 6f16ff96453..f637562a43b 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sk",{title:"Inštrukcie prístupnosti",contents:"Pomocný obsah. Pre zatvorenie tohto okna, stlačte ESC.",legend:[{name:"Všeobecne",items:[{name:"Lišta nástrojov editora",legend:"Stlačte ${toolbarFocus} pre navigáciu na lištu nástrojov. Medzi ďalšou a predchádzajúcou lištou nástrojov sa pohybujete s TAB a SHIFT+TAB. Medzi ďalším a predchádzajúcim tlačidlom na lište nástrojov sa pohybujete s pravou šípkou a ľavou šípkou. Stlačte medzerník alebo ENTER pre aktiváciu tlačidla lišty nástrojov."},
-{name:"Editorový dialóg",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editorové kontextové menu",legend:"Stlačte ${contextMenu} alebo APPLICATION KEY pre otvorenie kontextového menu. Potom sa presúvajte na ďalšie možnosti menu s TAB alebo dolnou šípkou. Presunte sa k predchádzajúcej možnosti s SHIFT+TAB alebo hornou šípkou. Stlačte medzerník alebo ENTER pre výber možnosti menu. Otvorte pod-menu danej možnosti s medzerníkom, alebo ENTER, alebo pravou šípkou. Vráťte sa späť do položky rodičovského menu s ESC alebo ľavou šípkou. Zatvorte kontextové menu s ESC."},
+{name:"Editorový dialóg",legend:"V dialógovom okne stlačte TAB pre presun na ďalší prvok, SHIFT+TAB pre presun na predchádzajúci prvok, ENTER pre odoslanie, ESC pre zrušenie. Keď má dialógové okno viacero kariet, zoznam kariet dosiahnete buď stlačením ALT+F10 alebo s TAB v príslušnom poradí kariet. So zameraným zoznamom kariet sa pohybujte k ďalšej alebo predchádzajúcej karte cez PRAVÚ a ĽAVÚ ŠÍPKU."},{name:"Editorové kontextové menu",legend:"Stlačte ${contextMenu} alebo APPLICATION KEY pre otvorenie kontextového menu. Potom sa presúvajte na ďalšie možnosti menu s TAB alebo dolnou šípkou. Presunte sa k predchádzajúcej možnosti s SHIFT+TAB alebo hornou šípkou. Stlačte medzerník alebo ENTER pre výber možnosti menu. Otvorte pod-menu danej možnosti s medzerníkom, alebo ENTER, alebo pravou šípkou. Vráťte sa späť do položky rodičovského menu s ESC alebo ľavou šípkou. Zatvorte kontextové menu s ESC."},
 {name:"Editorov box zoznamu",legend:"V boxe zoznamu, presuňte sa na ďalšiu položku v zozname s TAB alebo dolnou šípkou. Presuňte sa k predchádzajúcej položke v zozname so SHIFT+TAB alebo hornou šípkou. Stlačte medzerník alebo ENTER pre výber možnosti zoznamu. Stlačte ESC pre zatvorenie boxu zoznamu."},{name:"Editorove pásmo cesty prvku",legend:"Stlačte ${elementsPathFocus} pre navigovanie na pásmo cesty elementu. Presuňte sa na tlačidlo ďalšieho prvku s TAB alebo pravou šípkou. Presuňte sa k predchádzajúcemu tlačidlu s SHIFT+TAB alebo ľavou šípkou. Stlačte medzerník alebo ENTER pre výber prvku v editore."}]},
 {name:"Príkazy",items:[{name:"Vrátiť príkazy",legend:"Stlačte ${undo}"},{name:"Nanovo vrátiť príkaz",legend:"Stlačte ${redo}"},{name:"Príkaz na stučnenie",legend:"Stlačte ${bold}"},{name:"Príkaz na kurzívu",legend:"Stlačte ${italic}"},{name:"Príkaz na podčiarknutie",legend:"Stlačte ${underline}"},{name:"Príkaz na odkaz",legend:"Stlačte ${link}"},{name:"Príkaz na zbalenie lišty nástrojov",legend:"Stlačte ${toolbarCollapse}"},{name:"Prejsť na predchádzajúcu zamerateľnú medzeru príkazu",legend:"Stlačte ${accessPreviousSpace} pre prístup na najbližšie nedosiahnuteľné zamerateľné medzery pred vsuvkuo. Napríklad: dve za sebou idúce horizontálne čiary. Opakujte kombináciu klávesov pre dosiahnutie vzdialených zamerateľných medzier."},
-{name:"Prejsť na ďalší ",legend:"Stlačte ${accessNextSpace} pre prístup na najbližšie nedosiahnuteľné zamerateľné medzery po vsuvke. Napríklad: dve za sebou idúce horizontálne čiary. Opakujte kombináciu klávesov pre dosiahnutie vzdialených zamerateľných medzier."},{name:"Pomoc prístupnosti",legend:"Stlačte ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Stránka hore",pageDown:"Stránka dole",
-end:"End",home:"Home",leftArrow:"Šípka naľavo",upArrow:"Šípka hore",rightArrow:"Šípka napravo",downArrow:"Šípka dole",insert:"Insert","delete":"Delete",leftWindowKey:"Ľavé Windows tlačidlo",rightWindowKey:"Pravé Windows tlačidlo",selectKey:"Tlačidlo Select",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Násobenie",add:"Sčítanie",subtract:"Odčítanie",
-decimalPoint:"Desatinná čiarka",divide:"Delenie",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Bodkočiarka",equalSign:"Rovná sa",comma:"Čiarka",dash:"Pomĺčka",period:"Bodka",forwardSlash:"Lomítko",graveAccent:"Zdôrazňovanie prízvuku",openBracket:"Hranatá zátvorka otváracia",backSlash:"Backslash",closeBracket:"Hranatá zátvorka zatváracia",singleQuote:"Jednoduché úvodzovky"});
\ No newline at end of file
+{name:"Prejsť na ďalší ",legend:"Stlačte ${accessNextSpace} pre prístup na najbližšie nedosiahnuteľné zamerateľné medzery po vsuvke. Napríklad: dve za sebou idúce horizontálne čiary. Opakujte kombináciu klávesov pre dosiahnutie vzdialených zamerateľných medzier."},{name:"Pomoc prístupnosti",legend:"Stlačte ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Stránka hore",pageDown:"Stránka dole",leftArrow:"Šípka naľavo",upArrow:"Šípka hore",rightArrow:"Šípka napravo",
+downArrow:"Šípka dole",insert:"Insert",leftWindowKey:"Ľavé Windows tlačidlo",rightWindowKey:"Pravé Windows tlačidlo",selectKey:"Tlačidlo Select",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Násobenie",add:"Sčítanie",subtract:"Odčítanie",decimalPoint:"Desatinná čiarka",divide:"Delenie",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",
+f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Bodkočiarka",equalSign:"Rovná sa",comma:"Čiarka",dash:"Pomĺčka",period:"Bodka",forwardSlash:"Lomítko",graveAccent:"Zdôrazňovanie prízvuku",openBracket:"Hranatá zátvorka otváracia",backSlash:"Backslash",closeBracket:"Hranatá zátvorka zatváracia",singleQuote:"Jednoduché úvodzovky"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
index 0671357d523..01cfc7fd96d 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.plugins.setLang("a11yhelp","sl",{title:"Navodila Dostopnosti",contents:"Vsebina Pomoči. Če želite zapreti to pogovorno okno pritisnite ESC.",legend:[{name:"Splošno",items:[{name:"Urejevalna Orodna Vrstica",legend:"Pritisnite ${toolbarFocus} za pomik v orodno vrstico. Z TAB in SHIFT+TAB se pomikate na naslednjo in prejšnjo skupino orodne vrstice. Z DESNO PUŠČICO ali LEVO PUŠČICO se pomikate na naslednji in prejšnji gumb orodne vrstice. Pritisnite SPACE ali ENTER, da aktivirate gumb orodne vrstice."},
-{name:"Urejevalno Pogovorno Okno",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Urejevalni Kontekstni Meni",legend:"Pritisnite ${contextMenu} ali APPLICATION KEY, da odprete kontekstni meni. Nato se premaknite na naslednjo možnost menija s tipko TAB ali PUŠČICA DOL. Premakniti se na prejšnjo možnost z SHIFT + TAB ali PUŠČICA GOR. Pritisnite SPACE ali ENTER za izbiro možnosti menija. Odprite podmeni trenutne možnosti menija s tipko SPACE ali ENTER ali DESNA PUŠČICA. Vrnite se na matični element menija s tipko ESC ali LEVA PUŠČICA. Zaprite kontekstni meni z ESC."},
+CKEDITOR.plugins.setLang("a11yhelp","sl",{title:"Navodila za dostopnost",contents:"Vsebina pomoči. Če želite zapreti pogovorno okno, pritisnite ESC.",legend:[{name:"Splošno",items:[{name:"Orodna vrstica urejevalnika",legend:"Pritisnite ${toolbarFocus} za pomik v orodno vrstico. Z TAB in SHIFT+TAB se pomikate na naslednjo in prejšnjo skupino orodne vrstice. Z DESNO PUŠČICO ali LEVO PUŠČICO se pomikate na naslednji in prejšnji gumb orodne vrstice. Pritisnite SPACE ali ENTER, da aktivirate gumb orodne vrstice."},
+{name:"Urejevalno Pogovorno Okno",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Kontekstni meni urejevalnika",legend:"Pritisnite ${contextMenu} ali APPLICATION KEY, da odprete kontekstni meni. Nato se premaknite na naslednjo možnost menija s tipko TAB ali PUŠČICA DOL. Premakniti se na prejšnjo možnost z SHIFT + TAB ali PUŠČICA GOR. Pritisnite SPACE ali ENTER za izbiro možnosti menija. Odprite podmeni trenutne možnosti menija s tipko SPACE ali ENTER ali DESNA PUŠČICA. Vrnite se na matični element menija s tipko ESC ali LEVA PUŠČICA. Zaprite kontekstni meni z ESC."},
 {name:"Urejevalno Seznamsko Polje",legend:"Znotraj seznama, se premaknete na naslednji element seznama s tipko TAB ali PUŠČICO DOL. Z SHIFT+TAB ali PUŠČICO GOR se premaknete na prejšnji element seznama. Pritisnite tipko SPACE ali ENTER za izbiro elementa. Pritisnite tipko ESC, da zaprete seznam."},{name:"Urejevalna vrstica poti elementa",legend:"Pritisnite ${elementsPathFocus} za pomikanje po vrstici elementnih poti. S TAB ali DESNA PUŠČICA se premaknete na naslednji gumb elementa. Z SHIFT+TAB ali LEVO PUŠČICO se premaknete na prejšnji gumb elementa. Pritisnite SPACE ali ENTER za izbiro elementa v urejevalniku."}]},
 {name:"Ukazi",items:[{name:"Razveljavi ukaz",legend:"Pritisnite ${undo}"},{name:"Ponovi ukaz",legend:"Pritisnite ${redo}"},{name:"Krepki ukaz",legend:"Pritisnite ${bold}"},{name:"Ležeči ukaz",legend:"Pritisnite ${italic}"},{name:"Poudarni ukaz",legend:"Pritisnite ${underline}"},{name:"Ukaz povezave",legend:"Pritisnite ${link}"},{name:"Skrči Orodno Vrstico Ukaz",legend:"Pritisnite ${toolbarCollapse}"},{name:"Dostop do prejšnjega ukaza ostrenja",legend:"Pritisnite ${accessPreviousSpace} za dostop do najbližjega nedosegljivega osredotočenega prostora pred strešico, npr.: dva sosednja HR elementa. Ponovite kombinacijo tipk, da dosežete oddaljene osredotočene prostore."},
-{name:"Dostop do naslednjega ukaza ostrenja",legend:"Pritisnite ${accessNextSpace} za dostop do najbližjega nedosegljivega osredotočenega prostora po strešici, npr.: dva sosednja HR elementa. Ponovite kombinacijo tipk, da dosežete oddaljene osredotočene prostore."},{name:"Pomoč Dostopnosti",legend:"Pritisnite ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",
-home:"Home",leftArrow:"Levo puščica",upArrow:"Gor puščica",rightArrow:"Desno puščica",downArrow:"Dol puščica",insert:"Insert","delete":"Delete",leftWindowKey:"Leva Windows tipka",rightWindowKey:"Desna Windows tipka",selectKey:"Select tipka",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Zmnoži",add:"Dodaj",subtract:"Odštej",decimalPoint:"Decimalna vejica",
-divide:"Deli",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Podpičje",equalSign:"enačaj",comma:"Vejica",dash:"Vezaj",period:"Pika",forwardSlash:"Desna poševnica",graveAccent:"Krativec",openBracket:"Oklepaj",backSlash:"Leva poševnica",closeBracket:"Oklepaj",singleQuote:"Opuščaj"});
\ No newline at end of file
+{name:"Dostop do naslednjega ukaza ostrenja",legend:"Pritisnite ${accessNextSpace} za dostop do najbližjega nedosegljivega osredotočenega prostora po strešici, npr.: dva sosednja HR elementa. Ponovite kombinacijo tipk, da dosežete oddaljene osredotočene prostore."},{name:"Pomoč dostopnosti",legend:"Pritisnite ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Puščica levo",upArrow:"Puščica gor",rightArrow:"Puščica desno",
+downArrow:"Puščica dol",insert:"Insert",leftWindowKey:"Leva tipka Windows",rightWindowKey:"Desna tipka Windows",selectKey:"Select tipka",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Zmnoži",add:"Dodaj",subtract:"Odštej",decimalPoint:"Decimalna vejica",divide:"Deli",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",
+f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Podpičje",equalSign:"Enačaj",comma:"Vejica",dash:"Vezaj",period:"Pika",forwardSlash:"Desna poševnica",graveAccent:"Krativec",openBracket:"Oklepaj",backSlash:"Leva poševnica",closeBracket:"Zaklepaj",singleQuote:"Opuščaj"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
index 8f9d5c782c7..247e9faaa7f 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sq",{title:"Udhëzimet e Qasjes",contents:"Përmbajtja ndihmëse. Për ta mbyllur dialogun shtyp ESC.",legend:[{name:"Të përgjithshme",items:[{name:"Shiriti i Redaktuesit",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Dialogu i Redaktuesit",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Komandat",items:[{name:"Rikthe komandën",legend:"Shtyp ${undo}"},{name:"Ribëj komandën",legend:"Shtyp ${redo}"},{name:"Komanda e trashjes së tekstit",legend:"Shtyp ${bold}"},{name:"Komanda kursive",legend:"Shtyp ${italic}"},
 {name:"Komanda e nënvijëzimit",legend:"Shtyp ${underline}"},{name:"Komanda e Nyjes",legend:"Shtyp ${link}"},{name:" Toolbar Collapse command",legend:"Shtyp ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:"Ndihmë Qasjeje",legend:"Shtyp ${a11yHelp}"}]}],backspace:"Prapa",tab:"Fletë",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Shenja majtas",upArrow:"Shenja sipër",rightArrow:"Shenja djathtas",downArrow:"Shenja poshtë",insert:"Shto","delete":"Grise",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Shto",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Presje",dash:"vizë",period:"Pikë",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Hape kllapën",backSlash:"Backslash",closeBracket:"Mbylle kllapën",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Ndihmë Qasjeje",legend:"Shtyp ${a11yHelp}"}]}],tab:"Fletë",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Shenja majtas",upArrow:"Shenja sipër",rightArrow:"Shenja djathtas",downArrow:"Shenja poshtë",insert:"Shto",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Shto",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Presje",dash:"vizë",period:"Pikë",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Hape kllapën",backSlash:"Backslash",closeBracket:"Mbylle kllapën",
+singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
index ee71b676c63..da29ebdfbe3 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sr-latn",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Opšte",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
index fd04d223c7c..02ebb1c359e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sr",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Опште",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
index 751a0751f10..720193fb832 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sv",{title:"Hjälpmedelsinstruktioner",contents:"Hjälpinnehåll. För att stänga denna dialogruta trycker du på ESC.",legend:[{name:"Allmänt",items:[{name:"Editor verktygsfält",legend:"Tryck på ${toolbarFocus} för att navigera till verktygsfältet. Flytta till nästa och föregående verktygsfältsgrupp med TAB och SHIFT+TAB. Flytta till nästa och föregående knapp i verktygsfältet med HÖGERPIL eller VÄNSTERPIL. Tryck SPACE eller ENTER för att aktivera knappen i verktygsfältet."},
 {name:"Dialogeditor",legend:"Inuti en dialogruta, tryck TAB för att navigera till nästa fält i dialogrutan, tryck SKIFT+TAB för att flytta till föregående fält, tryck ENTER för att skicka. Du avbryter och stänger dialogen med ESC. För dialogrutor som har flera flikar, tryck ALT+F10 eller TAB för att navigera till fliklistan. med fliklistan vald flytta till nästa och föregående flik med HÖGER- eller VÄNSTERPIL."},{name:"Editor för innehållsmeny",legend:"Tryck på $ {contextMenu} eller PROGRAMTANGENTEN för att öppna snabbmenyn. Flytta sedan till nästa menyalternativ med TAB eller NEDPIL. Flytta till föregående alternativ med SHIFT + TABB eller UPPIL. Tryck Space eller ENTER för att välja menyalternativ. Öppna undermeny av nuvarande alternativ med SPACE eller ENTER eller HÖGERPIL. Gå tillbaka till överordnade menyalternativ med ESC eller VÄNSTERPIL. Stäng snabbmenyn med ESC."},
 {name:"Editor för list-box",legend:"Inuti en list-box, gå till nästa listobjekt med TAB eller NEDPIL. Flytta till föregående listobjekt med SHIFT+TAB eller UPPIL. Tryck SPACE eller ENTER för att välja listan alternativet. Tryck ESC för att stänga list-boxen."},{name:"Editor för elementens sökväg",legend:"Tryck på ${elementsPathFocus} för att navigera till verktygsfältet för elementens sökvägar. Flytta till nästa elementknapp med TAB eller HÖGERPIL. Flytta till föregående knapp med SKIFT+TAB eller VÄNSTERPIL. Tryck SPACE eller ENTER för att välja element i redigeraren."}]},
 {name:"Kommandon",items:[{name:"Ångra kommando",legend:"Tryck på ${undo}"},{name:"Gör om kommando",legend:"Tryck på ${redo}"},{name:"Kommandot fet stil",legend:"Tryck på ${bold}"},{name:"Kommandot kursiv",legend:"Tryck på ${italic}"},{name:"Kommandot understruken",legend:"Tryck på ${underline}"},{name:"Kommandot länk",legend:"Tryck på ${link}"},{name:"Verktygsfält Dölj kommandot",legend:"Tryck på ${toolbarCollapse}"},{name:"Gå till föregående fokus plats",legend:"Tryck på ${accessPreviousSpace} för att gå till närmast onåbara utrymme före markören, exempel: två intilliggande HR element. Repetera tangentkombinationen för att gå till nästa."},
-{name:"Tillgå nästa fokuskommandots utrymme",legend:"Tryck ${accessNextSpace} på för att komma åt den närmaste onåbar fokus utrymme efter cirkumflex, till exempel: två intilliggande HR element. Upprepa tangentkombinationen för att nå avlägsna fokus utrymmen."},{name:"Hjälp om tillgänglighet",legend:"Tryck ${a11yHelp}"}]}],backspace:"Backsteg",tab:"Tab",enter:"Retur",shift:"Skift",ctrl:"Ctrl",alt:"Alt",pause:"Paus",capslock:"Caps lock",escape:"Escape",pageUp:"Sida Up",pageDown:"Sida Ned",end:"Slut",
-home:"Hem",leftArrow:"Vänsterpil",upArrow:"Uppil",rightArrow:"Högerpil",downArrow:"Nedåtpil",insert:"Infoga","delete":"Radera",leftWindowKey:"Vänster Windowstangent",rightWindowKey:"Höger Windowstangent",selectKey:"Välj tangent",numpad0:"Nummer 0",numpad1:"Nummer 1",numpad2:"Nummer 2",numpad3:"Nummer 3",numpad4:"Nummer 4",numpad5:"Nummer 5",numpad6:"Nummer 6",numpad7:"Nummer 7",numpad8:"Nummer 8",numpad9:"Nummer 9",multiply:"Multiplicera",add:"Addera",subtract:"Minus",decimalPoint:"Decimalpunkt",
-divide:"Dividera",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Lika med tecken",comma:"Komma",dash:"Minus",period:"Punkt",forwardSlash:"Snedstreck framåt",graveAccent:"Accent",openBracket:"Öppningsparentes",backSlash:"Snedstreck bakåt",closeBracket:"Slutparentes",singleQuote:"Enkelt Citattecken"});
\ No newline at end of file
+{name:"Tillgå nästa fokuskommandots utrymme",legend:"Tryck ${accessNextSpace} på för att komma åt den närmaste onåbar fokus utrymme efter cirkumflex, till exempel: två intilliggande HR element. Upprepa tangentkombinationen för att nå avlägsna fokus utrymmen."},{name:"Hjälp om tillgänglighet",legend:"Tryck ${a11yHelp}"}]}],tab:"Tab",pause:"Paus",capslock:"Caps lock",escape:"Escape",pageUp:"Sida Up",pageDown:"Sida Ned",leftArrow:"Vänsterpil",upArrow:"Uppil",rightArrow:"Högerpil",downArrow:"Nedåtpil",
+insert:"Infoga",leftWindowKey:"Vänster Windowstangent",rightWindowKey:"Höger Windowstangent",selectKey:"Välj tangent",numpad0:"Nummer 0",numpad1:"Nummer 1",numpad2:"Nummer 2",numpad3:"Nummer 3",numpad4:"Nummer 4",numpad5:"Nummer 5",numpad6:"Nummer 6",numpad7:"Nummer 7",numpad8:"Nummer 8",numpad9:"Nummer 9",multiply:"Multiplicera",add:"Addera",subtract:"Minus",decimalPoint:"Decimalpunkt",divide:"Dividera",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",
+numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Lika med tecken",comma:"Komma",dash:"Minus",period:"Punkt",forwardSlash:"Snedstreck framåt",graveAccent:"Accent",openBracket:"Öppningsparentes",backSlash:"Snedstreck bakåt",closeBracket:"Slutparentes",singleQuote:"Enkelt Citattecken"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
index 2499b992fbc..a61d6cf7ba0 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","th",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"ทั่วไป",items:[{name:"แถบเครื่องมือสำหรับเครื่องมือช่วยพิมพ์",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"คำสั่ง",items:[{name:"เลิกทำคำสั่ง",legend:"วาง ${undo}"},{name:"คำสั่งสำหรับทำซ้ำ",legend:"วาง ${redo}"},{name:"คำสั่งสำหรับตัวหนา",legend:"วาง ${bold}"},{name:"คำสั่งสำหรับตัวเอียง",legend:"วาง ${italic}"},{name:"คำสั่งสำหรับขีดเส้นใต้",
 legend:"วาง ${underline}"},{name:"คำสั่งสำหรับลิงก์",legend:"วาง ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
index 1eb46ce3988..87769c2c2a5 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","tr",{title:"Erişilebilirlik Talimatları",contents:"Yardım içeriği. Bu pencereyi kapatmak için ESC tuşuna basın.",legend:[{name:"Genel",items:[{name:"Düzenleyici Araç Çubuğu",legend:"Araç çubuğunda gezinmek için ${toolbarFocus} basın. TAB ve SHIFT+TAB ile önceki ve sonraki araç çubuğu grubuna taşıyın. SAĞ OK veya SOL OK ile önceki ve sonraki bir araç çubuğu düğmesini hareket ettirin. SPACE tuşuna basın veya araç çubuğu düğmesini etkinleştirmek için ENTER tuşna basın."},
@@ -7,6 +7,6 @@ CKEDITOR.plugins.setLang("a11yhelp","tr",{title:"Erişilebilirlik Talimatları",
 {name:"İçerik Menü Editörü",legend:"İçerik menüsünü açmak için ${contextMenu} veya UYGULAMA TUŞU'na basın. Daha sonra SEKME veya AŞAĞI OK ile bir sonraki menü seçeneği taşıyın. SHIFT + TAB veya YUKARI OK ile önceki seçeneğe gider. Menü seçeneğini seçmek için SPACE veya ENTER tuşuna basın. Seçili seçeneğin alt menüsünü SPACE ya da ENTER veya SAĞ OK açın. Üst menü öğesini geçmek için ESC veya SOL OK ile geri dönün. ESC ile bağlam menüsünü kapatın."},{name:"Liste Kutusu Editörü",legend:"Liste kutusu içinde, bir sonraki liste öğesine SEKME VEYA AŞAĞI OK ile taşıyın. SHIFT+TAB veya YUKARI önceki liste öğesi taşıyın. Liste seçeneği seçmek için SPACE veya ENTER tuşuna basın. Liste kutusunu kapatmak için ESC tuşuna basın."},
 {name:"Element Yol Çubuğu Editörü",legend:"Elementlerin yol çubuğunda gezinmek için ${ElementsPathFocus} basın. SEKME veya SAĞ OK ile sonraki element düğmesine taşıyın. SHIFT+TAB veya SOL OK önceki düğmeye hareket ettirin. Editör içindeki elementi seçmek için ENTER veya SPACE tuşuna basın."}]},{name:"Komutlar",items:[{name:"Komutu geri al",legend:"$(undo)'ya basın"},{name:"Komutu geri al",legend:"${redo} basın"},{name:" Kalın komut",legend:"${bold} basın"},{name:" İtalik komutu",legend:"${italic} basın"},
 {name:" Alttan çizgi komutu",legend:"${underline} basın"},{name:" Bağlantı komutu",legend:"${link} basın"},{name:" Araç çubuğu Toplama komutu",legend:"${toolbarCollapse} basın"},{name:"Önceki komut alanına odaklan",legend:"Düzeltme imleçinden önce, en yakın uzaktaki alana erişmek için ${accessPreviousSpace} basın, örneğin: iki birleşik HR elementleri. Aynı tuş kombinasyonu tekrarıyla diğer alanlarada ulaşın."},{name:"Sonraki komut alanına odaklan",legend:"Düzeltme imleçinden sonra, en yakın uzaktaki alana erişmek için ${accessNextSpace} basın, örneğin: iki birleşik HR elementleri. Aynı tuş kombinasyonu tekrarıyla diğer alanlarada ulaşın."},
-{name:"Erişilebilirlik Yardımı",legend:"${a11yHelp}'e basın"}]}],backspace:"Silme",tab:"Sekme tuşu",enter:"Gir tuşu",shift:'"Shift" Kaydırma tuşu',ctrl:'"Ctrl" Kontrol tuşu',alt:'"Alt" Anahtar tuşu',pause:"Durdurma tuşu",capslock:"Büyük harf tuşu",escape:"Vazgeç tuşu",pageUp:"Sayfa Yukarı",pageDown:"Sayfa Aşağı",end:"Sona",home:"En başa",leftArrow:"Sol ok",upArrow:"Yukarı ok",rightArrow:"Sağ ok",downArrow:"Aşağı ok",insert:"Araya gir","delete":"Silme",leftWindowKey:"Sol windows tuşu",rightWindowKey:"Sağ windows tuşu",
-selectKey:"Seçme tuşu",numpad0:"Nümerik 0",numpad1:"Nümerik 1",numpad2:"Nümerik 2",numpad3:"Nümerik 3",numpad4:"Nümerik 4",numpad5:"Nümerik 5",numpad6:"Nümerik 6",numpad7:"Nümerik 7",numpad8:"Nümerik 8",numpad9:"Nümerik 9",multiply:"Çarpma",add:"Toplama",subtract:"Çıkarma",decimalPoint:"Ondalık işareti",divide:"Bölme",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lk",scrollLock:"Scr Lk",semiColon:"Noktalı virgül",equalSign:"Eşittir",
-comma:"Virgül",dash:"Eksi",period:"Nokta",forwardSlash:"İleri eğik çizgi",graveAccent:"Üst tırnak",openBracket:"Parantez aç",backSlash:"Ters eğik çizgi",closeBracket:"Parantez kapa",singleQuote:"Tek tırnak"});
\ No newline at end of file
+{name:"Erişilebilirlik Yardımı",legend:"${a11yHelp}'e basın"}]}],tab:"Sekme tuşu",pause:"Durdurma tuşu",capslock:"Büyük harf tuşu",escape:"Vazgeç tuşu",pageUp:"Sayfa Yukarı",pageDown:"Sayfa Aşağı",leftArrow:"Sol ok",upArrow:"Yukarı ok",rightArrow:"Sağ ok",downArrow:"Aşağı ok",insert:"Araya gir",leftWindowKey:"Sol windows tuşu",rightWindowKey:"Sağ windows tuşu",selectKey:"Seçme tuşu",numpad0:"Nümerik 0",numpad1:"Nümerik 1",numpad2:"Nümerik 2",numpad3:"Nümerik 3",numpad4:"Nümerik 4",numpad5:"Nümerik 5",
+numpad6:"Nümerik 6",numpad7:"Nümerik 7",numpad8:"Nümerik 8",numpad9:"Nümerik 9",multiply:"Çarpma",add:"Toplama",subtract:"Çıkarma",decimalPoint:"Ondalık işareti",divide:"Bölme",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lk",scrollLock:"Scr Lk",semiColon:"Noktalı virgül",equalSign:"Eşittir",comma:"Virgül",dash:"Eksi",period:"Nokta",forwardSlash:"İleri eğik çizgi",graveAccent:"Üst tırnak",openBracket:"Parantez aç",backSlash:"Ters eğik çizgi",
+closeBracket:"Parantez kapa",singleQuote:"Tek tırnak"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
index 40d8b283355..665dd37caa5 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","tt",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Гомуми",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Командалар",items:[{name:"Кайтару",legend:"${undo} басыгыз"},{name:"Кабатлау",legend:"${redo} басыгыз"},{name:"Калын",legend:"${bold} басыгыз"},{name:"Курсив",legend:"${italic} басыгыз"},{name:"Астына сызылган",legend:"${underline} басыгыз"},
 {name:"Сылталама",legend:"${link} басыгыз"},{name:" Toolbar Collapse command",legend:"${toolbarCollapse} басыгыз"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"${a11yHelp} басыгыз"}]}],backspace:"Кайтару",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Тыныш",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Сул якка ук",upArrow:"Өскә таба ук",rightArrow:"Уң якка ук",downArrow:"Аска таба ук",insert:"Өстәү","delete":"Бетерү",leftWindowKey:"Сул Windows төймəсе",rightWindowKey:"Уң Windows төймəсе",selectKey:"Select төймəсе",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Тапкырлау",add:"Кушу",subtract:"Алу",decimalPoint:"Унарлы нокта",divide:"Бүлү",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Нокталы өтер",equalSign:"Тигезлек билгесе",comma:"Өтер",dash:"Сызык",period:"Дәрәҗә",forwardSlash:"Кыек сызык",
-graveAccent:"Гравис",openBracket:"Җәя ачу",backSlash:"Кире кыек сызык",closeBracket:"Җәя ябу",singleQuote:"Бер иңле куштырнаклар"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"${a11yHelp} басыгыз"}]}],tab:"Tab",pause:"Тыныш",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Сул якка ук",upArrow:"Өскә таба ук",rightArrow:"Уң якка ук",downArrow:"Аска таба ук",insert:"Өстәү",leftWindowKey:"Сул Windows төймəсе",rightWindowKey:"Уң Windows төймəсе",selectKey:"Select төймəсе",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",
+numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Тапкырлау",add:"Кушу",subtract:"Алу",decimalPoint:"Унарлы нокта",divide:"Бүлү",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Нокталы өтер",equalSign:"Тигезлек билгесе",comma:"Өтер",dash:"Сызык",period:"Дәрәҗә",forwardSlash:"Кыек сызык",graveAccent:"Гравис",openBracket:"Җәя ачу",backSlash:"Кире кыек сызык",closeBracket:"Җәя ябу",
+singleQuote:"Бер иңле куштырнаклар"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
index c7fe6fd2be3..fb74e518cad 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
@@ -1,12 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ug",{title:"قوشۇمچە چۈشەندۈرۈش",contents:"ياردەم مەزمۇنى. بۇ سۆزلەشكۈنى ياپماقچى بولسىڭىز ESC نى بېسىڭ.",legend:[{name:"ئادەتتىكى",items:[{name:"قورال بالداق تەھرىر",legend:"${toolbarFocus} بېسىلسا قورال بالداققا يېتەكلەيدۇ، TAB ياكى SHIFT+TAB ئارقىلىق قورال بالداق گۇرۇپپىسى تاللىنىدۇ، ئوڭ سول يا ئوقتا توپچا تاللىنىدۇ، بوشلۇق ياكى Enter كۇنۇپكىسىدا تاللانغان توپچىنى قوللىنىدۇ."},{name:"تەھرىرلىگۈچ سۆزلەشكۈسى",legend:"سۆزلەشكۈدە TAB كۇنۇپكىسىدا كېيىنكى سۆز بۆلىكىگە يۆتكىلىدۇ، SHIFT+TAB بىرىكمە كۇنۇپكىسىدا ئالدىنقى سۆز بۆلىكىگە يۆتكىلىدۇ، ENTER كۇنۇپكىسىدا سۆزلەشكۈنى تاپشۇرىدۇ، ESC كۇنۇپكىسى سۆزلەشكۈدىن ۋاز كېچىدۇ. كۆپ بەتكۈچلۈك سۆزلەشكۈگە نىسبەتەن، ALT+F10 دا بەتكۈچ تىزىمىغا يۆتكەيدۇ. ئاندىن TAB كۇنۇپكىسى ياكى ئوڭ يا ئوق كۇنۇپكىسى كېيىنكى بەتكۈچكە يۆتكەيدۇ؛SHIFT+ TAB كۇنۇپكىسى ياكى سول يا ئوق كۇنۇپكىسى ئالدىنقى بەتكۈچكە يۆتكەيدۇ. بوشلۇق كۇنۇپكىسى ياكى ENTER كۇنۇپكىسى بەتكۈچنى تاللايدۇ."},
 {name:"تەھرىرلىگۈچ تىل مۇھىت تىزىملىكى",legend:"${contextMenu} ياكى ئەپ كۇنۇپكىسىدا تىل مۇھىت تىزىملىكىنى ئاچىدۇ. ئاندىن TAB ياكى ئاستى يا ئوق كۇنۇپكىسىدا كېيىنكى تىزىملىك تۈرىگە يۆتكەيدۇ؛ SHIFT+TAB ياكى ئۈستى يا ئوق كۇنۇپكىسىدا ئالدىنقى تىزىملىك تۈرىگە يۆتكەيدۇ. بوشلۇق ياكى ENTER كۇنۇپكىسىدا تىزىملىك تۈرىنى تاللايدۇ. بوشلۇق، ENTER ياكى ئوڭ يا ئوق كۇنۇپكىسىدا تارماق تىزىملىكنى ئاچىدۇ. قايتىش تىزىملىكىگە ESC ياكى سول يا ئوق كۇنۇپكىسى ئىشلىتىلىدۇ. ESC كۇنۇپكىسىدا تىل مۇھىت تىزىملىكى تاقىلىدۇ."},{name:"تەھرىرلىگۈچ تىزىمى",
 legend:"تىزىم قۇتىسىدا، كېيىنكى تىزىم تۈرىگە يۆتكەشتە TAB ياكى ئاستى يا ئوق كۇنۇپكىسى ئىشلىتىلىدۇ. ئالدىنقى تىزىم تۈرىگە يۆتكەشتە SHIFT+TAB ياكى ئۈستى يا ئوق كۇنۇپكىسى ئىشلىتىلىدۇ. بوشلۇق ياكى ENTER كۇنۇپكىسىدا تىزىم تۈرىنى تاللايدۇ.ESC كۇنۇپكىسىدا تىزىم قۇتىسىنى يىغىدۇ."},{name:"تەھرىرلىگۈچ ئېلېمېنت يول بالداق",legend:"${elementsPathFocus} بېسىلسا ئېلېمېنت يول بالداققا يېتەكلەيدۇ، TAB ياكى ئوڭ يا ئوقتا كېيىنكى ئېلېمېنت تاللىنىدۇ، SHIFT+TAB ياكى سول يا ئوقتا ئالدىنقى ئېلېمېنت تاللىنىدۇ، بوشلۇق ياكى Enter كۇنۇپكىسىدا تەھرىرلىگۈچتىكى ئېلېمېنت تاللىنىدۇ."}]},
 {name:"بۇيرۇق",items:[{name:"بۇيرۇقتىن يېنىۋال",legend:"${undo} نى بېسىڭ"},{name:"قايتىلاش بۇيرۇقى",legend:"${redo} نى بېسىڭ"},{name:"توملىتىش بۇيرۇقى",legend:"${bold} نى بېسىڭ"},{name:"يانتۇ بۇيرۇقى",legend:"${italic} نى بېسىڭ"},{name:"ئاستى سىزىق بۇيرۇقى",legend:"${underline} نى بېسىڭ"},{name:"ئۇلانما بۇيرۇقى",legend:"${link} نى بېسىڭ"},{name:"قورال بالداق قاتلاش بۇيرۇقى",legend:"${toolbarCollapse} نى بېسىڭ"},{name:"ئالدىنقى فوكۇس نۇقتىسىنى زىيارەت قىلىدىغان بۇيرۇق",legend:"${accessPreviousSpace} بېسىپ ^ بەلگىسىگە ئەڭ يېقىن زىيارەت قىلغىلى بولمايدىغان فوكۇس نۇقتا رايونىنىڭ ئالدىنى زىيارەت قىلىدۇ، مەسىلەن: ئۆز ئارا قوشنا ئىككى HR ئېلېمېنت. بۇ بىرىكمە كۇنۇپكا تەكرارلانسا يىراقتىكى فوكۇس نۇقتا رايونىغا يەتكىلى بولىدۇ."},
-{name:"كېيىنكى فوكۇس نۇقتىسىنى زىيارەت قىلىدىغان بۇيرۇق",legend:"${accessNextSpace} بېسىپ ^ بەلگىسىگە ئەڭ يېقىن زىيارەت قىلغىلى بولمايدىغان فوكۇس نۇقتا رايونىنىڭ كەينىنى زىيارەت قىلىدۇ، مەسىلەن: ئۆز ئارا قوشنا ئىككى HR ئېلېمېنت. بۇ بىرىكمە كۇنۇپكا تەكرارلانسا يىراقتىكى فوكۇس نۇقتا رايونىغا يەتكىلى بولىدۇ."},{name:"توسالغۇسىز لايىھە چۈشەندۈرۈشى",legend:"${a11yHelp} نى بېسىڭ"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",
-pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"سول يا ئوق",upArrow:"ئۈستى يا ئوق",rightArrow:"ئوڭ يا ئوق",downArrow:"ئاستى يا ئوق",insert:"قىستۇر","delete":"ئۆچۈر",leftWindowKey:"سول Windows كۇنۇپكىسى",rightWindowKey:"ئوڭ Windows كۇنۇپكىسى",selectKey:"تاللاش كۇنۇپكىسى",numpad0:"سان تاختا 0",numpad1:"سان تاختا 1",numpad2:"سان تاختا 2",numpad3:"سان تاختا 3",numpad4:"سان تاختا 4",numpad5:"سان تاختا 5",numpad6:"سان تاختا 6",numpad7:"سان تاختا 7",numpad8:"سان تاختا 8",numpad9:"سان تاختا 9",
-multiply:"يۇلتۇز كۇنۇپكىسى",add:"قوشۇش",subtract:"ئېلىش",decimalPoint:"كەسىر چېكىت",divide:"بۆلۈش",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"سان قۇلۇپ كۇنۇپكىسى",scrollLock:"سۈرگۈچ قۇلۇپ كۇنۇپكىسى",semiColon:"چېكىتلىك پەش",equalSign:"تەڭلىك بەلگىسى",comma:"پەش",dash:"سىزىقچە",period:"چېكىت",forwardSlash:"سولغا يانتۇ سىزىق",graveAccent:"ئۇرغۇ بەلگىسى",openBracket:"ئېچىلغان تىرناق",backSlash:"ئوڭغا يانتۇ سىزىق",closeBracket:"يېپىلغان تىرناق",
-singleQuote:"يالاڭ پەش"});
\ No newline at end of file
+{name:"كېيىنكى فوكۇس نۇقتىسىنى زىيارەت قىلىدىغان بۇيرۇق",legend:"${accessNextSpace} بېسىپ ^ بەلگىسىگە ئەڭ يېقىن زىيارەت قىلغىلى بولمايدىغان فوكۇس نۇقتا رايونىنىڭ كەينىنى زىيارەت قىلىدۇ، مەسىلەن: ئۆز ئارا قوشنا ئىككى HR ئېلېمېنت. بۇ بىرىكمە كۇنۇپكا تەكرارلانسا يىراقتىكى فوكۇس نۇقتا رايونىغا يەتكىلى بولىدۇ."},{name:"توسالغۇسىز لايىھە چۈشەندۈرۈشى",legend:"${a11yHelp} نى بېسىڭ"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"سول يا ئوق",
+upArrow:"ئۈستى يا ئوق",rightArrow:"ئوڭ يا ئوق",downArrow:"ئاستى يا ئوق",insert:"قىستۇر",leftWindowKey:"سول Windows كۇنۇپكىسى",rightWindowKey:"ئوڭ Windows كۇنۇپكىسى",selectKey:"تاللاش كۇنۇپكىسى",numpad0:"سان تاختا 0",numpad1:"سان تاختا 1",numpad2:"سان تاختا 2",numpad3:"سان تاختا 3",numpad4:"سان تاختا 4",numpad5:"سان تاختا 5",numpad6:"سان تاختا 6",numpad7:"سان تاختا 7",numpad8:"سان تاختا 8",numpad9:"سان تاختا 9",multiply:"يۇلتۇز كۇنۇپكىسى",add:"قوشۇش",subtract:"ئېلىش",decimalPoint:"كەسىر چېكىت",divide:"بۆلۈش",
+f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"سان قۇلۇپ كۇنۇپكىسى",scrollLock:"سۈرگۈچ قۇلۇپ كۇنۇپكىسى",semiColon:"چېكىتلىك پەش",equalSign:"تەڭلىك بەلگىسى",comma:"پەش",dash:"سىزىقچە",period:"چېكىت",forwardSlash:"سولغا يانتۇ سىزىق",graveAccent:"ئۇرغۇ بەلگىسى",openBracket:"ئېچىلغان تىرناق",backSlash:"ئوڭغا يانتۇ سىزىق",closeBracket:"يېپىلغان تىرناق",singleQuote:"يالاڭ پەش"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
index c7aac2bf554..4aff22c8c88 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","uk",{title:"Спеціальні Інструкції",contents:"Довідка. Натисніть ESC і вона зникне.",legend:[{name:"Основне",items:[{name:"Панель Редактора",legend:"Натисніть ${toolbarFocus} для переходу до панелі інструментів. Для переміщення між групами панелі інструментів використовуйте TAB і SHIFT+TAB. Для переміщення між кнопками панелі іструментів використовуйте кнопки СТРІЛКА ВПРАВО або ВЛІВО. Натисніть ПРОПУСК або ENTER для запуску кнопки панелі інструментів."},{name:"Діалог Редактора",
@@ -7,6 +7,6 @@ legend:'Усередині діалогу, натисніть TAB щоб пер
 {name:"Контекстне Меню Редактора",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Потім перейдіть до наступного пункту меню за допомогою TAB або СТРІЛКИ ВНИЗ. Натисніть ПРОПУСК або ENTER для вибору параметру меню. Відкрийте підменю поточного параметру, натиснувши ПРОПУСК або ENTER або СТРІЛКУ ВПРАВО. Перейдіть до батьківського елемента меню, натиснувши ESC або СТРІЛКУ ВЛІВО. Закрийте контекстне меню, натиснувши ESC."},{name:"Скринька Списків Редактора",legend:"Усередині списку, перехід до наступного пункту списку виконується клавішею TAB або СТРІЛКА ВНИЗ. Перехід до попереднього елемента списку клавішею SHIFT+TAB або СТРІЛКА ВГОРУ. Натисніть ПРОПУСК або ENTER, щоб вибрати параметр списку. Натисніть клавішу ESC, щоб закрити список."},
 {name:"Шлях до елемента редактора",legend:"Натисніть ${elementsPathFocus} для навігації між елементами панелі. Перейдіть до наступного елемента кнопкою TAB або СТРІЛКА ВПРАВО. Перейдіть до попереднього елемента кнопкою SHIFT+TAB або СТРІЛКА ВЛІВО. Натисніть ПРОПУСК або ENTER для вибору елемента в редакторі."}]},{name:"Команди",items:[{name:"Відмінити команду",legend:"Натисніть ${undo}"},{name:"Повторити",legend:"Натисніть ${redo}"},{name:"Жирний",legend:"Натисніть ${bold}"},{name:"Курсив",legend:"Натисніть ${italic}"},
 {name:"Підкреслений",legend:"Натисніть ${underline}"},{name:"Посилання",legend:"Натисніть ${link}"},{name:"Згорнути панель інструментів",legend:"Натисніть ${toolbarCollapse}"},{name:"Доступ до попереднього місця фокусування",legend:"Натисніть ${accessNextSpace} для доступу до найближчої недосяжної області фокусування перед кареткою, наприклад: два сусідні елементи HR. Повторіть комбінацію клавіш для досягнення віддалених областей фокусування."},{name:"Доступ до наступного місця фокусування",legend:"Натисніть ${accessNextSpace} для доступу до найближчої недосяжної області фокусування після каретки, наприклад: два сусідні елементи HR. Повторіть комбінацію клавіш для досягнення віддалених областей фокусування."},
-{name:"Допомога з доступності",legend:"Натисніть ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Ліва стрілка",upArrow:"Стрілка вгору",rightArrow:"Права стрілка",downArrow:"Стрілка вниз",insert:"Вставити","delete":"Видалити",leftWindowKey:"Ліва клавіша Windows",rightWindowKey:"Права клавіша Windows",selectKey:"Виберіть клавішу",numpad0:"Numpad 0",
-numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Множення",add:"Додати",subtract:"Віднімання",decimalPoint:"Десяткова кома",divide:"Ділення",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Крапка з комою",equalSign:"Знак рівності",comma:"Кома",dash:"Тире",period:"Період",
-forwardSlash:"Коса риска",graveAccent:"Гравіс",openBracket:"Відкрити дужку",backSlash:"Зворотна коса риска",closeBracket:"Закрити дужку",singleQuote:"Одинарні лапки"});
\ No newline at end of file
+{name:"Допомога з доступності",legend:"Натисніть ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Ліва стрілка",upArrow:"Стрілка вгору",rightArrow:"Права стрілка",downArrow:"Стрілка вниз",insert:"Вставити",leftWindowKey:"Ліва клавіша Windows",rightWindowKey:"Права клавіша Windows",selectKey:"Виберіть клавішу",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",
+numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Множення",add:"Додати",subtract:"Віднімання",decimalPoint:"Десяткова кома",divide:"Ділення",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Крапка з комою",equalSign:"Знак рівності",comma:"Кома",dash:"Тире",period:"Період",forwardSlash:"Коса риска",graveAccent:"Гравіс",openBracket:"Відкрити дужку",backSlash:"Зворотна коса риска",
+closeBracket:"Закрити дужку",singleQuote:"Одинарні лапки"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
index 18ba88260c6..616286be5b5 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","vi",{title:"Hướng dẫn trợ năng",contents:"Nội dung Hỗ trợ. Nhấn ESC để đóng hộp thoại.",legend:[{name:"Chung",items:[{name:"Thanh công cụ soạn thảo",legend:"Nhấn ${toolbarFocus} để điều hướng đến thanh công cụ. Nhấn TAB và SHIFT+TAB để chuyển đến nhóm thanh công cụ khác. Nhấn MŨI TÊN PHẢI hoặc MŨI TÊN TRÁI để chuyển sang nút khác trên thanh công cụ. Nhấn PHÍM CÁCH hoặc ENTER để kích hoạt nút trên thanh công cụ."},{name:"Hộp thoại Biên t",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Trình đơn Ngữ cảnh cBộ soạn thảo",legend:"Nhấn ${contextMenu} hoặc PHÍM ỨNG DỤNG để mở thực đơn ngữ cảnh. Sau đó nhấn TAB hoặc MŨI TÊN XUỐNG để di chuyển đến tuỳ chọn tiếp theo của thực đơn. Nhấn SHIFT+TAB hoặc MŨI TÊN LÊN để quay lại tuỳ chọn trước. Nhấn DẤU CÁCH hoặc ENTER để chọn tuỳ chọn của thực đơn. Nhấn DẤU CÁCH hoặc ENTER hoặc MŨI TÊN SANG PHẢI để mở thực đơn con của tuỳ chọn hiện tại. Nhấn ESC hoặc MŨI TÊN SANG TRÁI để quay trở lại thực đơn gốc. Nhấn ESC để đóng thực đơn ngữ cảnh."},
 {name:"Hộp danh sách trình biên tập",legend:"Trong một danh sách chọn, di chuyển đối tượng tiếp theo với phím TAB hoặc phím mũi tên hướng xuống. Di chuyển đến đối tượng trước đó bằng cách nhấn tổ hợp phím SHIFT+TAB hoặc mũi tên hướng lên. Phím khoảng cách hoặc phím ENTER để chọn các tùy chọn trong danh sách. Nhấn phím ESC để đóng lại danh sách chọn."},{name:"Thanh đường dẫn các đối tượng",legend:"Nhấn ${elementsPathFocus} để điều hướng các đối tượng trong thanh đường dẫn. Di chuyển đến đối tượng tiếp theo bằng phím TAB hoặc phím mũi tên bên phải. Di chuyển đến đối tượng trước đó bằng tổ hợp phím SHIFT+TAB hoặc phím mũi tên bên trái. Nhấn phím khoảng cách hoặc ENTER để chọn đối tượng trong trình soạn thảo."}]},
 {name:"Lệnh",items:[{name:"Làm lại lện",legend:"Ấn ${undo}"},{name:"Làm lại lệnh",legend:"Ấn ${redo}"},{name:"Lệnh in đậm",legend:"Ấn ${bold}"},{name:"Lệnh in nghiêng",legend:"Ấn ${italic}"},{name:"Lệnh gạch dưới",legend:"Ấn ${underline}"},{name:"Lệnh liên kết",legend:"Nhấn ${link}"},{name:"Lệnh hiển thị thanh công cụ",legend:"Nhấn${toolbarCollapse}"},{name:"Truy cập đến lệnh tập trung vào khoảng cách trước đó",legend:"Ấn ${accessPreviousSpace} để truy cập đến phần tập trung khoảng cách sau phần còn sót lại của khoảng cách gần nhất vốn không tác động đến được , thí dụ: hai yếu tố điều chỉnh HR. Lặp lại các phím kết họep này để vươn đến phần khoảng cách."},
-{name:"Truy cập phần đối tượng lệnh khoảng trống",legend:"Ấn ${accessNextSpace} để truy cập đến phần tập trung khoảng cách sau phần còn sót lại của khoảng cách gần nhất vốn không tác động đến được , thí dụ: hai yếu tố điều chỉnh HR. Lặp lại các phím kết họep này để vươn đến phần khoảng cách."},{name:"Trợ giúp liên quan",legend:"Nhấn ${a11yHelp}"}]}],backspace:"Phím Backspace",tab:"Phím Tab",enter:"Phím Tab",shift:"Phím Shift",ctrl:"Phím Ctrl",alt:"Phím Alt",pause:"Phím Pause",capslock:"Phím Caps Lock",
-escape:"Phím Escape",pageUp:"Phím Page Up",pageDown:"Phím Page Down",end:"Phím End",home:"Phím Home",leftArrow:"Phím Left Arrow",upArrow:"Phím Up Arrow",rightArrow:"Phím Right Arrow",downArrow:"Phím Down Arrow",insert:"Chèn","delete":"Xóa",leftWindowKey:"Phím Left Windows",rightWindowKey:"Phím Right Windows ",selectKey:"Chọn phím",numpad0:"Phím 0",numpad1:"Phím 1",numpad2:"Phím 2",numpad3:"Phím 3",numpad4:"Phím 4",numpad5:"Phím 5",numpad6:"Phím 6",numpad7:"Phím 7",numpad8:"Phím 8",numpad9:"Phím 9",
-multiply:"Nhân",add:"Thêm",subtract:"Trừ",decimalPoint:"Điểm số thập phân",divide:"Chia",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Dấu chấm phẩy",equalSign:"Đăng nhập bằng",comma:"Dấu phẩy",dash:"Dấu gạch ngang",period:"Phím .",forwardSlash:"Phím /",graveAccent:"Phím `",openBracket:"Open Bracket",backSlash:"Dấu gạch chéo ngược",closeBracket:"Gần giá đỡ",singleQuote:"Trích dẫn"});
\ No newline at end of file
+{name:"Truy cập phần đối tượng lệnh khoảng trống",legend:"Ấn ${accessNextSpace} để truy cập đến phần tập trung khoảng cách sau phần còn sót lại của khoảng cách gần nhất vốn không tác động đến được , thí dụ: hai yếu tố điều chỉnh HR. Lặp lại các phím kết họep này để vươn đến phần khoảng cách."},{name:"Trợ giúp liên quan",legend:"Nhấn ${a11yHelp}"}]}],tab:"Phím Tab",pause:"Phím Pause",capslock:"Phím Caps Lock",escape:"Phím Escape",pageUp:"Phím Page Up",pageDown:"Phím Page Down",leftArrow:"Phím Left Arrow",
+upArrow:"Phím Up Arrow",rightArrow:"Phím Right Arrow",downArrow:"Phím Down Arrow",insert:"Chèn",leftWindowKey:"Phím Left Windows",rightWindowKey:"Phím Right Windows ",selectKey:"Chọn phím",numpad0:"Phím 0",numpad1:"Phím 1",numpad2:"Phím 2",numpad3:"Phím 3",numpad4:"Phím 4",numpad5:"Phím 5",numpad6:"Phím 6",numpad7:"Phím 7",numpad8:"Phím 8",numpad9:"Phím 9",multiply:"Nhân",add:"Thêm",subtract:"Trừ",decimalPoint:"Điểm số thập phân",divide:"Chia",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",
+f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Dấu chấm phẩy",equalSign:"Đăng nhập bằng",comma:"Dấu phẩy",dash:"Dấu gạch ngang",period:"Phím .",forwardSlash:"Phím /",graveAccent:"Phím `",openBracket:"Open Bracket",backSlash:"Dấu gạch chéo ngược",closeBracket:"Gần giá đỡ",singleQuote:"Trích dẫn"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
index b63d413b740..6c16130b3de 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
@@ -1,9 +1,9 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","zh-cn",{title:"辅助功能说明",contents:"帮助内容。要关闭此对话框请按 ESC 键。",legend:[{name:"常规",items:[{name:"编辑器工具栏",legend:"按 ${toolbarFocus} 切换到工具栏，使用 TAB 键和 SHIFT+TAB 组合键移动到上一个和下一个工具栏组。使用左右箭头键移动到上一个或下一个工具栏按钮。按空格键或回车键以选中工具栏按钮。"},{name:"编辑器对话框",legend:"在对话框内，按 TAB 键移动到下一个字段，按 SHIFT + TAB 组合键移动到上一个字段，按 ENTER 键提交对话框，按 ESC 键取消对话框。对于有多选项卡的对话框，可以按 ALT + F10 直接切换到或者按 TAB 键逐步移到选项卡列表，当焦点移到选项卡列表时可以用左右箭头键来移动到前后的选项卡。"},{name:"编辑器上下文菜单",legend:"用 ${contextMenu} 或者“应用程序键”打开上下文菜单。然后用 TAB 键或者下箭头键来移动到下一个菜单项；SHIFT + TAB 组合键或者上箭头键移动到上一个菜单项。用 SPACE 键或者 ENTER 键选择菜单项。用 SPACE 键，ENTER 键或者右箭头键打开子菜单。返回菜单用 ESC 键或者左箭头键。用 ESC 键关闭上下文菜单。"},
 {name:"编辑器列表框",legend:"在列表框中，移到下一列表项用 TAB 键或者下箭头键。移到上一列表项用SHIFT+TAB 组合键或者上箭头键，用 SPACE 键或者 ENTER 键选择列表项。用 ESC 键收起列表框。"},{name:"编辑器元素路径栏",legend:"按 ${elementsPathFocus} 以导航到元素路径栏，使用 TAB 键或右箭头键选择下一个元素，使用 SHIFT+TAB 组合键或左箭头键选择上一个元素，按空格键或回车键以选定编辑器里的元素。"}]},{name:"命令",items:[{name:" 撤消命令",legend:"按 ${undo}"},{name:" 重做命令",legend:"按 ${redo}"},{name:" 加粗命令",legend:"按 ${bold}"},{name:" 倾斜命令",legend:"按 ${italic}"},{name:" 下划线命令",legend:"按 ${underline}"},{name:" 链接命令",legend:"按 ${link}"},{name:" 工具栏折叠命令",legend:"按 ${toolbarCollapse}"},
-{name:"访问前一个焦点区域的命令",legend:"按 ${accessPreviousSpace} 访问^符号前最近的不可访问的焦点区域，例如：两个相邻的 HR 元素。重复此组合按键可以到达远处的焦点区域。"},{name:"访问下一个焦点区域命令",legend:"按 ${accessNextSpace} 以访问^符号后最近的不可访问的焦点区域。例如：两个相邻的 HR 元素。重复此组合按键可以到达远处的焦点区域。"},{name:"辅助功能帮助",legend:"按 ${a11yHelp}"}]}],backspace:"退格键",tab:"Tab 键",enter:"回车键",shift:"Shift 键",ctrl:"Ctrl 键",alt:"Alt 键",pause:"暂停键",capslock:"大写锁定键",escape:"Esc 键",pageUp:"上翻页键",pageDown:"下翻页键",end:"行尾键",home:"行首键",leftArrow:"向左箭头键",upArrow:"向上箭头键",rightArrow:"向右箭头键",downArrow:"向下箭头键",
-insert:"插入键","delete":"删除键",leftWindowKey:"左 WIN 键",rightWindowKey:"右 WIN 键",selectKey:"选择键",numpad0:"小键盘 0 键",numpad1:"小键盘 1 键",numpad2:"小键盘 2 键",numpad3:"小键盘 3 键",numpad4:"小键盘 4 键",numpad5:"小键盘 5 键",numpad6:"小键盘 6 键",numpad7:"小键盘 7 键",numpad8:"小键盘 8 键",numpad9:"小键盘 9 键",multiply:"星号键",add:"加号键",subtract:"减号键",decimalPoint:"小数点键",divide:"除号键",f1:"F1 键",f2:"F2 键",f3:"F3 键",f4:"F4 键",f5:"F5 键",f6:"F6 键",f7:"F7 键",f8:"F8 键",f9:"F9 键",f10:"F10 键",f11:"F11 键",f12:"F12 键",numLock:"数字锁定键",scrollLock:"滚动锁定键",
-semiColon:"分号键",equalSign:"等号键",comma:"逗号键",dash:"短划线键",period:"句号键",forwardSlash:"斜杠键",graveAccent:"重音符键",openBracket:"左中括号键",backSlash:"反斜杠键",closeBracket:"右中括号键",singleQuote:"单引号键"});
\ No newline at end of file
+{name:"访问前一个焦点区域的命令",legend:"按 ${accessPreviousSpace} 访问^符号前最近的不可访问的焦点区域，例如：两个相邻的 HR 元素。重复此组合按键可以到达远处的焦点区域。"},{name:"访问下一个焦点区域命令",legend:"按 ${accessNextSpace} 以访问^符号后最近的不可访问的焦点区域。例如：两个相邻的 HR 元素。重复此组合按键可以到达远处的焦点区域。"},{name:"辅助功能帮助",legend:"按 ${a11yHelp}"}]}],tab:"Tab 键",pause:"暂停键",capslock:"大写锁定键",escape:"Esc 键",pageUp:"上翻页键",pageDown:"下翻页键",leftArrow:"向左箭头键",upArrow:"向上箭头键",rightArrow:"向右箭头键",downArrow:"向下箭头键",insert:"插入键",leftWindowKey:"左 WIN 键",rightWindowKey:"右 WIN 键",selectKey:"选择键",numpad0:"小键盘 0 键",
+numpad1:"小键盘 1 键",numpad2:"小键盘 2 键",numpad3:"小键盘 3 键",numpad4:"小键盘 4 键",numpad5:"小键盘 5 键",numpad6:"小键盘 6 键",numpad7:"小键盘 7 键",numpad8:"小键盘 8 键",numpad9:"小键盘 9 键",multiply:"星号键",add:"加号键",subtract:"减号键",decimalPoint:"小数点键",divide:"除号键",f1:"F1 键",f2:"F2 键",f3:"F3 键",f4:"F4 键",f5:"F5 键",f6:"F6 键",f7:"F7 键",f8:"F8 键",f9:"F9 键",f10:"F10 键",f11:"F11 键",f12:"F12 键",numLock:"数字锁定键",scrollLock:"滚动锁定键",semiColon:"分号键",equalSign:"等号键",comma:"逗号键",dash:"短划线键",period:"句号键",forwardSlash:"斜杠键",graveAccent:"重音符键",
+openBracket:"左中括号键",backSlash:"反斜杠键",closeBracket:"右中括号键",singleQuote:"单引号键"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
index 3305d9c60c1..a43d47a6d0d 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
@@ -1,9 +1,9 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","zh",{title:"輔助工具指南",contents:"說明內容。若要關閉此對話框請按「ESC」。",legend:[{name:"一般",items:[{name:"編輯器工具列",legend:"請按 ${toolbarFocus} 以導覽到工具列。利用 TAB 或 SHIFT+TAB 以便移動到下一個及前一個工具列群組。利用右方向鍵或左方向鍵以便移動到下一個及上一個工具列按鈕。按下空白鍵或 ENTER 鍵啟用工具列按鈕。"},{name:"編輯器對話方塊",legend:"在對話框中，按下 TAB 鍵以導覽到下一個對話框元素，按下 SHIFT+TAB 以移動到上一個對話框元素，按下 ENTER 以遞交對話框，按下 ESC 以取消對話框。當對話框有多個分頁時，可以使用 ALT+F10 或是在對話框分頁順序中的一部份按下 TAB 以使用分頁列表。焦點在分頁列表上時，分別使用右方向鍵及左方向鍵移動到下一個及上一個分頁。"},{name:"編輯器內容功能表",legend:"請按下「${contextMenu}」或是「應用程式鍵」以開啟內容選單。以「TAB」或是「↓」鍵移動到下一個選單選項。以「SHIFT + TAB」或是「↑」鍵移動到上一個選單選項。按下「空白鍵」或是「ENTER」鍵以選取選單選項。以「空白鍵」或「ENTER」或「→」開啟目前選項之子選單。以「ESC」或「←」回到父選單。以「ESC」鍵關閉內容選單」。"},
 {name:"編輯器清單方塊",legend:"在清單方塊中，使用 TAB 或下方向鍵移動到下一個列表項目。使用 SHIFT+TAB 或上方向鍵移動到上一個列表項目。按下空白鍵或 ENTER 以選取列表選項。按下 ESC 以關閉清單方塊。"},{name:"編輯器元件路徑工具列",legend:"請按 ${elementsPathFocus} 以瀏覽元素路徑列。利用 TAB 或右方向鍵以便移動到下一個元素按鈕。利用 SHIFT 或左方向鍵以便移動到上一個按鈕。按下空白鍵或 ENTER 鍵來選取在編輯器中的元素。"}]},{name:"命令",items:[{name:"復原命令",legend:"請按下「${undo}」"},{name:"重複命令",legend:"請按下「 ${redo}」"},{name:"粗體命令",legend:"請按下「${bold}」"},{name:"斜體",legend:"請按下「${italic}」"},{name:"底線命令",legend:"請按下「${underline}」"},{name:"連結",legend:"請按下「${link}」"},
-{name:"隱藏工具列",legend:"請按下「${toolbarCollapse}」"},{name:"存取前一個焦點空間命令",legend:"請按下 ${accessPreviousSpace} 以存取最近但無法靠近之插字符號前的焦點空間。舉例：二個相鄰的 HR 元素。\r\n重複按鍵以存取較遠的焦點空間。"},{name:"存取下一個焦點空間命令",legend:"請按下 ${accessNextSpace} 以存取最近但無法靠近之插字符號後的焦點空間。舉例：二個相鄰的 HR 元素。\r\n重複按鍵以存取較遠的焦點空間。"},{name:"協助工具說明",legend:"請按下「${a11yHelp}」"}]}],backspace:"退格鍵",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",
-leftArrow:"向左箭號",upArrow:"向上鍵號",rightArrow:"向右鍵號",downArrow:"向下鍵號",insert:"插入","delete":"刪除",leftWindowKey:"左方 Windows 鍵",rightWindowKey:"右方 Windows 鍵",selectKey:"選擇鍵",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"乘號",add:"新增",subtract:"減號",decimalPoint:"小數點",divide:"除號",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",
-f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"分號",equalSign:"等號",comma:"逗號",dash:"虛線",period:"句點",forwardSlash:"斜線",graveAccent:"抑音符號",openBracket:"左方括號",backSlash:"反斜線",closeBracket:"右方括號",singleQuote:"單引號"});
\ No newline at end of file
+{name:"隱藏工具列",legend:"請按下「${toolbarCollapse}」"},{name:"存取前一個焦點空間命令",legend:"請按下 ${accessPreviousSpace} 以存取最近但無法靠近之插字符號前的焦點空間。舉例：二個相鄰的 HR 元素。\r\n重複按鍵以存取較遠的焦點空間。"},{name:"存取下一個焦點空間命令",legend:"請按下 ${accessNextSpace} 以存取最近但無法靠近之插字符號後的焦點空間。舉例：二個相鄰的 HR 元素。\r\n重複按鍵以存取較遠的焦點空間。"},{name:"協助工具說明",legend:"請按下「${a11yHelp}」"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"向左箭號",upArrow:"向上鍵號",rightArrow:"向右鍵號",downArrow:"向下鍵號",insert:"插入",leftWindowKey:"左方 Windows 鍵",
+rightWindowKey:"右方 Windows 鍵",selectKey:"選擇鍵",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"乘號",add:"新增",subtract:"減號",decimalPoint:"小數點",divide:"除號",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"分號",equalSign:"等號",comma:"逗號",dash:"虛線",
+period:"句點",forwardSlash:"斜線",graveAccent:"抑音符號",openBracket:"左方括號",backSlash:"反斜線",closeBracket:"右方括號",singleQuote:"單引號"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js b/htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js
index 81d9372f183..14eba697ca8 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js
@@ -1,7 +1,8 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("about",function(a){a=a.lang.about;var b=CKEDITOR.getUrl(CKEDITOR.plugins.get("about").path+"dialogs/"+(CKEDITOR.env.hidpi?"hidpi/":"")+"logo_ckeditor.png");return{title:CKEDITOR.env.ie?a.dlgTitle:a.title,minWidth:390,minHeight:230,contents:[{id:"tab1",label:"",title:"",expand:!0,padding:0,elements:[{type:"html",html:'\x3cstyle type\x3d"text/css"\x3e.cke_about_container{color:#000 !important;padding:10px 10px 0;margin-top:5px}.cke_about_container p{margin: 0 0 10px;}.cke_about_container .cke_about_logo{height:81px;background-color:#fff;background-image:url('+
-b+");"+(CKEDITOR.env.hidpi?"background-size:163px 58px;":"")+'background-position:center; background-repeat:no-repeat;margin-bottom:10px;}.cke_about_container a{cursor:pointer !important;color:#00B2CE !important;text-decoration:underline !important;}\x3c/style\x3e\x3cdiv class\x3d"cke_about_container"\x3e\x3cdiv class\x3d"cke_about_logo"\x3e\x3c/div\x3e\x3cp\x3eCKEditor '+CKEDITOR.version+" (revision "+CKEDITOR.revision+')\x3cbr\x3e\x3ca target\x3d"_blank" href\x3d"http://ckeditor.com/"\x3ehttp://ckeditor.com\x3c/a\x3e\x3c/p\x3e\x3cp\x3e'+
-a.help.replace("$1",'\x3ca target\x3d"_blank" href\x3d"http://docs.ckeditor.com/user"\x3e'+a.userGuide+"\x3c/a\x3e")+"\x3c/p\x3e\x3cp\x3e"+a.moreInfo+'\x3cbr\x3e\x3ca target\x3d"_blank" href\x3d"http://ckeditor.com/about/license"\x3ehttp://ckeditor.com/about/license\x3c/a\x3e\x3c/p\x3e\x3cp\x3e'+a.copy.replace("$1",'\x3ca target\x3d"_blank" href\x3d"http://cksource.com/"\x3eCKSource\x3c/a\x3e - Frederico Knabben')+"\x3c/p\x3e\x3c/div\x3e"}]}],buttons:[CKEDITOR.dialog.cancelButton]}});
\ No newline at end of file
+b+");"+(CKEDITOR.env.hidpi?"background-size:163px 58px;":"")+'background-position:center; background-repeat:no-repeat;margin-bottom:10px;}.cke_about_container a{cursor:pointer !important;color:#00B2CE !important;text-decoration:underline !important;}\x3c/style\x3e\x3cdiv class\x3d"cke_about_container"\x3e\x3cdiv class\x3d"cke_about_logo"\x3e\x3c/div\x3e\x3cp\x3eCKEditor '+CKEDITOR.version+" (revision "+CKEDITOR.revision+')\x3cbr\x3e\x3ca target\x3d"_blank" rel\x3d"noopener noreferrer" href\x3d"http://ckeditor.com/"\x3ehttp://ckeditor.com\x3c/a\x3e\x3c/p\x3e\x3cp\x3e'+
+a.help.replace("$1",'\x3ca target\x3d"_blank" rel\x3d"noopener noreferrer" href\x3d"http://docs.ckeditor.com/user"\x3e'+a.userGuide+"\x3c/a\x3e")+"\x3c/p\x3e\x3cp\x3e"+a.moreInfo+'\x3cbr\x3e\x3ca target\x3d"_blank" rel\x3d"noopener noreferrer" href\x3d"http://ckeditor.com/about/license"\x3ehttp://ckeditor.com/about/license\x3c/a\x3e\x3c/p\x3e\x3cp\x3e'+a.copy.replace("$1",'\x3ca target\x3d"_blank" rel\x3d"noopener noreferrer" href\x3d"http://cksource.com/"\x3eCKSource\x3c/a\x3e - Frederico Knabben')+
+"\x3c/p\x3e\x3c/div\x3e"}]}],buttons:[CKEDITOR.dialog.cancelButton]}});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js b/htdocs/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
index 8039751b9a4..927b942b183 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("paste",function(c){function k(a){var b=new CKEDITOR.dom.document(a.document),g=b.getBody(),d=b.getById("cke_actscrpt");d&&d.remove();g.setAttribute("contenteditable",!0);g.on(e.mainPasteEvent,function(a){a=e.initPasteDataTransfer(a);f?a!=f&&(f=e.initPasteDataTransfer()):f=a});if(CKEDITOR.env.ie&&8>CKEDITOR.env.version)b.getWindow().on("blur",function(){b.$.selection.empty()});b.on("keydown",function(a){a=a.data;var b;switch(a.getKeystroke()){case 27:this.hide();b=1;break;case 9:case CKEDITOR.SHIFT+
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css b/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css
index e75b9f702cd..e284ba08945 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md or http://ckeditor.com/license
  */
 
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js b/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
index 6d1cee7f637..ae32c15522a 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("colordialog",function(x){function m(){h.getById(n).removeStyle("background-color");p.getContentElement("picker","selectedColor").setValue("");y()}function z(a){a=a.data.getTarget();var c;"td"==a.getName()&&(c=a.getChild(0).getHtml())&&(y(),f=a,f.setAttribute("aria-selected",!0),f.addClass("cke_colordialog_selected"),p.getContentElement("picker","selectedColor").setValue(c))}function y(){f&&(f.removeClass("cke_colordialog_selected"),f.removeAttribute("aria-selected"),f=null)}function D(a){a=
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/cursors/cursor-disabled.svg b/htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/cursors/cursor-disabled.svg
new file mode 100644
index 00000000000..9298aefd8ae
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/cursors/cursor-disabled.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <title>cursor_disabled</title>
+    <desc></desc>
+    <defs></defs>
+    <g id="Page-4" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="cursor_disabled_5">
+            <g id="cursor_disabled_illustrator" transform="translate(24.000000, 2.000000)">
+                <g id="Layer_1">
+                    <path d="M225,14 C227.8,14 230,11.8 230,9 L230,5 C230,2.2 227.8,0 225,0 L127,0 C124.2,0 122,2.2 122,5 L122,9 C122,11.8 124.2,14 127,14 L158,14 L158,26.3 C172.4,34 185,44.6 195,57.4 L195,14 L225,14 L225,14 Z" id="Shape" fill="#000000"></path>
+                    <path d="M158,228.7 L158,238 L134.5,238 C130.6,239.1 126.7,239.9 122.6,240.6 C122.2,241.3 121.9,242.1 121.9,243 L121.9,247 C121.9,249.8 124.1,252 126.9,252 L224.9,252 C227.7,252 229.9,249.8 229.9,247 L229.9,243 C229.9,240.2 227.7,238 224.9,238 L194.9,238 L194.9,197.6 C185,210.4 172.4,221 158,228.7 L158,228.7 Z" id="Shape" fill="#000000"></path>
+                    <path d="M54.7,107.6 C53.9,110.7 51.1,112.9 41.8,116.1 C35.6,118.3 31.9,121.1 29.5,124.5 C29.5,125.5 29.4,126.4 29.4,127.4 C29.4,134.1 30.3,140.7 32,146.9 L93.9,146.9 L54.7,107.6 L54.7,107.6 Z" id="Shape" fill="#000000"></path>
+                    <path d="M70.8,13 C70.7,13 70.6,13.1 70.5,13.3 C65.9,13.7 58.9,15.5 54.6,24.4 C63.2,20.2 72.5,17.1 82.2,15.1 C77.4,12.7 72.6,13 70.8,13 L70.8,13 Z" id="Shape" fill="#000000"></path>
+                    <path d="M55,170 L55,183.7 C58.7,187 62.7,189.9 67,192.3 L67,170 L78,170 L78,197.6 C81.9,199.1 85.9,200.2 90,201 L90,170 L101,170 L101,202.4 C102.2,202.5 103.3,202.5 104.5,202.5 C109.4,202.5 114.3,202 119.1,201.1 C119.3,193.5 119.5,182.8 119.6,172.6 L105.1,158 L36.1,158 C38.3,162.8 40.9,167.4 44,171.7 L44,170 L55,170 L55,170 Z" id="Shape" fill="#000000"></path>
+                    <path d="M26.3,211.5 C26.3,211.5 24.6,222.6 36.8,222.6 L40.8,222.6 C35.7,219.1 30.8,215.3 26.3,211.1 L26.3,211.5 L26.3,211.5 Z" id="Shape" fill="#000000"></path>
+                    <path d="M172.1,159.8 C176.9,149.8 179.4,138.7 179.4,127.5 C179.4,107.1 171.2,88.6 158,75.1 L158,145.7 L172.1,159.8 L172.1,159.8 Z" id="Shape" fill="#000000"></path>
+                    <path d="M72.2,59.9 L91.2,78.9 C92.3,73 93.7,65.4 94.1,53.3 C86.5,54.3 79.1,56.6 72.2,59.9 L72.2,59.9 Z" id="Shape" fill="#000000"></path>
+                    <path d="M119.7,158 L119.2,158 L119.7,158.5 L119.7,158 L119.7,158 Z" id="Shape" fill="#FF0000"></path>
+                    <path d="M195,75.3 C186.1,59.9 173.3,46.9 158,37.8 C142.3,28.4 124,23 104.5,23 C99.7,23 95,23.3 90.4,24 C86.3,24.6 82.3,25.3 78.3,26.4 C73.4,27.7 68.7,29.3 64.1,31.2 C59.6,33.1 55.3,35.3 51.2,37.7 C20.6,55.9 0,89.3 0,127.5 C0,153.8 9.8,177.9 25.9,196.3 C31.3,202.4 37.3,207.9 44,212.6 C47.5,215.1 51.2,217.4 55,219.5 C57,220.6 59,221.6 61.1,222.5 C74.3,228.6 89,231.9 104.5,231.9 C124,231.9 142.3,226.5 158,217.1 C173.3,207.9 186.1,195 195,179.6 C203.9,164.2 209,146.4 209,127.4 C209,108.5 203.9,90.7 195,75.3 L195,75.3 Z M151.2,198.5 C141.4,205 130.4,209.3 118.9,211.3 C114.2,212.1 109.4,212.5 104.5,212.5 C103.3,212.5 102.2,212.5 101,212.4 C97.3,212.2 93.6,211.8 90,211.2 C85.9,210.5 81.9,209.5 78,208.2 C74.2,207 70.5,205.5 67,203.7 C62.8,201.6 58.8,199.2 55,196.5 C51.1,193.7 47.4,190.5 44,187.1 C36,179 29.6,169.2 25.4,158.4 C21.6,148.8 19.6,138.4 19.6,127.5 C19.6,110.8 24.4,94.7 33.6,80.8 L37,75.7 L55.7,94.4 L108.4,147.1 L119.4,158.1 L119.9,158.1 L119.9,158.6 L156.5,195.2 L151.2,198.5 L151.2,198.5 Z M177.7,170.7 L174.4,176.2 L158,159.9 L89.4,91.3 L55.8,57.6 L61.3,54.3 C71.4,48.3 82.6,44.6 94.2,43.1 C97.6,42.7 101,42.5 104.5,42.5 C124.8,42.5 143.4,49.6 158,61.5 C177.2,77.1 189.4,100.8 189.4,127.4 C189.4,142.7 185.4,157.7 177.7,170.7 L177.7,170.7 Z" id="Shape" fill="#FF0000"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/cursors/cursor.svg b/htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/cursors/cursor.svg
new file mode 100644
index 00000000000..95951478f01
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/cursors/cursor.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 205 252" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>cursor</title>
+    <desc></desc>
+    <defs></defs>
+    <g id="Page-4" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-49.000000, -2.000000)" fill="#000000">
+            <g id="cursor" transform="translate(49.000000, 2.000000)">
+                <path d="M170,14 L200.007537,14 C202.769057,14 205,11.7636493 205,9.00497092 L205,4.99502908 C205,2.23382212 202.764798,0 200.007537,0 L101.992463,0 C99.2309431,0 97,2.23635069 97,4.99502908 L97,9.00497092 C97,11.7661779 99.2352017,14 101.992463,14 L133,14 L133,238 L101.992463,238 C99.2309431,238 97,240.236351 97,242.995029 L97,247.004971 C97,249.766178 99.2352017,252 101.992463,252 L200.007537,252 C202.769057,252 205,249.763649 205,247.004971 L205,242.995029 C205,240.233822 202.764798,238 200.007537,238 L170,238 L170,14 Z" id="Combined-Shape"></path>
+                <path d="M65,222.280829 C60.6131176,222.280829 56.3742162,222.280828 52.9999995,222.280828 L53,170 L42,170 L42,222.560593 C38.6130246,222.560593 34.3763308,222.560593 30.0000005,222.560594 L30,170 L19,170 L19,222.560595 C16.324865,222.560595 13.8463369,222.560595 11.7612725,222.560596 C-0.369586438,222.560599 1.28381746,211.509313 1.28381746,211.509313 C1.28381746,211.509313 0.389689944,177.756 0.396571277,158 L94.7408232,158 C94.7392736,177.793089 93.8535396,211.229548 93.8535396,211.229548 C93.8535396,211.229548 95.5069435,222.280834 83.3760845,222.280831 C81.2553782,222.28083 78.7276415,222.28083 76.0000002,222.28083 L76,170 L65,170 L65,222.280829 Z M0.574534036,147 C0.579768387,146.896149 0.585131638,146.794755 0.590625514,146.695866 C1.28381748,134.218409 -0.797112286,122.434146 16.8792816,116.195422 C34.5556755,109.956698 28.6662536,107.530522 30.3978792,95.7462576 C32.1295048,83.961993 25.8921298,78.069863 25.8921315,44.7966496 C25.892133,17.9607206 38.5169467,13.9220173 45.5220939,13.3637617 C45.6089814,13.1340727 45.7002506,13.0164391 45.7960631,13.0164391 C49.8372056,13.0164389 69.2452237,11.2436713 69.2452255,44.5168847 C69.2452273,77.7900982 63.0078523,83.6822281 64.7394778,95.4664928 C66.4711034,107.250757 60.5816815,109.676933 78.2580754,115.915657 C95.9344693,122.154381 93.8535395,133.938644 94.5467315,146.416101 C94.5570586,146.601989 94.5669242,146.796724 94.5763397,147 L0.574534036,147 Z M47.5,41 C52.1944204,41 56,37.1944204 56,32.5 C56,27.8055796 52.1944204,24 47.5,24 C42.8055796,24 39,27.8055796 39,32.5 C39,37.1944204 42.8055796,41 47.5,41 Z" id="Combined-Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/styles/copyformatting.css b/htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/styles/copyformatting.css
new file mode 100644
index 00000000000..7aea2c3ebad
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/styles/copyformatting.css
@@ -0,0 +1,45 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+
+html.cke_copyformatting_active {
+	min-height: 100%;
+}
+
+/* There is no cursor in CUR format for IE/Edge as that browser
+ does not support custom cursor in [contenteditable] area.
+ Ticket for this issue:
+ https://connect.microsoft.com/IE/feedback/details/1070215/cant-change-cursor-in-contenteditable-using-css */
+.cke_copyformatting_disabled,
+.cke_copyformatting_disabled a,
+.cke_copyformatting_disabled .cke_editable {
+	cursor: url(../cursors/cursor-disabled.svg) 12 1, auto;
+}
+
+.cke_copyformatting_disabled .cke_top a,
+.cke_copyformatting_disabled .cke_bottom a {
+	cursor: default;
+}
+
+/* Added `!important` rule as a fix for overriding the cursor by the Table Resize plugin.
+ The `!important` rule is used because the Table Resize plugin creates a `<div>` which changes the cursor using inlined styles. */
+.cke_copyformatting_active,
+.cke_copyformatting_active.cke_editable,
+.cke_copyformatting_active .cke_editable,
+.cke_copyformatting_active a,
+.cke_copyformatting_active table,
+.cke_copyformatting_active div[data-cke-temp],
+.cke_copyformatting_tableresize_cursor div[data-cke-temp] {
+	cursor: url(../cursors/cursor.svg) 12 1, auto !important;
+}
+
+.cke_screen_reader_only {
+	position: absolute;
+	clip: rect(1px, 1px, 1px, 1px);
+	padding: 0;
+	border: 0;
+	height: 1px;
+	width: 1px;
+	overflow: hidden;
+}
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js b/htdocs/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
index 26c2feb304d..5c35976dfa0 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
@@ -1,4 +1,4 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js b/htdocs/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js
index eb0593ff683..5d00e99f6cd 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 (function(){function C(c){return c.type==CKEDITOR.NODE_TEXT&&0<c.getLength()&&(!r||!c.isReadOnly())}function w(c){return!(c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary(CKEDITOR.tools.extend({},CKEDITOR.dtd.$empty,CKEDITOR.dtd.$nonEditable)))}function q(c,g){function n(a,b){var d=this,c=new CKEDITOR.dom.walker(a);c.guard=b?w:function(a){!w(a)&&(d._.matchBoundary=!0)};c.evaluator=C;c.breakOnFalse=1;a.startContainer.type==CKEDITOR.NODE_TEXT&&(this.textNode=a.startContainer,this.offset=a.startOffset-
@@ -15,11 +15,11 @@ k.reset()}if(2==l){if(d){var h=this.matchRange.getCursors(),p=h[h.length-1],h=h[
 arguments.callee.apply(this,Array.prototype.slice.call(arguments).concat([!0]))):!1},replaceCounter:0,replace:function(a,b,d,f,e,g,k){r=1;a=0;a=this.hasMatchOptionsChanged(b,f,e);if(!this.matchRange||!this.matchRange.isMatched()||this.matchRange._.isReplaced||this.matchRange.isReadOnly()||a)a&&this.matchRange&&(this.matchRange.clearMatched(),this.matchRange.removeHighlight(),this.matchRange=null),a=this.find(b,f,e,g,!k);else{this.matchRange.removeHighlight();b=this.matchRange.toDomRange();d=c.document.createText(d);
 if(!k){var l=c.getSelection();l.selectRanges([b]);c.fire("saveSnapshot")}b.deleteContents();b.insertNode(d);k||(l.selectRanges([b]),c.fire("saveSnapshot"));this.matchRange.updateFromDomRange(b);k||this.matchRange.highlight();this.matchRange._.isReplaced=!0;this.replaceCounter++;a=1}r=0;return a},matchOptions:null,hasMatchOptionsChanged:function(a,b,c){a=[a,b,c].join(".");b=this.matchOptions&&this.matchOptions!=a;this.matchOptions=a;return b}},f=c.lang.find;return{title:f.title,resizable:CKEDITOR.DIALOG_RESIZE_NONE,
 minWidth:350,minHeight:170,buttons:[CKEDITOR.dialog.cancelButton(c,{label:c.lang.common.close})],contents:[{id:"find",label:f.find,title:f.find,accessKey:"",elements:[{type:"hbox",widths:["230px","90px"],children:[{type:"text",id:"txtFindFind",label:f.findWhat,isChanged:!1,labelLayout:"horizontal",accessKey:"F"},{type:"button",id:"btnFind",align:"left",style:"width:100%",label:f.find,onClick:function(){var a=this.getDialog();e.find(a.getValueOf("find","txtFindFind"),a.getValueOf("find","txtFindCaseChk"),
-a.getValueOf("find","txtFindWordChk"),a.getValueOf("find","txtFindCyclic"))||alert(f.notFoundMsg)}}]},{type:"fieldset",label:CKEDITOR.tools.htmlEncode(f.findOptions),style:"margin-top:29px",children:[{type:"vbox",padding:0,children:[{type:"checkbox",id:"txtFindCaseChk",isChanged:!1,label:f.matchCase},{type:"checkbox",id:"txtFindWordChk",isChanged:!1,label:f.matchWord},{type:"checkbox",id:"txtFindCyclic",isChanged:!1,"default":!0,label:f.matchCyclic}]}]}]},{id:"replace",label:f.replace,accessKey:"M",
-elements:[{type:"hbox",widths:["230px","90px"],children:[{type:"text",id:"txtFindReplace",label:f.findWhat,isChanged:!1,labelLayout:"horizontal",accessKey:"F"},{type:"button",id:"btnFindReplace",align:"left",style:"width:100%",label:f.replace,onClick:function(){var a=this.getDialog();e.replace(a,a.getValueOf("replace","txtFindReplace"),a.getValueOf("replace","txtReplace"),a.getValueOf("replace","txtReplaceCaseChk"),a.getValueOf("replace","txtReplaceWordChk"),a.getValueOf("replace","txtReplaceCyclic"))||
-alert(f.notFoundMsg)}}]},{type:"hbox",widths:["230px","90px"],children:[{type:"text",id:"txtReplace",label:f.replaceWith,isChanged:!1,labelLayout:"horizontal",accessKey:"R"},{type:"button",id:"btnReplaceAll",align:"left",style:"width:100%",label:f.replaceAll,isChanged:!1,onClick:function(){var a=this.getDialog();e.replaceCounter=0;e.searchRange=t(1);e.matchRange&&(e.matchRange.removeHighlight(),e.matchRange=null);for(c.fire("saveSnapshot");e.replace(a,a.getValueOf("replace","txtFindReplace"),a.getValueOf("replace",
-"txtReplace"),a.getValueOf("replace","txtReplaceCaseChk"),a.getValueOf("replace","txtReplaceWordChk"),!1,!0););e.replaceCounter?(alert(f.replaceSuccessMsg.replace(/%1/,e.replaceCounter)),c.fire("saveSnapshot")):alert(f.notFoundMsg)}}]},{type:"fieldset",label:CKEDITOR.tools.htmlEncode(f.findOptions),children:[{type:"vbox",padding:0,children:[{type:"checkbox",id:"txtReplaceCaseChk",isChanged:!1,label:f.matchCase},{type:"checkbox",id:"txtReplaceWordChk",isChanged:!1,label:f.matchWord},{type:"checkbox",
-id:"txtReplaceCyclic",isChanged:!1,"default":!0,label:f.matchCyclic}]}]}]}],onLoad:function(){var a=this,b,c=0;this.on("hide",function(){c=0});this.on("show",function(){c=1});this.selectPage=CKEDITOR.tools.override(this.selectPage,function(f){return function(e){f.call(a,e);var g=a._.tabs[e],k;k="find"===e?"txtFindWordChk":"txtReplaceWordChk";b=a.getContentElement(e,"find"===e?"txtFindFind":"txtFindReplace");a.getContentElement(e,k);g.initialized||(CKEDITOR.document.getById(b._.inputId),g.initialized=
-!0);if(c){var l;e="find"===e?1:0;var g=1-e,m,h=v.length;for(m=0;m<h;m++)k=this.getContentElement(B[e],v[m][e]),l=this.getContentElement(B[g],v[m][g]),l.setValue(k.getValue())}}})},onShow:function(){e.searchRange=t();var a=this.getParentEditor().getSelection().getSelectedText(),b=this.getContentElement(g,"find"==g?"txtFindFind":"txtFindReplace");b.setValue(a);b.select();this.selectPage(g);this[("find"==g&&this._.editor.readOnly?"hide":"show")+"Page"]("replace")},onHide:function(){var a;e.matchRange&&
-e.matchRange.isMatched()&&(e.matchRange.removeHighlight(),c.focus(),(a=e.matchRange.toDomRange())&&c.getSelection().selectRanges([a]));delete e.matchRange},onFocus:function(){return"replace"==g?this.getContentElement("replace","txtFindReplace"):this.getContentElement("find","txtFindFind")}}}var r,y=function(){return{textNode:this.textNode,offset:this.offset,character:this.textNode?this.textNode.getText().charAt(this.offset):null,hitMatchBoundary:this._.matchBoundary}},B=["find","replace"],v=[["txtFindFind",
-"txtFindReplace"],["txtFindCaseChk","txtReplaceCaseChk"],["txtFindWordChk","txtReplaceWordChk"],["txtFindCyclic","txtReplaceCyclic"]];CKEDITOR.dialog.add("find",function(c){return q(c,"find")});CKEDITOR.dialog.add("replace",function(c){return q(c,"replace")})})();
\ No newline at end of file
+a.getValueOf("find","txtFindWordChk"),a.getValueOf("find","txtFindCyclic"))||alert(f.notFoundMsg)}}]},{type:"fieldset",className:"cke_dialog_find_fieldset",label:CKEDITOR.tools.htmlEncode(f.findOptions),style:"margin-top:29px",children:[{type:"vbox",padding:0,children:[{type:"checkbox",id:"txtFindCaseChk",isChanged:!1,label:f.matchCase},{type:"checkbox",id:"txtFindWordChk",isChanged:!1,label:f.matchWord},{type:"checkbox",id:"txtFindCyclic",isChanged:!1,"default":!0,label:f.matchCyclic}]}]}]},{id:"replace",
+label:f.replace,accessKey:"M",elements:[{type:"hbox",widths:["230px","90px"],children:[{type:"text",id:"txtFindReplace",label:f.findWhat,isChanged:!1,labelLayout:"horizontal",accessKey:"F"},{type:"button",id:"btnFindReplace",align:"left",style:"width:100%",label:f.replace,onClick:function(){var a=this.getDialog();e.replace(a,a.getValueOf("replace","txtFindReplace"),a.getValueOf("replace","txtReplace"),a.getValueOf("replace","txtReplaceCaseChk"),a.getValueOf("replace","txtReplaceWordChk"),a.getValueOf("replace",
+"txtReplaceCyclic"))||alert(f.notFoundMsg)}}]},{type:"hbox",widths:["230px","90px"],children:[{type:"text",id:"txtReplace",label:f.replaceWith,isChanged:!1,labelLayout:"horizontal",accessKey:"R"},{type:"button",id:"btnReplaceAll",align:"left",style:"width:100%",label:f.replaceAll,isChanged:!1,onClick:function(){var a=this.getDialog();e.replaceCounter=0;e.searchRange=t(1);e.matchRange&&(e.matchRange.removeHighlight(),e.matchRange=null);for(c.fire("saveSnapshot");e.replace(a,a.getValueOf("replace",
+"txtFindReplace"),a.getValueOf("replace","txtReplace"),a.getValueOf("replace","txtReplaceCaseChk"),a.getValueOf("replace","txtReplaceWordChk"),!1,!0););e.replaceCounter?(alert(f.replaceSuccessMsg.replace(/%1/,e.replaceCounter)),c.fire("saveSnapshot")):alert(f.notFoundMsg)}}]},{type:"fieldset",label:CKEDITOR.tools.htmlEncode(f.findOptions),children:[{type:"vbox",padding:0,children:[{type:"checkbox",id:"txtReplaceCaseChk",isChanged:!1,label:f.matchCase},{type:"checkbox",id:"txtReplaceWordChk",isChanged:!1,
+label:f.matchWord},{type:"checkbox",id:"txtReplaceCyclic",isChanged:!1,"default":!0,label:f.matchCyclic}]}]}]}],onLoad:function(){var a=this,b,c=0;this.on("hide",function(){c=0});this.on("show",function(){c=1});this.selectPage=CKEDITOR.tools.override(this.selectPage,function(f){return function(e){f.call(a,e);var g=a._.tabs[e],k;k="find"===e?"txtFindWordChk":"txtReplaceWordChk";b=a.getContentElement(e,"find"===e?"txtFindFind":"txtFindReplace");a.getContentElement(e,k);g.initialized||(CKEDITOR.document.getById(b._.inputId),
+g.initialized=!0);if(c){var l;e="find"===e?1:0;var g=1-e,m,h=v.length;for(m=0;m<h;m++)k=this.getContentElement(B[e],v[m][e]),l=this.getContentElement(B[g],v[m][g]),l.setValue(k.getValue())}}})},onShow:function(){e.searchRange=t();var a=this.getParentEditor().getSelection().getSelectedText(),b=this.getContentElement(g,"find"==g?"txtFindFind":"txtFindReplace");b.setValue(a);b.select();this.selectPage(g);this[("find"==g&&this._.editor.readOnly?"hide":"show")+"Page"]("replace")},onHide:function(){var a;
+e.matchRange&&e.matchRange.isMatched()&&(e.matchRange.removeHighlight(),(a=e.matchRange.toDomRange())&&c.getSelection().selectRanges([a]),c.focus());delete e.matchRange},onFocus:function(){return"replace"==g?this.getContentElement("replace","txtFindReplace"):this.getContentElement("find","txtFindFind")}}}var r,y=function(){return{textNode:this.textNode,offset:this.offset,character:this.textNode?this.textNode.getText().charAt(this.offset):null,hitMatchBoundary:this._.matchBoundary}},B=["find","replace"],
+v=[["txtFindFind","txtFindReplace"],["txtFindCaseChk","txtReplaceCaseChk"],["txtFindWordChk","txtReplaceWordChk"],["txtFindCyclic","txtReplaceCyclic"]];CKEDITOR.dialog.add("find",function(c){return q(c,"find")});CKEDITOR.dialog.add("replace",function(c){return q(c,"replace")})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/flash/dialogs/flash.js b/htdocs/includes/ckeditor/ckeditor/plugins/flash/dialogs/flash.js
index ea7d3313ad2..25344a4db6f 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/flash/dialogs/flash.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/flash/dialogs/flash.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 (function(){function b(a,b,c){var h=n[this.id];if(h)for(var f=this instanceof CKEDITOR.ui.dialog.checkbox,e=0;e<h.length;e++){var d=h[e];switch(d.type){case 1:if(!a)continue;if(null!==a.getAttribute(d.name)){a=a.getAttribute(d.name);f?this.setValue("true"==a.toLowerCase()):this.setValue(a);return}f&&this.setValue(!!d["default"]);break;case 2:if(!a)continue;if(d.name in c){a=c[d.name];f?this.setValue("true"==a.toLowerCase()):this.setValue(a);return}f&&this.setValue(!!d["default"]);break;case 4:if(!b)continue;
@@ -11,14 +11,14 @@ name:"style"},{type:4,name:"style"}],type:[{type:4,name:"type"}]},k="play loop m
 if(e&&e.data("cke-real-element-type")&&"flash"==e.data("cke-real-element-type")){this.fakeImage=e;var d=a.restoreRealElement(e),g=null,b=null,c={};if("cke:object"==d.getName()){g=d;d=g.getElementsByTag("embed","cke");0<d.count()&&(b=d.getItem(0));for(var d=g.getElementsByTag("param","cke"),f=0,l=d.count();f<l;f++){var k=d.getItem(f),n=k.getAttribute("name"),k=k.getAttribute("value");c[n]=k}}else"cke:embed"==d.getName()&&(b=d);this.objectNode=g;this.embedNode=b;this.setupContent(g,b,c,e)}},onOk:function(){var e=
 null,d=null,b=null;this.fakeImage?(e=this.objectNode,d=this.embedNode):(l&&(e=CKEDITOR.dom.element.createFromHtml("\x3ccke:object\x3e\x3c/cke:object\x3e",a.document),e.setAttributes({classid:"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000",codebase:"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version\x3d6,0,40,0"})),k&&(d=CKEDITOR.dom.element.createFromHtml("\x3ccke:embed\x3e\x3c/cke:embed\x3e",a.document),d.setAttributes({type:"application/x-shockwave-flash",pluginspage:"http://www.macromedia.com/go/getflashplayer"}),
 e&&d.appendTo(e)));if(e)for(var b={},c=e.getElementsByTag("param","cke"),f=0,h=c.count();f<h;f++)b[c.getItem(f).getAttribute("name")]=c.getItem(f);c={};f={};this.commitContent(e,d,b,c,f);e=a.createFakeElement(e||d,"cke_flash","flash",!0);e.setAttributes(f);e.setStyles(c);this.fakeImage?(e.replace(this.fakeImage),a.getSelection().selectElement(e)):a.insertElement(e)},onHide:function(){this.preview&&this.preview.setHtml("")},contents:[{id:"info",label:a.lang.common.generalTab,accessKey:"I",elements:[{type:"vbox",
-padding:0,children:[{type:"hbox",widths:["280px","110px"],align:"right",children:[{id:"src",type:"text",label:a.lang.common.url,required:!0,validate:CKEDITOR.dialog.validate.notEmpty(a.lang.flash.validateSrc),setup:b,commit:c,onLoad:function(){var a=this.getDialog(),b=function(b){h.setAttribute("src",b);a.preview.setHtml('\x3cembed height\x3d"100%" width\x3d"100%" src\x3d"'+CKEDITOR.tools.htmlEncode(h.getAttribute("src"))+'" type\x3d"application/x-shockwave-flash"\x3e\x3c/embed\x3e')};a.preview=a.getContentElement("info",
-"preview").getElement().getChild(3);this.on("change",function(a){a.data&&a.data.value&&b(a.data.value)});this.getInputElement().on("change",function(){b(this.getValue())},this)}},{type:"button",id:"browse",filebrowser:"info:src",hidden:!0,style:"display:inline-block;margin-top:14px;",label:a.lang.common.browseServer}]}]},{type:"hbox",widths:["25%","25%","25%","25%","25%"],children:[{type:"text",id:"width",requiredContent:"embed[width]",style:"width:95px",label:a.lang.common.width,validate:CKEDITOR.dialog.validate.htmlLength(a.lang.common.invalidHtmlLength.replace("%1",
-a.lang.common.width)),setup:b,commit:c},{type:"text",id:"height",requiredContent:"embed[height]",style:"width:95px",label:a.lang.common.height,validate:CKEDITOR.dialog.validate.htmlLength(a.lang.common.invalidHtmlLength.replace("%1",a.lang.common.height)),setup:b,commit:c},{type:"text",id:"hSpace",requiredContent:"embed[hspace]",style:"width:95px",label:a.lang.flash.hSpace,validate:CKEDITOR.dialog.validate.integer(a.lang.flash.validateHSpace),setup:b,commit:c},{type:"text",id:"vSpace",requiredContent:"embed[vspace]",
-style:"width:95px",label:a.lang.flash.vSpace,validate:CKEDITOR.dialog.validate.integer(a.lang.flash.validateVSpace),setup:b,commit:c}]},{type:"vbox",children:[{type:"html",id:"preview",style:"width:95%;",html:f}]}]},{id:"Upload",hidden:!0,filebrowser:"uploadButton",label:a.lang.common.upload,elements:[{type:"file",id:"upload",label:a.lang.common.upload,size:38},{type:"fileButton",id:"uploadButton",label:a.lang.common.uploadSubmit,filebrowser:"info:src","for":["Upload","upload"]}]},{id:"properties",
-label:a.lang.flash.propertiesTab,elements:[{type:"hbox",widths:["50%","50%"],children:[{id:"scale",type:"select",requiredContent:"embed[scale]",label:a.lang.flash.scale,"default":"",style:"width : 100%;",items:[[a.lang.common.notSet,""],[a.lang.flash.scaleAll,"showall"],[a.lang.flash.scaleNoBorder,"noborder"],[a.lang.flash.scaleFit,"exactfit"]],setup:b,commit:c},{id:"allowScriptAccess",type:"select",requiredContent:"embed[allowscriptaccess]",label:a.lang.flash.access,"default":"",style:"width : 100%;",
-items:[[a.lang.common.notSet,""],[a.lang.flash.accessAlways,"always"],[a.lang.flash.accessSameDomain,"samedomain"],[a.lang.flash.accessNever,"never"]],setup:b,commit:c}]},{type:"hbox",widths:["50%","50%"],children:[{id:"wmode",type:"select",requiredContent:"embed[wmode]",label:a.lang.flash.windowMode,"default":"",style:"width : 100%;",items:[[a.lang.common.notSet,""],[a.lang.flash.windowModeWindow,"window"],[a.lang.flash.windowModeOpaque,"opaque"],[a.lang.flash.windowModeTransparent,"transparent"]],
-setup:b,commit:c},{id:"quality",type:"select",requiredContent:"embed[quality]",label:a.lang.flash.quality,"default":"high",style:"width : 100%;",items:[[a.lang.common.notSet,""],[a.lang.flash.qualityBest,"best"],[a.lang.flash.qualityHigh,"high"],[a.lang.flash.qualityAutoHigh,"autohigh"],[a.lang.flash.qualityMedium,"medium"],[a.lang.flash.qualityAutoLow,"autolow"],[a.lang.flash.qualityLow,"low"]],setup:b,commit:c}]},{type:"hbox",widths:["50%","50%"],children:[{id:"align",type:"select",requiredContent:"object[align]",
-label:a.lang.common.align,"default":"",style:"width : 100%;",items:[[a.lang.common.notSet,""],[a.lang.common.alignLeft,"left"],[a.lang.flash.alignAbsBottom,"absBottom"],[a.lang.flash.alignAbsMiddle,"absMiddle"],[a.lang.flash.alignBaseline,"baseline"],[a.lang.common.alignBottom,"bottom"],[a.lang.common.alignMiddle,"middle"],[a.lang.common.alignRight,"right"],[a.lang.flash.alignTextTop,"textTop"],[a.lang.common.alignTop,"top"]],setup:b,commit:function(a,b,f,k,l){var h=this.getValue();c.apply(this,arguments);
-h&&(l.align=h)}},{type:"html",html:"\x3cdiv\x3e\x3c/div\x3e"}]},{type:"fieldset",label:CKEDITOR.tools.htmlEncode(a.lang.flash.flashvars),children:[{type:"vbox",padding:0,children:[{type:"checkbox",id:"menu",label:a.lang.flash.chkMenu,"default":!0,setup:b,commit:c},{type:"checkbox",id:"play",label:a.lang.flash.chkPlay,"default":!0,setup:b,commit:c},{type:"checkbox",id:"loop",label:a.lang.flash.chkLoop,"default":!0,setup:b,commit:c},{type:"checkbox",id:"allowFullScreen",label:a.lang.flash.chkFull,"default":!0,
-setup:b,commit:c}]}]}]},{id:"advanced",label:a.lang.common.advancedTab,elements:[{type:"hbox",children:[{type:"text",id:"id",requiredContent:"object[id]",label:a.lang.common.id,setup:b,commit:c}]},{type:"hbox",widths:["45%","55%"],children:[{type:"text",id:"bgcolor",requiredContent:"embed[bgcolor]",label:a.lang.flash.bgcolor,setup:b,commit:c},{type:"text",id:"class",requiredContent:"embed(cke-xyz)",label:a.lang.common.cssClass,setup:b,commit:c}]},{type:"text",id:"style",requiredContent:"embed{cke-xyz}",
-validate:CKEDITOR.dialog.validate.inlineStyle(a.lang.common.invalidInlineStyle),label:a.lang.common.cssStyle,setup:b,commit:c}]}]}})})();
\ No newline at end of file
+padding:0,children:[{type:"hbox",widths:["280px","110px"],align:"right",className:"cke_dialog_flash_url",children:[{id:"src",type:"text",label:a.lang.common.url,required:!0,validate:CKEDITOR.dialog.validate.notEmpty(a.lang.flash.validateSrc),setup:b,commit:c,onLoad:function(){var a=this.getDialog(),b=function(b){h.setAttribute("src",b);a.preview.setHtml('\x3cembed height\x3d"100%" width\x3d"100%" src\x3d"'+CKEDITOR.tools.htmlEncode(h.getAttribute("src"))+'" type\x3d"application/x-shockwave-flash"\x3e\x3c/embed\x3e')};
+a.preview=a.getContentElement("info","preview").getElement().getChild(3);this.on("change",function(a){a.data&&a.data.value&&b(a.data.value)});this.getInputElement().on("change",function(){b(this.getValue())},this)}},{type:"button",id:"browse",filebrowser:"info:src",hidden:!0,style:"display:inline-block;margin-top:14px;",label:a.lang.common.browseServer}]}]},{type:"hbox",widths:["25%","25%","25%","25%","25%"],children:[{type:"text",id:"width",requiredContent:"embed[width]",style:"width:95px",label:a.lang.common.width,
+validate:CKEDITOR.dialog.validate.htmlLength(a.lang.common.invalidHtmlLength.replace("%1",a.lang.common.width)),setup:b,commit:c},{type:"text",id:"height",requiredContent:"embed[height]",style:"width:95px",label:a.lang.common.height,validate:CKEDITOR.dialog.validate.htmlLength(a.lang.common.invalidHtmlLength.replace("%1",a.lang.common.height)),setup:b,commit:c},{type:"text",id:"hSpace",requiredContent:"embed[hspace]",style:"width:95px",label:a.lang.flash.hSpace,validate:CKEDITOR.dialog.validate.integer(a.lang.flash.validateHSpace),
+setup:b,commit:c},{type:"text",id:"vSpace",requiredContent:"embed[vspace]",style:"width:95px",label:a.lang.flash.vSpace,validate:CKEDITOR.dialog.validate.integer(a.lang.flash.validateVSpace),setup:b,commit:c}]},{type:"vbox",children:[{type:"html",id:"preview",style:"width:95%;",html:f}]}]},{id:"Upload",hidden:!0,filebrowser:"uploadButton",label:a.lang.common.upload,elements:[{type:"file",id:"upload",label:a.lang.common.upload,size:38},{type:"fileButton",id:"uploadButton",label:a.lang.common.uploadSubmit,
+filebrowser:"info:src","for":["Upload","upload"]}]},{id:"properties",label:a.lang.flash.propertiesTab,elements:[{type:"hbox",widths:["50%","50%"],children:[{id:"scale",type:"select",requiredContent:"embed[scale]",label:a.lang.flash.scale,"default":"",style:"width : 100%;",items:[[a.lang.common.notSet,""],[a.lang.flash.scaleAll,"showall"],[a.lang.flash.scaleNoBorder,"noborder"],[a.lang.flash.scaleFit,"exactfit"]],setup:b,commit:c},{id:"allowScriptAccess",type:"select",requiredContent:"embed[allowscriptaccess]",
+label:a.lang.flash.access,"default":"",style:"width : 100%;",items:[[a.lang.common.notSet,""],[a.lang.flash.accessAlways,"always"],[a.lang.flash.accessSameDomain,"samedomain"],[a.lang.flash.accessNever,"never"]],setup:b,commit:c}]},{type:"hbox",widths:["50%","50%"],children:[{id:"wmode",type:"select",requiredContent:"embed[wmode]",label:a.lang.flash.windowMode,"default":"",style:"width : 100%;",items:[[a.lang.common.notSet,""],[a.lang.flash.windowModeWindow,"window"],[a.lang.flash.windowModeOpaque,
+"opaque"],[a.lang.flash.windowModeTransparent,"transparent"]],setup:b,commit:c},{id:"quality",type:"select",requiredContent:"embed[quality]",label:a.lang.flash.quality,"default":"high",style:"width : 100%;",items:[[a.lang.common.notSet,""],[a.lang.flash.qualityBest,"best"],[a.lang.flash.qualityHigh,"high"],[a.lang.flash.qualityAutoHigh,"autohigh"],[a.lang.flash.qualityMedium,"medium"],[a.lang.flash.qualityAutoLow,"autolow"],[a.lang.flash.qualityLow,"low"]],setup:b,commit:c}]},{type:"hbox",widths:["50%",
+"50%"],children:[{id:"align",type:"select",requiredContent:"object[align]",label:a.lang.common.align,"default":"",style:"width : 100%;",items:[[a.lang.common.notSet,""],[a.lang.common.alignLeft,"left"],[a.lang.flash.alignAbsBottom,"absBottom"],[a.lang.flash.alignAbsMiddle,"absMiddle"],[a.lang.flash.alignBaseline,"baseline"],[a.lang.common.alignBottom,"bottom"],[a.lang.common.alignMiddle,"middle"],[a.lang.common.alignRight,"right"],[a.lang.flash.alignTextTop,"textTop"],[a.lang.common.alignTop,"top"]],
+setup:b,commit:function(a,b,f,k,l){var h=this.getValue();c.apply(this,arguments);h&&(l.align=h)}},{type:"html",html:"\x3cdiv\x3e\x3c/div\x3e"}]},{type:"fieldset",label:CKEDITOR.tools.htmlEncode(a.lang.flash.flashvars),children:[{type:"vbox",padding:0,children:[{type:"checkbox",id:"menu",label:a.lang.flash.chkMenu,"default":!0,setup:b,commit:c},{type:"checkbox",id:"play",label:a.lang.flash.chkPlay,"default":!0,setup:b,commit:c},{type:"checkbox",id:"loop",label:a.lang.flash.chkLoop,"default":!0,setup:b,
+commit:c},{type:"checkbox",id:"allowFullScreen",label:a.lang.flash.chkFull,"default":!0,setup:b,commit:c}]}]}]},{id:"advanced",label:a.lang.common.advancedTab,elements:[{type:"hbox",children:[{type:"text",id:"id",requiredContent:"object[id]",label:a.lang.common.id,setup:b,commit:c}]},{type:"hbox",widths:["45%","55%"],children:[{type:"text",id:"bgcolor",requiredContent:"embed[bgcolor]",label:a.lang.flash.bgcolor,setup:b,commit:c},{type:"text",id:"class",requiredContent:"embed(cke-xyz)",label:a.lang.common.cssClass,
+setup:b,commit:c}]},{type:"text",id:"style",requiredContent:"embed{cke-xyz}",validate:CKEDITOR.dialog.validate.inlineStyle(a.lang.common.invalidInlineStyle),label:a.lang.common.cssStyle,setup:b,commit:c}]}]}})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js
index 7e97b7e83b7..4361d380e18 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("button",function(b){function d(a){var b=this.getValue();b?(a.attributes[this.id]=b,"name"==this.id&&(a.attributes["data-cke-saved-name"]=b)):(delete a.attributes[this.id],"name"==this.id&&delete a.attributes["data-cke-saved-name"])}return{title:b.lang.forms.button.title,minWidth:350,minHeight:150,onShow:function(){delete this.button;var a=this.getParentEditor().getSelection().getSelectedElement();a&&a.is("input")&&a.getAttribute("type")in{button:1,reset:1,submit:1}&&(this.button=
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js
index 1ccfb3e5b9f..14d031db88e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("checkbox",function(d){return{title:d.lang.forms.checkboxAndRadio.checkboxTitle,minWidth:350,minHeight:140,onShow:function(){delete this.checkbox;var a=this.getParentEditor().getSelection().getSelectedElement();a&&"checkbox"==a.getAttribute("type")&&(this.checkbox=a,this.setupContent(a))},onOk:function(){var a,b=this.checkbox;b||(a=this.getParentEditor(),b=a.document.createElement("input"),b.setAttribute("type","checkbox"),a.insertElement(b));this.commitContent({element:b})},contents:[{id:"info",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js
index 13431bb2899..002122b2974 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("form",function(a){var d={action:1,id:1,method:1,enctype:1,target:1};return{title:a.lang.forms.form.title,minWidth:350,minHeight:200,onShow:function(){delete this.form;var b=this.getParentEditor().elementPath().contains("form",1);b&&(this.form=b,this.setupContent(b))},onOk:function(){var b,a=this.form,c=!a;c&&(b=this.getParentEditor(),a=b.document.createElement("form"),a.appendBogus());c&&b.insertElement(a);this.commitContent(a)},onLoad:function(){function a(b){this.setValue(b.getAttribute(this.id)||
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
index 2c7528d059c..c4800926955 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("hiddenfield",function(d){return{title:d.lang.forms.hidden.title,hiddenField:null,minWidth:350,minHeight:110,onShow:function(){delete this.hiddenField;var a=this.getParentEditor(),b=a.getSelection(),c=b.getSelectedElement();c&&c.data("cke-real-element-type")&&"hiddenfield"==c.data("cke-real-element-type")&&(this.hiddenField=c,c=a.restoreRealElement(this.hiddenField),this.setupContent(c),b.selectElement(this.hiddenField))},onOk:function(){var a=this.getValueOf("info","_cke_saved_name"),
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js
index 8cd3bf49c0c..bd398282b9a 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("radio",function(b){return{title:b.lang.forms.checkboxAndRadio.radioTitle,minWidth:350,minHeight:140,onShow:function(){delete this.radioButton;var a=this.getParentEditor().getSelection().getSelectedElement();a&&"input"==a.getName()&&"radio"==a.getAttribute("type")&&(this.radioButton=a,this.setupContent(a))},onOk:function(){var a,c=this.radioButton,b=!c;b&&(a=this.getParentEditor(),c=a.document.createElement("input"),c.setAttribute("type","radio"));b&&a.insertElement(c);this.commitContent({element:c})},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js
index 517ee9e3c6e..868f374aad8 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("select",function(c){function h(a,b,e,d,c){a=f(a);d=d?d.createElement("OPTION"):document.createElement("OPTION");if(a&&d&&"option"==d.getName())CKEDITOR.env.ie?(isNaN(parseInt(c,10))?a.$.options.add(d.$):a.$.options.add(d.$,c),d.$.innerHTML=0<b.length?b:"",d.$.value=e):(null!==c&&c<a.getChildCount()?a.getChild(0>c?0:c).insertBeforeMe(d):a.append(d),d.setText(0<b.length?b:""),d.setValue(e));else return!1;return d}function p(a){a=f(a);for(var b=g(a),e=a.getChildren().count()-1;0<=
@@ -7,14 +7,14 @@ e;e--)a.getChild(e).$.selected&&a.getChild(e).remove();k(a,b)}function q(a,b,e,d
 function k(a,b){a=f(a);if(0>b)return null;var e=a.getChildren().count();a.$.selectedIndex=b>=e?e-1:b;return a}function n(a){return(a=f(a))?a.getChildren():!1}function f(a){return a&&a.domId&&a.getInputElement().$?a.getInputElement():a&&a.$?a:!1}return{title:c.lang.forms.select.title,minWidth:CKEDITOR.env.ie?460:395,minHeight:CKEDITOR.env.ie?320:300,onShow:function(){delete this.selectBox;this.setupContent("clear");var a=this.getParentEditor().getSelection().getSelectedElement();if(a&&"select"==a.getName()){this.selectBox=
 a;this.setupContent(a.getName(),a);for(var a=n(a),b=0;b<a.count();b++)this.setupContent("option",a.getItem(b))}},onOk:function(){var a=this.getParentEditor(),b=this.selectBox,e=!b;e&&(b=a.document.createElement("select"));this.commitContent(b);if(e&&(a.insertElement(b),CKEDITOR.env.ie)){var d=a.getSelection(),c=d.createBookmarks();setTimeout(function(){d.selectBookmarks(c)},0)}},contents:[{id:"info",label:c.lang.forms.select.selectInfo,title:c.lang.forms.select.selectInfo,accessKey:"",elements:[{id:"txtName",
 type:"text",widths:["25%","75%"],labelLayout:"horizontal",label:c.lang.common.name,"default":"",accessKey:"N",style:"width:350px",setup:function(a,b){"clear"==a?this.setValue(this["default"]||""):"select"==a&&this.setValue(b.data("cke-saved-name")||b.getAttribute("name")||"")},commit:function(a){this.getValue()?a.data("cke-saved-name",this.getValue()):(a.data("cke-saved-name",!1),a.removeAttribute("name"))}},{id:"txtValue",type:"text",widths:["25%","75%"],labelLayout:"horizontal",label:c.lang.forms.select.value,
-style:"width:350px","default":"",className:"cke_disabled",onLoad:function(){this.getInputElement().setAttribute("readOnly",!0)},setup:function(a,b){"clear"==a?this.setValue(""):"option"==a&&b.getAttribute("selected")&&this.setValue(b.$.value)}},{type:"hbox",widths:["175px","170px"],children:[{id:"txtSize",type:"text",labelLayout:"horizontal",label:c.lang.forms.select.size,"default":"",accessKey:"S",style:"width:175px",validate:function(){var a=CKEDITOR.dialog.validate.integer(c.lang.common.validateNumberFailed);
+style:"width:350px","default":"",className:"cke_disabled",onLoad:function(){this.getInputElement().setAttribute("readOnly",!0)},setup:function(a,b){"clear"==a?this.setValue(""):"option"==a&&b.getAttribute("selected")&&this.setValue(b.$.value)}},{type:"hbox",className:"cke_dialog_forms_select_order_txtsize",widths:["175px","170px"],children:[{id:"txtSize",type:"text",labelLayout:"horizontal",label:c.lang.forms.select.size,"default":"",accessKey:"S",style:"width:175px",validate:function(){var a=CKEDITOR.dialog.validate.integer(c.lang.common.validateNumberFailed);
 return""===this.getValue()||a.apply(this)},setup:function(a,b){"select"==a&&this.setValue(b.getAttribute("size")||"");CKEDITOR.env.webkit&&this.getInputElement().setStyle("width","86px")},commit:function(a){this.getValue()?a.setAttribute("size",this.getValue()):a.removeAttribute("size")}},{type:"html",html:"\x3cspan\x3e"+CKEDITOR.tools.htmlEncode(c.lang.forms.select.lines)+"\x3c/span\x3e"}]},{type:"html",html:"\x3cspan\x3e"+CKEDITOR.tools.htmlEncode(c.lang.forms.select.opAvail)+"\x3c/span\x3e"},{type:"hbox",
-widths:["115px","115px","100px"],children:[{type:"vbox",children:[{id:"txtOptName",type:"text",label:c.lang.forms.select.opText,style:"width:115px",setup:function(a){"clear"==a&&this.setValue("")}},{type:"select",id:"cmbName",label:"",title:"",size:5,style:"width:115px;height:75px",items:[],onChange:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbValue"),e=a.getContentElement("info","txtOptName"),a=a.getContentElement("info","txtOptValue"),d=g(this);k(b,d);e.setValue(this.getValue());
-a.setValue(b.getValue())},setup:function(a,b){"clear"==a?m(this):"option"==a&&h(this,b.getText(),b.getText(),this.getDialog().getParentEditor().document)},commit:function(a){var b=this.getDialog(),e=n(this),d=n(b.getContentElement("info","cmbValue")),c=b.getContentElement("info","txtValue").getValue();m(a);for(var f=0;f<e.count();f++){var g=h(a,e.getItem(f).getValue(),d.getItem(f).getValue(),b.getParentEditor().document);d.getItem(f).getValue()==c&&(g.setAttribute("selected","selected"),g.selected=
-!0)}}}]},{type:"vbox",children:[{id:"txtOptValue",type:"text",label:c.lang.forms.select.opValue,style:"width:115px",setup:function(a){"clear"==a&&this.setValue("")}},{type:"select",id:"cmbValue",label:"",size:5,style:"width:115px;height:75px",items:[],onChange:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),e=a.getContentElement("info","txtOptName"),a=a.getContentElement("info","txtOptValue"),d=g(this);k(b,d);e.setValue(b.getValue());a.setValue(this.getValue())},setup:function(a,
-b){if("clear"==a)m(this);else if("option"==a){var e=b.getValue();h(this,e,e,this.getDialog().getParentEditor().document);"selected"==b.getAttribute("selected")&&this.getDialog().getContentElement("info","txtValue").setValue(e)}}}]},{type:"vbox",padding:5,children:[{type:"button",id:"btnAdd",label:c.lang.forms.select.btnAdd,title:c.lang.forms.select.btnAdd,style:"width:100%;",onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","txtOptName"),e=a.getContentElement("info","txtOptValue"),
-d=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue");h(d,b.getValue(),b.getValue(),a.getParentEditor().document);h(c,e.getValue(),e.getValue(),a.getParentEditor().document);b.setValue("");e.setValue("")}},{type:"button",id:"btnModify",label:c.lang.forms.select.btnModify,title:c.lang.forms.select.btnModify,style:"width:100%;",onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","txtOptName"),e=a.getContentElement("info","txtOptValue"),d=a.getContentElement("info",
-"cmbName"),a=a.getContentElement("info","cmbValue"),c=g(d);0<=c&&(q(d,c,b.getValue(),b.getValue()),q(a,c,e.getValue(),e.getValue()))}},{type:"button",id:"btnUp",style:"width:100%;",label:c.lang.forms.select.btnUp,title:c.lang.forms.select.btnUp,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue");l(b,-1,a.getParentEditor().document);l(c,-1,a.getParentEditor().document)}},{type:"button",id:"btnDown",style:"width:100%;",label:c.lang.forms.select.btnDown,
-title:c.lang.forms.select.btnDown,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue");l(b,1,a.getParentEditor().document);l(c,1,a.getParentEditor().document)}}]}]},{type:"hbox",widths:["40%","20%","40%"],children:[{type:"button",id:"btnSetValue",label:c.lang.forms.select.btnSetValue,title:c.lang.forms.select.btnSetValue,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbValue");a.getContentElement("info",
-"txtValue").setValue(b.getValue())}},{type:"button",id:"btnDelete",label:c.lang.forms.select.btnDelete,title:c.lang.forms.select.btnDelete,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue"),d=a.getContentElement("info","txtOptName"),a=a.getContentElement("info","txtOptValue");p(b);p(c);d.setValue("");a.setValue("")}},{type:"vbox",children:[{id:"chkMulti",type:"checkbox",label:c.lang.forms.select.chkMulti,"default":"",accessKey:"M",
-value:"checked",setup:function(a,b){"select"==a&&this.setValue(b.getAttribute("multiple"))},commit:function(a){this.getValue()?a.setAttribute("multiple",this.getValue()):a.removeAttribute("multiple")}},{id:"required",type:"checkbox",label:c.lang.forms.select.required,"default":"",accessKey:"Q",value:"checked",setup:function(a,b){"select"==a&&this.setValue(b.getAttribute("required"))},commit:function(a){this.getValue()?a.setAttribute("required","required"):a.removeAttribute("required")}}]}]}]}]}});
\ No newline at end of file
+widths:["115px","115px","100px"],className:"cke_dialog_forms_select_order",children:[{type:"vbox",children:[{id:"txtOptName",type:"text",label:c.lang.forms.select.opText,style:"width:115px",setup:function(a){"clear"==a&&this.setValue("")}},{type:"select",id:"cmbName",label:"",title:"",size:5,style:"width:115px;height:75px",items:[],onChange:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbValue"),e=a.getContentElement("info","txtOptName"),a=a.getContentElement("info","txtOptValue"),
+d=g(this);k(b,d);e.setValue(this.getValue());a.setValue(b.getValue())},setup:function(a,b){"clear"==a?m(this):"option"==a&&h(this,b.getText(),b.getText(),this.getDialog().getParentEditor().document)},commit:function(a){var b=this.getDialog(),e=n(this),d=n(b.getContentElement("info","cmbValue")),c=b.getContentElement("info","txtValue").getValue();m(a);for(var f=0;f<e.count();f++){var g=h(a,e.getItem(f).getValue(),d.getItem(f).getValue(),b.getParentEditor().document);d.getItem(f).getValue()==c&&(g.setAttribute("selected",
+"selected"),g.selected=!0)}}}]},{type:"vbox",children:[{id:"txtOptValue",type:"text",label:c.lang.forms.select.opValue,style:"width:115px",setup:function(a){"clear"==a&&this.setValue("")}},{type:"select",id:"cmbValue",label:"",size:5,style:"width:115px;height:75px",items:[],onChange:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),e=a.getContentElement("info","txtOptName"),a=a.getContentElement("info","txtOptValue"),d=g(this);k(b,d);e.setValue(b.getValue());a.setValue(this.getValue())},
+setup:function(a,b){if("clear"==a)m(this);else if("option"==a){var e=b.getValue();h(this,e,e,this.getDialog().getParentEditor().document);"selected"==b.getAttribute("selected")&&this.getDialog().getContentElement("info","txtValue").setValue(e)}}}]},{type:"vbox",padding:5,children:[{type:"button",id:"btnAdd",label:c.lang.forms.select.btnAdd,title:c.lang.forms.select.btnAdd,style:"width:100%;",onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","txtOptName"),e=a.getContentElement("info",
+"txtOptValue"),d=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue");h(d,b.getValue(),b.getValue(),a.getParentEditor().document);h(c,e.getValue(),e.getValue(),a.getParentEditor().document);b.setValue("");e.setValue("")}},{type:"button",id:"btnModify",label:c.lang.forms.select.btnModify,title:c.lang.forms.select.btnModify,style:"width:100%;",onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","txtOptName"),e=a.getContentElement("info","txtOptValue"),d=
+a.getContentElement("info","cmbName"),a=a.getContentElement("info","cmbValue"),c=g(d);0<=c&&(q(d,c,b.getValue(),b.getValue()),q(a,c,e.getValue(),e.getValue()))}},{type:"button",id:"btnUp",style:"width:100%;",label:c.lang.forms.select.btnUp,title:c.lang.forms.select.btnUp,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue");l(b,-1,a.getParentEditor().document);l(c,-1,a.getParentEditor().document)}},{type:"button",id:"btnDown",style:"width:100%;",
+label:c.lang.forms.select.btnDown,title:c.lang.forms.select.btnDown,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue");l(b,1,a.getParentEditor().document);l(c,1,a.getParentEditor().document)}}]}]},{type:"hbox",widths:["40%","20%","40%"],children:[{type:"button",id:"btnSetValue",label:c.lang.forms.select.btnSetValue,title:c.lang.forms.select.btnSetValue,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbValue");
+a.getContentElement("info","txtValue").setValue(b.getValue())}},{type:"button",id:"btnDelete",label:c.lang.forms.select.btnDelete,title:c.lang.forms.select.btnDelete,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue"),d=a.getContentElement("info","txtOptName"),a=a.getContentElement("info","txtOptValue");p(b);p(c);d.setValue("");a.setValue("")}},{type:"vbox",children:[{id:"chkMulti",type:"checkbox",label:c.lang.forms.select.chkMulti,
+"default":"",accessKey:"M",value:"checked",setup:function(a,b){"select"==a&&this.setValue(b.getAttribute("multiple"))},commit:function(a){this.getValue()?a.setAttribute("multiple",this.getValue()):a.removeAttribute("multiple")}},{id:"required",type:"checkbox",label:c.lang.forms.select.required,"default":"",accessKey:"Q",value:"checked",setup:function(a,b){"select"==a&&this.setValue(b.getAttribute("required"))},commit:function(a){this.getValue()?a.setAttribute("required","required"):a.removeAttribute("required")}}]}]}]}]}});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
index 8749a52f74f..f3c9eaf764d 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("textarea",function(b){return{title:b.lang.forms.textarea.title,minWidth:350,minHeight:220,onShow:function(){delete this.textarea;var a=this.getParentEditor().getSelection().getSelectedElement();a&&"textarea"==a.getName()&&(this.textarea=a,this.setupContent(a))},onOk:function(){var a,b=this.textarea,c=!b;c&&(a=this.getParentEditor(),b=a.document.createElement("textarea"));this.commitContent(b);c&&a.insertElement(b)},contents:[{id:"info",label:b.lang.forms.textarea.title,title:b.lang.forms.textarea.title,
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js
index ba95717df6f..bf62afbd0f2 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("textfield",function(b){function e(a){a=a.element;var b=this.getValue();b?a.setAttribute(this.id,b):a.removeAttribute(this.id)}function f(a){a=a.hasAttribute(this.id)&&a.getAttribute(this.id);this.setValue(a||"")}var g={email:1,password:1,search:1,tel:1,text:1,url:1};return{title:b.lang.forms.textfield.title,minWidth:350,minHeight:150,onShow:function(){delete this.textField;var a=this.getParentEditor().getSelection().getSelectedElement();!a||"input"!=a.getName()||!g[a.getAttribute("type")]&&
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/icons.png b/htdocs/includes/ckeditor/ckeditor/plugins/icons.png
index eaefc17a1077fa849c3d726b14dd3cebf2c7fc0e..958eedc340a777055aa5213176e9aadf0d044fde 100644
GIT binary patch
literal 12421
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
Xyuya|^pxP=3m}cVx+++-UF81(KEs1{

literal 20634
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

diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/icons_hidpi.png b/htdocs/includes/ckeditor/ckeditor/plugins/icons_hidpi.png
index 6e103c05f11690fe3f9fd56dbd67205b58d7e90d..7b069915f7616d49c3f6790a9b4d89491f9eafa1 100644
GIT binary patch
literal 40265
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
AssI20

literal 67753
zcmZsD1y~h-xAky1z#%;X(hU+4(xCLAJ48}CR9YJ8PU!~e5~MqX14uUtNH<7#N%+nG
zzW06a{l4de=i$K2FfcQ}z4zK{t$o7PRAh0n$gltaz?GMi(g0s+0N~Lv3?2L~1&4_H
zpP%KWBsASK_q{zbHK)=po$L-2wO?x=Ejs_;J;(Ys&Z}J8PY1K3S;N;RR7OwmlK;uZ
zL&`%N9^T7!qr|NewJzFAlHXhMfwqYb0)Em6IsXv1cb@sUces6<f5=|iYHd3=?8S3+
zbAK39w97UoqQ7|CzAgOxxP#Ih$Abi5MHz;Sml_5F4XD>pWCn2Qr4F?+<`w0u&&~Zt
zBS!7v;n6=fhVdNs`{+p4$o@GV)r-7q40Ip76+58I9se35wC@bL$*QG;eR@V4PRAe*
zDI^4tBsiR8IL0{WUTxk&q6>BJ1(?5KAy-dmI6FS>{&ah;(*%#m6DNeq#Y5%ebC|JU
zw8kXpGWm}g6EH0!(fp0!W1@fWIONqW{nrc3(a5<=7Sa+@uC_`yheYyd{I&&yx=nC!
zadT_S_5}U9zkU1WEt)+x$QhLchbXYv@RL7dWsST#oRbFH+&I{ehpg?JR$Yrn(6hE5
z<AqL4P4OMqdLF*;>5PAR@L{KkwW7&Xp8-EDB_jhnvIkPz6EHI0AfJ8ki;EK3E)~qP
zWA*&A@C~AM3QGb`1B0NWqZbIwR8niQE<aki0v;eV$7_+#M+MT9$OCiXQtCm>u;1_O
z1t5ZAx;Hy8!M!4-FPNd-u+Z+~+xz2<ExXIDt&ad3Q_xQWgdIcB8$4q=KbPkncaHkL
zMn-ak(qVZp|80~q7t0!~sQ0kCQ??=JU_`9c<5dR|qx)WgVSs}+Xg^F<4z>#11!-8V
zNuOv)tEUqx<jUcnVqwpZI=fh?u5=r;LX@YbFf7!A*oNQ?m_5P4^D<hZ5U~XRr)n7a
zUzx#=<EU_C=GK-5;6g9@kfP}UqkVI;F;Ex;XRg6fkEeklChKVoh;7h0y}!S`{jt$(
zspowU4T1MZK(e;Es%yBN&uho<8C71uFlj{*{S}XiQ|N~7@-PV=7WYp4G_ceOSFdhA
z{MemZl;4wc5=hIzN8$t6rxB5r`n<lPI6>lY=rt+|#nJwP&&GJJ8;o{YHSvW3aX|n!
zQgL))A^3@fMgQ4Hb#?W}pFalpsWAs-{U|O}bv+owIF_kFj0PivBU3mGbTl-f(#f<#
z+)Z-OJZ3sVtlZYtjMl66+XfE`ykvOINhFQh_J`KTCc4ZK5czoI2Z}o%u@==VoVN2x
z#lHEsqnQ{vFJ9BWPgyIVfeMdF#xsQFg&A{(ne|1xJb%-4{4HT|@m=<dT0G=tP;5{K
z3R&+0B&&vdbo;E+q*ekBb#`-e3dN&*hOXxSn_v<xC{}rAkd((imw+iM_~}y{b)R+v
zICSIVw^o1<)g3@41jUZ)42{APC+#&9ZfCygo;~o43D*W|kmV-ob&M;>!b=Jg@g{2B
zUD-CHJmB~UD575m(N9CWAxOKi&XvSdG*_-gubvo_QLJKny0wK+Cv?sd^f!}@UO-t9
zm?h+EAX;g<p*%QHE-Wmp(qXHbwJE8nK&ObVe5?Ocr<Eof4v{dxsFP;y$f5argjl)w
zMDG3h^XIOW6`HP9PDCzzH1kCuMKRB29*<p4;^^(Y)7XKF;OEuJNsZ=`61j%C0}STE
z?7s%E5{63+g&SFF&;9k03;}A5;x)I2ET~p#WK77nM2(~6PkwlmFP(pn=Sqe~pCB0R
zWh{Y9hGltRbcbCqVdgC3fMZ5d#`2mq=qt1F3p`CY0%(~k!$ukcs*vMPk5EE71v*Y}
z#glW@uuAZ-u)yUMz5Ur=Jcol2YbqE)i*w`ktJ-?zW!kz=WJ$U4$^wiTi!KgkF5#EQ
zoRcV{TvdZ3tquTMwWOn62ogm_6W%mVw@aIu3RSWD;!ha@m70QfjDYJt)UPB|iZHh%
zNrvw6^}SCO8@2+A5+eZx9)_c%qj9~S33uA~!q1?=!NC?LYTr9rK;Sb0imtk8Qe<A(
z!^6XP2rju_Nx2$?^LUW8lHy@U)%Rs?X=!PfT_d=Ve%bO58?{}Be6sJjcVQs?O8PC+
zYD9%4IFFg+^oFqB@qjTx`>PI@{hll}EgU8u&(IIX9bC;w9~)2}7#t1rbG-snWG-PT
z#<LXg{-gqlDA)LsVfa{~-ZfTDgiw@KH5ib&EhQdJFU}G?Yl%wx9Rmo0hr=Bs;HSln
z0(Nig>h(nQsG`@$XJ$e>+HdV9Yijo(08Te@$ALj1xx>6OfSUNp6MvJ`l0sp)c&dfl
zn;HibjYfmsz}QlDahU)74ln9;)}IRo;0%XIvHPyssgn~2nkCCgBBlLyJL{Y0l@?ua
z46O*t)Y)TIq#eILc}B(&9|?|wAO$lEhm48}p1FKLf!@%8>unKuuq)sm40p8JhyIMK
z>~|biR)lrdg`oSv#Sf_XDWbhqQI3TxfnVq=`d=c(O0Z4Q%96tKVA1O|5vFzU{13k@
zj7cb7y4v_S$FJZ4%gS1=j1}{w7r3}7&vpf488E?6UbSn#*`iEJN@6N2D^o=e?0f*j
z7}KX?Spuc^9dBM!6UoTP2&XPvt*1(M1K|F4n4N|dE63HJLH;*230$kva50YNOO?%R
zjhmO~@=bGdb53GjMFUYA!(z?R57obDe%#!WTR+t9wQ~vc*iez_O?$0?4+c$@&;6e>
z40QC5Qd2X`5p<<xrC2D#<WAUN9{qlg{|p@!Mytw5^M@UH&W$da%Qn<g!|#x9wh96A
z-w5pJ`^B2D<|0^>h!o=sqyUE>X*_Qkfv|h`;4TwDFqv7^(!j5l$B!23YVFtv&~Ds;
zi_tW2f+T}WQd08z?9T;eqmy|9UO#u3f*;@@M1hmXu_&R#hR-m7s#^hZ@KArhBleES
zSw8un%D1?9(CW1_$%QZOOvFisf>^22`yAZU<5@4tPl5yHihmNW#v2^nWLkNAFrGes
z^!zZC($R)7VZd)jFaG4|OW!&>fYYfLhZ6_Yb|~aBwde(hZnCtmuUJL%VT<zB!v+&y
zP;9;#BOEU@f9z;C0w$HR?*6V_^5DbB(G~UGjrSGqQiJP(7qBd+<thUeUGAWk`W%9Z
z9Ejk4$DalvihRmzJ6AWp#jdaL8839}vLg_Fx{`{irtn!#M1NoIZmotKc^?$JT>MNd
zfrzBuD;fwb$#)e0b_uu#z-w3oYh3;-<@_u6a9Mg0Ak{)<BEMjf{qRBP8!kx;7`c5`
z^fa4ZN=<AMV3JPm#Dw_#{rM`J=7ju-U-f<g-FLy(a@#Dr2)H0#4Kt*a^id6tE}TY+
zF06_T9RvM%2A6zL<4KA)w%VLYquv3SI;-^9z~#=FF#_aWnj~9r@$wQbPS4Nu8P>R;
z7!TeKqytDbg=GxRN?&7|^Qn2e+W7-lI09M2cIS`8_SNrr*ljv@gCl&B>Z)w4ixbmP
z>QIp#4{OB5ny7>f@(4kSUcMP4u~UQ7Z<?DHi)gz`j@Urz{-s-G%iSr9_)k$d3_VF-
ztMZVM{u2fZ=cRX#U$fctSG<G?lG>2ZhdZ+vIbs=LwG@}NkPg=6Sw0bdq-uAl4!pm@
zk0JKI0ZfI;X62v)<+|OpR<wWDFx?dti28TsS>@y5Si#35l|C1Qv<zR|7#{aF)Xtf6
zPiwt)>93)f*IoWG?+Hf^*hG@)V~3gQ>&k~y?k+kB$K2iBt;_Lj_Qn95WAC_oM$?14
zO}utm_7Ff#1NNtIKl<nPae0>=%n`6!w!^mdXgh@5%fRU-xbbdj**0?oKHtC~_b3h?
zl>j8PS8X~K#+yX=q?z{$ckGOrg>|os<d5%H=oU{<=7Dc=&!)EFj-p$<=>kk=;Si0h
zyRN11c2ww4&MSHktoqspA~B`p#P5E_&6=U$Q|FU0L1x6g+j(YfBnyLsZ)$e41i&?)
zIuaZddppH@^j483L4;w5h~03XoBR`3!nZ9+x*+6%Bi9)*n?tp5%z=Jm(aYeJrfX-+
zOb?H3Md3&Mga|=G1ScVanGnH%FTqR*ArA+UDGn~)+81J@;g8mCEf}F>W%KvVKWw6J
zV)?$`;(-s8lO&P3u!AOOA&EUaF()xAC(UfrU0akra*$=pZD#MEg8AR87v20VtE*rX
zEL0m+@R9mwe+8+SyHNOI7Y{5411TGpzSltCGy2B{a{&_4Tvq+%OI}?ap-Lz!M+&x9
z*^>a~fNens;YZ096JYXxc<=#X0<8q$qFnB9B8&eKuX47}(J(2`O4U56t~$v9uCCCz
zI1I&%6N%(BCXq40L3aqq5k75Q-lS=nWufJ+CK!EhWBbjsv&|!lAp&Qprkc`eu8?_<
zQ<^bh;5#QeDxL7yzM%W~l-?^R73f2ucP|bPaX6=5kH0v;pMm@O^=pOhpI=I{xY59n
z5p>-rQOOb>pb&HbyB|4x^s!8NU3Wc5EfI%JengjC>1#IpaAO($jMIFVy^yqxt<leA
z_g?^{;`49c@8<1&hvX(Go8;r{aNM=ueCQ#K`GHxA4`OTg)1BhNyM={=u;|k<xQM~4
zh~F|-3Q~n8yexi@17>l$0&A3%0b@Tl`3c;pAf##iS_So;@v`sTWn*oEg~qpMtnfvr
z%t`mONd$sr6CDF1zu3l{G>4EV5-mgYItLvo8J4~;o0Plzs!bf$90bRgdo4T2k&~$P
z=EKF*=T&jQu8|x)khUcz(Ij!bFNW1%aZzw_UWle<-&Kk@`wBkAIrz&w!<F*);SQ!z
zy;ah;rV<!<ZYAfeKob%Y9CT^8w8hFWDGnZ9p06=b?CI(4#e6ORJfiPZ+5HNpK(Sv{
zCf%8`R31Uq(qqXut-Rbp@E&7MakzBh?S}lmkON>K8+}JL;k_-ds{fSk7(HY!j4O=%
zYq}&`yJJ0H-60B!I0<?l1B*#Anz=^-@g^lej3RF-v3|Z|oagok@x_!ojWB<r|D9);
z1gs<vX~W-bRS!a$Zp+$EbMDS}yuC*PmhKX2cm4nmFK+<|mekdcXQOMkzN<r-3vWn7
zYMwBV>VRN}|7^i&%w%u6JZk<RWN0&>$27d2aO^B<X3xU#X2@twpH^%-9up=U`5O_B
z`R2sj_bg+X)Aw$jnzV8TJ7EB-zyg&J=OpaHAQ$M332cPX&M-2>;%e3|2m{(QEysdF
zFJDGc#V}1{<uT+IcNoo9+v<0%Go+D}`QjKO@}6tbW@^J|1!zAm>>alJ`SVK`I+Cld
zr5@*OAg74T%>FwTHR1|Io&iLRin1^hOj@DKgL#a6u9tOn`Tm=mn^7&oF^D;%?tuhG
zt|w?{!{g)QgY<pT<-$LH{J>br`A8{#{=tUP&sEjXP*OrdVmNQ~Oc?Ab7&SF<N{gS%
z5U9!;D>(6#GqVLPn))NYbYTbJhf5((gz4C@<>ObJU#_|~uQ&*js13fGzq|Jli?ZZt
z@VZ`Q4T>G={Rs&S40PbcaSuhcObF*9`=k`zjpC+)m!qPLfYGyJL9=2g&#<9^zh8Kh
zWgpBl(f$#NgTKdI@cnx~Xk_H>e`7um)^YS-2d=3jTff7f1^SziSpHf?FQ0uooa*1v
zc2}dBn&Jj$k&5TOVTaduh~1yRYWuTWrsU=(@aNB;)TJfEOi^z#m0|+$J}^IfrlFvy
zSbf<rpLmK%;P<=x_Zvk2q4Pxnodb5^`3r^jVuhN+$7@r<@-ZJR7a$*`qQVX-b;C-i
zEV%MwOy(lPU5}dykl1Dy^t=C))p8~Kd|A!ueS|9z15SV!B#<_&L`3jQJRb1ekI9%b
z2*oSxom9+M&OeLerXIdi5l_w>7wsrS9id0Q*Q=JWuBU(u+2?QQ8MfVB9%p)t%IQHr
zL`2*VlC%vms)WfQ^tMt;L+3j#T9Igwv3#pZhOccK@h@aDY(++~Xi)rS-Zk1c-AyX$
zKVwt^sKY@VOyj%uJx<}TE`gfkn~IK$s|#8RJo>Jh{(*r`Y2r8Ib}lakfMeiT&&iRW
zt>d_hC}RpM+2S!)@c8m_%<k@PW6jgpezjSl`s(VklAN5W16SEVlhhFydZ7FEw<}jp
zoNhLd#~{*w^CmJkmo`Ypb^g+J9t)E;VJr!W3bbo!Yd5x*l$1=ZpZpVU=G?S|Np1l@
zcB0bEeiHD_yB;pgqOaH?`c+4h{GK3(03v=~-hB=Z4m+3DMNYC$T(^~$LFc#kFeqeR
z^kyT0Uy9!2O~%1ZfYc!o9?}9>ns2l>N?;ojlH#+8B1)6wk<(>Mb}AL7^?%Ip0Mall
zOjA;EKNWvazi{18r9@`;>Un5Do?!~n7S!bA<n$VI;{0Gl&7+g!X!InbHHXle53`zZ
z(<jXsSKH_a+8ahL+QnQne|<@di!M3L#kFx}awbb{t08rQua;h~X-o$(%wMD`U$ByH
zYXv)T$%~-6t&NTEma;S?-!b$X?c(X<6k`hwP4YOJJeT%o+4&=%@=t;NCu+xX$9;Z`
zsMTDHi}epA5*gjuDRC_PNS!cl-Pu%2e_j|k@#kIwXqcK!x!7gWt<vJ<6DoK}KdlII
z@Q=~Q^<RP|w4P?y#x$DZMNL&(n^!2?P&tU^)tBRXAZyM`;*zwsZ|k`_nn=)J>r5ay
z9Rxr3e`t2N2FVZq1SSG}H3VC0d1Iqnc$^6w2F+m}Y@nBouA?O@+r_G%G8Fx=_PuLz
za*{Gmu7Hn;2_t~P|Cz#mEJ2~B{LikW1SVFMP_v)U^>IuT+>%u@o4^e1?6b*g<e|;?
zt)1e?AtzCfrErg>@GhmIdCMSSz}eK%<suZnkh-_fLug`pFJe%k`Q7Qp28WBnjx7CY
zTS@wR*`gnE-_0c7#0Qz>6ji8PYH1cQaDLMGgI{<~Qh4qe{)}2;Ei`dbWlB&)`gSxu
zg-JjugE1u~Wyr8n+qHGEX8s`gGe=71D-C??22QG6bNsw_r{=S4^1omD2+vw6`Z)>N
zrr>MJ?}-1+xa@0|a+JrEPhJhrl2-oCa5+mXBTg7Z$rKu*XJB{5$-<JR5fs?@ymYQs
z&g+3T<U+6IxeX3YMfU%~-Pe^}sr#tw7?Eg-MC_0W2saPTzN-+$ix<C6ZnhP#yw4|y
z75yA30--VYLmcfoEG*9=dZ-@O^k^{6<;h$Z*04RfXoHx;IWk7jbzfR*C{01M3Ix;R
zIBZ{=txp#1S_K72RING;_j{af$U~*L3ROCr+?BT8IQV-l1)w?Bq)4(a{wAu@IW(v@
zm5$uyx(U4!yK~SBp-PCJG4$B%Qxjo~XA6|C=zZd8f7d0<m`8)8Sk%vSV0*VCW5-`K
zg^N3a5L}S^dB4uzO1WuaVPU|e$`J=$MFU)|RYpS;li965{5n_>#EX-I21-ggY;KAy
zd!PTd28`=wlbt$^<v)DjiinI*D=<Wpmi~RTCj?m`UBNz2{eI<?$3YXshKfHHAhv(M
zUt2jfHFXec(F_K^c(TPW8-6yyqc$yoGefDH?aK*O!nFdxrYr#&&=bE({Y^yxevOLh
zGgpF!cqoBf&7a#_Fby?O3p$9OrM9_k^v4x}j07brDyp$A5k+68RW+cpjXR4^q8)>|
zCd_Eo>+Ye{8};ElH7X4W-miaAGyg)GCx3CdXZttgk9C28B>w%dUO7?hK-xrcbUL$s
zqEJa!58;~my(FhLLsIqnBy;zHL&t%`g*UUGGg#*hI7roP1A^qN*^TNy@(s2b>SzW+
z&3M<guND$`y*<1|D%#H{e_IRC(%=O8-rtNR6saouS?C5SF&?9%;-E`Tu0)X0?P}TQ
zSrL*d6(#Qcz#nI0P~+R}END2kCgLrzYTtP#M?J5i9wP0oWD7{MEf}-;rk}sZ{2stw
zCZoXksXdl$DE0}Olr72&<wy(sMSGpPWoI`+Y9Aufg0ZjIbr7E45cY3+w}LMIA5j4L
zA82|y8n#3<%6~o_1?V_To$Nwv)dsAv3&=I0Z}S825q>}Qg?Ow{zF+t<2C8MW03kbX
zV#39}dPvJrCj^-$4k44#{&mqqus)E%!8Ygn$cm3K1qHyO8$;y!24A|0Ei$jPw4fvC
zJ*JxU4*4|h1f$DS#Un?-Ho$a_q0<=dw&1b-tH*(vGbemSoo|{wsyD>^LOU@@nf4h9
z*mJ?qPs%HOMZQQG>p^4!b3-k3<x0zB)Cm)nQ>z%|m&i|@oJRC=45HULIXPEqW%#iB
zWLC->m+>-RILS<CUK2`p{+ye8p;hc80@Fn^Ci8nrv+*E5HPvDHQ<o;34&?X1{-%vw
ze6ngiO|J8<rn<1O+pgYq<D;<pjaV(IPX{%VN+t-s0;a5j`wnC_zlT?6uY=U<x`BZ|
z!ROB)&0Ao;`L@P)W%W^`jjsA@^$CG5H8ta#j-7Nv4!;gk=f?fqxhO{BNWlU*Gs9H=
z?Vv$K4*x)Cok&f8)dNtpva-HXm);pKpjBpk73EhT<D~Yeol@9q1GfI5H4;Thsc<xf
z#UCB8M`d0*Ukw#9bbq)(W{G&Ff_Pd;GB>u*vK9^GKM<cjeVT0ZIQu$d<m;W0eo+<_
zE6ekRo&euaVdre%5;Y3R#Ebfr$`}WOg1Jx;r~^`QjIr_}3`Brvh+sg8)|652Zhw?)
zskgY<w<RR3AQSDdO_*dYPg32MWpsr&uH=t1nYqHMDotwIAZ3CB_4tbbQqsfSNMWO#
ze|Km9@R}X0?Kms1rMjbvJcY<YoJ5S&u<}pRNXyI5hM1JZ4GpQj@{|8^An_M>W^Dms
z@Q7t#0kh!2+3J+ooyi@H#HQhGg<-vwkGcd3RKky82!;XqeX!TPSNW|MK=u$DecjmH
zmMkL7h03;%1tU|mIgCWbW)5VS2_t61JS4=!M63z1gSt6MKEXl|zcHhTd`Qm9(mFR=
zhCvx4YugM(fRFVVSB8WpGdil5Kd|JvO=<b}@*sZ~WTp~RQW_m8Fu1$C%G9t(M(yUb
zVgAT7`62nA5V7GPzePJx?ctiwZCHP~)Cfp@%iwK!{+S^HDiYyW*yL`&$S`bq_Q8MK
zOqu#9kM#YxrAE`C%;Qu(GxXBky&v&Smvh$5Alf-DRco*u*IM(!M(V~W_CldqeNo9o
zKb10)<G)|EKU}C887*gl$2m|CQ-+l$y$R=;uueXU!USnhUBZd!$$+`uUQGtW#m2X)
zo7HB0t``><v?Mrq*0{JkUO4%f@3vv?RP3*cO*L$75%{I|_I=<%dfJ9QH`Ak|qqd=s
zs1LEx1L5m<-0wNEqcGoDdVutQNO!6rZLVE=$R0}D)wd%bx6$ov-=%7|qouXZTv|C(
zrT1Pq>^bNYxS`#G-hX&OgvYO;K%nrK0HN|2L4<OR<<|lEjp;<Omfy%c8;vqDGC4mJ
z+Pk&&>5<6wN>@Si7`{g$ye1Q_fxrz}t);>BS7$W|S|6tlH@^I;OHS>3J`oJ~AYi&F
z(Lo_`PKHj#PnE?^13}z9{LXs*`r0hU!r+D9_dRibcFwYVv-P8FFGr;$)CnHTlf7~_
zc@}+RLQU(dnA&n3$%#Z3M|BsM{p85fvduh}SCfL7p#&sOn*flZ95TYlbpMwacf=%i
z|1W*+e8m5%&f~f39U{H^82y9;Ha*+>7=lcY^;HZ(V#xX$xGmpstZ(R1EQ?G%()|X7
zyN7veeG@}2K%H?}9oh@-C~=%3j!XY%pNy8_YoiXk=_u0tb`ojhwmaY?X+|ld!A?d|
zv5PC=-Fb8*wRl-uL-hv(eMM|@7yFNT5b#{UakqSZ{hnTtN^prn?|1CHr%!X%GVcL^
z^FtT3YL)XJ^^o^v5)UmWl@FlsCAXr&ZhhxRF-Tt0_6}ecK84Gg5BmUs`|nN+Vt#%B
z`~8ExKvx-BR!BEK<0)#vZ^+c-LqZ?5x3h`0^<FQ?dq_1+Xt<FQ^iMzHjQVaC!=5=Y
z-B1mJyL~8wE){=-g*+KQ<7C|ReS#`S=F|k&Gq`8(sI~ugKGTloaX_q3q#FgM0?U&3
zW)ijKLoFBn`U-f*jHDWT{FHKUvHy1!&6SkRbF<*_`-^J)IByrL55)%U81QSy8LEdg
z;UeDvd;lKmFUU$GSW?uZ7{<XeUgSOfHDod#AB^+vqqE$`%16|8i!XB=7PNu3_@Yx+
zl25AjBdO}I-n@wtt|SKO-rqY1Jq@a&FYqLq9wWD;pl?(v-L_w|YHMu?e&%{5LJI{2
z)BuLnDS;)p3Z<AR0WymriFj*c)B9tOMaq*FM@O1)Q_W^cc6vg*^+IhUN{ZdR47?n2
zl828E>#te0H1*20r05<W3sWaJhe^@VB%0pz5NAmAce5Nmw3lg>KdaMa19?#QtQZ3j
z`w-QVYJYvRgLZ7M7eeBHnx6g?+#=j3@yaU2;ziLfuq!5%?~)!$X`~N_4<;5BVPgUu
z(xm8!s^b7`A}g0Z8!5h5MM{sQ9&09?k)n*SX}?iJ0wt)N8rgF^g{7rx<2JIGgKC6m
zScR!-db<cs!Ccm9NTAPO4t2s%Oqx%Lktr6W@ic&V_OnOuM@B*GEnpJ;8l5d=0TYgK
zU=CWqB=G8PG2WgoACrNiXsVNx*TkWP<&`uasL(z`<-&PT`+WiH<4Vu+$m51eAiumS
zMg%gcD3QtlHFp_{*}e~m)OGl(AS2kk8@O7DSwUM`TW^^Qd*tAIUNf@P-eq6&5WD0g
z#t?s?j=PS0vQFU-C;`;nb*G>7zs)uf`j)>wKr@tA+?aw1g+$T7qNe{w<gJ|D--5z0
zb@+yXl=`28N}u{m^2X)p_6MI#wko~3e|rH$z0*%_@4;WHzM~k+|5{f^zRRlwQ`ixE
zrEqh_Z&yHU;QZJCWRSdio@n<I8@lJ>tSBh#bo17yUx}$Jcqp*kpJo45dfs-7@R%xn
zeH!tEbt8JVc5_C+#{KnB_V63uM}EDsRG#}HpPFf4zYh*9T2(TCfqI6*7D%@{0iS@w
zk2jkskMLiAVZ{&6DQ<K-&U>neUVryxjhMpgq%h?fj!Zt?5H|=Xzz+2$17rsdrGMsr
z#t(`O42m^syM4I5kx9VJWA55MGdY;6FJ3z<=GJtrt8dWa#zD>61_k&jNtSyOaiKhw
zD5a{p+}uvdCukrz`sVFj{IKJ>JQOpQy`ZDqUr&{S4H+|YaDdZn*h!^~`)W!m6@-qs
ze)Bhh<Di3TMtR%ipFK-pd4$3DwTrj6!)!3|AkW*;#Iv(AU-^8E)7h|fH(p-8aBO1s
zcxx-GjlW)hc6bse*-1BfUr-!@CImG*8>@H`sxgAZN&3V|g5A3@sH>vN=(f|=Xc7p8
znE&3j--gr-{8fELPQG~>5s`a)*m}gG@IF;zF5^o}bVQ%k?(RnEK*D`rG&M0xVKGZ#
zzSgKz)5y+A|7d2WDs!Q}X5?K6+aU$uqdaVRQ#16OTH~xkf`xsUVVw^!gdAIt;S#f#
zVk_`7-rGam-TMv~J*R?yUpkYnWrq#(k}==*g?-%4ej2o|n90s%t}ue*K<r23M+~Fw
zs~xEP4;WeZWeWMM&OdL%$)z;-IX(!khJa&+`r@oGZ7a}R+BNO=lCRd!B0~^hSYyh=
z5yt!(aqEsI^Gw-aZ*8_!GFih({EeBvSG^rw`7~pwn6Z;4c83BcoG^!lmhNm{9~A~u
zsFeJqYir>mqxZebOta?vBh-~lIUG+BCPo4n?V)oTb75m;^UW3pXhdkc<IY!WIsE-_
zZ$|f+o`!X>>hq5;;;@@1g@lb2x@Q1N&fU#e6x-0=%SV)h=~7YR4f9>R_>G_#?$>GT
zcULUN<t@70BIoO?1vP!1rK!#<vHw*LXj(6tD*Ld4L`h6aviK%oJIoGO4bX_l55*J7
zc@QhR<LcGjPgIeEOw1-+NCc9gJRN9X7Az1pL%=@ZBQif^TNLajd>|gyZNO>PV(sdr
z(MkSv*dAjUH84bgFs{~Hb!<Jk=?o+tiHO1s3qWRK23J}9D5`V2I6v}@>7(|gs9`AI
z6Ln>K8eR*X90ouvAx$Tae($x8E6@byk5_+hvT<O#Gv4R#H1OXN=Q($B5lRcG$4w}B
z?6Efr=cq+6WxEIDM${Z`oUCKYoAcp@bJZFk=YHM|mN$xu1HupA38D}?Ek8bg&X>zH
z2&)Ujmd`1ObC#EaASsR7FSHgKT-h15wYZbp+J4Fk+gP6UADQ(Zi%TN#%k0}8gU_m@
zyqvOLqgND;hO&Ek5%jiy(so-_HXxzkom{#(ROR!_U=YElzA^a3!pB#V$&Gd>$i-lR
z^UqC8Rl;oL<S)HrQjMl7v_y~fNiTYui*Bo;0KDI7%#*e!p*JnF<c92QxxF;WuY<;K
zjJbRM)$wKdu{oBCY_=;<P5#@FDc&2Sc20qjOQdJM4<$sK-dCBy4V*Gp5KQ7Zgvb+`
zG|c;RWmWO<;M`%3l3Fa4YO%V^9~i^bYrKy&V?4NglF<b1bhe@t$zskJ0M1iqOMbE>
zGcmogf3NX4NK1$K74h!}$f8jWSb2T@51)_Uqy5juV<WqYzt5Tev+qAbN*v}hKo~ve
zlwz<1T7{ziKJ9C@&un4JU@{n>D1x=4Bb+L=KW=uCW(-+T-Q9l9?3~Ut)=y0-r3LI&
zwtpn6*2x-S7~>?tQ8n_tnEDZcjXfd!R>gW6N+|teG^D#~{-9|;UXcUc!JcU9ug&J^
zCM#$k&`Ay+FeiJO8J8?BFONx%7up%p4NBs@!?U#=s4F2j&pJSD^;Rs2kQgKzSMs8(
zvc6*0)zyK#21x*OuW62!Qq~>JFPd;xk4Y*0{QFl@9-3oesJaxWGkJL2l(<FKL8-2H
zR8=o7FVUf|4WtR7Z2E1#_6Ns&G1W!V;+RKIJ{q;Z+tDa1!TJ&w;0L1Y%{W=Afp%=b
z>!rtFqJh6S4dWvQMSKpU_O|hThc+A}Rm!vyTQc!;aDygMkIo;k>l5c}YDU^oQ(*gx
zJ*@5&7oVS>JESMJF-LH6;%IRgEt%HMW<@LB_D4iMKm3P{WG9n=a|-eX%`AKIP$TJe
z321_XfHsHw-Ko})kPy>3?mQZrzExyRPoy?k`E;uZ=R)(!-I@I{Xk+;~8Ab<^=$S8G
z*gx_37D}-5*!<j8iG>~Qc;^lc`{P$4#lZP>|ABWwo$rErY<k<hZ^7DJ=<>%|hMrj-
zKcJIF#o3K|>1_6GAwUF2xJHHhDVSpV36K@3TqrZMp0&K;Ao(N%cIhNIAv$fS<);pU
zQR|;S=Z;++p!yvVAbc`P7NWHI5dHeVw0DDB<+s+>d1Aa!v!wSm66wxr4EUV`2~5o$
z?GGOT<lexuu?RnfH7eBO(L)i>g52C(aV0{dCqk2YG;kPfO!R7DVjwArR_fv?!IUj;
zR)CC@QBy<jqr16RWa@4_GgYRZkrCDkmJ2+F8U+zHw(BV3dc4x9CBrA)rzppTgQ~E@
zi|EHrD{(j9DyNDLmhS0^Y2fAKN>_Q@_hDQ!g(SqkZ{5F(v;6I!TU8VizSFT_@xtON
zhkpohihnFnIC;gzvR^7Hd^{%$<QH4rjyTLnLb%eDnAuq*Xz-hvSI%sq<7r=!Hv6`P
zS}A)y*u>B6KrGdsOG_d0vCi{;`C(cBwEp1&EiEmVBUvKzy1KeAXlM3<XH7eAGx%}w
zE-wwC#sYro90|^5NbD68;2Tls`uEH<p7}3%G+i~Ik01jCO9ob(9jH|md3kwT8v_Y9
zD#cFL%p^f<5vfAf$&EQBzv)f+F;Kjq#y&;tY6@)0s_Dhbtj^mT--Aw-c3=J-vG=xK
ze^RE!2k1z`JSYL?!UG@+&Dhr7zR^>dDy4xxb=Xo$5YO`wg<nU9FT0=Yk9wq8BrzLv
zoqjpKWPeep?^Ubq0ngj^AG5O_3WU;cJQrOk6}7)My(yyrV6^i9F9G5sjFuyNj7eQV
zK=ibqem<RyeEAH#y5USw%3uqNM?i_f)Ol9#w3bI_SMX`u+32lbZ*FnpRl?Sm<xLwJ
zwmIO&*suRa%%xQL?I^{~T~B1_=3>3|j4aRG+{W4SCUF_fAg=e=KQ~(z;qFvd3!asa
z)h&9!2>e!3<pAmX;EmG_h&$!Ap`oFH3|5E7v4p4B($>~i1n4KwkW}Sme0sb{eP6OS
zjP!#b90pD|L2y+`fLNjny1Sg4Dm&s#8wmz+IC^8NwfPdOefv$~@)1TiXR7Cthrx+Q
zih<*R0e{BGKn<I5HHE_5L*it^;6OqnFQ35B>!~TaJk&i6K#WtroN3N-G;wHfh`#U7
zEww_dn>^?k83iw~+40nz3i$&7Gh5@-s^BcYQ_&l4lK`<C=Bq-wm4Za7+S!9*@*<Ta
z>%HBLfIK=6Q;S03@@jPsR@MaHD!WCHkv@9buP?_UV(BLMhaALDyK{OkI&#D-zLv(5
zXQXfBt(l%^cifEJCQep@T_DjpdSRWLrROaMh@6)4^5|ywE@XtM#+G6l?f(Y-W00F>
z7`WvqJU4f8It#UHZ0!IIX`^Ffk6ITGRUc8kJg<IM_c|?FoC`c+fkrfcSM&XKD4_?_
zcuBl=UK@Ae`Bq|5-;<5p#0O7`xT=qCUzRZI+LjnR=6Oor{I}!|wr~{xPhkmQezj=i
zK=eOl=0El29_`=$w!gY0LlSe_lrLVC4by*zLqXRD$sLbhS-Tp<X;jQ8YjF<C@_X~E
zU=5quYSfHn52iAKL-Xg1Jz=6M*=m2${kBp1f9&q2ItUI!13OK$1t~0xrlz>UvIf0H
zD>4bJbTI>KpIZ5wl6(?+Ti-~mfjFKhQf5SiX)I3CWzQ_(p(2?hxc@MS{NteI&he_U
zCC59Mv&c#0uH70Tz%0CeH{T#CH|Y#?<4lL^tvr-fwAEDQR*YV4W!Pf@rzkmf1woi-
z5G6qhnIMbD;Zh++Y>{AkRHH#ACMUkz-0Ha5%0NgOd_F2=tz?5b_|6eAmz9f%l$VxX
z-w+#$M=w$d6?x7#b|^Qt-*ODg(8umCa20}<Q_4u9Rkx12r{O+Q?_(`KOeJZXj!oo?
zFg>DRme17fIrlhw*SFA|C=<BbV<`MCIc!K<l4Wt6%Z=l+sQpq&?NELT(yCVCQ`U_w
zqQA4Lk_uy`TX*VnT*~vq<-U3)E7D~mmf$H%a+mIWJkeKxl4gdL+ue3htUk)Z%a)PJ
zKzL27#o?P{Oie)<f*itrwGU6pairGGi<oG#^XFu^GsDQrWxsrjvh#l)2E=C?Q1ijw
zf9y=~2tyxN`7+LX8u7|zE-x8{MgqGaE*Ro>yUk&^VCVMo@#7$!Kjvc3(jQ>Cg#3|c
zaSl!Q-EK?G)X4oH=;VS(X?n&yX#ys>p^pcft7WF!YOv#LC#Ty9RWWG<WanIlLWSwB
zb46zt9k>pZ5X^jQFs|Du4hcxJ(jWoE$>PNJbV0eP>Vd=BP9|#z?G?U(kb3e5MmSQw
ze&9>dR#KFBi-er)yTQ!6^H<#i1z%*%%x`qvBwCJsn3z9&#aL~Q_K&-%wMUUAZ7A}z
zwvIb;>`dIal1ya4fkH@x9ad~^KDaPY1eMah<nn)vhC?N2OtKlL;)eP`?iVDPup?yq
z>oBh=Jf>x;D**B<|I`>0H^R9t!l<YNqnbSDON+6Vr_hq;nKH@O>068FTMj?lZmWb%
z69Z#bR>}5x-26_?QVZrh>@mOPn6PIpPZc#z-zr?-sZLMN{0L7<;x?;}Y6+a2(`$Af
zOyt^=Oj1dsOPQYTJ!K-ZwLe^Ld{p~(?9#)aqH`etLSuKJWlqZYeZODVh_U>MMx9@Z
z#$4Jy%gpZ+FOAm*%8zYVzgCv+T3MaDi-so&!~?YEu^MwYD{lcJ)9*4#l-XVZ_Fgwb
zzlFTXdQ09IpSF_vn1LR_O#;T1=l1R4MFR;ugDE9B+qK@Za=^hN7pn*zt^nk>q-91L
z{^}LbF4EifpXm1gH_VI*_;1MRxBLG`p#kS;I}ecm_+J0&%AHGj;QH|adR#;|+23Kn
zuiz5A0qid@VRbHx!Clgk5m020C}qhs8-Y$V=7VgNSDP6|OAOWhBfv;mY9*vOl1OA~
z?k7|?KBwRDobs3g7e5FNN8~xu%Fs6)EQFVn3;1AKDQ0><YtXa*tY!2lYaKjLLkQ*d
zYXRO7OaROX=z%CW-3;EU;MJqcBhKpH|7x)q(x!>%#{8+AF+C_vXB;~xm%9^nesOV-
zVv&XlMD}#K3uiHgcE`no-tn9uV+Bdcq18CouC+Y6Vg`B6A}$qJfFHr)VtcuMgAxiH
z8+(r5X{(}CJ|X=pzrKblNg*M3AviGLMyVwxG>;Y})uW`*W;IZQlWd``r&oG|&x>03
z;b5kH>+bAq43xYJar#TYaJ>^Gx6(?oGL98|SL1pm+Cfde<UNCGOhhXccKdK2`f$JO
zjn}%EkK3khQ3Cxg*w<4fSDAjpaOt*C$c*Kl6)Fb*Wnq%)w#KS`qN%Gp%fXKye(4gx
zos&$hYNvzT)X9UUFvx>M`E_TD3q{@_1^r3iwxN3`0SrnbuK~)Xt0N5D6F6q+1vj^#
zvR0wj%+1@Ch9-3sQJ82)NkL}X*4(T-SEr<@<we<TX2=9@oJdRp`H#7|xyzWQTXJ|k
z?K}7D=p!#CLKwPPyju65Mxr{cb!aHLR$32FK_UVS!5gnZefw{lD92a;(vpXWnDFbm
zhmS)^qg(PERx3;4WTnpub~Y<hpP8I7Qe_Szf2*ht_L#9xEQI_z@DX|FS#lf6JD)zi
z<^gjI@P<^o?^Qx+scS7;hBGJQQGlQ>b@>gNgx~T}UnR9yY`C?Lwa<r>4ia2+(1-kM
z@i2QfBC>w^Zav%3Yl3g%tOr^b;^MDow?+hnC`(GKBe5YMf7L=XoaPh(pDbsz9~>KE
zJ=oimw6}k*5E)r4_3<OwPrH?U#vhixG*ubvHzu_xn0m%K;|JHxrS%HTgk4XEQmA8E
zJ=GMhgwOVC?QNIp!cqJ@&bAe2e0CIX*S4;@m;ZJ?(xdYJO{>FBl)BcHprH^t8)^0;
z-Eu6MX=77jK3#$Zt?%sj{yw4Ta-%)9Us@1c`reLK#u`_JDQG{U?Dyipt0G?IG~rpZ
z+F8@c7#jKC`+EeJcJr3x(~xSe9FF`NHhKyy+P=*>yp`AGj(`>dmgTXP=6QN{riilg
zbLWSFwO#uxU%)s){l!J&9}JA`_opU+=__wdY~JBaQd^V+%pAfz<~3*4M_HaHJ(Mm9
zAk_;aRZFOF_57v^qrd<MGXSEpC$6EWsNUX@C~d_Jen|<N?6&Oe$`*x%pb3;FNIaH-
z;^^QB-u^GHHnchknC<R~@IQveuNlHO#&0$`Ti;lZ8r8wnWO?D<G@#F}?Ruu80;TU8
zh7<;Up));sI44D)G7s6ObYrd4_a)^T={0i)ZcDSMG=}y?HPyK$?F=xuG#6tCW2u7I
z1s`7-@ZGJa`)a|>h?xSfPwL0UV^)*NU>I=wdEUMeAF&p=SjoY`OmZnlbgQ4t1#;{{
zer0C&iv8`@6-|g(^Vt*|+6Whv=diDN%&rRglZHgKFEn*D)+9B<F#t6KqYkybyf`tv
zh&&|dpDt*-tN6jB!Zt1Hwz*aFgNzJXe)D>@E>&l4HgyK6p0!<^_S1-~cJ_^qx>iG7
zO&&z*{`FbYVl~FJR7ZLQo0*=sx3sjbE}FEntvVr^7HIdV1tWLjov>&rcKc1aJuVIo
z4k!+T12Fj$VQp=~?oLjt7w)lpuBf|Co&66#dp|Kp&^%MG>_fG;<2XG%HRdIwg+czM
zg`dRyy^i4$)3zbgP*|?Cea9I=F|&H{(S$!E;USAjvZmPN;Jp<{BvvdejAS4F;*x_k
z+c5Y~0a+hcW;&L<u2g;22+?u}ZTRO2l2f0W>ssQ<tgmL@@4wx*wVoM8ad<(y@jM@2
zLm_)$e94!?o$aZ<!j6@~4v1Y>1hvRChbYQoB>saUL!*P5$ix{AUj|gmsm0X0D%u^k
zHZHlZd#PcCz=P-?3!n7Ur%3XwTZC1YxT1=8uicz&OUBb+Lm1S9x-A1)nBLkppnXb0
z&JCVAhV6RhF+{{dQO>qU4I<u+e|nzi_swPc>r_0m3~MxxhNg06Kg}n#Kko3RqW8O+
zDHPhEV+%(?oyTRDeH4>`dnq@G55?1PNiVPyP{+ld7$0|dMuCSN&mfV^P^X-2NU?j^
zejZ6T&R?0IuZ%AZ`fRe7V_FYehF)x(9hmA81u%D+R{K@Y^H4?2;_K+^X@bQFDcgAY
z2-36@GF3LKCWs?X2+kf64QDhGlFIlDg!q+#|DN@`%*VHb))gm@5r)kdTN$VneVFNE
zCTl^M;vs=t<dCvGYpea5Ep@cxDSi9<z(0$M==mSWX&J1Xk}ZC!WVrGSZ`B2InL%Cz
z2V1igg5ys)gp3I+Qm`*5$85A4dF@$L#NC|gk0KdNz*WTsHIZ&{<oV2TCNwukwr0>m
zR6F~^_u;M#vl~e4vWwAkVlGrOCk4%xGR02igjn}4UU#O|1GLs>j!wB39sEbw*x2ei
zYJOc^px-)r)rU@3<~E8{F;*s5B!Q?uThwXmnY4i;pA&iIOZrhq1~AUS7Hy)nn2<n0
z(f_yc-9t0H$zrfT-ctITQ}$RWpY^mc!s7+KoW}5k1t&@Dy0e1Y!iUhxrjmX|aL7$s
z;<drzh-?hyE%C8e*U0zxm`bHzbcX=AChJ=o5_9|JO(H<fnJB1w{=icw`LjJI2@)Rg
zrM^B`_Ugze{IL*|De2_Tj=J221`Um)EDPOXgDPV{oQn3l$SEWi6g7Q~utE^kA58hv
zkb)FO%32au5cF<sOj=O7(Mj%!U5?S8u2_si+T#E;L9i4y{pqQhWopolO-F$Nj*1Ao
z>>_|y_?z-mXarah5ga1kyPD2Bn;ypzYu489t}PTMk=9ye^;<s&5}d$6I~*DMDD~ng
zZQ#zV7dl78UfOh9(Mlp6Phz|KdV1P1D0bvMtgZQGJto`Z?fu7I(`u=!=+u#>n}&In
za|#8HUt(DQH41f4U*S8-dBlTx`oMWM_g8@Sp<4LVNMWV3I4k}ezy6>B@4AuD3n6T1
zw4_e5iGoZ2I||mK-AD3Kehl((l$E2O5Itj}e*-T(%JA5v7MTUUBH|eJO3R^&HhikG
zCpMfgeli+?6C&T&zWt!F^}yBacJ%We-r+1NAohX@0vY2$1!Z!*4$*bQ^pY!iIyo7j
zFhjY}D!_`LPv!qq9u$Q9HcEx^D?n~RNYKfVv%Ed)i`_e&P_`DcI(%#Z|Mfblg`b=&
zO4Is@EOqew!D#w-W=KsQAWz5_?+-s^{UilW#OzvIrLtUHkjBY<l}>nl(Je20@tvUm
z!d=bCU_^6jy67oax?f(DZk#Or$p(QcG9xAQPdb^U1{uDY`uafB_w|_ksvH1J{89NO
z?+kjOi4*vb%otBV<#=^?g@%lrJfYpek{vZ37gQ|;CESszYr_Lg(f(2l#@vNA6E=14
zYBb)2$8nNqjFv_f8Z$Q3(=KlYa1D^r4sfGGP@L_SMcdkV%hOIselN5y#`2olVHJ?S
zGWtbBA>_ZI%wNP6YbX9z7#2xRuAU?FM+KbS9H)kXFnWyp*>e_ubLDA}f(ywCS}y2y
zckN7#bs;V=7H;5*wZ&%8#}J;HQr~<UXi}GsR|ubSK?-y+WUH7yTPHfEd})4M$o7n@
z#?IgA{^@W-ThJIPy|mgG8V)Usz6l`;1WD$`x%0+^FHOU4igXGsp1BME0yRe0g@uYJ
z5CuhD>CgQ;M?8#+xqk@d(W!Lhd{ymXnjy%lLsyrKw_M-tj9eM>z#@a*F9Iw1|1qOp
zdm{cfq1^f6HI*v31^E9q`yZbCU(mjS<T7*Gbv4+uVi7O!&$SH7=5ZW-Ys~)K1)X1Z
z-z2*}<H!9=9Zo)Wzw{W3YVZ4x1VEjUbKGy2=Ho4=F@r}ds#eo2PXrc@Nec-pMbCzn
zfYuNZg00jMhcu;Mjc>;uva+&7LrkJ-U%s4s%g<MTcarutDt0p)g1r1hF3@t|TF1-B
zmzbEik$t#Bx^S^m?0J`)3b0Zz5;&GmtGn&j>($5BVsWnZ1gTjO3XWbEZ)aJPP>`gG
zfxeuFeCmg)$VZ`RLt5p3l9RJ)_Pv&o$h%oe%3v=B(@ZY!kL~ux#-f`|H+s5g9v(9C
zgr8<W3uDUrY=i2L7Zh>ZpK`^Kax8o?bTmWUQ1$NvKZ;vXY@k)Pmiqc=V;`bsHcuhr
zU61UcRTIQGSZy>&Vi;`ht)A{DWo3mRiw}8atVG1Ne;@9rOp>RdJWcAL5|55{oHAp0
z%R_6<MQh$^ZU61UR#zPy)<i{O0lRLIx9Aw2gn+lCB<ers;nCA?1qt>M)9`TPUtgz*
z_$hkNNqHE6P}#>hySl~~Q*0m0z?sCSK{WW`E3IOGCOFG!17~sI`1fv5j&!lVlpOf}
z^Q+9$yVbhoE^K|dW=n10Oc9iwMn2Y@R4J2d(wtvXoe)&Q1v5uY@*_-0<l+fmol*K<
z;Dw?_Fq28hJq2_|wkAP_9PQx1zITvBT0A~v=#~Kg2PN72qX|vz#P3?M%AeTTv53Qw
z>lge$s&UTGHyRocz@CXAho!9VIbKk#y2AX)GD}S+r!gJv#?L$HNOZ(1r)5J!)?41R
zU2}Ov-~KF?UuuM87g1Q_5kA5c!c2eAt~ru0UI|;dd#cEP<0ZPWu~9dY&bQYlPU9Et
zaTZO0Fg?odhJj;erOe$pla?+xRdFyjB5Z+7iJz_U`+TCICQBe`xFT4=IJ5r#>h@me
z<C2GcPci8fB!`eAl>Txy^r*wA=S&zhEr~VVUshb7t7PCx-3wsy*EiI&puQa?JPS|*
zjinesw{TuJ48#h$$tNk>*+v!@?n|y)o8Nplkp4z^=U3~4WfdAgmDOY;uFCd&=+)8l
zqKJS|df8K4kl?4cb3g(6^}paXBP2z$tHD{lJlknDH1Rg9YnUL#&x91&Zyp{sLIT=#
zLZ90fR|Su$V?>|5QW#TH$PfA?GqLI#*=+cH<T-QBQk(FubE~utTfPm~t!m~k0Kv>f
z@_T(uG~*@5^FmF{$}#3b`yaJk19XMw?M=@1Wi#>@tqF5)F$dcWl)GOk5TGr~$%(hp
zfr>C#g^J{fTk#WTiLUOMd$yFy)i|VX#dN*K`2i{^U(+YRJW3F-feNk#CbOm@<?QxC
zuhWebBxksdLe^7a1H!hoLDo&yiZ%_ys&^CNckcwlgU?bpF6hZ}SXd@Kz8JjH*P9mj
z`Lm9gknks!pqC(V#OYQQq3f+}`KM1Q&*HyBC27Hm{qTEaL`1LSuaV!sy#QPv*5(g0
zDP&(Ok8FlMq7nv-?enlST>P!A6o>wRI>W)LTG*<4*8Oqdqx9T|s8ZuCc0K0;=I52%
zgg9%%X*}20>oKh;N~Psxp3i31n@0~$#7#(c$_19fe0hcR#cKx1(=%pNpFOv~!o}mZ
z5sXqM7XS^)%Or7!T>))v3R&CW6nFJT05-6)3}{mP>hSG(t!?xPbS$aKb7ytf%<_;>
z*)g!7XkYyNvd08IgV7HZ-JCf5_Df#@LA(|J>mcc*q~&<&$HILk4)0)BOHQgVq%Ry1
z4Y?j^JZgK@e9$lt$3r(UC0WlaRFsXAlUm8}pi=b=vPgpst)28y&pb0yg1w+hsVMr=
z?i0=ogFypRXP5AR7y^VB0M6lHBSjj^4azh%HUD`x0b%=!k}o#`-=(q1rD>FQ?8_LH
z$@X`4zzNUmNxqqtnzD*Nmtlh@!vi<ylCbVCdDmBem;bV&T)TLYA^KZbD_X3K-o9mm
z_=tId!<93)hqq7jUh#6F2p!kI&GMNOvYuuG$AsaCRC-W#4tbZ!gF71C(2$YK40>)i
zpFCk681t33{i8E$LBJ%+=f0&B$jH>-F+{Yf$g1s=p^@H(1}vbiJc<$hQ^M_b_~zPM
zw21;w)k%N;BcKczJHNDVNE=bfTIUoL45ME3ZiLVnmPN2sl(>IwFWPExVEzvNZSd_B
zTG#64F;Lz}!7!heT(L11;uN00SNP&}md;m~mlpt{xuLKS8kwOeQjAfdBjLG)NyHu*
z8FS%z{$pv)<ky<#)6>(Fr>Bk|EgjTuxvVJ-^wAl#41HeQkGge`7bWte=)CkeHP_S7
zK-lt=-(Lhi8cdullifO?Byq2<t4qv!>HYF{kRVR2vK2*;r4VCHR7i$}FS=h_p5@?m
zhnOUb?NG}pl;KeOZwGIMW17atxA9&syJLTTvCjNkk-awZSK3GA04RYul;Q8QSAmp(
zD0&qxQY-4ip6p8qYgo^znuUkQhY#wHPfyR(HFaRXKgP&3f0Xm{%eCupg8#$SUw}mw
zwci8ip*ti50SW1lknU1MIwYl}ySrN&ly0PvZjf#f>FzG+Zn)d;cfbF4pL-sj!!Tz!
zGqY#T-tW8Kwbm;bx7`-T6o04u>=?SPKmGAzj~SHpf#xHdu9xb&U!h1<zoCD>A#C57
ztJQ;h8jt%q7SswuzHVg_itI{Q?6i##{#@lFFagNe?yw^PLRa+!1Oh=1sCW{!X%Q3f
z&cTiF9)I!oQF>iXN6z#l+=9wDp-fcK3pMT+&7Jq2K>O6T9F0pWS3ylp{i&?!@%GW<
zsIkv;T$Z~Mv%q1wGUq)O8LxeAyB=#2G6fwIUHe2Z;#FBX{{T!gN5XS;yQS=RER)j{
zzTt0I&Td9#XB$1H%d~Z<qNPVB$Hw090Eq!jbRS&tVDK;&X*beQYpNp0m+M63#QKKo
z@3(WB$0T3CoL^Q}w%Fu+U=F+T?mX|}6+{h%L0Y~$8aPK~+D$2-dgqJ;3j-bs{=qdo
zoUHR$FWd~pk?B)auKJ1_Sl-h3oWd3x9SR8Ab)g9yvBOt^%^#3=DFV-*{VOt+z$sv?
z#HaJSxXY*W^#Fl9;8ht(C*V=?d9l-sShJ-X*rAy3?bXBaAg?fp{VFm<z!r0dv=CNI
z51tH;{&eN=4BbDKW@Oxrm~yZarAv}K`cef_b-#8nsKA(sisl(w?G6=BYx(xDxgeX+
z{T|0=E%IggI?or}{qF7)KP+@a1AWVij$ZOZX<z8W4k+I`$h%A*MIVxGO}wUUn$O%$
zexH(Y=)L@-?8m?TRq2mgazgZ1M3G{QKkZV2%Y8?A7#XNV0p_RfwCF?u)%WBP42Hx#
zU2g4JH~66ii>>ftDn`LY^lEgelDB1L2@!>MFR<4y+Ybndg?Lm1#Kze!JD&|AZFCcj
zO2XgV+=#b+>%#+r(MnN?oJsws(VQbpwT3?f{Lal~ljblXkGYnquP2>SKEO!rqRf6a
zdXvoB^wa%UK&(cSXXBvh8$Zb<4k$60k0xJ4RyLBG1T#R)aopEvJNhF`;pADZQvQr2
z6|9HcPz-lr5-ecbow~N@fDcJQRK!SSQjPWP&J&dsur(2W-@}o8?A~%cQ6S``KZEM|
zSU1mH3kZz}a4^UE0PbDVzj^s4)uB9F$&5o{J^$}-DaPTmm25@FtMeM~lPLbN;3WBC
z$hSrKv0q+u!I~SOn1oRHb0+n6(^{L)$0>9$UCj;WDHcR8f}h1!z^XUuBfzcHe#Z+L
zJ~e}}t@>Vh5+PTRnrKihT0Wh#yw{U)wTy*+e(}KV>q5at2@g4u8y3x)KS(Ky2MlGz
z2AFa%7~5pw706{8%aQP3dZAaIv#c7wrPqdAd0}E*=JI=^pBY?kEjn18tPLYmi1qUr
znZrn;*#9U>v9SSw9?7=+y06Dr0apwX8?is98%h^y`OHc^CcC$Ytf%Pqu7^Hdwdoho
zC;};D&Zvmo3#On4xnD+bAz1Y2UA~gVY%k(bU-w0=?uX*Oh?gt?Iw}gNCso(`CY@!;
z%f-#wx@^(#jcCERpV4e!b1gug;dG9uzjS^6tT6=yk@{hPvewCJ%Il0?N-LkQ^6G#x
zIk!6po4x5y$LHY!>+yWQ`m5kktHtio5sPBcN1_BH{sYV}+Z{-xE2^cMoLJB&U0pII
zZ~(l?+6Gglk79Y9U)THW4kwE6s1d#B;^(??A+3M|B)e`8qITh-!eWC7rqmzsT`N09
z$~=i5am9raq+1L~-%c+u?UrL^AMN1z0)D6n@+w^(8f00V%oZ@(O;1se*2&7_eo8fz
zDfHk4U13Q3eSO8KsIA;(I`OwgibTi`mS8v|9W~2o0d7*7{)ZYVuctcl`&VDVLLMmg
zy*N3O2NM{sKoz8fUP`5(>Fv&cJ)`Kfd*<f2nTv!UwGNqeOaulGC$hZPaN}jPC9&X2
z{XV&ygq+v;{o$?v*7W6HlJ#u(yosk7pC|6u<%L<gT5Uq8!Hv$H2(<L0RI&&>@9A6C
z4e-l=uI%4->=M1kqHvE8)+Ta7K=%mSqnmY&hUeq=|92<r*HZ&2a2S-x!4~xNjHzOK
ztJPw7(2JnmKU%k0>f$i%<}AlyYdBggkEqhhl!+BuN#ih!>d@1}K!n=^Hzn8C8W{Ds
zk_j`mDUJpH(2NHP{J{Dl;z@{0<E53nx(0i^5Q48z^ihEg9pn_e%s9iyHzYaJWXwMb
z)w%T%kSWLmeN~ELs2Q*$@3f$bXUWSkv~V*z>Pn{@RTgEHax9DnFbf!?ass)fUm=lq
z;&88j_rnaZ0!iM^-`!Q%4sybOVt-fB_C_><pV*OHP)Ib%gG%A#6*ngrk^M`|U<e(#
z<9ot$W<u1C^$XNzZBNwD6D)aYM=C;hjBrc|DNq&nMUzHy1|s*ZlC|EdY~_f5IsL@X
z=RNJQ+WDhlT{uZebFN=O^YH2>OSQP;OaS%l?1d<H`;W=v^Q&dY>zPXY5Q!%;U)_Qh
z_=pKa5o9rt7Gn}6^yEYfGs6dn&N$d7bU#VZTk$!Z8a`S9I;wOc^Y`*{ti{E}nHn?P
zsdC+DfKRd$C2SJy{gqMuvTg^V^z{{Huz%5Ma_7{pw5NVepf>I!^kHOspt#sfQ3YRi
zZs{$(pcMUP)6b@x8?@&N(yGs8HHn6v{;IX1PEAeTgsOTx)3^MVOBBNllcOYBIt_TI
z^VjLf6m65lk*wYCcE8pg!HqyG!Y`eh0Lx~vvq1PxL&Q<<p5Ip(cIRe|psjHB?6B$Q
zx9nHMzQef;?X2MA`^bc*eQP~qSgXGBdr<bq4;$xIATWUNglN4_&N9&gV*qOs3tLPG
zV>GY2!<5xk*KIQ%@(rR#{iT>hD5fV9`Ff(;v{pD@AR4fh9DnCcNQ^nNP;4MUs&eHe
z6Zbm=Z97ueFCpv3J!bctKQEFZB@}`?h(FbJ>kk!PxPMgn2r%+0K)!fS9vH#YCrJ`F
zh7YxZ2=%q7-`V2gy;|Eb!dCamI#>>~d_@Q)^pO2*^s=-I#?yJd_h()ez0FY-QPM}D
zFf=*sZRvl_-DPsby4f7nJ<5T)^2&D*dK`_*BnzJrp+eXajmTz8O0^>M1$2;0^eTB7
zzm(fsBPI%k;z_{60(+o8-PzskILUc04B1lp4xz9qDN5-gRfs)$|2;SJTqj=EQ;$bA
z1`KX@_mR=%r@eqC7oQV@#;Zj6^sp!QbHxsRR$#dV58SX?R6USl%xRlB2Tv%2v8%$c
zv%{W{%`Xbz#kx(fq*k%u(RcCG!*joyHz%#x3l?(|>OTfs7UR>SE?h)E5sqn;%ELAY
zb-8g-m@&x*psk&CAy8ewS9d`1c+*NzCW-r1vlGpR{r*@&_amg|?wN?k;vwHb@`Hg!
zAR)X^U4SIu!{SRYhN@O1WNB$?OB5-=R+hejKDp~CQ#bj0r$*D(-&d}jfM3@;nF^`#
zc5m-f-GU=vocX)xt+0QIB56#=3NmE5J?Tv$s;g^WXmyw_lO-6+@PcV?2?_rhucC0=
zMD4J>l^CC}Cd_4tjsBtQHY}cT)saVpYQXI$5i4|ktS2o!%MH>5v=<Q);^f%ah@L{{
z9s;J;*3Zd+RRWLGZB4~`B)2;iwGQNayR}uZXgYC!GiwsWB>i_GXv?DPb68kdd*R2O
zbN9;iyhKU;I5{y`NJvBN(}2}{-5{&al7Q%nTZbXX8+;%>x6y;X>tVP0!O+n1r&{SW
zt4E0=LJDjVG{7MUCu0N`D$%FHLPZYUl$0FQ75OC!al@J3P5V5k8Q)zV>=Vz|tycDt
z1_0gt^xnJo?~(G=)Yi-SU8+v}Y-MPanVP96HX?J+TEBA=byP8Z{PrG0l1zXsFb1T*
zL?KxCF3_*xfq|~gfkZ{1Ie71Lg7!VTnFO1%w&ySncuK%Xu?O3X?>Le(;ER~;&zX>*
z{Kxr=8-?N>Hf>pnX0zoBpuREExVC|jp$%-NB2!jXMdTdNU;OEWKDMA1;V$?QopOsa
zCR@;0t~RbvhQODbE)VuCZI>W@{YOan=J6_sc&gOkUWdhzX1s|)SAT=Hn6MTXaGZL2
z)=ILTEk@)fy<JWuviP~|2DxsGzE2Jy^O`Ui`dx)XABs49hK>(UgNObKPz>wAM``c)
zlTGl`KclmM+x?MV?xml52usBv_A<;_-oXL3Y=ez>jXw#Y4Z;+R>&Rc*IQim|x1ypj
z=X@_CzAcU%T~QLEuAXiV@Hnr*3oI@cK%T^FCHrjj3g~(Uq96MG^TG)z`56I0Jz(3-
zZp(1tUexU}O)5`J*GG71p%yK1IMWBIy#S`h2!}NZcF;UvwUKzbq;i`teI>UC<HX;n
z5Klzgd&-0m(L54y5s28`1`<ex2%8b?8Zm-%M5-x;eeUM=$_zB(8Msu~H7b|{h$3HM
zBkSquK|1C2?+T`oUVWAH_SVs<>@e+~ddc6gG&Hoi8z)&HQaQOg^VI*zy3%3no~1Ex
zH}L(dXXjT};>DA#55TGJIi)qMB`cwT{dT&Gg#G^IPvN#}eR&_3D<&%KD93VR;^|Ti
zgJ_9YYP3aCdC^ax*l)^#3bGLk=SzN;*6X!bAFhQU8)yeTSS$flOqdCg;jOi*dof4t
zzll`A?j@9J*7{0Puk$cFFRlv<3{w(CW-sr(<H4D|>NCkOLp+v-R03mW17qR?W4_p1
z*4=A2Idh&0fG<ANr&@EEZc=>8)y0@vby6nV#&#pQFzn)6TPlCX^z<bx;KD)FE>9KS
z_~&m`SlE}X;dC^~+Mahgbl{PiOj!0hHYFat(;^S2@4|m0^!p@fZJv-tt*;OhiWn%5
zKZAVaaLNXp`N&#~SH<kMN<Riv>Du39zuOE!YbDWzvv8=Y#tk%K^5Thz8j?FAwrN&`
zwOjlku&l%CV*P;}JA`@@%C*Gu_f6Zk6d{qtqN2;HQcr0##rrj~Xt+w!*H6(I4KtI5
z=hgTpCjKHa<Ivi5!P?Ns2!zRfY2V*sL!!RF_06_gmb!^-x3+%rL<N|~q{aD@lapYs
zOQ|K^t!6&fV7Ie;b2hv15b*IOWM1O-dGw4P*!&SOeBACplGfN*hWWuyofrs&Z#;vU
zX?<KX`r6x}sS<4u)b_4^XILq-7jFyl5Pb8>%jGGj(-xfEM15xszuD-k;p<JBACn}G
zZEj%o+5KA_cJ>{gcKnb|DV&=Ohv0s}#K<Dw<O~|8GEHlhpgEAtG*D$!N|PUZMw27c
zr1ZMI*7Yc#4xgOXc0q5a;l-5}2#i7YMfTleWMDjUZq%w=H?W6?fgSFPNM%DH3_bzU
zLaw2(7d|mH*F_I)-j~%lx$YvuNP2nqJzKU+sfwS_go@txBYY;LsXM347g1CkO^)eP
zF8*pV(ig8oYVTwF^k9Yk$@~5{iih`y{w`%2*(yn-cI$dt^wkptlpry{n&ES>eDbbb
zIgO4MIF-yDUJo@o4I#5{(P81^<B#^bjpC=FtljjfFKS)-wrAUJR^RoxK0xX!^!l?_
zM&$DL$qHaYhvJi~!fhfTn1D=qu1Y3f-z^;)J_ANF4W2hu6;AV9Fzo>!Ubi(=<!=qZ
zV>>K%t2n(mHQN9C*PM}sE@V?A#KtZ))Ah8U)J2!<)mZw-_Sx!Mp7htd!!{q?iyAW;
zs4Z-MIg33tvp9`Ug_3HqVr-GO>nrktmzV2WKdlG35I3x3Z9-<6s`en!`7KUP2X<jm
z(d<?A7cyt_iN83I0}91^!=8)h16wx^TP0jOj+MO$n2oDI2H8P|o+0eKf&3o1=vQt#
zA2hs4fOoCc*!Vni_^Jaanb4tDS!6erxxu1(b<zw@hpmHI)neD}KQXGBq|MDbEX+DT
zH(ES*zoD%CZJAkQUBroAq?OOiXm;$!;fI+4;U7%4+a)>F)S+*drl@TNl)d7p+dP;+
zTW)G&v+caUFssbwWX?!I)!~*d=cgYc7k(K(kVx?S`E$+5F}}ATmji)A{DjE(BIkN$
z!oMff{<-01aCa%~#BRI+XG$JOCGgEi)1V5u-5Js{GBV;HKBMO4<sI3($R4Mcy(QPE
z5HM_7w60+Cc>Kp5#`c)E2M&`P>u*3VBqe~<-s-SDH0886#m1FdI-_5iOZQ66g_ST6
zaFpi{tUb)mj6d&wqmHGxjkEqh>nRCTTXAEHAG33+&vstAES#uXTOWQ=ExsrjG$saQ
zWjJut^50#cNZa@6WqSJiT@`2PL`O>nscA(vlMY*6`inw}7e#I4kDDB1p)3UlF*<T6
z6kXoDDhmJGV(1Z%X`w`zW8C{jrhW#*ZtfiYmLB_^lpwU%m`yMF(wTESjG2B#m4dRt
zVFu~F)0MT&$X>cAn1F>B-S<lCB`BXI$<X`~W$D%6L;e?hfhiaK)M`e``aGUxsyG-A
zdv_ahrJ}nFf`CHb*hyp0vCelid(>2~dKUOp{IjZ<G_{{eOCw1HlWA;NxB(_Z{e0xm
zkleLrtDTAnbBt;+LKiErHnFQ@8hAyB-f7A8Z*nduKq`>W4Av}to^u*OY5&>qEK0K!
zk@3A2TsML|0gFyVPdN6P0O`7D)$DUfeYSzFUJ1OefDYEeNe6+?>&lS>&s4{Zt}|E>
z4ELT>4qilXmwPjz{(5c&O5r6XOrS~-wVtKqB~bl()|BHnggulg96eiY(kHWr8@f;i
zFRG^={Ml1rm^g||7*mS=-2EX?7j_l}yf05nGqWO>;S53GF-4Uo;C5<Gm}$4~4VKPT
z@KyY?;C9x$VefHQZ#<mg)h1VL^vAfGye~2tc`XP@oMQFiYWb<G`M2>A!BL~hP=cB+
z27piDx>#|Qp8UyKC1U9-Zh!8f%L|=!dj!TbRvF*Kjnzx&p}b_YQItAU=E#j(lBM?w
zQkr9f5#!HwSQdO%Tl{~y>;LVK+pyGBKd*B2>Z6FG&v5+3GN=r!Mn$Wq5EsaCM9b7x
zC>Bo9(AcfwB~kcr0xMzunhH`6h9SeWSXf+Sbk=S>eU?3%EE!=Er|S3R@P48o%?$xT
z=acuNu-Dy^M<&tteRxvO{mS9S`FS55b@d(3+oA$e|As9piLlo+ZOxvFtT>`|1DwXI
z(D8xCkr%`K=52u<mH++e={s@KkqXmiZRf$ny^C`7;MaBVyKtqUR3$jRbWDnVS3#-2
zFrJid26RM0a*0HgjCmNg0$34CBHA`}^Yx%Sp)OCtmn*JiY0eyQ!u}41&mGRFg__pn
zZqQ;%9bhRPB6{M3X}saOiw$-sdfT#!dU3{c?y-Y)UW0!pRioCiQQ(tK!%zuj^NY9f
z18X=_#}G}oHeb?omtuqxSl7+gm20=mp-MeNM@(LN^!~`ru|Icyy&i6`J-8Aot?0Y$
zra1qWNujvjh&SDaf{j!1KhN#NsHO?XZMr!BM8|up7{t%}GRb4f^nVdu-;g~jtT8bO
z)VTMA@mi>rbIqQe>L86ECzRID9n7nhs((fRS5x=7TT7vt`P{|M!xanZ-{v<(R^&zJ
zM{Q4!SO=KzLsbjJdGK%&UTYf80tP=91fu&oC17+(Vtk8;$m+1vtQ`#~R$<4E+k;wg
zAEy6CM+;u=8cl207Z;Rc`RT>1@?xTG4c9X#2`@__z;xIq*?F`Srt)*=9M8Co(|w&o
z9OGdkZ9Ho2Vc#BFoE)D<@*!{kmB9t}=jRvSy_cG6CNu1pR_S7PH3jXT9>PsHxsU8U
zT9AXfWF#4GO18GNqtPimE6(x{5Rwri-yb&F*sXU4HSxK7jE>HS_XeRMm0rRlylL=P
zBBFpHEY(c6<GJsF!(w_|m~OpHxPP(@g!5G`m7v4<KyMoct6Iz{maX_)pDxjBSMG9R
z*qh6;14q`qmWVHag1S^POu|SxzlJ^T4G_RRJl@KC+g~6f<k>#Z3OD|=oU2*>cSJcq
z_pO<XVpe{u_v;*0G<1c=&AddNF2YQddf=>Ufv(VBI4LIU^)P4XW~Oa`CGhBaP$~X}
zE0fRZM+4Brz9>bCR6_NTi&D_hS>m$lji_DLXlph4NUQX}8CBt0xC<8YU^}VayL!c}
z{A)5%NbGXSbKXi86s6hVdRzzT5`wUUJ2s;*1=`HUg%tR>Mg26wpPxA4<Lj~7#U`Ur
zU_&GVZa8-?2TCw@h^Q9MTmbA;4-Q4BBQ@D2hj>JNRnS8M;1M=%y7e@SUs?FB^H40Q
z;wh68MRt;5QW7DPlO(?3NZu&zswKe|%QDg^%p?Cqk9zFy>!*ip({ec%m`|eRx#;BC
z+`=mA$L1~-{0>}H*lJBER^<I$iA5At(<8Po(HTT!rm%h1l3?S;0?8N%nBPXtqN}EC
z44nwLBO%)AUmXTkGi$XFA#f3MSl-SIJd5fwswZx$xBS3J`yFwOx6<RPVh)%L>I129
zHdCq+C!R>$y8iB8Bi<JldK``(E!gldmchF#Y2@uM3HUT6zd5M*De@H$`5eRW3j06M
z=b;2>iLqSsNVZOda>kg(q{ZmOR3d)!p(`v7Sk(WpgCGbNXflB$+o@zgNUoXx-amp&
zN%Cc&rG@8sx-CCGwvs?g$TdcbRH71a?Ql^MJFv#kI_*&0uc?OjXFNoGgn{y!uPZx=
zZkYDmUlhD1M#i7=Y2=HPGnrCo#fEFj!|ZeDIkT?WMj8rI2KEL|K*4!4!GIsYc8e5z
zTd2a250(jMS^alqW|sF`t02s`GqWlURVnTh#9&2ef0tvsv3+MwMBLW+5adYDiueCE
znkeJgp3YCDsya3tr_j<jpQLL77$~Bn;y*yyF$t0nYe*ld*ZCb;0qkJ0YKiIP<&{DE
zcGpc^-E*m3EEI}qD8TT7h?^q?BQ`7y7+wN$#Fsvw8)-xlDU1e40ABA|8Dc95LD{ET
zR8J0|%RxVChw|eSJ#v%sn4xqgD6!Y{-c(gQV4N<<H&h}gr;cF2PwtN~yNm?oM+SVc
z4)SI=xSb1E-{L$U+;%1XDs`?U$Mr}TElUgj)5Ny>pxRl>@m?M4_PvWb&s}NVA5*3r
zAUZb{^l9DfdbryQ;b4hS`ui%-@eRAlAN7f&lNI@4A%5#l81m^&9Kv9jK05&MtrtZS
z$Ij1xic=z3x8*qn^yRO6jz3}k&;(ji2O@vSEHyOL8t1W4eLYZx93<8-HaV%Jtg-u5
z8Vd@H0a2Avf=cnTRUVN)pMPStBTaj);WGXilezX&KrU}NL0q}epJDwIOdm@Nh_&B`
z*E^0fz4^Xx!nMcEX{y(1#(c7FiEo=24`|_cp_x%n05+m<?NN!kq-G-Dwt5&<n^lrh
z!vU?mCPR4H{(6L>eBsEb&=6Ojo;?3vx|0AsN}()JqWU|XFc|<nG9JAxfeE0p6d6{k
zr9eWceR35ZrqmfH@azSH4>ScCOG^nqcgI`I;HYt50iO%&SM01(<E5%i-`h9EfVQlu
z9Lr~+hTdQo?f1avN%M|ZU4iS0CG4g;z^jaX*bYSYJ5EiXjDZ13-8p2tyYYc--ZB5h
za6k#WWVA#zg)j@&S6f2xD(-J?wvk#c-{=!dDlbxU=x`6G^4Dv`NG-2B*H5Ub7%>TA
zFC&hzm=bF2*3MzLH8xgSJl%)0U~0I3vSX{N)vP4Wx3cY0%W{)bj#a-EfifN+DZp^I
z5HPd)dZLUWvzym;;g*kD{&L`Zh7z>0yVr%5%8j)*H^7?3!FxWu2f3C?A(ZlnPz!WX
zkLnAYoBfvyAW&Rcsj=b)Y}3!(1x}ONEa*B;y@K=nW7bX>m|yqwIBY}EyR|3!8wLo{
zJU~nw54EL(2O*$Zz2yt%UBIHY<a;@zz&c|zW}Y5nJT4u)vGJ)O#@OA(q3cibVB9t^
zl)^?2()_{55ZrwE=8;jY+fJl-vQ9#rqC)dP{8!oq|HZ0G`Ety*W3Q6TO95Bgx6?Yo
z3Q}0WEwHhwMD-3Bbs!C{;SQHHI;{TbhardrLFU>)y+MD<20yWI_f-y*fFrfb4kgHf
zDus-i+O%P<#ConBBh%*j2tz!oW;&*ZDr1R;#>kJ!%6oVKd_M@0xj%Rx>y*>A>pw#<
zzGW7S!;vaN0~MU1)i?nX%z7rB<_1k0R`QiAkVC6U@6A>_ogUc@dpd?3^}#S1BU7Y9
z#?Uoo_w`x8H>+wC^e%Fu(5&f$UW@WJp*ffEp1_!ACf+v8<%O<{;Nus{#7gAn)0|_`
zmU5eWfkHX1lQ$QWnF-?8k-h)01#`@AP9ioIE8H}loY*0FSeU@h)r8&6&91|%WWo;^
zmbM!kA~97>%@3FJ2Fxw~|J%g)4iS%0X=tK5jCL1LR{b{<$30p9u*a*Y49==Dp1TXG
zC%mlRS!9T3NboENms#j~-*PayC+g{Z!;qo--YuuaHMMktmgi~^!BSq_Wwb$-Ve%tz
zepp@ncXzY*Ad!yAn-&D9J0;!gYON<c^Vn73fPdLD_FeFb%DUwCw>)Xy;>nb!sZTbG
zU0ZzV78iUkRTu1~y``nm+&w&kB&pt%nNe-D-xEb5f<$cSlT9N6P>xEJjW;GZHELau
zMkC3}$^z3f^IG@L&fWo?n*4m4=F{Jdw%}mNtfe#HZny6`W>;4`{1F{rAD5#__1jEC
z241wlQ_8q{w&%yBdAHh)`VZ|qB~ehN%Ngzd#!hSEo2R6H3(B6gnivvMxKtMDTJEos
zchu=oZ1U$oF>Pem5y-1uSNxDFj0T>oGd-_hO0_?{7C?#6I(4K?luwC|M*wBDoKZq$
zs@P*BGEZz^E7%k5eNG9Ij)0Dsinayv%@jRPAzgwzJZ)_dlTTJ!&}B}n+OE(F-=GLx
z6v>O0ssevgQ2y(w^8E3UVduh~hXhmLdL_UW3^gktX-rH_=|9|FRA`n0;Jy+Tybnhw
zCqE_B%;D)C)7m*MU=HK9{SsturW`~SOvL=V|DL}2{&WD;XhA;TkqYES3kzCFgT|({
zn*Zd-wZc~m4yLB2P!}s}vW%&PMb`jJ8+v#T&HyT?Hy#7d25`GCRh^e0b>I1}=6yH6
zTy}VH(DV3kXMoYIU%AqHci5FLn+j}6p?Ikv(5m2S*@p~#IM<Wq-Uxu?9Vrn&cE5t;
zdO2%iaMus|WO$yBzIQ!pxgsxMH6}!?HXalMG*qFdn_(M@xUoUd-J?gdw63nHi5N@x
zo>jF(-B0&^jllJ9Q30#NmQ01+BfKcK?c=>$8ovu>+tb65-OdQb{T6qdC>YRA@6*<Y
zhX;^EyRL=ORyggc-k%9Su>%2o=c=vr`}gmOzw5K!-KEQ!G)d+CIM~O_x!T;=$O7E{
zJedAPdVsH9R~mp(pkrhl;9=LrhSzHKd|_p!ANDD603l=h6F_E8VY*KVni2Fyqk%)L
z3#re&ooxBMcFCw|+P9jCYAMET!{9V4QDlIHsznV>)d4H^U)(@c3f%gDVbcJ$(ka3J
z0l@#azh5@W-D0KnmDn98e?aiXf;{OS9w3qFYlf`pYGlMVxX7)h8#&rk>e+BG4?&Q;
zkMO+^8Bhd`E=~4O;535i2o4$XOWI385`@3dec8{tI%ji@7t{0O)i$GRJ^27NtZcCE
zMMr~HS2_Y(L2HD}<wge+@;+-DKCdlwkKDXGgm!HR6Vv;)<ECoJ60^MdQqz02Gl*cp
z`fB#Oj^85q6@*5hqwaQ4+YFAwU7wm-WR<!8j=LiM`&Ye1u6{4MAX5k4Zf#r|T1u3n
zNi37Q{exJ6>3dwnf3$#)9`xMH^_YCx`Es8LqC}1>o~(+HyBZzLyoP_u^Eh<VWmuq)
z+D-e8nHM+o^)gTQ=XS=G&0{yMt3<&avgScZ0-l%6?C*F_FYzwk57%vqQtR^AM;aea
z0u`h*b_q3?M{KQU!|(-skMeNi4sm!2KC0@Zy)nb#5_&j)QLy;PMPb--{z>TL4-?~w
zDX#79ZOTt!B@-a3y1aBIF*kD~79cwVry@K0yKDA%p6-$Wh=r?vPS)Q^{>|Q%`4s6?
zTWiUKV`evZKmk2bJ+=S67+$Ec)^<=fpaiwjLPA7_V9~NJzx-Z_e|NJNPYdI^l=;}t
z9elT?8hewIAKWu(XJCr}!hB%N!UNSm6Wb7(cF}Fpf9H_U;}0$tFxfB@A%K+$C-fg%
zWI(^8mQj^M{3pp+W&PyDq@9vT+Go0~X>PE_{%PAvkq(SuuRP#e)C`}EP@tni-EK(g
zNnPgwyo^9G3iUt6A_d_+`80uP$v%UeiNF{c{3m*mZ`Y=I#M@U5P6u;X>-F0N1k<3<
zu3oq0NCx`Pguac@)k=%mUYV-35C)I3ZP23Uj2YtuZ6`p;=nPzLJy7s-#wkcbMc4!R
zX*<tGXsHKg9#+2`6@6p?(+pJ~(}yCMsP!mNPhv8+l=&rCHoZ3t_zK5%8S!yMG0jx&
zEsvh}mElCh7<?_HBz-SGBqV0H*ZlZFO0Og(=HzwDo{4hNxQP5kEXIMV4}i!71YC`a
z*XJfeu>vnz6|vzzs;FF`7qx>WgFnCz`baZga(%FT{aek`y8bStZ(Wp!L{7nf+YQVt
zt^%YDi-(l|Ie5}%UR`C3@Zim){j&!5LoWJTfxP7uF0Wg}Y^Bxi)vhy&rDcj_b)S^P
zM3>%O$0>mNfw>nBI}z#f>MEzWcux;Z7caVv4B8T;bv3jfnDOCB_}$O%7{t6eOfgtR
zq*YWVRg3$(tK1)sV0Iu8zE!`dsHj{1qvo@gZ~~S?e&>DlY2X0&lNp2rM_?B91cH_v
z(sn<dRX)}7r<O_m&x{NVb#J;FDHNsB<HmGMtPe+j1|yQT%ddMA|Nim#T(-vlsiy3^
zpUc)3DOh8HI*rrkB@nSYU7UOJ<dra`>1r`Ceh<GBT>6nQgjxo7Jbu5X?=7XF(NJ7}
zB`&oa{23(?z9Mc+{OKfsteGF!Y}kq_KEo1=dNrt!5-fpjUz1fBk||&$buH|D9N>~S
zfA&lDT1je;E>E$(&tb;6`ekWh$%aNL7y8N6ogh?9;XbE5_OuLlj9NSy43KuW)IsNo
zgA<bcI0^c^T1p(!f^M~3-19QcTJvf~7M6X-M%RLYo^2kI=6?NE+2?4P>$b<I&T2Y3
zuD}F}MQU0A_(J_I45XdxrYQOv<g!0=@^~?=`{Y?SSogZmx-Bg>)?s$l*0SyKb}w@o
zj3m%D*)HIITpYm(E`XP&UnGw=rOO86fpL`*z0>pduf%D1KND4J(thHjw+Ql!%ka?u
z#XJ7~5oqla5CPlC4H~mlm6q?d@x~ZoB-voP;Jg`EGPy#SDV05^z#sJjmjPurn9*Eu
zWKTG_nI;=uH4f|~l-QmsP_lm#SmyA!Yy#9FZ!f|lZ-X@{wdqk%oFuzl&~`bYsdl4G
zNlj&0ay%Qn52~wkq19}V*^Xy?Z_~U><Nev;>|JkiYU(nWdw_5iM*nR-3PSt7R>An<
z_6hm)?jMs0AannB@4Ig&7a<(6na}7Daz<Cyu}RC}L4cC=@uP3lEA>nD@92~aBFas(
zN38ck4^4`Uke&A%##{-*pDt4ijgjwyg2vDJ(s@2>WH_-5hF}GYHMs7MRX%uJE%9q2
z!1qt3;h=v}y5)hoN;Im)0EvvRr2~>s63N2r5P=R34gh=RiWm}*L%!KJ#f#Z|W2UcE
ziiCaJx#&W+^Y^b9E4FW%7B?YsR&g<!Zo}On93(c@nj;n!&`s5s`zjC~S~%VGI4n}D
z+y^<vV-hS_ixt3amSqQdLElfgUhfg&#eNk;{(6hdD?#6KmA=?S#+boTR9lm4_y$Vj
z_i3#?=nQg)u5iSnB2{^8IZN4y$7xW+eksR|_0Y<vYbtOVNg+c+X@UdLH5$c6Q6+M8
zV*jatusW1>;a=+eM9_BK0|zEOb1T9wr|9=lYhAEKj24E-6o3Qw`sw81=qQnEkZ8b3
z9=K@J(@g4>@iYqldW!yH3yl<hTob`NzH5@<(`I_5j7Xh9!~!rVnsiK<wzlw5bB@wg
zJ#6zFyNVE*bp|af4k0{D#P5@)nkaeaG2^?A8r9VYK#~v7Jy+q|6*#%42y|)ky1Mde
zYHGA-E0Stzi5Bio7aqnf-c?-u^T}nOqL2cy1I52H*J>`#O-`yHuKWt2d=p8j4H-x9
zyc*{jVeU_%=vV#!0iU4%5|XZkk5~u|-V@jQ`2BwLUkyebZZEt?^Q7_Vko=x=&N3o;
zk3ebk@i8dk(f{ik%_rEGe{@+<sU`Mx3CI3(V?#Hq>zp7W?(-c%@Foi(J>>}t`ux8m
z!JE2-U)%KXqy#v-ng2tCg1{bF%KzWCdW1py7Hz8U^XoQrJzQTgh+Ls)pP}|P=LYZ<
zQe|lr^v<VF8>a6!2)xB4nU-pYkNTQCu72kDwachiRb|}&F%ceM(W%-v?vYN!97Qp1
z-{x=hyg9`ZzH1ylNhm4VPWrn$PJjRlBXBum@V(RDf3)-)84OKMrRQFqRh@S<QZ*4V
z0h?Swb;a_!sESb@R(q!%N5oT5?w0Hl!im?hjElTH6)kOFFA+LoV2&bm?IQMze_dnF
zh*7mYB_08`eR28=x63{&wwNYe-j%(-tz=JCcF`0N6JnosxS|%sp+ZRrXavFP@lw?m
z)68VKTFHSi%8_T=;a}%B+qZGwiG(e|ia=Rk>x(DM6+}2D<pM?hvF(W|0<mj}fCx7*
zMgY8TqG*UM`zlGcR=mT!mNiAj%m>#(<PD)5o>*|_$+uMBubjzrZyMpsQufMI%++K9
zVUx|(oz+8_i8H=bXRYu;)6w;?;!_Z)io(MdmX`)m({8&#7QGs9$Yu*Lr#M)_+iutQ
z-uKg8SUw88PCxX1{dTt&h#v`O?%;6msr56Z@(&9`oo6TJ&L~WJ^KK-0aQ%BXNZ>gs
zQf$c~$h&(}HmcDQnF3@o<bmqIx|S(5!|U>GPaM5}hxyB5oYw3yrJ8j9FMvv{H@4A_
zBCI5et<4puRQQnr=zAKGDYWC1RvU$%Zn|Z;m$lqfu`|%zTk1t4esRCr@DLp{PWR;9
zXfOs&fgut(K$D1MZefugh&?`0q%6zQdfXY>-_zqiWVr;-wz1ss>Iz)~)AZtRaXAr?
z3j6)|!9YvV{ZUob*mXBAQ7#VeIVxYcQMXk0AwuY%$YokCOv!#ZCa|nl@R39X;N#=V
ziG|c!{>JMnE^oHiSMqMn;!Ng(X)tRx7oj!6H@Wxrp@lfOxVCV`ID8)VbW7z5&h%7N
z;?uG9)880{S?}$YXVSf9z=@ch^&z6A&QEsY1BKW#R<6_oPtZTek?-Z-y*)G(ia+x<
zZB}5VHZLkJuErJH2L$V%SC@x^Y%SSh6@2LiD%nw^<~~F3Un#KtVH2bGTGnI5lTYF3
zH+z!|JOS;_cN77-*kN1^tYX)WSGxc)-^s~o#I%;j^PUHB;ZX5|NsT7n##Z+5!6lFz
zI|4ky06I((^17`&+a68?8Qq^3>B!Gsjt7QNz6kcAr5>Xtigf1PznlW@6wl#IDdLnE
z-$s8pDGcLqZ-$IP3l1#bWXKzBWvq|90qq}=8hqb{5#3P#yFH0t&kvQU5u;bmUf@9l
ziOI?|tMhc8$SBo&UPAj`PhMuuEwjxhWle``iA);yg#`uMJ8$pM${d|uY6D`__a+?U
z>19XU<;6w8)lMV6rk_zuj^nbPzys%9@2c&_)z3wcB3p-4@73p5p4q%)p@sFGZN&W2
zG<^`<wff71Q}Z>?Ny_i)Jtt{E-mFW@?A+^#;$9+r<Rq*55aR``ciz)47LS^D*b87W
z5Yb(R9)wFktZ1pJ2+#~bG0@40s(Y0~-J}!!!)487)0BU}LCf&+mT^XJ?2pfQ4$8pQ
z_(L@yELj&2*EU@l$p;2`8q>e}XUpSN+KM!j=cdo454G}_q5k5G={NXhJ@5KzK4w;C
z{H~90)eBiQ>D(Qgyn2{Ud7cn!byjZM_~n4VUPb=_F4aO@dP`%`cRx_=2h={oMot=o
z3G>f!CCTg5S~iuIWo19~Nxe3{!U3jKzk2%5_EjgSSvAjJm4wN)d-mo%qm~7iO<4+G
z{7nyKG)a=CswyCmzeAv-n)f0JqNX;ruzL5&f)Q0(3bOP1RT#8Kwc6&s77B-ffe};{
z?f;puLhPGbxYBPuZ2l+7APbrNL1kKb;|#o@ZCtUDnVF>FD$BHK%N<057v^6aJ8Nmi
zw@$~Dw(8p+FJSr!hd@_{?QIZ50<*>JVLIMEK?*~ol=*APBLv0?iS;dTP5x1CyVI6&
zH8RR$WMtf1DK2j{NBhzR;1zT~9)?ItMnK%&q6ZHfC*~#vP=W0;u^BMUsHv(>b+|0K
z^+_Oq-n^fQSUx&>6M`Diw-$^aTv9R!XcGF5=LNzq3(L!0o{2evraR2lvkRw79!Il;
z!Cx0)2?+^z^#2$;SWpoLP8kyIp@!pYINxoh{9rJipDIQAYy1a1kz;Lbtz5zQY?aTG
zH*pthCy)?@11c>@fk898Zv5u}%!yBrH8^UpN6<2L6dcm4)RS=HbdBoj2tWeKje@o|
zMnH#eYpc+|P9oqX074=FUK?yz#iGIMrHUIfftZR53wg#zXL&VBRr%lVBgItv_HEXN
zJ}}=rHw3tWnzy(29)J=DpnU~Zbx-uu|A+VEJ$^a9T4e)XW>8*;y_N*!WQZVb*F_Q&
zSms9J%gWl)`*P0=u$g103;^rn7b$Ks%1Ih|dLLEF4%^pICXKp?YK>ARR_}~h!)TPQ
z69MdPw#K>E!o$IXdCqjTvaGY;_?F9ck>BH@)FQ&X^kyT#8L*)t0`%V0{op@tf|k^8
z++@~jw4{+0<>R&uC8I<CymgZ^Y<wX|^9Fa5_v@zddD1WR%X#%I@Z}eWf15%#94gTC
zc$9@0jEck|ib@p-M^qBGzRwv-F(6Z!(8u;HBNiT^J6;uXd{MIbE)SS%ACfR<@P7fT
zf}SNfW|&;!qn9;MIGNu~nZ3Tp`ys!-aI{^Rb);wK;&#fE4u0@>?O9~6!?#yj1|USj
z2+9JqKa0l2Ra-E$cR>S*!U?W#V^L98PF&sHe>U~Fz7<?tR9k<hQ7Y#*Hp4*J=!OH4
z!@ms^<W4~o&2@bXfS}rfrca^obJYj%|2OP7|6^+VJ8CjK!u|_XP6+->-DW+cd-Uf4
z?Ct+={NK5Zw43odr$i2^)D-^(0hlsDeBdT%;olP=yX4j}S8J=zq`yCA_l!kTjW<fX
zemdNR%Z9X|`q75Mia1FxIiTJTSbctGPwn{eaeW@qmGsaLW`DlQC~fGrEvT)Hi`C-7
zd?RU4Z=Jm^3SSDea06wu3SBce)DPYDRiV=QF{Jp|(`e7jbRuC>F^Fp27bMyZ>3k(Q
z!Un9louykS@<rs;2slRRI4q@xNz`7Ee935Sow+Iw;v~AUOqbh#!bPS<-a!k3+H~Wy
zpme$>Pedv*{V;mfRfFxLBkMweXI=|*Rw5MIujS7LDMXE>h#MYbGvDes*CnBOkz|HZ
z3PeY>3N_yr2uBX{{&y4~r&-5L%G@Cf7!L6?;tUom8>A7G6)Pwe=D!5Qn0OT-r{8#h
zjtz-reO;4t7^Op|0KK9*fV_6~%2f{Lnk)EgoDCg97>uRk#x_e5w+EMN)Y*>H&j3c%
zvYOZ0Roxnzn&t@YH2{;co~tQ38%*a9udb?MY9=RK@;VYccXVuqTN#JuByvRlAtx>m
zKUACp<Ot|NKN+{<4x~MDV~Y!@0(J#@3mT`4X=-bi!m)ymu(9tmJWoGdjT-d*rPG_e
z+)5P;d28+G>K0roQZ2}0bC&{KAS9`9ZWnEQJc5lh78%Q%$1+k=J<KlmXDLE(LAw??
z5F(0`V_%mT8vnou64ObSqh(TWr~q;N)Pd)nRasksi5nmF7`=k!Q2(sYz)z=35LcOU
zgiY&s9E`QMi+mq7#dFOt0i8A5&zk4=F07OIT@I(fpIb<zo+HoE;k^;{`WLSjl<)Rv
zGp=1Apn=oAit0B^sW-a2B=yl<{tvSe_5K34e(7iX_62G4YA|s#z>2N(HB?QiXS<=k
zZ!cJYFNFPiZ=@g^0dozBkmoho0cKwrdx5;qw-Ak2wBl*^*Zh$5Ut*#t8HU%TUb{Ej
z%P_WsdZ;CzDqK&_n6TX}wuj^(YDTrP1#n8DNxLW+G33j`MW7UGi^d*PS5{tk^SC;E
z>799`3ppxD5r@XLCMo@V)_x&dZGtr6-eNJV`{d5P=KkJ4If^h6OLNc|4<Ek;X$8;s
zeS}2Lr;I0h6RS-((tiMM*}x>Q@ZWB|TJreh1qWC1@$be$zYEMvz5V8IcF^^-ThEnM
z8DoM)qtU*tysd5fp~XWSn}DAqAu-X$+R`%O;4MAEf2eMzR#sLX7Sm-4W#hZ>6>#ms
zd8rid={aF|I6Q_(QrQ>>PN#@%{`hmK_q3&z)h5Z1``e<n<Bo+U$Q73b3!JGkdy!+e
zH#%%Hrwh1^p|sP++tZFU?@Mv6<-`eTYAM+pa1d!jb{v8+t|$?`TR^k+;^N}j4Uw1Y
z{>&wS1VJ0!&w$UWR;DFtVPUZXzH5TC@)_{m6t4Ib8%AOw(ILsO>?Z?_XWJgYn?a9*
zYk=4Ql_yP3jTNtR|K^P48PI?#=&ID7UxK!9<$%Zp&cyo!{%|1`a2+}C#+9!TB?&af
z5ew!##1#{3ytzRF&>)GNi8)T+*x$d8vuE39K>6E0PnX9mWmc10bDp!dw$>Fl#+rBT
zXk&9UTmH1yrW1~?l7W&jHowiR^(%2|;(TCUpB5AYfM|qgY08=EFo_hp$`EkaYKlcg
zlgAbtg1g4Zi@V$PdECZ?5JRl=)Rm8Q-Pa?P84`kMtY10p<6sBxvJs*uahZ)xS_Rqy
z%WN~k{L-A3MfdZWN)|&C6MmSqx$|vd`SINgmn5q?e8T+6hpl+VQp6V0z?h6UBCw`D
zlSmWSL0Z|&H8_GjUNlotkq1beNiJzsJ-GVqd2o1rm`S`T*RF)4(Ye!j%u%|4IH8wD
zvX8^Y-25-f7qJmTqd_U5Fl_r^Y<mLVd2&^k*)gL5h635t{A5)X6`|_<EzD2WhdI!1
zq}Z}I$;N>JqJON-!#3$6>5mtI%@rs{>nVwfQr67LJn)JkyNOzHCHi5*`-@_W#cbQp
z8gp}eOs%ethT}nBkv7Ae2GsV~Kq1xV(t4II5(bN)x(ECXGU@=8mbP>C2wnAC$h5}>
z;96S&Si~OBJ6-O}rgVbdBj>aXoI>1Ih0R8jRuIsmSpEA)JOs${v1?rZy_g>qCMDg5
zmc<nd`(-GNzNEOAe{#?H{e}!WQ0&39k%4k<^wTQV!-p?%cnJyK?4U|mBz#W+f719&
zWNa};$-T<G7kx^fD{)`gHtXGpxd{p>R$>X1Hv#F*|4=Co^z-vW01e6Glz<d3jn5&!
zpuXu2SPUX<Ja9^^hhsQ7S%6;Pnpk9fRM=t+W0Mf%dG_nO_zl7QoB-!|{v_(dgRq*B
zNr43xA7ry^KW_yBuz#6mkl4=7j_J|Cp)s`o?UJ2U^T1&<mbSdn@g#fu_`7%z)S6sm
zyg7Ct<axd`3OY@JQgy!o;TC0xHoKcJW8V4dSbuB)n58y|iHNSty$&n@W3604$_YCC
zu5?gd@?(uwJ{d>IapTu#sog`-AZc3W{5a=KA&*O`&x(pi=P968$n^!r6N?5nwFX#K
z#m9dE9To?Mli9Z^rFK^j=If_nuiy9%j29Q*bY^ESDHq7=f)gl9DWC4<d(q{^F~e58
zgt$Tbr8CX+vW4;G=%LF?W{3=$!CGnmnQG0))mU@ReRQxm-|T+zSFr7VlVuigN+(kX
zjk!R-EQa{MAf_}4qrh|>K%r;~F7b1vrYhYnE^oQ~tmFN-32Z@I8*&3#=or=<_MLS=
zT@JJW7xuWcT(Yh|16{m4L4TzqM?MzorDnJCn$GG^3?sk3GWS`#l@=}^T|Es<w>lR#
zG+Zk<J71bLEiTzq&)$MXa7d1Up7;Ku+~;A(cX&Jclg>|m?b>LGuTF7ev0b`TQt|-q
zji>f}%Tf?Gb`6TNRIO=s;_kdJ55>d&AF2s^e8o|G`E%apeS&H@U|#!o==H7;<V5xY
z!8>4Oq8qc{c71NX+^?2YAYVD7*l;%JtFyx88*~5#6@P3K>Tr6{1~5BEhLIcR{yX-B
z-B(@xyiEkrs1KAmG=U56kY{PV4!_k!qWrEx`6{T-DFVY98k=$iqUCE@ZCMOxMenmt
zcEEqR0MY|CLuq^nkbGnwB4L88>HA6|;4<s!sU#3<=5^K?^b54fQB{2o5K>W@{0oC;
zn38O!YuVmfrGB~3t*U21{~)OLBcozez@V{s`7k#P!naK=D>wnHj3)DF%{FhZPaYop
z0$yInfS%UU@^Wvwe0b-Hn7L}0;vGy1-q+19%eSiiRht9#z_psh!pw}f&hqB;webB^
zy;ScHk*YL8_UBA1CO}l$2Mppkjvg|J^V4`C?~KDQhP*H4A>V?$wks(gvT)F_&^f%T
zvIv~!c%;?q3(P&=W1k@}8-gqSP7pdpV8F~~22rrW3kfTZ$KAO+X*5nEj0Hi#XdO!{
zK}2%n6nuCJFYerA@y>`qGG@&RJ(K~~5Q$ew!X9<K`t`zCSqe*jRGZB*geXX%g6A)w
zRA>h2S*yFI)j@q#sVb=9yzTsKJ4%<p#mzs7*mV{&mdqYV6#@6cLzHA3l~&%{vV(Kl
zQ!H<q4B<GG<1UWp^o$#b!QcrZX&P>Tf+{>Ul^8|<20|?5`b=-O#uG!7_$#Ykoog_K
zcO0-J)^07zYY7tKETw*6qz_pFv4(OiCsCyTdc#a3Pn0+nj$gl?h`922I`lZ3HA+=e
z8>kc0Yj`>14@B9b*udc$TWn-v#CNT;Q=Y`qOal)&=y0-X|F^}~aJd08%<vig@H2ZW
zJc8$)dnW?9a$$bYl|@$EDnhw)hCdFc-MnZ~4VUCVWkA*!Q;7<oq(zb@cwLprW2dj|
z?92s3F4;<xCSus|GU<Hrp;DZ2*$@RhO}gA8-yrY^P&ZS22Ks!|Vo8~m;NyxZsAvE`
zq3qF}7>&-&6iLi>M->>zxP=r#p9QVGlQ}sNqt+24)#4ZOg8h4MGL`Y5ypal~KhFmY
zF4&D_;JOFisP}J73E)ucfA#)`4=7H@80c9QSu5;{QQ|x#88L;HpQFTCnYTtKgUcsR
zH4xz@7~<8<^~A*d?ffAdR^-4gpkn?f0sX%%$j*S6YQ1YYaQAHM<dR-_DDv`}tt|=f
zIUf0NJfG~ffiiG@@ePmiZt-k}ooBsgLZ9CVC?pq=^epw%zBRnfXji#|2J{b`-B5_~
zQjMvhnQ9X(@)vcy8S<{nUo7FiMPf6=UniumsyzMp%0MJb@SPV|<`2);k8pA8gyci6
zU(W?M-*(|8$#|OXvT3NVM}8cL^`1x6(+FPIXC(bb*%q6N{M5h9&JYvz^Y%850SC|!
zZJnypEL(|RzrfGh&2b*+o)f7mpvJ^~i~D4Pq^$R6-Ish8J+=_8Yrnjtyv?C-ojnRJ
zFov3nGyMHNE`QkAhTTfBX0_W<3a7>I;(-A_ir%k*(h3^Nl;(H@wfuSAkQ}Kn>D^FX
zBfQh(B&h8nUq6_pup<Fc^cLz00t_uskoHG%t44d1#JI!ceT2(8mvXu4NOp3PD^>ku
zUslVx$V&@X0X(sLjYuTloS`*h_N848BwFdTJ*A`fePWHcpbuCi)}OAZDhhR>S&S;;
zp}kqNwTuohXDh1VIN-5eT~Kk`?S&Eh1p+Ay-@f;y?IFE>=WYrDkPvSitN|%f?}3hQ
zZlx~6XBr1LOAjK14UeZE=wOU|f!!<Xzl*Nl2$$~NRXk(m(Tg<gE@LnxB4(W;ROz%!
z$!rwEaBMtLsmD9K0pGN>{#0|#FCSJeY+sSps5ABTx@Ra-4l*{d&aL-RJ_pU=xBFHF
z{)@k%qEc>ILnahN#1ex$%V>YL@-myYGjO2sM;g=(LlepYOVaTDN_z5P$}~xYM~rqe
zt(IPtWfk;T(|javWVW#*+k1>{^58h4`$1DFS&Si4A(A^CRpkJ7yXDve*t3*WgUcWp
zRtEf^cel3pE28K>pgczkUsbUX?!_y~F%qSJ#dcJ@z8C$$9JgHL5u;pGv5M>8_a8YX
z<&Q~y-%08gazX4A5+_6%u;Sm0#VoYFyrhWrJ~EtNUahA!2vG;E(j6N>ZAdYCfk25Y
zU4wx!g{VI*kW4WzBB!WW%Es>@jC^B$?~LCSAx#{jw!)daTMfEUmN%T-?m10zatb32
zv|`d5c-Vi_5&Pxw7M(0^sI3CNix7#as?AqKi`bZhP;YE+blaJ7cvH+njbI^Nf8@2O
zq^z=*qDp+LRNj78Aa<p!Ym2Fk)jNN{V8tHO!pRwJnB25~eLK|l@M#-p4y`DaW>_d@
zb$Nc<kw5y@Ac3}kWt+dAbreo-Qx3gN6%co?>Au4tD3}+my2*sKC8hurkaX!cqjDQO
z#~i*FZ&C4|<AzM|ZpKPUe-9%j3voQSd+-M7YOdf-3@T9UrdxYd6&rW<`pFa$(#&de
zGe|rMkT-2o_ZpB$iYBH<Drk-2whRVmeL^pcAClJ_9z>9q^uG`gl4hlVf14-PHjJce
z!-A-ySGWzM^IMy&{;BUy0DH5+&W(oT;Y@@a@*&55@;JQ@_{{c~$W*7X>TDqhO<VG(
ztPhZYutfCzh^V|qTY?ncs3QCi6X}IB^75-{717W==GM@)Rasd!^%5-+ioZYzC}EM@
zy22Jmqb3xfHTM!ljlZ~X@&9~DNe_G70FIdln)Sv0J+%iF!F&Ky9wA^mct^N-i4u8G
z5b$HY4gaB2{-vOv01)DwI5}N?<e7xVuKzH~of4alr5DuHd<0Pc_NOS)i`l9w^_y$9
zVfs9O))EOGZ1lt3-TjgP!gP9Pls+Sp5Szf{{h;J~%=M~Py`))@@!OZZCM1Nt8<#TP
zU)nM~VB#(ie&6~lW|y!iO#P1}bDz0I=X=<e?06SPzY6BpNZ$VsS8o9pRn)Ex@1doK
zM!Ez=N<dOtLXj@%Zt2dUM?gRnkVX&*X_1ibZVBm>mhSqO=lkAs&i7x}z%_ej&%n&y
z`&nz<&mEhs`9_L|`kbJ=Mr+<~kOD6W8OHaYJ*h)bw7)1%@7X-~;bC@u8?H0cb8Xqq
zoxRIC|CgY>QC$)ucO*A{-T(4Xpu4^484h&Xc|rAL2I+N6A7^~FfZlwcj#;P?!<x^B
zFuB;ahx+3X?-YxCMyTz(yH<sfw60#`qkE1oFEa!)<3>X_s6yj}&8r^P!USc%G^-Fw
zsaa|fbTx5Pqo+ah=-lqy=;vR~S3ZumOgFbIO(PvJ`wa7oN;3hgS)wTD;FC5G_zi78
zPIPBad>o{e*Y*|_a}@7;xt+qpR~g!(I#hA%q<LwqOGJFX#)G0{2yxNWma*=A1ku3X
zYCnzr#*EN4f(j;<hlm|nXK$AKxU}!uv>Vm3$F_e1d>~I`GDGqj4V1W0An<%x>$a)3
zx|7WNY%^B6pRvbv_TMo_sOie(+Gj}brs`>tmDt-xHerO!;XDx&V6FruQ}TrkYP*wR
z$OlVmikLtX6?A46KMKY~inwX4E<0+9r)DR_-MCLl`p#}=-4;HOQY1MWGk>ANq^_;a
zZeoZzKS4hfbOOO6Q+pv7(L|Y;Y;$4f>p{QVWmj%R<D&V!+qlywh(iW9ao0b7^qZ|6
zCaQtxg&NM0ly(BtV}*9$6#kE}g<GpqmrQrptG|^ZWoJ~4Y<cT46ZM=>0<)y?#zTH4
z0N?n1<z5-ZAfF(HX>bRf@X_HRD=ARHicmf7lVWEXz>{MHAhy51KXCF0FNulqfbQ@Y
z3A(R;K7EYd+ftF*+t+Jr_w5_tnfl>JFmZd%i@qEydi|4<*Ajw27HO#e)mg;p-`^{{
zfByo#o3MJ{dnQ5mKZ-blf1e_cu;lu&wMzHu{sKkI-Ozkemz=Y~W<d4NpW}1!x>Q&U
zWV=N2@>npUs5sa??o=MH795YV^!8BmCmGI9245N~#=p&6Q7|2<fBRvIGQNI_Cni0q
zT{>91-}1C$N5oQ&Vt8V!;oDZdc;U~2za{fu$WHse?VWw2%XggfRi69#a_(r(b+G>8
zsKe+6ux8%M<JS2ku&<u|*Vg(#CfA@*jmj!VA}93y!<(S0otBV=jHedZNe<=m-vV#!
z1|P}Y&JYNht~)?iPGcLj_a#sfZ=tVHzGv;6*UpF>OWw@Do8MKhwi*NcIais)omDfE
zlO~<l<5`YZGOwBUHE3jxofwm02qdl6A@ZMhOS?$Y<Inx|_4v@5GcVQS#PpYce@4;j
zS4Ds9og`8<$xiqd%BFD`Nx-Qm`|lZCvc5sDi@)ih=`Z;GM*=lxlDy2qiz-t*$;LIO
z+V<q)Vm{AXKX`M))^S{eNedD_MB$xLw|9G$>lS6fWVR#sLX8Q*ANP#ak8b)v3G<<i
zRe~=S48e1n1D;>;KU?6U^v+<X;8{+#ZdKB$v4#&Al_8M%5y;4dg;x_rMap`hf3{~-
zrAWQ-iy1|y_<i8X`PT;rw-$Zv6TiQA9H*siLy9lhNr+X4K;nz_QucE+&2yML&f{fV
z3=&du)MoYQa@XEHPtH#QTus*JPJ{M*E}%Z@w|!9{pw}>YKgVq|iV7Y``)$1%8BVbN
zXCdH<9`bxt?1bN}4l-00&9|(aLm_GQM`XvRr`bgn6{$R@ea(BFJNCZH$^;;=#H4y=
z<o8I>=Zg!84Icll;cGuP4>zDX?K?X?hBh}(oAIK{jS@ArJkCx}O|74I)MLTISJz{Y
zy+rd13+@S}ZESD#Cdt6bISpmN+G!BL_`o*f$aW5b|Nb+SIh6U#6CW@>YMc(TsWW~p
zb!#VSYO1^bS~)P554e>N&GA{5ab8~Sk&ziH3}ns5U?iF>dd*a#Qyv^cE6zzYQqXLo
zxkej<RHAtnps!zUieCKs`vdMkzR-k|o%Ws&1wPB|^5cUwe=N(Lw={%3Z!Q~_Y-B1W
z`NuEcTIY5?V^64T_NQvy6Z-eeJN3L#LCyB{)KcSaLO@CU955@$ak7isjrpO8AS;sR
z)b*Wj0DjhsTC0*o*Yr#0mGjC<K3vKt%;$P#6-7JtJ#%vd2N-QKP^pc^KCSr=MGfvw
zG1z{H^=5qw_j@zk-@kviun13~05o;`_`;9kiI<b>$LoXjgVg+Am(JabEdzjQ?QYg3
zE8JN-JW}r8KUMx~_}6OaNdC!lSKQ`mNXJaW9%cVAf*Af#bVz`YU#KgZ<|VnXa1~|%
zepNGacJ>DV0=Qk$NCWPw+l~Y(D|dRi9{XWXpFKnfFo?8WF|L;8mcq_S5q;=w5qD$l
zl)N5c>k;&Rsq2Dv4i22MtA9%Hu8U%hbsOHC{gpPlI83VDPET(<#UW3jFTD#oCjRhM
zvByIwJ*3{yahNokSpifv(V;fma(c)8#lZopr*2O=3pK_k3D`O3lamrGd~8l^ZAQ-z
zengjdw++iwdd>%<^Lh7@Jkfbf=lc4!t=e`bQeOXRvMI7Jkz@N4Sc54$JD2O|>OKO2
z?)pYm_P^H%CQ1o#+XAtlI%|;)<>v0Di&|h0e3(pbfRlcEWW&VhtoVjwJeEohGF-KP
zYN+rXK0?PQ*4J9PfN80~vKQrka>Dnu>gm2eTrWpS#xYaWRrWClNA7Yw5xlue<+U7q
zM3K=a5jp=LyRY|0BC=6gW(%%Cu($$t_~+`Tlp(}Kq^i*-_XE0+ak~X4lqqOVHvRl6
ztN2p+48`j{hV=EG|3yaL*yvaTm{pouXeQi&y%>8M?GD=<C$HHw|Lo&IPXOEyMkV0z
z2^f@aj-8&`L8ps<<Thzp`p{;t+0wb)rpo;EWHAJ+hv^qUhGM(4p^z1KC!_Uo{uK&i
zA?iLE;{6_wEj3n{hIOr<rBa#^e*E-@vxDyaxGlh|7ZZ#JWOGK2`iyQzMZXo}#rel`
zm`2n5DrEiBDPvP%1k-^atD*D{hS$G`eu|$jqL$?3gd{OPM1=%nTvylD?g6lSRJ-Z)
z$4>n6a`W|}He_TPZ4jlYtRF|6Y~hQ-MDO&5HGA{z$MlZ{%<u%18q{V!D6AJ9(*9_N
zgSgWmWBDJ4VPQ9BwBn(|ATb&Xl{<L(Z~gOTREm^zJmO5<C;hBg)_Z?DrzfROjNm^6
zcRY?E?)$hsySk<b==?bxzwQ|$hZF+z<8#iY`6(`!jAU^b;XZt#0?&WNcfXy!MTF6C
z?pB}p2Y${?e05;6#*F^S<7$_!zlSnT)hYKIj^4aCYZb&<O{MhVo>&NjXo1mw6r;X_
zXZzm!oW<qmf*)0f>6BmE62fH|fjSIsbIEpo{Vw?DLv?OZ0rCeK$~JWS_fR<9J(jb2
zsXly#Xsf9JPrntyl~$I@Sv<556cKLD^CH2L**NrK96eUuzo0_z;OD2{u_jcMHG3g0
z?-wA>IbRdxDi_mE2Bb@^z*6$X!H9n;eRFEJMsy|Lh-EoqU2WzWnnLj0E=K))oTd`p
zf5LM9PvZFd?%VH8*OH21X8O+*jV?m0uO&uNj!%!9U!XA!u>!GW2LUrjbH~y8$V|js
zg*=)s%6l49?5s4*?IDZ_TIG?G<h>a2z@pcE*B2CtsW>@AzQL_&^US!<hq@_HDMFM9
zooc@mr{0}b$IURJIe~INX&i@+B$g0iV8{w(BY!SP6NA)aL=(L0VJ*wc3(+3&@E`wF
z_~ThH^Jl%bSW3D?6WUhB$6xL*5fIO#Jeb8T@_9+fhz~!2o=7<u7v+eP5~>1*HiO(%
zTf+es){&eRZ-A&QKpzII6>GQ%;q~AP0)jqO6TxMr4l&6%18EjY?k-lWeU?QvvClu6
z$43}qBbjyS?~BKMgqXWZ8$PNOPb2Hd+U;Px2>F~Z%xFl@wsl7iwt{bM-7O(&T=WWC
zNt3w}{dT6fz@Uu0#Hj0c$Y-lrCNw9JbSK@%sBI|)*{GOd(br*blb@#6Q{)nkoCoj!
zFcwC%QAo7w;Z(qW;eCOYu#9l*q2-?#JKAA|Y@Gi$;N-uK$hkg!Lfwkk?%L%Wqc}FM
zxH70`ik!I(hxxHY#VPvRLzI!YiZQpPyj7x(J8i$9KWv*#{*n}2ghWRgLaN0b#4@B=
z%BSeqT!b+?qLLagH4`JkR${`>ax2_+Q1y<YO{MDLf)5GvueWNpMue42HO{D*o;&hv
z%DuZde!-A(v=X^C;`ZNPBu3*l&Y>UqvD9?Jh76zblYF#;gCZK_W3d0Am;B4GMtXY0
z6H($79Jj0g&RO}d4^Y#w5$o^!!YfQHQ|BdV>97?{t%LpeHKNadk(B6A?jsx6^!rn{
zqQl|z(kmq2pWfKYc=-YgpWfIrE_zq8^%jZZBup(Sg36IVhaRdxc<+h{dvUZQYNNpe
zufFi`b{`WwqGs`vrM_j|ha}WY!Yee?s`aPB2X4RNtlI;ux93ce7_pNxfwT<Cs)R8?
z%Wxu2n=G%;p*6O1zbW!Bl<x!rnNd#KCg>jq%79o?&IswhyN~<>13!a5q;>91_5WNT
zSPSILbzF*nWc)E!H%dXe5qcR;b75TZZ!nU@B_xu0YBS3d`S^+L-0n-C42g%?7Y|9!
zA09y1PP~`e4gr!d7gtx4zMhtnH#0@_k!2!Eh3FJ!Eo5b@tM**%k8E)_NXJG;<I>aL
zfpML?(`n`M<b&n+3;n)Io7T2i(fDUBQ)Ta>%lE$ax84*3{C+lhrHf{h45vto{qXRx
z=AS-<7g%lFUMDrpBB;;QXs*;y98QA*d<_`0cU2g#F@~onI^Sj^-%&lqf?}it_Ud3e
zkkcog2m27WNhhv(vZ71u3pdAJ3Q(YG=ccMHaG+~c^Y6~E!?AlPBbf|z@FBBk8(m56
z+QHR%|1XafUHSTTYvP(I=I@5?q6?$$59jZKP`b}4r`9O>8Cj)A2+PKzW4HDfn8sM}
zQj=*u9uW>ajF_mxCMGDG`E%EH$2^A~F8JG*ZajVViTvBqLF(ZqvOdC?5PqKep-)2`
zNdSY>a==hHUiim;)RDu1bb(k@MD=9x*fH85#Y=i?OYy~teQ}bQI3WS!!uK1wy;j3N
z1;10K{if!p!J<N6(bHYMpnos6cx1BoXMiU&Mj&~)N&*S_K7A9JD*4Xqg`G4?$_Z>2
zm6GhG3(7H*KH?8s*}Q#F`=226mr0SY9}uVEW6pAtGe2}YcB00N8jn1V#yvjwJKv_e
zHHHu(v|bYZFJ68)s-26IQN<VGRG@~qV?N+wpbCb-K&rteCFRDcPx<MONvVj>Muas=
zdBocjCGR#{0_R)9sDb3<?)1WM7O&2LJ=0QX>zbiWg`^|2vt(vHB;Ph&=BVHZC$cVo
z*c-889L?i^n&dJx;1|vEk&C(M@HaUlB4{P<eKO_Qy(dq2TM86g1Vb1;`)yrgJV(Td
z0f+7<1D5oIg`Z5GwtW+hZsti;5i7p_{1?G|Pb?PGlhY8lbcnUo@DX>X@v3(X4gR^t
zo~U7?&V@7@5UB0{-aTKO^E4A{nF`0qmy^uCs633oa@xIg$5OJIMZw>hVMWhiOZFQ%
z#DpWYsY?<2S40DO?tz&T!Pa!2s~<J}pTPvAw!L^?IBd}YrNCw}jB(B7QuUx~*4FyF
z2aL@#P$RUcoA%-eCW^gSe!R0Yy8NDrr>Kk&=$=3qt~mkdQl2?4$FCmD5=i)mbM5b1
z50e<T9&avZ?9P<7Zu?_58xd|vP2*;vH=BJuJ{H;D-a6+QAMft(|LED?Yr`JHL*ez$
zqc8A$EEDbO9n}K*J{L6XF=@aE`RxbZl~zH(2AUKzH_z;>#6ZyF@JobWqe0wwsg~sv
z{*NT2$+DVS*+oUT@oWH!_hv7#mqoJWOF!8cWoE3usBZdvHOhhtDT1XXGn5Jr=`T2}
zVpHIya@TPp+3duqY2)Q)9!ETL(7HEn&k&{=ZZ<vI31-Vt$9=-*a7H*tG(7m5`?6)>
zm!}*SeIz3oxGCVE@nEQgPhnO;WgW|^V^S1}O3#Rujn!mJN7?u$ibR5t9vkJl<{|(E
zg&Bu2m@QJ$Kw=SQhMjfdb|ci8_d0QFFCPVgRUkMn+xxnGalynV4-57MZNX6uCG>|x
zztSgbOe$`ejD-~ZdHI5g>{~XS#GltS9E5&%H}+u?lv`v-5nRkK#1Htfm-`(K9;qpJ
z1TBm!(|D4cqr-yf+ue{Pgi7(u^1UKtXfU81jAsTAHt1ag!HIkvYc(XJ5IKheeApeL
z&@noVRosHMlH-u{3Pjfd;-a(!K*~4*@*X?vpJrwNr-5HnQ`Y`hyVYT4T`_CA#S<<s
zWid)KA{FAL4BxafHJ(oBrQU9C8_{X<`JHDSAG=X#JbjS;q*Nqb326MhE53gxxV>H%
zAEFQs@MBqB#9;uoNuokut0vlW^J42=wm!lj*;i?7L<r(KPdl!z-tu|nM~@zHVg(PU
zWn=(#Ki781oI}s{Nk+g<d6$FVp6|l9t^s45B>J)P2uL5sP1cOIc8JHpwcvTupKJrE
z2$=+9L9AyxBNN2%kvW;;hdmqM)ND^oG79kCt9mozL99wX7n+I;P?q84$BFN=rO#I1
z`rd1?()kwrbWG&KRZG-r<UbR>wdR8Rze84-k-2;?!e#Vf+4tO>DmMi`k}y*xcNueZ
z?iaP3u&FMJZS9Y-@jr#(&>*d7{>}3*7-s$G#+fd;XwFuxL9*v)o_*-ZtLJ>f=ly#0
zX>aS+P^@3So&_>SM%?hAr(fR2G)I%2>s6Nx|Hs-{UKS?-4<PVkP9KP;&=#4Xb+v~Q
zNHL=pl0kbzbpuWQdZ&$HdRC{4UedHWC)nWMzsgV%#=aeMC+{^K<jRkZHMx#@&N`DN
zdH2taXx_B^pR0EyZFjTtA}$74xG(RI<V*$bXDzx4-(_Qcr$kK8ilH{A%fIw>XkG0=
z_kHT{Yd-DLzmc$@B7z|BG~?o^g$D?sDYKC%4zx-sQ^Sa_Z;3BJM)<7%^=ePuP=@#(
zQ>G&wL=I&nE56HNXCEM@qH>mYUzJl=Eg;J(D2E%Cl7~~=KSFGUuLwp{^Pm7iGCkv1
z9`F$)LW5CveFjTtZiq9M)!a3^m{p@1xj+ESH%-rZwCx6DRMCzunkl4}w6s)O){cA_
z6o~w=+laoS|04W2_MZCEW0hB?Ej-mvMgt}vFNF`BR^txo6mST$S)PCS!&g|M!!ayT
z=)ix0^7TDK!j|tt2OQioh)0j!j{=`BkkIqr@3?)o8jEypKkzLTAskrKh&Q6N$@s0Z
zp1}*SNl9rXG%RJB7PyoZsmWK-{*4zgsCm@m?>cy~f}y~oxAKfA>OVkaSVTiLxkH3B
z5cB5A#nR3R0o`i=Fr+Ri)~j}*jm;Ak5UA$n<s}A&k+L~(>aMWIT0sxA`TjcPOTB2P
z2?s*Z4JTnPYB9I&q@+|mn)92NMwe=fO^pq{XS4>jF1ahc3GD7bR{ZDRHTJHPen}EL
zY}-xP`F1py>h7@V?(6`Qj3XW$mz-Wd(?~_DD);7i6Qet{opwza`W;+C*31mGCG5oP
z`S1B&X_p#4W8>f`o;59Z0@-%K^gwp}LUbt5ZR=OTd+0@u@Fc<HI{S-ab(vpT$&!s$
zU$f^uziC_<fG)+%&0!zc-oHzVjB!gd;O-;xZ;X~!s8}Y_kRdxdpHd3FN2?~ZLA54)
zfmpRf7+htc+ecT}&o?l-OV<SvE0LGtXel}Lq$<dFQ<j3dC|_(x6iA$#kPfv_rZ*1Q
z*RdA*DJHI;DLy=W@&8Ou{T#}voAn@0Y0Htyl03~bahjFJz8A0iemug~9wBKp_R1|R
zw7mq1QIJ>FLWRo^@g7iaM|qz(ZFIxaL|s;|AkgajURd=NLn&hAYk;K5I9eO^9>;&U
z0IH!~D=jD6li-uReMi_4L7!RwF0{q;b(8Twqr3j(BqN{ATybJmg6A#qEHB%g@$i;w
z!ZDnC;#rokAM&ShH5`v-S`DUo{|ma!2Ct(lMo%0{7I6GAx%RWlqzwZT;qvMsX@91;
z(S1=b;IMmnvVA_Ya7*Tx>Fv`QO-X5^Wp`V*J@E`<u^QpyYWsxaX|ke@R~HQx%)I`5
zIZE6(de<ykL6>~!$VoUI+!igYwo=Y`I!_z^JqyK^@5hKdO;LQ%Y_3Z^f^xyalJpWJ
zGF1fv;WG5sB)VaI>esJN=?P)LtQc5XA&=IAnkdcSmnI*2Li_s_fw8sm<Y0Oo(i)Bs
zU=<J$2m~y+aXYIad>orhRpJLocTgZ@jv<IdTPu=RPp<=9{X6dtfSwHSP<*Ybsv<iQ
z60#Z3QUC3iL*mYzr8WZ2QiN6XJ18z86(@6nZrP6U^|_xIP=c7RVI<^G;epg6TLRja
z)P{Mx*H87zD4#i;sj8Cj_#AIsQtS!*;RknoR7sYc>tZnsUnLG;WKL3<Pla$8zj!Iq
z<*YA;*n|vcDr`Pz7^%Bf*3{JK7Ee8;z?D~4mILV2C~2NHn8Br||NE*Kd}JA0f#N6T
zuegg$@6aFyVw1Y7<zu1;XLjxFS_k>Un@@tO{k;PXxb&Gwk4~Q^pms3T(@UM2n0PQT
zKHiani9~v!bPs_&X1SfS&$+l7DcmOEe&`GOwWF>#(?4#WGs%)b=UxZ#EPK!t-R_N#
zDDBj)2e^5e%AL)Xemrp=LBi1|OATi31`^nrcnL>xWPXX*pYH>`7d7P@Ljpr4*=WK{
zAOOcx7CmSWhcn5xgCLOZ_seBVZQ>7-1-vxWH5hf3WtN8w{hU2*Y&IRDI$VTAMD#R_
zz$8BVw>?=B@P}g<ZUiKuIbi$U0o-7Ct^>eMwUw1_Xa8O$(395UGtf&4!zN`Q>Hs}r
z)gspHR-L_<H^LJ{s=h_NnrB@^*#-|^*8O(h`0v5!|K7<q782uaM64SX6c(jrq<%pC
z-a(YWCFpm|rbGt}$ssnnXFlVfwzf9>f`D6E31^z1w+j;*!&4)tt9tKckSxR51myfY
z7s1ax=O0eQQnCK~;rw|t_{pyYNcXSTH+e1f8~x|&r~F!WYF)MKXkzSA1sr4g$oo?T
zxI(#fsvQjU8?$nAS=!>?zrUNGakSe<mt8T<STFZFSbisu-~#AkLqo&H?k-;b*2*C|
zkh9KrQ{f^;D0;|oIXN5kb#-*g%(f@!jkv)T-np~0LvKVF(3+v)7j*gMS(mfGMetvT
zo%sflZgM`Qj9I^`hMO&*qmsS|E(BM(qQ8F}7sYEsPNhtt?+bn{-~+Y8f%vvDtEOK6
zabXF*ZDmL)$oj?ju=6I630lRy4+Q^et>osGnCVsa*IScKjm2`L0iyXOXI`R{E-o&I
zr~?}=wJ|A_-)NutxIN4EGS)W69F9yKRC9sV6J*g!+|(Sb@K_ILy@8r3>ZD`_h=v?}
zZP#8vg<>iq-iN0x$;t2N0CiOwGOU}J^Un(Crx<KMg8KzMe><^!azTA1e(QyAt}NOS
zXV6)XN?+|XRd(hb@;P8?e+d-vx#^;`uYn(tUJ%#wv=Ze+u77@Zfi9;zT{6GE-*vyA
zfu&Jus4Q}Fas?ugV)%9b{0OV>n0Q36>vu@n7;8C3A3GV<k$K?@^P4pha<1D(SxL#+
za_bR{c+I^JP*L*q?BjXYy#`YyhY}GHRymG#TWBazTLbAi=bogas>y<KUXchX9DpQ`
zyTk99bN8U_iPF+iYW^)9JG*Z+)+3A~i3w{MWfBiBe~(r?0e<^`3H5Y!+dCCL%)hCg
zDNbp4i{jTZ6i`(M&TUU0pUX914#6YmzqX1@1{VVh`}Tsy#jT=@0h4TusK?Bk>bL)*
z;{?By4dX2isE&^>2Z!NwfH3+f_0-gAw&KGRiTQoO2VsyQjBva!9$O6Jk1ii$rs62V
zRM9sy4ERy=<;xQ=a%UPgL^7bGZ*1+Lbve(7UGKM9cB}83Mf2Q4;xf5}@l0SZ@<4&;
zPW<7JxM_5{)}gx;ZREOArdayI+_=S=cLN0|{Pna1*8z8u#l1|rSxxlWvxmLC{2@n&
z(-j&MiR*)zNq+`1?`GBm4?lE`C*<iv(4C>aT17=oJ{E8fp^fcw_@Vm-Odott|0bm2
zcZERnDpvAqBY(*w*&k_<k&}M@{+;;22b-BLy1>UEb>i=rwj~KOGp3}}%sXrZ%fljG
zq*ZvrM<mBsUX+=wT}S8FuM&=X4A~_u7Z+Wfv2<L6_HRgeU0mv+Kj=@s7NUEk;$m!q
zU`2V}WRR3w&NRH#3#HYaZswtbkxs~a>Dt?T#y%ZV%F8#TlsO(V0+t;U@$vDmdOzHS
zBL!JFw3A8eny2OsleQ_~bIG=_zqzU5uUdLFH(?A&WC^jVdu7EXQ+u1t@wffnwotE3
z<d&LY?SB@eAPMsB&HmG6yXUQ?)j1#eiJI?sryTb6-pSd{d5s+dbm9%KWvJI865SM+
z&VCA#Nr{Z*(<#RMQ&}|~PTFfl&Sg~VvRAh~xxo2T-wdX&vOqnXK|E3iS+Z(ey{hk`
zNF_d<N#P1yV?RqFSto~@k3{{lkx79EQ3B9xX`|3u;w00zZ+d7=bO6}}6IgHqcY+sU
z-;a-TES+H*1!dRDPn?P`-|iGW_7csATbV)Z?6Qlnvsd20EpHbDZHNTvtJY~cn?I&_
z?oPqqrzNEO7v$yT(epl|sVB13AVdSI=kDIYMv{O)705z8d53+emA@o)vY4GhU3(oQ
zo^+S#TDWKRt+gh6)20EzMUSzX0_ltPs%gZ$h8ZH44_3Nj7X$;Y&+$}AV(GwRLBnxR
zP*EB0D@^OF6Toc-(NS62@5c|3RI}eT@h5DbbG;k#;zv`_FpQD$hu%VinG?SRV)!h~
zsjVqQCK5qahc<S$etIqhp;li}#~{bK*LWEa>(iF~Ww{4_aU0YrnXy%ry!HSW@y9p$
zX3}fWH4~2i295?(2}?GOmZT4UvoTEO>+9Qn^Uw$npks?iJ}ru07rVk`(14F6pQhg|
z77R+};Ah^jdBrR>`Hl+S6brhYYM!2+l2rp_756=6b}4vF+jF<q2W@cT3dPDikN%+O
zc~qITmzhvfQdV$rM6?A(C2@)D%*|C>@>hC#irBw?-4#nM<g(KJo=M=}#_rtQrEPv`
z`2U7x<+1PC2@Wd{L?#B%KLmiGH%4)Tm)hm+?IA9_ZpHlM=H_`jyS&!Ig3-W>P^f3?
zD(LnA7mmXGZEvsC@;Q4>$=)PCwXhiZxxIFq`SFd!ofifNEPnLt%=1AsA^mIcj&KHv
zip$%NrQ!ek#dLAwDwAj1-#-7Zb6Qx;t{$&BbCq=0oCUgm;l5DXO3Xw`vbp(5$bIY8
zoFgupTN9nb9Cm)Ie8kdncHLhoS<44ccV}y_N6XEO)L3O@&s+rsU$vM@Z=2`p)2hOu
zfYaGpDNPF&P8t!i_>4p1g!?rpkVhV|?7Md4Ztb$9ocv*AA%jV@e-ck8+oH}x+!T&D
zY>^NoEB}4|tB+ctT^~<_pvnwGbwm&f%OgbixZ;b&m}SG;#2*siz-Wk{SEIq6tDo;x
z7okJ-o;cf=TrnEO;ks)wq4>i)s1GZ6C7iv5qA^g5HaEK~e>)v6cO=?b4YrffYx0_S
z3FUM}!|f?4YsfNqdLl1zv2ldxG!fwSOKYHM+VXA5{MGk@qr;;QTc|XXtyE-Xcr?>m
zV)hh1zCMdif=(BQ7Uy2K#`-X|aZHeu3A}9fdp5_mD(<)LQI#bFfANqgeV9P_9k=l}
z0NTY_{0QcGkRK4ELxfp^?$>xjE+V|e%gYOcP~fwLpUzP6@jAmk5(_X;bbCt}-MIbF
zG-pHL*Zmk7etHEvwd}p<$7GLdZamB_EluwZR^D`Z>|(!Ce%S`#BBy)Pr1H@wD}M&y
zw^7;H5}f3ih)f~7L~iqaV`?1bGcUD@s2DxO*a~b2Zx-W`ZBKN$P&7|xcK&bmT!ptY
zDDBQIZN*EUhJSt3pqu*cYSq4XuR$7*)UlWEp)(F4AD>=<j6Tfoy+af9Md<^PHlk$c
zTZXu%{1@WQlo-93(Bo^>zb^-DKOr;d<nc-gwYBxt_1MjS+rxcs^_~((W@81$|6mTO
z@eBHGk3UV*`IF1y+h=e|Ry}z>wC5)1v^mQ1>X~@leM5%PSuS=QAY&7B-O^Bec855D
zHPIvfeUlGftF|HuCHAl0CuGoS4~c`Xb#i+yaH;d%P!sr1hA-L1wZ;F_!Hdz0T$H;E
zopB_0Ez+V8<ZOM01KWSgD0Y368Hlo2AZQ^b;Cis^_z4$dz(qzuDyc8**<QUFq+!(Y
z+L9N;!n~OxQ8k{q<{9nv0Wc<VM@aw#1-jddp;}KagUkF5dyKr%3L>b9EqsF}q#zm#
z1HxF7!*@ACg3eHyNOjcedBjlXw{&C%OST*rc;MynRg1<Ndat&~;5}>!q=r0(QuEF6
z1<;~5nMdEmdZDnLT_5HRi4R3(Q#faQLP}{g>3gAsp{oKqvDe?)^(_js)Md>QBGWO~
zp=a7weD@s_X=++&`PdL_kpMEj)s6=k84@d+XVu)|;7n}4c@NHF?nIHeaMg_3G}P0(
zjJkx5x>m4_w1=%>G%XN-8&5wh7;q{6`kpV1Lyf>2xODDpzwO(AteF$JqRjg>TX!i?
z7-{Qh@|4o2U3aF+pMg0nkb1VT(kleRo1Xz2M@OhJSM{R$FHn~S@;)LUww45`Szr-I
zE#hH61bnJbkEeDSM$AH(O0pXbSJ6#oMx-OYLWD0~yzl@fH2gCpa#%sEhcAhy>*@~P
zKZ!xL1}r3JYmcYVy=6>{0Kur6ivhxUKQ|yWQ-IF5rl;Sa3@Ho!2y9~bg6@^$d<5Pu
zg`ulz*6ZI6U9og`S-|B=EOXCt0n0Z6hBoiGXmI5x=H}_Sa(=Kv$CluTwm+E@fzN*g
z<hMvNmE)GCFlys5G$Eyv<BEz3&u{{|MtU%r!pMlAS2+LW&^7-mRZ7?R8cfop?Vkd>
zNmat(nVBfCjJW}T9&a^!0#`6Kr5itD4gT5k?M9bLVCvfq1I9zKM$?W9kib@0Qt)}J
z+{{Mj)hiid+;0W&Z(T9DTPgP+adG8!X%`79%NXY3x)%M+mST~?GM%OStc_JFO6_c5
z#fGkk-P1nR$#$khaAkvOrZ`g}84)alS}exvvGvOlz4H_=0(CNm7LOAB0!$gRqN5kn
zoQ=09=wRnc^}#ET?sIs1-#vXZ`lZx4&Pp(oUV^X#Yt6l?Bbed!YwiP4iY}Ax>x+fy
z3NyLzx}23gvxHJDwP)lRT57LrFHbkenk@f#QwZV9hQPqBo<U8rkKN|qModWZy7SfX
zrV)EVk^Vb*3!SnOV<{WyHi3R`?<QC?-b2nmFCVc_0*)O=(#H;_vNQ~>DyMvH6~_2U
zR8<*igSo?aFr$=?jPi!kgt+zua`EsMuvT$Sg9;B;I+lY`^hE=2O99io_r=Tgf+S0Y
z_{Eb8W6#<$$MwNI=v?&^?t-ngtxu=r55@tI{pQ@#XUx6W&zf08%%X5#RikoocKn-Q
zxu@fXu0%YVDxr#&T18e(zO|w8CT{;OSa1V!j@QmXm$Iz}J|yn*?_O1Pb=#&}`0B~k
z4IAg96m9Sd07vew36>527g~*$sY{3^n69M%(@o*>kGe9A!9_Py?)?N*NK5Qcep4XR
zXKN$(WfF7V7^P~A5n(WnRw$HR(fc--@Vbc}%c*Xz#^<DPe{4Nd{Br7WEg_CP!CL3|
z-#u~v+lw54bdiF5E;LQ=tqLYItUF5_eK3zJt-suAVTmHwM$ze}@MYEAeKDO4He-F(
z#<dB28Vm>aBnKR&6i(K1{*C~AEVfjK0ag>mL#7>DgjIfiK+4V>(n9#eCD`H{8kUlb
zLlO@7<N-N6f_x|ou41L0C}#FN2=@atl~5ghe%oK6d^vEXJl=Eu=MZQf%yLc+_=eo^
z-tWNu#(%Cr3c)2AgY`(3JOzoSQz&_#G@9^GH1mY-@8LHww=B890s=Se$--DwR><Fq
zHmFT-Et7stcnA+wp443vO_G;<D;E9VlZzN9(RZuQjxac1F}o6OZXRxJY2ul6WluUp
zOs;<rpwP|qj1F26)Zrl0;pH9KJy@I*zb!XH5j7CD{Z%+ZN;(_teY8JZVR7%}+*2!j
zW<0v;9;|&g1&g&p)wQ+R^e8g)N7by4z~ELMR`*#MLpe!9^R4UpK+bs6#jC}r%eUs(
zpJu0D47je#-r&Z%+uv?3M@DLrc60!vp}8=*BrZ%upmFq#-4hi0Na8doyCFDFE-|ST
zWF9a5HTX#q`|MDD;gKA5gfPz|@)^s4?D3{s_skT7cYu*&YisvXAH^=9QPB6V{^jmo
zz~o*pEUWxS!hJox9Bje^Y+%_@3s48YrOy!vv8Q$S)zbb<iVo+eG3<J-A*$X;DZ-HQ
z9-q>KdxJItkl8p8;>2tjOK!AOB8p&(U^yZ00$c5^*h$ck7D6!nfekEvH}pUl<R$zh
z-YQ+>b%goT){N)SFMo(eHnULRGQgdBd16A*jiG*74x>o_kk`4llfhs8B~z%o*jO5P
z28<DNbaRRi)M}31dVlD)^vFKGDNHjj3EFn6h4R$Dmm%peUnI~vn@R;uSb4YB(f(&V
z#iv0HYdnN0pXF8{9b1Jw7v9-_r!1K_teJJVn9?LsLhyw1eYltWl<Jg5ux#siBnR3L
z3AhI)*|k(2B4S<w&eAj5hW@1Be2ix<zFa*&_!5eo{e*>bT@kex+7v^lTh;&P?26%b
zQ<+*}wD3Et@`J~rRT;z9Xl9SuRbj}Dw{mpetLWU};*A#%Fgvx<pE)x!Ffg8=#-lM8
z<bxrU9livtqm1YkT7gAh%X{WxVb3iMeFn9!bXZsiQ#rAXQ0M;TcBw1TNFh$eOhmra
z7Y#WQlI8buhQ=Ua<8>Ph$u5Jnym>|pgFlm$Ii6X#iLo3?e>rh|oiDPBb%Xelma$Dh
z^6E<b-*FuNJsvhaJ)J-M3$ckrDQ#oL;@ZD2_80}JF~Y`5r_O@Ln`|of3&CFSsfCc2
zx~F;j-d&%~3vpkVn4QIsL2|!8|8?Zjxd4j%U%vn{_1_l?K20?R?!#$VLEOiZ%)7d#
z*iA-82EtXQCGDR-%RmP>zPHa;!(;J=w3&(}#ZD3CcVCj=3Z-e;hQS6V>K`YZ0*zeH
z+AZcm8EDY0+efVQ9{R=oB3473{rY>s`+?!_X#Mxr%(^l@^5#+S6jrxb&khUwRtfqZ
zEH8G~X{w6hB==NWj9g!EgoTBvG<k?kH$Dr?fBH4A$-is1wvG46lSP+0Y2j@NxvMu-
zmR3zaj0e-~KlGrLcA+*c&=HXa19c|Fr=IMAxVK-qdb$U0Zi0ne6#=BVcNA6=c@JB~
zKo18ZWWHzMAW#x`cn>mmvU%w8IMEpQgZUUtk=Dq_(M33&`w?d_63bMlU7Kv)71f_n
zH&%)9<}clC>D|eBs$)HmzkGn06*zmHsjst<FVoYf?ndN3H(FyrukMa!794zUFV@e}
zgj_q}%L|HgD5z`@(wYSkxVN(<EcEqjr<R(UnsJq`^N&1CInO<%^oPpS3=XW>hK#mc
z6vD?-0Nm<0EH{%Db}|}@X13RRA>%IN_8ytW6dCDZNlJ#XXLdx!xpRkk4_+UPh?*>2
z`LetrFO8If0#Q{2Y+FMISWo|^!yr*L2^B)PJc%SvFCd{YWEViUPJTlf=t1{B?e*O+
zL2ucc#H}QJ5E_LfgLyIRQvu1NIwL~cIfI1Y1xduBCvaLBc-13UK(A0%H;0%^{k0$Y
z>E2b8x%Q+U*@+$iApU0!nf;mTe*DKn9EI(B<YM~}wyTTzz@!xeVsa&@Yc2Tv^*utY
zPy|W(Gff=AUrSxVL)&3pD?y(a1NmFDs8!XO3_$||Z~vN{9!u5c<1&v~`{Nu{-o+P9
z+`b2<<?g5UaM=|MsLJ{*H^m5R3lnr<v2k$9t#7Z%ET6oAseJ0ij1JF&0-ERm&kPVl
zbzHh=%%V3pXJ8r;R>luyRUk=|27oMqoN6*I9q!qb^agZ^BMzG&1g#Ota}bfcFB&WI
zXK-M!d%&NrnMgCk>;CAM(U5->hAd8_cxLZ<9F)$<$<(L*=S${LAj;(sQ)nJ0I(^5u
zQ5LB_C%IUI$E%;~^S%NO`b_~=5*O~f{gkgdw2a0=P|%h?#IXUxkwsvb8<P}x@-3&B
z*QyFOMIbTLVk`~^t#C9T{Poi3Onc^gy0ye4w^J)5^bTt5rMRlyQZOA9@A-;}zJKBO
z&#CPyft_`xRKEv<o4VPLtWDGJ#d}R1wivcY(+V<5&#R5d*CxObXdz<*r%=v{?<pUM
zO}*$TwH`MV0@N{F+GxHEOtofj40ORpD`lKj3E`KNW~v0FXkM^UC!7T?7<7%>yukY|
ztJ@aLdt3ID|E9^}GT&gKTUacY)r($``jMf~bG)i7u&mJIlqkGF2X*5=J=ydAktBjE
zfiYg*q))Alk^aGumE&F}G|QWXqL?hCo;Ev7XmbBC+~lg!f9iB8Lg5W%w*N;m$O|~H
zuiZiW4<P6MeATqE%~jA{m*&hH>v>1X9~n}=?yIgj_&m1=#aiMUI(G9B9SAi1Lu@v6
zF(N11`AI|7h)c=NJ`}dd=TGvG2S-L?y26fJX?MYqp0T8$_V*C73`DWn5r#TLC7pIb
zbPKL$a~I<|vhGbsgCb&32$bctp)zPv?FyzRU{G+V7CBa1&KBD7C;<&*iQ15Vrn^Qb
z`KrM6!QWF1f!xoAb8r_G7WymN*tDbuUNb!@p2(6i>G+^L8iPk=9QlJiktWl4G@9~!
zO*!zs=;iNimnA@N?_5$AtM$2PfBShlnKatY;j4mr9ud4jStdcCPYJ)!FG1$`_Dg}f
zjlQdEd&wiy2%9RM#Sa8E&w40C3SM0Do4XrS#;`xMAtHHqAL8y*A{zOC;?!(kE@K`^
z*t~rt8Gm+*Io`zENgG0qDPY6hiT_k7vt;u<ixk3cvXqr(pPpgA{woy%3&u$+gaSPr
z3CRCU`bk|K!j0SY=5wUp!XL*q7BPDq!jl-Z%5OLWmo9&0V%3YPQr#SzHwc*S3d#{P
z+vq$Ge2t>Cj2G`wgmjn(_bpk^{tUQ@g(*(_6i?xb%z|>wx}Lf`AQsc9t5Uwqv#DO-
zOpKwKIqwNVokr;*rhmqS3YKpE1ys=R*i6)Mbaeja$o2bu9tZi44EzulkM6M4ELj}$
z!&QIs7@8=_r&Nlf1mAl?alcawO)niZuN<|oV%3;buK<xEvjUHS_;V_B2EU-62zE?-
zieEpc-&W5(KxzJ4X1&mYiRAU}0P~Yd#~8r}CI^RI{^$p36X(m+Gcifx4y@7Z0{IJ@
zH~#21udId*38c*CI@!K7ZQ2}YwRtHoMwwv{vIgdin@fccgnu`=_xT{k%&k&cM0npu
zPVU#S#ACDKUOdaA*al8=z<bGw($UdmAxlg;yYQ1Y@va41q%CnSHa4cJfOyUC!v`N(
z+xHWQ_)OpYSWnvG>^WjN65DH>Bkp|=HK3McxgM_e%%)5l_MsD|2d#YnewL`ELAaXm
zbn{zfcJTSmPD9WkpV-GCVpWG<WK-3iT(^ItjM{&ko*JK@%SgNsyo9$!tZ?nshy1Ll
zkWgFf+af}M!qG;t9ius%+7obPw>XebDid@WwZQ;QLd>)RoFt`;LDJm+U9^|}@7N!V
zHEY{QzfAgxgN)7BoTD*|>M%xbdrJ$X14ul`jb^=(kw<dTLuu4447q-iH@^z@ZEI*p
zJwByn=lIypZtVQp5t(LS#(>Dz2$|ri^RTn&;@}4apEt{sO}Bkh7+g^m4(>goWenBc
zh#K0WQw9v_N=x(R-6Qn9*dBJmAb3lBB1ZMt@0yb~f{=QtQNy~IT`_M~qh;%XmH5LY
z()d%o3|m8nO)`1@(zs)`f4|*WzmObZD>MarZT1{uD|ohQ9AWoVOGJ934=8na2v*H4
zXp@`)0&RcDwm(Z=cCMVL?d@VqS&AZ*RiGDJt#y8V`)O9n>lO<J4&#!0tuc3MU=d3@
zbcii^k4yU<?JFSWU`$FRGkKU`Ybg1xy215&Lsc<Dv{q!&a=V{WltN`-E}pHG4JTzT
zsV~1$s)($c<#l!GMM5h0N3-jAJB8m`KSo$ViV^mXB<;{Xc2AI6Kl}08k@h<2e^9lD
z&yCK5#dUa}B!1G!H2acoZGhjE2|cD!fqkv2x->gL*PAR=e#ERJ+PEm{uyt_<H5+Lg
z4AdEL&M!HI>N_Mwm3}Mv13ORfMO{mi8}$q7sq`Fee|ynR;bH$f{_8&aZQ|Dl6hbjc
zGCZcfofN26+|67Ht$)%*oNey{nBdMIzP>to!niZlaCP6W@jyP5s|HNJf&uI76l7lA
zQ#lVd2@9)lb6EG?^#H5S8vPrLPwD^R0+ht{0Uvg-ZUWCofa!>s2PR-~C{d^zylDdO
zg2D`97wGu6TnxOum$plrV)~Dd>5cXi9Q{H(-b|B>;V3u14On?oy+kg4(etXYd9&UB
zY%U@MSU}XeU7we+{kGt%tQ`K8NR~}<gs!fqoBuhNMa;<fhwf6+QQk)`LZoqm^h6lF
zsoC;@4+Bwd8kcnnkF+{5osE&xu5NG0V-#rRq8*odkWTEem3+Csq=XHPHYj)gl6=MT
zHU2GHou3kTEW<=|SX|#c7vIIn7^~n?af$e&){wz{6}%29j+4;O|2|y)`BS#@=-haB
zTC5|<KI7Spk-qk%*WX3Sf#Vw1ZvZtNnIXWOZct(cy|0|Fa#XJwtoqvSKg`;RnqXwu
z3})*Tou|8VYhdo#Gmsqk_z*%c%~aV~;wmSRcuI}Lso>;`BoVGNyL<g)i{wEEgtfP9
zU-IIaJ8)}ydB~gtizxY~xp9SNOMv;Dyz)z&>kB@In6tdkUkW;M1S4iv22r!wWQ&fl
z?~dFo+)q5^G=W$?CR6ZW?t@$`W1GEfX(SDN#jW)m1ONUgB_2j}Ny)9l^XJc18iWh8
zQ7{(kI=L6zNIF@<m{R-!mzr52m^qT|5vOcvUl^)f%r!3*U0iVCpy~{I<bm=*2Wavu
z-h%unXEHS5VgP;5B={GHdbW3GRWTC?K~yyOeB+aWNoJ2j$&tLcRK*X7?SKCk^xRO9
zm(sWjJ_V$a(_Ye@sd^zDAt-L{HiRZs;O^)*yY_IvjnDqA;3@i$w*e<#X9X8qe*QiI
z2m7`wU)X00i`&l$30v0zPyi>#fRTp&<Cww%hDZw|`nQaumnKHs74_7H`~=27fWdaq
z`xW6lrR3JT+q0(FH%7+&gYyRZS`${ZSv5t`(Z7G!p|08Zv2|5(P1SjFowcvTu5{*Q
z25S#ucU-aI_*vcyMt}_P`jdIzS)I8?iT_M&nG}wD8tL(kxXVt#X{guHv(nX;)y|G)
zo{%9Qy6bypx_x<qYG<S(VoS2_CMZ}pM_b7Oj1tqvmKJT*ZH%}J3Ler$n_MMwNL~fc
zq@)-dM@My#BV|S(By({S!Uepi`NWZBX6u8iJ2<l1n(n2(SG!sMEyKYmC3$%fQC;N6
z$Hz|6IM~6b=-cxFGXg&gAKkkO?(IFDj*JWznD=68Z8V<z`U=QCRL5&%(3;q?52|Ju
zcX0kToEcIJyKij)!xys|@_*OTs?8Wut)E;m<0%JEV>2MUQP4Lw7p2u`N?*A(h<2(w
z7}49xpiYRY_NbBEmv|Sti_;pRT^Lv9FIjI^chejwa24FISko{+e3f&64Osi_zUVCO
z?(h1Io3B8UO{S0S(avvE1p|YX*J0WK6|nq*(C$__!1k};!W#3$NO`Oq75XLO2-{y+
zFXM&bXUDv4^=@|NHztxM$^a&lj!yny_IUMkYoD?Ytvo^-EBYoBaO@j`De7Avk(QP{
zf*VSLwym8}7I3NN^9s{E@CxfrR*5%Gj6GvzMqrfg`$H6Z>fgbB3{nV&iwi;v)6ekc
z5-gbM5%vPX3aJ)L4?AQ8lo|z9jTu0r_`rIKoJ31AjCx1_kCG9;I3LU7C%5Rc%4{h<
zur1q12V?xH&tpsSj_uKCB^QP6>xcN@oIFZ-R#~L@I1U|yu%mHtwcPBJu*C~c4_R3&
zEkoKY;VTAgsis|=FM?!bJi9o!PiN+{M@Pkuuz};Ad3Wztoqr2xI!8BMEt5-og@uBT
z(((Mc&eiSJPye7n_Wy3Q98+x>I8|t4T^_zVck^~XDGV<+8?mcy+dg`}fg7yiNAmiA
zp;O`E3W{2Yyq9wCboqZ~2kUV=($eZCo_pHNqzT12Y{4&?o5xrZ628eMB)NKW>XPJ(
zE~!r`#deW3YX1M>shQjVfu}mxaVj5imE`Mas_OU8xlbB+xm~zG=a`*SO%IqL-0=38
zvj}amih4gyZ-slFd!xBtJMZN#wS=-WOJcQar=Hr872lqeUj5p!<@@nN6<j#WL^?-D
z9lu@IM;!yt>H@U!p?Af_zow?|Gf4c>R?*YzbNBFA#vyoyc3l2@9O+vrLM@i5jL$)%
zTT9yfqFe5qm91$v$X;*X6&f)!d%%vET$gq*q}50e2w4eG2ezBG<vPYnFHzwj+kAe>
zqi#>o_fP){y$@QmTnY;F_NI-DJ3lawpr`lv&d=T#I1^2|3}o@s3wMhlOw3)<?hbQ5
zPlkihaR!y_Y~UPEQ|VNT9&dqB$1p@7I<mm^4<XzD&G^-KUF8A$H@S4T`w@fO&qFBA
zhuBLSr+sIRH_dyy1<@}w!?HZKGz!y&`48S&Z;s|d`y_~jcf=1quCM)B7FoE6A#JvV
zzC-4)ZZvMt-%NaVZY=xe4abA0d>^I%vNB|y>ua!0I83|YLd{dtJ?dYFI|owVA~W83
zh{KC(rbi@SsedK3`d*BuT$(JJZ2Lf2Nk90T*g`eTSjO91*<Tvfn`M)*AlOX~zFf=$
zbb1v(f3k`e|15Z0n3_Tqh)(tN4G<zoN8qirI14(R@3S9dH=}sHUl9b7wdZW9ITuy2
zkD713TarS}tzkGqA4ZT|ffs$w<eZj2f(7pLn6!q5dLwnhCZOgy&$)3MzWdG%4L5LT
zWPAf!JPTAOdd|nkC!;9OtdQagh7;rlA>>yRaAV`DdtX*lLnC;_kV4GIt+HoZ&muSX
zO)@2=PPzSW%Xf$I4nYi1qWI0Oqd;D=BH+8rwADDXm!t`Or*YBGc@G`J9z#P-;%?{r
zR?L#kcBKs%5LGJ<al)tRC1kGE&2kolv|-BZRJVdmOV(_<fx#$naa(e!m5?d>Gypg|
zK|&k@xAT~E=Hz4~)R^3fJY>t!WnW5SphX~^W^k9a3tE#7CkV80Q72{v^lmXapwJx|
z9}jaBy)d^L*ckD}SYI=s`k3ll{H4b0PFuUA-sOCMX{R+91=cLRlz=)S7o>$VoAe>`
z?n;4})g>AWNKQTKXaIE_3?Y#ntTbAW7D^Lz)U@TYnU`9Z+NM>TG^bS6G=9x_ugI44
zm}Aq92|c2dsKH*mf;wTJP-@Xp`wkp`WQaoFN3fDQ;W1c*BQA{DmzO?(^PLU4Iq|C}
zUvHMU{7mj4@Q+R8G!~}h+X@RA=Ox?O>9bL~8@xbEi?r&^LQMVa>^IjxLw8%g+Y>jv
z_T}b!9EsiEWuk+e)BaF0#V?3YZo0sfto(w5kl4tLPZgt8#3O8LXO@gxyTsC2^bR<o
zKicm@MkdiTKqd@1!pb`QgDH%oElybfTM*H8N4LRFkmVltkdyHg-SuxH)o)8){e}jo
z+PUFqO{m+bC7NNtT<YsUxIZR-kub*|O#q>{D-p_hz2V>Rxfp_Ze}N?_L+=yK8Us%G
z_{yyhD_tLm7^NUd!o?(l?=1c3qLuc^1AAxE*JGK2@n1Bplrt1{uwL!mD4xz|?yvL0
zpB-#4#nuB%wM$@OwRs8vwo1&*p{ED8%*lA5RuREz4H~b}<C*IZI;s8vx~_Rj9i)sF
zdE2N`qNf`<TnL_e5JQkAQ@Pc;ImQzvUvPGtMF^sPQBcb)2kzrb=rc$WzADYcMQ+?<
z%wD+t>&XYu^@>01a?hH`Kfghee|rLFyMG#Z-YQM-k5>ddZB>8V_uoZz_6}*@-ao(L
zqTn~xmLaDPptHs>YkH`9fD!#q+uM`O8!H`83)_dA?HHw64fuQ>%Lx6DC+Kry88z@H
zb7GW{Q>SckXQEh-0NpF(3}{Td|CKApR37O{OAB=G5E@MUVdU0U`+^N$gBbMfA=ApQ
zH)DBYpd1xysUZvR#s~t>rPuo>v|fOk1uG*O>3Hb+M~0L>`TH6>D=0UUAZ_S(2!W*p
zeu)^~6RSA%Wa+8v^gX|>l%&+C&U?ft^)2dW9Isj}Ou+ktlJh3zNmz-88zH<HnV5;p
zn5*&TeU<Sfta(ZoI^Ry@=prJcPcaNMcXuE9bm_yGU2VF?$~efb5CLo~twC`jaQfgo
zEY*4>VQ844psLnL@e=C%<hHoKq}}ZNWD=1&D=md0vyDppKylG42d>!GVj$QE?A%-*
z<iP*=&;8rM6h&raTY!(RhFKNu`qr_tV8QKQ`N<hU*6scLrhZZUz!{cZ*&J!n_teVL
zJgca(60f<s5}QiQhmRn}*F@v_^IRbgJh~F2K;4H&aT7NwC^BQ)s8jpXcBPU;Xt*?D
z*OdF$R}h)RA6!`!9hbHK<Xya#&f<UdD5WPfujyvj66#}cB}hT4XvmIj6TiRL9K^0&
z8j~_NF|m8#^9GR9oqR=&qk%nqHlU&b1TU?{7_#C<nBmTN?#4U#U2d*Gw@jbOkcE>;
z{7VF+WF%M-1ayP9TfGU|FCwGP2mp2VsUX*$?!Thbc(D56|Lg3mqoNGkbwBh_GK4e|
zlG5E>64D`El9Gay#Lx)RE!`+3-Q5i$pwbdUNC`;8c|70V`|Q6Di+3?Ii=_j+PhIzQ
z|1L0>nd}@MhOZ(*=#|o!zV+jhN!&6NGyH1m9_F?JoeKEuc@FP=hdukP>c285$$*uF
zhldA*^qTWzNPVyvI$YLTXn2i>>@9AC%{AP5XQu&ue*$@eaV!c^q)mFviE@cG<fadN
zLBXI@4jNJNo0>?n1)cMX%E~CZW6RJmfX)@QM?rz<zex2~>^6*(jkdt^edOra*r&3x
z$h|GH<Vd@gd6Wn`@$5I1dafUoW;`B>YK-XUKrP05>G1H!>9+swGWf*}#7<5IgJ{2v
z(A)O`l-)Rk-{&G_`mpx!eBYNDu-Fof7^5VNi__b@Q<KB*cTfC+^0J?FQITin1RHWO
z<p1V>Da>@;q<B7}4TS!-nx4ontCEXNUf|#Z*Q9>+6C<POo)C2V*6SFw*bUdaL0n29
z4`^xZ6Mvj;mn4F``o_P%zJ-U&JWs6X#Y;aJnk_=7tl&XM8A76rsJ!`Wa<w^~k8jwd
z==AYPoBt&+K1vrbpUZ~f*>Jgvd)^#hdPM{!^IEg?{^^8vv&#HFR2*na;UTEC-c3r&
zmN2GW@&1<WdUJqH%tyS5kj1haO%#u<L@JR(GN;4<Z|D3cfBWe|*J1Fl7$)ZKo%e(T
zHIE<Da;!ebm#S=zV$v{Iap590*D#Jm3&3uU7j@kuial6yg6I^|h_YgX1;xRL2DrT6
zw3zE><zoiN$3sBey|_4)KqfATSnb!2HX};New&1kbH2i<M6)$sMy~`c-Js~Zw+_gy
zanyWv8gIux_PGL1Lg7EWJYZH076FRsRDp6LQ33h~S1RgeRB0)Ir&tL<WEZhwz@<ab
zb-V5+Mg7#()xT^Zrx{|C><JjZy+T9kc!U9H6kf=7mbIgd>)2AW@wc~=rV%Is1I5kP
zSTz0a?*IlP??UAb!Y7ft@%4BpCiCz}(9l8nvNPVvmtHr@4+>9#OKF@KyUO!z5O-sA
zWKJ^a;uG&TT#O6(TR2Q>_h#9{8LGg_ujLRlyVc9ub+de5`}He&rH$n22-D3I-^+Dh
z=A%sR#&XYJaxH#yA)iv#^V#zV;BXk86H<-k05fjUry)#UQkfi)U$hOVP}99&(vTmP
z(f|_fUw>f=zPLOR{iC8e8f%B7WdG4F5xxBo1PT;@+h0PS1ZUX4yC|zWEqR@?!J0v7
zkygu_8cHHXBoA<~?N`_PH!8}?d^g=7So&hwebxV*mLsnhEpi?M)w(SH&&qq|GbNg-
zMVSv0G*DzxnHxBfH&-#6CXwtY6l>b5iMoL-W-cHajnWEq#)BlTiNr|rnwMPvaq;ta
zO#yuIUGlcgcU_&z#e?wK-OyYFEz920leRm%PzYcnrj^7}cztu^(RHW92!fh?j>JX<
zJ!_W0cG5$v^>q5A9h}s$ja&W5CSxBRe~?b3_x9^7G?Ki3Nv>^7`Aq7CW<qIO9d9p^
z)-*-==eRO`A^zYaqw~F66O;AiZqhO_@lS-gq2btN5PBsn)Ad=0HLX=bl(xJ-@`R2^
zgWnY)9}BiX7b`Fn!0ztTon?T;Up*QhB;O_+|Adtrl{h-xsRkam&VvI%Rg!61#BE;2
zq#96q2~qyD$hMM%5g)l+^S|mvC{cE1RTKcmB7Nmf8$kpZ`PyR@2IAK8@{C#s54d8S
z<*RdMi*hgqOweuUC5!4qf%xNFELmlc6d~k^WvINlUa-)1)Z60TUKE<4lN>YuJ1fgU
z;){PoJJnIM+XgxkLM%!cD!meH``uB3?qfIU4c8}P4Zg(=h)gi9*y%Vg1(^H3S|-O(
z1J4qOl0(OR(tfp-X8N&8vk^iAtPFGFs`bRosK=(4aS!)L52m2kff%MWpDsjsIph*R
z2)WlT%)&l-wm<~u_C)F~_>#+8A|UAHN=fp~8+34-o&9b7$fSNB$^CcP`!NHX6wx>v
z2m2O^0|hXYfF3R7ubPmfi-tEeGaa;6?s?5Y&>ak8XTk09?AI812esnT^xu&ClvQl8
zgCWdd3v{#YDs+4vcsr!>p=QUhoCs6H)I?WT8R=~&os^>fLNTqt;^e(fP8p=miHwYP
zkECfR1o)=0r%BmI=$xs!emc4<`5b{RM^5O!slnw(t=iysCKPt~r;^VOt*xh5{u19o
zK4ZjDOX+F~%86M|a=vW%ONJEmal~m4;NM|<xz~eoMM%4OSC0n(k8fq2&0FM1;h|DF
zcm=Jjjf!%2h}2P&D5baG)@b>A)w=gIdeqEiY^>#Yx6*RQ*vOQR6uo5Mo)2k`wmwzx
zX^CHsXJV7eWPkd!Y?+v7>#eitijv$TNkY{UNgOinUsKZpcjJihZQLJMS4YUrg4{^n
z0ac5;p|k7ph5YA#LHr}3%2C&9)w)YbetomI^hUEAbLD5l$Bc6MEaLvM;6P@@_#(YK
zq{d~?=a@!<iqHE?dS)i;_9k$@3uHp2Je0nwtP2t(>~77K>o3gB`Pfe6u&2h6Gf?#W
zxpjT5H~-$C&NiCYW*nw6IvT54pd*2QCxONA(EafGXriyMdD3rv_0x)xmWqQ?WvZcQ
zB1{HK+s_dM%dBzxKs6*JU|G{Q{`T;kzU7gZ&9AF*p$t*?u6U*Go9z+r7H)5vCquEa
z#1TR-87=w0+i)8PGr*$5P-O_%Kc($eexAH5{QPlGmmM~_)N=kVC!n?bI!mNW1o7>Y
z`^ts*5e3tMpR)ZL;;7x-+tA6$ZqEPWgx6+rv#xU9=%Uheg43im*-MCWIr(cQK+fu{
zFSBMarP4k}YAA?Tgp$Q31>nNX4u8}kE-$(s?ydwfV-kj9S5{WW5R=(;QfHT)p)k55
z@%MJo7cesap^s9cp4thA9mm<QKSmHUpUnit(c6HoS>P!}_<&ea)#~!LN9Ls6Jl5+{
z--P0iT;WL0i;v`%iygCMNYRnunRf{%Ntm=lNSBDITr=j^bEM%tAo1&Cv3O+241cMP
zF;9B)@kdSQfRkaN+e3Rv2^I%YF9=4jlDNOz=m0Sn)g)=DsmSCLg4HH1zc7ydddZuy
zU*^xg9nTPNV<d&HeJxh;Z*pGdL9w&u`zR~<?sQ_CAOfYG=5`L?3J?&-%%V4aWt<$W
z6rZZA5p{KSH!Q^q%*EiBL&8!FY>&B;Le`^10oxS@VsQWIeWv|Ec@1UvcQ@B76T`#J
zas$VN`pm`hUjtW*Kpq+B3d9(D_DoG%*(~c@uWp$}zDyX_<7fAM`KSd(!vU(D;%;3Y
z2L#qZqbZv22OTBq{6+{=!vCcKLg)8!DH>Pt=~2AEX&9uif);!UA@Avdy5Fjhjv3UI
z+n>32KdeHv&dj=EJHU>qh`d?si%rZLGaD)cs-(~PToaPtV+}SrWrx=!r@@fiDH8lR
z*V;83gBh4IOhe14?WF`YqsFG|_mCbMZ|V3u{1+S^BFBmG<-_aHBk4z+AhAaF`%<bM
zlh-nhnYNw{DN#PXB@Q`~s<)`(GuUP}xs+eXpk3YAh(f`>B6))rR`B=q{v;%s=iVdK
z3-y^=+{Bo)^!6XdM8h=s5@UbVxn{!YqimtldWPh%A*6eg?yQtlbcLU7dG*a7xE&co
zyB)b8A|`$G30$(JuenqLq7x|u#s(*XA&LR_>pezIFfGIR6(kR!5eo~i?<-_p42huy
z(-S%ywdy3J$^RfxN5$!joa2BN@CWeB9)59q)(3#Ip^4vP)rgdh&QC5#`hE0{Jd7hd
zgItRybezV}!amy+&_@y}KQEktCuG@2upemuFazBR?WUYrYE12>N6mLMmaLHezv?O~
zA#)D$hKA&PQU2&BuW6zHDI3g)LjKohCKK2;6CZ(l37rckDGUB45Gmz1@^|`26Iy7j
z9ly||VHfFg2b_`Lt)IG_BtEEdaYm+6#fjoUw7y&Q`gTBzN@ZCOFbg9kIm<G{DF#{!
zV0S-{xmwk7J}4E2is8kZ$<3%sH=}oUyxosL5p)S}@(3$u$NFRbnCeCZzX11FSeYA*
z>e`QqOwiP|;`hqj9KtphuKSjoL<eW#llO`CBbgJC{MrbYtMW=ClInN2Cr`n@(#s@o
z7m2QEOrPS$bA6STY-Ul@@wNSdDOu~l%gpbDVICp+#da!Z;HMBrw`x>NFiV(Eh*C91
zf+L<#YzWw6F!1tL{EgYM4vkM^DZZxmd$@VXokEBnXRh9Rau*cT?2@5N+dsff`OejM
z{591Gk8k?gE+mfj-D6f-ty3d*<(zZxS>b_xAiEaj2t>wOf{@&t31)tlT66}BaVuf*
zVnE>y0T6_=cfP)(5K6jGKYlVd4dsVtLG!<zxfNL0l?<DM`&U&hdjy$_T}q6b!I07c
zW9!!gdHgES@|6%CNw~_;U~=3ihMmSJx0s&B3hHMKp)hnQZ_b+b9DSLVl(d9YXTqR%
zo`SC;A<TbR7tlb|YXJ#bA$PBR7-%{k+CYMU?XKc&uJStYhj65+EGctLBwIm2lr9MS
z1+k%hc6>6d?5e`CA*)A2fTkwRGH|wAfG~54LUuCXxZN$yrGw!N3TaG_dQEZRfE_IO
z1UrVaub-JnaSFP+r~$n_V8GNv*o<eIXg(IdsfP=v-jMyw*FPQNdgE-6I$)dYk6!mf
zET0hsMLm7`)J=ae@Q?oxK0nR#@`XGZK0+Myz5_dfOl~It6)Duq)FNcQflnR9VYXJJ
z5RP`t9bFWH|3yTpo&YPX7jYCu_f$q}@5I~kr_eR`@595KW2^KEyblx-QUM~HYCcRT
znmlqJP(T}XLqox8=8nLlI7`BK>e3|)t)32z4LMl+!64IhR$Rn``yf&ap6aGBHQuMQ
zpg>9fyuU%O{H30J9(va?TK(3#v+W5+GKmsHB@NUf!p@DLKa0Ex?>I5E&huw|@`_xk
zdajKsqjrB=Kgd_`@F42ZfQsRYE=JMELxXAHF&{A*WETdar(ZXi6NQDQnCYC2GmyHt
zSmO|ylQNdzLGW7xel(~QybVQ%Fc-5_^5!Iuy<l(?1Amg2Y+jGg9>cZl8JyO|0Fu4`
zCa09BN(1U%)Kqj!Z&z=qAVLgZ<Ybi@4*jJm4+Gv9aF^jfibI72356uWBqs+#^K~UG
zK@^`%ek5u#ER^Uq{Fut2f$!I)8fNogG=D!=o`Ti5ech&2JQ$A7qZmpJ3(pRd1#N8m
za+3NW-QAT&!GW((o9~iUp@e~0s*IbqwojK|$+VtPFwSNtSN`9b|KDv&$MG9xm1>eC
z(N^rP+>S92u+b*2SA}~py{p#LSpOZ6Y#^X<T*3`#9b3>a8zh*O)<~m#En24-b#jc^
zkSJ(F)vfiY$Vzq&{B<(qBoec|G`V29|MTkSYm<LZ2;(H3QNEa{$#s~9gG9E8AcNF=
zw#@6A1qwIHdrb}9IS~PY@MXY-U?*0o9I*Vf-0`l-)6o$JO;@+FSrIB2)VIz|Nkt(W
z5YS1OI0S5jw}Iek2za%fHvADfzWAF6X{Z5z&qn0!I{7pO4m4`N0|BL_CY&+&>)um#
z2bp$YqQnzMCVwG!51l=PaxT*?#*uYM^g70c%iwG^i<-`B$3_naW<uyXJR+2y&wshV
z!sjXQUPGhp{l(sj%M`V9i*M6$5+Aj_?;KBnMD9a5U%!G`a2mIYnnaJO6pAU>BfgI^
z;;^=|qg(*J9l4SE%GeyC-Ww`vktIRXwWweE=Jv>o@_7S#!Q!!V+)#DUyF5-kI?FgE
zW8|8R?q^FmqKyPHSjAo5yMgpVo#<;2+E-6Ecc}_8X(kIFS6T+~c~yKa`+_e6JH8nZ
zVrU{8Qyt)pEC>vldHI~h|JSdrF?{#&MSl3DmdcNhra=d%+v7DpgM*V)5^v-(vr|&E
z;!_f4W=`2BCYIWT-S;G}kNXZFKl9m=AZ}hi<a2pnR#pPHbZ(YV!kcwSe0GZN&B%K~
z!|Da>kh!1Fa`C`~=@(*eX)#KQ?mm0wd-?bV3CtZbJv2*CrqCd|8;9Hpki5}@6Jsb^
z2p4ncss*xV+Z_)zPH$F5iwPa~0{D`RhpuVf6mfw9GW7mxDktQo*)oK_)UHI5iR72$
zoKj|yx3;!6Q$<$Z&ESjPvavTHa~T=mWY5U(0}pd;YL<$Ub2N+EEY;MhpD}|P+gwTK
zsbTpRHWs#zyYDru_$<m#d~0+k%hqw+R9oAfGFcA-pD}O#O-4~3N;+dO7-8Df_EyvV
z)F*DpYIe_~MXDm^<>lm8%chn8_5u{Ua1fDmaB@<M`EEu&K4}-xQa;c*`}jB}QwP6X
zNU2o^->t)&ekCvYuS%}qFNRp<v}XjS>i;%R|AvrESY$=TMSRNnN)c7`mrTdT<<m6I
zE`h+SKd%`x*%cmK-|786SFq_=wCcV;Zhc$IJ3H&-Jfc;)-Gh-!dg`6}@TaorR|QA|
z8-9Ch@+8x#@qo;x?qG9>I(L6(XBxRX>M?7x!HXAfZ8DuiMTJOP1hO1eE32HT$SM0>
zE)M6m5r~C<*S+VF>B00GO^Kd<)97xpkr<;cUVKJ|!OojDO)X=}dC6oVl83^v0|gtK
z5;pB-FaB=qV8;uR{J=GQ7I%$3Y|_uiPsKFl5C}9Rn7EMK4mFLBO%$ywXMEH>tp#<u
ztA*wjq0(}JQ#8}+RWj<wf+g;sW+z1>aKe^|NQuBH2dTBIW}c9pk``NkxPsD;6vPHW
zx+A?qFlPl`(X)5=7pFx1XGk#$eod#hdpfZj=RuhGk<uQIW4$Po{DWV>mczaL*;*dn
z50d;PqEGH*BEygqhbz>HR_En4G`F{Fz)*>F_5MIKUefs<#m7+<7n_r!`^d{LggY-q
z&Y%o)zzY&8(0|9AZf6VZc?guwVlI47x7%hvV2|g06U9|4lKn_HBO^@L+FJcmHh-&B
z;+k1(p%Am)X(lRR5mmM106lxsv$E-8={+G+ePerjvfN3CtSln)<HzQL#6*$wiN&7U
z1Go^;5QR4L3z+w^p2qZ^XUp{5TnZRA=3`^!2YY*8TTM7N7Y{1`T)n!+V5sCm%ALZ<
z`B%$ftiS-s5E2j+5D7at@kXDOpN)gw$+q@Ds)u+<W%GvDcQ$;U=+4a%&ZFq)>Kpmw
zL==`WS73axu{C>ieaBo`vGgcB13Ns!$k3ogeCGmygheX?p$q8X-e(aP?<gu8{yew8
zj*GsI7xt@j?iFXOLiQtjU-4#hSckvATJF#WZD_K}f@o4|f<>;DW<q9a&LhaNuUNCk
z)t@g52Ty21$5H8WgYo>IsK34&&p@=bwmSNDNC^H6(fgL&hqC6&C1k9v&AW5zU2qOT
zv^zI};55pv>17inh_JA5T8Fb&{XMNQO44VH=WjXyF8dRmZb$HE&i^`K=#-`Fw8KT?
ztYAT+22@=d21ad_ZriG$WP%#p)32A7C<>_?L3LL^SGWuK{SJ}cMt3YD|6-yMg!PPn
zyg5?5xjtvHHSTnHj9Q#<O9k`JZ*TQAdST5__cuRcvv=r6y&r{X*J?o<cKI#IXsOzk
z{%WA4zY{{uN92Cuy|H;ut#!T6`ChuGvb^EFjDhZ4<L6qQZNSFl$@y823F(yYfBE*4
zY~g#`Od)5&b`8+GQ(4=d<>R<4BG%z^n*BJopCIW33z1g+Qrc{>W+V2q$$Ou%v{`VK
zPIf!iod6NNr26RR+l4Tc?j`H79dKDf=^cXsteI;v0pHQl1>^9`&y?r%qH5nUWho=_
zb~0%U)*oDgSGn^r{fwFDrC8AL1v~nQ4$}o*V9R)J>*@FzNu=q$ymW#*@XqjCOD=pO
zl=3SkgjhWcM0dTMUTU{+(AB+s<!?f@&0%<!JoxHb7*4uN6q6Vmqaqc57cNH^%}sv6
zZq(`#)3**E+NVl+0I97#i3N1^0)o}nIN=wNB39l%!LS7v`LB%Aaw1({_GiC}=r=U*
zgF>(6_<_w7rSKp4E#gxM#zITGDXpL&$ygeP(;R6`wniw+9M^dNH3-4jZJKal#ogUi
z)NgE<Gh!nKTAlgON(Ua2P}T6C%nLlq@4wHlz={&4JC@47H@@8$-;0s4$^7IKfjKlt
z{=>FrqD8|K(-udAjFEqBNJ4*S6sPD++pXddrGcP>=}0yo210$l6jWA{qxV@rh&%Ks
zyy#Vbq9!KRELb*la!7d)Dzb!0m%e*s8F_7&3^PZ0+~E;Yr~_BKpo65T<9y2z34#r+
zr@r!@UY$K%cn7Lb1|(xxVpCQ&CMFH@juOzk=LrLYq%l+t{QUC4H2>UutAP)9Z;!n_
zA#nY~{t{LAhEH>f9=_>O7eE~QS&#3Z0~}9%W4#VUsBE~lx}mr@krwr-v*1mH|IHIQ
z=6XdRSwdeNYsu3DrrqjC9v&6VTW^HPV$ij1CfSl6o@GjOn3m73r;hRa+CAJqhDd1G
zJZ2Pu$w%C1to0RUXS0W>*;Xs8(<!*{^$H6JxYpOXW76fu7A>e;@<d&XKbt<^J=wr!
zV_>i-&&W?mC@0}CGex3t7CVz$P<c)h_8k?aYGsAtPtWky7(1j&{mfU1TGqyo{qq~G
zk6&CN>(3=v2x%Z664M4p;F_h;ZMN(dgs%B8oL`Ixr5{JO({^i7f8L_fzxRo$=X2oC
z?1{{mIsELpt2-`aKz!``lp~dG=dbvW4f%pY#vk=!Te@-ovj9eo3}){knKmc&T5gAy
zKk+9rP<Z;XiK1ePX%tGZgAAqR+BqNo^3oL~8aat0rck=Qj-sTvVCLZ_9DZM1%tlFm
z+|B0p4%Na?Ef%+`sxT8GX#p}%rU1=kwC>m6^L_Sw4d`u-IL_lxCw&g%=NWPp``)1&
z<TfSBaINc!QURBHd}xoT<byDZOry!}q1t;n93)d1<8PNp*dO&|EwKjs*|;*AwS%Tr
zn=%^5wr3)m%F33;h$}*dlQV7gJ80;dt>g{aQ;pWjrcx%B_b-vX*4^n;El;<p@gXjt
zQwGJ{m;nDd{X#C3x%i)!vfy=4@NeAPWU{Ygi7H6Y(8Hdoqb7#l8Br`Qu2Yird?4c`
zz?Lgir%&8hv@jMAQl%SqgEF{@K2f0w5_*wvAE?}l1d(!<A83*uRvW6f=e~On-l<%*
zy00vEMreNx>p6MS?!=FnnAiOF_ClT}M3^rsKg*=_)vSN7vC@O=L*y<=si!{aIa04(
zdGjoL44QjaH?;UTDQV&(2T2J{MuJiQR*3RtqsK1!pxqJ%4eNDy;#E`ZB1XX(Y72Q`
zjr-Nt;z|IAcJ=A#{Wr`<0&|4lYzA>RWloGu418{EwDC7IWFivXBiO|xAfO3lF7!&>
z0b{s4mHqYj<Y@2$qVERdkt6ysg?#D;)w>Ic&6BHOfLLT*{JHmUPC(K@mTIM>=G8^c
zBl6WmeI3-}>Md_%^cDygAX)C-`~G&dZ{x~7YyWoryCSvtm>Z=kBcUFLkzOj86woy+
z6AJuGRpBJ4mvT35Bp$6K!pdj{>QZprcs?3UX1*PdsS#gfB=~@XKb6#xw*`hJ=CN3N
zZCL$K-NxO;su|+%Rd6s(USml~BsaMz<U5f;RK3mVzZjP}fTtd)?Onl>@NVoXMN}iL
zfzepwCY8s>Bg<Tmz`OY?F7(T@4u{sx$^H{+UREWgBX|H}sYy?L@3N_=%z_qfIRE52
zSCcG-<^*4A21p9k2R=j@aV(VSmCF7&+dcn7{cp5`K)<CoEm;^MB6{$zW-PpKDAUf+
zNSZJSb}(b94}Kf}qNJdhW(C&tdP5wM><&eM`GF1fDJSkDrC<83Exj*PG^%BNCbCJ0
zA}eca($P_#|J{T;Xn%k@YN*FrNe}{w_dv%)#BG>x9zIVG&XM{=@m$2`MG@2U=WEel
z35O%IQv;=ak;!T{J88tFWsuF1bEFi+{DVF-{m-I&*@f*Ta=?zNfsu#Qtr}U9iGXAw
zxe|B#Kzc%3j^g1@y3LR-r>^Vkmu}m|Hn%ss9U6LH@$~F^{7Rk0ES-Iyzi#n}(u=a&
z9ipa+9<)WXIdn?GR+hzWg)YS+<}3)5E8x52EcQs>XjU$ta~S#Z(p(^e>$k_RyStmP
znf!cxBr!a5zLl_{r}1cO42t%<R;;P)Av5OP!^6<)o9imcizW9CAf-A5_l94l&iY)n
zAadFy#Q5sDz;a~2yL(wtj*an%`bkmGS{-ENJqL|2Qi#RT9jo4wzNsNrs`WYmr`-+4
z)KLeXX;$idfvjmqM$cWvk9!ARm7Dpu-`%WMv$M1F+uGO!ml7Qvt#Y23w$>we2kBtm
zHZ_>t|B)oxMDz{Sl2TEHEpA*Lhs4H)L8_3wiMwfKA{8g4SSrzvao{eoA7V_rFY_a!
zKr>H_y}kYP?z#7Awimhr28JzC<g!0?SXcwEZNOAc8U~10Nws#fGVeZ>R#ZfhBU^Wr
z89qu5LxIq4BGYafL7q%bj@Lg<OZNNyre*Eo1|JLk<oF}MXUxc1c<qum>NuIOu#3P{
zZgmO@dt8fgdY5@mDI`D<>XQy5Xp&`#yv6EHTyFE^KRds`yY`a+>b4yz`bD+z5A-$Q
zc>{Kky*YVWmT!DOE?jBlzgCyLwZMhD(6b6f^&3DWeJ&FeTVJN)M$}GDOvszMo#Zkx
z<}Fmu+Bd8TseK5VI9)@{C+QAk3hhrpVd!a$p!U}}Rz~&C!63o12+-C>>z8Kpd~2+$
zJxhue24Uf`WhRobmk-14E+=H8427j?wXPyAn%+=i#3-OBv#^no#Y6qbwNV~3FnBW4
zwP7V&j(+>3k4gJ!h&-l$NFvuoYQCRYbx;NVopJg#gni1bDa77^k1Jg@ciCbc;+j?Z
z4O8hQ0~EPg13JCSV+qwz4(q(XHw~nL<RIjigA_u#0`Gm)Z(qmZ$wV^spX$jx7pf8&
zt7R^)>LineK>F+&`e=PHsQSs_3fjJ<s1VXIW#!)=ikbmn3Lr`s@Bg~QaHB$Ldumy<
zjVo5EtB@dHwh>b??&~@;>DD!Hsd`SlFd1-X43sERTU$XP-IFG5RRD)M$$3+R@X=Av
z_==M!A>yPw?T}mim5^c8pNmuslE=gm#Fp($!zy~yym&x7gsiL?pNj`sZ4LPq4RqV{
z$fYafAV_$4M9b9urJ^WY+YJ-qy{lns`{LnzUmB1V%xNG&8ybSI=RrKK7ROJ=d4i4r
zFCV4%sn}uQegVr)P)FXHEW{)<zOxy;dwnFz>xYM{T=nI4pQKZ7u{9Z5o#bRLVKg)s
znz<75AJk23#?9#nA#kUBh>Zm*;DZk0{w@Y`uc?;0<8--TW>{D9H$w7uz4Y$xZt44X
zQgG@g=HoB6-QJ``Kh8}gGC^JIxE>s=wzhc%w>DU6eTxkeO%PQV7y8JT?6mY1`jLXv
z!)O{REH5yQ4?8bbA3W}o)QO2nNEU&t^nsDEmD5yC-Rt53E;OgrTcNIgl)F4_J~BEC
zUpyF`o`xX@b%V`y)i;zKdyre*1Aqg%5Fw%_bPs#`p|9+zYBJC9;kNpf#s-pne90@{
zzIo(TSI1d*m;#vrnNeFTPW-x&L51xHF*fLKb6#qmInP|Z-Ts!ss!xo(gK|6#pa&wA
zK0Y8*j_pZM#e8aN6lf0*+3~1@(mo)Yvp^O=+W1d^hU5QzdIiHm-w<g>hG;}-Fo#xD
zRNw(I*x_?|c_!qR0xld1TL9L}XWJ9m*rYLaaMWME;abTl$rbHycE55mke!waWL8c&
z3h)B&Is@ep64t7YGJxcP(Fu||0VR`xNkLID#JOn^$Gl0ee9rbI+c5?*oW3`XM&rjc
z4d})*8J-+}^`>H;r*1@t@%7BB7ltpZhfldjyGO&(*9W`d@lG{dfSe;w9#ir>mWCsO
z&bGs}*?<^^8i*4VU8>Ftb}IMBJNdFP=poYOIFg)rV?dynqah;qK03DWe5-<;xWyDT
zJi{Y#bPzUn@T4TTyZ`wyOR<eIOKt&0o_@h=^WduoVP^_0<tA-qkfAx0=y(5|#i>2|
zHmz(g?fL)HK|;O9GOrsB4ocCayIoeiH>Qwo<*pC_Cve49M@B9Kk>L{K<8!SkMfA;d
zc2>fyhm|YXE2{1X&wl>AGR#(cx8568mo}Mo#Q^V0BJ4M!5=0c2_BjY(GiEv|o#kdQ
z64u5joSC$LKOX@-dwluv$J3)JaTV8J(?lT53(;{+l6PlQMjt<ZY?HV<`#sVZ5vN{V
zR%Z0@O`B7u5Yq+YJuR32;Sz>VtkoZP_Xc)s;w2K<I4#DV3*I)bgU@8-q%Zw`598Zh
zZog<8cCLoYz%8mj`!epF+5?vHwQsfYr#7FB!P~B-)`lrjkx{W`&jZ2DS}Ul~@4r{}
zHoVFz%ArdY6~=O{J}|1M$71Lpc=M6ldv+ob%H4q6xDgMb)Nq$qKkKi6gby+eID^X6
zMN9?VZDv3Tw+9Vb4>ETG)v+;RGeGkcO-o9eRg{<Q-?mEx!UfgM#Sv{N8=3|=R@lo_
zYi^grC09aN_>8u)+wsnfcxb#&XgqQBkJ}V&CUvZ?cNZpzG(pE^$~Y<BEgvB)Yz&Yl
zG<gH+<E5$wm8vuvSRgf4gUb$0Ll$bVaqj&g$Q&l>d59D3Zk;=~aD9_f5=c^XRN-}h
zZpI2P8?YbvK!$fr8L_vwmm}=HodrW(@BH}r^L&s>8j+KfG_<EOKmYuILO_i6SS+}Q
zrq1sNj}Q+pC-W>)!H6vpQpDLip%U~_6%~@#r06ak=c!-ZHWZ>q?Bpy00x*gG{tBj{
zA%&Xv@3y<<)t!PkqeDs55b58GO?YA2C31gB<XQ`u3c^<4XX^#8yK|B<><N*P0EeUr
z$?gRxgh}%`8$;K;;C2lAC*H>)2aBw>-{y3YyN7qmzBn(7lr*;b9*~YXTVS9IA<t+?
z<kQOs*P;{4!t&-EYQT)^1#T73?~VeXr<!(b{iR!*4U15Y;>AETf@Tlq`O4NB_m5bd
zaXEi96=@mR^VDqT<H+@SiN0}fz(;l5+A8;Biv}UAes}w3ftziscZb>&?Cd~QDa#aa
zDlQ<;pL1|q8%_Y}gtkyxqx%DruJ4~`9C}9AcjVFYf+0?usrh>oMvZ6HMqQoMeSInT
zsK3$BoJ>>YE!<AH;MK^NpO@E#_AhP{l2UYWyP=U*O$voUbH4AU7i+8(Q)!^2Psp*_
z;+uXrLND){muB6K9+`7}YgJHi-Tfs$wGx8Ci4rBz4bvLD_8T4_*`*6@$A#FowjnN2
zg2HiPXJsgbCg0@4P-D=+rZ#Sqh<F}l8vSMC2;#(i;Il5I8>u^$9h4BRDqVJcq`k*A
zH8p9W!GYJ`KD}6|HnY{MHg#$VJo$wMF|l~l7=^XR%wD{DIq9{MJk?SEdSQW*fuX*!
zDmFO21)^bW^5V6_>s`K+K7I9U@>&uiW53<4G#};NNMn@buai^NCL8)yhHpz+OKi#j
zGulMQc<JsBYqeaFHXj+T(x2?1#|Vcacd_DnH4!H22To;srs6ZM;%}_kiyYSM<(1V(
zfmbQ|WghqR#b<U|9{8x6*pjJmDSsW2E5f|w02voiHP(za*Y)C?g^KmXpFiyYE03L-
zInT^@hgRYl)usf026IM}ou;jug+)g9>4$~=fweUn8v#CZL@d=iNIjv<OY88F57ydz
zwmrdjkJ>suAcR1AI}RRRq5UM~@1+`9xSb@d@LDCM8(nUoAd1CrreLxlI2bDkK?cUE
zkWl2{phElgC@V7D1k%_aosx(Z)b+B(W@6Id6mg_3Rp5G9Ab*4H)abe{D=TYfXV(qZ
zoo6KX9tBeD8wZZJ(eo*+fv@Iw(?J6orMt~G3d-HxJIJtafA5b|gctGVmM&Is_vNN&
zt~doq2L1^7M=Ve#W?=Ne-8pARii<e8@q>Biu+%QTwwcOgS_tiMTWP=J4igmk)sTBD
z2WKu=6*G<eSi~<SJb7}$l)JRBJcpL8hEb^?3wCKh-4n(mA|Y|9Uv$*|M8gHFeBe!{
zi@y`_JX~TS>Euqi6apH9@-EoDI=Q&ms%49yWlo?M&OpO0P$4kXpp&aRQlL`<h`>K;
z1U4i9{lrbhet+8=wH~q(uaqU`LjY>4T*{fo;III0praLbh&M%d(kEgGjv#M(wJf2a
zCF2>y^6@bj7_5iQ$H~$xb6U!)1<8NFoHGsV<c6lEYKwx7@k7^5^aU4>lnKD-D*)H^
zFD(847#wuUF7a@Km42GME1kX{5Ih>CzFsCgu3?j6Aq~$MFTQSup-Mw&3((m6xKuy9
zUVDcl1AThj4mkGxCxWh1(((p8g(=vj8^68uLKCyTc^Ljs`+&Ie&LM%&IAWulYt3@w
zJS8~x?Eu?Bw6R+56#_nT+;JOT(5DaS-g@&wxfNhq0R~MP9B~yC6lbm?B<T;JV5Y!<
zPzw8bYkg&RdToV+9`YRi*a;=c+3@(%uhtd3ToVLO*$}d0p{*sU%6dgcPRvmRVPs!!
zXHa2gkR#IL{dq#tq#9*PrlrP|@@WeV$q$PIL+dSJii1dw)^RX|onRpUeXsY_x!ml?
zmcyqaGzvTx@9lIA5jrRD>0m8VtsRsSA#Rl;#%yUUraWtB4CUt{oWpz>o4HAe9Lsj7
zvXMdr;eHZ)0{lUbO>X7sUy-7Nax9V(Ex*C8j0ClZ4R3vqIZU>%Pso2yho?8)R38I!
zxzX|+n(vk9tY`HU>$m3#_pNqJ=r1d15g$RST4w53XqrRoCth1E$g~z@Q=N-|ppuv<
z>Z;p2{da-}hrSA7Xk^^rtGLiNl*`Z2-Vmt%ea@Wr=`pIb-VD<~QCz4<_IK1CDTuF|
zQoP3|&+1`WQli=v7Ze?t#z%mn_?H4b?T<!WnaB#loMaE2KCVz0Y-IeNkFKNAAD<MJ
zD>^c?47XbV5{)mZ037{|lD-Kr9wAf9|1RPDld|YT(7F#Lb=R?xj6Vu^9h$JVGk#{W
zgtW&SX}BJb#88Zt=;$mtT@gn4n4otAT=e>!5>IAvqg1To<^DFl!KOJ5<$k&`geQIs
zANZIZBSk}VO_PplGV6`X1_>}W)jjVAIVl4NH;KRFu#i8nj3OT<cgxuEwSh@#6fBTE
zVKVr>G|1g_%JOL_&5o62J8w-p#VnT1#E@~|T_fzwmw~AbjXaDYNC7Mb(OUPi&>*!!
zX*c^_iMR!9#9TQt+%!^JK$O;S_HT?LjbX4x2{*Zy;AB?Im&Ovt-|{R8L@x?wq{?UC
z$Ht-}J*g%EpMn?|CqKflWx5aUAIsr!V7_O@6zd_4k?af{z>4M<rO4M{_FH&QZ&n+D
zX0W7Q^z!1v=Ha?wpkyqi=r*QLhfzXzVba&no`V(P;TYqLNz$FKTaI5*8?2Omll%h=
zo(PMP;qLm6<Q<DgX1v=T*GQBxjIcwL#Eyq^mXwqZP-STaSnB`SRW$Nx2{q=!Z;kHf
z?f5_}wLm@jgrxD_-WxiH)2ui2L=YmAz1>fhIU?s$E-uw;Z(4vQsPB&ETJ0`Ca&T~P
z%|nD+L<B2s3=LE+Q>_PT=!j&vNadJG`zx+}iIP*D6_b6u`ztk-$7l?vIoiL^x;GZL
z2$zGc{4nSw<dk<z)ny0D(5{E&{(L1hwP--r{`GHOoJWuLh6V@6L*w@Vk=+SsS05A#
z?T9L8rSpi6?ynaf(DTGO05{PQ<ya6RcFt>?gI0`fEg4!XnIJ_2&;?cNbyE`27ZPNk
zUz9p4@Txd%TqL`SLr^eHNnJgn$F9G4N)qq>WLEu@Rv4j1Y~zuyLt$Ng@ZD|GrOBxr
zxZprw3E8wm126|PFD*v1l5jSv%o)=7lSum+jrP4VQ&Jjn_4M@gS5tfBfsV5BaCej&
zY8RAEnXH9fe1`k%*C{BM^8y#(8X)UlrZT8p)`D_YwH3=My7I26{SnsP<mnVOsC!;a
z8a2nKIkUahP|l6NjW|}90KG$QZf<3r`9WSf`f;MvdCA0@%A(B0XQ{JS1_9DR6gckQ
zGN?t^DN3T&I|Dg6yy$gT?pDsuql5&?yMg)1*MAQey>O&1LNT9{STGlJDihBgp55N2
z2U%y`#w2T9@ESFB3I^<Lk{CW`>5$Q$pH<lG$kp=QsDeHxsnt+sn$K`X-2F5m{2#UI
zKM$~ehckb@o0a-XW*p4?ID_lZ*K8y?3QMfT&C0-8x<@)Pp^M35qK$Fw^eS)8?l>ia
z+J>0Tus&wz90MuY-vX5e3d+==7GhUcJ!BOpRy&=Z;6~m}Xa+?pG{t+C0K6@`ySv`M
zYKGXhbamSjWH36OBF{%*vBR+-W9*Dc%_b^X{Gbls<4*ZAl}&mv>an_1p>Pa66`!sm
zvpmcs2<*|3!dXTd4KvQ_`PiJC!oDtuyBaxE&F-#YqkehlMzXjZj5(6_h$N=Hp^lTn
zhf|aB@XV`~SK0h=5-2JyrWI$$4YlaSCnE^MPw|?yYcR|@+Uo^#ro`smy(hC+GsDwk
z+t&K}g9&WnA`(%`f>*}0gBUQ{#yAXvMz)1;_gAQ0`#Y|f0S|%UJIqh>CwID1^mOm~
z06VA~0``gAXzHlRTHx>rHuT}GB3UACqU|rlkj*l+v`_I~;Nq^y(xN`LKrJ|;lv2J9
z1@~}G4L1%hZub7}?hG>YraYF>oRgV-S)#o232j)8)FYDe+lf;#u;2j~&C6tJlV-}w
z_3epF8Ex&^e2^u=j@~UZgI|d0=;C1aB{WzX6dPm`7yQ8xjT`FIROSTq&02v>_Lsa)
z<iz8-)ytj!H^$|2<is0e4Zu(Y3a75;dvl$Aim@N`boCmgKZM;BZRSx+y<)0Yb+Ky}
zF0R+1KE7E$@#Yc}V*^eZ_lMmK+wYaY`Ndv<?10i;Z$BIQ>z5@dPWTtPK41gh^*|2w
z^Zq-Y;R^v=dDLUC8E2Vfe%G$Phn_<g2m}gKl9SePUI2K4e_94`IoSfvtvfB6SP*Ic
zE=2C}5(G{GLBFMJGK!s~QMB7RI=Z+$h~~`kzy4JEkyheOdCHR;!u1#*Y?41)TU#qf
zVh^_#N{X<=SN9am#cmPbYCn>9T8|KP78i%*0+}>7H#aa`>$)ZRAx7@XvWF|;6dP-)
zDQj}7Xq+nfYr#pa@aOWY>u~hWvSy+B&W;Z4#G*J&Wo=(FmYEK()lREqE$ZU4uA+}4
z>6v2`<J(i5f6uZKBB@i7%?SJcjW0!(x3j2Eeh|`%OFon($CV~`N)_J46k{px;wtan
zdBw*mw}yy*Ol0BoP~^FN|CaB6FNI|qZZ3Iy*g8Nl=F~Vx``l@6Ty~ADYX;FZizoQ+
zSO3fX@SiHsNg$0*pxkFkx;g5Ey}0M+ibdB?weIjg-ADf4mkU@u3c&Y+XaDUx1rJV+
zU?-`F^Vf@u>e#{XRnX*?`&7Az$LridV$3l-90rHs;NjvL|K7cFt*>@rC7Q1#m?zfL
z547@iI`FGhEA4Py@BN`-J9$e`;KK>O?A_aLKl6AwVbk-fj{W^T?<`p7XCgbJN!lcY
zJ$B+5i3pw;w){!Z1)&=lkaD`+jRSSbyVKN?lI<#WN%41oj@LJ4S)c9AOP+s=p0+c6
z{@na}sRi#3<<KT#+rbF%VmZT~6st}j*?J!R)aB*l`f~X_;pzDCM5bfHvMG{zOx8G9
z<W;8;v-1mc=jWy^T3)AvF;{^tZ(rwnc_jO|9{h9}wjP4Hem^*!9k)qNO@_7@7_`6`
zo-~b-pt_311!W3uUA~gZ?@KtmxJp-zu(H2YD0z_yyz@1nP)`6sKq#v-h3j_q=E~QQ
zkyzn--l)&&*i$Qz+p@<-Ms^De20YyPl)&je_U`5aCX<THj2kAyHddQ1=;hpu3GLfq
zDHifR+j$~0EGF|jdcg61^ivX3*lNd3)#(_8fN`v1UdA6W%CIn$Eo*DUodor7?UD*T
zMi_ILTB$5EX+3foZD_@buh^gzS0t6F*Y%c%*c3`Z{aGvB4ce~ges<v90v3((OA~IZ
zK@_o}e8BPjM-XR1m2R#s`TY6q+E)g7ipT^D7hK#*m(?%pm_Z199Q2H>vDBV~3?J!?
zM-aY*byiM@>+`M%D~G)HdXJiLi{p7C7fcY8S)cwvfoL0%CS@_n3PlbMf+%E7Vq=Ji
zt^&p2UY3irA50w@Le|Q!0+Hy7DnemFFdiEJ<{k1ch*vg0L!}@<X>)=Y0$laxS~ND&
z?IVzM83M9E@ETpJvo!VfF(FS23wvAN?x+9U+iS35YYU?yU4ufT9l~E}%y(Ntk%1W!
z(Ctpuz{K__bAl1zwq6NSvN|uYp$(nxbb6mq%3)r{{;sHy&Os!+Zm_9AL796a67+Q^
zJ_$$8pn$5SC1IW2>Hk+UP`0pPC;^f|r2<R5;`uha(e*;5*=pSS`Y06nZ*Z^x=UBm)
zW^dANeI&oRL)R=o;T#?r{fuso+FxT-IMeOWA-;3)z2>P33>6Hgkpfd7d7$0~7$5Go
zuxAO7I+#3t+U#*sV0+XPl7=KtZ4PCz0zcmNrU$;v3Oby3dD;CoNJ<uc$e#8QrEQA_
zG*}^IGB#H64Hou3k{t@$;^wLM7t6V4kTu|gNoDWpx}9%2Yo`(0E-Nd8q4r4n?|mx)
ztv|fw`qhm~UEXeJ@G350BYCv9$*Esm{1BopqX^TV4g0TS6A28B^cAItjUmicRVDll
z4IUpa*UL-QaDQN9ade*j851k^kgGycwg+aXDxeHkifEf?^Xh0D?Q=ZiI1B(P0Nq!X
zj~~M6kv2D?-1)x>=V%!+WhccwkQCP^Y5AsW?WIgQrPZd+%`aSZ-Hx*Ahy-dS)+&@n
z)6ke*)}W&96@DGbg%qC=D(?ywJ2JSFaI||oeB}2tGNN#DbSy$cLpxK!6Yp0n4p}N?
zBxE=xX5VAuU}Gcn&N%_6KT68}@o;pY2Uy|3J!PQf<E|G*9nOVzlfh^=RG#n1rrdDG
zYDu3wQJBpV{@!900pY%{krdJXj4D8*yg;aZSs<S+kB0Ubd5V{9%+l2r784WWeV(F^
z8mT<aKGVjk#c)i*x=`^$`1Sqm9p-bQNt1fJ!2Ahf4nI3PC@wCp_xYUuR&Q>sz7Xt_
z;0Gh`{m~Rjo_!Bh8(-g8VcyfAp!<7qh}fI;I>giw+wfR95jdNVcuBkyFnxExkJPP>
zB$iU<YTiyhy>Ep41aITwiso2M`&HAzc#fcY73RB*cApz7EEmWA*OFK7A#O}_+pogn
zj8Kv{D5(SgjQB5`m=x^2D5OpO@F5F)U_?bn3;uL!{G<aT1?=PeeA@9GaSD)Ckc_=5
zWV+rh6h~Wp#tw-C+*n>fMGl^@37N4&?c+j*K!KKV8-RoR$P!E)-goB<Xpuj^{MEry
z4}%jIgzwM%{p-2CIg&IyHWs4!fe7H2sXI@BdlVb865gD^Vm%w>hEZTgz@(NX1p;Cq
zkyAd}vs5HGJj}(0K%+?3>h$kJ|0fuXjg8sggya5s`H(7iwj!-$Ia~6=16*dt>;JW=
dMLkSku7-tu{lR_LYXkuwO7d!QRWjzm{|CP}?@j;!

diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js b/htdocs/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
index 9c811a0af0b..d431e5f4f62 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 (function(){function c(b){var c=this instanceof CKEDITOR.ui.dialog.checkbox;b.hasAttribute(this.id)&&(b=b.getAttribute(this.id),c?this.setValue(e[this.id]["true"]==b.toLowerCase()):this.setValue(b))}function d(b){var c=""===this.getValue(),a=this instanceof CKEDITOR.ui.dialog.checkbox,d=this.getValue();c?b.removeAttribute(this.att||this.id):a?b.setAttribute(this.id,e[this.id][d]):b.setAttribute(this.att||this.id,d)}var e={scrolling:{"true":"yes","false":"no"},frameborder:{"true":"1","false":"0"}};
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js b/htdocs/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js
index 18185792477..ad47e6b6865 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 (function(){var v=function(d,l){function v(){var a=arguments,b=this.getContentElement("advanced","txtdlgGenStyle");b&&b.commit.apply(b,a);this.foreach(function(b){b.commit&&"txtdlgGenStyle"!=b.id&&b.commit.apply(b,a)})}function k(a){if(!w){w=1;var b=this.getDialog(),c=b.imageElement;if(c){this.commit(1,c);a=[].concat(a);for(var d=a.length,f,g=0;g<d;g++)(f=b.getContentElement.apply(b,a[g].split(":")))&&f.setup(1,c)}w=0}}var m=/^\s*(\d+)((px)|\%)?\s*$/i,z=/(^\s*(\d+)((px)|\%)?\s*$)|^$/i,r=/^\d+px$/,
@@ -8,35 +8,35 @@ b){if(!a.getContentElement("info","ratioLock"))return null;var c=a.originalEleme
 d.removeClass("cke_btn_unlocked"):d.addClass("cke_btn_unlocked");d.setAttribute("aria-checked",a.lockRatio);CKEDITOR.env.hc&&d.getChild(0).setHtml(a.lockRatio?CKEDITOR.env.ie?"■":"▣":CKEDITOR.env.ie?"□":"▢");return a.lockRatio},B=function(a,b){var c=a.originalElement;if("true"==c.getCustomData("isReady")){var d=a.getContentElement("info","txtWidth"),f=a.getContentElement("info","txtHeight"),g;b?c=g=0:(g=c.$.width,c=c.$.height);d&&d.setValue(g);f&&f.setValue(c)}e(a)},C=function(a,b){function c(a,b){var c=
 a.match(m);return c?("%"==c[2]&&(c[1]+="%",n(d,!1)),c[1]):b}if(1==a){var d=this.getDialog(),f="",g="txtWidth"==this.id?"width":"height",e=b.getAttribute(g);e&&(f=c(e,f));f=c(b.getStyle(g),f);this.setValue(f)}},x,u=function(){var a=this.originalElement,b=CKEDITOR.document.getById(p);a.setCustomData("isReady","true");a.removeListener("load",u);a.removeListener("error",h);a.removeListener("abort",h);b&&b.setStyle("display","none");this.dontResetSize||B(this,!1===d.config.image_prefillDimensions);this.firstLoad&&
 CKEDITOR.tools.setTimeout(function(){n(this,"check")},0,this);this.dontResetSize=this.firstLoad=!1;e(this)},h=function(){var a=this.originalElement,b=CKEDITOR.document.getById(p);a.removeListener("load",u);a.removeListener("error",h);a.removeListener("abort",h);a=CKEDITOR.getUrl(CKEDITOR.plugins.get("image").path+"images/noimage.png");this.preview&&this.preview.setAttribute("src",a);b&&b.setStyle("display","none");n(this,!1)},q=function(a){return CKEDITOR.tools.getNextId()+"_"+a},t=q("btnLockSizes"),
-y=q("btnResetSize"),p=q("ImagePreviewLoader"),E=q("previewLink"),D=q("previewImage");return{title:d.lang.image["image"==l?"title":"titleButton"],minWidth:420,minHeight:360,onShow:function(){this.linkEditMode=this.imageEditMode=this.linkElement=this.imageElement=!1;this.lockRatio=!0;this.userlockRatio=0;this.dontResetSize=!1;this.firstLoad=!0;this.addLink=!1;var a=this.getParentEditor(),b=a.getSelection(),c=(b=b&&b.getSelectedElement())&&a.elementPath(b).contains("a",1),d=CKEDITOR.document.getById(p);
-d&&d.setStyle("display","none");x=new CKEDITOR.dom.element("img",a.document);this.preview=CKEDITOR.document.getById(D);this.originalElement=a.document.createElement("img");this.originalElement.setAttribute("alt","");this.originalElement.setCustomData("isReady","false");c&&(this.linkElement=c,this.addLink=this.linkEditMode=!0,a=c.getChildren(),1==a.count()&&(d=a.getItem(0),d.type==CKEDITOR.NODE_ELEMENT&&(d.is("img")||d.is("input"))&&(this.imageElement=a.getItem(0),this.imageElement.is("img")?this.imageEditMode=
-"img":this.imageElement.is("input")&&(this.imageEditMode="input"))),"image"==l&&this.setupContent(2,c));if(this.customImageElement)this.imageEditMode="img",this.imageElement=this.customImageElement,delete this.customImageElement;else if(b&&"img"==b.getName()&&!b.data("cke-realelement")||b&&"input"==b.getName()&&"image"==b.getAttribute("type"))this.imageEditMode=b.getName(),this.imageElement=b;this.imageEditMode&&(this.cleanImageElement=this.imageElement,this.imageElement=this.cleanImageElement.clone(!0,
-!0),this.setupContent(1,this.imageElement));n(this,!0);CKEDITOR.tools.trim(this.getValueOf("info","txtUrl"))||(this.preview.removeAttribute("src"),this.preview.setStyle("display","none"))},onOk:function(){if(this.imageEditMode){var a=this.imageEditMode;"image"==l&&"input"==a&&confirm(d.lang.image.button2Img)?(this.imageElement=d.document.createElement("img"),this.imageElement.setAttribute("alt",""),d.insertElement(this.imageElement)):"image"!=l&&"img"==a&&confirm(d.lang.image.img2Button)?(this.imageElement=
-d.document.createElement("input"),this.imageElement.setAttributes({type:"image",alt:""}),d.insertElement(this.imageElement)):(this.imageElement=this.cleanImageElement,delete this.cleanImageElement)}else"image"==l?this.imageElement=d.document.createElement("img"):(this.imageElement=d.document.createElement("input"),this.imageElement.setAttribute("type","image")),this.imageElement.setAttribute("alt","");this.linkEditMode||(this.linkElement=d.document.createElement("a"));this.commitContent(1,this.imageElement);
-this.commitContent(2,this.linkElement);this.imageElement.getAttribute("style")||this.imageElement.removeAttribute("style");this.imageEditMode?!this.linkEditMode&&this.addLink?(d.insertElement(this.linkElement),this.imageElement.appendTo(this.linkElement)):this.linkEditMode&&!this.addLink&&(d.getSelection().selectElement(this.linkElement),d.insertElement(this.imageElement)):this.addLink?this.linkEditMode?this.linkElement.equals(d.getSelection().getSelectedElement())?(this.linkElement.setHtml(""),this.linkElement.append(this.imageElement,
-!1)):d.insertElement(this.imageElement):(d.insertElement(this.linkElement),this.linkElement.append(this.imageElement,!1)):d.insertElement(this.imageElement)},onLoad:function(){"image"!=l&&this.hidePage("Link");var a=this._.element.getDocument();this.getContentElement("info","ratioLock")&&(this.addFocusable(a.getById(y),5),this.addFocusable(a.getById(t),5));this.commitContent=v},onHide:function(){this.preview&&this.commitContent(8,this.preview);this.originalElement&&(this.originalElement.removeListener("load",
-u),this.originalElement.removeListener("error",h),this.originalElement.removeListener("abort",h),this.originalElement.remove(),this.originalElement=!1);delete this.imageElement},contents:[{id:"info",label:d.lang.image.infoTab,accessKey:"I",elements:[{type:"vbox",padding:0,children:[{type:"hbox",widths:["280px","110px"],align:"right",children:[{id:"txtUrl",type:"text",label:d.lang.common.url,required:!0,onChange:function(){var a=this.getDialog(),b=this.getValue();if(0<b.length){var a=this.getDialog(),
-c=a.originalElement;a.preview&&a.preview.removeStyle("display");c.setCustomData("isReady","false");var d=CKEDITOR.document.getById(p);d&&d.setStyle("display","");c.on("load",u,a);c.on("error",h,a);c.on("abort",h,a);c.setAttribute("src",b);a.preview&&(x.setAttribute("src",b),a.preview.setAttribute("src",x.$.src),e(a))}else a.preview&&(a.preview.removeAttribute("src"),a.preview.setStyle("display","none"))},setup:function(a,b){if(1==a){var c=b.data("cke-saved-src")||b.getAttribute("src");this.getDialog().dontResetSize=
-!0;this.setValue(c);this.setInitValue()}},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())?(b.data("cke-saved-src",this.getValue()),b.setAttribute("src",this.getValue())):8==a&&(b.setAttribute("src",""),b.removeAttribute("src"))},validate:CKEDITOR.dialog.validate.notEmpty(d.lang.image.urlMissing)},{type:"button",id:"browse",style:"display:inline-block;margin-top:14px;",align:"center",label:d.lang.common.browseServer,hidden:!0,filebrowser:"info:txtUrl"}]}]},{id:"txtAlt",type:"text",label:d.lang.image.alt,
-accessKey:"T","default":"",onChange:function(){e(this.getDialog())},setup:function(a,b){1==a&&this.setValue(b.getAttribute("alt"))},commit:function(a,b){1==a?(this.getValue()||this.isChanged())&&b.setAttribute("alt",this.getValue()):4==a?b.setAttribute("alt",this.getValue()):8==a&&b.removeAttribute("alt")}},{type:"hbox",children:[{id:"basic",type:"vbox",children:[{type:"hbox",requiredContent:"img{width,height}",widths:["50%","50%"],children:[{type:"vbox",padding:1,children:[{type:"text",width:"45px",
-id:"txtWidth",label:d.lang.common.width,onKeyUp:A,onChange:function(){k.call(this,"advanced:txtdlgGenStyle")},validate:function(){var a=this.getValue().match(z);(a=!(!a||0===parseInt(a[1],10)))||alert(d.lang.common.invalidWidth);return a},setup:C,commit:function(a,b){var c=this.getValue();1==a?(c&&d.activeFilter.check("img{width,height}")?b.setStyle("width",CKEDITOR.tools.cssLength(c)):b.removeStyle("width"),b.removeAttribute("width")):4==a?c.match(m)?b.setStyle("width",CKEDITOR.tools.cssLength(c)):
-(c=this.getDialog().originalElement,"true"==c.getCustomData("isReady")&&b.setStyle("width",c.$.width+"px")):8==a&&(b.removeAttribute("width"),b.removeStyle("width"))}},{type:"text",id:"txtHeight",width:"45px",label:d.lang.common.height,onKeyUp:A,onChange:function(){k.call(this,"advanced:txtdlgGenStyle")},validate:function(){var a=this.getValue().match(z);(a=!(!a||0===parseInt(a[1],10)))||alert(d.lang.common.invalidHeight);return a},setup:C,commit:function(a,b){var c=this.getValue();1==a?(c&&d.activeFilter.check("img{width,height}")?
-b.setStyle("height",CKEDITOR.tools.cssLength(c)):b.removeStyle("height"),b.removeAttribute("height")):4==a?c.match(m)?b.setStyle("height",CKEDITOR.tools.cssLength(c)):(c=this.getDialog().originalElement,"true"==c.getCustomData("isReady")&&b.setStyle("height",c.$.height+"px")):8==a&&(b.removeAttribute("height"),b.removeStyle("height"))}}]},{id:"ratioLock",type:"html",style:"margin-top:30px;width:40px;height:40px;",onLoad:function(){var a=CKEDITOR.document.getById(y),b=CKEDITOR.document.getById(t);
-a&&(a.on("click",function(a){B(this);a.data&&a.data.preventDefault()},this.getDialog()),a.on("mouseover",function(){this.addClass("cke_btn_over")},a),a.on("mouseout",function(){this.removeClass("cke_btn_over")},a));b&&(b.on("click",function(a){n(this);var b=this.originalElement,d=this.getValueOf("info","txtWidth");"true"==b.getCustomData("isReady")&&d&&(b=b.$.height/b.$.width*d,isNaN(b)||(this.setValueOf("info","txtHeight",Math.round(b)),e(this)));a.data&&a.data.preventDefault()},this.getDialog()),
-b.on("mouseover",function(){this.addClass("cke_btn_over")},b),b.on("mouseout",function(){this.removeClass("cke_btn_over")},b))},html:'\x3cdiv\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+d.lang.image.lockRatio+'" class\x3d"cke_btn_locked" id\x3d"'+t+'" role\x3d"checkbox"\x3e\x3cspan class\x3d"cke_icon"\x3e\x3c/span\x3e\x3cspan class\x3d"cke_label"\x3e'+d.lang.image.lockRatio+'\x3c/span\x3e\x3c/a\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+d.lang.image.resetSize+
-'" class\x3d"cke_btn_reset" id\x3d"'+y+'" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3e'+d.lang.image.resetSize+"\x3c/span\x3e\x3c/a\x3e\x3c/div\x3e"}]},{type:"vbox",padding:1,children:[{type:"text",id:"txtBorder",requiredContent:"img{border-width}",width:"60px",label:d.lang.image.border,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){k.call(this,"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateBorder),setup:function(a,b){if(1==
-a){var c;c=(c=(c=b.getStyle("border-width"))&&c.match(/^(\d+px)(?: \1 \1 \1)?$/))&&parseInt(c[1],10);isNaN(parseInt(c,10))&&(c=b.getAttribute("border"));this.setValue(c)}},commit:function(a,b){var c=parseInt(this.getValue(),10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&b.removeStyle("border"):(b.setStyle("border-width",CKEDITOR.tools.cssLength(c)),b.setStyle("border-style","solid")),1==a&&b.removeAttribute("border")):8==a&&(b.removeAttribute("border"),b.removeStyle("border-width"),b.removeStyle("border-style"),
-b.removeStyle("border-color"))}},{type:"text",id:"txtHSpace",requiredContent:"img{margin-left,margin-right}",width:"60px",label:d.lang.image.hSpace,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){k.call(this,"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateHSpace),setup:function(a,b){if(1==a){var c,d;c=b.getStyle("margin-left");d=b.getStyle("margin-right");c=c&&c.match(r);d=d&&d.match(r);c=parseInt(c,10);d=parseInt(d,10);c=c==d&&c;
-isNaN(parseInt(c,10))&&(c=b.getAttribute("hspace"));this.setValue(c)}},commit:function(a,b){var c=parseInt(this.getValue(),10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&(b.removeStyle("margin-left"),b.removeStyle("margin-right")):(b.setStyle("margin-left",CKEDITOR.tools.cssLength(c)),b.setStyle("margin-right",CKEDITOR.tools.cssLength(c))),1==a&&b.removeAttribute("hspace")):8==a&&(b.removeAttribute("hspace"),b.removeStyle("margin-left"),b.removeStyle("margin-right"))}},{type:"text",id:"txtVSpace",
-requiredContent:"img{margin-top,margin-bottom}",width:"60px",label:d.lang.image.vSpace,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){k.call(this,"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateVSpace),setup:function(a,b){if(1==a){var c,d;c=b.getStyle("margin-top");d=b.getStyle("margin-bottom");c=c&&c.match(r);d=d&&d.match(r);c=parseInt(c,10);d=parseInt(d,10);c=c==d&&c;isNaN(parseInt(c,10))&&(c=b.getAttribute("vspace"));this.setValue(c)}},
-commit:function(a,b){var c=parseInt(this.getValue(),10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&(b.removeStyle("margin-top"),b.removeStyle("margin-bottom")):(b.setStyle("margin-top",CKEDITOR.tools.cssLength(c)),b.setStyle("margin-bottom",CKEDITOR.tools.cssLength(c))),1==a&&b.removeAttribute("vspace")):8==a&&(b.removeAttribute("vspace"),b.removeStyle("margin-top"),b.removeStyle("margin-bottom"))}},{id:"cmbAlign",requiredContent:"img{float}",type:"select",widths:["35%","65%"],style:"width:90px",
-label:d.lang.common.align,"default":"",items:[[d.lang.common.notSet,""],[d.lang.common.alignLeft,"left"],[d.lang.common.alignRight,"right"]],onChange:function(){e(this.getDialog());k.call(this,"advanced:txtdlgGenStyle")},setup:function(a,b){if(1==a){var c=b.getStyle("float");switch(c){case "inherit":case "none":c=""}!c&&(c=(b.getAttribute("align")||"").toLowerCase());this.setValue(c)}},commit:function(a,b){var c=this.getValue();if(1==a||4==a){if(c?b.setStyle("float",c):b.removeStyle("float"),1==a)switch(c=
-(b.getAttribute("align")||"").toLowerCase(),c){case "left":case "right":b.removeAttribute("align")}}else 8==a&&b.removeStyle("float")}}]}]},{type:"vbox",height:"250px",children:[{type:"html",id:"htmlPreview",style:"width:95%;",html:"\x3cdiv\x3e"+CKEDITOR.tools.htmlEncode(d.lang.common.preview)+'\x3cbr\x3e\x3cdiv id\x3d"'+p+'" class\x3d"ImagePreviewLoader" style\x3d"display:none"\x3e\x3cdiv class\x3d"loading"\x3e\x26nbsp;\x3c/div\x3e\x3c/div\x3e\x3cdiv class\x3d"ImagePreviewBox"\x3e\x3ctable\x3e\x3ctr\x3e\x3ctd\x3e\x3ca href\x3d"javascript:void(0)" target\x3d"_blank" onclick\x3d"return false;" id\x3d"'+
+y=q("btnResetSize"),p=q("ImagePreviewLoader"),E=q("previewLink"),D=q("previewImage");return{title:d.lang.image["image"==l?"title":"titleButton"],minWidth:"moono-lisa"==(CKEDITOR.skinName||d.config.skin)?500:420,minHeight:360,onShow:function(){this.linkEditMode=this.imageEditMode=this.linkElement=this.imageElement=!1;this.lockRatio=!0;this.userlockRatio=0;this.dontResetSize=!1;this.firstLoad=!0;this.addLink=!1;var a=this.getParentEditor(),b=a.getSelection(),c=(b=b&&b.getSelectedElement())&&a.elementPath(b).contains("a",
+1),d=CKEDITOR.document.getById(p);d&&d.setStyle("display","none");x=new CKEDITOR.dom.element("img",a.document);this.preview=CKEDITOR.document.getById(D);this.originalElement=a.document.createElement("img");this.originalElement.setAttribute("alt","");this.originalElement.setCustomData("isReady","false");c&&(this.linkElement=c,this.addLink=this.linkEditMode=!0,a=c.getChildren(),1==a.count()&&(d=a.getItem(0),d.type==CKEDITOR.NODE_ELEMENT&&(d.is("img")||d.is("input"))&&(this.imageElement=a.getItem(0),
+this.imageElement.is("img")?this.imageEditMode="img":this.imageElement.is("input")&&(this.imageEditMode="input"))),"image"==l&&this.setupContent(2,c));if(this.customImageElement)this.imageEditMode="img",this.imageElement=this.customImageElement,delete this.customImageElement;else if(b&&"img"==b.getName()&&!b.data("cke-realelement")||b&&"input"==b.getName()&&"image"==b.getAttribute("type"))this.imageEditMode=b.getName(),this.imageElement=b;this.imageEditMode&&(this.cleanImageElement=this.imageElement,
+this.imageElement=this.cleanImageElement.clone(!0,!0),this.setupContent(1,this.imageElement));n(this,!0);CKEDITOR.tools.trim(this.getValueOf("info","txtUrl"))||(this.preview.removeAttribute("src"),this.preview.setStyle("display","none"))},onOk:function(){if(this.imageEditMode){var a=this.imageEditMode;"image"==l&&"input"==a&&confirm(d.lang.image.button2Img)?(this.imageElement=d.document.createElement("img"),this.imageElement.setAttribute("alt",""),d.insertElement(this.imageElement)):"image"!=l&&"img"==
+a&&confirm(d.lang.image.img2Button)?(this.imageElement=d.document.createElement("input"),this.imageElement.setAttributes({type:"image",alt:""}),d.insertElement(this.imageElement)):(this.imageElement=this.cleanImageElement,delete this.cleanImageElement)}else"image"==l?this.imageElement=d.document.createElement("img"):(this.imageElement=d.document.createElement("input"),this.imageElement.setAttribute("type","image")),this.imageElement.setAttribute("alt","");this.linkEditMode||(this.linkElement=d.document.createElement("a"));
+this.commitContent(1,this.imageElement);this.commitContent(2,this.linkElement);this.imageElement.getAttribute("style")||this.imageElement.removeAttribute("style");this.imageEditMode?!this.linkEditMode&&this.addLink?(d.insertElement(this.linkElement),this.imageElement.appendTo(this.linkElement)):this.linkEditMode&&!this.addLink&&(d.getSelection().selectElement(this.linkElement),d.insertElement(this.imageElement)):this.addLink?this.linkEditMode?this.linkElement.equals(d.getSelection().getSelectedElement())?
+(this.linkElement.setHtml(""),this.linkElement.append(this.imageElement,!1)):d.insertElement(this.imageElement):(d.insertElement(this.linkElement),this.linkElement.append(this.imageElement,!1)):d.insertElement(this.imageElement)},onLoad:function(){"image"!=l&&this.hidePage("Link");var a=this._.element.getDocument();this.getContentElement("info","ratioLock")&&(this.addFocusable(a.getById(y),5),this.addFocusable(a.getById(t),5));this.commitContent=v},onHide:function(){this.preview&&this.commitContent(8,
+this.preview);this.originalElement&&(this.originalElement.removeListener("load",u),this.originalElement.removeListener("error",h),this.originalElement.removeListener("abort",h),this.originalElement.remove(),this.originalElement=!1);delete this.imageElement},contents:[{id:"info",label:d.lang.image.infoTab,accessKey:"I",elements:[{type:"vbox",padding:0,children:[{type:"hbox",widths:["280px","110px"],align:"right",className:"cke_dialog_image_url",children:[{id:"txtUrl",type:"text",label:d.lang.common.url,
+required:!0,onChange:function(){var a=this.getDialog(),b=this.getValue();if(0<b.length){var a=this.getDialog(),c=a.originalElement;a.preview&&a.preview.removeStyle("display");c.setCustomData("isReady","false");var d=CKEDITOR.document.getById(p);d&&d.setStyle("display","");c.on("load",u,a);c.on("error",h,a);c.on("abort",h,a);c.setAttribute("src",b);a.preview&&(x.setAttribute("src",b),a.preview.setAttribute("src",x.$.src),e(a))}else a.preview&&(a.preview.removeAttribute("src"),a.preview.setStyle("display",
+"none"))},setup:function(a,b){if(1==a){var c=b.data("cke-saved-src")||b.getAttribute("src");this.getDialog().dontResetSize=!0;this.setValue(c);this.setInitValue()}},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())?(b.data("cke-saved-src",this.getValue()),b.setAttribute("src",this.getValue())):8==a&&(b.setAttribute("src",""),b.removeAttribute("src"))},validate:CKEDITOR.dialog.validate.notEmpty(d.lang.image.urlMissing)},{type:"button",id:"browse",style:"display:inline-block;margin-top:14px;",
+align:"center",label:d.lang.common.browseServer,hidden:!0,filebrowser:"info:txtUrl"}]}]},{id:"txtAlt",type:"text",label:d.lang.image.alt,accessKey:"T","default":"",onChange:function(){e(this.getDialog())},setup:function(a,b){1==a&&this.setValue(b.getAttribute("alt"))},commit:function(a,b){1==a?(this.getValue()||this.isChanged())&&b.setAttribute("alt",this.getValue()):4==a?b.setAttribute("alt",this.getValue()):8==a&&b.removeAttribute("alt")}},{type:"hbox",children:[{id:"basic",type:"vbox",children:[{type:"hbox",
+requiredContent:"img{width,height}",widths:["50%","50%"],children:[{type:"vbox",padding:1,children:[{type:"text",width:"45px",id:"txtWidth",label:d.lang.common.width,onKeyUp:A,onChange:function(){k.call(this,"advanced:txtdlgGenStyle")},validate:function(){var a=this.getValue().match(z);(a=!(!a||0===parseInt(a[1],10)))||alert(d.lang.common.invalidWidth);return a},setup:C,commit:function(a,b){var c=this.getValue();1==a?(c&&d.activeFilter.check("img{width,height}")?b.setStyle("width",CKEDITOR.tools.cssLength(c)):
+b.removeStyle("width"),b.removeAttribute("width")):4==a?c.match(m)?b.setStyle("width",CKEDITOR.tools.cssLength(c)):(c=this.getDialog().originalElement,"true"==c.getCustomData("isReady")&&b.setStyle("width",c.$.width+"px")):8==a&&(b.removeAttribute("width"),b.removeStyle("width"))}},{type:"text",id:"txtHeight",width:"45px",label:d.lang.common.height,onKeyUp:A,onChange:function(){k.call(this,"advanced:txtdlgGenStyle")},validate:function(){var a=this.getValue().match(z);(a=!(!a||0===parseInt(a[1],10)))||
+alert(d.lang.common.invalidHeight);return a},setup:C,commit:function(a,b){var c=this.getValue();1==a?(c&&d.activeFilter.check("img{width,height}")?b.setStyle("height",CKEDITOR.tools.cssLength(c)):b.removeStyle("height"),b.removeAttribute("height")):4==a?c.match(m)?b.setStyle("height",CKEDITOR.tools.cssLength(c)):(c=this.getDialog().originalElement,"true"==c.getCustomData("isReady")&&b.setStyle("height",c.$.height+"px")):8==a&&(b.removeAttribute("height"),b.removeStyle("height"))}}]},{id:"ratioLock",
+type:"html",className:"cke_dialog_image_ratiolock",style:"margin-top:30px;width:40px;height:40px;",onLoad:function(){var a=CKEDITOR.document.getById(y),b=CKEDITOR.document.getById(t);a&&(a.on("click",function(a){B(this);a.data&&a.data.preventDefault()},this.getDialog()),a.on("mouseover",function(){this.addClass("cke_btn_over")},a),a.on("mouseout",function(){this.removeClass("cke_btn_over")},a));b&&(b.on("click",function(a){n(this);var b=this.originalElement,d=this.getValueOf("info","txtWidth");"true"==
+b.getCustomData("isReady")&&d&&(b=b.$.height/b.$.width*d,isNaN(b)||(this.setValueOf("info","txtHeight",Math.round(b)),e(this)));a.data&&a.data.preventDefault()},this.getDialog()),b.on("mouseover",function(){this.addClass("cke_btn_over")},b),b.on("mouseout",function(){this.removeClass("cke_btn_over")},b))},html:'\x3cdiv\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+d.lang.image.lockRatio+'" class\x3d"cke_btn_locked" id\x3d"'+t+'" role\x3d"checkbox"\x3e\x3cspan class\x3d"cke_icon"\x3e\x3c/span\x3e\x3cspan class\x3d"cke_label"\x3e'+
+d.lang.image.lockRatio+'\x3c/span\x3e\x3c/a\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+d.lang.image.resetSize+'" class\x3d"cke_btn_reset" id\x3d"'+y+'" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3e'+d.lang.image.resetSize+"\x3c/span\x3e\x3c/a\x3e\x3c/div\x3e"}]},{type:"vbox",padding:1,children:[{type:"text",id:"txtBorder",requiredContent:"img{border-width}",width:"60px",label:d.lang.image.border,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){k.call(this,
+"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateBorder),setup:function(a,b){if(1==a){var c;c=(c=(c=b.getStyle("border-width"))&&c.match(/^(\d+px)(?: \1 \1 \1)?$/))&&parseInt(c[1],10);isNaN(parseInt(c,10))&&(c=b.getAttribute("border"));this.setValue(c)}},commit:function(a,b){var c=parseInt(this.getValue(),10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&b.removeStyle("border"):(b.setStyle("border-width",CKEDITOR.tools.cssLength(c)),b.setStyle("border-style",
+"solid")),1==a&&b.removeAttribute("border")):8==a&&(b.removeAttribute("border"),b.removeStyle("border-width"),b.removeStyle("border-style"),b.removeStyle("border-color"))}},{type:"text",id:"txtHSpace",requiredContent:"img{margin-left,margin-right}",width:"60px",label:d.lang.image.hSpace,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){k.call(this,"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateHSpace),setup:function(a,b){if(1==a){var c,
+d;c=b.getStyle("margin-left");d=b.getStyle("margin-right");c=c&&c.match(r);d=d&&d.match(r);c=parseInt(c,10);d=parseInt(d,10);c=c==d&&c;isNaN(parseInt(c,10))&&(c=b.getAttribute("hspace"));this.setValue(c)}},commit:function(a,b){var c=parseInt(this.getValue(),10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&(b.removeStyle("margin-left"),b.removeStyle("margin-right")):(b.setStyle("margin-left",CKEDITOR.tools.cssLength(c)),b.setStyle("margin-right",CKEDITOR.tools.cssLength(c))),1==a&&b.removeAttribute("hspace")):
+8==a&&(b.removeAttribute("hspace"),b.removeStyle("margin-left"),b.removeStyle("margin-right"))}},{type:"text",id:"txtVSpace",requiredContent:"img{margin-top,margin-bottom}",width:"60px",label:d.lang.image.vSpace,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){k.call(this,"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateVSpace),setup:function(a,b){if(1==a){var c,d;c=b.getStyle("margin-top");d=b.getStyle("margin-bottom");c=c&&c.match(r);
+d=d&&d.match(r);c=parseInt(c,10);d=parseInt(d,10);c=c==d&&c;isNaN(parseInt(c,10))&&(c=b.getAttribute("vspace"));this.setValue(c)}},commit:function(a,b){var c=parseInt(this.getValue(),10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&(b.removeStyle("margin-top"),b.removeStyle("margin-bottom")):(b.setStyle("margin-top",CKEDITOR.tools.cssLength(c)),b.setStyle("margin-bottom",CKEDITOR.tools.cssLength(c))),1==a&&b.removeAttribute("vspace")):8==a&&(b.removeAttribute("vspace"),b.removeStyle("margin-top"),b.removeStyle("margin-bottom"))}},
+{id:"cmbAlign",requiredContent:"img{float}",type:"select",widths:["35%","65%"],style:"width:90px",label:d.lang.common.align,"default":"",items:[[d.lang.common.notSet,""],[d.lang.common.alignLeft,"left"],[d.lang.common.alignRight,"right"]],onChange:function(){e(this.getDialog());k.call(this,"advanced:txtdlgGenStyle")},setup:function(a,b){if(1==a){var c=b.getStyle("float");switch(c){case "inherit":case "none":c=""}!c&&(c=(b.getAttribute("align")||"").toLowerCase());this.setValue(c)}},commit:function(a,
+b){var c=this.getValue();if(1==a||4==a){if(c?b.setStyle("float",c):b.removeStyle("float"),1==a)switch(c=(b.getAttribute("align")||"").toLowerCase(),c){case "left":case "right":b.removeAttribute("align")}}else 8==a&&b.removeStyle("float")}}]}]},{type:"vbox",height:"250px",children:[{type:"html",id:"htmlPreview",style:"width:95%;",html:"\x3cdiv\x3e"+CKEDITOR.tools.htmlEncode(d.lang.common.preview)+'\x3cbr\x3e\x3cdiv id\x3d"'+p+'" class\x3d"ImagePreviewLoader" style\x3d"display:none"\x3e\x3cdiv class\x3d"loading"\x3e\x26nbsp;\x3c/div\x3e\x3c/div\x3e\x3cdiv class\x3d"ImagePreviewBox"\x3e\x3ctable\x3e\x3ctr\x3e\x3ctd\x3e\x3ca href\x3d"javascript:void(0)" target\x3d"_blank" onclick\x3d"return false;" id\x3d"'+
 E+'"\x3e\x3cimg id\x3d"'+D+'" alt\x3d"" /\x3e\x3c/a\x3e'+(d.config.image_previewText||"Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas feugiat consequat diam. Maecenas metus. Vivamus diam purus, cursus a, commodo non, facilisis vitae, nulla. Aenean dictum lacinia tortor. Nunc iaculis, nibh non iaculis aliquam, orci felis euismod neque, sed ornare massa mauris sed velit. Nulla pretium mi et risus. Fusce mi pede, tempor id, cursus ac, ullamcorper nec, enim. Sed tortor. Curabitur molestie. Duis velit augue, condimentum at, ultrices a, luctus ut, orci. Donec pellentesque egestas eros. Integer cursus, augue in cursus faucibus, eros pede bibendum sem, in tempus tellus justo quis ligula. Etiam eget tortor. Vestibulum rutrum, est ut placerat elementum, lectus nisl aliquam velit, tempor aliquam eros nunc nonummy metus. In eros metus, gravida a, gravida sed, lobortis id, turpis. Ut ultrices, ipsum at venenatis fringilla, sem nulla lacinia tellus, eget aliquet turpis mauris non enim. Nam turpis. Suspendisse lacinia. Curabitur ac tortor ut ipsum egestas elementum. Nunc imperdiet gravida mauris.")+
 "\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e\x3c/div\x3e"}]}]}]},{id:"Link",requiredContent:"a[href]",label:d.lang.image.linkTab,padding:0,elements:[{id:"txtUrl",type:"text",label:d.lang.common.url,style:"width: 100%","default":"",setup:function(a,b){if(2==a){var c=b.data("cke-saved-href");c||(c=b.getAttribute("href"));this.setValue(c)}},commit:function(a,b){if(2==a&&(this.getValue()||this.isChanged())){var c=this.getValue();b.data("cke-saved-href",c);b.setAttribute("href",c);this.getValue()||
-!d.config.image_removeLinkByEmptyURL?this.getDialog().addLink=!0:this.getDialog().addLink=!1}}},{type:"button",id:"browse",filebrowser:{action:"Browse",target:"Link:txtUrl",url:d.config.filebrowserImageBrowseLinkUrl},style:"float:right",hidden:!0,label:d.lang.common.browseServer},{id:"cmbTarget",type:"select",requiredContent:"a[target]",label:d.lang.common.target,"default":"",items:[[d.lang.common.notSet,""],[d.lang.common.targetNew,"_blank"],[d.lang.common.targetTop,"_top"],[d.lang.common.targetSelf,
-"_self"],[d.lang.common.targetParent,"_parent"]],setup:function(a,b){2==a&&this.setValue(b.getAttribute("target")||"")},commit:function(a,b){2==a&&(this.getValue()||this.isChanged())&&b.setAttribute("target",this.getValue())}}]},{id:"Upload",hidden:!0,filebrowser:"uploadButton",label:d.lang.image.upload,elements:[{type:"file",id:"upload",label:d.lang.image.btnUpload,style:"height:40px",size:38},{type:"fileButton",id:"uploadButton",filebrowser:"info:txtUrl",label:d.lang.image.btnUpload,"for":["Upload",
-"upload"]}]},{id:"advanced",label:d.lang.common.advancedTab,elements:[{type:"hbox",widths:["50%","25%","25%"],children:[{type:"text",id:"linkId",requiredContent:"img[id]",label:d.lang.common.id,setup:function(a,b){1==a&&this.setValue(b.getAttribute("id"))},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())&&b.setAttribute("id",this.getValue())}},{id:"cmbLangDir",type:"select",requiredContent:"img[dir]",style:"width : 100px;",label:d.lang.common.langDir,"default":"",items:[[d.lang.common.notSet,
+!d.config.image_removeLinkByEmptyURL?this.getDialog().addLink=!0:this.getDialog().addLink=!1}}},{type:"button",id:"browse",className:"cke_dialog_image_browse",filebrowser:{action:"Browse",target:"Link:txtUrl",url:d.config.filebrowserImageBrowseLinkUrl},style:"float:right",hidden:!0,label:d.lang.common.browseServer},{id:"cmbTarget",type:"select",requiredContent:"a[target]",label:d.lang.common.target,"default":"",items:[[d.lang.common.notSet,""],[d.lang.common.targetNew,"_blank"],[d.lang.common.targetTop,
+"_top"],[d.lang.common.targetSelf,"_self"],[d.lang.common.targetParent,"_parent"]],setup:function(a,b){2==a&&this.setValue(b.getAttribute("target")||"")},commit:function(a,b){2==a&&(this.getValue()||this.isChanged())&&b.setAttribute("target",this.getValue())}}]},{id:"Upload",hidden:!0,filebrowser:"uploadButton",label:d.lang.image.upload,elements:[{type:"file",id:"upload",label:d.lang.image.btnUpload,style:"height:40px",size:38},{type:"fileButton",id:"uploadButton",filebrowser:"info:txtUrl",label:d.lang.image.btnUpload,
+"for":["Upload","upload"]}]},{id:"advanced",label:d.lang.common.advancedTab,elements:[{type:"hbox",widths:["50%","25%","25%"],children:[{type:"text",id:"linkId",requiredContent:"img[id]",label:d.lang.common.id,setup:function(a,b){1==a&&this.setValue(b.getAttribute("id"))},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())&&b.setAttribute("id",this.getValue())}},{id:"cmbLangDir",type:"select",requiredContent:"img[dir]",style:"width : 100px;",label:d.lang.common.langDir,"default":"",items:[[d.lang.common.notSet,
 ""],[d.lang.common.langDirLtr,"ltr"],[d.lang.common.langDirRtl,"rtl"]],setup:function(a,b){1==a&&this.setValue(b.getAttribute("dir"))},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())&&b.setAttribute("dir",this.getValue())}},{type:"text",id:"txtLangCode",requiredContent:"img[lang]",label:d.lang.common.langCode,"default":"",setup:function(a,b){1==a&&this.setValue(b.getAttribute("lang"))},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())&&b.setAttribute("lang",this.getValue())}}]},
 {type:"text",id:"txtGenLongDescr",requiredContent:"img[longdesc]",label:d.lang.common.longDescr,setup:function(a,b){1==a&&this.setValue(b.getAttribute("longDesc"))},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())&&b.setAttribute("longDesc",this.getValue())}},{type:"hbox",widths:["50%","50%"],children:[{type:"text",id:"txtGenClass",requiredContent:"img(cke-xyz)",label:d.lang.common.cssClass,"default":"",setup:function(a,b){1==a&&this.setValue(b.getAttribute("class"))},commit:function(a,
 b){1==a&&(this.getValue()||this.isChanged())&&b.setAttribute("class",this.getValue())}},{type:"text",id:"txtGenTitle",requiredContent:"img[title]",label:d.lang.common.advisoryTitle,"default":"",onChange:function(){e(this.getDialog())},setup:function(a,b){1==a&&this.setValue(b.getAttribute("title"))},commit:function(a,b){1==a?(this.getValue()||this.isChanged())&&b.setAttribute("title",this.getValue()):4==a?b.setAttribute("title",this.getValue()):8==a&&b.removeAttribute("title")}}]},{type:"text",id:"txtdlgGenStyle",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js b/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
index 63372eb57a9..255d60c12c3 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("anchor",function(c){function d(a,b){return a.createFakeElement(a.document.createElement("a",{attributes:b}),"cke_anchor","anchor")}return{title:c.lang.link.anchor.title,minWidth:300,minHeight:60,onOk:function(){var a=CKEDITOR.tools.trim(this.getValueOf("info","txtName")),a={id:a,name:a,"data-cke-saved-name":a};if(this._.selectedElement)this._.selectedElement.data("cke-realelement")?(a=d(c,a),a.replace(this._.selectedElement),CKEDITOR.env.ie&&c.getSelection().selectElement(a)):
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js b/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js
index fcb4b64e218..bd837a2210c 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js
@@ -1,26 +1,28 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-(function(){CKEDITOR.dialog.add("link",function(g){var n=CKEDITOR.plugins.link,p=function(){var a=this.getDialog(),b=a.getContentElement("target","popupFeatures"),a=a.getContentElement("target","linkTargetName"),m=this.getValue();if(b&&a)switch(b=b.getElement(),b.hide(),a.setValue(""),m){case "frame":a.setLabel(g.lang.link.targetFrameName);a.getElement().show();break;case "popup":b.show();a.setLabel(g.lang.link.targetPopupName);a.getElement().show();break;default:a.setValue(m),a.getElement().hide()}},
-f=function(a){a.target&&this.setValue(a.target[this.id]||"")},h=function(a){a.advanced&&this.setValue(a.advanced[this.id]||"")},k=function(a){a.target||(a.target={});a.target[this.id]=this.getValue()||""},l=function(a){a.advanced||(a.advanced={});a.advanced[this.id]=this.getValue()||""},c=g.lang.common,b=g.lang.link,d;return{title:b.title,minWidth:350,minHeight:230,contents:[{id:"info",label:b.info,title:b.info,elements:[{id:"linkType",type:"select",label:b.type,"default":"url",items:[[b.toUrl,"url"],
-[b.toAnchor,"anchor"],[b.toEmail,"email"]],onChange:function(){var a=this.getDialog(),b=["urlOptions","anchorOptions","emailOptions"],m=this.getValue(),e=a.definition.getContents("upload"),e=e&&e.hidden;"url"==m?(g.config.linkShowTargetTab&&a.showPage("target"),e||a.showPage("upload")):(a.hidePage("target"),e||a.hidePage("upload"));for(e=0;e<b.length;e++){var c=a.getContentElement("info",b[e]);c&&(c=c.getElement().getParent().getParent(),b[e]==m+"Options"?c.show():c.hide())}a.layout()},setup:function(a){this.setValue(a.type||
-"url")},commit:function(a){a.type=this.getValue()}},{type:"vbox",id:"urlOptions",children:[{type:"hbox",widths:["25%","75%"],children:[{id:"protocol",type:"select",label:c.protocol,"default":"http://",items:[["http://‎","http://"],["https://‎","https://"],["ftp://‎","ftp://"],["news://‎","news://"],[b.other,""]],setup:function(a){a.url&&this.setValue(a.url.protocol||"")},commit:function(a){a.url||(a.url={});a.url.protocol=this.getValue()}},{type:"text",id:"url",label:c.url,required:!0,onLoad:function(){this.allowOnChange=
-!0},onKeyUp:function(){this.allowOnChange=!1;var a=this.getDialog().getContentElement("info","protocol"),b=this.getValue(),m=/^((javascript:)|[#\/\.\?])/i,c=/^(http|https|ftp|news):\/\/(?=.)/i.exec(b);c?(this.setValue(b.substr(c[0].length)),a.setValue(c[0].toLowerCase())):m.test(b)&&a.setValue("");this.allowOnChange=!0},onChange:function(){if(this.allowOnChange)this.onKeyUp()},validate:function(){var a=this.getDialog();return a.getContentElement("info","linkType")&&"url"!=a.getValueOf("info","linkType")?
-!0:!g.config.linkJavaScriptLinksAllowed&&/javascript\:/.test(this.getValue())?(alert(c.invalidValue),!1):this.getDialog().fakeObj?!0:CKEDITOR.dialog.validate.notEmpty(b.noUrl).apply(this)},setup:function(a){this.allowOnChange=!1;a.url&&this.setValue(a.url.url);this.allowOnChange=!0},commit:function(a){this.onChange();a.url||(a.url={});a.url.url=this.getValue();this.allowOnChange=!1}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().show()}},{type:"button",
-id:"browse",hidden:"true",filebrowser:"info:url",label:c.browseServer}]},{type:"vbox",id:"anchorOptions",width:260,align:"center",padding:0,children:[{type:"fieldset",id:"selectAnchorText",label:b.selectAnchor,setup:function(){d=n.getEditorAnchors(g);this.getElement()[d&&d.length?"show":"hide"]()},children:[{type:"hbox",id:"selectAnchor",children:[{type:"select",id:"anchorName","default":"",label:b.anchorName,style:"width: 100%;",items:[[""]],setup:function(a){this.clear();this.add("");if(d)for(var b=
-0;b<d.length;b++)d[b].name&&this.add(d[b].name);a.anchor&&this.setValue(a.anchor.name);(a=this.getDialog().getContentElement("info","linkType"))&&"email"==a.getValue()&&this.focus()},commit:function(a){a.anchor||(a.anchor={});a.anchor.name=this.getValue()}},{type:"select",id:"anchorId","default":"",label:b.anchorId,style:"width: 100%;",items:[[""]],setup:function(a){this.clear();this.add("");if(d)for(var b=0;b<d.length;b++)d[b].id&&this.add(d[b].id);a.anchor&&this.setValue(a.anchor.id)},commit:function(a){a.anchor||
-(a.anchor={});a.anchor.id=this.getValue()}}],setup:function(){this.getElement()[d&&d.length?"show":"hide"]()}}]},{type:"html",id:"noAnchors",style:"text-align: center;",html:'\x3cdiv role\x3d"note" tabIndex\x3d"-1"\x3e'+CKEDITOR.tools.htmlEncode(b.noAnchors)+"\x3c/div\x3e",focus:!0,setup:function(){this.getElement()[d&&d.length?"hide":"show"]()}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().hide()}},{type:"vbox",id:"emailOptions",padding:1,children:[{type:"text",
-id:"emailAddress",label:b.emailAddress,required:!0,validate:function(){var a=this.getDialog();return a.getContentElement("info","linkType")&&"email"==a.getValueOf("info","linkType")?CKEDITOR.dialog.validate.notEmpty(b.noEmail).apply(this):!0},setup:function(a){a.email&&this.setValue(a.email.address);(a=this.getDialog().getContentElement("info","linkType"))&&"email"==a.getValue()&&this.select()},commit:function(a){a.email||(a.email={});a.email.address=this.getValue()}},{type:"text",id:"emailSubject",
-label:b.emailSubject,setup:function(a){a.email&&this.setValue(a.email.subject)},commit:function(a){a.email||(a.email={});a.email.subject=this.getValue()}},{type:"textarea",id:"emailBody",label:b.emailBody,rows:3,"default":"",setup:function(a){a.email&&this.setValue(a.email.body)},commit:function(a){a.email||(a.email={});a.email.body=this.getValue()}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().hide()}}]},{id:"target",requiredContent:"a[target]",label:b.target,
-title:b.target,elements:[{type:"hbox",widths:["50%","50%"],children:[{type:"select",id:"linkTargetType",label:c.target,"default":"notSet",style:"width : 100%;",items:[[c.notSet,"notSet"],[b.targetFrame,"frame"],[b.targetPopup,"popup"],[c.targetNew,"_blank"],[c.targetTop,"_top"],[c.targetSelf,"_self"],[c.targetParent,"_parent"]],onChange:p,setup:function(a){a.target&&this.setValue(a.target.type||"notSet");p.call(this)},commit:function(a){a.target||(a.target={});a.target.type=this.getValue()}},{type:"text",
-id:"linkTargetName",label:b.targetFrameName,"default":"",setup:function(a){a.target&&this.setValue(a.target.name)},commit:function(a){a.target||(a.target={});a.target.name=this.getValue().replace(/([^\x00-\x7F]|\s)/gi,"")}}]},{type:"vbox",width:"100%",align:"center",padding:2,id:"popupFeatures",children:[{type:"fieldset",label:b.popupFeatures,children:[{type:"hbox",children:[{type:"checkbox",id:"resizable",label:b.popupResizable,setup:f,commit:k},{type:"checkbox",id:"status",label:b.popupStatusBar,
-setup:f,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"location",label:b.popupLocationBar,setup:f,commit:k},{type:"checkbox",id:"toolbar",label:b.popupToolbar,setup:f,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"menubar",label:b.popupMenuBar,setup:f,commit:k},{type:"checkbox",id:"fullscreen",label:b.popupFullScreen,setup:f,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"scrollbars",label:b.popupScrollBars,setup:f,commit:k},{type:"checkbox",id:"dependent",label:b.popupDependent,
-setup:f,commit:k}]},{type:"hbox",children:[{type:"text",widths:["50%","50%"],labelLayout:"horizontal",label:c.width,id:"width",setup:f,commit:k},{type:"text",labelLayout:"horizontal",widths:["50%","50%"],label:b.popupLeft,id:"left",setup:f,commit:k}]},{type:"hbox",children:[{type:"text",labelLayout:"horizontal",widths:["50%","50%"],label:c.height,id:"height",setup:f,commit:k},{type:"text",labelLayout:"horizontal",label:b.popupTop,widths:["50%","50%"],id:"top",setup:f,commit:k}]}]}]}]},{id:"upload",
-label:b.upload,title:b.upload,hidden:!0,filebrowser:"uploadButton",elements:[{type:"file",id:"upload",label:c.upload,style:"height:40px",size:29},{type:"fileButton",id:"uploadButton",label:c.uploadSubmit,filebrowser:"info:url","for":["upload","upload"]}]},{id:"advanced",label:b.advanced,title:b.advanced,elements:[{type:"vbox",padding:1,children:[{type:"hbox",widths:["45%","35%","20%"],children:[{type:"text",id:"advId",requiredContent:"a[id]",label:b.id,setup:h,commit:l},{type:"select",id:"advLangDir",
-requiredContent:"a[dir]",label:b.langDir,"default":"",style:"width:110px",items:[[c.notSet,""],[b.langDirLTR,"ltr"],[b.langDirRTL,"rtl"]],setup:h,commit:l},{type:"text",id:"advAccessKey",requiredContent:"a[accesskey]",width:"80px",label:b.acccessKey,maxLength:1,setup:h,commit:l}]},{type:"hbox",widths:["45%","35%","20%"],children:[{type:"text",label:b.name,id:"advName",requiredContent:"a[name]",setup:h,commit:l},{type:"text",label:b.langCode,id:"advLangCode",requiredContent:"a[lang]",width:"110px",
-"default":"",setup:h,commit:l},{type:"text",label:b.tabIndex,id:"advTabIndex",requiredContent:"a[tabindex]",width:"80px",maxLength:5,setup:h,commit:l}]}]},{type:"vbox",padding:1,children:[{type:"hbox",widths:["45%","55%"],children:[{type:"text",label:b.advisoryTitle,requiredContent:"a[title]","default":"",id:"advTitle",setup:h,commit:l},{type:"text",label:b.advisoryContentType,requiredContent:"a[type]","default":"",id:"advContentType",setup:h,commit:l}]},{type:"hbox",widths:["45%","55%"],children:[{type:"text",
-label:b.cssClasses,requiredContent:"a(cke-xyz)","default":"",id:"advCSSClasses",setup:h,commit:l},{type:"text",label:b.charset,requiredContent:"a[charset]","default":"",id:"advCharset",setup:h,commit:l}]},{type:"hbox",widths:["45%","55%"],children:[{type:"text",label:b.rel,requiredContent:"a[rel]","default":"",id:"advRel",setup:h,commit:l},{type:"text",label:b.styles,requiredContent:"a{cke-xyz}","default":"",id:"advStyles",validate:CKEDITOR.dialog.validate.inlineStyle(g.lang.common.invalidInlineStyle),
-setup:h,commit:l}]}]}]}],onShow:function(){var a=this.getParentEditor(),b=a.getSelection(),c=null;(c=n.getSelectedLink(a))&&c.hasAttribute("href")?b.getSelectedElement()||b.selectElement(c):c=null;a=n.parseLinkAttributes(a,c);this._.selectedElement=c;this.setupContent(a)},onOk:function(){var a={};this.commitContent(a);var b=g.getSelection(),c=n.getLinkAttributes(g,a);if(this._.selectedElement){var e=this._.selectedElement,d=e.data("cke-saved-href"),f=e.getHtml();e.setAttributes(c.set);e.removeAttributes(c.removed);
-if(d==f||"email"==a.type&&-1!=f.indexOf("@"))e.setHtml("email"==a.type?a.email.address:c.set["data-cke-saved-href"]),b.selectElement(e);delete this._.selectedElement}else b=b.getRanges()[0],b.collapsed&&(a=new CKEDITOR.dom.text("email"==a.type?a.email.address:c.set["data-cke-saved-href"],g.document),b.insertNode(a),b.selectNodeContents(a)),c=new CKEDITOR.style({element:"a",attributes:c.set}),c.type=CKEDITOR.STYLE_INLINE,c.applyToRange(b,g),b.select()},onLoad:function(){g.config.linkShowAdvancedTab||
-this.hidePage("advanced");g.config.linkShowTargetTab||this.hidePage("target")},onFocus:function(){var a=this.getContentElement("info","linkType");a&&"url"==a.getValue()&&(a=this.getContentElement("info","url"),a.select())}}})})();
\ No newline at end of file
+(function(){CKEDITOR.dialog.add("link",function(e){var m=CKEDITOR.plugins.link,p,q=function(){var a=this.getDialog(),b=a.getContentElement("target","popupFeatures"),a=a.getContentElement("target","linkTargetName"),n=this.getValue();if(b&&a)switch(b=b.getElement(),b.hide(),a.setValue(""),n){case "frame":a.setLabel(e.lang.link.targetFrameName);a.getElement().show();break;case "popup":b.show();a.setLabel(e.lang.link.targetPopupName);a.getElement().show();break;default:a.setValue(n),a.getElement().hide()}},
+h=function(a){a.target&&this.setValue(a.target[this.id]||"")},f=function(a){a.advanced&&this.setValue(a.advanced[this.id]||"")},k=function(a){a.target||(a.target={});a.target[this.id]=this.getValue()||""},l=function(a){a.advanced||(a.advanced={});a.advanced[this.id]=this.getValue()||""},c=e.lang.common,b=e.lang.link,g;return{title:b.title,minWidth:"moono-lisa"==(CKEDITOR.skinName||e.config.skin)?450:350,minHeight:240,contents:[{id:"info",label:b.info,title:b.info,elements:[{type:"text",id:"linkDisplayText",
+label:b.displayText,setup:function(){this.enable();this.setValue(e.getSelection().getSelectedText());p=this.getValue()},commit:function(a){a.linkText=this.isEnabled()?this.getValue():""}},{id:"linkType",type:"select",label:b.type,"default":"url",items:[[b.toUrl,"url"],[b.toAnchor,"anchor"],[b.toEmail,"email"]],onChange:function(){var a=this.getDialog(),b=["urlOptions","anchorOptions","emailOptions"],n=this.getValue(),d=a.definition.getContents("upload"),d=d&&d.hidden;"url"==n?(e.config.linkShowTargetTab&&
+a.showPage("target"),d||a.showPage("upload")):(a.hidePage("target"),d||a.hidePage("upload"));for(d=0;d<b.length;d++){var c=a.getContentElement("info",b[d]);c&&(c=c.getElement().getParent().getParent(),b[d]==n+"Options"?c.show():c.hide())}a.layout()},setup:function(a){this.setValue(a.type||"url")},commit:function(a){a.type=this.getValue()}},{type:"vbox",id:"urlOptions",children:[{type:"hbox",widths:["25%","75%"],children:[{id:"protocol",type:"select",label:c.protocol,"default":"http://",items:[["http://‎",
+"http://"],["https://‎","https://"],["ftp://‎","ftp://"],["news://‎","news://"],[b.other,""]],setup:function(a){a.url&&this.setValue(a.url.protocol||"")},commit:function(a){a.url||(a.url={});a.url.protocol=this.getValue()}},{type:"text",id:"url",label:c.url,required:!0,onLoad:function(){this.allowOnChange=!0},onKeyUp:function(){this.allowOnChange=!1;var a=this.getDialog().getContentElement("info","protocol"),b=this.getValue(),c=/^((javascript:)|[#\/\.\?])/i,d=/^(http|https|ftp|news):\/\/(?=.)/i.exec(b);
+d?(this.setValue(b.substr(d[0].length)),a.setValue(d[0].toLowerCase())):c.test(b)&&a.setValue("");this.allowOnChange=!0},onChange:function(){if(this.allowOnChange)this.onKeyUp()},validate:function(){var a=this.getDialog();return a.getContentElement("info","linkType")&&"url"!=a.getValueOf("info","linkType")?!0:!e.config.linkJavaScriptLinksAllowed&&/javascript\:/.test(this.getValue())?(alert(c.invalidValue),!1):this.getDialog().fakeObj?!0:CKEDITOR.dialog.validate.notEmpty(b.noUrl).apply(this)},setup:function(a){this.allowOnChange=
+!1;a.url&&this.setValue(a.url.url);this.allowOnChange=!0},commit:function(a){this.onChange();a.url||(a.url={});a.url.url=this.getValue();this.allowOnChange=!1}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().show()}},{type:"button",id:"browse",hidden:"true",filebrowser:"info:url",label:c.browseServer}]},{type:"vbox",id:"anchorOptions",width:260,align:"center",padding:0,children:[{type:"fieldset",id:"selectAnchorText",label:b.selectAnchor,setup:function(){g=
+m.getEditorAnchors(e);this.getElement()[g&&g.length?"show":"hide"]()},children:[{type:"hbox",id:"selectAnchor",children:[{type:"select",id:"anchorName","default":"",label:b.anchorName,style:"width: 100%;",items:[[""]],setup:function(a){this.clear();this.add("");if(g)for(var b=0;b<g.length;b++)g[b].name&&this.add(g[b].name);a.anchor&&this.setValue(a.anchor.name);(a=this.getDialog().getContentElement("info","linkType"))&&"email"==a.getValue()&&this.focus()},commit:function(a){a.anchor||(a.anchor={});
+a.anchor.name=this.getValue()}},{type:"select",id:"anchorId","default":"",label:b.anchorId,style:"width: 100%;",items:[[""]],setup:function(a){this.clear();this.add("");if(g)for(var b=0;b<g.length;b++)g[b].id&&this.add(g[b].id);a.anchor&&this.setValue(a.anchor.id)},commit:function(a){a.anchor||(a.anchor={});a.anchor.id=this.getValue()}}],setup:function(){this.getElement()[g&&g.length?"show":"hide"]()}}]},{type:"html",id:"noAnchors",style:"text-align: center;",html:'\x3cdiv role\x3d"note" tabIndex\x3d"-1"\x3e'+
+CKEDITOR.tools.htmlEncode(b.noAnchors)+"\x3c/div\x3e",focus:!0,setup:function(){this.getElement()[g&&g.length?"hide":"show"]()}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().hide()}},{type:"vbox",id:"emailOptions",padding:1,children:[{type:"text",id:"emailAddress",label:b.emailAddress,required:!0,validate:function(){var a=this.getDialog();return a.getContentElement("info","linkType")&&"email"==a.getValueOf("info","linkType")?CKEDITOR.dialog.validate.notEmpty(b.noEmail).apply(this):
+!0},setup:function(a){a.email&&this.setValue(a.email.address);(a=this.getDialog().getContentElement("info","linkType"))&&"email"==a.getValue()&&this.select()},commit:function(a){a.email||(a.email={});a.email.address=this.getValue()}},{type:"text",id:"emailSubject",label:b.emailSubject,setup:function(a){a.email&&this.setValue(a.email.subject)},commit:function(a){a.email||(a.email={});a.email.subject=this.getValue()}},{type:"textarea",id:"emailBody",label:b.emailBody,rows:3,"default":"",setup:function(a){a.email&&
+this.setValue(a.email.body)},commit:function(a){a.email||(a.email={});a.email.body=this.getValue()}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().hide()}}]},{id:"target",requiredContent:"a[target]",label:b.target,title:b.target,elements:[{type:"hbox",widths:["50%","50%"],children:[{type:"select",id:"linkTargetType",label:c.target,"default":"notSet",style:"width : 100%;",items:[[c.notSet,"notSet"],[b.targetFrame,"frame"],[b.targetPopup,"popup"],[c.targetNew,
+"_blank"],[c.targetTop,"_top"],[c.targetSelf,"_self"],[c.targetParent,"_parent"]],onChange:q,setup:function(a){a.target&&this.setValue(a.target.type||"notSet");q.call(this)},commit:function(a){a.target||(a.target={});a.target.type=this.getValue()}},{type:"text",id:"linkTargetName",label:b.targetFrameName,"default":"",setup:function(a){a.target&&this.setValue(a.target.name)},commit:function(a){a.target||(a.target={});a.target.name=this.getValue().replace(/([^\x00-\x7F]|\s)/gi,"")}}]},{type:"vbox",
+width:"100%",align:"center",padding:2,id:"popupFeatures",children:[{type:"fieldset",label:b.popupFeatures,children:[{type:"hbox",children:[{type:"checkbox",id:"resizable",label:b.popupResizable,setup:h,commit:k},{type:"checkbox",id:"status",label:b.popupStatusBar,setup:h,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"location",label:b.popupLocationBar,setup:h,commit:k},{type:"checkbox",id:"toolbar",label:b.popupToolbar,setup:h,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"menubar",
+label:b.popupMenuBar,setup:h,commit:k},{type:"checkbox",id:"fullscreen",label:b.popupFullScreen,setup:h,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"scrollbars",label:b.popupScrollBars,setup:h,commit:k},{type:"checkbox",id:"dependent",label:b.popupDependent,setup:h,commit:k}]},{type:"hbox",children:[{type:"text",widths:["50%","50%"],labelLayout:"horizontal",label:c.width,id:"width",setup:h,commit:k},{type:"text",labelLayout:"horizontal",widths:["50%","50%"],label:b.popupLeft,id:"left",
+setup:h,commit:k}]},{type:"hbox",children:[{type:"text",labelLayout:"horizontal",widths:["50%","50%"],label:c.height,id:"height",setup:h,commit:k},{type:"text",labelLayout:"horizontal",label:b.popupTop,widths:["50%","50%"],id:"top",setup:h,commit:k}]}]}]}]},{id:"upload",label:b.upload,title:b.upload,hidden:!0,filebrowser:"uploadButton",elements:[{type:"file",id:"upload",label:c.upload,style:"height:40px",size:29},{type:"fileButton",id:"uploadButton",label:c.uploadSubmit,filebrowser:"info:url","for":["upload",
+"upload"]}]},{id:"advanced",label:b.advanced,title:b.advanced,elements:[{type:"vbox",padding:1,children:[{type:"hbox",widths:["45%","35%","20%"],children:[{type:"text",id:"advId",requiredContent:"a[id]",label:b.id,setup:f,commit:l},{type:"select",id:"advLangDir",requiredContent:"a[dir]",label:b.langDir,"default":"",style:"width:110px",items:[[c.notSet,""],[b.langDirLTR,"ltr"],[b.langDirRTL,"rtl"]],setup:f,commit:l},{type:"text",id:"advAccessKey",requiredContent:"a[accesskey]",width:"80px",label:b.acccessKey,
+maxLength:1,setup:f,commit:l}]},{type:"hbox",widths:["45%","35%","20%"],children:[{type:"text",label:b.name,id:"advName",requiredContent:"a[name]",setup:f,commit:l},{type:"text",label:b.langCode,id:"advLangCode",requiredContent:"a[lang]",width:"110px","default":"",setup:f,commit:l},{type:"text",label:b.tabIndex,id:"advTabIndex",requiredContent:"a[tabindex]",width:"80px",maxLength:5,setup:f,commit:l}]}]},{type:"vbox",padding:1,children:[{type:"hbox",widths:["45%","55%"],children:[{type:"text",label:b.advisoryTitle,
+requiredContent:"a[title]","default":"",id:"advTitle",setup:f,commit:l},{type:"text",label:b.advisoryContentType,requiredContent:"a[type]","default":"",id:"advContentType",setup:f,commit:l}]},{type:"hbox",widths:["45%","55%"],children:[{type:"text",label:b.cssClasses,requiredContent:"a(cke-xyz)","default":"",id:"advCSSClasses",setup:f,commit:l},{type:"text",label:b.charset,requiredContent:"a[charset]","default":"",id:"advCharset",setup:f,commit:l}]},{type:"hbox",widths:["45%","55%"],children:[{type:"text",
+label:b.rel,requiredContent:"a[rel]","default":"",id:"advRel",setup:f,commit:l},{type:"text",label:b.styles,requiredContent:"a{cke-xyz}","default":"",id:"advStyles",validate:CKEDITOR.dialog.validate.inlineStyle(e.lang.common.invalidInlineStyle),setup:f,commit:l}]},{type:"hbox",widths:["45%","55%"],children:[{type:"checkbox",id:"download",requiredContent:"a[download]",label:b.download,setup:function(a){void 0!==a.download&&this.setValue("checked","checked")},commit:function(a){this.getValue()&&(a.download=
+this.getValue())}}]}]}]}],onShow:function(){var a=this.getParentEditor(),b=a.getSelection(),c=b.getSelectedElement(),d=this.getContentElement("info","linkDisplayText").getElement().getParent().getParent(),e=null;(e=m.getSelectedLink(a))&&e.hasAttribute("href")?c||(b.selectElement(e),c=e):e=null;m.showDisplayTextForElement(c,a)?d.show():d.hide();a=m.parseLinkAttributes(a,e);this._.selectedElement=e;this.setupContent(a)},onOk:function(){var a={};this.commitContent(a);var b=e.getSelection(),c=m.getLinkAttributes(e,
+a);if(this._.selectedElement){var d=this._.selectedElement,g=d.data("cke-saved-href"),h=d.getHtml(),f;d.setAttributes(c.set);d.removeAttributes(c.removed);if(a.linkText&&p!=a.linkText)f=a.linkText;else if(g==h||"email"==a.type&&-1!=h.indexOf("@"))f="email"==a.type?a.email.address:c.set["data-cke-saved-href"];f&&(d.setText(f),b.selectElement(d));delete this._.selectedElement}else{b=b.getRanges()[0];b.collapsed?(a=new CKEDITOR.dom.text(a.linkText||("email"==a.type?a.email.address:c.set["data-cke-saved-href"]),
+e.document),b.insertNode(a),b.selectNodeContents(a)):p!==a.linkText&&(a=new CKEDITOR.dom.text(a.linkText,e.document),b.shrink(CKEDITOR.SHRINK_TEXT),e.editable().extractHtmlFromRange(b),b.insertNode(a));a=b._find("a");for(d=0;d<a.length;d++)a[d].remove(!0);c=new CKEDITOR.style({element:"a",attributes:c.set});c.type=CKEDITOR.STYLE_INLINE;c.applyToRange(b,e);b.select()}},onLoad:function(){e.config.linkShowAdvancedTab||this.hidePage("advanced");e.config.linkShowTargetTab||this.hidePage("target")},onFocus:function(){var a=
+this.getContentElement("info","linkType");a&&"url"==a.getValue()&&(a=this.getContentElement("info","url"),a.select())}}})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/link/images/anchor.png b/htdocs/includes/ckeditor/ckeditor/plugins/link/images/anchor.png
index 6d861a0e7a5cbd98d5cd3264c5fdb6009d43362b..d94adb41306ffd96741ae5e5ca1e8d749853f3fb 100644
GIT binary patch
delta 729
zcmX@h@_}`Nay<h}x}&cn1H;CC?mvmF3=9kk$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo
z7+xhXFj&oCU=S~uvn$XBD8ZKG?e4<x9|RZdT|OBo!d~L(>&pIsn~7JJJ#VH`2m=G-
z7f%<*5R21OC!O_@aTICYziQpA`E7n|GgF&(6v);K-d9+!(5$dd<lxlqoKFmPt_lx~
zCO3F93o%8qsLXaT){|xFbrP7_={e)w%XgDqzrW}yeB8JwZ?0A8>Q{HNA6ck%CSQ6e
zU@b8rKITJJVx#z_;s=HW-*#XAnKb8c*lLOQo_hL~Cg$p?GZ)@}zu2>8mz`Bmdakei
zt+#^TKP6PotUtZi_TKf^=D(I)Z|?qFtis9l@9~u>w-%Hy*uKE*#p_F#j_|JcdOQDd
z@|lw-IWJ$nY;;Va)BIQfGZWVnhp=;6?mTNeV&vtdra!M-xJB$#^T7zF=wn*fB_~YV
zxQXXD$FTx=A4`eqgS|nAJ~8yDOFwkveAm3&dxgoHcfDzExF6rTUC*Mm?ULca69*pj
z@qe#hxW<ibi%Qg`cGu43-Q7nVoC5bLZWlcy@uF<EaIcD{ZAAR@=kN5E-@ffJYifyx
z=Y4ZCw^@77JyY9nCF`^Oc4}JMvt<+Q-oKfV{`vC_6V;u&l-_<1l(~HSetKE9_MdB6
ze``1G>dH4;X)^nN`J<aJSI*2bssG?`?fqnRPAMLVZ&fMHjE;NzvP}vCT?E>8M6EST
z>{=gUa4vE0aW=-T<WCmI!d5@YjQWu15wJd4OEgBrHC2$SezC@(>i&&l(rqWId%n-e
z5>@HhD)F4_oaH}8P6@T+vu5Ny0459764!{5l*E!$tK_0oAjM#0U}&amXs8=xU=(6#
xY-MC=WnivtU}$AvaD?k_7K)DC{FKbJO1KUT4O_!guK_hMc)I$ztaD0e0sz}UH%$Nl

delta 565
zcmV-50?PgH1<eGIBYy%ENkl<ZILmdC&uUXa6vlsNZrX}XV=02I;G!vlDDGO+or^v|
zAD~a*EBG2NU362ytyn5j1iP>lYbi8HxR;v-p;YW5F+`<FW<D2p(l-A2;J`3*=Epa4
zKFhL<AOR47zH{7PShx?|19of8=27B376Jxfh5(aD%pgruB!9hDp-o9|TD!aYxU!<o
z{=Os~NO~&iM(y|*Nw?$PMm@_Q%Q7ShkR-jEo6|aI9rOaU2KunP9QkT@cXq;)*jvwY
zN@fPY^z1AEQzs|fs#G}abf^I3B;otk7Heh<;M#SdM<GiRN^wo!djJ+^W~j$^GCs~&
zxy(Yj%;MxE(|=P_d_6j1^Yk<l>=K|?a3vAAP%vX)M$b8HVuHaC9_5A$9~}@Ua(*Bc
z&{%^10Q&vt%1F#efCO-6IJ07e|Ij&raAEvMx63!+SFgu}_lyH$W+cv$zzFR84~P!l
zwpzRbW`INBO1sUYcAJOQDuh6{+r79gQNl*eWxzA31%K=T54M+<DxdcD*lIMeMuRip
zPSN^a-b0?}BSDh1E$L>h*+f!F(ql<4CG`(hS0(98(sN1E^)$uuJf~W%%FK{Nn&%e0
z#{ijua|GwOJ3oIFr~+R;=Xoayfy9iGq>(2$z&Xb-p#n4*P*2mJf|>zi&f%OZf)qj+
z0VsqKfGz=Y?$Wr1AuP^a4A4e&vf;hwPgiF4R}J+WGDARE%D;pG00000NkvXXu0mjf
D5Wol0

diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/link/images/hidpi/anchor.png b/htdocs/includes/ckeditor/ckeditor/plugins/link/images/hidpi/anchor.png
index f5048430d57dcf0170a2df9e48ba25a58ba18ef9..186c3e916512175f0d6ab12d8eacfe9f320314db 100644
GIT binary patch
delta 1089
zcmV-H1it&@3e^aZBYyw{XF*Lt006O%3;baP0000WV@Og>004R>004l5008;`004mK
z004C`008P>0026e000+ooVrmw00006VoOIv0RI600RN!9r;`8x00(qQO+^Rb3jz%x
z0D}(B2mk;BSxH1eR9M5^m(7bDMHt3^)jd05dz3Xu$Sv$?S${-t3SPVfvIHfVOYo43
z3)zF<zaRu6fm{Odv^NhSg1Qihdq_mkOCShp0$GrJc?cdPEV4K|pI!BM=<1p3kDXz5
z;~spVnCa?%-}l#5UDZz`iK)#woVB<#Ei_q+oSPnBY@aC;k|>;X&S9;^T8qmQTZ`@Y
zk@U8t?<D;x$$zS-wGm7m(76B8Af^IPtADn(_B<EprlccoFer|UbI4lUaEPRjN-<*q
zf47t6oF1&M>ieTd^~3Sw`sM6d?cBRpzUqaf_iVR|8xC>9A!)mfq|a;ejRCB+BLF~9
z<avDYqHch`25tEE4d{md|Ln?@I^^Fa{T6ooxVSj3pMTZF<N$FT3m{1n1avzc0PdeV
z$JWLM3D5u{G6`^i1qQzFjn!4&T3?4|lTiKV&-rP2nP;62pGaA}wZ_D86<}du0f3#I
z9RR*GhSz|(pm?YdB=s=!!0Ss(M9n7K4<FJ2VxR+joCBn(F>y?zoX{A9g5!n{t}6~;
zg7XdFh<^v#e)I@@|0}+)UlZS`ODgA>RmQixXx&KFsRH1fBZ|f;46|#Nm<ntZML21O
z6bDlUK!;eo7T~Z|0dV_x0RLYj5Jl0xmf=eSIP58?>;sZ8!9Jkix4b^W&F7^7)X6d4
z@2&5P$hP2o8=eHC((hD&a2iseOSZ=^udQ+H%zqio+#G-3y~`h0ud?0g&}96w%3;Fd
z@_Ew2@EI_s3J^sRHUQ`XZ?3HH&Ye4j>yDj1&C;byxOSUg&!6YXty@GMBn}{)FWdu8
zUb|KVfNajwG#xpRR;#6?)fyRxpHH0%J;i-VANaOjb|6nKU)D{~b<kJ7T?cJ~cAq{C
zFMnMrIHC$blGHhz4{g6ccE!UXw%bM0yWWb8WP3fmxP4oHZEni$?w0eMaB0e{04GO5
zVe?kq4hBeiRnoT;T;&&OyG>ZU79dFy&Ckz=ffx3)+kxeF-u>EMFQ3}?{ZuX5UT@Fu
zh>9g^wOSZsXt&$>iZG!+n5gWIvgMY)Rez1a<PV&wF4THQ6ugpWdOiE4bs$5Me-Ry)
zDkG4l>C_+-4CQ`d^Bj$G!ZLs<&D*r&eT~4RJ345AX^N&5`L6-~1#DbVwNjSptN;K2
zC3HntbYx+4WjbSWWnpw>05UK!HZ3tREif`vF*7<dGdeIZD=;xSFfi8vtnB~*06Haf
zMObuXVRU6WZEs|0W_bWIFfleQF)=MLGE^}$Ix{mmFfc1HF*-0Xrd$+J00000NkvXX
Hu0mjfE8_1-

delta 1361
zcmV-X1+Mzl2;&NnBYy=dNkl<ZSi`+nU2IfE6h8N7|0u96ORFeE14$`rTT+4vHPJ*9
zA-<CMVq(OAU@69jf+R+ttf}Fprhx(>F-A!GKzLMwM$<qy*wU0VB??(np-C&d?qa38
z-M_on@668Ky?eXMu0WaO+nqZz_ndFeoHOTKWol@MOw%MYmwzL4$liE7m&uTkN|BMx
zE}17qAx+mw^LR*eyGc=13@Ku~L=I%Ltit=4x7O-HNjgoL#YLgav?<{iS$XG?BPt$W
z1zrPo06H)Mi~_^KW5>eox;oN*K2lw-A`wdl<g=U{Zvu_ixOgp-o;-Js()aJvw*C8G
z!CW8EDfM3mK7Ru40_TBND&I14{%a5!(_sx3tOMM#$s}bG3EI)q^Bx|*0Oo*C#!sF4
z*}ZBN(d5~)G&(TAJ0AxO2d01s_ZLDT<Cm5eV~9xLa(lZG9UgYB4+49Dx+{Hs#6aH<
zeCb#>$~sxM!as|#7`=SxkdZ$grEvaMo9gPK@xejzN`Kq)ik#ef8rZOI9lbs~Yqv@g
z_zU<4*aCQX@B_#`E#-oM=3BEy$RoSUbaZr-IMEL<Wf;CukG>xcm&05F&l;Oo5{S&r
z(RUd4vx8i`NR2ypGS}xV8MDWa(?EAO8D-8-5U~5UVHhO@rlG6_|1HhU6kAxJD6C~-
z%<J`%2Y=*TnnsCuoc@NRC9v+&u3bWrM{bNst^n!)UnK(emSs=15!epA)Ye83L`fFp
zavZW&h_X51@qx8#=~;O8Je>J12(sM`Nq`juY=o*3D2Z1l(9l5l5JIfnEO$>J%y=#f
zOE8fQ>(`Tx4J2U^p5yp6(I1(fE*nCsb0BB!%zt(yhINrtXgtSj*m^0Bc|7}9uO`3W
zPbSD@Fm5`Iy2JvC<JPhtfhkR1OS3Fuk;%yoJV-|QBY4!t3R#X7(hpd=gn%;&EP=Hu
zE>T#+dsUsVQe#s;j;5A9M<)SQrR8dRxhQZp#SYGNw&%xAK=^<|xeA|fL9vH{ehOo*
ze19${4gWk}j*Rj!1e{^0L8%WpAcnMhYkr>Y;6~&YK)gSV%clwRI-mjtGO{R992R`I
zFvNZTM>tI1Mj|2sX;K&$2{%B-2ehKNXm4sFFNmrjrAt!m%;LX-g=!-36BM79$>bSe
zBWFMq9bsJ0|DqoQMnGch_HAlKg4)v9NPo>t27M7tu-tD*Rw<bu{`Wm_26zK_cVdD(
zTemI|aP#0n`tigGx`X~0lwF&dAqCjTK7!pxAn%@3zPb2X(5gGihM{STaV`S)VN5E&
z1at#kz-cZ8HY3+}WB#j9h+e=zgRBuk82cT{!{~Ey@b=!l^l{$0Y>dxT92al2YJV7h
zn1ALCbfM-u!xb=_mJ7|!!-u(Md`lENn>M}qzG;dLEnK)jS9b3f^}#k&QqLVYV2PUn
z-ubn^f5cl~pATs+$&$$7+hs`>2n58+Xf$fQbOShgwZH#+4>FvFyf26%*@$u-#YvVc
z=bj#}fc61<fTtY$Vncib^g>SDi+?Q1#jC;&Tg?eC_x83iTOVN6{^IQ9_W&Okm-E*K
z2megR<DY`a=a_zxizpd1yz8s5Ue>*GWl@f%)pikaz0c*dChPs;H;D`_z5^hPh3fG9
z@slSFSZ5L&nY7k1*%c^O3Lh^vIaMvdOjXBA&aWfI`qJUcNcu>nHPv&0BTCCDQa~-u
z$`g;23sR{RJ;}DDEYHgCx5AMuGXeXd1Pd2Y@eHri6CsdSc+{aVC_YZj<+Z_oD2K5x
Td{^*A00000NkvXXu0mjfE|i1n

diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js b/htdocs/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
index b984cbbb787..3d5a56f531b 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 (function(){function d(c,d){var b;try{b=c.getSelection().getRanges()[0]}catch(f){return null}b.shrink(CKEDITOR.SHRINK_TEXT);return c.elementPath(b.getCommonAncestor()).contains(d,1)}function e(c,e){var b=c.lang.liststyle;if("bulletedListStyle"==e)return{title:b.bulletedTitle,minWidth:300,minHeight:50,contents:[{id:"info",accessKey:"I",elements:[{type:"select",label:b.type,id:"type",align:"center",style:"width:150px",items:[[b.notset,""],[b.circle,"circle"],[b.disc,"disc"],[b.square,"square"]],setup:function(a){a=
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js b/htdocs/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
index 75c116dbb84..21e14be037a 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
@@ -1,32 +1,43 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-(function(){function C(a){a=a.toUpperCase();for(var c=D.length,b=0,f=0;f<c;++f)for(var d=D[f],e=d[1].length;a.substr(0,e)==d[1];a=a.substr(e))b+=d[0];return b}function E(a){a=a.toUpperCase();for(var c=1,b=1;0<a.length;b*=26)c+="ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(a.charAt(a.length-1))*b,a=a.substr(0,a.length-1);return c}var F=CKEDITOR.htmlParser.fragment.prototype,r=CKEDITOR.htmlParser.element.prototype;F.onlyChild=r.onlyChild=function(){var a=this.children;return 1==a.length&&a[0]||null};r.removeAnyChildWithName=
-function(a){for(var c=this.children,b=[],f,d=0;d<c.length;d++)f=c[d],f.name&&(f.name==a&&(b.push(f),c.splice(d--,1)),b=b.concat(f.removeAnyChildWithName(a)));return b};r.getAncestor=function(a){for(var c=this.parent;c&&(!c.name||!c.name.match(a));)c=c.parent;return c};F.firstChild=r.firstChild=function(a){for(var c,b=0;b<this.children.length;b++)if(c=this.children[b],a(c)||c.name&&(c=c.firstChild(a)))return c;return null};r.addStyle=function(a,c,b){var f="";if("string"==typeof c)f+=a+":"+c+";";else{if("object"==
-typeof a)for(var d in a)a.hasOwnProperty(d)&&(f+=d+":"+a[d]+";");else f+=a;b=c}this.attributes||(this.attributes={});a=this.attributes.style||"";a=(b?[f,a]:[a,f]).join(";");this.attributes.style=a.replace(/^;+|;(?=;)/g,"")};r.getStyle=function(a){var c=this.attributes.style;if(c)return c=CKEDITOR.tools.parseCssText(c,1),c[a]};CKEDITOR.dtd.parentOf=function(a){var c={},b;for(b in this)-1==b.indexOf("$")&&this[b][a]&&(c[b]=1);return c};var G=/^(?:\b0[^\s]*\s*){1,4}$/,B={ol:{decimal:/\d+/,"lower-roman":/^m{0,4}(cm|cd|d?c{0,3})(xc|xl|l?x{0,3})(ix|iv|v?i{0,3})$/,
-"upper-roman":/^M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$/,"lower-alpha":/^[a-z]+$/,"upper-alpha":/^[A-Z]+$/},ul:{disc:/[l\u00B7\u2002]/,circle:/[\u006F\u00D8]/,square:/[\u006E\u25C6]/}},D=[[1E3,"M"],[900,"CM"],[500,"D"],[400,"CD"],[100,"C"],[90,"XC"],[50,"L"],[40,"XL"],[10,"X"],[9,"IX"],[5,"V"],[4,"IV"],[1,"I"]],w=0,x=null,A,H=CKEDITOR.plugins.pastefromword={utils:{createListBulletMarker:function(a,c){var b=new CKEDITOR.htmlParser.element("cke:listbullet");b.attributes={"cke:listsymbol":a[0]};
-b.add(new CKEDITOR.htmlParser.text(c));return b},isListBulletIndicator:function(a){if(/mso-list\s*:\s*Ignore/i.test(a.attributes&&a.attributes.style))return!0},isContainingOnlySpaces:function(a){var c;return(c=a.onlyChild())&&/^(:?\s|&nbsp;)+$/.test(c.value)},resolveList:function(a){var c=a.attributes,b;if((b=a.removeAnyChildWithName("cke:listbullet"))&&b.length&&(b=b[0]))return a.name="cke:li",c.style&&(c.style=H.filters.stylesFilter([["text-indent"],["line-height"],[/^margin(:?-left)?$/,null,function(a){a=
-a.split(" ");a=CKEDITOR.tools.convertToPx(a[3]||a[1]||a[0]);!w&&null!==x&&a>x&&(w=a-x);x=a;c["cke:indent"]=w&&Math.ceil(a/w)+1||1}],[/^mso-list$/,null,function(a){a=a.split(" ");if(!(2>a.length)){var b=Number(a[0].match(/\d+/));a=Number(a[1].match(/\d+/));1==a&&(b!==A&&(c["cke:reset"]=1),A=b);c["cke:indent"]=a}}]])(c.style,a)||""),c["cke:indent"]||(x=0,c["cke:indent"]=1),CKEDITOR.tools.extend(c,b.attributes),!0;A=x=w=null;return!1},getStyleComponents:function(){var a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"position:absolute;left:-9999px;top:-9999px;"\x3e\x3c/div\x3e',
-CKEDITOR.document);CKEDITOR.document.getBody().append(a);return function(c,b,f){a.setStyle(c,b);c={};b=f.length;for(var d=0;d<b;d++)c[f[d]]=a.getStyle(f[d]);return c}}(),listDtdParents:CKEDITOR.dtd.parentOf("ol")},filters:{flattenList:function(a,c){c="number"==typeof c?c:1;var b=a.attributes,f;switch(b.type){case "a":f="lower-alpha";break;case "1":f="decimal"}for(var d=a.children,e,k=0;k<d.length;k++)if(e=d[k],e.name in CKEDITOR.dtd.$listItem){var l=e.attributes,g=e.children,n=g[0],h=g[g.length-1];
-n.attributes&&n.attributes.style&&-1<n.attributes.style.indexOf("mso-list")&&(e.attributes.style=n.attributes.style,n.replaceWithChildren());h.name in CKEDITOR.dtd.$list&&(a.add(h,k+1),--g.length||d.splice(k--,1));e.name="cke:li";b.start&&!k&&(l.value=b.start);H.filters.stylesFilter([["tab-stops",null,function(a){(a=a.match(/0$|\d+\.?\d*\w+/))&&(x=CKEDITOR.tools.convertToPx(a[0]))}],1==c?["mso-list",null,function(a){a=a.split(" ");a=Number(a[0].match(/\d+/));a!==A&&(l["cke:reset"]=1);A=a}]:null])(l.style);
-l["cke:indent"]=c;l["cke:listtype"]=a.name;l["cke:list-style-type"]=f}else if(e.name in CKEDITOR.dtd.$list){arguments.callee.apply(this,[e,c+1]);d=d.slice(0,k).concat(e.children).concat(d.slice(k+1));a.children=[];e=0;for(g=d.length;e<g;e++)a.add(d[e]);d=a.children}delete a.name;b["cke:list"]=1},assembleList:function(a){var c=a.children,b,f,d,e,k,l;a=[];for(var g,n,h,p,m,t,q=0;q<c.length;q++)if(b=c[q],"cke:li"==b.name)if(b.name="li",f=b.attributes,h=(h=f["cke:listsymbol"])&&h.match(/^(?:[(]?)([^\s]+?)([.)]?)$/),
-p=m=t=null,f["cke:ignored"])c.splice(q--,1);else{f["cke:reset"]&&(l=e=k=null);d=Number(f["cke:indent"]);d!=e&&(n=g=null);if(h){if(n&&B[n][g].test(h[1]))p=n,m=g;else for(var u in B)for(var y in B[u])if(B[u][y].test(h[1]))if("ol"==u&&/alpha|roman/.test(y)){if(g=/roman/.test(y)?C(h[1]):E(h[1]),!t||g<t)t=g,p=u,m=y}else{p=u;m=y;break}!p&&(p=h[2]?"ol":"ul")}else p=f["cke:listtype"]||"ol",m=f["cke:list-style-type"];n=p;g=m||("ol"==p?"decimal":"disc");m&&m!=("ol"==p?"decimal":"disc")&&b.addStyle("list-style-type",
-m);if("ol"==p&&h){switch(m){case "decimal":t=Number(h[1]);break;case "lower-roman":case "upper-roman":t=C(h[1]);break;case "lower-alpha":case "upper-alpha":t=E(h[1])}b.attributes.value=t}if(l){if(d>e)a.push(l=new CKEDITOR.htmlParser.element(p)),l.add(b),k.add(l);else{if(d<e){e-=d;for(var v;e--&&(v=l.parent);)l=v.parent}l.add(b)}c.splice(q--,1)}else a.push(l=new CKEDITOR.htmlParser.element(p)),l.add(b),c[q]=l;k=b;e=d}else l&&(l=e=k=null);for(q=0;q<a.length;q++)if(l=a[q],u=l.children,g=g=void 0,y=l.children.length,
-v=g=void 0,c=/list-style-type:(.*?)(?:;|$)/,e=CKEDITOR.plugins.pastefromword.filters.stylesFilter,g=l.attributes,!c.exec(g.style)){for(k=0;k<y;k++)if(g=u[k],g.attributes.value&&Number(g.attributes.value)==k+1&&delete g.attributes.value,g=c.exec(g.attributes.style))if(g[1]!=v&&v){v=null;break}else v=g[1];if(v){for(k=0;k<y;k++)g=u[k].attributes,g.style&&(g.style=e([["list-style-type"]])(g.style)||"");l.addStyle("list-style-type",v)}}A=x=w=null},falsyFilter:function(){return!1},stylesFilter:function(a,
-c){return function(b,f){var d=[];(b||"").replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(b,e,g){e=e.toLowerCase();"font-family"==e&&(g=g.replace(/["']/g,""));for(var n,h,p,m=0;m<a.length;m++)if(a[m]&&(b=a[m][0],n=a[m][1],h=a[m][2],p=a[m][3],e.match(b)&&(!n||g.match(n)))){e=p||e;c&&(h=h||g);"function"==typeof h&&(h=h(g,f,e));h&&h.push&&(e=h[0],h=h[1]);"string"==typeof h&&d.push([e,h]);return}!c&&d.push([e,g])});for(var e=0;e<d.length;e++)d[e]=d[e].join(":");return d.length?
-d.join(";")+";":!1}},elementMigrateFilter:function(a,c){return a?function(b){var f=c?(new CKEDITOR.style(a,c))._.definition:a;b.name=f.element;CKEDITOR.tools.extend(b.attributes,CKEDITOR.tools.clone(f.attributes));b.addStyle(CKEDITOR.style.getStyleText(f));f.attributes&&f.attributes["class"]&&(b.classWhiteList=" "+f.attributes["class"]+" ")}:function(){}},styleMigrateFilter:function(a,c){var b=this.elementMigrateFilter;return a?function(f,d){var e=new CKEDITOR.htmlParser.element(null),k={};k[c]=f;
-b(a,k)(e);e.children=d.children;d.children=[e];e.filter=function(){};e.parent=d}:function(){}},bogusAttrFilter:function(a,c){if(-1==c.name.indexOf("cke:"))return!1},applyStyleFilter:null},getRules:function(a,c){var b=CKEDITOR.dtd,f=CKEDITOR.tools.extend({},b.$block,b.$listItem,b.$tableContent),d=a.config,e=this.filters,k=e.falsyFilter,l=e.stylesFilter,g=e.elementMigrateFilter,n=CKEDITOR.tools.bind(this.filters.styleMigrateFilter,this.filters),h=this.utils.createListBulletMarker,p=e.flattenList,m=
-e.assembleList,t=this.utils.isListBulletIndicator,q=this.utils.isContainingOnlySpaces,u=this.utils.resolveList,y=function(a){a=CKEDITOR.tools.convertToPx(a);return isNaN(a)?a:a+"px"},v=this.utils.getStyleComponents,x=this.utils.listDtdParents,r=!1!==d.pasteFromWordRemoveFontStyles,w=!1!==d.pasteFromWordRemoveStyles;return{elementNames:[[/meta|link|script/,""]],root:function(a){a.filterChildren(c);m(a)},elements:{"^":function(a){var c;CKEDITOR.env.gecko&&(c=e.applyStyleFilter)&&c(a)},$:function(a){var z=
-a.name||"",e=a.attributes;z in f&&e.style&&(e.style=l([[/^(:?width|height)$/,null,y]])(e.style)||"");if(z.match(/h\d/)){a.filterChildren(c);if(u(a))return;g(d["format_"+z])(a)}else if(z in b.$inline)a.filterChildren(c),q(a)&&delete a.name;else if(-1!=z.indexOf(":")&&-1==z.indexOf("cke")){a.filterChildren(c);if("v:imagedata"==z){if(z=a.attributes["o:href"])a.attributes.src=z;a.name="img";return}delete a.name}z in x&&(a.filterChildren(c),m(a))},style:function(a){if(CKEDITOR.env.gecko){a=(a=a.onlyChild().value.match(/\/\* Style Definitions \*\/([\s\S]*?)\/\*/))&&
-a[1];var c={};a&&(a.replace(/[\n\r]/g,"").replace(/(.+?)\{(.+?)\}/g,function(a,b,I){b=b.split(",");a=b.length;for(var d=0;d<a;d++)CKEDITOR.tools.trim(b[d]).replace(/^(\w+)(\.[\w-]+)?$/g,function(a,b,d){b=b||"*";d=d.substring(1,d.length);d.match(/MsoNormal/)||(c[b]||(c[b]={}),d?c[b][d]=I:c[b]=I)})}),e.applyStyleFilter=function(a){var b=c["*"]?"*":a.name,d=a.attributes&&a.attributes["class"];b in c&&(b=c[b],"object"==typeof b&&(b=b[d]),b&&a.addStyle(b,!0))})}return!1},p:function(a){if(/MsoListParagraph/i.exec(a.attributes["class"])||
-a.getStyle("mso-list")&&!a.getStyle("mso-list").match(/^(none|skip)$/i)){var b=a.firstChild(function(a){return a.type==CKEDITOR.NODE_TEXT&&!q(a.parent)});(b=b&&b.parent)&&b.addStyle("mso-list","Ignore")}a.filterChildren(c);u(a)||(d.enterMode==CKEDITOR.ENTER_BR?(delete a.name,a.add(new CKEDITOR.htmlParser.element("br"))):g(d["format_"+(d.enterMode==CKEDITOR.ENTER_P?"p":"div")])(a))},div:function(a){var c=a.onlyChild();if(c&&"table"==c.name){var b=a.attributes;c.attributes=CKEDITOR.tools.extend(c.attributes,
-b);b.style&&c.addStyle(b.style);c=new CKEDITOR.htmlParser.element("div");c.addStyle("clear","both");a.add(c);delete a.name}},td:function(a){a.getAncestor("thead")&&(a.name="th")},ol:p,ul:p,dl:p,font:function(a){if(t(a.parent))delete a.name;else{a.filterChildren(c);var b=a.attributes,d=b.style,e=a.parent;"font"==e.name?(CKEDITOR.tools.extend(e.attributes,a.attributes),d&&e.addStyle(d),delete a.name):(d=(d||"").split(";"),b.color&&("#000000"!=b.color&&d.push("color:"+b.color),delete b.color),b.face&&
-(d.push("font-family:"+b.face),delete b.face),b.size&&(d.push("font-size:"+(3<b.size?"large":3>b.size?"small":"medium")),delete b.size),a.name="span",a.addStyle(d.join(";")))}},span:function(a){if(t(a.parent))return!1;a.filterChildren(c);if(q(a))return delete a.name,null;if(t(a)){var b=a.firstChild(function(a){return a.value||"img"==a.name}),e=(b=b&&(b.value||"l."))&&b.match(/^(?:[(]?)([^\s]+?)([.)]?)$/);if(e)return b=h(e,b),(a=a.getAncestor("span"))&&/ mso-hide:\s*all|display:\s*none /.test(a.attributes.style)&&
-(b.attributes["cke:ignored"]=1),b}if(e=(b=a.attributes)&&b.style)b.style=l([["line-height"],[/^font-family$/,null,r?null:n(d.font_style,"family")],[/^font-size$/,null,r?null:n(d.fontSize_style,"size")],[/^color$/,null,r?null:n(d.colorButton_foreStyle,"color")],[/^background-color$/,null,r?null:n(d.colorButton_backStyle,"color")]])(e,a)||"";b.style||delete b.style;CKEDITOR.tools.isEmpty(b)&&delete a.name;return null},b:g(d.coreStyles_bold),i:g(d.coreStyles_italic),u:g(d.coreStyles_underline),s:g(d.coreStyles_strike),
-sup:g(d.coreStyles_superscript),sub:g(d.coreStyles_subscript),a:function(a){var b=a.attributes;b.name&&b.name.match(/ole_link\d+/i)?delete a.name:b.href&&b.href.match(/^file:\/\/\/[\S]+#/i)&&(b.href=b.href.replace(/^file:\/\/\/[^#]+/i,""))},"cke:listbullet":function(a){a.getAncestor(/h\d/)&&!d.pasteFromWordNumberedHeadingToList&&delete a.name}},attributeNames:[[/^onmouse(:?out|over)/,""],[/^onload$/,""],[/(?:v|o):\w+/,""],[/^lang/,""]],attributes:{style:l(w?[[/^list-style-type$/,null],[/^margin$|^margin-(?!bottom|top)/,
-null,function(a,b,c){if(b.name in{p:1,div:1}){b="ltr"==d.contentsLangDirection?"margin-left":"margin-right";if("margin"==c)a=v(c,a,[b])[b];else if(c!=b)return null;if(a&&!G.test(a))return[b,a]}return null}],[/^clear$/],[/^border.*|margin.*|vertical-align|float$/,null,function(a,b){if("img"==b.name)return a}],[/^width|height$/,null,function(a,b){if(b.name in{table:1,td:1,th:1,img:1})return a}]]:[[/^mso-/],[/-color$/,null,function(a){if("transparent"==a)return!1;if(CKEDITOR.env.gecko)return a.replace(/-moz-use-text-color/g,
-"transparent")}],[/^margin$/,G],["text-indent","0cm"],["page-break-before"],["tab-stops"],["display","none"],r?[/font-?/]:null],w),width:function(a,c){if(c.name in b.$tableContent)return!1},border:function(a,c){if(c.name in b.$tableContent)return!1},"class":function(a,b){return b.classWhiteList&&-1!=b.classWhiteList.indexOf(" "+a+" ")?a:!1},bgcolor:k,valign:w?k:function(a,b){b.addStyle("vertical-align",a);return!1}},comment:CKEDITOR.env.ie?k:function(a,b){var c=a.match(/<img.*?>/),d=a.match(/^\[if !supportLists\]([\s\S]*?)\[endif\]$/);
-return d?(d=(c=d[1]||c&&"l.")&&c.match(/>(?:[(]?)([^\s]+?)([.)]?)</),h(d,c)):CKEDITOR.env.gecko&&c?(c=CKEDITOR.htmlParser.fragment.fromHtml(c[0]).children[0],(d=(d=(d=b.previous)&&d.value.match(/<v:imagedata[^>]*o:href=['"](.*?)['"]/))&&d[1])&&(c.attributes.src=d),c):!1}}}},J=function(){this.dataFilter=new CKEDITOR.htmlParser.filter};J.prototype={toHtml:function(a){a=CKEDITOR.htmlParser.fragment.fromHtml(a);var c=new CKEDITOR.htmlParser.basicWriter;a.writeHtml(c,this.dataFilter);return c.getHtml(!0)}};
-CKEDITOR.cleanWord=function(a,c){a=a.replace(/<!\[([^\]]*?)\]>/g,"\x3c!--[$1]--\x3e");CKEDITOR.env.gecko&&(a=a.replace(/(\x3c!--\[if[^<]*?\])--\x3e([\S\s]*?)\x3c!--(\[endif\]--\x3e)/gi,"$1$2$3"));CKEDITOR.env.webkit&&(a=a.replace(/(class="MsoListParagraph[^>]+>\x3c!--\[if !supportLists\]--\x3e)([^<]+<span[^<]+<\/span>)(\x3c!--\[endif\]--\x3e)/gi,"$1\x3cspan\x3e$2\x3c/span\x3e$3"));var b=new J,f=b.dataFilter;f.addRules(CKEDITOR.plugins.pastefromword.getRules(c,f));c.fire("beforeCleanWord",{filter:f});
-try{a=b.toHtml(a)}catch(d){c.showNotification(c.lang.pastefromword.error)}a=a.replace(/cke:.*?".*?"/g,"");a=a.replace(/style=""/g,"");return a=a.replace(/<span>/g,"")}})();
\ No newline at end of file
+(function(){function t(){return!1}function x(a,b){var c,d=[];a.filterChildren(b);for(c=a.children.length-1;0<=c;c--)d.unshift(a.children[c]),a.children[c].remove();c=a.attributes;var e=a,h=!0,g;for(g in c)if(h)h=!1;else{var m=new CKEDITOR.htmlParser.element(a.name);m.attributes[g]=c[g];e.add(m);e=m;delete c[g]}for(c=0;c<d.length;c++)e.add(d[c])}var f,k,u,r,l=CKEDITOR.tools,y=["o:p","xml","script","meta","link"],w={},v=0;CKEDITOR.plugins.pastefromword={};CKEDITOR.cleanWord=function(a,b){var c=Boolean(a.match(/mso-list:\s*l\d+\s+level\d+\s+lfo\d+/));
+a=a.replace(/<!\[/g,"\x3c!--[").replace(/\]>/g,"]--\x3e");var d=CKEDITOR.htmlParser.fragment.fromHtml(a);r=new CKEDITOR.htmlParser.filter({root:function(a){a.filterChildren(r);CKEDITOR.plugins.pastefromword.lists.cleanup(f.createLists(a))},elementNames:[[/^\?xml:namespace$/,""],[/^v:shapetype/,""],[new RegExp(y.join("|")),""]],elements:{a:function(a){if(a.attributes.name){if("_GoBack"==a.attributes.name){delete a.name;return}if(a.attributes.name.match(/^OLE_LINK\d+$/)){delete a.name;return}}if(a.attributes.href&&
+a.attributes.href.match(/#.+$/)){var b=a.attributes.href.match(/#(.+)$/)[1];w[b]=a}a.attributes.name&&w[a.attributes.name]&&(a=w[a.attributes.name],a.attributes.href=a.attributes.href.replace(/.*#(.*)$/,"#$1"))},div:function(a){k.createStyleStack(a,r,b)},img:function(a){if(a.parent){var b=a.parent.attributes;(b=b.style||b.STYLE)&&b.match(/mso\-list:\s?Ignore/)&&(a.attributes["cke-ignored"]=!0)}k.mapStyles(a,{width:function(b){k.setStyle(a,"width",b+"px")},height:function(b){k.setStyle(a,"height",
+b+"px")}});a.attributes.src&&a.attributes.src.match(/^file:\/\//)&&a.attributes.alt&&a.attributes.alt.match(/^https?:\/\//)&&(a.attributes.src=a.attributes.alt)},p:function(a){a.filterChildren(r);if(a.attributes.style&&a.attributes.style.match(/display:\s*none/i))return!1;if(f.thisIsAListItem(b,a))f.convertToFakeListItem(b,a);else{var c=a.getAscendant(function(a){return"ul"==a.name||"ol"==a.name}),d=l.parseCssText(a.attributes.style);c&&!c.attributes["cke-list-level"]&&d["mso-list"]&&d["mso-list"].match(/level/)&&
+(c.attributes["cke-list-level"]=d["mso-list"].match(/level(\d+)/)[1])}k.createStyleStack(a,r,b)},pre:function(a){f.thisIsAListItem(b,a)&&f.convertToFakeListItem(b,a);k.createStyleStack(a,r,b)},h1:function(a){f.thisIsAListItem(b,a)&&f.convertToFakeListItem(b,a);k.createStyleStack(a,r,b)},font:function(a){if(a.getHtml().match(/^\s*$/))return(new CKEDITOR.htmlParser.text(" ")).insertAfter(a),!1;b&&!0===b.config.pasteFromWordRemoveFontStyles&&a.attributes.size&&delete a.attributes.size;x(a,r)},ul:function(a){if(c)return"li"==
+a.parent.name&&0===l.indexOf(a.parent.children,a)&&k.setStyle(a.parent,"list-style-type","none"),f.dissolveList(a),!1},li:function(a){c&&(a.attributes.style=k.normalizedStyles(a,b),k.pushStylesLower(a))},ol:function(a){if(c)return"li"==a.parent.name&&0===l.indexOf(a.parent.children,a)&&k.setStyle(a.parent,"list-style-type","none"),f.dissolveList(a),!1},span:function(a){a.filterChildren(r);a.attributes.style=k.normalizedStyles(a,b);if(!a.attributes.style||a.attributes.style.match(/^mso\-bookmark:OLE_LINK\d+$/)||
+a.getHtml().match(/^(\s|&nbsp;)+$/)){for(var c=a.children.length-1;0<=c;c--)a.children[c].insertAfter(a);return!1}k.createStyleStack(a,r,b)},table:function(a){a._tdBorders={};a.filterChildren(r);var b,c=0,d;for(d in a._tdBorders)a._tdBorders[d]>c&&(c=a._tdBorders[d],b=d);k.setStyle(a,"border",b)},td:function(a){var b=a.getAscendant("table"),c=b._tdBorders,d=["border","border-top","border-right","border-bottom","border-left"],b=l.parseCssText(b.attributes.style),e=b.background||b.BACKGROUND;e&&k.setStyle(a,
+"background",e,!0);(b=b["background-color"]||b["BACKGROUND-COLOR"])&&k.setStyle(a,"background-color",b,!0);var b=l.parseCssText(a.attributes.style),p;for(p in b)e=b[p],delete b[p],b[p.toLowerCase()]=e;for(p=0;p<d.length;p++)b[d[p]]&&(e=b[d[p]],c[e]=c[e]?c[e]+1:1);k.pushStylesLower(a,{background:!0})},"v:imagedata":t,"v:shape":function(a){var b=!1;a.parent.getFirst(function(c){"img"==c.name&&c.attributes&&c.attributes["v:shapes"]==a.attributes.id&&(b=!0)});if(b)return!1;var c="";a.forEach(function(a){a.attributes&&
+a.attributes.src&&(c=a.attributes.src)},CKEDITOR.NODE_ELEMENT,!0);a.filterChildren(r);a.name="img";a.attributes.src=a.attributes.src||c;delete a.attributes.type},style:function(){return!1}},attributes:{style:function(a,c){return k.normalizedStyles(c,b)||!1},"class":function(a){a=a.replace(/msonormal|msolistparagraph\w*/ig,"");return""===a?!1:a},cellspacing:t,cellpadding:t,border:t,valign:t,"v:shapes":t,"o:spid":t},comment:function(a){a.match(/\[if.* supportFields.*\]/)&&v++;"[endif]"==a&&(v=0<v?v-
+1:0);return!1},text:function(a){return v?"":a.replace(/&nbsp;/g," ")}});var e=new CKEDITOR.htmlParser.basicWriter;r.applyTo(d);d.writeHtml(e);return e.getHtml()};CKEDITOR.plugins.pastefromword.styles={setStyle:function(a,b,c,d){var e=l.parseCssText(a.attributes.style);d&&e[b]||(""===c?delete e[b]:e[b]=c,a.attributes.style=CKEDITOR.tools.writeCssText(e))},mapStyles:function(a,b){for(var c in b)if(a.attributes[c]){if("function"===typeof b[c])b[c](a.attributes[c]);else k.setStyle(a,b[c],a.attributes[c]);
+delete a.attributes[c]}},normalizedStyles:function(a,b){var c="background-color:transparent border-image:none color:windowtext direction:ltr mso- text-indent visibility:visible div:border:none".split(" "),d="font-family font font-size color background-color line-height text-decoration".split(" "),e=function(){for(var a=[],b=0;b<arguments.length;b++)arguments[b]&&a.push(arguments[b]);return-1!==l.indexOf(c,a.join(":"))},h=b&&!0===b.config.pasteFromWordRemoveFontStyles,g=l.parseCssText(a.attributes.style);
+"cke:li"==a.name&&g["TEXT-INDENT"]&&g.MARGIN&&(a.attributes["cke-indentation"]=f.getElementIndentation(a),g.MARGIN=g.MARGIN.replace(/(([\w\.]+ ){3,3})[\d\.]+(\w+$)/,"$10$3"));for(var m=l.objectKeys(g),q=0;q<m.length;q++){var n=m[q].toLowerCase(),p=g[m[q]],k=CKEDITOR.tools.indexOf;(h&&-1!==k(d,n.toLowerCase())||e(null,n,p)||e(null,n.replace(/\-.*$/,"-"))||e(null,n)||e(a.name,n,p)||e(a.name,n.replace(/\-.*$/,"-"))||e(a.name,n)||e(p))&&delete g[m[q]]}return CKEDITOR.tools.writeCssText(g)},createStyleStack:function(a,
+b,c){var d=[];a.filterChildren(b);for(b=a.children.length-1;0<=b;b--)d.unshift(a.children[b]),a.children[b].remove();k.sortStyles(a);b=l.parseCssText(k.normalizedStyles(a,c));c=a;var e="span"===a.name,h;for(h in b)if(!h.match(/margin|text\-align|width|border|padding/i))if(e)e=!1;else{var g=new CKEDITOR.htmlParser.element("span");g.attributes.style=h+":"+b[h];c.add(g);c=g;delete b[h]}"{}"!==JSON.stringify(b)?a.attributes.style=CKEDITOR.tools.writeCssText(b):delete a.attributes.style;for(b=0;b<d.length;b++)c.add(d[b])},
+sortStyles:function(a){for(var b=["border","border-bottom","font-size","background"],c=l.parseCssText(a.attributes.style),d=l.objectKeys(c),e=[],h=[],g=0;g<d.length;g++)-1!==l.indexOf(b,d[g].toLowerCase())?e.push(d[g]):h.push(d[g]);e.sort(function(a,c){var d=l.indexOf(b,a.toLowerCase()),e=l.indexOf(b,c.toLowerCase());return d-e});d=[].concat(e,h);e={};for(g=0;g<d.length;g++)e[d[g]]=c[d[g]];a.attributes.style=CKEDITOR.tools.writeCssText(e)},pushStylesLower:function(a,b){if(!a.attributes.style||0===
+a.children.length)return!1;b=b||{};var c={"list-style-type":!0,width:!0,border:!0,"border-":!0},d=l.parseCssText(a.attributes.style),e;for(e in d)if(!(e.toLowerCase()in c||c[e.toLowerCase().replace(/\-.*$/,"-")]||e.toLowerCase()in b)){for(var h=!1,g=0;g<a.children.length;g++){var m=a.children[g];m.type===CKEDITOR.NODE_ELEMENT&&(h=!0,k.setStyle(m,e,d[e]))}h&&delete d[e]}a.attributes.style=CKEDITOR.tools.writeCssText(d);return!0}};k=CKEDITOR.plugins.pastefromword.styles;CKEDITOR.plugins.pastefromword.lists=
+{thisIsAListItem:function(a,b){return u.isEdgeListItem(a,b)||b.attributes.style&&b.attributes.style.match(/mso\-list:\s?l\d/)&&"li"!==b.parent.name||b.attributes["cke-dissolved"]||b.getHtml().match(/<!\-\-\[if !supportLists]\-\->/)||b.getHtml().match(/^( )*.*?[\.\)] ( ){2,700}/)?!0:!1},convertToFakeListItem:function(a,b){u.isEdgeListItem(a,b)&&u.assignListLevels(a,b);this.getListItemInfo(b);if(!b.attributes["cke-dissolved"]){var c;b.forEach(function(a){!c&&"img"==a.name&&a.attributes["cke-ignored"]&&
+"*"==a.attributes.alt&&(c="·",a.remove())},CKEDITOR.NODE_ELEMENT);b.forEach(function(a){c||a.value.match(/^ /)||(c=a.value)},CKEDITOR.NODE_TEXT);if("undefined"==typeof c)return;b.attributes["cke-symbol"]=c.replace(/ .*$/,"");f.removeSymbolText(b)}if(b.attributes.style){var d=l.parseCssText(b.attributes.style);d["margin-left"]&&(delete d["margin-left"],b.attributes.style=CKEDITOR.tools.writeCssText(d))}b.name="cke:li"},convertToRealListItems:function(a){var b=[];a.forEach(function(a){"cke:li"==a.name&&
+(a.name="li",b.push(a))},CKEDITOR.NODE_ELEMENT,!1);return b},removeSymbolText:function(a){var b,c=a.attributes["cke-symbol"];a.forEach(function(d){!b&&d.value.match(c.replace(")","\\)").replace("(",""))&&(d.value=d.value.replace(c,""),d.parent.getHtml().match(/^(\s|&nbsp;)*$/)&&(b=d.parent!==a?d.parent:null))},CKEDITOR.NODE_TEXT);b&&b.remove()},setListSymbol:function(a,b,c){c=c||1;var d=l.parseCssText(a.attributes.style);if("ol"==a.name){if(a.attributes.type||d["list-style-type"])return;var e={"[ivx]":"lower-roman",
+"[IVX]":"upper-roman","[a-z]":"lower-alpha","[A-Z]":"upper-alpha","\\d":"decimal"},h;for(h in e)if(f.getSubsectionSymbol(b).match(new RegExp(h))){d["list-style-type"]=e[h];break}a.attributes["cke-list-style-type"]=d["list-style-type"]}else e={"·":"disc",o:"circle","§":"square"},!d["list-style-type"]&&e[b]&&(d["list-style-type"]=e[b]);f.setListSymbol.removeRedundancies(d,c);(a.attributes.style=CKEDITOR.tools.writeCssText(d))||delete a.attributes.style},setListStart:function(a){for(var b=[],c=0,d=0;d<
+a.children.length;d++)b.push(a.children[d].attributes["cke-symbol"]||"");b[0]||c++;switch(a.attributes["cke-list-style-type"]){case "lower-roman":case "upper-roman":a.attributes.start=f.toArabic(f.getSubsectionSymbol(b[c]))-c;break;case "lower-alpha":case "upper-alpha":a.attributes.start=f.getSubsectionSymbol(b[c]).replace(/\W/g,"").toLowerCase().charCodeAt(0)-96-c;break;case "decimal":a.attributes.start=parseInt(f.getSubsectionSymbol(b[c]),10)-c||1}"1"==a.attributes.start&&delete a.attributes.start;
+delete a.attributes["cke-list-style-type"]},numbering:{toNumber:function(a,b){function c(a){a=a.toUpperCase();for(var b=1,c=1;0<a.length;c*=26)b+="ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(a.charAt(a.length-1))*c,a=a.substr(0,a.length-1);return b}function d(a){var b=[[1E3,"M"],[900,"CM"],[500,"D"],[400,"CD"],[100,"C"],[90,"XC"],[50,"L"],[40,"XL"],[10,"X"],[9,"IX"],[5,"V"],[4,"IV"],[1,"I"]];a=a.toUpperCase();for(var c=b.length,d=0,f=0;f<c;++f)for(var n=b[f],p=n[1].length;a.substr(0,p)==n[1];a=a.substr(p))d+=
+n[0];return d}return"decimal"==b?Number(a):"upper-roman"==b||"lower-roman"==b?d(a.toUpperCase()):"lower-alpha"==b||"upper-alpha"==b?c(a):1},getStyle:function(a){a=a.slice(0,1);var b={i:"lower-roman",v:"lower-roman",x:"lower-roman",l:"lower-roman",m:"lower-roman",I:"upper-roman",V:"upper-roman",X:"upper-roman",L:"upper-roman",M:"upper-roman"}[a];b||(b="decimal",a.match(/[a-z]/)&&(b="lower-alpha"),a.match(/[A-Z]/)&&(b="upper-alpha"));return b}},getSubsectionSymbol:function(a){return(a.match(/([\da-zA-Z]+).?$/)||
+["placeholder",1])[1]},setListDir:function(a){var b=0,c=0;a.forEach(function(a){"li"==a.name&&("rtl"==(a.attributes.dir||a.attributes.DIR||"").toLowerCase()?c++:b++)},CKEDITOR.ELEMENT_NODE);c>b&&(a.attributes.dir="rtl")},createList:function(a){return(a.attributes["cke-symbol"].match(/([\da-np-zA-NP-Z]).?/)||[])[1]?new CKEDITOR.htmlParser.element("ol"):new CKEDITOR.htmlParser.element("ul")},createLists:function(a){var b,c,d,e=f.convertToRealListItems(a);if(0===e.length)return[];var h=f.groupLists(e);
+for(a=0;a<h.length;a++){var g=h[a],m=g[0];for(d=0;d<g.length;d++)if(1==g[d].attributes["cke-list-level"]){m=g[d];break}var m=[f.createList(m)],k=m[0],n=[m[0]];k.insertBefore(g[0]);for(d=0;d<g.length;d++){b=g[d];for(c=b.attributes["cke-list-level"];c>m.length;){var p=f.createList(b),l=k.children;0<l.length?l[l.length-1].add(p):(l=new CKEDITOR.htmlParser.element("li",{style:"list-style-type:none"}),l.add(p),k.add(l));m.push(p);n.push(p);k=p;c==m.length&&f.setListSymbol(p,b.attributes["cke-symbol"],
+c)}for(;c<m.length;)m.pop(),k=m[m.length-1],c==m.length&&f.setListSymbol(k,b.attributes["cke-symbol"],c);b.remove();k.add(b)}m[0].children.length&&(d=m[0].children[0].attributes["cke-symbol"],!d&&1<m[0].children.length&&(d=m[0].children[1].attributes["cke-symbol"]),d&&f.setListSymbol(m[0],d));for(d=0;d<n.length;d++)f.setListStart(n[d]);for(d=0;d<g.length;d++)this.determineListItemValue(g[d])}return e},cleanup:function(a){var b=["cke-list-level","cke-symbol","cke-list-id","cke-indentation","cke-dissolved"],
+c,d;for(c=0;c<a.length;c++)for(d=0;d<b.length;d++)delete a[c].attributes[b[d]]},determineListItemValue:function(a){if("ol"===a.parent.name){var b=this.calculateValue(a),c=a.attributes["cke-symbol"].match(/[a-z0-9]+/gi),d;c&&(c=c[c.length-1],d=a.parent.attributes["cke-list-style-type"]||this.numbering.getStyle(c),c=this.numbering.toNumber(c,d),c!==b&&(a.attributes.value=c))}},calculateValue:function(a){if(!a.parent)return 1;var b=a.parent;a=a.getIndex();var c=null,d,e,h;for(h=a;0<=h&&null===c;h--)e=
+b.children[h],e.attributes&&void 0!==e.attributes.value&&(d=h,c=parseInt(e.attributes.value,10));null===c&&(c=void 0!==b.attributes.start?parseInt(b.attributes.start,10):1,d=0);return c+(a-d)},dissolveList:function(a){function b(a){return 50<=a?"l"+b(a-50):40<=a?"xl"+b(a-40):10<=a?"x"+b(a-10):9==a?"ix":5<=a?"v"+b(a-5):4==a?"iv":1<=a?"i"+b(a-1):""}function c(a,b){function c(b,d){return b&&b.parent?a(b.parent)?c(b.parent,d+1):c(b.parent,d):d}return c(b,0)}var d=function(a){return function(b){return b.name==
+a}},e=function(a){return d("ul")(a)||d("ol")(a)},h=CKEDITOR.tools.array,g=[],f,q;a.forEach(function(a){g.push(a)},CKEDITOR.NODE_ELEMENT,!1);f=h.filter(g,d("li"));var n=h.filter(g,e);h.forEach(n,function(a){var g=a.attributes.type,f=parseInt(a.attributes.start,10)||1,k=c(e,a)+1;g||(g=l.parseCssText(a.attributes.style)["list-style-type"]);h.forEach(h.filter(a.children,d("li")),function(c,d){var e;switch(g){case "disc":e="·";break;case "circle":e="o";break;case "square":e="§";break;case "1":case "decimal":e=
+f+d+".";break;case "a":case "lower-alpha":e=String.fromCharCode(97+f-1+d)+".";break;case "A":case "upper-alpha":e=String.fromCharCode(65+f-1+d)+".";break;case "i":case "lower-roman":e=b(f+d)+".";break;case "I":case "upper-roman":e=b(f+d).toUpperCase()+".";break;default:e="ul"==a.name?"·":f+d+"."}c.attributes["cke-symbol"]=e;c.attributes["cke-list-level"]=k})});f=h.reduce(f,function(a,b){var c=b.children[0];if(c&&c.name&&c.attributes.style&&c.attributes.style.match(/mso-list:/i)){k.pushStylesLower(b,
+{"list-style-type":!0,display:!0});var d=l.parseCssText(c.attributes.style,!0);k.setStyle(b,"mso-list",d["mso-list"],!0);k.setStyle(c,"mso-list","");delete b["cke-list-level"];(c=d.display?"display":d.DISPLAY?"DISPLAY":"")&&k.setStyle(b,"display",d[c],!0)}if(1===b.children.length&&e(b.children[0]))return a;b.name="p";b.attributes["cke-dissolved"]=!0;a.push(b);return a},[]);for(q=f.length-1;0<=q;q--)f[q].insertAfter(a);for(q=n.length-1;0<=q;q--)delete n[q].name},groupLists:function(a){var b,c,d=[[a[0]]],
+e=d[0];c=a[0];c.attributes["cke-indentation"]=c.attributes["cke-indentation"]||f.getElementIndentation(c);for(b=1;b<a.length;b++){c=a[b];var h=a[b-1];c.attributes["cke-indentation"]=c.attributes["cke-indentation"]||f.getElementIndentation(c);c.previous!==h&&(f.chopDiscontinuousLists(e,d),d.push(e=[]));e.push(c)}f.chopDiscontinuousLists(e,d);return d},chopDiscontinuousLists:function(a,b){for(var c={},d=[[]],e,h=0;h<a.length;h++){var g=c[a[h].attributes["cke-list-level"]],k=this.getListItemInfo(a[h]),
+q,n;g?(n=g.type.match(/alpha/)&&7==g.index?"alpha":n,n="o"==a[h].attributes["cke-symbol"]&&14==g.index?"alpha":n,q=f.getSymbolInfo(a[h].attributes["cke-symbol"],n),k=this.getListItemInfo(a[h]),(g.type!=q.type||e&&k.id!=e.id&&!this.isAListContinuation(a[h]))&&d.push([])):q=f.getSymbolInfo(a[h].attributes["cke-symbol"]);for(e=parseInt(a[h].attributes["cke-list-level"],10)+1;20>e;e++)c[e]&&delete c[e];c[a[h].attributes["cke-list-level"]]=q;d[d.length-1].push(a[h]);e=k}[].splice.apply(b,[].concat([l.indexOf(b,
+a),1],d))},isAListContinuation:function(a){var b=a;do if((b=b.previous)&&b.type===CKEDITOR.NODE_ELEMENT){if(void 0===b.attributes["cke-list-level"])break;if(b.attributes["cke-list-level"]===a.attributes["cke-list-level"])return b.attributes["cke-list-id"]===a.attributes["cke-list-id"]}while(b);return!1},getElementIndentation:function(a){a=l.parseCssText(a.attributes.style);if(a.margin||a.MARGIN){a.margin=a.margin||a.MARGIN;var b={styles:{margin:a.margin}};CKEDITOR.filter.transformationsTools.splitMarginShorthand(b);
+a["margin-left"]=b.styles["margin-left"]}return parseInt(l.convertToPx(a["margin-left"]||"0px"),10)},toArabic:function(a){return a.match(/[ivxl]/i)?a.match(/^l/i)?50+f.toArabic(a.slice(1)):a.match(/^lx/i)?40+f.toArabic(a.slice(1)):a.match(/^x/i)?10+f.toArabic(a.slice(1)):a.match(/^ix/i)?9+f.toArabic(a.slice(2)):a.match(/^v/i)?5+f.toArabic(a.slice(1)):a.match(/^iv/i)?4+f.toArabic(a.slice(2)):a.match(/^i/i)?1+f.toArabic(a.slice(1)):f.toArabic(a.slice(1)):0},getSymbolInfo:function(a,b){var c=a.toUpperCase()==
+a?"upper-":"lower-",d={"·":["disc",-1],o:["circle",-2],"§":["square",-3]};if(a in d||b&&b.match(/(disc|circle|square)/))return{index:d[a][1],type:d[a][0]};if(a.match(/\d/))return{index:a?parseInt(f.getSubsectionSymbol(a),10):0,type:"decimal"};a=a.replace(/\W/g,"").toLowerCase();return!b&&a.match(/[ivxl]+/i)||b&&"alpha"!=b||"roman"==b?{index:f.toArabic(a),type:c+"roman"}:a.match(/[a-z]/i)?{index:a.charCodeAt(0)-97,type:c+"alpha"}:{index:-1,type:"disc"}},getListItemInfo:function(a){if(void 0!==a.attributes["cke-list-id"])return{id:a.attributes["cke-list-id"],
+level:a.attributes["cke-list-level"]};var b=l.parseCssText(a.attributes.style)["mso-list"],c={id:"0",level:"1"};b&&(b+=" ",c.level=b.match(/level(.+?)\s+/)[1],c.id=b.match(/l(\d+?)\s+/)[1]);a.attributes["cke-list-level"]=void 0!==a.attributes["cke-list-level"]?a.attributes["cke-list-level"]:c.level;a.attributes["cke-list-id"]=c.id;return c}};f=CKEDITOR.plugins.pastefromword.lists;CKEDITOR.plugins.pastefromword.heuristics={isEdgeListItem:function(a,b){return CKEDITOR.env.edge&&a.config.pasteFromWord_heuristicsEdgeList?
+b.attributes.style&&!b.attributes.style.match(/mso\-list/)&&!!b.find(function(a){var b=l.parseCssText(a.attributes&&a.attributes.style);if(!b)return!1;var e=b["font-family"]||"";return(b.font||b["font-size"]||"").match(/7pt/i)&&!!a.previous||e.match(/symbol/i)},!0).length:!1},assignListLevels:function(a,b){if(!b.attributes||void 0===b.attributes["cke-list-level"]){for(var c=[f.getElementIndentation(b)],d=[b],e=[],h=CKEDITOR.tools.array,g=h.map;b.next&&b.next.attributes&&!b.next.attributes["cke-list-level"]&&
+u.isEdgeListItem(a,b.next);)b=b.next,c.push(f.getElementIndentation(b)),d.push(b);var k=g(c,function(a,b){return 0===b?0:a-c[b-1]}),l=this.guessIndentationStep(h.filter(c,function(a){return 0!==a})),e=g(c,function(a){return Math.round(a/l)});-1!==h.indexOf(e,0)&&(e=g(e,function(a){return a+1}));h.forEach(d,function(a,b){a.attributes["cke-list-level"]=e[b]});return{indents:c,levels:e,diffs:k}}},guessIndentationStep:function(a){return a.length?Math.min.apply(null,a):null}};u=CKEDITOR.plugins.pastefromword.heuristics;
+f.setListSymbol.removeRedundancies=function(a,b){(1===b&&"disc"===a["list-style-type"]||"decimal"===a["list-style-type"])&&delete a["list-style-type"]};CKEDITOR.plugins.pastefromword.createAttributeStack=x;CKEDITOR.config.pasteFromWord_heuristicsEdgeList=!0})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js
index 12dbfd132d0..6f158a0589f 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js
@@ -1,19 +1,19 @@
-CKEDITOR.dialog.add("scaytDialog",function(c){var f=c.scayt,q='\x3cp\x3e\x3cimg src\x3d"'+f.getLogo()+'" /\x3e\x3c/p\x3e\x3cp\x3e'+f.getLocal("version")+f.getVersion()+"\x3c/p\x3e\x3cp\x3e"+f.getLocal("text_copyrights")+"\x3c/p\x3e",r=CKEDITOR.document,n={isChanged:function(){return null===this.newLang||this.currentLang===this.newLang?!1:!0},currentLang:f.getLang(),newLang:null,reset:function(){this.currentLang=f.getLang();this.newLang=null},id:"lang"},q=[{id:"options",label:f.getLocal("tab_options"),
-onShow:function(){},elements:[{type:"vbox",id:"scaytOptions",children:function(){var a=f.getApplicationConfig(),b=[],g={"ignore-all-caps-words":"label_allCaps","ignore-domain-names":"label_ignoreDomainNames","ignore-words-with-mixed-cases":"label_mixedCase","ignore-words-with-numbers":"label_mixedWithDigits"},e;for(e in a)a={type:"checkbox"},a.id=e,a.label=f.getLocal(g[e]),b.push(a);return b}(),onShow:function(){this.getChild();for(var a=c.scayt,b=0;b<this.getChild().length;b++)this.getChild()[b].setValue(a.getApplicationConfig()[this.getChild()[b].id])}}]},
-{id:"langs",label:f.getLocal("tab_languages"),elements:[{id:"leftLangColumn",type:"vbox",align:"left",widths:["100"],children:[{type:"html",id:"langBox",style:"overflow: hidden; white-space: normal;margin-bottom:15px;",html:'\x3cdiv\x3e\x3cdiv style\x3d"float:left;width:45%;margin-left:5px;" id\x3d"left-col-'+c.name+'"\x3e\x3c/div\x3e\x3cdiv style\x3d"float:left;width:45%;margin-left:15px;" id\x3d"right-col-'+c.name+'"\x3e\x3c/div\x3e\x3c/div\x3e',onShow:function(){var a=c.scayt.getLang();r.getById("scaytLang_"+
-c.name+"_"+a).$.checked=!0}},{type:"html",id:"graytLanguagesHint",html:'\x3cdiv style\x3d"margin:5px auto; width:95%;white-space:normal;" id\x3d"'+c.name+'graytLanguagesHint"\x3e\x3cspan style\x3d"width:10px;height:10px;display: inline-block; background:#02b620;vertical-align:top;margin-top:2px;"\x3e\x3c/span\x3e - This languages are supported by Grammar As You Type(GRAYT).\x3c/div\x3e',onShow:function(){var a=r.getById(c.name+"graytLanguagesHint");c.config.grayt_autoStartup||(a.$.style.display="none")}}]}]},
-{id:"dictionaries",label:f.getLocal("tab_dictionaries"),elements:[{type:"vbox",id:"rightCol_col__left",children:[{type:"html",id:"dictionaryNote",html:""},{type:"text",id:"dictionaryName",label:f.getLocal("label_fieldNameDic")||"Dictionary name",onShow:function(a){var b=a.sender,g=c.scayt;setTimeout(function(){b.getContentElement("dictionaries","dictionaryNote").getElement().setText("");null!=g.getUserDictionaryName()&&""!=g.getUserDictionaryName()&&b.getContentElement("dictionaries","dictionaryName").setValue(g.getUserDictionaryName())},
-0)}},{type:"hbox",id:"notExistDic",align:"left",style:"width:auto;",widths:["50%","50%"],children:[{type:"button",id:"createDic",label:f.getLocal("btn_createDic"),title:f.getLocal("btn_createDic"),onClick:function(){var a=this.getDialog(),b=p,g=c.scayt,e=a.getContentElement("dictionaries","dictionaryName").getValue();g.createUserDictionary(e,function(d){d.error||b.toggleDictionaryButtons.call(a,!0);d.dialog=a;d.command="create";d.name=e;c.fire("scaytUserDictionaryAction",d)},function(d){d.dialog=
-a;d.command="create";d.name=e;c.fire("scaytUserDictionaryActionError",d)})}},{type:"button",id:"restoreDic",label:f.getLocal("btn_restoreDic"),title:f.getLocal("btn_restoreDic"),onClick:function(){var a=this.getDialog(),b=c.scayt,g=p,e=a.getContentElement("dictionaries","dictionaryName").getValue();b.restoreUserDictionary(e,function(d){d.dialog=a;d.error||g.toggleDictionaryButtons.call(a,!0);d.command="restore";d.name=e;c.fire("scaytUserDictionaryAction",d)},function(d){d.dialog=a;d.command="restore";
-d.name=e;c.fire("scaytUserDictionaryActionError",d)})}}]},{type:"hbox",id:"existDic",align:"left",style:"width:auto;",widths:["50%","50%"],children:[{type:"button",id:"removeDic",label:f.getLocal("btn_deleteDic"),title:f.getLocal("btn_deleteDic"),onClick:function(){var a=this.getDialog(),b=c.scayt,g=p,e=a.getContentElement("dictionaries","dictionaryName"),d=e.getValue();b.removeUserDictionary(d,function(b){e.setValue("");b.error||g.toggleDictionaryButtons.call(a,!1);b.dialog=a;b.command="remove";
-b.name=d;c.fire("scaytUserDictionaryAction",b)},function(b){b.dialog=a;b.command="remove";b.name=d;c.fire("scaytUserDictionaryActionError",b)})}},{type:"button",id:"renameDic",label:f.getLocal("btn_renameDic"),title:f.getLocal("btn_renameDic"),onClick:function(){var a=this.getDialog(),b=c.scayt,g=a.getContentElement("dictionaries","dictionaryName").getValue();b.renameUserDictionary(g,function(b){b.dialog=a;b.command="rename";b.name=g;c.fire("scaytUserDictionaryAction",b)},function(b){b.dialog=a;b.command=
-"rename";b.name=g;c.fire("scaytUserDictionaryActionError",b)})}}]},{type:"html",id:"dicInfo",html:'\x3cdiv id\x3d"dic_info_editor1" style\x3d"margin:5px auto; width:95%;white-space:normal;"\x3e'+f.getLocal("text_descriptionDic")+"\x3c/div\x3e"}]}]},{id:"about",label:f.getLocal("tab_about"),elements:[{type:"html",id:"about",style:"margin: 5px 5px;",html:'\x3cdiv\x3e\x3cdiv id\x3d"scayt_about_"\x3e'+q+"\x3c/div\x3e\x3c/div\x3e"}]}];c.on("scaytUserDictionaryAction",function(a){var b=SCAYT.prototype.UILib,
-g=a.data.dialog,e=g.getContentElement("dictionaries","dictionaryNote").getElement(),d=a.editor.scayt,c;void 0===a.data.error?(c=d.getLocal("message_success_"+a.data.command+"Dic"),c=c.replace("%s",a.data.name),e.setText(c),b.css(e.$,{color:"blue"})):(""===a.data.name?e.setText(d.getLocal("message_info_emptyDic")):(c=d.getLocal("message_error_"+a.data.command+"Dic"),c=c.replace("%s",a.data.name),e.setText(c)),b.css(e.$,{color:"red"}),null!=d.getUserDictionaryName()&&""!=d.getUserDictionaryName()?g.getContentElement("dictionaries",
-"dictionaryName").setValue(d.getUserDictionaryName()):g.getContentElement("dictionaries","dictionaryName").setValue(""))});c.on("scaytUserDictionaryActionError",function(a){var b=SCAYT.prototype.UILib,c=a.data.dialog,e=c.getContentElement("dictionaries","dictionaryNote").getElement(),d=a.editor.scayt,f;""===a.data.name?e.setText(d.getLocal("message_info_emptyDic")):(f=d.getLocal("message_error_"+a.data.command+"Dic"),f=f.replace("%s",a.data.name),e.setText(f));b.css(e.$,{color:"red"});null!=d.getUserDictionaryName()&&
-""!=d.getUserDictionaryName()?c.getContentElement("dictionaries","dictionaryName").setValue(d.getUserDictionaryName()):c.getContentElement("dictionaries","dictionaryName").setValue("")});var p={title:f.getLocal("text_title"),resizable:CKEDITOR.DIALOG_RESIZE_BOTH,minWidth:340,minHeight:260,onLoad:function(){if(0!=c.config.scayt_uiTabs[1]){var a=p,b=a.getLangBoxes.call(this);b.getParent().setStyle("white-space","normal");a.renderLangList(b);this.definition.minWidth=this.getSize().width;this.resize(this.definition.minWidth,
-this.definition.minHeight)}},onCancel:function(){n.reset()},onHide:function(){c.unlockSelection()},onShow:function(){c.fire("scaytDialogShown",this);if(0!=c.config.scayt_uiTabs[2]){var a=c.scayt,b=this.getContentElement("dictionaries","dictionaryName"),g=this.getContentElement("dictionaries","existDic").getElement().getParent(),e=this.getContentElement("dictionaries","notExistDic").getElement().getParent();g.hide();e.hide();null!=a.getUserDictionaryName()&&""!=a.getUserDictionaryName()?(this.getContentElement("dictionaries",
-"dictionaryName").setValue(a.getUserDictionaryName()),g.show()):(b.setValue(""),e.show())}},onOk:function(){var a=p,b=c.scayt;this.getContentElement("options","scaytOptions");a=a.getChangedOption.call(this);b.commitOption({changedOptions:a})},toggleDictionaryButtons:function(a){var b=this.getContentElement("dictionaries","existDic").getElement().getParent(),c=this.getContentElement("dictionaries","notExistDic").getElement().getParent();a?(b.show(),c.hide()):(b.hide(),c.show())},getChangedOption:function(){var a=
-{};if(1==c.config.scayt_uiTabs[0])for(var b=this.getContentElement("options","scaytOptions").getChild(),g=0;g<b.length;g++)b[g].isChanged()&&(a[b[g].id]=b[g].getValue());n.isChanged()&&(a[n.id]=c.config.scayt_sLang=n.currentLang=n.newLang);return a},buildRadioInputs:function(a,b,g){var e=new CKEDITOR.dom.element("div"),d="scaytLang_"+c.name+"_"+b,f=CKEDITOR.dom.element.createFromHtml('\x3cinput id\x3d"'+d+'" type\x3d"radio"  value\x3d"'+b+'" name\x3d"scayt_lang" /\x3e'),m=new CKEDITOR.dom.element("label"),
-k=c.scayt;e.setStyles({"white-space":"normal",position:"relative","padding-bottom":"2px"});f.on("click",function(a){n.newLang=a.sender.getValue()});m.appendText(a);m.setAttribute("for",d);g&&c.config.grayt_autoStartup&&m.setStyles({color:"#02b620"});e.append(f);e.append(m);b===k.getLang()&&(f.setAttribute("checked",!0),f.setAttribute("defaultChecked","defaultChecked"));return e},renderLangList:function(a){var b=a.find("#left-col-"+c.name).getItem(0);a=a.find("#right-col-"+c.name).getItem(0);var g=
-f.getScaytLangList(),e=f.getGraytLangList(),d={},l=[],m=0,k=!1,h;for(h in g.ltr)d[h]=g.ltr[h];for(h in g.rtl)d[h]=g.rtl[h];for(h in d)l.push([h,d[h]]);l.sort(function(a,b){var c=0;a[1]>b[1]?c=1:a[1]<b[1]&&(c=-1);return c});d={};for(k=0;k<l.length;k++)d[l[k][0]]=l[k][1];l=Math.round(l.length/2);for(h in d)m++,k=h in e.ltr||h in e.rtl,this.buildRadioInputs(d[h],h,k).appendTo(m<=l?b:a)},getLangBoxes:function(){return this.getContentElement("langs","langBox").getElement()},contents:function(a,b){var c=
-[],e=b.config.scayt_uiTabs;if(e){for(var d in e)1==e[d]&&c.push(a[d]);c.push(a[a.length-1])}else return a;return c}(q,c)};return p});
\ No newline at end of file
+CKEDITOR.dialog.add("scaytDialog",function(d){var f=d.scayt,p='\x3cp\x3e\x3cimg src\x3d"'+f.getLogo()+'" /\x3e\x3c/p\x3e\x3cp\x3e'+f.getLocal("version")+f.getVersion()+"\x3c/p\x3e\x3cp\x3e"+f.getLocal("text_copyrights")+"\x3c/p\x3e",q=CKEDITOR.document,l={isChanged:function(){return null===this.newLang||this.currentLang===this.newLang?!1:!0},currentLang:f.getLang(),newLang:null,reset:function(){this.currentLang=f.getLang();this.newLang=null},id:"lang"},p=[{id:"options",label:f.getLocal("tab_options"),
+onShow:function(){},elements:[{type:"vbox",id:"scaytOptions",children:function(){var a=f.getApplicationConfig(),b=[],e={"ignore-all-caps-words":"label_allCaps","ignore-domain-names":"label_ignoreDomainNames","ignore-words-with-mixed-cases":"label_mixedCase","ignore-words-with-numbers":"label_mixedWithDigits"},h;for(h in a)a={type:"checkbox"},a.id=h,a.label=f.getLocal(e[h]),b.push(a);return b}(),onShow:function(){this.getChild();for(var a=d.scayt,b=0;b<this.getChild().length;b++)this.getChild()[b].setValue(a.getApplicationConfig()[this.getChild()[b].id])}}]},
+{id:"langs",label:f.getLocal("tab_languages"),elements:[{id:"leftLangColumn",type:"vbox",align:"left",widths:["100"],children:[{type:"html",id:"langBox",style:"overflow: hidden; white-space: normal;margin-bottom:15px;",html:'\x3cdiv\x3e\x3cdiv style\x3d"float:left;width:45%;margin-left:5px;" id\x3d"left-col-'+d.name+'" class\x3d"scayt-lang-list"\x3e\x3c/div\x3e\x3cdiv style\x3d"float:left;width:45%;margin-left:15px;" id\x3d"right-col-'+d.name+'" class\x3d"scayt-lang-list"\x3e\x3c/div\x3e\x3c/div\x3e',
+onShow:function(){var a=d.scayt.getLang();q.getById("scaytLang_"+d.name+"_"+a).$.checked=!0}},{type:"html",id:"graytLanguagesHint",html:'\x3cdiv style\x3d"margin:5px auto; width:95%;white-space:normal;" id\x3d"'+d.name+'graytLanguagesHint"\x3e\x3cspan style\x3d"width:10px;height:10px;display: inline-block; background:#02b620;vertical-align:top;margin-top:2px;"\x3e\x3c/span\x3e - This languages are supported by Grammar As You Type(GRAYT).\x3c/div\x3e',onShow:function(){var a=q.getById(d.name+"graytLanguagesHint");
+d.config.grayt_autoStartup||(a.$.style.display="none")}}]}]},{id:"dictionaries",label:f.getLocal("tab_dictionaries"),elements:[{type:"vbox",id:"rightCol_col__left",children:[{type:"html",id:"dictionaryNote",html:""},{type:"text",id:"dictionaryName",label:f.getLocal("label_fieldNameDic")||"Dictionary name",onShow:function(a){var b=a.sender,e=d.scayt;setTimeout(function(){b.getContentElement("dictionaries","dictionaryNote").getElement().setText("");null!=e.getUserDictionaryName()&&""!=e.getUserDictionaryName()&&
+b.getContentElement("dictionaries","dictionaryName").setValue(e.getUserDictionaryName())},0)}},{type:"hbox",id:"notExistDic",align:"left",style:"width:auto;",widths:["50%","50%"],children:[{type:"button",id:"createDic",label:f.getLocal("btn_createDic"),title:f.getLocal("btn_createDic"),onClick:function(){var a=this.getDialog(),b=n,e=d.scayt,h=a.getContentElement("dictionaries","dictionaryName").getValue();e.createUserDictionary(h,function(c){c.error||b.toggleDictionaryButtons.call(a,!0);c.dialog=
+a;c.command="create";c.name=h;d.fire("scaytUserDictionaryAction",c)},function(c){c.dialog=a;c.command="create";c.name=h;d.fire("scaytUserDictionaryActionError",c)})}},{type:"button",id:"restoreDic",label:f.getLocal("btn_restoreDic"),title:f.getLocal("btn_restoreDic"),onClick:function(){var a=this.getDialog(),b=d.scayt,e=n,h=a.getContentElement("dictionaries","dictionaryName").getValue();b.restoreUserDictionary(h,function(c){c.dialog=a;c.error||e.toggleDictionaryButtons.call(a,!0);c.command="restore";
+c.name=h;d.fire("scaytUserDictionaryAction",c)},function(c){c.dialog=a;c.command="restore";c.name=h;d.fire("scaytUserDictionaryActionError",c)})}}]},{type:"hbox",id:"existDic",align:"left",style:"width:auto;",widths:["50%","50%"],children:[{type:"button",id:"removeDic",label:f.getLocal("btn_deleteDic"),title:f.getLocal("btn_deleteDic"),onClick:function(){var a=this.getDialog(),b=d.scayt,e=n,h=a.getContentElement("dictionaries","dictionaryName"),c=h.getValue();b.removeUserDictionary(c,function(b){h.setValue("");
+b.error||e.toggleDictionaryButtons.call(a,!1);b.dialog=a;b.command="remove";b.name=c;d.fire("scaytUserDictionaryAction",b)},function(b){b.dialog=a;b.command="remove";b.name=c;d.fire("scaytUserDictionaryActionError",b)})}},{type:"button",id:"renameDic",label:f.getLocal("btn_renameDic"),title:f.getLocal("btn_renameDic"),onClick:function(){var a=this.getDialog(),b=d.scayt,e=a.getContentElement("dictionaries","dictionaryName").getValue();b.renameUserDictionary(e,function(b){b.dialog=a;b.command="rename";
+b.name=e;d.fire("scaytUserDictionaryAction",b)},function(b){b.dialog=a;b.command="rename";b.name=e;d.fire("scaytUserDictionaryActionError",b)})}}]},{type:"html",id:"dicInfo",html:'\x3cdiv id\x3d"dic_info_editor1" style\x3d"margin:5px auto; width:95%;white-space:normal;"\x3e'+f.getLocal("text_descriptionDic")+"\x3c/div\x3e"}]}]},{id:"about",label:f.getLocal("tab_about"),elements:[{type:"html",id:"about",style:"margin: 5px 5px;",html:'\x3cdiv\x3e\x3cdiv id\x3d"scayt_about_"\x3e'+p+"\x3c/div\x3e\x3c/div\x3e"}]}];
+d.on("scaytUserDictionaryAction",function(a){var b=SCAYT.prototype.UILib,e=a.data.dialog,d=e.getContentElement("dictionaries","dictionaryNote").getElement(),c=a.editor.scayt,g;void 0===a.data.error?(g=c.getLocal("message_success_"+a.data.command+"Dic"),g=g.replace("%s",a.data.name),d.setText(g),b.css(d.$,{color:"blue"})):(""===a.data.name?d.setText(c.getLocal("message_info_emptyDic")):(g=c.getLocal("message_error_"+a.data.command+"Dic"),g=g.replace("%s",a.data.name),d.setText(g)),b.css(d.$,{color:"red"}),
+null!=c.getUserDictionaryName()&&""!=c.getUserDictionaryName()?e.getContentElement("dictionaries","dictionaryName").setValue(c.getUserDictionaryName()):e.getContentElement("dictionaries","dictionaryName").setValue(""))});d.on("scaytUserDictionaryActionError",function(a){var b=SCAYT.prototype.UILib,e=a.data.dialog,d=e.getContentElement("dictionaries","dictionaryNote").getElement(),c=a.editor.scayt,g;""===a.data.name?d.setText(c.getLocal("message_info_emptyDic")):(g=c.getLocal("message_error_"+a.data.command+
+"Dic"),g=g.replace("%s",a.data.name),d.setText(g));b.css(d.$,{color:"red"});null!=c.getUserDictionaryName()&&""!=c.getUserDictionaryName()?e.getContentElement("dictionaries","dictionaryName").setValue(c.getUserDictionaryName()):e.getContentElement("dictionaries","dictionaryName").setValue("")});var n={title:f.getLocal("text_title"),resizable:CKEDITOR.DIALOG_RESIZE_BOTH,minWidth:"moono-lisa"==(CKEDITOR.skinName||d.config.skin)?450:340,minHeight:260,onLoad:function(){if(0!=d.config.scayt_uiTabs[1]){var a=
+n,b=a.getLangBoxes.call(this);b.getParent().setStyle("white-space","normal");a.renderLangList(b);this.definition.minWidth=this.getSize().width;this.resize(this.definition.minWidth,this.definition.minHeight)}},onCancel:function(){l.reset()},onHide:function(){d.unlockSelection()},onShow:function(){d.fire("scaytDialogShown",this);if(0!=d.config.scayt_uiTabs[2]){var a=d.scayt,b=this.getContentElement("dictionaries","dictionaryName"),e=this.getContentElement("dictionaries","existDic").getElement().getParent(),
+h=this.getContentElement("dictionaries","notExistDic").getElement().getParent();e.hide();h.hide();null!=a.getUserDictionaryName()&&""!=a.getUserDictionaryName()?(this.getContentElement("dictionaries","dictionaryName").setValue(a.getUserDictionaryName()),e.show()):(b.setValue(""),h.show())}},onOk:function(){var a=n,b=d.scayt;this.getContentElement("options","scaytOptions");a=a.getChangedOption.call(this);b.commitOption({changedOptions:a})},toggleDictionaryButtons:function(a){var b=this.getContentElement("dictionaries",
+"existDic").getElement().getParent(),d=this.getContentElement("dictionaries","notExistDic").getElement().getParent();a?(b.show(),d.hide()):(b.hide(),d.show())},getChangedOption:function(){var a={};if(1==d.config.scayt_uiTabs[0])for(var b=this.getContentElement("options","scaytOptions").getChild(),e=0;e<b.length;e++)b[e].isChanged()&&(a[b[e].id]=b[e].getValue());l.isChanged()&&(a[l.id]=d.config.scayt_sLang=l.currentLang=l.newLang);return a},buildRadioInputs:function(a,b,e){var h=new CKEDITOR.dom.element("div"),
+c="scaytLang_"+d.name+"_"+b,g=CKEDITOR.dom.element.createFromHtml('\x3cinput id\x3d"'+c+'" type\x3d"radio"  value\x3d"'+b+'" name\x3d"scayt_lang" /\x3e'),f=new CKEDITOR.dom.element("label"),m=d.scayt;h.setStyles({"white-space":"normal",position:"relative","padding-bottom":"2px"});g.on("click",function(a){l.newLang=a.sender.getValue()});f.appendText(a);f.setAttribute("for",c);e&&d.config.grayt_autoStartup&&f.setStyles({color:"#02b620"});h.append(g);h.append(f);b===m.getLang()&&(g.setAttribute("checked",
+!0),g.setAttribute("defaultChecked","defaultChecked"));return h},renderLangList:function(a){var b=a.find("#left-col-"+d.name).getItem(0);a=a.find("#right-col-"+d.name).getItem(0);var e=f.getScaytLangList(),h=f.getGraytLangList(),c={},g=[],l=0,m=!1,k;for(k in e.ltr)c[k]=e.ltr[k];for(k in e.rtl)c[k]=e.rtl[k];for(k in c)g.push([k,c[k]]);g.sort(function(a,b){var c=0;a[1]>b[1]?c=1:a[1]<b[1]&&(c=-1);return c});c={};for(m=0;m<g.length;m++)c[g[m][0]]=g[m][1];g=Math.round(g.length/2);for(k in c)l++,m=k in
+h.ltr||k in h.rtl,this.buildRadioInputs(c[k],k,m).appendTo(l<=g?b:a)},getLangBoxes:function(){return this.getContentElement("langs","langBox").getElement()},contents:function(a,b){var d=[],f=b.config.scayt_uiTabs;if(f){for(var c in f)1==f[c]&&d.push(a[c]);d.push(a[a.length-1])}else return a;return d}(p,d)};return n});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/skins/moono-lisa/scayt.css b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/skins/moono-lisa/scayt.css
new file mode 100644
index 00000000000..00b2439a310
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/skins/moono-lisa/scayt.css
@@ -0,0 +1,20 @@
+.scayt-lang-list > div
+{
+    padding-bottom: 6px !important;
+}
+
+.scayt-lang-list > div input
+{
+    margin-right: 4px;
+}
+
+#scayt_about_
+{
+    width: 190px;
+    margin: 30px auto 0 auto;
+}
+
+.cke_dialog_contents_body div[name=dictionaries] .cke_dialog_ui_hbox_last > a.cke_dialog_ui_button
+{
+    margin-top: 0;
+}
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
index 64635c4b892..841d789d527 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("smiley",function(f){for(var e=f.config,a=f.lang.smiley,h=e.smiley_images,g=e.smiley_columns||8,k,m=function(l){var c=l.data.getTarget(),b=c.getName();if("a"==b)c=c.getChild(0);else if("img"!=b)return;var b=c.getAttribute("cke_src"),a=c.getAttribute("title"),c=f.document.createElement("img",{attributes:{src:b,"data-cke-saved-src":b,title:a,alt:a,width:c.$.width,height:c.$.height}});f.insertElement(c);k.hide();l.data.preventDefault()},q=CKEDITOR.tools.addFunction(function(a,c){a=
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
index 1b0d421deed..58f21b07c0a 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 
 cs.js      Found: 118 Missing: 0
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js
index 41780d2904e..4203e53ed46 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","af",{euro:"Euroteken",lsquo:"Linker enkelkwotasie",rsquo:"Regter enkelkwotasie",ldquo:"Linker dubbelkwotasie",rdquo:"Regter dubbelkwotasie",ndash:"Kortkoppelteken",mdash:"Langkoppelteken",iexcl:"Omgekeerdeuitroepteken",cent:"Centteken",pound:"Pondteken",curren:"Geldeenheidteken",yen:"Yenteken",brvbar:"Gebreekte balk",sect:"Afdeelingsteken",uml:"Deelteken",copy:"Kopieregteken",ordf:"Vroulikekenteken",laquo:"Linkgeoorienteerde aanhaalingsteken",not:"Verbodeteken",
 reg:"Regestrasieteken",macr:"Lengteteken",deg:"Gradeteken",sup2:"Kwadraatteken",sup3:"Kubiekteken",acute:"Akuutaksentteken",micro:"Mikroteken",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
index cdd1c9034ad..0b2a258c3f0 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ar",{euro:"رمز اليورو",lsquo:"علامة تنصيص فردية علي اليسار",rsquo:"علامة تنصيص فردية علي اليمين",ldquo:"علامة تنصيص مزدوجة علي اليسار",rdquo:"علامة تنصيص مزدوجة علي اليمين",ndash:"En dash",mdash:"Em dash",iexcl:"علامة تعجب مقلوبة",cent:"رمز السنت",pound:"رمز الاسترليني",curren:"رمز العملة",yen:"رمز الين",brvbar:"شريط مقطوع",sect:"رمز القسم",uml:"Diaeresis",copy:"علامة حقوق الطبع",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"ليست علامة",reg:"علامة مسجّلة",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"علامة الإستفهام غير صحيحة",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/az.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/az.js
new file mode 100644
index 00000000000..0639af112e5
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/az.js
@@ -0,0 +1,10 @@
+/*
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang("specialchar","az",{euro:"Avropa valyuta işarəsi",lsquo:"Sol tək dırnaq işarəsi",rsquo:"Sağ tək dırnaq işarəsi",ldquo:"Sol cüt dırnaq işarəsi",rdquo:"Sağ cüt dırnaq işarəsi",ndash:"Çıxma işarəsi",mdash:"Tire",iexcl:"Çevrilmiş nida işarəsi",cent:"Sent işarəsi",pound:"Funt sterlinq işarəsi",curren:"Valyuta işarəsi",yen:"İena işarəsi",brvbar:"Sınmış zolaq",sect:"Paraqraf işarəsi",uml:"Umlyaut",copy:"Müəllif hüquqları haqqında işarəsi",ordf:"Qadın sıra indikatoru (a)",laquo:"Sola göstərən cüt bucaqlı dırnaq",
+not:"QEYRİ işarəsi",reg:"Qeyd olunmuş işarəsi",macr:"Makron",deg:"Dərəcə işarəsi",sup2:"Yuxarı indeks 2",sup3:"Yuxarı indeks 3",acute:"Vurğu işarəsi",micro:"Mikro işarəsi",para:"Abzas işarəsi",middot:"Orta nöqtə",cedil:"Tsedilla işarəsi",sup1:"Yuxarı indeks 1",ordm:"Kişi say indikatoru (o)",raquo:"Sağa göstərən cüt bucaqlı dırnaq",frac14:"Dörddə bir hissə kəsri",frac12:"Bir yarım kəsri",frac34:"Dörddə üç hissə kəsri",iquest:"Çevrilmiş sual işarəsi",Agrave:"Soldan vurğu ilə A",Aacute:"Vurğu ilə A",
+Acirc:"Dam işarəsi ilə A",Atilde:"Tilda işarəsi ilə A",Auml:"Umlyaut ilə A",Aring:"Dairəli A",AElig:"Æ hərfi",Ccedil:"Tsedilla ilə C",Egrave:"Soldan vurğu ilə E",Eacute:"Vurğu ilə E",Ecirc:"Dam işarəsi ilə E",Euml:"Umlyaut ilə E",Igrave:"Soldan vurğu ilə I",Iacute:"Vurğu ilə I",Icirc:"Dam işarəsi ilə I",Iuml:"Umlyaut ilə I",ETH:"Eth latin hərfi",Ntilde:"Tilda işarəsi ilə N",Ograve:"Soldan vurğu ilə O",Oacute:"Vurğu ilə O",Ocirc:"Dam işarəsi ilə E",Otilde:"Tilda işarəsi ilə O",Ouml:"Umlyaut ilə O",
+times:"Vurma işarəsi",Oslash:"Üstxəttli O",Ugrave:"Soldan vurğu ilə U",Uacute:"Vurğu ilə U",Ucirc:"Dam işarəsi ilə U",Uuml:"Umlyaut ilə U",Yacute:"Vurğu ilə Y",THORN:"Thorn hərfi",szlig:"İti s kiçik hərfi",agrave:"Soldan vurğu ilə a",aacute:"Vurğu ilə a",acirc:"Dam işarəsi ilə a",atilde:"Tilda işarəsi ilə a",auml:"Umlyaut ilə a",aring:"Dairəli a",aelig:"æ hərfi",ccedil:"ç hərfi",egrave:"Soldan vurğu ilə e",eacute:"Vurğu ilə e",ecirc:"Dam işarəsi ilə e",euml:"Umlyaut ilə e",igrave:"Soldan vurğu ilə i",
+iacute:"Vurğu ilə i",icirc:"Dam işarəsi ilə i",iuml:"Umlyaut ilə i",eth:"eth kiçik hərfi",ntilde:"Tilda işarəsi ilə n",ograve:"Soldan vurğu ilə o",oacute:"Vurğu ilə o",ocirc:"Dam işarəsi ilə o",otilde:"Tilda işarəsi ilə o",ouml:"Umlyaut ilə o",divide:"Bölünmə işarəsi",oslash:"Üstxəttli o",ugrave:"Soldan vurğu ilə u",uacute:"Vurğu ilə u",ucirc:"Dam işarəsi ilə u",uuml:"Umlyaut ilə u",yacute:"Vurğu ilə y",thorn:"Thorn kiçik hərfi",yuml:"Umlyaut ilə y",OElig:"OE ligaturası",oelig:"oe ligaturası",372:"Dam işarəsi ilə W",
+374:"Dam işarəsi ilə Y",373:"Dam işarəsi ilə w",375:"Dam işarəsi ilə y",sbquo:"Aşağı dırnaq",8219:"Tək yuxarı çevrilmiş dırnaq",bdquo:"Aşağı cütlü dırnaqlar",hellip:"Üfüqi ellips",trade:"Əmtəə nişanı",9658:"Sağa göstərici",bull:"Marker",rarr:"Sağa istiqamətləndirən ox",rArr:"Sağa istiqamətləndirən cütlü ox",hArr:"Hərtərəfli ox",diams:"Qara kərpic",asymp:"Təxmini barabər"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
index 3406b35dca3..0ffe116433d 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","bg",{euro:"Евро знак",lsquo:"Лява маркировка за цитат",rsquo:"Дясна маркировка за цитат",ldquo:"Лява двойна кавичка за цитат",rdquo:"Дясна двойна кавичка за цитат",ndash:"\\\\",mdash:"/",iexcl:"Обърната питанка",cent:"Знак за цент",pound:"Знак за паунд",curren:"Валутен знак",yen:"Знак за йена",brvbar:"Прекъсната линия",sect:"Знак за секция",uml:"Diaeresis",copy:"Знак за Copyright",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Not sign",reg:"Registered sign",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
index a872189118b..2e5c266b15c 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ca",{euro:"Símbol d'euro",lsquo:"Signe de cometa simple esquerra",rsquo:"Signe de cometa simple dreta",ldquo:"Signe de cometa doble esquerra",rdquo:"Signe de cometa doble dreta",ndash:"Guió",mdash:"Guió baix",iexcl:"Signe d'exclamació inversa",cent:"Símbol de percentatge",pound:"Símbol de lliura",curren:"Símbol de moneda",yen:"Símbol de Yen",brvbar:"Barra trencada",sect:"Símbol de secció",uml:"Dièresi",copy:"Símbol de Copyright",ordf:"Indicador ordinal femení",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
index 1d98c29f862..eaae5bd723a 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","cs",{euro:"Znak eura",lsquo:"Počáteční uvozovka jednoduchá",rsquo:"Koncová uvozovka jednoduchá",ldquo:"Počáteční uvozovka dvojitá",rdquo:"Koncová uvozovka dvojitá",ndash:"En pomlčka",mdash:"Em pomlčka",iexcl:"Obrácený vykřičník",cent:"Znak centu",pound:"Znak libry",curren:"Znak měny",yen:"Znak jenu",brvbar:"Přerušená svislá čára",sect:"Znak oddílu",uml:"Přehláska",copy:"Znak copyrightu",ordf:"Ženský indikátor rodu",laquo:"Znak dvojitých lomených uvozovek vlevo",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
index 1ceb05b2ad0..630ae3190fb 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","cy",{euro:"Arwydd yr Ewro",lsquo:"Dyfynnod chwith unigol",rsquo:"Dyfynnod dde unigol",ldquo:"Dyfynnod chwith dwbl",rdquo:"Dyfynnod dde dwbl",ndash:"Cysylltnod en",mdash:"Cysylltnod em",iexcl:"Ebychnod gwrthdro",cent:"Arwydd sent",pound:"Arwydd punt",curren:"Arwydd arian cyfred",yen:"Arwydd yen",brvbar:"Bar toriedig",sect:"Arwydd adran",uml:"Didolnod",copy:"Arwydd hawlfraint",ordf:"Dangosydd benywaidd",laquo:"Dyfynnod dwbl ar ongl i'r chwith",not:"Arwydd Nid",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js
index 7b26e4c30a7..10e47c39235 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","da",{euro:"Euro-tegn",lsquo:"Venstre enkelt anførselstegn",rsquo:"Højre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Højre dobbelt anførselstegn",ndash:"Bindestreg",mdash:"Tankestreg",iexcl:"Omvendt udråbstegn",cent:"Cent-tegn",pound:"Pund-tegn",curren:"Kurs-tegn",yen:"Yen-tegn",brvbar:"Brudt streg",sect:"Paragraftegn",uml:"Umlaut",copy:"Copyright-tegn",ordf:"Feminin ordinal indikator",laquo:"Venstre dobbel citations-vinkel",not:"Negation",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
index 60673f088d7..e4e5907f9ff 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","de-ch",{euro:"Euro Zeichen",lsquo:"Hochkomma links",rsquo:"Hochkomma rechts",ldquo:"Anführungszeichen links",rdquo:"Anführungszeichen rechts",ndash:"Kleiner Strich",mdash:"Mittlerer Strich",iexcl:"Invertiertes Ausrufezeichen",cent:"Cent-Zeichen",pound:"Pfund-Zeichen",curren:"Währungszeichen",yen:"Yen",brvbar:"Gestrichelte Linie",sect:"Paragrafenzeichen",uml:"Diäresis",copy:"Copyright-Zeichen",ordf:"Feminine ordinal Anzeige",laquo:"Nach links zeigenden Doppel-Winkel Anführungszeichen",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js
index 2f67f0c1106..427639713d2 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","de",{euro:"Euro Zeichen",lsquo:"Hochkomma links",rsquo:"Hochkomma rechts",ldquo:"Anführungszeichen links",rdquo:"Anführungszeichen rechts",ndash:"Kleiner Strich",mdash:"Mittlerer Strich",iexcl:"Invertiertes Ausrufezeichen",cent:"Cent-Zeichen",pound:"Pfund-Zeichen",curren:"Währungszeichen",yen:"Yen",brvbar:"Gestrichelte Linie",sect:"Paragrafenzeichen",uml:"Diäresis",copy:"Copyright-Zeichen",ordf:"Feminine ordinal Anzeige",laquo:"Nach links zeigenden Doppel-Winkel Anführungszeichen",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js
index c27777e8f31..dc1d28a886e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","el",{euro:"Σύμβολο Ευρώ",lsquo:"Αριστερός χαρακτήρας μονού εισαγωγικού",rsquo:"Δεξιός χαρακτήρας μονού εισαγωγικού",ldquo:"Αριστερός χαρακτήρας ευθύγραμμων εισαγωγικών",rdquo:"Δεξιός χαρακτήρας ευθύγραμμων εισαγωγικών",ndash:"Παύλα en",mdash:"Παύλα em",iexcl:"Ανάποδο θαυμαστικό",cent:"Σύμβολο σεντ",pound:"Σύμβολο λίρας",curren:"Σύμβολο συναλλαγματικής μονάδας",yen:"Σύμβολο Γιεν",brvbar:"Σπασμένη μπάρα",sect:"Σύμβολο τμήματος",uml:"Διαίρεση",copy:"Σύμβολο πνευματικών δικαιωμάτων",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
index e0128d6a2b9..ff73fe863e2 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","en-gb",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
index d89d46d3b68..361a6858bbf 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","en",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Not sign",reg:"Registered sign",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
index 4c173404687..5f4fa9de337 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","eo",{euro:"Eŭrosigno",lsquo:"Supra 6-citilo",rsquo:"Supra 9-citilo",ldquo:"Supra 66-citilo",rdquo:"Supra 99-citilo",ndash:"Streketo",mdash:"Substreko",iexcl:"Renversita krisigno",cent:"Cendosigno",pound:"Pundosigno",curren:"Monersigno",yen:"Enosigno",brvbar:"Rompita vertikala streko",sect:"Kurba paragrafo",uml:"Tremao",copy:"Kopirajtosigno",ordf:"Adjektiva numerfinaĵo",laquo:"Duobla malplio-citilo",not:"Negohoko",reg:"Registrita marko",macr:"Superstreko",deg:"Gradosigno",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js
index 875b6448f62..dd395e54aed 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","es",{euro:"Símbolo de euro",lsquo:"Comilla simple izquierda",rsquo:"Comilla simple derecha",ldquo:"Comilla doble izquierda",rdquo:"Comilla doble derecha",ndash:"Guión corto",mdash:"Guión medio largo",iexcl:"Signo de admiración invertido",cent:"Símbolo centavo",pound:"Símbolo libra",curren:"Símbolo moneda",yen:"Símbolo yen",brvbar:"Barra vertical rota",sect:"Símbolo sección",uml:"Diéresis",copy:"Signo de derechos de autor",ordf:"Indicador ordinal femenino",laquo:"Abre comillas angulares",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js
index ca6f8808732..b7a2e1f02a7 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","et",{euro:"Euromärk",lsquo:"Alustav ühekordne jutumärk",rsquo:"Lõpetav ühekordne jutumärk",ldquo:"Alustav kahekordne jutumärk",rdquo:"Lõpetav kahekordne jutumärk",ndash:"Enn-kriips",mdash:"Emm-kriips",iexcl:"Pööratud hüüumärk",cent:"Sendimärk",pound:"Naela märk",curren:"Valuutamärk",yen:"Jeeni märk",brvbar:"Katkestatud kriips",sect:"Lõigu märk",uml:"Täpid",copy:"Autoriõiguse märk",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Ei-märk",reg:"Registered sign",macr:"Macron",deg:"Kraadimärk",sup2:"Ülaindeks kaks",sup3:"Ülaindeks kolm",acute:"Acute accent",micro:"Mikro-märk",para:"Pilcrow sign",middot:"Keskpunkt",cedil:"Cedilla",sup1:"Ülaindeks üks",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Ladina suur A tildega",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Ladina suur A tildega",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Täppidega ladina suur O",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Kandilise katusega suur ladina U",Uuml:"Täppidega ladina suur U",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Ladina väike terav s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Kandilise katusega ladina väike a",atilde:"Tildega ladina väike a",auml:"Täppidega ladina väike a",aring:"Latin small letter a with ring above",
 aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",ntilde:"Latin small letter n with tilde",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
index d1161bed8f8..26ac3d8ab15 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
@@ -1,13 +1,13 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.plugins.setLang("specialchar","eu",{euro:"Euro zeinua",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
+CKEDITOR.plugins.setLang("specialchar","eu",{euro:"Euro zeinua",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Libera zeinua",curren:"Currency sign",yen:"Yen zeinua",brvbar:"Broken bar",sect:"Section sign",uml:"Dieresia",copy:"Copyright zeinua",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Ez zeinua",reg:"Registered sign",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
-Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Bider zeinua",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
 ntilde:"Latin small letter n with tilde",ograve:"Latin small letter o with grave accent",oacute:"Latin small letter o with acute accent",ocirc:"Latin small letter o with circumflex",otilde:"Latin small letter o with tilde",ouml:"Latin small letter o with diaeresis",divide:"Division sign",oslash:"Latin small letter o with stroke",ugrave:"Latin small letter u with grave accent",uacute:"Latin small letter u with acute accent",ucirc:"Latin small letter u with circumflex",uuml:"Latin small letter u with diaeresis",
 yacute:"Latin small letter y with acute accent",thorn:"Latin small letter thorn",yuml:"Latin small letter y with diaeresis",OElig:"Latin capital ligature OE",oelig:"Latin small ligature oe",372:"Latin capital letter W with circumflex",374:"Latin capital letter Y with circumflex",373:"Latin small letter w with circumflex",375:"Latin small letter y with circumflex",sbquo:"Single low-9 quotation mark",8219:"Single high-reversed-9 quotation mark",bdquo:"Double low-9 quotation mark",hellip:"Horizontal ellipsis",
-trade:"Trade mark sign",9658:"Black right-pointing pointer",bull:"Bullet",rarr:"Rightwards arrow",rArr:"Rightwards double arrow",hArr:"Left right double arrow",diams:"Black diamond suit",asymp:"Almost equal to"});
\ No newline at end of file
+trade:"Trade mark sign",9658:"Black right-pointing pointer",bull:"Buleta",rarr:"Rightwards arrow",rArr:"Rightwards double arrow",hArr:"Left right double arrow",diams:"Black diamond suit",asymp:"Almost equal to"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
index 6351d73ced2..5028d03a195 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","fa",{euro:"نشان یورو",lsquo:"علامت نقل قول تکی چپ",rsquo:"علامت نقل قول تکی راست",ldquo:"علامت نقل قول دوتایی چپ",rdquo:"علامت نقل قول دوتایی راست",ndash:"خط تیره En",mdash:"خط تیره Em",iexcl:"علامت تعجب وارونه",cent:"نشان سنت",pound:"نشان پوند",curren:"نشان ارز",yen:"نشان ین",brvbar:"نوار شکسته",sect:"نشان بخش",uml:"نشان سواگیری",copy:"نشان کپی رایت",ordf:"شاخص ترتیبی مونث",laquo:"اشاره چپ مکرر برای زاویه علامت نقل قول",not:"نشان ثبت نشده",reg:"نشان ثبت شده",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
index 7132cd197ae..af6f9105b43 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","fi",{euro:"Euron merkki",lsquo:"Vasen yksittäinen lainausmerkki",rsquo:"Oikea yksittäinen lainausmerkki",ldquo:"Vasen kaksoislainausmerkki",rdquo:"Oikea kaksoislainausmerkki",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Sentin merkki",pound:"Punnan merkki",curren:"Valuuttamerkki",yen:"Yenin merkki",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Not sign",reg:"Rekisteröity merkki",macr:"Macron",deg:"Asteen merkki",sup2:"Yläindeksi kaksi",sup3:"Yläindeksi kolme",acute:"Acute accent",micro:"Mikron merkki",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Yläindeksi yksi",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Ylösalaisin oleva kysymysmerkki",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Kertomerkki",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
index 326a6e5c6e7..5cda5e8b7f5 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","fr-ca",{euro:"Symbole Euro",lsquo:"Guillemet simple ouvrant",rsquo:"Guillemet simple fermant",ldquo:"Guillemet double ouvrant",rdquo:"Guillemet double fermant",ndash:"Tiret haut",mdash:"Tiret",iexcl:"Point d'exclamation inversé",cent:"Symbole de cent",pound:"Symbole de Livre Sterling",curren:"Symbole monétaire",yen:"Symbole du Yen",brvbar:"Barre scindée",sect:"Symbole de section",uml:"Tréma",copy:"Symbole de copyright",ordf:"Indicateur ordinal féminin",laquo:"Guillemet français ouvrant",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
index e84fa1396a0..88a63431b87 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
@@ -1,11 +1,12 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.plugins.setLang("specialchar","fr",{euro:"Symbole Euro",lsquo:"Guillemet simple ouvrant",rsquo:"Guillemet simple fermant",ldquo:"Guillemet double ouvrant",rdquo:"Guillemet double fermant",ndash:"Tiret haut",mdash:"Tiret cadratin",iexcl:"Point d'exclamation inversé",cent:"Symbole Cent",pound:"Symbole Livre Sterling",curren:"Symbole monétaire",yen:"Symbole Yen",brvbar:"Barre verticale scindée",sect:"Section",uml:"Tréma",copy:"Symbole Copyright",ordf:"Indicateur ordinal féminin",laquo:"Guillemet français ouvrant",
-not:"Crochet de négation",reg:"Marque déposée",macr:"Macron",deg:"Degré",sup2:"Exposant 2",sup3:"Exposant 3",acute:"Accent aigu",micro:"Omicron",para:"Paragraphe",middot:"Point médian",cedil:"Cédille",sup1:"Exposant 1",ordm:"Indicateur ordinal masculin",raquo:"Guillemet français fermant",frac14:"Un quart",frac12:"Un demi",frac34:"Trois quarts",iquest:"Point d'interrogation inversé",Agrave:"A majuscule accent grave",Aacute:"A majuscule accent aigu",Acirc:"A majuscule accent circonflexe",Atilde:"A majuscule avec caron",
-Auml:"A majuscule tréma",Aring:"A majuscule avec un rond au-dessus",AElig:"Æ majuscule ligaturés",Ccedil:"C majuscule cédille",Egrave:"E majuscule accent grave",Eacute:"E majuscule accent aigu",Ecirc:"E majuscule accent circonflexe",Euml:"E majuscule tréma",Igrave:"I majuscule accent grave",Iacute:"I majuscule accent aigu",Icirc:"I majuscule accent circonflexe",Iuml:"I majuscule tréma",ETH:"Lettre majuscule islandaise ED",Ntilde:"N majuscule avec caron",Ograve:"O majuscule accent grave",Oacute:"O majuscule accent aigu",
-Ocirc:"O majuscule accent circonflexe",Otilde:"O majuscule avec caron",Ouml:"O majuscule tréma",times:"Multiplication",Oslash:"O majuscule barré",Ugrave:"U majuscule accent grave",Uacute:"U majuscule accent aigu",Ucirc:"U majuscule accent circonflexe",Uuml:"U majuscule tréma",Yacute:"Y majuscule accent aigu",THORN:"Lettre islandaise Thorn majuscule",szlig:"Lettre minuscule allemande s dur",agrave:"a minuscule accent grave",aacute:"a minuscule accent aigu",acirc:"a minuscule accent circonflexe",atilde:"a minuscule avec caron",
-auml:"a minuscule tréma",aring:"a minuscule avec un rond au-dessus",aelig:"æ minuscule ligaturés",ccedil:"c minuscule cédille",egrave:"e minuscule accent grave",eacute:"e minuscule accent aigu",ecirc:"e minuscule accent circonflexe",euml:"e minuscule tréma",igrave:"i minuscule accent grave",iacute:"i minuscule accent aigu",icirc:"i minuscule accent circonflexe",iuml:"i minuscule tréma",eth:"Lettre minuscule islandaise ED",ntilde:"n minuscule avec caron",ograve:"o minuscule accent grave",oacute:"o minuscule accent aigu",
-ocirc:"o minuscule accent circonflexe",otilde:"o minuscule avec caron",ouml:"o minuscule tréma",divide:"Division",oslash:"o minuscule barré",ugrave:"u minuscule accent grave",uacute:"u minuscule accent aigu",ucirc:"u minuscule accent circonflexe",uuml:"u minuscule tréma",yacute:"y minuscule accent aigu",thorn:"Lettre islandaise thorn minuscule",yuml:"y minuscule tréma",OElig:"ligature majuscule latine Œ",oelig:"ligature minuscule latine œ",372:"W majuscule accent circonflexe",374:"Y majuscule accent circonflexe",
-373:"w minuscule accent circonflexe",375:"y minuscule accent circonflexe",sbquo:"Guillemet simple fermant (anglais)",8219:"Guillemet-virgule supérieur culbuté",bdquo:"Guillemet-virgule double inférieur",hellip:"Points de suspension",trade:"Marque commerciale (trade mark)",9658:"Flèche noire pointant vers la droite",bull:"Gros point médian",rarr:"Flèche vers la droite",rArr:"Double flèche vers la droite",hArr:"Double flèche vers la gauche",diams:"Carreau noir",asymp:"Presque égal"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("specialchar","fr",{euro:"Symbole euro",lsquo:"Guillemet simple ouvrant",rsquo:"Guillemet simple fermant",ldquo:"Guillemet double ouvrant",rdquo:"Guillemet double fermant",ndash:"Tiret demi-cadratin",mdash:"Tiret cadratin",iexcl:"Point d'exclamation inversé",cent:"Symbole cent",pound:"Symbole Livre sterling",curren:"Symbole monétaire",yen:"Symbole yen",brvbar:"Barre verticale scindée",sect:"Signe de section",uml:"Tréma",copy:"Symbole Copyright",ordf:"Indicateur ordinal féminin",
+laquo:"Guillemet français ouvrant",not:"Crochet de négation",reg:"Symbole de marque déposée",macr:"Macron",deg:"Symbole degré",sup2:"Exposant 2",sup3:"Exposant 3",acute:"Accent aigu",micro:"Symbole micro",para:"Symbole pied-de-mouche",middot:"Point médian",cedil:"Cédille",sup1:"Exposant 1",ordm:"Indicateur ordinal masculin",raquo:"Guillemet français fermant",frac14:"Fraction un quart",frac12:"Fraction un demi",frac34:"Fraction trois quarts",iquest:"Point d'interrogation inversé",Agrave:"A accent grave majuscule",
+Aacute:"A accent aigu majuscule",Acirc:"A accent circonflexe majuscule",Atilde:"A caron majuscule",Auml:"A tréma majuscule",Aring:"A rond majuscule",AElig:"Ligature Æ majuscule",Ccedil:"C cédille majuscule",Egrave:"E accent grave majuscule",Eacute:"E accent aigu majuscule",Ecirc:"E accent circonflexe majuscule",Euml:"E tréma majuscule",Igrave:"I accent grave majuscule",Iacute:"I accent aigu majuscule",Icirc:"I accent circonflexe majuscule",Iuml:"I tréma majuscule",ETH:"Lettre majuscule islandaise ED",
+Ntilde:"N caron majuscule",Ograve:"O accent grave majuscule",Oacute:"O accent aigu majuscule",Ocirc:"O accent circonflexe majuscule",Otilde:"O caron majuscule",Ouml:"O tréma majuscule",times:"Symbole de multiplication",Oslash:"O barré majuscule",Ugrave:"U accent grave majuscule",Uacute:"U accent aigu majuscule",Ucirc:"U accent circonflexe majuscule",Uuml:"U tréma majuscule",Yacute:"Y accent aigu majuscule",THORN:"Lettre islandaise thorn majuscule",szlig:"Lettre minuscule allemande S dur",agrave:"A accent grave minuscule",
+aacute:"A accent aigu minuscule",acirc:"A accent circonflexe minuscule",atilde:"A tilde minuscule",auml:"A tréma minuscule",aring:"A rond minuscule",aelig:"Ligature Æ minuscule",ccedil:"C cédille minuscule",egrave:"E accent grave minuscule",eacute:"E accent aigu minuscule",ecirc:"E accent circonflexe minuscule",euml:"E tréma minuscule",igrave:"I accent grave minuscule",iacute:"I accent aigu minuscule",icirc:"I accent circonflexe minuscule",iuml:"i minuscule tréma",eth:"Lettre minuscule islandaise ED",
+ntilde:"N caron minuscule",ograve:"O minuscule accent grave",oacute:"O accent aigu minuscule",ocirc:"O accent circonflexe minuscule",otilde:"O tilde minuscule",ouml:"O tréma minuscule",divide:"Symbole de division",oslash:"O barré minuscule",ugrave:"U accent grave minuscule",uacute:"U accent aigu minuscule",ucirc:"U accent circonflexe minuscule",uuml:"U tréma minuscule",yacute:"Y accent aigu minuscule",thorn:"Lettre islandaise thorn minuscule",yuml:"Y tréma minuscule",OElig:"Ligature Œ majuscule",
+oelig:"Ligature Œ minuscule",372:"W accent circonflexe majuscule",374:"Y accent circonflexe majuscule",373:"W accent circonflexe minuscule",375:"Y accent circonflexe minuscule",sbquo:"Guillemet simple fermant inférieur",8219:"Guillemet-virgule supérieur culbuté",bdquo:"Guillemet-virgule double inférieur",hellip:"Points de suspension",trade:"Symbole de marque commerciale",9658:"Flèche noire pointant vers la droite",bull:"Gros point médian",rarr:"Flèche vers la droite",rArr:"Double flèche vers la droite",
+hArr:"Double flèche vers la gauche",diams:"Losange noir",asymp:"Environ égal"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
index 6a31fdcfcba..ef2a19398d7 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","gl",{euro:"Símbolo do euro",lsquo:"Comiña simple esquerda",rsquo:"Comiña simple dereita",ldquo:"Comiñas dobres esquerda",rdquo:"Comiñas dobres dereita",ndash:"Guión",mdash:"Raia",iexcl:"Signo de admiración invertido",cent:"Símbolo do centavo",pound:"Símbolo da libra",curren:"Símbolo de moeda",yen:"Símbolo do yen",brvbar:"Barra vertical rota",sect:"Símbolo de sección",uml:"Diérese",copy:"Símbolo de dereitos de autoría",ordf:"Indicador ordinal feminino",laquo:"Comiñas latinas, apertura",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js
index 5fabd82d5f4..2d6d956b29e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","he",{euro:"יורו",lsquo:"סימן ציטוט יחיד שמאלי",rsquo:"סימן ציטוט יחיד ימני",ldquo:"סימן ציטוט כפול שמאלי",rdquo:"סימן ציטוט כפול ימני",ndash:"קו מפריד קצר",mdash:"קו מפריד ארוך",iexcl:"סימן קריאה הפוך",cent:"סנט",pound:"פאונד",curren:"מטבע",yen:"ין",brvbar:"קו שבור",sect:"סימן מקטע",uml:"שתי נקודות אופקיות (Diaeresis)",copy:"סימן זכויות יוצרים (Copyright)",ordf:"סימן אורדינאלי נקבי",laquo:"סימן ציטוט זווית כפולה לשמאל",not:"סימן שלילה מתמטי",reg:"סימן רשום",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
index 41dfd8ffbce..8b0d52975e4 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","hr",{euro:"Euro znak",lsquo:"Lijevi jednostruki navodnik",rsquo:"Desni jednostruki navodnik",ldquo:"Lijevi dvostruki navodnik",rdquo:"Desni dvostruki navodnik",ndash:"En crtica",mdash:"Em crtica",iexcl:"Naopaki uskličnik",cent:"Cent znak",pound:"Funta znak",curren:"Znak valute",yen:"Yen znak",brvbar:"Potrgana prečka",sect:"Znak odjeljka",uml:"Prijeglasi",copy:"Copyright znak",ordf:"Feminine ordinal indicator",laquo:"Lijevi dvostruki uglati navodnik",not:"Not znak",
 reg:"Registered znak",macr:"Macron",deg:"Stupanj znak",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Mikro znak",para:"Pilcrow sign",middot:"Srednja točka",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Desni dvostruku uglati navodnik",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Naopaki upitnik",Agrave:"Veliko latinsko slovo A s akcentom",Aacute:"Latinično veliko slovo A sa oštrim naglaskom",
-Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent",
+Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent",
 Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",Ugrave:"Latin capital letter U with grave accent",
 Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",aring:"Latin small letter a with ring above",
 aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",ntilde:"Latin small letter n with tilde",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
index fd56ab131b0..944721f4ac6 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","hu",{euro:"Euró jel",lsquo:"Bal szimpla idézőjel",rsquo:"Jobb szimpla idézőjel",ldquo:"Bal dupla idézőjel",rdquo:"Jobb dupla idézőjel",ndash:"Rövid gondolatjel",mdash:"Hosszú gondolatjel",iexcl:"Fordított felkiáltójel",cent:"Cent jel",pound:"Font jel",curren:"Valuta jel",yen:"Yen jel",brvbar:"Hosszú kettőspont",sect:"Paragrafus jel",uml:"Kettős hangzó jel",copy:"Szerzői jog jel",ordf:"Női sorrend mutatója",laquo:"Balra mutató duplanyíl",not:"Feltételes kötőjel",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js
index 45803cae55f..35ccd46a367 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","id",{euro:"Tanda Euro",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Tanda Yen",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Tanda Hak Cipta",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Not sign",reg:"Tanda Telah Terdaftar",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js
index ca36dc201b2..ef772b983f9 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","it",{euro:"Simbolo Euro",lsquo:"Virgoletta singola sinistra",rsquo:"Virgoletta singola destra",ldquo:"Virgolette aperte",rdquo:"Virgolette chiuse",ndash:"Trattino",mdash:"Trattino lungo",iexcl:"Punto esclavamativo invertito",cent:"Simbolo Cent",pound:"Simbolo Sterlina",curren:"Simbolo Moneta",yen:"Simbolo Yen",brvbar:"Barra interrotta",sect:"Simbolo di sezione",uml:"Dieresi",copy:"Simbolo Copyright",ordf:"Indicatore ordinale femminile",laquo:"Virgolette basse aperte",
 not:"Nessun segno",reg:"Simbolo Registrato",macr:"Macron",deg:"Simbolo Grado",sup2:"Apice Due",sup3:"Apice Tre",acute:"Accento acuto",micro:"Simbolo Micro",para:"Simbolo Paragrafo",middot:"Punto centrale",cedil:"Cediglia",sup1:"Apice Uno",ordm:"Indicatore ordinale maschile",raquo:"Virgolette basse chiuse",frac14:"Frazione volgare un quarto",frac12:"Frazione volgare un mezzo",frac34:"Frazione volgare tre quarti",iquest:"Punto interrogativo invertito",Agrave:"Lettera maiuscola latina A con accento grave",
-Aacute:"Lettera maiuscola latina A con accento acuto",Acirc:"Lettera maiuscola latina A con accento circonflesso",Atilde:"Lettera maiuscola latina A con tilde",Auml:"Lettera maiuscola latina A con dieresi",Aring:"Lettera maiuscola latina A con anello sopra",AElig:"Lettera maiuscola latina AE",Ccedil:"Lettera maiuscola latina C con cediglia",Egrave:"Lettera maiuscola latina E con accento grave",Eacute:"Lettera maiuscola latina E con accento acuto",Ecirc:"Lettera maiuscola latina E con accento circonflesso",
+Aacute:"Lettera maiuscola latina A con accento acuto",Acirc:"Lettera maiuscola latina A con accento circonflesso",Atilde:"Lettera maiuscola latina A con tilde",Auml:"Lettera maiuscola latina A con dieresi",Aring:"Lettera maiuscola latina A con anello sopra",AElig:"Lettera maiuscola latina Æ",Ccedil:"Lettera maiuscola latina C con cediglia",Egrave:"Lettera maiuscola latina E con accento grave",Eacute:"Lettera maiuscola latina E con accento acuto",Ecirc:"Lettera maiuscola latina E con accento circonflesso",
 Euml:"Lettera maiuscola latina E con dieresi",Igrave:"Lettera maiuscola latina I con accento grave",Iacute:"Lettera maiuscola latina I con accento acuto",Icirc:"Lettera maiuscola latina I con accento circonflesso",Iuml:"Lettera maiuscola latina I con dieresi",ETH:"Lettera maiuscola latina Eth",Ntilde:"Lettera maiuscola latina N con tilde",Ograve:"Lettera maiuscola latina O con accento grave",Oacute:"Lettera maiuscola latina O con accento acuto",Ocirc:"Lettera maiuscola latina O con accento circonflesso",
 Otilde:"Lettera maiuscola latina O con tilde",Ouml:"Lettera maiuscola latina O con dieresi",times:"Simbolo di moltiplicazione",Oslash:"Lettera maiuscola latina O barrata",Ugrave:"Lettera maiuscola latina U con accento grave",Uacute:"Lettera maiuscola latina U con accento acuto",Ucirc:"Lettera maiuscola latina U con accento circonflesso",Uuml:"Lettera maiuscola latina U con accento circonflesso",Yacute:"Lettera maiuscola latina Y con accento acuto",THORN:"Lettera maiuscola latina Thorn",szlig:"Lettera latina minuscola doppia S",
 agrave:"Lettera minuscola latina a con accento grave",aacute:"Lettera minuscola latina a con accento acuto",acirc:"Lettera minuscola latina a con accento circonflesso",atilde:"Lettera minuscola latina a con tilde",auml:"Lettera minuscola latina a con dieresi",aring:"Lettera minuscola latina a con anello superiore",aelig:"Lettera minuscola latina ae",ccedil:"Lettera minuscola latina c con cediglia",egrave:"Lettera minuscola latina e con accento grave",eacute:"Lettera minuscola latina e con accento acuto",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
index ba348aae473..47393e4728f 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ja",{euro:"ユーロ記号",lsquo:"左シングル引用符",rsquo:"右シングル引用符",ldquo:"左ダブル引用符",rdquo:"右ダブル引用符",ndash:"半角ダッシュ",mdash:"全角ダッシュ",iexcl:"逆さ感嘆符",cent:"セント記号",pound:"ポンド記号",curren:"通貨記号",yen:"円記号",brvbar:"上下に分かれた縦棒",sect:"節記号",uml:"分音記号(ウムラウト)",copy:"著作権表示記号",ordf:"女性序数標識",laquo:" 始め二重山括弧引用記号",not:"論理否定記号",reg:"登録商標記号",macr:"長音符",deg:"度記号",sup2:"上つき2, 2乗",sup3:"上つき3, 3乗",acute:"揚音符",micro:"ミクロン記号",para:"段落記号",middot:"中黒",cedil:"セディラ",sup1:"上つき1",ordm:"男性序数標識",raquo:"終わり二重山括弧引用記号",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js
index 8f9fd7fcd2d..40a0828dc65 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","km",{euro:"សញ្ញា​អឺរ៉ូ",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"សញ្ញា​សេន",pound:"សញ្ញា​ផោន",curren:"សញ្ញា​រូបិយបណ្ណ",yen:"សញ្ញា​យ៉េន",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"សញ្ញា​រក្សា​សិទ្ធិ",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Not sign",reg:"Registered sign",macr:"Macron",deg:"សញ្ញា​ដឺក្រេ",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"សញ្ញា​មីក្រូ",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
index 05759fcf9fb..426b392c39f 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ko",{euro:"유로화 기호",lsquo:"왼쪽 외 따옴표",rsquo:"오른쪽 외 따옴표",ldquo:"왼쪽 쌍 따옴표",rdquo:"오른쪽 쌍 따옴표",ndash:"반각 대시",mdash:"전각 대시",iexcl:"반전된 느낌표",cent:"센트 기호",pound:"파운드화 기호",curren:"커런시 기호",yen:"위안화 기호",brvbar:"Broken bar",sect:"섹션 기호",uml:"분음 부호",copy:"저작권 기호",ordf:"Feminine ordinal indicator",laquo:"왼쪽 쌍꺽쇠 인용 부호",not:"금지 기호",reg:"등록 기호",macr:"장음 기호",deg:"도 기호",sup2:"위첨자 2",sup3:"위첨자 3",acute:"양음 악센트 부호",micro:"마이크로 기호",para:"단락 기호",middot:"가운데 점",cedil:"세디유",sup1:"위첨자 1",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
index 1da11107ab7..736193fd770 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ku",{euro:"نیشانەی یۆرۆ",lsquo:"نیشانەی فاریزەی سەرووژێری تاکی چەپ",rsquo:"نیشانەی فاریزەی سەرووژێری تاکی ڕاست",ldquo:"نیشانەی فاریزەی سەرووژێری دووهێندەی چه‌پ",rdquo:"نیشانەی فاریزەی سەرووژێری دووهێندەی ڕاست",ndash:"تەقەڵی کورت",mdash:"تەقەڵی درێژ",iexcl:"نیشانەی هەڵەوگێڕی سەرسوڕهێنەر",cent:"نیشانەی سەنت",pound:"نیشانەی پاوەند",curren:"نیشانەی دراو",yen:"نیشانەی یەنی ژاپۆنی",brvbar:"شریتی ئەستوونی پچڕاو",sect:"نیشانەی دوو s لەسەریەک",uml:"خاڵ",copy:"نیشانەی مافی چاپ",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
index c1fdd117d7c..ab3797e3260 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","lt",{euro:"Euro ženklas",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cento ženklas",pound:"Svaro ženklas",curren:"Valiutos ženklas",yen:"Jenos ženklas",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Ne ženklas",reg:"Registered sign",macr:"Makronas",deg:"Laipsnio ženklas",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Mikro ženklas",para:"Pilcrow sign",middot:"Vidurinis taškas",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
index b3a2aa0021a..4e8f1d20477 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","lv",{euro:"Euro zīme",lsquo:"Kreisā  vienkārtīga pēdiņa",rsquo:"Labā  vienkārtīga pēdiņa",ldquo:"Kreisā  dubult pēdiņa",rdquo:"Labā dubult pēdiņa",ndash:"En svītra",mdash:"Em svītra",iexcl:"Apgriezta izsaukuma zīme",cent:"Centu naudas zīme",pound:"Sterliņu mārciņu naudas zīme",curren:"Valūtas zīme",yen:"Jenu naudas zīme",brvbar:"Vertikāla pārrauta līnija",sect:"Paragrāfa zīme",uml:"Diakritiska zīme",copy:"Autortiesību zīme",ordf:"Sievišķas kārtas rādītājs",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
index 9f2684efc9f..87d18532d84 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","nb",{euro:"Eurosymbol",lsquo:"Venstre enkelt anførselstegn",rsquo:"Høyre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Høyre anførsesltegn",ndash:"Kort tankestrek",mdash:"Lang tankestrek",iexcl:"Omvendt utropstegn",cent:"Centsymbol",pound:"Pundsymbol",curren:"Valutategn",yen:"Yensymbol",brvbar:"Brutt loddrett strek",sect:"Paragraftegn",uml:"Tøddel",copy:"Copyrighttegn",ordf:"Feminin ordensindikator",laquo:"Venstre anførselstegn",not:"Negasjonstegn",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
index 5274e6f14c6..7d973f8b344 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","nl",{euro:"Euro-teken",lsquo:"Linker enkel aanhalingsteken",rsquo:"Rechter enkel aanhalingsteken",ldquo:"Linker dubbel aanhalingsteken",rdquo:"Rechter dubbel aanhalingsteken",ndash:"En dash",mdash:"Em dash",iexcl:"Omgekeerd uitroepteken",cent:"Cent-teken",pound:"Pond-teken",curren:"Valuta-teken",yen:"Yen-teken",brvbar:"Gebroken streep",sect:"Paragraaf-teken",uml:"Trema",copy:"Copyright-teken",ordf:"Vrouwelijk ordinaal",laquo:"Linker guillemet",not:"Ongelijk-teken",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js
index 87695334caf..7f23591233b 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","no",{euro:"Eurosymbol",lsquo:"Venstre enkelt anførselstegn",rsquo:"Høyre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Høyre anførsesltegn",ndash:"Kort tankestrek",mdash:"Lang tankestrek",iexcl:"Omvendt utropstegn",cent:"Centsymbol",pound:"Pundsymbol",curren:"Valutategn",yen:"Yensymbol",brvbar:"Brutt loddrett strek",sect:"Paragraftegn",uml:"Tøddel",copy:"Copyrighttegn",ordf:"Feminin ordensindikator",laquo:"Venstre anførselstegn",not:"Negasjonstegn",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/oc.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/oc.js
new file mode 100644
index 00000000000..18474316c92
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/oc.js
@@ -0,0 +1,12 @@
+/*
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang("specialchar","oc",{euro:"Simbòl èuro",lsquo:"Vergueta simpla dobrenta",rsquo:"Vergueta simpla tampanta",ldquo:"Vergueta dobla dobrenta",rdquo:"Vergueta dobla tampanta",ndash:"Jonhent semi-quadratin",mdash:"Jonhent quadratin",iexcl:"Punt d'exclamacion inversat",cent:"Simbòl cent",pound:"Simbòl Liura sterling",curren:"Simbòl monetari",yen:"Simbòl ièn",brvbar:"Barra verticala separada",sect:"Signe de seccion",uml:"Trèma",copy:"Simbòl Copyright",ordf:"Indicador ordinal femenin",
+laquo:"Vergueta francesa dobrenta",not:"Croquet de negacion",reg:"Simbòl de marca depausada",macr:"Macron",deg:"Simbòl gra",sup2:"Exponent 2",sup3:"Exponent 3",acute:"Accent agut",micro:"Simbòl micro",para:"Simbòl pè de mòsca",middot:"Punt median",cedil:"Cedilha",sup1:"Exponent 1",ordm:"Indicador ordenal masculin",raquo:"Vergueta francesa tampanta",frac14:"Fraccion un quart",frac12:"Fraccion un mièg",frac34:"Fraccion tres quarts",iquest:"Punt d'interrogacion inversat",Agrave:"A accent grèu majuscula",
+Aacute:"A accent agut majuscula",Acirc:"A accent circonflèxe majuscula",Atilde:"A caron majuscula",Auml:"A trèma majuscula",Aring:"A redond majuscula",AElig:"Ligatura Æ majuscula",Ccedil:"C cédille majuscula",Egrave:"E accent grèu majuscula",Eacute:"E accent agut majuscula",Ecirc:"E accent circonflèxe majuscula",Euml:"E trèma majuscula",Igrave:"I accent grèu majuscula",Iacute:"I accent agut majuscula",Icirc:"I accent circonflèxe majuscula",Iuml:"I trèma majuscula",ETH:"Letra majuscula islandaise ED",
+Ntilde:"N caron majuscula",Ograve:"O accent grèu majuscula",Oacute:"O accent agut majuscula",Ocirc:"O accent circonflèxe majuscula",Otilde:"O caron majuscula",Ouml:"O trèma majuscula",times:"Simbòl de multiplicacion",Oslash:"O raiat majuscula",Ugrave:"U accent grèu majuscula",Uacute:"U accent agut majuscula",Ucirc:"U accent circonflèxe majuscula",Uuml:"U trèma majuscula",Yacute:"Y accent agut majuscula",THORN:"Letra islandesa thorn majuscula",szlig:"Letra minuscula alemanda S dur",agrave:"A accent grèu minuscula",
+aacute:"A accent agut minuscula",acirc:"A accent circonflèxe minuscula",atilde:"A tilda minuscula",auml:"A trèma minuscula",aring:"A redond minuscula",aelig:"Ligatura Æ minuscula",ccedil:"C cédille minuscula",egrave:"E accent grèu minuscula",eacute:"E accent agut minuscula",ecirc:"E accent circonflèxe minuscula",euml:"E trèma minuscula",igrave:"I accent grèu minuscula",iacute:"I accent agut minuscula",icirc:"I accent circonflèxe minuscula",iuml:"i minuscula trèma",eth:"Letra minuscula islandaise ED",
+ntilde:"N caron minuscula",ograve:"O minuscula accent grèu",oacute:"O accent agut minuscula",ocirc:"O accent circonflèxe minuscula",otilde:"O tilda minuscula",ouml:"O trèma minuscula",divide:"Simbòl de division",oslash:"O raiat minuscula",ugrave:"U accent grèu minuscula",uacute:"U accent agut minuscula",ucirc:"U accent circonflèxe minuscula",uuml:"U trèma minuscula",yacute:"Y accent agut minuscula",thorn:"Letra islandaise thorn minuscula",yuml:"Y trèma minuscula",OElig:"Ligatura Œ majuscula",oelig:"Ligatura Œ minuscula",
+372:"W accent circonflèxe majuscula",374:"Y accent circonflèxe majuscula",373:"W accent circonflèxe minuscula",375:"Y accent circonflèxe minuscula",sbquo:"Vergueta simpla tampanta inferior",8219:"Vergueta-virgula superior culbuté",bdquo:"Vergueta-virgula double inferior",hellip:"Punts de suspension",trade:"Simbòl de marca comerciala",9658:"Sageta negra puntant cap a dreita",bull:"Gròs punt median",rarr:"Sageta cap a dreita",rArr:"Sageta dobla cap a dreita",hArr:"Sageta dobla cap a esquèrra",diams:"Lausange negre",
+asymp:"Environ egal"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
index c560a313556..b5dc457e1c8 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","pl",{euro:"Znak euro",lsquo:"Cudzysłów pojedynczy otwierający",rsquo:"Cudzysłów pojedynczy zamykający",ldquo:"Cudzysłów apostrofowy otwierający",rdquo:"Cudzysłów apostrofowy zamykający",ndash:"Półpauza",mdash:"Pauza",iexcl:"Odwrócony wykrzyknik",cent:"Znak centa",pound:"Znak funta",curren:"Znak waluty",yen:"Znak jena",brvbar:"Przerwana pionowa kreska",sect:"Paragraf",uml:"Diereza",copy:"Znak praw autorskich",ordf:"Wskaźnik rodzaju żeńskiego liczebnika porządkowego",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
index b8486afe3b6..76eb659e830 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","pt-br",{euro:"Euro",lsquo:"Aspas simples esquerda",rsquo:"Aspas simples direita",ldquo:"Aspas duplas esquerda",rdquo:"Aspas duplas direita",ndash:"Traço",mdash:"Travessão",iexcl:"Ponto de exclamação invertido",cent:"Cent",pound:"Cerquilha",curren:"Dinheiro",yen:"Yen",brvbar:"Bara interrompida",sect:"Símbolo de Parágrafo",uml:"Trema",copy:"Direito de Cópia",ordf:"Indicador ordinal feminino",laquo:"Aspas duplas angulares esquerda",not:"Negação",reg:"Marca Registrada",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
index 3f76dd58620..c431a2f9099 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
@@ -1,13 +1,13 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.plugins.setLang("specialchar","pt",{euro:"Símbolo do Euro",lsquo:"Aspa esquerda simples",rsquo:"Aspa direita simples",ldquo:"Aspa esquerda dupla",rdquo:"Aspa direita dupla",ndash:"Travessão Simples",mdash:"Travessão Longo",iexcl:"Ponto de exclamação invertido",cent:"Símbolo do Cêntimo",pound:"Símbolo da Libra",curren:"Símbolo de Moeda",yen:"Símbolo do Iene",brvbar:"Barra quebrada",sect:"Símbolo de Secção",uml:"Trema",copy:"Símbolo dos Direitos de Autor",ordf:"Indicador ordinal feminino",
-laquo:"Aspa esquerda ângulo duplo",not:"Não Símbolo",reg:"Símbolo de Registado",macr:"Mácron",deg:"Símbolo de Grau",sup2:"Expoente 2",sup3:"Expoente 3",acute:"Acento agudo",micro:"Símbolo de Micro",para:"Símbolo de Parágrafo",middot:"Ponto do Meio",cedil:"Cedilha",sup1:"Expoente 1",ordm:"Indicador ordinal masculino",raquo:"Aspas ângulo duplo pra Direita",frac14:"Fração vulgar 1/4",frac12:"Fração vulgar 1/2",frac34:"Fração vulgar 3/4",iquest:"Ponto de interrogação invertido",Agrave:"Letra maiúscula latina A com acento grave",
-Aacute:"Letra maiúscula latina A com acento agudo",Acirc:"Letra maiúscula latina A com circunflexo",Atilde:"Letra maiúscula latina A com til",Auml:"Letra maiúscula latina A com trema",Aring:"Letra maiúscula latina A com sinal diacrítico",AElig:"Letra maiúscula latina Æ",Ccedil:"Letra maiúscula latina C com cedilha",Egrave:"Letra maiúscula latina E com acento grave",Eacute:"Letra maiúscula latina E com acento agudo",Ecirc:"Letra maiúscula latina E com circunflexo",Euml:"Letra maiúscula latina E com trema",
-Igrave:"Letra maiúscula latina I com acento grave",Iacute:"Letra maiúscula latina I com acento agudo",Icirc:"Letra maiúscula latina I com cincunflexo",Iuml:"Letra maiúscula latina I com trema",ETH:"Letra maiúscula latina Eth (Ðð)",Ntilde:"Letra maiúscula latina N com til",Ograve:"Letra maiúscula latina O com acento grave",Oacute:"Letra maiúscula latina O com acento agudo",Ocirc:"Letra maiúscula latina I com circunflexo",Otilde:"Letra maiúscula latina O com til",Ouml:"Letra maiúscula latina O com trema",
-times:"Símbolo de multiplicação",Oslash:"Letra maiúscula O com barra",Ugrave:"Letra maiúscula latina U com acento grave",Uacute:"Letra maiúscula latina U com acento agudo",Ucirc:"Letra maiúscula latina U com circunflexo",Uuml:"Letra maiúscula latina E com trema",Yacute:"Letra maiúscula latina Y com acento agudo",THORN:"Letra maiúscula latina Rúnico",szlig:"Letra minúscula latina s forte",agrave:"Letra minúscula latina a com acento grave",aacute:"Letra minúscula latina a com acento agudo",acirc:"Letra minúscula latina a com circunflexo",
-atilde:"Letra minúscula latina a com til",auml:"Letra minúscula latina a com trema",aring:"Letra minúscula latina a com sinal diacrítico",aelig:"Letra minúscula latina æ",ccedil:"Letra minúscula latina c com cedilha",egrave:"Letra minúscula latina e com acento grave",eacute:"Letra minúscula latina e com acento agudo",ecirc:"Letra minúscula latina e com circunflexo",euml:"Letra minúscula latina e com trema",igrave:"Letra minúscula latina i com acento grave",iacute:"Letra minúscula latina i com acento agudo",
-icirc:"Letra minúscula latina i com circunflexo",iuml:"Letra pequena latina i com trema",eth:"Letra minúscula latina eth",ntilde:"Letra minúscula latina n com til",ograve:"Letra minúscula latina o com acento grave",oacute:"Letra minúscula latina o com acento agudo",ocirc:"Letra minúscula latina o com circunflexo",otilde:"Letra minúscula latina o com til",ouml:"Letra minúscula latina o com trema",divide:"Símbolo de divisão",oslash:"Letra minúscula latina o com barra",ugrave:"Letra minúscula latina u com acento grave",
-uacute:"Letra minúscula latina u com acento agudo",ucirc:"Letra minúscula latina u com circunflexo",uuml:"Letra minúscula latina u com trema",yacute:"Letra minúscula latina y com acento agudo",thorn:"Letra minúscula latina Rúnico",yuml:"Letra minúscula latina y com trema",OElig:"Ligadura maiúscula latina OE",oelig:"Ligadura minúscula latina oe",372:"Letra maiúscula latina W com circunflexo",374:"Letra maiúscula latina Y com circunflexo",373:"Letra minúscula latina w com circunflexo",375:"Letra minúscula latina y com circunflexo",
-sbquo:"Aspa Simples inferior-9",8219:"Aspa Simples superior invertida-9",bdquo:"Aspa duplas inferior-9",hellip:"Elipse Horizontal ",trade:"Símbolo de Marca Registada",9658:"Ponteiro preto direito",bull:"Marca",rarr:"Seta para a direita",rArr:"Seta dupla para a direita",hArr:"Seta dupla direita esquerda",diams:"Naipe diamante preto",asymp:"Quase igual a "});
\ No newline at end of file
+CKEDITOR.plugins.setLang("specialchar","pt",{euro:"Símbolo de Euro",lsquo:"Aspa esquerda simples",rsquo:"Aspa direita simples",ldquo:"Aspa esquerda dupla",rdquo:"Aspa direita dupla",ndash:"Travessão simples",mdash:"Travessão longo",iexcl:"Ponto de exclamação invertido",cent:"Símbolo de cêntimo",pound:"Símbolo de Libra",curren:"Símbolo de Moeda",yen:"Símbolo de Iene",brvbar:"Barra quebrada",sect:"Símbolo de secção",uml:"Trema",copy:"Símbolo de direitos de autor",ordf:"Indicador ordinal feminino",laquo:"Aspa esquerda ângulo duplo",
+not:"Não símbolo",reg:"Símbolo de registado",macr:"Mácron",deg:"Símbolo de graus",sup2:"Expoente 2",sup3:"Expoente 3",acute:"Acento agudo",micro:"Símbolo de micro",para:"Símbolo de parágrafo",middot:"Ponto do meio",cedil:"Cedilha",sup1:"Expoente 1",ordm:"Indicador ordinal masculino",raquo:"Aspas ângulo duplo para a direita",frac14:"Fração vulgar 1/4",frac12:"Fração vulgar 1/2",frac34:"Fração vulgar 3/4",iquest:"Ponto de interrogação invertido",Agrave:"Letra maiúscula latina A com acento grave",Aacute:"Letra maiúscula latina A com acento agudo",
+Acirc:"Letra maiúscula latina A com circunflexo",Atilde:"Letra maiúscula latina A com til",Auml:"Letra maiúscula latina A com trema",Aring:"Letra maiúscula latina A com sinal diacrítico",AElig:"Letra maiúscula latina Æ",Ccedil:"Letra maiúscula latina C com cedilha",Egrave:"Letra maiúscula latina E com acento grave",Eacute:"Letra maiúscula latina E com acento agudo",Ecirc:"Letra maiúscula latina E com circunflexo",Euml:"Letra maiúscula latina E com trema",Igrave:"Letra maiúscula latina I com acento grave",
+Iacute:"Letra maiúscula latina I com acento agudo",Icirc:"Letra maiúscula latina I com cincunflexo",Iuml:"Letra maiúscula latina I com trema",ETH:"Letra maiúscula latina Eth (Ðð)",Ntilde:"Letra maiúscula latina N com til",Ograve:"Letra maiúscula latina O com acento grave",Oacute:"Letra maiúscula latina O com acento agudo",Ocirc:"Letra maiúscula latina I com circunflexo",Otilde:"Letra maiúscula latina O com til",Ouml:"Letra maiúscula latina O com trema",times:"Símbolo de multiplicação",Oslash:"Letra maiúscula O com barra",
+Ugrave:"Letra maiúscula latina U com acento grave",Uacute:"Letra maiúscula latina U com acento agudo",Ucirc:"Letra maiúscula latina U com circunflexo",Uuml:"Letra maiúscula latina E com trema",Yacute:"Letra maiúscula latina Y com acento agudo",THORN:"Letra maiúscula latina Rúnico",szlig:"Letra minúscula latina s forte",agrave:"Letra minúscula latina a com acento grave",aacute:"Letra minúscula latina a com acento agudo",acirc:"Letra minúscula latina a com circunflexo",atilde:"Letra minúscula latina a com til",
+auml:"Letra minúscula latina a com trema",aring:"Letra minúscula latina a com sinal diacrítico",aelig:"Letra minúscula latina æ",ccedil:"Letra minúscula latina c com cedilha",egrave:"Letra minúscula latina e com acento grave",eacute:"Letra minúscula latina e com acento agudo",ecirc:"Letra minúscula latina e com circunflexo",euml:"Letra minúscula latina e com trema",igrave:"Letra minúscula latina i com acento grave",iacute:"Letra minúscula latina i com acento agudo",icirc:"Letra minúscula latina i com circunflexo",
+iuml:"Letra pequena latina i com trema",eth:"Letra minúscula latina eth",ntilde:"Letra minúscula latina n com til",ograve:"Letra minúscula latina o com acento grave",oacute:"Letra minúscula latina o com acento agudo",ocirc:"Letra minúscula latina o com circunflexo",otilde:"Letra minúscula latina o com til",ouml:"Letra minúscula latina o com trema",divide:"Símbolo de divisão",oslash:"Letra minúscula latina o com barra",ugrave:"Letra minúscula latina u com acento grave",uacute:"Letra minúscula latina u com acento agudo",
+ucirc:"Letra minúscula latina u com circunflexo",uuml:"Letra minúscula latina u com trema",yacute:"Letra minúscula latina y com acento agudo",thorn:"Letra minúscula latina Rúnico",yuml:"Letra minúscula latina y com trema",OElig:"Ligadura maiúscula latina OE",oelig:"Ligadura minúscula latina oe",372:"Letra maiúscula latina W com circunflexo",374:"Letra maiúscula latina Y com circunflexo",373:"Letra minúscula latina w com circunflexo",375:"Letra minúscula latina y com circunflexo",sbquo:"Aspa Simples inferior-9",
+8219:"Aspa simples superior invertida-9",bdquo:"Aspa duplas inferior-9",hellip:"Elipse horizontal ",trade:"Símbolo de marca registada",9658:"Ponteiro preto direito",bull:"Marca",rarr:"Seta para a direita",rArr:"Seta dupla para a direita",hArr:"Seta dupla direita esquerda",diams:"Naipe diamante preto",asymp:"Quase igual a "});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
index c0218667b02..b7bf674eb6b 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ru",{euro:"Знак евро",lsquo:"Левая одинарная кавычка",rsquo:"Правая одинарная кавычка",ldquo:"Левая двойная кавычка",rdquo:"Левая двойная кавычка",ndash:"Среднее тире",mdash:"Длинное тире",iexcl:"перевёрнутый восклицательный знак",cent:"Цент",pound:"Фунт",curren:"Знак валюты",yen:"Йена",brvbar:"Вертикальная черта с разрывом",sect:"Знак параграфа",uml:"Умлаут",copy:"Знак охраны авторского права",ordf:"Указатель окончания женского рода ...ая",laquo:"Левая кавычка-«ёлочка»",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js
index d6d445e097f..cc4679c2e73 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","si",{euro:"යුරෝ සලකුණ",lsquo:"වමේ තනි උපුටා දක්වීම ",rsquo:"දකුණේ තනි උපුටා දක්වීම ",ldquo:"වමේ දිත්ව  උපුටා දක්වීම ",rdquo:"දකුණේ දිත්ව  උපුටා දක්වීම ",ndash:"En dash",mdash:"Em dash",iexcl:"යටිකුරු හර්ෂදී ",cent:"Cent sign",pound:"Pound sign",curren:"මුල්‍යමය ",yen:"යෙන් ",brvbar:"Broken bar",sect:"තෙරේම් ",uml:"Diaeresis",copy:"පිටපත් අයිතිය ",ordf:"දර්ශකය",laquo:"Left-pointing double angle quotation mark",not:"සලකුණක් නොවේ",reg:"සලකුණක් ලියාපදිංචි කිරීම",
 macr:"මුද්‍රිත ",deg:"සලකුණේ ",sup2:"උඩු ලකුණු දෙක",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",Aacute:"Latin capital letter A with acute accent",
-Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent",
+Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent",
 Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",Ugrave:"Latin capital letter U with grave accent",
 Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",aring:"Latin small letter a with ring above",
 aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",ntilde:"Latin small letter n with tilde",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
index 83e1e2fa163..5d6a583d366 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","sk",{euro:"Znak eura",lsquo:"Ľavá jednoduchá úvodzovka",rsquo:"Pravá jednoduchá úvodzovka",ldquo:"Pravá dvojitá úvodzovka",rdquo:"Pravá dvojitá úvodzovka",ndash:"En pomlčka",mdash:"Em pomlčka",iexcl:"Obrátený výkričník",cent:"Znak centu",pound:"Znak libry",curren:"Znak meny",yen:"Znak jenu",brvbar:"Prerušená zvislá čiara",sect:"Znak odseku",uml:"Prehláska",copy:"Znak copyrightu",ordf:"Ženský indikátor rodu",laquo:"Znak dvojitých lomených úvodzoviek vľavo",not:"Logistický zápor",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
index 653afc57175..7ecf707a2f2 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
@@ -1,12 +1,12 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.plugins.setLang("specialchar","sl",{euro:"Evro znak",lsquo:"Levi enojni narekovaj",rsquo:"Desni enojni narekovaj",ldquo:"Levi dvojni narekovaj",rdquo:"Desni dvojni narekovaj",ndash:"En pomišljaj",mdash:"Em pomišljaj",iexcl:"Obrnjen klicaj",cent:"Cent znak",pound:"Funt znak",curren:"Znak valute",yen:"Jen znak",brvbar:"Zlomljena črta",sect:"Znak oddelka",uml:"Diaeresis",copy:"Znak avtorskih pravic",ordf:"Ženski zaporedni kazalnik",laquo:"Levi obrnjen dvojni kotni narekovaj",not:"Ne znak",reg:"Registrirani znak",
-macr:"Macron",deg:"Znak stopinj",sup2:"Nadpisano dva",sup3:"Nadpisano tri",acute:"Ostrivec",micro:"Mikro znak",para:"Pilcrow znak",middot:"Sredinska pika",cedil:"Cedilla",sup1:"Nadpisano ena",ordm:"Moški zaporedni kazalnik",raquo:"Desno obrnjen dvojni kotni narekovaj",frac14:"Ena četrtina",frac12:"Ena polovica",frac34:"Tri četrtine",iquest:"Obrnjen vprašaj",Agrave:"Velika latinska črka A s krativcem",Aacute:"Velika latinska črka A z ostrivcem",Acirc:"Velika latinska črka A s strešico",Atilde:"Velika latinska črka A z tildo",
-Auml:"Velika latinska črka A z diaeresis-om",Aring:"Velika latinska črka A z obročem",AElig:"Velika latinska črka Æ",Ccedil:"Velika latinska črka C s cedillo",Egrave:"Velika latinska črka E s krativcem",Eacute:"Velika latinska črka E z ostrivcem",Ecirc:"Velika latinska črka E s strešico",Euml:"Velika latinska črka E z diaeresis-om",Igrave:"Velika latinska črka I s krativcem",Iacute:"Velika latinska črka I z ostrivcem",Icirc:"Velika latinska črka I s strešico",Iuml:"Velika latinska črka I z diaeresis-om",
-ETH:"Velika latinska črka Eth",Ntilde:"Velika latinska črka N s tildo",Ograve:"Velika latinska črka O s krativcem",Oacute:"Velika latinska črka O z ostrivcem",Ocirc:"Velika latinska črka O s strešico",Otilde:"Velika latinska črka O s tildo",Ouml:"Velika latinska črka O z diaeresis-om",times:"Znak za množenje",Oslash:"Velika prečrtana latinska črka O",Ugrave:"Velika latinska črka U s krativcem",Uacute:"Velika latinska črka U z ostrivcem",Ucirc:"Velika latinska črka U s strešico",Uuml:"Velika latinska črka U z diaeresis-om",
-Yacute:"Velika latinska črka Y z ostrivcem",THORN:"Velika latinska črka Thorn",szlig:"Mala ostra latinska črka s",agrave:"Mala latinska črka a s krativcem",aacute:"Mala latinska črka a z ostrivcem",acirc:"Mala latinska črka a s strešico",atilde:"Mala latinska črka a s tildo",auml:"Mala latinska črka a z diaeresis-om",aring:"Mala latinska črka a z obročem",aelig:"Mala latinska črka æ",ccedil:"Mala latinska črka c s cedillo",egrave:"Mala latinska črka e s krativcem",eacute:"Mala latinska črka e z ostrivcem",
-ecirc:"Mala latinska črka e s strešico",euml:"Mala latinska črka e z diaeresis-om",igrave:"Mala latinska črka i s krativcem",iacute:"Mala latinska črka i z ostrivcem",icirc:"Mala latinska črka i s strešico",iuml:"Mala latinska črka i z diaeresis-om",eth:"Mala latinska črka eth",ntilde:"Mala latinska črka n s tildo",ograve:"Mala latinska črka o s krativcem",oacute:"Mala latinska črka o z ostrivcem",ocirc:"Mala latinska črka o s strešico",otilde:"Mala latinska črka o s tildo",ouml:"Mala latinska črka o z diaeresis-om",
-divide:"Znak za deljenje",oslash:"Mala prečrtana latinska črka o",ugrave:"Mala latinska črka u s krativcem",uacute:"Mala latinska črka u z ostrivcem",ucirc:"Mala latinska črka u s strešico",uuml:"Mala latinska črka u z diaeresis-om",yacute:"Mala latinska črka y z ostrivcem",thorn:"Mala latinska črka thorn",yuml:"Mala latinska črka y z diaeresis-om",OElig:"Velika latinska ligatura OE",oelig:"Mala latinska ligatura oe",372:"Velika latinska črka W s strešico",374:"Velika latinska črka Y s strešico",
-373:"Mala latinska črka w s strešico",375:"Mala latinska črka y s strešico",sbquo:"Enojni nizki-9 narekovaj",8219:"Enojni visoki-obrnjen-9 narekovaj",bdquo:"Dvojni nizki-9 narekovaj",hellip:"Horizontalni izpust",trade:"Znak blagovne znamke",9658:"Črni desno-usmerjen kazalec",bull:"Krogla",rarr:"Desno-usmerjena puščica",rArr:"Desno-usmerjena dvojna puščica",hArr:"Leva in desna dvojna puščica",diams:"Črna kara",asymp:"Skoraj enako"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("specialchar","sl",{euro:"Znak za evro",lsquo:"Levi enojni narekovaj",rsquo:"Desni enojni narekovaj",ldquo:"Levi dvojni narekovaj",rdquo:"Desni dvojni narekovaj",ndash:"Pomišljaj",mdash:"Dolgi pomišljaj",iexcl:"Obrnjen klicaj",cent:"Znak za cent",pound:"Znak za funt",curren:"Znak valute",yen:"Znak za jen",brvbar:"Zlomljena črta",sect:"Znak za člen",uml:"Diereza",copy:"Znak avtorskih pravic",ordf:"Ženski zaporedni kazalnik",laquo:"Levi dvojni lomljeni narekovaj",not:"Znak za ne",
+reg:"Registrirani znak",macr:"Nadčrtano",deg:"Znak za stopinje",sup2:"Nadpisano dva",sup3:"Nadpisano tri",acute:"Ostrivec",micro:"Znak za mikro",para:"Znak za odstavek",middot:"Usredinjena pika",cedil:"Cedilla",sup1:"Nadpisano ena",ordm:"Moški zaporedni kazalnik",raquo:"Desno obrnjen dvojni kotni narekovaj",frac14:"Ena četrtina",frac12:"Ena polovica",frac34:"Tri četrtine",iquest:"Obrnjen vprašaj",Agrave:"Velika latinska črka A s krativcem",Aacute:"Velika latinska črka A z ostrivcem",Acirc:"Velika latinska črka A s strešico",
+Atilde:"Velika latinska črka A z tildo",Auml:"Velika latinska črka A z diaeresis-om",Aring:"Velika latinska črka A z obročem",AElig:"Velika latinska črka Æ",Ccedil:"Velika latinska črka C s cedillo",Egrave:"Velika latinska črka E s krativcem",Eacute:"Velika latinska črka E z ostrivcem",Ecirc:"Velika latinska črka E s strešico",Euml:"Velika latinska črka E z diaeresis-om",Igrave:"Velika latinska črka I s krativcem",Iacute:"Velika latinska črka I z ostrivcem",Icirc:"Velika latinska črka I s strešico",
+Iuml:"Velika latinska črka I z diaeresis-om",ETH:"Velika latinska črka Eth",Ntilde:"Velika latinska črka N s tildo",Ograve:"Velika latinska črka O s krativcem",Oacute:"Velika latinska črka O z ostrivcem",Ocirc:"Velika latinska črka O s strešico",Otilde:"Velika latinska črka O s tildo",Ouml:"Velika latinska črka O z diaeresis-om",times:"Znak za množenje",Oslash:"Velika prečrtana latinska črka O",Ugrave:"Velika latinska črka U s krativcem",Uacute:"Velika latinska črka U z ostrivcem",Ucirc:"Velika latinska črka U s strešico",
+Uuml:"Velika latinska črka U z diaeresis-om",Yacute:"Velika latinska črka Y z ostrivcem",THORN:"Velika latinska črka Thorn",szlig:"Mala ostra latinska črka s",agrave:"Mala latinska črka a s krativcem",aacute:"Mala latinska črka a z ostrivcem",acirc:"Mala latinska črka a s strešico",atilde:"Mala latinska črka a s tildo",auml:"Mala latinska črka a z diaeresis-om",aring:"Mala latinska črka a z obročem",aelig:"Mala latinska črka æ",ccedil:"Mala latinska črka c s cedillo",egrave:"Mala latinska črka e s krativcem",
+eacute:"Mala latinska črka e z ostrivcem",ecirc:"Mala latinska črka e s strešico",euml:"Mala latinska črka e z diaeresis-om",igrave:"Mala latinska črka i s krativcem",iacute:"Mala latinska črka i z ostrivcem",icirc:"Mala latinska črka i s strešico",iuml:"Mala latinska črka i z diaeresis-om",eth:"Mala latinska črka eth",ntilde:"Mala latinska črka n s tildo",ograve:"Mala latinska črka o s krativcem",oacute:"Mala latinska črka o z ostrivcem",ocirc:"Mala latinska črka o s strešico",otilde:"Mala latinska črka o s tildo",
+ouml:"Mala latinska črka o z diaeresis-om",divide:"Znak za deljenje",oslash:"Mala prečrtana latinska črka o",ugrave:"Mala latinska črka u s krativcem",uacute:"Mala latinska črka u z ostrivcem",ucirc:"Mala latinska črka u s strešico",uuml:"Mala latinska črka u z diaeresis-om",yacute:"Mala latinska črka y z ostrivcem",thorn:"Mala latinska črka thorn",yuml:"Mala latinska črka y z diaeresis-om",OElig:"Velika latinska ligatura OE",oelig:"Mala latinska ligatura oe",372:"Velika latinska črka W s strešico",
+374:"Velika latinska črka Y s strešico",373:"Mala latinska črka w s strešico",375:"Mala latinska črka y s strešico",sbquo:"Enojni nizki-9 narekovaj",8219:"Enojni visoki-obrnjen-9 narekovaj",bdquo:"Dvojni nizki-9 narekovaj",hellip:"Horizontalni izpust",trade:"Znak blagovne znamke",9658:"Črni desno-usmerjen kazalec",bull:"Krogla",rarr:"Desno-usmerjena puščica",rArr:"Desno-usmerjena dvojna puščica",hArr:"Leva in desna dvojna puščica",diams:"Črna kara",asymp:"Skoraj enako"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
index f4fbecc64fd..6e284bc30cf 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","sq",{euro:"Shenja e Euros",lsquo:"Thonjëza majtas me një vi",rsquo:"Thonjëza djathtas me një vi",ldquo:"Thonjëza majtas",rdquo:"Thonjëza djathtas",ndash:"En viza lidhëse",mdash:"Em viza lidhëse",iexcl:"Pikëçuditëse e përmbysur",cent:"Shenja e Centit",pound:"Shejna e Funtit",curren:"Shenja e valutës",yen:"Shenja e Jenit",brvbar:"Viza e këputur",sect:"Shenja e pjesës",uml:"Diaeresis",copy:"Shenja e të drejtave të kopjimit",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
index ac1f4ac6b6a..9c2419cc660 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","sv",{euro:"Eurotecken",lsquo:"Enkelt vänster citattecken",rsquo:"Enkelt höger citattecken",ldquo:"Dubbelt vänster citattecken",rdquo:"Dubbelt höger citattecken",ndash:"Snedstreck",mdash:"Långt tankstreck",iexcl:"Inverterad utropstecken",cent:"Centtecken",pound:"Pundtecken",curren:"Valutatecken",yen:"Yentecken",brvbar:"Brutet lodrätt streck",sect:"Paragraftecken",uml:"Diaeresis",copy:"Upphovsrättstecken",ordf:"Feminit ordningstalsindikator",laquo:"Vänsterställt dubbelt vinkelcitationstecken",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js
index 9c2b30724aa..fa51766e0cf 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","th",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"สัญลักษณ์สกุลเงิน",yen:"สัญลักษณ์เงินเยน",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Not sign",reg:"Registered sign",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
index f5815b94673..1bcfbcd712e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","tr",{euro:"Euro işareti",lsquo:"Sol tek tırnak işareti",rsquo:"Sağ tek tırnak işareti",ldquo:"Sol çift tırnak işareti",rdquo:"Sağ çift tırnak işareti",ndash:"En tire",mdash:"Em tire",iexcl:"Ters ünlem işareti",cent:"Cent işareti",pound:"Pound işareti",curren:"Para birimi işareti",yen:"Yen işareti",brvbar:"Kırık bar",sect:"Bölüm işareti",uml:"İki sesli harfin ayrılması",copy:"Telif hakkı işareti",ordf:"Dişil sıralı gösterge",laquo:"Sol-işaret çift açı tırnak işareti",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
index 1fef21e08c6..bdf01c3e31f 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","tt",{euro:"Евро тамгасы",lsquo:"Сул бер иңле куштырнаклар",rsquo:"Уң бер иңле куштырнаклар",ldquo:"Сул ике иңле куштырнаклар",rdquo:"Уң ике иңле куштырнаклар",ndash:"Кыска сызык",mdash:"Озын сызык",iexcl:"Әйләндерелгән өндәү билгесе",cent:"Цент тамгасы",pound:"Фунт тамгасы",curren:"Акча берәмлеге тамгасы",yen:"Иена тамгасы",brvbar:"Broken bar",sect:"Параграф билгесе",uml:"Диерезис",copy:"Хокук иясе булу билгесе",ordf:"Feminine ordinal indicator",laquo:"Ачылучы чыршысыман җәя",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
index 68eaeb3915e..a1fbf4a92d8 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ug",{euro:"ياۋرو بەلگىسى",lsquo:"يالاڭ پەش سول",rsquo:"يالاڭ پەش ئوڭ",ldquo:"قوش پەش سول",rdquo:"قوش پەش ئوڭ",ndash:"سىزىقچە",mdash:"سىزىق",iexcl:"ئۈندەش",cent:"تىيىن بەلگىسى",pound:"فوند ستېرلىڭ",curren:"پۇل بەلگىسى",yen:"ياپونىيە يىنى",brvbar:"ئۈزۈك بالداق",sect:"پاراگراف بەلگىسى",uml:"تاۋۇش ئايرىش بەلگىسى",copy:"نەشر ھوقۇقى بەلگىسى",ordf:"Feminine ordinal indicator",laquo:"قوش تىرناق سول",not:"غەيرى بەلگە",reg:"خەتلەتكەن تاۋار ماركىسى",macr:"سوزۇش بەلگىسى",
 deg:"گىرادۇس بەلگىسى",sup2:"يۇقىرى ئىندېكىس 2",sup3:"يۇقىرى ئىندېكىس 3",acute:"ئۇرغۇ بەلگىسى",micro:"Micro sign",para:"ئابزاس بەلگىسى",middot:"ئوتتۇرا چېكىت",cedil:"ئاستىغا قوشۇلىدىغان بەلگە",sup1:"يۇقىرى ئىندېكىس 1",ordm:"Masculine ordinal indicator",raquo:"قوش تىرناق ئوڭ",frac14:"ئاددىي كەسىر تۆتتىن بىر",frac12:"ئاددىي كەسىر ئىككىدىن بىر",frac34:"ئاددىي كەسىر ئۈچتىن تۆرت",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",Aacute:"Latin capital letter A with acute accent",
-Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent",
+Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent",
 Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"قوش پەش ئوڭ",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",
 Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",
 ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",ntilde:"تىك موللاق سوئال بەلگىسى",ograve:"Latin small letter o with grave accent",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
index 001c62667e1..a976a0ce172 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","uk",{euro:"Знак євро",lsquo:"Ліві одинарні лапки",rsquo:"Праві одинарні лапки",ldquo:"Ліві подвійні лапки",rdquo:"Праві подвійні лапки",ndash:"Середнє тире",mdash:"Довге тире",iexcl:"Перевернутий знак оклику",cent:"Знак цента",pound:"Знак фунта",curren:"Знак валюти",yen:"Знак єни",brvbar:"Переривчаста вертикальна лінія",sect:"Знак параграфу",uml:"Умлаут",copy:"Знак авторських прав",ordf:"Жіночий порядковий вказівник",laquo:"ліві вказівні подвійні кутові дужки",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
index 3bf84b6e413..9ebd877e434 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","vi",{euro:"Ký hiệu Euro",lsquo:"Dấu ngoặc đơn trái",rsquo:"Dấu ngoặc đơn phải",ldquo:"Dấu ngoặc đôi trái",rdquo:"Dấu ngoặc đôi phải",ndash:"Gạch ngang tiếng anh",mdash:"Gạch ngang Em",iexcl:"Chuyển đổi dấu chấm than",cent:"Ký tự tiền Mỹ",pound:"Ký tự tiền Anh",curren:"Ký tự tiền tệ",yen:"Ký tự tiền Yên Nhật",brvbar:"Thanh hỏng",sect:"Ký tự khu vực",uml:"Dấu tách đôi",copy:"Ký tự bản quyền",ordf:"Phần chỉ thị giống cái",laquo:"Chọn dấu ngoặc đôi trái",not:"Không có ký tự",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
index eb64eaa8c60..57db383e87b 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","zh-cn",{euro:"欧元符号",lsquo:"左单引号",rsquo:"右单引号",ldquo:"左双引号",rdquo:"右双引号",ndash:"短划线",mdash:"长划线",iexcl:"竖翻叹号",cent:"分币符号",pound:"英镑符号",curren:"货币符号",yen:"日元符号",brvbar:"间断条",sect:"节标记",uml:"分音符",copy:"版权所有标记",ordf:"阴性顺序指示符",laquo:"左指双尖引号",not:"非标记",reg:"注册标记",macr:"长音符",deg:"度标记",sup2:"上标二",sup3:"上标三",acute:"锐音符",micro:"微符",para:"段落标记",middot:"中间点",cedil:"下加符",sup1:"上标一",ordm:"阳性顺序指示符",raquo:"右指双尖引号",frac14:"普通分数四分之一",frac12:"普通分数二分之一",frac34:"普通分数四分之三",iquest:"竖翻问号",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
index 774087117e4..297f96e018e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","zh",{euro:"歐元符號",lsquo:"左單引號",rsquo:"右單引號",ldquo:"左雙引號",rdquo:"右雙引號",ndash:"短破折號",mdash:"長破折號",iexcl:"倒置的驚嘆號",cent:"美分符號",pound:"英鎊符號",curren:"貨幣符號",yen:"日圓符號",brvbar:"破折號",sect:"章節符號",uml:"分音符號",copy:"版權符號",ordf:"雌性符號",laquo:"左雙角括號",not:"Not 符號",reg:"註冊商標符號",macr:"長音符號",deg:"度數符號",sup2:"上標字 2",sup3:"上標字 3",acute:"尖音符號",micro:"微",para:"段落符號",middot:"中間點",cedil:"字母 C 下面的尾型符號 ",sup1:"上標",ordm:"雄性符號",raquo:"右雙角括號",frac14:"四分之一符號",frac12:"二分之一符號",frac34:"四分之三符號",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js
index 012d34bf324..d04c1867447 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("specialchar",function(k){var e,n=k.lang.specialchar,m=function(c){var b;c=c.data?c.data.getTarget():new CKEDITOR.dom.element(c);"a"==c.getName()&&(b=c.getChild(0).getHtml())&&(c.removeClass("cke_light_background"),e.hide(),c=k.document.createElement("span"),c.setHtml(b),k.insertText(c.getText()))},p=CKEDITOR.tools.addFunction(m),l,g=function(c,b){var a;b=b||c.data.getTarget();"span"==b.getName()&&(b=b.getParent());if("a"==b.getName()&&(a=b.getChild(0).getHtml())){l&&d(null,l);
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js b/htdocs/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js
index 081f38f303a..3206bfe7ae7 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 (function(){function v(a){for(var f=0,n=0,l=0,p,e=a.$.rows.length;l<e;l++){p=a.$.rows[l];for(var d=f=0,b,c=p.cells.length;d<c;d++)b=p.cells[d],f+=b.colSpan;f>n&&(n=f)}return n}function r(a){return function(){var f=this.getValue(),f=!!(CKEDITOR.dialog.validate.integer()(f)&&0<f);f||(alert(a),this.select());return f}}function q(a,f){var n=function(e){return new CKEDITOR.dom.element(e,a.document)},q=a.editable(),p=a.plugins.dialogadvtab;return{title:a.lang.table.title,minWidth:310,minHeight:CKEDITOR.env.ie?
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js b/htdocs/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js
index 25b664a1053..101d6c093b4 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("cellProperties",function(g){function d(a){return function(b){for(var c=a(b[0]),d=1;d<b.length;d++)if(a(b[d])!==c){c=null;break}"undefined"!=typeof c&&(this.setValue(c),CKEDITOR.env.gecko&&"select"==this.type&&!c&&(this.getInputElement().$.selectedIndex=-1))}}function l(a){if(a=n.exec(a.getStyle("width")||a.getAttribute("width")))return a[2]}var h=g.lang.table,c=h.cell,e=g.lang.common,k=CKEDITOR.dialog.validate,n=/^(\d+(?:\.\d+)?)(px|%)$/,f={type:"html",html:"\x26nbsp;"},p="rtl"==
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css b/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css
index 8ea4ffb848e..1cb99f0111c 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js b/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js
index 78822633f79..a27de870c49 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 (function(){CKEDITOR.dialog.add("templates",function(c){function r(a,b){var m=CKEDITOR.dom.element.createFromHtml('\x3ca href\x3d"javascript:void(0)" tabIndex\x3d"-1" role\x3d"option" \x3e\x3cdiv class\x3d"cke_tpl_item"\x3e\x3c/div\x3e\x3c/a\x3e'),d='\x3ctable style\x3d"width:350px;" class\x3d"cke_tpl_preview" role\x3d"presentation"\x3e\x3ctr\x3e';a.image&&b&&(d+='\x3ctd class\x3d"cke_tpl_preview_img"\x3e\x3cimg src\x3d"'+CKEDITOR.getUrl(b+a.image)+'"'+(CKEDITOR.env.ie6Compat?' onload\x3d"this.width\x3dthis.width"':
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js b/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
index 03426c04756..6e2997a53c6 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
@@ -1,7 +1,7 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.addTemplates("default",{imagesPath:CKEDITOR.getUrl(CKEDITOR.plugins.getPath("templates")+"templates/images/"),templates:[{title:"Image and Title",image:"template1.gif",description:"One main image with a title and text that surround the image.",html:'\x3ch3\x3e\x3cimg src\x3d" " alt\x3d"" style\x3d"margin-right: 10px" height\x3d"100" width\x3d"100" align\x3d"left" /\x3eType the title here\x3c/h3\x3e\x3cp\x3eType the text here\x3c/p\x3e'},{title:"Strange Template",image:"template2.gif",description:"A template that defines two colums, each one with a title, and some text.",
+CKEDITOR.addTemplates("default",{imagesPath:CKEDITOR.getUrl(CKEDITOR.plugins.getPath("templates")+"templates/images/"),templates:[{title:"Image and Title",image:"template1.gif",description:"One main image with a title and text that surround the image.",html:'\x3ch3\x3e\x3cimg src\x3d" " alt\x3d"" style\x3d"margin-right: 10px" height\x3d"100" width\x3d"100" align\x3d"left" /\x3eType the title here\x3c/h3\x3e\x3cp\x3eType the text here\x3c/p\x3e'},{title:"Strange Template",image:"template2.gif",description:"A template that defines two columns, each one with a title, and some text.",
 html:'\x3ctable cellspacing\x3d"0" cellpadding\x3d"0" style\x3d"width:100%" border\x3d"0"\x3e\x3ctr\x3e\x3ctd style\x3d"width:50%"\x3e\x3ch3\x3eTitle 1\x3c/h3\x3e\x3c/td\x3e\x3ctd\x3e\x3c/td\x3e\x3ctd style\x3d"width:50%"\x3e\x3ch3\x3eTitle 2\x3c/h3\x3e\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd\x3eText 1\x3c/td\x3e\x3ctd\x3e\x3c/td\x3e\x3ctd\x3eText 2\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3cp\x3eMore text goes here.\x3c/p\x3e'},{title:"Text and Table",image:"template3.gif",description:"A title with some text and a table.",
 html:'\x3cdiv style\x3d"width: 80%"\x3e\x3ch3\x3eTitle goes here\x3c/h3\x3e\x3ctable style\x3d"width:150px;float: right" cellspacing\x3d"0" cellpadding\x3d"0" border\x3d"1"\x3e\x3ccaption style\x3d"border:solid 1px black"\x3e\x3cstrong\x3eTable title\x3c/strong\x3e\x3c/caption\x3e\x3ctr\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3cp\x3eType the text here\x3c/p\x3e\x3c/div\x3e'}]});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template1.gif b/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template1.gif
index efdabbebd4503ceb55c948fa73b9b83cbd373e57..428c5a6a8840bd9fabd512c7e1f4c34c8841f992 100644
GIT binary patch
literal 539
zcmV+$0_6QiNk%w1VPpVC0OJY(lclDVrKgjosFbFs$<orw($dS)(#g})%G1-z)YSj~
z|NsC0|NsC0|NsC0|NsC0A^8LW3IGoPEC2ui0Av70000F3@C87ty*TU5yZ@IUfn;f(
zXD|Ry>%MR-&vb3yI1H?8?*G7`&mt@uk2xZ8$wVrf&?xRHty*1F7y&`(dcWW>7-5i!
z&*-$6mUXG$=kkjSuh(bo7B{-p+W%^J6*FCY1b%>tVS*Hdhfswtij!ZAJu#6@nJtu*
z2$qh9n4N&1pk|MnsaHmM51UJ{tU<1_N4B#=gQ%jpMYXH3!M?hUypX{Mbfk3%2dAUG
zE(gqj&oaQ$ddt;n&d`3^#Ko84$m6uT(dXzt+3f8}>gKBP<e~5_%H43^*z=Nx-Acx<
z&b1it>doO+P>er>0Nn^Qg3BI6W9t-Jw2_cW#f`~WB66Bo<Ri!j9fh5&;c5@00x<S9
zMDtLG$Oj2#%9%D(%|V+OV<afhjZ6##410R1`NGx8cut?9iz<~E)vCF!VrA7bsnV}w
zOkFJZf*RPfXMQ%lnZPUBuSmgdZKri^mAZDL;LY1)FW)6y-wNI$7ARSsg9WP%8T3Wl
z#AxIGYy5YX-^#6SVwQ4wb2`eNIp0JI`K;uzGt8C-ySRm`$E%f|HXPcr=GuU7<37@P
d_l@4ZSq>0@qPX$nB?3Gkj=Z^Z<jNxe06U?cA2R>|

literal 375
zcmV--0f_!bNk%w1VPpVC0FeLyva+%O00960{{R30A^8LV00000EC2ui0Av7000092
zgpaAq?GK}zwAu@W-n{z{hT=$;9b%^H%BpA!$8!13_AS@=&Xal%3~GMDB95pDD3{Ep
z^T{;k4xj+g%7JRP+$IPq!1Bb&uKB$DQa@x|8x8NO4b`hO25#T<cT?Wp$MV<17dSFF
z))BV|H3v{fXt;v7Qz+>OnRw~9=3yE0xyeE4CQ8$(2)Mz>8udZCXX=BRr7DZbW_#-a
zYZEHlJM(KAEc4dditDMnJ4(CC+&uK06fIp0D*Z|wX5EYpGb{?;a*WKVoEoWp!Y!`y
zeo4*}FFC(bZ<u%9$nH#MiXXad0R3$OV^9jhghduI4C3%%k9`6wT1+QVA-9Z3Kq7Ly
z;ql{)kRtK8vxt%(#*z~^va~_+<s_FfO%|-VgJQ~^i&o+sN%QB-n?ivSEo$=-QkX%P
V&N}LJD2Az2t6IH^HS2={06Vn%v1I@N

diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template2.gif b/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template2.gif
index d1cebb3aed88265add0a1d87d40de566f86a9619..c494efe260c33ecab0c109c59ac9465d295f6311 100644
GIT binary patch
literal 497
zcmZ?wbhEHbOkr?ic+9~tdFiq#OP5bxwqnY%<tHy)I(hl>DImIX<v$Lf_>+Z^i-Chd
zhXDvcW-ze)6JT{%z1QOP+1>xAD>SBL&Pz97@OZtiK<9i(?tKfMH97D8A6Rf+Nk^*R
zQmN>qi`MK58t*jMM#YBAXgu(?YX1X+ify8^&p(d57V5V9;>K^)^ZM3Cf2p~<^nLMF
zQRBK=!{(|6k*2ni*6!jC+uptmwn>xIrW%!3Oi!9QZEoEBvc~Xbp|h8-a$321o#)c^
zn;h0|-e$Eis%T*h+hW~)d*b&^FlIfJz-oB>MBJ%aJM|BqWnnviY4@IMN4MWK-Fk1^
zgNK_QKUw$e`KsBM&mP%z<?8;3i+X21UjOzn=BNIfn+vxcT&y-BM5*-oCB;393KUmW
z@tt<;>Bvj6PI<rK=;@Bv4>r}#XZfYL!`(NfyI$HgP9$tYvP#!xsY5AB#mgplnn^x7
z^Yg-EhY1e53%;07Ou4W?O)$rb;lqmEmFnf6dV-3xCaempPdLkUTK)PweN!t|t10us
zYm+Aybssd*J+Ue9d|m6N(s$-7%et?e<@VLPudH!5uVvMi6$ukOr<>W@aONfMumAd}
l*Cxg2spd5O+c#EMwljz<aPHO<WH|Wz;)>vYJy}KuYXFgy1+)MF

literal 333
zcmV-T0kZx_Nk%w1VPpVC0FeLyva+%O00960{{R30A^8LV00000EC2ui0Av7000092
zgpaAq?GK}zwAu@W-n{z{hT=$;9b%^H%BpA!$8!13_AS@=&Xal%3~GMDB93TG#*l)5
z^9hYgr_{iwip@$vOs!XY{ff7r?)dx+qsQEX@;zh1=Oa1&?y=+d0`r>f@duda#%D-q
zaHzPUxA@lRm;@PF<R|E*cA3?dNXa+p2?QF-GfH|?csggPiIv$(#R;HFXG)usdMlZ$
zTglrSWDC5)3On^`93?w!B+P8${Ot29eG^?BQk)EhyzR7%T}mCkG)~@fea?}tJ~ZwP
zF9_a_+eu$;e~)giKb_z2;$6IfgHG@RnC&3KG71+O{O7Pv!-(!6Y9NRa6GMw06gST5
f=<g#)5$xKPRCn@RN^%%lx_k*Urp%cV3IG5*5PY8V

diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template3.gif b/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/images/template3.gif
index db41cb4fb8fc7eafac8f382810e87147e791ad6e..d5a40cefad3ac245be6ea1125011cf3eadaba3fc 100644
GIT binary patch
literal 557
zcmV+|0@D3QNk%w1VPpVC0OJV&lclDVrKgjosFbFs$<orx($dM()5_D+%GA{V|NsC0
z|NsC0|NsC0|NsC0|NsC0A^8LW3IGoPEC2ui0Av70000F3@C87ty*TU5yZ@IUfn;f(
zXD|Ry>%MR-&vb3yI1H?8?*G7`&mt@uk2xZ8$wVrf&?xRHty*1F7-7rpdcWYXcuX$S
zvaUmU&2GEJGj!`suiL-z%IwbXv-1>teuIQvfITsVihc)&G>edRXL?taRdSY@MVOkM
zLzJGOK%Am31Zt261(Sg?2dI&+iIH8aGMEOmTm~^}m8Xubu&KOS1i#0(prtZfF1dY;
zrpYm+rOqwGcG7dyI?K$)$id;W<I1h&#=6+m;Az^5vf?zw^)>C^=`hf`_S5)mcr%9%
z5sX*54*csDu%RGw>Ht0xh;Ja4ck1#bqWH*S3v1h=*l~dv@qtDy93K`e`Ql{Dl+8Ro
zz=V+2yp}TOz$EBy--~{<7Mjdyawol>24B>SCDf%Uqc}-M6zLRXD5p9d#*~_oDAA%F
zxt7BUc4F9-EE$?zyA^G(c!h4J@e0)xH+@N;i4<CZs@SE(WE6nQD5ur5mJTDnqImHo
zjE*}sjtqq+VX8LozQBdK^DeOnE_+_2`JzwCk|Cq6G<mfX)vh0(j?EY{;L(}I0>$kQ
vv}oRpN`Hh+yE5_OOj;u!b$s~|<<64~5P+h(_3I@9JfM!fyLar`BLDz9DZwJt

literal 422
zcmV;X0a^Y>Nk%w1VPpVC0FeLyva+%O00960{{R30A^8LV00000EC2ui0Av7000092
zgpaAq?GK}zwAu@W-n{z{hT=$;9b%^H%BpA!$8!13_AS@=&Xal%3~GMDB93TG#*l%g
z^9hYgr_`$T`us4l+^+W<)gC_JviY3#AeC&_xD98m<8-m1jvsB&<_@0<GMBdz090rP
zFgS9^!+7$h2y*z>q~XXRsCap^IRqK$(K#c!N9pBf82AawVH$?WN){q&IjedXiz+EX
zOS+od%WDgp+d909toAG5`lTy-9D18rOxWx+T}>D*o&1Qa9n5V^96nACtqfi*?*05t
zZSMX~zfpQ^<%jRPUfiDEO<g>8=eEuB)DKv}S_cJW8uTxqL`=(AMXYB~Aenu4SM=e_
zrj6M`kqsZ_xrlC}y^5evW>krApudqWP2zFM5Fo{b%sA$2wGU)SI5vkKVQCad(WEn$
zGF`IFr&KONpB8ayRSwduHn4I{;q@zxs8h=VDkqjl*t8<nvaR~I>(;n#c+zd*_U=jy
QeEa(S3plV~2n7HDJNoX*`2YX_

diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js
index 5ef1d391f3e..af51da7255c 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js
@@ -19,9 +19,9 @@ for(var e=0;e<b.length;e++){var d=document.createElement("option");d.text=b[e];d
 a+";opacity: "+f+";filter: alpha(opacity\x3d"+100*f+");display: none;";k.id=d;h||e.appendChild(k);return{setDisable:function(){k.style.display="none"},setEnable:function(){k.style.display="block"}}},L=function(b,c,e){var d=new CKEDITOR.dom.element("div"),f=new CKEDITOR.dom.element("input"),h=new CKEDITOR.dom.element("label"),k="wscGrammerSuggest"+b+"_"+c;d.addClass("cke_dialog_ui_input_radio");d.setAttribute("role","presentation");d.setStyles({width:"97%",padding:"5px","white-space":"normal"});f.setAttributes({type:"radio",
 value:c,name:"wscGrammerSuggest",id:k});f.setStyles({"float":"left"});f.on("click",function(b){a.textNode.GrammTab.setValue(b.sender.getValue())});e?f.setAttribute("checked",!0):!1;f.addClass("cke_dialog_ui_radio_input");h.appendText(b);h.setAttribute("for",k);h.setStyles({display:"block","line-height":"16px","margin-left":"18px","white-space":"normal"});d.append(f);d.append(h);return d},F=function(a){a=a||"true";null!==a&&"false"==a&&t()},w=function(b){var c=new I(b);b="wscLang"+a.dialog.getParentEditor().name;
 b=document.getElementById(b);var e=a.iframeNumber+"_"+a.dialog._.currentTabId;a.buildOptionLang(c.setLangList,a.dialog.getParentEditor().name);u[c.getCurrentLangGroup(a.selectingLang)].onShow();F(a.show_grammar);b.onchange=function(b){b=c.getCurrentLangGroup(this.value);var f=a.dialog._.currentTabId;u[b].onShow();F(a.show_grammar);a.div_overlay.setEnable();a.selectingLang=this.value;f=a.cmd[f];b&&u[b]&&u[b].allowedTabCommands[f]||(f=u[b].defaultTabCommand);for(var h in a.cmd)if(a.cmd[h]==f){a.previousTab=
-h;break}g.postMessage.send({message:{changeLang:a.selectingLang,text:a.dataTemp,cmd:f},target:a.targetFromFrame[e],id:"selectionLang_outer__page"})}},M=function(b){var c,e=function(b){b=a.dialog.getContentElement(a.dialog._.currentTabId,b)||a.LocalizationButton[b].instance;b.getElement().hasClass("cke_disabled")?b.getElement().setStyle("color","#a0a0a0"):b.disable()};c=function(b){b=a.dialog.getContentElement(a.dialog._.currentTabId,b)||a.LocalizationButton[b].instance;b.enable();b.getElement().setStyle("color",
-"#333")};"no_any_suggestions"==b?(b="No suggestions",c=a.dialog.getContentElement(a.dialog._.currentTabId,"ChangeTo_button")||a.LocalizationButton.ChangeTo_button.instance,c.disable(),c=a.dialog.getContentElement(a.dialog._.currentTabId,"ChangeAll")||a.LocalizationButton.ChangeAll.instance,c.disable(),e("ChangeTo_button"),e("ChangeAll")):(c("ChangeTo_button"),c("ChangeAll"));return b},O={iframeOnload:function(b){a.div_overlay.setEnable();b=a.dialog._.currentTabId;E(a.targetFromFrame[a.iframeNumber+
-"_"+b],a.cmd[b])},suggestlist:function(b){delete b.id;a.div_overlay_no_check.setDisable();C();w(a.langList);var c=M(b.word),e="";c instanceof Array&&(c=b.word[0]);e=c=c.split(",");a.textNode.SpellTab.setValue(e[0]);b=z(A);A.clear();for(c=0;c<e.length;c++){var d=document.createElement("option");d.text=e[c];d.value=e[c];b.$.add(d,c)}v();a.div_overlay.setDisable()},grammerSuggest:function(b){delete b.id;delete b.mocklangs;C();w(a.langList);var c=b.grammSuggest[0];a.grammerSuggest.getElement().setHtml("");
+h;break}g.postMessage.send({message:{changeLang:a.selectingLang,interfaceLang:a.interfaceLang,text:a.dataTemp,cmd:f},target:a.targetFromFrame[e],id:"selectionLang_outer__page"})}},M=function(b){var c,e=function(b){b=a.dialog.getContentElement(a.dialog._.currentTabId,b)||a.LocalizationButton[b].instance;b.getElement().hasClass("cke_disabled")?b.getElement().setStyle("color","#a0a0a0"):b.disable()};c=function(b){b=a.dialog.getContentElement(a.dialog._.currentTabId,b)||a.LocalizationButton[b].instance;
+b.enable();b.getElement().setStyle("color","#333")};"no_any_suggestions"==b?(b="No suggestions",c=a.dialog.getContentElement(a.dialog._.currentTabId,"ChangeTo_button")||a.LocalizationButton.ChangeTo_button.instance,c.disable(),c=a.dialog.getContentElement(a.dialog._.currentTabId,"ChangeAll")||a.LocalizationButton.ChangeAll.instance,c.disable(),e("ChangeTo_button"),e("ChangeAll")):(c("ChangeTo_button"),c("ChangeAll"));return b},O={iframeOnload:function(b){a.div_overlay.setEnable();b=a.dialog._.currentTabId;
+E(a.targetFromFrame[a.iframeNumber+"_"+b],a.cmd[b])},suggestlist:function(b){delete b.id;a.div_overlay_no_check.setDisable();C();w(a.langList);var c=M(b.word),e="";c instanceof Array&&(c=b.word[0]);e=c=c.split(",");a.textNode.SpellTab.setValue(e[0]);b=z(A);A.clear();for(c=0;c<e.length;c++){var d=document.createElement("option");d.text=e[c];d.value=e[c];b.$.add(d,c)}v();a.div_overlay.setDisable()},grammerSuggest:function(b){delete b.id;delete b.mocklangs;C();w(a.langList);var c=b.grammSuggest[0];a.grammerSuggest.getElement().setHtml("");
 a.textNode.GrammTab.reset();a.textNode.GrammTab.setValue(c);a.textNodeInfo.GrammTab.getElement().setHtml("");a.textNodeInfo.GrammTab.getElement().setText(b.info);b=b.grammSuggest;for(var c=b.length,e=!0,d=0;d<c;d++)a.grammerSuggest.getElement().append(L(b[d],b[d],e)),e=!1;v();a.div_overlay.setDisable()},thesaurusSuggest:function(b){delete b.id;delete b.mocklangs;C();w(a.langList);a.selectNodeResponce=b;a.textNode.Thesaurus.reset();var c=z(a.selectNode.Categories),e=0;a.selectNode.Categories.clear();
 for(var d in b)b=document.createElement("option"),b.text=d,b.value=d,c.$.add(b,e),e++;c=a.selectNode.Categories.getInputElement().getChildren().$[0].value;a.selectNode.Categories.getInputElement().getChildren().$[0].selected=!0;a.buildOptionSynonyms(c);v();a.div_overlay.setDisable()},finish:function(b){delete b.id;N();b=a.dialog.getContentElement(a.dialog._.currentTabId,"BlockFinishChecking").getElement();b.removeStyle("display");b.removeStyle("position");b.removeStyle("left");b.show();a.div_overlay.setDisable()},
 settext:function(b){delete b.id;a.dialog.getParentEditor().getCommand("checkspell");var c=a.dialog.getParentEditor();if(c.scayt&&c.wsc.isSsrvSame){var e=c.wsc.udn;e?c.wsc.DataStorage.setData("scayt_user_dictionary_name",e):c.wsc.DataStorage.setData("scayt_user_dictionary_name","")}try{c.focus()}catch(d){}c.setData(b.text,function(){a.dataTemp="";c.unlockSelection();c.fire("saveSnapshot");a.dialog.hide()})},ReplaceText:function(b){delete b.id;a.div_overlay.setEnable();a.dataTemp=b.text;a.selectingLang=
@@ -29,8 +29,8 @@ b.currentLang;(b.cmd="0"!==b.len&&b.len)?a.div_overlay.setDisable():window.setTi
 b.DefOptions.localizationButtonsAndText;a.show_grammar=b.show_grammar;a.langList=b.lang;a.bnr=b.bannerId;a.sessionid=b.sessionid;if(b.bannerId){a.setHeightBannerFrame();var e=b.banner;a.dialog.getContentElement(a.dialog._.currentTabId,"banner").getElement().setHtml(e)}else a.setHeightFrame();"undefined"==c&&(a.userDictionaryName?(c=a.userDictionaryName,e={osp:g.cookie.get("osp"),udn:a.userDictionaryName,cust_dic_ids:a.cust_dic_ids,id:"options_dic_send",udnCmd:"create"},g.postMessage.send({message:e,
 target:a.targetFromFrame[void 0]})):c="");g.cookie.set("osp",b.DefOptions.osp);g.cookie.set("udn",c);g.cookie.set("cust_dic_ids",b.DefOptions.cust_dic_ids);g.postMessage.send({id:"giveOptions"})},options_dic_send:function(b){b={osp:g.cookie.get("osp"),udn:g.cookie.get("udn"),cust_dic_ids:a.cust_dic_ids,id:"options_dic_send",udnCmd:g.cookie.get("udnCmd")};g.postMessage.send({message:b,target:a.targetFromFrame[a.iframeNumber+"_"+a.dialog._.currentTabId]})},data:function(a){delete a.id},giveOptions:function(){},
 setOptionsConfirmF:function(){},setOptionsConfirmT:function(){r.setValue("")},clickBusy:function(){a.div_overlay.setEnable()},suggestAllCame:function(){a.div_overlay.setDisable();a.div_overlay_no_check.setDisable()},TextCorrect:function(){w(a.langList)}},G=function(a){a=a||window.event;if((a=window.JSON.parse(a.data))&&a.id)O[a.id](a)},E=function(b,c,e,d){c=c||CKEDITOR.config.wsc_cmd;e=e||a.dataTemp;g.postMessage.send({message:{customerId:a.wsc_customerId,text:e,txt_ctrl:a.TextAreaNumber,cmd:c,cust_dic_ids:a.cust_dic_ids,
-udn:a.userDictionaryName,slang:a.selectingLang,reset_suggest:d||!1,sessionid:a.sessionid},target:b,id:"data_outer__page"});a.div_overlay.setEnable()},u={superset:{onShow:function(){a.dialog.showPage("Thesaurus");a.dialog.showPage("GrammTab");l()},allowedTabCommands:{spell:!0,grammar:!0,thes:!0},defaultTabCommand:"spell"},usual:{onShow:function(){x();t();l()},allowedTabCommands:{spell:!0},defaultTabCommand:"spell"},rtl:{onShow:function(){x();t();l()},allowedTabCommands:{spell:!0},defaultTabCommand:"spell"},
-spellgrammar:{onShow:function(){x();a.dialog.showPage("GrammTab");l()},allowedTabCommands:{spell:!0,grammar:!0},defaultTabCommand:"spell"},spellthes:{onShow:function(){a.dialog.showPage("Thesaurus");t();l()},allowedTabCommands:{spell:!0,thes:!0},defaultTabCommand:"spell"}},H=function(b){var c=(new function(a){var b={};return{getCmdByTab:function(c){for(var h in a)b[a[h]]=h;return b[c]}}}(a.cmd)).getCmdByTab(CKEDITOR.config.wsc_cmd);b.selectPage(c);a.sendData(b)},x=function(){a.dialog.hidePage("Thesaurus")},
+udn:a.userDictionaryName,slang:a.selectingLang,interfaceLang:a.interfaceLang,reset_suggest:d||!1,sessionid:a.sessionid},target:b,id:"data_outer__page"});a.div_overlay.setEnable()},u={superset:{onShow:function(){a.dialog.showPage("Thesaurus");a.dialog.showPage("GrammTab");l()},allowedTabCommands:{spell:!0,grammar:!0,thes:!0},defaultTabCommand:"spell"},usual:{onShow:function(){x();t();l()},allowedTabCommands:{spell:!0},defaultTabCommand:"spell"},rtl:{onShow:function(){x();t();l()},allowedTabCommands:{spell:!0},
+defaultTabCommand:"spell"},spellgrammar:{onShow:function(){x();a.dialog.showPage("GrammTab");l()},allowedTabCommands:{spell:!0,grammar:!0},defaultTabCommand:"spell"},spellthes:{onShow:function(){a.dialog.showPage("Thesaurus");t();l()},allowedTabCommands:{spell:!0,thes:!0},defaultTabCommand:"spell"}},H=function(b){var c=(new function(a){var b={};return{getCmdByTab:function(c){for(var h in a)b[a[h]]=h;return b[c]}}}(a.cmd)).getCmdByTab(CKEDITOR.config.wsc_cmd);b.selectPage(c);a.sendData(b)},x=function(){a.dialog.hidePage("Thesaurus")},
 t=function(){a.dialog.hidePage("GrammTab")},l=function(){a.dialog.showPage("SpellTab")},v=function(){var b=a.dialog.getContentElement(a.dialog._.currentTabId,"bottomGroup").getElement();b.removeStyle("display");b.removeStyle("position");b.removeStyle("left");b.show()},N=function(){var b=a.dialog.getContentElement(a.dialog._.currentTabId,"bottomGroup").getElement(),c=document.activeElement,e;b.setStyles({display:"block",position:"absolute",left:"-9999px"});setTimeout(function(){b.removeStyle("display");
 b.removeStyle("position");b.removeStyle("left");b.hide();a.dialog._.editor.focusManager.currentActive.focusNext();e=g.misc.findFocusable(a.dialog.parts.contents);if(g.misc.hasClass(c,"cke_dialog_tab")||g.misc.hasClass(c,"cke_dialog_contents_body")||!g.misc.isVisible(c))for(var d=0,f;d<e.count();d++){if(f=e.getItem(d),g.misc.isVisible(f.$)){try{f.$.focus()}catch(h){}break}}else try{c.focus()}catch(k){}},0)},C=function(){var b=a.dialog.getContentElement(a.dialog._.currentTabId,"BlockFinishChecking").getElement(),
 c=document.activeElement,e;b.setStyles({display:"block",position:"absolute",left:"-9999px"});setTimeout(function(){b.removeStyle("display");b.removeStyle("position");b.removeStyle("left");b.hide();a.dialog._.editor.focusManager.currentActive.focusNext();e=g.misc.findFocusable(a.dialog.parts.contents);if(g.misc.hasClass(c,"cke_dialog_tab")||g.misc.hasClass(c,"cke_dialog_contents_body")||!g.misc.isVisible(c))for(var d=0,f;d<e.count();d++){if(f=e.getItem(d),g.misc.isVisible(f.$)){try{f.$.focus()}catch(h){}break}}else try{c.focus()}catch(k){}},
@@ -46,15 +46,15 @@ e.src=d;document.getElementsByTagName("head")[0].appendChild(e);e.onload=c;e.onr
 new_word:e},target:a.targetFromFrame[d],id:"cmd_outer__page"});"ChangeTo"!=f&&"ChangeAll"!=f||b.fire("saveSnapshot");"FinishChecking"==f&&b.config.wsc_onFinish.call(CKEDITOR.document.getWindow().getFrame())},f={minWidth:560,minHeight:444};return{title:b.config.wsc_dialogTitle||b.lang.wsc.title,minWidth:f.minWidth,minHeight:f.minHeight,buttons:[CKEDITOR.dialog.cancelButton],onLoad:function(){a.dialog=this;x();t();l();b.plugins.scayt&&e()},onShow:function(){a.dialog=this;b.lockSelection(b.getSelection());
 a.TextAreaNumber="cke_textarea_"+b.name;g.postMessage.init(G);a.dataTemp=b.getData();a.OverlayPlace=a.dialog.parts.tabs.getParent().$;if(CKEDITOR&&CKEDITOR.config){a.wsc_customerId=b.config.wsc_customerId;a.cust_dic_ids=b.config.wsc_customDictionaryIds;a.userDictionaryName=b.config.wsc_userDictionaryName;a.defaultLanguage=CKEDITOR.config.defaultLanguage;var d="file:"==document.location.protocol?"http:":document.location.protocol,d=b.config.wsc_customLoaderScript||d+"//loader.webspellchecker.net/sproxy_fck/sproxy.php?plugin\x3dfck2\x26customerid\x3d"+
 a.wsc_customerId+"\x26cmd\x3dscript\x26doc\x3dwsc\x26schema\x3d22";c(this);CKEDITOR.scriptLoader.load(d,function(c){CKEDITOR.config&&CKEDITOR.config.wsc&&CKEDITOR.config.wsc.DefaultParams?(a.serverLocationHash=CKEDITOR.config.wsc.DefaultParams.serviceHost,a.logotype=CKEDITOR.config.wsc.DefaultParams.logoPath,a.loadIcon=CKEDITOR.config.wsc.DefaultParams.iconPath,a.loadIconEmptyEditor=CKEDITOR.config.wsc.DefaultParams.iconPathEmptyEditor,a.LangComparer=new CKEDITOR.config.wsc.DefaultParams._SP_FCK_LangCompare):
-(a.serverLocationHash=DefaultParams.serviceHost,a.logotype=DefaultParams.logoPath,a.loadIcon=DefaultParams.iconPath,a.loadIconEmptyEditor=DefaultParams.iconPathEmptyEditor,a.LangComparer=new _SP_FCK_LangCompare);a.pluginPath=CKEDITOR.getUrl(b.plugins.wsc.path);a.iframeNumber=a.TextAreaNumber;a.templatePath=a.pluginPath+"dialogs/tmp.html";a.LangComparer.setDefaulLangCode(a.defaultLanguage);a.currentLang=b.config.wsc_lang||a.LangComparer.getSPLangCode(b.langCode)||"en_US";a.selectingLang=a.currentLang;
-a.div_overlay=new B({opacity:"1",background:"#fff url("+a.loadIcon+") no-repeat 50% 50%",target:a.OverlayPlace});var d=a.dialog.parts.tabs.getId(),d=CKEDITOR.document.getById(d);d.setStyle("width","97%");d.getElementsByTag("DIV").count()||d.append(a.buildSelectLang(a.dialog.getParentEditor().name));a.div_overlay_no_check=new B({opacity:"1",id:"no_check_over",background:"#fff url("+a.loadIconEmptyEditor+") no-repeat 50% 50%",target:a.OverlayPlace});c&&(H(a.dialog),a.dialog.setupContent(a.dialog));
+(a.serverLocationHash=DefaultParams.serviceHost,a.logotype=DefaultParams.logoPath,a.loadIcon=DefaultParams.iconPath,a.loadIconEmptyEditor=DefaultParams.iconPathEmptyEditor,a.LangComparer=new _SP_FCK_LangCompare);a.pluginPath=CKEDITOR.getUrl(b.plugins.wsc.path);a.iframeNumber=a.TextAreaNumber;a.templatePath=a.pluginPath+"dialogs/tmp.html";a.LangComparer.setDefaulLangCode(a.defaultLanguage);a.currentLang=b.config.wsc_lang||a.LangComparer.getSPLangCode(b.langCode)||"en_US";a.interfaceLang=b.config.wsc_interfaceLang;
+a.selectingLang=a.currentLang;a.div_overlay=new B({opacity:"1",background:"#fff url("+a.loadIcon+") no-repeat 50% 50%",target:a.OverlayPlace});var d=a.dialog.parts.tabs.getId(),d=CKEDITOR.document.getById(d);d.setStyle("width","97%");d.getElementsByTag("DIV").count()||d.append(a.buildSelectLang(a.dialog.getParentEditor().name));a.div_overlay_no_check=new B({opacity:"1",id:"no_check_over",background:"#fff url("+a.loadIconEmptyEditor+") no-repeat 50% 50%",target:a.OverlayPlace});c&&(H(a.dialog),a.dialog.setupContent(a.dialog));
 b.plugins.scayt&&(b.wsc.isSsrvSame=function(){var a=CKEDITOR.config.wsc.DefaultParams.serviceHost.replace("lf/22/js/../../../","").split("//")[1],c=CKEDITOR.config.wsc.DefaultParams.ssrvHost,d=b.config.scayt_srcUrl,e,h,f,g,p;window.SCAYT&&window.SCAYT.CKSCAYT&&(f=SCAYT.CKSCAYT.prototype.basePath,f.split("//"),g=f.split("//")[1].split("/")[0],p=f.split(g+"/")[1].replace("/lf/scayt3/ckscayt/","")+"/script/ssrv.cgi");!d||f||b.config.scayt_servicePath||(d.split("//"),e=d.split("//")[1].split("/")[0],
 h=d.split(e+"/")[1].replace("/lf/scayt3/ckscayt/ckscayt.js","")+"/script/ssrv.cgi");return"//"+a+c==="//"+(b.config.scayt_serviceHost||g||e)+"/"+(b.config.scayt_servicePath||p||h)}());if(window.SCAYT&&b.wsc&&b.wsc.isSsrvSame){var e=b.wsc.cgiOrigin();b.wsc.syncIsDone=!1;c=function(a){a.origin===e&&(a=JSON.parse(a.data),a.ud&&"undefined"!==a.ud?b.wsc.ud=a.ud:"undefined"===a.ud&&(b.wsc.ud=void 0),a.udn&&"undefined"!==a.udn?b.wsc.udn=a.udn:"undefined"===a.udn&&(b.wsc.udn=void 0),b.wsc.syncIsDone||(h(b.wsc.ud),
 b.wsc.syncIsDone=!0))};var h=function(c){c=b.wsc.getLocalStorageUD();var d;c instanceof Array&&(d=c.toString());void 0!==d&&""!==d&&setTimeout(function(){b.wsc.addWords(d,function(){H(a.dialog);a.dialog.setupContent(a.dialog)})},400)};window.addEventListener?addEventListener("message",c,!1):window.attachEvent("onmessage",c);setTimeout(function(){var a=b.wsc.getLocalStorageUDN();void 0!==a&&b.wsc.operationWithUDN("restore",a)},500)}})}else a.dialog.hide()},onHide:function(){var c=CKEDITOR.plugins.scayt,
 d=b.scayt;b.unlockSelection();c&&d&&c.state[b.name]&&d.setMarkupPaused(!1);a.dataTemp="";a.sessionid="";g.postMessage.unbindHandler(G);if(b.plugins.scayt&&b.wsc&&b.wsc.isSsrvSame){var c=b.wsc.udn,e=b.wsc.ud,f,l;b.scayt?(c?(b.wsc.DataStorage.setData("scayt_user_dictionary_name",c),b.scayt.restoreUserDictionary(c)):(b.wsc.DataStorage.setData("scayt_user_dictionary_name",""),b.scayt.removeUserDictionary()),e&&setTimeout(function(){f=e.split(",");for(l=0;l<f.length;l+=1)b.scayt.addWordToUserDictionary(f[l])},
 200),e||b.wsc.DataStorage.setData("scayt_user_dictionary",[])):(c?b.wsc.DataStorage.setData("scayt_user_dictionary_name",c):b.wsc.DataStorage.setData("scayt_user_dictionary_name",""),e&&(f=e.split(","),b.wsc.DataStorage.setData("scayt_user_dictionary",f)))}},contents:[{id:"SpellTab",label:"SpellChecker",accessKey:"S",elements:[{type:"html",id:"banner",label:"banner",style:"",html:"\x3cdiv\x3e\x3c/div\x3e"},{type:"html",id:"Content",label:"spellContent",html:"",setup:function(b){b=a.iframeNumber+"_"+
-b._.currentTabId;var c=document.getElementById(b);a.targetFromFrame[b]=c.contentWindow}},{type:"hbox",id:"bottomGroup",style:"width:560px; margin: 0 auto;",widths:["50%","50%"],children:[{type:"hbox",id:"leftCol",align:"left",width:"50%",children:[{type:"vbox",id:"rightCol1",widths:["50%","50%"],children:[{type:"text",id:"ChangeTo_label",label:a.LocalizationLabel.ChangeTo_label.text+":",labelLayout:"horizontal",labelStyle:"font: 12px/25px arial, sans-serif;",width:"140px","default":"",onShow:function(){a.textNode.SpellTab=
-this;a.LocalizationLabel.ChangeTo_label.instance=this},onHide:function(){this.reset()}},{type:"hbox",id:"rightCol",align:"right",width:"30%",children:[{type:"vbox",id:"rightCol_col__left",children:[{type:"text",id:"labelSuggestions",label:a.LocalizationLabel.Suggestions.text+":",onShow:function(){a.LocalizationLabel.Suggestions.instance=this;this.getInputElement().setStyles({display:"none"})}},{type:"html",id:"logo",html:'\x3cimg width\x3d"99" height\x3d"68" border\x3d"0" src\x3d"" title\x3d"WebSpellChecker.net" alt\x3d"WebSpellChecker.net" style\x3d"display: inline-block;"\x3e',
+b._.currentTabId;var c=document.getElementById(b);a.targetFromFrame[b]=c.contentWindow}},{type:"hbox",id:"bottomGroup",style:"width:560px; margin: 0 auto;",widths:["50%","50%"],className:"wsc-spelltab-bottom",children:[{type:"hbox",id:"leftCol",align:"left",width:"50%",children:[{type:"vbox",id:"rightCol1",widths:["50%","50%"],children:[{type:"text",id:"ChangeTo_label",label:a.LocalizationLabel.ChangeTo_label.text+":",labelLayout:"horizontal",labelStyle:"font: 12px/25px arial, sans-serif;",width:"140px",
+"default":"",onShow:function(){a.textNode.SpellTab=this;a.LocalizationLabel.ChangeTo_label.instance=this},onHide:function(){this.reset()}},{type:"hbox",id:"rightCol",align:"right",width:"30%",children:[{type:"vbox",id:"rightCol_col__left",children:[{type:"text",id:"labelSuggestions",label:a.LocalizationLabel.Suggestions.text+":",onShow:function(){a.LocalizationLabel.Suggestions.instance=this;this.getInputElement().setStyles({display:"none"})}},{type:"html",id:"logo",html:'\x3cimg width\x3d"99" height\x3d"68" border\x3d"0" src\x3d"" title\x3d"WebSpellChecker.net" alt\x3d"WebSpellChecker.net" style\x3d"display: inline-block;"\x3e',
 setup:function(b){this.getElement().$.src=a.logotype;this.getElement().getParent().setStyles({"text-align":"left"})}}]},{type:"select",id:"list_of_suggestions",labelStyle:"font: 12px/25px arial, sans-serif;",size:"6",inputStyle:"width: 140px; height: auto;",items:[["loading..."]],onShow:function(){A=this},onChange:function(){a.textNode.SpellTab.setValue(this.getValue())}}]}]}]},{type:"hbox",id:"rightCol",align:"right",width:"50%",children:[{type:"vbox",id:"rightCol_col__left",widths:["50%","50%",
 "50%","50%"],children:[{type:"button",id:"ChangeTo_button",label:a.LocalizationButton.ChangeTo_button.text,title:"Change to",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd","ChangeTo");a.LocalizationButton.ChangeTo_button.instance=this},onClick:d},{type:"button",id:"ChangeAll",label:a.LocalizationButton.ChangeAll.text,title:"Change All",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);a.LocalizationButton.ChangeAll.instance=
 this},onClick:d},{type:"button",id:"AddWord",label:a.LocalizationButton.AddWord.text,title:"Add word",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);a.LocalizationButton.AddWord.instance=this},onClick:d},{type:"button",id:"FinishChecking_button",label:a.LocalizationButton.FinishChecking_button.text,title:"Finish Checking",style:"width: 100%;margin-top: 9px;",onLoad:function(){this.getElement().setAttribute("title-cmd","FinishChecking");a.LocalizationButton.FinishChecking_button.instance=
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/skins/moono-lisa/wsc.css b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/skins/moono-lisa/wsc.css
new file mode 100644
index 00000000000..a48a08f9f4d
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/skins/moono-lisa/wsc.css
@@ -0,0 +1,43 @@
+.cke_dialog_body #overlayBlock,
+.cke_dialog_body #no_check_over
+{
+    top: 39px !important;
+}
+
+div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_vbox td > .cke_dialog_ui_button:first-child
+{
+    margin-top: 4px;
+}
+
+div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select > label
+{
+    margin-left: 0;
+}
+
+div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select div.cke_dialog_ui_input_select
+{
+    width: 140px !important;
+}
+
+div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select select.cke_dialog_ui_input_select,
+div[name=Thesaurus] div.cke_dialog_ui_input_select select.cke_dialog_ui_input_select
+{
+    margin-top: 1px;
+}
+
+div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select select.cke_dialog_ui_input_select:focus,
+div[name=Thesaurus] div.cke_dialog_ui_input_select select.cke_dialog_ui_input_select:focus
+{
+    margin-top: 0;
+}
+
+div[name=GrammTab] .cke_dialog_ui_vbox tbody > tr:first-child .cke_dialog_ui_button,
+div[name=Thesaurus] .cke_dialog_ui_vbox tbody > tr:first-child .cke_dialog_ui_button
+{
+    margin-top: 4px !important;
+}
+
+div[name=Thesaurus] div.cke_dialog_ui_input_select
+{
+    width: 180px !important;
+}
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/css/samples.css b/htdocs/includes/ckeditor/ckeditor/samples/css/samples.css
index 7697e827287..455b15239e0 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/css/samples.css
+++ b/htdocs/includes/ckeditor/ckeditor/samples/css/samples.css
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md or http://ckeditor.com/license
  */
 @media (max-width: 900px) {
@@ -136,7 +136,7 @@ html {
 }
 .navigation-a {
   height: 30px;
-  background: #3d3d3d;
+  background: #3D3D3D;
   position: absolute;
   left: 0;
   right: 0;
@@ -197,14 +197,14 @@ html {
   line-height: 1.13rem;
   line-height: 30px;
   float: left;
-  color: #dddddd;
+  color: #ddd;
   font-weight: bold;
   text-decoration: none;
   text-transform: uppercase;
 }
 .navigation-a ul li a:hover {
   cursor: pointer;
-  color: #ffffff;
+  color: #fff;
 }
 .icon-navigation-a-github:before,
 .icon-navigation-a-github:after {
@@ -282,9 +282,9 @@ html {
   color: #8a8a8a;
 }
 .footer-a a {
-  color: #27c0d8;
+  color: #27C0D8;
   text-decoration: none;
-  border-bottom: 1px dotted #27c0d8;
+  border-bottom: 1px dotted #27C0D8;
 }
 .footer-a a:hover {
   color: #23adc2;
@@ -333,7 +333,7 @@ html {
 .content blockquote,
 .content pre {
   background: none;
-  border-left: 4px solid #27c0d8;
+  border-left: 4px solid #27C0D8;
   padding: 1.5em 2.25em;
 }
 .content p a,
@@ -345,9 +345,9 @@ html {
 .content h3 a,
 .content h4 a,
 .content h5 a {
-  color: #27c0d8;
+  color: #27C0D8;
   text-decoration: none;
-  border-bottom: 1px dotted #27c0d8;
+  border-bottom: 1px dotted #27C0D8;
 }
 .content p a:hover,
 .content ul a:hover,
@@ -422,7 +422,7 @@ html {
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.08);
   font: inherit;
   color: inherit;
-  border: 1px solid #d9d9d9;
+  border: 1px solid #D9D9D9;
   padding: .2em .5em;
 }
 .content input:focus,
@@ -489,7 +489,7 @@ html {
 }
 .content hr {
   border: 0;
-  border-top: 4px solid #d9d9d9;
+  border-top: 4px solid #D9D9D9;
   margin: 1.5em 0;
 }
 .content input[type="text"] {
@@ -508,9 +508,9 @@ html {
   line-height: 1.35rem;
   font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
   padding: 2px 6px;
-  -webkit-box-shadow: 0 0 4px #ffffff inset, 0 2px 0 #d9d9d9;
-  -moz-box-shadow: 0 0 4px #ffffff inset, 0 2px 0 #d9d9d9;
-  box-shadow: 0 0 4px #ffffff inset, 0 2px 0 #d9d9d9;
+  -webkit-box-shadow: 0 0 4px #fff inset, 0 2px 0 #D9D9D9;
+  -moz-box-shadow: 0 0 4px #fff inset, 0 2px 0 #D9D9D9;
+  box-shadow: 0 0 4px #fff inset, 0 2px 0 #D9D9D9;
 }
 .content p img {
   vertical-align: middle;
@@ -704,7 +704,7 @@ body a.navigation-b ul li a:hover,
 body button.navigation-b ul li a:hover,
 body input.navigation-b ul li a:hover {
   color: #fff;
-  background: #27c0d8;
+  background: #27C0D8;
 }
 body a.button-a-background:active,
 body button.button-a-background:active,
@@ -826,7 +826,7 @@ body input.navigation-b ul li a:hover:hover {
   line-height: 25.2px;
   line-height: 1.57rem;
   font-weight: bold;
-  background-color: #27c0d8;
+  background-color: #27C0D8;
   overflow: hidden;
   display: inline-block;
   padding: 0.75em 0.25em;
@@ -1004,10 +1004,10 @@ footer > div {
   margin-top: 30px;
 }
 .footer-a {
-  border-top: 1px solid #d9d9d9;
+  border-top: 1px solid #D9D9D9;
 }
 .adjoined-top {
-  background-color: #27c0d8;
+  background-color: #27C0D8;
   color: #fff;
 }
 .adjoined-top .content h1,
@@ -1040,7 +1040,7 @@ footer > div {
 }
 .adjoined-top .content code {
   font-size: inherit;
-  color: #27c0d8;
+  color: #27C0D8;
 }
 .adjoined-bottom {
   position: relative;
@@ -1048,7 +1048,7 @@ footer > div {
 .adjoined-bottom:before {
   z-index: -1;
   content: '';
-  background: #27c0d8;
+  background: #27C0D8;
   position: absolute;
   top: 0;
   left: 0;
@@ -1091,15 +1091,7 @@ main .grid-container.freed-width {
 #main #editor {
   background: #FFF;
   padding: 2% 4%;
-  border: dashed 5px #27c0d8;
-}
-div.cke a.cke_button,
-div.cke .cke_combo_button {
-  border-bottom: none;
-}
-div.cke a.cke_button.cke_combo_button,
-div.cke .cke_combo_button.cke_combo_button {
-  border-bottom: 1px solid #a6a6a6;
+  border: dashed 5px #27C0D8;
 }
 #main .adjoined-top:before {
   height: 335px;
@@ -1313,7 +1305,7 @@ div.toolbarModifier .empty > p {
 div.toolbarModifier > ul {
   padding: 0;
   margin: 0;
-  border-top: 1px solid #cccccc;
+  border-top: 1px solid #ccc;
   width: 100%;
 }
 div.toolbarModifier > ul[data-type="table-header"] {
@@ -1336,7 +1328,7 @@ div.toolbarModifier > ul > li[data-type="header"] {
 }
 div.toolbarModifier > ul > li[data-type="group"],
 div.toolbarModifier > ul > li[data-type="separator"] {
-  border-bottom: 1px solid #cccccc;
+  border-bottom: 1px solid #ccc;
 }
 div.toolbarModifier > ul > li[data-type="subgroup"] {
   border-top: 1px solid #eee;
@@ -1425,7 +1417,7 @@ div.toolbarModifier > ul > li ul li {
   line-height: 1;
 }
 div.toolbarModifier > ul > li ul li[data-type="subgroup"] {
-  border-top: 1px solid #dddddd;
+  border-top: 1px solid #ddd;
 }
 div.toolbarModifier > ul > li ul li[data-type="subgroup"]:first-child {
   border-top: 0;
@@ -1491,7 +1483,7 @@ div.toolbarModifier-hints h3 {
   line-height: 2.03rem;
   padding: 0.36em 1.5em;
   background: #f5f5f5;
-  border-bottom: 1px solid #dddddd;
+  border-bottom: 1px solid #ddd;
   margin-top: 0;
   margin-bottom: 1.2em;
 }
@@ -1512,7 +1504,7 @@ div.toolbarModifier-hints dl dt {
   width: 9em;
   clear: both;
   text-align: right;
-  border-top: 1px solid #dddddd;
+  border-top: 1px solid #ddd;
   padding-left: 1.5em;
   padding-right: .1em;
   -webkit-box-sizing: border-box;
@@ -1637,4 +1629,4 @@ div.toolbarModifier-hints dl dd:after {
 #help-content {
   display: none;
 }
-/*# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../node_modules/cksource-samples-framework/components/global/global.less","../../node_modules/cksource-samples-framework/components/core/core.less","../../node_modules/cksource-samples-framework/components/grid/grid.less","../../node_modules/cksource-samples-framework/node_modules/lesshat/build/lesshat.less","../../node_modules/cksource-samples-framework/components/header-a/header-a.less","../../node_modules/cksource-samples-framework/components/navigation-a/navigation-a.less","../../node_modules/cksource-samples-framework/components/navigation-b/navigation-b.less","../../node_modules/cksource-samples-framework/components/footer-a/footer-a.less","../../node_modules/cksource-samples-framework/components/content/content.less","../../node_modules/cksource-samples-framework/components/button-a/button-a.less","../../node_modules/cksource-samples-framework/components/balloon-a/balloon-a.less","../../node_modules/cksource-samples-framework/components/icon/icon.less","../../node_modules/cksource-samples-framework/components/switch/switch.less","../../node_modules/cksource-samples-framework/components/toggler/toggler.less","../../node_modules/cksource-samples-framework/components/modal/modal.less","../../node_modules/cksource-samples-framework/components/basicsample/core.less","../../node_modules/cksource-samples-framework/components/basicsample/adjoined.less","../../samples/less/custom.less","../../samples/toolbarconfigurator/less/toolbarmodifier.less","../../samples/toolbarconfigurator/less/base.less"],"names":[],"mappings":"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"} */
+/*# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../node_modules/cksource-samples-framework/components/global/global.less","../../node_modules/cksource-samples-framework/components/core/core.less","../../node_modules/cksource-samples-framework/components/grid/grid.less","../../node_modules/cksource-samples-framework/node_modules/lesshat/build/lesshat.less","../../node_modules/cksource-samples-framework/components/header-a/header-a.less","../../node_modules/cksource-samples-framework/components/navigation-a/navigation-a.less","../../node_modules/cksource-samples-framework/components/navigation-b/navigation-b.less","../../node_modules/cksource-samples-framework/components/footer-a/footer-a.less","../../node_modules/cksource-samples-framework/components/content/content.less","../../node_modules/cksource-samples-framework/components/button-a/button-a.less","../../node_modules/cksource-samples-framework/components/balloon-a/balloon-a.less","../../node_modules/cksource-samples-framework/components/icon/icon.less","../../node_modules/cksource-samples-framework/components/switch/switch.less","../../node_modules/cksource-samples-framework/components/toggler/toggler.less","../../node_modules/cksource-samples-framework/components/modal/modal.less","../../node_modules/cksource-samples-framework/components/basicsample/core.less","../../node_modules/cksource-samples-framework/components/basicsample/adjoined.less","../../samples/less/custom.less","../../samples/toolbarconfigurator/less/toolbarmodifier.less","../../samples/toolbarconfigurator/less/base.less"],"names":[],"mappings":"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"} */
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/index.html b/htdocs/includes/ckeditor/ckeditor/samples/index.html
index 0b154b799d6..3d274cf054d 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/index.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -116,7 +116,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 			CKEditor &ndash; The text editor for the Internet &ndash; <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p class="grid-width-100" id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> &ndash; Frederico Knabben. All rights reserved.
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> &ndash; Frederico Knabben. All rights reserved.
 		</p>
 	</div>
 </footer>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/js/sample.js b/htdocs/includes/ckeditor/ckeditor/samples/js/sample.js
index c382b4777bd..1e582b51107 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/js/sample.js
+++ b/htdocs/includes/ckeditor/ckeditor/samples/js/sample.js
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/**
+ * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md or http://ckeditor.com/license
  */
 
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/js/sf.js b/htdocs/includes/ckeditor/ckeditor/samples/js/sf.js
index 72edbdebba6..69dd77d21a9 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/js/sf.js
+++ b/htdocs/includes/ckeditor/ckeditor/samples/js/sf.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 var SF=function(){function d(a){return(a=a.attributes?a.attributes.getNamedItem("class"):null)?a.value.split(" "):[]}function c(a){var e=document.createAttribute("class");e.value=a.join(" ");return e}var b={attachListener:function(a,e,b){if(a.addEventListener)a.addEventListener(e,b,!1);else if(a.attachEvent)a.attachEvent("on"+e,function(){b.apply(a,arguments)});else throw Error("Could not attach event.");}};b.indexOf=function(){var a=Array.prototype.indexOf;return"function"===a?function(e,b){return a.call(e,
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/ajax.html b/htdocs/includes/ckeditor/ckeditor/samples/old/ajax.html
index 3f88ec2ab5a..852a0867fae 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/ajax.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/ajax.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -77,7 +77,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/api.html b/htdocs/includes/ckeditor/ckeditor/samples/old/api.html
index d01f0ee6f30..682a7197c5b 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/api.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/api.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -202,7 +202,7 @@ Second line of text preceded by two line breaks.</textarea>
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/appendto.html b/htdocs/includes/ckeditor/ckeditor/samples/old/appendto.html
index 51e2d626a9f..a984704bb07 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/appendto.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/appendto.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -51,7 +51,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css b/htdocs/includes/ckeditor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
index 50daa1d06ff..b81e1d7882d 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md or http://ckeditor.com/license
  *
  * Styles used by the XHTML 1.1 sample page (xhtml.html).
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/assets/posteddata.php b/htdocs/includes/ckeditor/ckeditor/samples/old/assets/posteddata.php
index 914b0984d24..ca43cc9c861 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/assets/posteddata.php
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/assets/posteddata.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <?php
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 ?>
@@ -52,7 +52,7 @@ if (!empty($_POST))
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
 		</p>
 	</div>
 </body>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/assets/uilanguages/languages.js b/htdocs/includes/ckeditor/ckeditor/samples/old/assets/uilanguages/languages.js
index 3bd12482824..df904e182a6 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/assets/uilanguages/languages.js
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/assets/uilanguages/languages.js
@@ -1,7 +1,7 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-var CKEDITOR_LANGS=function(){var c={af:"Afrikaans",ar:"Arabic",bg:"Bulgarian",bn:"Bengali/Bangla",bs:"Bosnian",ca:"Catalan",cs:"Czech",cy:"Welsh",da:"Danish",de:"German","de-ch":"German (Switzerland)",el:"Greek",en:"English","en-au":"English (Australia)","en-ca":"English (Canadian)","en-gb":"English (United Kingdom)",eo:"Esperanto",es:"Spanish",et:"Estonian",eu:"Basque",fa:"Persian",fi:"Finnish",fo:"Faroese",fr:"French","fr-ca":"French (Canada)",gl:"Galician",gu:"Gujarati",he:"Hebrew",hi:"Hindi",
-hr:"Croatian",hu:"Hungarian",id:"Indonesian",is:"Icelandic",it:"Italian",ja:"Japanese",ka:"Georgian",km:"Khmer",ko:"Korean",ku:"Kurdish",lt:"Lithuanian",lv:"Latvian",mk:"Macedonian",mn:"Mongolian",ms:"Malay",nb:"Norwegian Bokmal",nl:"Dutch",no:"Norwegian",pl:"Polish",pt:"Portuguese (Portugal)","pt-br":"Portuguese (Brazil)",ro:"Romanian",ru:"Russian",si:"Sinhala",sk:"Slovak",sq:"Albanian",sl:"Slovenian",sr:"Serbian (Cyrillic)","sr-latn":"Serbian (Latin)",sv:"Swedish",th:"Thai",tr:"Turkish",tt:"Tatar",
-ug:"Uighur",uk:"Ukrainian",vi:"Vietnamese",zh:"Chinese Traditional","zh-cn":"Chinese Simplified"},b=[],a;for(a in CKEDITOR.lang.languages)b.push({code:a,name:c[a]||a});b.sort(function(a,b){return a.name<b.name?-1:1});return b}();
\ No newline at end of file
+var CKEDITOR_LANGS=function(){var c={af:"Afrikaans",ar:"Arabic",az:"Azerbaijani",bg:"Bulgarian",bn:"Bengali/Bangla",bs:"Bosnian",ca:"Catalan",cs:"Czech",cy:"Welsh",da:"Danish",de:"German","de-ch":"German (Switzerland)",el:"Greek",en:"English","en-au":"English (Australia)","en-ca":"English (Canadian)","en-gb":"English (United Kingdom)",eo:"Esperanto",es:"Spanish",et:"Estonian",eu:"Basque",fa:"Persian",fi:"Finnish",fo:"Faroese",fr:"French","fr-ca":"French (Canada)",gl:"Galician",gu:"Gujarati",he:"Hebrew",
+hi:"Hindi",hr:"Croatian",hu:"Hungarian",id:"Indonesian",is:"Icelandic",it:"Italian",ja:"Japanese",ka:"Georgian",km:"Khmer",ko:"Korean",ku:"Kurdish",lt:"Lithuanian",lv:"Latvian",mk:"Macedonian",mn:"Mongolian",ms:"Malay",nb:"Norwegian Bokmal",nl:"Dutch",no:"Norwegian",oc:"Occitan",pl:"Polish",pt:"Portuguese (Portugal)","pt-br":"Portuguese (Brazil)",ro:"Romanian",ru:"Russian",si:"Sinhala",sk:"Slovak",sq:"Albanian",sl:"Slovenian",sr:"Serbian (Cyrillic)","sr-latn":"Serbian (Latin)",sv:"Swedish",th:"Thai",
+tr:"Turkish",tt:"Tatar",ug:"Uighur",uk:"Ukrainian",vi:"Vietnamese",zh:"Chinese Traditional","zh-cn":"Chinese Simplified"},b=[],a;for(a in CKEDITOR.lang.languages)b.push({code:a,name:c[a]||a});b.sort(function(a,b){return a.name<b.name?-1:1});return b}();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/datafiltering.html b/htdocs/includes/ckeditor/ckeditor/samples/old/datafiltering.html
index 700cd9ed48c..dd78ba5d0cb 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/datafiltering.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/datafiltering.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -399,7 +399,7 @@ CKEDITOR.replace( 'editor4', {
 		<div class="description">
 			<p>
 				This editor is using a custom configuration for <abbr title="Advanced Content Filter">ACF</abbr>.
-				It's using the <a href="http://docs.ckeditor.com/#!/guide/dev_disallowed_content" target="_blank">
+				It's using the <a href="http://docs.ckeditor.com/#!/guide/dev_disallowed_content" rel="noopener noreferrer" target="_blank">
 				Disallowed Content</a> property of the filter to eliminate all <code>title</code> attributes.
 			</p>
 
@@ -454,7 +454,7 @@ CKEDITOR.replace( 'editor6', {
 		<div class="description">
 			<p>
 				This editor is using a custom configuration for <abbr title="Advanced Content Filter">ACF</abbr>.
-				It's using the <a href="http://docs.ckeditor.com/#!/guide/dev_disallowed_content" target="_blank">
+				It's using the <a href="http://docs.ckeditor.com/#!/guide/dev_disallowed_content" rel="noopener noreferrer" target="_blank">
 				Disallowed Content</a> property of the filter to eliminate all <code>a</code> and <code>img</code> tags,
 				while allowing all other tags.
 			</p>
@@ -500,7 +500,7 @@ CKEDITOR.replace( 'editor7', {
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/dialog/assets/my_dialog.js b/htdocs/includes/ckeditor/ckeditor/samples/old/dialog/assets/my_dialog.js
index 4f8fe1a2d11..04deb206bb6 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/dialog/assets/my_dialog.js
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/dialog/assets/my_dialog.js
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/**
+ * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md or http://ckeditor.com/license
  */
 
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/dialog/dialog.html b/htdocs/includes/ckeditor/ckeditor/samples/old/dialog/dialog.html
index 4064b714016..6a1440ed1d4 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/dialog/dialog.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/dialog/dialog.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -182,7 +182,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/divreplace.html b/htdocs/includes/ckeditor/ckeditor/samples/old/divreplace.html
index 91008c8e899..e882b22ef7c 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/divreplace.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/divreplace.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -136,7 +136,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/enterkey/enterkey.html b/htdocs/includes/ckeditor/ckeditor/samples/old/enterkey/enterkey.html
index dc7295f148f..ff9df0a366d 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/enterkey/enterkey.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/enterkey/enterkey.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -98,7 +98,7 @@ CKEDITOR.replace( '<em>textarea_id</em>', {
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputforflash.html b/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputforflash.html
index 59a5efacaee..2fea4ce7988 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputforflash.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputforflash.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -275,7 +275,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputhtml.html b/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputhtml.html
index bcf1eca8069..9e32f6be8bb 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputhtml.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/outputhtml.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -216,7 +216,7 @@ CKEDITOR.replace( '<em>textarea_id</em>', {
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/index.html b/htdocs/includes/ckeditor/ckeditor/samples/old/index.html
index fc26eda7c1d..b2ee7f968ca 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/index.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -124,7 +124,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
 		</p>
 	</div>
 </body>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/inlineall.html b/htdocs/includes/ckeditor/ckeditor/samples/old/inlineall.html
index 6fbd9ef38b3..8220ea59498 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/inlineall.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/inlineall.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -306,7 +306,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 			http://ckeditor.com</a>
 	</p>
 	<p id="copy">
-		Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a>
+		Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a>
 		- Frederico Knabben. All rights reserved.
 	</p>
 </div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/inlinebycode.html b/htdocs/includes/ckeditor/ckeditor/samples/old/inlinebycode.html
index 390b142b748..eea27236a54 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/inlinebycode.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/inlinebycode.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -116,7 +116,7 @@ var editor = CKEDITOR.inline( document.getElementById( 'editable' ) );
 				http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a>
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a>
 			- Frederico Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/inlinetextarea.html b/htdocs/includes/ckeditor/ckeditor/samples/old/inlinetextarea.html
index 99ac241a628..57e664ee228 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/inlinetextarea.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/inlinetextarea.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -105,7 +105,7 @@ var editor = CKEDITOR.inline( 'article-body' );
 				http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a>
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a>
 			- Frederico Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/jquery.html b/htdocs/includes/ckeditor/ckeditor/samples/old/jquery.html
index 75bffa9fd43..2f6d95812c6 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/jquery.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/jquery.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -95,7 +95,7 @@ $( document ).ready( function() {
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/magicline/magicline.html b/htdocs/includes/ckeditor/ckeditor/samples/old/magicline/magicline.html
index d769b7f21f7..a347d9c3647 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/magicline/magicline.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/magicline/magicline.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -201,7 +201,7 @@ CKEDITOR.replace( 'editor2', {
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/readonly.html b/htdocs/includes/ckeditor/ckeditor/samples/old/readonly.html
index 086e7b428cb..084d6af14f7 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/readonly.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/readonly.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -68,7 +68,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/replacebyclass.html b/htdocs/includes/ckeditor/ckeditor/samples/old/replacebyclass.html
index e2eaa3549cb..23652d6b30e 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/replacebyclass.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/replacebyclass.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -52,7 +52,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/replacebycode.html b/htdocs/includes/ckeditor/ckeditor/samples/old/replacebycode.html
index a447c4ebbe3..a4f4395af65 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/replacebycode.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/replacebycode.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -51,7 +51,7 @@ CKEDITOR.replace( '<em>textarea_id</em>' )
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/sample.css b/htdocs/includes/ckeditor/ckeditor/samples/old/sample.css
index 891509871de..33041112cff 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/sample.css
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/sample.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/sample.js b/htdocs/includes/ckeditor/ckeditor/samples/old/sample.js
index 1502efdee79..53e1db2b71b 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/sample.js
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/sample.js
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/**
+ * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md or http://ckeditor.com/license
  */
 
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/sample_posteddata.php b/htdocs/includes/ckeditor/ckeditor/samples/old/sample_posteddata.php
index d34d5811d0f..54e9b7ce81a 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/sample_posteddata.php
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/sample_posteddata.php
@@ -9,7 +9,7 @@
   To save the content created with CKEditor you need to read the POST data on the server
   side and write it to a file or the database.
 
-  Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+  Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
   For licensing, see LICENSE.md or http://ckeditor.com/license
 -------------------------------------------------------------------------------------------
 
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/tabindex.html b/htdocs/includes/ckeditor/ckeditor/samples/old/tabindex.html
index 22ff5bee2d5..4238f33ac17 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/tabindex.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/tabindex.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -70,7 +70,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/toolbar/toolbar.html b/htdocs/includes/ckeditor/ckeditor/samples/old/toolbar/toolbar.html
index 2b8df46f117..2c2622bb166 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/toolbar/toolbar.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/toolbar/toolbar.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -227,7 +227,7 @@ CKEDITOR.replace( <em>'textarea_id'</em>, {
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/uicolor.html b/htdocs/includes/ckeditor/ckeditor/samples/old/uicolor.html
index 8acc91fa978..fb61b1fe06a 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/uicolor.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/uicolor.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -64,7 +64,7 @@ CKEDITOR.replace( '<em>textarea_id</em>', {
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/uilanguages.html b/htdocs/includes/ckeditor/ckeditor/samples/old/uilanguages.html
index b1bb6947cac..76749cb0d0c 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/uilanguages.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/uilanguages.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -114,7 +114,7 @@ CKEDITOR.replace( '<em>textarea_id</em>', {
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html b/htdocs/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html
index 8d58389134c..7bb1a62a08b 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -72,7 +72,7 @@ CKEDITOR.replace( '<em>textarea_id</em>', {
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/old/xhtmlstyle.html b/htdocs/includes/ckeditor/ckeditor/samples/old/xhtmlstyle.html
index 0732848beb6..c918766fcd5 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/old/xhtmlstyle.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/old/xhtmlstyle.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <html>
@@ -226,7 +226,7 @@ CKEDITOR.replace( '<em>textarea_id</em>', {
 			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>
diff --git a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html
index cf3d0438a32..4d312892396 100644
--- a/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html
+++ b/htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 -->
 <!--[if IE 8]><html class="ie8"><![endif]-->
@@ -136,7 +136,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
 		CKEditor &ndash; The text editor for the Internet &ndash; <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 	</p>
 	<p class="grid-width-100" id="copy">
-		Copyright &copy; 2003-2016, <a class="samples" href="http://cksource.com/">CKSource</a> &ndash; Frederico Knabben. All rights reserved.
+		Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> &ndash; Frederico Knabben. All rights reserved.
 	</p>
 </footer>
 
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog.css
new file mode 100644
index 00000000000..4806c2b2a2d
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie.css
new file mode 100644
index 00000000000..a5522cc2564
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie8.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie8.css
new file mode 100644
index 00000000000..8833e5cad74
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie8.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}a.cke_dialog_ui_button{min-height:18px}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{min-height:18px}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus{padding-top:4px;padding-bottom:2px}select.cke_dialog_ui_input_select{width:100%!important}select.cke_dialog_ui_input_select:focus{margin-left:1px;width:100%!important;padding-top:2px;padding-bottom:2px}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_iequirks.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_iequirks.css
new file mode 100644
index 00000000000..590c5c22707
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_iequirks.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_footer{filter:""}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor.css
new file mode 100644
index 00000000000..9638ae8b06c
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon {background: url(icons.png?t=20af917) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=20af917) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=20af917) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=20af917) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=20af917) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=20af917) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=20af917) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=20af917) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=20af917) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=20af917) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=20af917) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=20af917) no-repeat 0 -504px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=20af917) no-repeat 0 -528px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=20af917) no-repeat 0 -552px !important;}.cke_button__replace_icon {background: url(icons.png?t=20af917) no-repeat 0 -576px !important;}.cke_button__flash_icon {background: url(icons.png?t=20af917) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=20af917) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=20af917) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=20af917) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=20af917) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=20af917) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=20af917) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=20af917) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=20af917) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=20af917) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=20af917) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=20af917) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=20af917) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=20af917) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=20af917) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=20af917) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=20af917) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=20af917) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=20af917) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=20af917) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=20af917) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=20af917) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=20af917) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=20af917) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=20af917) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=20af917) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=20af917) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=20af917) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=20af917) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=20af917) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=20af917) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=20af917) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=20af917) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=20af917) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=20af917) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=20af917) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=20af917) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=20af917) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=20af917) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=20af917) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=20af917) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -2016px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=20af917) no-repeat 0 -2040px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -2016px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -2040px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_gecko.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_gecko.css
new file mode 100644
index 00000000000..7b02ed3fc3f
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_gecko.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_bottom{padding-bottom:3px}.cke_combo_text{margin-bottom:-1px;margin-top:1px}.cke_button__about_icon {background: url(icons.png?t=20af917) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=20af917) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=20af917) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=20af917) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=20af917) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=20af917) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=20af917) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=20af917) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=20af917) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=20af917) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=20af917) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=20af917) no-repeat 0 -504px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=20af917) no-repeat 0 -528px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=20af917) no-repeat 0 -552px !important;}.cke_button__replace_icon {background: url(icons.png?t=20af917) no-repeat 0 -576px !important;}.cke_button__flash_icon {background: url(icons.png?t=20af917) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=20af917) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=20af917) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=20af917) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=20af917) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=20af917) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=20af917) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=20af917) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=20af917) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=20af917) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=20af917) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=20af917) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=20af917) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=20af917) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=20af917) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=20af917) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=20af917) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=20af917) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=20af917) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=20af917) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=20af917) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=20af917) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=20af917) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=20af917) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=20af917) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=20af917) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=20af917) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=20af917) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=20af917) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=20af917) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=20af917) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=20af917) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=20af917) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=20af917) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=20af917) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=20af917) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=20af917) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=20af917) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=20af917) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=20af917) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=20af917) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -2016px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=20af917) no-repeat 0 -2040px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -2016px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -2040px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie.css
new file mode 100644
index 00000000000..e839cfbfcf2
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_button__about_icon {background: url(icons.png?t=20af917) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=20af917) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=20af917) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=20af917) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=20af917) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=20af917) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=20af917) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=20af917) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=20af917) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=20af917) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=20af917) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=20af917) no-repeat 0 -504px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=20af917) no-repeat 0 -528px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=20af917) no-repeat 0 -552px !important;}.cke_button__replace_icon {background: url(icons.png?t=20af917) no-repeat 0 -576px !important;}.cke_button__flash_icon {background: url(icons.png?t=20af917) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=20af917) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=20af917) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=20af917) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=20af917) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=20af917) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=20af917) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=20af917) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=20af917) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=20af917) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=20af917) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=20af917) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=20af917) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=20af917) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=20af917) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=20af917) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=20af917) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=20af917) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=20af917) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=20af917) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=20af917) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=20af917) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=20af917) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=20af917) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=20af917) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=20af917) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=20af917) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=20af917) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=20af917) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=20af917) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=20af917) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=20af917) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=20af917) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=20af917) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=20af917) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=20af917) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=20af917) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=20af917) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=20af917) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=20af917) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=20af917) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -2016px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=20af917) no-repeat 0 -2040px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -2016px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -2040px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie8.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie8.css
new file mode 100644
index 00000000000..bc2e8640383
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie8.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_toolbar{position:relative}.cke_rtl .cke_toolbar_end{right:auto;left:0}.cke_toolbar_end:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:1px;right:2px}.cke_rtl .cke_toolbar_end:after{right:auto;left:2px}.cke_hc .cke_toolbar_end:after{top:2px;right:5px;border-color:#000}.cke_hc.cke_rtl .cke_toolbar_end:after{right:auto;left:5px}.cke_combo+.cke_toolbar_end:after,.cke_toolbar.cke_toolbar_last .cke_toolbar_end:after{content:none;border:0}.cke_combo+.cke_toolgroup+.cke_toolbar_end:after{right:0}.cke_rtl .cke_combo+.cke_toolgroup+.cke_toolbar_end:after{right:auto;left:0}.cke_button__about_icon {background: url(icons.png?t=20af917) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=20af917) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=20af917) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=20af917) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=20af917) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=20af917) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=20af917) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=20af917) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=20af917) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=20af917) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=20af917) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=20af917) no-repeat 0 -504px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=20af917) no-repeat 0 -528px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=20af917) no-repeat 0 -552px !important;}.cke_button__replace_icon {background: url(icons.png?t=20af917) no-repeat 0 -576px !important;}.cke_button__flash_icon {background: url(icons.png?t=20af917) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=20af917) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=20af917) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=20af917) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=20af917) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=20af917) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=20af917) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=20af917) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=20af917) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=20af917) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=20af917) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=20af917) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=20af917) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=20af917) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=20af917) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=20af917) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=20af917) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=20af917) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=20af917) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=20af917) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=20af917) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=20af917) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=20af917) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=20af917) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=20af917) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=20af917) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=20af917) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=20af917) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=20af917) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=20af917) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=20af917) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=20af917) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=20af917) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=20af917) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=20af917) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=20af917) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=20af917) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=20af917) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=20af917) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=20af917) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=20af917) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -2016px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=20af917) no-repeat 0 -2040px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -2016px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -2040px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_iequirks.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_iequirks.css
new file mode 100644
index 00000000000..6f01aee2ef2
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_iequirks.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_top,.cke_contents,.cke_bottom{width:100%}.cke_button_arrow{font-size:0}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_rtl .cke_button_icon{float:none}.cke_resizer{width:10px}.cke_source{white-space:normal}.cke_bottom{position:static}.cke_colorbox{font-size:0}.cke_button__about_icon {background: url(icons.png?t=20af917) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=20af917) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=20af917) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=20af917) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=20af917) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=20af917) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=20af917) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=20af917) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=20af917) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=20af917) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=20af917) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=20af917) no-repeat 0 -504px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=20af917) no-repeat 0 -528px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=20af917) no-repeat 0 -552px !important;}.cke_button__replace_icon {background: url(icons.png?t=20af917) no-repeat 0 -576px !important;}.cke_button__flash_icon {background: url(icons.png?t=20af917) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=20af917) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=20af917) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=20af917) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=20af917) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=20af917) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=20af917) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=20af917) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=20af917) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=20af917) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=20af917) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=20af917) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=20af917) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=20af917) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=20af917) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=20af917) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=20af917) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=20af917) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=20af917) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=20af917) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=20af917) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=20af917) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=20af917) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=20af917) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=20af917) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=20af917) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=20af917) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=20af917) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=20af917) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=20af917) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=20af917) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=20af917) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=20af917) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=20af917) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=20af917) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=20af917) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=20af917) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=20af917) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=20af917) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=20af917) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=20af917) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=20af917) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -2016px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=20af917) no-repeat 0 -2040px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -2016px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -2040px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/icons.png b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..958eedc340a777055aa5213176e9aadf0d044fde
GIT binary patch
literal 12421
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
Xyuya|^pxP=3m}cVx+++-UF81(KEs1{

literal 0
HcmV?d00001

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/icons_hidpi.png b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/icons_hidpi.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b069915f7616d49c3f6790a9b4d89491f9eafa1
GIT binary patch
literal 40265
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
AssI20

literal 0
HcmV?d00001

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/arrow.png b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/arrow.png
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/images/arrow.png
rename to htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/arrow.png
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/close.png b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..40caa6ddfd01c2a26947761de218e4ce8f5e361e
GIT binary patch
literal 615
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CDO3=9p;3=BX21L>Cx45bDP46hOx7_4S6Fo@?*ia+WGRLhp+?e4<x9|RZdT|OBo
z!dc)ES<Jw|Eeyhp4727)00r4gJbhi+AFvDa%4zA^eUM~eU<~tgaSX9I-5czfb=ZMN
zCiD7(8dZG`mFZ$kN86niOmKerzA8t-a*ESJ+pm+@RnDK-%Drt#oKE%Y8%wQju9nPP
za&zgbRSy!=!tbB?^Ll>A1op@M5>3aOmOBJL-|3|^OV7Yn$}BPM-7dk4;tau8cTbEB
zVOVq2VrTe-pr)C+XL-*25p&w{RY|c$I<(f*c*aemrB}2+@TEpJ&78kybw|w+iRXsL
zc6QXHdC8sL^yZ3dsB5%j+BccxKY6pB9X)fw<gBK=^06NZO4i}aR_$ft7rZIzy0K`{
z^X^3vPgBnK-(yzV_2iv^V8@G3_p3Lod;QC1&(zY``HXAabKk5oyw6-wUc`|o=oFDs
zU6F6t_ukz@)6s?R<~DPsB9V#8#`#9&e0j<Y8&;K>F<ESVvUb(G+cy`ks!qGNZO-J|
zD^@L7wQ5(cuwal^+#4;M=MhRyGIp15=9GP9`!r{=?SJOoX15=O)R`Ou2D)mAYeY#(
zVo9o1a#1RfVlXl=G}ARO*EO^ZF*LR^Hn1`=(l#)%GBA*sP+ozeAvZrIGp!Q0hRn0)
Rj{r3=c)I$ztaD0e0sv6L>9YU;

literal 0
HcmV?d00001

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/hidpi/close.png b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/hidpi/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa00f4fce646958807479472de68a95c5ac44eb2
GIT binary patch
literal 1238
zcmZ{jYg7_;7{>o7;-$1aS*Vpuj%MUhKwKnwBQeE>iCHQM;;kr2MKsN9ajfHLX|~d(
z0j_!7rnbWj70DqHaGE-Ec*#mE*7Aa+f@PN3=;J=@yzl!w=RD8(eS9y+L`T@$x!M5$
z>`9TtShMf=d^Rw%a*B$U%mzI{AQJ!(RjgZ0vHD!5MaGf=DB1}C_Ywf_%@KDRfP6Fn
zvkU<6)d0YA1l^QCa{)^|7(oP|KF{r*<{Re3I*&vSw|>6P!rmQRbokQ-0Lv#NA|Wn8
zVTd1y-b&iI_DfM<hX}3{yBh=GUd&An@9eKZ*l+6*(EF(8PhkXIpBts5hnwCi*I-8^
zkLqjL6$Hs##z9v}(3?+3^5ZuwgnU#Jm2g${SQYQy{DlbIhl1SP>n`pHG`3_1z=jcT
zi%WSg1p=WE0<Kn6a2%>#s-iqK<m(<9F+@;XYXK~hVJhc_lXi{}N4fKjpgVIzLlj@8
zbc^Eywm{<(MuPO_>?LkfYeSPPgL#*CapJyenttXZ*J|Ceva)*hv&=Giu4Kt|_o#+;
z>}-5zb*1N97r@o)GeM!9;t@cLsckcvyOSAjih68&?@b4ntN#|X>if2GF)*oA3JX>2
z4hjhwy!?~cHw`de9d!!lc$p5!CUKJ1nt02cawS`!FH}Dc!pg#IPiJR;LL!!f<L-{q
z8^-flo4u>-KqxU+hT6XNXeN)Uq#mFQcT1%o#$K1C{(32;>vwCG%E5GaBNVOT)^G;=
zh0*iUiL6p$=hO3@A`v@#dzX<2bzFJ5a~9^@Rc4Vld3Q9qGWNoUw~GdYK~WgE^SEkl
zZSCTrQr<O>hw#Q>+_KPnt5a1{Y}EP9-wpP!ju^wC{bl~-q4{NdM|ZL&DJ?MqVN68k
zADI&g1hj2#Zuh<3rB0)8ynGKtOw<d{1@FmGORmXeD&EkFw5neDwx)pg^|<ZNl@^W$
zKhsF&8IBF;WuO!Iv>y88)w=0B>unMH#ng#J-<yXE_BhSxbckct;g<Tk+QF&A`wT3v
zr((mZKe;(LeXf63?9mcABc_Nh8}1nBSK(7%wJtt`4O97Nq!YgQ0z-GC3||IrPh=JF
zn6JVf1~trK`2)uhe<k9=Igs_=C^nZKIkktsuYH^~%VD;oYAQ8tZEZrosZlSuuzLZ=
zA6Pc6tTv<40Mp;K?LhsIaj_gzSX{g+kw{jwC(boOl`}_MM(|gZx(E@9)uTYq`E0qO
zR;DgGm!=HjJ9&?r_=8g+r^HnC*d__64p8&zn75i{qU>v2NY|HidutyTQ1zr9`uzC#
z3%ZgBr8tpkQ(E>Mz7ywii1wrSwG{!4G}i69#cVs5G1mT1uEY%jpFJg>ooGiGDabF8
zvk9?LWa7(u)Pgw-3W!&U8h6;N<z#*Vm0Kg;)6ax;$cRfc<Qutt?~~vBwCtqyp_w0{
zTo(C;M<Stt^+WT?_Z2NIV!EW`=JyOM1U;bT9^u`zPjXDn1G!wzFQY0lmOtiS{G+k2
zuP@Ld+cT5LL%WunH%hiayI%%$!pP#VE_apr@jdgx6Y|ni@-pygxfx~yerU`d9}LC^
v?H7l^;;~pf8tsk7m~{-&YWNRuIy?R3@w5LAG$lDv%m5&TM-%VtXO#R4kLoT+

literal 0
HcmV?d00001

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..c89978907d0827713ef3332d20e4ac7ddcf5c458
GIT binary patch
literal 1071
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NSwWJ?9znhg
z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh?!xdN1Q+aGJ{c&&
zUgGKN%Km_xiC2-KneQA20|T?Mr;B4q#NoAJ-g%GR1ZuD5*6rDJjcrd)-h>3B=A1V=
zIR}n!c(^9bSo{Jf6U$}^=5L`*AC=-%+%IT8Y1IunyKa_ih|B7mIi1a#4FXqn%Jx>R
zUp1?xM^}tnXS(;Eeft)@w(8(;VPQ~EQdsoQF7;Z}mD1juIc=La8|#R5FZAa-@babR
zt!=H}<<9I8mT}-$NOfUJ=2^4V;Mf7n_SdhoZES7d{*Zmju;%(}yB$$8-bOroSe)i|
zdmBT;*)-!1hC6xZ6o0t){Yv(Mr$wA;|GGO`I#?P6CK`O+TfB~6PwB(G!<Oyax0|mC
z(~gOYljC#9ynf)EWygu<KWp?{z8J3KOg<AED59kF-S_evhK$={zL$BDQdB!K^-h1X
zPy1)NuC?Xv)zaF1aqFL##-@KiZzK?Xy>!38#rZoQaX0)A3B6jY5zqA@jv>(?TbH3G
zYHgT{OTBdRx!voOm6WpIT2IwYc>eC`)6^*!_cEAN{P1>}aW;+N!|sk6-7cov2mYJ+
zI=j2OC!`4oy0ECLtH<w)X5y7FHdH(K@uOkKi|}M0ixvM)9J?@k_3G8KT|u*67Idz>
zlGAJ&$Z$-;;4|N&4|n&*3haNe*PrRe^ZnsXJC+|8kpEQQ#hazTR_JhEU03G*WQhx_
zSFQTa@XK)Z_m!qfLO<mfCam5s_UPNC^!M(J2A|Kp$i4l|@~BhS#1P(=Y_4MxpJjgc
ziY@&1No1Gklz;rG5|fv(Pq;i|=GM8tdP;OxzAm$^v3qu#*&}uJ0w%8CrLmXG59_P2
zmU}#WH@7A6!$zr&Y?V1Jnr4$29_d}sUb?*R#U`EnnKNh1>{_&A>$Pt=8XZ@DdvY$j
zVYWN^`JKn#T3oJ|_TNtD-`Ox(<;2YI{|r-<V`e8svK{O4$mFYay4j&|Tb12#fplis
z!!)I)MH+dJ^ydOekvUt<s`v3oc*yQelx~yE{aR~qEMfCa8zzU)Q1g4g+bblF>hRvU
zGP}FGn~^hk%bWyj=I6V+4bl@|A5FH}mcx5Qy6<e)1@;@VM;`{v`Vty5?P<Pk`o$T2
z_CdnO-!IU1VJVHR?|7_oo=LE=_?`S!ZMXT_Hw=}Pw&YrS9P6?C@8QjO?X~pQ6X)|y
z4-|$2bCha{YeY#(Vo9o1a#1RfVlXl=G}ARS)HN^)F*LR^HnuV_&^9mxlGhp6yhYKF
bo1c=IR*74~vKWy-paup{S3j3^P6<r_L;=fQ

literal 0
HcmV?d00001

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/hidpi/lock.png b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/hidpi/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..25ad0f4a31906d0d7f13f55e2ed4e174aa365a48
GIT binary patch
literal 1062
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NSwWJ?9znhg
z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh?!xdN1Q+aGJ{c&&
zUgGKN%Km_xiC2-KneQA20|T>`r;B4q#NoB!jzNzN1l~-1d}PiEc8g8<4BNhKiaBGy
z;E?er?jTpWL(J2d<8Ng9?X;YJr0e4sxsI4F9c#X=!B4w%d)?R0dpS}0#m1jCeOI$u
z&!#bF>xPJ`%=UI+U{G27Ufr`v=d{6Gzrxbe)}J-^J{i__ufP8K+979O7X>8+&TQRl
zuS-P^tk6D?wY6#MHpU0<ulz67IntvNB6=-~;XvJf`C|_Ao@;b5-F_<;8oF@ZYh{7_
z{QQ8ctsMdki~%kyR&}phC1pQp#cQe1(8S$$7in-kskGB!O^rMhb(=w<^KKsdq;8w@
zno7p@x+;l1GnZz1P3qpH)6Wo*9XRdj2azkKcbTT7-i)7gJyA=^?DVEL-}AQro|qb$
zzqZ8aLAbT2kJ@C`li55bldiXy_dVia60j0;Wt?PO@8gotvy)MQLB(^DG(+OSb7r%B
z^WXTf)y(!=uJ0GL>XlZ!N1cUy=wFS~L2io!A3F<8pFUmxzSqHtlMT=N6&;h1NY1<K
zH|HMXgGY~;l!~%@KC1q@BfeYk<Ke^3&Vef7Jjae)-yeP9^FscJP*sj=cgj~i2)X`w
z>V>DTQ!F%CmoqVDL>2KIDPJ4PyfL9KFZs+#<`Xl64<|4P-o0PTTfbK1&74GOyB{A7
zYD2{D-HBCa2(`8Px@PP9jfd6Us^2(tiLNw!X8Yx}j+6g;bzK|XyPM~?t(#)P@T+Lm
zDnGxoeRm>E*0&ed?>oJnQQ-Dk=BI%-dUhLrU-v)v!2#Yt_k8t|UKO2H6E<#e`{O5(
ztjwhl(zrY6XUW@g8#()xt5&R9lKE?jis#`rX2ELvSxv=nHtb%$YSlE)Nem2j_V&};
zcV6Gedfv-%{?*dGUv7Rler{tN+pew?7vKDDng6<0OY%qq_ml03^?JUSkALu1_r2`S
zuID-F+@fA10jnRoc}nX~ykBj|_WN%gC&T2EPd2W5eSL#utIpONCFbA1f7cZ{ck-!Z
z*_DEQu`RXFy!CS~FZ_DVL1M$|@E>*u3bnt@zVu*y5`#ql@%>Wgn#|tL`}@EC;K$oR
ztez>6-;86_tHdU_gof6~>~s23%X&Lii77ib+j!aOpY>5Z8+QL=G~s3s>1C{H2WBMI
z64!{5l*E!$tK_0oAjM#0U}&amXsByo6k=#>Wo&F^V4!Va2qdpFu6c{1AvZrIGp!Q0
UhGj7#fj|ump00i_>zopr0FH;n#Q*>R

literal 0
HcmV?d00001

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/hidpi/refresh.png b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/hidpi/refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..117a2d4a4715551e735a14ac0a79d40c9affab8a
GIT binary patch
literal 1623
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
VFfgWE6j1;G002ovPDHLkV1k^A*Kq&<

literal 0
HcmV?d00001

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/lock-open.png b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/lock-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..42df5f411136270482f7af50e8553832e36b7769
GIT binary patch
literal 511
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CDO3=9p;3=BX21L>Cx45bDP46hOx7_4S6Fo@?*ia+WGRLhp+?e4<x9|RZdT|OBo
z!dc)ES<Jw|Eeyhp4727)00r4gJbhi+AFvDa%4zA^eUJnSz4LT&46!&pce1bF5d)sq
z`^9rjJ?^CP9ay)*{KZ$dV#byo%*CQ&8*=aLiF62DULUgciR+^$pD!0XF=WhQoAj?p
zcUqR&U4@-o5vy(<Yn(oRnGnO&pjoONS4(XtKYO=ziFtXw+Q})GPM(Q7K0#5I!ArB8
zOX<;E73HLe_`82a1mzjtsr<OIWTn)k2`%ehuS+vN{j9<CIs1hx`qKUVPsAB=RTw&+
zJTEw|c2{nLvWl&4-$#!erZa2a{+^e1O^)fw9Q}8Fb3Q*6P*{4!jU~uyHCGLHfR|->
zXsMjst^Hgcb?*)HYR(;>?|kX8+=2JA85!;{ysK~L@z>RI1^QgI#5JNMC9x#cD!C{X
zNHG{07@FxCnClu^h8P-K85>xc7-<_ASs55eOen8F(U6;;l9^VCTSMmA^GARh7(8A5
KT-G@yGywqDd$lqE

literal 0
HcmV?d00001

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/lock.png b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..bde67727d775326b472106b5e0a82f7744de2fc9
GIT binary patch
literal 506
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CDO3=9p;3=BX21L>Cx45bDP46hOx7_4S6Fo@?*ia+WGRLhp+?e4<x9|RZdT|OBo
z!dc)ES<Jw|Eeyhp4727)00r4gJbhi+AFvDa%4zA^eUJnSz4UZ(46!&pH~3`lVFLl>
z<I4NRJ@nTdWZTBPU3^Jn$;Ld@`F~%{`WwNmI!#uY`NKj+Pr()!28rW>>z#`>8*e`A
zcVWh~ihTX*C38NTGiXPgmlmG6j8o-*;1Q*w@T-a~4xzFxPvT~aWN2pzE}t@O-}{L{
zQ6Z%rhW{8Ux-Pt7VA%7$d*;Fe)%&+p_;bFR=DE+7x#7z82{mh$F4Wt=#2|6f{o)Dl
zCT>5Uvy+XR7F(JKOtf6;A~@6Dh(qyCh^S)AZFjbFJ1viKJin92WNUQ7GJf~E-OuKn
zFLn6z-KWsh|MmIAwD@$MYv#-hKbReosxL9#m<|ee)e_f;l9a@fRIB8oR3OD*WMF8f
zYhbQxXc=N?Y-Ma<Wn!dlU}R-rATgo50!2e^eoAIqC2kFwXU`u2YGCkm^>bP0l+XkK
D;C!rU

literal 0
HcmV?d00001

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/refresh.png b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..e363764e3d0886333a3b03b04f5502d4cd79d133
GIT binary patch
literal 757
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CDO3=9p;3=BX21L>Cx45bDP46hOx7_4S6Fo@?*ia+WGRLhp+?e4<x9|RZdT|OBo
z!dc)ES<Jw|Eeyhp4727)00r4gJbhi+AFvDa%4zA^eUM~eV0_}~;uvCaIycz1Tf|YI
zHq`dAwe@3FDV-Nh({q+>=#-F<k(1Vykl^5MO2~PT|Dmp-i7o9PgK~3nZyqzV;Wch?
z5tfO(;?FiO-|e&PciJ9piHueEt3zYgw}q`1eYLC2knNmh2S*2o3k!pQ;FrVCYd07^
z6Y_9rx>2>at)pi3YpXk7?elJnowJM)Rcbn##3;CP{noPIf9*u1IU=&zl`?0=2~WI!
z=1*ky-*w6t4jybgQdo26y~Qix)vKIlEtCIbQ_sh6?UuK!sc*5HOFv@`Q^N{=iC#DR
zwOiZwHqPxn;mdHndV{-C(JS^-cB`jUF+C7qnDJAWfvI47?rmwgJ$LguJN(%7emLLW
zCcpb}`SUy8`A^d}GYbAKJa;k2j61B#dS*w!wA6r}$3I&4hj=C0&2R3=Gc;bu^=?(X
z%8dH<?}o`%bH9Du&%n{}ozdT=<FSRptYwwY)bn~c{idXH3huo7^MCmT$4M#yUbQca
z)GO!ln{8T`t>U@q<C431-?cb?+|}=TbYk)*9btz2MH;)7PpMk9^&F$kn`cEvGku(n
zZ;8=!HeGr}Hv4V=|Np)B;%e5edUdeEMsC-G!%@|7BCLWJBklcNE=0*Qa-^iS1-(iV
zwpBcB#1LWP%lv$f`e6xUfe<gnE~P)roNNE=e8T@J377;_OI#yLQW8s2t&)pUffR$0
zfuWhMfw``sWr(4%m9c@9iIKK}k(Ggg#Dww+6b-rgDVb@NxHV*+J%0qKfx*+&&t;uc
GLK6TDHy}>{

literal 0
HcmV?d00001

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/spinner.gif b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/spinner.gif
similarity index 100%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/images/spinner.gif
rename to htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/images/spinner.gif
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/readme.md b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/readme.md
similarity index 72%
rename from htdocs/includes/ckeditor/ckeditor/skins/moono/readme.md
rename to htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/readme.md
index d5bf7bead0d..7ed4c7871e3 100644
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono/readme.md
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/readme.md
@@ -1,21 +1,19 @@
-"Moono" Skin
-====================
+"Moono-lisa" Skin
+=================
 
-This skin has been chosen for the **default skin** of CKEditor 4.x, elected from the CKEditor
-[skin contest](http://ckeditor.com/blog/new_ckeditor_4_skin) and further shaped by
-the CKEditor team. "Moono" is maintained by the core developers.
+This skin has been made a **default skin** starting from CKEditor 4.6.0 and is maintained by the core developers.
 
 For more information about skins, please check the [CKEditor Skin SDK](http://docs.cksource.com/CKEditor_4.x/Skin_SDK)
 documentation.
 
 Features
 -------------------
-"Moono" is a monochromatic skin, which offers a modern look coupled with gradients and transparency.
+"Moono-lisa" is a monochromatic skin, which offers a modern, flat and minimalistic look which blends very well in modern design.
 It comes with the following features:
 
-- Chameleon feature with brightness,
-- high-contrast compatibility,
-- graphics source provided in SVG.
+- Chameleon feature with brightness.
+- High-contrast compatibility.
+- Graphics source provided in SVG.
 
 Directory Structure
 -------------------
@@ -37,13 +35,12 @@ it's not loaded until the first menu open up,
 
 Other parts:
 - **skin.js**: the only JavaScript part of the skin that registers the skin, its browser specific files and its icons and defines the Chameleon feature,
-- **icons/**: contains all skin defined icons,
 - **images/**: contains a fill general used images,
-- **dev/**: contains SVG source of the skin icons.
+- **dev/**: contains SVG and PNG source of the skin icons.
 
 License
 -------
 
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 
 For licensing, see LICENSE.md or [http://ckeditor.com/license](http://ckeditor.com/license)
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog.css
deleted file mode 100644
index 4394f15e7b1..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css
deleted file mode 100644
index eb1d271f2d8..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css
deleted file mode 100644
index 629d4369d6f..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie7.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_title{zoom:1}.cke_dialog_footer{border-top:1px solid #bfbfbf}.cke_dialog_footer_buttons{position:static}.cke_dialog_footer_buttons a.cke_dialog_ui_button{vertical-align:top}.cke_dialog .cke_resizer_ltr{padding-left:4px}.cke_dialog .cke_resizer_rtl{padding-right:4px}.cke_dialog_ui_input_text,.cke_dialog_ui_input_password,.cke_dialog_ui_input_textarea,.cke_dialog_ui_input_select{padding:0!important}.cke_dialog_ui_checkbox_input,.cke_dialog_ui_ratio_input,.cke_btn_reset,.cke_btn_locked,.cke_btn_unlocked{border:1px solid transparent!important}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css
deleted file mode 100644
index 9e9a771886e..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_ie8.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{display:block}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css
deleted file mode 100644
index 0d650503564..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_iequirks.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_footer{filter:""}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/editor.css
deleted file mode 100644
index 9f5a9f7caaf..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -456px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -480px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -504px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -528px !important;}.cke_button__replace_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -552px !important;}.cke_button__flash_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -576px !important;}.cke_button__button_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -600px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -624px !important;}.cke_button__form_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -648px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -672px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -696px !important;}.cke_button__radio_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -720px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -744px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -768px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -792px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -816px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -840px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -864px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -888px !important;}.cke_button__iframe_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -912px !important;}.cke_button__image_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -936px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -960px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -984px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1008px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1032px !important;}.cke_button__smiley_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1056px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1080px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1104px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1128px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1152px !important;}.cke_button__language_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1176px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1200px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1224px !important;}.cke_button__link_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1248px !important;}.cke_button__unlink_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1272px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1296px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1320px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1344px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1368px !important;}.cke_button__maximize_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1392px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1416px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1440px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1464px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1488px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1512px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1536px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1560px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1584px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1608px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1632px !important;}.cke_button__print_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1656px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1680px !important;}.cke_button__save_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1704px !important;}.cke_button__selectall_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1728px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1752px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1776px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1800px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1824px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1848px !important;}.cke_button__scayt_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1872px !important;}.cke_button__table_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1896px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1920px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1944px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1968px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1992px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -2016px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -2016px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css
deleted file mode 100644
index 5a0a08fa44a..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_gecko.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_bottom{padding-bottom:3px}.cke_combo_text{margin-bottom:-1px;margin-top:1px}.cke_button__about_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -456px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -480px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -504px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -528px !important;}.cke_button__replace_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -552px !important;}.cke_button__flash_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -576px !important;}.cke_button__button_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -600px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -624px !important;}.cke_button__form_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -648px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -672px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -696px !important;}.cke_button__radio_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -720px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -744px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -768px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -792px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -816px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -840px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -864px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -888px !important;}.cke_button__iframe_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -912px !important;}.cke_button__image_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -936px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -960px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -984px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1008px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1032px !important;}.cke_button__smiley_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1056px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1080px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1104px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1128px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1152px !important;}.cke_button__language_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1176px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1200px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1224px !important;}.cke_button__link_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1248px !important;}.cke_button__unlink_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1272px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1296px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1320px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1344px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1368px !important;}.cke_button__maximize_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1392px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1416px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1440px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1464px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1488px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1512px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1536px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1560px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1584px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1608px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1632px !important;}.cke_button__print_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1656px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1680px !important;}.cke_button__save_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1704px !important;}.cke_button__selectall_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1728px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1752px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1776px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1800px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1824px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1848px !important;}.cke_button__scayt_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1872px !important;}.cke_button__table_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1896px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1920px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1944px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1968px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1992px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -2016px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -2016px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie.css
deleted file mode 100644
index 8e0eb586019..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_button__about_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -456px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -480px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -504px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -528px !important;}.cke_button__replace_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -552px !important;}.cke_button__flash_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -576px !important;}.cke_button__button_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -600px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -624px !important;}.cke_button__form_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -648px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -672px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -696px !important;}.cke_button__radio_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -720px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -744px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -768px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -792px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -816px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -840px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -864px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -888px !important;}.cke_button__iframe_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -912px !important;}.cke_button__image_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -936px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -960px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -984px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1008px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1032px !important;}.cke_button__smiley_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1056px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1080px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1104px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1128px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1152px !important;}.cke_button__language_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1176px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1200px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1224px !important;}.cke_button__link_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1248px !important;}.cke_button__unlink_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1272px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1296px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1320px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1344px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1368px !important;}.cke_button__maximize_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1392px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1416px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1440px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1464px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1488px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1512px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1536px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1560px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1584px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1608px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1632px !important;}.cke_button__print_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1656px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1680px !important;}.cke_button__save_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1704px !important;}.cke_button__selectall_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1728px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1752px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1776px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1800px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1824px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1848px !important;}.cke_button__scayt_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1872px !important;}.cke_button__table_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1896px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1920px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1944px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1968px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1992px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -2016px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -2016px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css
deleted file mode 100644
index fef0f87ef26..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie7.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_toolbox{display:inline-block;padding-bottom:5px;height:100%}.cke_rtl .cke_toolbox{padding-bottom:0}.cke_toolbar{margin-bottom:5px}.cke_rtl .cke_toolbar{margin-bottom:0}.cke_toolgroup{height:26px}.cke_toolgroup,.cke_combo{position:relative}a.cke_button{float:none;vertical-align:top}.cke_toolbar_separator{display:inline-block;float:none;vertical-align:top;background-color:#c0c0c0}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_rtl .cke_button_arrow{padding-top:8px;margin-right:2px}.cke_rtl .cke_combo_inlinelabel{display:table-cell;vertical-align:middle}.cke_menubutton{display:block;height:24px}.cke_menubutton_inner{display:block;position:relative}.cke_menubutton_icon{height:16px;width:16px}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:inline-block}.cke_menubutton_label{width:auto;vertical-align:top;line-height:24px;height:24px;margin:0 10px 0 0}.cke_menuarrow{width:5px;height:6px;padding:0;position:absolute;right:8px;top:10px;background-position:0 0}.cke_rtl .cke_menubutton_icon{position:absolute;right:0;top:0}.cke_rtl .cke_menubutton_label{float:right;clear:both;margin:0 24px 0 10px}.cke_hc .cke_rtl .cke_menubutton_label{margin-right:0}.cke_rtl .cke_menuarrow{left:8px;right:auto;background-position:0 -24px}.cke_hc .cke_menuarrow{top:5px;padding:0 5px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{position:relative}.cke_wysiwyg_div{padding-top:0!important;padding-bottom:0!important}.cke_button__about_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -456px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -480px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -504px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -528px !important;}.cke_button__replace_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -552px !important;}.cke_button__flash_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -576px !important;}.cke_button__button_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -600px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -624px !important;}.cke_button__form_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -648px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -672px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -696px !important;}.cke_button__radio_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -720px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -744px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -768px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -792px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -816px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -840px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -864px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -888px !important;}.cke_button__iframe_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -912px !important;}.cke_button__image_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -936px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -960px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -984px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1008px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1032px !important;}.cke_button__smiley_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1056px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1080px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1104px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1128px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1152px !important;}.cke_button__language_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1176px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1200px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1224px !important;}.cke_button__link_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1248px !important;}.cke_button__unlink_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1272px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1296px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1320px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1344px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1368px !important;}.cke_button__maximize_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1392px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1416px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1440px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1464px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1488px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1512px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1536px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1560px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1584px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1608px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1632px !important;}.cke_button__print_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1656px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1680px !important;}.cke_button__save_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1704px !important;}.cke_button__selectall_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1728px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1752px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1776px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1800px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1824px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1848px !important;}.cke_button__scayt_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1872px !important;}.cke_button__table_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1896px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1920px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1944px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1968px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1992px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -2016px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -2016px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css
deleted file mode 100644
index c771da4e9b9..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_ie8.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_button__about_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -456px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -480px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -504px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -528px !important;}.cke_button__replace_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -552px !important;}.cke_button__flash_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -576px !important;}.cke_button__button_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -600px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -624px !important;}.cke_button__form_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -648px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -672px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -696px !important;}.cke_button__radio_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -720px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -744px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -768px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -792px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -816px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -840px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -864px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -888px !important;}.cke_button__iframe_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -912px !important;}.cke_button__image_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -936px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -960px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -984px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1008px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1032px !important;}.cke_button__smiley_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1056px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1080px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1104px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1128px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1152px !important;}.cke_button__language_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1176px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1200px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1224px !important;}.cke_button__link_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1248px !important;}.cke_button__unlink_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1272px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1296px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1320px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1344px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1368px !important;}.cke_button__maximize_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1392px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1416px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1440px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1464px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1488px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1512px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1536px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1560px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1584px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1608px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1632px !important;}.cke_button__print_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1656px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1680px !important;}.cke_button__save_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1704px !important;}.cke_button__selectall_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1728px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1752px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1776px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1800px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1824px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1848px !important;}.cke_button__scayt_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1872px !important;}.cke_button__table_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1896px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1920px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1944px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1968px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1992px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -2016px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -2016px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css b/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css
deleted file mode 100644
index 9a9254223ed..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono/editor_iequirks.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_top,.cke_contents,.cke_bottom{width:100%}.cke_button_arrow{font-size:0}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_rtl .cke_button_icon{float:none}.cke_resizer{width:10px}.cke_source{white-space:normal}.cke_bottom{position:static}.cke_colorbox{font-size:0}.cke_button__about_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -456px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -480px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -504px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -528px !important;}.cke_button__replace_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -552px !important;}.cke_button__flash_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -576px !important;}.cke_button__button_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -600px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -624px !important;}.cke_button__form_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -648px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -672px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -696px !important;}.cke_button__radio_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -720px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -744px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -768px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -792px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -816px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -840px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -864px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -888px !important;}.cke_button__iframe_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -912px !important;}.cke_button__image_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -936px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -960px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -984px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1008px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1032px !important;}.cke_button__smiley_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1056px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1080px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1104px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1128px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1152px !important;}.cke_button__language_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1176px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1200px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1224px !important;}.cke_button__link_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1248px !important;}.cke_button__unlink_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1272px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1296px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1320px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1344px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1368px !important;}.cke_button__maximize_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1392px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1416px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1440px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1464px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1488px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1512px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1536px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1560px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1584px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1608px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1632px !important;}.cke_button__print_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1656px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1680px !important;}.cke_button__save_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1704px !important;}.cke_button__selectall_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1728px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1752px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1776px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1800px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1824px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1848px !important;}.cke_button__scayt_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1872px !important;}.cke_button__table_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1896px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1920px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1944px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1968px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -1992px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=a35abfe) no-repeat 0 -2016px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=a35abfe) no-repeat 0 -2016px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/icons.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/icons.png
deleted file mode 100644
index eaefc17a1077fa849c3d726b14dd3cebf2c7fc0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20634
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

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/icons_hidpi.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/icons_hidpi.png
deleted file mode 100644
index 6e103c05f11690fe3f9fd56dbd67205b58d7e90d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 67753
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

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/close.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/close.png
deleted file mode 100644
index 6a04ab5275b321ce911c4e1416df7e0184d05f51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 468
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf(g2?j*SmM`-n)12!Gi~n9zA;e
z`0<k`Po6$~`ug?jw{PFRd-v}B`}dzdefs+K>$h*;zJLGz<HwIbfByXa`}g0!fB*mg
z2bzHi*xA_`85#Nb_>iSUMMc%s)kQ=^Bqb$fWn~o<6oA~|;9y%@TNf7>e}Dgoh=|C@
z$mr;3CnqOwZ|}gsz|hdpn3$O4<mA-U)X=KuJwW3ON`m}A4#xmY;Stes@kvRk>67O?
zeE#wc(2+oA0v!ni`CC}e12wGkba4!kkc>STSk!F5<8V;@q(cnT$uIxXbDYwnHXI20
zznl9%hr)yghbDzZvup(?cbsYBkw5jWXX+2z%?nB|&bJCE>3b9CvZkg_ddl%%sY-2p
zciuhvRkQ7^EzhNOM%l6b;kVbDIBe=KwTZ9(?7(=`_OdK1&)j93&fUu|^7>}-Chzs5
z_sJ{fJWC8(mio1P_ql~`)`ur#?%8+Odfr~yz>Zjzezy%z<s@7#M5XZ0Qm=n|D(&yy
S_2)n?XYh3Ob6Mw<&;$Vd#K%nl

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/close.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/close.png
deleted file mode 100644
index e406c2c35ba11a410291fe484d5bb406657b62eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1271
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0V0;tc6XJSh#fqyyv~uOORjaPA
zT6JUf>YG5cX3Z@iTD$i4+O>Dqt-HH^{liV09&Ot6c=P5bK(uAc)2&;dZQc4Dh_-Ee
zxqbV~9Xnp{-1%nb&bPaFzuUe0^S*tb_wWC5;K0{|2frOS@a^EiABPYBJAV8>5S=*j
z|K!R4r%wGpefs~|v;WVX`+xrY{|guXU%veR%9a1uum8V!6X-&s03#y{4-coHAOjN<
zF7?84azG>`D=R214OAv9D+@&WmX<*ETmk|DqM|?~A|b&mEX*e&!Vg415fKq-S=pfA
zU_(nwIW;wHV`EcmYfF238%IZ5CnqO&cOO5$fY8vu(9p2(@W8OJkjTiem>7E}CkJO|
zM^{%T7Z+D|F!1zr_ww=p0#8pbAn@_=1_B=+A73!=^Yilug8&c+3=9kcf?yB`0fJBv
z2n!2~0D?#`h>nf|f@lzk0fM-=*x1;(xVU&ANC1Px#3Ud{PEJZmNls2q0fMx&bRfvc
z$jZvf&dtrq$yq#0?-bDIOG<+Lf^mfyPH|QlH7z4^3rj0&8(Wb7JUqR8rcR%~VBw0D
zt5&bwymi~F_wPS^_y_@CzJ7y)@87@wB@djAYS_oXz$E7B;uvCa`s(Dn{=$I*N1xw&
zmuH{2J$}UvvF664p8t)Uot^w@YX3e<Efw+=kX|z7(zLwt@^@!GF7(#4`SEVgojKO~
z?|7b@>HS4MMA5#twxCv@S8$@{k82K*Q#(4=#CkFcR=T*fdPzi-erDAcjNHHLY2?{u
z8&A962-^K~k93eA&xEgw=dQTCQgSj^(SkcSY^&H+_8IlaZ_V2K&rrQ^&eMkQ)$jKo
z-Tcq>QD?>Nw^8pe2fz6zd3@zMhG31h-+n9WXI3n`bLUlUNZF@U3*XP;JztqFmn8A)
zU0x9Ny6(c2hoAc|9(u~aV3B*^;^~i<-tU_p^7Zw}pDGir7cZD)cvUg2KF)rcPiaAs
zS>%pt^@k?OCJU~-)L1=_r!MxqtQmua!EBF+7&QyoKl9Ga%}ZnKFx)8aDEj5|?FysE
zq4lX>wd7837f{l=vuW$Iz**P$qi^fSbuwKrJ02!+gJF&Q)<t{Gr}WoOQVT0ywBcQO
zytZ@uX0Dd9OK<u<badowmHhha(18qx4C#;kJdNqQ`gV)Hlg&~qGTq@RwscWf<|n3;
zR`0wPmuE;w@Vi~#sH2@KB(3(@;&4_AZ<AGb!mnDBd6Si`IC`^eIo8}c8mpJ*oVI-N
z$DX5_le+lJ>q<8ZnjeXq6B~Ozf^oT&wN%`lJ4T<@emnIwOEc2%aZRRn;?5~LYTo7h
wzq#6<u$Vfvl0W6$PSdc3uj@a1{M-DGX;O1gaCJP-eNc+^boFyt=akR{0APJM!2kdN

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.png
deleted file mode 100644
index edbd12f3bdc10a969f350a8c482f92c224d1c466..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1329
zcmV-11<v}3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000E|Nkl<ZSi_xG
zO>7fa5dP-v+ibkXKVZe+7Bwiq5s(474n?R34pjx@h*VlBB~_$|Yjdd7L)9LtD(5Ov
z)dL4Ww3l9cKsgjjQ3S1!I3S^@QYDnc5QyV{@4h!Zc-L&4wX<d<AN<yy`R4m(zJ2uM
z_HDdPP@i)iGLIa#s1O2%5Fqj(uvgOi&dg9+Lu(xgOk@B=1StgKu^3XejS(rqT0?0K
z03A?5pzXRS*XyV?8gR7+^I#Z}01yBv1QNE5TqXl577s&+sm#HH#iK`$zE46J&z?Pd
z^z!-hhj5%*{NTaL>c$2t_4=+LA^{LWAU-<k7ys<jt5<(a+ICzi)n(xLks}v`VO-d%
z)#j;K{F3kA{|U^f?81bI0>JRPr(*G&FRop?p0w>aD+Msa0AK)s*3hntJ(d-po}FEc
zO-<d(?c0ZhZ9@vtcW5I42*eLRU%&osrO{|;B9LLgFijYy2_Yqj2&^?s0GFqxF4LJa
zv$;$L@mLH(gqNZyYiM{9WRgkPsT3%me{Xbb?Ca*{=D%>9-vE>Wocs9FrSIR(<;Gbl
zFcB(^M(x)dH}aLGrIpoJuh4egx0?a2HEPW!+O7+`RzqcJ=|9UfXN3?D-t@z^f1zW?
ze*fs=#eWVSI4}-oBy2klDL=7H^E*KV!cL!v1b~6gZaWSf*G09_=u+x?L&CPfj~|!m
z#EGvypP9MEN<jli@85r#2YA9zM#Riep3!uN%Ii#Pjksk2z#olv8zvEy))*fjKc%#O
zV^}>ga0m(Emb>kY84SQt3a_hG@bdENX0-~(b)l3(I-Sn3x2nEd4rE}5-FgLf3nGH+
zx=_s~>dhwhm?i)~DFwqYFk+f-qzp*11Aq_$wq+p|kHeA@%nXj;>jXd=28>t?W?=6v
zDPbiNc*ihMYqe0W)lhG>x(2pm4M(IzHl0TL{Q0wE6B7$Z4j(S)0UGv#x1>ZO7Q?9Q
z^wx4+)Y@%4dHQsDePv~S^Uj@nrOnOmN^WC-JSr_IF*Y%=@WIKG1p?63FhU5T&T4vk
zk4OnqN=)YSg+G}WEGZ``u#%x$z|5F9bf^GkNFe~jhzuZ@quUe!<>l;sC&-Y00?cq6
z2g-FJ4CBqa|1E==p_GE-INkjH0eGRAq5Tc$qkk{3es4Su<m-)a07RW+-iLQQrp|AO
zx*)p6nZtqj=RKhNGN6>|d;&#+0GsW$^Vh?NH@8ZqMF2=<vvZTDPhS}w88Leq^CeJ9
zMPR_6&_L(Gj(ji=9zD8QzI%5DTU(t6$>dD>+&O$WIXN9B2YYAa)!0=6trT<!14IM}
zf%5wLA}STEmP!DC91+Uv>x-Is8a+24X71*TBmto_G~90p2bhvSJKF&GAbbX*%mDjI
zLWYpFMlze7Ln<|s^AA%gB(vE$tu-iQ5V_BA4wgV`D5XM&@YM0+SN0T(sBLU40zf>I
znJeV;SG0Fm>@BXf9!`QF;xObRQkrKAg=qlOL20<hXnGllBmoh1jU#Mzd=`3>4Kgi1
zA4T#3BCM{hEg#ssx6rSnp@Imm)>vIzTOKHZKdnv2LG#6n`M;SL_Ghz&pv#3N-|ZO@
zVZBsZZoPat-*lX99<zf1r8QnxtJqpvx;JW?lYNs9$p8Q}9S5(g)$U~^6oA$m^=1>T
nb{o{^Dm`@l0K5K`%#Z&8E@ID3`%|n)00000NkvXXu0mjf=}%$%

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png
deleted file mode 100644
index 1b87bbb7a14ceac0e259d75bdbc03365f01e9acf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1299
zcmcK2YfO_@7zgl|J7XgE`xuonh01Nvjr*nTTY7<(-l(*+SfqVRg|f}S7??s;78ztp
zX0k1txJ4X+B9|7(76PTE8=#;ILmd?4R;B^j!~z2x+8z9CvQPWvf6jSwzMPXM&u0ue
z$=S)@34$PJ3K?dB6Lqj0ZNLuSs2_nKYbQn)hj_2G^*%^j+k>{Y-&LyV_V$_fcH_;P
zvmhNEa~&NIJ3AM;yO-4JC5>iTtzPNveFW0ix8C2sF)(1(YB#mot---<5UuuakfEU+
z5S?yEuiw?_cJ=x_oo)~8!^6)(42FLUhW+7T%gBgjY|L`|wq<<WGBIJfbH_3{X_=a`
z%*<G3XTc|5!`2qEvwPFS<FL24i;s_^mzQfmfF}y&;OPl!ui#)GG@4AKQR(!k#KZ(5
zkt-176%^oLm_(%phK2@)g}sfz9EpfPM@EK3MIDWaITjlmhQ%I_iwlpBk4j34PEL+V
zNr}Vb6H-$XU^tmXN=ZvgNl#D3;ZiA-G%7V6k54C)aRdT^NF-!t!T^y7XJilo(ko;#
zi9!L-kpT*Y3<@Tb3S?$dv$8S)8ZDDf&jRRl8jzh$V>0OglbH=L7z`GR!Dcf!945ee
zh0SJhIBXy%hXcap<^bFSCwRPEK0j9|<O>AC{QP{8=%iRI0uZF2u&_`pE|f?L5kw3~
zBx0#lf*=y96hROvP*fz9$%<q$S#hzfq~x?*{-jjt2b$hl#-g)d)BOLqa`8iBlTRQD
zMN?B#i&{Mj%+If^n9aMpFaB@Sp@FD_d8WWPPW-t1%CDtU>ApWdo)va&{wTvRRW0uB
zs>XO!=Uk-==9!?5@ZAN6#Syn!*AzSWhcB_^{#}C$haF~V#>Iw??d;fVlers<?hsT#
zH%g109dWEbY9Nz+^;^e3smOcyORtS@Tvg(h_M%3`t*O8C;kP>m!!7;Uj>SJmi_hG5
zZ#pk-HW(_<uFCJ@hX%q=TPx*OammKCCkDQhcu%{(hDT5Ga?`FNn4r?&xs|LQ+1C4|
zVRbbzsm&=vDuQ_LMS0csJ6<2<om;!G6m!?cJforaebD}s13pT9sX=4w!;4=3)IM4m
zSarQh9f{Fk9{8w^8AHnCqr7~Qpe@m+x#~SalawQ|nXayGbU8GTl<V<Z#k{EdtCJVY
zOT^}9n}buPH(uTyx7BSS?798t>ix=qMW}A|^1`E2(SBSAdU|Li>Y8G$tCm(@1~=H6
z6ag5$lC;o&ImGX(B0jJPRk>h;_7e6O1LgJZU)YLj?I~aT3umymFustv(yj67&=Dm^
z?g_V&m3kVp*&AiWs4odWC9^_H_CGgi5Nm8H&$p$wuM4(gUDumDCrs~Z2E6SyLW!%&
zP!I0Lm2aTnAU?{vkv)U$mKU^^qb1M{1k-Ofb_PyW@s~9{B7WB6vn4NitEC!2g!?Sd
p*{oO(6}kOo)YtW8d<-4USq^e@@n6;8y}(pJ5QRvGJMp6P{{r75P22zg

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png
deleted file mode 100644
index c6c2b86e6d1cd21bd352a54321ae13100b78e581..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1842
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

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/lock-open.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/lock-open.png
deleted file mode 100644
index 04769877aa6d074e476f9560638d06cb158aaf1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 349
zcmV-j0iyniP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0003bNkl<ZD9>Hc
z&n^Q25XbTF&7uB8h{F<*UK$c{6bF(DX-V5yq<8{P)2DIiBX|hAR<{~TY$9<em9Imq
zS@OHhd@?f`B1VZx=+dJ{k1h%ExISrj$Z(R3&X|lr!Yjf7H)PyWm5d}09(acx?l@*~
z;d-`1RZ`;ogg#%B1@qV3%HuB>o%h5mZ)AKROqT}ICn1K2gcrVZ2a4<}@<IX;DMM)g
z6(=I?At}Ukk!4T4^lF?-FAQB)y1!t{nrEKdv}x0GPp!F?2kTaB7`oY-3N~Az4J)qa
zLCHhwh86-T1fg{gE#*PcvPU+YX%Wn{8Xj4;m<NH|?z!)Vb8firp4$c^5Ro!~_L6}s
vuDa%`D+Vq}dq4^i_dN6Y?@=P3Jaf+vlmhmmbAk*n00000NkvXXu0mjfJj9ZI

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/lock.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/lock.png
deleted file mode 100644
index c5a14400d5ddfe1c564c7c93799c24d03f0e9618..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 475
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf;Q*fy*SmM`-n)12{{8z89z1yT
z=+WcHkDokw^7QG`XV0F!eEIU#t5>gIzkdJz{m-92fBpLP=g*)2|NjHELI68EJ2y8s
zkS!=EC?q7r%gd{)s|%6h<KqJ|)Ya92BtJjDn3$N9l$5lzw2X|5oSdA3f`XEg5>QrC
zQ&USzOJ85#+}zyO*4EC>&e74)$;rvp)z#hI-P6<4$H&Ll*VoU_FCZWwFfcGEC@3T(
zBrGf}JUl!iA|f&}GAb%c^3n-Mpfw65L4F`_p#mOBpv4~P>Ak%>PCWYb^I+EhUqA)R
zJzX3_BqUi68WtTk;Bh_3F0dqH=?3-5S9bp27<4=JnDRuWx-#Aadn}%KH8O@(F~l4f
zV%6B5u|000zF>k}?(D_64^}eFG4tcw`tZRF@ly(tt&g5n<lkvsY`wPn!N<Vw><9kM
zsLu=gzW%*|vFG*AU-=fqr?FkSs@QPm>HfukQ`A@#Ix8h7DKMl)rKBuVXo%cucmMZ^
rIRclgQu1>9uIx<t5hlx^@cbvg318?Ii9lH$ke@tV{an^LB{Ts5+fc4+

diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono/images/refresh.png b/htdocs/includes/ckeditor/ckeditor/skins/moono/images/refresh.png
deleted file mode 100644
index 1ff63c3090ab7dc443a74be76c1d7b52fabb71d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 422
zcmV;X0a^ZuP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0004PNkl<Z7#Rh@
zy-QUA00+=xW|)-}gt=)ER1g`p^dU)VLqd^M7!n}_IYiLV)<4h`NK=at&Q6Uj(H1QZ
z(GvG^eSSpw^!YRpHT-psLZMJ7lqz+5A{uH+g@Qt%P^v7d3n#qQ7Mm873JRslvZjd8
zJrrN{#)g`bLZvQ3pXc7UPru4|4m6C$s*2LG&~ED3-o*@OIFp&oL^@;muX!p>;p5dj
z%lP`u&v$=J<Vo&t8jHG$CE;m*#?$l8!O;CUL*Jc=rkaw5*!OKL=RZY+?o%^5V#jau
zN_MsFzq0i(9><2z5)lzAD*kbFD5EhFb!&D-m^J6co(0xLU+qr3iEV3kgyVg?12G;;
z{1S&}Zs+utOA*o9X7*lg?dXjK7KQHXD<kRLHsz6*t#j8hk|VF9siM*l1~2~^&V`)J
zx%B5ox;|))WhJGW4WaAM^x2<-djrj$FCIj!suUDTH4PD=LrX-{vP!A&AMRM*Bw=>U
Qp#T5?07*qoM6N<$g14l=!T<mO

diff --git a/htdocs/includes/ckeditor/ckeditor/styles.js b/htdocs/includes/ckeditor/ckeditor/styles.js
index c7811a61f05..e1cd4d4f098 100644
--- a/htdocs/includes/ckeditor/ckeditor/styles.js
+++ b/htdocs/includes/ckeditor/ckeditor/styles.js
@@ -1,22 +1,24 @@
-/**
- * Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+/**
+ * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md or http://ckeditor.com/license
  */
 
 // This file contains style definitions that can be used by CKEditor plugins.
 //
-// The most common use for it is the "stylescombo" plugin, which shows a combo
-// in the editor toolbar, containing all styles. Other plugins instead, like
-// the div plugin, use a subset of the styles on their feature.
+// The most common use for it is the "stylescombo" plugin which shows the Styles drop-down
+// list containing all styles in the editor toolbar. Other plugins, like
+// the "div" plugin, use a subset of the styles for their features.
 //
-// If you don't have plugins that depend on this file, you can simply ignore it.
-// Otherwise it is strongly recommended to customize this file to match your
+// If you do not have plugins that depend on this file in your editor build, you can simply
+// ignore it. Otherwise it is strongly recommended to customize this file to match your
 // website requirements and design properly.
+//
+// For more information refer to: http://docs.ckeditor.com/#!/guide/dev_styles-section-style-rules
 
 CKEDITOR.stylesSet.add( 'default', [
-	/* Block Styles */
+	/* Block styles */
 
-	// These styles are already available in the "Format" combo ("format" plugin),
+	// These styles are already available in the "Format" drop-down list ("format" plugin),
 	// so they are not needed here by default. You may enable them to avoid
 	// placing the "Format" combo in the toolbar, maintaining the same features.
 	/*
@@ -43,11 +45,11 @@ CKEDITOR.stylesSet.add( 'default', [
 		}
 	},
 
-	/* Inline Styles */
+	/* Inline styles */
 
 	// These are core styles available as toolbar buttons. You may opt enabling
-	// some of them in the Styles combo, removing them from the toolbar.
-	// (This requires the "stylescombo" plugin)
+	// some of them in the Styles drop-down list, removing them from the toolbar.
+	// (This requires the "stylescombo" plugin.)
 	/*
 	{ name: 'Strong',			element: 'strong', overrides: 'b' },
 	{ name: 'Emphasis',			element: 'em'	, overrides: 'i' },
@@ -77,22 +79,22 @@ CKEDITOR.stylesSet.add( 'default', [
 	{ name: 'Language: RTL',	element: 'span', attributes: { 'dir': 'rtl' } },
 	{ name: 'Language: LTR',	element: 'span', attributes: { 'dir': 'ltr' } },
 
-	/* Object Styles */
+	/* Object styles */
 
 	{
-		name: 'Styled image (left)',
+		name: 'Styled Image (left)',
 		element: 'img',
 		attributes: { 'class': 'left' }
 	},
 
 	{
-		name: 'Styled image (right)',
+		name: 'Styled Image (right)',
 		element: 'img',
 		attributes: { 'class': 'right' }
 	},
 
 	{
-		name: 'Compact table',
+		name: 'Compact Table',
 		element: 'table',
 		attributes: {
 			cellpadding: '5',
@@ -106,6 +108,30 @@ CKEDITOR.stylesSet.add( 'default', [
 	},
 
 	{ name: 'Borderless Table',		element: 'table',	styles: { 'border-style': 'hidden', 'background-color': '#E6E6FA' } },
-	{ name: 'Square Bulleted List',	element: 'ul',		styles: { 'list-style-type': 'square' } }
+	{ name: 'Square Bulleted List',	element: 'ul',		styles: { 'list-style-type': 'square' } },
+
+	/* Widget styles */
+
+	{ name: 'Clean Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-clean' } },
+	{ name: 'Grayscale Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-grayscale' } },
+
+	{ name: 'Featured Snippet', type: 'widget', widget: 'codeSnippet', attributes: { 'class': 'code-featured' } },
+
+	{ name: 'Featured Formula', type: 'widget', widget: 'mathjax', attributes: { 'class': 'math-featured' } },
+
+	{ name: '240p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-240p' }, group: 'size' },
+	{ name: '360p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-360p' }, group: 'size' },
+	{ name: '480p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-480p' }, group: 'size' },
+	{ name: '720p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-720p' }, group: 'size' },
+	{ name: '1080p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-1080p' }, group: 'size' },
+
+	// Adding space after the style name is an intended workaround. For now, there
+	// is no option to create two styles with the same name for different widget types. See #16664.
+	{ name: '240p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-240p' }, group: 'size' },
+	{ name: '360p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-360p' }, group: 'size' },
+	{ name: '480p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-480p' }, group: 'size' },
+	{ name: '720p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-720p' }, group: 'size' },
+	{ name: '1080p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-1080p' }, group: 'size' }
+
 ] );
 
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 5cb53447b97..c47b2d7e5fe 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -109,3 +109,6 @@ ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_soc_remise_fk_invoice_su
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoice_supplier        FOREIGN KEY (fk_invoice_supplier)      REFERENCES llx_facture_fourn (rowid);
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoice_supplier_source FOREIGN KEY (fk_invoice_supplier)      REFERENCES llx_facture_fourn (rowid);
 
+UPDATE llx_const set value='moono-lisa' where value = 'moono' AND name = 'FCKEDITOR_SKIN';
+
+  
diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js
index eb88af48a04..a1bb5fdcf0b 100644
--- a/htdocs/theme/eldy/ckeditor/config.js
+++ b/htdocs/theme/eldy/ckeditor/config.js
@@ -33,16 +33,16 @@ CKEDITOR.editorConfig = function( config )
 	    ['Source','Maximize','Preview'],
 	    ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print', 'SpellChecker', 'Scayt'],
 	    ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
+	 	['CreateDiv','ShowBlocks'],
 	    ['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'],
 	    ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],
-	    ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'],
+	    ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],
 	    ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['BidiLtr', 'BidiRtl'],
 	    ['Link','Unlink','Anchor'],
 	    ['Image','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'],
 	    ['Styles','Format','Font','FontSize'],
 	    ['TextColor','BGColor'],
-	    ['Maximize', 'ShowBlocks']
 	];
 
 	// Used for mailing fields
@@ -51,9 +51,10 @@ CKEDITOR.editorConfig = function( config )
 	 	['Source','Maximize','Preview'],
 	 	['Cut','Copy','Paste','-','SpellChecker', 'Scayt'],
 	 	['Undo','Redo','-','Find','Replace'],
+	 	['CreateDiv','ShowBlocks'],
 	    ['Format','Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
-	 	['NumberedList','BulletedList','Outdent','Indent','CreateDiv'],
+	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	 	['Link','Unlink','Anchor','Image','Table','HorizontalRule','SpecialChar']
 	 ];
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b0708cf47e4..4970f7b6541 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3570,15 +3570,18 @@ A.none, A.none:active, A.none:visited, A.none:hover {
 /*  CKEditor                                                                      */
 /* ============================================================================== */
 
+.cke_dialog {
+    border: 1px #bbb solid ! important;
+}
 .cke_editable
 {
 	margin: 5px !important;
 }
-.cke_editor table, .cke_editor tr, .cke_editor td
+/*.cke_editor table, .cke_editor tr, .cke_editor td
 {
     border: 0px solid #FF0000 !important;
 }
-span.cke_skin_kama { padding: 0 !important; }
+span.cke_skin_kama { padding: 0 !important; }*/
 .cke_wrapper { padding: 4px !important; }
 a.cke_dialog_ui_button
 {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index faeab2a8ef7..d2a145b30ee 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3468,15 +3468,18 @@ A.none, A.none:active, A.none:visited, A.none:hover {
 /*  CKEditor                                                                      */
 /* ============================================================================== */
 
+.cke_dialog {
+    border: 1px #bbb solid ! important;
+}
 .cke_editable
 {
 	margin: 5px !important;
 }
-.cke_editor table, .cke_editor tr, .cke_editor td
+/*.cke_editor table, .cke_editor tr, .cke_editor td
 {
     border: 0px solid #FF0000 !important;
 }
-span.cke_skin_kama { padding: 0 !important; }
+span.cke_skin_kama { padding: 0 !important; }*/
 .cke_wrapper { padding: 4px !important; }
 a.cke_dialog_ui_button
 {

From 9928f943a7104bf65de359c437c3935cbd197311 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2017 11:20:33 +0100
Subject: [PATCH 0323/1163] Remove hook that is duplicate code with trigger.

---
 htdocs/user/class/user.class.php      | 18 +++++----------
 htdocs/user/class/usergroup.class.php | 32 +++++++--------------------
 2 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 865b07c7cdc..49ff3803488 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1237,7 +1237,7 @@ class User extends CommonObject
 	 */
 	function update($user,$notrigger=0,$nosyncmember=0,$nosyncmemberpass=0)
 	{
-		global $conf, $langs, $hookmanager;
+		global $conf, $langs;
 
 		$nbrowsaffected=0;
 		$error=0;
@@ -1412,22 +1412,14 @@ class User extends CommonObject
 			$action='update';
 
 			// Actions on extra fields (by external module or standard code)
-			// FIXME le hook fait double emploi avec le trigger !!
-			$hookmanager->initHooks(array('userdao'));
-			$parameters=array('socid'=>$this->id);
-			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			if (empty($reshook))
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				$result=$this->insertExtraFields();
+				if ($result < 0)
 				{
-					$result=$this->insertExtraFields();
-					if ($result < 0)
-					{
-						$error++;
-					}
+					$error++;
 				}
 			}
-			else if ($reshook < 0) $error++;
 
 			if (! $error && ! $notrigger)
 			{
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 4f96f46f251..093fc36e653 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -624,22 +624,14 @@ class UserGroup extends CommonObject
 			$action='create';
 
 			// Actions on extra fields (by external module or standard code)
-            // TODO le hook fait double emploi avec le trigger !!
-			$hookmanager->initHooks(array('groupdao'));
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			if (empty($reshook))
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				$result=$this->insertExtraFields();
+				if ($result < 0)
 				{
-					$result=$this->insertExtraFields();
-					if ($result < 0)
-					{
-						$error++;
-					}
+					$error++;
 				}
 			}
-			else if ($reshook < 0) $error++;
 
 			if (! $error && ! $notrigger)
 			{
@@ -695,22 +687,14 @@ class UserGroup extends CommonObject
 			$action='update';
 
 			// Actions on extra fields (by external module or standard code)
-            // TODO le hook fait double emploi avec le trigger !!
-			$hookmanager->initHooks(array('groupdao'));
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			if (empty($reshook))
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				$result=$this->insertExtraFields();
+				if ($result < 0)
 				{
-					$result=$this->insertExtraFields();
-					if ($result < 0)
-					{
-						$error++;
-					}
+					$error++;
 				}
 			}
-			else if ($reshook < 0) $error++;
 
 			if (! $error && ! $notrigger)
 			{

From d93689830836c08f368b179d8cf159fff53f6fc6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2017 11:40:14 +0100
Subject: [PATCH 0324/1163] Update doc

---
 COPYRIGHT | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index 16943279f23..f55772c0d9f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -14,7 +14,7 @@ Component              Version       License                     GPL Compatible
 PHP libraries:
 AdoDb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
 ChromePHP              4.1.0         Apache Software License 2.0 Yes             Return server log to chrome browser console
-CKEditor               4.5.8         LGPL-2.1+                   Yes             Editor WYSIWYG
+CKEditor               4.6.2         LGPL-2.1+                   Yes             Editor WYSIWYG
 EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation
 Escpos-php                           MIT License                 Yes             Thermal receipt printer library, for use with ESC/POS compatible printers
 GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
@@ -43,8 +43,8 @@ jQuery JCrop           0.9.8         GPL and MIT License         Yes
 jQuery Jeditable       1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
 jQuery jNotify         1.1.00        Apache Software License 2.0 Yes             JS library plugin jNotify (to use ajax popups)
 jQuery jPicker         1.1.6         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
-jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
-jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for color picker with not defined list of colors
+jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes             JS library for filetree
+jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for filetree
 jQuery TableDnD        0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
 jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips

From 372cb40cf98cd02ef8180df0ce076b302b79a8d5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2017 12:10:45 +0100
Subject: [PATCH 0325/1163] The trigger USER_SETINGROUP and
 USER_REMOVEFROMGROUP has been replaced with trigger USER_MODIFY

---
 ChangeLog                        | 4 ++--
 htdocs/user/class/user.class.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 06ac1181c17..85928619cc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,13 +2,13 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
-***** ChangeLog for 5.0.0 compared to 4.0.* *****
+***** ChangeLog for 6.0.0 compared to 5.0.* *****
 
 WARNING: 
 
 Following changes may create regression for some external modules, but were necessary to make Dolibarr better:
 * The hook getNodeList has been replaced by a normalized 'addreplace' hook getDirList.
-
+* The trigger USER_SETINGROUP and USER_REMOVEFROMGROUP has been replaced with trigger USER_MODIFY.
  
 
 ***** ChangeLog for 5.0.0 compared to 4.0.* *****
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6df4cd1cc7e..60bb6bbe627 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1859,7 +1859,7 @@ class User extends CommonObject
 			    $this->context = array('audit'=>$langs->trans("UserSetInGroup"), 'newgroupid'=>$group);
 			     
 			    // Call trigger
-                $result=$this->call_trigger('USER_SETINGROUP',$user);
+                $result=$this->call_trigger('USER_MODIFY',$user);
 	            if ($result < 0) { $error++; }
                 // End call triggers
 			}
@@ -1914,7 +1914,7 @@ class User extends CommonObject
 			    $this->context = array('audit'=>$langs->trans("UserRemovedFromGroup"), 'oldgroupid'=>$group);
 			    
 			    // Call trigger
-                $result=$this->call_trigger('USER_REMOVEFROMGROUP',$user);
+                $result=$this->call_trigger('USER_MODIFY',$user);
                 if ($result < 0) { $error++; }
                 // End call triggers
 			}

From 940b56ee3e4d0cf5c62de89471c207cacbfdfa18 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2017 12:24:07 +0100
Subject: [PATCH 0326/1163] Fix lang loading

---
 htdocs/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 4e2fac98fa5..810d2fff4b7 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -311,7 +311,7 @@ if (empty($user->societe_id))
 	                    "companies",
 	                    "members",
 	                    "products",
-	                    "produts",
+	                    "products",
 	                    "propal",
 	                    "orders",
             	        "bills",

From 58229907d4eb9ba2ea0611b39858db9468179cda Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2017 12:35:55 +0100
Subject: [PATCH 0327/1163] Removed not used class "Service". Reduce nb of
 request on dashboard.

---
 htdocs/index.php                       |  7 +-
 htdocs/product/class/product.class.php | 12 ++--
 htdocs/product/class/service.class.php | 88 --------------------------
 3 files changed, 10 insertions(+), 97 deletions(-)
 delete mode 100644 htdocs/product/class/service.class.php

diff --git a/htdocs/index.php b/htdocs/index.php
index 810d2fff4b7..b59535d0169 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -210,7 +210,7 @@ if (empty($user->societe_id))
 	                   'Contact',
 	                   'Adherent',
 	                   'Product',
-	                   'Service',
+	                   'Product',
 	                   'Propal',
 	                   'Commande',
 	                   'Facture',
@@ -338,7 +338,10 @@ if (empty($user->societe_id))
 	                $board->load_state_board($user);
 	                $boardloaded[$classe]=$board;
 	            }
-	            else $board=$boardloaded[$classe];
+	            else 
+	            {
+	                $board=$boardloaded[$classe];
+	            }
 
 	            $var=!$var;
 	            if (!empty($langfile[$key])) $langs->load($langfile[$key]);
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9726f822636..ad4aa3b0b5d 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4223,29 +4223,27 @@ class Product extends CommonObject
 	}
 
 	/**
-	 *  Charge indicateurs this->nb de tableau de bord
+	 *  Load indicators this->nb for the dashboard
 	 *
-	 *  @param     int     $type       0=Product, 1=Service
 	 *  @return    int                 <0 if KO, >0 if OK
 	 */
-	function load_state_board($type=0)
+	function load_state_board()
 	{
 		global $conf, $user;
 
 		$this->nb=array();
 
-		$sql = "SELECT count(p.rowid) as nb";
+		$sql = "SELECT count(p.rowid) as nb, fk_product_type";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 		$sql.= ' WHERE p.entity IN ('.getEntity($this->element, 1).')';
-		if ($type == 1) $sql.= " AND p.fk_product_type = 1";
-		else $sql.= " AND p.fk_product_type <> 1";
+		$sql.= ' GROUP BY fk_product_type';
 
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
 			while ($obj=$this->db->fetch_object($resql))
 			{
-				if ($type == 1) $this->nb["services"]=$obj->nb;
+				if ($obj->fk_product_type == 1) $this->nb["services"]=$obj->nb;
 				else $this->nb["products"]=$obj->nb;
 			}
             $this->db->free($resql);
diff --git a/htdocs/product/class/service.class.php b/htdocs/product/class/service.class.php
deleted file mode 100644
index 40e8d39488b..00000000000
--- a/htdocs/product/class/service.class.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/* Copyright (C) 2002      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/product/class/service.class.php
- *       \ingroup    service
- *       \brief      Fichier de la classe des services predefinis
- */
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
-
-
-/**
- *	Class to manage predefined services
- *
- *  @deprecated     Use class Product compatible for both product and services
- */
-class Service extends CommonObject
-{
-	public $libelle;
-	public $price;
-	public $tms;
-	public $debut;
-	public $fin;
-
-	public $debut_epoch;
-	public $fin_epoch;
-
-	/**
-	*  Constructor
-	*
-	*  @param      DoliDB		$db      Database handler
-	*/
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	/**
-	 *	Charge indicateurs this->nb de tableau de bord
-	 *
-	 *	@return     int         <0 if KO, >0 if OK
-	 */
-	function load_state_board()
-	{
-		global $conf, $user;
-
-		$this->nb=array();
-
-		$sql = "SELECT count(p.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-		$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
-		$sql.= " AND p.fk_product_type = 1";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj=$this->db->fetch_object($resql))
-			{
-				$this->nb["services"]=$obj->nb;
-			}
-            $this->db->free($resql);
-			return 1;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			$this->error=$this->db->error();
-			return -1;
-		}
-	}
-
-}

From 5c2ed0f19fb07c22ebde2cf59639b58d1d62793e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2017 12:57:34 +0100
Subject: [PATCH 0328/1163] Fix field title lost

---
 htdocs/societe/rib.php          | 55 ++++++++++++++++-----------------
 htdocs/theme/eldy/style.css.php |  9 ++++--
 htdocs/theme/md/style.css.php   |  9 ++++--
 3 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 06c16a2efe6..65bd12b2be4 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -701,7 +701,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 	print '<table class="border centpercent">';
 
     print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>';
+    print '<td><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>';
 
     print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
     print '<td><input size="30" type="text" name="bank" value="'.$account->bank.'"></td></tr>';
@@ -743,17 +743,17 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 		print '</tr>';
 	}
 
-    print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
+    print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
     print '<textarea name="domiciliation" rows="4" cols="40" maxlength="255">';
     print $account->domiciliation;
     print "</textarea></td></tr>";
 
     print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>';
+    print '<td><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>';
     print "</td></tr>\n";
 
-    print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
-    print "<textarea name=\"owner_address\" rows=\"4\" cols=\"40\" maxlength=\"255\">";
+    print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
+    print '<textarea name="owner_address" rows="'.ROWS_4.'" cols="40" maxlength="255">';
     print $account->owner_address;
     print "</textarea></td></tr>";
 
@@ -769,14 +769,14 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 
     	// RUM
     	print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
-	print '<td colspan="4"><input size="30" type="text" name="rum" value="'.dol_escape_htmltag($account->rum).'"></td></tr>';
-
-	print '<td colspan="4">';
-	$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
-	print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur')?GETPOST('frstrecur'):$account->frstrecur), 0);
-	print '</td></tr>';
-
-	print '</table>';
+    	print '<td><input size="30" type="text" name="rum" value="'.dol_escape_htmltag($account->rum).'"></td></tr>';
+    
+    	print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
+    	$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
+    	print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur')?GETPOST('frstrecur'):$account->frstrecur), 0);
+    	print '</td></tr>';
+    
+    	print '</table>';
     }
 
     print '</div>';
@@ -806,7 +806,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 	print '<table class="border centpercent">';
 
     print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LabelRIB").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="label" value="'.GETPOST('label').'"></td></tr>';
+    print '<td><input size="30" type="text" name="label" value="'.GETPOST('label').'"></td></tr>';
 
     print '<tr><td class="fieldrequired">'.$langs->trans("Bank").'</td>';
     print '<td><input size="30" type="text" name="bank" value="'.GETPOST('bank').'"></td></tr>';
@@ -842,17 +842,17 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
         print '</tr>';
     }
 
-    print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
-    print '<textarea name="domiciliation" rows="4" cols="40" maxlength="255">';
+    print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
+    print '<textarea name="domiciliation" rows="'.ROWS_4.'" cols="40" maxlength="255">';
     print GETPOST('domiciliation');
     print "</textarea></td></tr>";
 
     print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="proprio" value="'.GETPOST('proprio').'"></td></tr>';
+    print '<td><input size="30" type="text" name="proprio" value="'.GETPOST('proprio').'"></td></tr>';
     print "</td></tr>\n";
 
-    print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
-    print '<textarea name="owner_address" rows="4" cols="40" maxlength="255">';
+    print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
+    print '<textarea name="owner_address" rows="'.ROWS_4.'" cols="40" maxlength="255">';
     print GETPOST('owner_address');
     print "</textarea></td></tr>";
 
@@ -860,21 +860,20 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 
     if ($conf->prelevement->enabled)
     {
-	print '<br>';
+    	print '<br>';
 
     	print '<table class="border" width="100%">';
 
     	// RUM
     	print '<tr><td class="titlefieldcreate">'.$langs->trans("RUM").'</td>';
-	print '<td>'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
+    	print '<td>'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
+    
+    	print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
+    	$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
+    	print $form->selectarray("frstrecur", $tblArraychoice, (isset($_POST['frstrecur'])?GETPOST('frstrecur'):'FRST'), 0);
+    	print '</td></tr>';
 
-	print '<td>';
-	$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
-	print $form->selectarray("frstrecur", $tblArraychoice, (isset($_POST['frstrecur'])?GETPOST('frstrecur'):'FRST'), 0);
-	print '</td></tr>';
-
-
-	print '</table>';
+    	print '</table>';
     }
 
     print '</div>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4970f7b6541..bed4b5c3fe3 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2307,7 +2307,9 @@ td.border, div.tagtable div div.border {
 
 
 /* Main boxes */
-
+.ficheaddleft table.noborder {
+	margin: 0px 0px 0px 0px;
+}
 table.liste, table.noborder, table.formdoc, div.noborder {
 	width: 100%;
 
@@ -2780,7 +2782,10 @@ div.tabBar .noborder {
 /*
  *  Boxes
  */
-
+ 
+.ficheaddleft div.boxstats {
+    border: none;
+}
 .boxstats {
     <?php print "float: ".$left.";\n"; ?>
     margin: 3px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index d2a145b30ee..acfd9d67452 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2177,7 +2177,9 @@ td.border, div.tagtable div div.border {
 
 
 /* Main boxes */
-
+.ficheaddleft table.noborder {
+	margin: 0px 0px 0px 0px;
+}
 table.liste, table.noborder, table.formdoc, div.noborder {
 	width: 100%;
 
@@ -2659,7 +2661,10 @@ div .tdtop {
 /*
  *  Boxes
  */
-
+ 
+.ficheaddleft div.boxstats {
+    border: none;
+}
 .boxstats {
     <?php print "float: ".$left.";\n"; ?>
     margin: 3px;

From 0f11a42fe4407c89df7265e6a13550016f8c8918 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2017 19:03:39 +0100
Subject: [PATCH 0329/1163] Fight against useless colspan

---
 htdocs/product/stock/product.php              | 15 +++----
 .../product/stock/tpl/stockcorrection.tpl.php | 43 +++++++++++--------
 .../product/stock/tpl/stocktransfer.tpl.php   | 27 ++++++------
 3 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 158440c5855..14cd07ec817 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -924,8 +924,8 @@ print "</tr>";
 print "</table>";
 print '</div>';
 
-if(!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) {
-	
+if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
+{
 	print '<br><br>';
 	print_titre($langs->trans('AddNewProductStockWarehouse'));
 	//print '<br />';
@@ -944,11 +944,11 @@ if(!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) {
 	$pse = new ProductStockEntrepot($db);
 	$lines = $pse->fetchAll(GETPOST('id'));
 	
-	if(!empty($lines)) {
-		
+	if (!empty($lines)) 
+	{
 		$var=false;
-		foreach($lines as $line) {
-			
+		foreach($lines as $line) 
+		{
 			$ent = new Entrepot($db);
 			$ent->fetch($line['fk_entrepot']);
 			print '<tr '.$bc[$var].'><td width="40%" colspan="4">'.$ent->getNomUrl(3).'</td>';
@@ -957,15 +957,12 @@ if(!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) {
 			print '<td align="right"><a href="?id='.GETPOST('id').'&fk_productstockwarehouse='.$line['id'].'&action=delete_productstockwarehouse">'.img_delete().'</a></td>';
 			print '</tr>';
 			$var=!$var;
-			
 		}
-
 	}
 	
 	print "</table>";
 	
 	print '</form>';
-	
 }
 
 llxFooter();
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index d08cf334671..757407a6692 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2010-2015 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2010-2017 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,6 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * $object must be defined
+ * $backtopage 
  */
 ?>
 
@@ -54,30 +55,34 @@
 		print '<tr>';
 		if ($object->element == 'product')
 		{
-			print '<td width="20%" class="fieldrequired" colspan="2">'.$langs->trans("Warehouse").'</td>';
-			print '<td width="20%">';
+			print '<td width="20%" class="fieldrequired">'.$langs->trans("Warehouse").'</td>';
+			print '<td width="30%">';
 			print $formproduct->selectWarehouses((GETPOST("dwid")?GETPOST("dwid",'int'):(GETPOST('id_entrepot')?GETPOST('id_entrepot','int'):'ifone')), 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100');
+    		print ' &nbsp; <select name="mouvement" id="mouvement">';
+    		print '<option value="0">'.$langs->trans("Add").'</option>';
+    		print '<option value="1"'.(GETPOST('mouvement')?' selected="selected"':'').'>'.$langs->trans("Delete").'</option>';
+    		print '</select>';
 			print '</td>';
 		}
 		if ($object->element == 'stock')
 		{
 			print '<td width="20%" class="fieldrequired" colspan="2">'.$langs->trans("Product").'</td>';
-	        print '<td width="20%">';
+	        print '<td width="30%">';
 	        print $form->select_produits(GETPOST('product_id'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES)?'0':''), 20, 0, -1);
+    		print ' &nbsp; <select name="mouvement" id="mouvement">';
+    		print '<option value="0">'.$langs->trans("Add").'</option>';
+    		print '<option value="1"'.(GETPOST('mouvement')?' selected="selected"':'').'>'.$langs->trans("Delete").'</option>';
+    		print '</select>';
 	        print '</td>';
 		}
-		print '<td width="20%">';
-		print '<select name="mouvement" id="mouvement" class="flat">';
-		print '<option value="0">'.$langs->trans("Add").'</option>';
-		print '<option value="1"'.(GETPOST('mouvement')?' selected="selected"':'').'>'.$langs->trans("Delete").'</option>';
-		print '</select></td>';
-		print '<td width="20%" class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td><td width="20%"><input class="flat" name="nbpiece" id="nbpiece" size="10" value="'.GETPOST("nbpiece").'"></td>';
+		print '<td width="20%" class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td>';
+		print '<td width="30%"><input name="nbpiece" id="nbpiece" size="10" value="'.GETPOST("nbpiece").'"></td>';
 		print '</tr>';
 
 		// Purchase price
 		print '<tr>';
-		print '<td width="20%" colspan="2">'.$langs->trans("UnitPurchaseValue").'</td>';
-		print '<td colspan="'.(!empty($conf->projet->enabled) ? '2' : '4').'"><input class="flat" name="unitprice" id="unitprice" size="10" value="'.GETPOST("unitprice").'"></td>';
+		print '<td width="25%">'.$langs->trans("UnitPurchaseValue").'</td>';
+		print '<td colspan="'.(!empty($conf->projet->enabled) ? '1' : '3').'"><input name="unitprice" id="unitprice" size="10" value="'.GETPOST("unitprice").'"></td>';
 		if (! empty($conf->projet->enabled))
 		{
 			print '<td>'.$langs->trans('Project').'</td>';
@@ -94,15 +99,15 @@
 		)
 		{
 			print '<tr>';
-			print '<td colspan="2"'.($object->element == 'stock'?'': ' class="fieldrequired"').'>'.$langs->trans("batch_number").'</td><td colspan="4">';
+			print '<td'.($object->element == 'stock'?'': ' class="fieldrequired"').'>'.$langs->trans("batch_number").'</td><td colspan="3">';
 			print '<input type="text" name="batch_number" size="40" value="'.GETPOST("batch_number").'">';
 			print '</td>';
-			print '</tr><tr>';
-			print '<td colspan="2">'.$langs->trans("EatByDate").'</td><td>';
+			print '</tr>';
+			print '<tr>';
+			print '<td>'.$langs->trans("EatByDate").'</td><td>';
 			$eatbyselected=dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear'));
 			$form->select_date($eatbyselected,'eatby','','',1,"");
 			print '</td>';
-			print '<td></td>';
 			print '<td>'.$langs->trans("SellByDate").'</td><td>';
 			$sellbyselected=dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear'));
 			$form->select_date($sellbyselected,'sellby','','',1,"");
@@ -113,11 +118,11 @@
 		// Label of mouvement of id of inventory
 		$valformovementlabel=((GETPOST("label") && (GETPOST('label') != $langs->trans("MovementCorrectStock",''))) ? GETPOST("label") : $langs->trans("MovementCorrectStock", $productref));
 		print '<tr>';
-		print '<td width="20%" colspan="2">'.$langs->trans("MovementLabel").'</td>';
-		print '<td colspan="2">';
+		print '<td>'.$langs->trans("MovementLabel").'</td>';
+		print '<td>';
 		print '<input type="text" name="label" size="60" value="'.$valformovementlabel.'">';
 		print '</td>';
-		print '<td width="20%">'.$langs->trans("InventoryCode").'</td><td width="20%"><input class="flat maxwidth100onsmartphone" name="inventorycode" id="inventorycode" value="'.GETPOST("inventorycode").'"></td>';
+		print '<td>'.$langs->trans("InventoryCode").'</td><td><input class="maxwidth100onsmartphone" name="inventorycode" id="inventorycode" value="'.GETPOST("inventorycode").'"></td>';
 		print '</tr>';
 
 		print '</table>';
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index b38804c05b1..407d8a714d8 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2010-2015 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2010-2017 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -61,23 +61,23 @@
 		print '<tr>';
 		if ($object->element == 'product')
 		{
-		    print '<td width="15%" class="fieldrequired">'.$langs->trans("WarehouseSource").'</td>';
-		    print '<td width="15%">';
+		    print '<td width="20%" class="fieldrequired">'.$langs->trans("WarehouseSource").'</td>';
+		    print '<td width="30%">';
 		    print $formproduct->selectWarehouses((GETPOST("dwid")?GETPOST("dwid",'int'):(GETPOST('id_entrepot')?GETPOST('id_entrepot','int'):'ifone')), 'id_entrepot', 'warehouseopen,warehouseinternal', 1);
 		    print '</td>';
 		}
 		if ($object->element == 'stock')
 		{
-		    print '<td width="15%" class="fieldrequired">'.$langs->trans("Product").'</td>';
-		    print '<td width="15%">';
+		    print '<td width="20%" class="fieldrequired">'.$langs->trans("Product").'</td>';
+		    print '<td width="30%">';
 		    print $form->select_produits(GETPOST('product_id'),'product_id',(empty($conf->global->STOCK_SUPPORTS_SERVICES)?'0':''));
 		    print '</td>';
 		}
 		
-		print '<td width="15%" class="fieldrequired">'.$langs->trans("WarehouseTarget").'</td><td width="15%">';
+		print '<td width="20%" class="fieldrequired">'.$langs->trans("WarehouseTarget").'</td><td width="30%">';
 		print $formproduct->selectWarehouses(GETPOST('id_entrepot_destination'), 'id_entrepot_destination', 'warehouseopen,warehouseinternal', 1);
-		print '</td>';
-		print '<td width="15%" class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td><td width="15%"><input type="text" class="flat" name="nbpiece" size="10" value="'.dol_escape_htmltag(GETPOST("nbpiece")).'"></td>';
+		print '</td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td><td colspan="3"><input type="text" name="nbpiece" size="10" value="'.dol_escape_htmltag(GETPOST("nbpiece")).'"></td>';
 		print '</tr>';
 
 		// Serial / Eat-by date
@@ -87,7 +87,7 @@
 		)
 		{
 			print '<tr>';
-			print '<td'.($object->element == 'stock'?'': ' class="fieldrequired"').'>'.$langs->trans("batch_number").'</td><td colspan="5">';
+			print '<td'.($object->element == 'stock'?'': ' class="fieldrequired"').'>'.$langs->trans("batch_number").'</td><td colspan="3">';
 			if ($pdluoid > 0)
 			{
                 // If form was opened for a specific pdluoid, field is disabled
@@ -99,14 +99,15 @@
 			    print '<input type="text" name="batch_number" size="40" value="'.(GETPOST('batch_number')?GETPOST('batch_number'):$pdluo->batch).'">';
 			}
 			print '</td>';
-			print '</tr><tr>';
+			print '</tr>';
+			
+			print '<tr>';
 			print '<td>'.$langs->trans("EatByDate").'</td><td>';
 			print $form->select_date(($d_eatby?$d_eatby:$pdluo->eatby),'eatby','','',1,"", 1, 0, 1, ($pdluoid > 0 ? 1 : 0));		// If form was opened for a specific pdluoid, field is disabled
 			print '</td>';
 			print '<td>'.$langs->trans("SellByDate").'</td><td>';
 			print $form->select_date(($d_sellby?$d_sellby:$pdluo->sellby),'sellby','','',1,"", 1, 0, 1, ($pdluoid > 0 ? 1 : 0));		// If form was opened for a specific pdluoid, field is disabled
 			print '</td>';
-			print '<td colspan="2"></td>';
 			print '</tr>';
 		}
 
@@ -114,10 +115,10 @@
 		$valformovementlabel=(GETPOST("label")?GETPOST("label"):$langs->trans("MovementTransferStock", $productref));
 		print '<tr>';
 		print '<td width="15%">'.$langs->trans("MovementLabel").'</td>';
-		print '<td colspan="3">';
+		print '<td>';
 		print '<input type="text" name="label" size="60" value="'.dol_escape_htmltag($valformovementlabel).'">';
 		print '</td>';
-		print '<td width="20%">'.$langs->trans("InventoryCode").'</td><td width="20%"><input class="flat maxwidth100onsmartphone" name="inventorycode" id="inventorycode" value="'.(GETPOST("inventorycode")?GETPOST("inventorycode",'alpha'):dol_print_date(dol_now(),'%y%m%d%H%M%S')).'"></td>';
+		print '<td width="15%">'.$langs->trans("InventoryCode").'</td><td><input class="maxwidth100onsmartphone" name="inventorycode" id="inventorycode" value="'.(GETPOST("inventorycode")?GETPOST("inventorycode",'alpha'):dol_print_date(dol_now(),'%y%m%d%H%M%S')).'"></td>';
 		print '</tr>';
 
 		print '</table>';

From 706dd838c9cbccd675e9de6f12afb732280e962d Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Wed, 1 Mar 2017 11:21:49 +0100
Subject: [PATCH 0330/1163] Situation total row left a col if bank enabled

---
 htdocs/compta/facture.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 6c311224ba0..2bc8b86a19c 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3664,6 +3664,9 @@ else if ($id > 0 || ! empty($ref))
             
             print '<tr ' . $bc[$var] . '>';
             print '<td colspan="2" align="right"></td>';
+	    if (! empty($conf->banque->enabled))
+		print '<td align="right"></td>';
+
             print '<td align="right"><b>' . price($total_next_ht) . '</b></td>';
             print '<td align="right"><b>' . price($total_next_ttc) . '</b></td>';
             print '<td width="18">&nbsp;</td>';

From a371b275646e0f693622343744bfa5950c46d5da Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Wed, 1 Mar 2017 16:48:09 +0100
Subject: [PATCH 0331/1163] better management of situation progress in pdf

---
 .../core/modules/facture/doc/pdf_crabe.modules.php  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index fc9bae07c9c..a8284213022 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -453,7 +453,7 @@ class pdf_crabe extends ModelePDFFactures
 						$pageposafter=$pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
+						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX-$progress_width,3,$curX,$curY,$hideref,$hidedesc);
 						$pageposafter=$pdf->getPage();
 						$posyafter=$pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
@@ -1452,6 +1452,17 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
 			}
 		}
+
+		if ($this->situationinvoice)
+		{
+			$pdf->line($this->postotalht+4, $tab_top, $this->postotalht+4, $tab_top + $tab_height);
+			if (empty($hidetop))
+			{
+				$pdf->SetXY($this->postotalht-19, $tab_top+1);
+				$pdf->MultiCell(30,2, $outputlangs->transnoentities("Situation"),'','C');
+			}
+		}
+
 		if ($this->atleastonediscount)
 		{
 			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);

From d202003e29e56d75769fef92b1db99f3931a27a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Mar 2017 18:12:06 +0100
Subject: [PATCH 0332/1163] Fix translation

---
 htdocs/core/class/commoninvoice.class.php | 26 +++++++++++------------
 htdocs/langs/en_US/bills.lang             |  4 ++--
 htdocs/theme/eldy/style.css.php           | 16 ++++++++------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 2a6270e11dc..ac7bb3175fb 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -331,8 +331,8 @@ abstract class CommonInvoice extends CommonObject
 			}
 			else
 			{
-				if ($type == 2) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');       // credit note
-				elseif ($type == 3) return $langs->trans('Bill'.$prefix.'StatusConverted');             // deposit invoice
+				if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');       // credit note
+				elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');             // deposit invoice
 				else return $langs->trans('Bill'.$prefix.'StatusPaid');
 			}
 		}
@@ -349,8 +349,8 @@ abstract class CommonInvoice extends CommonObject
 			}
 			else
 			{
-				if ($type == 2) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
-				elseif ($type == 3) return $langs->trans('Bill'.$prefix.'StatusConverted');
+				if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
+				elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');
 				else return $langs->trans('Bill'.$prefix.'StatusPaid');
 			}
 		}
@@ -367,8 +367,8 @@ abstract class CommonInvoice extends CommonObject
 			}
 			else
 			{
-				if ($type == 2) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
-				elseif ($type == 3) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusConverted');
+				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
+				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusConverted');
 				else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaid');
 			}
 		}
@@ -385,8 +385,8 @@ abstract class CommonInvoice extends CommonObject
 			}
 			else
 			{
-				if ($type == 2) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
-				elseif ($type == 3) return img_picto($langs->trans('BillStatusConverted'),'statut6');
+				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
+				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6');
 				else return img_picto($langs->trans('BillStatusPaid'),'statut6');
 			}
 		}
@@ -403,8 +403,8 @@ abstract class CommonInvoice extends CommonObject
 			}
 			else
 			{
-				if ($type == 2) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('BillStatusPaidBackOrConverted');
-				elseif ($type == 3) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('BillStatusConverted');
+				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('BillStatusPaidBackOrConverted');
+				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('BillStatusConverted');
 				else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('BillStatusPaid');
 			}
 		}
@@ -418,15 +418,15 @@ abstract class CommonInvoice extends CommonObject
 				if (($status == 3 || $status == 2) && $alreadypaid > 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut7');
 				if ($alreadypaid <= 0) 
 				{
-				    if ($type == 2) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'),'statut1');
+				    if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'),'statut1');
 				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotPaid').' </span>'.img_picto($langs->trans('BillStatusNotPaid'),'statut1');
 				}
 				return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusStarted').' </span>'.img_picto($langs->trans('BillStatusStarted'),'statut3');
 			}
 			else
 			{
-				if ($type == 2) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted').' </span>'.img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
-				elseif ($type == 3) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusConverted').' </span>'.img_picto($langs->trans('BillStatusConverted'),'statut6');
+				if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted').' </span>'.img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
+				elseif ($type == self::TYPE_DEPOSIT) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusConverted').' </span>'.img_picto($langs->trans('BillStatusConverted'),'statut6');
 				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaid').' </span>'.img_picto($langs->trans('BillStatusPaid'),'statut6');
 			}
 		}
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 46fe0bba2ab..067734d2d27 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -115,7 +115,7 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or converted into discount
 BillStatusConverted=Paid (ready for final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
@@ -126,7 +126,7 @@ BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Credit note refund/converted
 BillShortStatusConverted=Processed
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 70fd7c2f44e..fddd059e726 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -286,19 +286,21 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     font-size: <?php print $fontsize ?>px;
     font-family: <?php print $fontlist ?>;
 
-    border: 1px solid #C0C0C0;
-    /* v6 border: none;
+    /* border: 1px solid #C0C0C0; */
+    border: none;
     border-bottom: 1px solid #C0C0C0;
-    outline: none !important;*/
+    outline: none;
     margin: 0px 0px 0px 0px;
 }
-
+input {
+    line-height: 17px;
+}
 input, select {
-	/* v6 border-bottom: solid 1px rgba(0,0,0,.2);*/
-	border-radius: 2px;
+	border-bottom: solid 1px rgba(0,0,0,.2);
+	/*border-radius: 2px;
 	border: solid 1px rgba(0,0,0,.3);
 	border-top:solid 1px rgba(0,0,0,.3);
-	border-bottom:solid 1px rgba(0,0,0,.2);
+	border-bottom:solid 1px rgba(0,0,0,.2);*/
 
 	padding:4px;
 	margin-left:0px;

From 83622c62bed27000d45e77282a84ddc588cd2962 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Wed, 1 Mar 2017 21:54:30 +0100
Subject: [PATCH 0333/1163] Update pdf_crabe.modules.php

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index a8284213022..2b3209a183b 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1543,6 +1543,7 @@ class pdf_crabe extends ModelePDFFactures
 		if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir");
 		if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
 		if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProFormat");
+		if ($this->situationinvoice) $title=$outputlangs->transnoentities("InvoiceSituation");
 		$pdf->MultiCell($w, 3, $title, '', 'R');
 
 		$pdf->SetFont('','B',$default_font_size);

From 02d9a41e77a2d070cf12c63c394af2f1ef026cb4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2017 01:25:11 +0100
Subject: [PATCH 0334/1163] Use placeholder for %

---
 htdocs/accountancy/customer/lines.php      | 4 ++--
 htdocs/accountancy/customer/list.php       | 8 ++++----
 htdocs/accountancy/expensereport/lines.php | 4 ++--
 htdocs/accountancy/expensereport/list.php  | 8 ++++----
 htdocs/accountancy/supplier/lines.php      | 4 ++--
 htdocs/accountancy/supplier/list.php       | 8 ++++----
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index d6f78df21e7..a759472304e 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -278,8 +278,8 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
-	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="right flat maxwidth50" placeholder="%" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tavintra" value="' . dol_escape_htmltag($search_tavintra) . '"></td>';
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 45dac88f62d..09ad316a398 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -293,11 +293,11 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidthonsmartphone" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
-	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '">%</td>';
+	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50 right" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
+	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50 right" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
-	print '<td align="right" class="liste_titre">';
+	print '<td align="center" class="liste_titre">';
 	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
 	print $searchpitco;
 	print '</td>';
@@ -400,7 +400,7 @@ if ($result) {
 		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
 		
-		print '<td align="right">';
+		print '<td align="center">';
 		print '<input type="checkbox" class="flat checkforselect" name="toselect[]"  value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
 		print '</td>';
 		print '</tr>';
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 049e1d44687..40fd15d7307 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -253,8 +253,8 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
 	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="right flat maxwidth50" name="search_vat" size="1" placeholder="%" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="right flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
     print '<td class="liste_titre" align="right"></td>';
     print '<td class="liste_titre" align="right">';
     $searchpicto=$form->showFilterAndCheckAddButtons(1);
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 693984432ae..5c1ebff96ec 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -279,11 +279,11 @@ if ($result) {
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidthonsmartphone" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
-	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
+	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
-	print '<td align="right" class="liste_titre">';
+	print '<td align="center" class="liste_titre">';
 	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
 	print $searchpicto;
 	print '</td>';
@@ -344,7 +344,7 @@ if ($result) {
 		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
 
-		print '<td align="right">';
+		print '<td align="center">';
 		print '<input type="checkbox" class="flat checkforselect" name="toselect[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
 		print '</td>';
 
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index df5b37357b5..121ba0e9f46 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -261,8 +261,8 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
-	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
     print '<td class="liste_titre" align="center">';
     $searchpitco=$form->showFilterAndCheckAddButtons(1);
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 93cdd4d48ac..19ef52f0d85 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -292,11 +292,11 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidthonsmartphone" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
-	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
+	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
-	print '<td align="right" class="liste_titre">';
+	print '<td align="center" class="liste_titre">';
 	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
 	print $searchpitco;
 	print '</td>';
@@ -406,7 +406,7 @@ if ($result) {
 		print '</td>';
 		
 		// Colonne choix ligne a ventiler
-		print '<td align="right">';
+		print '<td align="center">';
 		print '<input type="checkbox" class="flat checkforselect" name="toselect[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
 		print '</td>';
 

From d3a80795ceed3ed482f33e45fac76b0fb1400bf1 Mon Sep 17 00:00:00 2001
From: dolibarr95 <onajid@1blow-services.com>
Date: Thu, 2 Mar 2017 11:40:43 +0100
Subject: [PATCH 0335/1163] Add label tag

Add a label html tag for the input radio extrafield tag.
---
 htdocs/core/class/extrafields.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 1211c334617..24023eb4d89 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1018,8 +1018,9 @@ class ExtraFields
 			{
 				$out.='<input class="flat '.$showsize.'" type="radio" name="'.$keysuffix.'options_'.$key.$keyprefix.'" '.($moreparam?$moreparam:'');
 				$out.=' value="'.$keyopt.'"';
+				$out.=' id="'.$keysuffix.'options_'.$key.$keyprefix.'_'.$keyopt.'"';
 				$out.= ($value==$keyopt?'checked':'');
-				$out.='/>'.$val.'<br>';
+				$out.='/><label for="'.$keysuffix.'options_'.$key.$keyprefix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
 		}
 		elseif ($type == 'chkbxlst')

From abeba95de9740d1cecaed4f872ff799326e15c13 Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Thu, 2 Mar 2017 15:13:42 +0100
Subject: [PATCH 0336/1163] New USER odt

---
 htdocs/admin/user.php                     | 194 +++++++++++++++++++++-
 htdocs/core/class/html.formfile.class.php |   4 +-
 htdocs/core/lib/admin.lib.php             |   2 +-
 htdocs/user/card.php                      |   9 +-
 htdocs/user/class/user.class.php          |  34 ++++
 5 files changed, 235 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index fcb062457a9..d237ca3e727 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -35,11 +35,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 $langs->load("admin");
 $langs->load("members");
 $langs->load("users");
-
 if (! $user->admin) accessforbidden();
 
 $extrafields = new ExtraFields($db);
 
+$action = GETPOST('action','alpha');
+$value = GETPOST('value','alpha');
 $type='user';
 
 /*
@@ -47,7 +48,36 @@ $type='user';
  */
 
 // Activate a model
-if ($action == 'set_default')
+
+// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
+if ($action == 'setModuleOptions')
+{
+	$post_size=count($_POST);
+
+	$db->begin();
+
+	for($i=0;$i < $post_size;$i++)
+    {
+    	if (array_key_exists('param'.$i,$_POST))
+    	{
+    		$param=GETPOST("param".$i,'alpha');
+    		$value=GETPOST("value".$i,'alpha');
+    		if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+	    	if (! $res > 0) $error++;
+    	}
+    }
+	if (! $error)
+    {
+        $db->commit();
+	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        $db->rollback();
+	    setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+elseif ($action == 'set_default')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 	$res = true;
@@ -70,7 +100,7 @@ elseif ($action == 'setdoc')
 	{
 		// La constante qui a ete lue en avant du nouveau set
 		// on passe donc par une variable pour avoir un affichage coherent
-		$conf->global->PRODUCT_ADDON_PDF_ODT = $value;
+		$conf->global->USER_ADDON_PDF_ODT = $value;
 	}
 
 	// On active le modele
@@ -175,6 +205,164 @@ print '</td></tr>';
 
 print '</table>';
 
+
+
+$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+
+$form=new Form($db);
+
+// Defini tableau def des modeles
+$def = array();
+$sql = "SELECT nom";
+$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql.= " WHERE type = '".$type."'";
+$sql.= " AND entity = ".$conf->entity;
+$resql=$db->query($sql);
+if ($resql)
+{
+	$i = 0;
+	$num_rows=$db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
+}
+else
+{
+	dol_print_error($db);
+}
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
+print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
+print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+$var=true;
+foreach ($dirmodels as $reldir)
+{
+    foreach (array('','/doc') as $valdir)
+    {
+    	$dir = dol_buildpath($reldir."core/modules/user".$valdir);
+        if (is_dir($dir))
+        {
+            $handle=opendir($dir);
+            if (is_resource($handle))
+            {
+                while (($file = readdir($handle))!==false)
+                {
+                    $filelist[]=$file;
+                }
+                closedir($handle);
+                arsort($filelist);
+
+                foreach($filelist as $file)
+                {
+                    if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
+                    {
+
+                    	if (file_exists($dir.'/'.$file))
+                    	{
+                    		$name = substr($file, 4, dol_strlen($file) -16);
+	                        $classname = substr($file, 0, dol_strlen($file) -12);
+
+	                        require_once $dir.'/'.$file;
+	                        $module = new $classname($db);
+
+	                        $modulequalified=1;
+	                        if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+
+	                        if ($modulequalified)
+	                        {
+	                            $var = !$var;
+	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print (empty($module->name)?$name:$module->name);
+	                            print "</td><td>\n";
+	                            if (method_exists($module,'info')) print $module->info($langs);
+	                            else print $module->description;
+	                            print '</td>';
+
+	                            // Active
+	                            if (in_array($name, $def))
+	                            {
+	                            	print '<td align="center">'."\n";
+	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&value='.$name.'">';
+	                            	print img_picto($langs->trans("Enabled"),'switch_on');
+	                            	print '</a>';
+	                            	print '</td>';
+	                            }
+	                            else
+	                            {
+	                                print '<td align="center">'."\n";
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+	                                print "</td>";
+	                            }
+
+	                            // Defaut
+	                            print '<td align="center">';
+	                            if ($conf->global->USER_ADDON_PDF == $name)
+	                            {
+	                                print img_picto($langs->trans("Default"),'on');
+	                            }
+	                            else
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+	                            }
+	                            print '</td>';
+
+	                           // Info
+		    					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+					    		$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+			                    if ($module->type == 'pdf')
+			                    {
+			                        $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+			                    }
+					    		$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					    		$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
+
+
+	                            print '<td align="center">';
+	                            print $form->textwithpicto('',$htmltooltip,1,0);
+	                            print '</td>';
+
+	                            // Preview
+	                            print '<td align="center">';
+	                            if ($module->type == 'pdf')
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'contract').'</a>';
+	                            }
+	                            else
+	                            {
+	                                print img_object($langs->trans("PreviewNotAvailable"),'generic');
+	                            }
+	                            print '</td>';
+
+	                            print "</tr>\n";
+	                        }
+                    	}
+                    }
+                }
+            }
+        }
+    }
+}
+
+print '</table>';
+print "<br>";
+
 dol_fiche_end();
 
 llxFooter();
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index ded716c1766..f60faa84426 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -416,8 +416,8 @@ class FormFile
                 if (is_array($genallowed)) $modellist=$genallowed;
                 else
                 {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.php';
-                    $modellist=ModelePDFProduct::liste_modeles($this->db);
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
+                    $modellist=ModelePDFUser::liste_modeles($this->db);
                 }
             }
             elseif ($modulepart == 'group')
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index ffb09b2b3ab..56c48a33173 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1270,7 +1270,7 @@ function addDocumentModel($name, $type, $label='', $description='')
     $sql.= ($label?"'".$db->escape($label)."'":'null').", ";
     $sql.= (! empty($description)?"'".$db->escape($description)."'":"null");
     $sql.= ")";
-
+	
     dol_syslog("admin.lib::addDocumentModel", LOG_DEBUG);
 	$resql=$db->query($sql);
 	if ($resql)
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index ce6ef3f992f..53634de159c 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -580,6 +580,11 @@ if (empty($reshook)) {
             setEventMessages($ldap->error, $ldap->errors, 'errors');
         }
     }
+		
+    // Actions to build doc
+    $upload_dir = $conf->user->dir_output;
+    $permissioncreate=$user->rights->user->user->creer;
+    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
 
@@ -2284,8 +2289,8 @@ else
         $filename = dol_sanitizeFileName($object->ref);
         $filedir = $conf->user->dir_output . "/" . dol_sanitizeFileName($object->ref);
         $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-        $genallowed = $user->rights->user->creer;
-        $delallowed = $user->rights->user->supprimer;
+        $genallowed = $user->rights->user->user->creer;
+        $delallowed = $user->rights->user->user->supprimer;
 
         $var = true;
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 1ee07e0a7af..f77a7fbc9df 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2622,5 +2622,39 @@ class User extends CommonObject
         }
     }
 
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 * 	@param	    string		$modele			Force model to use ('' to not force)
+	 * 	@param		Translate	$outputlangs	Object langs to use for output
+	 *  @param      int			$hidedetails    Hide details of lines
+	 *  @param      int			$hidedesc       Hide description
+	 *  @param      int			$hideref        Hide ref
+	 * 	@return     int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	{
+		global $conf,$user,$langs;
+
+		$langs->load("user");
+
+		// Positionne le modele sur le nom du modele a utiliser
+		if (! dol_strlen($modele))
+		{
+			if (! empty($conf->global->USER_ADDON_PDF))
+			{
+				$modele = $conf->global->USER_ADDON_PDF;
+			}
+			else
+			{
+				$modele = 'bluesky';
+			}
+		}
+
+		$modelpath = "core/modules/user/doc/";
+
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
+
 }
 

From 29cb5dd5452d1704c54271f1d91241497e240ec7 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 3 Mar 2017 11:48:04 +0100
Subject: [PATCH 0337/1163] FIX input stock value not display

the good array is "value" (like in the card tabs who give the right value)
---
 htdocs/product/stock/mouvement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index a5daa87a510..d23dca08282 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -574,7 +574,7 @@ if ($resql)
         
         // Value
         print '<tr><td class="titlefield">'.$langs->trans("EstimatedStockValueShort").'</td><td>';
-        print price((empty($calcproducts['qty'])?'0':price2num($calcproducts['qty'],'MT')), 0, $langs, 0, -1, -1, $conf->currency);
+        print price((empty($calcproducts['value'])?'0':price2num($calcproducts['value'],'MT')), 0, $langs, 0, -1, -1, $conf->currency);
         print "</td></tr>";
 
         // Last movement

From cff9fa0e6b4f4c13909f703f2cd646336cd48437 Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Fri, 3 Mar 2017 12:01:58 +0100
Subject: [PATCH 0338/1163] FIX user odt

---
 .../core/class/commondocgenerator.class.php   | 29 ++++++++++++++-----
 .../core/modules/user/modules_user.class.php  | 28 ++++++++++++++++++
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 51977bcb356..1d4cb508fb9 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -320,16 +320,29 @@ abstract class CommonDocGenerator
 	
 	
 
+    /**
+     * Define array with couple subtitution key => subtitution value
+     *
+     * @param   Object		$object    		Dolibarr Object
+     * @param   Translate	$outputlangs    Language object for output
+     * @param   boolean		$recursive    	Want to fetch child array or child object
+     * @return	array						Array of substitution key->code
+     */
 	function get_substitutionarray_each_var_object(&$object,$outputlangs,$recursive=true) {
-		foreach($object as $key => $value) {
-			if(!is_array($value) && !is_object($value)) {
-	    	$array_other['object_'.$key] = $value;
-			}
-			if(is_array($value) && $recursive){
-				foreach($value as $key2 => $val) {
-					$array_other[$key][$key2] = $this->get_substitutionarray_each_var_object($val,$outputlangs,false);
+		$array_other = array();
+		if(!empty($object)) {
+			foreach($object as $key => $value) {
+				if(!is_array($value) && !is_object($value)) {
+		    		$array_other['object_'.$key] = $value;
 				}
-			}
+				if(is_array($value) && $recursive){
+					if(!empty($value)) {
+						foreach($value as $key2 => $val) {
+							$array_other[$key][$key2] = $this->get_substitutionarray_each_var_object($val,$outputlangs,false);
+						}
+					}
+				}
+		    }
 	    }
 		return $array_other;
 	}
diff --git a/htdocs/core/modules/user/modules_user.class.php b/htdocs/core/modules/user/modules_user.class.php
index 3e94ece9372..43660da1adb 100644
--- a/htdocs/core/modules/user/modules_user.class.php
+++ b/htdocs/core/modules/user/modules_user.class.php
@@ -55,6 +55,34 @@ abstract class ModelePDFUser extends CommonDocGenerator
 		$type='user';
 		$liste=array();
 
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		return $liste;
+	}
+}
+
+/**
+ *	Parent class to manage intervention document templates
+ */
+abstract class ModelePDFUserGroup extends CommonDocGenerator
+{
+	var $error='';
+
+
+	/**
+	 *	Return list of active generation modules
+	 *
+     *  @param	DoliDB	$db     			Database handler
+     *  @param  integer	$maxfilenamelength  Max length of value to show
+     *  @return	array						List of templates
+	 */
+	static function liste_modeles($db,$maxfilenamelength=0)
+	{
+		global $conf;
+
+		$type='usergroup';
+		$liste=array();
+
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$liste=getListOfModels($db,$type,$maxfilenamelength);
 		return $liste;

From 07c828d38f220bfc69cfa156ce7c230478194955 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2017 13:27:51 +0100
Subject: [PATCH 0339/1163] Introduce method loadLangs to save code lines

---
 htdocs/commande/list.php              |  7 +------
 htdocs/core/class/translate.class.php | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 662a727c88b..6442dcb0866 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -43,12 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-$langs->load('orders');
-$langs->load('sendings');
-$langs->load('deliveries');
-$langs->load('companies');
-$langs->load('compta');
-$langs->load('bills');
+$langs->loadLangs(array("orders",'sendings','deliveries','companies','compta','bills'));
 
 $action=GETPOST('action','alpha');
 $massaction=GETPOST('massaction','alpha');
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index e8318698ef7..66d438d3ffe 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -138,6 +138,20 @@ class Translate
 	}
 
 
+	/**
+	 *  Load translation files.
+     *
+	 *  @param	array	$domains      		Array of lang files to load
+	 *	@return	int							<0 if KO, 0 if already loaded or loading not required, >0 if OK
+	 */
+	function loadLangs($domains)
+	{
+	    foreach($domains as $domain)
+	    {
+	        $this->load($domain);
+	    }
+	}
+	
 	/**
 	 *  Load translation key-value for a particular file, into a memory array.
 	 *  If data for file already loaded, do nothing.

From 8cd0956b306059cd3be99ef326c6c8847c74b6c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2017 13:28:18 +0100
Subject: [PATCH 0340/1163] Code comment

---
 dev/examples/ldap/ldapsearch_sample1.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/examples/ldap/ldapsearch_sample1.txt b/dev/examples/ldap/ldapsearch_sample1.txt
index fb7c4f85543..7000723d92a 100644
--- a/dev/examples/ldap/ldapsearch_sample1.txt
+++ b/dev/examples/ldap/ldapsearch_sample1.txt
@@ -5,5 +5,5 @@
 #
 # ldapsearch -h hostname -x
 # ldapsearch -h hostname -x -b "ou=people,dc=teclib,dc=infra"
-# ldapsearch -h hostname -x -z 0 -b "o=somecompany.com" -D "cn=manager,o=somecompany.com" -W "(objectclass=*)"
-# ldapsearch -h hostname -x -b "o=somecompany.com" -D "cn=manager,o=somecompany.com" -W "(objectclass=*)"
+# ldapsearch -h hostname -x -z 0 -b "o=somecompany.com" -D "cn=manager,o=somecompany.com" -w password "(objectclass=*)"
+# ldapsearch -h hostname -x -b "o=somecompany.com" -D "cn=manager,o=somecompany.com" -w password "(objectclass=*)"

From afc0cb93b35fd7c246623045910652af19e489b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2017 13:30:02 +0100
Subject: [PATCH 0341/1163] First implementation of CSS3 flex.

---
 htdocs/index.php                | 31 +++++++++------------------
 htdocs/theme/eldy/style.css.php | 36 +++++++++++++++++++++++++-------
 htdocs/theme/md/style.css.php   | 37 +++++++++++++++++++++++++++++----
 3 files changed, 71 insertions(+), 33 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index b59535d0169..4605e090fa3 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -110,26 +110,6 @@ if (! empty($conf->global->MAIN_MOTD))
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-/*
- * Informations area
- */
-/* Was moved into a widget
-$boxinfo='';
-$boxinfo.= '<div class="box">';
-$boxinfo.= '<table summary="'.dol_escape_htmltag($langs->trans("LoginInformation")).'" class="noborder boxtable" width="100%">';
-$boxinfo.= '<tr class="liste_titre"><th class="liste_titre" colspan="2">'.$langs->trans("Informations").'</th></tr>';
-$boxinfo.= '<tr '.$bc[false].'>';
-$boxinfo.= '<td class="nowrap">'.$langs->trans("User").'</td><td>'.$user->getNomUrl(0).'</td></tr>';
-$boxinfo.= '<tr '.$bc[true].'>';
-$boxinfo.= '<td class="nowrap">'.$langs->trans("PreviousConnexion").'</td><td>';
-if ($user->datepreviouslogin) $boxinfo.= dol_print_date($user->datepreviouslogin,"dayhour",'tzuser');
-else $boxinfo.= $langs->trans("Unknown");
-$boxinfo.= '</td>';
-$boxinfo.= "</tr>\n";
-$boxinfo.= "</table>\n";
-$boxinfo.= '</div>';
-*/
-
 /*
  * Dashboard Dolibarr states (statistics)
  * Hidden for external users
@@ -148,7 +128,7 @@ if (empty($user->societe_id))
     $boxstat.='<tr class="liste_titre">';
     $boxstat.='<th class="liste_titre">'.$langs->trans("DolibarrStateBoard").'</th>';
     $boxstat.='</tr>';
-    $boxstat.='<tr class="impair"><td class="tdboxstats nohover">';
+    $boxstat.='<tr class="impair"><td class="tdboxstats nohover flexcontainer">';
 
     $var=true;
 
@@ -356,6 +336,15 @@ if (empty($user->societe_id))
 	    }
     }
 
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
+    
     $boxstat.='</td></tr>';
     $boxstat.='</table>';
     $boxstat.='</div>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index fddd059e726..6a99badca9e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -646,6 +646,20 @@ div.fiche>form>div.div-table-responsive {
     min-height: 350px;
 }
 
+.flexcontainer {
+    display: inline-flex;
+    flex-flow: row wrap;
+    justify-content: flex-start;
+}
+.thumbstat {
+	flex: 1 1 120px;
+    /* flex-grow: 1; */
+    /* flex-shrink: 1; */
+    /* flex-basis: 140px; */
+    width: 100%;
+    justify-content: flex-start;
+    align-self: flex-start;
+}
 
 /* ============================================================================== */
 /* Styles to hide objects                                                         */
@@ -2803,7 +2817,7 @@ div.tabBar .noborder {
 	white-space: nowrap;
 	overflow: hidden;
     text-overflow: ellipsis;
-    width: 110px;    
+    width: 105px;    
 }
 .boxstats:hover {
 	box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.20);
@@ -3925,13 +3939,19 @@ div.dataTables_length select {
 	background: #FFFFFF !important;
 }
 
+.select2-arrow {
+	border: none;
+	border-left: none !important;
+	background: none !important;
+}
+
 .select2-choice
 {
-	border: 1px solid #aaa;
-	/* v6 border-top: none !important;
+	/* border: 1px solid #aaa; */
+	border-top: none !important;
 	border-left: none !important;
 	border-right: none !important;
-	border-bottom: 1px solid #aaa;*/
+	border-bottom: 1px solid #aaa;
 }
 .select2-drop.select2-drop-above.select2-drop-active,
 .select2-container-active .select2-choice,
@@ -3941,7 +3961,6 @@ div.dataTables_length select {
 .select2-container-multi.select2-container-active .select2-choices
 {
 	border: 1px solid #aaa;
-	/* v6 */
 }
 .select2-disabled
 {
@@ -3949,7 +3968,7 @@ div.dataTables_length select {
 }
 .select2-drop-active
 {
-	border: 1px solid #aaa;
+	border: none;
 	border-top: none;
 }
 a span.select2-chosen
@@ -3958,7 +3977,7 @@ a span.select2-chosen
 }
 .select2-container .select2-choice {
 	background-image: none;
-	height: 24px;
+	/* height: 24px; */
 	line-height: 24px;
 }
 .select2-choices .select2-search-choice {
@@ -4062,6 +4081,8 @@ ul.ulselectedfields {
 dl.dropdown {
     margin:0px;
     padding:0px;
+    vertical-align: middle;
+    display: inline-block;
 }
 .dropdown dd, .dropdown dt {
     margin:0px;
@@ -4163,7 +4184,6 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i
 }
 select {
     /* display: inline-block; */	/* We can't set this. This disable ability to make */
-    /* TODO modified by jmobile, replace jmobile with pure css*/
     overflow:hidden;
     white-space: nowrap;			/* Enabling this make behaviour strange when selecting the empty value if this empty value is '' instead of '&nbsp;' */
     text-overflow: ellipsis;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3095057aec5..7514f1c2c30 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -622,6 +622,21 @@ div.fiche>form>div.div-table-responsive {
     min-height: 350px;
 }
 
+.flexcontainer {
+    display: inline-flex;
+    flex-flow: row wrap;
+    justify-content: flex-start;
+}
+.thumbstat {
+	flex: 1 1 120px;
+    /* flex-grow: 1; */
+    /* flex-shrink: 1; */
+    /* flex-basis: 140px; */
+    width: 100%;
+    justify-content: flex-start;
+    align-self: flex-start;
+}
+
 
 /* ============================================================================== */
 /* Styles to hide objects                                                         */
@@ -2681,7 +2696,7 @@ div .tdtop {
 	white-space: nowrap;
 	overflow: hidden;
     text-overflow: ellipsis;
-    width: 110px;    
+    width: 105px;    
 }
 .boxstats:hover {
 	box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.20);
@@ -3821,6 +3836,20 @@ div.dataTables_length select {
 	background: #FFFFFF !important;
 }
 
+.select2-arrow {
+	border: none;
+	border-left: none !important;
+	background: none !important;
+}
+.select2-choice
+{
+	/* border: 1px solid #aaa; */
+	border-top: none !important;
+	border-left: none !important;
+	border-right: none !important;
+	border-bottom: 1px solid #aaa;
+}
+
 .select2-choice,
 .select2-drop.select2-drop-above.select2-drop-active,
 .select2-container-active .select2-choice,
@@ -3837,7 +3866,7 @@ div.dataTables_length select {
 }
 .select2-drop-active
 {
-	border: 1px solid #aaa;
+	border: none;
 	border-top: none;
 }
 a span.select2-chosen
@@ -3846,7 +3875,6 @@ a span.select2-chosen
 }
 .select2-container .select2-choice {
 	background-image: none;
-	height: 24px;
 	line-height: 24px;
 }
 .select2-choices .select2-search-choice {
@@ -3949,6 +3977,8 @@ ul.ulselectedfields {
 dl.dropdown {
     margin:0px;
     padding:0px;
+    vertical-align: middle;
+    display: inline-block;
 }
 .dropdown dd, .dropdown dt {
     margin:0px;
@@ -4050,7 +4080,6 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i
 }
 select {
     /* display: inline-block; */	/* We can't set this. This disable ability to make */
-    /* TODO modified by jmobile, replace jmobile with pure css*/
     overflow:hidden;
     white-space: nowrap;			/* Enabling this make behaviour strange when selecting the empty value if this empty value is '' instead of '&nbsp;' */
     text-overflow: ellipsis;

From 0a0797e7976cefc8ba2ccabf87cc068ce6981979 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2017 13:36:38 +0100
Subject: [PATCH 0342/1163] Rename menu entry

---
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 htdocs/langs/en_US/main.lang            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 228c6447a22..440c96c1e49 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -536,7 +536,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 				$newmenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"),1);
 				$newmenu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"),1);
-				$newmenu->add("/admin/delais.php?mainmenu=home",$langs->trans("Alerts"),1);
+				$newmenu->add("/admin/delais.php?mainmenu=home",$langs->trans("MenuWarnings"),1);
 				$newmenu->add("/admin/security_other.php?mainmenu=home", $langs->trans("Security"),1);
 				$newmenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"),1);
 				$newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"),1);
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 1452e078bed..457056337d3 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -222,6 +222,7 @@ NoLogoutProcessWithAuthMode=No applicative disconnect feature with authenticatio
 Connection=Connection
 Setup=Setup
 Alert=Alert
+MenuWarnings=Alerts
 Previous=Previous
 Next=Next
 Cards=Cards

From 0b69d0143be56c8f9530edda630631d5ad76c8e4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2017 15:26:51 +0100
Subject: [PATCH 0343/1163] Try jSignature

---
 .../jquery/plugins/jSignature/jSignature.js   | 1392 +++++++++++++++++
 .../plugins/jSignature/jSignature.min.js      |   77 +
 2 files changed, 1469 insertions(+)
 create mode 100644 htdocs/includes/jquery/plugins/jSignature/jSignature.js
 create mode 100644 htdocs/includes/jquery/plugins/jSignature/jSignature.min.js

diff --git a/htdocs/includes/jquery/plugins/jSignature/jSignature.js b/htdocs/includes/jquery/plugins/jSignature/jSignature.js
new file mode 100644
index 00000000000..3709d4a2ee6
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/jSignature/jSignature.js
@@ -0,0 +1,1392 @@
+/** @preserve 
+jSignature v2 "${buildDate}" "${commitID}"
+Copyright (c) 2012 Willow Systems Corp http://willow-systems.com
+Copyright (c) 2010 Brinley Ang http://www.unbolt.net
+MIT License <http://www.opensource.org/licenses/mit-license.php> 
+
+*/
+;(function() {
+
+var apinamespace = 'jSignature'
+
+/**
+Allows one to delay certain eventual action by setting up a timer for it and allowing one to delay it
+by "kick"ing it. Sorta like "kick the can down the road"
+
+@public
+@class
+@param
+@returns {Type}
+*/
+var KickTimerClass = function(time, callback) {
+	var timer
+	this.kick = function() {
+		clearTimeout(timer)
+		timer = setTimeout(
+			callback
+			, time
+		)		
+	}
+	this.clear = function() {
+		clearTimeout(timer)
+	}
+	return this
+}
+
+var PubSubClass = function(context){
+	'use strict'
+	/*  @preserve 
+	-----------------------------------------------------------------------------------------------
+	JavaScript PubSub library
+	2012 (c) Willow Systems Corp (www.willow-systems.com)
+	based on Peter Higgins (dante@dojotoolkit.org)
+	Loosely based on Dojo publish/subscribe API, limited in scope. Rewritten blindly.
+	Original is (c) Dojo Foundation 2004-2010. Released under either AFL or new BSD, see:
+	http://dojofoundation.org/license for more information.
+	-----------------------------------------------------------------------------------------------
+	*/
+	this.topics = {}
+	// here we choose what will be "this" for the called events.
+	// if context is defined, it's context. Else, 'this' is this instance of PubSub
+	this.context = context ? context : this
+	/**
+	 * Allows caller to emit an event and pass arguments to event listeners.
+	 * @public
+	 * @function
+	 * @param topic {String} Name of the channel on which to voice this event
+	 * @param **arguments Any number of arguments you want to pass to the listeners of this event.
+	 */
+	this.publish = function(topic, arg1, arg2, etc) {
+		'use strict'
+		if (this.topics[topic]) {
+			var currentTopic = this.topics[topic]
+			, args = Array.prototype.slice.call(arguments, 1)
+			, toremove = []
+			, fn
+			, i, l
+			, pair
+
+			for (i = 0, l = currentTopic.length; i < l; i++) {
+				pair = currentTopic[i] // this is a [function, once_flag] array
+				fn = pair[0] 
+				if (pair[1] /* 'run once' flag set */){
+				  pair[0] = function(){}
+				  toremove.push(i)
+				}
+			   	fn.apply(this.context, args)
+			}
+			for (i = 0, l = toremove.length; i < l; i++) {
+			  currentTopic.splice(toremove[i], 1)
+			}
+		}
+	}
+	/**
+	 * Allows listener code to subscribe to channel and be called when data is available 
+	 * @public
+	 * @function
+	 * @param topic {String} Name of the channel on which to voice this event
+	 * @param callback {Function} Executable (function pointer) that will be ran when event is voiced on this channel.
+	 * @param once {Boolean} (optional. False by default) Flag indicating if the function is to be triggered only once.
+	 * @returns {Object} A token object that cen be used for unsubscribing.  
+	 */
+	this.subscribe = function(topic, callback, once) {
+		'use strict'
+		if (!this.topics[topic]) {
+			this.topics[topic] = [[callback, once]];
+		} else {
+			this.topics[topic].push([callback,once]);
+		}
+		return {
+			"topic": topic,
+			"callback": callback
+		};
+	};
+	/**
+	 * Allows listener code to unsubscribe from a channel 
+	 * @public
+	 * @function
+	 * @param token {Object} A token object that was returned by `subscribe` method 
+	 */
+	this.unsubscribe = function(token) {
+		if (this.topics[token.topic]) {
+			var currentTopic = this.topics[token.topic]
+			
+			for (var i = 0, l = currentTopic.length; i < l; i++) {
+				if (currentTopic[i][0] === token.callback) {
+					currentTopic.splice(i, 1)
+				}
+			}
+		}
+	}
+}
+
+/// Returns front, back and "decor" colors derived from element (as jQuery obj)
+function getColors($e){
+	var tmp
+	, undef
+	, frontcolor = $e.css('color')
+	, backcolor
+	, e = $e[0]
+	
+	var toOfDOM = false
+	while(e && !backcolor && !toOfDOM){
+		try{
+			tmp = $(e).css('background-color')
+		} catch (ex) {
+			tmp = 'transparent'
+		}
+		if (tmp !== 'transparent' && tmp !== 'rgba(0, 0, 0, 0)'){
+			backcolor = tmp
+		}
+		toOfDOM = e.body
+		e = e.parentNode
+	}
+
+	var rgbaregex = /rgb[a]*\((\d+),\s*(\d+),\s*(\d+)/ // modern browsers
+	, hexregex = /#([AaBbCcDdEeFf\d]{2})([AaBbCcDdEeFf\d]{2})([AaBbCcDdEeFf\d]{2})/ // IE 8 and less.
+	, frontcolorcomponents
+
+	// Decomposing Front color into R, G, B ints
+	tmp = undef
+	tmp = frontcolor.match(rgbaregex)
+	if (tmp){
+		frontcolorcomponents = {'r':parseInt(tmp[1],10),'g':parseInt(tmp[2],10),'b':parseInt(tmp[3],10)}
+	} else {
+		tmp = frontcolor.match(hexregex)
+		if (tmp) {
+			frontcolorcomponents = {'r':parseInt(tmp[1],16),'g':parseInt(tmp[2],16),'b':parseInt(tmp[3],16)}
+		}
+	}
+//		if(!frontcolorcomponents){
+//			frontcolorcomponents = {'r':255,'g':255,'b':255}
+//		}
+
+	var backcolorcomponents
+	// Decomposing back color into R, G, B ints
+	if(!backcolor){
+		// HIghly unlikely since this means that no background styling was applied to any element from here to top of dom.
+		// we'll pick up back color from front color
+		if(frontcolorcomponents){
+			if (Math.max.apply(null, [frontcolorcomponents.r, frontcolorcomponents.g, frontcolorcomponents.b]) > 127){
+				backcolorcomponents = {'r':0,'g':0,'b':0}
+			} else {
+				backcolorcomponents = {'r':255,'g':255,'b':255}
+			}
+		} else {
+			// arg!!! front color is in format we don't understand (hsl, named colors)
+			// Let's just go with white background.
+			backcolorcomponents = {'r':255,'g':255,'b':255}
+		}
+	} else {
+		tmp = undef
+		tmp = backcolor.match(rgbaregex)
+		if (tmp){
+			backcolorcomponents = {'r':parseInt(tmp[1],10),'g':parseInt(tmp[2],10),'b':parseInt(tmp[3],10)}
+		} else {
+			tmp = backcolor.match(hexregex)
+			if (tmp) {
+				backcolorcomponents = {'r':parseInt(tmp[1],16),'g':parseInt(tmp[2],16),'b':parseInt(tmp[3],16)}
+			}
+		}
+//			if(!backcolorcomponents){
+//				backcolorcomponents = {'r':0,'g':0,'b':0}
+//			}
+	}
+	
+	// Deriving Decor color
+	// THis is LAZY!!!! Better way would be to use HSL and adjust luminocity. However, that could be an overkill. 
+	
+	var toRGBfn = function(o){return 'rgb(' + [o.r, o.g, o.b].join(', ') + ')'} 
+	, decorcolorcomponents
+	, frontcolorbrightness
+	, adjusted
+	
+	if (frontcolorcomponents && backcolorcomponents){
+		var backcolorbrightness = Math.max.apply(null, [frontcolorcomponents.r, frontcolorcomponents.g, frontcolorcomponents.b])
+		
+		frontcolorbrightness = Math.max.apply(null, [backcolorcomponents.r, backcolorcomponents.g, backcolorcomponents.b])
+		adjusted = Math.round(frontcolorbrightness + (-1 * (frontcolorbrightness - backcolorbrightness) * 0.75)) // "dimming" the difference between pen and back.
+		decorcolorcomponents = {'r':adjusted,'g':adjusted,'b':adjusted} // always shade of gray
+	} else if (frontcolorcomponents) {
+		frontcolorbrightness = Math.max.apply(null, [frontcolorcomponents.r, frontcolorcomponents.g, frontcolorcomponents.b])
+		var polarity = +1
+		if (frontcolorbrightness > 127){
+			polarity = -1
+		}
+		// shifting by 25% (64 points on RGB scale)
+		adjusted = Math.round(frontcolorbrightness + (polarity * 96)) // "dimming" the pen's color by 75% to get decor color.
+		decorcolorcomponents = {'r':adjusted,'g':adjusted,'b':adjusted} // always shade of gray
+	} else {
+		decorcolorcomponents = {'r':191,'g':191,'b':191} // always shade of gray
+	}
+
+	return {
+		'color': frontcolor
+		, 'background-color': backcolorcomponents? toRGBfn(backcolorcomponents) : backcolor
+		, 'decor-color': toRGBfn(decorcolorcomponents)
+	}
+}
+
+function Vector(x,y){
+	this.x = x
+	this.y = y
+	this.reverse = function(){
+		return new this.constructor( 
+			this.x * -1
+			, this.y * -1
+		)
+	}
+	this._length = null
+	this.getLength = function(){
+		if (!this._length){
+			this._length = Math.sqrt( Math.pow(this.x, 2) + Math.pow(this.y, 2) )
+		}
+		return this._length
+	}
+	
+	var polarity = function (e){
+		return Math.round(e / Math.abs(e))
+	}
+	this.resizeTo = function(length){
+		// proportionally changes x,y such that the hypotenuse (vector length) is = new length
+		if (this.x === 0 && this.y === 0){
+			this._length = 0
+		} else if (this.x === 0){
+			this._length = length
+			this.y = length * polarity(this.y)
+		} else if(this.y === 0){
+			this._length = length
+			this.x = length * polarity(this.x)
+		} else {
+			var proportion = Math.abs(this.y / this.x)
+				, x = Math.sqrt(Math.pow(length, 2) / (1 + Math.pow(proportion, 2)))
+				, y = proportion * x
+			this._length = length
+			this.x = x * polarity(this.x)
+			this.y = y * polarity(this.y)
+		}
+		return this
+	}
+	
+	/**
+	 * Calculates the angle between 'this' vector and another.
+	 * @public
+	 * @function
+	 * @returns {Number} The angle between the two vectors as measured in PI. 
+	 */
+	this.angleTo = function(vectorB) {
+		var divisor = this.getLength() * vectorB.getLength()
+		if (divisor === 0) {
+			return 0
+		} else {
+			// JavaScript floating point math is screwed up.
+			// because of it, the core of the formula can, on occasion, have values
+			// over 1.0 and below -1.0.
+			return Math.acos(
+				Math.min( 
+					Math.max( 
+						( this.x * vectorB.x + this.y * vectorB.y ) / divisor
+						, -1.0
+					)
+					, 1.0
+				)
+			) / Math.PI
+		}
+	}
+}
+
+function Point(x,y){
+	this.x = x
+	this.y = y
+	
+	this.getVectorToCoordinates = function (x, y) {
+		return new Vector(x - this.x, y - this.y)
+	}
+	this.getVectorFromCoordinates = function (x, y) {
+		return this.getVectorToCoordinates(x, y).reverse()
+	}
+	this.getVectorToPoint = function (point) {
+		return new Vector(point.x - this.x, point.y - this.y)
+	}
+	this.getVectorFromPoint = function (point) {
+		return this.getVectorToPoint(point).reverse()
+	}
+}
+
+/*
+ * About data structure:
+ * We don't store / deal with "pictures" this signature capture code captures "vectors"
+ * 
+ * We don't store bitmaps. We store "strokes" as arrays of arrays. (Actually, arrays of objects containing arrays of coordinates.
+ * 
+ * Stroke = mousedown + mousemoved * n (+ mouseup but we don't record that as that was the "end / lack of movement" indicator)
+ * 
+ * Vectors = not classical vectors where numbers indicated shift relative last position. Our vectors are actually coordinates against top left of canvas.
+ * 			we could calc the classical vectors, but keeping the the actual coordinates allows us (through Math.max / min) 
+ * 			to calc the size of resulting drawing very quickly. If we want classical vectors later, we can always get them in backend code.
+ * 
+ * So, the data structure:
+ * 
+ * var data = [
+ * 	{ // stroke starts
+ * 		x : [101, 98, 57, 43] // x points
+ * 		, y : [1, 23, 65, 87] // y points
+ * 	} // stroke ends
+ * 	, { // stroke starts
+ * 		x : [55, 56, 57, 58] // x points
+ * 		, y : [101, 97, 54, 4] // y points
+ * 	} // stroke ends
+ * 	, { // stroke consisting of just a dot
+ * 		x : [53] // x points
+ * 		, y : [151] // y points
+ * 	} // stroke ends
+ * ]
+ * 
+ * we don't care or store stroke width (it's canvas-size-relative), color, shadow values. These can be added / changed on whim post-capture.
+ * 
+ */
+function DataEngine(storageObject, context, startStrokeFn, addToStrokeFn, endStrokeFn){
+	this.data = storageObject // we expect this to be an instance of Array
+	this.context = context
+
+	if (storageObject.length){
+		// we have data to render
+		var numofstrokes = storageObject.length
+		, stroke
+		, numofpoints
+		
+		for (var i = 0; i < numofstrokes; i++){
+			stroke = storageObject[i]
+			numofpoints = stroke.x.length
+			startStrokeFn.call(context, stroke)
+			for(var j = 1; j < numofpoints; j++){
+				addToStrokeFn.call(context, stroke, j)
+			}
+			endStrokeFn.call(context, stroke)
+		}
+	}
+
+	this.changed = function(){}
+	
+	this.startStrokeFn = startStrokeFn
+	this.addToStrokeFn = addToStrokeFn
+	this.endStrokeFn = endStrokeFn
+
+	this.inStroke = false
+	
+	this._lastPoint = null
+	this._stroke = null
+	this.startStroke = function(point){
+		if(point && typeof(point.x) == "number" && typeof(point.y) == "number"){
+			this._stroke = {'x':[point.x], 'y':[point.y]}
+			this.data.push(this._stroke)
+			this._lastPoint = point
+			this.inStroke = true
+			// 'this' does not work same inside setTimeout(
+			var stroke = this._stroke 
+			, fn = this.startStrokeFn
+			, context = this.context
+			setTimeout(
+				// some IE's don't support passing args per setTimeout API. Have to create closure every time instead.
+				function() {fn.call(context, stroke)}
+				, 3
+			)
+			return point
+		} else {
+			return null
+		}
+	}
+	// that "5" at the very end of this if is important to explain.
+	// we do NOT render links between two captured points (in the middle of the stroke) if the distance is shorter than that number.
+	// not only do we NOT render it, we also do NOT capture (add) these intermediate points to storage.
+	// when clustering of these is too tight, it produces noise on the line, which, because of smoothing, makes lines too curvy.
+	// maybe, later, we can expose this as a configurable setting of some sort.
+	this.addToStroke = function(point){
+		if (this.inStroke && 
+			typeof(point.x) === "number" && 
+			typeof(point.y) === "number" &&
+			// calculates absolute shift in diagonal pixels away from original point
+			(Math.abs(point.x - this._lastPoint.x) + Math.abs(point.y - this._lastPoint.y)) > 4
+		){
+			var positionInStroke = this._stroke.x.length
+			this._stroke.x.push(point.x)
+			this._stroke.y.push(point.y)
+			this._lastPoint = point
+			
+			var stroke = this._stroke
+			, fn = this.addToStrokeFn
+			, context = this.context
+			setTimeout(
+				// some IE's don't support passing args per setTimeout API. Have to create closure every time instead.
+				function() {fn.call(context, stroke, positionInStroke)}
+				, 3
+			)
+			return point
+		} else {
+			return null
+		}
+	}
+	this.endStroke = function(){
+		var c = this.inStroke
+		this.inStroke = false
+		this._lastPoint = null
+		if (c){
+			var stroke = this._stroke
+			, fn = this.endStrokeFn // 'this' does not work same inside setTimeout(
+			, context = this.context
+			, changedfn = this.changed
+			setTimeout(
+				// some IE's don't support passing args per setTimeout API. Have to create closure every time instead.
+				function(){
+					fn.call(context, stroke)
+					changedfn.call(context)
+				}
+				, 3
+			)
+			return true
+		} else {
+			return null
+		}
+	}
+}
+
+var basicDot = function(ctx, x, y, size){
+	var fillStyle = ctx.fillStyle
+	ctx.fillStyle = ctx.strokeStyle
+	ctx.fillRect(x + size / -2 , y + size / -2, size, size)
+	ctx.fillStyle = fillStyle
+}
+, basicLine = function(ctx, startx, starty, endx, endy){
+	ctx.beginPath()
+	ctx.moveTo(startx, starty)
+	ctx.lineTo(endx, endy)
+	ctx.stroke()
+}
+, basicCurve = function(ctx, startx, starty, endx, endy, cp1x, cp1y, cp2x, cp2y){
+	ctx.beginPath()
+	ctx.moveTo(startx, starty)
+	ctx.bezierCurveTo(cp1x, cp1y, cp2x, cp2y, endx, endy)
+	ctx.stroke()
+}
+, strokeStartCallback = function(stroke) {
+	// this = jSignatureClass instance
+	basicDot(this.canvasContext, stroke.x[0], stroke.y[0], this.settings.lineWidth)
+}
+, strokeAddCallback = function(stroke, positionInStroke){
+	// this = jSignatureClass instance
+
+	// Because we are funky this way, here we draw TWO curves.
+	// 1. POSSIBLY "this line" - spanning from point right before us, to this latest point.
+	// 2. POSSIBLY "prior curve" - spanning from "latest point" to the one before it.
+	
+	// Why you ask?
+	// long lines (ones with many pixels between them) do not look good when they are part of a large curvy stroke.
+	// You know, the jaggedy crocodile spine instead of a pretty, smooth curve. Yuck!
+	// We want to approximate pretty curves in-place of those ugly lines.
+	// To approximate a very nice curve we need to know the direction of line before and after.
+	// Hence, on long lines we actually wait for another point beyond it to come back from
+	// mousemoved before we draw this curve.
+	
+	// So for "prior curve" to be calc'ed we need 4 points 
+	// 	A, B, C, D (we are on D now, A is 3 points in the past.)
+	// and 3 lines:
+	//  pre-line (from points A to B), 
+	//  this line (from points B to C), (we call it "this" because if it was not yet, it's the only one we can draw for sure.) 
+	//  post-line (from points C to D) (even through D point is 'current' we don't know how we can draw it yet)
+	//
+	// Well, actually, we don't need to *know* the point A, just the vector A->B
+	var Cpoint = new Point(stroke.x[positionInStroke-1], stroke.y[positionInStroke-1])
+		, Dpoint = new Point(stroke.x[positionInStroke], stroke.y[positionInStroke])
+		, CDvector = Cpoint.getVectorToPoint(Dpoint)
+		
+	// Again, we have a chance here to draw TWO things:
+	//  BC Curve (only if it's long, because if it was short, it was drawn by previous callback) and 
+	//  CD Line (only if it's short)
+	
+	// So, let's start with BC curve.
+	// if there is only 2 points in stroke array, we don't have "history" long enough to have point B, let alone point A.
+	// Falling through to drawing line CD is proper, as that's the only line we have points for.
+	if(positionInStroke > 1) {
+		// we are here when there are at least 3 points in stroke array.
+		var Bpoint = new Point(stroke.x[positionInStroke-2], stroke.y[positionInStroke-2])
+		, BCvector = Bpoint.getVectorToPoint(Cpoint)
+		, ABvector
+		if(BCvector.getLength() > this.lineCurveThreshold){
+			// Yey! Pretty curves, here we come!
+			if(positionInStroke > 2) {
+				// we are here when at least 4 points in stroke array.
+				ABvector = (new Point(stroke.x[positionInStroke-3], stroke.y[positionInStroke-3])).getVectorToPoint(Bpoint)
+			} else {
+				ABvector = new Vector(0,0)
+			}
+
+			var minlenfraction = 0.05
+			, maxlen = BCvector.getLength() * 0.35
+			, ABCangle = BCvector.angleTo(ABvector.reverse())
+			, BCDangle = CDvector.angleTo(BCvector.reverse())
+			, BCP1vector = new Vector(ABvector.x + BCvector.x, ABvector.y + BCvector.y).resizeTo(
+				Math.max(minlenfraction, ABCangle) * maxlen
+			)
+			, CCP2vector = (new Vector(BCvector.x + CDvector.x, BCvector.y + CDvector.y)).reverse().resizeTo(
+				Math.max(minlenfraction, BCDangle) * maxlen
+			)
+			
+			basicCurve(
+				this.canvasContext
+				, Bpoint.x
+				, Bpoint.y
+				, Cpoint.x
+				, Cpoint.y
+				, Bpoint.x + BCP1vector.x
+				, Bpoint.y + BCP1vector.y
+				, Cpoint.x + CCP2vector.x
+				, Cpoint.y + CCP2vector.y
+			)
+		}
+	}
+	if(CDvector.getLength() <= this.lineCurveThreshold){
+		basicLine(
+			this.canvasContext
+			, Cpoint.x
+			, Cpoint.y
+			, Dpoint.x
+			, Dpoint.y
+		)
+	}
+}
+, strokeEndCallback = function(stroke){
+	// this = jSignatureClass instance
+
+	// Here we tidy up things left unfinished in last strokeAddCallback run.
+	
+	// What's POTENTIALLY left unfinished there is the curve between the last points
+	// in the stroke, if the len of that line is more than lineCurveThreshold
+	// If the last line was shorter than lineCurveThreshold, it was drawn there, and there
+	// is nothing for us here to do.
+	// We can also be called when there is only one point in the stroke (meaning, the 
+	// stroke was just a dot), in which case, again, there is nothing for us to do.
+				
+	// So for "this curve" to be calc'ed we need 3 points 
+	// 	A, B, C
+	// and 2 lines:
+	//  pre-line (from points A to B), 
+	//  this line (from points B to C) 
+	// Well, actually, we don't need to *know* the point A, just the vector A->B
+	// so, we really need points B, C and AB vector.
+	var positionInStroke = stroke.x.length - 1
+	
+	if (positionInStroke > 0){
+		// there are at least 2 points in the stroke.we are in business.
+		var Cpoint = new Point(stroke.x[positionInStroke], stroke.y[positionInStroke])
+			, Bpoint = new Point(stroke.x[positionInStroke-1], stroke.y[positionInStroke-1])
+			, BCvector = Bpoint.getVectorToPoint(Cpoint)
+			, ABvector
+		if (BCvector.getLength() > this.lineCurveThreshold){
+			// yep. This one was left undrawn in prior callback. Have to draw it now.
+			if (positionInStroke > 1){
+				// we have at least 3 elems in stroke
+				ABvector = (new Point(stroke.x[positionInStroke-2], stroke.y[positionInStroke-2])).getVectorToPoint(Bpoint)
+				var BCP1vector = new Vector(ABvector.x + BCvector.x, ABvector.y + BCvector.y).resizeTo(BCvector.getLength() / 2)
+				basicCurve(
+					this.canvasContext
+					, Bpoint.x
+					, Bpoint.y
+					, Cpoint.x
+					, Cpoint.y
+					, Bpoint.x + BCP1vector.x
+					, Bpoint.y + BCP1vector.y
+					, Cpoint.x
+					, Cpoint.y
+				)
+			} else {
+				// Since there is no AB leg, there is no curve to draw. This line is still "long" but no curve.
+				basicLine(
+					this.canvasContext
+					, Bpoint.x
+					, Bpoint.y
+					, Cpoint.x
+					, Cpoint.y
+				)
+			}
+		}
+	}
+}
+
+
+/*
+var getDataStats = function(){
+	var strokecnt = strokes.length
+		, stroke
+		, pointid
+		, pointcnt
+		, x, y
+		, maxX = Number.NEGATIVE_INFINITY
+		, maxY = Number.NEGATIVE_INFINITY
+		, minX = Number.POSITIVE_INFINITY
+		, minY = Number.POSITIVE_INFINITY
+	for(strokeid = 0; strokeid < strokecnt; strokeid++){
+		stroke = strokes[strokeid]
+		pointcnt = stroke.length
+		for(pointid = 0; pointid < pointcnt; pointid++){
+			x = stroke.x[pointid]
+			y = stroke.y[pointid]
+			if (x > maxX){
+				maxX = x
+			} else if (x < minX) {
+				minX = x
+			}
+			if (y > maxY){
+				maxY = y
+			} else if (y < minY) {
+				minY = y
+			}
+		}
+	}
+	return {'maxX': maxX, 'minX': minX, 'maxY': maxY, 'minY': minY}
+}
+*/
+
+function conditionallyLinkCanvasResizeToWindowResize(jSignatureInstance, settingsWidth, apinamespace, globalEvents){
+	'use strict'
+	if ( settingsWidth === 'ratio' || settingsWidth.split('')[settingsWidth.length - 1] === '%' ) {
+		
+		this.eventTokens[apinamespace + '.parentresized'] = globalEvents.subscribe(
+			apinamespace + '.parentresized'
+			, (function(eventTokens, $parent, originalParentWidth, sizeRatio){
+				'use strict'
+
+				return function(){
+					'use strict'
+
+					var w = $parent.width()
+					if (w !== originalParentWidth) {
+					
+						// UNsubscribing this particular instance of signature pad only.
+						// there is a separate `eventTokens` per each instance of signature pad 
+						for (var key in eventTokens){
+							if (eventTokens.hasOwnProperty(key)) {
+								globalEvents.unsubscribe(eventTokens[key])
+								delete eventTokens[key]
+                            }
+						}
+
+						var settings = jSignatureInstance.settings
+						jSignatureInstance.$parent.children().remove()
+						for (var key in jSignatureInstance){
+							if (jSignatureInstance.hasOwnProperty(key)) {
+								delete jSignatureInstance[key]
+							}
+						}
+						
+						// scale data to new signature pad size
+						settings.data = (function(data, scale){
+							var newData = []
+							var o, i, l, j, m, stroke
+							for ( i = 0, l = data.length; i < l; i++) {
+                            	stroke = data[i]
+                            	
+                            	o = {'x':[],'y':[]}
+                            	
+                            	for ( j = 0, m = stroke.x.length; j < m; j++) {
+                                	o.x.push(stroke.x[j] * scale)
+                                	o.y.push(stroke.y[j] * scale)
+                                }
+                            
+                            	newData.push(o)
+                            }
+							return newData
+						})(
+							settings.data
+							, w * 1.0 / originalParentWidth
+						)
+						
+						$parent[apinamespace](settings)
+			        }
+				}
+			})(
+				this.eventTokens
+				, this.$parent
+				, this.$parent.width()
+				, this.canvas.width * 1.0 / this.canvas.height
+			)
+		)
+	}
+}
+
+
+function jSignatureClass(parent, options, instanceExtensions) {
+
+	var $parent = this.$parent = $(parent)
+	, eventTokens = this.eventTokens = {}
+	, events = this.events = new PubSubClass(this)
+	, globalEvents = $.fn[apinamespace]('globalEvents')
+	, settings = {
+		'width' : 'ratio'
+		,'height' : 'ratio'
+		,'sizeRatio': 4 // only used when height = 'ratio'
+		,'color' : '#000'
+		,'background-color': '#fff'
+		,'decor-color': '#eee'
+		,'lineWidth' : 0
+		,'minFatFingerCompensation' : -10
+		,'showUndoButton': false
+		,'data': []
+	}
+	
+	$.extend(settings, getColors($parent))
+	if (options) {
+		$.extend(settings, options)
+	}
+	this.settings = settings
+
+	for (var extensionName in instanceExtensions){
+		if (instanceExtensions.hasOwnProperty(extensionName)) {
+			instanceExtensions[extensionName].call(this, extensionName)
+		}
+	}
+
+	this.events.publish(apinamespace+'.initializing')
+
+	// these, when enabled, will hover above the sig area. Hence we append them to DOM before canvas.
+	this.$controlbarUpper = (function(){
+		var controlbarstyle = 'padding:0 !important;margin:0 !important;'+
+			'width: 100% !important; height: 0 !important;'+
+			'margin-top:-1em !important;margin-bottom:1em !important;'
+		return $('<div style="'+controlbarstyle+'"></div>').appendTo($parent)
+	})();
+
+	this.isCanvasEmulator = false // will be flipped by initializer when needed.
+	var canvas = this.canvas = this.initializeCanvas(settings)
+	, $canvas = $(canvas)
+
+	this.$controlbarLower = (function(){
+		var controlbarstyle = 'padding:0 !important;margin:0 !important;'+
+			'width: 100% !important; height: 0 !important;'+
+			'margin-top:-1.5em !important;margin-bottom:1.5em !important;'
+		return $('<div style="'+controlbarstyle+'"></div>').appendTo($parent)
+	})();
+
+	this.canvasContext = canvas.getContext("2d")
+
+	// Most of our exposed API will be looking for this:
+	$canvas.data(apinamespace + '.this', this)
+
+	settings.lineWidth = (function(defaultLineWidth, canvasWidth){
+		if (!defaultLineWidth){
+			return Math.max(
+				Math.round(canvasWidth / 400) /*+1 pixel for every extra 300px of width.*/
+				, 2 /* minimum line width */
+			) 
+		} else {
+			return defaultLineWidth
+		}
+	})(settings.lineWidth, canvas.width);
+
+	this.lineCurveThreshold = settings.lineWidth * 3
+
+	// Add custom class if defined
+	if(settings.cssclass && $.trim(settings.cssclass) != "") {
+		$canvas.addClass(settings.cssclass)
+	}
+
+	// used for shifting the drawing point up on touch devices, so one can see the drawing above the finger.
+	this.fatFingerCompensation = 0
+
+	var movementHandlers = (function(jSignatureInstance) {
+
+		//================================
+		// mouse down, move, up handlers:
+
+		// shifts - adjustment values in viewport pixels drived from position of canvas on the page
+		var shiftX
+		, shiftY
+		, setStartValues = function(){
+			var tos = $(jSignatureInstance.canvas).offset()
+			shiftX = tos.left * -1
+			shiftY = tos.top * -1
+		}
+		, getPointFromEvent = function(e) {
+			var firstEvent = (e.changedTouches && e.changedTouches.length > 0 ? e.changedTouches[0] : e)
+			// All devices i tried report correct coordinates in pageX,Y
+			// Android Chrome 2.3.x, 3.1, 3.2., Opera Mobile,  safari iOS 4.x,
+			// Windows: Chrome, FF, IE9, Safari
+			// None of that scroll shift calc vs screenXY other sigs do is needed.
+			// ... oh, yeah, the "fatFinger.." is for tablets so that people see what they draw.
+			return new Point(
+				Math.round(firstEvent.pageX + shiftX)
+				, Math.round(firstEvent.pageY + shiftY) + jSignatureInstance.fatFingerCompensation
+			)
+		}
+		, timer = new KickTimerClass(
+			750
+			, function() { jSignatureInstance.dataEngine.endStroke() }
+		)
+
+		this.drawEndHandler = function(e) {
+			try { e.preventDefault() } catch (ex) {}
+			timer.clear()
+			jSignatureInstance.dataEngine.endStroke()
+		}
+		this.drawStartHandler = function(e) {
+			e.preventDefault()
+			// for performance we cache the offsets
+			// we recalc these only at the beginning the stroke			
+			setStartValues()
+			jSignatureInstance.dataEngine.startStroke( getPointFromEvent(e) )
+			timer.kick()
+		}
+		this.drawMoveHandler = function(e) {
+			e.preventDefault()
+			if (!jSignatureInstance.dataEngine.inStroke){
+				return
+			} 
+			jSignatureInstance.dataEngine.addToStroke( getPointFromEvent(e) )
+			timer.kick()
+		}
+
+		return this
+
+	}).call( {}, this )
+
+	//
+	//================================
+
+	;(function(drawEndHandler, drawStartHandler, drawMoveHandler) {
+		var canvas = this.canvas
+		, $canvas = $(canvas)
+		, undef
+		if (this.isCanvasEmulator){
+			$canvas.bind('mousemove.'+apinamespace, drawMoveHandler)
+			$canvas.bind('mouseup.'+apinamespace, drawEndHandler)
+			$canvas.bind('mousedown.'+apinamespace, drawStartHandler)
+		} else {
+			canvas.ontouchstart = function(e) {
+				canvas.onmousedown = undef
+				canvas.onmouseup = undef
+				canvas.onmousemove = undef
+
+				this.fatFingerCompensation = (
+					settings.minFatFingerCompensation && 
+					settings.lineWidth * -3 > settings.minFatFingerCompensation
+				) ? settings.lineWidth * -3 : settings.minFatFingerCompensation
+
+				drawStartHandler(e)
+
+				canvas.ontouchend = drawEndHandler
+				canvas.ontouchstart = drawStartHandler
+				canvas.ontouchmove = drawMoveHandler
+			}
+			canvas.onmousedown = function(e) {
+				canvas.ontouchstart = undef
+				canvas.ontouchend = undef
+				canvas.ontouchmove = undef
+
+				drawStartHandler(e)
+
+				canvas.onmousedown = drawStartHandler
+				canvas.onmouseup = drawEndHandler
+				canvas.onmousemove = drawMoveHandler
+			}
+		}
+	}).call( 
+		this
+		, movementHandlers.drawEndHandler
+		, movementHandlers.drawStartHandler
+		, movementHandlers.drawMoveHandler
+	)
+
+	//=========================================
+	// various event handlers
+
+	// on mouseout + mouseup canvas did not know that mouseUP fired. Continued to draw despite mouse UP.
+	// it is bettr than
+	// $canvas.bind('mouseout', drawEndHandler)
+	// because we don't want to break the stroke where user accidentally gets ouside and wants to get back in quickly.
+	eventTokens[apinamespace + '.windowmouseup'] = globalEvents.subscribe(
+		apinamespace + '.windowmouseup'
+		, movementHandlers.drawEndHandler
+	)
+
+	this.events.publish(apinamespace+'.attachingEventHandlers')
+
+	// If we have proportional width, we sign up to events broadcasting "window resized" and checking if
+	// parent's width changed. If so, we (1) extract settings + data from current signature pad,
+	// (2) remove signature pad from parent, and (3) reinit new signature pad at new size with same settings, (rescaled) data.
+	conditionallyLinkCanvasResizeToWindowResize.call(
+		this
+		, this
+		, settings.width.toString(10)
+		, apinamespace, globalEvents
+	)
+	
+	// end of event handlers.
+	// ===============================
+
+	this.resetCanvas(settings.data)
+
+	// resetCanvas renders the data on the screen and fires ONE "change" event
+	// if there is data. If you have controls that rely on "change" firing
+	// attach them to something that runs before this.resetCanvas, like
+	// apinamespace+'.attachingEventHandlers' that fires a bit higher.
+	this.events.publish(apinamespace+'.initialized')
+
+	return this
+} // end of initBase
+
+//=========================================================================
+// jSignatureClass's methods and supporting fn's
+
+jSignatureClass.prototype.resetCanvas = function(data){
+	var canvas = this.canvas
+	, settings = this.settings
+	, ctx = this.canvasContext
+	, isCanvasEmulator = this.isCanvasEmulator
+
+	, cw = canvas.width
+	, ch = canvas.height
+	
+	// preparing colors, drawing area
+
+	ctx.clearRect(0, 0, cw + 30, ch + 30)
+
+	ctx.shadowColor = ctx.fillStyle = settings['background-color']
+	if (isCanvasEmulator){
+		// FLashCanvas fills with Black by default, covering up the parent div's background
+		// hence we refill 
+		ctx.fillRect(0,0,cw + 30, ch + 30)
+	}
+
+	ctx.lineWidth = Math.ceil(parseInt(settings.lineWidth, 10))
+	ctx.lineCap = ctx.lineJoin = "round"
+	
+	// signature line
+	ctx.strokeStyle = settings['decor-color']
+	ctx.shadowOffsetX = 0
+	ctx.shadowOffsetY = 0
+	var lineoffset = Math.round( ch / 5 )
+	basicLine(ctx, lineoffset * 1.5, ch - lineoffset, cw - (lineoffset * 1.5), ch - lineoffset)
+	ctx.strokeStyle = settings.color
+
+	if (!isCanvasEmulator){
+		ctx.shadowColor = ctx.strokeStyle
+		ctx.shadowOffsetX = ctx.lineWidth * 0.5
+		ctx.shadowOffsetY = ctx.lineWidth * -0.6
+		ctx.shadowBlur = 0					
+	}
+	
+	// setting up new dataEngine
+
+	if (!data) { data = [] }
+	
+	var dataEngine = this.dataEngine = new DataEngine(
+		data
+		, this
+		, strokeStartCallback
+		, strokeAddCallback
+		, strokeEndCallback
+	)
+
+	settings.data = data  // onwindowresize handler uses it, i think.
+	$(canvas).data(apinamespace+'.data', data)
+		.data(apinamespace+'.settings', settings)
+
+	// we fire "change" event on every change in data.
+	// setting this up:
+	dataEngine.changed = (function(target, events, apinamespace) {
+		'use strict'
+		return function() {
+			events.publish(apinamespace+'.change')
+			target.trigger('change') 
+		}
+	})(this.$parent, this.events, apinamespace)
+	// let's trigger change on all data reloads
+	dataEngine.changed()
+
+	// import filters will be passing this back as indication of "we rendered"
+	return true
+}
+
+function initializeCanvasEmulator(canvas){
+	if (canvas.getContext){
+		return false
+	} else {
+		// for cases when jSignature, FlashCanvas is inserted
+		// from one window into another (child iframe)
+		// 'window' and 'FlashCanvas' may be stuck behind
+		// in that other parent window.
+		// we need to find it
+		var window = canvas.ownerDocument.parentWindow
+		var FC = window.FlashCanvas ?
+			canvas.ownerDocument.parentWindow.FlashCanvas :
+			(
+				typeof FlashCanvas === "undefined" ?
+				undefined :
+				FlashCanvas
+			)
+
+		if (FC) {
+			canvas = FC.initElement(canvas)
+			
+			var zoom = 1
+			// FlashCanvas uses flash which has this annoying habit of NOT scaling with page zoom. 
+			// It matches pixel-to-pixel to screen instead.
+			// Since we are targeting ONLY IE 7, 8 with FlashCanvas, we will test the zoom only the IE8, IE7 way
+			if (window && window.screen && window.screen.deviceXDPI && window.screen.logicalXDPI){
+				zoom = window.screen.deviceXDPI * 1.0 / window.screen.logicalXDPI
+			}
+			if (zoom !== 1){
+				try {
+					// We effectively abuse the brokenness of FlashCanvas and force the flash rendering surface to
+					// occupy larger pixel dimensions than the wrapping, scaled up DIV and Canvas elems.
+					$(canvas).children('object').get(0).resize(Math.ceil(canvas.width * zoom), Math.ceil(canvas.height * zoom))
+					// And by applying "scale" transformation we can talk "browser pixels" to FlashCanvas
+					// and have it translate the "browser pixels" to "screen pixels"
+					canvas.getContext('2d').scale(zoom, zoom)
+					// Note to self: don't reuse Canvas element. Repeated "scale" are cumulative.
+				} catch (ex) {}
+			}
+			return true
+		} else {
+			throw new Error("Canvas element does not support 2d context. jSignature cannot proceed.")
+		}
+	}
+
+}
+
+jSignatureClass.prototype.initializeCanvas = function(settings) {
+	// ===========
+	// Init + Sizing code
+
+	var canvas = document.createElement('canvas')
+	, $canvas = $(canvas)
+
+	// We cannot work with circular dependency
+	if (settings.width === settings.height && settings.height === 'ratio') {
+    	settings.width = '100%'
+    }
+
+	$canvas.css(
+		'margin'
+		, 0
+	).css(
+		'padding'
+		, 0
+	).css(
+		'border'
+		, 'none'
+	).css(
+		'height'
+		, settings.height === 'ratio' || !settings.height ? 1 : settings.height.toString(10)
+	).css(
+		'width'
+		, settings.width === 'ratio' || !settings.width ? 1 : settings.width.toString(10)
+	)
+
+	$canvas.appendTo(this.$parent)
+
+	// we could not do this until canvas is rendered (appended to DOM)
+	if (settings.height === 'ratio') {
+		$canvas.css(
+			'height'
+			, Math.round( $canvas.width() / settings.sizeRatio )
+		)
+    } else if (settings.width === 'ratio') {
+		$canvas.css(
+			'width'
+			, Math.round( $canvas.height() * settings.sizeRatio )
+		)
+    }
+
+	$canvas.addClass(apinamespace)
+
+	// canvas's drawing area resolution is independent from canvas's size.
+	// pixels are just scaled up or down when internal resolution does not
+	// match external size. So...
+
+	canvas.width = $canvas.width()
+	canvas.height = $canvas.height()
+	
+	// Special case Sizing code
+
+	this.isCanvasEmulator = initializeCanvasEmulator(canvas)
+
+	// End of Sizing Code
+	// ===========
+
+	// normally select preventer would be short, but
+	// Canvas emulator on IE does NOT provide value for Event. Hence this convoluted line.
+	canvas.onselectstart = function(e){if(e && e.preventDefault){e.preventDefault()}; if(e && e.stopPropagation){e.stopPropagation()}; return false;}
+
+	return canvas
+}
+
+
+var GlobalJSignatureObjectInitializer = function(window){
+
+	var globalEvents = new PubSubClass()
+	
+	// common "window resized" event listener.
+	// jSignature instances will subscribe to this chanel.
+	// to resize themselves when needed.
+	;(function(globalEvents, apinamespace, $, window){
+		'use strict'
+
+		var resizetimer
+		, runner = function(){
+			globalEvents.publish(
+				apinamespace + '.parentresized'
+			)
+		}
+
+		// jSignature knows how to resize its content when its parent is resized
+		// window resize is the only way we can catch resize events though...
+		$(window).bind('resize.'+apinamespace, function(){
+			if (resizetimer) {
+                clearTimeout(resizetimer)
+			}
+			resizetimer = setTimeout( 
+				runner
+				, 500
+			)
+		})
+		// when mouse exists canvas element and "up"s outside, we cannot catch it with
+		// callbacks attached to canvas. This catches it outside.
+		.bind('mouseup.'+apinamespace, function(e){
+			globalEvents.publish(
+				apinamespace + '.windowmouseup'
+			)
+		})
+
+	})(globalEvents, apinamespace, $, window)
+
+	var jSignatureInstanceExtensions = {
+		/*
+		'exampleExtension':function(extensionName){
+			// we are called very early in instance's life.
+			// right after the settings are resolved and 
+			// jSignatureInstance.events is created 
+			// and right before first ("jSignature.initializing") event is called.
+			// You don't really need to manupilate 
+			// jSignatureInstance directly, just attach
+			// a bunch of events to jSignatureInstance.events
+			// (look at the source of jSignatureClass to see when these fire)
+			// and your special pieces of code will attach by themselves.
+
+			// this function runs every time a new instance is set up.
+			// this means every var you create will live only for one instance
+			// unless you attach it to something outside, like "window."
+			// and pick it up later from there.
+
+			// when globalEvents' events fire, 'this' is globalEvents object
+			// when jSignatureInstance's events fire, 'this' is jSignatureInstance
+
+			// Here,
+			// this = is new jSignatureClass's instance.
+
+			// The way you COULD approch setting this up is:
+			// if you have multistep set up, attach event to "jSignature.initializing"
+			// that attaches other events to be fired further lower the init stream.
+			// Or, if you know for sure you rely on only one jSignatureInstance's event,
+			// just attach to it directly
+
+			this.events.subscribe(
+				// name of the event
+				apinamespace + '.initializing'
+				// event handlers, can pass args too, but in majority of cases,
+				// 'this' which is jSignatureClass object instance pointer is enough to get by.
+				, function(){
+					if (this.settings.hasOwnProperty('non-existent setting category?')) {
+						console.log(extensionName + ' is here')
+					}
+				}
+			)
+		}
+		*/
+	}
+
+	var exportplugins = {
+		'default':function(data){return this.toDataURL()}
+		, 'native':function(data){return data}
+		, 'image':function(data){
+			/*this = canvas elem */
+			var imagestring = this.toDataURL()
+			
+			if (typeof imagestring === 'string' && 
+				imagestring.length > 4 && 
+				imagestring.slice(0,5) === 'data:' &&
+				imagestring.indexOf(',') !== -1){
+				
+				var splitterpos = imagestring.indexOf(',')
+
+				return [
+			        imagestring.slice(5, splitterpos)
+			        , imagestring.substr(splitterpos + 1)
+		        ]
+			}
+			return []
+		}
+	}
+
+	// will be part of "importplugins"
+	function _renderImageOnCanvas( data, formattype, rerendercallable ) {
+		'use strict'
+		// #1. Do NOT rely on this. No worky on IE 
+		//   (url max len + lack of base64 decoder + possibly other issues)
+		// #2. This does NOT affect what is captured as "signature" as far as vector data is 
+		// concerned. This is treated same as "signature line" - i.e. completely ignored
+		// the only time you see imported image data exported is if you export as image.
+
+		// we do NOT call rerendercallable here (unlike in other import plugins)
+		// because importing image does absolutely nothing to the underlying vector data storage
+		// This could be a way to "import" old signatures stored as images
+		// This could also be a way to import extra decor into signature area.
+		
+		var img = new Image()
+		// this = Canvas DOM elem. Not jQuery object. Not Canvas's parent div.
+		, c = this
+
+		img.onload = function() {
+			var ctx = c.getContext("2d").drawImage( 
+				img, 0, 0
+				, ( img.width < c.width) ? img.width : c.width
+				, ( img.height < c.height) ? img.height : c.height
+			)
+		}
+
+		img.src = 'data:' + formattype + ',' + data
+	}
+
+	var importplugins = {
+		'native':function(data, formattype, rerendercallable){
+			// we expect data as Array of objects of arrays here - whatever 'default' EXPORT plugin spits out.
+			// returning Truthy to indicate we are good, all updated.
+			rerendercallable( data )
+		}
+		, 'image': _renderImageOnCanvas
+		, 'image/png;base64': _renderImageOnCanvas
+		, 'image/jpeg;base64': _renderImageOnCanvas
+		, 'image/jpg;base64': _renderImageOnCanvas
+	}
+
+	function _clearDrawingArea( data ) {
+		this.find('canvas.'+apinamespace)
+			.add(this.filter('canvas.'+apinamespace))
+			.data(apinamespace+'.this').resetCanvas( data )
+		return this
+	}
+
+	function _setDrawingData( data, formattype ) {
+		var undef
+
+		if (formattype === undef && typeof data === 'string' && data.substr(0,5) === 'data:') {
+			formattype = data.slice(5).split(',')[0]
+			// 5 chars of "data:" + mimetype len + 1 "," char = all skipped.
+			data = data.slice(6 + formattype.length) 
+			if (formattype === data) return
+		}
+
+		var $canvas = this.find('canvas.'+apinamespace).add(this.filter('canvas.'+apinamespace))
+
+		if (!importplugins.hasOwnProperty(formattype)){
+			throw new Error(apinamespace + " is unable to find import plugin with for format '"+ String(formattype) +"'")
+		} else if ($canvas.length !== 0){
+			importplugins[formattype].call(
+				$canvas[0]
+				, data
+				, formattype
+				, (function(jSignatureInstance){ 
+					return function(){ return jSignatureInstance.resetCanvas.apply(jSignatureInstance, arguments) }
+				})($canvas.data(apinamespace+'.this'))
+			)
+		}
+
+		return this
+	}
+
+	var elementIsOrphan = function(e){
+		var topOfDOM = false
+		e = e.parentNode
+		while (e && !topOfDOM){
+			topOfDOM = e.body
+			e = e.parentNode
+		}
+		return !topOfDOM
+	}
+
+	//These are exposed as methods under $obj.jSignature('methodname', *args)
+	var plugins = {'export':exportplugins, 'import':importplugins, 'instance': jSignatureInstanceExtensions}
+	, methods = {
+		'init' : function( options ) {
+			return this.each( function() {
+				if (!elementIsOrphan(this)) {
+					new jSignatureClass(this, options, jSignatureInstanceExtensions)					
+				}
+			})
+		}
+		, 'getSettings' : function() {
+			return this.find('canvas.'+apinamespace)
+				.add(this.filter('canvas.'+apinamespace))
+				.data(apinamespace+'.this').settings
+		}
+		// around since v1
+		, 'clear' : _clearDrawingArea
+		// was mistakenly introduced instead of 'clear' in v2
+		, 'reset' : _clearDrawingArea
+		, 'addPlugin' : function(pluginType, pluginName, callable){
+			if (plugins.hasOwnProperty(pluginType)){
+				plugins[pluginType][pluginName] = callable
+			}
+			return this
+		}
+		, 'listPlugins' : function(pluginType){
+			var answer = []
+			if (plugins.hasOwnProperty(pluginType)){
+				var o = plugins[pluginType]
+				for (var k in o){
+					if (o.hasOwnProperty(k)){
+						answer.push(k)
+					}
+				}
+			}
+			return answer
+		}
+		, 'getData' : function( formattype ) {
+			var undef, $canvas=this.find('canvas.'+apinamespace).add(this.filter('canvas.'+apinamespace))
+			if (formattype === undef) formattype = 'default'
+			if ($canvas.length !== 0 && exportplugins.hasOwnProperty(formattype)){				
+				return exportplugins[formattype].call(
+					$canvas.get(0) // canvas dom elem
+					, $canvas.data(apinamespace+'.data') // raw signature data as array of objects of arrays
+				)
+			}
+		}
+		// around since v1. Took only one arg - data-url-formatted string with (likely png of) signature image
+		, 'importData' : _setDrawingData
+		// was mistakenly introduced instead of 'importData' in v2
+		, 'setData' : _setDrawingData
+		// this is one and same instance for all jSignature.
+		, 'globalEvents' : function(){return globalEvents}
+		// there will be a separate one for each jSignature instance.
+		, 'events' : function() {
+			return this.find('canvas.'+apinamespace)
+					.add(this.filter('canvas.'+apinamespace))
+					.data(apinamespace+'.this').events
+		}
+	} // end of methods declaration.
+	
+	$.fn[apinamespace] = function(method) {
+		'use strict'
+		if ( !method || typeof method === 'object' ) {
+			return methods.init.apply( this, arguments )
+		} else if ( typeof method === 'string' && methods[method] ) {
+			return methods[method].apply( this, Array.prototype.slice.call( arguments, 1 ))
+		} else {
+			$.error( 'Method ' +  String(method) + ' does not exist on jQuery.' + apinamespace )
+		}
+	}
+
+} // end of GlobalJSignatureObjectInitializer
+
+GlobalJSignatureObjectInitializer(window)
+
+})();
diff --git a/htdocs/includes/jquery/plugins/jSignature/jSignature.min.js b/htdocs/includes/jquery/plugins/jSignature/jSignature.min.js
new file mode 100644
index 00000000000..3c5590659a8
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/jSignature/jSignature.min.js
@@ -0,0 +1,77 @@
+/*
+ 
+jSignature v2 "2012-11-01T22:48" "commit ID 1c15dfafecc75925c3b7d529356a558b59220edb"
+Copyright (c) 2012 Willow Systems Corp http://willow-systems.com
+Copyright (c) 2010 Brinley Ang http://www.unbolt.net
+MIT License <http://www.opensource.org/licenses/mit-license.php> 
+
+
+Simplify.js BSD 
+(c) 2012, Vladimir Agafonkin
+mourner.github.com/simplify-js
+
+
+base64 encoder
+MIT, GPL
+http://phpjs.org/functions/base64_encode
++   original by: Tyler Akins (http://rumkin.com)
++   improved by: Bayron Guevara
++   improved by: Thunder.m
++   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
++   bugfixed by: Pellentesque Malesuada
++   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
++   improved by: Rafal Kukawski (http://kukawski.pl)
+
+
+jSignature v2 jSignature's Undo Button and undo functionality plugin
+
+
+jSignature v2 jSignature's custom "base30" format export and import plugins.
+
+
+jSignature v2 SVG export plugin.
+
+*/
+(function(){function q(b){for(var j,s=b.css("color"),g,b=b[0],c=!1;b&&!g&&!c;){try{j=$(b).css("background-color")}catch(d){j="transparent"}"transparent"!==j&&"rgba(0, 0, 0, 0)"!==j&&(g=j);c=b.body;b=b.parentNode}var b=/rgb[a]*\((\d+),\s*(\d+),\s*(\d+)/,c=/#([AaBbCcDdEeFf\d]{2})([AaBbCcDdEeFf\d]{2})([AaBbCcDdEeFf\d]{2})/,a;j=void 0;(j=s.match(b))?a={r:parseInt(j[1],10),g:parseInt(j[2],10),b:parseInt(j[3],10)}:(j=s.match(c))&&(a={r:parseInt(j[1],16),g:parseInt(j[2],16),b:parseInt(j[3],16)});var f;g?
+(j=void 0,(j=g.match(b))?f={r:parseInt(j[1],10),g:parseInt(j[2],10),b:parseInt(j[3],10)}:(j=g.match(c))&&(f={r:parseInt(j[1],16),g:parseInt(j[2],16),b:parseInt(j[3],16)})):f=a?127<Math.max.apply(null,[a.r,a.g,a.b])?{r:0,g:0,b:0}:{r:255,g:255,b:255}:{r:255,g:255,b:255};j=function(b){return"rgb("+[b.r,b.g,b.b].join(", ")+")"};a&&f?(b=Math.max.apply(null,[a.r,a.g,a.b]),a=Math.max.apply(null,[f.r,f.g,f.b]),a=Math.round(a+-0.75*(a-b)),a={r:a,g:a,b:a}):a?(a=Math.max.apply(null,[a.r,a.g,a.b]),b=1,127<a&&
+(b=-1),a=Math.round(a+96*b),a={r:a,g:a,b:a}):a={r:191,g:191,b:191};return{color:s,"background-color":f?j(f):g,"decor-color":j(a)}}function m(b,j){this.x=b;this.y=j;this.reverse=function(){return new this.constructor(-1*this.x,-1*this.y)};this._length=null;this.getLength=function(){this._length||(this._length=Math.sqrt(Math.pow(this.x,2)+Math.pow(this.y,2)));return this._length};var s=function(b){return Math.round(b/Math.abs(b))};this.resizeTo=function(b){if(0===this.x&&0===this.y)this._length=0;else if(0===
+this.x)this._length=b,this.y=b*s(this.y);else if(0===this.y)this._length=b,this.x=b*s(this.x);else{var j=Math.abs(this.y/this.x),a=Math.sqrt(Math.pow(b,2)/(1+Math.pow(j,2))),j=j*a;this._length=b;this.x=a*s(this.x);this.y=j*s(this.y)}return this};this.angleTo=function(b){var j=this.getLength()*b.getLength();return 0===j?0:Math.acos(Math.min(Math.max((this.x*b.x+this.y*b.y)/j,-1),1))/Math.PI}}function k(b,j){this.x=b;this.y=j;this.getVectorToCoordinates=function(b,j){return new m(b-this.x,j-this.y)};
+this.getVectorFromCoordinates=function(b,j){return this.getVectorToCoordinates(b,j).reverse()};this.getVectorToPoint=function(b){return new m(b.x-this.x,b.y-this.y)};this.getVectorFromPoint=function(b){return this.getVectorToPoint(b).reverse()}}function t(b,j,a,g,c){this.data=b;this.context=j;if(b.length)for(var d=b.length,f,l,i=0;i<d;i++){f=b[i];l=f.x.length;a.call(j,f);for(var e=1;e<l;e++)g.call(j,f,e);c.call(j,f)}this.changed=function(){};this.startStrokeFn=a;this.addToStrokeFn=g;this.endStrokeFn=
+c;this.inStroke=!1;this._stroke=this._lastPoint=null;this.startStroke=function(b){if(b&&"number"==typeof b.x&&"number"==typeof b.y){this._stroke={x:[b.x],y:[b.y]};this.data.push(this._stroke);this._lastPoint=b;this.inStroke=!0;var j=this._stroke,a=this.startStrokeFn,g=this.context;setTimeout(function(){a.call(g,j)},3);return b}return null};this.addToStroke=function(b){if(this.inStroke&&"number"===typeof b.x&&"number"===typeof b.y&&4<Math.abs(b.x-this._lastPoint.x)+Math.abs(b.y-this._lastPoint.y)){var j=
+this._stroke.x.length;this._stroke.x.push(b.x);this._stroke.y.push(b.y);this._lastPoint=b;var a=this._stroke,g=this.addToStrokeFn,s=this.context;setTimeout(function(){g.call(s,a,j)},3);return b}return null};this.endStroke=function(){var b=this.inStroke;this.inStroke=!1;this._lastPoint=null;if(b){var j=this._stroke,a=this.endStrokeFn,g=this.context,s=this.changed;setTimeout(function(){a.call(g,j);s.call(g)},3);return!0}return null}}function r(b,j,a){var g=this.$parent=$(b),b=this.eventTokens={};this.events=
+new v(this);var c=$.fn[e]("globalEvents"),d={width:"ratio",height:"ratio",sizeRatio:4,color:"#000","background-color":"#fff","decor-color":"#eee",lineWidth:0,minFatFingerCompensation:-10,showUndoButton:!1,data:[]};$.extend(d,q(g));j&&$.extend(d,j);this.settings=d;for(var f in a)a.hasOwnProperty(f)&&a[f].call(this,f);this.events.publish(e+".initializing");this.$controlbarUpper=$('<div style="padding:0 !important;margin:0 !important;width: 100% !important; height: 0 !important;margin-top:-1em !important;margin-bottom:1em !important;"></div>').appendTo(g);
+this.isCanvasEmulator=!1;a=this.canvas=this.initializeCanvas(d);j=$(a);this.$controlbarLower=$('<div style="padding:0 !important;margin:0 !important;width: 100% !important; height: 0 !important;margin-top:-1.5em !important;margin-bottom:1.5em !important;"></div>').appendTo(g);this.canvasContext=a.getContext("2d");j.data(e+".this",this);g=(g=d.lineWidth)?g:Math.max(Math.round(a.width/400),2);d.lineWidth=g;this.lineCurveThreshold=3*d.lineWidth;d.cssclass&&""!=$.trim(d.cssclass)&&j.addClass(d.cssclass);
+this.fatFingerCompensation=0;var g=function(b){var j,a,g=function(g){g=g.changedTouches&&0<g.changedTouches.length?g.changedTouches[0]:g;return new k(Math.round(g.pageX+j),Math.round(g.pageY+a)+b.fatFingerCompensation)},d=new y(750,function(){b.dataEngine.endStroke()});this.drawEndHandler=function(j){try{j.preventDefault()}catch(a){}d.clear();b.dataEngine.endStroke()};this.drawStartHandler=function(c){c.preventDefault();var s=$(b.canvas).offset();j=-1*s.left;a=-1*s.top;b.dataEngine.startStroke(g(c));
+d.kick()};this.drawMoveHandler=function(j){j.preventDefault();b.dataEngine.inStroke&&(b.dataEngine.addToStroke(g(j)),d.kick())};return this}.call({},this),l=g.drawEndHandler,i=g.drawStartHandler,p=g.drawMoveHandler,h=this.canvas,j=$(h);this.isCanvasEmulator?(j.bind("mousemove."+e,p),j.bind("mouseup."+e,l),j.bind("mousedown."+e,i)):(h.ontouchstart=function(b){h.onmousedown=void 0;h.onmouseup=void 0;h.onmousemove=void 0;this.fatFingerCompensation=d.minFatFingerCompensation&&-3*d.lineWidth>d.minFatFingerCompensation?
+-3*d.lineWidth:d.minFatFingerCompensation;i(b);h.ontouchend=l;h.ontouchstart=i;h.ontouchmove=p},h.onmousedown=function(b){h.ontouchstart=void 0;h.ontouchend=void 0;h.ontouchmove=void 0;i(b);h.onmousedown=i;h.onmouseup=l;h.onmousemove=p});b[e+".windowmouseup"]=c.subscribe(e+".windowmouseup",g.drawEndHandler);this.events.publish(e+".attachingEventHandlers");var n=this,b=d.width.toString(10),w=e;if("ratio"===b||"%"===b.split("")[b.length-1])this.eventTokens[w+".parentresized"]=c.subscribe(w+".parentresized",
+function(b,j,a){return function(){var g=j.width();if(g!==a){for(var d in b)b.hasOwnProperty(d)&&(c.unsubscribe(b[d]),delete b[d]);var s=n.settings;n.$parent.children().remove();for(d in n)n.hasOwnProperty(d)&&delete n[d];d=s.data;var g=1*g/a,f=[],l,i,e,h,k,p;i=0;for(e=d.length;i<e;i++){p=d[i];l={x:[],y:[]};h=0;for(k=p.x.length;h<k;h++)l.x.push(p.x[h]*g),l.y.push(p.y[h]*g);f.push(l)}s.data=f;j[w](s)}}}(this.eventTokens,this.$parent,this.$parent.width(),1*this.canvas.width/this.canvas.height));this.resetCanvas(d.data);
+this.events.publish(e+".initialized");return this}var e="jSignature",y=function(b,j){var a;this.kick=function(){clearTimeout(a);a=setTimeout(j,b)};this.clear=function(){clearTimeout(a)};return this},v=function(b){this.topics={};this.context=b?b:this;this.publish=function(b,a,g,d){if(this.topics[b]){var c=this.topics[b],f=Array.prototype.slice.call(arguments,1),l=[],i,e,h,p;e=0;for(h=c.length;e<h;e++)p=c[e],i=p[0],p[1]&&(p[0]=function(){},l.push(e)),i.apply(this.context,f);e=0;for(h=l.length;e<h;e++)c.splice(l[e],
+1)}};this.subscribe=function(b,a,g){this.topics[b]?this.topics[b].push([a,g]):this.topics[b]=[[a,g]];return{topic:b,callback:a}};this.unsubscribe=function(b){if(this.topics[b.topic])for(var a=this.topics[b.topic],g=0,d=a.length;g<d;g++)a[g][0]===b.callback&&a.splice(g,1)}},z=function(b){var a=this.canvasContext,d=b.x[0],b=b.y[0],g=this.settings.lineWidth,c=a.fillStyle;a.fillStyle=a.strokeStyle;a.fillRect(d+g/-2,b+g/-2,g,g);a.fillStyle=c},u=function(b,a){var d=new k(b.x[a-1],b.y[a-1]),g=new k(b.x[a],
+b.y[a]),c=d.getVectorToPoint(g);if(1<a){var f=new k(b.x[a-2],b.y[a-2]),l=f.getVectorToPoint(d),i;if(l.getLength()>this.lineCurveThreshold){i=2<a?(new k(b.x[a-3],b.y[a-3])).getVectorToPoint(f):new m(0,0);var e=0.35*l.getLength(),h=l.angleTo(i.reverse()),p=c.angleTo(l.reverse());i=(new m(i.x+l.x,i.y+l.y)).resizeTo(Math.max(0.05,h)*e);var n=(new m(l.x+c.x,l.y+c.y)).reverse().resizeTo(Math.max(0.05,p)*e),l=this.canvasContext,e=f.x,p=f.y,h=d.x,w=d.y,A=f.x+i.x,f=f.y+i.y;i=d.x+n.x;n=d.y+n.y;l.beginPath();
+l.moveTo(e,p);l.bezierCurveTo(A,f,i,n,h,w);l.stroke()}}c.getLength()<=this.lineCurveThreshold&&(c=this.canvasContext,f=d.x,d=d.y,i=g.x,g=g.y,c.beginPath(),c.moveTo(f,d),c.lineTo(i,g),c.stroke())},x=function(b){var a=b.x.length-1;if(0<a){var d=new k(b.x[a],b.y[a]),g=new k(b.x[a-1],b.y[a-1]),c=g.getVectorToPoint(d);if(c.getLength()>this.lineCurveThreshold){if(1<a){var b=(new k(b.x[a-2],b.y[a-2])).getVectorToPoint(g),f=(new m(b.x+c.x,b.y+c.y)).resizeTo(c.getLength()/2),c=this.canvasContext,b=g.x,a=g.y,
+l=d.x,i=d.y,e=g.x+f.x,g=g.y+f.y,f=d.x,d=d.y;c.beginPath();c.moveTo(b,a);c.bezierCurveTo(e,g,f,d,l,i)}else c=this.canvasContext,b=g.x,g=g.y,a=d.x,d=d.y,c.beginPath(),c.moveTo(b,g),c.lineTo(a,d);c.stroke()}}};r.prototype.resetCanvas=function(b){var a=this.canvas,d=this.settings,c=this.canvasContext,f=this.isCanvasEmulator,l=a.width,i=a.height;c.clearRect(0,0,l+30,i+30);c.shadowColor=c.fillStyle=d["background-color"];f&&c.fillRect(0,0,l+30,i+30);c.lineWidth=Math.ceil(parseInt(d.lineWidth,10));c.lineCap=
+c.lineJoin="round";c.strokeStyle=d["decor-color"];c.shadowOffsetX=0;c.shadowOffsetY=0;var h=Math.round(i/5),p=1.5*h,k=i-h,l=l-1.5*h,i=i-h;c.beginPath();c.moveTo(p,k);c.lineTo(l,i);c.stroke();c.strokeStyle=d.color;f||(c.shadowColor=c.strokeStyle,c.shadowOffsetX=0.5*c.lineWidth,c.shadowOffsetY=-0.6*c.lineWidth,c.shadowBlur=0);b||(b=[]);c=this.dataEngine=new t(b,this,z,u,x);d.data=b;$(a).data(e+".data",b).data(e+".settings",d);var n=this.$parent,w=this.events,A=e;c.changed=function(){w.publish(A+".change");
+n.trigger("change")};c.changed();return!0};r.prototype.initializeCanvas=function(b){var a=document.createElement("canvas"),c=$(a);b.width===b.height&&"ratio"===b.height&&(b.width="100%");c.css("margin",0).css("padding",0).css("border","none").css("height","ratio"===b.height||!b.height?1:b.height.toString(10)).css("width","ratio"===b.width||!b.width?1:b.width.toString(10));c.appendTo(this.$parent);"ratio"===b.height?c.css("height",Math.round(c.width()/b.sizeRatio)):"ratio"===b.width&&c.css("width",
+Math.round(c.height()*b.sizeRatio));c.addClass(e);a.width=c.width();a.height=c.height();b=a;if(b.getContext)b=!1;else{var c=b.ownerDocument.parentWindow,d=c.FlashCanvas?b.ownerDocument.parentWindow.FlashCanvas:"undefined"===typeof FlashCanvas?void 0:FlashCanvas;if(d){b=d.initElement(b);d=1;c&&(c.screen&&c.screen.deviceXDPI&&c.screen.logicalXDPI)&&(d=1*c.screen.deviceXDPI/c.screen.logicalXDPI);if(1!==d)try{$(b).children("object").get(0).resize(Math.ceil(b.width*d),Math.ceil(b.height*d)),b.getContext("2d").scale(d,
+d)}catch(f){}b=!0}else throw Error("Canvas element does not support 2d context. jSignature cannot proceed.");}this.isCanvasEmulator=b;a.onselectstart=function(b){b&&b.preventDefault&&b.preventDefault();b&&b.stopPropagation&&b.stopPropagation();return!1};return a};var p=window,h=function(b,a){var c=new Image,d=this;c.onload=function(){d.getContext("2d").drawImage(c,0,0,c.width<d.width?c.width:d.width,c.height<d.height?c.height:d.height)};c.src="data:"+a+","+b},a=function(b){this.find("canvas."+e).add(this.filter("canvas."+
+e)).data(e+".this").resetCanvas(b);return this},f=function(b,a){if(void 0===a&&("string"===typeof b&&"data:"===b.substr(0,5))&&(a=b.slice(5).split(",")[0],b=b.slice(6+a.length),a===b))return;var c=this.find("canvas."+e).add(this.filter("canvas."+e));if(n.hasOwnProperty(a))0!==c.length&&n[a].call(c[0],b,a,function(b){return function(){return b.resetCanvas.apply(b,arguments)}}(c.data(e+".this")));else throw Error(e+" is unable to find import plugin with for format '"+String(a)+"'");return this},d=new v,
+c=e,l,i=function(){d.publish(c+".parentresized")};$(p).bind("resize."+c,function(){l&&clearTimeout(l);l=setTimeout(i,500)}).bind("mouseup."+c,function(){d.publish(c+".windowmouseup")});var w={},A={"default":function(){return this.toDataURL()},"native":function(b){return b},image:function(){var b=this.toDataURL();if("string"===typeof b&&4<b.length&&"data:"===b.slice(0,5)&&-1!==b.indexOf(",")){var a=b.indexOf(",");return[b.slice(5,a),b.substr(a+1)]}return[]}},n={"native":function(b,a,c){c(b)},image:h,
+"image/png;base64":h,"image/jpeg;base64":h,"image/jpg;base64":h},B={"export":A,"import":n,instance:w},C={init:function(b){return this.each(function(){var a,c=!1;for(a=this.parentNode;a&&!c;)c=a.body,a=a.parentNode;!c||new r(this,b,w)})},getSettings:function(){return this.find("canvas."+e).add(this.filter("canvas."+e)).data(e+".this").settings},clear:a,reset:a,addPlugin:function(b,a,c){B.hasOwnProperty(b)&&(B[b][a]=c);return this},listPlugins:function(b){var a=[];if(B.hasOwnProperty(b)){var b=B[b],
+c;for(c in b)b.hasOwnProperty(c)&&a.push(c)}return a},getData:function(b){var a=this.find("canvas."+e).add(this.filter("canvas."+e));void 0===b&&(b="default");if(0!==a.length&&A.hasOwnProperty(b))return A[b].call(a.get(0),a.data(e+".data"))},importData:f,setData:f,globalEvents:function(){return d},events:function(){return this.find("canvas."+e).add(this.filter("canvas."+e)).data(e+".this").events}};$.fn[e]=function(b){if(!b||"object"===typeof b)return C.init.apply(this,arguments);if("string"===typeof b&&
+C[b])return C[b].apply(this,Array.prototype.slice.call(arguments,1));$.error("Method "+String(b)+" does not exist on jQuery."+e)}})();
+(function(){$.fn.jSignature("addPlugin","instance","UndoButton",function(q){this.events.subscribe("jSignature.attachingEventHandlers",function(){if(this.settings[q]){var m=this.settings[q];"function"!==typeof m&&(m=function(){var e=$('<input type="button" value="Undo last stroke" style="position:absolute;display:none;margin:0 !important;top:auto" />').appendTo(this.$controlbarLower),k=e.width();e.css("left",Math.round((this.canvas.width-k)/2));k!==e.width()&&e.width(k);return e});var k=m.call(this),
+t=this;t.events.subscribe("jSignature.change",function(){t.dataEngine.data.length?k.show():k.hide()});var r=this,e=(this.events.topics.hasOwnProperty("jSignature.undo")?q:"jSignature")+".undo";k.bind("click",function(){r.events.publish(e)});r.events.subscribe(e,function(){var e=r.dataEngine.data;e.length&&(e.pop(),r.resetCanvas(e))})}})})})();
+(function(){for(var q={},m={},k="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWX".split(""),t=k.length/2,r=t-1;-1<r;r--)q[k[r]]=k[r+t],m[k[r+t]]=k[r];var e=function(e){for(var e=e.split(""),h=e.length,a=1;a<h;a++)e[a]=q[e[a]];return e.join("")},y=function(k){for(var h=[],a=0,f=1,d=k.length,c,l,i=0;i<d;i++)c=Math.round(k[i]),l=c-a,a=c,0>l&&0<f?(f=-1,h.push("Z")):0<l&&0>f&&(f=1,h.push("Y")),c=Math.abs(l),c>=t?h.push(e(c.toString(t))):h.push(c.toString(t));return h.join("")},v=function(e){for(var h=
+[],e=e.split(""),a=e.length,f,d=1,c=[],l=0,i=0;i<a;i++)f=e[i],f in q||"Z"===f||"Y"===f?(0!==c.length&&(c=parseInt(c.join(""),t)*d+l,h.push(c),l=c),"Z"===f?(d=-1,c=[]):"Y"===f?(d=1,c=[]):c=[f]):c.push(m[f]);h.push(parseInt(c.join(""),t)*d+l);return h},z=function(e){for(var h=[],a=e.length,f,d=0;d<a;d++)f=e[d],h.push(y(f.x)),h.push(y(f.y));return h.join("_")},u=function(e){for(var h=[],e=e.split("_"),a=e.length/2,f=0;f<a;f++)h.push({x:v(e[2*f]),y:v(e[2*f+1])});return h},k=function(e){return["image/jsignature;base30",
+z(e)]},r=function(e,h,a){"string"===typeof e&&("image/jsignature;base30"===e.substring(0,23).toLowerCase()&&(e=e.substring(24)),a(u(e)))};if(null==this.jQuery)throw Error("We need jQuery for some of the functionality. jQuery is not detected. Failing to initialize...");var x=this.jQuery.fn.jSignature;x("addPlugin","export","base30",k);x("addPlugin","export","image/jsignature;base30",k);x("addPlugin","import","base30",r);x("addPlugin","import","image/jsignature;base30",r);this.jSignatureDebug&&(this.jSignatureDebug.base30=
+{remapTailChars:e,compressstrokeleg:y,uncompressstrokeleg:v,compressstrokes:z,uncompressstrokes:u,charmap:q})}).call("undefined"!==typeof window?window:this);
+(function(){function q(a,f){this.x=a;this.y=f;this.reverse=function(){return new this.constructor(-1*this.x,-1*this.y)};this._length=null;this.getLength=function(){this._length||(this._length=Math.sqrt(Math.pow(this.x,2)+Math.pow(this.y,2)));return this._length};var d=function(a){return Math.round(a/Math.abs(a))};this.resizeTo=function(a){if(0===this.x&&0===this.y)this._length=0;else if(0===this.x)this._length=a,this.y=a*d(this.y);else if(0===this.y)this._length=a,this.x=a*d(this.x);else{var f=Math.abs(this.y/
+this.x),e=Math.sqrt(Math.pow(a,2)/(1+Math.pow(f,2))),f=f*e;this._length=a;this.x=e*d(this.x);this.y=f*d(this.y)}return this};this.angleTo=function(a){var d=this.getLength()*a.getLength();return 0===d?0:Math.acos(Math.min(Math.max((this.x*a.x+this.y*a.y)/d,-1),1))/Math.PI}}function m(a,f){this.x=a;this.y=f;this.getVectorToCoordinates=function(a,c){return new q(a-this.x,c-this.y)};this.getVectorFromCoordinates=function(a,c){return this.getVectorToCoordinates(a,c).reverse()};this.getVectorToPoint=function(a){return new q(a.x-
+this.x,a.y-this.y)};this.getVectorFromPoint=function(a){return this.getVectorToPoint(a).reverse()}}function k(a,f){var d=Math.pow(10,f);return Math.round(a*d)/d}function t(a,f,d){var f=f+1,c=new m(a.x[f-1],a.y[f-1]),e=new m(a.x[f],a.y[f]),e=c.getVectorToPoint(e),i=new m(a.x[f-2],a.y[f-2]),c=i.getVectorToPoint(c);return c.getLength()>d?(d=2<f?(new m(a.x[f-3],a.y[f-3])).getVectorToPoint(i):new q(0,0),a=0.35*c.getLength(),i=c.angleTo(d.reverse()),f=e.angleTo(c.reverse()),d=(new q(d.x+c.x,d.y+c.y)).resizeTo(Math.max(0.05,
+i)*a),e=(new q(c.x+e.x,c.y+e.y)).reverse().resizeTo(Math.max(0.05,f)*a),e=new q(c.x+e.x,c.y+e.y),["c",k(d.x,2),k(d.y,2),k(e.x,2),k(e.y,2),k(c.x,2),k(c.y,2)]):["l",k(c.x,2),k(c.y,2)]}function r(a,f){var d=a.x.length-1,c=new m(a.x[d],a.y[d]),e=new m(a.x[d-1],a.y[d-1]),c=e.getVectorToPoint(c);if(1<d&&c.getLength()>f){var d=(new m(a.x[d-2],a.y[d-2])).getVectorToPoint(e),e=c.angleTo(d.reverse()),i=0.35*c.getLength(),d=(new q(d.x+c.x,d.y+c.y)).resizeTo(Math.max(0.05,e)*i);return["c",k(d.x,2),k(d.y,2),k(c.x,
+2),k(c.y,2),k(c.x,2),k(c.y,2)]}return["l",k(c.x,2),k(c.y,2)]}function e(a,e,d){for(var e=["M",k(a.x[0]-e,2),k(a.y[0]-d,2)],d=1,c=a.x.length-1;d<c;d++)e.push.apply(e,t(a,d,1));0<c?e.push.apply(e,r(a,d,1)):0===c&&e.push.apply(e,["l",1,1]);return e.join(" ")}function y(a){var f=['<?xml version="1.0" encoding="UTF-8" standalone="no"?>','<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">'],d,c=a.length,l,i=[],h=[],k=l=d=0,n=0,p=[];if(0!==c){for(d=0;d<c;d++){k=
+a[d];n=[];l={x:[],y:[]};for(var m=void 0,b=void 0,m=0,b=k.x.length;m<b;m++)n.push({x:k.x[m],y:k.y[m]});n=simplify(n,0.7,!0);m=0;for(b=n.length;m<b;m++)l.x.push(n[m].x),l.y.push(n[m].y);p.push(l);i=i.concat(l.x);h=h.concat(l.y)}a=Math.min.apply(null,i)-1;c=Math.max.apply(null,i)+1;i=Math.min.apply(null,h)-1;h=Math.max.apply(null,h)+1;k=0>a?0:a;n=0>i?0:i;d=c-a;l=h-i}f.push('<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="'+d.toString()+'" height="'+l.toString()+'">');d=0;for(c=p.length;d<
+c;d++)l=p[d],f.push('<path fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="'+e(l,k,n)+'"/>');f.push("</svg>");return f.join("")}function v(a){return[p,y(a)]}function z(a){return[h,x(y(a))]}var u=window;"use strict";("undefined"!=typeof exports?exports:u).simplify=function(a,e,d){e=void 0!==e?e*e:1;if(!d){for(var c=a.length,l,i=a[0],h=[i],d=1;d<c;d++){l=a[d];var k=l.x-i.x,n=l.y-i.y;k*k+n*n>e&&(h.push(l),i=l)}a=(i!==l&&h.push(l),h)}l=a;var d=l.length,
+c=new ("undefined"!=typeof Uint8Array?Uint8Array:Array)(d),i=0,h=d-1,m,p,b=[],j=[],s=[];for(c[i]=c[h]=1;h;){n=0;for(k=i+1;k<h;k++){m=l[k];var g=l[i],r=l[h],q=g.x,t=g.y,g=r.x-q,u=r.y-t,v=void 0;if(0!==g||0!==u)v=((m.x-q)*g+(m.y-t)*u)/(g*g+u*u),1<v?(q=r.x,t=r.y):0<v&&(q+=g*v,t+=u*v);m=(g=m.x-q,u=m.y-t,g*g+u*u);m>n&&(p=k,n=m)}n>e&&(c[p]=1,b.push(i),j.push(p),b.push(p),j.push(h));i=b.pop();h=j.pop()}for(k=0;k<d;k++)c[k]&&s.push(l[k]);return a=s,a};if("function"!==typeof x)var x=function(a){var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".split(""),
+d,c,h,i,k=0,m=0,n="",n=[];do d=a.charCodeAt(k++),c=a.charCodeAt(k++),h=a.charCodeAt(k++),i=d<<16|c<<8|h,d=i>>18&63,c=i>>12&63,h=i>>6&63,i&=63,n[m++]=e[d]+e[c]+e[h]+e[i];while(k<a.length);n=n.join("");a=a.length%3;return(a?n.slice(0,a-3):n)+"===".slice(a||3)};var p="image/svg+xml",h="image/svg+xml;base64";if("undefined"===typeof $)throw Error("We need jQuery for some of the functionality. jQuery is not detected. Failing to initialize...");u=$.fn.jSignature;u("addPlugin","export","svg",v);u("addPlugin",
+"export",p,v);u("addPlugin","export","svgbase64",z);u("addPlugin","export",h,z)})();
\ No newline at end of file

From c3d4df2b7284cc225c04c2dc4d70b14e891bfa3b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2017 16:55:22 +0100
Subject: [PATCH 0344/1163] Rewrite working board to prepare new features

---
 htdocs/index.php | 67 +++++++++++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 21 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index afea714d95f..eab8844b960 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -364,18 +364,6 @@ $showweather=empty($conf->global->MAIN_DISABLE_METEO)?1:0;
 //Array that contains all WorkboardResponse classes to process them
 $dashboardlines=array();
 
-$boxwork='';
-$boxwork.='<div class="box">';
-$boxwork.='<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable" width="100%">'."\n";
-$boxwork.='<tr class="liste_titre">';
-$boxwork.='<th class="liste_titre" colspan="2">'.$langs->trans("DolibarrWorkBoard").'</th>';
-$boxwork.='<th class="liste_titre" align="right">'.$langs->trans("Number").'</th>';
-$boxwork.='<th class="liste_titre" align="right">'.$form->textwithpicto($langs->trans("Late"),$langs->trans("LateDesc")).'</th>';
-$boxwork.='<th class="liste_titre">&nbsp;</th>';
-//print '<th class="liste_titre" width="20">&nbsp;</th>';
-if ($showweather) $boxwork.='<th class="liste_titre hideonsmartphone" width="80">&nbsp;</th>';
-$boxwork.='</tr>'."\n";
-
 // Do not include sections without management permission
 require DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
 
@@ -531,27 +519,64 @@ foreach($valid_dashboardlines as $board)
     }
 }
 
+
+$boxwork='';
+$boxwork.='<div class="box">';
+$boxwork.='<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable" width="100%">'."\n";
+$boxwork.='<tr class="liste_titre">';
+$boxwork.='<th class="liste_titre">'.$langs->trans("DolibarrWorkBoard").'</th>';
+$boxwork.='<th class="liste_titre" align="right">'.$langs->trans("Number").'</th>';
+$boxwork.='<th class="liste_titre" align="right">'.$form->textwithpicto($langs->trans("Late"),$langs->trans("LateDesc")).'</th>';
+$boxwork.='<th class="liste_titre" style="width: 22px">&nbsp;</th>';
+//print '<th class="liste_titre" width="20">&nbsp;</th>';
+//if ($showweather) $boxwork.='<th class="liste_titre hideonsmartphone" width="80">&nbsp;</th>';
+$boxwork.='</tr>'."\n";
+
+if ($showweather)
+{
+    $var=!$var;
+    $boxwork.='<tr '.$bc[$var].'>';
+    $boxwork.='<td colspan="4" class="nohover hideonsmartphone center valignmiddle">';
+    //$boxwork.=$langs->trans("Meteo");
+    //$boxwork.='</td><td colspan="2" class="nohover center">';
+    $text='';
+    if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
+    $options='height="64px"';
+    if ($rowspan <= 2) $options='height="24"';  // Weather logo is smaller if dashboard has few elements
+    else if ($rowspan <= 3) $options='height="48"';  // Weather logo is smaller if dashboard has few elements
+    $boxwork.=showWeather($totallate,$text,$options);
+    $boxwork.='</td>';
+    /*$boxwork.='<td align="left" colspan="3" class="nohover">';
+    if ($board->nbtodolate > 0) $boxwork.=img_picto($textlate,"warning");
+    else $boxwork.='&nbsp;';
+    $boxwork.='</td>';*/
+    $boxwork.='</tr>';
+    $showweather=0;
+}
+
+
 // Show dashboard
 foreach($valid_dashboardlines as $board)
 {
     $var=!$var;
-    $boxwork.= '<tr '.$bc[$var].'><td width="16">'.$board->img.'</td><td>'.$board->label.'</td>';
+    $boxwork.= '<tr '.$bc[$var].'><td class="nowrap">'.$board->img.' &nbsp; '.$board->label.'</td>';
     $boxwork.= '<td align="right"><a class="dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator">'.$board->nbtodo.'</span></a></td>';
     $boxwork.= '<td align="right">';
     $textlate = $langs->trans("NActionsLate",$board->nbtodolate);
-    $textlate .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
-    $boxwork.= '<a title="'.dol_escape_htmltag($textlate).'" class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'"><span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
+    $textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
+    $boxwork.= '<a title="'.dol_escape_htmltag($textlate).'" class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
+    $boxwork.= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
     $boxwork.= $board->nbtodolate;
-    $boxwork.= '</span></a>';
+    $boxwork.= '</span>';
+    $boxwork.= '</a>';
     $boxwork.='</td>';
-    $boxwork.='<td align="left">';
-    if ($board->nbtodolate > 0) $boxwork.=img_picto($textlate,"warning");
-    else $boxwork.='&nbsp;';
+    $boxwork.='<td>';
+    if ($board->nbtodolate > 0) $boxwork.=img_picto($textlate, "warning", 'class="valignmiddle"').' ';
     $boxwork.='</td>';
     /*print '<td class="nowrap" align="right">';
     print ' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')';
     print '</td>';*/
-    
+    /*
     if ($showweather)
     {
         $boxwork.='<td class="nohover hideonsmartphone noborderbottom" rowspan="'.$rowspan.'" width="80" style="border-left: 1px solid #DDDDDD" align="center">';
@@ -563,7 +588,7 @@ foreach($valid_dashboardlines as $board)
         $boxwork.=showWeather($totallate,$text,$options);
         $boxwork.='</td>';
         $showweather=0;
-    }
+    }*/
     $boxwork.='</tr>';
     $boxwork.="\n";
 }

From 00758e515aa097c09f6ed93ac6b5f0e7d16f635c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 4 Mar 2017 12:18:34 +0100
Subject: [PATCH 0345/1163] Better css

---
 htdocs/theme/eldy/style.css.php | 3 +++
 htdocs/theme/md/style.css.php   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 35dd6aa4a28..f58ed5d4144 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -282,6 +282,9 @@ textarea.cke_source:focus
 	box-shadow: none;
 }
 
+.liste_titre input[name=month], .liste_titre input[name=month_lim] {
+	margin-right: 4px;
+}
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
     font-size: <?php print $fontsize ?>px;
     font-family: <?php print $fontlist ?>;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 7a62f0b3f92..3fa54b1d462 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -270,6 +270,9 @@ textarea.cke_source:focus
 	box-shadow: none;
 }
 
+.liste_titre input[name=month], .liste_titre input[name=month_lim] {
+	margin-right: 4px;
+}
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
     font-size: <?php print $fontsize ?>px;
 	font-family: <?php print $fontlist ?>;

From 5d18aad15f53897ff7321f770843cbd5c1d5e14d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 4 Mar 2017 14:18:04 +0100
Subject: [PATCH 0346/1163] Add the vat_code on all table of prices

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql                | 4 +++-
 htdocs/install/mysql/tables/llx_product_fournisseur_price.sql | 1 +
 htdocs/install/mysql/tables/llx_product_price.sql             | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index c47b2d7e5fe..0dfc5f36925 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -111,4 +111,6 @@ ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoic
 
 UPDATE llx_const set value='moono-lisa' where value = 'moono' AND name = 'FCKEDITOR_SKIN';
 
-  
+ALTER TABLE llx_product_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
+
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
index 717f0617c83..94032b784f4 100755
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -36,6 +36,7 @@ create table llx_product_fournisseur_price
   unitprice				double(24,8) DEFAULT 0,
   charges				double(24,8) DEFAULT 0,		-- to store transport cost. Constant PRODUCT_CHARGES must be set to see it.
   unitcharges			double(24,8) DEFAULT 0,		-- deprecated
+  default_vat_code	    varchar(10),
   tva_tx				double(6,3) NOT NULL,
   info_bits				integer NOT NULL DEFAULT 0,
   fk_user				integer,
diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql
index 9c3869f1e35..ee2ee953c49 100755
--- a/htdocs/install/mysql/tables/llx_product_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_price.sql
@@ -31,6 +31,7 @@ create table llx_product_price
   price_min			double(24,8) default NULL,
   price_min_ttc		double(24,8) default NULL,
   price_base_type	varchar(3) DEFAULT 'HT',
+  default_vat_code	varchar(10),	         		-- Same code than into table llx_c_tva (but no constraints). Should be used in priority to find default vat, npr, localtaxes for product.
   tva_tx			double(6,3) NOT NULL,
   recuperableonly	integer NOT NULL DEFAULT '0',  
   localtax1_tx		double(6,3) DEFAULT 0,

From c2298c2e6b588ad035a2f40c45d6a7ae6bc5fd36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 4 Mar 2017 17:49:44 +0100
Subject: [PATCH 0347/1163] Clean CSS

---
 htdocs/theme/eldy/style.css.php |  75 ++++++++++++------
 htdocs/theme/md/style.css.php   | 130 ++++++++++++++++++++++----------
 2 files changed, 143 insertions(+), 62 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f58ed5d4144..a5ae098c545 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -266,7 +266,6 @@ textarea:focus, button:focus {
 	border: 1px solid #aaa !important;
 }
 input:focus, select:focus {
-    /* box-shadow: 0 0 4px #8091BF; */
 	border-bottom: 1px solid #666;
 }
 input.select2-input {
@@ -289,7 +288,6 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     font-size: <?php print $fontsize ?>px;
     font-family: <?php print $fontlist ?>;
 
-    /* border: 1px solid #C0C0C0; */
     border: none;
     border-bottom: 1px solid #C0C0C0;
     outline: none;
@@ -300,10 +298,6 @@ input {
 }
 input, select {
 	border-bottom: solid 1px rgba(0,0,0,.2);
-	/*border-radius: 2px;
-	border: solid 1px rgba(0,0,0,.3);
-	border-top:solid 1px rgba(0,0,0,.3);
-	border-bottom:solid 1px rgba(0,0,0,.2);*/
 
 	padding:4px;
 	margin-left:0px;
@@ -311,7 +305,7 @@ input, select {
 	margin-top:1px;
 	}
 textarea {
-	border-radius: 2px;
+	border-radius: 0;
 	border: solid 1px rgba(0,0,0,.3);
 	border-top:solid 1px rgba(0,0,0,.3);
 	border-bottom:solid 1px rgba(0,0,0,.2);
@@ -582,7 +576,7 @@ div.myavailability {
 .strikefordisabled {
 	text-decoration: line-through;
 }
-/* using a tdoverflowxxx make the min-with not working */
+/* using a tdoverflowxxx make the min-width not working */
 .tdoverflow {
     max-width: 0;
     overflow: hidden;
@@ -1701,7 +1695,7 @@ div.blockvmenusearchphone
 .vmenu div.blockvmenusearch
 {
 	padding-bottom: 14px;
-	border-bottom: 1px solid #e0e0e0;
+/*	border-bottom: 1px solid #e0e0e0;  */
 }
 .vmenu div.blockvmenuend
 {
@@ -3945,38 +3939,75 @@ div.dataTables_length select {
 .selectoptiondisabledwhite {
 	background: #FFFFFF !important;
 }
-
 .select2-arrow {
 	border: none;
 	border-left: none !important;
 	background: none !important;
 }
-
 .select2-choice
 {
-	/* border: 1px solid #aaa; */
 	border-top: none !important;
 	border-left: none !important;
 	border-right: none !important;
 	border-bottom: 1px solid #aaa;
 }
-.select2-drop.select2-drop-above.select2-drop-active,
-.select2-container-active .select2-choice,
-.select2-container-active .select2-choices,
-.select2-dropdown-open.select2-drop-above .select2-choice,
-.select2-dropdown-open.select2-drop-above .select2-choices,
-.select2-container-multi.select2-container-active .select2-choices
+.select2-drop.select2-drop-above {
+	box-shadow: none !important;
+}
+.select2-drop.select2-drop-above.select2-drop-active {
+	border-top: 1px solid #ccc;
+}
+.select2-container-active .select2-choice, .select2-container-active .select2-choices 
 {
-	border: 1px solid #aaa;
+	outline: none;
+	border-top: none;
+	border-left: none;
+	border-bottom: none;
+	-webkit-box-shadow: none !important;
+	box-shadow: none !important;
+}
+.select2-dropdown-open {
+	background-color: #fff;
+}
+.select2-dropdown-open .select2-choice, .select2-dropdown-open .select2-choices
+{
+	outline: none;
+	border-top: none;
+	border-left: none;
+	border-bottom: none;
+	-webkit-box-shadow: none !important;
+	box-shadow: none !important;
+	background-color: #fff;
 }
 .select2-disabled
 {
 	color: #888;
 }
+.select2-drop.select2-drop-above.select2-drop-active, .select2-drop {
+	border-radius: 0;
+}
+.select2-drop.select2-drop-above {
+	border-radius:  0;
+}
+.select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices {
+	background-image: none;
+	border-left: 1px solid #ccc !important;
+	border-right: 1px solid #ccc !important;
+	border-radius: 0 !important;
+}
+div.select2-drop-above
+{
+	background: #fff;
+	-webkit-box-shadow: none !important;
+	box-shadow: none !important;
+}
 .select2-drop-active
 {
+	border: 1px solid #ccc;
+	padding-top: 4px;
+}
+.select2-search input {
 	border: none;
-	border-top: none;
 }
 a span.select2-chosen
 {
@@ -3984,12 +4015,8 @@ a span.select2-chosen
 }
 .select2-container .select2-choice {
 	background-image: none;
-	/* height: 24px; */
 	line-height: 24px;
 }
-.select2-choices .select2-search-choice {
-    /* border: 1px solid #aaa !important; */
-}
 .select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit
 {
 	background: #FFFFFF;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3fa54b1d462..625251a6bb0 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -241,8 +241,8 @@ body {
 <?php } ?>
 	color: rgb(<?php echo $colortext; ?>);
 	font-size: <?php print $fontsize ?>px;
-	font-family: <?php print $fontlist ?>;
 	line-height: 130%;
+	font-family: <?php print $fontlist ?>;
     margin-top: 0;
     margin-bottom: 0;
     margin-right: 0;
@@ -261,10 +261,21 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     background-color: #FDFDFD;
 }
 
-input:focus, textarea:focus, button:focus, select:focus {
-    box-shadow: 0 0 4px #8091BF;
-    /* TODO Remove shadow on focus. Use instead border-bottom: 1px solid #aaa !important; To disable with select2 too. */
+textarea:focus, button:focus {
+    /* v6 box-shadow: 0 0 4px #8091BF; */
+	border: 1px solid #aaa !important;
 }
+input:focus, textarea:focus, button:focus, select:focus {
+	border-bottom: 1px solid #666;
+}
+input.select2-input {
+	border-bottom: none ! important;
+}
+.select2-choice {
+	border: none;
+	border-bottom: 1px solid #aaa !important;
+}
+
 textarea.cke_source:focus
 {
 	box-shadow: none;
@@ -276,17 +287,28 @@ textarea.cke_source:focus
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
     font-size: <?php print $fontsize ?>px;
 	font-family: <?php print $fontlist ?>;
-    border: 1px solid #C0C0C0;
+    border: none;
+    border-bottom: 1px solid #C0C0C0;
+    outline: none;
     margin: 0px 0px 0px 0px;
 }
 
-input, textarea, select {
-	border-radius:2px;
-	border:solid 1px rgba(0,0,0,.3);
+input, select {
+	border-bottom: solid 1px rgba(0,0,0,.2);
+
+	padding:4px;
+	margin-left:0px;
+	margin-bottom:1px;
+	margin-top:1px;
+	}
+
+textarea {
+	border-radius: 0;
+	border: solid 1px rgba(0,0,0,.3);
 	border-top:solid 1px rgba(0,0,0,.3);
 	border-bottom:solid 1px rgba(0,0,0,.2);
+		
 	background-color: #FFF;
-	/* box-shadow: 1px 1px 1px rgba(0,0,0,.2) inset;*/
 	padding:4px;
 	margin-left:1px;
 	margin-bottom:1px;
@@ -361,7 +383,7 @@ fieldset { border: 1px solid #AAAAAA !important; }
 .legendforfieldsetstep { padding-bottom: 10px; }
 
 
-.button, sbmtConnexion {
+.button, .buttonDelete, input[name="sbmtConnexion"] {
     font-family: <?php print $fontlist ?>;
 	border-color: #c5c5c5;
 	border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
@@ -371,7 +393,8 @@ fieldset { border: 1px solid #AAAAAA !important; }
 	margin-top: 0;
 	text-align: center;
 	cursor: pointer;
-	color: #333333;
+	color: #333333 !important;
+	text-decoration: none !important;
 	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
 	background-color: #f5f5f5;
 	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
@@ -393,17 +416,17 @@ fieldset { border: 1px solid #AAAAAA !important; }
 	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 }
-.button:focus  {
+.button:focus, .buttonDelete:focus  {
 	-moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 	-webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 	box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 }
-.button:hover   {
+.button:hover, .buttonDelete:hover   {
 	-moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 	-webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 	box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 }
-.button:disabled {
+.button:disabled, .buttonDelete:disabled {
 	opacity: 0.4;
     filter: alpha(opacity=40); /* For IE8 and earlier */
     box-shadow: none;
@@ -559,6 +582,7 @@ div.myavailability {
 .strikefordisabled {
 	text-decoration: line-through;
 }
+/* using a tdoverflowxxx make the min-width not working */
 .tdoverflow {
     max-width: 0;
     overflow: hidden;
@@ -1716,10 +1740,10 @@ div.blockvmenusearch
     padding-right: 1px;
     padding-top: 3px;
     padding-bottom: 3px;
-    margin: 1px 0px 8px 0px;
+    margin: 1px 0px 12px 0px;
 
     padding-bottom: 10px;
-    border-bottom: 1px solid #f4f4f4;
+    /* border-bottom: 1px solid #f4f4f4; */
 }
 div.blockvmenusearchphone
 {
@@ -2350,14 +2374,6 @@ div.pagination li.pagination span {
   line-height: 1.42857143;
   color: #000;
   text-decoration: none;
-
-    background-color: #f5f5f5;
-    background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-    background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-    background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-    background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-    background-repeat: repeat-x;
 }
 div.pagination li.pagination span.inactive {
   cursor: default;
@@ -3834,8 +3850,12 @@ div.dataTables_length select {
 .select2-container .select2-choice .select2-arrow {
 	border-radius: 0;
 }
+.select2-container-multi .select2-choices {
+	background-image: none;
+}
 .select2-container .select2-choice {
 	color: #000;
+	border-radius: 0;
 }
 .selectoptiondisabledwhite {
 	background: #FFFFFF !important;
@@ -3848,31 +3868,68 @@ div.dataTables_length select {
 }
 .select2-choice
 {
-	/* border: 1px solid #aaa; */
 	border-top: none !important;
 	border-left: none !important;
 	border-right: none !important;
 	border-bottom: 1px solid #aaa;
 }
-
-.select2-choice,
-.select2-drop.select2-drop-above.select2-drop-active,
-.select2-container-active .select2-choice,
-.select2-container-active .select2-choices,
-.select2-dropdown-open.select2-drop-above .select2-choice,
-.select2-dropdown-open.select2-drop-above .select2-choices,
-.select2-container-multi.select2-container-active .select2-choices
+.select2-drop.select2-drop-above {
+	box-shadow: none !important;
+}
+.select2-drop.select2-drop-above.select2-drop-active {
+	border-top: 1px solid #ccc;
+}
+.select2-container-active .select2-choice, .select2-container-active .select2-choices 
 {
-	border: 1px solid #aaa;
+	outline: none;
+	border-top: none;
+	border-left: none;
+	border-bottom: none;
+	-webkit-box-shadow: none !important;
+	box-shadow: none !important;
+}
+.select2-dropdown-open {
+	background-color: #fff;
+}
+.select2-dropdown-open .select2-choice, .select2-dropdown-open .select2-choices
+{
+	outline: none;
+	border-top: none;
+	border-left: none;
+	border-bottom: none;
+	-webkit-box-shadow: none !important;
+	box-shadow: none !important;
+	background-color: #fff;
 }
 .select2-disabled
 {
 	color: #888;
 }
+.select2-drop.select2-drop-above.select2-drop-active, .select2-drop {
+	border-radius: 0;
+}
+.select2-drop.select2-drop-above {
+	border-radius:  0;
+}
+.select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices {
+	background-image: none;
+	border-left: 1px solid #ccc !important;
+	border-right: 1px solid #ccc !important;
+	border-radius: 0 !important;
+}
+div.select2-drop-above
+{
+	background: #fff;
+	-webkit-box-shadow: none !important;
+	box-shadow: none !important;
+}
 .select2-drop-active
 {
+	border: 1px solid #ccc;
+	padding-top: 4px;
+}
+.select2-search input {
 	border: none;
-	border-top: none;
 }
 a span.select2-chosen
 {
@@ -3882,9 +3939,6 @@ a span.select2-chosen
 	background-image: none;
 	line-height: 24px;
 }
-.select2-choices .select2-search-choice {
-  border: 1px solid #aaa !important;
-}
 .select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit
 {
 	background: #FFFFFF;

From b37827944089c9963f6eee1c0bcecb0ccc7e5b4d Mon Sep 17 00:00:00 2001
From: Quentin Vial-Gouteyron <quentin@mail.atm-consulting.fr>
Date: Mon, 6 Mar 2017 15:50:17 +0100
Subject: [PATCH 0348/1163] New_filter_to_add_draft_order_to_validated_one

---
 htdocs/product/stock/replenish.php | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index c050acc7663..2f8a9ba39b4 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -53,6 +53,8 @@ $type = GETPOST('type','int');
 $tobuy = GETPOST('tobuy', 'int');
 $salert = GETPOST('salert', 'alpha');
 $mode = GETPOST('mode','alpha');
+$draftorder = GETPOST('draftorder','alpha');
+
 
 $fourn_id = GETPOST('fourn_id','int');
 $fk_supplier = GETPOST('fk_supplier','int');
@@ -96,7 +98,9 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
     $snom = '';
     $sal = '';
     $salert = '';
+	$draftorder='';
 }
+if($draftorder == 'on') $draftchecked = "checked";
 
 // Create orders
 if ($action == 'order' && isset($_POST['valid']))
@@ -438,6 +442,7 @@ print '<input type="hidden" name="action" value="filter">';
 print '<input type="hidden" name="sref" value="'.$sref.'">';
 print '<input type="hidden" name="snom" value="'.$snom.'">';
 print '<input type="hidden" name="salert" value="'.$salert.'">';
+print '<input type="hidden" name="draftorder" value="'.$draftorder.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 print '<div class="inline-block valignmiddle" style="padding-right: 20px;">';
 print $langs->trans('Warehouse').' '.$formproduct->selectWarehouses($fk_entrepot, 'fk_entrepot', '', 1);
@@ -450,10 +455,11 @@ print '<input class="button" type="submit" name="valid" value="'.$langs->trans('
 print '</div>';
 print '</form>';
 
-if ($sref || $snom || $sall || $salert || GETPOST('search', 'alpha')) {
+if ($sref || $snom || $sall || $salert || $draftorder || GETPOST('search', 'alpha')) {
 	$filters = '&sref=' . $sref . '&snom=' . $snom;
 	$filters .= '&sall=' . $sall;
 	$filters .= '&salert=' . $salert;
+	$filters .= '&draftorder=' . $draftorder;
 	$filters .= '&mode=' . $mode;
 	$filters .= '&fk_supplier=' . $fk_supplier;
 	$filters .= '&fk_entrepot=' . $fk_entrepot;
@@ -472,6 +478,7 @@ if ($sref || $snom || $sall || $salert || GETPOST('search', 'alpha')) {
 	$filters .= '&fourn_id=' . $fourn_id;
 	$filters .= (isset($type)?'&type=' . $type:'');
 	$filters .=  '&=' . $salert;
+	$filters .= '&draftorder=' . $draftorder;
 	$filters .= '&mode=' . $mode;
 	$filters .= '&fk_supplier=' . $fk_supplier;
 	$filters .= '&fk_entrepot=' . $fk_entrepot;
@@ -490,7 +497,7 @@ if ($sref || $snom || $sall || $salert || GETPOST('search', 'alpha')) {
 print '<table class="liste" width="100%">';
 
 $param = (isset($type)? '&type=' . $type : '');
-$param .= '&fourn_id=' . $fourn_id . '&snom='. $snom . '&salert=' . $salert;
+$param .= '&fourn_id=' . $fourn_id . '&snom='. $snom . '&salert=' . $salert . '&draftorder='.$draftorder;
 $param .= '&sref=' . $sref;
 $param .= '&mode=' . $mode;
 $param .= '&fk_supplier=' . $fk_supplier;
@@ -534,7 +541,7 @@ if (!empty($conf->service->enabled) && $type == 1) print '<td class="liste_titre
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre" align="right">&nbsp;</td>';
 print '<td class="liste_titre" align="right">' . $langs->trans('AlertOnly') . '&nbsp;<input type="checkbox" id="salert" name="salert" ' . (!empty($alertchecked)?$alertchecked:'') . '></td>';
-print '<td class="liste_titre" align="right">&nbsp;</td>';
+print '<td class="liste_titre" align="right">' . $langs->trans('Draft') . '&nbsp;<input type="checkbox" id="draftorder" name="draftorder" ' . (!empty($draftchecked)?$draftchecked:'') . '></td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre" align="right">';
 $searchpitco=$form->showFilterAndCheckAddButtons(0);
@@ -584,7 +591,12 @@ while ($i < ($limit ? min($num, $limit) : $num))
 		}
 
 		// Force call prod->load_stats_xxx to choose status to count (otherwise it is loaded by load_stock function)
-		$result=$prod->load_stats_commande_fournisseur(0,'1,2,3,4');
+		if(isset($draftchecked)){
+			$result=$prod->load_stats_commande_fournisseur(0,'0,1,2,3,4');
+		}else {
+			$result=$prod->load_stats_commande_fournisseur(0,'1,2,3,4');
+		}
+		
 		$result=$prod->load_stats_reception(0,'4');
 
 		//print $prod->stats_commande_fournisseur['qty'].'<br>'."\n";
@@ -671,11 +683,12 @@ print '</table>';
 
 if ($num > $conf->liste_limit)
 {
-	if ($sref || $snom || $sall || $salert || GETPOST('search', 'alpha'))
+	if ($sref || $snom || $sall || $salert || $draftorder || GETPOST('search', 'alpha'))
 	{
 		$filters = '&sref=' . $sref . '&snom=' . $snom;
 		$filters .= '&sall=' . $sall;
 		$filters .= '&salert=' . $salert;
+		$filters .= '&draftorder=' . $draftorder;
 		$filters .= '&mode=' . $mode;
 		$filters .= '&fk_supplier=' . $fk_supplier;
 		$filters .= '&fk_entrepot=' . $fk_entrepot;
@@ -687,6 +700,7 @@ if ($num > $conf->liste_limit)
 		$filters .= '&fourn_id=' . $fourn_id;
 		$filters .= (isset($type)? '&type=' . $type : '');
 		$filters .= '&salert=' . $salert;
+		$filters .= '&draftorder=' . $draftorder;
 		$filters .= '&mode=' . $mode;
 		$filters .= '&fk_supplier=' . $fk_supplier;
 		$filters .= '&fk_entrepot=' . $fk_entrepot;

From 8ac1aab45af59eb996ef7b84645aec65d7343a04 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 7 Mar 2017 18:34:57 +0100
Subject: [PATCH 0349/1163] Uniformize look and feels

---
 htdocs/core/ajax/ajaxdirpreview.php       |  3 ++-
 htdocs/core/class/html.formfile.class.php | 19 +++++++++++----
 htdocs/ecm/docfile.php                    | 29 +++++++++++++++++------
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 28f78e22ef4..52411613e0b 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -192,6 +192,7 @@ if ($type == 'directory')
     // Auto area for expense report
     else if ($module == 'expensereport') $upload_dir = $conf->expensereport->dir_output;
 
+    // Automatic list
     if (in_array($module, $automodules))
     {
         $param.='&module='.$module;
@@ -200,7 +201,7 @@ if ($type == 'directory')
         $filearray=dol_dir_list($upload_dir,"files",1,'', $excludefiles, $sortfield, $sorting,1);
         $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname,$url);
     }
-    //Manual area
+    // Manual list
     else
     {
         $relativepath=$ecmdir->getRelativePath();
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index e80ff8008df..44b6a8adcd7 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1115,6 +1115,7 @@ class FormFile
 					print "</td>\n";
 					print '<td align="right" width="80px">'.dol_print_size($file['size'],1,1).'</td>';
 					print '<td align="center" width="130px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';
+				
 					// Preview
 					if (empty($useinecm))
 					{
@@ -1420,6 +1421,13 @@ class FormFile
                 print '<td>';
                 if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
                 else print $langs->trans("ObjectDeleted",($id?$id:$ref));
+                
+                $filename=dol_sanitizeFileName($ref);
+                //$filedir=$conf->$modulepart->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+                $filedir=$file['path'];
+                //$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+                //print $formfile->getDocumentsLink($modulepart, $filename, $filedir);
+                
                 print '</td>';
                 print '<td>';
                 //print "XX".$file['name']; //$file['name'] must be utf8
@@ -1429,14 +1437,17 @@ class FormFile
                 print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
                 print dol_trunc($file['name'],$maxlength,'middle');
                 print '</a>';
+                
+                print $this->getDocumentsLink($modulepart, $filename, $filedir);
+                
                 print "</td>\n";
                 print '<td align="right">'.dol_print_size($file['size'],1,1).'</td>';
                 print '<td align="center">'.dol_print_date($file['date'],"dayhour").'</td>';
                 print '<td align="right">';
-                if (! empty($useinecm))  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-                if ($forcedownload) print '&attachment=1';
-                print '&file='.urlencode($relativefile).'">';
-                print img_view().'</a> &nbsp; ';
+                //if (! empty($useinecm))  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
+                //if ($forcedownload) print '&attachment=1';
+                //print '&file='.urlencode($relativefile).'">';
+                //print img_view().'</a> &nbsp; ';
                 //if ($permtodelete) print '<a href="'.$url.'?id='.$object->id.'&section='.$_REQUEST["section"].'&action=delete&urlfile='.urlencode($file['name']).'">'.img_delete().'</a>';
                 //else print '&nbsp;';
                 print "</td></tr>\n";
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index 9a0ca16f662..3b6455fe4a9 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2008-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -61,6 +61,8 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="label";
 
+$cancel=GETPOST('cancel');
+$action=GETPOST('action');
 $section=GETPOST("section");
 if (! $section)
 {
@@ -107,8 +109,23 @@ if (! empty($_GET["fileid"]))
  * Put here all code to do according to value of "action" parameter
  ********************************************************************/
 
+if ($action == 'cancel') 
+{
+    $action ='';
+    if ($backtourl) 
+    {
+        header("Location: ".$backtourl);
+        exit;
+    }
+    else
+    {
+        header("Location: ".DOL_URL_ROOT.'/ecm/index.php?action=file_manager&section='.$section);
+        exit;
+    }
+}
+
 // Rename file
-if (GETPOST('action') == 'update' && ! GETPOST('cancel'))
+if ($action == 'update')
 {
     $error=0;
 
@@ -131,7 +148,7 @@ if (GETPOST('action') == 'update' && ! GETPOST('cancel'))
         if (! $result)
         {
             $langs->load('errors');
-            $mesg='<div class="error">'.$langs->trans('ErrorFailToRenameFile',$oldfile,$newfile).'</div>';
+            setEventMessages($langs->trans('ErrorFailToRenameFile',$oldfile,$newfile), null, 'errors');
             $error++;
         }
     }
@@ -279,16 +296,14 @@ if ($_GET['action'] == 'delete_file')
 
 if ($_GET["action"] != 'edit')
 {
-
-	if ($mesg) { print $mesg."<br>"; }
-
-
 	// Actions buttons
 	print '<div class="tabsAction">';
 
     if ($user->rights->ecm->setup)
     {
         print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.$section.'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
+
+        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=cancel&section='.$section.'&urlfile='.urlencode($urlfile).'&backtourl='.urlencode($backtourl).'">'.$langs->trans('Cancel').'</a>';
     }
 /*
 	if ($user->rights->ecm->setup)

From fd0a46c5cfa1b011fe0a1c99e271aafcf5f9c5de Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Tue, 7 Mar 2017 22:31:34 +0100
Subject: [PATCH 0350/1163] New : add donations statistics in home statistics

---
 htdocs/core/modules/modDon.class.php |  2 +-
 htdocs/don/class/don.class.php       | 35 +++++++++++++++++++++++++++-
 htdocs/index.php                     | 24 ++++++++++++-------
 3 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index f69cb1b5331..26dd397c913 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -32,7 +32,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 /**
  *	Class to describe and enable module Donation
  */
-class modDon  extends DolibarrModules
+class modDon extends DolibarrModules
 {
 
 	/**
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index d7e4d84baab..74349a16271 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009      Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2015      Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2016      Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -804,6 +804,39 @@ class Don extends CommonObject
         return $result;
     }
 
+	/**
+     *	Charge indicateurs this->nb pour le tableau de bord
+     *
+     *	@return     int         <0 if KO, >0 if OK
+     */
+    function load_state_board()
+    {
+        global $conf;
+
+        $this->nb=array();
+
+        $sql = "SELECT count(d.rowid) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."don as d";
+        $sql.= " WHERE d.fk_statut > 0";
+        $sql.= " AND d.entity IN (".getEntity('don', 1).")";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            while ($obj=$this->db->fetch_object($resql))
+            {
+                $this->nb["donations"]=$obj->nb;
+            }
+            $this->db->free($resql);
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            $this->error=$this->db->error();
+            return -1;
+        }
+    }
 
     /**
      *	Return clicable name (with picto eventually)
diff --git a/htdocs/index.php b/htdocs/index.php
index eab8844b960..21210904abb 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -159,7 +159,8 @@ if (empty($user->societe_id))
 		! empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS),
 		! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_PROPOSAL_STATS),
 	    ! empty($conf->projet->enabled) && $user->rights->projet->lire,
-	    ! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
+	    ! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire,
+		! empty($conf->don->enabled) && $user->rights->don->lire
 	    );
 	    // Class file containing the method load_state_board for each line
 	    $includes=array(
@@ -180,7 +181,8 @@ if (empty($user->societe_id))
     	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
     	    DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
             DOL_DOCUMENT_ROOT."/projet/class/project.class.php", 
-	        DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php"
+	        DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
+			DOL_DOCUMENT_ROOT."/don/class/don.class.php"
 	    );
 	    // Name class containing the method load_state_board for each line
 	    $classes=array('User',
@@ -200,7 +202,8 @@ if (empty($user->societe_id))
 	                   'FactureFournisseur',
             	       'SupplierProposal',
 	                   'Project',
-	                   'ExpenseReport'
+	                   'ExpenseReport',
+					   'Don'
 	    );
 	    // Cle array returned by the method load_state_board for each line
 	    $keys=array('users',
@@ -220,7 +223,8 @@ if (empty($user->societe_id))
 	                'supplier_invoices',
 	                'askprice',
 	                'projects',
-	                'expensereports'
+	                'expensereports',
+					'donations'
 	    );
 	    // Dashboard Icon lines
 	    $icons=array('user',
@@ -240,7 +244,8 @@ if (empty($user->societe_id))
 	                 'bill',
 	                 'propal',
 	                 'project',
-					 'trip'
+					 'trip',
+					 'generic'
 	    );
 	    // Translation keyword
 	    $titres=array("Users",
@@ -260,7 +265,8 @@ if (empty($user->societe_id))
                       "SuppliersInvoices",
 	                  "SupplierProposalShort",
 	                  "Projects",
-					  "ExpenseReports"
+					  "ExpenseReports",
+					  "Donations"
 	    );
 	    // Dashboard Link lines
 	    $links=array(
@@ -281,7 +287,8 @@ if (empty($user->societe_id))
 	        DOL_URL_ROOT.'/fourn/facture/list.php',
 	        DOL_URL_ROOT.'/supplier_proposal/list.php',
 	        DOL_URL_ROOT.'/projet/list.php?mainmenu=project',
-    		DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'
+    		DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm',
+			DOL_URL_ROOT.'/don/list.php?leftmenu=donations'
 	    );
 	    // Translation lang files
 	    $langfile=array("users",
@@ -301,7 +308,8 @@ if (empty($user->societe_id))
 	                    "bills",
 	                    "supplier_proposal",
 	                    "projects",
-						"trips"
+						"trips",
+						"donations"
 	    );
 
 

From 184d52525a0b89f96e16b7933457e321a2435e8d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 7 Mar 2017 22:45:22 +0100
Subject: [PATCH 0351/1163] PHP code to manage pair/impair is replaced by
 native CSS.

---
 htdocs/adherents/index.php                | 143 +++++++++++-----------
 htdocs/adherents/type.php                 |  10 +-
 htdocs/comm/index.php                     |  24 ++--
 htdocs/commande/index.php                 |  10 +-
 htdocs/compta/index.php                   |  78 ++++++------
 htdocs/compta/paiement/cheque/index.php   |  14 +--
 htdocs/compta/prelevement/index.php       |  12 +-
 htdocs/contrat/index.php                  |  18 +--
 htdocs/core/boxes/box_actions.php         |   5 +-
 htdocs/core/boxes/modules_boxes.php       |   5 +-
 htdocs/core/lib/agenda.lib.php            |   8 +-
 htdocs/don/index.php                      |   4 +-
 htdocs/expedition/index.php               |   8 +-
 htdocs/expensereport/index.php            |  12 +-
 htdocs/fichinter/index.php                |   8 +-
 htdocs/fourn/commande/index.php           |  14 +--
 htdocs/hrm/index.php                      |  28 ++---
 htdocs/index.php                          |  33 ++---
 htdocs/product/index.php                  |   4 +-
 htdocs/product/stock/index.php            |  16 +--
 htdocs/projet/graph_opportunities.inc.php |   2 +-
 htdocs/supplier_proposal/index.php        |   8 +-
 htdocs/theme/eldy/style.css.php           | 115 ++++++++---------
 htdocs/theme/md/style.css.php             |  84 +++++++------
 24 files changed, 329 insertions(+), 334 deletions(-)

diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index ef20c2e96c0..9c1b0bb01e1 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -163,7 +163,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
 if ($conf->use_javascript_ajax)
 {
     print '<table class="noborder nohover" width="100%">';
-    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").'</td></tr>';
+    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
     print '<tr '.$bc[0].'><td align="center" colspan="2">';
 
     $SommeA=0;
@@ -201,8 +201,70 @@ if ($conf->use_javascript_ajax)
     print '</table>';
 }
 
+print '<br>';
+
+// List of subscription by year
+$Total=array();
+$Number=array();
+$tot=0;
+$numb=0;
+
+$sql = "SELECT c.subscription, c.dateadh as dateh";
+$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
+$sql.= " WHERE d.entity IN (".getEntity().")";
+$sql.= " AND d.rowid = c.fk_adherent";
+if(isset($date_select) && $date_select != '')
+{
+    $sql .= " AND c.dateadh LIKE '".$date_select."%'";
+}
+$result = $db->query($sql);
+if ($result)
+{
+    $num = $db->num_rows($result);
+    $i = 0;
+    while ($i < $num)
+    {
+        $objp = $db->fetch_object($result);
+        $year=dol_print_date($db->jdate($objp->dateh),"%Y");
+        $Total[$year]=(isset($Total[$year])?$Total[$year]:0)+$objp->subscription;
+        $Number[$year]=(isset($Number[$year])?$Number[$year]:0)+1;
+        $tot+=$objp->subscription;
+        $numb+=1;
+        $i++;
+    }
+}
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<th>'.$langs->trans("Subscriptions").'</th>';
+print '<th align="right">'.$langs->trans("Number").'</th>';
+print '<th align="right">'.$langs->trans("AmountTotal").'</th>';
+print '<th align="right">'.$langs->trans("AmountAverage").'</th>';
+print "</tr>\n";
+
+$var=true;
+krsort($Total);
+foreach ($Total as $key=>$value)
+{
+    $var=!$var;
+    print "<tr ".$bc[$var].">";
+    print "<td><a href=\"./subscription/list.php?date_select=$key\">$key</a></td>";
+    print "<td align=\"right\">".$Number[$key]."</td>";
+    print "<td align=\"right\">".price($value)."</td>";
+    print "<td align=\"right\">".price(price2num($value/$Number[$key],'MT'))."</td>";
+    print "</tr>\n";
+}
+
+// Total
+print '<tr class="liste_total">';
+print '<td>'.$langs->trans("Total").'</td>';
+print "<td align=\"right\">".$numb."</td>";
+print '<td align="right">'.price($tot)."</td>";
+print "<td align=\"right\">".price(price2num($numb>0?($tot/$numb):0,'MT'))."</td>";
+print "</tr>\n";
+print "</table><br>\n";
+
 
-//print '</td><td class="notopnoleftnoright" valign="top">';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
@@ -227,7 +289,7 @@ if ($resql)
 {
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td colspan="4">'.$langs->trans("LastMembersModified",$max).'</td></tr>';
+	print '<th colspan="4">'.$langs->trans("LastMembersModified",$max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
 	if ($num)
@@ -290,7 +352,7 @@ if ($resql)
 {
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td colspan="5">'.$langs->trans("LastSubscriptionsModified",$max).'</td></tr>';
+	print '<th colspan="5">'.$langs->trans("LastSubscriptionsModified",$max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
 	if ($num)
@@ -336,11 +398,11 @@ else
 // Summary of members by type
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("MembersTypes").'</td>';
-print '<td align=right>'.$langs->trans("MembersStatusToValid").'</td>';
-print '<td align=right>'.$langs->trans("MenuMembersNotUpToDate").'</td>';
-print '<td align=right>'.$langs->trans("MenuMembersUpToDate").'</td>';
-print '<td align=right>'.$langs->trans("MembersStatusResiliated").'</td>';
+print '<th>'.$langs->trans("MembersTypes").'</th>';
+print '<th align=right>'.$langs->trans("MembersStatusToValid").'</th>';
+print '<th align=right>'.$langs->trans("MenuMembersNotUpToDate").'</th>';
+print '<th align=right>'.$langs->trans("MenuMembersUpToDate").'</th>';
+print '<th align=right>'.$langs->trans("MembersStatusResiliated").'</th>';
 print "</tr>\n";
 
 foreach ($AdherentType as $key => $adhtype)
@@ -363,71 +425,8 @@ print '<td class="liste_total" align="right">'.$SommeD.' '.$staticmember->LibSta
 print '</tr>';
 
 print "</table>\n";
-print "<br>\n";
 
 
-// List of subscription by year
-$Total=array();
-$Number=array();
-$tot=0;
-$numb=0;
-
-$sql = "SELECT c.subscription, c.dateadh as dateh";
-$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
-$sql.= " WHERE d.entity IN (".getEntity().")";
-$sql.= " AND d.rowid = c.fk_adherent";
-if(isset($date_select) && $date_select != '')
-{
-	$sql .= " AND c.dateadh LIKE '".$date_select."%'";
-}
-$result = $db->query($sql);
-if ($result)
-{
-	$num = $db->num_rows($result);
-	$i = 0;
-	while ($i < $num)
-	{
-		$objp = $db->fetch_object($result);
-		$year=dol_print_date($db->jdate($objp->dateh),"%Y");
-		$Total[$year]=(isset($Total[$year])?$Total[$year]:0)+$objp->subscription;
-		$Number[$year]=(isset($Number[$year])?$Number[$year]:0)+1;
-		$tot+=$objp->subscription;
-		$numb+=1;
-		$i++;
-	}
-}
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Subscriptions").'</td>';
-print '<td align="right">'.$langs->trans("Number").'</td>';
-print '<td align="right">'.$langs->trans("AmountTotal").'</td>';
-print '<td align="right">'.$langs->trans("AmountAverage").'</td>';
-print "</tr>\n";
-
-$var=true;
-krsort($Total);
-foreach ($Total as $key=>$value)
-{
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
-	print "<td><a href=\"./subscription/list.php?date_select=$key\">$key</a></td>";
-	print "<td align=\"right\">".$Number[$key]."</td>";
-	print "<td align=\"right\">".price($value)."</td>";
-	print "<td align=\"right\">".price(price2num($value/$Number[$key],'MT'))."</td>";
-	print "</tr>\n";
-}
-
-// Total
-print '<tr class="liste_total">';
-print '<td>'.$langs->trans("Total").'</td>';
-print "<td align=\"right\">".$numb."</td>";
-print '<td align="right">'.price($tot)."</td>";
-print "<td align=\"right\">".price(price2num($numb>0?($tot/$numb):0,'MT'))."</td>";
-print "</tr>\n";
-print "</table><br>\n";
-
-//print '</td></tr></table>';
 print '</div></div></div>';
 
 
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 3ad6120be02..846b0dab7a9 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -199,11 +199,11 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 		print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 		
 		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("Ref").'</td>';
-		print '<td>'.$langs->trans("Label").'</td>';
-		print '<td align="center">'.$langs->trans("SubscriptionRequired").'</td>';
-		print '<td align="center">'.$langs->trans("VoteAllowed").'</td>';
-		print '<td>&nbsp;</td>';
+		print '<th>'.$langs->trans("Ref").'</th>';
+		print '<th>'.$langs->trans("Label").'</th>';
+		print '<th align="center">'.$langs->trans("SubscriptionRequired").'</th>';
+		print '<th align="center">'.$langs->trans("VoteAllowed").'</th>';
+		print '<th>&nbsp;</th>';
 		print "</tr>\n";
 
 		$var=True;
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index c967f303648..f8f987f1222 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -158,7 +158,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 	    
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("ProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>';
+		print '<th colspan="3">'.$langs->trans("ProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
 
 		if ($num > 0)
 		{
@@ -239,7 +239,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
          
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print '<td colspan="3">'.$langs->trans("SupplierProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>';
+        print '<th colspan="3">'.$langs->trans("SupplierProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
 
         if ($num > 0)
         {
@@ -318,7 +318,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 	    
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("DraftOrders").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>';
+		print '<th colspan="3">'.$langs->trans("DraftOrders").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
 
 		if ($num)
 		{
@@ -399,7 +399,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
 
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print '<td colspan="3">'.$langs->trans("DraftSuppliersOrders").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>';
+        print '<th colspan="3">'.$langs->trans("DraftSuppliersOrders").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
 
         if ($num)
         {
@@ -485,12 +485,12 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="2">';
+		print '<th colspan="2">';
 		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastCustomersOrProspects",$max);
         else if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastModifiedProspects",$max);
 		else print $langs->trans("BoxTitleLastModifiedCustomers",$max);
-		print '</td>';
-		print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
+		print '</th>';
+		print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
 		print '</tr>';
 		if ($num)
 		{
@@ -549,8 +549,8 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
 		$i = 0;
 
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><td>'.$langs->trans("BoxTitleLastModifiedSuppliers",min($max,$num)).'</td>';
-		print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
+		print '<tr class="liste_titre"><th>'.$langs->trans("BoxTitleLastModifiedSuppliers",min($max,$num)).'</th>';
+		print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
 		print '</tr>';
 		if ($num)
 		{
@@ -628,7 +628,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO
 		if ($num > 0)
 		{
 			print '<table class="noborder" width="100%">';
-			print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("LastContracts",5).'</td></tr>';
+			print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("LastContracts",5).'</th></tr>';
 			$i = 0;
 
 			$staticcontrat=new Contrat($db);
@@ -689,7 +689,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 			$var=true;
 
 			print '<table class="noborder" width="100%">';
-			print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></td></tr>';
+			print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
 
 			$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
 			while ($i < $nbofloop)
@@ -788,7 +788,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 			$var=true;
 
 			print '<table class="noborder" width="100%">';
-			print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("OrdersOpened").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></td></tr>';
+			print '<tr class="liste_titre"><th class="liste_titre" colspan="5">'.$langs->trans("OrdersOpened").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
 
 			$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
 			while ($i < $nbofloop)
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 24e07b5ab07..f24202f7fff 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -119,7 +119,7 @@ if ($resql)
     }
     $db->free($resql);
     print '<table class="noborder nohover" width="100%">';
-    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'</td></tr>'."\n";
+    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'</th></tr>'."\n";
     $listofstatus=array(0,1,2,3,3,-1);
     $bool=false;
     foreach ($listofstatus as $status)
@@ -187,7 +187,7 @@ if (! empty($conf->commande->enabled))
 	{
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="2">'.$langs->trans("DraftOrders").'</td></tr>';
+		print '<th colspan="2">'.$langs->trans("DraftOrders").'</th></tr>';
 		$langs->load("orders");
 		$num = $db->num_rows($resql);
 		if ($num)
@@ -259,7 +259,7 @@ if ($resql)
 {
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td colspan="4">'.$langs->trans("LastModifiedOrders",$max).'</td></tr>';
+	print '<th colspan="4">'.$langs->trans("LastModifiedOrders",$max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
 	if ($num)
@@ -341,7 +341,7 @@ if (! empty($conf->commande->enabled))
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>';
+		print '<th colspan="3">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></th></tr>';
 
 		if ($num)
 		{
@@ -423,7 +423,7 @@ if (! empty($conf->commande->enabled))
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=2"><span class="badge">'.$num.'</span></a></td></tr>';
+		print '<th colspan="3">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=2"><span class="badge">'.$num.'</span></a></th></tr>';
 
 		if ($num)
 		{
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 44d9aa4d3c1..ea8d47b264e 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -162,7 +162,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("CustomersDraftInvoices").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>';
+		print '<th colspan="3">'.$langs->trans("CustomersDraftInvoices").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
 		if ($num)
 		{
 			$companystatic=new Societe($db);
@@ -238,7 +238,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("SuppliersDraftInvoices").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>';
+		print '<th colspan="3">'.$langs->trans("SuppliersDraftInvoices").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
 		if ($num)
 		{
 			$companystatic=new Societe($db);
@@ -324,11 +324,11 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 		$i = 0;
 
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BoxTitleLastCustomerBills",$max).'</td>';
-		if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>';
-		print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
-		print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
-		print '<td width="16">&nbsp;</td>';
+		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BoxTitleLastCustomerBills",$max).'</th>';
+		if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th align="right">'.$langs->trans("AmountHT").'</th>';
+		print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
+		print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
+		print '<th width="16">&nbsp;</th>';
 		print '</tr>';
 		if ($num)
 		{
@@ -432,11 +432,11 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 		$num = $db->num_rows($resql);
 
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BoxTitleLastSupplierBills",$max).'</td>';
-		if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>';
-		print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
-		print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
-		print '<td width="16">&nbsp;</td>';
+		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BoxTitleLastSupplierBills",$max).'</th>';
+		if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th align="right">'.$langs->trans("AmountHT").'</th>';
+		print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
+		print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
+		print '<th width="16">&nbsp;</th>';
 		print "</tr>\n";
 		if ($num)
 		{
@@ -513,10 +513,10 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("BoxTitleLastModifiedDonations",$max).'</td>';
-        print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
-		print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
-        print '<td width="16">&nbsp;</td>';
+		print '<th>'.$langs->trans("BoxTitleLastModifiedDonations",$max).'</th>';
+        print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
+		print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
+        print '<th width="16">&nbsp;</th>';
 		print '</tr>';
 		if ($num)
 		{
@@ -581,11 +581,11 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre">';
-			print '<td>'.$langs->trans("ContributionsToPay").($num?' <a href="'.DOL_URL_ROOT.'/compta/sociales/index.php?status=0"><span class="badge">'.$num.'</span></a>':'').'</td>';
-			print '<td align="center">'.$langs->trans("DateDue").'</td>';
-			print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
-			print '<td align="right">'.$langs->trans("Paid").'</td>';
-			print '<td align="center" width="16">&nbsp;</td>';
+			print '<th>'.$langs->trans("ContributionsToPay").($num?' <a href="'.DOL_URL_ROOT.'/compta/sociales/index.php?status=0"><span class="badge">'.$num.'</span></a>':'').'</th>';
+			print '<th align="center">'.$langs->trans("DateDue").'</th>';
+			print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
+			print '<th align="right">'.$langs->trans("Paid").'</th>';
+			print '<th align="center" width="16">&nbsp;</th>';
 			print '</tr>';
 			if ($num)
 			{
@@ -667,11 +667,11 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
 			$i = 0;
 			print '<table class="noborder" width="100%">';
 			print "<tr class=\"liste_titre\">";
-			print '<td colspan="2">'.$langs->trans("OrdersDeliveredToBill").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=3&amp;billed=0"><span class="badge">'.$num.'</span></a></td>';
-			if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>';
-			print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
-			print '<td align="right">'.$langs->trans("ToBill").'</td>';
-			print '<td align="center" width="16">&nbsp;</td>';
+			print '<th colspan="2">'.$langs->trans("OrdersDeliveredToBill").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=3&amp;billed=0"><span class="badge">'.$num.'</span></a></th>';
+			if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th align="right">'.$langs->trans("AmountHT").'</th>';
+			print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
+			print '<th align="right">'.$langs->trans("ToBill").'</th>';
+			print '<th align="center" width="16">&nbsp;</th>';
 			print '</tr>';
 			$tot_ht=$tot_ttc=$tot_tobill=0;
 			$societestatic = new Societe($db);
@@ -769,12 +769,12 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 		$i = 0;
 
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BillsCustomersUnpaid",$num).' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status=1"><span class="badge">'.$num.'</span></a></td>';
-		print '<td align="right">'.$langs->trans("DateDue").'</td>';
-		if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>';
-		print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
-		print '<td align="right">'.$langs->trans("Received").'</td>';
-		print '<td width="16">&nbsp;</td>';
+		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BillsCustomersUnpaid",$num).' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status=1"><span class="badge">'.$num.'</span></a></th>';
+		print '<th align="right">'.$langs->trans("DateDue").'</th>';
+		if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th align="right">'.$langs->trans("AmountHT").'</th>';
+		print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
+		print '<th align="right">'.$langs->trans("Received").'</th>';
+		print '<th width="16">&nbsp;</th>';
 		print '</tr>';
 		if ($num)
 		{
@@ -891,12 +891,12 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 		$num = $db->num_rows($resql);
 
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BillsSuppliersUnpaid",$num).' <a href="'.DOL_URL_ROOT.'/fourn/facture/impayees.php"><span class="badge">'.$num.'</span></a></td>';
-		print '<td align="right">'.$langs->trans("DateDue").'</td>';
-		if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>';
-		print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
-		print '<td align="right">'.$langs->trans("Paid").'</td>';
-		print '<td width="16">&nbsp;</td>';
+		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BillsSuppliersUnpaid",$num).' <a href="'.DOL_URL_ROOT.'/fourn/facture/impayees.php"><span class="badge">'.$num.'</span></a></th>';
+		print '<th align="right">'.$langs->trans("DateDue").'</th>';
+		if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th align="right">'.$langs->trans("AmountHT").'</th>';
+		print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
+		print '<th align="right">'.$langs->trans("Paid").'</th>';
+		print '<th width="16">&nbsp;</th>';
 		print "</tr>\n";
 		$societestatic = new Societe($db);
 		if ($num)
@@ -963,7 +963,7 @@ $resql = 0;
 if ($resql)
 {
 	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("TasksToDo").'</td>';
+	print '<tr class="liste_titre"><thcolspan="2">'.$langs->trans("TasksToDo").'</th>';
 	print "</tr>\n";
 	$var = true;
 	$i = 0;
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 887868fb594..bba49827104 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -67,7 +67,7 @@ $resql = $db->query($sql);
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print '<td colspan="2">'.$langs->trans("BankChecks")."</td>\n";
+print '<th colspan="2">'.$langs->trans("BankChecks")."</th>\n";
 print "</tr>\n";
 
 if ($resql)
@@ -111,12 +111,12 @@ if ($resql)
 {
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("LastCheckReceiptShort",$max).'</td>';
-	print '<td>'.$langs->trans("Date")."</td>";
-	print '<td>'.$langs->trans("Account").'</td>';
-	print '<td align="right">'.$langs->trans("NbOfCheques").'</td>';
-	print '<td align="right">'.$langs->trans("Amount").'</td>';
-	print '<td align="right">'.$langs->trans("Status").'</td>';
+	print '<th>'.$langs->trans("LastCheckReceiptShort",$max).'</th>';
+	print '<th>'.$langs->trans("Date")."</th>";
+	print '<th>'.$langs->trans("Account").'</th>';
+	print '<th align="right">'.$langs->trans("NbOfCheques").'</th>';
+	print '<th align="right">'.$langs->trans("Amount").'</th>';
+	print '<th align="right">'.$langs->trans("Status").'</th>';
 	print "</tr>\n";
 
 	$var=true;
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 9e766e937e2..440af1cdbaf 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -74,7 +74,7 @@ $bprev = new BonPrelevement($db);
 $var=true;
 
 print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").'</td></tr>';
+print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
 $var=!$var;
 print '<tr '.$bc[$var].'><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>';
 print '<td align="right">';
@@ -114,7 +114,7 @@ if ($resql)
 
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print '<td colspan="5">'.$langs->trans("InvoiceWaitingWithdraw").' ('.$num.')</td></tr>';
+    print '<th colspan="5">'.$langs->trans("InvoiceWaitingWithdraw").' ('.$num.')</th></tr>';
     if ($num)
     {
         $var = True;
@@ -188,10 +188,10 @@ if ($result)
 
     print"\n<!-- debut table -->\n";
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("LastWithdrawalReceipt",$limit).'</td>';
-    print '<td>'.$langs->trans("Date").'</td>';
-    print '<td align="right">'.$langs->trans("Amount").'</td>';
-    print '<td align="right">'.$langs->trans("Status").'</td>';
+    print '<tr class="liste_titre"><th>'.$langs->trans("LastWithdrawalReceipt",$limit).'</th>';
+    print '<th>'.$langs->trans("Date").'</th>';
+    print '<th align="right">'.$langs->trans("Amount").'</th>';
+    print '<th align="right">'.$langs->trans("Status").'</th>';
     print '</tr>';
 
     while ($i < min($num,$limit))
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index b1d99c60d20..9ec924254a9 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -180,7 +180,7 @@ else
 
 
 print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Services").'</td></tr>'."\n";
+print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Services").'</th></tr>'."\n";
 $var=true;
 $listofstatus=array(0,4,4,5); $bool=false;
 foreach($listofstatus as $status)
@@ -248,7 +248,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("DraftContracts").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>';
+		print '<th colspan="3">'.$langs->trans("DraftContracts").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
 		if ($num)
 		{
 			$companystatic=new Societe($db);
@@ -324,10 +324,10 @@ if ($result)
 
 	print '<table class="noborder" width="100%">';
 
-	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("LastContracts",5).'</td>';
-	print '<td align="center">'.$langs->trans("DateModification").'</td>';
-	//print '<td align="left">'.$langs->trans("Status").'</td>';
-	print '<td align="center" width="80" colspan="4">'.$langs->trans("Services").'</td>';
+	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastContracts",5).'</th>';
+	print '<th align="center">'.$langs->trans("DateModification").'</th>';
+	//print '<th align="left">'.$langs->trans("Status").'</th>';
+	print '<th align="center" width="80" colspan="4">'.$langs->trans("Services").'</th>';
 	print "</tr>\n";
 
 	$var=True;
@@ -394,7 +394,7 @@ if ($resql)
 
 	print '<table class="noborder" width="100%">';
 
-	print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("LastModifiedServices",$max).'</td>';
+	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("LastModifiedServices",$max).'</th>';
 	print "</tr>\n";
 
 	$var=True;
@@ -475,7 +475,7 @@ if ($resql)
 
 	print '<table class="noborder" width="100%">';
 
-	print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("NotActivatedServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=0"><span class="badge">'.$num.'</span></a></td>';
+	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("NotActivatedServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=0"><span class="badge">'.$num.'</span></a></th>';
 	print "</tr>\n";
 
 	$var=True;
@@ -556,7 +556,7 @@ if ($resql)
 
 	print '<table class="noborder" width="100%">';
 
-	print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></td>';
+	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></th>';
 	print "</tr>\n";
 
 	$var=True;
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 973738fec11..c406ada6fa5 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -180,9 +180,6 @@ class box_actions extends ModeleBoxes
 			$actioncejour=false;
 			$contents=$this->info_box_contents;
 			$nblines=count($contents);
-			$bcx=array();
-			$bcx[0] = 'class="box_pair"';
-			$bcx[1] = 'class="box_impair"';
 			if ($contents[0][0]['text'] != $langs->trans("NoActionsToDo"))
 			{
 				$out.= '<div id="dialogboxaction" title="'.$nblines." ".$langs->trans("ActionsToDo").'">';
@@ -204,7 +201,7 @@ class box_actions extends ModeleBoxes
 						$urlsoc=$contents[$line][3]['url'];
 						$dateligne=$contents[$line][4]['text'];
 						$percentage=$contents[$line][5]['text'];
-						$out.= '<tr '.$bcx[$var].'>';
+						$out.= '<tr class="oddeven">';
 						$out.= '<td align=center>';
 						$out.= img_object("",$logo);
 						$out.= '</td>';
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 0f754682925..9a093cff927 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -206,9 +206,6 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
         require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
 
 		$MAXLENGTHBOX=60;   // Mettre 0 pour pas de limite
-		$bcx = array();
-		$bcx[0] = 'class="box_pair"';
-		$bcx[1] = 'class="box_impair"';
 		$var = false;
 
         $cachetime = 900;   // 900 : 15mn
@@ -284,7 +281,7 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
 
                         // TR
                         if (isset($contents[$i][0]['tr'])) $out.= '<tr valign="top" '.$contents[$i][0]['tr'].'>';
-                        else $out.= '<tr valign="top" '.$bcx[$var].'>';
+                        else $out.= '<tr class="oddeven">';
 
                         // Loop on each TD
                         $nbcolthisline=count($contents[$i]);
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 09f89ba0c3f..91c5d24f36c 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -238,8 +238,8 @@ function show_array_actions_to_do($max=5)
 	    $num = $db->num_rows($resql);
 
 	    print '<table class="noborder" width="100%">';
-	    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("LastActionsToDo",$max).'</td>';
-		print '<td colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=todo">'.$langs->trans("FullList").'</a>';
+	    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo",$max).'</th>';
+		print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=todo">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 
 		$var = true;
@@ -335,8 +335,8 @@ function show_array_last_actions_done($max=5)
 		$num = $db->num_rows($resql);
 
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("LastDoneTasks",$max).'</td>';
-		print '<td colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=done">'.$langs->trans("FullList").'</a>';
+		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks",$max).'</th>';
+		print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=done">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 		$var = true;
 		$i = 0;
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index daf82d85bbc..de4d84529fe 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -112,7 +112,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
 
 print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre">';
-print '<td colspan="4">'.$langs->trans("Statistics").'</td>';
+print '<th colspan="4">'.$langs->trans("Statistics").'</th>';
 print "</tr>\n";
 
 $listofstatus=array(0,1,-1,2);
@@ -182,7 +182,7 @@ if ($resql)
 {
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print '<td colspan="5">'.$langs->trans("LastModifiedDonations",$max).'</td></tr>';
+    print '<th colspan="5">'.$langs->trans("LastModifiedDonations",$max).'</th></tr>';
 
     $num = $db->num_rows($resql);
     if ($num)
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index e9bfa8a484c..17f349348ff 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -88,7 +88,7 @@ if ($resql)
 	{
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("SendingsToValidate").'</td></tr>';
+		print '<th colspan="3">'.$langs->trans("SendingsToValidate").'</th></tr>';
 		$i = 0;
 		$var = True;
 		while ($i < $num)
@@ -141,7 +141,7 @@ if ($resql)
 		$i = 0;
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("OrdersToProcess").'</td></tr>';
+		print '<th colspan="3">'.$langs->trans("OrdersToProcess").'</th></tr>';
 		$var = True;
 		while ($i < $num)
 		{
@@ -203,7 +203,7 @@ if ( $resql )
 		$i = 0;
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("OrdersInProcess").'</td></tr>';
+		print '<th colspan="3">'.$langs->trans("OrdersInProcess").'</th></tr>';
 		$var = True;
 		while ($i < $num)
 		{
@@ -264,7 +264,7 @@ if ($resql)
 		$i = 0;
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("LastSendings",$num).'</td></tr>';
+		print '<th colspan="3">'.$langs->trans("LastSendings",$num).'</th></tr>';
 		$var = True;
 		while ($i < $num)
 		{
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 2b317a0b751..3f37be8fb8d 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -112,7 +112,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre">';
-print '<td colspan="4">'.$langs->trans("Statistics").'</td>';
+print '<th colspan="4">'.$langs->trans("Statistics").'</th>';
 print "</tr>\n";
 
 $listoftype=$tripandexpense_static->listOfTypes();
@@ -174,11 +174,11 @@ if ($result)
 
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print '<td colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</td>';
-    print '<td align="right">'.$langs->trans("AmountHT").'</td>';
-    print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
-    print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
-    print '<td>&nbsp;</td>';
+    print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</th>';
+    print '<th align="right">'.$langs->trans("AmountHT").'</th>';
+    print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
+    print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
+    print '<th>&nbsp;</th>';
     print '</tr>';
     if ($num)
     {
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index f1592b1e13b..59f94df5f7b 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -116,7 +116,7 @@ if ($resql)
     }
     $db->free($resql);
     print '<table class="noborder nohover" width="100%">';
-    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</td></tr>'."\n";
+    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</th></tr>'."\n";
     $listofstatus=array(0,1,2);
     $bool=false;
     foreach ($listofstatus as $status)
@@ -181,7 +181,7 @@ if (! empty($conf->ficheinter->enabled))
 	{
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="2">'.$langs->trans("DraftFichinter").'</td></tr>';
+		print '<th colspan="2">'.$langs->trans("DraftFichinter").'</th></tr>';
 		$langs->load("fichinter");
 		$num = $db->num_rows($resql);
 		if ($num)
@@ -231,7 +231,7 @@ if ($resql)
 {
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td colspan="4">'.$langs->trans("LastModifiedInterventions",$max).'</td></tr>';
+	print '<th colspan="4">'.$langs->trans("LastModifiedInterventions",$max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
 	if ($num)
@@ -303,7 +303,7 @@ if (! empty($conf->ficheinter->enabled))
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("FichinterToProcess").' <a href="'.DOL_URL_ROOT.'/fichinter/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>';
+		print '<th colspan="3">'.$langs->trans("FichinterToProcess").' <a href="'.DOL_URL_ROOT.'/fichinter/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></th></tr>';
 
 		if ($num)
 		{
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 8ad4b9f4857..be27733294f 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -112,7 +112,7 @@ if ($resql)
 	$db->free($resql);
 
 	print '<table class="noborder nohover" width="100%">';
-	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("SuppliersOrders").'</td></tr>';
+	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("SuppliersOrders").'</th></tr>';
 	print "</tr>\n";
 	foreach (array(0,1,2,3,4,5,6) as $statut)
 	{
@@ -169,8 +169,8 @@ if ($resql)
 
 	print '<table class="liste" width="100%">';
 
-	print '<tr class="liste_titre"><td>'.$langs->trans("Status").'</td>';
-	print '<td align="right">'.$langs->trans("Nb").'</td>';
+	print '<tr class="liste_titre"><th>'.$langs->trans("Status").'</th>';
+	print '<th align="right">'.$langs->trans("Nb").'</th>';
 	print "</tr>\n";
 	$var=True;
 
@@ -216,7 +216,7 @@ if (! empty($conf->fournisseur->enabled))
 	{
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="2">'.$langs->trans("DraftOrders").'</td></tr>';
+		print '<th colspan="2">'.$langs->trans("DraftOrders").'</th></tr>';
 		$langs->load("orders");
 		$num = $db->num_rows($resql);
 		if ($num)
@@ -261,7 +261,7 @@ if ($resql)
 	$i = 0;
 
 	print '<table class="liste" width="100%">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("UserWithApproveOrderGrant").'</td>';
+	print '<tr class="liste_titre"><th>'.$langs->trans("UserWithApproveOrderGrant").'</th>';
 	print "</tr>\n";
 	$var=True;
 
@@ -315,7 +315,7 @@ if ($resql)
 {
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td colspan="4">'.$langs->trans("LastModifiedOrders",$max).'</td></tr>';
+	print '<th colspan="4">'.$langs->trans("LastModifiedOrders",$max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
 	if ($num)
@@ -385,7 +385,7 @@ $num = $db->num_rows($resql);
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print '<td colspan="3">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1">('.$num.')</a></td></tr>';
+print '<th colspan="3">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1">('.$num.')</a></th></tr>';
 
 if ($num)
 {
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index e8038497e2c..b0e2bf58d79 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -121,7 +121,7 @@ if (! empty($conf->holiday->enabled))
 	$user_id = $user->id;
 
     print '<table class="noborder nohover" width="100%">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Holidays").'</td></tr>';
+    print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Holidays").'</th></tr>';
     print "<tr ".$bc[0].">";
     print '<td colspan="3">';
 
@@ -179,11 +179,11 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
 
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print '<td colspan="3">'.$langs->trans("BoxTitleLastLeaveRequests",min($max,$num)).'</td>';
-        print '<td>'.$langs->trans("from").'</td>';
-        print '<td>'.$langs->trans("to").'</td>';
-        print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
-        print '<td width="16">&nbsp;</td>';
+        print '<th colspan="3">'.$langs->trans("BoxTitleLastLeaveRequests",min($max,$num)).'</th>';
+        print '<th>'.$langs->trans("from").'</th>';
+        print '<th>'.$langs->trans("to").'</th>';
+        print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
+        print '<th width="16">&nbsp;</th>';
         print '</tr>';
         if ($num)
         {
@@ -250,10 +250,10 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</td>';
-		print '<td align="right">'.$langs->trans("FeesKilometersOrAmout").'</td>';
-		print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
-		print '<td width="16">&nbsp;</td>';
+		print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</th>';
+		print '<th align="right">'.$langs->trans("FeesKilometersOrAmout").'</th>';
+		print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
+		print '<th width="16">&nbsp;</th>';
 		print '</tr>';
 		if ($num)
 		{
@@ -317,10 +317,10 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</td>';
-		print '<td align="right">'.$langs->trans("TotalTTC").'</td>';
-		print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
-		print '<td width="16">&nbsp;</td>';
+		print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</th>';
+		print '<th align="right">'.$langs->trans("TotalTTC").'</th>';
+		print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
+		print '<th width="16">&nbsp;</th>';
 		print '</tr>';
 		if ($num)
 		{
diff --git a/htdocs/index.php b/htdocs/index.php
index eab8844b960..4ac80fbf57c 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -535,7 +535,7 @@ $boxwork.='</tr>'."\n";
 if ($showweather)
 {
     $var=!$var;
-    $boxwork.='<tr '.$bc[$var].'>';
+    $boxwork.='<tr class="nohover">';
     $boxwork.='<td colspan="4" class="nohover hideonsmartphone center valignmiddle">';
     //$boxwork.=$langs->trans("Meteo");
     //$boxwork.='</td><td colspan="2" class="nohover center">';
@@ -556,23 +556,26 @@ if ($showweather)
 
 
 // Show dashboard
+$nbworkboardempty=0;
 foreach($valid_dashboardlines as $board)
 {
+    if (empty($boad->nbtodo)) $nbworkboardempty++;
+    
     $var=!$var;
-    $boxwork.= '<tr '.$bc[$var].'><td class="nowrap">'.$board->img.' &nbsp; '.$board->label.'</td>';
-    $boxwork.= '<td align="right"><a class="dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator">'.$board->nbtodo.'</span></a></td>';
-    $boxwork.= '<td align="right">';
+    $boxwork .= '<tr class="oddeven'.($board->nbtodo?'':' workboardempty').'"><td class="nowrap">'.$board->img.' &nbsp; '.$board->label.'</td>';
+    $boxwork .= '<td align="right"><a class="dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator">'.$board->nbtodo.'</span></a></td>';
+    $boxwork .= '<td align="right">';
     $textlate = $langs->trans("NActionsLate",$board->nbtodolate);
     $textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
-    $boxwork.= '<a title="'.dol_escape_htmltag($textlate).'" class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
-    $boxwork.= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
-    $boxwork.= $board->nbtodolate;
-    $boxwork.= '</span>';
-    $boxwork.= '</a>';
-    $boxwork.='</td>';
-    $boxwork.='<td>';
-    if ($board->nbtodolate > 0) $boxwork.=img_picto($textlate, "warning", 'class="valignmiddle"').' ';
-    $boxwork.='</td>';
+    $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
+    $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
+    $boxwork .= $board->nbtodolate;
+    $boxwork .= '</span>';
+    $boxwork .= '</a>';
+    $boxwork .='</td>';
+    $boxwork .='<td>';
+    if ($board->nbtodolate > 0) $boxwork .=img_picto($textlate, "warning", 'class="valignmiddle"').' ';
+    $boxwork .='</td>';
     /*print '<td class="nowrap" align="right">';
     print ' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')';
     print '</td>';*/
@@ -589,8 +592,8 @@ foreach($valid_dashboardlines as $board)
         $boxwork.='</td>';
         $showweather=0;
     }*/
-    $boxwork.='</tr>';
-    $boxwork.="\n";
+    $boxwork .='</tr>';
+    $boxwork .="\n";
 }
 
 $boxwork.='</table>';   // End table array of working board
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 84991a76db2..355e0d2757f 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -127,7 +127,7 @@ while ($objp = $db->fetch_object($result))
 }
 
 print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").'</td></tr>';
+print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
 if (! empty($conf->product->enabled))
 {
 	$statProducts = "<tr ".$bc[0].">";
@@ -268,7 +268,7 @@ if ($result)
 		$colnb=5;
 		if (empty($conf->global->PRODUIT_MULTIPRICES)) $colnb++;
 
-		print '<tr class="liste_titre"><td colspan="'.$colnb.'">'.$transRecordedType.'</td></tr>';
+		print '<tr class="liste_titre"><th colspan="'.$colnb.'">'.$transRecordedType.'</th></tr>';
 
 		$var=True;
 
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 7349b48d1c9..b2ecaf3afd1 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -77,7 +77,7 @@ if ($result)
     $i = 0;
 
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Warehouses").'</td></tr>';
+    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Warehouses").'</th></tr>';
 
     if ($num)
     {
@@ -132,16 +132,16 @@ if ($resql)
 
 	print '<table class="noborder" width="100%">';
 	print "<tr class=\"liste_titre\">";
-	print '<td>'.$langs->trans("LastMovements",min($num,$max)).'</td>';
-	print '<td>'.$langs->trans("Product").'</td>';
+	print '<th>'.$langs->trans("LastMovements",min($num,$max)).'</th>';
+	print '<th>'.$langs->trans("Product").'</th>';
 	if (! empty($conf->productbatch->enabled))
 	{
-		print '<td>'.$langs->trans("Batch").'</td>';
-		print '<td>'.$langs->trans("EatByDate").'</td>';
-		print '<td>'.$langs->trans("SellByDate").'</td>';
+		print '<th>'.$langs->trans("Batch").'</th>';
+		print '<th>'.$langs->trans("EatByDate").'</th>';
+		print '<th>'.$langs->trans("SellByDate").'</th>';
 	}
-	print '<td>'.$langs->trans("Warehouse").'</td>';
-	print '<td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/product/stock/mouvement.php">'.$langs->trans("FullList").'</a></td>';
+	print '<th>'.$langs->trans("Warehouse").'</th>';
+	print '<th align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/product/stock/mouvement.php">'.$langs->trans("FullList").'</a></th>';
 	print "</tr>\n";
 
 	$var=True;
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 0480196ccf9..668e96d2958 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -50,7 +50,7 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 	    $ponderated_opp_amount = $ponderated_opp_amount / 100;
 	    
 	    print '<table class="noborder nohover" width="100%">';
-	    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").'</td></tr>'."\n";
+	    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").'</th></tr>'."\n";
 	    $var=true;
 	    $listofstatus=array_keys($listofoppstatus);
 	    foreach ($listofstatus as $status)
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index eec34a02987..f6ca9aaee45 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -117,7 +117,7 @@ if ($resql)
     $db->free($resql);
 
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CommRequests").'</td></tr>'."\n";
+    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CommRequests").'</th></tr>'."\n";
     $var=true;
     $listofstatus=array(0,1,2,3,4);
     foreach ($listofstatus as $status)
@@ -169,7 +169,7 @@ if (! empty($conf->supplier_proposal->enabled))
 	{
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="2">'.$langs->trans("DraftRequests").'</td></tr>';
+		print '<th colspan="2">'.$langs->trans("DraftRequests").'</th></tr>';
 		$langs->load("supplier_proposal");
 		$num = $db->num_rows($resql);
 		if ($num)
@@ -227,7 +227,7 @@ if ($resql)
 {
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td colspan="4">'.$langs->trans("LastModifiedRequests",$max).'</td></tr>';
+	print '<th colspan="4">'.$langs->trans("LastModifiedRequests",$max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
 	if ($num)
@@ -311,7 +311,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
 			$var=true;
 
 			print '<table class="noborder" width="100%">';
-			print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("RequestsOpened").' <a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>';
+			print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("RequestsOpened").' <a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></th></tr>';
 
 			$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
 			while ($i < $nbofloop)
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a5ae098c545..8a4e636cee0 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2368,23 +2368,23 @@ div.liste_titre_bydiv .divsearchfield {
 }
 
 tr.box_titre .nobordernopadding td {
-	padding: 0px ! important;
+	padding: 0 ! important;
 }
 table.nobordernopadding {
 	border-collapse: collapse !important;
-	border: 0px;
+	border: 0;
 }
 table.nobordernopadding tr {
-	border: 0px !important;
-	padding: 0px 0px !important;
+	border: 0 !important;
+	padding: 0 0 !important;
 }
 table.nobordernopadding tr td {
-	border: 0px;
+	border: 0 !important;
 	padding: 0 3px 0 0;
 }
 table.border tr td table.nobordernopadding tr td {
-	padding-top: 0px;
-	padding-bottom: 0px;
+	padding-top: 0;
+	padding-bottom: 0;
 }
 td.borderright {
     border: none;	/* to erase value for table.nobordernopadding td */
@@ -2559,72 +2559,51 @@ div.pagination li.paginationafterarrows {
 	margin-top: 9px;
 }
 
-/* Prepare to remove class pair - impair
-.noborder > tbody > tr:nth-child(even) td {
-	background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	font-family: <?php print $fontlist ?>;
-	border: 0px;
-	margin-bottom: 1px;
-	color: #202020;
-	min-height: 18px;
-}
 
-.noborder > tbody > tr:nth-child(odd) td {
-	background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	font-family: <?php print $fontlist ?>;
-	border: 0px;
-	margin-bottom: 1px;
-	color: #202020;
-}
-*/
 
 /* Set the color for hover lines */
-.odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover, table.dataTable tr.even:hover, table.dataTable tr.odd:hover, .box_pair:hover, .box_impair:hover
+.oddeven:hover, .odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover, table.dataTable tr.even:hover, table.dataTable tr.odd:hover
 {
 <?php if ($colorbacklinepairhover) { ?>
 	background: rgb(<?php echo $colorbacklinepairhover; ?>) !important;
 <?php } ?>
 }
 
-.odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover,  tr.box_pair td.nohover, tr.box_impair td.nohover
+.oddeven, .odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
 {
 	font-family: <?php print $fontlist ?>;
 	margin-bottom: 1px;
 	color: #202020;
-	min-height: 18px; /* seems to not be used */
-
+}
+.odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
+{
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
 #GanttChartDIV {
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
 
-.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
+.oddeven, .even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
 	font-family: <?php print $fontlist ?>;
 	margin-bottom: 1px;
 	color: #202020;
-
+}
+.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>;
 }
 
-table.dataTable tr.odd {
+table.dataTable tr.odd, table.dataTable tr.oddeven {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
 
 /* For no hover style */
-table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td {
+td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
+	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
 }
 tr.nohoverpair td {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
+	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
 
 table.dataTable td {
@@ -2699,6 +2678,10 @@ tr.liste_titre th, tr.liste_titre td, th.liste_titre
 {
 	border-bottom: 1px solid #<?php echo ($colorbacktitle1 == '255,255,255'?'BBBBBB':'FDFFFF'); ?>;
 }
+/* TODO Once title line is moved under title search, make border bottom of all th black and force to whit when it's first tr */ 
+tr:first-child th.liste_titre {
+    border-bottom: 1px solid #FFF ! important;
+}
 tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div
 {
     font-family: <?php print $fontlist ?>;
@@ -2723,10 +2706,11 @@ tr.liste_titre_topborder td {
 .liste_titre td a.notasortlink:hover {
 	background: transparent;
 }
-tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd {				/* For last line of table headers only */
+tr.liste_titre:last-child th.liste_titre, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd {				/* For last line of table headers only */
     border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
 }
 
+
 tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre_sel, form.liste_titre_sel div
 {
     font-family: <?php print $fontlist ?>;
@@ -2796,6 +2780,32 @@ div.tabBar .noborder {
 }
 
 
+/* Prepare to remove class pair - impair */
+
+.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) { 
+	background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+}
+.noborder > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre) {
+	border-bottom: 1px solid #ddd;
+}
+
+.noborder > tbody > tr:nth-child(odd):not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(.liste_titre) {
+	background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+}
+.noborder > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre) {
+	border-bottom: 1px solid #ddd;
+}
+
+
+
 /*
  *  Boxes
  */
@@ -2884,29 +2894,6 @@ tr.box_titre td.boxclose {
 	width: 30px;
 }
 
-tr.box_impair {
-    background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-    background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-    background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-    background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-    background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-
-    font-family: <?php print $fontlist ?>;
-}
-
-
-tr.box_pair {
-    font-family: <?php print $fontlist ?>;
-
-	background-color: #f9f9f9;
-}
-
-tr.box_pair td, tr.box_impair td {
-	/* padding: 4px; */
-}
-tr.box_pair:not(:last-child) td, tr.box_impair:not(:last-child) td {
-    border-bottom: 1px solid #ddd;
-}
 .noborderbottom {
 	border-bottom: none !important;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 625251a6bb0..6fad30ed46b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2290,19 +2290,19 @@ div.liste_titre_bydiv .divsearchfield {
 
 table.nobordernopadding {
 	border-collapse: collapse !important;
-	border: 0px;
+	border: 0;
 }
 table.nobordernopadding tr {
-	border: 0px !important;
-	padding: 0px 0px !important;
+	border: 0 !important;
+	padding: 0 0 !important;
 }
 table.nobordernopadding tr td {
-	border: 0px;
+	border: 0 !important;
 	padding: 0 3px 0 0;
 }
 table.border tr td table.nobordernopadding tr td {
-	padding-top: 0px;
-	padding-bottom: 0px;
+	padding-top: 0;
+	padding-bottom: 0;
 }
 td.borderright {
     border: none;	/* to erase value for table.nobordernopadding td */
@@ -2475,44 +2475,48 @@ div.pagination li.paginationafterarrows {
 */
 
 /* Set the color for hover lines */
-.odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover, table.dataTable tr.even:hover, table.dataTable tr.odd:hover, .box_pair:hover, .box_impair:hover
+.oddeven:hover, .odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover, table.dataTable tr.even:hover, table.dataTable tr.odd:hover
 {
 <?php if ($colorbacklinepairhover) { ?>
 	background: rgb(<?php echo $colorbacklinepairhover; ?>) !important;
 <?php } ?>
 }
 
-.odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover,  tr.box_pair td.nohover, tr.box_impair td.nohover
+.oddeven, .odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
 {
 	font-family: <?php print $fontlist ?>;
 	border: 0px;
 	margin-bottom: 1px;
 	color: #202020;
-	min-height: 18px; /* seems to not be used */
-
+}
+.odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
+{
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
 #GanttChartDIV {
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
 
-.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
+.oddeven, .even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
 	font-family: <?php print $fontlist ?>;
 	margin-bottom: 1px;
 	color: #202020;
-
+}
+.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>;
 }
-table.dataTable tr.odd {
+table.dataTable tr.odd, table.dataTable tr.oddeven {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
 
 /* For no hover style */
-table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td {
+td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
+	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
 }
 tr.nohoverpair td {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
+	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
 
 table.dataTable td {
@@ -2592,6 +2596,10 @@ tr.liste_titre th, tr.liste_titre td, th.liste_titre, form.liste_titre div, div.
 {
 	border-bottom: 1px solid #<?php echo ($colorbacktitle1 == '255,255,255'?'BBBBBB':'FDFFFF'); ?>;
 }
+/* TODO Once title line is moved under title search, make border bottom of all th black and force to whit when it's first tr */ 
+tr:first-child th.liste_titre {
+    border-bottom: 1px solid #FFF ! important;
+}
 tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div, div.liste_titre
 {
     font-family: <?php print $fontlist ?>;
@@ -2616,7 +2624,7 @@ tr.liste_titre_topborder td {
 .liste_titre td a.notasortlink:hover {
 	background: transparent;
 }
-tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel {		/* For last line of table headers only */
+tr.liste_titre:last-child th.liste_titre, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd {				/* For last line of table headers only */
     border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
 }
 
@@ -2694,6 +2702,31 @@ div .tdtop {
 }
 
 
+/* Prepare to remove class pair - impair */
+
+.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) { 
+	background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+}
+.noborder > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre) {
+	border-bottom: 1px solid #ddd;
+}
+
+.noborder > tbody > tr:nth-child(odd):not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(.liste_titre) {
+	background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+}
+.noborder > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre) {
+	border-bottom: 1px solid #ddd;
+}
+
+
 /*
  *  Boxes
  */
@@ -2784,27 +2817,6 @@ tr.box_titre td.boxclose {
 	width: 30px;
 }
 
-tr.box_impair {
-    background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-    background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-    background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-    background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-    background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-    font-family: <?php print $fontlist ?>;
-}
-
-tr.box_pair {
-    font-family: <?php print $fontlist ?>;
-
-	background-color: #f9f9f9;
-}
-
-tr.box_pair td, tr.box_impair td {
-	padding: 4px;
-}
-tr.box_pair:not(:last-child) td, tr.box_impair:not(:last-child) td {
-    border-bottom: 1px solid #eee;
-}
 .noborderbottom {
 	border-bottom: none !important;
 }

From 76e55fcdb1ec51c7d12623960aa91aa953b15802 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Wed, 8 Mar 2017 09:06:38 +0100
Subject: [PATCH 0352/1163] NEW :hidden Easter egg to display commitstrip strip
 on login page

---
 htdocs/core/tpl/login.tpl.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 3772b44c9fc..ba501e802dd 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -239,6 +239,18 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
 	</div></div>
 <?php
 }
+if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
+	if (substr($langs->defaultlang,0,2)=='fr') {
+		$xml = simplexml_load_file("http://www.commitstrip.com/fr/feed/");
+	} else {
+		$xml = simplexml_load_file("http://www.commitstrip.com/en/feed/");
+	}
+
+    $little = $xml->channel->item[0]->children('content',true);
+
+    print $little->encoded;
+}
+
 ?>
 
 <?php if ($main_home)

From 4a7e3fb3872d0e85613227f5d1b454cae5c5a0a8 Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Wed, 8 Mar 2017 11:34:21 +0100
Subject: [PATCH 0353/1163] NEW odt usergroup

---
 htdocs/admin/usergroup.php                    | 316 ++++++++++++++++++
 .../core/class/commondocgenerator.class.php   |  16 +-
 htdocs/core/class/conf.class.php              |   5 +
 htdocs/core/class/html.formfile.class.php     |   6 +-
 htdocs/core/lib/usergroups.lib.php            |   5 +
 .../core/modules/user/modules_user.class.php  |  28 --
 .../usergroup/modules_usergroup.class.php     |  62 ++++
 htdocs/install/mysql/tables/llx_user.sql      |   1 +
 htdocs/install/mysql/tables/llx_usergroup.sql |   5 +-
 htdocs/user/class/usergroup.class.php         |  34 ++
 htdocs/user/group/card.php                    |  40 ++-
 11 files changed, 475 insertions(+), 43 deletions(-)
 create mode 100644 htdocs/admin/usergroup.php
 create mode 100644 htdocs/core/modules/usergroup/modules_usergroup.class.php

diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
new file mode 100644
index 00000000000..72365726d25
--- /dev/null
+++ b/htdocs/admin/usergroup.php
@@ -0,0 +1,316 @@
+<?php
+/* Copyright (C) 2003		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2009	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Sebastien Di Cintio		<sdicintio@ressource-toi.org>
+ * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
+ * Copyright (C) 2005-2011	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       htdocs/admin/usergroup.php
+ *		\ingroup    core
+ *		\brief      Page to setup usergroup module
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+$langs->load("admin");
+$langs->load("members");
+$langs->load("users");
+if (! $user->admin) accessforbidden();
+
+$extrafields = new ExtraFields($db);
+
+$action = GETPOST('action','alpha');
+$value = GETPOST('value','alpha');
+$type='group';
+
+/*
+ * Action
+ */
+
+// Activate a model
+
+// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
+if ($action == 'setModuleOptions')
+{
+	$post_size=count($_POST);
+
+	$db->begin();
+
+	for($i=0;$i < $post_size;$i++)
+    {
+    	if (array_key_exists('param'.$i,$_POST))
+    	{
+    		$param=GETPOST("param".$i,'alpha');
+    		$value=GETPOST("value".$i,'alpha');
+    		if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+	    	if (! $res > 0) $error++;
+    	}
+    }
+	if (! $error)
+    {
+        $db->commit();
+	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        $db->rollback();
+	    setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+elseif ($action == 'set_default')
+{
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+	$res = true;
+}
+
+elseif ($action == 'del_default')
+{
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+        if ($conf->global->USERGROUP_ADDON_PDF_ODT == "$value") dolibarr_del_const($db, 'USERGROUP_ADDON_PDF_ODT',$conf->entity);
+	}
+	$res = true;
+}
+
+// Set default model
+elseif ($action == 'setdoc')
+{
+	if (dolibarr_set_const($db, "USERGROUP_ADDON_PDF_ODT",$value,'chaine',0,'',$conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->USERGROUP_ADDON_PDF_ODT = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+	$res = true;
+}
+elseif (preg_match('/set_(.*)/',$action,$reg))
+{
+    $code=$reg[1];
+    if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]);
+        exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+}
+
+elseif (preg_match('/del_(.*)/',$action,$reg))
+{
+    $code=$reg[1];
+    if (dolibarr_del_const($db, $code, $conf->entity) > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]);
+        exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+}
+/*
+ * View
+ */
+
+$help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios';
+llxHeader('',$langs->trans("UsersSetup"),$help_url);
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
+
+
+$head=user_admin_prepare_head();
+
+dol_fiche_head($head,'usergroupcard', $langs->trans("MenuUsersAndGroups"), 0, 'user');
+
+
+$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+
+$form=new Form($db);
+
+// Defini tableau def des modeles
+$def = array();
+$sql = "SELECT nom";
+$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql.= " WHERE type = '".$type."'";
+$sql.= " AND entity = ".$conf->entity;
+$resql=$db->query($sql);
+if ($resql)
+{
+	$i = 0;
+	$num_rows=$db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
+}
+else
+{
+	dol_print_error($db);
+}
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
+print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
+print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+$var=true;
+foreach ($dirmodels as $reldir)
+{
+    foreach (array('','/doc') as $valdir)
+    {
+    	$dir = dol_buildpath($reldir."core/modules/usergroup".$valdir);
+        if (is_dir($dir))
+        {
+            $handle=opendir($dir);
+            if (is_resource($handle))
+            {
+                while (($file = readdir($handle))!==false)
+                {
+                    $filelist[]=$file;
+                }
+                closedir($handle);
+                arsort($filelist);
+
+                foreach($filelist as $file)
+                {
+                    if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
+                    {
+
+                    	if (file_exists($dir.'/'.$file))
+                    	{
+                    		$name = substr($file, 4, dol_strlen($file) -16);
+	                        $classname = substr($file, 0, dol_strlen($file) -12);
+
+	                        require_once $dir.'/'.$file;
+	                        $module = new $classname($db);
+
+	                        $modulequalified=1;
+	                        if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+
+	                        if ($modulequalified)
+	                        {
+	                            $var = !$var;
+	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print (empty($module->name)?$name:$module->name);
+	                            print "</td><td>\n";
+	                            if (method_exists($module,'info')) print $module->info($langs);
+	                            else print $module->description;
+	                            print '</td>';
+
+	                            // Active
+	                            if (in_array($name, $def))
+	                            {
+	                            	print '<td align="center">'."\n";
+	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&value='.$name.'">';
+	                            	print img_picto($langs->trans("Enabled"),'switch_on');
+	                            	print '</a>';
+	                            	print '</td>';
+	                            }
+	                            else
+	                            {
+	                                print '<td align="center">'."\n";
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+	                                print "</td>";
+	                            }
+
+	                            // Defaut
+	                            print '<td align="center">';
+	                            if ($conf->global->USERGROUP_ADDON_PDF == $name)
+	                            {
+	                                print img_picto($langs->trans("Default"),'on');
+	                            }
+	                            else
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+	                            }
+	                            print '</td>';
+
+	                           // Info
+		    					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+					    		$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+			                    if ($module->type == 'pdf')
+			                    {
+			                        $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+			                    }
+					    		$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					    		$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
+
+
+	                            print '<td align="center">';
+	                            print $form->textwithpicto('',$htmltooltip,1,0);
+	                            print '</td>';
+
+	                            // Preview
+	                            print '<td align="center">';
+	                            if ($module->type == 'pdf')
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'contract').'</a>';
+	                            }
+	                            else
+	                            {
+	                                print img_object($langs->trans("PreviewNotAvailable"),'generic');
+	                            }
+	                            print '</td>';
+
+	                            print "</tr>\n";
+	                        }
+                    	}
+                    }
+                }
+            }
+        }
+    }
+}
+
+print '</table>';
+print "<br>";
+
+dol_fiche_end();
+
+llxFooter();
+$db->close();
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 1d4cb508fb9..9c3bc5b131e 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -332,19 +332,17 @@ abstract class CommonDocGenerator
 		$array_other = array();
 		if(!empty($object)) {
 			foreach($object as $key => $value) {
-				if(!is_array($value) && !is_object($value)) {
-		    		$array_other['object_'.$key] = $value;
-				}
-				if(is_array($value) && $recursive){
-					if(!empty($value)) {
-						foreach($value as $key2 => $val) {
-							$array_other[$key][$key2] = $this->get_substitutionarray_each_var_object($val,$outputlangs,false);
-						}
+				if(!empty($value)) {
+					if(!is_array($value) && !is_object($value)) {
+			    		$array_other['object_'.$key] = $value;
+					}
+					if(is_array($value) && $recursive){
+						$array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value,$outputlangs,false);
 					}
 				}
 		    }
 	    }
-		return $array_other;
+	    return $array_other;
 	}
 
 
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 0bd28092bff..8a5172c182b 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -106,6 +106,7 @@ class Conf
 		$this->propal			= new stdClass();
 		$this->facture			= new stdClass();
 		$this->contrat			= new stdClass();
+		$this->usergroup		= new stdClass();
 		$this->adherent			= new stdClass();
 		$this->bank				= new stdClass();
 		$this->notification		= new stdClass();
@@ -309,6 +310,10 @@ class Conf
 		// For backward compatibility
 		$this->user->dir_output=$rootforuser."/users";
 		$this->user->dir_temp=$rootforuser."/users/temp";
+		
+		// UserGroup
+		$this->usergroup->dir_output=$rootforuser."/usergroups";
+		$this->usergroup->dir_temp=$rootforuser."/usergroups/temp";
 
 		// For propal storage
 		$this->propal->dir_output=$rootfordata."/propale";
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index f60faa84426..2dbbd9545db 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -420,13 +420,13 @@ class FormFile
                     $modellist=ModelePDFUser::liste_modeles($this->db);
                 }
             }
-            elseif ($modulepart == 'group')
+            elseif ($modulepart == 'usergroup')
             {
                 if (is_array($genallowed)) $modellist=$genallowed;
                 else
                 {
-                    include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_group.php';
-                    $modellist=ModelePDFProduct::liste_modeles($this->db);
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
+                    $modellist=ModelePDFUserGroup::liste_modeles($this->db);
                 }
             }
             elseif ($modulepart == 'project_task')
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index ed95bdc4023..117f7a1e86e 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -207,6 +207,11 @@ function user_admin_prepare_head()
     $head[$h][2] = 'card';
     $h++;
 
+    $head[$h][0] = DOL_URL_ROOT.'/admin/usergroup.php';
+    $head[$h][1] = $langs->trans("Group");
+    $head[$h][2] = 'usergroupcard';
+    $h++;
+
     $head[$h][0] = DOL_URL_ROOT.'/user/admin/user_extrafields.php';
     $head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
diff --git a/htdocs/core/modules/user/modules_user.class.php b/htdocs/core/modules/user/modules_user.class.php
index 43660da1adb..3e94ece9372 100644
--- a/htdocs/core/modules/user/modules_user.class.php
+++ b/htdocs/core/modules/user/modules_user.class.php
@@ -55,34 +55,6 @@ abstract class ModelePDFUser extends CommonDocGenerator
 		$type='user';
 		$liste=array();
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
-		return $liste;
-	}
-}
-
-/**
- *	Parent class to manage intervention document templates
- */
-abstract class ModelePDFUserGroup extends CommonDocGenerator
-{
-	var $error='';
-
-
-	/**
-	 *	Return list of active generation modules
-	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-	 */
-	static function liste_modeles($db,$maxfilenamelength=0)
-	{
-		global $conf;
-
-		$type='usergroup';
-		$liste=array();
-
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$liste=getListOfModels($db,$type,$maxfilenamelength);
 		return $liste;
diff --git a/htdocs/core/modules/usergroup/modules_usergroup.class.php b/htdocs/core/modules/usergroup/modules_usergroup.class.php
new file mode 100644
index 00000000000..f7d4778efe1
--- /dev/null
+++ b/htdocs/core/modules/usergroup/modules_usergroup.class.php
@@ -0,0 +1,62 @@
+<?php
+/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+
+/**
+ *	    \class      ModeleProductCode
+ *		\brief  	Parent class for product code generators
+ */
+ 
+/**
+ *  \file       htdocs/core/modules/contract/modules_contract.php
+ *  \ingroup    contract
+ *  \brief      File with parent class for generating contracts to PDF and File of class to manage contract numbering
+ */
+
+ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+ 
+/**
+ *	Parent class to manage intervention document templates
+ */
+abstract class ModelePDFUserGroup extends CommonDocGenerator
+{
+	var $error='';
+
+
+	/**
+	 *	Return list of active generation modules
+	 *
+     *  @param	DoliDB	$db     			Database handler
+     *  @param  integer	$maxfilenamelength  Max length of value to show
+     *  @return	array						List of templates
+	 */
+	static function liste_modeles($db,$maxfilenamelength=0)
+	{
+		global $conf;
+
+		$type='usergroup';
+		$liste=array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		return $liste;
+	}
+}
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index e334ae1f802..5530622ac1d 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -62,6 +62,7 @@ create table llx_user
   fk_member         integer,
   fk_user           integer,               -- Hierarchic parent
   note              text DEFAULT NULL,
+  model_pdf         varchar(255) DEFAULT NULL,
   datelastlogin     datetime,
   datepreviouslogin datetime,
   egroupware_id     integer,
diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql
index 156c6eda364..9afe72f3b24 100644
--- a/htdocs/install/mysql/tables/llx_usergroup.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup.sql
@@ -25,7 +25,8 @@ create table llx_usergroup
   entity        integer DEFAULT 1 NOT NULL,	-- multi company id
   datec         datetime,
   tms           timestamp,
-  note          text
+  note          text,
+  model_pdf     varchar(255) DEFAULT NULL,
 )ENGINE=innodb;
 
 -- 
@@ -35,4 +36,4 @@ create table llx_usergroup
 -- 1 : first company group
 -- 2 : second company group
 -- 3 : etc...
---
\ No newline at end of file
+--
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 50237b0ef61..96f2d3aa7bc 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -818,5 +818,39 @@ class UserGroup extends CommonObject
 		$this->datem=time();
 		$this->members=array($user->id);	// Members of this group is just me
 	}
+	
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 * 	@param	    string		$modele			Force model to use ('' to not force)
+	 * 	@param		Translate	$outputlangs	Object langs to use for output
+	 *  @param      int			$hidedetails    Hide details of lines
+	 *  @param      int			$hidedesc       Hide description
+	 *  @param      int			$hideref        Hide ref
+	 * 	@return     int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	{
+		global $conf,$user,$langs;
+
+		$langs->load("user");
+
+		// Positionne le modele sur le nom du modele a utiliser
+		if (! dol_strlen($modele))
+		{
+			if (! empty($conf->global->USERGROUP_ADDON_PDF))
+			{
+				$modele = $conf->global->USERGROUP_ADDON_PDF;
+			}
+			else
+			{
+				$modele = 'grass';
+			}
+		}
+
+		$modelpath = "core/modules/usergroup/doc/";
+
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
 }
 
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 716db97b911..cc496152f4f 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -28,6 +28,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 if(! empty($conf->multicompany->enabled)) dol_include_once('/multicompany/class/actions_multicompany.class.php');
 
 // Defini si peux lire/modifier utilisateurs et permisssions
@@ -220,6 +221,8 @@ llxHeader('',$langs->trans("GroupCard"));
 
 $form = new Form($db);
 $fuserstatic = new User($db);
+$form = new Form($db);
+$formfile = new FormFile($db);
 
 if ($action == 'create')
 {
@@ -495,6 +498,42 @@ else
             }
             print "</table>";
             print "<br>";
+					
+		    // Actions to build doc
+		    $upload_dir = $conf->usergroup->dir_output;
+		    $permissioncreate=$user->rights->user->user->creer;
+		    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+			
+			/*
+	         * Documents generes
+	         */
+	        $filename = dol_sanitizeFileName($object->ref);
+	        $filedir = $conf->usergroup->dir_output . "/" . dol_sanitizeFileName($object->ref);
+	        $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+	        $genallowed = $user->rights->user->user->creer;
+	        $delallowed = $user->rights->user->user->supprimer;
+	
+	        $var = true;
+	
+	        $somethingshown = $formfile->show_documents('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+	
+			// Linked object block
+			$somethingshown = $form->showLinkedObjectBlock($object);
+	
+			// Show links to link elements
+			$linktoelem = $form->showLinkToObjectBlock($object);
+			if ($linktoelem) print '<br>'.$linktoelem;
+	
+	
+	        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	
+			// List of actions on element
+			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+			$formactions = new FormActions($db);
+			$somethingshown = $formactions->showactions($object, 'usergroup', $socid);
+	        
+	        
+	        print '</div></div></div>';
         }
 
         /*
@@ -551,7 +590,6 @@ else
 
             print '</form>';
         }
-
     }
 }
 

From b520c0ab6b910b76796d177cca7a998a3492d577 Mon Sep 17 00:00:00 2001
From: Thomas Raschbacher <lordvan@lordvan.com>
Date: Thu, 9 Mar 2017 08:12:45 +0100
Subject: [PATCH 0354/1163] fix typo in Issue tracker URL

---
 .github/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 690b00211f7..02d21453a3a 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -6,7 +6,7 @@ Bug reports and feature requests
 
 <a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](http://www.dolibarr.org/forum).
 
-Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/Issues).
+Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
 
 1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem.
 2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request.

From d241adc201292f87cbb4ebbdff953b068f125f66 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 9 Mar 2017 13:22:43 +0100
Subject: [PATCH 0355/1163] NEW Use autocompletion on the "Add widget list".

---
 htdocs/core/ajax/box.php                   |  7 ++++++-
 htdocs/core/class/html.formother.class.php | 18 +++---------------
 htdocs/core/class/infobox.class.php        |  2 +-
 htdocs/index.php                           |  5 ++---
 htdocs/langs/en_US/boxes.lang              |  1 +
 htdocs/theme/eldy/style.css.php            | 17 +++++++++++++++++
 htdocs/theme/md/style.css.php              | 17 +++++++++++++++++
 7 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php
index 63f96a0c513..be4d9231c5f 100644
--- a/htdocs/core/ajax/box.php
+++ b/htdocs/core/ajax/box.php
@@ -26,7 +26,7 @@ if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 if (! defined('NOREQUIREHOOK'))  define('NOREQUIREHOOK','1');
 
 require '../../main.inc.php';
@@ -70,5 +70,10 @@ if ($boxorder && $zone != '' &&  $userid > 0)
 	dol_syslog("AjaxBox boxorder=".$boxorder." zone=".$zone." userid=".$userid, LOG_DEBUG);
 
 	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
+	if ($result > 0) 
+	{
+	    $langs->load("boxes");
+	    setEventMessages($langs->trans("BoxAdded"), null);
+	}
 }
 
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 9cb402cfc89..bcad9dbac44 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -978,7 +978,7 @@ class FormOther
      *
      * 	@param	   User         $user		 Object User
      * 	@param	   String       $areacode    Code of area for pages (0=value for Home page)
-     * 	@return    array                     array('selectboxlist'=>, 'boxactivated'=>, 'boxlist'=>)
+     * 	@return    array                     array('selectboxlist'=>, 'boxactivated'=>, 'boxlista'=>, 'boxlistb'=>)
      */
     static function getBoxesArea($user,$areacode)
     {
@@ -1027,10 +1027,10 @@ class FormOther
 			$selectboxlist.='<input type="hidden" name="userid" value="'.$user->id.'">';
 			$selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';
 			$selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';
-			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, '', $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, ' disabled hidden selected');
+			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected');
             if (empty($conf->use_javascript_ajax)) $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
             $selectboxlist.='</form>';
-            //$selectboxlist.=ajax_combobox("boxcombo");
+            $selectboxlist.=ajax_combobox("boxcombo");
         }
 
         // Javascript code for dynamic actions
@@ -1114,11 +1114,6 @@ class FormOther
 
         	$emptybox=new ModeleBoxes($db);
 
-            //$boxlist.='<table width="100%" class="notopnoleftnoright">';
-            //$boxlist.='<tr><td class="notopnoleftnoright">'."\n";
-
-            //$boxlist.='<div class="fichehalfleft">';
-
             $boxlista.="\n<!-- Box left container -->\n";
             $boxlista.='<div id="left" class="connectedSortable">'."\n";
 
@@ -1152,8 +1147,6 @@ class FormOther
             $boxlista.= "</div>\n";
             $boxlista.= "<!-- End box left container -->\n";
 
-            //$boxlist.= '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
             $boxlistb.= "\n<!-- Box right container -->\n";
             $boxlistb.= '<div id="right" class="connectedSortable">'."\n";
 
@@ -1183,11 +1176,6 @@ class FormOther
             $boxlistb.= "</div>\n";
             $boxlistb.= "<!-- End box right container -->\n";
 
-            //$boxlist.= '</div></div>';
-            //$boxlist.= "\n";
-
-            //$boxlist.= "</td></tr>";
-            //$boxlist.= "</table>";
         }
 
         return array('selectboxlist'=>count($boxactivated)?$selectboxlist:'', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index cd06eb587b7..419f31dca4d 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -183,7 +183,7 @@ class InfoBox
      *  @param	string	$zone       	Name of area (0 for Homepage, ...)
      *  @param  string  $boxorder   	List of boxes with correct order 'A:123,456,...-B:789,321...'
      *  @param  int     $userid     	Id of user
-     *  @return int                   	<0 if KO, >= 0 if OK
+     *  @return int                   	<0 if KO, 0=Nothing done, > 0 if OK
      */
     static function saveboxorder($db, $zone,$boxorder,$userid=0)
     {
diff --git a/htdocs/index.php b/htdocs/index.php
index 4ac80fbf57c..0fec7ea11d5 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -61,11 +61,10 @@ if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax dis
 	$boxorder.=GETPOST('boxcombo');
 
 	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
+	if ($result > 0) setEventMessages($langs->trans("BoxAdded"), null);
 }
 
 
-
-
 /*
  * View
  */
@@ -79,7 +78,7 @@ if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$langs->trans("HomeAr
 llxHeader('',$title);
 
 
-$resultboxes=FormOther::getBoxesArea($user,"0");
+$resultboxes=FormOther::getBoxesArea($user,"0");    // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
 
 
 print load_fiche_titre($langs->trans("HomeArea"),$resultboxes['selectboxlist'],'title_home');
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 0e6c5019cac..9eb795ea7d1 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -83,3 +83,4 @@ ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The latest %s month rolling
 ChooseBoxToAdd=Add widget to your dashboard
+BoxAdded=Widget was added in your dashboard
\ No newline at end of file
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 8a4e636cee0..090bb3f887c 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -4023,6 +4023,23 @@ a span.select2-chosen
 .select2-container-multi .select2-choices .select2-search-choice {
   margin-bottom: 3px;
 }
+
+/* Special case for the select2 add widget */
+#addbox .select2-container .select2-choice > .select2-chosen {
+    text-align: left;
+    opacity: 0.2;
+}
+/* Style used before the select2 js is executed on boxcombo */
+#boxcombo.boxcombo {
+    text-align: left;
+    opacity: 0.2;
+    border-bottom: 1px solid #000;
+    height: 26px;
+    line-height: 24px;
+    padding: 0 0 5px 5px;
+    vertical-align: top;
+}
+
 /* To emulate select 2 style */
 .select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
   padding: 2px 5px 1px 5px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 6fad30ed46b..96cb8002719 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3970,6 +3970,23 @@ a span.select2-chosen
 .select2-container-multi .select2-choices .select2-search-choice {
   margin-bottom: 3px;
 }
+
+/* Special case for the select2 add widget */
+#addbox .select2-container .select2-choice > .select2-chosen {
+    text-align: left;
+    opacity: 0.2;
+}
+/* Style used before the select2 js is executed on boxcombo */
+#boxcombo.boxcombo {
+    text-align: left;
+    opacity: 0.2;
+    border-bottom: 1px solid #000;
+    height: 26px;
+    line-height: 24px;
+    padding: 0 0 5px 5px;
+    vertical-align: top;
+}
+
 /* To emulate select 2 style */
 .select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
   padding: 2px 5px 1px 5px;

From c962daabacac1c832045663f6284b7f9e6c476b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 9 Mar 2017 15:16:16 +0100
Subject: [PATCH 0356/1163] NEW add property to show warnings when activating
 modules

---
 htdocs/admin/modules.php                      | 55 ++++++++++++++++---
 htdocs/core/lib/admin.lib.php                 | 17 ++++--
 htdocs/core/modules/DolibarrModules.class.php | 27 +++++++--
 htdocs/core/modules/modCron.class.php         |  2 +-
 htdocs/core/modules/modFacture.class.php      |  9 ++-
 htdocs/core/modules/modSkype.class.php        |  2 +-
 htdocs/core/modules/modWebsites.class.php     |  2 +-
 htdocs/langs/en_US/admin.lang                 |  1 +
 8 files changed, 90 insertions(+), 25 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 596aefa803e..6d9df62e979 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -235,6 +235,8 @@ $help_url='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones'
 llxHeader('',$langs->trans("Setup"),$help_url);
 
 $arrayofnatures=array('core'=>$langs->transnoentitiesnoconv("Core"), 'external'=>$langs->transnoentitiesnoconv("External").' - '.$langs->trans("AllPublishers"));
+$arrayofwarnings=array();    // Array of warning each module want to show when activated
+$arrayofwarningsext=array();    // Array of warning each module want to show when we activate an external module
 
 // Search modules dirs
 $modulesdir = dolGetModulesDirs();
@@ -266,7 +268,7 @@ foreach ($modulesdir as $dir)
 
 		        if ($modName)
 		        {
-		        	if (! empty($modNameLoaded[$modName]))
+		        	if (! empty($modNameLoaded[$modName]))   // In cache of already loaded modules ?
 		        	{
 		        		$mesg="Error: Module ".$modName." was found twice: Into ".$modNameLoaded[$modName]." and ".$dir.". You probably have an old file on your disk.<br>";
 		        		setEventMessages($mesg, null, 'warnings');
@@ -297,7 +299,7 @@ foreach ($modulesdir as $dir)
 		    					if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) $modulequalified=0;
 								if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0))) $modulequalified=0;
 
-		    					// We discard modules according to property disabled
+		    					// We discard modules according to property ->hidden
 		    					if (! empty($objMod->hidden)) $modulequalified=0;
 
 		    					if ($modulequalified > 0)
@@ -321,8 +323,8 @@ foreach ($modulesdir as $dir)
 		    					// Define array $categ with categ with at least one qualified module
 		    					if ($modulequalified > 0)
 		    					{
-		    						$modules[$i] = $objMod;
 		    			            $filename[$i]= $modName;
+		    					    $modules[$modName] = $objMod;
 
 		    			            $special = $objMod->special;
 
@@ -342,6 +344,16 @@ foreach ($modulesdir as $dir)
 
 		    			            if ($special == 1) $familykey='interface';
 
+		    			            // Add list of warnings to show into arrayofwarnings and arrayofwarningsext
+		    			            if (! empty($objMod->warnings_activation))
+		    			            {
+		    			                $arrayofwarnings[$modName]=$objMod->warnings_activation;
+		    			            }
+		    			            if (! empty($objMod->warnings_activation_ext))
+		    			            {
+		    			                $arrayofwarningsext[$modName]=$objMod->warnings_activation_ext;
+		    			            }
+		    			             
 		    			            $orders[$i]  = $familyinfo[$familykey]['position']."_".$familykey."_".$moduleposition."_".$j;   // Sort by family, then by module position then number
 		    						$dirmod[$i]  = $dir;
 		    						//print $i.'-'.$dirmod[$i].'<br>';
@@ -484,7 +496,7 @@ if ($mode == 'common')
         $familyposition=$tab[0]; $familykey=$tab[1]; $module_position=$tab[2]; $numero=$tab[3];
 
         $modName = $filename[$key];
-    	$objMod  = $modules[$key];
+    	$objMod  = $modules[$modName];
     	$dirofmodule = $dirmod[$key];
 
     	$special = $objMod->special;
@@ -633,7 +645,7 @@ if ($mode == 'common')
         print "</td>\n";
 
         // Activate/Disable and Setup (2 columns)
-        if (! empty($conf->global->$const_name))	// If module is activated
+        if (! empty($conf->global->$const_name))	// If module is already activated
         {
         	$disableSetup = 0;
 
@@ -699,12 +711,12 @@ if ($mode == 'common')
         	}
 
         }
-        else	// Module not activated
+        else	// Module not yet activated
 		{
         	print '<td align="center" valign="middle">';
 		    if (! empty($objMod->always_enabled))
         	{
-        		// Ne devrait pas arriver.
+        		// Should never happened
         	}
         	else if (! empty($objMod->disabled))
         	{
@@ -712,7 +724,34 @@ if ($mode == 'common')
         	}
         	else
         	{
-	        	// Module non actif
+	        	// Module qualified for activation
+        	    $warningmessage='';
+	        	if (! empty($arrayofwarnings[$modName]))
+	        	{
+                    print '<!-- This module has a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";
+	        	    foreach ($arrayofwarnings[$modName] as $keycountry => $cursorwarningmessage)
+   	        	    {
+	        	        $warningmessage .= ($warningmessage?"\n":"").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code);
+   	        	    }
+	        	}
+        		if ($objMod->isCoreOrExternalModule() == 'external' && ! empty($arrayofwarningsext))
+	        	{
+	        	    print '<!-- This module is an external module and it may have a warning to show (note: your country is '.$mysoc->country_code.') -->'."\n";
+	        	    foreach ($arrayofwarningsext as $keymodule => $arrayofwarningsextbycountry)
+	        	    {
+	        	        if (! empty($modules[$keymodule]->const_name))    // If module that request warning is on
+	        	        {
+        	        	    foreach ($arrayofwarningsextbycountry as $keycountry => $cursorwarningmessage)
+        	        	    {
+        	        	        if ($keycountry == 'always' || $keycountry == $mysoc->country_code)
+        	        	        {
+        	        	            $warningmessage .= ($warningmessage?"\n":"").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code, $modules[$keymodule]->getName());
+        	        	        }
+        	        	    }
+	        	        }
+	        	    }
+	        	}
+        	    print '<!-- Message to show: '.$warningmessage.' -->'."\n";
 	        	print '<a class="reposition" href="modules.php?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '">';
 	        	print img_picto($langs->trans("Disabled"),'switch_off');
 	        	print "</a>\n";
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 288082296f3..7de948ddfba 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -779,16 +779,21 @@ function activateModule($value,$withdeps=1)
         {
             if (isset($objMod->depends) && is_array($objMod->depends) && ! empty($objMod->depends))
             {
-                // Activation des modules dont le module depend
-                $num = count($objMod->depends);
-                for ($i = 0; $i < $num; $i++)
+                // Activation of modules this module depends on
+                // this->depends may be array('modModule1', 'mmodModule2') or array('always'=>"modModule1", 'FR'=>'modModule2')
+                foreach ($objMod->depend as $key => $modulestring)
                 {
+                    if ((! is_numeric($key)) && $key != 'always' && $key != $mysoc->country_code)
+                    {
+                        dol_syslog("We are not concerned by dependency with key=".$key." because our country is ".$mysoc->country_code);
+                        continue;
+                    }
                 	$activate = false;
                 	foreach ($modulesdir as $dir)
                 	{
-                		if (file_exists($dir.$objMod->depends[$i].".class.php"))
+                		if (file_exists($dir.$modulestring.".class.php"))
                 		{
-                			$resarray = activateModule($objMod->depends[$i]);
+                			$resarray = activateModule($modulestring);
     						if (empty($resarray['errors'])){
     						    $activate = true;
                             }else{
@@ -807,7 +812,7 @@ function activateModule($value,$withdeps=1)
     				}
     				else 
     				{
-    				    $ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $objMod->depends[$i]);
+    				    $ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring);
     				}
                 }
             }
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 8e526baa241..84538801add 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -215,11 +215,6 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      */
     public $descriptionlong;
     
-    /**
-     * @var string[] Module language files
-     */
-    public $langfiles;
-
     /**
      * @var string Module export code
      */
@@ -291,6 +286,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 	 */
 	public $config_page_url;
 
+	
 	/**
 	 * @var string[] List of module class names that must be enabled if this module is enabled.
 	 *
@@ -309,6 +305,26 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 	 */
 	public $conflictwith;
 
+    /**
+     * @var string[] Module language files
+     */
+    public $langfiles;
+    
+    /**
+     * @var string[] Array of warnings to show when we activate the module
+     * 
+     * array('always'='text') or array('FR'='text')
+     */
+    public $warnings_activation;
+    
+    /**
+     * @var string[] Array of warnings to show when we activate an external module
+     * 
+     * array('always'='text') or array('FR'='text')
+     */
+    public $warnings_activation_ext;
+    
+	
 	/**
 	 * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.3 = array(5, 3)
@@ -326,6 +342,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 	 */
 	public $hidden = false;
 
+	
 	/**
 	 * Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index bd5f193c568..88b154f891e 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -67,7 +67,7 @@ class modCron extends DolibarrModules
 
         // Dependancies
         //-------------
-		$this->hidden = ! empty($conf->global->CRON_MODULE_DISABLED);	// A condition to disable module
+		$this->hidden = ! empty($conf->global->MODULE_CRON_DISABLED);	// A condition to disable module
 		$this->depends = array();		// List of modules id that must be enabled if this module is enabled
         $this->requiredby = array();	// List of modules id to disable if this one is disabled
 		$this->conflictwith = array();	// List of modules id this module is in conflict with
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 4bc8590d5b4..a88082ba6fc 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -64,11 +64,13 @@ class modFacture extends DolibarrModules
 		$this->dirs = array("/facture/temp");
 
 		// Dependencies
-		$this->depends = array("modSociete");
+		$this->depends = array('always'=>"modSociete", 'FR'=>'modBlockChainLog');
 		$this->requiredby = array("modComptabilite","modAccounting");
 		$this->conflictwith = array();
 		$this->langfiles = array("bills","companies","compta","products");
-
+		$this->warnings_activation = array();                                                             // Warning to show when we activate module. array('always'='text') or array('FR'='text')
+		$this->warnings_activation_ext = array('CA'=>'WarningInstallationMayBecomeNotCompliantWithLaw');  // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
+		
 		// Config pages
 		$this->config_page_url = array("facture.php");
 
@@ -96,7 +98,8 @@ class modFacture extends DolibarrModules
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
-
+		
+		
 		// Boxes
 		//$this->boxes = array(0=>array(1=>'box_factures_imp.php'),1=>array(1=>'box_factures.php'));
 		$this->boxes = array(
diff --git a/htdocs/core/modules/modSkype.class.php b/htdocs/core/modules/modSkype.class.php
index d6017b06c16..ca9179d5fa3 100644
--- a/htdocs/core/modules/modSkype.class.php
+++ b/htdocs/core/modules/modSkype.class.php
@@ -65,7 +65,7 @@ class modSkype extends DolibarrModules
 
         // Dependancies
         //-------------
-	    $this->hidden = ! empty($conf->global->SKYPE_MODULE_DISABLED);	// A condition to disable module
+	    $this->hidden = ! empty($conf->global->MODULE_SKYPE_DISABLED);	// A condition to disable module
 	    $this->depends = array('modSociete');		// List of modules id that must be enabled if this module is enabled
         $this->requiredby = array();	// List of modules id to disable if this one is disabled
 	    $this->conflictwith = array();	// List of modules id this module is in conflict with
diff --git a/htdocs/core/modules/modWebsites.class.php b/htdocs/core/modules/modWebsites.class.php
index 97dfbd6dd12..877c78b85eb 100644
--- a/htdocs/core/modules/modWebsites.class.php
+++ b/htdocs/core/modules/modWebsites.class.php
@@ -67,7 +67,7 @@ class modWebsites extends DolibarrModules
 
         // Dependancies
         //-------------
-		$this->hidden = ! empty($conf->global->WEBSITE_MODULE_DISABLED);	// A condition to disable module
+		$this->hidden = ! empty($conf->global->MODULE_WEBSITE_DISABLED);	// A condition to disable module
 		$this->depends = array('modFckeditor');		// List of modules id that must be enabled if this module is enabled
         $this->requiredby = array();	// List of modules id to disable if this one is disabled
 		$this->conflictwith = array();	// List of modules id this module is in conflict with
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a5fb93a4665..f5aa35f0c35 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1661,6 +1661,7 @@ ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for act
 UserHasNoPermissions=This user has no permission defined
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
 BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module <strong>%s</strong> that is an external module. Activate an external module only if it does not alterate negatively the behavior required by your country laws (%s). If the module bring a non legal feature, you are the only responsible for the use of a non-compliant software.   
 ##### Resource ####
 ResourceSetup=Configuration du module Resource 
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).

From e44234a47f55ab12fdfe2d4eab393d67867e7439 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 9 Mar 2017 15:16:45 +0100
Subject: [PATCH 0357/1163] NEW add property to show warnings when activating
 modules

---
 .../core/modules/modBlockChainLog.class.php   | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 htdocs/core/modules/modBlockChainLog.class.php

diff --git a/htdocs/core/modules/modBlockChainLog.class.php b/htdocs/core/modules/modBlockChainLog.class.php
new file mode 100644
index 00000000000..dbf9cc406e9
--- /dev/null
+++ b/htdocs/core/modules/modBlockChainLog.class.php
@@ -0,0 +1,90 @@
+<?php
+/* Copyright (C) 2013   Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	\defgroup   blockchainlog   Module BlockChainLog
+ *  \brief      Add a log into a block chain for some actions.
+ *  \file       htdocs/core/modules/modBlockChainLog.class.php
+ *  \ingroup    blockchainlog
+ *  \brief      Description and activation file for module BlockChainLog
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+/**
+ *	Class to describe a Cron module
+ */
+class modBlockChainLog extends DolibarrModules
+{
+
+    /**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+    	global $langs,$conf;
+
+        $this->db = $db;
+        $this->numero = 3200;
+
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+        $this->family = "technic";
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Enable a log of some business events into a non reversible block chain. This module may be mandatory for some countries.";
+        $this->version = 'development';                        // 'development', 'experimental' or 'dolibarr' or version
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
+        $this->special = 1;
+        // Name of image file used for this module.
+        $this->picto='skype';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array();
+
+        // Config pages
+        //-------------
+        $this->config_page_url = array();
+
+        // Dependancies
+        //-------------
+	    $this->hidden = false;	// A condition to disable module
+	    $this->depends = array('modFacture');		// List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of modules id to disable if this one is disabled
+	    $this->conflictwith = array();	// List of modules id this module is in conflict with
+        $this->langfiles = array();
+
+        // Constants
+        //-----------
+
+
+        // New pages on tabs
+        // -----------------
+        $this->tabs = array();
+
+        // Boxes
+        //------
+        $this->boxes = array();
+
+        // Main menu entries
+        //------------------
+        $this->menu = array();
+    }
+}

From b3d27521cb238fe20c4261f3b66b4aa2009c3e12 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 10 Mar 2017 10:55:35 +0100
Subject: [PATCH 0358/1163] Fix Must use tdoverflowmax100 instead of tdoverflow

---
 htdocs/core/boxes/box_services_expired.php | 14 ++++++++------
 htdocs/core/boxes/modules_boxes.php        |  2 +-
 htdocs/theme/eldy/style.css.php            |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index f2bc86cdac5..90f36ef6d30 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -83,6 +83,8 @@ class box_services_expired extends ModeleBoxes
 
     			$i = 0;
 
+    			$thirdpartytmp = new Societe($this->db);
+    			
     			while ($i < $num)
     			{
     			    $late='';
@@ -100,13 +102,13 @@ class box_services_expired extends ModeleBoxes
     				'text' => ($objp->ref?$objp->ref:$objp->rowid),	// Some contracts have no ref
     				'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
 
-    				$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
-    				'logo' => 'company',
-    				'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
+    				$thirdpartytmp->id = $objp->socid;
+    				$thirdpartytmp->name = $objp->name;
 
-    				$this->info_box_contents[$i][3] = array('td' => 'class="tdoverflow maxwidth100onsmartphone" align="left"',
-    				'text' => $objp->name,
-    				'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
+    				$this->info_box_contents[$i][2] = array('td' => 'class="tdoverflowmax100 maxwidth100onsmartphone" align="left"',
+    				'text' => $thirdpartytmp->getNomUrl(1, 'customer'),
+    				'asis' => 1
+    				);
 
     				$this->info_box_contents[$i][4] = array('td' => 'align="center"',
     				'text' => dol_print_date($dateline,'day'),
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 9a093cff927..3ebac7e7ab0 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -240,7 +240,7 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
                 $out.= '>';
                 if ($conf->use_javascript_ajax)
                 {
-                    $out.= '<table summary="" class="nobordernopadding" width="100%"><tr><td class="tdoverflow maxwidth300onsmartphone">';
+                    $out.= '<table summary="" class="nobordernopadding" width="100%"><tr><td class="tdoverflowmax100 maxwidth100onsmartphone">';
                 }
                 if (! empty($head['text']))
                 {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 090bb3f887c..ffb3e7b83f8 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -583,13 +583,13 @@ div.myavailability {
     text-overflow: ellipsis;
     white-space: nowrap;
 }
-.tdoverflowmax100 {
+.tdoverflowmax100 {			/* For tdoverflow, the max-midth become a minimum ! */
     max-width: 100px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
 }
-.tdoverflowmax300 {
+.tdoverflowmax300 {			/* For tdoverflow, the max-midth become a minimum ! */
     max-width: 300px;
     overflow: hidden;
     text-overflow: ellipsis;

From 80702e4c0a63ad7a7e79127a575cd9f058e4dc16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 10 Mar 2017 11:22:27 +0100
Subject: [PATCH 0359/1163] Fix Better HTML5 compliant

---
 htdocs/core/boxes/box_actions.php             |  8 +++---
 htdocs/core/boxes/box_activity.php            | 26 +++++++++----------
 htdocs/core/boxes/box_bookmarks.php           |  4 +--
 htdocs/core/boxes/box_clients.php             |  6 ++---
 htdocs/core/boxes/box_commandes.php           | 12 ++++-----
 htdocs/core/boxes/box_comptes.php             | 10 +++----
 htdocs/core/boxes/box_contacts.php            |  8 +++---
 htdocs/core/boxes/box_contracts.php           | 12 ++++-----
 htdocs/core/boxes/box_external_rss.php        |  2 +-
 htdocs/core/boxes/box_factures.php            | 12 ++++-----
 htdocs/core/boxes/box_factures_fourn.php      | 14 +++++-----
 htdocs/core/boxes/box_factures_fourn_imp.php  | 12 ++++-----
 htdocs/core/boxes/box_factures_imp.php        | 12 ++++-----
 htdocs/core/boxes/box_ficheinter.php          | 10 +++----
 htdocs/core/boxes/box_fournisseurs.php        |  8 +++---
 htdocs/core/boxes/box_goodcustomers.php       |  8 +++---
 .../boxes/box_graph_invoices_permonth.php     |  2 +-
 .../box_graph_invoices_supplier_permonth.php  |  2 +-
 .../core/boxes/box_graph_orders_permonth.php  |  2 +-
 .../box_graph_orders_supplier_permonth.php    |  2 +-
 .../boxes/box_graph_propales_permonth.php     |  2 +-
 htdocs/core/boxes/box_members.php             |  8 +++---
 htdocs/core/boxes/box_produits.php            | 12 ++++-----
 .../core/boxes/box_produits_alerte_stock.php  | 10 +++----
 htdocs/core/boxes/box_project.php             | 14 +++++-----
 htdocs/core/boxes/box_propales.php            | 12 ++++-----
 htdocs/core/boxes/box_prospect.php            |  8 +++---
 htdocs/core/boxes/box_services_contracts.php  |  4 +--
 htdocs/core/boxes/box_services_expired.php    |  8 +++---
 htdocs/core/boxes/box_supplier_orders.php     | 12 ++++-----
 htdocs/core/boxes/box_task.php                | 10 +++----
 31 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index c406ada6fa5..b6d38d17b53 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -110,14 +110,14 @@ class box_actions extends ModeleBoxes
 					$label = empty($objp->label)?$objp->type_label:$objp->label;
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $actionstatic->getNomUrl(1),
                         'text2'=> $late,
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => ($societestatic->id > 0 ? $societestatic->getNomUrl(1) : ''),
                         'asis' => 1,
                     );
@@ -128,7 +128,7 @@ class box_actions extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => ($objp->percentage>= 0?$objp->percentage.'%':''),
                     );
 
@@ -149,7 +149,7 @@ class box_actions extends ModeleBoxes
                 $db->free($result);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 34666507488..96a451f70f8 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -148,19 +148,19 @@ class box_activity extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][1] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1,$data[$j]->fk_statut,0)." ".$data[$j]->annee,
                     );
 
                     $this->info_box_contents[$line][2] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
                         'text' => $data[$j]->nb,
                         'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
                     );
 
                     $this->info_box_contents[$line][3] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency)
                     );
 
@@ -230,19 +230,19 @@ class box_activity extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][1] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
                     );
 
                     $this->info_box_contents[$line][2] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => $data[$j]->nb,
                         'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
                         'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
                     );
                     $totalnb += $data[$j]->nb;
                     $this->info_box_contents[$line][3] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
                     );
                     $totalMnt += $objp->Mnttot;
@@ -260,7 +260,7 @@ class box_activity extends ModeleBoxes
                     );
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500, 'text' => ($db->error().' sql='.$sql),
                 );
             }
@@ -323,12 +323,12 @@ class box_activity extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][1] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' =>$langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut,0,0),
                     );
 
                     $this->info_box_contents[$line][2] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => $data[$j]->nb,
                         'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut,0,0),
                         'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;viewstatut=".$data[$j]->fk_statut,
@@ -336,7 +336,7 @@ class box_activity extends ModeleBoxes
                     $totalnb += $data[$j]->nb;
 
                     $this->info_box_contents[$line][3] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
                     );
                     $totalMnt += $data[$j]->Mnttot;
@@ -413,12 +413,12 @@ class box_activity extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][1] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
                     );
 
                     $this->info_box_contents[$line][2] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => $data[$j]->nb,
                         'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
                         'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
@@ -426,7 +426,7 @@ class box_activity extends ModeleBoxes
                     $totalnb += $data[$j]->nb;
 
                     $this->info_box_contents[$line][3] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
                     );
                     $totalMnt += $data[$j]->Mnttot;
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index e99a0b30387..b6df56f52a2 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -94,7 +94,7 @@ class box_bookmarks extends ModeleBoxes
                         'target' => $objp->target?'newtab':'',
                     );
                     $this->info_box_contents[$line][1] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $objp->title,
                         'url' => $objp->url,
                         'tooltip' => $objp->title,
@@ -117,7 +117,7 @@ class box_bookmarks extends ModeleBoxes
                 $db->free($result);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 307dcc7cbfd..0649d43a049 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -117,13 +117,13 @@ class box_clients extends ModeleBoxes
                     $thirdpartystatic->logo = $objp->logo;
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $thirdpartystatic->getNomUrl(1),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => dol_print_date($datem, "day")
                     );
 
@@ -140,7 +140,7 @@ class box_clients extends ModeleBoxes
 				$db->free($result);
 			}
 			else {
-				$this->info_box_contents[0][0] = array(	'td' => 'align="left"',
+				$this->info_box_contents[0][0] = array(	'td' => '',
     	        										'maxlength'=>500,
 	            										'text' => ($db->error().' sql='.$sql));
 			}
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 7653206333d..fe460f7d512 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -115,33 +115,33 @@ class box_commandes extends ModeleBoxes
                     $societestatic->logo = $objp->logo;
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $commandestatic->getNomUrl(1),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $societestatic->getNomUrl(1),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
                     );
 
                     if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
                         if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
                         $this->info_box_contents[$line][] = array(
-                            'td' => 'align="right"',
+                            'td' => 'class="right"',
                             'text' => (($objp->fk_user_valid > 0)?$userstatic->getNomUrl(1):''),
                             'asis' => 1,
                         );
                     }
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => dol_print_date($date,'day'),
                     );
 
@@ -158,7 +158,7 @@ class box_commandes extends ModeleBoxes
                 $db->free($result);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index a1c3625e78c..2372a31f035 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -111,18 +111,18 @@ class box_comptes extends ModeleBoxes
                     $solde_total[$objp->currency_code] += $solde;
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $account_static->getNomUrl(1),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $objp->number,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code)
                     );
 
@@ -151,14 +151,14 @@ class box_comptes extends ModeleBoxes
                 $db->free($result);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left"',
+                'td' => '',
                 'text' => $langs->trans("ReadPermissionNotAllowed"),
             );
         }
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 45963af9bb1..d6c38a9fce8 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -110,19 +110,19 @@ class box_contacts extends ModeleBoxes
                     $societestatic->fournisseur = $objp->fournisseur;
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $contactstatic->getNomUrl(1),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => ($objp->fk_soc > 0 ? $societestatic->getNomUrl(1) : ''),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => dol_print_date($datem, "day"),
                     );
 
@@ -144,7 +144,7 @@ class box_contacts extends ModeleBoxes
                 $db->free($result);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index fe864e1df16..cd436f3eb85 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -106,25 +106,25 @@ class box_contracts extends ModeleBoxes
     				// if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->contrat->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $contractstatic->getNomUrl(1),
                         'text2'=> $late,
                         'asis'=>1
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
                         'text' => $thirdpartytmp->getNomUrl(1),
                         'asis'=>1
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => dol_print_date($datec,'day'),
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" class="nowrap"',
+                        'td' => 'class="nowrap right"',
                         'text' => $contractstatic->getLibStatut(6),
                         'asis'=>1,
                     );
@@ -141,14 +141,14 @@ class box_contracts extends ModeleBoxes
                 $db->free($resql);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left"',
+                'td' => '',
                 'text' => $langs->trans("ReadPermissionNotAllowed"),
             );
         }
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index dbe71a6ca41..71b643665b3 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -163,7 +163,7 @@ class box_external_rss extends ModeleBoxes
             );
 
             $this->info_box_contents[$line][1] = array(
-                'td' => 'align="left"',
+                'td' => '',
                 'text' => $title,
                 'url' => $href,
                 'tooltip' => $tooltip,
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 22a90929a0b..b7c9dfa0e91 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -122,25 +122,25 @@ class box_factures extends ModeleBoxes
                     }
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $facturestatic->getNomUrl(1),
                         'text2'=> $late,
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $societestatic->getNomUrl(1, '', 40),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => dol_print_date($date,'day'),
                     );
 
@@ -161,7 +161,7 @@ class box_factures extends ModeleBoxes
                 $db->free($result);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
@@ -169,7 +169,7 @@ class box_factures extends ModeleBoxes
 
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left"',
+                'td' => '',
                 'text' => $langs->trans("ReadPermissionNotAllowed"),
             );
         }
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index b43d9cfc47b..4f88d99bb09 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -122,32 +122,32 @@ class box_factures_fourn extends ModeleBoxes
                     }
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $facturestatic->getNomUrl(1),
                         'text2'=> $late,
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $objp->ref_supplier,
                         'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref?$objp->ref:$objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier,
                         'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => dol_print_date($date,'day'),
                     );
 
@@ -171,14 +171,14 @@ class box_factures_fourn extends ModeleBoxes
                 $db->free($result);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left"',
+                'td' => '',
                 'text' => $langs->transnoentities("ReadPermissionNotAllowed"),
             );
         }
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 0d6bc28f077..3313b4cbd50 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -119,25 +119,25 @@ class box_factures_fourn_imp extends ModeleBoxes
                     $tooltip = $langs->trans('SupplierInvoice') . ': ' . ($objp->ref?$objp->ref:$objp->facid) . '<br>' . $langs->trans('RefSupplier') . ': ' . $objp->ref_supplier;
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $facturestatic->getNomUrl(1),
                         'text2'=> $late,
                         'asis' => 1
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $thirdpartytmp->getNomUrl(1, '', 40),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => dol_print_date($datelimite,'day'),
                     );
 
@@ -161,14 +161,14 @@ class box_factures_fourn_imp extends ModeleBoxes
                 $db->free($result);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left"',
+                'td' => '',
                 'text' => $langs->trans("ReadPermissionNotAllowed"),
             );
         }
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 67c4d4dbfcc..6bd2e662b64 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -126,25 +126,25 @@ class box_factures_imp extends ModeleBoxes
 					}
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $facturestatic->getNomUrl(1),
                         'text2'=> $late,
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $societestatic->getNomUrl(1, '', 44),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => dol_print_date($datelimite,'day'),
                     );
 
@@ -163,7 +163,7 @@ class box_factures_imp extends ModeleBoxes
 			else
 			{
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
@@ -171,7 +171,7 @@ class box_factures_imp extends ModeleBoxes
 		}
 		else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left"',
+                'td' => '',
                 'text' => $langs->trans("ReadPermissionNotAllowed"),
             );
 		}
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index d57a2a991df..9fcd8ec6cd7 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -98,7 +98,7 @@ class box_ficheinter extends ModeleBoxes
 					'logo' => $this->boximg,
 					'url' => DOL_URL_ROOT."/fichinter/card.php?id=".$objp->rowid);
 
-					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
+					$this->info_box_contents[$i][1] = array('td' => '',
 					'text' => ($objp->ref?$objp->ref:$objp->rowid),	// Some interventions have no ref
 					'url' => DOL_URL_ROOT."/fichinter/card.php?id=".$objp->rowid);
 
@@ -106,11 +106,11 @@ class box_ficheinter extends ModeleBoxes
 					'logo' => 'company',
 					'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
-					$this->info_box_contents[$i][3] = array('td' => 'align="left"',
+					$this->info_box_contents[$i][3] = array('td' => '',
 					'text' => dol_trunc($objp->name,40),
 					'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
-					$this->info_box_contents[$i][4] = array('td' => 'align="right"',
+					$this->info_box_contents[$i][4] = array('td' => 'class="right"',
 					'text' => dol_print_date($datec,'day'));
 
 					$this->info_box_contents[$i][5] = array('td' => 'align="right" class="nowrap"',
@@ -127,14 +127,14 @@ class box_ficheinter extends ModeleBoxes
 			}
 			else
 			{
-				$this->info_box_contents[0][0] = array(  'td' => 'align="left"',
+				$this->info_box_contents[0][0] = array(  'td' => '',
 				'maxlength'=>500,
 				'text' => ($db->error().' sql='.$sql));
 			}
 		}
 		else
 		{
-			$this->info_box_contents[0][0] = array('td' => 'align="left"',
+			$this->info_box_contents[0][0] = array('td' => '',
 			'text' => $langs->trans("ReadPermissionNotAllowed"));
 		}
 	}
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index ed3680af455..432d34897d0 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -94,13 +94,13 @@ class box_fournisseurs extends ModeleBoxes
                     $thirdpartytmp->logo = $objp->logo;
 
                    	$this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $thirdpartytmp->getNomUrl(1, '', 40),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => dol_print_date($datem, "day"),
                     );
 
@@ -120,14 +120,14 @@ class box_fournisseurs extends ModeleBoxes
                 $db->free($result);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left"',
+                'td' => '',
                 'text' => $langs->trans("ReadPermissionNotAllowed"),
             );
         }
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 552ed92b8a3..73208b1423a 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -114,18 +114,18 @@ class box_goodcustomers extends ModeleBoxes
 					$nbimpaye = $objp->nbfact - $objp->nbfactpaye;
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'align="left"',
+					    'td' => '',
 					    'text' => $thirdpartystatic->getNomUrl(1),
 					    'asis' => 1,
 					);
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'align="right"',
+					    'td' => 'class="right"',
 					    'text' => dol_print_date($datem, "day")
 					);
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'align="right"',
+					    'td' => 'class="right"',
 					    'text' => $nbfact.( $nbimpaye != 0 ? ' ('.$nbimpaye.')':'')
 					);
 
@@ -142,7 +142,7 @@ class box_goodcustomers extends ModeleBoxes
 				$db->free($result);
 			}
 			else {
-				$this->info_box_contents[0][0] = array(	'td' => 'align="left"',
+				$this->info_box_contents[0][0] = array(	'td' => '',
     	        										'maxlength'=>500,
 	            										'text' => ($db->error().' sql='.$sql));
 			}
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index e4639070203..d313d10b310 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -255,7 +255,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => 'align="left"',
+			$this->info_box_contents[0][0] = array('td' => '',
             'text' => $langs->trans("ReadPermissionNotAllowed"));
 		}
 	}
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 254195b42f1..ddc51aa79fe 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -252,7 +252,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => 'align="left"',
+			$this->info_box_contents[0][0] = array('td' => '',
             'text' => $langs->trans("ReadPermissionNotAllowed"));
 		}
 	}
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 6b023b9c157..0d3077a82ce 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -253,7 +253,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => 'align="left"',
+			$this->info_box_contents[0][0] = array('td' => '',
             'text' => $langs->trans("ReadPermissionNotAllowed"));
 		}
 	}
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 646f28e949c..d16bfbc0f90 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -252,7 +252,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => 'align="left"',
+			$this->info_box_contents[0][0] = array('td' => '',
             'text' => $langs->trans("ReadPermissionNotAllowed"));
 		}
 	}
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 39fe12ed7a3..2a29cf27314 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -254,7 +254,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => 'align="left"',
+			$this->info_box_contents[0][0] = array('td' => '',
             'text' => $langs->trans("ReadPermissionNotAllowed"));
 		}
 	}
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index afcbe8e68a6..1bbcec45881 100644
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -117,19 +117,19 @@ class box_members extends ModeleBoxes
 					}
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $memberstatic->getNomUrl(1),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $memberstatic->getFullName($langs),
                         'url' => DOL_URL_ROOT."/adherents/card.php?rowid=".$objp->rowid,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => dol_print_date($datem, "day"),
                     );
 
@@ -150,7 +150,7 @@ class box_members extends ModeleBoxes
                 $db->free($result);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 5cce3254bfb..10ec22ce5f5 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -106,13 +106,13 @@ class box_produits extends ModeleBoxes
 					$productstatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $productstatic->getNomUrl(1),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $objp->label,
                     );
 
@@ -139,7 +139,7 @@ class box_produits extends ModeleBoxes
 	                    }
 	               	}
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => $price,
                     );
 
@@ -149,7 +149,7 @@ class box_produits extends ModeleBoxes
                     );
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => dol_print_date($datem,'day'),
                     );
 
@@ -174,14 +174,14 @@ class box_produits extends ModeleBoxes
                 $db->free($result);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left"',
+                'td' => '',
                 'text' => $langs->trans("ReadPermissionNotAllowed"),
             );
         }
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 3ec0fc7070c..1367caed866 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -113,13 +113,13 @@ class box_produits_alerte_stock extends ModeleBoxes
 					$productstatic->entity = $objp->entity;
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $productstatic->getNomUrl(1),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $objp->label,
                     );
 
@@ -148,7 +148,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 	               	}
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => $price,
                     );
 
@@ -180,7 +180,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 			else
 			{
 				$this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
@@ -188,7 +188,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 		}
 		else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left"',
+                'td' => '',
                 'text' => $langs->trans("ReadPermissionNotAllowed"),
             );
 		}
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 4c0689cd282..c2cc1cb041b 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -104,14 +104,14 @@ class box_project extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$i][1] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $objp->ref,
                         'tooltip' => $tooltip,
                         'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid,
                     );
 
                     $this->info_box_contents[$i][2] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $objp->title,
                     );
 
@@ -123,20 +123,20 @@ class box_project extends ModeleBoxes
 					if ($resultTask) {
 						$objTask = $db->fetch_object($resultTask);
                         $this->info_box_contents[$i][3] = array(
-                            'td' => 'align="right"',
+                            'td' => 'class="right"',
                             'text' => number_format($objTask->nb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"),
                         );
 						if ($objTask->nb  > 0 )
                             $this->info_box_contents[$i][4] = array(
-                                'td' => 'align="right"',
+                                'td' => 'class="right"',
                                 'text' => number_format(($objTask->totprogress/$objTask->nb), 0, ',', ' ')."%",
                             );
 						else
-							$this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => "N/A&nbsp;");
+							$this->info_box_contents[$i][4] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
 						$totalnbTask += $objTask->nb;
 					} else {
-						$this->info_box_contents[$i][3] = array('td' => 'align="right"', 'text' => number_format(0, 0, ',', ' '));
-						$this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => "N/A&nbsp;");
+						$this->info_box_contents[$i][3] = array('td' => 'class="right"', 'text' => number_format(0, 0, ',', ' '));
+						$this->info_box_contents[$i][4] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
 					}
 
 					$i++;
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index b0a1e4a3798..d3945ddb940 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -109,25 +109,25 @@ class box_propales extends ModeleBoxes
     				}
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $propalstatic->getNomUrl(1),
                         'text2'=> $late,
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $societestatic->getNomUrl(1,'',40),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => dol_print_date($date,'day'),
                     );
 
@@ -148,14 +148,14 @@ class box_propales extends ModeleBoxes
                 $db->free($result);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left"',
+                'td' => '',
                 'text' => $langs->trans("ReadPermissionNotAllowed"),
             );
         }
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 40adb98b405..1acd77addfc 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -117,13 +117,13 @@ class box_prospect extends ModeleBoxes
                     $thirdpartystatic->logo = $objp->logo;
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $thirdpartystatic->getNomUrl(1),
                     	'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => dol_print_date($datem, "day"),
                     );
 
@@ -149,14 +149,14 @@ class box_prospect extends ModeleBoxes
                 $db->free($resql);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left"',
+                'td' => '',
                 'text' => $langs->trans("ReadPermissionNotAllowed"),
             );
 		}
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 752509a0616..b33079d2ab0 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -155,13 +155,13 @@ class box_services_contracts extends ModeleBoxes
 			}
 			else
 			{
-				$this->info_box_contents[0][0] = array(	'td' => 'align="left"',
+				$this->info_box_contents[0][0] = array(	'td' => '',
     	        										'maxlength'=>500,
 	            										'text' => ($db->error().' sql='.$sql));
 			}
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => 'align="left"',
+			$this->info_box_contents[0][0] = array('td' => '',
             'text' => $langs->trans("ReadPermissionNotAllowed"));
 		}
 
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 90f36ef6d30..2754a4cece6 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -98,7 +98,7 @@ class box_services_expired extends ModeleBoxes
     				'logo' => $this->boximg,
     				'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
 
-    				$this->info_box_contents[$i][1] = array('td' => 'align="left"',
+    				$this->info_box_contents[$i][1] = array('td' => '',
     				'text' => ($objp->ref?$objp->ref:$objp->rowid),	// Some contracts have no ref
     				'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
 
@@ -114,7 +114,7 @@ class box_services_expired extends ModeleBoxes
     				'text' => dol_print_date($dateline,'day'),
     				'text2'=> $late);
 
-    				$this->info_box_contents[$i][5] = array('td' => 'align="right"',
+    				$this->info_box_contents[$i][5] = array('td' => 'class="right"',
     				'text' => $objp->nb_services);
 
 
@@ -131,7 +131,7 @@ class box_services_expired extends ModeleBoxes
     		}
     		else
     		{
-    			$this->info_box_contents[0][0] = array(  'td' => 'align="left"',
+    			$this->info_box_contents[0][0] = array(  'td' => '',
                                                         'maxlength'=>500,
                                                         'text' => ($db->error().' sql='.$sql));
     		}
@@ -140,7 +140,7 @@ class box_services_expired extends ModeleBoxes
     	}
     	else
     	{
-    		$this->info_box_contents[0][0] = array('td' => 'align="left"',
+    		$this->info_box_contents[0][0] = array('td' => '',
     		'text' => $langs->trans("ReadPermissionNotAllowed"));
     	}
     }
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 1f0e1ece2ef..29b6009b367 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -112,25 +112,25 @@ class box_supplier_orders extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $objp->ref,
                         'tooltip' => $tooltip,
                         'url' => $urlo,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
                         'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
                     );
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => dol_print_date($date,'day'),
                     );
 
@@ -151,7 +151,7 @@ class box_supplier_orders extends ModeleBoxes
                 $db->free($result);
             } else {
                 $this->info_box_contents[0][0] = array(
-                    'td' => 'align="left"',
+                    'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
                 );
@@ -160,7 +160,7 @@ class box_supplier_orders extends ModeleBoxes
         else
         {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left"',
+                'td' => '',
                 'text' => $langs->trans("ReadPermissionNotAllowed"),
             );
         }
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 29dd9390597..ed02e2fc6eb 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -99,19 +99,19 @@ class box_task extends ModeleBoxes
                 {
                     $objp = $db->fetch_object($result);
                     $this->info_box_contents[$i][] = array(
-                        'td' => 'align="left"',
+                        'td' => '',
                         'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut,0),
                     );
 
                     $this->info_box_contents[$i][] = array(
-                        'td' => 'align="right"',
+                        'td' => 'class="right"',
                         'text' => $objp->nb."&nbsp;".$langs->trans("Tasks"),
                         'url' => DOL_URL_ROOT."/projet/tasks/list.php?leftmenu=projects&viewstatut=".$objp->fk_statut,
                     );
 					$totalnb += $objp->nb;
-					$this->info_box_contents[$i][] = array('td' => 'align="right"', 'text' => ConvertSecondToTime($objp->plannedtot,'all',25200,5));
+					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->plannedtot,'all',25200,5));
 					$totalplannedtot += $objp->plannedtot;
-					$this->info_box_contents[$i][] = array('td' => 'align="right"', 'text' => ConvertSecondToTime($objp->durationtot,'all',25200,5));
+					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot,'all',25200,5));
 					$totaldurationtot += $objp->durationtot;
 
 					$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut,3));
@@ -124,7 +124,7 @@ class box_task extends ModeleBoxes
 
 
 		// Add the sum à the bottom of the boxes
-		$this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => 'align="left"', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
+		$this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => '', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
 		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
 		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
 		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));

From 46eedeafe82073253709d07eb166915078f8c7fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 10 Mar 2017 11:30:46 +0100
Subject: [PATCH 0360/1163] Fix message shown to many times

---
 htdocs/core/ajax/box.php                   | 5 ++++-
 htdocs/core/class/html.formother.class.php | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php
index be4d9231c5f..fbb8fc759ad 100644
--- a/htdocs/core/ajax/box.php
+++ b/htdocs/core/ajax/box.php
@@ -73,7 +73,10 @@ if ($boxorder && $zone != '' &&  $userid > 0)
 	if ($result > 0) 
 	{
 	    $langs->load("boxes");
-	    setEventMessages($langs->trans("BoxAdded"), null);
+	    if (empty(GETPOST('closing')))
+	    {
+	       setEventMessages($langs->trans("BoxAdded"), null);
+	    }
 	}
 }
 
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index bcad9dbac44..5f8fe76e320 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -1046,7 +1046,7 @@ class FormOther
 	        	if (boxorder==\'A:A-B:B\' && closing == 1)	// There is no more boxes on screen, and we are after a delete of a box so we must hide title
 	        	{
 	        		jQuery.ajax({
-	        			url: \''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&zone='.$areacode.'&userid=\'+'.$user->id.',
+	        			url: \''.DOL_URL_ROOT.'/core/ajax/box.php?closing=\'+closing+\'&boxorder=\'+boxorder+\'&zone='.$areacode.'&userid=\'+'.$user->id.',
 	        			async: false
 	        		});
 	        		// We force reload to be sure to get all boxes into list
@@ -1055,7 +1055,7 @@ class FormOther
 	        	else
 	        	{
 	        		jQuery.ajax({
-	        			url: \''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&zone='.$areacode.'&userid=\'+'.$user->id.',
+	        			url: \''.DOL_URL_ROOT.'/core/ajax/box.php?closing=\'+closing+\'&boxorder=\'+boxorder+\'&zone='.$areacode.'&userid=\'+'.$user->id.',
 	        			async: true
 	        		});
 	        	}

From e5fc1583c7b89b19a603d7a04a1bc08742f523ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 10 Mar 2017 12:05:42 +0100
Subject: [PATCH 0361/1163] Fix No external access without using getUrlContent
 function.

---
 htdocs/core/tpl/login.tpl.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index ba501e802dd..e0aa28ce2d6 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -239,16 +239,21 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
 	</div></div>
 <?php
 }
+
+// Add commit strip
 if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 	if (substr($langs->defaultlang,0,2)=='fr') {
-		$xml = simplexml_load_file("http://www.commitstrip.com/fr/feed/");
+		$resgetcommitstrip = getURLContent("http://www.commitstrip.com/fr/feed/");
 	} else {
-		$xml = simplexml_load_file("http://www.commitstrip.com/en/feed/");
+		$resgetcommitstrip = getURLContent("http://www.commitstrip.com/en/feed/");
 	}
-
-    $little = $xml->channel->item[0]->children('content',true);
-
-    print $little->encoded;
+    if ($resgetcommitstrip && $resgetcommitstrip['http_code'] == '200') 
+    {
+        $xml = simplexml_load_string($resgetcommitstrip['content']);
+        $little = $xml->channel->item[0]->children('content',true);
+        print $little->encoded;
+    }
 }
 
 ?>

From 57c297117517f961d1903e11b85534dba270dbfd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 10 Mar 2017 16:19:18 +0100
Subject: [PATCH 0362/1163] Fix dol_banner for agenda

---
 htdocs/core/class/html.form.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0bb01da357d..3a99965e301 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5851,7 +5851,13 @@ class Form
 		{
 		    $ret.=dol_htmlentities($object->getFullName($langs));
 		}
+		else if (in_array($object->element, array('action', 'agenda')))
+		{
+		    $ret.=$object->label;    
+		}
 		else if ($fieldref != 'none') $ret.=dol_htmlentities($object->$fieldref);
+		
+		
 		if ($morehtmlref)
 		{
 		    $ret.=' '.$morehtmlref;

From 618c27d63c7ecfffc22404fe95dea5d72edb42bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 10 Mar 2017 16:26:43 +0100
Subject: [PATCH 0363/1163] Optimize space

---
 htdocs/comm/action/index.php      | 24 +++++++++++++++++-------
 htdocs/core/lib/functions.lib.php | 14 ++++++++++----
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index f8b50fb588a..25d410e7bdb 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1353,7 +1353,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     print '<ul class="cal_event" style="'.$h.'">';	// always 1 li per ul, 1 ul per event
                     print '<li class="cal_event" style="'.$h.'">';
                     print '<table class="cal_event'.(empty($event->transparency)?'':' cal_event_busy').'" style="'.$h;
-                    print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
+                    print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -3).'), to(#'.dol_color_minus($color, -3).'));';
                     //if (! empty($event->transparency)) print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
                     //else print 'background-color: transparent !important; background: none; border: 1px solid #bbb;';
                     print ' -moz-border-radius:4px;" width="100%"><tr>';
@@ -1413,7 +1413,9 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                             {
                                 $savlabel=$event->libelle;
                                 $event->libelle=$daterange;
+                                //print '<strong>';
                                 print $event->getNomUrl(0);
+                                //print '</strong>';
                                 $event->libelle=$savlabel;
                             }
                             else
@@ -1421,7 +1423,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                                 print $daterange;
                             }
                             //print '</strong> ';
-                            print "<br>\n";
+                            print " ";
                         }
                         else
 						{
@@ -1535,14 +1537,22 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
  * Change color with a delta
  *
  * @param	string	$color		Color
- * @param 	int		$minus		Delta
+ * @param 	int		$minus		Delta (1 = 16 unit)
+ * @param   int     $minusunit  Minus unit
  * @return	string				New color
  */
-function dol_color_minus($color, $minus)
+function dol_color_minus($color, $minus, $minusunit = 16)
 {
 	$newcolor=$color;
-	$newcolor[0]=((hexdec($newcolor[0])-$minus)<0)?0:dechex((hexdec($newcolor[0])-$minus));
-	$newcolor[2]=((hexdec($newcolor[2])-$minus)<0)?0:dechex((hexdec($newcolor[2])-$minus));
-	$newcolor[4]=((hexdec($newcolor[4])-$minus)<0)?0:dechex((hexdec($newcolor[4])-$minus));
+	if ($minusunit == 16)
+	{
+    	$newcolor[0]=dechex(max(min(hexdec($newcolor[0])-$minus, 15), 0));
+    	$newcolor[2]=dechex(max(min(hexdec($newcolor[2])-$minus, 15), 0));
+    	$newcolor[4]=dechex(max(min(hexdec($newcolor[4])-$minus, 15), 0));
+	}
+	else
+	{
+	    // Not yet implemented
+	}
 	return $newcolor;
 }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6a0ffad4149..0c19d216164 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1047,9 +1047,15 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
             }
         }
 	}
+	
 	if ($showbarcode) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
-	if ($object->element == 'societe' && ! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
-		$morehtmlstatus.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
+	
+	if ($object->element == 'societe')
+	{
+	    if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) 
+    	{
+	       	$morehtmlstatus.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
+    	}
 	}
 	elseif ($object->element == 'product')
 	{
@@ -1099,9 +1105,9 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	
 	if ($object->element == 'product' || $object->element == 'bank_account')
 	{
-		if(! empty($object->label)) $morehtmlref.='<div class="refidno">'.$object->label.'</div>';
+		if (! empty($object->label)) $morehtmlref.='<div class="refidno">'.$object->label.'</div>';
 	}
-
+	
 	if ($object->element != 'product' && $object->element != 'bookmark') 
 	{
     	$morehtmlref.='<div class="refidno">';

From 5033c6ea99bffa1648db1aad5b55716c303fa248 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 11 Mar 2017 00:35:39 +0100
Subject: [PATCH 0364/1163] Add hidden constant as this is not common

---
 htdocs/projet/element.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 54643ad6780..69dde026c9b 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -406,7 +406,7 @@ $listofreferent=array(
 	'table'=>'stock_mouvement',
 	'datefieldname'=>'datem',
 	'disableamount'=>0,
-	'test'=>$conf->stock->enabled && $user->rights->stock->mouvement->lire),
+	'test'=>($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW)))
 /* No need for this, available on dedicated tab "Agenda/Events"
 'agenda'=>array(
 	'name'=>"Agenda",

From 106d74184c1164f277f9a1ab72ed57caa45bdd35 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 11 Mar 2017 00:43:06 +0100
Subject: [PATCH 0365/1163] CSS change. More information on project list of
 thirdparty.

---
 htdocs/core/lib/company.lib.php | 33 ++++++++++++++++---
 htdocs/projet/list.php          |  5 ++-
 htdocs/theme/eldy/style.css.php | 58 +++++++++++++++++++--------------
 htdocs/theme/md/style.css.php   | 40 ++++++++++++++++-------
 4 files changed, 94 insertions(+), 42 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 2e809fa6c3b..0e610df00e8 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -533,8 +533,10 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
         print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"),$buttoncreate,'');
         print "\n".'<table class="noborder" width=100%>';
 
-        $sql  = "SELECT p.rowid as id, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status";
+        $sql  = "SELECT p.rowid as id, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount";
+        $sql .= ", cls.code as opp_status_code";
         $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
         $sql .= " WHERE p.fk_soc = ".$object->id;
         $sql .= " ORDER BY p.dateo DESC";
 
@@ -544,8 +546,14 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
             $num = $db->num_rows($result);
 
             print '<tr class="liste_titre">';
-            print '<td>'.$langs->trans("Ref").'</td><td>'.$langs->trans("Name").'</td><td align="center">'.$langs->trans("DateStart").'</td><td align="center">'.$langs->trans("DateEnd").'</td>';
-            print '<td align="right">'.$langs->trans("Status").'</td>';
+            print '<td>'.$langs->trans("Ref").'</td>';
+            print '<td>'.$langs->trans("Name").'</td>';
+            print '<td class="center">'.$langs->trans("DateStart").'</td>';
+            print '<td class="center">'.$langs->trans("DateEnd").'</td>';
+            print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
+            print '<td class="center">'.$langs->trans("OpportunityStatusShort").'</td>';
+            print '<td class="right">'.$langs->trans("OpportunityProbabilityShort").'</td>';
+            print '<td class="right">'.$langs->trans("Status").'</td>';
             print '</tr>';
 
             if ($num > 0)
@@ -574,9 +582,24 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
                         // Label
                         print '<td>'.$obj->title.'</td>';
                         // Date start
-                        print '<td align="center">'.dol_print_date($db->jdate($obj->do),"day").'</td>';
+                        print '<td class="center">'.dol_print_date($db->jdate($obj->do),"day").'</td>';
                         // Date end
-                        print '<td align="center">'.dol_print_date($db->jdate($obj->de),"day").'</td>';
+                        print '<td class="center">'.dol_print_date($db->jdate($obj->de),"day").'</td>';
+                        // Opp amount
+                        print '<td class="right">';
+                        if ($obj->opp_status_code)
+                        {
+                            print price($obj->opp_amount, 1, '', 1, -1, -1, '');
+                        }
+                        print '</td>';
+                        // Opp status
+                        print '<td align="center">';
+            			if ($obj->opp_status_code) print $langs->trans("OppStatusShort".$obj->opp_status_code);
+            			print '</td>';
+			            // Opp percent
+            			print '<td align="right">';
+            			if ($obj->opp_percent) print price($obj->opp_percent, 1, '', 1, 0).'%';
+            			print '</td>';			            
                         // Status
                         print '<td align="right">'.$projecttmp->getLibStatut(5).'</td>';
 
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 68077621771..35f65b75c2a 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -741,7 +741,7 @@ while ($i < min($num,$limit))
     		print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}
-    	// Amount
+    	// Opp Amount
     	if (! empty($arrayfields['p.opp_amount']['checked']))
     	{
 			print '<td align="right">';
@@ -754,6 +754,7 @@ while ($i < min($num,$limit))
 			if (! $i) $totalarray['nbfield']++;
 			if (! $i) $totalarray['totaloppfield']=$totalarray['nbfield'];
     	}
+    	// Opp Status
     	if (! empty($arrayfields['p.fk_opp_status']['checked']))
     	{
             print '<td align="middle">';
@@ -761,6 +762,7 @@ while ($i < min($num,$limit))
 			print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}
+    	// Opp percent
 	    if (! empty($arrayfields['p.opp_percent']['checked']))
     	{
 			print '<td align="right">';
@@ -768,6 +770,7 @@ while ($i < min($num,$limit))
 			print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}
+    	// Budget
 	    if (! empty($arrayfields['p.budget_amount']['checked']))
     	{
 			print '<td align="right">';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index ffb3e7b83f8..5ce9e9515c1 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -100,7 +100,6 @@ $usegradienttop=(isset($conf->global->THEME_ELDY_TOPMENU_BACK1)?0:1);
 $usegradienttitle=(isset($conf->global->THEME_ELDY_BACKTITLE1)?0:1);
 $useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
 $borderwith=2;
-$noborderline=0;
 
 // Case of option always editable
 if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody;
@@ -273,7 +272,7 @@ input.select2-input {
 }
 .select2-choice {
 	border: none;
-	border-bottom: 1px solid #aaa !important;
+	border-bottom: 1px solid #ccc !important;
 }
 
 textarea.cke_source:focus
@@ -299,15 +298,19 @@ input {
 input, select {
 	border-bottom: solid 1px rgba(0,0,0,.2);
 
-	padding:4px;
+	padding: 4px;
 	margin-left:0px;
 	margin-bottom:1px;
 	margin-top:1px;
-	}
+}
+select {
+	padding: 4px 4px 4px 1px;
+}
 textarea {
 	border-radius: 0;
-	border: solid 1px rgba(0,0,0,.3);
-	border-top:solid 1px rgba(0,0,0,.3);
+	border-top:solid 1px rgba(0,0,0,.1);
+	border-left:solid 1px rgba(0,0,0,.1);
+	border-right:solid 1px rgba(0,0,0,.1);
 	border-bottom:solid 1px rgba(0,0,0,.2);
 
 	padding:4px;
@@ -476,6 +479,9 @@ th .button {
 .valignbottom {
 	vertical-align: bottom;
 }
+.valigntextbottom {
+	vertical-align: text-bottom;
+}
 .centpercent {
 	width: 100%;
 }
@@ -919,8 +925,8 @@ div.fiche {
 
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:($dol_hide_leftmenu?'6':'20')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'12':'6')); ?>px;
+	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:($dol_hide_leftmenu?'6':'26')); ?>px;
+	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'6')); ?>px;
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
 	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
 }
@@ -1477,10 +1483,6 @@ form#login {
 	-webkit-box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.1), 0 2px 6px rgba(60,60,60,0.15);
 	box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.1), 0 2px 6px rgba(60,60,60,0.15);
 
-	/*-moz-box-shadow: 3px 2px 20px #CCC;
-    -webkit-box-shadow: 3px 2px 20px #CCC;
-    box-shadow: 3px 2px 20px #CCC;*/
-
 	border-radius: 5px;
 	/*border-top:solid 1px rgba(180,180,180,.4);
 	border-left:solid 1px rgba(180,180,180,.4);
@@ -2273,9 +2275,6 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 
 
 table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
-<?php if (empty($noborderline)) { ?>
-	border: 1px solid #E0E0E0;
-<?php } ?>
 	border-collapse: collapse !important;
 	padding: 1px 2px 1px 3px;			/* t r b l */
 }
@@ -2295,18 +2294,14 @@ div .tdtop {
 }
 
 table.border td, div.border div div.tagtd {
-<?php if (empty($noborderline)) { ?>
-	padding: 2px 2px 2px 2px;
-	border: 1px solid #E0E0E0;
-<?php } elseif ($noborderline == 1) { ?>
 	padding: 3px 2px 3px 2px;
-	border-bottom: 1px solid #E0E0E0;
-<?php } elseif ($noborderline == 2) { ?>
-	padding: 3px 2px 3px 2px;
-	/* border: 1px solid #E0E0E0; */
-<?php } ?>
 	border-collapse: collapse;
 }
+div.tabBar .fichecenter table.border>tbody>tr>td, div.tabBar .fichecenter div.border div div.tagtd
+{
+	padding-top: 4px;
+	border-bottom: 1px solid #E0E0E0;
+}
 
 td.border, div.tagtable div div.border {
 	border-top: 1px solid #000000;
@@ -2854,6 +2849,7 @@ span.dashboardlineko {
 }
 .boxtable {
     margin-bottom: 8px !important;
+    border-bottom-width: 0 !important;
 }
 .tdboxstats {
 	text-align: center;
@@ -3910,6 +3906,9 @@ div.dataTables_length select {
 /*  Select2                                                                       */
 /* ============================================================================== */
 
+.select2-container .select2-choice {
+	border-bottom: 1px solid #ccc;
+}
 .select2-container .select2-choice > .select2-chosen {
     margin-right: 23px;
 }
@@ -3936,7 +3935,7 @@ div.dataTables_length select {
 	border-top: none !important;
 	border-left: none !important;
 	border-right: none !important;
-	border-bottom: 1px solid #aaa;
+	border-bottom: 1px solid #ccc;
 }
 .select2-drop.select2-drop-above {
 	box-shadow: none !important;
@@ -4023,6 +4022,15 @@ a span.select2-chosen
 .select2-container-multi .select2-choices .select2-search-choice {
   margin-bottom: 3px;
 }
+.select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices, .select2-container-multi .select2-choices,
+.select2-container-multi.select2-container-active .select2-choices
+{
+	border-bottom: 1px solid #ccc;
+	border-right: none;
+	border-top: none;
+	border-left: 1px solid #ddd;
+}
+
 
 /* Special case for the select2 add widget */
 #addbox .select2-container .select2-choice > .select2-chosen {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 96cb8002719..b64ce9e3a89 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -273,7 +273,7 @@ input.select2-input {
 }
 .select2-choice {
 	border: none;
-	border-bottom: 1px solid #aaa !important;
+	border-bottom: 1px solid #ccc !important;
 }
 
 textarea.cke_source:focus
@@ -296,16 +296,22 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
 input, select {
 	border-bottom: solid 1px rgba(0,0,0,.2);
 
-	padding:4px;
 	margin-left:0px;
 	margin-bottom:1px;
 	margin-top:1px;
-	}
+}
+input {
+	padding:4px;
+}
+select {
+	padding:1px;
+}
 
 textarea {
 	border-radius: 0;
-	border: solid 1px rgba(0,0,0,.3);
-	border-top:solid 1px rgba(0,0,0,.3);
+	border-top:solid 1px rgba(0,0,0,.1);
+	border-left:solid 1px rgba(0,0,0,.1);
+	border-right:solid 1px rgba(0,0,0,.1);
 	border-bottom:solid 1px rgba(0,0,0,.2);
 		
 	background-color: #FFF;
@@ -481,6 +487,9 @@ th .button {
 .valignbottom {
 	vertical-align: bottom;
 }
+.valigntextbottom {
+	vertical-align: text-bottom;
+}
 .centpercent {
 	width: 100%;
 }
@@ -1512,9 +1521,6 @@ form#login {
 	-moz-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
 	-webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
 	box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
-	/*-moz-box-shadow: 3px 2px 20px #CCC;
-    -webkit-box-shadow: 3px 2px 20px #CCC;
-    box-shadow: 3px 2px 20px #CCC;*/
 
 	border-radius: 4px;
 	border:solid 1px rgba(80,80,80,.4);
@@ -2184,9 +2190,7 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 
 
 table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
-<?php if (empty($noborderline)) { ?>
 	border: 1px solid #f4f4f4;
-<?php } ?>
 	border-collapse: collapse !important;
 	padding: 1px 2px 1px 3px;			/* t r b l */
 }
@@ -2776,6 +2780,7 @@ span.dashboardlineko {
 }
 .boxtable {
     margin-bottom: 8px !important;
+    border-bottom-width: 0 !important;
 }
 .tdboxstats {
 	text-align: center;
@@ -3856,6 +3861,9 @@ div.dataTables_length select {
 /*  Select2                                                                       */
 /* ============================================================================== */
 
+.select2-container .select2-choice {
+	border-bottom: 1px solid #ccc;
+}
 .select2-container .select2-choice > .select2-chosen {
     margin-right: 23px;
 }
@@ -3883,7 +3891,7 @@ div.dataTables_length select {
 	border-top: none !important;
 	border-left: none !important;
 	border-right: none !important;
-	border-bottom: 1px solid #aaa;
+	border-bottom: 1px solid #ccc;
 }
 .select2-drop.select2-drop-above {
 	box-shadow: none !important;
@@ -3970,6 +3978,16 @@ a span.select2-chosen
 .select2-container-multi .select2-choices .select2-search-choice {
   margin-bottom: 3px;
 }
+.select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices, .select2-container-multi .select2-choices,
+.select2-container-multi.select2-container-active .select2-choices
+{
+	border-bottom: 1px solid #ccc;
+	border-right: none;
+	border-top: none;
+	border-left: 1px solid #ddd;
+}
+
+
 
 /* Special case for the select2 add widget */
 #addbox .select2-container .select2-choice > .select2-chosen {

From 21189048e7b7efafda508a746ae8fb60120f137e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 11 Mar 2017 00:50:31 +0100
Subject: [PATCH 0366/1163] FIX choice of category was lost if an error occurs
 during creation

---
 htdocs/projet/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 7c8a3e3a71a..1b0ccb36ed0 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -595,6 +595,7 @@ if ($action == 'create' && $user->rights->projet->creer)
     	// Categories
     	print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
     	$cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
+    	$arrayselected=GETPOST('categories', 'array');
     	print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
     	print "</td></tr>";
     }

From 2054ce0aab2e7fab9a81fa4544e1cd2baba16136 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 11 Mar 2017 00:50:55 +0100
Subject: [PATCH 0367/1163] FIX Avoid flash on screen

---
 htdocs/core/class/html.formprojet.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index a0e37026ff8..571b24bca52 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -597,7 +597,7 @@ class FormProjets
 			if ($num > 0)
 			{
 				$sellist = '<select class="flat oppstatus'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-				if ($showempty) $sellist.= '<option value="-1"></option>';
+				if ($showempty) $sellist.= '<option value="-1">&nbsp;</option>';    // Without &nbsp, strange move of screen when switching value
 				if ($showallnone) $sellist.= '<option value="all"'.($preselected == 'all'?' selected="selected"':'').'>--'.$langs->trans("OnlyOpportunitiesShort").'--</option>';
 				if ($showallnone) $sellist.= '<option value="openedopp"'.($preselected == 'openedopp'?' selected="selected"':'').'>--'.$langs->trans("OpenedOpportunitiesShort").'--</option>';
 				if ($showallnone) $sellist.= '<option value="none"'.($preselected == 'none'?' selected="selected"':'').'>--'.$langs->trans("NotAnOpportunityShort").'--</option>';

From 47dd53abbe322413c3e47926d6719bb7a2d2e633 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 11 Mar 2017 02:36:22 +0100
Subject: [PATCH 0368/1163] NEW The substitution keys available for emailing
 edition is now into a popup

---
 htdocs/comm/mailing/card.php          | 18 +++---------------
 htdocs/core/class/html.form.class.php |  4 ++--
 htdocs/theme/eldy/style.css.php       |  9 ++++-----
 htdocs/theme/md/style.css.php         |  3 +--
 4 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index ea4b21d78be..2ce6a638191 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -846,11 +846,6 @@ else
 			
 			print '<table class="border" width="100%">';
 
-/*			print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td>';
-			print '<td colspan="3">';
-			print $form->showrefnav($object,'id', $linkback);
-			print '</td></tr>';
-*/
 			// Description
 			print '<tr><td class="titlefield">'.$form->editfieldkey("MailTitle",'titre',$object->titre,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
 			print $form->editfieldval("MailTitle",'titre',$object->titre,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
@@ -865,13 +860,6 @@ else
 			print '<tr><td>'.$form->editfieldkey("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
 			print $form->editfieldval("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
 			print '</td></tr>';
-
-			// Status
-			/*
-			print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4);
-			if ($object->statut == 2) print ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.')';
-			print'</td></tr>';
-			*/
 			
 			// Nb of distinct emails
 			print '<tr><td>';
@@ -1062,7 +1050,7 @@ else
 			$htmltext.='</i>';
 			
 			// Print mail content
-			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext), 'title_generic');
+			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
 			
 			dol_fiche_head('');
 			
@@ -1085,7 +1073,7 @@ else
 			}
 			else
 			{
-				print $langs->trans("NoAttachedFiles").'<br>';
+				print '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
 			}
 			print '</td></tr>';
 
@@ -1191,7 +1179,7 @@ else
 			$htmltext.='</i>';
 			
 			// Print mail content
-			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext), 'title_generic');
+			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
 
 			dol_fiche_head();
 			
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3a99965e301..a427d67ac83 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -447,7 +447,7 @@ class Form
         else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
         if ($tooltipon == 1 || $tooltipon == 3) 
         {
-            $paramfortooltiptd=' class="'.$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" ';
+            $paramfortooltiptd=' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" ';
             if ($tooltiptrigger == '') $paramfortooltiptd.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
             else $paramfortooltiptd.=' dolid="'.$tooltiptrigger.'"';
         }
@@ -524,7 +524,7 @@ class Form
         elseif ($type == 'warning') $img = img_warning($alt);
 		else $img = img_picto($alt, $type);
 
-        return $this->textwithtooltip($text, $htmltext, 2, $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger);
+        return $this->textwithtooltip($text, $htmltext, ($tooltiptrigger?3:2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger);
     }
 
     /**
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 5ce9e9515c1..e424f65ca3f 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -304,7 +304,7 @@ input, select {
 	margin-top:1px;
 }
 select {
-	padding: 4px 4px 4px 1px;
+	/* padding: 4px 4px 2px 1px; */
 }
 textarea {
 	border-radius: 0;
@@ -387,7 +387,7 @@ fieldset { border: 1px solid #AAAAAA !important; }
 	border-color: #c5c5c5;
 	border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
 	display: inline-block;
-	padding: 4px 14px;
+	padding: 3px 14px;
 	margin-bottom: 0;
 	margin-top: 0;
 	text-align: center;
@@ -3942,6 +3942,7 @@ div.dataTables_length select {
 }
 .select2-drop.select2-drop-above.select2-drop-active {
 	border-top: 1px solid #ccc;
+	border-bottom: 1px solid #ccc;
 }
 .select2-container-active .select2-choice, .select2-container-active .select2-choices 
 {
@@ -3977,8 +3978,6 @@ div.dataTables_length select {
 }
 .select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices {
 	background-image: none;
-	border-left: 1px solid #ccc !important;
-	border-right: 1px solid #ccc !important;
 	border-radius: 0 !important;
 }
 div.select2-drop-above
@@ -4025,7 +4024,7 @@ a span.select2-chosen
 .select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices, .select2-container-multi .select2-choices,
 .select2-container-multi.select2-container-active .select2-choices
 {
-	border-bottom: 1px solid #ccc;
+	border-bottom: none;
 	border-right: none;
 	border-top: none;
 	border-left: 1px solid #ddd;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index b64ce9e3a89..76776e1c41e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3898,6 +3898,7 @@ div.dataTables_length select {
 }
 .select2-drop.select2-drop-above.select2-drop-active {
 	border-top: 1px solid #ccc;
+	border-bottom: 1px solid #ccc;
 }
 .select2-container-active .select2-choice, .select2-container-active .select2-choices 
 {
@@ -3933,8 +3934,6 @@ div.dataTables_length select {
 }
 .select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices {
 	background-image: none;
-	border-left: 1px solid #ccc !important;
-	border-right: 1px solid #ccc !important;
 	border-radius: 0 !important;
 }
 div.select2-drop-above

From c7713a88392b63be7e304a164cde84d4083b8fce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 11 Mar 2017 03:01:45 +0100
Subject: [PATCH 0369/1163] CSS

---
 htdocs/theme/eldy/style.css.php | 14 +++++++-------
 htdocs/theme/md/style.css.php   |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 691513e4231..85fdd49f8ef 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -272,7 +272,7 @@ input.select2-input {
 }
 .select2-choice {
 	border: none;
-	border-bottom: 1px solid #ccc !important;
+	border-bottom:  solid 1px rgba(0,0,0,.1) !important;	/* required to avoid to lose bottom line when focus is lost on select2. */
 }
 
 textarea.cke_source:focus
@@ -288,7 +288,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     font-family: <?php print $fontlist ?>;
 
     border: none;
-    border-bottom: 1px solid #C0C0C0;
+    border-bottom: solid 1px rgba(0,0,0,.1);
     outline: none;
     margin: 0px 0px 0px 0px;
 }
@@ -296,7 +296,7 @@ input {
     line-height: 17px;
 }
 input, select {
-	border-bottom: solid 1px rgba(0,0,0,.2);
+	border-bottom: solid 1px rgba(0,0,0,.1);
 
 	padding: 4px;
 	margin-left:0px;
@@ -311,7 +311,7 @@ textarea {
 	border-top:solid 1px rgba(0,0,0,.1);
 	border-left:solid 1px rgba(0,0,0,.1);
 	border-right:solid 1px rgba(0,0,0,.1);
-	border-bottom:solid 1px rgba(0,0,0,.2);
+	border-bottom:solid 1px rgba(0,0,0,.1);
 
 	padding:4px;
 	margin-left:0px;
@@ -3909,7 +3909,7 @@ div.dataTables_length select {
 /* ============================================================================== */
 
 .select2-container .select2-choice {
-	border-bottom: 1px solid #ccc;
+	border-bottom: solid 1px rgba(0,0,0,.1);
 }
 .select2-container .select2-choice > .select2-chosen {
     margin-right: 23px;
@@ -3937,14 +3937,14 @@ div.dataTables_length select {
 	border-top: none !important;
 	border-left: none !important;
 	border-right: none !important;
-	border-bottom: 1px solid #ccc;
+	border-bottom: solid 1px rgba(0,0,0,.1);
 }
 .select2-drop.select2-drop-above {
 	box-shadow: none !important;
 }
 .select2-drop.select2-drop-above.select2-drop-active {
 	border-top: 1px solid #ccc;
-	border-bottom: 1px solid #ccc;
+	border-bottom: solid 1px rgba(0,0,0,.1);
 }
 .select2-container-active .select2-choice, .select2-container-active .select2-choices 
 {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3917967acef..481c3483724 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -288,13 +288,13 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     font-size: <?php print $fontsize ?>px;
 	font-family: <?php print $fontlist ?>;
     border: none;
-    border-bottom: 1px solid #C0C0C0;
+    border-bottom: solid 1px rgba(0,0,0,.1);
     outline: none;
     margin: 0px 0px 0px 0px;
 }
 
 input, select {
-	border-bottom: solid 1px rgba(0,0,0,.2);
+	border-bottom: solid 1px rgba(0,0,0,.1);
 
 	margin-left:0px;
 	margin-bottom:1px;

From 4ca634b41c93f2cfed9795e839249457a843301f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 11 Mar 2017 12:04:28 +0100
Subject: [PATCH 0370/1163] Better look and feel

---
 htdocs/product/stock/product.php              |  95 +++++++-------
 .../product/stock/tpl/stockcorrection.tpl.php |  11 +-
 .../product/stock/tpl/stocktransfer.tpl.php   |   5 +
 htdocs/societe/soc.php                        |   4 +-
 htdocs/theme/eldy/style.css.php               |  52 ++++----
 htdocs/theme/md/style.css.php                 |   1 -
 htdocs/variants/combinations.php              | 120 +++++++++++-------
 7 files changed, 160 insertions(+), 128 deletions(-)

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 14cd07ec817..f12316591d0 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -110,7 +110,7 @@ $parameters=array('id'=>$id, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if($action == 'addlimitstockwarehouse') {
+if ($action == 'addlimitstockwarehouse') {
 	
 	$seuil_stock_alerte = GETPOST('seuil_stock_alerte');
 	$desiredstock = GETPOST('desiredstock');
@@ -625,7 +625,8 @@ if ($id > 0 || $ref)
         print '</td></tr>';
 
         // Real stock
-        $text_stock_options = '';
+        $text_stock_options = $langs->trans("RealStockDesc").'<br>';
+        $text_stock_options.= $langs->trans("RealStockWillAutomaticallyWhen").'<br>';
         $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)?$langs->trans("DeStockOnShipment").'<br>':'');
         $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)?$langs->trans("DeStockOnValidateOrder").'<br>':'');
         $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_BILL)?$langs->trans("DeStockOnBill").'<br>':'');
@@ -642,57 +643,55 @@ if ($id > 0 || $ref)
 
 		$stocktheo = price2num($object->stock_theorique, 'MS');
 		
+		$found=0;
+		$helpondiff='<strong>'.$langs->trans("StockDiffPhysicTeoric").':</strong><br>';
+		// Number of customer orders running
+		if (! empty($conf->commande->enabled))
+		{
+		    if ($found) $helpondiff.='<br>'; else $found=1;
+		    $helpondiff.=$langs->trans("ProductQtyInCustomersOrdersRunning").': '.$object->stats_commande['qty'];
+		    $result=$object->load_stats_commande(0,'0');
+		    if ($result < 0) dol_print_error($db,$object->error);
+		    $helpondiff.=' ('.$langs->trans("ProductQtyInDraft").': '.$object->stats_commande['qty'].')';
+		}
+		
+		// Number of product from customer order already sent (partial shipping)
+		if (! empty($conf->expedition->enabled))
+		{
+		    if ($found) $helpondiff.='<br>'; else $found=1;
+		    $result=$object->load_stats_sending(0,'2');
+		    $helpondiff.=$langs->trans("ProductQtyInShipmentAlreadySent").': '.$object->stats_expedition['qty'];
+		}
+		
+		// Number of supplier order running
+		if (! empty($conf->fournisseur->enabled))
+		{
+		    if ($found) $helpondiff.='<br>'; else $found=1;
+		    $result=$object->load_stats_commande_fournisseur(0,'3,4');
+		    $helpondiff.=$langs->trans("ProductQtyInSuppliersOrdersRunning").': '.$object->stats_commande_fournisseur['qty'];
+		    $result=$object->load_stats_commande_fournisseur(0,'0,1,2');
+		    if ($result < 0) dol_print_error($db,$object->error);
+		    $helpondiff.=' ('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$object->stats_commande_fournisseur['qty'].')';
+		}
+		
+		// Number of product from supplier order already received (partial receipt)
+		if (! empty($conf->fournisseur->enabled))
+		{
+		    if ($found) $helpondiff.='<br>'; else $found=1;
+		    $helpondiff.=$langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied").': '.$object->stats_reception['qty'];
+		}
+		
         // Calculating a theorical value
-        print '<tr><td>'.$langs->trans("VirtualStock").'</td>';
-        print "<td>".(empty($stocktheo)?0:$stocktheo);
+        print '<tr><td>';
+        print $form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc"));
+        print '</td>';
+        print "<td>";
+        //print (empty($stocktheo)?0:$stocktheo);
+        print $form->textwithpicto((empty($stocktheo)?0:$stocktheo), $helpondiff);
         if ($object->seuil_stock_alerte != '' && ($object->stock_theorique < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit"));
         print '</td>';
         print '</tr>';
 
-        print '<tr><td>';
-        print $langs->trans("StockDiffPhysicTeoric");
-        print '</td>';
-        print '<td>';
-
-        $found=0;
-        // Number of customer orders running
-        if (! empty($conf->commande->enabled))
-        {
-            if ($found) print '<br>'; else $found=1;
-            print $langs->trans("ProductQtyInCustomersOrdersRunning").': '.$object->stats_commande['qty'];
-            $result=$object->load_stats_commande(0,'0');
-            if ($result < 0) dol_print_error($db,$object->error);
-            print ' ('.$langs->trans("ProductQtyInDraft").': '.$object->stats_commande['qty'].')';
-        }
-
-        // Number of product from customer order already sent (partial shipping)
-        if (! empty($conf->expedition->enabled))
-        {
-            if ($found) print '<br>'; else $found=1;
-            $result=$object->load_stats_sending(0,'2');
-            print $langs->trans("ProductQtyInShipmentAlreadySent").': '.$object->stats_expedition['qty'];
-        }
-
-        // Number of supplier order running
-        if (! empty($conf->fournisseur->enabled))
-        {
-            if ($found) print '<br>'; else $found=1;
-            $result=$object->load_stats_commande_fournisseur(0,'3,4');
-            print $langs->trans("ProductQtyInSuppliersOrdersRunning").': '.$object->stats_commande_fournisseur['qty'];
-            $result=$object->load_stats_commande_fournisseur(0,'0,1,2');
-            if ($result < 0) dol_print_error($db,$object->error);
-            print ' ('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$object->stats_commande_fournisseur['qty'].')';
-        }
-
-	    // Number of product from supplier order already received (partial receipt)
-        if (! empty($conf->fournisseur->enabled))
-        {
-            if ($found) print '<br>'; else $found=1;
-            print $langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied").': '.$object->stats_reception['qty'];
-        }
-
-        print '</td></tr>';
-
 		// Last movement
 		$sql = "SELECT max(m.datem) as datem";
 		$sql.= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index 757407a6692..28fd3dfadea 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -21,12 +21,14 @@
 
 <!-- BEGIN PHP TEMPLATE STOCKCORRECTION.TPL.PHP -->
 <?php
+
         $productref = '';
         if ($object->element == 'product') $productref = $object->ref;
 
         $langs->load("productbatch");
 
-		if (empty($id)) $id = $object->id;
+
+        if (empty($id)) $id = $object->id;
 
 		print '<script type="text/javascript" language="javascript">
 		jQuery(document).ready(function() {
@@ -46,6 +48,9 @@
 		print load_fiche_titre($langs->trans("StockCorrection"),'','title_generic.png');
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">'."\n";
+
+        dol_fiche_head();
+        
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="correct_stock">';
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
@@ -127,12 +132,14 @@
 
 		print '</table>';
 
+        dol_fiche_end();
+        
 		print '<div class="center">';
 		print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans('Save')).'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 		print '</div>';
+		
 		print '</form>';
-
 ?>
 <!-- END PHP STOCKCORRECTION.TPL.PHP -->
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index 407d8a714d8..ed367742f1c 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -48,6 +48,9 @@
 		print load_fiche_titre($langs->trans("StockTransfer"),'','title_generic.png');
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">'."\n";
+		
+		dol_fiche_head();
+		
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="transfert_stock">';
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
@@ -123,6 +126,8 @@
 
 		print '</table>';
 
+		dol_fiche_end();
+		
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Save')).'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 79a8d9cae94..474a037d23f 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1514,13 +1514,13 @@ else
             // Ref/ID
 			if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
 			{
-		        print '<tr><td>'.$langs->trans("ID").'</td><td colspan="3">';
+		        print '<tr><td class="titlefieldcreate">'.$langs->trans("ID").'</td><td colspan="3">';
             	print $object->ref;
             	print '</td></tr>';
 			}
 
             // Name
-            print '<tr><td class="titlefield">'.fieldLabel('ThirdPartyName','name',1).'</td>';
+            print '<tr><td class="titlefieldcreate">'.fieldLabel('ThirdPartyName','name',1).'</td>';
 	        print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus"></td></tr>';
 
 	        // Alias names (commercial, trademark or alias names)
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 85fdd49f8ef..6c6869ce7d4 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -260,24 +260,12 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     background-color: #FFF;
 }
 
-textarea:focus, button:focus {
-    /* v6 box-shadow: 0 0 4px #8091BF; */
-	border: 1px solid #aaa !important;
-}
-input:focus, select:focus {
-	border-bottom: 1px solid #666;
-}
 input.select2-input {
 	border-bottom: none ! important;
 }
 .select2-choice {
 	border: none;
-	border-bottom:  solid 1px rgba(0,0,0,.1) !important;	/* required to avoid to lose bottom line when focus is lost on select2. */
-}
-
-textarea.cke_source:focus
-{
-	box-shadow: none;
+	border-bottom:  solid 1px rgba(0,0,0,.2) !important;	/* required to avoid to lose bottom line when focus is lost on select2. */
 }
 
 .liste_titre input[name=month], .liste_titre input[name=month_lim] {
@@ -288,7 +276,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     font-family: <?php print $fontlist ?>;
 
     border: none;
-    border-bottom: solid 1px rgba(0,0,0,.1);
+    border-bottom: solid 1px rgba(0,0,0,.2);
     outline: none;
     margin: 0px 0px 0px 0px;
 }
@@ -296,22 +284,34 @@ input {
     line-height: 17px;
 }
 input, select {
-	border-bottom: solid 1px rgba(0,0,0,.1);
-
 	padding: 4px;
 	margin-left:0px;
 	margin-bottom:1px;
 	margin-top:1px;
 }
+
+/* Focus definitions must be after standard definition */
+textarea:focus, button:focus {
+    /* v6 box-shadow: 0 0 4px #8091BF; */
+	border: 1px solid #aaa !important;
+}
+input:focus, select:focus {
+	border-bottom: 1px solid #666;
+}
+textarea.cke_source:focus
+{
+	box-shadow: none;
+}
+
 select {
 	/* padding: 4px 4px 2px 1px; */
 }
 textarea {
 	border-radius: 0;
-	border-top:solid 1px rgba(0,0,0,.1);
-	border-left:solid 1px rgba(0,0,0,.1);
-	border-right:solid 1px rgba(0,0,0,.1);
-	border-bottom:solid 1px rgba(0,0,0,.1);
+	border-top:solid 1px rgba(0,0,0,.2);
+	border-left:solid 1px rgba(0,0,0,.2);
+	border-right:solid 1px rgba(0,0,0,.2);
+	border-bottom:solid 1px rgba(0,0,0,.2);
 
 	padding:4px;
 	margin-left:0px;
@@ -378,7 +378,8 @@ input:-webkit-autofill {
 ::-moz-placeholder { color:#bbb; } 			/* firefox 19+ */
 :-ms-input-placeholder { color:#ccc; } 		/* ie */
 input:-moz-placeholder { color:#ccc; }
-
+input[name=weight], input[name=volume], input[name=surface], input[name=sizeheight] { margin-right: 6px; }
+input[name=surface] { margin-right: 4px; }
 fieldset { border: 1px solid #AAAAAA !important; }
 .legendforfieldsetstep { padding-bottom: 10px; }
 
@@ -2297,7 +2298,7 @@ table.border td, div.border div div.tagtd {
 	padding: 3px 2px 3px 2px;
 	border-collapse: collapse;
 }
-div.tabBar .fichecenter table.border>tbody>tr>td, div.tabBar .fichecenter div.border div div.tagtd
+div.tabBar .fichecenter table.border>tbody>tr>td, div.tabBar .fichecenter div.border div div.tagtd, div.tabBar div.border div div.tagtd
 {
 	padding-top: 4px;
 	border-bottom: 1px solid #E0E0E0;
@@ -3908,8 +3909,8 @@ div.dataTables_length select {
 /*  Select2                                                                       */
 /* ============================================================================== */
 
-.select2-container .select2-choice {
-	border-bottom: solid 1px rgba(0,0,0,.1);
+.select2-choice, .select2-container .select2-choice {
+	border-bottom: solid 1px rgba(0,0,0,.2);
 }
 .select2-container .select2-choice > .select2-chosen {
     margin-right: 23px;
@@ -3937,14 +3938,13 @@ div.dataTables_length select {
 	border-top: none !important;
 	border-left: none !important;
 	border-right: none !important;
-	border-bottom: solid 1px rgba(0,0,0,.1);
 }
 .select2-drop.select2-drop-above {
 	box-shadow: none !important;
 }
 .select2-drop.select2-drop-above.select2-drop-active {
 	border-top: 1px solid #ccc;
-	border-bottom: solid 1px rgba(0,0,0,.1);
+	border-bottom: solid 1px rgba(0,0,0,.2);
 }
 .select2-container-active .select2-choice, .select2-container-active .select2-choices 
 {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 481c3483724..425b4a4fb2f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -292,7 +292,6 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     outline: none;
     margin: 0px 0px 0px 0px;
 }
-
 input, select {
 	border-bottom: solid 1px rgba(0,0,0,.1);
 
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index dc1edd01ef0..03e45a328e8 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -278,6 +278,7 @@ if (! empty($id) || ! empty($ref)) {
 		dol_fiche_end();
 	}
 
+	// Create or edit a varian
 	if ($action == 'add' || ($action == 'edit')) {
 
 		if ($action == 'add') {
@@ -311,21 +312,24 @@ if (! empty($id) || ! empty($ref)) {
 				info: []
 			};
 
-			<?php foreach ($productCombination2ValuePairs1 as $pc2v):
-			$prodattr_val->fetch($pc2v->fk_prod_attr_val);
+			<?php 
+			foreach ($productCombination2ValuePairs1 as $pc2v) {
+                $prodattr_val->fetch($pc2v->fk_prod_attr_val);
 			?>
-			variants_selected.index.push(<?php echo $pc2v->fk_prod_attr ?>);
-			variants_selected.info[<?php echo $pc2v->fk_prod_attr ?>] = {
-				attribute: variants_available[<?php echo $pc2v->fk_prod_attr ?>],
-				value: {
-					id: <?php echo $pc2v->fk_prod_attr_val ?>,
-					label: '<?php echo $prodattr_val->value ?>'
-				}
-			};
-			<?php endforeach ?>
+    			variants_selected.index.push(<?php echo $pc2v->fk_prod_attr ?>);
+    			variants_selected.info[<?php echo $pc2v->fk_prod_attr ?>] = {
+    				attribute: variants_available[<?php echo $pc2v->fk_prod_attr ?>],
+    				value: {
+    					id: <?php echo $pc2v->fk_prod_attr_val ?>,
+    					label: '<?php echo $prodattr_val->value ?>'
+    				}
+    			};
+			<?php 
+		    } 
+		    ?>
 
 			restoreAttributes = function() {
-				jQuery("select[name=attribute]").empty().append('<option value=""></option>');
+				jQuery("select[name=attribute]").empty().append('<option value="-1">&nbsp;</option>');
 
 				jQuery.each(variants_available, function (key, val) {
 					if (jQuery.inArray(val.id, variants_selected.index) == -1) {
@@ -354,12 +358,11 @@ if (! empty($id) || ! empty($ref)) {
 			};
 
 			jQuery(document).ready(function() {
-
 				jQuery("select#attribute").change(function () {
-
+					console.log("Change of field attribute");
 					var select = jQuery("select#value");
 
-					if (!jQuery(this).val().length) {
+					if (!jQuery(this).val().length || jQuery(this).val() == '-1') {
 						select.empty();
 						return;
 					}
@@ -375,9 +378,12 @@ if (! empty($id) || ! empty($ref)) {
 						}
 
 						select.empty();
+						/* console.log(data.length); */
 
 						jQuery(data).each(function (key, val) {
-							jQuery("select#value").append('<option value="' + val.id + '">' + val.value + '</option>');
+							keyforoption = val.id
+							valforoption = val.value
+							jQuery("select#value").append('<option value="' + keyforoption + '">' + valforoption + '</option>');
 						});
 					});
 				});
@@ -429,31 +435,36 @@ if (! empty($id) || ! empty($ref)) {
 				});
 			});
 		</script>
-		<?php } ?>
-
-		<form method="post" id="combinationform">
+		<?php 
+		}
+		
+        print '<form method="post" id="combinationform">';		
+		print dol_fiche_head();
+		
+		?>
+		
 		<table class="border" style="width: 100%">
-			<?php if ($action == 'add'): ?>
+			<?php if ($action == 'add') { ?>
 			<tr>
-				<td style="width: 25%"><label for="attribute"><?php echo $langs->trans('ProductAttribute') ?></label></td>
-				<td colspan="2"><select id="attribute" name="attribute">
-					<option value=""></option>
+				<td class="titlefieldcreate fieldrequired"><label for="attribute"><?php echo $langs->trans('ProductAttribute') ?></label></td>
+				<td colspan="2"><select class="flat minwidth100" id="attribute" name="attribute">
+					<option value="-1">&nbsp;</option>
 					<?php foreach ($prodattr_all as $attr): ?>
 					<option value="<?php echo $attr->id ?>"><?php echo $attr->label ?></option>
 					<?php endforeach ?>
 				</select></td>
 			</tr>
 			<tr>
-				<td style="width: 25%"><label for="value"><?php echo $langs->trans('Value') ?></label></td>
+				<td class="fieldrequired"><label for="value"><?php echo $langs->trans('Value') ?></label></td>
 				<td colspan="2">
-					<select id="value" name="value">
-						<option value=""></option>
+					<select class="flat minwidth100" id="value" name="value">
+						<option value="-1">&nbsp;</option>
 					</select>
 				</td>
 			</tr>
-			<?php endif; ?>
+			<?php } ?>
 			<tr>
-				<td style="width: 25%" class="fieldrequired"><label for="features"><?php echo $langs->trans('Features') ?></label></td>
+				<td class="titlefieldcreate fieldrequired"><label for="features"><?php echo $langs->trans('Features') ?></label></td>
 				<td><select multiple style="width: 100%" id="features">
 						<?php
 						foreach ($productCombination2ValuePairs1 as $pc2v): ?>
@@ -468,26 +479,33 @@ if (! empty($id) || ! empty($ref)) {
 				</td>
 			</tr>
 			<tr>
-				<td style="width: 25%"><label for="price_impact"><?php echo $langs->trans('PriceImpact') ?></label></td>
+				<td><label for="price_impact"><?php echo $langs->trans('PriceImpact') ?></label></td>
 				<td colspan="2"><input type="text" id="price_impact" name="price_impact" value="<?php echo price($price_impact) ?>">
 				<input type="checkbox" id="price_impact_percent" name="price_impact_percent" <?php echo $price_impact_percent ? ' checked' : '' ?>> <label for="price_impact_percent"><?php echo $langs->trans('PercentageVariation') ?></label></td>
 			</tr>
 			<tr>
-				<td style="width: 25%"><label for="weight_impact"><?php echo $langs->trans('WeightImpact') ?></label></td>
+				<td><label for="weight_impact"><?php echo $langs->trans('WeightImpact') ?></label></td>
 				<td colspan="2"><input type="text" id="weight_impact" name="weight_impact" value="<?php echo price($weight_impact) ?>"></td>
 			</tr>
 		</table>
 
-		<br>
-		<div style="text-align: center"><input type="submit" value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans('Save') ?>" class="button"></div>
-			<?php foreach ($productCombination2ValuePairs1 as $pc2v): ?>
+		<?php
+        print dol_fiche_end();
+        ?>
+
+		<div style="text-align: center">
+		
+		<input type="submit" value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans('Save') ?>" class="button"></div>
+		
+		<?php foreach ($productCombination2ValuePairs1 as $pc2v): ?>
 				<input type="hidden" name="features[]" value="<?php echo $pc2v->fk_prod_attr.':'.$pc2v->fk_prod_attr_val ?>">
-			<?php endforeach; ?>
-		</form>
+		<?php endforeach; ?>
 <?php
 
-	} else {
-
+        print '</form>';
+	}
+	else 
+	{
 		if ($action === 'delete') {
 
 			if ($prodcomb->fetch($valueid) > 0) {
@@ -565,7 +583,22 @@ if (! empty($id) || ! empty($ref)) {
 		<input type="submit" value="<?php echo $langs->trans("Apply") ?>" class="button">
 		<br>
 		<br>
-		<?php } ?>
+		<?php } 
+		
+
+		print '<div class="tabsAction">';
+		print '	<div class="inline-block divButAction">';
+		if ($productCombinations) {
+		    print '<a href="combinations.php?id='.$id.'&action=copy" class="butAction">'.$langs->trans('Copy').'</a>';
+		}
+		print '<a href="combinations.php?id='.$id.'&action=add" class="butAction">'.$langs->trans('NewProductCombination').'</a>';
+		print '<a href="generator.php?id='.$id.'" class="butAction">'.$langs->trans('ProductCombinationGenerator').'</a>';
+		print '	</div>';
+		print '</div>';
+		
+		
+		
+		?>
 
 		<table class="liste">
 			<tr class="liste_titre">
@@ -618,17 +651,6 @@ if (! empty($id) || ! empty($ref)) {
 		<?php endif ?>
 
 		<?php
-
-		print '<div class="tabsAction">';
-		print '	<div class="inline-block divButAction">';
-		if ($productCombinations) {
-			print '		<a href="combinations.php?id='.$id.'&action=copy" class="butAction">'.$langs->trans('Copy').'</a>';
-		}
-		print '		<a href="generator.php?id='.$id.'" class="butAction">'.$langs->trans('ProductCombinationGenerator').'</a>
-		<a href="combinations.php?id='.$id.'&action=add" class="butAction">'.$langs->trans('NewProductCombination').'</a>';
-		print '	</div>';
-		print '</div>';
-
 	}
 }
 

From 7103d7921e44584d9ab59ad5c28f9da7e4849d82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 11 Mar 2017 13:42:16 +0100
Subject: [PATCH 0371/1163] Uniformize look

---
 htdocs/product/traduction.php   | 20 +++++++++++++++-----
 htdocs/theme/eldy/style.css.php |  5 +++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index e7986fde074..b5f4b8b34ae 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -244,8 +244,9 @@ if ($action == 'edit')
 		foreach ($object->multilangs as $key => $value)
 		{
 			$s=picto_from_langcode($key);
-			print "<br>".($s?$s.' ':'')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', '')."</a><br>";
+			print "<br>".($s?$s.' ':'')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"')."</a><br>";
 		    
+			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border" width="100%">';
 			print '<tr><td class="tdtop titlefieldcreate fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle-'.$key.'" size="40" value="'.$object->multilangs[$key]["label"].'"></td></tr>';
 			print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
@@ -263,6 +264,8 @@ if ($action == 'edit')
 		}
 	}
 
+	print '<br>';
+	
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
@@ -274,17 +277,20 @@ if ($action == 'edit')
 }
 else if ($action != 'add')
 {
-    if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
+    //if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
     
 	if (! empty($object->multilangs))
 	{
 		foreach ($object->multilangs as $key => $value)
 		{
 			$s=picto_from_langcode($key);
+			//print '<tr><td>';
+			print ($s?$s.' ':'')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>';
+			//print '</td><td></td></tr>';
+			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border" width="100%">';
-			print '<tr class="liste_titre"><td colspan="2">'.($s?$s.' ':'')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', '').'</a></td></tr>';
 			print '<tr><td class="titlefieldcreate">'.$langs->trans('Label').'</td><td>'.$object->multilangs[$key]["label"].'</td></tr>';
-			print '<tr><td>'.$langs->trans('Description').'</td><td>'.$object->multilangs[$key]["description"].'</td></tr>';
+			print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>'.$object->multilangs[$key]["description"].'</td></tr>';
 			if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION))
 			{
                 print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
@@ -312,6 +318,8 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 	print '<input type="hidden" name="action" value="vadd">';
 	print '<input type="hidden" name="id" value="'.GETPOST("id",'int').'">';
 
+	dol_fiche_head();
+	
 	print '<table class="border" width="100%">';
 	print '<tr><td class="tdtop titlefieldcreate fieldrequired">'.$langs->trans('Language').'</td><td>';
     print $formadmin->select_language('','forcelangprod',0,$object->multilangs,1);
@@ -331,7 +339,9 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
     }
 	print '</table>';
 
-	print '<br><div class="center">';
+	dol_fiche_end();
+	
+	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 6c6869ce7d4..1f2f1a225e3 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2559,10 +2559,11 @@ div.pagination li.paginationafterarrows {
 
 
 /* Set the color for hover lines */
-.oddeven:hover, .odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover, table.dataTable tr.even:hover, table.dataTable tr.odd:hover
+.oddeven:hover, .odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover,
+table.dataTable tr.even:hover, table.dataTable tr.odd:hover
 {
 <?php if ($colorbacklinepairhover) { ?>
-	background-color: rgb(<?php echo $colorbacklinepairhover; ?>) !important;
+	background: rgb(<?php echo $colorbacklinepairhover; ?>) !important;		/* Must be background to be stronger than background of odd or even */
 <?php } ?>
 }
 

From c6c07bf9f4bbbc7e0aa15a191c0824844344f82b Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 12 Mar 2017 14:32:49 +0100
Subject: [PATCH 0372/1163] New : Add project to social contributions

---
 htdocs/compta/sociales/card.php               | 67 +++++++++++++++----
 .../sociales/class/chargesociales.class.php   | 42 +++++++-----
 htdocs/core/class/html.formprojet.class.php   |  3 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 +
 .../mysql/tables/llx_chargesociales.sql       | 36 +++++-----
 htdocs/langs/en_US/compta.lang                |  2 +
 htdocs/projet/element.php                     | 58 ++++++++++------
 7 files changed, 139 insertions(+), 71 deletions(-)

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 92cb36059e4..76456aee99b 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2016      Frédéric France      <frederic.france@free.fr>
- * Copyright (C) 2016      Alexandre Spangaro   <aspangaro@zendsi.com>
+ * Copyright (C) 2017      Alexandre Spangaro   <aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,11 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
+if (! empty($conf->projet->enabled))
+{
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
 
 $langs->load("compta");
 $langs->load("bills");
@@ -35,6 +40,7 @@ $langs->load("bills");
 $id=GETPOST('id','int');
 $action=GETPOST("action");
 $confirm=GETPOST('confirm');
+$projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
 $socid = GETPOST('socid','int');
@@ -43,8 +49,6 @@ $result = restrictedArea($user, 'tax', $id, 'chargesociales','charges');
 
 $object = new ChargeSociales($db);
 
-
-
 /* *************************************************************************** */
 /*                                                                             */
 /* Actions                                                                     */
@@ -122,6 +126,7 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 	$dateperiod=dol_mktime(GETPOST('periodhour'),GETPOST('periodmin'),GETPOST('periodsec'),GETPOST('periodmonth'),GETPOST('periodday'),GETPOST('periodyear'));
     $amount=price2num(GETPOST('amount'));
     $actioncode=GETPOST('actioncode');
+
 	if (! $dateech)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateDue")), null, 'errors');
@@ -149,13 +154,14 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 	}
 	else
 	{
-		$object->type=$actioncode;
-		$object->lib=GETPOST('label');
-		$object->date_ech=$dateech;
-		$object->periode=$dateperiod;
-		$object->amount=$amount;
-        $object->mode_reglement_id = GETPOST('mode_reglement_id');
-        $object->fk_account = GETPOST('fk_account', 'int');
+		$object->type				= $actioncode;
+		$object->lib				= GETPOST('label');
+		$object->date_ech			= $dateech;
+		$object->periode			= $dateperiod;
+		$object->amount				= $amount;
+        $object->mode_reglement_id	= GETPOST('mode_reglement_id');
+        $object->fk_account			= GETPOST('fk_account', 'int');
+		$object->fk_project			= GETPOST('fk_project');
 
 		$id=$object->create($user);
 		if ($id <= 0)
@@ -172,6 +178,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->cr
     $dateech=dol_mktime(GETPOST('echhour'),GETPOST('echmin'),GETPOST('echsec'),GETPOST('echmonth'),GETPOST('echday'),GETPOST('echyear'));
     $dateperiod=dol_mktime(GETPOST('periodhour'),GETPOST('periodmin'),GETPOST('periodsec'),GETPOST('periodmonth'),GETPOST('periodday'),GETPOST('periodyear'));
     $amount=price2num(GETPOST('amount'));
+
     if (! $dateech)
     {
         setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateDue")), null, 'errors');
@@ -196,10 +203,11 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->cr
 	{
         $result=$object->fetch($id);
 
-        $object->lib=GETPOST('label');
-        $object->date_ech=$dateech;
-        $object->periode=$dateperiod;
-        $object->amount=price2num($amount);
+        $object->lib		= GETPOST('label');
+        $object->date_ech	= $dateech;
+        $object->periode	= $dateperiod;
+        $object->amount		= price2num($amount);
+		$object->fk_project	= GETPOST("fk_project");
 
         $result=$object->update($user);
         if ($result <= 0)
@@ -325,6 +333,21 @@ if ($action == 'create')
 	print '<td><input type="text" size="6" name="amount" class="flat" value="'.GETPOST('amount').'"></td>';
     print '</tr>';
 
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+		$formproject=new FormProjets($db);
+
+		// Associated project
+		$langs->load("projects");
+
+		print '<tr><td>'.$langs->trans("Project").'</td><td>';
+
+		$numproject=$formproject->select_projects(-1, $projectid,'fk_project',0,0,1,1);
+		
+		print '</td></tr>';
+	}
+
     // Payment Mode
     print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
     $form->select_types_paiements($mode_reglement_id, 'mode_reglement_id');
@@ -485,6 +508,22 @@ if ($id > 0)
             print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
         }
 
+		// Project
+		if (! empty($conf->projet->enabled)){
+			print '<tr><td class="nowrap">';
+			print $langs->trans("Project");
+			print '</td><td>';
+			if ($action == 'edit') {
+				$formproject=new FormProjets($db);
+				$numproject=$formproject->select_projects(-1,$object->fk_project,'fk_project',16,0,1,1);
+			} else {
+				$project=new Project($db);
+				$project->fetch($object->fk_project);
+				print $project->getNomUrl(1,'',1);;
+			}
+			print '</td></tr>';
+		}
+
         // Mode of payment
         print '<tr><td>';
         print '<table class="nobordernopadding" width="100%"><tr><td>';
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 61546b39061..dae1fe109ca 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2002      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2016      Frédéric France      <frederic.france@free.fr>
+ * Copyright (C) 2017      Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,6 +53,7 @@ class ChargeSociales extends CommonObject
     var $date_modification;
     var $date_validation;
     var $fk_account;
+	var $fk_project;
 
 
     /**
@@ -75,7 +77,7 @@ class ChargeSociales extends CommonObject
     function fetch($id, $ref='')
     {
         $sql = "SELECT cs.rowid, cs.date_ech";
-        $sql.= ", cs.libelle as lib, cs.fk_type, cs.amount, cs.paye, cs.periode, cs.import_key";
+        $sql.= ", cs.libelle as lib, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key";
         $sql.= ", cs.fk_account, cs.fk_mode_reglement";
         $sql.= ", c.libelle";
         $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
@@ -93,20 +95,21 @@ class ChargeSociales extends CommonObject
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->id             = $obj->rowid;
-                $this->ref            = $obj->rowid;
-                $this->date_ech       = $this->db->jdate($obj->date_ech);
-                $this->lib            = $obj->lib;
-                $this->type           = $obj->fk_type;
-                $this->type_libelle   = $obj->libelle;
-                $this->fk_account = $obj->fk_account;
-                $this->mode_reglement_id = $obj->fk_mode_reglement;
-                $this->mode_reglement_code = $obj->mode_reglement_code;
-                $this->mode_reglement = $obj->mode_reglement_libelle;
-                $this->amount         = $obj->amount;
-                $this->paye           = $obj->paye;
-                $this->periode        = $this->db->jdate($obj->periode);
-                $this->import_key     = $this->import_key;
+                $this->id					= $obj->rowid;
+                $this->ref					= $obj->rowid;
+                $this->date_ech				= $this->db->jdate($obj->date_ech);
+                $this->lib					= $obj->lib;
+                $this->type					= $obj->fk_type;
+                $this->type_libelle			= $obj->libelle;
+                $this->fk_account			= $obj->fk_account;
+                $this->mode_reglement_id	= $obj->fk_mode_reglement;
+                $this->mode_reglement_code	= $obj->mode_reglement_code;
+                $this->mode_reglement		= $obj->mode_reglement_libelle;
+                $this->amount				= $obj->amount;
+				$this->fk_project			= $obj->fk_project;
+                $this->paye					= $obj->paye;
+                $this->periode				= $this->db->jdate($obj->periode);
+                $this->import_key			= $this->import_key;
                 
                 $this->db->free($resql);
 
@@ -166,13 +169,15 @@ class ChargeSociales extends CommonObject
 
         $this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, entity, fk_user_author, date_creation)";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, fk_projet, entity, fk_user_author, date_creation)";
         $sql.= " VALUES (".$this->type;
         $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
         $sql.= ", ".($this->mode_reglement_id>0?"'".$this->mode_reglement_id."'":"NULL");
         $sql.= ", '".$this->db->escape($this->lib)."'";
-        $sql.= ", '".$this->db->idate($this->date_ech)."','".$this->db->idate($this->periode)."'";
+        $sql.= ", '".$this->db->idate($this->date_ech)."'";
+		$sql.= ", '".$this->db->idate($this->periode)."'";
         $sql.= ", '".price2num($newamount)."'";
+		$sql.= ", ".($this->fk_project>0?$this->fk_project:'NULL');
         $sql.= ", ".$conf->entity;
         $sql.= ", ".$user->id;
         $sql.= ", '".$this->db->idate($now)."'";
@@ -283,6 +288,7 @@ class ChargeSociales extends CommonObject
         $sql.= ", date_ech='".$this->db->idate($this->date_ech)."'";
         $sql.= ", periode='".$this->db->idate($this->periode)."'";
         $sql.= ", amount='".price2num($this->amount,'MT')."'";
+		$sql.= ", fk_projet='".$this->db->escape($this->fk_project)."'";
         $sql.= ", fk_user_modif=".$user->id;
         $sql.= " WHERE rowid=".$this->id;
 
@@ -302,7 +308,7 @@ class ChargeSociales extends CommonObject
     }
 
     /**
-     * Enter description here ...
+     * Calculate amount remaining to pay by year
      *
      * @param	int		$year		Year
      * @return	number
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 571b24bca52..0a6837ecb53 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -464,7 +464,7 @@ class FormProjets
 		if ($table_element == 'projet_task') return '';		// Special cas of element we never link to a project (already always done)
 
 		$linkedtothirdparty=false;
-		if (! in_array($table_element, array('don','expensereport_det','expensereport','loan','stock_mouvement'))) $linkedtothirdparty=true;
+		if (! in_array($table_element, array('don','expensereport_det','expensereport','loan','stock_mouvement','chargesociales'))) $linkedtothirdparty=true;
 
 		$sqlfilter='';
 		$projectkey="fk_projet";
@@ -507,6 +507,7 @@ class FormProjets
 				$sql = 'SELECT t.rowid, t.label as ref';
 				$projectkey='fk_origin';
 				break;
+			case "chargesociales":
 			default:
 				$sql = "SELECT t.rowid, t.ref";
 				break;
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 0dfc5f36925..e6d525df983 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -114,3 +114,5 @@ UPDATE llx_const set value='moono-lisa' where value = 'moono' AND name = 'FCKEDI
 ALTER TABLE llx_product_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
 ALTER TABLE llx_product_fournisseur_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
 
+ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
+
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index 95ab50661b6..5c07c9a74fc 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+-- Copyright (C) 2017      Alexandre Spangaro   <aspangaro@zendsi.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -19,23 +20,24 @@
 
 create table llx_chargesociales
 (
-  rowid      integer AUTO_INCREMENT PRIMARY KEY,
-  date_ech   datetime NOT NULL,             -- date echeance
-  libelle    varchar(80) NOT NULL,
-  entity     integer DEFAULT 1 NOT NULL,	  -- multi company id
-  tms                   timestamp,
-  date_creation         datetime,						-- date de creation 
-  date_valid            datetime,						-- date de validation
-  fk_user_author		integer,						-- user making creation
-  fk_user_modif         integer,                        -- user making last change
-  fk_user_valid			integer,						-- user validating
-  fk_type    integer NOT NULL,
-  fk_account integer,                       -- bank account
-  fk_mode_reglement integer,                -- mode de reglement
-  amount     real     default 0 NOT NULL,
-  paye       smallint default 0 NOT NULL,
-  periode    date,
-  import_key varchar(14)
+  rowid				integer AUTO_INCREMENT PRIMARY KEY,
+  date_ech			datetime NOT NULL,             -- date echeance
+  libelle			varchar(80) NOT NULL,
+  entity			integer DEFAULT 1 NOT NULL,	  -- multi company id
+  tms				timestamp,
+  date_creation		datetime,						-- date de creation 
+  date_valid		datetime,						-- date de validation
+  fk_user_author	integer,						-- user making creation
+  fk_user_modif		integer,                        -- user making last change
+  fk_user_valid		integer,						-- user validating
+  fk_type			integer NOT NULL,
+  fk_account		integer,                       -- bank account
+  fk_mode_reglement	integer,                -- mode de reglement
+  amount			real     default 0 NOT NULL,
+  paye				smallint default 0 NOT NULL,
+  periode			date,
+  fk_projet			integer DEFAULT NULL,
+  import_key		varchar(14)
 )ENGINE=innodb;
 
 -- 
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index eca26d337c2..aa5f2195a56 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
 MenuNewSocialContribution=New social/fiscal tax
 NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=Social/fiscal taxes to pay
 AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
@@ -205,3 +206,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 69dde026c9b..89bab45896f 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012-2016 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2015      Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2016      Josep Lluís Amador   <joseplluis@lliuretic.cat>
  *
@@ -34,25 +34,27 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (! empty($conf->propal->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (! empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
-if (! empty($conf->commande->enabled))    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (! empty($conf->propal->enabled))		require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (! empty($conf->facture->enabled))		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+if (! empty($conf->facture->enabled))		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+if (! empty($conf->commande->enabled))		require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 if (! empty($conf->supplier_proposal->enabled)) require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (! empty($conf->contrat->enabled))     require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (! empty($conf->ficheinter->enabled))  require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-if (! empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
-if (! empty($conf->expensereport->enabled)) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-if (! empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-if (! empty($conf->don->enabled))         require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-if (! empty($conf->loan->enabled))        require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
-if (! empty($conf->stock->enabled))	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+if (! empty($conf->fournisseur->enabled))	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+if (! empty($conf->fournisseur->enabled))	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+if (! empty($conf->contrat->enabled))		require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+if (! empty($conf->ficheinter->enabled))	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+if (! empty($conf->deplacement->enabled))	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+if (! empty($conf->expensereport->enabled))	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+if (! empty($conf->agenda->enabled))		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+if (! empty($conf->don->enabled))			require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
+if (! empty($conf->loan->enabled))			require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+if (! empty($conf->stock->enabled))			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+if (! empty($conf->tax->enabled))			require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 
 $langs->load("projects");
 $langs->load("companies");
 $langs->load("suppliers");
+$langs->load("compta");
 if (! empty($conf->facture->enabled))  	    $langs->load("bills");
 if (! empty($conf->commande->enabled)) 	    $langs->load("orders");
 if (! empty($conf->propal->enabled))   	    $langs->load("propal");
@@ -406,7 +408,20 @@ $listofreferent=array(
 	'table'=>'stock_mouvement',
 	'datefieldname'=>'datem',
 	'disableamount'=>0,
-	'test'=>($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW)))
+	'test'=>($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW))),
+'chargesociales'=>array(
+	'name'=>"SocialContribution",
+	'title'=>"ListSocialContributionAssociatedProject",
+	'class'=>'ChargeSociales',
+	'margin'=>'add',
+	'table'=>'chargesociales',
+	'datefieldname'=>'date_ech',
+	'disableamount'=>0,
+    'urlnew'=>DOL_URL_ROOT.'/compta/sociales/card.php?action=create&projectid='.$id,
+    'lang'=>'compta',
+    'buttonnew'=>'AddSocialContribution',
+    'testnew'=>$user->rights->tax->charges->lire,
+    'test'=>$conf->tax->enabled && $user->rights->tax->charges->lire)
 /* No need for this, available on dedicated tab "Agenda/Events"
 'agenda'=>array(
 	'name'=>"Agenda",
@@ -539,7 +554,7 @@ foreach ($listofreferent as $key => $value)
 
                 // Special cases
 				if ($tablename != 'expensereport_det' && method_exists($element, 'fetch_thirdparty')) $element->fetch_thirdparty();
-				if ($tablename == 'don') $total_ht_by_line=$element->amount;
+				if ($tablename == 'don' || $tablename == 'chargesociales') $total_ht_by_line=$element->amount;
 				elseif ($tablename == 'stock_mouvement') $total_ht_by_line=$element->price*abs($element->qty);
 				elseif ($tablename == 'projet_task')
 				{
@@ -564,7 +579,7 @@ foreach ($listofreferent as $key => $value)
 
 				if ($qualifiedfortotal) $total_ht = $total_ht + $total_ht_by_line;
 
-				if ($tablename == 'don') $total_ttc_by_line=$element->amount;
+				if ($tablename == 'don' || $tablename == 'chargesociales') $total_ttc_by_line=$element->amount;
 				elseif ($tablename == 'stock_mouvement') $total_ttc_by_line=$element->price*abs($element->qty);
 				elseif ($tablename == 'projet_task')
 				{
@@ -865,9 +880,10 @@ foreach ($listofreferent as $key => $value)
 				$date=''; $total_time_by_line = null;
 				if ($tablename == 'expensereport_det') $date = $element->date;      // No draft status on lines
 				elseif ($tablename == 'stock_mouvement') $date = $element->datem;
+				if ($tablename == 'chargesociales') $date = $element->date_ech;
 				elseif (! empty($element->status) || ! empty($element->statut) || ! empty($element->fk_status))
 				{
-				    if ($tablename=='don') $date = $element->datedon;
+				    if ($tablename == 'don') $date = $element->datedon;
 				    if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
     				{
     				    $date=($element->date_commande?$element->date_commande:$element->date_valid);
@@ -927,7 +943,7 @@ foreach ($listofreferent as $key => $value)
 				{
 				    $total_ht_by_line=null;
 				    $othermessage='';
-					if ($tablename == 'don') $total_ht_by_line=$element->amount;
+					if ($tablename == 'don' || $tablename == 'chargesociales') $total_ht_by_line=$element->amount;
 					elseif ($tablename == 'stock_mouvement') $total_ht_by_line=$element->price*abs($element->qty);
 					elseif (in_array($tablename, array('projet_task')))
 					{
@@ -967,7 +983,7 @@ foreach ($listofreferent as $key => $value)
 				if (empty($value['disableamount']))
 				{
 				    $total_ttc_by_line=null;
-					if ($tablename == 'don') $total_ttc_by_line=$element->amount;
+					if ($tablename == 'don' || $tablename == 'chargesociales') $total_ttc_by_line=$element->amount;
 					elseif ($tablename == 'stock_mouvement') $total_ttc_by_line=$element->price*abs($element->qty);
 					elseif ($tablename == 'projet_task')
 					{

From e8a1f0ba46ed8272b123170feaa0a0ffa137f9a5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 12 Mar 2017 17:10:32 +0100
Subject: [PATCH 0373/1163] Uniformize code

---
 htdocs/variants/combinations.php | 71 +++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 03e45a328e8..dabace75ac0 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -615,35 +615,48 @@ if (! empty($id) || ! empty($ref)) {
 				<th class="liste_titre" style="text-align: center;"><?php echo $langs->trans('OnBuy') ?></th>
 				<th class="liste_titre"></th>
 			</tr>
-			<?php foreach ($productCombinations as $currcomb):
-				$prodstatic->fetch($currcomb->fk_product_child); ?>
-			<tr <?php echo $bc[!$var] ?>>
-				<td><input type="checkbox" name="select[<?php echo $prodstatic->id ?>]"></td>
-				<td><?php echo $prodstatic->getNomUrl(1) ?></td>
-				<td>
-					<?php
-
-					$productCombination2ValuePairs = $comb2val->fetchByFkCombination($currcomb->id);
-					$iMax = count($productCombination2ValuePairs);
-
-					for ($i = 0; $i < $iMax; $i++) {
-						echo dol_htmlentities($productCombination2ValuePairs[$i]);
-
-						if ($i !== ($iMax - 1)) {
-							echo ', ';
-						}
-					} ?>
-				</td>
-				<td style="text-align: right"><?php echo ($currcomb->variation_price >= 0 ? '+' : '').price($currcomb->variation_price).($currcomb->variation_price_percentage ? ' %' : '') ?></td>
-				<td style="text-align: right"><?php echo ($currcomb->variation_weight >= 0 ? '+' : '').price($currcomb->variation_weight).' '.measuring_units_string($prodstatic->weight_units, 'weight') ?></td>
-				<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 0) ?></td>
-				<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 1) ?></td>
-				<td style="text-align: right">
-					<a href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=edit&valueid='.$currcomb->id, 2) ?>"><?php echo img_edit() ?></a>
-					<a href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=delete&valueid='.$currcomb->id, 2) ?>"><?php echo img_delete() ?></a>
-				</td>
-			</tr>
-			<?php $var = !$var; endforeach ?>
+			<?php
+			
+			if (count($productCombinations))
+			{
+    			foreach ($productCombinations as $currcomb) {
+    				$prodstatic->fetch($currcomb->fk_product_child); 
+    				?>
+    				<tr <?php echo $bc[!$var] ?>>
+    				<td><input type="checkbox" name="select[<?php echo $prodstatic->id ?>]"></td>
+    				<td><?php echo $prodstatic->getNomUrl(1) ?></td>
+    				<td>
+    					<?php
+    
+    					$productCombination2ValuePairs = $comb2val->fetchByFkCombination($currcomb->id);
+    					$iMax = count($productCombination2ValuePairs);
+    
+    					for ($i = 0; $i < $iMax; $i++) {
+    						echo dol_htmlentities($productCombination2ValuePairs[$i]);
+    
+    						if ($i !== ($iMax - 1)) {
+    							echo ', ';
+    						}
+    					} ?>
+    				</td>
+    				<td style="text-align: right"><?php echo ($currcomb->variation_price >= 0 ? '+' : '').price($currcomb->variation_price).($currcomb->variation_price_percentage ? ' %' : '') ?></td>
+    				<td style="text-align: right"><?php echo ($currcomb->variation_weight >= 0 ? '+' : '').price($currcomb->variation_weight).' '.measuring_units_string($prodstatic->weight_units, 'weight') ?></td>
+    				<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 0) ?></td>
+    				<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 1) ?></td>
+    				<td style="text-align: right">
+    					<a href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=edit&valueid='.$currcomb->id, 2) ?>"><?php echo img_edit() ?></a>
+    					<a href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=delete&valueid='.$currcomb->id, 2) ?>"><?php echo img_delete() ?></a>
+    				</td>
+    			</tr>
+    			<?php
+    			$var = !$var; 
+			    }
+			}
+			else
+			{
+			     print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';   
+			}
+			?>
 		</table>
 
 		<?php if ($productCombinations): ?>

From 520bdac5109ae86112f1a8f8248d8f24891a978a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 13 Mar 2017 01:35:04 +0100
Subject: [PATCH 0374/1163] Translation

---
 htdocs/core/modules/modNotification.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
index c29c77b8f24..72c90ca7a6d 100644
--- a/htdocs/core/modules/modNotification.class.php
+++ b/htdocs/core/modules/modNotification.class.php
@@ -44,7 +44,7 @@ class modNotification extends DolibarrModules
 		$this->family = "technic";
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Gestion des notifications (par mail) sur evenement Dolibarr";
+		$this->description = "EMail notifications (push) on business Dolibarr events";
 		$this->version = 'dolibarr';	// 'experimental' or 'dolibarr' or version
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 1;

From b8b32ae2e34805bebc26928dd27a17457c135629 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 13 Mar 2017 02:10:22 +0100
Subject: [PATCH 0375/1163] FIX colspan

---
 htdocs/societe/rib.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 65bd12b2be4..feea1aca0ce 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -359,14 +359,16 @@ if ($socid && $action != 'edit' && $action != "create")
 
     print load_fiche_titre($langs->trans("DefaultRIB"), '', '');
 
+    print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
+    
     print '<table class="border centpercent">';
 
     print '<tr><td class="titlefield">'.$langs->trans("LabelRIB").'</td>';
-    print '<td colspan="4">'.$account->label.'</td></tr>';
+    print '<td>'.$account->label.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("BankName").'</td>';
-	print '<td colspan="4">'.$account->bank.'</td></tr>';
+	print '<td>'.$account->bank.'</td></tr>';
 
 	// Show fields of bank account
 	foreach($account->getFieldsToShow(1) as $val)
@@ -407,24 +409,24 @@ if ($socid && $action != 'edit' && $action != "create")
 		}
 
 		print '<tr><td>'.$langs->trans($val).'</td>';
-		print '<td colspan="4">'.$content.'</td>';
+		print '<td>'.$content.'</td>';
 		print '</tr>';
 	}
 
-	print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
+	print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 	print $account->domiciliation;
 	print "</td></tr>\n";
 
-	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td><td colspan="4">';
+	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td><td>';
 	print $account->proprio;
 	print "</td></tr>\n";
 
-	print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
+	print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
 	print $account->owner_address;
 	print "</td></tr>\n";
 
 	print '</table>';
-
+    print '</div>';
 
 	print '<br>';
 	
@@ -611,7 +613,7 @@ if ($socid && $action != 'edit' && $action != "create")
         {
         	$colspan=8;
         	if (! empty($conf->prelevement->enabled)) $colspan+=2;
-            print '<tr '.$bc[0].'><td colspan="'.$colspan.'" align="center">'.$langs->trans("NoBANRecord").'</td></tr>';
+            print '<tr '.$bc[0].'><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoBANRecord").'</td></tr>';
         }
 
         print '</table>';

From ca80c588532b718b79f794d3bbb85595400995bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 13 Mar 2017 02:14:42 +0100
Subject: [PATCH 0376/1163] Fix PHP error

---
 htdocs/core/ajax/box.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php
index fbb8fc759ad..7826747769b 100644
--- a/htdocs/core/ajax/box.php
+++ b/htdocs/core/ajax/box.php
@@ -73,7 +73,7 @@ if ($boxorder && $zone != '' &&  $userid > 0)
 	if ($result > 0) 
 	{
 	    $langs->load("boxes");
-	    if (empty(GETPOST('closing')))
+	    if (! GETPOST('closing'))
 	    {
 	       setEventMessages($langs->trans("BoxAdded"), null);
 	    }

From 14ed67499ed9e612e5a80444e61ee4d79fd10391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?= <joseplluis@lliuretic.cat>
Date: Tue, 14 Mar 2017 00:26:47 +0100
Subject: [PATCH 0377/1163] FIX html tag

Fix incorrect html tag not closed
---
 htdocs/societe/tpl/linesalesrepresentative.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
index 0c3dd0656b8..d8d4b4b08bb 100644
--- a/htdocs/societe/tpl/linesalesrepresentative.tpl.php
+++ b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
@@ -3,7 +3,7 @@
         print '<tr><td>';
         print '<table width="100%" class="nobordernopadding"><tr><td>';
         print $langs->trans('SalesRepresentatives');
-        print '<td><td align="right">';
+        print '</td><td align="right">';
         if ($user->rights->societe->creer && $user->rights->societe->client->voir)
         print '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$object->id.'">'.img_edit('',1).'</a>';
         else

From 192a825de8548ed7cbbbafbb4cc0f841c60527f7 Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Tue, 14 Mar 2017 09:25:29 +0100
Subject: [PATCH 0378/1163] NEW ODT docs for USER USERGROUP CONTRACT and
 PRODUCT class

---
 htdocs/core/actions_builddoc.inc.php          |   3 +-
 htdocs/core/class/html.formfile.class.php     |  29 +-
 htdocs/core/lib/functions2.lib.php            |   2 +-
 .../doc/doc_generic_contract_odt.modules.php  | 495 +++++++++++++++++
 .../doc/doc_generic_product_odt.modules.php   | 499 +++++++++++++++++
 .../user/doc/doc_generic_user_odt.modules.php | 433 +++++++++++++++
 .../doc/doc_generic_usergroup_odt.modules.php | 501 ++++++++++++++++++
 .../usergroup/modules_usergroup.class.php     |   2 +-
 .../install/doctemplates/contracts/index.html |   0
 .../contracts/template_contract.odt           | Bin 0 -> 25866 bytes
 .../install/doctemplates/products/index.html  |   0
 .../products/template_product.odt             | Bin 0 -> 17591 bytes
 .../doctemplates/usergroups/index.html        |   0
 .../usergroups/template_usergroup.odt         | Bin 0 -> 17537 bytes
 htdocs/install/doctemplates/users/index.html  |   0
 .../doctemplates/users/template_user.odt      | Bin 0 -> 13431 bytes
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   8 +
 htdocs/install/step1.php                      |  12 +-
 htdocs/product/admin/product.php              | 264 ++++-----
 htdocs/product/card.php                       |  24 +-
 htdocs/user/group/card.php                    |  10 +-
 21 files changed, 2141 insertions(+), 141 deletions(-)
 create mode 100644 htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
 create mode 100644 htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
 create mode 100644 htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
 create mode 100644 htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
 create mode 100644 htdocs/install/doctemplates/contracts/index.html
 create mode 100755 htdocs/install/doctemplates/contracts/template_contract.odt
 create mode 100644 htdocs/install/doctemplates/products/index.html
 create mode 100644 htdocs/install/doctemplates/products/template_product.odt
 create mode 100644 htdocs/install/doctemplates/usergroups/index.html
 create mode 100755 htdocs/install/doctemplates/usergroups/template_usergroup.odt
 create mode 100644 htdocs/install/doctemplates/users/index.html
 create mode 100755 htdocs/install/doctemplates/users/template_user.odt

diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index adbc17a4161..94f4229e0db 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -33,13 +33,14 @@
 // Build doc
 if ($action == 'builddoc' && $permissioncreate)
 {
+	
     if (is_numeric(GETPOST('model')))
     {
         $error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Model"));
     }
     else
     {
-        // Reload to get all modified line records and be ready for hooks
+   		// Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
         $ret = $object->fetch_thirdparty();
         /*if (empty($object->id) || ! $object->id > 0)
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 44b6a8adcd7..5aa699c055c 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -333,7 +333,7 @@ class FormFile
         
         $titletoshow=$langs->trans("Documents");
         if (! empty($title)) $titletoshow=$title;
-
+        
         // Show table
         if ($genallowed)
         {
@@ -439,6 +439,15 @@ class FormFile
             		$modellist=ModelePDFTask::liste_modeles($this->db);
             	}
             }
+            elseif ($modulepart == 'product')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
+                    $modellist=ModelePDFProduct::liste_modeles($this->db);
+                }
+            }
             elseif ($modulepart == 'export')
             {
                 if (is_array($genallowed)) $modellist=$genallowed;
@@ -524,6 +533,24 @@ class FormFile
             {
                 $modellist='';
             }
+            elseif ($modulepart == 'user')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
+                    $modellist=ModelePDFUser::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'usergroup')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
+                    $modellist=ModelePDFUserGroup::liste_modeles($this->db);
+                }
+            }
             else //if ($modulepart != 'agenda')
             {
             	// For normalized standard modules
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 0a4eb1b0fe1..dc0541e39ef 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1509,7 +1509,7 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
     $sql.= " WHERE type = '".$type."'";
     $sql.= " AND entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
     $sql.= " ORDER BY description DESC";
-
+		
     dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG);
     $resql = $db->query($sql);
     if ($resql)
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
new file mode 100644
index 00000000000..a58d00455e8
--- /dev/null
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -0,0 +1,495 @@
+<?php
+/* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+* or see http://www.gnu.org/
+*/
+
+/**
+ *	\file       htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+ *	\ingroup    societe
+ *	\brief      File of class to build ODT documents for third parties
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
+
+
+/**
+ *	Class to build documents using ODF templates generator
+ */
+class doc_generic_contract_odt extends ModelePDFContract
+{
+	var $emetteur;	// Objet societe qui emet
+
+	var $phpmin = array(5,2,0);	// Minimum version of PHP required by module
+	var $version = 'dolibarr';
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		global $conf,$langs,$mysoc;
+
+		$langs->load("main");
+		$langs->load("companies");
+
+		$this->db = $db;
+		$this->name = "ODT templates";
+		$this->description = $langs->trans("DocumentModelOdt");
+		$this->scandir = 'CONTRACT_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+
+		// Dimension page pour format A4
+		$this->type = 'odt';
+		$this->page_largeur = 0;
+		$this->page_hauteur = 0;
+		$this->format = array($this->page_largeur,$this->page_hauteur);
+		$this->marge_gauche=0;
+		$this->marge_droite=0;
+		$this->marge_haute=0;
+		$this->marge_basse=0;
+
+		$this->option_logo = 1;                    // Affiche logo
+		$this->option_tva = 0;                     // Gere option tva CONTRACT_TVAOPTION
+		$this->option_modereg = 0;                 // Affiche mode reglement
+		$this->option_condreg = 0;                 // Affiche conditions reglement
+		$this->option_codeproduitservice = 0;      // Affiche code produit-service
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
+		$this->option_escompte = 0;                // Affiche si il y a eu escompte
+		$this->option_credit_note = 0;             // Support credit notes
+		$this->option_freetext = 1;				   // Support add of a personalised text
+		$this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
+
+		// Recupere emetteur
+		$this->emetteur=$mysoc;
+		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+	}
+
+
+	/**
+	 *	Return description of a module
+	 *
+	 *	@param	Translate	$langs      Lang object to use for output
+	 *	@return string       			Description
+	 */
+	function info($langs)
+	{
+		global $conf,$langs;
+
+		$langs->load("companies");
+		$langs->load("errors");
+
+		$form = new Form($this->db);
+
+		$texte = $this->description.".<br>\n";
+		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte.= '<input type="hidden" name="param1" value="CONTRACT_ADDON_PDF_ODT_PATH">';
+		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
+		{
+			$texte.= '<input type="hidden" name="param2" value="CONTRACT_ADDON_PDF_ODT_DEFAULT">';
+			$texte.= '<input type="hidden" name="param3" value="CONTRACT_ADDON_PDF_ODT_TOBILL">';
+			$texte.= '<input type="hidden" name="param4" value="CONTRACT_ADDON_PDF_ODT_CLOSED">';
+		}
+		$texte.= '<table class="nobordernopadding" width="100%">';
+
+		// List of directories area
+		$texte.= '<tr><td>';
+		$texttitle=$langs->trans("ListOfDirectories");
+		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->CONTRACT_ADDON_PDF_ODT_PATH)));
+		$listoffiles=array();
+		foreach($listofdir as $key=>$tmpdir)
+		{
+			$tmpdir=trim($tmpdir);
+			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+			if (! $tmpdir) {
+				unset($listofdir[$key]); continue;
+			}
+			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			else
+			{
+				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+			}
+		}
+		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		// Add list of substitution keys
+		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
+
+		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
+		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte.= '<textarea class="flat" cols="60" name="value1">';
+		$texte.=$conf->global->CONTRACT_ADDON_PDF_ODT_PATH;
+		$texte.= '</textarea>';
+		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte.= '<br></div></div>';
+
+		// Scan directories
+		if (count($listofdir))
+		{
+			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
+
+			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
+			{
+				// Model for creation
+				$liste=ModelePDFContract::liste_modeles($this->db);
+				$texte.= '<table width="50%;">';
+				$texte.= '<tr>';
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value2',$liste,$conf->global->CONTRACT_ADDON_PDF_ODT_DEFAULT);
+				$texte.= "</td></tr>";
+
+				$texte.= '<tr>';
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value3',$liste,$conf->global->CONTRACT_ADDON_PDF_ODT_TOBILL);
+				$texte.= "</td></tr>";
+				$texte.= '<tr>';
+
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value4',$liste,$conf->global->CONTRACT_ADDON_PDF_ODT_CLOSED);
+				$texte.= "</td></tr>";
+				$texte.= '</table>';
+			}
+		}
+
+		$texte.= '</td>';
+
+		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte.= '</td>';
+		$texte.= '</tr>';
+
+		$texte.= '</table>';
+		$texte.= '</form>';
+
+		return $texte;
+	}
+
+	/**
+	 *	Function to build a document on disk using the generic odt module.
+	 *
+	 *	@param		Contract		$object				Object source to build document
+	 *	@param		Translate	$outputlangs		Lang output object
+	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *	@return		int         					1 if OK, <=0 if KO
+	 */
+	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	{
+		global $user,$langs,$conf,$mysoc,$hookmanager;
+
+		if (empty($srctemplatepath))
+		{
+			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+			return -1;
+		}
+
+		// Add odtgeneration hook
+		if (! is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
+
+		if (! is_object($outputlangs)) $outputlangs=$langs;
+		$sav_charset_output=$outputlangs->charset_output;
+		$outputlangs->charset_output='UTF-8';
+
+		$outputlangs->load("main");
+		$outputlangs->load("dict");
+		$outputlangs->load("companies");
+		$outputlangs->load("bills");
+
+		if ($conf->contrat->dir_output)
+		{
+			// If $object is id instead of object
+			if (! is_object($object))
+			{
+				$id = $object;
+				$object = new Contract($this->db);
+				$result=$object->fetch($id);
+				if ($result < 0)
+				{
+					dol_print_error($this->db,$object->error);
+					return -1;
+				}
+			}
+
+			$dir = $conf->contrat->dir_output;
+			$objectref = dol_sanitizeFileName($object->ref);
+			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			$file = $dir . "/" . $objectref . ".odt";
+
+			if (! file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					return -1;
+				}
+			}
+
+			if (file_exists($dir))
+			{
+				//print "srctemplatepath=".$srctemplatepath;	// Src filename
+				$newfile=basename($srctemplatepath);
+				$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
+				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
+				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+
+				$newfiletmp=$objectref.'_'.$newfiletmp;
+
+				// Get extension (ods or odt)
+				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
+				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+				{
+				    $format=$conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+				}
+				else
+				{
+					$filename=$newfiletmp.'.'.$newfileformat;
+				}
+				$file=$dir.'/'.$filename;
+				//print "newdir=".$dir;
+				//print "newfile=".$newfile;
+				//print "file=".$file;
+				//print "conf->contrat->dir_temp=".$conf->contrat->dir_temp;
+
+				dol_mkdir($conf->contrat->dir_temp);
+
+
+				// If CUSTOMER contact defined on contract, we use it
+				$usecontact=false;
+				$arrayidcontact=$object->getIdContact('external','CUSTOMER');
+				if (count($arrayidcontact) > 0)
+				{
+					$usecontact=true;
+					$result=$object->fetch_contact($arrayidcontact[0]);
+				}
+
+				// Recipient name
+				if (! empty($usecontact))
+				{
+					// On peut utiliser le nom de la societe du contact
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
+					else {
+                        			$socobject = $object->client;
+                        			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+                        			$contactobject = $object->contact;
+                    			}
+				}
+				else
+				{
+					$socobject=$object->client;
+				}
+				// Make substitution
+				$substitutionarray=array(
+				'__FROM_NAME__' => $this->emetteur->name,
+				'__FROM_EMAIL__' => $this->emetteur->email,
+				'__TOTAL_TTC__' => $object->total_ttc,
+				'__TOTAL_HT__' => $object->total_ht,
+				'__TOTAL_VAT__' => $object->total_vat
+				);
+				complete_substitutions_array($substitutionarray, $langs, $object);
+				// Call the ODTSubstitution hook
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$substitutionarray);
+				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				// Line of free text
+				$newfreetext='';
+				$paramfreetext='contract_FREE_TEXT';
+				if (! empty($conf->global->$paramfreetext))
+				{
+					$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+				}
+
+				// Open and load template
+				require_once ODTPHP_PATH.'odf.php';
+				try {
+					$odfHandler = new odf(
+						$srctemplatepath,
+						array(
+						'PATH_TO_TMP'	  => $conf->contrat->dir_temp,
+						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'DELIMITER_LEFT'  => '{',
+						'DELIMITER_RIGHT' => '}'
+						)
+					);
+				}
+				catch(Exception $e)
+				{
+					$this->error=$e->getMessage();
+					return -1;
+				}
+				// After construction $odfHandler->contentXml contains content and
+				// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
+				// [!-- BEGIN lines --]*[!-- END lines --]
+				//print html_entity_decode($odfHandler->__toString());
+				//print exit;
+
+
+				// Make substitutions into odt of freetext
+				try {
+					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
+				}
+				catch(OdfException $e)
+				{
+				}
+
+				// Make substitutions into odt
+				$array_contract=$this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
+				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
+				$array_other=$this->get_substitutionarray_other($outputlangs);
+		                // retrieve contact information for use in contract as contact_xxx tags
+                		$array_thirdparty_contact = array();
+                		if ($usecontact)
+                    			$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+
+				$tmparray = array_merge($array_contract,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
+				complete_substitutions_array($tmparray, $outputlangs, $object);
+				$object->fetch_optionals();
+				// Call the ODTSubstitution hook
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						if (preg_match('/logo$/',$key)) // Image
+						{
+							if (file_exists($value)) $odfHandler->setImage($key, $value);
+							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						}
+						else    // Text
+						{
+							$odfHandler->setVars($key, $value, true, 'UTF-8');
+						}
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+				// Replace tags of lines
+				try
+				{
+					$listlines = $odfHandler->setSegment('lines');
+					foreach ($object->lines as $line)
+					{
+						$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
+						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
+						// Call the ODTSubstitutionLine hook
+						$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
+						$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+						foreach($tmparray as $key => $val)
+						{
+							try
+							{
+								$listlines->setVars($key, $val, true, 'UTF-8');
+							}
+							catch(OdfException $e)
+							{
+							}
+							catch(SegmentException $e)
+							{
+							}
+						}
+						$listlines->merge();
+					}
+					$odfHandler->mergeSegment($listlines);
+				}
+				catch(OdfException $e)
+				{
+					$this->error=$e->getMessage();
+					dol_syslog($this->error, LOG_WARNING);
+					return -1;
+				}
+
+				// Replace labels translated
+				$tmparray=$outputlangs->get_translations_for_substitutions();
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+
+				// Call the beforeODTSave hook
+				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				// Write new file
+				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+					try {
+						$odfHandler->exportAsAttachedPDF($file);
+					}catch (Exception $e){
+						$this->error=$e->getMessage();
+						return -1;
+					}
+				}
+				else {
+					try {
+					$odfHandler->saveToDisk($file);
+					}catch (Exception $e){
+						$this->error=$e->getMessage();
+						return -1;
+					}
+				}
+
+				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				if (! empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$odfHandler=null;	// Destroy object
+
+				return 1;   // Success
+			}
+			else
+			{
+				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				return -1;
+			}
+		}
+
+		return -1;
+	}
+
+}
+
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
new file mode 100644
index 00000000000..3341ad20f08
--- /dev/null
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -0,0 +1,499 @@
+<?php
+/* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@products.sourceforge.net>
+ * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+* or see http://www.gnu.org/
+*/
+
+/**
+ *	\file       htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+ *	\ingroup    societe
+ *	\brief      File of class to build ODT documents for third parties
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
+
+
+/**
+ *	Class to build documents using ODF templates generator
+ */
+class doc_generic_product_odt extends ModelePDFProduct
+{
+	var $emetteur;	// Objet societe qui emet
+
+	var $phpmin = array(5,2,0);	// Minimum version of PHP required by module
+	var $version = 'dolibarr';
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		global $conf,$langs,$mysoc;
+
+		$langs->load("main");
+		$langs->load("companies");
+
+		$this->db = $db;
+		$this->name = "ODT templates";
+		$this->description = $langs->trans("DocumentModelOdt");
+		$this->scandir = 'PRODUCT_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+
+		// Dimension page pour format A4
+		$this->type = 'odt';
+		$this->page_largeur = 0;
+		$this->page_hauteur = 0;
+		$this->format = array($this->page_largeur,$this->page_hauteur);
+		$this->marge_gauche=0;
+		$this->marge_droite=0;
+		$this->marge_haute=0;
+		$this->marge_basse=0;
+
+		$this->option_logo = 1;                    // Affiche logo
+		$this->option_tva = 0;                     // Gere option tva PRODUCT_TVAOPTION
+		$this->option_modereg = 0;                 // Affiche mode reglement
+		$this->option_condreg = 0;                 // Affiche conditions reglement
+		$this->option_codeproduitservice = 0;      // Affiche code produit-service
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
+		$this->option_escompte = 0;                // Affiche si il y a eu escompte
+		$this->option_credit_note = 0;             // Support credit notes
+		$this->option_freetext = 1;				   // Support add of a personalised text
+		$this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
+
+		// Recupere emetteur
+		$this->emetteur=$mysoc;
+		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+	}
+
+
+	/**
+	 *	Return description of a module
+	 *
+	 *	@param	Translate	$langs      Lang object to use for output
+	 *	@return string       			Description
+	 */
+	function info($langs)
+	{
+		global $conf,$langs;
+		
+		$langs->load("companies");
+		$langs->load("errors");
+
+		$form = new Form($this->db);
+
+		$texte = $this->description.".<br>\n";
+		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte.= '<input type="hidden" name="param1" value="PRODUCT_ADDON_PDF_ODT_PATH">';
+		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
+		{
+			$texte.= '<input type="hidden" name="param2" value="PRODUCT_ADDON_PDF_ODT_DEFAULT">';
+			$texte.= '<input type="hidden" name="param3" value="PRODUCT_ADDON_PDF_ODT_TOBILL">';
+			$texte.= '<input type="hidden" name="param4" value="PRODUCT_ADDON_PDF_ODT_CLOSED">';
+		}
+		$texte.= '<table class="nobordernopadding" width="100%">';
+
+		// List of directories area
+		$texte.= '<tr><td>';
+		$texttitle=$langs->trans("ListOfDirectories");
+		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->PRODUCT_ADDON_PDF_ODT_PATH)));
+		$listoffiles=array();
+		foreach($listofdir as $key=>$tmpdir)
+		{
+			$tmpdir=trim($tmpdir);
+			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+			if (! $tmpdir) {
+				unset($listofdir[$key]); continue;
+			}
+			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			else
+			{
+				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+			}
+		}
+		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		// Add list of substitution keys
+		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
+
+		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
+		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte.= '<textarea class="flat" cols="60" name="value1">';
+		$texte.=$conf->global->PRODUCT_ADDON_PDF_ODT_PATH;
+		$texte.= '</textarea>';
+		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte.= '<br></div></div>';
+
+		// Scan directories
+		if (count($listofdir))
+		{
+			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
+
+			/*if ($conf->global->MAIN_PRODUCT_CHOOSE_ODT_DOCUMENT > 0)
+			{
+				// Model for creation
+				$liste=ModelePDFProduct::liste_modeles($this->db);
+				$texte.= '<table width="50%;">';
+				$texte.= '<tr>';
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value2',$liste,$conf->global->PRODUCT_ADDON_PDF_ODT_DEFAULT);
+				$texte.= "</td></tr>";
+
+				$texte.= '<tr>';
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value3',$liste,$conf->global->PRODUCT_ADDON_PDF_ODT_TOBILL);
+				$texte.= "</td></tr>";
+				$texte.= '<tr>';
+
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value4',$liste,$conf->global->PRODUCT_ADDON_PDF_ODT_CLOSED);
+				$texte.= "</td></tr>";
+				$texte.= '</table>';
+			}*/
+		}
+
+		$texte.= '</td>';
+
+		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte.= '</td>';
+		$texte.= '</tr>';
+
+		$texte.= '</table>';
+		$texte.= '</form>';
+
+		return $texte;
+	}
+
+	/**
+	 *	Function to build a document on disk using the generic odt module.
+	 *
+	 *	@param		Product		$object				Object source to build document
+	 *	@param		Translate	$outputlangs		Lang output object
+	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *	@return		int         					1 if OK, <=0 if KO
+	 */
+	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	{
+		global $product,$langs,$conf,$mysoc,$hookmanager,$user;
+
+		if (empty($srctemplatepath))
+		{
+			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+			return -1;
+		}
+
+		// Add odtgeneration hook
+		if (! is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
+
+		if (! is_object($outputlangs)) $outputlangs=$langs;
+		$sav_charset_output=$outputlangs->charset_output;
+		$outputlangs->charset_output='UTF-8';
+
+		$outputlangs->load("main");
+		$outputlangs->load("dict");
+		$outputlangs->load("companies");
+		$outputlangs->load("bills");
+		if ($conf->produit->dir_output)
+		{
+			// If $object is id instead of object
+			if (! is_object($object))
+			{
+				$id = $object;
+				$object = new Product($this->db);
+				$result=$object->fetch($id);
+				if ($result < 0)
+				{
+					dol_print_error($this->db,$object->error);
+					return -1;
+				}
+			}
+			$productFournisseur = new ProductFournisseur($this->db);
+			$supplierprices = $productFournisseur->list_product_fournisseur_price($object->id);
+			$object->supplierprices = $supplierprices;
+
+			$dir = $conf->produit->dir_output;
+			$objectref = dol_sanitizeFileName($object->ref);
+			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			$file = $dir . "/" . $objectref . ".odt";
+
+			if (! file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					return -1;
+				}
+			}
+
+			if (file_exists($dir))
+			{
+				//print "srctemplatepath=".$srctemplatepath;	// Src filename
+				$newfile=basename($srctemplatepath);
+				$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
+				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
+				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+
+				$newfiletmp=$objectref.'_'.$newfiletmp;
+
+				// Get extension (ods or odt)
+				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
+				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+				{
+				    $format=$conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+				}
+				else
+				{
+					$filename=$newfiletmp.'.'.$newfileformat;
+				}
+				$file=$dir.'/'.$filename;
+				//print "newdir=".$dir;
+				//print "newfile=".$newfile;
+				//print "file=".$file;
+				//print "conf->produit->dir_temp=".$conf->produit->dir_temp;
+
+				dol_mkdir($conf->produit->dir_temp);
+
+
+				// If CUSTOMER contact defined on product, we use it
+				$usecontact=false;
+				$arrayidcontact=$object->getIdContact('external','CUSTOMER');
+				if (count($arrayidcontact) > 0)
+				{
+					$usecontact=true;
+					$result=$object->fetch_contact($arrayidcontact[0]);
+				}
+
+				// Recipient name
+				if (! empty($usecontact))
+				{
+					// On peut utiliser le nom de la societe du contact
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
+					else {
+                        			$socobject = $object->client;
+                        			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+                        			$contactobject = $object->contact;
+                    			}
+				}
+				else
+				{
+					$socobject=$object->client;
+				}
+				// Make substitution
+				$substitutionarray=array(
+				'__FROM_NAME__' => $this->emetteur->name,
+				'__FROM_EMAIL__' => $this->emetteur->email,
+				'__TOTAL_TTC__' => $object->total_ttc,
+				'__TOTAL_HT__' => $object->total_ht,
+				'__TOTAL_VAT__' => $object->total_vat
+				);
+				complete_substitutions_array($substitutionarray, $langs, $object);
+				// Call the ODTSubstitution hook
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$substitutionarray);
+				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				// Line of free text
+				$newfreetext='';
+				$paramfreetext='product_FREE_TEXT';
+				if (! empty($conf->global->$paramfreetext))
+				{
+					$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+				}
+
+				// Open and load template
+				require_once ODTPHP_PATH.'odf.php';
+				try {
+					$odfHandler = new odf(
+						$srctemplatepath,
+						array(
+						'PATH_TO_TMP'	  => $conf->produit->dir_temp,
+						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'DELIMITER_LEFT'  => '{',
+						'DELIMITER_RIGHT' => '}'
+						)
+					);
+				}
+				catch(Exception $e)
+				{
+					$this->error=$e->getMessage();
+					return -1;
+				}
+				// After construction $odfHandler->contentXml contains content and
+				// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
+				// [!-- BEGIN lines --]*[!-- END lines --]
+				//print html_entity_decode($odfHandler->__toString());
+				//print exit;
+
+
+				// Make substitutions into odt of freetext
+				try {
+					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
+				}
+				catch(OdfException $e)
+				{
+				}
+				
+				// Make substitutions into odt
+				$array_global = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
+				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+				//$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
+				$array_other=$this->get_substitutionarray_other($outputlangs);
+                // retrieve contact information for use in product as contact_xxx tags
+        		$array_thirdparty_contact = array();
+        		if ($usecontact)
+            			$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+
+				$tmparray = array_merge($array_global,$array_user,$array_soc,$array_thirdparty,$array_other,$array_thirdparty_contact);
+				complete_substitutions_array($tmparray, $outputlangs, $object);
+				$object->fetch_optionals();
+				// Call the ODTSubstitution hook
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						if (preg_match('/logo$/',$key)) // Image
+						{
+							if (file_exists($value)) $odfHandler->setImage($key, $value);
+							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						}
+						else    // Text
+						{
+							$odfHandler->setVars($key, $value, true, 'UTF-8');
+						}
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+				// Replace tags of lines
+				try
+				{
+					$listlines = $odfHandler->setSegment('supplierprices');
+					if(!empty($object->supplierprices)){
+						foreach ($object->supplierprices as $supplierprice)
+						{
+							$array_lines = $this->get_substitutionarray_each_var_object($supplierprice, $outputlangs);
+							complete_substitutions_array($array_lines, $outputlangs, $object, $supplierprice, "completesubstitutionarray_lines");
+							// Call the ODTSubstitutionLine hook
+							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$array_lines,'line'=>$supplierprice);
+							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+							foreach($array_lines as $key => $val)
+							{
+								try
+								{
+									$listlines->setVars($key, $val, true, 'UTF-8');
+								}
+								catch(OdfException $e)
+								{
+								}
+								catch(SegmentException $e)
+								{
+								}
+							}
+							$listlines->merge();
+						}
+					}
+					$odfHandler->mergeSegment($listlines);
+				}
+				catch(OdfException $e)
+				{
+					$this->error=$e->getMessage();
+					dol_syslog($this->error, LOG_WARNING);
+					return -1;
+				}
+
+				// Replace labels translated
+				$tmparray=$outputlangs->get_translations_for_substitutions();
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+
+				// Call the beforeODTSave hook
+				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				// Write new file
+				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+					try {
+						$odfHandler->exportAsAttachedPDF($file);
+					}catch (Exception $e){
+						$this->error=$e->getMessage();
+						return -1;
+					}
+				}
+				else {
+					try {
+					$odfHandler->saveToDisk($file);
+					}catch (Exception $e){
+						$this->error=$e->getMessage();
+						return -1;
+					}
+				}
+
+				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				if (! empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$odfHandler=null;	// Destroy object
+
+				return 1;   // Success
+			}
+			else
+			{
+				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				return -1;
+			}
+		}
+
+		return -1;
+	}
+
+}
+
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
new file mode 100644
index 00000000000..b7079dde30e
--- /dev/null
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -0,0 +1,433 @@
+<?php
+/* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+* or see http://www.gnu.org/
+*/
+
+/**
+ *	\file       htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+ *	\ingroup    societe
+ *	\brief      File of class to build ODT documents for third parties
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
+
+
+/**
+ *	Class to build documents using ODF templates generator
+ */
+class doc_generic_user_odt extends ModelePDFUser
+{
+	var $emetteur;	// Objet societe qui emet
+
+	var $phpmin = array(5,2,0);	// Minimum version of PHP required by module
+	var $version = 'dolibarr';
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		global $conf,$langs,$mysoc;
+
+		$langs->load("main");
+		$langs->load("companies");
+
+		$this->db = $db;
+		$this->name = "ODT templates";
+		$this->description = $langs->trans("DocumentModelOdt");
+		$this->scandir = 'USER_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+
+		// Dimension page pour format A4
+		$this->type = 'odt';
+		$this->page_largeur = 0;
+		$this->page_hauteur = 0;
+		$this->format = array($this->page_largeur,$this->page_hauteur);
+		$this->marge_gauche=0;
+		$this->marge_droite=0;
+		$this->marge_haute=0;
+		$this->marge_basse=0;
+
+		$this->option_logo = 1;                    // Affiche logo
+		$this->option_tva = 0;                     // Gere option tva USER_TVAOPTION
+		$this->option_modereg = 0;                 // Affiche mode reglement
+		$this->option_condreg = 0;                 // Affiche conditions reglement
+		$this->option_codeproduitservice = 0;      // Affiche code produit-service
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
+		$this->option_escompte = 0;                // Affiche si il y a eu escompte
+		$this->option_credit_note = 0;             // Support credit notes
+		$this->option_freetext = 1;				   // Support add of a personalised text
+		$this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
+
+		// Recupere emetteur
+		$this->emetteur=$mysoc;
+		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+	}
+
+
+	/**
+	 *	Return description of a module
+	 *
+	 *	@param	Translate	$langs      Lang object to use for output
+	 *	@return string       			Description
+	 */
+	function info($langs)
+	{
+		global $conf,$langs;
+
+		$langs->load("companies");
+		$langs->load("errors");
+
+		$form = new Form($this->db);
+
+		$texte = $this->description.".<br>\n";
+		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte.= '<input type="hidden" name="param1" value="USER_ADDON_PDF_ODT_PATH">';
+		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
+		{
+			$texte.= '<input type="hidden" name="param2" value="USER_ADDON_PDF_ODT_DEFAULT">';
+			$texte.= '<input type="hidden" name="param3" value="USER_ADDON_PDF_ODT_TOBILL">';
+			$texte.= '<input type="hidden" name="param4" value="USER_ADDON_PDF_ODT_CLOSED">';
+		}
+		$texte.= '<table class="nobordernopadding" width="100%">';
+
+		// List of directories area
+		$texte.= '<tr><td>';
+		$texttitle=$langs->trans("ListOfDirectories");
+		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->USER_ADDON_PDF_ODT_PATH)));
+		$listoffiles=array();
+		foreach($listofdir as $key=>$tmpdir)
+		{
+			$tmpdir=trim($tmpdir);
+			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+			if (! $tmpdir) {
+				unset($listofdir[$key]); continue;
+			}
+			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			else
+			{
+				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+			}
+		}
+		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		// Add list of substitution keys
+		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
+
+		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
+		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte.= '<textarea class="flat" cols="60" name="value1">';
+		$texte.=$conf->global->USER_ADDON_PDF_ODT_PATH;
+		$texte.= '</textarea>';
+		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte.= '<br></div></div>';
+
+		// Scan directories
+		if (count($listofdir))
+		{
+			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
+
+			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
+			{
+				// Model for creation
+				$liste=ModelePDFUser::liste_modeles($this->db);
+				$texte.= '<table width="50%;">';
+				$texte.= '<tr>';
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value2',$liste,$conf->global->USER_ADDON_PDF_ODT_DEFAULT);
+				$texte.= "</td></tr>";
+
+				$texte.= '<tr>';
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value3',$liste,$conf->global->USER_ADDON_PDF_ODT_TOBILL);
+				$texte.= "</td></tr>";
+				$texte.= '<tr>';
+
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value4',$liste,$conf->global->USER_ADDON_PDF_ODT_CLOSED);
+				$texte.= "</td></tr>";
+				$texte.= '</table>';
+			}
+		}
+
+		$texte.= '</td>';
+
+		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte.= '</td>';
+		$texte.= '</tr>';
+
+		$texte.= '</table>';
+		$texte.= '</form>';
+
+		return $texte;
+	}
+
+	/**
+	 *	Function to build a document on disk using the generic odt module.
+	 *
+	 *	@param		User		$object				Object source to build document
+	 *	@param		Translate	$outputlangs		Lang output object
+	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *	@return		int         					1 if OK, <=0 if KO
+	 */
+	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	{
+		global $user,$langs,$conf,$mysoc,$hookmanager;
+
+		if (empty($srctemplatepath))
+		{
+			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+			return -1;
+		}
+
+		// Add odtgeneration hook
+		if (! is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
+
+		if (! is_object($outputlangs)) $outputlangs=$langs;
+		$sav_charset_output=$outputlangs->charset_output;
+		$outputlangs->charset_output='UTF-8';
+
+		$outputlangs->load("main");
+		$outputlangs->load("dict");
+		$outputlangs->load("companies");
+		$outputlangs->load("bills");
+
+		if ($conf->user->dir_output)
+		{
+			// If $object is id instead of object
+			if (! is_object($object))
+			{
+				$id = $object;
+				$object = new User($this->db);
+				$result=$object->fetch($id);
+				if ($result < 0)
+				{
+					dol_print_error($this->db,$object->error);
+					return -1;
+				}
+			}
+
+			$dir = $conf->user->dir_output;
+			$objectref = dol_sanitizeFileName($object->ref);
+			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			$file = $dir . "/" . $objectref . ".odt";
+
+			if (! file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					return -1;
+				}
+			}
+
+			if (file_exists($dir))
+			{
+				//print "srctemplatepath=".$srctemplatepath;	// Src filename
+				$newfile=basename($srctemplatepath);
+				$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
+				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
+				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+
+				$newfiletmp=$objectref.'_'.$newfiletmp;
+
+				// Get extension (ods or odt)
+				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
+				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+				{
+				    $format=$conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+				}
+				else
+				{
+					$filename=$newfiletmp.'.'.$newfileformat;
+				}
+				$file=$dir.'/'.$filename;
+				//print "newdir=".$dir;
+				//print "newfile=".$newfile;
+				//print "file=".$file;
+				//print "conf->user->dir_temp=".$conf->user->dir_temp;
+
+				dol_mkdir($conf->user->dir_temp);
+
+
+				// If CUSTOMER contact defined on user, we use it
+				$usecontact=false;
+				$arrayidcontact=$object->getIdContact('external','CUSTOMER');
+				if (count($arrayidcontact) > 0)
+				{
+					$usecontact=true;
+					$result=$object->fetch_contact($arrayidcontact[0]);
+				}
+
+				// Recipient name
+				if (! empty($usecontact))
+				{
+					// On peut utiliser le nom de la societe du contact
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
+					else {
+                        			$socobject = $object->client;
+                        			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+                        			$contactobject = $object->contact;
+                    			}
+				}
+				else
+				{
+					$socobject=$object->client;
+				}
+				
+				// Open and load template
+				require_once ODTPHP_PATH.'odf.php';
+				try {
+					$odfHandler = new odf(
+						$srctemplatepath,
+						array(
+						'PATH_TO_TMP'	  => $conf->user->dir_temp,
+						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'DELIMITER_LEFT'  => '{',
+						'DELIMITER_RIGHT' => '}'
+						)
+					);
+				}
+				catch(Exception $e)
+				{
+					$this->error=$e->getMessage();
+					return -1;
+				}
+				
+				// Make substitutions into odt
+				$array_user=$this->get_substitutionarray_user($object,$outputlangs);
+				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+				$array_other=$this->get_substitutionarray_other($outputlangs);
+		                // retrieve contact information for use in user as contact_xxx tags
+                		$array_thirdparty_contact = array();
+                		if ($usecontact)
+                    			$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+
+				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_other,$array_thirdparty_contact);
+				complete_substitutions_array($tmparray, $outputlangs, $object);
+				$object->fetch_optionals();
+				// Call the ODTSubstitution hook
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						if (preg_match('/logo$/',$key)) // Image
+						{
+							if (file_exists($value)) $odfHandler->setImage($key, $value);
+							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						}
+						else    // Text
+						{
+							$odfHandler->setVars($key, $value, true, 'UTF-8');
+						}
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+				
+				// Replace labels translated
+				$tmparray=$outputlangs->get_translations_for_substitutions();
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+
+				// Call the beforeODTSave hook
+				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				// Write new file
+				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+					try {
+						$odfHandler->exportAsAttachedPDF($file);
+					}catch (Exception $e){
+						$this->error=$e->getMessage();
+						return -1;
+					}
+				}
+				else {
+					try {
+					$odfHandler->saveToDisk($file);
+					}catch (Exception $e){
+						$this->error=$e->getMessage();
+						return -1;
+					}
+				}
+
+				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				if (! empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$odfHandler=null;	// Destroy object
+
+				return 1;   // Success
+			}
+			else
+			{
+				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				return -1;
+			}
+		}
+
+		return -1;
+	}
+
+	function get_substitutionarray_object($object,$outputlangs) {
+		foreach($object as $key => $value) {
+			if(!is_array($value) && !is_object($value)) {
+	    	$array_other['object_'.$key] = $value;
+			}
+	     }
+		return $array_other;
+	}
+
+}
+
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
new file mode 100644
index 00000000000..35367052796
--- /dev/null
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -0,0 +1,501 @@
+<?php
+/* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+* or see http://www.gnu.org/
+*/
+
+/**
+ *	\file       htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+ *	\ingroup    societe
+ *	\brief      File of class to build ODT documents for third parties
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
+
+
+/**
+ *	Class to build documents using ODF templates generator
+ */
+class doc_generic_usergroup_odt extends ModelePDFUserGroup
+{
+	var $emetteur;	// Objet societe qui emet
+
+	var $phpmin = array(5,2,0);	// Minimum version of PHP required by module
+	var $version = 'dolibarr';
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		global $conf,$langs,$mysoc;
+
+		$langs->load("main");
+		$langs->load("companies");
+
+		$this->db = $db;
+		$this->name = "ODT templates";
+		$this->description = $langs->trans("DocumentModelOdt");
+		$this->scandir = 'USERGROUP_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+
+		// Dimension page pour format A4
+		$this->type = 'odt';
+		$this->page_largeur = 0;
+		$this->page_hauteur = 0;
+		$this->format = array($this->page_largeur,$this->page_hauteur);
+		$this->marge_gauche=0;
+		$this->marge_droite=0;
+		$this->marge_haute=0;
+		$this->marge_basse=0;
+
+		$this->option_logo = 1;                    // Affiche logo
+		$this->option_tva = 0;                     // Gere option tva USERGROUP_TVAOPTION
+		$this->option_modereg = 0;                 // Affiche mode reglement
+		$this->option_condreg = 0;                 // Affiche conditions reglement
+		$this->option_codeproduitservice = 0;      // Affiche code produit-service
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
+		$this->option_escompte = 0;                // Affiche si il y a eu escompte
+		$this->option_credit_note = 0;             // Support credit notes
+		$this->option_freetext = 1;				   // Support add of a personalised text
+		$this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
+
+		// Recupere emetteur
+		$this->emetteur=$mysoc;
+		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+	}
+
+
+	/**
+	 *	Return description of a module
+	 *
+	 *	@param	Translate	$langs      Lang object to use for output
+	 *	@return string       			Description
+	 */
+	function info($langs)
+	{
+		global $conf,$langs;
+
+		$langs->load("companies");
+		$langs->load("errors");
+
+		$form = new Form($this->db);
+
+		$texte = $this->description.".<br>\n";
+		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte.= '<input type="hidden" name="param1" value="USERGROUP_ADDON_PDF_ODT_PATH">';
+		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
+		{
+			$texte.= '<input type="hidden" name="param2" value="USERGROUP_ADDON_PDF_ODT_DEFAULT">';
+			$texte.= '<input type="hidden" name="param3" value="USERGROUP_ADDON_PDF_ODT_TOBILL">';
+			$texte.= '<input type="hidden" name="param4" value="USERGROUP_ADDON_PDF_ODT_CLOSED">';
+		}
+		$texte.= '<table class="nobordernopadding" width="100%">';
+
+		// List of directories area
+		$texte.= '<tr><td>';
+		$texttitle=$langs->trans("ListOfDirectories");
+		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->USERGROUP_ADDON_PDF_ODT_PATH)));
+		$listoffiles=array();
+		foreach($listofdir as $key=>$tmpdir)
+		{
+			$tmpdir=trim($tmpdir);
+			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+			if (! $tmpdir) {
+				unset($listofdir[$key]); continue;
+			}
+			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			else
+			{
+				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+			}
+		}
+		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		// Add list of substitution keys
+		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
+
+		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
+		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte.= '<textarea class="flat" cols="60" name="value1">';
+		$texte.=$conf->global->USERGROUP_ADDON_PDF_ODT_PATH;
+		$texte.= '</textarea>';
+		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte.= '<br></div></div>';
+
+		// Scan directories
+		if (count($listofdir))
+		{
+			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
+
+			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
+			{
+				// Model for creation
+				$liste=ModelePDFUserGroup::liste_modeles($this->db);
+				$texte.= '<table width="50%;">';
+				$texte.= '<tr>';
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value2',$liste,$conf->global->USERGROUP_ADDON_PDF_ODT_DEFAULT);
+				$texte.= "</td></tr>";
+
+				$texte.= '<tr>';
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value3',$liste,$conf->global->USERGROUP_ADDON_PDF_ODT_TOBILL);
+				$texte.= "</td></tr>";
+				$texte.= '<tr>';
+
+				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
+				$texte.= '<td colspan="">';
+				$texte.= $form->selectarray('value4',$liste,$conf->global->USERGROUP_ADDON_PDF_ODT_CLOSED);
+				$texte.= "</td></tr>";
+				$texte.= '</table>';
+			}
+		}
+
+		$texte.= '</td>';
+
+		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte.= '</td>';
+		$texte.= '</tr>';
+
+		$texte.= '</table>';
+		$texte.= '</form>';
+
+		return $texte;
+	}
+
+	/**
+	 *	Function to build a document on disk using the generic odt module.
+	 *
+	 *	@param		UserGroup		$object				Object source to build document
+	 *	@param		Translate	$outputlangs		Lang output object
+	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *	@return		int         					1 if OK, <=0 if KO
+	 */
+	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	{
+		global $user,$langs,$conf,$mysoc,$hookmanager;
+
+		if (empty($srctemplatepath))
+		{
+			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+			return -1;
+		}
+
+		// Add odtgeneration hook
+		if (! is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
+
+		if (! is_object($outputlangs)) $outputlangs=$langs;
+		$sav_charset_output=$outputlangs->charset_output;
+		$outputlangs->charset_output='UTF-8';
+
+		$outputlangs->load("main");
+		$outputlangs->load("dict");
+		$outputlangs->load("companies");
+		$outputlangs->load("bills");
+
+		if ($conf->user->dir_output)
+		{
+			// If $object is id instead of object
+			if (! is_object($object))
+			{
+				$id = $object;
+				$object = new UserGroup($this->db);
+				$result=$object->fetch($id);
+				if ($result < 0)
+				{
+					dol_print_error($this->db,$object->error);
+					return -1;
+				}
+			}
+
+			$dir = $conf->usergroup->dir_output;
+			$objectref = dol_sanitizeFileName($object->ref);
+			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			$file = $dir . "/" . $objectref . ".odt";
+
+			if (! file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					return -1;
+				}
+			}
+
+			if (file_exists($dir))
+			{
+				//print "srctemplatepath=".$srctemplatepath;	// Src filename
+				$newfile=basename($srctemplatepath);
+				$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
+				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
+				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+
+				$newfiletmp=$objectref.'_'.$newfiletmp;
+
+				// Get extension (ods or odt)
+				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
+				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+				{
+				    $format=$conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+				}
+				else
+				{
+					$filename=$newfiletmp.'.'.$newfileformat;
+				}
+				$file=$dir.'/'.$filename;
+				//print "newdir=".$dir;
+				//print "newfile=".$newfile;
+				//print "file=".$file;
+				//print "conf->user->dir_temp=".$conf->user->dir_temp;
+
+				dol_mkdir($conf->user->dir_temp);
+
+
+				// If CUSTOMER contact defined on user, we use it
+				$usecontact=false;
+				$arrayidcontact=$object->getIdContact('external','CUSTOMER');
+				if (count($arrayidcontact) > 0)
+				{
+					$usecontact=true;
+					$result=$object->fetch_contact($arrayidcontact[0]);
+				}
+
+				// Recipient name
+				if (! empty($usecontact))
+				{
+					// On peut utiliser le nom de la societe du contact
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
+					else {
+                        			$socobject = $object->client;
+                        			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+                        			$contactobject = $object->contact;
+                    			}
+				}
+				else
+				{
+					$socobject=$object->client;
+				}
+				// Make substitution
+				$substitutionarray=array(
+				'__FROM_NAME__' => $this->emetteur->name,
+				'__FROM_EMAIL__' => $this->emetteur->email,
+				'__TOTAL_TTC__' => $object->total_ttc,
+				'__TOTAL_HT__' => $object->total_ht,
+				'__TOTAL_VAT__' => $object->total_vat
+				);
+				complete_substitutions_array($substitutionarray, $langs, $object);
+				// Call the ODTSubstitution hook
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$substitutionarray);
+				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				// Line of free text
+				$newfreetext='';
+				$paramfreetext='user_FREE_TEXT';
+				if (! empty($conf->global->$paramfreetext))
+				{
+					$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+				}
+
+				// Open and load template
+				require_once ODTPHP_PATH.'odf.php';
+				try {
+					$odfHandler = new odf(
+						$srctemplatepath,
+						array(
+						'PATH_TO_TMP'	  => $conf->user->dir_temp,
+						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'DELIMITER_LEFT'  => '{',
+						'DELIMITER_RIGHT' => '}'
+						)
+					);
+				}
+				catch(Exception $e)
+				{
+					$this->error=$e->getMessage();
+					return -1;
+				}
+				// After construction $odfHandler->contentXml contains content and
+				// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
+				// [!-- BEGIN lines --]*[!-- END lines --]
+				//print html_entity_decode($odfHandler->__toString());
+				//print exit;
+
+
+				// Make substitutions into odt of freetext
+				try {
+					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
+				}
+				catch(OdfException $e)
+				{
+				}
+
+				// Make substitutions into odt
+				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
+				$array_global=$this->get_substitutionarray_each_var_object($object,$outputlangs);
+				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+				$array_objet=$this->get_substitutionarray_each_var_object($object,$outputlangs);
+				$array_other=$this->get_substitutionarray_other($outputlangs);
+		                // retrieve contact information for use in user as contact_xxx tags
+                		$array_thirdparty_contact = array();
+                		if ($usecontact)
+                    			$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+
+				$tmparray = array_merge($array_global,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
+				complete_substitutions_array($tmparray, $outputlangs, $object);
+				$object->fetch_optionals();
+				// Call the ODTSubstitution hook
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				foreach($tmparray as $key=>$value)
+				{
+					try 
+					{
+						if (preg_match('/logo$/',$key)) // Image
+						{
+							if (file_exists($value)) $odfHandler->setImage($key, $value);
+							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						}
+						else    // Text
+						{
+							$odfHandler->setVars($key, $value, true, 'UTF-8');
+						}
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+				// Replace tags of lines
+				try
+				{
+					$listlines = $odfHandler->setSegment('lines');
+					foreach ($object->members as $u)
+					{
+						$tmparray=$this->get_substitutionarray_each_var_object($u,$outputlangs);
+						unset($tmparray['object_pass']);
+						unset($tmparray['object_pass_indatabase']);
+						complete_substitutions_array($tmparray, $outputlangs, $object, $user, "completesubstitutionarray_users");
+						// Call the ODTSubstitutionLine hook
+						$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$u);
+						$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+						foreach($tmparray as $key => $val)
+						{
+							try
+							{
+								if(!is_array($val)) {
+									$listlines->setVars($key, $val, true, 'UTF-8');
+								}
+							}
+							catch(OdfException $e)
+							{
+							}
+							catch(SegmentException $e)
+							{
+							}
+						}
+						$listlines->merge();
+					}
+					$odfHandler->mergeSegment($listlines);
+				}
+				catch(OdfException $e)
+				{
+					$this->error=$e->getMessage();
+					dol_syslog($this->error, LOG_WARNING);
+					return -1;
+				}
+				
+				// Replace labels translated
+				$tmparray=$outputlangs->get_translations_for_substitutions();
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+
+				// Call the beforeODTSave hook
+				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				// Write new file
+				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+					try {
+						$odfHandler->exportAsAttachedPDF($file);
+					}catch (Exception $e){
+						$this->error=$e->getMessage();
+						return -1;
+					}
+				}
+				else {
+					try {
+					$odfHandler->saveToDisk($file);
+					}catch (Exception $e){
+						$this->error=$e->getMessage();
+						return -1;
+					}
+				}
+
+				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				if (! empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$odfHandler=null;	// Destroy object
+
+				return 1;   // Success
+			}
+			else
+			{
+				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				return -1;
+			}
+		}
+
+		return -1;
+	}
+
+}
+
diff --git a/htdocs/core/modules/usergroup/modules_usergroup.class.php b/htdocs/core/modules/usergroup/modules_usergroup.class.php
index f7d4778efe1..26edb08d57c 100644
--- a/htdocs/core/modules/usergroup/modules_usergroup.class.php
+++ b/htdocs/core/modules/usergroup/modules_usergroup.class.php
@@ -52,7 +52,7 @@ abstract class ModelePDFUserGroup extends CommonDocGenerator
 	{
 		global $conf;
 
-		$type='usergroup';
+		$type='group';
 		$liste=array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/install/doctemplates/contracts/index.html b/htdocs/install/doctemplates/contracts/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/doctemplates/contracts/template_contract.odt b/htdocs/install/doctemplates/contracts/template_contract.odt
new file mode 100755
index 0000000000000000000000000000000000000000..8ece83c989c9ff688337dbb0edf6febd47eb0dcf
GIT binary patch
literal 25866
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

literal 0
HcmV?d00001

diff --git a/htdocs/install/doctemplates/products/index.html b/htdocs/install/doctemplates/products/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/doctemplates/products/template_product.odt b/htdocs/install/doctemplates/products/template_product.odt
new file mode 100644
index 0000000000000000000000000000000000000000..344fcfa391aefbfef2b4ae85c5436e6c707adaa2
GIT binary patch
literal 17591
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

literal 0
HcmV?d00001

diff --git a/htdocs/install/doctemplates/usergroups/index.html b/htdocs/install/doctemplates/usergroups/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/doctemplates/usergroups/template_usergroup.odt b/htdocs/install/doctemplates/usergroups/template_usergroup.odt
new file mode 100755
index 0000000000000000000000000000000000000000..7a02ea059701a0e90878d4324cb751af1c88b0ff
GIT binary patch
literal 17537
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

literal 0
HcmV?d00001

diff --git a/htdocs/install/doctemplates/users/index.html b/htdocs/install/doctemplates/users/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/doctemplates/users/template_user.odt b/htdocs/install/doctemplates/users/template_user.odt
new file mode 100755
index 0000000000000000000000000000000000000000..f1f1fcc2c5af013e85cb5dcdf394b8053b10e749
GIT binary patch
literal 13431
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
WNr*Q`EeHtG+sEdOe=g{M9sM79yJa*0

literal 0
HcmV?d00001

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 0dfc5f36925..0f8bfb4591e 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -114,3 +114,11 @@ UPDATE llx_const set value='moono-lisa' where value = 'moono' AND name = 'FCKEDI
 ALTER TABLE llx_product_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
 ALTER TABLE llx_product_fournisseur_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
 
+ALTER TABLE llx_user ADD COLUMN model_pdf varchar(255);
+ALTER TABLE llx_usergroup ADD COLUMN model_pdf varchar(255);
+
+INSERT INTO `llx_const` (`name`, `entity`, `value`, `type`, `visible`, `note`, `tms`) VALUES
+('PRODUCT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/products', 'chaine', 0, '', '2017-03-13 16:54:30'),
+('CONTRACT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/contracts', 'chaine', 0, '', '2017-03-13 13:07:27'),
+('USERGROUP_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/usergroups', 'chaine', 0, '', '2017-03-10 15:25:06'),
+('USER_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0, '', '2017-03-10 15:14:14')
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index b323c970a9d..b1a9fabb20d 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -457,7 +457,17 @@ if (! $error && $db->connected && $action == "set")
             	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
             	$srcroot=$main_dir.'/install/doctemplates';
             	$destroot=$main_data_dir.'/doctemplates';
-            	$docs=array('thirdparties' => 'thirdparty', 'proposals' => 'proposal', 'orders' => 'order', 'invoices' => 'invoice', 'projects' => 'project', 'tasks' => 'task_summary');
+            	$docs=array('contracts' => 'contract'
+            		, 'thirdparties' => 'thirdparty'
+            		, 'products' => 'product'
+            		, 'proposals' => 'proposal'
+            		, 'orders' => 'order'
+            		, 'invoices' => 'invoice'
+            		, 'projects' => 'project'
+            		, 'tasks' => 'task_summary'
+            		, 'users' => 'user'
+            		, 'usergroups' => 'usergroups'
+            	);
             	foreach($docs as $cursordir => $cursorfile)
             	{
             		$src=$srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt';
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index c42c3981494..c879ab54059 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -44,9 +44,9 @@ if (! $user->admin || (empty($conf->product->enabled) && empty($conf->service->e
 
 $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');
-$type = GETPOST('type','alpha');
 $label = GETPOST('label','alpha');
 $scandir = GETPOST('scandir','alpha');
+$type='product';
 
 // Pricing Rules
 $select_pricing_rules=array(
@@ -325,6 +325,7 @@ $form=new Form($db);
  * Module to manage product / services code
  */
 $dirproduct=array('/core/modules/product/');
+$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 
 print load_fiche_titre($langs->trans("ProductCodeChecker"), '', '');
 
@@ -402,146 +403,157 @@ foreach ($dirproduct as $dirroot)
 }
 print '</table>';
 
-
-// Load array def with activated templates
+// Defini tableau def des modeles
 $def = array();
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql.= " WHERE type = 'product'";
+$sql.= " WHERE type = '".$type."'";
 $sql.= " AND entity = ".$conf->entity;
 $resql=$db->query($sql);
 if ($resql)
 {
 	$i = 0;
 	$num_rows=$db->num_rows($resql);
-	if ($num_rows > 0)
+	while ($i < $num_rows)
 	{
-	    print '<br>';
-	    print load_fiche_titre($langs->trans("ModelModulesProduct"), '', '');
-
-    	while ($i < $num_rows)
-    	{
-    		$array = $db->fetch_array($resql);
-    		array_push($def, $array[0]);
-    		$i++;
-    	}
-        
-        print '<table class="noborder" width="100%">';
-        print '<tr class="liste_titre">';
-        print '<td width="140">'.$langs->trans("Name").'</td>';
-        print '<td>'.$langs->trans("Description").'</td>';
-        print '<td align="center" width="80">'.$langs->trans("Status").'</td>';
-        print '<td align="center" width="60">'.$langs->trans("ShortInfo").'</td>';
-        print '<td align="center" width="60">'.$langs->trans("Preview").'</td>';
-        print "</tr>\n";
-        
-        $var=true;
-        foreach ($dirproduct as $dirroot)
-        {
-        	$dir = dol_buildpath($dirroot.'core/modules/product/doc/',0);
-        	$handle=@opendir($dir);
-        	if (is_resource($handle))
-        	{
-        		while (($file = readdir($handle))!==false)
-        		{
-        			if (preg_match('/\.modules\.php$/i',$file))
-        			{
-        				$name = substr($file, 4, dol_strlen($file) -16);
-        				$classname = substr($file, 0, dol_strlen($file) -12);
-        
-        			    try {
-                			dol_include_once($dirroot.'core/modules/product/doc/'.$file);
-            			}
-            			catch(Exception $e)
-            			{
-            			    dol_syslog($e->getMessage(), LOG_ERR);
-            			}
-        
-            			$module = new $classname($db);
-        
-        				$modulequalified=1;
-        				if (! empty($module->version)) {
-        					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-        					else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
-        				}
-        
-        				if ($modulequalified)
-        				{
-        					$var = !$var;
-        					print '<tr '.$bc[$var].'><td width="100">';
-        					print $module->name;
-        					print "</td><td>\n";
-        					if (method_exists($module,'info')) print $module->info($langs);
-        					else print $module->description;
-        					print '</td>';
-        
-        					// Activate / Disable
-        					if (in_array($name, $def))
-        					{
-        						print "<td align=\"center\">\n";
-        						print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&type=product&scandir='.$module->scandir.'&label='.urlencode($module->name).'">';
-        						print img_picto($langs->trans("Enabled"),'switch_on');
-        						print '</a>';
-        						print "</td>";
-        					}
-        					else
-        					{
-        						if (versioncompare($module->phpmin,versionphparray()) > 0)
-        						{
-        							print "<td align=\"center\">\n";
-        							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion",join('.',$module->phpmin))),'switch_off');
-        							print "</td>";
-        						}
-        						else
-        						{
-        							print "<td align=\"center\">\n";
-        							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&type=product&scandir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-        							print "</td>";
-        						}
-        					}
-        
-        					// Info
-        					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
-        					$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
-        					if ($module->type == 'pdf')
-        					{
-        						$htmltooltip.='<br>'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
-        					}
-        					$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-        					$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);
-        
-        					print '<td align="center" class="nowrap">';
-        					print $form->textwithpicto('',$htmltooltip,1,0);
-        					print '</td>';
-        
-        					// Preview
-        					print '<td align="center" class="nowrap">';
-        					if ($module->type == 'pdf')
-        					{
-        						$linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
-        					}
-        					else
-        					{
-        						$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
-        					}
-        					print $linkspec;
-        					print '</td>';
-        
-        					print "</tr>\n";
-        				}
-        			}
-        		}
-        		closedir($handle);
-        	}
-        }
-        print '</table>';
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
 	}
 }
 else
 {
-    dol_print_error($db);
+	dol_print_error($db);
 }
-    
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
+print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
+print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+$var=true;
+foreach ($dirmodels as $reldir)
+{
+    foreach (array('','/doc') as $valdir)
+    {
+    	$dir = dol_buildpath($reldir."core/modules/product".$valdir);
+        if (is_dir($dir))
+        {
+            $handle=opendir($dir);
+            if (is_resource($handle))
+            {
+                while (($file = readdir($handle))!==false)
+                {
+                    $filelist[]=$file;
+                }
+                closedir($handle);
+                arsort($filelist);
+
+                foreach($filelist as $file)
+                {
+                    if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
+                    {
+
+                    	if (file_exists($dir.'/'.$file))
+                    	{
+                    		$name = substr($file, 4, dol_strlen($file) -16);
+	                        $classname = substr($file, 0, dol_strlen($file) -12);
+
+	                        require_once $dir.'/'.$file;
+	                        $module = new $classname($db);
+
+	                        $modulequalified=1;
+	                        if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+
+	                        if ($modulequalified)
+	                        {
+	                            $var = !$var;
+	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print (empty($module->name)?$name:$module->name);
+	                            print "</td><td>\n";
+	                            if (method_exists($module,'info')) print $module->info($langs);
+	                            else print $module->description;
+	                            print '</td>';
+
+	                            // Active
+	                            if (in_array($name, $def))
+	                            {
+	                            	print '<td align="center">'."\n";
+	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
+	                            	print img_picto($langs->trans("Enabled"),'switch_on');
+	                            	print '</a>';
+	                            	print '</td>';
+	                            }
+	                            else
+	                            {
+	                                print '<td align="center">'."\n";
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+	                                print "</td>";
+	                            }
+
+	                            // Defaut
+	                            print '<td align="center">';
+	                            if ($conf->global->PRODUCT_ADDON_PDF == $name)
+	                            {
+	                                print img_picto($langs->trans("Default"),'on');
+	                            }
+	                            else
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+	                            }
+	                            print '</td>';
+
+	                           // Info
+		    					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+					    		$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+			                    if ($module->type == 'pdf')
+			                    {
+			                        $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+			                    }
+					    		$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					    		$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
+
+
+	                            print '<td align="center">';
+	                            print $form->textwithpicto('',$htmltooltip,1,0);
+	                            print '</td>';
+
+	                            // Preview
+	                            print '<td align="center">';
+	                            if ($module->type == 'pdf')
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'contract').'</a>';
+	                            }
+	                            else
+	                            {
+	                                print img_object($langs->trans("PreviewNotAvailable"),'generic');
+	                            }
+	                            print '</td>';
+
+	                            print "</tr>\n";
+	                        }
+                    	}
+                    }
+                }
+            }
+        }
+    }
+}
+
+print '</table>';
+print "<br>";
     
 /*
  * Other conf
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index b27cef6d985..4df8b45041f 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -147,7 +147,6 @@ if (empty($reshook))
 	{
 		// Save last template used to generate document
 		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
 		// Define output language
 		$outputlangs = $langs;
 		$newlang='';
@@ -158,11 +157,12 @@ if (empty($reshook))
 			$outputlangs = new Translate("",$conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		$result=product_create($db, $object, GETPOST('model','alpha'), $outputlangs);
+		$ret = $object->fetch($id); // Reload to get new records
+		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		if ($result <= 0)
 		{
-			dol_print_error($db,$result);
-			exit;
+			setEventMessages($object->error, $object->errors, 'errors');
+	        $action='';
 		}
 	}
 	
@@ -197,6 +197,20 @@ if (empty($reshook))
 			setEventMessages($errors, null, 'errors');
 		}
     }
+	
+	// Remove file in doc form
+	if ($action == 'remove_file' && $user->rights->produit->creer) {
+		if ($object->id > 0) {
+			require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+	
+			$langs->load("other");
+			$upload_dir = $conf->product->dir_output;
+			$file = $upload_dir . '/' . GETPOST('file');
+			$ret = dol_delete_file($file, 0, 0, 0, $object);
+			if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+			else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+		}
+	}
 
     // Add a product or service
     if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service->creer))
@@ -2001,7 +2015,7 @@ if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action =
 /*
  * Documents generes
  */
-if ($action == '' || $action == 'view')
+if ($action != 'edit' && $action != 'delete')
 {
     print '<div class="fichecenter"><div class="fichehalfleft">';
     print '<a name="builddoc"></a>'; // ancre
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 5cc173da6ad..192d681ca81 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -210,6 +210,11 @@ if ($action == 'update')
         setEventMessages($langs->trans('ErrorForbidden'), null, 'mesgs');
     }
 }
+					
+// Actions to build doc
+$upload_dir = $conf->usergroup->dir_output;
+$permissioncreate=$user->rights->user->user->creer;
+include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 
 
@@ -498,11 +503,6 @@ else
             }
             print "</table>";
             print "<br>";
-					
-		    // Actions to build doc
-		    $upload_dir = $conf->usergroup->dir_output;
-		    $permissioncreate=$user->rights->user->user->creer;
-		    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 			
 			/*
 	         * Documents generes

From 3ab7bac511ddf748356e27e058a79657ad5bb955 Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.saint-patrice@atm-consulting.fr>
Date: Tue, 14 Mar 2017 09:37:51 +0100
Subject: [PATCH 0379/1163] FIX fresh install const

---
 htdocs/install/mysql/data/llx_const.sql | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index 42ecad2b927..b34e0cac513 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -85,3 +85,12 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_DELAY_EXP
 --
 insert into llx_const (name, value, type, note, visible) values ('MAIN_FIX_FOR_BUGGED_MTA','1','chaine','Set constant to fix email ending from PHP with some linux ike system',1);
 insert into llx_const (name, value, type, note, visible) values ('MAILING_EMAIL_FROM','dolibarr@domain.com','chaine','EMail emmetteur pour les envois d emailings',0);
+
+
+--
+-- ODT Path
+---
+insert into `llx_const` (`name`, `entity`, `value`, `type`, `visible`) VALUES ('PRODUCT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/products', 'chaine', 0);
+insert into `llx_const` (`name`, `entity`, `value`, `type`, `visible`) VALUES ('CONTRACT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/contracts', 'chaine', 0);
+insert into `llx_const` (`name`, `entity`, `value`, `type`, `visible`) VALUES ('USERGROUP_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/usergroups', 'chaine', 0);
+insert into `llx_const` (`name`, `entity`, `value`, `type`, `visible`) VALUES ('USER_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0);

From e0449cf17f4a1e9a096a6f7b9806f21834537ffa Mon Sep 17 00:00:00 2001
From: camlafit <cam.lafit@azerttyu.net>
Date: Tue, 14 Mar 2017 09:56:30 +0100
Subject: [PATCH 0380/1163] Execute in background process

It's better to split command call in two part. Set command to execute with binary path and execute after in background
---
 scripts/odt2pdf/odt2pdf.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/odt2pdf/odt2pdf.sh b/scripts/odt2pdf/odt2pdf.sh
index b44ab3e6d78..1147ff3bbcc 100755
--- a/scripts/odt2pdf/odt2pdf.sh
+++ b/scripts/odt2pdf/odt2pdf.sh
@@ -17,13 +17,16 @@ then
 	exit
 fi
 
+soffice="/usr/bin/soffice"
+
 
 if [ -f "$1.odt" ]
  then
   nbprocess=$(pgrep -c soffice)
   if [ $nbprocess -ne 1 ]	# If there is some soffice process running
    then
-    soffice --invisible --accept="socket,host=127.0.0.1,port=8100;urp;" --nofirststartwizard --headless &
+    cmd="$soffice --invisible --accept=socket,host=127.0.0.1,port=8100;urp; --nofirststartwizard --headless"
+    $cmd &
     retcode=$?
     if [ $retcode -ne 0 ]
      then

From 67189fa68399ff62b6691a218427b013123e9d51 Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Tue, 14 Mar 2017 10:17:10 +0100
Subject: [PATCH 0381/1163] Provide a home directory to java/soffice

By default www-data run as system user on /root directory, to prevent some error about right user we :
* move first to /tmp directory
* set /tmp as home www-data user

If needed admin sys can update *$home_java* to a valide www-data directory
---
 scripts/odt2pdf/odt2pdf.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/odt2pdf/odt2pdf.sh b/scripts/odt2pdf/odt2pdf.sh
index 1147ff3bbcc..75aa6cc15f0 100755
--- a/scripts/odt2pdf/odt2pdf.sh
+++ b/scripts/odt2pdf/odt2pdf.sh
@@ -18,15 +18,15 @@ then
 fi
 
 soffice="/usr/bin/soffice"
-
+home_java="/tmp"
 
 if [ -f "$1.odt" ]
  then
   nbprocess=$(pgrep -c soffice)
   if [ $nbprocess -ne 1 ]	# If there is some soffice process running
    then
-    cmd="$soffice --invisible --accept=socket,host=127.0.0.1,port=8100;urp; --nofirststartwizard --headless"
-    $cmd &
+    cmd="$soffice --invisible --accept=socket,host=127.0.0.1,port=8100;urp; --nofirststartwizard --headless -env:UserInstallation=file:///$home_java/"
+    export HOME=$home_java && cd $home_java && $cmd&
     retcode=$?
     if [ $retcode -ne 0 ]
      then

From fc5d96b84bc2900ddfedb5587f3ac15175b1996e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 14 Mar 2017 10:51:28 +0100
Subject: [PATCH 0382/1163] Add comments

---
 scripts/odt2pdf/odt2pdf.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/odt2pdf/odt2pdf.sh b/scripts/odt2pdf/odt2pdf.sh
index 75aa6cc15f0..4cf1ab54013 100755
--- a/scripts/odt2pdf/odt2pdf.sh
+++ b/scripts/odt2pdf/odt2pdf.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 # @copyright  GPL License 2010 - Vikas Mahajan - http://vikasmahajan.wordpress.com
 # @copyright  GPL License 2013 - Florian HEnry - florian.henry@open-concept.pro
-# @copyright  GPL License 2015 - Laurent Destailleur - eldy@users.sourceforge.net
+# @copyright  GPL License 2017 - Laurent Destailleur - eldy@users.sourceforge.net
 #
 # Convert an ODT into a PDF using "jodconverter" or "pyodconverter" tool.
 # Dolibarr variable MAIN_ODT_AS_PDF must be defined to value "jodconverter" to call jodconverter wrapper after ODT generation
-# or value "pyodconverter" to call DocumentConverter.py after ODT generation.
-# or value "/pathto/jodconverter-cli-file.jar" to call jodconverter java tool without wrapper after ODT generation.
+#  or value "pyodconverter" to call DocumentConverter.py after ODT generation.
+#  or value "/pathto/jodconverter-cli-file.jar" to call jodconverter java tool without wrapper after ODT generation.
 # Dolibarr variable MAIN_DOL_SCRIPTS_ROOT must be defined to path of script directories (otherwise dolibarr will try to guess).
- 
+
 
 if [ "x$1" == "x" ] 
 then
@@ -17,9 +17,14 @@ then
 	exit
 fi
 
+# Full patch where soffice is installed 
 soffice="/usr/bin/soffice"
+
+# Temporary directory (web user must have permission to read/write). You can set here path to your DOL_DATA_ROOT/admin/temp directory for example. 
 home_java="/tmp"
 
+
+# Main program
 if [ -f "$1.odt" ]
  then
   nbprocess=$(pgrep -c soffice)

From ec7d48931e747c846c3f57ea0989184c9fafd353 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 14 Mar 2017 13:49:04 +0100
Subject: [PATCH 0383/1163] Merge duplicate menus/page on projects

---
 htdocs/core/menus/standard/eldy.lib.php | 21 +++++++++-------
 htdocs/langs/en_US/projects.lang        |  4 ++++
 htdocs/projet/activity/index.php        | 20 ++++++++++++++--
 htdocs/projet/activity/perday.php       |  2 +-
 htdocs/projet/activity/perweek.php      |  2 +-
 htdocs/projet/index.php                 | 22 ++++++++++++++---
 htdocs/projet/list.php                  | 26 ++++++++++----------
 htdocs/projet/tasks/list.php            | 32 ++++++++++++++++++++-----
 htdocs/projet/tasks/time.php            |  4 +++-
 htdocs/theme/eldy/style.css.php         | 11 ++++++---
 htdocs/theme/md/style.css.php           | 20 ++++++++++------
 11 files changed, 117 insertions(+), 47 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 440c96c1e49..9396363a0ab 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1226,29 +1226,32 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$langs->load("projects");
 
 				// Project affected to user
-				$newmenu->add("/projet/index.php?leftmenu=myprojects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire, '', $mainmenu, 'myprojects');
-				$newmenu->add("/projet/card.php?leftmenu=myprojects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer);
-				$newmenu->add("/projet/list.php?leftmenu=myprojects&mode=mine&search_status=99", $langs->trans("List"), 1, $user->rights->projet->lire);
+				$newmenu->add("/projet/index.php?leftmenu=projects&search_project_user=".GETPOST('search_project_user'), $langs->trans("Projects"), 0, $user->rights->projet->lire, '', $mainmenu, 'projects');
+				$newmenu->add("/projet/card.php?leftmenu=projects&action=create&search_project_user=".GETPOST('search_project_user'), $langs->trans("NewProject"), 1, $user->rights->projet->creer);
+				$newmenu->add("/projet/list.php?leftmenu=projects&search_project_user=".GETPOST('search_project_user')."&search_status=99", $langs->trans("List"), 1, $user->rights->projet->lire);
 
 				// All project i have permission on
+				/*
 				$newmenu->add("/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire && $user->rights->projet->lire, '', $mainmenu, 'projects');
 				$newmenu->add("/projet/card.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer && $user->rights->projet->creer);
 				$newmenu->add("/projet/list.php?leftmenu=projects&search_status=99", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire);
+                */
 				$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire && $user->rights->projet->lire);
-
+				
 				if (empty($conf->global->PROJECT_HIDE_TASKS))
 				{
 					// Project affected to user
-					$newmenu->add("/projet/activity/index.php?leftmenu=mytasks&mode=mine", $langs->trans("MyActivities"), 0, $user->rights->projet->lire);
-					$newmenu->add("/projet/tasks.php?leftmenu=mytasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
-					$newmenu->add("/projet/tasks/list.php?leftmenu=mytasks&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire);
-					$newmenu->add("/projet/activity/perweek.php?leftmenu=mytasks&mode=mine", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->lire);
+					$newmenu->add("/projet/activity/index.php?leftmenu=tasks&search_project_user=".GETPOST('search_project_user'), $langs->trans("Activities"), 0, $user->rights->projet->lire);
+					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
+					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks&search_project_user=".GETPOST('search_project_user'), $langs->trans("List"), 1, $user->rights->projet->lire);
+					$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks&search_project_user=".GETPOST('search_project_user'), $langs->trans("NewTimeSpent"), 1, $user->rights->projet->lire);
 
 					// All project i have permission on
-					$newmenu->add("/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire && $user->rights->projet->lire);
+					/*$newmenu->add("/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire && $user->rights->projet->lire);
 					$newmenu->add("/projet/tasks.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer && $user->rights->projet->creer);
 					$newmenu->add("/projet/tasks/list.php", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire);
 					$newmenu->add("/projet/activity/perweek.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer && $user->rights->projet->lire);
+					*/
 				}
 
 				// Categories
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index f9c603ce113..3d218611194 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -9,6 +9,9 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
+ProjectsImContactFor=Projects I'm explicitely a contact of 
+AllAllowedProjects=All project I can read (mine + public)
+AllProjects=All projects
 MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
 ProjectsPublicDesc=This view presents all projects you are allowed to read.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -23,6 +26,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task assigned to you. Assign task to yourself if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Tasks of projects
+ProjectCategories=Project tags/categories
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 4586c8d52a6..495337b4a7b 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -58,11 +58,27 @@ $taskstatic=new Task($db);
 $tasktmp=new Task($db);
 
 $title=$langs->trans("Activities");
-if ($mine) $title=$langs->trans("MyActivities");
+//if ($mine) $title=$langs->trans("MyActivities");
 
 llxHeader("",$title);
 
-print load_fiche_titre($title, '', 'title_project');
+
+// Title for combo list see all projects
+$titleall=$langs->trans("AllAllowedProjects");
+if (! empty($user->rights->projet->all->lire) && ! $socid) $titleall=$langs->trans("AllProjects");
+else $titleall=$langs->trans("AllAllowedProjects").'<br><br>';
+
+
+$morehtml='';
+$morehtml.='<form name="projectform">';
+$morehtml.='<SELECT name="mode">';
+$morehtml.='<option name="all" value="all"'.($mine?'':' selected').'>'.$titleall.'</option>';
+$morehtml.='<option name="mine" value="mine"'.($mine?' selected':'').'>'.$langs->trans("ProjectsImContactFor").'</option>';
+$morehtml.='</SELECT>';
+$morehtml.='<input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'">';
+
+print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'title_project.png', 0, $morehtml);
+//print load_fiche_titre($title, '', 'title_project');
 
 if ($mine) print $langs->trans("MyTasksDesc").'<br><br>';
 else
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 195ad3dbd89..692c5ecfad4 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -345,7 +345,7 @@ if ($mine) print $langs->trans("MyTasksDesc").($onlyopenedproject?' '.$langs->tr
 else
 {
 	if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').'<br>';
-	else print $langs->trans("ProjectsPublicTaskDesc").($onlyopenedproject?' '.$langs->trans("AlsoOnlyOpenedProject"):'').'<br>';
+	else print $langs->trans("ProjectsPublicTaskDesc").($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').'<br>';
 }
 if ($mine)
 {
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 9a34913b2f5..e1c71a98ba7 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -341,7 +341,7 @@ if ($mine) print $langs->trans("MyTasksDesc").($onlyopenedproject?' '.$langs->tr
 else
 {
 	if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').'<br>';
-	else print $langs->trans("ProjectsPublicTaskDesc").($onlyopenedproject?' '.$langs->trans("AlsoOnlyOpenedProject"):'').'<br>';
+	else print $langs->trans("ProjectsPublicTaskDesc").($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').'<br>';
 }
 if ($mine)
 {
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index f3690eee61e..8292e4d31a8 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -34,6 +34,7 @@ $langs->load("projects");
 $langs->load("companies");
 
 $mine = GETPOST('mode')=='mine' ? 1 : 0;
+$search_project_user = GETPOST('search_project_user','int');
 
 // Security check
 $socid=0;
@@ -59,10 +60,25 @@ $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,($mine?$min
 
 llxHeader("",$langs->trans("Projects"),"EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos");
 
-$text=$langs->trans("ProjectsArea");
-if ($mine) $text=$langs->trans("MyProjectsArea");
+$title=$langs->trans("ProjectsArea");
+//if ($mine) $title=$langs->trans("MyProjectsArea");
 
-print load_fiche_titre($text,'','title_project.png');
+
+// Title for combo list see all projects
+$titleall=$langs->trans("AllAllowedProjects");
+if (! empty($user->rights->projet->all->lire) && ! $socid) $titleall=$langs->trans("AllProjects");
+else $titleall=$langs->trans("AllAllowedProjects").'<br><br>';
+
+
+$morehtml='';
+$morehtml.='<form name="projectform">';
+$morehtml.='<SELECT name="search_project_user">';
+$morehtml.='<option name="all" value="0"'.($mine?'':' selected').'>'.$titleall.'</option>';
+$morehtml.='<option name="mine" value="'.$user->id.'"'.(($search_project_user == $user->id)?' selected':'').'>'.$langs->trans("ProjectsImContactFor").'</option>';
+$morehtml.='</SELECT>';
+$morehtml.='<input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'">';
+
+print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'title_project.png', 0, $morehtml);
 
 // Show description of content
 if ($mine) print $langs->trans("MyProjectsDesc").'<br><br>';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 35f65b75c2a..f45148c84c7 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -75,12 +75,12 @@ $search_opp_percent=GETPOST("search_opp_percent",'alpha');
 $search_opp_amount=GETPOST("search_opp_amount",'alpha');
 $search_budget_amount=GETPOST("search_budget_amount",'alpha');
 $search_public=GETPOST("search_public",'int');
-$search_user=GETPOST('search_user','int');
+$search_project_user=GETPOST('search_project_user','int');
 $search_sale=GETPOST('search_sale','int');
 $optioncss = GETPOST('optioncss','alpha');
 
 $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
-if ($mine) { $search_user = $user->id; $mine=0; }
+if ($mine) { $search_project_user = $user->id; $mine=0; }
 
 $sday	= GETPOST('sday','int');
 $smonth	= GETPOST('smonth','int');
@@ -170,7 +170,7 @@ if (empty($reshook))
     	$search_budget_amount='';
     	$search_public="";
     	$search_sale="";
-    	$search_user='';
+    	$search_project_user='';
     	$sday="";
     	$smonth="";
     	$syear="";
@@ -193,7 +193,8 @@ $formother = new FormOther($db);
 $formproject = new FormProjets($db);
 
 $title=$langs->trans("Projects");
-if ($search_user == $user->id) $title=$langs->trans("MyProjects");
+//if ($search_project_user == $user->id) $title=$langs->trans("MyProjects");
+
 
 // Get list of project id allowed to user (in a string list separated by coma)
 if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
@@ -238,7 +239,7 @@ if (! empty($search_categ)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_proje
 // For external user, no check is done on company permission because readability is managed by public status of project and assignement.
 //if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
 if ($search_sale > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
-if ($search_user > 0)
+if ($search_project_user > 0)
 {
 	$sql.=", ".MAIN_DB_PREFIX."element_contact as ecp";
 }
@@ -296,7 +297,7 @@ if ($search_public!='') $sql .= " AND p.public = ".$db->escape($search_public);
 if ($search_sale > 0) $sql.= " AND sc.fk_user = " .$search_sale;
 // For external user, no check is done on company permission because readability is managed by public status of project and assignement.
 //if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
-if ($search_user > 0) $sql.= " AND ecp.fk_c_type_contact IN (".join(',',array_keys($listofprojectcontacttype)).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".$search_user; 
+if ($search_project_user > 0) $sql.= " AND ecp.fk_c_type_contact IN (".join(',',array_keys($listofprojectcontacttype)).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".$search_project_user; 
 if ($search_opp_amount != '') $sql .= natural_search('p.opp_amount', $search_opp_amount, 1);
 if ($search_budget_amount != '') $sql .= natural_search('p.budget_amount', $search_budget_amount, 1);
 // Add where from extra fields
@@ -368,7 +369,7 @@ if ($search_status >= 0) 		$param.='&search_status='.$search_status;
 if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all','openedopp','none'))) 	$param.='&search_opp_status='.urlencode($search_opp_status);
 if ((is_numeric($search_opp_percent) && $search_opp_percent >= 0) || in_array($search_opp_percent, array('all','openedopp','none'))) 	$param.='&search_opp_percent='.urlencode($search_opp_percent);
 if ($search_public != '') 		$param.='&search_public='.$search_public;
-if ($search_user > 0)    		$param.='&search_user='.$search_user;
+if ($search_project_user != '')   $param.='&search_project_user='.$search_project_user;
 if ($search_sale > 0)    		$param.='&search_sale='.$search_sale;
 if ($search_opp_amount != '')    $param.='&search_opp_amount='.$search_opp_amount;
 if ($search_budget_amount != '') $param.='&search_budget_amount='.$search_budget_amount;
@@ -381,9 +382,6 @@ foreach ($search_array_options as $key => $val)
     if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 }
 
-$text=$langs->trans("Projects");
-if ($search_user == $user->id) $text=$langs->trans('MyProjects');
-
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -394,10 +392,10 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'title_project', 0, '', '', $limit);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'title_project', 0, '', '', $limit);
 
 // Show description of content
-if ($search_user == $user->id) print $langs->trans("MyProjectsDesc").'<br><br>';
+if ($search_project_user == $user->id) print $langs->trans("MyProjectsDesc").'<br><br>';
 else
 {
 	if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").'<br><br>';
@@ -417,7 +415,7 @@ if (! empty($conf->categorie->enabled))
 {
     require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
     $moreforfilter.='<div class="divsearchfield">';
-    $moreforfilter.=$langs->trans('Categories'). ': ';
+    $moreforfilter.=$langs->trans('ProjectCategories'). ': ';
     $moreforfilter.=$formother->select_categories('project',$search_categ,'search_categ',1);
     $moreforfilter.='</div>';
 }
@@ -427,7 +425,7 @@ $moreforfilter.='<div class="divsearchfield">';
 $moreforfilter.=$langs->trans('ProjectsWithThisUserAsContact'). ': ';
 $includeonly='';
 if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
-$moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth300');
+$moreforfilter.=$form->select_dolusers($search_project_user?$search_project_user:'', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth300');
 $moreforfilter.='</div>';
 
 // If the user can view thirdparties other than his'
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 74f9b122f14..c9d9e82ea82 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -37,6 +37,7 @@ $langs->load('companies');
 $id=GETPOST('id','int');
 
 $search_all=GETPOST('search_all');
+$search_categ=GETPOST("search_categ",'alpha');
 $search_project=GETPOST('search_project');
 if (! isset($_GET['search_projectstatus']) && ! isset($_POST['search_projectstatus'])) 
 {
@@ -142,9 +143,10 @@ if (empty($reshook))
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
     // Purge search criteria
-    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
         $search_all="";
+        $search_categ="";
         $search_project="";
         $search_projectstatus=-1;
         $search_project_ref="";
@@ -184,7 +186,7 @@ if ($search_project_user > 0) $puser->fetch($search_project_user);
 if ($search_task_user > 0) $tuser->fetch($search_task_user);
 
 $title=$langs->trans("Activities");
-if ($search_task_user == $user->id) $title=$langs->trans("MyActivities");
+//if ($search_task_user == $user->id) $title=$langs->trans("MyActivities");
 
 if ($id)
 {
@@ -232,6 +234,8 @@ $sql = "SELECT ".$distinct." p.rowid as projectid, p.ref as projectref, p.title
 $sql.= ", s.nom as name, s.rowid as socid";
 $sql.= ", t.datec as date_creation, t.dateo as date_start, t.datee as date_end, t.tms as date_update";
 $sql.= ", t.rowid as id, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress, t.fk_statut";
+// We'll need these fields in order to filter by categ
+if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_project";
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -239,8 +243,10 @@ $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid,";
-$sql.= " ".MAIN_DB_PREFIX."projet_task as t";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+// We'll need this table joined to the select in order to filter by categ
+if (! empty($search_categ)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_project as cs ON p.rowid = cs.fk_project"; // We'll need this table joined to the select in order to filter by categ
+$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as ef on (t.rowid = ef.fk_object)";
 if ($search_project_user > 0)  $sql.=", ".MAIN_DB_PREFIX."element_contact as ecp";
 if ($search_task_user > 0)     $sql.=", ".MAIN_DB_PREFIX."element_contact as ect";
@@ -249,6 +255,8 @@ $sql.= " AND p.entity IN (".getEntity('project',1).')';
 if (! $user->rights->projet->all->lire) $sql.=" AND p.rowid IN (".($projectsListId?$projectsListId:'0').")";    // public and assigned to projects, or restricted to company for external users
 // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+if ($search_categ > 0)     $sql.= " AND cs.fk_categorie = ".$db->escape($search_categ);
+if ($search_categ == -2)   $sql.= " AND cs.fk_categorie IS NULL";
 if ($search_project_ref)   $sql .= natural_search('p.ref', $search_project_ref);
 if ($search_project_title) $sql .= natural_search('p.title', $search_project_title);
 if ($search_task_ref)      $sql .= natural_search('t.ref', $search_task_ref);
@@ -359,7 +367,7 @@ if ($search_societe != '') 		$param.='&search_societe='.$search_societe;
 if ($search_projectstatus != '') $param.='&search_projectstatus='.$search_projectstatus;
 if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all','none'))) 	$param.='&search_opp_status='.urlencode($search_opp_status);
 if ($search_public != '') 		$param.='&search_public='.$search_public;
-if ($search_project_user > 0)   $param.='&search_project_user='.$search_project_user;
+if ($search_project_user != '')   $param.='&search_project_user='.$search_project_user;
 if ($search_task_user > 0)    	$param.='&search_task_user='.$search_task_user;
 if ($optioncss != '') $param.='&optioncss='.$optioncss;
 // Add $param from extra fields
@@ -395,12 +403,24 @@ if ($search_all)
     print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
 }
 
+$morehtmlfilter = '';
+
+// Filter on categories
+if (! empty($conf->categorie->enabled))
+{
+    require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+    $moreforfilter.='<div class="divsearchfield">';
+    $moreforfilter.=$langs->trans('ProjectCategories'). ': ';
+    $moreforfilter.=$formother->select_categories('project',$search_categ,'search_categ',1);
+    $moreforfilter.='</div>';
+}
+
 // If the user can view users
 $moreforfilter.='<div class="divsearchfield">';
 $moreforfilter.=$langs->trans('ProjectsWithThisUserAsContact'). ' ';
 $includeonly='';
 if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
-$moreforfilter.=$form->select_dolusers($search_project_user, 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth300');
+$moreforfilter.=$form->select_dolusers($search_project_user?$search_project_user:'', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth300');
 $moreforfilter.='</div>';
 
 // If the user can view users
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 6cb52588a89..22293039c86 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -425,6 +425,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.'&lineid='.$_GET["lineid"].($withproject?'&withproject=1':''),$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
 		}
 
+		print '<div class="fichecenter">';
 		print '<table class="border" width="100%">';
 
 		$param=($withproject?'&withproject=1':'');
@@ -492,7 +493,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		}
 
 		print '</table>';
-
+        print '</div>';
+        
 		dol_fiche_end();
 
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 1f2f1a225e3..5ae8d76e456 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -268,7 +268,7 @@ input.select2-input {
 	border-bottom:  solid 1px rgba(0,0,0,.2) !important;	/* required to avoid to lose bottom line when focus is lost on select2. */
 }
 
-.liste_titre input[name=month], .liste_titre input[name=month_lim] {
+.liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
@@ -282,9 +282,14 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
 }
 input {
     line-height: 17px;
+	padding: 4px;
+	padding-left: 5px;
+}
+select {
+	padding: 4px;
+	padding-left: 2px;
 }
 input, select {
-	padding: 4px;
 	margin-left:0px;
 	margin-bottom:1px;
 	margin-top:1px;
@@ -4003,7 +4008,7 @@ a span.select2-chosen
 }
 .select2-container .select2-choice {
 	background-image: none;
-	line-height: 24px;
+	/* line-height: 24px; */
 }
 .select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit
 {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 425b4a4fb2f..b7da47d400c 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -292,18 +292,24 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     outline: none;
     margin: 0px 0px 0px 0px;
 }
-input, select {
-	border-bottom: solid 1px rgba(0,0,0,.1);
 
+input {
+    line-height: 17px;
+	padding: 4px;
+	padding-left: 5px;
+}
+select {
+	padding: 4px;
+	padding-left: 2px;
+}
+input, select {
 	margin-left:0px;
 	margin-bottom:1px;
 	margin-top:1px;
 }
-input {
-	padding:4px;
-}
-select {
-	padding:1px;
+
+input, select {
+	border-bottom: solid 1px rgba(0,0,0,.1);
 }
 
 textarea {

From 6c392fad9f5f7e952c7ee9c174e22884f866450a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 14 Mar 2017 14:06:55 +0100
Subject: [PATCH 0384/1163] Fix CSS

---
 htdocs/core/menus/init_menu_auguria.sql | 9 +--------
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 htdocs/projet/tasks.php                 | 2 +-
 htdocs/projet/tasks/task.php            | 2 +-
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 59886b99f63..8ac601b4e27 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -281,20 +281,13 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3600__+MAX_llx_menu__, 'project', 'projects', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects', 'Projects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/card.php?leftmenu=projects&amp;action=create', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3602__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__);
-
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3610__+MAX_llx_menu__, 'project', 'myprojects', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects&amp;mode=mine', 'MyProjects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3611__+MAX_llx_menu__, 'project', '', 3610__+MAX_llx_menu__, '/projet/card.php?leftmenu=projects&amp;action=create&amp;mode=mine', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3612__+MAX_llx_menu__, 'project', '', 3610__+MAX_llx_menu__, '/projet/list.php?leftmenu=projects&amp;mode=mine', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3603__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/stats/index.php?leftmenu=projects', 'Statistics', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__);
 
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3700__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/index.php?leftmenu=projects', 'Activities', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3701__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&amp;action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3702__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3703__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/activity/perweek.php?leftmenu=projects', 'NewTimeSpent', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__);
 
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3800__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/index.php?leftmenu=projects&amp;mode=mine', 'MyActivities', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3801__+MAX_llx_menu__, 'project', '', 3800__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&amp;action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3802__+MAX_llx_menu__, 'project', '', 3800__+MAX_llx_menu__, '/projet/tasks/list.php?leftmenu=projects&amp;mode=mine', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3803__+MAX_llx_menu__, 'project', '', 3800__+MAX_llx_menu__, '/projet/activity/perweek.php?leftmenu=projects&amp;mode=mine', 'NewTimeSpent', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__);
 -- Project - Categories
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3804__+MAX_llx_menu__, 'project', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=6', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3805__+MAX_llx_menu__, 'project', '', 3200__+MAX_llx_menu__, '/categories/card.php?action=create&amp;type=6', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 9396363a0ab..924a71020d8 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1236,7 +1236,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/projet/card.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer && $user->rights->projet->creer);
 				$newmenu->add("/projet/list.php?leftmenu=projects&search_status=99", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire);
                 */
-				$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire && $user->rights->projet->lire);
+				$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
 				
 				if (empty($conf->global->PROJECT_HIDE_TASKS))
 				{
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index cd8728b3013..b742b5a3acb 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -394,7 +394,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	// Description
 	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
 	print '<td>';
-	print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'">'.$description.'</textarea>';
+	print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_4.'">'.$description.'</textarea>';
 	print '</td></tr>';
 
 	// Other options
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 890de102e6b..84dccbb93e7 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -400,7 +400,7 @@ if ($id > 0 || ! empty($ref))
 			// Description
 			print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
 			print '<td>';
-			print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'">'.$object->description.'</textarea>';
+			print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_4.'">'.$object->description.'</textarea>';
 			print '</td></tr>';
 
 			// Other options

From 7f8c4d7d0fbbaf7ee1d22190337d2ec06062a4ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 14 Mar 2017 14:33:25 +0100
Subject: [PATCH 0385/1163] Fix CSS

---
 htdocs/comm/card.php            |  2 +-
 htdocs/fourn/card.php           |  2 +-
 htdocs/index.php                | 84 ++++++++++++++++++---------------
 htdocs/langs/en_US/main.lang    |  1 +
 htdocs/theme/eldy/style.css.php |  3 ++
 htdocs/theme/md/style.css.php   |  3 ++
 6 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 126c3fe0f62..b7cd28c446a 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -519,7 +519,7 @@ if ($id > 0)
 
 	// Lien recap
 	$boxstat.='<div class="box">';
-	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable" width="100%">';
+	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom" width="100%">';
 	$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
 	
 	if ($conf->propal->enabled)
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index f731fac1684..390872bb836 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -284,7 +284,7 @@ if ($object->id > 0)
 	
 	// Lien recap
 	$boxstat.='<div class="box">';
-	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable" width="100%">';
+	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom" width="100%">';
 	$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
 	
 	if ($conf->supplier_proposal->enabled)
diff --git a/htdocs/index.php b/htdocs/index.php
index ee7d2ea7e04..b6189537546 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -516,7 +516,6 @@ foreach($dashboardlines as $tmp)
 {
 	if ($tmp instanceof WorkboardResponse) $valid_dashboardlines[] = $tmp;
 }
-$rowspan = count($valid_dashboardlines);
 
 // We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop
 foreach($valid_dashboardlines as $board)
@@ -549,8 +548,6 @@ if ($showweather)
     $text='';
     if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
     $options='height="64px"';
-    if ($rowspan <= 2) $options='height="24"';  // Weather logo is smaller if dashboard has few elements
-    else if ($rowspan <= 3) $options='height="48"';  // Weather logo is smaller if dashboard has few elements
     $boxwork.=showWeather($totallate,$text,$options);
     $boxwork.='</td>';
     /*$boxwork.='<td align="left" colspan="3" class="nohover">';
@@ -564,43 +561,54 @@ if ($showweather)
 
 // Show dashboard
 $nbworkboardempty=0;
-foreach($valid_dashboardlines as $board)
+if (! empty($valid_dashboardlines))
 {
-    if (empty($boad->nbtodo)) $nbworkboardempty++;
-    
-    $var=!$var;
-    $boxwork .= '<tr class="oddeven'.($board->nbtodo?'':' workboardempty').'"><td class="nowrap">'.$board->img.' &nbsp; '.$board->label.'</td>';
-    $boxwork .= '<td align="right"><a class="dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator">'.$board->nbtodo.'</span></a></td>';
-    $boxwork .= '<td align="right">';
-    $textlate = $langs->trans("NActionsLate",$board->nbtodolate);
-    $textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
-    $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
-    $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
-    $boxwork .= $board->nbtodolate;
-    $boxwork .= '</span>';
-    $boxwork .= '</a>';
-    $boxwork .='</td>';
-    $boxwork .='<td>';
-    if ($board->nbtodolate > 0) $boxwork .=img_picto($textlate, "warning", 'class="valignmiddle"').' ';
-    $boxwork .='</td>';
-    /*print '<td class="nowrap" align="right">';
-    print ' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')';
-    print '</td>';*/
-    /*
-    if ($showweather)
+    foreach($valid_dashboardlines as $board)
     {
-        $boxwork.='<td class="nohover hideonsmartphone noborderbottom" rowspan="'.$rowspan.'" width="80" style="border-left: 1px solid #DDDDDD" align="center">';
-        $text='';
-        if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
-        $options='height="64px"';
-        if ($rowspan <= 2) $options='height="24"';  // Weather logo is smaller if dashboard has few elements
-        else if ($rowspan <= 3) $options='height="48"';  // Weather logo is smaller if dashboard has few elements
-        $boxwork.=showWeather($totallate,$text,$options);
-        $boxwork.='</td>';
-        $showweather=0;
-    }*/
-    $boxwork .='</tr>';
-    $boxwork .="\n";
+        if (empty($boad->nbtodo)) $nbworkboardempty++;
+        
+        $var=!$var;
+        $boxwork .= '<tr class="oddeven'.($board->nbtodo?'':' workboardempty').'"><td class="nowrap">'.$board->img.' &nbsp; '.$board->label.'</td>';
+        $boxwork .= '<td align="right"><a class="dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator">'.$board->nbtodo.'</span></a></td>';
+        $boxwork .= '<td align="right">';
+        $textlate = $langs->trans("NActionsLate",$board->nbtodolate);
+        $textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
+        $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
+        $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
+        $boxwork .= $board->nbtodolate;
+        $boxwork .= '</span>';
+        $boxwork .= '</a>';
+        $boxwork .='</td>';
+        $boxwork .='<td>';
+        if ($board->nbtodolate > 0) $boxwork .=img_picto($textlate, "warning", 'class="valignmiddle"').' ';
+        $boxwork .='</td>';
+        /*print '<td class="nowrap" align="right">';
+        print ' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')';
+        print '</td>';*/
+        /*
+        if ($showweather)
+        {
+            $boxwork.='<td class="nohover hideonsmartphone noborderbottom" rowspan="'.$rowspan.'" width="80" style="border-left: 1px solid #DDDDDD" align="center">';
+            $text='';
+            if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
+            $options='height="64px"';
+            if ($rowspan <= 2) $options='height="24"';  // Weather logo is smaller if dashboard has few elements
+            else if ($rowspan <= 3) $options='height="48"';  // Weather logo is smaller if dashboard has few elements
+            $boxwork.=showWeather($totallate,$text,$options);
+            $boxwork.='</td>';
+            $showweather=0;
+        }*/
+        $boxwork .='</tr>';
+        $boxwork .="\n";
+    }
+}
+else
+{
+    $boxwork.='<tr class="nohover">';
+    $boxwork.='<td colspan="4" class="nohover valignmiddle opacitymedium">';
+    $boxwork.=$langs->trans("NoOpenedElementToProcess");
+    $boxwork.='</td>';
+    $boxwork.='</tr>';
 }
 
 $boxwork.='</table>';   // End table array of working board
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index e29c8d8c8b9..9267fa16b2d 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -408,6 +408,7 @@ TotalDuration=Total duration
 Summary=Summary
 DolibarrStateBoard=Statistics
 DolibarrWorkBoard=Work tasks board
+NoOpenedElementToProcess=No opened element to process
 Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 5ae8d76e456..17e77025da8 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2858,6 +2858,9 @@ span.dashboardlineko {
 }
 .boxtable {
     margin-bottom: 8px !important;
+    border-bottom-width: 1px;
+}
+.boxtablenobottom {
     border-bottom-width: 0 !important;
 }
 .tdboxstats {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index b7da47d400c..4470cbed751 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2785,6 +2785,9 @@ span.dashboardlineko {
 }
 .boxtable {
     margin-bottom: 8px !important;
+    border-bottom-width: 1px;
+}
+.boxtablenobottom {
     border-bottom-width: 0 !important;
 }
 .tdboxstats {

From 76db6c9f18d2f5f56afb85bc9e293e16f16b680c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 14 Mar 2017 21:02:26 +0100
Subject: [PATCH 0386/1163] Fix css and colspan

---
 htdocs/core/tpl/objectline_create.tpl.php | 16 +++++++-------
 htdocs/core/tpl/objectline_edit.tpl.php   | 26 +++++++++++------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index f85ca68c864..83725580db5 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -269,12 +269,12 @@ else {
 	?>
 	</td>
 	<td class="nobottom linecoluht" align="right">
-	<input type="text" size="5" name="price_ht" id="price_ht" class="flat" value="<?php echo (isset($_POST["price_ht"])?GETPOST("price_ht",'alpha',2):''); ?>">
+	<input type="text" size="5" name="price_ht" id="price_ht" class="flat right" value="<?php echo (isset($_POST["price_ht"])?GETPOST("price_ht",'alpha',2):''); ?>">
 	</td>
 	
 	<?php if (!empty($conf->multicurrency->enabled)) { $colspan++;?>
 	<td class="nobottom linecoluht_currency" align="right">
-	<input type="text" size="5" name="multicurrency_price_ht" id="multicurrency_price_ht" class="flat" value="<?php echo (isset($_POST["multicurrency_price_ht"])?GETPOST("multicurrency_price_ht",'alpha',2):''); ?>">
+	<input type="text" size="5" name="multicurrency_price_ht" id="multicurrency_price_ht" class="flat right" value="<?php echo (isset($_POST["multicurrency_price_ht"])?GETPOST("multicurrency_price_ht",'alpha',2):''); ?>">
 	</td>
 	<?php } ?>
 	
@@ -283,7 +283,7 @@ else {
 	<input type="text" size="5" name="price_ttc" id="price_ttc" class="flat" value="<?php echo (isset($_POST["price_ttc"])?GETPOST("price_ttc",'alpha',2):''); ?>">
 	</td>
 	<?php } ?>
-	<td class="nobottom linecolqty" align="right"><input type="text" size="2" name="qty" id="qty" class="flat" value="<?php echo (isset($_POST["qty"])?GETPOST("qty",'alpha',2):1); ?>">
+	<td class="nobottom linecolqty" align="right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="<?php echo (isset($_POST["qty"])?GETPOST("qty",'alpha',2):1); ?>">
 	</td>
 	<?php
 	if($conf->global->PRODUCT_USE_UNITS)
@@ -293,11 +293,11 @@ else {
 		print '</td>';
 	}
 	?>
-	<td class="nobottom nowrap linecoldiscount" align="right"><input type="text" size="1" name="remise_percent" id="remise_percent" class="flat" value="<?php echo (isset($_POST["remise_percent"])?GETPOST("remise_percent",'alpha',2):$buyer->remise_percent); ?>"><span class="hideonsmartphone">%</span></td>
+	<td class="nobottom nowrap linecoldiscount" align="right"><input type="text" size="1" name="remise_percent" id="remise_percent" class="flat right" value="<?php echo (isset($_POST["remise_percent"])?GETPOST("remise_percent",'alpha',2):$buyer->remise_percent); ?>"><span class="hideonsmartphone">%</span></td>
 	<?php
 	if ($this->situation_cycle_ref) {
 		$coldisplay++;
-		print '<td class="nobottom nowrap" align="right"><input type="text" size="1" value="0" name="progress">%</td>';
+		print '<td class="nobottom nowrap" align="right"><input class="falt right" type="text" size="1" value="0" name="progress">%</td>';
 	}
 	if (! empty($usemargins))
 	{
@@ -309,7 +309,7 @@ else {
 			<select id="fournprice_predef" name="fournprice_predef" class="flat" data-role="none" style="display: none;"></select>
 			<?php } ?>
 			<!-- For free product -->
-			<input type="text" size="5" id="buying_price" name="buying_price" class="flat" value="<?php echo (isset($_POST["buying_price"])?GETPOST("buying_price",'alpha',2):''); ?>">
+			<input type="text" size="5" id="buying_price" name="buying_price" class="flat right" value="<?php echo (isset($_POST["buying_price"])?GETPOST("buying_price",'alpha',2):''); ?>">
 		</td>
 		<?php
 		$coldisplay++;
@@ -319,12 +319,12 @@ else {
 		{
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
 			{
-				echo '<td align="right" class="nobottom nowrap margininfos"><input type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(isset($_POST["np_marginRate"])?GETPOST("np_marginRate",'alpha',2):'').'"><span class="np_marginRate hideonsmartphone">%</span></td>';
+				echo '<td align="right" class="nobottom nowrap margininfos"><input class="flat right" type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(isset($_POST["np_marginRate"])?GETPOST("np_marginRate",'alpha',2):'').'"><span class="np_marginRate hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
 			if (! empty($conf->global->DISPLAY_MARK_RATES))
 			{
-				echo '<td align="right" class="nobottom nowrap margininfos"><input type="text" size="2" id="np_markRate" name="np_markRate" value="'.(isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):'').'"><span class="np_markRate hideonsmartphone">%</span></td>';
+				echo '<td align="right" class="nobottom nowrap margininfos"><input class="flat right" type="text" size="2" id="np_markRate" name="np_markRate" value="'.(isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):'').'"><span class="np_markRate hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
 		}
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index d982516bd67..2f839e06281 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -46,6 +46,7 @@ $colspan = 3;	// Col total ht + col edit + col delete
 if (! empty($inputalsopricewithtax)) $colspan++;	// We add 1 if col total ttc
 if (in_array($object->element,array('propal','supplier_proposal','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++;	// With this, there is a column move button
 if (empty($user->rights->margins->creer)) $colspan++;
+if (!empty($conf->multicurrency->enabled)) $colspan+=2;
 ?>
 
 <!-- BEGIN PHP TEMPLATE objectline_edit.tpl.php -->
@@ -114,23 +115,22 @@ $coldisplay=-1; // We remove first td
 	if ($this->situation_counter == 1 || !$this->situation_cycle_ref) {
 		print '<td align="right">' . $form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1) . '</td>';
 	} else {
-		print '<td align="right"><input size="1" type="text" class="flat" name="tva_tx" value="' . price($line->tva_tx) . '" readonly />%</td>';
+		print '<td align="right"><input size="1" type="text" class="flat right" name="tva_tx" value="' . price($line->tva_tx) . '" readonly />%</td>';
 	}
 
 	$coldisplay++;
-	print '<td align="right"><input type="text" class="flat" size="5" id="price_ht" name="price_ht" value="' . (isset($line->pu_ht)?price($line->pu_ht,0,'',0):price($line->subprice,0,'',0)) . '"';
+	print '<td align="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="' . (isset($line->pu_ht)?price($line->pu_ht,0,'',0):price($line->subprice,0,'',0)) . '"';
 	if ($this->situation_counter > 1) print ' readonly';
 	print '></td>';
 
 	if (!empty($conf->multicurrency->enabled)) {
-		$colspan++;
-		print '<td align="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>';
+		print '<td align="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>';
 	}
 
 	if ($inputalsopricewithtax)
 	{
 		$coldisplay++;
-		print '<td align="right"><input type="text" class="flat" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"';
+		print '<td align="right"><input type="text" class="flat right" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"';
 		if ($this->situation_counter > 1) print ' readonly';
 		print '></td>';
 	}
@@ -141,7 +141,7 @@ $coldisplay=-1; // We remove first td
 		// for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
 		// must also not be output for most entities (proposal, intervention, ...)
 		//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
-		print '<input size="3" type="text" class="flat" name="qty" id="qty" value="' . $line->qty . '"';
+		print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="' . $line->qty . '"';
 		if ($this->situation_counter > 1) print ' readonly';
 		print '>';
 	} else { ?>
@@ -160,7 +160,7 @@ $coldisplay=-1; // We remove first td
 
 	<td align="right" class="nowrap"><?php $coldisplay++; ?>
 	<?php if (($line->info_bits & 2) != 2) {
-		print '<input size="1" type="text" class="flat" name="remise_percent" id="remise_percent" value="' . $line->remise_percent . '"';
+		print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="' . $line->remise_percent . '"';
 		if ($this->situation_counter > 1) print ' readonly';
 		print '>%';
 	} else { ?>
@@ -170,7 +170,7 @@ $coldisplay=-1; // We remove first td
 	<?php
 	if ($this->situation_cycle_ref) {
 		$coldisplay++;
-		print '<td align="right" class="nowrap"><input type="text" size="1" value="' . $line->situation_percent . '" name="progress">%</td>';
+		print '<td align="right" class="nowrap"><input class="right" type="text" size="1" value="' . $line->situation_percent . '" name="progress">%</td>';
 	}
 	if (! empty($usemargins))
 	{
@@ -179,10 +179,10 @@ $coldisplay=-1; // We remove first td
 		<td align="right" class="margininfos"><?php $coldisplay++; ?>
 			<!-- For predef product -->
 			<?php if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) { ?>
-			<select id="fournprice_predef" name="fournprice_predef" class="flat" data-role="none" style="display: none;"></select>
+			<select id="fournprice_predef" name="fournprice_predef" class="flat right" data-role="none" style="display: none;"></select>
 			<?php } ?>
 			<!-- For free product -->
-			<input type="text" size="5" id="buying_price" name="buying_price" class="hideobject" value="<?php echo price($line->pa_ht,0,'',0); ?>">
+			<input class="flat right" type="text" size="5" id="buying_price" name="buying_price" class="hideobject" value="<?php echo price($line->pa_ht,0,'',0); ?>">
 		</td>
 		<?php } ?>
 	    <?php if ($user->rights->margins->creer) {
@@ -193,7 +193,7 @@ $coldisplay=-1; // We remove first td
 					if ($line->subprice < 0)
 						echo '<td align="right" class="nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
 					else
-						echo '<td align="right" class="nowrap margininfos"><input type="text" size="2" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
+						echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
 					$coldisplay++;
 				  }
 				elseif (! empty($conf->global->DISPLAY_MARK_RATES))
@@ -203,7 +203,7 @@ $coldisplay=-1; // We remove first td
 					if ($line->subprice < 0)
 						echo '<td align="right" class="nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
 					else
-						echo '<td align="right" class="nowrap margininfos"><input type="text" size="2" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
+						echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
 					$coldisplay++;
 				  }
 			  }
@@ -227,7 +227,7 @@ $coldisplay=-1; // We remove first td
 
 <?php if (! empty($conf->service->enabled) && $line->product_type == 1 && $dateSelector)	 { ?>
 <tr id="service_duration_area" <?php echo $bc[$var]; ?>>
-	<td colspan="11"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
+	<td colspan="<?php echo 7+$colspan ?>"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
 	<?php
 	$hourmin=(isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:'');
 	echo $form->select_date($line->date_start,'date_start',$hourmin,$hourmin,$line->date_start?0:1,"updateligne",1,0,1);

From 688073dc18b49d836341c8b2f549a5990faae026 Mon Sep 17 00:00:00 2001
From: dolibarr95 <onajid@1blow-services.com>
Date: Wed, 15 Mar 2017 10:31:45 +0100
Subject: [PATCH 0387/1163] Create a trigger for company create RIB

Since there no 'trigger' executed when we create a RIB for a company (COMPANY_CREATE, COMPANY_MODIFY, COMPANY_DELETE not executed), I purpose a new one COMPANY_RIB_CREATE. If this PR is qualified i will purpose COMPANY_RIB_MODIFY and COMPANY_RIB_DELETE too.

tks
---
 .../class/companybankaccount.class.php        | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 7d1afae725d..d59bedd03af 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -69,8 +69,8 @@ class CompanyBankAccount extends Account
      */
     function create(User $user = null, $notrigger=0)
     {
-        $now=dol_now();
-
+        $now	= dol_now();
+	$error	= 0;
         // Correct default_rib to be sure to have always one default
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib where fk_soc = ".$this->socid." AND default_rib = 1";
    		$result = $this->db->query($sql);
@@ -89,7 +89,21 @@ class CompanyBankAccount extends Account
             if ($this->db->affected_rows($resql))
             {
                 $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_rib");
-                return 1;
+		    
+		// Call trigger
+		$result=$this->call_trigger('COMPANY_RIB_CREATE',$user);
+		if ($result < 0) $error++;
+		// End call triggers
+		    
+		if(! $error )
+		{
+			return 1;
+		}
+		else
+		{
+			return 0;
+		}
+               
             }
         }
         else

From 0721e6af42b757a2c19a4c1463e390acceac9d3a Mon Sep 17 00:00:00 2001
From: dolibarr95 <onajid@1blow-services.com>
Date: Wed, 15 Mar 2017 10:37:08 +0100
Subject: [PATCH 0388/1163] add condition

add condition check for $notrigger
---
 .../class/companybankaccount.class.php        | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index d59bedd03af..ec770d628a0 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -90,19 +90,27 @@ class CompanyBankAccount extends Account
             {
                 $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_rib");
 		    
-		// Call trigger
-		$result=$this->call_trigger('COMPANY_RIB_CREATE',$user);
-		if ($result < 0) $error++;
-		// End call triggers
+		    if (! $notrigger)
+		    {
+		   	 // Call trigger
+			$result=$this->call_trigger('COMPANY_RIB_CREATE',$user);
+			if ($result < 0) $error++;
+			// End call triggers
+
+			if(! $error )
+			{
+				return 1;
+			}
+			else
+			{
+				return 0;
+			}
 		    
-		if(! $error )
-		{
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
+		    }
+		    else
+		    {
+		    	return 1;
+		    }
                
             }
         }

From 888675016d458972fe5b18962726516d02ca8382 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 15 Mar 2017 11:13:30 +0100
Subject: [PATCH 0389/1163] NEW Can use dol_fiche_end without showing bottom
 border.

---
 htdocs/bookmarks/card.php         | 10 +++++++---
 htdocs/comm/propal/card.php       |  1 -
 htdocs/contrat/note.php           |  2 +-
 htdocs/core/lib/functions.lib.php | 12 ++++++------
 htdocs/societe/soc.php            |  4 ++--
 htdocs/supplier_proposal/card.php |  1 -
 htdocs/theme/eldy/style.css.php   | 23 ++++++++++++-----------
 htdocs/theme/md/style.css.php     | 24 +++++++++++-------------
 8 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 818a38c28df..cf5a52cf9c6 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -159,7 +159,7 @@ if ($action == 'create')
 
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input class="flat" name="title" size="30" value="'.$title.'"></td><td class="hideonsmartphone">'.$langs->trans("SetHereATitleForLink").'</td></tr>';
 
-	print '<tr><td class="fieldrequired">'.$langs->trans("UrlOrLink").'</td><td><input class="flat" name="url" size="50" value="'.$url.'"></td><td class="hideonsmartphone">'.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'</td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("UrlOrLink").'</td><td><input class="flat" name="url" class="quatrevingtpercent" value="'.$url.'"></td><td class="hideonsmartphone">'.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>';
 	$liste=array(0=>$langs->trans("ReplaceWindow"),1=>$langs->trans("OpenANewWindow"));
@@ -219,9 +219,11 @@ if ($id > 0 && ! preg_match('/^add/i',$action))
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans("BackToList").'</a>';
 	
-  dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', '', 0);
+    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', '', 0);
 
-  print '<div class="underbanner clearboth"></div>';
+    print '<div class="fichecenter">';
+    
+    print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 
 	print '<tr><td class="titlefield">';
@@ -297,6 +299,8 @@ if ($id > 0 && ! preg_match('/^add/i',$action))
 
 	print '</table>';
 
+	print '</div>';
+	
 	dol_fiche_end();
 
 	if ($action == 'edit')
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index b1a37c67b31..99e4a6c0871 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2414,7 +2414,6 @@ if ($action == 'create')
 
 		print '</div>';
 	}
-	print "<br>\n";
 
 	//Select mail models is same action as presend
 	if (GETPOST('modelselected')) $action = 'presend';
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index c97124ed35b..212fa465266 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -164,7 +164,7 @@ if ($id > 0 || ! empty($ref))
 	
 	print '</div>';
 	
-	print '<br>';
+	//print '<br>';
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0c19d216164..62b2fb274c8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -780,7 +780,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='
  *	@param	array	$links				Array of tabs. Currently initialized by calling a function xxx_admin_prepare_head
  *	@param	string	$active     		Active tab name (document', 'info', 'ldap', ....)
  *	@param  string	$title      		Title
- *	@param  int		$notab				0=Add tab header, 1=no tab header. If you set this to 1, using dol_fiche_end() to close tab is not required.
+ *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header. If you set this to 1, using dol_fiche_end() to close tab is not required.
  * 	@param	string	$picto				Add a picto on tab title
  *	@param	int		$pictoisfullpath	If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto.
  * 	@return	void
@@ -796,7 +796,7 @@ function dol_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto
  *	@param	array	$links				Array of tabs
  *	@param	string	$active     		Active tab name
  *	@param  string	$title      		Title
- *	@param  int		$notab				0=Add tab header, 1=no tab header. If you set this to 1, using dol_fiche_end() to close tab is not required.
+ *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header. If you set this to 1, using dol_fiche_end() to close tab is not required.
  * 	@param	string	$picto				Add a picto on tab title
  *	@param	int		$pictoisfullpath	If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto.
  * 	@return	string
@@ -926,7 +926,7 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
 
 	$out.="</div>\n";
 
-	if (! $notab) $out.="\n".'<div class="tabBar">'."\n";
+	if (! $notab || $notab == -1) $out.="\n".'<div class="tabBar'.($notab == -1 ? '' : ' tabBarWithBottom').'">'."\n";
 
 	$parameters=array('tabname' => $active, 'out' => $out);
 	$reshook=$hookmanager->executeHooks('printTabsHead',$parameters);	// This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"
@@ -941,7 +941,7 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
 /**
  *  Show tab footer of a card
  *
- *  @param	int		$notab       0=Add tab footer, 1=no tab footer
+ *  @param	int		$notab       -1 or 0=Add tab footer, 1=no tab footer
  *  @return	void
  */
 function dol_fiche_end($notab=0)
@@ -952,12 +952,12 @@ function dol_fiche_end($notab=0)
 /**
  *	Return tab footer of a card
  *
- *	@param  int		$notab		0=Add tab footer, 1=no tab footer
+ *	@param  int		$notab		-1 or 0=Add tab footer, 1=no tab footer
  *  @return	string
  */
 function dol_get_fiche_end($notab=0)
 {
-	if (! $notab) return "\n</div>\n";
+	if (! $notab || $notab == -1) return "\n</div>\n";
 	else return '';
 }
 
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 474a037d23f..74c02440a9f 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1506,7 +1506,7 @@ else
             if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
 
 
-            dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
+            dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
 
             print '<table class="border" width="100%">';
@@ -1921,7 +1921,7 @@ else
 
         $head = societe_prepare_head($object);
 
-        dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
+        dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
         // Confirm delete third party
         if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)))
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index e02a512f327..8ec24860e14 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1773,7 +1773,6 @@ if ($action == 'create')
 
 		print '</div>';
 	}
-	print "<br>\n";
 
 	if ($action != 'presend')
 	{
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 17e77025da8..a665002e30a 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1878,20 +1878,21 @@ div.tabBar {
     color: #<?php echo $colortextbacktab; ?>;
     padding-top: 16px;
     padding-left: 0px; padding-right: 0px;
-    padding-bottom: 14px;
-    margin: 0px 0px 14px 0px;
+    padding-bottom: 2px;
+    margin: 0px 0px 16px 0px;
     border-top: 1px solid #BBB;
-    border-bottom: 1px solid #AAA;
+    /* border-bottom: 1px solid #AAA; */
 	width: auto;
-
 	background: rgb(<?php echo $colorbacktabcard1; ?>);
-
-	/*<?php if (empty($dol_optimize_smallscreen)) { ?>
-    -moz-box-shadow: 3px 3px 4px #DDD;
-    -webkit-box-shadow: 3px 3px 4px #DDD;
-    box-shadow: 3px 3px 4px #DDD;
-	<?php } ?>*/
 }
+div.tabBarWithBottom {
+	padding-bottom: 18px;
+	border-bottom: 1px solid #aaa; 
+}
+div.tabBar table.tableforservicepart2:last-child {
+    border-bottom: 1px solid #aaa;
+}
+
 div.popuptabset {
 	padding: 6px;
 	background: #fff;
@@ -1904,7 +1905,7 @@ div.popuptab {
 	padding-right: 5px;
 }
 div.tabsAction {
-    margin: 20px 0em 10px 0em;
+    margin: 20px 0em 25px 0em;
     padding: 0em 0em;
     text-align: right;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 4470cbed751..913a269b0f2 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1883,30 +1883,28 @@ div.tabBar {
     padding-top: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
     padding-left: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
     padding-right: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
-    padding-bottom: <?php echo ($dol_optimize_smallscreen?'4':'14'); ?>px;
-    margin: 0px 0px 14px 0px;
+    padding-bottom: <?php echo ($dol_optimize_smallscreen?'2':'2'); ?>px;
+    margin: 0px 0px 16px 0px;
     -moz-border-radius:3px;
     -webkit-border-radius: 3px;
 	border-radius: 3px;
     border-right: 1px solid #BBB;
-    border-bottom: 1px solid #BBB;
+    /* border-bottom: 1px solid #BBB; */
     border-left: 1px solid #BBB;
     border-top: 1px solid #CCC;
 	width: auto;
-
 	background: rgb(<?php echo $colorbacktabcard1; ?>);
-
-	/*
-	<?php if (empty($dol_optimize_smallscreen)) { ?>
-    -moz-box-shadow: 3px 3px 4px #f4f4f4;
-    -webkit-box-shadow: 3px 3px 4px #f4f4f4;
-    box-shadow: 3px 3px 4px #f4f4f4;
-	<?php } ?>
-	*/
+}
+div.tabBarWithBottom {
+	padding-bottom: 18px;
+	border-bottom: 1px solid #aaa; 
+}
+div.tabBar table.tableforservicepart2:last-child {
+    border-bottom: 1px solid #aaa;
 }
 
 div.tabsAction {
-    margin: 20px 0em 10px 0em;
+    margin: 20px 0em 25px 0em;
     padding: 0em 0em;
     text-align: right;
 }

From e6d8b3c4db761bc55a63d02f83c5e98e8b9d2cef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 15 Mar 2017 11:41:15 +0100
Subject: [PATCH 0390/1163] Css enhancement

---
 htdocs/core/tpl/contacts.tpl.php | 20 ++++++++++----------
 htdocs/theme/eldy/style.css.php  | 10 ++++++++++
 htdocs/theme/md/style.css.php    |  3 +++
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 3f8006c286b..0a17a8c07c2 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -90,7 +90,7 @@ if ($permission) {
 		echo $formcompany->selectTypeContact($tmpobject, '', 'type','internal'); 
 		?></div>
 		<div class="tagtd">&nbsp;</div>
-		<div class="tagtd" align="right"><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></div>
+		<div class="tagtd right"><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></div>
 	</form>
 
 	<?php
@@ -107,8 +107,8 @@ if ($permission) {
 	<input type="hidden" name="action" value="addcontact" />
 	<input type="hidden" name="source" value="external" />
 	<?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
-		<div class="tagtd nowrap"><?php echo img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); ?></div>
-		<div class="tagtd nowrap maxwidthonsmartphone">
+		<div class="tagtd nowrap noborderbottom"><?php echo img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); ?></div>
+		<div class="tagtd nowrap maxwidthonsmartphone noborderbottom">
 			<?php $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$object->socid; ?>
 			<?php 
 			// add company icon before select list 
@@ -119,17 +119,17 @@ if ($permission) {
 			?>
 			<?php $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0); ?>
 		</div>
-		<div class="tagtd maxwidthonsmartphone">
+		<div class="tagtd maxwidthonsmartphone noborderbottom">
 			<?php $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid', 0, '', '', 0, 'minwidth200'); ?>
 		</div>
-		<div class="tagtd maxwidthonsmartphone">
+		<div class="tagtd maxwidthonsmartphone noborderbottom">
 			<?php
 			$tmpobject=$object;
 			if ($object->element == 'shipping' && is_object($objectsrc)) $tmpobject=$objectsrc;
 			$formcompany->selectTypeContact($tmpobject, '', 'type','external'); ?>
 		</div>
-		<div class="tagtd">&nbsp;</div>
-		<div  class="tagtd" align="right">
+		<div class="tagtd noborderbottom">&nbsp;</div>
+		<div class="tagtd right noborderbottom">
 			<input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (! $nbofcontacts) echo ' disabled'; ?>>
 		</div>
 	</form>
@@ -144,7 +144,7 @@ if ($permission) {
 		<div class="tagtd liste_titre"><?php echo $langs->trans("ThirdParty"); ?></div>
 		<div class="tagtd liste_titre"><?php echo $langs->trans("Users").'/'.$langs->trans("Contacts"); ?></div>
 		<div class="tagtd liste_titre"><?php echo $langs->trans("ContactType"); ?></div>
-		<div class="tagtd liste_titre" align="center"><?php echo $langs->trans("Status"); ?></div>
+		<div class="tagtd liste_titre center"><?php echo $langs->trans("Status"); ?></div>
 		<div class="tagtd liste_titre">&nbsp;</div>
 	</form>
 
@@ -208,7 +208,7 @@ if ($permission) {
 			?>
 		</div>
 		<div class="tagtd"><?php echo $tab[$i]['libelle']; ?></div>
-		<div class="tagtd" align="center">
+		<div class="tagtd center">
 			<?php //if ($object->statut >= 0) echo '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=swapstatut&amp;ligne='.$tab[$i]['rowid'].'">'; ?>
 			<?php
 			if ($tab[$i]['source']=='internal')
@@ -228,7 +228,7 @@ if ($permission) {
 			?>
 			<?php //if ($object->statut >= 0) echo '</a>'; ?>
 		</div>
-		<div class="tagtd nowrap" align="right">
+		<div class="tagtd nowrap right">
 			<?php if ($permission) { ?>
 				&nbsp;<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deletecontact&amp;lineid='.$tab[$i]['rowid']; ?>"><?php echo img_delete(); ?></a>
 			<?php } ?>
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a665002e30a..832b13dedf9 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2326,6 +2326,9 @@ td.border, div.tagtable div div.border {
 
 
 /* Main boxes */
+.noborderbottom {
+    border-bottom: none !important;
+}
 .ficheaddleft table.noborder {
 	margin: 0px 0px 0px 0px;
 }
@@ -2345,6 +2348,13 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 
 	margin: 0px 0px 5px 0px;
 }
+div.ficheaddleft table.noborder:last-child {
+    border-bottom: 1px solid #aaa;
+}
+div.ficheaddleft table.noborder {
+    border-bottom: none;
+}
+
 table.paddingtopbottomonly tr td {
 	padding-top: 1px;
 	padding-bottom: 2px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 913a269b0f2..6bca9f1751e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2228,6 +2228,9 @@ td.border, div.tagtable div div.border {
 
 
 /* Main boxes */
+.noborderbottom {
+    border-bottom: none !important;
+}
 .ficheaddleft table.noborder {
 	margin: 0px 0px 0px 0px;
 }

From 4c0ff38020f22ab337950702f98cf0e5ac89eec7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 15 Mar 2017 11:58:13 +0100
Subject: [PATCH 0391/1163] Fix closing boxes

---
 htdocs/core/class/html.formother.class.php | 6 +++---
 htdocs/hrm/index.php                       | 2 +-
 htdocs/theme/eldy/style.css.php            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 5f8fe76e320..77d3e6cf271 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -1046,7 +1046,7 @@ class FormOther
 	        	if (boxorder==\'A:A-B:B\' && closing == 1)	// There is no more boxes on screen, and we are after a delete of a box so we must hide title
 	        	{
 	        		jQuery.ajax({
-	        			url: \''.DOL_URL_ROOT.'/core/ajax/box.php?closing=\'+closing+\'&boxorder=\'+boxorder+\'&zone='.$areacode.'&userid=\'+'.$user->id.',
+	        			url: \''.DOL_URL_ROOT.'/core/ajax/box.php?closing=0&boxorder=\'+boxorder+\'&zone='.$areacode.'&userid=\'+'.$user->id.',
 	        			async: false
 	        		});
 	        		// We force reload to be sure to get all boxes into list
@@ -1086,7 +1086,7 @@ class FormOther
 	        		containment: \'.fiche\',
 	        		connectWith: \'.connectedSortable\',
 	        		stop: function(event, ui) {
-	        			updateBoxOrder(0);
+	        			updateBoxOrder(1);  /* 1 to avoid message after a move */
 	        		}
 	    		});
 
@@ -1096,7 +1096,7 @@ class FormOther
 	        		var label=jQuery(\'#boxlabelentry\'+boxid).val();
 	        		jQuery(\'#boxto_\'+boxid).remove();
 	        		if (boxid > 0) jQuery(\'#boxcombo\').append(new Option(label, boxid));
-	        		updateBoxOrder(1);
+	        		updateBoxOrder(1);  /* 1 to avoid message after a remove */
 	        	});
 
         	});'."\n";
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index b0e2bf58d79..63700629fd8 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -355,7 +355,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
 		{
 			print '<tr '.$bc[$var].'><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
-		print '</table><br>';
+		print '</table>';
 	}
 	else dol_print_error($db);
 }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 832b13dedf9..90aebd7d908 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2348,10 +2348,10 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 
 	margin: 0px 0px 5px 0px;
 }
-div.ficheaddleft table.noborder:last-child {
+div.tabBar div.ficheaddleft table.noborder:last-of-type {
     border-bottom: 1px solid #aaa;
 }
-div.ficheaddleft table.noborder {
+div.tabBar div.ficheaddleft table.noborder {
     border-bottom: none;
 }
 

From 4e1799b2be6d9ca4c862f864c69a59a760e10b32 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Wed, 15 Mar 2017 21:31:44 +0100
Subject: [PATCH 0392/1163] Add fin_validite, date_cloture in fetch

---
 htdocs/contrat/class/contrat.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 1562cfcd942..10971a3b452 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -496,7 +496,7 @@ class Contrat extends CommonObject
 		$sql.= " ref_supplier, ref_customer,";
 		$sql.= " ref_ext,";
 		$sql.= " fk_user_mise_en_service, date_contrat as datecontrat,";
-		$sql.= " fk_user_author,";
+		$sql.= " fk_user_author, fin_validite, date_cloture,";
 		$sql.= " fk_projet,";
 		$sql.= " fk_commercial_signature, fk_commercial_suivi,";
 		$sql.= " note_private, note_public, model_pdf, extraparams";
@@ -527,6 +527,10 @@ class Contrat extends CommonObject
 				$this->date_contrat				= $this->db->jdate($result["datecontrat"]);
 				$this->date_creation				= $this->db->jdate($result["datecontrat"]);
 
+				$this->fin_validite				= $this->db->jdate($result["fin_validite"]);
+				$this->date_cloture				= $this->db->jdate($result["date_cloture"]);
+
+				
 				$this->user_author_id			= $result["fk_user_author"];
 
 				$this->commercial_signature_id	= $result["fk_commercial_signature"];

From dba6d996869a7d2549472d13508a3fd78e5c6beb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 16 Mar 2017 17:02:30 +0100
Subject: [PATCH 0393/1163] Minor look enhancement

---
 htdocs/core/class/html.form.class.php       | 19 +++++++++++--------
 htdocs/core/class/html.formprojet.class.php |  2 +-
 htdocs/core/lib/project.lib.php             |  1 -
 htdocs/projet/activity/perday.php           |  8 +++++---
 htdocs/projet/activity/perweek.php          |  6 ++++--
 htdocs/theme/eldy/style.css.php             |  4 ++--
 htdocs/theme/md/style.css.php               |  4 ++--
 7 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index dc47dec5c41..1366435f144 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4740,7 +4740,7 @@ class Form
                 // Year
                 if ($emptydate || $set_time == -1)
                 {
-                    $retstring.='<input'.($disabled?' disabled':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp" type="text" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
+                    $retstring.='<input'.($disabled?' disabled':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="text" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
                 }
                 else
                 {
@@ -4885,7 +4885,7 @@ class Form
      *	@param	string	$prefix   		Prefix for input fields
      *	@param  int		$iSecond  		Default preselected duration (number of seconds or '')
      * 	@param	int		$disabled		Disable the combo box
-     * 	@param	string	$typehour		If 'select' then input hour and input min is a combo, if 'text' input hour is in text and input min is a combo
+     * 	@param	string	$typehour		If 'select' then input hour and input min is a combo, if 'text' input hour is in text and input min is a text
      *  @param	integer	$minunderhours	If 1, show minutes selection under the hours
      * 	@param	int		$nooutput		Do not output html string but return it
      *  @return	string|null
@@ -4923,12 +4923,13 @@ class Form
         }
         elseif ($typehour=='text')
         {
-        	$retstring.='<input type="text" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">';
+        	$retstring.='<input placeholder="'.$langs->trans('HourShort').'" type="text" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">';
         }
         else return 'BadValueForParameterTypeHour';
 
-        $retstring.=' '.$langs->trans('HourShort');
-
+        if ($typehour!='text') $retstring.=' '.$langs->trans('HourShort');
+        else $retstring.=':';
+        
         // Minutes
         if ($minunderhours) $retstring.='<br>';
         else $retstring.="&nbsp;";
@@ -4946,10 +4947,12 @@ class Form
         }
         elseif ($typehour=='text')
         {
-        	$retstring.='<input type="text" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat" value="'.($minSelected?((int) $minSelected):'').'">';
+        	$retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="text" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat" value="'.($minSelected?((int) $minSelected):'').'">';
         }
-        $retstring.=' '.$langs->trans('MinuteShort');
-        $retstring.="&nbsp;";
+        
+        if ($typehour!='text') $retstring.=' '.$langs->trans('MinuteShort');
+
+        //$retstring.="&nbsp;";
 
         if (! empty($nooutput)) return $retstring;
 
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 0a6837ecb53..ea77904f5cf 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -352,7 +352,7 @@ class FormProjets
 			}
 
 			if (empty($option_only)) {
-				$out.= '<select class="flat'.($minmax?' '.$minmax:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
+				$out.= '<select class="valignmiddle flat'.($minmax?' '.$minmax:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
 			}
 			if (!empty($show_empty)) {
 				$out.= '<option value="0">&nbsp;</option>';
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 173aee8ce26..054ab579194 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -919,7 +919,6 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
                     $tableCell.='</td>';
                     print $tableCell;
 		        }
-		        dol_syslog("yyy");
 		        
 				print '<td align="right">';
 				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject"));
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 692c5ecfad4..a65ffdd64e2 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -323,7 +323,7 @@ $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,$day,$y
 $nav.='<a class="inline-block valignmiddle" href="?year='.$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param.'">'.img_next($langs->trans("Next"))."</a>\n";
 $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
 $nav.='<br>'.$form->select_date(-1,'',0,0,2,"addtime",1,0,1).' ';
-$nav.=' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
+$nav.=' <input type="submit" name="submitdateselect" class="button valignmiddle" value="'.$langs->trans("Refresh").'">';
 
 $picto='calendarweek';
 
@@ -338,9 +338,10 @@ print '<input type="hidden" name="addtimemonth" value="'.$tmp['mon'].'">';
 print '<input type="hidden" name="addtimeday" value="'.$tmp['mday'].'">';
 
 $head=project_timesheet_prepare_head($mode);
-dol_fiche_head($head, 'inputperday', '', 0, 'task');
+dol_fiche_head($head, 'inputperday', '', -1, 'task');
 
 // Show description of content
+print '<div class="hideonsmartphone">';
 if ($mine) print $langs->trans("MyTasksDesc").($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').'<br>';
 else
 {
@@ -355,6 +356,7 @@ else
 {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
 }
+print '</div>';
 
 dol_fiche_end();
 
@@ -389,7 +391,7 @@ dol_fiche_end();
 //print '<input type="hidden" name="month" value="'.$month.'">';
 //print '<input type="hidden" name="day" value="'.$day.'">';
 
-print '<div class="floatright">'.$nav.'</div>';     // We move this before the assign to components so, the default submit button is not the assign to.
+print '<div class="floatright right">'.$nav.'</div>';     // We move this before the assign to components so, the default submit button is not the assign to.
 
 print '<div class="float valignmiddle">';
 print $langs->trans("AssignTaskToMe").'<br>';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index e1c71a98ba7..5847e91d46c 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -334,9 +334,10 @@ print '<input type="hidden" name="month" value="'.$month.'">';
 print '<input type="hidden" name="year" value="'.$year.'">';
 
 $head=project_timesheet_prepare_head($mode);
-dol_fiche_head($head, 'inputperweek', '', 0, 'task');
+dol_fiche_head($head, 'inputperweek', '', -1, 'task');
 
 // Show description of content
+print '<div class="hideonsmartphone">';
 if ($mine) print $langs->trans("MyTasksDesc").($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').'<br>';
 else
 {
@@ -351,6 +352,7 @@ else
 {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
 }
+print '</div>';
 
 dol_fiche_end();
 
@@ -384,7 +386,7 @@ dol_fiche_end();
 //print '<input type="hidden" name="month" value="'.$month.'">';
 //print '<input type="hidden" name="day" value="'.$day.'">';
 
-print '<div class="floatright">'.$nav.'</div>';     // We move this before the assign to components so, the default submit button is not the assign to.
+print '<div class="floatright right">'.$nav.'</div>';     // We move this before the assign to components so, the default submit button is not the assign to.
 
 print '<div class="float valignmiddle">';
 print $langs->trans("AssignTaskToMe").'<br>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 90aebd7d908..3d6e8868bec 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -761,8 +761,8 @@ div.fiche>form>div.div-table-responsive {
 		min-width: 20px;
     	min-height: 1.4em;
     	line-height: 1.4em;
-    	padding: .4em .1em;
-    	border: 1px solid #BBB;
+    	/* padding: .4em .1em; */
+    	/* border-bottom: 1px solid #BBB; */
     	/* max-width: inherit; why this ? */
      }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 6bca9f1751e..aae0fd7f677 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -771,8 +771,8 @@ div.fiche>form>div.div-table-responsive {
 		min-width: 20px;
     	min-height: 1.4em;
     	line-height: 1.4em;
-    	padding: .4em .1em;
-    	border: 1px solid #BBB;
+    	/* padding: .4em .1em; */
+    	/* border-bottom: 1px solid #BBB; */
     	/* max-width: inherit; why this */
      }
 

From 35b79818b7699586c221c285e4282cd62e1f890c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 16 Mar 2017 20:33:51 +0100
Subject: [PATCH 0394/1163] Uniformize css rules

---
 htdocs/core/class/html.formother.class.php |  2 +-
 htdocs/core/modules/modSociete.class.php   |  2 +-
 htdocs/exports/export.php                  | 51 ++++++++++++++--------
 3 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 77d3e6cf271..95dee1424ef 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -72,7 +72,7 @@ class FormOther
         $result = $this->db->query($sql);
         if ($result)
         {
-            print '<select class="flat" name="'.$htmlname.'">';
+            print '<select class="flat minwidth200" name="'.$htmlname.'">';
             if ($useempty)
             {
                 print '<option value="-1">&nbsp;</option>';
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 6c1929d1dc9..a2239514898 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -270,7 +270,7 @@ class modSociete extends DolibarrModules
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_fields_array[$r]+=array('u.login'=>'SaleRepresentativeLogin','u.firstname'=>'SaleRepresentativeFirstname', 'u.lastname'=>'SaleRepresentativeLastname');
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'List:c_departements:nom:rowid');
-		$this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Numeric",'s.client'=>"Numeric",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text','u.login'=>'Text','u.firstname'=>'Text','u.lastname'=>'Text','payterm.libelle'=>'Text','paymode.libelle'=>'Text','s.entity'=>'Numeric');
+		$this->export_TypeFields_array[$r]=array('s.rowid'=>"Numeric", 's.nom'=>"Text",'s.status'=>"Numeric",'s.client'=>"Numeric",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text','u.login'=>'Text','u.firstname'=>'Text','u.lastname'=>'Text','payterm.libelle'=>'Text','paymode.libelle'=>'Text','s.entity'=>'Numeric');
 
 		$this->export_entities_array[$r]=array('u.login'=>'user','u.firstname'=>'user','u.lastname'=>'user');	// We define here only fields that use another picto
 		$this->export_examplevalues_array[$r]=array('s.client'=>'0 (no customer no prospect)/1 (customer)/2 (prospect)/3 (customer and prospect)','s.fournisseur'=>'0 (not a supplier) or 1 (supplier)');
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 24b9ef3728e..152e095afa6 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -510,19 +510,21 @@ if ($step == 2 && $datatoexport)
     $hselected=$h;
     $h++;
 
-    dol_fiche_head($head, $hselected, $langs->trans("NewExport"));
+    dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
 
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
     print '<table width="100%" class="border">';
 
     // Module
-    print '<tr><td width="25%">'.$langs->trans("Module").'</td>';
+    print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
     print '<td>';
     //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
     print $objexport->array_export_module[0]->getName();
     print '</td></tr>';
 
     // Lot de donnees a exporter
-    print '<tr><td width="25%">'.$langs->trans("DatasetToExport").'</td>';
+    print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
 	$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
     $label=$objexport->array_export_label[0];
@@ -532,6 +534,10 @@ if ($step == 2 && $datatoexport)
     print '</td></tr>';
 
     print '</table>';
+    print '</div>';
+    
+    dol_fiche_end();
+    
     print '<br>';
 
     // Combo list of export models
@@ -543,6 +549,7 @@ if ($step == 2 && $datatoexport)
     print '<table><tr><td colspan="2">';
     print $langs->trans("SelectExportFields").' ';
     $htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1);
+    print ' ';
     print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
     print '</td></tr></table>';
     print '</form>';
@@ -635,8 +642,7 @@ if ($step == 2 && $datatoexport)
 
     print '</table>';
 
-    print '</div>';
-
+    
     /*
      * Barre d'action
      *
@@ -693,19 +699,21 @@ if ($step == 3 && $datatoexport)
 	$hselected=$h;
 	$h++;
 
-	dol_fiche_head($head, $hselected, $langs->trans("NewExport"));
+	dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
 
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
 	print '<table width="100%" class="border">';
 
 	// Module
-	print '<tr><td width="25%">'.$langs->trans("Module").'</td>';
+	print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
 	print '<td>';
 	//print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
 	print $objexport->array_export_module[0]->getName();
 	print '</td></tr>';
 
 	// Lot de donnees a exporter
-	print '<tr><td width="25%">'.$langs->trans("DatasetToExport").'</td>';
+	print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
 	print '<td>';
 	$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
 	$label=$objexport->array_export_label[0];
@@ -715,7 +723,7 @@ if ($step == 3 && $datatoexport)
 	print '</td></tr>';
 
 	// Nbre champs exportes
-	print '<tr><td width="25%">'.$langs->trans("ExportedFields").'</td>';
+	print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
 	$list='';
 	foreach($array_selected as $code=>$value)
 	{
@@ -725,6 +733,8 @@ if ($step == 3 && $datatoexport)
 	print '<td>'.$list.'</td></tr>';
 
 	print '</table>';
+	print '</div>';
+	
 	print '<br>';
 
 	// Combo list of export models
@@ -866,8 +876,10 @@ if ($step == 4 && $datatoexport)
     $hselected=$h;
     $h++;
 
-    dol_fiche_head($head, $hselected, $langs->trans("NewExport"));
+    dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
 
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
     print '<table width="100%" class="border">';
 
     // Module
@@ -918,6 +930,8 @@ if ($step == 4 && $datatoexport)
     }
 
     print '</table>';
+    print '</div>';
+    
     print '<br>';
 
     // Select request if all fields are selected
@@ -1102,7 +1116,7 @@ if ($step == 5 && $datatoexport)
     $hselected=$h;
     $h++;
 
-    dol_fiche_head($head, $hselected, $langs->trans("NewExport"));
+    dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
 
     /*
      * Confirmation suppression fichier
@@ -1113,17 +1127,20 @@ if ($step == 5 && $datatoexport)
 
     }
 
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
+    
     print '<table width="100%" class="border">';
 
     // Module
-    print '<tr><td width="25%">'.$langs->trans("Module").'</td>';
+    print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
     print '<td>';
     //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
     print $objexport->array_export_module[0]->getName();
     print '</td></tr>';
 
     // Lot de donnees a exporter
-    print '<tr><td width="25%">'.$langs->trans("DatasetToExport").'</td>';
+    print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
 	$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
     print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
@@ -1131,7 +1148,7 @@ if ($step == 5 && $datatoexport)
     print '</td></tr>';
 
     // List of exported fields
-    print '<tr><td width="25%">'.$langs->trans("ExportedFields").'</td>';
+    print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
     $list='';
     foreach($array_selected as $code=>$label)
     {
@@ -1143,7 +1160,7 @@ if ($step == 5 && $datatoexport)
     // List of filtered fiels
     if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
     {
-    	print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>';
+    	print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
     	$list='';
     	if (! empty($array_filtervalue))
     	{
@@ -1162,6 +1179,8 @@ if ($step == 5 && $datatoexport)
     }
 
     print '</table>';
+    print '</div>';
+    
     print '<br>';
 
     print $langs->trans("NowClickToGenerateToBuildExportFile").'<br>';
@@ -1222,8 +1241,6 @@ if ($step == 5 && $datatoexport)
     print '</div></div></div>';
 }
 
-print '<br>';
-
 llxFooter();
 
 $db->close();

From 16b12b33fc1b1e9bf4889e3bd0dd58a79c1f842a Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 18 Mar 2017 07:24:55 +0100
Subject: [PATCH 0395/1163] First step : remove BANK_DISABLE_DIRECT_INPUT

---
 htdocs/accountancy/admin/index.php            | 27 -------
 htdocs/compta/bank/bankentries.php            | 71 +++----------------
 htdocs/core/modules/modAccounting.class.php   | 10 +--
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 +
 4 files changed, 13 insertions(+), 97 deletions(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 74479a9d39f..b92da48353f 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -141,19 +141,6 @@ if ($action == 'setmanagezero') {
         }
 }
 
-if ($action == 'setdisabledirectinput') {
-    $setdisabledirectinput = GETPOST('value', 'int');
-    $res = dolibarr_set_const($db, "BANK_DISABLE_DIRECT_INPUT", $setdisabledirectinput, 'yesno', 0, '', $conf->entity);
-    if (! $res > 0)
-        $error ++;
-        if (! $error) {
-            setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-        } else {
-            setEventMessages($langs->trans("Error"), null, 'mesgs');
-        }
-}
-
-
 /*
  * View
  */
@@ -243,20 +230,6 @@ if (! empty($user->admin))
     }
     print '</tr>';
 
-    $var = ! $var;
-    print "<tr " . $bc[$var] . ">";
-    print '<td>' . $langs->trans("BANK_DISABLE_DIRECT_INPUT") . '</td>';
-    if (! empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
-        print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=0">';
-        print img_picto($langs->trans("Activated"), 'switch_on');
-        print '</a></td>';
-    } else {
-        print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=1">';
-        print img_picto($langs->trans("Disabled"), 'switch_off');
-        print '</a></td>';
-    }
-    print '</tr>';
-    
     $var = ! $var;
     print "<tr " . $bc[$var] . ">";
     print '<td>' . $langs->trans("ACCOUNTING_MANAGE_ZERO") . '</td>';
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index ad3817f28cd..3fabed83d93 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -4,8 +4,9 @@
  * Copyright (C) 2005-2010  Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012       Vinícius Nogueira    <viniciusvgn@gmail.com>
  * Copyright (C) 2014       Florian Henry    	 <florian.henry@open-cooncept.pro>
- * Copyright (C) 2015       Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2015       Jean-François Ferry	 <jfefe@aternatik.fr>
  * Copyright (C) 2016       Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2017       Alexandre Spangaro   <aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -405,28 +406,19 @@ if ($id > 0 || ! empty($ref))
     
     dol_fiche_end();
  
-
-
     /*
      * Buttons actions
      */
-    if ($action != 'addline' && $action != 'reconcile')
+    if ($action != 'reconcile')
     {
         print '<div class="tabsAction">';
-    
-        if ($action != 'addline')
-        {
-            if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT))
-            {
-                if ($user->rights->banque->modifier) {
-                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param.'">'.$langs->trans("AddBankRecord").'</a>';
-                } else {
-                    print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
-                }
-            } else {
-                print '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
-            }
-        }
+
+		if ($user->rights->banque->modifier) {
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param.'">'.$langs->trans("AddBankRecord").'</a>';
+        } else {
+			print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
+		}
+
         if ($object->canBeConciliated() > 0) {
             // If not cash account and can be reconciliate
             if ($user->rights->banque->consolidate) {
@@ -636,49 +628,6 @@ if ($resql)
 //	    print '</td></tr></table>';
 	}
 
-	// Form to add a transaction with no invoice
-	if ($user->rights->banque->modifier && $action == 'addline')
-	{
-	    print load_fiche_titre($langs->trans("AddBankRecordLong"),'','');
-	
-	    print '<table class="noborder" width="100%">';
-	    print '<tr class="liste_titre">';
-	    print '<td>'.$langs->trans("Date").'</td>';
-	    print '<td>&nbsp;</td>';
-	    print '<td>'.$langs->trans("Type").'</td>';
-	    print '<td>'.$langs->trans("Numero").'</td>';
-	    print '<td colspan="2">'.$langs->trans("Description").'</td>';
-	    print '<td align=right>'.$langs->trans("Debit").'</td>';
-	    print '<td align=right>'.$langs->trans("Credit").'</td>';
-	    print '<td colspan="2" align="center">&nbsp;</td>';
-	    print '</tr>';
-	
-	    print '<tr '.$bcnd[false].'>';
-	    print '<td class="nowrap" colspan="2">';
-	    $form->select_date(empty($dateop)?-1:$dateop,'op',0,0,0,'transaction');
-	    print '</td>';
-	    print '<td class="nowrap">';
-	    $form->select_types_paiements((GETPOST('operation')?GETPOST('operation'):($object->courant == Account::TYPE_CASH ? 'LIQ' : '')),'operation','1,2',2,1);
-	    print '</td><td>';
-	    print '<input name="num_chq" class="flat" type="text" size="4" value="'.GETPOST("num_chq").'"></td>';
-	    print '<td colspan="2">';
-	    print '<input name="label" class="flat" type="text" size="24"  value="'.GETPOST("label").'">';
-	    if ($options) {
-	        print '<br>'.$langs->trans("Rubrique").': ';
-	        print Form::selectarray('cat1', $options, GETPOST('cat1'), 1);
-	    }
-	    print '</td>';
-	    print '<td align="right"><input name="adddebit" class="flat" type="text" size="4" value="'.GETPOST("adddebit").'"></td>';
-	    print '<td align="right"><input name="addcredit" class="flat" type="text" size="4" value="'.GETPOST("addcredit").'"></td>';
-	    print '<td colspan="2" align="center">';
-	    print '<input type="submit" name="save" class="button" value="'.$langs->trans("Add").'"><br>';
-	    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-	    print '</td></tr>';
-	    print '</table>';
-	    print '<br>';
-	}	
-	
-	
 	/// ajax to adjust value date with plus and less picto
 	print '
     <script type="text/javascript">
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 87506217838..9204cd02aa0 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2014      Ari Elbaz (elarifr)	<github@accedinfo.com>
  * Copyright (C) 2014 	   Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2016      Laurent Destailleur 	<eldy@users.sourceforge.net>
@@ -201,14 +201,6 @@ class modAccounting extends DolibarrModules
 				"chaine",
 				"csv"
 		);
-		/* Not required to disable this. This make not possible to do complete reconciliation.
-		Also, this is not a problem, lines added manually will be reported as "not binded into accounting export module
-		and will be binded manually to be created into general ledger
-		$this->const[24] = array(
-				"BANK_DISABLE_DIRECT_INPUT",
-				"yesno",
-				"1"
-		);*/
 
 		// Tabs
 		$this->tabs = array();
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 6804576c9bd..eb972b6c298 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -123,3 +123,5 @@ INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USERGR
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USER_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0, '');
 
 ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
+
+DELETE FROM llx_const WHERE name = __ENCRYPT('BANK_DISABLE_DIRECT_INPUT')__;

From 8328c046247fa76389db63fc2387be681eb8e992 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 18 Mar 2017 08:12:29 +0100
Subject: [PATCH 0396/1163] 2nd step : Add table

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   | 20 ++++++++++
 .../mysql/tables/llx_payment_various.sql      | 37 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 htdocs/install/mysql/tables/llx_payment_various.sql

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index eb972b6c298..5cdc53be443 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -125,3 +125,23 @@ INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USER_A
 ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
 
 DELETE FROM llx_const WHERE name = __ENCRYPT('BANK_DISABLE_DIRECT_INPUT')__;
+
+create table llx_payment_various
+(
+  rowid                 integer AUTO_INCREMENT PRIMARY KEY,
+  tms                   timestamp,
+  datec                 datetime,                   -- Create date
+  datep                 date,                       -- date de paiement
+  datev                 date,                       -- date de valeur (this field should not be here, only into bank tables)
+  sens                  smallint DEFAULT 0 NOT NULL,
+  amount                double(24,8) DEFAULT 0 NOT NULL,
+  fk_typepayment        integer NOT NULL,
+  num_payment           varchar(50),				-- ref
+  label                 varchar(255),
+  entity                integer DEFAULT 1 NOT NULL,	-- multi company id
+  note                  text,
+  fk_bank               integer,
+  fk_code_ventilation	integer DEFAULT 0,
+  fk_user_author        integer,                    -- utilisateur qui a cree l'info
+  fk_user_modif         integer                     -- utilisateur qui a modifié l'info
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_payment_various.sql b/htdocs/install/mysql/tables/llx_payment_various.sql
new file mode 100644
index 00000000000..fe2751a9b79
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_payment_various.sql
@@ -0,0 +1,37 @@
+-- ===================================================================
+-- Copyright (C) 2017		Alexandre Spangaro <aspangaro@zendsi.com>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+create table llx_payment_various
+(
+  rowid                 integer AUTO_INCREMENT PRIMARY KEY,
+  tms                   timestamp,
+  datec                 datetime,                   -- Create date
+  datep                 date,                       -- date de paiement
+  datev                 date,                       -- date de valeur (this field should not be here, only into bank tables)
+  sens                  smallint DEFAULT 0 NOT NULL,
+  amount                double(24,8) DEFAULT 0 NOT NULL,
+  fk_typepayment        integer NOT NULL,
+  num_payment           varchar(50),				-- ref
+  label                 varchar(255),
+  entity                integer DEFAULT 1 NOT NULL,	-- multi company id
+  note                  text,
+  fk_bank               integer,
+  fk_code_ventilation	integer DEFAULT 0,
+  fk_user_author        integer,                    -- utilisateur qui a cree l'info
+  fk_user_modif         integer                     -- utilisateur qui a modifié l'info
+)ENGINE=innodb;
\ No newline at end of file

From a05ebb6c65142800fe6760e0e4e69d0e072a2698 Mon Sep 17 00:00:00 2001
From: De Coninck Laurent <laurent@adlogix.eu>
Date: Sat, 18 Mar 2017 11:51:45 +0100
Subject: [PATCH 0397/1163] add 'fusion pdf' in mass action of expense report

Add a mass action 'fusion pdf (build doc)' in expense report list
---
 htdocs/core/lib/files.lib.php | 8 ++++++++
 htdocs/expensereport/list.php | 7 +++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 59e5a3426a2..ea4c529611a 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1608,6 +1608,14 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	    }
 	    $original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
+	else if ($modulepart == 'massfilesarea_expensereport')
+	{
+	    if ($fuser->rights->facture->lire || preg_match('/^specimen/i',$original_file))
+	    {
+	        $accessallowed=1;
+	    }
+	    $original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	}
 	
 	// Wrapping for interventions
 	else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 13b95311dee..8e2b46459b0 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -303,7 +303,7 @@ if ($resql)
 	// List of mass actions available
 	$arrayofmassactions =  array(
 	    //'presend'=>$langs->trans("SendByMail"),
-	    //'builddoc'=>$langs->trans("PDFMerge"),
+	    'builddoc'=>$langs->trans("PDFMerge"),
 	);
 	if ($user->rights->expensereport->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	if ($massaction == 'presend') $arrayofmassactions=array();
@@ -716,7 +716,7 @@ if ($resql)
 
 	print '</form>'."\n";
 
-	/*
+
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
 	{
 	    // Show list of available documents
@@ -727,13 +727,12 @@ if ($resql)
 	    $genallowed=$user->rights->expensereport->lire;
 	    $delallowed=$user->rights->expensereport->lire;
 	
-	    print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+	    print $formfile->showdocuments('massfilesarea_expensereport','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
 	}
 	else
 	{
 	    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
 	}
-	*/
 }
 else
 {

From b9d6122c53a87fc6dfce97979fa37529b412fa4d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Mar 2017 19:56:53 +0100
Subject: [PATCH 0398/1163] Add comments

---
 htdocs/core/class/smtps.class.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index d16d9875fe3..b16b65e64ff 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -427,6 +427,25 @@ class SMTPs
 		{
 			if (!empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS))
 			{
+			    /*
+			    The following dialog illustrates how a client and server can start a TLS STARTTLS session
+			    S: <waits for connection on TCP port 25>
+			    C: <opens connection>
+			    S: 220 mail.imc.org SMTP service ready
+			    C: EHLO mail.ietf.org
+			    S: 250-mail.imc.org offers a warm hug of welcome
+			    S: 250 STARTTLS
+			    C: STARTTLS
+			    S: 220 Go ahead
+			    C: <starts TLS negotiation>
+			    C & S: <negotiate a TLS session>
+			    C & S: <check result of negotiation>
+                // Second pass EHLO
+                C: EHLO client-domain.com
+                S: 250-server-domain.com
+                S: 250 AUTH LOGIN			    
+			    C: <continues by sending an SMTP command
+			    */
 				if (!$_retVal = $this->socket_send_str('STARTTLS', 220))
 				{
 					$this->_setErr(131, 'STARTTLS connection is not supported.');
@@ -437,6 +456,8 @@ class SMTPs
 					$this->_setErr(132, 'STARTTLS connection failed.');
 					return $_retVal;
 				}
+				// Most server servers expect a 2nd pass of EHLO after TLS is established to get another time 
+				// the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
 				if (!$_retVal = $this->socket_send_str('EHLO '.$host, '250'))
 				{
 					$this->_setErr(126, '"' . $host . '" does not support authenticated connections.');

From 49624c7b683c87cfc8f81d28ef226f78892a1514 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Mar 2017 19:57:33 +0100
Subject: [PATCH 0399/1163] Useless bottom-border

---
 htdocs/admin/mails.php           | 4 ++--
 htdocs/admin/mails_templates.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index e0e23f75d18..6c01935ec39 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -228,7 +228,7 @@ if ($action == 'edit')
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="update">';
 
-	dol_fiche_head($head, 'common', '');
+	dol_fiche_head($head, 'common', '', -1);
 	
 	print $langs->trans("EMailsDesc")."<br>\n";
 	print "<br>\n";
@@ -453,7 +453,7 @@ if ($action == 'edit')
 }
 else
 {
-    dol_fiche_head($head, 'common', '');
+    dol_fiche_head($head, 'common', '', -1);
     
     print $langs->trans("EMailsDesc")."<br>\n";
     print "<br>\n";
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 150f288e45d..90949c7980d 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -405,7 +405,7 @@ $head[$h][2] = 'templates';
 $h++;
 
 
-dol_fiche_head($head, 'templates', '');
+dol_fiche_head($head, 'templates', '', -1);
 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')

From 0e910616b60c0d92db9507fb484b9e0f0cfe4d2e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 19 Mar 2017 07:25:19 +0100
Subject: [PATCH 0400/1163] Update table

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql   | 16 ++++++++--------
 .../install/mysql/tables/llx_payment_various.sql |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 5cdc53be443..a4357cacdeb 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -130,18 +130,18 @@ create table llx_payment_various
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
   tms                   timestamp,
-  datec                 datetime,                   -- Create date
-  datep                 date,                       -- date de paiement
-  datev                 date,                       -- date de valeur (this field should not be here, only into bank tables)
+  datec                 datetime,
+  datep                 date,
+  datev                 date,
   sens                  smallint DEFAULT 0 NOT NULL,
   amount                double(24,8) DEFAULT 0 NOT NULL,
   fk_typepayment        integer NOT NULL,
-  num_payment           varchar(50),				-- ref
+  num_payment           varchar(50),
   label                 varchar(255),
-  entity                integer DEFAULT 1 NOT NULL,	-- multi company id
+  accountancy_code		varchar(32),
+  entity                integer DEFAULT 1 NOT NULL,
   note                  text,
   fk_bank               integer,
-  fk_code_ventilation	integer DEFAULT 0,
-  fk_user_author        integer,                    -- utilisateur qui a cree l'info
-  fk_user_modif         integer                     -- utilisateur qui a modifié l'info
+  fk_user_author        integer,
+  fk_user_modif         integer
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_payment_various.sql b/htdocs/install/mysql/tables/llx_payment_various.sql
index fe2751a9b79..abaf9fdab26 100644
--- a/htdocs/install/mysql/tables/llx_payment_various.sql
+++ b/htdocs/install/mysql/tables/llx_payment_various.sql
@@ -23,15 +23,15 @@ create table llx_payment_various
   datec                 datetime,                   -- Create date
   datep                 date,                       -- date de paiement
   datev                 date,                       -- date de valeur (this field should not be here, only into bank tables)
-  sens                  smallint DEFAULT 0 NOT NULL,
+  sens                  smallint DEFAULT 0 NOT NULL,-- Sens of the operation: 0 for debit operation, 1 for credit operation
   amount                double(24,8) DEFAULT 0 NOT NULL,
   fk_typepayment        integer NOT NULL,
   num_payment           varchar(50),				-- ref
   label                 varchar(255),
+  accountancy_code		varchar(32),
   entity                integer DEFAULT 1 NOT NULL,	-- multi company id
   note                  text,
   fk_bank               integer,
-  fk_code_ventilation	integer DEFAULT 0,
   fk_user_author        integer,                    -- utilisateur qui a cree l'info
   fk_user_modif         integer                     -- utilisateur qui a modifié l'info
 )ENGINE=innodb;
\ No newline at end of file

From 504e1e1ec8d07da057c83bfcaede5cc54d737919 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 19 Mar 2017 07:26:15 +0100
Subject: [PATCH 0401/1163] Step 3: Work on card

---
 htdocs/compta/bank/bankentries.php          |   2 +-
 htdocs/compta/bank/various_payment/card.php | 389 ++++++++++++++++++++
 htdocs/langs/en_US/banks.lang               |   5 +-
 3 files changed, 394 insertions(+), 2 deletions(-)
 create mode 100644 htdocs/compta/bank/various_payment/card.php

diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index 3fabed83d93..81bd829b8f5 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -414,7 +414,7 @@ if ($id > 0 || ! empty($ref))
         print '<div class="tabsAction">';
 
 		if ($user->rights->banque->modifier) {
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param.'">'.$langs->trans("AddBankRecord").'</a>';
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$account.'">'.$langs->trans("AddBankRecord").'</a>';
         } else {
 			print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
 		}
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
new file mode 100644
index 00000000000..4e95cd0b402
--- /dev/null
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -0,0 +1,389 @@
+<?php
+/* Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/compta/bank/various_expenses/card.php
+ *      \ingroup    bank
+ *		\brief      Page of various expenses
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+
+$langs->load("compta");
+$langs->load("banks");
+$langs->load("bills");
+$langs->load("users");
+$langs->load("accountancy");
+
+$id=GETPOST("id",'int');
+$action=GETPOST('action','alpha');
+$cancel=GETPOST('cancel','alpha');
+$accountid=GETPOST("accountid") > 0 ? GETPOST("accountid","int") : 0;
+$label=GETPOST("label","alpha");
+$sens=GETPOST("sens","int");
+$amount=GETPOST("amount");
+$paymenttype=GETPOST("paymenttype");
+$accountancy_code=GETPOST("accountancy_code","int");
+
+// Security check
+$socid = GETPOST("socid","int");
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'banque', '', '', '');
+
+$object = new PaymentVarious($db);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('variouscard','globalcard'));
+
+
+
+/**
+ * Actions
+ */
+
+if (! empty($cancel))
+{
+	header("Location: index.php");
+	exit;
+}
+
+if ($action == 'add' && empty($cancel))
+{
+	$error=0;
+
+	$datep=dol_mktime(12,0,0, GETPOST("datepmonth"), GETPOST("datepday"), GETPOST("datepyear"));
+	$datev=dol_mktime(12,0,0, GETPOST("datevmonth"), GETPOST("datevday"), GETPOST("datevyear"));
+	if (empty($datev)) $datev=$datep;
+	
+	$object->accountid=GETPOST("accountid") > 0 ? GETPOST("accountid","int") : 0;
+	$object->datev=$datev;
+	$object->datep=$datep;
+	$object->amount=price2num(GETPOST("amount"));
+	$object->label=GETPOST("label");
+	$object->note=GETPOST("note");
+	$object->type_payment=GETPOST("paymenttype") > 0 ? GETPOST("paymenttype", "int") : 0;
+	$object->num_payment=GETPOST("num_payment");
+	$object->fk_user_author=$user->id;
+	$object->accountancy_code=GETPOST("accountancy_code") > 0 ? GETPOST("accountancy_code","int") : "";
+
+	if (empty($datep) || empty($datev))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+		$error++;
+	}
+	if (empty($object->type_payment) || $object->type_payment < 0)
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentMode")), null, 'errors');
+		$error++;
+	}
+	if (empty($object->amount))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
+		$error++;
+	}
+	if (! empty($conf->banque->enabled) && ! $object->accountid > 0)
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
+		$error++;
+	}
+
+	if (! $error)
+	{
+		$db->begin();
+
+		$ret=$object->create($user);
+		if ($ret > 0)
+		{
+			$db->commit();
+			header("Location: index.php");
+			exit;
+		}
+		else
+		{
+			$db->rollback();
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action="create";
+		}
+	}
+
+	$action='create';
+}
+
+if ($action == 'delete')
+{
+	$result=$object->fetch($id);
+
+	if ($object->rappro == 0)
+	{
+		$db->begin();
+
+		$ret=$object->delete($user);
+		if ($ret > 0)
+		{
+			if ($object->fk_bank)
+			{
+				$accountline=new AccountLine($db);
+				$result=$accountline->fetch($object->fk_bank);
+				if ($result > 0) $result=$accountline->delete($user);	// $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
+			}
+
+			if ($result >= 0)
+			{
+				$db->commit();
+				header("Location: ".DOL_URL_ROOT.'/compta/salaries/index.php');
+				exit;
+			}
+			else
+			{
+				$object->error=$accountline->error;
+				$db->rollback();
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+		else
+		{
+			$db->rollback();
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+	else
+	{
+		setEventMessages('Error try do delete a line linked to a conciliated bank transaction', null, 'errors');
+	}
+}
+
+
+/*
+ *	View
+ */
+
+llxHeader("",$langs->trans("VariousPayment"));
+
+$form = new Form($db);
+if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+
+if ($id)
+{
+	$object = new PaymentVarious($db);
+	$result = $object->fetch($id);
+	if ($result <= 0)
+	{
+		dol_print_error($db);
+		exit;
+	}
+}
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Create mode                                                                */
+/*                                                                            */
+/* ************************************************************************** */
+if ($action == 'create')
+{
+	print '<form name="salary" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="add">';
+
+	print load_fiche_titre($langs->trans("NewVariousPayment"),'', 'title_accountancy.png');
+
+	dol_fiche_head('', '');
+	
+	print '<table class="border" width="100%">';
+
+	// Date payment
+	print '<tr><td>';
+	print fieldLabel('DatePayment','datep',1).'</td><td>';
+	print $form->select_date((empty($datep)?-1:$datep),"datep",'','','','add',1,1);
+	print '</td></tr>';
+
+	// Date value for bank
+	print '<tr><td>';
+	print fieldLabel('DateValue','datev',0).'</td><td>';
+	print $form->select_date((empty($datev)?-1:$datev),"datev",'','','','add',1,1);
+	print '</td></tr>';
+
+	// Label
+	print '<tr><td>';
+	print fieldLabel('Label','label',1).'</td><td>';
+	print '<input name="label" id="label" class="minwidth300" value="'.(GETPOST("label")?GETPOST("label",'',2):$langs->trans("VariousPayment")).'">';
+	print '</td></tr>';
+
+	// Sens
+	print '<tr><td>';
+	print fieldLabel('Sens','sens',1).'</td><td>';
+    $sensarray=array( '0' => $langs->trans("Debit"), '1' => $langs->trans("Credit"));
+    print $form->selectarray('sens',$sensarray,$sens);
+	print '</td></tr>';
+
+	// Amount
+	print '<tr><td>';
+	print fieldLabel('Amount','amount',1).'</td><td>';
+	print '<input name="amount" id="amount" class="minwidth100" value="'.$amount.'">';
+	print '</td></tr>';
+
+	// Bank
+	if (! empty($conf->banque->enabled))
+	{
+		print '<tr><td>';
+		print fieldLabel('BankAccount','selectaccountid',1).'</td><td>';
+		$form->select_comptes($accountid,"accountid",0,'',1);  // Affiche liste des comptes courant
+		print '</td></tr>';
+	}
+
+	// Type payment
+	print '<tr><td>';
+	print fieldLabel('PaymentMode','selectpaymenttype',1).'</td><td>';
+	$form->select_types_paiements($paymenttype, "paymenttype");
+	print '</td></tr>';
+
+	// Number
+	if (! empty($conf->banque->enabled))
+	{
+		// Number
+		print '<tr><td><label for="num_payment">'.$langs->trans('Numero');
+		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
+		print '</label></td>';
+		print '<td><input name="num_payment" id="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
+	}
+
+	// Accountancy account
+	if (! empty($conf->accounting->enabled))
+	{
+		print '<tr><td>'.$langs->trans("AccountAccounting").'</td>';
+        print '<td>';
+		print $formaccountancy->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1, '');
+        print '</td></tr>';
+	}			
+	else // For external software 
+	{
+		print '<tr><td>'.$langs->trans("AccountAccounting").'</td>';
+		print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code" value="'.$accountancy_code.'">';
+		print '</td></tr>';
+	}
+
+	// Other attributes
+	$parameters=array('colspan' => ' colspan="1"');
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+	print '</table>';
+
+	dol_fiche_end();
+
+	print '<div class="center">';
+	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+
+	print '</form>';
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* View mode                                                                  */
+/*                                                                            */
+/* ************************************************************************** */
+
+if ($id)
+{
+
+	$head=various_payement_prepare_head($object);
+
+	dol_fiche_head($head, 'card', $langs->trans("VariousPayment"), 0, 'payment');
+
+	print '<table class="border" width="100%">';
+
+    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+	
+    print "<tr>";
+	print '<td class="titlefield">'.$langs->trans("Ref").'</td><td colspan="3">';
+	print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
+	print '</td></tr>';
+
+	// Label
+	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
+
+	print "<tr>";
+	print '<td>'.$langs->trans("DatePayment").'</td><td colspan="3">';
+	print dol_print_date($object->datep,'day');
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("DateValue").'</td><td colspan="3">';
+	print dol_print_date($object->datev,'day');
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="3">'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+
+	if (! empty($conf->banque->enabled))
+	{
+		if ($object->fk_account > 0)
+		{
+			$bankline=new AccountLine($db);
+			$bankline->fetch($object->fk_bank);
+
+			print '<tr>';
+			print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+			print '<td colspan="3">';
+			print $bankline->getNomUrl(1,0,'showall');
+			print '</td>';
+			print '</tr>';
+		}
+	}
+
+	// Other attributes
+	$parameters=array('colspan' => ' colspan="3"');
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+	print '</table>';
+
+	dol_fiche_end();
+
+	
+	/*
+	 * Action buttons
+	 */
+	print '<div class="tabsAction">'."\n";
+	if ($object->rappro == 0)
+	{
+		if (! empty($user->rights->salaries->delete))
+		{
+			print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
+		}
+		else
+		{
+			print '<a class="butActionRefused" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a>';
+		}
+	}
+	else
+	{
+		print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a>';
+	}
+	print "</div>";
+}
+
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index a6071e38fa5..00c0b26bb4b 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -149,4 +149,7 @@ CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information. 
+DocumentModelBan=Template to print a page with BAN information.
+NewVariousPayment=New various payment
+VariousPayment=Various payment
+ShowVariousPayment=Show various payment 

From e07f93418544af622460eabb1520d2fca6f6cbc6 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 19 Mar 2017 07:26:37 +0100
Subject: [PATCH 0402/1163] Class is missing

---
 .../bank/class/paymentvarious.class.php       | 518 ++++++++++++++++++
 1 file changed, 518 insertions(+)
 create mode 100644 htdocs/compta/bank/class/paymentvarious.class.php

diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
new file mode 100644
index 00000000000..9dc505aa393
--- /dev/null
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -0,0 +1,518 @@
+<?php
+/* Copyright (C) 2017 		Alexandre Spangaro   <aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/compta/bank/class/paymentvarious.class.php
+ *      \ingroup    salaries
+ *      \brief		Class for salaries module payment
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+
+
+/**
+ *  Class to manage various payments
+ */
+class PaymentVarious extends CommonObject
+{
+	//public $element='payment_various';			//!< Id that identify managed objects
+	//public $table_element='payment_various';	//!< Name of table without prefix where object is stored
+
+	var $tms;
+	var $datep;
+	var $datev;
+	var $sens;
+	var $amount;
+	var $type_payment;
+	var $num_payment;
+	var $label;
+	var $accountancy_code;
+	var $fk_bank;
+	var $fk_user_author;
+	var $fk_user_modif;
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		$this->element = 'payment_various';
+		$this->table_element = 'payment_various';
+		return 1;
+	}
+
+	/**
+	 * Update database
+	 *
+	 * @param   User	$user        	User that modify
+	 * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
+	 * @return  int         			<0 if KO, >0 if OK
+	 */
+	function update($user=null, $notrigger=0)
+	{
+		global $conf, $langs;
+
+		$error=0;
+
+		// Clean parameters
+		$this->fk_user=trim($this->fk_user);
+		$this->amount=trim($this->amount);
+		$this->label=trim($this->label);
+		$this->note=trim($this->note);
+		$this->fk_bank=trim($this->fk_bank);
+		$this->fk_user_author=trim($this->fk_user_author);
+		$this->fk_user_modif=trim($this->fk_user_modif);
+
+		$this->db->begin();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_salary SET";
+
+		$sql.= " tms=".$this->db->idate($this->tms).",";
+		$sql.= " fk_user='".$this->fk_user."',";
+		$sql.= " datep=".$this->db->idate($this->datep).",";
+		$sql.= " datev=".$this->db->idate($this->datev).",";
+		$sql.= " sens=".$this->sens.",";
+		$sql.= " amount='".$this->amount."',";
+		$sql.= " fk_typepayment=".$this->fk_typepayment."',";
+		$sql.= " num_payment='".$this->num_payment."',";
+		$sql.= " label='".$this->db->escape($this->label)."',";
+		$sql.= " note='".$this->db->escape($this->note)."',";
+		$sql.= " fk_bank=".($this->fk_bank > 0 ? "'".$this->fk_bank."'":"null").",";
+		$sql.= " fk_user_author='".$this->fk_user_author."',";
+		$sql.= " fk_user_modif='".$this->fk_user_modif."'";
+
+		$sql.= " WHERE rowid=".$this->id;
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql)
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+
+		if (! $notrigger)
+		{
+            // Call trigger
+            $result=$this->call_trigger('PAYMENT_SALARY_MODIFY',$user);
+            if ($result < 0) $error++;
+            // End call triggers
+		}
+
+		if (! $error)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param	int		$id         id object
+	 *  @param  User	$user       User that load
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	function fetch($id, $user=null)
+	{
+		global $langs;
+		$sql = "SELECT";
+		$sql.= " v.rowid,";
+
+		$sql.= " v.tms,";
+		$sql.= " v.datep,";
+		$sql.= " v.datev,";
+		$sql.= " v.sens,";
+		$sql.= " v.amount,";
+		$sql.= " v.fk_typepayment,";
+		$sql.= " v.num_payment,";
+		$sql.= " v.label,";
+		$sql.= " v.note,";
+		$sql.= " v.fk_bank,";
+		$sql.= " v.fk_user_author,";
+		$sql.= " v.fk_user_modif,";
+		$sql.= " b.fk_account,";
+		$sql.= " b.fk_type,";
+		$sql.= " b.rappro";
+
+		$sql.= " FROM ".MAIN_DB_PREFIX."payment_various as v";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON v.fk_bank = b.rowid";
+		$sql.= " WHERE s.rowid = ".$id;
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id    = $obj->rowid;
+				$this->ref   = $obj->rowid;
+				$this->tms   = $this->db->jdate($obj->tms);
+				$this->fk_user = $obj->fk_user;
+				$this->datep = $this->db->jdate($obj->datep);
+				$this->datev = $this->db->jdate($obj->datev);
+				$this->amount = $obj->amount;
+				$this->type_payement = $obj->fk_typepayment;
+				$this->num_payment = $obj->num_payment;
+				$this->label = $obj->label;
+				$this->note  = $obj->note;
+				$this->fk_bank = $obj->fk_bank;
+				$this->fk_user_author = $obj->fk_user_author;
+				$this->fk_user_modif = $obj->fk_user_modif;
+				$this->fk_account = $obj->fk_account;
+				$this->fk_type = $obj->fk_type;
+				$this->rappro  = $obj->rappro;
+			}
+			$this->db->free($resql);
+
+			return 1;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Delete object in database
+	 *
+	 *	@param	User	$user       User that delete
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	function delete($user)
+	{
+		global $conf, $langs;
+
+		$error=0;
+
+		// Call trigger
+		$result=$this->call_trigger('PAYMENT_VARIOUS_DELETE',$user);
+		if ($result < 0) return -1;
+		// End call triggers
+
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_various";
+		$sql.= " WHERE rowid=".$this->id;
+
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql)
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+
+		return 1;
+	}
+
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	function initAsSpecimen()
+	{
+		$this->id=0;
+
+		$this->tms='';
+		$this->fk_user='';
+		$this->datep='';
+		$this->datev='';
+		$this->sens='';
+		$this->amount='';
+		$this->label='';
+		$this->note='';
+		$this->fk_bank='';
+		$this->fk_user_author='';
+		$this->fk_user_modif='';
+	}
+
+    /**
+     *  Create in database
+     *
+     *  @param      User	$user       User that create
+     *  @return     int      			<0 if KO, >0 if OK
+     */
+	function create($user)
+	{
+		global $conf,$langs;
+
+		$error=0;
+		$now=dol_now();
+
+		// Clean parameters
+		$this->amount=price2num(trim($this->amount));
+		$this->label=trim($this->label);
+		$this->note=trim($this->note);
+		$this->fk_bank=trim($this->fk_bank);
+		$this->fk_user_author=trim($this->fk_user_author);
+		$this->fk_user_modif=trim($this->fk_user_modif);
+
+		// Check parameters
+		if (! $this->label)
+		{
+			$this->error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label"));
+			return -3;
+		}
+		if ($this->amount < 0 || $this->amount == '')
+		{
+			$this->error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount"));
+			return -5;
+		}
+		if (! empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+		{
+			$this->error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Account"));
+			return -6;
+		}
+		if (! empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
+		{
+			$this->error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode"));
+			return -7;
+		}
+
+		$this->db->begin();
+
+		// Insert into llx_payment_various
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_various (";
+		$sql.= " datep";
+		$sql.= ", datev";
+		$sql.= ", amount";
+		$sql.= ", fk_typepayment";
+		$sql.= ", num_payment";
+		if ($this->note) $sql.= ", note";
+		$sql.= ", label";
+		$sql.= ", fk_user_author";
+		$sql.= ", datec";
+		$sql.= ", fk_bank";
+		$sql.= ", entity";
+		$sql.= ")";
+		$sql.= " VALUES (";
+		$sql.= "'".$this->db->idate($this->datep)."'";
+		$sql.= ", '".$this->db->idate($this->datev)."'";
+		$sql.= ", ".$this->amount;
+		$sql.= ", ".($this->salary > 0 ? $this->salary : "null");
+		$sql.= ", '".$this->type_payment."'";
+		$sql.= ", '".$this->num_payment."'";
+		if ($this->note) $sql.= ", '".$this->db->escape($this->note)."'";
+		$sql.= ", '".$this->db->escape($this->label)."'";
+		$sql.= ", '".$user->id."'";
+		$sql.= ", '".$this->db->idate($now)."'";
+		$sql.= ", NULL";
+		$sql.= ", ".$conf->entity;
+		$sql.= ")";
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_various");
+
+			if ($this->id > 0)
+			{
+				if (! empty($conf->banque->enabled) && ! empty($this->amount))
+				{
+					// Insert into llx_bank
+					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+					$acc = new Account($this->db);
+					$result=$acc->fetch($this->accountid);
+					if ($result <= 0) dol_print_error($this->db);
+
+					// Insert payment into llx_bank
+					// Add link 'payment_salary' in bank_url between payment and bank transaction
+					$bank_line_id = $acc->addline(
+						$this->datep,
+						$this->type_payment,
+						$this->label,
+						-abs($this->amount),
+						$this->num_payment,
+						'',
+						$user
+					);
+
+					// Update fk_bank into llx_paiement.
+					// So we know the payment which has generate the banking ecriture
+					if ($bank_line_id > 0)
+					{
+						$this->update_fk_bank($bank_line_id);
+					}
+					else
+					{
+						$this->error=$acc->error;
+						$error++;
+					}
+
+					if (! $error)
+					{
+						// Add link 'payment_various' in bank_url between payment and bank transaction
+						$url=DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id=';
+
+						$result=$acc->add_url_line($bank_line_id, $this->id, $url, "(VariousPayment)", "payment_various");
+						if ($result <= 0)
+						{
+							$this->error=$acc->error;
+							$error++;
+						}
+					}
+
+					if ($result <= 0)
+					{
+						$this->error=$acc->error;
+						$error++;
+					}
+				}
+
+	            // Call trigger
+	            $result=$this->call_trigger('PAYMENT_VARIOUS_CREATE',$user);
+	            if ($result < 0) $error++;
+	            // End call triggers
+
+			}
+			else $error++;
+
+			if (! $error)
+			{
+				$this->db->commit();
+				return $this->id;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Update link between payment various and line generate into llx_bank
+	 *
+	 *  @param	int		$id_bank    Id bank account
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	function update_fk_bank($id_bank)
+	{
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'payment_various SET fk_bank = '.$id_bank;
+		$sql.= ' WHERE rowid = '.$this->id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Send name clicable (with possibly the picto)
+	 *
+	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+	 *	@param	string	$option			link option
+	 *	@return	string					Chaine with URL
+	 */
+	function getNomUrl($withpicto=0,$option='')
+	{
+		global $langs;
+
+		$result='';
+        $label=$langs->trans("ShowVariousPayment").': '.$this->ref;
+
+        $link = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkend='</a>';
+
+		$picto='payment';
+
+        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto && $withpicto != 2) $result.=' ';
+		if ($withpicto != 2) $result.=$link.$this->ref.$linkend;
+		return $result;
+	}
+
+	/**
+	 * Information on record
+	 *
+	 * @param	int		$id      Id of record
+	 * @return	void
+	 */
+	function info($id)
+	{
+		$sql = 'SELECT v.rowid, v.datec, v.fk_user_author';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'payment_various as v';
+		$sql.= ' WHERE v.rowid = '.$id;
+
+		dol_syslog(get_class($this).'::info', LOG_DEBUG);
+		$result = $this->db->query($sql);
+
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+				$this->date_creation = $this->db->jdate($obj->datec);
+				if ($obj->fk_user_modif)
+				{
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modif = $muser;
+				}
+				$this->date_modif = $this->db->jdate($obj->tms);
+			}
+			$this->db->free($result);
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
+
+}

From 36f279837fdb8b7c22fa4c0bf92b031d675fa771 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 19 Mar 2017 08:17:32 +0100
Subject: [PATCH 0403/1163] Update work

---
 .../bank/class/paymentvarious.class.php       |   7 +-
 htdocs/compta/bank/ligne.php                  |   8 +-
 htdocs/compta/bank/various_payment/card.php   |   4 +-
 .../compta/bank/various_payment/document.php  | 127 +++++++++
 htdocs/compta/bank/various_payment/index.php  | 253 ++++++++++++++++++
 htdocs/compta/bank/various_payment/info.php   |  65 +++++
 htdocs/core/lib/bank.lib.php                  |  45 ++++
 7 files changed, 504 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/compta/bank/various_payment/document.php
 create mode 100644 htdocs/compta/bank/various_payment/index.php
 create mode 100644 htdocs/compta/bank/various_payment/info.php

diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 9dc505aa393..94bf08867e4 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -163,7 +163,7 @@ class PaymentVarious extends CommonObject
 
 		$sql.= " FROM ".MAIN_DB_PREFIX."payment_various as v";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON v.fk_bank = b.rowid";
-		$sql.= " WHERE s.rowid = ".$id;
+		$sql.= " WHERE v.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -309,11 +309,13 @@ class PaymentVarious extends CommonObject
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_various (";
 		$sql.= " datep";
 		$sql.= ", datev";
+		$sql.= ", sens";
 		$sql.= ", amount";
 		$sql.= ", fk_typepayment";
 		$sql.= ", num_payment";
 		if ($this->note) $sql.= ", note";
 		$sql.= ", label";
+		$sql.= ", accountancy_code";
 		$sql.= ", fk_user_author";
 		$sql.= ", datec";
 		$sql.= ", fk_bank";
@@ -322,12 +324,13 @@ class PaymentVarious extends CommonObject
 		$sql.= " VALUES (";
 		$sql.= "'".$this->db->idate($this->datep)."'";
 		$sql.= ", '".$this->db->idate($this->datev)."'";
+		$sql.= ", '".$this->sens."'";
 		$sql.= ", ".$this->amount;
-		$sql.= ", ".($this->salary > 0 ? $this->salary : "null");
 		$sql.= ", '".$this->type_payment."'";
 		$sql.= ", '".$this->num_payment."'";
 		if ($this->note) $sql.= ", '".$this->db->escape($this->note)."'";
 		$sql.= ", '".$this->db->escape($this->label)."'";
+		$sql.= ", '".$this->accountancy_code."'";
 		$sql.= ", '".$user->id."'";
 		$sql.= ", '".$this->db->idate($now)."'";
 		$sql.= ", NULL";
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 609a3f47bd1..e5c6e81eba8 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Christophe Combelles <ccomb@free.fr>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2015-2016 Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2015-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
  *
@@ -378,6 +378,12 @@ if ($result)
                     print img_object($langs->trans('ShowUser'),'user').' ';
                     print $langs->trans("User");
                     print '</a>';
+                }
+				else if ($links[$key]['type']=='payment_various') {
+                    print '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$links[$key]['url_id'].'">';
+                    print img_object($langs->trans('ShowVariousPayment'),'payment').' ';
+                    print $langs->trans("SalaryPayment");
+                    print '</a>';
                 }
                 else {
                     print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 4e95cd0b402..0c2b5256c2c 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -308,13 +308,13 @@ if ($action == 'create')
 if ($id)
 {
 
-	$head=various_payement_prepare_head($object);
+	$head=various_payment_prepare_head($object);
 
 	dol_fiche_head($head, 'card', $langs->trans("VariousPayment"), 0, 'payment');
 
 	print '<table class="border" width="100%">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 	
     print "<tr>";
 	print '<td class="titlefield">'.$langs->trans("Ref").'</td><td colspan="3">';
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
new file mode 100644
index 00000000000..3fa15deb9c2
--- /dev/null
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -0,0 +1,127 @@
+<?php
+/* Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *       \file       htdocs/compta/bank/various_payment/document.php
+ *       \ingroup    banque
+ *       \brief      Page of linked files onto various_payment
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+
+$langs->load("other");
+$langs->load("bank");
+$langs->load("companies");
+
+$id = GETPOST('id','int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action','alpha');
+$confirm = GETPOST('confirm','alpha');
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'salaries', $id, '');
+
+
+// Get parameters
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="name";
+
+
+$object = new PaymentVarious($db);
+$object->fetch($id, $ref);
+
+$upload_dir = $conf->banque->dir_output.'/'.dol_sanitizeFileName($object->id);
+$modulepart='banque';
+
+
+/*
+ * Actions
+ */
+
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+llxHeader("",$langs->trans("VariousPayment"));
+
+
+if ($object->id)
+{
+	$head=various_payment_prepare_head($object);
+
+	dol_fiche_head($head, 'documents',  $langs->trans("VariousPayment"), 0, 'payment');
+
+
+	// Construit liste des fichiers
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$totalsize=0;
+	foreach($filearray as $key => $file)
+	{
+		$totalsize+=$file['size'];
+	}
+
+
+    print '<table class="border" width="100%">';
+
+    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+	// Ref
+	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
+	print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
+	print '</td></tr>';
+
+	// Societe
+	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
+
+    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '</table>';
+
+    print '</div>';
+
+    $modulepart = 'banque';
+    $permission = $user->rights->banque->modifier;
+    $param = '&id=' . $object->id;
+    include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+
+}
+else
+{
+	print $langs->trans("ErrorUnknown");
+}
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
new file mode 100644
index 00000000000..1747e5db855
--- /dev/null
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -0,0 +1,253 @@
+<?php
+/* Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/compta/bank/various_payment/index.php
+ *      \ingroup    bank
+ *		\brief     	List of various payments
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("compta");
+$langs->load("salaries");
+$langs->load("bills");
+
+// Security check
+$socid = GETPOST("socid","int");
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'banque', '', '', '');
+
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$search_ref = GETPOST('search_ref','int');
+$search_user = GETPOST('search_user','alpha');
+$search_label = GETPOST('search_label','alpha');
+$search_amount = GETPOST('search_amount','alpha');
+$search_account = GETPOST('search_account','int');
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="v.datep";
+if (! $sortorder) $sortorder="DESC";
+$optioncss = GETPOST('optioncss','alpha');
+
+$filtre=$_GET["filtre"];
+
+if (empty($_REQUEST['typeid']))
+{
+	$newfiltre=str_replace('filtre=','',$filtre);
+	$filterarray=explode('-',$newfiltre);
+	foreach($filterarray as $val)
+	{
+		$part=explode(':',$val);
+		if ($part[0] == 'v.fk_typepayment') $typeid=$part[1];
+	}
+}
+else
+{
+	$typeid=$_REQUEST['typeid'];
+}
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+{
+	$search_ref="";
+	$search_label="";
+	$search_amount="";
+	$search_account='';
+    $typeid="";
+}
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$form = new Form($db);
+$variousstatic = new PaymentVarious($db);
+$accountstatic = new Account($db);
+
+$sql = "SELECT v.rowid, v.amount, v.label, v.datep as datep, v.datev as datev, v.fk_typepayment as type, v.num_payment, v.fk_bank,";
+$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.accountancy_journal, ba.label as blabel,";
+$sql.= " pst.code as payment_code";
+$sql.= " FROM ".MAIN_DB_PREFIX."payment_various as v";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON v.fk_typepayment = pst.id";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON v.fk_bank = b.rowid";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+$sql.= " WHERE v.entity = ".$conf->entity;
+
+// Search criteria
+if ($search_ref)	$sql.=" AND v.rowid=".$search_ref;
+if ($search_label) 	$sql.=natural_search(array('v.label'), $search_label);
+if ($search_amount) $sql.=natural_search("v.amount", $search_amount, 1);
+if ($search_account > 0) $sql .=" AND b.fk_account=".$search_account;
+if ($filtre) {
+    $filtre=str_replace(":","=",$filtre);
+    $sql .= " AND ".$filtre;
+}
+if ($typeid) {
+    $sql .= " AND v.fk_typepayment=".$typeid;
+}
+$sql.= $db->order($sortfield,$sortorder);
+
+//$sql.= " GROUP BY u.rowid, u.lastname, u.firstname, v.rowid, v.fk_user, v.amount, v.label, v.datev, v.fk_typepayment, v.num_payment, pst.code";
+$totalnboflines=0;
+$result=$db->query($sql);
+if ($result)
+{
+    $totalnboflines = $db->num_rows($result);
+}
+$sql.= $db->plimit($limit+1,$offset);
+
+$result = $db->query($sql);
+if ($result)
+{
+    $num = $db->num_rows($result);
+    $i = 0;
+    $total = 0 ;
+	$var=true;
+
+	$param='';
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	if ($typeid) $param.='&amp;typeid='.$typeid;
+	if ($optioncss != '') $param.='&amp;optioncss='.$optioncss;
+
+	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+    print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+
+	print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
+	
+    print '<div class="div-table-responsive">';
+    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"v.rowid","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"v.label","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"v.datep","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
+    if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("BankAccount"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"v.amount","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+    print "</tr>\n";
+
+	print '<tr class="liste_titre">';
+	// Ref
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" size="3" name="search_ref" value="'.$search_ref.'">';
+	print '</td>';
+	// Label
+	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.$search_label.'"></td>';
+	// Date
+	print '<td class="liste_titre">&nbsp;</td>';
+	// Type
+	print '<td class="liste_titre" align="left">';
+	$form->select_types_paiements($typeid,'typeid','',0,0,1,16);
+	print '</td>';
+	// Account
+	if (! empty($conf->banque->enabled))
+    {
+	    print '<td class="liste_titre">';
+	    $form->select_comptes($search_account,'search_account',0,'',1);
+	    print '</td>';
+    }
+	// Amount
+	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
+
+    print '<td class="liste_titre" align="right">';
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
+    print '</td>';
+    
+	print "</tr>\n";
+
+    while ($i < min($num,$limit))
+    {
+        $obj = $db->fetch_object($result);
+        $var=!$var;
+        print "<tr ".$bc[$var].">";
+
+        $variousstatic->id=$obj->rowid;
+		$variousstatic->ref=$obj->rowid;
+        // Ref
+		print "<td>".$variousstatic->getNomUrl(1)."</td>\n";
+		// Label payment
+        print "<td>".dol_trunc($obj->label,40)."</td>\n";
+		// Date payment
+        print '<td align="center">'.dol_print_date($db->jdate($obj->datep),'day')."</td>\n";
+        // Type
+        print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
+		// Account
+    	if (! empty($conf->banque->enabled))
+	    {
+	        print '<td>';
+	        if ($obj->fk_bank > 0)
+	        {
+	        	//$accountstatic->fetch($obj->fk_bank);
+	            $accountstatic->id=$obj->bid;
+	            $accountstatic->ref=$obj->bref;
+	            $accountstatic->number=$obj->bnumber;
+	            $accountstatic->accountancy_number=$obj->account_number;
+	            $accountstatic->accountancy_journal=$obj->accountancy_journal;
+	            $accountstatic->label=$obj->blabel;
+	        	print $accountstatic->getNomUrl(1);
+	        }
+	        else print '&nbsp;';
+	        print '</td>';
+	    }
+        // Amount
+        print "<td align=\"right\">".price($obj->amount)."</td>";
+        print "<td></td>";
+        print "</tr>\n";
+
+        $total = $total + $obj->amount;
+
+        $i++;
+    }
+
+    $colspan=5;
+    if (! empty($conf->banque->enabled)) $colspan++;
+    print '<tr class="liste_total"><td colspan="'.$colspan.'" class="liste_total">'.$langs->trans("Total").'</td>';
+    print '<td class="liste_total" align="right">'.price($total)."</td>";
+	print "<td></td></tr>";
+
+    print "</table>";
+    print '</div>';
+	print '</form>';
+
+    $db->free($result);
+}
+else
+{
+    dol_print_error($db);
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
new file mode 100644
index 00000000000..73c1baa5c02
--- /dev/null
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -0,0 +1,65 @@
+<?php
+/* Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/compta/bank/various_payment/info.php
+ *	\ingroup    salaries
+ *	\brief      Page with info about salaries contribution
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("salaries");
+
+$id=GETPOST('id','int');
+$action=GETPOST("action");
+
+// Security check
+$socid = GETPOST('socid','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'salaries', '', '', '');
+
+
+/*
+ * View
+ */
+
+llxHeader("",$langs->trans("VariousPayment"));
+
+$object = new PaymentVarious($db);
+$result = $object->fetch($id);
+$object->info($id);
+
+$head = various_payment_prepare_head($object);
+
+dol_fiche_head($head, 'info', $langs->trans("VariousPayment"), 0, 'payment');
+
+
+print '<table width="100%"><tr><td>';
+dol_print_object_info($object);
+print '</td></tr></table>';
+
+print '</div>';
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 47d3539e3ba..8e9fb7bc77a 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -134,6 +134,51 @@ function bank_admin_prepare_head($object)
 	return $head;
 }
 
+/**
+ * Prepare array with list of tabs
+ *
+ * @param   Object	$object		Object related to tabs
+ * @return  array				Array of tabs to shoc
+ */
+function various_payment_prepare_head($object) {
+	
+	global $db, $langs, $conf;
+	
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'card';
+	$h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'various_payment');
+
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->banque->dir_output . "/" . dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+    $nbLinks=Link::count($db, $object->element, $object->id);
+	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/document.php?id='.$object->id;
+	$head[$h][1] = $langs->trans('Documents');
+	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	$head[$h][2] = 'documents';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/info.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
+    
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'various_payment', 'remove');
+
+	return $head;
+}
+
 /**
  *      Check SWIFT informations for a bank account
  *

From 75d73b188c176e6cd862817297a11b9283a58c41 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 19 Mar 2017 14:51:25 +0100
Subject: [PATCH 0404/1163] Fix bad vat rate used into sql request

---
 htdocs/fourn/class/fournisseur.commande.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index c4e7811f4b3..6c2c7eb69a5 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2321,7 +2321,7 @@ class CommandeFournisseur extends CommonOrder
             if (preg_match('/\((.*)\)/', $txtva, $reg))
             {
                 $vat_src_code = $reg[1];
-                $vatrate = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+                $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
             }
             
             $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);

From b09398a68e26d47fcbc02b5f0b19ea8188a81b2d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 19 Mar 2017 15:23:35 +0100
Subject: [PATCH 0405/1163] Update works

---
 .../class/accountingaccount.class.php         | 13 +++---
 .../bank/class/paymentvarious.class.php       | 44 +++++++++++--------
 htdocs/compta/bank/ligne.php                  |  2 +-
 htdocs/compta/bank/various_payment/card.php   | 34 +++++++++++---
 htdocs/compta/bank/various_payment/index.php  | 14 ++++--
 htdocs/langs/en_US/banks.lang                 |  1 +
 6 files changed, 71 insertions(+), 37 deletions(-)

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index aee7d7172c6..4174ee7809f 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -369,22 +369,23 @@ class AccountingAccount extends CommonObject
 	 */
 	function getNomUrl($withpicto = 0) {
 		global $langs;
-		
+
 		$result = '';
-		
+
 		$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id . '">';
 		$linkend = '</a>';
-		
+
 		$picto = 'billr';
-		
+
 		$label = $langs->trans("Show") . ': ' . $this->account_number . ' - ' . $this->label;
-		
+
 		if ($withpicto)
 			$result .= ($link . img_object($label, $picto) . $linkend);
 		if ($withpicto && $withpicto != 2)
 			$result .= ' ';
 		if ($withpicto != 2)
-			$result .= $link . $this->account_number . $linkend;
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+			$result .= $link . length_accountg($this->account_number) . ' - ' . $this->label . $linkend;
 		return $result;
 	}
 	
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 94bf08867e4..2cbd75146df 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -97,6 +97,7 @@ class PaymentVarious extends CommonObject
 		$sql.= " num_payment='".$this->num_payment."',";
 		$sql.= " label='".$this->db->escape($this->label)."',";
 		$sql.= " note='".$this->db->escape($this->note)."',";
+		$sql.= " accountancy_code='".$this->db->escape($this->accountancy_code)."',";
 		$sql.= " fk_bank=".($this->fk_bank > 0 ? "'".$this->fk_bank."'":"null").",";
 		$sql.= " fk_user_author='".$this->fk_user_author."',";
 		$sql.= " fk_user_modif='".$this->fk_user_modif."'";
@@ -154,6 +155,7 @@ class PaymentVarious extends CommonObject
 		$sql.= " v.num_payment,";
 		$sql.= " v.label,";
 		$sql.= " v.note,";
+		$sql.= " v.accountancy_code,";
 		$sql.= " v.fk_bank,";
 		$sql.= " v.fk_user_author,";
 		$sql.= " v.fk_user_modif,";
@@ -173,23 +175,25 @@ class PaymentVarious extends CommonObject
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id    = $obj->rowid;
-				$this->ref   = $obj->rowid;
-				$this->tms   = $this->db->jdate($obj->tms);
-				$this->fk_user = $obj->fk_user;
-				$this->datep = $this->db->jdate($obj->datep);
-				$this->datev = $this->db->jdate($obj->datev);
-				$this->amount = $obj->amount;
-				$this->type_payement = $obj->fk_typepayment;
-				$this->num_payment = $obj->num_payment;
-				$this->label = $obj->label;
-				$this->note  = $obj->note;
-				$this->fk_bank = $obj->fk_bank;
-				$this->fk_user_author = $obj->fk_user_author;
-				$this->fk_user_modif = $obj->fk_user_modif;
-				$this->fk_account = $obj->fk_account;
-				$this->fk_type = $obj->fk_type;
-				$this->rappro  = $obj->rappro;
+				$this->id				= $obj->rowid;
+				$this->ref				= $obj->rowid;
+				$this->tms				= $this->db->jdate($obj->tms);
+				$this->fk_user			= $obj->fk_user;
+				$this->datep			= $this->db->jdate($obj->datep);
+				$this->datev			= $this->db->jdate($obj->datev);
+				$this->sens				= $obj->sens;
+				$this->amount			= $obj->amount;
+				$this->type_payement	= $obj->fk_typepayment;
+				$this->num_payment		= $obj->num_payment;
+				$this->label			= $obj->label;
+				$this->note				= $obj->note;
+				$this->accountancy_code	= $obj->accountancy_code;
+				$this->fk_bank			= $obj->fk_bank;
+				$this->fk_user_author	= $obj->fk_user_author;
+				$this->fk_user_modif	= $obj->fk_user_modif;
+				$this->fk_account		= $obj->fk_account;
+				$this->fk_type			= $obj->fk_type;
+				$this->rappro			= $obj->rappro;
 			}
 			$this->db->free($resql);
 
@@ -356,12 +360,14 @@ class PaymentVarious extends CommonObject
 					if ($result <= 0) dol_print_error($this->db);
 
 					// Insert payment into llx_bank
-					// Add link 'payment_salary' in bank_url between payment and bank transaction
+					// Add link 'payment_various' in bank_url between payment and bank transaction
+					if ($this->sens == '0') $sign='-';
+
 					$bank_line_id = $acc->addline(
 						$this->datep,
 						$this->type_payment,
 						$this->label,
-						-abs($this->amount),
+						$sign.abs($this->amount),
 						$this->num_payment,
 						'',
 						$user
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index e5c6e81eba8..1c3e1c0ac93 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -382,7 +382,7 @@ if ($result)
 				else if ($links[$key]['type']=='payment_various') {
                     print '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('ShowVariousPayment'),'payment').' ';
-                    print $langs->trans("SalaryPayment");
+                    print $langs->trans("VariousPayment");
                     print '</a>';
                 }
                 else {
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 0c2b5256c2c..9e32941bab9 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -26,8 +26,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 
 $langs->load("compta");
 $langs->load("banks");
@@ -317,7 +317,7 @@ if ($id)
     $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 	
     print "<tr>";
-	print '<td class="titlefield">'.$langs->trans("Ref").'</td><td colspan="3">';
+	print '<td class="titlefield">'.$langs->trans("Ref").'</td><td>';
 	print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
 	print '</td></tr>';
 
@@ -325,15 +325,35 @@ if ($id)
 	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
 
 	print "<tr>";
-	print '<td>'.$langs->trans("DatePayment").'</td><td colspan="3">';
+	print '<td>'.$langs->trans("DatePayment").'</td><td>';
 	print dol_print_date($object->datep,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("DateValue").'</td><td colspan="3">';
+	print '<tr><td>'.$langs->trans("DateValue").'</td><td>';
 	print dol_print_date($object->datev,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="3">'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+	// Debit / Credit
+	if ($object->sens == '1') $sens = $langs->trans("Credit"); else $sens = $langs->trans("Debit");
+	print '<tr><td>'.$langs->trans("Sens").'</td><td>'.$sens.'</td></tr>';
+
+	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+
+	// Accountancy code
+	print '<tr><td class="nowrap">';
+	print $langs->trans("AccountAccounting");
+	print '</td><td>';
+	if (! empty($conf->accounting->enabled))
+	{
+		$accountancyaccount = new AccountingAccount($db);
+		$accountancyaccount->fetch('',$object->accountancy_code);
+
+		print $accountancyaccount->getNomUrl(1);
+		// print length_accountg($object->accountancy_code);
+	} else {
+		print $object->accountancy_code;
+	}
+	print '</td></tr>';
 
 	if (! empty($conf->banque->enabled))
 	{
@@ -352,7 +372,7 @@ if ($id)
 	}
 
 	// Other attributes
-	$parameters=array('colspan' => ' colspan="3"');
+	$parameters=array('colspan' => ' colspan="1"');
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
 	print '</table>';
@@ -366,7 +386,7 @@ if ($id)
 	print '<div class="tabsAction">'."\n";
 	if ($object->rappro == 0)
 	{
-		if (! empty($user->rights->salaries->delete))
+		if (! empty($user->rights->banque->delete))
 		{
 			print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
 		}
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index 1747e5db855..7366c0cf2a5 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load("compta");
-$langs->load("salaries");
+$langs->load("banks");
 $langs->load("bills");
 
 // Security check
@@ -142,7 +142,7 @@ if ($result)
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-	print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
+	print_barre_liste($langs->trans("VariousPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
 	
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -153,7 +153,8 @@ if ($result)
 	print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"v.datep","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
     if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("BankAccount"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"v.amount","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"v.amount","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Sens"),$_SERVER["PHP_SELF"],"v.sens","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
     print "</tr>\n";
 
@@ -179,6 +180,8 @@ if ($result)
     }
 	// Amount
 	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
+	// Sens
+	print '<td class="liste_titre">&nbsp;</td>';
 
     print '<td class="liste_titre" align="right">';
     $searchpicto=$form->showFilterAndCheckAddButtons(0);
@@ -223,6 +226,9 @@ if ($result)
 	    }
         // Amount
         print "<td align=\"right\">".price($obj->amount)."</td>";
+        // Sens
+		if ($obj->sens == '1') $sens = $langs->trans("Credit"); else $sens = $langs->trans("Debit");
+        print "<td align=\"right\">".$sens."</td>";
         print "<td></td>";
         print "</tr>\n";
 
@@ -231,7 +237,7 @@ if ($result)
         $i++;
     }
 
-    $colspan=5;
+    $colspan=4;
     if (! empty($conf->banque->enabled)) $colspan++;
     print '<tr class="liste_total"><td colspan="'.$colspan.'" class="liste_total">'.$langs->trans("Total").'</td>';
     print '<td class="liste_total" align="right">'.price($total)."</td>";
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 00c0b26bb4b..d054220825f 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -152,4 +152,5 @@ DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countrie
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New various payment
 VariousPayment=Various payment
+VariousPayments=Various payments
 ShowVariousPayment=Show various payment 

From e85206dee59be7d29227d49c99564b82b7b0aa23 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 19 Mar 2017 15:37:07 +0100
Subject: [PATCH 0406/1163] FIX multicurrency management on supplier
 order/invoice

---
 .../modules/dons/html_cerfafr.modules.php     |  9 ++-
 .../doc/pdf_standard.modules.php              |  4 +-
 .../modules/facture/doc/pdf_crabe.modules.php |  2 +
 .../pdf/pdf_canelle.modules.php               | 28 ++++---
 .../pdf/pdf_muscadet.modules.php              | 31 ++++----
 .../supplier_payment/pdf/pdf_cow.modules.php  |  6 +-
 .../doc/pdf_aurore.modules.php                |  6 +-
 htdocs/fourn/commande/card.php                | 76 ++++++-------------
 8 files changed, 78 insertions(+), 84 deletions(-)

diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index 314d5779ede..5e557f95f33 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -69,9 +69,10 @@ class html_cerfafr extends ModeleDon
      *
      *	@param	Don			$don	        Donation object
      *  @param  Translate	$outputlangs    Lang object for output language
+	 *  @param	string		$currency		Currency code
      *	@return	int             			>0 if OK, <0 if KO
      */
-    function write_file($don,$outputlangs)
+    function write_file($don,$outputlangs,$currency='')
     {
 		global $user,$conf,$langs,$mysoc;
 
@@ -87,7 +88,9 @@ class html_cerfafr extends ModeleDon
 		$outputlangs->load("products");
 		$outputlangs->load("donations");
 
-        if (! empty($conf->don->dir_output))
+		$currency = !empty($currency) ? $currency : $conf->currency;
+		
+		if (! empty($conf->don->dir_output))
         {
 			// Definition of the object don (for upward compatibility)
         	if (! is_object($don))
@@ -165,7 +168,7 @@ class html_cerfafr extends ModeleDon
 		        //$form = str_replace('__IP__',$user->ip,$form); // TODO $user->ip not exist
 		        $form = str_replace('__AMOUNT__',$don->amount,$form);
 				$form = str_replace('__AMOUNTLETTERS__',chiffre_en_lettre($don->amount),$form);
-		        $form = str_replace('__CURRENCY__',$outputlangs->transnoentitiesnoconv("Currency".$conf->currency),$form);
+		        $form = str_replace('__CURRENCY__',$outputlangs->transnoentitiesnoconv("Currency".$currency),$form);
 		        $form = str_replace('__CURRENCYCODE__',$conf->currency,$form);
 		        $form = str_replace('__MAIN_INFO_SOCIETE_NOM__',$mysoc->name,$form);
 		        $form = str_replace('__MAIN_INFO_SOCIETE_ADDRESS__',$mysoc->address,$form);
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 56204fda6bb..0be42600af7 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -725,6 +725,7 @@ class pdf_standard extends ModeleExpenseReport
 	 *   @param		Translate	$outputlangs	Output langs
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
 	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
@@ -735,12 +736,13 @@ class pdf_standard extends ModeleExpenseReport
 		$hidebottom=0;
 		if ($hidetop) $hidetop=-1;
 
+		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Amount in (at tab_top - 1)
 		$pdf->SetTextColor(0,0,0);
 		$pdf->SetFont('','', $default_font_size - 2);
-		$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
+		$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
 		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 4), $tab_top -4);
 		$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 2b3209a183b..9ee00df696e 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1070,6 +1070,8 @@ class pdf_crabe extends ModelePDFFactures
 			}
 			else
 			{
+			    // FIXME amount of vat not supported with multicurrency
+			    			 
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index dd29a839a48..9865fc86136 100644
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -388,8 +388,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
                     }
 
 					// Unit price before discount
+					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxup, $curY);
-					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, price($object->lines[$i]->pu_ht), 0, 'R', 0);
+					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
 
 					// Unit price before discount
 					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
@@ -466,11 +467,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						$pdf->setPage($pagenb);
 						if ($pagenb == 1)
 						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
 						else
 						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf,$object,$outputlangs,1);
 						$pagenb++;
@@ -482,11 +483,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					{
 						if ($pagenb == 1)
 						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
 						else
 						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf,$object,$outputlangs,1);
 						// New page
@@ -500,12 +501,12 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				// Show square
 				if ($pagenb == 1)
 				{
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 				else
 				{
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
@@ -593,8 +594,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$pdf->SetFillColor(255,255,255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+
+		$total_ht = ($conf->multicurrency->enabled && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + $object->remise), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + $object->remise), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248,248,248);
@@ -719,8 +722,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$pdf->SetFillColor(224,224,224);
 		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
+		$total_ttc = ($conf->multicurrency->enabled && $object->multiccurency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', 1);
 
 		if ($deja_regle > 0)
 		{
@@ -757,9 +761,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array
 	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
 	{
 		global $conf;
 
@@ -767,6 +772,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$hidebottom=0;
 		if ($hidetop) $hidetop=-1;
 
+		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
         // Amount in (at tab_top - 1)
@@ -775,7 +781,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 		if (empty($hidetop))
 		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
+			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 111fe12d9ec..2c699190a7c 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -400,8 +400,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					}
 
 					// Unit price before discount
+					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxup, $curY);
-					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, price($object->lines[$i]->subprice), 0, 'R', 0);
+					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
 
 					// Quantity
 					$pdf->SetXY($this->posxqty, $curY);
@@ -489,11 +490,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						$pdf->setPage($pagenb);
 						if ($pagenb == 1)
 						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
 						else
 						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf,$object,$outputlangs,1);
 						$pagenb++;
@@ -505,11 +506,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					{
 						if ($pagenb == 1)
 						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						}
 						else
 						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf,$object,$outputlangs,1);
 						// New page
@@ -523,12 +524,12 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				// Show square
 				if ($pagenb == 1)
 				{
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 				else
 				{
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
@@ -691,8 +692,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
+		$total_ht = ($conf->multicurrency->enabled && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + (! empty($object->remise)?$object->remise:0)), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (! empty($object->remise)?$object->remise:0)), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248,248,248);
@@ -826,8 +828,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$pdf->SetFillColor(224,224,224);
 		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
+		$total_ttc = ($conf->multicurrency->enabled && $object->multiccurency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', 1);
 		$pdf->SetFont('','', $default_font_size - 1);
 		$pdf->SetTextColor(0,0,0);
 
@@ -876,9 +879,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array
 	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
 	{
 		global $conf;
 
@@ -886,6 +890,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$hidebottom=0;
 		if ($hidetop) $hidetop=-1;
 
+		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
         // Amount in (at tab_top - 1)
@@ -894,7 +899,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		if (empty($hidetop))
 		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
+			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
@@ -1073,14 +1078,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		if (! empty($object->date_commande))
 		{
-			$posy+=4;
+			$posy+=5;
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date_commande,"day",false,$outputlangs,true), '', 'R');
 		}
 		else
 		{
-			$posy+=4;
+			$posy+=5;
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(255,0,0);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderToProcess"), '', 'R');
diff --git a/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php b/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
index 83c0d38b0ce..edb37ddcdde 100644
--- a/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
+++ b/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
@@ -530,9 +530,10 @@ class pdf_cow extends ModelePDFSuppliersPayments
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array
 	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
 	{
 		global $conf,$mysoc;
 
@@ -540,6 +541,7 @@ class pdf_cow extends ModelePDFSuppliersPayments
 		$hidebottom=0;
 		if ($hidetop) $hidetop=-1;
 
+		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
         // Amount in (at tab_top - 1)
@@ -550,7 +552,7 @@ class pdf_cow extends ModelePDFSuppliersPayments
 		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3) - 60, $tab_top-6);
 		$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 		
-		$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
+		$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
 		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top);
 		$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 32c8eb23cbb..650be00c25d 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -1089,9 +1089,10 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
 	{
 		global $conf;
 
@@ -1099,6 +1100,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$hidebottom=0;
 		if ($hidetop) $hidetop=-1;
 
+		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Amount in (at tab_top - 1)
@@ -1107,7 +1109,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		if (empty($hidetop))
 		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
+			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index b8ea51b8567..c624eaa6c77 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -895,38 +895,10 @@ if (empty($reshook))
 	    }
 	}
 
-	if ($action == 'builddoc' && $user->rights->fournisseur->commande->creer)	// En get ou en	post
-	{
-	    // Build document
-
-	    // Save last template used to generate document
-	    if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-	    $outputlangs = $langs;
-	    if (GETPOST('lang_id'))
-	    {
-	        $outputlangs = new Translate("",$conf);
-	        $outputlangs->setDefaultLang(GETPOST('lang_id'));
-	    }
-	    $result= $object->generateDocument($object->modelpdf,$outputlangs, $hidedetails, $hidedesc, $hideref);
-	    if ($result	<= 0)
-	    {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	        $action='';
-	    }
-	}
-
-	// Delete file in doc form
-	if ($action == 'remove_file' && $object->id > 0 && $user->rights->fournisseur->commande->creer)
-	{
-	    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	    $langs->load("other");
-	    $upload_dir =	$conf->fournisseur->commande->dir_output;
-	    $file =	$upload_dir	. '/' .	GETPOST('file');
-	    $ret=dol_delete_file($file,0,0,0,$object);
-	    if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-	    else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-	}
+	// Actions to build doc
+	$upload_dir = $conf->commande->dir_output;
+	$permissioncreate = $user->rights->fournisseur->commande->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'update_extras')
 	{
@@ -1647,7 +1619,7 @@ elseif (! empty($object->id))
 	$head = ordersupplier_prepare_head($object);
 
 	$title=$langs->trans("SupplierOrder");
-	dol_fiche_head($head, 'card', $title, 0, 'order');
+	dol_fiche_head($head, 'card', $title, -1, 'order');
 
 
 	$formconfirm='';
@@ -2032,9 +2004,27 @@ elseif (! empty($object->id))
 	print '<div class="underbanner clearboth"></div>';
 	
 	print '<table class="border centpercent">';
+
+	if (!empty($conf->multicurrency->enabled))
+	{
+	    // Multicurrency Amount HT
+	    print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
+	    print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+	    print '</tr>';
+	
+	    // Multicurrency Amount VAT
+	    print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
+	    print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+	    print '</tr>';
+	
+	    // Multicurrency Amount TTC
+	    print '<tr><td>' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
+	    print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+	    print '</tr>';
+	}
 	
 	// Total
-	print '<tr><td class="titlefield">'.$langs->trans("AmountHT").'</td>';
+	print '<tr><td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
 	print '<td>'.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'</td>';
 	print '</tr>';
 
@@ -2060,24 +2050,6 @@ elseif (! empty($object->id))
 	print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->total_ttc,'',$langs,1,-1,-1,$conf->currency).'</td>';
 	print '</tr>';
 
-	if (!empty($conf->multicurrency->enabled))
-	{
-		// Multicurrency Amount HT
-		print '<tr><td>' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
-		print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
-		print '</tr>';
-
-		// Multicurrency Amount VAT
-		print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
-		print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
-		print '</tr>';
-
-		// Multicurrency Amount TTC
-		print '<tr><td>' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
-		print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
-		print '</tr>';
-	}
-
 	print '</table>';
 	
 	// Margin Infos

From 6d5578a8769ab5cdebf7bb6d5443bd5b324ca757 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 19 Mar 2017 20:47:30 +0100
Subject: [PATCH 0407/1163] Reactivated constant BANK_DISABLE_DIRECT_INPUT

---
 htdocs/accountancy/admin/index.php            | 26 +++++++++++++++++++
 htdocs/compta/bank/bankentries.php            | 24 ++++++++++-------
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 --
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index b92da48353f..e6bae2f73d8 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -141,6 +141,18 @@ if ($action == 'setmanagezero') {
         }
 }
 
+if ($action == 'setdisabledirectinput') {
+	$setdisabledirectinput = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "BANK_DISABLE_DIRECT_INPUT", $setdisabledirectinput, 'yesno', 0, '', $conf->entity);
+	if (! $res > 0)
+		$error ++;
+		if (! $error) {
+			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("Error"), null, 'mesgs');
+		}
+}
+
 /*
  * View
  */
@@ -230,6 +242,20 @@ if (! empty($user->admin))
     }
     print '</tr>';
 
+	$var = ! $var;
+	print "<tr " . $bc[$var] . ">";
+	print '<td>' . $langs->trans("BANK_DISABLE_DIRECT_INPUT") . '</td>';
+	if (! empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
+		print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=0">';
+		print img_picto($langs->trans("Activated"), 'switch_on');
+		print '</a></td>';
+	} else {
+		print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=1">';
+		print img_picto($langs->trans("Disabled"), 'switch_off');
+		print '</a></td>';
+	}
+	print '</tr>';
+
     $var = ! $var;
     print "<tr " . $bc[$var] . ">";
     print '<td>' . $langs->trans("ACCOUNTING_MANAGE_ZERO") . '</td>';
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index 81bd829b8f5..7ea3a0807a5 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -394,16 +394,15 @@ if ($id > 0 || ! empty($ref))
     foreach ($bankcateg->fetchAll() as $bankcategory) {
         $options[$bankcategory->id] = $bankcategory->label;
     }
-    
+
     // Bank card
-    
     $head=bank_prepare_head($object);
     dol_fiche_head($head,'journal',$langs->trans("FinancialAccount"),0,'account');
-    
+
     $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
-    
+
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-    
+
     dol_fiche_end();
  
     /*
@@ -413,10 +412,17 @@ if ($id > 0 || ! empty($ref))
     {
         print '<div class="tabsAction">';
 
-		if ($user->rights->banque->modifier) {
-			print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$account.'">'.$langs->trans("AddBankRecord").'</a>';
-        } else {
-			print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
+		if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT))
+		{
+			if ($user->rights->banque->modifier) {
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$account.'">'.$langs->trans("AddBankRecord").'</a>';
+			} else {
+				print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
+			}
+		}
+		else
+		{
+			print '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
 		}
 
         if ($object->canBeConciliated() > 0) {
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index a4357cacdeb..5921e3a8099 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -124,8 +124,6 @@ INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USER_A
 
 ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
 
-DELETE FROM llx_const WHERE name = __ENCRYPT('BANK_DISABLE_DIRECT_INPUT')__;
-
 create table llx_payment_various
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,

From db35db127c0d1df68705737ea63f713ce952e39f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Mar 2017 19:21:26 +0100
Subject: [PATCH 0408/1163] Do not allow to migrate n+2 before n+1

---
 htdocs/install/check.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index ad687d3c52d..b37837df663 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -478,8 +478,17 @@ else
             $choice .= '<td class="listofchoices" align="center">';
 			if ($allowupgrade)
 			{
-				// If it's not last updagre script, action = upgrade_tmp, if last action = upgrade
-                $choice .= '<a class="button runupgrade" href="upgrade.php?action=upgrade'.($count<count($migrationscript)?'_'.$versionto:'').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'">'.$langs->trans("Start").'</a>';
+				$disabled=false;
+				if ($foundrecommandedchoice == 2)
+				{
+					$disabled=true;
+				}
+				if ($foundrecommandedchoice == 1)
+				{
+					$foundrecommandedchoice = 2;
+				}
+				if ($disabled) $choice .= '<span class="buttonDisable runupgrade"'.($disabled?' disabled="disabled"':'').' href="#">'.$langs->trans("NotAvailable").'</span>';
+				else $choice .= '<a class="button runupgrade"'.($disabled?' disabled="disabled"':'').' href="upgrade.php?action=upgrade'.($count<count($migrationscript)?'_'.$versionto:'').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'">'.$langs->trans("Start").'</a>';
 			}
 			else
 			{

From 47e325cc661501b1fa94607f307e71a75f7a3b96 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Mar 2017 20:35:24 +0100
Subject: [PATCH 0409/1163] NEW Can set the default value of any field on any
 create page with option MAIN_DEFAULT_FOR_path-to-file_fieldname

---
 htdocs/core/lib/functions.lib.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 62b2fb274c8..3851a173c24 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -248,7 +248,24 @@ function dol_shutdown()
  */
 function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 {
-	if (empty($method)) $out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
+	if (empty($method))
+	{
+		$out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
+		
+		// Management of default values
+		if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+		{
+			$relativepathstring = preg_replace('/\.[a-z]+$/', '', $_SERVER["PHP_SELF"]);
+			if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+			$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+			$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+			$relativepathstring=dol_string_nospecial($relativepathstring, '-');
+			// $relativepathstring is now string that identify the page: '_societe_card', '_agenda_card', ...
+			$keyfordefaultvalue = 'MAIN_DEFAULT_FOR_'.$relativepathstring.'_'.$paramname;
+			global $conf;
+			if (isset($conf->global->$keyfordefaultvalue)) $out = $conf->global->$keyfordefaultvalue;
+		}
+	}
 	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
 	elseif ($method==2) $out = isset($_POST[$paramname])?$_POST[$paramname]:'';
 	elseif ($method==3) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:'');

From b9a999768869476f472b72d86217c878c59e763e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Mar 2017 20:58:43 +0100
Subject: [PATCH 0410/1163] Page societe/soc.php and compta/facture.php was
 renamed into card.php to match page naming conventions.

---
 ChangeLog                                            |  4 +++-
 htdocs/cashdesk/tpl/validation2.tpl.php              |  2 +-
 htdocs/comm/card.php                                 |  2 +-
 htdocs/comm/propal/card.php                          |  2 +-
 htdocs/comm/remx.php                                 |  2 +-
 htdocs/commande/card.php                             |  4 ++--
 htdocs/commande/orderstoinvoice.php                  |  2 +-
 htdocs/compta/bank/ligne.php                         |  4 ----
 htdocs/compta/facture/apercu.php                     |  2 +-
 htdocs/compta/{facture.php => facture/card.php}      | 10 +++++-----
 htdocs/compta/facture/class/facture.class.php        |  2 +-
 htdocs/compta/facture/document.php                   |  2 +-
 htdocs/compta/facture/fiche-rec.php                  |  4 ++--
 htdocs/compta/facture/info.php                       |  2 +-
 htdocs/compta/facture/note.php                       |  2 +-
 htdocs/compta/paiement.php                           |  4 ++--
 htdocs/compta/prelevement/ligne.php                  |  4 ++--
 htdocs/compta/prelevement/list.php                   |  4 ++--
 htdocs/compta/tva/quadri.php                         |  2 +-
 htdocs/contrat/card.php                              |  2 +-
 htdocs/core/class/discount.class.php                 |  2 +-
 htdocs/core/class/notify.class.php                   |  8 ++++----
 htdocs/core/lib/company.lib.php                      |  6 +++---
 htdocs/core/lib/invoice.lib.php                      |  2 +-
 htdocs/core/menus/init_menu_auguria.sql              | 10 +++++-----
 htdocs/core/menus/standard/eldy.lib.php              | 12 ++++++------
 .../core/modules/mailings/thirdparties.modules.php   |  2 +-
 .../thirdparties_services_expired.modules.php        |  2 +-
 htdocs/expedition/card.php                           |  2 +-
 htdocs/fichinter/card.php                            |  2 +-
 htdocs/fourn/facture/paiement.php                    |  2 +-
 htdocs/product/card.php                              |  2 +-
 htdocs/product/fournisseurs.php                      |  2 +-
 htdocs/projet/card.php                               |  4 ++--
 htdocs/projet/element.php                            |  4 ++--
 htdocs/societe/{soc.php => card.php}                 |  4 ++--
 htdocs/societe/class/societe.class.php               |  2 +-
 htdocs/societe/list.php                              |  2 +-
 38 files changed, 65 insertions(+), 67 deletions(-)
 rename htdocs/compta/{facture.php => facture/card.php} (99%)
 rename htdocs/societe/{soc.php => card.php} (99%)

diff --git a/ChangeLog b/ChangeLog
index 85928619cc5..4b97d3a6b89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,9 @@ WARNING:
 Following changes may create regression for some external modules, but were necessary to make Dolibarr better:
 * The hook getNodeList has been replaced by a normalized 'addreplace' hook getDirList.
 * The trigger USER_SETINGROUP and USER_REMOVEFROMGROUP has been replaced with trigger USER_MODIFY.
- 
+* The page societe/soc.php was renamed into societe/card.php to match page naming conventions.
+* The page compta/facture.php was renamed into compta/facture/card.php to match page naming conventions.
+
 
 ***** ChangeLog for 5.0.0 compared to 4.0.* *****
 For users:
diff --git a/htdocs/cashdesk/tpl/validation2.tpl.php b/htdocs/cashdesk/tpl/validation2.tpl.php
index 8f24e2069aa..a6e2fe2a3f3 100644
--- a/htdocs/cashdesk/tpl/validation2.tpl.php
+++ b/htdocs/cashdesk/tpl/validation2.tpl.php
@@ -41,7 +41,7 @@ $langs->load("bills");
 
 </script>
 
-<p><a class="lien1" href="<?php echo DOL_URL_ROOT ?>/compta/facture.php?action=builddoc&facid=<?php echo $_GET['facid']; ?>" target="_blank"><?php echo $langs->trans("ShowInvoice"); ?></a></p>
+<p><a class="lien1" href="<?php echo DOL_URL_ROOT ?>/compta/facture/card.php?action=builddoc&facid=<?php echo $_GET['facid']; ?>" target="_blank"><?php echo $langs->trans("ShowInvoice"); ?></a></p>
 <br>
 <p><a class="lien1" href="#" onclick="Javascript: popupTicket(); return(false);"><?php echo $langs->trans("PrintTicket"); ?></a></p>
 
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index b7cd28c446a..aa6c2729745 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -1094,7 +1094,7 @@ if ($id > 0)
     					else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
     				}
     
-    				if ($object->client != 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
+    				if ($object->client != 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
     				else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
     
     			}
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 99e4a6c0871..d5a492bf7d6 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2383,7 +2383,7 @@ if ($action == 'create')
 				{
 					if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
 					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/compta/facture.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddBill") . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/compta/facture/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddBill") . '</a></div>';
 					}
 
 					$arrayofinvoiceforpropal = $object->getInvoiceArrayList();
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 9e781139723..8c35c6c9e1f 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -564,7 +564,7 @@ if ($socid > 0)
 				print $obj->description;
 				print '</td>';
 			}
-			print '<td align="left" class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.'</a></td>';
+			print '<td align="left" class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.'</a></td>';
 			print '<td align="right">'.price($obj->amount_ht).'</td>';
 			print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
 			print '<td align="right">'.price($obj->amount_ttc).'</td>';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 5d68619d2f9..7db6c28e89d 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2009,7 +2009,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
 		$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
-		$addcreditnote = '<a href="' . DOL_URL_ROOT . '/compta/facture.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
+		$addcreditnote = '<a href="' . DOL_URL_ROOT . '/compta/facture/card.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
 
 		print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
 		if ($soc->remise_percent)
@@ -2541,7 +2541,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 				// Note: Even if module invoice is not enabled, we should be able to use button "Classified billed"
 				if ($object->statut > Commande::STATUS_DRAFT && ! $object->billed) {
 					if (! empty($conf->facture->enabled) && $user->rights->facture->creer && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/compta/facture.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("CreateBill") . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/compta/facture/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("CreateBill") . '</a></div>';
 					}
 					if ($user->rights->commande->creer && $object->statut >= Commande::STATUS_VALIDATED && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=classifybilled">' . $langs->trans("ClassifyBilled") . '</a></div>';
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 009326f1f41..17c73c82698 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -350,7 +350,7 @@ if (($action == 'create' || $action == 'add') && !$error)
 		if ($id > 0 && ! $error)
 		{
 			$db->commit();
-			header('Location: '.DOL_URL_ROOT.'/compta/facture.php?facid='.$id);
+			header('Location: '.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$id);
 			exit;
 		}
 		else
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 609a3f47bd1..8c1f2af7b1f 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -311,13 +311,9 @@ if ($result)
                     print '</a>';
                 }
                 else if ($links[$key]['type']=='company') {
-                    print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$links[$key]['url_id'].'">';
-                    //print img_object($langs->trans('ShowCompany'),'company').' ';
                     $societe=new Societe($db);
                     $societe->fetch($links[$key]['url_id']);
-                    //print $links[$key]['label'];
                     print $societe->getNomUrl(1);
-                    print '</a>';
                 }
                 else if ($links[$key]['type']=='sc') {
                     print '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$links[$key]['url_id'].'">';
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index 258b2434f60..b22571ad93f 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -151,7 +151,7 @@ if ($id > 0 || ! empty($ref))
 
         // Relative and absolute discounts
         $addabsolutediscount=' <a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$soc->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'?facid='.$object->id.'">'.$langs->trans("AddGlobalDiscount").'</a>';
-        $addcreditnote=' <a href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&socid='.$soc->id.'&type=2&backtopage='.urlencode($_SERVER["PHP_SELF"]).'?facid='.$object->id.'">'.$langs->trans("AddCreditNote").'</a>';
+        $addcreditnote=' <a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$soc->id.'&type=2&backtopage='.urlencode($_SERVER["PHP_SELF"]).'?facid='.$object->id.'">'.$langs->trans("AddCreditNote").'</a>';
 
         print '<tr><td>'.$langs->trans('Discounts').'</td>';
         print '<td colspan="5">';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture/card.php
similarity index 99%
rename from htdocs/compta/facture.php
rename to htdocs/compta/facture/card.php
index fad36115a26..4cbad38902f 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture/card.php
@@ -30,12 +30,12 @@
  */
 
 /**
- * \file 	htdocs/compta/facture.php
+ * \file 	htdocs/compta/facture/card.php
  * \ingroup facture
  * \brief 	Page to create/see an invoice
  */
 
-require '../main.inc.php';
+require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture-rec.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
@@ -2828,7 +2828,7 @@ else if ($id > 0 || ! empty($ref))
 
 	$head = facture_prepare_head($object);
 
-	dol_fiche_head($head, 'compta', $langs->trans('InvoiceCustomer'), 0, 'bill');
+	dol_fiche_head($head, 'compta', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
 	$formconfirm = '';
 
@@ -3159,7 +3159,7 @@ else if ($id > 0 || ! empty($ref))
 	// Relative and absolute discounts
 	$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
 	$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
-	$addcreditnote = '<a href="' . DOL_URL_ROOT . '/compta/facture.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
+	$addcreditnote = '<a href="' . DOL_URL_ROOT . '/compta/facture/card.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
 
 	print '<tr><td>' . $langs->trans('Discounts');
 	print '</td><td>';
@@ -3466,7 +3466,7 @@ else if ($id > 0 || ! empty($ref))
         print '<table width="100%" class="nobordernopadding"><tr><td>';
         print $langs->trans('IncotermLabel');
         print '<td><td align="right">';
-        if ($user->rights->facture->creer) print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+        if ($user->rights->facture->creer) print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
         else print '&nbsp;';
         print '</td></tr></table>';
         print '</td>';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 305b8a7e1c0..721713fc279 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1048,7 +1048,7 @@ class Facture extends CommonInvoice
 		$result='';
 
 		if ($option == 'withdraw') $url = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$this->id;
-		else $url = DOL_URL_ROOT.'/compta/facture.php?facid='.$this->id;
+		else $url = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->id;
 
 		if ($short) return $url;
 
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index d6424309f87..45c6102ce1c 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -97,7 +97,7 @@ if ($id > 0 || ! empty($ref))
 		$upload_dir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
 		$head = facture_prepare_head($object);
-		dol_fiche_head($head, 'documents', $langs->trans('InvoiceCustomer'), 0, 'bill');
+		dol_fiche_head($head, 'documents', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
     	$totalpaye = $object->getSommePaiement();
 		
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index c858a2cda1f..9d4329a671b 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1495,7 +1495,7 @@ else
 				{
 					if (empty($object->frequency) || $object->date_when <= $today)
 					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$object->thirdparty->id.'&amp;fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;socid='.$object->thirdparty->id.'&amp;fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
 					}
 					else
 					{
@@ -1786,7 +1786,7 @@ else
 					{
 				        if (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
 				        {
-                            print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
+                            print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
                             print $langs->trans("CreateBill").'</a>';
 				        }
 				        else
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index d52e7648418..56f89a83154 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -50,7 +50,7 @@ $object->fetch_thirdparty();
 $object->info($object->id);
 
 $head = facture_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans("InvoiceCustomer"), 0, 'bill');
+dol_fiche_head($head, 'info', $langs->trans("InvoiceCustomer"), -1, 'bill');
 
 $totalpaye = $object->getSommePaiement();
 
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 9b939cf7c32..223480e4ba8 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -77,7 +77,7 @@ if ($id > 0 || ! empty($ref))
 	
     $totalpaye = $object->getSommePaiement();
     
-    dol_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), 0, 'bill');
+    dol_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), -1, 'bill');
 
     // Invoice content
 
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index e81d0e38345..6a3e0e1a433 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -292,7 +292,7 @@ if (empty($reshook))
 	                else $invoiceid=$facid;
 	            }
 	        }
-	        if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture.php?facid='.$invoiceid;
+	        if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
 	        else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
 	        header('Location: '.$loc);
 	        exit;
@@ -861,7 +861,7 @@ if (! GETPOST('action'))
             $objp = $db->fetch_object($resql);
             $var=!$var;
             print '<tr '.$bc[$var].'>';
-            print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">'.$objp->facnumber."</a></td>\n";
+            print '<td><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$objp->facid.'">'.$objp->facnumber."</a></td>\n";
             print '<td>'.dol_print_date($db->jdate($objp->dp))."</td>\n";
             print '<td>'.$objp->paiement_type.' '.$objp->num_paiement."</td>\n";
             print '<td align="right">'.price($objp->amount).'</td><td>&nbsp;</td>';
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index d43ba27ef26..64ddb12a7bc 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -309,11 +309,11 @@ if ($id)
 
 			print "<tr ".$bc[$var]."><td>";
 
-			print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">';
+			print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">';
 			print img_object($langs->trans("ShowBill"),"bill");
 			print '</a>&nbsp;';
 
-			print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->ref."</a></td>\n";
+			print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">'.$obj->ref."</a></td>\n";
 
 			print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">';
 			print img_object($langs->trans("ShowCompany"),"company"). ' '.$obj->name."</a></td>\n";
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 7a7eeb7610a..d5ae2514034 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -183,9 +183,9 @@ if ($result)
 
         print '<a href="card.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
 
-        print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">';
+        print '<td><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">';
         print img_object($langs->trans("ShowBill"),"bill");
-          print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->facnumber."</a></td>\n";
+          print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">'.$obj->facnumber."</a></td>\n";
         print '</a></td>';
 
         print '<td><a href="card.php?id='.$obj->rowid.'">'.$obj->name."</a></td>\n";
diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php
index 73cc0bc96ba..57ce32b72fe 100644
--- a/htdocs/compta/tva/quadri.php
+++ b/htdocs/compta/tva/quadri.php
@@ -237,7 +237,7 @@ if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES")
 			$x_both[$my_coll_rate]['paye']['vat'] = 0;
 			$x_both[$my_coll_rate]['coll']['links'] = '';
 			foreach($x_coll[$my_coll_rate]['facid'] as $id=>$dummy){
-				$x_both[$my_coll_rate]['coll']['links'] .= '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$x_coll[$my_coll_rate]['facid'][$id].'" title="'.$x_coll[$my_coll_rate]['facnum'][$id].'">..'.substr($x_coll[$my_coll_rate]['facnum'][$id],-2).'</a> ';
+				$x_both[$my_coll_rate]['coll']['links'] .= '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$x_coll[$my_coll_rate]['facid'][$id].'" title="'.$x_coll[$my_coll_rate]['facnum'][$id].'">..'.substr($x_coll[$my_coll_rate]['facnum'][$id],-2).'</a> ';
 			}
 		}
 		foreach(array_keys($x_paye) as $my_paye_rate){
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index f95a60ab130..400548b7076 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2037,7 +2037,7 @@ else
             if (! empty($conf->facture->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
             {
                 $langs->load("bills");
-                if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
+                if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
                 else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
             }
 
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 387c662baad..41c5d67688c 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -483,7 +483,7 @@ class DiscountAbsolute
 
         if ($option == 'invoice') {
             $label=$langs->trans("ShowDiscount").': '.$this->ref_facture_source;
-            $link = '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$this->fk_facture_source.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+            $link = '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->fk_facture_source.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
             $linkend='</a>';
             $ref=$this->ref_facture_source;
             $picto='bill';
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 17e3b00b602..fd3b1e7187d 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -368,13 +368,13 @@ class Notify
 	                	
 	                    switch ($notifcode) {
 							case 'BILL_VALIDATE':
-								$link='/compta/facture.php?facid='.$object->id;
+								$link='/compta/facture/card.php?facid='.$object->id;
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'facture';
 								$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$newref);
 								break;
 							case 'BILL_PAYED':
-								$link='/compta/facture.php?facid='.$object->id;
+								$link='/compta/facture/card.php?facid='.$object->id;
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'facture';
 								$mesg = $langs->transnoentitiesnoconv("EMailTextInvoicePayed",$newref);
@@ -544,13 +544,13 @@ class Notify
 
 		        switch ($notifcode) {
 					case 'BILL_VALIDATE':
-						$link='/compta/facture.php?facid='.$object->id;
+						$link='/compta/facture/card.php?facid='.$object->id;
 						$dir_output = $conf->facture->dir_output;
 						$object_type = 'facture';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$newref);
 						break;
 					case 'BILL_PAYED':
-						$link='/compta/facture.php?facid='.$object->id;
+						$link='/compta/facture/card.php?facid='.$object->id;
 						$dir_output = $conf->facture->dir_output;
 						$object_type = 'facture';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoicePayed",$newref);
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index caa469daa65..bfb893d92ee 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -43,7 +43,7 @@ function societe_prepare_head(Societe $object)
     $h = 0;
     $head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/societe/soc.php?socid='.$object->id;
+    $head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;
     $head[$h][1] = $langs->trans("Card");
     $head[$h][2] = 'card';
     $h++;
@@ -259,7 +259,7 @@ function societe_prepare_head2($object)
     $h = 0;
     $head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/societe/soc.php?socid='.$object->id;
+    $head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;
     $head[$h][1] = $langs->trans("Card");
     $head[$h][2] = 'company';
     $h++;
@@ -1470,7 +1470,7 @@ function show_subsidiaries($conf,$langs,$db,$object)
 			print '<td>'.$obj->code_client.'</td>';
 
 			print '<td align="center">';
-			print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$obj->rowid.'&amp;action=edit">';
+			print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$obj->rowid.'&amp;action=edit">';
 			print img_edit();
 			print '</a></td>';
 
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index f48a248ab14..fa8151563b1 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -38,7 +38,7 @@ function facture_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture.php?facid='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Card');
 	$head[$h][2] = 'compta';
 	$h++;
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 8ac601b4e27..54cddfcaa96 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -68,14 +68,14 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 404__+MAX_llx_menu__, 'home', '', 403__+MAX_llx_menu__, '/user/group/card.php?leftmenu=users&amp;action=create', 'NewGroup', 2, 'users', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin', '', 2, 0, __ENTITY__);
 -- Third parties
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 500__+MAX_llx_menu__, 'companies', 'thirdparties', 2__+MAX_llx_menu__, '/societe/index.php?leftmenu=thirdparties', 'ThirdParty', 0, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 501__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/soc.php?action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 501__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/card.php?action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 502__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?action=create', 'List', 1, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 503__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?type=f&leftmenu=suppliers', 'ListSuppliersShort', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 5, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 504__+MAX_llx_menu__, 'companies', '', 503__+MAX_llx_menu__, '/societe/soc.php?leftmenu=supplier&amp;action=create&amp;type=f', 'NewSupplier', 2, 'suppliers', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 504__+MAX_llx_menu__, 'companies', '', 503__+MAX_llx_menu__, '/societe/card.php?leftmenu=supplier&amp;action=create&amp;type=f', 'NewSupplier', 2, 'suppliers', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 506__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?type=p&leftmenu=prospects', 'ListProspectsShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 507__+MAX_llx_menu__, 'companies', '', 506__+MAX_llx_menu__, '/societe/soc.php?leftmenu=prospects&amp;action=create&amp;type=p', 'MenuNewProspect', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 507__+MAX_llx_menu__, 'companies', '', 506__+MAX_llx_menu__, '/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p', 'MenuNewProspect', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 509__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?type=c&leftmenu=customers', 'ListCustomersShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 510__+MAX_llx_menu__, 'companies', '', 509__+MAX_llx_menu__, '/societe/soc.php?leftmenu=customers&amp;action=create&amp;type=c', 'MenuNewCustomer', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 510__+MAX_llx_menu__, 'companies', '', 509__+MAX_llx_menu__, '/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c', 'MenuNewCustomer', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
 -- Third parties - Contacts
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 600__+MAX_llx_menu__, 'companies', 'contacts', 2__+MAX_llx_menu__, '/contact/list.php?leftmenu=contacts', 'ContactsAddresses', 0, 'companies', '$user->rights->societe->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 601__+MAX_llx_menu__, 'companies', '', 600__+MAX_llx_menu__, '/contact/card.php?leftmenu=contacts&amp;action=create', 'NewContactAddress', 1, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
@@ -171,7 +171,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1604__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier', 'Statistics', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 8, __ENTITY__);
 -- Accountancy - Customer invoice
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1700__+MAX_llx_menu__, 'accountancy', 'customer_bills', 6__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills', 'BillsCustomers', 0, 'bills', '$user->rights->facture->lire', '', 2, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1701__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture.php?action=create&amp;leftmenu=customers_bills', 'NewBill', 1, 'bills', '$user->rights->facture->creer', '', 2, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1701__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/card.php?action=create&amp;leftmenu=customers_bills', 'NewBill', 1, 'bills', '$user->rights->facture->creer', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1705__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills', 'List', 1, 'bills', '$user->rights->facture->lire', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1702__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/fiche-rec.php?leftmenu=customers_bills', 'ListOfTemplates', 1, 'bills', '$user->rights->facture->lire', '', 2, 5, __ENTITY__);
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index c7ac721a3d4..178f1ca9db7 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -611,8 +611,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 				if ($user->rights->societe->creer)
 				{
-					$newmenu->add("/societe/soc.php?action=create", $langs->trans("MenuNewThirdParty"),1);
-					if (! $conf->use_javascript_ajax) $newmenu->add("/societe/soc.php?action=create&amp;private=1",$langs->trans("MenuNewPrivateIndividual"),1);
+					$newmenu->add("/societe/card.php?action=create", $langs->trans("MenuNewThirdParty"),1);
+					if (! $conf->use_javascript_ajax) $newmenu->add("/societe/card.php?action=create&amp;private=1",$langs->trans("MenuNewPrivateIndividual"),1);
 				}
 			}
 
@@ -630,7 +630,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=2", $langs->trans("LastProspectContactInProcess"), 2, $user->rights->societe->lire);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->rights->societe->lire);
 				*/
-				$newmenu->add("/societe/soc.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 2, $user->rights->societe->creer);
+				$newmenu->add("/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 2, $user->rights->societe->creer);
 				//$newmenu->add("/contact/list.php?leftmenu=customers&amp;type=p", $langs->trans("Contacts"), 2, $user->rights->societe->contact->lire);
 			}
 
@@ -640,7 +640,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$langs->load("commercial");
 				$newmenu->add("/societe/list.php?type=c&leftmenu=customers", $langs->trans("ListCustomersShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'customers');
 
-				$newmenu->add("/societe/soc.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 2, $user->rights->societe->creer);
+				$newmenu->add("/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 2, $user->rights->societe->creer);
 				//$newmenu->add("/contact/list.php?leftmenu=customers&amp;type=c", $langs->trans("Contacts"), 2, $user->rights->societe->contact->lire);
 			}
 
@@ -649,7 +649,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$langs->load("suppliers");
 				$newmenu->add("/societe/list.php?type=f&leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 1, $user->rights->fournisseur->lire, '', $mainmenu, 'suppliers');
-				$newmenu->add("/societe/soc.php?leftmenu=suppliers&amp;action=create&amp;type=f",$langs->trans("MenuNewSupplier"), 2, $user->rights->societe->creer && $user->rights->fournisseur->lire);
+				$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f",$langs->trans("MenuNewSupplier"), 2, $user->rights->societe->creer && $user->rights->fournisseur->lire);
 			}
 
 			// Contacts
@@ -790,7 +790,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$langs->load("bills");
 				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("BillsCustomers"),0,$user->rights->facture->lire);
-				$newmenu->add("/compta/facture.php?action=create",$langs->trans("NewBill"),1,$user->rights->facture->creer);
+				$newmenu->add("/compta/facture/card.php?action=create",$langs->trans("NewBill"),1,$user->rights->facture->creer);
 				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("List"),1,$user->rights->facture->lire);
 
 				if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills/', $leftmenu))
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 55cce13fbcf..148c21aa31d 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -241,7 +241,7 @@ class mailing_thirdparties extends MailingTargets
 	 */
 	function url($id)
 	{
-		return '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$id.'">'.img_object('',"company").'</a>';
+		return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('',"company").'</a>';
 	}
 
 }
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index de92354a964..21a37301e38 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -234,7 +234,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
      */
     function url($id)
     {
-        return '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$id.'">'.img_object('',"company").'</a>';
+        return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('',"company").'</a>';
     }
 
 }
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index fd7c3e2633c..e179142b19a 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2019,7 +2019,7 @@ else if ($id || $ref)
 			{
 				if ($user->rights->facture->creer)
 				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
 				}
 			}
 	
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 5e1b536cf40..31f72e18075 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1635,7 +1635,7 @@ else if ($id > 0 || ! empty($ref))
 					$langs->load("bills");
 					if ($object->statut < 2)
 					{
-						if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddBill").'</a></div>';
+						if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddBill").'</a></div>';
 						else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("AddBill").'</a></div>';
 					}
 
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 1048e41c18c..d93750ad4ee 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -756,7 +756,7 @@ if (empty($action))
 
             // Thirdparty
             print '<td>';
-            if ($objp->socid) print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'),'company').' '.dol_trunc($objp->name,32).'</a>';
+            if ($objp->socid) print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'),'company').' '.dol_trunc($objp->name,32).'</a>';
             else print '&nbsp;';
             print '</td>';
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 4df8b45041f..ac260fc99fb 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -804,7 +804,7 @@ if (empty($reshook))
                 );
 
                 if ($result > 0) {
-                    header("Location: " . DOL_URL_ROOT . "/compta/facture.php?facid=" . $facture->id);
+                    header("Location: " . DOL_URL_ROOT . "/compta/facture/card.php?facid=" . $facture->id);
                     exit;
                 }
             }
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 69a9344832b..ab74bc29485 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -394,7 +394,7 @@ if ($id > 0 || $ref)
 					{
 						if (empty($form->result))
 						{
-							print ' - <a href="'.DOL_URL_ROOT.'/societe/soc.php?action=create&type=f&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id.'&action='.$action).'">'.$langs->trans("CreateDolibarrThirdPartySupplier").'</a>';
+							print ' - <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&type=f&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id.'&action='.$action).'">'.$langs->trans("CreateDolibarrThirdPartySupplier").'</a>';
 						}
 					}
 				}
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 1b0ccb36ed0..9407fc716c1 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -528,7 +528,7 @@ if ($action == 'create' && $user->rights->projet->creer)
         	print $form->textwithtooltip($text.' '.img_help(),$texthelp,1);
         }
         else print $text;
-        print ' <a href="'.DOL_URL_ROOT.'/societe/soc.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'">'.$langs->trans("AddThirdParty").'</a>';
+        print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'">'.$langs->trans("AddThirdParty").'</a>';
         print '</td></tr>';
     }
 
@@ -1088,7 +1088,7 @@ elseif ($object->id > 0)
 	            if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
 	            {
 	                $langs->load("bills");
-	                print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a></div>';
+	                print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a></div>';
 	            }
 	            if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer)
 	            {
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 89bab45896f..e10196b8784 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -263,7 +263,7 @@ $listofreferent=array(
 	'margin'=>'add',
 	'table'=>'facture',
 	'datefieldname'=>'datef',
-    'urlnew'=>DOL_URL_ROOT.'/compta/facture.php?action=create&projectid='.$id.'&socid='.$socid,
+    'urlnew'=>DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$id.'&socid='.$socid,
     'lang'=>'bills',
     'buttonnew'=>'CreateBill',
     'testnew'=>$user->rights->facture->creer,
@@ -274,7 +274,7 @@ $listofreferent=array(
 	'class'=>'FactureRec',
 	'table'=>'facture_rec',
 	'datefieldname'=>'datec',
-    'urlnew'=>DOL_URL_ROOT.'/compta/facture.php?action=create&projectid='.$id.'&socid='.$socid,
+    'urlnew'=>DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$id.'&socid='.$socid,
     'lang'=>'bills',
     'buttonnew'=>'CreateBill',
     'testnew'=>$user->rights->facture->creer,
diff --git a/htdocs/societe/soc.php b/htdocs/societe/card.php
similarity index 99%
rename from htdocs/societe/soc.php
rename to htdocs/societe/card.php
index 80aeb14a684..c9fb0de6edf 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/card.php
@@ -26,7 +26,7 @@
  */
 
 /**
- *  \file       htdocs/societe/soc.php
+ *  \file       htdocs/societe/card.php
  *  \ingroup    societe
  *  \brief      Third party card page
  */
@@ -2281,7 +2281,7 @@ else
             print '<table width="100%" class="nobordernopadding"><tr><td>';
             print $langs->trans('IncotermLabel');
             print '<td><td align="right">';
-            if ($user->rights->societe->creer) print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$object->id.'&action=editincoterm">'.img_edit('',1).'</a>';
+            if ($user->rights->societe->creer) print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('',1).'</a>';
             else print '&nbsp;';
             print '</td></tr></table>';
             print '</td>';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 5aac6fdec85..ed3fdad13c4 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1891,7 +1891,7 @@ class Societe extends CommonObject
         if (empty($linkstart))
         {
             $label.= '<u>' . $langs->trans("ShowCompany") . '</u>';
-            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$this->id;
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
         }
 
         if (! empty($this->name))
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index cc5ab706fb0..649965f972c 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -461,7 +461,7 @@ if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) &&
 {
     $obj = $db->fetch_object($resql);
     $id = $obj->rowid;
-    header("Location: ".DOL_URL_ROOT.'/societe/soc.php?socid='.$id);
+    header("Location: ".DOL_URL_ROOT.'/societe/card.php?socid='.$id);
     exit;
 }
 

From 2bc7f10cd66681661152283756874f0b9c080a35 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Tue, 21 Mar 2017 06:45:13 +0100
Subject: [PATCH 0411/1163] Fix

---
 htdocs/compta/bank/various_payment/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 9e32941bab9..4875ac593c6 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -225,7 +225,7 @@ if ($action == 'create')
 	// Label
 	print '<tr><td>';
 	print fieldLabel('Label','label',1).'</td><td>';
-	print '<input name="label" id="label" class="minwidth300" value="'.(GETPOST("label")?GETPOST("label",'',2):$langs->trans("VariousPayment")).'">';
+	print '<input name="label" id="label" class="minwidth300" value="'.($label?$label:$langs->trans("VariousPayment")).'">';
 	print '</td></tr>';
 
 	// Sens

From d9abe553cfb0723aba098c5901326dce4082952e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 10:54:47 +0100
Subject: [PATCH 0412/1163] Useless bottom-border

---
 htdocs/admin/modules.php              | 6 +++---
 htdocs/supplier_proposal/card.php     | 2 +-
 htdocs/supplier_proposal/document.php | 2 +-
 htdocs/supplier_proposal/info.php     | 2 +-
 htdocs/supplier_proposal/note.php     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 107cffd8500..52b250e8cf0 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -440,7 +440,7 @@ if ($mode == 'common')
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-    dol_fiche_head($head, $mode, '');
+    dol_fiche_head($head, $mode, '', -1);
 
     $moreforfilter = '';
     $moreforfilter.='<div class="divsearchfield">';
@@ -773,7 +773,7 @@ if ($mode == 'common')
 
 if ($mode == 'marketplace')
 {
-    dol_fiche_head($head, $mode, '');
+    dol_fiche_head($head, $mode, '', -1);
     
     // Marketplace
     print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
@@ -809,7 +809,7 @@ if ($mode == 'marketplace')
    
 if ($mode == 'deploy')
 {
-    dol_fiche_head($head, $mode, '');
+    dol_fiche_head($head, $mode, '', -1);
 
     
     $allowonlineinstall=true;
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 8ec24860e14..d05d3490776 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1283,7 +1283,7 @@ if ($action == 'create')
 	$soc->fetch($object->socid);
 
 	$head = supplier_proposal_prepare_head($object);
-	dol_fiche_head($head, 'comm', $langs->trans('CommRequest'), 0, 'supplier_proposal');
+	dol_fiche_head($head, 'comm', $langs->trans('CommRequest'), -1, 'supplier_proposal');
 
 	$formconfirm = '';
 
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 2f49951c844..1f21693246b 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -83,7 +83,7 @@ if ($object->id > 0)
 	$upload_dir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
 	$head = supplier_proposal_prepare_head($object);
-	dol_fiche_head($head, 'document', $langs->trans('CommRequest'), 0, 'supplier_proposal');
+	dol_fiche_head($head, 'document', $langs->trans('CommRequest'), -1, 'supplier_proposal');
 
 	// Construit liste des fichiers
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
index de98ed5be65..718b79ce4ae 100644
--- a/htdocs/supplier_proposal/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -53,7 +53,7 @@ $object->info($object->id);
 
 
 $head = supplier_proposal_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans('CommRequest'), 0, 'supplier_proposal');
+dol_fiche_head($head, 'info', $langs->trans('CommRequest'), -1, 'supplier_proposal');
 
 // Supplier proposal card
 $linkback = '<a href="' . DOL_URL_ROOT . '/supplier_proposal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index b764372848d..10a9668382c 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -76,7 +76,7 @@ if ($id > 0 || ! empty($ref))
 		if ( $societe->fetch($object->socid) )
 		{
 			$head = supplier_proposal_prepare_head($object);
-			dol_fiche_head($head, 'note', $langs->trans('CommRequest'), 0, 'supplier_proposal');
+			dol_fiche_head($head, 'note', $langs->trans('CommRequest'), -1, 'supplier_proposal');
 
 
 			// Supplier proposal card

From 5231fbf1e3519c3cb1d7caf704b25b20a67a6a1f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 11:37:03 +0100
Subject: [PATCH 0413/1163] Option to hide version

---
 htdocs/main.inc.php | 60 +++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 5cb73be28e7..6b9d4f08531 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1390,7 +1390,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    $logouttext='';
 	    if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	    {
-    	    $logouthtmltext=$appli.'<br>';
+    	    //$logouthtmltext=$appli.'<br>';
     	    if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
     	    {
     	    	$logouthtmltext.=$langs->trans("Logout").'<br>';
@@ -1467,8 +1467,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	        if ($helpbaseurl && $helppage)
 	        {
 	            $text='';
-	            $title='';
-	            //$text.='<div id="blockvmenuhelpwiki" class="blockvmenuhelp">';
+	            $title=$appli.'<br>';
 	            $title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
 	            if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
 	            $text.='<a class="help" target="_blank" href="';
@@ -1631,32 +1630,35 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
         print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
 
         // Version
-        $doliurl='http://www.dolibarr.org';
-		//local communities
-		if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.fr';
-		if (preg_match('/es/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.es';
-		if (preg_match('/de/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.de';
-		if (preg_match('/it/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.it';
-		if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.gr';
-
-        $appli=constant('DOL_APPLICATION_TITLE');
-	    if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-	    {
-	    	$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
-	    	if (preg_match('/\d\.\d/', $appli))
-	    	{
-				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-	    	}
-	    	else $appli.=" ".DOL_VERSION;
-	    }
-	    else $appli.=" ".DOL_VERSION;
-	    print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-	    if ($doliurl) print '<a class="help" target="_blank" href="'.$doliurl.'">';
-	    else print '<span class="help">';
-	    print $appli;
-	    if ($doliurl) print '</a>';
-	    else print '</span>';
-	    print '</div>'."\n";
+        if (empty($conf->global->MAIN_HIDE_VERSION))    // Version is already on help picto and on login page.
+        {
+            $doliurl='https://www.dolibarr.org';
+    		//local communities
+    		if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.fr';
+    		if (preg_match('/es/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.es';
+    		if (preg_match('/de/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.de';
+    		if (preg_match('/it/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.it';
+    		if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.gr';
+    
+            $appli=constant('DOL_APPLICATION_TITLE');
+    	    if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+    	    {
+    	    	$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
+    	    	if (preg_match('/\d\.\d/', $appli))
+    	    	{
+    				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    	    	}
+    	    	else $appli.=" ".DOL_VERSION;
+    	    }
+    	    else $appli.=" ".DOL_VERSION;
+    	    print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
+    	    if ($doliurl) print '<a class="help" target="_blank" href="'.$doliurl.'">';
+    	    else print '<span class="help">';
+    	    print $appli;
+    	    if ($doliurl) print '</a>';
+    	    else print '</span>';
+    	    print '</div>'."\n";
+        }
 
 		// Link to bugtrack
 		if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))

From 9abe0940e7ec3234302388956a63fae7e5e6bc35 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 11:42:02 +0100
Subject: [PATCH 0414/1163] Fix bad use of showLinkedObjectBlock

---
 htdocs/user/card.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 4627d7c472a..839d09ee9c7 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2360,13 +2360,9 @@ else
 
         $somethingshown = $formfile->show_documents('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 
-		// Linked object block
-		$somethingshown = $form->showLinkedObjectBlock($object);
-
 		// Show links to link elements
-		$linktoelem = $form->showLinkToObjectBlock($object);
-		if ($linktoelem) print '<br>'.$linktoelem;
-
+		$linktoelem = $form->showLinkToObjectBlock($object, null, null);
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
         print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 

From 5b4bb560122450add46324a9233d9016a95455fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 12:13:02 +0100
Subject: [PATCH 0415/1163] No more need of $bc[$var]

---
 htdocs/admin/ihm.php | 195 +++++++++++++++++++------------------------
 1 file changed, 88 insertions(+), 107 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index eefa6a1fc24..95917a79ab5 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -157,8 +157,7 @@ if ($action == 'edit')	// Edit
     print '<input type="hidden" name="action" value="update">';
 
     clearstatcache();
-    $var=true;
-
+    
     print '<br>';
     print '<table summary="edit" class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
@@ -166,16 +165,14 @@ if ($action == 'edit')	// Edit
 	print '</tr>';
 
     // Default language
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
+    print '<tr><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
     print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'main_lang_default', 1, 0, 0, 0, 0, 'minwidth300');
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Multilingual GUI
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("EnableMultilangInterface").'</td><td>';
+    print '<tr><td width="35%">'.$langs->trans("EnableMultilangInterface").'</td><td>';
     print $form->selectyesno('main_multilangs',$conf->global->MAIN_MULTILANGS,1);
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
@@ -192,11 +189,9 @@ if ($action == 'edit')	// Edit
     {
         print '<table summary="search" class="noborder" width="100%">';
         print '<tr class="liste_titre"><td width="35%">'.$langs->trans("PermanentLeftSearchForm").'</td><td colspan="2">'.$langs->trans("Activated").'</td></tr>';
-        $var=True;
         foreach ($searchform as $key => $value)
         {
-            $var=!$var;
-            print '<tr '.$bc[$var].'><td width="35%">'.$searchformtitle[$key].'</td><td colspan="2">';
+            print '<tr><td width="35%">'.$searchformtitle[$key].'</td><td colspan="2">';
             print $form->selectyesno($searchform[$key],$searchformconst[$key],1);
             print '</td></tr>';
         }
@@ -210,29 +205,18 @@ if ($action == 'edit')	// Edit
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
-	// Show logo
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("EnableShowLogo").'</td><td>';
-    print $form->selectyesno('MAIN_SHOW_LOGO',$conf->global->MAIN_SHOW_LOGO,1);
-    print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
 	// Max size of lists
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td><input class="flat" name="main_size_liste_limit" size="4" value="' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '"></td>';
+    print '<tr><td>'.$langs->trans("DefaultMaxSizeList").'</td><td><input class="flat" name="main_size_liste_limit" size="4" value="' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '"></td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Max size of short lists on customer card
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td><input class="flat" name="main_size_shortliste_limit" size="4" value="' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '"></td>';
+    print '<tr><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td><input class="flat" name="main_size_shortliste_limit" size="4" value="' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '"></td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 	
     // Disable javascript and ajax
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
+    print '<tr><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
     print $form->selectyesno('main_disable_javascript',isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0,1);
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
@@ -241,8 +225,7 @@ if ($action == 'edit')	// Edit
     // Activate preview tab on element card
     if (class_exists("Imagick"))
 	{
-	    $var=!$var;
-	    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("UsePreviewTabs").'</td><td>';
+	    print '<tr><td width="35%">'.$langs->trans("UsePreviewTabs").'</td><td>';
 	    print $form->selectyesno('MAIN_USE_PREVIEW_TABS',isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:0,1);
 	    print '</td>';
 		print '<td width="20">&nbsp;</td>';
@@ -250,32 +233,28 @@ if ($action == 'edit')	// Edit
 	}
 
     // First day for weeks
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("WeekStartOnDay").'</td><td>';
+    print '<tr><td width="35%">'.$langs->trans("WeekStartOnDay").'</td><td>';
     print $formother->select_dayofweek((isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'),'MAIN_START_WEEK',0);
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
     // DefaultWorkingDays
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultWorkingDays").'</td><td>';
+    print '<tr><td width="35%">'.$langs->trans("DefaultWorkingDays").'</td><td>';
     print '<input type="text" name="MAIN_DEFAULT_WORKING_DAYS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_DAYS)?$conf->global->MAIN_DEFAULT_WORKING_DAYS:'1-5').'">';
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
     // DefaultWorkingHours
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultWorkingHours").'</td><td>';
+    print '<tr><td width="35%">'.$langs->trans("DefaultWorkingHours").'</td><td>';
     print '<input type="text" name="MAIN_DEFAULT_WORKING_HOURS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_HOURS)?$conf->global->MAIN_DEFAULT_WORKING_HOURS:'9-18').'">';
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Firstname/Name
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>';
+    print '<tr><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>';
 	$array=array(0=>$langs->trans("Firstname").' '.$langs->trans("Lastname"),1=>$langs->trans("Lastname").' '.$langs->trans("Firstname"));
     print $form->selectarray('MAIN_FIRSTNAME_NAME_POSITION',$array,(isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?$conf->global->MAIN_FIRSTNAME_NAME_POSITION:0));
     print '</td>';
@@ -283,40 +262,52 @@ if ($action == 'edit')	// Edit
 	print '</tr>';
 
 	// Hide unauthorized button
-	$var=!$var;
-	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
+	print '<tr><td width="35%">'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
 	print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED',isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)?$conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED:0,1);
 	print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
-    // Hide helpcenter link on login page
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
-    print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK',isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0,1);
-    print '</td>';
+	// Show logo
+	print '<tr><td width="35%">'.$langs->trans("EnableShowLogo").'</td><td>';
+	print $form->selectyesno('MAIN_SHOW_LOGO',$conf->global->MAIN_SHOW_LOGO,1);
+	print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
-
-	// Hide wiki link on login page
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td>';
-    print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0,1);
-    print '</td>';
+	
+	// Hide version link
+	/*
+	
+	print '<tr><td width="35%">'.$langs->trans("HideVersionLink").'</td><td>';
+	print $form->selectyesno('MAIN_HIDE_VERSION',$conf->global->MAIN_HIDE_VERSION,1);
+	print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
-
+    */
+	
 	// Show bugtrack link
-	$var=!$var;
-	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
+	print '<tr><td width="35%">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
 	print $form->selectyesno('MAIN_BUGTRACK_ENABLELINK',$conf->global->MAIN_BUGTRACK_ENABLELINK,1);
 	print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
-    // Message on login page
-	$var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
+	// Hide wiki link on login page
+    print '<tr><td width="35%">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td>';
+    print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0,1);
+    print '</td>';
+	print '<td width="20">&nbsp;</td>';
+	print '</tr>';
+
+	// Hide helpcenter link on login page
+	print '<tr><td width="35%">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
+	print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK',isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0,1);
+	print '</td>';
+	print '<td width="20">&nbsp;</td>';
+	print '</tr>';
+	
+	// Message on login page
+    print '<tr><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
 
     $doleditor = new DolEditor('main_home', (isset($conf->global->MAIN_HOME)?$conf->global->MAIN_HOME:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
 	$doleditor->Create();
@@ -324,8 +315,7 @@ if ($action == 'edit')	// Edit
 	print '</td></tr>'."\n";
 
 	// Message of the day on home page
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
+    print '<tr><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
 
     $doleditor = new DolEditor('main_motd', (isset($conf->global->MAIN_MOTD)?$conf->global->MAIN_MOTD:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
 	$doleditor->Create();
@@ -345,14 +335,11 @@ if ($action == 'edit')	// Edit
 }
 else	// Show
 {
-    $var=true;
-
     // Language
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td><td>&nbsp;</td></tr>';
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
+    print '<tr><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
     $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
     print ($s?$s.' ':'');
     print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
@@ -361,9 +348,8 @@ else	// Show
     if ($user->admin && $conf->global->MAIN_LANG_DEFAULT!='auto') print info_admin($langs->trans("SubmitTranslation".($conf->global->MAIN_LANG_DEFAULT=='en_US'?'ENUS':''),$conf->global->MAIN_LANG_DEFAULT),1);
 	print '</td>';
 	print "</tr>";
-
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("EnableMultilangInterface").'</td><td>' . yn($conf->global->MAIN_MULTILANGS) . '</td>';
+    
+    print '<tr><td width="35%">'.$langs->trans("EnableMultilangInterface").'</td><td>' . yn($conf->global->MAIN_MULTILANGS) . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
@@ -380,11 +366,10 @@ else	// Show
     {
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre"><td width="35%">'.$langs->trans("PermanentLeftSearchForm").'</td><td>'.$langs->trans("Activated").'</td><td>&nbsp;</td></tr>';
-        $var=true;
         foreach ($searchform as $key => $value)
         {
-            $var=!$var;
-            print '<tr '.$bc[$var].'><td width="35%">'.$searchformtitle[$key].'</td><td>'.yn($searchformconst[$key]).'</td>';
+            
+            print '<tr><td width="35%">'.$searchformtitle[$key].'</td><td>'.yn($searchformconst[$key]).'</td>';
     		print '<td align="left">';
     		if (! empty($searchformmodule[$key])) print $langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key]));
             print '</td></tr>';
@@ -394,28 +379,20 @@ else	// Show
     }
 
     // Other
-    $var=true;
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameters").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>';
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print "</tr>";
-
-	$var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '</td>';
+    print '<tr><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 	
-	$var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td>' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '</td>';
+    print '<tr><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td>' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
     // Disable javascript/ajax
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
+    
+    print '<tr><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
     print yn($conf->global->MAIN_DISABLE_JAVASCRIPT)."</td>";
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
@@ -423,40 +400,36 @@ else	// Show
     // Activate preview tab on element card
     if (class_exists("Imagick"))
 	{
-		$var=!$var;
-	    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("UsePreviewTabs").'</td><td>';
+		
+	    print '<tr><td width="35%">'.$langs->trans("UsePreviewTabs").'</td><td>';
 	    print yn(isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:0)."</td>";
 		print '<td width="20">&nbsp;</td>';
 		print "</tr>";
 	}
 
 	// First day for weeks
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("WeekStartOnDay").'</td><td>';
+    print '<tr><td width="35%">'.$langs->trans("WeekStartOnDay").'</td><td>';
     print $langs->trans("Day".(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'));
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
     // DefaultWorkingDays
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultWorkingDays").'</td><td>';
+    print '<tr><td width="35%">'.$langs->trans("DefaultWorkingDays").'</td><td>';
     print isset($conf->global->MAIN_DEFAULT_WORKING_DAYS)?$conf->global->MAIN_DEFAULT_WORKING_DAYS:'1-5';
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
     // DefaultWorkingHours
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultWorkingHours").'</td><td>';
+    print '<tr><td width="35%">'.$langs->trans("DefaultWorkingHours").'</td><td>';
     print isset($conf->global->MAIN_DEFAULT_WORKING_HOURS)?$conf->global->MAIN_DEFAULT_WORKING_HOURS:'9-18';
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Firstname / Name position
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>';
+    print '<tr><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>';
     if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { print $langs->trans("Firstname").' '.$langs->trans("Lastname"); }
     else { print $langs->trans("Lastname").' '.$langs->trans("Firstname"); }
     print '</td>';
@@ -464,40 +437,48 @@ else	// Show
 	print '</tr>';
 
 	// Hide unauthorized button
-	$var=!$var;
-	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ButtonHideUnauthorized").'</td><td colspan="2">';
+	print '<tr><td width="35%">'.$langs->trans("ButtonHideUnauthorized").'</td><td colspan="2">';
 	print yn((isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)?$conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED:0),1);
 	print '</td></tr>';
 
-    // Link to help center
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableLinkToHelpCenter").'</td><td colspan="2">';
-    print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0),1);
-    print '</td></tr>';
+    // Show logo
+    print '<tr><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';
+	print '<td width="20">&nbsp;</td>';
+	print "</tr>";
 
-    // Link to wiki help
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td colspan="2">';
-    print yn((isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0),1);
-    print '</td></tr>';
-
-	// Show bugtrack link
-	$var=!$var;
-	print '<tr '.$bc[$var].'"><td width="35%">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
+	// Hide version link
+	/*
+	 print '<tr><td width="35%">'.$langs->trans("HideVersionLink").'</td><td>';
+	 print yn($conf->global->MAIN_HIDE_VERSION);
+	 print '</td>';
+	 print '<td width="20">&nbsp;</td>';
+	 print '</tr>';
+	 */
+	
+    // Show bugtrack link
+	print '<tr"><td width="35%">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
 	print yn($conf->global->MAIN_BUGTRACK_ENABLELINK)."</td>";
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
-    // Message login
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
+    // Link to wiki help
+    print '<tr><td width="35%">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td colspan="2">';
+    print yn((isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0),1);
+    print '</td></tr>';
+
+	// Link to help center
+    print '<tr><td width="35%">'.$langs->trans("DisableLinkToHelpCenter").'</td><td colspan="2">';
+    print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0),1);
+    print '</td></tr>';
+
+	// Message login
+    print '<tr><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
     if (isset($conf->global->MAIN_HOME)) print dol_htmlcleanlastbr($conf->global->MAIN_HOME);
     else print '&nbsp;';
     print '</td></tr>'."\n";
 
     // Message of the day
-    $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
+    print '<tr><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
     if (isset($conf->global->MAIN_MOTD)) print dol_htmlcleanlastbr($conf->global->MAIN_MOTD);
     else print '&nbsp;';
     print '</td></tr>'."\n";

From 0e997c973f05cff4d8bafcf363081d8274a34df0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 13:01:32 +0100
Subject: [PATCH 0416/1163] FIX Picto of project on dol_banner and box

---
 htdocs/core/boxes/box_project.php | 8 ++++----
 htdocs/core/lib/functions.lib.php | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index c2cc1cb041b..b4a020cf500 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -78,7 +78,7 @@ class box_project extends ModeleBoxes
 		// list the summary of the orders
 		if ($user->rights->projet->lire) {
 
-			$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut ";
+			$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
 			$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
             if($user->socid) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=p.fk_soc";
 			$sql.= " WHERE p.entity = ".$conf->entity;
@@ -98,7 +98,7 @@ class box_project extends ModeleBoxes
                     $tooltip = $langs->trans('Project') . ': ' . $objp->ref;
                     $this->info_box_contents[$i][0] = array(
                         'td' => 'align="left" width="16"',
-                        'logo' => 'object_project',
+                        'logo' => 'object_project'.($objp->public?'pub':''),
                         'tooltip' => $tooltip,
                         'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid,
                     );
@@ -124,12 +124,12 @@ class box_project extends ModeleBoxes
 						$objTask = $db->fetch_object($resultTask);
                         $this->info_box_contents[$i][3] = array(
                             'td' => 'class="right"',
-                            'text' => number_format($objTask->nb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"),
+                            'text' => $objTask->nb."&nbsp;".$langs->trans("Tasks"),
                         );
 						if ($objTask->nb  > 0 )
                             $this->info_box_contents[$i][4] = array(
                                 'td' => 'class="right"',
-                                'text' => number_format(($objTask->totprogress/$objTask->nb), 0, ',', ' ')."%",
+                                'text' => round($objTask->totprogress/$objTask->nb, 0)."%",
                             );
 						else
 							$this->info_box_contents[$i][4] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3851a173c24..c987b9dd954 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1045,7 +1045,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                     $morehtmlleft.='</div>';
                 }
             }
-            elseif ($conf->browser->layout != 'phone')      // Show no photo link
+            elseif ($conf->browser->layout != 'phone')      // Show No photo link (picto of pbject)
             {
                 $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">';
                 if ($object->element == 'action')
@@ -1057,7 +1057,9 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                 else
                 {
                     $width=14; $cssclass='photorefcenter';
-    				$nophoto=img_picto('', 'object_'.$object->picto, '', false, 1);
+                    $picto = $object->picto;
+                    if ($object->element == 'project' && ! $object->public) $picto = 'project'; // instead of projectpub
+    				$nophoto=img_picto('', 'object_'.$picto, '', false, 1);
     				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.$nophoto.'"></div></div>';
                 }
                 $morehtmlleft.='</div>';

From aa71710a746794f42e71c0708b83461e51e03fc4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 13:38:00 +0100
Subject: [PATCH 0417/1163] FIX list of projects

---
 htdocs/core/boxes/box_project.php | 44 ++++++++++++++++++++++---------
 htdocs/projet/list.php            |  3 ++-
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index b4a020cf500..4277481499f 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -72,27 +72,40 @@ class box_project extends ModeleBoxes
 		$totalnb = 0;
 		$totalnbTask=0;
 
-		$textHead = $langs->trans("Projects");
+		$textHead = $langs->trans("OpenedProjects");
 		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
 
 		// list the summary of the orders
 		if ($user->rights->projet->lire) {
-
-			$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
+		    
+		    include_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
+		    $projectstatic = new Project($this->db);
+		    
+		    $socid=$user->societe_id;
+		    
+    		// Get list of project id allowed to user (in a string list separated by coma)
+		    $projectsListId='';
+    		if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
+		
+		    $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
 			$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
             if($user->socid) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=p.fk_soc";
-			$sql.= " WHERE p.entity = ".$conf->entity;
-            if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
+			$sql.= " WHERE p.entity IN (".getEntity('project',1).')';
+            if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";     // public and assigned to, or restricted to company for external users
+			if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
             $sql.= " AND p.fk_statut = 1"; // Seulement les projets ouverts
-			$sql.= " ORDER BY p.datec DESC";
-			$sql.= $db->plimit($max, 0);
+            if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+            if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+            
+            $sql.= " ORDER BY p.datec DESC";
+			//$sql.= $db->plimit($max, 0);
 
             $result = $db->query($sql);
 
             if ($result) {
                 $num = $db->num_rows($result);
                 $i = 0;
-                while ($i < $num) {
+                while ($i < min($num, $max)) {
                     $objp = $db->fetch_object($result);
 
                     $tooltip = $langs->trans('Project') . ': ' . $objp->ref;
@@ -117,8 +130,8 @@ class box_project extends ModeleBoxes
 
 					$sql ="SELECT count(*) as nb, sum(progress) as totprogress";
 					$sql.=" FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
-					$sql.=" WHERE p.entity = ".$conf->entity;
-					$sql.=" AND p.rowid = ".$objp->rowid;
+	           		$sql.= " WHERE p.entity IN (".getEntity('project',1).')';
+    				$sql.=" AND p.rowid = ".$objp->rowid;
 					$resultTask = $db->query($sql);
 					if ($resultTask) {
 						$objTask = $db->fetch_object($resultTask);
@@ -135,12 +148,17 @@ class box_project extends ModeleBoxes
 							$this->info_box_contents[$i][4] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
 						$totalnbTask += $objTask->nb;
 					} else {
-						$this->info_box_contents[$i][3] = array('td' => 'class="right"', 'text' => number_format(0, 0, ',', ' '));
+						$this->info_box_contents[$i][3] = array('td' => 'class="right"', 'text' => round(0));
 						$this->info_box_contents[$i][4] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
 					}
 
 					$i++;
 				}
+				if ($max < $num)
+				{
+				    $this->info_box_contents[$i][0] = array('td' => 'colspan="5"', 'text' => '...');				    
+				    $i++;
+				}
 			}
 		}
 
@@ -158,11 +176,11 @@ class box_project extends ModeleBoxes
         );
         $this->info_box_contents[$i][2] = array(
             'td' => 'align="right" ',
-            'text' => number_format($num, 0, ',', ' ')."&nbsp;".$langs->trans("Projects"),
+            'text' => round($num, 0)."&nbsp;".$langs->trans("Projects"),
         );
         $this->info_box_contents[$i][3] = array(
             'td' => 'align="right" ',
-            'text' => number_format($totalnbTask, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"),
+            'text' => (($max < $num) ? '' : (round($totalnbTask, 0)."&nbsp;".$langs->trans("Tasks"))),
         );
         $this->info_box_contents[$i][4] = array(
             'td' => '',
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index f45148c84c7..c7d213b19ce 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -197,6 +197,7 @@ $title=$langs->trans("Projects");
 
 
 // Get list of project id allowed to user (in a string list separated by coma)
+$projectsListId='';
 if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
 
 // Get id of types of contacts for projects (This list never contains a lot of elements)
@@ -246,7 +247,7 @@ if ($search_project_user > 0)
 $sql.= " WHERE p.entity IN (".getEntity('project',1).')';
 if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";     // public and assigned to, or restricted to company for external users
 // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
-if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 if ($search_categ > 0)    $sql.= " AND cs.fk_categorie = ".$db->escape($search_categ);
 if ($search_categ == -2)  $sql.= " AND cs.fk_categorie IS NULL";
 if ($search_ref) $sql .= natural_search('p.ref', $search_ref);

From 95da2f5d545aa9083ea47ba3ebe5776eac142373 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 13:38:21 +0100
Subject: [PATCH 0418/1163] NEW Add font-awesome css.

---
 htdocs/main.inc.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6b9d4f08531..45787d5054b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1080,7 +1080,13 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css'.($ext?'?'.$ext:'').'">'."\n";
             }
         }
-
+        
+        if (! defined('DISABLE_FONT_AWSOME'))
+        {
+            print '<!-- Includes CSS for font awesome -->'."\n";
+            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext?'?'.$ext:'').'">'."\n";
+        }
+            
         print '<!-- Includes CSS for Dolibarr theme -->'."\n";
         // Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
         //$themepath=dol_buildpath((empty($conf->global->MAIN_FORCETHEMEDIR)?'':$conf->global->MAIN_FORCETHEMEDIR).$conf->css,1);
@@ -1100,7 +1106,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         }
         //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
         print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
-	    if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+	    if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
 
         // CSS forced by modules (relative url starting with /)
         if (! empty($conf->modules_parts['css']))

From 68257283e444cab0e16d4559d8f083a5bb557102 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 13:39:42 +0100
Subject: [PATCH 0419/1163] Enhance select list

---
 htdocs/core/class/html.form.class.php      | 41 ++++++++++------------
 htdocs/core/class/html.formother.class.php |  3 +-
 htdocs/core/lib/ajax.lib.php               |  2 +-
 htdocs/index.php                           |  5 ++-
 htdocs/projet/class/project.class.php      |  4 +--
 5 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1366435f144..0ec07e1c3fa 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1070,11 +1070,10 @@ class Form
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
             	$comboenhancement =ajax_combobox($htmlname, $events, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
             	$out.= $comboenhancement;
-            	$nodatarole=($comboenhancement?' data-role="none"':'');
             }
 
             // Construct $out and $outarray
-            $out.= '<select id="'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'"'.($moreparam?' '.$moreparam:'').' name="'.$htmlname.'"'.$nodatarole.'>'."\n";
+            $out.= '<select id="'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'"'.($moreparam?' '.$moreparam:'').' name="'.$htmlname.'">'."\n";
 
             $textifempty='';
             // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
@@ -1286,10 +1285,9 @@ class Form
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
             	$comboenhancement = ajax_combobox($htmlname, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
             	$out.= $comboenhancement;
-            	$nodatarole=($comboenhancement?' data-role="none"':'');
             }
 
-            if ($htmlname != 'none' || $options_only) $out.= '<select class="flat'.($moreclass?' '.$moreclass:'').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
+            if ($htmlname != 'none' || $options_only) $out.= '<select class="flat'.($moreclass?' '.$moreclass:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
             if ($showempty == 1) $out.= '<option value="0"'.($selected=='0'?' selected':'').'></option>';
             if ($showempty == 2) $out.= '<option value="0"'.($selected=='0'?' selected':'').'>'.$langs->trans("Internal").'</option>';
             $num = $this->db->num_rows($resql);
@@ -1481,17 +1479,15 @@ class Form
             if ($num)
             {
            		// Enhance with select2
-           		$nodatarole='';
 		        if ($conf->use_javascript_ajax)
 		        {
 		            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 		            $comboenhancement = ajax_combobox($htmlname);
 		            $out.=$comboenhancement;
-		            $nodatarole=($comboenhancement?' data-role="none"':'');
 		        }
 
 		        // do not use maxwidthonsmartphone by default. Set it by caller so auto size to 100% will work when not defined
-                $out.= '<select class="flat'.($morecss?' minwidth100 '.$morecss:' minwidth200').'" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').$nodatarole.'>';
+                $out.= '<select class="flat'.($morecss?' minwidth100 '.$morecss:' minwidth200').'" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').'>';
                 if ($show_empty) $out.= '<option value="-1"'.((empty($selected) || $selected==-1)?' selected':'').'>&nbsp;</option>'."\n";
 				if ($show_every) $out.= '<option value="-2"'.(($selected==-2)?' selected':'').'>-- '.$langs->trans("Everybody").' --</option>'."\n";
 
@@ -1964,10 +1960,9 @@ class Form
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
             	$comboenhancement =ajax_combobox($htmlname, $events, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
             	$out.= $comboenhancement;
-            	$nodatarole=($comboenhancement?' data-role="none"':'');
             }
 
-            $out.='<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'"'.$nodatarole.'>';
+            $out.='<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 
             $textifempty='';
             // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
@@ -4966,24 +4961,25 @@ class Form
      *  Note: Do not apply langs->trans function on returned content, content may be entity encoded twice.
      *
      *	@param	string			$htmlname       Name of html select area. Must start with "multi" if this is a multiselect
-     *	@param	array			$array          Array with key+value
+     *	@param	array			$array          Array (key => value)
      *	@param	string|string[]	$id             Preselected key or preselected keys for multiselect
      *	@param	int				$show_empty     0 no empty value allowed, 1 or string to add an empty value into list (value is '' or '&nbsp;' if 1), <0 to add an empty value with key that is this value.
-     *	@param	int				$key_in_label   1 pour afficher la key dans la valeur "[key] value"
+     *	@param	int				$key_in_label   1 to show key into label with format "[key] value"
      *	@param	int				$value_as_key   1 to use value as key
      *	@param  string			$moreparam      Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
-     *	@param  int				$translate		Translate and encode value
+     *	@param  int				$translate		1=Translate and encode value
      * 	@param	int				$maxlen			Length maximum for labels
      * 	@param	int				$disabled		Html select box is disabled
      *  @param	string			$sort			'ASC' or 'DESC' = Sort on label, '' or 'NONE' or 'POS' = Do not sort, we keep original order
      *  @param	string			$morecss		Add more class to css styles
      *  @param	int				$addjscombo		    Add js combo
-     *  @param  string          $moreparamonempty   Add more param on the empty option line. Not used if show_empty not set.
-     *  @param  int             $disablebademail    Check if an email is found into value and if not disable and colorize entry.
-     * 	@return	string							    HTML select string.
+     *  @param  string          $moreparamonempty   Add more param on the empty option line. Not used if show_empty not set
+     *  @param  int             $disablebademail    Check if an email is found into value and if not disable and colorize entry
+     *  @param  int             $nohtmlescape       No html escaping.
+     * 	@return	string							    HTML select string
      *  @see multiselectarray
      */
-    static function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $moreparam='', $translate=0, $maxlen=0, $disabled=0, $sort='', $morecss='', $addjscombo=0, $moreparamonempty='',$disablebademail=0)
+    static function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $moreparam='', $translate=0, $maxlen=0, $disabled=0, $sort='', $morecss='', $addjscombo=0, $moreparamonempty='',$disablebademail=0, $nohtmlescape=0)
     {
         global $conf, $langs;
 
@@ -5003,13 +4999,11 @@ class Form
         	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?(constant('REQUIRE_JQUERY_MULTISELECT')?constant('REQUIRE_JQUERY_MULTISELECT'):'select2'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
 
         	// Enhance with select2
-        	$nodatarole='';
         	if ($conf->use_javascript_ajax)
         	{
         	    include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
         	    $comboenhancement = ajax_combobox($htmlname);
         	    $out.=$comboenhancement;
-        	    $nodatarole=($comboenhancement?' data-role="none"':'');
         	}
         }
 
@@ -5057,11 +5051,13 @@ class Form
 
                 if ($key_in_label)
                 {
-                    $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen?dol_trunc($value,$maxlen):$value));
+                    if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen?dol_trunc($value,$maxlen):$value));
+                    else $selectOptionValue = $key.' - '.($maxlen?dol_trunc($value,$maxlen):$value);
                 }
                 else
                 {
-                    $selectOptionValue = dol_escape_htmltag($maxlen?dol_trunc($value,$maxlen):$value);
+                    if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($maxlen?dol_trunc($value,$maxlen):$value);
+                    else $selectOptionValue = $maxlen?dol_trunc($value,$maxlen):$value;
                     if ($value == '' || $value == '-') $selectOptionValue='&nbsp;';
                 }
                 //var_dump($selectOptionValue);
@@ -5976,6 +5972,7 @@ class Form
         }
         else
         {
+            // Generic case to show photos
         	$dir=$conf->$modulepart->dir_output;
         	if (! empty($object->photo))
         	{
@@ -6045,7 +6042,6 @@ class Form
                 if ($object->photo) $ret.="<br>\n";
                 $ret.='<table class="nobordernopadding centpercent">';
                 if ($object->photo) $ret.='<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
-                //$ret.='<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
                 $ret.='<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput"></td></tr>';
                 $ret.='</table>';
             }
@@ -6112,10 +6108,9 @@ class Form
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 	           	$comboenhancement = ajax_combobox($htmlname);
                 $out.= $comboenhancement;
-                $nodatarole=($comboenhancement?' data-role="none"':'');
             }
 
-            $out.= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').$nodatarole.'>';
+            $out.= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').'>';
 
         	$num = $this->db->num_rows($resql);
             $i = 0;
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 95dee1424ef..4ae2d81539d 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -1011,6 +1011,7 @@ class FormOther
         		if (! empty($boxidactivatedforuser[$box->id])) continue;	// Already visible for user
         		$label=$langs->transnoentitiesnoconv($box->boxlabel);
         		if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
+        		//$label = '<span class="fa fa-home fa-fw" aria-hidden="true"></span>'.$label;    KO with select2. No html rendering.
         		$arrayboxtoactivatelabel[$box->id]=$label;			// We keep only boxes not shown for user, to show into combo list
         	}
             foreach($boxidactivatedforuser as $boxid)
@@ -1027,7 +1028,7 @@ class FormOther
 			$selectboxlist.='<input type="hidden" name="userid" value="'.$user->id.'">';
 			$selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';
 			$selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';
-			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected');
+			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);
             if (empty($conf->use_javascript_ajax)) $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
             $selectboxlist.='</form>';
             $selectboxlist.=ajax_combobox("boxcombo");
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 68e3f079361..214704f06a2 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -377,7 +377,7 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
         		$(\''.(preg_match('/^\./',$htmlname)?$htmlname:'#'.$htmlname).'\').'.$tmpplugin.'({
         		    dir: \'ltr\',
         			width: \''.$widthTypeOfAutocomplete.'\',		/* off or resolve */
-					minimumInputLength: '.$minLengthToAutocomplete.'
+					minimumInputLength: '.$minLengthToAutocomplete.'				    
 				})';
 	if ($forcefocus) $msg.= '.select2(\'focus\')';
 	$msg.= ';'."\n";
diff --git a/htdocs/index.php b/htdocs/index.php
index b6189537546..75ee74144f2 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -77,7 +77,7 @@ if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$langs->trans("HomeAr
 
 llxHeader('',$title);
 
-
+    
 $resultboxes=FormOther::getBoxesArea($user,"0");    // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
 
 
@@ -242,7 +242,7 @@ if (empty($user->societe_id))
 	                 'order',
 	                 'bill',
 	                 'propal',
-	                 'project',
+	                 'projectpub',
 					 'trip',
 					 'generic'
 	    );
@@ -388,7 +388,6 @@ if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
     $board=new Project($db);
-
     $dashboardlines[] = $board->load_board($user);
 }
 
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 755998f7238..94c49d6d0ef 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1692,8 +1692,8 @@ class Project extends CommonObject
             $response->warning_delay = $conf->projet->warning_delay/60/60/24;
             $response->label = $langs->trans("OpenedProjects");
             if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
-            else $response->url = DOL_URL_ROOT.'/projet/list.php?mode=mine&search_status=1&mainmenu=project';
-            $response->img = img_object($langs->trans("Projects"),"project");
+            else $response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
+            $response->img = img_object($langs->trans("Projects"),"projectpub");
 
             // This assignment in condition is not a bug. It allows walking the results.
             while ($obj=$this->db->fetch_object($resql))

From a5c11dc8408884ce022e648ac7f3d4409eabdf12 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 16:02:54 +0100
Subject: [PATCH 0420/1163] NEW Add function dolMd2Html

---
 COPYRIGHT                                  |    1 +
 htdocs/admin/modulehelp.php                |   68 +-
 htdocs/core/lib/parsemd.lib.php            |   46 +
 htdocs/core/modules/modFacture.class.php   |    2 +-
 htdocs/includes/parsedown/.travis.yml      |   16 +
 htdocs/includes/parsedown/LICENSE.txt      |   20 +
 htdocs/includes/parsedown/Parsedown.php    | 1548 ++++++++++++++++++++
 htdocs/includes/parsedown/README.md        |   56 +
 htdocs/includes/parsedown/composer.json    |   21 +
 htdocs/includes/parsedown/phpunit.xml.dist |    8 +
 htdocs/langs/en_US/admin.lang              |    1 +
 11 files changed, 1762 insertions(+), 25 deletions(-)
 create mode 100644 htdocs/core/lib/parsemd.lib.php
 create mode 100644 htdocs/includes/parsedown/.travis.yml
 create mode 100644 htdocs/includes/parsedown/LICENSE.txt
 create mode 100644 htdocs/includes/parsedown/Parsedown.php
 create mode 100644 htdocs/includes/parsedown/README.md
 create mode 100644 htdocs/includes/parsedown/composer.json
 create mode 100644 htdocs/includes/parsedown/phpunit.xml.dist

diff --git a/COPYRIGHT b/COPYRIGHT
index f55772c0d9f..6f8a595897d 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -22,6 +22,7 @@ Mobiledetect           2.8.17        MIT License                 Yes
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
 odtPHP                 1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
+ParseDown              1.6           MIT License                 Yes             Markdown parser
 PHPExcel               1.8.1         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 9ff7a4478ff..e76627c2965 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -239,7 +239,7 @@ $head[$h][2] = 'desc';
 $h++;
 
 $head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$id.'&mode=feature';
-$head[$h][1] = $langs->trans("Features");
+$head[$h][1] = $langs->trans("TechnicalServicesProvided");
 $head[$h][2] = 'feature';
 $h++;
 
@@ -251,45 +251,38 @@ foreach($orders as $tmpkey => $tmpvalue)
     if ($objMod->numero == $id)
     {
         $key = $i;
+        $modName = $filename[$tmpkey];
+        $dirofmodule = $dirmod[$tmpkey];
         break;
     }
     $i++;
 }
 $value = $orders[$key];
+$special = $objMod->special;
+$tab=explode('_',$value);
+$familyposition=$tab[0]; $familykey=$tab[1]; $module_position=$tab[2]; $numero=$tab[3];
+
+// Check filters
+$modulename=$objMod->getName();
+$moduledesc=$objMod->getDesc();
+$moduleauthor=$objMod->getPublisher();
+
 
 
 print '<div class="centpercent">';
 
-
-print load_fiche_titre($objMod->getDesc(),$moreinfo,'object_'.$objMod->picto);
+print load_fiche_titre(($modulename?$modulename:$moduledesc), $moreinfo, 'object_'.$objMod->picto);
 print '<br>';
 
-dol_fiche_head($head, $mode, $title);
+dol_fiche_head($head, $mode, $title, -1);
 
-
-
-$tab=explode('_',$value);
-$familyposition=$tab[0]; $familykey=$tab[1]; $module_position=$tab[2]; $numero=$tab[3];
-
-$modName = $filename[$key];
-$objMod  = $modules[$key];
-$dirofmodule = $dirmod[$key];
-
-$special = $objMod->special;
-
-if (! $objMod->getName())
+if (! $modulename)
 {
 	dol_syslog("Error for module ".$key." - Property name of module looks empty", LOG_WARNING);
 }
 
 $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
 
-// Check filters
-$modulename=$objMod->getName();
-$moduledesc=$objMod->getDesc();
-$moduledesclong=$objMod->getDescLong();
-$moduleauthor=$objMod->getPublisher();
-
 // Load all lang files of module
 if (isset($objMod->langfiles) && is_array($objMod->langfiles))
 {
@@ -322,6 +315,8 @@ $text='';
    
 if ($mode == 'desc')
 {
+    if ($moduledesc) $text.=$moduledesc.'<br><br>';
+    
     $text.='<strong>'.$langs->trans("Version").':</strong> '.$version;
     
     $textexternal='';
@@ -329,7 +324,7 @@ if ($mode == 'desc')
     {
         $textexternal.='<br><strong>'.$langs->trans("Origin").':</strong> '.$langs->trans("ExternalModule",$dirofmodule);
         if ($objMod->editor_name != 'dolibarr') $textexternal.='<br><strong>'.$langs->trans("Publisher").':</strong> '.(empty($objMod->editor_name)?$langs->trans("Unknown"):$objMod->editor_name);
-        if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i',$objMod->editor_url)) $textexternal.='<br><strong>'.$langs->trans("Url").':</strong> '.$objMod->editor_url;
+        if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i',$objMod->editor_url)) $textexternal.='<br><strong>'.$langs->trans("Url").':</strong> <a href="'.$objMod->editor_url.'" target="_blank">'.$objMod->editor_url.'</a>';
         $text.=$textexternal;
         $text.='<br>';
     }
@@ -342,7 +337,8 @@ if ($mode == 'desc')
     else $text.=$langs->trans("Disabled");
     $text.='<br>';
 
-    if ($objMod->getDescLong()) $text.=$objMod->getDesc().'<br>';
+    $moduledesclong=$objMod->getDescLong();
+    if ($moduledesclong) $text.='<br><hr><br>'.$moduledesclong.'<br>';
 }
 
 if ($mode == 'feature')
@@ -360,6 +356,8 @@ if ($mode == 'feature')
     }
     else $text.=$langs->trans("No");
     
+    $text.='<br>';
+    
     $text.='<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
     if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
     {
@@ -372,6 +370,8 @@ if ($mode == 'feature')
     }
     else $text.=$langs->trans("No");
     
+    $text.='<br>';
+    
     $text.='<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
     if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
     {
@@ -384,6 +384,8 @@ if ($mode == 'feature')
     }
     else $text.=$langs->trans("No");
     
+    $text.='<br>';
+    
     $text.='<br><strong>'.$langs->trans("AddModels").':</strong> ';
     if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
     {
@@ -391,6 +393,8 @@ if ($mode == 'feature')
     }
     else $text.=$langs->trans("No");
     
+    $text.='<br>';
+    
     $text.='<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
     if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
     {
@@ -398,6 +402,8 @@ if ($mode == 'feature')
     }
     else $text.=$langs->trans("No");
     
+    $text.='<br>';
+    
     $text.='<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
     if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
     {
@@ -410,6 +416,8 @@ if ($mode == 'feature')
     }
     else $text.=$langs->trans("No");
     
+    $text.='<br>';
+    
     $text.='<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
     if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
     {
@@ -417,6 +425,8 @@ if ($mode == 'feature')
     }
     else $text.=$langs->trans("No");
     
+    $text.='<br>';
+    
     $text.='<br><strong>'.$langs->trans("AddHooks").':</strong> ';
     if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
     {
@@ -429,6 +439,8 @@ if ($mode == 'feature')
     }
     else $text.=$langs->trans("No");
     
+    $text.='<br>';
+    
     $text.='<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
     if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
     {
@@ -441,6 +453,8 @@ if ($mode == 'feature')
     }
     else $text.=$langs->trans("No");
     
+    $text.='<br>';
+    
     $text.='<br><strong>'.$langs->trans("AddMenus").':</strong> ';
     if (isset($objMod->menu) && ! empty($objMod->menu)) // objMod can be an array or just an int 1
     {
@@ -448,6 +462,8 @@ if ($mode == 'feature')
     }
     else $text.=$langs->trans("No");
     
+    $text.='<br>';
+    
     $text.='<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
     if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
     {
@@ -460,6 +476,8 @@ if ($mode == 'feature')
     }
     else $text.=$langs->trans("No");
     
+    $text.='<br>';
+    
     $text.='<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
     if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
     {
@@ -472,6 +490,8 @@ if ($mode == 'feature')
     }
     else $text.=$langs->trans("No");
     
+    $text.='<br>';
+    
     $text.='<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
     $text.=$langs->trans("DetectionNotPossible");
 }
diff --git a/htdocs/core/lib/parsemd.lib.php b/htdocs/core/lib/parsemd.lib.php
new file mode 100644
index 00000000000..17e64f6543e
--- /dev/null
+++ b/htdocs/core/lib/parsemd.lib.php
@@ -0,0 +1,46 @@
+<?php
+/* Copyright (C) 2008-2013	Laurent Destailleur			<eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *	\file			htdocs/core/lib/parsemd.lib.php
+ *	\brief			This file contains functions dedicated to MD parsind.
+ */
+
+/**
+ * Function to parse MD content into HTML
+ *
+ * @param	string	  $content			MD content
+ * @param   string    $parser           'parsedown' or 'nl2br'
+ * @return	string                      Parsed content
+ */
+function dolMd2Html($content, $parser='parsedown')
+{
+    if ($parser == 'parsedown')
+    {
+        include DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
+        $Parsedown = new Parsedown();
+        $content = $Parsedown->text($content);
+    }
+    else
+    {
+        $content = nl2br($content);
+    }
+
+    return $content;
+}
+
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index a88082ba6fc..d6e6bfd2575 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -69,7 +69,7 @@ class modFacture extends DolibarrModules
 		$this->conflictwith = array();
 		$this->langfiles = array("bills","companies","compta","products");
 		$this->warnings_activation = array();                                                             // Warning to show when we activate module. array('always'='text') or array('FR'='text')
-		$this->warnings_activation_ext = array('CA'=>'WarningInstallationMayBecomeNotCompliantWithLaw');  // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
+		$this->warnings_activation_ext = array('FR'=>'WarningInstallationMayBecomeNotCompliantWithLaw');  // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
 		
 		// Config pages
 		$this->config_page_url = array("facture.php");
diff --git a/htdocs/includes/parsedown/.travis.yml b/htdocs/includes/parsedown/.travis.yml
new file mode 100644
index 00000000000..fa5ca981cc9
--- /dev/null
+++ b/htdocs/includes/parsedown/.travis.yml
@@ -0,0 +1,16 @@
+language: php
+
+php:
+  - 7.1
+  - 7.0
+  - 5.6
+  - 5.5
+  - 5.4
+  - 5.3
+  - hhvm
+  - hhvm-nightly
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - php: hhvm-nightly
diff --git a/htdocs/includes/parsedown/LICENSE.txt b/htdocs/includes/parsedown/LICENSE.txt
new file mode 100644
index 00000000000..baca86f5b8e
--- /dev/null
+++ b/htdocs/includes/parsedown/LICENSE.txt
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Emanuil Rusev, erusev.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/htdocs/includes/parsedown/Parsedown.php b/htdocs/includes/parsedown/Parsedown.php
new file mode 100644
index 00000000000..20863a7537a
--- /dev/null
+++ b/htdocs/includes/parsedown/Parsedown.php
@@ -0,0 +1,1548 @@
+<?php
+
+#
+#
+# Parsedown
+# http://parsedown.org
+#
+# (c) Emanuil Rusev
+# http://erusev.com
+#
+# For the full license information, view the LICENSE file that was distributed
+# with this source code.
+#
+#
+
+class Parsedown
+{
+    # ~
+
+    const version = '1.6.0';
+
+    # ~
+
+    function text($text)
+    {
+        # make sure no definitions are set
+        $this->DefinitionData = array();
+
+        # standardize line breaks
+        $text = str_replace(array("\r\n", "\r"), "\n", $text);
+
+        # remove surrounding line breaks
+        $text = trim($text, "\n");
+
+        # split text into lines
+        $lines = explode("\n", $text);
+
+        # iterate through lines to identify blocks
+        $markup = $this->lines($lines);
+
+        # trim line breaks
+        $markup = trim($markup, "\n");
+
+        return $markup;
+    }
+
+    #
+    # Setters
+    #
+
+    function setBreaksEnabled($breaksEnabled)
+    {
+        $this->breaksEnabled = $breaksEnabled;
+
+        return $this;
+    }
+
+    protected $breaksEnabled;
+
+    function setMarkupEscaped($markupEscaped)
+    {
+        $this->markupEscaped = $markupEscaped;
+
+        return $this;
+    }
+
+    protected $markupEscaped;
+
+    function setUrlsLinked($urlsLinked)
+    {
+        $this->urlsLinked = $urlsLinked;
+
+        return $this;
+    }
+
+    protected $urlsLinked = true;
+
+    #
+    # Lines
+    #
+
+    protected $BlockTypes = array(
+        '#' => array('Header'),
+        '*' => array('Rule', 'List'),
+        '+' => array('List'),
+        '-' => array('SetextHeader', 'Table', 'Rule', 'List'),
+        '0' => array('List'),
+        '1' => array('List'),
+        '2' => array('List'),
+        '3' => array('List'),
+        '4' => array('List'),
+        '5' => array('List'),
+        '6' => array('List'),
+        '7' => array('List'),
+        '8' => array('List'),
+        '9' => array('List'),
+        ':' => array('Table'),
+        '<' => array('Comment', 'Markup'),
+        '=' => array('SetextHeader'),
+        '>' => array('Quote'),
+        '[' => array('Reference'),
+        '_' => array('Rule'),
+        '`' => array('FencedCode'),
+        '|' => array('Table'),
+        '~' => array('FencedCode'),
+    );
+
+    # ~
+
+    protected $unmarkedBlockTypes = array(
+        'Code',
+    );
+
+    #
+    # Blocks
+    #
+
+    protected function lines(array $lines)
+    {
+        $CurrentBlock = null;
+
+        foreach ($lines as $line)
+        {
+            if (chop($line) === '')
+            {
+                if (isset($CurrentBlock))
+                {
+                    $CurrentBlock['interrupted'] = true;
+                }
+
+                continue;
+            }
+
+            if (strpos($line, "\t") !== false)
+            {
+                $parts = explode("\t", $line);
+
+                $line = $parts[0];
+
+                unset($parts[0]);
+
+                foreach ($parts as $part)
+                {
+                    $shortage = 4 - mb_strlen($line, 'utf-8') % 4;
+
+                    $line .= str_repeat(' ', $shortage);
+                    $line .= $part;
+                }
+            }
+
+            $indent = 0;
+
+            while (isset($line[$indent]) and $line[$indent] === ' ')
+            {
+                $indent ++;
+            }
+
+            $text = $indent > 0 ? substr($line, $indent) : $line;
+
+            # ~
+
+            $Line = array('body' => $line, 'indent' => $indent, 'text' => $text);
+
+            # ~
+
+            if (isset($CurrentBlock['continuable']))
+            {
+                $Block = $this->{'block'.$CurrentBlock['type'].'Continue'}($Line, $CurrentBlock);
+
+                if (isset($Block))
+                {
+                    $CurrentBlock = $Block;
+
+                    continue;
+                }
+                else
+                {
+                    if ($this->isBlockCompletable($CurrentBlock['type']))
+                    {
+                        $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
+                    }
+                }
+            }
+
+            # ~
+
+            $marker = $text[0];
+
+            # ~
+
+            $blockTypes = $this->unmarkedBlockTypes;
+
+            if (isset($this->BlockTypes[$marker]))
+            {
+                foreach ($this->BlockTypes[$marker] as $blockType)
+                {
+                    $blockTypes []= $blockType;
+                }
+            }
+
+            #
+            # ~
+
+            foreach ($blockTypes as $blockType)
+            {
+                $Block = $this->{'block'.$blockType}($Line, $CurrentBlock);
+
+                if (isset($Block))
+                {
+                    $Block['type'] = $blockType;
+
+                    if ( ! isset($Block['identified']))
+                    {
+                        $Blocks []= $CurrentBlock;
+
+                        $Block['identified'] = true;
+                    }
+
+                    if ($this->isBlockContinuable($blockType))
+                    {
+                        $Block['continuable'] = true;
+                    }
+
+                    $CurrentBlock = $Block;
+
+                    continue 2;
+                }
+            }
+
+            # ~
+
+            if (isset($CurrentBlock) and ! isset($CurrentBlock['type']) and ! isset($CurrentBlock['interrupted']))
+            {
+                $CurrentBlock['element']['text'] .= "\n".$text;
+            }
+            else
+            {
+                $Blocks []= $CurrentBlock;
+
+                $CurrentBlock = $this->paragraph($Line);
+
+                $CurrentBlock['identified'] = true;
+            }
+        }
+
+        # ~
+
+        if (isset($CurrentBlock['continuable']) and $this->isBlockCompletable($CurrentBlock['type']))
+        {
+            $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
+        }
+
+        # ~
+
+        $Blocks []= $CurrentBlock;
+
+        unset($Blocks[0]);
+
+        # ~
+
+        $markup = '';
+
+        foreach ($Blocks as $Block)
+        {
+            if (isset($Block['hidden']))
+            {
+                continue;
+            }
+
+            $markup .= "\n";
+            $markup .= isset($Block['markup']) ? $Block['markup'] : $this->element($Block['element']);
+        }
+
+        $markup .= "\n";
+
+        # ~
+
+        return $markup;
+    }
+
+    protected function isBlockContinuable($Type)
+    {
+        return method_exists($this, 'block'.$Type.'Continue');
+    }
+
+    protected function isBlockCompletable($Type)
+    {
+        return method_exists($this, 'block'.$Type.'Complete');
+    }
+
+    #
+    # Code
+
+    protected function blockCode($Line, $Block = null)
+    {
+        if (isset($Block) and ! isset($Block['type']) and ! isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if ($Line['indent'] >= 4)
+        {
+            $text = substr($Line['body'], 4);
+
+            $Block = array(
+                'element' => array(
+                    'name' => 'pre',
+                    'handler' => 'element',
+                    'text' => array(
+                        'name' => 'code',
+                        'text' => $text,
+                    ),
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockCodeContinue($Line, $Block)
+    {
+        if ($Line['indent'] >= 4)
+        {
+            if (isset($Block['interrupted']))
+            {
+                $Block['element']['text']['text'] .= "\n";
+
+                unset($Block['interrupted']);
+            }
+
+            $Block['element']['text']['text'] .= "\n";
+
+            $text = substr($Line['body'], 4);
+
+            $Block['element']['text']['text'] .= $text;
+
+            return $Block;
+        }
+    }
+
+    protected function blockCodeComplete($Block)
+    {
+        $text = $Block['element']['text']['text'];
+
+        $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
+
+        $Block['element']['text']['text'] = $text;
+
+        return $Block;
+    }
+
+    #
+    # Comment
+
+    protected function blockComment($Line)
+    {
+        if ($this->markupEscaped)
+        {
+            return;
+        }
+
+        if (isset($Line['text'][3]) and $Line['text'][3] === '-' and $Line['text'][2] === '-' and $Line['text'][1] === '!')
+        {
+            $Block = array(
+                'markup' => $Line['body'],
+            );
+
+            if (preg_match('/-->$/', $Line['text']))
+            {
+                $Block['closed'] = true;
+            }
+
+            return $Block;
+        }
+    }
+
+    protected function blockCommentContinue($Line, array $Block)
+    {
+        if (isset($Block['closed']))
+        {
+            return;
+        }
+
+        $Block['markup'] .= "\n" . $Line['body'];
+
+        if (preg_match('/-->$/', $Line['text']))
+        {
+            $Block['closed'] = true;
+        }
+
+        return $Block;
+    }
+
+    #
+    # Fenced Code
+
+    protected function blockFencedCode($Line)
+    {
+        if (preg_match('/^['.$Line['text'][0].']{3,}[ ]*([\w-]+)?[ ]*$/', $Line['text'], $matches))
+        {
+            $Element = array(
+                'name' => 'code',
+                'text' => '',
+            );
+
+            if (isset($matches[1]))
+            {
+                $class = 'language-'.$matches[1];
+
+                $Element['attributes'] = array(
+                    'class' => $class,
+                );
+            }
+
+            $Block = array(
+                'char' => $Line['text'][0],
+                'element' => array(
+                    'name' => 'pre',
+                    'handler' => 'element',
+                    'text' => $Element,
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockFencedCodeContinue($Line, $Block)
+    {
+        if (isset($Block['complete']))
+        {
+            return;
+        }
+
+        if (isset($Block['interrupted']))
+        {
+            $Block['element']['text']['text'] .= "\n";
+
+            unset($Block['interrupted']);
+        }
+
+        if (preg_match('/^'.$Block['char'].'{3,}[ ]*$/', $Line['text']))
+        {
+            $Block['element']['text']['text'] = substr($Block['element']['text']['text'], 1);
+
+            $Block['complete'] = true;
+
+            return $Block;
+        }
+
+        $Block['element']['text']['text'] .= "\n".$Line['body'];
+
+        return $Block;
+    }
+
+    protected function blockFencedCodeComplete($Block)
+    {
+        $text = $Block['element']['text']['text'];
+
+        $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
+
+        $Block['element']['text']['text'] = $text;
+
+        return $Block;
+    }
+
+    #
+    # Header
+
+    protected function blockHeader($Line)
+    {
+        if (isset($Line['text'][1]))
+        {
+            $level = 1;
+
+            while (isset($Line['text'][$level]) and $Line['text'][$level] === '#')
+            {
+                $level ++;
+            }
+
+            if ($level > 6)
+            {
+                return;
+            }
+
+            $text = trim($Line['text'], '# ');
+
+            $Block = array(
+                'element' => array(
+                    'name' => 'h' . min(6, $level),
+                    'text' => $text,
+                    'handler' => 'line',
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    #
+    # List
+
+    protected function blockList($Line)
+    {
+        list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]+[.]');
+
+        if (preg_match('/^('.$pattern.'[ ]+)(.*)/', $Line['text'], $matches))
+        {
+            $Block = array(
+                'indent' => $Line['indent'],
+                'pattern' => $pattern,
+                'element' => array(
+                    'name' => $name,
+                    'handler' => 'elements',
+                ),
+            );
+
+            if($name === 'ol') 
+            {
+                $listStart = stristr($matches[0], '.', true);
+                
+                if($listStart !== '1')
+                {
+                    $Block['element']['attributes'] = array('start' => $listStart);
+                }
+            }
+
+            $Block['li'] = array(
+                'name' => 'li',
+                'handler' => 'li',
+                'text' => array(
+                    $matches[2],
+                ),
+            );
+
+            $Block['element']['text'] []= & $Block['li'];
+
+            return $Block;
+        }
+    }
+
+    protected function blockListContinue($Line, array $Block)
+    {
+        if ($Block['indent'] === $Line['indent'] and preg_match('/^'.$Block['pattern'].'(?:[ ]+(.*)|$)/', $Line['text'], $matches))
+        {
+            if (isset($Block['interrupted']))
+            {
+                $Block['li']['text'] []= '';
+
+                unset($Block['interrupted']);
+            }
+
+            unset($Block['li']);
+
+            $text = isset($matches[1]) ? $matches[1] : '';
+
+            $Block['li'] = array(
+                'name' => 'li',
+                'handler' => 'li',
+                'text' => array(
+                    $text,
+                ),
+            );
+
+            $Block['element']['text'] []= & $Block['li'];
+
+            return $Block;
+        }
+
+        if ($Line['text'][0] === '[' and $this->blockReference($Line))
+        {
+            return $Block;
+        }
+
+        if ( ! isset($Block['interrupted']))
+        {
+            $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
+
+            $Block['li']['text'] []= $text;
+
+            return $Block;
+        }
+
+        if ($Line['indent'] > 0)
+        {
+            $Block['li']['text'] []= '';
+
+            $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
+
+            $Block['li']['text'] []= $text;
+
+            unset($Block['interrupted']);
+
+            return $Block;
+        }
+    }
+
+    #
+    # Quote
+
+    protected function blockQuote($Line)
+    {
+        if (preg_match('/^>[ ]?(.*)/', $Line['text'], $matches))
+        {
+            $Block = array(
+                'element' => array(
+                    'name' => 'blockquote',
+                    'handler' => 'lines',
+                    'text' => (array) $matches[1],
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockQuoteContinue($Line, array $Block)
+    {
+        if ($Line['text'][0] === '>' and preg_match('/^>[ ]?(.*)/', $Line['text'], $matches))
+        {
+            if (isset($Block['interrupted']))
+            {
+                $Block['element']['text'] []= '';
+
+                unset($Block['interrupted']);
+            }
+
+            $Block['element']['text'] []= $matches[1];
+
+            return $Block;
+        }
+
+        if ( ! isset($Block['interrupted']))
+        {
+            $Block['element']['text'] []= $Line['text'];
+
+            return $Block;
+        }
+    }
+
+    #
+    # Rule
+
+    protected function blockRule($Line)
+    {
+        if (preg_match('/^(['.$Line['text'][0].'])([ ]*\1){2,}[ ]*$/', $Line['text']))
+        {
+            $Block = array(
+                'element' => array(
+                    'name' => 'hr'
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    #
+    # Setext
+
+    protected function blockSetextHeader($Line, array $Block = null)
+    {
+        if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if (chop($Line['text'], $Line['text'][0]) === '')
+        {
+            $Block['element']['name'] = $Line['text'][0] === '=' ? 'h1' : 'h2';
+
+            return $Block;
+        }
+    }
+
+    #
+    # Markup
+
+    protected function blockMarkup($Line)
+    {
+        if ($this->markupEscaped)
+        {
+            return;
+        }
+
+        if (preg_match('/^<(\w*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches))
+        {
+            $element = strtolower($matches[1]);
+
+            if (in_array($element, $this->textLevelElements))
+            {
+                return;
+            }
+
+            $Block = array(
+                'name' => $matches[1],
+                'depth' => 0,
+                'markup' => $Line['text'],
+            );
+
+            $length = strlen($matches[0]);
+
+            $remainder = substr($Line['text'], $length);
+
+            if (trim($remainder) === '')
+            {
+                if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
+                {
+                    $Block['closed'] = true;
+
+                    $Block['void'] = true;
+                }
+            }
+            else
+            {
+                if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
+                {
+                    return;
+                }
+
+                if (preg_match('/<\/'.$matches[1].'>[ ]*$/i', $remainder))
+                {
+                    $Block['closed'] = true;
+                }
+            }
+
+            return $Block;
+        }
+    }
+
+    protected function blockMarkupContinue($Line, array $Block)
+    {
+        if (isset($Block['closed']))
+        {
+            return;
+        }
+
+        if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) # open
+        {
+            $Block['depth'] ++;
+        }
+
+        if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close
+        {
+            if ($Block['depth'] > 0)
+            {
+                $Block['depth'] --;
+            }
+            else
+            {
+                $Block['closed'] = true;
+            }
+        }
+
+        if (isset($Block['interrupted']))
+        {
+            $Block['markup'] .= "\n";
+
+            unset($Block['interrupted']);
+        }
+
+        $Block['markup'] .= "\n".$Line['body'];
+
+        return $Block;
+    }
+
+    #
+    # Reference
+
+    protected function blockReference($Line)
+    {
+        if (preg_match('/^\[(.+?)\]:[ ]*<?(\S+?)>?(?:[ ]+["\'(](.+)["\')])?[ ]*$/', $Line['text'], $matches))
+        {
+            $id = strtolower($matches[1]);
+
+            $Data = array(
+                'url' => $matches[2],
+                'title' => null,
+            );
+
+            if (isset($matches[3]))
+            {
+                $Data['title'] = $matches[3];
+            }
+
+            $this->DefinitionData['Reference'][$id] = $Data;
+
+            $Block = array(
+                'hidden' => true,
+            );
+
+            return $Block;
+        }
+    }
+
+    #
+    # Table
+
+    protected function blockTable($Line, array $Block = null)
+    {
+        if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if (strpos($Block['element']['text'], '|') !== false and chop($Line['text'], ' -:|') === '')
+        {
+            $alignments = array();
+
+            $divider = $Line['text'];
+
+            $divider = trim($divider);
+            $divider = trim($divider, '|');
+
+            $dividerCells = explode('|', $divider);
+
+            foreach ($dividerCells as $dividerCell)
+            {
+                $dividerCell = trim($dividerCell);
+
+                if ($dividerCell === '')
+                {
+                    continue;
+                }
+
+                $alignment = null;
+
+                if ($dividerCell[0] === ':')
+                {
+                    $alignment = 'left';
+                }
+
+                if (substr($dividerCell, - 1) === ':')
+                {
+                    $alignment = $alignment === 'left' ? 'center' : 'right';
+                }
+
+                $alignments []= $alignment;
+            }
+
+            # ~
+
+            $HeaderElements = array();
+
+            $header = $Block['element']['text'];
+
+            $header = trim($header);
+            $header = trim($header, '|');
+
+            $headerCells = explode('|', $header);
+
+            foreach ($headerCells as $index => $headerCell)
+            {
+                $headerCell = trim($headerCell);
+
+                $HeaderElement = array(
+                    'name' => 'th',
+                    'text' => $headerCell,
+                    'handler' => 'line',
+                );
+
+                if (isset($alignments[$index]))
+                {
+                    $alignment = $alignments[$index];
+
+                    $HeaderElement['attributes'] = array(
+                        'style' => 'text-align: '.$alignment.';',
+                    );
+                }
+
+                $HeaderElements []= $HeaderElement;
+            }
+
+            # ~
+
+            $Block = array(
+                'alignments' => $alignments,
+                'identified' => true,
+                'element' => array(
+                    'name' => 'table',
+                    'handler' => 'elements',
+                ),
+            );
+
+            $Block['element']['text'] []= array(
+                'name' => 'thead',
+                'handler' => 'elements',
+            );
+
+            $Block['element']['text'] []= array(
+                'name' => 'tbody',
+                'handler' => 'elements',
+                'text' => array(),
+            );
+
+            $Block['element']['text'][0]['text'] []= array(
+                'name' => 'tr',
+                'handler' => 'elements',
+                'text' => $HeaderElements,
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockTableContinue($Line, array $Block)
+    {
+        if (isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if ($Line['text'][0] === '|' or strpos($Line['text'], '|'))
+        {
+            $Elements = array();
+
+            $row = $Line['text'];
+
+            $row = trim($row);
+            $row = trim($row, '|');
+
+            preg_match_all('/(?:(\\\\[|])|[^|`]|`[^`]+`|`)+/', $row, $matches);
+
+            foreach ($matches[0] as $index => $cell)
+            {
+                $cell = trim($cell);
+
+                $Element = array(
+                    'name' => 'td',
+                    'handler' => 'line',
+                    'text' => $cell,
+                );
+
+                if (isset($Block['alignments'][$index]))
+                {
+                    $Element['attributes'] = array(
+                        'style' => 'text-align: '.$Block['alignments'][$index].';',
+                    );
+                }
+
+                $Elements []= $Element;
+            }
+
+            $Element = array(
+                'name' => 'tr',
+                'handler' => 'elements',
+                'text' => $Elements,
+            );
+
+            $Block['element']['text'][1]['text'] []= $Element;
+
+            return $Block;
+        }
+    }
+
+    #
+    # ~
+    #
+
+    protected function paragraph($Line)
+    {
+        $Block = array(
+            'element' => array(
+                'name' => 'p',
+                'text' => $Line['text'],
+                'handler' => 'line',
+            ),
+        );
+
+        return $Block;
+    }
+
+    #
+    # Inline Elements
+    #
+
+    protected $InlineTypes = array(
+        '"' => array('SpecialCharacter'),
+        '!' => array('Image'),
+        '&' => array('SpecialCharacter'),
+        '*' => array('Emphasis'),
+        ':' => array('Url'),
+        '<' => array('UrlTag', 'EmailTag', 'Markup', 'SpecialCharacter'),
+        '>' => array('SpecialCharacter'),
+        '[' => array('Link'),
+        '_' => array('Emphasis'),
+        '`' => array('Code'),
+        '~' => array('Strikethrough'),
+        '\\' => array('EscapeSequence'),
+    );
+
+    # ~
+
+    protected $inlineMarkerList = '!"*_&[:<>`~\\';
+
+    #
+    # ~
+    #
+
+    public function line($text)
+    {
+        $markup = '';
+
+        # $excerpt is based on the first occurrence of a marker
+
+        while ($excerpt = strpbrk($text, $this->inlineMarkerList))
+        {
+            $marker = $excerpt[0];
+
+            $markerPosition = strpos($text, $marker);
+
+            $Excerpt = array('text' => $excerpt, 'context' => $text);
+
+            foreach ($this->InlineTypes[$marker] as $inlineType)
+            {
+                $Inline = $this->{'inline'.$inlineType}($Excerpt);
+
+                if ( ! isset($Inline))
+                {
+                    continue;
+                }
+
+                # makes sure that the inline belongs to "our" marker
+
+                if (isset($Inline['position']) and $Inline['position'] > $markerPosition)
+                {
+                    continue;
+                }
+
+                # sets a default inline position
+
+                if ( ! isset($Inline['position']))
+                {
+                    $Inline['position'] = $markerPosition;
+                }
+
+                # the text that comes before the inline
+                $unmarkedText = substr($text, 0, $Inline['position']);
+
+                # compile the unmarked text
+                $markup .= $this->unmarkedText($unmarkedText);
+
+                # compile the inline
+                $markup .= isset($Inline['markup']) ? $Inline['markup'] : $this->element($Inline['element']);
+
+                # remove the examined text
+                $text = substr($text, $Inline['position'] + $Inline['extent']);
+
+                continue 2;
+            }
+
+            # the marker does not belong to an inline
+
+            $unmarkedText = substr($text, 0, $markerPosition + 1);
+
+            $markup .= $this->unmarkedText($unmarkedText);
+
+            $text = substr($text, $markerPosition + 1);
+        }
+
+        $markup .= $this->unmarkedText($text);
+
+        return $markup;
+    }
+
+    #
+    # ~
+    #
+
+    protected function inlineCode($Excerpt)
+    {
+        $marker = $Excerpt['text'][0];
+
+        if (preg_match('/^('.$marker.'+)[ ]*(.+?)[ ]*(?<!'.$marker.')\1(?!'.$marker.')/s', $Excerpt['text'], $matches))
+        {
+            $text = $matches[2];
+            $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
+            $text = preg_replace("/[ ]*\n/", ' ', $text);
+
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'code',
+                    'text' => $text,
+                ),
+            );
+        }
+    }
+
+    protected function inlineEmailTag($Excerpt)
+    {
+        if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<((mailto:)?\S+?@\S+?)>/i', $Excerpt['text'], $matches))
+        {
+            $url = $matches[1];
+
+            if ( ! isset($matches[2]))
+            {
+                $url = 'mailto:' . $url;
+            }
+
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'a',
+                    'text' => $matches[1],
+                    'attributes' => array(
+                        'href' => $url,
+                    ),
+                ),
+            );
+        }
+    }
+
+    protected function inlineEmphasis($Excerpt)
+    {
+        if ( ! isset($Excerpt['text'][1]))
+        {
+            return;
+        }
+
+        $marker = $Excerpt['text'][0];
+
+        if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
+        {
+            $emphasis = 'strong';
+        }
+        elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
+        {
+            $emphasis = 'em';
+        }
+        else
+        {
+            return;
+        }
+
+        return array(
+            'extent' => strlen($matches[0]),
+            'element' => array(
+                'name' => $emphasis,
+                'handler' => 'line',
+                'text' => $matches[1],
+            ),
+        );
+    }
+
+    protected function inlineEscapeSequence($Excerpt)
+    {
+        if (isset($Excerpt['text'][1]) and in_array($Excerpt['text'][1], $this->specialCharacters))
+        {
+            return array(
+                'markup' => $Excerpt['text'][1],
+                'extent' => 2,
+            );
+        }
+    }
+
+    protected function inlineImage($Excerpt)
+    {
+        if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
+        {
+            return;
+        }
+
+        $Excerpt['text']= substr($Excerpt['text'], 1);
+
+        $Link = $this->inlineLink($Excerpt);
+
+        if ($Link === null)
+        {
+            return;
+        }
+
+        $Inline = array(
+            'extent' => $Link['extent'] + 1,
+            'element' => array(
+                'name' => 'img',
+                'attributes' => array(
+                    'src' => $Link['element']['attributes']['href'],
+                    'alt' => $Link['element']['text'],
+                ),
+            ),
+        );
+
+        $Inline['element']['attributes'] += $Link['element']['attributes'];
+
+        unset($Inline['element']['attributes']['href']);
+
+        return $Inline;
+    }
+
+    protected function inlineLink($Excerpt)
+    {
+        $Element = array(
+            'name' => 'a',
+            'handler' => 'line',
+            'text' => null,
+            'attributes' => array(
+                'href' => null,
+                'title' => null,
+            ),
+        );
+
+        $extent = 0;
+
+        $remainder = $Excerpt['text'];
+
+        if (preg_match('/\[((?:[^][]++|(?R))*+)\]/', $remainder, $matches))
+        {
+            $Element['text'] = $matches[1];
+
+            $extent += strlen($matches[0]);
+
+            $remainder = substr($remainder, $extent);
+        }
+        else
+        {
+            return;
+        }
+
+        if (preg_match('/^[(]\s*+((?:[^ ()]++|[(][^ )]+[)])++)(?:[ ]+("[^"]*"|\'[^\']*\'))?\s*[)]/', $remainder, $matches))
+        {
+            $Element['attributes']['href'] = $matches[1];
+
+            if (isset($matches[2]))
+            {
+                $Element['attributes']['title'] = substr($matches[2], 1, - 1);
+            }
+
+            $extent += strlen($matches[0]);
+        }
+        else
+        {
+            if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches))
+            {
+                $definition = strlen($matches[1]) ? $matches[1] : $Element['text'];
+                $definition = strtolower($definition);
+
+                $extent += strlen($matches[0]);
+            }
+            else
+            {
+                $definition = strtolower($Element['text']);
+            }
+
+            if ( ! isset($this->DefinitionData['Reference'][$definition]))
+            {
+                return;
+            }
+
+            $Definition = $this->DefinitionData['Reference'][$definition];
+
+            $Element['attributes']['href'] = $Definition['url'];
+            $Element['attributes']['title'] = $Definition['title'];
+        }
+
+        $Element['attributes']['href'] = str_replace(array('&', '<'), array('&amp;', '&lt;'), $Element['attributes']['href']);
+
+        return array(
+            'extent' => $extent,
+            'element' => $Element,
+        );
+    }
+
+    protected function inlineMarkup($Excerpt)
+    {
+        if ($this->markupEscaped or strpos($Excerpt['text'], '>') === false)
+        {
+            return;
+        }
+
+        if ($Excerpt['text'][1] === '/' and preg_match('/^<\/\w*[ ]*>/s', $Excerpt['text'], $matches))
+        {
+            return array(
+                'markup' => $matches[0],
+                'extent' => strlen($matches[0]),
+            );
+        }
+
+        if ($Excerpt['text'][1] === '!' and preg_match('/^<!---?[^>-](?:-?[^-])*-->/s', $Excerpt['text'], $matches))
+        {
+            return array(
+                'markup' => $matches[0],
+                'extent' => strlen($matches[0]),
+            );
+        }
+
+        if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w*(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*\/?>/s', $Excerpt['text'], $matches))
+        {
+            return array(
+                'markup' => $matches[0],
+                'extent' => strlen($matches[0]),
+            );
+        }
+    }
+
+    protected function inlineSpecialCharacter($Excerpt)
+    {
+        if ($Excerpt['text'][0] === '&' and ! preg_match('/^&#?\w+;/', $Excerpt['text']))
+        {
+            return array(
+                'markup' => '&amp;',
+                'extent' => 1,
+            );
+        }
+
+        $SpecialCharacter = array('>' => 'gt', '<' => 'lt', '"' => 'quot');
+
+        if (isset($SpecialCharacter[$Excerpt['text'][0]]))
+        {
+            return array(
+                'markup' => '&'.$SpecialCharacter[$Excerpt['text'][0]].';',
+                'extent' => 1,
+            );
+        }
+    }
+
+    protected function inlineStrikethrough($Excerpt)
+    {
+        if ( ! isset($Excerpt['text'][1]))
+        {
+            return;
+        }
+
+        if ($Excerpt['text'][1] === '~' and preg_match('/^~~(?=\S)(.+?)(?<=\S)~~/', $Excerpt['text'], $matches))
+        {
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'del',
+                    'text' => $matches[1],
+                    'handler' => 'line',
+                ),
+            );
+        }
+    }
+
+    protected function inlineUrl($Excerpt)
+    {
+        if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
+        {
+            return;
+        }
+
+        if (preg_match('/\bhttps?:[\/]{2}[^\s<]+\b\/*/ui', $Excerpt['context'], $matches, PREG_OFFSET_CAPTURE))
+        {
+            $Inline = array(
+                'extent' => strlen($matches[0][0]),
+                'position' => $matches[0][1],
+                'element' => array(
+                    'name' => 'a',
+                    'text' => $matches[0][0],
+                    'attributes' => array(
+                        'href' => $matches[0][0],
+                    ),
+                ),
+            );
+
+            return $Inline;
+        }
+    }
+
+    protected function inlineUrlTag($Excerpt)
+    {
+        if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<(\w+:\/{2}[^ >]+)>/i', $Excerpt['text'], $matches))
+        {
+            $url = str_replace(array('&', '<'), array('&amp;', '&lt;'), $matches[1]);
+
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'a',
+                    'text' => $url,
+                    'attributes' => array(
+                        'href' => $url,
+                    ),
+                ),
+            );
+        }
+    }
+
+    # ~
+
+    protected function unmarkedText($text)
+    {
+        if ($this->breaksEnabled)
+        {
+            $text = preg_replace('/[ ]*\n/', "<br />\n", $text);
+        }
+        else
+        {
+            $text = preg_replace('/(?:[ ][ ]+|[ ]*\\\\)\n/', "<br />\n", $text);
+            $text = str_replace(" \n", "\n", $text);
+        }
+
+        return $text;
+    }
+
+    #
+    # Handlers
+    #
+
+    protected function element(array $Element)
+    {
+        $markup = '<'.$Element['name'];
+
+        if (isset($Element['attributes']))
+        {
+            foreach ($Element['attributes'] as $name => $value)
+            {
+                if ($value === null)
+                {
+                    continue;
+                }
+
+                $markup .= ' '.$name.'="'.$value.'"';
+            }
+        }
+
+        if (isset($Element['text']))
+        {
+            $markup .= '>';
+
+            if (isset($Element['handler']))
+            {
+                $markup .= $this->{$Element['handler']}($Element['text']);
+            }
+            else
+            {
+                $markup .= $Element['text'];
+            }
+
+            $markup .= '</'.$Element['name'].'>';
+        }
+        else
+        {
+            $markup .= ' />';
+        }
+
+        return $markup;
+    }
+
+    protected function elements(array $Elements)
+    {
+        $markup = '';
+
+        foreach ($Elements as $Element)
+        {
+            $markup .= "\n" . $this->element($Element);
+        }
+
+        $markup .= "\n";
+
+        return $markup;
+    }
+
+    # ~
+
+    protected function li($lines)
+    {
+        $markup = $this->lines($lines);
+
+        $trimmedMarkup = trim($markup);
+
+        if ( ! in_array('', $lines) and substr($trimmedMarkup, 0, 3) === '<p>')
+        {
+            $markup = $trimmedMarkup;
+            $markup = substr($markup, 3);
+
+            $position = strpos($markup, "</p>");
+
+            $markup = substr_replace($markup, '', $position, 4);
+        }
+
+        return $markup;
+    }
+
+    #
+    # Deprecated Methods
+    #
+
+    function parse($text)
+    {
+        $markup = $this->text($text);
+
+        return $markup;
+    }
+
+    #
+    # Static Methods
+    #
+
+    static function instance($name = 'default')
+    {
+        if (isset(self::$instances[$name]))
+        {
+            return self::$instances[$name];
+        }
+
+        $instance = new static();
+
+        self::$instances[$name] = $instance;
+
+        return $instance;
+    }
+
+    private static $instances = array();
+
+    #
+    # Fields
+    #
+
+    protected $DefinitionData;
+
+    #
+    # Read-Only
+
+    protected $specialCharacters = array(
+        '\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!', '|',
+    );
+
+    protected $StrongRegex = array(
+        '*' => '/^[*]{2}((?:\\\\\*|[^*]|[*][^*]*[*])+?)[*]{2}(?![*])/s',
+        '_' => '/^__((?:\\\\_|[^_]|_[^_]*_)+?)__(?!_)/us',
+    );
+
+    protected $EmRegex = array(
+        '*' => '/^[*]((?:\\\\\*|[^*]|[*][*][^*]+?[*][*])+?)[*](?![*])/s',
+        '_' => '/^_((?:\\\\_|[^_]|__[^_]*__)+?)_(?!_)\b/us',
+    );
+
+    protected $regexHtmlAttribute = '[a-zA-Z_:][\w:.-]*(?:\s*=\s*(?:[^"\'=<>`\s]+|"[^"]*"|\'[^\']*\'))?';
+
+    protected $voidElements = array(
+        'area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source',
+    );
+
+    protected $textLevelElements = array(
+        'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont',
+        'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing',
+        'i', 'rp', 'del', 'code',          'strike', 'marquee',
+        'q', 'rt', 'ins', 'font',          'strong',
+        's', 'tt', 'sub', 'mark',
+        'u', 'xm', 'sup', 'nobr',
+                   'var', 'ruby',
+                   'wbr', 'span',
+                          'time',
+    );
+}
diff --git a/htdocs/includes/parsedown/README.md b/htdocs/includes/parsedown/README.md
new file mode 100644
index 00000000000..4e5659a4804
--- /dev/null
+++ b/htdocs/includes/parsedown/README.md
@@ -0,0 +1,56 @@
+> You might also like [Caret](http://caret.io?ref=parsedown) - our Markdown editor for Mac / Windows / Linux.
+
+## Parsedown
+
+[![Build Status](https://img.shields.io/travis/erusev/parsedown/master.svg?style=flat-square)](https://travis-ci.org/erusev/parsedown)
+<!--[![Total Downloads](http://img.shields.io/packagist/dt/erusev/parsedown.svg?style=flat-square)](https://packagist.org/packages/erusev/parsedown)-->
+
+Better Markdown Parser in PHP
+
+[Demo](http://parsedown.org/demo) |
+[Benchmarks](http://parsedown.org/speed) |
+[Tests](http://parsedown.org/tests/) |
+[Documentation](https://github.com/erusev/parsedown/wiki/)
+
+### Features
+
+* One File
+* Super Fast
+* Extensible
+* [GitHub flavored](https://help.github.com/articles/github-flavored-markdown)
+* Tested in 5.3 to 7.1 and in HHVM
+* [Markdown Extra extension](https://github.com/erusev/parsedown-extra)
+
+### Installation
+
+Include `Parsedown.php` or install [the composer package](https://packagist.org/packages/erusev/parsedown).
+
+### Example
+
+``` php
+$Parsedown = new Parsedown();
+
+echo $Parsedown->text('Hello _Parsedown_!'); # prints: <p>Hello <em>Parsedown</em>!</p>
+```
+
+More examples in [the wiki](https://github.com/erusev/parsedown/wiki/) and in [this video tutorial](http://youtu.be/wYZBY8DEikI).
+
+### Questions
+
+**How does Parsedown work?**
+
+It tries to read Markdown like a human. First, it looks at the lines. It’s interested in how the lines start. This helps it recognise blocks. It knows, for example, that if a line starts with a `-` then perhaps it belongs to a list. Once it recognises the blocks, it continues to the content. As it reads, it watches out for special characters. This helps it recognise inline elements (or inlines).
+
+We call this approach "line based". We believe that Parsedown is the first Markdown parser to use it. Since the release of Parsedown, other developers have used the same approach to develop other Markdown parsers in PHP and in other languages.
+
+**Is it compliant with CommonMark?**
+
+It passes most of the CommonMark tests. Most of the tests that don't pass deal with cases that are quite uncommon. Still, as CommonMark matures, compliance should improve.
+
+**Who uses it?**
+
+[phpDocumentor](http://www.phpdoc.org/), [October CMS](http://octobercms.com/), [Bolt CMS](http://bolt.cm/), [Kirby CMS](http://getkirby.com/), [Grav CMS](http://getgrav.org/), [Statamic CMS](http://www.statamic.com/), [Herbie CMS](http://www.getherbie.org/), [RaspberryPi.org](http://www.raspberrypi.org/), [Symfony demo](https://github.com/symfony/symfony-demo) and [more](https://packagist.org/packages/erusev/parsedown/dependents).
+
+**How can I help?**
+
+Use it, star it, share it and if you feel generous, [donate](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=528P3NZQMP8N2).
diff --git a/htdocs/includes/parsedown/composer.json b/htdocs/includes/parsedown/composer.json
new file mode 100644
index 00000000000..28145af68ca
--- /dev/null
+++ b/htdocs/includes/parsedown/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "erusev/parsedown",
+    "description": "Parser for Markdown.",
+    "keywords": ["markdown", "parser"],
+    "homepage": "http://parsedown.org",
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Emanuil Rusev",
+            "email": "hello@erusev.com",
+            "homepage": "http://erusev.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0"
+    },
+    "autoload": {
+        "psr-0": {"Parsedown": ""}
+    }
+}
diff --git a/htdocs/includes/parsedown/phpunit.xml.dist b/htdocs/includes/parsedown/phpunit.xml.dist
new file mode 100644
index 00000000000..b2d5e9d4fe1
--- /dev/null
+++ b/htdocs/includes/parsedown/phpunit.xml.dist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="test/bootstrap.php" colors="true">
+	<testsuites>
+		<testsuite>
+			<file>test/ParsedownTest.php</file>
+		</testsuite>
+	</testsuites>
+</phpunit>
\ No newline at end of file
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index f5aa35f0c35..69881d693c6 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1131,6 +1131,7 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
+TechnicalServicesProvided=Technical services provided
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####

From b5e646daa0620ec92f0953730acdd2f4369dbd54 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 16:29:31 +0100
Subject: [PATCH 0421/1163] NEW Show by default README.md file found into root
 dir of ext module.

---
 htdocs/admin/modulehelp.php                   |  2 +-
 htdocs/core/lib/parsemd.lib.php               | 18 ++++--
 htdocs/core/modules/DolibarrModules.class.php | 58 ++++++++++++++++---
 htdocs/theme/eldy/style.css.php               |  7 +++
 htdocs/theme/md/style.css.php                 |  7 +++
 5 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index e76627c2965..5b428443248 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -338,7 +338,7 @@ if ($mode == 'desc')
     $text.='<br>';
 
     $moduledesclong=$objMod->getDescLong();
-    if ($moduledesclong) $text.='<br><hr><br>'.$moduledesclong.'<br>';
+    if ($moduledesclong) $text.='<br><hr><div class="moduledesclong">'.$moduledesclong.'<div>';
 }
 
 if ($mode == 'feature')
diff --git a/htdocs/core/lib/parsemd.lib.php b/htdocs/core/lib/parsemd.lib.php
index 17e64f6543e..1eb962463c0 100644
--- a/htdocs/core/lib/parsemd.lib.php
+++ b/htdocs/core/lib/parsemd.lib.php
@@ -24,12 +24,22 @@
 /**
  * Function to parse MD content into HTML
  *
- * @param	string	  $content			MD content
- * @param   string    $parser           'parsedown' or 'nl2br'
- * @return	string                      Parsed content
+ * @param	string	  $content			    MD content
+ * @param   string    $parser               'parsedown' or 'nl2br'
+ * @param   string    $replaceimagepath     Replace path to image with another path. Exemple: ('doc/'=>'xxx/aaa/')
+ * @return	string                          Parsed content
  */
-function dolMd2Html($content, $parser='parsedown')
+function dolMd2Html($content, $parser='parsedown',$replaceimagepath=null)
 {
+    if (is_array($replaceimagepath))
+    {
+        foreach($replaceimagepath as $key => $val)
+        {
+            $keytoreplace = ']('.$key;
+            $valafter = ']('.$val;
+            $content = preg_replace('/'.preg_quote($keytoreplace,'/').'/m', $valafter, $content);
+        }
+    }
     if ($parser == 'parsedown')
     {
         include DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 84538801add..48ce35f1532 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -582,26 +582,68 @@ class DolibarrModules           // Can not be abstract, because we need to insta
     }
 
     /**
-     * Gives the translated module description if translation exists in admin.lang or the default module description
+     * Gives the long description of a module. First check README-la_LA.md then README.md
+     * If not markdown files found, it return translated value of the key ->descriptionlong.
      *
-     * @return  string  Translated module description
+     * @return  string  Long description of a module
      */
     function getDescLong()
     {
         global $langs;
         $langs->load("admin");
         
-        if (empty($this->descriptionlong)) return '';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+
+        $filefound= false;
         
-        // If module description translation does not exist using its unique id, we can use its name to find translation
-        if (is_array($this->langfiles))
+        // Define path to file README.md. 
+        // First check README-la_LA.md then README.md
+        $pathoffile = dol_buildpath(strtolower($this->name).'/README-'.$langs->defaultlang.'.md', 0);
+        if (dol_is_file($pathoffile))
         {
-            foreach($this->langfiles as $val)
+            $filefound = true;
+        }
+        if (! $filefound)
+        {
+            $pathoffile = dol_buildpath(strtolower($this->name).'/README.md', 0);
+            if (dol_is_file($pathoffile))
             {
-                if ($val) $langs->load($val);
+                $filefound = true;
             }
         }
-        return $langs->trans($this->descriptionlong);
+        
+        if ($filefound)     // Mostly for external modules
+        {
+            $content = file_get_contents($pathoffile);
+    
+            if ((float) DOL_VERSION >= 6.0)
+            {
+                @include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
+                $content = dolMd2Html($content, 'parsedown', array('doc/'=>dol_buildpath('cabinetmed/doc/', 1)));
+            }
+            else
+            {
+                $content = nl2br($content);
+            }
+        }
+        else                // Mostly for internal modules
+        {
+            if (! empty($this->descriptionlong))
+            {
+                if (is_array($this->langfiles))
+                {
+                    foreach($this->langfiles as $val)
+                    {
+                        if ($val) $langs->load($val);
+                    }
+                }
+            
+                $content = $langs->trans($this->descriptionlong);
+            }
+        }
+    
+        return $content;
     }
     
     /**
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3d6e8868bec..26a0c8d21ed 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -632,6 +632,13 @@ div.myavailability {
 	margin-bottom: 12px;
 }
 
+/* For the long description of module */
+.moduledesclong p img, .moduledesclong p a img {
+    max-width: 90% !important;
+    height: auto !important;
+}
+
+
 /* DOL_XXX for future usage (when left menu has been removed). If we do not use datatable */
 /*.table-responsive {
     width: calc(100% - 330px);
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index aae0fd7f677..c930b82dd8c 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -640,6 +640,13 @@ div.myavailability {
 	margin-bottom: 12px;
 }
 
+/* For the long description of module */
+.moduledesclong p img,.moduledesclong p a img {
+    max-width: 90% !important;
+    height: auto !important;
+}
+
+
 /* DOL_XXX for future usage (when left menu has been removed). If we do not use datatable */
 /*.table-responsive {
     width: calc(100% - 330px);

From a0fe79a1132b329b744c7bd1b487d358beb9db4a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 16:46:12 +0100
Subject: [PATCH 0422/1163] Fix duplicate include.

---
 htdocs/core/lib/parsemd.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/parsemd.lib.php b/htdocs/core/lib/parsemd.lib.php
index 1eb962463c0..13334fd400c 100644
--- a/htdocs/core/lib/parsemd.lib.php
+++ b/htdocs/core/lib/parsemd.lib.php
@@ -42,7 +42,7 @@ function dolMd2Html($content, $parser='parsedown',$replaceimagepath=null)
     }
     if ($parser == 'parsedown')
     {
-        include DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
+        include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
         $Parsedown = new Parsedown();
         $content = $Parsedown->text($content);
     }

From e7a45a7f6ad69e42b325d4cf514a2610edc23fc1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 17:50:43 +0100
Subject: [PATCH 0423/1163] NEW Use html5 type "number" on select field for
 year and duration.

---
 htdocs/core/class/html.form.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0ec07e1c3fa..90c2a98720f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4735,7 +4735,7 @@ class Form
                 // Year
                 if ($emptydate || $set_time == -1)
                 {
-                    $retstring.='<input'.($disabled?' disabled':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="text" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
+                    $retstring.='<input'.($disabled?' disabled':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
                 }
                 else
                 {
@@ -4918,7 +4918,7 @@ class Form
         }
         elseif ($typehour=='text')
         {
-        	$retstring.='<input placeholder="'.$langs->trans('HourShort').'" type="text" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">';
+        	$retstring.='<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">';
         }
         else return 'BadValueForParameterTypeHour';
 
@@ -4942,7 +4942,7 @@ class Form
         }
         elseif ($typehour=='text')
         {
-        	$retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="text" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat" value="'.($minSelected?((int) $minSelected):'').'">';
+        	$retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat" value="'.($minSelected?((int) $minSelected):'').'">';
         }
         
         if ($typehour!='text') $retstring.=' '.$langs->trans('MinuteShort');

From b0a75da2ac62ca0fd34fd665d8c46ba4a0426bb8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 17:50:52 +0100
Subject: [PATCH 0424/1163] Fix css

---
 htdocs/expensereport/card.php | 59 +++++------------------------------
 1 file changed, 8 insertions(+), 51 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 6061250bfbd..4c28fe0281c 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1217,53 +1217,10 @@ if (empty($reshook))
     	}
     }
     
-    
-    /*
-     * Generate or regenerate the PDF document
-     */
-    if ($action == 'builddoc')	// GET or POST
-    {
-    	$depl = new ExpenseReport($db, 0, $_GET['id']);
-    	$depl->fetch($id);
-    
-    	if ($_REQUEST['model'])
-    	{
-    		$depl->setDocModel($user, $_REQUEST['model']);
-    	}
-    
-    	$outputlangs = $langs;
-    	if (! empty($_REQUEST['lang_id']))
-    	{
-    		$outputlangs = new Translate("",$conf);
-    		$outputlangs->setDefaultLang($_REQUEST['lang_id']);
-    	}
-    	$result=expensereport_pdf_create($db, $depl, '', $depl->modelpdf, $outputlangs);
-    	if ($result <= 0)
-    	{
-    		setEventMessages($object->error, $object->errors, 'errors');
-            $action='';
-    	}
-    }
-    
-    // Remove file in doc form
-    else if ($action == 'remove_file')
-    {
-    	$object = new ExpenseReport($db, 0, $_GET['id']);
-    	if ($object->fetch($id))
-    	{
-    		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    
-    		$object->fetch_thirdparty();
-    
-    		$langs->load("other");
-    		$upload_dir = $conf->expensereport->dir_output;
-    		$file = $upload_dir . '/' . GETPOST('file');
-    		$ret=dol_delete_file($file,0,0,0,$object);
-    		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-    		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-    		$action='';
-    	}
-    }
+    // Actions to build doc
+    $upload_dir = $conf->expensereport->dir_output;
+    $permissioncreate = $user->rights->expensereport->creer;
+    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
 
@@ -1352,8 +1309,8 @@ if ($action == 'create')
 
 	// Public note
 	print '<tr>';
-	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
-	print '<td class="tdtop">';
+	print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
+	print '<td>';
 
 	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
@@ -1362,8 +1319,8 @@ if ($action == 'create')
 	// Private note
 	if (empty($user->societe_id)) {
 		print '<tr>';
-		print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
-		print '<td class="tdtop">';
+		print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
+		print '<td>';
 
 		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 		print $doleditor->Create(1);

From 559232a4d726cb70fe296a7bae6df966c563d9d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 17:56:11 +0100
Subject: [PATCH 0425/1163] bottom-border useless

---
 htdocs/expensereport/card.php     | 6 +++---
 htdocs/expensereport/document.php | 2 +-
 htdocs/expensereport/info.php     | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 4c28fe0281c..8ec9d9140cb 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1272,8 +1272,8 @@ if ($action == 'create')
 	print '<td>';
 	$defaultselectuser=$user->id;
 	if (GETPOST('fk_user_author') > 0) $defaultselectuser=GETPOST('fk_user_author');
-  $include_users = 'hierarchyme';
-  if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expensereport->writeall_advance)) $include_users=array();
+    $include_users = 'hierarchyme';
+    if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expensereport->writeall_advance)) $include_users=array();
 	$s=$form->select_dolusers($defaultselectuser, "fk_user_author", 0, "", 0, $include_users);
 	print $s;
 	print '</td>';
@@ -1485,7 +1485,7 @@ else
 			}
 			else
 			{
-				dol_fiche_head($head, 'card', $langs->trans("ExpenseReport"), 0, 'trip');
+				dol_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
 
 				// Clone confirmation
 				if ($action == 'clone') {
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 470e2ec3346..eb622867f54 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -91,7 +91,7 @@ if ($object->id)
 
 	$head=expensereport_prepare_head($object);
 
-	dol_fiche_head($head, 'documents',  $langs->trans("ExpenseReport"), 0, 'trip');
+	dol_fiche_head($head, 'documents',  $langs->trans("ExpenseReport"), -1, 'trip');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 	
diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php
index 21ee44df97a..0c3f687519c 100644
--- a/htdocs/expensereport/info.php
+++ b/htdocs/expensereport/info.php
@@ -39,6 +39,9 @@ $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 /*
  * View
  */
+
+$form = new Form($db);
+
 $title=$langs->trans("ExpenseReport") . " - " . $langs->trans("Info");
 $helpurl="EN:Module_Expense_Reports";
 llxHeader("",$title,$helpurl);
@@ -51,7 +54,7 @@ if ($id > 0 || ! empty($ref))
 
 	$head = expensereport_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $langs->trans("ExpenseReport"), 0, 'trip');
+	dol_fiche_head($head, 'info', $langs->trans("ExpenseReport"), -1, 'trip');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 	

From 9a13dc92ab4ed01916a3410d4bf96f6caae50f2a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 17:56:11 +0100
Subject: [PATCH 0426/1163] bottom-border useless

---
 htdocs/expensereport/card.php     |  6 +++---
 htdocs/expensereport/document.php |  2 +-
 htdocs/expensereport/info.php     |  5 ++++-
 htdocs/expensereport/note.php     | 17 +----------------
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 4c28fe0281c..8ec9d9140cb 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1272,8 +1272,8 @@ if ($action == 'create')
 	print '<td>';
 	$defaultselectuser=$user->id;
 	if (GETPOST('fk_user_author') > 0) $defaultselectuser=GETPOST('fk_user_author');
-  $include_users = 'hierarchyme';
-  if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expensereport->writeall_advance)) $include_users=array();
+    $include_users = 'hierarchyme';
+    if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expensereport->writeall_advance)) $include_users=array();
 	$s=$form->select_dolusers($defaultselectuser, "fk_user_author", 0, "", 0, $include_users);
 	print $s;
 	print '</td>';
@@ -1485,7 +1485,7 @@ else
 			}
 			else
 			{
-				dol_fiche_head($head, 'card', $langs->trans("ExpenseReport"), 0, 'trip');
+				dol_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
 
 				// Clone confirmation
 				if ($action == 'clone') {
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 470e2ec3346..eb622867f54 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -91,7 +91,7 @@ if ($object->id)
 
 	$head=expensereport_prepare_head($object);
 
-	dol_fiche_head($head, 'documents',  $langs->trans("ExpenseReport"), 0, 'trip');
+	dol_fiche_head($head, 'documents',  $langs->trans("ExpenseReport"), -1, 'trip');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 	
diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php
index 21ee44df97a..0c3f687519c 100644
--- a/htdocs/expensereport/info.php
+++ b/htdocs/expensereport/info.php
@@ -39,6 +39,9 @@ $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 /*
  * View
  */
+
+$form = new Form($db);
+
 $title=$langs->trans("ExpenseReport") . " - " . $langs->trans("Info");
 $helpurl="EN:Module_Expense_Reports";
 llxHeader("",$title,$helpurl);
@@ -51,7 +54,7 @@ if ($id > 0 || ! empty($ref))
 
 	$head = expensereport_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $langs->trans("ExpenseReport"), 0, 'trip');
+	dol_fiche_head($head, 'info', $langs->trans("ExpenseReport"), -1, 'trip');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 	
diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index 636e54c654e..8c059b8b284 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -78,7 +78,7 @@ if ($id > 0 || ! empty($ref))
 
 	$head = expensereport_prepare_head($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("ExpenseReport"), 0, 'trip');
+	dol_fiche_head($head, 'note', $langs->trans("ExpenseReport"), -1, 'trip');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 	
@@ -87,20 +87,6 @@ if ($id > 0 || ! empty($ref))
 
 	
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	
-	
-    /*	
-	print '<table class="border" width="100%">';
-
-	// Ref
-	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td colspan="3">';
-	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
-	print "</td></tr>";
-
-	print "</table>";
-
-	print '<br>';
-    */
 	 
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
@@ -111,7 +97,6 @@ if ($id > 0 || ! empty($ref))
 	print '</div>';
 	
 	dol_fiche_end();
-	
 }
 
 

From acdfd6ab9edc33cb8299b9bb853786afe110b54a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Mar 2017 18:23:58 +0100
Subject: [PATCH 0427/1163] css enhancement

---
 htdocs/core/class/html.form.class.php |  6 +++---
 htdocs/expensereport/card.php         | 14 +++++++-------
 htdocs/theme/eldy/style.css.php       | 17 +++++++++++------
 htdocs/theme/md/style.css.php         | 17 +++++++++++------
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 90c2a98720f..c5118ec56ef 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4528,7 +4528,7 @@ class Form
         		$disabled=true;
         	}
 
-        	if (! $options_only) $return.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').$title.'>';
+        	if (! $options_only) $return.= '<select class="flat minwidth75imp" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').$title.'>';
 
         	$selectedfound=false;
         	foreach ($this->cache_vatrates as $rate)
@@ -4717,7 +4717,7 @@ class Form
 
                 $retstring.="</select>";
 
-                $retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50onsmartphone" id="'.$prefix.'month" name="'.$prefix.'month">';
+                $retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'month" name="'.$prefix.'month">';
                 if ($emptydate || $set_time == -1)
                 {
                     $retstring.='<option value="0" selected>&nbsp;</option>';
@@ -4739,7 +4739,7 @@ class Form
                 }
                 else
                 {
-                    $retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth75" id="'.$prefix.'year" name="'.$prefix.'year">';
+                    $retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';
 
                     for ($year = $syear - 5; $year < $syear + 10 ; $year++)
                     {
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 8ec9d9140cb..fa6018fcd07 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1959,7 +1959,7 @@ else
 									print '<td></td>';
 
 									// Select date
-									print '<td style="text-align:center;">';
+									print '<td class="center">';
 									$form->select_date($objp->date,'date');
 									print '</td>';
 
@@ -1972,13 +1972,13 @@ else
 									}
 									
 									// Select type
-									print '<td style="text-align:center;">';
+									print '<td class="center">';
 									select_type_fees_id($objp->type_fees_code,'fk_c_type_fees');
 									print '</td>';
 
 									// Add comments
 									print '<td>';
-									print '<textarea class="flat_ndf" name="comments" class="centpercent">'.$objp->comments.'</textarea>';
+									print '<textarea name="comments" class="flat_ndf centpercent">'.$objp->comments.'</textarea>';
 									print '</td>';
 
 									// VAT
@@ -1988,12 +1988,12 @@ else
 
 									// Unit price
 									print '<td style="text-align:right;">';
-									print '<input type="text" size="6" name="value_unit" value="'.$objp->value_unit.'" />';
+									print '<input type="text" min="0" class="maxwidth100" name="value_unit" value="'.$objp->value_unit.'" />';
 									print '</td>';
 
 									// Quantity
 									print '<td style="text-align:right;">';
-									print '<input type="text" size="4" name="qty" value="'.$objp->qty.'" />';
+									print '<input type="number" min="0" class="maxwidth100" name="qty" value="'.$objp->qty.'" />';
 									print '</td>';
 
 									if ($action != 'editline')
@@ -2074,12 +2074,12 @@ else
 
 						// Unit price
 						print '<td align="right">';
-						print '<input type="text" size="5" name="value_unit" value="'.$value_unit.'">';
+						print '<input type="text" class="right maxwidth50" name="value_unit" value="'.$value_unit.'">';
 						print '</td>';
 
 						// Quantity
 						print '<td align="right">';
-						print '<input type="text" size="2" name="qty"  value="'.($qty?$qty:1).'">';
+						print '<input type="number" min="0" class="right maxwidth50" name="qty" value="'.($qty?$qty:1).'">';
 						print '</td>';
 
 						if ($action != 'editline')
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 26a0c8d21ed..086e78f3552 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -693,6 +693,7 @@ div.fiche>form>div.div-table-responsive {
     .minwidth400 { min-width: 400px; }
     .minwidth500 { min-width: 500px; }
     .minwidth50imp  { min-width: 50px !important; }
+    .minwidth75imp  { min-width: 75px !important; }
     .minwidth100imp { min-width: 100px !important; }
     .minwidth200imp { min-width: 200px !important; }
     .minwidth300imp { min-width: 300px !important; }
@@ -709,6 +710,7 @@ div.fiche>form>div.div-table-responsive {
 .maxwidth400 { max-width: 400px; }
 .maxwidth500 { max-width: 500px; }
 .maxwidth50imp  { max-width: 50px !important; }
+.maxwidth75imp  { max-width: 75px !important; }
 .minheight20 { min-height: 20px; }
 .minheight40 { min-height: 40px; }
 .titlefieldcreate { width: 20%; }
@@ -722,6 +724,7 @@ div.fiche>form>div.div-table-responsive {
 	.titlefield { width: 30% !important; }
 	.titlefieldcreate { width: 30% !important; }
 	.minwidth50imp  { min-width: 50px !important; }
+    .minwidth75imp  { min-width: 75px !important; }
     .minwidth100imp { min-width: 100px !important; }
     .minwidth200imp { min-width: 200px !important; }
     .minwidth300imp { min-width: 300px !important; }
@@ -734,7 +737,8 @@ div.fiche>form>div.div-table-responsive {
 {
     .maxwidthonsmartphone { max-width: 100px; }
 	.minwidth50imp  { min-width: 50px !important; }
-    .minwidth100imp { min-width: 50px !important; }
+    .minwidth75imp  { min-width: 70px !important; }
+    .minwidth100imp { min-width: 80px !important; }
     .minwidth200imp { min-width: 100px !important; }
     .minwidth300imp { min-width: 100px !important; }
     .minwidth400imp { min-width: 100px !important; }
@@ -785,11 +789,12 @@ div.fiche>form>div.div-table-responsive {
     .maxwidth300onsmartphone { max-width: 300px; }
     .maxwidth400onsmartphone { max-width: 400px; }
 	.minwidth50imp  { min-width: 50px !important; }
-    .minwidth100imp { min-width: 50px !important; }
-    .minwidth200imp { min-width: 50px !important; }
-    .minwidth300imp { min-width: 50px !important; }
-    .minwidth400imp { min-width: 50px !important; }
-    .minwidth500imp { min-width: 50px !important; }
+	.minwidth75imp  { min-width: 60px !important; }
+    .minwidth100imp { min-width: 60px !important; }
+    .minwidth200imp { min-width: 60px !important; }
+    .minwidth300imp { min-width: 60px !important; }
+    .minwidth400imp { min-width: 60px !important; }
+    .minwidth500imp { min-width: 60px !important; }
     .titlefield { width: auto; }
     .titlefieldcreate { width: auto; }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c930b82dd8c..e90311ca0d2 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -702,6 +702,7 @@ div.fiche>form>div.div-table-responsive {
 	.minwidth400 { min-width: 400px; }
 	.minwidth500 { min-width: 500px; }
 	.minwidth50imp  { min-width: 50px !important; }
+    .minwidth75imp  { min-width: 75px !important; }
 	.minwidth100imp { min-width: 100px !important; }
 	.minwidth200imp { min-width: 200px !important; }
 	.minwidth300imp { min-width: 300px !important; }
@@ -718,6 +719,7 @@ div.fiche>form>div.div-table-responsive {
 .maxwidth400 { max-width: 400px; }
 .maxwidth500 { max-width: 500px; }
 .maxwidth50imp  { max-width: 50px !important; }
+.maxwidth75imp  { max-width: 75px !important; }
 .minheight20 { min-height: 20px; }
 .minheight40 { min-height: 40px; }
 .titlefieldcreate { width: 20%; }
@@ -732,6 +734,7 @@ div.fiche>form>div.div-table-responsive {
 	.titlefield { width: 30% !important; }
 	.titlefieldcreate { width: 30% !important; }
 	.minwidth50imp  { min-width: 50px !important; }
+    .minwidth75imp  { min-width: 75px !important; }
     .minwidth100imp { min-width: 100px !important; }
     .minwidth200imp { min-width: 200px !important; }
     .minwidth300imp { min-width: 300px !important; }
@@ -744,7 +747,8 @@ div.fiche>form>div.div-table-responsive {
 {
     .maxwidthonsmartphone { max-width: 100px; }
 	.minwidth50imp  { min-width: 50px !important; }
-    .minwidth100imp { min-width: 50px !important; }
+    .minwidth75imp  { min-width: 70px !important; }
+    .minwidth100imp { min-width: 80px !important; }
     .minwidth200imp { min-width: 100px !important; }
     .minwidth300imp { min-width: 100px !important; }
     .minwidth400imp { min-width: 100px !important; }
@@ -794,11 +798,12 @@ div.fiche>form>div.div-table-responsive {
     .maxwidth300onsmartphone { max-width: 300px; }
     .maxwidth400onsmartphone { max-width: 400px; }
 	.minwidth50imp  { min-width: 50px !important; }
-    .minwidth100imp { min-width: 50px !important; }
-    .minwidth200imp { min-width: 50px !important; }
-    .minwidth300imp { min-width: 50px !important; }
-    .minwidth400imp { min-width: 50px !important; }
-    .minwidth500imp { min-width: 50px !important; }
+	.minwidth75imp  { min-width: 60px !important; }
+    .minwidth100imp { min-width: 60px !important; }
+    .minwidth200imp { min-width: 60px !important; }
+    .minwidth300imp { min-width: 60px !important; }
+    .minwidth400imp { min-width: 60px !important; }
+    .minwidth500imp { min-width: 60px !important; }
     .titlefield { width: auto; }
     .titlefieldcreate { width: auto; }
 

From 7999cb9a46c31dd85e5782d6cc8566ff136ec39d Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Tue, 21 Mar 2017 23:48:06 +0100
Subject: [PATCH 0428/1163] introducing "mixte" mode for select_duration

If 'select' then input hour and input min is a combo,
if 'text' input hour is in text and input min is a text,
if 'mixte' input hour is in text and input min is a combo
---
 htdocs/core/class/html.form.class.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c5118ec56ef..4202c27f744 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4878,11 +4878,13 @@ class Form
      *	Function to show a form to select a duration on a page
      *
      *	@param	string	$prefix   		Prefix for input fields
-     *	@param  int		$iSecond  		Default preselected duration (number of seconds or '')
-     * 	@param	int		$disabled		Disable the combo box
-     * 	@param	string	$typehour		If 'select' then input hour and input min is a combo, if 'text' input hour is in text and input min is a text
-     *  @param	integer	$minunderhours	If 1, show minutes selection under the hours
-     * 	@param	int		$nooutput		Do not output html string but return it
+     *	@param  int	$iSecond  		Default preselected duration (number of seconds or '')
+     * 	@param	int	$disabled		Disable the combo box
+     * 	@param	string	$typehour		If 'select' then input hour and input min is a combo,
+     *						if 'text' input hour is in text and input min is a text, 
+     *						if 'mixte' input hour is in text and input min is a combo
+     *  @param	integer	$minunderhours		If 1, show minutes selection under the hours
+     * 	@param	int	$nooutput		Do not output html string but return it
      *  @return	string|null
      */
     function select_duration($prefix, $iSecond='', $disabled=0, $typehour='select', $minunderhours=0, $nooutput=0)
@@ -4902,7 +4904,7 @@ class Form
             $minSelected = convertSecondToTime($iSecond,'min');
         }
 
-        if ($typehour=='select')
+        if ($typehour=='select' )
         {
 	        $retstring.='<select class="flat" name="'.$prefix.'hour"'.($disabled?' disabled':'').'>';
 	        for ($hour = 0; $hour < 25; $hour++)	// For a duration, we allow 24 hours
@@ -4916,7 +4918,7 @@ class Form
 	        }
 	        $retstring.="</select>";
         }
-        elseif ($typehour=='text')
+        elseif ($typehour=='text' || $typehour=='mixte')
         {
         	$retstring.='<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">';
         }
@@ -4929,7 +4931,7 @@ class Form
         if ($minunderhours) $retstring.='<br>';
         else $retstring.="&nbsp;";
 
-        if ($typehour=='select')
+        if ($typehour=='select' || $typehour=='mixte')
         {
 	        $retstring.='<select class="flat" name="'.$prefix.'min"'.($disabled?' disabled':'').'>';
 	        for ($min = 0; $min <= 55; $min=$min+5)
@@ -4940,7 +4942,7 @@ class Form
 	        }
 	        $retstring.="</select>";
         }
-        elseif ($typehour=='text')
+        elseif ($typehour=='text' )
         {
         	$retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat" value="'.($minSelected?((int) $minSelected):'').'">';
         }

From 917ef1e01e0f98e3914d9a9d1c1c04bacee3e44e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Mar 2017 20:34:01 +0100
Subject: [PATCH 0429/1163] Uniformize code

---
 htdocs/admin/confexped.php                 | 26 +++-----
 htdocs/admin/expedition.php                | 75 +++++++++-------------
 htdocs/admin/expedition_extrafields.php    |  2 +-
 htdocs/admin/expeditiondet_extrafields.php |  2 +-
 htdocs/admin/livraison.php                 |  6 +-
 htdocs/admin/livraison_extrafields.php     |  2 +-
 htdocs/admin/livraisondet_extrafields.php  |  2 +-
 7 files changed, 46 insertions(+), 69 deletions(-)

diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index 859534d53fd..0059f337752 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -94,28 +94,23 @@ print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
 print '<br>';
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Sendings"), 0, 'sending');
+dol_fiche_head($head, 'general', $langs->trans("Sendings"), -1, 'sending');
 
-/*
- * Formulaire parametres divers
- */
-
-$var=true;
+// Miscellaneous parameters
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Feature").'</td>';
-print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="center" width="100">'.$langs->trans("Status").'</td>';
+print '<td width="20">&nbsp;</td>';
+print '<td class="center">'.$langs->trans("Status").'</td>';
 print '</tr>'."\n";
 
 // expedition activation/desactivation
-$var=!$var;
-print "<tr ".$bc[$var].">";
+print "<tr>";
 print '<td>'.$langs->trans("SendingsAbility").'</td>';
-print '<td align="center" width="20">';
+print '<td>';
 print '</td>';
-print '<td align="center" width="100">';
+print '<td class="center">';
 print $langs->trans("Required");
 /*if (empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 {
@@ -129,15 +124,14 @@ print "</td>";
 print '</tr>';
 
 // Bon de livraison activation/desactivation
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+print '<tr>';
 print '<td>';
 print $langs->trans("DeliveriesOrderAbility");
 print '<br>'.info_admin($langs->trans("NoNeedForDeliveryReceipts"), 0, 1);
 print '</td>';
-print '<td align="center" width="20">';
+print '<td>';
 print '</td>';
-print '<td align="center" width="100">';
+print '<td class="center">';
 
 if (empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
 {
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 34a561121b2..ef8b10c411f 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -72,26 +72,28 @@ if ($action == 'updateMask')
 	}
 }
 
-else if ($action == 'set_SHIPPING_FREE_TEXT')
+else if ($action == 'set_param')
 {
 	$freetext=GETPOST('SHIPPING_FREE_TEXT');	// No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "SHIPPING_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
-
-	if ($res > 0)
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	else
+	if ($res <= 0)
+	{
+		$error++;
 		setEventMessages($langs->trans("Error"), null, 'errors');
-}
-
-else if ($action == 'set_SHIPPING_DRAFT_WATERMARK')
-{
+	}
+	
 	$draft=GETPOST('SHIPPING_DRAFT_WATERMARK','alpha');
 	$res = dolibarr_set_const($db, "SHIPPING_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
-
-	if ($res > 0)
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	else
+	if ($res <= 0)
+	{
+		$error++;
 		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+
+	if (! $error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
 }
 
 else if ($action == 'specimen')
@@ -222,11 +224,9 @@ print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
 print '<br>';
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'shipment', $langs->trans("Sendings"), 0, 'sending');
+dol_fiche_head($head, 'shipment', $langs->trans("Sendings"), -1, 'sending');
 
-/*
- * Expedition numbering model
- */
+// Shipment numbering model
 
 print load_fiche_titre($langs->trans("SendingsNumberingModules"));
 
@@ -235,8 +235,8 @@ print '<tr class="liste_titre">';
 print '<td width="100">'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td>'.$langs->trans("Example").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
-print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
+print '<td class="center" width="80">'.$langs->trans("ShortInfo").'</td>';
 print "</tr>\n";
 
 clearstatcache();
@@ -250,8 +250,6 @@ foreach ($dirmodels as $reldir)
 		$handle = opendir($dir);
 		if (is_resource($handle))
 		{
-			$var=true;
-
 			while (($file = readdir($handle))!==false)
 			{
 				if (substr($file, 0, 15) == 'mod_expedition_' && substr($file, dol_strlen($file)-3, 3) == 'php')
@@ -268,8 +266,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-						$var=!$var;
-						print '<tr '.$bc[$var].'><td>'.$module->nom."</td>\n";
+						print '<tr><td>'.$module->nom."</td>\n";
 						print '<td>';
 						print $module->info();
 						print '</td>';
@@ -374,7 +371,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var=true;
 foreach ($dirmodels as $reldir)
 {
     foreach (array('','/doc') as $valdir)
@@ -412,8 +408,7 @@ foreach ($dirmodels as $reldir)
 
 	                        if ($modulequalified)
 	                        {
-	                            $var = !$var;
-	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print '<tr><td width="100">';
 	                            print (empty($module->name)?$name:$module->name);
 	                            print "</td><td>\n";
 	                            if (method_exists($module,'info')) print $module->info($langs);
@@ -498,19 +493,16 @@ print '<br>';
  */
 print load_fiche_titre($langs->trans("OtherOptions"));
 
-$var=true;
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_param">';
+
 print "<table class=\"noborder\" width=\"100%\">";
 print "<tr class=\"liste_titre\">";
 print "<td>".$langs->trans("Parameter")."</td>\n";
-print '<td width="60" align="center">'.$langs->trans("Value")."</td>\n";
-print "<td>&nbsp;</td>\n";
 print "</tr>";
 
-$var=! $var;
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_SHIPPING_FREE_TEXT">';
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr><td>';
 print $langs->trans("FreeLegalTextOnShippings").' ('.$langs->trans("AddCRIfTooLong").')<br>';
 $variablename='SHIPPING_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
@@ -523,25 +515,18 @@ else
     $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
     print $doleditor->Create();
 }
-print '</td><td align="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
-print '</form>';
 
-$var=!$var;
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_SHIPPING_DRAFT_WATERMARK">';
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr><td>';
 print $langs->trans("WatermarkOnDraft").'<br>';
 print '<input size="50" class="flat" type="text" name="SHIPPING_DRAFT_WATERMARK" value="'.$conf->global->SHIPPING_DRAFT_WATERMARK.'">';
-print '</td><td align="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
-print '</form>';
 
 print '</table>';
 
+print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+
+print '</form>';
 
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/expedition_extrafields.php b/htdocs/admin/expedition_extrafields.php
index d682f73ce6d..8c24c49cb23 100644
--- a/htdocs/admin/expedition_extrafields.php
+++ b/htdocs/admin/expedition_extrafields.php
@@ -78,7 +78,7 @@ print "<br>\n";
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_shipment', $langs->trans("Sendings"), 0, 'sending');
+dol_fiche_head($head, 'attributes_shipment', $langs->trans("Sendings"), -1, 'sending');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/expeditiondet_extrafields.php b/htdocs/admin/expeditiondet_extrafields.php
index c4d45f08ded..283eeab452a 100644
--- a/htdocs/admin/expeditiondet_extrafields.php
+++ b/htdocs/admin/expeditiondet_extrafields.php
@@ -78,7 +78,7 @@ print "<br>\n";
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines_shipment', $langs->trans("Sendings"), 0, 'sending');
+dol_fiche_head($head, 'attributeslines_shipment', $langs->trans("Sendings"), -1, 'sending');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 42d7fa69ac8..e49f25d7ef8 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -214,12 +214,10 @@ print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
 print '<br>';
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'receivings', $langs->trans("Receivings"), 0, 'sending');
+dol_fiche_head($head, 'receivings', $langs->trans("Receivings"), -1, 'sending');
 
 
-/*
- * Livraison numbering model
- */
+// Delivery numbering model
 
 print load_fiche_titre($langs->trans("DeliveryOrderNumberingModules"),'','');
 
diff --git a/htdocs/admin/livraison_extrafields.php b/htdocs/admin/livraison_extrafields.php
index 71a34039084..84037ae9b80 100644
--- a/htdocs/admin/livraison_extrafields.php
+++ b/htdocs/admin/livraison_extrafields.php
@@ -78,7 +78,7 @@ print "<br>\n";
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_receivings', $langs->trans("Receivings"), 0, 'sending');
+dol_fiche_head($head, 'attributes_receivings', $langs->trans("Receivings"), -1, 'sending');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/livraisondet_extrafields.php b/htdocs/admin/livraisondet_extrafields.php
index 4679123352a..22a7e89d724 100644
--- a/htdocs/admin/livraisondet_extrafields.php
+++ b/htdocs/admin/livraisondet_extrafields.php
@@ -78,7 +78,7 @@ print "<br>\n";
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines_receivings', $langs->trans("Receivings"), 0, 'sending');
+dol_fiche_head($head, 'attributeslines_receivings', $langs->trans("Receivings"), -1, 'sending');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 

From 0a35d172079da39f1c303c8f2fc0ff98c8e8c0b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Mar 2017 10:59:13 +0100
Subject: [PATCH 0430/1163] CSS enhancement

---
 htdocs/admin/events.php               |   2 +-
 htdocs/admin/perms.php                |   2 +-
 htdocs/admin/proxy.php                |   2 +-
 htdocs/admin/security.php             |   2 +-
 htdocs/admin/security_file.php        |   2 +-
 htdocs/admin/security_other.php       |   2 +-
 htdocs/admin/translation.php          |   2 +-
 htdocs/core/class/html.form.class.php |   4 +-
 htdocs/core/lib/functions.lib.php     |   2 +-
 htdocs/holiday/card.php               |  10 +-
 htdocs/theme/eldy/style.css.php       |  18 +++-
 htdocs/theme/md/style.css.php         |  23 +++--
 htdocs/user/class/user.class.php      | 132 +++++++++++++-------------
 htdocs/user/hierarchy.php             |   3 +-
 htdocs/user/home.php                  |  11 +--
 htdocs/user/index.php                 |  12 +--
 16 files changed, 128 insertions(+), 101 deletions(-)

diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 6092a95d0b9..892e0860cbd 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -86,7 +86,7 @@ print '<input type="hidden" name="action" value="save">';
 
 $head=security_prepare_head();
 
-dol_fiche_head($head, 'audit', $langs->trans("Security"));
+dol_fiche_head($head, 'audit', $langs->trans("Security"), -1);
 
 
 $var=true;
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 4302222630c..84cb9ed8bf2 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -118,7 +118,7 @@ $db->commit();
 
 $head=security_prepare_head();
 
-dol_fiche_head($head, 'default', $langs->trans("Security"));
+dol_fiche_head($head, 'default', $langs->trans("Security"), -1);
 
 
 // Show warning about external users
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 1f6e45223b4..84836407499 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -96,7 +96,7 @@ print '<input type="hidden" name="action" value="set_proxy">';
 
 $head=security_prepare_head();
 
-dol_fiche_head($head, 'proxy', $langs->trans("Security"));
+dol_fiche_head($head, 'proxy', $langs->trans("Security"), -1);
 
 
 if ($conf->use_javascript_ajax)
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 97cae20377c..3aa0bdf33bf 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -198,7 +198,7 @@ print "<br>\n";
 
 $head=security_prepare_head();
 
-dol_fiche_head($head, 'passwords', $langs->trans("Security"));
+dol_fiche_head($head, 'passwords', $langs->trans("Security"), -1);
 
 
 $var=false;
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index f7a776c7249..0114bbb74b8 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -124,7 +124,7 @@ print '<input type="hidden" name="action" value="updateform">';
 
 $head=security_prepare_head();
 
-dol_fiche_head($head, 'file', $langs->trans("Security"));
+dol_fiche_head($head, 'file', $langs->trans("Security"), -1);
 
 
 // Upload options
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index ac0a1e883eb..9ce79359a7c 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -103,7 +103,7 @@ print '<input type="hidden" name="action" value="updateform">';
 
 $head=security_prepare_head();
 
-dol_fiche_head($head, 'misc', $langs->trans("Security"));
+dol_fiche_head($head, 'misc', $langs->trans("Security"), -1);
 
 
 // Other Options
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 7d07f7ead94..4dbfc53c821 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -181,7 +181,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 $head=translation_prepare_head();
 
-dol_fiche_head($head, $mode, '', 0, '');
+dol_fiche_head($head, $mode, '', -1, '');
 
 if ($mode == 'overwrite')
 {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1366435f144..1256732999a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5998,7 +5998,7 @@ class Form
                     if ($urladvanced) $ret.='<a href="'.$urladvanced.'">';
                     else $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
                 }
-                $ret.='<img alt="Photo" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" class="'.$cssclass.'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
+                $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Photo" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
                 if ($addlinktofullsize) $ret.='</a>';
             }
             else if ($altfile && file_exists($dir."/".$altfile))
@@ -6009,7 +6009,7 @@ class Form
                     if ($urladvanced) $ret.='<a href="'.$urladvanced.'">';
                     else $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
                 }
-                $ret.='<img alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" class="'.$cssclass.'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
+                $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" class="'.$cssclass.'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
                 if ($addlinktofullsize) $ret.='</a>';
             }
             else
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3851a173c24..4ca49934bcd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2378,7 +2378,7 @@ function img_picto($titlealt, $picto, $morealt = '', $pictoisfullpath = false, $
 		if (preg_match('/:[^\s0-9]/',$titlealt)) $tmparray=explode(':',$titlealt);		// We explode if we have TextA:TextB. Not if we have TextA: TextB
 		$title=$tmparray[0];
 		$alt=empty($tmparray[1])?'':$tmparray[1];
-		return '<img src="'.$fullpathpicto.'" border="0" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($title).'"').($morealt?' '.$morealt:'').'>';	// Alt is used for accessibility, title for popup
+		return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($title).'"').($morealt?' '.$morealt:'').'>';	// Alt is used for accessibility, title for popup
 	}
 }
 
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 6583ad09b61..bd520676f75 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -828,7 +828,10 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
 
         // Date start
         print '<tr>';
-        print '<td class="fieldrequired">'.$langs->trans("DateDebCP").' ('.$langs->trans("FirstDayOfHoliday").')</td>';
+        print '<td class="fieldrequired">';
+        print $langs->trans("DateDebCP");
+        print ' ('.$langs->trans("FirstDayOfHoliday").')';
+        print '</td>';
         print '<td>';
         // Si la demande ne vient pas de l'agenda
         if (! GETPOST('date_debut_')) {
@@ -844,7 +847,10 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
 
         // Date end
         print '<tr>';
-        print '<td class="fieldrequired">'.$langs->trans("DateFinCP").' ('.$langs->trans("LastDayOfHoliday").')</td>';
+        print '<td class="fieldrequired">';
+        print $langs->trans("DateFinCP");
+        print ' ('.$langs->trans("LastDayOfHoliday").')';
+        print '</td>';
         print '<td>';
         // Si la demande ne vient pas de l'agenda
         if (! GETPOST('date_fin_')) {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3d6e8868bec..6f8e7293efb 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -519,6 +519,12 @@ textarea.centpercent {
 .nounderline {
     text-decoration: none;
 }
+.paddingleft {
+	padding-<?php print $left; ?>: 4px;
+}
+.paddingright {
+	padding-<?php print $right; ?>: 4px;
+}
 .cursorpointer {
 	cursor: pointer;
 }
@@ -1090,7 +1096,8 @@ img.photorefnoborder {
 	height: 48px;
 	width: 48px;
     object-fit: contain;
-    border: 1px solid #CCC;
+    border: 1px solid #AAA;
+    border-radius: 100px;
 }
 .underrefbanner {
 }
@@ -1615,11 +1622,16 @@ img.login, img.printer, img.entity {
 	color: white;
 	font-weight: bold;
 }
-img.loginphoto {
-	border-radius: 2px;
+.userimgatoplogin img.userphoto {		/* size for user photo in login bar */
 	width: 16px;
     height: 16px;
 }
+img.userphoto {			/* size for user photo in lists */
+	border-radius: 2px;
+	width: 18px;
+    height: 18px;
+    vertical-align: middle;
+}
 .span-icon-user {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>);
 	background-repeat: no-repeat;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index aae0fd7f677..46d410e61cb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -526,6 +526,12 @@ textarea.centpercent {
 .nounderline {
     text-decoration: none;
 }
+.paddingleft {
+	padding-<?php print $left; ?>: 4px;
+}
+.paddingright {
+	padding-<?php print $right; ?>: 4px;
+}
 .cursorpointer {
 	cursor: pointer;
 }
@@ -1141,7 +1147,8 @@ img.photorefnoborder {
 	height: 48px;
 	width: 48px;
     object-fit: contain;
-    border: 1px solid #CCC;
+    border: 1px solid #AAA;
+    border-radius: 100px;
 }
 .underrefbanner {
 }
@@ -1654,13 +1661,17 @@ img.login, img.printer, img.entity {
 	color: white;
 	font-weight: bold;
 }
-img.loginphoto {
+.userimgatoplogin img.userphoto {		/* size for user photo in login bar */
 	border-radius: 5px;
-	margin-top: -4px;
-	width: 20px;
-	height: 20px;
+	width: 16px;
+	height: 16px;
+	vertical-align: text-bottom;
+}
+img.userphoto {			/* size for user photo in lists */
+    width: 18px;
+    height: 18px;
+    vertical-align: middle;
 }
-
 .span-icon-user {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>);
 	background-repeat: no-repeat;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index c107c1587ae..4b9c1c9960c 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1981,77 +1981,77 @@ class User extends CommonObject
 	function getNomUrl($withpictoimg=0, $option='', $infologin=0, $notooltip=0, $maxlen=24, $hidethirdpartylogo=0, $mode='',$morecss='')
 	{
 		global $langs, $conf, $db, $hookmanager;
-        	global $dolibarr_main_authentication, $dolibarr_main_demo;
-        	global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
 		if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg=0;
 
-	        $result = '';
-	        $companylink = '';
-	        $link = '';
+		$result = '';
+		$companylink = '';
+		$link = '';
 
-	        $label = '<u>' . $langs->trans("User") . '</u>';
-	        $label.= '<div width="100%">';
-	        $label.= '<b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs,'','');
-	        if (! empty($this->login))
-	        $label.= '<br><b>' . $langs->trans('Login') . ':</b> ' . $this->login;
-	        $label.= '<br><b>' . $langs->trans("EMail").':</b> '.$this->email;
-	        if (! empty($this->admin))
-	        $label.= '<br><b>' . $langs->trans("Administrator").'</b>: '.yn($this->admin);
-	        if (! empty($this->societe_id) )	// Add thirdparty for external users
-	        {
-	            $thirdpartystatic = new Societe($db);
-	            $thirdpartystatic->fetch($this->societe_id);
-	            if (empty($hidethirdpartylogo)) $companylink = ' '.$thirdpartystatic->getNomUrl(2);	// picto only of company
-	            $company=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
-	        }
-	        $type=($this->societe_id?$langs->trans("External").$company:$langs->trans("Internal"));
-	        $label.= '<br><b>' . $langs->trans("Type") . ':</b> ' . $type;
-	        $label.='</div>';
-	        if (! empty($this->photo))
-	        {
-	        	$label.= '<div class="photointooltip">';
+		$label = '<u>' . $langs->trans("User") . '</u>';
+		$label.= '<div width="100%">';
+		$label.= '<b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs,'','');
+		if (! empty($this->login))
+			$label.= '<br><b>' . $langs->trans('Login') . ':</b> ' . $this->login;
+		$label.= '<br><b>' . $langs->trans("EMail").':</b> '.$this->email;
+		if (! empty($this->admin))
+			$label.= '<br><b>' . $langs->trans("Administrator").'</b>: '.yn($this->admin);
+		if (! empty($this->societe_id) )	// Add thirdparty for external users
+		{
+			$thirdpartystatic = new Societe($db);
+			$thirdpartystatic->fetch($this->societe_id);
+			if (empty($hidethirdpartylogo)) $companylink = ' '.$thirdpartystatic->getNomUrl(2);	// picto only of company
+			$company=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
+		}
+		$type=($this->societe_id?$langs->trans("External").$company:$langs->trans("Internal"));
+		$label.= '<br><b>' . $langs->trans("Type") . ':</b> ' . $type;
+		$label.='</div>';
+		if (! empty($this->photo))
+		{
+			$label.= '<div class="photointooltip">';
 			$label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
-	        	$label.= '</div><div style="clear: both;"></div>';
-	        }
+			$label.= '</div><div style="clear: both;"></div>';
+		}
 
-	        // Info Login
-	        if ($infologin)
-	        {
-	            $label.= '<br>';
-	            $label.= '<br><u>'.$langs->trans("Connection").'</u>';
-	            $label.= '<br><b>'.$langs->trans("IPAddress").'</b>: '.$_SERVER["REMOTE_ADDR"];
-	            if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $label.= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$this->entity.')';
-	            $label.= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo)?'':' (demo)');
-	            $label.= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($this->datelastlogin,"dayhour",'tzuser');
-	            $label.= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($this->datepreviouslogin,"dayhour",'tzuser');
-	            $label.= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.$conf->theme;
-	            $label.= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;
-	            $s=picto_from_langcode($langs->getDefaultLang());
-	            $label.= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($s?$s.' ':'').$langs->getDefaultLang();
-	            $label.= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')';
-	            $label.= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
-	            $label.= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
-	            if (! empty($conf->browser->phone)) $label.= '<br><b>'.$langs->trans("Phone").':</b> '.$conf->browser->phone;
-	            if (! empty($_SESSION["disablemodules"])) $label.= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ',explode(',',$_SESSION["disablemodules"]));
-	        }
+		// Info Login
+		if ($infologin)
+		{
+			$label.= '<br>';
+			$label.= '<br><u>'.$langs->trans("Connection").'</u>';
+			$label.= '<br><b>'.$langs->trans("IPAddress").'</b>: '.$_SERVER["REMOTE_ADDR"];
+			if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $label.= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$this->entity.')';
+			$label.= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo)?'':' (demo)');
+			$label.= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($this->datelastlogin,"dayhour",'tzuser');
+			$label.= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($this->datepreviouslogin,"dayhour",'tzuser');
+			$label.= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.$conf->theme;
+			$label.= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;
+			$s=picto_from_langcode($langs->getDefaultLang());
+			$label.= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($s?$s.' ':'').$langs->getDefaultLang();
+			$label.= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')';
+			$label.= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
+			$label.= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
+			if (! empty($conf->browser->phone)) $label.= '<br><b>'.$langs->trans("Phone").':</b> '.$conf->browser->phone;
+			if (! empty($_SESSION["disablemodules"])) $label.= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ',explode(',',$_SESSION["disablemodules"]));
+		}
 
 
-	        if ($option == 'leave') $link.= '<a href="'.DOL_URL_ROOT.'/holiday/list.php?id='.$this->id.'"';
-	        else $link.= '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'"';
+		if ($option == 'leave') $link.= '<a href="'.DOL_URL_ROOT.'/holiday/list.php?id='.$this->id.'"';
+		else $link.= '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'"';
 
-	        $linkclose="";
-	        if (empty($notooltip))
-	        {
-	            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-	            {
-	                $langs->load("users");
-	                $label=$langs->trans("ShowUser");
-	                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-	            }
-	            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-	            $linkclose.= ' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
-	        }
+		$linkclose="";
+		if (empty($notooltip))
+		{
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$langs->load("users");
+				$label=$langs->trans("ShowUser");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.= ' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+		}
 		if (! is_object($hookmanager))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
@@ -2071,9 +2071,11 @@ class User extends CommonObject
 	    {
 	      	$paddafterimage='';
 			if (abs($withpictoimg) == 1) $paddafterimage='style="margin-right: 3px;"';
-        		if ($withpictoimg > 0) $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
-        		else $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto', 'mini', 0, 1).'</div>';
-            		$result.=$picto;
+        	// Only picto
+			if ($withpictoimg > 0) $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
+        	// Picto must be a photo
+			else $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto', 'mini', 0, 1).'</div>';
+            $result.=$picto;
 		}
 		if (abs($withpictoimg) != 2)
 		{
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index bb558bd56b3..888d4ca5317 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -146,8 +146,7 @@ $param="search_statut=".$search_statut;
 print '<table class="liste nohover" width="100%">';
 print '<tr class="liste_titre">';
 print_liste_field_titre($langs->trans("HierarchicView"));
-print '<td align="right"><div id="iddivjstreecontrol"><a href="#">'.img_picto('','object_category').' '.$langs->trans("UndoExpandAll").'</a>';
-print ' | <a href="#">'.img_picto('','object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div></td>';
+print_liste_field_titre('<div id="iddivjstreecontrol"><a href="#">'.img_picto('','object_category').' '.$langs->trans("UndoExpandAll").'</a> | <a href="#">'.img_picto('','object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div>',$_SERVER['PHP_SELF'],"",'',"",'align="center"');
 print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"",'',"",'align="right"');
 print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','','','','maxwidthsearch ');
 print '</tr>';
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index a5e9db67867..29ef7dac061 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -62,22 +62,21 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
 // Search User
-$var=false;
 print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("User").':</td><td><input class="flat inputsearch" type="text" name="search_user" size="18"></td><td'.($canreadperms?' rowspan="2"':'').'><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Search").'</td></tr>';
+print '<tr><td>';
+print $langs->trans("User").':</td><td><input class="flat inputsearch" type="text" name="search_user" size="18"></td></tr>';
 
 // Search Group
 if ($canreadperms)
 {
-	$var=false;
-	print '<tr '.$bc[$var].'><td>';
+	print '<tr><td>';
 	print $langs->trans("Group").':</td><td><input class="flat inputsearch" type="text" name="search_group" size="18"></td></tr>';
 }
 
+print '<tr><td class="center" colspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
 print "</table><br>\n";
 print '</form>';
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 623e2df3434..60defe580a7 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -461,12 +461,10 @@ print "</tr>\n";
 
 $user2=new User($db);
 
-$var=True;
 $i = 0;
 while ($i < min($num,$limit))
 {
     $obj = $db->fetch_object($result);
-    $var=!$var;
 
 	$userstatic->id=$obj->rowid;
 	$userstatic->ref=$obj->label;
@@ -482,18 +480,18 @@ while ($i < min($num,$limit))
 
 	$li=$userstatic->getNomUrl(-1,'',0,0,24,1,'login');
 
-    print "<tr ".$bc[$var].">";
+    print "<tr>";
     if (! empty($arrayfields['u.login']['checked']))
 	{
 	    print '<td>';
 		print $li;
         if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity)
         {
-          	print img_picto($langs->trans("SuperAdministrator"),'redstar');
+          	print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
         }
         else if ($obj->admin)
         {
-        	print img_picto($langs->trans("Administrator"),'star');
+        	print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
         }
         print '</td>';
 	}
@@ -584,11 +582,11 @@ while ($i < min($num,$limit))
 	        print $user2->getNomUrl(-1,'',0,0,24,0,'');
             if (! empty($conf->multicompany->enabled) && $obj->admin2 && ! $obj->entity2)
             {
-              	print img_picto($langs->trans("SuperAdministrator"),'redstar');
+              	print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
             }
             else if ($obj->admin2)
             {
-            	print img_picto($langs->trans("Administrator"),'star');
+            	print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
             }
         }
         print '</td>';

From 996cb9d3f17f23ca0b2bb81868ced4f0cda3a2cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Mar 2017 11:16:30 +0100
Subject: [PATCH 0431/1163] NEW Add function ajax_autoselect

---
 htdocs/core/lib/ajax.lib.php     | 19 +++++++++++++++++++
 htdocs/opensurvey/card.php       | 14 ++------------
 htdocs/paypal/lib/paypal.lib.php |  3 ++-
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 68e3f079361..c16453b73b4 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -347,6 +347,25 @@ function ajax_dialog($title,$message,$w=350,$h=150)
     return $msg;
 }
 
+
+/**
+ * Make a input box content all selected
+ * 
+ * @param string	$htmlname	Id of html object 
+ * @param int		$addlink	Add a link to after
+ */
+function ajax_autoselect($htmlname, $addlink=0)
+{
+	global $langs;
+	$out = '<script type="text/javascript">
+               jQuery(document).ready(function () {
+				    jQuery("#'.$htmlname.'").click(function() { jQuery(this).select(); } );
+				});
+		    </script>';
+	if ($addlink) $out.=' <a href="'.$url.'" target="_blank">'.$langs->trans("Link").'</a>';
+	return $out;
+}
+
 /**
  * Convert a html select field into an ajax combobox.
  * Use ajax_combobox() only for small combo list! If not, use instead ajax_autocompleter().
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 133f1554b49..bb4d4650344 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -338,18 +338,8 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 $url=$urlwithouturlroot.dol_buildpath('/public/opensurvey/studs.php',1).'?sondage='.$object->id_sondage;
-$urllink='<input type="text" style="width: 60%" '.($action == 'edit' ? 'disabled' : '').' id="opensurveyurl" name="opensurveyurl" value="'.$url.'">';
-print $urllink;
-if ($action != 'edit')
-{
-	print '<script type="text/javascript">
-               jQuery(document).ready(function () {
-				    jQuery("#opensurveyurl").click(function() { jQuery(this).select(); } );
-				});
-		    </script>';
-	print ' <a href="'.$url.'" target="_blank">'.$langs->trans("Link").'</a>';
-
-}
+print '<input type="text" style="width: 60%" '.($action == 'edit' ? 'disabled' : '').' id="opensurveyurl" name="opensurveyurl" value="'.$url.'">';
+if ($action != 'edit') print ajax_autoselect("opensurveyurl", 1);
 
 print '</td></tr>';
 
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 1496bb3552e..4c1cb588f1f 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -209,7 +209,8 @@ function showPaypalPaymentUrl($type,$ref)
     $out='<br><br>';
     $out.=img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
     $url=getPaypalPaymentUrl(0,$type,$ref);
-    $out.='<input type="text" id="paypalurl" class="quatrevingtpercent" value="'.$url.'"><br>';
+    $out.='<input type="text" id="paypalurl" class="quatrevingtpercent" value="'.$url.'">';
+    $out.=ajax_autoselect("paypalurl", 0);
     return $out;
 }
 

From e72f0076edf57a51dd39d7c1726830826b6a0810 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Mar 2017 13:06:38 +0100
Subject: [PATCH 0432/1163] Remove border-bottom useless

---
 htdocs/margin/tabs/thirdpartyMargins.php | 2 +-
 htdocs/societe/agenda.php                | 2 +-
 htdocs/societe/commerciaux.php           | 2 +-
 htdocs/societe/consumption.php           | 2 +-
 htdocs/societe/document.php              | 2 +-
 htdocs/societe/note.php                  | 2 +-
 htdocs/societe/notify/card.php           | 2 +-
 htdocs/societe/project.php               | 2 +-
 htdocs/societe/rib.php                   | 2 +-
 htdocs/theme/eldy/style.css.php          | 2 +-
 htdocs/theme/md/style.css.php            | 7 ++++---
 11 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index df472489c36..99df684342d 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -89,7 +89,7 @@ if ($socid > 0)
 
     $head = societe_prepare_head($object);
 
-    dol_fiche_head($head, 'margin', $langs->trans("ThirdParty"),0,'company');
+    dol_fiche_head($head, 'margin', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
     
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 644cda92bc4..36fbe790bf3 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -118,7 +118,7 @@ if ($socid > 0)
 	if (! empty($conf->notification->enabled)) $langs->load("mails");
 	$head = societe_prepare_head($object);
 
-	dol_fiche_head($head, 'agenda', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'agenda', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
 	
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index dd8802779b8..2126c81ddfe 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -112,7 +112,7 @@ if (! empty($socid))
 
 	$head=societe_prepare_head2($object);
 
-	dol_fiche_head($head, 'salesrepresentative', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'salesrepresentative', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
 	
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index fb154790210..0bff649d7d3 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -112,7 +112,7 @@ if (empty($socid))
 }
 
 $head = societe_prepare_head($object);
-dol_fiche_head($head, 'consumption', $langs->trans("ThirdParty"),0,'company');
+dol_fiche_head($head, 'consumption', $langs->trans("ThirdParty"), -1, 'company');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index d83822c2cd7..48f5fd79621 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -98,7 +98,7 @@ if ($object->id)
 
 	$form=new Form($db);
 
-	dol_fiche_head($head, 'document', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
 
 
 	// Construit liste des fichiers
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index 9ca7f1fcd2a..c713250a0e2 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -71,7 +71,7 @@ if ($id > 0)
 
     $head = societe_prepare_head($object);
 
-    dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
+    dol_fiche_head($head, 'note', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
     
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index bc754d8e9a4..63d33dcee1d 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -153,7 +153,7 @@ if ($result > 0)
 
     $head = societe_prepare_head($object);
 
-    dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"),0,'company');
+    dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
     
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index fe206dd4cc5..72c371ce934 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -79,7 +79,7 @@ if ($socid)
 	if (! empty($conf->notification->enabled)) $langs->load("mails");
 	$head = societe_prepare_head($object);
 
-	dol_fiche_head($head, 'project', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
 	
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index feea1aca0ce..f1db2d21835 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -344,7 +344,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 // View
 if ($socid && $action != 'edit' && $action != "create")
 {
-	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'rib', $langs->trans("ThirdParty"), -1, 'company');
 
 	// Confirm delete third party
     if ($action == 'delete')
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c1b0ece5df0..4495f5e2719 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2451,7 +2451,7 @@ div.refid  {
   	font-size: 160%;
 }
 div.refidno  {
-	padding-top: 2px;
+	padding-top: 8px;
 	font-weight: normal;
   	color: #444;
   	font-size: <?php print $fontsize ?>px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3c3e60ca129..e464482addb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1906,17 +1906,18 @@ div.tabBar {
     padding-top: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
     padding-left: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
     padding-right: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
-    padding-bottom: <?php echo ($dol_optimize_smallscreen?'2':'2'); ?>px;
     margin: 0px 0px 16px 0px;
     -moz-border-radius:3px;
     -webkit-border-radius: 3px;
 	border-radius: 3px;
     border-right: 1px solid #BBB;
-    /* border-bottom: 1px solid #BBB; */
     border-left: 1px solid #BBB;
     border-top: 1px solid #CCC;
 	width: auto;
 	background: rgb(<?php echo $colorbacktabcard1; ?>);
+
+	padding-bottom: 12px;
+	border-bottom: 1px solid #aaa; 
 }
 div.tabBarWithBottom {
 	padding-bottom: 18px;
@@ -2363,7 +2364,7 @@ div.refid  {
   	font-size: 160%;
 }
 div.refidno  {
-	padding-top: 2px;
+	padding-top: 8px;
 	font-weight: normal;
   	color: #444;
   	font-size: <?php print $fontsize ?>px;

From 22247271f6c36a7494e9239375042df0c4c080fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Mar 2017 13:19:00 +0100
Subject: [PATCH 0433/1163] CSS enhancement

---
 htdocs/compta/bank/ligne.php    | 3 ++-
 htdocs/theme/eldy/style.css.php | 2 ++
 htdocs/theme/md/style.css.php   | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 8c1f2af7b1f..53153c62189 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -539,7 +539,8 @@ if ($result)
         // Releve rappro
         if ($acct->canBeConciliated() > 0)  // Si compte rapprochable
         {
-            print '<br>'."\n";
+            print '<br><hr>'."\n";
+            
             print load_fiche_titre($langs->trans("Reconciliation"), '', 'title_bank.png');
             print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$objp->rowid.'">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4495f5e2719..6197458fc74 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -388,6 +388,8 @@ input[name=surface] { margin-right: 4px; }
 fieldset { border: 1px solid #AAAAAA !important; }
 .legendforfieldsetstep { padding-bottom: 10px; }
 
+hr { border: 0; border-top: 1px solid #ccc; }
+
 .button, .buttonDelete, input[name="sbmtConnexion"] {
     font-family: <?php print $fontlist ?>;
 	border-color: #c5c5c5;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e464482addb..26c3f75b8e2 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -393,6 +393,7 @@ input:-moz-placeholder { color:#ccc; }
 fieldset { border: 1px solid #AAAAAA !important; }
 .legendforfieldsetstep { padding-bottom: 10px; }
 
+hr { border: 0; border-top: 1px solid #ccc; }
 
 .button, .buttonDelete, input[name="sbmtConnexion"] {
     font-family: <?php print $fontlist ?>;

From 53a04703d636cdd3f314a8695b09068e43906624 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Mar 2017 16:10:38 +0100
Subject: [PATCH 0434/1163] Uniformize code

---
 htdocs/compta/sociales/document.php           |  2 +-
 htdocs/compta/sociales/info.php               |  2 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  1 +
 .../mysql/tables/llx_chargesociales.sql       |  3 ++-
 htdocs/projet/document.php                    |  2 +-
 htdocs/projet/element.php                     | 26 +++++++++----------
 htdocs/projet/note.php                        |  2 +-
 htdocs/projet/tasks/task.php                  |  6 +++--
 htdocs/theme/eldy/style.css.php               |  2 +-
 htdocs/theme/md/style.css.php                 |  2 +-
 10 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index a6f4bc10daf..4d3f908e73c 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -99,7 +99,7 @@ if ($object->id)
 
     $head=tax_prepare_head($object);
 
-    dol_fiche_head($head, 'documents',  $langs->trans("SocialContribution"), 0, 'bill');
+    dol_fiche_head($head, 'documents',  $langs->trans("SocialContribution"), -1, 'bill');
 
 	$morehtmlref='<div class="refidno">';
 	// Label of social contribution
diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index ff905f1ee6c..7caa212be9e 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -62,7 +62,7 @@ $object->info($id);
 
 $head = tax_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("SocialContribution"), 0, 'bill');
+dol_fiche_head($head, 'info', $langs->trans("SocialContribution"), -1, 'bill');
 
 $morehtmlref='<div class="refidno">';
 // Label of social contribution
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 6804576c9bd..d0accdda693 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -122,4 +122,5 @@ INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('CONTRA
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USERGROUP_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/usergroups', 'chaine', 0, '');
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USER_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0, '');
 
+ALTER TABLE llx_chargesociales ADD COLUMN ref varchar(16);
 ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index 5c07c9a74fc..519ceacc9e5 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -21,6 +21,7 @@
 create table llx_chargesociales
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
+  ref               varchar(16),				   -- "TX...."
   date_ech			datetime NOT NULL,             -- date echeance
   libelle			varchar(80) NOT NULL,
   entity			integer DEFAULT 1 NOT NULL,	  -- multi company id
@@ -46,4 +47,4 @@ create table llx_chargesociales
 -- 1 : first company tax
 -- 2 : second company tax
 -- 3 : etc...
---
\ No newline at end of file
+--
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index d61c9085f68..ab43a752d15 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -96,7 +96,7 @@ if ($object->id > 0)
     //print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
 	$head = project_prepare_head($object);
-	dol_fiche_head($head, 'document', $langs->trans("Project"), 0, ($object->public?'projectpub':'project'));
+	dol_fiche_head($head, 'document', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
 	// Files list constructor
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index eec48b2a5bd..1efc4465d81 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -388,6 +388,19 @@ $listofreferent=array(
     'buttonnew'=>'AddLoan',
     'testnew'=>$user->rights->loan->write,
     'test'=>$conf->loan->enabled && $user->rights->loan->read),
+'chargesociales'=>array(
+    'name'=>"SocialContribution",
+    'title'=>"ListSocialContributionAssociatedProject",
+    'class'=>'ChargeSociales',
+    'margin'=>'add',
+    'table'=>'chargesociales',
+    'datefieldname'=>'date_ech',
+    'disableamount'=>0,
+    'urlnew'=>DOL_URL_ROOT.'/compta/sociales/card.php?action=create&projectid='.$id,
+    'lang'=>'compta',
+    'buttonnew'=>'AddSocialContribution',
+    'testnew'=>$user->rights->tax->charges->lire,
+    'test'=>$conf->tax->enabled && $user->rights->tax->charges->lire),    
 'project_task'=>array(
 	'name'=>"TaskTimeValorised",
 	'title'=>"ListTaskTimeUserProject",
@@ -409,19 +422,6 @@ $listofreferent=array(
 	'datefieldname'=>'datem',
 	'disableamount'=>0,
 	'test'=>($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW))),
-'chargesociales'=>array(
-	'name'=>"SocialContribution",
-	'title'=>"ListSocialContributionAssociatedProject",
-	'class'=>'ChargeSociales',
-	'margin'=>'add',
-	'table'=>'chargesociales',
-	'datefieldname'=>'date_ech',
-	'disableamount'=>0,
-    'urlnew'=>DOL_URL_ROOT.'/compta/sociales/card.php?action=create&projectid='.$id,
-    'lang'=>'compta',
-    'buttonnew'=>'AddSocialContribution',
-    'testnew'=>$user->rights->tax->charges->lire,
-    'test'=>$conf->tax->enabled && $user->rights->tax->charges->lire)
 /* No need for this, available on dedicated tab "Agenda/Events"
 'agenda'=>array(
 	'name'=>"Agenda",
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index b00eae5d54d..a6b6e3c93e2 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -77,7 +77,7 @@ if ($id > 0 || ! empty($ref))
 	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
 	$head = project_prepare_head($object);
-	dol_fiche_head($head, 'notes', $langs->trans('Project'), 0, ($object->public?'projectpub':'project'));
+	dol_fiche_head($head, 'notes', $langs->trans('Project'), -1, ($object->public?'projectpub':'project'));
 
 	
 	// Project card
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 84dccbb93e7..2665b0b33b5 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -430,13 +430,14 @@ if ($id > 0 || ! empty($ref))
 			$param=($withproject?'&withproject=1':'');
 			$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
 
-			dol_fiche_head($head, 'task_task', $langs->trans("Task"),0,'projecttask');
+			dol_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask');
 
 			if ($action == 'delete')
 			{
 				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&withproject='.$withproject,$langs->trans("DeleteATask"),$langs->trans("ConfirmDeleteATask"),"confirm_delete");
 			}
 
+			print '<div class="fichecenter">';
 			print '<table class="border" width="100%">';
 
 			// Ref
@@ -522,7 +523,8 @@ if ($id > 0 || ! empty($ref))
 			}
 
 			print '</table>';
-
+            print '</div>';
+            
 			dol_fiche_end();
 		}
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 6197458fc74..a394eae4312 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1061,7 +1061,7 @@ div.nopadding {
 	width: 44px;
 }
 div.attacharea {
-	padding-top: 10px;
+	padding-top: 18px;
 	padding-bottom: 10px;
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 26c3f75b8e2..55741cdcffd 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1112,7 +1112,7 @@ table.noborder tr.liste_titre td {
 	width: 44px;
 }
 div.attacharea {
-	padding-top: 10px;
+	padding-top: 18px;
 	padding-bottom: 10px;
 }
 div.arearef {

From 4bc2864a6f86b7fb41732a5b98524a4a6bc02dc8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Mar 2017 19:26:28 +0100
Subject: [PATCH 0435/1163] Better board for open items

---
 htdocs/index.php                | 80 +++++++++++++++------------------
 htdocs/projet/info.php          |  2 +-
 htdocs/theme/eldy/style.css.php | 51 ++++++++++++++++-----
 htdocs/theme/md/style.css.php   | 50 ++++++++++++++++-----
 4 files changed, 115 insertions(+), 68 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 75ee74144f2..86ea10b801f 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -337,7 +337,7 @@ if (empty($user->societe_id))
 	            $text=$langs->trans($titres[$key]);
 	            $boxstat.='<a href="'.$links[$key].'" class="boxstatsindicator thumbstat nobold nounderline">';
 	            $boxstat.='<div class="boxstats">';
-	            $boxstat.='<span class="boxstatstext">'.img_object("",$icons[$key]).' '.$text.'</span><br>';
+	            $boxstat.='<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.img_object("",$icons[$key]).' '.$text.'</span><br>';
 	            $boxstat.='<span class="boxstatsindicator">'.$board->nb[$val].'</span>';
 	            $boxstat.='</div>';
 	            $boxstat.='</a>';
@@ -530,33 +530,26 @@ $boxwork.='<div class="box">';
 $boxwork.='<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable" width="100%">'."\n";
 $boxwork.='<tr class="liste_titre">';
 $boxwork.='<th class="liste_titre">'.$langs->trans("DolibarrWorkBoard").'</th>';
-$boxwork.='<th class="liste_titre" align="right">'.$langs->trans("Number").'</th>';
-$boxwork.='<th class="liste_titre" align="right">'.$form->textwithpicto($langs->trans("Late"),$langs->trans("LateDesc")).'</th>';
-$boxwork.='<th class="liste_titre" style="width: 22px">&nbsp;</th>';
+//$boxwork.='<th class="liste_titre" align="right">'.$langs->trans("Number").'</th>';
+//$boxwork.='<th class="liste_titre" align="right">'.$form->textwithpicto($langs->trans("Late"),$langs->trans("LateDesc")).'</th>';
+//$boxwork.='<th class="liste_titre" style="width: 22px">&nbsp;</th>';
 //print '<th class="liste_titre" width="20">&nbsp;</th>';
 //if ($showweather) $boxwork.='<th class="liste_titre hideonsmartphone" width="80">&nbsp;</th>';
 $boxwork.='</tr>'."\n";
 
 if ($showweather)
-{
-    $var=!$var;
+{/*
     $boxwork.='<tr class="nohover">';
-    $boxwork.='<td colspan="4" class="nohover hideonsmartphone center valignmiddle">';
-    //$boxwork.=$langs->trans("Meteo");
-    //$boxwork.='</td><td colspan="2" class="nohover center">';
+    $boxwork.='<td class="nohover hideonsmartphone center valignmiddle">';
     $text='';
     if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
     $options='height="64px"';
     $boxwork.=showWeather($totallate,$text,$options);
     $boxwork.='</td>';
-    /*$boxwork.='<td align="left" colspan="3" class="nohover">';
-    if ($board->nbtodolate > 0) $boxwork.=img_picto($textlate,"warning");
-    else $boxwork.='&nbsp;';
-    $boxwork.='</td>';*/
-    $boxwork.='</tr>';
-    $showweather=0;
+    $boxwork.='</tr>';*/
 }
 
+$boxwork.='<td class="tdboxstats nohover flexcontainer">';
 
 // Show dashboard
 $nbworkboardempty=0;
@@ -565,41 +558,36 @@ if (! empty($valid_dashboardlines))
     foreach($valid_dashboardlines as $board)
     {
         if (empty($boad->nbtodo)) $nbworkboardempty++;
-        
-        $var=!$var;
-        $boxwork .= '<tr class="oddeven'.($board->nbtodo?'':' workboardempty').'"><td class="nowrap">'.$board->img.' &nbsp; '.$board->label.'</td>';
-        $boxwork .= '<td align="right"><a class="dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator">'.$board->nbtodo.'</span></a></td>';
-        $boxwork .= '<td align="right">';
+
         $textlate = $langs->trans("NActionsLate",$board->nbtodolate);
         $textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
-        $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
-        $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
-        $boxwork .= $board->nbtodolate;
-        $boxwork .= '</span>';
-        $boxwork .= '</a>';
-        $boxwork .='</td>';
-        $boxwork .='<td>';
-        if ($board->nbtodolate > 0) $boxwork .=img_picto($textlate, "warning", 'class="valignmiddle"').' ';
-        $boxwork .='</td>';
-        /*print '<td class="nowrap" align="right">';
-        print ' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')';
-        print '</td>';*/
-        /*
-        if ($showweather)
+        
+        $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
+        $boxwork .= '<div class="boxstatscontent">';
+        $boxwork .= $board->img.' '.$board->label.'<br>';
+        $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0)?' dashboardlineok':'').'">'.$board->nbtodo.'</span></a>';
+        $boxwork .= '</div>';
+        if ($board->nbtodolate > 0)
         {
-            $boxwork.='<td class="nohover hideonsmartphone noborderbottom" rowspan="'.$rowspan.'" width="80" style="border-left: 1px solid #DDDDDD" align="center">';
-            $text='';
-            if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
-            $options='height="64px"';
-            if ($rowspan <= 2) $options='height="24"';  // Weather logo is smaller if dashboard has few elements
-            else if ($rowspan <= 3) $options='height="48"';  // Weather logo is smaller if dashboard has few elements
-            $boxwork.=showWeather($totallate,$text,$options);
-            $boxwork.='</td>';
-            $showweather=0;
-        }*/
-        $boxwork .='</tr>';
+            $boxwork .= '<div class="dashboardlinelatecoin nowrap">';
+            $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
+            $boxwork .= img_picto($textlate, "warning", 'class="valigntextbottom"').'';
+            $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
+            $boxwork .= $board->nbtodolate;
+            $boxwork .= '</span>';
+            $boxwork .= '</a>';
+            $boxwork .= '</div>';
+        }
+        $boxwork.='</div></div>';
         $boxwork .="\n";
     }
+    
+    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
+    $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
 }
 else
 {
@@ -610,6 +598,8 @@ else
     $boxwork.='</tr>';
 }
 
+$boxwork.='</td></tr>';
+
 $boxwork.='</table>';   // End table array of working board
 $boxwork.='</div>';
 
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 65a95e232ff..3206fd51244 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -107,7 +107,7 @@ llxHeader("",$title,$help_url);
 
 $head = project_prepare_head($object);
 
-dol_fiche_head($head, 'agenda', $langs->trans("Project"), 0, ($object->public?'projectpub':'project'));
+dol_fiche_head($head, 'agenda', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
 
 // Project card
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a394eae4312..aaa9254987b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -677,6 +677,11 @@ div.fiche>form>div.div-table-responsive {
 }
 .thumbstat {
 	flex: 1 1 120px;
+}
+.thumbstat150 {
+	flex: 1 1 150px;
+}
+.thumbstat, thumbstat150 {
     /* flex-grow: 1; */
     /* flex-shrink: 1; */
     /* flex-basis: 140px; */
@@ -2854,26 +2859,37 @@ div.tabBar .noborder {
 .ficheaddleft div.boxstats {
     border: none;
 }
-.boxstats {
+.boxstatsborder {
+    border: 1px solid #CCC !important;
+}
+.boxstats, .boxstats130 {
     display: inline-block;
     margin: 3px;
-    padding: 3px;
-	/*-moz-box-shadow: 3px 3px 4px #DDD;
-    -webkit-box-shadow: 3px 3px 4px #DDD;
-    box-shadow: 3px 3px 4px #DDD;
-    margin-bottom: 8px !important;*/
     border: 1px solid #CCC;
     text-align: center;
     border-radius: 2px;
-    
+}
+.boxstats, .boxstats130, .boxstatscontent {    
 	white-space: nowrap;
 	overflow: hidden;
     text-overflow: ellipsis;
-    width: 115px;    
 }
+.boxstats {
+    padding: 3px;
+    width: 105px;    
+}
+.boxstats130 {
+    width: 135px; 
+    height: 48px;
+    padding: 3px  
+}
+.boxstatscontent {
+	padding: 3px;
+}
+
 @media only screen and (max-width: 767px)
 {
-    .boxstats {
+    .boxstats, .boxstats130 {
         width: 100px;    
     }
 }
@@ -2890,15 +2906,25 @@ span.boxstatsindicator {
 	font-weight: normal;
 }
 span.dashboardlineindicator, span.dashboardlineindicatorlate {
-	font-size: 120%;
+	font-size: 130%;
 	font-weight: normal;
 }
+.dashboardlineindicatorlate img {
+	width: 16px;
+}
 span.dashboardlineok {
 	color: #008800;
 }
 span.dashboardlineko {
 	color: #880000;
-	font-weight: bold;
+	/* font-weight: bold; */
+	font-size: 100%;	
+}
+.dashboardlinelatecoin {
+	float: right;
+	position: relative;
+    text-align: right;
+    top: -22px
 }
 .boxtable {
     margin-bottom: 8px !important;
@@ -2910,6 +2936,9 @@ span.dashboardlineko {
 .tdboxstats {
 	text-align: center;
 }
+a.valignmiddle.dashboardlineindicator {
+    line-height: 30px;
+}
 
 .box {
     padding-right: 0px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 55741cdcffd..994a5be6924 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -684,6 +684,11 @@ div.fiche>form>div.div-table-responsive {
 }
 .thumbstat {
 	flex: 1 1 120px;
+}
+.thumbstat150 {
+	flex: 1 1 150px;
+}
+.thumbstat, thumbstat150 {
     /* flex-grow: 1; */
     /* flex-shrink: 1; */
     /* flex-basis: 140px; */
@@ -2769,27 +2774,33 @@ div .tdtop {
 .ficheaddleft div.boxstats {
     border: none;
 }
-.boxstats {
+.boxstatsborder {
+    border: 1px solid #CCC !important;
+}
+.boxstats, .boxstats130 {
     display: inline-block;
     margin: 3px;
-    padding: 3px;
-	/*-moz-box-shadow: 3px 3px 4px #f4f4f4;
-    -webkit-box-shadow: 3px 3px 4px #f4f4f4;
-    box-shadow: 3px 3px 4px #f4f4f4;
-    margin-bottom: 8px !important;*/
     border: 1px solid #CCC;
     text-align: center;
     border-radius: 2px;
-    min-height: 38px;
-    
+}
+.boxstats, .boxstats130, .boxstatscontent {    
 	white-space: nowrap;
 	overflow: hidden;
     text-overflow: ellipsis;
-    width: 115px;    
+}
+.boxstats {
+    padding: 3px;
+    width: 105px;    
+}
+.boxstats130 {
+    width: 135px; 
+    height: 48px;
+    padding: 3px  
 }
 @media only screen and (max-width: 767px)
 {
-    .boxstats {
+    .boxstats, .boxstats130 {
         width: 100px;    
     }
 }
@@ -2806,7 +2817,10 @@ span.boxstatsindicator {
 }
 span.dashboardlineindicator, span.dashboardlineindicatorlate {
 	font-size: 120%;
-	font-weight: bold;
+	font-weight: normal;
+}
+.dashboardlineindicatorlate img {
+	width: 16px;
 }
 span.dashboardlineok {
 	color: #008800;
@@ -2815,6 +2829,16 @@ span.dashboardlineko {
 	color: #880000;
 	font-weight: bold;
 }
+.dashboardlinelatecoin {
+	float: right;
+	position: relative;
+    text-align: right;
+    top: -22px
+}
+.boxtable {
+    margin-bottom: 8px !important;
+    border-bottom-width: 1px;
+}
 .boxtable {
     margin-bottom: 8px !important;
     border-bottom-width: 1px;
@@ -2825,6 +2849,10 @@ span.dashboardlineko {
 .tdboxstats {
 	text-align: center;
 }
+a.valignmiddle.dashboardlineindicator {
+    line-height: 30px;
+}
+
 
 .box {
     padding-right: 0px;

From eb145faffd31b3b78a8ebd4cbe0b834072587774 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Mar 2017 19:57:45 +0100
Subject: [PATCH 0436/1163] Replace parameter mixte with textselect

---
 htdocs/core/class/html.form.class.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index af0502e7def..21c3b5dbcfe 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4878,13 +4878,13 @@ class Form
      *	Function to show a form to select a duration on a page
      *
      *	@param	string	$prefix   		Prefix for input fields
-     *	@param  int	$iSecond  		Default preselected duration (number of seconds or '')
-     * 	@param	int	$disabled		Disable the combo box
+     *	@param  int	$iSecond  		    Default preselected duration (number of seconds or '')
+     * 	@param	int	$disabled           Disable the combo box
      * 	@param	string	$typehour		If 'select' then input hour and input min is a combo,
-     *						if 'text' input hour is in text and input min is a text, 
-     *						if 'mixte' input hour is in text and input min is a combo
-     *  @param	integer	$minunderhours		If 1, show minutes selection under the hours
-     * 	@param	int	$nooutput		Do not output html string but return it
+     *						            if 'text' input hour is in text and input min is a text, 
+     *						            if 'textselect' input hour is in text and input min is a combo
+     *  @param	integer	$minunderhours	If 1, show minutes selection under the hours
+     * 	@param	int	$nooutput		    Do not output html string but return it
      *  @return	string|null
      */
     function select_duration($prefix, $iSecond='', $disabled=0, $typehour='select', $minunderhours=0, $nooutput=0)
@@ -4918,7 +4918,7 @@ class Form
 	        }
 	        $retstring.="</select>";
         }
-        elseif ($typehour=='text' || $typehour=='mixte')
+        elseif ($typehour=='text' || $typehour=='textselect')
         {
         	$retstring.='<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">';
         }
@@ -4931,7 +4931,7 @@ class Form
         if ($minunderhours) $retstring.='<br>';
         else $retstring.="&nbsp;";
 
-        if ($typehour=='select' || $typehour=='mixte')
+        if ($typehour=='select' || $typehour=='textselect')
         {
 	        $retstring.='<select class="flat" name="'.$prefix.'min"'.($disabled?' disabled':'').'>';
 	        for ($min = 0; $min <= 55; $min=$min+5)

From cb0eb26faaf3b6dd16814b5633696ff90f70a9c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Mar 2017 20:37:04 +0100
Subject: [PATCH 0437/1163] Fix phpunit

---
 test/phpunit/FunctionsLibTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 786970e2b3a..a53f971904c 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -712,15 +712,15 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
 
         $s=img_picto('title','/fullpath/img.png','',1);
         print __METHOD__." s=".$s."\n";
-        $this->assertEquals('<img src="/fullpath/img.png" border="0" alt="" title="title">',$s,'testImgPicto3');
+        $this->assertEquals('<img src="/fullpath/img.png" alt="" title="title">',$s,'testImgPicto3');
 
         $s=img_picto('title','/fullpath/img.png','',true);
         print __METHOD__." s=".$s."\n";
-        $this->assertEquals('<img src="/fullpath/img.png" border="0" alt="" title="title">',$s,'testImgPicto4');
+        $this->assertEquals('<img src="/fullpath/img.png" alt="" title="title">',$s,'testImgPicto4');
 
         $s=img_picto('title:alt','/fullpath/img.png','',true);
         print __METHOD__." s=".$s."\n";
-        $this->assertEquals('<img src="/fullpath/img.png" border="0" alt="alt" title="title">',$s,'testImgPicto5');
+        $this->assertEquals('<img src="/fullpath/img.png" alt="alt" title="title">',$s,'testImgPicto5');
     }
 
     /**

From 664380d304cfea59874d1af26d2670099d114ba6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Mar 2017 21:24:57 +0100
Subject: [PATCH 0438/1163] Css enhancement

---
 htdocs/core/class/html.formfile.class.php   |  2 +-
 htdocs/core/menus/standard/auguria_menu.php |  8 ++++----
 htdocs/core/menus/standard/eldy_menu.php    | 19 +++++++++++++------
 htdocs/core/menus/standard/empty.php        |  8 ++++----
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 5aa699c055c..802b547eae8 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -992,7 +992,7 @@ class FormFile
 			    print '<input type="hidden" name="id" value="'.$object->id.'">';
 			    print '<input type="hidden" name="modulepart" value="'.$modulepart.'">';
 			}
-			print '<table width="100%" id="tablelines" class="'.($useinecm?'liste noborderbottom':'liste').'">'."\n";
+			print '<table width="100%" id="tablelines" class="'.($useinecm?'liste noborder':'liste').'">'."\n";
 			
 			print '<tr class="liste_titre nodrag nodrop">';
 			print_liste_field_titre($langs->trans("Documents2"),$url,"name","",$param,'align="left"',$sortfield,$sortorder);
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 5402ac5bbd1..4b19ffd5f3b 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -150,8 +150,8 @@ class MenuManager
         	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
         	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         	{
-        		print '<ul class="ulmenu" data-role="listview" data-inset="true">';
-        		print '<li data-role="list-dividerxxx" class="lilevel0">';
+        		print '<ul class="ulmenu" data-inset="true">';
+        		print '<li class="lilevel0">';
         		if ($val['enabled'] == 1)
         		{
         			$relurl=dol_buildpath($val['url'],1);
@@ -175,7 +175,7 @@ class MenuManager
         				|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/index.php') !== false))
 					{
 						// We add sub entry
-						print str_pad('',1).'<li data-role="list-dividerxxx" class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
+						print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
 						print '<a href="'.$relurl.'">';
 					    if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation 
         				{
@@ -199,7 +199,7 @@ class MenuManager
 	        				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
 	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
 	        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
-	        				if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-dividerxxx"':'').' class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
+	        				if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
 	        				else print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).'">';	 // ui-btn to highlight on clic
 	        				if ($relurl2)
 	        				{
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 0b876899272..9750811ffa5 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -159,8 +159,8 @@ class MenuManager
         	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
         	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         	{
-        		print '<ul class="ulmenu" data-role="listview" data-inset="true">';
-        		print '<li data-role="list-dividerxxx" class="lilevel0">';
+        		print '<ul class="ulmenu" data-inset="true">';
+        		print '<li class="lilevel0">';
 
         		if ($val['enabled'] == 1)
         		{
@@ -168,7 +168,14 @@ class MenuManager
 					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
 					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
 
-        			print '<a class="alilevel0" href="#">'.$val['titre'].'</a>'."\n";
+					
+        			print '<a class="alilevel0" href="#">';
+					
+					// Add font-awesome
+					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+        			
+					print $val['titre'];
+        			print '</a>'."\n";
         			// Search submenu fot this mainmenu entry
         			$tmpmainmenu=$val['mainmenu'];
         			$tmpleftmenu='all';
@@ -187,13 +194,13 @@ class MenuManager
         				|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/index.php') !== false))
 					{
         				// We add sub entry
-        				print str_pad('',1).'<li data-role="list-dividerxxx" class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
+        				print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
         				print '<a href="'.$relurl.'"';
         				//print ' data-ajax="false"';
         				print '>';
         				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation 
         				{
-        				    if ($val['mainmenu'] == 'cashdesk') print $langs->trans("Access");
+        				    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
         				    else print $langs->trans("Dashboard");	
         				}
         				else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
@@ -214,7 +221,7 @@ class MenuManager
 	        				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
 	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
 	        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
-	        				if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-dividerxxx"':'').' class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
+	        				if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
 	        				else print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).'">';	 // ui-btn to highlight on clic
 	        				if ($relurl2)
 	        				{
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 6bc3df987cc..9a98fa4ffa4 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -244,8 +244,8 @@ class MenuManager
 		{
 			foreach($this->topmenu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 			{
-				print '<ul class="ulmenu" data-role="listview" data-inset="true">';
-				print '<li data-role="list-dividerxxx" class="lilevel0">';
+				print '<ul class="ulmenu" data-inset="true">';
+				print '<li class="lilevel0">';
 				if ($val['enabled'] == 1)
 				{
 					$relurl=dol_buildpath($val['url'],1);
@@ -269,7 +269,7 @@ class MenuManager
         			if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))
 					{
 						// We add sub entry
-						print '<li data-role="list-dividerxxx"><a href="'.$relurl.'">'.$langs->trans("MainArea").'-'.$val['titre'].'</a></li>'."\n";
+						print '<li><a href="'.$relurl.'">'.$langs->trans("MainArea").'-'.$val['titre'].'</a></li>'."\n";
 					}
 					foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 					{
@@ -277,7 +277,7 @@ class MenuManager
 						$relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2);
 						$relurl2=preg_replace('/__USERID__/',$user->id,$relurl2);
 						//var_dump($val2);
-						print '<li'.($val2['level']==0?' data-role="list-dividerxxx"':'').'><a href="'.$relurl2.'">'.$val2['titre'].'</a></li>'."\n";
+						print '<li><a href="'.$relurl2.'">'.$val2['titre'].'</a></li>'."\n";
 					}
 					//var_dump($submenu);
 					print '</ul>';

From 38660418b4b5c51cec2e4d52d6155d2244ab19d4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Mar 2017 22:24:39 +0100
Subject: [PATCH 0439/1163] Include preview of pdf into dol_banner

---
 htdocs/comm/propal/apercu.php         | 224 ---------------
 htdocs/comm/propal/card.php           |  39 +--
 htdocs/comm/propal/contact.php        |   2 +-
 htdocs/comm/propal/document.php       |   2 +-
 htdocs/comm/propal/info.php           |   2 +-
 htdocs/comm/propal/note.php           |   2 +-
 htdocs/commande/apercu.php            | 223 ---------------
 htdocs/compta/facture/apercu.php      | 392 --------------------------
 htdocs/core/class/html.form.class.php |   4 +-
 htdocs/core/lib/functions.lib.php     |  69 ++++-
 htdocs/core/lib/invoice.lib.php       |   8 -
 htdocs/core/lib/order.lib.php         |   8 -
 htdocs/core/lib/propal.lib.php        |   7 -
 13 files changed, 69 insertions(+), 913 deletions(-)
 delete mode 100644 htdocs/comm/propal/apercu.php
 delete mode 100644 htdocs/commande/apercu.php
 delete mode 100644 htdocs/compta/facture/apercu.php

diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
deleted file mode 100644
index cdeacefafe1..00000000000
--- a/htdocs/comm/propal/apercu.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2014      Frederic France      <frederic.france@free.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *  \file		htdocs/comm/propal/apercu.php
- *  \ingroup	propal
- *  \brief		Preview tab of propal
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-$langs->load('propal');
-$langs->load("bills");
-$langs->load('compta');
-
-// Security check
-$socid=0;
-$id = GETPOST('id','int');
-$ref = GETPOST("ref");
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'propal', $id);
-
-
-/*
- * View Mode
- */
-
-$form = new Form($db);
-
-llxHeader();
-
-if ($id > 0 || ! empty($ref))
-{
-	$object = new Propal($db);
-
-	if ($object->fetch($id,$ref) > 0)
-	{
-		$soc = new Societe($db);
-		$soc->fetch($object->socid);
-
-		$head = propal_prepare_head($object);
-		dol_fiche_head($head, 'preview', $langs->trans('Proposal'), 0, 'propal');
-
-
-		/*
-		 *   Propal
-		 */
-        print '<table class="border" width="100%">';
-
-    	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-    
-    	// Ref
-    	print '<tr><td>' . $langs->trans('Ref') . '</td><td colspan="5">';
-    	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
-    	print '</td></tr>';
-
-        // Ref client
-        print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
-        print '<td colspan="5">'.$object->ref_client.'</td>';
-        print '</tr>';
-
-
-        // Thirdparty
-        print '<tr><td>'.$langs->trans('Company').'</td>';
-        print '<td colspan="5">'.$soc->getNomUrl(1).'</td>';
-        print '</tr>';
-
-        // Status
-        print '<tr><td>'.$langs->trans("Status").'</td>';
-        print '<td colspan="5">'.$object->getLibStatut(4).'</td>';
-        print '</tr>';
-
-        // Discount
-		print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="5">';
-		if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent);
-		else print $langs->trans("CompanyHasNoRelativeDiscount");
-		$absolute_discount=$soc->getAvailableDiscounts();
-		print '. ';
-		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->currency));
-		else print $langs->trans("CompanyHasNoAbsoluteDiscount");
-        print '.</td>';
-        print '</tr>';
-
-        // Date
-        print '<tr><td>'.$langs->trans('Date').'</td>';
-        print '<td>'.dol_print_date($object->date,'daytext').'</td>';
-
-        // Right part with $rowspan lines
-        $rowspan=4;
-        print '<td rowspan="'.$rowspan.'" valign="top" width="50%">';
-
-        /*
-         * Documents
-         */
-        $objectref = dol_sanitizeFileName($object->ref);
-        $dir_output = $conf->propal->dir_output . "/";
-        $filepath = $dir_output . $objectref . "/";
-        $file = $filepath . $objectref . ".pdf";
-        $filedetail = $filepath . $objectref . "-detail.pdf";
-        $relativepath = $objectref.'/'.$objectref.'.pdf';
-        $relativepathdetail = $objectref.'/'.$objectref.'-detail.pdf';
-
-        // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")
-        $fileimage = $file.'_preview.png';              // If PDF has 1 page
-        $fileimagebis = $file.'_preview-0.pdf.png';     // If PDF has more than one page
-        $relativepathimage = $relativepath.'_preview.png';
-
-        $var=true;
-
-		// Si fichier PDF existe
-		if (file_exists($file))
-		{
-			$encfile = urlencode($file);
-            print '<table class="nobordernopadding" width="100%">';
-            print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Documents").'</td></tr>';
-
-            print '<tr '.$bc[$var].'><td>'.$langs->trans("Proposal").' PDF</td>';
-
-			print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=propal&file='.urlencode($relativepath).'">'.$object->ref.'.pdf</a></td>';
-
-			print '<td align="right">'.dol_print_size(dol_filesize($file)).'</td>';
-			print '<td align="right">'.dol_print_date(dol_filemtime($file),'dayhour').'</td>';
-			print '</tr>';
-
-			print "</table>\n";
-
-			// Conversion du PDF en image png si fichier png non existant
-			if ((! file_exists($fileimage) && ! file_exists($fileimagebis)) || (filemtime($fileimage) < filemtime($file)))
-			{
-				if (class_exists("Imagick"))
-				{
-					$ret = dol_convert_file($file,'png',$fileimage);
-					if ($ret < 0) $error++;
-				}
-				else
-				{
-					$langs->load("errors");
-					print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>';
-				}
-			}
-		}
-
-        print '</td>';
-        print '</tr>';
-
-        // Total HT - left part
-        print '<tr><td>'.$langs->trans('AmountHT').'</td>';
-        print '<td align="right" class="nowrap"><b>' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
-        print '</tr>';
-
-        // Total VAT - left part
-        print '<tr><td>'.$langs->trans('AmountVAT').'</td>';
-        print '<td align="right" class="nowrap"><b>' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
-        print '</tr>';
-
-        // Total TTC - left part
-        print '<tr><td>'.$langs->trans('AmountTTC').'</td>';
-        print '<td align="right" class="nowrap"><b>' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
-        print '</tr>';
-
-        print '</table>';
-
-		dol_fiche_end();
-	}
-	else
-	{
-		// Propal non trouvee
-		print $langs->trans("ErrorPropalNotFound",$_GET["id"]);
-	}
-}
-
-print '<table class="border" width="100%">';
-print '<tr><td>';
-print '<div class="photolist">';
-// Si fichier png PDF d'1 page trouve
-if (file_exists($fileimage))
-{
-	print '<img class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercupropal&amp;file='.urlencode($relativepathimage).'">';
-}
-// Si fichier png PDF de plus d'1 page trouve
-elseif (file_exists($fileimagebis))
-{
-	$multiple = preg_replace('/\.png/','',$relativepath) . "-";
-
-	for ($i = 0; $i < 20; $i++)
-	{
-		$preview = $multiple.$i.'.png';
-
-		if (file_exists($dir_output.$preview))
-		{
-			print '<img class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercupropal&amp;file='.urlencode($preview).'"><p>';
-		}
-	}
-}
-print '</div>';
-print '</td></tr>';
-print '</table>';
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 810d6bd1abb..9b70ee36ace 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1675,7 +1675,7 @@ if ($action == 'create')
 	$soc->fetch($object->socid);
 
 	$head = propal_prepare_head($object);
-	dol_fiche_head($head, 'comm', $langs->trans('Proposal'), 0, 'propal');
+	dol_fiche_head($head, 'comm', $langs->trans('Proposal'), -1, 'propal');
 
 	$formconfirm = '';
 
@@ -1804,42 +1804,7 @@ if ($action == 'create')
 
 	print '<table class="border" width="100%">';
 
-    // Ref
-    /*
-	print '<tr><td>' . $langs->trans('Ref') . '</td><td colspan="5">';
-	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
-	print '</td></tr>';
-	*/
-
-	// Ref customer
-	/*
-	print '<tr><td>';
-	print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
-	print $langs->trans('RefCustomer') . '</td>';
-	if ($action != 'refclient' && ! empty($object->brouillon))
-		print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=refclient&amp;id=' . $object->id . '">' . img_edit($langs->trans('Modify')) . '</a></td>';
-	print '</td></tr></table>';
-	print '</td><td colspan="5">';
-	if ($user->rights->propal->creer && $action == 'refclient') {
-		print '<form action="'.$_SERVER["PHP_SELF"].'?id=' . $object->id . '" method="post">';
-		print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-		print '<input type="hidden" name="action" value="set_ref_client">';
-		print '<input type="text" class="flat" size="20" name="ref_client" value="' . $object->ref_client . '">';
-		print ' <input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
-		print '</form>';
-	} else {
-		print $object->ref_client;
-	}
-	print '</td>';
-	print '</tr>';
-    */
-
-	// Company
-	/*
-	print '<tr><td>' . $langs->trans('Company') . '</td><td colspan="5">' . $soc->getNomUrl(1) . '</td>';
-	print '</tr>';*/
-
-	// Lin for thirdparty discounts
+	// Link for thirdparty discounts
 	print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
 	if ($soc->remise_percent)
 		print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 8588bfc5749..3c3aa6aef88 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -151,7 +151,7 @@ $formother = new FormOther($db);
 if ($object->id > 0)
 {
     $head = propal_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("Proposal"), 0, 'propal');
+	dol_fiche_head($head, 'contact', $langs->trans("Proposal"), -1, 'propal');
 
 
 	// Proposal card
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 9b875e434f7..82978daf2c1 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -89,7 +89,7 @@ if ($object->id > 0)
 	$upload_dir = $conf->propal->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
 	$head = propal_prepare_head($object);
-	dol_fiche_head($head, 'document', $langs->trans('Proposal'), 0, 'propal');
+	dol_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal');
 
 	// Construit liste des fichiers
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index 14a4911b80f..d8af8fb87a8 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -59,7 +59,7 @@ llxHeader('',$langs->trans('Proposal'),'EN:Commercial_Proposals|FR:Proposition_c
 $object->fetch_thirdparty();
 
 $head = propal_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans('Proposal'), 0, 'propal');
+dol_fiche_head($head, 'info', $langs->trans('Proposal'), -1, 'propal');
 
 $object->info($object->id);
 
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 57181b83f6b..ec1dac31c24 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -74,7 +74,7 @@ if ($id > 0 || ! empty($ref))
 		if ($object->fetch_thirdparty() > 0)
 		{
 		    $head = propal_prepare_head($object);
-			dol_fiche_head($head, 'note', $langs->trans('Proposal'), 0, 'propal');
+			dol_fiche_head($head, 'note', $langs->trans('Proposal'), -1, 'propal');
 
 			$cssclass='titlefield';
 			//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php
deleted file mode 100644
index 1ec3a0533cc..00000000000
--- a/htdocs/commande/apercu.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2014      Frederic France      <frederic.france@free.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *		\file		htdocs/commande/apercu.php
- *		\ingroup	commande
- *		\brief		Preview tab of order
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-
-$langs->load('orders');
-$langs->load("bills");
-$langs->load('compta');
-
-// Security check
-$socid=0;
-$id = GETPOST('id','int');
-$ref = GETPOST("ref");
-if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user,'commande',$id,'');
-
-
-/*
- * View Mode
- */
-
-$form = new Form($db);
-
-llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
-
-if ($id > 0 || ! empty($ref))
-{
-	$object = new Commande($db);
-
-	if ($object->fetch($id,$ref) > 0)
-	{
-		$soc = new Societe($db);
-		$soc->fetch($object->socid);
-
-
-        $head = commande_prepare_head($object);
-        dol_fiche_head($head, 'preview', $langs->trans("CustomerOrder"), 0, 'order');
-
-        print '<table class="border" width="100%">';
-
-    	//$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-    
-    	// Ref
-    	print '<tr><td>' . $langs->trans('Ref') . '</td><td colspan="5">';
-    	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
-    	print '</td></tr>';
-
-        // Ref cde client
-        print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
-        print '<td colspan="5">'.$object->ref_client.'</td>';
-        print '</tr>';
-
-        // Client
-        print '<tr><td>'.$langs->trans("Customer").'</td>';
-        print '<td colspan="5">'.$soc->getNomUrl(1).'</td>';
-        print '</tr>';
-
-        // Statut
-        print '<tr><td>'.$langs->trans("Status").'</td>';
-        print '<td colspan="5">'.$object->getLibStatut(4).'</td>';
-        print '</tr>';
-
-        // Discount - left part
-        print '<tr><td>'.$langs->trans('Discounts').'</td>';
-        print '<td colspan="5">'.$object->remise_percent.'%</td>';
-        print '</tr>';
-
-        // Date - left part
-        print '<tr><td>'.$langs->trans("Date").'</td>';
-        print '<td colspan="3">'.dol_print_date($object->date,"daytext").'</td>';
-
-        // Right part with $rowspan lines
-        $rowspan=4;
-        print '<td rowspan="'.$rowspan.'" valign="top" width="50%">';
-
-        /*
-         * Documents
-         */
-		$objectref = dol_sanitizeFileName($object->ref);
-		$dir_output = $conf->commande->dir_output . "/";
-		$filepath = $dir_output . $objectref . "/";
-		$file = $filepath . $objectref . ".pdf";
-		$filedetail = $filepath . $objectref . "-detail.pdf";
-        $relativepath = $objectref.'/'.$objectref.'.pdf';
-        $relativepathdetail = $objectref.'/'.$objectref.'-detail.pdf';
-
-        // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")
-        $fileimage = $file.'_preview.png';          	// If PDF has 1 page
-        $fileimagebis = $file.'_preview-0.pdf.png';     // If PDF has more than one page
-        $relativepathimage = $relativepath.'_preview.png';
-
-		$var=true;
-
-		// if PDF file exist
-		if (file_exists($file))
-		{
-			$encfile = urlencode($file);
-            print '<table class="nobordernopadding" width="100%">';
-            print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Documents").'</td></tr>';
-
-			print "<tr ".$bc[$var]."><td>".$langs->trans("Order")." PDF</td>";
-
-			print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=commande&amp;file='.urlencode($relativepath).'">'.$object->ref.'.pdf</a></td>';
-			print '<td align="right">'.dol_print_size(dol_filesize($file)).'</td>';
-			print '<td align="right">'.dol_print_date(dol_filemtime($file),'dayhour').'</td>';
-			print '</tr>';
-
-			// Si fichier detail PDF existe
-			// TODO deprecated ?
-			if (file_exists($filedetail))
-			{
-				print "<tr ".$bc[$var]."><td>Commande detaillee</td>";
-
-				print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=commande&amp;file='.urlencode($relativepathdetail).'">'.$object->ref.'-detail.pdf</a></td>';
-				print '<td align="right">'.dol_print_size(dol_filesize($filedetail)).'</td>';
-				print '<td align="right">'.dol_print_date(dol_filemtime($filedetail),'dayhour').'</td>';
-				print '</tr>';
-			}
-			print "</table>\n";
-
-			// Conversion du PDF en image png si fichier png non existant
-			if ((! file_exists($fileimage) && ! file_exists($fileimagebis)) || (filemtime($fileimage) < filemtime($file)))
-			{
-				if (class_exists("Imagick"))
-				{
-					$ret = dol_convert_file($file,'png',$fileimage);
-					if ($ret < 0) $error++;
-				}
-				else
-				{
-					$langs->load("errors");
-					print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>';
-				}
-			}
-		}
-
-        print '</td></tr>';
-
-        // Total HT - left part
-        print '<tr><td>'.$langs->trans('AmountHT').'</td>';
-        print '<td align="right" class="nowrap"><b>' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
-        print '</tr>';
-
-        // Total VAT - left part
-        print '<tr><td>'.$langs->trans('AmountVAT').'</td>';
-        print '<td align="right" class="nowrap"><b>' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
-        print '</tr>';
-
-        // Total TTC - left part
-        print '<tr><td>'.$langs->trans('AmountTTC').'</td>';
-        print '<td align="right" class="nowrap"><b>' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
-        print '</tr>';
-
-        print '</table>';
-
-		dol_fiche_end();
-	}
-	else
-	{
-		// Object not found
-		print $langs->trans("ErrorOrderNotFound",$id);
-	}
-}
-
-print '<table class="border" width="100%">';
-print '<tr><td>';
-print '<div class="photolist">';
-// Si fichier png PDF d'1 page trouve
-if (file_exists($fileimage))
-{
-	print '<img class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercucommande&amp;file='.urlencode($relativepathimage).'">';
-}
-// Si fichier png PDF de plus d'1 page trouve
-elseif (file_exists($fileimagebis))
-{
-	$multiple = preg_replace('/\.png/','',$relativepath) . "-";
-
-	for ($i = 0; $i < 20; $i++)
-	{
-		$preview = $multiple.$i.'.png';
-
-		if (file_exists($dir_output.$preview))
-		{
-			print '<img class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercucommande&amp;file='.urlencode($preview).'"><p>';
-		}
-	}
-}
-print '</div>';
-print '</td></tr>';
-print '</table>';
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
deleted file mode 100644
index b22571ad93f..00000000000
--- a/htdocs/compta/facture/apercu.php
+++ /dev/null
@@ -1,392 +0,0 @@
-<?php
-/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2014      Frederic France      <frederic.france@free.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- *      \file       htdocs/compta/facture/apercu.php
- *      \ingroup    facture
- *      \brief      Preview Tab of invoice
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-$langs->load("bills");
-
-// Security check
-$socid=0;
-$id = GETPOST('facid','int');
-$ref = GETPOST("ref");
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'facture', $id);
-
-
-/*
- * View
- */
-
-$now=dol_now();
-
-$title = $langs->trans('InvoiceCustomer') . " - " . $langs->trans('Preview');
-$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
-llxHeader('', $title, $helpurl);
-
-$form = new Form($db);
-
-/* *************************************************************************** */
-/*                                                                             */
-/* Mode fiche                                                                  */
-/*                                                                             */
-/* *************************************************************************** */
-
-if ($id > 0 || ! empty($ref))
-{
-    $object = New Facture($db);
-
-    if ($object->fetch($id,$ref) > 0)
-    {
-        $soc = new Societe($db);
-        $soc->fetch($object->socid);
-
-        $head = facture_prepare_head($object);
-        dol_fiche_head($head, 'preview', $langs->trans("InvoiceCustomer"), 0, 'bill');
-
-
-        $totalpaye  = $object->getSommePaiement();
-
-        /*
-         *   Invoice
-         */
-        print '<table class="border" width="100%">';
-
-    	$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-    
-    	// Ref
-    	print '<tr><td class="titlefield">' . $langs->trans('Ref') . '</td><td colspan="5">';
-    	$morehtmlref = '';
-    	$discount = new DiscountAbsolute($db);
-    	$result = $discount->fetch(0, $object->id);
-    	if ($result > 0) {
-    		$morehtmlref = ' (' . $langs->trans("CreditNoteConvertedIntoDiscount", $discount->getNomUrl(1, 'discount')) . ')';
-    	}
-    	if ($result < 0) {
-    		dol_print_error('', $discount->error);
-    	}
-    	print $form->showrefnav($object, 'ref', $linkback, 1, 'facnumber', 'ref', $morehtmlref);
-    	print '</td></tr>';
-
-        // Ref customer
-        print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
-        print '<td colspan="5">'.$object->ref_client.'</td>';
-        print '</tr>';
-
-        // Thirdparty
-        print '<tr><td>'.$langs->trans("Company").'</td>';
-        print '<td colspan="5">'.$soc->getNomUrl(1,'compta').'</td>';
-        print '</tr>';
-
-        // Type
-        print '<tr><td>'.$langs->trans('Type').'</td>';
-        print '<td colspan="5">';
-        print $object->getLibType();
-        if ($object->type == Facture::TYPE_REPLACEMENT)
-        {
-            $facreplaced=new Facture($db);
-            $facreplaced->fetch($object->fk_facture_source);
-            print ' ('.$langs->transnoentities("ReplaceInvoice",$facreplaced->getNomUrl(1)).')';
-        }
-        if ($object->type == Facture::TYPE_CREDIT_NOTE)
-        {
-            $facusing=new Facture($db);
-            $facusing->fetch($object->fk_facture_source);
-            print ' ('.$langs->transnoentities("CorrectInvoice",$facusing->getNomUrl(1)).')';
-        }
-
-        $facidavoir=$object->getListIdAvoirFromInvoice();
-        if (count($facidavoir) > 0)
-        {
-            print ' ('.$langs->transnoentities("InvoiceHasAvoir");
-            $i=0;
-            foreach($facidavoir as $id)
-            {
-                if ($i==0) print ' ';
-                else print ',';
-                $facavoir=new Facture($db);
-                $facavoir->fetch($id);
-                print $facavoir->getNomUrl(1);
-            }
-            print ')';
-        }
-        if ($objectidnext > 0)
-        {
-            $facthatreplace=new Facture($db);
-            $facthatreplace->fetch($objectidnext);
-            print ' ('.$langs->transnoentities("ReplacedByInvoice",$facthatreplace->getNomUrl(1)).')';
-        }
-        print '</td>';
-        print '</tr>';
-
-        // Relative and absolute discounts
-        $addabsolutediscount=' <a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$soc->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'?facid='.$object->id.'">'.$langs->trans("AddGlobalDiscount").'</a>';
-        $addcreditnote=' <a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$soc->id.'&type=2&backtopage='.urlencode($_SERVER["PHP_SELF"]).'?facid='.$object->id.'">'.$langs->trans("AddCreditNote").'</a>';
-
-        print '<tr><td>'.$langs->trans('Discounts').'</td>';
-        print '<td colspan="5">';
-        if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent);
-        else print $langs->trans("CompanyHasNoRelativeDiscount");
-
-        if ($absolute_discount > 0)
-        {
-            print '. ';
-            if ($object->statut > Facture::STATUS_DRAFT || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
-            {
-                if ($object->statut == Facture::STATUS_DRAFT)
-                {
-                    print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
-                    print '. ';
-                }
-                else
-                {
-                    if ($object->statut < Facture::STATUS_VALIDATED || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
-                    {
-                        $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
-                        print '<br>'.$text.'.<br>';
-                    }
-                    else
-                    {
-                        $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
-                        $text2=$langs->trans("AbsoluteDiscountUse");
-                        print $form->textwithpicto($text,$text2);
-                    }
-                }
-            }
-            else
-            {
-                // Remise dispo de type remise fixe (not credit note)
-                $filter='fk_facture_source IS NULL';
-                print '<br>';
-                $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0,  'remise_id',$soc->id, $absolute_discount, $filter, $resteapayer, ' - '.$addabsolutediscount, 1);
-            }
-        }
-        else
-        {
-            if ($absolute_creditnote > 0)    // If not linked will be added later
-            {
-                if ($object->statut == Facture::STATUS_DRAFT && $object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT) print ' - '.$addabsolutediscount.'<br>';
-                else print '.';
-            }
-            else print '. ';
-        }
-        if ($absolute_creditnote > 0)
-        {
-            // If validated, we show link "add credit note to payment"
-            if ($object->statut != Facture::STATUS_VALIDATED || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
-            {
-                if ($object->statut == Facture::STATUS_DRAFT && $object->type != Facture::TYPE_DEPOSIT)
-                {
-                    $text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency));
-                    print $form->textwithpicto($text,$langs->trans("CreditNoteDepositUse"));
-                }
-                else
-                {
-                    print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)).'.';
-                }
-            }
-            else
-            {
-                // Remise dispo de type avoir
-                $filter='fk_facture_source IS NOT NULL';
-                if (! $absolute_discount) print '<br>';
-                $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filter, $resteapayer, '', 1);
-            }
-        }
-        if (! $absolute_discount && ! $absolute_creditnote)
-        {
-            print $langs->trans("CompanyHasNoAbsoluteDiscount");
-            if ($object->statut == Facture::STATUS_DRAFT && $object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT) print ' - '.$addabsolutediscount.'<br>';
-            else print '. ';
-        }
-        /*if ($object->statut == 0 && $object->type != 2 && $object->type != 3)
-         {
-         if (! $absolute_discount && ! $absolute_creditnote) print '<br>';
-         //print ' &nbsp; - &nbsp; ';
-         print $addabsolutediscount;
-         //print ' &nbsp; - &nbsp; '.$addcreditnote;      // We disbale link to credit note
-         }*/
-        print '</td>';
-        print '</tr>';
-
-        // Dates
-        print '<tr><td>'.$langs->trans("DateInvoice").'</td>';
-        print '<td>'.dol_print_date($object->date,"daytext").'</td>';
-
-        // Right part with $rowspan lines
-        $rowspan=5;
-        if (! empty($conf->projet->enabled)) $rowspan++;
-        print '<td rowspan="'.$rowspan.'" valign="top" width="50%">';
-
-        /*
-         * Documents
-         */
-        $objectref = dol_sanitizeFileName($object->ref);
-        $dir_output = $conf->facture->dir_output . "/";
-        $filepath = $dir_output . $objectref . "/";
-        $file = $filepath . $objectref . ".pdf";
-        $filedetail = $filepath . $objectref . "-detail.pdf";
-        $relativepath = $objectref.'/'.$objectref.'.pdf';
-        $relativepathdetail = $objectref.'/'.$objectref.'-detail.pdf';
-
-        // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")
-        $fileimage = $file.'_preview.png';              // If PDF has 1 page
-        $fileimagebis = $file.'_preview-0.pdf.png';     // If PDF has more than one page
-        $relativepathimage = $relativepath.'_preview.png';
-
-        $var=true;
-
-        // Si fichier PDF existe
-        if (file_exists($file))
-        {
-            $encfile = urlencode($file);
-            print '<table class="nobordernopadding" width="100%">';
-            print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Documents").'</td></tr>';
-
-            print "<tr ".$bc[$var]."><td>".$langs->trans("Bill")." PDF</td>";
-
-            print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture&file='.urlencode($relativepath).'">'.$object->ref.'.pdf</a></td>';
-            print '<td align="right">'.dol_print_size(dol_filesize($file)). '</td>';
-            print '<td align="right">'.dol_print_date(dol_filemtime($file),'dayhour').'</td>';
-            print '</tr>';
-
-            // Si fichier detail PDF existe
-            if (file_exists($filedetail)) // facture detaillee supplementaire
-            {
-                print "<tr ".$bc[$var]."><td>Facture detaillee</td>";
-
-                print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture&file='.urlencode($relativepathdetail).'">'.$object->ref.'-detail.pdf</a></td>';
-                print '<td align="right">'.dol_print_size(dol_filesize($filedetail)).'</td>';
-                print '<td align="right">'.dol_print_date(dol_filemtime($filedetail),'dayhour').'</td>';
-                print '</tr>';
-            }
-
-            print "</table>\n";
-
-            // Conversion du PDF en image png si fichier png non existant
-			if ((! file_exists($fileimage) && ! file_exists($fileimagebis)) || (filemtime($fileimage) < filemtime($file)))
-            {
-                if (class_exists("Imagick"))
-                {
-                    $ret = dol_convert_file($file,'png',$fileimage);
-                    if ($ret < 0) $error++;
-                }
-                else
-                {
-                    $langs->load("errors");
-                    print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>';
-                }
-            }
-        }
-        print "</td></tr>";
-
-        // Total HT
-        print '<tr><td>'.$langs->trans("AmountHT").'</td>';
-        print '<td align="right" class="nowrap"><b>' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
-        print '</tr>';
-
-        // Total VAT
-        print '<tr><td>'.$langs->trans('AmountVAT').'</td>';
-        print '<td align="right" class="nowrap"><b>' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
-        print '</tr>';
-
-        // Total TTC
-        print '<tr><td>'.$langs->trans('AmountTTC').'</td>';
-        print '<td align="right" class="nowrap"><b>' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
-        print '</tr>';
-
-        // Statut
-        print '<tr><td>'.$langs->trans('Status').'</td>';
-        print '<td align="left">'.($object->getLibStatut(4,$totalpaye)).'</td>';
-        print '</tr>';
-
-        // Projet
-        if (! empty($conf->projet->enabled))
-        {
-            $langs->load("projects");
-            print '<tr><td>'.$langs->trans("Project").'</td>';
-            print '<td>';
-            if ($object->fk_project > 0)
-            {
-                $project = New Project($db);
-                $project->fetch($object->fk_project);
-                print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'">'.$project->title.'</a>';
-            }
-            else
-            {
-                print '&nbsp;';
-            }
-            print '</td></tr>';
-        }
-
-        print '</table>';
-
-        dol_fiche_end();
-    }
-    else
-    {
-        // Facture non trouvee
-        print $langs->trans("ErrorBillNotFound",$id);
-    }
-}
-
-print '<table class="border" width="100%">';
-print '<tr><td>';
-print '<div class="photolist">';
-// Si fichier png PDF d'1 page trouve
-if (file_exists($fileimage))
-{
-    print '<img class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufacture&amp;file='.urlencode($relativepathimage).'">';
-}
-// Si fichier png PDF de plus d'1 page trouve
-elseif (file_exists($fileimagebis))
-{
-    $multiple = preg_replace('/\.png/','',$relativepath) . "-";
-
-    for ($i = 0; $i < 20; $i++)
-    {
-        $preview = $multiple.$i.'.png';
-
-        if (file_exists($dir_output.$preview))
-        {
-            print '<img class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufacture&amp;file='.urlencode($preview).'"><p>';
-        }
-    }
-}
-print '</div>';
-print '</td></tr>';
-print '</table>';
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 21c3b5dbcfe..315e920947d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6028,13 +6028,13 @@ class Form
 	                 */
                     global $dolibarr_main_url_root;
                     $ret.='<!-- Put link to gravatar -->';
-                    $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" border="0"'.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="https://www.gravatar.com/avatar/'.dol_hash(strtolower(trim($email)),3).'?s='.$width.'&d='.urlencode(dol_buildpath($nophoto,3)).'">';	// gravatar need md5 hash
+                    $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="https://www.gravatar.com/avatar/'.dol_hash(strtolower(trim($email)),3).'?s='.$width.'&d='.urlencode(dol_buildpath($nophoto,3)).'">';	// gravatar need md5 hash
                 }
                 else
 				{
 				    if ($conf->browser->layout != 'phone')
 				    {
-                        $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'">';
+                        $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'">';
 				    }
                 }
             }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a872d166283..dd2d9a00a50 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1006,12 +1006,15 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
 	$modulepart='unknown';
 
-	if ($object->element == 'societe') $modulepart='societe';
-	if ($object->element == 'contact') $modulepart='contact';
-	if ($object->element == 'member')  $modulepart='memberphoto';
-	if ($object->element == 'user')    $modulepart='userphoto';
-	if ($object->element == 'product') $modulepart='product';
-
+	if ($object->element == 'societe')   $modulepart='societe';
+	if ($object->element == 'contact')   $modulepart='contact';
+	if ($object->element == 'member')    $modulepart='memberphoto';
+	if ($object->element == 'user')      $modulepart='userphoto';
+	if ($object->element == 'product')   $modulepart='product';
+	if ($object->element == 'propal')    $modulepart='propal';
+	if ($object->element == 'commande')  $modulepart='commande';
+	if ($object->element == 'facture')   $modulepart='facture';
+	
 	if ($object->element == 'product')
 	{
 	    $width=80; $cssclass='photoref';
@@ -1037,7 +1040,56 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
         {
             if ($modulepart != 'unknown')
             {
-                $phototoshow = $form->showphoto($modulepart,$object,0,0,0,'photoref','small',1,0,$maxvisiblephotos);
+                // Check if a preview file is available
+                if (in_array($modulepart, array('propal', 'commande', 'facture')) && class_exists("Imagick"))
+                {
+                    $objectref = dol_sanitizeFileName($object->ref);
+                    $dir_output = $conf->$modulepart->dir_output . "/";
+                    $filepath = $dir_output . $objectref . "/";
+                    $file = $filepath . $objectref . ".pdf";
+                    $relativepath = $objectref.'/'.$objectref.'.pdf';
+                    
+                    // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")
+                    $fileimage = $file.'_preview.png';              // If PDF has 1 page
+                    $fileimagebis = $file.'_preview-0.pdf.png';     // If PDF has more than one page
+                    $relativepathimage = $relativepath.'_preview.png';
+                    
+                    // Si fichier PDF existe
+                    if (file_exists($file))
+                    {
+                        $encfile = urlencode($file);
+                        // Conversion du PDF en image png si fichier png non existant
+                        if ((! file_exists($fileimage) && ! file_exists($fileimagebis)) || (filemtime($fileimage) < filemtime($file)))
+                        {
+                            $ret = dol_convert_file($file,'png',$fileimage);
+                            if ($ret < 0) $error++;
+                        }
+    
+                        // Si fichier png PDF d'1 page trouve
+                        if (file_exists($fileimage))
+                        {
+                            $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
+                            $phototoshow.= '<img height="70" class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
+                            $phototoshow.= '</div></div>';
+                        }
+                        // Si fichier png PDF de plus d'1 page trouve
+                        elseif (file_exists($fileimagebis))
+                        {
+                            $preview = preg_replace('/\.png/','',$relativepath) . "-0.png";
+                            if (file_exists($dir_output.$preview))
+                            {
+                                $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
+                                $phototoshow.= '<img height="70" class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';
+                                $phototoshow.= '</div></div>';
+                            }
+                        }
+                    }
+                }
+                else if (! $phototoshow)
+                {
+                    $phototoshow = $form->showphoto($modulepart,$object,0,0,0,'photoref','small',1,0,$maxvisiblephotos);
+                }
+
                 if ($phototoshow)
                 {
                     $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">';
@@ -1045,7 +1097,8 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                     $morehtmlleft.='</div>';
                 }
             }
-            elseif ($conf->browser->layout != 'phone')      // Show No photo link (picto of pbject)
+            
+            if (! $phototoshow && $conf->browser->layout != 'phone')      // Show No photo link (picto of pbject)
             {
                 $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">';
                 if ($object->element == 'action')
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index fa8151563b1..6e5640d1e0a 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -53,14 +53,6 @@ function facture_prepare_head($object)
 		$h++;
 	}
 
-	if (! empty($conf->global->MAIN_USE_PREVIEW_TABS))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/apercu.php?facid='.$object->id;
-		$head[$h][1] = $langs->trans('Preview');
-		$head[$h][2] = 'preview';
-		$h++;
-	}
-
 	//if ($fac->mode_reglement_code == 'PRE')
 	if (! empty($conf->prelevement->enabled))
 	{
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 1458f37fdce..6bfb2541c11 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -60,14 +60,6 @@ function commande_prepare_head(Commande $object)
 		$h++;
 	}
 
-	if (! empty($conf->global->MAIN_USE_PREVIEW_TABS))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/commande/apercu.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Preview");
-		$head[$h][2] = 'preview';
-		$h++;
-	}
-
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index 13fbe06e7d4..66ef1146850 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -55,13 +55,6 @@ function propal_prepare_head($object)
 		$head[$h][2] = 'shipping';
 		$h++;
 	}
-	if (! empty($conf->global->MAIN_USE_PREVIEW_TABS))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/comm/propal/apercu.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Preview");
-		$head[$h][2] = 'preview';
-		$h++;
-	}
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{

From 80f78e66bba42ece24fe097937e5d230f37a6d22 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 24 Mar 2017 15:30:46 +0100
Subject: [PATCH 0440/1163] error on install

---
 htdocs/install/mysql/tables/llx_usergroup.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql
index 9afe72f3b24..cc8501a5fcd 100644
--- a/htdocs/install/mysql/tables/llx_usergroup.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup.sql
@@ -26,7 +26,7 @@ create table llx_usergroup
   datec         datetime,
   tms           timestamp,
   note          text,
-  model_pdf     varchar(255) DEFAULT NULL,
+  model_pdf     varchar(255) DEFAULT NULL
 )ENGINE=innodb;
 
 -- 

From cdb1de75960263fce74b26cae24172632ecb0e73 Mon Sep 17 00:00:00 2001
From: jean <jean@tiaris.info>
Date: Fri, 24 Mar 2017 16:48:44 +0100
Subject: [PATCH 0441/1163] bug 6563 installation issue with
 doctemplates/usergroups/template_usergroups.odt

---
 ...mplate_usergroup.odt => template_usergroups.odt} | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename htdocs/install/doctemplates/usergroups/{template_usergroup.odt => template_usergroups.odt} (100%)

diff --git a/htdocs/install/doctemplates/usergroups/template_usergroup.odt b/htdocs/install/doctemplates/usergroups/template_usergroups.odt
similarity index 100%
rename from htdocs/install/doctemplates/usergroups/template_usergroup.odt
rename to htdocs/install/doctemplates/usergroups/template_usergroups.odt

From d1a988a0beba0fe0cd689bf4824520e606a67b9f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Mar 2017 17:32:38 +0100
Subject: [PATCH 0442/1163] Fix document_preview is possible on files with +
 chars inside.

---
 htdocs/contact/card.php                   |  3 ++-
 htdocs/core/class/html.formfile.class.php | 13 ++++++------
 htdocs/core/lib/company.lib.php           | 24 +++++++----------------
 htdocs/core/lib/functions.lib.php         | 16 +++++++++++----
 htdocs/main.inc.php                       | 19 +++++++++++++++++-
 htdocs/societe/rib.php                    |  6 +++---
 6 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 7d95da69aef..dfa6eec515c 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -673,7 +673,8 @@ else
 
             print "</table><br>";
 
-
+			print '<hr style="margin-bottom: 20px">';
+			
             // Add personnal information
             print load_fiche_titre('<div class="comboperso">'.$langs->trans("PersonalInformations").'</div>','','');
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 5aa699c055c..d90b906882f 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -867,9 +867,9 @@ class FormFile
 
     			// Preview
     			$urladvanced = getAdvancedPreviewUrl($modulepart, $relativepath);
-    		    if ($urladvanced) $tmpout.= '<li><a data-ajax="false" href="'.$urladvanced.'">'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
+    		    if ($urladvanced) $tmpout.= '<li><a href="'.$urladvanced.'">'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
     			// Download
-    		    $tmpout.= '<li><a data-ajax="false" class="pictopreview" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
+    		    $tmpout.= '<li><a class="pictopreview" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
     			$mime=dol_mimetype($relativepath,'',0);
     			if (preg_match('/text/',$mime)) $tmpout.= ' target="_blank"';
     			$tmpout.= '>';
@@ -1679,11 +1679,12 @@ class FormFile
         $out='';
         if ($conf->browser->layout != 'phone')
         {
-            $urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath);      // Return if a file is qualified for preview
-            if ($urladvancedpreview)
+            $urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath, 1);      // Return if a file is qualified for preview.
+            if (count($urladvancedpreview))
             {
-                $out.= '<a data-ajax="false" class="pictopreview" href="'.$urladvancedpreview.'">';
-                if (empty($ruleforpicto)) $out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
+                $out.= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime'])?'':' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target'])?'':' target="'.$urladvancedpreview['target'].'"').'>';
+                //$out.= '<a class="pictopreview">';
+            	if (empty($ruleforpicto)) $out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
                 else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
                 $out.= '</a>';
             }
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index bfb893d92ee..fb901198852 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -693,7 +693,6 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 
     $colspan=9;
     print '<tr class="liste_titre">';
-    print_liste_field_titre('');
     print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"p.lastname","",$param,'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Poste"),$_SERVER["PHP_SELF"],"p.poste","",$param,'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email"),$_SERVER["PHP_SELF"],"","",$param,'',$sortfield,$sortorder);
@@ -728,21 +727,16 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     {
         print '<tr class="liste_titre">';
         
-        // Photo
-        print '<td class="liste_titre">';
-        print '</td>';
-        
-        // Name - Position
+        // Photo - Name
         print '<td class="liste_titre">';
         print '<input type="text" class="flat" name="search_name" size="20" value="'.$search_name.'">';
         print '</td>';
     
-        // Address / Phone
+        // Position
         print '<td class="liste_titre">';
-        //print '<input type="text" class="flat" name="search_addressphone" size="20" value="'.$search_addressphone.'">';
         print '</td>';
     
-        // Email
+        // Address - Phone - Email
         print '<td class="liste_titre">&nbsp;</td>';
     
         // Status
@@ -797,14 +791,10 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
             
             print "<tr ".$bc[$var].">";
 
-            // Photo
-            print '<td width="50px">';
-            print $form->showphoto('contact',$contactstatic,0,0,0,'photorefnoborder','small',1,0,1);
-			print '</td>';
-            
-			// Name
+			// Photo - Name
 			print '<td>';
-            print $contactstatic->getNomUrl(0,'',0,'&backtopage='.urlencode($backtopage));
+            print $form->showphoto('contact',$contactstatic,0,0,0,'photorefnoborder valignmiddle marginrightonly','small',1,0,1);
+			print $contactstatic->getNomUrl(0,'',0,'&backtopage='.urlencode($backtopage));
 			print '</td>';
 			
 			// Job position
@@ -812,7 +802,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
             if ($obj->poste) print $obj->poste;
             print '</td>';
 
-            // Address and phone
+            // Address - Phone - Email
             print '<td>';
             print $contactstatic->getBannerAddress('contact', $object);
             print '</td>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a872d166283..64b26ed7875 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5855,10 +5855,11 @@ function getImageFileNameForSize($file, $extName, $extImgTarget='')
  * Return URL we can use for advanced preview links
  *
  * @param   string    $modulepart     propal, facture, facture_fourn, ...
- * @param   string    $relativepath   Relative path of docs
- * @return  string                    Output string with HTML
+ * @param   string    $relativepath   Relative path of docs.
+ * @param	int		  $alldata		  Return array with all components (1 is recommended)  
+ * @return  string|array              Output string with href link or array with all components of link
  */
-function getAdvancedPreviewUrl($modulepart, $relativepath)
+function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata=0)
 {
     global $conf, $langs;
 
@@ -5868,8 +5869,15 @@ function getAdvancedPreviewUrl($modulepart, $relativepath)
     //$mime_preview[]='vnd.oasis.opendocument.presentation';
     //$mime_preview[]='archive';
     $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);
+ 
+    if ($alldata == 1) 
+    {
+    	if ($num_mime !== false) return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath), 'mime'=>dol_mimetype($relativepath), );
+    	else return array();
+    }
 
-    if ($num_mime !== false) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&amp;attachment=0&amp;file='.$relativepath).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
+    // old behavior
+    if ($num_mime !== false) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath)).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
     else return '';
 }
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 9c0a98cbcfb..7d5e5dfa64c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1882,7 +1882,9 @@ if (! function_exists("llxFooter"))
 
         if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
 
-		// Wrapper to show tooltips
+        // TODO Move this in lib_head.js
+
+        // Wrapper to show tooltips (html or onclick popup)
         if (! empty($conf->use_javascript_ajax) && empty($conf->dol_no_mouse_hover))
         {
     		print "\n<!-- JS CODE TO ENABLE tipTip on all object with class classfortooltip -->\n";
@@ -1902,6 +1904,21 @@ if (! function_exists("llxFooter"))
             </script>' . "\n";
         }
         
+        // Wrapper to manage document_preview
+        if (! empty($conf->use_javascript_ajax))
+        {
+            print "\n<!-- JS CODE TO ENABLE document_preview -->\n";
+            print '<script type="text/javascript">
+                jQuery(document).ready(function () {
+			        jQuery(".documentpreview").click(function () {
+            		    console.log("We click on preview for element with href="+$(this).attr(\'href\')+" mime="+$(this).attr(\'mime\'));
+            		    document_preview($(this).attr(\'href\'), $(this).attr(\'mime\'), \''.dol_escape_js($langs->transnoentities("Preview")).'\');
+                		return false;
+        			});
+        		});
+            </script>' . "\n";
+        }         
+        
         // Wrapper to manage dropdown
         if ($conf->use_javascript_ajax)
         {
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index f1db2d21835..42860abb98a 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -802,7 +802,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 
     dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+    print '<div class="nofichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
@@ -845,7 +845,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
     }
 
     print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-    print '<textarea name="domiciliation" rows="'.ROWS_4.'" cols="40" maxlength="255">';
+    print '<textarea name="domiciliation" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
     print GETPOST('domiciliation');
     print "</textarea></td></tr>";
 
@@ -854,7 +854,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
     print "</td></tr>\n";
 
     print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
-    print '<textarea name="owner_address" rows="'.ROWS_4.'" cols="40" maxlength="255">';
+    print '<textarea name="owner_address" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
     print GETPOST('owner_address');
     print "</textarea></td></tr>";
 

From 2b1c29316fa3d348bd76a591626e1119313e89f5 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 24 Mar 2017 22:13:58 +0100
Subject: [PATCH 0443/1163] Display totalLine if one of total field are present

---
 htdocs/compta/facture/list.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index aad49656e2e..8ed52eddb97 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1210,7 +1210,12 @@ if ($resql)
         }
 
     	// Show total line
-    	if (isset($totalarray['totalhtfield']))
+    	if (isset($totalarray['totalhtfield'])
+	   || isset($totalarray['totalvatfield'])
+	   || isset($totalarray['totalttcfield'])
+	   || isset($totalarray['totalamfield'])
+	   || isset($totalarray['totalrtpfield'])
+	   )
     	{
     		print '<tr class="liste_total">';
     		$i=0;

From 94a1fc19fa9b3656878a5379a6600f17c0f2a5ab Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 24 Mar 2017 23:39:25 +0100
Subject: [PATCH 0444/1163] display total line for all total line

---
 htdocs/comm/propal/list.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index aa6df1afb2b..44a2b9356e8 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -977,7 +977,12 @@ if ($resql)
 	}
 
 	// Show total line
-	if (isset($totalarray['totalhtfield']))
+    	if (isset($totalarray['totalhtfield'])
+ 	   || isset($totalarray['totalvatfield'])
+ 	   || isset($totalarray['totalttcfield'])
+ 	   || isset($totalarray['totalamfield'])
+ 	   || isset($totalarray['totalrtpfield'])
+ 	   )
 	{
 		print '<tr class="liste_total">';
 		$i=0;

From 3aff05382825a94ab47e5e25738bbaeb940a5cdb Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 24 Mar 2017 23:40:34 +0100
Subject: [PATCH 0445/1163] Update list.php

---
 htdocs/commande/list.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index f92836599de..f4fc3b76745 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1393,7 +1393,12 @@ if ($resql)
 	}
 
 	// Show total line
-	if (isset($totalarray['totalhtfield']))
+    	if (isset($totalarray['totalhtfield'])
+ 	   || isset($totalarray['totalvatfield'])
+ 	   || isset($totalarray['totalttcfield'])
+ 	   || isset($totalarray['totalamfield'])
+ 	   || isset($totalarray['totalrtpfield'])
+ 	   )
 	{
 	    print '<tr class="liste_total">';
 	    $i=0;

From 6b33a755ba4fb15adf8ba5c7649a771a0a724718 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Mar 2017 23:52:06 +0100
Subject: [PATCH 0446/1163] Add more log on tableDnD

---
 htdocs/core/tpl/ajaxrow.tpl.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index d0a7b45efea..61c27579b50 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -44,6 +44,7 @@ $(document).ready(function(){
     $("#<?php echo $tagidfortablednd; ?>").tableDnD({
 		onDrop: function(table, row) {
 			var reloadpage = "<?php echo $forcereloadpage; ?>";
+			console.log("tableDND onDrop");
 			console.log($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize());
 			var roworder = cleanSerialize($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize());
 			var table_element_line = "<?php echo $table_element_line; ?>";
@@ -59,14 +60,15 @@ $(document).ready(function(){
 						filepath: filepath
 					},
 					function() {
+						console.log("tableDND end of ajax call");
 						if (reloadpage == 1) {
 							location.href = '<?php echo $_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING']; ?>';
 						} else {
 							$("#<?php echo $tagidfortablednd; ?> .drag").each(
 									function( intIndex ) {
-										$(this).removeClass("pair impair");
-										if (intIndex % 2 == 0) $(this).addClass('impair');
-										if (intIndex % 2 == 1) $(this).addClass('pair');
+										// $(this).removeClass("pair impair");
+										//if (intIndex % 2 == 0) $(this).addClass('impair');
+										//if (intIndex % 2 == 1) $(this).addClass('pair');
 									});
 						}
 					});

From db76a05d0cabe59343aa098fb63bc5c568225bdf Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 24 Mar 2017 23:53:32 +0100
Subject: [PATCH 0447/1163] Update list.php

---
 htdocs/fourn/facture/list.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index bff5c773cfc..3afb97c5fb1 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -956,7 +956,12 @@ if ($resql)
 		}
 		
 	    // Show total line
-    	if (isset($totalarray['totalhtfield']))
+    	if (isset($totalarray['totalhtfield'])
+ 	   || isset($totalarray['totalvatfield'])
+ 	   || isset($totalarray['totalttcfield'])
+ 	   || isset($totalarray['totalamfield'])
+ 	   || isset($totalarray['totalrtpfield'])
+ 	   )
     	{
     		print '<tr class="liste_total">';
     		$i=0;

From 720a820ee4c116c5a298921da277ca947ed0a5e4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Mar 2017 00:04:21 +0100
Subject: [PATCH 0448/1163] border-bottom not required.

---
 htdocs/comm/propal/card.php     | 2 +-
 htdocs/comm/propal/contact.php  | 2 +-
 htdocs/comm/propal/document.php | 2 +-
 htdocs/comm/propal/info.php     | 2 +-
 htdocs/comm/propal/note.php     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 810d6bd1abb..e1224ad0e72 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1675,7 +1675,7 @@ if ($action == 'create')
 	$soc->fetch($object->socid);
 
 	$head = propal_prepare_head($object);
-	dol_fiche_head($head, 'comm', $langs->trans('Proposal'), 0, 'propal');
+	dol_fiche_head($head, 'comm', $langs->trans('Proposal'), -1, 'propal');
 
 	$formconfirm = '';
 
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 8588bfc5749..3c3aa6aef88 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -151,7 +151,7 @@ $formother = new FormOther($db);
 if ($object->id > 0)
 {
     $head = propal_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("Proposal"), 0, 'propal');
+	dol_fiche_head($head, 'contact', $langs->trans("Proposal"), -1, 'propal');
 
 
 	// Proposal card
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 9b875e434f7..82978daf2c1 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -89,7 +89,7 @@ if ($object->id > 0)
 	$upload_dir = $conf->propal->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
 	$head = propal_prepare_head($object);
-	dol_fiche_head($head, 'document', $langs->trans('Proposal'), 0, 'propal');
+	dol_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal');
 
 	// Construit liste des fichiers
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index 14a4911b80f..d8af8fb87a8 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -59,7 +59,7 @@ llxHeader('',$langs->trans('Proposal'),'EN:Commercial_Proposals|FR:Proposition_c
 $object->fetch_thirdparty();
 
 $head = propal_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans('Proposal'), 0, 'propal');
+dol_fiche_head($head, 'info', $langs->trans('Proposal'), -1, 'propal');
 
 $object->info($object->id);
 
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 57181b83f6b..ec1dac31c24 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -74,7 +74,7 @@ if ($id > 0 || ! empty($ref))
 		if ($object->fetch_thirdparty() > 0)
 		{
 		    $head = propal_prepare_head($object);
-			dol_fiche_head($head, 'note', $langs->trans('Proposal'), 0, 'propal');
+			dol_fiche_head($head, 'note', $langs->trans('Proposal'), -1, 'propal');
 
 			$cssclass='titlefield';
 			//if ($action == 'editnote_public') $cssclass='titlefieldcreate';

From de832d90a96693e35db3a618eedc183e93e0e754 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 00:50:53 +0100
Subject: [PATCH 0449/1163] Refactoring

---
 htdocs/core/class/coreobject.class.php | 522 ++++++++++++++++---------
 1 file changed, 336 insertions(+), 186 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 312120c59bf..5619361547e 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -25,10 +25,8 @@
  
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
-class CoreObject extends CommonObject {
-	
-	public $db;
-	
+class CoreObject extends CommonObject
+{
 	public $withChild = true;
 	
 	public $error = '';
@@ -41,217 +39,326 @@ class CoreObject extends CommonObject {
 	 *
 	 *  @param      DoliDB		$db      Database handler
 	 */
-	function __construct(DoliDB &$db) {
-		
-
+	function __construct(DoliDB &$db)
+    {
+        $this->db = $db;
 	}
-	
-	protected function init() {
-		
+
+    /**
+     * Function to init fields
+     *
+     * @return bool
+     */
+	protected function init()
+    {
 		$this->id = 0;
 		$this->datec = 0;
 		$this->tms = 0;
 		
-		if(!empty($this->__fields)) {
-			foreach ($this->__fields as $field=>$info) {
-		
-		        if($this->is_date($info)){
-					$this->{$field} = time();
-		        }
-		        elseif($this->is_array($info)){
-					$this->{$field} = array();
-		        }
-		        elseif($this->is_int($info)){
-					$this->{$field} = (int)0;
-		        }
-		        elseif($this->is_float($info)) {
-					$this->{$field} = (double)0;
-				}
-		        else{
-					$this->{$field} = '';
-		        }
+		if (!empty($this->__fields))
+		{
+			foreach ($this->__fields as $field=>$info)
+			{
+		        if ($this->is_date($info)) $this->{$field} = time();
+		        elseif ($this->is_array($info)) $this->{$field} = array();
+		        elseif ($this->is_int($info)) $this->{$field} = (int) 0;
+		        elseif ($this->is_float($info)) $this->{$field} = (double) 0;
+				else $this->{$field} = '';
 		    }
-			
-		    $this->to_delete=false;
+
+            $this->to_delete=false;
+            $this->is_clone=false;
 			
 			return true;
 		}
-		else{
+		else
+        {
 			return false;
 		}
 			
 	}
-	
-	private function checkFieldType($field, $type) {
-		
-		if( isset($this->__fields[$field]) && method_exists($this, 'is_'.$type)) {
+
+    /**
+     * Test type of field
+     *
+     * @param   string  $field  name of field
+     * @param   string  $type   type of field to test
+     * @return                  value of field or false
+     */
+    private function checkFieldType($field, $type)
+    {
+		if (isset($this->__fields[$field]) && method_exists($this, 'is_'.$type))
+		{
 			return $this->{'is_'.$type}($this->__fields[$field]);
 		}
-		else return false;
-		
+		else
+        {
+            return false;
+        }
 	}
-	
-	private function is_date(Array &$info){
-	
+
+    /**
+     * Function test if type is date
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+    private function is_date($info)
+    {
 		if(isset($info['type']) && $info['type']=='date') return true;
 		else return false;
-		
 	}
-	
-	private function is_array($info) {
-		
-	  	if(is_array($info)) {
+
+    /**
+     * Function test if type is array
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+	private function is_array($info)
+    {
+	  	if(is_array($info))
+	  	{
 			if(isset($info['type']) && $info['type']=='array') return true;
 			else return false;
 		}
 		else return false;
 	}
-	
-	
-	private function is_null($info){
-		if(is_array($info)) {
+
+    /**
+     * Function test if type is null
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+	private function is_null($info)
+    {
+		if(is_array($info))
+		{
 			if(isset($info['type']) && $info['type']=='null') return true;
 			else return false;
 		}
 		else return false;
 	}
-	
-	private function is_int($info){
-	
-		if(is_array($info)) {
+
+    /**
+     * Function test if type is integer
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+	private function is_int($info)
+    {
+		if(is_array($info))
+		{
 			if(isset($info['type']) && ($info['type']=='int' || $info['type']=='integer' )) return true;
 			else return false;
 		}
 		else return false;
 	}
-	private function is_float($info){
-		if(is_array($info)) {
+
+    /**
+     * Function test if type is float
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+	private function is_float($info)
+    {
+		if(is_array($info))
+		{
 			if(isset($info['type']) && $info['type']=='float') return true;
 			else return false;
-		} else return false;
+		}
+		else return false;
 	}
-	
-	private function is_text($info){
-	  	if(is_array($info)) {
+
+    /**
+     * Function test if type is text
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+	private function is_text($info)
+    {
+	  	if(is_array($info))
+	  	{
 			if(isset($info['type']) && $info['type']=='text') return true;
 			else return false;
-		} else return false;
+		}
+		else return false;
 	}
-	private function is_index($info){
-	  	if(is_array($info)) {
+
+    /**
+     * Function test if is indexed
+     *
+     * @param   array   $info   content informations of field
+     * @return                  bool
+     */
+	private function is_index($info)
+    {
+	  	if(is_array($info))
+	  	{
 			if(isset($info['index']) && $info['index']==true) return true;
 			else return false;
-		} else return false;
+		}
+		else return false;
 	}
-		
-	private function set_save_query(){
-		
+
+
+    /**
+     * Function to prepare the values to insert
+     *
+     * @return array
+     */
+    private function set_save_query()
+    {
 		$query=array();
-		
-		foreach ($this->__fields as $field=>$info) {
-	
-			if($this->is_date($info)){
-				if(empty($this->{$field})){
+		foreach ($this->__fields as $field=>$info)
+		{
+			if($this->is_date($info))
+			{
+				if(empty($this->{$field}))
+				{
 					$query[$field] = NULL;
 				}
-				else{
+				else
+                {
 					$query[$field] = $this->db->idate($this->{$field});
 				}
 		  	}
-		  	else if($this->is_array($info)){
-		  		    $query[$field] = serialize($this->{$field});
+		  	else if($this->is_array($info))
+		  	{
+                $query[$field] = serialize($this->{$field});
 		  	}
-		
-		  	else if($this->is_int($info)){
-		    	$query[$field] = (int)price2num($this->{$field});
+		  	else if($this->is_int($info))
+		  	{
+		    	$query[$field] = (int) price2num($this->{$field});
 		  	}
-		
-		  	else if($this->is_float($info)){
-		    	$query[$field] = (double)price2num($this->{$field});
+		  	else if($this->is_float($info))
+		  	{
+		    	$query[$field] = (double) price2num($this->{$field});
 		  	}
-		
-		  	elseif($this->is_null($info)) {
-		  		$query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0')?null:$this->{$field});
+		  	elseif($this->is_null($info))
+            {
+		  		$query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0') ? null : $this->{$field});
 		    }
-		    else{
+		    else
+            {
 		       $query[$field] = $this->{$field};
 		    }
-		
 	    }
 	
 		return $query;
 	}
-		
-	private function get_field_list(){
-			
+
+
+    /**
+     * Function to concat keys of fields
+     *
+     * @return string
+     */
+    private function get_field_list()
+    {
 		$keys = array_keys($this->__fields);
-		
 	    return implode(',', $keys);
 	}
-	
-	private function set_vars_by_db(&$obj){
 
-		foreach ($this->__fields as $field=>$info) {
-			if($this->is_date($info)){
-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00')$this->{$field} = 0;
+
+    /**
+     * Function to load data into current object this
+     *
+     * @param   stdClass    $obj    Contain data of object from database
+     */
+    private function set_vars_by_db(&$obj)
+    {
+		foreach ($this->__fields as $field => $info)
+		{
+			if($this->is_date($info))
+			{
+				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
 				else $this->{$field} = strtotime($obj->{$field});
 			}
-			elseif($this->is_array($info)){
+			elseif($this->is_array($info))
+            {
 				$this->{$field} = @unserialize($obj->{$field});
-				//HACK POUR LES DONNES NON UTF8
-				if($this->{$field}===FALSE)@unserialize(utf8_decode($obj->{$field}));
+				// Hack for data not in UTF8
+				if($this->{$field } === FALSE) @unserialize(utf8_decode($obj->{$field}));
 			}
-			elseif($this->is_int($info)){
+			elseif($this->is_int($info))
+            {
 				$this->{$field} = (int)$obj->{$field};
 			}
-			elseif($this->is_float($info)){
+			elseif($this->is_float($info))
+            {
 				$this->{$field} = (double)$obj->{$field};
 			}
-			elseif($this->is_null($info)){
+			elseif($this->is_null($info))
+            {
 				$val = $obj->{$field};
 				// zero is not null 
-				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0')?null:$val);
+				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);
 			}
-			else{
+			else
+            {
 				$this->{$field} = $obj->{$field};
 			}
 
 		}
 	}
-	
-	public function fetch($id, $loadChild = true) {
+
+    /**
+     *	Get object and children from database
+     *
+     *	@param      int			$id       		Id of object to load
+     * 	@param		bool		$loadChild		used to load children from database
+     *	@return     int         				>0 if OK, <0 if KO, 0 if not found
+     */
+	public function fetch($id, $loadChild = true)
+    {
+		if (empty($id)) return false;
+
+		$sql = 'SELECT '.$this->get_field_list().', datec, tms';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= ' WHERE rowid = '.$id;
 		
-		if(empty($id)) return false;
+		$res = $this->db->query($sql);
+		if($obj = $this->db->fetch_object($res))
+		{
+            $this->id = $id;
+            $this->set_vars_by_db($obj);
 
-		$sql = 'SELECT '.$this->get_field_list().',datec,tms
-						FROM '.MAIN_DB_PREFIX.$this->table_element.'
-						WHERE rowid='.$id;
-		
-		$res = $this->db->query( $sql );
-		if($obj = $this->db->fetch_object($res)) {
-				$this->id=$id;
-			
-				$this->set_vars_by_db($obj);
+            $this->datec = $this->db->idate($obj->datec);
+            $this->tms = $this->db->idate($obj->tms);
 
-				$this->datec=$this->db->idate($obj->datec);
-				$this->tms=$this->db->idate($obj->tms);
-				
-				if($loadChild) $this->fetchChild();
+            if ($loadChild) $this->fetchChild();
 
-				return $this->id;
+            return $this->id;
 		}
-		else {
-				$this->error = $this->db->lasterror();
-				
-				return false;
+		else
+        {
+            $this->error = $this->db->lasterror();
+            return false;
 		}
-		
 	}
-	public function addChild($tabName, $id='', $key='id', $try_to_load = false) {
-		if(!empty($id)) {
-			foreach($this->{$tabName} as $k=>&$object) {
+
+
+    /**
+     * Function to instantiate a new child
+     *
+     * @param   string  $tabName        Table name of child
+     * @param   int     $id             If id is given, we try to return his key if exist or load if we try_to_load
+     * @param   string  $key            Attribute name of the object id
+     * @param   bool    $try_to_load    Force the fetch if an id is given
+     * @return                          int
+     */
+    public function addChild($tabName, $id=0, $key='id', $try_to_load = false)
+    {
+		if(!empty($id))
+		{
+			foreach($this->{$tabName} as $k=>&$object)
+			{
 				if($object->{$key} === $id) return $k;
-	
 			}
 		}
 	
@@ -259,28 +366,39 @@ class CoreObject extends CommonObject {
 	
 		$className = ucfirst($tabName);
 		$this->{$tabName}[$k] = new $className($this->db);
-		if($id>0 && $key==='id' && $try_to_load) { 
+		if($id>0 && $key==='id' && $try_to_load)
+		{
 			$this->{$tabName}[$k]->fetch($id); 
 		}
-	
-	
+
 		return $k;
 	}
-	
-	public function removeChild($tabName, $id, $key='id') {
-		foreach($this->{$tabName} as &$object) {
-	
-			if($object->{$key} == $id) {
+
+
+    /**
+     * Function to set a child as to delete
+     *
+     * @param   string  $tabName        Table name of child
+     * @param   int     $id             Id of child to set as to delete
+     * @param   string  $key            Attribute name of the object id
+     * @return                          bool
+     */
+    public function removeChild($tabName, $id, $key='id')
+    {
+		foreach ($this->{$tabName} as &$object)
+		{
+			if ($object->{$key} == $id)
+			{
 				$object->to_delete = true;
 				return true;
 			}
-	
-	
 		}
 		return false;
 	}
-	
-	public function fetchChild() {
+
+
+	public function fetchChild()
+    {
 
 		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
 			foreach($this->childtables as &$childTable) {
@@ -390,76 +508,108 @@ class CoreObject extends CommonObject {
 		}
 	
 	}
-	public function delete(User &$user){
-		if($this->id>0){
-			$this->call_trigger(strtoupper($this->element). '_DELETE', $user);
-			
-			$this->db->delete($this->table_element,array('rowid'=>$this->id),array('rowid'));
-			
-			if($this->withChild && !empty($this->childtables)) {
-				foreach($this->childtables as &$childTable) {
-						
-					$className = ucfirst($childTable);
-					if(!empty($this->{$className})) {
-						foreach($this->{$className} as &$object) {
-				
-							$object->delete($user);
-				
-						}
-					}
-			
-				}
-			}
-			
-		
-			
+	public function delete(User &$user)
+    {
+		if($this->id>0)
+		{
+            $error = 0;
+
+            $result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user);
+            if ($result < 0) $error++;
+
+
+            if (!$error)
+            {
+                $this->db->delete($this->table_element, array('rowid'=>$this->id), array('rowid'));
+
+                if($this->withChild && !empty($this->childtables))
+                {
+                    foreach($this->childtables as &$childTable)
+                    {
+                        $className = ucfirst($childTable);
+                        if (!empty($this->{$className}))
+                        {
+                            foreach($this->{$className} as &$object)
+                            {
+                                $object->delete($user);
+                            }
+                        }
+                    }
+                }
+            }
+
 		}
-	
-		
-	
 	}
-	public function get_date($field,$format='') {
+
+
+    /**
+     * Function to get a formatted date
+     *
+     * @param   string  $field  Attribute to return
+     * @param   string  $format Output date format
+     * @return          string
+     */
+    public function get_date($field, $format='')
+    {
 		if(empty($this->{$field})) return '';
-		else {
+		else
+        {
 			
 			return dol_print_date($this->{$field}, $format);
 		}
-	
 	}
-	
-	public function set_date($field,$date){
 
-	  	if(empty($date)) {
+    /**
+     * Function to set date in field
+     *
+     * @param   string  $field  field to set
+     * @param   string  $date   formatted date to convert
+     * @return                  mixed
+     */
+    public function set_date($field, $date)
+    {
+	  	if (empty($date))
+	  	{
 	  		$this->{$field} = 0;
 	  	}
-		else {
+		else
+        {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$this->{$field} = dol_stringtotime($date);
 		}
 
 		return $this->{$field};
 	}
-	
-	public function set_values(&$Tab) {
-		
-		foreach ($Tab as $key=>$value) {
-	
-			if($this->checkFieldType($key,'date')) {
+
+
+    /**
+     * Function to update current object
+     *
+     * @param   array   $Tab    Array of values
+     */
+    public function set_values(&$Tab)
+    {
+		foreach ($Tab as $key => $value)
+		{
+			if($this->checkFieldType($key, 'date'))
+			{
 				$this->set_date($key, $value);
 			}
-			else if( $this->checkFieldType($key,'array')){
+			else if( $this->checkFieldType($key, 'array'))
+			{
 				$this->{$key} = $value;
 			}
-			else if( $this->checkFieldType($key,'float') ) {
-				$this->{$key} = (double)price2num($value);
+			else if( $this->checkFieldType($key, 'float') )
+			{
+				$this->{$key} = (double) price2num($value);
 			}
-			else if( $this->checkFieldType($key,'int') ) {
-				$this->{$key} = (int)price2num($value);
+			else if( $this->checkFieldType($key, 'int') ) {
+				$this->{$key} = (int) price2num($value);
 			}
-			else {
+			else
+            {
 				$this->{$key} = @stripslashes($value);
 			}
-			
 		}
 	}
 	

From 2e6ab393df577388bc93571b425dbf232a371bb6 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 25 Mar 2017 10:45:01 +0100
Subject: [PATCH 0450/1163] add next_prev_filter for pagination

---
 htdocs/product/price.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index e6bde28d27e..8601ce9c05d 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -657,7 +657,7 @@ $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 dol_fiche_head($head, 'price', $titre, 0, $picto);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-
+$object->next_prev_filter=" fk_product_type = ".$object->type;
 dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
 
 

From cf68039c364a84cc7c0b5379c08a784d19b45000 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 25 Mar 2017 10:47:42 +0100
Subject: [PATCH 0451/1163] Update document.php

---
 htdocs/product/document.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index ae2782cc4de..cedfec4abdc 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -210,8 +210,8 @@ if ($object->id)
 
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-    
-	dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
+    $object->next_prev_filter=" fk_product_type = ".$object->type;
+    dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
     
     print '<div class="fichecenter">';
     

From 269645dfc77143daca1b1f46771460bf3627f6e3 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 10:48:06 +0100
Subject: [PATCH 0452/1163] Add method documentations

---
 htdocs/core/class/coreobject.class.php | 280 +++++++++++++++----------
 1 file changed, 172 insertions(+), 108 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 5619361547e..92597b40ffd 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -28,13 +28,23 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 class CoreObject extends CommonObject
 {
 	public $withChild = true;
-	
+
+    /**
+     * @var string 		Error string
+     */
 	public $error = '';
-	/*
+
+    /**
+     * @var string[]	Array of error strings
+     */
+    public $errors=array();
+
+	/**
 	 *  @var Array $_fields Fields to synchronize with Database
 	 */
 	protected $__fields=array();
-	 /**
+
+    /**
 	 *  Constructor
 	 *
 	 *  @param      DoliDB		$db      Database handler
@@ -338,6 +348,7 @@ class CoreObject extends CommonObject
 		else
         {
             $this->error = $this->db->lasterror();
+            $this->errors[] = $this->error;
             return false;
 		}
 	}
@@ -397,148 +408,202 @@ class CoreObject extends CommonObject
 	}
 
 
-	public function fetchChild()
+    /**
+     * Function to fetch children objects
+     */
+    public function fetchChild()
     {
+		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+		{
+			foreach($this->childtables as &$childTable)
+			{
+                $className = ucfirst($childTable);
 
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
-			foreach($this->childtables as &$childTable) {
-					
-					$className = ucfirst($childTable);
-					
-					$this->{$className}=array();
-					
-					$sql = " SELECT rowid FROM ".MAIN_DB_PREFIX.$childTable." WHERE ".$this->fk_element."=".$this->id;
-					$res = $this->db->query($sql);
-					
-					if($res) {
-						$Tab=array();
-						while($obj = $this->db->fetch_object($res)) {
-							
-							$o=new $className($this->db);	
-							$o->fetch($obj->rowid);
-							
-							$this->{$className}[] = $o;
-							
-						}
-						
-					}
+                $this->{$className}=array();
 
+                $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$childTable.' WHERE '.$this->fk_element.' = '.$this->id;
+                $res = $this->db->query($sql);
+
+                if($res)
+                {
+                    while($obj = $this->db->fetch_object($res))
+                    {
+                        $o=new $className($this->db);
+                        $o->fetch($obj->rowid);
+
+                        $this->{$className}[] = $o;
+                    }
+                }
+                else
+                {
+                    $this->errors[] = $this->db->lasterror();
+                }
 			}
-
 		}
-
 	}
-	
-	public function saveChild(User &$user) {
-	
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
-			foreach($this->childtables as &$childTable) {
-	
+
+    /**
+     * Function to update children data
+     *
+     * @param   User    $user   user object
+     */
+	public function saveChild(User &$user)
+    {
+		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+		{
+			foreach($this->childtables as &$childTable)
+			{
 				$className = ucfirst($childTable);
-				if(!empty($this->{$className})) {
-					foreach($this->{$className} as $i => &$object) {
-		
+				if(!empty($this->{$className}))
+				{
+					foreach($this->{$className} as $i => &$object)
+					{
 						$object->{$this->fk_element} = $this->id;
 						
 						$object->update($user);
 						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
 					}
 				}
-	
 			}
 		}
 	}
-	public function update(User &$user) {
-		if(empty($this->id )) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
-		
-		if(isset($this->to_delete) && $this->to_delete==true) {
-			$this->delete($user);
-		}
-		else {
-		
-			$query = array();
-			
-			$query = $this->set_save_query();
-			$query['rowid']=$this->id;
-				
-			$res = $this->db->update($this->table_element,$query,array('rowid'));
-			
-			if($res) {
-			
-				$result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
-				
-				$this->saveChild($user);
-			
-				return true;
-			}
-			else{
-				$this->error = $this->db->lasterror();
-				
-				return false;
-			}
-		
-		}
-		return $this->id;
-		
-		
+
+
+    /**
+     * Function to update object or create or delete if needed
+     *
+     * @param   User    $user   user object
+     * @return                  < 0 if ko, > 0 if ok
+     */
+    public function update(User &$user)
+    {
+		if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
+        elseif (isset($this->to_delete) && $this->to_delete==true) return $this->delete($user);
+
+        $error = 0;
+        $this->db->begin();
+
+        $query = $this->set_save_query();
+        $query['rowid'] = $this->id;
+
+        $res = $this->db->update($this->table_element, $query, array('rowid'));
+        if ($res)
+        {
+            $result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
+            if ($result < 0) $error++;
+            else $this->saveChild($user);
+        }
+        else
+        {
+            $error++;
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->error;
+        }
+
+        if (empty($error))
+        {
+            $this->db->commit();
+            return $this->id;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+
 	}
-	public function create(User &$user) {
-		if($this->id>0) return $this->update($user);
-		
-		$query = array();
+
+    /**
+     * Function to create object in database
+     *
+     * @param   User    $user   user object
+     * @return                  < 0 if ko, > 0 if ok
+     */
+    public function create(User &$user)
+    {
+		if($this->id > 0) return $this->update($user);
+
+        $error = 0;
+        $this->db->begin();
+
 		$query = $this->set_save_query();
-		$query['datec'] = date("Y-m-d H:i:s",$this->datec);
+		$query['datec'] = date("Y-m-d H:i:s", $this->datec);
 		
-		$res = $this->db->insert($this->table_element,$query);
-	
-		if($res) {
+		$res = $this->db->insert($this->table_element, $query);
+		if($res)
+		{
 			$this->id = $this->db->last_insert_id($this->table_element);
-			
+
 			$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
-			
-			$this->saveChild($user);
-			
-			return $this->id;
+            if ($result < 0) $error++;
+            else $this->saveChild($user);
 		}
-		else{
-			
-			$this->error = $this->db->lasterror();
-			
-			return false;
+		else
+        {
+            $error++;
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->error;
 		}
-	
+
+        if (empty($error))
+        {
+            $this->db->commit();
+            return $this->id;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
 	}
+
+    /**
+     * Function to delete object in database
+     *
+     * @param   User    $user   user object
+     * @return                  < 0 if ko, > 0 if ok
+     */
 	public function delete(User &$user)
     {
-		if($this->id>0)
-		{
-            $error = 0;
+		if ($this->id <= 0) return 0;
 
-            $result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user);
-            if ($result < 0) $error++;
+        $error = 0;
+        $this->db->begin();
 
+        $result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user);
+        if ($result < 0) $error++;
 
-            if (!$error)
+        if (!$error)
+        {
+            $this->db->delete($this->table_element, array('rowid' => $this->id), array('rowid'));
+            if($this->withChild && !empty($this->childtables))
             {
-                $this->db->delete($this->table_element, array('rowid'=>$this->id), array('rowid'));
-
-                if($this->withChild && !empty($this->childtables))
+                foreach($this->childtables as &$childTable)
                 {
-                    foreach($this->childtables as &$childTable)
+                    $className = ucfirst($childTable);
+                    if (!empty($this->{$className}))
                     {
-                        $className = ucfirst($childTable);
-                        if (!empty($this->{$className}))
+                        foreach($this->{$className} as &$object)
                         {
-                            foreach($this->{$className} as &$object)
-                            {
-                                $object->delete($user);
-                            }
+                            $object->delete($user);
                         }
                     }
                 }
             }
+        }
 
-		}
+        if (empty($error))
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->error;
+            $this->db->rollback();
+            return -1;
+        }
 	}
 
 
@@ -554,7 +619,6 @@ class CoreObject extends CommonObject
 		if(empty($this->{$field})) return '';
 		else
         {
-			
 			return dol_print_date($this->{$field}, $format);
 		}
 	}

From a1db02cc0853020fb1ae100e3ee331fbd44ddde4 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 25 Mar 2017 10:48:50 +0100
Subject: [PATCH 0453/1163] Update fournisseurs.php

---
 htdocs/product/fournisseurs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index ab74bc29485..ab959f479fd 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -308,7 +308,7 @@ if ($id > 0 || $ref)
 			dol_fiche_head($head, 'suppliers', $titre, 0, $picto);
 			
 			$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-				
+		$object->next_prev_filter=" fk_product_type = ".$object->type;		
             dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
             
             print '<div class="fichecenter">';

From 656875acb5ab71702bcb7905f5b973dec158032d Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 25 Mar 2017 10:49:57 +0100
Subject: [PATCH 0454/1163] Update info.php

---
 htdocs/product/info.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/info.php b/htdocs/product/info.php
index e29d1a168cb..af626cce5dd 100644
--- a/htdocs/product/info.php
+++ b/htdocs/product/info.php
@@ -94,7 +94,7 @@ if ($id > 0 || $ref)
     dol_fiche_head($head, 'info', $titre, 0, $picto);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-
+	$object->next_prev_filter=" fk_product_type = ".$object->type;
 	dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
 	
 	$object->info($object->id);

From ec3402a04b1045c9d4cdc91ec2207eb3d0cb6920 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 25 Mar 2017 10:52:03 +0100
Subject: [PATCH 0455/1163] Update note.php

---
 htdocs/product/note.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index 9a914527a83..c63d60229fb 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -94,7 +94,7 @@ if ($id > 0 || ! empty($ref))
     dol_fiche_head($head, 'note', $titre, 0, $picto);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-
+    $object->next_prev_filter=" fk_product_type = ".$object->type;
     dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
 
     $cssclass='titlefield';

From 1cc8671433a09e9772f43da29d5a7c8f5f828a09 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 25 Mar 2017 12:06:02 +0100
Subject: [PATCH 0456/1163] FIX : supplier default condition not retrived on
 create

---
 htdocs/supplier_proposal/card.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 41fe2db302a..5b007d45774 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1050,7 +1050,9 @@ if ($action == 'create')
 	}
 	else
 	{
-	    if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
+		$cond_reglement_id 	= $soc->cond_reglement_supplier_id;
+		$mode_reglement_id 	= $soc->mode_reglement_supplier_id;
+		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 	}
 
 	$object = new SupplierProposal($db);
@@ -1087,12 +1089,12 @@ if ($action == 'create')
 
 	// Terms of payment
 	print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td colspan="2">';
-	$form->select_conditions_paiements(GETPOST('cond_reglement_id') > 0 ? GETPOST('cond_reglement_id') : $soc->cond_reglement_id, 'cond_reglement_id', -1, 1);
+	$form->select_conditions_paiements(GETPOST('cond_reglement_id') > 0 ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1);
 	print '</td></tr>';
 
 	// Mode of payment
 	print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
-	$form->select_types_paiements(GETPOST('mode_reglement_id') > 0 ? GETPOST('mode_reglement_id') : $soc->mode_reglement_id, 'mode_reglement_id');
+	$form->select_types_paiements(GETPOST('mode_reglement_id') > 0 ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id');
 	print '</td></tr>';
 
     // Bank Account

From 447607ecd96381ca307c335b8cb2214bcfb7cf0a Mon Sep 17 00:00:00 2001
From: Inovea Conseil <info@inovea-conseil.com>
Date: Sat, 25 Mar 2017 12:46:32 +0100
Subject: [PATCH 0457/1163] Update pdf.php

Missing translate #6577
---
 htdocs/admin/pdf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 74684c823e7..55bd83cbc19 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -98,7 +98,7 @@ $formadmin=new FormAdmin($db);
 $arraydetailsforpdffoot = array(
 	0 => $langs->trans('NoDetails'),
 	1 => $langs->trans('DisplayCompanyInfo'),
-	2 => $langs->trans('DisplayManagersInfo'),
+	2 => $langs->trans('DisplayCompanyManagers'),
 	3 => $langs->trans('DisplayCompanyInfoAndManagers')
 );
 

From 3c9d336148d831f542c9e89b1eb282e678ae797d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Mar 2017 17:05:27 +0100
Subject: [PATCH 0458/1163] Fix error message

---
 build/generate_filelist_xml.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index ff580fad58c..1eeac5410b2 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -40,6 +40,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
  * Main
  */
 
+$includecustom=0;
 $includeconstants=array();
 
 if (empty($argv[1])) 
@@ -67,8 +68,6 @@ while ($i < $argc)
 
 if (empty($includecustom))
 {
-    $includecustom=0;
-
     if (DOL_VERSION != $release)
     {
         print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$release.')'."\n";
@@ -80,7 +79,7 @@ else
 {
     if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
     {
-        print 'Error: When parameter "includecustom" is not set, version declared into ('.DOL_VERSION.') must be used with a suffix into "release" parmater (ex: '.DOL_VERSION.'-mydistrib).'."\n";
+        print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parmater (ex: '.DOL_VERSION.'-mydistrib).'."\n";
         print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
         exit -1;
     }

From ae33e40dc872f1d37f99df04e0d1cd2413a413ea Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 17:32:42 +0100
Subject: [PATCH 0459/1163] Refactoring and add method comments

---
 htdocs/core/class/coreobject.class.php     |  15 +-
 htdocs/inventory/class/inventory.class.php | 567 +++++++++++++--------
 2 files changed, 370 insertions(+), 212 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 92597b40ffd..ec6442c2302 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -29,16 +29,6 @@ class CoreObject extends CommonObject
 {
 	public $withChild = true;
 
-    /**
-     * @var string 		Error string
-     */
-	public $error = '';
-
-    /**
-     * @var string[]	Array of error strings
-     */
-    public $errors=array();
-
 	/**
 	 *  @var Array $_fields Fields to synchronize with Database
 	 */
@@ -349,7 +339,7 @@ class CoreObject extends CommonObject
         {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
-            return false;
+            return -1;
 		}
 	}
 
@@ -650,6 +640,7 @@ class CoreObject extends CommonObject
      * Function to update current object
      *
      * @param   array   $Tab    Array of values
+     * @return                  int
      */
     public function set_values(&$Tab)
     {
@@ -675,6 +666,8 @@ class CoreObject extends CommonObject
 				$this->{$key} = @stripslashes($value);
 			}
 		}
+
+		return 1;
 	}
 	
 }
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 344252f4dc4..05996d02489 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -26,7 +26,6 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 class Inventory extends CoreObject
 {
-	
 	public $element='inventory';
 	public $table_element='inventory';
 	public $fk_element='fk_inventory';
@@ -60,7 +59,11 @@ class Inventory extends CoreObject
 	 * @var string
 	 */
 	public $title;
-	
+
+    /**
+     * Attribute object linked with database
+     * @var array
+     */
 	protected $__fields=array(
 		'fk_warehouse'=>array('type'=>'integer','index'=>true)
 		,'entity'=>array('type'=>'integer','index'=>true)
@@ -68,58 +71,70 @@ class Inventory extends CoreObject
 		,'date_inventory'=>array('type'=>'date')
 		,'title'=>array('type'=>'string')
 	);
-	
-	public $db;
-	
+
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDB		$db      Database handler
+     */
 	public function __construct(DoliDB &$db) 
 	{
 		global $conf;
-		
-		$this->db = &$db;
-		
+
+        parent::__construct($db);
 		parent::init();
 		
        	$this->status = 0;
 		$this->entity = $conf->entity;
 		$this->errors = array();
 		$this->amount = 0;
-		
 	}
-	
+
+    /**
+     * Function to sort children object
+     */
 	public function sort_det() 
 	{
-
 		if(!empty($this->Inventorydet))	usort($this->Inventorydet, array('Inventory', 'customSort'));
 	}
-	
-	public function fetch($id,$annexe = true) 
+
+    /**
+     *	Get object and children from database
+     *
+     *	@param      int			$id       		Id of object to load
+     * 	@param		bool		$loadChild		used to load children from database
+     *	@return     int         				>0 if OK, <0 if KO, 0 if not found
+     */
+	public function fetch($id, $loadChild = true)
 	{
-	    
-        if(!$annexe) $this->withChild = false;
+        if(!$loadChild) $this->withChild = false;
         
-		$res = parent::fetch($id);
-		
-		if($res>0) {
+		$res = parent::fetch($id, $loadChild);
+		if($res > 0)
+		{
 			$this->sort_det();
-			
 			$this->amount = 0;
-			
-			if(!empty($this->Inventorydet ))  {
-				foreach($this->Inventorydet as &$det){
-					$this->amount+=$det->qty_view * $det->pmp;
+			if(!empty($this->Inventorydet ))
+			{
+				foreach($this->Inventorydet as &$det)
+				{
+					$this->amount += $det->qty_view * $det->pmp;
 				}
-				
 			}
 		}
 				
 		return $res;
 	}
-	
-	
+
+    /**
+     * Custom function call by usort
+     *
+     * @param   Inventorydet    $objA   first Inventorydet object
+     * @param   Inventorydet    $objB   second Inventorydet object
+     * @return                          int
+     */
 	private function customSort(&$objA, &$objB)
 	{
-		global $db;
-		
 		$r = strcmp(strtoupper(trim($objA->product->ref)), strtoupper(trim($objB->product->ref)));
 		
 		if ($r < 0) $r = -1;
@@ -128,42 +143,109 @@ class Inventory extends CoreObject
 		
 		return $r;
 	}
-	
-	public function changePMP(User &$user) {
-		if(!empty($this->Inventorydet)) {
+
+    /**
+     * @param   User    $user   user object
+     * @return                  int
+     */
+    public function changePMP(User &$user)
+    {
+        $error = 0;
+        $this->db->begin();
+
+		if(!empty($this->Inventorydet))
+		{
 			foreach ($this->Inventorydet as $k => &$Inventorydet)
 			{
-				
-				if($Inventorydet->new_pmp>0) {
+				if($Inventorydet->new_pmp>0)
+				{
 					$Inventorydet->pmp = $Inventorydet->new_pmp; 
 					$Inventorydet->new_pmp = 0;
 				
-					$this->db->query("UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$Inventorydet->pmp."
-					WHERE rowid = ".$Inventorydet->fk_product );
-					
+					$res = $this->db->query('UPDATE '.MAIN_DB_PREFIX.'product as p SET pmp = '.$Inventorydet->pmp.' WHERE rowid = '.$Inventorydet->fk_product );
+					if (!$res)
+                    {
+                        $error++;
+                        $this->error = $this->db->lasterror();
+                        $this->errors[] = $this->db->lasterror();
+                    }
 				}
 			}
 		}
 		
-		return parent::update($user);
-		
+		$res = parent::update($user);
+        if (!$res)
+        {
+            $error++;
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->db->lasterror();
+        }
+
+
+        if (!$error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
 	}
-	
+
+    /**
+     * Function to update object or create or delete if needed
+     *
+     * @param   User    $user   user object
+     * @return                  < 0 if ko, > 0 if ok
+     */
 	public function update(User &$user)
 	{
-		
-		//si on valide l'inventaire on sauvegarde le stock à cette instant
+		$error = 0;
+		$this->db->begin();
+
+        // if we valid the inventory we save the stock at the same time
 		if ($this->status)
 		{
-			 $this->regulate();
+		    $res = $this->regulate();
+            if ($res < 0)
+            {
+                $error++;
+                $this->error = $this->db->lasterror();
+                $this->errors[] = $this->db->lasterror();
+            }
 		}
-		
-		parent::update($user);
+
+        $res = parent::update($user);
+        if (!$res)
+        {
+            $error++;
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->db->lasterror();
+        }
+
+		if (!$error)
+        {
+            $this->db->commit();
+            return $this->id;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
 	}
-	
+
+    /**
+     * Function to update current object
+     *
+     * @param   array   $Tab    Array of values
+     * @return                  int
+     */
 	public function set_values(&$Tab)
 	{
-		global $db,$langs;
+		global $langs;
 		
 		if (isset($Tab['qty_to_add']))
 		{
@@ -174,10 +256,10 @@ class Inventory extends CoreObject
 				if ($qty < 0) 
 				{
 					$this->errors[] = $langs->trans('inventoryErrorQtyAdd');
-					return 0;
+					return -1;
 				} 
 				
-				$product = new Product($db);
+				$product = new Product($this->db);
 				$product->fetch($this->Inventorydet[$k]->fk_product);
 				
 				$this->Inventorydet[$k]->pmp = $product->pmp;
@@ -185,47 +267,73 @@ class Inventory extends CoreObject
 			}	
 		}
 		
-		parent::set_values($Tab);
+		return parent::set_values($Tab);
 	}
-	
-    public function deleteAllLine(User &$user) {
-        
-        foreach($this->Inventorydet as &$det) {
+
+    /**
+     * Function to delete all Inventorydet
+     *
+     * @param   User    $user   user object
+     * @return                  < 0 if ko, > 0 if ok
+     */
+    public function deleteAllLine(User &$user)
+    {
+        foreach($this->Inventorydet as &$det)
+        {
             $det->to_delete = true;
         }
         
-        $this->update($user);
-      
-        $this->Inventorydet=array();
-        
+        $res = $this->update($user);
+
+        if ($res > 0) $this->Inventorydet = array();
+        else return -1;
     }
-    
-    public function add_product($fk_product, $fk_entrepot='') {
-        
+
+    /**
+     * Function to add Inventorydet
+     *
+     * @param   int     $fk_product     fk_product of Inventorydet
+     * @param   int     $fk_warehouse   fk_warehouse target
+     * @return                          bool
+     */
+    public function add_product($fk_product, $fk_warehouse=0)
+    {
         $k = $this->addChild('Inventorydet');
         $det =  &$this->Inventorydet[$k];
         
         $det->fk_inventory = $this->id;
         $det->fk_product = $fk_product;
-		$det->fk_warehouse = empty($fk_entrepot) ? $this->fk_warehouse : $fk_entrepot;
+		$det->fk_warehouse = empty($fk_warehouse) ? $this->fk_warehouse : $fk_warehouse;
         
         $det->load_product();
                 
         $date = $this->get_date('date_inventory', 'Y-m-d');
-        if(empty($date))$date = $this->get_date('datec', 'Y-m-d'); 
-        $det->setStockDate( $date , $fk_entrepot);
+        if(empty($date)) $date = $this->get_date('datec', 'Y-m-d');
+        $det->setStockDate( $date , $fk_warehouse);
         
         return true;
     }
-    
+
+    /**
+     *  Duplication method product to add datem
+     *  Adjust stock in a warehouse for product
+     *
+     *  @param  	int     $fk_product     id of product
+     *  @param  	int		$fk_warehouse   id of warehouse
+     *  @param  	double	$nbpiece        nb of units
+     *  @param  	int		$movement       0 = add, 1 = remove
+     * 	@param		string	$label			Label of stock movement
+     * 	@param		double	$price			Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed.
+     *  @param		string	$inventorycode	Inventory code
+     * 	@return     int     				<0 if KO, >0 if OK
+     */
     public function correct_stock($fk_product, $fk_warehouse, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
 	{
-		global $conf, $db, $langs, $user;
-		
-		/* duplication method product to add datem */
+		global $conf, $user;
+
 		if ($fk_warehouse)
 		{
-			$db->begin();
+			$this->db->begin();
 
 			require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
 
@@ -234,7 +342,7 @@ class Inventory extends CoreObject
 
 			$datem = empty($conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT) ? dol_now() : $this->date_inventory;
 
-			$movementstock=new MouvementStock($db);
+			$movementstock=new MouvementStock($this->db);
 			$movementstock->origin = new stdClass();
 			$movementstock->origin->element = 'inventory';
 			$movementstock->origin->id = $this->id;
@@ -242,7 +350,7 @@ class Inventory extends CoreObject
 			
 			if ($result >= 0)
 			{
-				$db->commit();
+				$this->db->commit();
 				return 1;
 			}
 			else
@@ -250,19 +358,25 @@ class Inventory extends CoreObject
 			    $this->error=$movementstock->error;
 			    $this->errors=$movementstock->errors;
 
-				$db->rollback();
+				$this->db->rollback();
 				return -1;
 			}
 		}
 	}
-	
+
+    /**
+     * Function to regulate stock
+     *
+     * @return      int
+     */
 	public function regulate()
 	{
-		global $db,$user,$langs,$conf;
+		global $langs,$conf;
 		
-		if($conf->global->INVENTORY_DISABLE_VIRTUAL){
+		if($conf->global->INVENTORY_DISABLE_VIRTUAL)
+		{
 			$pdt_virtuel = false;
-			// Test si pdt virtuel est activé
+			// Test if virtual product is enabled
 			if($conf->global->PRODUIT_SOUSPRODUITS)
 			{
 				$pdt_virtuel = true;
@@ -272,106 +386,138 @@ class Inventory extends CoreObject
 		
 		foreach ($this->Inventorydet as $k => $Inventorydet)
 		{
-			$product = new Product($db);
+			$product = new Product($this->db);
 			$product->fetch($Inventorydet->fk_product);
-			
-			/*
-			 * Ancien code qui était pourri et qui modifié la valeur du stock théorique si le parent était déstocké le même jour que l'enfant
-			 * 
-			 * $product->load_stock();
-			$Inventorydet->qty_stock = $product->stock_warehouse[$this->fk_warehouse]->real;
-			
-			if(date('Y-m-d', $this->date_inventory) < date('Y-m-d')) {
-				$TRes = $Inventorydet->getPmpStockFromDate($PDOdb, date('Y-m-d', $this->date_inventory), $this->fk_warehouse);
-				$Inventorydet->qty_stock = $TRes[1];
-			}
-			*/
+
 			if ($Inventorydet->qty_view != $Inventorydet->qty_stock)
 			{
 				$Inventorydet->qty_regulated = $Inventorydet->qty_view - $Inventorydet->qty_stock;
 				$nbpiece = abs($Inventorydet->qty_regulated);
 				$movement = (int) ($Inventorydet->qty_view < $Inventorydet->qty_stock); // 0 = add ; 1 = remove
 						
-				$href = dol_buildpath('/inventory/inventory.php?id='.$this->id.'&action=view', 1);
+				//$href = dol_buildpath('/inventory/inventory.php?id='.$this->id.'&action=view', 1);
 				
-				$this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock'));
+				$res = $this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock'));
+				if ($res < 0) return -1;
 			}
 		}
 
-		if($conf->global->INVENTORY_DISABLE_VIRTUAL){
-			// Test si pdt virtuel était activé avant la régule
+		if($conf->global->INVENTORY_DISABLE_VIRTUAL)
+		{
+            // Test if virtual product was enabled before regulate
 			if($pdt_virtuel) $conf->global->PRODUIT_SOUSPRODUITS = 1;
 		}
 		
 		return 1;
 	}
-    
-	public function getTitle() {
+
+    /**
+     * Get the title
+     * @return  string
+     */
+	public function getTitle()
+    {
 		global $langs;
 		
 		return !empty($this->title) ? $this->title : $langs->trans('inventoryTitle').' '.$this->id;
 	}
-	
-	public function getNomUrl($picto = 1) {
-		
-        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$this->id, 1).'">'.($picto ? img_picto('','object_list.png','',0).' ' : '').$this->getTitle().'</a>';
-        
-	} 
-	
-	public function add_products_for($fk_warehouse,$fk_category=0,$fk_supplier=0,$only_prods_in_stock=0) {
-		$e = new Entrepot($this->db);
-		$e->fetch($fk_warehouse);
+
+
+    /**
+     * Return clicable link of object (with eventually picto)
+     *
+     * @param   int     $withpicto  Add picto into link
+     * @return                      string
+     */
+	public function getNomUrl($withpicto = 1)
+    {
+        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$this->id, 1).'">'.($withpicto ? img_picto('','object_list.png','',0).' ' : '').$this->getTitle().'</a>';
+	}
+
+    /**
+     * Function to add products by default from warehouse and children
+     *
+     * @param $fk_warehouse
+     * @param int $fk_category
+     * @param int $fk_supplier
+     * @param int $only_prods_in_stock
+     *
+     * @return int
+     */
+	public function add_products_for($fk_warehouse,$fk_category=0,$fk_supplier=0,$only_prods_in_stock=0)
+    {
+        $warehouse = new Entrepot($this->db);
+        $warehouse->fetch($fk_warehouse);
 		$TChildWarehouses = array($fk_warehouse);
-		$e->get_children_warehouses($fk_warehouse, $TChildWarehouses);
+        $warehouse->get_children_warehouses($fk_warehouse, $TChildWarehouses);
 			
-		$sql = 'SELECT ps.fk_product, ps.fk_entrepot
-			     FROM '.MAIN_DB_PREFIX.'product_stock ps
-			     INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = ps.fk_product)
-                 LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product cp ON (cp.fk_product = p.rowid)
-				 LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price pfp ON (pfp.fk_product = p.rowid)
-			     WHERE ps.fk_entrepot IN ('.implode(', ', $TChildWarehouses).')';
+		$sql = 'SELECT ps.fk_product, ps.fk_entrepot';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'product_stock ps';
+        $sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = ps.fk_product)';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product cp ON (cp.fk_product = p.rowid)';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price pfp ON (pfp.fk_product = p.rowid)';
+        $sql.= ' WHERE ps.fk_entrepot IN ('.implode(', ', $TChildWarehouses).')';
 			
-		if($fk_category>0) $sql.= " AND cp.fk_categorie=".$fk_category;
-		if($fk_supplier>0) $sql.= " AND pfp.fk_soc=".$fk_supplier;
-		if(!empty($only_prods_in_stock)) $sql.= ' AND ps.reel > 0';
+		if ($fk_category>0) $sql.= ' AND cp.fk_categorie='.$fk_category;
+		if ($fk_supplier>0) $sql.= ' AND pfp.fk_soc = '.$fk_supplier;
+		if (!empty($only_prods_in_stock)) $sql.= ' AND ps.reel > 0';
 			
-		$sql.=' GROUP BY ps.fk_product, ps.fk_entrepot
-					ORDER BY p.ref ASC,p.label ASC';
+		$sql.=' GROUP BY ps.fk_product, ps.fk_entrepot ORDER BY p.ref ASC,p.label ASC';
 		 
 		$res = $this->db->query($sql);
-		if($res) {
-			while($obj = $this->db->fetch_object($res)){
+		if($res)
+		{
+			while($obj = $this->db->fetch_object($res))
+            {
 				$this->add_product($obj->fk_product, $obj->fk_entrepot);
 			}
+
+			return 1;
 		}
-			
-		
+		else
+        {
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->db->lasterror();
+            return -1;
+        }
 	}
-	
-    static function getLink($id) {
+
+    /**
+     * Return clicable link of inventory object
+     *
+     * @param   int     $id         id of inventory
+     * @param   int     $withpicto  Add picto into link
+     * @return  string
+     */
+    static function getLink($id, $withpicto=1)
+    {
         global $langs,$db;
         
-        $i = new Inventory($db);
-        if($i->fetch($id, false)>0) return $i->getNomUrl();
+        $inventory = new Inventory($db);
+        if($inventory->fetch($id, false) > 0) return $inventory->getNomUrl($withpicto);
         else return $langs->trans('InventoryUnableToFetchObject');
-        
     }
-	
-	static function getSQL($type) {
+
+    /**
+     * Function to get the sql select of inventory
+     * @param   string  $type
+     * @return  string
+     */
+	static function getSQL($type)
+    {
 		global $conf;
-		
-		if($type=='All') {
-			
-			$sql="SELECT i.rowid,i.title, e.label, i.date_inventory, i.fk_warehouse, i.datec, i.tms, i.status
-				  FROM ".MAIN_DB_PREFIX."inventory i
-				  LEFT JOIN ".MAIN_DB_PREFIX."entrepot e ON (e.rowid = i.fk_warehouse)
-				  WHERE i.entity=".(int) $conf->entity;
-			
+
+        $sql = '';
+		if($type == 'All')
+		{
+			$sql = 'SELECT i.rowid,i.title, e.label, i.date_inventory, i.fk_warehouse, i.datec, i.tms, i.status';
+            $sql.= ' FROM '.MAIN_DB_PREFIX.'inventory i';
+            $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot e ON (e.rowid = i.fk_warehouse)';
+            $sql.= ' WHERE i.entity = '.(int) $conf->entity;
 		}
 	
 		return $sql;	
 	}
-	
 }
 
 class Inventorydet extends CoreObject
@@ -404,138 +550,157 @@ class Inventorydet extends CoreObject
 		,'pa'=>array('type'=>'float')
 		,'new_pmp'=>array('type'=>'float')
 	);
-	
-	
-	function __construct(&$db)
+
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDB		$db      Database handler
+     */
+	function __construct(DoliDB &$db)
 	{
 		global $conf;
-		
-		$this->db = &$db;
-		
+
+		parent::__construct($db);
 		parent::init();
 				
 		$this->entity = $conf->entity;
 		$this->errors = array();
 		
 		$this->product = null;
-		
 		$this->current_pa = 0;
-		
 	}
-	
+
+    /**
+     * Get object and children from database
+     *
+     * @param   int   $id   id of inventorydet object
+     * @return  int
+     */
 	function fetch($id) 
 	{
-		global $conf;
-		
 		$res = parent::fetch($id);
 		$this->load_product();
         $this->fetch_current_pa();
 			
 		return $res;
 	}
-	
-	function fetch_current_pa() {
+
+    /**
+     * Function to get the unit buy price
+     *
+     * @return bool
+     */
+    function fetch_current_pa()
+    {
 		global $db,$conf;
 		
 		if(empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)) return false;
 		
-		if($this->pa>0){ 
+		if($this->pa > 0)
+		{
 			$this->current_pa = $this->pa;
 		}
-		else {
-			
+		else
+        {
 			dol_include_once('/fourn/class/fournisseur.product.class.php');
 			$p= new ProductFournisseur($db);
 			$p->find_min_price_product_fournisseur($this->fk_product);
 			
 			if($p->fourn_qty>0)	$this->current_pa = $p->fourn_price / $p->fourn_qty;
 		}
+
 		return true;
 	}
-	
-    function setStockDate($date, $fk_warehouse) {
-        
-		list($pmp,$stock) = $this->getPmpStockFromDate($date, $fk_warehouse);
-		
+
+    /**
+     * Function to set pa attribute from date en fk_warehouse
+     *
+     * @param   date    $date           date value
+     * @param   int     $fk_warehouse   fk_warehouse target
+     */
+    function setStockDate($date, $fk_warehouse)
+    {
+		list($pmp, $stock) = $this->getPmpStockFromDate($date, $fk_warehouse);
+
         $this->qty_stock = $stock;
         $this->pmp = $pmp;
-        
+
         $last_pa = 0;
-        $sql = "SELECT price FROM ".MAIN_DB_PREFIX."stock_mouvement 
-                WHERE fk_entrepot=".$fk_warehouse." 
-                AND fk_product=".$this->fk_product." 
-                AND (origintype='order_supplier' || origintype='invoice_supplier')
-                AND price>0 
-                AND datem<='".$date." 23:59:59'
-                ORDER BY datem DESC LIMIT 1";
-               
+        $sql = 'SELECT price FROM '.MAIN_DB_PREFIX.'stock_mouvement';
+        $sql.= ' WHERE fk_entrepot = '.$fk_warehouse;
+        $sql.= ' AND fk_product = '.$this->fk_product;
+        $sql.= ' AND (origintype=\'order_supplier\' || origintype=\'invoice_supplier\')';
+        $sql.= ' AND price > 0';
+        $sql.= ' AND datem <= \''.$date.' 23:59:59\'';
+        $sql.= ' ORDER BY datem DESC LIMIT 1';
+
         $res = $this->db->query($sql);
-       
-        if($res && $obj = $this->db->fetch_object($res)) {
+        if($res && $obj = $this->db->fetch_object($res))
+        {
             $last_pa = $obj->price;
         }
-        
+
         $this->pa = $last_pa;
-      
     }
 
-	function getPmpStockFromDate( $date, $fk_warehouse){
-		
+
+    /**
+     * Get the last pmp and last stock from date and warehouse
+     *
+     * @param   date    $date           date to check
+     * @param   int     $fk_warehouse   id of warehouse
+     * @return array
+     */
+    function getPmpStockFromDate($date, $fk_warehouse)
+    {
 		$res = $this->product->load_stock();
 		
-		if($res>0) {
+		if($res>0)
+		{
 			$stock = isset($this->product->stock_warehouse[$fk_warehouse]->real) ? $this->product->stock_warehouse[$fk_warehouse]->real : 0;
-			
-			if((float)DOL_VERSION<4.0) {
-				$pmp = isset($this->product->stock_warehouse[$fk_warehouse]->pmp) ? $this->product->stock_warehouse[$fk_warehouse]->pmp : 0; 
-			}
-			else{
-				$pmp = $this->product->pmp;
-			}
-			
+            $pmp = $this->product->pmp;
 		}
 		
 		//All Stock mouvement between now and inventory date
-		$sql = "SELECT value, price
-				FROM ".MAIN_DB_PREFIX."stock_mouvement
-				WHERE fk_product = ".$this->product->id."
-					AND fk_entrepot = ".$fk_warehouse."
-					AND datem > '".date('Y-m-d 23:59:59',strtotime($date))."'
-				ORDER BY datem DESC";
+		$sql = 'SELECT value, price';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.'stock_mouvement';
+        $sql.= ' WHERE fk_product = '.$this->product->id;
+        $sql.= ' AND fk_entrepot = '.$fk_warehouse;
+        $sql.= ' AND datem > \''.date('Y-m-d 23:59:59', strtotime($date)).'\'';
+        $sql.= ' ORDER BY datem DESC';
 
-		
 		$res = $this->db->query($sql);
 		
 		$laststock = $stock;
 		$lastpmp = $pmp;
 		
-		if($res) {
-			while($mouvement = $this->db->fetch_object($res)) {
-				$price = ($mouvement->price>0 && $mouvement->value>0) ? $mouvement->price : $lastpmp;
-				
+		if($res)
+		{
+			while($mouvement = $this->db->fetch_object($res))
+            {
+				$price = ($mouvement->price > 0 && $mouvement->value > 0) ? $mouvement->price : $lastpmp;
 				$stock_value = $laststock * $lastpmp;
-					
 				$laststock -= $mouvement->value;
-					
 				$last_stock_value = $stock_value - ($mouvement->value * $price);
-					
 				$lastpmp = ($laststock != 0) ? $last_stock_value / $laststock : $lastpmp;
 			}
-			
 		}
 		
-		return array($lastpmp,$laststock);
+		return array($lastpmp, $laststock);
 	}
-    
+
+    /**
+     * Fetch the product linked with the line
+     * @return  void
+     */
 	function load_product() 
 	{
 		global $db;
 		
-		if($this->fk_product>0) {
+		if($this->fk_product>0)
+		{
 			$this->product = new Product($db);
 			$this->product->fetch($this->fk_product);
 		}
-		
 	}
-	
 }

From e3afa06cf310878b586c12fb7f771b9a9da5bf54 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 18:01:43 +0100
Subject: [PATCH 0460/1163] Fix inventory sql

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql       | 12 ++++++------
 htdocs/install/mysql/tables/llx_inventory.key.sql    |  2 +-
 htdocs/install/mysql/tables/llx_inventory.sql        |  4 ++--
 htdocs/install/mysql/tables/llx_inventorydet.key.sql |  2 +-
 htdocs/install/mysql/tables/llx_inventorydet.sql     |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 365d367b3f7..986faf2a74c 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -129,20 +129,20 @@ ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
 CREATE TABLE llx_inventory 
 ( 
 rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
-datec DATETIME DEFAULT NULL, 
+datec datetime DEFAULT NULL,
 tms timestamp, 
 fk_warehouse integer DEFAULT 0, 
 entity integer DEFAULT 0, 
 status integer DEFAULT 0, 
 title varchar(255) NOT NULL, 
-date_inventory datetime DATETIME DEFAULT NULL
+date_inventory datetime DEFAULT NULL
 ) 
 ENGINE=InnoDB;
 
 CREATE TABLE llx_inventorydet 
 ( 
 rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
-datec DATETIME DEFAULT NULL, 
+datec datetime DEFAULT NULL,
 tms timestamp, 
 fk_inventory integer DEFAULT 0, 
 fk_warehouse integer DEFAULT 0,
@@ -153,12 +153,12 @@ qty_stock double DEFAULT 0,
 qty_regulated double DEFAULT 0, 
 pmp double DEFAULT 0, 
 pa double DEFAULT 0, 
-new_pmp double DEFAULT 0, 
+new_pmp double DEFAULT 0
 ) 
 ENGINE=InnoDB;
 
 ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms);
-ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (date_cre);
+ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (datec);
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_tms (tms);
-ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (date_cre);
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (datec);
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_fk_inventory (fk_inventory);
diff --git a/htdocs/install/mysql/tables/llx_inventory.key.sql b/htdocs/install/mysql/tables/llx_inventory.key.sql
index 6596e88d817..bf76381e108 100644
--- a/htdocs/install/mysql/tables/llx_inventory.key.sql
+++ b/htdocs/install/mysql/tables/llx_inventory.key.sql
@@ -18,4 +18,4 @@
 -- ===================================================================
 
 ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms);
-ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (date_cre);
+ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (datec);
diff --git a/htdocs/install/mysql/tables/llx_inventory.sql b/htdocs/install/mysql/tables/llx_inventory.sql
index dc4b66f1be2..f906699f5dd 100644
--- a/htdocs/install/mysql/tables/llx_inventory.sql
+++ b/htdocs/install/mysql/tables/llx_inventory.sql
@@ -20,12 +20,12 @@
 CREATE TABLE llx_inventory 
 ( 
 rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
-datec DATETIME DEFAULT NULL, 
+datec datetime DEFAULT NULL,
 tms timestamp, 
 fk_warehouse integer DEFAULT 0, 
 entity integer DEFAULT 0, 
 status integer DEFAULT 0, 
 title varchar(255) NOT NULL, 
-date_inventory datetime DATETIME DEFAULT NULL
+date_inventory datetime DEFAULT NULL
 ) 
 ENGINE=InnoDB;
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.key.sql b/htdocs/install/mysql/tables/llx_inventorydet.key.sql
index 31c5884f60b..3cef44ba52a 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.key.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet.key.sql
@@ -18,5 +18,5 @@
 -- ===================================================================
 
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_tms (tms);
-ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (date_cre);
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (datec);
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_fk_inventory (fk_inventory);
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.sql b/htdocs/install/mysql/tables/llx_inventorydet.sql
index c67ccd32a3f..20e48b877b5 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet.sql
@@ -20,7 +20,7 @@
 CREATE TABLE llx_inventorydet 
 ( 
 rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
-datec DATETIME DEFAULT NULL, 
+datec datetime DEFAULT NULL,
 tms timestamp, 
 fk_inventory integer DEFAULT 0, 
 fk_warehouse integer DEFAULT 0,
@@ -31,6 +31,6 @@ qty_stock double DEFAULT 0,
 qty_regulated double DEFAULT 0, 
 pmp double DEFAULT 0, 
 pa double DEFAULT 0, 
-new_pmp double DEFAULT 0, 
+new_pmp double DEFAULT 0
 ) 
 ENGINE=InnoDB;

From fce8e08b51a7d6a0160c925778e0e4458cd45330 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 18:13:39 +0100
Subject: [PATCH 0461/1163] Refactoring and fix

---
 htdocs/core/class/coreobject.class.php     |   2 +-
 htdocs/core/class/listview.class.php       |  31 +++---
 htdocs/inventory/ajax/ajax.inventory.php   |  18 ++--
 htdocs/inventory/class/inventory.class.php |   5 +-
 htdocs/inventory/inventory.php             |   6 +-
 htdocs/inventory/list.php                  | 108 ++++++++++-----------
 6 files changed, 83 insertions(+), 87 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index ec6442c2302..6454c6e814b 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -517,7 +517,7 @@ class CoreObject extends CommonObject
         $this->db->begin();
 
 		$query = $this->set_save_query();
-		$query['datec'] = date("Y-m-d H:i:s", $this->datec);
+		$query['datec'] = date("Y-m-d H:i:s", dol_now());
 		
 		$res = $this->db->insert($this->table_element, $query);
 		if($res)
diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 46a766a1206..c0579a47850 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -19,21 +19,19 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class Listview {
+class Listview
+{
 	
-	function __construct(&$db, $id ) {
-			
+	function __construct(&$db, $id)
+    {
 		$this->db = &$db;
-			
 		$this->id = $id;
-		
 		$this->TTotalTmp=array();
-		
 		$this->sql = '';
-
 	}
-	private function init(&$TParam) {
-		
+
+	private function init(&$TParam)
+    {
 		global $conf, $langs;
 		
 		if(!isset($TParam['hide']))$TParam['hide']=array();
@@ -574,7 +572,7 @@ class Listview {
 		
 		$this->init($TParam);
 		
-		$this->parse_array($THeader, $TField, $TParam,$TField);
+		$this->parse_array($THeader, $TField, $TParam);
 		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
 		$this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);	
@@ -610,13 +608,14 @@ class Listview {
 		return $sql;
 	}
 	
-	private function parse_array(&$THeader, &$TField, &$TParam, $TField) {
-		$first=true;
-		
-		 $this->THideFlip = array_flip($TParam['hide']);
+	private function parse_array(&$THeader, &$TField, &$TParam)
+    {
+		$first = true;
+
+		$this->THideFlip = array_flip($TParam['hide']);
 		$this->TTotalTmp=array();
 		
-		if(empty($TField)) return false;
+		if (empty($TField)) return false;
 		
 		foreach($TField as $row) {
 			if($first) {
@@ -844,7 +843,7 @@ class Listview {
 		$this->TTotalTmp=array();
 		
 		$this->THideFlip = array_flip($TParam['hide']);
-var_dump($this->sql);
+
 		$res = $this->db->query($this->sql);
 		if($res!==false) {
 			
diff --git a/htdocs/inventory/ajax/ajax.inventory.php b/htdocs/inventory/ajax/ajax.inventory.php
index f2f5ef54903..c1f372806c8 100644
--- a/htdocs/inventory/ajax/ajax.inventory.php
+++ b/htdocs/inventory/ajax/ajax.inventory.php
@@ -6,20 +6,23 @@
     $get = GETPOST('get');
     $put = GETPOST('put');
     
-    switch ($put) {
+    switch ($put)
+    {
         case 'qty':
-            if (!$user->rights->inventory->write) { echo -1; exit; }
+            if (empty($user->rights->inventory->write)) { echo -1; exit; }
             
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
             $det = new Inventorydet($db);
-            if( $det->fetch( $fk_det_inventory)) {
+            if( $det->fetch( $fk_det_inventory))
+            {
                 $det->qty_view+=GETPOST('qty');
                 $det->update($user);
                 
                 echo $det->qty_view;
             }
-            else {
+            else
+            {
                 echo -2;
             }            
             
@@ -31,17 +34,18 @@
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
             $det = new Inventorydet($db);
-            if( $det->fetch( $fk_det_inventory)) {
+            if( $det->fetch( $fk_det_inventory))
+            {
                 $det->new_pmp=price2num(GETPOST('pmp'));
                 $det->update($user);
                 
                 echo $det->new_pmp;
             }
-            else {
+            else
+            {
                 echo -2;
             }            
             
             break;
-        
     }
  
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 05996d02489..46f27906cc9 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -573,10 +573,11 @@ class Inventorydet extends CoreObject
     /**
      * Get object and children from database
      *
-     * @param   int   $id   id of inventorydet object
+     * @param   int   $id           id of inventorydet object
+     * @param   bool  $loadChild    load children
      * @return  int
      */
-	function fetch($id) 
+	function fetch($id, $loadChild = true)
 	{
 		$res = parent::fetch($id);
 		$this->load_product();
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index 7e43c3ce44e..403b148ec2c 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 $langs->load("stock");
 $langs->load("inventory");
 
-if(!$user->rights->inventory->read) accessforbidden();
+if(empty($user->rights->inventory->read)) accessforbidden();
 
 _action();
 
@@ -54,7 +54,7 @@ function _action()
 	
 	switch($action) {
 		case 'create':
-			if (!$user->rights->inventory->create) accessforbidden();
+			if (empty($user->rights->inventory->create)) accessforbidden();
 			
 			$inventory = new Inventory($db);
 			
@@ -63,7 +63,7 @@ function _action()
 			break;
 		
 		case 'confirmCreate':
-			if (!$user->rights->inventory->create) accessforbidden();
+			if (empty($user->rights->inventory->create)) accessforbidden();
 		
 			$inventory = new Inventory($db);
 			$inventory->set_values($_POST);
diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index c6846cfc618..2fb1a2b7f31 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -36,67 +36,59 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 $langs->load("stock");
 $langs->load("inventory");
 
-if(!$user->rights->inventory->read) accessforbidden();
-
-_list();
-
-
-function _list() 
-{
-	
-	global $db, $conf, $langs, $user;
+if (empty($user->rights->inventory->read)) accessforbidden();
 		
-	llxHeader('',$langs->trans('inventoryListTitle'),'','');
-	
-	echo '<form name="formListInvetory" action="'.$_SERVER['PHP_SELF'].'" method="post" >';
-	
-	$inventory = new Inventory($db);
-	$l = new ListView($db,'listInventory');
+llxHeader('',$langs->trans('inventoryListTitle'),'','');
 
-	$THide = array('label','title');
+echo '<form name="formListInvetory" action="'.$_SERVER['PHP_SELF'].'" method="post" >';
 
-	echo $l->render(Inventory::getSQL('All'), array(
-		'link'=>array(
-			'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
-		)
-		,'translate'=>array()
-		,'hide'=>$THide
-		,'type'=>array(
-			'datec'=>'date'
-			,'tms'=>'datetime'
-			,'date_inventory'=>'date'
-		)
-		,'list'=>array(
-			'title'=>$langs->trans('inventoryListTitle')
-			,'messageNothing'=>$langs->trans('inventoryListEmpty')
-		)
-		,'title'=>array(
-			'rowid'=>$langs->trans('Title')
-			,'fk_warehouse'=>$langs->trans('Warehouse')
-			,'date_inventory'=>$langs->trans('InventoryDate')
-			,'datec'=>$langs->trans('DateCreation')
-			,'tms'=>$langs->trans('DateUpdate')
-			,'status'=>$langs->trans('Status')
-		)
-		,'eval'=>array(
-			'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))'
-			,'rowid'=>'Inventory::getLink(@val@)'
-		)
-		,'search'=>array(
-				'date_inventory'=>'calendars'
-				,'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
-		)
-	));
+$inventory = new Inventory($db);
+$list = new ListView($db,'listInventory');
+
+$THide = array('label','title');
+
+echo $list->render(Inventory::getSQL('All'), array(
+    'link'=>array(
+        'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
+    )
+    ,'translate'=>array()
+    ,'hide'=>$THide
+    ,'type'=>array(
+        'datec'=>'date'
+        ,'tms'=>'datetime'
+        ,'date_inventory'=>'date'
+    )
+    ,'list'=>array(
+        'title'=>$langs->trans('inventoryListTitle')
+        ,'messageNothing'=>$langs->trans('inventoryListEmpty')
+    )
+    ,'title'=>array(
+        'rowid'=>$langs->trans('Title')
+        ,'fk_warehouse'=>$langs->trans('Warehouse')
+        ,'date_inventory'=>$langs->trans('InventoryDate')
+        ,'datec'=>$langs->trans('DateCreation')
+        ,'tms'=>$langs->trans('DateUpdate')
+        ,'status'=>$langs->trans('Status')
+    )
+    ,'eval'=>array(
+        'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))'
+        ,'rowid'=>'Inventory::getLink(@val@)'
+    )
+    ,'search'=>array(
+        'date_inventory'=>'calendars'
+        ,'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
+    )
+));
 
 
-	if ($user->rights->inventory->create)
-	{
-		print '<div class="tabsAction">';
-		print '<a class="butAction" href="inventory.php?action=create">'.$langs->trans('inventoryCreate').'</a>';
-		print '</div>';
-	}
+if (!empty($user->rights->inventory->create))
+{
+    print '<div class="tabsAction">';
+    print '<a class="butAction" href="inventory.php?action=create">'.$langs->trans('inventoryCreate').'</a>';
+    print '</div>';
+}
 
-	echo '</form>';
-	
-	llxFooter('');
-}
\ No newline at end of file
+echo '</form>';
+
+llxFooter('');
+$db->close();
\ No newline at end of file

From cb576e6c9932b814ebfe0ad5b686d35d287c1c33 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 18:26:10 +0100
Subject: [PATCH 0462/1163] Refactoring class

---
 htdocs/core/class/listview.class.php | 117 +++++++++++++++++++--------
 htdocs/inventory/list.php            |   2 +-
 2 files changed, 83 insertions(+), 36 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index c0579a47850..11a948472e4 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -21,7 +21,12 @@
 
 class Listview
 {
-	
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDB		$db      Database handler
+     *  @param      string		$id      html id
+     */
 	function __construct(&$db, $id)
     {
 		$this->db = &$db;
@@ -30,6 +35,12 @@ class Listview
 		$this->sql = '';
 	}
 
+    /**
+     * Function to init fields
+     *
+     * @param   array   $TParam     array of configuration of list
+     * @return bool
+     */
 	private function init(&$TParam)
     {
 		global $conf, $langs;
@@ -51,87 +62,123 @@ class Listview
 			,'orderUp'=>''
 			,'id'=>$this->id
 			,'head_search'=>''
-			,'export'=>array() //TODO include native export
-			,'view_type'=>'' //TODO to include graph or kanban instead of list
+			,'export'=>array()
+			,'view_type'=>''
 		),$TParam['list']);
 		
 		$POSTList = GETPOST('Listview');
 		
-		if(empty($TParam['limit']))$TParam['limit']=array();
-		if(!empty($POSTList[$this->id]['page'])) $TParam['limit']['page'] = $POSTList[$this->id]['page'];
+		if (empty($TParam['limit']))$TParam['limit'] = array();
+		if (!empty($POSTList[$this->id]['page'])) $TParam['limit']['page'] = $POSTList[$this->id]['page'];
 		
-		$TParam['limit']=array_merge(array('page'=>1, 'nbLine'=>$conf->liste_limit, 'global'=>0), $TParam['limit']);
+		$TParam['limit'] = array_merge(array('page'=>1, 'nbLine'=>$conf->liste_limit, 'global'=>0), $TParam['limit']);
 		
-		if(!empty($POSTList[$this->id]['orderBy'])) {
+		if(!empty($POSTList[$this->id]['orderBy']))
+		{
 			$TParam['orderBy'] = $POSTList[$this->id]['orderBy']; 
 		}
-		
 	}
-	private function getSearchNull($key, &$TParam) {
+
+
+    /**
+     * Function to know if we can search on null value
+     * @param   string  $key    field name
+     * @param   array   $TParam array of configuration
+     * @return bool
+     */
+    private function getSearchNull($key, &$TParam)
+    {
 		return !empty($TParam['search'][$key]['allow_is_null']);
-	} 
-	private function getSearchKey($key, &$TParam) {
-		
-		$TPrefixe=array();
-		if(!empty($TParam['search'][$key]['table'])) {
+	}
+
+    /**
+     * @param $key
+     * @param $TParam
+     * @return array
+     */
+	private function getSearchKey($key, &$TParam)
+    {
+		$TPrefixe = array();
+		if(!empty($TParam['search'][$key]['table']))
+		{
 			if (!is_array($TParam['search'][$key]['table'])) $TParam['search'][$key]['table'] = array($TParam['search'][$key]['table']);
 			
-			foreach ($TParam['search'][$key]['table'] as $prefix_table) {
+			foreach ($TParam['search'][$key]['table'] as $prefix_table)
+			{
 				$TPrefixe[] = $prefix_table.'.'; 
 			}
 		}
 		
 		$TKey=array();
-		if(!empty($TParam['search'][$key]['field'])) {
+		if(!empty($TParam['search'][$key]['field']))
+		{
 			if (!is_array($TParam['search'][$key]['field'])) $TParam['search'][$key]['field'] = array($TParam['search'][$key]['field']);
 			
-			foreach ($TParam['search'][$key]['field'] as $i => $field) {
+			foreach ($TParam['search'][$key]['field'] as $i => $field)
+			{
 				$prefixe = !empty($TPrefixe[$i]) ? $TPrefixe[$i] : $TPrefixe[0];
 				$TKey[] = $prefixe. $field ;
 			}
-		} else {
-			$TKey[] =$TPrefixe[0].$key;
+		}
+		else
+		{
+			$TKey[] = $TPrefixe[0].$key;
 		}
 		
 		return $TKey;
-	} 
-	
-	private function dateToSQLDate($date) {
-		
+	}
+
+    /**
+     * @param $date
+     * @return int|string   Date TMS or ''
+     */
+    private function dateToSQLDate($date)
+    {
 		return $this->db->jdate($date);
 	}
-	
-	private function addSqlFromTypeDate(&$TSQLMore, &$value, $sKey)
+
+
+    /**
+     * @param $TSQLMore
+     * @param $value
+     * @param $sKey
+     */
+    private function addSqlFromTypeDate(&$TSQLMore, &$value, $sKey)
 	{
 		if(is_array($value))
 		{
-			
 			$TSQLDate=array();
 			if(!empty($value['start']))
 			{
 				$valueDeb = $this->dateToSQLDate($value['start']);
 				$TSQLDate[]=$sKey." >= '".$valueDeb." 00:00:00'" ;
-				
 			}
-			
+
 			if(!empty($value['end']))
 			{
 				$valueFin = $this->dateToSQLDate($value['end']);
-				$TSQLDate[]=$sKey." <= '".$valueFin." 23:59:59'" ;	
-				
+				$TSQLDate[]=$sKey." <= '".$valueFin." 23:59:59'" ;
 			}
-			
+
 			if(!empty($TSQLDate)) $TSQLMore[] = implode(' AND ', $TSQLDate);
 		}
 		else
 		{
 			$value = $this->dateToSQLDate($value);
 			$TSQLMore[]=$sKey." LIKE '".$value."%'" ;
-			
 		}
 	}
-	
-	private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $key)
+
+
+    /**
+     * @param $TSQLMore
+     * @param $value
+     * @param $TParam
+     * @param $sKey
+     * @param $key
+     * @return bool
+     */
+    private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $key)
 	{
 		if($value==-1) return false;
 			
@@ -363,7 +410,7 @@ class Listview
 					$TTotal[$field]=count($this->TTotalTmp[$targetField]);
 				}
 				else {
-					$TTotal[$field]=array_sum($this->TTotalTmp[$targetField]);	
+					$TTotal[$field]=array_sum($this->TTotalTmp[$targetField]);
 				}
 								
 			}
diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index 2fb1a2b7f31..23d25913ccd 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -43,7 +43,7 @@ llxHeader('',$langs->trans('inventoryListTitle'),'','');
 echo '<form name="formListInvetory" action="'.$_SERVER['PHP_SELF'].'" method="post" >';
 
 $inventory = new Inventory($db);
-$list = new ListView($db,'listInventory');
+$list = new ListView($db, 'listInventory');
 
 $THide = array('label','title');
 

From 2fc74b496278394b4b5bca76aa13b5b4d811a04c Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 18:53:14 +0100
Subject: [PATCH 0463/1163] Refactoring class

---
 htdocs/core/class/listview.class.php | 685 +++++++++++++++------------
 htdocs/inventory/list.php            |  54 +--
 2 files changed, 420 insertions(+), 319 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 11a948472e4..38645dbca0a 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -200,52 +200,51 @@ class Listview
 		}
 		else
 		{
-				if(strpos($value,'%')===false) $value = '%'.$value.'%';
-				$TSQLMore[]=$sKey." LIKE '".addslashes($value)."'" ;
+            if(strpos($value,'%')===false) $value = '%'.$value.'%';
+            $TSQLMore[]=$sKey." LIKE '".addslashes($value)."'" ;
 		}
 		
 		return true;
 	}
 
-	private function search($sql,&$TParam) {
-	
+
+    /**
+     * @param $sql
+     * @param $TParam
+     * @return string
+     */
+    private function search($sql, &$TParam)
+    {
 		$ListPOST = GETPOST('Listview');
 		
-		if(!empty($ListPOST[$this->id]['search'])) {
+		if(!empty($ListPOST[$this->id]['search']))
+		{
 			$sqlGROUPBY='';
-			if(strpos($sql,'GROUP BY')!==false) { //TODO regex
+			if(strpos($sql,'GROUP BY')!==false)
+			{
 				list($sql, $sqlGROUPBY) = explode('GROUP BY', $sql);
 			}
 			
-			if(strpos($sql,'WHERE ')===false)$sql.=' WHERE 1 '; //TODO regex
-			//TODO	$value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
+			if(strpos($sql,'WHERE ')===false) $sql.=' WHERE 1 ';
 			
-			foreach($ListPOST[$this->id]['search'] as $key=>$value)
+			foreach($ListPOST[$this->id]['search'] as $key => $value)
 			{
 				$TsKey = $this->getSearchKey($key, $TParam);
-				
-				//if (!empty($value)) var_dump($TsKey, $TsBindKey, '==================================');
 				$TSQLMore = array();
 				
 				$allow_is_null = $this->getSearchNull($key,$TParam);
-				$search_on_null = false; //TODO useless
 				
 				foreach ($TsKey as $i => &$sKey)
 				{
 					if($allow_is_null && !empty($ListPOST[$this->id]['search_on_null'][$key]))
 					{
 						$TSQLMore[] = $sKey.' IS NULL ';
-						$search_on_null = true;
-						
 						$value = '';
 					}
-					elseif($allow_is_null)
+
+					// Do not use empty() function, statut 0 exist
+					if($value != '')
 					{
-						null;
-					}
-					
-					if($value!='') { // pas empty car biensûr le statut = 0 existe dans de nombreux cas
-						
 						if(isset($TParam['type'][$key]) && ($TParam['type'][$key]==='date' || $TParam['type'][$key]==='datetime'))
 						{
 							$this->addSqlFromTypeDate($TSQLMore, $value, $sKey);
@@ -265,15 +264,18 @@ class Listview
 			}
 			
 			if($sqlGROUPBY!='')	$sql.=' GROUP BY '.$sqlGROUPBY;
-			
 		}
 
-		
 		return $sql;
 	}
 
-	public function render($sql,$TParam=array()) {
-
+    /**
+     * @param $sql
+     * @param array $TParam
+     * @return string
+     */
+    public function render($sql, $TParam=array())
+    {
 		$THeader=array();
 		$TField=array();	
 		
@@ -286,11 +288,16 @@ class Listview
 		
 		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
-		return $this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);	
-		
+		return $this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);
 	}
 
-	private function setSearch(&$THeader, &$TParam) {
+    /**
+     * @param $THeader
+     * @param $TParam
+     * @return array
+     */
+    private function setSearch(&$THeader, &$TParam)
+    {
 		global $langs, $form;
 		
 		if(empty($TParam['search'])) return array();
@@ -299,32 +306,33 @@ class Listview
 		
 		$nb_search_in_bar = 0;
 		
-		if(!empty($TParam['search'])) {
-			foreach($THeader as $key=>$libelle) { // init
+		if(!empty($TParam['search']))
+		{
+			foreach($THeader as $key => $libelle)
+			{
 				if(empty($TSearch[$key]))$TSearch[$key]='';
 			}
 		}	
 		
 		$ListPOST = GETPOST('Listview');
-		
-		foreach($TParam['search'] as $key=>$param_search) {
-			
+		foreach($TParam['search'] as $key => $param_search)
+		{
 			$value = isset($ListPOST[$this->id]['search'][$key]) ? $ListPOST[$this->id]['search'][$key] : '';
 			
 			$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search;  
 			
-			if(is_array($typeRecherche)) {
+			if(is_array($typeRecherche))
+			{
 				$fsearch=$form->selectarray('Listview['.$this->id.'][search]['.$key.']', $typeRecherche,$value,1);
 			}
-			else if($typeRecherche==='calendar') {
-				
+			else if($typeRecherche==='calendar')
+			{
 				$value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
 				
 				$fsearch = $form->select_date($value, 'Listview_'.$this->id.'_search_'.$key,0, 0, 1, "", 1, 0, 1);
-				//$fsearch=$form->calendrier('','Listview['.$this->id.'][search]['.$key.']',$value,10,10,' listviewtbs="calendar" ');	
 			}
-			else if($typeRecherche==='calendars') {
-				
+			else if($typeRecherche==='calendars')
+			{
 				$value_start = GETPOST('Listview_'.$this->id.'_search_'.$key.'_start') ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startmonth'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startday'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startyear') ) : '';
 				$value_end = GETPOST('Listview_'.$this->id.'_search_'.$key.'_end') ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endmonth'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endday'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endyear') ) : '';
 			
@@ -332,96 +340,113 @@ class Listview
 						 . $form->select_date($value_end, 'Listview_'.$this->id.'_search_'.$key.'_end',0, 0, 1, "", 1, 0, 1);
 				
 			}
-			else if(is_string($typeRecherche)) {
+			else if(is_string($typeRecherche))
+			{
 				$fsearch=$TParam['search'][$key];	
 			}
-			else {
+			else
+            {
 				$fsearch='<input type="text" name="Listview['.$this->id.'][search]['.$key.']" id="Listview['.$this->id.'][search]['.$key.']" value="'.$value.'" size="15" />';
 			}
 
-			if(!empty($param_search['allow_is_null'])) {
+			if(!empty($param_search['allow_is_null']))
+			{
 				$valueNull = isset($ListPOST[$this->id]['search_on_null'][$key]) ? 1 : 0;
 				$fsearch.=' '.$form->checkbox1('', 'Listview['.$this->id.'][search_on_null]['.$key.']',1, $valueNull,' onclick=" if($(this).is(\':checked\')){ $(this).prev().val(\'\'); }" ').img_help(1, $langs->trans('SearchOnNUllValue'));
 			}
-			
 
-			if(!empty($THeader[$key])) {
+			if(!empty($THeader[$key]))
+			{
 				$TSearch[$key] = $fsearch;
 				$nb_search_in_bar++;
 			}
-			else {
+			else
+            {
 				
 				$label = !empty($TParam['title'][$key]) ? $TParam['title'][$key] : $key ;
 				$TParam['list']['head_search'].='<div><span style="min-width:200px;display:inline-block;">'.$libelle.'</span> '.$fsearch.'</div>';	
 			}
-				
 		}
 		
 		$search_button = ' <a href="#" onclick="Listview_submitSearch(this);" class="list-search-link">'.img_search().'</a>';
 
-		if(!empty($TParam['list']['head_search'])) {
+		if(!empty($TParam['list']['head_search']))
+		{
 			$TParam['list']['head_search']='<div style="float:right;">'.$search_button.'</div>'.$TParam['list']['head_search'];
 		}
 		
-		if($nb_search_in_bar>0) {
+		if($nb_search_in_bar>0)
+		{
 			end($TSearch);
 			list($key,$v) = each($TSearch);
 			$TSearch[$key].=$search_button;
 		}
-		else{
+		else
+        {
 			$TSearch=array();
 		}
 		
 		return $TSearch;
 	}
 
-	/*
-	 * Function analysant et totalisant une colonne
-	 * Supporté : sum, average
-	 */
-	private function get_total(&$TField, &$TParam) {
+    /**
+     * Function to analyse and calculate the total from a column
+     *
+     * @param $TField
+     * @param $TParam
+     * @return array
+     */
+    private function get_total(&$TField, &$TParam)
+    {
 		$TTotal=$TTotalGroup=array();	
 		
-		if(!empty($TParam['math']) && !empty($TField[0])) {
-			
-			foreach($TField[0] as $field=>$value) {
+		if(!empty($TParam['math']) && !empty($TField[0]))
+		{
+			foreach($TField[0] as $field=>$value)
+			{
 				$TTotal[$field]='';	
 				$TTotalGroup[$field] = '';
 			}
 		
-			foreach($TParam['math'] as $field=>$typeMath){
-
-				if(is_array($typeMath)) {
+			foreach($TParam['math'] as $field=>$typeMath)
+			{
+				if(is_array($typeMath))
+				{
 					$targetField = $typeMath[1];
 					$typeMath = $typeMath[0];
 				}
-				else {
+				else
+                {
 					$targetField = $field;
 				}
 
-				if($typeMath == 'groupsum') {
+				if($typeMath == 'groupsum')
+				{
 					$TTotalGroup[$field] = array('target'=>$targetField, 'values'=> $this->TTotalTmp['@groupsum'][$targetField]);
-					
 				}
-				else if($typeMath=='average') {
+				else if($typeMath=='average')
+				{
 					$TTotal[$field]=array_sum($this->TTotalTmp[$targetField]) / count($this->TTotalTmp[$targetField]);
 				}
-				elseif($typeMath=='count') {
+				elseif($typeMath=='count')
+                {
 					$TTotal[$field]=count($this->TTotalTmp[$targetField]);
 				}
-				else {
+				else
+                {
 					$TTotal[$field]=array_sum($this->TTotalTmp[$targetField]);
 				}
-								
 			}
-			
-		
 		}
 		
 		return array($TTotal,$TTotalGroup);
 	}
 
-	private function getJS() {
+    /**
+     * @return string
+     */
+    private function getJS()
+    {
 		$javaScript = '<script language="javascript">
 		if(typeof(Listview_include)=="undefined") {
 			document.write("<script type=\"text/javascript\" src=\"'.DOL_URL_ROOT.'/core/js/listview.js?version='.DOL_VERSION.'\"></scr");
@@ -432,55 +457,66 @@ class Listview
 		return $javaScript;
 	}
 
-	private function setExport(&$TParam,$TField,$THeader) {
+    /**
+     * @param $TParam
+     * @param $TField
+     * @param $THeader
+     * @return array
+     */
+    private function setExport(&$TParam, $TField, $THeader)
+    {
 		global $langs;
 		
 		$Tab=array();
-		if(!empty($TParam['export'])) {
+		if(!empty($TParam['export']))
+		{
 			$token = GETPOST('token');
 			if(empty($token)) $token = md5($this->id.time().rand(1,9999));
 
-			$_SESSION['token_list_'.$token] = gzdeflate( serialize( array(
-				'title'=>$this->title
-				,'sql'=>$this->sql
-				,'TBind'=>$this->TBind
-				,'TChamps'=>$TField
-				,'TEntete'=>$THeader
-			) ) );
+            $_SESSION['token_list_'.$token] = gzdeflate( serialize( array(
+                'title'=>$this->title,
+                'sql'=>$this->sql,
+                'TBind'=>$this->TBind,
+                'TChamps'=>$TField,
+                'TEntete'=>$THeader
+            )));
 
-			foreach($TParam['export'] as $mode_export) {
-				
-				$Tab[] = array(
-						'label'=>$langs->trans('Export'.$mode_export)
-						,'url'=>dol_buildpath('/abricot/downlist.php',1)
-						,'mode'=>$mode_export
-						,'token'=>$token
-						,'session_name'=>session_name()
-				);
-				
+            foreach($TParam['export'] as $mode_export)
+            {
+                $Tab[] = array(
+                    'label'=>$langs->trans('Export'.$mode_export),
+                    'url'=>dol_buildpath('/abricot/downlist.php',1),
+                    'mode'=>$mode_export,
+                    'token'=>$token,
+                    'session_name'=>session_name()
+                );
 			}
 			
 		}
 		
-		
 		return $Tab;
 	}
 
-	private function addTotalGroup($TField,$TTotalGroup) {
+    /**
+     * @param $TField
+     * @param $TTotalGroup
+     * @return array
+     */
+    private function addTotalGroup($TField, $TTotalGroup)
+    {
 		global $langs;
 		
 		$Tab=array();
-		
 		$proto_total_line = array();
-		
 		$tagbase = $old_tagbase = null;
-		
 		$addGroupLine = false;
 		
-		foreach($TField as $k=>&$line) {
-				
-			if(empty($proto_total_line)) {
-				foreach($line as $field=>$value) {
+		foreach($TField as $k=>&$line)
+		{
+			if(empty($proto_total_line))
+			{
+				foreach($line as $field=>$value)
+				{
 					$proto_total_line[$field] = '';
 				}
 				$group_line = $proto_total_line;	
@@ -489,19 +525,19 @@ class Listview
 			$addGroupLine = false;
 			
 			$tagbase = '';
-			foreach($line as $field=>$value) {
-				
-				if(!empty($TTotalGroup[$field])) {
+			foreach($line as $field=>$value)
+			{
+				if(!empty($TTotalGroup[$field]))
+				{
 					$tagbase.=$value.'|';
 					$group_line[$field] = '<div style="text-align:right; font-weight:bold; color:#552266;">'.(empty($value) ? $langs->trans('Empty') : $value ).' : </div>';
 					$group_line[$TTotalGroup[$field]['target']] = '<div style="text-align:right; font-weight:bold; color:#552266;">'.price($TTotalGroup[$field]['values'][$value]).'</div>';
 					$addGroupLine = true;
 				}
-				
 			}
 			
-			if(!is_null($old_tagbase) && $old_tagbase!=$tagbase && $addGroupLine) {
-			//	var_dump(array($k,$tagbase,$old_tagbase,$empty_line));
+			if(!is_null($old_tagbase) && $old_tagbase!=$tagbase && $addGroupLine)
+			{
 				$Tab[] = $previous_group_line;
 			}
 			
@@ -510,30 +546,36 @@ class Listview
 			$group_line = $proto_total_line;
 			
 			$Tab[] = $line;
-			
-			
-			
 		}
-		if($addGroupLine) {
+
+		if($addGroupLine)
+		{
 			$Tab[] = $previous_group_line;
 		}
 		
-		
 		return $Tab;
 	}
-	
-	private function renderList(&$THeader, &$TField, &$TTotal,&$TTotalGroup, &$TParam) {
-		
+
+    /**
+     * @param $THeader
+     * @param $TField
+     * @param $TTotal
+     * @param $TTotalGroup
+     * @param $TParam
+     * @return string
+     */
+    private function renderList(&$THeader, &$TField, &$TTotal, &$TTotalGroup, &$TParam)
+    {
 		$TSearch = $this->setSearch($THeader, $TParam);
 		$TExport=$this->setExport($TParam, $TField, $THeader);
 		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
 		$out = $this->getJS();
 		$out.=load_fiche_titre($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $TParam['limit']['page'], count($TField), 'title_products.png', 0, '', '', $limit);
-		$out.='<table id="'.$this->id.'" class="liste" width="100%">
-			<thead>';
+		$out.='<table id="'.$this->id.'" class="liste" width="100%"><thead>';
 		
-		if(!empty($TParam['list']['head_search'])) {
+		if(!empty($TParam['list']['head_search']))
+		{
 			$out.='<tr class="liste_titre barre-recherche-head">
 					<td colspan="'.count($THeader).'">'.$TParam['list']['head_search'].'</td>
 				</tr>';
@@ -541,7 +583,8 @@ class Listview
 			
 		$out.='<tr class="liste_titre">';
 		
-		foreach($THeader as $field=>$head) {
+		foreach($THeader as $field=>$head)
+		{
 			if(empty($head['width']))$head['width']='auto';
 			
 			$out.='<th style="width:'.$head['width'].';text-align:'.$head['text-align'].'" class="liste_titre">'.$head['libelle'];
@@ -557,12 +600,14 @@ class Listview
 		
 		$out.='</tr>';
 			
-		if(count($TSearch)>0) {
+		if(count($TSearch)>0)
+		{
 			$out.='<tr class="liste_titre barre-recherche">';
-			foreach($TSearch as $field=>$search) {
+			foreach($TSearch as $field=>$search)
+			{
 				$out.='<td class="liste_titre">'.$search.'</td>';
-				
 			}
+
 			$out.='</tr>';
 		}
 				
@@ -570,50 +615,54 @@ class Listview
 		
 		$class='pair';
 		
-		if(empty($TField)) {
-			$out.='<tr class="'.$class.'">
-					<td colspan="'.$TParam['list']['nb_columns'].'">'.$TParam['list']['messageNothing'].'</td></tr>';
-			
+		if(empty($TField))
+		{
+			$out.='<tr class="'.$class.'"><td colspan="'.$TParam['list']['nb_columns'].'">'.$TParam['list']['messageNothing'].'</td></tr>';
 		}
-		else{
-			
-			foreach($TField as $fields) { //TODO pagination limit
-					
+		else
+        {
+			foreach($TField as $fields)
+			{
 				$class = ($class=='pair') ? 'impair' : 'pair';
 				$out.='<tr class="'.$class.'"> <!-- '.$field.' -->';
 			
-				foreach($fields as $field=>$value) {
+				foreach($fields as $field=>$value)
+				{
 					$out.='<td field="'.$field.'">'.$value.'</td>';
 				}
 					
 				$out.='</tr>';
-					
 			}
 			
 			$out.='</tbody>';
 			
-			if(!empty($TParam['list']['haveTotal'])) {
-				$out.='<tfoot>
-				<tr class="liste_total">';
+			if(!empty($TParam['list']['haveTotal']))
+			{
+				$out.='<tfoot><tr class="liste_total">';
 			
-				foreach($TTotal as $field=>$total) {
+				foreach($TTotal as $field=>$total)
+				{
 					$out.='<td align="right" field="'.$field.'">'.price($total).'</td>';
 				}
 					
 				$out.='</tr></tfoot>';
 			}
-				
 		}
-		
-			
+
 		$out.='</table>';
 		
 		return $out;
 	}
-	
-	public function renderArray(&$db,$TField, $TParam=array()) {
+
+    /**
+     * @param $db
+     * @param $TField
+     * @param array $TParam
+     */
+    public function renderArray(&$db, $TField, $TParam=array())
+    {
 		$this->typeRender = 'array';
-		// on conserve db pour le traitement ultérieur des subQuery
+
 		$THeader=array();
 		$TField=array();	
 		
@@ -622,21 +671,28 @@ class Listview
 		$this->parse_array($THeader, $TField, $TParam);
 		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
-		$this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);	
-		
+		$this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);
 	}
 
-	private function order_by($sql, &$TParam) {
-		$first = true;	
-		//	print_r($TParam['orderBy']);
-		if(!empty($TParam['orderBy'])) {
-			
-			if(strpos($sql,'LIMIT ')!==false) { //TODO regex
+
+    /**
+     * @param $sql
+     * @param $TParam
+     * @return string
+     */
+    private function order_by($sql, &$TParam)
+    {
+		$first = true;
+		if(!empty($TParam['orderBy']))
+		{
+			if(strpos($sql,'LIMIT ')!==false)
+			{
 				list($sql, $sqlLIMIT) = explode('LIMIT ', $sql);
 			}
 			
 			$sql.=' ORDER BY '; 
-			foreach($TParam['orderBy'] as $field=>$order) {
+			foreach($TParam['orderBy'] as $field=>$order)
+			{
 				if(!$first) $sql.=',';
 				
 				if($order=='DESC')$TParam['list']['orderDown'] = $field;
@@ -649,13 +705,18 @@ class Listview
 			}
 			
 			if(!empty($sqlLIMIT))$sql.=' LIMIT '.$sqlLIMIT;
-			
 		}
 		
 		return $sql;
 	}
-	
-	private function parse_array(&$THeader, &$TField, &$TParam)
+
+    /**
+     * @param $THeader
+     * @param $TField
+     * @param $TParam
+     * @return bool
+     */
+    private function parse_array(&$THeader, &$TField, &$TParam)
     {
 		$first = true;
 
@@ -664,38 +725,42 @@ class Listview
 		
 		if (empty($TField)) return false;
 		
-		foreach($TField as $row) {
-			if($first) {
+		foreach($TField as $row)
+		{
+			if($first)
+			{
 				$this->initHeader($THeader, $TParam, $row);
 				$first=false;
 			}	
 			
 			$this->set_line($TField, $TParam, $row);
-		}		
-
+		}
 	}
-	
-	private function initHeader(&$THeader, &$TParam, $currentLine) {
-		
+
+    /**
+     * @param $THeader
+     * @param $TParam
+     * @param $currentLine
+     */
+    private function initHeader(&$THeader, &$TParam, $currentLine)
+    {
+        global $db,$conf,$user;
+
 		$TField=$TFieldVisibility=array();
-		
-		foreach ($currentLine as $field => $value) {
+		foreach ($currentLine as $field => $value)
+		{
 			$TField[$field]=true;
 		}
 		
-		global $user;
-		
 		$contextpage=md5($_SERVER['PHP_SELF']);
-		if(!empty($TParam['allow-field-select'])) {
-			
+		if(!empty($TParam['allow-field-select']))
+		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			
-			global $db,$conf,$user;
 			$form=new Form($db);
-				
 			$selectedfields = GETPOST('Listview'.$this->id.'_selectedfields');
 			
-			if(!empty($selectedfields)) {
+			if(!empty($selectedfields))
+			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				$tabparam['MAIN_SELECTEDFIELDS_'.$contextpage]=$selectedfields;
 	    		$result=dol_set_user_param($db, $conf, $user, $tabparam);
@@ -721,54 +786,58 @@ class Listview
 						'label'=>$libelle
 						,'checked'=>$visible
 					);
-					
-					
 		        }
 			}
-			else{
+			else
+            {
 				foreach($TField as $field=>$dummy)
 		        {
 		        	$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
-					$visible = (!in_array($field,$TParam['hide'])) ? 1 : 0;	
+					$visible = (!in_array($field, $TParam['hide'])) ? 1 : 0;
 					$TFieldVisibility[$field]=array(
-						'label'=>$libelle
-						,'checked'=>$visible
+						'label'=>$libelle,
+						'checked'=>$visible
 					);
 				}
 			}	
 
 			$selectedfields=$form->multiSelectArrayWithCheckbox('Listview'.$this->id.'_selectedfields', $TFieldVisibility, $contextpage);	// This also change content of $arrayfields_0
-			
 		}
 		
-		foreach ($currentLine as $field => $value) {
+		foreach ($currentLine as $field => $value)
+		{
 			$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
 			$visible = (!in_array($field,$TParam['hide'])) ? 1 : 0;	
 			
-			if($visible) {
+			if($visible)
+			{
 				$lastfield = $field;
 				$THeader[$field] = array(
-					'libelle'=>$libelle
-					,'order'=>(in_array($field, $TParam['orderby']['noOrder']) ? 0 : 1)
-					,'width'=>(!empty($TParam['size']['width'][$field]) ? $TParam['size']['width'][$field] : 'auto')
-					,'text-align'=>(!empty($TParam['position']['text-align'][$field]) ? $TParam['position']['text-align'][$field] : 'auto')
-					,'more'=>''
+					'libelle'=>$libelle,
+					'order'=>(in_array($field, $TParam['orderby']['noOrder']) ? 0 : 1),
+					'width'=>(!empty($TParam['size']['width'][$field]) ? $TParam['size']['width'][$field] : 'auto'),
+					'text-align'=>(!empty($TParam['position']['text-align'][$field]) ? $TParam['position']['text-align'][$field] : 'auto'),
+					'more'=>''
 				);
-				  
 			}
 		}
 		
-		if(!empty($selectedfields) && !empty($lastfield)) {
+		if(!empty($selectedfields) && !empty($lastfield))
+		{
 			$THeader[$lastfield]['more']='<div style="float:right">'.$selectedfields.'</div>';
 		}
-		
-		
 	}
-	
-	private function in_view(&$TParam, $line_number) {
+
+    /**
+     * @param $TParam
+     * @param $line_number
+     * @return bool
+     */
+    private function in_view(&$TParam, $line_number)
+    {
 		global $conf;
 
-		if(!empty($_REQUEST['get-all-for-export'])) return true; // doit être dans la vue
+		if(!empty($_REQUEST['get-all-for-export'])) return true;
 
 		$page_number = !empty($TParam['limit']['page']) ? $TParam['limit']['page'] : 1;
 		$line_per_page = !empty($TParam['limit']['nbLine']) ? $TParam['limit']['nbLine'] : $conf->liste_limit;
@@ -779,112 +848,143 @@ class Listview
 		if($line_number>=$start && $line_number<=$end) return true;
 		else return false;
 	}
-	
-	private function set_line(&$TField, &$TParam, $currentLine) {
-		
-			global $conf;
-		
-			$line_number = count($TField);
-			
-			if($this->in_view($TParam,$line_number)) {
-				
-				$row=array(); $trans = array();
-				foreach($currentLine as $field=>$value) {
-					
-					if(is_object($value)) {
-						if(get_class($value)=='stdClass') {$value=print_r($value, true);}
-						else $value=(string)$value;
-					} 
-					
-					$trans['@'.$field.'@'] = $value;
-					
-					if(!empty($TParam['math'][$field])) {
-						$float_value = (double)strip_tags($value);
-						$this->TTotalTmp[$field][] = $float_value;
-					}
-					
-					if(!in_array($field,$TParam['hide'])) {
-						$row[$field]=$value;
-						
-						if(isset($TParam['eval'][$field]) && in_array($field,array_keys($row))) {
-							$strToEval = 'return '.strtr( $TParam['eval'][$field] ,  array_merge( $trans, array('@val@'=>$row[$field])  )).';';
-							$row[$field] = eval($strToEval);
-						}
-						
-						if(isset($TParam['type'][$field]) && !isset($TParam['eval'][$field])) {
-							if($TParam['type'][$field]=='date' 
-								|| $TParam['type'][$field]=='datetime' ) {
 
-								if($row[$field] != '0000-00-00 00:00:00' && $row[$field] != '1000-01-01 00:00:00' && $row[$field] != '0000-00-00' && !empty($row[$field])) {
-									if($TParam['type'][$field]=='datetime')$row[$field] = dol_print_date(strtotime($row[$field]),'dayhoursec');
-									else $row[$field] = dol_print_date(strtotime($row[$field]),'day');
-								} else {
-									$row[$field] = '';
-								}
-							}
-							if($TParam['type'][$field]=='hour') { $row[$field] = date('H:i', strtotime($row[$field])); }
-							if($TParam['type'][$field]=='money') { $row[$field] = '<div align="right">'.price($row[$field],0,'',1,-1,2).'</div>'; }
-							if($TParam['type'][$field]=='number') { $row[$field] = '<div align="right">'.price($row[$field]).'</div>'; }
-							if($TParam['type'][$field]=='integer') { $row[$field] = '<div align="right">'.(int)$row[$field].'</div>'; }
-						}
-	
-	                                        if(isset($TParam['link'][$field])) {
-	                                                if(empty($row[$field]) && $row[$field]!==0 && $row[$field]!=='0')$row[$field]='(vide)';
-	                                                $row[$field]= strtr( $TParam['link'][$field],  array_merge( $trans, array('@val@'=>$row[$field])  )) ;
-	                                        }
-	                                        
-	                                        if(isset($TParam['translate'][$field])) {
-							if(isset($TParam['translate'][$field][''])) unset($TParam['translate'][$field]['']);
-	                                                $row[$field] = strtr( $row[$field] , $TParam['translate'][$field]);
-	                                        }
-	
-	
-					} 
-					
-					
-				} 
-			}
-			else{
-				$row=array(); 
+    /**
+     * @param $TField
+     * @param $TParam
+     * @param $currentLine
+     */
+    private function set_line(&$TField, &$TParam, $currentLine)
+    {
+        global $conf;
 
-				foreach($currentLine as $field=>&$value) {
-					if(!isset($this->THideFlip[$field])) {
-						if(isset($TParam['math'][$field]) && !empty($TParam['math'][$field])) {
-							$float_value = (double)strip_tags($value);
-							$this->TTotalTmp[$field][] = $float_value;
-						}
-						
-						$row[$field] = $value;
-					}
-				}
-			}
+        $line_number = count($TField);
 
-			if(!empty($TParam['math'][$field])) {
-			foreach($row as $field=>$value) {
-				if(!empty($TParam['math'][$field]) && is_array($TParam['math'][$field])) {
-						$toField = $TParam['math'][$field][1];
-						$float_value = (double)strip_tags($row[$toField]);
-						$this->TTotalTmp['@groupsum'][$toField][ $row[$field]  ] +=$float_value;
-						
-				}
-			}
-			}
-			$TField[] = $row;	
+        if($this->in_view($TParam,$line_number))
+        {
+
+            $row=array(); $trans = array();
+            foreach($currentLine as $field=>$value)
+            {
+                if(is_object($value))
+                {
+                    if(get_class($value)=='stdClass') {$value=print_r($value, true);}
+                    else $value=(string)$value;
+                }
+
+                $trans['@'.$field.'@'] = $value;
+
+                if(!empty($TParam['math'][$field]))
+                {
+                    $float_value = (double)strip_tags($value);
+                    $this->TTotalTmp[$field][] = $float_value;
+                }
+
+                if(!in_array($field,$TParam['hide']))
+                {
+                    $row[$field]=$value;
+
+                    if(isset($TParam['eval'][$field]) && in_array($field,array_keys($row)))
+                    {
+                        $strToEval = 'return '.strtr( $TParam['eval'][$field] ,  array_merge( $trans, array('@val@'=>$row[$field])  )).';';
+                        $row[$field] = eval($strToEval);
+                    }
+
+                    if(isset($TParam['type'][$field]) && !isset($TParam['eval'][$field]))
+                    {
+                        if($TParam['type'][$field]=='date' || $TParam['type'][$field]=='datetime' )
+                        {
+
+                            if($row[$field] != '0000-00-00 00:00:00' && $row[$field] != '1000-01-01 00:00:00' && $row[$field] != '0000-00-00' && !empty($row[$field]))
+                            {
+                                if($TParam['type'][$field]=='datetime')$row[$field] = dol_print_date(strtotime($row[$field]),'dayhoursec');
+                                else $row[$field] = dol_print_date(strtotime($row[$field]),'day');
+                            }
+                            else
+                            {
+                                $row[$field] = '';
+                            }
+                        }
+
+                        if($TParam['type'][$field]=='hour') { $row[$field] = date('H:i', strtotime($row[$field])); }
+                        if($TParam['type'][$field]=='money') { $row[$field] = '<div align="right">'.price($row[$field],0,'',1,-1,2).'</div>'; }
+                        if($TParam['type'][$field]=='number') { $row[$field] = '<div align="right">'.price($row[$field]).'</div>'; }
+                        if($TParam['type'][$field]=='integer') { $row[$field] = '<div align="right">'.(int)$row[$field].'</div>'; }
+                    }
+
+                    if(isset($TParam['link'][$field]))
+                    {
+                        if(empty($row[$field]) && $row[$field]!==0 && $row[$field]!=='0')$row[$field]='(vide)';
+                        $row[$field]= strtr( $TParam['link'][$field],  array_merge( $trans, array('@val@'=>$row[$field]))) ;
+                    }
+
+                    if(isset($TParam['translate'][$field]))
+                    {
+                        if(isset($TParam['translate'][$field][''])) unset($TParam['translate'][$field]['']);
+
+                        $row[$field] = strtr( $row[$field] , $TParam['translate'][$field]);
+                    }
+                }
+            }
+        }
+        else
+        {
+            $row = array();
+
+            foreach($currentLine as $field=>&$value)
+            {
+                if(!isset($this->THideFlip[$field]))
+                {
+                    if(isset($TParam['math'][$field]) && !empty($TParam['math'][$field]))
+                    {
+                        $float_value = (double)strip_tags($value);
+                        $this->TTotalTmp[$field][] = $float_value;
+                    }
+
+                    $row[$field] = $value;
+                }
+            }
+        }
+
+        if(!empty($TParam['math'][$field]))
+        {
+            foreach($row as $field=>$value)
+            {
+                if(!empty($TParam['math'][$field]) && is_array($TParam['math'][$field]))
+                {
+                    $toField = $TParam['math'][$field][1];
+                    $float_value = (double)strip_tags($row[$toField]);
+                    $this->TTotalTmp['@groupsum'][$toField][ $row[$field]  ] +=$float_value;
+                }
+            }
+        }
+
+        $TField[] = $row;
 	}
-	
-	private function limitSQL($sql,&$TParam) {
-		
-		if(!empty($TParam['limit']['global']) && strpos($sql,'LIMIT ')===false ) {
-			
+
+    /**
+     * @param $sql
+     * @param $TParam
+     * @return string
+     */
+    private function limitSQL($sql, &$TParam)
+    {
+		if(!empty($TParam['limit']['global']) && strpos($sql,'LIMIT ')===false )
+		{
 			$sql.=' LIMIT '.(int)$TParam['limit']['global'];
-			
 		}
 		
 		return $sql;
 	}
-	
-	private function parse_sql( &$THeader, &$TField,&$TParam, $sql) {
-		
+
+    /**
+     * @param $THeader
+     * @param $TField
+     * @param $TParam
+     * @param $sql
+     */
+    private function parse_sql(&$THeader, &$TField, &$TParam, $sql)
+    {
 		$this->sql = $this->limitSQL($sql, $TParam);
 		
 		$this->TTotalTmp=array();
@@ -892,25 +992,26 @@ class Listview
 		$this->THideFlip = array_flip($TParam['hide']);
 
 		$res = $this->db->query($this->sql);
-		if($res!==false) {
-			
+		if($res!==false)
+		{
 			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_DEBUG);
 			
 			$first=true;
-			while($currentLine = $this->db->fetch_object($res)) {
-				if($first) {
+			while($currentLine = $this->db->fetch_object($res))
+            {
+				if($first)
+				{
 					$this->initHeader($THeader, $TParam, $currentLine);
 					$first = false;
 				}
 				
 				$this->set_line($TField, $TParam, $currentLine);
-				
 			}
 			
 		}
-		else {
+		else
+        {
 			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_ERR);
 		}
-		
 	}	
 }
diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index 23d25913ccd..7efc1fae342 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -50,33 +50,33 @@ $THide = array('label','title');
 echo $list->render(Inventory::getSQL('All'), array(
     'link'=>array(
         'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
-    )
-    ,'translate'=>array()
-    ,'hide'=>$THide
-    ,'type'=>array(
-        'datec'=>'date'
-        ,'tms'=>'datetime'
-        ,'date_inventory'=>'date'
-    )
-    ,'list'=>array(
-        'title'=>$langs->trans('inventoryListTitle')
-        ,'messageNothing'=>$langs->trans('inventoryListEmpty')
-    )
-    ,'title'=>array(
-        'rowid'=>$langs->trans('Title')
-        ,'fk_warehouse'=>$langs->trans('Warehouse')
-        ,'date_inventory'=>$langs->trans('InventoryDate')
-        ,'datec'=>$langs->trans('DateCreation')
-        ,'tms'=>$langs->trans('DateUpdate')
-        ,'status'=>$langs->trans('Status')
-    )
-    ,'eval'=>array(
-        'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))'
-        ,'rowid'=>'Inventory::getLink(@val@)'
-    )
-    ,'search'=>array(
-        'date_inventory'=>'calendars'
-        ,'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
+    ),
+    'translate'=>array(),
+    'hide'=>$THide,
+    'type'=>array(
+        'datec'=>'date',
+        'tms'=>'datetime',
+        'date_inventory'=>'date'
+    ),
+    'list'=>array(
+        'title'=>$langs->trans('inventoryListTitle'),
+        'messageNothing'=>$langs->trans('inventoryListEmpty')
+    ),
+    'title'=>array(
+        'rowid'=>$langs->trans('Title'),
+        'fk_warehouse'=>$langs->trans('Warehouse'),
+        'date_inventory'=>$langs->trans('InventoryDate'),
+        'datec'=>$langs->trans('DateCreation'),
+        'tms'=>$langs->trans('DateUpdate'),
+        'status'=>$langs->trans('Status')
+    ),
+    'eval'=>array(
+        'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))',
+        'rowid'=>'Inventory::getLink(@val@)'
+    ),
+    'search'=>array(
+        'date_inventory'=>'calendars',
+        'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
     )
 ));
 

From aa5ff36a046d4f5cf049560e15d1d8d41c8879d1 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 25 Mar 2017 19:04:27 +0100
Subject: [PATCH 0464/1163] display input border by setting

---
 htdocs/theme/eldy/style.css.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 24300718a3b..e16f6136233 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -275,7 +275,10 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     font-size: <?php print $fontsize ?>px;
     font-family: <?php print $fontlist ?>;
 
-    border: none;
+<?php if(empty($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)) 
+	print "border: none;" 
+?>
+    
     border-bottom: solid 1px rgba(0,0,0,.2);
     outline: none;
     margin: 0px 0px 0px 0px;

From 4197254209e505b4f48bf8fb742925958769a90d Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 19:09:58 +0100
Subject: [PATCH 0465/1163] Fix remove button on list to create a new inventory

---
 htdocs/inventory/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index 7efc1fae342..bcea7794f7a 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -81,12 +81,12 @@ echo $list->render(Inventory::getSQL('All'), array(
 ));
 
 
-if (!empty($user->rights->inventory->create))
+/*if (!empty($user->rights->inventory->create))
 {
     print '<div class="tabsAction">';
     print '<a class="butAction" href="inventory.php?action=create">'.$langs->trans('inventoryCreate').'</a>';
     print '</div>';
-}
+}*/
 
 echo '</form>';
 

From 21e30e43d96cd90a041461d4cbab72aad800eec3 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 19:10:16 +0100
Subject: [PATCH 0466/1163] Update entries menus

---
 htdocs/core/modules/modInventory.class.php | 100 ++++++++++-----------
 1 file changed, 45 insertions(+), 55 deletions(-)

diff --git a/htdocs/core/modules/modInventory.class.php b/htdocs/core/modules/modInventory.class.php
index d3ee39c89ff..11b4c992e6a 100644
--- a/htdocs/core/modules/modInventory.class.php
+++ b/htdocs/core/modules/modInventory.class.php
@@ -214,64 +214,54 @@ class modinventory extends DolibarrModules
 		$this->menu = array();			// List of menus to add
 		$r=0;
 
-		// Add here entries to declare new menus
-		//
-		// Example to declare a new Top Menu entry and its Left menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>0,			                // Put 0 if this is a top menu
-		//							'type'=>'top',			                // This is a Top menu entry
-		//							'titre'=>'inventory top menu',
-		//							'mainmenu'=>'inventory',
-		//							'leftmenu'=>'inventory',
-		//							'url'=>'/inventory/pagetop.php',
-		//							'langs'=>'mylangfile@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-		//
-		// Example to declare a Left Menu entry into an existing Top menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'left',			                // This is a Left menu entry
-		//							'titre'=>'inventory left menu',
-		//							'mainmenu'=>'xxx',
-		//							'leftmenu'=>'inventory',
-		//							'url'=>'/inventory/pagelevel2.php',
-		//							'langs'=>'mylangfile@inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->inventory->enabled',  // Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=stock',			                // Put 0 if this is a top menu
-								'type'=>'left',			                // This is a Top menu entry
-								'titre'=>'ListInventory',
-								'mainmenu'=>'inventory',
-								'leftmenu'=>'inventory',
-								'url'=>'/inventory/list.php',
-								'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-								'position'=>100,
-								'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-								'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-								'target'=>'',
-								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		$r++;
+
+        $this->menu[$r]=array(
+            'fk_menu'=>'fk_mainmenu=products',			                // Put 0 if this is a top menu
+            'type'=>'left',			                // This is a Top menu entry
+            'titre'=>'Inventory',
+            'mainmenu'=>'products',
+            'leftmenu'=>'inventory_left',
+            'url'=>'/inventory/list.php',
+            'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'position'=>100+$r,
+            'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+            'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+            'target'=>'',
+            'user'=>2
+        );				                // 0=Menu for internal users, 1=external users, 2=both
+        $r++;
 		
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=stock',			                // Put 0 if this is a top menu
-								'type'=>'left',			                // This is a Top menu entry
-								'titre'=>'NewInventory',
-								'mainmenu'=>'inventory',
-								'leftmenu'=>'inventory',
-								'url'=>'/inventory/inventory.php?action=create',
-								'position'=>100,
-								'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-								'perms'=>'$user->rights->inventory->create',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-								'target'=>'',
-								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		$this->menu[$r]=array(
+		    'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
+            'type'=>'left',			                // This is a Top menu entry
+            'titre'=>'NewInventory',
+            'mainmenu'=>'products',
+            'leftmenu'=>'inventory_left_create',
+            'url'=>'/inventory/inventory.php?action=create',
+            'position'=>100+$r,
+            'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+            'perms'=>'$user->rights->inventory->create',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+            'target'=>'',
+            'user'=>2
+        );				                // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
 
+        $this->menu[$r]=array(
+            'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
+            'type'=>'left',			                // This is a Top menu entry
+            'titre'=>'ListInventory',
+            'mainmenu'=>'products',
+            'leftmenu'=>'inventory_left_list',
+            'url'=>'/inventory/list.php',
+            'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'position'=>100+$r,
+            'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+            'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+            'target'=>'',
+            'user'=>2
+        );				                // 0=Menu for internal users, 1=external users, 2=both
+        $r++;
+
 		// Exports
 		$r=1;
 

From acfdc9612164bd70ed393cf6d975dfcd99db643d Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 25 Mar 2017 19:34:04 +0100
Subject: [PATCH 0467/1163] Border input display is allowed by setting

---
 htdocs/admin/ihm.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 95917a79ab5..554227f4bc1 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -215,6 +215,12 @@ if ($action == 'edit')	// Edit
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 	
+    // show input border
+    print '<tr><td width="35%">'.$langs->trans("showInputBorder").'</td><td>';
+    print $form->selectyesno('main_showInputBorder',isset($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)?$conf->global->THEME_ELDY_SHOW_BORDER_INPUT:0,1);
+    print '</td>';
+	print '<td width="20">&nbsp;</td>';
+	print '</tr>';
     // Disable javascript and ajax
     print '<tr><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
     print $form->selectyesno('main_disable_javascript',isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0,1);
@@ -390,12 +396,16 @@ else	// Show
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
+    print '<tr><td width="35%">'.$langs->trans("showInputBorder").'</td><td>';
+    print yn($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)."</td>";
+    print '<td width="20">&nbsp;</td>';
+    print "</tr>";
+
     // Disable javascript/ajax
-    
     print '<tr><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
     print yn($conf->global->MAIN_DISABLE_JAVASCRIPT)."</td>";
-	print '<td width="20">&nbsp;</td>';
-	print "</tr>";
+    print '<td width="20">&nbsp;</td>';
+    print "</tr>";
 
     // Activate preview tab on element card
     if (class_exists("Imagick"))

From 8c2b70c4a74ac20c9ec6112e4860404dcf077615 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Mar 2017 20:51:02 +0100
Subject: [PATCH 0468/1163] Fix filechecker

---
 htdocs/admin/system/filecheck.php                     | 4 ++--
 htdocs/core/modules/mailings/thirdparties.modules.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 498e1ec54f0..679cea1b946 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -95,13 +95,13 @@ print '<!-- for a local check target=local&xmlshortfile=... -->'."\n";
 if (dol_is_file($xmlfile))
 {
     print '<input type="radio" name="target" value="local"'.((! GETPOST('target') || GETPOST('target') == 'local') ? 'checked="checked"':'').'"> '.$langs->trans("LocalSignature").' = ';
-    print '<input name="xmlshortfile" class="flat minwidth200" value="'.dol_escape_htmltag($xmlshortfile).'">';
+    print '<input name="xmlshortfile" class="flat minwidth200 quatrevingtpercent" value="'.dol_escape_htmltag($xmlshortfile).'">';
     print '<br>';
 }
 else
 {
     print '<input type="radio" name="target" value="local"> '.$langs->trans("LocalSignature").' = ';
-    print '<input name="xmlshortfile" class="flat minwidth200" value="'.dol_escape_htmltag($xmlshortfile).'">';
+    print '<input name="xmlshortfile" class="flat minwidth200 quatrevingtpercent" value="'.dol_escape_htmltag($xmlshortfile).'">';
     print ' <span class="warning">('.$langs->trans("AvailableOnlyOnPackagedVersions").')</span>';
     print '<br>';
 }
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 148c21aa31d..2f9be84aab4 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -23,7 +23,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
  */
 class mailing_thirdparties extends MailingTargets
 {
-	var $name='ContactsCategories';
+	var $name='ThirdPartiesByCategories';
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
 	var $desc="Third parties (by categories)";
 	var $require_admin=0;

From 09f645fc9fe3801ca59c0a24f0ff512d1f23f3b6 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 25 Mar 2017 23:21:49 +0100
Subject: [PATCH 0469/1163] Fix travis

---
 htdocs/core/class/coreobject.class.php     |   2 +-
 htdocs/core/js/listview.js                 |   7 +-
 htdocs/inventory/class/inventory.class.php |  30 ++---
 htdocs/inventory/inventory.php             | 129 +++++++++------------
 htdocs/inventory/lib/inventory.lib.php     |   1 -
 5 files changed, 74 insertions(+), 95 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 6454c6e814b..92da1604dca 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -642,7 +642,7 @@ class CoreObject extends CommonObject
      * @param   array   $Tab    Array of values
      * @return                  int
      */
-    public function set_values(&$Tab)
+    public function setValues(&$Tab)
     {
 		foreach ($Tab as $key => $value)
 		{
diff --git a/htdocs/core/js/listview.js b/htdocs/core/js/listview.js
index 0affb264474..d68a7993218 100644
--- a/htdocs/core/js/listview.js
+++ b/htdocs/core/js/listview.js
@@ -90,11 +90,6 @@ function Listview_submitSearch(obj) {
 	if($form.length>0){
 		$form.submit();
 	}
-	else{
-		//There is no form for search action
-		null;
-	}
-
 }
 function Listview_launch_downloadAs(mode,url,token,session_name) {
 	 $('#listviewdAS_export_form').remove();
@@ -145,7 +140,7 @@ $(document).ready(function() {
 	});
 	
 	if(typeof $_GET["get-all-for-export"] != "undefined") {
-		Listview_launch_downloadAs($_GET["mode"],$_GET["url"],$_GET["token"],$_GET["session_name"]);
+		Listview_launch_downloadAs($_GET['mode'],$_GET['url'],$_GET['token'],$_GET['session_name']);
 	}
 	
 });
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 46f27906cc9..5f172c7c697 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -93,7 +93,7 @@ class Inventory extends CoreObject
     /**
      * Function to sort children object
      */
-	public function sort_det() 
+	public function sortDet()
 	{
 		if(!empty($this->Inventorydet))	usort($this->Inventorydet, array('Inventory', 'customSort'));
 	}
@@ -112,7 +112,7 @@ class Inventory extends CoreObject
 		$res = parent::fetch($id, $loadChild);
 		if($res > 0)
 		{
-			$this->sort_det();
+			$this->sortDet();
 			$this->amount = 0;
 			if(!empty($this->Inventorydet ))
 			{
@@ -243,7 +243,7 @@ class Inventory extends CoreObject
      * @param   array   $Tab    Array of values
      * @return                  int
      */
-	public function set_values(&$Tab)
+	public function setValues(&$Tab)
 	{
 		global $langs;
 		
@@ -267,7 +267,7 @@ class Inventory extends CoreObject
 			}	
 		}
 		
-		return parent::set_values($Tab);
+		return parent::setValues($Tab);
 	}
 
     /**
@@ -296,7 +296,7 @@ class Inventory extends CoreObject
      * @param   int     $fk_warehouse   fk_warehouse target
      * @return                          bool
      */
-    public function add_product($fk_product, $fk_warehouse=0)
+    public function addProduct($fk_product, $fk_warehouse=0)
     {
         $k = $this->addChild('Inventorydet');
         $det =  &$this->Inventorydet[$k];
@@ -309,7 +309,7 @@ class Inventory extends CoreObject
                 
         $date = $this->get_date('date_inventory', 'Y-m-d');
         if(empty($date)) $date = $this->get_date('datec', 'Y-m-d');
-        $det->setStockDate( $date , $fk_warehouse);
+        $det->setStockDate($date, $fk_warehouse);
         
         return true;
     }
@@ -327,7 +327,7 @@ class Inventory extends CoreObject
      *  @param		string	$inventorycode	Inventory code
      * 	@return     int     				<0 if KO, >0 if OK
      */
-    public function correct_stock($fk_product, $fk_warehouse, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
+    public function correctStock($fk_product, $fk_warehouse, $nbpiece, $movement, $label='', $price=0, $inventorycode='')
 	{
 		global $conf, $user;
 
@@ -397,7 +397,7 @@ class Inventory extends CoreObject
 						
 				//$href = dol_buildpath('/inventory/inventory.php?id='.$this->id.'&action=view', 1);
 				
-				$res = $this->correct_stock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock'));
+				$res = $this->correctStock($product->id, $Inventorydet->fk_warehouse, $nbpiece, $movement, $langs->trans('inventoryMvtStock'));
 				if ($res < 0) return -1;
 			}
 		}
@@ -437,14 +437,14 @@ class Inventory extends CoreObject
     /**
      * Function to add products by default from warehouse and children
      *
-     * @param $fk_warehouse
-     * @param int $fk_category
-     * @param int $fk_supplier
-     * @param int $only_prods_in_stock
+     * @param int $fk_warehouse         id of warehouse
+     * @param int $fk_category          id of category
+     * @param int $fk_supplier          id of supplier
+     * @param int $only_prods_in_stock  only product with stock
      *
      * @return int
      */
-	public function add_products_for($fk_warehouse,$fk_category=0,$fk_supplier=0,$only_prods_in_stock=0)
+	public function addProductsFor($fk_warehouse,$fk_category=0,$fk_supplier=0,$only_prods_in_stock=0)
     {
         $warehouse = new Entrepot($this->db);
         $warehouse->fetch($fk_warehouse);
@@ -469,7 +469,7 @@ class Inventory extends CoreObject
 		{
 			while($obj = $this->db->fetch_object($res))
             {
-				$this->add_product($obj->fk_product, $obj->fk_entrepot);
+				$this->addProduct($obj->fk_product, $obj->fk_entrepot);
 			}
 
 			return 1;
@@ -500,7 +500,7 @@ class Inventory extends CoreObject
 
     /**
      * Function to get the sql select of inventory
-     * @param   string  $type
+     * @param   string  $type   'All' to get all data
      * @return  string
      */
 	static function getSQL($type)
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index 403b148ec2c..f9297951c22 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
-$langs->load("stock");
-$langs->load("inventory");
+$langs->load('stock');
+$langs->load('inventory');
 
 if(empty($user->rights->inventory->read)) accessforbidden();
 
@@ -58,7 +58,7 @@ function _action()
 			
 			$inventory = new Inventory($db);
 			
-			_card_warehouse( $inventory);
+			card_warehouse( $inventory);
 
 			break;
 		
@@ -66,17 +66,17 @@ function _action()
 			if (empty($user->rights->inventory->create)) accessforbidden();
 		
 			$inventory = new Inventory($db);
-			$inventory->set_values($_POST);
+			$inventory->setValues($_POST);
 			
             $fk_inventory = $inventory->create($user);
 			if($fk_inventory>0) {
             	
-            	$fk_category = (int)GETPOST('fk_category');
-            	$fk_supplier = (int)GETPOST('fk_supplier');
-            	$fk_warehouse = (int)GETPOST('fk_warehouse');
-            	$only_prods_in_stock = (int)GETPOST('OnlyProdsInStock');
+            	$fk_category = (int) GETPOST('fk_category');
+            	$fk_supplier = (int) GETPOST('fk_supplier');
+            	$fk_warehouse = (int) GETPOST('fk_warehouse');
+            	$only_prods_in_stock = (int) GETPOST('OnlyProdsInStock');
             	
-            	$inventory->add_products_for($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
+            	$inventory->addProductsFor($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
             	$inventory->update($user);
             	
             	header('Location: '.dol_buildpath('/inventory/inventory.php?id='.$inventory->id.'&action=edit', 1));
@@ -97,7 +97,7 @@ function _action()
 			$inventory = new Inventory($db);
 			$inventory->fetch(GETPOST('id'));
 			
-			_card($inventory, GETPOST('action'));
+			card($inventory, GETPOST('action'));
 			
 			break;
 			
@@ -110,12 +110,12 @@ function _action()
 			$inventory = new Inventory($db);
 			$inventory->fetch($id);
 			
-			$inventory->set_values($_REQUEST);
+			$inventory->setValues($_REQUEST);
 			
 			if ($inventory->errors)
 			{
 				setEventMessage($inventory->errors, 'errors');
-				_card( $inventory, 'edit');
+				card( $inventory, 'edit');
 			}
 			else 
 			{
@@ -136,12 +136,12 @@ function _action()
                 $inventory->status = 1;
                 $inventory->update($user);
                 
-                _card( $inventory, 'view');
+                card( $inventory, 'view');
                 
             
             }
             else {
-               _card( $inventory, 'view');
+               card( $inventory, 'view');
             }
             
 			break;
@@ -155,7 +155,7 @@ function _action()
 			
 			$inventory->changePMP($user);
 			
-			_card( $inventory, 'view');
+			card( $inventory, 'view');
 			
 			break;
 			
@@ -192,7 +192,7 @@ function _action()
 					}
 					if (!$alreadyExists)
 					{
-					    if($inventory->add_product($product->id, $fk_warehouse)) {
+					    if($inventory->addProduct($product->id, $fk_warehouse)) {
 					    	setEventMessage($langs->trans('ProductAdded'));
 					    }
 					}
@@ -204,10 +204,10 @@ function _action()
 				}
 				
 				$inventory->update($user);
-				$inventory->sort_det();
+				$inventory->sortDet();
 			}
 			
-			_card( $inventory, 'edit');
+			card( $inventory, 'edit');
 			
 			break;
 			
@@ -226,7 +226,7 @@ function _action()
 			$inventory = new Inventory($db);
 			$inventory->fetch( $id);
 			
-			_card($inventory, 'edit');
+			card($inventory, 'edit');
 			
 			break;
         case 'confirm_flush':
@@ -242,7 +242,7 @@ function _action()
             
             setEventMessage($langs->trans('InventoryFlushed'));
             
-            _card( $inventory, 'edit');
+            card( $inventory, 'edit');
            
             
             break;
@@ -283,7 +283,7 @@ function _action()
 			$inventory = new Inventory($db);
 			$inventory->fetch($id);
 				
-			_card($inventory, $action );
+			card($inventory, $action );
 				
 			
 			break;
@@ -291,7 +291,7 @@ function _action()
 	
 }
 
-function _card_warehouse(&$inventory)
+function card_warehouse(&$inventory)
 {
 	global $langs,$conf,$db, $user, $form;
 	
@@ -346,44 +346,31 @@ function _card_warehouse(&$inventory)
 	llxFooter('');
 }
 
-function _card(&$inventory, $action='edit')
+function card(&$inventory, $action='edit')
 {
 	global $langs, $conf, $db, $user,$form;
 	
 	llxHeader('',$langs->trans('inventoryEdit'),'','');
 	
-	if($action == 'changePMP') {
-	
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('ApplyNewPMP')
-				,$langs->trans('ConfirmApplyNewPMP',$inventory->getTitle()),'confirm_changePMP'
-				,array(),'no',1);
-	
+	if($action == 'changePMP')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id, $langs->trans('ApplyNewPMP'), $langs->trans('ConfirmApplyNewPMP', $inventory->getTitle()), 'confirm_changePMP', array(),'no',1);
 	}
-	else if($action == 'flush') {
-	
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('FlushInventory')
-				,$langs->trans('ConfirmFlushInventory',$inventory->getTitle()),'confirm_flush'
-				,array(),'no',1);
-	
+	else if($action == 'flush')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('FlushInventory'),$langs->trans('ConfirmFlushInventory',$inventory->getTitle()),'confirm_flush',array(),'no',1);
 	}
-	else if($action == 'delete') {
-	
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('Delete')
-				,$langs->trans('ConfirmDelete',$inventory->getTitle()),'confirm_delete'
-				,array(),'no',1);
-	
+	else if($action == 'delete')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('Delete'),$langs->trans('ConfirmDelete',$inventory->getTitle()),'confirm_delete',array(),'no',1);
 	}
-	else if($action == 'delete_line') {
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id.'&rowid='.GETPOST('rowid'),$langs->trans('DeleteLine')
-				,$langs->trans('ConfirmDeleteLine',$inventory->getTitle()),'confirm_delete_line'
-				,array(),'no',1);
-	
+	else if($action == 'delete_line')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id.'&rowid='.GETPOST('rowid'),$langs->trans('DeleteLine'),$langs->trans('ConfirmDeleteLine',$inventory->getTitle()),'confirm_delete_line',array(),'no',1);
 	}
-	else if($action == 'regulate') {
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('RegulateStock')
-				,$langs->trans('ConfirmRegulateStock',$inventory->getTitle()),'confirm_regulate'
-				,array(),'no',1);
-	
+	else if($action == 'regulate')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('RegulateStock'),$langs->trans('ConfirmRegulateStock',$inventory->getTitle()),'confirm_regulate',array(),'no',1);
 	}
 	
 	$warehouse = new Entrepot($db);
@@ -392,7 +379,7 @@ function _card(&$inventory, $action='edit')
 	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), empty($action) ? '': '&action='.$action));
 	
 	$lines = array();
-	_card_line($inventory, $lines, $action);
+	card_line($inventory, $lines, $action);
 	
 	print '<b>'.$langs->trans('inventoryOnDate')." ".$inventory->get_date('date_inventory').'</b><br><br>';
 	
@@ -425,7 +412,7 @@ function _card(&$inventory, $action='edit')
 }
 
 
-function _card_line(&$inventory, &$lines, $mode)
+function card_line(&$inventory, &$lines, $mode)
 {
 	global $db,$langs,$user,$conf;
 	$inventory->amount_actual = 0;
@@ -452,25 +439,23 @@ function _card_line(&$inventory, &$lines, $mode)
 		$qty = (float)GETPOST('qty_to_add')[$k];
 		
 		$lines[]=array(
-			'produit' => $product->getNomUrl(1).'&nbsp;-&nbsp;'.$product->label
-			,'entrepot'=>$e->getNomUrl(1)
-			,'barcode' => $product->barcode
-			,'qty' =>($mode == 'edit' ? '<input type="text" name="qty_to_add['.$k.']" value="'.$qty.'" size="8" style="text-align:center;" /> <a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto($langs->trans('Add'), 'plus16@inventory').'</a>' : '' )
-			,'qty_view' => $Inventorydet->qty_view ? $Inventorydet->qty_view : 0
-			,'qty_stock' => $stock
-			,'qty_regulated' => $Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0
-			,'action' => ($user->rights->inventory->write && $mode=='edit' ? '<a href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : '')
-			,'pmp_stock'=>round($pmp_actual,2)
-            ,'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2)
-			,'pmp_new'=>(!empty($user->rights->inventory->changePMP && $mode =='edit') ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" /> <a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' :  price($Inventorydet->new_pmp))
-            ,'pa_stock'=>round($last_pa * $stock,2)
-            ,'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2)
-			,'current_pa_stock'=>round($current_pa * $stock,2)
-			,'current_pa_actual'=>round($current_pa * $Inventorydet->qty_view,2)
-          
-            ,'k'=>$k
-            ,'id'=>$Inventorydet->id
-				
+			'produit' => $product->getNomUrl(1).'&nbsp;-&nbsp;'.$product->label,
+			'entrepot'=>$e->getNomUrl(1),
+			'barcode' => $product->barcode,
+			'qty' =>($mode == 'edit' ? '<input type="text" name="qty_to_add['.$k.']" value="'.$qty.'" size="8" style="text-align:center;" /> <a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto($langs->trans('Add'), 'plus16@inventory').'</a>' : '' ),
+			'qty_view' => ($Inventorydet->qty_view ? $Inventorydet->qty_view : 0),
+			'qty_stock' => $stock,
+			'qty_regulated' => ($Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0),
+			'action' => ($user->rights->inventory->write && $mode=='edit' ? '<a href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : ''),
+			'pmp_stock'=>round($pmp_actual,2),
+            'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2),
+			'pmp_new'=>(!empty($user->rights->inventory->changePMP) && $mode == 'edit' ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" /> <a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' :  price($Inventorydet->new_pmp)),
+            'pa_stock'=>round($last_pa * $stock,2),
+            'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2),
+			'current_pa_stock'=>round($current_pa * $stock,2),
+			'current_pa_actual'=>round($current_pa * $Inventorydet->qty_view,2),
+            'k'=>$k,
+            'id'=>$Inventorydet->id
 		);
 	}
 
diff --git a/htdocs/inventory/lib/inventory.lib.php b/htdocs/inventory/lib/inventory.lib.php
index 3cbf03a67c7..767d7416fc7 100644
--- a/htdocs/inventory/lib/inventory.lib.php
+++ b/htdocs/inventory/lib/inventory.lib.php
@@ -20,7 +20,6 @@
  *	\file		lib/inventory.lib.php
  *	\ingroup	inventory
  *	\brief		This file is an example module library
- *				Put some comments here
  */
 
 function inventoryAdminPrepareHead()

From dfb24a13d945116da035457c4f0f055236930fb3 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sat, 25 Mar 2017 23:48:30 +0100
Subject: [PATCH 0470/1163] Bad parasite caracters

TD not good
---
 htdocs/loan/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 18ba36ec382..4b1384aeedb 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -489,7 +489,7 @@ if ($id > 0)
 		print "</td></tr>";
 
 		// Nbterms
-		print '<tr><td">'.$langs->trans("Nbterms").'</td>';
+		print '<tr><td>'.$langs->trans("Nbterms").'</td>';
 		print '<td>';
 		if ($action == 'edit')
 		{
@@ -502,7 +502,7 @@ if ($id > 0)
 		print '</td></tr>';
 
 		// Rate
-		print '<tr><td">'.$langs->trans("Rate").'</td>';
+		print '<tr><td>'.$langs->trans("Rate").'</td>';
 		print '<td>';
 		if ($action == 'edit')
 		{

From 9a85e5ef003a7ee7db4bc3633fd2d5d3c751506c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 26 Mar 2017 01:45:09 +0100
Subject: [PATCH 0471/1163] Enhance the file checker

---
 build/generate_filelist_xml.php   | 28 ++++++++++++++++++++--------
 htdocs/admin/system/filecheck.php |  6 +++---
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index 1eeac5410b2..c1a56beacd7 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -123,16 +123,21 @@ foreach ($includeconstants as $countrycode => $tmp)
 
 fputs($fp, '<dolibarr_htdocs_dir includecustom="'.$includecustom.'">'."\n");
 
-// TODO Replace RecursiveDirectoryIterator with dol_dir_list
-$dir_iterator1 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../htdocs/');
+/*$dir_iterator1 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../htdocs/');
 $iterator1 = new RecursiveIteratorIterator($dir_iterator1);
 // Need to ignore document custom etc. Note: this also ignore natively symbolic links.
 $files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom?'':'custom\/|').'documents\/|conf\/|install\/))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
+*/
+$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
+$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install)$';  // Exclude dirs
+$files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 $dir='';
 $needtoclose=0;
-foreach ($files as $file) {
-    $newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
-    if ($newdir!=$dir) {
+foreach ($files as $filetmp) {
+	$file = $filetmp['fullname'];
+	//$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
+	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
+	if ($newdir!=$dir) {
         if ($needtoclose)
             fputs($fp, '  </dir>'."\n");
         fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
@@ -160,14 +165,21 @@ $checksumconcat=array();
 fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n");
 
 // TODO Replace RecursiveDirectoryIterator with dol_dir_list
-$dir_iterator2 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../scripts/');
+/*$dir_iterator2 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../scripts/');
 $iterator2 = new RecursiveIteratorIterator($dir_iterator2);
 // Need to ignore document custom etc. Note: this also ignore natively symbolic links.
 $files = new RegexIterator($iterator2, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
+*/
+$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
+$regextoexclude='(custom|documents|conf|install)$';  // Exclude dirs
+$files = dol_dir_list(dirname(__FILE__).'/../scripts/', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 $dir='';
 $needtoclose=0;
-foreach ($files as $file) {
-    $newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
+foreach ($files as $filetmp) {
+	$file = $filetmp['fullname'];
+	//$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
+	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
+	$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
     if ($newdir!=$dir) {
         if ($needtoclose)
             fputs($fp, '  </dir>'."\n");
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 679cea1b946..62d0999170f 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -95,13 +95,13 @@ print '<!-- for a local check target=local&xmlshortfile=... -->'."\n";
 if (dol_is_file($xmlfile))
 {
     print '<input type="radio" name="target" value="local"'.((! GETPOST('target') || GETPOST('target') == 'local') ? 'checked="checked"':'').'"> '.$langs->trans("LocalSignature").' = ';
-    print '<input name="xmlshortfile" class="flat minwidth200 quatrevingtpercent" value="'.dol_escape_htmltag($xmlshortfile).'">';
+    print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
     print '<br>';
 }
 else
 {
     print '<input type="radio" name="target" value="local"> '.$langs->trans("LocalSignature").' = ';
-    print '<input name="xmlshortfile" class="flat minwidth200 quatrevingtpercent" value="'.dol_escape_htmltag($xmlshortfile).'">';
+    print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
     print ' <span class="warning">('.$langs->trans("AvailableOnlyOnPackagedVersions").')</span>';
     print '<br>';
 }
@@ -109,7 +109,7 @@ print '<!-- for a remote target=remote&xmlremote=... -->'."\n";
 if ($enableremotecheck)
 {
     print '<input type="radio" name="target" value="remote"'.(GETPOST('target') == 'remote' ? 'checked="checked"':'').'> '.$langs->trans("RemoteSignature").' = ';
-    print '<input name="xmlremote" class="flat quatrevingtpercent" value="'.dol_escape_htmltag($xmlremote).'"><br>';
+    print '<input name="xmlremote" class="flat minwidth400" value="'.dol_escape_htmltag($xmlremote).'"><br>';
 }
 else
 {

From 9f0328ab7fc18046922d1c4b52af480481cb78ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 26 Mar 2017 13:10:25 +0200
Subject: [PATCH 0472/1163] Hidden for the moment because option specific to
 one theme only.

---
 htdocs/admin/ihm.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 554227f4bc1..03fab048962 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -216,13 +216,16 @@ if ($action == 'edit')	// Edit
 	print '</tr>';
 	
     // show input border
-    print '<tr><td width="35%">'.$langs->trans("showInputBorder").'</td><td>';
+    /*
+    print '<tr><td>'.$langs->trans("showInputBorder").'</td><td>';
     print $form->selectyesno('main_showInputBorder',isset($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)?$conf->global->THEME_ELDY_SHOW_BORDER_INPUT:0,1);
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
-    // Disable javascript and ajax
-    print '<tr><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
+    */
+	
+	// Disable javascript and ajax
+    print '<tr><td>'.$langs->trans("DisableJavascript").'</td><td>';
     print $form->selectyesno('main_disable_javascript',isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0,1);
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
@@ -396,11 +399,13 @@ else	// Show
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
-    print '<tr><td width="35%">'.$langs->trans("showInputBorder").'</td><td>';
+	/*
+    print '<tr><td>'.$langs->trans("showInputBorder").'</td><td>';
     print yn($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)."</td>";
     print '<td width="20">&nbsp;</td>';
     print "</tr>";
-
+	*/
+	
     // Disable javascript/ajax
     print '<tr><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
     print yn($conf->global->MAIN_DISABLE_JAVASCRIPT)."</td>";

From ae2ab3276da65f894435fe8626b03e64185ba72c Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sun, 26 Mar 2017 14:37:25 +0200
Subject: [PATCH 0473/1163] Refactoring and class/method documentation

---
 htdocs/core/class/coreobject.class.php     | 10 +++---
 htdocs/core/class/listview.class.php       | 37 ++++++++++++----------
 htdocs/inventory/class/inventory.class.php |  7 ++--
 htdocs/inventory/inventory.php             |  6 ++--
 htdocs/inventory/lib/inventory.lib.php     |  5 +++
 5 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 92da1604dca..396caf029cc 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -287,11 +287,11 @@ class CoreObject extends CommonObject
 			}
 			elseif($this->is_int($info))
             {
-				$this->{$field} = (int)$obj->{$field};
+				$this->{$field} = (int) $obj->{$field};
 			}
 			elseif($this->is_float($info))
             {
-				$this->{$field} = (double)$obj->{$field};
+				$this->{$field} = (double) $obj->{$field};
 			}
 			elseif($this->is_null($info))
             {
@@ -604,7 +604,7 @@ class CoreObject extends CommonObject
      * @param   string  $format Output date format
      * @return          string
      */
-    public function get_date($field, $format='')
+    public function getDate($field, $format='')
     {
 		if(empty($this->{$field})) return '';
 		else
@@ -620,7 +620,7 @@ class CoreObject extends CommonObject
      * @param   string  $date   formatted date to convert
      * @return                  mixed
      */
-    public function set_date($field, $date)
+    public function setDate($field, $date)
     {
 	  	if (empty($date))
 	  	{
@@ -648,7 +648,7 @@ class CoreObject extends CommonObject
 		{
 			if($this->checkFieldType($key, 'date'))
 			{
-				$this->set_date($key, $value);
+				$this->setDate($key, $value);
 			}
 			else if( $this->checkFieldType($key, 'array'))
 			{
diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 38645dbca0a..4394a1230da 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -19,6 +19,9 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ *	Class to manage the lists view
+ */
 class Listview
 {
     /**
@@ -92,8 +95,8 @@ class Listview
 	}
 
     /**
-     * @param $key
-     * @param $TParam
+     * @param string    $key    field name
+     * @param array     $TParam array of configuration
      * @return array
      */
 	private function getSearchKey($key, &$TParam)
@@ -129,7 +132,7 @@ class Listview
 	}
 
     /**
-     * @param $date
+     * @param string    $date   date to convert
      * @return int|string   Date TMS or ''
      */
     private function dateToSQLDate($date)
@@ -139,9 +142,9 @@ class Listview
 
 
     /**
-     * @param $TSQLMore
-     * @param $value
-     * @param $sKey
+     * @param array     $TSQLMore   contain some additional sql instructions
+     * @param string    $value      date with read format
+     * @param string    $sKey       field name
      */
     private function addSqlFromTypeDate(&$TSQLMore, &$value, $sKey)
 	{
@@ -171,11 +174,11 @@ class Listview
 
 
     /**
-     * @param $TSQLMore
-     * @param $value
-     * @param $TParam
-     * @param $sKey
-     * @param $key
+     * @param array     $TSQLMore   contain some additional sql instructions
+     * @param string    $value      value to filter
+     * @param array     $TParam     array of configuration
+     * @param string    $sKey       field name
+     * @param string    $key        reference of sKey to find value into TParam
      * @return bool
      */
     private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $key)
@@ -209,8 +212,8 @@ class Listview
 
 
     /**
-     * @param $sql
-     * @param $TParam
+     * @param string    $sql    standard select sql
+     * @param array     $TParam array of configuration
      * @return string
      */
     private function search($sql, &$TParam)
@@ -270,8 +273,8 @@ class Listview
 	}
 
     /**
-     * @param $sql
-     * @param array $TParam
+     * @param string    $sql    standard select sql
+     * @param array     $TParam array of configuration
      * @return string
      */
     public function render($sql, $TParam=array())
@@ -292,8 +295,8 @@ class Listview
 	}
 
     /**
-     * @param $THeader
-     * @param $TParam
+     * @param array     $THeader    the configuration of header
+     * @param array     $TParam     array of configuration
      * @return array
      */
     private function setSearch(&$THeader, &$TParam)
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/inventory/class/inventory.class.php
index 5f172c7c697..14230d90893 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/inventory/class/inventory.class.php
@@ -24,6 +24,9 @@
 require_once DOL_DOCUMENT_ROOT.'/core/class/coreobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
+/**
+ *	Class to manage inventories
+ */
 class Inventory extends CoreObject
 {
 	public $element='inventory';
@@ -307,8 +310,8 @@ class Inventory extends CoreObject
         
         $det->load_product();
                 
-        $date = $this->get_date('date_inventory', 'Y-m-d');
-        if(empty($date)) $date = $this->get_date('datec', 'Y-m-d');
+        $date = $this->getDate('date_inventory', 'Y-m-d');
+        if(empty($date)) $date = $this->getDate('datec', 'Y-m-d');
         $det->setStockDate($date, $fk_warehouse);
         
         return true;
diff --git a/htdocs/inventory/inventory.php b/htdocs/inventory/inventory.php
index f9297951c22..c10cbd1ab20 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/inventory/inventory.php
@@ -381,12 +381,12 @@ function card(&$inventory, $action='edit')
 	$lines = array();
 	card_line($inventory, $lines, $action);
 	
-	print '<b>'.$langs->trans('inventoryOnDate')." ".$inventory->get_date('date_inventory').'</b><br><br>';
+	print '<b>'.$langs->trans('inventoryOnDate')." ".$inventory->getDate('date_inventory').'</b><br><br>';
 	
 	$inventoryTPL = array(
 		'id'=> $inventory->id
-		,'date_cre' => $inventory->get_date('date_cre', 'd/m/Y')
-		,'date_maj' => $inventory->get_date('date_maj', 'd/m/Y H:i')
+		,'date_cre' => $inventory->getDate('date_cre', 'd/m/Y')
+		,'date_maj' => $inventory->getDate('date_maj', 'd/m/Y H:i')
 		,'fk_warehouse' => $inventory->fk_warehouse
 		,'status' => $inventory->status
 		,'entity' => $inventory->entity
diff --git a/htdocs/inventory/lib/inventory.lib.php b/htdocs/inventory/lib/inventory.lib.php
index 767d7416fc7..eb79ae67cc4 100644
--- a/htdocs/inventory/lib/inventory.lib.php
+++ b/htdocs/inventory/lib/inventory.lib.php
@@ -22,6 +22,11 @@
  *	\brief		This file is an example module library
  */
 
+/**
+ *  Define head array for tabs of inventory tools setup pages
+ *
+ *  @return			Array of head
+ */
 function inventoryAdminPrepareHead()
 {
     global $langs, $conf;

From ed27b44f62e04a80ae8419db40586927ebdb57df Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sun, 26 Mar 2017 14:58:59 +0200
Subject: [PATCH 0474/1163] Add TODO to print header table as Dolibarr

---
 htdocs/core/class/listview.class.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 4394a1230da..15510f58e9c 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -589,14 +589,17 @@ class Listview
 		foreach($THeader as $field=>$head)
 		{
 			if(empty($head['width']))$head['width']='auto';
-			
+
+
 			$out.='<th style="width:'.$head['width'].';text-align:'.$head['text-align'].'" class="liste_titre">'.$head['libelle'];
-				
+			// TODO replace the actual html by this function call to print a standard output as Dolibarr then add extrafields
+//            $out .= getTitleFieldOfList($head, $_SERVER["PHP_SELF"],"p.ref");
+
 			if($head['order']) $out.='<span class="nowrap">
 					<a href="javascript:Listview_OrderDown(\''.$this->id.'\',\''.$field.'\')">'.img_down().'</a>
 					<a href="javascript:Listview_OrderUp(\''.$this->id.'\', \''.$field.'\')">'.img_up().'</a>
 			</span>';
-			
+
 			$out.=$head['more'];
 			$out.='</th>';
 		}

From f843f8a93d9557a71af7316753fbd14d11830aa9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Mar 2017 00:48:50 +0200
Subject: [PATCH 0475/1163] Start to move search bar before table titles

---
 htdocs/comm/propal/list.php               |  84 +++++++++---------
 htdocs/commande/card.php                  |   3 +-
 htdocs/commande/contact.php               |   2 +-
 htdocs/commande/document.php              |   2 +-
 htdocs/commande/info.php                  |   2 +-
 htdocs/commande/list.php                  |  82 +++++++++---------
 htdocs/commande/note.php                  |   2 +-
 htdocs/contact/list.php                   |  81 +++++++++--------
 htdocs/core/class/html.form.class.php     |   3 +-
 htdocs/core/class/html.formmail.class.php |  24 +----
 htdocs/expedition/contact.php             |   2 +-
 htdocs/expedition/note.php                |  34 ++++----
 htdocs/expedition/shipment.php            |   2 +-
 htdocs/index.php                          |   4 +-
 htdocs/projet/list.php                    |  21 +++--
 htdocs/projet/tasks/list.php              |   7 +-
 htdocs/societe/list.php                   | 101 +++++++++++-----------
 htdocs/theme/eldy/img/warning_white.png   | Bin 0 -> 316 bytes
 htdocs/theme/eldy/style.css.php           |  75 +++++++++-------
 htdocs/theme/md/img/warning_white.png     | Bin 0 -> 316 bytes
 htdocs/theme/md/style.css.php             |  29 +++++--
 21 files changed, 280 insertions(+), 280 deletions(-)
 create mode 100644 htdocs/theme/eldy/img/warning_white.png
 create mode 100644 htdocs/theme/md/img/warning_white.png

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 44a2b9356e8..0ff70fe9107 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -559,46 +559,8 @@ if ($resql)
 	
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	
-	// Fields title
-	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['p.ref']['checked']))            print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['p.ref_client']['checked']))     print_liste_field_titre($arrayfields['p.ref_client']['label'],$_SERVER["PHP_SELF"],'p.ref_client','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['p.date']['checked']))           print_liste_field_titre($arrayfields['p.date']['label'],$_SERVER["PHP_SELF"],'p.datep','',$param, 'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['p.fin_validite']['checked']))   print_liste_field_titre($arrayfields['p.fin_validite']['label'],$_SERVER["PHP_SELF"],'dfv','',$param, 'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['p.total_ht']['checked']))       print_liste_field_titre($arrayfields['p.total_ht']['label'],$_SERVER["PHP_SELF"],'p.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['p.total_vat']['checked']))      print_liste_field_titre($arrayfields['p.total_vat']['label'],$_SERVER["PHP_SELF"],'p.tva','',$param, 'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['p.total_ttc']['checked']))      print_liste_field_titre($arrayfields['p.total_ttc']['label'],$_SERVER["PHP_SELF"],'p.total','',$param, 'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['u.login']['checked']))       	  print_liste_field_titre($arrayfields['u.login']['label'],$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder);
-	// Extra fields
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-	   foreach($extrafields->attribute_label as $key => $val) 
-	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
-           {
-				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-           }
-	   }
-	}
-	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
-    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-	if (! empty($arrayfields['p.datec']['checked']))     print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['p.tms']['checked']))       print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-	print '</tr>'."\n";
-	
-	print '<tr class="liste_titre">';
+
+	print '<tr class="liste_titre_filter">';
 	if (! empty($arrayfields['p.ref']['checked']))            
 	{
 	    print '<td class="liste_titre">';
@@ -739,9 +701,47 @@ if ($resql)
 	
 	print "</tr>\n";
 
+	
+	// Fields title
+	print '<tr class="liste_titre">';
+	if (! empty($arrayfields['p.ref']['checked']))            print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.ref_client']['checked']))     print_liste_field_titre($arrayfields['p.ref_client']['label'],$_SERVER["PHP_SELF"],'p.ref_client','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.date']['checked']))           print_liste_field_titre($arrayfields['p.date']['label'],$_SERVER["PHP_SELF"],'p.datep','',$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.fin_validite']['checked']))   print_liste_field_titre($arrayfields['p.fin_validite']['label'],$_SERVER["PHP_SELF"],'dfv','',$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.total_ht']['checked']))       print_liste_field_titre($arrayfields['p.total_ht']['label'],$_SERVER["PHP_SELF"],'p.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.total_vat']['checked']))      print_liste_field_titre($arrayfields['p.total_vat']['label'],$_SERVER["PHP_SELF"],'p.tva','',$param, 'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.total_ttc']['checked']))      print_liste_field_titre($arrayfields['p.total_ttc']['label'],$_SERVER["PHP_SELF"],'p.total','',$param, 'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['u.login']['checked']))       	  print_liste_field_titre($arrayfields['u.login']['label'],$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder);
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	   foreach($extrafields->attribute_label as $key => $val) 
+	   {
+           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           {
+				$align=$extrafields->getAlignFlag($key);
+				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+           }
+	   }
+	}
+	// Hook fields
+	$parameters=array('arrayfields'=>$arrayfields);
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+	if (! empty($arrayfields['p.datec']['checked']))     print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.tms']['checked']))       print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print '</tr>'."\n";
+	
 	$now = dol_now();
 	$i=0;
-	$var=true;
 	$totalarray=array();
 	while ($i < min($num,$limit))
 	{
@@ -751,7 +751,7 @@ if ($resql)
     	$objectstatic->id=$obj->rowid;
     	$objectstatic->ref=$obj->ref;
     		
-		print '<tr '.$bc[$var].'>';
+		print '<tr>';
 		
 		if (! empty($arrayfields['p.ref']['checked']))
 		{
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index cf14e1cac48..01a33e550a2 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1769,7 +1769,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		$res = $object->fetch_optionals($object->id, $extralabels);
 
 		$head = commande_prepare_head($object);
-		dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), 0, 'order');
+		dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
 
 		$formconfirm = '';
 
@@ -2651,6 +2651,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 				$file = $fileparams['fullname'];
 			}
 
+			print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 			print '<div class="clearboth"></div>';
 			print '<br>';
 			print load_fiche_titre($langs->trans('SendOrderByMail'));
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index f693d09da52..bc257f3ac05 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -143,7 +143,7 @@ if ($id > 0 || ! empty($ref))
 	    $object->fetch_thirdparty();
 	    
 		$head = commande_prepare_head($object);
-		dol_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), 0, 'order');
+		dol_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), -1, 'order');
 
 		
 		// Order card
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 5ce456fe8e0..199cb6d43c3 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -92,7 +92,7 @@ if ($id > 0 || ! empty($ref))
 		$upload_dir = $conf->commande->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
 		$head = commande_prepare_head($object);
-		dol_fiche_head($head, 'documents', $langs->trans('CustomerOrder'), 0, 'order');
+		dol_fiche_head($head, 'documents', $langs->trans('CustomerOrder'), -1, 'order');
 
 		// Construit liste des fichiers
 		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 9ee0e85e73e..02b631c4c8a 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -61,7 +61,7 @@ $object->fetch_thirdparty();
 $object->info($object->id);
 
 $head = commande_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans("CustomerOrder"), 0, 'order');
+dol_fiche_head($head, 'info', $langs->trans("CustomerOrder"), -1, 'order');
 
 // Order card
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index f4fc3b76745..03b9cfce56a 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -845,45 +845,7 @@ if ($resql)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-	// Fields title
-	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['c.ref']['checked']))            print_liste_field_titre($arrayfields['c.ref']['label'],$_SERVER["PHP_SELF"],'c.ref','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['c.ref_client']['checked']))     print_liste_field_titre($arrayfields['c.ref_client']['label'],$_SERVER["PHP_SELF"],'c.ref_client','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['c.date_commande']['checked']))  print_liste_field_titre($arrayfields['c.date_commande']['label'],$_SERVER["PHP_SELF"],'c.date_commande','',$param, 'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['c.date_delivery']['checked']))  print_liste_field_titre($arrayfields['c.date_delivery']['label'],$_SERVER["PHP_SELF"],'c.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['c.total_ht']['checked']))       print_liste_field_titre($arrayfields['c.total_ht']['label'],$_SERVER["PHP_SELF"],'c.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['c.total_vat']['checked']))      print_liste_field_titre($arrayfields['c.total_vat']['label'],$_SERVER["PHP_SELF"],'c.tva','',$param, 'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['c.total_ttc']['checked']))      print_liste_field_titre($arrayfields['c.total_ttc']['label'],$_SERVER["PHP_SELF"],'c.total_ttc','',$param, 'align="right"',$sortfield,$sortorder);
-	// Extra fields
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-	   foreach($extrafields->attribute_label as $key => $val) 
-	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
-           {
-				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-           }
-	   }
-	}
-	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
-    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-	if (! empty($arrayfields['c.datec']['checked']))     print_liste_field_titre($arrayfields['c.datec']['label'],$_SERVER["PHP_SELF"],"c.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['c.tms']['checked']))       print_liste_field_titre($arrayfields['c.tms']['label'],$_SERVER["PHP_SELF"],"c.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'],$_SERVER["PHP_SELF"],"c.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['c.facture']['checked']))   print_liste_field_titre($arrayfields['c.facture']['label'],$_SERVER["PHP_SELF"],'c.facture','',$param,'align="center"',$sortfield,$sortorder,'');
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-	print '</tr>'."\n";
-
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	// Ref
 	if (! empty($arrayfields['c.ref']['checked'])) 
 	{
@@ -1036,6 +998,44 @@ if ($resql)
 	
     print "</tr>\n";
 
+	// Fields title
+	print '<tr class="liste_titre">';
+	if (! empty($arrayfields['c.ref']['checked']))            print_liste_field_titre($arrayfields['c.ref']['label'],$_SERVER["PHP_SELF"],'c.ref','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['c.ref_client']['checked']))     print_liste_field_titre($arrayfields['c.ref_client']['label'],$_SERVER["PHP_SELF"],'c.ref_client','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['c.date_commande']['checked']))  print_liste_field_titre($arrayfields['c.date_commande']['label'],$_SERVER["PHP_SELF"],'c.date_commande','',$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['c.date_delivery']['checked']))  print_liste_field_titre($arrayfields['c.date_delivery']['label'],$_SERVER["PHP_SELF"],'c.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['c.total_ht']['checked']))       print_liste_field_titre($arrayfields['c.total_ht']['label'],$_SERVER["PHP_SELF"],'c.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['c.total_vat']['checked']))      print_liste_field_titre($arrayfields['c.total_vat']['label'],$_SERVER["PHP_SELF"],'c.tva','',$param, 'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['c.total_ttc']['checked']))      print_liste_field_titre($arrayfields['c.total_ttc']['label'],$_SERVER["PHP_SELF"],'c.total_ttc','',$param, 'align="right"',$sortfield,$sortorder);
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	   foreach($extrafields->attribute_label as $key => $val) 
+	   {
+           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           {
+				$align=$extrafields->getAlignFlag($key);
+				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+           }
+	   }
+	}
+	// Hook fields
+	$parameters=array('arrayfields'=>$arrayfields);
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+	if (! empty($arrayfields['c.datec']['checked']))     print_liste_field_titre($arrayfields['c.datec']['label'],$_SERVER["PHP_SELF"],"c.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['c.tms']['checked']))       print_liste_field_titre($arrayfields['c.tms']['label'],$_SERVER["PHP_SELF"],"c.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'],$_SERVER["PHP_SELF"],"c.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['c.facture']['checked']))   print_liste_field_titre($arrayfields['c.facture']['label'],$_SERVER["PHP_SELF"],'c.facture','',$param,'align="center"',$sortfield,$sortorder,'');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print '</tr>'."\n";
+    
 	$total=0;
 	$subtotal=0;
     $productstat_cache=array();
@@ -1044,13 +1044,11 @@ if ($resql)
     $generic_product = new Product($db);
 	
     $i=0;
-	$var=true;
 	$totalarray=array();
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($resql);
-        $var=!$var;
-        print '<tr '.$bc[$var].'>';
+        print '<tr>';
 
         $notshippable=0;
         $warning = 0;
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 4d53d8e8d50..79475c75917 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -75,7 +75,7 @@ if ($id > 0 || ! empty($ref))
 	
 	$head = commande_prepare_head($object);
 	
-	dol_fiche_head($head, 'note', $langs->trans("CustomerOrder"), 0, 'order');
+	dol_fiche_head($head, 'note', $langs->trans("CustomerOrder"), -1, 'order');
 
 	// Order card
 	
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 6091171dfe6..80649ef4e06 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -486,45 +486,8 @@ $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfiel
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-// Ligne des titres
-print '<tr class="liste_titre">';
-if (! empty($arrayfields['p.lastname']['checked']))            print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.lastname", $begin, $param, '', $sortfield,$sortorder);
-if (! empty($arrayfields['p.firstname']['checked']))            print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"p.firstname", $begin, $param, '', $sortfield,$sortorder);
-if (! empty($arrayfields['p.zip']['checked']))            print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"p.zip", $begin, $param, '', $sortfield,$sortorder);
-if (! empty($arrayfields['p.town']['checked']))            print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"p.town", $begin, $param, '', $sortfield,$sortorder);
-if (! empty($arrayfields['p.poste']['checked']))            print_liste_field_titre($langs->trans("PostOrFunction"),$_SERVER["PHP_SELF"],"p.poste", $begin, $param, '', $sortfield,$sortorder);
-if (! empty($arrayfields['p.phone']['checked']))            print_liste_field_titre($langs->trans("Phone"),$_SERVER["PHP_SELF"],"p.phone", $begin, $param, '', $sortfield,$sortorder);
-if (! empty($arrayfields['p.phone_perso']['checked']))            print_liste_field_titre($langs->trans("PhonePerso"),$_SERVER["PHP_SELF"],"p.phone_perso", $begin, $param, '', $sortfield,$sortorder);
-if (! empty($arrayfields['p.phone_mobile']['checked']))            print_liste_field_titre($langs->trans("PhoneMobile"),$_SERVER["PHP_SELF"],"p.phone_mobile", $begin, $param, '', $sortfield,$sortorder);
-if (! empty($arrayfields['p.fax']['checked']))            print_liste_field_titre($langs->trans("Fax"),$_SERVER["PHP_SELF"],"p.fax", $begin, $param, '', $sortfield,$sortorder);
-if (! empty($arrayfields['p.email']['checked']))            print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"p.email", $begin, $param, '', $sortfield,$sortorder);
-if (! empty($arrayfields['p.skype']['checked']))            print_liste_field_titre($langs->trans("Skype"),$_SERVER["PHP_SELF"],"p.skype", $begin, $param, '', $sortfield,$sortorder);
-if (! empty($arrayfields['p.thirdparty']['checked']))            print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom", $begin, $param, '', $sortfield,$sortorder);
-if (! empty($arrayfields['p.priv']['checked']))            print_liste_field_titre($langs->trans("ContactVisibility"),$_SERVER["PHP_SELF"],"p.priv", $begin, $param, 'align="center"', $sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val)
-   {
-       if (! empty($arrayfields["ef.".$key]['checked']))
-       {
-			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['p.datec']['checked']))  print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['p.tms']['checked']))    print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['p.statut']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-print "</tr>\n";
-
 // Lines for filter fields
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 if (! empty($arrayfields['p.lastname']['checked']))
 {
     print '<td class="liste_titre">';
@@ -645,14 +608,50 @@ print '</td>';
 
 print '</tr>';
 
-$var=True;
+// Ligne des titres
+print '<tr class="liste_titre">';
+if (! empty($arrayfields['p.lastname']['checked']))            print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.lastname", $begin, $param, '', $sortfield,$sortorder);
+if (! empty($arrayfields['p.firstname']['checked']))            print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"p.firstname", $begin, $param, '', $sortfield,$sortorder);
+if (! empty($arrayfields['p.zip']['checked']))            print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"p.zip", $begin, $param, '', $sortfield,$sortorder);
+if (! empty($arrayfields['p.town']['checked']))            print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"p.town", $begin, $param, '', $sortfield,$sortorder);
+if (! empty($arrayfields['p.poste']['checked']))            print_liste_field_titre($langs->trans("PostOrFunction"),$_SERVER["PHP_SELF"],"p.poste", $begin, $param, '', $sortfield,$sortorder);
+if (! empty($arrayfields['p.phone']['checked']))            print_liste_field_titre($langs->trans("Phone"),$_SERVER["PHP_SELF"],"p.phone", $begin, $param, '', $sortfield,$sortorder);
+if (! empty($arrayfields['p.phone_perso']['checked']))            print_liste_field_titre($langs->trans("PhonePerso"),$_SERVER["PHP_SELF"],"p.phone_perso", $begin, $param, '', $sortfield,$sortorder);
+if (! empty($arrayfields['p.phone_mobile']['checked']))            print_liste_field_titre($langs->trans("PhoneMobile"),$_SERVER["PHP_SELF"],"p.phone_mobile", $begin, $param, '', $sortfield,$sortorder);
+if (! empty($arrayfields['p.fax']['checked']))            print_liste_field_titre($langs->trans("Fax"),$_SERVER["PHP_SELF"],"p.fax", $begin, $param, '', $sortfield,$sortorder);
+if (! empty($arrayfields['p.email']['checked']))            print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"p.email", $begin, $param, '', $sortfield,$sortorder);
+if (! empty($arrayfields['p.skype']['checked']))            print_liste_field_titre($langs->trans("Skype"),$_SERVER["PHP_SELF"],"p.skype", $begin, $param, '', $sortfield,$sortorder);
+if (! empty($arrayfields['p.thirdparty']['checked']))            print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom", $begin, $param, '', $sortfield,$sortorder);
+if (! empty($arrayfields['p.priv']['checked']))            print_liste_field_titre($langs->trans("ContactVisibility"),$_SERVER["PHP_SELF"],"p.priv", $begin, $param, 'align="center"', $sortfield,$sortorder);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+   foreach($extrafields->attribute_label as $key => $val)
+   {
+       if (! empty($arrayfields["ef.".$key]['checked']))
+       {
+			$align=$extrafields->getAlignFlag($key);
+			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+       }
+   }
+}
+// Hook fields
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['p.datec']['checked']))  print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['p.tms']['checked']))    print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['p.statut']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print "</tr>\n";
+
+
 $i = 0;
 while ($i < min($num,$limit))
 {
     $obj = $db->fetch_object($result);
 
-	$var=!$var;
-    print "<tr ".$bc[$var].">";
+    print "<tr>";
 
 	$contactstatic->lastname=$obj->lastname;
 	$contactstatic->firstname='';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 315e920947d..4b8d9517dcf 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5242,8 +5242,7 @@ class Form
 
     	// Try also magic suggest
 
-    	// Add data-role="none" to disable jmobile decoration
-		$out .= '<select data-role="none" id="'.$htmlname.'" class="multiselect'.($morecss?' '.$morecss:'').'" multiple name="'.$htmlname.'[]"'.($moreattrib?' '.$moreattrib:'').($width?' style="width: '.(preg_match('/%/',$width)?$width:$width.'px').'"':'').'>'."\n";
+		$out .= '<select id="'.$htmlname.'" class="multiselect'.($morecss?' '.$morecss:'').'" multiple name="'.$htmlname.'[]"'.($moreattrib?' '.$moreattrib:'').($width?' style="width: '.(preg_match('/%/',$width)?$width:$width.'px').'"':'').'>'."\n";
     	if (is_array($array) && ! empty($array))
     	{
     		if ($value_as_key) $array=array_combine($array, $array);
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index e960b3d6909..d7ab17e60c4 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -527,26 +527,7 @@ class FormMail extends Form
         				{
         				    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
         				}
-        				$out.= $form->multiselectarray("receiver", $tmparray, GETPOST("receiver"), null, null, null,null, "90%");
-        			}
-        			if (isset($this->withtosocid) && $this->withtosocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
-        			{
-        			    dol_syslog("get_form was called with a deprecated way: ->withtosocid must not be defined, only ->withto", LOG_WARNING);
-        				$liste=array();
-        				$soc=new Societe($this->db);
-        				$soc->fetch($this->withtosocid);
-        				foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-        				{
-        					$liste[$key]=$value;
-        				}
-        				if ($this->withtofree) $out.= " ".$langs->trans("or")." ";
-        			    // multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
-        				$tmparray = $liste;
-        				foreach($tmparray as $key => $val)
-        				{
-        				    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
-        				}
-        				$out.= $form->multiselectarray("receiver", $liste, GETPOST("receiver"), null, null, null,null, "90%");
+        				$out.= $form->multiselectarray("receiver", $tmparray, GETPOST("receiver"), null, null, 'inline-block minwidth500', null, "");
         			}
         		}
         		$out.= "</td></tr>\n";
@@ -574,8 +555,7 @@ class FormMail extends Form
         				{
         				    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
         				}
-        				//$out.= $form->selectarray("receivercc", $this->withtocc, GETPOST("receivercc"), 1, 0, 0, '', 0, 0, 0, '', '', 0, '', $disablebademails);
-        				$out.= $form->multiselectarray("receivercc", $tmparray, GETPOST("receivercc"), null, null, null,null, "90%");
+        				$out.= $form->multiselectarray("receivercc", $tmparray, GETPOST("receivercc"), null, null, 'inline-block minwidth500',null, "");
         			}
         		}
         		$out.= "</td></tr>\n";
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 80ceb1e8bd5..1354b3d49f1 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -156,7 +156,7 @@ if ($id > 0 || ! empty($ref))
 	$langs->trans("OrderCard");
 
 	$head = shipping_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("Shipment"), 0, 'sending');
+	dol_fiche_head($head, 'contact', $langs->trans("Shipment"), -1, 'sending');
 
 
 	// Shipment card
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 0f7093fa90c..c32ec5c5124 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -1,22 +1,22 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
-* Copyright (C) 2005-2012  Regis Houssin        <regis.houssin@capnetworks.com>
-* Copyright (C) 2013 	   Florian Henry        <florian.henry@open-concept.pro>
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
+ * Copyright (C) 2005-2012  Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013 	   Florian Henry        <florian.henry@open-concept.pro>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /**
  *      \file       htdocs/expedition/note.php
@@ -98,7 +98,7 @@ if ($id > 0 || ! empty($ref))
 {
 
 	$head=shipping_prepare_head($object);
-	dol_fiche_head($head, 'note', $langs->trans("Shipment"), 0, 'sending');
+	dol_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending');
 
     
 	// Shipment card
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 3044a1beb10..f53b80b927d 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -245,7 +245,7 @@ if ($id > 0 || ! empty($ref))
 		$res = $object->fetch_optionals($object->id, $extralabels);
 		
 		$head = commande_prepare_head($object);
-		dol_fiche_head($head, 'shipping', $langs->trans("CustomerOrder"), 0, 'order');
+		dol_fiche_head($head, 'shipping', $langs->trans("CustomerOrder"), -1, 'order');
 
 		
 		$formconfirm = '';
diff --git a/htdocs/index.php b/htdocs/index.php
index 0e44483118a..943914ebd15 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -561,14 +561,14 @@ if (! empty($valid_dashboardlines))
         
         $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
         $boxwork .= '<div class="boxstatscontent">';
-        $boxwork .= $board->img.' '.$board->label.'<br>';
+        $boxwork .= '<span class="boxstatstext">'.$board->img.' '.$board->label.'</span><br>';
         $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0)?' dashboardlineok':'').'">'.$board->nbtodo.'</span></a>';
         $boxwork .= '</div>';
         if ($board->nbtodolate > 0)
         {
             $boxwork .= '<div class="dashboardlinelatecoin nowrap">';
             $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
-            $boxwork .= img_picto($textlate, "warning", 'class="valigntextbottom"').'';
+            $boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
             $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
             $boxwork .= $board->nbtodolate;
             $boxwork .= '</span>';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index c7d213b19ce..7126e454d5c 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -116,7 +116,7 @@ $arrayfields=array(
     'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
     'p.title'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
     's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'enabled'=>$conf->societe->enabled),
-    'commercial'=>array('label'=>$langs->trans("SalesRepresentative"), 'checked'=>1),
+    'commercial'=>array('label'=>$langs->trans("ThirdPartiesOfSaleRepresentative"), 'checked'=>1),
 	'p.dateo'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>100),
     'p.datee'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1, 'position'=>101),
     'p.public'=>array('label'=>$langs->trans("Visibility"), 'checked'=>1, 'position'=>102),
@@ -339,7 +339,6 @@ if (! $resql)
     exit;
 }
 
-$var=true;
 $num = $db->num_rows($resql);
 
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
@@ -547,7 +546,7 @@ if (! empty($arrayfields['p.opp_amount']['checked']))
 if (! empty($arrayfields['p.fk_opp_status']['checked']))
 {
 	print '<td class="liste_titre nowrap center">';
-	print $formproject->selectOpportunityStatus('search_opp_status',$search_opp_status,1,1,1);
+	print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 1, 1, 0, 'maxwidth100');
     print '</td>';
 }
 if (! empty($arrayfields['p.opp_percent']['checked']))
@@ -619,7 +618,6 @@ print '</td>';
 print '</tr>'."\n";
 
 $i=0;
-$var=true;
 $totalarray=array();
 while ($i < min($num,$limit))
 {
@@ -636,8 +634,7 @@ while ($i < min($num,$limit))
 	$userAccess = $projectstatic->restrictedProjectArea($user);    // why this ?
 	if ($userAccess >= 0)
 	{
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		print "<tr>";
 
 		// Project url
     	if (! empty($arrayfields['p.ref']['checked']))
@@ -651,7 +648,7 @@ while ($i < min($num,$limit))
 		// Title
     	if (! empty($arrayfields['p.title']['checked']))
     	{
-        	print '<td>';
+        	print '<td class="tdoverflowmax100">';
     		print dol_trunc($obj->title,80);
     		print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
@@ -659,7 +656,7 @@ while ($i < min($num,$limit))
 		// Company
     	if (! empty($arrayfields['s.nom']['checked']))
     	{
-        	print '<td>';
+        	print '<td class="tdoverflowmax100">';
     		if ($obj->socid)
     		{
     			$socstatic->id=$obj->socid;
@@ -701,9 +698,11 @@ while ($i < min($num,$limit))
     					$userstatic->email=$val['email'];
     					$userstatic->statut=$val['statut'];
     					$userstatic->entity=$val['entity'];
-    					print $userstatic->getNomUrl(1);
+    					$userstatic->photo=$val['photo'];
+    					//print $userstatic->getNomUrl(1, '', 0, 0, 12);
+    					print $userstatic->getNomUrl(-2);
     					$j++;
-    					if ($j < $nbofsalesrepresentative) print ', ';
+    					if ($j < $nbofsalesrepresentative) print ' ';
     				}
     			}
     			//else print $langs->trans("NoSalesRepresentativeAffected");
@@ -756,7 +755,7 @@ while ($i < min($num,$limit))
     	// Opp Status
     	if (! empty($arrayfields['p.fk_opp_status']['checked']))
     	{
-            print '<td align="middle">';
+            print '<td class="center">';
 			if ($obj->opp_status_code) print $langs->trans("OppStatusShort".$obj->opp_status_code);
 			print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index c9d9e82ea82..7d5e4eea1ae 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -335,7 +335,6 @@ if (! $resql)
     exit;
 }
 
-$var=true;
 $num = $db->num_rows($resql);
 
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
@@ -597,7 +596,6 @@ if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$
  
 $now = dol_now();
 $i=0;
-$var=true;
 $totalarray=array();
 while ($i < min($num,$limit))
 {
@@ -621,8 +619,7 @@ while ($i < min($num,$limit))
 	$userAccess = $projectstatic->restrictedProjectArea($user);    // why this ?
 	if ($userAccess >= 0)
 	{
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		print "<tr>";
 
     	// Ref
     	if (! empty($arrayfields['t.ref']['checked']))
@@ -741,7 +738,7 @@ while ($i < min($num,$limit))
         	if ($obj->planned_workload || $obj->duration_effective)
 			{
 				if ($obj->planned_workload) print round(100 * $obj->duration_effective / $obj->planned_workload,2).' %';
-				else print $langs->trans('WorkloadNotDefined');
+				else print $form->textwithpicto('',$langs->trans('WorkloadNotDefined'), 1, 'help');
 			}
     		print '</td>';
             if (! $i) $totalarray['nbfield']++;
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 649965f972c..c4412660ea7 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -592,54 +592,8 @@ if (empty($arrayfields['customerorsupplier']['checked'])) print '<input type="hi
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-print '<tr class="liste_titre">';
-if (! empty($arrayfields['s.nom']['checked']))                     print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['s.barcode']['checked']))                 print_liste_field_titre($arrayfields['s.barcode']['label'], $_SERVER["PHP_SELF"], "s.barcode",$param,'','',$sortfield,$sortorder);
-if (! empty($arrayfields['s.code_client']['checked']))             print_liste_field_titre($arrayfields['s.code_client']['label'],$_SERVER["PHP_SELF"],"s.code_client","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.code_fournisseur']['checked']))        print_liste_field_titre($arrayfields['s.code_fournisseur']['label'],$_SERVER["PHP_SELF"],"s.code_fournisseur","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.code_compta']['checked']))             print_liste_field_titre($arrayfields['s.code_compta']['label'],$_SERVER["PHP_SELF"],"s.code_compta","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.code_compta_fournisseur']['checked'])) print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'],$_SERVER["PHP_SELF"],"s.code_compta_fournisseur","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],"s.town","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],"s.zip","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.email']['checked']))          print_liste_field_titre($arrayfields['s.email']['label'],$_SERVER["PHP_SELF"],"s.email","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.phone']['checked']))          print_liste_field_titre($arrayfields['s.phone']['label'],$_SERVER["PHP_SELF"],"s.phone","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.url']['checked']))            print_liste_field_titre($arrayfields['s.url']['label'],$_SERVER["PHP_SELF"],"s.url","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.siren']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"),$textprofid[1],1,0),$_SERVER["PHP_SELF"],"s.siren","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.siret']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"),$textprofid[2],1,0),$_SERVER["PHP_SELF"],"s.siret","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.ape']['checked']))            print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"),$textprofid[3],1,0),$_SERVER["PHP_SELF"],"s.ape","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.idprof4']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof4","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.idprof5']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof5","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.idprof6']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof6","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['customerorsupplier']['checked']))        print_liste_field_titre('');   // type of customer
-if (! empty($arrayfields['s.fk_prospectlevel']['checked']))        print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'],$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.fk_stcomm']['checked']))               print_liste_field_titre($arrayfields['s.fk_stcomm']['label'],$_SERVER["PHP_SELF"],"s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val)
-   {
-       if (! empty($arrayfields["ef.".$key]['checked']))
-       {
-			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['s.datec']['checked']))  print_liste_field_titre($arrayfields['s.datec']['label'],$_SERVER["PHP_SELF"],"s.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.tms']['checked']))    print_liste_field_titre($arrayfields['s.tms']['label'],$_SERVER["PHP_SELF"],"s.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.status']['checked'])) print_liste_field_titre($arrayfields['s.status']['label'],$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-print "</tr>\n";
-
 // Fields title search
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 if (! empty($arrayfields['s.nom']['checked']))
 {
 	print '<td class="liste_titre">';
@@ -889,12 +843,57 @@ print '</td>';
 
 print "</tr>\n";
 
-$var=True;
+print '<tr class="liste_titre">';
+if (! empty($arrayfields['s.nom']['checked']))                     print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['s.barcode']['checked']))                 print_liste_field_titre($arrayfields['s.barcode']['label'], $_SERVER["PHP_SELF"], "s.barcode",$param,'','',$sortfield,$sortorder);
+if (! empty($arrayfields['s.code_client']['checked']))             print_liste_field_titre($arrayfields['s.code_client']['label'],$_SERVER["PHP_SELF"],"s.code_client","",$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['s.code_fournisseur']['checked']))        print_liste_field_titre($arrayfields['s.code_fournisseur']['label'],$_SERVER["PHP_SELF"],"s.code_fournisseur","",$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['s.code_compta']['checked']))             print_liste_field_titre($arrayfields['s.code_compta']['label'],$_SERVER["PHP_SELF"],"s.code_compta","",$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['s.code_compta_fournisseur']['checked'])) print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'],$_SERVER["PHP_SELF"],"s.code_compta_fournisseur","",$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],"s.town","",$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],"s.zip","",$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['s.email']['checked']))          print_liste_field_titre($arrayfields['s.email']['label'],$_SERVER["PHP_SELF"],"s.email","",$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['s.phone']['checked']))          print_liste_field_titre($arrayfields['s.phone']['label'],$_SERVER["PHP_SELF"],"s.phone","",$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['s.url']['checked']))            print_liste_field_titre($arrayfields['s.url']['label'],$_SERVER["PHP_SELF"],"s.url","",$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['s.siren']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"),$textprofid[1],1,0),$_SERVER["PHP_SELF"],"s.siren","",$param,'class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['s.siret']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"),$textprofid[2],1,0),$_SERVER["PHP_SELF"],"s.siret","",$param,'class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['s.ape']['checked']))            print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"),$textprofid[3],1,0),$_SERVER["PHP_SELF"],"s.ape","",$param,'class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['s.idprof4']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof4","",$param,'class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['s.idprof5']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof5","",$param,'class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['s.idprof6']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof6","",$param,'class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['customerorsupplier']['checked']))        print_liste_field_titre('');   // type of customer
+if (! empty($arrayfields['s.fk_prospectlevel']['checked']))        print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'],$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['s.fk_stcomm']['checked']))               print_liste_field_titre($arrayfields['s.fk_stcomm']['label'],$_SERVER["PHP_SELF"],"s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+   foreach($extrafields->attribute_label as $key => $val)
+   {
+       if (! empty($arrayfields["ef.".$key]['checked']))
+       {
+			$align=$extrafields->getAlignFlag($key);
+			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+       }
+   }
+}
+// Hook fields
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['s.datec']['checked']))  print_liste_field_titre($arrayfields['s.datec']['label'],$_SERVER["PHP_SELF"],"s.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['s.tms']['checked']))    print_liste_field_titre($arrayfields['s.tms']['label'],$_SERVER["PHP_SELF"],"s.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['s.status']['checked'])) print_liste_field_titre($arrayfields['s.status']['label'],$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print "</tr>\n";
+
+
 $i = 0;
 while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
-	$var=!$var;
 
 	$companystatic->id=$obj->rowid;
 	$companystatic->name=$obj->name;
@@ -911,10 +910,10 @@ while ($i < min($num, $limit))
     	$companystatic->fk_prospectlevel=$obj->fk_prospectlevel;
     	$companystatic->name_alias=$obj->name_alias;
 
-	print "<tr ".$bc[$var].">";
+	print "<tr>";
 	if (! empty($arrayfields['s.nom']['checked']))
 	{
-		print "<td>";
+		print '<td class="tdoverflowmax200">';
 		print $companystatic->getNomUrl(1,'',100);
 		print "</td>\n";
 	}
diff --git a/htdocs/theme/eldy/img/warning_white.png b/htdocs/theme/eldy/img/warning_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..56ea847427b79039889f88536148d81ac20a4f9e
GIT binary patch
literal 316
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|wj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&pI+SxV5-P`m7PHc;rKr;B5V#p$z?eEAMKNVMIbv`*C{
z;}M(hodvNwIkWX1roU8q#c=L`sz*dZs_UbTGu@1Dxp^O%yyv9OzV|bKrn&tRZD6ms
zFW`FMQLraNj8D@hA@PV$Dol5b7EK60WV9%@D<e9@$lK(+Z_={&UNsM<WW1SiM27MH
zyVVhsRxO#hr0QH8ucveH?8;es1)JX;mE(QDRr1+IdiBG38`&b#J=vB78+$I!_r7&N
zaj`}2mKnAex>WfL7TP2qC~R1^WNM`**S~1@OOZkT^~ag-YaTrE<a^Z*pr;r-UHx3v
IIVCg!04orC2LJ#7

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index e16f6136233..c8c0dda380b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -65,6 +65,7 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
 
 // Define image path files and other constants
 $fontlist='roboto,arial,tahoma,verdana,helvetica';    //$fontlist='helvetica, verdana, arial, sans-serif';
+//$fontlist='"open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;';
 $img_head='';
 $img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
 $dol_hide_topmenu=$conf->dol_hide_topmenu;
@@ -95,7 +96,7 @@ $colortexttitle='0,0,0';
 $colortext='0,0,0';
 $colortextlink='0,0,120';
 $fontsize='13';
-$fontsizesmaller='11';
+$fontsizesmaller='12';
 $usegradienttop=(isset($conf->global->THEME_ELDY_TOPMENU_BACK1)?0:1);
 $usegradienttitle=(isset($conf->global->THEME_ELDY_BACKTITLE1)?0:1);
 $useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
@@ -122,7 +123,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
     $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
     $conf->global->THEME_ELDY_TEXT='0,0,0';
     $conf->global->THEME_ELDY_FONT_SIZE1='13';
-    $conf->global->THEME_ELDY_FONT_SIZE2='11';
+    $conf->global->THEME_ELDY_FONT_SIZE2='12';
 }
 
 
@@ -240,7 +241,7 @@ body {
 <?php } ?>
 	color: rgb(<?php echo $colortext; ?>);
 	font-size: <?php print $fontsize ?>px;
-	line-height: 130%;
+	line-height: 1.4;
 	font-family: <?php print $fontlist ?>;
     margin-top: 0;
     margin-bottom: 0;
@@ -670,7 +671,7 @@ div.fiche>form>div.div-table-responsive, div.fiche>form>div.div-table-responsive
     overflow-x: auto;
 }
 div.fiche>form>div.div-table-responsive {
-    min-height: 350px;
+    min-height: 390px;
 }
 
 .flexcontainer {
@@ -682,7 +683,7 @@ div.fiche>form>div.div-table-responsive {
 	flex: 1 1 120px;
 }
 .thumbstat150 {
-	flex: 1 1 150px;
+	flex: 1 1 170px;
 }
 .thumbstat, thumbstat150 {
     /* flex-grow: 1; */
@@ -876,13 +877,14 @@ td.showDragHandle {
 #id-right, #id-left {
 	padding-top: 16px;
 	padding-bottom: 8px;
-
+	
 	display: table-cell;			/* DOL_XXX Empeche fonctionnement correct du scroll horizontal sur tableau, avec datatable ou CSS */
 	float: none;
 	vertical-align: top;
 }
 #id-right {	/* This must stay id-right and not be replaced with echo $right */
 	width: 100%;
+	background: rgb(<?php print $colorbackbody; ?>);
 }
 #id-left {
 /*	background-color: #fff;
@@ -2393,6 +2395,9 @@ table.paddingtopbottomonly tr td {
 	padding-top: 1px;
 	padding-bottom: 2px;
 }
+tr.liste_titre_filter td.liste_titre {
+    border-bottom: 1px solid #eee;
+}
 .liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd
 {
     border-top-width: 2px;
@@ -2707,29 +2712,26 @@ tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, tabl
 }
 div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
 {
-	<?php if ($usegradienttitle) { ?>
-	background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.4) 100%);
-	background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.4) 100%);
-	background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.4) 100%);
-	background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.4) 100%);
-	background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.4) 100%);
-	<?php } else { ?>
-	background: rgb(<?php echo $colorbacktitle1; ?>);
-	<?php } ?>
+	background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
 	font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
-
+    border-bottom: 1px solid #ddd;
+	
     color: rgb(<?php echo $colortexttitle; ?>);
     font-family: <?php print $fontlist ?>;
-    border-bottom: 1px solid #FDFFFF;
     text-align: <?php echo $left; ?>;
 }
 tr.liste_titre th, tr.liste_titre td, th.liste_titre
 {
-	border-bottom: 1px solid #<?php echo ($colorbacktitle1 == '255,255,255'?'BBBBBB':'FDFFFF'); ?>;
+/*	border-bottom: 1px solid #<?php echo ($colorbacktitle1 == '255,255,255'?'BBBBBB':'ddd'); ?>; */
+	border-bottom: 1px solid #888;
 }
-/* TODO Once title line is moved under title search, make border bottom of all th black and force to whit when it's first tr */ 
-tr:first-child th.liste_titre {
-    border-bottom: 1px solid #FFF ! important;
+/* TODO Once title line is moved under title search, make border bottom of all th black and force to white when it's first tr */ 
+tr.liste_titre:first-child th, tr:first-child th.liste_titre {
+    border-bottom: 1px solid #ddd ! important;
 }
 tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div
 {
@@ -2882,7 +2884,7 @@ div.tabBar .noborder {
     width: 105px;    
 }
 .boxstats130 {
-    width: 135px; 
+    width: 160px; 
     height: 48px;
     padding: 3px  
 }
@@ -2892,8 +2894,15 @@ div.tabBar .noborder {
 
 @media only screen and (max-width: 767px)
 {
-    .boxstats, .boxstats130 {
-        width: 100px;    
+	.thumbstat150 {
+		flex: 1 1 110px;
+	}
+	.boxstats, .boxstats130 {
+        width: 90px;    
+    }
+    .dashboardlineindicator { 
+        float: left;
+    	padding-left: 5px;
     }
 }
 
@@ -2919,15 +2928,18 @@ span.dashboardlineok {
 	color: #008800;
 }
 span.dashboardlineko {
-	color: #880000;
-	/* font-weight: bold; */
-	font-size: 100%;	
+	color: #FFF;
+	font-size: 80%;	
 }
 .dashboardlinelatecoin {
 	float: right;
 	position: relative;
     text-align: right;
-    top: -22px
+    top: -28px;
+    padding: 1px 6px 1px 6px;
+    background-color: #8c4446;
+    color: #FFFFFF ! important;
+    border-radius: .25em;    
 }
 .boxtable {
     margin-bottom: 8px !important;
@@ -4114,10 +4126,11 @@ a span.select2-chosen
 .select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices, .select2-container-multi .select2-choices,
 .select2-container-multi.select2-container-active .select2-choices
 {
-	border-bottom: none;
+	border-bottom: 1px solid #ccc;
 	border-right: none;
 	border-top: none;
-	border-left: 1px solid #ddd;
+	border-left: none;
+	
 }
 
 
@@ -4623,7 +4636,7 @@ border-top-right-radius: 6px;
 @media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 6.9, 0) + 20; ?>px)
 {
 	div.tmenucenter {
-	    max-width: <?php echo round($fontsize * 4); ?>px;	/* size of viewport */
+	    width: <?php echo round($fontsize * 4); ?>px;	/* size of viewport */
     	white-space: nowrap;
   		overflow: hidden;
   		text-overflow: ellipsis;
diff --git a/htdocs/theme/md/img/warning_white.png b/htdocs/theme/md/img/warning_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..56ea847427b79039889f88536148d81ac20a4f9e
GIT binary patch
literal 316
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|wj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&pI+SxV5-P`m7PHc;rKr;B5V#p$z?eEAMKNVMIbv`*C{
z;}M(hodvNwIkWX1roU8q#c=L`sz*dZs_UbTGu@1Dxp^O%yyv9OzV|bKrn&tRZD6ms
zFW`FMQLraNj8D@hA@PV$Dol5b7EK60WV9%@D<e9@$lK(+Z_={&UNsM<WW1SiM27MH
zyVVhsRxO#hr0QH8ucveH?8;es1)JX;mE(QDRr1+IdiBG38`&b#J=vB78+$I!_r7&N
zaj`}2mKnAex>WfL7TP2qC~R1^WNM`**S~1@OOZkT^~ag-YaTrE<a^Z*pr;r-UHx3v
IIVCg!04orC2LJ#7

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index dd0f07b0a95..4c1d32c31ad 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -674,7 +674,7 @@ div.fiche>form>div.div-table-responsive, div.fiche>form>div.div-table-responsive
     overflow-x: auto;
 }
 div.fiche>form>div.div-table-responsive {
-    min-height: 350px;
+    min-height: 390px;
 }
 
 .flexcontainer {
@@ -2301,6 +2301,9 @@ table.paddingtopbottomonly tr td {
 	padding-bottom: 2px;
 }
 
+tr.liste_titre_filter td.liste_titre {
+    border-bottom: 1px solid #eee;
+}
 .liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd
 {
     border-top-width: 2px;
@@ -2800,20 +2803,28 @@ div .tdtop {
 }
 @media only screen and (max-width: 767px)
 {
-    .boxstats, .boxstats130 {
-        width: 100px;    
+	.thumbstat150 {
+		flex: 1 1 110px;
+	}
+	.boxstats, .boxstats130 {
+        width: 90px;    
+    }
+    .dashboardlineindicator { 
+        float: left;
+    	padding-left: 5px;
     }
 }
 .boxstats:hover {
 	box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.20);
 }
 span.boxstatstext {
-	/* opacity: 0.9;  Disabled. This make text on top of left menu in smartphone size */
     line-height: 18px;
+    opacity: 0.7;
 }
 span.boxstatsindicator {
 	font-size: 110%;
 	font-weight: normal;
+	font-color: rgb(<?php print $colortextlink; ?>);
 }
 span.dashboardlineindicator, span.dashboardlineindicatorlate {
 	font-size: 120%;
@@ -2826,14 +2837,18 @@ span.dashboardlineok {
 	color: #008800;
 }
 span.dashboardlineko {
-	color: #880000;
-	font-weight: bold;
+	color: #FFF;
+	font-size: 80%;
 }
 .dashboardlinelatecoin {
 	float: right;
 	position: relative;
     text-align: right;
-    top: -22px
+    top: -24px;
+    padding: 1px 6px 1px 6px;
+    background-color: #8c4446;
+    color: #FFFFFF ! important;
+    border-radius: .25em;    
 }
 .boxtable {
     margin-bottom: 8px !important;

From 262d1d5f8c13d2bb5511734f4cefbaba67d7fe28 Mon Sep 17 00:00:00 2001
From: dolibarr95 <onajid@1blow-services.com>
Date: Mon, 27 Mar 2017 09:19:46 +0200
Subject: [PATCH 0476/1163] Create a trigger for company rib create

---
 .../class/companybankaccount.class.php        | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index ec770d628a0..a30eee1820a 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -130,7 +130,9 @@ class CompanyBankAccount extends Account
      */
     function update(User $user = null, $notrigger = 0)
     {
-    	global $conf;
+	    global $conf;
+	    $error = 0;
+	   
 
         if (! $this->id)
         {
@@ -167,7 +169,28 @@ class CompanyBankAccount extends Account
         $result = $this->db->query($sql);
         if ($result)
         {
-            return 1;
+		
+		
+		if (! $notrigger)
+		{
+			// Call trigger
+			$result=$this->call_trigger('COMPANY_RIB_UPDATE',$user);
+			if ($result < 0) $error++;
+			// End call triggers
+			if(! $error )
+			{
+				return 1;
+			}
+			else
+			{
+				return 0;
+			}
+		}
+		else
+		{
+			return 1;
+		}
+		
         }
         else
         {

From 17e52799075d6ac852d1e27c54c8a53f180fdaa3 Mon Sep 17 00:00:00 2001
From: dolibarr95 <onajid@1blow-services.com>
Date: Mon, 27 Mar 2017 14:00:05 +0200
Subject: [PATCH 0477/1163]  Create a trigger for company rib delete

---
 .../class/companybankaccount.class.php        | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index ec770d628a0..64205c62363 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -235,22 +235,45 @@ class CompanyBankAccount extends Account
     /**
      *  Delete a rib from database
      *
-     *	@param	User	$user	User deleting
-     *  @return int         	<0 if KO, >0 if OK
+     *	@param		User		$user		User deleting
+     *	@param  	int		$notrigger	1=Disable triggers
+     *  @return		int		<0 if KO, >0 if OK
      */
-    function delete(User $user = null)
+    function delete(User $user = null, $notrigger=0)
     {
         global $conf;
-
+	$error = 0;
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib";
         $sql.= " WHERE rowid  = ".$this->id;
-
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $result = $this->db->query($sql);
-        if ($result) {
-            return 1;
+        if ($result)
+	{
+
+		if (! $notrigger)
+		{
+			// Call trigger
+			$result=$this->call_trigger('COMPANY_RIB_CREATE',$user);
+			if ($result < 0) $error++;
+			// End call triggers
+			
+			if(! $error )
+			{
+				return 1;
+			}
+			else
+			{
+				return -1;
+			}
+		}
+		else
+		{
+			return 1;
+		}
+	
         }
-        else {
+        else
+	{
             dol_print_error($this->db);
             return -1;
         }

From 6ee1c79f6f20e1d9b538ad2711eb8f0d1a6ed585 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Mon, 27 Mar 2017 18:26:24 +0200
Subject: [PATCH 0478/1163] SOCIETE_ADD_REF_IN_LIST more display case GetNomUrl

0 = only socname (usual)
1 = socname and code_customer and supplier (like before)
2 = only code customer
3 = only code supplier
---
 htdocs/societe/class/societe.class.php | 33 +++++++++++++++++---------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ed3fdad13c4..36f9e8c609b 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1838,18 +1838,29 @@ class Societe extends CommonObject
 
         $name=$this->name?$this->name:$this->nom;
 
-		if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
-		{
-			if (($this->client) && (! empty ( $this->code_client ))) {
-				$code = $this->code_client . ' - ';
-			}
-			if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))) {
-				$code .= $this->code_fournisseur . ' - ';
-			}
-			$name =$code.' '.$name;
-		}
+	if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
+	{
+		if (($this->client) && (! empty ( $this->code_client ))
+			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
+			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
+			)
+		) 
+			$code = $this->code_client . ' - ';
 
-	    if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
+		if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
+			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
+			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
+			)
+		) 
+			$code .= $this->code_fournisseur . ' - ';
+
+		if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
+			$name =$code.' '.$name;
+		else
+			$name =$code;
+	}
+
+	if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
 
         $result=''; $label='';
         $linkstart=''; $linkend='';

From 219bcb0d54f5c1b332d9df453c1b50e441e88599 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Mar 2017 22:44:50 +0200
Subject: [PATCH 0479/1163] Work on 6.0 features.

---
 htdocs/admin/modules.php                      | 67 +++++++------
 ...nLog.class.php => modBlockedLog.class.php} | 17 ++--
 htdocs/core/modules/modFacture.class.php      |  5 +-
 htdocs/langs/en_US/admin.lang                 |  1 +
 htdocs/product/admin/dynamic_prices.php       | 88 ++++++++++--------
 htdocs/product/dynamic_price/editor.php       | 20 ++--
 htdocs/product/stock/mouvement.php            | 93 ++++++++++---------
 htdocs/theme/eldy/style.css.php               | 13 +--
 8 files changed, 163 insertions(+), 141 deletions(-)
 rename htdocs/core/modules/{modBlockChainLog.class.php => modBlockedLog.class.php} (86%)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 52b250e8cf0..bfaeabf67d4 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -471,12 +471,10 @@ if ($mode == 'common')
 
     if (! empty($moreforfilter))
     {
-        //print '<div class="liste_titre liste_titre_bydiv centpercent">';
         print $moreforfilter;
         $parameters=array();
         $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
-        //print '</div>';
     }
     
     
@@ -485,8 +483,6 @@ if ($mode == 'common')
     $moreforfilter='';
     
     // Show list of modules
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" summary="list_of_modules" id="list_of_modules" >'."\n";
 
     $oldfamily='';
 
@@ -570,14 +566,15 @@ if ($mode == 'common')
         // Print a separator if we change family
         if ($familykey!=$oldfamily)
         {
-            print '<tr class="liste_titre">'."\n";
-            print '<td colspan="5">';
+        	if ($oldfamily) print '</table></div><br>';
+        	
             $familytext=empty($familyinfo[$familykey]['label'])?$familykey:$familyinfo[$familykey]['label'];
-            print $familytext;
-            print "</td>\n";
-    		print '<td colspan="2" align="right">'.$langs->trans("SetupShort").'</td>'."\n";
-            print "</tr>\n";
-            $atleastoneforfamily=0;
+            print_fiche_titre($familytext, '', '');
+    		
+            print '<div class="div-table-responsive">';
+        	print '<table class="tagtable liste" summary="list_of_modules">'."\n";
+            
+        	$atleastoneforfamily=0;
         }
 
         $atleastoneforfamily++;
@@ -606,43 +603,38 @@ if ($mode == 'common')
             $imginfo="info_black";
         }
         
-        print '<tr '.$bc[$var].">\n";
+        print '<tr>'."\n";
 
-        // Picto
-        print '  <td valign="top" width="14" align="center">';
+        // Picto + Name of module
+        print '  <td width="200px">';
         $alttext='';
         //if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version);
         //if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);
         if (! empty($objMod->picto))
         {
         	if (preg_match('/^\//i',$objMod->picto)) print img_picto($alttext,$objMod->picto,' width="14px"',1);
-        	else print img_object($alttext,$objMod->picto,' width="14px"');
+        	else print img_object($alttext, $objMod->picto, 'class="valignmiddle" width="14px"');
         }
         else
         {
-        	print img_object($alttext,'generic');
+        	print img_object($alttext, 'generic', 'class="valignmiddle"');
         }
-        print '</td>';
-
-        // Name
-        print '<td class="tdtop">'.$objMod->getName();
+        print ' <span class="valignmiddle">'.$objMod->getName().'</span>';
         print "</td>\n";
 
         // Desc
-        print '<td class="tdtop">';
+        print '<td class="valignmiddle tdoverflowmax300">';
         print nl2br($objMod->getDesc());
         print "</td>\n";
 
         // Help
-        print '<td align="center" valign="top" class="nowrap" style="width: 82px;">';
-        
+        print '<td class="center nowrap" style="width: 82px;">';
         //print $form->textwithpicto('', $text, 1, $imginfo, 'minheight20', 0, 2, 1);
         print '<a href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$objMod->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'</a>';
-        
         print '</td>';
 
         // Version
-        print '<td align="center" valign="top" class="nowrap">';
+        print '<td class="center nowrap" width="120px">';
         print $versiontrans;
         print "</td>\n";
 
@@ -651,8 +643,12 @@ if ($mode == 'common')
         {
         	$disableSetup = 0;
 
-        	print '<td align="center" valign="middle">';
-            if (! empty($objMod->disabled))
+        	print '<td class="center valignmiddle" width="80px">';
+        	if (! empty($arrayofwarnings[$modName]))
+	        {
+                print '<!-- This module has a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";
+	        }
+	        if (! empty($objMod->disabled))
         	{
         		print $langs->trans("Disabled");
         	}
@@ -674,7 +670,7 @@ if ($mode == 'common')
         	{
         		if (is_array($objMod->config_page_url))
         		{
-        			print '<td class="tdsetuppicto" align="right" valign="top">';
+        			print '<td class="tdsetuppicto right" width="40px"">';
         			$i=0;
         			foreach ($objMod->config_page_url as $page)
         			{
@@ -700,22 +696,22 @@ if ($mode == 'common')
         		}
         		else if (preg_match('/^([^@]+)@([^@]+)$/i',$objMod->config_page_url,$regs))
         		{
-        			print '<td class="tdsetuppicto" align="right" valign="middle"><a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
+        			print '<td class="tdsetuppicto right valignmiddle" width="80px"><a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
         		}
         		else
         		{
-        			print '<td class="tdsetuppicto" align="right" valign="middle"><a href="'.$objMod->config_page_url.'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
+        			print '<td class="tdsetuppicto right valignmiddle" width="80px"><a href="'.$objMod->config_page_url.'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
         		}
         	}
         	else
         	{
-        		print '<td class="tdsetuppicto" align="right" valign="middle">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
+        		print '<td class="tdsetuppicto right valignmiddle" width="80px">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
         	}
 
         }
         else	// Module not yet activated
 		{
-        	print '<td align="center" valign="middle">';
+        	print '<td class="center valignmiddle" width="80px">';
 		    if (! empty($objMod->always_enabled))
         	{
         		// Should never happened
@@ -754,17 +750,20 @@ if ($mode == 'common')
 	        	    }
 	        	}
         	    print '<!-- Message to show: '.$warningmessage.' -->'."\n";
-	        	print '<a class="reposition" href="modules.php?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '">';
+	        	print '<a class="reposition" href="modules.php?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '"';
+	        	if ($warningmessage) print ' onclick="return confirm(\''.dol_escape_js($warningmessage).'\');"';
+	        	print '>';
 	        	print img_picto($langs->trans("Disabled"),'switch_off');
 	        	print "</a>\n";
         	}
         	print "</td>\n";
-        	print '<td class="tdsetuppicto" align="right" valign="middle">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
+        	print '<td class="tdsetuppicto right valignmiddle" width="80px">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
         }
 
         print "</tr>\n";
 
     }
+    
     print "</table>\n";
     print '</div>';
     
diff --git a/htdocs/core/modules/modBlockChainLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
similarity index 86%
rename from htdocs/core/modules/modBlockChainLog.class.php
rename to htdocs/core/modules/modBlockedLog.class.php
index dbf9cc406e9..30e4734e843 100644
--- a/htdocs/core/modules/modBlockChainLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2013   Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2017   Laurent Destailleur  <eldy@users.sourcefore.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,20 +16,19 @@
  */
 
 /**
- * 	\defgroup   blockchainlog   Module BlockChainLog
+ * 	\defgroup   blockedlog   Module BlockedLog
  *  \brief      Add a log into a block chain for some actions.
- *  \file       htdocs/core/modules/modBlockChainLog.class.php
- *  \ingroup    blockchainlog
- *  \brief      Description and activation file for module BlockChainLog
+ *  \file       htdocs/core/modules/modBlockedLog.class.php
+ *  \ingroup    blockedlog
+ *  \brief      Description and activation file for module BlockedLog
  */
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 /**
  *	Class to describe a Cron module
  */
-class modBlockChainLog extends DolibarrModules
+class modBlockedLog extends DolibarrModules
 {
-
     /**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -47,14 +46,14 @@ class modBlockChainLog extends DolibarrModules
         $this->family = "technic";
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
         $this->name = preg_replace('/^mod/i','',get_class($this));
-        $this->description = "Enable a log of some business events into a non reversible block chain. This module may be mandatory for some countries.";
+        $this->description = "Enable a log on some business events into a reserved log. This module may be mandatory for some countries.";
         $this->version = 'development';                        // 'development', 'experimental' or 'dolibarr' or version
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
         $this->special = 1;
         // Name of image file used for this module.
-        $this->picto='skype';
+        $this->picto='technic';
 
         // Data directories to create when module is enabled
         $this->dirs = array();
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index d6e6bfd2575..8022b21279f 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -64,11 +64,12 @@ class modFacture extends DolibarrModules
 		$this->dirs = array("/facture/temp");
 
 		// Dependencies
-		$this->depends = array('always'=>"modSociete", 'FR'=>'modBlockChainLog');
+		$this->depends = array('always'=>"modSociete", 'FR'=>'modBlockedLog');
 		$this->requiredby = array("modComptabilite","modAccounting");
 		$this->conflictwith = array();
 		$this->langfiles = array("bills","companies","compta","products");
-		$this->warnings_activation = array();                                                             // Warning to show when we activate module. array('always'='text') or array('FR'='text')
+		$this->warnings_activation = array('FR'=>'WarningNoteModuleInvoiceForFrenchLaw');                              // Warning to show when we activate module. array('always'='text') or array('FR'='text')
+		$this->warnings_activation = array();
 		$this->warnings_activation_ext = array('FR'=>'WarningInstallationMayBecomeNotCompliantWithLaw');  // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
 		
 		// Config pages
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b8ba74995a7..3831fb49007 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1663,6 +1663,7 @@ ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for act
 UserHasNoPermissions=This user has no permission defined
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
 BaseCurrency=Reference currency of the company (go into setup of company to change this)
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016). 
 WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module <strong>%s</strong> that is an external module. Activate an external module only if it does not alterate negatively the behavior required by your country laws (%s). If the module bring a non legal feature, you are the only responsible for the use of a non-compliant software.   
 ##### Resource ####
 ResourceSetup=Configuration du module Resource 
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index 7949b47c346..4345ea095ae 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -16,7 +16,7 @@
  */
 
 /**
- *  \file		htdocs/product/admin/expression_globals.php
+ *  \file		htdocs/product/admin/dynamic_prices.php
  *  \ingroup	product
  *  \brief		Page for configuring dynamic prices
  */
@@ -161,16 +161,25 @@ if ($action != 'create_updater' && $action != 'edit_updater') {
     print '<td width="80">&nbsp;</td>'; //Space for buttons
     print '</tr>';
 
-    $var=True;
-    foreach ($price_globals->listGlobalVariables() as $i=>$entry) {
-        $var = !$var;
-        print '<tr '.$bc[$var].'>';
-        print '<td>'.$entry->code.'</td>';
-        print '<td>'.$entry->description.'</td>';
-        print '<td>'.price($entry->value).'</td>';
-        print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_variable&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
-        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_variable&selection='.$entry->id.'">'.img_delete().'</a></td>';
-        print '</tr>';
+    $arrayglobalvars=$price_globals->listGlobalVariables();
+    if (! empty($arrayglobalvars))
+    {
+	    foreach ($arrayglobalvars as $i=>$entry) {
+	        $var = !$var;
+	        print '<tr '.$bc[$var].'>';
+	        print '<td>'.$entry->code.'</td>';
+	        print '<td>'.$entry->description.'</td>';
+	        print '<td>'.price($entry->value).'</td>';
+	        print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_variable&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
+	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_variable&selection='.$entry->id.'">'.img_delete().'</a></td>';
+	        print '</tr>';
+	    }
+    }
+    else
+    {
+    	print '<tr colspan="7"><td class="opacitymedium">';
+    	print $langs->trans("None");
+    	print '</td></tr>';
     }
     print '</table>';
 
@@ -218,16 +227,9 @@ if ($action == 'create_variable' || $action == 'edit_variable') {
     print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
     print '</div>';
     print '</form>';
-} else if ($action != 'create_updater') {
-    //Action Buttons
-    print '<div class="tabsAction">';
-    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_variable">'.$langs->trans("Add").'</a>';
-    print '</div>';
-    //Separator is only need for updaters table is showed after buttons
-    print '<br><br>';
 }
 
-//Updaters table
+// Updaters table
 if ($action != 'create_variable' && $action != 'edit_variable') {
     print $langs->trans("GlobalVariableUpdaters");
     print '<table summary="listofattributes" class="noborder" width="100%">';
@@ -241,26 +243,34 @@ if ($action != 'create_variable' && $action != 'edit_variable') {
     print '<td width="80">&nbsp;</td>'; //Space for buttons
     print '</tr>';
 
-    $var=True;
-    foreach ($price_updaters->listUpdaters() as $i=>$entry) {
-        $code = "";
-        if ($entry->fk_variable > 0) {
-            $res = $price_globals->fetch($entry->fk_variable);
-            if ($res > 0) {
-                $code = $price_globals->code;
-            }
-        }
-        $var = !$var;
-        print '<tr '.$bc[$var].'>';
-        print '<td>'.$code.'</td>';
-        print '<td>'.$entry->description.'</td>';
-        print '<td>'.$langs->trans("GlobalVariableUpdaterType".$entry->type).'</td>';
-        print '<td style="max-width: 250px; word-wrap: break-word; white-space: pre-wrap;">'.$entry->parameters.'</td>';
-        print '<td>'.$entry->update_interval.'</td>';
-        print '<td>'.$entry->getLastUpdated().'</td>';
-        print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_updater&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
-        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_updater&selection='.$entry->id.'">'.img_delete().'</a></td>';
-        print '</tr>';
+    $arraypriceupdaters = $price_updaters->listUpdaters();
+    if (! empty($arraypriceupdaters))
+    {
+	    foreach ($arraypriceupdaters as $i=>$entry) {
+	        $code = "";
+	        if ($entry->fk_variable > 0) {
+	            $res = $price_globals->fetch($entry->fk_variable);
+	            if ($res > 0) {
+	                $code = $price_globals->code;
+	            }
+	        }
+	        print '<tr>';
+	        print '<td>'.$code.'</td>';
+	        print '<td>'.$entry->description.'</td>';
+	        print '<td>'.$langs->trans("GlobalVariableUpdaterType".$entry->type).'</td>';
+	        print '<td style="max-width: 250px; word-wrap: break-word; white-space: pre-wrap;">'.$entry->parameters.'</td>';
+	        print '<td>'.$entry->update_interval.'</td>';
+	        print '<td>'.$entry->getLastUpdated().'</td>';
+	        print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_updater&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
+	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_updater&selection='.$entry->id.'">'.img_delete().'</a></td>';
+	        print '</tr>';
+	    }
+    }
+    else
+    {
+    	print '<tr colspan="7"><td class="opacitymedium">';
+    	print $langs->trans("None");
+    	print '</td></tr>';
     }
     print '</table>';
 
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index 0b93d17749a..055da4a3ad7 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -16,9 +16,9 @@
  */
 
 /**
- *  \file	   htdocs/product/dynamic_price/editor.php
+ *  \file	    htdocs/product/dynamic_price/editor.php
  *  \ingroup	product
- *  \brief	  Page for editing expression
+ *  \brief	    Page for editing expression
  */
 
 require '../../main.inc.php';
@@ -60,6 +60,7 @@ else if ($action != 'delete')
 	$price_expression->fetch($eid);
 }
 
+
 /*
  * Actions
  */
@@ -157,23 +158,28 @@ if ($action == 'delete')
 	}
 }
 
+
 /*
  * View
  */
 
-//Header
-llxHeader("","",$langs->trans("CardProduct".$product->type));
-print load_fiche_titre($langs->trans("PriceExpressionEditor"));
 $form = new Form($db);
 
+llxHeader("","",$langs->trans("CardProduct".$product->type));
+
+print load_fiche_titre($langs->trans("PriceExpressionEditor"));
+
 //Form/Table
 print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;tab='.$tab.'&amp;eid='.$eid.'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value='.($eid == 0 ? 'add' : 'update').'>';
+
+dol_fiche_head();
+
 print '<table class="border" width="100%">';
 
 // Price expression selector
-print '<tr><td class="fieldrequired">'.$langs->trans("PriceExpressionSelected").'</td><td>';
+print '<tr><td class="titlefield fieldrequired">'.$langs->trans("PriceExpressionSelected").'</td><td>';
 $price_expression_list = array(0 => $langs->trans("New")); //Put the new as first option
 foreach ($price_expression->list_price_expression() as $entry) {
 	$price_expression_list[$entry->id] = $entry->title;
@@ -204,6 +210,8 @@ $doleditor->Create();
 print '</td></tr>';
 print '</table>';
 
+dol_fiche_end();
+
 //Buttons
 print '<div class="center">';
 print '<input type="submit" class="butAction" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index d2ba81db86c..a3742dcc00d 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2006	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
  *
@@ -418,7 +418,7 @@ $sql.= " e.label as stock, e.rowid as entrepot_id, e.lieu,";
 $sql.= " m.rowid as mid, m.value as qty, m.datem, m.fk_user_author, m.label, m.inventorycode, m.fk_origin, m.origintype,";
 $sql.= " m.batch,";
 $sql.= " pl.rowid as lotid, pl.eatby, pl.sellby,";
-$sql.= " u.login";
+$sql.= " u.login, u.photo, u.lastname, u.firstname";
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -728,43 +728,8 @@ if ($resql)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
     
-    print "<tr class=\"liste_titre\">";
-    if (! empty($arrayfields['m.rowid']['checked']))            print_liste_field_titre($arrayfields['m.rowid']['label'],$_SERVER["PHP_SELF"],'m.rowid','',$param,'',$sortfield,$sortorder);
-    if (! empty($arrayfields['m.datem']['checked']))            print_liste_field_titre($arrayfields['m.datem']['label'],$_SERVER["PHP_SELF"],'m.datem','',$param,'',$sortfield,$sortorder);
-    if (! empty($arrayfields['p.ref']['checked']))              print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder);
-    if (! empty($arrayfields['p.label']['checked']))            print_liste_field_titre($arrayfields['p.label']['label'],$_SERVER["PHP_SELF"],'p.label','',$param,'',$sortfield,$sortorder);
-    if (! empty($arrayfields['m.batch']['checked']))            print_liste_field_titre($arrayfields['m.batch']['label'],$_SERVER["PHP_SELF"],'m.batch','',$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['pl.eatby']['checked']))           print_liste_field_titre($arrayfields['pl.eatby']['label'],$_SERVER["PHP_SELF"],'pl.eatby','',$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['pl.sellby']['checked']))          print_liste_field_titre($arrayfields['pl.sellby']['label'],$_SERVER["PHP_SELF"],'pl.sellby','',$param,'align="center"',$sortfield,$sortorder);
-    if (! empty($arrayfields['e.label']['checked']))        print_liste_field_titre($arrayfields['e.label']['label'],$_SERVER["PHP_SELF"], "e.label","",$param,"",$sortfield,$sortorder);	// We are on a specific warehouse card, no filter on other should be possible
-    if (! empty($arrayfields['m.fk_user_author']['checked']))   print_liste_field_titre($arrayfields['m.fk_user_author']['label'],$_SERVER["PHP_SELF"], "m.fk_user_author","",$param,"",$sortfield,$sortorder);
-    if (! empty($arrayfields['m.inventorycode']['checked']))    print_liste_field_titre($arrayfields['m.inventorycode']['label'],$_SERVER["PHP_SELF"], "m.inventorycode","",$param,"",$sortfield,$sortorder);
-    if (! empty($arrayfields['m.label']['checked']))            print_liste_field_titre($arrayfields['m.label']['label'],$_SERVER["PHP_SELF"], "m.label","",$param,"",$sortfield,$sortorder);
-    if (! empty($arrayfields['origin']['checked']))             print_liste_field_titre($arrayfields['origin']['label'],$_SERVER["PHP_SELF"], "","",$param,"",$sortfield,$sortorder);
-    if (! empty($arrayfields['m.value']['checked']))            print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"], "m.value","",$param,'align="right"',$sortfield,$sortorder);
-	// Extra fields
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-	   foreach($extrafields->attribute_label as $key => $val) 
-	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
-           {
-				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-           }
-	   }
-	}
-	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
-    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-	if (! empty($arrayfields['m.datec']['checked']))     print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['m.tms']['checked']))       print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-    print "</tr>\n";
-
     // Lignes des champs de filtre
-    print '<tr class="liste_titre">';
+    print '<tr class="liste_titre_filter">';
     if (! empty($arrayfields['m.rowid']['checked'])) 
     {
 	    // Ref
@@ -901,9 +866,44 @@ if ($resql)
     print '</td>';
     print "</tr>\n";
 
+    print '<tr class="liste_titre">';
+    if (! empty($arrayfields['m.rowid']['checked']))            print_liste_field_titre($arrayfields['m.rowid']['label'],$_SERVER["PHP_SELF"],'m.rowid','',$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['m.datem']['checked']))            print_liste_field_titre($arrayfields['m.datem']['label'],$_SERVER["PHP_SELF"],'m.datem','',$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['p.ref']['checked']))              print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['p.label']['checked']))            print_liste_field_titre($arrayfields['p.label']['label'],$_SERVER["PHP_SELF"],'p.label','',$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['m.batch']['checked']))            print_liste_field_titre($arrayfields['m.batch']['label'],$_SERVER["PHP_SELF"],'m.batch','',$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['pl.eatby']['checked']))           print_liste_field_titre($arrayfields['pl.eatby']['label'],$_SERVER["PHP_SELF"],'pl.eatby','',$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['pl.sellby']['checked']))          print_liste_field_titre($arrayfields['pl.sellby']['label'],$_SERVER["PHP_SELF"],'pl.sellby','',$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['e.label']['checked']))        print_liste_field_titre($arrayfields['e.label']['label'],$_SERVER["PHP_SELF"], "e.label","",$param,"",$sortfield,$sortorder);	// We are on a specific warehouse card, no filter on other should be possible
+    if (! empty($arrayfields['m.fk_user_author']['checked']))   print_liste_field_titre($arrayfields['m.fk_user_author']['label'],$_SERVER["PHP_SELF"], "m.fk_user_author","",$param,"",$sortfield,$sortorder);
+    if (! empty($arrayfields['m.inventorycode']['checked']))    print_liste_field_titre($arrayfields['m.inventorycode']['label'],$_SERVER["PHP_SELF"], "m.inventorycode","",$param,"",$sortfield,$sortorder);
+    if (! empty($arrayfields['m.label']['checked']))            print_liste_field_titre($arrayfields['m.label']['label'],$_SERVER["PHP_SELF"], "m.label","",$param,"",$sortfield,$sortorder);
+    if (! empty($arrayfields['origin']['checked']))             print_liste_field_titre($arrayfields['origin']['label'],$_SERVER["PHP_SELF"], "","",$param,"",$sortfield,$sortorder);
+    if (! empty($arrayfields['m.value']['checked']))            print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"], "m.value","",$param,'align="right"',$sortfield,$sortorder);
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	   foreach($extrafields->attribute_label as $key => $val) 
+	   {
+           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           {
+				$align=$extrafields->getAlignFlag($key);
+				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+           }
+	   }
+	}
+	// Hook fields
+	$parameters=array('arrayfields'=>$arrayfields);
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+	if (! empty($arrayfields['m.datec']['checked']))     print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['m.tms']['checked']))       print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+    print "</tr>\n";
+
+
     $arrayofuniqueproduct=array();
 
-    $var=True;
     while ($i < min($num,$limit))
     {
         $objp = $db->fetch_object($resql);
@@ -913,6 +913,7 @@ if ($resql)
         $productstatic->label=$objp->produit;
         $productstatic->type=$objp->type;
         $productstatic->entity=$objp->entity;
+        
         $productlot->id = $objp->lotid;
         $productlot->batch= $objp->batch;
         $productlot->eatby= $objp->eatby;
@@ -929,8 +930,7 @@ if ($resql)
 			$origin = '';
 		}
 
-        $var=!$var;
-        print "<tr ".$bc[$var].">";
+        print "<tr>";
         // Id movement
         if (! empty($arrayfields['m.rowid']['checked']))
         {
@@ -984,10 +984,13 @@ if ($resql)
         // Author
         if (! empty($arrayfields['m.fk_user_author']['checked']))
         {
-	        print '<td>';
+	        print '<td class="tdoverflowmax100">';
 	        $userstatic->id=$objp->fk_user_author;
-	        $userstatic->lastname=$objp->login;
-	        print $userstatic->getNomUrl(1);
+	        $userstatic->login=$objp->login;
+	        $userstatic->lastname=$objp->lastname;
+	        $userstatic->firstname=$objp->firstname;
+	        $userstatic->photo=$objp->photo;
+	        print $userstatic->getNomUrl(-1);
 	        print "</td>\n";
         }
         if (! empty($arrayfields['m.inventorycode']['checked']))
@@ -998,7 +1001,7 @@ if ($resql)
         if (! empty($arrayfields['m.label']['checked']))
         {
             // Label of movement
-        	print '<td>'.$objp->label.'</td>';
+        	print '<td class="tdoverflowmax100aaa">'.$objp->label.'</td>';
         }
         if (! empty($arrayfields['origin']['checked']))
         {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c8c0dda380b..babc2a190e2 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -272,18 +272,19 @@ input.select2-input {
 .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
+input, input.flat, form.flat select, select, select.flat, .dataTables_length label select {
+	<?php if (empty($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)) 
+		print "border: none;" 
+	?>
+}
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
     font-size: <?php print $fontsize ?>px;
     font-family: <?php print $fontlist ?>;
-
-<?php if(empty($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)) 
-	print "border: none;" 
-?>
-    
-    border-bottom: solid 1px rgba(0,0,0,.2);
     outline: none;
     margin: 0px 0px 0px 0px;
+    border-bottom: solid 1px rgba(0,0,0,.2);
 }
+
 input {
     line-height: 17px;
 	padding: 4px;

From fc2b9a858b0e518b4088698c08b30faddbdd665c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Tue, 28 Mar 2017 06:35:03 +0200
Subject: [PATCH 0480/1163] New : [FP17] Add multijournals in accountancy admin

---
 htdocs/accountancy/admin/journals.php         | 170 ++++++
 htdocs/accountancy/admin/journals_card.php    | 296 ++++++++++
 .../class/accountingjournal.class.php         | 525 ++++++++++++++++++
 htdocs/core/lib/accounting.lib.php            |   4 +-
 htdocs/install/mysql/data/llx_accounting.sql  |   2 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   3 +-
 .../mysql/tables/llx_accounting_journal.sql   |   2 +-
 htdocs/langs/en_US/accountancy.lang           |   8 +
 8 files changed, 1004 insertions(+), 6 deletions(-)
 create mode 100644 htdocs/accountancy/admin/journals.php
 create mode 100644 htdocs/accountancy/admin/journals_card.php
 create mode 100644 htdocs/accountancy/class/accountingjournal.class.php

diff --git a/htdocs/accountancy/admin/journals.php b/htdocs/accountancy/admin/journals.php
new file mode 100644
index 00000000000..72f81dc90ba
--- /dev/null
+++ b/htdocs/accountancy/admin/journals.php
@@ -0,0 +1,170 @@
+<?php
+/* Copyright (C) 2017		Alexandre Spangaro   <aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file		htdocs/accountancy/admin/journals.php
+ * \ingroup		Advanced accountancy
+ * \brief		Setup page to configure journals
+ */
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+
+$action = GETPOST('action');
+
+// Load variable for pagination
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="j.rowid"; // Set here default search field
+if (! $sortorder) $sortorder="ASC";
+
+$langs->load("admin");
+$langs->load("compta");
+$langs->load("accountancy");
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+if (! $user->rights->accounting->fiscalyear)              // If we can read accounting records, we shoul be able to see fiscal year.
+    accessforbidden();
+	
+$error = 0;
+
+// List of status
+/*
+static $tmptype2label = array (
+		'0' => 'AccountingJournalTypeVariousOperation',
+		'1' => 'AccountingJournalTypeSale',
+		'2' => 'AccountingJournalTypePurchase',
+		'3' => 'AccountingJournalTypeBank',
+		'9' => 'AccountingJournalTypeHasNew'
+);
+$type2label = array (
+		'' 
+);
+foreach ( $tmptype2label as $key => $val )
+	$type2label[$key] = $langs->trans($val);
+*/
+
+$errors = array ();
+
+$object = new AccountingJournal($db);
+
+
+/*
+ * Actions
+ */
+
+
+
+/*
+ * View
+ */
+$title = $langs->trans('AccountingJournals');
+$helpurl = "";
+llxHeader('', $title, $helpurl);
+
+$max = 100;
+$form = new Form($db);
+
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
+print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
+
+$head = admin_accounting_prepare_head(null);
+
+dol_fiche_head($head, 'journal', $langs->trans("Configuration"), 0, 'cron');
+
+$sql = "SELECT j.rowid, j.code, j.label, j.nature, j.active";
+$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_journal as j";
+// $sql .= " WHERE j.entity = " . $conf->entity;
+$sql.=$db->order($sortfield,$sortorder);
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}
+
+$sql.= $db->plimit($limit+1, $offset);
+
+$result = $db->query($sql);
+if ($result) {
+	$var = false;
+	$num = $db->num_rows($result);
+
+	$i = 0;
+
+	// $title = $langs->trans('AccountingJournals');
+	// print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit, 1);
+
+	// Load attribute_label
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	// print '<td>' . $langs->trans("Ref") . '</td>';
+	print '<td>' . $langs->trans("Code") . '</td>';
+	print '<td>' . $langs->trans("Label") . '</td>';
+	print '<td>' . $langs->trans("Nature") . '</td>';
+	print '</tr>';
+
+	if ($num) {
+		$accountingjournalstatic = new AccountingJournal($db);
+
+		while ( $i < $num && $i < $max ) {
+			$obj = $db->fetch_object($result);
+			$accountingjournalstatic->id = $obj->rowid;
+			print '<tr ' . $bc[$var] . '>';
+			print '<td><a href="journals_card.php?id=' . $obj->rowid . '">' . img_object($langs->trans("ShowJournal"), "technic") . ' ' . $obj->code . '</a></td>';
+			print '<td align="left">' . $obj->label . '</td>';
+			print '<td>' . $accountingjournalstatic->LibType($obj->nature, 0) . '</td>';
+			print '</tr>';
+			$var = ! $var;
+			$i ++;
+		}
+	} else {
+		print '<tr ' . $bc[$var] . '><td colspan="3" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
+	}
+	print '</table>';
+} else {
+	dol_print_error($db);
+}
+
+dol_fiche_end();
+
+// Buttons
+print '<div class="tabsAction">';
+if (! empty($user->rights->accounting->fiscalyear))
+{
+    print '<a class="butAction" href="journals_card.php?action=create">' . $langs->trans("NewAccountingJournal") . '</a>';
+}
+else
+{
+    print '<a class="butActionRefused" href="#">' . $langs->trans("NewAccountingJournal") . '</a>';
+}
+print '</div>';
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/admin/journals_card.php b/htdocs/accountancy/admin/journals_card.php
new file mode 100644
index 00000000000..c9c45f9a4e5
--- /dev/null
+++ b/htdocs/accountancy/admin/journals_card.php
@@ -0,0 +1,296 @@
+<?php
+/* Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file        htdocs/accountancy/admin/journals_card.php
+ * \ingroup     Advanced accountancy
+ * \brief       Page to show an accounting journal
+ */
+require '../../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+
+$langs->load("admin");
+$langs->load("compta");
+$langs->load("accountancy");
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+if (empty($user->rights->accounting->fiscalyear))
+	accessforbidden();
+
+$error = 0;
+
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$id = GETPOST('id', 'int');
+
+// List of status
+static $tmptype2label = array (
+		'0' => 'AccountingJournalTypeVariousOperation',
+		'1' => 'AccountingJournalTypeSale',
+		'2' => 'AccountingJournalTypePurchase',
+		'3' => 'AccountingJournalTypeBank',
+		'9' => 'AccountingJournalTypeHasNew'
+);
+$type2label = array (
+		'' 
+);
+foreach ( $tmptype2label as $key => $val )
+	$type2label[$key] = $langs->trans($val);
+
+$object = new AccountingJournal($db);
+
+/*
+ * Actions
+ */
+
+if ($action == 'confirm_delete' && $confirm == "yes") {
+	$result = $object->delete($id);
+	if ($result >= 0) {
+		header("Location: journals.php");
+		exit();
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+} 
+
+else if ($action == 'add') {
+	if (! GETPOST('cancel', 'alpha')) {
+		$error = 0;
+
+		$object->code = GETPOST('code', 'alpha');
+		$object->label = GETPOST('label', 'alpha');
+		$object->nature = GETPOST('nature', 'int');
+
+		if (empty($object->code)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Code")), null, 'errors');
+			$error ++;
+		}
+		if (empty($object->label)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			$error ++;
+		}
+
+		if (! $error) {
+			$db->begin();
+
+			$id = $object->create($user);
+
+			if ($id > 0) {
+				$db->commit();
+
+				header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+				exit();
+			} else {
+				$db->rollback();
+
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = 'create';
+			}
+		} else {
+			$action = 'create';
+		}
+	} else {
+		header("Location: ./journals.php");
+		exit();
+	}
+} 
+
+// Update record
+else if ($action == 'update') {
+	if (! GETPOST('cancel', 'alpha')) {
+		$result = $object->fetch($id);
+
+		$object->code = GETPOST('code', 'alpha');
+		$object->label = GETPOST('label', 'alpha');
+		$object->nature = GETPOST('nature', 'int');
+
+		$result = $object->update($user);
+		
+		if ($result > 0) {
+			header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+			exit();
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} else {
+		header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+		exit();
+	}
+}
+
+
+
+/*
+ * View
+ */
+
+$title = $langs->trans("Journal") . " - " . $langs->trans("Card");
+$helpurl = "";
+llxHeader("",$title,$helpurl);
+
+$form = new Form($db);
+
+if ($action == 'create') 
+{
+	print load_fiche_titre($langs->trans("NewAccountingJournal"));
+
+	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+	print '<input type="hidden" name="action" value="add">';
+
+	dol_fiche_head();
+
+	print '<table class="border" width="100%">';
+
+	// Code
+	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans("Code") . '</td><td><input name="code" size="32" value="' . GETPOST("code") . '"></td></tr>';
+
+
+	// Label
+	print '<tr><td class="fieldrequired">' . $langs->trans("Label") . '</td><td><input name="label" size="128" value="' . GETPOST("label") . '"></td></tr>';
+
+	// Nature
+	print '<tr>';
+	print '<td class="fieldrequired">' . $langs->trans("Status") . '</td>';
+	print '<td class="valeur">';
+	print $form->selectarray('nature', $type2label, GETPOST('nature'));
+	print '</td></tr>';
+	
+	print '</table>';
+
+	dol_fiche_end();
+
+	print '<div class="center">';
+	print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
+	print '</div>';
+
+	print '</form>';
+} else if ($id) {
+	$result = $object->fetch($id);
+	if ($result > 0) {
+		$head = fiscalyear_prepare_head($object);
+
+		if ($action == 'edit') {
+			dol_fiche_head($head, 'card', $langs->trans("Fiscalyear"), 0, 'cron');
+
+			print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
+			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+			print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="id" value="' . $id . '">';
+
+			print '<table class="border" width="100%">';
+
+			// Ref
+			print "<tr>";
+			print '<td class="titlefieldcreate titlefield">' . $langs->trans("Ref") . '</td><td>';
+			print $object->ref;
+			print '</td></tr>';
+
+			// Label
+			print '<tr><td class="fieldrequired">' . $langs->trans("Label") . '</td><td>';
+			print '<input name="label" class="flat" size="32" value="' . $object->label . '">';
+			print '</td></tr>';
+
+			// Date start
+			print '<tr><td class="fieldrequired">' . $langs->trans("DateStart") . '</td><td>';
+			print $form->select_date($object->date_start ? $object->date_start : - 1, 'fiscalyear');
+			print '</td></tr>';
+
+			// Date end
+			print '<tr><td class="fieldrequired">' . $langs->trans("DateEnd") . '</td><td>';
+			print $form->select_date($object->date_end ? $object->date_end : - 1, 'fiscalyearend');
+			print '</td></tr>';
+
+			// Nature
+			print '<tr><td>' . $langs->trans("Type") . '</td><td>';
+			// print $form->selectarray('statut', $statut2label, $object->statut);
+			print $object->getLibStatut(4);
+			print '</td></tr>';
+
+			print '</table>';
+
+			print '<br><div class="center">';
+			print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
+			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+			print '<input type="submit" name="cancel" class="button" value="' . $langs->trans("Cancel") . '">';
+			print '</div>';
+
+			print '</form>';
+
+			dol_fiche_end();
+		} else {
+			/*
+			 * Confirm delete
+			 */
+			if ($action == 'delete') {
+				print $form->formconfirm($_SERVER["PHP_SELF"] . "?id=" . $id, $langs->trans("DeleteFiscalYear"), $langs->trans("ConfirmDeleteFiscalYear"), "confirm_delete");
+			}
+
+			dol_fiche_head($head, 'card', $langs->trans("Fiscalyear"), 0, 'cron');
+
+			print '<table class="border" width="100%">';
+
+			$linkback = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/fiscalyear.php">' . $langs->trans("BackToList") . '</a>';
+
+			// Ref
+			print '<tr><td class="titlefield">' . $langs->trans("Ref") . '</td><td width="50%">';
+			print $object->ref;
+			print '</td><td>';
+			print $linkback;
+			print '</td></tr>';
+
+			// Label
+			print '<tr><td class="tdtop">';
+			print $form->editfieldkey("Label", 'label', $object->label, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'alpha:32');
+			print '</td><td colspan="2">';
+			print $form->editfieldval("Label", 'label', $object->label, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'alpha:32');
+			print "</td></tr>";
+
+			// Nature
+			print '<tr><td>' . $langs->trans("Type") . '</td><td>' . $object->getLibType(0) . '</td></tr>';
+
+			print "</table>";
+
+			dol_fiche_end();
+
+			if (! empty($user->rights->accounting->fiscalyear))
+			{
+    			/*
+    			 * Barre d'actions
+    			 */
+    			print '<div class="tabsAction">';
+
+    			print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&id=' . $id . '">' . $langs->trans('Modify') . '</a>';
+    
+    			// print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
+			
+    			print '</div>';
+			}
+		}
+	} else {
+		dol_print_error($db);
+	}
+}
+
+llxFooter();
+$db->close();
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
new file mode 100644
index 00000000000..7b34c4171d8
--- /dev/null
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -0,0 +1,525 @@
+<?php
+/* Copyright (C) 2017		Alexandre Spangaro   <aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/class/accountingjournal.class.php
+ * \ingroup		Advanced accountancy
+ * \brief		File of class to manage accounting journals
+ */
+
+/**
+ * Class to manage accounting accounts
+ */
+class AccountingJournal extends CommonObject
+{
+	var $db;
+	var $error;
+	var $errors;
+	var $id;
+	var $rowid;
+	var $datec; // Creation date
+	var $fk_pcg_version;
+	var $pcg_type;
+	var $pcg_subtype;
+	var $account_number;
+	var $account_parent;
+	var $account_category;
+	var $label;
+	var $fk_user_author;
+	var $fk_user_modif;
+	var $active;       // duplicate with status
+	var $status;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handle
+	 */
+	function __construct($db) {
+		$this->db = $db;
+	}
+	
+	/**
+	 * Load record in memory
+	 *
+	 * @param 	int 	$rowid 				   Id
+	 * @param 	string 	$account_number 	   Account number
+	 * @param 	int 	$limittocurrentchart   1=Do not load record if it is into another accounting system
+	 * @return 	int                            <0 if KO, Id of record if OK and found
+	 */
+	function fetch($rowid = null, $account_number = null, $limittocurrentchart = 0) {
+		global $conf;
+		
+		if ($rowid || $account_number) {
+			$sql  = "SELECT a.rowid as rowid, a.datec, a.tms, a.fk_pcg_version, a.pcg_type, a.pcg_subtype, a.account_number, a.account_parent, a.label, a.fk_accounting_category, a.fk_user_author, a.fk_user_modif, a.active";
+			$sql .= ", ca.label as category_label";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as a";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_accounting_category as ca ON a.fk_accounting_category = ca.rowid";
+			$sql .= " WHERE";
+			if ($rowid) {
+				$sql .= " a.rowid = '" . $rowid . "'";
+			} elseif ($account_number) {
+				$sql .= " a.account_number = '" . $account_number . "'";
+			}
+			if (! empty($limittocurrentchart)) {
+				$sql .= ' AND a.fk_pcg_version IN (SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
+			}
+
+			dol_syslog(get_class($this) . "::fetch sql=" . $sql, LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$obj = $this->db->fetch_object($result);
+				
+				if ($obj) {
+					$this->id = $obj->rowid;
+					$this->rowid = $obj->rowid;
+					$this->datec = $obj->datec;
+					$this->tms = $obj->tms;
+					$this->fk_pcg_version = $obj->fk_pcg_version;
+					$this->pcg_type = $obj->pcg_type;
+					$this->pcg_subtype = $obj->pcg_subtype;
+					$this->account_number = $obj->account_number;
+					$this->account_parent = $obj->account_parent;
+					$this->label = $obj->label;
+					$this->account_category = $obj->fk_accounting_category;
+					$this->account_category_label = $obj->category_label;
+					$this->fk_user_author = $obj->fk_user_author;
+					$this->fk_user_modif = $obj->fk_user_modif;
+					$this->active = $obj->active;
+					$this->status = $obj->active;
+					
+					return $this->id;
+				} else {
+					return 0;
+				}
+			} else {
+				$this->error = "Error " . $this->db->lasterror();
+				$this->errors[] = "Error " . $this->db->lasterror();
+			}
+		}
+		return - 1;
+	}
+	
+	/**
+	 * Insert new accounting account in chart of accounts
+	 *
+	 * @param User $user Use making action
+	 * @param int $notrigger Disable triggers
+	 * @return int <0 if KO, >0 if OK
+	 */
+	function create($user, $notrigger = 0) {
+		global $conf;
+		$error = 0;
+		$now = dol_now();
+		
+		// Clean parameters
+		if (isset($this->fk_pcg_version))
+			$this->fk_pcg_version = trim($this->fk_pcg_version);
+		if (isset($this->pcg_type))
+			$this->pcg_type = trim($this->pcg_type);
+		if (isset($this->pcg_subtype))
+			$this->pcg_subtype = trim($this->pcg_subtype);
+		if (isset($this->account_number))
+			$this->account_number = trim($this->account_number);
+		if (isset($this->account_parent))
+			$this->account_parent = trim($this->account_parent);
+		if (isset($this->label))
+			$this->label = trim($this->label);
+		if (isset($this->account_category))
+			$this->account_category = trim($this->account_category);
+		if (isset($this->fk_user_author))
+			$this->fk_user_author = trim($this->fk_user_author);
+		if (isset($this->active))
+			$this->active = trim($this->active);
+			
+		if (empty($this->pcg_type) || $this->pcg_type == '-1')
+		{
+		    $this->pcg_type = 'XXXXXX';
+		}
+		if (empty($this->pcg_subtype) || $this->pcg_subtype == '-1')
+		{
+		    $this->pcg_subtype = 'XXXXXX';
+		}
+		// Check parameters
+		// Put here code to add control on parameters values
+			
+		// Insert request
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_account(";
+		$sql .= "datec";
+		$sql .= ", entity";
+		$sql .= ", fk_pcg_version";
+		$sql .= ", pcg_type";
+		$sql .= ", pcg_subtype";
+		$sql .= ", account_number";
+		$sql .= ", account_parent";
+		$sql .= ", label";
+		$sql .= ", fk_accounting_category";
+		$sql .= ", fk_user_author";
+		$sql .= ", active";
+		$sql .= ") VALUES (";
+		$sql .= " '" . $this->db->idate($now) . "'";
+		$sql .= ", " . $conf->entity;
+		$sql .= ", " . (empty($this->fk_pcg_version) ? 'NULL' : "'" . $this->db->escape($this->fk_pcg_version) . "'");
+		$sql .= ", " . (empty($this->pcg_type) ? 'NULL' : "'" . $this->db->escape($this->pcg_type) . "'");
+		$sql .= ", " . (empty($this->pcg_subtype) ? 'NULL' : "'" . $this->pcg_subtype . "'");
+		$sql .= ", " . (empty($this->account_number) ? 'NULL' : "'" . $this->account_number . "'");
+		$sql .= ", " . (empty($this->account_parent) ? 'NULL' : "'" . $this->db->escape($this->account_parent) . "'");
+		$sql .= ", " . (empty($this->label) ? 'NULL' : "'" . $this->db->escape($this->label) . "'");
+		$sql .= ", " . (empty($this->account_category) ? 'NULL' : "'" . $this->db->escape($this->account_category) . "'");
+		$sql .= ", " . $user->id;
+		$sql .= ", " . (! isset($this->active) ? 'NULL' : $this->db->escape($this->active));
+		$sql .= ")";
+		
+		$this->db->begin();
+		
+		dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error ++;
+			$this->errors[] = "Error " . $this->db->lasterror();
+		}
+		
+		if (! $error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_account");
+			
+			// if (! $notrigger) {
+			// Uncomment this and change MYOBJECT to your own tag if you
+			// want this action calls a trigger.
+			
+			// // Call triggers
+			// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+			// $interface=new Interfaces($this->db);
+			// $result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+			// if ($result < 0) { $error++; $this->errors=$interface->errors; }
+			// // End call triggers
+			// }
+		}
+		
+		// Commit or rollback
+		if ($error) {
+			foreach ( $this->errors as $errmsg ) {
+				dol_syslog(get_class($this) . "::create " . $errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
+	
+	/**
+	 * Update record
+	 *
+	 * @param  User $user      Use making update
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	function update($user) 
+	{
+	    // Check parameters
+	    if (empty($this->pcg_type) || $this->pcg_type == '-1')
+	    {
+	        $this->pcg_type = 'XXXXXX';
+	    }
+	    if (empty($this->pcg_subtype) || $this->pcg_subtype == '-1')
+	    {
+	        $this->pcg_subtype = 'XXXXXX';
+	    }
+	     
+	    $this->db->begin();
+		
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
+		$sql .= " SET fk_pcg_version = " . ($this->fk_pcg_version ? "'" . $this->db->escape($this->fk_pcg_version) . "'" : "null");
+		$sql .= " , pcg_type = " . ($this->pcg_type ? "'" . $this->db->escape($this->pcg_type) . "'" : "null");
+		$sql .= " , pcg_subtype = " . ($this->pcg_subtype ? "'" . $this->db->escape($this->pcg_subtype) . "'" : "null");
+		$sql .= " , account_number = '" . $this->account_number . "'";
+		$sql .= " , account_parent = '" . $this->account_parent . "'";
+		$sql .= " , label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "null");
+		$sql .= " , fk_accounting_category = '" . $this->account_category . "'";
+		$sql .= " , fk_user_modif = " . $user->id;
+		$sql .= " , active = '" . $this->active . "'";
+		$sql .= " WHERE rowid = " . $this->id;
+		
+		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return - 1;
+		}
+	}
+	
+	/**
+	 * Check usage of accounting code
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	function checkUsage() {
+		global $langs;
+		
+		$sql = "(SELECT fk_code_ventilation FROM " . MAIN_DB_PREFIX . "facturedet";
+		$sql .= " WHERE  fk_code_ventilation=" . $this->id . ")";
+		$sql .= "UNION";
+		$sql .= "(SELECT fk_code_ventilation FROM " . MAIN_DB_PREFIX . "facture_fourn_det";
+		$sql .= " WHERE  fk_code_ventilation=" . $this->id . ")";
+		
+		dol_syslog(get_class($this) . "::checkUsage sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			if ($num > 0) {
+				$this->error = $langs->trans('ErrorAccountancyCodeIsAlreadyUse');
+				return 0;
+			} else {
+				return 1;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return - 1;
+		}
+	}
+	
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user User that deletes
+	 * @param int $notrigger 0=triggers after, 1=disable triggers
+	 * @return int <0 if KO, >0 if OK
+	 */
+	function delete($user, $notrigger = 0) {
+		$error = 0;
+		
+		$result = $this->checkUsage();
+		
+		if ($result > 0) {
+			
+			$this->db->begin();
+			
+			// if (! $error) {
+			// if (! $notrigger) {
+			// Uncomment this and change MYOBJECT to your own tag if you
+			// want this action calls a trigger.
+			
+			// // Call triggers
+			// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+			// $interface=new Interfaces($this->db);
+			// $result=$interface->run_triggers('ACCOUNTANCY_ACCOUNT_DELETE',$this,$user,$langs,$conf);
+			// if ($result < 0) { $error++; $this->errors=$interface->errors; }
+			// // End call triggers
+			// }
+			// }
+			
+			if (! $error) {
+				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accounting_account";
+				$sql .= " WHERE rowid=" . $this->id;
+				
+				dol_syslog(get_class($this) . "::delete sql=" . $sql);
+				$resql = $this->db->query($sql);
+				if (! $resql) {
+					$error ++;
+					$this->errors[] = "Error " . $this->db->lasterror();
+				}
+			}
+			
+			// Commit or rollback
+			if ($error) {
+				foreach ( $this->errors as $errmsg ) {
+					dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
+					$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+				}
+				$this->db->rollback();
+				return - 1 * $error;
+			} else {
+				$this->db->commit();
+				return 1;
+			}
+		} else {
+			return - 1;
+		}
+	}
+	
+	/**
+	 * Return clicable name (with picto eventually)
+	 *
+	 * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
+	 * @return string Chaine avec URL
+	 */
+	function getNomUrl($withpicto = 0) {
+		global $langs;
+
+		$result = '';
+
+		$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id . '">';
+		$linkend = '</a>';
+
+		$picto = 'billr';
+
+		$label = $langs->trans("Show") . ': ' . $this->account_number . ' - ' . $this->label;
+
+		if ($withpicto)
+			$result .= ($link . img_object($label, $picto) . $linkend);
+		if ($withpicto && $withpicto != 2)
+			$result .= ' ';
+		if ($withpicto != 2)
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+			$result .= $link . length_accountg($this->account_number) . ' - ' . $this->label . $linkend;
+		return $result;
+	}
+	
+	/**
+	 * Information on record
+	 *
+	 * @param int $id of record
+	 * @return void
+	 */
+	function info($id) {
+		$sql = 'SELECT a.rowid, a.datec, a.fk_user_author, a.fk_user_modif, a.tms';
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'accounting_account as a';
+		$sql .= ' WHERE a.rowid = ' . $id;
+		
+		dol_syslog(get_class($this) . '::info sql=' . $sql);
+		$result = $this->db->query($sql);
+		
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+				if ($obj->fk_user_modif) {
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
+				$this->date_creation = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->tms);
+			}
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+	
+	/**
+	 * Account desactivate
+	 *
+	 * @param int $id Id
+	 * @return int <0 if KO, >0 if OK
+	 */
+	function account_desactivate($id) {
+		$result = $this->checkUsage();
+		
+		if ($result > 0) {
+			$this->db->begin();
+			
+			$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
+			$sql .= "SET active = '0'";
+			$sql .= " WHERE rowid = " . $this->db->escape($id);
+			
+			dol_syslog(get_class($this) . "::desactivate sql=" . $sql, LOG_DEBUG);
+			$result = $this->db->query($sql);
+			
+			if ($result) {
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->error = $this->db->lasterror();
+				$this->db->rollback();
+				return - 1;
+			}
+		} else {
+			return - 1;
+		}
+	}
+	
+	/**
+	 * Account activate
+	 *
+	 * @param int $id Id
+	 * @return int <0 if KO, >0 if OK
+	 */
+	function account_activate($id) {
+		$this->db->begin();
+		
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
+		$sql .= "SET active = '1'";
+		$sql .= " WHERE rowid = " . $this->db->escape($id);
+		
+		dol_syslog(get_class($this) . "::activate sql=" . $sql, LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return - 1;
+		}
+	}
+	
+	
+	/**
+	 *  Retourne le libelle du statut d'un user (actif, inactif)
+	 *
+	 *  @param	int		$mode          0=libelle long, 1=libelle court
+	 *  @return	string 			       Label of type
+	 */
+	function getLibType($mode=0)
+	{
+	    return $this->LibType($this->nature,$mode);
+	}
+	
+	/**
+	 *  Return type of an accounting journal
+	 *
+	 *  @param	int		$nature        	Id type
+	 *  @param  int		$mode          	0=libelle long, 1=libelle court
+	 *  @return string 			       	Label of type
+	 */
+	function LibType($nature,$mode=0)
+	{
+	    global $langs;
+
+		$langs->load("accountancy");
+	
+	    if ($mode == 0)
+	    {
+	        $prefix='';
+			if ($nature == 9) return $langs->trans('AccountingJournalTypeHasNew');
+			if ($nature == 3) return $langs->trans('AccountingJournalTypeBank');
+			if ($nature == 2) return $langs->trans('AccountingJournalTypePurchase');
+	        if ($nature == 1) return $langs->trans('AccountingJournalTypeSale');
+	        if ($nature == 0) return $langs->trans('AccountingJournalTypeVariousOperation');
+	    }
+	    if ($mode == 1)
+	    {
+			if ($nature == 9) return $langs->trans('AccountingJournalTypeHasNew');
+			if ($nature == 3) return $langs->trans('AccountingJournalTypeBank');
+			if ($nature == 2) return $langs->trans('AccountingJournalTypePurchase');
+	        if ($nature == 1) return $langs->trans('AccountingJournalTypeSale');
+	        if ($nature == 0) return $langs->trans('AccountingJournalTypeVariousOperation');
+	    }
+	}
+}
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 8ec0713b01a..205acb9ba80 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014 	   Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -41,7 +41,7 @@ function admin_accounting_prepare_head(AccountingAccount $object=null)
 	$head[$h][2] = 'general';
 	$h ++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/journal.php';
+	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/journals.php';
 	$head[$h][1] = $langs->trans("Journaux");
 	$head[$h][2] = 'journal';
 	$h ++;
diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql
index 1db22e7408d..5f0e8dd5416 100644
--- a/htdocs/install/mysql/data/llx_accounting.sql
+++ b/htdocs/install/mysql/data/llx_accounting.sql
@@ -34,7 +34,7 @@ delete from llx_accounting_journal;
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Journal des ventes', 1, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Journal des achats', 2, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Journal de banque', 3, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 4, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 0, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Journal des à-nouveaux', 9, 1);
 --
 -- Descriptif des plans comptables FR PCG99-ABREGE
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 18683f71638..1ce53af43fe 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -101,7 +101,7 @@ CREATE TABLE llx_product_attribute_combination
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Journal des ventes', 1, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Journal des achats', 2, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Journal de banque', 3, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 4, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 0, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Journal des à-nouveaux', 9, 1);
 
 ALTER TABLE llx_paiementfourn ADD COLUMN model_pdf varchar(255);
@@ -150,4 +150,3 @@ create table llx_payment_various
   fk_user_author        integer,
   fk_user_modif         integer
 )ENGINE=innodb;
->>>>>>> uptream/develop
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.sql b/htdocs/install/mysql/tables/llx_accounting_journal.sql
index f3ee2a2e010..d9c6ea76e3e 100644
--- a/htdocs/install/mysql/tables/llx_accounting_journal.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_journal.sql
@@ -22,6 +22,6 @@ create table llx_accounting_journal
   rowid             integer AUTO_INCREMENT PRIMARY KEY,
   code       		varchar(32) NOT NULL,
   label             varchar(128) NOT NULL,
-  nature			smallint DEFAULT 0 NOT NULL,			-- type of journals (1:Sale / 2:purchase / 3:bank / 4:various operations / 9: has-new)
+  nature			smallint DEFAULT 0 NOT NULL,			-- type of journals (0:various operations / 1:sale / 2:purchase / 3:bank / 9: has-new)
   active            smallint DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index d8313e2a11b..f35b61055ad 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -198,6 +198,14 @@ ChangeBinding=Change the binding
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
+AccountingJournals=Accounting journals
+NewAccountingJournal=New accounting journal
+ShowAccoutingJournal=Show accounting journal
+AccountingJournalTypeVariousOperation=Various operation
+AccountingJournalTypeSale=Sale
+AccountingJournalTypePurchase=Purchase
+AccountingJournalTypeBank=Bank
+AccountingJournalTypeHasNew=Has-new
 
 ## Export
 Exports=Exports

From 4354820689f35911799c94ee15facf84aceea4b4 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 28 Mar 2017 09:39:26 +0200
Subject: [PATCH 0481/1163] Fix call function get_date instead getDate

---
 htdocs/inventory/tpl/inventory.tpl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/inventory/tpl/inventory.tpl.php b/htdocs/inventory/tpl/inventory.tpl.php
index d707ec581b1..e3fa8e5421d 100644
--- a/htdocs/inventory/tpl/inventory.tpl.php
+++ b/htdocs/inventory/tpl/inventory.tpl.php
@@ -198,8 +198,8 @@
 		</div>
 	<?php } ?>
 </form>
-<p>Date de création : <?php echo $inventory->get_date('datec') ?>
-<br />Dernière mise à jour : <?php echo $inventory->get_date('tms') ?></p>
+<p>Date de création : <?php echo $inventory->getDate('datec') ?>
+<br />Dernière mise à jour : <?php echo $inventory->getDate('tms') ?></p>
 	
 
 	

From 3740137e3146197bb438288b274d4240d15fa2c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Mar 2017 10:44:52 +0200
Subject: [PATCH 0482/1163] Add tooltip on label of each open item.

---
 htdocs/adherents/class/adherent.class.php                  | 2 +-
 htdocs/comm/action/class/actioncomm.class.php              | 2 +-
 htdocs/comm/propal/class/propal.class.php                  | 2 +-
 htdocs/commande/class/commande.class.php                   | 2 +-
 htdocs/compta/bank/class/account.class.php                 | 2 +-
 htdocs/compta/facture/class/facture.class.php              | 2 +-
 htdocs/compta/paiement/cheque/class/remisecheque.class.php | 2 +-
 htdocs/contrat/class/contrat.class.php                     | 2 +-
 htdocs/expensereport/class/expensereport.class.php         | 2 +-
 htdocs/fourn/class/fournisseur.commande.class.php          | 2 +-
 htdocs/fourn/class/fournisseur.facture.class.php           | 2 +-
 htdocs/index.php                                           | 4 +---
 htdocs/projet/class/project.class.php                      | 2 +-
 htdocs/projet/class/task.class.php                         | 2 +-
 htdocs/supplier_proposal/class/supplier_proposal.class.php | 2 +-
 htdocs/theme/eldy/graph-color.php                          | 2 +-
 16 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 1ffa7da1866..833b5bf224e 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1775,7 +1775,7 @@ class Adherent extends CommonObject
 	        $response->warning_delay=$conf->adherent->subscription->warning_delay/60/60/24;
 	        $response->label=$langs->trans("MembersWithSubscriptionToReceive");
 	        $response->url=DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut=1&amp;filter=outofdate';
-	        $response->img=img_object($langs->trans("Members"),"user");
+	        $response->img=img_object('',"user");
 
             $adherentstatic = new Adherent($this->db);
 
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 7140bb09a1e..fc0bbebb901 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -936,7 +936,7 @@ class ActionComm extends CommonObject
 	        $response->label = $langs->trans("ActionsToDo");
 	        $response->url = DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&amp;mainmenu=agenda';
 	        if ($user->rights->agenda->allactions->read) $response->url.='&amp;filtert=-1';
-	        $response->img = img_object($langs->trans("Actions"),"action");
+	        $response->img = img_object('',"action");
 
             // This assignment in condition is not a bug. It allows walking the results.
             while ($obj=$this->db->fetch_object($resql))
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 765179c3d63..3489860e1dd 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3027,7 +3027,7 @@ class Propal extends CommonObject
 	        $response->label = $label;
 	        $response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals';
 	        $response->url_late = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals&sortfield=p.datep&sortorder=asc';
-	        $response->img = img_object($langs->trans("Propals"),"propal");
+	        $response->img = img_object('',"propal");
 
             // This assignment in condition is not a bug. It allows walking the results.
             while ($obj=$this->db->fetch_object($resql))
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 7bad08b2f84..13a3dab037d 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3233,7 +3233,7 @@ class Commande extends CommonOrder
 	        $response->warning_delay=$conf->commande->client->warning_delay/60/60/24;
 	        $response->label=$langs->trans("OrdersToProcess");
 	        $response->url=DOL_URL_ROOT.'/commande/list.php?viewstatut=-3&mainmenu=commercial&leftmenu=orders';
-	        $response->img=img_object($langs->trans("Orders"),"order");
+	        $response->img=img_object('',"order");
 
             $generic_commande = new Commande($this->db);
 
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index be4ec60b7f8..1670ac2917c 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1185,7 +1185,7 @@ class Account extends CommonObject
 	        $response->warning_delay=$conf->bank->rappro->warning_delay/60/60/24;
 	        $response->label=$langs->trans("TransactionsToConciliate");
 	        $response->url=DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank';
-	        $response->img=img_object($langs->trans("TransactionsToConciliate"),"payment");
+	        $response->img=img_object('',"payment");
 
             while ($obj=$this->db->fetch_object($resql))
             {
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 721713fc279..963534da934 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3680,7 +3680,7 @@ class Facture extends CommonInvoice
 			$response->warning_delay=$conf->facture->client->warning_delay/60/60/24;
 			$response->label=$langs->trans("CustomerBillsUnpaid");
 			$response->url=DOL_URL_ROOT.'/compta/facture/list.php?search_status=1&mainmenu=accountancy&leftmenu=customers_bills';
-			$response->img=img_object($langs->trans("Bills"),"bill");
+			$response->img=img_object('',"bill");
 
 			$generic_facture = new Facture($this->db);
 
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index ad53e98693e..d784bfa03e7 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -511,7 +511,7 @@ class RemiseCheque extends CommonObject
 			$response->warning_delay=$conf->bank->cheque->warning_delay/60/60/24;
 			$response->label=$langs->trans("BankChecksToReceipt");
 			$response->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank';
-			$response->img=img_object($langs->trans("BankChecksToReceipt"),"payment");
+			$response->img=img_object('',"payment");
 
 			while ($obj=$this->db->fetch_object($resql))
 			{
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index ca89cdd8d18..ca751a5892a 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2070,7 +2070,7 @@ class Contrat extends CommonObject
 			$response->warning_delay = $warning_delay/60/60/24;
 			$response->label = $label;
 			$response->url = $url;
-			$response->img = img_object($langs->trans("Contract"),"contract");
+			$response->img = img_object('',"contract");
 
 			while ($obj=$this->db->fetch_object($resql))
 			{
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 578ab81b339..e4754f4ab60 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1913,7 +1913,7 @@ class ExpenseReport extends CommonObject
 	            $response->label=$langs->trans("ExpenseReportsToPay");
 	            $response->url=DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut=5';
 	        }
-	        $response->img=img_object($langs->trans("ExpenseReports"),"trip");
+	        $response->img=img_object('',"trip");
 
             while ($obj=$this->db->fetch_object($resql))
             {
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index a4deab90768..1da9854791b 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2624,7 +2624,7 @@ class CommandeFournisseur extends CommonOrder
 	        $response->warning_delay=$conf->commande->fournisseur->warning_delay/60/60/24;
 	        $response->label=$langs->trans("SuppliersOrdersToProcess");
 	        $response->url=DOL_URL_ROOT.'/fourn/commande/list.php?statut=1,2,3&mainmenu=commercial&leftmenu=orders_suppliers';
-	        $response->img=img_object($langs->trans("Orders"),"order");
+	        $response->img=img_object('',"order");
 
             while ($obj=$this->db->fetch_object($resql))
             {
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 009f765e5cd..5f435da9daf 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1787,7 +1787,7 @@ class FactureFournisseur extends CommonInvoice
 	        $response->warning_delay=$conf->facture->fournisseur->warning_delay/60/60/24;
 	        $response->label=$langs->trans("SupplierBillsToPay");
 	        $response->url=DOL_URL_ROOT.'/fourn/facture/list.php?filtre=fac.fk_statut:1,paye:0&mainmenu=accountancy&leftmenu=suppliers_bills';
-	        $response->img=img_object($langs->trans("Bills"),"bill");
+	        $response->img=img_object('',"bill");
 
             $facturestatic = new FactureFournisseur($this->db);
 
diff --git a/htdocs/index.php b/htdocs/index.php
index 943914ebd15..29f80428b11 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -561,7 +561,7 @@ if (! empty($valid_dashboardlines))
         
         $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
         $boxwork .= '<div class="boxstatscontent">';
-        $boxwork .= '<span class="boxstatstext">'.$board->img.' '.$board->label.'</span><br>';
+        $boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' '.$board->label.'</span><br>';
         $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0)?' dashboardlineok':'').'">'.$board->nbtodo.'</span></a>';
         $boxwork .= '</div>';
         if ($board->nbtodolate > 0)
@@ -600,8 +600,6 @@ $boxwork.='</td></tr>';
 $boxwork.='</table>';   // End table array of working board
 $boxwork.='</div>';
 
-//print $boxwork;
-
 print '</div></div></div><div class="clearboth"></div>';
 
 print '<div class="fichecenter fichecenterbis">';
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index eeb10281c3a..7748534c970 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1694,7 +1694,7 @@ class Project extends CommonObject
             $response->label = $langs->trans("OpenedProjects");
             if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
             else $response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
-            $response->img = img_object($langs->trans("Projects"),"projectpub");
+            $response->img = img_object('',"projectpub");
 
             // This assignment in condition is not a bug. It allows walking the results.
             while ($obj=$this->db->fetch_object($resql))
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 905098d202a..7c986e4d9a2 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1713,7 +1713,7 @@ class Task extends CommonObject
 	        $response->label = $langs->trans("OpenedTasks");
 	        if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mainmenu=project';
 	        else $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mode=mine&amp;mainmenu=project';
-	        $response->img = img_object($langs->trans("Tasks"),"task");
+	        $response->img = img_object('',"task");
 	
 	        // This assignment in condition is not a bug. It allows walking the results.
 	        while ($obj=$this->db->fetch_object($resql))
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 0ec7710ee70..65efb97f824 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2143,7 +2143,7 @@ class SupplierProposal extends CommonObject
 	        $response->warning_delay = $delay_warning/60/60/24;
 	        $response->label = $label;
 	        $response->url = DOL_URL_ROOT.'/supplier_proposal/list.php?viewstatut='.$statut;
-	        $response->img = img_object($langs->trans("SupplierProposals"),"propal");
+	        $response->img = img_object('',"propal");
             
             // This assignment in condition is not a bug. It allows walking the results.
             while ($obj=$this->db->fetch_object($resql))
diff --git a/htdocs/theme/eldy/graph-color.php b/htdocs/theme/eldy/graph-color.php
index 4346d007158..42989907747 100644
--- a/htdocs/theme/eldy/graph-color.php
+++ b/htdocs/theme/eldy/graph-color.php
@@ -28,7 +28,7 @@
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
 $theme_bordercolor = array(235,235,224);
-$theme_datacolor = array(array(140,140,220), array(190,120,120), array(0,160,140), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
+$theme_datacolor = array(array(120,140,220), array(190,120,120), array(0,160,140), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
 $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
 $theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
 

From b5b0eba4700b7f7d9ad012de1ac0a26157efc0f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Mar 2017 12:47:48 +0200
Subject: [PATCH 0483/1163] Several enhancement for 6.0

---
 htdocs/contrat/card.php                      |  10 +-
 htdocs/contrat/class/contrat.class.php       |  19 +-
 htdocs/contrat/tpl/linkedobjectblock.tpl.php |   2 +-
 htdocs/core/boxes/box_contracts.php          |   8 +-
 htdocs/core/boxes/modules_boxes.php          |   4 +-
 htdocs/core/lib/fichinter.lib.php            |   8 -
 htdocs/core/lib/files.lib.php                |   2 +-
 htdocs/core/lib/functions.lib.php            |   4 +-
 htdocs/fichinter/apercu.php                  | 197 -------------------
 htdocs/fichinter/card.php                    |   2 +-
 htdocs/fichinter/contact.php                 |   2 +-
 htdocs/fichinter/document.php                |   2 +-
 htdocs/fichinter/info.php                    |   2 +-
 htdocs/fichinter/note.php                    |   2 +-
 htdocs/index.php                             |   1 +
 htdocs/main.inc.php                          |   6 +-
 htdocs/resource/element_resource.php         |   6 +-
 htdocs/theme/eldy/style.css.php              |  24 ++-
 18 files changed, 59 insertions(+), 242 deletions(-)
 delete mode 100644 htdocs/fichinter/apercu.php

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 400548b7076..34f44c4f690 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1271,7 +1271,7 @@ else
 
         $hselected = 0;
 
-        dol_fiche_head($head, $hselected, $langs->trans("Contract"), 0, 'contract');
+        dol_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
 
 
         /*
@@ -1595,7 +1595,7 @@ else
 
                     print "</tr>\n";
 
-                    // Dates de en service prevues et effectives
+                    // Dates of service planed and real
                     if ($objp->subprice >= 0)
                     {
 	                    $colspan = 6;
@@ -1862,15 +1862,13 @@ else
                 print '</table>';
             }
 
+            // Form to activate line
             if ($user->rights->contrat->activer && $action == 'activateline' && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
             {
-                /**
-                 * Activer la ligne de contrat
-                 */
                 print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.GETPOST('ligne').'&amp;action=active" method="post">';
                 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-                print '<table class="noborder tableforservicepart2" width="100%">';
+                print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ?'  boxtablenobottom':'').'" width="100%">';
 
                 // Definie date debut et fin par defaut
                 $dateactstart = $objp->date_debut;
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index ca751a5892a..d4d41b2f60c 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1765,7 +1765,7 @@ class Contrat extends CommonObject
 	/**
 	 *  Return label of a contract status
 	 *
-	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services
+	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services, 7=Same than 6 with fixed length
 	 *  @return string      		Label
 	 */
 	function getLibStatut($mode)
@@ -1777,7 +1777,7 @@ class Contrat extends CommonObject
 	 *  Renvoi label of a given contrat status
 	 *
 	 *  @param	int		$statut      	Status id
-	 *  @param  int		$mode          	0=Long label, 1=Short label, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services
+	 *  @param  int		$mode          	0=Long label, 1=Short label, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services, 7=Same than 6 with fixed length
 	 *	@return string      			Label
 	 */
 	function LibStatut($statut,$mode)
@@ -1808,7 +1808,7 @@ class Contrat extends CommonObject
 			if ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'),'statut4'); }
 			if ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'),'statut6'); }
 		}
-		if ($mode == 4 || $mode == 6)
+		if ($mode == 4 || $mode == 6 || $mode == 7)
 		{
 			$line=new ContratLigne($this->db);
 			$text='';
@@ -1818,10 +1818,15 @@ class Contrat extends CommonObject
 				$text.=' '.$langs->trans("Services");
 				$text.=': &nbsp; &nbsp; ';
 			}
-			$text.=$this->nbofserviceswait.' '.$line->LibStatut(0,3).' &nbsp; ';
-			$text.=$this->nbofservicesopened.' '.$line->LibStatut(4,3,0).' &nbsp; ';
-			$text.=$this->nbofservicesexpired.' '.$line->LibStatut(4,3,1).' &nbsp; ';
-			$text.=$this->nbofservicesclosed.' '.$line->LibStatut(5,3);
+			$text.=($mode == 7?'<div class="inline-block">':'');
+			$text.=($mode != 7 || $this->nbofserviceswait > 0) ? $this->nbofserviceswait.' '.$line->LibStatut(0,3).' &nbsp; ' : '';
+			$text.=($mode == 7?'</div><div class="inline-block">':'');
+			$text.=($mode != 7 || $this->nbofservicesopened > 0) ? $this->nbofservicesopened.' '.$line->LibStatut(4,3,0).' &nbsp; ' : '';
+			$text.=($mode == 7?'</div><div class="inline-block">':'');
+			$text.=($mode != 7 || $this->nbofservicesexpired > 0) ? $this->nbofservicesexpired.' '.$line->LibStatut(4,3,1).' &nbsp; ' : '';
+			$text.=($mode == 7?'</div><div class="inline-block">':'');
+			$text.=($mode != 7 || $this->nbofservicesclosed > 0) ? $this->nbofservicesclosed.' '.$line->LibStatut(5,3).' &nbsp; ' : '';
+			$text.=($mode == 7?'</div>':'');
 			return $text;
 		}
 		if ($mode == 5)
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index 9ea21f890fc..1257e3503a9 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -43,7 +43,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
     <td></td>
 	<td align="center"><?php echo dol_print_date($objectlink->date_contrat,'day'); ?></td>
 	<td align="right">&nbsp;</td>
-	<td align="right"><?php echo $objectlink->getLibStatut(6); ?></td>
+	<td align="right"><?php echo $objectlink->getLibStatut(7); ?></td>
 	<td align="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_delete($langs->transnoentitiesnoconv("RemoveLink")); ?></a></td>
 </tr>
 <?php } ?>
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index cd436f3eb85..7585c5d931c 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2010 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2015 Frederic France      <frederic.france@free.fr>
- * Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2010      Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
+ * Copyright (C) 2016-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -125,7 +125,7 @@ class box_contracts extends ModeleBoxes
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="nowrap right"',
-                        'text' => $contractstatic->getLibStatut(6),
+                        'text' => $contractstatic->getLibStatut(7),
                         'asis'=>1,
                     );
 
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 3ebac7e7ab0..26ee34bdca0 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -325,13 +325,13 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
                             if (! empty($contents[$i][$j]['maxlength'])) $maxlength=$contents[$i][$j]['maxlength'];
 
                             if ($maxlength) $textwithnotags=dol_trunc($textwithnotags,$maxlength);
-                            if (preg_match('/^<img/i',$text) || ! empty($contents[$i][$j]['asis'])) $out.= $text;   // show text with no html cleaning
+                            if (preg_match('/^<img/i',$text) || preg_match('/^<div/i',$text) || ! empty($contents[$i][$j]['asis'])) $out.= $text;   // show text with no html cleaning
                             else $out.= $textwithnotags;                // show text with html cleaning
 
                             // End Url
                             if (! empty($contents[$i][$j]['url'])) $out.= '</a>';
 
-                            if (preg_match('/^<img/i',$text2) || ! empty($contents[$i][$j]['asis2'])) $out.= $text2; // show text with no html cleaning
+                            if (preg_match('/^<img/i',$text2) || preg_match('/^<div/i',$text2) || ! empty($contents[$i][$j]['asis2'])) $out.= $text2; // show text with no html cleaning
                             else $out.= $text2withnotags;               // show text with html cleaning
 
                             if (! empty($textnoformat)) $out.= "\n".$textnoformat."\n";
diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index 964bbe14b2c..4e91c02f4f2 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -55,14 +55,6 @@ function fichinter_prepare_head($object)
 		$h++;
 	}
 
-	if (! empty($conf->global->MAIN_USE_PREVIEW_TABS))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/fichinter/apercu.php?id='.$object->id;
-		$head[$h][1] = $langs->trans('Preview');
-		$head[$h][2] = 'preview';
-		$h++;
-	}
-
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 51be81a7bd5..1cb4da03488 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1626,7 +1626,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 		$original_file=$conf->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu intervention
-	elseif ($modulepart == 'apercufichinter' && !empty($conf->ficheinter->dir_output))
+	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
 		if ($fuser->rights->ficheinter->lire) $accessallowed=1;
 		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 06419ba5930..20186ebe28d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1014,6 +1014,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	if ($object->element == 'propal')    $modulepart='propal';
 	if ($object->element == 'commande')  $modulepart='commande';
 	if ($object->element == 'facture')   $modulepart='facture';
+	if ($object->element == 'fichinter') $modulepart='ficheinter';
 	
 	if ($object->element == 'product')
 	{
@@ -1041,7 +1042,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
             if ($modulepart != 'unknown')
             {
                 // Check if a preview file is available
-                if (in_array($modulepart, array('propal', 'commande', 'facture')) && class_exists("Imagick"))
+                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter')) && class_exists("Imagick"))
                 {
                     $objectref = dol_sanitizeFileName($object->ref);
                     $dir_output = $conf->$modulepart->dir_output . "/";
@@ -2694,6 +2695,7 @@ function img_warning($titlealt = 'default', $morealt = '')
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
 
+	//return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($morealt ? ($morealt == '1' ? ' style="float: right"' : ' '.$morealt): '')).'</div>';
 	return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($morealt ? ($morealt == '1' ? ' style="float: right"' : ' '.$morealt): ''));
 }
 
diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php
deleted file mode 100644
index 899ecaf9805..00000000000
--- a/htdocs/fichinter/apercu.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2012 Juanjo Menent        <jmenent@2byte.es>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * 		\file		htdocs/fichinter/apercu.php
- * 		\ingroup	fichinter
- * 		\brief		Page de l'onglet apercu d'une fiche d'intervention
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-if (! empty($conf->projet->enabled))	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-$langs->load('interventions');
-
-
-// Security check
-$socid=0;
-$id = GETPOST('id','int');
-$ref = GETPOST('ref','alpha');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
-
-
-/*
- * View
- */
-
-llxHeader();
-
-$form = new Form($db);
-
-/* *************************************************************************** */
-/*                                                                             */
-/* Mode fiche                                                                  */
-/*                                                                             */
-/* *************************************************************************** */
-
-if ($id > 0 || ! empty($ref))
-{
-	$object = new Fichinter($db);
-
-	if ($object->fetch($id,$ref) > 0)
-	{
-		$soc = new Societe($db);
-		$soc->fetch($object->socid);
-
-		$head = fichinter_prepare_head($object);
-		dol_fiche_head($head, 'preview', $langs->trans("InterventionCard"), 0, 'intervention');
-
-		/*
-		 *   Fiche intervention
-		 */
-		print '<table class="border" width="100%">';
-
-    	$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-    
-    	// Ref
-    	print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
-    	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
-    	print '</td></tr>';
-
-		$nbrow=3;
-		// Client
-		print "<tr><td>".$langs->trans("Customer")."</td>";
-		print '<td>';
-		print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$soc->id.'">'.$soc->name.'</a>';
-		print '</td>';
-		print '<td rowspan="'.$nbrow.'" valign="top" width="50%">';
-		
-		/*
-		 * Documents
-		 */
-		$objectref = dol_sanitizeFileName($object->ref);
-		$dir_output = $conf->ficheinter->dir_output . "/";
-		$filepath = $dir_output . $objectref . "/";
-		$file = $filepath . $objectref . ".pdf";
-		$filedetail = $filepath . $objectref . "-detail.pdf";
-		$relativepath = "${objectref}/${objectref}.pdf";
-		$relativepathdetail = "${objectref}/${objectref}-detail.pdf";
-
-        // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")
-        $fileimage = $file.'_preview.png';          	// If PDF has 1 page
-        $fileimagebis = $file.'_preview-0.pdf.png';     // If PDF has more than one page
-        $relativepathimage = $relativepath.'_preview.png';
-
-		$var=true;
-
-		// Si fichier PDF existe
-		if (file_exists($file))
-		{
-			$encfile = urlencode($file);
-			print load_fiche_titre($langs->trans("Documents"));
-			print '<table class="border" width="100%">';
-
-			print "<tr ".$bc[$var]."><td>".$langs->trans("Intervention")." PDF</td>";
-
-			print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=ficheinter&file='.urlencode($relativepath).'">'.$object->ref.'.pdf</a></td>';
-			print '<td align="right">'.dol_print_size(dol_filesize($file)).'</td>';
-			print '<td align="right">'.dol_print_date(dol_filemtime($file),'dayhour').'</td>';
-			print '</tr>';
-
-			// Si fichier detail PDF existe
-			if (file_exists($filedetail))
-			{
-				print "<tr ".$bc[$var]."><td>Fiche d'intervention detaillee</td>";
-
-				print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=ficheinter&file='.urlencode($relativepathdetail).'">'.$object->ref.'-detail.pdf</a></td>';
-				print '<td align="right">'.dol_print_size(dol_filesize($filedetail)).'</td>';
-				print '<td align="right">'.dol_print_date(dol_filemtime($filedetail),'dayhour').'</td>';
-				print '</tr>';
-			}
-			print "</table>\n";
-
-			// Conversion du PDF en image png si fichier png non existant
-			if ((! file_exists($fileimage) && ! file_exists($fileimagebis)) || (filemtime($fileimage) < filemtime($file)))
-			{
-				if (class_exists("Imagick"))
-				{
-					$ret = dol_convert_file($file,'png',$fileimage);
-					if ($ret < 0) $error++;
-				}
-				else
-				{
-					$langs->load("errors");
-					print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>';
-				}
-			}
-		}
-
-		print "</td></tr>";
-
-		// Statut
-		print '<tr><td>'.$langs->trans("Status").'</td>';
-		print "<td>".$object->getLibStatut(4)."</td>\n";
-		print '</tr>';
-
-		// Date
-		print '<tr><td>'.$langs->trans("Date").'</td>';
-		print "<td>".dol_print_date($object->datec,"daytext")."</td>\n";
-		print '</tr>';
-
-		print '</table>';
-
-		dol_fiche_end();
-	}
-	else
-	{
-		// Object not found
-		print $langs->trans("ErrorFichinterNotFound",$id);
-	}
-}
-
-// Si fichier png PDF d'1 page trouve
-if (file_exists($fileimage))
-{
-	print '<img style="background: #FFF" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufichinter&file='.urlencode($relativepathimage).'">';
-}
-// Si fichier png PDF de plus d'1 page trouve
-elseif (file_exists($fileimagebis))
-{
-	$multiple = $relativepath . "-";
-
-	for ($i = 0; $i < 20; $i++)
-	{
-		$preview = $multiple.$i.'.png';
-
-		if (file_exists($dir_output.$preview))
-		{
-			print '<img style="background: #FFF" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufichinter&file='.urlencode($preview).'"><p>';
-		}
-	}
-}
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 31f72e18075..cd10e704d90 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1079,7 +1079,7 @@ else if ($id > 0 || ! empty($ref))
 
 	$head = fichinter_prepare_head($object);
 
-	dol_fiche_head($head, 'card', $langs->trans("InterventionCard"), 0, 'intervention');
+	dol_fiche_head($head, 'card', $langs->trans("InterventionCard"), -1, 'intervention');
 
 	$formconfirm='';
 
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 83825b08a90..2b40553a3d9 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -122,7 +122,7 @@ if ($id > 0 || ! empty($ref))
 	$object->fetch_thirdparty();
 
 	$head = fichinter_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("InterventionCard"), 0, 'intervention');
+	dol_fiche_head($head, 'contact', $langs->trans("InterventionCard"), -1, 'intervention');
 
 
 	// Intervention card
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 2e53d6ebc62..f24283e8aa1 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -89,7 +89,7 @@ if ($object->id)
 
 	$head=fichinter_prepare_head($object);
 
-	dol_fiche_head($head, 'documents',  $langs->trans("InterventionCard"), 0, 'intervention');
+	dol_fiche_head($head, 'documents',  $langs->trans("InterventionCard"), -1, 'intervention');
 
 
 	// Construit liste des fichiers
diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
index de2317eecca..87533644893 100644
--- a/htdocs/fichinter/info.php
+++ b/htdocs/fichinter/info.php
@@ -58,7 +58,7 @@ $object->fetch_thirdparty();
 $object->info($object->id);
 
 $head = fichinter_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans('InterventionCard'), 0, 'intervention');
+dol_fiche_head($head, 'info', $langs->trans('InterventionCard'), -1, 'intervention');
 
 // Intervention card
 $linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index 1da0b0c425c..43a2654d1fd 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -63,7 +63,7 @@ if ($id > 0 || ! empty($ref))
 	$object->fetch_thirdparty();
 	
 	$head = fichinter_prepare_head($object);
-	dol_fiche_head($head, 'note', $langs->trans('InterventionCard'), 0, 'intervention');
+	dol_fiche_head($head, 'note', $langs->trans('InterventionCard'), -1, 'intervention');
 
 	// Intervention card
 	$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
diff --git a/htdocs/index.php b/htdocs/index.php
index 29f80428b11..e0609c91274 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -568,6 +568,7 @@ if (! empty($valid_dashboardlines))
         {
             $boxwork .= '<div class="dashboardlinelatecoin nowrap">';
             $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
+            //$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
             $boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
             $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
             $boxwork .= $board->nbtodolate;
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 7d5e5dfa64c..8d1138e5758 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -848,9 +848,9 @@ if (! defined('NOREQUIRETRAN'))
 
 // Define some constants used for style of arrays
 $bc=array(0=>'class="impair"',1=>'class="pair"');
-$bcdd=array(0=>'class="impair drag drop"',1=>'class="pair drag drop"');
-$bcnd=array(0=>'class="impair nodrag nodrop nohover"',1=>'class="pair nodrag nodrop nohoverpair"');		// Used for tr to add new lines
-$bctag=array(0=>'class="impair tagtr"',1=>'class="pair tagtr"');
+$bcdd=array(0=>'class="drag drop"',1=>'class="drag drop"');
+$bcnd=array(0=>'class="nodrag nodrop nohover"',1=>'class="nodrag nodrop nohoverpair"');		// Used for tr to add new lines
+$bctag=array(0=>'class="tagtr"',1=>'class="pair tagtr"');
 
 // Define messages variables
 $mesg=''; $warning=''; $error=0;
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index a09e9d3db39..fbb75e021ff 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -197,7 +197,7 @@ else
 
 			$head=actions_prepare_head($act);
 
-			dol_fiche_head($head, 'resources', $langs->trans("Action"),0,'action');
+			dol_fiche_head($head, 'resources', $langs->trans("Action"), -1, 'action');
 
 			$linkback =img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
 			$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/listactions.php">'.$langs->trans("BackToList").'</a>';
@@ -327,7 +327,7 @@ else
 			require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
 			$head = societe_prepare_head($socstatic);
 
-			dol_fiche_head($head, 'resources', $langs->trans("ThirdParty"), 0, 'company');
+			dol_fiche_head($head, 'resources', $langs->trans("ThirdParty"), -1, 'company');
 
 			dol_banner_tab($socstatic, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', 'nom', '', '&element='.$element);
 
@@ -363,7 +363,7 @@ else
 		if (is_object($fichinter)) 
 		{
 			$head=fichinter_prepare_head($fichinter);
-			dol_fiche_head($head, 'resource', $langs->trans("InterventionCard"),0,'intervention');
+			dol_fiche_head($head, 'resource', $langs->trans("InterventionCard"), -1, 'intervention');
 
 			// Intervention card
 			$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c8c0dda380b..51a5ab39889 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2462,7 +2462,7 @@ div.refidpadding  {
 }
 div.refid  {
 	font-weight: bold;
-  	color: #866;
+  	color: #868;
   	font-size: 160%;
 }
 div.refidno  {
@@ -2916,6 +2916,7 @@ span.boxstatstext {
 span.boxstatsindicator {
 	font-size: 130%;
 	font-weight: normal;
+	line-height: 29px;
 }
 span.dashboardlineindicator, span.dashboardlineindicatorlate {
 	font-size: 130%;
@@ -2929,17 +2930,32 @@ span.dashboardlineok {
 }
 span.dashboardlineko {
 	color: #FFF;
-	font-size: 80%;	
+	/*color: #8c4446 ! important;
+	padding-left: 1px;*/
+	
+	font-size: 80%;
 }
 .dashboardlinelatecoin {
 	float: right;
 	position: relative;
     text-align: right;
-    top: -28px;
-    padding: 1px 6px 1px 6px;
+    top: -24px;
+    padding: 1px 2px 1px 2px;
+    border-radius: .25em;    
+
+    background-color: #af4705;
+    padding: 0px 5px 0px 5px;
+    top: -26px;
+}
+.imglatecoin {
+    padding: 1px 3px 1px 1px;
+    margin-left: 4px;
+    margin-right: 2px;
     background-color: #8c4446;
     color: #FFFFFF ! important;
     border-radius: .25em;    
+	display: inline-block;
+	vertical-align: middle;
 }
 .boxtable {
     margin-bottom: 8px !important;

From 41063e7cf2756a1c850b7c0094fa4fe7cf95930a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Mar 2017 12:55:20 +0200
Subject: [PATCH 0484/1163] Fix: trigger for delete must be before delete of
 element

---
 htdocs/commande/class/commande.class.php      |  6 +-
 .../class/companybankaccount.class.php        | 68 ++++++++++---------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 13a3dab037d..e87923beb8c 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3102,6 +3102,8 @@ class Commande extends CommonOrder
 
         $error = 0;
 
+        dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
+        
         $this->db->begin();
 
         if (! $error && ! $notrigger)
@@ -3117,7 +3119,6 @@ class Commande extends CommonOrder
         {
         	// Delete order details
         	$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE fk_commande = ".$this->id;
-        	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         	if (! $this->db->query($sql) )
         	{
         		$error++;
@@ -3126,7 +3127,6 @@ class Commande extends CommonOrder
 
         	// Delete order
         	$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande WHERE rowid = ".$this->id;
-        	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         	if (! $this->db->query($sql) )
         	{
         		$error++;
@@ -3184,7 +3184,6 @@ class Commande extends CommonOrder
 
         if (! $error)
         {
-        	dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
         	$this->db->commit();
         	return 1;
         }
@@ -3192,7 +3191,6 @@ class Commande extends CommonOrder
         {
 	        foreach($this->errors as $errmsg)
 	        {
-		        dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 		        $this->error.=($this->error?', '.$errmsg:$errmsg);
 	        }
 	        $this->db->rollback();
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 64205c62363..72f237999f8 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -235,47 +235,49 @@ class CompanyBankAccount extends Account
     /**
      *  Delete a rib from database
      *
-     *	@param		User		$user		User deleting
+     *	@param		User	$user		User deleting
      *	@param  	int		$notrigger	1=Disable triggers
-     *  @return		int		<0 if KO, >0 if OK
+     *  @return		int		            <0 if KO, >0 if OK
      */
     function delete(User $user = null, $notrigger=0)
     {
         global $conf;
-	$error = 0;
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib";
-        $sql.= " WHERE rowid  = ".$this->id;
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-	{
+        
+        $error = 0;
+        
+        dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
+        
+        $this->db->begin();
+        
+        if (! $error && ! $notrigger)
+        {
+            // Call trigger
+            $result=$this->call_trigger('COMAPNY_RIB_DELETE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
+        }
 
-		if (! $notrigger)
-		{
-			// Call trigger
-			$result=$this->call_trigger('COMPANY_RIB_CREATE',$user);
-			if ($result < 0) $error++;
-			// End call triggers
-			
-			if(! $error )
-			{
-				return 1;
-			}
-			else
-			{
-				return -1;
-			}
-		}
-		else
-		{
-			return 1;
-		}
-	
+        if (! $error)
+        {
+            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "societe_rib";
+            $sql .= " WHERE rowid  = " . $this->id;
+            
+            if (! $this->db->query($sql))
+        	{
+        		$error++;
+        		$this->errors[]=$this->db->lasterror();
+        	}
+        }
+        
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
         }
         else
-	{
-            dol_print_error($this->db);
-            return -1;
+        {
+            $this->db->rollback();
+            return -1*$error;
         }
     }
 

From 6bf61c677f7ab79783292e2bbc24890796c00fbc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Mar 2017 13:20:31 +0200
Subject: [PATCH 0485/1163] FIX #6586 Introduce processing status

---
 htdocs/cron/class/cronjob.class.php           | 33 +++++++++++++------
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  6 ++++
 htdocs/install/mysql/tables/llx_cronjob.sql   |  1 +
 htdocs/public/cron/cron_run_jobs.php          |  2 +-
 scripts/cron/cron_run_jobs.php                |  4 +--
 5 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 59a3d025386..2f9ad12a57f 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -55,6 +55,7 @@ class Cronjob extends CommonObject
 	var $unitfrequency;
 	var $frequency;
 	var $status;
+	var $processing;
 	var $fk_user_author;
 	var $fk_user_mod;
 	var $nbrun;
@@ -287,6 +288,7 @@ class Cronjob extends CommonObject
 		$sql.= " t.unitfrequency,";
 		$sql.= " t.frequency,";
 		$sql.= " t.status,";
+		$sql.= " t.processing,";
 		$sql.= " t.fk_user_author,";
 		$sql.= " t.fk_user_mod,";
 		$sql.= " t.note,";
@@ -330,6 +332,7 @@ class Cronjob extends CommonObject
 				$this->unitfrequency = $obj->unitfrequency;
 				$this->frequency = $obj->frequency;
 				$this->status = $obj->status;
+				$this->processing = $obj->processing;
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->fk_user_mod = $obj->fk_user_mod;
 				$this->note = $obj->note;
@@ -352,15 +355,16 @@ class Cronjob extends CommonObject
     /**
      *  Load object in memory from the database
      *
-	 *  @param	string		$sortorder    sort order
-	 *  @param	string		$sortfield    sort field
-	 *  @param	int			$limit		  limit page
-	 *  @param	int			$offset    	  page
-	 *  @param	int			$status    	  display active or not
-	 *  @param	array		$filter    	  filter output
-     *  @return int          			<0 if KO, >0 if OK
+	 *  @param	string		$sortorder      sort order
+	 *  @param	string		$sortfield      sort field
+	 *  @param	int			$limit		    limit page
+	 *  @param	int			$offset    	    page
+	 *  @param	int			$status    	    display active or not
+	 *  @param	array		$filter    	    filter output
+	 *  @param  int         $processing     Processing or not 
+     *  @return int          			    <0 if KO, >0 if OK
      */
-    function fetch_all($sortorder='DESC', $sortfield='t.rowid', $limit=0, $offset=0, $status=1, $filter='')
+    function fetch_all($sortorder='DESC', $sortfield='t.rowid', $limit=0, $offset=0, $status=1, $filter='', $processing=-1)
     {
     	global $langs;
     	
@@ -391,6 +395,7 @@ class Cronjob extends CommonObject
     	$sql.= " t.unitfrequency,";
     	$sql.= " t.frequency,";
     	$sql.= " t.status,";
+    	$sql.= " t.processing,";
     	$sql.= " t.fk_user_author,";
     	$sql.= " t.fk_user_mod,";
     	$sql.= " t.note,";
@@ -399,6 +404,7 @@ class Cronjob extends CommonObject
     	$sql.= " t.test";
     	$sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
     	$sql.= " WHERE 1 = 1";
+    	if ($processing >= 0) $sql.= " AND t.processing = ".(empty($processing)?'0':'1');
     	if ($status >= 0 && $status < 2) $sql.= " AND t.status = ".(empty($status)?'0':'1');
     	if ($status == 2) $sql.= " AND t.status = 2";
     	//Manage filter
@@ -463,6 +469,7 @@ class Cronjob extends CommonObject
 	    			$line->unitfrequency = $obj->unitfrequency;
 	    			$line->frequency = $obj->frequency;
 	    			$line->status = $obj->status;
+	    			$line->processing = $obj->processing;
 	    			$line->fk_user_author = $obj->fk_user_author;
 	    			$line->fk_user_mod = $obj->fk_user_mod;
 	    			$line->note = $obj->note;
@@ -520,9 +527,11 @@ class Cronjob extends CommonObject
 		if (isset($this->status)) $this->status=trim($this->status);
 		if (isset($this->note)) $this->note=trim($this->note);
 		if (isset($this->nbrun)) $this->nbrun=trim($this->nbrun);
-		if (empty($this->maxrun)) $this->maxrun=0;
         if (isset($this->libname)) $this->libname = trim($this->libname);
         if (isset($this->test)) $this->test = trim($this->test);
+
+		if (empty($this->maxrun)) $this->maxrun=0;
+        if (empty($this->processing)) $this->processing=0;
         
 		// Check parameters
 		// Put here code to add a control on parameters values
@@ -588,6 +597,7 @@ class Cronjob extends CommonObject
 		$sql.= " unitfrequency=".(isset($this->unitfrequency)?$this->unitfrequency:"null").",";
 		$sql.= " frequency=".(isset($this->frequency)?$this->frequency:"null").",";
 		$sql.= " status=".(isset($this->status)?$this->status:"null").",";
+		$sql.= " processing=".((isset($this->processing) && $this->processing > 0)?$this->processing:"0").",";
 		$sql.= " fk_user_mod=".$user->id.",";
 		$sql.= " note=".(isset($this->note)?"'".$this->db->escape($this->note)."'":"null").",";
 		$sql.= " nbrun=".((isset($this->nbrun) && $this->nbrun >0)?$this->nbrun:"null").",";
@@ -786,7 +796,8 @@ class Cronjob extends CommonObject
 		$this->lastresult='';
 		$this->unitfrequency='';
 		$this->frequency='';
-		$this->status='';
+		$this->status=0;
+		$this->processing=0;
 		$this->fk_user_author='';
 		$this->fk_user_mod='';
 		$this->note='';
@@ -898,6 +909,7 @@ class Cronjob extends CommonObject
 		$this->datelastresult=null;
 		$this->lastoutput='';
 		$this->lastresult='';
+		$this->processing = 1;                // To know job was started
 		$this->nbrun=$this->nbrun + 1;
 		$result = $this->update($user);       // This include begin/commit
 		if ($result<0) {
@@ -1099,6 +1111,7 @@ class Cronjob extends CommonObject
 		dol_syslog(get_class($this)."::run_jobs now we update job to track it is finished (with success or error)");
 		
 		$this->datelastresult=dol_now();
+		$this->processing=0;
 		$result = $this->update($user);       // This include begin/commit
 		if ($result < 0)
 		{
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 25145dc7cfe..6e098e4f59d 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -125,6 +125,9 @@ INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USER_A
 ALTER TABLE llx_chargesociales ADD COLUMN ref varchar(16);
 ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
 
+ALTER TABLE llx_cronjob ADD COLUMN processing integer NOT NULL DEFAULT 0;
+
+
 create table llx_payment_various
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
@@ -144,3 +147,6 @@ create table llx_payment_various
   fk_user_author        integer,
   fk_user_modif         integer
 )ENGINE=innodb;
+
+
+
diff --git a/htdocs/install/mysql/tables/llx_cronjob.sql b/htdocs/install/mysql/tables/llx_cronjob.sql
index f9d2ac1ab7a..96458de8420 100644
--- a/htdocs/install/mysql/tables/llx_cronjob.sql
+++ b/htdocs/install/mysql/tables/llx_cronjob.sql
@@ -46,6 +46,7 @@ CREATE TABLE llx_cronjob
 	nbrun			integer,						-- nb of run complete (failed or not)
     autodelete      integer DEFAULT 0,				-- 0=Job is kept unchanged once nbrun > maxrun or date > dateend, 2=Job must be archived (archive = status 2) once nbrun > maxrun or date > dateend 
   	status 			integer NOT NULL DEFAULT 1,		-- 0=disabled, 1=enabled, 2=archived
+  	processing 		integer NOT NULL DEFAULT 0,		-- 1=process currently running
   	test		    varchar(255) DEFAULT '1',
   	fk_user_author 	integer DEFAULT NULL,
   	fk_user_mod 	integer DEFAULT NULL,
diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php
index fc8e15aeed6..a7d3d4b3fcd 100644
--- a/htdocs/public/cron/cron_run_jobs.php
+++ b/htdocs/public/cron/cron_run_jobs.php
@@ -111,7 +111,7 @@ if (! empty($id))
 	$filter['t.rowid']=$id;
 }
 
-$result = $object->fetch_all('DESC','t.rowid', 0, 0, 1, $filter);
+$result = $object->fetch_all('DESC','t.rowid', 0, 0, 1, $filter, 0);
 if ($result<0)
 {
 	echo "Error: ".$cronjob->error;
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index d60218fba22..4360e74cae5 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -128,7 +128,7 @@ if (! empty($id)) {
 	$filter['t.rowid']=$id;
 }
 
-$result = $object->fetch_all('DESC','t.rowid', 0, 0, 1, $filter);
+$result = $object->fetch_all('DESC','t.rowid', 0, 0, 1, $filter, 0);
 if ($result<0)
 {
 	echo "Error: ".$object->error;
@@ -136,7 +136,7 @@ if ($result<0)
 	exit(-1);
 }
 
-// TODO This sequence of code must be shared with code into cron_run_jobs.php php page.
+// TODO This sequence of code must be shared with code into public/cron/cron_run_jobs.php php page.
 
 // current date
 $now=dol_now();

From 997bc35d5ffbf021ad6398c0bd0c465841c7bf9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Mar 2017 13:22:11 +0200
Subject: [PATCH 0486/1163] FIX #6586

---
 htdocs/compta/facture/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 88ce6ca10e0..663c0374b9a 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4099,7 +4099,7 @@ else if ($id > 0 || ! empty($ref))
 					if ($resteapayer == 0) {
 						print '<div class="inline-block divButAction"><span class="butActionRefused" title="' . $langs->trans("DisabledBecauseRemainderToPayIsZero") . '">' . $langs->trans('DoPayment') . '</span></div>';
 					} else {
-						print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid=' . $object->id . '&amp;action=create&amp;accountid='.$object->fk_account.'">' . $langs->trans('DoPayment') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'. DOL_URL_ROOT .'/compta/paiement.php?facid=' . $object->id . '&amp;action=create&amp;accountid='.$object->fk_account.'">' . $langs->trans('DoPayment') . '</a></div>';
 					}
 				}
 			}
@@ -4115,7 +4115,7 @@ else if ($id > 0 || ! empty($ref))
 					}
 					else
 					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'. DOL_URL_ROOT .'/compta/paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a></div>';
 					}
 				}
 

From 2f439fed858b4e54d357bb47d64da019ee66ca7d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Mar 2017 13:22:11 +0200
Subject: [PATCH 0487/1163] Code for 6

---
 htdocs/compta/facture/card.php |  4 ++--
 htdocs/cron/card.php           | 18 ++++++++++++----
 htdocs/cron/list.php           | 38 ++++++++++++++++++----------------
 3 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 88ce6ca10e0..663c0374b9a 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4099,7 +4099,7 @@ else if ($id > 0 || ! empty($ref))
 					if ($resteapayer == 0) {
 						print '<div class="inline-block divButAction"><span class="butActionRefused" title="' . $langs->trans("DisabledBecauseRemainderToPayIsZero") . '">' . $langs->trans('DoPayment') . '</span></div>';
 					} else {
-						print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid=' . $object->id . '&amp;action=create&amp;accountid='.$object->fk_account.'">' . $langs->trans('DoPayment') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'. DOL_URL_ROOT .'/compta/paiement.php?facid=' . $object->id . '&amp;action=create&amp;accountid='.$object->fk_account.'">' . $langs->trans('DoPayment') . '</a></div>';
 					}
 				}
 			}
@@ -4115,7 +4115,7 @@ else if ($id > 0 || ! empty($ref))
 					}
 					else
 					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'. DOL_URL_ROOT .'/compta/paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a></div>';
 					}
 				}
 
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index b4d27eb8878..5e2bc435e56 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -321,6 +321,7 @@ if (($action=="create") || ($action=="edit"))
 		print '<input type="hidden" name="action" value="add">'."\n";
 	}
 
+	
 	dol_fiche_head('');
 
 	print '<table class="border" width="100%">';
@@ -535,7 +536,7 @@ if (($action=="create") || ($action=="edit"))
 	print "</tr>";
 	
 	print '</table>';
-
+    
 	dol_fiche_end();
 
 	print '<div align="center">';
@@ -554,11 +555,13 @@ else
 	 */
     $now = dol_now();
     
-	dol_fiche_head($head, 'card', $langs->trans("CronTask"), 0, 'cron');
+	dol_fiche_head($head, 'card', $langs->trans("CronTask"), -1, 'cron');
 
 	$linkback = '<a href="' . DOL_URL_ROOT . '/cron/list.php?status=-2">' . $langs->trans("BackToList") . '</a>';
 	
 	// box add_jobs_box
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 
 	print '<tr><td class="titlefield">';
@@ -617,10 +620,13 @@ else
 	print "</td></tr>";
 
 	print '</table>';
-
+    print '</div>';
+    
 	print '<br>';
 
 	
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 	
 	print '<tr><td class="titlefield">';
@@ -673,9 +679,12 @@ else
 	print "</td></tr>";
 	
 	print '</table>';
+	print '</div>';
 	
 	print '<br>';
 	
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 
 	print '<tr><td class="titlefield">';
@@ -699,7 +708,8 @@ else
 	print "</td></tr>";
 
 	print '</table>';
-
+    print '</div>';
+    
 	dol_fiche_end();
 
 
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 880235a9a17..4703641de20 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -295,25 +295,9 @@ print '<br>';
 
 
 print '<div class="div-table-responsive">';
-print '<table width="100%" class="noborder">';
-print '<tr class="liste_titre">';
-print_liste_field_titre($langs->trans("ID"),$_SERVER["PHP_SELF"],"t.rowid","",$param,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronLabel"),$_SERVER["PHP_SELF"],"t.label","",$param,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronTask"),'','',"",$param,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronFrequency"),'',"","",$param,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronDtStart"),$_SERVER["PHP_SELF"],"t.datestart","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronDtEnd"),$_SERVER["PHP_SELF"],"t.dateend","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronMaxRun"),$_SERVER["PHP_SELF"],"t.maxrun","",$param,'align="right"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronNbRun"),$_SERVER["PHP_SELF"],"t.nbrun","",$param,'align="right"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronDtNextLaunch"),$_SERVER["PHP_SELF"],"t.datenextrun","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronDtLastLaunch"),$_SERVER["PHP_SELF"],"t.datelastrun","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronLastResult"),$_SERVER["PHP_SELF"],"t.lastresult","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronLastOutput"),$_SERVER["PHP_SELF"],"t.lastoutput","",$param,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre('');
-print "</tr>\n";
+print '<table class="noborder">';
 
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">';
 print '<input type="text" class="flat" name="search_label" value="'.$search_label.'" size="10">';
@@ -336,6 +320,24 @@ print '<input type="image" class="liste_titre" name="button_removefilter" src="'
 print '</td>';
 print '</tr>';
 
+print '<tr class="liste_titre">';
+print_liste_field_titre($langs->trans("ID"),$_SERVER["PHP_SELF"],"t.rowid","",$param,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronLabel"),$_SERVER["PHP_SELF"],"t.label","",$param,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronTask"),'','',"",$param,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronFrequency"),'',"","",$param,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronDtStart"),$_SERVER["PHP_SELF"],"t.datestart","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronDtEnd"),$_SERVER["PHP_SELF"],"t.dateend","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronMaxRun"),$_SERVER["PHP_SELF"],"t.maxrun","",$param,'align="right"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronNbRun"),$_SERVER["PHP_SELF"],"t.nbrun","",$param,'align="right"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronDtNextLaunch"),$_SERVER["PHP_SELF"],"t.datenextrun","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronDtLastLaunch"),$_SERVER["PHP_SELF"],"t.datelastrun","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronLastResult"),$_SERVER["PHP_SELF"],"t.lastresult","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronLastOutput"),$_SERVER["PHP_SELF"],"t.lastoutput","",$param,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre('');
+print "</tr>\n";
+
+
 if ($num > 0)
 {
 	// Loop on each job

From 70743e1f687887bed905f83d7554ace39b9007ab Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 28 Mar 2017 13:48:33 +0200
Subject: [PATCH 0488/1163] Update list header to be print with Dolibarr
 functions

---
 htdocs/core/class/listview.class.php | 259 +++++++++++++--------------
 htdocs/inventory/list.php            |  12 +-
 2 files changed, 131 insertions(+), 140 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 15510f58e9c..312ef749671 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -36,6 +36,7 @@ class Listview
 		$this->id = $id;
 		$this->TTotalTmp=array();
 		$this->sql = '';
+		$this->form = null;
 	}
 
     /**
@@ -46,12 +47,12 @@ class Listview
      */
 	private function init(&$TParam)
     {
-		global $conf, $langs;
+		global $conf, $langs, $user;
 		
-		if(!isset($TParam['hide']))$TParam['hide']=array();
-		if(!isset($TParam['link']))$TParam['link']=array();
-		if(!isset($TParam['type']))$TParam['type']=array();
-		if(!isset($TParam['orderby']['noOrder']))$TParam['orderby']['noOrder']=array();
+		if(!isset($TParam['hide'])) $TParam['hide']=array();
+		if(!isset($TParam['link'])) $TParam['link']=array();
+		if(!isset($TParam['type'])) $TParam['type']=array();
+		if(!isset($TParam['orderby']['noOrder'])) $TParam['orderby']['noOrder']=array();
 		if(!isset($TParam['allow-fields-select'])) $TParam['allow-fields-select'] = 0;
 		
 		if(!isset($TParam['list']))$TParam['list']=array();
@@ -74,12 +75,17 @@ class Listview
 		if (empty($TParam['limit']))$TParam['limit'] = array();
 		if (!empty($POSTList[$this->id]['page'])) $TParam['limit']['page'] = $POSTList[$this->id]['page'];
 		
-		$TParam['limit'] = array_merge(array('page'=>1, 'nbLine'=>$conf->liste_limit, 'global'=>0), $TParam['limit']);
+		$nbLine = !empty($user->conf->MAIN_SIZE_LISTE_LIMIT) ? $user->conf->MAIN_SIZE_LISTE_LIMIT : $conf->global->MAIN_SIZE_LISTE_LIMIT;
+		$TParam['limit'] = array_merge(array('page'=>1, 'nbLine' => $nbLine, 'global'=>0), $TParam['limit']);
 		
-		if(!empty($POSTList[$this->id]['orderBy']))
+		if (GETPOST('sortfield'))
 		{
-			$TParam['orderBy'] = $POSTList[$this->id]['orderBy']; 
+			$TParam['sortfield'] = GETPOST('sortfield');
+			$TParam['sortorder'] = GETPOST('sortorder');
 		}
+		
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+		$this->form = new Form($this->db);
 	}
 
 
@@ -279,19 +285,18 @@ class Listview
      */
     public function render($sql, $TParam=array())
     {
-		$THeader=array();
-		$TField=array();	
+		$TField=array();
 		
 		$this->init($TParam);
+		$THeader = $this->initHeader($TParam);
 		
 		$sql = $this->search($sql,$TParam);
 		$sql = $this->order_by($sql, $TParam);		
 		
 		$this->parse_sql($THeader, $TField, $TParam, $sql);	
-		
 		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
-		return $this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);
+		return $this->renderList($THeader, $TField, $TTotal, $TTotalGroup, $TParam);
 	}
 
     /**
@@ -365,9 +370,9 @@ class Listview
 			}
 			else
             {
-				
 				$label = !empty($TParam['title'][$key]) ? $TParam['title'][$key] : $key ;
-				$TParam['list']['head_search'].='<div><span style="min-width:200px;display:inline-block;">'.$libelle.'</span> '.$fsearch.'</div>';	
+				$TParam['list']['head_search'].= '<th>'.$label.'</th>';
+//				$TParam['list']['head_search'].='<div><span style="min-width:200px;display:inline-block;">'.$label.'</span> '.$fsearch.'</div>';	
 			}
 		}
 		
@@ -569,72 +574,84 @@ class Listview
      */
     private function renderList(&$THeader, &$TField, &$TTotal, &$TTotalGroup, &$TParam)
     {
+		global $bc;
+		
 		$TSearch = $this->setSearch($THeader, $TParam);
-		$TExport=$this->setExport($TParam, $TField, $THeader);
+		$TExport = $this->setExport($TParam, $TField, $THeader);
 		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
 		$out = $this->getJS();
-		$out.=load_fiche_titre($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $TParam['limit']['page'], count($TField), 'title_products.png', 0, '', '', $limit);
-		$out.='<table id="'.$this->id.'" class="liste" width="100%"><thead>';
-		
-		if(!empty($TParam['list']['head_search']))
-		{
-			$out.='<tr class="liste_titre barre-recherche-head">
-					<td colspan="'.count($THeader).'">'.$TParam['list']['head_search'].'</td>
-				</tr>';
-		}
+		$out.= load_fiche_titre($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $TParam['limit']['page'], count($TField), 'title_products.png', 0, '', '', $limit);
+		$out.= '<table id="'.$this->id.'" class="liste" width="100%"><thead>';
 			
-		$out.='<tr class="liste_titre">';
-		
-		foreach($THeader as $field=>$head)
+		$out.= '<tr class="liste_titre">';
+		foreach($THeader as $field => $head)
 		{
-			if(empty($head['width']))$head['width']='auto';
+			$moreattrib = '';
+			$search = '';
+			$prefix = '';
 
+			if ($field === 'selectedfields')
+			{
+				$moreattrib = 'align="right" ';
+				$prefix = 'maxwidthsearch ';
+			}
 
-			$out.='<th style="width:'.$head['width'].';text-align:'.$head['text-align'].'" class="liste_titre">'.$head['libelle'];
-			// TODO replace the actual html by this function call to print a standard output as Dolibarr then add extrafields
-//            $out .= getTitleFieldOfList($head, $_SERVER["PHP_SELF"],"p.ref");
+			if (empty($head['width'])) $head['width'] = 'auto';
+			if (!empty($head['width']) && !empty($head['text-align'])) $moreattrib .= 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
 
-			if($head['order']) $out.='<span class="nowrap">
-					<a href="javascript:Listview_OrderDown(\''.$this->id.'\',\''.$field.'\')">'.img_down().'</a>
-					<a href="javascript:Listview_OrderUp(\''.$this->id.'\', \''.$field.'\')">'.img_up().'</a>
-			</span>';
+			if (isset($TParam['search'][$field]['recherche']) && $TParam['search'][$field]['recherche'] !== false)
+			{
+				$TsKey = $this->getSearchKey($field, $TParam);
+				if (!empty($TsKey)) $search = implode(',', $TsKey);
+				else $search = $field;
+			}
 
-			$out.=$head['more'];
-			$out.='</th>';
+			$out .= getTitleFieldOfList($head['label'], 0, $_SERVER["PHP_SELF"], $search, '', $moreparam, $moreattrib, $TParam['sortfield'], $TParam['sortorder'], $prefix);
+			$out .= $head['more'];
 		}
 		
-		$out.='</tr>';
-			
+		//$out .= '<th aligne="right" class="maxwidthsearch liste_titre">--</th>';
+		$out .= '</tr>';
+		
 		if(count($TSearch)>0)
 		{
 			$out.='<tr class="liste_titre barre-recherche">';
-			foreach($TSearch as $field=>$search)
+//			foreach($TSearch as $field => $search)
+			foreach ($THeader as $field => $head)
 			{
-				$out.='<td class="liste_titre">'.$search.'</td>';
+				if ($field === 'selectedfields')
+				{
+					$out.= '<td class="liste_titre" align="right">'.$this->form->showFilterAndCheckAddButtons(0).'</td>';
+				}
+				else
+				{
+					$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
+					$out .= '<td class="liste_titre" '.$moreattrib.'>'.$TSearch[$field].'</td>';
+				}
 			}
-
+			
 			$out.='</tr>';
 		}
 				
 		$out.='</thead><tbody>';
 		
-		$class='pair';
-		
 		if(empty($TField))
 		{
-			$out.='<tr class="'.$class.'"><td colspan="'.$TParam['list']['nb_columns'].'">'.$TParam['list']['messageNothing'].'</td></tr>';
+			if (!empty($TParam['list']['messageNothing'])) $out .= '<tr class="'.$class.'"><td colspan="'.$TParam['list']['nb_columns'].'">'.$TParam['list']['messageNothing'].'</td></tr>';
 		}
 		else
         {
+			$var=true;
 			foreach($TField as $fields)
 			{
-				$class = ($class=='pair') ? 'impair' : 'pair';
-				$out.='<tr class="'.$class.'"> <!-- '.$field.' -->';
+				$var=!$var;
+				$out.='<tr '.$bc[$var].'> <!-- '.$field.' -->';
 			
-				foreach($fields as $field=>$value)
+				foreach ($THeader as $field => $head)
 				{
-					$out.='<td field="'.$field.'">'.$value.'</td>';
+					$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
+					$out.='<td class="'.$field.'" '.$moreattrib.'>'.$fields[$field].'</td>';
 				}
 					
 				$out.='</tr>';
@@ -642,20 +659,24 @@ class Listview
 			
 			$out.='</tbody>';
 			
-			if(!empty($TParam['list']['haveTotal']))
+			if (!empty($TParam['list']['haveTotal']))
 			{
 				$out.='<tfoot><tr class="liste_total">';
 			
-				foreach($TTotal as $field=>$total)
+				foreach ($THeader as $field => $head)
 				{
-					$out.='<td align="right" field="'.$field.'">'.price($total).'</td>';
+					if (isset($TTotal[$field]))
+					{
+						$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
+						$out.='<td align="right" class="'.$field.'" '.$moreattrib.'>'.price($TTotal[$field]).'</td>';
+					}
 				}
 					
 				$out.='</tr></tfoot>';
 			}
 		}
 
-		$out.='</table>';
+		$out .= '</table>';
 		
 		return $out;
 	}
@@ -669,15 +690,15 @@ class Listview
     {
 		$this->typeRender = 'array';
 
-		$THeader=array();
 		$TField=array();	
 		
 		$this->init($TParam);
+		$THeader = $this->initHeader($TParam);
 		
 		$this->parse_array($THeader, $TField, $TParam);
 		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
-		$this->renderList($THeader, $TField,$TTotal,$TTotalGroup, $TParam);
+		$this->renderList($THeader, $TField, $TTotal, $TTotalGroup, $TParam);
 	}
 
 
@@ -688,29 +709,15 @@ class Listview
      */
     private function order_by($sql, &$TParam)
     {
-		$first = true;
-		if(!empty($TParam['orderBy']))
+		global $db;
+		
+		if (!empty($TParam['sortfield']))
 		{
-			if(strpos($sql,'LIMIT ')!==false)
-			{
-				list($sql, $sqlLIMIT) = explode('LIMIT ', $sql);
-			}
+			if(strpos($sql,'LIMIT ') !== false) list($sql, $sqlLIMIT) = explode('LIMIT ', $sql);
 			
-			$sql.=' ORDER BY '; 
-			foreach($TParam['orderBy'] as $field=>$order)
-			{
-				if(!$first) $sql.=',';
-				
-				if($order=='DESC')$TParam['list']['orderDown'] = $field;
-				else $TParam['list']['orderUp'] = $field;
-				
-				if(strpos($field,'.')===false)	$sql.='`'.$field.'` '.$order;
-				else $sql.=$field.' '.$order;
-				
-				$first=false;
-			}
+			$sql .= $db->order($TParam['sortfield'], $TParam['sortorder']);
 			
-			if(!empty($sqlLIMIT))$sql.=' LIMIT '.$sqlLIMIT;
+			if (!empty($sqlLIMIT)) $sql .= ' LIMIT '.$sqlLIMIT;
 		}
 		
 		return $sql;
@@ -724,8 +731,6 @@ class Listview
      */
     private function parse_array(&$THeader, &$TField, &$TParam)
     {
-		$first = true;
-
 		$this->THideFlip = array_flip($TParam['hide']);
 		$this->TTotalTmp=array();
 		
@@ -733,27 +738,19 @@ class Listview
 		
 		foreach($TField as $row)
 		{
-			if($first)
-			{
-				$this->initHeader($THeader, $TParam, $row);
-				$first=false;
-			}	
-			
 			$this->set_line($TField, $TParam, $row);
 		}
 	}
 
-    /**
-     * @param $THeader
-     * @param $TParam
-     * @param $currentLine
-     */
-    private function initHeader(&$THeader, &$TParam, $currentLine)
-    {
-        global $db,$conf,$user;
-
+	
+	private function initHeader(&$TParam)
+	{
+		global $user,$conf;
+		
+		$THeader = array();
+		
 		$TField=$TFieldVisibility=array();
-		foreach ($currentLine as $field => $value)
+		foreach ($TParam['title'] as $field => $value)
 		{
 			$TField[$field]=true;
 		}
@@ -761,35 +758,35 @@ class Listview
 		$contextpage=md5($_SERVER['PHP_SELF']);
 		if(!empty($TParam['allow-field-select']))
 		{
-			include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($db);
 			$selectedfields = GETPOST('Listview'.$this->id.'_selectedfields');
 			
 			if(!empty($selectedfields))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-				$tabparam['MAIN_SELECTEDFIELDS_'.$contextpage]=$selectedfields;
-	    		$result=dol_set_user_param($db, $conf, $user, $tabparam);
+				$tabparam['MAIN_SELECTEDFIELDS_'.$contextpage] = $selectedfields;
+	    		$result=dol_set_user_param($this->db, $conf, $user, $tabparam);
 			}
 			
 			$tmpvar='MAIN_SELECTEDFIELDS_'.$contextpage;
-			if (! empty($user->conf->$tmpvar)) {
-				$tmparray=explode(',', $user->conf->$tmpvar);
-				$TParam['hide']=array();
-		        foreach($TField as $field=>$dummy)
+			if (! empty($user->conf->{$tmpvar}))
+			{
+				$tmparray = explode(',', $user->conf->{$tmpvar});
+				$TParam['hide'] = array();
+		        foreach($TField as $field => $dummy)
 		        {
-		          	$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
-
-					if(!in_array($field,$tmparray)) {
+		          	$label = $TParam['title'][$field];
+					if(!in_array($field, $tmparray))
+					{
 				  		$TParam['hide'][] = $field;
 						$visible = 0;
 				  	}
-					else{
+					else
+					{
 						$visible = 1;
 					}
 		            
-					$TFieldVisibility[$field]=array(
-						'label'=>$libelle
+					$TFieldVisibility[$field] = array(
+						'label'=>$label
 						,'checked'=>$visible
 					);
 		        }
@@ -798,28 +795,25 @@ class Listview
             {
 				foreach($TField as $field=>$dummy)
 		        {
-		        	$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
+		        	$label = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
 					$visible = (!in_array($field, $TParam['hide'])) ? 1 : 0;
 					$TFieldVisibility[$field]=array(
-						'label'=>$libelle,
+						'label'=>$label,
 						'checked'=>$visible
 					);
 				}
 			}	
 
-			$selectedfields=$form->multiSelectArrayWithCheckbox('Listview'.$this->id.'_selectedfields', $TFieldVisibility, $contextpage);	// This also change content of $arrayfields_0
+			$selectedfields = $this->form->multiSelectArrayWithCheckbox('Listview'.$this->id.'_selectedfields', $TFieldVisibility, $contextpage);	// This also change content of $arrayfields_0
 		}
-		
-		foreach ($currentLine as $field => $value)
+
+		foreach ($TParam['title'] as $field => $label)
 		{
-			$libelle = isset($TParam['title'][$field]) ? $TParam['title'][$field] : $field;
-			$visible = (!in_array($field,$TParam['hide'])) ? 1 : 0;	
-			
+			$visible = (!in_array($field, $TParam['hide'])) ? 1 : 0;
 			if($visible)
 			{
-				$lastfield = $field;
 				$THeader[$field] = array(
-					'libelle'=>$libelle,
+					'label'=>$label,
 					'order'=>(in_array($field, $TParam['orderby']['noOrder']) ? 0 : 1),
 					'width'=>(!empty($TParam['size']['width'][$field]) ? $TParam['size']['width'][$field] : 'auto'),
 					'text-align'=>(!empty($TParam['position']['text-align'][$field]) ? $TParam['position']['text-align'][$field] : 'auto'),
@@ -828,10 +822,12 @@ class Listview
 			}
 		}
 		
-		if(!empty($selectedfields) && !empty($lastfield))
+		if(!empty($selectedfields))
 		{
-			$THeader[$lastfield]['more']='<div style="float:right">'.$selectedfields.'</div>';
+			$THeader['selectedfields']['label']='<div style="float:right">'.$selectedfields.'</div>';
 		}
+		
+		return $THeader;
 	}
 
     /**
@@ -868,21 +864,20 @@ class Listview
 
         if($this->in_view($TParam,$line_number))
         {
-
             $row=array(); $trans = array();
             foreach($currentLine as $field=>$value)
             {
                 if(is_object($value))
                 {
                     if(get_class($value)=='stdClass') {$value=print_r($value, true);}
-                    else $value=(string)$value;
+                    else $value=(string) $value;
                 }
 
                 $trans['@'.$field.'@'] = $value;
 
                 if(!empty($TParam['math'][$field]))
                 {
-                    $float_value = (double)strip_tags($value);
+                    $float_value = (double) strip_tags($value);
                     $this->TTotalTmp[$field][] = $float_value;
                 }
 
@@ -900,7 +895,6 @@ class Listview
                     {
                         if($TParam['type'][$field]=='date' || $TParam['type'][$field]=='datetime' )
                         {
-
                             if($row[$field] != '0000-00-00 00:00:00' && $row[$field] != '1000-01-01 00:00:00' && $row[$field] != '0000-00-00' && !empty($row[$field]))
                             {
                                 if($TParam['type'][$field]=='datetime')$row[$field] = dol_print_date(strtotime($row[$field]),'dayhoursec');
@@ -943,7 +937,7 @@ class Listview
                 {
                     if(isset($TParam['math'][$field]) && !empty($TParam['math'][$field]))
                     {
-                        $float_value = (double)strip_tags($value);
+                        $float_value = (double) strip_tags($value);
                         $this->TTotalTmp[$field][] = $float_value;
                     }
 
@@ -959,8 +953,8 @@ class Listview
                 if(!empty($TParam['math'][$field]) && is_array($TParam['math'][$field]))
                 {
                     $toField = $TParam['math'][$field][1];
-                    $float_value = (double)strip_tags($row[$toField]);
-                    $this->TTotalTmp['@groupsum'][$toField][ $row[$field]  ] +=$float_value;
+                    $float_value = (double) strip_tags($row[$toField]);
+                    $this->TTotalTmp['@groupsum'][$toField][ $row[$field]  ] += $float_value;
                 }
             }
         }
@@ -977,7 +971,7 @@ class Listview
     {
 		if(!empty($TParam['limit']['global']) && strpos($sql,'LIMIT ')===false )
 		{
-			$sql.=' LIMIT '.(int)$TParam['limit']['global'];
+			$sql.=' LIMIT '.(int) $TParam['limit']['global'];
 		}
 		
 		return $sql;
@@ -994,26 +988,17 @@ class Listview
 		$this->sql = $this->limitSQL($sql, $TParam);
 		
 		$this->TTotalTmp=array();
-		
 		$this->THideFlip = array_flip($TParam['hide']);
-
+		
 		$res = $this->db->query($this->sql);
 		if($res!==false)
 		{
 			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_DEBUG);
 			
-			$first=true;
 			while($currentLine = $this->db->fetch_object($res))
             {
-				if($first)
-				{
-					$this->initHeader($THeader, $TParam, $currentLine);
-					$first = false;
-				}
-				
 				$this->set_line($TField, $TParam, $currentLine);
 			}
-			
 		}
 		else
         {
diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index bcea7794f7a..1f1150fb158 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -48,6 +48,7 @@ $list = new ListView($db, 'listInventory');
 $THide = array('label','title');
 
 echo $list->render(Inventory::getSQL('All'), array(
+	'allow-field-select' => true,
     'link'=>array(
         'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'
     ),
@@ -64,9 +65,9 @@ echo $list->render(Inventory::getSQL('All'), array(
     ),
     'title'=>array(
         'rowid'=>$langs->trans('Title'),
-        'fk_warehouse'=>$langs->trans('Warehouse'),
-        'date_inventory'=>$langs->trans('InventoryDate'),
+		'date_inventory'=>$langs->trans('InventoryDate'),
         'datec'=>$langs->trans('DateCreation'),
+        'fk_warehouse'=>$langs->trans('Warehouse'),
         'tms'=>$langs->trans('DateUpdate'),
         'status'=>$langs->trans('Status')
     ),
@@ -74,8 +75,13 @@ echo $list->render(Inventory::getSQL('All'), array(
         'status' => '(@val@ ? img_picto("'.$langs->trans("inventoryValidate").'", "statut4") : img_picto("'.$langs->trans("inventoryDraft").'", "statut3"))',
         'rowid'=>'Inventory::getLink(@val@)'
     ),
+	'position' => array(
+		'text-align' => array('status' => 'right')
+		
+	),
     'search'=>array(
-        'date_inventory'=>'calendars',
+		'rowid' => array('recherche' => true, 'table' => array('i'), 'field' => array('title')),
+        'date_inventory'=>array('recherche' => 'calendars'),
         'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
     )
 ));

From 80715ec61b7e0837e0c67e214aa67b407ed5bcd5 Mon Sep 17 00:00:00 2001
From: dolibarr95 <onajid@1blow-services.com>
Date: Tue, 28 Mar 2017 14:50:01 +0200
Subject: [PATCH 0489/1163] Return -1 instead of 0 if error

---
 htdocs/societe/class/companybankaccount.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index a30eee1820a..6a00de29259 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -183,7 +183,7 @@ class CompanyBankAccount extends Account
 			}
 			else
 			{
-				return 0;
+				return -1;
 			}
 		}
 		else
@@ -195,7 +195,7 @@ class CompanyBankAccount extends Account
         else
         {
             dol_print_error($this->db);
-            return 0;
+            return -1;
         }
     }
 

From df170769c93d6132a79c1796c8832167a00ac3ed Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 28 Mar 2017 16:05:18 +0200
Subject: [PATCH 0490/1163] Update function module inventory

---
 htdocs/core/class/listview.class.php | 106 ++++++++++++++++-----------
 htdocs/inventory/list.php            |   5 +-
 htdocs/langs/en_US/inventory.lang    |   4 +-
 htdocs/langs/fr_FR/inventory.lang    |  52 -------------
 4 files changed, 68 insertions(+), 99 deletions(-)
 delete mode 100644 htdocs/langs/fr_FR/inventory.lang

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 312ef749671..cb41ffd32d6 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -37,6 +37,8 @@ class Listview
 		$this->TTotalTmp=array();
 		$this->sql = '';
 		$this->form = null;
+		$this->totalRowToShow=0;
+		$this->totalRow=0;
 	}
 
     /**
@@ -70,13 +72,12 @@ class Listview
 			,'view_type'=>''
 		),$TParam['list']);
 		
-		$POSTList = GETPOST('Listview');
+		if (empty($TParam['limit'])) $TParam['limit'] = array();
 		
-		if (empty($TParam['limit']))$TParam['limit'] = array();
-		if (!empty($POSTList[$this->id]['page'])) $TParam['limit']['page'] = $POSTList[$this->id]['page'];
+		$page = GETPOST('page');
+		if (!empty($page)) $TParam['limit']['page'] = $page+1; // TODO dolibarr start page at 0 instead 1
 		
-		$nbLine = !empty($user->conf->MAIN_SIZE_LISTE_LIMIT) ? $user->conf->MAIN_SIZE_LISTE_LIMIT : $conf->global->MAIN_SIZE_LISTE_LIMIT;
-		$TParam['limit'] = array_merge(array('page'=>1, 'nbLine' => $nbLine, 'global'=>0), $TParam['limit']);
+		$TParam['limit'] = array_merge(array('page'=>1, 'nbLine' => $conf->liste_limit, 'global'=>0), $TParam['limit']);
 		
 		if (GETPOST('sortfield'))
 		{
@@ -226,7 +227,7 @@ class Listview
     {
 		$ListPOST = GETPOST('Listview');
 		
-		if(!empty($ListPOST[$this->id]['search']))
+		if (!empty($ListPOST[$this->id]['search']))
 		{
 			$sqlGROUPBY='';
 			if(strpos($sql,'GROUP BY')!==false)
@@ -236,43 +237,45 @@ class Listview
 			
 			if(strpos($sql,'WHERE ')===false) $sql.=' WHERE 1 ';
 			
-			foreach($ListPOST[$this->id]['search'] as $key => $value)
+			if (!GETPOST("button_removefilter_x") && !GETPOST("button_removefilter.x") && !GETPOST("button_removefilter"))
 			{
-				$TsKey = $this->getSearchKey($key, $TParam);
-				$TSQLMore = array();
-				
-				$allow_is_null = $this->getSearchNull($key,$TParam);
-				
-				foreach ($TsKey as $i => &$sKey)
+				// TODO input date are not supported yet
+				foreach($ListPOST[$this->id]['search'] as $key => $value)
 				{
-					if($allow_is_null && !empty($ListPOST[$this->id]['search_on_null'][$key]))
-					{
-						$TSQLMore[] = $sKey.' IS NULL ';
-						$value = '';
-					}
+					$TsKey = $this->getSearchKey($key, $TParam);
+					$TSQLMore = array();
+					$allow_is_null = $this->getSearchNull($key,$TParam);
 
-					// Do not use empty() function, statut 0 exist
-					if($value != '')
+					foreach ($TsKey as $i => &$sKey)
 					{
-						if(isset($TParam['type'][$key]) && ($TParam['type'][$key]==='date' || $TParam['type'][$key]==='datetime'))
+						if($allow_is_null && !empty($ListPOST[$this->id]['search_on_null'][$key]))
 						{
-							$this->addSqlFromTypeDate($TSQLMore, $value, $sKey);
+							$TSQLMore[] = $sKey.' IS NULL ';
+							$value = '';
 						}
-						else
+
+						// Do not use empty() function, statut 0 exist
+						if($value != '')
 						{
-							$this->addSqlFromOther($TSQLMore, $value, $TParam, $sKey, $key);
+							if(isset($TParam['type'][$key]) && ($TParam['type'][$key]==='date' || $TParam['type'][$key]==='datetime'))
+							{
+								$this->addSqlFromTypeDate($TSQLMore, $value, $sKey);
+							}
+							else
+							{
+								$this->addSqlFromOther($TSQLMore, $value, $TParam, $sKey, $key);
+							}
 						}
 					}
-				}
 
-				if(!empty($TSQLMore))
-				{
-					$sql.=' AND ( '.implode(' OR ',$TSQLMore).' ) ';
+					if(!empty($TSQLMore))
+					{
+						$sql.=' AND ( '.implode(' OR ',$TSQLMore).' ) ';
+					}
 				}
-				
 			}
 			
-			if($sqlGROUPBY!='')	$sql.=' GROUP BY '.$sqlGROUPBY;
+			if ($sqlGROUPBY!='')	$sql.=' GROUP BY '.$sqlGROUPBY;
 		}
 
 		return $sql;
@@ -326,6 +329,7 @@ class Listview
 		foreach($TParam['search'] as $key => $param_search)
 		{
 			$value = isset($ListPOST[$this->id]['search'][$key]) ? $ListPOST[$this->id]['search'][$key] : '';
+			if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) $value = '';
 			
 			$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search;  
 			
@@ -335,14 +339,14 @@ class Listview
 			}
 			else if($typeRecherche==='calendar')
 			{
-				$value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
+				$value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
 				
 				$fsearch = $form->select_date($value, 'Listview_'.$this->id.'_search_'.$key,0, 0, 1, "", 1, 0, 1);
 			}
 			else if($typeRecherche==='calendars')
 			{
-				$value_start = GETPOST('Listview_'.$this->id.'_search_'.$key.'_start') ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startmonth'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startday'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_startyear') ) : '';
-				$value_end = GETPOST('Listview_'.$this->id.'_search_'.$key.'_end') ? mktime(0,0,0, (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endmonth'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endday'), (int)GETPOST('Listview_'.$this->id.'_search_'.$key.'_endyear') ) : '';
+				$value_start = GETPOST('Listview_'.$this->id.'_search_'.$key.'_start') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startyear') ) : '';
+				$value_end = GETPOST('Listview_'.$this->id.'_search_'.$key.'_end') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endyear') ) : '';
 			
 				$fsearch = $form->select_date($value_start, 'Listview_'.$this->id.'_search_'.$key.'_start',0, 0, 1, "", 1, 0, 1)
 						 . $form->select_date($value_end, 'Listview_'.$this->id.'_search_'.$key.'_end',0, 0, 1, "", 1, 0, 1);
@@ -581,7 +585,13 @@ class Listview
 		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
 		$out = $this->getJS();
-		$out.= load_fiche_titre($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $TParam['limit']['page'], count($TField), 'title_products.png', 0, '', '', $limit);
+		
+		$dolibarr_decalage = $this->totalRow > $this->totalRowToShow ? 1 : 0;
+		ob_start();
+		print_barre_liste($TParam['list']['title'], $TParam['limit']['page']-1, $_SERVER["PHP_SELF"], '&param', $TParam['sortfield'], $TParam['sortorder'], '', $this->totalRowToShow+$dolibarr_decalage, $this->totalRow, $TParam['list']['image'], 0, '', '', $TParam['limit']['nbLine']);
+		$out .= ob_get_clean();
+		
+	
 		$out.= '<table id="'.$this->id.'" class="liste" width="100%"><thead>';
 			
 		$out.= '<tr class="liste_titre">';
@@ -617,7 +627,7 @@ class Listview
 		if(count($TSearch)>0)
 		{
 			$out.='<tr class="liste_titre barre-recherche">';
-//			foreach($TSearch as $field => $search)
+			
 			foreach ($THeader as $field => $head)
 			{
 				if ($field === 'selectedfields')
@@ -643,18 +653,24 @@ class Listview
 		else
         {
 			$var=true;
+			$line_number = 0;
 			foreach($TField as $fields)
 			{
-				$var=!$var;
-				$out.='<tr '.$bc[$var].'> <!-- '.$field.' -->';
-			
-				foreach ($THeader as $field => $head)
+				if($this->in_view($TParam, $line_number))
 				{
-					$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
-					$out.='<td class="'.$field.'" '.$moreattrib.'>'.$fields[$field].'</td>';
+					$var=!$var;
+					$out.='<tr '.$bc[$var].'> <!-- '.$field.' -->';
+
+					foreach ($THeader as $field => $head)
+					{
+						$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
+						$out.='<td class="'.$field.'" '.$moreattrib.'>'.$fields[$field].'</td>';
+					}
+
+					$out.='</tr>';
 				}
-					
-				$out.='</tr>';
+				
+				$line_number++;
 			}
 			
 			$out.='</tbody>';
@@ -731,6 +747,8 @@ class Listview
      */
     private function parse_array(&$THeader, &$TField, &$TParam)
     {
+		$this->totalRow = count($TField);
+		
 		$this->THideFlip = array_flip($TParam['hide']);
 		$this->TTotalTmp=array();
 		
@@ -864,6 +882,7 @@ class Listview
 
         if($this->in_view($TParam,$line_number))
         {
+			$this->totalRowToShow++;
             $row=array(); $trans = array();
             foreach($currentLine as $field=>$value)
             {
@@ -993,6 +1012,7 @@ class Listview
 		$res = $this->db->query($this->sql);
 		if($res!==false)
 		{
+			$this->totalRow = $this->db->num_rows($res);
 			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_DEBUG);
 			
 			while($currentLine = $this->db->fetch_object($res))
diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index 1f1150fb158..cb5b2593c32 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -61,7 +61,8 @@ echo $list->render(Inventory::getSQL('All'), array(
     ),
     'list'=>array(
         'title'=>$langs->trans('inventoryListTitle'),
-        'messageNothing'=>$langs->trans('inventoryListEmpty')
+        'messageNothing'=>$langs->trans('inventoryListEmpty'),
+		'image' => 'inventory.png@inventory'
     ),
     'title'=>array(
         'rowid'=>$langs->trans('Title'),
@@ -81,7 +82,7 @@ echo $list->render(Inventory::getSQL('All'), array(
 	),
     'search'=>array(
 		'rowid' => array('recherche' => true, 'table' => array('i'), 'field' => array('title')),
-        'date_inventory'=>array('recherche' => 'calendars'),
+        'date_inventory'=>array('recherche' => 'calendars', 'table' => array('i'), 'field' => array('date_inventory')),
         'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
     )
 ));
diff --git a/htdocs/langs/en_US/inventory.lang b/htdocs/langs/en_US/inventory.lang
index 152aceed862..db92cb9a14a 100644
--- a/htdocs/langs/en_US/inventory.lang
+++ b/htdocs/langs/en_US/inventory.lang
@@ -11,7 +11,7 @@ inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
 
 inventoryTitle=Inventory
-inventoryListTitle=List
+inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
 
 inventoryCreateDelete=Create/Delete inventory
@@ -50,5 +50,5 @@ InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 RegulateStock=Regulate Stock
-ListInventory=Inventories list
+ListInventory=List
 NewInventory=New inventory
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/inventory.lang b/htdocs/langs/fr_FR/inventory.lang
deleted file mode 100644
index 546a5202976..00000000000
--- a/htdocs/langs/fr_FR/inventory.lang
+++ /dev/null
@@ -1,52 +0,0 @@
-Module104420Name = Inventory
-Module104420Desc = Create and manage your inventory
-
-inventorySetup = Inventory Setup
-
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-
-inventoryTitle=Inventory
-inventoryListTitle=List
-inventoryListEmpty=No inventory in progress
-
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
-inventoryEdit=Edit
-inventoryValidate=Validated
-inventoryDraft=Running
-inventorySelectWarehouse=Warehouse choice
-inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
-SelectCategory=Category filter
-SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory 
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock mouvment have date of inventory
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
-AddProduct=Add
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
-inventoryDeleteLine=Delete line
-RegulateStock=Regulate Stock
-InventoryDate=Inventory date
-DateUpdate=Last update
\ No newline at end of file

From 5decbde79bd8b9204167010bf8acbf5d3b3bf138 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 28 Mar 2017 17:06:22 +0200
Subject: [PATCH 0491/1163] Fix search by date does not work

---
 htdocs/core/class/listview.class.php | 102 ++++++++++++++-------------
 1 file changed, 54 insertions(+), 48 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index cb41ffd32d6..1fcb63fa8a2 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -139,12 +139,12 @@ class Listview
 	}
 
     /**
-     * @param string    $date   date to convert
+     * @param timestamp    $date   date to convert
      * @return int|string   Date TMS or ''
      */
     private function dateToSQLDate($date)
     {
-		return $this->db->jdate($date);
+		return $this->db->idate($date);
 	}
 
 
@@ -160,21 +160,21 @@ class Listview
 			$TSQLDate=array();
 			if(!empty($value['start']))
 			{
-				$valueDeb = $this->dateToSQLDate($value['start']);
-				$TSQLDate[]=$sKey." >= '".$valueDeb." 00:00:00'" ;
+//				$valueDeb = $this->dateToSQLDate($value['start'].' 00:00:00');
+				$TSQLDate[]=$sKey." >= '".$value['start']."'" ;
 			}
 
 			if(!empty($value['end']))
 			{
-				$valueFin = $this->dateToSQLDate($value['end']);
-				$TSQLDate[]=$sKey." <= '".$valueFin." 23:59:59'" ;
+//				$valueFin = $this->dateToSQLDate($value['end'].' 23:59:59');
+				$TSQLDate[]=$sKey." <= '".$value['end']."'" ;
 			}
 
 			if(!empty($TSQLDate)) $TSQLMore[] = implode(' AND ', $TSQLDate);
 		}
 		else
 		{
-			$value = $this->dateToSQLDate($value);
+//			$value = $this->dateToSQLDate($value);
 			$TSQLMore[]=$sKey." LIKE '".$value."%'" ;
 		}
 	}
@@ -190,7 +190,9 @@ class Listview
      */
     private function addSqlFromOther(&$TSQLMore, &$value, &$TParam, $sKey, $key)
 	{
-		if($value==-1) return false;
+		// Do not use empty() function, statut 0 exist
+		if ($value == '') return false;
+		elseif($value==-1) return false;
 			
 		if(isset($TParam['operator'][$key]))
 		{
@@ -227,56 +229,60 @@ class Listview
     {
 		$ListPOST = GETPOST('Listview');
 		
-		if (!empty($ListPOST[$this->id]['search']))
+		if (!GETPOST("button_removefilter_x") && !GETPOST("button_removefilter.x") && !GETPOST("button_removefilter"))
 		{
-			$sqlGROUPBY='';
-			if(strpos($sql,'GROUP BY')!==false)
+			foreach ($TParam['search'] as $field => $info)
 			{
-				list($sql, $sqlGROUPBY) = explode('GROUP BY', $sql);
-			}
-			
-			if(strpos($sql,'WHERE ')===false) $sql.=' WHERE 1 ';
-			
-			if (!GETPOST("button_removefilter_x") && !GETPOST("button_removefilter.x") && !GETPOST("button_removefilter"))
-			{
-				// TODO input date are not supported yet
-				foreach($ListPOST[$this->id]['search'] as $key => $value)
+				$TsKey = $this->getSearchKey($field, $TParam);
+				$TSQLMore = array();
+				$allow_is_null = $this->getSearchNull($field,$TParam);
+				
+				foreach ($TsKey as $i => &$sKey)
 				{
-					$TsKey = $this->getSearchKey($key, $TParam);
-					$TSQLMore = array();
-					$allow_is_null = $this->getSearchNull($key,$TParam);
-
-					foreach ($TsKey as $i => &$sKey)
+					$value = '';
+					if (isset($ListPOST[$this->id]['search'][$field])) $value = $ListPOST[$this->id]['search'][$field];
+					
+					if ($allow_is_null && !empty($ListPOST[$this->id]['search_on_null'][$field]))
 					{
-						if($allow_is_null && !empty($ListPOST[$this->id]['search_on_null'][$key]))
-						{
-							$TSQLMore[] = $sKey.' IS NULL ';
-							$value = '';
-						}
-
-						// Do not use empty() function, statut 0 exist
-						if($value != '')
-						{
-							if(isset($TParam['type'][$key]) && ($TParam['type'][$key]==='date' || $TParam['type'][$key]==='datetime'))
-							{
-								$this->addSqlFromTypeDate($TSQLMore, $value, $sKey);
-							}
-							else
-							{
-								$this->addSqlFromOther($TSQLMore, $value, $TParam, $sKey, $key);
-							}
-						}
+						$TSQLMore[] = $sKey.' IS NULL ';
+						$value = '';
 					}
-
-					if(!empty($TSQLMore))
+					
+					if (isset($TParam['type'][$field]) && ($TParam['type'][$field]==='date' || $TParam['type'][$field]==='datetime'))
 					{
-						$sql.=' AND ( '.implode(' OR ',$TSQLMore).' ) ';
+						$k = 'Listview_'.$this->id.'_search_'.$field;
+						if ($info['recherche'] === 'calendars')
+						{
+							$value = array();
+							
+							$timestart = dol_mktime(0, 0, 0, GETPOST($k.'_startmonth'), GETPOST($k.'_startday'), GETPOST($k.'_startyear'));
+							if ($timestart) $value['start'] = date('Y-m-d', $timestart);
+							
+							$timeend = dol_mktime(23, 59, 59, GETPOST($k.'_endmonth'), GETPOST($k.'_endday'), GETPOST($k.'_endyear'));
+							if ($timeend) $value['end'] = date('Y-m-d', $timeend);
+						}
+						else
+						{
+							$time = dol_mktime(12, 0, 0, GETPOST($k.'month'), GETPOST($k.'day'), GETPOST($k.'year'));
+							if ($time) $value = date('Y-m-d', $time);
+						}
+						
+						if (!empty($value)) $this->addSqlFromTypeDate($TSQLMore, $value, $sKey);
+					}
+					else
+					{
+						$this->addSqlFromOther($TSQLMore, $value, $TParam, $sKey, $field);
 					}
 				}
+				
+				if (!empty($TSQLMore))
+				{
+					$sql.=' AND ( '.implode(' OR ',$TSQLMore).' ) ';
+				}
 			}
-			
-			if ($sqlGROUPBY!='')	$sql.=' GROUP BY '.$sqlGROUPBY;
 		}
+		
+		if ($sqlGROUPBY!='') $sql.=' GROUP BY '.$sqlGROUPBY;
 
 		return $sql;
 	}

From 31bde1ae74f63128e7e977364500781b992a569a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Mar 2017 17:12:15 +0200
Subject: [PATCH 0492/1163] Code for 6.0 new look and feel

---
 htdocs/contrat/list.php               | 111 +++++++++++++-------------
 htdocs/core/class/html.form.class.php |  80 +++++++++++++------
 htdocs/theme/eldy/style.css.php       |   3 +-
 htdocs/theme/md/style.css.php         |   3 +-
 4 files changed, 112 insertions(+), 85 deletions(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 7436c16fe69..c382bfc7612 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -340,7 +340,7 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+	
     print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'title_commercial.png', 0, '', '', $limit);
 
 	if ($sall)
@@ -393,51 +393,12 @@ if ($resql)
 
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	
+	if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+    
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-    print '<tr class="liste_titre">';
-    if (! empty($arrayfields['c.ref']['checked']))               print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref","","$param",'',$sortfield,$sortorder);
-    if (! empty($arrayfields['c.ref_customer']['checked']))      print_liste_field_titre($arrayfields['c.ref_customer']['label'], $_SERVER["PHP_SELF"], "c.ref_customer","","$param",'',$sortfield,$sortorder);
-    if (! empty($arrayfields['c.ref_supplier']['checked']))      print_liste_field_titre($arrayfields['c.ref_supplier']['label'], $_SERVER["PHP_SELF"], "c.ref_supplier","","$param",'',$sortfield,$sortorder);
-    if (! empty($arrayfields['s.nom']['checked']))               print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom","","$param",'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.town']['checked']))              print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.zip']['checked']))               print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['state.nom']['checked']))           print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['country.code_iso']['checked']))    print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['typent.code']['checked']))         print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-    if (! empty($arrayfields['sale_representative']['checked'])) print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "","","$param",'',$sortfield,$sortorder);
-    if (! empty($arrayfields['c.date_contrat']['checked']))      print_liste_field_titre($arrayfields['c.date_contrat']['label'], $_SERVER["PHP_SELF"], "c.date_contrat","","$param",'align="center"',$sortfield,$sortorder);
-	// Extra fields
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-	   foreach($extrafields->attribute_label as $key => $val) 
-	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
-           {
-				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-           }
-	   }
-	}
-	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
-    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-	if (! empty($arrayfields['c.datec']['checked']))     print_liste_field_titre($arrayfields['c.datec']['label'],$_SERVER["PHP_SELF"],"c.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['c.tms']['checked']))       print_liste_field_titre($arrayfields['c.tms']['label'],$_SERVER["PHP_SELF"],"c.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-    if (! empty($arrayfields['status']['checked']))
-    {
-        print_liste_field_titre($staticcontratligne->LibStatut(0,3), '', '', '', '', 'width="16"');
-        print_liste_field_titre($staticcontratligne->LibStatut(4,3,0), '', '', '', '', 'width="16"');
-        print_liste_field_titre($staticcontratligne->LibStatut(4,3,1), '', '', '', '', 'width="16"');
-        print_liste_field_titre($staticcontratligne->LibStatut(5,3), '', '', '', '', 'width="16"');
-    }
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-    print "</tr>\n";
 
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<tr class="liste_titre">';
+    print '<tr class="liste_titre_filter">';
     if (! empty($arrayfields['c.ref']['checked']))
     {
         print '<td class="liste_titre">';
@@ -486,7 +447,7 @@ if ($resql)
         print '<td class="liste_titre maxwidthonsmartphone" align="center">';
         print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
         print '</td>';
-    }    
+    }
     if (! empty($arrayfields['sale_representative']['checked']))
     {
         print '<td class="liste_titre"></td>';
@@ -495,12 +456,12 @@ if ($resql)
     {
         // Date contract
         print '<td class="liste_titre center">';
-      	//print $langs->trans('Month').': ';
-       	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-       	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-       	//print '&nbsp;'.$langs->trans('Year').': ';
-       	$syear = $year;
-       	$formother->select_year($syear,'year',1, 20, 5);
+        //print $langs->trans('Month').': ';
+        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+        print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+        //print '&nbsp;'.$langs->trans('Year').': ';
+        $syear = $year;
+        $formother->select_year($syear,'year',1, 20, 5);
         print '</td>';
     }
     // Extra fields
@@ -541,19 +502,58 @@ if ($resql)
     {
         print '<td class="liste_titre">';
         print '</td>';
-    }    
+    }
     // Status
     if (! empty($arrayfields['status']['checked']))
     {
         print '<td class="liste_titre" colspan="4" align="right"></td>';
     }
     print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-	print $searchpitco;
+    $searchpitco=$form->showFilterButtons();
+    print $searchpitco;
     print '</td>';
     print "</tr>\n";
+    
+    print '<tr class="liste_titre">';
+    if (! empty($arrayfields['c.ref']['checked']))               print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref","","$param",'',$sortfield,$sortorder);
+    if (! empty($arrayfields['c.ref_customer']['checked']))      print_liste_field_titre($arrayfields['c.ref_customer']['label'], $_SERVER["PHP_SELF"], "c.ref_customer","","$param",'',$sortfield,$sortorder);
+    if (! empty($arrayfields['c.ref_supplier']['checked']))      print_liste_field_titre($arrayfields['c.ref_supplier']['label'], $_SERVER["PHP_SELF"], "c.ref_supplier","","$param",'',$sortfield,$sortorder);
+    if (! empty($arrayfields['s.nom']['checked']))               print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom","","$param",'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.town']['checked']))              print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.zip']['checked']))               print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['state.nom']['checked']))           print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['country.code_iso']['checked']))    print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['typent.code']['checked']))         print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['sale_representative']['checked'])) print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "","","$param",'',$sortfield,$sortorder);
+    if (! empty($arrayfields['c.date_contrat']['checked']))      print_liste_field_titre($arrayfields['c.date_contrat']['label'], $_SERVER["PHP_SELF"], "c.date_contrat","","$param",'align="center"',$sortfield,$sortorder);
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	   foreach($extrafields->attribute_label as $key => $val) 
+	   {
+           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           {
+				$align=$extrafields->getAlignFlag($key);
+				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+           }
+	   }
+	}
+	// Hook fields
+	$parameters=array('arrayfields'=>$arrayfields);
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+	if (! empty($arrayfields['c.datec']['checked']))     print_liste_field_titre($arrayfields['c.datec']['label'],$_SERVER["PHP_SELF"],"c.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['c.tms']['checked']))       print_liste_field_titre($arrayfields['c.tms']['label'],$_SERVER["PHP_SELF"],"c.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+    if (! empty($arrayfields['status']['checked']))
+    {
+        print_liste_field_titre($staticcontratligne->LibStatut(0,3), '', '', '', '', 'width="16"');
+        print_liste_field_titre($staticcontratligne->LibStatut(4,3,0), '', '', '', '', 'width="16"');
+        print_liste_field_titre($staticcontratligne->LibStatut(4,3,1), '', '', '', '', 'width="16"');
+        print_liste_field_titre($staticcontratligne->LibStatut(5,3), '', '', '', '', 'width="16"');
+    }
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+    print "</tr>\n";
 
-    $var=true;
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($resql);
@@ -563,8 +563,7 @@ if ($resql)
         $contracttmp->ref_customer=$obj->ref_customer;
         $contracttmp->ref_supplier=$obj->ref_supplier;
         
-        $var=!$var;
-        print '<tr '.$bc[$var].'>';
+        print '<tr>';
         if (! empty($arrayfields['c.ref']['checked']))
         {
             print '<td class="nowrap">';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4b8d9517dcf..271f87ab4a0 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5804,8 +5804,8 @@ class Form
             $navurl = preg_replace('/\/tasks\/(task|contact|time|note|document).php/','/tasks.php',$navurl);
             $paramid='ref';
         }
-        $previous_ref = $object->ref_previous?'<a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$navurl.'?'.$paramid.'='.urlencode($object->ref_previous).$moreparam.'">'.(($conf->dol_use_jmobile != 4)?'&lt;':'&nbsp;').'</a>':'<span class="inactive">'.(($conf->dol_use_jmobile != 4)?'&lt;':'&nbsp;').'</span>';
-        $next_ref     = $object->ref_next?'<a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$navurl.'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'">'.(($conf->dol_use_jmobile != 4)?'&gt;':'&nbsp;').'</a>':'<span class="inactive">'.(($conf->dol_use_jmobile != 4)?'&gt;':'&nbsp;').'</span>';
+        $previous_ref = $object->ref_previous?'<a href="'.$navurl.'?'.$paramid.'='.urlencode($object->ref_previous).$moreparam.'"><i class="fa fa-chevron-left"></i></a>':'<span class="inactive"><i class="fa fa-chevron-left opacitymedium"></i></span>';
+        $next_ref     = $object->ref_next?'<a href="'.$navurl.'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'"><i class="fa fa-chevron-right"></i></a>':'<span class="inactive"><i class="fa fa-chevron-right opacitymedium"></i></span>';
 
         //print "xx".$previous_ref."x".$next_ref;
         $ret.='<!-- Start banner content --><div style="vertical-align: middle">';
@@ -6158,6 +6158,57 @@ class Form
         return $out;
     }
 
+    
+    /**
+     *	Return HTML to show the search and clear seach button
+     *
+     *  @return	string
+     */
+    function showFilterButtons()
+    {
+        global $conf, $langs;
+    
+        $out='<div class="nowrap">';
+        $out.='<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+        $out.='<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+        $out.='</div>';
+
+        return $out;
+    }
+
+    /**
+     *	Return HTML to show the search and clear seach button
+     *
+     *  @param  string  $cssclass                  CSS class
+     *  @param  int     $calljsfunction            0=default. 1=call function initCheckForSelect() after changing status of checkboxes
+     *  @return	string
+     */
+    function showCheckAddButtons($cssclass='checkforaction', $calljsfunction=0)
+    {
+        global $conf, $langs;
+    
+        $out='';
+        if (! empty($conf->use_javascript_ajax)) $out.='<input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions">';
+        $out.='<script type="text/javascript">
+            $(document).ready(function() {
+            	$("#checkallactions").click(function() {
+                    if($(this).is(\':checked\')){
+                        console.log("We check all");
+                		$(".'.$cssclass.'").prop(\'checked\', true);
+                    }
+                    else
+                    {
+                        console.log("We uncheck all");
+                		$(".'.$cssclass.'").prop(\'checked\', false);
+                    }'."\n";
+        if ($calljsfunction) $out.='if (typeof initCheckForSelect == \'function\') { initCheckForSelect(); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
+        $out.='         });
+                });
+            </script>';
+
+        return $out;
+    }
+
     /**
      *	Return HTML to show the search and clear seach button
      *
@@ -6168,31 +6219,10 @@ class Form
      */
     function showFilterAndCheckAddButtons($addcheckuncheckall=0, $cssclass='checkforaction', $calljsfunction=0)
     {
-        global $conf, $langs;
-
-        $out='<div class="nowrap">';
-        $out.='<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-        $out.='<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-        $out.='</div>';
+        $out.=$this->showFilterButtons();
         if ($addcheckuncheckall)
         {
-            if (! empty($conf->use_javascript_ajax)) $out.='<input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions">';
-            $out.='<script type="text/javascript">
-                $(document).ready(function() {
-                	$("#checkallactions").click(function() {
-                        if($(this).is(\':checked\')){
-                            console.log("We check all");
-                    		$(".'.$cssclass.'").prop(\'checked\', true);
-                        }
-                        else
-                        {
-                            console.log("We uncheck all");
-                    		$(".'.$cssclass.'").prop(\'checked\', false);
-                        }'."\n";
-            if ($calljsfunction) $out.='if (typeof initCheckForSelect == \'function\') { initCheckForSelect(); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
-            $out.='         });
-                    });
-                </script>';
+            $out.=$this->showCheckAddButtons($cssclass, $calljsfunction);
         }
         return $out;
     }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 51a5ab39889..b16d6d13790 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -584,7 +584,7 @@ div.myavailability {
 	padding-bottom: 4px;
 }
 .checkallactions {
-	vertical-align: top;
+	vertical-align: text-bottom;
     margin-top: 6px;
     margin-left: 4px;
 }
@@ -2505,7 +2505,6 @@ div.pagination li {
 div.pagination li.pagination a,
 div.pagination li.pagination span {
   padding: 6px 12px;
-  margin-left: -1px;
   line-height: 1.42857143;
   color: #000;
   text-decoration: none;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 4c1d32c31ad..d80630f0501 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -587,7 +587,7 @@ div.myavailability {
 	padding-bottom: 4px;
 }
 .checkallactions {
-	vertical-align: top;
+	vertical-align: text-bottom;
     margin-top: 6px;
     margin-left: 4px;
 }
@@ -2413,7 +2413,6 @@ div.pagination li {
 div.pagination li.pagination a,
 div.pagination li.pagination span {
   padding: 6px 12px;
-  margin-left: -1px;
   line-height: 1.42857143;
   color: #000;
   text-decoration: none;

From 466b6518b25d0a7e6ec0fb22e0d3514963b63b32 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 28 Mar 2017 17:18:55 +0200
Subject: [PATCH 0493/1163] Update add the custom value "limit" for the list

---
 htdocs/inventory/list.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index cb5b2593c32..ff2c5e4d8d4 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -48,6 +48,9 @@ $list = new ListView($db, 'listInventory');
 $THide = array('label','title');
 
 echo $list->render(Inventory::getSQL('All'), array(
+	'limit' => array(
+		'nbLine' => GETPOST('limit')
+	),
 	'allow-field-select' => true,
     'link'=>array(
         'fk_warehouse'=>'<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id=@val@">'.img_picto('','object_stock.png','',0).' @label@</a>'

From fe1b1ede0f14fb39f11f136ce88326cc5c6acbe2 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 28 Mar 2017 17:35:51 +0200
Subject: [PATCH 0494/1163] Fix remove filter on date

---
 htdocs/core/class/listview.class.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index 1fcb63fa8a2..a5af2d6f758 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -332,10 +332,11 @@ class Listview
 		}	
 		
 		$ListPOST = GETPOST('Listview');
+		$removeFilter = (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter"));
 		foreach($TParam['search'] as $key => $param_search)
 		{
 			$value = isset($ListPOST[$this->id]['search'][$key]) ? $ListPOST[$this->id]['search'][$key] : '';
-			if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) $value = '';
+			if ($removeFilter) $value = '';
 			
 			$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search;  
 			
@@ -345,14 +346,18 @@ class Listview
 			}
 			else if($typeRecherche==='calendar')
 			{
-				$value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
+				if (!$removeFilter) $value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
 				
 				$fsearch = $form->select_date($value, 'Listview_'.$this->id.'_search_'.$key,0, 0, 1, "", 1, 0, 1);
 			}
 			else if($typeRecherche==='calendars')
 			{
-				$value_start = GETPOST('Listview_'.$this->id.'_search_'.$key.'_start') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startyear') ) : '';
-				$value_end = GETPOST('Listview_'.$this->id.'_search_'.$key.'_end') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endyear') ) : '';
+				$value_start = $value_end = '';
+				if (!$removeFilter)
+				{
+					$value_start = GETPOST('Listview_'.$this->id.'_search_'.$key.'_start') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startyear') ) : '';
+					$value_end = GETPOST('Listview_'.$this->id.'_search_'.$key.'_end') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endyear') ) : '';
+				}
 			
 				$fsearch = $form->select_date($value_start, 'Listview_'.$this->id.'_search_'.$key.'_start',0, 0, 1, "", 1, 0, 1)
 						 . $form->select_date($value_end, 'Listview_'.$this->id.'_search_'.$key.'_end',0, 0, 1, "", 1, 0, 1);
@@ -654,7 +659,7 @@ class Listview
 		
 		if(empty($TField))
 		{
-			if (!empty($TParam['list']['messageNothing'])) $out .= '<tr class="'.$class.'"><td colspan="'.$TParam['list']['nb_columns'].'">'.$TParam['list']['messageNothing'].'</td></tr>';
+			if (!empty($TParam['list']['messageNothing'])) $out .= '<tr class="pair" align="center"><td colspan="'.(count($TParam['title'])+1).'">'.$TParam['list']['messageNothing'].'</td></tr>';
 		}
 		else
         {

From e416ea275e0a808ebb46b686a05a7bce1902e26b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Mar 2017 18:42:23 +0200
Subject: [PATCH 0495/1163] Work on 6.0 look and feel

---
 htdocs/adherents/list.php                     | 93 ++++++++++---------
 htdocs/adherents/subscription/list.php        | 32 +++----
 htdocs/comm/action/index.php                  | 12 +--
 htdocs/comm/action/listactions.php            |  8 +-
 htdocs/comm/action/peruser.php                |  4 +-
 htdocs/compta/bank/annuel.php                 |  2 +-
 htdocs/compta/bank/bankentries.php            | 74 ++++++++-------
 htdocs/compta/bank/card.php                   |  6 +-
 htdocs/compta/bank/class/account.class.php    | 59 +++++++++++-
 htdocs/compta/bank/class/bankcateg.class.php  |  5 +-
 htdocs/compta/bank/document.php               |  2 +-
 htdocs/compta/bank/index.php                  | 64 +++++++------
 htdocs/compta/bank/info.php                   | 24 +++--
 htdocs/compta/bank/ligne.php                  | 15 ++-
 htdocs/compta/bank/treso.php                  |  2 +-
 htdocs/compta/facture/list.php                | 82 ++++++++--------
 htdocs/contrat/card.php                       | 38 ++++----
 htdocs/contrat/contact.php                    |  2 +-
 htdocs/contrat/document.php                   |  2 +-
 htdocs/contrat/info.php                       | 20 ++--
 htdocs/contrat/note.php                       |  2 +-
 htdocs/core/class/html.formactions.class.php  |  2 +-
 htdocs/core/lib/agenda.lib.php                |  2 +-
 htdocs/core/lib/bank.lib.php                  |  5 +
 htdocs/core/lib/functions.lib.php             | 10 +-
 htdocs/core/tpl/objectline_create.tpl.php     |  1 -
 htdocs/core/tpl/resource_add.tpl.php          |  3 +-
 htdocs/core/tpl/resource_view.tpl.php         |  8 +-
 htdocs/fichinter/list.php                     | 64 ++++++-------
 htdocs/fourn/commande/list.php                | 83 +++++++++--------
 htdocs/fourn/facture/list.php                 | 81 ++++++++--------
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 +
 .../mysql/tables/llx_supplier_proposaldet.sql |  2 +-
 htdocs/projet/list.php                        | 70 +++++++-------
 htdocs/projet/tasks/list.php                  | 70 +++++++-------
 htdocs/resource/element_resource.php          |  1 +
 htdocs/supplier_proposal/list.php             | 29 +++---
 htdocs/theme/eldy/style.css.php               |  8 +-
 htdocs/theme/md/style.css.php                 |  5 +-
 39 files changed, 550 insertions(+), 444 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 28cd8773d53..8d00194993b 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -377,52 +377,10 @@ $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfiel
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-print '<tr class="liste_titre">';
-if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
-{
-	print '<td colspan="1" align="center">'.$langs->trans("NumberingShort").'</td>';
-}
-if (! empty($arrayfields['d.ref']['checked']))            print_liste_field_titre($arrayfields['d.ref']['label'],$_SERVER["PHP_SELF"],'d.rowid','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['d.firstname']['checked']))      print_liste_field_titre($arrayfields['d.firstname']['label'],$_SERVER["PHP_SELF"],'d.firstname','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['d.lastname']['checked']))       print_liste_field_titre($arrayfields['d.lastname']['label'],$_SERVER["PHP_SELF"],'d.lastname','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['d.company']['checked']))        print_liste_field_titre($arrayfields['d.company']['label'],$_SERVER["PHP_SELF"],'d.societe','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['d.login']['checked']))          print_liste_field_titre($arrayfields['d.login']['label'],$_SERVER["PHP_SELF"],'d.login','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['d.morphy']['checked']))         print_liste_field_titre($arrayfields['d.morphy']['label'],$_SERVER["PHP_SELF"],'d.morphy','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['t.libelle']['checked']))        print_liste_field_titre($arrayfields['t.libelle']['label'],$_SERVER["PHP_SELF"],'t.libelle','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['d.address']['checked']))        print_liste_field_titre($arrayfields['d.address']['label'],$_SERVER["PHP_SELF"],'d.address','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['d.zip']['checked']))            print_liste_field_titre($arrayfields['d.zip']['label'],$_SERVER["PHP_SELF"],'d.zip','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['d.town']['checked']))           print_liste_field_titre($arrayfields['d.town']['label'],$_SERVER["PHP_SELF"],'d.town','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($langs->trans("StateShort"),$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($langs->trans("Country"),$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['d.phone']['checked']))          print_liste_field_titre($arrayfields['d.phone']['label'],$_SERVER["PHP_SELF"],'d.phone','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['d.phone_perso']['checked']))    print_liste_field_titre($arrayfields['d.phone_perso']['label'],$_SERVER["PHP_SELF"],'d.phone_perso','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['d.phone_mobile']['checked']))   print_liste_field_titre($arrayfields['d.phone_mobile']['label'],$_SERVER["PHP_SELF"],'d.phone_mobile','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['d.email']['checked']))          print_liste_field_titre($arrayfields['d.email']['label'],$_SERVER["PHP_SELF"],'d.email','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['d.datefin']['checked']))        print_liste_field_titre($arrayfields['d.datefin']['label'],$_SERVER["PHP_SELF"],'d.datefin','',$param,'align="center"',$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val) 
-   {
-       if (! empty($arrayfields["ef.".$key]['checked'])) 
-       {
-			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['d.datec']['checked']))     print_liste_field_titre($arrayfields['d.datec']['label'],$_SERVER["PHP_SELF"],"d.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['d.tms']['checked']))       print_liste_field_titre($arrayfields['d.tms']['label'],$_SERVER["PHP_SELF"],"d.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['d.statut']['checked']))    print_liste_field_titre($arrayfields['d.statut']['label'],$_SERVER["PHP_SELF"],"d.statut","",$param,'align="right"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-print "</tr>\n";
+
 
 // Line for filters fields
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 
 // Line numbering
 if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
@@ -595,7 +553,50 @@ print '</td>';
 
 print "</tr>\n";
 
-$var=True;
+print '<tr class="liste_titre">';
+if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+{
+    print '<td colspan="1" align="center">'.$langs->trans("NumberingShort").'</td>';
+}
+if (! empty($arrayfields['d.ref']['checked']))            print_liste_field_titre($arrayfields['d.ref']['label'],$_SERVER["PHP_SELF"],'d.rowid','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['d.firstname']['checked']))      print_liste_field_titre($arrayfields['d.firstname']['label'],$_SERVER["PHP_SELF"],'d.firstname','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['d.lastname']['checked']))       print_liste_field_titre($arrayfields['d.lastname']['label'],$_SERVER["PHP_SELF"],'d.lastname','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['d.company']['checked']))        print_liste_field_titre($arrayfields['d.company']['label'],$_SERVER["PHP_SELF"],'d.societe','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['d.login']['checked']))          print_liste_field_titre($arrayfields['d.login']['label'],$_SERVER["PHP_SELF"],'d.login','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['d.morphy']['checked']))         print_liste_field_titre($arrayfields['d.morphy']['label'],$_SERVER["PHP_SELF"],'d.morphy','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['t.libelle']['checked']))        print_liste_field_titre($arrayfields['t.libelle']['label'],$_SERVER["PHP_SELF"],'t.libelle','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['d.address']['checked']))        print_liste_field_titre($arrayfields['d.address']['label'],$_SERVER["PHP_SELF"],'d.address','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['d.zip']['checked']))            print_liste_field_titre($arrayfields['d.zip']['label'],$_SERVER["PHP_SELF"],'d.zip','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['d.town']['checked']))           print_liste_field_titre($arrayfields['d.town']['label'],$_SERVER["PHP_SELF"],'d.town','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($langs->trans("StateShort"),$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($langs->trans("Country"),$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['d.phone']['checked']))          print_liste_field_titre($arrayfields['d.phone']['label'],$_SERVER["PHP_SELF"],'d.phone','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['d.phone_perso']['checked']))    print_liste_field_titre($arrayfields['d.phone_perso']['label'],$_SERVER["PHP_SELF"],'d.phone_perso','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['d.phone_mobile']['checked']))   print_liste_field_titre($arrayfields['d.phone_mobile']['label'],$_SERVER["PHP_SELF"],'d.phone_mobile','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['d.email']['checked']))          print_liste_field_titre($arrayfields['d.email']['label'],$_SERVER["PHP_SELF"],'d.email','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['d.datefin']['checked']))        print_liste_field_titre($arrayfields['d.datefin']['label'],$_SERVER["PHP_SELF"],'d.datefin','',$param,'align="center"',$sortfield,$sortorder);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        if (! empty($arrayfields["ef.".$key]['checked']))
+        {
+            $align=$extrafields->getAlignFlag($key);
+            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+        }
+    }
+}
+// Hook fields
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['d.datec']['checked']))     print_liste_field_titre($arrayfields['d.datec']['label'],$_SERVER["PHP_SELF"],"d.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['d.tms']['checked']))       print_liste_field_titre($arrayfields['d.tms']['label'],$_SERVER["PHP_SELF"],"d.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['d.statut']['checked']))    print_liste_field_titre($arrayfields['d.statut']['label'],$_SERVER["PHP_SELF"],"d.statut","",$param,'align="right"',$sortfield,$sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print "</tr>\n";
+
 $i = 0;
 while ($i < min($num, $limit))
 {
@@ -619,7 +620,7 @@ while ($i < min($num, $limit))
 	}
 
 	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	print "<tr>";
 	
 	if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 	{
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index d8116c79e94..0705a035ba0 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -159,22 +159,6 @@ if ($result)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"c.rowid",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Login"),$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"c.note",$param,"",'align="left"',$sortfield,$sortorder);
-    if (! empty($conf->banque->enabled))
-    {
-        print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"b.fk_account",$pram,"","",$sortfield,$sortorder);
-    }
-    print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"c.dateadh",$param,"",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"c.datef",$param,"",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"c.subscription",$param,"",'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre('');
-    print "</tr>\n";
-
-
 	// Line for filters fields
 	print '<tr class="liste_titre">';
 
@@ -214,6 +198,22 @@ if ($result)
 	print "</tr>\n";
 
 
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"c.rowid",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Login"),$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"c.note",$param,"",'align="left"',$sortfield,$sortorder);
+	if (! empty($conf->banque->enabled))
+	{
+	    print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"b.fk_account",$pram,"","",$sortfield,$sortorder);
+	}
+	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"c.dateadh",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"c.datef",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"c.subscription",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
+	
+	
     // Static objects
     $subscription=new Subscription($db);
     $adherent=new Adherent($db);
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 25d410e7bdb..13fb3d9624f 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -306,28 +306,28 @@ $param.="&maxprint=".$maxprint;
 // Show navigation bar
 if (empty($action) || $action=='show_month')
 {
-    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month.$param."\">".img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a>\n";
+    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
     $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,1,$year),"%b %Y");
     $nav.=" </span>\n";
-    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month.$param."\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>\n";
+    $nav.=" &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";
     $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth.$param."\">".$langs->trans("Today")."</a>)";
     $picto='calendar';
 }
 if ($action=='show_week')
 {
-    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a>\n";
+    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\" title=\"".dol_escape_htmltag($langs->trans("Previous"))."\"></i></a> &nbsp;\n";
     $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week;
     $nav.=" </span>\n";
-    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>\n";
+    $nav.=" &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
     $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
     $picto='calendarweek';
 }
 if ($action=='show_day')
 {
-    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a>\n";
+    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
     $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,$day,$year),"daytextshort");
     $nav.=" </span>\n";
-    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>\n";
+    $nav.=" &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";
     $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
     $picto='calendarday';
 }
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 0a08b6e55f1..8776984345b 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
+include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 
 $langs->load("users");
 $langs->load("companies");
@@ -147,6 +148,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 
 $form=new Form($db);
 $userstatic=new User($db);
+$formactions=new FormActions($db);
 
 $nav='';
 $nav.=$form->select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1);
@@ -227,6 +229,7 @@ if ($type) $sql.= " AND c.id = ".$type;
 if ($status == '0') { $sql.= " AND a.percent = 0"; }
 if ($status == '-1') { $sql.= " AND a.percent = -1"; }	// Not applicable
 if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
+if ($status == '100') { $sql.= " AND a.percent = 100"; }
 if ($status == 'done' || $status == '100') { $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))"; }
 if ($status == 'todo') { $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))"; }
 if ($search_title) $sql.=natural_search("a.label", $search_title);
@@ -324,7 +327,6 @@ if ($resql)
     if ($optioncss != '') $nav.= '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     if ($actioncode) $nav.='<input type="hidden" name="actioncode" value="'.$actioncode.'">';
     if ($resourceid) $nav.='<input type="hidden" name="resourceid" value="'.$resourceid.'">';
-    if ($status || isset($_GET['status']) || isset($_POST['status']))  $nav.='<input type="hidden" name="status" value="'.$status.'">';
     if ($filter)  $nav.='<input type="hidden" name="filter" value="'.$filter.'">';
     if ($filtert) $nav.='<input type="hidden" name="filtert" value="'.$filtert.'">';
     if ($socid)   $nav.='<input type="hidden" name="socid" value="'.$socid.'">';
@@ -368,7 +370,9 @@ if ($resql)
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
-    print '<td class="liste_titre"></td>';
+    print '<td class="liste_titre center">';
+    print $formactions->form_select_status_action('formaction',$status,1,'status',1,2);
+    print '</td>';
 	// Action column
 	print '<td class="liste_titre" align="middle">';
 	$searchpitco=$form->showFilterAndCheckAddButtons(0);
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index f5de3fa6ca3..61bf98634c4 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -242,10 +242,10 @@ $max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year));
 
 $tmpday = $first_day;
 
-$nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a>\n";
+$nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\" title=\"".dol_escape_htmltag($langs->trans("Previous"))."\"></i></a> &nbsp; \n";
 $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week;
 $nav.=" </span>\n";
-$nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>\n";
+$nav.=" &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
 $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
 $picto='calendarweek';
 
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index af63247f48d..a81a0072302 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -144,7 +144,7 @@ else
 
 // Onglets
 $head=bank_prepare_head($object);
-dol_fiche_head($head,'annual',$langs->trans("FinancialAccount"),0,'account');
+dol_fiche_head($head, 'annual', $langs->trans("FinancialAccount"), -1, 'account');
 
 $title=$langs->trans("FinancialAccount")." : ".$object->label;
 $link=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?account=".$object->id."&year_start=".($year_start-1)."'>".img_previous('', 'class="valignbottom"')."</a> ".$langs->trans("Year")." <a href='".$_SERVER["PHP_SELF"]."?account=".$object->id."&year_start=".($year_start+1)."'>".img_next('', 'class="valignbottom"')."</a>":"");
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index 9af9b6f4707..c7596a0aee2 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -720,43 +720,8 @@ if ($resql)
 	
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	
-	// Fields title
-	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['b.rowid']['checked']))            print_liste_field_titre($arrayfields['b.rowid']['label'],$_SERVER['PHP_SELF'],'b.rowid','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['description']['checked']))        print_liste_field_titre($arrayfields['description']['label'],$_SERVER['PHP_SELF'],'','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['b.dateo']['checked']))            print_liste_field_titre($arrayfields['b.dateo']['label'],$_SERVER['PHP_SELF'],'b.dateo','',$param,'align="center"',$sortfield,$sortorder);
-    if (! empty($arrayfields['b.datev']['checked']))            print_liste_field_titre($arrayfields['b.datev']['label'],$_SERVER['PHP_SELF'],'b.datev, b.dateo, b.rowid','',$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['type']['checked']))               print_liste_field_titre($arrayfields['type']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="center"',$sortfield,$sortorder);
-    if (! empty($arrayfields['b.num_chq']['checked']))          print_liste_field_titre($arrayfields['b.num_chq']['label'],$_SERVER['PHP_SELF'],'b.num_chq','',$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['bu.label']['checked']))           print_liste_field_titre($arrayfields['bu.label']['label'],$_SERVER['PHP_SELF'],'bu.label','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['ba.ref']['checked']))             print_liste_field_titre($arrayfields['ba.ref']['label'],$_SERVER['PHP_SELF'],'ba.ref','',$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['b.debit']['checked']))            print_liste_field_titre($arrayfields['b.debit']['label'],$_SERVER['PHP_SELF'],'b.amount','',$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['b.credit']['checked']))           print_liste_field_titre($arrayfields['b.credit']['label'],$_SERVER['PHP_SELF'],'b.amount','',$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['balance']['checked']))            print_liste_field_titre($arrayfields['balance']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['b.num_releve']['checked']))       print_liste_field_titre($arrayfields['b.num_releve']['label'],$_SERVER['PHP_SELF'],'b.num_releve','',$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['b.conciliated']['checked']))      print_liste_field_titre($arrayfields['b.conciliated']['label'],$_SERVER['PHP_SELF'],'b.rappro','',$param,'align="center"',$sortfield,$sortorder);
-	// Extra fields
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-	   foreach($extrafields->attribute_label as $key => $val) 
-	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
-           {
-				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-           }
-	   }
-	}
-	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
-    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-	print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
 
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	if (! empty($arrayfields['b.rowid']['checked']))            
 	{
 	    print '<td class="liste_titre">';
@@ -837,6 +802,43 @@ if ($resql)
     print '</td>';
 	print "</tr>\n";
 
+
+	// Fields title
+	print '<tr class="liste_titre">';
+	if (! empty($arrayfields['b.rowid']['checked']))            print_liste_field_titre($arrayfields['b.rowid']['label'],$_SERVER['PHP_SELF'],'b.rowid','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['description']['checked']))        print_liste_field_titre($arrayfields['description']['label'],$_SERVER['PHP_SELF'],'','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['b.dateo']['checked']))            print_liste_field_titre($arrayfields['b.dateo']['label'],$_SERVER['PHP_SELF'],'b.dateo','',$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['b.datev']['checked']))            print_liste_field_titre($arrayfields['b.datev']['label'],$_SERVER['PHP_SELF'],'b.datev, b.dateo, b.rowid','',$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['type']['checked']))               print_liste_field_titre($arrayfields['type']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['b.num_chq']['checked']))          print_liste_field_titre($arrayfields['b.num_chq']['label'],$_SERVER['PHP_SELF'],'b.num_chq','',$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['bu.label']['checked']))           print_liste_field_titre($arrayfields['bu.label']['label'],$_SERVER['PHP_SELF'],'bu.label','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['ba.ref']['checked']))             print_liste_field_titre($arrayfields['ba.ref']['label'],$_SERVER['PHP_SELF'],'ba.ref','',$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['b.debit']['checked']))            print_liste_field_titre($arrayfields['b.debit']['label'],$_SERVER['PHP_SELF'],'b.amount','',$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['b.credit']['checked']))           print_liste_field_titre($arrayfields['b.credit']['label'],$_SERVER['PHP_SELF'],'b.amount','',$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['balance']['checked']))            print_liste_field_titre($arrayfields['balance']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['b.num_releve']['checked']))       print_liste_field_titre($arrayfields['b.num_releve']['label'],$_SERVER['PHP_SELF'],'b.num_releve','',$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['b.conciliated']['checked']))      print_liste_field_titre($arrayfields['b.conciliated']['label'],$_SERVER['PHP_SELF'],'b.rappro','',$param,'align="center"',$sortfield,$sortorder);
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	    foreach($extrafields->attribute_label as $key => $val)
+	    {
+	        if (! empty($arrayfields["ef.".$key]['checked']))
+	        {
+	            $align=$extrafields->getAlignFlag($key);
+	            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+	        }
+	    }
+	}
+	// Hook fields
+	$parameters=array('arrayfields'=>$arrayfields);
+	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print "</tr>\n";
+	
+	
     $balance = 0;    // For balance
 	$balancecalculated = false;
 	
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index dcc0fc85ecc..0bb518662d6 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -713,7 +713,7 @@ else
 		    
 		    print '<table class="border centpercent">';
 
-			print '<tr class="liste_titre_add"><td class="titlefield">'.$langs->trans("BankName").'</td>';
+			print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("BankName").'</td>';
 			print '<td>'.$object->bank.'</td></tr>';
 
 			// Show fields of bank account
@@ -957,7 +957,7 @@ else
 		print '<br>';
 
 
-		print '<div class="underbanner clearboth"></div>';
+		//print '<div class="underbanner clearboth"></div>';
 		
 		print '<table class="border" width="100%">';
 		
@@ -991,7 +991,7 @@ else
 		{
 		    print '<br>';
 		    
-		    print '<div class="underbanner clearboth"></div>';
+		    //print '<div class="underbanner clearboth"></div>';
 		    
 			print '<table class="border" width="100%">';
 
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 1670ac2917c..8925a67d593 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1553,7 +1553,8 @@ class AccountLine extends CommonObject
     var $db;
     var $element='bank';
     var $table_element='bank';
-
+    var $picto = 'generic';
+    
     var $id;
     var $ref;
     var $datec;
@@ -2040,5 +2041,61 @@ class AccountLine extends CommonObject
         return $result;
     }
 
+    
+    /**
+     *    Return label of status (activity, closed)
+     *
+     *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
+     *    @return   string        		Libelle
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->status,$mode);
+    }
+    
+    /**
+     *  Renvoi le libelle d'un statut donne
+     *
+     *  @param	int		$statut         Id statut
+     *  @param	int		$mode           0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *  @return	string          		Libelle du statut
+     */
+    function LibStatut($statut,$mode=0)
+    {
+        global $langs;
+        //$langs->load('companies');
+        /*
+        if ($mode == 0)
+        {
+            if ($statut==0) return $langs->trans("ActivityCeased");
+            if ($statut==1) return $langs->trans("InActivity");
+        }
+        if ($mode == 1)
+        {
+            if ($statut==0) return $langs->trans("ActivityCeased");
+            if ($statut==1) return $langs->trans("InActivity");
+        }
+        if ($mode == 2)
+        {
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+            if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+        }
+        if ($mode == 3)
+        {
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+            if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+        }
+        if ($mode == 4)
+        {
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+            if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+        }
+        if ($mode == 5)
+        {
+            if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+            if ($statut==1) return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+        }*/
+    }
+    
 }
 
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index 073c28be1ca..176fdb626a5 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -30,10 +30,11 @@ class BankCateg // extends CommonObject
 {
 	//public $element='bank_categ';			//!< Id that identify managed objects
 	//public $table_element='bank_categ';	//!< Name of table without prefix where object is stored
-
+    public $picto='generic';
+    
 	public $id;
 	public $label;
-
+   
 
 	/**
 	 * Constructor
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index db70acc7373..084cddf51cd 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -107,7 +107,7 @@ if ($id > 0 || !empty($ref)) {
 
         // Onglets
         $head = bank_prepare_head($object);
-        dol_fiche_head($head, 'document', $langs->trans("FinancialAccount"), 0, 'account');
+        dol_fiche_head($head, 'document', $langs->trans("FinancialAccount"), -1, 'account');
 
 
         // Construit liste des fichiers
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 29877302104..71397f695d6 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -285,39 +285,7 @@ $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfiel
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-// Fields title
-print '<tr class="liste_titre">';
-if (! empty($arrayfields['b.ref']['checked']))            print_liste_field_titre($arrayfields['b.ref']['label'],$_SERVER["PHP_SELF"],'b.ref','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['b.label']['checked']))          print_liste_field_titre($arrayfields['b.label']['label'],$_SERVER["PHP_SELF"],'b.label','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['accountype']['checked']))       print_liste_field_titre($arrayfields['accountype']['label'],$_SERVER["PHP_SELF"],'','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['b.number']['checked']))         print_liste_field_titre($arrayfields['b.number']['label'],$_SERVER["PHP_SELF"],'b.number','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['b.account_number']['checked'])) print_liste_field_titre($arrayfields['b.account_number']['label'],$_SERVER["PHP_SELF"],'b.account_number','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['toreconcile']['checked']))      print_liste_field_titre($arrayfields['toreconcile']['label'],$_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val) 
-   {
-       if (! empty($arrayfields["ef.".$key]['checked'])) 
-       {
-			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['b.datec']['checked']))          print_liste_field_titre($arrayfields['b.datec']['label'],$_SERVER["PHP_SELF"],"b.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['b.tms']['checked']))            print_liste_field_titre($arrayfields['b.tms']['label'],$_SERVER["PHP_SELF"],"b.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['b.clos']['checked']))           print_liste_field_titre($arrayfields['b.clos']['label'],$_SERVER["PHP_SELF"],'b.clos','',$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['balance']['checked']))          print_liste_field_titre($arrayfields['balance']['label'],$_SERVER["PHP_SELF"],'','',$param,'align="right"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-print "</tr>\n";
-
-
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 // Ref
 if (! empty($arrayfields['b.ref']['checked']))
 {
@@ -419,6 +387,36 @@ print $searchpitco;
 print '</td>';
 print '</tr>';
 
+// Fields title
+print '<tr class="liste_titre">';
+if (! empty($arrayfields['b.ref']['checked']))            print_liste_field_titre($arrayfields['b.ref']['label'],$_SERVER["PHP_SELF"],'b.ref','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['b.label']['checked']))          print_liste_field_titre($arrayfields['b.label']['label'],$_SERVER["PHP_SELF"],'b.label','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['accountype']['checked']))       print_liste_field_titre($arrayfields['accountype']['label'],$_SERVER["PHP_SELF"],'','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['b.number']['checked']))         print_liste_field_titre($arrayfields['b.number']['label'],$_SERVER["PHP_SELF"],'b.number','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['b.account_number']['checked'])) print_liste_field_titre($arrayfields['b.account_number']['label'],$_SERVER["PHP_SELF"],'b.account_number','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['toreconcile']['checked']))      print_liste_field_titre($arrayfields['toreconcile']['label'],$_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        if (! empty($arrayfields["ef.".$key]['checked']))
+        {
+            $align=$extrafields->getAlignFlag($key);
+            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+        }
+    }
+}
+// Hook fields
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['b.datec']['checked']))          print_liste_field_titre($arrayfields['b.datec']['label'],$_SERVER["PHP_SELF"],"b.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['b.tms']['checked']))            print_liste_field_titre($arrayfields['b.tms']['label'],$_SERVER["PHP_SELF"],"b.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['b.clos']['checked']))           print_liste_field_titre($arrayfields['b.clos']['label'],$_SERVER["PHP_SELF"],'b.clos','',$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['balance']['checked']))          print_liste_field_titre($arrayfields['balance']['label'],$_SERVER["PHP_SELF"],'','',$param,'align="right"',$sortfield,$sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print "</tr>\n";
 
 
 $total = array(); $found = 0; $i=0; $lastcurrencycode='';
diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php
index a1952ab5957..15555e45338 100644
--- a/htdocs/compta/bank/info.php
+++ b/htdocs/compta/bank/info.php
@@ -30,6 +30,8 @@ $langs->load("banks");
 $langs->load("categories");
 $langs->load("companies");
 
+$id = GETPOST("rowid");
+
 
 /*
  * View
@@ -37,27 +39,35 @@ $langs->load("companies");
 
 llxHeader();
 
-$line = new AccountLine($db);
-$line->fetch($_GET["rowid"]);
-$line->info($_GET["rowid"]);
+$object = new AccountLine($db);
+$object->fetch($id);
+$object->info($id);
 
 
 $h=0;
 
-$head[$h][0] = DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$_GET["rowid"];
+$head[$h][0] = DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$id;
 $head[$h][1] = $langs->trans("Card");
 $h++;
 
-$head[$h][0] = DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$_GET["rowid"];
+$head[$h][0] = DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$id;
 $head[$h][1] = $langs->trans("Info");
 $hselected = $h;
 $h++;
 
 
-dol_fiche_head($head, $hselected, $langs->trans("LineRecord"),0,'account');
+dol_fiche_head($head, $hselected, $langs->trans("LineRecord"), -1, 'account');
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries.php">'.$langs->trans("BackToList").'</a>';
+
+
+dol_banner_tab($object, 'rowid', $linkback);
+
+print '<div class="underbanner clearboth"></div>';
+print '<br>';
 
 print '<table width="100%"><tr><td>';
-dol_print_object_info($line);
+dol_print_object_info($object);
 print '</td></tr></table>';
 
 print '</div>';
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 558f1b0c042..f403f676f07 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -269,22 +269,27 @@ if ($result)
         print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
         print '<input type="hidden" name="id" value="'.$acct->id.'">';
 
-        print '<table class="border" width="100%">';
-
         $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries.php">'.$langs->trans("BackToList").'</a>';
 
+        
+        dol_banner_tab($bankline, 'rowid', $linkback);
+        
+        print '<div class="underbanner clearboth"></div>';       
+        print '<table class="border" width="100%">';
+
         // Ref
+        /*
         print '<tr><td class="titlefield">'.$langs->trans("Ref")."</td>";
         print '<td>';
         print $form->showrefnav($bankline, 'rowid', $linkback, 1, 'rowid', 'rowid');
         print '</td>';
         print '</tr>';
-
+        */
+        
         $i++;
 
-
         // Bank account
-        print "<tr><td>".$langs->trans("Account")."</td>";
+        print '<tr><td class="titlefield">'.$langs->trans("Account").'</td>';
         print '<td>';
         print $acct->getNomUrl(1,'transactions');
         print '</td>';
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index e889b4dff19..5a42e516020 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -91,7 +91,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 
 	// Onglets
 	$head=bank_prepare_head($object);
-	dol_fiche_head($head,'cash',$langs->trans("FinancialAccount"),0,'account');
+	dol_fiche_head($head, 'cash', $langs->trans("FinancialAccount"), -1, 'account');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 8ed52eddb97..eafd8900d37 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -742,48 +742,8 @@ if ($resql)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-    print '<tr class="liste_titre">';
-    if (! empty($arrayfields['f.facnumber']['checked']))          print_liste_field_titre($arrayfields['f.facnumber']['label'],$_SERVER['PHP_SELF'],'f.facnumber','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.ref_client']['checked']))         print_liste_field_titre($arrayfields['f.ref_client']['label'],$_SERVER["PHP_SELF"],'f.ref_client','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.type']['checked']))               print_liste_field_titre($arrayfields['f.type']['label'],$_SERVER["PHP_SELF"],'f.type','',$param,'',$sortfield,$sortorder);
-    if (! empty($arrayfields['f.date']['checked']))               print_liste_field_titre($arrayfields['f.date']['label'],$_SERVER['PHP_SELF'],'f.datef','',$param,'align="center"',$sortfield,$sortorder);
-    if (! empty($arrayfields['f.date_lim_reglement']['checked'])) print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'],$_SERVER['PHP_SELF'],"f.date_lim_reglement",'',$param,'align="center"',$sortfield,$sortorder);
-    if (! empty($arrayfields['s.nom']['checked']))                print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER['PHP_SELF'],'s.nom','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.town']['checked']))               print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.zip']['checked']))                print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['state.nom']['checked']))            print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['country.code_iso']['checked']))     print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['typent.code']['checked']))          print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-    if (! empty($arrayfields['f.fk_mode_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'],$_SERVER["PHP_SELF"],"f.fk_mode_reglement","",$param,"",$sortfield,$sortorder);
-    if (! empty($arrayfields['f.total_ht']['checked']))           print_liste_field_titre($arrayfields['f.total_ht']['label'],$_SERVER['PHP_SELF'],'f.total','',$param,'align="right"',$sortfield,$sortorder);
-    if (! empty($arrayfields['f.total_vat']['checked']))          print_liste_field_titre($arrayfields['f.total_vat']['label'],$_SERVER['PHP_SELF'],'f.tva','',$param,'align="right"',$sortfield,$sortorder);
-    if (! empty($arrayfields['f.total_ttc']['checked']))          print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],'f.total_ttc','',$param,'align="right"',$sortfield,$sortorder);
-    if (! empty($arrayfields['dynamount_payed']['checked']))      print_liste_field_titre($arrayfields['dynamount_payed']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['rtp']['checked']))                  print_liste_field_titre($arrayfields['rtp']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
-    // Extra fields
-    if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-    {
-        foreach($extrafields->attribute_label as $key => $val)
-        {
-            if (! empty($arrayfields["ef.".$key]['checked']))
-            {
-                $align=$extrafields->getAlignFlag($key);
-                print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-            }
-        }
-    }
-    // Hook fields
-    $parameters=array('arrayfields'=>$arrayfields);
-    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    if (! empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'],$_SERVER["PHP_SELF"],"f.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-    if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-    if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'],$_SERVER["PHP_SELF"],"fk_statut,paye,type,dynamount_payed","",$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-    print "</tr>\n";
-
     // Filters lines
-    print '<tr class="liste_titre">';
+    print '<tr class="liste_titre_filter">';
 	// Ref
 	if (! empty($arrayfields['f.facnumber']['checked'])) 
 	{
@@ -953,6 +913,46 @@ if ($resql)
     print '</td>';
     print "</tr>\n";
 
+    print '<tr class="liste_titre">';
+    if (! empty($arrayfields['f.facnumber']['checked']))          print_liste_field_titre($arrayfields['f.facnumber']['label'],$_SERVER['PHP_SELF'],'f.facnumber','',$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.ref_client']['checked']))         print_liste_field_titre($arrayfields['f.ref_client']['label'],$_SERVER["PHP_SELF"],'f.ref_client','',$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.type']['checked']))               print_liste_field_titre($arrayfields['f.type']['label'],$_SERVER["PHP_SELF"],'f.type','',$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.date']['checked']))               print_liste_field_titre($arrayfields['f.date']['label'],$_SERVER['PHP_SELF'],'f.datef','',$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.date_lim_reglement']['checked'])) print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'],$_SERVER['PHP_SELF'],"f.date_lim_reglement",'',$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['s.nom']['checked']))                print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER['PHP_SELF'],'s.nom','',$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['s.town']['checked']))               print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['s.zip']['checked']))                print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['state.nom']['checked']))            print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['country.code_iso']['checked']))     print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['typent.code']['checked']))          print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.fk_mode_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'],$_SERVER["PHP_SELF"],"f.fk_mode_reglement","",$param,"",$sortfield,$sortorder);
+    if (! empty($arrayfields['f.total_ht']['checked']))           print_liste_field_titre($arrayfields['f.total_ht']['label'],$_SERVER['PHP_SELF'],'f.total','',$param,'align="right"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.total_vat']['checked']))          print_liste_field_titre($arrayfields['f.total_vat']['label'],$_SERVER['PHP_SELF'],'f.tva','',$param,'align="right"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.total_ttc']['checked']))          print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],'f.total_ttc','',$param,'align="right"',$sortfield,$sortorder);
+    if (! empty($arrayfields['dynamount_payed']['checked']))      print_liste_field_titre($arrayfields['dynamount_payed']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+    if (! empty($arrayfields['rtp']['checked']))                  print_liste_field_titre($arrayfields['rtp']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+    // Extra fields
+    if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+    {
+        foreach($extrafields->attribute_label as $key => $val)
+        {
+            if (! empty($arrayfields["ef.".$key]['checked']))
+            {
+                $align=$extrafields->getAlignFlag($key);
+                print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            }
+        }
+    }
+    // Hook fields
+    $parameters=array('arrayfields'=>$arrayfields);
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    if (! empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'],$_SERVER["PHP_SELF"],"f.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'],$_SERVER["PHP_SELF"],"fk_statut,paye,type,dynamount_payed","",$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+    print "</tr>\n";    
+    
     if ($num > 0)
     {
         $i=0;
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 34f44c4f690..dc3ea846eee 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1868,7 +1868,7 @@ else
                 print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.GETPOST('ligne').'&amp;action=active" method="post">';
                 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-                print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ?'  boxtablenobottom':'').'" width="100%">';
+                print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
 
                 // Definie date debut et fin par defaut
                 $dateactstart = $objp->date_debut;
@@ -1887,23 +1887,25 @@ else
                     }
                 }
 
-                print '<tr '.$bc[$var].'>';
+                print '<tr '.$bc[false].'>';
                 print '<td class="nohover">'.$langs->trans("DateServiceActivate").'</td><td class="nohover">';
                 print $form->select_date($dateactstart,'',$usehm,$usehm,'',"active",1,0,1);
                 print '</td>';
-
                 print '<td class="nohover">'.$langs->trans("DateEndPlanned").'</td><td class="nohover">';
                 print $form->select_date($dateactend,"end",$usehm,$usehm,'',"active",1,0,1);
                 print '</td>';
-
-                print '<td class="center nohover" rowspan="2" valign="middle" class="nohover">';
-                print '<input type="submit" class="button" name="activate" value="'.$langs->trans("Activate").'"><br>';
-                print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+                print '<td class="center nohover">';
                 print '</td>';
 
                 print '</tr>';
 
-                print '<tr '.$bc[$var].'><td class="nohover">'.$langs->trans("Comment").'</td><td class="nohover" colspan="'.($conf->margin->enabled?4:3).'"><input size="80" type="text" name="comment" value="'.$_POST["comment"].'"></td></tr>';
+                print '<tr '.$bc[false].'>';
+                print '<td class="nohover">'.$langs->trans("Comment").'</td><td colspan="3" class="nohover" colspan="'.($conf->margin->enabled?4:3).'"><input size="80" type="text" name="comment" value="'.$_POST["comment"].'"></td>';
+                print '<td class="nohover right">';
+                print '<input type="submit" class="button" name="activate" value="'.$langs->trans("Activate").'"> &nbsp; ';
+                print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+                print '</td>';
+                print '</tr>';
 
                 print '</table>';
 
@@ -1913,13 +1915,13 @@ else
             if ($user->rights->contrat->activer && $action == 'unactivateline' && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
             {
                 /**
-                 * Desactiver la ligne de contrat
+                 * Disable a contract line
                  */
                 print '<form name="closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline-1]->id.'&amp;action=closeline" method="post">';
 
                 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-                print '<table class="noborder tableforservicepart2" width="100%">';
+                print '<table class="noborder tableforservicepart2 boxtablenobottom" width="100%">';
 
                 // Definie date debut et fin par defaut
                 $dateactstart = $objp->date_debut_reelle;
@@ -1940,7 +1942,7 @@ else
                 $now=dol_now();
                 if ($dateactend > $now) $dateactend=$now;
 
-                print '<tr '.$bc[$var].'><td colspan="2" class="nohover">';
+                print '<tr '.$bc[false].'><td colspan="2" class="nohover">';
                 if ($objp->statut >= 4)
                 {
                     if ($objp->statut == 4)
@@ -1950,13 +1952,17 @@ else
                     }
                 }
                 print '</td>';
-
-                print '<td rowspan="2" class="center nohover">';
-                print '<input type="submit" class="button" name="close" value="'.$langs->trans("Unactivate").'"><br>';
-                print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+                print '<td class="center nohover">';
                 print '</td></tr>';
 
-                print '<tr '.$bc[$var].'><td class="nohover">'.$langs->trans("Comment").'</td><td class="nohover"><input size="70" type="text" class="flat" name="comment" value="'.GETPOST('comment').'"></td></tr>';
+                print '<tr '.$bc[false].'>';
+                print '<td class="nohover">'.$langs->trans("Comment").'</td><td class="nohover"><input size="70" type="text" class="flat" name="comment" value="'.GETPOST('comment').'"></td>';
+                print '<td class="nohover right">';
+                print '<input type="submit" class="button" name="close" value="'.$langs->trans("Unactivate").'"> &nbsp; ';
+                print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+                print '</td>';
+                print '</tr>';
+                
                 print '</table>';
 
                 print '</form>';
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index e6607729767..8510888cf35 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -130,7 +130,7 @@ if ($id > 0 || ! empty($ref))
 
 		$hselected=1;
 
-		dol_fiche_head($head, $hselected, $langs->trans("Contract"), 0, 'contract');
+		dol_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
 
 		// Contract card
 
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 289ec50b78b..35fbdf065b9 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -93,7 +93,7 @@ if ($object->id)
 {
 	$head=contract_prepare_head($object);
 
-	dol_fiche_head($head, 'documents', $langs->trans("Contract"), 0, 'contract');
+	dol_fiche_head($head, 'documents', $langs->trans("Contract"), -1, 'contract');
 
 
 	// Construit liste des fichiers
diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php
index 7f20b21c888..35cca237b21 100644
--- a/htdocs/contrat/info.php
+++ b/htdocs/contrat/info.php
@@ -28,10 +28,14 @@ require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
 $langs->load("contracts");
 
+$action		= GETPOST('action','alpha');
+$confirm	= GETPOST('confirm','alpha');
+$id			= GETPOST('id','int');
+$ref		= GETPOST('ref','alpha');
+
 // Security check
-$contratid = GETPOST("id",'int');
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'contrat',$contratid,'');
+$result = restrictedArea($user, 'contrat', $id, '');
 
 
 /*
@@ -41,13 +45,17 @@ $result = restrictedArea($user, 'contrat',$contratid,'');
 llxHeader('',$langs->trans("Contract"),"");
 
 $object = new Contrat($db);
-$object->fetch($contratid);
-$object->fetch_thirdparty();
-$object->info($contratid);
+$object->fetch($id, $ref);
+if ($object->id > 0)
+{
+    $object->fetch_thirdparty();
+}
+
+$object->info($object->id);
 
 $head = contract_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("Contract"), 0, 'contract');
+dol_fiche_head($head, 'info', $langs->trans("Contract"), -1, 'contract');
 
 
 // Contract card
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 212fa465266..7d4927d19b8 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -70,7 +70,7 @@ if ($id > 0 || ! empty($ref))
 
     $hselected = 2;
 
-    dol_fiche_head($head, 'note', $langs->trans("Contract"), 0, 'contract');
+    dol_fiche_head($head, 'note', $langs->trans("Contract"), -1, 'contract');
 
     // Contract card
 
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index b44f854087c..6050679631f 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -120,7 +120,7 @@ class FormActions
         {
         	//var_dump($selected);
         	if ($selected == 'done') $selected='100';
-            print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat">';
+            print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat maxwidth100">';
             if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
             foreach($listofstatus as $key => $val)
             {
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 91c5d24f36c..6c6f2d2f1d8 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -135,7 +135,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print '</td></tr>';
 	}
 
-	if ($canedit)
+	if ($canedit && ! preg_match('/listaction/', $_SERVER["PHP_SELF"]))
 	{
 		// Status
 		print '<tr>';
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 8e9fb7bc77a..ed13b736a7d 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -91,6 +91,11 @@ function bank_prepare_head(Account $object)
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank');
 
+    /*$head[$h][0] = DOL_URL_ROOT . "/compta/bank/info.php?id=" . $object->id;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $h++;*/
+    
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank', 'remove');
 
     return $head;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 20186ebe28d..f9ba39f870e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2589,7 +2589,7 @@ function img_edit_remove($titlealt = 'default', $other='')
  *	@param  string	$other		Add more attributes on img
  *	@return string      		Return tag img
  */
-function img_edit($titlealt = 'default', $float = 0, $other = '')
+function img_edit($titlealt = 'default', $float = 0, $other = 'class="pictoedit"')
 {
 	global $conf, $langs;
 
@@ -2624,7 +2624,7 @@ function img_view($titlealt = 'default', $float = 0, $other = '')
  *	@param  string	$other      Add more attributes on img
  *  @return string      		Retourne tag img
  */
-function img_delete($titlealt = 'default', $other = '')
+function img_delete($titlealt = 'default', $other = 'class="pictodelete"')
 {
 	global $conf, $langs;
 
@@ -3450,8 +3450,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
 	}
 	if ($page > 0)
 	{
-		if (($conf->dol_use_jmobile != 4)) print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page-1).$options.'"><</a></li>';
-		else print '<li><a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$file.'?page='.($page-1).$options.'">'.$langs->trans("Previous").'</a></li>';
+		print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page-1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
 	}
 	if ($betweenarrows)
 	{
@@ -3459,8 +3458,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
 	}
 	if ($nextpage > 0)
 	{
-		if (($conf->dol_use_jmobile != 4)) print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page+1).$options.'">></a></li>';
-		else print '<li><a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$file.'?page='.($page+1).$options.'">'.$langs->trans("Next").'</a></li>';
+		print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page+1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
 	}
 	if ($afterarrows)
 	{
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 83725580db5..ed6bb2c9979 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -57,7 +57,6 @@ $nolinesbefore=(count($this->lines) == 0 || $forcetoshowtitlelines);
 if ($nolinesbefore) {
 ?>
 <tr class="liste_titre<?php echo (($nolinesbefore || $object->element=='contrat')?'':' liste_titre_add') ?> nodrag nodrop">
-<tr id="addline" class="liste_titre liste_titre_add nodrag nodrop">
 	<td class="linecoldescription" <?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
 	<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span><?php // echo $langs->trans("FreeZone"); ?>
 	</td>
diff --git a/htdocs/core/tpl/resource_add.tpl.php b/htdocs/core/tpl/resource_add.tpl.php
index b521445701b..28c42c85b71 100644
--- a/htdocs/core/tpl/resource_add.tpl.php
+++ b/htdocs/core/tpl/resource_add.tpl.php
@@ -17,7 +17,8 @@ $out .= '<input type="hidden" name="resource_type" value="'.(empty($resource_typ
 
 
 // Place
-$out .= '<div class="tagtd">'.$langs->trans("SelectResource").'</div><div>';
+$out .= '<div class="tagtd">'.$langs->trans("SelectResource").'</div>';
+$out .= '<div class="tagtd">';
 $events=array();
 $out .= $formresources->select_resource_list('','fk_resource','',1,1,0,$events,'',2);
 $out .= '</div>';
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index ecc9f32d837..cad54932c71 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -62,7 +62,7 @@ if( (array) $linked_resources && count($linked_resources) > 0)
 			if ($linked_resource['rowid'] == GETPOST('lineid'))
 				$style='style="background: orange;"';
 
-			print '<div class="tagtr '.($var==true?"pair":"impair").'" '.$style.'>';
+			print '<form class="tagtr '.($var==true?"pair":"impair").'" '.$style.'>';
 
 			print '<div class="tagtd">';
 			print $object_resource->getNomUrl(1);
@@ -90,19 +90,19 @@ if( (array) $linked_resources && count($linked_resources) > 0)
 			print '</a>';
 			print '</div>';
 
-			print '</div>';
+			print '</form>';
 		}
 	}
 
 }
 else {
-	print '<div class="tagtr '.($var==true?"pair":"impair").'">';
+	print '<form class="tagtr '.($var==true?"pair":"impair").'">';
 	print '<div class="tagtd opacitymedium">'.$langs->trans('NoResourceLinked').'</div>';
 	print '<div class="tagtd opacitymedium"></div>';
 	print '<div class="tagtd opacitymedium"></div>';
 	print '<div class="tagtd opacitymedium"></div>';
 	print '<div class="tagtd opacitymedium"></div>';
-	print '</div>';
+	print '</form>';
 }
 
 print '</div>';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 563c57f5ad7..2ec1eb2af70 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -137,6 +137,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 $form = new Form($db);
 $formfile = new FormFile($db);
 $objectstatic=new Fichinter($db);
+$companystatic=new Societe($db);
+
 
 llxHeader('', $langs->trans("Intervention"));
 
@@ -253,36 +255,8 @@ if ($result)
     
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['f.ref']['checked']))          print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.ref","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.nom']['checked']))          print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.description']['checked']))  print_liste_field_titre($langs->trans("Description"),$_SERVER["PHP_SELF"],"f.description","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['fd.description']['checked'])) print_liste_field_titre('',$_SERVER["PHP_SELF"],'');
-	if (! empty($arrayfields['fd.date']['checked']))        print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"fd.date","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['fd.duree']['checked']))       print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],"fd.duree","",$param,'align="right"',$sortfield,$sortorder);
-	// Extra fields
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-	   foreach($extrafields->attribute_label as $key => $val) 
-	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
-           {
-				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-           }
-	   }
-	}
-    // Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
-    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-	if (! empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"f.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
 
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
     if (! empty($arrayfields['f.ref']['checked']))
     {
 		print '<td class="liste_titre">';
@@ -367,9 +341,35 @@ if ($result)
 	print '</td>';
     print "</tr>\n";
 
-	$companystatic=new Societe($db);
-
-	$var=True;
+    print '<tr class="liste_titre">';
+    if (! empty($arrayfields['f.ref']['checked']))          print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.ref","",$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['s.nom']['checked']))          print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.description']['checked']))  print_liste_field_titre($langs->trans("Description"),$_SERVER["PHP_SELF"],"f.description","",$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['fd.description']['checked'])) print_liste_field_titre('',$_SERVER["PHP_SELF"],'');
+    if (! empty($arrayfields['fd.date']['checked']))        print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"fd.date","",$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['fd.duree']['checked']))       print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],"fd.duree","",$param,'align="right"',$sortfield,$sortorder);
+    // Extra fields
+    if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+    {
+        foreach($extrafields->attribute_label as $key => $val)
+        {
+            if (! empty($arrayfields["ef.".$key]['checked']))
+            {
+                $align=$extrafields->getAlignFlag($key);
+                print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            }
+        }
+    }
+    // Hook fields
+    $parameters=array('arrayfields'=>$arrayfields);
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    if (! empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"f.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+    print "</tr>\n";
+    
 	$total = 0;
 	$i = 0;
 	$totalarray=array();
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 49de2dac7a3..f8062cc70bc 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -494,47 +494,7 @@ if ($resql)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['cf.ref']['checked']))            print_liste_field_titre($arrayfields['cf.ref']['label'],$_SERVER["PHP_SELF"],"cf.ref","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['cf.ref_supplier']['checked']))   print_liste_field_titre($arrayfields['cf.ref_supplier']['label'],$_SERVER["PHP_SELF"],"cf.ref_supplier","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['p.project_ref']['checked'])) 	   print_liste_field_titre($arrayfields['p.project_ref']['label'],$_SERVER["PHP_SELF"],"p.ref","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['u.login']['checked'])) 	       print_liste_field_titre($arrayfields['u.login']['label'],$_SERVER["PHP_SELF"],"u.login","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.nom']['checked']))             print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.town']['checked']))            print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.zip']['checked']))             print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['state.nom']['checked']))         print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['country.code_iso']['checked']))  print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['typent.code']['checked']))       print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['cf.fk_author']['checked']))      print_liste_field_titre($arrayfields['cf.fk_author']['label'],$_SERVER["PHP_SELF"],"cf.fk_author","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['cf.date_commande']['checked']))  print_liste_field_titre($arrayfields['cf.date_commande']['label'],$_SERVER["PHP_SELF"],"cf.date_commande","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['cf.date_delivery']['checked']))  print_liste_field_titre($arrayfields['cf.date_delivery']['label'],$_SERVER["PHP_SELF"],'cf.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['cf.total_ht']['checked']))       print_liste_field_titre($arrayfields['cf.total_ht']['label'],$_SERVER["PHP_SELF"],"cf.total_ht","",$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['cf.total_vat']['checked']))      print_liste_field_titre($arrayfields['cf.total_vat']['label'],$_SERVER["PHP_SELF"],"cf.tva","",$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['cf.total_ttc']['checked']))      print_liste_field_titre($arrayfields['cf.total_ttc']['label'],$_SERVER["PHP_SELF"],"cf.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
-	// Extra fields
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-	   foreach($extrafields->attribute_label as $key => $val)
-	   {
-           if (! empty($arrayfields["ef.".$key]['checked']))
-           {
-				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-           }
-	   }
-	}
-	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
-    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    if (! empty($arrayfields['cf.datec']['checked']))     print_liste_field_titre($arrayfields['cf.datec']['label'],$_SERVER["PHP_SELF"],"cf.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-    if (! empty($arrayfields['cf.tms']['checked']))       print_liste_field_titre($arrayfields['cf.tms']['label'],$_SERVER["PHP_SELF"],"cf.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-    if (! empty($arrayfields['cf.fk_statut']['checked'])) print_liste_field_titre($arrayfields['cf.fk_statut']['label'],$_SERVER["PHP_SELF"],"cf.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-    if (! empty($arrayfields['cf.billed']['checked']))    print_liste_field_titre($arrayfields['cf.billed']['label'],$_SERVER["PHP_SELF"],'cf.billed','',$param,'align="center"',$sortfield,$sortorder,'');
-    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	// Ref
 	if (! empty($arrayfields['cf.ref']['checked']))
 	{
@@ -687,6 +647,47 @@ if ($resql)
 
 	print "</tr>\n";
 
+	print '<tr class="liste_titre">';
+	if (! empty($arrayfields['cf.ref']['checked']))            print_liste_field_titre($arrayfields['cf.ref']['label'],$_SERVER["PHP_SELF"],"cf.ref","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['cf.ref_supplier']['checked']))   print_liste_field_titre($arrayfields['cf.ref_supplier']['label'],$_SERVER["PHP_SELF"],"cf.ref_supplier","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.project_ref']['checked'])) 	   print_liste_field_titre($arrayfields['p.project_ref']['label'],$_SERVER["PHP_SELF"],"p.ref","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['u.login']['checked'])) 	       print_liste_field_titre($arrayfields['u.login']['label'],$_SERVER["PHP_SELF"],"u.login","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.nom']['checked']))             print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.town']['checked']))            print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.zip']['checked']))             print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['state.nom']['checked']))         print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['country.code_iso']['checked']))  print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['typent.code']['checked']))       print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['cf.fk_author']['checked']))      print_liste_field_titre($arrayfields['cf.fk_author']['label'],$_SERVER["PHP_SELF"],"cf.fk_author","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['cf.date_commande']['checked']))  print_liste_field_titre($arrayfields['cf.date_commande']['label'],$_SERVER["PHP_SELF"],"cf.date_commande","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['cf.date_delivery']['checked']))  print_liste_field_titre($arrayfields['cf.date_delivery']['label'],$_SERVER["PHP_SELF"],'cf.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['cf.total_ht']['checked']))       print_liste_field_titre($arrayfields['cf.total_ht']['label'],$_SERVER["PHP_SELF"],"cf.total_ht","",$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['cf.total_vat']['checked']))      print_liste_field_titre($arrayfields['cf.total_vat']['label'],$_SERVER["PHP_SELF"],"cf.tva","",$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['cf.total_ttc']['checked']))      print_liste_field_titre($arrayfields['cf.total_ttc']['label'],$_SERVER["PHP_SELF"],"cf.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	    foreach($extrafields->attribute_label as $key => $val)
+	    {
+	        if (! empty($arrayfields["ef.".$key]['checked']))
+	        {
+	            $align=$extrafields->getAlignFlag($key);
+	            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+	        }
+	    }
+	}
+	// Hook fields
+	$parameters=array('arrayfields'=>$arrayfields);
+	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (! empty($arrayfields['cf.datec']['checked']))     print_liste_field_titre($arrayfields['cf.datec']['label'],$_SERVER["PHP_SELF"],"cf.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['cf.tms']['checked']))       print_liste_field_titre($arrayfields['cf.tms']['label'],$_SERVER["PHP_SELF"],"cf.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['cf.fk_statut']['checked'])) print_liste_field_titre($arrayfields['cf.fk_statut']['label'],$_SERVER["PHP_SELF"],"cf.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['cf.billed']['checked']))    print_liste_field_titre($arrayfields['cf.billed']['label'],$_SERVER["PHP_SELF"],'cf.billed','',$param,'align="center"',$sortfield,$sortorder,'');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print "</tr>\n";
+	
+	
 	$total=0;
 	$subtotal=0;
     $productstat_cache=array();
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 3afb97c5fb1..dbfc9d8fd3c 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -490,48 +490,10 @@ if ($resql)
 	
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['f.ref']['checked']))                print_liste_field_titre($arrayfields['f.ref']['label'],$_SERVER['PHP_SELF'],'f.ref,f.rowid','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.ref_supplier']['checked']))       print_liste_field_titre($arrayfields['f.ref_supplier']['label'],$_SERVER["PHP_SELF"],'f.ref_supplier','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.label']['checked']))              print_liste_field_titre($arrayfields['f.label']['label'],$_SERVER['PHP_SELF'],"f.libelle,f.rowid",'',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.datef']['checked']))              print_liste_field_titre($arrayfields['f.datef']['label'],$_SERVER['PHP_SELF'],'f.datef,f.rowid','',$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.date_lim_reglement']['checked'])) print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'],$_SERVER['PHP_SELF'],"f.date_lim_reglement",'',$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['p.ref']['checked']))                print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER['PHP_SELF'],"p.ref",'',$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.nom']['checked']))                print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER['PHP_SELF'],'s.nom','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.town']['checked']))               print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.zip']['checked']))                print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['state.nom']['checked']))            print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['country.code_iso']['checked']))     print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['typent.code']['checked']))          print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'],$_SERVER["PHP_SELF"],"f.fk_mode_reglement","",$param,"",$sortfield,$sortorder);
-	if (! empty($arrayfields['f.total_ht']['checked']))           print_liste_field_titre($arrayfields['f.total_ht']['label'],$_SERVER['PHP_SELF'],'f.total','',$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.total_vat']['checked']))          print_liste_field_titre($arrayfields['f.total_vat']['label'],$_SERVER['PHP_SELF'],'f.tva','',$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.total_ttc']['checked']))          print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],'f.total_ttc','',$param,'align="right"',$sortfield,$sortorder);
-	// Extra fields
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-	    foreach($extrafields->attribute_label as $key => $val)
-	    {
-	        if (! empty($arrayfields["ef.".$key]['checked']))
-	        {
-	            $align=$extrafields->getAlignFlag($key);
-	            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-	        }
-	    }
-	}
-	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
-	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	if (! empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'],$_SERVER["PHP_SELF"],"f.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'],$_SERVER["PHP_SELF"],"fk_statut,paye","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
+
 
 	// Line for filters
-
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	// Ref
 	if (! empty($arrayfields['f.ref']['checked']))
 	{
@@ -690,6 +652,45 @@ if ($resql)
 
 	print "</tr>\n";
 
+	print '<tr class="liste_titre">';
+	if (! empty($arrayfields['f.ref']['checked']))                print_liste_field_titre($arrayfields['f.ref']['label'],$_SERVER['PHP_SELF'],'f.ref,f.rowid','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.ref_supplier']['checked']))       print_liste_field_titre($arrayfields['f.ref_supplier']['label'],$_SERVER["PHP_SELF"],'f.ref_supplier','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.label']['checked']))              print_liste_field_titre($arrayfields['f.label']['label'],$_SERVER['PHP_SELF'],"f.libelle,f.rowid",'',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.datef']['checked']))              print_liste_field_titre($arrayfields['f.datef']['label'],$_SERVER['PHP_SELF'],'f.datef,f.rowid','',$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.date_lim_reglement']['checked'])) print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'],$_SERVER['PHP_SELF'],"f.date_lim_reglement",'',$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.ref']['checked']))                print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER['PHP_SELF'],"p.ref",'',$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.nom']['checked']))                print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER['PHP_SELF'],'s.nom','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.town']['checked']))               print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.zip']['checked']))                print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['state.nom']['checked']))            print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['country.code_iso']['checked']))     print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['typent.code']['checked']))          print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'],$_SERVER["PHP_SELF"],"f.fk_mode_reglement","",$param,"",$sortfield,$sortorder);
+	if (! empty($arrayfields['f.total_ht']['checked']))           print_liste_field_titre($arrayfields['f.total_ht']['label'],$_SERVER['PHP_SELF'],'f.total','',$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.total_vat']['checked']))          print_liste_field_titre($arrayfields['f.total_vat']['label'],$_SERVER['PHP_SELF'],'f.tva','',$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.total_ttc']['checked']))          print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],'f.total_ttc','',$param,'align="right"',$sortfield,$sortorder);
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	    foreach($extrafields->attribute_label as $key => $val)
+	    {
+	        if (! empty($arrayfields["ef.".$key]['checked']))
+	        {
+	            $align=$extrafields->getAlignFlag($key);
+	            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+	        }
+	    }
+	}
+	// Hook fields
+	$parameters=array('arrayfields'=>$arrayfields);
+	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (! empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'],$_SERVER["PHP_SELF"],"f.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'],$_SERVER["PHP_SELF"],"fk_statut,paye","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print "</tr>\n";	
+	
     $facturestatic=new FactureFournisseur($db);
 	$supplierstatic=new Fournisseur($db);
 	$projectstatic=new Project($db);
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 6e098e4f59d..db85e68c8cd 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -25,6 +25,8 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN fk_unit integer DEFAULT NULL;
+
 ALTER TABLE llx_ecm_files ADD COLUMN ref varchar(128) AFTER rowid;
 ALTER TABLE llx_ecm_files CHANGE COLUMN fullpath filepath varchar(255);
 ALTER TABLE llx_ecm_files CHANGE COLUMN filepath filepath varchar(255);
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
index ebe44b0f702..4b669f60ba3 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
@@ -52,5 +52,5 @@ CREATE TABLE llx_supplier_proposaldet (
   multicurrency_total_ht  double(24,8) DEFAULT 0,
   multicurrency_total_tva double(24,8) DEFAULT 0,
   multicurrency_total_ttc double(24,8) DEFAULT 0,
-  fk_unit integer DEFAULT NULL -- lien vers table des unités
+  fk_unit integer DEFAULT NULL
 ) ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 7126e454d5c..236671eea4c 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -453,42 +453,8 @@ $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfiel
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-		
-print '<tr class="liste_titre">';
-if (! empty($arrayfields['p.ref']['checked']))           print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['p.title']['checked']))         print_liste_field_titre($arrayfields['p.title']['label'],$_SERVER["PHP_SELF"],"p.title","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['s.nom']['checked']))           print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['commercial']['checked']))      print_liste_field_titre($arrayfields['commercial']['label'],$_SERVER["PHP_SELF"],"","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['p.dateo']['checked']))         print_liste_field_titre($arrayfields['p.dateo']['label'],$_SERVER["PHP_SELF"],"p.dateo","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['p.datee']['checked']))         print_liste_field_titre($arrayfields['p.datee']['label'],$_SERVER["PHP_SELF"],"p.datee","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['p.public']['checked']))        print_liste_field_titre($arrayfields['p.public']['label'],$_SERVER["PHP_SELF"],"p.public","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'],$_SERVER["PHP_SELF"],'p.opp_amount',"",$param,'align="right"',$sortfield,$sortorder);
-if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'],$_SERVER["PHP_SELF"],'p.fk_opp_status',"",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'],$_SERVER["PHP_SELF"],'p.opp_percent',"",$param,'align="right"',$sortfield,$sortorder);
-if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'],$_SERVER["PHP_SELF"],'p.budget_amount',"",$param,'align="right"',$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val) 
-   {
-       if (! empty($arrayfields["ef.".$key]['checked'])) 
-       {
-			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['p.datec']['checked']))  print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['p.tms']['checked']))    print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-print "</tr>\n";
 
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 if (! empty($arrayfields['p.ref']['checked']))
 {
 	print '<td class="liste_titre">';
@@ -617,6 +583,40 @@ print '</td>';
 
 print '</tr>'."\n";
 
+print '<tr class="liste_titre">';
+if (! empty($arrayfields['p.ref']['checked']))           print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['p.title']['checked']))         print_liste_field_titre($arrayfields['p.title']['label'],$_SERVER["PHP_SELF"],"p.title","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['s.nom']['checked']))           print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['commercial']['checked']))      print_liste_field_titre($arrayfields['commercial']['label'],$_SERVER["PHP_SELF"],"","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['p.dateo']['checked']))         print_liste_field_titre($arrayfields['p.dateo']['label'],$_SERVER["PHP_SELF"],"p.dateo","",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['p.datee']['checked']))         print_liste_field_titre($arrayfields['p.datee']['label'],$_SERVER["PHP_SELF"],"p.datee","",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['p.public']['checked']))        print_liste_field_titre($arrayfields['p.public']['label'],$_SERVER["PHP_SELF"],"p.public","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'],$_SERVER["PHP_SELF"],'p.opp_amount',"",$param,'align="right"',$sortfield,$sortorder);
+if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'],$_SERVER["PHP_SELF"],'p.fk_opp_status',"",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'],$_SERVER["PHP_SELF"],'p.opp_percent',"",$param,'align="right"',$sortfield,$sortorder);
+if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'],$_SERVER["PHP_SELF"],'p.budget_amount',"",$param,'align="right"',$sortfield,$sortorder);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        if (! empty($arrayfields["ef.".$key]['checked']))
+        {
+            $align=$extrafields->getAlignFlag($key);
+            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+        }
+    }
+}
+// Hook fields
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['p.datec']['checked']))  print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['p.tms']['checked']))    print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print "</tr>\n";
+
 $i=0;
 $totalarray=array();
 while ($i < min($num,$limit))
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 7d5e4eea1ae..dd43fd61d93 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -446,41 +446,7 @@ $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfiel
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
 
-print '<tr class="liste_titre">';
-if (! empty($arrayfields['t.ref']['checked']))           print_liste_field_titre($arrayfields['t.ref']['label'],$_SERVER["PHP_SELF"],"t.ref","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['t.label']['checked']))         print_liste_field_titre($arrayfields['t.label']['label'],$_SERVER["PHP_SELF"],"t.label","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['t.dateo']['checked']))         print_liste_field_titre($arrayfields['t.dateo']['label'],$_SERVER["PHP_SELF"],"t.dateo","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.datee']['checked']))         print_liste_field_titre($arrayfields['t.datee']['label'],$_SERVER["PHP_SELF"],"t.datee","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['p.ref']['checked']))           print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['p.title']['checked']))         print_liste_field_titre($arrayfields['p.title']['label'],$_SERVER["PHP_SELF"],"p.title","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['s.nom']['checked']))           print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['p.fk_statut']['checked']))     print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.planned_workload']['checked']))         print_liste_field_titre($arrayfields['t.planned_workload']['label'],$_SERVER["PHP_SELF"],"t.planned_workload","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.duration_effective']['checked']))       print_liste_field_titre($arrayfields['t.duration_effective']['label'],$_SERVER["PHP_SELF"],"t.duration_effective","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.progress_calculated']['checked']))      print_liste_field_titre($arrayfields['t.progress_calculated']['label'],$_SERVER["PHP_SELF"],"","",$param,'align="center"');
-if (! empty($arrayfields['t.progress']['checked']))      print_liste_field_titre($arrayfields['t.progress']['label'],$_SERVER["PHP_SELF"],"t.progress","",$param,'align="center"',$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val) 
-   {
-       if (! empty($arrayfields["ef.".$key]['checked'])) 
-       {
-			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-print "</tr>\n";
-
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 if (! empty($arrayfields['t.ref']['checked']))
 {
     print '<td class="liste_titre">';
@@ -588,6 +554,40 @@ print $searchpitco;
 print '</td>';
 print "</tr>\n";
 
+print '<tr class="liste_titre">';
+if (! empty($arrayfields['t.ref']['checked']))           print_liste_field_titre($arrayfields['t.ref']['label'],$_SERVER["PHP_SELF"],"t.ref","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['t.label']['checked']))         print_liste_field_titre($arrayfields['t.label']['label'],$_SERVER["PHP_SELF"],"t.label","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['t.dateo']['checked']))         print_liste_field_titre($arrayfields['t.dateo']['label'],$_SERVER["PHP_SELF"],"t.dateo","",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['t.datee']['checked']))         print_liste_field_titre($arrayfields['t.datee']['label'],$_SERVER["PHP_SELF"],"t.datee","",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['p.ref']['checked']))           print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['p.title']['checked']))         print_liste_field_titre($arrayfields['p.title']['label'],$_SERVER["PHP_SELF"],"p.title","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['s.nom']['checked']))           print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['p.fk_statut']['checked']))     print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['t.planned_workload']['checked']))         print_liste_field_titre($arrayfields['t.planned_workload']['label'],$_SERVER["PHP_SELF"],"t.planned_workload","",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['t.duration_effective']['checked']))       print_liste_field_titre($arrayfields['t.duration_effective']['label'],$_SERVER["PHP_SELF"],"t.duration_effective","",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['t.progress_calculated']['checked']))      print_liste_field_titre($arrayfields['t.progress_calculated']['label'],$_SERVER["PHP_SELF"],"","",$param,'align="center"');
+if (! empty($arrayfields['t.progress']['checked']))      print_liste_field_titre($arrayfields['t.progress']['label'],$_SERVER["PHP_SELF"],"t.progress","",$param,'align="center"',$sortfield,$sortorder);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        if (! empty($arrayfields["ef.".$key]['checked']))
+        {
+            $align=$extrafields->getAlignFlag($key);
+            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+        }
+    }
+}
+// Hook fields
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print "</tr>\n";
+
 
 $plannedworkloadoutputformat='allhourmin';
 $timespentoutputformat='allhourmin';
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index fbb75e021ff..fc6e9ecb743 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -39,6 +39,7 @@ if (! empty($conf->projet->enabled)) {
 // Load traductions files requiredby by page
 $langs->load("resource");
 $langs->load("other");
+$langs->load("interventions");
 
 /*
 $sortorder                      = GETPOST('sortorder','alpha');
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index caf79597e53..09dd0eb240c 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -509,23 +509,12 @@ if ($result)
 	
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+    if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
     
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
     
-	// Fields title
-    print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'sp.ref','',$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Supplier'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'sp.date_valid','',$param, 'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('SupplierProposalDate'),$_SERVER["PHP_SELF"],'sp.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('AmountHT'),$_SERVER["PHP_SELF"],'sp.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'sp.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre">';
 	print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
 	print '</td>';
@@ -564,12 +553,24 @@ if ($result)
 	print '</td>';
 	// Check boxes
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	$searchpitco=$form->showFilterButtons();
 	print $searchpitco;
 	print '</td>';
 
 	print "</tr>\n";
 
+	// Fields title
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'sp.ref','',$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('Supplier'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'sp.date_valid','',$param, 'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('SupplierProposalDate'),$_SERVER["PHP_SELF"],'sp.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('AmountHT'),$_SERVER["PHP_SELF"],'sp.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'sp.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print "</tr>\n";
+	
 	$now = dol_now();
 	$var=true;
 	$total=0;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 8d3ea40cb14..9b90e92e30d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -269,7 +269,7 @@ input.select2-input {
 	border-bottom:  solid 1px rgba(0,0,0,.2) !important;	/* required to avoid to lose bottom line when focus is lost on select2. */
 }
 
-.liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
+.liste_titre input[name=monthvalid], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
 input, input.flat, form.flat select, select, select.flat, .dataTables_length label select {
@@ -1064,6 +1064,9 @@ div.nopadding {
 .pictowarning, .pictopreview {
     padding-<?php echo $left; ?>: 3px;
 }
+.pictoedit, .pictowarning, .pictopreview, .pictodelete {
+    vertical-align: text-bottom;
+}
 .colorthumb {
 	padding-left: 1px !important;
 	padding-right: 1px;
@@ -2729,7 +2732,6 @@ tr.liste_titre th, tr.liste_titre td, th.liste_titre
 /*	border-bottom: 1px solid #<?php echo ($colorbacktitle1 == '255,255,255'?'BBBBBB':'ddd'); ?>; */
 	border-bottom: 1px solid #888;
 }
-/* TODO Once title line is moved under title search, make border bottom of all th black and force to white when it's first tr */ 
 tr.liste_titre:first-child th, tr:first-child th.liste_titre {
     border-bottom: 1px solid #ddd ! important;
 }
@@ -2758,7 +2760,7 @@ tr.liste_titre_topborder td {
 	background: transparent;
 }
 tr.liste_titre:last-child th.liste_titre, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd {				/* For last line of table headers only */
-    border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
+    border-bottom: 1px solid #ddd;
 }
 
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index d80630f0501..2ae5decbf96 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -281,7 +281,7 @@ textarea.cke_source:focus
 	box-shadow: none;
 }
 
-.liste_titre input[name=month], .liste_titre input[name=month_lim] {
+.liste_titre input[name=monthvalid], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
@@ -1109,6 +1109,9 @@ table.noborder tr.liste_titre td {
 .pictowarning, .pictopreview {
     padding-<?php echo $left; ?>: 3px;
 }
+.pictoedit, .pictowarning, .pictopreview, .pictodelete {
+    vertical-align: text-bottom;
+}
 .colorthumb {
 	padding-left: 1px !important;
 	padding-right: 1px;

From 06c2f049270d69f00f1917590593d6e3f63656b1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 29 Mar 2017 06:32:26 +0200
Subject: [PATCH 0496/1163] Finish work on multijournal admin part Need
 harmonization on rights

---
 htdocs/accountancy/admin/journals_card.php    |  54 ++--
 .../class/accountingjournal.class.php         | 273 ++++++------------
 htdocs/core/lib/accounting.lib.php            |  29 ++
 htdocs/langs/en_US/accountancy.lang           |   4 +
 4 files changed, 140 insertions(+), 220 deletions(-)

diff --git a/htdocs/accountancy/admin/journals_card.php b/htdocs/accountancy/admin/journals_card.php
index c9c45f9a4e5..9e04d75ce9f 100644
--- a/htdocs/accountancy/admin/journals_card.php
+++ b/htdocs/accountancy/admin/journals_card.php
@@ -122,6 +122,15 @@ else if ($action == 'update') {
 		$object->label = GETPOST('label', 'alpha');
 		$object->nature = GETPOST('nature', 'int');
 
+		if (empty($object->code)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Code")), null, 'errors');
+			$error ++;
+		}
+		if (empty($object->label)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			$error ++;
+		}
+
 		$result = $object->update($user);
 		
 		if ($result > 0) {
@@ -161,15 +170,15 @@ if ($action == 'create')
 	print '<table class="border" width="100%">';
 
 	// Code
-	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans("Code") . '</td><td><input name="code" size="32" value="' . GETPOST("code") . '"></td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans("Code") . '</td><td><input name="code" size="10" value="' . GETPOST("code") . '"></td></tr>';
 
 
 	// Label
-	print '<tr><td class="fieldrequired">' . $langs->trans("Label") . '</td><td><input name="label" size="128" value="' . GETPOST("label") . '"></td></tr>';
+	print '<tr><td class="fieldrequired">' . $langs->trans("Label") . '</td><td><input name="label" size="32" value="' . GETPOST("label") . '"></td></tr>';
 
 	// Nature
 	print '<tr>';
-	print '<td class="fieldrequired">' . $langs->trans("Status") . '</td>';
+	print '<td class="fieldrequired">' . $langs->trans("Type") . '</td>';
 	print '<td class="valeur">';
 	print $form->selectarray('nature', $type2label, GETPOST('nature'));
 	print '</td></tr>';
@@ -188,10 +197,10 @@ if ($action == 'create')
 } else if ($id) {
 	$result = $object->fetch($id);
 	if ($result > 0) {
-		$head = fiscalyear_prepare_head($object);
+		$head = accounting_journal_prepare_head($object);
 
 		if ($action == 'edit') {
-			dol_fiche_head($head, 'card', $langs->trans("Fiscalyear"), 0, 'cron');
+			dol_fiche_head($head, 'card', $langs->trans("AccountingJournal"), 0, 'cron');
 
 			print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
@@ -200,10 +209,10 @@ if ($action == 'create')
 
 			print '<table class="border" width="100%">';
 
-			// Ref
+			// Code
 			print "<tr>";
-			print '<td class="titlefieldcreate titlefield">' . $langs->trans("Ref") . '</td><td>';
-			print $object->ref;
+			print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("Code") . '</td><td>';
+			print '<input name="code" class="flat" size="8" value="' . $object->code . '">';
 			print '</td></tr>';
 
 			// Label
@@ -211,20 +220,9 @@ if ($action == 'create')
 			print '<input name="label" class="flat" size="32" value="' . $object->label . '">';
 			print '</td></tr>';
 
-			// Date start
-			print '<tr><td class="fieldrequired">' . $langs->trans("DateStart") . '</td><td>';
-			print $form->select_date($object->date_start ? $object->date_start : - 1, 'fiscalyear');
-			print '</td></tr>';
-
-			// Date end
-			print '<tr><td class="fieldrequired">' . $langs->trans("DateEnd") . '</td><td>';
-			print $form->select_date($object->date_end ? $object->date_end : - 1, 'fiscalyearend');
-			print '</td></tr>';
-
 			// Nature
 			print '<tr><td>' . $langs->trans("Type") . '</td><td>';
-			// print $form->selectarray('statut', $statut2label, $object->statut);
-			print $object->getLibStatut(4);
+			print $form->selectarray('nature', $type2label, $object->nature);
 			print '</td></tr>';
 
 			print '</table>';
@@ -246,15 +244,15 @@ if ($action == 'create')
 				print $form->formconfirm($_SERVER["PHP_SELF"] . "?id=" . $id, $langs->trans("DeleteFiscalYear"), $langs->trans("ConfirmDeleteFiscalYear"), "confirm_delete");
 			}
 
-			dol_fiche_head($head, 'card', $langs->trans("Fiscalyear"), 0, 'cron');
+			dol_fiche_head($head, 'card', $langs->trans("AccountingJournal"), 0, 'cron');
 
 			print '<table class="border" width="100%">';
 
-			$linkback = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/fiscalyear.php">' . $langs->trans("BackToList") . '</a>';
+			$linkback = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/journals.php">' . $langs->trans("BackToList") . '</a>';
 
 			// Ref
-			print '<tr><td class="titlefield">' . $langs->trans("Ref") . '</td><td width="50%">';
-			print $object->ref;
+			print '<tr><td class="titlefield">' . $langs->trans("Code") . '</td><td width="50%">';
+			print $object->code;
 			print '</td><td>';
 			print $linkback;
 			print '</td></tr>';
@@ -267,7 +265,7 @@ if ($action == 'create')
 			print "</td></tr>";
 
 			// Nature
-			print '<tr><td>' . $langs->trans("Type") . '</td><td>' . $object->getLibType(0) . '</td></tr>';
+			print '<tr><td>' . $langs->trans("Type") . '</td><td colspan="2">' . $object->getLibType(0) . '</td></tr>';
 
 			print "</table>";
 
@@ -281,9 +279,9 @@ if ($action == 'create')
     			print '<div class="tabsAction">';
 
     			print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&id=' . $id . '">' . $langs->trans('Modify') . '</a>';
-    
-    			// print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
-			
+
+    			print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
+
     			print '</div>';
 			}
 		}
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 7b34c4171d8..d7cc61d6418 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -26,24 +26,18 @@
  */
 class AccountingJournal extends CommonObject
 {
-	var $db;
-	var $error;
-	var $errors;
-	var $id;
+	public $element='accounting_journal';
+	public $table_element='accounting_journal';
+	public $fk_element = '';
+	protected $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+
 	var $rowid;
-	var $datec; // Creation date
-	var $fk_pcg_version;
-	var $pcg_type;
-	var $pcg_subtype;
-	var $account_number;
-	var $account_parent;
-	var $account_category;
+
+	var $code;
 	var $label;
-	var $fk_user_author;
-	var $fk_user_modif;
-	var $active;       // duplicate with status
-	var $status;
-	
+	var $nature;		// 0:various operations, 1:sale, 2:purchase, 3:bank, 9: has-new
+	var $active;
+
 	/**
 	 * Constructor
 	 *
@@ -54,133 +48,75 @@ class AccountingJournal extends CommonObject
 	}
 	
 	/**
-	 * Load record in memory
-	 *
-	 * @param 	int 	$rowid 				   Id
-	 * @param 	string 	$account_number 	   Account number
-	 * @param 	int 	$limittocurrentchart   1=Do not load record if it is into another accounting system
-	 * @return 	int                            <0 if KO, Id of record if OK and found
-	 */
-	function fetch($rowid = null, $account_number = null, $limittocurrentchart = 0) {
-		global $conf;
-		
-		if ($rowid || $account_number) {
-			$sql  = "SELECT a.rowid as rowid, a.datec, a.tms, a.fk_pcg_version, a.pcg_type, a.pcg_subtype, a.account_number, a.account_parent, a.label, a.fk_accounting_category, a.fk_user_author, a.fk_user_modif, a.active";
-			$sql .= ", ca.label as category_label";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as a";
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_accounting_category as ca ON a.fk_accounting_category = ca.rowid";
-			$sql .= " WHERE";
-			if ($rowid) {
-				$sql .= " a.rowid = '" . $rowid . "'";
-			} elseif ($account_number) {
-				$sql .= " a.account_number = '" . $account_number . "'";
-			}
-			if (! empty($limittocurrentchart)) {
-				$sql .= ' AND a.fk_pcg_version IN (SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
-			}
+	* Load an object from database
+	*
+	* @param	int		$id		Id of record to load
+	* @return	int				<0 if KO, >0 if OK
+	*/
+	function fetch($id)
+	{
+		$sql = "SELECT rowid, code, label, nature, active";
+		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+		$sql.= " WHERE rowid = ".$id;
 
-			dol_syslog(get_class($this) . "::fetch sql=" . $sql, LOG_DEBUG);
-			$result = $this->db->query($sql);
-			if ($result) {
-				$obj = $this->db->fetch_object($result);
-				
-				if ($obj) {
-					$this->id = $obj->rowid;
-					$this->rowid = $obj->rowid;
-					$this->datec = $obj->datec;
-					$this->tms = $obj->tms;
-					$this->fk_pcg_version = $obj->fk_pcg_version;
-					$this->pcg_type = $obj->pcg_type;
-					$this->pcg_subtype = $obj->pcg_subtype;
-					$this->account_number = $obj->account_number;
-					$this->account_parent = $obj->account_parent;
-					$this->label = $obj->label;
-					$this->account_category = $obj->fk_accounting_category;
-					$this->account_category_label = $obj->category_label;
-					$this->fk_user_author = $obj->fk_user_author;
-					$this->fk_user_modif = $obj->fk_user_modif;
-					$this->active = $obj->active;
-					$this->status = $obj->active;
-					
-					return $this->id;
-				} else {
-					return 0;
-				}
-			} else {
-				$this->error = "Error " . $this->db->lasterror();
-				$this->errors[] = "Error " . $this->db->lasterror();
-			}
+		dol_syslog(get_class($this)."::fetch sql=" . $sql, LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ( $result )
+		{
+			$obj = $this->db->fetch_object($result);
+
+			$this->id			= $obj->rowid;
+
+			$this->code			= $obj->code;
+			$this->ref			= $obj->code;
+			$this->label		= $obj->label;
+			$this->nature	    = $obj->nature;
+			$this->active		= $obj->active;
+
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			return -1;
 		}
-		return - 1;
 	}
 	
 	/**
-	 * Insert new accounting account in chart of accounts
+	 * Insert journal in database
 	 *
-	 * @param User $user Use making action
-	 * @param int $notrigger Disable triggers
-	 * @return int <0 if KO, >0 if OK
+	 * @param	User	$user		Use making action
+	 * @param	int		$notrigger	Disable triggers
+	 * @return 	int 				<0 if KO, >0 if OK
 	 */
-	function create($user, $notrigger = 0) {
+	function create($user, $notrigger = 0)
+	{
 		global $conf;
 		$error = 0;
 		$now = dol_now();
 		
 		// Clean parameters
-		if (isset($this->fk_pcg_version))
-			$this->fk_pcg_version = trim($this->fk_pcg_version);
-		if (isset($this->pcg_type))
-			$this->pcg_type = trim($this->pcg_type);
-		if (isset($this->pcg_subtype))
-			$this->pcg_subtype = trim($this->pcg_subtype);
-		if (isset($this->account_number))
-			$this->account_number = trim($this->account_number);
-		if (isset($this->account_parent))
-			$this->account_parent = trim($this->account_parent);
+		if (isset($this->code))
+			$this->code = trim($this->code);
 		if (isset($this->label))
 			$this->label = trim($this->label);
-		if (isset($this->account_category))
-			$this->account_category = trim($this->account_category);
-		if (isset($this->fk_user_author))
-			$this->fk_user_author = trim($this->fk_user_author);
-		if (isset($this->active))
-			$this->active = trim($this->active);
-			
-		if (empty($this->pcg_type) || $this->pcg_type == '-1')
-		{
-		    $this->pcg_type = 'XXXXXX';
-		}
-		if (empty($this->pcg_subtype) || $this->pcg_subtype == '-1')
-		{
-		    $this->pcg_subtype = 'XXXXXX';
-		}
+
 		// Check parameters
-		// Put here code to add control on parameters values
-			
+		if (empty($this->nature) || $this->nature == '-1')
+		{
+		    $this->nature = '0';
+		}
+
 		// Insert request
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_account(";
-		$sql .= "datec";
-		$sql .= ", entity";
-		$sql .= ", fk_pcg_version";
-		$sql .= ", pcg_type";
-		$sql .= ", pcg_subtype";
-		$sql .= ", account_number";
-		$sql .= ", account_parent";
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_journal(";
+		$sql .= "code";
 		$sql .= ", label";
-		$sql .= ", fk_accounting_category";
-		$sql .= ", fk_user_author";
+		$sql .= ", nature";
 		$sql .= ", active";
 		$sql .= ") VALUES (";
-		$sql .= " '" . $this->db->idate($now) . "'";
-		$sql .= ", " . $conf->entity;
-		$sql .= ", " . (empty($this->fk_pcg_version) ? 'NULL' : "'" . $this->db->escape($this->fk_pcg_version) . "'");
-		$sql .= ", " . (empty($this->pcg_type) ? 'NULL' : "'" . $this->db->escape($this->pcg_type) . "'");
-		$sql .= ", " . (empty($this->pcg_subtype) ? 'NULL' : "'" . $this->pcg_subtype . "'");
-		$sql .= ", " . (empty($this->account_number) ? 'NULL' : "'" . $this->account_number . "'");
-		$sql .= ", " . (empty($this->account_parent) ? 'NULL' : "'" . $this->db->escape($this->account_parent) . "'");
+		$sql .= " " . (empty($this->code) ? 'NULL' : "'" . $this->db->escape($this->code) . "'");
 		$sql .= ", " . (empty($this->label) ? 'NULL' : "'" . $this->db->escape($this->label) . "'");
-		$sql .= ", " . (empty($this->account_category) ? 'NULL' : "'" . $this->db->escape($this->account_category) . "'");
-		$sql .= ", " . $user->id;
+		$sql .= ", " . (empty($this->nature) ? '0' : "'" . $this->db->escape($this->nature) . "'");
 		$sql .= ", " . (! isset($this->active) ? 'NULL' : $this->db->escape($this->active));
 		$sql .= ")";
 		
@@ -194,7 +130,7 @@ class AccountingJournal extends CommonObject
 		}
 		
 		if (! $error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_account");
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_journal");
 			
 			// if (! $notrigger) {
 			// Uncomment this and change MYOBJECT to your own tag if you
@@ -232,26 +168,17 @@ class AccountingJournal extends CommonObject
 	function update($user) 
 	{
 	    // Check parameters
-	    if (empty($this->pcg_type) || $this->pcg_type == '-1')
+	    if (empty($this->nature) || $this->nature == '-1')
 	    {
-	        $this->pcg_type = 'XXXXXX';
+	        $this->nature = '0';
 	    }
-	    if (empty($this->pcg_subtype) || $this->pcg_subtype == '-1')
-	    {
-	        $this->pcg_subtype = 'XXXXXX';
-	    }
-	     
+
 	    $this->db->begin();
 		
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
-		$sql .= " SET fk_pcg_version = " . ($this->fk_pcg_version ? "'" . $this->db->escape($this->fk_pcg_version) . "'" : "null");
-		$sql .= " , pcg_type = " . ($this->pcg_type ? "'" . $this->db->escape($this->pcg_type) . "'" : "null");
-		$sql .= " , pcg_subtype = " . ($this->pcg_subtype ? "'" . $this->db->escape($this->pcg_subtype) . "'" : "null");
-		$sql .= " , account_number = '" . $this->account_number . "'";
-		$sql .= " , account_parent = '" . $this->account_parent . "'";
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_journal ";
+		$sql .= " SET code = " . ($this->code ? "'" . $this->db->escape($this->code) . "'" : "null");
 		$sql .= " , label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "null");
-		$sql .= " , fk_accounting_category = '" . $this->account_category . "'";
-		$sql .= " , fk_user_modif = " . $user->id;
+		$sql .= " , nature = " . ($this->nature ? "'" . $this->db->escape($this->nature) . "'" : "0");
 		$sql .= " , active = '" . $this->active . "'";
 		$sql .= " WHERE rowid = " . $this->id;
 		
@@ -268,7 +195,7 @@ class AccountingJournal extends CommonObject
 	}
 	
 	/**
-	 * Check usage of accounting code
+	 * Check usage of accounting journal
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
@@ -287,7 +214,7 @@ class AccountingJournal extends CommonObject
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			if ($num > 0) {
-				$this->error = $langs->trans('ErrorAccountancyCodeIsAlreadyUse');
+				$this->error = $langs->trans('ErrorAccountingJournalIsAlreadyUse');
 				return 0;
 			} else {
 				return 1;
@@ -329,7 +256,7 @@ class AccountingJournal extends CommonObject
 			// }
 			
 			if (! $error) {
-				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accounting_account";
+				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accounting_journal";
 				$sql .= " WHERE rowid=" . $this->id;
 				
 				dol_syslog(get_class($this) . "::delete sql=" . $sql);
@@ -360,85 +287,47 @@ class AccountingJournal extends CommonObject
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
-	 * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
-	 * @return string Chaine avec URL
+	 * @param	int		$withpicto	0=No picto, 1=Include picto into link, 2=Only picto
+	 * @return	string				Chaine avec URL
 	 */
 	function getNomUrl($withpicto = 0) {
 		global $langs;
 
 		$result = '';
 
-		$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id . '">';
+		$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/journals_card.php?id=' . $this->id . '">';
 		$linkend = '</a>';
 
 		$picto = 'billr';
 
-		$label = $langs->trans("Show") . ': ' . $this->account_number . ' - ' . $this->label;
+		$label = $langs->trans("Show") . ': ' . $this->code . ' - ' . $this->label;
 
 		if ($withpicto)
 			$result .= ($link . img_object($label, $picto) . $linkend);
 		if ($withpicto && $withpicto != 2)
 			$result .= ' ';
 		if ($withpicto != 2)
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-			$result .= $link . length_accountg($this->account_number) . ' - ' . $this->label . $linkend;
+			$result .= $link . $this->code . ' - ' . $this->label . $linkend;
 		return $result;
 	}
 	
 	/**
-	 * Information on record
-	 *
-	 * @param int $id of record
-	 * @return void
-	 */
-	function info($id) {
-		$sql = 'SELECT a.rowid, a.datec, a.fk_user_author, a.fk_user_modif, a.tms';
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'accounting_account as a';
-		$sql .= ' WHERE a.rowid = ' . $id;
-		
-		dol_syslog(get_class($this) . '::info sql=' . $sql);
-		$result = $this->db->query($sql);
-		
-		if ($result) {
-			if ($this->db->num_rows($result)) {
-				$obj = $this->db->fetch_object($result);
-				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-				if ($obj->fk_user_modif) {
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_modif);
-					$this->user_modification = $muser;
-				}
-				$this->date_creation = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->tms);
-			}
-			$this->db->free($result);
-		} else {
-			dol_print_error($this->db);
-		}
-	}
-	
-	/**
-	 * Account desactivate
+	 * Deactivate journal
 	 *
 	 * @param int $id Id
 	 * @return int <0 if KO, >0 if OK
 	 */
-	function account_desactivate($id) {
+	function journal_deactivate($id) {
 		$result = $this->checkUsage();
 		
 		if ($result > 0) {
 			$this->db->begin();
 			
-			$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
+			$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_journal ";
 			$sql .= "SET active = '0'";
 			$sql .= " WHERE rowid = " . $this->db->escape($id);
 			
-			dol_syslog(get_class($this) . "::desactivate sql=" . $sql, LOG_DEBUG);
+			dol_syslog(get_class($this) . "::deactivate sql=" . $sql, LOG_DEBUG);
 			$result = $this->db->query($sql);
 			
 			if ($result) {
@@ -455,15 +344,15 @@ class AccountingJournal extends CommonObject
 	}
 	
 	/**
-	 * Account activate
+	 * Activate journal
 	 *
 	 * @param int $id Id
 	 * @return int <0 if KO, >0 if OK
 	 */
-	function account_activate($id) {
+	function journal_activate($id) {
 		$this->db->begin();
 		
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_journal ";
 		$sql .= "SET active = '1'";
 		$sql .= " WHERE rowid = " . $this->db->escape($id);
 		
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 205acb9ba80..56fdc8e6de9 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -91,6 +91,35 @@ function accounting_prepare_head(AccountingAccount $object)
 	return $head;
 }
 
+/**
+ *	Prepare array with list of tabs
+ *
+ *	@param	AccountingAccount	$object		Accounting account
+ *	@return	array				Array of tabs to show
+ */
+function accounting_journal_prepare_head(AccountingJournal $object)
+{
+	global $langs, $conf;
+
+	$h = 0;
+	$head = array ();
+
+	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/journals_card.php?id=' . $object->id;
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'card';
+	$h ++;
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+	// $this->tabs = array('entity:-tabname); to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_journal');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_journal', 'remove');
+
+	return $head;
+}
+
 /**
  * Return accounting account without zero on the right
  *
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index f35b61055ad..42c5c519d2c 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -199,13 +199,17 @@ ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
 CategoryDeleted=Category for the accounting account has been removed
 AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
+Code=Code
+Nature=Nature
 AccountingJournalTypeVariousOperation=Various operation
 AccountingJournalTypeSale=Sale
 AccountingJournalTypePurchase=Purchase
 AccountingJournalTypeBank=Bank
 AccountingJournalTypeHasNew=Has-new
+ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
 Exports=Exports

From 4fa5448aaba62721831283922f62683037efc760 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 29 Mar 2017 10:34:33 +0200
Subject: [PATCH 0497/1163] FIX Detection of color brightness

---
 htdocs/core/class/html.formother.class.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 4ae2d81539d..270deb2134e 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -604,10 +604,22 @@ class FormOther
     	$textcolor='FFF';
     	if ($color)
     	{
-        	$hex=$color;
-        	$r = hexdec($hex[0].$hex[1]);
-        	$g = hexdec($hex[2].$hex[3]);
-        	$b = hexdec($hex[4].$hex[5]);
+    	    $tmp=explode(',', $color);
+    	    if (count($tmp) > 1)   // This is a comma RGB ('255','255','255')
+    	    {
+    	        $r = $tmp[0];
+    	        $g = $tmp[1];
+    	        $b = $tmp[2];
+    	    }
+    	    else
+    	    {
+    	        $hexr=$color[0].$color[1];
+    	        $hexg=$color[2].$color[3];
+    	        $hexb=$color[4].$color[5];
+            	$r = hexdec($hexr);
+            	$g = hexdec($hexg);
+            	$b = hexdec($hexb);
+    	    }
         	$bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm
             if ($bright > 0.6) $textcolor='000';     	   
     	}

From 54b03a35522b0d4b2171c0bad41de0e641def478 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 29 Mar 2017 11:03:13 +0200
Subject: [PATCH 0498/1163] Work on 6.0 new look and feel

---
 htdocs/admin/ihm.php                | 40 +++++++-------
 htdocs/comm/propal/list.php         |  2 +-
 htdocs/commande/list.php            |  3 +-
 htdocs/contact/list.php             |  6 +--
 htdocs/contrat/list.php             |  2 +-
 htdocs/core/boxes/modules_boxes.php |  2 +-
 htdocs/core/lib/usergroups.lib.php  |  2 +-
 htdocs/product/list.php             | 83 ++++++++++++++---------------
 htdocs/projet/list.php              |  2 +-
 htdocs/projet/tasks/list.php        |  2 +-
 htdocs/societe/list.php             |  6 +--
 htdocs/theme/eldy/style.css.php     | 25 +++------
 htdocs/theme/md/style.css.php       |  7 ++-
 13 files changed, 87 insertions(+), 95 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 03fab048962..83f6701e2a1 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -165,14 +165,14 @@ if ($action == 'edit')	// Edit
 	print '</tr>';
 
     // Default language
-    print '<tr><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
     print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'main_lang_default', 1, 0, 0, 0, 0, 'minwidth300');
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Multilingual GUI
-    print '<tr><td width="35%">'.$langs->trans("EnableMultilangInterface").'</td><td>';
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("EnableMultilangInterface").'</td><td>';
     print $form->selectyesno('main_multilangs',$conf->global->MAIN_MULTILANGS,1);
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
@@ -348,7 +348,7 @@ else	// Show
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td><td>&nbsp;</td></tr>';
 
-    print '<tr><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
     $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
     print ($s?$s.' ':'');
     print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
@@ -358,7 +358,7 @@ else	// Show
 	print '</td>';
 	print "</tr>";
     
-    print '<tr><td width="35%">'.$langs->trans("EnableMultilangInterface").'</td><td>' . yn($conf->global->MAIN_MULTILANGS) . '</td>';
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("EnableMultilangInterface").'</td><td>' . yn($conf->global->MAIN_MULTILANGS) . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
@@ -378,7 +378,7 @@ else	// Show
         foreach ($searchform as $key => $value)
         {
             
-            print '<tr><td width="35%">'.$searchformtitle[$key].'</td><td>'.yn($searchformconst[$key]).'</td>';
+            print '<tr class="oddeven"><td width="35%">'.$searchformtitle[$key].'</td><td>'.yn($searchformconst[$key]).'</td>';
     		print '<td align="left">';
     		if (! empty($searchformmodule[$key])) print $langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key]));
             print '</td></tr>';
@@ -391,11 +391,11 @@ else	// Show
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameters").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>';
 
-    print '<tr><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '</td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 	
-    print '<tr><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td>' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '</td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td>' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
@@ -407,7 +407,7 @@ else	// Show
 	*/
 	
     // Disable javascript/ajax
-    print '<tr><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
     print yn($conf->global->MAIN_DISABLE_JAVASCRIPT)."</td>";
     print '<td width="20">&nbsp;</td>';
     print "</tr>";
@@ -416,35 +416,35 @@ else	// Show
     if (class_exists("Imagick"))
 	{
 		
-	    print '<tr><td width="35%">'.$langs->trans("UsePreviewTabs").'</td><td>';
+	    print '<tr class="oddeven"><td width="35%">'.$langs->trans("UsePreviewTabs").'</td><td>';
 	    print yn(isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:0)."</td>";
 		print '<td width="20">&nbsp;</td>';
 		print "</tr>";
 	}
 
 	// First day for weeks
-    print '<tr><td width="35%">'.$langs->trans("WeekStartOnDay").'</td><td>';
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("WeekStartOnDay").'</td><td>';
     print $langs->trans("Day".(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'));
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
     // DefaultWorkingDays
-    print '<tr><td width="35%">'.$langs->trans("DefaultWorkingDays").'</td><td>';
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("DefaultWorkingDays").'</td><td>';
     print isset($conf->global->MAIN_DEFAULT_WORKING_DAYS)?$conf->global->MAIN_DEFAULT_WORKING_DAYS:'1-5';
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
     // DefaultWorkingHours
-    print '<tr><td width="35%">'.$langs->trans("DefaultWorkingHours").'</td><td>';
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("DefaultWorkingHours").'</td><td>';
     print isset($conf->global->MAIN_DEFAULT_WORKING_HOURS)?$conf->global->MAIN_DEFAULT_WORKING_HOURS:'9-18';
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Firstname / Name position
-    print '<tr><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>';
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>';
     if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { print $langs->trans("Firstname").' '.$langs->trans("Lastname"); }
     else { print $langs->trans("Lastname").' '.$langs->trans("Firstname"); }
     print '</td>';
@@ -452,12 +452,12 @@ else	// Show
 	print '</tr>';
 
 	// Hide unauthorized button
-	print '<tr><td width="35%">'.$langs->trans("ButtonHideUnauthorized").'</td><td colspan="2">';
+	print '<tr class="oddeven"><td width="35%">'.$langs->trans("ButtonHideUnauthorized").'</td><td colspan="2">';
 	print yn((isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)?$conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED:0),1);
 	print '</td></tr>';
 
     // Show logo
-    print '<tr><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
@@ -471,29 +471,29 @@ else	// Show
 	 */
 	
     // Show bugtrack link
-	print '<tr"><td width="35%">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
+	print '<tr class="oddeven"><td width="35%">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
 	print yn($conf->global->MAIN_BUGTRACK_ENABLELINK)."</td>";
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
     // Link to wiki help
-    print '<tr><td width="35%">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td colspan="2">';
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td colspan="2">';
     print yn((isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0),1);
     print '</td></tr>';
 
 	// Link to help center
-    print '<tr><td width="35%">'.$langs->trans("DisableLinkToHelpCenter").'</td><td colspan="2">';
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("DisableLinkToHelpCenter").'</td><td colspan="2">';
     print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0),1);
     print '</td></tr>';
 
 	// Message login
-    print '<tr><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
     if (isset($conf->global->MAIN_HOME)) print dol_htmlcleanlastbr($conf->global->MAIN_HOME);
     else print '&nbsp;';
     print '</td></tr>'."\n";
 
     // Message of the day
-    print '<tr><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
     if (isset($conf->global->MAIN_MOTD)) print dol_htmlcleanlastbr($conf->global->MAIN_MOTD);
     else print '&nbsp;';
     print '</td></tr>'."\n";
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 0ff70fe9107..fdcbdde5ca8 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -751,7 +751,7 @@ if ($resql)
     	$objectstatic->id=$obj->rowid;
     	$objectstatic->ref=$obj->ref;
     		
-		print '<tr>';
+		print '<tr class="oddeven">';
 		
 		if (! empty($arrayfields['p.ref']['checked']))
 		{
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 03b9cfce56a..37170e0af84 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1048,7 +1048,8 @@ if ($resql)
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($resql);
-        print '<tr>';
+        
+        print '<tr class="oddeven">';
 
         $notshippable=0;
         $warning = 0;
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 80649ef4e06..4e7a9c6f190 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -651,7 +651,7 @@ while ($i < min($num,$limit))
 {
     $obj = $db->fetch_object($result);
 
-    print "<tr>";
+    print '<tr class="oddeven">';
 
 	$contactstatic->lastname=$obj->lastname;
 	$contactstatic->firstname='';
@@ -669,8 +669,8 @@ while ($i < min($num,$limit))
     if (! empty($arrayfields['p.lastname']['checked']))
     {
         print '<td valign="middle">';
-	  print $contactstatic->getNomUrl(1,'',0);
-	  print '</td>';
+        print $contactstatic->getNomUrl(1,'',0);
+        print '</td>';
     }
 	// Firstname
     if (! empty($arrayfields['p.firstname']['checked']))
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index c382bfc7612..0224da7d88c 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -563,7 +563,7 @@ if ($resql)
         $contracttmp->ref_customer=$obj->ref_customer;
         $contracttmp->ref_supplier=$obj->ref_supplier;
         
-        print '<tr>';
+        print '<tr class="oddeven">';
         if (! empty($arrayfields['c.ref']['checked']))
         {
             print '<td class="nowrap">';
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 26ee34bdca0..c016741cb39 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -234,7 +234,7 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
             // Show box title
             if (! empty($head['text']) || ! empty($head['sublink']) || ! empty($head['subpicto']))
             {
-                $out.= '<tr class="box_titre">';
+                $out.= '<tr class="liste_titre box_titre">';
                 $out.= '<td';
                 if ($nbcol > 0) { $out.= ' colspan="'.$nbcol.'"'; }
                 $out.= '>';
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 0c735a97c2f..6e6e0c7b511 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -589,7 +589,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	   	{
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
-    	print ' &nbsp; ('.$langs->trans("Default").': <strong>e6e6e6</strong>) ';
+    	print ' &nbsp; ('.$langs->trans("Default").': <strong>f0f0f0</strong>) ';  // $colorbacktitle1 in CSS
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    print '</td>';
 
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 85b63077a05..69108a893d9 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -473,45 +473,9 @@ else
 
             print '<div class="div-table-responsive">';
             print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-    		print '<tr class="liste_titre">';
-    		if (! empty($arrayfields['p.ref']['checked']))  print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder);
-    		if (! empty($arrayfields['pfp.ref_fourn']['checked']))  print_liste_field_titre($arrayfields['pfp.ref_fourn']['label'], $_SERVER["PHP_SELF"],"pfp.ref_fourn","",$param,"",$sortfield,$sortorder);
-    		if (! empty($arrayfields['p.label']['checked']))  print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"],"p.label","",$param,"",$sortfield,$sortorder);
-    		if (! empty($arrayfields['p.barcode']['checked']))  print_liste_field_titre($arrayfields['p.barcode']['label'], $_SERVER["PHP_SELF"],"p.barcode","",$param,"",$sortfield,$sortorder);
-    		if (! empty($arrayfields['p.duration']['checked']))  print_liste_field_titre($arrayfields['p.duration']['label'], $_SERVER["PHP_SELF"],"p.duration","",$param,'align="center"',$sortfield,$sortorder);
-    		if (! empty($arrayfields['p.sellprice']['checked']))  print_liste_field_titre($arrayfields['p.sellprice']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
-    		if (! empty($arrayfields['p.minbuyprice']['checked']))  print_liste_field_titre($arrayfields['p.minbuyprice']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
-    		if (! empty($arrayfields['p.seuil_stock_alerte']['checked']))  print_liste_field_titre($arrayfields['p.seuil_stock_alerte']['label'], $_SERVER["PHP_SELF"],"p.seuil_stock_alerte","",$param,'align="right"',$sortfield,$sortorder);
-    		if (! empty($arrayfields['p.desiredstock']['checked']))  print_liste_field_titre($arrayfields['p.desiredstock']['label'], $_SERVER["PHP_SELF"],"p.desiredstock","",$param,'align="right"',$sortfield,$sortorder);
-    		if (! empty($arrayfields['p.stock']['checked']))  print_liste_field_titre($arrayfields['p.stock']['label'], $_SERVER["PHP_SELF"],"p.stock","",$param,'align="right"',$sortfield,$sortorder);
-    		if (! empty($arrayfields['stock_virtual']['checked']))  print_liste_field_titre($arrayfields['stock_virtual']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
-    		if (! empty($arrayfields['p.tobatch']['checked']))  print_liste_field_titre($arrayfields['p.tobatch']['label'], $_SERVER["PHP_SELF"],"p.tobatch","",$param,'align="center"',$sortfield,$sortorder);
-    		if (! empty($arrayfields['p.accountancy_code_sell']['checked']))  print_liste_field_titre($arrayfields['p.accountancy_code_sell']['label'], $_SERVER["PHP_SELF"],"p.accountancy_code_sell","",$param,'',$sortfield,$sortorder);
-    		if (! empty($arrayfields['p.accountancy_code_buy']['checked']))  print_liste_field_titre($arrayfields['p.accountancy_code_buy']['label'], $_SERVER["PHP_SELF"],"p.accountancy_code_buy","",$param,'',$sortfield,$sortorder);
-    		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-			{
-			   foreach($extrafields->attribute_label as $key => $val) 
-			   {
-		           if (! empty($arrayfields["ef.".$key]['checked'])) 
-		           {
-						$align=$extrafields->getAlignFlag($key);
-						print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-		           }
-			   }
-			}
-    		// Hook fields
-			$parameters=array('arrayfields'=>$arrayfields);
-		    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-		    print $hookmanager->resPrint;
-			if (! empty($arrayfields['p.datec']['checked']))  print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-			if (! empty($arrayfields['p.tms']['checked']))    print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-			if (! empty($arrayfields['p.tosell']['checked'])) print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Sell").')',$_SERVER["PHP_SELF"],"p.tosell","",$param,'align="right"',$sortfield,$sortorder);
-			if (! empty($arrayfields['p.tobuy']['checked']))  print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Buy").')',$_SERVER["PHP_SELF"],"p.tobuy","",$param,'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-			print "</tr>\n";
-
+    		
     		// Lines with input filters
-    		print '<tr class="liste_titre">';
+    		print '<tr class="liste_titre_filter">';
     		if (! empty($arrayfields['p.ref']['checked']))
     		{
     			print '<td class="liste_titre" align="left">';
@@ -624,11 +588,47 @@ else
 
     		print '</tr>';
 
-
+    		print '<tr class="liste_titre">';
+    		if (! empty($arrayfields['p.ref']['checked']))  print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder);
+    		if (! empty($arrayfields['pfp.ref_fourn']['checked']))  print_liste_field_titre($arrayfields['pfp.ref_fourn']['label'], $_SERVER["PHP_SELF"],"pfp.ref_fourn","",$param,"",$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.label']['checked']))  print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"],"p.label","",$param,"",$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.barcode']['checked']))  print_liste_field_titre($arrayfields['p.barcode']['label'], $_SERVER["PHP_SELF"],"p.barcode","",$param,"",$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.duration']['checked']))  print_liste_field_titre($arrayfields['p.duration']['label'], $_SERVER["PHP_SELF"],"p.duration","",$param,'align="center"',$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.sellprice']['checked']))  print_liste_field_titre($arrayfields['p.sellprice']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.minbuyprice']['checked']))  print_liste_field_titre($arrayfields['p.minbuyprice']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.seuil_stock_alerte']['checked']))  print_liste_field_titre($arrayfields['p.seuil_stock_alerte']['label'], $_SERVER["PHP_SELF"],"p.seuil_stock_alerte","",$param,'align="right"',$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.desiredstock']['checked']))  print_liste_field_titre($arrayfields['p.desiredstock']['label'], $_SERVER["PHP_SELF"],"p.desiredstock","",$param,'align="right"',$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.stock']['checked']))  print_liste_field_titre($arrayfields['p.stock']['label'], $_SERVER["PHP_SELF"],"p.stock","",$param,'align="right"',$sortfield,$sortorder);
+    		if (! empty($arrayfields['stock_virtual']['checked']))  print_liste_field_titre($arrayfields['stock_virtual']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.tobatch']['checked']))  print_liste_field_titre($arrayfields['p.tobatch']['label'], $_SERVER["PHP_SELF"],"p.tobatch","",$param,'align="center"',$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.accountancy_code_sell']['checked']))  print_liste_field_titre($arrayfields['p.accountancy_code_sell']['label'], $_SERVER["PHP_SELF"],"p.accountancy_code_sell","",$param,'',$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.accountancy_code_buy']['checked']))  print_liste_field_titre($arrayfields['p.accountancy_code_buy']['label'], $_SERVER["PHP_SELF"],"p.accountancy_code_buy","",$param,'',$sortfield,$sortorder);
+    		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+    		{
+    		    foreach($extrafields->attribute_label as $key => $val)
+    		    {
+    		        if (! empty($arrayfields["ef.".$key]['checked']))
+    		        {
+    		            $align=$extrafields->getAlignFlag($key);
+    		            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    		        }
+    		    }
+    		}
+    		// Hook fields
+    		$parameters=array('arrayfields'=>$arrayfields);
+    		$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    		print $hookmanager->resPrint;
+    		if (! empty($arrayfields['p.datec']['checked']))  print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.tms']['checked']))    print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.tosell']['checked'])) print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Sell").')',$_SERVER["PHP_SELF"],"p.tosell","",$param,'align="right"',$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.tobuy']['checked']))  print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Buy").')',$_SERVER["PHP_SELF"],"p.tobuy","",$param,'align="right"',$sortfield,$sortorder);
+    		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+    		print "</tr>\n";
+    		
+    		
     		$product_static=new Product($db);
     		$product_fourn =new ProductFournisseur($db);
 
-    		$var=true;
     	    $i = 0;
     		while ($i < min($num,$limit))
     		{
@@ -669,8 +669,7 @@ else
 				}
 
 
-    			$var=!$var;
-    			print '<tr '.$bc[$var].'>';
+    			print '<tr class="oddeven">';
 
     			// Ref
 			    if (! empty($arrayfields['p.ref']['checked']))
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 236671eea4c..c8335676700 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -634,7 +634,7 @@ while ($i < min($num,$limit))
 	$userAccess = $projectstatic->restrictedProjectArea($user);    // why this ?
 	if ($userAccess >= 0)
 	{
-		print "<tr>";
+		print '<tr class="oddeven">';
 
 		// Project url
     	if (! empty($arrayfields['p.ref']['checked']))
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index dd43fd61d93..a6a4c855474 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -619,7 +619,7 @@ while ($i < min($num,$limit))
 	$userAccess = $projectstatic->restrictedProjectArea($user);    // why this ?
 	if ($userAccess >= 0)
 	{
-		print "<tr>";
+		print '<tr class="oddeven">';
 
     	// Ref
     	if (! empty($arrayfields['t.ref']['checked']))
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index c4412660ea7..1a9980bbf12 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -907,10 +907,10 @@ while ($i < min($num, $limit))
 	$companystatic->code_compta_client=$obj->code_compta;
 	$companystatic->code_compta_fournisseur=$obj->code_compta_fournisseur;
 
-    	$companystatic->fk_prospectlevel=$obj->fk_prospectlevel;
-    	$companystatic->name_alias=$obj->name_alias;
+   	$companystatic->fk_prospectlevel=$obj->fk_prospectlevel;
+   	$companystatic->name_alias=$obj->name_alias;
 
-	print "<tr>";
+	print '<tr class="oddeven">';
 	if (! empty($arrayfields['s.nom']['checked']))
 	{
 		print '<td class="tdoverflowmax200">';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9b90e92e30d..49c17a749f0 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -82,7 +82,7 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 $colorbackhmenu1='110,120,160';      // topmenu
 $colorbackvmenu1='255,255,255';      // vmenu
 $colortopbordertitle1='120,120,120';    // top border of title
-$colorbacktitle1='230,230,230';      // title of tables,list
+$colorbacktitle1='240,240,240';      // title of tables,list
 $colorbacktabcard1='255,255,255';  // card
 $colorbacktabactive='234,234,234';
 $colorbacklineimpair1='255,255,255';    // line impair
@@ -98,7 +98,6 @@ $colortextlink='0,0,120';
 $fontsize='13';
 $fontsizesmaller='12';
 $usegradienttop=(isset($conf->global->THEME_ELDY_TOPMENU_BACK1)?0:1);
-$usegradienttitle=(isset($conf->global->THEME_ELDY_BACKTITLE1)?0:1);
 $useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
 $borderwith=2;
 
@@ -2399,8 +2398,11 @@ table.paddingtopbottomonly tr td {
 	padding-top: 1px;
 	padding-bottom: 2px;
 }
+.liste_titre_filter {
+	background: rgb(<?php echo $colorbacktitle1; ?>) !important;
+}
 tr.liste_titre_filter td.liste_titre {
-    border-bottom: 1px solid #eee;
+    border-bottom: 1px solid #ddd;
 }
 .liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd
 {
@@ -2715,11 +2717,7 @@ tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, tabl
 }
 div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
 {
-	background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: rgb(<?php echo $colorbacktitle1; ?>);
 	font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
     border-bottom: 1px solid #ddd;
 	
@@ -2987,16 +2985,7 @@ tr.box_titre {
 	color: #000 !important;*/
 
 	/* TO MATCH ELDY */
-	<?php if ($usegradienttitle) { ?>
-	background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.4) 100%);
-	background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.4) 100%);
-	background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.4) 100%);
-	background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.4) 100%);
-	background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(<?php echo $colorbacktitle1; ?>,0.4) 100%);
-	<?php } else { ?>
-	background: rgb(<?php echo $colorbacktitle1; ?>);
-	<?php } ?>
-
+	background: rgb(<?php echo $colorbacktitle1; ?>)
 	color: rgb(<?php echo $colortexttitle; ?>);
     font-family: <?php print $fontlist ?>, sans-serif;
     font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 2ae5decbf96..1908fcfef4a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -82,7 +82,7 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 $colorbackhmenu1='90,50,120';      // topmenu
 $colorbackvmenu1='255,255,255';      // vmenu
 $colortopbordertitle1='';           // top border of tables-lists title. not defined = default to colorbackhmenu1
-$colorbacktitle1='230,230,230';      // title of tables-lists
+$colorbacktitle1='240,240,240';      // title of tables-lists
 $colorbacktabcard1='255,255,255';  // card
 $colorbacktabactive='234,234,234';
 $colorbacklineimpair1='255,255,255';    // line impair
@@ -2304,8 +2304,11 @@ table.paddingtopbottomonly tr td {
 	padding-bottom: 2px;
 }
 
+.liste_titre_filter {
+	background: rgb(<?php echo $colorbacktitle1; ?>) !important;
+}
 tr.liste_titre_filter td.liste_titre {
-    border-bottom: 1px solid #eee;
+    border-bottom: 1px solid #FDFFFF;
 }
 .liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd
 {

From e3d3d32b4a55cfbab14bb45ba2e7563164067b0c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 29 Mar 2017 11:11:37 +0200
Subject: [PATCH 0499/1163] Translation

---
 htdocs/langs/en_US/products.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index b38b714ddfb..046521e398e 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -303,7 +303,7 @@ ErrorDeletingGeneratedProducts=There was an error while trying to delete existin
 NbOfDifferentValues=Nb of different values
 NbProducts=Nb. of products
 ParentProduct=Parent product
-HideChildProducts=Hide child products
+HideChildProducts=Hide variant products
 ConfirmCloneProductCombinations=Would you like to copy all the product variant to the product with the given reference?
 CloneDestinationReference=Destination product reference
 ErrorCopyProductCombinations=There was an error while copying the product variants

From 527fa27fb786c3df0325fd63276b823c5d970e85 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Wed, 29 Mar 2017 11:18:03 +0200
Subject: [PATCH 0500/1163] Add jquery-migrate to handle jquery 3.0 removes

---
 htdocs/includes/jquery/js/jquery-migrate.js   | 540 ++++++++++++++++++
 .../includes/jquery/js/jquery-migrate.min.js  |   2 +
 htdocs/main.inc.php                           |   2 +
 htdocs/public/test/test_arrays.php            |   2 +
 4 files changed, 546 insertions(+)
 create mode 100644 htdocs/includes/jquery/js/jquery-migrate.js
 create mode 100644 htdocs/includes/jquery/js/jquery-migrate.min.js

diff --git a/htdocs/includes/jquery/js/jquery-migrate.js b/htdocs/includes/jquery/js/jquery-migrate.js
new file mode 100644
index 00000000000..350b79958d1
--- /dev/null
+++ b/htdocs/includes/jquery/js/jquery-migrate.js
@@ -0,0 +1,540 @@
+/*!
+ * jQuery Migrate - v3.0.0 - 2016-06-09
+ * Copyright jQuery Foundation and other contributors
+ */
+(function( jQuery, window ) {
+"use strict";
+
+
+jQuery.migrateVersion = "3.0.0";
+
+
+( function() {
+
+	// Support: IE9 only
+	// IE9 only creates console object when dev tools are first opened
+	// Also, avoid Function#bind here to simplify PhantomJS usage
+	var log = window.console && window.console.log &&
+			function() { window.console.log.apply( window.console, arguments ); },
+		rbadVersions = /^[12]\./;
+
+	if ( !log ) {
+		return;
+	}
+
+	// Need jQuery 3.0.0+ and no older Migrate loaded
+	if ( !jQuery || rbadVersions.test( jQuery.fn.jquery ) ) {
+		log( "JQMIGRATE: jQuery 3.0.0+ REQUIRED" );
+	}
+	if ( jQuery.migrateWarnings ) {
+		log( "JQMIGRATE: Migrate plugin loaded multiple times" );
+	}
+
+	// Show a message on the console so devs know we're active
+	log( "JQMIGRATE: Migrate is installed" +
+		( jQuery.migrateMute ? "" : " with logging active" ) +
+		", version " + jQuery.migrateVersion );
+
+} )();
+
+var warnedAbout = {};
+
+// List of warnings already given; public read only
+jQuery.migrateWarnings = [];
+
+// Set to false to disable traces that appear with warnings
+if ( jQuery.migrateTrace === undefined ) {
+	jQuery.migrateTrace = true;
+}
+
+// Forget any warnings we've already given; public
+jQuery.migrateReset = function() {
+	warnedAbout = {};
+	jQuery.migrateWarnings.length = 0;
+};
+
+function migrateWarn( msg ) {
+	var console = window.console;
+	if ( !warnedAbout[ msg ] ) {
+		warnedAbout[ msg ] = true;
+		jQuery.migrateWarnings.push( msg );
+		if ( console && console.warn && !jQuery.migrateMute ) {
+			console.warn( "JQMIGRATE: " + msg );
+			if ( jQuery.migrateTrace && console.trace ) {
+				console.trace();
+			}
+		}
+	}
+}
+
+function migrateWarnProp( obj, prop, value, msg ) {
+	Object.defineProperty( obj, prop, {
+		configurable: true,
+		enumerable: true,
+		get: function() {
+			migrateWarn( msg );
+			return value;
+		}
+	} );
+}
+
+if ( document.compatMode === "BackCompat" ) {
+
+	// JQuery has never supported or tested Quirks Mode
+	migrateWarn( "jQuery is not compatible with Quirks Mode" );
+}
+
+
+var oldInit = jQuery.fn.init,
+	oldIsNumeric = jQuery.isNumeric,
+	oldFind = jQuery.find,
+	rattrHashTest = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/,
+	rattrHashGlob = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g;
+
+jQuery.fn.init = function( arg1 ) {
+	var args = Array.prototype.slice.call( arguments );
+
+	if ( typeof arg1 === "string" && arg1 === "#" ) {
+
+		// JQuery( "#" ) is a bogus ID selector, but it returned an empty set before jQuery 3.0
+		migrateWarn( "jQuery( '#' ) is not a valid selector" );
+		args[ 0 ] = [];
+	}
+
+	return oldInit.apply( this, args );
+};
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.find = function( selector ) {
+	var args = Array.prototype.slice.call( arguments );
+
+	// Support: PhantomJS 1.x
+	// String#match fails to match when used with a //g RegExp, only on some strings
+	if ( typeof selector === "string" && rattrHashTest.test( selector ) ) {
+
+		// The nonstandard and undocumented unquoted-hash was removed in jQuery 1.12.0
+		// First see if qS thinks it's a valid selector, if so avoid a false positive
+		try {
+			document.querySelector( selector );
+		} catch ( err1 ) {
+
+			// Didn't *look* valid to qSA, warn and try quoting what we think is the value
+			selector = selector.replace( rattrHashGlob, function( _, attr, op, value ) {
+				return "[" + attr + op + "\"" + value + "\"]";
+			} );
+
+			// If the regexp *may* have created an invalid selector, don't update it
+			// Note that there may be false alarms if selector uses jQuery extensions
+			try {
+				document.querySelector( selector );
+				migrateWarn( "Attribute selector with '#' must be quoted: " + args[ 0 ] );
+				args[ 0 ] = selector;
+			} catch ( err2 ) {
+				migrateWarn( "Attribute selector with '#' was not fixed: " + args[ 0 ] );
+			}
+		}
+	}
+
+	return oldFind.apply( this, args );
+};
+
+// Copy properties attached to original jQuery.find method (e.g. .attr, .isXML)
+var findProp;
+for ( findProp in oldFind ) {
+	if ( Object.prototype.hasOwnProperty.call( oldFind, findProp ) ) {
+		jQuery.find[ findProp ] = oldFind[ findProp ];
+	}
+}
+
+// The number of elements contained in the matched element set
+jQuery.fn.size = function() {
+	migrateWarn( "jQuery.fn.size() is deprecated; use the .length property" );
+	return this.length;
+};
+
+jQuery.parseJSON = function() {
+	migrateWarn( "jQuery.parseJSON is deprecated; use JSON.parse" );
+	return JSON.parse.apply( null, arguments );
+};
+
+jQuery.isNumeric = function( val ) {
+
+	// The jQuery 2.2.3 implementation of isNumeric
+	function isNumeric2( obj ) {
+		var realStringObj = obj && obj.toString();
+		return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0;
+	}
+
+	var newValue = oldIsNumeric( val ),
+		oldValue = isNumeric2( val );
+
+	if ( newValue !== oldValue ) {
+		migrateWarn( "jQuery.isNumeric() should not be called on constructed objects" );
+	}
+
+	return oldValue;
+};
+
+migrateWarnProp( jQuery, "unique", jQuery.uniqueSort,
+	"jQuery.unique is deprecated, use jQuery.uniqueSort" );
+
+// Now jQuery.expr.pseudos is the standard incantation
+migrateWarnProp( jQuery.expr, "filters", jQuery.expr.pseudos,
+	"jQuery.expr.filters is now jQuery.expr.pseudos" );
+migrateWarnProp( jQuery.expr, ":", jQuery.expr.pseudos,
+	"jQuery.expr[\":\"] is now jQuery.expr.pseudos" );
+
+
+var oldAjax = jQuery.ajax;
+
+jQuery.ajax = function( ) {
+	var jQXHR = oldAjax.apply( this, arguments );
+
+	// Be sure we got a jQXHR (e.g., not sync)
+	if ( jQXHR.promise ) {
+		migrateWarnProp( jQXHR, "success", jQXHR.done,
+			"jQXHR.success is deprecated and removed" );
+		migrateWarnProp( jQXHR, "error", jQXHR.fail,
+			"jQXHR.error is deprecated and removed" );
+		migrateWarnProp( jQXHR, "complete", jQXHR.always,
+			"jQXHR.complete is deprecated and removed" );
+	}
+
+	return jQXHR;
+};
+
+
+var oldRemoveAttr = jQuery.fn.removeAttr,
+	oldToggleClass = jQuery.fn.toggleClass,
+	rmatchNonSpace = /\S+/g;
+
+jQuery.fn.removeAttr = function( name ) {
+	var self = this;
+
+	jQuery.each( name.match( rmatchNonSpace ), function( i, attr ) {
+		if ( jQuery.expr.match.bool.test( attr ) ) {
+			migrateWarn( "jQuery.fn.removeAttr no longer sets boolean properties: " + attr );
+			self.prop( attr, false );
+		}
+	} );
+
+	return oldRemoveAttr.apply( this, arguments );
+};
+
+jQuery.fn.toggleClass = function( state ) {
+
+	// Only deprecating no-args or single boolean arg
+	if ( state !== undefined && typeof state !== "boolean" ) {
+		return oldToggleClass.apply( this, arguments );
+	}
+
+	migrateWarn( "jQuery.fn.toggleClass( boolean ) is deprecated" );
+
+	// Toggle entire class name of each element
+	return this.each( function() {
+		var className = this.getAttribute && this.getAttribute( "class" ) || "";
+
+		if ( className ) {
+			jQuery.data( this, "__className__", className );
+		}
+
+		// If the element has a class name or if we're passed `false`,
+		// then remove the whole classname (if there was one, the above saved it).
+		// Otherwise bring back whatever was previously saved (if anything),
+		// falling back to the empty string if nothing was stored.
+		if ( this.setAttribute ) {
+			this.setAttribute( "class",
+				className || state === false ?
+				"" :
+				jQuery.data( this, "__className__" ) || ""
+			);
+		}
+	} );
+};
+
+
+var internalSwapCall = false;
+
+// If this version of jQuery has .swap(), don't false-alarm on internal uses
+if ( jQuery.swap ) {
+	jQuery.each( [ "height", "width", "reliableMarginRight" ], function( _, name ) {
+		var oldHook = jQuery.cssHooks[ name ] && jQuery.cssHooks[ name ].get;
+
+		if ( oldHook ) {
+			jQuery.cssHooks[ name ].get = function() {
+				var ret;
+
+				internalSwapCall = true;
+				ret = oldHook.apply( this, arguments );
+				internalSwapCall = false;
+				return ret;
+			};
+		}
+	} );
+}
+
+jQuery.swap = function( elem, options, callback, args ) {
+	var ret, name,
+		old = {};
+
+	if ( !internalSwapCall ) {
+		migrateWarn( "jQuery.swap() is undocumented and deprecated" );
+	}
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.apply( elem, args || [] );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+var oldData = jQuery.data;
+
+jQuery.data = function( elem, name, value ) {
+	var curData;
+
+	// If the name is transformed, look for the un-transformed name in the data object
+	if ( name && name !== jQuery.camelCase( name ) ) {
+		curData = jQuery.hasData( elem ) && oldData.call( this, elem );
+		if ( curData && name in curData ) {
+			migrateWarn( "jQuery.data() always sets/gets camelCased names: " + name );
+			if ( arguments.length > 2 ) {
+				curData[ name ] = value;
+			}
+			return curData[ name ];
+		}
+	}
+
+	return oldData.apply( this, arguments );
+};
+
+var oldTweenRun = jQuery.Tween.prototype.run;
+
+jQuery.Tween.prototype.run = function( percent ) {
+	if ( jQuery.easing[ this.easing ].length > 1 ) {
+		migrateWarn(
+			"easing function " +
+			"\"jQuery.easing." + this.easing.toString() +
+			"\" should use only first argument"
+		);
+
+		jQuery.easing[ this.easing ] = jQuery.easing[ this.easing ].bind(
+			jQuery.easing,
+			percent, this.options.duration * percent, 0, 1, this.options.duration
+		);
+	}
+
+	oldTweenRun.apply( this, arguments );
+};
+
+var oldLoad = jQuery.fn.load,
+	originalFix = jQuery.event.fix;
+
+jQuery.event.props = [];
+jQuery.event.fixHooks = {};
+
+jQuery.event.fix = function( originalEvent ) {
+	var event,
+		type = originalEvent.type,
+		fixHook = this.fixHooks[ type ],
+		props = jQuery.event.props;
+
+	if ( props.length ) {
+		migrateWarn( "jQuery.event.props are deprecated and removed: " + props.join() );
+		while ( props.length ) {
+			jQuery.event.addProp( props.pop() );
+		}
+	}
+
+	if ( fixHook && !fixHook._migrated_ ) {
+		fixHook._migrated_ = true;
+		migrateWarn( "jQuery.event.fixHooks are deprecated and removed: " + type );
+		if ( ( props = fixHook.props ) && props.length ) {
+			while ( props.length ) {
+			   jQuery.event.addProp( props.pop() );
+			}
+		}
+	}
+
+	event = originalFix.call( this, originalEvent );
+
+	return fixHook && fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
+};
+
+jQuery.each( [ "load", "unload", "error" ], function( _, name ) {
+
+	jQuery.fn[ name ] = function() {
+		var args = Array.prototype.slice.call( arguments, 0 );
+
+		// If this is an ajax load() the first arg should be the string URL;
+		// technically this could also be the "Anything" arg of the event .load()
+		// which just goes to show why this dumb signature has been deprecated!
+		// jQuery custom builds that exclude the Ajax module justifiably die here.
+		if ( name === "load" && typeof args[ 0 ] === "string" ) {
+			return oldLoad.apply( this, args );
+		}
+
+		migrateWarn( "jQuery.fn." + name + "() is deprecated" );
+
+		args.splice( 0, 0, name );
+		if ( arguments.length ) {
+			return this.on.apply( this, args );
+		}
+
+		// Use .triggerHandler here because:
+		// - load and unload events don't need to bubble, only applied to window or image
+		// - error event should not bubble to window, although it does pre-1.7
+		// See http://bugs.jquery.com/ticket/11820
+		this.triggerHandler.apply( this, args );
+		return this;
+	};
+
+} );
+
+// Trigger "ready" event only once, on document ready
+jQuery( function() {
+	jQuery( document ).triggerHandler( "ready" );
+} );
+
+jQuery.event.special.ready = {
+	setup: function() {
+		if ( this === document ) {
+			migrateWarn( "'ready' event is deprecated" );
+		}
+	}
+};
+
+jQuery.fn.extend( {
+
+	bind: function( types, data, fn ) {
+		migrateWarn( "jQuery.fn.bind() is deprecated" );
+		return this.on( types, null, data, fn );
+	},
+	unbind: function( types, fn ) {
+		migrateWarn( "jQuery.fn.unbind() is deprecated" );
+		return this.off( types, null, fn );
+	},
+	delegate: function( selector, types, data, fn ) {
+		migrateWarn( "jQuery.fn.delegate() is deprecated" );
+		return this.on( types, selector, data, fn );
+	},
+	undelegate: function( selector, types, fn ) {
+		migrateWarn( "jQuery.fn.undelegate() is deprecated" );
+		return arguments.length === 1 ?
+			this.off( selector, "**" ) :
+			this.off( types, selector || "**", fn );
+	}
+} );
+
+
+var oldOffset = jQuery.fn.offset;
+
+jQuery.fn.offset = function() {
+	var docElem,
+		elem = this[ 0 ],
+		origin = { top: 0, left: 0 };
+
+	if ( !elem || !elem.nodeType ) {
+		migrateWarn( "jQuery.fn.offset() requires a valid DOM element" );
+		return origin;
+	}
+
+	docElem = ( elem.ownerDocument || document ).documentElement;
+	if ( !jQuery.contains( docElem, elem ) ) {
+		migrateWarn( "jQuery.fn.offset() requires an element connected to a document" );
+		return origin;
+	}
+
+	return oldOffset.apply( this, arguments );
+};
+
+
+var oldParam = jQuery.param;
+
+jQuery.param = function( data, traditional ) {
+	var ajaxTraditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
+
+	if ( traditional === undefined && ajaxTraditional ) {
+
+		migrateWarn( "jQuery.param() no longer uses jQuery.ajaxSettings.traditional" );
+		traditional = ajaxTraditional;
+	}
+
+	return oldParam.call( this, data, traditional );
+};
+
+var oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack;
+
+jQuery.fn.andSelf = function() {
+	migrateWarn( "jQuery.fn.andSelf() replaced by jQuery.fn.addBack()" );
+	return oldSelf.apply( this, arguments );
+};
+
+
+var oldDeferred = jQuery.Deferred,
+	tuples = [
+
+		// Action, add listener, callbacks, .then handlers, final state
+		[ "resolve", "done", jQuery.Callbacks( "once memory" ),
+			jQuery.Callbacks( "once memory" ), "resolved" ],
+		[ "reject", "fail", jQuery.Callbacks( "once memory" ),
+			jQuery.Callbacks( "once memory" ), "rejected" ],
+		[ "notify", "progress", jQuery.Callbacks( "memory" ),
+			jQuery.Callbacks( "memory" ) ]
+	];
+
+jQuery.Deferred = function( func ) {
+	var deferred = oldDeferred(),
+		promise = deferred.promise();
+
+	deferred.pipe = promise.pipe = function( /* fnDone, fnFail, fnProgress */ ) {
+		var fns = arguments;
+
+		migrateWarn( "deferred.pipe() is deprecated" );
+
+		return jQuery.Deferred( function( newDefer ) {
+			jQuery.each( tuples, function( i, tuple ) {
+				var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+
+				// Deferred.done(function() { bind to newDefer or newDefer.resolve })
+				// deferred.fail(function() { bind to newDefer or newDefer.reject })
+				// deferred.progress(function() { bind to newDefer or newDefer.notify })
+				deferred[ tuple[ 1 ] ]( function() {
+					var returned = fn && fn.apply( this, arguments );
+					if ( returned && jQuery.isFunction( returned.promise ) ) {
+						returned.promise()
+							.done( newDefer.resolve )
+							.fail( newDefer.reject )
+							.progress( newDefer.notify );
+					} else {
+						newDefer[ tuple[ 0 ] + "With" ](
+							this === promise ? newDefer.promise() : this,
+							fn ? [ returned ] : arguments
+						);
+					}
+				} );
+			} );
+			fns = null;
+		} ).promise();
+
+	};
+
+	if ( func ) {
+		func.call( deferred, deferred );
+	}
+
+	return deferred;
+};
+
+
+
+})( jQuery, window );
\ No newline at end of file
diff --git a/htdocs/includes/jquery/js/jquery-migrate.min.js b/htdocs/includes/jquery/js/jquery-migrate.min.js
new file mode 100644
index 00000000000..a2813c5d2d8
--- /dev/null
+++ b/htdocs/includes/jquery/js/jquery-migrate.min.js
@@ -0,0 +1,2 @@
+/*! jQuery Migrate v3.0.0 | (c) jQuery Foundation and other contributors | jquery.org/license */
+"undefined"==typeof jQuery.migrateMute&&(jQuery.migrateMute=!0),function(a,b){"use strict";function c(c){var d=b.console;e[c]||(e[c]=!0,a.migrateWarnings.push(c),d&&d.warn&&!a.migrateMute&&(d.warn("JQMIGRATE: "+c),a.migrateTrace&&d.trace&&d.trace()))}function d(a,b,d,e){Object.defineProperty(a,b,{configurable:!0,enumerable:!0,get:function(){return c(e),d}})}a.migrateVersion="3.0.0",function(){var c=b.console&&b.console.log&&function(){b.console.log.apply(b.console,arguments)},d=/^[12]\./;c&&(a&&!d.test(a.fn.jquery)||c("JQMIGRATE: jQuery 3.0.0+ REQUIRED"),a.migrateWarnings&&c("JQMIGRATE: Migrate plugin loaded multiple times"),c("JQMIGRATE: Migrate is installed"+(a.migrateMute?"":" with logging active")+", version "+a.migrateVersion))}();var e={};a.migrateWarnings=[],void 0===a.migrateTrace&&(a.migrateTrace=!0),a.migrateReset=function(){e={},a.migrateWarnings.length=0},"BackCompat"===document.compatMode&&c("jQuery is not compatible with Quirks Mode");var f=a.fn.init,g=a.isNumeric,h=a.find,i=/\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/,j=/\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g;a.fn.init=function(a){var b=Array.prototype.slice.call(arguments);return"string"==typeof a&&"#"===a&&(c("jQuery( '#' ) is not a valid selector"),b[0]=[]),f.apply(this,b)},a.fn.init.prototype=a.fn,a.find=function(a){var b=Array.prototype.slice.call(arguments);if("string"==typeof a&&i.test(a))try{document.querySelector(a)}catch(d){a=a.replace(j,function(a,b,c,d){return"["+b+c+'"'+d+'"]'});try{document.querySelector(a),c("Attribute selector with '#' must be quoted: "+b[0]),b[0]=a}catch(e){c("Attribute selector with '#' was not fixed: "+b[0])}}return h.apply(this,b)};var k;for(k in h)Object.prototype.hasOwnProperty.call(h,k)&&(a.find[k]=h[k]);a.fn.size=function(){return c("jQuery.fn.size() is deprecated; use the .length property"),this.length},a.parseJSON=function(){return c("jQuery.parseJSON is deprecated; use JSON.parse"),JSON.parse.apply(null,arguments)},a.isNumeric=function(b){function d(b){var c=b&&b.toString();return!a.isArray(b)&&c-parseFloat(c)+1>=0}var e=g(b),f=d(b);return e!==f&&c("jQuery.isNumeric() should not be called on constructed objects"),f},d(a,"unique",a.uniqueSort,"jQuery.unique is deprecated, use jQuery.uniqueSort"),d(a.expr,"filters",a.expr.pseudos,"jQuery.expr.filters is now jQuery.expr.pseudos"),d(a.expr,":",a.expr.pseudos,'jQuery.expr[":"] is now jQuery.expr.pseudos');var l=a.ajax;a.ajax=function(){var a=l.apply(this,arguments);return a.promise&&(d(a,"success",a.done,"jQXHR.success is deprecated and removed"),d(a,"error",a.fail,"jQXHR.error is deprecated and removed"),d(a,"complete",a.always,"jQXHR.complete is deprecated and removed")),a};var m=a.fn.removeAttr,n=a.fn.toggleClass,o=/\S+/g;a.fn.removeAttr=function(b){var d=this;return a.each(b.match(o),function(b,e){a.expr.match.bool.test(e)&&(c("jQuery.fn.removeAttr no longer sets boolean properties: "+e),d.prop(e,!1))}),m.apply(this,arguments)},a.fn.toggleClass=function(b){return void 0!==b&&"boolean"!=typeof b?n.apply(this,arguments):(c("jQuery.fn.toggleClass( boolean ) is deprecated"),this.each(function(){var c=this.getAttribute&&this.getAttribute("class")||"";c&&a.data(this,"__className__",c),this.setAttribute&&this.setAttribute("class",c||b===!1?"":a.data(this,"__className__")||"")}))};var p=!1;a.swap&&a.each(["height","width","reliableMarginRight"],function(b,c){var d=a.cssHooks[c]&&a.cssHooks[c].get;d&&(a.cssHooks[c].get=function(){var a;return p=!0,a=d.apply(this,arguments),p=!1,a})}),a.swap=function(a,b,d,e){var f,g,h={};p||c("jQuery.swap() is undocumented and deprecated");for(g in b)h[g]=a.style[g],a.style[g]=b[g];f=d.apply(a,e||[]);for(g in b)a.style[g]=h[g];return f};var q=a.data;a.data=function(b,d,e){var f;return d&&d!==a.camelCase(d)&&(f=a.hasData(b)&&q.call(this,b),f&&d in f)?(c("jQuery.data() always sets/gets camelCased names: "+d),arguments.length>2&&(f[d]=e),f[d]):q.apply(this,arguments)};var r=a.Tween.prototype.run;a.Tween.prototype.run=function(b){a.easing[this.easing].length>1&&(c('easing function "jQuery.easing.'+this.easing.toString()+'" should use only first argument'),a.easing[this.easing]=a.easing[this.easing].bind(a.easing,b,this.options.duration*b,0,1,this.options.duration)),r.apply(this,arguments)};var s=a.fn.load,t=a.event.fix;a.event.props=[],a.event.fixHooks={},a.event.fix=function(b){var d,e=b.type,f=this.fixHooks[e],g=a.event.props;if(g.length)for(c("jQuery.event.props are deprecated and removed: "+g.join());g.length;)a.event.addProp(g.pop());if(f&&!f._migrated_&&(f._migrated_=!0,c("jQuery.event.fixHooks are deprecated and removed: "+e),(g=f.props)&&g.length))for(;g.length;)a.event.addProp(g.pop());return d=t.call(this,b),f&&f.filter?f.filter(d,b):d},a.each(["load","unload","error"],function(b,d){a.fn[d]=function(){var a=Array.prototype.slice.call(arguments,0);return"load"===d&&"string"==typeof a[0]?s.apply(this,a):(c("jQuery.fn."+d+"() is deprecated"),a.splice(0,0,d),arguments.length?this.on.apply(this,a):(this.triggerHandler.apply(this,a),this))}}),a(function(){a(document).triggerHandler("ready")}),a.event.special.ready={setup:function(){this===document&&c("'ready' event is deprecated")}},a.fn.extend({bind:function(a,b,d){return c("jQuery.fn.bind() is deprecated"),this.on(a,null,b,d)},unbind:function(a,b){return c("jQuery.fn.unbind() is deprecated"),this.off(a,null,b)},delegate:function(a,b,d,e){return c("jQuery.fn.delegate() is deprecated"),this.on(b,a,d,e)},undelegate:function(a,b,d){return c("jQuery.fn.undelegate() is deprecated"),1===arguments.length?this.off(a,"**"):this.off(b,a||"**",d)}});var u=a.fn.offset;a.fn.offset=function(){var b,d=this[0],e={top:0,left:0};return d&&d.nodeType?(b=(d.ownerDocument||document).documentElement,a.contains(b,d)?u.apply(this,arguments):(c("jQuery.fn.offset() requires an element connected to a document"),e)):(c("jQuery.fn.offset() requires a valid DOM element"),e)};var v=a.param;a.param=function(b,d){var e=a.ajaxSettings&&a.ajaxSettings.traditional;return void 0===d&&e&&(c("jQuery.param() no longer uses jQuery.ajaxSettings.traditional"),d=e),v.call(this,b,d)};var w=a.fn.andSelf||a.fn.addBack;a.fn.andSelf=function(){return c("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()"),w.apply(this,arguments)};var x=a.Deferred,y=[["resolve","done",a.Callbacks("once memory"),a.Callbacks("once memory"),"resolved"],["reject","fail",a.Callbacks("once memory"),a.Callbacks("once memory"),"rejected"],["notify","progress",a.Callbacks("memory"),a.Callbacks("memory")]];a.Deferred=function(b){var d=x(),e=d.promise();return d.pipe=e.pipe=function(){var b=arguments;return c("deferred.pipe() is deprecated"),a.Deferred(function(c){a.each(y,function(f,g){var h=a.isFunction(b[f])&&b[f];d[g[1]](function(){var b=h&&h.apply(this,arguments);b&&a.isFunction(b.promise)?b.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[g[0]+"With"](this===e?c.promise():this,h?[b]:arguments)})}),b=null}).promise()},b&&b.call(d,d),d}}(jQuery,window);
\ No newline at end of file
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 9c0a98cbcfb..3a6ec46d61f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1146,6 +1146,8 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             print '<!-- Includes JS for JQuery -->'."\n";
             if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            if (constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             if (constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 3de7196a696..0776c36f74a 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -38,6 +38,8 @@ if (empty($usedolheader))
 	<link rel="stylesheet" type="text/css" title="default" href="<?php echo DOL_URL_ROOT ?>/theme/eldy/style.css.php<?php echo ($_GET["dol_use_jmobile"] == 1)?'?dol_use_jmobile=1&dol_optimize_smallscreen=1':''; ?>" />
 	<!-- Includes JS for JQuery -->
 	<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/js/jquery.min.js"></script>
+	<!-- migration fixes for removed Jquery functions -->
+	<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/js/jquery-migrate.min.js"></script>
 	<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js"></script>
 	<!-- <script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/datatables/media/js/jquery.dataTables.js"></script> -->
 	<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/select2/select2.min.js?version=4.0.0-beta"></script>

From a76ddc8b3ff6b96f7bc2e2dcfefc7fc588421f4f Mon Sep 17 00:00:00 2001
From: Thomas Raschbacher <lordvan@lordvan.com>
Date: Wed, 29 Mar 2017 15:33:32 +0200
Subject: [PATCH 0501/1163] Add phone phone numbers to project contacts

Add phone number(s) for project contacts to be used in odt
---
 .../doc/doc_generic_project_odt.modules.php   | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 06b188496a5..32be29b082c 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -186,6 +186,25 @@ class doc_generic_project_odt extends ModelePDFProjects
 	{
 		global $conf;
 
+		// adding phone numbers if external
+		$phone_pro = '';
+		$phone_perso = '';
+		$phone_mobile = '';
+
+		$ct = new Contact($this->db);
+		if ($contact['source']=='external') {
+			$ct = new Contact($this->db);
+			$ct->fetch($contact['id']);
+			$phone_pro = $ct->phone_pro;
+			$phone_perso = $ct->phone_perso;
+			$phone_mobile = $ct->phone_mobile;
+		} elseif ($contact['source']=='internal') {
+			$ct = new User($this->db);
+			$ct->fetch($contact['id']);
+			$phone_pro = $ct->office_phone;
+			$phone_mobile = $ct->user_mobile;
+		}
+
 		return array(
 		'projcontacts_id'=>$contact['id'],
 		'projcontacts_rowid'=>$contact['rowid'],
@@ -194,7 +213,10 @@ class doc_generic_project_odt extends ModelePDFProjects
 		'projcontacts_firstname'=>$contact['firstname'],
 		'projcontacts_fullcivname'=>$contact['fullname'],
 		'projcontacts_socname'=>$contact['socname'],
-		'projcontacts_email'=>$contact['email']
+		'projcontacts_email'=>$contact['email'],
+		'projcontacts_phone_pro'=>$phone_pro,
+		'projcontacts_phone_perso'=>$phone_perso,
+		'projcontacts_phone_mobile'=>$phone_mobile
 		);
 	}
 

From 4df8dcf9800d81225265fd534ea1cef35869fb63 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 29 Mar 2017 21:36:50 +0200
Subject: [PATCH 0502/1163] Work on module modBlockedLog and modModuleBuilder

---
 htdocs/admin/menus.php                        |   2 +-
 htdocs/admin/menus/index.php                  |   2 +-
 htdocs/admin/menus/other.php                  |   2 +-
 htdocs/admin/modules.php                      |   3 +-
 htdocs/core/modules/modBlockedLog.class.php   |   2 +-
 .../core/modules/modModuleBuilder.class.php   |  89 +++
 htdocs/cron/card.php                          |   8 +-
 htdocs/cron/class/cronjob.class.php           |  57 +-
 htdocs/langs/en_US/modulebuilder.lang         |   3 +
 htdocs/main.inc.php                           |  36 +-
 htdocs/modulebuilder/index.php                |  91 +++
 htdocs/modulebuilder/skeletons/.gitignore     |   2 +
 htdocs/modulebuilder/skeletons/README         |  34 +
 .../skeletons/build_api_class.php             | 123 ++++
 .../skeletons/build_class_from_table.php      | 677 ++++++++++++++++++
 .../skeletons/build_webservice_from_class.php | 179 +++++
 .../skeletons/modMyModule.class.php           | 291 ++++++++
 .../skeletons/skeleton_api_class.class.php    | 289 ++++++++
 .../modulebuilder/skeletons/skeleton_card.php | 351 +++++++++
 .../skeletons/skeleton_class.class.php        | 593 +++++++++++++++
 .../modulebuilder/skeletons/skeleton_list.php | 569 +++++++++++++++
 .../skeletons/skeleton_script.php             | 166 +++++
 .../skeletons/skeleton_webservice_server.php  | 272 +++++++
 htdocs/theme/eldy/style.css.php               |   4 +
 htdocs/theme/md/style.css.php                 |   4 +
 htdocs/user/class/user.class.php              |   2 +-
 26 files changed, 3828 insertions(+), 23 deletions(-)
 create mode 100644 htdocs/core/modules/modModuleBuilder.class.php
 create mode 100644 htdocs/langs/en_US/modulebuilder.lang
 create mode 100644 htdocs/modulebuilder/index.php
 create mode 100644 htdocs/modulebuilder/skeletons/.gitignore
 create mode 100644 htdocs/modulebuilder/skeletons/README
 create mode 100755 htdocs/modulebuilder/skeletons/build_api_class.php
 create mode 100755 htdocs/modulebuilder/skeletons/build_class_from_table.php
 create mode 100755 htdocs/modulebuilder/skeletons/build_webservice_from_class.php
 create mode 100644 htdocs/modulebuilder/skeletons/modMyModule.class.php
 create mode 100644 htdocs/modulebuilder/skeletons/skeleton_api_class.class.php
 create mode 100644 htdocs/modulebuilder/skeletons/skeleton_card.php
 create mode 100644 htdocs/modulebuilder/skeletons/skeleton_class.class.php
 create mode 100644 htdocs/modulebuilder/skeletons/skeleton_list.php
 create mode 100644 htdocs/modulebuilder/skeletons/skeleton_script.php
 create mode 100644 htdocs/modulebuilder/skeletons/skeleton_webservice_server.php

diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index f8b89c515aa..0d6ff4d34a0 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -155,7 +155,7 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head($head, 'handler', $langs->trans("Menus"));
+dol_fiche_head($head, 'handler', $langs->trans("Menus"), -1);
 
 print $langs->trans("MenusDesc")."<br>\n";
 print "<br>\n";
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index acfa9d2dccd..ed5f56954c0 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -234,7 +234,7 @@ $head[$h][1] = $langs->trans("Miscellaneous");
 $head[$h][2] = 'misc';
 $h++;
 
-dol_fiche_head($head, 'editor', $langs->trans("Menus"));
+dol_fiche_head($head, 'editor', $langs->trans("Menus"), -1);
 
 print $langs->trans("MenusEditorDesc")."<br>\n";
 print "<br>\n";
diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php
index 471edf58e79..0a3cb6b99bc 100644
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@@ -77,7 +77,7 @@ $head[$h][1] = $langs->trans("Miscellaneous");
 $head[$h][2] = 'misc';
 $h++;
 
-dol_fiche_head($head, 'misc', $langs->trans("Menus"));
+dol_fiche_head($head, 'misc', $langs->trans("Menus"), -1);
 
 
 // Other Options
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index bfaeabf67d4..ddaf940492f 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -278,13 +278,12 @@ foreach ($modulesdir as $dir)
 
 		            try
 		            {
-		                $res=include_once $dir.$file;
+		                $res=include_once $dir.$file;     // A class already exists in a different file will send a non catchable fatal error. 
 		                if (class_exists($modName))
 						{
 							try {
 				                $objMod = new $modName($db);
 								$modNameLoaded[$modName]=$dir;
-
     		    		        if (! $objMod->numero > 0 && $modName != 'modUser')
     		            		{
     		         		    	dol_syslog('The module descriptor '.$modName.' must have a numero property', LOG_ERR);
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 30e4734e843..c3e2cb6345a 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -25,7 +25,7 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 /**
- *	Class to describe a Cron module
+ *	Class to describe a BlockedLog module
  */
 class modBlockedLog extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modModuleBuilder.class.php b/htdocs/core/modules/modModuleBuilder.class.php
new file mode 100644
index 00000000000..b68148377c3
--- /dev/null
+++ b/htdocs/core/modules/modModuleBuilder.class.php
@@ -0,0 +1,89 @@
+<?php
+/* Copyright (C) 2017   Laurent Destailleur  <eldy@users.sourcefore.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	\defgroup   modulebuilder   Module ModuleBuilder
+ *  \brief      Add a log into a block chain for some actions.
+ *  \file       htdocs/core/modules/modBlockedLog.class.php
+ *  \ingroup    blockedlog
+ *  \brief      Description and activation file for module ModuleBuilder
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+/**
+ *	Class to describe a ModuleBuilder module
+ */
+class modModuleBuilder extends DolibarrModules
+{
+    /**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+    	global $langs,$conf;
+
+        $this->db = $db;
+        $this->numero = 3300;
+
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+        $this->family = "technic";
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "A tool to help developers to build their own module.";
+        $this->version = 'development';                        // 'development', 'experimental' or 'dolibarr' or version
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
+        $this->special = 1;
+        // Name of image file used for this module.
+        $this->picto='technic';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array();
+
+        // Config pages
+        //-------------
+        $this->config_page_url = array();
+
+        // Dependancies
+        //-------------
+	    $this->hidden = false;	// A condition to disable module
+	    $this->depends = array();		// List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of modules id to disable if this one is disabled
+	    $this->conflictwith = array();	// List of modules id this module is in conflict with
+        $this->langfiles = array();
+
+        // Constants
+        //-----------
+
+
+        // New pages on tabs
+        // -----------------
+        $this->tabs = array();
+
+        // Boxes
+        //------
+        $this->boxes = array();
+
+        // Main menu entries
+        //------------------
+        $this->menu = array();
+    }
+}
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 5e2bc435e56..fc89f6eb3cf 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -321,8 +321,8 @@ if (($action=="create") || ($action=="edit"))
 		print '<input type="hidden" name="action" value="add">'."\n";
 	}
 
-	
-	dol_fiche_head('');
+	if ($action=="edit") dol_fiche_head($head, 'card', $langs->trans("CronTask"), 0, 'cron');
+	else dol_fiche_head('');
 
 	print '<table class="border" width="100%">';
 
@@ -558,6 +558,8 @@ else
 	dol_fiche_head($head, 'card', $langs->trans("CronTask"), -1, 'cron');
 
 	$linkback = '<a href="' . DOL_URL_ROOT . '/cron/list.php?status=-2">' . $langs->trans("BackToList") . '</a>';
+
+	// TODO Use dol_banner
 	
 	// box add_jobs_box
 	print '<div class="fichecenter">';
@@ -616,7 +618,7 @@ else
 
 	print '<tr><td>';
 	print $langs->trans('Active')."</td><td>";
-	print yn($object->status);
+	print $object->getLibStatut(4);
 	print "</td></tr>";
 
 	print '</table>';
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 2f9ad12a57f..789e3bafcec 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -1199,8 +1199,63 @@ class Cronjob extends CommonObject
 		}
 
 		return 1;
-
 	}
+	
+	/**
+	 *  Return label of status of user (active, inactive)
+	 *
+	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return	string 			       Label of status
+	 */
+	function getLibStatut($mode=0)
+	{
+	    return $this->LibStatut($this->status,$mode);
+	}
+	
+	/**
+	 *  Renvoi le libelle d'un statut donne
+	 *
+	 *  @param	int		$status        	Id statut
+	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return string 			       	Label of status
+	 */
+	function LibStatut($status,$mode=0)
+	{
+	    global $langs;
+	    $langs->load('users');
+	
+	    if ($mode == 0)
+	    {
+	        $prefix='';
+	        if ($status == 1) return $langs->trans('Enabled');
+	        if ($status == 0) return $langs->trans('Disabled');
+	    }
+	    if ($mode == 1)
+	    {
+	        if ($status == 1) return $langs->trans('Enabled');
+	        if ($status == 0) return $langs->trans('Disabled');
+	    }
+	    if ($mode == 2)
+	    {
+	        if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4','class="pictostatus"').' '.$langs->trans('Enabled');
+	        if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5','class="pictostatus"').' '.$langs->trans('Disabled');
+	    }
+	    if ($mode == 3)
+	    {
+	        if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4','class="pictostatus"');
+	        if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5','class="pictostatus"');
+	    }
+	    if ($mode == 4)
+	    {
+	        if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4','class="pictostatus"').' '.$langs->trans('Enabled');
+	        if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5','class="pictostatus"').' '.$langs->trans('Disabled');
+	    }
+	    if ($mode == 5)
+	    {
+	        if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4','class="pictostatus"');
+	        if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5','class="pictostatus"');
+	    }
+	}	
 }
 
 
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
new file mode 100644
index 00000000000..6605a7b6a63
--- /dev/null
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilder=Module Builder
+ModuleBuilderDesc=This tools give you utilites to build your own module. Your modules will be generated into the first alternative directory: <strong>%s</strong>.
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 8d1138e5758..fe1ed01a68f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1377,8 +1377,6 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    $menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks));      // This contains a \n
 	    print "</div>\n";
 
-	    //$form=new Form($db);
-
 	    // Define link to login card
         $appli=constant('DOL_APPLICATION_TITLE');
 	    if (! empty($conf->global->MAIN_APPLICATION_TITLE))
@@ -1403,7 +1401,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
     	    	$logouthtmltext.=$langs->trans("Logout").'<br>';
 
     	    	$logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php">';
-    	        $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+    	        //$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+    	    	$logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
     	        $logouttext .='</a>';
     	    }
     	    else
@@ -1427,6 +1426,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 		$toprightmenu.='</div>';
 
 	    $toprightmenu.='<div class="login_block_other">';
+		
 		// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
 	    $parameters=array();
 	    $result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
@@ -1437,7 +1437,17 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 		}
 		else $toprightmenu.=$result;	// For backward compatibility
 
-	    // Link to print main content area
+    	// Link to module builder
+	    if (! empty($conf->modulebuilder->enabled))
+	    {
+	        $text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_blank">';
+	        //$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
+	        $text.='<span class="fa fa-bug atoplogin"></span>';
+	        $text.='</a>';
+	        $toprightmenu.=@Form::textwithtooltip('',$langs->trans("ModuleBuilder"),2,1,$text,'login_block_elem',2);
+	    }
+
+		// Link to print main content area
 	    if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && empty($conf->browser->phone))
 	    {
 	        $qs=$_SERVER["QUERY_STRING"];
@@ -1448,7 +1458,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 
 			$qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
 	        $text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
-	        $text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
+	        //$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
+	        $text.='<span class="fa fa-print atoplogin"></span>';
 	        $text.='</a>';
 	        $toprightmenu.=@Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
 	    }
@@ -1481,7 +1492,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	            if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
 	            else $text.=sprintf($helpbaseurl,$helppage);
 	            $text.='">';
-	            $text.=img_picto('', 'helpdoc_top').' ';
+	            //$text.=img_picto('', 'helpdoc_top').' ';
+	            $text.='<span class="fa fa-question-circle atoplogin"></span>';
 	            //$toprightmenu.=$langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help');
 	            //if ($mode == 'wiki') $text.=' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
 	            $text.='</a>';
@@ -1641,11 +1653,11 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
         {
             $doliurl='https://www.dolibarr.org';
     		//local communities
-    		if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.fr';
-    		if (preg_match('/es/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.es';
-    		if (preg_match('/de/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.de';
-    		if (preg_match('/it/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.it';
-    		if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.gr';
+    		if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.fr';
+    		if (preg_match('/es/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.es';
+    		if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
+    		if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
+    		if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
     
             $appli=constant('DOL_APPLICATION_TITLE');
     	    if (! empty($conf->global->MAIN_APPLICATION_TITLE))
@@ -1676,7 +1688,7 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
 			$bugbaseurl.= '?title=';
 			$bugbaseurl.= urlencode("Bug: ");
 			$bugbaseurl.= '&body=';
-			// FIXME: use .github/ISSUE_TEMPLATE.md to generate?
+			// TODO use .github/ISSUE_TEMPLATE.md to generate?
 			$bugbaseurl .= urlencode("# Bug\n");
 			$bugbaseurl .= urlencode("\n");
 			$bugbaseurl.= urlencode("## Environment\n");
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
new file mode 100644
index 00000000000..182268a5f06
--- /dev/null
+++ b/htdocs/modulebuilder/index.php
@@ -0,0 +1,91 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/modulebuilder/index.php
+ *       \brief      Home page for module builder module
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+$langs->load("admin");
+$langs->load("modulebuilder");
+$langs->load("other");
+
+// Security check
+if (! $user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessforbidden('ModuleBuilderNotAllowed');
+
+
+
+/*
+ * View
+ */
+
+$socstatic=new Societe($db);
+
+
+llxHeader("",$langs->trans("ModuleBuilder"),"");
+
+
+$text=$langs->trans("ModuleBuilder");
+
+print load_fiche_titre($text, '', 'title_setup');
+
+$tmp=explode(',', $dolibarr_main_document_root_alt);
+$dircustom = $tmp[0];
+
+// Show description of content
+print $langs->trans("ModuleBuilderDesc", $dircustom).'<br><br>';
+
+
+
+/*
+if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// Entry for Module builder
+{
+    global $dolibarr_main_document_root_alt;
+    if (! empty($dolibarr_main_document_root_alt) && is_array($dolibarr_main_document_root_alt))
+    {
+        foreach ($dolibarr_main_document_root_alt as $diralt)
+        {*/
+            $dirsincustom=dol_dir_list($dircustom);
+            
+            if (is_array($dirsincustom) && count($dirsincustom) > 0)
+            {
+                foreach ($dirsincustom as $dircustom)
+                {
+                    $fullname = $dircustom['fullname'];
+                    if (dol_is_file($fullname.'/modulebuilder.txt'))
+                    {
+                        print '<div class="boxstats">'.$module.'</div>';
+                    }
+                }
+            }
+/*        }
+    }
+    else
+    {
+        $newmenu->add('', 'NoGeneratedModuleFound', 0, 0);
+    }*/
+
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/modulebuilder/skeletons/.gitignore b/htdocs/modulebuilder/skeletons/.gitignore
new file mode 100644
index 00000000000..2dda6229d24
--- /dev/null
+++ b/htdocs/modulebuilder/skeletons/.gitignore
@@ -0,0 +1,2 @@
+out.*
+socpeople*
diff --git a/htdocs/modulebuilder/skeletons/README b/htdocs/modulebuilder/skeletons/README
new file mode 100644
index 00000000000..5b5b992d91e
--- /dev/null
+++ b/htdocs/modulebuilder/skeletons/README
@@ -0,0 +1,34 @@
+README (English)
+--------------------------------
+This directory contains PHP script samples that can be used to start a development on Dolibarr.
+
+
+*** build_class_from_table.php:
+
+This is the script to use to generate PHP code of a PHP POJO class
+object, a PHP script that use this POJO. This script use the files
+skeleton_*.php to build its generated code. 
+
+
+*** modMyModule.class.php:
+
+Is a sample of module descriptor that you can use if you want to build a new module/plugin for
+Dolibarr.
+
+
+*** skeleton_script.php:
+
+Is a sample you can use as an example if you need to build a script to run on command line
+
+
+*** skeleton_page.php:
+
+Is a sample you can use as an example if you need to build an HTML page to include in Dolibarr GUI.
+
+
+*** skeleton_class.class.php:
+
+Is a sample you can use as an example if you need to build a class file to access a new table required by a Dolibarr development.
+However it is better to run the build_class_from_table.php script that accepts a table name as a parameter and will uses the description table within database and the skeleton_class.class.php file to generate full code for your class file.
+After running this script, the class to access your table (insert a record, update, delete and select) is directly finished and can be used by your module's code. 
+No more coding is needed to get access to table with this script because the file is completely generated once.
diff --git a/htdocs/modulebuilder/skeletons/build_api_class.php b/htdocs/modulebuilder/skeletons/build_api_class.php
new file mode 100755
index 00000000000..6263eabcd6e
--- /dev/null
+++ b/htdocs/modulebuilder/skeletons/build_api_class.php
@@ -0,0 +1,123 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2015   Jean-François Ferry <jfefe@aternatik.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       dev/skeletons/build_api_class.php
+ *  \ingroup    core
+ *  \brief      Create a complete API class file from existant class file
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
+}
+
+// Include Dolibarr environment
+require_once($path."../../htdocs/master.inc.php");
+// After this $db is a defined handler to database.
+
+// Main
+$version='1';
+@set_time_limit(0);
+$error=0;
+
+$langs->load("main");
+
+
+print "***** $script_file ($version) *****\n";
+
+
+// -------------------- START OF BUILD_API_FROM_CLASS --------------------
+
+// Check parameters
+if (! isset($argv[1]) && ! isset($argv[2]))
+{
+    print "Usage: $script_file phpClassFile phpClassName\n";
+    exit;
+}
+// Show parameters
+print 'Classfile='.$argv[1]."\n";
+print 'Classname='.$argv[2]."\n";
+
+$classfile=$argv[1];
+$classname=$argv[2];
+$classmin=strtolower($classname);
+$classnameApi = $classname.'Api';
+$property=array();
+$targetcontent='';
+
+// Load the class and read properties
+require_once($classfile);
+
+$property=array();
+$class = new $classname($db);
+$values=get_class_vars($classname);
+
+unset($values['db']);
+unset($values['error']);
+unset($values['errors']);
+unset($values['element']);
+unset($values['table_element']);
+unset($values['table_element_line']);
+unset($values['fk_element']);
+unset($values['ismultientitymanaged']);
+
+// Read skeleton_api_class.class.php file
+$skeletonfile=$path.'skeleton_api_class.class.php';
+$sourcecontent=file_get_contents($skeletonfile);
+if (! $sourcecontent)
+{
+	print "\n";
+	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
+	print "Try to run script from skeletons directory.\n";
+	exit;
+}
+
+// Define output variables
+$outfile='out.api_'.$classmin.'.class.php';
+$targetcontent=$sourcecontent;
+
+// Substitute class name
+$targetcontent=preg_replace('/skeleton_api_class\.class\.php/', 'api_'.$classmin.'.class.php', $targetcontent);
+$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
+//$targetcontent=preg_replace('/\$table_element=\'skeleton\'/', '\$table_element=\''.$tablenoprefix.'\'', $targetcontent);
+$targetcontent=preg_replace('/SkeletonApi/', $classnameApi, $targetcontent);
+$targetcontent=preg_replace('/Skeleton/', $classname, $targetcontent);
+
+// Build file
+$fp=fopen($outfile,"w");
+if ($fp)
+{
+	fputs($fp, $targetcontent);
+	fclose($fp);
+	print "\n";
+	print "File '".$outfile."' has been built in current directory.\n";
+}
+else $error++;
+
+
+
+// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
+
+print "You can now rename generated files by removing the 'out.' prefix in their name and store them into directory /module/class.\n";
+return $error;
diff --git a/htdocs/modulebuilder/skeletons/build_class_from_table.php b/htdocs/modulebuilder/skeletons/build_class_from_table.php
new file mode 100755
index 00000000000..0e5a6d82a82
--- /dev/null
+++ b/htdocs/modulebuilder/skeletons/build_class_from_table.php
@@ -0,0 +1,677 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2008-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       dev/skeletons/build_class_from_table.php
+ *  \ingroup    core
+ *  \brief      Create a complete class file from a table in database
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
+}
+
+// Include Dolibarr environment
+require_once($path."../../htdocs/master.inc.php");
+// After this $db is a defined handler to database.
+
+// Main
+$version='3.2';
+@set_time_limit(0);
+$error=0;
+
+$langs->load("main");
+
+
+print "***** $script_file ($version) *****\n";
+
+
+// -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
+
+// Check parameters
+if (! isset($argv[1]) || ! isset($argv[2]) || (isset($argv[3]) && ! isset($argv[7])))
+{
+    print "Usage: $script_file tablename modulename [server port databasename user pass]\n";
+    exit;
+}
+
+if (isset($argv[3]) && isset($argv[4]) && isset($argv[5]) && isset($argv[6]) && isset($argv[7]))
+{
+	print 'Use specific database ids'."\n";
+	$db=getDoliDBInstance('mysqli',$argv[3],$argv[6],$argv[7],$argv[5],$argv[4]);
+}
+
+if ($db->type != 'mysql' && $db->type != 'mysqli')
+{
+	print "Error: This script works with mysql or mysqli driver only\n";
+	exit;
+}
+
+$table=$argv[1];
+$module=$argv[2];
+
+// Show parameters
+print 'Tablename: '.$table."\n";
+print 'Modulename: '.$module."\n";
+print "Current dir: ".getcwd()."\n";
+print "Database name: ".$db->database_name."\n";
+
+
+// Define array with list of properties
+$property=array();
+$foundprimary=0;
+$resql=$db->DDLDescTable($table);
+if ($resql)
+{
+	$i=0;
+	while($obj=$db->fetch_object($resql))
+	{
+		//var_dump($obj);
+		$i++;
+		$property[$i]['field']=$obj->Field;
+		if ($obj->Key == 'PRI')
+		{
+			$property[$i]['primary']=1;
+			$foundprimary=1;
+		}
+		else
+		{
+			$property[$i]['primary']=1;
+		}
+		$property[$i]['type'] =$obj->Type;
+		$property[$i]['null'] =$obj->Null;
+		$property[$i]['extra']=$obj->Extra;
+		if ($property[$i]['type'] == 'date'
+			|| $property[$i]['type'] == 'datetime'
+			|| $property[$i]['type'] == 'timestamp')
+		{
+			$property[$i]['istime']=true;
+		}
+		else
+		{
+			$property[$i]['istime']=false;
+		}
+		if (preg_match('/varchar/i',$property[$i]['type'])
+			|| preg_match('/text/i',$property[$i]['type']))
+		{
+			$property[$i]['ischar']=true;
+		}
+		else
+		{
+			$property[$i]['ischar']=false;
+		}
+		if (preg_match('/int/i',$property[$i]['type']))
+		{
+			$property[$i]['isint']=true;
+		}
+		else
+		{
+			$property[$i]['isint']=false;
+		}
+	}
+}
+else
+{
+	print "Error: Failed to get description for table '".$table."'.\n";
+	return false;
+}
+//var_dump($property);
+
+// Define substitute fetch/select parameters
+$varpropselect="\n";
+$cleanparam='';
+$i=0;
+foreach($property as $key => $prop)
+{
+    $i++;
+    if ($prop['field'] != 'rowid')
+    {
+        $varpropselect.="\t\t\$sql .= \" ";
+        $varpropselect.="t.".$prop['field'];
+        if ($i < count($property)) $varpropselect.=",";
+        $varpropselect.="\";";
+        $varpropselect.="\n";
+    }
+}
+
+
+
+//--------------------------------
+// Build skeleton_class.class.php
+//--------------------------------
+
+// Define working variables
+$table=strtolower($table);
+$tablenoprefix=preg_replace('/'.preg_quote(MAIN_DB_PREFIX,'/').'/i','',$table);
+$classname=preg_replace('/_/','',ucfirst($tablenoprefix));
+$classmin=preg_replace('/_/','',strtolower($classname));
+
+
+// Read skeleton_class.class.php file
+$skeletonfile=$path.'skeleton_class.class.php';
+$sourcecontent=file_get_contents($skeletonfile);
+if (! $sourcecontent)
+{
+	print "\n";
+	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
+	print "Try to run script from skeletons directory.\n";
+	exit;
+}
+
+// Define output variables
+$outfile=$classmin.'.class.php';
+$targetcontent=$sourcecontent;
+
+// Substitute module name
+$targetcontent=preg_replace('/dev\/skeletons/', $module, $targetcontent);
+$targetcontent=preg_replace('/mymodule othermodule1 othermodule2/', $module, $targetcontent);
+$targetcontent=preg_replace('/mymodule/', $module, $targetcontent);
+
+// Substitute class name
+$targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
+$targetcontent=preg_replace('/\$element = \'skeleton\'/', '\$element = \''.$classmin.'\'', $targetcontent);
+$targetcontent=preg_replace('/\$table_element = \'skeleton\'/', '\$table_element = \''.$tablenoprefix.'\'', $targetcontent);
+$targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
+$targetcontent=preg_replace('/skeletons/', $classmin, $targetcontent);
+$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
+
+// Substitute comments
+$targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
+$targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
+$targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
+
+// Substitute table name
+$targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
+
+// Substitute declaration parameters
+$varprop="\n";
+$cleanparam='';
+foreach($property as $key => $prop)
+{
+	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
+	{
+		$varprop.="\tpublic \$".$prop['field'];
+		if ($prop['istime']) $varprop.=" = ''";
+		$varprop.=";";
+		if ($prop['comment']) $varprop.="\t// ".$prop['extra'];
+		$varprop.="\n";
+	}
+}
+$targetcontent=preg_replace('/'.preg_quote('public $prop1;','/').'/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/'.preg_quote('public $prop2;','/').'/', '', $targetcontent);
+
+$targetcontent=preg_replace('/\*((\s|\n|\r|\t)*)\@var mixed Sample property 1((\s|\n|\r|\t)*)/', '', $targetcontent);
+$targetcontent=preg_replace('/\*((\s|\n|\r|\t)*)\@var mixed Sample property 2((\s|\n|\r|\t)*)/', '', $targetcontent);
+
+// Substitute clean parameters
+$varprop="\n";
+$cleanparam='';
+foreach($property as $key => $prop)
+{
+	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+	{
+		$varprop.="\t\tif (isset(\$this->".$prop['field'].")) {\n\t\t\t \$this->".$prop['field']." = trim(\$this->".$prop['field'].");\n\t\t}";
+		$varprop.="\n";
+	}
+}
+$targetcontent=preg_replace('/if \(isset\(\$this->prop1\)\) {((\n|\r|\t)*)\$this->prop1 = trim\(\$this->prop1\);((\n|\r|\t)*)}/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/if \(isset\(\$this->prop2\)\) {((\n|\r|\t)*)\$this->prop2 = trim\(\$this->prop2\);((\n|\r|\t)*)}/', '', $targetcontent);
+
+
+$no_output_field=0;
+foreach($property as $key => $prop)
+{
+	if ($prop['field'] == 'tms') $no_output_field++;	// This is a field of type timestamp edited automatically
+	if ($prop['extra'] == 'auto_increment') $no_output_field++;
+}
+// Substitute insert into parameters
+$varprop="\n";
+$cleanparam='';
+$i=0;
+foreach($property as $key => $prop)
+{
+	$i++;
+	$addfield=1;
+	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
+	if ($prop['extra'] == 'auto_increment') $addfield=0;
+
+	if ($addfield)
+	{
+		$varprop.="\t\t\$sql.= '".$prop['field'];
+		if ($i < (count($property)-$no_output_field)) $varprop.=",";
+		$varprop.="';";
+		$varprop.="\n";
+	}
+}
+$targetcontent=preg_replace('/\$sql \.= \' field1,\';/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\$sql \.= \' field2\';/', '', $targetcontent);
+
+// Substitute insert values parameters
+$varprop="\n";
+$cleanparam='';
+$i=0;
+
+//Count nb field to output to manage commat at end SQL instruction
+
+
+foreach($property as $key => $prop)
+{
+	
+	$addfield=1;
+	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
+	if ($prop['extra'] == 'auto_increment') $addfield=0;
+	
+	if ($addfield)
+	{
+		$i++;
+		
+		$varprop.="\t\t\$sql .= ' ";
+		if ($prop['field']=='datec')
+		{
+			$varprop.='\'."\'".$this->db->idate(dol_now())."\'"';
+		}
+		elseif ($prop['istime'])
+		{
+			$varprop.='\'.(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].')==0?\'NULL\':"\'".$this->db->idate(';
+			$varprop.="\$this->".$prop['field'];
+			$varprop.=").\"'\")";
+		}
+		elseif ($prop['ischar'])
+		{
+			$varprop.="'.(! isset(\$this->".$prop['field'].")?'NULL':\"'\".";
+			$varprop.="\$this->db->escape(\$this->".$prop['field'].")";
+			$varprop.=".\"'\")";
+		}
+		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_m' ||  $prop['field']=='fk_user_author')
+		{
+			$varprop.="'.\$user->id";
+		}
+		elseif ($prop['isint'])
+		{
+			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':';
+			$varprop.="\$this->".$prop['field'];
+			$varprop.=')';
+		}
+		else
+		{
+			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':"\'".';
+			$varprop.="\$this->".$prop['field'];
+			$varprop.='."\'")';
+		}
+		
+		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
+		$varprop.=';';
+		$varprop.="\n";
+	}
+}
+
+$patern1='/\$sql \.= \' (.*)\' \. \$this->prop1 \. \'(.*),\';/';
+$patern2='/\$sql \.= \' (.*)\' \. \$this->prop2 \. \'(.*)\';/';
+$targetcontent=preg_replace($patern1, $varprop, $targetcontent);
+$targetcontent=preg_replace($patern2, '', $targetcontent);
+
+// Substitute update values parameters
+
+//Count nb field to output to manage commat at end SQL instruction
+$no_output_field=0;
+foreach($property as $key => $prop)
+{
+	if ($prop['extra'] == 'auto_increment') $no_output_field++;
+}
+
+$varprop="\n";
+$cleanparam='';
+$i=0;
+foreach($property as $key => $prop)
+{
+	
+	$addfield=1;
+	if ($prop['extra'] == 'auto_increment') $addfield=0;
+	
+	if ($addfield)
+	{
+		$i++;
+		
+		$varprop.="\t\t\$sql .= ' ";
+		$varprop.=$prop['field'].' = ';
+		if ($prop['field']=='tms') {
+			$varprop.='\'.(dol_strlen($this->'.$prop['field'].') != 0 ? "\'".$this->db->idate(';
+			$varprop.='$this->'.$prop['field'];
+			$varprop.=')."\'" : "\'".$this->db->idate(dol_now())."\'")';
+		}
+		elseif ($prop['istime'])
+		{
+			$varprop.='\'.(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].') != 0 ? "\'".$this->db->idate(';
+			$varprop.='$this->'.$prop['field'];
+			$varprop.=')."\'" : \'null\')';
+		}
+		
+		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_m') {
+			$varprop.="'.\$user->id";
+		}
+		else
+		{
+			$varprop.="'.";
+			if ($prop['ischar']) $varprop.='(isset($this->'.$prop['field'].')?"\'".$this->db->escape($this->'.$prop['field'].')."\'":"null")';
+			elseif ($prop['isint']) $varprop.='(isset($this->'.$prop['field'].')?$this->'.$prop['field'].':"null")';
+			else $varprop.='(isset($this->'.$prop['field'].')?$this->'.$prop['field'].':"null")';
+		}
+
+		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
+		$varprop.=';';
+		$varprop.="\n";
+	}
+}
+$targetcontent=preg_replace('/\$sql \.= " field1=".\(isset\(\$this->field1\)\?"\'".\$this->db->escape\(\$this->field1\)."\'":"null"\).",";/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\$sql \.= " field2=".\(isset\(\$this->field2\)\?"\'".\$this->db->escape\(\$this->field2\)."\'":"null"\)."";/', '', $targetcontent);
+
+// Substitute fetch/select parameters
+$targetcontent=preg_replace('/\$sql \.= \' t\.field1,\';/', $varpropselect, $targetcontent);
+$targetcontent=preg_replace('/\$sql \.= \' t\.field2\';/', '', $targetcontent);
+
+// Substitute select set parameters
+$varprop="\n";
+$varpropline="\n";
+$cleanparam='';
+$i=0;
+foreach($property as $key => $prop)
+{
+	$i++;
+	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
+	{
+		$varprop.="\t\t\t\t\$this->".$prop['field']." = ";
+		if ($prop['istime']) $varprop.='$this->db->jdate(';
+		$varprop.='$obj->'.$prop['field'];
+		if ($prop['istime']) $varprop.=')';
+		$varprop.=";";
+		$varprop.="\n";
+		
+		$varpropline.="\t\t\t\t\$line->".$prop['field']." = ";
+		if ($prop['istime']) $varpropline.='$this->db->jdate(';
+		$varpropline.='$obj->'.$prop['field'];
+		if ($prop['istime']) $varpropline.=')';
+		$varpropline.=";";
+		$varpropline.="\n";
+	}
+}
+$targetcontent=preg_replace('/\$this->prop1 = \$obj->field1;/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\$this->prop2 = \$obj->field2;/', '', $targetcontent);
+
+//Substirute fetchAll
+$targetcontent=preg_replace('/\$line->prop1 = \$obj->field1;/', $varpropline, $targetcontent);
+$targetcontent=preg_replace('/\$line->prop2 = \$obj->field2;/', '', $targetcontent);
+
+
+// Substitute initasspecimen parameters
+$varprop="\n";
+$cleanparam='';
+foreach($property as $key => $prop)
+{
+	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
+	{
+		$varprop.="\t\t\$this->".$prop['field']." = '';";
+		$varprop.="\n";
+	}
+}
+$targetcontent=preg_replace('/\$this->prop1 = \'prop1\';/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\$this->prop2 = \'prop2\';/', '', $targetcontent);
+
+// Build file
+$fp=fopen($outfile,"w");
+if ($fp)
+{
+	fputs($fp, $targetcontent);
+	fclose($fp);
+	print "\n";
+	print "File '".$outfile."' has been built in current directory.\n";
+}
+else $error++;
+
+
+
+//--------------------------------------------------------------------
+// Build skeleton_script.php, skeleton_list.php and skeleton_card.php
+//--------------------------------------------------------------------
+
+$skeletonfiles=array(
+    $path.'skeleton_script.php' => $classmin.'_script.php', 
+    $path.'skeleton_list.php' => $classmin.'_list.php', 
+    $path.'skeleton_card.php' => $classmin.'_card.php'
+    );
+    
+foreach ($skeletonfiles as $skeletonfile => $outfile)
+{
+    $sourcecontent=file_get_contents($skeletonfile);
+    if (! $sourcecontent)
+    {
+    	print "\n";
+    	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
+    	print "Try to run script from skeletons directory.\n";
+    	exit;
+    }
+    
+    // Define output variables
+    $targetcontent=$sourcecontent;
+    
+    // Substitute module name
+    $targetcontent=preg_replace('/dev\/skeletons/', $module, $targetcontent);
+    $targetcontent=preg_replace('/mymodule othermodule1 othermodule2/', $module, $targetcontent);
+    $targetcontent=preg_replace('/mymodule/', $module, $targetcontent);
+    
+    // Substitute class name
+    $targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
+    $targetcontent=preg_replace('/skeleton_script\.php/', $classmin.'_script.php', $targetcontent);
+    $targetcontent=preg_replace('/\$element = \'skeleton\'/', '\$element=\''.$classmin.'\'', $targetcontent);
+    $targetcontent=preg_replace('/\$table_element = \'skeleton\'/', '\$table_element=\''.$classmin.'\'', $targetcontent);
+    $targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
+    $targetcontent=preg_replace('/skeletons/', $classmin, $targetcontent);
+    $targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
+    
+    // Substitute comments
+    $targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
+    $targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
+    $targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
+    
+    // Substitute table name
+    $targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
+        
+    // Substitute GETPOST search_fieldx
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    if ($prop['isint']) $varprop.='$search_'.$prop['field']."=GETPOST('search_".$prop['field']."','int');\n";
+    	    else $varprop.='$search_'.$prop['field']."=GETPOST('search_".$prop['field']."','alpha');\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote('$search_field1=GETPOST("search_field1");','/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote('$search_field2=GETPOST("search_field2");','/').'/', '', $targetcontent);
+    
+    // Substitute GETPOST fieldx
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    if ($prop['isint']) $varprop.="\t\$object->".$prop['field']."=GETPOST('".$prop['field']."','int');\n";
+    	    else $varprop.="\t\$object->".$prop['field']."=GETPOST('".$prop['field']."','alpha');\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote('$object->prop1=GETPOST("field1");','/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote('$object->prop2=GETPOST("field2");','/').'/', '', $targetcontent);
+    
+    // Substitute reset search_field = '';
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.='$search_'.$prop['field']."='';\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote('$search_field1=\'\';','/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote('$search_field2=\'\';','/').'/', '', $targetcontent);
+    
+    // Substitute fetch/select parameters
+    $targetcontent=preg_replace('/\$sql\s*\.= " t\.field1,";/', $varpropselect, $targetcontent);
+    $targetcontent=preg_replace('/\$sql\s*\.= " t\.field2";/', '', $targetcontent);
+    
+    // Substitute where for search
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.='if ($search_'.$prop['field'].') $sql.= natural_search("'.$prop['field'].'",$search_'.$prop['field'].');'."\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote('if ($search_field1) $sql.= natural_search("field1",$search_field1);','/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote('if ($search_field2) $sql.= natural_search("field2",$search_field2);','/').'/', '', $targetcontent);
+    
+    // substitute $params.=
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="if (\$search_".$prop['field']." != '') \$params.= '&amp;search_".$prop['field']."='.urlencode(\$search_".$prop['field'].");\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote("if (\$search_field1 != '') \$params.= '&amp;search_field1='.urlencode(\$search_field1);",'/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote("if (\$search_field2 != '') \$params.= '&amp;search_field2='.urlencode(\$search_field2);",'/').'/', '', $targetcontent);
+    
+    // Substitute arrayfields
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="'t.".$prop['field']."'=>array('label'=>\$langs->trans(\"Field".$prop['field']."\"), 'checked'=>1),\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote("'t.field1'=>array('label'=>\$langs->trans(\"Field1\"), 'checked'=>1),",'/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote("'t.field2'=>array('label'=>\$langs->trans(\"Field2\"), 'checked'=>1),",'/').'/', '', $targetcontent);
+    
+    // Substitute print_liste_field_titre
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print_liste_field_titre(\$arrayfields['t.".$prop['field']."']['label'],\$_SERVER['PHP_SELF'],'t.".$prop['field']."','',\$params,'',\$sortfield,\$sortorder);\n";
+    	}
+    }
+    $targetcontent=preg_replace('/LIST_OF_TD_TITLE_FIELDS/', $varprop, $targetcontent);
+    
+    // Substitute fields title search
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td class=\"liste_titre\"><input type=\"text\" class=\"flat\" name=\"search_".$prop['field']."\" value=\"'.\$search_".$prop['field'].".'\" size=\"10\"></td>';\n";
+    	}
+    }
+    $targetcontent=preg_replace('/LIST_OF_TD_TITLE_SEARCH/', $varprop, $targetcontent);
+    
+    // Substitute where for <td>.fieldx.</td>
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td>'.\$obj->".$prop['field'].".'</td>';\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field1']['checked'])) print '<td>'.\$obj->field1.'</td>';",'/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field2']['checked'])) print '<td>'.\$obj->field2.'</td>';",'/').'/', '', $targetcontent);
+
+    // LIST_OF_TD_LABEL_FIELDS_CREATE - List of td for card view 
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td><input class=\"flat\" type=\"text\" name=\"".$prop['field']."\" value=\"'.GETPOST('".$prop['field']."').'\"></td></tr>';\n";
+    	}
+    }
+    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_CREATE/', $varprop, $targetcontent);
+
+    // LIST_OF_TD_LABEL_FIELDS_EDIT - List of td for card view 
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+            $baseString = 'print "<tr><td class=\"fieldrequired\">".\$langs->trans("Field%s")."</td><td><input class=\"flat\" type=\"text\" name=\"%s\" value=\"".$object->%s."\"></td></tr>";';
+            $varprop.= sprintf("\t ".$baseString." \n", $prop['field'], $prop['field'], $prop['field']);
+    	}
+    }
+    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_EDIT/', $varprop, $targetcontent);
+    
+    // LIST_OF_TD_LABEL_FIELDS_VIEW - List of td for card view 
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.=sprintf("\t print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field%s\").'</td><td>'.\$object->%s.'</td></tr>';\n",$prop['field'],$prop['field']);
+    	}
+    }
+    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_VIEW/', $varprop, $targetcontent);
+    
+    
+    // LIST_OF_TD_FIELDS_LIST
+    
+    
+    
+    // Build file
+    $fp=fopen($outfile,"w");
+    if ($fp)
+    {
+    	fputs($fp, $targetcontent);
+    	fclose($fp);
+    	print "File '".$outfile."' has been built in current directory.\n";
+    }
+    else $error++;
+}
+
+
+// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
+
+print "You can now move generated files to store them into directory /yourmodule/class (for .class.php file) or /yourmodule.\n";
+return $error;
diff --git a/htdocs/modulebuilder/skeletons/build_webservice_from_class.php b/htdocs/modulebuilder/skeletons/build_webservice_from_class.php
new file mode 100755
index 00000000000..c91347a424d
--- /dev/null
+++ b/htdocs/modulebuilder/skeletons/build_webservice_from_class.php
@@ -0,0 +1,179 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       dev/skeletons/build_webservice_from_class.php
+ *  \ingroup    core
+ *  \brief      Create a complete webservice file from CRUD functions of a PHP class
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
+}
+
+// Include Dolibarr environment
+require_once($path."../../htdocs/master.inc.php");
+// After this $db is a defined handler to database.
+
+// Main
+$version='1.8';
+@set_time_limit(0);
+$error=0;
+
+$langs->load("main");
+
+
+print "***** $script_file ($version) *****\n";
+
+
+// -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
+
+// Check parameters
+if (! isset($argv[1]) && ! isset($argv[2]))
+{
+    print "Usage: $script_file phpClassFile phpClassName\n";
+    exit;
+}
+
+// Show parameters
+print 'Classfile='.$argv[1]."\n";
+print 'Classname='.$argv[2]."\n";
+
+$classfile=$argv[1];
+$classname=$argv[2];
+$classmin=strtolower($classname);
+$property=array();
+$targetcontent='';
+
+// Load the class and read properties
+require_once($classfile);
+
+$property=array();
+$class = new $classname($db);
+$values=get_class_vars($classname);
+
+unset($values['db']);
+unset($values['error']);
+unset($values['errors']);
+unset($values['element']);
+unset($values['table_element']);
+unset($values['table_element_line']);
+unset($values['fk_element']);
+unset($values['ismultientitymanaged']);
+
+$properties=array_keys($values);
+
+// Read skeleton_class.class.php file
+$skeletonfile='skeleton_webservice_server.php';
+$sourcecontent=file_get_contents($skeletonfile);
+if (! $sourcecontent)
+{
+	print "\n";
+	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
+	print "Try to run script from skeletons directory.\n";
+	exit;
+}
+
+// Define output variables
+$outfile='out.server_'.$classmin.'.php';
+$targetcontent=$sourcecontent;
+
+
+
+// Substitute class name
+$targetcontent=preg_replace('/Skeleton/', $classname, $targetcontent);
+$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
+
+// Substitute declaration parameters
+$varprop="\n";
+$cleanparam='';
+$i=0;
+
+while($i<count($properties))
+{
+		$varprop.="'".$properties[$i]."' => array('name'=>'".$properties[$i]."','type'=>'xsd:string')";
+		$i++;
+
+		if ($i == count($properties))
+			$varprop.="\n";
+		else
+			$varprop.=",\n";
+}
+
+$targetcontent=preg_replace('/\'prop1\'=>\'xxx\',/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\'prop2\'=>\'xxx\',/', '', $targetcontent);
+// Substitute get method parameters
+$varprop="\n";
+$cleanparam='';
+$i=0;
+
+while($i<count($properties))
+{
+		$varprop.="'".$properties[$i]."' => $".$classmin."->".$properties[$i];
+
+		$i++;
+		if ($i == count($properties))
+			$varprop.="\n";
+		else
+			$varprop.=",\n";
+}
+
+$targetcontent=preg_replace('/\'prop1\'=>\$'.$classmin.'->prop1,/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\'prop2\'=>\$'.$classmin.'->prop2,/', '', $targetcontent);
+
+// Substitute get method parameters
+$varprop="\n\t\t";
+$cleanparam='';
+$i=0;
+
+while($i<count($properties))
+{
+
+	$varprop.='$newobject->'.$properties[$i].'=$'.$classmin.'->'.$properties[$i].';';
+
+	$i++;
+	if ($i == count($properties))
+		$varprop.="\n";
+	else
+		$varprop.="\n\t\t";
+}
+$targetcontent=preg_replace('/\$newobject->prop1=\$'.$classmin.'->prop1;/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\$newobject->prop2=\$'.$classmin.'->prop2;/', '', $targetcontent);
+
+
+
+// Build file
+$fp=fopen($outfile,"w");
+if ($fp)
+{
+	fputs($fp, $targetcontent);
+	fclose($fp);
+	print "File '".$outfile."' has been built in current directory.\n";
+}
+else $error++;
+
+// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
+
+print "You must rename files by removing the 'out.' prefix in their name.\n";
+return $error;
diff --git a/htdocs/modulebuilder/skeletons/modMyModule.class.php b/htdocs/modulebuilder/skeletons/modMyModule.class.php
new file mode 100644
index 00000000000..4f994c7c654
--- /dev/null
+++ b/htdocs/modulebuilder/skeletons/modMyModule.class.php
@@ -0,0 +1,291 @@
+<?php
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	\defgroup   mymodule     Module MyModule
+ *  \brief      Example of a module descriptor.
+ *				Such a file must be copied into htdocs/mymodule/core/modules directory.
+ *  \file       htdocs/mymodule/core/modules/modMyModule.class.php
+ *  \ingroup    mymodule
+ *  \brief      Description and activation file for module MyModule
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ *  Description and activation class for module MyModule
+ */
+class modMyModule extends DolibarrModules
+{
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+        global $langs,$conf;
+
+        $this->db = $db;
+
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 500000;		// TODO Go on page http://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'mymodule';
+
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','interface','other'
+		// It is used to group modules by family in module setup page
+		$this->family = "other";
+		// Module position in the family
+		$this->module_position = 500;
+		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		//$this->familyinfo = array('myownfamily' => array('position' => '001', 'label' => $langs->trans("MyOwnFamily")));
+
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i','',get_class($this));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Description of module MyModule";
+		$this->descriptionlong = "A very long description. Can be a full HTML content";
+		$this->editor_name = 'Editor name';
+		$this->editor_url = 'https://www.dolibarr.org';
+		
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = '1.0';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto='generic';
+
+		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+		// for default path (eg: /mymodule/core/xxxxx) (0=disable, 1=enable)
+		// for specific path of parts (eg: /mymodule/core/modules/barcode)
+		// for specific css file (eg: /mymodule/css/mymodule.css.php)
+		//$this->module_parts = array(
+		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
+		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
+		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
+		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
+		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
+		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
+		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
+		//							'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
+	 	//							'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
+		//							'hooks' => array('hookcontext1','hookcontext2',...) // Set here all hooks context managed by module. You can also set hook context 'all'
+		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
+		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@mymodule')) // Set here all workflow context managed by module
+		//                        );
+		$this->module_parts = array();
+
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/mymodule/temp");
+		$this->dirs = array();
+
+		// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
+		$this->config_page_url = array("mysetuppage.php@mymodule");
+
+		// Dependencies
+		$this->hidden = false;			// A condition to hide module
+		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array();	// List of module ids to disable if this one is disabled
+		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
+		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+		$this->langfiles = array("mylangfile@mymodule");
+
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+		// );
+		$this->const = array();
+
+		// Array to add new pages in new tabs
+		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
+        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		// where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
+        $this->tabs = array();
+
+		if (! isset($conf->mymodule) || ! isset($conf->mymodule->enabled))
+        {
+        	$conf->mymodule=new stdClass();
+        	$conf->mymodule->enabled=0;
+        }
+        
+        // Dictionaries
+		$this->dictionaries=array();
+        /* Example:
+        $this->dictionaries=array(
+            'langs'=>'mylangfile@mymodule',
+            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
+            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
+            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
+            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
+            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
+            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
+            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
+            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
+            'tabcond'=>array($conf->mymodule->enabled,$conf->mymodule->enabled,$conf->mymodule->enabled)												// Condition to show each dictionary
+        );
+        */
+
+        // Boxes
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+        $this->boxes = array();			// List of boxes
+		// Example:
+		//$this->boxes=array(
+		//    0=>array('file'=>'myboxa.php@mymodule','note'=>'','enabledbydefaulton'=>'Home'),
+		//    1=>array('file'=>'myboxb.php@mymodule','note'=>''),
+		//    2=>array('file'=>'myboxc.php@mymodule','note'=>'')
+		//);
+
+		// Cronjobs
+		$this->cronjobs = array();			// List of cron jobs entries to add
+		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true),
+		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true)
+		// );
+
+		// Permissions
+		$this->rights = array();		// Permission array used by this module
+		$r=0;
+
+		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
+		// Example:
+		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		// $this->rights[$r][1] = 'Permision label';	// Permission label
+		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $r++;
+
+		// Main menu entries
+		$this->menu = array();			// List of menus to add
+		$r=0;
+
+		// Add here entries to declare new menus
+		//
+		// Example to declare a new Top Menu entry and its Left menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		//							'type'=>'top',			                // This is a Top menu entry
+		//							'titre'=>'MyModule top menu',
+		//							'mainmenu'=>'mymodule',
+		//							'leftmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagetop.php',
+		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'enabled'=>'$conf->mymodule->enabled',	// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
+		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
+		//
+		// Example to declare a Left Menu entry into an existing Top menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		//							'type'=>'left',			                // This is a Left menu entry
+		//							'titre'=>'MyModule left menu',
+		//							'mainmenu'=>'xxx',
+		//							'leftmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagelevel2.php',
+		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'enabled'=>'$conf->mymodule->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
+
+
+		// Exports
+		$r=1;
+
+		// Example:
+		// $this->export_code[$r]=$this->rights_class.'_'.$r;
+		// $this->export_label[$r]='MyModule';	// Translation key (used only if key ExportDataset_xxx_z not found)
+        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
+        // $this->export_icon[$r]='generic:MyModule';					// Put here code of icon then string for translation key of module name
+		// $this->export_permission[$r]=array(array("mymodule","level1","level2"));
+		// $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef');
+		// $this->export_TypeFields_array[$r]=array('t.date'=>'Date', 't.qte'=>'Numeric', 't.poids'=>'Numeric', 't.fad'=>'Numeric', 't.paq'=>'Numeric', 't.stockage'=>'Numeric', 't.fadparliv'=>'Numeric', 't.livau100'=>'Numeric', 't.forfait'=>'Numeric', 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text');
+		// $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product');
+		// $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		// $this->export_sql_start[$r]='SELECT DISTINCT ';
+		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
+		// $r++;
+	}
+
+	/**
+	 *		Function called when module is enabled.
+	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *		It also creates data directories
+	 *
+     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options='')
+	{
+		$sql = array();
+
+		//$this->_load_tables('/mymodule/sql/');
+
+		return $this->_init($sql, $options);
+	}
+
+	/**
+	 * Function called when module is disabled.
+	 * Remove from database constants, boxes and permissions from Dolibarr database.
+	 * Data directories are not deleted
+	 *
+	 * @param      string	$options    Options when enabling module ('', 'noboxes')
+	 * @return     int             	1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
+
+		return $this->_remove($sql, $options);
+	}
+
+}
+
diff --git a/htdocs/modulebuilder/skeletons/skeleton_api_class.class.php b/htdocs/modulebuilder/skeletons/skeleton_api_class.class.php
new file mode 100644
index 00000000000..a40b00af72c
--- /dev/null
+++ b/htdocs/modulebuilder/skeletons/skeleton_api_class.class.php
@@ -0,0 +1,289 @@
+<?php
+/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+ use Luracast\Restler\RestException;
+
+
+/**
+ * API class for skeleton object
+ *
+ * @smart-auto-routing false
+ * @access protected 
+ * @class  DolibarrApiAccess {@requires user,external}
+ * 
+ *
+ */
+class SkeletonApi extends DolibarrApi
+{
+    /**
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
+     */
+    static $FIELDS = array(
+        'name'
+    );
+
+    /**
+     * @var Skeleton $skeleton {@type Skeleton}
+     */
+    public $skeleton;
+
+    /**
+     * Constructor
+     *
+     * @url     GET skeleton/
+     * 
+     */
+    function __construct()
+    {
+		global $db, $conf;
+		$this->db = $db;
+        $this->skeleton = new Skeleton($this->db);
+    }
+
+    /**
+     * Get properties of a skeleton object
+     *
+     * Return an array with skeleton informations
+     *
+     * @param 	int 	$id ID of skeleton
+     * @return 	array|mixed data without useless information
+	 * 
+     * @url	GET skeleton/{id}
+     * @throws 	RestException
+     */
+    function get($id)
+    {		
+		if(! DolibarrApiAccess::$user->rights->skeleton->read) {
+			throw new RestException(401);
+		}
+			
+        $result = $this->skeleton->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Skeleton not found');
+        }
+		
+		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		return $this->_cleanObjectDatas($this->skeleton);
+    }
+
+    /**
+     * List skeletons
+     * 
+     * Get a list of skeletons
+     * 
+     * @param int		$mode		Use this param to filter list
+     * @param string	$sortfield	Sort field
+     * @param string	$sortorder	Sort order
+     * @param int		$limit		Limit for list
+     * @param int		$page		Page number
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') or (t.import_key:=:'20160101')"
+     * @return array Array of skeleton objects
+     *
+     * @url	GET /skeletons/
+     */
+    function index($mode, $sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '') {
+        global $db, $conf;
+        
+        $obj_ret = array();
+        
+        $socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
+            
+        // If the internal user must only see his customers, force searching by him
+        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+
+        $sql = "SELECT s.rowid";
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+        $sql.= " FROM ".MAIN_DB_PREFIX."skeleton as s";
+        
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
+        $sql.= " WHERE s.fk_stcomm = st.id";
+        
+		// Example of use $mode
+        //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
+        //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
+
+        $sql.= ' AND s.entity IN ('.getEntity('skeleton', 1).')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
+        if ($socid) $sql.= " AND s.fk_soc = ".$socid;
+        if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        // Insert sale filter
+        if ($search_sale > 0)
+        {
+            $sql .= " AND sc.fk_user = ".$search_sale;
+        }
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+        $sql.= $db->order($sortfield, $sortorder);
+        if ($limit)	{
+            if ($page < 0)
+            {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql.= $db->plimit($limit + 1, $offset);
+        }
+
+        $result = $db->query($sql);
+        if ($result)
+        {
+            $num = $db->num_rows($result);
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($result);
+                $skeleton_static = new Skeleton($db);
+                if($skeleton_static->fetch($obj->rowid)) {
+                    $obj_ret[] = parent::_cleanObjectDatas($skeleton_static);
+                }
+                $i++;
+            }
+        }
+        else {
+            throw new RestException(503, 'Error when retrieve skeleton list');
+        }
+        if( ! count($obj_ret)) {
+            throw new RestException(404, 'No skeleton found');
+        }
+		return $obj_ret;
+    }
+    
+    /**
+     * Create skeleton object
+     *
+     * @param array $request_data   Request datas
+     * @return int  ID of skeleton
+     * 
+     * @url	POST skeleton/
+     */
+    function post($request_data = NULL)
+    {
+        if(! DolibarrApiAccess::$user->rights->skeleton->create) {
+			throw new RestException(401);
+		}
+        // Check mandatory fields
+        $result = $this->_validate($request_data);
+        
+        foreach($request_data as $field => $value) {
+            $this->skeleton->$field = $value;
+        }
+        if( ! $this->skeleton->create(DolibarrApiAccess::$user)) {
+            throw new RestException(500);
+        }
+        return $this->skeleton->id;
+    }
+
+    /**
+     * Update skeleton
+     *
+     * @param int   $id             Id of skeleton to update
+     * @param array $request_data   Datas   
+     * @return int 
+     * 
+     * @url	PUT skeleton/{id}
+     */
+    function put($id, $request_data = NULL)
+    {
+        if(! DolibarrApiAccess::$user->rights->skeleton->create) {
+			throw new RestException(401);
+		}
+        
+        $result = $this->skeleton->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Skeleton not found');
+        }
+		
+		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+        foreach($request_data as $field => $value) {
+            $this->skeleton->$field = $value;
+        }
+        
+        if($this->skeleton->update($id, DolibarrApiAccess::$user))
+            return $this->get ($id);
+        
+        return false;
+    }
+    
+    /**
+     * Delete skeleton
+     *
+     * @param   int     $id   Skeleton ID
+     * @return  array
+     * 
+     * @url	DELETE skeleton/{id}
+     */
+    function delete($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->skeleton->supprimer) {
+			throw new RestException(401);
+		}
+        $result = $this->skeleton->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Skeleton not found');
+        }
+		
+		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+        
+        if( !$this->skeleton->delete($id))
+        {
+            throw new RestException(500);
+        }
+        
+         return array(
+            'success' => array(
+                'code' => 200,
+                'message' => 'Skeleton deleted'
+            )
+        );
+        
+    }
+    
+    /**
+     * Validate fields before create or update object
+     * 
+     * @param array $data   Data to validate
+     * @return array
+     * 
+     * @throws RestException
+     */
+    function _validate($data)
+    {
+        $skeleton = array();
+        foreach (SkeletonApi::$FIELDS as $field) {
+            if (!isset($data[$field]))
+                throw new RestException(400, "$field field missing");
+            $skeleton[$field] = $data[$field];
+        }
+        return $skeleton;
+    }
+}
diff --git a/htdocs/modulebuilder/skeletons/skeleton_card.php b/htdocs/modulebuilder/skeletons/skeleton_card.php
new file mode 100644
index 00000000000..f0a9dd23c26
--- /dev/null
+++ b/htdocs/modulebuilder/skeletons/skeleton_card.php
@@ -0,0 +1,351 @@
+<?php
+/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       dev/skeletons/skeleton_card.php
+ *		\ingroup    mymodule othermodule1 othermodule2
+ *		\brief      This file is an example of a php page
+ *					Put here some comments
+ */
+
+//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
+//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
+//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
+//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
+
+// Change this following line to use the correct relative path (../, ../../, etc)
+$res=0;
+if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
+if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
+if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
+if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
+if (! $res) die("Include of main fails");
+// Change this following line to use the correct relative path from htdocs
+include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
+dol_include_once('/mymodule/class/skeleton_class.class.php');
+
+// Load traductions files requiredby by page
+$langs->load("mymodule");
+$langs->load("other");
+
+// Get parameters
+$id			= GETPOST('id','int');
+$action		= GETPOST('action','alpha');
+$cancel     = GETPOST('cancel');
+$backtopage = GETPOST('backtopage');
+$myparam	= GETPOST('myparam','alpha');
+
+$search_field1=GETPOST("search_field1");
+$search_field2=GETPOST("search_field2");
+
+if (empty($action) && empty($id) && empty($ref)) $action='view';
+
+// Protection if external user
+if ($user->societe_id > 0)
+{
+	//accessforbidden();
+}
+//$result = restrictedArea($user, 'mymodule', $id);
+
+
+$object = new Skeleton_Class($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+// Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('skeleton'));
+
+
+
+/*******************************************************************
+* ACTIONS
+*
+* Put here all code to do according to value of "action" parameter
+********************************************************************/
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	if ($cancel) 
+	{
+		if ($action != 'addlink')
+		{
+			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+			header("Location: ".$urltogo);
+			exit;
+		}		
+		if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
+		$action='';
+	}
+	
+	// Action to add record
+	if ($action == 'add')
+	{
+		if (GETPOST('cancel'))
+		{
+			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+			header("Location: ".$urltogo);
+			exit;
+		}
+
+		$error=0;
+
+		/* object_prop_getpost_prop */
+		$object->prop1=GETPOST("field1");
+		$object->prop2=GETPOST("field2");
+
+		if (empty($object->ref))
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
+		}
+
+		if (! $error)
+		{
+			$result=$object->create($user);
+			if ($result > 0)
+			{
+				// Creation OK
+				$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+				header("Location: ".$urltogo);
+				exit;
+			}
+			{
+				// Creation KO
+				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+				else  setEventMessages($object->error, null, 'errors');
+				$action='create';
+			}
+		}
+		else
+		{
+			$action='create';
+		}
+	}
+
+	// Action to update record
+	if ($action == 'update')
+	{
+		$error=0;
+
+		$object->prop1=GETPOST("field1");
+		$object->prop2=GETPOST("field2");
+
+		if (empty($object->ref))
+		{
+			$error++;
+			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
+		}
+
+		if (! $error)
+		{
+			$result=$object->update($user);
+			if ($result > 0)
+			{
+				$action='view';
+			}
+			else
+			{
+				// Creation KO
+				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+				else setEventMessages($object->error, null, 'errors');
+				$action='edit';
+			}
+		}
+		else
+		{
+			$action='edit';
+		}
+	}
+
+	// Action to delete
+	if ($action == 'confirm_delete')
+	{
+		$result=$object->delete($user);
+		if ($result > 0)
+		{
+			// Delete OK
+			setEventMessages("RecordDeleted", null, 'mesgs');
+			header("Location: ".dol_buildpath('/mymodule/list.php',1));
+			exit;
+		}
+		else
+		{
+			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+			else setEventMessages($object->error, null, 'errors');
+		}
+	}
+}
+
+
+
+
+/***************************************************
+* VIEW
+*
+* Put here all code to build page
+****************************************************/
+
+llxHeader('','MyPageName','');
+
+$form=new Form($db);
+
+
+// Put here content of your page
+
+// Example : Adding jquery code
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	function init_myfunc()
+	{
+		jQuery("#myid").removeAttr(\'disabled\');
+		jQuery("#myid").attr(\'disabled\',\'disabled\');
+	}
+	init_myfunc();
+	jQuery("#mybutton").click(function() {
+		init_myfunc();
+	});
+});
+</script>';
+
+
+// Part to create
+if ($action == 'create')
+{
+	print load_fiche_titre($langs->trans("NewMyModule"));
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+
+	dol_fiche_head();
+
+	print '<table class="border centpercent">'."\n";
+	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
+	// LIST_OF_TD_LABEL_FIELDS_CREATE
+	print '</table>'."\n";
+
+	dol_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+
+	print '</form>';
+}
+
+
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit')
+{
+	print load_fiche_titre($langs->trans("MyModule"));
+    
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
+	
+	dol_fiche_head();
+
+	print '<table class="border centpercent">'."\n";
+	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
+	// LIST_OF_TD_LABEL_FIELDS_EDIT
+	print '</table>';
+	
+	dol_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+
+	print '</form>';
+}
+
+
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
+{
+    $res = $object->fetch_optionals($object->id, $extralabels);
+
+	$head = commande_prepare_head($object);
+	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), 0, 'order');
+		
+	print load_fiche_titre($langs->trans("MyModule"));
+    
+	dol_fiche_head();
+
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
+		print $formconfirm;
+	}
+	
+	print '<table class="border centpercent">'."\n";
+	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
+	// LIST_OF_TD_LABEL_FIELDS_VIEW
+	print '</table>';
+	
+	dol_fiche_end();
+
+
+	// Buttons
+	print '<div class="tabsAction">'."\n";
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+	if (empty($reshook))
+	{
+		if ($user->rights->mymodule->write)
+		{
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+		}
+
+		if ($user->rights->mymodule->delete)
+		{
+			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+		}
+	}
+	print '</div>'."\n";
+
+
+	// Example 2 : Adding links to objects
+	// Show links to link elements
+	//$linktoelem = $form->showLinkToObjectBlock($object, null, array('skeleton'));
+	//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+}
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/modulebuilder/skeletons/skeleton_class.class.php b/htdocs/modulebuilder/skeletons/skeleton_class.class.php
new file mode 100644
index 00000000000..01b48c35f75
--- /dev/null
+++ b/htdocs/modulebuilder/skeletons/skeleton_class.class.php
@@ -0,0 +1,593 @@
+<?php
+/* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    dev/skeletons/skeleton_class.class.php
+ * \ingroup mymodule othermodule1 othermodule2
+ * \brief   This file is an example for a CRUD class file (Create/Read/Update/Delete)
+ *          Put some comments here
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class Skeleton_Class
+ *
+ * Put here description of your class
+ *
+ * @see CommonObject
+ */
+class Skeleton_Class extends CommonObject
+{
+	/**
+	 * @var string Id to identify managed objects
+	 */
+	public $element = 'skeleton';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'skeleton';
+
+	/**
+	 * @var Skeleton_ClassLine[] Lines
+	 */
+	public $lines = array();
+
+	/**
+	 * @var mixed Sample property 1
+	 */
+	public $prop1;
+	/**
+	 * @var mixed Sample property 2
+	 */
+	public $prop2;
+	//...
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+
+		// Clean parameters
+		if (isset($this->prop1)) {
+			$this->prop1 = trim($this->prop1);
+		}
+		if (isset($this->prop2)) {
+			$this->prop2 = trim($this->prop2);
+		}
+		//...
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Insert request
+		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		$sql .= ' field1,';
+		$sql .= ' field2';
+		//...
+		$sql .= ') VALUES (';
+		$sql .= ' \'' . $this->prop1 . '\',';
+		$sql .= ' \'' . $this->prop2 . '\'';
+		//...
+		$sql .= ')';
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+
+			if (!$notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action to call a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) $error++;
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id  Id object
+	 * @param string $ref Ref
+	 *
+	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		$sql .= ' t.field1,';
+		$sql .= ' t.field2';
+		//...
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		$sql.= ' WHERE 1 = 1';
+		if (! empty($conf->multicompany->enabled)) {
+		    $sql .= " AND entity IN (" . getEntity("skeleton", 1) . ")";
+		}
+		if (null !== $ref) {
+			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
+		} else {
+			$sql .= ' AND t.rowid = ' . $id;
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$numrows = $this->db->num_rows($resql);
+			if ($numrows) {
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				$this->prop1 = $obj->field1;
+				$this->prop2 = $obj->field2;
+				//...
+			}
+			
+			// Retrieve all extrafields for invoice
+			// fetch optionals attributes and labels
+			/*
+			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+			$extrafields=new ExtraFields($this->db);
+			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+			$this->fetch_optionals($this->id,$extralabels);
+            */
+			
+			// $this->fetch_lines();
+			
+			$this->db->free($resql);
+
+			if ($numrows) {
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param string $sortorder Sort Order
+	 * @param string $sortfield Sort field
+	 * @param int    $limit     offset limit
+	 * @param int    $offset    offset limit
+	 * @param array  $filter    filter array
+	 * @param string $filtermode filter mode (AND or OR)
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		$sql .= ' t.field1,';
+		$sql .= ' t.field2';
+		//...
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+			}
+		}
+		$sql.= ' WHERE 1 = 1';
+		if (! empty($conf->multicompany->enabled)) {
+		    $sql .= " AND entity IN (" . getEntity("skeleton", 1) . ")";
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
+		}
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield,$sortorder);
+		}
+		if (!empty($limit)) {
+		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+
+			while ($obj = $this->db->fetch_object($resql)) {
+				$line = new self($this->db);
+
+				$line->id = $obj->rowid;
+				$line->prop1 = $obj->field1;
+				$line->prop2 = $obj->field2;
+				//...
+			}
+			$this->db->free($resql);
+
+			return $num;
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		// Clean parameters
+		if (isset($this->prop1)) {
+			$this->prop1 = trim($this->prop1);
+		}
+		if (isset($this->prop2)) {
+			$this->prop2 = trim($this->prop2);
+		}
+		//...
+
+		// Check parameters
+		// Put here code to add a control on parameters values
+
+		// Update request
+		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		$sql .= " field1=".(isset($this->field1)?"'".$this->db->escape($this->field1)."'":"null").",";
+        $sql .= " field2=".(isset($this->field2)?"'".$this->db->escape($this->field2)."'":"null")."";
+		//...
+		$sql .= ' WHERE rowid=' . $this->id;
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error && !$notrigger) {
+			// Uncomment this and change MYOBJECT to your own tag if you
+			// want this action calls a trigger.
+
+			//// Call triggers
+			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+			//// End call triggers
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user      User that deletes
+	 * @param bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+
+		$this->db->begin();
+
+		if (!$error) {
+			if (!$notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
+
+		// If you need to delete child tables to, you can insert them here
+		
+		if (!$error) {
+			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+			$sql .= ' WHERE rowid=' . $this->id;
+
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Load an object from its id and create a new one in database
+	 *
+	 * @param int $fromid Id of object to clone
+	 *
+	 * @return int New id of clone
+	 */
+	public function createFromClone($fromid)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		global $user;
+		$error = 0;
+		$object = new Skeleton_Class($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$object->fetch($fromid);
+		// Reset object
+		$object->id = 0;
+
+		// Clear fields
+		// ...
+
+		// Create clone
+		$result = $object->create($user);
+
+		// Other options
+		if ($result < 0) {
+			$error ++;
+			$this->errors = $object->errors;
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+
+			return $object->id;
+		} else {
+			$this->db->rollback();
+
+			return - 1;
+		}
+	}
+
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *	@param	string	$option				On what the link point to
+     *  @param	int  	$notooltip			1=Disable tooltip
+     *  @param	int		$maxlen				Max length of visible user name
+     *  @param  string  $morecss            Add more css on link
+	 *	@return	string						String with URL
+	 */
+	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
+	{
+		global $db, $conf, $langs;
+        global $dolibarr_main_authentication, $dolibarr_main_demo;
+        global $menumanager;
+
+        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        
+        $result = '';
+        $companylink = '';
+
+        $label = '<u>' . $langs->trans("MyModule") . '</u>';
+        $label.= '<br>';
+        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+
+        $url = DOL_URL_ROOT.'/mymodule/'.$this->table_name.'_card.php?id='.$this->id;
+        
+        $linkclose='';
+        if (empty($notooltip))
+        {
+            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            {
+                $label=$langs->trans("ShowProject");
+                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+            }
+            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+        }
+        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+        
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
+		$linkend='</a>';
+
+        if ($withpicto)
+        {
+            $result.=($linkstart.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
+            if ($withpicto != 2) $result.=' ';
+		}
+		$result.= $linkstart . $this->ref . $linkend;
+		return $result;
+	}
+
+	/**
+	 *  Retourne le libelle du status d'un user (actif, inactif)
+	 *
+	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return	string 			       Label of status
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->status,$mode);
+	}
+
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        	Id status
+	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
+	 *  @return string 			       	Label of status
+	 */
+	static function LibStatut($status,$mode=0)
+	{
+		global $langs;
+
+		if ($mode == 0)
+		{
+			$prefix='';
+			if ($status == 1) return $langs->trans('Enabled');
+			if ($status == 0) return $langs->trans('Disabled');
+		}
+		if ($mode == 1)
+		{
+			if ($status == 1) return $langs->trans('Enabled');
+			if ($status == 0) return $langs->trans('Disabled');
+		}
+		if ($mode == 2)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+		}
+		if ($mode == 3)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+		}
+		if ($mode == 4)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+		}
+		if ($mode == 5)
+		{
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+		}
+		if ($mode == 6)
+		{
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+		}
+	}
+
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		$this->prop1 = 'prop1';
+		$this->prop2 = 'prop2';
+	}
+
+}
+
+/**
+ * Class Skeleton_ClassLine
+ */
+class Skeleton_ClassLine
+{
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	/**
+	 * @var mixed Sample line property 1
+	 */
+	public $prop1;
+	/**
+	 * @var mixed Sample line property 2
+	 */
+	public $prop2;
+}
diff --git a/htdocs/modulebuilder/skeletons/skeleton_list.php b/htdocs/modulebuilder/skeletons/skeleton_list.php
new file mode 100644
index 00000000000..77485c6d638
--- /dev/null
+++ b/htdocs/modulebuilder/skeletons/skeleton_list.php
@@ -0,0 +1,569 @@
+<?php
+/* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2016 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2016      Jean-François Ferry	<jfefe@aternatik.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       dev/skeletons/skeleton_list.php
+ *		\ingroup    mymodule othermodule1 othermodule2
+ *		\brief      This file is an example of a php page
+ *					Put here some comments
+ */
+
+//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
+//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
+//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
+//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
+
+// Change this following line to use the correct relative path (../, ../../, etc)
+$res=0;
+if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
+if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
+if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
+if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
+if (! $res) die("Include of main fails");
+// Change this following line to use the correct relative path from htdocs
+require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+dol_include_once('/mymodule/class/skeleton_class.class.php');
+
+// Load traductions files requiredby by page
+$langs->load("mymodule");
+$langs->load("other");
+
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
+
+$id			= GETPOST('id','int');
+$backtopage = GETPOST('backtopage');
+$myparam	= GETPOST('myparam','alpha');
+
+$search_all=trim(GETPOST("sall"));
+$search_field1=GETPOST("search_field1");
+$search_field2=GETPOST("search_field2");
+$search_myfield=GETPOST('search_myfield');
+$optioncss = GETPOST('optioncss','alpha');
+
+// Load variable for pagination
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="t.rowid"; // Set here default search field
+if (! $sortorder) $sortorder="ASC";
+
+// Protection if external user
+$socid=0;
+if ($user->societe_id > 0)
+{
+    $socid = $user->societe_id;
+	//accessforbidden();
+}
+
+// Initialize technical object to manage context to save list fields
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'mymodulelist';
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('mymodulelist'));
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('mymodule');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+    't.ref'=>'Ref',
+    't.note_public'=>'NotePublic',
+);
+if (empty($user->socid)) $fieldstosearchall["t.note_private"]="NotePrivate";
+
+// Definition of fields for list
+$arrayfields=array(
+    't.field1'=>array('label'=>$langs->trans("Field1"), 'checked'=>1),
+    't.field2'=>array('label'=>$langs->trans("Field2"), 'checked'=>1),
+    //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+    't.datec'=>array('label'=>$langs->trans("DateCreationShort"), 'checked'=>0, 'position'=>500),
+    't.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+    //'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+    }
+}
+
+
+// Load object if id or ref is provided as parameter
+$object=new Skeleton_Class($db);
+if (($id > 0 || ! empty($ref)) && $action != 'add')
+{
+	$result=$object->fetch($id,$ref);
+	if ($result < 0) dol_print_error($db);
+}
+
+
+
+
+/*******************************************************************
+* ACTIONS
+*
+* Put here all code to do according to value of "action" parameter
+********************************************************************/
+
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Purge search criteria
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+    {
+    	$search_field1='';
+    	$search_field2='';
+    	$search_date_creation='';
+    	$search_date_update='';
+        $toselect='';
+        $search_array_options=array();
+    }
+
+    // Mass actions
+    $objectclass='Skeleton';
+    $objectlabel='Skeleton';
+    $permtoread = $user->rights->skeleton->read;
+    $permtodelete = $user->rights->skeleton->delete;
+    $uploaddir = $conf->skeleton->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/***************************************************
+* VIEW
+*
+* Put here all code to build page
+****************************************************/
+
+$now=dol_now();
+
+$form=new Form($db);
+
+//$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
+$help_url='';
+$title = $langs->trans('MyModuleListTitle');
+
+// Put here content of your page
+
+// Example : Adding jquery code
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	function init_myfunc()
+	{
+		jQuery("#myid").removeAttr(\'disabled\');
+		jQuery("#myid").attr(\'disabled\',\'disabled\');
+	}
+	init_myfunc();
+	jQuery("#mybutton").click(function() {
+		init_myfunc();
+	});
+});
+</script>';
+
+
+$sql = "SELECT";
+$sql.= " t.rowid,";
+$sql.= " t.field1,";
+$sql.= " t.field2";
+// Add fields from extrafields
+foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+$sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mytable_extrafields as ef on (t.rowid = ef.fk_object)";
+$sql.= " WHERE 1 = 1";
+//$sql.= " WHERE u.entity IN (".getEntity('mytable',1).")";
+if ($search_field1) $sql.= natural_search("field1",$search_field1);
+if ($search_field2) $sql.= natural_search("field2",$search_field2);
+if ($sall)          $sql.= natural_search(array_keys($fieldstosearchall), $sall);
+// Add where from extra fields
+foreach ($search_array_options as $key => $val)
+{
+    $crit=$val;
+    $tmpkey=preg_replace('/search_options_/','',$key);
+    $typ=$extrafields->attribute_type[$tmpkey];
+    $mode=0;
+    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+    {
+        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+    }
+}
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+$sql.=$db->order($sortfield,$sortorder);
+//$sql.= $db->plimit($conf->liste_limit+1, $offset);
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}	
+
+$sql.= $db->plimit($limit+1, $offset);
+
+dol_syslog($script_file, LOG_DEBUG);
+$resql=$db->query($sql);
+if (! $resql)
+{
+    dol_print_error($db);
+    exit;
+}
+
+$num = $db->num_rows($resql);
+
+// Direct jump if only one record found
+if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
+{
+    $obj = $db->fetch_object($resql);
+    $id = $obj->rowid;
+    header("Location: ".DOL_URL_ROOT.'/skeleton/card.php?id='.$id);
+    exit;
+}
+
+llxHeader('', $title, $help_url);
+
+$arrayofselected=is_array($toselect)?$toselect:array();
+
+$param='';
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+if ($search_field1 != '') $param.= '&amp;search_field1='.urlencode($search_field1);
+if ($search_field2 != '') $param.= '&amp;search_field2='.urlencode($search_field2);
+if ($optioncss != '') $param.='&optioncss='.$optioncss;
+// Add $param from extra fields
+foreach ($search_array_options as $key => $val)
+{
+    $crit=$val;
+    $tmpkey=preg_replace('/search_options_/','',$key);
+    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+} 
+
+$arrayofmassactions =  array(
+    'presend'=>$langs->trans("SendByMail"),
+    'builddoc'=>$langs->trans("PDFMerge"),
+);
+if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+if ($massaction == 'presend') $arrayofmassactions=array();
+$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
+
+if ($sall)
+{
+    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+    print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
+}
+
+$moreforfilter = '';
+$moreforfilter.='<div class="divsearchfield">';
+$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+$moreforfilter.= '</div>';
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+else $moreforfilter = $hookmanager->resPrint;
+
+if (! empty($moreforfilter))
+{
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+    print '</div>';
+}
+
+$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
+// Fields title
+print '<tr class="liste_titre">';
+// LIST_OF_TD_TITLE_FIELDS
+//if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($arrayfields['t.field1']['label'],$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
+//if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($arrayfields['t.field2']['label'],$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+   foreach($extrafields->attribute_label as $key => $val) 
+   {
+       if (! empty($arrayfields["ef.".$key]['checked'])) 
+       {
+			$align=$extrafields->getAlignFlag($key);
+			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+       }
+   }
+}
+// Hook fields
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print '</tr>'."\n";
+
+// Fields title search
+print '<tr class="liste_titre">';
+// LIST_OF_TD_TITLE_SEARCH
+//if (! empty($arrayfields['t.field1']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field1" value="'.$search_field1.'" size="10"></td>';
+//if (! empty($arrayfields['t.field2']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field2" value="'.$search_field2.'" size="10"></td>';
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val) 
+    {
+        if (! empty($arrayfields["ef.".$key]['checked']))
+        {
+            $align=$extrafields->getAlignFlag($key);
+            $typeofextrafield=$extrafields->attribute_type[$key];
+            print '<td class="liste_titre'.($align?' '.$align:'').'">';
+        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+			{
+			    $crit=$val;
+				$tmpkey=preg_replace('/search_options_/','',$key);
+				$searchclass='';
+				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+			}
+            print '</td>';
+        }
+    }
+}
+// Fields from hook
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['t.datec']['checked']))
+{
+    // Date creation
+    print '<td class="liste_titre">';
+    print '</td>';
+}
+if (! empty($arrayfields['t.tms']['checked']))
+{
+    // Date modification
+    print '<td class="liste_titre">';
+    print '</td>';
+}
+/*if (! empty($arrayfields['u.statut']['checked']))
+{
+    // Status
+    print '<td class="liste_titre" align="center">';
+    print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
+    print '</td>';
+}*/
+// Action column
+print '<td class="liste_titre" align="right">';
+$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+print $searchpitco;
+print '</td>';
+print '</tr>'."\n";
+    
+
+$i=0;
+$var=true;
+$totalarray=array();
+while ($i < min($num, $limit))
+{
+    $obj = $db->fetch_object($resql);
+    if ($obj)
+    {
+        $var = !$var;
+        
+        // Show here line of result
+        print '<tr '.$bc[$var].'>';
+        // LIST_OF_TD_FIELDS_LIST
+        /*
+        if (! empty($arrayfields['t.field1']['checked'])) 
+        {
+            print '<td>'.$obj->field1.'</td>';
+		    if (! $i) $totalarray['nbfield']++;
+        }
+        if (! empty($arrayfields['t.field2']['checked'])) 
+        {
+            print '<td>'.$obj->field2.'</td>';
+		    if (! $i) $totalarray['nbfield']++;
+        }*/
+    	// Extra fields
+		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+		{
+		   foreach($extrafields->attribute_label as $key => $val) 
+		   {
+				if (! empty($arrayfields["ef.".$key]['checked'])) 
+				{
+					print '<td';
+					$align=$extrafields->getAlignFlag($key);
+					if ($align) print ' align="'.$align.'"';
+					print '>';
+					$tmpkey='options_'.$key;
+					print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
+					print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
+				}
+		   }
+		}
+        // Fields from hook
+	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+    	// Date creation
+        if (! empty($arrayfields['t.datec']['checked']))
+        {
+            print '<td align="center">';
+            print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
+            print '</td>';
+		    if (! $i) $totalarray['nbfield']++;
+        }
+        // Date modification
+        if (! empty($arrayfields['t.tms']['checked']))
+        {
+            print '<td align="center">';
+            print dol_print_date($db->jdate($obj->date_update), 'dayhour');
+            print '</td>';
+		    if (! $i) $totalarray['nbfield']++;
+        }
+        // Status
+        /*
+        if (! empty($arrayfields['u.statut']['checked']))
+        {
+		  $userstatic->statut=$obj->statut;
+          print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
+        }*/
+
+        // Action column
+        print '<td class="nowrap" align="center">';
+	    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+        {
+	        $selected=0;
+			if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+        }
+	    print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+
+        print '</tr>';
+    }
+    $i++;
+}
+
+// Show total line
+if (isset($totalarray['totalhtfield']))
+{
+    print '<tr class="liste_total">';
+    $i=0;
+    while ($i < $totalarray['nbfield'])
+    {
+        $i++;
+        if ($i == 1)
+        {
+            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+        }
+        elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
+        elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
+        elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
+        else print '<td></td>';
+    }
+    print '</tr>';
+}
+
+$db->free($resql);
+
+$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
+
+
+if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
+{
+    // Show list of available documents
+    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+    $urlsource.=str_replace('&amp;','&',$param);
+
+    $filedir=$diroutputmassaction;
+    $genallowed=$user->rights->facture->lire;
+    $delallowed=$user->rights->facture->lire;
+
+    print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+}
+else
+{
+    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
+}
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/modulebuilder/skeletons/skeleton_script.php b/htdocs/modulebuilder/skeletons/skeleton_script.php
new file mode 100644
index 00000000000..5eb1565d4a3
--- /dev/null
+++ b/htdocs/modulebuilder/skeletons/skeleton_script.php
@@ -0,0 +1,166 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2007-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       dev/skeletons/skeleton_script.php
+ *		\ingroup    mymodule
+ *      \brief      This file is an example for a command line script
+ *					Put here some comments
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+	exit(-1);
+}
+
+// Global variables
+$version='1.0';
+$error=0;
+
+
+// -------------------- START OF YOUR CODE HERE --------------------
+@set_time_limit(0);							// No timeout for this script
+define('EVEN_IF_ONLY_LOGIN_ALLOWED',1);		// Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
+
+// Include and load Dolibarr environment variables
+require_once($path."../../htdocs/master.inc.php");
+// After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file).
+// $user is created but empty.
+
+//$langs->setDefaultLang('en_US'); 	// To change default language of $langs
+$langs->load("main");				// To load language file for default language
+
+// Load user and its permissions
+$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$user->getrights();
+
+
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+if (! isset($argv[1])) {	// Check parameters
+    print "Usage: ".$script_file." param1 param2 ...\n";
+	exit(-1);
+}
+print '--- start'."\n";
+print 'Argument 1='.$argv[1]."\n";
+print 'Argument 2='.$argv[2]."\n";
+
+
+// Start of transaction
+$db->begin();
+
+
+// Examples for manipulating class skeleton_class
+require_once(DOL_DOCUMENT_ROOT."/../dev/skeletons/skeleton_class.class.php");
+$myobject=new Skeleton_Class($db);
+
+// Example for inserting creating object in database
+/*
+dol_syslog($script_file." CREATE", LOG_DEBUG);
+$myobject->prop1='value_prop1';
+$myobject->prop2='value_prop2';
+$id=$myobject->create($user);
+if ($id < 0) { $error++; dol_print_error($db,$myobject->error); }
+else print "Object created with id=".$id."\n";
+*/
+
+// Example for reading object from database
+/*
+dol_syslog($script_file." FETCH", LOG_DEBUG);
+$result=$myobject->fetch($id);
+if ($result < 0) { $error; dol_print_error($db,$myobject->error); }
+else print "Object with id=".$id." loaded\n";
+*/
+
+// Example for updating object in database ($myobject must have been loaded by a fetch before)
+/*
+dol_syslog($script_file." UPDATE", LOG_DEBUG);
+$myobject->prop1='newvalue_prop1';
+$myobject->prop2='newvalue_prop2';
+$result=$myobject->update($user);
+if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
+else print "Object with id ".$myobject->id." updated\n";
+*/
+
+// Example for deleting object in database ($myobject must have been loaded by a fetch before)
+/*
+dol_syslog($script_file." DELETE", LOG_DEBUG);
+$result=$myobject->delete($user);
+if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
+else print "Object with id ".$myobject->id." deleted\n";
+*/
+
+
+// An example of a direct SQL read without using the fetch method
+/*
+$sql = "SELECT field1, field2";
+$sql.= " FROM ".MAIN_DB_PREFIX."skeleton";
+$sql.= " WHERE field3 = 'xxx'";
+$sql.= " ORDER BY field1 ASC";
+
+dol_syslog($script_file, LOG_DEBUG);
+$resql=$db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+	$i = 0;
+	if ($num)
+	{
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj)
+			{
+				// You can use here results
+				print $obj->field1;
+				print $obj->field2;
+			}
+			$i++;
+		}
+	}
+}
+else
+{
+	$error++;
+	dol_print_error($db);
+}
+*/
+
+
+// -------------------- END OF YOUR CODE --------------------
+
+if (! $error)
+{
+	$db->commit();
+	print '--- end ok'."\n";
+}
+else
+{
+	print '--- end error code='.$error."\n";
+	$db->rollback();
+}
+
+$db->close();	// Close $db database opened handler
+
+exit($error);
diff --git a/htdocs/modulebuilder/skeletons/skeleton_webservice_server.php b/htdocs/modulebuilder/skeletons/skeleton_webservice_server.php
new file mode 100644
index 00000000000..54a050ff9da
--- /dev/null
+++ b/htdocs/modulebuilder/skeletons/skeleton_webservice_server.php
@@ -0,0 +1,272 @@
+<?php
+/* Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/webservices/server_skeleton.php
+ *       \brief      File that is entry point to call Dolibarr WebServices
+ *       \version    $Id: server_skeleton.php,v 1.7 2010/12/19 11:49:37 eldy Exp $
+ */
+
+// This is to make Dolibarr working with Plesk
+set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
+
+require_once("../master.inc.php");
+require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/skeleton/class/skeleton.class.php");
+
+
+dol_syslog("Call Skeleton webservices interfaces");
+
+// Enable and test if module web services is enabled
+if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
+{
+    $langs->load("admin");
+    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+    print $langs->trans("ToActivateModule");
+    exit;
+}
+
+// Create the soap Object
+$server = new nusoap_server();
+$server->soap_defencoding='UTF-8';
+$server->decode_utf8=false;
+$ns='http://www.dolibarr.org/ns/';
+$server->configureWSDL('WebServicesDolibarrSkeleton',$ns);
+$server->wsdl->schemaTargetNamespace=$ns;
+
+
+// Define WSDL Authentication object
+$server->wsdl->addComplexType(
+    'authentication',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
+    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
+    	'login' => array('name'=>'login','type'=>'xsd:string'),
+    	'password' => array('name'=>'password','type'=>'xsd:string'),
+        'entity' => array('name'=>'entity','type'=>'xsd:string'),
+    )
+);
+
+// Define WSDL Return object
+$server->wsdl->addComplexType(
+    'result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
+        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+    )
+);
+
+// Define other specific objects
+$server->wsdl->addComplexType(
+    'skeleton',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+	    'prop1'=>'xxx',
+		'prop2'=>'xxx',
+    //...
+    )
+);
+
+
+
+// 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
+// Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
+// http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
+$styledoc='rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
+$styleuse='encoded';   // encoded/literal/literal wrapped
+// Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
+
+
+// Register WSDL
+$server->register(
+    'getSkeleton',
+    // Entry values
+    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+    // Exit values
+    array('result'=>'tns:result','skeleton'=>'tns:skeleton'),
+    $ns,
+    $ns.'#getSkeleton',
+    $styledoc,
+    $styleuse,
+    'WS to get skeleton'
+);
+
+// Register WSDL
+$server->register(
+	'createSkeleton',
+	// Entry values
+	array('authentication'=>'tns:authentication','skeleton'=>'tns:skeleton'),
+	// Exit values
+	array('result'=>'tns:result','id'=>'xsd:string'),
+	$ns,
+	$ns.'#createSkeleton',
+	$styledoc,
+	$styleuse,
+	'WS to create a skeleton'
+);
+
+
+
+
+/**
+ * Get Skeleton
+ *
+ * @param	array		$authentication		Array of authentication information
+ * @param	int			$id					Id of object
+ * @param	string		$ref				Ref of object
+ * @param	string		$ref_ext			Ref external of object
+ * @return	mixed
+ */
+function getSkeleton($authentication,$id,$ref='',$ref_ext='')
+{
+    global $db,$conf,$langs;
+
+    dol_syslog("Function: getSkeleton login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
+
+    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+    // Init and check authentication
+    $objectresp=array();
+    $errorcode='';$errorlabel='';
+    $error=0;
+    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    // Check parameters
+    if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
+    {
+        $error++;
+        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+    }
+
+    if (! $error)
+    {
+        $fuser->getrights();
+
+        if ($fuser->rights->skeleton->read)
+        {
+            $skeleton=new Skeleton($db);
+            $result=$skeleton->fetch($id,$ref,$ref_ext);
+            if ($result > 0)
+            {
+                // Create
+                $objectresp = array(
+			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
+			        'skeleton'=>array(
+				    'prop1'=>$skeleton->prop1,
+				    'prop2'=>$skeleton->prop2,
+                    //...
+                    )
+                );
+            }
+            else
+            {
+                $error++;
+                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+            }
+        }
+        else
+        {
+            $error++;
+            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+        }
+    }
+
+    if ($error)
+    {
+        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+    }
+
+    return $objectresp;
+}
+
+
+/**
+ * Create Skeleton
+ *
+ * @param	array		$authentication		Array of authentication information
+ * @param	Skeleton	$skeleton		    $skeleton
+ * @return	array							Array result
+ */
+function createSkeleton($authentication,$skeleton)
+{
+	global $db,$conf,$langs;
+
+	$now=dol_now();
+
+	dol_syslog("Function: createSkeleton login=".$authentication['login']);
+
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
+
+
+	if (! $error)
+	{
+		$newobject=new Skeleton($db);
+		$newobject->prop1=$skeleton->prop1;
+		$newobject->prop2=$skeleton->prop2;
+		//...
+
+		$db->begin();
+
+		$result=$newobject->create($fuser);
+		if ($result <= 0)
+		{
+			$error++;
+		}
+
+		if (! $error)
+		{
+			$db->commit();
+			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
+		}
+		else
+		{
+			$db->rollback();
+			$error++;
+			$errorcode='KO';
+			$errorlabel=$newobject->error;
+		}
+	}
+
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
+
+	return $objectresp;
+}
+
+// Return the results.
+$server->service(file_get_contents("php://input"));
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 49c17a749f0..f7cb1c0bb5a 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1642,6 +1642,10 @@ div.login_block_other { padding-top: 3px; text-align: right; }
 .alogin:hover, .atoplogin:hover {
 	text-decoration:underline !important;
 }
+span.fa.atoplogin, span.fa.atoplogin:hover {
+    font-size: 16px;
+    text-decoration: none !important;
+}
 img.login, img.printer, img.entity {
 	/* padding: 0px 0px 0px 4px; */
 	/* margin: 0px 0px 0px 8px; */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 1908fcfef4a..f83d5df0d50 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1675,6 +1675,10 @@ div.login_block_other { padding-top: 3px; }
 .alogin:hover, .atoplogin:hover {
 	text-decoration:underline !important;
 }
+span.fa.atoplogin, span.fa.atoplogin:hover {
+    font-size: 16px;
+    text-decoration: none !important;
+}
 img.login, img.printer, img.entity {
 	/* padding: 0px 0px 0px 4px; */
 	/* margin: 0px 0px 0px 8px; */
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 4b9c1c9960c..26af6c659ff 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2118,7 +2118,7 @@ class User extends CommonObject
 	}
 
 	/**
-	 *  Retourne le libelle du statut d'un user (actif, inactif)
+	 *  Return label of status of user (active, inactive)
 	 *
 	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return	string 			       Label of status

From 1489847a7412bd70bbcf530cfce9bcfa125e0986 Mon Sep 17 00:00:00 2001
From: dolibarr95 <onajid@1blow-services.com>
Date: Thu, 30 Mar 2017 09:49:34 +0200
Subject: [PATCH 0503/1163] Display mobile icon

Display a specific icon when mobile
---
 htdocs/core/class/commonobject.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index b79c72e6336..e6a5b5d6b92 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -495,7 +495,7 @@ abstract class CommonObject
 			$out.=dol_print_phone($this->phone_pro,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
 		}
 		if (! empty($this->phone_mobile)) {
-			$out.=dol_print_phone($this->phone_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhoneMobile")); $outdone++;
+			$out.=dol_print_phone($this->phone_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','mobile',$langs->trans("PhoneMobile")); $outdone++;
 		}
 		if (! empty($this->phone_perso)) {
 			$out.=dol_print_phone($this->phone_perso,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePerso")); $outdone++;
@@ -507,7 +507,7 @@ abstract class CommonObject
 			$out.=dol_print_phone($this->office_phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
 		}
 		if (! empty($this->user_mobile)) {
-			$out.=dol_print_phone($this->user_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhoneMobile")); $outdone++;
+			$out.=dol_print_phone($this->user_mobile,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','mobile',$langs->trans("PhoneMobile")); $outdone++;
 		}
 		if (! empty($this->office_fax)) {
 			$out.=dol_print_phone($this->fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;

From 78cc976e9f6d6f2d835ec8cf517e54ee120b9010 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 30 Mar 2017 10:40:15 +0200
Subject: [PATCH 0504/1163] Work on module builder

---
 htdocs/core/modules/modCron.class.php          |  2 +-
 htdocs/core/modules/modModuleBuilder.class.php | 14 ++++++++++++++
 htdocs/core/modules/modPrinting.class.php      |  2 +-
 htdocs/langs/en_US/admin.lang                  |  2 +-
 htdocs/langs/en_US/main.lang                   |  1 +
 htdocs/langs/en_US/modulebuilder.lang          |  1 -
 htdocs/main.inc.php                            |  2 +-
 7 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 88b154f891e..7f949501023 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -138,7 +138,7 @@ class modCron extends DolibarrModules
 						        'url'=>'/cron/list.php?status=-2&leftmenu=admintools',
 						        'langs'=>'cron',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 						        'position'=>200,
-						        'enabled'=>'($leftmenu==\'admintools\' || $leftmenu==\'admintools_info\')',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+						        'enabled'=>'$conf->cron->enabled && preg_match(\'/^admintools/\', $leftmenu)',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 						        'perms'=>'$user->rights->cron->read',			    // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
 						        'target'=>'',
 						        'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
diff --git a/htdocs/core/modules/modModuleBuilder.class.php b/htdocs/core/modules/modModuleBuilder.class.php
index b68148377c3..dce442720a3 100644
--- a/htdocs/core/modules/modModuleBuilder.class.php
+++ b/htdocs/core/modules/modModuleBuilder.class.php
@@ -85,5 +85,19 @@ class modModuleBuilder extends DolibarrModules
         // Main menu entries
         //------------------
         $this->menu = array();
+        
+        $this->menu[$r]=array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',
+            'type'=>'left',
+            'titre'=>'ModuleBuilder',
+            'mainmenu'=>'home',
+            'leftmenu'=>'admintools_modulebuilder',
+            'url'=>'/modulebuilder/index.php?mainmenu=home&amp;leftmenu=admintools_modulebuilder',
+            'langs'=>'modulebuilder',
+            'position'=>100,
+            'perms'=>'1',
+            'enabled'=>'$conf->modulebuilder->enabled && preg_match(\'/^admintools/\',$leftmenu) && ($user->admin || $conf->global->MODULEBUILDER_FOREVERYONE)',
+            'target'=>'_modulebuilder',
+            'user'=>0);
+        
     }
 }
diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php
index fd101615809..89bf6115dae 100644
--- a/htdocs/core/modules/modPrinting.class.php
+++ b/htdocs/core/modules/modPrinting.class.php
@@ -111,7 +111,7 @@ class modPrinting extends DolibarrModules
                                 'url'=>'/printing/index.php?mainmenu=home&leftmenu=admintools',
                                 'langs'=>'printing',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
                                 'position'=>300,
-                                'enabled'=>'$conf->printing->enabled && ($leftmenu==\'admintools\' || $leftmenu==\'admintools_info\')',
+                                'enabled'=>'$conf->printing->enabled && preg_match(\'/^admintools/\', $leftmenu)',
                                 'perms'=>'$user->rights->printing->read',    // Use 'perms'=>'1' if you want your menu with no permission rules
                                 'target'=>'',
                                 'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 3831fb49007..b3f43698843 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1664,7 +1664,7 @@ UserHasNoPermissions=This user has no permission defined
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
 BaseCurrency=Reference currency of the company (go into setup of company to change this)
 WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016). 
-WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module <strong>%s</strong> that is an external module. Activate an external module only if it does not alterate negatively the behavior required by your country laws (%s). If the module bring a non legal feature, you are the only responsible for the use of a non-compliant software.   
+WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the editor of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.   
 ##### Resource ####
 ResourceSetup=Configuration du module Resource 
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 53d727d9965..918f46a44b7 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -763,6 +763,7 @@ DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
+ModuleBuilder=Module Builder
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 6605a7b6a63..9979760bc4f 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilder=Module Builder
 ModuleBuilderDesc=This tools give you utilites to build your own module. Your modules will be generated into the first alternative directory: <strong>%s</strong>.
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index fe1ed01a68f..88e2760ecb4 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1440,7 +1440,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
     	// Link to module builder
 	    if (! empty($conf->modulebuilder->enabled))
 	    {
-	        $text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_blank">';
+	        $text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
 	        //$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
 	        $text.='<span class="fa fa-bug atoplogin"></span>';
 	        $text.='</a>';

From 6bd112db5e844ba957e188d1db78d2ef45950dbb Mon Sep 17 00:00:00 2001
From: dolibarr95 <onajid@1blow-services.com>
Date: Thu, 30 Mar 2017 14:49:40 +0200
Subject: [PATCH 0505/1163] Unify the trigger name

Should be COMPANY_RIB_MODIFY instead of COMPANY_RIB_UPDATE
---
 htdocs/societe/class/companybankaccount.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 6a00de29259..4101910005e 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -174,7 +174,7 @@ class CompanyBankAccount extends Account
 		if (! $notrigger)
 		{
 			// Call trigger
-			$result=$this->call_trigger('COMPANY_RIB_UPDATE',$user);
+			$result=$this->call_trigger('COMPANY_RIB_MODIFY',$user);
 			if ($result < 0) $error++;
 			// End call triggers
 			if(! $error )

From 8e70c4a0b738e42b42b845dae8af885aa95083b8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 30 Mar 2017 15:39:50 +0200
Subject: [PATCH 0506/1163] Work on 6.0 new look and feel

---
 htdocs/adherents/agenda.php                |  38 ++---
 htdocs/adherents/document.php              |   2 +-
 htdocs/adherents/note.php                  |   3 +-
 htdocs/contact/list.php                    |   9 +-
 htdocs/core/class/html.formother.class.php |   2 +-
 htdocs/core/lib/company.lib.php            | 123 ++++++++-------
 htdocs/core/lib/functions.lib.php          |  10 +-
 htdocs/core/modules/modAgenda.class.php    |   4 +-
 htdocs/expedition/list.php                 |  73 +++++----
 htdocs/imports/import.php                  |  53 ++++---
 htdocs/langs/en_US/exports.lang            |   2 +
 htdocs/product/popuprop.php                |   7 +-
 htdocs/product/reassort.php                | 171 +++++++++------------
 htdocs/product/reassortlot.php             |  68 ++++----
 htdocs/product/stock/list.php              |  22 +--
 htdocs/product/stock/productlot_list.php   | 129 ++++++++--------
 htdocs/product/stock/replenish.php         |  32 ++--
 htdocs/product/stock/replenishorders.php   | 135 ++++++++--------
 htdocs/theme/eldy/style.css.php            |   2 +-
 htdocs/theme/md/style.css.php              |   2 +-
 20 files changed, 429 insertions(+), 458 deletions(-)

diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index fc73892d44d..f85761ff266 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 $langs->load("companies");
 $langs->load("members");
 
-$id = GETPOST('id','int');
+$id = GETPOST('id','int')?GETPOST('id','int'):GETPOST('rowid','int');
 
 // Security check
 $result=restrictedArea($user,'adherent',$id);
@@ -85,12 +85,13 @@ if ($object->id > 0)
 	if (! empty($conf->notification->enabled)) $langs->load("mails");
 	$head = member_prepare_head($object);
 
-	dol_fiche_head($head, 'agenda', $langs->trans("Member"),0,'user');
+	dol_fiche_head($head, 'agenda', $langs->trans("Member"), -1, 'user');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
 	
 	dol_banner_tab($object, 'rowid', $linkback);
     
+	/*
     print '<div class="fichecenter">';
     
     print '<div class="underbanner clearboth"></div>';
@@ -107,9 +108,6 @@ if ($object->id > 0)
 
 	// Morphy
 	print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
-	/*print '<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">';
-	 print $form->showphoto('memberphoto',$member);
-	print '</td>';*/
 	print '</tr>';
 
 	// Company
@@ -120,15 +118,16 @@ if ($object->id > 0)
 	print '</tr>';
 
 	print '</table>';
-
+    */
 	
-	print '<br>';
+	print '<div class="fichecenter">';
+	
+	print '<div class="underbanner clearboth"></div>';
 	
 	$object->info($id);
 	print dol_print_object_info($object, 1);
 	
-	
-	print '</div>';
+	print '</div>';	
 
 	dol_fiche_end();
 	
@@ -146,30 +145,11 @@ if ($object->id > 0)
 
     print '</div>';
 
-    print '<br>';
-
     $out='';
 
-    /*$objthirdparty=$object->thirdparty;
-    $objcon=new stdClass();
-
-    $permok=$user->rights->agenda->myactions->create;
-    if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
-    {
-        $out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-        if (get_class($objthirdparty) == 'Societe') $out.='&amp;socid='.$objthirdparty->id;
-        $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1">';
-    	$out.=$langs->trans("AddAnAction").' ';
-    	$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    	$out.="</a>";
-	}*/
-
     print load_fiche_titre($langs->trans("ActionsOnMember"),$out,'');
 
-    // List of todo actions
-    //show_actions_todo($conf,$langs,$db,$object);
-
-    // List of done actions
+    // List of actions
     show_actions_done($conf,$langs,$db,$object,null,0,'','');
 }
 
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 47fbebbf976..cbc6d7f090c 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -108,7 +108,7 @@ if ($id > 0)
 
 		$head = member_prepare_head($object);
 
-		dol_fiche_head($head, 'document', $langs->trans("Member"),0,'user');
+		dol_fiche_head($head, 'document', $langs->trans("Member"), -1, 'user');
 
     	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
     	
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 9e6a20f6cb3..325b14680e7 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -69,7 +69,7 @@ if ($id)
 {
 	$head = member_prepare_head($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("Member"), 0, 'user');
+	dol_fiche_head($head, 'note', $langs->trans("Member"), -1, 'user');
 
 	print "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -109,7 +109,6 @@ if ($id)
     print "</table>";
 
     print '</div>';
-    print '<br>';
 
 
     $cssclass='titlefield';
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 4e7a9c6f190..e7d4f603618 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -784,12 +784,13 @@ while ($i < min($num,$limit))
         print '<td align="center">'.$contactstatic->getLibStatut(3).'</td>';
     }
     // Action column - Links Add action and Export vcard
-    print '<td align="right">';
-    print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;contactid='.$obj->cidp.'&amp;socid='.$obj->socid.'">'.img_object($langs->trans("AddAction"),"action").'</a>';
+    print '<td class="center">';
+    /*print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;contactid='.$obj->cidp.'&amp;socid='.$obj->socid.'">'.img_object($langs->trans("AddAction"),"action").'</a>';
     print ' &nbsp; ';
-    print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$obj->cidp.'">';
+    print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$obj->cidp.'">';
     print img_picto($langs->trans("VCard"),'vcard.png').' ';
-    print '</a></td>';
+    print '</a>'; */
+    print '</td>';
 
     print "</tr>\n";
     $i++;
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 270deb2134e..66e624e96b9 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -121,7 +121,7 @@ class FormOther
         $result = $this->db->query($sql);
         if ($result)
         {
-            print '<select class="flat" name="'.$htmlname.'">';
+            print '<select class="flat minwidth200" name="'.$htmlname.'">';
             if ($useempty)
             {
                 print '<option value="-1">&nbsp;</option>';
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 13152f85ac8..bbe9febd481 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1005,7 +1005,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         $sql.= " a.fk_element, a.elementtype,";
         $sql.= " a.fk_user_author, a.fk_contact,";
         $sql.= " c.code as acode, c.libelle as alabel, c.picto as apicto,";
-        $sql.= " u.login, u.rowid as user_id";
+        $sql.= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname";
         if (get_class($filterobj) == 'Societe')  $sql.= ", sp.lastname, sp.firstname";
         if (get_class($filterobj) == 'Adherent') $sql.= ", m.lastname, m.firstname";
         if (get_class($filterobj) == 'CommandeFournisseur') $sql.= ", o.ref";
@@ -1078,9 +1078,14 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
             		'dateend'=>$db->jdate($obj->dp2),
             		'note'=>$obj->label,
             		'percent'=>$obj->percent,
+                    
                     'userid'=>$obj->user_id,
-            		'login'=>$obj->login,
-            		'contact_id'=>$obj->fk_contact,
+                    'login'=>$obj->user_login,
+                    'userfirstname'=>$obj->user_firstname,
+                    'userlastname'=>$obj->user_lastname,
+                    'userphoto'=>$obj->user_photo,
+
+                    'contact_id'=>$obj->fk_contact,
             		'lastname'=>$obj->lastname,
             		'firstname'=>$obj->firstname,
             		'fk_element'=>$obj->fk_element,
@@ -1109,7 +1114,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
 
         $sql = "SELECT m.rowid as id, mc.date_envoi as da, m.titre as note, '100' as percentage,";
         $sql.= " 'AC_EMAILING' as acode,";
-        $sql.= " u.rowid as user_id, u.login";	// User that valid action
+        $sql.= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action
         $sql.= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u";
         $sql.= " WHERE mc.email = '".$db->escape($objcon->email)."'";	// Search is done on email.
         $sql.= " AND mc.statut = 1";
@@ -1136,8 +1141,12 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
                 		'note'=>$obj->note,
                 		'percent'=>$obj->percentage,
                 		'acode'=>$obj->acode,
-                		'userid'=>$obj->user_id,
-                		'login'=>$obj->login
+                    
+                        'userid'=>$obj->user_id,
+                        'login'=>$obj->user_login,
+                        'userfirstname'=>$obj->user_firstname,
+                        'userlastname'=>$obj->user_lastname,
+                        'userphoto'=>$obj->user_photo
 				);
                 $numaction++;
                 $i++;
@@ -1189,52 +1198,50 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         
         $out.='<div class="div-table-responsive-no-min">';
         $out.='<table class="noborder" width="100%">';
+
+        $out.='<tr class="liste_titre">';
+        if ($donetodo)
+        {
+            $out.='<td class="liste_titre"></td>';
+        }
+        $out.='<td class="liste_titre"></td>';
+        $out.='<td class="liste_titre"></td>';
+        $out.='<td class="liste_titre maxwidth100onsmartphone"><input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'"></td>';
+        $out.='<td class="liste_titre"></td>';
+        $out.='<td class="liste_titre">';
+        $out.=$formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:-1, 0, 0, 1);
+        $out.='</td>';
+        $out.='<td class="liste_titre"></td>';
+        $out.='<td class="liste_titre"></td>';
+        $out.='<td class="liste_titre"></td>';
+        // Action column
+        $out.='<td class="liste_titre" align="middle">';
+        $searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+        $out.=$searchpitco;
+        $out.='</td>';
+        $out.='</tr>';
+        
         $out.='<tr class="liste_titre">';
 		if ($donetodo)
 		{
-            $out.='<td>';
-            if (get_class($filterobj) == 'Societe') $out.='<a href="'.DOL_URL_ROOT.'/comm/action/listactions.php?socid='.$filterobj->id.'&amp;status=done">';
-            $out.=($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
-            $out.=($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
-            $out.=($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
+            $tmp='';
+            if (get_class($filterobj) == 'Societe') $tmp.='<a href="'.DOL_URL_ROOT.'/comm/action/listactions.php?socid='.$filterobj->id.'&amp;status=done">';
+            $tmp.=($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
+            $tmp.=($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
+            $tmp.=($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
             //$out.=$langs->trans("ActionsToDoShort").' / '.$langs->trans("ActionsDoneShort");
-            if (get_class($filterobj) == 'Societe') $out.='</a>';
-            $out.='</td>';
+            if (get_class($filterobj) == 'Societe') $tmp.='</a>';
+            $out.=getTitleFieldOfList($tmp);
 		}
-        $out.=getTitleFieldOfList($langs->trans("Ref"), 0, $_SERVER["PHP_SELF"], 'a.id', '', $param, '', $sortfield, $sortorder);
-        $out.='<td class="maxwidth100onsmartphone">'.$langs->trans("Label").'</td>';
-        $out.=getTitleFieldOfList($langs->trans("Date"), 0, $_SERVER["PHP_SELF"], 'a.datep,a.id', '', $param, '', $sortfield, $sortorder);
-        $out.='<td>'.$langs->trans("Type").'</td>';
-		$out.='<td></td>';
-		$out.='<td></td>';
-		$out.='<td>'.$langs->trans("Owner").'</td>';
+		$out.=getTitleFieldOfList($langs->trans("Ref"), 0, $_SERVER["PHP_SELF"], 'a.id', '', $param, '', $sortfield, $sortorder);
+		$out.=getTitleFieldOfList($langs->trans("Owner"));
+		$out.=getTitleFieldOfList($langs->trans("Label"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+        $out.=getTitleFieldOfList($langs->trans("Date"), 0, $_SERVER["PHP_SELF"], 'a.datep,a.id', '', $param, 'align="center"', $sortfield, $sortorder);
+        $out.=getTitleFieldOfList($langs->trans("Type"));
+		$out.=getTitleFieldOfList('');
+		$out.=getTitleFieldOfList('');
 		$out.=getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], 'a.percent', '', $param, 'align="center"', $sortfield, $sortorder);
-		$out.='<td class="maxwidthsearch">';
-		//TODO Add selection of fields
-		$out.='</td>';
-		$out.='</tr>';
-
-		
-		$out.='<tr class="liste_titre">';
-		if ($donetodo)
-		{
-            $out.='<td class="liste_titre"></td>';
-		}
-		$out.='<td class="liste_titre"></td>';
-		$out.='<td class="liste_titre maxwidth100onsmartphone"><input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'"></td>';
-		$out.='<td class="liste_titre"></td>';
-		$out.='<td class="liste_titre">';
-	    $out.=$formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:-1, 0, 0, 1);
-		$out.='</td>';
-		$out.='<td class="liste_titre"></td>';
-		$out.='<td class="liste_titre"></td>';
-		$out.='<td class="liste_titre"></td>';
-		$out.='<td class="liste_titre"></td>';
-    	// Action column
-    	$out.='<td class="liste_titre" align="middle">';
-    	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-    	$out.=$searchpitco;
-    	$out.='</td>';
+		$out.=getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'maxwidthsearch ');
 		$out.='</tr>';
 		
         foreach ($histo as $key=>$value)
@@ -1256,6 +1263,15 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
             $out.=$actionstatic->getNomUrl(1, -1);
             $out.='</td>';
             
+            // Author of event
+            $out.='<td>';
+            //$userstatic->id=$histo[$key]['userid'];
+            //$userstatic->login=$histo[$key]['login'];
+            //$out.=$userstatic->getLoginUrl(1);
+            $userstatic->fetch($histo[$key]['userid']);
+            $out.=$userstatic->getNomUrl(-1);
+            $out.='</td>';
+            
             // Title
             $out.='<td>';
             if (isset($histo[$key]['type']) && $histo[$key]['type']=='action')
@@ -1276,9 +1292,9 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
                 $out.=dol_trunc($libelle,120);
             }
             $out.='</td>';
-			
+
             // Date
-            $out.='<td class="nowrap">';
+            $out.='<td class="center nowrap">';
             $out.=dol_print_date($histo[$key]['datestart'],'dayhour');
             if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart'])
             {
@@ -1374,16 +1390,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
                 $out.='<td>&nbsp;</td>';
             }
 
-            // Auteur
-            $out.='<td class="nowrap" width="80">';
-            //$userstatic->id=$histo[$key]['userid'];
-            //$userstatic->login=$histo[$key]['login'];
-            //$out.=$userstatic->getLoginUrl(1);
-            $userstatic->fetch($histo[$key]['userid']);
-            $out.=$userstatic->getNomUrl(1);
-            $out.='</td>';
-
-            // Statut
+            // Status
             $out.='<td class="nowrap" align="center">'.$actionstatic->LibStatut($histo[$key]['percent'],3,1,$histo[$key]['datestart']).'</td>';
 
             // Actions
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f9ba39f870e..ea92fb5a63b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2711,7 +2711,7 @@ function img_error($titlealt = 'default')
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Error');
 
-	return img_picto($titlealt, 'error.png');
+	return img_picto($titlealt, 'error.png', 'class="valigntextbottom"');
 }
 
 /**
@@ -2727,7 +2727,8 @@ function img_next($titlealt = 'default', $morealt='')
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Next');
 
-	return img_picto($titlealt, 'next.png', $morealt);
+	//return img_picto($titlealt, 'next.png', $morealt);
+	return '<span class="fa fa-chevron-right paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';
 }
 
 /**
@@ -2743,7 +2744,8 @@ function img_previous($titlealt = 'default', $morealt='')
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Previous');
 
-	return img_picto($titlealt, 'previous.png', $morealt);
+	//return img_picto($titlealt, 'previous.png', $morealt);
+	return '<span class="fa fa-chevron-left paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';
 }
 
 /**
@@ -3109,7 +3111,7 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar
  *	@param	string	$field       Field to use for new sorting. Empty if this field is not sortable.
  *	@param	string	$begin       ("" by defaut)
  *	@param	string	$moreparam   Add more parameters on sort url links ("" by default)
- *	@param  string	$moreattrib  Add more attributes on th ("" by defaut)
+ *	@param  string	$moreattrib  Add more attributes on th ("" by defaut). To add more css class, use param $prefix.
  *	@param  string	$sortfield   Current field used to sort
  *	@param  string	$sortorder   Current sort order
  *  @param	string	$prefix		 Prefix for css. Use space after prefix to add your own CSS tag.
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 291ca6bdbfd..339a208fc31 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -86,9 +86,9 @@ class modAgenda extends DolibarrModules
 		{
 		    while ($obj = $this->db->fetch_object($sqlreadactions))
 		    {
-		        if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue;    // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation). 
+		        //if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue;    // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation). 
 		        if (preg_match('/^TASK_/',$obj->code)) continue;      // We don't track such events by default.
-		        if (preg_match('/^_MODIFY/',$obj->code)) continue;    // We don't track such events by default.
+		        //if (preg_match('/^_MODIFY/',$obj->code)) continue;    // We don't track such events by default.
 		        $this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1");
 		    }
 		}
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 65d7fd5223e..4166bbb3791 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -308,44 +308,8 @@ if ($resql)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-	print '<tr class="liste_titre">';
-
-	if (! empty($arrayfields['e.ref']['checked']))            print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.ref_customer']['checked']))   print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"],"e.ref_customer","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
-   	if (! empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
-	// Extra fields
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-	   foreach($extrafields->attribute_label as $key => $val) 
-	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
-           {
-				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-           }
-	   }
-	}
-	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
-    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-	if (! empty($arrayfields['e.datec']['checked']))  print_liste_field_titre($arrayfields['e.datec']['label'],$_SERVER["PHP_SELF"],"e.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.tms']['checked']))    print_liste_field_titre($arrayfields['e.tms']['label'],$_SERVER["PHP_SELF"],"e.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'],$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['l.fk_statut']['checked'])) print_liste_field_titre($arrayfields['l.fk_statut']['label'], $_SERVER["PHP_SELF"],"l.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
-
 	// Lignes des champs de filtre
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	// Ref
 	if (! empty($arrayfields['e.ref']['checked']))            
 	{
@@ -462,6 +426,41 @@ if ($resql)
     print '</td>';
 	print "</tr>\n";
 
+	print '<tr class="liste_titre">';
+	if (! empty($arrayfields['e.ref']['checked']))            print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['e.ref_customer']['checked']))   print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"],"e.ref_customer","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
+	if (! empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	    foreach($extrafields->attribute_label as $key => $val)
+	    {
+	        if (! empty($arrayfields["ef.".$key]['checked']))
+	        {
+	            $align=$extrafields->getAlignFlag($key);
+	            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+	        }
+	    }
+	}
+	// Hook fields
+	$parameters=array('arrayfields'=>$arrayfields);
+	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (! empty($arrayfields['e.datec']['checked']))  print_liste_field_titre($arrayfields['e.datec']['label'],$_SERVER["PHP_SELF"],"e.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['e.tms']['checked']))    print_liste_field_titre($arrayfields['e.tms']['label'],$_SERVER["PHP_SELF"],"e.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'],$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['l.fk_statut']['checked'])) print_liste_field_titre($arrayfields['l.fk_statut']['label'], $_SERVER["PHP_SELF"],"l.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print "</tr>\n";
+	
 	$i=0;
 	$var=true;
 	$totalarray=array();
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 21348a5c948..8de637df3cc 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -507,8 +507,11 @@ if ($step == 3 && $datatoimport)
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
-	print '</table><br>';
-	print '<b>'.$langs->trans("InformationOnSourceFile").'</b>';
+	print '</table>';
+	
+	print '<br>';
+	
+	print '<b>'.$langs->trans("InformationOnSourceFile").'</b><hr>';
 	print '<table width="100%" class="border">';
 	//print '<tr><td colspan="2"><b>'.$langs->trans("InformationOnSourceFile").'</b></td></tr>';
 
@@ -752,8 +755,11 @@ if ($step == 4 && $datatoimport)
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
-	print '</table><br>';
-	print '<b>'.$langs->trans("InformationOnSourceFile").'</b>';
+	print '</table>';
+	
+	print '<br>';
+	
+	print '<b>'.$langs->trans("InformationOnSourceFile").'</b><hr>';
 	print '<table width="100%" class="border">';
 	//print '<tr><td colspan="2"><b>'.$langs->trans("InformationOnSourceFile").'</b></td></tr>';
 
@@ -1219,8 +1225,11 @@ if ($step == 5 && $datatoimport)
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
-	print '</table><br>';
-	print '<b>'.$langs->trans("InformationOnSourceFile").'</b>';
+	print '</table>';
+	
+	print '<br>';
+	
+	print '<b>'.$langs->trans("InformationOnSourceFile").'</b><hr>';
 	print '<table width="100%" class="border">';
 	//print '<tr><td colspan="2"><b>'.$langs->trans("InformationOnSourceFile").'</b></td></tr>';
 
@@ -1261,38 +1270,33 @@ if ($step == 5 && $datatoimport)
 
 	// Do not import first lines
 	print '<tr><td>';
-	print $langs->trans("ImportFromLine");
+	print $langs->trans("ImportFromToLine");
 	print '</td><td>';
 	if ($action=='launchsimu')
 	{
-	    print '<input type="text" size="4" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
+	    print '<input type="number" class="maxwidth50" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
 	    print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
         print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	}
 	else
 	{
-	    print '<input type="text" size="4" name="excludefirstline" value="'.$excludefirstline.'">';
+	    print '<input type="number" class="maxwidth50" name="excludefirstline" value="'.$excludefirstline.'">';
 	    print $form->textwithpicto("", $langs->trans("SetThisValueTo2ToExcludeFirstLine"));
 	}
-	print '</td></tr>';
-
-	// Do not import end lines
-	print '<tr><td>';
-	print $langs->trans("EndAtLineNb");
-	print '</td><td>';
+	print ' - ';
 	if ($action=='launchsimu')
 	{
-	    print '<input type="text" size="4" name="endatlinenbbis" disabled="disabled" value="'.$endatlinenb.'">';
+	    print '<input type="text" class="maxwidth50" name="endatlinenbbis" disabled="disabled" value="'.$endatlinenb.'">';
 	    print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
         print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	}
 	else
 	{
-	    print '<input type="text" size="4" name="endatlinenb" value="'.$endatlinenb.'">';
+	    print '<input type="text" class="maxwidth50" name="endatlinenb" value="'.$endatlinenb.'">';
 	    print $form->textwithpicto("", $langs->trans("KeepEmptyToGoToEndOfFile"));
 	}
 	print '</td></tr>';
-	
+
 	print '<tr><td>';
 	print $langs->trans("KeysToUseForUpdates");
 	print '</td><td>';
@@ -1304,7 +1308,7 @@ if ($step == 5 && $datatoimport)
 		print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	} else {
 		print $form->multiselectarray('updatekeys', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%');
-		print $form->textwithpicto("", $langs->trans("SelectColumnsOfYourFileForUpdateAttempt"));
+		print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
 	}
 	/*echo '<pre>';
 	print_r($objimport->array_import_updatekeys);
@@ -1315,7 +1319,7 @@ if ($step == 5 && $datatoimport)
 
 	print '<br>';
 
-	print '<b>'.$langs->trans("InformationOnTargetTables").'</b>';
+	print '<b>'.$langs->trans("InformationOnTargetTables").'</b><hr>';
 	print '<table width="100%" class="border">';
 	//print '<tr><td colspan="2"><b>'.$langs->trans("InformationOnTargetTables").'</b></td></tr>';
 
@@ -1643,8 +1647,11 @@ if ($step == 6 && $datatoimport)
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
-	print '</table><br>';
-	print '<b>'.$langs->trans("InformationOnSourceFile").'</b>';
+	print '</table>';
+	
+	print '<br>';
+	
+	print '<b>'.$langs->trans("InformationOnSourceFile").'</b><hr>';
 	print '<table width="100%" class="border">';
 	//print '<tr><td colspan="2"><b>'.$langs->trans("InformationOnSourceFile").'</b></td></tr>';
 
@@ -1701,7 +1708,7 @@ if ($step == 6 && $datatoimport)
 
 	print '<br>';
 
-	print '<b>'.$langs->trans("InformationOnTargetTables").'</b>';
+	print '<b>'.$langs->trans("InformationOnTargetTables").'</b><hr>';
 	print '<table width="100%" class="border">';
 	//print '<tr><td colspan="2"><b>'.$langs->trans("InformationOnTargetTables").'</b></td></tr>';
 
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index 47b6fde9840..acbf407fd62 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -113,8 +113,10 @@ ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+
 ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
 ImportFromLine=Import starting from line number
 EndAtLineNb=End at line number
+ImportFromToLine=Import line numbers (from - to) 
 SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
 KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
+SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for update attempt
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilteredFields=Filtered fields
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 52ed6c9c969..5320e637316 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -103,7 +103,7 @@ $head[$h][1] = $title;
 $head[$h][2] = 'popularityprop';
 $h++;
 
-dol_fiche_head($head,'popularityprop',$langs->trans("Statistics"));
+dol_fiche_head($head, 'popularityprop', $langs->trans("Statistics"), -1);
 
 
 // Array of liens to show
@@ -136,7 +136,6 @@ if ($resql)
     $num = $db->num_rows($resql);
     $i = 0;
 
-    $var=True;
     while ($i < $num)
     {
         $objp = $db->fetch_object($resql);
@@ -166,7 +165,6 @@ print_liste_field_titre($langs->trans('Label'), $_SERVER["PHP_SELF"], 'p.label',
 print_liste_field_titre($langs->trans('NbOfQtyInProposals'), $_SERVER["PHP_SELF"], 'c', '', $param, 'align="right"', $sortfield, $sortorder);
 print "</tr>\n";
 
-$var=True;
 foreach($infoprod as $prodid => $vals)
 {
 	// Multilangs
@@ -186,8 +184,7 @@ foreach($infoprod as $prodid => $vals)
 		}
 	}
 
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	print "<tr>";
 	print '<td><a href="'.DOL_URL_ROOT.'/product/stats/card.php?id='.$prodid.'">';
 	if ($vals['type'] == 1) print img_object($langs->trans("ShowService"),"service");
 	else print img_object($langs->trans("ShowProduct"),"product");
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 13bc0fef186..8e3d1aa1985 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -121,10 +121,7 @@ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s on p.rowid = s.fk_produc
 if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_product as cp";
 $sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
 if ($search_categ) $sql.= " AND p.rowid = cp.fk_product";	// Join for the needed table to filter by categ
-if ($sall)
-{
-	$sql.= " AND (p.ref LIKE '%".$db->escape($sall)."%' OR p.label LIKE '%".$db->escape($sall)."%' OR p.description LIKE '%".$db->escape($sall)."%' OR p.note LIKE '%".$db->escape($sall)."%')";
-}
+if ($sall) $sql.=natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $all);
 // if the type is not 1, we show all products (type = 0,2,3)
 if (dol_strlen($type))
 {
@@ -137,41 +134,32 @@ if (dol_strlen($type))
         $sql.= " AND p.fk_product_type <> '1'";
     }
 }
-if ($sref)     $sql.= " AND p.ref LIKE '%".$sref."%'";
-if ($sbarcode) $sql.= " AND p.barcode LIKE '%".$sbarcode."%'";
-if ($snom)     $sql.= " AND p.label LIKE '%".$db->escape($snom)."%'";
-if (! empty($tosell))
-{
-	$sql.= " AND p.tosell = ".$tosell;
-}
-if (! empty($tobuy))
-{
-    $sql.= " AND p.tobuy = ".$tobuy;
-}
-if (! empty($canvas))
-{
-    $sql.= " AND p.canvas = '".$db->escape($canvas)."'";
-}
-if($catid)
-{
-	$sql.= " AND cp.fk_categorie = ".$catid;
-}
-if ($fourn_id > 0)
-{
-	$sql.= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".$fourn_id;
-}
+if ($sref)     $sql.= natural_search('p.ref', $ref);
+if ($sbarcode) $sql.= natural_search('p.barcode', $sbarcode);
+if ($snom)     $sql.= natural_search('p.label', $snom);
+if (! empty($tosell)) $sql.= " AND p.tosell = ".$tosell;
+if (! empty($tobuy)) $sql.= " AND p.tobuy = ".$tobuy;
+if (! empty($canvas)) $sql.= " AND p.canvas = '".$db->escape($canvas)."'";
+if($catid) $sql.= " AND cp.fk_categorie = ".$catid;
+if ($fourn_id > 0) $sql.= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".$fourn_id;
 // Insert categ filter
-if ($search_categ)
-{
-	$sql .= " AND cp.fk_categorie = ".$db->escape($search_categ);
-}
+if ($search_categ) $sql .= " AND cp.fk_categorie = ".$db->escape($search_categ);
 $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,";
 $sql.= " p.fk_product_type, p.tms, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock";
-if ($toolowstock) $sql.= " HAVING SUM(".$db->ifsql('s.reel IS NULL', '0', 's.reel').") < p.seuil_stock_alerte";    // Not used yet
+if ($toolowstock) $sql.= " HAVING SUM(".$db->ifsql('s.reel IS NULL', '0', 's.reel').") < p.seuil_stock_alerte";
 $sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($limit + 1, $offset);
-$resql = $db->query($sql);
 
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+}
+
+$sql.= $db->plimit($limit + 1, $offset);
+
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -197,31 +185,31 @@ if ($resql)
 
 	llxHeader("", $texte, $helpurl);
 
-	if ($sref || $snom || $sall || GETPOST('search'))
-	{
-		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=".$sref."&snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy.(!empty($search_categ) ? '&amp;search_categ='.$search_categ : '').(!empty($toolowstock) ? '&amp;toolowstock='.$toolowstock : ''), $sortfield, $sortorder,'',$num, 0, 'title_products');
-	}
-	else
-	{
-		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&amp;type=$type":"").(!empty($search_categ) ? '&amp;search_categ='.$search_categ : '').(!empty($toolowstock) ? '&amp;toolowstock='.$toolowstock : ''), $sortfield, $sortorder,'',$num, 0, 'title_products');
-	}
-
-	if (! empty($catid))
-	{
-		print "<div id='ways'>";
-		$c = new Categorie($db);
-		$c->fetch($catid);
-		$ways = $c->print_all_ways(' &gt; ','product/reassort.php');
-		print " &gt; ".$ways[0]."<br>\n";
-		print "</div><br>";
-	}
-
 	print '<form action="'. $_SERVER["PHP_SELF"] .'" method="post" name="formulaire">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
+	if ($sref || $snom || $sall || GETPOST('search'))
+	{
+	    print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=".$sref."&snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy.(!empty($search_categ) ? '&amp;search_categ='.$search_categ : '').(!empty($toolowstock) ? '&amp;toolowstock='.$toolowstock : ''), $sortfield, $sortorder,'',$num, $nbtotalofrecords, 'title_products', 0, '', '', $limit);
+	}
+	else
+	{
+	    print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&amp;type=$type":"").(!empty($search_categ) ? '&amp;search_categ='.$search_categ : '').(!empty($toolowstock) ? '&amp;toolowstock='.$toolowstock : ''), $sortfield, $sortorder,'',$num, $nbtotalofrecords, 'title_products', 0, '', '', $limit);
+	}
+	
+	if (! empty($catid))
+	{
+	    print "<div id='ways'>";
+	    $c = new Categorie($db);
+	    $c->fetch($catid);
+	    $ways = $c->print_all_ways(' &gt; ','product/reassort.php');
+	    print " &gt; ".$ways[0]."<br>\n";
+	    print "</div><br>";
+	}
+	
 	// Filter on categories
  	$moreforfilter='';
 	if (! empty($conf->categorie->enabled))
@@ -264,32 +252,8 @@ if ($resql)
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
 	
-	// Lignes des titres
-	print "<tr class=\"liste_titre\">";
-	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
-	if (! empty($conf->service->enabled) && $type == 1) print_liste_field_titre($langs->trans("Duration"), $_SERVER["PHP_SELF"], "p.duration",$param,"",'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("StockLimit"), $_SERVER["PHP_SELF"], "p.seuil_stock_alerte",$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DesiredStock"), $_SERVER["PHP_SELF"], "p.desiredstock",$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("PhysicalStock"), $_SERVER["PHP_SELF"], "stock_physique",$param,"",'align="right"',$sortfield,$sortorder);
-	// Details per warehouse
-	if (! empty($conf->global->STOCK_DETAIL_ON_WAREHOUSE))	// TODO This should be moved into the selection of fields on page product/list (page product/stock will be removed and replaced with product/list with its own context)
-	{
-		if ($nb_warehouse>1) {
-			foreach($warehouses_list as &$wh) {
-				print_liste_field_titre($wh['label'], '', '','','','align="right"');
-			}
-			
-		}
-	} 
-	if ($virtualdiffersfromphysical) print_liste_field_titre($langs->trans("VirtualStock"),$_SERVER["PHP_SELF"], "",$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
-	print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Sell").')',$_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Buy").')',$_SERVER["PHP_SELF"], "p.tobuy",$param,"",'align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-
 	// Lignes des champs de filtre
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="sref" size="6" value="'.$sref.'">';
 	print '</td>';
@@ -310,24 +274,47 @@ if ($resql)
 	if ($virtualdiffersfromphysical) print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre" colspan="'.$colspan_warehouse.'">&nbsp;</td>';
+	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre" align="right">';
    	$searchpitco=$form->showFilterAndCheckAddButtons(0);
    	print $searchpitco;
 	print '</td>';
 	print '</tr>';
 
-	$var=True;
+	// Lignes des titres
+	print "<tr class=\"liste_titre\">";
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
+	if (! empty($conf->service->enabled) && $type == 1) print_liste_field_titre($langs->trans("Duration"), $_SERVER["PHP_SELF"], "p.duration",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("StockLimit"), $_SERVER["PHP_SELF"], "p.seuil_stock_alerte",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DesiredStock"), $_SERVER["PHP_SELF"], "p.desiredstock",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("PhysicalStock"), $_SERVER["PHP_SELF"], "stock_physique",$param,"",'align="right"',$sortfield,$sortorder);
+	// Details per warehouse
+	if (! empty($conf->global->STOCK_DETAIL_ON_WAREHOUSE))	// TODO This should be moved into the selection of fields on page product/list (page product/stock will be removed and replaced with product/list with its own context)
+	{
+	    if ($nb_warehouse>1) {
+	        foreach($warehouses_list as &$wh) {
+	            print_liste_field_titre($wh['label'], '', '','','','align="right"');
+	        }
+	        	
+	    }
+	}
+	if ($virtualdiffersfromphysical) print_liste_field_titre($langs->trans("VirtualStock"),$_SERVER["PHP_SELF"], "",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
+	print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Sell").')',$_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Buy").')',$_SERVER["PHP_SELF"], "p.tobuy",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
+	
 	while ($i < min($num,$limit))
 	{
 		$objp = $db->fetch_object($resql);
 
-		$var=!$var;
-		print '<tr '.$bc[$var].'><td class="nowrap">';
-		
+		print '<tr>';
+		print '<td class="nowrap">';
 		$product=new Product($db);
 		$product->fetch($objp->rowid);
 		$product->load_stock();
-		
 		print $product->getNomUrl(1,'',16);
 		//if ($objp->stock_theorique < $objp->seuil_stock_alerte) print ' '.img_warning($langs->trans("StockTooLow"));
 		print '</td>';
@@ -376,27 +363,17 @@ if ($resql)
 		}
 		print '<td align="right"><a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$product->id.'">'.$langs->trans("Movements").'</a></td>';
 		print '<td align="right" class="nowrap">'.$product->LibStatut($objp->statut,5,0).'</td>';
-        	print '<td align="right" class="nowrap">'.$product->LibStatut($objp->tobuy,5,1).'</td>';
-		print "</tr>\n";
+        print '<td align="right" class="nowrap">'.$product->LibStatut($objp->tobuy,5,1).'</td>';
+		print '<td></td>';
+        print "</tr>\n";
 		$i++;
 	}
 
 	print "</table>";
 	print '</div>';
+	
 	print '</form>';
 
-	if ($num > $conf->liste_limit)
-	{
-		if ($sref || $snom || $sall || GETPOST('search'))
-		{
-	  		print_barre_liste('', $page, "reassort.php", "&sref=".$sref."&snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy.(!empty($search_categ) ? '&amp;search_categ='.$search_categ : '').(!empty($toolowstock) ? '&amp;toolowstock='.$toolowstock : ''), $sortfield, $sortorder,'',$num, 0, '');
-		}
-		else
-		{
-	  		print_barre_liste('', $page, "reassort.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&amp;type=$type":"")."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy.(!empty($search_categ) ? '&amp;search_categ='.$search_categ : '').(!empty($toolowstock) ? '&amp;toolowstock='.$toolowstock : ''), $sortfield, $sortorder,'',$num, 0, '');
-		}
-	}
-
 	$db->free($resql);
 
 }
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 01285f09417..af1c6f2ec15 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -160,15 +160,17 @@ $sql.= " pb.batch, pb.eatby, pb.sellby,";
 $sql.= " pl.eatby, pl.sellby";
 if ($toolowstock) $sql.= " HAVING SUM(".$db->ifsql('ps.reel IS NULL', '0', 'ps.reel').") < p.seuil_stock_alerte";    // Not used yet
 $sql.= $db->order($sortfield,$sortorder);
+
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
 }
-$sql.= $db->plimit($limit + 1, $offset);
-$resql = $db->query($sql);
 
+$sql.= $db->plimit($limit + 1, $offset);
+
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -194,13 +196,19 @@ if ($resql)
 
 	llxHeader("",$title,$helpurl,$texte);
 
+	print '<form action="'. $_SERVER["PHP_SELF"] .'" method="post" name="formulaire">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
+
 	if ($sref || $snom || $sall || GETPOST('search'))
 	{
-		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=".$sref."&snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy, $sortfield, $sortorder,'',$num, $nbtotalofrecords, 'title_products');
+		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=".$sref."&snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy, $sortfield, $sortorder,'',$num, $nbtotalofrecords, 'title_products', 0, '', '', $limit);
 	}
 	else
 	{
-		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&amp;type=$type":""), $sortfield, $sortorder,'',$num, $nbtotalofrecords, 'title_products');
+		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&amp;type=$type":""), $sortfield, $sortorder,'',$num, $nbtotalofrecords, 'title_products', 0, '', '', $limit);
 	}
 
 	if (! empty($catid))
@@ -213,12 +221,6 @@ if ($resql)
 		print "</div><br>";
 	}
 
-	print '<form action="'. $_SERVER["PHP_SELF"] .'" method="post" name="formulaire">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="type" value="'.$type.'">';
-
 	// Filter on categories
  	$moreforfilter='';
 	if (! empty($conf->categorie->enabled))
@@ -255,26 +257,8 @@ if ($resql)
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
 	
-	// Lignes des titres
-	print "<tr class=\"liste_titre\">";
-	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
-	if (! empty($conf->service->enabled) && $type == 1) print_liste_field_titre($langs->trans("Duration"), $_SERVER["PHP_SELF"], "p.duration",$param,"",'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Warehouse"), $_SERVER["PHP_SELF"], "e.label",$param,"",'',$sortfield,$sortorder);
-	//print_liste_field_titre($langs->trans("DesiredStock"), $_SERVER["PHP_SELF"], "p.desiredstock",$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Batch"), $_SERVER["PHP_SELF"], "pb.batch",$param,"",'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("EatByDate"), $_SERVER["PHP_SELF"], "pb.eatby",$param,"",'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("SellByDate"), $_SERVER["PHP_SELF"], "pb.sellby",$param,"",'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("PhysicalStock"), $_SERVER["PHP_SELF"], "stock_physique",$param,"",'align="right"',$sortfield,$sortorder);
-	// TODO Add info of running suppliers/customers orders
-	//print_liste_field_titre($langs->trans("TheoreticalStock"),$_SERVER["PHP_SELF"], "stock_theorique",$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
-	print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Sell").')',$_SERVER["PHP_SELF"], "p.tosell","",$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Buy").')',$_SERVER["PHP_SELF"], "p.tobuy","",$param,'align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-
 	// Lignes des champs de filtre
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="sref" size="6" value="'.$sref.'">';
 	print '</td>';
@@ -294,16 +278,35 @@ if ($resql)
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre" align="right">';
     $searchpitco=$form->showFilterAndCheckAddButtons(0);
     print $searchpitco;
     print '</td>';
 	print '</tr>';
 
+	// Lignes des titres
+	print "<tr class=\"liste_titre\">";
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
+	if (! empty($conf->service->enabled) && $type == 1) print_liste_field_titre($langs->trans("Duration"), $_SERVER["PHP_SELF"], "p.duration",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Warehouse"), $_SERVER["PHP_SELF"], "e.label",$param,"",'',$sortfield,$sortorder);
+	//print_liste_field_titre($langs->trans("DesiredStock"), $_SERVER["PHP_SELF"], "p.desiredstock",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Batch"), $_SERVER["PHP_SELF"], "pb.batch",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("EatByDate"), $_SERVER["PHP_SELF"], "pb.eatby",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("SellByDate"), $_SERVER["PHP_SELF"], "pb.sellby",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("PhysicalStock"), $_SERVER["PHP_SELF"], "stock_physique",$param,"",'align="right"',$sortfield,$sortorder);
+	// TODO Add info of running suppliers/customers orders
+	//print_liste_field_titre($langs->trans("TheoreticalStock"),$_SERVER["PHP_SELF"], "stock_theorique",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
+	print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Sell").')',$_SERVER["PHP_SELF"], "p.tosell","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Buy").')',$_SERVER["PHP_SELF"], "p.tobuy","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
+	
 	$product_static=new Product($db);
 	$warehousetmp=new Entrepot($db);
 
-	$var=True;
 	while ($i < min($num,$limit))
 	{
 		$objp = $db->fetch_object($resql);
@@ -337,9 +340,7 @@ if ($resql)
 		$warehousetmp->label=$objp->warehouse_ref;
 		$warehousetmp->fk_parent=$objp->warehouse_parent;
 
-		$var=!$var;
-
-		print '<tr '.$bc[$var].'>';
+		print '<tr>';
 		
 		// Ref
 		print '<td class="nowrap">';
@@ -380,6 +381,7 @@ if ($resql)
 		print '<td align="right"><a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$product_static->id.'&search_warehouse='.$objp->fk_entrepot.'&search_batch='.($objp->batch != 'Undefined' ? $objp->batch : 'Undefined').'">'.$langs->trans("Movements").'</a></td>';
 		print '<td align="right" class="nowrap">'.$product_static->LibStatut($objp->statut,5,0).'</td>';
         print '<td align="right" class="nowrap">'.$product_static->LibStatut($objp->tobuy,5,1).'</td>';
+        print '<td></td>';
 		print "</tr>\n";
 		$i++;
 	}
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 0bfd9048352..f31b7c9eb6e 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -149,18 +149,8 @@ if ($result)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-	print "<tr class=\"liste_titre\">";
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"], "e.label","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("LocationSummary"),$_SERVER["PHP_SELF"], "e.lieu","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("PhysicalStock"), $_SERVER["PHP_SELF"], "stockqty",'',$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("EstimatedStockValue"), $_SERVER["PHP_SELF"], "estimatedvalue",'',$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("EstimatedStockValueSell"), $_SERVER["PHP_SELF"], "",'',$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"], "e.statut",'',$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'',$param,'',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
-
 	// Lignes des champs de filtre
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat" type="text" name="search_ref" size="6" value="'.dol_escape_htmltag($search_ref).'">';
@@ -183,6 +173,16 @@ if ($result)
     print '</td>';
 
 	print '</tr>';
+    
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"], "e.label","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("LocationSummary"),$_SERVER["PHP_SELF"], "e.lieu","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("PhysicalStock"), $_SERVER["PHP_SELF"], "stockqty",'',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("EstimatedStockValue"), $_SERVER["PHP_SELF"], "estimatedvalue",'',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("EstimatedStockValueSell"), $_SERVER["PHP_SELF"], "",'',$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"], "e.statut",'',$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'',$param,'',$sortfield,$sortorder,'maxwidthsearch ');
+	print "</tr>\n";
 
 	if ($num)
 	{
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 2910103e380..58bb6f6a3cb 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -236,8 +236,7 @@ if ($search_fk_user_creat) $sql.= natural_search("fk_user_creat",$search_fk_user
 if ($search_fk_user_modif) $sql.= natural_search("fk_user_modif",$search_fk_user_modif);
 if ($search_import_key) $sql.= natural_search("import_key",$search_import_key);
 
-
-if ($sall)          $sql.= natural_search(array_keys($fieldstosearchall), $sall);
+if ($sall) $sql.= natural_search(array_keys($fieldstosearchall), $sall);
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
 {
@@ -342,6 +341,69 @@ if ($resql)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
+    // Fields title search
+    print '<tr class="liste_titre_filter">';
+    if (! empty($arrayfields['t.entity']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_entity" value="'.$search_entity.'" size="8"></td>';
+    if (! empty($arrayfields['t.batch']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_batch" value="'.$search_batch.'" size="8"></td>';
+    if (! empty($arrayfields['t.fk_product']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_product" value="'.$search_product.'" size="8"></td>';
+    if (! empty($arrayfields['t.eatby']['checked'])) print '<td class="liste_titre"></td>';
+    if (! empty($arrayfields['t.sellby']['checked'])) print '<td class="liste_titre"></td>';
+    if (! empty($arrayfields['t.fk_user_creat']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_fk_user_creat" value="'.$search_fk_user_creat.'" size="10"></td>';
+    if (! empty($arrayfields['t.fk_user_modif']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_fk_user_modif" value="'.$search_fk_user_modif.'" size="10"></td>';
+    if (! empty($arrayfields['t.import_key']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_import_key" value="'.$search_import_key.'" size="10"></td>';
+    // Extra fields
+    if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+    {
+        foreach($extrafields->attribute_label as $key => $val)
+        {
+            if (! empty($arrayfields["ef.".$key]['checked']))
+            {
+                $align=$extrafields->getAlignFlag($key);
+                $typeofextrafield=$extrafields->attribute_type[$key];
+                print '<td class="liste_titre'.($align?' '.$align:'').'">';
+                if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+                {
+                    $crit=$val;
+                    $tmpkey=preg_replace('/search_options_/','',$key);
+                    $searchclass='';
+                    if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+                    if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+                    print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+                }
+                print '</td>';
+            }
+        }
+    }
+    // Fields from hook
+    $parameters=array('arrayfields'=>$arrayfields);
+    $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    if (! empty($arrayfields['t.datec']['checked']))
+    {
+        // Date creation
+        print '<td class="liste_titre">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['t.tms']['checked']))
+    {
+        // Date modification
+        print '<td class="liste_titre">';
+        print '</td>';
+    }
+    /*if (! empty($arrayfields['u.statut']['checked']))
+     {
+     // Status
+     print '<td class="liste_titre" align="center">';
+     print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
+     print '</td>';
+     }*/
+    // Action column
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+    print $searchpitco;
+    print '</td>';
+    print '</tr>'."\n";
+    
     // Fields title
     print '<tr class="liste_titre">';
     if (! empty($arrayfields['t.entity']['checked']))        print_liste_field_titre($arrayfields['t.entity']['label'],$_SERVER['PHP_SELF'],'t.entity','',$param,'',$sortfield,$sortorder);
@@ -374,69 +436,6 @@ if ($resql)
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
     print '</tr>'."\n";
 
-    // Fields title search
-	print '<tr class="liste_titre">';
-    if (! empty($arrayfields['t.entity']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_entity" value="'.$search_entity.'" size="8"></td>';
-    if (! empty($arrayfields['t.batch']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_batch" value="'.$search_batch.'" size="8"></td>';
-    if (! empty($arrayfields['t.fk_product']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_product" value="'.$search_product.'" size="8"></td>';
-    if (! empty($arrayfields['t.eatby']['checked'])) print '<td class="liste_titre"></td>';
-    if (! empty($arrayfields['t.sellby']['checked'])) print '<td class="liste_titre"></td>';
-    if (! empty($arrayfields['t.fk_user_creat']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_fk_user_creat" value="'.$search_fk_user_creat.'" size="10"></td>';
-    if (! empty($arrayfields['t.fk_user_modif']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_fk_user_modif" value="'.$search_fk_user_modif.'" size="10"></td>';
-    if (! empty($arrayfields['t.import_key']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_import_key" value="'.$search_import_key.'" size="10"></td>';
-	// Extra fields
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-        foreach($extrafields->attribute_label as $key => $val) 
-        {
-            if (! empty($arrayfields["ef.".$key]['checked']))
-            {
-                $align=$extrafields->getAlignFlag($key);
-                $typeofextrafield=$extrafields->attribute_type[$key];
-                print '<td class="liste_titre'.($align?' '.$align:'').'">';
-            	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
-				{
-				    $crit=$val;
-    				$tmpkey=preg_replace('/search_options_/','',$key);
-    				$searchclass='';
-    				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-    				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-    				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
-				}
-                print '</td>';
-            }
-        }
-	}
-    // Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields);
-    $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    if (! empty($arrayfields['t.datec']['checked']))
-    {
-        // Date creation
-        print '<td class="liste_titre">';
-        print '</td>';
-    }
-    if (! empty($arrayfields['t.tms']['checked']))
-    {
-        // Date modification
-        print '<td class="liste_titre">';
-        print '</td>';
-    }
-    /*if (! empty($arrayfields['u.statut']['checked']))
-    {
-        // Status
-        print '<td class="liste_titre" align="center">';
-        print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
-        print '</td>';
-    }*/
-    // Action column
-	print '<td class="liste_titre" align="right">';
-	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-    print $searchpitco;
-    print '</td>';
-	print '</tr>'."\n";
-        
 	$productlot = new Productlot($db);
 	
 	$i=0;
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 9185406a6ef..ded0feec881 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -403,7 +403,7 @@ $head[1][2] = 'replenishorders';
 
 print load_fiche_titre($langs->trans('Replenishment'), '', 'title_generic.png');
 
-dol_fiche_head($head, 'replenish', '', 0, '');
+dol_fiche_head($head, 'replenish', '', -1, '');
 
 print $langs->trans("ReplenishmentStatusDesc").'<br>'."\n";
 if ($usevirtualstock == 1)
@@ -501,22 +501,8 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire">'
 	'<input type="hidden" name="action" value="order">'.
 	'<input type="hidden" name="mode" value="' . $mode . '">';
 
-// Lines of title
-print '<tr class="liste_titre">';
-print_liste_field_titre('<input type="checkbox" onClick="toggle(this)" />', $_SERVER["PHP_SELF"], '');
-print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], 'p.ref', $param, '', '', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans('Label'), $_SERVER["PHP_SELF"], 'p.label', $param, '', '', $sortfield, $sortorder);
-if (!empty($conf->service->enabled) && $type == 1) print_liste_field_titre($langs->trans('Duration'), $_SERVER["PHP_SELF"], 'p.duration', $param, '', 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans('DesiredStock'), $_SERVER["PHP_SELF"], 'p.desiredstock', $param, '', 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans('StockLimitShort'), $_SERVER["PHP_SELF"], 'p.seuil_stock_alerte', $param, '', 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($stocklabel, $_SERVER["PHP_SELF"], 'stock_physique', $param, '', 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans('Ordered'), $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans('StockToBuy'), $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans('SupplierRef'), $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
-print "</tr>\n";
-
 // Lignes des champs de filtre
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre"><input class="flat" type="text" name="sref" size="8" value="'.dol_escape_htmltag($sref).'"></td>';
 print '<td class="liste_titre"><input class="flat" type="text" name="snom" size="8" value="'.dol_escape_htmltag($snom).'"></td>';
@@ -532,6 +518,20 @@ print $searchpitco;
 print '</td>';
 print '</tr>';
 
+// Lines of title
+print '<tr class="liste_titre">';
+print_liste_field_titre('<input type="checkbox" onClick="toggle(this)" />', $_SERVER["PHP_SELF"], '');
+print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], 'p.ref', $param, '', '', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans('Label'), $_SERVER["PHP_SELF"], 'p.label', $param, '', '', $sortfield, $sortorder);
+if (!empty($conf->service->enabled) && $type == 1) print_liste_field_titre($langs->trans('Duration'), $_SERVER["PHP_SELF"], 'p.duration', $param, '', 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans('DesiredStock'), $_SERVER["PHP_SELF"], 'p.desiredstock', $param, '', 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans('StockLimitShort'), $_SERVER["PHP_SELF"], 'p.seuil_stock_alerte', $param, '', 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($stocklabel, $_SERVER["PHP_SELF"], 'stock_physique', $param, '', 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans('Ordered'), $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans('StockToBuy'), $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans('SupplierRef'), $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
+print "</tr>\n";
+
 $prod = new Product($db);
 
 $var = True;
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 4986d7c524d..607e28165ed 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -97,7 +97,7 @@ $head[1][0] = DOL_URL_ROOT.'/product/stock/replenishorders.php';
 $head[1][1] = $texte;
 $head[1][2] = 'replenishorders';
 
-dol_fiche_head($head, 'replenishorders', '', 0, '');
+dol_fiche_head($head, 'replenishorders', '', -1, '');
 
 $commandestatic = new CommandeFournisseur($db);
 
@@ -160,71 +160,9 @@ if ($resql)
 
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
 
-    print '<table class="noborder" width="100%">'.
-         '<tr class="liste_titre">';
-    print_liste_field_titre(
-    		$langs->trans('Ref'),
-    		$_SERVER['PHP_SELF'],
-    		'cf.ref',
-    		'',
-    		'',
-    		'',
-    		$sortfield,
-    		$sortorder
-    );
-    print_liste_field_titre(
-    		$langs->trans('Company'),
-    		$_SERVER['PHP_SELF'],
-    		's.nom',
-    		'',
-    		'',
-    		'',
-    		$sortfield,
-    		$sortorder
-    );
-    print_liste_field_titre(
-    		$langs->trans('Author'),
-    		$_SERVER['PHP_SELF'],
-    		'u.login',
-    		'',
-    		'',
-    		'',
-    		$sortfield,
-    		$sortorder
-    );
-    print_liste_field_titre(
-    		$langs->trans('AmountTTC'),
-    		$_SERVER['PHP_SELF'],
-    		'cf.total_ttc',
-    		'',
-    		'',
-    		'',
-    		$sortfield,
-    		$sortorder
-    );
-    print_liste_field_titre(
-    		$langs->trans('OrderCreation'),
-    		$_SERVER['PHP_SELF'],
-    		'cf.date_creation',
-    		'',
-    		'',
-    		'',
-    		$sortfield,
-    		$sortorder
-    );
-    print_liste_field_titre(
-    		$langs->trans('Status'),
-    		$_SERVER['PHP_SELF'],
-    		'cf.fk_statut',
-    		'',
-    		'',
-    		'align="right"',
-    		$sortfield,
-    		$sortorder
-    );
-    print '</tr>'.
+    print '<table class="noborder" width="100%">';
 
-         '<tr class="liste_titre">'.
+    print '<tr class="liste_titre_filter">'.
          '<td class="liste_titre">'.
          '<input type="text" class="flat" name="search_ref" value="' . $sref . '">'.
          '</td>'.
@@ -246,20 +184,81 @@ if ($resql)
          '</td>'.
          '</tr>';
 
-    $var = true;
+         print '<tr class="liste_titre">';
+         print_liste_field_titre(
+             $langs->trans('Ref'),
+             $_SERVER['PHP_SELF'],
+             'cf.ref',
+             '',
+             '',
+             '',
+             $sortfield,
+             $sortorder
+             );
+         print_liste_field_titre(
+             $langs->trans('Company'),
+             $_SERVER['PHP_SELF'],
+             's.nom',
+             '',
+             '',
+             '',
+             $sortfield,
+             $sortorder
+             );
+         print_liste_field_titre(
+             $langs->trans('Author'),
+             $_SERVER['PHP_SELF'],
+             'u.login',
+             '',
+             '',
+             '',
+             $sortfield,
+             $sortorder
+             );
+         print_liste_field_titre(
+             $langs->trans('AmountTTC'),
+             $_SERVER['PHP_SELF'],
+             'cf.total_ttc',
+             '',
+             '',
+             '',
+             $sortfield,
+             $sortorder
+             );
+         print_liste_field_titre(
+             $langs->trans('OrderCreation'),
+             $_SERVER['PHP_SELF'],
+             'cf.date_creation',
+             '',
+             '',
+             '',
+             $sortfield,
+             $sortorder
+             );
+         print_liste_field_titre(
+             $langs->trans('Status'),
+             $_SERVER['PHP_SELF'],
+             'cf.fk_statut',
+             '',
+             '',
+             'align="right"',
+             $sortfield,
+             $sortorder
+             );
+         print '</tr>';
+          
     $userstatic = new User($db);
 
     while ($i < min($num,$conf->liste_limit))
     {
         $obj = $db->fetch_object($resql);
-        $var = !$var;
 
         $showline = dolDispatchToDo($obj->rowid) && (!$sproduct || in_array($sproduct, getProducts($obj->rowid)));
 
         if ($showline)
         {
             $href = DOL_URL_ROOT . '/fourn/commande/card.php?id=' . $obj->rowid;
-            print '<tr ' . $bc[$var] . '>'.
+            print '<tr>'.
             // Ref
                  '<td>'.
                  '<a href="' . $href . '">'.
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f7cb1c0bb5a..b43eb6450c1 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1948,7 +1948,7 @@ div.popuptab {
 	padding-right: 5px;
 }
 div.tabsAction {
-    margin: 20px 0em 25px 0em;
+    margin: 20px 0em 20px 0em;
     padding: 0em 0em;
     text-align: right;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index f83d5df0d50..2a393dee748 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1941,7 +1941,7 @@ div.tabBar table.tableforservicepart2:last-child {
 }
 
 div.tabsAction {
-    margin: 20px 0em 25px 0em;
+    margin: 20px 0em 20px 0em;
     padding: 0em 0em;
     text-align: right;
 }

From 18e1e5b7806c67938c03391c9fabfd54ea97286f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 30 Mar 2017 15:54:48 +0200
Subject: [PATCH 0507/1163] NEW Add "depends on" and "required by "into module
 informations

---
 htdocs/admin/modulehelp.php          | 18 ++++++++++--------
 htdocs/core/modules/modHRM.class.php |  5 ++++-
 htdocs/langs/en_US/admin.lang        |  2 ++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 5b428443248..3fe6addea2d 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -1,12 +1,5 @@
 <?php
-/* Copyright (C) 2003-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2003       Jean-Louis Bergamo      <jlb@j1b.org>
- * Copyright (C) 2004-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
- * Copyright (C) 2011       Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+/* Copyright (C) 2017  Laurent Destailleur     <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -343,6 +336,15 @@ if ($mode == 'desc')
 
 if ($mode == 'feature')
 {
+    $text.='<br><strong>'.$langs->trans("DependsOn").':</strong> ';
+    if (count($objMod->requiredby)) $text.=join(',', $objMod->depends);
+	else $text.=$langs->trans("None");
+    $text.='<br><strong>'.$langs->trans("RequiredBy").':</strong> ';
+	if (count($objMod->requiredby)) $text.=join(',', $objMod->requiredby);
+	else $text.=$langs->trans("None");
+	
+    $text.='<br><br><br>';
+    
     $text.='<strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
     if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
     {
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 5cbb282424a..74a0107aedb 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -52,7 +52,10 @@ class modHRM extends DolibarrModules
 		
 		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
 		$this->special = 0;
-		// $this->picto = '';
+	    // Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto='generic';
 		
 		// define triggers
 		$this->module_parts = array();
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b3f43698843..1d16fefa959 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -425,6 +425,8 @@ Use3StepsApproval=By default, Purchase Orders need to be created and approved by
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account). 
 ClickToShowDescription=Click to show description
+DependsOn=This module need the module(s)
+RequiredBy=This module is required by module(s)
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management

From da1427ef5411a38ce9956965d8e785c4999653cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 30 Mar 2017 16:00:53 +0200
Subject: [PATCH 0508/1163] Work on 6.0 look and feel

---
 htdocs/comm/mailing/list.php | 29 +++++++-------
 htdocs/opensurvey/list.php   | 52 ++++++++++++++----------
 htdocs/resource/list.php     | 39 +++++++++---------
 htdocs/user/hierarchy.php    | 16 ++++----
 htdocs/user/index.php        | 76 ++++++++++++++++++------------------
 5 files changed, 114 insertions(+), 98 deletions(-)

diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 2d6fae37b98..622783d7ca5 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -122,18 +122,7 @@ if ($result)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-    print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"m.rowid",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"m.titre",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"m.date_creat",$param,"",'align="center"',$sortfield,$sortorder);
-	if (! $filteremail) print_liste_field_titre($langs->trans("NbOfEMails"),$_SERVER["PHP_SELF"],"m.nbemail",$param,"",'align="center"',$sortfield,$sortorder);
-	if (! $filteremail) print_liste_field_titre($langs->trans("DateLastSend"),$_SERVER["PHP_SELF"],"m.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
-	else print_liste_field_titre($langs->trans("DateSending"),$_SERVER["PHP_SELF"],"mc.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],($filteremail?"mc.statut":"m.statut"),$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat maxwidth50" name="sref" value="'.dol_escape_htmltag($sref).'">';
 	print '</td>';
@@ -151,8 +140,18 @@ if ($result)
 	print '</td>';
 	print "</tr>\n";
 
-	$var=True;
-
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"m.rowid",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"m.titre",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"m.date_creat",$param,"",'align="center"',$sortfield,$sortorder);
+	if (! $filteremail) print_liste_field_titre($langs->trans("NbOfEMails"),$_SERVER["PHP_SELF"],"m.nbemail",$param,"",'align="center"',$sortfield,$sortorder);
+	if (! $filteremail) print_liste_field_titre($langs->trans("DateLastSend"),$_SERVER["PHP_SELF"],"m.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
+	else print_liste_field_titre($langs->trans("DateSending"),$_SERVER["PHP_SELF"],"mc.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],($filteremail?"mc.statut":"m.statut"),$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print "</tr>\n";
+	
+	
 	$email=new Mailing($db);
 
 	while ($i < min($num,$limit))
@@ -161,7 +160,7 @@ if ($result)
 
 		$var=!$var;
 
-		print "<tr ".$bc[$var].">";
+		print "<tr>";
 		print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$obj->rowid.'">';
 		print img_object($langs->trans("ShowEMail"),"email").' '.stripslashes($obj->rowid).'</a></td>';
 		print '<td>'.$obj->titre.'</td>';
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 9a95797736d..203602bde6e 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -33,8 +33,9 @@ if (!$user->rights->opensurvey->read) accessforbidden();
 $action=GETPOST('action');
 $id=GETPOST('id','alpha');
 $numsondage= $id;
-$surveytitle=GETPOST('surveytitle');
-$status=GETPOST('status');
+$search_ref = GETPOST('search_ref', 'alpha');
+$surveytitle=GETPOST('surveytitle', 'alpha');
+$status=GETPOST('status', 'int');
 //if (! isset($_POST['status']) && ! isset($_GET['status'])) $status='opened';	// If filter unknown, we choose 'opened'
 
 $sortfield = GETPOST("sortfield",'alpha');
@@ -61,6 +62,7 @@ if (GETPOST('button_removefilter'))
 {
 	$status='';
 	$surveytitle='';
+	$search_ref='';
 }
 
 
@@ -93,19 +95,8 @@ $moreforfilter = '';
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-print '<tr class="liste_titre">';
-print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.id_sondage",$param,"","",$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Title"), $_SERVER["PHP_SELF"], "p.titre",$param,"","",$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Type"));
-print_liste_field_titre($langs->trans("Author"), $_SERVER["PHP_SELF"], "u.".$fieldtosortuser,$param,"","",$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("NbOfVoters"));
-print_liste_field_titre($langs->trans("ExpireDate"), $_SERVER["PHP_SELF"], "p.date_fin",$param,"",'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"], "p.status",$param,"",'align="center"',$sortfield,$sortorder);
-print_liste_field_titre('');
-print '</tr>'."\n";
-
-print '<tr class="liste_titre">';
-print '<td class="liste_titre"></td>';
+print '<tr class="liste_titre_filter">';
+print '<td class="liste_titre"><input type="text" class="maxwidth100" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
 print '<td class="liste_titre"><input type="text" class="maxwidth100onsmartphone" name="surveytitle" value="'.dol_escape_htmltag($surveytitle).'"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
@@ -119,6 +110,17 @@ print $searchpitco;
 print '</td>';
 print '</tr>'."\n";
 
+print '<tr class="liste_titre">';
+print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.id_sondage", $param,"","",$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Title"), $_SERVER["PHP_SELF"], "p.titre", $param,"","",$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Type"));
+print_liste_field_titre($langs->trans("Author"), $_SERVER["PHP_SELF"], "u.".$fieldtosortuser, $param,"","",$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("NbOfVoters"), $_SERVER["PHP_SELF"], "", $param,"",'align="right"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("ExpireDate"), $_SERVER["PHP_SELF"], "p.date_fin", $param,"",'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"], "p.status", $param,"",'align="center"',$sortfield,$sortorder);
+print_liste_field_titre('');
+print '</tr>'."\n";
+
 $sql = "SELECT p.id_sondage, p.fk_user_creat, p.format, p.date_fin, p.status, p.titre, p.nom_admin,";
 $sql.= " u.login, u.firstname, u.lastname";
 $sql.= " FROM ".MAIN_DB_PREFIX."opensurvey_sondage as p";
@@ -133,9 +135,20 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql.= " WHERE p.entity = ".getEntity('survey',1);
 if ($status == 'expired') $sql.=" AND date_fin < '".$db->idate($now)."'";
 if ($status == 'opened') $sql.=" AND date_fin >= '".$db->idate($now)."'";
-if ($surveytitle) $sql.=" AND titre LIKE '%".$db->escape($surveytitle)."%'";
+if ($search_ref) $sql.=natural_search("p.id_sondage", $search_ref);
+if ($surveytitle) $sql.=natural_search("p.titre", $surveytitle);
+
 $sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+}
+
+$sql.= $db->plimit($limit + 1,$offset);
 
 $resql=$db->query($sql);
 if (! $resql) dol_print_error($db);
@@ -159,8 +172,7 @@ while ($i < min($num,$limit))
 	$opensurvey_static->id=$obj->id_sondage;
 	$opensurvey_static->status=$obj->status;
 	
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	print '<tr>';
 	print '<td>';
 	print '<a href="'.dol_buildpath('/opensurvey/card.php',1).'?id='.$obj->id_sondage.'">'.img_picto('','object_opensurvey').' '.$obj->id_sondage.'</a>';
 	print '</td><td>'.dol_htmlentities($obj->titre).'</td><td>';
@@ -184,7 +196,7 @@ while ($i < min($num,$limit))
 
 	print '</td>';
 
-	print'<td align="center">'.$nbuser.'</td>'."\n";
+	print'<td align="right">'.$nbuser.'</td>'."\n";
 	
 	print '<td align="center">'.dol_print_date($db->jdate($obj->date_fin),'day');
 	if ($db->jdate($obj->date_fin) < time()) { print ' ('.$langs->trans("Expired").')'; }
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 2c97b68f7ed..5a3d5390bb0 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -194,25 +194,7 @@ $moreforfilter = '';
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-print '<tr class="liste_titre">';
-if (! empty($arrayfields['t.ref']['checked']))           print_liste_field_titre($arrayfields['t.ref']['label'],$_SERVER["PHP_SELF"],"t.ref","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['ty.label']['checked']))        print_liste_field_titre($arrayfields['ty.label']['label'],$_SERVER["PHP_SELF"],"t.code","",$param,"",$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-	foreach($extrafields->attribute_label as $key => $val)
-	{
-		if (! empty($arrayfields["ef.".$key]['checked']))
-		{
-			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-		}
-	}
-}
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-print "</tr>\n";
-
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 if (! empty($arrayfields['t.ref']['checked']))
 {
 	print '<td class="liste_titre">';
@@ -255,6 +237,25 @@ print $searchpitco;
 print '</td>';
 print "</tr>\n";
 
+print '<tr class="liste_titre">';
+if (! empty($arrayfields['t.ref']['checked']))           print_liste_field_titre($arrayfields['t.ref']['label'],$_SERVER["PHP_SELF"],"t.ref","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['ty.label']['checked']))        print_liste_field_titre($arrayfields['ty.label']['label'],$_SERVER["PHP_SELF"],"t.code","",$param,"",$sortfield,$sortorder);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        if (! empty($arrayfields["ef.".$key]['checked']))
+        {
+            $align=$extrafields->getAlignFlag($key);
+            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+        }
+    }
+}
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print "</tr>\n";
+
+
 if ($ret)
 {
     foreach ($object->lines as $resource)
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 888d4ca5317..734b1aa0d14 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -144,14 +144,8 @@ print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'"
 $param="search_statut=".$search_statut;
 
 print '<table class="liste nohover" width="100%">';
-print '<tr class="liste_titre">';
-print_liste_field_titre($langs->trans("HierarchicView"));
-print_liste_field_titre('<div id="iddivjstreecontrol"><a href="#">'.img_picto('','object_category').' '.$langs->trans("UndoExpandAll").'</a> | <a href="#">'.img_picto('','object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div>',$_SERVER['PHP_SELF'],"",'',"",'align="center"');
-print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"",'',"",'align="right"');
-print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','','','','maxwidthsearch ');
-print '</tr>';
 
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 // Status
@@ -164,6 +158,14 @@ print $searchpitco;
 print '</td>';
 print '</tr>';
 
+print '<tr class="liste_titre">';
+print_liste_field_titre($langs->trans("HierarchicView"));
+print_liste_field_titre('<div id="iddivjstreecontrol"><a href="#">'.img_picto('','object_category').' '.$langs->trans("UndoExpandAll").'</a> | <a href="#">'.img_picto('','object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div>',$_SERVER['PHP_SELF'],"",'',"",'align="center"');
+print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"",'',"",'align="right"');
+print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','','','','maxwidthsearch ');
+print '</tr>';
+
+
 $nbofentries=(count($data) - 1);
 
 if ($nbofentries > 0)
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 60defe580a7..3e1da6a7431 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -174,6 +174,7 @@ if (empty($reshook))
  * View
  */
 
+$user2=new User($db);
 
 $buttonviewhierarchy='<form action="'.DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : '').'" method="POST"><input type="submit" class="button" style="width:120px" name="viewcal" value="'.dol_escape_htmltag($langs->trans("HierarchicView")).'"></form>';
 
@@ -315,43 +316,8 @@ $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfiel
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-print '<tr class="liste_titre">';
-if (! empty($arrayfields['u.login']['checked']))          print_liste_field_titre($langs->trans("Login"),$_SERVER['PHP_SELF'],"u.login",$param,"","",$sortfield,$sortorder);
-if (! empty($arrayfields['u.lastname']['checked']))       print_liste_field_titre($langs->trans("Lastname"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder);
-if (! empty($arrayfields['u.firstname']['checked']))      print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder);
-if (! empty($arrayfields['u.gender']['checked']))         print_liste_field_titre($langs->trans("Gender"),$_SERVER['PHP_SELF'],"u.gender",$param,"","",$sortfield,$sortorder);
-if (! empty($arrayfields['u.employee']['checked']))       print_liste_field_titre($langs->trans("Employee"),$_SERVER['PHP_SELF'],"u.employee",$param,"","",$sortfield,$sortorder);
-if (! empty($arrayfields['u.accountancy_code']['checked'])) print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER['PHP_SELF'],"u.accountancy_code",$param,"","",$sortfield,$sortorder);
-if (! empty($arrayfields['u.email']['checked']))          print_liste_field_titre($langs->trans("EMail"),$_SERVER['PHP_SELF'],"u.email",$param,"","",$sortfield,$sortorder);
-if (! empty($arrayfields['u.fk_soc']['checked']))         print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_soc",$param,"","",$sortfield,$sortorder);
-if (! empty($arrayfields['u.entity']['checked']))         print_liste_field_titre($langs->trans("Entity"),$_SERVER['PHP_SELF'],"u.entity",$param,"","",$sortfield,$sortorder);
-if (! empty($arrayfields['u.fk_user']['checked']))        print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u.fk_user",$param,"","",$sortfield,$sortorder);
-if (! empty($arrayfields['u.datelastlogin']['checked']))  print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['u.datepreviouslogin']['checked'])) print_liste_field_titre($langs->trans("PreviousConnexion"),$_SERVER['PHP_SELF'],"u.datepreviouslogin",$param,"",'align="center"',$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val)
-   {
-       if (! empty($arrayfields["ef.".$key]['checked']))
-       {
-			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['u.datec']['checked']))  print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"u.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['u.tms']['checked']))    print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"u.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['u.statut']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"u.statut","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-print "</tr>\n";
-
 // Search bar
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 if (! empty($arrayfields['u.login']['checked']))
 {
     print '<td class="liste_titre"><input type="text" name="search_login" size="6" value="'.$search_login.'"></td>';
@@ -459,7 +425,43 @@ print '</td>';
 
 print "</tr>\n";
 
-$user2=new User($db);
+
+print '<tr class="liste_titre">';
+if (! empty($arrayfields['u.login']['checked']))          print_liste_field_titre($langs->trans("Login"),$_SERVER['PHP_SELF'],"u.login",$param,"","",$sortfield,$sortorder);
+if (! empty($arrayfields['u.lastname']['checked']))       print_liste_field_titre($langs->trans("Lastname"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder);
+if (! empty($arrayfields['u.firstname']['checked']))      print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder);
+if (! empty($arrayfields['u.gender']['checked']))         print_liste_field_titre($langs->trans("Gender"),$_SERVER['PHP_SELF'],"u.gender",$param,"","",$sortfield,$sortorder);
+if (! empty($arrayfields['u.employee']['checked']))       print_liste_field_titre($langs->trans("Employee"),$_SERVER['PHP_SELF'],"u.employee",$param,"","",$sortfield,$sortorder);
+if (! empty($arrayfields['u.accountancy_code']['checked'])) print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER['PHP_SELF'],"u.accountancy_code",$param,"","",$sortfield,$sortorder);
+if (! empty($arrayfields['u.email']['checked']))          print_liste_field_titre($langs->trans("EMail"),$_SERVER['PHP_SELF'],"u.email",$param,"","",$sortfield,$sortorder);
+if (! empty($arrayfields['u.fk_soc']['checked']))         print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_soc",$param,"","",$sortfield,$sortorder);
+if (! empty($arrayfields['u.entity']['checked']))         print_liste_field_titre($langs->trans("Entity"),$_SERVER['PHP_SELF'],"u.entity",$param,"","",$sortfield,$sortorder);
+if (! empty($arrayfields['u.fk_user']['checked']))        print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u.fk_user",$param,"","",$sortfield,$sortorder);
+if (! empty($arrayfields['u.datelastlogin']['checked']))  print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['u.datepreviouslogin']['checked'])) print_liste_field_titre($langs->trans("PreviousConnexion"),$_SERVER['PHP_SELF'],"u.datepreviouslogin",$param,"",'align="center"',$sortfield,$sortorder);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        if (! empty($arrayfields["ef.".$key]['checked']))
+        {
+            $align=$extrafields->getAlignFlag($key);
+            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+        }
+    }
+}
+// Hook fields
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['u.datec']['checked']))  print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"u.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['u.tms']['checked']))    print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"u.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['u.statut']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"u.statut","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print "</tr>\n";
+
+
 
 $i = 0;
 while ($i < min($num,$limit))

From 979bcd3a9b225c7e7e6b672a4fb8b6ea390f2240 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 31 Mar 2017 11:39:12 +0200
Subject: [PATCH 0509/1163] NEW Can add a background image on login page

---
 htdocs/admin/company.php                      |  40 ++--
 htdocs/admin/ihm.php                          | 181 ++++++++++++++++--
 htdocs/cashdesk/index.php                     |   2 +-
 htdocs/cashdesk/tpl/ticket.tpl.php            |   2 +-
 htdocs/core/lib/files.lib.php                 |   2 +-
 htdocs/core/lib/security2.lib.php             |   4 +-
 htdocs/core/menus/standard/auguria.lib.php    |   2 +-
 htdocs/core/menus/standard/eldy.lib.php       |   4 +-
 htdocs/core/tpl/login.tpl.php                 |  28 ++-
 htdocs/core/tpl/passwordforgotten.tpl.php     |  26 +--
 .../mycompany/background_computer_coffee.jpg  | Bin 0 -> 385205 bytes
 htdocs/langs/en_US/admin.lang                 |   2 +
 htdocs/margin/tabs/productMargins.php         |   2 +-
 htdocs/opensurvey/fonctions.php               |   2 +-
 htdocs/product/document.php                   |   3 +-
 htdocs/product/fournisseurs.php               |   5 +-
 htdocs/product/info.php                       |   3 +-
 htdocs/product/note.php                       |   2 +-
 htdocs/product/price.php                      |   3 +-
 htdocs/product/stock/product.php              |   3 +-
 htdocs/public/members/new.php                 |   4 +-
 htdocs/public/paybox/newpayment.php           |   4 +-
 htdocs/public/paypal/newpayment.php           |   4 +-
 htdocs/theme/eldy/style.css.php               |  17 +-
 htdocs/theme/md/style.css.php                 |  16 +-
 htdocs/user/passwordforgotten.php             |   4 +-
 htdocs/viewimage.php                          |   4 +-
 27 files changed, 270 insertions(+), 99 deletions(-)
 create mode 100644 htdocs/install/doctemplates/mycompany/background_computer_coffee.jpg

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 0f8efb23da0..d73f23d0ef7 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -51,8 +52,6 @@ $error=0;
 if ( ($action == 'update' && empty($_POST["cancel"]))
 || ($action == 'updateedit') )
 {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
 	$tmparray=getCountry(GETPOST('country_id','int'),'all',$db,$langs,0);
 	if (! empty($tmparray['id']))
 	{
@@ -76,21 +75,23 @@ if ( ($action == 'update' && empty($_POST["cancel"]))
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_WEB",$_POST["web"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOTE",$_POST["note"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GENCOD",$_POST["barcode"],'chaine',0,'',$conf->entity);
-	if ($_FILES["logo"]["tmp_name"])
+	
+	$varforimage='logo'; $dirforimage=$conf->mycompany->dir_output.'/logos/';
+	if ($_FILES[$varforimage]["tmp_name"])
 	{
-		if (preg_match('/([^\\/:]+)$/i',$_FILES["logo"]["name"],$reg))
+		if (preg_match('/([^\\/:]+)$/i',$_FILES[$varforimage]["name"],$reg))
 		{
 			$original_file=$reg[1];
 
 			$isimage=image_format_supported($original_file);
 			if ($isimage >= 0)
 			{
-				dol_syslog("Move file ".$_FILES["logo"]["tmp_name"]." to ".$conf->mycompany->dir_output.'/logos/'.$original_file);
-				if (! is_dir($conf->mycompany->dir_output.'/logos/'))
+				dol_syslog("Move file ".$_FILES[$varforimage]["tmp_name"]." to ".$dirforimage.$original_file);
+				if (! is_dir($dirforimage))
 				{
-					dol_mkdir($conf->mycompany->dir_output.'/logos/');
+					dol_mkdir($dirforimage);
 				}
-				$result=dol_move_uploaded_file($_FILES["logo"]["tmp_name"],$conf->mycompany->dir_output.'/logos/'.$original_file,1,0,$_FILES['logo']['error']);
+				$result=dol_move_uploaded_file($_FILES[$varforimage]["tmp_name"],$dirforimage.$original_file,1,0,$_FILES[$varforimage]['error']);
 				if ($result > 0)
 				{
 					dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO",$original_file,'chaine',0,'',$conf->entity);
@@ -101,8 +102,8 @@ if ( ($action == 'update' && empty($_POST["cancel"]))
 					    // Create thumbs
 					    //$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get... 
 					    	
-						// Used on logon for example
-						$imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+						// Create small thumb, Used on logon for example
+						$imgThumbSmall = vignette($dirforimage.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
 						if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbSmall,$reg))
 						{
 							$imgThumbSmall = $reg[1];    // Save only basename
@@ -110,9 +111,8 @@ if ( ($action == 'update' && empty($_POST["cancel"]))
 						}
 						else dol_syslog($imgThumbSmall);
 
-						// Create mini thumbs for company (Ratio is near 16/9)
-						// Used on menu or for setup page for example
-						$imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
+						// Create mini thumb, Used on menu or for setup page for example
+						$imgThumbMini = vignette($dirforimage.$original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
 						if (image_format_supported($imgThumbMini) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbMini,$reg))
 						{
 							$imgThumbMini = $reg[1];     // Save only basename
@@ -143,6 +143,7 @@ if ( ($action == 'update' && empty($_POST["cancel"]))
 			}
 		}
 	}
+	
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MANAGERS",$_POST["MAIN_INFO_SOCIETE_MANAGERS"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_CAPITAL",$_POST["capital"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FORME_JURIDIQUE",$_POST["forme_juridique_code"],'chaine',0,'',$conf->entity);
@@ -196,7 +197,7 @@ if ( ($action == 'update' && empty($_POST["cancel"]))
 	}
 }
 
-if ($action == 'addthumb')
+if ($action == 'addthumb')  // Regenerate thumbs
 {
 	if (file_exists($conf->mycompany->dir_output.'/logos/'.$_GET["file"]))
 	{
@@ -208,7 +209,7 @@ if ($action == 'addthumb')
 		    // Create thumbs
 		    //$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get... 
 
-			// Used on logon for example
+			// Create small thumb. Used on logon for example
 			$imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthsmall, $maxheightsmall, '_small',$quality);
 			if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbSmall,$reg))
 			{
@@ -217,8 +218,7 @@ if ($action == 'addthumb')
 			}
 			else dol_syslog($imgThumbSmall);
 
-			// Create mini thumbs for company (Ratio is near 16/9)
-			// Used on menu or for setup page for example
+			// Create mini thumbs. Used on menu or for setup page for example
 			$imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthmini, $maxheightmini, '_mini',$quality);
 			if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbMini,$reg))
 			{
@@ -300,7 +300,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		  });';
 	print '</script>'."\n";
 
-	print '<form enctype="multipart/form-data" method="post" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
+	print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="update">';
 	$var=true;
@@ -383,7 +383,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print '<a href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete")).'</a>';
 		if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
 			print ' &nbsp; ';
-			print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_mini).'">';
+			print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('/thumbs/'.$mysoc->logo_mini).'">';
 		}
 	} else {
 		print '<img height="30" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
@@ -775,7 +775,7 @@ else
 	}
 	else if ($mysoc->logo_mini && is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
 	{
-		print '<img class="img_logo" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_mini).'">';
+		print '<img class="img_logo" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('/thumbs/'.$mysoc->logo_mini).'">';
 	}
 	else
 	{
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 83f6701e2a1..ff3bb89946b 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -26,6 +26,8 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
@@ -70,6 +72,26 @@ if (GETPOST('cancel'))
     $action='';
 }
 
+if ($action == 'removebackgroundlogin' && ! empty($conf->global->MAIN_LOGIN_BACKGROUND))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    $logofile=$conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_LOGIN_BACKGROUND;
+    dol_delete_file($logofile);
+    dolibarr_del_const($db, "MAIN_LOGIN_BACKGROUND",$conf->entity);
+    $mysoc->logo='';
+
+    /*$logosmallfile=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
+    dol_delete_file($logosmallfile);
+    dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$conf->entity);
+    $mysoc->logo_small='';
+
+    $logominifile=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini;
+    dol_delete_file($logominifile);
+    dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$conf->entity);
+    $mysoc->logo_mini='';*/
+}
+
 if ($action == 'update')
 {
 	dolibarr_set_const($db, "MAIN_LANG_DEFAULT",				$_POST["main_lang_default"],'chaine',0,'',$conf->entity);
@@ -123,6 +145,78 @@ if ($action == 'update')
 	// This one is not always defined
 	if (isset($_POST["MAIN_USE_PREVIEW_TABS"])) dolibarr_set_const($db, "MAIN_USE_PREVIEW_TABS", $_POST["MAIN_USE_PREVIEW_TABS"],'chaine',0,'',$conf->entity);
 
+	$varforimage='imagebackground'; $dirforimage=$conf->mycompany->dir_output.'/logos/';
+	if ($_FILES[$varforimage]["tmp_name"])
+	{
+	    if (preg_match('/([^\\/:]+)$/i',$_FILES[$varforimage]["name"],$reg))
+	    {
+	        $original_file=$reg[1];
+	
+	        $isimage=image_format_supported($original_file);
+	        if ($isimage >= 0)
+	        {
+	            dol_syslog("Move file ".$_FILES[$varforimage]["tmp_name"]." to ".$dirforimage.$original_file);
+	            if (! is_dir($dirforimage))
+	            {
+	                dol_mkdir($dirforimage);
+	            }
+	            $result=dol_move_uploaded_file($_FILES[$varforimage]["tmp_name"],$dirforimage.$original_file,1,0,$_FILES[$varforimage]['error']);
+	            if ($result > 0)
+	            {
+	                dolibarr_set_const($db, "MAIN_LOGIN_BACKGROUND",$original_file,'chaine',0,'',$conf->entity);
+	
+	                // Create thumbs of logo (Note that PDF use original file and not thumbs)
+	                /*
+	                if ($isimage > 0)
+	                {
+	                    // Create thumbs
+	                    //$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
+	
+	                    // Create small thumb, Used on logon for example
+	                    $imgThumbSmall = vignette($dirforimage.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+	                    if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbSmall,$reg))
+	                    {
+	                        $imgThumbSmall = $reg[1];    // Save only basename
+	                        dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$imgThumbSmall,'chaine',0,'',$conf->entity);
+	                    }
+	                    else dol_syslog($imgThumbSmall);
+	
+	                    // Create mini thumb, Used on menu or for setup page for example
+	                    $imgThumbMini = vignette($dirforimage.$original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
+	                    if (image_format_supported($imgThumbMini) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbMini,$reg))
+	                    {
+	                        $imgThumbMini = $reg[1];     // Save only basename
+	                        dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$imgThumbMini,'chaine',0,'',$conf->entity);
+	                    }
+	                    else dol_syslog($imgThumbMini);
+	                }
+	                else dol_syslog("ErrorImageFormatNotSupported",LOG_WARNING);
+	                */
+	            }
+	            else if (preg_match('/^ErrorFileIsInfectedWithAVirus/',$result))
+	            {
+	                $error++;
+	                $langs->load("errors");
+	                $tmparray=explode(':',$result);
+	                setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus',$tmparray[1]), null, 'errors');
+	            }
+	            else
+	            {
+	                $error++;
+	                setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
+	            }
+	        }
+	        else
+	        {
+	            $error++;
+	            $langs->load("errors");
+	            setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
+	        }
+	    }
+	}
+	
+	
+	
 	$_SESSION["mainmenu"]="";   // Le gestionnaire de menu a pu changer
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
@@ -152,7 +246,7 @@ if ($action == 'edit')	// Edit
     //WYSIWYG Editor
     require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+    print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="update">';
 
@@ -160,7 +254,7 @@ if ($action == 'edit')	// Edit
     
     print '<br>';
     print '<table summary="edit" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
+    print '<tr class="liste_titre"><td>'.$langs->trans("Language").'</td><td></td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
@@ -315,14 +409,6 @@ if ($action == 'edit')	// Edit
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 	
-	// Message on login page
-    print '<tr><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
-
-    $doleditor = new DolEditor('main_home', (isset($conf->global->MAIN_HOME)?$conf->global->MAIN_HOME:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
-	$doleditor->Create();
-
-	print '</td></tr>'."\n";
-
 	// Message of the day on home page
     print '<tr><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
 
@@ -333,6 +419,40 @@ if ($action == 'edit')	// Edit
 
 	print '</table>'."\n";
 
+	print '<br>';
+	
+	// Other
+	print '<table summary="edit" class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td width="35%">'.$langs->trans("LoginPage").'</td><td></td>';
+	print '<td width="20">&nbsp;</td>';
+	print '</tr>';
+	
+	// Message on login page
+	print '<tr><td>'.$langs->trans("MessageLogin").'</td><td colspan="2">';
+	$doleditor = new DolEditor('main_home', (isset($conf->global->MAIN_HOME)?$conf->global->MAIN_HOME:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
+	$doleditor->Create();
+	print '</td></tr>'."\n";
+	
+	// Logo
+	$var=!$var;
+	print '<tr'.dol_bc($var,'hideonsmartphone').'><td><label for="imagebackground">'.$langs->trans("BackgroundImageLogin").' (png,jpg)</label></td><td colspan="2">';
+	print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
+	print '<input type="file" class="flat class=minwidth200" name="imagebackground" id="imagebackground">';
+	print '</td><td class="nocellnopadd" valign="middle" align="right">';
+	if (! empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
+	    print '<a href="'.$_SERVER["PHP_SELF"].'?action=removebackgroundlogin">'.img_delete($langs->trans("Delete")).'</a>';
+	    if (file_exists($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_LOGIN_BACKGROUND)) {
+	        print ' &nbsp; ';
+	        print '<img width="100px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('/'.$conf->global->MAIN_LOGIN_BACKGROUND).'">';
+	    }
+	} else {
+	    print '<img width="100" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+	}
+	print '</td></tr></table>';
+	print '</td></tr>';
+	
+	print '</table>'."\n";
+	
 
     print '<br><div class="center">';
     print '<input class="button" type="submit" name="submit" value="'.$langs->trans("Save").'">';
@@ -346,7 +466,7 @@ else	// Show
 {
     // Language
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td><td>&nbsp;</td></tr>';
+    print '<tr class="liste_titre"><td>'.$langs->trans("Language").'</td><td></td><td>&nbsp;</td></tr>';
 
     print '<tr class="oddeven"><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
     $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
@@ -486,12 +606,6 @@ else	// Show
     print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0),1);
     print '</td></tr>';
 
-	// Message login
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
-    if (isset($conf->global->MAIN_HOME)) print dol_htmlcleanlastbr($conf->global->MAIN_HOME);
-    else print '&nbsp;';
-    print '</td></tr>'."\n";
-
     // Message of the day
     print '<tr class="oddeven"><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
     if (isset($conf->global->MAIN_MOTD)) print dol_htmlcleanlastbr($conf->global->MAIN_MOTD);
@@ -500,6 +614,39 @@ else	// Show
 
     print '</table>'."\n";
 
+    print '<br>';
+    
+    // Login page
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre"><td>'.$langs->trans("LoginPage").'</td><td></td><td>&nbsp;</td></tr>';
+
+    // Message login
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
+    if (isset($conf->global->MAIN_HOME)) print dol_htmlcleanlastbr($conf->global->MAIN_HOME);
+    else print '&nbsp;';
+    print '</td></tr>'."\n";
+    
+    // Background login
+    // Logo
+    $var=!$var;
+    print '<tr class="oddeven"><td>'.$langs->trans("BackgroundImageLogin").'</td><td colspan="2">';
+    print '<div class="tagtable centpercent"><div class="tagtr inline-block centpercent valignmiddle"><div class="tagtd inline-block valignmiddle left">';
+    print $conf->global->MAIN_LOGIN_BACKGROUND;
+    print '</div><div class="tagtd inline-block valignmiddle left">';
+    // It offers the generation of the thumbnail if it does not exist
+    if ($conf->global->MAIN_LOGIN_BACKGROUND && is_file($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_LOGIN_BACKGROUND))
+    {
+        print '<img class="img_logo" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($conf->global->MAIN_LOGIN_BACKGROUND).'">';
+    }
+    else
+    {
+        print '<img class="img_logo" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+    }
+    print '</div></div></div>';
+    print '</td></tr>';
+    
+    print '</table>'."\n";
+    
     print '<div class="tabsAction">';
     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
     print '</div>';
diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php
index 9a61a50b38a..8f6af8b6d4d 100644
--- a/htdocs/cashdesk/index.php
+++ b/htdocs/cashdesk/index.php
@@ -63,7 +63,7 @@ top_htmlhead('','',0,0,'',$arrayofcss);
 <?php
 if (! empty($mysoc->logo_small))
 {
-    print '<img class="logopos" alt="Logo company" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small).'">';
+    print '<img class="logopos" alt="Logo company" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small).'">';
 }
 else
 {
diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php
index 78ce86f45f7..40be470c429 100644
--- a/htdocs/cashdesk/tpl/ticket.tpl.php
+++ b/htdocs/cashdesk/tpl/ticket.tpl.php
@@ -37,7 +37,7 @@ $object->fetch($facid);
 
 <div class="entete">
     <div class="logo">
-        <?php print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small).'">'; ?>
+        <?php print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small).'">'; ?>
     </div>
     <div class="infos">
         <p class="address"><?php echo $mysoc->name; ?><br>
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 1cb4da03488..0d4c1dff71e 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1590,7 +1590,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	$relative_original_file = $original_file;
 	
 	// Wrapping for some images
-	if ($modulepart == 'companylogo' && !empty($conf->mycompany->dir_output))
+	if (($modulepart == 'mycompany' || $modulepart == 'companylogo') && !empty($conf->mycompany->dir_output))
 	{
 		$accessallowed=1;
 		$original_file=$conf->mycompany->dir_output.'/logos/'.$original_file;
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index fc05e2c9194..cadf133169d 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -227,11 +227,11 @@ function dol_loginfunction($langs,$conf,$mysoc)
 
 	if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 	{
-		$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode('thumbs/'.$mysoc->logo_small);
+		$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('thumbs/'.$mysoc->logo_small);
 	}
 	elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 	{
-		$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode($mysoc->logo);
+		$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode($mysoc->logo);
 		$width=128;
 	}
 	elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'))
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 2c2d2c5ec63..e95359e5683 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -257,7 +257,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 		$mysoc->logo_mini=$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
 		if (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
 		{
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode('thumbs/'.$mysoc->logo_mini);
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('thumbs/'.$mysoc->logo_mini);
 		}
 		else
 		{
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 178f1ca9db7..ccf6902a289 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -466,7 +466,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 		$mysoc->logo_mini=$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
 		if (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
 		{
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode('thumbs/'.$mysoc->logo_mini);
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('thumbs/'.$mysoc->logo_mini);
 		}
 		else
 		{
@@ -478,7 +478,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 		print '<div class="menu_titre" id="menu_titre_logo"></div>';
 		print '<div class="menu_top" id="menu_top_logo"></div>';
 		print '<div class="menu_contenu" id="menu_contenu_logo">';
-		print '<div class="center"><img class="companylogo" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 80%"></div>'."\n";
+		print '<div class="center"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 80%"></div>'."\n";
 		print '</div>';
 		print '<div class="menu_end" id="menu_end_logo"></div>';
 		print '</div>'."\n";
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index e0aa28ce2d6..a23d14a979d 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -45,7 +45,7 @@ print top_htmlhead('', $titleofloginpage, 0, 0, $arrayofjs, array(), 0, $disable
 ?>
 <!-- BEGIN PHP TEMPLATE LOGIN.TPL.PHP -->
 
-<body class="body bodylogin">
+<body class="body bodylogin"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND)?'':' style="background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file='.urlencode($conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
 
 <?php if (empty($conf->dol_use_jmobile)) { ?>
 <script type="text/javascript">
@@ -56,7 +56,7 @@ $(document).ready(function () {
 </script>
 <?php } ?>
 
-<div class="center">
+<div class="login_center center">
 <div class="login_vertical_align">
 
 <form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
@@ -76,16 +76,6 @@ $(document).ready(function () {
 <input type="hidden" name="dol_no_mouse_hover" id="dol_no_mouse_hover" value="<?php echo $dol_no_mouse_hover; ?>" />
 <input type="hidden" name="dol_use_jmobile" id="dol_use_jmobile" value="<?php echo $dol_use_jmobile; ?>" />
 
-<table class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
-<tr class="vmenu"><td class="center">
-<?php
-if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
-echo dol_escape_htmltag($title); 
-if ($disablenofollow) echo '</a>';
-?>
-</td></tr>
-</table>
-<br>
 
 <div class="login_table">
 
@@ -159,9 +149,6 @@ if (! empty($hookmanager->resArray['options'])) {
 </div> <!-- end div left -->
 
 
-
-
-
 </div>
 
 <div id="login_line2" style="clear: both">
@@ -226,6 +213,17 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
 
 </div>
 
+
+<!-- Title with version -->
+<div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
+<?php
+if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+echo dol_escape_htmltag($title); 
+if ($disablenofollow) echo '</a>';
+?>
+</div>
+
+
 </form>
 
 
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index b641627b789..8a403d675d7 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -32,7 +32,7 @@ print top_htmlhead('',$langs->trans('SendNewPassword'));
 ?>
 <!-- BEGIN PHP TEMPLATE PASSWORDFORGOTTEN.TPL.PHP -->
 
-<body class="bodylogin">
+<body class="body bodylogin"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND)?'':' style="background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file='.urlencode($conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
 
 <?php if (empty($conf->dol_use_jmobile)) { ?>
 <script type="text/javascript">
@@ -44,24 +44,19 @@ $(document).ready(function () {
 <?php } ?>
 
 
-<div align="center">
+<div class="login_center center">
 <div class="login_vertical_align">
 
-
 <form id="login" name="login" method="POST" action="<?php echo $php_self; ?>">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
 <input type="hidden" name="action" value="buildnewpassword">
 
-<table class="login_table_title center" summary="<?php echo dol_escape_htmltag($title); ?>">
-<tr class="vmenu"><td align="center"><?php echo $title; ?></td></tr>
-</table>
-<br>
+
 
 <div class="login_table">
 
 <div id="login_line1">
 
-
 <div id="login_left">
 
 <img alt="Logo" title="" src="<?php echo $urllogo; ?>" id="img_logo" />
@@ -111,7 +106,7 @@ if (! empty($hookmanager->resArray['options'])) {
 	</span>
 	</td>
 	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>
-	<td><a href="<?php echo $php_self; ?>" tabindex="4" data-role="button"><?php echo $captcha_refresh; ?></a></td>
+	<td><a href="<?php echo $php_self; ?>" tabindex="4"><?php echo $captcha_refresh; ?></a></td>
 	</tr></table>
 
 	</td></tr>
@@ -128,8 +123,8 @@ if (! empty($hookmanager->resArray['options'])) {
 
 <div id="login_line2" style="clear: both">
 
-<!-- Button Send password -->
-<br><input id="password" type="submit" <?php echo $disabled; ?> class="button" name="password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" />
+<!-- Button "Regenerate and Send password" -->
+<br><input type="submit" <?php echo $disabled; ?> class="button" name="password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" />
 
 <br>
 <div align="center" style="margin-top: 8px;">
@@ -148,6 +143,15 @@ if (! empty($hookmanager->resArray['options'])) {
 
 </div>
 
+<!-- Title with version -->
+<div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
+<?php
+if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+echo dol_escape_htmltag($title); 
+if ($disablenofollow) echo '</a>';
+?>
+</div>
+
 </form>
 
 
diff --git a/htdocs/install/doctemplates/mycompany/background_computer_coffee.jpg b/htdocs/install/doctemplates/mycompany/background_computer_coffee.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0a4c8828a585c72cb1df00e127aea7d026c842a3
GIT binary patch
literal 385205
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%0DHvB~0NfFfyTSIAyKD;|F`BX?e-Zxx2H^c7;QoX3
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%0AXb&9{p#9*sl2U{qDt{A5wN=NZTO1|
zPrkJovY4%WQiRh;mL#tEDee3{MUdKPM^mo#ER!9j{{YjMH4(pEV2*V}ZVi0J7|(y0
z4rq*Vl^a;wqH{qUL&Wk69n)f^Bm~yteFxTkH!dGlb1&&X&AvW@E);~l%4%t<KI1~S
zFV7D-{XBk=?ErXGT<uFB^L<tR2^=mKm>MjrneHz)acJfIAE*})0P{Na^9m?)Q2V87
z3Tph!b-#I&qASxXfxvHIx`BykU{e7Nw0;Dr?*tNwfP!V5=<GKi4;96|s_ZhtzBa?M
zjS4TF512m6CQoi=gYu5c9-D<=5H6$}uH118;%=@z0=&kGI9x(RmGdfkl?bGHW~BZ#
zEyz42y9>F@_B|`1ugHkseL(!aoU*K(>bPc$z!YK`2fts4(FaHsB@85)PFd?+o1P@<
zKhz`GL--Hg2XZ)Kq3jX6fg82K_bsT^du~|_o$)a~wiC^u(H^%PO~MZ_nEbM%YQOX#
z%2yF)GQhFf)Dnv*?zudW0`>4;nTR&BxbT|0Uvh-YaXU(t0=fjLREw3Vh!1-4GYC3(
zGt&yB!T$i>USof<?8a2*mzi5G%&R5~UeFu~>fl#9)CU*9{I4?h*5tc*_Y#RxUj(LP
zI+*UiF%V*+MCo5e{TKD-48N}WS4-=d{<qK2_1x#B{RFy$E};ZBf@GbwHVfh+VJqvu
zt@=&~Qub6=<uRM$pQ`?={WOgsPDos!M@!slyGTudQy+_5yOOc>tpHWk60r+5{^sYf
zG%@!_klruIo=aG)&;+*AiOyykg4>C@;%3JDF~R6@aPD4X4bt8r`*3jtV|%%q5$;jB
zd7ZHSSzOHaegrAaH%Iw@6SK(KJ|Ti$uM<^{M?skDnQJkL8^oaemAinX7LqbD{{U!3
zd?z><dV!olYQ5HCQ{va&TL6CZB3$KJpaWS9GuXvakC^2QR&0YpUxV!))))4T%@bA1
z59h?epakrakQcw{Fkt<nbi}}c2H(M*lucOvU~tK;&lS*%E7~aFB!y@%#Z18-95HHO
ztn!x2I?hO|mef~jAQ65-S`=zfz~)vuSC$HCsQosKMdAF!IxSgVRHVMv!}gRO?Z>G>
z<CC<<Oh7Om<=~;)f0<$f_hR`^EVZhhL>)I5jUCNrelrl{cZCS376{3k7Q^lQF#vrA
zk~|4;8MdNap8o){14#KgAhrmOxL>FjEIBXnFT2$a<uOI9twrO0BCdY$V=>i4iTW4T
z{{Tk%zgg?8_3`zcbKB^@qTjCmf#?sCUyFtj<c<O+ZQHcYVDS~DAE{kPg0oY47_UgE
zJ^re$r$^}L>oUsFg-qoXR3=vu?BU#`{=vjs>plK~8U|G?^QZB9mCok>06Jt=3ch~k
zS&_c!R-ba#9+~(+tWT8GyG%CKvaeqw56r4!m2Un}C{WOp@y4Q}hGEK<U0py2FJfO3
z@~NoDc>)EvX1C?su6sa%Fn5CBIn=u@;0UUyE?=5~67?;fCSQcRg2ZsFO+<DYhxR1J
zVslv%tatR!`iVYL8qU4eQ!ei5`w>Cu!!N{SF7pCWU*aLxG3-EijMGJ@)VZmstv}R6
z-PypLF70XcDm0ZVphk?~cV+`eyuyI*%%IVZZ)ts+GmuS0pq!8TgxkJmrjr|V*Ze>U
zZ9)JqA2P4BVx>k9t0;1q!d~3;sZ)4dM!cP-8pMAw$r8DQuBEsg?gg*1-};pC;SI-p
zZ!OdvxRz}<5P`nWC#hJCRGPEg$7uix56q)2Kxmh6reZapl(IjGKw@D30PP&98q7X>
zOY;(s;$Q`w0UQg$)$<b#%1w~$L&{tgP~5=<3)yJF@8UhQy9^>FAFzOVb1cousOAWt
zqkS%4=v=?5{{X?ceOczZU+LWWhqym7;InlGMDHm~!?{+KeaV({-lYrWCcdZWu7>6T
z4>u^)<}7;;s_%c`Wf&?}+bR}rBDazYGD9`na32OS%HiZ<C1sB=@r$Rg=P=8+r2Dys
z3cI=a7#GF+oSA2jp*Y|15(CMmVKLC~L%gVC;wWNTUt7rp+1lgZwFK3NF7c6te5W1Y
z0Ikl`A80i`Lh&BR(y3_pf@yi~dz9_DOj9rqw6ju77rz9uo;5!LX!60K_?0H#1frI{
z<zEvdsj>sp{Ytr%@I&DSs4#Oh=52&@j7ILv&2t^D==mHhsDz31Qz^Ua>QD*b&pj$M
zpaUkDF^I1(h=3_p?1G8my)gpMWBkDa*y$!ZVNaC{m8g93kLC7e+nG0gqN^rr0R}x*
z${!8-hyjBD8i38lfrZt5o{uVr!rG@(2m{In#Qc(_J*8fv7cDJ%6BavKR#i^$iiS|B
zq%OZZ*^aK?$8rQvcT$!Im8paW8pK}t7%TG4i6UixFZBlsRc!mFUBjR<!pKcy5j&zE
ze+L>U77(GeZTmZTgOfz<&BFd($#U2{K+QhtNN6ir<0SONG9|(jSl<~tOX`C5q7+U_
zR-sw^#3o>dw=3a^7)t#c`VXM}8~*?cT~E~CUlQRD5M4xcYnV*K=z?Flrh5l->iGJ3
z==bnt>r%PCK97&^MWGC0FoC946$aVdK_dHhm<__*zg9&`_9*`Vw?BP&n6<kSg}}oU
z^uXB68Kb<ef0%&gT~);8@E)kHkTF1UZ{7<teWCL%oZ=eN<Ba~(ki5Aj6~~%tUs9f8
z5W9*NQg>B~`h>Xr5{}1dh&!B0Q@b*mz`Fw2uEkWNk9_a@f~;w&Pl$kk9vO@++{pRu
zH=*u#1YH8_ku2oyaKGsY8N0u@cuIs?U_IrYrM5epixbLrCyE)#nPpzExE%B_-JjP>
z-<$s7TN71z^oEN2?oG`7x+Z3a7l@^rU~+Om4)99pQp000;%y&!Z^M&zK?3rg&r*w;
zKYm$zZcGlUcJnf(hO9pmFK#ZXED!uBecyH0m;!g<COX|qy!02ST-ia`ORwA)@P^c0
z)>pC`Q{40FF(=GD%9Ict-wQ0QJrf)gSR-kvUo`H&6GlX)PwEl?y)4hqQDC{}(=QXu
zr<X&8I@dy3NommOy+d8wJfe6?T}xF(YkiClzqCsL?x>4P&gF$Cx{VrDN-&FffPe>X
zN`b5vs`CdNVJ$&QK=yCqR<@7ArnN4WaZx{3<^GSy=wInq)t~T4T<7T)Ek`+>*UWZE
z!Zy(^F6O^N`caA(uM<v@EB-4snQ4_K0uK20)&_SAiWbtUT1k@Qe=(9a!I$qet-%Fi
z;v=RCf`;Qw5T;Wbi74mgJ}?nMyb&ha;mp7bz9$#_(Fh6;aSH4~1{3iqUCxIDBvb2W
z-U6BqpB*UOY2IK5cA=PSnCju?FLDhTHDB5laE~Of5~p-~fiYN>#G^s(VF7km2BLer
zB4jh0ZlwzL)V7a`AV+;38J7eO>NRRqd{Fbj@tIm$MIg>j7$;s^@7GmCI7_@#ICX$7
zRH=zqKI?_E9S%j`iE%^El=CwjGL_fiEhGwPcZKr}n3c$JLb_K^m|OyGo9j?&%p-u9
zPd(z&UhF^fiGb7Pv)mHv77W7d0k{C#Niir3xXa`R!Wx4GmY2GJm;{>9p0>rW1Fln$
z7j2JI{vnlXU87V@?U>tF^VBs>-$={%!(EV3d=k3YxsgK5^!t&RC_8kziQFn68I+I{
zM`&TJ9!<(c*+p$zqF7K}iPY?+26Nt7YF_E~N`(vYn2vm&VVp-WOaaWOP9lD>^mFt-
zr}6$@7y7D7V_>*2jm+~;Byy1Ysu@CNyj-`Kxr5k!ciZ*dGd?c-LJLN0f>BP)LRAAO
zl8vv3V_;VbYrMk{UlW$Ey~FP@d4-2)(PF(W33H@mNLw%b?Ewa32L2)?@DbX8?1Y>g
z5qh3;iiia5WW*WW&el-k9@39>J<V&Tkz4WZ6bVmeB(jWI#kAx4OT?&Axkz9dXL~8g
z^(gguCOgkWwH)?0A61>%o>aTaQ~9{nr<@SV?#wa~5_M;9)oArI-)U1sy3Xgymx)~g
zPGY8zOcIfq76oO4Ns8?Y2{V+cAjkVaawd~9jw8{iBS|(HWvO%B!}gZ<2L;rtC(TAz
zKpGnV0K~h4&zR;%8G|2grf$2oi}$)^d%cd(NK!Y{kSuV(aOV`wdX<<J2P5in)Uz?D
zcu|MG^E(z4mX@nWvUw56>KM;t9$dZd7S@+W-)LHe(C^d&zv}PoK-O1Fj5r^|NuFn(
zg(4~yCnQSD${cuMz6DP&h-R(v!w)?xf%;d{`dqryZnErVV9z8YId>q`;c{F3B?a1h
zl(Kf>6N8R$_?ez$=uSMM_5{}+qb34|Z}Sz=FU7<znb}Zq;txNrzt-dGzoNda{SWKh
z7}a|sR%wscr0%kuE+d9V6`6H-Z01rl<LRI#F8IW8cguRwkMQaYq<jQrCygSaw_#7a
zD+dF0Z{AYXdB*nw`P>=hD$Qfq3>@~lc$PN3_>{V-xvb98(AzS++}CZEfY+$^d~g+9
zI`(@*)2e30Kz2D?+|HF@?qzs`lhz<0mOZ<52;EM7YJg>zte(urn&x;3LVHFTjv%z}
zOsw<&0P%@bWPy0OTMJ%zyMk^(S;j9{6*+k;m@>sFq%M^^aW!dK%Tbxjv5T4K+c@^b
z4q4Ipg|m$XvF&=}r8$*1p#r5`Gq@Un6G?XwMZw}x4d5C1&SDCy#xTr0*xW?1aeA4W
za@c0P1=_-C*9w+)N0I@s2P+$Tn!@A8V|Xv`{X=`-Vd@4^P$(xoJGkt|H##M4vu_tH
z3f)=#$(kbM;rA&Rqh}APxn1RE0I@eL@0m`3^Be$sYws((2FM-OZXU<>l-MSmFKB2M
zuPSb53RT@O9rhQbzdG4|?Z;vEpMGb+x|ilusZpbN_Y|{xUrKstoM4^csS7p5yfZ5k
zE@GHhRQ~|gK0sWM!&h#<KTXD45RfK&NFP83dCP&{$d`F~J0)5LP*L#`a0H*g{?epa
zwS{Z>k95J_GS<!;xRFDT#L0wsj8zi9z#sAN{0Hh8aFnFHzzol0GhYKUe(@KlJ^fcv
z$zPeEj7|KJQBr*w99PJNX9;KB`ptDxvP#zTk|;hpA9<gs=YMnnDKw}CP##H|7C2lk
zmO(sA1S+{Na9OC;%DHp%4zt9*EU;QH?-@d;cE<&DQMPRx;)oef2>FH6l}rBsQkjwF
z2QDE<7jDB}yba#$tLLQtNJA5}tUy-x%>0!BT^EO63^jx(-Cm#t0Y3i#Fzl8KkL9U|
zOWBme8eO@EP#F^0?`9BNC%`kY(QK+ZKFo%53m68(0Kiv(hUd)8+PTo?R25Avm%?tA
zeYzObz|4KnKq5TEvOHyzQlg;1K~2H`02xQ@V=#at=2n?ZTZ)Xg_Q&^_LPur$#YCA#
zPwD~}xE9Rn(xr8%<_b1OovGb?c8U$X)<gHOsKR4G{owNC1DR9iV;Yrv5}kdhn#E!{
zz>e)p+d<z__VD3^DoMcR4g$~%-dWeIBKO;vDycTb?VaK!xLyAMs&7A)vQ(&;oB+5s
z%ClhrSa7D#WIW210y(TGW=QZ8b&@>HP+PY$%Bb0RgbTdn^)Jl6th?9HGhW|hJ6B^e
zwj2-VyeO*kLFj~GT#0G!WMUyQm+P65l-=0&c4ZP%7Ka#=bjJ2}Dq@<<QS&VjP5%H|
z{+pZqZT|p*{*}w<B~DpUOrw?em<B1nNt*arwrqDICd&F$jB_j*`_4pu(uVpy12qT~
z%0#hsBUt7Aa<C<oFMtRTt<Dkv%)S==<tC~XF#wb@t9Y0*RKk8<CRaCUSc_8m1eA-{
z?HoSEh|Z4J06%vv9O|>Urc{!)i!68?7Qky0985Tc%HvZzxkvgrAst(eKXB>T$CM>O
z)UVg-VPXtVgvH~aogN_JUu?>?R<#JzJLWH8DZ5|yGs&<|lt}A%_b>^`S2ma;e@bRs
z+j4k;>z<E^#-qzp=&s<zv0b&ERpKC(QRQ8#W&mpR9^zmPj|%X{1`n{AxV2}HVHEg)
zk8Hb+l4~Rx1CskeV4avsRXbcoX)hB!?1$M61y`~qeGZe_03I>>68coG)780Q{m0Cv
z^(9Gw@Eh?HEF(SSe$dt!ejkg5LOry?l9z@hW_s;14z*l-;w#ch!CqzIE>OR^Q;X0=
zovZJr6;$x^D&3K?cOMdqSgy#J+zt5c4I71QGxO0<90$bwWD=lHNm#X_U)vm(!J;=U
z_MOWO3e40B{)vgT<{vMIku0fpevKtRMaFDKT~RYO*J#RD4o7lta_%^A#nLQgl<Zp@
z<_XK1W?U*6I0E;GK)r6O%prA?a;<B&WlxA;>yOmGuKM5T*Xw-r@%nc!=>tqsADNcW
zd|aRza!nI<mH<CMr%78WM}dx0Yw;LCh^i)dgxNXym?MMr6`-v92}w66WHf!{VBw%=
z^E-0TEaCSK3izG|;acKRX>$o!r1_Q0EnYP;Zv?vlHJ;?kf#E39)ujEnAX_X$&yvWJ
z`zA|e)dw2!JB-TlD>;}m6nw?-7qqtGO1;W7m<Z{aaBcpuR2pdR5To_P-3Y+ur81dP
zB4Mn2>K{!G#3cp!S)D#7^Bp%qTzi6&Zj1&)bgz`#Jw!2)399>7FyF*6MuBwC3>3a4
z?~iAHQ6*p~s)P>U8PCi8$Kji;fzPNjPI9dLpvpW??oF;?#Hgr*<}pd9m)!sYHeH<(
zG7Lvdvya3ZI9zNk99z)xQ*icA3UH8jbdT*SS4vpN4I3cw5~ZNV$FHKM#Nrk)E1PGR
zw5kEB{_sJtt&Cf40hJvc#5V>;oG>M;Z5f5ECkU|BWH<u8q-<(!C+rlV^P3Y#cthjr
zp?ncs`pWP8#HmuCaSOi*Erng(PA+EzD!4YNWUwb;4%n%93G%JMZ)PcyU0qn3sQBDS
zkbkms0$A_4m)5T_`fj<I=J_aIuH+>j2n+e|9IHs(zS95>kgPU*%7m|Bn#lwO%_YSP
zDCIMW#F(JJ24RDolXDHmEA{SQ(|s@KzpVW)nUAjii~R%W8O-G(U{Z<?xu0-`Om{Ub
zbktF(+@g{LhWU&}9FY}RjjH&Y=t_G;JAErsFNs(!bA+=X_y_=TDrGj18utiiFii#}
zA2$p-m(8|_`C=F_&R@QwxQ85*dSB`WLOxO;p}dzfln4tFj(!=FE5j;tJx6<Oup12w
zl7fq&TJxCvU=VB9cvF&m%Bbg2gOHkhqaO>LpfyjjahLHk0n|7kixG`)-1cw`GLnI^
zGiAm`;*PN9<+@SeToGu}GaR-qa<}aa4EA!v03Oj+O0Ig}cwLsX7-?2{9*`Xn((*wm
z7o=wV^}xVDMg{<=GYaKax>z!wcnx+_zs#tD{?GL+mgAVpjl;L%Q<&s><L`LuQ+Y@e
ziBYnHKG-H1bYKewWl#B>i--gclT#AA^sbclfKu-*LiV@+0Jz89i*Xi{z}zq1qmzKs
zF&GC56LM!KQS_NR99QO50ZceaV~(E^r7ekQ7?pxu*sImcc|L}u$PImng}cAlj*VTD
z48YT$GK9MhnL_i@5{VAjCXCU*&)@9?5aVjk$|Z$N4+#EUN{lqffHnUB%(duigsd}A
zEpjF&>aBvDU5posO8)@pLLHzzE;;I<m6>k`iIJKw2x6vj*tkEr9<(8#z914cA$J9&
z?57Vs-lfohaN+!<%9>3tWe9WGu}wES#P=dfg{OD9Lh$MK<w}+Q1^rk0S3ZBhztrdG
z&wiqa?qg=g=qG3ccleY{#$so*<B3Jf6U9d!i0A09t8|OvH^bi;S*x*$TcF|xkjv&M
z{{YCIwQCK-p^8F==ef3iA(7d2JxKyyP*$0AT%FkNX#W5ZSas!!pRR)s1c2=WIVx!f
z9y&OzW?DII-%-t{XrMuu1N#s-^fq$~o~3b6$40Aj`I(dSM-Yv7hm<=wxwjz(k^W*O
z1>&V2!@iP;d(0g=Q$3l0CODstpTx2uWt@=q@0p%wxsWy)x3RjT{ow&yFEDlomdR$@
zYtN)Sh1-a|{$?-D7KfY_rQE$zG`N^hdzf|{6i)s*afm2DP*>$w0N(naMcNSuYq<i&
zJOL4|w{?W?FU}8WsE;E3kQk3ABzwkLS7l5qZ*1j&FlEa>HjpHDx-$Ky*~+euwBC+T
z{^g4{LmeN9vt7s}CjG?uxqlFM$NQBH_zbI+(IuhWG0(GD`-~TWEywY>T{MIp#f}lv
zEP2-Z<!U``N4b_ucXRtj7Sixc%jRB(k5KRZ?*si#9gKg(qJF@l6)`!CAoyd^x|M((
z-B_MwMkf}630Wz?hsts{_U|jBiLJb^{SVB@r*)^8S!Njeo3n4)c<>xgw6;)UYP=GQ
zXdLu`%}SN`9hiCD(~<2c^g_-G^vf1=kYiP<Ved0<Mqx-g5iyElf0KWw&-fSgXQqC)
z=vaN3SQUAjBG-88+|EFaaZF{GQ)DA{7xdxmm5XbbxpY}fL1;cQ`^G~DEE$<WLH3?k
zH>hR^Zh6>a)Ha<kqGhVo0P#@9Z%}-Hyyl0A#yxjCN6IB(@R>PjLs#Tz{{Xy0`V0uB
zdHX?PwkEwmtdW&&a}gYQjwn^UYFdI;;k4Z(R73FbE9gIn_m@a>b1J7XiGe8a!Kb{o
zVHGrG7P!t3_2<;P-qo6M<NK8OS;v<=riuX;U^V~;0B}cLnpZFZlaZAwGy>4k%u0>+
zj(+XTC7&hVX5YlC52b3M6G4iIY9|vY^qveH+8A>je=^7AxMeNJbnaD^+VL<1?#5Jp
z(c@`LC^KZHr1xhD0S6yV^)NaGZn`Ox<`ONJjgfRra;wAt09>j~a;1Bfu!E;Lg+}V}
zEB&0X^XXWy`_vK1R;+trL4TEZ?SqufHE-T~N2T@*q>2FZ;uy#^oshM&w<9xWz06;u
z<drIXO8Nrhy^ONED6f(OGywO<^KeZ9qqQ1PTMUM0$U9HkCn}1C{q9#-(WT2J5~>pX
zeFV6tih^YGj@j6fxLZ?_Gdti+lUF8H&2)HIx}pN3ZBjqtVo#Axd!F2ba7m(Wu^njH
z7!blIEw$f5$ydE4iyrs{;+U;_nNxC7{?gl<Sa4whMgIWHh*?;&)*j`<vy+&#OpsfG
zB4^wVB7cQ{RrS84df(~XzLzhp%l`lcA<QkEqql@E#$ap)hG5kI88aEYx<6rj6PjZ0
z3xX888YkidEX##KFa8jxmOk-2VI(*(a!V$J-2~KgUSm9Wh?<{0qG#v9fGp(o;izSh
z4)I`Hf{AbecUqM|cP}%!z*sF9@PV3v$+_!~h*jn;7C`Pp-N1)*y8i&U1~4c&tVLt2
zZHv@9j_mK^09V%<+FYO>&=&(amqvUmIh?L|{LGu*U(!<%Kod%XL?ejNvlB#JBkP!t
zX3u4Ko9&IQ#E*{wTOK7G#PJeTFe{>^Olo5aI2&eJXIiD66o&xV{LJeM0jT}Gt0l$i
zk2J&sruZSIPa$k3g0H6?KoFNNrS!gx?2MVQ8yP%9xn7k|_3Bt2az^l;<JflwAW}yN
zwxd=~+gth|VR;#J`I(kfbDp?M>L!MMV+UK{6ByHn`a)JVJu;>N+jAbD_T_WFSRT)q
zN>DryO5dB72F);i;%qARs`8Z%m=3|I+_(y2!l_n|HNosdmsMgqgBNjfAcs981E)ix
zz;!RB+_w!y2xLIQ`HPeecu24%A9sm=znjxAbzVh7Qjc>GseAtbQqHSga~K$%*syDN
zZEKCrde(!}D>411k@262eH)ctrD4nVf@ZeMSx@}T4N}p&ym0bGHLQT$aK}+2T}7}3
zHsfQAWJ+#k4P|Nu^AhG)l2?g>S6cr76XsuA`mgHes`cZhKCAr`>jjD!o$DO|ifYr?
zAdpnU#f%qQ%xBy2f@py7P3`k=C@uJg5JC_S{EA*1SK$yzXq%35V>PlHrkqjQUly>u
zANwuHi*WB&)+!aIpDAZdaFL4H+CMkPc)f!8sHZEd%<um0DtrwAPzANQUo!)!Wo{W=
zxqxMs;}b9SELDHx6U?ITrsYQwho3yu?ffa3>spn5OtRMQ0nBp+6>cNPsyFtP;yv6&
zRi**Na>3tFsiI@N%^!_g{6~WCSn)AevFQ=9bHIo?*B#I^N44StZaj}Zqt@uVne)Q)
z%=H#<BmL)J$+&zRN=Al&U9%4bEw|nO01*{Uu2|aN6B!P*3h@F7Ea{C)mg(tpGkm>i
zWfOv1#J`Bt6xSkUvYnEQZX_**HE&q8V$3u`W30C^UFLduiTpUk{{SXDiNvW=r8w`k
zF@=+aeQ*sGxay2DLz~J##yp*-lnchs-d<`ha?No#a>vT<`F_x$_RSejTodl;>=lDu
z4{=7uR6Q%=<&=%)#I%s@&#7S#B;kdq(D}=k(Q{V{<LI&?1gplstPxm%T30zas8MKl
zxxCThRvtM_OSL`;@5P2;Ncf1<*j9pKAN;0}C#FBN>LYsYV;-Y~1D0%-YofmWr7ulI
z4(Dk?MW>P8T+FfBzo__aa<Oc7E_ffg-c`yJt^1iSgIpDfQx_H5ECKg}VZPFisGT41
zuj;@45mE3><n&5ClEo;SOw2C7L^E(TF5`ZGd62@56B=B!b$E|m%HWr)TH`PWvZr*m
zccB(5mSQmmn$5~_uguR6h~e9ra=^pejU0~UD4#NzyC;|>clV5{o){)JQ(n=!=61OC
zyz7E#2LXwLRR;qk_5S7KEbRkWoLD{}w=0r&2e{rS>}H6XwO?W5^C=KdVqZoqHHbLt
zBeW#MNLvGrA_1k%$CmtX@df1uh(fSgnM5TzjRt>t<_^0!$ggt+c7*({zj(>OU3NtY
zjbg+gWFZs0HBrX9aJ@>YOJ1b{_YsD1*ZjCBxE3%Cx4A^n&4j`=lgi9X4gww_-nf;t
z_CU5O9UO^DxR^*lhfTuZ%jtad8R~xj08UXXyvAkj(yYeEXe!FG8Ww;wIDXY0kY^wE
zX1=Gf_ezO9%9T9*>KkU9yX#YO&hN6+sR@_cfB7?`bZ~fzS=pQsxCZne)D%JN0w!I&
z74U8w>Ff>@fG8#0CC)luMXn`g5cjun?qKw5{iY7)gHeI+us?Vt$;k#$?sT{$Hpo1(
z#PqY41>i>GpS9%7JYeatRvAVK#E9e=sX}id1)DetsELz2AHvKq0?;@1hbY{igo}BX
zDGK>8%ZS{s;v~PzH^L|~ju<$ov+kCtykD3LmpCkr^`u~T>T}*&oFa=b=sr-0H4Ih|
z_CbLQ0W0{HSUgV5NdEwezpDCt%+4kBS%2b!@iU%Erl$9sDf}T;!HdcZizw>J<9=d0
zmf85r3scMy*>{<asEKft)Ym(P2o79M3}Muvag{~d4J<=~R8g-mFyRcwj22_J96*{$
zlUs?=q;`H;jYRD-&>m_7Ocubxj>dlSt6#LErxLV7CZn!C@F;*XbUtB5e$wc<$7U4G
zL=?iXx%7dLjah7E0?j6?;&02oIEVedHX`{V=w=HeBci1l#Vz4D0wW;HcCYf5Te99*
zIah96KV>s~ofhY@Oxw(NjQ5e^4agFn#~sl#{wt0q5xy7#rVc89+kprdF{I{O6u#%p
zMHDn_g%~bIcprJSvCw6RRc<Uwrv=f(%0A%%03Ny`4xb-ZdL1vJW~ITnA6*d)sbO1T
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

literal 0
HcmV?d00001

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1d16fefa959..54abd345136 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -936,6 +936,8 @@ DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Message of the day
 MessageLogin=Login page message
+LoginPage=Login page
+BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 7550b672007..bac8bebe52a 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -93,7 +93,7 @@ if ($id > 0 || ! empty($ref))
 		$head=product_prepare_head($object);
 		$titre=$langs->trans("CardProduct".$object->type);
 		$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-		dol_fiche_head($head, 'margin', $titre, 0, $picto);
+		dol_fiche_head($head, 'margin', $titre, -1, $picto);
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
 		
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index d194646140c..3828d4e5e25 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -108,7 +108,7 @@ function showlogo()
 	// Print logo
 	if ($mysoc->logo) {
 		if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file=thumbs/'.urlencode($mysoc->logo_small);
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file=thumbs/'.urlencode($mysoc->logo_small);
 		}
 	}
 
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index cedfec4abdc..c7199c99868 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -188,7 +188,8 @@ if ($object->id)
 	$head=product_prepare_head($object);
 	$titre=$langs->trans("CardProduct".$object->type);
 	$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-	dol_fiche_head($head, 'documents', $titre, 0, $picto);
+	
+	dol_fiche_head($head, 'documents', $titre, -1, $picto);
 
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index ab959f479fd..afabf209897 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -305,10 +305,11 @@ if ($id > 0 || $ref)
 			$head=product_prepare_head($object);
 			$titre=$langs->trans("CardProduct".$object->type);
 			$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-			dol_fiche_head($head, 'suppliers', $titre, 0, $picto);
+			
+			dol_fiche_head($head, 'suppliers', $titre, -1, $picto);
 			
 			$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		$object->next_prev_filter=" fk_product_type = ".$object->type;		
+		    $object->next_prev_filter=" fk_product_type = ".$object->type;		
             dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
             
             print '<div class="fichecenter">';
diff --git a/htdocs/product/info.php b/htdocs/product/info.php
index af626cce5dd..e6011c7945c 100644
--- a/htdocs/product/info.php
+++ b/htdocs/product/info.php
@@ -91,7 +91,8 @@ if ($id > 0 || $ref)
 	$head=product_prepare_head($object);
     $titre=$langs->trans("CardProduct".$object->type);
     $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-    dol_fiche_head($head, 'info', $titre, 0, $picto);
+    
+    dol_fiche_head($head, 'info', $titre, -1, $picto);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
 	$object->next_prev_filter=" fk_product_type = ".$object->type;
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index c63d60229fb..0178635ed10 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -91,7 +91,7 @@ if ($id > 0 || ! empty($ref))
     $titre=$langs->trans("CardProduct".$object->type);
     $picto=($object->type==Product::TYPE_SERVICE?'service':'product');
     
-    dol_fiche_head($head, 'note', $titre, 0, $picto);
+    dol_fiche_head($head, 'note', $titre, -1, $picto);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
     $object->next_prev_filter=" fk_product_type = ".$object->type;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 8601ce9c05d..90adaa96856 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -654,7 +654,8 @@ llxHeader('', $title, $helpurl);
 $head = product_prepare_head($object);
 $titre = $langs->trans("CardProduct" . $object->type);
 $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
-dol_fiche_head($head, 'price', $titre, 0, $picto);
+
+dol_fiche_head($head, 'price', $titre, -1, $picto);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
 $object->next_prev_filter=" fk_product_type = ".$object->type;
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index f12316591d0..6c5040c1589 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -538,7 +538,8 @@ if ($id > 0 || $ref)
 		$head=product_prepare_head($object);
 		$titre=$langs->trans("CardProduct".$object->type);
 		$picto=($object->type==Product::TYPE_SERVICE?'service':'product');
-		dol_fiche_head($head, 'stock', $titre, 0, $picto);
+		
+		dol_fiche_head($head, 'stock', $titre, -1, $picto);
 
 		dol_htmloutput_events();
 
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index b101e656f67..e01201ccea3 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -99,11 +99,11 @@ function llxHeaderVierge($title, $head="", $disablejs=0, $disablehead=0, $arrayo
 
     if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
     {
-        $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode('thumbs/'.$mysoc->logo_small);
+        $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('thumbs/'.$mysoc->logo_small);
     }
     elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
     {
-        $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode($mysoc->logo);
+        $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode($mysoc->logo);
         $width=128;
     }
     elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 1945aa6c8cf..5f83855529d 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -195,11 +195,11 @@ else if (! empty($conf->global->PAYBOX_LOGO)) $logosmall=$conf->global->PAYBOX_L
 $urllogo='';
 if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('thumbs/'.$logosmall);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
 }
 elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode($logo);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
 	$width=96;
 }
 // Output html code for logo
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index b5d105d6cf6..8313c39bb95 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -300,11 +300,11 @@ else if (! empty($conf->global->PAYBOX_LOGO)) $logosmall=$conf->global->PAYBOX_L
 $urllogo='';
 if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('thumbs/'.$logosmall);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
 }
 elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode($logo);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
 	$width=96;
 }
 // Output html code for logo
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b43eb6450c1..3ea40470708 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1490,21 +1490,28 @@ foreach($mainmenuusedarray as $val)
 .bodylogin
 {
 	background: #f0f0f0;
-	/* background: linear-gradient(to left top, rgb(255,255,255), rgb(240,240,240)) fixed; */
+	display: table;
+    position: absolute;
+    height: 100%;
+    width: 100%;	
+}
+.login_center {
+	display: table-cell;
+    vertical-align: middle;
 }
 .login_vertical_align {
 	padding: 10px;
 }
 form#login {
-	margin-top: <?php echo $dol_optimize_smallscreen?'30':'60' ?>px;
-	margin-bottom: 30px;
+	padding-bottom: 30px;
 	font-size: 13px;
 	vertical-align: middle;
 }
 .login_table_title {
 	max-width: 530px;
-	color: #888888 !important;
-	text-shadow: 1px 1px 1px #FFF;
+	color: #aaa !important;
+	padding-top: 30px;
+	/* text-shadow: 1px 1px 1px #FFF; */
 }
 .login_table label {
 	text-shadow: 1px 1px 1px #FFF;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 2a393dee748..28c3c6c0193 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1523,20 +1523,28 @@ foreach($mainmenuusedarray as $val)
 .bodylogin
 {
 	background: #f0f0f0;
+	display: table;
+    position: absolute;
+    height: 100%;
+    width: 100%;	
 }
+.login_center {
+	display: table-cell;
+    vertical-align: middle;
+}	
 .login_vertical_align {
 	padding: 10px;
 }
 form#login {
-	margin-top: <?php echo $dol_optimize_smallscreen?'30':'60' ?>px;
-	margin-bottom: 30px;
+	padding-bottom: 30px;
 	font-size: 13px;
 	vertical-align: middle;
 }
 .login_table_title {
 	max-width: 530px;
-	color: #888888 !important;
-	text-shadow: 1px 1px 1px #FFF;
+	color: #aaa !important;
+	padding-top: 30px;
+	/* text-shadow: 1px 1px 1px #FFF; */
 }
 .login_table label {
 	text-shadow: 1px 1px 1px #FFF;
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index cb38d1c9e49..f7acc3609c7 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -214,11 +214,11 @@ $rowspan=2;
 $urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
 if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode('thumbs/'.$mysoc->logo_small);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('thumbs/'.$mysoc->logo_small);
 }
 elseif (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file='.urlencode($mysoc->logo);
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode($mysoc->logo);
 	$width=128;
 }
 elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'))
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 6fa65660df1..f69c7e4e4aa 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -35,7 +35,7 @@ if (! defined('NOREQUIREHTML'))		define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIREHOOK'))		define('NOREQUIREHOOK','1');	// Disable "main.inc.php" hooks
 // Some value of modulepart can be used to get resources that are public so no login are required.
-if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'companylogo') && ! defined("NOLOGIN")) define("NOLOGIN",'1');
+if ((isset($_GET["modulepart"]) && ($_GET["modulepart"] == 'mycompany' || $_GET["modulepart"] == 'companylogo')) && ! defined("NOLOGIN")) define("NOLOGIN",'1');
 if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias') && ! defined("NOLOGIN"))
 {
 	define("NOLOGIN",'1');
@@ -179,7 +179,7 @@ else					// Open and return file
     dol_syslog("viewimage.php return file $original_file content-type=$type");
 
     // This test is to avoid error images when image is not available (for example thumbs).
-    if (! dol_is_file($original_file))
+    if (! dol_is_file($original_file) && empty($_GET["noalt"]))
     {
         $original_file=DOL_DOCUMENT_ROOT.'/public/theme/common/nophoto.png';
         /*$error='Error: File '.$_GET["file"].' does not exists or filesystems permissions are not allowed';

From d01ba54cb5850682df4b9abc3fe0e7d93cbf7b88 Mon Sep 17 00:00:00 2001
From: Guido Schratzer <guido.schratzer@backbone.co.at>
Date: Fri, 31 Mar 2017 17:13:09 +0200
Subject: [PATCH 0510/1163] FIX: Issue #6549 don't rewrite email and password

---
 htdocs/adherents/card.php     |   35 +-
 htdocs/adherents/card.php.bak | 1787 +++++++++++++++++++++++++++++++++
 2 files changed, 1804 insertions(+), 18 deletions(-)
 create mode 100644 htdocs/adherents/card.php.bak

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 48461c64b02..270430c899f 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -307,7 +307,7 @@ if (empty($reshook))
 			$object->phone       = trim($_POST["phone"]);
 			$object->phone_perso = trim($_POST["phone_perso"]);
 			$object->phone_mobile= trim($_POST["phone_mobile"]);
-			$object->email       = trim($_POST["email"]);
+			$object->email       = trim($_POST["member_email"]);
 			$object->skype       = trim($_POST["skype"]);
 			$object->birth       = $birthdate;
 
@@ -825,6 +825,16 @@ else
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="member_login" class="maxwidth200" value="'.(isset($_POST["member_login"])?GETPOST("member_login", 'alpha', 2):$object->login).'"></td></tr>';
 		}
 
+		// Password
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+			$generated_password=getRandomPassword(false);
+			print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
+			print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">';
+			print '</td></tr>';
+		}
+		
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("MemberType").'</td><td>';
 		$listetype=$adht->liste_array();
@@ -862,16 +872,6 @@ else
 		// EMail
 		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(GETPOST('member_email','alpha')?GETPOST('member_email','alpha'):$object->email).'"></td></tr>';
 
-		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-			$generated_password=getRandomPassword(false);
-			print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
-			print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">';
-			print '</td></tr>';
-		}
-
 		// Address
 		print '<tr><td class="tdtop">'.$langs->trans("Address").'</td><td>';
 		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(GETPOST('address','alpha')?GETPOST('address','alpha'):$object->address).'</textarea>';
@@ -1069,6 +1069,11 @@ else
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td colspan="2"><input type="text" name="login" class="maxwidth200" value="'.(isset($_POST["login"])?GETPOST("login",'alpha',2):$object->login).'"></td></tr>';
 		}
 
+	// Password
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="maxwdith200" value="'.(isset($_POST["pass"])?GETPOST("pass",'',2):$object->pass).'"></td></tr>';
+		}
 		// Morphy
 		$morphys["phy"] = $langs->trans("Physical");
 		$morphys["mor"] = $langs->trans("Morale");
@@ -1122,13 +1127,7 @@ else
 		print '</td></tr>';
 
 		// EMail
-		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.(isset($_POST["email"])?GETPOST("email",'',2):$object->email).'"></td></tr>';
-
-		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="maxwdith200" value="'.(isset($_POST["pass"])?GETPOST("pass",'',2):$object->pass).'"></td></tr>';
-		}
+		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(isset($_POST["member_email"])?GETPOST("member_email",'',2):$object->email).'"></td></tr>';
 
 		// Address
 		print '<tr><td>'.$langs->trans("Address").'</td><td>';
diff --git a/htdocs/adherents/card.php.bak b/htdocs/adherents/card.php.bak
new file mode 100644
index 00000000000..48461c64b02
--- /dev/null
+++ b/htdocs/adherents/card.php.bak
@@ -0,0 +1,1787 @@
+<?php
+/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2016 Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2015-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/adherents/card.php
+ *       \ingroup    member
+ *       \brief      Page of member
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+
+$langs->load("companies");
+$langs->load("bills");
+$langs->load("members");
+$langs->load("users");
+$langs->load('other');
+
+$action=GETPOST('action','alpha');
+$cancel=GETPOST('cancel','alpha');
+$backtopage=GETPOST('backtopage','alpha');
+$confirm=GETPOST('confirm','alpha');
+$rowid=GETPOST('rowid','int');
+$id=GETPOST('id')?GETPOST('id','int'):$rowid;
+$typeid=GETPOST('typeid','int');
+$userid=GETPOST('userid','int');
+$socid=GETPOST('socid','int');
+
+if (! empty($conf->mailmanspip->enabled))
+{
+	include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
+
+	$langs->load('mailmanspip');
+
+	$mailmanspip = new MailmanSpip($db);
+}
+
+$object = new Adherent($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
+$object->getCanvas($id);
+$canvas = $object->canvas?$object->canvas:GETPOST("canvas");
+$objcanvas=null;
+if (! empty($canvas))
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('adherent', 'membercard', $canvas);
+}
+
+// Security check
+$result=restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid', $objcanvas);
+
+if ($id > 0)
+{
+	// Load member
+	$result = $object->fetch($id);
+
+	// Define variables to know what current user can do on users
+	$canadduser=($user->admin || $user->rights->user->user->creer);
+	// Define variables to know what current user can do on properties of user linked to edited member
+	if ($object->user_id)
+	{
+		// $ User is the user who edits, $ object->user_id is the id of the related user in the edited member  
+		$caneditfielduser=((($user->id == $object->user_id) && $user->rights->user->self->creer)
+				|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
+		$caneditpassworduser=((($user->id == $object->user_id) && $user->rights->user->self->password)
+				|| (($user->id != $object->user_id) && $user->rights->user->user->password));
+	}
+}
+
+// Define variables to determine what the current user can do on the members
+$canaddmember=$user->rights->adherent->creer;
+// Define variables to determine what the current user can do on the properties of a member
+if ($id)
+{
+	$caneditfieldmember=$user->rights->adherent->creer;
+}
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('membercard','globalcard'));
+
+
+
+/*
+ * 	Actions
+ */
+
+if ($cancel) $action='';
+
+$parameters=array('id'=>$id, 'rowid'=>$id, 'objcanvas'=>$objcanvas);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
+	{
+		$error=0;
+		if (empty($user->rights->user->user->creer))	// If can edit only itself user, we can link to itself only
+		{
+			if ($userid != $user->id && $userid != $object->user_id)
+			{
+				$error++;
+				setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
+			}
+		}
+
+		if (! $error)
+		{
+			if ($userid != $object->user_id)	// If link differs from currently in database
+			{
+				$result=$object->setUserId($userid);
+				if ($result < 0) dol_print_error($object->db,$object->error);
+				$action='';
+			}
+		}
+	}
+
+	if ($action == 'setsocid')
+	{
+		$error=0;
+		if (! $error)
+		{
+			if ($socid != $object->fk_soc)	// If link differs from currently in database
+			{
+				$sql ="SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
+				$sql.=" WHERE fk_soc = '".$socid."'";
+				$sql.=" AND entity = ".$conf->entity;
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$obj = $db->fetch_object($resql);
+					if ($obj && $obj->rowid > 0)
+					{
+						$othermember=new Adherent($db);
+						$othermember->fetch($obj->rowid);
+						$thirdparty=new Societe($db);
+						$thirdparty->fetch($socid);
+						$error++;
+						setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), null, 'errors');
+					}
+				}
+
+				if (! $error)
+				{
+					$result=$object->setThirdPartyId($socid);
+					if ($result < 0) dol_print_error($object->db,$object->error);
+					$action='';
+				}
+			}
+		}
+	}
+
+	// Create user from a member
+	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
+	{
+		if ($result > 0)
+		{
+			// Creation user
+			$nuser = new User($db);
+			$result=$nuser->create_from_member($object,GETPOST('login'));
+
+			if ($result < 0)
+			{
+				$langs->load("errors");
+				setEventMessages($langs->trans($nuser->error), null, 'errors');
+			}
+		}
+		else
+		{
+			setEventMessages($object->errors, $object->error, 'errors');
+		}
+	}
+
+	// Create third party from a member
+	if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
+	{
+		if ($result > 0)
+		{
+			// User creation 
+			$company = new Societe($db);
+			$result=$company->create_from_member($object,GETPOST('companyname'));
+
+			if ($result < 0)
+			{
+				$langs->load("errors");
+				setEventMessages($langs->trans($company->error), null, 'errors');
+				setEventMessages($company->error, $company->errors, 'errors');
+			}
+		}
+		else
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+
+	if ($action == 'confirm_sendinfo' && $confirm == 'yes')
+	{
+		if ($object->email)
+		{
+			$from=$conf->email_from;
+			if (! empty($conf->global->ADHERENT_MAIL_FROM)) $from=$conf->global->ADHERENT_MAIL_FROM;
+
+			$result=$object->send_an_email($langs->transnoentitiesnoconv("ThisIsContentOfYourCard")."\n\n%INFOS%\n\n",$langs->transnoentitiesnoconv("CardContent"));
+
+			$langs->load("mails");
+			setEventMessages($langs->trans("MailSuccessfulySent", $from, $object->email), null, 'mesgs');
+		}
+	}
+
+	if ($action == 'update' && ! $cancel && $user->rights->adherent->creer)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$birthdate='';
+		if (isset($_POST["birthday"]) && $_POST["birthday"]
+				&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
+				&& isset($_POST["birthyear"]) && $_POST["birthyear"])
+		{
+			$birthdate=dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
+		}
+		$lastname=$_POST["lastname"];
+		$firstname=$_POST["firstname"];
+		$societe=$_POST["societe"];
+		$morphy=$_POST["morphy"];
+		$login=$_POST["login"];
+		if ($morphy != 'mor' && empty($lastname)) {
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Lastname")), null, 'errors');
+		}
+		if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Firstname")), null, 'errors');
+		}
+		if ($morphy == 'mor' && empty($societe)) {
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors');
+		}
+		// Test si le login existe deja
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			if (empty($login)) {
+				$error++;
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Login")), null, 'errors');
+			}
+		}
+		// Create new object
+		if ($result > 0 && ! $error)
+		{
+			$object->oldcopy = clone $object;
+
+			// Change values
+			$object->civility_id = trim($_POST["civility_id"]);
+			$object->firstname   = trim($_POST["firstname"]);
+			$object->lastname    = trim($_POST["lastname"]);
+			$object->login       = trim($_POST["login"]);
+			$object->pass        = trim($_POST["pass"]);
+
+			$object->societe     = trim($_POST["societe"]);
+			$object->company     = trim($_POST["societe"]);
+
+			$object->address     = trim($_POST["address"]);
+			$object->zip         = trim($_POST["zipcode"]);
+			$object->town        = trim($_POST["town"]);
+			$object->state_id    = $_POST["state_id"];
+			$object->country_id  = $_POST["country_id"];
+
+			$object->phone       = trim($_POST["phone"]);
+			$object->phone_perso = trim($_POST["phone_perso"]);
+			$object->phone_mobile= trim($_POST["phone_mobile"]);
+			$object->email       = trim($_POST["email"]);
+			$object->skype       = trim($_POST["skype"]);
+			$object->birth       = $birthdate;
+
+			$object->typeid      = $_POST["typeid"];
+			//$object->note        = trim($_POST["comment"]);
+			$object->morphy      = $_POST["morphy"];
+
+			if (GETPOST('deletephoto')) $object->photo='';
+			elseif (! empty($_FILES['photo']['name'])) $object->photo  = dol_sanitizeFileName($_FILES['photo']['name']);
+
+			// Get status and public property
+			$object->statut      = $_POST["statut"];
+			$object->public      = $_POST["public"];
+
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+			if ($ret < 0) $error++;
+
+			// Check if we need to also synchronize user information
+			$nosyncuser=0;
+			if ($object->user_id)	// If linked to a user
+			{
+				if ($user->id != $object->user_id && empty($user->rights->user->user->creer)) $nosyncuser=1;		// Disable synchronizing
+			}
+
+			// Check if we need to also synchronize password information
+			$nosyncuserpass=0;
+			if ($object->user_id)	// If linked to a user
+			{
+				if ($user->id != $object->user_id && empty($user->rights->user->user->password)) $nosyncuserpass=1;	// Disable synchronizing
+			}
+
+			$result=$object->update($user,0,$nosyncuser,$nosyncuserpass);
+
+			if ($result >= 0 && ! count($object->errors))
+			{
+				$categories = GETPOST('memcats', 'array');
+				$object->setCategories($categories);
+
+				// Logo/Photo save
+				$dir= $conf->adherent->dir_output . '/' . get_exdir(0,0,0,1,$object,'member').'/photos';
+				$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
+				if ($file_OK)
+				{
+					if (GETPOST('deletephoto'))
+					{
+						require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+						$fileimg=$conf->adherent->dir_output.'/'.get_exdir(0,0,0,1,$object,'member').'/photos/'.$object->photo;
+						$dirthumbs=$conf->adherent->dir_output.'/'.get_exdir(0,0,0,1,$object,'member').'/photos/thumbs';
+						dol_delete_file($fileimg);
+						dol_delete_dir_recursive($dirthumbs);
+					}
+
+					if (image_format_supported($_FILES['photo']['name']) > 0)
+					{
+						dol_mkdir($dir);
+
+						if (@is_dir($dir))
+						{
+							$newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+							if (! dol_move_uploaded_file($_FILES['photo']['tmp_name'],$newfile,1,0,$_FILES['photo']['error']) > 0)
+							{
+								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
+							}
+							else
+							{
+							    // Create thumbs
+							    $object->addThumbs($newfile);
+							}
+						}
+					}
+					else
+					{
+						setEventMessages("ErrorBadImageFormat", null, 'errors');
+					}
+				}
+				else
+				{
+					switch($_FILES['photo']['error'])
+					{
+						case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
+						case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
+							$errors[] = "ErrorFileSizeTooLarge";
+							break;
+						case 3: //uploaded file was only partially uploaded
+							$errors[] = "ErrorFilePartiallyUploaded";
+							break;
+					}
+				}
+
+	            $rowid=$object->id;
+	            $id=$object->id;
+				$action='';
+
+				if (! empty($backtopage))
+				{
+					header("Location: ".$backtopage);
+					exit;
+				}
+			}
+			else
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action='';
+			}
+		}
+		else
+		{
+			$action='edit';
+		}
+	}
+
+	if ($action == 'add' && $user->rights->adherent->creer)
+	{
+		if ($canvas) $object->canvas=$canvas;
+		$birthdate='';
+		if (isset($_POST["birthday"]) && $_POST["birthday"]
+				&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
+				&& isset($_POST["birthyear"]) && $_POST["birthyear"])
+		{
+			$birthdate=dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
+		}
+		$datesubscription='';
+		if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"]))
+		{
+			$datesubscription=dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
+		}
+
+		$typeid=$_POST["typeid"];
+		$civility_id=$_POST["civility_id"];
+		$lastname=$_POST["lastname"];
+		$firstname=$_POST["firstname"];
+		$societe=$_POST["societe"];
+		$address=$_POST["address"];
+		$zip=$_POST["zipcode"];
+		$town=$_POST["town"];
+		$state_id=$_POST["state_id"];
+		$country_id=$_POST["country_id"];
+
+		$phone=$_POST["phone"];
+		$phone_perso=$_POST["phone_perso"];
+		$phone_mobile=$_POST["phone_mobile"];
+		$skype=$_POST["member_skype"];
+		$email=$_POST["member_email"];
+		$login=$_POST["member_login"];
+		$pass=$_POST["password"];
+		$photo=$_POST["photo"];
+		//$comment=$_POST["comment"];
+		$morphy=$_POST["morphy"];
+		$subscription=$_POST["subscription"];
+		$public=$_POST["public"];
+
+		$userid=$_POST["userid"];
+		$socid=$_POST["socid"];
+
+		$object->civility_id = $civility_id;
+		$object->firstname   = $firstname;
+		$object->lastname    = $lastname;
+		$object->societe     = $societe;
+		$object->address     = $address;
+		$object->zip         = $zip;
+		$object->town        = $town;
+		$object->state_id    = $state_id;
+		$object->country_id  = $country_id;
+		$object->phone       = $phone;
+		$object->phone_perso = $phone_perso;
+		$object->phone_mobile= $phone_mobile;
+		$object->skype       = $skype;
+		$object->email       = $email;
+		$object->login       = $login;
+		$object->pass        = $pass;
+		$object->birth       = $birthdate;
+		$object->photo       = $photo;
+		$object->typeid      = $typeid;
+		//$object->note        = $comment;
+		$object->morphy      = $morphy;
+		$object->user_id     = $userid;
+		$object->fk_soc      = $socid;
+		$object->public      = $public;
+
+		// Fill array 'array_options' with data from add form
+		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+		if ($ret < 0) $error++;
+
+		// Check parameters
+		if (empty($morphy) || $morphy == "-1") {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Nature")), null, 'errors');
+		}
+		// Tests if the login already exists
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			if (empty($login)) {
+				$error++;
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Login")), null, 'errors');
+			}
+			else {
+				$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape($login)."'";
+				$result = $db->query($sql);
+				if ($result) {
+					$num = $db->num_rows($result);
+				}
+				if ($num) {
+					$error++;
+					$langs->load("errors");
+					setEventMessages($langs->trans("ErrorLoginAlreadyExists",$login), null, 'errors');
+				}
+			}
+			if (empty($pass)) {
+				$error++;
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Password")), null, 'errors');
+			}
+		}
+		if ($morphy == 'mor' && empty($societe)) {
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors');
+		}
+		if ($morphy != 'mor' && empty($lastname)) {
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Lastname")), null, 'errors');
+		}
+		if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Firstname")), null, 'errors');
+		}
+		if (! ($typeid > 0)) {	// Keep () before !
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+		}
+		if ($conf->global->ADHERENT_MAIL_REQUIRED && ! isValidEMail($email)) {
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorBadEMail",$email), null, 'errors');
+		}
+		$public=0;
+		if (isset($public)) $public=1;
+
+		if (! $error)
+		{
+			$db->begin();
+
+			// Email about right and login does not exist
+			$result=$object->create($user);
+			if ($result > 0)
+			{
+				// Foundation categories
+				$memcats = GETPOST('memcats', 'array');
+				$object->setCategories($memcats);
+
+				$db->commit();
+				$rowid=$object->id;
+				$id=$object->id;
+				$action='';
+			}
+			else
+			{
+				$db->rollback();
+
+				if ($object->error) {
+					setEventMessages($object->error, $object->errors, 'errors');
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+
+				$action = 'create';
+			}
+		}
+		else {
+			$action = 'create';
+		}
+	}
+
+	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
+	{
+		$result=$object->delete($id);
+		if ($result > 0)
+		{
+			if (! empty($backtopage))
+			{
+				header("Location: ".$backtopage);
+				exit;
+			}
+			else
+			{
+				header("Location: list.php");
+				exit;
+			}
+		}
+		else
+		{
+			$errmesg=$object->error;
+		}
+	}
+
+	if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes')
+	{
+		$error=0;
+
+		$db->begin();
+
+		$adht = new AdherentType($db);
+		$adht->fetch($object->typeid);
+
+		$result=$object->validate($user);
+
+		if ($result >= 0 && ! count($object->errors))
+		{
+			// Send confirmation email (according to parameters of member type. Otherwise generic)
+			if ($object->email && GETPOST("send_mail"))
+			{
+				$result=$object->send_an_email($adht->getMailOnValid(),$conf->global->ADHERENT_MAIL_VALID_SUBJECT,array(),array(),array(),"","",0,2);
+				if ($result < 0)
+				{
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
+		}
+		else
+		{
+			$error++;
+			if ($object->error) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+
+		if (! $error)
+		{
+			$db->commit();
+		}
+		else
+		{
+			$db->rollback();
+		}
+		$action='';
+	}
+
+	if ($user->rights->adherent->supprimer && $action == 'confirm_resign')
+	{
+		$error = 0;
+
+		if ($confirm == 'yes')
+		{
+			$adht = new AdherentType($db);
+			$adht->fetch($object->typeid);
+
+			$result=$object->resiliate($user);
+
+			if ($result >= 0 && ! count($object->errors))
+			{
+				if ($object->email && GETPOST("send_mail"))
+				{
+					$result=$object->send_an_email($adht->getMailOnResiliate(),$conf->global->ADHERENT_MAIL_RESIL_SUBJECT,array(),array(),array(),"","",0,-1);
+				}
+				if ($result < 0)
+				{
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
+			else
+			{
+				$error++;
+
+				if ($object->error) {
+					setEventMessages($object->error, $object->errors, 'errors');
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+				$action='';
+			}
+		}
+		if (! empty($backtopage) && ! $error)
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+	}
+
+	// SPIP Management
+	if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $confirm == 'yes')
+	{
+		if (! count($object->errors))
+		{
+			if (!$mailmanspip->del_to_spip($object))
+			{
+				setEventMessages($langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error, null, 'errors');
+			}
+		}
+	}
+
+	if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes')
+	{
+		if (! count($object->errors))
+		{
+			if (!$mailmanspip->add_to_spip($object))
+			{
+				setEventMessages($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, null, 'errors');
+			}
+		}
+	}
+	
+	// Actions to build doc
+	$upload_dir = $conf->adherent->dir_output;
+	$permissioncreate=$user->rights->adherent->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formcompany = new FormCompany($db);
+
+$title=$langs->trans("Member") . " - " . $langs->trans("Card");
+$help_url='EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
+llxHeader('',$title,$help_url);
+
+$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
+{
+	// -----------------------------------------
+	// When used with CANVAS
+	// -----------------------------------------
+	if (empty($object->error) && $id)
+	{
+		$object = new Adherent($db);
+		$result=$object->fetch($id);
+		if ($result <= 0) dol_print_error('',$object->error);
+	}
+   	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
+    $objcanvas->display_canvas($action);							// Show template
+}
+else
+{
+	// -----------------------------------------
+	// When used in standard mode
+	// -----------------------------------------
+
+	if ($action == 'create')
+	{
+		/* ************************************************************************** */
+		/*                                                                            */
+		/* Creation mode                                                              */
+		/*                                                                            */
+		/* ************************************************************************** */
+		$object->canvas=$canvas;
+		$object->state_id = GETPOST('state_id', 'int');
+
+		// We set country_id, country_code and country for the selected country
+		$object->country_id=GETPOST('country_id','int')?GETPOST('country_id','int'):$mysoc->country_id;
+		if ($object->country_id)
+		{
+			$tmparray=getCountry($object->country_id,'all');
+			$object->country_code=$tmparray['code'];
+			$object->country=$tmparray['label'];
+		}
+
+		$adht = new AdherentType($db);
+
+		print load_fiche_titre($langs->trans("NewMember"));
+
+		if ($conf->use_javascript_ajax)
+		{
+			print "\n".'<script type="text/javascript" language="javascript">';
+			print 'jQuery(document).ready(function () {
+						jQuery("#selectcountry_id").change(function() {
+							document.formsoc.action.value="create";
+							document.formsoc.submit();
+						});
+						function initfieldrequired()
+						{
+							jQuery("#tdcompany").removeClass("fieldrequired");
+							jQuery("#tdlastname").removeClass("fieldrequired");
+							jQuery("#tdfirstname").removeClass("fieldrequired");
+							if (jQuery("#morphy").val() == \'mor\')
+							{
+								jQuery("#tdcompany").addClass("fieldrequired");
+							}
+							if (jQuery("#morphy").val() == \'phy\')
+							{
+								jQuery("#tdlastname").addClass("fieldrequired");
+								jQuery("#tdfirstname").addClass("fieldrequired");
+							}
+						}
+						jQuery("#morphy").change(function() {
+							initfieldrequired();
+						});
+						initfieldrequired();
+					})';
+			print '</script>'."\n";
+		}
+
+		print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="add">';
+
+        dol_fiche_head('');
+
+		print '<table class="border" width="100%">';
+		print '<tbody>';
+
+		// Login
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="member_login" class="maxwidth200" value="'.(isset($_POST["member_login"])?GETPOST("member_login", 'alpha', 2):$object->login).'"></td></tr>';
+		}
+
+		// Type
+		print '<tr><td class="fieldrequired">'.$langs->trans("MemberType").'</td><td>';
+		$listetype=$adht->liste_array();
+		if (count($listetype))
+		{
+			print $form->selectarray("typeid", $listetype, GETPOST('typeid','int')?GETPOST('typeid','int'):$typeid, count($listetype)>1?1:0);
+		} else {
+			print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
+		}
+		print "</td>\n";
+
+		// Morphy
+		$morphys["phy"] = $langs->trans("Physical");
+		$morphys["mor"] = $langs->trans("Moral");
+		print '<tr><td class="fieldrequired">'.$langs->trans("Nature")."</td><td>\n";
+		print $form->selectarray("morphy", $morphys, GETPOST('morphy','alpha')?GETPOST('morphy','alpha'):$object->morphy, 1);
+		print "</td>\n";
+
+		// Company
+		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(GETPOST('societe','alpha')?GETPOST('societe','alpha'):$object->societe).'"></td></tr>';
+
+		// Civility
+		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
+		print $formcompany->select_civility(GETPOST('civility_id','int')?GETPOST('civility_id','int'):$object->civility_id,'civility_id').'</td>';
+		print '</tr>';
+
+		// Lastname
+		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.(GETPOST('lastname','alpha')?GETPOST('lastname','alpha'):$object->lastname).'" size="40"></td>';
+		print '</tr>';
+
+		// Firstname
+		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(GETPOST('firstname','alpha')?GETPOST('firstname','alpha'):$object->firstname).'"></td>';
+		print '</tr>';
+
+		// EMail
+		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(GETPOST('member_email','alpha')?GETPOST('member_email','alpha'):$object->email).'"></td></tr>';
+
+		// Password
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+			$generated_password=getRandomPassword(false);
+			print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
+			print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">';
+			print '</td></tr>';
+		}
+
+		// Address
+		print '<tr><td class="tdtop">'.$langs->trans("Address").'</td><td>';
+		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(GETPOST('address','alpha')?GETPOST('address','alpha'):$object->address).'</textarea>';
+		print '</td></tr>';
+
+		// Zip / Town
+		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
+		print $formcompany->select_ziptown((GETPOST('zipcode','alpha')?GETPOST('zipcode','alpha'):$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
+		print ' ';
+		print $formcompany->select_ziptown((GETPOST('town','alpha')?GETPOST('town','alpha'):$object->town),'town',array('zipcode','selectcountry_id','state_id'));
+		print '</td></tr>';
+
+		// Country
+		$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;
+		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
+		print $form->select_country(GETPOST('country_id','alpha')?GETPOST('country_id','alpha'):$object->country_id,'country_id');
+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		print '</td></tr>';
+
+		// State
+		if (empty($conf->global->MEMBER_DISABLE_STATE))
+		{
+			print '<tr><td>'.$langs->trans('State').'</td><td>';
+			if ($object->country_id)
+			{
+				print $formcompany->select_state(GETPOST('state_id','int')?GETPOST('state_id','int'):$object->state_id,$object->country_code);
+			}
+			else
+			{
+				print $countrynotdefined;
+			}
+			print '</td></tr>';
+		}
+
+		// Pro phone
+		print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.(GETPOST('phone','alpha')?GETPOST('phone','alpha'):$object->phone).'"></td></tr>';
+
+		// Personal phone
+		print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.(GETPOST('phone_perso','alpha')?GETPOST('phone_perso','alpha'):$object->phone_perso).'"></td></tr>';
+
+		// Mobile phone
+		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(GETPOST('phone_mobile','alpha')?GETPOST('phone_mobile','alpha'):$object->phone_mobile).'"></td></tr>';
+
+	    // Skype
+	    if (! empty($conf->skype->enabled))
+	    {
+			print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="member_skype" size="40" value="'.(GETPOST('member_skype','alpha')?GETPOST('member_skype','alpha'):$object->skype).'"></td></tr>';
+	    }
+
+		// Birthday
+		print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
+		$form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
+		print "</td></tr>\n";
+
+		// Public profil
+		print "<tr><td>".$langs->trans("Public")."</td><td>\n";
+		print $form->selectyesno("public",$object->public,1);
+		print "</td></tr>\n";
+
+		// Categories
+		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
+		{
+			print '<tr><td>' . fieldLabel('Categories', 'memcars') . '</td><td>';
+			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, 'parent', null, null, 1);
+			print $form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, null, null, '100%');
+			print "</td></tr>";
+		}
+
+		// Other attributes
+		$parameters=array();
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print $object->showOptionals($extrafields,'edit');
+		}
+
+		/*
+		 // Third party Dolibarr
+		if (! empty($conf->societe->enabled))
+		{
+		print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td class="valeur">';
+		print $form->select_company($object->fk_soc,'socid','',1);
+		print '</td></tr>';
+		}
+
+		// Login Dolibarr
+		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td class="valeur">';
+		print $form->select_dolusers($object->user_id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+		print '</td></tr>';
+		*/
+        print '<tbody>';
+		print "</table>\n";
+
+        dol_fiche_end();
+
+	    print '<div class="center">';
+	    print '<input type="submit" name="button" class="button" value="'.$langs->trans("AddMember").'">';
+	    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
+	    print '</div>';
+
+		print "</form>\n";
+	}
+
+	if ($action == 'edit')
+	{
+		/********************************************
+		*
+		* Edition mode
+		*
+		********************************************/
+
+		$res=$object->fetch($id);
+		if ($res < 0) {
+			dol_print_error($db,$object->error); exit;
+		}
+		$res=$object->fetch_optionals($object->id,$extralabels);
+		if ($res < 0) {
+			dol_print_error($db); exit;
+		}
+
+		$adht = new AdherentType($db);
+		$adht->fetch($object->typeid);
+
+		// We set country_id, and country_code, country of the chosen country
+		$country=GETPOST('country','int');
+		if (!empty($country) || $object->country_id)
+		{
+			$sql = "SELECT rowid, code, label from ".MAIN_DB_PREFIX."c_country where rowid = ".(!empty($country)?$country:$object->country_id);
+			$resql=$db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+			}
+			else
+			{
+				dol_print_error($db);
+			}
+			$object->country_id=$obj->rowid;
+			$object->country_code=$obj->code;
+			$object->country=$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label;
+		}
+
+		$head = member_prepare_head($object);
+
+
+		if ($conf->use_javascript_ajax)
+		{
+			print "\n".'<script type="text/javascript" language="javascript">';
+			print 'jQuery(document).ready(function () {
+				jQuery("#selectcountry_id").change(function() {
+					document.formsoc.action.value="edit";
+					document.formsoc.submit();
+				});
+				function initfieldrequired()
+				{
+					jQuery("#tdcompany").removeClass("fieldrequired");
+					jQuery("#tdlastname").removeClass("fieldrequired");
+					jQuery("#tdfirstname").removeClass("fieldrequired");
+					if (jQuery("#morphy").val() == \'mor\')
+					{
+						jQuery("#tdcompany").addClass("fieldrequired");
+					}
+					if (jQuery("#morphy").val() == \'phy\')
+					{
+						jQuery("#tdlastname").addClass("fieldrequired");
+						jQuery("#tdfirstname").addClass("fieldrequired");
+					}
+				}
+				jQuery("#morphy").change(function() {
+					initfieldrequired();
+				});
+				initfieldrequired();
+			})';
+			print '</script>'."\n";
+		}
+
+		print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+		print '<input type="hidden" name="action" value="update" />';
+		print '<input type="hidden" name="rowid" value="'.$id.'" />';
+		print '<input type="hidden" name="statut" value="'.$object->statut.'" />';
+		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
+
+		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
+
+		print '<table class="border" width="100%">';
+
+		// Ref
+		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur" colspan="2">'.$object->id.'</td></tr>';
+
+		// Login
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td colspan="2"><input type="text" name="login" class="maxwidth200" value="'.(isset($_POST["login"])?GETPOST("login",'alpha',2):$object->login).'"></td></tr>';
+		}
+
+		// Morphy
+		$morphys["phy"] = $langs->trans("Physical");
+		$morphys["mor"] = $langs->trans("Morale");
+		print '<tr><td><span class="fieldrequired">'.$langs->trans("Nature").'</span></td><td>';
+		print $form->selectarray("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$object->morphy);
+		print "</td></tr>";
+
+		// Type
+		print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+		if ($user->rights->adherent->creer)
+		{
+			print $form->selectarray("typeid", $adht->liste_array(), (isset($_POST["typeid"])?$_POST["typeid"]:$object->typeid));
+		}
+		else
+		{
+			print $adht->getNomUrl(1);
+			print '<input type="hidden" name="typeid" value="'.$object->typeid.'">';
+		}
+		print "</td></tr>";
+
+		// Company
+		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(isset($_POST["societe"])?GETPOST("societe",'',2):$object->societe).'"></td></tr>';
+
+		// Civility
+		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
+		print $formcompany->select_civility(isset($_POST["civility_id"])?$_POST["civility_id"]:$object->civility_id)."\n";
+		print '</td>';
+		print '</tr>';
+
+		// Lastname
+		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" size="40" value="'.(isset($_POST["lastname"])?GETPOST("lastname",'',2):$object->lastname).'"></td>';
+		print '</tr>';
+
+		// Firstname
+		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(isset($_POST["firstname"])?GETPOST("firstname",'',3):$object->firstname).'"></td>';
+		print '</tr>';
+
+		// Photo
+		print '<tr><td>'.$langs->trans("Photo").'</td>';
+		print '<td class="hideonsmartphone" valign="middle">';
+		print $form->showphoto('memberphoto',$object)."\n";
+		if ($caneditfieldmember)
+		{
+			if ($object->photo) print "<br>\n";
+			print '<table class="nobordernopadding">';
+			if ($object->photo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+			print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
+			print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
+			print '</table>';
+		}
+		print '</td></tr>';
+
+		// EMail
+		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.(isset($_POST["email"])?GETPOST("email",'',2):$object->email).'"></td></tr>';
+
+		// Password
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="maxwdith200" value="'.(isset($_POST["pass"])?GETPOST("pass",'',2):$object->pass).'"></td></tr>';
+		}
+
+		// Address
+		print '<tr><td>'.$langs->trans("Address").'</td><td>';
+		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(isset($_POST["address"])?GETPOST("address",'',2):$object->address).'</textarea>';
+		print '</td></tr>';
+
+		// Zip / Town
+		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
+		print $formcompany->select_ziptown((isset($_POST["zipcode"])?GETPOST("zipcode",'',2):$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
+		print ' ';
+		print $formcompany->select_ziptown((isset($_POST["town"])?GETPOST("town",'',2):$object->town),'town',array('zipcode','selectcountry_id','state_id'));
+		print '</td></tr>';
+
+		// Country
+		//$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;    // In edit mode we don't force to company country if not defined
+		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
+		print $form->select_country(isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'country_id');
+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		print '</td></tr>';
+
+		// State
+		if (empty($conf->global->MEMBER_DISABLE_STATE))
+		{
+			print '<tr><td>'.$langs->trans('State').'</td><td>';
+			print $formcompany->select_state($object->state_id,isset($_POST["country_id"])?GETPOST("country_id"):$object->country_id);
+			print '</td></tr>';
+		}
+
+		// Pro phone
+		print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.(isset($_POST["phone"])?GETPOST("phone"):$object->phone).'"></td></tr>';
+
+		// Personal phone
+		print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.(isset($_POST["phone_perso"])?GETPOST("phone_perso"):$object->phone_perso).'"></td></tr>';
+
+		// Mobile phone
+		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(isset($_POST["phone_mobile"])?GETPOST("phone_mobile"):$object->phone_mobile).'"></td></tr>';
+
+	    // Skype
+	    if (! empty($conf->skype->enabled))
+	    {
+			    print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="skype" size="40" value="'.(isset($_POST["skype"])?GETPOST("skype"):$object->skype).'"></td></tr>';
+	    }
+
+		// Birthday
+		print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
+		$form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
+		print "</td></tr>\n";
+
+		// Public profil
+		print "<tr><td>".$langs->trans("Public")."</td><td>\n";
+		print $form->selectyesno("public",(isset($_POST["public"])?GETPOST("public",'',2):$object->public),1);
+		print "</td></tr>\n";
+
+		// Categories
+		if (! empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire ))
+		{
+			print '<tr><td>' . fieldLabel('Categories', 'memcats') . '</td>';
+			print '<td colspan="2">';
+			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
+			$c = new Categorie($db);
+			$cats = $c->containing($object->id, Categorie::TYPE_MEMBER);
+			foreach ($cats as $cat) {
+				$arrayselected[] = $cat->id;
+			}
+			print $form->multiselectarray('memcats', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+			print "</td></tr>";
+		}
+
+		// Other attributes
+		$parameters=array("colspan"=>2);
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print $object->showOptionals($extrafields,'edit',$parameters);
+		}
+
+		// Third party Dolibarr
+		if (! empty($conf->societe->enabled))
+		{
+			print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2" class="valeur">';
+			if ($object->fk_soc)
+			{
+				$company=new Societe($db);
+				$result=$company->fetch($object->fk_soc);
+				print $company->getNomUrl(1);
+			}
+			else
+			{
+				print $langs->trans("NoThirdPartyAssociatedToMember");
+			}
+			print '</td></tr>';
+		}
+
+		// Login Dolibarr
+		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td colspan="2" class="valeur">';
+		if ($object->user_id)
+		{
+			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
+		}
+		else print $langs->trans("NoDolibarrAccess");
+		print '</td></tr>';
+
+		print '</table>';
+
+		dol_fiche_end();
+
+		print '<div class="center">';
+		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
+		print '</div>';
+
+		print '</form>';
+
+	}
+
+	if ($id > 0 && $action != 'edit')
+	{
+		/* ************************************************************************** */
+		/*                                                                            */
+		/* View mode                                                                  */
+		/*                                                                            */
+		/* ************************************************************************** */
+
+		$res=$object->fetch($id);
+		if ($res < 0) {
+			dol_print_error($db,$object->error); exit;
+		}
+		$res=$object->fetch_optionals($object->id,$extralabels);
+		if ($res < 0) {
+			dol_print_error($db); exit;
+		}
+
+		$adht = new AdherentType($db);
+		$res=$adht->fetch($object->typeid);
+		if ($res < 0) {
+			dol_print_error($db); exit;
+		}
+
+
+		/*
+		 * Show tabs
+		 */
+		$head = member_prepare_head($object);
+
+		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
+
+		// Confirm create user
+		if ($action == 'create_user')
+		{
+			$login=$object->login;
+			if (empty($login))
+			{
+				// Full firstname and name separated with a dot : firstname.name
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+				$login=dol_buildlogin($object->lastname,$object->firstname);
+			}
+			if (empty($login)) $login=strtolower(substr($object->firstname, 0, 4)) . strtolower(substr($object->lastname, 0, 4));
+
+			// Create a form array
+			$formquestion=array(
+					array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
+			);
+			$text=$langs->trans("ConfirmCreateLogin").'<br>';
+			if (! empty($conf->societe->enabled))
+			{
+				if ($object->fk_soc > 0) $text.=$langs->trans("UserWillBeExternalUser");
+				else $text.=$langs->trans("UserWillBeInternalUser");
+			}
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrLogin"),$text,"confirm_create_user",$formquestion,'yes');
+		}
+
+		// Confirm create third party
+		if ($action == 'create_thirdparty')
+		{
+			$name = $object->getFullName($langs);
+			if (! empty($name))
+			{
+				if ($object->societe) $name.=' ('.$object->societe.')';
+			}
+			else
+			{
+				$name=$object->societe;
+			}
+
+			// Create a form array
+			$formquestion=array(		array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
+
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
+		}
+
+		// Confirm validate member
+		if ($action == 'valid')
+		{
+			$langs->load("mails");
+
+			$adht = new AdherentType($db);
+			$adht->fetch($object->typeid);
+
+			$subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_VALID_SUBJECT);
+			$texttosend=$object->makeSubstitution($adht->getMailOnValid());
+
+			$tmp=$langs->trans("SendAnEMailToMember");
+			$tmp.='<br>('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
+			$tmp.=$langs->trans("MailRecipient").': <b>'.$object->email.'</b>)';
+			$helpcontent='';
+			$helpcontent.='<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
+			$helpcontent.='<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
+			$helpcontent.='<b>'.$langs->trans("Subject").'</b>:<br>'."\n";
+			$helpcontent.=$subjecttosend."\n";
+			$helpcontent.="<br>";
+			$helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
+			$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
+			$label=$form->textwithpicto($tmp,$helpcontent,1,'help');
+
+			// Create form popup
+			$formquestion=array();
+			if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label,  'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?true:false));
+			if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_MAILMAN)) {
+				$formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroMailManEnabled"),'value'=>'');
+			}
+			if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))    {
+				$formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroSpipEnabled"),'value'=>'');
+			}
+			print $form->formconfirm("card.php?rowid=".$id,$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion,1,1);
+		}
+
+		// Confirm send card by mail
+		if ($action == 'sendinfo')
+		{
+			print $form->formconfirm("card.php?rowid=".$id,$langs->trans("SendCardByMail"),$langs->trans("ConfirmSendCardByMail",$object->email),"confirm_sendinfo",'',0,1);
+		}
+
+		// Confirm terminate
+		if ($action == 'resign')
+		{
+			$langs->load("mails");
+
+			$adht = new AdherentType($db);
+			$adht->fetch($object->typeid);
+
+			$subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_RESIL_SUBJECT);
+			$texttosend=$object->makeSubstitution($adht->getMailOnResiliate());
+
+			$tmp=$langs->trans("SendAnEMailToMember");
+			$tmp.='<br>('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
+			$tmp.=$langs->trans("MailRecipient").': <b>'.$object->email.'</b>)';
+			$helpcontent='';
+			$helpcontent.='<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
+			$helpcontent.='<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
+			$helpcontent.='<b>'.$langs->trans("Subject").'</b>:<br>'."\n";
+			$helpcontent.=$subjecttosend."\n";
+			$helpcontent.="<br>";
+			$helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
+			$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
+			$label=$form->textwithpicto($tmp,$helpcontent,1,'help');
+
+			// Create an array
+			$formquestion=array();
+			if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?'true':'false'));
+			if ($backtopage)    $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
+			print $form->formconfirm("card.php?rowid=".$id,$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion,'no',1);
+		}
+
+		// Confirm remove member
+		if ($action == 'delete')
+		{
+			$formquestion=array();
+			if ($backtopage) $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
+			print $form->formconfirm("card.php?rowid=".$id,$langs->trans("DeleteMember"),$langs->trans("ConfirmDeleteMember"),"confirm_delete",$formquestion,0,1);
+		}
+
+		// Confirm add in spip
+		if ($action == 'add_spip')
+		{
+			print $form->formconfirm("card.php?rowid=".$id, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip');
+		}
+		// Confirm removed from spip
+		if ($action == 'del_spip')
+		{
+			print $form->formconfirm("card.php?rowid=$id", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip');
+		}
+
+		$rowspan=17;
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
+		if (! empty($conf->societe->enabled)) $rowspan++;
+
+		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
+		
+		dol_banner_tab($object, 'rowid', $linkback);
+        
+        print '<div class="fichecenter">';
+        print '<div class="fichehalfleft">';
+        
+        print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent">';
+
+		// Login
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+		}
+
+		// Type
+		print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
+
+		// Morphy
+		print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
+		print '</tr>';
+
+		// Company
+		print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->societe.'</td></tr>';
+
+		// Civility
+		print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
+		print '</tr>';
+
+		// Password
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i','*',$object->pass);
+			if ($object->pass) print preg_replace('/./i','*',$object->pass);
+			else
+			{
+			    if ($user->admin) print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
+			    else print $langs->trans("Hidden");
+			}
+			if ((! empty($object->pass) || ! empty($object->pass_crypted)) && empty($object->user_id))
+			{
+			    $langs->load("errors");
+			    $htmltext=$langs->trans("WarningPasswordSetWithNoAccount");
+			    print ' '.$form->textwithpicto('', $htmltext,1,'warning');
+			}
+			print '</td></tr>';
+		}
+		
+        print '</table>';
+        
+        print '</div>';
+        print '<div class="fichehalfright"><div class="ficheaddleft">';
+       
+        print '<div class="underbanner clearboth"></div>';
+        print '<table class="border tableforfield" width="100%">';
+		
+		// Birthday
+		print '<tr><td class="titlefield">'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';
+
+		// Public
+		print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
+
+		// Categories
+		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
+		{
+			print '<tr><td>' . $langs->trans("Categories") . '</td>';
+			print '<td colspan="2">';
+			print $form->showCategories($object->id, 'member', 1);
+			print '</td></tr>';
+		}
+
+		// Other attributes
+		$parameters=array('colspan'=>2);
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print $object->showOptionals($extrafields, 'view', $parameters);
+		}
+
+        // Date end subscription
+        print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
+        if ($object->datefin)
+        {
+            print dol_print_date($object->datefin,'day');
+            if ($object->hasDelay()) {
+                print " ".img_warning($langs->trans("Late"));
+            }
+        }
+        else
+        {
+	        if (! $adht->subscription)
+	        {
+	        	print $langs->trans("SubscriptionNotRecorded");
+		        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
+	        }
+	        else
+	        {
+	            print $langs->trans("SubscriptionNotReceived");
+	            if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
+	        }
+        }
+        print '</td></tr>';
+		
+		// Third party Dolibarr
+		if (! empty($conf->societe->enabled))
+		{
+			print '<tr><td>';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans("LinkedToDolibarrThirdParty");
+			print '</td>';
+			if ($action != 'editthirdparty' && $user->rights->adherent->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'),1).'</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="2" class="valeur">';
+			if ($action == 'editthirdparty')
+			{
+				$htmlname='socid';
+				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
+				print '<input type="hidden" name="rowid" value="'.$object->id.'">';
+				print '<input type="hidden" name="action" value="set'.$htmlname.'">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+				print '<tr><td>';
+				print $form->select_company($object->fk_soc,'socid','',1);
+				print '</td>';
+				print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+				print '</tr></table></form>';
+			}
+			else
+			{
+				if ($object->fk_soc)
+				{
+					$company=new Societe($db);
+					$result=$company->fetch($object->fk_soc);
+					print $company->getNomUrl(1);
+				}
+				else
+				{
+					print $langs->trans("NoThirdPartyAssociatedToMember");
+				}
+			}
+			print '</td></tr>';
+		}
+
+		// Login Dolibarr
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans("LinkedToDolibarrUser");
+		print '</td>';
+		if ($action != 'editlogin' && $user->rights->adherent->creer)
+		{
+			print '<td align="right">';
+			if ($user->rights->user->user->creer)
+			{
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=editlogin&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'),1).'</a>';
+			}
+			print '</td>';
+		}
+		print '</tr></table>';
+		print '</td><td colspan="2" class="valeur">';
+		if ($action == 'editlogin')
+		{
+			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'userid','');
+		}
+		else
+		{
+			if ($object->user_id)
+			{
+				$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
+			}
+			else print $langs->trans("NoDolibarrAccess");
+		}
+		print '</td></tr>';
+
+		print "</table>\n";
+
+		print "</div></div></div>\n";
+        print '<div style="clear:both"></div>';
+
+        dol_fiche_end();
+        
+        
+		/*
+		 * Hotbar
+		 */
+        
+		print '<div class="tabsAction">';
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+		if (empty($reshook)) {
+			if ($action != 'valid' && $action != 'editlogin' && $action != 'editthirdparty')
+			{
+				// Modify
+				if ($user->rights->adherent->creer)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=edit">'.$langs->trans("Modify")."</a></div>";
+				}
+				else
+				{
+					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>';
+				}
+	
+				// Validate
+				if ($object->statut == -1)
+				{
+					if ($user->rights->adherent->creer)
+					{
+						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Validate")."</a></div>\n";
+					}
+					else
+					{
+						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>';
+					}
+				}
+	
+				// Reactivate
+				if ($object->statut == 0)
+				{
+					if ($user->rights->adherent->creer)
+					{
+						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Reenable")."</a></div>\n";
+					}
+					else
+					{
+						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable")."</font></div>";
+					}
+				}
+	
+				// Send card by email
+				if ($user->rights->adherent->creer)
+				{
+					if ($object->statut >= 1)
+					{
+						if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=sendinfo">'.$langs->trans("SendCardByMail")."</a></div>\n";
+						else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendCardByMail")."</a></div>\n";
+					}
+					else
+					{
+						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("SendCardByMail")."</font></div>";
+					}
+				}
+				else
+				{
+					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</font></div>";
+				}
+	
+				// Terminate
+				if ($object->statut >= 1)
+				{
+					if ($user->rights->adherent->supprimer)
+					{
+						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=resign">'.$langs->trans("Resiliate")."</a></div>\n";
+					}
+					else
+					{
+						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate")."</font></div>";
+					}
+				}
+	
+				// Create third party
+				if (! empty($conf->societe->enabled) && ! $object->fk_soc)
+				{
+					if ($user->rights->societe->creer)
+					{
+						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
+						else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
+					}
+					else
+					{
+						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrThirdParty")."</font></div>";
+					}
+				}
+	
+				// Create user
+				if (! $user->societe_id && ! $object->user_id)
+				{
+					if ($user->rights->user->user->creer)
+					{
+						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
+						else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
+					}
+					else
+					{
+						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
+					}
+				}
+	
+				// Delete
+				if ($user->rights->adherent->supprimer)
+				{
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>\n";
+				}
+				else
+				{
+					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
+				}
+	
+				// Action SPIP
+				if (! empty($conf->mailmanspip->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))
+				{
+					$isinspip = $mailmanspip->is_in_spip($object);
+	
+					if ($isinspip == 1)
+					{
+						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip")."</a></div>\n";
+					}
+					if ($isinspip == 0)
+					{
+						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
+					}
+				}
+	
+			}
+		}
+		print '</div>';
+
+		if ($isinspip == -1)
+		{
+			print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
+		}
+
+		
+		
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
+		
+		// Documents generes
+		$filename = dol_sanitizeFileName($object->ref);
+		//$filename =  'tmp_cards.php';
+		//$filedir = $conf->adherent->dir_output . '/' . get_exdir($object->id, 2, 0, 0, $object, 'member') . dol_sanitizeFileName($object->ref);
+		$filedir = $conf->adherent->dir_output . '/' . get_exdir(0, 0, 0, 0, $object, 'member');
+		$urlsource = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
+		$genallowed = $user->rights->adherent->creer;
+		$delallowed = $user->rights->adherent->supprimer;
+
+		print $formfile->showdocuments('member', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $object->default_lang, '', $object);
+		$somethingshown = $formfile->numoffiles;
+		
+		// Show links to link elements
+		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription'));
+		//$somethingshown = $form->showLinkedObjectBlock($object, '');
+		
+		// Show links to link elements
+		/*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
+		 if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
+		
+		 // Link for paypal payment
+		 /*
+		 if (! empty($conf->paypal->enabled) && $object->statut != 0) {
+		 include_once DOL_DOCUMENT_ROOT . '/paypal/lib/paypal.lib.php';
+		 print showPaypalPaymentUrl('invoice', $object->ref);
+		 }
+		 */
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		
+		// List of actions on element
+        /* Already in tab Agenda/Events
+        include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, 'member', $socid);
+		*/
+		print '</div></div></div>';		
+		
+	}
+}
+
+llxFooter();
+
+$db->close();

From 01a74a8d23cf1cec258260d4a360e40d24a03ab7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 31 Mar 2017 14:21:51 +0200
Subject: [PATCH 0511/1163] Work on 6.0 look and feel

---
 htdocs/admin/ihm.php                          |  25 +-
 htdocs/comm/action/card.php                   |  28 +-
 htdocs/comm/action/document.php               |  11 +-
 htdocs/comm/action/index.php                  |   2 +-
 htdocs/comm/action/info.php                   |   2 +-
 htdocs/comm/propal/card.php                   |   4 +-
 .../box_graph_invoices_supplier_permonth.php  |   2 +-
 htdocs/core/boxes/box_lastlogin.php           |   2 +-
 htdocs/core/boxes/modules_boxes.php           |  21 +-
 htdocs/core/class/html.form.class.php         |   6 +-
 htdocs/core/lib/functions.lib.php             |  63 ++--
 htdocs/core/lib/usergroups.lib.php            |  57 ++--
 htdocs/imports/import.php                     |  13 +-
 .../mycompany/background_dolibarr.jpg         | Bin 0 -> 337251 bytes
 htdocs/langs/en_US/exports.lang               |   1 +
 htdocs/resource/element_resource.php          |   6 +-
 htdocs/societe/card.php                       |   6 +-
 htdocs/societe/class/societe.class.php        |  15 +-
 .../tpl/linesalesrepresentative.tpl.php       |   2 +-
 htdocs/theme/eldy/img/refresh.png             | Bin 722 -> 205 bytes
 htdocs/theme/eldy/img/reload.png              | Bin 704 -> 0 bytes
 htdocs/theme/eldy/style.css.php               | 300 +++++-------------
 htdocs/theme/md/img/edit.png                  | Bin 148 -> 294 bytes
 htdocs/theme/md/img/reload.png                | Bin 205 -> 0 bytes
 htdocs/theme/md/style.css.php                 |  12 +-
 htdocs/user/class/user.class.php              |  24 +-
 26 files changed, 216 insertions(+), 386 deletions(-)
 create mode 100644 htdocs/install/doctemplates/mycompany/background_dolibarr.jpg
 delete mode 100644 htdocs/theme/eldy/img/reload.png
 delete mode 100644 htdocs/theme/md/img/reload.png

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index ff3bb89946b..65d168815c3 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -119,7 +119,7 @@ if ($action == 'update')
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $conf->entity);
     else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLENOTAB', implode(',',colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'),array())),'chaine',0,'',$conf->entity);
     
-    if (GETPOST('THEME_ELDY_USE_HOVER') == '') dolibarr_del_const($db, "THEME_ELDY_USE_HOVER", $conf->entity);
+    if (GETPOST('THEME_ELDY_USE_HOVER') == '') dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", '0', 'chaine', 0, '', $conf->entity);    // If empty, we set to '0' ('000000' is for black)
 	else dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $_POST["THEME_ELDY_USE_HOVER"], 'chaine', 0, '', $conf->entity);
 
 	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'),array()))));
@@ -142,9 +142,6 @@ if ($action == 'update')
 	dolibarr_set_const($db, "MAIN_HELP_DISABLELINK",			$_POST["MAIN_HELP_DISABLELINK"],'chaine',0,'',0);	    // Param for all entities
 	dolibarr_set_const($db, "MAIN_BUGTRACK_ENABLELINK",         $_POST["MAIN_BUGTRACK_ENABLELINK"],'chaine',0,'',$conf->entity);
 
-	// This one is not always defined
-	if (isset($_POST["MAIN_USE_PREVIEW_TABS"])) dolibarr_set_const($db, "MAIN_USE_PREVIEW_TABS", $_POST["MAIN_USE_PREVIEW_TABS"],'chaine',0,'',$conf->entity);
-
 	$varforimage='imagebackground'; $dirforimage=$conf->mycompany->dir_output.'/logos/';
 	if ($_FILES[$varforimage]["tmp_name"])
 	{
@@ -325,16 +322,6 @@ if ($action == 'edit')	// Edit
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
-    // Activate preview tab on element card
-    if (class_exists("Imagick"))
-	{
-	    print '<tr><td width="35%">'.$langs->trans("UsePreviewTabs").'</td><td>';
-	    print $form->selectyesno('MAIN_USE_PREVIEW_TABS',isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:0,1);
-	    print '</td>';
-		print '<td width="20">&nbsp;</td>';
-		print '</tr>';
-	}
-
     // First day for weeks
     print '<tr><td width="35%">'.$langs->trans("WeekStartOnDay").'</td><td>';
     print $formother->select_dayofweek((isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'),'MAIN_START_WEEK',0);
@@ -532,16 +519,6 @@ else	// Show
     print '<td width="20">&nbsp;</td>';
     print "</tr>";
 
-    // Activate preview tab on element card
-    if (class_exists("Imagick"))
-	{
-		
-	    print '<tr class="oddeven"><td width="35%">'.$langs->trans("UsePreviewTabs").'</td><td>';
-	    print yn(isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:0)."</td>";
-		print '<td width="20">&nbsp;</td>';
-		print "</tr>";
-	}
-
 	// First day for weeks
     print '<tr class="oddeven"><td width="35%">'.$langs->trans("WeekStartOnDay").'</td><td>';
     print $langs->trans("Day".(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'));
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index f853e88a0df..c5fe89593b6 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -752,6 +752,8 @@ if ($action == 'create')
 
 	print '</table>';
 	print '<br><br>';
+	
+	
 	print '<table class="border" width="100%">';
 
 	// Related company
@@ -1184,7 +1186,7 @@ if ($id > 0)
 	}
 	else
 	{
-		dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action');
+		dol_fiche_head($head, 'card', $langs->trans("Action"), -1, 'action');
 
 
 		// Clone event
@@ -1255,6 +1257,8 @@ if ($id > 0)
 		
 		dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref);
 		
+	    print '<div class="fichecenter">';
+	
 		print '<div class="underbanner clearboth"></div>';
 		
 		// Affichage fiche action en mode visu
@@ -1345,6 +1349,7 @@ if ($id > 0)
 
 		print '<br>';
 
+		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border" width="100%">';
 
 		if ($conf->societe->enabled)
@@ -1380,21 +1385,6 @@ if ($id > 0)
 			}
 			print '</td></tr>';
 		}
-
-		// Project
-		/*
-		if (! empty($conf->projet->enabled))
-		{
-			print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
-			if ($object->fk_project)
-			{
-				$project=new Project($db);
-				$project->fetch($object->fk_project);
-				print $project->getNomUrl(1,'',1);
-			}
-			print '</td></tr>';
-		}
-        */
 		
 		// Priority
 		print '<tr><td class="nowrap" class="titlefield">'.$langs->trans("Priority").'</td><td colspan="3">';
@@ -1423,7 +1413,9 @@ if ($id > 0)
 		//Extra field
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
-			print '<br><br><table class="border" width="100%">';
+			print '<br><br>';
+		    print '<div class="underbanner clearboth"></div>';
+			print '<table class="border" width="100%">';
 			foreach($extrafields->attribute_label as $key=>$label)
 			{
 				if (isset($_POST["options_" . $key])) {
@@ -1443,6 +1435,8 @@ if ($id > 0)
 			print '</table>';
 		}
 
+		print '</div>';
+		
 		dol_fiche_end();
 	}
 
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 241843623c2..3edc08d87cb 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -121,7 +121,7 @@ if ($object->id > 0)
 	$now=dol_now();
 	$delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
 
-	dol_fiche_head($head, 'documents', $langs->trans("Action"),0,'action');
+	dol_fiche_head($head, 'documents', $langs->trans("Action"), -1, 'action');
 
 	$linkback = img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
 	$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("BackToList").'</a>';
@@ -164,6 +164,8 @@ if ($object->id > 0)
 	
 	dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref);
 	
+	print '<div class="fichecenter">';
+	
 	print '<div class="underbanner clearboth"></div>';
 	
 	// Affichage fiche action en mode visu
@@ -236,9 +238,6 @@ if ($object->id > 0)
 
 	print '</table>';
 	
-
-	print '<br>';
-
 	print '<table class="border" width="100%">';
 
 	// Construit liste des fichiers
@@ -255,7 +254,9 @@ if ($object->id > 0)
 
 	print '</table>';
 
-	dol_fiche_end();
+    print '</div>';
+	
+    dol_fiche_end();
 
 
 	$modulepart = 'actions';
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 13fb3d9624f..5d9c84a22b6 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1332,7 +1332,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                         if ($user->rights->agenda->allactions->create ||
                             (($event->authorid == $user->id || $event->userownerid == $user->id) && $user->rights->agenda->myactions->create))
                         {
-                            $cssclass.= " movable";
+                            $cssclass.= " movable cursormove";
                         }else{
                             $cssclass.= " unmovable";
                         }
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 2ad3f424b12..7bee5550453 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -59,7 +59,7 @@ $object->fetch($id);
 $object->info($object->id);
 
 $head=actions_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans("Action"),0,'action');
+dol_fiche_head($head, 'info', $langs->trans("Action"), -1, 'action');
 
 $linkback = img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
 $linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("BackToList").'</a>';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 9b70ee36ace..444669a6f49 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1516,7 +1516,7 @@ if ($action == 'create')
 
 	// Public note
 	print '<tr>';
-	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
+	print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
 	print '<td valign="top" colspan="2">';
 	$note_public = $object->getDefaultCreateValueFor('note_public', (is_object($objectsrc)?$objectsrc->note_public:null));
 	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
@@ -1526,7 +1526,7 @@ if ($action == 'create')
 	if (empty($user->societe_id))
 	{
 		print '<tr>';
-		print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
+		print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
 		print '<td valign="top" colspan="2">';
         $note_private = $object->getDefaultCreateValueFor('note_private', ((! empty($origin) && ! empty($originid) && is_object($objectsrc))?$objectsrc->note_private:null));
 		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 315293281cc..7c3d6ab4e7f 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -223,7 +223,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfBillsByMonthHT");
 				$stringtoshow.='<br>';
 				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
+				$stringtoshow.='<input type="image" class="inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
 				$stringtoshow.='</form>';
 				$stringtoshow.='</div>';
 				if ($shownb && $showtot)
diff --git a/htdocs/core/boxes/box_lastlogin.php b/htdocs/core/boxes/box_lastlogin.php
index 7211877a593..05bd3043b0a 100644
--- a/htdocs/core/boxes/box_lastlogin.php
+++ b/htdocs/core/boxes/box_lastlogin.php
@@ -79,7 +79,7 @@ class box_lastlogin extends ModeleBoxes
         );
         $this->info_box_contents[$line][1] = array(
             'td' => '',
-            'text' => $user->getNomUrl(1),
+            'text' => $user->getNomUrl(-1),
             'asis' => 1
         );
         
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index c016741cb39..39f39524b41 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -247,25 +247,26 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
                     $s=dol_trunc($head['text'],isset($head['limit'])?$head['limit']:$MAXLENGTHBOX);
                     $out.= $s;
                 }
-                $out.= ' ';
-
-                $sublink='';
-                if (! empty($head['sublink']))  $sublink.= '<a href="'.$head['sublink'].'"'.(empty($head['target'])?' target="_blank"':'').'>';
-                if (! empty($head['subpicto'])) $sublink.= img_picto($head['subtext'], $head['subpicto'], 'class="'.(empty($head['subclass'])?'':$head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
-                if (! empty($head['sublink']))  $sublink.= '</a>';
+                $out.= '</td>';
+                
                 if (! empty($conf->use_javascript_ajax))
                 {
-                    $out.= '</td><td class="nocellnopadd boxclose nowrap">';
+                    $sublink='';
+                    if (! empty($head['sublink']))  $sublink.= '<a href="'.$head['sublink'].'"'.(empty($head['target'])?' target="_blank"':'').'>';
+                    if (! empty($head['subpicto'])) $sublink.= img_picto($head['subtext'], $head['subpicto'], 'class="'.(empty($head['subclass'])?'':$head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
+                    if (! empty($head['sublink']))  $sublink.= '</a>';
+                    
+                    $out.= '<td class="nocellnopadd boxclose right nowraponall">';
                     $out.=$sublink;
                     // The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
-                    $out.= img_picto($langs->trans("MoveBox",$this->box_id),'grip_title','class="boxhandle hideonsmartphone" style="cursor:move;"');
-                    $out.= img_picto($langs->trans("CloseBox",$this->box_id),'close_title','class="boxclose" rel="x:y" style="cursor:pointer;" id="imgclose'.$this->box_id.'"');
+                    $out.= img_picto($langs->trans("MoveBox",$this->box_id),'grip_title','class="boxhandle hideonsmartphone cursormove"');
+                    $out.= img_picto($langs->trans("CloseBox",$this->box_id),'close_title','class="boxclose cursorpointer" rel="x:y" id="imgclose'.$this->box_id.'"');
                     $label=$head['text'];
                     if (! empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')';
                     $out.= '<input type="hidden" id="boxlabelentry'.$this->box_id.'" value="'.dol_escape_htmltag($label).'">';
                     $out.= '</td></tr></table>';
                 }
-                $out.= '</td>';
+                
                 $out.= "</tr>\n";
             }
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 271f87ab4a0..99b27c20822 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -219,10 +219,10 @@ class Form
                 if (empty($notabletag)) $ret.='</td>';
 
                 if (empty($notabletag)) $ret.='<td align="left">';
-                else $ret.='<div class="clearboth"></div>';
-               	$ret.='<input type="submit" class="button'.(empty($notabletag)?'':' marginrightonly').'" name="modify" value="'.$langs->trans("Modify").'">';
+                //else $ret.='<div class="clearboth"></div>';
+               	$ret.='<input type="submit" class="button'.(empty($notabletag)?'':' ').'" name="modify" value="'.$langs->trans("Modify").'">';
                	if (preg_match('/ckeditor|textarea/',$typeofdata) && empty($notabletag)) $ret.='<br>'."\n";
-               	$ret.='<input type="submit" class="button'.(empty($notabletag)?'':' marginrightonly').'" name="cancel" value="'.$langs->trans("Cancel").'">';
+               	$ret.='<input type="submit" class="button'.(empty($notabletag)?'':' ').'" name="cancel" value="'.$langs->trans("Cancel").'">';
                	if (empty($notabletag)) $ret.='</td>';
 
                	if (empty($notabletag)) $ret.='</tr></table>'."\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ea92fb5a63b..6028f9bcabc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1164,7 +1164,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye); 
 		$morehtmlstatus.=$tmptxt;
 	}
-	elseif ($object->element == 'contrat') 
+	elseif ($object->element == 'contrat' || $object->element == 'contract') 
 	{
         if ($object->statut==0) $morehtmlstatus.=$object->getLibStatut(2);
         else $morehtmlstatus.=$object->getLibStatut(4);
@@ -2375,14 +2375,14 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
  *                                  			Example: picto.png                  if picto.png is stored into htdocs/theme/mytheme/img
  *                                  			Example: picto.png@mymodule         if picto.png is stored into htdocs/mymodule/img
  *                                  			Example: /mydir/mysubdir/picto.png  if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
- *	@param		string		$morealt			Add more attribute on img tag (For example 'style="float: right"')
+ *	@param		string		$moreatt			Add more attribute on img tag (For example 'style="float: right"')
  *	@param		int			$pictoisfullpath	If 1, image path is a full path
  *	@param		int			$srconly			Return only content of the src attribute of img.
  *  @param		int			$notitle			1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
  *  @return     string       				    Return img tag
  *  @see        #img_object, #img_picto_common
  */
-function img_picto($titlealt, $picto, $morealt = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
+function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
 {
 	global $conf;
 
@@ -2434,7 +2434,8 @@ function img_picto($titlealt, $picto, $morealt = '', $pictoisfullpath = false, $
 		if (preg_match('/:[^\s0-9]/',$titlealt)) $tmparray=explode(':',$titlealt);		// We explode if we have TextA:TextB. Not if we have TextA: TextB
 		$title=$tmparray[0];
 		$alt=empty($tmparray[1])?'':$tmparray[1];
-		return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($title).'"').($morealt?' '.$morealt:'').'>';	// Alt is used for accessibility, title for popup
+		if ($picto == 'refresh') var_dump($moreatt);
+		return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($title).'"').($moreatt?' '.$moreatt:' class="inline-block valigntextbottom"').'>';	// Alt is used for accessibility, title for popup
 	}
 }
 
@@ -2444,16 +2445,16 @@ function img_picto($titlealt, $picto, $morealt = '', $pictoisfullpath = false, $
  *	@param	string	$titlealt			Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param	string	$picto				Name of image to show object_picto (example: user, group, action, bill, contract, propal, product, ...)
  *										For external modules use imagename@mymodule to search into directory "img" of module.
- *	@param	string	$morealt			Add more attribute on img tag (ie: class="datecallink")
+ *	@param	string	$moreatt			Add more attribute on img tag (ie: class="datecallink")
  *	@param	int		$pictoisfullpath	If 1, image path is a full path
  *	@param	int		$srconly			Return only content of the src attribute of img.
  *  @param	int		$notitle			1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
  *	@return	string						Return img tag
  *	@see	#img_picto, #img_picto_common
  */
-function img_object($titlealt, $picto, $morealt = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
+function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
 {
-	return img_picto($titlealt, 'object_'.$picto, $morealt, $pictoisfullpath, $srconly, $notitle);
+	return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);
 }
 
 /**
@@ -2461,12 +2462,12 @@ function img_object($titlealt, $picto, $morealt = '', $pictoisfullpath = false,
  *
  *	@param      string		$titlealt         	Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param      string		$picto       		Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory.
- *	@param		string		$morealt			Add more attribute on img tag
+ *	@param		string		$moreatt			Add more attribute on img tag
  *	@param		int			$pictoisfullpath	If 1, image path is a full path
  *	@return     string      					Return img tag
  *  @see        #img_object, #img_picto
  */
-function img_weather($titlealt, $picto, $morealt = '', $pictoisfullpath = 0)
+function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)
 {
 	global $conf;
 
@@ -2474,7 +2475,7 @@ function img_weather($titlealt, $picto, $morealt = '', $pictoisfullpath = 0)
 
 	$path = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/weather/'.$picto;
 
-	return img_picto($titlealt, $path, $morealt, 1);
+	return img_picto($titlealt, $path, $moreatt, 1);
 }
 
 /**
@@ -2482,12 +2483,12 @@ function img_weather($titlealt, $picto, $morealt = '', $pictoisfullpath = 0)
  *
  *	@param      string		$titlealt         	Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param      string		$picto       		Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory.
- *	@param		string		$morealt			Add more attribute on img tag
+ *	@param		string		$moreatt			Add more attribute on img tag
  *	@param		int			$pictoisfullpath	If 1, image path is a full path
  *	@return     string      					Return img tag
  *  @see        #img_object, #img_picto
  */
-function img_picto_common($titlealt, $picto, $morealt = '', $pictoisfullpath = 0)
+function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)
 {
 	global $conf;
 
@@ -2506,7 +2507,7 @@ function img_picto_common($titlealt, $picto, $morealt = '', $pictoisfullpath = 0
 		}
 	}
 
-	return img_picto($titlealt, $path, $morealt, 1);
+	return img_picto($titlealt, $path, $moreatt, 1);
 }
 
 /**
@@ -2612,9 +2613,9 @@ function img_view($titlealt = 'default', $float = 0, $other = '')
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('View');
 
-	$morealt = ($float ? 'style="float: right" ' : '').$other;
+	$moreatt = ($float ? 'style="float: right" ' : '').$other;
 
-	return img_picto($titlealt, 'view.png', $morealt);
+	return img_picto($titlealt, 'view.png', $moreatt);
 }
 
 /**
@@ -2686,17 +2687,17 @@ function img_info($titlealt = 'default')
  *	Show warning logo
  *
  *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
- *	@param	string	$morealt	Add more attribute on img tag (For example 'style="float: right"'). If 1
+ *	@param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"'). If 1
  *	@return string      		Return img tag
  */
-function img_warning($titlealt = 'default', $morealt = '')
+function img_warning($titlealt = 'default', $moreatt = '')
 {
 	global $conf, $langs;
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
 
-	//return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($morealt ? ($morealt == '1' ? ' style="float: right"' : ' '.$morealt): '')).'</div>';
-	return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($morealt ? ($morealt == '1' ? ' style="float: right"' : ' '.$morealt): ''));
+	//return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';
+	return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): ''));
 }
 
 /**
@@ -2718,16 +2719,16 @@ function img_error($titlealt = 'default')
  *	Show next logo
  *
  *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
-*	@param	string	$morealt	Add more attribute on img tag (For example 'style="float: right"')
+*	@param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"')
   *	@return string      		Return img tag
  */
-function img_next($titlealt = 'default', $morealt='')
+function img_next($titlealt = 'default', $moreatt='')
 {
 	global $conf, $langs;
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Next');
 
-	//return img_picto($titlealt, 'next.png', $morealt);
+	//return img_picto($titlealt, 'next.png', $moreatt);
 	return '<span class="fa fa-chevron-right paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';
 }
 
@@ -2735,16 +2736,16 @@ function img_next($titlealt = 'default', $morealt='')
  *	Show previous logo
  *
  *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
- *	@param	string	$morealt	Add more attribute on img tag (For example 'style="float: right"')
+ *	@param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"')
  *	@return string      		Return img tag
  */
-function img_previous($titlealt = 'default', $morealt='')
+function img_previous($titlealt = 'default', $moreatt='')
 {
 	global $conf, $langs;
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Previous');
 
-	//return img_picto($titlealt, 'previous.png', $morealt);
+	//return img_picto($titlealt, 'previous.png', $moreatt);
 	return '<span class="fa fa-chevron-left paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';
 }
 
@@ -2787,16 +2788,16 @@ function img_up($titlealt = 'default', $selected = 0, $moreclass='')
  *
  *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param  int		$selected	Selected
- *	@param	string	$morealt	Add more attribute on img tag (For example 'style="float: right"')
+ *	@param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"')
  *	@return string      		Return img tag
  */
-function img_left($titlealt = 'default', $selected = 0, $morealt='')
+function img_left($titlealt = 'default', $selected = 0, $moreatt='')
 {
 	global $conf, $langs;
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Left');
 
-	return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $morealt);
+	return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);
 }
 
 /**
@@ -2804,16 +2805,16 @@ function img_left($titlealt = 'default', $selected = 0, $morealt='')
  *
  *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param  int		$selected	Selected
- *	@param	string	$morealt	Add more attribute on img tag (For example 'style="float: right"')
+ *	@param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"')
  *	@return string      		Return img tag
  */
-function img_right($titlealt = 'default', $selected = 0, $morealt='')
+function img_right($titlealt = 'default', $selected = 0, $moreatt='')
 {
 	global $conf, $langs;
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Right');
 
-	return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $morealt);
+	return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);
 }
 
 /**
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 6e6e0c7b511..d2567f30c04 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -334,8 +334,6 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     $thumbsbyrow=6;
     print '<table class="noborder" width="100%">';
 
-    $var=false;
-
     // Title
     if ($foruserprofile)
     {
@@ -343,10 +341,10 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     	print '<th colspan="2">&nbsp;</th>';
 	    print '</tr>';
 
-	    print '<tr '.$bc[$var].'>';
+	    print '<tr>';
 	    print '<td>'.$langs->trans("DefaultSkin").'</td>';
 	    print '<td>'.$conf->global->MAIN_THEME.'</td>';
-	    print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+	    print '<td align="left" class="nowrap" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
 	    print '<td>&nbsp;</td>';
 	    print '</tr>';
     }
@@ -362,7 +360,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     	print '</a>';
     	print '</th></tr>';
 
-    	print '<tr '.$bc[$var].'>';
+    	print '<tr>';
     	print '<td>'.$langs->trans("ThemeDir").'</td>';
     	print '<td>';
     	foreach($dirthemes as $dirtheme)
@@ -373,8 +371,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     	print '</tr>';
     }
 
-    //$var=!$var;
-    print '<tr '.$bc[$var].'><td colspan="'.$colspan.'">';
+    print '<tr><td colspan="'.$colspan.'">';
 
     print '<table class="nobordernopadding" width="100%"><tr><td><div align="center">';
 
@@ -410,11 +407,11 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     					print '</a><br>';
     					if ($subdir == $selected_theme)
     					{
-    						print '<input '.($edit?'':'disabled').' type="radio" class="'.($var?'imp':'').'pair themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
+    						print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
     					}
     					else
     					{
-    						print '<input '.($edit?'':'disabled').' type="radio" class="'.($var?'imp':'').'pair themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
+    						print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
     					}
 						print '</div>';
 
@@ -432,8 +429,8 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	// BackgroundColor
     if ($foruserprofile)
 	{
-	    /*$var=!$var;
-	    print '<tr '.$bc[$var].'>';
+	    /*
+	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
         print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
         print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
@@ -455,8 +452,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	}
 	else
 	{
-	    $var=!$var;
-	    print '<tr '.$bc[$var].'>';
+	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
 	    //var_dump($conf->global->THEME_ELDY_BACKBODY);
@@ -478,8 +474,8 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	// TopMenuBackgroundColor
     if ($foruserprofile)
 	{
-	    /*$var=!$var;
-	    print '<tr '.$bc[$var].'>';
+	    /*
+	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
         print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
         print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
@@ -501,10 +497,10 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	}
 	else
 	{
-	    $default='515870';
-	    if ($conf->theme == 'md') $default='5A3278';
+	    $default='5a6482';
+	    if ($conf->theme == 'md') $default='5a3278';
 	    $var=!$var;
-	    print '<tr '.$bc[$var].'>';
+	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
 	    if ($edit)
@@ -525,8 +521,8 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	// TopMenuBackgroundColor
 	if ($foruserprofile)
 	{
-	    /*$var=!$var;
-	     print '<tr '.$bc[$var].'>';
+	    /*
+	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 	     print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
 	     print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
@@ -549,8 +545,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	else
 	{
 	    $default=$langs->trans('No');
-	    $var=!$var;
-	    print '<tr '.$bc[$var].'>';
+	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
 	    if ($edit)
@@ -577,8 +572,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	}
 	else
 	{	
-	    $var=!$var;
-	    print '<tr '.$bc[$var].'>';
+	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
 	    if ($edit)
@@ -604,8 +598,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	}
 	else
 	{
-	    $var=!$var;
-	    print '<tr '.$bc[$var].'>';
+	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TextTitleColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
 	    if ($edit)
@@ -627,8 +620,8 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	// Text LinkColor
 	if ($foruserprofile)
 	{
-	    /*$var=!$var;
-	     print '<tr '.$bc[$var].'>';
+	    /*
+	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 	     print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
 	     print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
@@ -650,8 +643,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	}
 	else
 	{
-	    $var=!$var;
-	    print '<tr '.$bc[$var].'>';
+	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("LinkColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
 	    if ($edit)
@@ -670,11 +662,10 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	}
 		
 	// Use Hover
-	$var=!$var;
 	if ($foruserprofile)
 	{
 	    /* Must first change option to choose color of highlight instead of yes or no.
-	     print '<tr '.$bc[$var].'>';
+	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
 	     print '<td><input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
 	     print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
@@ -686,7 +677,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	}
 	else
 	{
-	    print '<tr '.$bc[$var].'>';
+	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("HighlightLinesColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
 	    //print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 8de637df3cc..29bcc04d54b 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -1268,7 +1268,7 @@ if ($step == 5 && $datatoimport)
 	print $nboflines;
 	print '</td></tr>';
 
-	// Do not import first lines
+	// Lines nb to import
 	print '<tr><td>';
 	print $langs->trans("ImportFromToLine");
 	print '</td><td>';
@@ -1307,8 +1307,15 @@ if ($step == 5 && $datatoimport)
 		}
 		print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	} else {
-		print $form->multiselectarray('updatekeys', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%');
-		print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
+	    if (count($objimport->array_import_updatekeys[0]))
+	    {
+		  print $form->multiselectarray('updatekeys', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%');
+	    }
+		else
+		{
+		    print '<span class="opacitymedium">'.$langs->trans("UpdateNotYetSupportedForThisImport").'</span>';
+		}
+	    print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
 	}
 	/*echo '<pre>';
 	print_r($objimport->array_import_updatekeys);
diff --git a/htdocs/install/doctemplates/mycompany/background_dolibarr.jpg b/htdocs/install/doctemplates/mycompany/background_dolibarr.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..31177b1b5c2bd609f69d46bcb5f40ce6ff9e5004
GIT binary patch
literal 337251
zcmb5Vdpy(q|35y5PU<Q|p~$fu7KzcugruC$GC5STh2mmPb4p#QltVeqX>*>_5WBiG
z&Fbo4SJt)|RykdznOP+^M09<huJ`Bt`+WZWy>>IP=EnW`cs%a+$Nlkm{qy#pzajF@
zj!upcDJdz)Y4CvjGYUBYk&)iGHlAg`CA(R6<J!7;^QO()w#vzE+q!L=+>Tv4<hJkJ
zzHQqt3cu{!B`>caFSkQ+x1#)R@NfBzA0oB!P8r#);EnRzw`~XC{r`FW^9-V}brWPu
zri_#VL|Q>gMnUSI7Z7y_L<an_8yDn%E-7gl*-e|bY~2Q4R{PIO|N9~Y@}HOgc@Nnk
zBL$I`myrkGS`+Zs)$ZcMNRJ=p`y?+V<zq=mV(H?;suMmPzvA)4@5%9h^SQV3L)?=L
z;)3dQbPVFmx^)c90_1BKiMdv*VMC()&_<Ipr1X$S5?EfFn`hL1QDNQ+JSHE!Cq*E5
zgx{_D>rpejVSj+HAIDKV%B^bPRke;*HS?;jx-O!c{wja2HvNGf5{z4k*_p~f^auHh
z`g`}U{R25vw=-3dJTqaHij`O`NK)hGCJ+hc11|(9<}KsOwG{09gvvy~2#)GfIpXkV
zbGK_k3OsR%KhDF4%>TiYr5Fb--m)o;72P__&kZMFDk_I`hDJMVh-;6nVrPYf?z?Ap
z!-z1vaq0X-&}ukAaJO>k^diAZJoAN_L0g)LW*ESZ4Pk{<hXqXB6fVqr-^(RIM|5f;
zKlO(7OkbTE=T^|Mgy|2XRm5+mW4Y6px*E)yUOp#&>!V_Ehxzcu%FnHa3~xJGUE|9=
z<Ca5Qd(y?)`g@tq!@ohD4Q&nH_T}B1b#T^{t5CjO?o|F)_G$9#zO=mWEVlx=f`&IU
zh|iMljWa=rmwLi@Bk4%NW1lD`-l4<a7ACi7(1ISaI5@Y9;i{@G1s_Wb9^Lo)CAd5?
zF-qfBP|7-PwHLlhh@BB3%PZ>sh?^GBL(-3ZpDV<>N2f9^RpWvhUdA0Y3;K9Df-ZhX
zO9`f~5~wNZxaB!yV0kXuR6vhTou1<2@$Ng%ip9NHRJq__)b?$GoKvoei-MU%{>%~s
z<DPC2QL`IXg*?wmTkGa9+Eqr9M^NB6j4!rD?OPPQo5Uw&APJq^<`z>Im64$3TZca|
z+pU*NV8nz<jA5&gQ`c=nA4_?Roy591XA#`NkK%KZ7bXJ012=R!GGdfCj++}LK4zB}
z<s&L*;d3@;nI&QY*BaG^v<?mOf504Tm5!w)FY*_X_zTO=_X%914pT<_uNz<x95n{<
z0h`KB)qb9wAbZcLz&<zzy;^+optHkm&lhcW)mw`^!ya^2OV!HX_g21sSixx9!3*^T
zXv{gBu@8zY?`;29@us3E^*}-or-7^S$I1^R{0Gu(Hb&!Sqk9R45EsYWWn3B5Ge19R
z1IrolzCbM{T?td|^D8T7ZEGMP7)h=v>9HaSqZtG|SG|X@C)gm4O~u84GjK=3aWOlh
z^!kHdle%(T@#Y0&9%@#Yf2za8qx-lE$!ZnTiuH|Br3Fk@F-Vom`N%L1DS+yRDKRRE
zb}1#dx#!V-q=+R}v2$PYSX1e4(x`Ig-krhlmH6i+^8#8Yxq%%dzEB*pB3b5-j^bmY
z)6-3RgXKw-myD8c0-lByV;@tEgJ6Z@son0uNNPe7!*Ra7p*5S86Js1~DxgtgtfQ<&
zrl@q&ZV>Q-KjujkJ9A2NU)L1RI4~O<fVaLhVbX5?h234orU>X)Ez^=EOuQ>RYFm54
zbDzVfN6__^!vqJ6%1Dx)n^PqkjV|{W{?Tyf*~{8&DO<$BQpi2E-_)-wZOYOL$U5y>
z)N)!uw(w$slkygq8!iO21Dfh9|KOzE(fab*sk4Z$sjHZw$>V3+kr|ci8D)|L;<(%A
zxG8W3!sm>%w4OLD?>O=k)zKyA;>Aa0#)%lHR0^AitRUuxWORgtR0XA^GBU*6z<~ET
z6KPTSk`-M1Cq7prmAO|n7SuGo{-XzfF`r0zn17<%#HHi7OSjF}(q6YSu^?(yc*oVn
z3qlTubPU9{_mrxmkEf9_J8$eqYMjJseomOzCP=A1gkY*YC$0ea@vc-6G|B+Wrj#UX
zw-9n#pJ+_1{Xk%6gal`4Q}R3w7qjy$1MfOdo9-&nq|(bkv1xo_Of2Q0x{A?#mY^OT
z=5ugy6WCY-Y_M5JNZ?XmuPH#^5a3Lv#xwGRR_2UTIhM#1$-%l~Ocxk<lM034SRa3v
zWG*ZaARXEdMnM}cyyo|Z1cjuHWoNTVYA30$(Dk=BZ93)_kZCKUo|U7oUTAw??p~Rn
zdA4qWQ>UWSW{mKF$MmlYLczl10gW<@m+HZ&@=p$B?Fri}F+QFYY2}(;!ed4aZKJTP
zn~LH=TqECe{MaQ;47Di%-6j}!Y_70mMNHnPEO;}OehS{q+?hF&(w+CSRMImwEMjse
zta>mltd=Ze6m4xaZeh~WxN>aq7LpGV&gl*xmR*TC89`1;Irf7%Y3UqOF-}W}zT#(C
zXf4_=s>*lII4cnFb|yh%3}W&6ubS*xFyg<*F!zP|n1o0o{NA*U-Sv`zch3ku!sqUf
zvW|gvmFNZHX>+4hq0zzV)WsO$j}qUe91z<YND$<>IqN9stX_r2e0NZMB7cClFA5Pf
zJWw><hY083VueJQ%8&zhB3_i6BIY(CE!FQt;x6NDf{%RQ?nDB%+95I|^v^M`p4v%#
zG)aQBcDi^q#}%+6%qi$dY?wiLPE-YvDkh6h>P-orXwxmbP1F&c>Gae@_l7(Ien(<!
zfv1vvAL7I*=W78slx`H<byCnRFf1zAs<~R#xX_y}80NORc1;Vo`T3v@e-zMSu`Cvr
z0_!)+X=B9|!tPvm=qic8_zR*b!gzrwK`<*}G}2P6IN=q;^~{?|3}#woO6<bqA>>r<
zG}Y1Tes=j3>YjbeA1N>*OE4h%x85`!KS4@`S&m$>H;wIEp~h4YSE%s<0S!y0ki!mk
z78-@2mNN1St4e534%IcHzKWQGUpQ~Ra2^K;hj`A#3U^DAILx%QWe$V1e=#qiB%$&V
zvrMs-U`Zs7{dm0a^$W8*c}56pxu>JXQF~tH3Xj=|j1`clyI5JbVdfJEE3D`Xqodm<
zR}k!SW;YZ&5wx6tcq*?fZUi?H_ktuQ%|D4wUE<Tl4J@OET=#@3Bw%Ae%18`MXCnR!
zBlMKvP^+Q$rW|ml@U-!jM+qILj3+S_6fUEdRq(OoTsbY<ckq=Pbl8wpiW)4zhN+eL
z)>A43xF2hl6<jeT)Gk}H4sZF8Z-iS|gd?y_QY7m#52IOon_Tl|>r8#ii_B)Jt&vXJ
zngy3nmuxk&G3(elju{+UOvuM{9FHO)(=h`RDdftz3bm;z?ybD<E0XCx3SO5T)C$Mq
zb<9~<t#fy5z1lm6n<r_25@zGUIdSUf={<zNieE0k=jrZe`2srNgicy4ncsiZH0X81
zE3=Y4m!X5~_A&_qE9qH~^n|?;<&9(Ne4Kx6U?QIHo95G_k#H(tk^NC}!7B@5VZO$_
z0%a0qfU8cxt*Yaa76qeR<k|8D!$W%w$ncmdkQZm46TAB6*%Ulfq^(bJ6VHC(baxwn
zU0Yqw%VjAx>@kb$d%&l`L6LEdrHRQ4*RQ0odvS}2{Nd3mkC4=N4KQsid87O=N*4MS
z1dmwPb~Pe<rZV1+g6yaW{Oi!ZoG9bqqf@j_>fX~2w`))uT|?#r?*vg30(yI?i;H|Z
zCCc+9)V`#_`*o{1tIW4WX|NdGR5@I6wAq(t6LYFB8A(55T;)LzJ@s{7$W<VO<%*}$
z9`TguSBPg^e@*BMj%{zqfo`#V8CLDD<*DWS_P(N%?44J-4ytGVjJfL{Vf>1V9mjwq
zc+8-TR&_RmjHsb~RTN_<4;-G46M~F*JAtB>l^MrPmyLMc{{^F3Z(tWOKwgXi#SG}u
zMy>|lHDw<oT5z&_K!I?c5Esj{w4u?uS)616s?VtCBDK`z{&r0~_79+Bk?Xh=ByKg>
zbetv;S@~^iddWb5gRwzc6Om?pk`g@*^gTPM(9|z7hMrEKE++^kc~#N#TxwguZlFhR
zA;k+5`&Z91lc#X#sfx;xi+0WJE0QI_e<_<ziF~Gm;1IuoTD3tf^JFoZe><?4Hpi>-
zhz>^LBr%9t&tWthR$_@ii~$+}Bn^(@f#Q-ZzA&R7alID}H7*Oha>IeF66PZXocfDR
z!aIPq3)nwt>pLF_M-JO&mR;E2?q^txCJ!4H+ZQ`Gc(Yw#;CY1}dZsV!A4tq**rNKe
z^<7UGsr`Q2Ey62B#{_-fu}}8;JQr~)o**wn!>Xm9T?^QxebV`rgOl!%w3F=Ze!BmB
z1zPd7R#W-DL;j74VqsKOE3b;ewdrtOt>9c?OI&WkUNIXF9iCs9w1DL$R8o!OE{?<&
zUqoY|ss-67|0~TrT9SlO$JJ<b&&ZpfiRXlnMgn(xnb=r@db4pLpy=dKF#%;R1$<Ri
z`DVFEpSomFo(6=R0TBl<!m<VQ^(S^K0yVP#A%{uYzZ#YsUQv>ebCK#ITTJ^xOGprm
z^Qw|U(tBgM*!G5I-G?e8)<C3U#ll<2DGm;U!k}Erjw}<B@`z)Pt>Qj^;k4pLz57}Y
zsWJC4OTO{B#;HsMXOCW%F`$T5u~5XUYln@!sm_9i;o^jNBp?y-n2UT2j3yc-_L{bf
zQ*yM;ngq0!_`Fn*Vz@bI6rz1>opZHtaE@^$yl$KK>&~5lCE;dhADH1Q=Nji?G&=%%
z7lvL5IUd^g9Z91tFCy0_{(-!iAE_;tLlqk;xrPx|zEA!}{kY6W9@zoazg~P@&RaoQ
zzrhds3T7dzTA*C^oM;*yvE5Y7p{uKaa^a3~Hv&dn#|#Sd&omxCLqfU<286^>f`mLq
z!BICF1W=9mG&3@(%gih%=XOw?86xZU{gILw>^rXdx~VW8s9}5!56M$URQSmSiQ6+$
z1br*GxvG+td73GBTTTxC82c!y9#5X5ElC(xL(<o&De5>$Wc)tmh$5Gggj<Kjag)an
zf5@F8@GEkttZ>zLdXZ7&#e|Kx2ggA$9iV+KkuJ{xLTYEKfX@YjX&*<8X=#8(X-vNt
za3}wzb6ot_C~V>*Z#L-R@@-1R6G7c2Fhv33@F}v8M_k8A68e6y@s?3pMS@rY25<&o
z7L_5WGS`wz?8OPW%1s;n9aTJGor3))3gl2E)`W3tM3|#uLpFLNBUs+#p;kS^EPeOL
zVrTmjvksl-pTGYD+0wl~YIfbmBW4C?_!4@@x7o8sJ4l=y`vfnv&RYw-cHTkB^G>EF
zLGO@ualuKWgSxNnJd@nv<oc1=GQ}6vA=LuRWpe!;)tZMK|3>siU^mlJ2(iLBjXcnb
zeJ$!FV8xRr$b|(SkVkJv;3H9$=!+N8RObCM*#ax`_FN1l4WzClB@Bf5n~9V~;$3qR
z#TW;|mc>l_K6zaI17WJ72&myADvXFN{XK>Acy0mocfaCR=b9(E>hBr;(>*1MuQ7zF
zyBpNqgI$<V9SNB578rXApl=rmmU+a|&w#hPZCHXv+&iOFawryaA84n5{0amV-bof?
zOZF&s!-RQ6TFMXctS~QEa8^IA8KcHTfG&VKXPm;>$3bN8X_!MS3IKn{_x0ez4Ypfg
zAMt5a5s<I@n24hGx9PDdFC&ACn?AS@Eqg$WEXKbKda%t~V0fn}%bWt(p}s{4JoZEu
z`9aa&tB#K^gzSpvFVZ^>bV{rp?|`DU%~!wV{vnGb@hMKybiki-`ZaR4+D->wbq)rc
zmM34=Y<B7x%)q|}{A#n&|5kxt@Ot=fM|HG~^h*D_?!QUy9wV^Pox&rps>4^)O=lAs
zjpStsBc!7E;`E1H5T}-h7p6dWn-?8bL{%+g-me7YG1PLC-9u0#^a7rRud2raOh*}h
z6{y7f2a`usCXa)%K52>kkPD)F1Py;g_}OvXqYi)T!{P_d8PX31#x*Gcm=sk>t_e|A
zvzN$T0Q`~t%N%Ah78IT^LO6^V?NvlMSuSC(!vSfIj;g1_0l!2B=UrlDV_6Kq2V9Mf
zCW1nqC-dOSNI`U|@C&mQSR19IsF5Zu7x+Z-NKiK(DaaM%I#4$AC7_4s4oR7_Y`*ji
z#jYb#K!+z`s`W)#zhkAa5(Mek)aR6eiPYuXhvl}?zSRC&z9*?9vM3AMZx1-ZuDrq5
z1&{oG+-iK`=Ya_P$d9y;?l<#~l_-Wq*}g4`weFYa1bQp%wc(sZ!}CsZr?+{Pk}K4;
z6=mJ-$qwD=1th{*w9I$GKEVy@AO!!K5i2qHl5Z^5h0{S|Eah0%bDzEu>pY5@u&+m)
zLWwVC9j$XA5*}M}p5P>_SjlSGfH3cipw;JMgIAs<hZ8imip2t?!w8t%@Mv5(idj}f
zEn^aFb+~7VZBvxwIglHoyf0G}km<hFpd)%9pl75`^SM>Tm3ex+Ku2AP+INv$M+wF>
zlB^I@k2{RN(pHy=xfthWdvqNXC)w!d=0NG$h-t*@S7-&GM1v9%`R{mDp|0_B`~2$s
z4Dr??<CK5T15g3bw=6WOtDDe+o%zCPY(%b3MGo?x7rQyaRKaNw0Yy6uy?DQziwJWs
z<t20D$kl!oRe)&#H&<ztg`qx956vMp@-!y9S(CIY<liCQ4eT?A?OEQ<zO7omEqg8*
z_(F%O8yI+x$`#^25aRsm7n|<!4~sUpa{P81`sg-!*FZaLEX8-l$d%ur(s$&m?d9&9
z!K9pY3nIN00$ZGH;7q$y+(iEDoDFGZbsP)qp;3Yb>^YITBKb7c?h3^JJWEVo!w)n6
z?zR3-E~h5tjZM0!Em9}X?priXoo}xk$F|%Ge8(j(#UR&BXa42qo0L&5AOmIR0G2?|
zo{<X9HzW1=KBgs*zXrf%!s{G8TzWFfDl&dfy%)YL0U}7fhZ7>Eld`;7tk}Ls$0XwK
ziz7iRBIp=sAN!+@^#}d6-N+|>3Pkh-?MILJ^8{$`TK@EP9SQn+Y+`>maP`8Hr%(cv
zBW~!fcX#e;SR-(fXg%F|1k4o|QoTXgzxK}pi1K*A&}!M|PDZIMGEPOON(4`WW?6oq
zoCAT26>x3Nau7MQ(hQoAs}?UH@dJboQ!WUgV$)3l?^w;uG2bn(SS7I+OCSd4F9ep<
zpqqVL{0hANw!`GS_e5^;7SD^s$IWJvi5~9Ri<2k*6sFR`Tl}{9>TN5wM}?%t2uSp>
zC$O*w*Y7BJ?$PpAF5G%YLEiAXVuWu&n){LBeQFh`Ve(RBl1QV<H6@kP%mpkkPF{>e
zaqfOMw)|do_Kpk$qQW~pQ$EL9go}7D7w0?95PSDekjERE2HCmpZDEf|$emP)C1|t1
z3<*aPTNL}ERX{xfZd>m8+^JlQDhAc==>4gzJxal1dkXtK=ZtG&Jdi%1XvMh3M@FH~
z8~0PNOpWv-8wUqkzgRM8F<$panH}>*wNnN_yoaQZ<CfwX{`2$_Z^hT0xl<MSz{?}4
zOjs`x6N)e}`Ic@%3RWn}Yp3<}gw>G}M=m$pxf~mE!P|gFE?^>ANW2`bSnfaH=o-T#
zj>Eq+CkD(EV|;Qkxfl-cR;Roww3^dn8$)7n;SdLb7a<{NIf>7unV*wuxUNU$$wfFf
zXrY_E4g4bv5Blg<gKB!UWTooFD{+b?Mnup5?adO-d6VId>IQpMiL2?8s=l9R2VMot
z$Zxun+2B;{tYCiQc6ot6v_iMQgDAM|>)fi;5<c#Qel3Yih)jw>{$Mn4t1MRjfgD?+
zYt*W2J*Rd190Z2G&oxO*5KV>jnNT<x-Bv>M;#8pHt3Mh;okr;yw}O%q80nyzOHj?e
z&}ly5JSQM585E_%{0g9FF~;7{K2hsc$$9Op?!5NOA3tIjdxKKQv<ZUS<%WyXFT!)D
zI6>bhz(FBDR1jfBz+OtIw9gJ?kDCqi@ED+jaElVoN%kM!UFb$j>!4V!Mhd9;rsPgq
zS9X&xbBsr_+#ul9lnryKJ-+2;Ge*Bp+$RP$(VVr&I>!24EpsAX$ccV5isIs0^&=go
zd<Xz;@kH9PBCF6zj!sQs1&uV;kP~CnL{NybOWDzhh}{GO?|T&AdIMhr5b4rQI=5Ie
zD;@-i_1y7{3XX`5zx8C8udmbs@zwknYMCmJVoBUx!%Rr0x11le=!TJQfrEDB<$`Sr
zc&Oujc_$;?-MhW@6h3|7`7k5^V%_C$(~er1kegs=k*N<cZDaT+%%E4_(Rs+!0AA;<
z#@r>xg)f*8G0>airsMSVaWh`?0C^_3-qkT7&+-<qo0G$mKMDvKV;8{2%t~terI-Uw
z5*i8<a^~*9Fc;YiPh8vx?b#S~iKm;Z1NFibrxCC+kb28`0O+`BsteIcgH+Br1&mP;
z*n;5=H5(c5Y)=9)Isp8y4Z{@|h7)+fq&piVeH&s@FhGmp?u%$(+19e50@M^rJP|M!
zh7$M~Za2blN#+x<u{QMQbEL~tUf^I+Q>37WszXfkhr|w#U7-WdDUDVSRIZ_e{sz4-
zd8h^T%1yON%elc5sC;`oN1T%3GX3NGqeao9)wzbhzbvl2msTuml2z<)U?9HXBrC^H
z8FXfP>KbgOXd2op7o0AL@YXDH@FmjWt`D4ap^6v<h0A2!7Y_}@HcyU!`uS5uNB%`E
z<Ol>JD`g9CmTI~bKfMa4_a%H;pijfTgoU)n#P@D-r0_N*dW>u095R*TPH8KFU(DHH
zG_~jZz(>gfn*!JwuQaoS`@WLE7cZ4LBu0_vc<Sk<pyU(aiSZ0a(3Ew`1(Y)hVDKT}
z?f@ek=3b}>l>TGoE@#=J43CiD^jIDb?>@cC{;jc~<Y1i|6Ik;Ld@eBG-lEu~XUvI2
zA!wf_+bu_6Lyz^9K-Y6Q3<m%fs!(96O)w)Ay_B2W+uvE;62NXGHtx&Y$b-(*^dO{1
zXjLl!7NYo?`uzU`);-d1b7Zk>i@l#*)a!*5x{Kfk4jw;8`$?Jk{y04(F4NB6zFM)N
z5Gs1k=Y8tkU)!hTsjIKtFW(%HEl+l`VCfckDR^cyNHU^TK^<i>(%u4lIgC)NeOl{6
z&|kXWt2}n~t*;&Ja#mQnFBtuBP^NYh7^VHsrJ^4gF9<23GpxRbg)CWq71LkzE-X@p
zsqeT|m<^!MG90HHxYxC#KuVKiY4EuU;@X<XdhT=?HivgCE3<PpDwfMt2cT`dAt45-
z#{OgQNXZ%NpiXiu7YK0TJiDt;%<f{b&Upf{PFNMsia4!}Hbm+KD>@>;yemg!9W+n-
zSA|>UyeqM13JEY^VNQ|~gt^htP11hm6wJPyNVv#)*0i~JbKOV`$%Ld)w<qc$Kwc0`
zfG+{3=G#+<_p=udcX}%gP1iV68g`dA6r1@fR%h*oefpk$_0Wf<51foV>U!wFx5d?C
zno@5dT2Q7@Ny105a3Of*Q{J6KDd!h^w6wep?VajRw|FV&3UztiGxMuRvzaLM_XPjT
z&iq_3IeI&3X?5%H6v5#EwW=y<>O1DiO$&(G>hoQx;|t%B8pl?uVxEUqc275~^wE>W
zvj2ryM*gXkLnOO$(m6D0?}VTuRc(1boi^$I*f?dGNH6`o;mg;dMt+xa$&1-(f$_Tw
zQaYEP%Qr?*Sr}EAs@<MF!|YMcDR(d#dB?*8MfddzwjuD^ZeYUzHNG)8+$a~sXxvDY
z>d6K?S;SQb4GJg&T=jkIKLYp{fLotH1idHGQe_C^1-*`RnMe@jCgi4I+|aZ4o1nwM
ztW+6ETUH$k^D&@RygG+;9)do$TIO^l4?cx#f<n<l-c3F(Fgd^S2Ct*d7=)+ubtOm3
zkIB7NCLfljI3XSG$NeN}>Na`K5Wh`Q4$4RS`Gn-L)iittE?}m!=A`Z>Te5wFx9<I|
z<*w7GcY7T$>5oV8fS5=G_Tq*OTtiEWLRJt0%Vom}VlmGW`7^MJ{gWIPCUsyWkTIP2
z?fb-J#Z20h$1l3k3m>qPCW_w&*XG4;X=6NgWO6LK`afa)0+bO5WK&(8<zRjck^Y<I
zjA=*B%jNLJ=+p!&L|8|%Pza-runs@cE3WKfclOQmL0HEE`xuy2{aSG)TFwtmP@~EJ
zs)JSV=aUeY7G1N|N}Ux%0N}q?3w8oNf*Zo1UbJXXNaAkyboJN)9&wfZzC38~VVnUv
z(zHoH7Sn+L)y(p)nX@Ddxrms(G-0#TX`?K|@|<Y+*gQ?##Hx%w*|bQcuce!u(rCLt
zhCs^BV=Va60Ac%Lpxgkbp(D`uwTuIJ*FG$#@ow>mF%<f7FUgv^I<-j|k|kq%LkFIg
zk)GkvZJnT=ms$HFOY6=H?UVHd*R-24M>lI5@sFL+^n0kbZ}tktpYo2j490=tN!oHe
z1KsFPS(&|hSVYo?aK5OEe~e-3r;otdI=96lIW|&UqD_wy0z0jCW%2}rwZdO{2?F}^
z%COi8;w1&t#>OS534!e<g}PXd_0exx&aBW2LR&<f&nZ)PiM5CxVE$flajd4GqpZiM
zqWz%B22(sxYb_`&4)jau{oy&Q7<D9QqQTri-HN?h{x1G+CC3ENT|NTtFz5xt34IBQ
z?8|S8X(BFh-SmlT3|CErc;`PP1!W!^x&Vex3CD(<i%$%t;AtV0bhAXioXCdCx2&9K
z+}Bua-<0KJo<M@MMkL%i2hnmVCyy2>wZfdU3@VP^Yw&C+bA9J`-&jQ`Chkh&B(KA#
ze-M(_PYr&%!jrvTEoC1e=j&8S_eZ34L?=gD$(?rw&}Q8(I9aPFzuWVky=-B~naXTE
zw4I%PNwD{ov$OFc^|PE;8wH_5<t^mE`&7YV0EdRHL~m&h7_Kpav#|{2szV}iYKF&|
zqQo-<^+Wb&gJSsyEMXr<#f*NFOj_Olt;*68{;Wy&T}kqjQ|xt9$)40bNzw73wpO4T
zyiHw>_JO%VSnfuJ2q*CG5);Y=6{?-5Q}D6fuJMb2!_twaT-udD)Jgk>3OEQ<3@Q!`
zsgtRK*ovcn-5Khg3Mm5~cn>Bj7p8w{$giB#h{#LCHn9a3;dXxHUi8C?u@vTmVrO)-
ze<Z%6!-h>;98s6rx(yFAi}do3%rY=!0qeEKxdCP1-GrizJx*i%Hu@2_u8RKg<AY@K
z)XVOWi+b`9-zFE+gV>OegoX9an_WJ#<_eoMl{2%IjpPf${b1#8x3iUd=KD2^ON&cg
zwm~SH^x`5y0Y({i66^1`&t1LLx%6E$I?Bo=1TB^!E)eZrU7Q{#B#8Ri#eHyhA0m90
z4K=SY0yE5?66Pnp{5%qBy+Z9M?kEZ^1`mDPe}fbPWW^@wKTpr*dzd8c6`EyKSkCUM
z@xb7|v@H`J9zGmU9Igs%=m78tTFwKwqDOF@3Q&;QDeQ5$WRc?m(i=Y4{6|BBPqA}$
zAB9cn0}qhjk62}B-#sBfa6M-C!iCKwd|ZE~8VU+nie0BxIqQ$Ln^Wc<?0V7OhsOYY
zC)#`7)>b<_>pu_z2fNv~$&=Dxm<1lJPy9)~%~i^)sYxjPZsV@{<?oBaOlMmq$PLPF
z6bo0zd%e`BmUrXyB~2x5WlddwBgKBba@Rj$n=kRkIr{8uF9VC$c1Qozb*_!r`n}^!
z)qKa*Dm4gZ=^}^9e8*e-X(BkDB>4H;%Fgi+kG7BNPb}Z8^rQ(6uam=w>-#>i(0v!x
zw`lHD*S$ei+4oK$Qm3uP?pOXRC5nG2A$?Eiag*uCRc5r6w8v?KYahR3ju@PWya4e2
zTWVGE0Fgz_pff5=nwYcsHI%nQvu#l>`ib{IHuiPljnj_`uxudC`f3AiM>-UfC&VC^
z>FG$bC$3j$GkEv?&AyZhz&l>R9dS&6Qz{I7sBJ9ETuY!9U=^K3Qikjzcgtg)gucr|
z%%kMoQ_aJp`B$TZ_r2T%Q2;>DT7b3Y3=B9wIbef=(%A$8lV)v|R&{H1dj5-oB>h<W
zUN8@MCFfhMBj@W-7>%RH^H>Re`|_UJku#+q)N9EV-*zZ;Qnb@m&8lix-&N@b7I5y~
z1l9fnAw1VHQq%jDd94ShcmMHUmgoClXjQeZA24}8cOaDMgK1+;Heo_|>S>ee>rmlJ
zC~G}Q^u%L+vXVEG(Xo$BtEyVvRV_)Y>(C&cWq0|OUV}-TbEdQ}IBA<%nAvO@V7wGD
z9y31oKd$vKNHY_NJAitarpM7fLLi$>x1QSwVi|}`d*~UnnNO=_9nFQa+?fQVPilOZ
zu>U2fgkXaO3!1S2&?Z%O66{}}Mg_7fDq=vz>~@VI3!58C+WQpAq)5{X(ePQbran@H
zy}G|Ru&)A7o}dI4A&x4$z(<lP1O}4rMQHlExbpb%{A6-GL{9GlD)3c*gEy!F8)Fvm
zDeK>fOC4LBVsnb|`2&A2OxW}5>aME=UxDYNWniylubU+%(UaPbj6pB_5`O2JcD=N+
z+coWj1<p>o@_VAVoXO^Ka*~8l&haO`vM&e98o?ya3u4(6cAcg8>Zx5%kz>@)=gdC$
z{tT@Z<qv!pi8~yvexDl~TgHv$V~D-(flI$m5_>f!u14JoW&I5OOrM*{!0<CB`&K!-
z>RwEJk~}e6<%EjXKChjfT_r|Y7&g5bES1{qwZ%GiKLZ-85st?4YSd*|pD4uu>}Yyi
zXhkR?RQ6@K$_CIcWaNQ-P*E>SRZKsc?vEL+LWSCe+!0;LiLAw9Ea7092nB<B>$mJW
zi||rkzbHi1zIgVy=^yj$6jH<Rj!lN;C`TB4C=9!s;M(HNXb!}aM<{{C=UqK(v9*2#
z#e`+SFg+zkQ~!o6)VU$<(S}zBL-&{c8^M5;JSpf<6Q*$Gz@d)(l7jU!?i$Nam?{0Q
z3=hE!m5+2P+JAEqug7v|MbDl+)pwHf^sTL}cPO}1;3Qk<oyI7Sh<-KD=q?7TY7RNd
zi3SG!QjEIa9}RUSW><~zEBUS4Rc@wgaE_165&h>;lhiNqgs#+N-ZdU#$EXYPb%+Z>
zoSqgMR`Qtp<R%O>zfm*Yf^TVK>G>Hpmn02$5og}G-xjv9<XT{D5Lt(d7vdNOto^qX
z?hE`&K4{C$G5bR+DpsJe3y8#(hd?WA+rU&RbK`lYq_E2)1v7hb^~GvmMq5Y9#2=r3
zm2SrDF$1RXd=p#DZnQ9KR%%KqCJV_CT&ozhuOXC%VmGyWHEz&ZFa@uijcqO}_RRMZ
zS#o!I$;z1cbR^G=MD}Id+1kITZ}(OL5VBDJ8>_|ktg^JLCXJuc=<R6{r$*vGd`(ST
zBsV)LHk3Lv?a@9RqV}z4stOhV^87ia`<pcD@7&7<W#8eR6Ku<G)77^Q>*LR$yRJ|N
zFdnXpQR)>Ov;e)bwnw}+Jo4e(k>l7e&j&`5cNKA8e#!40`dls;NwDrc+NIwSwIhCd
zs4Lf~etAAEm~(3H@XIBtXh@L0KZKqldKUgSeqRJ3YO?SZo@W)wa&9#@ua?EA?w{|+
z?(gioV0Va_HkT`0Kk(q}V628N@8%Q46Z0ol8k=Z;Z&U#(B~6vgb27%r%^7)^*>|hY
zMIOy~UQ|tsziL;jg=tfHPC(z31)7A)GSm<!hKL(oBLJG?_^^j{+k9IQmG4-Uk=REp
z&r4By?h)aU@r(R-T;l4h@U6=B0jR9Q&i3VHAjt`OrDh;1LCTYdcSBjp#88h{xLy_U
z3|Ex$>ryW<DbDcPMO~Nenzvn)UnCPcIke7!b6J`vPa6c>(DE+3@2z_cNTj%5rTw<<
z@p3jWz`C3yl|+%(uD0I#sPXmK+a0HtZKxTy&N;mxx)V1G@-ey1ABEx{EdR|ge={{P
zly@5OIx_FB&1fF|I31O+ydU;4I_bjdcX~H6C7Ir6H7%x3CkO&WH$ChFty;;S&GlO-
zfe)lzr*z8UJHtw>xx`0ItCzd1z$QxH9OG&E%9P;DG+wZmr3-;5*8+PIB7J+uFZD|*
zt1DF_;p<ja83dQE+BRu#B?`g)GRBMG2n9BYuksmKa|&w?5o3w<_mkP`rXN57f>agk
zF2Ug3k<{LhX!hD4ROp3G+Wvda75Cehd$TvN^Q8P2yYdEh)SnBh89uktsIzsV)%hi4
zNYVvw`5Sr;g^J3szU1Bw=-z&|v%OcZM7CEjH`CVjlhtm@MyxpA=xVyZTTbtyeepI!
zx)D#Xc6RdlcByOY1MQ*JZx2`!s}zWnO))IqIml+GX&xssxtyp$%xHW)8$0XfjF=a3
z;Sb>=88_sZ^?Gezx`s*Fpj}(~E<+Pa|LP-p6*7jsTFSHWO}X`4<Nc2v-=id$*f&RK
zS%y!y=H%oB@Zov-)A)R!@}n)95_hMJj3@z`eigM+yuwU_<NR(b{F~7`q|P2EuRL7e
z^=VNuhmf#)*pJygtapCiR<^9N1_c0<>X5+2;+$en3TteHFM@?fTB+Fk0c^`D&8)<P
zCH^q4c-9<pSUa5Mt4MV%^f6?4!3Tk?+*p3u7^oS<_0f}<vnxd8eBbYdpAp}HBdJnj
z=j88vU;DPQTO2QcbpQC#&zGKE(=@cJRn*$1T%di@+s;51Y-A|px(-dhu$4Vstf*h$
z+i^|u>zc{rb0hg3KZQJ#H_+0b7Z|POQ;T(l$j7Qb+*Z~J=OAY0*1O+W-H2<<ZRE@*
zBZxMQ%D+aYSvpBjSd{<#yS$o!5y#=r{OPa9B)q}=196-de)ZhTjbQ_^2RGK4zAZLW
zCvrJ2VCZYBxgmL^N!G6DTpYu+Kd$fKb|#};{rg`#t)tS&lY}V2G(C|XNh`1gg)vf7
zCSO=p_+{M$si+L-0yz5{Xm%r_EW<tF-uI7^hk=A=xnG`cu8{|X!iu!gs2kc;UTxk^
ztX!VZzXWLmnzA&G>hIJHln+=L3fD%LL>AkZqgs?6i6>dO^y6^O9|0o^>9;~O8XIpL
z_!=souDzsNuqo)_rzOU5S1Y-5(hsCI*Wb49)V+OA*-n>qu`1!~xA=&L;tEAR2Za{o
zPTj2>NpA6V?a~pquU)PBd27GCO8!??+z*iqV2S)E3+Zv||3EU*d~SxII_Nx;M-Q)+
z9$+k_2mS+b*$e(ksWJiT!)&q|aS!p}2Mr6sGfDYu`WY+nXr&slI>&(cGe$#zxY9WG
zjrVH#HNk84!n%igj7f~uSM0!DI*fJDkMP8igO^wbPg;%-1Y_(HPL>Zta;9`D`FTDi
z$MO&(n$-3jQ6oZ}Pv|J`p1!=&1A=w*h_Wg|bJO|>26y#tKJL&)VZ7e=kTyXf&4WcP
zN(#RD#HpyvP2~-!A<$4xlZDRBCx+Tfp_>k)z!brMzP-*4vdQ6vVNr2^1B&t=iHQP2
z(?8O$oZ{UCM*aM?iK;F5AWAza<9WxfQv-k9Xpxsw&{lTRJ!3({M5q1u^JJT>zLa<8
zR?ns`uid8|vNioGPhznQ57(tAB*E-m^E=vN6w)H9xfbpV3<g+9^f4Zvcbpya`h1u?
zX9M9;8I^@Iy;f0XmE!z($m=(23m$cF>Lh_V*uHf&x^Sj@BZwdhuQzJxM%?ZrCX^nK
zd7spn)}x`(SY6o@c6#u4n<s>C2-ijEd-`vLr%Q0rdqFz%tcW>0pJHU57h82^{{>ik
zVVHB>3Fm6ve(R>bgF$<yJMji+eF!Vfe5EzRpPtC6v@xCt`;6m!9*ZA*Rbtu%B#>Ei
z9|^UsK5s+kU{l%Utl5x;fKQ3{WLr?|A_@pwfs^8EO0NI>_^cT8`K0Px2id05EN`ll
zZ>vSPkF#IVf8-@=1JmMDCdN+;1d`;j9zG#4XdOiBtqf;heXXtcx4P)QQ|2^Qj8+|Y
zRr*tEa0AfO-in6TZ5`@|953=XD~J6{X39|yV`z&(k_~e>q!F-okR%GJhR00LuXXlr
zaQ5Q_<{WebEyxa*>=B5zmc{S?eg&SSckZ)3Y_0Ag<8zZ^K^w>Ldl3ERlmZH+prz;a
z<%ZSD(A^~T!;Y}MJi&=~f{wF<FM?E@2s%;vG4v$zua!v;<GJG@+(&OHoQ`bfr1k1b
zon-tR{;3f86={YC3!r-aAz1#yyT_&D*Jf6sf*)a4vqROHd(NX@10y2=IPdVGXGL;}
zAq`QMv~gCXpZWO+Eki$oqYuF`u`>quMe<E3WVhQwHWh?tX%=lXI~2nbtZz$%3!HSh
zzxZ5(k8_AkaE1$K@|A!lPUQl&`TB)rt7X5*UO~68zH*hAlo1f4=@kZ1-eY_Hrk~c<
zYf=_=urgDa0Czbj?vAwA$-a_^W)f+Yy-L`}dA2;YwkTx#Yh7FCwTFx%mER^c0hBgh
zJYae7<>*Pr;x`HVa{i0m#^*n+2>`wAK7Ua--037Z`HrAN2e(AQ8ND7Go3Yx7bjAmJ
z)Vy3kxaquMfr`0-W5+3z6L|v5MiY1ncV_BSMk8}6BXsC%E#mVjc8tv=Qlfg`c!(rn
zKa&$De!@@u2ci=-^!&$hhEReC3&yw!++4bD=1BQpCJTIu!m!XOpYmeahCD`iq+fB<
z=T^B*x-5gb!%2DVk0#T`A@bWUmYqMXrw2G1^fHyhh8t`RCe;}8l5p>D^P>5+)D_wy
zF@}_$6apM&eOb91T9E96)z7h<Ip)r?%|?*zat_(*M$!)2vYEfXE<Ad!j_puguT{{Z
za<l%L|L@=PF;(B@l6H_Gr<N0`>1}0yi4tluA@XRH>Gv`YmS;l467Q@=%nY>_v~|@#
zPD11|{||gp`~8zk(tb{a6O9|0@#T!HW^)mn(oUgNoi_a4oZ|eZXTqv$v9lwLusGjH
zw_y}=+tmb~#CrP2BMSGFbOgwWUDe-y`~$&{AD6HA!u)ZFzrM?9yW#Yr2`PRgVIl@K
z*gq0k*#;>FHLR<w8K}T;u*~Qg|23qTjC9b8<%0b@_Y{$FrjmS#leV|FHwY^O-=S&H
zoLGbd6$qVfZYYSvrhP?bSmC4hM;%+F*mQT;w9|&_HRWqIX>Gk8^$S~L?Sb%?ZGc>6
zy|ZroHa&E~>CE!$Tjlf5<aypVl)r|SQf!gu8~vRga`jp7*pUY+2PV|`%NEkQ_VPPq
zwfm2~a;=l;x8`ze9(y=?LN1uWUuV|#Lx*M&zx*GdATPw1zrn13;b_x(JuH0$@hk3B
zHp}S5i4)EP=H_iiC!B}AFo*kk^OAUi^o*3nmB~|kJN8bo@62BBm04Me`DQJdDg5Cf
zNKMa0W6=@z5AEEHyqE8e4NfmtbTz;8Kc<xF-Bi{9G)e`WLNIXo#Q{1x_F3}ltdQdt
z{^qu_{eR$z3`e=PM4(@{_<>DO|H~|(SHQ;Zq)~oo9wWp$Qs@2i+0}&^;dK<`hNgVh
z=>j8lw#{0nC{zD|@>cH~cQW;KeSHhGbnknf&i{SxQ%<DWg(&L)R<U=DbC#5Om){Dn
z@z&oO69EBtWPZenKTOzkSdw~m1`NT_QepGWi>Kwiw6}ws4|F$!o<L#qW^H|{;d}GK
zmWe{o|Ak6wfAds?_&w0qzcv3Iooofvj7Bc3ZM%7!+b_^T^58?n)UY5uCu)M9x*}@a
zyFgUGN<8Ft@M<@0J>zaHm}vt;hUExl9&Ps2a_=8%tr+Wd=^`ikZFTkn+N?G_2ZRuY
z_)wJh#A7G1Qsh-F?S<C89<FCrd(h92P4Xk?gCql=D-1VEJNh;Kl<^bwJldm9lgHVM
z!SFd+jdP}Kb-i!a#rvojYhqr2<T}z;*C1e%mZtW}S_SQ9C*A8#y30K)J&QyFCLPvw
zCkx6{9YPB#fb~wDeznpOa+OV=2zYx_=f{(v-m}Ffw}~kWLF=;VU*13<7bDS^a03ew
zZ<0C&M$iIlVuqmZj^gP+VDQ}DKu!1Q(}KJDbtkH4E&dlWh#43|0}8-C9r|YREx{Ve
zG4U~ij*#CBK6LxCy3^z;Vg5%QKjkWMes~PD#`8Sh72B=O;BTWq(d>=Jz!f-GcJ_Yx
zai81J<TgiyW_4u)2I2jMyRm^2vqQexvsm6q@h?hKcED{mDH00?0AJ%!gRDxSn>81P
zzC%e%i}@s`r@h5bzF5u01oP!QWu@i4l?(2p=B(*?sCecHTUCAeCPl5S1bIcbf`TTt
zZow`yP6Bm2#S)-Y=hK0k8JZbMfmsfXqJD2B6&@(P@DIc!;d~Q>^Oeb*g%SA=K>yQc
zrsHE~YnrzY!K?pk=&zONw{*ncd4=TVFJsei=zGf>04OKjttWtPyZz$n>)N~eOFOqA
z+QzE?7b|!ngDY4Bi74aq=h(N0)^42omqLWQ5yB>^5hy~W!_VIN<sVEF9Eh6F@dMWj
znza2~REMVfE(?61{SBV7YKXQ|VI#q;NWC)G@dV-*Oe1QLKkKWcskdpX*I`#z%4Pdv
zhxRzWiXezeQxU$piyOuSeB=|*yzEdUGz{e;*`Kf&Fd?~B*0czzkq>A-YhY02DqcM%
z;OS)wHKpqzcZ#(gjP%e>2kWmpWm`{LwAcmXjVMl$ETdqz%cH1C6j;E;rdDxMus<We
zK6?uJIZIpnC9L4M|Ip&WOo+6Dw7HqNOo5GR)qwGDIzBpHr&z?rdp+f48vbH__;W&F
zy4tE=%>v$r)_dR9$^TDn-2z##`yxa8t|Ixxr|C^A3e9kO6Yw9%6iopa{Q5r<xJqkU
zv?e6hUiDq$gwAlo^S#?6OzIyKU`F2LRu$o$t<HwU4oo-&cB~W1f)-piBFT@0*MG)P
zNEXyyG`Uqh@2-jtM6t>L-p(6(_l<Fr2Q8Tu53iiVl=uXBFH8l!qd6u|dVre<v8?dB
zBui8$!Fn{1g!hYU3uLFVZSvrY%m?<Fa`v{qzPFvUAL_m+^tJ<wCY1)i_&}ZckT6Gb
zt1*4ouwd=LC}W@ei>s+3Jg>$<=>*9%Q>v`yAP5WH8B>dcHmWwW<)0!iM(VFzTrJ-t
zXA{ku>eq&@>huiZ3eZXAMSfl3+BFvo+^7Ejxcga1vo$l`J@>fN?I2fM5K(W02sePu
z$8874brWA)y5bMnA|8nmZ%(OOt@v|h-K#kp@U-n#No)DgV}MKBsqlcO@%G+eacs{<
z2%-C5gK_2i%*PhgQPil<6^u(o=WxL1_`WQq6P?A_z{~(c7Q>2z;Gww5@%A@b6q_#=
zmzFi%X4ha@Ow0Xq`6X*V&rS<yU<^kJsZU8}1X;<(%U$!jASLajUGD@A)Ag0YBx6&(
zoVHq%l9U0&F0^VDjKi+~`2Kh1j-S)m6=c|(;bjV}BWU%cy}X^f@+Gv+^MyICWU4k(
zCQNF_Ia&3Cn;Q-o9UAg84!?H^hl-0#m#&3O<y(I+wYl>+(`$hkP54O+#zeIBfU2bE
zR3LZb2+;A@Zr_168;)8cz^%7l(uGl%9S+=_{s&@!X}ao#Tl``CLa%Z*ys{QB5T(4q
zRw}HEoDf(X9`rak(+kpIf4ju2ndRdHYByL>QhZ$-@cFSZbLcUQ%5!dMadsKvf+QOV
zlYuwkgE7J99$YW|yyZN^vw54{HZ-_LP6Qfmuo``<%46THkY7yN)w8m;LcHs@X3J-J
zYdhHKmKF3z&4~Z<Rm?tmyIA_3oR|E8%GG24Kx|TRVHXrmEwicVF7VQhg2GU5P%2c*
zRm%??Vw~YwXWy5UtZr^B-p@E0@6^_<ZP_htTa&3)s-}91fcd?qR849jcCkqHT1_P`
z`(;c^;+~D9(LSwPuubzm<SFEW=@DHJF?A7$!$XvL*U3*g2}Y|vS?ipdI{%Fos$v&-
zQ{^lc9T`{VTfOrJs4JZVZgL7|k5Eo}voABjei?2EY`}QIhzc;`<=bIhx5&d07{^X7
zO$59#bctTpWWf9W&bR$7opq!v$dT%ES@N3<E<{xz=D#Pc(4wJ<Qs<PsW$l%<9kdj+
zowW3@UFXj(XFS<nTw8pRR2u*mK;jF0`+c*I!$kQ46ATo3Zp(54e-b-GIM@j8%!a(`
z2IW>M*<kLys#>MjmWrS_JL;Tz$v4KWeW;rE@$K0UX$29HN_p?0_oWVI-P@d*5qxOo
zeFC!#p!lC_>u;Kx1*he20tt@ZjKP6>9s0h1J~Kyme?oT)X&9R*4%g}A{(iq%8!REW
z_(7-HktM#boDH`c_(g4ZP%JZYC_|$TSsbhl05-cd*jnU+oeL5CLeLcaLL(}LB|2=#
zZo|0fd82x+(12lhsT?2fr{x>y=Xb=J1d%Os5rk#z5SIICy}f=zR?E9VQTDb&ft$U9
z+r8!#3M1W};GXM#*J5l!5I8tJLXNBrM>)n!Z(n;k!`=hgvfRtht;|*?#;D;K!m~ul
z8;JHVJ8mgEBqyf!tE!c$U7Pn#Z>zcAoVov&IofR4{ceWOUN?88S*yJR?ydH^<pW+v
zBd(NXLY@x&7mb}h;-UG6Hl;t-W+2k10Wi7+wll{O%<tXE-<Ia~#>`|O2N8)#XXl|d
zXKJruUvXHqX04~QeX(Iyd5xPZrMx!6kQLA}_)@OEEF5eQ9m~cbSQm7Fy)TX{&l#(Q
z?WrBHrCbrPMvk#*@sB20p9f#M|0(rWNybnu^N5O8wVP`mp&{>Crmelaw}Q5UwiBvZ
z`*fF+=7)voyKT@xR@7OGp%K<Y!lLESd%+dA1oNRaeiffx{;Usj^{ObJ>j{xo*%77+
zimA5BhXJ|nBl;L!!U#p@gqgR_{L1klZo=y~e+_-gOSKI8G}{tX_w?8R@g@C{M*Jnh
z_V`bUGyerbwyI>VDt|D&QGNXdP(9$1);;y~)VH5jI!iH@9>U6a&tiw^CM8H?xK7va
ziJ&oJxXI~8UIQLD%9R3T!h!afy?`biLX;NgQ2x+90}sETJthvbgmEm7<(_Ot+^{lA
z{+1#Z*Nsn&hNW5z4Zd`KChwzW+6>tNfh71Vy^DYLjG$FpZ7+XAJ3>*n4BepZ)TCQz
zVqE$(vd^^DxvS)Jt2t~WLuP=nB7Vn_J*TrS!!v0FA_O9TL$<uE>UjA>!XEZVRxbN|
zj=c)&wY_RtgV*Lh$3_lcjNr_$HlMq+CF{`RNX?zcK6V^?=C-S~JIr*4W_6g#Q}8o(
znWTMB6}%V6&y<6&Hm+USh2LG&2Uh=q>|JylJt^a&OOf-d&@T6MF3MEk0*YXed(P$9
zK?e_d`+?g8%FvN!XfrUG6tg%8a1ZjiEY|srtT;yqk1~8=rBlB`9K*$S)KBq}M}5+#
zn>DpOP3u&QK&2*GsavTb<kjVZu2<U{mC4^YUE=SgSE^gE$9)2RPRjg+sdNEM+Pg0!
zUHIYqf$qFLGBQ63#4G7x36i*8k8b2c2&5n<*Y&R)qyDYGe+;d5A5GgoX>jmGO34uM
z*<8?lLIOn53@i1#7E&#zKd-xdc*oN>yGjaYuk2t!p4Kt)LrR@2YWu)mV&BorRNH_5
zb_m4A-sA7Jq`%fr6|N3Ow+F+{K@@L;p%NG}8Tby!Hc2_DBet9m8?pztA-EiU1@G!K
z2KQe9IW0g<Z|o;->>5GAlHxl=|A>o%f9%|Gz0usMs~(K@VLItOvqt`UrkZJ;mu=>G
z*F;33m5L@(5phEPhEdV!8`{dy0+*w9vIVJ?-vXbh-ImUjhiu)&PF?t!x)k@UPx|<q
zD{-s)4jzGD9+LP%WEh2SyEioGv4!teRfC83?he!Ok-3f_zf3G_pR}>QExueh5ac8L
zG7IOJJyDzD_CzxE9c@i>!sU;#S;YmHHluI7aw@BF5uIs4o9<8Tdo<E7cQRtHw`t}M
zxs5@dlvwfVmZ>KS%WJUp1c4-i=1)0^3bZopJECIepts3jo9mFCsc*IOiQ1R$+dNyG
zN}O&7u(H4{AXvQhTRc=`J;rB(c;H`$2ELxv<@#{ApR8~{;ESv7!7#UFi_W)l_cFsA
zkEmrrOl$n&gk1Z~2i1^GPKy1y4!7?^?>TMLz2~$vzD9u^0Y**vedoaIQnpH`rh9S!
zK;S9!S(!Jl)~NA&lI;uiL|u3u<-I3xq;|Yg$#eJ`Xa+k9Q_Ao;B;1$8EJLHKabC0j
z7c0v46HHmT$vCei|LHCLpHQ_+Jg+g-X0J9arOTVqndszn3J}C%qDKgd_vVLn3hGn^
zuc|OtmG<C3=%q^+&46XlZ7aVgTp56`DjvMLb?QlJdX@Us3pk`@(+Rmm1S#0h%CMi5
z$FO}S)pY%yvzCG3wt9K6@ky#h<@{CNAH-)z?%>}Bm~brNacqiqKvP#jv36U6bzUJK
zv9fN1{P`Pk(QO&l`8LZ5qM{_DR;{9=j<`Im^yZBs0wSxduh?9s>p-qWY2LUd@3ctI
zH-2CKuBJBFG?NnUODVb&z*_6)OkZ`!eTM9k7zL%5k7&Wqlvyvf+LYNs%%CsAcU+Lq
zb<Ko8e#7c`RUr?Yuq&&%-&7~?nfbEgX<cQ%HdS}A_2jOqmmfxcMfxp^Y)$XK-#Rrk
z$6EXCL;61uHr?ah&+F?RpEB}?`EoLUijWysC>gs1=^jbkPpi8;D$Gu>t#@Cl6VA$6
zH{EzMo?>tf^V^|s6IN@h>u2EWtqgj%q2D&w;cd2Cx40(y`S}>P^s9U7NM&Z3R~N}Q
zRK7#8IF=iCenY{>u^g~b8uXeE(CQD+ZbSw4cdGHSxmEp=sju^MpQi%f(Mdg7`u@`D
zN(<HhkFYn7hq4R*$L|?SNHv5|WN$2CEM?z9_MMD`2xUYWlzs9bWXW!9W8WhtNePw6
zI(DVvDa&9;jHMBt@6q$TKA-RJ_s{oK_tf0eIM=z)xz4q`ulLa(qJu7*W&f~WIa16k
z;UdAtjEED_O%>uzH4w!MMBe}E6F>wW%f!Iu40>vyNs)L}al*fbH{2&e0(0L!=D|S}
zCCfIn&B;4BC+~7$v43vCY9P|%CL93mz)E10i)RypV5hk`=uflud*JS;X?z{>kc$Z#
zUbL6uh4q`{L|0lF&E^MSR3<Lb6%4q}@5xi!%QjW~_Dj|dBILEyo>URcd6|%Jl_{yp
z%qAypY_6`~I1uXg&2TR2Klnx-t*~GM3+fQ8re|R!8E;%Ikz=vqFMJg7M9>H-OEHQ)
zEa3ejUyH46I0V@NBuJLpmq}%8!iSN7jM^HuC!sqgq1|TA#@+Q*iM}3FIbIwo4uwbg
zlnQZ-#dLfs?v8&wJ;wdG5S~h3Xeh+qBa+&{t}U)ef9Bw}73v8`hFylkDUXb@94`#E
zu7do!B|<s)oC<Vgm#0o6(qYjHFD)kC)oQqMrLrhHIX^YVq8B+d{dFLbQIOpL%q9rz
zBzjDbAs8>a<pAFWtA(3K&V=sW{WPVmKk@sBVNr+oO%#3nI3H(1{1m%TI$Hz2@T~f0
z%}d?RsM+m<u#JP}70n20o113m$JO<|<?j)Gew44Z<8<XpNE{r>p%d`>o_>b?sg?^z
zC3g`LX)Ie7J?KaTgMqy}*pT&ydZ94~?6#2-_wX$?r_oe(6!q%-R_Lo;?pI#EwbKs-
zjOd1w#nhn>+{g1#AG_Uj;%`<W=tKpXbW=r*QJf;|X(zo)b*1<GkP2SMZDg+qA9YZw
z{&m8f@KeTDI)q19bLi{c9~yRQn1bv_LCM3lYd0Y}RQLCW_Z2!}9F4j4m6`tOH@s2l
zaxs=3G21`9EjkT_5FkR%C<`HAl{`7n8Qy&S3w*a}W}Ao8?Sk8ZUHX{mknxrQ{-BAR
z&u);S@_S)qAWcnmPjhhBxoqDzsV?FXagu8HO7>v-=k9CMZ{sJ>#m{cptdzQm+p`Md
z=qp9x2yqEmuMSMBngi@Xe)IY6(#jL;)LHvJP>(->Zb0bIEt~dMD-!2-v9x`+<zL$?
zSpZGwQN^UArBL*a5B3<$i<>KMPb+ko9B{A<106PrIQD)$Ly=OQ=j_6Y+wwhCtT!d0
z2U_e6MrZSPl_E5LD`NpHZ_(%1reXX_{$*3;YhZ1-sZmoEiAwWIW&uAbqvq__wvva-
zJHYnA?s~&hh`YC`=Ms`=9TIqf`*5xtmFje{{JvR0R_W*;>K{7p)jPN{lk)TT%iWD#
zP4iqjQnJ8DvZ3mguf(FzkF$cR$BqpgeSTur(SNVb*PFBoOp=n%W2WrT6FyrjTZe15
z1IM#hkT`l4EjUM|RqA62)>KfeBW4e<FvVboh?2Wn7M>3D_zetPKZnlm8Pkso+^cue
z;3HgpS8wxbO?6on5hcLKd5K$_74lyRw6NC6XM${Sg08kw#Z{TQrY44PL6M9|CJlnq
zbpy9&+{Yo@d4`;`x!d!5^OSBC6zf0GrRMI@WPDbCOUIVvDhCK&2wT9IQgsdD*n|$l
zvS4+9Mi0t4bz_Ut<sRNP^bC0IA;crcRfr^BVtX)Ps^Y$Pl?p(j)Sy6+|J!WO>K|gI
zs`cO9+TCH2>P*Y-QF5KEQdhl1JIbedCbvcNMeFBXvlNK|266i0F}Zl|F4RYBEhH0C
zi_<<@T%6gWNFu`+1<;K=W4ZveXz%7oo8XyNzR}W`qfb>$t1Yp&+skrtx=lcL*X!l;
z4!%s#K~%!VS+BFgVV~?&+=^Jl3k6DHf;Xz0K<QdMr&gRm)M5SPiJ^msB)?drB8eza
zAq#3WMYH!N?;qUSlx=`Wo2rfuL6nJ{eB1H!Sy~Ve*wp`ROlg^>w}EAA5Qm5YksZ)v
z)fQLksKd%`3$7T4#l)mE|K%rF5=M-RY~sg7>TPcrbeUw_G;B#JB%LgMMkA$dwQJHM
zu56KB)7E^4$p>a#|3HXb&+VBblRuuqA|Jm~OoFT|4H$V?AZUn1+@8MLmdUD!+4F*E
zT;)JU-k14qUh*KIXQI}+DTCcMd)lMZ$IbclWQ=u$HL1L3xTUEFgcBJUj>9W?Sy;Va
zx|QR^ue))=A>Gs}V-dV1pnzZ&h>ZmN9MT8ZyvKlFVyy5)>g6k`8g5G#^8xn*+iBWk
z-qL>{-Fw{=YLy$TCO$#)8z;sn0l*yjcMKq?AFiP&m$+;#+N)AiIjb&kQAKjpM#vBW
z<_IFna4Zm?!=3I|>~ueEgcz_f+arIT_j_*r5PGPE|3;u)>a{wZF>hBbR?pn-=AK_*
zAHKduJIHc!?&F^Mn|LF_J*au-HEU_nII9~D0wxj+$sU=`1h;z3cuNAO1CTm+SNnln
zw+o_upscZ5<(<mHV1s<4B7XYDWxc$N_59Y~ew0o8Qlq~Q#_whdlT~_0A(AojuhY`m
zi&{uffg-@@?ry~;<N+{J+9-N_rwzgYJManP(X3*Zc@5){iMdj{oa1#Z%Q>HNwqHG<
zA17(PdD+nqXaaHmUe4*jN{CUv@V}7=s)!StSQ2hBfIh&rjvW_Xrr7?u!;I*alXBC*
zJll1;*hSshJ4Yo{?w?-X^BoCq?g8sz@EFPXR0nmJZhAB5?~Pefb%F)^K5xL)cl>IS
zs&Ohwj{=bgo`dcAo>~Vleg^J~Esd9*a$mMZ6{-TH3WVdNhXgWMY=QY?gDB$!s{@3a
zYdtz!4kPpva@1MJk#AL*)YHAX0k_Ckx&pr~`cc+qLmUCsg1r^HpaR_LsW_~XPFo_s
zSV2lWO2QupNLxl2EhRzSlZj5RHuF*X)aJh9d2%sw4{gt*^^W&SlSun&5d~q6v>|Sp
z-E(ysWqy}o?>&pM2Ch8u98-W`DV6_?2y8CD{5>AmCl5DJ9@M2at18cE%sl-Aqyym}
zgup`+(#6@(vzI@vk$0W1WU)Oscbr`D=ok6T{*mtc8p)gWl!((u3t`lK&mq5dI;uuR
zKB<0b#(7q25SuT{QKjxR9+69}U+5Xqtl0~Tuxm=Vd&vQY8;-_x_(Kd#OpumIX_>f<
zAXwI!Sl2(!9M;u-Fw>iC@nY7I);g8<d+=&+1E1~OWY^ZW)s3|k_vaP*#IopE-M_Tn
zAl<ZX3l?VRp-PUjKuCyPBt_wYNUEKoNOne4Bs*`Ufw`TZmoV?s$97Qd9k@J|WPXB7
zatgvT)`IoY+|8pA?#xe~X_opbwW!fpr3F;yf1{#o&as`C$lAq#$Mp)#PKV1Z{@e+_
zQgn5*4EN^~uoP<c>(e>;bcxH~Yuvbx80f^J245drVCF_-wx6Ja^6#K9Lc>1kLC#0g
zxzgjBM~Lgm4|X+2!@J-8CY4bm2*mpNPeaMe;U_*d6>>(w9<v;`5QP{^A=vQ_B+Nb?
zXOY2TgT#B-XUbQi2NIS=Nxas^7u=*UJVBe}X}{^~Jj0$3orNcphXEZ_Pg_3k`(*((
z1ua=V3swPGQoe%!3WTIbuonr5&{w&n-qP&^lqDikQtX7wqy6J0ynpeg(!nZ`lGLQu
z_Pp2f_{UtN&C8)-I&KQ*7ZSX?)O)@DSB1h-z7^nGbfI1W7t13YlW*2{HPN5vGxwPb
z{~aqH{AE$Yj_c=KOQwhc{Ts3yipW(*%lh`K?02sRdtXB=DhNbg=Wv(lzrWu`3g@2*
zKO61o+<UUHeKb`5cipoNpfVsFgoY`=A4oi8a$&Dwf5E9^gVc%3v=hZwX3G5$KC?p6
z{Uo|u-EVVHrT3|d6m5V!zmr_`ZE+1hW4iNb3~V7dU<A5AsH7YfDHjfbSO_S6(Tqr4
zuo2n|M8yucriN)Yzq1;%)Vq|C#BF`$G0VAy--Q0J6^b7eOZHFBoHfxBI5e65C;vv*
ze^KQaYe#WH$Bj?q08&YJka1IiGUfEYQp50tu)hOH?S1wO2Rt;=XxPJc@<G~Gn?CU4
zg07vb8vOM|H2}RBIClm$Z$JOtP(dRlxJLf_+z+Ry<KrJ!o+Q5~Mx>mxI7pykc9|>8
zI{bL)AQna*0R%h}CrS^`fT!Z&Ak-z1ArYJDp704owB|`FhmlaZd1>CfSKS&Lj}+>&
zDShPR+S$)_raKoWFcyd?2$kRhpsy=##W^Yv52OQCMH%(>pcG2vbf4<#YUk+mi2VbZ
zFRb~Ln2Jt3Q+$+ojKv|w<{6316(NTS{lH4x=a`W(nC<I&a<b~SBKsD)5qHDuUxA?`
zJb!mLUlWUBb;l=oo;BGc49#xO$PD$W{WYZW-$(ifjh?|$&gSja*MrKlMQ7s$SBuWj
z$<TfCW8o)g;DMhT*qs@7ezqs}G6&*6%g;~t`5PhhL0)OakGilM=znGIQ+rohWjJkq
zax*+www!4RXbCz|S@2w#wO~4;jsW9ra~KPfl<V?d=s(Ovd0LC-WV(}7$YXQU$~$<e
zfQ|g1AohJv{;yK2Ep0>xT$CW|pNYX>e>`7794E)bpcT#DNMtvt7M9a(;OWFa)+Jhn
z&J5FbPnYq2uB!I&y5-PQ^hDnJ#@;TOHXX2_<?(P=yv-?&?LkUWyhp3}q|@8~9TfTk
z$9%5MbPqZnNIt7P+<0;Qw{OOxJHO>(zQDhOawBNO+sC2<n);IJg22sp(e92;t#(#H
zLdMVFaY#3{aQt=<<!Ad~crLMCW=dm++>RPJ5YNA~eQ;_w(3{!b04a;(#6gQV1OvPS
z(&1FLfpZXzY)?uVD?e?>l?QP9T<)=j)c&z~&S<Q!l9#Zt9C1z+JKxn-lYH&Rz3ITQ
z8un5xNYz2%IucTaB?K!R(SdN42o{mdbVHHUMqNE2xyV!UazYrTU&%$^N{pq5y5&vh
z6(7|o)F@swPiXxII`%pU@2aRde0yUJF8r4GY^)`aXbZ6>YW?@vPpFkt4)wF}(DC%O
z?%f-i-O-dBzNAL1r2KoIPQEW$tS2!mQRVo%sk-P6nq&UWe6Ifd_xu?z4?h7DLf|%j
z1xkKe?f%>Cm#2F4esX3+4KKn%zyc0gh{7RYOjtl1ERQdXGl?4uWw3!9@>60ipk2`i
zwOq;|RE}ufC23F#iWP}j*xBIqHubiwf^Ab!8IsfBkfL+czAM26hUAjv-n{uXMhnJ(
zh_f-OOr<yK*EM^rZ>94FkIL5#JvH=m(b9cXT0yF~y6+Kkgp@rg^Ipd6dNB|@Y~u&)
za$fd$U;MQYmj6pLp6lWN_7R=kOaIO~bU7)E^k_F!V{L91>6zmli2Eb_p_-WU3I27I
z=KTJ5_(LDf;xO|JyobwOPZf;S-GVoTe?A2+XHTDf)3S25dY!b@S7xup0SCmZS_mlp
zP<R`pR%xw;1jkXi!%Rpgi1~sdHZb!KcTD-_W1hL?LOoAvzm3kS-uXe@**zXSX<ZWZ
z`3?wdv$~Zdpm_v~TZJ3!qkv#6y-``pNp=&%3$>+x$#EG1yONa@zst|U`$>;WE;art
zvUtFomgu)<wn=7Ztk^}hUHi9#|Dyz;J4~xm{fvITny0pu!pI*si3IEKZ54zc2baq$
zm5!PH{8t`<Y&cPxhbGhcyES`e)j5Jn<3bgj<L968`5QQ+|1}u(?m-0kX?WtB{YOdT
zes3Q{(iK9CA`k}*(t@)W8O>`mF-TQsVu2|QG9N$#QY!}&#w9X^g$ZafC9hV0J1B&}
zH=0#X-V6zPNl~S!tet0%M6miVMIj(@;c|`@x1+pp7)&CAUC7l{NY5*iwf_SSSkiyV
z&mAO3#`EZ1LY5ZCG@Fc=V&<Fs)_FeX%&}D+B&=n*{ORHUIuU0s6Y_T_RX=5OV0|??
zH-GJ~^=!)XnaAw5MZBi*=g`Hb4gV{XNI!UGOSAx}A(-vI-vZtUl8Y!n|H%5GY`)5W
z&F3vQ)B(?f0gnle!yyGYV?{*;VG>0rr4Ao0SkN(8G+@s%DJA9`it(Xh7J}oiH4#n+
z(fFvlCuB-Mx$;cVDB2Z)b5ZA&Wj55k1RHI5S3HliWYXardmG0lvd|HS7KrVCz^)B)
zK1V)<wI?zfrpTJ=Hfqz)vlQzoTzQWn{Ec7h#U&<hdWOF203C#&5C4;wSx-)X9VVvg
z7aiOum$mSE@1?v(a^I*o24K4gYZ}hCA7vHvlm0W4I=?9@NHxZTG=RW=e88-Xs079%
ztOT-8NN4+%yolRW%9GgZNIK}D1ULKvWCVT`ODB73dL(<lkUQ`Tzzp`18^i$OPr$a2
z_vxH9Kfb$M&<4}`ix0K2qiMRZ8O%79yQboZ6NFfU6B*!OA4tlNQn@F<fTR~xM4^PL
z&RsBM?=-~YCE`+9KZw>Q54Sb<yi#astcrwCHJpej0s(Wj=Sx^9?m^W-qHor}UFYHD
zG3YkqE9^QHUYq(*`|;fS0F~odx0AvtK0VB}H7h({4sSuwx8z5}XUDSx*jL>zH6^%l
zzcqTsEHNS1Cq=Z@iGc&BQZ@|`5k@HOP?LX11x&xu?tqjaMi``^1%r$_=mj!*p(3P-
zxGOr-J+A7IN{6IEQaR)Vbjc@6XZHp5>-lP4{7e}9zVA$Eznu#xOKw$K!5~&Y*+K?!
zh}D1Py6Iy`OHfgyPdQao7g1)0PSsg3sf;ukVak%<Om5gXuORgj(vmAmvegsW`|bD-
zlu8S3p?}bDkhqp*@J9q5-c&&y7&C-`SheVYzGb~6$K8>p8UoCv!{*oBU7#16R%b3+
z-`KM4@aH{ONF>!jAW}!4s{uDRHKT710tD)N*5iW_ElS&zF^G}lIINiEI^+PPgrG78
z$#f70vOSqAsZ5jtFlS?)7P57|xS@wdK3Sd2=gDTXrYZTEkk;*t?rt^(LjJJr(J6w4
z6Cg;`0_ryFQsIH<1r^v%O1*`fOt_~<x*A~Qv?5u*vwlA@5<dB17&-J523KsrLCK`1
z<heGd0tI^Sh?3m-p+CK4)H|yp%iZCp3UI5#dK@>=?p&6axS=RSl@3hE60(HAZ#d;q
zg+ieY#H<a`S3<DEkvX(%U}RoC)HLBu&?@!l=W{#f(nc3Qg3aa)tQca^0)<2n$FRf$
z8#t3y@!@nGz`I?*)-HhZ!Aw+{I2WcWxO3UvKCPTjenY**kM?r^iZl>z`F8C@p#V@s
z9So3BAvbHF3S%^m$*3&V(pauoSNEw9Q%<VMcSA#aAwhXZ(n#B6cWKj51CE(@SPK#c
zjucHMt0WF~`t0Hln$Lgob<cBJnTiLkl<r&+o>I@C7y5&&0@84=GJ<@G8#8w|=1j(I
zF0`kE-`0Wv1ci3CIljJdEpOD>5W5UKP?$EXk2~tsC&|L%UW5_ra#wo{_Vf3wTOgYA
zbw3`s9)*8H5QrW@mB9UohF8)Hx!Sq%#<_6`i2-RrHbvZx*JAb>pnkc%&?KM5F8Qck
zGi9}_HJnh|wKZ`M02FW13qTT4FavFICKlKy8+ug)6W4WilSUy!AsZtwV+ZBqY*IZ8
znRC&ElKuKb{ft_R4ui~iDOcE80)S$PVK?sz2xIrp%$)B4-2f_y*vTyR#f@dq^!ECV
zZOX)dI_J+l2y*4d>8ARnhxGJKW<Tg{JM;SEh)#AC6fIm#GV1^Vk6EXi8w2#&(p?Wx
z+W?C2a(!t}uV4mxPWW;^>{vBo40)Z|z$(2A5=gh=;3~|}t&F!2)d5yjr}0tt&W7BR
z=mk)=52Bd)f?X2<{^WKi|Hm!Hyak>mSs%7$KYiN{`8AO<_<3-uuM`m(@1~Da(9yB7
zf-UMD@9@Vlq$1*)5V|IffaCV4xFo$!rWNa?LYip*{@K+~FU2Q9T|ySm;~ycl3~5{4
z8xJ)vGr?L8l6*5kzd^g<7255%`|;&Ffe~>_9T*cm90uWlZvy@TRxs27vBs<G&QS&m
zk0dK@hVB}$LdS2LKiWN`-j1KSO&*y(i~tT?>8rRdg3vnid5~6*-fDV$%IBJ90&0@V
zl@sAhc{ond(HYC(dXC6owlI1OS-{yNGqLW5eAUbr8SZlAd~$wggVaJNV8YN3NN-5g
z_b<CM@De*(&TE+0(44kByAe!Y+WQCcY`j&wI)d@*gu_O86&Ob%nGNn(^Px&u=qoMa
zqKt}}V$t@of`ZrC-=L0)=ghVAh<SJ}Y5LBp=4V-zxr(ONR^7H|x=eoAy^*YG&WhtZ
z0@y+vaED_6OQ~A_+VHwvc`78dUOMmUfb``>4dcoD!+ZZVI0QQcW-{sbbWi4L{q-hi
zw=N99>cV(=z_Y!+?hIhoY;yr_Lr{?a<~Xj0XI=9Wi4ywb_a>>R7P{S6zdo&UU@}CQ
z3R9c$#SkSGvWhYGL-azrg@+?7WSAkz&BVzf<mk}?ILlN3v;er`19)ss-p9c>C(NV9
zCi?7{ER*|fb!Smo4d1qd?QUV4O_tnX7Kq+*B^SiJD8i0G+pV1GFd8bxCMk9|@2Q7Q
z4_=%RBf`^VjAz5=KMv2|(GZ<zC^FV9hR2KB!_Ia1p6zK3Q<H^_M3jWg{~Mp-;XN~g
z0<eiohhd~uks~+hU^rF?2==Fmd<WA&_)XSQ&=$lfAfyq(U$9T}`?7Trm>~kRPhmb`
z>Uu74-q0gwOV$EtUr&=NS|Q)Q`VEcXaQO>qzfXoo3~zCjUr`zGAGn=c$)tn8f$bY&
z7U8U+haqCK3NTq9R`*>9phVqNvg0Z<v3C9*U&iN+;^NMRJDsgb9=tQt@@;zua}iq)
zgoj`WMH#Gc22lY^?rs+pa7RTgQ4*Q1qLEC3*o6KM@|E(a1OtIIIrCACop(c1Qcn>v
za$T~B<iD1HO4q1k#i=B3`i4IHBO0CXrJp}u{0>hRu9=*7xa%!8GUvm#?POdE?t(|p
zss+2r&V_^M4#(y6<T)o-D9Gw}-tG{1deFLb7=IpkrF%qhcCbOkG9F2+y|)IP-k|JN
z6%b-fA8wU{*;_-Av_5(fJa>RB*AW3nCM38)B9D<S5afZa=L+b{H))Up%AlVp?KkL^
z6EuMzp9LG7yk7D+`R8k=h@<Z*JFQN2PmHG(Cw#hf6_2<X*`cD?BO@&!e_`%QrVKWt
zD5+0qV2j~BgdF=R^1|}M!Y5Vw2joQdFRq22KbF}WV{nYes0+^a^Q-bdkm%j5AX*{c
z!(I8df45**O3{MhYwWEyORE$EU7ITvJw^tsm!3Ta1Mt6%F3icSwUb%H%eiuX(g^Z{
z;C0e1bL21$AU}-XyE&<#v$7~w5B8m+5ktfIlIl0MRl*rAoE>}h?Y9O|Wsu9?cv!LR
zHt>?67+EAEBm@=VShYN`GJgi(scwT*t+CvpS!$bqEAdvovgZY?Q{#S{?}_1e?`duS
zK!qE-_a^+O6()STN+Fd}e-=9hQEe6rh_evqz`|Z?70K*w6Xzk4ksVi+&<|SHNsive
z+BA;-ebu$S^T$lNisCp?Ne&F&MOQj8gpJE*oe9Vzw}1_vfjblu=z+g42mXz=fYsit
zgy_MefBXzaA6<%LauEQxfjWe}_6t}LIFc_@MXLJ_!@+Vwvxa9Wp$BcrW-buKA6yr*
zEmnRRlfrJb*F5xX>Hf=I)dg6)24UdE(jHmm$mWyT-|Z%5#AuRPz_8-8=fI#7;ASnt
z!9)_=AttDQKI@UnLT;)nm#}i>z@Qfw)-J$mDG`&;L(D0!uaN&d|MT}<s>YR(o%?|^
zfbeP*UBe)VJI202wl^*g@WQx8OMouoKr~N>fnMB3=(>a$TFl-);e(uGLV~sYY2|**
z)`_9;@Wf-M3>b{^Q14*T62EduwA0DNLEQ1#eeM}aAm*V)x2Dq62iI~|3BDQm=9*Vd
zYa~Bf{I&Au=KuGi^l}5iMmAo;E`iz<7y5G__W3p1Nt8wZ1@O5uYP%sPtr%dUXU}aa
z1s5ED{Z$#~k6qeZO(G1)7e-ui0*OWx@8Css^aS;4pOzpy9QFVhQtSd?S-|C$-M<gE
zEX-v`r-9=(RJ&E8(d=UrEzOE(vs==ygGfZuH%gXF?{4_Q#g`a>Kzqf6#Bp8uOO=Yc
zu5zl5JT&3+9*hPAldwifz>JuzDs`e7#c#yj0N*Fa>OLUvD79dM+586@4i6qUdi9J1
z#90E&)Y*G|v?IyQ10U#y4kHjx|41vRAba@Aje{5g3Jb!4G~l22!AL2X9WDqp@v!i)
zkSN%3T(tAq&HEu|HS4QJbHMG+EJxojIa;!a+4=C~6V`7ghnD*3N(km}P@^<2f6pH~
zAfj#JSv&9P6wvz0`2RNoa>~Ry@mjHR5o1F|Qa*OTkL>vAlVm2bnh8BDy&vSh_>CH;
zsks>PWrwJWQTg&!(Jkd_rf+^C&GPZpXa1L;v`pS%V#s-C0XwPyD(zWdQg1W0Z&(5E
z);^9+l3pK!&v!qkoIxl%NTX&tOnps)L6S%}wsYNUg!O-*v!3|JM~WkgKhJCZk@d#S
zyCA>I&B{mzO8`59EDYE2@5TTJar^h9DK1A;+ODZ{YC*DW>jdM6P1IMx>dFFO2>#+z
z&s$<D6!Gj0JI-J6SN%ORm(#Nq-$Qry@G8XZn(p04<#H3QgRPWX_cCyC2qv&6xIhLt
z;L|d7E)2GaHRM>bi0!@~llD;TLE5x_+1=QnBn7|~m+}G#bX;ot`zBwn_>W7A*C6wz
znd{|I{129v78ZWaQ?4$r!QreEytpz3c&W94pivx$SShd+8d%V5l9Fs}^lWJ31W(V!
znaaI^QyJ3L9a;?MS?Obc{m5&7d_SbM6{jw|&pC5Ahkz79B)lH-@lB6wUM#>of`DK^
z8-PZiG$e8!t}kg{dLpo*LeWL|Lsk~SSx*a=;1XKjo=p5kS=;;$X5qQGq=L3UAqj`l
z#BjH--Q(;2Tfu(N%;~**1oJuZaYCKb*$F;u($l0`Ou&>KsBnScF(_Q80k}ZyH(EzF
zJkd?c;>Ic$6BW}>DWl`#J@30Ys=e}?ty7+q_Fo~HOBPh{PW3fJvX4yP#xKyiSwpxd
zM=<Itq!d#9qld+9)9VHj>E$>U3oVfTI4OZkQIst;mK3Rd8`U6{s;dob20VWE+;W6;
zcjlvFoPYz578LtyFt0sDDP#`}#U&84{%<IRFKsN+?00XgjZI3cU(_@)i^2UFivRnf
z%%bilotJ?-(?@N5dz88Qhl`81cFWd90SIEEErpJ!nqKk$E`<-S-K9J}w%*<sw0R(x
zkKRrEwtsI@=?k&uqV1HOAd{8=$oArxbTWYB#w_P3N**k`VFCCW0X9bdg0YcpzMEoq
zBGxRA*5<3xrmy(6HTzS3VBe(s6?Kw2{^QEXnMn;FTD#uhZ{B>apzI~;uK<}LjEX?D
zC2t`De5;O)3DPL4T8zCil~YI5)yAmP$mmVFuHo*H<#tKEg{hH-lV-d_T>_<{W`Gn~
z^ydyOsF1(vAkH`AkEmeB?1bPj+`n=&xkB7bjF13#%%O^ajbMHAhTu@-16Cog(({Mv
zf+<6wFh2FR3j_R!{yo~H`ajUg!P<TPp9j5DmO0YV?+_=ov>+8mS(pxc0}cnJDf<mX
z8%0S<EYt>SbLj&9t$cUK1%1i+*>J9l-wT`+m1myhE{!OkJSz4qvF!8dN#4b-*Va?u
z_@E@#&Gi<F!B&m2m~D<g83JcemVvhbRNE|wvJ_*KNUFHI2b?*R!NQYAN7G>c@&eB#
z2aD^vC|n0p<D%o?0}sV(sblvM|MS4DXG`C<{e9@J{oCli-w68xI1A5QSUsyfu(~ny
z-}`Xz%E19PGSCDHwGJH!97LqHw#Qa@gv};zx2@v7$AGnigOJ=13(SEPl&ZvKUPlVr
zr&zkPyYZNc-{`p`k}*F(CALe?s9rqTc&&!VFQs?<J^8BN#K)!aL~zPU$xO^ElG@BE
zb)MJS5&(^92=L35Lhh;VI?)m~$P}Y$_iWwH)W%AtK4nl<BqYza8?p2cbfN1|Zy}4h
zakOI_2imi%8*<PVY4fyW_Mg5Z&;!Q@#+a@f9AU{WiU-4w#IeGAYN8}2uHv+y!(*f%
z*n*fAcmeqiB$JUnD@+&W$f0e@Ko(;WoV-5Q{S!mfc-{Rw&29<zH_r9XmqHfwU>p#|
zx<dl&l0x~Zu2@r((#VAt-Lbx?)|N@RZ^)Mq@`yRdZFA+XB;I;7nmYrke!?9vD8(dy
z*J&^I{u*&~T&DYBTF%uy*2p76q&JSk#HiRkBlWsSij=XCK!3{FiUR^Q0Vw7-;Iu5b
z#$^zYdEBzQmtb+i<sV2ZujSYPj$U4<(;kXd__t60&#PL=cZsaTu$b_-YKjMJ0VhiR
z4pzq}y67T-=?gJ2!g=E#AG+>>>|&3Z1R88Ui4R`)kt2&pOQsiBc45v?P(~SPAYE`N
zeE{90SSO?JYgfJ>G~M{k$k+vC6o>AS0(B~5#%u-N#w^6LLx<hnQY1~PwzD(U!=%v=
zkFW^O-;Efg<L;v41@?9!?HKkzcb>9N)lyH}hxzRpk%q1mILlaZ8ZSC7<t}5CJtNM0
zE+tTn7ZErApR)b=0G(1o2lVAK?fVM<yR4nMe2y+UoWQ^T)doCfCdgPKN&w<Z6#4M}
zuDqPA6BbE!GNI)7BJmEXFGNMF{Lj>@+#ml=N%Y3lE_q~L%W^;mCon+KQk{L0JVYsD
z@Fz{m7|190My@nFrX1jVU4`hi^RyVk3I9qaOYc?)LA3M#mt=517Xu#N1gIme&{d!a
ziUOnrhV-e?+KOP8daRAdAI0Z+w3K`Jy}{$@b#094rSIl=dh6dn=xMWY=IMD#2kN$z
zO5Zw4Z)3<9*y*7|MnA^a>e}ccwDF8Lq{MEpx7{4v(OgUPd^zMI%LEo?2SkrT0s|Ld
zi82oL?21S#Zz_|Vqe<EOJF-~?s4UL6j#$4esgD_^;!YRVD<0}AewNY8o!C+Jy50IU
zqtc!p&a7<|mjRx%T)!?z4FP`2K6Y}tt|FVrV<H<u$fN{i)4d!~xi`z*CCe*Y4naqH
zd<h#DWjqs8U@g1SfVroe5etX{5G}R(cRAVLdP<#?()W8K_g>e;sCF4^Q6}kx$KS9Z
z-Vn8jM0DusKn!fL^cGOM79-HH#R7-35j56IhgSy1$XKYu(^_+SioEQ=3gV$fv4`(-
zfQ3shz+MJo8Qd@cx)(yTG2Yf8<5K}WYWjrLd?p4wCQ!A>^RjQuJN@R(TU7@379jc-
zX)D2HXen2TclWT5%@mDumCqC%aFd$vAG8N#_q{?XY`Yc9no3>3R7o#mVuenm&1lYr
zJCRNa!Qd*u1_C=kOci7m3yGYE;757OZZa`eaaX;C#kvCGU7${4=n$-0s6#;fzs=>(
z3s5b6D%l4slbSw@5I4O5?(kih7P!O#S~N%p9tB6>Qr%P70aaCMbvZEY#cY{9tQC-c
zk?Ch-^(3Bg2<oJ>r+z3za}Zg;A7&3R`%Dw6tK)neRz3?kD0nwPG&?7D-+D_k&kg>7
zx1j_WaVOFy|8$*;3AzL~5^)9lmjDD=AQ-@pbp^h}VeBggf&^pT{&X1v99}305FY*4
z{=^5KASo{n)?4>6df;6x9u$xZWL1Fj6E!*vBWcl#(u>~!5LJ$9QL7JeQH4eD$6es5
z-sCc{tF$nR61S<uTa@YcMoZ{{I=@u+Y`nV-@C7sd78-cE*yr4N^ijLX%bKc};4z8X
zhZ$#$E1~~DDYOtZ$8^v!h@K8?G@U4@L#vSW5(4lsfq$?<pjsaoX&wLd^N+3iZ?7$3
zIi~)zb`F&M+kDp7KDMP#4*Mo=W|fd;u)|gU5cCkz;f6;Z8hBc822Lo-Qz5DnFB09K
zRy|N>(+FHPV<Qfu-Zv=arz$U>;#|25&NDz6IvmwDg2u9CwsQT|A|QHeQI_i=#sP9?
zB7JOfZ##88rS<i#X3v%YTf5&4ST%<#`>cFhM336Ore<Ox4s;jPGz;+JVqF9)|I8m?
zbb{g?aEu`<J(w*(8U{EEgs^~t+0KSza?404o+_<uY6;A`xtKLhZZDdjY{U?G7Y9Br
zxBQsa_^Vx}lG4|bAD|)~qF7KP{gw}`cB2k0h$9lh83~NASS0sv?3rG0FmWg6EF^h6
zO+B^!ToXNMGRxZFc&fnZ=7REiP<cyMfz$mrfT^~tg&4fDwWU#l-cd2z_YCyvtQ3Tz
zk)k^3aST=_RhE)+{U+7G*|cQ`J{E{TfJj`NJy<gWu>;|2n`dF^D3HtOaN}lOzel27
zCX~#ghM2St9}P&kBJ5&006nAt@LVA#us{x-t3qhVg0a>Q^@O#!_)%t}dudtY_r$Dv
z6*9Ym(d0zei!EgzOWku7NvT2kvWW>NKX$cbbuW=5(jK9Aovwvr>ZR2^gYG4JW;qX2
z>nHA!zD$R4j5ti(Q>hCM$Y+BfB-~N{4hofktp&a%4>-(Ayf%SYYl010XunAQ{I=V4
ze#FW`ltG}5TueTR9JrAaX~`0KGplB}TgDT=0bmf6OsNddYSQSJeJASHYx$KQfsRXl
zAo@mMX;cW}5S2Pj#zJ7zP6wGpu!S3BNa@z<>PqqSv56Stw`U^$9{QG0lyt>L$pw`#
zHxWSysPDP^(PSg8O3Vg{Oowa*&Dg~J!T8A9L6Hr(?;V^au=JN527NJ=Q%+SuKW^N4
ze?_JwpZaBeS)@#xzu;m_MMkaR4V!}J_ukarSr#l0u-a9g$!+z>q|edI+ooeH^=_SD
zNV)3%a{Xh?{j^5R;8ST;`TC)~0z&hAQ`LZ{uVdKdl81{Sa~^3nIiE(cqwXIWN{<{1
zmuo*izePKvIxD>~Ve`alEG-{tg;Ts!B=NwCP9BjVf~yh|%7_=Si7N1|A4n$lt&oHL
zC~B&H*cswO+rjcjQ>5XF(c5cV<gcRzuLkVjv!nxpC!=Ty1VB|96}x(rd5YT`X1dx5
ziAKj=2Rb%;@MCi0?{?;NfGsYQc$miBC5M@N>9<E}J}c4Mzeeh!iP5mN9@H#xI}D~k
zjJZg}Qmk}R%D`BMt#QZGaf&2&)WxtgSb5AVXu`xE{djVui%9HmvAvEyB@^z;Uva+I
zfn9XUDJ^nd*iNuM^bT4yUEBE68I?#Mp({am3@$sI{uEX1xFYIlnz!*LpegUuGehID
z+=?^LJ=#VQlj2`V;Uwvoed>3WCdd6|oC3BfKXzs}_g@50b@qDd-1Y?c(sbtUOSF3?
zRQZIN=<ep|xy_$`%j55y5+?JNtRf|DC5d`zYe!YuF%WB1uju*noiok90Inth`J8k9
z?IZxNC2xLOB473N<Zo*xG_P<^J{M$W??4B40m}4I!ex_N*ee1+*;E=uA&rW4E3=Iy
z8Z&^#jE;?S0l!@B6PAT3;WMD}p(ydD+nID!lAU~-{jVRbp-!!P!QU|Pn0RGiN4!{{
zd~}*T*y@dWq{1kSGG4s;xt50N%SnmVGyc+COY6F`GHk0f<<zHilKEO@;YwA={I@ak
zgA42)uj(y3@j1LawK6wa9NjIs99$<xzJ9<CSXp^I5Ab6BNe+&_8N0bfkiaN4$kdTL
zrsLiz4p*hOZQP&B=5Hb~e^n%xTbm8^naH<Np00Hryz5)qtW&=7e)=3Z-a!4;-Fx*F
z)U9oxXolY{hy2_ONLa`#&6(IGy{Bjn22YMS?kn;}-kEi}mo@%9=(Sq*q>XKEzS#Qk
zHRf>{+kD%h05Fv3aT%+CNz>c8?yN{AEm5>#&ffDGT$m<d!&+l7IGE=Z*#S$*;wO~e
zomu7?G6i%qhV%|U0+*8VsjC!HNzlj~n4TP!y1hlrH?oaoGws~7Qw_7!J_!ukXR?0K
zAgt^e@ixZD#h}tr89BYmTgkZ9yschE!i7Oh&}_jMY*5(-+58m2oQ~joDt~^kw0Kkz
z1CF7%$nQNPja0eO=UE0A78g9`rJt|*#b#lN=s6`~H6W<Wd)^j3$QATyG?DG<lQhL;
z3?Wzgr0$d8I%8=GlBP;ArkZ3l+e^A8GMh6^7F{8JnUSGWFE>njZ6dm)@M1ov<FX!!
z|6cK%72m9sq?aXip^N54Gtyq`LE98!6M-KyLL8aa@a0oIQPx6JTl+fL)~>QZy|)#h
z{L*iuVRR{I?Q0)%kWaX8`F(}0yY(RibIfy%hwUduf@v>BNh)v+x2t;-?MkE9Hg++|
zUJb-hO8e>G($~V0u6|ZziDeMS#HTb_eCzF&)UUnMRrog|!(C*+UGZ;!()S4SH?(o`
zBDo?^#&J?*LUD&be5Up%Wrp3TUz=X4R4UbuINBEWx&=@S>pxv#P8WMGk*OykVytXb
z<?bPn>W+8Gj>C%d|Fsz2{@z_Ovns)z)eY%xXl$ITd2I5GYPU6yuiAL3M@v&)cEOFA
zhXn-rB!XgJeFmwttBMg*wBo-o`k~v=?`Yklqw=|1O(gt%`7+kUvCU@EAjx##N9f)X
zPv6V16HaO;!vilG4k+rMyG9!EpCy~pT4po?hHHt*s+&K;_^6%h)X_83k7U!6F9Dit
zQWB<<Jn67lC-wD2F{QiS@!;~q3Y#4j>`&#bUiBZX0Yoxw>qqlaaL|EFR=M!>w4Avl
zp9Uc`bg7=-r;O4vC|*ZVODj??PbtMK+HUc7si|wU^XK#>4)WdKzSW*PIvPKzRHKm<
z+G-Z|(tUAYXL59jw4(0h3w~IWFkr=*KSjN!L1!A!x73t0An$zn;$q9@Zn$~~%`4I>
zy;2Z~bUQPCTtdQ*E~fT~IFz9uG?`m5r+N7u?QDcb_DtZt<%(6i;JjBst*X0cR6<^S
z0d$+j=&?>jKSEE~C+~MNX?Qhh)y-6!qq^M2px9lvPa-ap>$)zxPQR{Br}mGqh=eZX
zYVKa3qhl1jIyQVXu;oetD(K}2Y$KO}p_~%$Iye|a<=5b~1MI`lc^Afv*CgqHY`w`L
zfAWv5Z`AvgdF-lXphy>{x~;uA_nO<ha&YKD$nu1W0(JdG-{LO77Tx)Y9bLG;Gx3^_
zO1(SE6H>cdH|?Vw?wni^LcmtYoZx#w4X*uteA@Tq>7On4cBS*e%<|eUCs*WNocOYJ
zuaB%8xTx{DIeDHq)7Nb)(=?fU90XGL&CQ%H-6?RoFgHcc^j~ZA3A;_D9b5~@!n=o=
z&NdYcY|zX!a!uUEzpRaI$;c#=7qKWAhy7+V{<E5wE8eva`%N@{YBmWEd5&+tL<&zn
zUxj7(kTakhAWuo$5%wM1_1n*K(#8%p4t|IWH=|Go(<<s^F536UT?<i~9NnP&xVtn-
z(k+atwZIwSEKKF%<1^k%K7=9xWMj^`fB(R|>ve&d6y`^O=2hYl`HAvo-@}qe$-bqt
zPh6SByd;<e^Lm7e3nSUSZ2M{?J2_RDg*m7q;-aO-`h>*L=xBCrNfdppE`R$Njn)15
zX|p_#W1|;B_qIrFC=!l05hq?yo>u7^WXZ?3KBI}Z$ILI%!ue<oFB{75N-#ldW51=R
zeH3U;8kJcytM7#0%}$GM1$$Cn1*w_%)7mt^N!Xf&OWkDJ_Il8!=&n=i^B1&&uwDFb
z{sSkwwkuiTYQDqMVW*Q%5==LL^G|yxA0arOBsk@YD^cs6v5O&h$4PI<lW*r|FxlzN
z6H9=^V`3(4_I^kZRm-__^_}?W^i0-#P_SCRuS3Rf{x)ZM^<p(C|4*s`q<H_`{JXTC
zX_5IX-M3D~Ng-j^z@%u!`dj)ZKbZ(=3Fv+po~X{>`dh{G3#D&Sk+jgVy=X3`ae_26
zMcrIAQx0m<_&xe=Yhe9rXkA!+!T0yII|1EIb<!BM+qwnnq0J_HGluhPdGaU2j{cZ+
zHU*_+-4*&5A}two5IWIbwk(K93$JhQ93s)mIlqztTk=}Oqk-)Gzske%);^M-VA}|q
zB_F<h9-kc@9l*Qx02FYVVpP7#2SNEtfvClaFzFXt_ekL6J`4xZyR%wM#8?D`N!U%E
zYA^50qymS)OIr(ygCX#fV#N7#IeE5=pD2zy0C^Rq-CZ?LkZV7gG{Z^Wy5r^_FNelK
z$G;BN5L8c3wS8_+o|w@Dlaw~C5zQa7u`)OKTHTYf8<gmIIF9`4)pb!TU$!q2?u9D3
z%_#-n8LU0wTz_7%-EO^xH1{jGMZVN4%sfK!CGXrja?rh&yvea8LM>%(ow$_oGYE6_
zqGy`w?%<cZX8NszVe)3Ll;mG$)^1(wQ(AA?ni^DFQx2HWsBb>AGTZeFHToBCnirTq
z&e`)z-v@pl&uh&285Fqd6SAYcHG0C>dgb@s-{GzMjNu`CLF=sz^%vTe=SSyWdiJmN
zP0Wtg6U=SZZw)Oa=dY2%9hA4G$j0^MtI1!2@2jHU@qxnwc=+|}`?tCWH%a)q`=v5P
zGOtMydhgmJq;tN<M**v-v=pfu`Jwu{5E>mNOt<j*OvHtq`>n^Y`*i4C=5|c7S-)=$
z!O2;(BrVI?H={^`jXs4vrIa0C9{7e{glEiXCu!evVu^4y^mkKgX?Ci6j-^PdQD<Xn
zu;!)th6IrMVKBhyaHe=%2x`_qlko*H6%9_Unbn<efjMFfDXTt)JoEk6Zs_3Ezr?XP
z2%329)LQq7cekxT6IGuwyZnv(+}|tYt5U#^ppUDon1^^p>R!lf?on`n=lJ%<C8ryk
z;>ky|Ov>T{oEtXp{|-pzy+<WZ_RN=w7?G-1$y>qLIp@6DnZEha8w1!JuqdaN-c^LQ
zxh2=6aZw6xd2Fv~TF-R%C{oX;TT1A1{k}>btp$l^=>}wE%5eGCG9`;}@lCFN*HX8l
zywih4o42{UoCSP_{=}g#YoAN%dAevc-?}EVC!WhMf3B$Q`BTzfte9WVH@qfn&^VS3
zF>%7;<|YTg`1_O6YTdBLl!34#{B4tjX6N&xI^tG^2o~LH^kE%p?PL4|Z-IIES>ct9
zJ+790maxG3roM_NeRnUe=Y?!+EN!)3{Nbr<D4?e;WGiyg$`H?`&3J=n3_V&K{F~I!
z8ay?asb?tHFOg~}CK>{Y#LnY77zGeW927g@(TR1Wd1l_JAUxUUB#rj(n5sfB1i&!*
zYAUs#zPNrSOjDJ-8dVL#cq?O|r2lf-S4wvWd2yp<+naV~7wc&)qhIlPXJcQ+hyOxw
zXz~ej#*0Zta!yY)sKfKSK5Y?ns=v(mXH+vcTkw8audqum*SCUcTlFVS|5Vxy{Sgw!
zupK-*Lz&+Q+M*q3#BxVEz4n}>kovmKH2e!Wb3X-QZ!l>|I>dH8v%Q%!F|p=(E$p6|
zQ(FrSzZ#=B5*!$O*~hn$G=z!?G#>H4taI<Z(AD_NjCao-r!#1Qsy=2dgjQjCq^;xn
zyjSRqW9XVAEr(318fhC;T)VTh9JJ4;wmB{VJ1SDC14i0dL}Uzo1W+9Ig{To=lSzL2
z3)EHYWPi~9Wgq9<yE9?|zb|HuZnbV7x1o;`1@ug*0D{dVRwU>u$X`*_8lp;SY7JOM
z=A^Kj7;XP<bAv^xz_henAc;p}U1^>?bB?r!$pOpVW9KUU6X`i&=Pp$6kw_R#j+u_1
zTYF?en_P+rj(2iq7tFGN(eCf2p{Gt<A+2wkY2kLIN4GT1BYkE5nx)WAT&z$OiAnvP
ze|NXNhP;NQ)t~kKKntnSrS}TE=%Z;nGq@&mitoTPxnzLcO1xB}dp!qQ<gwMWEzc;s
z?NL5O(#xIH@&7dJX&PWS>1j%`96x6`;%_)CMrqtd`x{5sT}>2wmN`G-^w<5dDo0Te
ztOB(;@ecqp1VLYj6NQY*1Q6`lzIk6w)ycD}ll*q;iTT5;RLYN^t26KFK7L9a)|LPz
zdr@F;Qmnnv??(xP!L6Y5a*?{%Ci8hME4N@qu&+Kbc5<a9V83Kw(U{#-TOmrEJ+%mK
z6x9cB<PwRr6T+w}``mBhuP7PK8Y4JmRTqiWJHJ|Z8pCM;Zz!a*V6zL96hA7jBpn)0
z6)l-^zNR`5gM;E~rM^#u9y3qIe4_<xm=7$?b`>LxPB|Md&hI`fc{dz%fbE-HFK~7W
zf`mtxG(fU?Za2Ijf)Kbz?W0g%{LnLUHpl)@=Xb``%kcXyDBoMZznxcarN<dS*&>Z@
zQ@1GvOWpaQKUA>;-nm~^e6O8SKceR^KSa{Y=WHEZSZa8dds^&K>C3L@z9PSm6Gb(a
zhQ@&Vp+%>x>_v;uHIINNS8gf9lomo-m5}HqP=SksM73Z@0b6k<dQnlsqk{#PO@8so
zQ(p(suJ(V~_50l#9K5HxeU}n6EH1=etOXK_LX}mGC)0w~)z5^RkCT5@<z@}O-#|6X
zEVhNuRNdJ;Zx~x8RGMnVCY5R^F64Mz<U29xMUzt9{o21Lf~0yoAL%h|5+iPs>xZ8k
zN=~lQK=4ct0;z#m7Gi^apJ<*GwMngV!6_~*U<<vdSgi}mu_`J{tt%29zx<`)l$<~f
z4nh@k9=$xW14^%x&%LS(KUwiMXg~Z4f9!Q%eS+J}!x7(sCk24opSpR6Y}4%VXm#zZ
zc^m(u^!m&ha0K0wdtbw3ZGiD|&*F!bISlu>RGbS@muN6tqaf}jRi1~cG!nHG^x_b#
zq<eU?Nz`cG-Pmtx={(t%)y?S1F_D&Aj!<c_z#$5Bm<bZ4XDNh%K{Sv6Q4rnED{?`n
z3r;xx;tQhXqiiXjPBZ)k$%J-uzAsf4MSwMkO_5VvEFgwB7dXFhK+x=@@Sjrmn~kuX
z+YGN+*xXsR+t?C`^v;Ot_-=O0?5L6%pJ)6FpZnhAmK+0c@IBK}q{pL%nMeD|=a>5f
zL&CA#T}p?M$I1ta`SD%$BT@_I7tz#H$|3VxS6cEZR#9|tYnFLp*R+OF+l70yA7KrH
zb@Na1_s>mHNNY}3K|4+tf^WP;``w(h3KP~y_>hMgu$7L9YuxHv>baZfX?E2(OK0wR
z-9?N+3Wu<8!P5~AW(FN?Tf}iYE&<-hU33rZ-!k3PiJkXroUeK!Z0M^}=?@hp^(kCU
zeJGiJxKLprOn;^lW&>xidW<uQX0}R2+DLU_`ml3r8b`eEUqihcRsBS9a{_UZd&fUx
zze+?ir6BacVe%5J-WxBmw7R`;aNh4JnX7$EyQEV!t)y~g70*Y2oK+J|T{)aheO6Z9
zRw$$-{ZR+x(4wLPul9v$pO(o8zWsLT_7HF^w$r`VU4Bx*a1GC;7!|h|)B`U4(uCp%
z^2AJXzZ%6$wfwcRs$_9fV<7}L@m^@zXeOLCSM-w__BXYz#(YlPh@WpXmOk%)Vepk`
zBNMXtQEE<$w-((QS-V0g2H;t?lxyGkRW*F*I)<9-aDiA@1t2>*D+@+t$6CLo^L@3=
z$L$Jrq9D1=XDyBnFE}hYpko3b5aJNC4cy8WiYgV9K!EyIw2(<nnsv{#nsoMhh+Fb~
z3UPdXbokp$ee$)SrQSG0f&Nai^6hVGV;jxMbmeNtTSHeprM}*MnUkuRo@R)M){)oA
zOuR8R)#T7J_+>6ln6pd1jF-3XOIuzDPYC6Q$38#VgG^lhsZf-Fxy0Sg>O%jCH<f|I
zN?5f(Rc*jr<C@s3#!bqz>1Rd|46qEM`#dffT4L@R->SK4^j)jW{gNH3QVDVaDG-qA
zC<N&OdOSMO)eVhCzP*)n_+}wJqzHK#b=;Zv>dh>x^3N<T^Xg`S!3&Ed>LjG9ZrSU=
z6d1K07-+E+!K(~(7zCLu;&4V8I#GgB*^{R=PI-q$RAi-0Cc6gTpR6F&n-iLoyW5jV
z;bB3$B$hiAwR>tWvmNJa=Td6li}<NJG?YEb^tuVoo)(E@O)xP5S)cJ>k`Bp;WSVSl
zJ<_tdxn`Cdm}NVoQdK5W-!#*GNnb7lgsWX-g+3UTrz<qXKQ%k=*;}VZL5Gx#)xGnd
zs02ABL3_y<MK_!qV$1?WtLbn6Fo}aeN?04%eN2A|OQLEqN(RU5LHR*mDe9PZlp+W3
z3!!v}_)H+Mm%|y^NKiR~V?^t5*<sF94+%uEu)vT=t!gXw$fzRODDhHLfMUaY2%Ge$
zC8PIdpKB^@Zfu@;ecN1TaB801{*byGYT{U$W2j&sZ&a<IsAzi3_$gYxw&bKpm*cYQ
z<gMTUb-Gcvv6d}=5Q;NKZ(7$qSGbzvb|nXARhVLGs=d0sKExrH0Rky5D3MR_3cucX
zr1+T?+V29(9>vzz>&y8u<JA_d91t^u3&1?W<3UEp1)v}ga}vkE6=0!Q0I1ZhT+A?=
zl~FMEh&ThCh2R^E1?RgMMZd8pUJjXHA}|S{VN6<d0B(BT%ON8QoTrFjw$Ncutuz8G
z_1TfElk(?H5=^{%pAwIvCa{;v!!!<j<tt=j{Ato*EqB|sldq!XHtx0y^C^q^E#`=#
zuY1WS^jn|g9JI-N#dkR@_=-kZL3zXSWX0XZ<-kwF($BwG%=^76X0k|O207(aWOh#4
z=hZnkB;b$${?*ND?^N%by%Na6O69uHub#cl1eL{Peax5{@y0}@3yT2DTabb1;H>6m
zy~K1VqN|-C?(h{118asM*9~_c#Z-f;4hX>t)9$!{gVjXxzPN4iy{xMGif{%_hocb=
z@@6m|_e38FyK+Nqt;T9Y(W-Mu`DS?l#pLZJA4S#r+#T!fuN^Ee%D4{SwF`@B+5SSs
z0CLEUicWHUpIbY>^y7^#r%(z@mz;oT)0bsp+iQ-k0Ci)6-Ru}~Xd<Mh^pk(Q#H}dV
zbQqIpu9cvn5U`#_iqUZbmx-TyE|tqYJb#RPJb}&Tlb}mNaXhk;wRUcdDjhn}kc6+-
zR~LSA@d*pVP2^!#%th7`OwYGKK5md1I&5^11tfs8rRTA;P04=@Aubg%mLjYz?PKbg
zyuRnS>ls^{I`*Yo&?B{xkgUZK$iA!YOmS_IYhi43uY7I)v;NMWyZ{tYQoi=bb)gSc
zqTnRKS#eJlv6ph&){8rY2=vs42|ts70@MFP)tkUWy?_7XLqpas(~z}07_wG|5lR_m
z7`rh;NRlNQl(lYJu52-u?6St#W^84vw74Z?iO3+*Cd$%s6Ro#<|K~mR`TidN_nkYV
z@gDPfpVv9h^E~JEI_Dj^a(uUU@O=2>?Ry7y!cBBNPQF<^VrFNy&uqUFschM_;pu)m
z&%H95L?qzKWZ<*J7+j6q<ZMrJa&8__*iR?FYQn6tlE6x}-OSz9G%NCHG-BQZ%!%t|
z5xqz4yc1&FqMLdX?;xc>0<kE`a^ZETShz&ta(F_H+X5A+K9ok){ehNNHPg&kVN`=k
z8|seGiAGya1h1`K&r;N#m!P7We-LBa!V<7k#m6!I6Ng(3ywaK?8vM)xcj8i2D^#ac
z4brN5PD~bgdz`4A8}6v?g)q#o_R`(j8^7Cho_XzceC_pU!*avZ77x?HnU{xTBWuv@
z;ceH8^0b9yS#d6BVTF;Jpn}0A@L1i{>b(Rl7bu@iIfQPp?SJ!mg^=WYPevjDCE@A7
zl1Ud#qEYfBin@k(LaJFPB}Q%ZfK5!LpWRk~pmnfN+=jZ1Qi+ANTCv;wYlL;Qa+E&`
zg`os`$h#dn40m2zFIn!RUq6tSA;hI{8R#x`WUnwZ^lKe%G4O=ju2+}p5Wp-A2U-kx
zLk0~GMX31xk};#^qSqOb#XILrBAX~LGhF9Qs&DsFUAB6sEsys8XfiXqd30)M?E(GD
z>D@PPd<$P%OkXQ)PaS2XU<7F-OeR$?fk=g=YhAVgM#UxJp;U?n#Xlv0rmw03C86zG
zTA%gx(kwOo&TY7`Ae9|Ly&Zt1QF;Vq9z^y876)Rg7l&3ijpkH6iPrRmS~je+5A4B-
z^+5?LBy0X}8CvLICS0;0{{C=lLo!!tK*X=eFV?3)jX31X6dmwPPVV>B_nK7lDv%E^
zy8Wu4$mH$v;`x22en|R-8Waw<a#RfL`@F{F!?qW7nG_Uk^~(+}3eNX-ePvRK9&m5*
zQF5hKUEP|!tT;GUdMwa8BYOF@_XKh29{2IZ`e)}W#x6R39Bnx4Ck8v(p=pGX5UhHu
zAP);^oO+h3x{F3NglgILDXLleGV8BCzCR#uDQ~G{>Vv`;qlJaAgn_Mc$xSEA6n71p
zC~PQsMlzGVUg>Ai3$scyhkXu!OUZm!x}CqA4RCZe7S=G)nT0%gUbdiIyeY~;$i~2Z
z+t%oNJNk>$0*ER3N5s>v4aUvO<E5GYWHZyx=Phe?5(h2Sd$$K~Eb|U|daR>*-ZA8<
zTSxV)9MQ1WjmBqDgQ@xR*T;5PQYV7_{7#w{)YF@WAD8`b{C?5))~Vo!-Z#oh9U4Zp
z@A<%mNpUgevAzQELjv+IP+=8Ji+XMzImf?WS|;m(lF`>G2n=_Hu(KK^AYCt)!0L`g
z4QK{nJzUzX+#<dHUOLe}q_xd{l3kV%y|uSm0wv6jhszU|f{B!L?%vMd-;o3wY#|p1
zRVg?RszJk&D5gR?OO&CajUQ^VUmohc84~qTzca#3NEEF#j?31;=NPiwyvrjm?V2<?
zs&)V7*MnPS(hdcRWzMov_lp<UL>s0T_?0iT)?I(|X5u8#bggX2@kZH|n0C|X(&3cj
zt(80KO`jQ^GZ!UWNMUdqRpex-g@bzuz+95g!u}CVzmdHI`SP_AZuf~+Z#QpCZ>yt)
zrQsLH%AOTXR|VTxLONUm&FW6}aUPJTU>R+(X-y}hUUYoSI8hUAx3D>G&8jys7Nz41
zw#o06<5Ldy3Yv>Ts!JFuV$c(jY^$Cv!olZP*%;lo9d@?8Bbsurtn3)^)$3F49V51y
zMY%=8Yy+>V;h9SH?(SYM$LQ_>uZLs|qpe**uQ!$35OTxXA!@H}^iuS)Sxjl(R72Fv
z8Z+8pj5~U01;Xj1#9U%Er=u~lJ{Kb>T%Bo7O+Y`ylVe5T2mV~DlA&>{u$9c<HY{8u
zqjT3}-sX^-`uF|GDYPH1@4oU}T9TZ>q59y9q|E)~Ej250+j7wtW>%)|daXBoxE8RW
z{F-sSC?B;h2+Add?ZLf3?I}Y9ww`JuMuAa>hIiWdY;tys?SRF=9lTu;g?y+Z3)6wQ
zZ&z4Y>^0a^+>^dym)23GD_<x-m_1v#l`!jHI9SASBebwzH5wLpMDI_}h-VMin=W7S
zSe`hkyUbhSEe6(mESM6F0{#4~q73(G`t8+`+u+u;S0>bdTvR}tF#zf+1B%L@%~*){
zRWKA%%5a3;-EGC&3by4C=N(RD-Bqdy7ga?`iTum`eCiuqTmay2H(r}ouAc_|j96~D
z478h31T(C)>sr0(t6QQwC)rSy>O(|a3stZjDW1}{5Il%VbU`i?W805U&bCQb_aCm{
z<QQlUL1jwzCRO#m`@>$7+Jif^!o8|*_ni26qPo{BZBmQiRY_1~kgsBcLT+fhwtaV$
z+tJ)S8fXDGJq>g%jd|c2<+ZxJvv{h7S*)O--YA0wME8s(s{08H<dsX^HdoPRBuk4}
zRNF!;rUY~{112;%-mv?%H)S^X{;r1Q{^6U2r>6d>nkT48!4_DQg~0FQo8OlW*t&tM
z>D^AlXiKZXdJantw3i}Q-t{{F!5(^AFSGhh#>e&;NmW?vfgO!P)Lcd~H9_5iLFEFQ
zvxBNw4QPY1mq2y5pG#^@8#B;47-@eW`n5IOhwFmP6?Coew1D1VnZ5!20<8%9zI>5<
zGJ!p5bIjq*f_JfL!&2)dddtoortPLvi>;@31d>O1ypeIDL+F&DVIZZ2Wt*2KQ!m1_
z6k4wd1-+2lL!og}dD^gu!s<tQ3JK!LQ)o9@!p+ypH%&StzUFwlMbB?Oa#Uczmz*Pl
z5-QhJK>>#B;of>?lCI}D0@tCRf@YjW)~=BMXqM8Vi6t>5qWwn*Q&YspTRgY{dJ?dk
zS1N_fb)iC|PMU6=I!#nZN0e|!R5DP?|4_$ZAsi)_$$?T6T9Wf}HKBg_b}1RrX}%p+
zcDWrj5nZoxw8@y3)B<|YLQ@?m>4qncPaFr!ZkWDV>R9A0bSyZg9BcJsJRA~B)nv0-
zo|??jxXTLHgo!vM_GKtM22H{Vz_3+BDbzd>Y6Cgh0-r5$-+n{Doble_qLr6}!~bwT
z20S<MlN-*>HWRQ&!a);*1lZgc`)}3fQ%jlwI+_(}erRdWvuFtX5t9W<h(1&T`I%kB
zLHTx<RlA8&Vb;TQL9s$DkOE|rZ3ooP>Po4@UJPj52qh9Z21c!Ele@}?+3sE+BXE7g
zUIoSjUX$trUX^Ml5jjNI7>6^jlbi0?YPjE_lDXg=-}L$_{V$Jqt$+RTcIFKj<f0>M
zs&vRfQc~PbTeI2+VEqm$p#ht;T_IBvngztdJjS90X)Yq=?WzzPs2HBr=(Z6r%=Yv8
zaR25xiO!J8!p)vvJ>V6yVv|6^W}#666p>s3e-uW53O5F={%vW`@!<f8YBs_K<76uc
zJS*f%10+3cC=%#^$OnN6;d_Z41Fcc}>8>s3e99ADc>Vh5%**y24H}0cJqoRYi(VZf
zHxr8}S;a-K$gqmsQ7A1xm<tnJ6rihXMbopeu;*kA$Y8G=R#2SiU0GE&1w{224|Hsu
z+)tcrSlheL?6{dxltE{4Kez6%UUe=+Rww~;IdjxHpvlu=I%t{OV$gaBCnaL8BFGZO
zNO@+7SP0q#8yH1gm3wWnH~Gb-J*FSk28%yx+<f#rCq2x5uGmFWFi#4NQh8XF?kr42
znd_nM3$Z1#eo)?jUDL5uX0)Zd4=4yw&C{*iL5a6(22%$#E6!@=m8{*1yccLVfte>>
zkgQ3Q$;`am(HmU!TD~c`Fc&szN|7z@U|wBrmM_#j1lQfs6fS(?G8tg1OUf3@xT>)A
zN~p%f>NZO0CNtv0sHsWrSfE3xDeO}5T2-u>+*vfy-|{Bdpl%^Q{|W&p78C-?#i4+c
zt)qDv3%H|E<s#603M^7M6Ng7Zn^b(f!A6-^CK<%pf(N_$|03)vc}Dz0E$hUqNPHHG
zMulzSI8>jc0Qd-WTpZd1%fYT+TmRQ<UZZBkAax>Bi+qrZlHyOPpOz<qrRgUa()YS!
zt~H}WeXeNU<YR+GQA&U>)!hr}5J`|F<gs8Ej8~s3L?82Us;VL$`My;3Lu9cHT1-Pj
zVq<#4%z~*-ts~box-8W+r;=XpFtyk?7F_z~(G-!`=;tzKF=(i*ThS;;1fCfSz8MSb
z3w2Pl0Wy3-0DY(gxI6)z##sXNx(SqT(us>KsqYPMe|@QV^P!`KM~h2Otb~_5oXhe}
zG&dKN!J^8`(Sma3*o0V=Hd@+H6s^t>G5^!)`<c@c>?E2qmMENvlgp}<hs}+kwOF`9
zRKmdUN#nOK9c7*uBzY?>XLX)vh!~3Wsve3+n;&*}_eh&?BS6O47h2HbskV6;+WYDa
z9UK~Go<d7)xT0!P!=+aC&{)00qo+edYeq&!4#6I!8|jwh_K}uZz!~V)4-@xu2Q5GL
zQ;B2w-)2hKngh6lj*2DVv#ACJ1{*gPp2(oQFxI%ac&h)B{;5YF=U)bv^x{g%x-3Dc
zh7=P+3kU&3Nm!r-$mR&{z<&Pou-X3TgNj_|0nc;xVRvB5q7_`1fF%GBI28%s{E*(^
zlVzsQ5A0fb_0RohJIstDJ9j-jakDktpr|j!7ngldw=PA>Tu8?-)v(p|(W8aNHw%vO
zmGqkHTVtY4H?ptmKH0&W+L0bIMQo(oz>JC;ri<BmvH<Fsw|%w?`2dL&M77EN+=DN5
z+Y;)e<1W)|K*M5T3#y8*fkA^rz-yE0m&O_DAFDs^`=~Z_VCPnYB7Leyv$;sTxd#@l
zhmt~LW6@F~TBzG-ynqV|hmsNzRlyCH|I7XKM^Htznx|({nqN6|09~i)CpTW{mTOc<
zeVEjiRxT~;7ie-XQ1ENSR|9YR#rcoVE|!&?c(#>zHvdROzesLubwEC|sHwO2(~+Y<
z$ks+mWux{w6nm|1A+;AXk1EW(VHOn?RTmY>=I{6NuyYx;gl&^RqwbJ}%Qv8efE_zS
zEjp+r3OypQ0i_U2bVi9-FfyU73~Mg3WbyvZ9Ix=M6K_w9zH&Ix{Ce<SfmU8&16vAp
z76sh}^iT;{5&txE0Wld_F)%qQ05Cc^;eG<kLaFUf`pHwe%|EZLyj)nNJk7682^w<K
zv@G(o(kiMYd~9TW4+biS4ZgZmxC2Voj_kNoR?_M<1$FC1vDKrxk0!3}Xi7T9TWF1X
z=9qN6vHsBU#zG#<(_XqqDP&30F+<{-Y=Ef@g?1<-gUVuImAKgLs3a5{r7zfwTogp<
z3W88ZQ!b+FiXjyi&H4J=e61U?4f8<>^R;8Ll=$i%I{cEhZ^snuUXMkYqhbMW6a)c4
z%&{V9skm%02`WNsFcya>=9zM{6RbQS=kLn~6-KE8@-Fes$v$yyLA_1)u=?pW>2lLm
z%!iQdYw1=q9lo!YJ7+wZ(xmi0+r)F=sHO)usM6AsF?GDvbK0TlSYr;IG12A_Ot%Rw
z6*ttq){?4O9qrs};tn(cHf}>o0S(G0fVz!D-5^>Y96U1`NWgfr-Jo}dPI#K$>zp!g
zyFVu5cf=haUfQ|MG&td9hF5bdL03pD79}N^3@v3*2wRa7!ofUAYYL*VQaHF%5=MkW
zUYF0(Z1<Ck{kP!LKi{;p4tvrpS?!4#C^U1lQi!WeNHQui^mA)7WDdxU#)_mG5cIb@
zo@kKp?1@x$6>Ld0+~?q+V?#7dk80~6dK%j9b5I8|0Q5kq(KZaZ1SH<--VWIkQFqjH
z_=gS>h{1KB(CW4+8o0PkYQ{ZbUh1zLZBA@r1;_3B`j_FykAJAY^!D$v?}Kh1<+v(1
z9gl`!MgS!wV2+R%90!WXM4_LiHad1TAD~AWwll~6oA>FT?^bQlR5#qRO$%;&kuGoU
z+}o(g5T*8x$qgtF{S>w{Y)Kma^5CRXD8g-o0o}Hi*+H!%c5cvTqgTI8B1{4m!s5yC
zH_!{i*RB&np?ucGBI*Qtr(+SBi@M|D)d%z&Bs4k-@{M0zdzlpcpkTP@<H~H&%M3qs
zUp5Ir1mAK?DV!J%_8vnkidb{~prmXf3><(WMYRu?TeMzJmd5M_vB0_i=6?F3B{v8W
zK?PJO>Q`F92EcUB=5)D<*ot%{#TZ)-w3{nt#esPMs>M=jGprU9Nb}K;ofZaE3W9Wn
z93o@6SQxVy>NaY<gn&8890ft24K7ZE&`@9!rXRen$RuDcICZQ1sjt8ao)=`8s1-JB
zG)!?#rowax<Eo4qx1nGI5_B*oLuYerT;`}?xggorf`rEC2;AML*%1_V8}_cl2_pYy
z!<aRzf+<+TU`w#LpwW6;x$#B_$b0o0an3OE3@eZyYMny7l75EVcr0`~2NV_HG$14P
zLDEW4ppE1mu;xt2L_n@k)1p}<FB@v??I*GQ;ogyDPftDdII-#cjwEmSKQz9m&kkmL
zM`A>57;(@5N+15VSgZ@h-W(-pj-_S73ra?S>PvFYw!tOb&&@)O=hGra7Gt534lovl
z7Ti;H`mf#jNx6^_st&p>tRH6>?500x+Y7=@V~(a(z}n1a`zX|Hkm~J-Yr^Z`rU)=Z
zVH8m&_BkI?P+*Rb)D-d2*D=R}#7I=g1ye}kg@tExuQf?V)*9Zd@872I_e(DWFT&sR
z_qOR?vmzGRpm1ngL4Cj!kery5ix>oREws2Q6tEc-__|~mZk#qbc9xYt;HiB9F${BX
zmcUxpul{-U4h0L*q4Pv0vd6u5XMvuMJff)8hA`|j=3GTODGf&2wfEo#XBcfS3>w9h
z5H449RzX0JKVSj)W=Ut9Iy%KU#l}O$H*ja9ftUSWnL8(57I`1)z|RhUsbmG8GkuX^
zbE5jSfq{xt7F;GW3Zytg$Q+$m9t&fSMV?UFqFi+tuZ@jBql|2u``aL>i-1crM|1+5
z^q$IFono3*0a)kWHe|-J`mHWEf|$Lq9uPELkyb5Tt&;@g4k=Q|8;g^JMS@sFDcYd;
z7cG;3LUO9GAb=8vw1tQT9)g_Aj!gfK3A;4EZKfYD83pQiHHN?X;1D+7L%g?5!)rOA
zuqk9<NJRoP77Ph0C1Di40(4ZO562gUMkFjClA9eBhXFn#U`GpZ@L;HwW6gm#!C>Jd
zfbp@pd)PlZ#pP`%ux^nK#bHQ5Lr8LIV<NAy6=@tXs53&|zs-EEv<`$!#L7uXb71u%
zs~+r)p9h9w6xcP9Evnk*Za^p?_TDd$KXG5-_0W7l&W;RZZ?w18A1m|Tr)K<2Sr>8{
zg5Z~s1BM4nAMh-Ms$zk|gde4#r;cv6sCpqLULINeVszbx6X7=qfFmtbL<EGaR}Wmh
zJ*a>vvY)NMS#u=NbcSx24~Z3LA^#^g3!?_f!l-$2E1(_{GMw#JB0RTsfa#W?!Kfs-
zouEv%mQOJ*?|ve5Gk|)uf{mgLoAMnGpE&f@;E$SX^Rq*91w~%?{z#4uRvTAk2z1pP
zC16elyAwea0VOCSqA4YoA_kEJ2CRUHuSymsRJY_0WL37goW();YAhN-Y-H3hEvnA{
zrhNJ$Pf?d>&TR;Sp$*7^gKP*IfCK>~K+=Nl=>c|tl8;vkq?69$AfW3l*CEMi8Va*7
z3&aZbLz8aRcGzcP!<0{mQy5a6sqPz?sgw`9TDHBQD7bh>c5t@$uH_69jgHD9FFHn@
zW#0#aL#m3_Nv*ShF(Yb<U^vP=5$CKf&p`eb2f4kHoCG(7(~>tP=MKMvdM-pY!2aN8
zMB3=z7XCcSN^(IG$w0}#y(>VJ4~bS};JNyh+Rg!>#%X?TvG*kR3*-REt&`KC$?2el
z#ZV&BqL{uE53o91ev5sdzWsD}e|Ujt!-f-0hff56a+uB)WP97d=5GB0f=Gu;1-g0@
z?q}f{3MC*(hIt1z%^$abAQo!(L{<Co35<kw@-Cxx0hV%IEGfQ#;VgJXP6jWCLW^YX
zsW{!KBX46nV2f;{h0%d;sSX-#j2(coV;FT03f}Z_zU`;fpmiP>1#VB+C>y%zI%i@k
zbgS4N?kf0rBCBtB=A|a2S=Nb$!IIXif`T1I!5Og2pD-VMQP)rVesY$o%yv|4l)0FS
zxw)x1%9zp37dawil)1=Rb7&*eU=@wWXHm061=6@doR<7pVFB|7Uld=!pdX0A!V4m9
zX~FfYzhCX4NNTcKe2@dJ0LVB@9S1d;02L=d9{)v}pFr+9h0Aii^6N&FjG^*KRZ7H8
z)kfXNPPEjv+uvf&|ImbnXxfB<*UHCxhLgHCJ0h+Q77uRQb#uixaO+_rLB)BUfCS11
zx+m&T%wKGXMTuxhfaDN=0!m_uL2=O9LSpytw;QNS#WG>}vZcBLoCsD37tof8NE;>v
zCzbST<Tw;r1a*Gl_oFO`LDV7eGK5>rq_Ja>Fa`GV>sJeo^tzaMFf8TGVHOnP<#0p+
zQCpH&Ci~#VkQ|I-l^q)5<mi$Pd3j=1+O?*Q?sgB99)7eNERDFQJ85{ZIL`mjWm^^a
zR`BcyoFip^KMz<3kM#lU0G8fjBanu+$ttT7spyfxdbY&+pcFtAMp39-G@{a=73L@y
zbvN?k*(?%n{ri8P$>cUv9cB(#xwQEqN<stVfLI?u&!su-uuJn8m?dxw6c%kEAm&O<
zcGZ!_ONSKB3&#X*jhO4G(QpVT_1n6B*W|89yP<7H(L+khLt9NQ6gFUNG-F}7DzQIH
zD3RKAFhP(pyaNa5C$$0YCLvXqnm+)4l3Gz9Q7(r<#l<!Y#tK?N*_Jd2nGbk~O7rC`
zkHw(Qe1H34l;#HHE}*<E-GhpVIWHaIOyIvO8YRN+ZQwwSd!3b_RIWN~6>P{RiAxu6
z=gC7s>zsdwga5VpRQJIL+jd0`A`%{auvHj(xmPt*#Ui6cMy4+zj6<9yj2l8va~Lzc
zq6Di%)iu~zqWDKC0{PeHTShQc0dqKMoeb8ZRxCll83%bwDTFeaBk+w9fnVY<sARbP
z&(j}erkclS;8?Qip{WiG7Tc&*6Gx*+dO$wks!47<!y*<XugW;9>H*Hq;#C$Ay)`)d
zwML|eT;YzSLw2l>gGom=dVNT^cIczrh56EsenAhiikdTgy{{a24xo>)euEr{PQwAT
zNCJ(|4$aNYW-`gPDmawO^xOPp=R}uvAmUh*AWI01Z4e;gV2mVl#Olz3V2gq{XLA%D
z3&b_{x2LztOciKuBM*^mZLf<E$d`~;ttSyQ5nC?TBZ1P=62XvdbX0N4c|$6ZDh)5y
zhrQ}G`x|O5d$ooYh=!%9zusOT*X89$5J}O<RE2b7EUui-|6zP6)NS}5q^<I6+$zag
z8~u6N4sZj~WNArKnmKXg@eW#76%K}r44A5kbqD1K(aM2*f8sLehCfUUDAM|O|2|OE
z(riCW*}w_F3Q5X47_zg{6<YFQN8BJFD2Kk$9{6mVe1(MjakA?D1_kOv4b^?O2ZAM*
z<$AsFUBRN^`UM+}?`M-)GGIxusCnpm$>H1CFTv_VHSI4z77)-<<*G|#xfncJL`M$%
zm4CL(p^obbGOA#GfFH3a0Rfsh5NQ}3qQQvwL(om49L2|tA7fK5EAm|+5fcr*L~cMZ
z$uP>?C;{c0fWt#1G?nb3s-nWlm#E*>TA<VLs>SP21l;PzPxeDv1gyr`R~pC3+K>f-
zF{6BtA?BsX3C5$50!NS(f6V+>Se8|Hqo!zN8Br5J5B2M{HN)*J<+VyFLRJrFOn=@<
z0THE`R67olD4&5K`imHwzi=i28N1-R&)WhsSV&({=OsV_K{;m;o`@~7@MwS8-nNIN
zgLwrRKGC!eyP|nwu78JJ_RHdIzpb>ak`5lZTh-OpTn33)*CBKRg?cWd-{po9fj9*X
z#v_;Xb9$lo1|HUO;U0(D7GyD0uk(xCHimv&8!BO#9rx1X2rPT{;y^vSp}pt`8cPO=
z@*RgS;x%B9$x_0ZQ=l4f#-IOnql~3c0_)HMg6r0=LkkKD!dIi<A7~+I%tm1;EKWs6
zb-O;n+<Cp4q3k9D3!)F6q;8~P8TQ{aczFTfV1kn^Itf{QMiqU8_P46nZ&mF*C+$sb
zdh4<?2OAKKwW$nizWrfh>G=6J+;=a|ZkAgr>M}gU;aQ+dR}~)J;YD&ZrBy}eRkfxV
z>6w{?<1Rbvw3P4E88z17hv<5AE6##kCFepVXFcuKdUFo{L;R0gbcHKuC6bip6n9P&
z+83-NTy_>oTw<ozF;jFH16m2PhO)w(C5Eys`!+|{q8lFihRRzS%DyesV69Drhv($o
z=j6Q!?buK|hK*;9^C}TOftD3GNb@ru*7uV&uyiGG@WZ5b+jt$}an%%p=6T0&<;~@n
zQ^iu{8f4-wk8~9>Fs`Kbbxd?2I!69&Jjqv9-(5%OU`4!k9JMk4V;OnmTakj;9e1YB
z8fmjyclbpOp`Zq(QD>TcamhKAYjv8HnUU+aGrs6dNs)F7??K=Cl3|br%PscF^Q2be
zfPF>QVG+{%y%P2&s@|wj9<3wXVi|Gkjw&W5Z90F|;>D+mPgBm(_;gw6gD`AkN`gBj
z;f1V<uW`DBR)MHNW`N&F#_X!vbuHy_k#`QXymVS?JNYEzF2lX3lIvc{DKbsD%Poof
zB~4ursFJmGT{&w`(O`uCS&nsty!W^wV;pmcn@bnbk#eU|YDl~~Qy~lL-#QFxhFY?F
zhJmG+T1h-}bG(jHyiSsvYC4CRqN<hqwoY6@To7iO(_ADj-wV@B55!H)#4~vT?$Zf0
zJjKZIkxVjtsjfw@j*w3S(ahOKMtGQGR36fYPY!)7%<k3o{oik_IoT<=^F{{n?qxTz
zF}k3lqGGZ9JB~?ZCPRk(slU0SIg28*-q7vBN6lNAq&?W0ox1YIj%o?+8ER=GBQR6p
zeRGP=971~^VQx<KhL+4D*3!7zwRS5vBDpYQPbj4}<!<As=69d(r#PmC3;)xy+qzps
zE~iR&g+Cv6`ol&kp6MO0^EBc34(TU+fez8y^=Noz*-{bia=W#QzBO$_RgAb`d9%1w
zvp9SZ9#YLkbs|lqmRrKEw}ic9MBb_COjk0C*!JT_6f+?vhRphd?D}`y*fsYIeP5V6
zSrtD+I?uX8m}e&JrY+GV@5VAZ#yL+Rl(v(6Nj@YWS#?k{kW6^dW)41s)V_h#Zpm~G
z>0_HoeB!y`;Cq`{cieR(CA9KL>I_BWsSz8gM-M{8?)d#wPVQ2i89CEB`J<oNWhMxo
z<JWl)cYcSF3`ItW<f$VR#L>#p4sh}w7?-KjvDZr6UQ_?%BrfiZ-pR0%^#ZrUlt3cf
zF5NBC-QgvNYB?DUMV-u0`bfaZk&J~|oer6)|0kKvJw)G(n)JJkA2{EGmPDnZ4T^pV
z7Lh6<*zTa8wzw+qzN&VuL*$+Rar`fhbK~Z7!G>wP`!rsVX}UGtL@2>M5m9k>3Zius
zvpI}4Zo0O7;4^M8c3_Uyu34+CIkP#5-5od9=6Uci&pk2CJuw*`FF~Tn<bi%-1A?Y&
zI5|XzQTtEhLMcLLg<{=v-FwpD!8hkX+;pBI!>9slLvy&X6xSOExX~M=BPr>`fCcJS
zQRD37k4GL64Z-}~6cozXCgeZPOTX$p>Ep&4^$gOXSn{SEhAsX4%-Z|A*kfgKf6vm(
zuz%Mk?IM)PIEmCI((iKGmQ2@gh;?_w8>jz9CX5C!m4-0n1KphEU0Z)YRJi_eot)mz
z%om7FOZ$LX!w<$88~JwTYUVuU9P%z`;GT+dPoH%(L-mIA69vNa9z{3ALi4pM8PSGE
zlt~I1S2NgI>**aJF+^PahoiKw@sP}K3`A%JZ2>1UGv=y(3L8FrjN8gsH6$HmX4Eh<
zs+4VC_|SeTqpvYveB<b>K1-K5wY>1zXnC)A&|h0be<dmDLWx+utQm;3dy+wpqfRH_
zY@_NvLbH{dBp;2fw;Z)($l{R;0_{bhm9OGp>{X$*q5!OxW|xC>eY^Pvf3PCa2yj(#
zJBS)|6u}1ARk^)}0XiFb<jZ#C4H<TA6qA!BDwSEX{@gB8QO9$FN}6F6UFXD*m)mi-
z&k2e<#&Z?)HaZF3y?xnJ_P4A0w#6|-ZTE$H)H$4omyyZeT!Lbq66Z(~{qHRA%#1fZ
z@&^<%-0`yc8Keo0*X~i=_mH>B_OD71RpomuFz6ChK1BBV3?`h+46qvs4Iaq=IJwUK
z1+b0(!-G^sMzoHS=~<TP(@M@9X+&FG3i<F)kEd%bUn60HKA9P6iNI_?k8{Qx;rS@Q
zbGsyhCP`B6Bkl^7TxU;L*-~e|3WMe+yC=1ZJ&SJN@Yw~K!SaD|Qr=4)=TJJsrl_W`
zw&JXNTvyy!dE0Ck8{~+HGQ5cU9+zz*%<B+#lV~6TRH*~#f(yfe@il8U7b$=S^D#sW
z=D|W#TM_YL026+QcFQ4njJ{w)KG9tEhzRfSc#~Ji;myrC8ldeNJ`IW@kA%DM7FIz_
zIDGEJ3-3gpYB)hj$;_l=Cych&;b}cpElUfY6|F|uV)WB1u3qE%$5kZWSlf?@k_#9z
z;o_M}#3;QV?#vlsy;qg?&SkBztfPF>n$qv#9c9Z3Up8JgKFzh>cPMDd8XWIW)DZ0o
z16hWZSWEXZYq_lnd3{FQ1;VX9>qwWKT;(Bbz)42vK8DS7&0D%8&5xpN+oNo8hbLy5
zO_mk1Oy>JY#JHfbW7@d$V5W^%ymnc<4lobt0<^s6xT4EA#*N#em0(EnrO1|6a;@o_
zmo*Vce;$$X8Sy7w<>w<LIWZCq40$g?yYM);5bV@%mcq%pR9z80W8`Ex{zJa5Y(*5{
z(JnL8XSz+%c^pHg19||EBi~PR2VnUH)6PcaHksBHS5H%Xnh|!9l!QPlhNg}oDFt>)
zQoujzKi25lHS?%Hi+sq+iWp~j=lqomjo<#J)mCmC6XxhrE4d@ls=rknR__qitBdDW
zA8cu}KK&`FeoBdLTgmj|i@A7&_4l0W&8#QWm0Rs;?P+1z<QKkYUpD@IExIB43R&4&
zhjJD)F2UV#V=RIjjw%2?ASNe<^gx{BoTA&RJTQ_OUd94pZZr?vp94*USqN~DiqTv;
zq`9P#!KNMdj_azGLMH2{#)lVay%+h6n?6@QFj+nrmv$}fCrLA4JgJLOKnPX4H68cO
zm#UoKRV&>c1};-vntg$W5IdkSNqZ69)nwbVLP{?)0g-RVjin00NvU$psq&x!H{)#Q
z6kRxkhENw#Q_XCZt04-wpDJD?cGr?Vj*iR>8Hi^J595=M1YQAAA_6u9KygLK0IAr)
zXBBO3tR#tJQ;wFIGigkbGS}}m1D96(CeqCmS5}_8k3@-7<#MVfR$XkZFWc8nUAjY0
zo;3#MW9e!}jwsItZ`~oh*F@yqQMDU&(%vHP8eMkAV?+00ZPdc69F-~J=k^tu&b;8c
zl()SDl89*EL1Rb05`uW)k2sVd(sf6qE71WuEbOIFsiVMV5Xo6}C+nDT-7M2WmT7t=
zhZk*-iTJ;tm=2(j0T<#05|D?f@#a{E$$Q5K|N3CSdR1`+&CK$)x3t5Q8ruIsI`Dvl
z&eqzJg<v<%;1BQcrF$gx83PC~R#xB_NbCC<4>9=W!DNKGPv>I%r58Yc2spvF_aLYY
z5P=ODFbY@ayFea*KRCq;W@M0Swg{hK1OZw%$_U9XEo2@oJh|l&chA6|9{S7Fvh=T~
zBsQdDvkS3hnUOLVkJTd70-^z6pb!!$a1kG{SCSheaS5UVpj^>v|BnH~Dh%D7=NU9(
z8b?$<s%)vcp*jZ8`6oQ^0b8nB$y%OW#x~=JCe3|>Sq@>2FdL6>uW7d9_zq^-Vx2ff
z+<sh{8qdXg1_C7hqHLgi2&~)ybO!Cq4ESSU4pXUW8%G`Ur;m)o<<ls&q{E44VG?=}
za^XIN?J71w^Mwgkeg|MygR%o08nER|cc2%H|DzWX2o~6;*C{&3*~S4~yHnnbd@E?9
z;r0M>7WslrLgu3fryyVe!r|aV57+@AgrC{pI-s*z1`~#guMV`jRL*aicvhEZwsHRN
zJkbk`dmkoe|1Pl>1x5xE<m2KNQAC2kP5SUnr1q_(_6MYbEfvb+)OS_KjW`3ZIMX#+
z{R$U+Q^m2-N=(zU>z%JftBts0`3BF|O<6U*db|FlSm$v6Gu&&qfeFrZJ}0}~p{Pb`
zR48RVy`2Jp4%*rEf6na}sS^vVPtRLFUhg&V0Rd<vn2Vy1+~I(|<J!8$I1m?zOEs4O
zyJCVR!YS3xp*{n@bTR3q5BznZ1b3lCM9yh14YzXw_?H8&Dr5oA2|+9wVQp@Rjq|Lv
zMK!ZiR63f=z9HmS=-{Q0V&ss2Qx&QZcY3hXRcGOS@y4e$U$=B;);qNxQ2li8_&%<e
z>4@pL=>~Qogoubg0jIJaby?}BbLj$pTT^$k4<Xqg#3qZKsUra(#LBIDG=M&B&zd*j
zUwoMv)xH^QpCxr=>Z)vMA3tFDrHjo<7Tw|8L;^xo^R|-mnn(rG1p;|*Y3-pjZ3Q-U
zoREYFQK*)gY8%gGcpeAt4nzTT0^84N*%<Q|!~tkdghWFG!~tGLjo462hK;m+Edp?=
zsg7}D;s_3c6d}GsaF7Zi4q&uVL#VB0j%xBM5-#;ZcqfR&SU?DZ4g!A!cgMtrn&;rM
zRen15ZrwvkNj2ED9W*?Kv^nIbw*i86I(^tOd=uX9%wo@hhgE;>-_ySve^L9d)&ud%
zFGSuA(F!zqwpWa&H>KLyewcWa8{K%f@gr_&Z$(!)Tn1l;YL6!H<C#{w--~U#f>VsD
z4V&&$QhOPm1m^vdnA{R}gP_POeyjg+L-{afdIK}Xd3=X&*-}Z6t|aZSoSszMd5~$?
zPhY}+*#ZHT9DOTEJwmb$#1bKKO#-x%M{B1-NCjs7OQJz->@mb^i#@Rpa0G3ZHAuII
zn3(U21DI(|ith1DPlUueeoIvl7ZZ2X71Py*6hSz6?jj^a>chW-$lr*A@KeQ#vTqf?
zXw$DyHUMHPOn7UGw#e$ws1#IjWQ4aysF|gz4W*}jW*`XyH-%6An7RhPQ-hz*>uh@B
zvaPAqY&Sm9`L8|A2jZq?Oq<9d(JdyUGi3?K1Ertzy=$Zu$a1E8HM6^4QoZ%C8<azX
zmLu=cY~yav$*R`5nLlp){Iux$Vb_3|k_=2>`E-YK!0@rGr>_tH?#xyGcZ<Xg`nAx2
zoe8Iy2X|_8A=<DCK1J=CG4RW|U)aYWIy|bqUX!e=M>~9h{Sep2(lba*n1#sG_@_?+
zcRy;cE%KTltCz&<<RS>D=*~i7BF~z>7&!>qsa0(YwFzr~*MZb5x^=BV1EqU|YB@lQ
zO8bl&`v`5JOoaIxFsv(b-vTr32CsdaFJL||EvtD)(g@>6TGdGIMDaLpgpa0a?!(|z
z#nkf9KhbdJ!6^mAi(Ar_uh1hSA+F+sVXC~iFs>}%yN%d5HhwvN{=@GpbziqVcstn{
zU->AQh&Uhvgmnc(_Ii0G9Jf|cew48kk1(D_+LrWQUl;cmlMP#GU6&&2zOIC@ZC4fd
z8d&XT%31$eTD6~AwV$*u$y>{t&{8@}?U5QNKOY9<W%?d&Fg`P&FQ7+wui^jr<r5;w
zk92sN{jklGA`2J@)Enf%e}E@LJP?2|DAEy9`vBo42&JBaiK0i*!q|qqQK3X3#FNz0
z4*m?bAejQbq@n=#lTS=&PLH++LGYig(sG;!Uf21jH-Qw<OGAWq<QUr~lG@df>{FKH
zjpyKg!5^i$4?(a>55Q1>JR)xSIS=w5Jl>rpwe<9~LW5`MP=&JS?>4qQYc3a;&;1hJ
z_=ke$m(FYi)E_oT8+Bl;5!kkKn2Nj18Q|5BF;Tm|NxbWdVzpfzvvc<V{t~G@$1q^J
zI$=M>`Qg@D)g{y8(oZ#?A_6mGg{aNM2S!NNgX<0(OdgDrXyS+5?GDqm6<oHsIK%T$
zs;wS@&*8+S`PzfvWRceYtnP?~>1g)1$b*V5arWcV3$?YO4pQ#Uo>8(FJfmf0KvVhd
zX$ZR}{f^YyAv}I903p}F+8K!34blzL)%*#0;05LAkcykbL@PSuXYJ#tNf4<css^6p
zU_}LYDTGbM$5D?UpyvR2J8s65(GDY{jXYn;?;U4c?cQ@8*6yx+Ij@~F`fTrG5K!z3
z;|&`VUO;9k`K2*3Sxag&i36?=0|x({)W)9&v0Tph;MTRZihFpItJWqu-I%pzjT;y^
zo}N{w#<M9g;`R|b`UtnI_NF(I+Cw4k?i)9gP+>!=%yIN^re}ccdPF4u(;;0emg-i|
z&NmNVq`16jXBo8tTWiBq)PesiU9*JP`~Rmv#))Yo<Mwr;YM}Z_<DBVcgxA3}_djDm
zD8mmqkm(&k*!&WH06*)9=co;(eY(TtR`l|nz;E;b=~*PkDElJAZgVRty6`r88!hhi
zOpnF<{I>DmdQP~m{5k&F3pm>Us0O&qEus(=Q>M00?Y?xQ4<MkSG~swrU*Gkz#so7j
z4rSc%ylSU&AK`lG%RqpHB%sO@#sLxOO^TlJ%q((g-4XDElFlzlK0$2@dfVHU04LxJ
zbgef_-oo!k(u*N;7-+NxJ{Tkr>ML1C!GKYy7H<jRM-S!jDJ16NM_o#RU~~w&L`ZUJ
z?S9Nm8%Tdm0oAHQLNai#^1VSp%-T9d&1_DN=+6|x-^?I5AckEt+5xj~Fn5Oo>D{)J
zN+~D84|dK!)dx;hf9?6;#rUV{Tj%1znm?|5J1!nfnwXM`#&VEc4RClwClJN3d%V4W
z_a*i9)Tc+Hh{`6Xsy$TlWxlsTwqU=d$a~^wRx~A8B<2p)^h#Fuj&JfJ@30RPoe_t;
zFA12{i}qxMDZQm<)zA^9oe4@`;u)<hmf@Qs|5Ghs_(;qPbhG+yFg7%3x?9m@RD;5&
z=FSL6ARhrP2gH<5n`#k#Kybp6NiId_N#3tL?I6U@iy=r$=MAK&ru?E#U$%oFn9Sg3
z8oj;tU&Hi;YfI0J+9t04$#dD#a6qQVX~5~yyTWMsC{lrJdJ{8+F}@?c>)yJ=%ClXM
zi}Y^w>0y)g3`QX13Q<Y<A+?;Pm8eZO9)8xoN_%+ERpKLKDki4-<LYlt)SNR#=GE4V
zLr)T|t)qoZ^qO9xINZ-CwI%8}2bEuS5;oUeN{erJnqYR2I=h)&p2>P`{~?bGF|1Lu
z)kHc(gH-%mj8&oK$n96<3p6r-Xiu%I5aPlT!P7&44jOJ00SR#1TFC}QcOxzuQqtPs
z#Ub?eBOQbsDkS-RWdTPa!da6Z25k{_Hmb5sKoA5{PE39-3RqE6EjLek01!fLXeh1l
zeLS6RNvA8XgoOC_jV5n-a*cby`dFpvmnQAqE<gT^%D!fM4ib{Mf!F1OIhg@NR{Mo#
zMndmYBJr5MLnWO$qo-@DC%)dfl;*hb0uc|{U}tskLa8g-ZSu;k)s|a>6h?RYc(Z<c
zWTWnJ%D}`!Ep@Y^s*9D^k8wCZc0hB5A4Cq55heLA_G0Z(MtAPVp3f&}c?OqR9}h_X
z<~pOMvV2%7zEMlblE=eH?_cyLbO6z*47Qp8n=#2EubJ(PQK$e$_$!7Mg9L0i;7vH|
zu2>A@G(>kMjcWpI{Qt}bVMmbv5=(^~e#xOE>_GAwCIAz@1#=J&vI5&d-c72h`Hk)u
zzWGQ<NML_Fo#yFtF9&Z){(dztc;ObO?_V8O+<{APu?My$)%?aFK-M(xZeZAStz;wc
zH{*bQE3c#(=g>%o?G^60K{GGn)IS$%&y=c5GKd@8E5q7y-^o6cy7GEMRo41Z)rKoy
z#xYNMW)}(4^YXv%&>0^ha~eZ;7TV|&&($uuc%NPT+W#NQ0q0V=`s%Ix9_wgHzJfJI
zo>^AY4oqWx3`>r$->NSaeSb*n+iYI9GM%Jl9dngxX^6pp{LlxNk7yUe$WrSuKcNG@
z<R^0hNdZc-m_T#Fa;}BCq}MAl)GZKp*mC?1g5XHbqZt6GqN1)0LK;4U$+eLjO8b0=
zTLA|baW8NXKt#ed>^5Gy@Q;@RJ*(b4|39}SSCe*3eyX3JMSRPwF>i!-Cy`JyfNxSX
zO|J`^zPD+*V7L74OIsF~R9Dl9b;kGuIkd+!n?GGSSGZ+wmGjuZR9>0v!PREJskafP
zPdR${WIG#!l$e;%-)%GS6({%0=zcKGY7gavx?1{vct<`RP3Tyiu!X*IPfQq$Go_wh
zHsAI+&sMHJ;~vzG@%;})wR52V_N1kTP0$(dRo&d!(My_)Y>RJNRHCm1bh_xwZ%nSA
zf<8~KxSTc{=O+@iAu7m%&o5m;qFN+76Lip?+c$?fj({<&QUDmksh=STOvU^k7$0<^
z!AeFQo^6XyLih?IEG{=*xg`Yb>_PE5siRM!HSsOZzqEfkRdfES`PTV(Gpy|J0T+@m
zh_r?zB{Y-0&!p@=;}{!b{ZOJ~l-gg*Dl-l~%v|5xVx*}WyI)yZZ>Q?1PagiK9j-6D
z-Z9P7Wxe&9eE77AQ>df5H`0ZBNBo>~Gvz9-Z3Bsyy`fU$s@2P>Q8t~ft8cxrlJ#X`
zY;;;<_FB&=zr==?@$23ti=MBXz8xOhn760uvX<+&y{D4v794A;HQJtN^-w6^^IaKM
zMr&crJL8|JRMT%2)q4)O7}qW>M|JO=-jp@bLefSfa6IxLM4^HWnFvI15X^!4@R!P9
zy#kLUt#~QUaX)#>bDkTYErEJ*<9P$c9Jn_;lDwJ&_YDWg%fCNI!#-VM%Tv3Rh6Ao|
ztycmEXSMWqjDK2wmgxKvTt5=jBjSSP1b9;YG(&Kz?;i=8G9~>mQ`kc5T5L4ZK6Ec~
zX=eftn}0GbI_v2rnbqSv_q$Az_VQMF<Kbp4J<6wCY*cj{LWw$R?p&`wOryzH|2i!F
zkACNM{0E|B%;dp-n(c>r`?cqZOUox2w&>tGm89z2D}(#7EiSa-Y>$QckWYH$`J?+4
z>bHu9+Ae*Ow+_#9l{G0g>l_Vdy%;kyn)6P&>}LAsm`C#-^JlXfi#O&?^oZm=(aNs&
z<h?i2D0@8iAJqB}<;+x|pDCwZt65t1@7_BgD(u<}49_-cA@rH>Il0T_kbQ&|DiCK7
z^PoK^TU*pLor5VyG;juTEDA-4q`}<<Kjuxr8V>k<#4PD_`hl(XS?L?!YiJidrT>SD
zx~Or=RYT)j=aZ8w<eE%lPb$_^Hr3)q(41`PLby^OfG7V++5EosmhrjElS4wC;%j%5
zt_J_mrA42+wC38$&E0!aLdah>xZR;9zw8<MN@}`plp*1v$CQla)&hL-)D!7HistpA
zyG${0+yaq+zou0<HXe7K-12m%`ck`IjE?D?(%tGLplb5AKD{x&PRJ?0k#;cMN#gF=
zdrEz0mK5b`U77kA?LR8EWjZJx_Ag>Tzc)!Xz0UP2&=4m|aEX<*^@=;lQFCt!RwoL(
z|3lSoa@)9i)Y;r2_!_je-0{w@o}0}29+6P9ysu4Y&ysE*{ojgxPw8vXbrCu}5|!F=
zFYvIE{l$|0Gj*u~%j5q?9SAALIVoCwKN++n91iw!X7<I3#ftI<^ROHsX)mWn`b*%<
z#GiQ<-)B!P?soWkilU+M^~cx|Tf!^CtN5*wNKn@9K+j{HnNF2(l+7mY!iZb3AKrA|
z3|Wh4HGPSTd$XSzwXL?7(0S2@gX>dNIQ@P4?<205*3hkEE~TBT+iI`6^p)nftPriW
zO;)6a%V~QeZ}a>)YjJdJoHyod;}qCV39o3p$!jG3W;g!8aFf^)>+qs~sJ*zM*ZT-^
z^6P8!xgXXir`h-&*qToBNq5>Xx_UC>O8N51%xG-<LWEt&)S$(=);SBgS80V0+b{JS
zUJ7ZCx>9@HJ8Q8n?&#Q!U5VC<)g;=;jxRRfj(oP?En4~g!m>77Wl6C?XvhBjFF;*g
zyc2gUDYsZ$tb4mL%Zsb7sKWp~3{faTcq!lR!9#%GV8Bv0EOu*V!}|7$4^&<vv0KJh
zP*1=@K^$-6du-`x4X<0|uMhtzUireZb@=!_@lBz$SA;gi-UM!+QTyHC8N#g5Y<w`R
zPcdw3xc7UEeEHeFrR!cU{c9(11@6zU@SFrkXXG+YW$EconaGHFKKM=d>M;j<_~!o8
zCXN<Uws{XtPx$2TycOlY-zhTfeEpKs(skQ}nobWzqRZ5gY-e?KJ;N*CQ{Qd6?os#l
zlfu4gg6YeB8v}0j@oH}A`vweT9A+*Z)}&>(-=E8T^;5iZovwaZ&p&vcR9^Hgmg%$}
zI@!j?2+z(MG}E^2d_ZbD&%FEcWekHiRyX5yo>Eos|6|X=LT%GcwR760f-_B=AI8^v
zb3k=(+c7)LwRQHs&2kl4uA9~RR`$UWz~ITO)?Y3oH9ttL_VhJ9c6r8?GTLSqk}7oA
zpzjOVhinDlb^R1Fq^Lo}{|`P_06xuHrz*+cd$cz_q<rQDj@zv`6?D6}9Jn}rsQ}6D
z+*t}BM*v@j7{)|+yaU}7HoYbvrs&0rCVKA92Q2mbVRHJ_{l98U9muWj-zEx=Vn0vU
zx>(Z{?jErHWU5GiCV8o}tT(qTzb;R!qU>16r%PIPQGb6JcQZP1!jWG5#D-e+<MBOo
zq*3)-`RImp)g`-P;pos){-^yE(w5+6fo_kOE(#|D_1-<Y`iEvnyWyu-qm$j1^yt{6
z_jGa1`pPEt&XGG_--_Jl9<K|?a`gC3DzY1&c0fbQ{Q`Tew~|vyn|Q@pW@c1mMvIkg
zvY=*LnJKcWf)ACp7oW87KcFaHXn5@KKt}E&>l|<bk2&o<4jL9`V*l!L8rw1LOWl%q
zW>VFxj}qAwTf6lAiHXCv^O0#aKkRB;iklj8G7p5duhUjN(IO8-+0qh{6j0+w+#XY`
znEU~Vq5p#dVMzyo2M}~t{F$|9+Ig$Thp7M79nC(~shW-X@eILI>z^#MM&cOkfx%F=
zwP^PMtS<ciFL%mw{C5&XWrxF5pvHooMAfre-qOzUcb6LjZK8Kph8A=6n!nUtxHtZ|
ztX=0wo)-7;lEQbpqR*bo3awY%B{iszO`FH|?vBj$IIULvTUlNHb5pW)q*8U~q>RI^
zy!NP^yS%-ceb+m0Rh{-_8Pw@TU?)=vGRJOE2G~u{ltXCKbzGLV=NFyp*-f3<)TU^c
zeT8Rg#|up5i?OQ@+1kbT&l#ReCT&R}pWNGDr+K-TJ!VzOQ43r4qg*vv@7(7UIv4!*
zzU#h7D;FT*QwpjBt;ExNKFqP~wmD7eSzAV}F7H{aCghwc*)QibT52gkteY3?X!8A0
zV>P5ED?UG5!d`ydLzue0l61?D>z|D1?t5U7=MewK^tpFBeP{^Mj)g1Fk%iduJG()?
z)vGjW=XDV8VbL@1Ez`i||6~9V_8_4laoa`m#l1P@e|@VBZhs{na;%JdJf()qYTBm5
zPM^C{?B8AbyH82+>dMH<fibT1fzewwj$Wn*>hRu*)wty}lTb>wuW4||a#)6`$CD$j
zvaDOl&5ZKbb=y=coQ}I!=GW$X(^|ecJ77Z!K3yDI$mtNNDr_5#78)SzZoIZV(EW`;
zUFi8>o$F@;DR1)3(gn)~IDSDY+@$=+uE&!W^-fP{9dXTeah`sk)>IP^s#rS6z1bJJ
z>w^gXgXVeWS3_nhnyH6pnm+AO4plxH^IJv1Zb@2-MelB=#;wtZ<HR?f6FYjLYsfxr
zC(F>nkE^9|my1{54QVsZ6xpWiF+af8Sge18&TW^vG^JXntTRrh_sdvNyEARbe9jKh
zo^TCBfHgIsi~Y@T<Y=6Fv|Y`r{9??1s65YanpJ!D?-+bZwfh`Q(cY{;HfA6c%M$WJ
ze4+(Uf3-^Ye_V<B{XY~#iPgAdShVjw&DmQoec{_{-t^+P{6%#7vPR?n&Sjg3mDai4
zpF>#ejO+QGYOvOr+maJCpC54~VezXC1T&5AfB$wOEV;P)+ZBz*EiR)uV>60$_1-Dd
z_lHg@S_;`tjQ(M~u!yfqJY27E=9BCJ@`dch2fu3#y{9p*n5M=r7NuxT@yg?_)UAK=
zE{aYWFObEb_FdWCR1r@5qjjeI%0th?)5{F8OphhMlZW5ycjRqS@Qm4ai`*1<gnVr;
z?Xhq4el_{l%Toc2S0`o_BD>X!Iw|Qay<N7Z8ARnHz8P0C$}>G}q}-MBtksG)X3KfF
z_2ctfwitC<ixaVp`Qu}GRX@bX)<kLFj#8`sL)Bb0+8DKm*5wd*onC+8)wXVm+a;_0
zyP{=lb_Vd*4u878|6wz5TLheUA4=Zx^sjl(PL|gCNvD-B57fWAu53Fr-cBxMslB92
zYhJcsk2X6A>M3S=?k(A1nc@h!E|`tVqi=22PMB`|4^{VR=^F8`wOc<v#~c{Tjabcd
zAimO6_6Un@d$#ZvLmF?xn3&O9cRM|HtZsc)|L#D|{TtKE<8LWn#FdVyw?D4gvZ#oj
z`>S?hZ{F`UZ^QmWjV<37dA!Y)*8K1ES*E;8Hf?Afp4@tW?-lLC9jASgJlJl$N*AyJ
zn)mP20oDU)?fVh=NsmjNbkl6IL)3H*9aMhzLY@@U$<Qx7=-hL@F7#dg*2=bBm!gY4
zJLz4|uF0E-$(5%ZKikB)wP@|CP7dGQ!79++WFxa*Hv@>QKfUmEa!?MrX2|;s$<H^{
z0h7T_x8CPzI{ku2*if<h>7-{`pj_XY0>`TJ6Tu<$Do;lF_px?$r^TKkh>p7~{v5lp
zYO}}gz+%7F>y%SJ)-#%CvI-qxa}FdqT8>00or49n=A7O3a@&y|9`_)+C?ps<b>{Hr
zz-jFc%mMy;TYcE{YusR5`ZdXGl1-%cWOWy%x3GpYTVhW;{0Pa6(+-zJlO6pDaKF;T
z|4>V}E=ss;eDqdENL_}AwtUpD&=yrU)xg_0^yH!{JL%2zg~NFTIz3G>pY^uTEog2B
z6b)jEIvTHdt99&o@nZeMF{*=4>#)Pf4>SEei?^ERp4CL+p0buqF`k=iYi&Y58@oNB
zJ2>9^F1@rIt(e`kO;YFWM|Svl+th+?XGyL8p&LEcN^2rtzd9bJK5dG4=v7X=MEsDo
z<}ggy(9{_IyE~n${B+=TguAxPm4WqD#{%!|)O;6}u<d%!t_YJsy6%TTy#QT;HQoM$
z#^+*#nUdjMmX1N)5!+7FC@iAFl1F}^Gg(hvp*h$2nx{>sdm!nUrT>bl@zb2uAKB%c
zh0SH9Ofcx66nJV9$y5G~$LMj;qbS{@{$)33^A5?T@Iw|5cL=cPVuVM(0!WuQ;kn(Z
zvtZuy)?z1T_W}92i^t=6eHrv<MS}zmWKwX`_auQv-wjS^Bx#S>=F$u6qUn{MHjpu}
z{B!L<@`Hjx_a1o(+NG&_g;~33bkz^7gMjV--c#AL*suY=Q2Y<MbkBJ1+q{A=E{pi=
zbS^u}#wj#Lo!heEDx<yL&L#a%e9-wAwIec;n1dQ?tuuaXk3eg?`}pds%%Zv_*5H2f
zeuv1k)P`WG)CTq*&Re4Pw;RgA7mrk&@*d2!-PgYBvP0xyY*S{(fy%4nrmv|}g?sJU
zX7_Y!4U#Bmr=`vdoFz@IAdSk)?!Kq!`-62BFO6gR6;<+9C`WESoLM>`L=dOQwK>Y>
zN6Bhse#KnPy42?S)=8*WA*1uiEppVy)tmIcKD8pja0LX=3JOIR-seCb6Ec~FU*xt!
zN0^JJ3E$kd)v>C#jjtbkX`J(RvY&q<oCyJoW;P^*^TeRMmQhP%ghI@b!*2bdG2Q=C
zF?`CW&ZhKlkCjr+mqI)746!T4UPXV@$2%RSj&5yxdBpIDB5mD$_K&ghvvU(W$#Xw8
zj*Vf?ls?AhtbS{5^v+zebzlB=k~`;r<Ptk^JpZ2QpMHG<!i2g5e!OLMAun3{(&xIq
zuCn&kF*mP^`?lzVtHfgaoqKZj8dWS<M>V9Sa<_(OMJGl`ujQbZf_J@cYlzl)-WZw7
zAXs&`c}3bUm!KUZi|vlVj34=1YLae0*(j0Sk(L?a;Op{e%KE@Aaf7+X8HMNl4O<3h
z>$bd5;-sgml%~kw&wFZI<hK2@X=UQ=5p3k4i@E<FW$zi*)Y`NSbGyY#ktR|EsX_oz
znsheOdr1JLih%T9rQU*6DN;fwNJ}6XdPhJ-x`03;9i&45krt$XSJ?Y`-uM0at!Q#^
zAhOo1xn|Be=e%aADZaZP{~v-T$wk+wD=<R{urNKj!iqFoNDKAagVEai1FUJCAo?|!
zpIo3d;IBl36HN}qww_XhWgauQS6&j;StwvOVIw`@@u*U>XKXN~Cq35=&j@?wUzI9{
z511llh51D-tQ+$~_YKN?<UMPC2!GL6MO@;P7FEzWQ$j^GiV)sxQm@}igNQO2XwNa@
zj^T>>>WmW6O)okm9{>H66XO4$q+~CFwZwB0Men=JNuRL~3wK+R{7M~BzX@G*DVxZ+
z8tT@^N@m(>16@04=B|gy%wIG)f#&RuFQmA;DQ1O%-e|Pu?T2nbLs_q~wY9JLHJWg-
zloIN36CHAXc$qf7LFBFL<huZ>%^0z-6H-CmGQ)~yZH9mt$l^((^Vu@iWI@8l)GohU
zlmI**5q<qb#;|}$X+7u@eXv_zq<(x_+#PJe(0;ZCG7^|{Kzsvzn2WdX-|<)GCBQ0G
zJSW+AIjUK(?~I6l#Fjyhou;*A<dD_YMBN;aAWdNZe4DG<c!_f@Kr!a*T|q}{@~5H0
zRPhvJbz7E8e|_m4F$vRlOx9u5ADM`yUQ;b_<VA3dwRx<*cqM=sm3XY|wLvWW4ehT6
z=k(p^88TC0YI%#JO=$Y;4QEd7^t}G)n<vpUUo<_LyB_s&f@Ue*qeOt!*dLTN)FgbE
zQu;yrfE_Odi;S<wR?$Ys=G9HDJqVb2?&#tj%_rz&N%tewC>T?HP9lvm)v?nm_98<6
z=lh$L4GF+97s&KN9SG3WD<KiP+`ytIN7}7NgaY=%Km%sEUn##a(rk0te!k2P#N#Ob
zF%Bpp{x^I3Bh?>7)Ob(w-8I4z@Q`x6hU~j(9td-iG7>natio=r>PzLgG_P^gMy4X_
zrZ%ZK!fuyhGdJ|Zi?<ru3!k6}@^1GZHH(ck+qH2rsMil_!W`{QIV+og(NU@K^4f5(
z^>HqqULDz`Im?`!(mJw-4ZFO?UyE+CE#~dveQ=98-Y)sVNL|2E*NJ|l^%`DX5p(Pw
z^|thZCa-@PI&U3Y;~Z$Dae4iywzOGgjVtoU<V7_4haZ<(9Ge2i*jP`l7}=dilYi;j
z<q%;FF{y$NIZOT4r1DlGS#H6g5;W=Zm*YEUE0}s}NpFW(oTf60*1^vQ!9Ypo=Pl06
zukN0CS95lZ*hBDmG|j7LS%;NuLt%Uw=<}Twn%G4Wr@4HbQXS0(;un@}yF(nq3Z1z!
z)w>1y0#oTwAG<^{MR1JURK2pTJfnhQfa1K7?OyW9tzrIE>7Ye;L~+e;abrfS&+N<w
z&SH%s+uoZpg^Sc{nqqUxbJdDl4PH*K1j?o*9;<qtECR3ck+^<NqB+lfD&G7sEx##=
z+ED<X?Fr$Kh_~bh$wJ~yx>LM<kMV^6dd_eLE|@(sZC`#(^iHm9MzW)JU^)O7#Qxhw
z855WVg#AnmVC`fS=wiV^Tu*=)$<O3Pr@Ke8Y^O2tHf2Zh_IhNah;PLn@2l8!_rAW}
z@+sgr479mRSfAGVmpcVImnp6naTw|v=jU)cF8%9L+J;PzG(`+WwM)a!Np6FBeOSLs
zXBf7>C#qW?w^o8i9BySmt-JvBKc35Wx|AgT6b_@7YyX@$t2>xNXq@GYHo4q7+*Eru
znG;RA%zz-|`zV)2<1;iX1_xQpor1>;wZ(7EiJQB3Th88G=6~2=46%_WQ+0!h^mm}5
z8$dYgc8ThoDxMO{zj|%Ce6mMNhxf4#v7R;0NzdJz7@Kz;QGdgAD%;knG2Ei^9|7{-
zOYNTddGV7QJ)4+<dbJU_2-Wa#@cVkP_-R%#XCgpr1OUzSj;JUowt=S6sugf=Obk1<
z%EgF(U>ni408<bfwpSzNL5o@OuBvR#D!)fGZLiw^zxOpkNie`32K)Ie=vBO{vE&<$
z+>z`Rd2R(SqE~VUq6Me%4h~lJC2%o4PCYKS<YG943-mtp_%4@9W}+PILG03k`nAUU
zDh$TFW!3%O?i7!N2#Vdpk-G^m$}LTl(H5g@(C8a814j`)244bvUQ<!?KAU^bc}T`*
zX9nd=J!;6r_kHycTJnzG6Lm#D+A8l|@QR;V#k0S{2hXK3*mp4{zKESy2=AilXYnTt
z=AM)M7<gZ+#$j7Mkf@>{6(}7icX%cH;5I_Ch|<0@)U<@w*-ZG2r_sX3tYmE&SKZ_a
z_nIsMpq--*cC904>fB;IejoE`>Skm2N$$?&6`~O@tVo2p;CN2Vde$mr@0_B5lm`^m
zz#TskrOn9DPFarEm%}M&#c%yy72s2u%y+BH^uB9dq<1Q%Jl7)k7p0BETjzHsK~GpH
zFqb1r$Y5+WD2{k5I0aFffVF5QW>s)pcy|0aRj>D7X)#1U1Pf^4j{8=Idu0=7C%wwp
zVU8*(DIJ^=W^2lh=w2b)*eHEb^@C53s#tA@VRjNb;m`X<KDhSK@ELEJkcQ(}P-+Rr
zSgM_>?^U$Dt<jS~)V1<P?FmLj3{o|V(?xL{dT`~qJu&J9o%n*dHa)Wk<42wRQskz$
ze*1_R-t*`Y$J328KVB0p+%{R`z6@Uh-Z43o&p3YsTJrO`G+(B@@kr|YNT)#!;a!@f
zd~M1AwX)Q}>Vn4y^?Wg>Wy3i5N))vZd4So{sp3m#nWn#HYgWN>cChM6wjzplthhA~
zE1naVau^F3y!jsZ&?VTt<h<TUcIJrXWg<!=;xyq&8SJO1i!>1dc#TM^uRzX!&5dpD
zyRr3cIH>JZCKvPwIBDAc+mMK?#(Z_Bw+8?%6I*NG0AxP#@V@ba7c}7G)$&$rTK7fo
zGI|Gfe9%VsH|E&b>(7SNPg#FPGqM4u^>B;qkn+&I23;PLX`L$5vU@=GQN{mlSB|j*
zl2guYygj>Y1E(mIgZ_}c;b2L6G`ht4-4tC^P*m8^Cu;jLux+L;0?~SZ+}`Yx*NLX`
zcqxbXWrJH^a-q?lUF3n4U;1+X%7lA4G6gNVcsN8dQQQWXQu1}%5=!w$+#w$Ix+@eZ
z%}pU$mo;VV*MybHFXkFZSD$zsRUtlvjImt#$fv8t=rY11CE3x_brd>##!<i4w2ULR
zpaHk`FDneN*#$a#4TyHYtZm|*iai=BZ!LT+nIF8(Wqchr@|A5MQi!=5Xp})Q0YdAI
z1xx1tNjigB*Bl~>fm}w_?Ox5QWFlI2mN99VPj>eLn*2lHfz}#0DE_UX_1s4sOCwdZ
z=ddZRR!2UAY+56Ac=a|ZS%ou20%vM|9Zq`7xo(BoVRDhzB?+l|cb`s(Q@5@X6V|C4
zmvoguX4{lNFcOxlc_9p?lyf_Pw_Bh+MBtS=ce$z%@deeg7F&}Oo|tozsvzx+%E}&5
zQgVfsNR1eXV!_+fRtj=P_lI-#7kR2+(Bk!Ke*4Yv{37V*N(#n^EK_5@%w>cuOa`UR
z6-4tUNVuPo{rUP2XNS!r`}=2CfS}>R1A(VpxFIp==7xj9>JA8+S}BXr9GzRJ7-%OC
z9PsAqSZQMx0ZLlH=)IJP_y#Ok?2&yDY>7nB{~XEe2~T{e>nV=Cx0-2BYenL;xtYnu
zDgJt`O(&kRK)g>13ME;`LZ{{$bWl5gb=jgizR6d$GF)Z(;bx+IoH%k#@q=$4$F=$s
zl>;MBngx4f7PypjY=abj#{0BJ&{sO8#H{R{_#ZR+jk^?-Bh!2(3KN{%KN}N<TX&T|
z*P8?+!bLpz3=(9P8=h5I_fbwf9JwJXs^XlJ?ZFUd)~xwH*W`Fq-Vl#B*C7jO8@D9C
zBPsswr~M})q$D?+l=Y5(d{a#m6&ij+b(*PZJj>)bI7=<+;4x7JLu@x(A!7vduYd~Z
z(b8ZSjE-okKDZbZz9Rg!*l!|@g~zzMGuo8P4jvgxU7_CI$?}NuPGqb?r^vRmw22P&
z$XAhVa%lyfTO&CXUJ?_YHQVI3OWxo#SvE(1C1I3*@W4Y2uRkTaX()`Xcf^OmG9puC
z-u_GI7jI4D5h7>fe+}(#?vhabZE&^OA3Ei)uU==?<TGdROaN8#Jmf9@2lm-Z3?i&|
zF!6q$Pu9KG5|>)BnKO`Rd`p{fP;)7@y{M?U=i%Rin&Q?s(4<fKu_?Py6KVdER*htc
zHFpUbl{E>!24<uwVhKg}X{krBb#lqo)%7n_1UWnwc!J0JuW}O|wXYw$C{O?37=mgQ
zzrFUf)WpE8%p8F!Pc7&x1vi~voZ<p+-kf1A{g9RUU>0?AYXQW*e}i8z(aA3I%A}yp
z4yr#`C;95*kGS4@p+3DCP>9olFH^&GC*EZtv5RlOD7#$3+*5k_RX<zru5X4#%f5_e
zaRM>*>T&BqXw~7=MT(`=AJi)$Z%U-)al-k-8o*GN!Xp!mC6O$LX@s$9@^`(yw%s0c
zVwT6s9HI(Fciy$*6b&49*t&<X*eacr&HKZ`%TjC4@Q+`cuU-vO3{lhL5|wriBGtvK
z`--OMDJrHb9pR}}l;$9lng`|+h@r;HAHCy_3};)12Hh$B-bzw*bhHNvflB+w_t_;L
zq~bGeB}O_2(mn68c6?zJQ5G%5@z1c#BG=DJGA`B|G45ylBYl`764U_yZjTOxo#{8@
z;`<5?!R|s0phdbku9iEMz=0H5j|*B{Xb@ph+A|{eoAoacsiGW+ctTG<+IYRx3a!y{
zDRF9Zhb%Qyd5daGR7D*_t>oeKQkW3?a73nJ(X`uXVM>D0WypX|^(^U7f$K{I&gMfw
zgU|Ce3;VL~?QRdFLYmJEMDz^k4AUXmlN5<f{id<M57LJkH_Ki94&qWS>=?-VKA^~(
zCMA^n>tF?*w!2MuZ+ff|)d#LX6ksm!7c2=Pgcsfh;U(<S`{L*3>x+7U-RiB$;$gUN
z|6bZf#QxvZkEcCt3@+#7g|*NtdEp%(uK4B=2O11#bjj#L{?z7L(Fr+-1iAnORnte#
zTy*^CI!R4TOt{%b)FhMBTbefC7fbzf+4x@n`xY-PPvuKUXRc3^|A?{dcer-|q0&z3
zIF7IugT9RV&{L`fYag5vd({-n+~CtM6s}dqm^m~13t;wI{2EuwY1?eIF-}|TovA%4
zN2ugDveibjMo~$0bBn>fDvOCNWwX46@OZHY;>dgCf9fh=p_#EuynRUGL3ZcZ>CVIF
zAS~R-8T}Tn((6l$K+h&!yT4d-fklak^a7QNNX9i>+{fJC=D!TZu|aqFqt*>tHVf*9
zzu!+~eD+LNWruZV^J$WRh<B~@bnY(0E-RT1wT4fLmS*Y3k^GAxnk7Bjq$(4qbrpW!
z^t8u63Tx}Hv1@d|To<j5A7Nl+==eD5x@5ETfbrAMrHKQdt7%UQrXE^;;iy{d^KoxD
z<E8P*Vmq78*kO3FQ1Y8zwIDjp53i40xhvC(bV!e&Jo2*F6QON4V~R5mp4%d58F<T3
zLT7{)tgJyP@Vi_ssZkUo37)T)x#bJM%mtn~0ZW>QRLFcjCscxQ6?(ycsh1-?;x1p@
z@pcvl9SYQ6@mwGe{9_E@DUum-FNyBl_B)u-y0k%dfz*KO2$^pjj64V_S$lM<=Q_dH
za=9F|0%Yi*w#<<nN~i*_ERkNyjluLHEm8A5viSneBk1C6Y0W63AK$|aFZV{%&iup^
zba6qcQtgNYccp5%cYbY|PI9ozVHMgZIzXAMO|ON)^F90>YzT|yF7ud^bHAd|n8qOV
zxyiO#s(Z<i$K|aNuSH1RB!mI`<JmRDIOA54tO3^E<gOCh{0>hU=pc<-n}a6~cP<6G
z97W{w7O49l`NyR4v820iA%3SD;E+#kDE$s%8^*@T-+erNtoUQm>uqgIrOdZi9@b;v
z0Hy6;!~h7ab+_WeWH)$Py=g7}n+vJk%g)!4zkHHuc-=4*2#IPzfmYE+_HYPAqfINW
z`%|2PP8^1h!qx1Ynrj2t|7JNM#8=vVX^+-}+SrcMVQ;$p(HKvDa_?Z$5y;RLi<Z?o
zUN{t!wisc^GcvcqW*P56>CXpUe7m(I1$&l<SQtMo*eF7SN11NSX0?8}hqq&qOns*j
z#9>07f8&)g&Y^A16o2H8Qbvr&+ITOO6*U;BNuHWj>;W8}mB&mwB<GW(rHR8cRr3ZK
zY1@ts96ny#^lMOaK}KlXDXmLs*woM1J?MR0^&Pq+*{4^7rCXg4FB{Sp#I`}u@mB;o
zGtd(gSF>w++3&pCiVoKp{3E!r(310@q2((8^%qq^7>iSeknQ|JE74@1ih1%6!2te^
z){s+!q$3QwKUiMFHb8&pO`WG$q6bNFHjXyrdJ2DGa9tlH(Sb-ltqE`SO1q__kExV@
zEJ)8ulAmdLsKe8Wtx5`-rp=)AdWN-q*y68e=pw7+lH$6s;?0qieK&*pYN<H@uPWv(
zzeX}<cE5lgXcbB@d*t=DCq{e|3av%E*DNSpq>|Ap8{`UyvirkvsmFNV!P+1`WbsCu
z$yv%F9WE{}Tn2jS<d~<6Gwy5TF9!ESKdcw6D~IEq5lRJsuQSD9kI<cued69HC7#mg
z=#kpZ<~kORK)+Ag25HgT9L4i2I;GH7eMog+pw^%hP9#J#FHe@mIny}IMdxZQ{AmHi
z+n9E)PkoeJ$Lv2bm`F2y4r6tEtqTMD*LA^CH18DzzG7h2Vxf)*Q#?T+X+N(|VwJ#d
zDm@kydo~&<pYdEzqQT&VNqIpa**PcqQe^5Vgd3^d?k6kxmHmjP28OOOu`7DEk$Mz%
z<S?aYGMD#jFr_5@M8^0|V_uJ!LdVoQLbx#t4klAhlI9>vy`Y?L0Od*QL_%9J;$!X)
z=j}U@36FS>JBOJX7A1^5D#l~LF20etd{IV;M$uQtz%;L#GWv4%3MS*;mAr=Q=38D3
zJXRlVlCa~GmUeBy_r5KCnkE%0ShwhybU@uhswv75Ty&^PP++uM!fC1!%VHYMnCNWY
zEyPj2O-WOBlv7Lr{YdR#S~gH`5t^Y*b^EFnQhsH#U-5)>ELX{dsXc2ZC~IwhUM#^o
zj|gbUjnMbNzYg>Qe;pctr^cP8^hCT54b}nZzn`1}D13++`3ilTZb%FWTR;*R@jG$X
za2x_*C5>281VX82MhmVnYM!mbn4619X}yEVXYgYD4MwE5%^X#Wffp*tydaa&0)HfO
z4?pQuBycury!i3i;%yV-Y_SzGWc|0+!Pws(Z0*L8=Oo;bqC=GQ?g|s4*8*UK+J|Yz
zT-1PUg4}a&rX6%*E1=+J))Mb$25za@>$3Z9$sYJ+WCIc-K4E8vEJgGm9@v;t8`$Bb
zMHu4auYEm=iLpV)<c~@fX?TxoJ@`I?QChy=y5jXbO(IFj(=@E&jd#i~haOGt7>5OF
z)&?7o2a%hIHNZA_)gSA}R2My<b04X+itwr3KFjMIYbwk)HJHrF{1?Jl59YFZ<i}hX
zk6<Ac?0RSrIF^xm`9N1*?mn>+B_97)qjugjAr8QLR=|4dQ&_H<gs+k-Prg9VufAft
za&qqnNj4ZiB?V2?%akgU#nviMowYgE`kW|il}xtHMqs%7y?}$-y?(8x>Yx6M%Ag)E
zt`Ug|kWK$hF3s8PZp4<A$$TIp?d;DoltbxId%0OZ+Ot59uY^`@&b`{G?iPrJz;ep*
zqVG<Jntgg}U)@@?Z&nqk`0TcIwjhhZ2}$1JLEkP*FTtBA2^iePkGi=nbB1kt4aWHg
z#bBzNu9-PCJTlV=utVVDCbuTg=8PfsLXYa-2H@Z|)My>$rEf3Gn360|`@9YKBucdp
zXZv7Lo~U2grtLp(av@ceJ4$=+hve?(XZ}-45X%Wh@XAr09Z$pWJd>OI!?9RgA(pSR
z7I=NcAlADTXQ5)UVw(&AU#xh#TLmar+<3n%M6WRQn_JG>yt&PTH3r)xBH%i<BM8!4
zzj4>>%_Bxdq?P(9nT#WAiWDX)5xBy8=m=C*X>~QWFE;NNYmH^Z6;yFn4S?~**4__C
zsvvg0_RloCCEp_7&*A?g+d2#>^ci17uncULn#v-sQ`!zK3DjtMZoqVIfA6<1!CQK&
z$>!p?9kGAOw&w2F{`@yogNZF*ZficlLil=cX2)Kk&Z}JY>xXn(sVs8^6k^N*;*4%=
z#DN(%ven%i7NAN10<=|vkW+O|@>LA&O24_9<kf0oP%*>9tyo@Y<f)W1*7`Ci^%kyx
zt0++<TAK$;taf?7?8Yd>D;TBw2A-%*^I6t|->$C$(YVW9I-!J<D1A}rO)zZAB&^va
z9bR@MUyiY{3F3^4@qdP+qFTs~b?{GrciJu}6o6#wUeuh^2|WEQW?voG;UQ=ZQ|k3;
z)bE$Dk3llBRFr-wsQY0inK~^KU#5O+b(V|sIwx6HJltz0R1=HmFxD_VB@kf)H|`%A
z3KlW?*DnsqvF8)i3p%dDxK!cnFy?vfi&B}bS+nLq#|x%_w$iyNIJ#IJ@)bYT?@)+%
zyw}k(RIV{R*CI&6g=jZ{^808s7loHun=1#sU9`5cwu(e<oMkDa$6W+C>P+vw(4A&S
z1#E5Ho(qgkTDPDQnD-l+Rxa)?*Yf7~J>q>y=;z*S)K$%_)D~mb6gMVXyJ7Ct*WI|~
zGMNDXJNB2@d2*kw7I>_FYlSF<ye{IbgGyAI*ynjd4Ip`$eh@oH!c$j%_N48|DZYj9
z2m9`IOf%mLW0OP<Apt$lE-|O{24r9Xf)?7_SaJz*I<21GbgNhJ3@s?IcerVD)49g=
zD8%sDIZ4iBf%ODnOG9Y$V;~grx)#DW65uaVR6$__(hk&Hf>sT-1kKR4kr;4?TrQTD
zp9jjU94#?>B*@bte~<z?v6-h_GWy<1Z1e`YvWDh7vy^q1Lb?>3`OBa<X9$jSPp6<L
zek2uBSA+^{tWhl&?_VpOciEJ7{!H4?*t7Zc79qS+4`&$7IQzmwEE6l#;~M)C<NB3Y
zjph6FauDoOHo00$T$PpvY|5^cvvjWZPN19Ia~4CG1okoIVb=`JoMA$ry=$-%vKsiM
z+E10oR|FQSwr|>%GH7|kD0c+PCwQhCs8&AdOP)g#PVc2jDml9NtVBZ<=Spuz9PzbU
zlsa#HFPrH5b8;iJ21X~1IfRuMw$?cB-O}kQPt*d+FF;Uj;r&5B5!vhFO|whZX5@7^
zAveF10SbbI%s~YX-X@>fzZ@}@xX;kx?=Oa|BCxH7LGY13x<M2hgQ(N#9mbIAu_*!R
z8(ef8(HO!qc~SL1Yj+`}cvek2S1@)-b18B&x6TrI-Et+)Uv?IQ=poHOl^S^_UX@62
zrsEgU97pNPQ|{jtaZ|yn?O2qykZM*L(hn3MM%~`8v(g)f)Wt%-KxsyF3xL4UEj5N)
zObYf${VUAiFc?#RPQp~bhTnV%FuxonvEtjvkC*QjOq4ZHhdr<^B*IvtT<HHkP`ap1
zt^EVn0UYQybl+ER4mbNUtACc?<m}ScW4eVmvw4dyUR1;zUzMTfU9=q=)a~`b8MYg!
zXt&k<`gRmDJ<EnVmRc0~5bnTMH|Agm(Vx_dNneclK8RWn#A$hW#C;qpxjP(TTVz9>
zZ=fgP^WSzl_tJzQqXWt*p@sWRe9ztIR(EpmvqiEt1pkb}m}Q$gi`E+5*`QBwWKawS
z_24i<9c|*xQNn=L4&X0~Un8YgHGpA<SkW8(1@&vC)%L^+Czve|4Pb%-z*OpL>jDse
z;MMX<8y7_&k|>b+=b9t+>IpB8j_dKYXs&u|nU34yreb&Q2#_-78y7PoI_h^&D0r?F
zrxUz3#qG12cIUQ4l-;A&%w}7T?X9?}K7vOx6VE8Ts<FbjY?J|?;gMljrlR4Pa1z3F
zdLnWsX;ST8pBb}GQkN=fZ(l6gm?H&Qr>60^WxNfxZOCOj=pAb_Fh5$gB-Y<5s&_Eq
zQz+D>cT+Zv+n|=Vj3YG@rp4@lWDcG?4)rfc*^_A}47#QAti+x2+9V33W}0Z);`2lP
zY`KnHU7kIpqjhT;S#E>W%6g2T03v!6h<Axtb&Am4lcCfedl*5k336GE=IqI<*4B-q
z&D`xV1tO7Z2TXys?D`nc^-*}E%;F33oP_3Bc<JodAvrzXw`a@AeZ-U(%~Bk*6u~KC
z>Fy99%eo!tdaz}oy;iE0jfu%E_K)|Id~s;unXOY=J@rEjv7!VO>Yz?Gc(#xVnG9yw
zYhK3R@RikI_TU$bY=?~hx+XwAkda)qH~ROXq1dU=gCeeBOpR76x=w0IBtB>-x=MBq
z3{6Dy8eJP@E%`Qy3<yq>BS@`m^DXPC_`3F=lR#?O_fu(!z=g2|7Z``8E}^`|B|m>l
z{q=ontMp|FZG}V%MTuL}6h$6xz>{r9ozF=UAjqd|gm&W}=Jxx9?3>g^okDf=<q1XY
z+;L~hL2<Bk9p>6I2m-!2=b3491!6^9w}RL$Wci=et)+78R@zw^>-O)Eumy=*pTlK#
zfv?_e&SKS^;(a!9DyL_U7A|cBw2ili!b@w>q99SGro0cxP-E|J6gxsl3%di?p5PB`
zogL!$IATHzlO|R8GF;!sC?i|i^i1m238xQ3+Wur;aJ%gBcc%;6ARWBPvk7bR`N1-Q
zF`O$=fI{1bfJ>xRPlO~;bE(ZMmPo6CXw12y+mntwI_}z^Z2PYS#^2A5G_S~g?)k{4
zPXcv0di*J?6($*%Psa(6sQJ1(<7#SWSM#k5W3AltotC*p7;$uW(>S&b+QQ#Yc04$i
zFpEnmH~kI`VO@|A+M;0<@zn2~oe))k8a&*c)$Uyyfc2#2)&-Aq3DEX!lp2>(F^+N*
zL45{Uz@+%pqI|AK3%yU)eMfK3nwB!!Xd`S8xkxMjI>B`~r%lrgkZOm_8FWg&hF#&t
zDfak5z_~1p_BF)ovAA$xr_?Bv9z#>qC=95fa4=CKrB&`x|NcS3N$NStPeMSglToHG
zVyKYGM0=SFc4N7_>+l)D;GCqr;GE>IGX+_VeW}IA%WaPX(IIc;Pl}Fmc68vrzwPDX
zw$tz$P64eQDTGV4i0&L-t2)!)6HIT}98A+s;r%QPOh(YV!sTUgh9^Hhq&4{!nQStG
z0YHYT>#H`NvMjfTh*f#EjZ%JS$(~Op<JBDN{v*%&wSr2olcX3yA2=(dmgk*L()B~q
zT@+l(woVbstz6=FPQpBE;n&uqaPpuxLuGQ!n#rM1p0LU??yTF3htL)JCg#4_Snq%O
z$8PE)g)ee}CEW-);OX8>Rf+xk0D?4HlG`p0Nos?(s_lF@qod!J6>cp%fJCq5ZQg&@
z3r}_V5VNZv(t2wlfsa;QRuU44q2o)$iVPS|@G@`&52BfBBkR{j_FGVW+m6e6Uk>b{
zV4L~Sz0m7_I{t_&K=p2Y4ub-~`)KlRrny{~+~|zp&QJ*DyzoY8Tcpy7?@2^p8s5X-
zfZfmdN-ZQC+gsTHkDgl{IVWK=!DCF>A3zdkZioE|VdzF$i@mCjoLBzkac|OWAfgTR
zp&p{~sWftl3}simXcOXda@PB2K*QE0EVzF8q>YA{e|A7j)`9CE!Tej}WG>SX&roTz
z6Nz>}BJ)K6*HSro<+6Oy!fNjN7X2a5IZ5<31Hqu}E9wI(;_f7;73ophlHQ2}>mpAZ
zuiR&qlkmgx9$5p{&ias>^JVVG#4~D+!!AlNdWbAqcDM6GsWK~uP(bCwTN;6s9cXE8
zKPRa!xQjW>)tMjdNoJ1`1QZ3Y;D?lw)qA;bEkaRMYYEoSn>Hxu*gKZ?Hw5PU6$>&E
z?PGQUw+IkK=c|oqO6%T$2Ug?Nd4b3z@s)Fu`+jYGY9~OdR#hC4ua@K73>m>JBXam$
zy1Bm04~?p4W9BA${H*ejADlc5r+te<cNJ^Se$=;08aG*IINA%(+v7fD(y1XjBF0ZB
z-||;}8noBrf$zomHQ7ijUgcNr7mCb#BWhou1!xW+vl#*V+?gGAsaczd3$NR0*INR_
zI!2F&i<Zq=nKsh!>nVv%s$Qivt(~nai!i+aAYH^L?WbnQ3|&4ke*2rYH^V|K;OLG5
zOvJuGTP#P7Mp{(mP^#n1*kU12*=GqDEiqzK%sxf<cWzY`L@JD{qzL^?obTi=jf+;s
zju{66b8uTt1FFYiSy~)`$5UU2a9i_R@4+uaO{~3!CSN2u1ZWDVYbX@NCk;xr-{hVD
zQ(IMa!`S706;5gMCPxB|%`>{X8ej5;KrsS`-A@lcPHDdHKTE_*wOp>fT#V%ErwGVo
zf&BEF_$rg9AD|4Ku&uR}Db)<ne@B2bY~B#=)GvnL0)t>O>{l(xjqOI_K$B7|>Z?+E
z<Ky_BPw!&p>ApSNOqK<7lywhcT*$UA@bH*OcXE^d+JYO$?k8Q|1E5F!z(VqnX2JXZ
zHd?L+EP#;^)_LJN%!N$=CQm1J?7l`)b)uN!SRC1+b*AO~PDg~YR9$uxyV$cMA<VH7
zckV~3yvT*5{4x^CS$zj}m{3=4=G{hHIaR>C_N(&ZRwpf3_nhk;;*(>lkSOH6V%DMN
zD%{_76FLc{+TsIubjY>+B&|LTBQB-<euyBays_K<&D|g`W>MIkJ;;}{O={lJUqA!X
z2_FyR4zTS(99~?I@FZA77aE8E^YKqR6>NSdl@E|xGAz8F_7xFzFZYdw<O%5xsspdH
z06Qm1`)IL*Iw!gM_4&zK%Me9CJ_}^ouP=I`G{Fvs7|AA-4mz^@h$VcyTDzv>sE5Gi
z%b*kkp2Tj~M7~7=M-)-vAP4T14lu)ra<<b2U1a%nB$|RFb^)rA+5L}^yuKl=S@F}i
zhRAP$z5$rXfa@%KxIpo6VMa#Bd>ov1ickb}Zgi-wDd+nGjKi+Fx0Lu%RKA%b54}jP
zBe+D{x_>WAD~@=8-2wezwAQ#1eGLFMywI5!L>R{w%y<Z$-v{?Dq;H0G=kpnB)aPIW
z86_EMFEcGs4ZEX!hqQVOZ>q?;9hJ!_ZKe*EaO4+KieWM-+cPpBQ!vbYI3N4-&2Q|=
z8>BQH?@wM(l(P(=WOA=>5Lhn%c9j;8|NPY5D052ZOmk*6QUJTs!~$9L>)q}8!7@}L
zQ}k$4Ne10M@ttL~NCu-CU>Hltq1t3*0|bWe$V$U!5973=Q`Ou6FU`_s*{eq8aDid0
zhR*MYmSk+w-=UBAcuf78_;;Z3sc_V0#@jmz3QD3-fOTHFrWrprFS%!`V{cY0cl95I
zmC+5PW(MQEoD}ns6STVGzH1MNnKysa>IE!z#}GT>0Yop~!iIFA&q)ORLi#EHv~pYx
zOhx1v@UDGVH-<S(t{Rlu)iugQJG5`YsD%oOFi_c;Q6(3PPjlpV+!ZBwv+mQ0t?wO_
zs5CLcG2sY`<;ck9eE!ENA|Lb4NxtRPj-y1e+w{U6qX@}jBxWV;+d-kTv$yb%BInvz
z6PvttXCJJCvAr4P-l<TLQrcI@vmmQ#gLZEEKEaXE*im$6kPoZ>D3L_JpdWxV3V`!}
zyAc1+2dN!~j)=~$ybtx!3xJ)V4u{_pbJk9|H&kY1!JBm(-_|!nx!Zmw7&U;S&-7C<
z(64Z+DObCz!^oL}ZmY1r6&v02r9B+z=&ob~0S4eOuHMLgAa3gRaUN9HF$!^jjbX9d
zHDYY|f<TpbJWXG5$O<V>T003j75u(c^yOp}e@@~M*(B~v--K?=@`PJ?oRjRx+H<Hq
z+rYm}J%Xt5%4GeGF){mSqSWSUrOVQpk8{En3&lil5nec|_ORuCY*WEYiQ*GwgC1^f
zOn(Q7mUvu2f(r(n)c@yz+yPrPF8XnzqEwf)*Jnz>s0wvN=yk$VA~pO!Hj@3Uw9x_&
zxR*<(U2rC2bQl2gFhX$qMA-+?xt8Nm^=I4PqmCE<AsMD4r}OO)&7XE{qEBFaIDlpE
zOJY@3?yrgnplJeeQkmI_7}n-3frUa(nj5=2ryMwvF2hDo@9s%0=AT+@>?_xWt~ixs
z)Os0%-5YEx7Vy$PA^0|~qvVydc%BcQ`cwL2dyYYT$31(&NTg(Ly|SDmrHx+8yZ>{x
z|8rw6STn$<wb>i&B;%2;??VIm0pK8Bl-0t*K+9-Tj9|v)Khui2fA&L`wzN*t&q=zr
z8OF^Q0ix)iak=O%gFqWYRP%Rxuyq5;P25FNw{O;(a2a`-B{Gie1{2|PD=pHzHH$hC
zV*0h15yMrC7F~4YBhnYPu<;>|UMW&h&NWBmu=1MOvXA#dBgbZdpKE|=^Nq5}2a|m0
zMs-+o-B!yWxd9>4HzZ+SE4|HU_5RlLjRHlQO?Tqi(p|kb7u=(s*R%CExHC&#PDI&-
z?83!$G!gWaWHevh(uu>$b(NlzJodL(QrQDJwAl>88qj3Q#}jpgC}K5vRT8&5%ZUm&
zN-~7(OTiQHb_*PMZ;yJkeTsHzo`F^3#veb0Yalqhc^Gl)%N+&cf9{V!5eqV#PE(s@
zbEn;N5_65*-+;?zJqpP`eZU-2e|*2cNM~1;wERRh1Pxg5$<vViv-Z;mcSlb`O36D$
z>eu=RRlatiK@;(;+t6=qkYt7=+PzOv_tWlH9*jL22W<zk3nIN3^!D%NG8N0kJv(#R
z3+b~R+P)*$*FL<_#B=2EjP4mVx?Ow8TSj>Bx~jlk#%Kk_n7Si6nKV}_M(hdeS#z2D
zGm$~$>-8`32R;XMGxKdjgO9c9wHg`UYPq3`z4cL1yT{5Ix5pN7bY#eQxp7&G^|PMc
zw8LpY+=rBEo|E)#9=$x7=#V1}T|Ta5mYYYxuLh#8+;3y_QKXW+t$Fqz;(XtK&X$<3
zuWpyh4bHqhj6IU&kkauAz4>N8rDo8^hGtSgi~oARCQ6iNyu|#+2OW^fwHN_9xB&3Z
z;uG$9oso>pcHrY;tAcw;CyFsse5f;C#JwQS++o)!^CND#{NXMI@y`MU&C+5+$d#-g
zIkG87aznvsH}^xT-|Fm?hV-o%Gulc{{U{j1h`PjEX)#qjLdK0M_Ok?`gkID)0WY#g
zthf#zoRiGo2-(cPe&8S;l5vsK5@`n$3(gEK+iz7b-v4ZHm#v#K%<K;r@#4T0x|J;I
zybaMgaTwe^$UAeCO#m^jMa~53(>Olq!8*JH9@k1Am5M?Q`*scEJ3}<oO`KidXKlk1
ztV(!V>`iubP^a{3zCFPq8*Ne+Mb06(-#j5nxpMoyeWzggzTFKQ-ZVIg-#n5tOg<;M
zS-<9aN_y+UJ?<`jDwco|8=maEKq6Fu<Mb_3=$1tWzSH?{X{cI-q-l1T^_}g~KU~^)
z(0j>?@7XRdIVXuTJBcTpldROQ{fXWDfaH3_8y%||ynWoY#rpB$gCYG}r;RXghGwrb
zZw+#osoRyUxqrq(deOZbC`O1&`(HUM08_=FV>gn45~g^`{7oX=qe7|I7uKtxP$))N
zj>9m{dNcjvGcpo&!<gcm9hyyc;0Kpsu81<mE-hCz>b%F}k8!@Ev*V8k+sa$Hd;C5O
z3i<@ep}+O#)~|(ai_cvFBTtIwW=wAk4ZXcV5qX7<(tMmK6mm!^FM5*lYv1vWTRhc;
zl8<@siCR|=V#-yoQNEnrCwN`%KS~>b8hu4GKlASu&mLYmm7@wRqv;%G5lh)lLB%4a
z%^uB{B+zO5WqN)cL2&=|^>4o@3O{W>ZM*oV@lOX-!AqGr_OWF%`GnKR%M9>1VA-xK
zH1%i4*pSfiliP7e(A9Gil^}>9?hG58#+3WV=qEHp?lgI^P37!jVeg%jXtadjX5`ZF
z$ss4c^=nz%rs8&?MA!0#-vaX$?yPo%6Xl(EZ`@=d*W|^sCyD1`BfqPFy}}pa6V$u>
z1&I44v=ZXUH1(Hw|9W%69s{|7Q2bNhwlE4xn3n1@wKkov&lmgj`2r$UoS&~^Fj@kp
z2*xQjx-w36M-SA03#3Wee)3Y<4zmmv%H*mB$i5?Zvu)rN#<7vrB|5hHh=C%R9L)g9
zbb`0U2Htc0JIla-310WB^JH?UHdYgCI|F2e$2X+^(jkd_Eq(oG%5QCHropRhKNqDr
zQE$?JSF<pBwhur#vTmFlx7L>1G;J!}<#QF=sM>X5dR6bZndO5RtLMAD<?>~E^U$QW
z&5qCB#J#*hua7my=sKOVFkefaQkBsVi{x9KyUKnOTEkWEwo@{(Souv!d=zue!eKD7
z+9hN2$Zf;yDmj>1zo~L_QC>O*a9;%z68Z1*n=h${P2o7PiVi+s5IaobOA_%`DPD!i
z%vl1$LdsJ&cZ%hMz1H!wX+P<^Tdn`p*Ph0llPn(8o|E(tR{;Hz!He>ATg_<;<Fm|S
z@0Mv+D0~e9cWPmE%h*_x+%xu(<dM6nM^ofjU|=ox<mC8+p2#+(f9oq_E`{t4v}YnD
zy`+zoGRn#TG6p83J*EXIEAX5|sJi{{r9dqQ4Q-59%@^6%?c;wZc%|@U<hi|lqW|Z<
z){O8zRhC!1>&WPf9SMM&g689a+)b3K<+oK&;utf8!X85Db5*?n$@H+tKrvD2omW0k
zpXaMCcr$mn(^_APdiYs4Y~%-JmaIh>K$L^ln*enZ0IJl?5G*~WJ16PhvOgzDaUCJ%
zgzy!bf&1Ay;t02obFaSahOgWlpeKImE=@#N(f{+^|KDFS@)<9gRUu(ORK~4&FzBku
zAY`KnblXq}_^3K`%c+QI*#X~9<Q?swEDG?tSs9|ZXBaiY>YtwukW&2ELqWI-Tk$fD
za^Z(pe5Nv{VWx`t&)pUPkAR`df9Pb*uNU`Fb7;uFO3v^;s%vn92RyF;R4qW^q7X*`
z-V{X?V4|QNesV}-h?qM;5E2ewf<>N#b`=_FN-Lf=kel>2>u@Hlm46f|!Tzx^IJL*i
zl`PJiqm(gK3!7JhQo&<MiBI{?OA%AJKqmc<?VHKRT-tq@DyAbgh)aJA6zH*wu}iT_
zQA<(FQOj?Z->m%ma!UNTE~_#w<t0^%=RTE-)-&qPC+MxJG4gU=lZDf&D>A7^M#$R_
zlKEM+XJ2{(Mpp|7iIFS(HNmf7MTI0Hs$aOk7{PH6qCUHy83o9lRH<)xG%UIIF2Mgs
zndk9w=~eG8d|qbN<D;SSlH=13;@62Q90MxZ2@)(Gs{ilHmF;814l!bb59&wN*E;jv
zI{B!2I;Z$G^&0JKB8Hh%o!S2H52sz*Ea~y(L9tg{H*G?ytz@#OHo6mDJ_!(_8Gpy}
z?Y{&YiH%;*@syQn-h`J>mTyRz49x(cbb<}<MlW<c1y#+f^HLx2tw<(AH9+Vc!I^Di
zLSeinvf7^V<uFTsflQWifMl$(@s;w(_tG-|`TVz=F6}n72Cq6aEjL+chSC*YJJCon
zV#)&iqIqvY<c-h@<vSb2MCEK47(Q`_Em7$o@Oc5OgOExV?8U84CnmFh9$55ly#&Rv
zP6|Bbdy|A!Myt8%PE0&q_bi{R#onQ3O4Ae@cjJ`w<G7D1cj-Fk^q|*awRB?I)8d<g
z?jZ@k0hCgb*ZtH;*Xx4fsd`^^uUtV^^YFWT0ZfI7;X-u=ZV>Ue%8CV31b6PA-AvnQ
z9uHZjS^6Q?SL^JnF@n{f;45_)*PAaJe(TY&BU#m?R?OWrfXBa@IkwTSN?o^zGHh+E
z96>i-x6Ii&Ct1rCJPMdgG@DzLmX3^kH8-QgSm|J#fZVk8saN;@CKvSyLmYw^GX&<z
zK3}GI5fd*2ZnSW`XZDH$NU_?6*+d}C)(d9&s(WOE(M6rX6#t$h*`1x0xkZD`+^Uw4
z(3O)ig2iFVp$`u25M~)yhC|ZS=W#w#mqlEy9|Eq<SRCD~HRhr0@zwK*=O>W-I-o2<
z@3yfjH9VB|lL-!!ln#?RjuV4U6A3QQz7tO2lz2XdQ!Pt5w0{sKejrEQzYTTktZJ=L
z4&!fa-mvzDzU;`1a{Vk-u0e)B#NGet*}`7sY44iVamMh<ffSPRSEOd{G)tCTQ;=kc
zw`AZMeoW_A?Ypy$X9>Uh3(q!9D1S|VJo}}`Iz6Fq+^ikq`$Dc6Bi9^x;J$L;;dxvS
z3-MXk`Gxy*wlOvMtAFZj!#v?v%kQ&wi-cb&UDoLbd2&rM$|0Ud@6ML@c~ATBp2x|!
zs|QSIonQB1xl<3&a^*+GXD#@Gqjhw`dVC2u>-T3>c&nqf656v5cu{a!;W~Jeqg<>}
zhfJG4bka9mrqWxc)KjL&-F)vR#+!OMYuk@Fkp5zfBN&DK->0M~;?!!=+g##P4hs}A
z3o}%v!W<res3rVwVGIcrrEe-9n`vwJJhSlQ4iY&hnbIx>CQ=u)*oV9wZBY*~^X5Hu
z$42g#>%IM9rX2Fro9fgAdw<{T<gB=j6+7A?SG?sAqH9j+YKA3DV+kGoI*x#17)1<W
zq`jXlKoaQm{W1n##oKE?qfn!y(e?c1sqWG3vTMr#<pUcOi_Q!xJ(UhYR#8wC|9<f#
z3vlB9{k;+?PD$bC*<K8$>APoM8=~1H_S&zIDnKv2FShE<KP_50c`UbdPBKy9P<Y20
zw2Qa;i2tA%C}RJ`;>5icVAsmjPh$OeBZBy&r<i|#YLYjrhS2H${hVan4LqbGg7}ON
zB|s3!c5a_Bp};cOaEi0GxXSypNcwW9iM5`9KF=g)j4%qW?A6R{(xlFVw_ktO34c_a
z;BfXA_a>1bU9uc#|N3xS4<RJn`BliUZElJD-8gbn;*LkfvSn}k%kqVX0N;Wpux#f>
zM#S$aL$G1T4VfTbBz|97RDKSkL#m%|f=|&fGmf^w=+)f}i{el7p&BnWz*PN+tu|ok
z%_y*2u>0}7##t*boKC6LJ6`!3JDNOaRjlYrOWE;E8Qy2CWMrRWuk<t^z%9o!KyTVM
z#I3~y3lY@cX9{oGzuD1fk+OZzUg)~3#Tu7z(}Mb@#~Txj<jq$|dDogKsbafGZ-E;W
z_!z2bBgN2t=R3d3ko2W<a;3&|)4Fq~hPy|#3zCi3B+C+)WboHj*VE^!E431XM*#KG
zHNjItczk7(Rqs>fk29+)v|lny(4hS3Vgf0hnuP`0uIZ;XNGkF3KJ~05qOU{-F0oNU
zX(LWh+dz_4ckYf|6R3+uh1RjnVXnE4XTI!yBT^Tgl=s8onRHMdSnjt>ayU#jGo41v
zHWT>DX)C0TLOqXS8qD(>*hBPZ)Lk&;agIm%bNr>jEe#qiJ*M^7v$J<LRj>!fB7q(Q
z4ny(Zm&Q~0o_6WZ_@_QDTApScF_PDhTHH*mYAJBgb)49Gvo`m<78@ln@S60aiLS{e
zh7`}FeiK{wh92$AzHd`(URIlnBh2}CzA>*Xr2kOTvCh-w9YgPX{L-s#<X#Hcjq_97
zQXz&TJjxC$YG101t~4yeC?WEck`!zaEfv5s?^gW%;rZGtdin2j24vUP?o>?wx<xzv
zOjzCJL*cv7ZL$JB4!5L7!IMNaXhLk8jc$JiuCBxLglTt<#SaW_5Qoh}qqRjZhD<44
zsAn(YK9S*p8h}3{P$hBf0yMnqW;~FG{)E2PCY2UXan-Y@1DhkQrG;1+D6Wtf#p&4A
z-_)UIc4PeXA{%fbRQ6bFuXt`_yFr@&%+E_(+s50$7aw0!M-vdT&@N5CH6={CdQZ12
z&BGE5!pQTRN4G~aWJ#||BHswhXO44-T2inTd|BG{Smt+2`lyTr>m|a-_c(SVN#)P%
zM~JXtnix%aJu=NMYjzhy+zm^N6*MW4ZvRIomA4nHs14%;ubvBx=9{>1;ax+irw>F#
z_C0l+%20}iB~pvlcCAD%8t>%d!IYI(S((eNi9k60Pw?6_EOWG9raIhM9a3_+%_L){
zK!Yk(TtgQencHxz^%U@~IsUwdc$ugj!--sNa}B%u+p11Va0+7cz>7R5=~?<)u1ZGP
znXuKXdN)<UfYtd=Zf`H$`vCSq<>fPimWUE{4zpzLrAok=*he7Ne#I%rMaLvK8as{n
zL=j>L*->IJ_QW^k4mTwRJl{$T6xixRs_b#vw#)+(Q~U!G%$$SrwSq9XMNUdDU;|&a
zw5OLj9CQUyJ#9&Bq)UG&Dr1df7%!f3Uo=EhwZt)_ODBiAC=1L#7_|TelKCW0_KgG_
zt)s!OOvF>#L2DIW8mb-Gr!kf&G`i}(gN96JV~U0Xb5a#uQs&grYkq3c5Y(NWxe+Yk
z&zi~bPU4tTRUMxwIX~v(G`0v2Nx9dg3wzM2+`C7ecR9dpW}S}%l_gb>%lIv2pYumt
zZ;U^lBO33<_L-sMQtVf)F))KG%inq*On)2f+?N)GzNt5*)es%};&qDq;?>`;xTd~D
zQ)o+5(76}L?iF`uCiT6%q)&L!z_<dr^y-*xyk3%Z&uUTKx@eh(^T4#HEfYDTC7EyU
z`(%mBCB!-ZF;2O@39l2XGHB?W9r!B>hE=cr9k%w}`yrTtPl>uMO)U;zfn=jSvSawL
zi~77>a@NTbMA>wA0*oUi<f9aif5v9`Ls0`Vr-YYMdBt%wLwZ#G0gt9{8K!fX^5K|c
zIyNHTV`#ps1&QOnRGN&FDt=1h`Qf5=Gu`$I9ul2A^W@qjuQaoRD1K<ri0U(EVWJup
zjr}amWcZhKk84xt$x3qR85Z@7ajC>cX{j#dWm@yTg=E7%&YixA8&A2Mh6;7^8~UGA
z^;WCBrZX<j83waZ9IcaNv3vV;6fwR~*_)dnl1hnzkq<Uzo#Xl@PPqL<q1~V&L+`tr
z(e#E7zEAP2s|SQT^Xg!iWWI!c7y`@SyV`gBl935p^OU_|R*C(Liijwg2U(`y^?UW&
zvLlj79C=B1@=-2|j#zbL6nWj0DOcvN0{`HhxfWqRJxP6hfxq%cR~7BY1;(LXK|C{w
z_4j7rHScG#YebxrutRly0g8o%^7q0i#QTjcWp4n5Zb{6xLvi#5d|OgNxtD#VZZMh<
zTxs<N<`D=U!=s+|o;XD}hBFSz)8-w&PDl<C-NCQ6EGF^CM|nK~^YcgIkv&{&qU^~~
z@gy$S<V)}0hCY7FD4rw`*l$YJ%rW0ha2#({R&|J1W9zbpaw{n@o{%|6aEH@WJs?Z(
z`Lf5@08^efM7p8S3_Y~WZ&C(gBNXq$pjTr2->Ebg6}n(1xB@5d#cD#HBNt}8UVp=F
z7<C_zD>8QSau|n;T3i~Ggps2X7t)vcOry#Y(HRoC3F(v8<#FAs)AKBle(~bvtP;mU
z<Oh>*8eY!cl)Yh`Y}qJOIlR@*9`B;Bi<Khff7CBJfO9QG;cl9lrXJ#vq03_eiM%@U
zO3Z1+?3t=ALVrVzbT#d1F~47N*FRd*dl4zizT(1r6o2(PU|6BvFj$GsQMdyynz!`%
zP$2wN^koAa>?5hJDXp5`)Iqh4K7q~(>|f2#ujiddEfkc8X7H9d!P$%Bt!#vs!2G0(
zJ+|D$-N{T0e<(EJKgJv~{MS~Vpp%AMC43kjTn<)`RR2+R9is7MUo@qlEVMC~oGU>2
z2Y9ZEh_eE-3+@E;?pgz@{EK=sOe^wh>9K|&2h9_Q)~i6-lZKMNTNmfuFEosIxxCSm
zxj`jE$Em2dwmx0yBzslF3Xbl|FKhtK`owxmUNN=jUK(TtQ!$x~3y(rM$E}bKb?9(o
zAr)m=n0pxX@}2PyF5Cs<2Aokw)-SIv)XHew;hW^alP9T8btuVNRf+z3QDoc@aYYsG
zr4@BZHm;)IAFd={B~f&#i`PPjy0RPdG;^iV*~L(eslc~H0oF-37_awqk(W))8eRWn
z%yf#Ev}Yq;m5FEBp>CpARez4(v*$IM0FfC^h%1KTG*pk8v-eA0+uM%f$c~z!GQ}JF
zbPsp1daX>@Z!(R#`P1vBwJbP8{mEjqeL+E4oU~|%&VQaRj8g;T7GN+kWcXx~?pmt<
z?P%u$dvXH<X;{5uiVG5dH_DL*uSMnqQ{f8H7<VCU-}?pQuC>@G3o9<N*K*6p(2@Dq
zEx?8|kA@+ug^s49s82n~HWK6mieNh+p!tYHu##m`ijmg+tzN$h_jbUIOY9y^`H+M(
zX1oy)s7h$LUl8b0)Wk75zohF7!!WqRILhO`Xm$waejEfDjW|lg3C1p-(Ntirypg&1
z6pYJ?UARl3GD0&1Ec3H84;vtAKDIGhs+7!;)~v2vkU)WRHsda>s+r}`gXyWV#2I^A
zCE4BCD?!bhrM%#a>|9hK_ph~gq|(9Erfjw+U$%$;Mq>h)aqK0Ysucu-&X`f|+stT;
zAcyViAzrdRruT^n&Yn=Y<Gk0*I)8TwJ-y5Lv!L{8G@31={Kd;Ots#zKWDfJe6GCF+
zP$Qp>zgnn-Uv}Sz2i9$e)B;Ur<{d98yJHTHIN+u8XqK_@?xp%iR{s1h+d7Iy)`|wy
z5e4ek(#sp=Z#+IH@e95osaWi7aFaLc7i@;bMnxvEAo4NkeR=^a%-QXTEj?u{g0UVd
zuMy2tVBpM3{X_F8<`vJ&|3=K|-T3Sq*HvS$V?Ug?=>VNbWcgvg8Gd{F-tkF4Q&7Wo
z-`3)Zc%+dRysJ1hk0r(dNB4HR-!bMat$OMP;=f5ZVq$I-)87b<3A@Xw9kC^R8?jFt
z=8zASqvysGnc}=|VyW7x6&LQ#r`PkUqUuT2EGI?073%IeNiLl_Z;D%jVe)W??ikv^
z?l$jy4#MD%8sC`E9G~hh48t?BP?^#LVgntl=!SBZoe<dJtsZ<l4QNS%KK0WbS!xHE
zhoLUqXXmLwge<wpI#YhJ3V1wdi6HiCZ~GN}f0cWS`#gBV$90A>wK1V5YaG3QoU@FS
zm+#PgFDlzBhBJ@LdUeOF7HAsi6-EmPFKm)3<a3p(F@g!2naZ_8tpYE@lW8XRl{EQ1
zB(8R^u&EjFUo!lFB6C&mRjxSXv;MSV?MR33#&f6}IKnqy)a6Bu=6^Jje&JMUGPW%F
zSigt)gQ1b7dE(+vx3N?FQ=0fHk?^x2El!_bF(MvKnIbe#3vHb5(+<B>k<5qQz!@R0
zIoP0{t=kqeW(ihvd(!*CP0^xd?pqZ~J+AK;owj>aOP)#oe{8)8Je1x0Ki<<r5!uPe
z5;NAQW~9dw9*i|Rl_<s7(_$+Tee8xYW9({>vD0ENT193ok&LpmSPLOa6sg~JPkp}M
z@9Xvd&(JWLb6@9L-q&)@eVu%jTEm@(drI_6ZrO|Vr1T9$>@?Lmdfg>!nNurxdU{5-
zEXe(&=)W&?@*W7TT3D`I7o3)#eYbl&iTW%!c<x+-4<YdFjP0SXnh#8^U+_#x{rk#T
zZnwzy3qj7~^npWKcKw~PFK5e*{R(3^G!BbQ?#QzUPgmG!C;X5BGS!@N$e1#sZciaf
zkoRQ8JMQ2)R20(KurkY3$=&T%>4;L%G~I1k>yei4cl5<;biu^!%ay!U(4*hGo;>q+
z`?H-tCv<E7dr!FCWKvP8so!$;OD$cA@=~aZX^7^^pfqrrmDf9uxO66k5X1N8t0b6c
z7kON);2*GH1?p|7I_=ZH=PZX@c{sP?QQBGiG%G2d!EvvKj-!^*r5rfAx?9F4-|d8}
z=oSC@(`jCA?Gq8>Dvp8Ls9nnMPro=?s)!%iS|J=*?QrMVOfb4)xguAz>I>^ghFQ{k
zMr^*CM~G$lkj%XzyiED4A}OnrmN&|C)1^fx7tJMVY~P694iF8&o7LUu+P?p+MWxap
zi|VZAT>fExNZNk-#tq_a)W1*7XYPi#E&TKJgbl-SIlPa@-|EQgoNkRArQK4NdRK%@
zMLf=uH42;h3pxGwnjSW6%ZG&mo?n~FeMNp=FH>1y)z#jTFqb-NE-1A-(`j%}W7+IR
zWf95yaIdiU>~ND?Y2)!K(dAcH?b2MWcP|&6dGPP}8-B<BL+1OF#pdlUlT&UfHuPIM
zI_<MMTOJz(g=I&%yU@LTHD2&2y06aU*QTg~m;wdIAqG0(o_q*e@k~g8J9pKYz4W_J
z9hsG)u|Y+ol#KEsj|wRdR_73Prm3l^b|-4#VaP&}M>y9)2$t%4wK#<J;+ot>JZxk5
zz2O1&xy+3pAxq|0ZX7`|J(&ZY?6ShC>5fyKhx;aPULVX)acUm5yF716HK?Bbr_l7s
z^t*A~5G^Ua?7qJ`E1tJ#T9C=;u=p7q<Q=ARkl}a4zs4}mN=O%lsTOk7FyEn~A~4|>
zZ0yHq*2{FBDNyG;e9=>ULoBOV)cOeY7)d(pFf*cMY$tis>Eq<CKr`}_l0$;G%th(X
z(sc{Vk7#R2ydS9Ced0@RT2_O2`at{proe}0@6*ujmQ&<0u?A7@y=MXsVBLKtAII)J
z!u9^{1um!WlAS8We$VV%^Gon)HD;B2YLbtJmz!yaRl1+et#rRrwqO`M-!c(qUx=Tc
z3NU)H+;^a;R9RlQXu3T(Pl$KsszOS&U44AKxE(9?u7#3-g^%qxsqYbYAGU3UDX*f6
ze>pTR&Dj5#(ILSI&Me+xq6r7Rm^QqrTOpq{pP|~<M%^~A@Kf@*^A@Gqk?2>8{%qsi
zdB7$#zdotCIf`|$(yuNUxy|{&fqxtVT>VuF^FK}<R*%Ze6cluw@)aG=GN?0EY-bDT
z8^w3`R#|1q%2y6%h6{tA$en%N@(J=*(iY7^w^E$6^f>gjefsQ_`|KNuTO1$CepRYK
z*S+20#`3K@W_|Z&iLtre;_kA;>iL}p`a8?tlO0DPh)I7@DVj2bQ(1|>WtQZ3%h6J4
z_JWo?-S^-gVz@V_ynD?N568+#ySGk?!Mi8KC$Hkez8_Pckg-Gm<P#ZSNG5R5?R)69
ztn#eR2BBW3;tMJawY^sQ{4=FZw`MZ+OC&3MsOTB9=iZiWF=1zgvRbXgM=Ui%vP6YC
zxJLFX$ybW(JWJg2_$3@Hwzx!7-S1WvIR&hJ$@EZBjeR*(Bqe;+&1}|-=+-RoTCmm6
zX~N@Vy<^9IuJKBWd`R6(^1R0G>lGe1lPa8#9&T<fz16tW<M2^b+2zA&?dzf=?N6I&
zmC&9_1$u@c{)<$>Zp2Vs>CJrg5V!k*2ma`EMpARumHUnu-`(5-LAtXcEq}+~wZUC~
zpJoi*6h(I{1s-u(yiIiZKxl9|P70-JxEvL95fcrJznnE&W-@!RXvl7})*gY;u&~MA
zFm9QhGYbAG`3IWrn2FwU{6y}9aNFwmfNUn^^wl^^EljapU(<sT^<iyqosO7oeiNoN
zdr2YUAso?EJAZQ_zR{8BTOrhCOLy`XE-Mu-!w8oi|EF}za;wR58zIb3_JP)>w*~(>
z6aQDEnZTKR!N&5`L;mhAIr4wol0|%K>fy$xKG{>$YLn_!{E@^lNx7ebwwF}{G@2FD
zhln?8+x2$T8;6@!y(h&_Kb5;_x;^)ndO@wd6Sc$PP+IfrSMYi^jXWiKNSSuC;;!{-
z$4IHikyqZ$x%268M@s6H79Y5bXDO*j)8lun!+4p)mMyQG#dv2M`>9_)%bLCvbFN9l
z9ocA2rN)w^WGWT7q%~TP_LOTCQ>RpvsTQ3=wg1VIcfXxkvbl*|oGU#vVOr9oxGya1
zyK>D{)XV+m)Q<CUm@~#YIhFYqN5_0UkI)?}OB}R_^S7jIc3Ugb_@U|^pK5W;!fOCu
z6J(Y`Pcs^_u=03=snIQ~@f2e0%GyCZWv6}Fy1+nnyU^nnRV>jx@sO(FF}hHnKvsEM
zqltV&w9Byk-}piUrBsXkLR5aPX#2vk)WvyC=YZ<Ic=7O3=d;MB7s>cpPaC+U-;u?_
zKTbl&1{6H0l%vFvp~e5_a088I6LPdkN}Acr-RZ+d0e&PnqUp%pjskMgAX!DZvsvVl
zE~frd=}pJ1QD`4?$WA9+Uq;0v1n(~uL_f7YznOnl#Y2jfq*Lz4idYyOTitdidG~7s
zge`XGg*;f{yXo1waQuY{zgx6Mi*UPA@&`xJqH)DiW0mR7Sve=#Q`ib)*Yr%x;>2^)
zJ-gkeRL*?XIFdUZdNCjMA?}jMUP8srj3iDtO_p}(%#cFet%$TGwLQA2V~rOxmeck}
zCn(R2ok_Iv_RD{2pvsibEUR%o(B0RVwY{OCSj0zOhzB2Yb2?mu?s7GhLoAMeOQO7r
zG}Orw;*DDKB}a|o_!MYX``w`GlXVT+AT==qcUIKq27Hn(6@iHEiTD@AYjT><u?%5Y
z)GdWO?c=A-)tcs{c&Sw?o}{En<KwTkmm5eYd5_=rRxmH@aIj7~+&AWW8{c=l@uR+a
zMVclW+MO}=e6H$E;9FL!!cD)5%JI)0;h)uFMXWTn-pcHia!^MOSAl*b{wo8p_9-vK
zX{Rh%qRYFGb)X8pp0Ga+`|NS-S#;=t;N{uq>nk4lc_LMCC4c6+bK%^8?$rsnxmL|g
zshG$*KP7ZcX;w9D#CbBJkfVNAR;<wT=wr{xL-hU^^s-p7#E8EgSAy_&_Ot&v6mC|r
zUx?!%j<3Y%iR_rbVtJ_JK^19eu@>!cojTgbhtW(OheMW9igNn7;%(X8+g=Y@R?LPo
zVCNl#MiFV3d9OjUGVjGomffO8TjPr6)t86Pg<EUU(Ko2EA@k@;W_tY_k={1Dj<irg
zizNHf6wZ<XUxmvUVA7t9XHwxsJ`3~`gEy8f8;6vB7T&O1z50spR(a^m+cI<t30Xf5
z52FRb4S;d@vW_tk3j^gvUx}Uevb~lG$v&B=U0ED15ohwDi$t_t9k$(JPUIx+`bt{6
z%Bj=w2gwGNa>VzK%k>VX^-pF|(DTz}b*YB}rF)EqnDP&}%9oEALfapvnw+#CKUYF5
z!UEefdK{#2G2#D=8bv{mE8B4c@lylaZQ+a2>L}UAKDT)bZ^SJ3BAm?u?Q>dp+nM$^
zz`QFos?&(``eAa~tAZ~ZOjs#!s1rmYM`iC>AK^LZqg^W^6IAB2{%p6oc62UxSQ;*T
zopvZVZ=$j^;MuM;2w<V@B<!2fT`b$l8oTtE?w~?6lNZkz)SNIlVV00s;?vM=aC%a#
zHbl%fW0lost+>4`jCAMlL2}pe@!g!xsli{E{zM4|Ut;b$=eKP!gJvxeTkaB=Z{-pn
zUKSUPDLkkxEx9-i8yOQerGjWp{v7@gU+za(fCJ@xZitrZZRj0fH=+9G>8`Zqb+^3G
z_b`tWCPu}zFSAI6YFs&>aIcuK7FVuc&bngDEc#SezTRL+zMW@WNj1)Wa)0pfm$0kQ
zK=1LGa>gRvp4;ra#&&{{pT|LCoU~S=T6o-zT;uXQt6~RJ<+d^9{35jhess;t`;^iu
zNz)g%Q7@{m_gpLT>5@lpaT)i?ND<mXl-R{$_~))?%c8l(_g;S`$i$8-B`-p2PI$CX
z+D4HR$NdOPO^}SGD@3j;Sf#$<!;3kJd58roWQyLoU|B{ikLx>5H91_<s<_kM(OB|X
zW$BUKjYgi3&4=YU9M+_rzq{BYM15ih+}>?1CYzW#8O2!<$9eNqLyuVPVKKVrKU6DM
zI{vFr*5RFJ^V%+0FsRD|gv2#_C_9@m*W9Va7q%(zHvZe9ES`|y`y@d~659C1L(;JR
zn$OTgNPR2wbmFA=l8Et-_CM=R*l(}F)S)K?Azi_CX#4X?qfE|RJ|J1_x--?!xKga#
zxzI1J+zxYex9?7s!^;~7D~`Q@?5DZY(;_J`@fH{E<}GPbYF6AW8N;&J^BI-$%41hC
zsv5-YbfbKX*e&d7Tjy6iM|ahAmVQ=FC{Jb5?JdR{hZ6(`XY)<_55wKn=8lx&Vbd4O
zO!cw~aa_M;OFi~_#xsLmMnu@cprK&|y9R%#fEDcv-*-9wF4=%0h(Fmq%3ce8^%;zP
zl%4y6S1H?9CppgIu~jo`kYgp=BQHJl&IxLJr}sk(pMjoeedANp&c!dkO{%O#qP9J}
z8f1RvYw*Y3gYL&A6DY=FHS~exBXri?WBH}M4nj()opihIqB9|UC_+Vmj8)ILURD@&
zxyo$KodZ2H>qV+_s6X>iETz~TdQ7E4F9x_fe~Z3!xo$B@^7RD*^EaDcve|6lu%x*U
zny*1~JLql)8&w$l>XJ3#t6?)j@4pS3dxDgiur(Bgi-$d-ozXr0ZS_lAapm22<9Ra{
zi_8}Ds^QGpZxZ9Dg9Al%^?5qUIr1|dSG8O16RKyo462BDTU!)I>>Jn1G1SW?ZVCRu
zg?sk5$%valz1{VUZZ;>`%>#HNPcU_3spNBBcT*;$HSi~&opRg<_Et{#^f?~HpYp87
zD0LE|<$wNxcqHS!7CFF6D~@*TDa|>`k1r_G>a~AqJM(ORCcUT6PeRSb_=X?fZJ&=x
zd`-JPrrwb~D|b|Iz$3{&^?q3<*9V`WRP*iKE01r8VciUTo#@Zo%jzbC;<3u&(GCrK
z3Rh*>`=znprz8=8uw}lY-Y2x#?f8--ifowXy?hW^ZlNexrNFtTsZ&Ood>#lXy#l~5
zMWRr#|B#Raw0X6*^D;sRJoYrt`mmVsKL`FXqH<>P3q-T(o$JLKwjRCyF`Dl#xrwg{
zzVDXLeiduzRCAyRe4)<zkKy*Ge3L8SIILo9TO6WdYLC0_-y{e%%z4D0fZ1SS|C${W
zL@LUg60o!VuCXBg$6I83=}j<uWN}v<JJnHrTZ_*j=YtkdW<G9Q0Txp%b_1?m!+F!-
zbZW?@2^P7=k$m0%14tal-uMgq0)uunD5=@=9EpCptD&{(c}VCT!B@zWQ_7Y8N~z(j
zSjm&_FBhek;`Td0|A!1SYe88d*_sr0YD1gSxPq<;eq8gl$y13w0sN2B$nU1RR)qFB
z3Y-S58w2BB`@xGCHSBr(Ku*0pJ^+ou3jLl|iB&tdoaU?&t9ZiFwKnHvmcp)4nh#cR
zi`JIT1Z^JM=z(1gK5D0C$4<xHmO3vssunu?RqA+Am80`h_)O14=KCJq30UrflMC>%
zV?u(vg!1sE=QGH5_0~JjogX<JKO*9J)5N*mnK?fwSNM1sztb8cw~xh``0O9eOw=w+
z)N96In%fH^%eA&vhjSW;5aJJ>j<wtInT<e58y{oXD1}s{|2&eGJ_}hMvehmzE_cX%
z|4DaZo1b62z%nl0_6;B4RL*;&Hrer~w;nf)zarljyBiXi>`Z^D)L;>sAldUzK(=@Q
zo#qEeSa78hxl*~U=?+R6WTCj$GYdP<*flon^xNr&I&IKczw?aGNciud6)%*@5w)c)
z#tCqIWY=v2Pd~m2cmBI3vDr?~(>@=%WbabPiU?<gIJ{ci7IRfMW+Y~_5`#CC!9`ap
zhzI*dw!<QeMT6izk>;}SVE^`d5;3PKEo(wfaO)K2k^*N7?5Oepy~&soBhWr*JuL^k
zjY9DD1~8jFUj{mb7T#VNPywfK$Qfc3H)YJqgBu=Gay;{(^-Sl1!J;z+_A~Loa9`uH
zP#g!{K<T-K<3SuWHY{v|n}FfQGg(U8WJfcP%C5Tl5Et8sCkN6_IK4RZLg;Nq+T2%}
zfG~0;^-1THXs7q0U(8jrmS>_I;$svE&>{8JV{AY6f5ZXJ&)E-Xya#BD{6i~Kku1aZ
z1m*8q+NxPc8%KU}j_RkBOKI~!TV7;+l1H<F3k+6nfX7kIB3YYu>z{y6Y`I`mFp8Ur
z$fR&Y3%cE1iyhnVl#c|G8kI&)jX1%#JNH?itmU1C(RRBs66NK%EutOZ-iN~W_(UH+
z@VURO@7wWfh?oopwo5s+$prWbop6fHj>X&;I+0(ru-9(D#?CYFnsVk3!z4spSCx{m
z0DDiAl016b{)h`{3-|jG^uG_l6+Qq$wtTe69%2FB27a972hAF`CLRQ|{_SK8VNRhn
ze!XI$EvJpE!0e;E4;o5imgHDUbrszZFoO7QX|l|Y%j?9JoX<GRRz0C%x{IWI4Zcw+
zt3l}H0pvM&U@+zkQ+_iyOf{t#G_X{NW)UpJ0r4I*ezAhv^w}+S;KuJAN@t^)s?Wqq
zimD`H7PcE6DzZ&mh|P|}G~bPAnboeCRqe5JEj_xlU@$M;=TNJ}Acel-8WZV&qcRZ9
zgxCL{xdsLOced6JaEtL%+R|p0G{!l-4Wzm)h&IlW-UU-iwvQg*IihCU;0{hw%?Vy$
z@`ZkZYKFAgAm#2dxoeuMB-nPr6I*sZ<JM06n3AM?lgWtV832U%;rQY95rH!e9CvnQ
zEel2QZ$@P512Q#Bh%-=*Efe}1&T%Cp-u}-_5#%Qi{*bmxodn@}8w{9fHxw;w$22u?
z?_ru>#N1O_PiBP>SjT9kvz}K}CMEmkMRm~e2mNDQ;Z)uKKAy4fvg$GVp9%hvDa?}W
z=8ZIc5CX)Gt6<Aj>^ht{1;UkM<zpc7p@_g-5edT!ytV6towq~Il$OXFD_B%7t@J4q
zB5o#H7Ws;t*_LwW?wJP1Gu7;8&6W}BmXYTc9705nA_HXs3rC?Gi=bB8*3Hm%MAB3c
zY0ZB1Y7Vl40=Xj;9LP5?F<PQ3Q_YaC5-;PNs5ct3a0b&{DE~Tbw$dC-^aj;9uTwRt
zwCj6`0aLeVSmlE8<5%p{lKwviDar1{%=m4Rpr-5~XaIClG11|FQHEbA6p=3Y1n^eH
z&YAEX<;O`omT`>ikO~w0s%zyq;XuU4;iK?ncFK+x#zI7s=j9`zBj>x2XV~`Z2K8v4
z=N5L#sTLkWc^v;46%vj`lyy5OD>5}W9-*4h2!We|Ra_X43J;FQHl{K)#E<{(uJtro
zc~;t-`GvzWfuXaE@|oAFNxL&Te@55_^836`%Bw}UAwbEtJ~m`J09mlbkKLmKp<8Lm
zkd-eF%|W$cMz8_GHZ-P<2l)q-Hp-7*K+Rwr=F$@c(lXAN{0Da1hFz@yM{vG8RVkwr
zfl#__d4`<r_B+J0JCWx(c>WvXV{5U0r&+WEw>4(7Aw~|5fkw8l$r7y2MWKD1samc&
ztzEeF@UB^wjBCt-nR&3`p$ho{)7SY$RjzcFmNC_e)w>~T8)RA^WNcvUK!D(>2grt~
zAT-L)22nJM2#}v_3nm4<-4W7h5D|c8!OZyJXE6x1$PO7u<NEIWGT6kV++Mbgw(U1O
zmS<SVa}9IuJSX&@GxyKjKNPn8&h-qg14ItGPzuL?F(Y7?CO*+DmV}&8M(OrI0u#=h
zW6zy4q>jW?*+zt}rwN@9NSieekqHc=+zca^2PVrUO{qg|9g@j;$v&nQr>OBIfOSwH
z;4acx9h%RxXVIeyv?BDv8xX&iDMMibQf*xuWcv>hAH_&O^yIKm3Z8DKgulM?-ve*u
zHx2()|F@5Th2ZaM5J!nnE=L(aThM>Z;LPT6%~<5jBk0%o1$E$n7H7t>)ML*>EOyP-
z%Q(k;d>-+XdykKKh~c5~^=las!AaUBovM{*OS^t;vIAnD0lm_if#mbGJj&gwKq&H!
z5ZnEy4>{5s7HJ~Q`l<oDlQPB}TFXK9azqn(p%l7M>=~}%zmzzjPK5`b$*xs#lo%-E
zOA%ZBj~Pd-8T-snSPuOYHJ^ki^l9ob;~eLx0dytf$gZ`|hobqL<b+Oe?<rb1Yd6qq
zH?Y^v>#*o-X{Yy6(+?9)1EyBdux@b*1|wONzZ>~%>M;a<{`7JM43YFHlb~6gSNh`t
z?Ugdz?YQxDTcY8CSm0SKU5Etr1pzQJpbHunDYyN{%vw0n4B6q0?8QQEzvGQ00A<gR
z;c3pXQuf+6LfrXo8LV;`tU{!<YyJBA)$+B~^4YTTI_2hT$^{G$2up^p2+^-kO83pl
zyJ0*?7@uWPP9{Bhg!OeFf@=~q6`*MxVkIPLhNRyRsFD|e7hvA5jA(nJh5WvZC$J+-
zUNaRU4I=x*MfQ;s2(A&n9D`Nmvw=KHb>R9pv&dBj12G>{BU-k;zG@zfY36Ub8-fH-
ztYgsPH$?s09CD}%ob7b-sZzOCQH~zY%zPK7OvYL}*VI7?w&W;}QFzPZ4l0lFbHUZ!
z?TC0F$sM6=7ZCVAv|u*>`^Rh%i2dD!`nUC-MiK}}Ych_-K@u~dq+K53&VS3`>$Ki@
zZ1#SHAmEVFY?)GB6WDO~PkpfV`|JZLq0R2M2FOL;^O1s$My0H^bKvA0n{A;+PoxDo
ziVc*3BIPk#kWVb4Hv!7Md<YeaT&Xlu0ji{-$)9t0ku>7_{aj=XLW|G9Q_Rg9Nv#Kr
zssus;5j;%dZ=wJdN^C01>&k0)RunKnPDhag#n>`t-$><ClPnJB*;Yg0<U_(it+8G{
zd9BBx0lS0*Wx?vfn%D<ju@BTkf+LxHc3^|JzPOxY5MCCCIL)?69gq3gxAnDcL^nJ;
z91%&lu#T~g!Mu$SMPeU~3w)EwdRz{T>e+qjA%Om$gW!HQ_eL12uMaT=$SxVez+|?p
zxgg<2CgsO}TPDC@RTiF{QpcyH9H*qT%WEg!SdoxxAV*KY@w@CHGyq+Z`zfJ`0s8?z
zA`0}Kow`8nQ#An@xbAwx-<8IdQcl|S5n=py`R`Ji`0pyseqhV2ytbnG8tMlbk@25_
zD=2Hyf3|(=Pa{DrveyO10-$)(1EDCo()4gLG8k|l2D{4#gS}Fk&E~<C*OuQtaI$00
z|15HB@<W8S9PH|)Uz_es{*DsafrQ;35h6&CaF~44;44$_!PeLCJgPLyP-;-2_mn9&
z)#m=l0;1sYd%D2WUz@lf=7gnwqzC|91A@kTRL5E5N`nC(?dlLezFRV`+M{~+LjuV+
z0+a2>yd0=j&qzNHAsP(hfR(Vb(knlN|Lom3dloqq3ic2r@B3|S*Jld{2vu8;kl7<?
zKQKK~K6{79mfl?kCr1@@Ob!kX9)<lr>hFG^{P%0qH}=6O>||w9i!*gf%+3o@&;UP9
zB#*5b0KX9u$ah=DRj<kP2ymQ7Coa?Y5{%V}@Rhv*WszL~V~hv=+H@3&sjuw>i@wHA
z5|WiWRiD5tS$yS>krdzvB$s^ytyPSp<XcisV*|fg)s(KE`DZW%IBgho-a%%SU6n#E
z05}d+aAcOM?5YW13Lnr0+T1cwRF!a)4@RO7lsE7J{DSMu=$-luyIR=gPz83At1E9m
zdjMSs51&0lfB>QkyWdp}B<Z61B^>5MKniAhes*l2Qq4Wtp59ZbN{2&KJ$k2Ve<ySu
z1q#T9S8!K9mwrzYa@60mlmzU6bmzA)f0v&I_^PCifQtFd_MP5(SS1-G0QV=s5rIE?
z5dMG!;4D@I!1WjYH!erg4<r<~^VEV!90__5yZuv!yW!jdByK&T)ZnLPpRAp%k}QXu
zMfIcSawWY2IdKB1Lo(h6eMc(y2sfM9ocqH%@QO%r4AC|=fe_e25Dy$ghUBZX^AmyK
z&k>T<-uK9SI|}5ICn1U}EiKibN6hh$+P?p-xqqTeMCX3ju-L^mWK8fsPO~+B84y#3
zh<R#>K=#}F{(s~F$E*Mcp{C-G$b*D10?`$=s_-CXu`<L)yMvIrSWiMCgr!u!IH*8|
zI5iL|p?m>pv7MKl2kd@Q|K82syaYw>bUnQAGs?ONJHcV+H$l+m`!^?%Wi?}n_TzFO
zx<X(V!dxWcEd-fE76So3tGr>G>XS}H*8bjKfOTLYNab7MGIUM(YPpgBfAS_|R7615
zzg5T+0ah{$3&!#%dq->rs-;NLl<Ft)0fIS)AgF3w(P8tCUCsW`LXqSCwFxN(vNhrV
zut2g5;Q_r94*vNARY;-<(IcDY3^qF;U@tVzHO{n#LKn!Tpcfbbr#S%Oy#<g=>^sE>
z7XH})-9i4V@_&?`o#Op2Kp;guZ-_qIq<1+Zk@J7crAS_@gjA?1Rbf3BI%t3Y0mCA6
z=E7cFq}Bzahb%;2>9+-@|7Q1pt%_|}2x}aWnjzAust2y|yK2bB5+uU_+Cc)|Vs2i*
zLWD1Hll1ezKUaXcfO@cV2R$KRkj1aIP3nT1HgEpxZ+LM0z3DIb-n2>ZFQLtU3kdI$
z#qRspmc!r_ryR~s#O=J{7PPwk{(z`o!<)GN`unfH^#7W!&=ii+_C~ckx;Uj6Y9zk&
z@aDWe|9k^uJFaM%Cl}l)`i5E_NWEcF6H0x|n5Gxc2-B^p+8zwN$MF<<4YHZqeN@K2
zl-YoEx^<Mcr)?tv6{umx+Jhy9v+{7k<}cFDQ-g6hG){vjOBFk>i3=w7DVkMIdnR_1
zy0WCd!bNcB#k$$Q3hMM=My+$QjnH!HSk|6@V`X_RV3%bhHz%c+BC(1A*MhUPIoc`3
zU4yIZRYg0{fuBkL&z)+xu@2r#9N0Up+h>%RClqYnucDUwn#3GHJEj=+dSRF4VrPV}
zTN5>frNs7_6iO8PiHS2FxmUvom>ChVxtc%?E|w~m<atcnV>-Rqdh?qsG)^6jYxB@8
z6AJF=SN!WNli4H@*TtKzY9R_^qr~46a#3ev_axN)kmZ`tB)-rj<LGbO{AeHcOQt&W
zz2WaO=6<1R{zB36`W;Uu3+*(e#S>;mLuuoY@pE011*x4uf;7Plu^~z!NB}=0Tx@Sn
zg!aw9iJlN&rNO7oU^1OIhuqcCwkd{F$^0I+AQST^#&Sa>Qet<Ld+TuVsCBNkyGw1G
zmx(8%!9uvyI#-h`8pDtS+MnO?Ocqnc<~0(2Z0D-b_Lxa8wJo&UW{UB~_?b&g`qAPZ
z;N^;EfFP>2F=rnkbqe@p|AseQH#JEZc@r~}e6gW8#V8}iUR@Ongp!2IIHrZ^N4@WX
zM7ajgw$+TfVG=?Ua6G?{ilXMim;2L3TWbMiP~&?bOEkz|ZbXjFM;<Sy8k8UvMezff
zW}>C$j<avHMV9pu+k-ipyFX3lC5SVY0&bWzb#ZtK-??&vtD-$X5@a1^ceaaKX;LFm
z?aDK^fq|1tiT#RZ6TACC=Rnr?`L@=Huc=t)=I8D+QJqkfj(2JTSqqjQC(OX7>7H~@
z0d5{I+@zmirAeV%mh_iWYa;Mo6w${Nqf}D7F0~zbXH;znp)y-lm#T@d)N1??{7Nl1
zAqd)`E-2ao1~HFUZ#YfcT3=J--i;y1Z|ithcv%KzU&mR>^MT{Ehe?w}Ny1FcvRnx_
zLZXsmdE+MzPmG^r+iAFVgk^-1F`ry8=uJ{^(_Teoi3H_<ImSaTTQ^SR?LI}z@`MM;
zaKQ?RxMVTupXM<sU|~dU;|t+~V5eLxU_HzfEMPjlR4uE!CQyBk6Ja<OMC@qzhRPO%
zm^krq*Je7Xw?w>lTz3O+1GjYVOM>e08uu4&>2h+`n!5$8?KtVyFKi3jkB;`iQM-sa
zM(a>>CCaoA9vh4luK5&#;z)YT2uB(CHxfbYWH7&;ty|9~u#%9sivxuJbBCZBh;THp
zbx3^Tc@iiT5p*YWn!wf)EuJhyDpYL_p!H~B7U;4)%mC;Wv`40DZQg#7fR;lvnAsI<
z3$W3_@T^0j1akvN<jPRmo}Bf9m`Q8bkCu;P)YWbrZwg4_?pLvS3|g8V1t`#FOS9;B
zT~A8`#bC%@u{s-TDT+)am<;%pDfXtzyaVIcA<^cyL+zgUTDoQjSS12&$zHgpJq}V1
zQiiSK?RrUUXu{{=?qTP;Xt93O%H!2t{9%9I#e&wfc?AlVn|LPF>WC1*GI8ex?s#~Z
zcmUbSyv879#MA-Sm`qaQFk)4<`1J?s+v{*MV1;t#i8#hspFLs(mJ^Db=_q#%vzLHn
z_Rlq^Bl9c(0)Urb5@OvRfUFKVDQ0L*wR^M1h(#mJ6q)uU!}1Q=={|2bb^#C(QPUaW
z#JD=t|DXe)Gbl+$dTb_JpA7+Xr*jlHgO;ht0)UaasHrQ)=8yB#NiJ9fKM+zID`@Dw
zAzO0EL%Ct9p2T>Y2a$9YYYrekK++p!cgA-w23Qf8Epwf5?=1p0Z2>e-i)62hs(_<q
z$`Wz$Sjw$3)Ds}bGt6nSo?2;A(RsWY_(=oR1YcnnJlND}QW5wx`P^XfA5=*^A%<v1
zca3|iAYxxsZTD%<<ZJ*6wOS<vz}R?Jh`O4K3cq2cE@WjGalpjH^=r6FI>IN=uUt)0
zF`%CXUNnuT<!tuLSlbD<RLQt#u{lyAOUvx#Ue4>`4~zZWEyaCdHW@pN5R!kx!O#M+
zA3<lc>!7;F!Jw=S0pLi0*^2l)Ek)E0BSigBS!&I|z8<;rV!d8YO@UL5CQcbjwzuX;
zL}pq<j{=pbP@z{W{0Z&&UMrC$zVXjJRoy<rV9+nn4$!Z&6KNWJ_8N(x>XGR~BA|G1
zP0da&7i@>G7S{kASKlhWIuKn-JHxgEvpl);KqNwr8B5hELW4aa^A}38{_Rc>p(4tc
z%zyUjE(C91DD8<i!Fz$tO(it2l`pOjQ3O(#e-bE@=eEQGI2GG~T4__ku?|YN`MgM8
z7x?j}uB{j`qE4{x`$IeSI5oLZf)Qbt27p3wa@MH=99ui2*7Ir0Tqiz;Nf5zS3SHx!
zY9wL-M*$IZnQc+aMQq52|GI623RKtPVrlV^2;#BUVBjEeh$XP38bCC}VOF;x22Iuy
zSsn!7&ke*$Ga=+CwY>!#Mf8tRtKv<>tl!u!Ri|P8byq=XlE{DMnBL^8g+Vy0iceRt
zce&tH6FAkCy$73EVT4?t*so-*E2bttIfb^Jgn%P5#e%I~_!*JiFF+9iJ39g7Nd#%;
zZ@CHuCoQZXK#$<(9;XPdLbf-yb$Kv{@Ejrlr^Yu)Eudf-0?jD*Nw4G8D-|Hl$K`j}
zK*rkR=V7k*(XxL;-Lb%)`x}QPjNmat^V}vnM6FOjg=MKCO2YQi>WO*i#0eF(oGx}2
zAQttQQTNeM69i$FCrmcRv@fAS(1_0ia0Hm4f%Ve^gkz!owL9XNyGVo~fCFSg?R&Do
zVeQc3;b&tb8GE+fsm6V(9V@E1InMZbmoQcDlV$%d=D=6ND4{|`2@xeVi)(4_nEO*;
zmlIJu2^k%1#-9F$e8?OW32}ZTf{eY0<azkh+<me<-XMB}2Lotat2pC+i<6=S_j5)3
zxRP4_3Peo6$iUX=!Zsi%AoC3cAg?Q1)hQfJ0u)q{4TeC;#KS|k(y`ExzB=rcyT#;o
zm5dlMMn4EhfXVRtwX{Q+Vk(l6_JFqrl?}#;%$qT=&x1g0KhIX0qa~y!30N(2-U6{B
z0{fV0;S$W495@j<b%+cA%-$fdE*IQ`d!Xu>4BFc`4M8BMaleogDVaCiv5<BKIMEh^
zb{L46v$+>}KX?5-B9N{u$!&b<iDQ~cq5_TZL0GOzz1xmWb8MAHI0I;cgg<p}NcTZ!
z3PI7u)cV;_#dcyl4yl@W`0ar3$Bzv@pc}{B!B-i_>sH#*wj~#mND$1SvNRNZS8aWB
z=BX94Eh~y|hOHf;K&-kWs%50Fx9Z^rdF0XAt{r=TaalT|(Xlgd;f`ZEbM3gNWC*Ve
zCoO|PA@QRDpaqhi9BTR9;8!X-1L3;Mj$lB5RhHMm!r{V&5P5*r06#rOZ4Ci8#Z(bb
z8pqvsLe--~Z(+N-RIP@t(`vnDr^s%_z|Vo^5>SjbAx!t){;FS9Q2b&tX6BJYp4IW-
z&+92-dydzKUu1QOrG1bMT+|c+&xS<gDtoR8W@IDrSQjs0+7K}Lzos%2lnQ#nldbAP
z2N?mxgF=XX@;Z+2nco9QJ+I_=0>mSj>o&j7vBIAI)_nCmuqC%*mhr$)#g@k1ui1l(
zGp^ecBsn#ttFHKRWAFE{;QjiRUHla(zU#vG&vu!+_tlZJ7f@hJe0)!0ppM%qtu5XK
zf-_2OLJaz=W)DCh5;;6Ee$nnUiG=w`{PPBo4?iOr2o!*Ybn%AMOSm6bxMpFq(6V!}
zj)fV*pZ4u%j;K4lq{wh2Wk7its)3!N*x9b$D%#H%8XD+(a^cvlJx&3ibVwkn5hYxV
zq<O!REN}Q=6Z1G2D{sx2e5S2E+fP7fo?JNZ{y|nEj@eC$cM89-o9#D6#JUQz_8`%N
zU#606IjGCiE-_R_`lo&S-XWKkUZT7(6f`2yjvjH1IEmT#XC3|IZJ0QdNt<=W5K``~
zSM5-Bnp08=$P_5MfXz}xuA7B&e<O-G5CCLrb0YXB_oqD&EsIG{BSEmz(F*{%5IOS)
zI~LkUzxgDDGhfXSKbKo@TYod--n5Hf$ZikP!|bD|oE!y$491h}s#tmX%&JV)*AwIX
z&=qph^qrUMAu-ADmrm8Ab8;p4Jz2+V5K$wS=r)WY^Pv;LJt4Y3)kV#9ql9H3V78gQ
z!wR(D{b@q8ilgD%3k8>=;=kvveOZ{_>b6Gl@0cM~T|<BTk}W*C#$XJt`9E6SwP7<`
zw|3n9yjFd~B12b8eSj8d>y~+^cP8X~`xmK3*BcY4OV}3-?tuFjhPmEi1_n~}-b;M@
zFw7&Ca?k(4vj-fqc`IPV2<9KJUK50T4}cbQju)oS1|?RZA;2OS7Q&ng`%?V+YhJDq
z^}VhU!_*FB)kc=-6ye`nWj9!#mDaa`a<CV(^&KlK`@vhy(DD+0bw-O6L`+XpoT+WJ
zbNF<Jwc)C7^@CEfmbgaSyQN_I(b1|hiMxbhtK;4#Uh3=OeuN5s8SmSqDGI?vk$Nj0
z1g8HVLbUcA8+ydlo+D8*IM@t<xO*t~sboll=aMp19Lt-XKr7tRylfskZoS<7;L>Wa
zl5L^Exl2e@YchK3`kd!L#gE1a-7fP>T4gOAoTF=$vesF8lZ3O=^q8d$^k!s*Zs=uc
zhe7K+;jd~Zzi6nl7z+{7`M0thPzGPaXkqr0evQwp_Vc~nGRDhc`gWyXK1Y~j^A(R@
zNy*-^_bzb=99AghO^-Y$`qw6-w25~QyFDS#4FV&h1Vc^$NW{rzWHv%`CP;XPk$49)
zcXd#l+UNmNex8)6gk<K12`Ky8i{OguW_!Q;H|D)_G#Y;4YHb9!1y8z_mBe3UbSz(~
z{IHzUFHVe^jVz6<Iua77ch5!Fr`5)^-lXsTdihWXN@jAVzU$wKk(Hr;lSIV=R`+68
zK=Gp%Aou}rfkbu=i4ADm5)H-X*r*pyrwhdO>#gwenvLKhE`7s*+W<d<xElA_PMu5z
z)Cz|DBwm)MKkuge<Yap4eX*FHzQOhNo0k<dq%5zH5U6?X@|sonlrmU)h45?Bg@d%@
zjt&xetBkw;Ad`xi6ae7c5(^Oo)d;FiHEwgUawQh&pRPYn`J(u$ASzt1*s+s)rmNQi
zL|R-q9Zg?8xQypJbsx%g9h^n<%j?XI7by{YBrBZ{nFqE~&b;$$qd9dju%o2xv|Tx~
zNIC|wF+gXbAy{20?rA)Bo|^qIX7fMY1+I~M^={n%R8|(Gb};bg7N;Iu*-g>t5{nM3
z+%Q+v1%YN6JWu2lGPB9(KJ-jp(GXOYnm!V6jk?8mJTztb&yCD^ytvv4LV_UW%^VUq
zJcY8$w6R5|%AQhemZF^b>fM}A3a(Eg-ho*}-ikPO=}k|-ATejbuiH~Kk5@t8V^wj+
z3+okj$?XHn*0I9QjELTtqh$&_;C_qpjY+dMO5-sQzCXXZQls?h<@=6#o!T~!4boMu
zVHI7feFDlb4!@@nY!Sg?i$uejf-6MwXU{psH!K(22Us4Zr5>+`v>law#PwodC)%>B
zhKjPrjZQLIFZ0Y2=K7pe94iE|_47l*QZ{tCe*&G&dXP&#9*t<mwCb8U=nY$X_XqVC
z?UoDL19hI?lCoq=isB*5Wo#ZD@l!#kBfGlbqG22#E^eFXZp8oyzhO(!r0QDjmwS@y
z%SX0ls$3L%6Kly+saRs}yH`=RgTr@p$meZD22>*wru8UyS-Ivy?BEW;6vH@VChTi0
zqm^*0-+ps&R?xm=8zfEbwuSa3X5dqvmLocG;*Q~t;}@o*z1TVts<tztSwlm!w{E#E
zm$F6OXCI3+^)Kk*)9c}m@u4ZjT^H-bLD`*}+(!yUVe)o76(oYHW%{Qj^d;Pi@F&-9
z!b}Bt`^S}Vg$|f-W{ya*XYG#bcLKrUQXADLAzKdi+3>n_+WvB|B~Df_mas>ci$%=j
zBzb<y;ur<w$zh|Tsta;~^4L8UX%Rm$!620JFEHlq)wepmZA!a2Ejo^g%nv0RF2BxB
zPqQ}MUti=vy|`EU7Nvi7=HnD?YW+g1&l@fX#v$sPCWy1glra>vKV>*<{*Bjcx@*wp
z>4$;rg40rolw{*m6^8V*h>P;YY&(qlI&L7J3{|)Xh-p>Wh138RRk!P=Cbo5Qf8z}c
zToGRQ&SyW>)#Ao58lqfoPEVify)!zyt;IeLzt;uH3?{X9)r+4&Z^VFALZrY;7!p+h
z&eM0eh__=&o#q984>Zw5dtJ>}gH`M;n8gcPYKp&iWCf7ADleyR1e@zcT>Bn;WLt*H
z5&T{gUUK_RbD7p#tuUVZ(|D*ZWJ1*@7NT#DT#Vt4QW%slYbXHh`Z`%~A=Vb$%r>CC
zywNjZKrf>6`&UkwVy&ZzZgC<uVe?$~fpp0$ZlL~q4M^1>P+aQ}SA~6v#aG#27zjwD
zfNy8#?(F?jNbySp;v0rqYOJjP18&99BLg6PK-Ts>w;wLeDd>bPjZ{XS*tRWW-<SHU
zS6V$FxQesL+(B;#kArKKW*Q14CFZEe(N$!5o+Hv|^S}dsLB<5}GlcNSy1!O;V0QEb
zxk+){mUKNo_shbEF}+VdUlyG%y|dXnY;pnw(k{!UGSM{|hG>=U^<d8v;uz3ryeyZY
zK-_)aT%aDplBPf;zd+WUB-&0(LU{#+`Jp4;?ul96=$*q~99qkn={d<yBS`D*mC+f~
zuO~pv0`3puTw@DSfw&nYVrd-`RkB6a=}8mpO8_o`HgM&DuMvoq<tZT{Ko9XZ<h~xg
z_v-oh7;eiC-hMXMRsT@xwnn8fP8NjdqbYfd>tAcYOh9t2GKRnefw-55yu?=x1;Omq
zAx{BeA^b!@2vK@uDzUQXga~?H?oI|eL9ByBSrFy>DwbaU^m8NOO<4cPYny^3ip~sS
zl4g-95I6lh#1a!<gHLj~rVk-06niXCJP_?RQ9*k;{1;-i_Qj_6*$SfKc!F)rVUg>%
zM;zwwhb7-zR%BH1d|I-bBlN7vFxL@>0sth-(}zf{l|6d6FZu=0hgdhliHCoIP|5&H
zLE(<xisUm}n(eh;)$&Mgk=mfVi`X+HwgAS%hQGw}*u7Q&^aL4;9Tqz(6!cnPq7OAh
z1s#-T3r;=U79RX42>ZHF;6bs?f`SRKNEJMe9?S<}2_keXDMHCLBhAC@i)Dl=P~<rv
z9j3>4H`Jo{KKyGhB_(mA?Q!$lIZvnwxRJsO5sjDu){8S{%oR*zRM()CmW2fai^z~U
z=Nz%!%BlY|{_d5(vH~dSz4uzbqX@5oRrtMDY#SgEJ{qokj_8hb`Ca{mViE+h`4uAz
z&;wgqx9m0Ls499d#&CYYby&ve=2!7|);hv#7g>y-n6?R(i@nww2dUe3G^JD*ytbqi
z0+WFMd#xxXq{wIxL|EPEdd`oAZBP$@)C=@=La{XLz0Cdm#RvS4s#GFQ_BR}T;ax`h
zIWeQ&Lq+w*e7y35^vaT2ADMnzv)yi0uV_XiGW*x2G~N9h;!6*Y@giosjA+gSgi&*A
zM=SFCK7*MSf|(-1QE_x3V7~U64lVpth$#6?x%;m0r-^n=nWk4|WJ5)KX})OofOMnY
z0cKYTOuq}PP5<l)u&(YaZdfmb3$PQEXtuz#Mc|=x#EMH~K_P|pu{}SMYh&+B!wKA?
zrLqfQ!k<(WG7Ex}x&B~oKCABwDdHUH?8WE{>o{HB`zvpCe%!Z!#;jJi^{px-Qhk0_
zl$EGsqcWPp2@}2wh@x>B?x-fnJj|=ZqNj4&^-8e|?Vi&%=e(tO#vguqky8I_ll7~C
z)^zc?(-G2l`kywShutQ8W#+}#o`XeB1nv6{A_7k64z4NQ^8BO=>-C8)zJBj!u>JjA
z_hl+(PtNG{M&|Ahq!m57nUGQkpG4Fe0PkH5$s;T`=W;9J;2`Wlf;t!0m4EbFzRFLV
z6W6S>@*8Uh7E@$O*YwMuveq7G_Py-ljT~{CxU8Q5I0thsjhh?X&^6-E2Jl1B*H8dz
zGcSH^@@S2XSfPaIx?YG{pI%v$_`acc^l|@&%Tb&5eWz!89v08qyz~F3pE3wa{**-c
zc90Z#LiD$R0qz)<7*Cu3e5kmQ{%*wj-628k!M5Bf=(;+&WW9BEP1D!!sjOakc4PL7
z)29jkyLx9d>c@u&j|xoStgdrqGSw##BWT`HM_3iINz*$4%-Il8E9?Ip@vhaxPEWU8
z%UazB{ng5Aa_x3i@9bw%-Lk$7t6&M&Y8`&H$uqmpvtueGVr5PLI%77tmepymSG1h3
zw&!?YWd6>X-g)tj;Js%Va~M$N8*_|%h=mfQzf7C24u@YH4!^v|c1$8nJ@%3Jz6Tfg
zo!tBB`I=2t|BDx0rVb0<Uw>_~`FU{0ea$0gS`N2HL(3@|=^kIC9h9k@aVxpGE_-2w
zUuUM5iindfQ~jj$PoMjdYfvue4sQ5<TD)u2iTZlQrX)VEdiD1Fbjj>Q#@K;qefu?9
z<Of!Sbs1~wj8*lQhqOyyoz|S%^<&dz6i24KPXp!w8Y9D|qrY>{nFQ!)t@JnQPWDbm
zQh2MMM1GjPVqCJ^M|M6LS=Oj;RYh}=G=I)w^yu}==*;}uqzq<!fidr0hUR~q17l#!
z^<o7VheG##S)kkLm(R>vdR9<E_3nLKTDwn>blX!wUia~vHGMuI;cDJ>aPgCj`{iD%
z4`~mt<}H1BSn#>P7$gMBJNltaoj>1Dpn0PA*2ArPw@60{OC4YQiMx^xXSa`3L~MwE
zX^b!1(KpkhS@-pRz%5jpTFsY-!t20}!9uQ+f9ZJn&g)<E9A)%&xqX#rwykCktfibd
zJDj#c(P4a99z>Y<hB8{_PdZT0^6=LtiSdgCTl6B@zP*!qAs4*FqTMfWS#v#Unt+Zt
z693@-rFXwJX)18e1K%#{s!vj$=>6J+%8ud3-v5UE0;e5!K7aY5RkHT5zU|r@sdJ^J
z!tbicm(=Eet~0(w6DnXz4;8{9CoeMyHG^}SU*W^s$@#}FM!Q{_>1v_myuB>`Qvw0?
zwJ;BgKCWF$l8lsm*=e#CSJzm5!{`23@60b=A(U}~c(+!%%o`P0YW81IZy`+f_vJ1)
zsMgwAt0#QMwJJT$@tx8gU8i3;N44qhJtWTftR;TA6IjY+C^l^<C~b3xQL8{`89$aW
z(xKJ;1lxH&P6nHs-C?e)l@lqvs`oBNEvrxFFX;o!P7VY=<CeZlT#03*&wrCdbPpj4
z{5)G<*2R|^5n-_<hWsh(LF-3m{||+O>*sKk<`E|I6TkP$w@b^4EhC{{KCXg_A!%A8
zqkRbQ6w1Jr@Zq!n`}tVekPaQ+pTa<6^P){a#82t4Q%D@f4m83d!_YOlq2Gqhx>n%&
zf5`aXmv|89iV{A(A48pFFvhTx>*3~I-b;1;(y`z6Hz;a3G`fPvxgdz`r=%3OBZo|8
z!5R~y21u;)XT)r9Jt#J9;4y35J#uH#EH6_h77LnIR?<0IqfZ&C)Cle~ZSA!TleV%c
z=`~Ty8VctPuF7oeD&ya29;Ku2*A5tsg;hP?KZd$io36E=`9pCb;t?0csHN)bv5$n~
zja_}@2iDxr=YRbEAf=_|zlOaQ2!DTN+j_w{-|Xn{e^>oUIgBCF6;bJYS5lZ(uxZTp
ziH?=;=D2jU5&g=R0!-*iSD}C7Nm1zxPa&HkY4Qod(bg+X@D~c^`?=pnVD?^Hr%sIM
zB`oz#ca%*QnCS9ep=RSl_q~%d|9-GL@w0ERjs1}5_jgUwx;I)?<cbaKWiMN<4PKGE
z9HzM@_@iUGt@ScdaZ>tw8mOA$rH^<6eO(!%+YjP$z_R`q#Uf#Tov9zh&(?jPCPJr4
z5SC7W&*`)zp_`)Ar*AcV&;215;eUmyN7jplCdpygeP14)WENoNrGIKGhKhG(LC9!>
zPi*HBXH4tP*I$0=YIA2ay<cD~xgl=2?Mb}l(GDzj@J3tVAw0gjND@cOq3N6QZNw=K
zCE7oy)QO~%UY}^jV!u2r`>fd8YCT6lahMC?VM_xEuQs?!5MRkFy7V2&#q*a1`(=dn
z>Zohj!9e}$$)L$VEwe!9%jC<!?t~8!Hj_3~o-xG=o<b54<&FcFncqzqK9E;5&PIym
zz|W?X76rCJ{9k?jt@&+?p0!73QXd*qypTvM!VJ%Zg2WX;s1hJ$Rm4I}?A}e3+Ja*2
zeUE1U@uN*19XK3@FhlsRh5lUr&gEOdxySA%<~pX&I%LvJK2{-bP$D}I<S20Lb!RN8
zgHji*=rKk@u|L9(exojxpRk083>h2p&iCFO6iPH9>hb7#O-a73JN4pfMKY<PX|+cn
zGgOwx6lX$SWp1uydm}^1vCw$3LQ^j8)NS_%oh?YxZdiR}8~gyd_3q74qAIdi3a=FM
zcs{(d1Z_iX(hdgq=-v}1-<y{Yc~pD#(Ga6*gBAua1uFsG8#FkYaz!)nXOHBgbxHLN
z+V3w#?kDG4TDS5k!gH(GR_U#hBGGi^t&)=G16s_KH;ZtcjG7I_E`8bST_@cQOR@y<
zpI%^QRga8x@_If5HNA`cdG&|BLkop+H5|5jAb-H98=_2kcS!52u@>DXMxWmytnfd-
z@}J(cgOTO}NLqr99Yg;+s@}IzCK1Im>gNcl0|b9~B*ZU&s6`p-NLYfc6^6?vk4EHo
z8p~15kL{MnDN`-Us^o)Y6t+J{a4>PW?fvmCO$sL+udFCUA6hpZ5U}i6e^lG_Ym<BT
zEpKUWG4F4mucTl$RC8uLqwGsC#TiQWkQE~}8*ag5K|8pZ%cE<(EhRr9Be;M9B=mvz
zkQV?kTP6KdOKP0g?~6}uIo8s(74~*_kn3|#n|Dz=sF#y11#jF5KlO9blQcEXCpmiU
z-&Ny?{YZ|NAV~`hcpu<({=<f(7TmwL#e0i~k6__eX%07{ov1*OkBB*g$RL_2b6O;E
zZjPzG(~Gh8Z<TKrv@dS4r+>enqDl?j%bCne35!)ry<?0=0K0iz_-`chWOl*2!la@c
z0)fXPu=k|<ny2%#E(s0qdQ6Z+xs|Ob@=w?EpM9dDR$!dSGSTjnHlqb8$Q=}X*D)9?
z8;()SdP5#r(K$D~-HnRzFmZ7_#sfQeBozf=$>XSZ-S?9mQy5Q0S!B-xq&@2^fVb>u
zTKAocqKDcjLApD_k~r;RvV>V?m>g49kmMp+?$dl)@H%OO+22-S={@IJNZROl(YaM{
zGMxTEX#qdAMc<Bg1uf-|)Bi~o-pGiqsaxUAv*fdcwW9mKHW`0d6YqgmwC~n+q{!`#
z`1a?>;$?kSUd}4A7>Ntm(b=(2jc$T_n#c?{Es~A}AGtQzF&y>|e@-vfdYYO(NQ@B1
zT*S@yYjt-Ngks|w8q+w;wJZfQI-JrQ6;u}-ea=B+&sP2EIz@~t_k#5?-*4ECbS%cw
zK*(DBz31{>I8VZ}EI&7Novg=5ulFZL)5X5cT8eL2pf#DXE<!<VlWkLNP(>i*yw~z*
zyfWnfYg6rKXVZJCPLbKKS?$lgmarYEx;1It9$`wqS7hgY8saTO+F=pdNNpOYc*{iJ
z5ce@nk#1tHD_}`gu*IL_=pftpq~v$i#1LvGybQ81#)k}qI>b5;<hf2BioU0bs>rlD
zc;f=K9pj0Ty55QF`j%tj1SiJ`nK&1O4mW;wD}6+CwC0`2k+VY)R(G%J`%4v9Txv@(
zeAkyH-kXD4b1D$>M4d7TSe3zFRJ6)e_=iX{W2LFb)aS*qR_88!bj^mf2GrH7j&c{G
zQpDeP2Y!XcGg$dml%eJ~;xJ999UpVhB^2LiZ49lCd_+-bmuF*IkcoCe8g@GE7%F96
zK`}<j-Bea+&Brri+^yow*tzn>Mc?;7=5c{dJ5d!e`<Jc{(O&9^`+2N?%F5qoV)wUt
ze^abArqBSFNL82I<x_9|<IX3{%A$2KVb~H!+2`bO8#8Nif_Sca{lc_~HWyvR(P^W*
zez~}7X5!Z-?%nx%W?kztU+;A-MD{j;x+)J*F@Azr#WUH>(cxE{g{79zdmEoyro#3y
z!H>wwUdQ9x?Up>jd+rJ5#uH{wXbHn@$Cuuo>f!1v)f(}A*8vB&k#KV6C?PD$a9>_=
zGq!U?!8>|CQv-+h6YoMp-Hfq~)YYOn*&T>_uaiz${+IZ|bP0WA%Sz(GOA6R@B~#qN
zjFhX2nz<S}24xw`2p{r@&pYboh-uu!oc)VEicOk?>`VJ@Cn|8o+=)q$3@`YZ*u%wy
zqSZ95l+W@|+eRWQQNy=jNz5q=t@c9<XK$M`l*jBmm12*J{IVhO&PF<5n3v?SXyT<s
z&90&G;ewO6u88X8;|S&WH3!~a4tGN1G4aVuBT8OQ=*_$(V*9!-FL|6YB`BvWr*Frb
zgnM$hhbo{ny9LwGwx7*+T4OOYx8<uwTMt|kNSt%tZh15sm*sB#{iCv42ggiz=ziKI
zg+sy$rS`sEG4Tp`OS(ErJA%1*A%;oWN<Gsda0T5m;qR6^Yh4g?$UabfDLSMkCR<p!
z-7=^G?suBaVXj2Gr7zDFXQt^DDC@T~Ay7Z{Ym<;i*Gvdje(XmgOUK68yk7ycU@)43
zH>vR{xL8%(L42I+VIj^;mt+?BYQk#zW-9L$`S?PzD<#_fDL=>67!%Z7N4$xW56$1R
zH1Ry)+Vr9;_Y>Yialt+<7HLBLAQySk#%-ROZ|_!dPQm$H3z;j5st_<3*p2(y!H`Uh
z_J~6HI58w7`zUD|Xnl^v=xU5-MoWB=@a{W#4aX&dFtbIHH|q}O`dD@d5Es0jX%1s4
zO=Rq5@12S>L)vB)PkNV_&!hKK#dCS1xridLSFgfB%EXz^EG8SZXgSlHuFBPJrdU)>
z#?^)n!SQ(!%$JM>s6X_Irz;tHbdabzpp(4eHEVOWwiCM-U&uu$xLw6|P-m=7v}4DZ
zo^h6DZ!PPv1NymHSNA;)_EhRZ+w8Z-=86lBT+%=ZC9>qup0(;PJpD`x$>%)O%EbKK
z6VtgB#2Y<YvT(k4XBIu<NWrfhTg20g2}y5F6@wmbFwr=Lt$$1M2!&XNkdIp*w+_nb
zRdCC*_9y!%vY52bX=c)0ELarJd{ZRlaU%7>LnqX!OP{TGKV~w$P?kFqKbsUSn%Io6
zXxl_jZsk}z<R4^$dSr^$QbZp*CM>3u_||fTp-uf~2Y!NZP!LDR$myDncIRDg1Fu*~
z(5X9kOcQObU8)*@7B`Z?w~5Y}k|FYOsZ%qOWcKixX<diCiS9v?R9bf0XIE?J=Oue?
za^a#*-bVUx$u^#|izdY_<R;Xk)017o2lWeIb!g^urS%DzsOy=Y<nST|R<}D<Gv-{G
zg_@$Pwf`~;Tu|8VbGJ?nFnsoxRcU$^%U+GZd3bV2920z3){&KtdlI0NGYM?G5XDn*
z1~NKHJ|2TmtzDBbSpe$n8{yt-ng2hk-UJY;^^G6zmLw$GWJ{JAgi7|JxOOAE8A_p;
zgzTXr`I?ZO8T*zn_AO*j60$_uvzDzwh%O~t|L2T*f4|@VTvub}ocFx%vwoiCJu`To
zp~L>Ph%ad`gt20UZl7~Y(2_TZKBs6<k*d2QG^zFdhv*yZ+cMS}-}7rvA!Jb2de(OE
zX;Mq_*6@0KH>a(ZB_*ke)vkm0yqEMco)a6s_L=rx+}T*0#7#%tH=1tDx|y@LITunX
z-~QX!1{=o8-8(u&F!7`gd%#m$kflX12(tjg&7ro{N@$bn48B7HZKV{#PHfY;rg-Jv
z^KXoAg#>N7eS<LMl>70(cdFozDij$BY|DfwJR6UucC(D8=|b0AN8ucWz%Zsm2Ogax
zYPW}Xc|sLy_I!9nnIb$899lz>QqARbEP{)nGA;4i0hda@#FfQsL&k*oZ|>@rN%f<v
z+WY%&GFSULB59>~Sh5Pk-LqPLp=3;(5lewPRO34JGvd3#N$u_&P|d)KD8)-P3mVO8
zXw)%>#tG8kQ~_v>Fl0xqtmz9Kex*v5PLv!%8&(%%nx$SPsuS!N1i#ypTf-8Nym#}7
zu7_cKx+<KpAtHKo4?jnJP=lav@x3624)edk>vl0+zN(uDYkPzmudy_r+5{a`MMUh7
zB8Re3RButJew+1hYVV;7seM-`ByOCAg$XzYQ{!HaFYhzmMA%MYFR&y*zZ&P;iG=eE
z31`eNIVqN2ajvr9pgMYn*{kT<ajm7X>V~N60Rn!n5^yoGY>`rKp>CsZ6#8k;4?`}T
zbMx{JikGh@@9E;h*BedHH(z_K^DbcfT?i?Wu=#C*i1Y<YmAXTwELt!dtF8kbWMPbD
zH==q}kNw$K#iV<E_EF+z^6z6YwTQrxv;$X5clQPM{6qrW5TpYcQs(!G+3K2iXl@Hi
zhoCuQ!k<<xdVQo1Wojn&z|%%#Qpx(pYSe}OH2Sj-jUY9MwB5p!=Aj)V!{RHn)to~m
zO1`@uVG~_zJ)F?;8SW@@UIHCcL($OK&ru(>p~z>x1}Wz-K$W%Dt#yW>fO{c^*M1d#
z_*KR^cILox$ee1F!%h4;dq9O%*A^jWipqvULogESue}T=OAC4-z3yjq88Yau3ix&K
zt1ck<RwxIsU?3Ve2Bm^giZzmPhhe-=UM-%!#33T+E{shNkJ_LYlmp?zLE#z64aAV7
zu=}Cff(%XC&v6NOi%90(=f{xNBEVp3(KT(Wq<OQc+*J(jY8en3nyLmusUtHughA<s
z`SggjJGJTg%r%Ja`~=&2k-?&x+op?<Tsov}h%hXN8j`m5gaK#I=&SLWLs~2f$|I$-
zZ;Kg<!=YiwiI>3xLEa4q%f)ad6Ok<)NW}*l`>a0)Np5Oi&3Iru!Y*buD>571fDv%6
z@)bwwMo0+B8CJ}YO{Y2$PVK5gY9E(Vq1Fv#nDExN;($zaDASm7TTft5_0<edxCcV=
zOrQ-zuZ1r3#!y*-uo4h>)K_51NnGhno+<|=;B<lx5LO*2vN$)WpMgRFqLN5<=cmm&
z$J-3LywJE~@4w#qbb9DphGQVYHi$<+gak)`bJ1`IA2yP8%Pg=E6j^eYu}T%H??+d-
zezrrl>8gN-09>?JYVpXt_z0RRpcCfpF%f|n^qkcr0Vm^Z{Whm3?{BTRt&sYvRbfy;
z8iYoOU;v*oS&ZN|hR9#AcsH0>t@R9&v++@WjeNYZv7tTZYj;%;oz1eJdeJ<RGDg~_
zspTtV8GKVGk#d_VXWK@X<KDOe43Jv}Uf-mOw{^=GcSeXq;7pfn)Jd}+=jPzv5)OMG
zHp5_0JdwI(tK4h|u@g>pWLNaWYr0Xn$n1f-L^uhln1kV#jLP1{1mHAu!hY0z#DpNT
zMBe?ckPn$N5SF>p=4g=3Ih*Z<cr-QULUON&%yp2$eHx7zR`OVwae09oga>!HxQ^PY
zFTPQ3?+MTp6jZR<@khA9vEz@3k%ms(ykCmeOqY*@3i5}Tz(YU2C;<in^&{qh)9E{&
zbn1U2+Lsqt&)1aUa~HnpT9rA3$d9anIlwGq`x0M`mEws_B{xvBya12^i4EPY;opQa
zz-Qz_)dj!x!}F2TSD{+NN!6gR-CB%?)(t68MGfs1)j7X)`MJ~4a4yu;GC6kKfN9h_
zh6Y=$$AWC_v5;Z6D6kJ1e@`kw%NGCaTlj|tc8wrh7VzuusWS|K?wdG4dTPys#cH#U
zIXD6+mBEah(zsxUoJTzw@njYWI|2;F9vPq%`4-W@Tjsz&`z~KCCNV=c@pQuW*1tP#
zkc~Dp`)K#?-+$mQ*lF_@%l-qbu+xS{;H>1|Du(Q^(dN4A!5h-Xs%|JWMuxi6W<Rpi
zW=hz)&V_!ige!^l@5R2hzP`>nhlu3fu>P`f;ss-|?p{mz*84nU0v0Vdf76tWPgjxA
zD_J0`_5^$D<&w~iQu+ny$$8!b&y-TV66Xlaf^YpN&fpbh#fdM@JT(ivqVQ^tmo&_q
zqex&@;hr_|qWAW<RILk7IHXN|KcmN5g<GuE!>rW<|D>)?>+hw=;W<f3NlZ=+s@D?L
zgfFCcFbyw7`uAyumRX>B@d_%m=xQNT`l85j#&&!X7aN6%)MKql#wy>zd{gKUwyqJ+
ztaA>1F4h~<+poqOdU;c0MJYLB%qE*O6-n25(8EmQo>@dME<`=;v5rl7;-=eLbGf2p
z6nhHsMe75YM%P<y-jiNEi%~hedAw&x(JIHKP)(NB3mOCTD}`haBJ)yY`yx}%JU@}H
zzcxknC0rEf`c_+#_rP;S^m7HxVE#2}>ld9ap(`a^w+}q^YP0j|($&&Ej7)#(nv{q(
za-z-CSN>9=-ObX{r};fP@a6RyIA$nQsxS1+OQOFM$k-KvII&Lrb)7h|2+!(elc`hZ
z(bjh~$A8q0c#JgDHIACHLQPpnW6~tg@{-n?pS9UXZ%b*H(67|_TcLVQ^-D-SiU;P~
z>?4EJ_=)GV3z73zuW4dqD4dbQi?D(eR}~t2VOR0Ym%t|Y(uH|ibd{pob49hML^=#U
zbk)F6JTJDRk5S9f>#?H;Cn+<}?BG2!4I>4a>k5Y)y;`2eNScagz7P*m;}!!JJ>tc*
zcct;SCRWf|cU@r&QWHq~Em2MOOe5e!r|L{R%otmZFlmpSgOrlvm12F*EtU1O^G7iz
zafQy6(yx?qg=S(EIWxv|ea|g2wa;+_ai^1jlP|=lYY6%!hg5kfiU-OSZ86MRjN!v2
zWuE(AiW3WiV9MxcFlCPj7D|$gc#*~5rSxU^W|lGDj1k_lK5JRZbMYdx)_Ztl+5Tg^
z<pqq49(a1V<vdB@Z;;xj9!&n3*T?-W<s+Jb6HL9&9v-(iSCk^$TNOcZLfiA$jcJaa
z)ui)4JC4b9Y4a16N=lLw=9Iz<bMkpSGddJ5tr&=+RH-w~tg$8NM=%X<5@3NBm?pFz
zQ+QuU*@_3Pl!UI<h;@bZ!@NKh{KxD(Dp+MA&(oKOWfmBId*tyxNEi*mgRG>5C`;CG
zH4A)T)?15tSCa_LVtTchVvBJ|ETR9cw`!?ce4?%?c!{ZJiRsY+UX0m65I>Jj58|P}
zmk>PxKA3@w>&~w8`}a9T_AEvY_nx&C>%_&5qGIfjHLO-)Nhwmcn%4FEYr;u*yK!mt
zEWw9y7V?~hWTQaF!rbgAN|eglFOH{k1h=T;N%R#SIV+_g&GZ$59-&$e@k;REH>PIZ
z3fA)mT&N}s)GDYcPM`euyxQ}}{gJO0BS%7x+pV80Ec0xt5r6$se7cTsvxv!m6j^)L
z0X9~;55nSIX04!3C5IQf5cwi_Jyr?f_NK2AZ<PmiI{bl+r3YkD;SiR_KCuM3bqOfB
zqD_?oqqgut*UYKJf<Y4SUdS|}JWS}=dwnT`Ai5z&ZOOA|PVzeO6pcG(%UO5WO~`9_
z;K>HP1m~2@I`JS|En5XPJ_DyH%Fg3{++*kGT6ABJm&=1x2ZCT<Ny5yBNA^(7L7P)_
zJ3sM$dm&<iV0q1_uRr>0gx7y<MbU|~qNZN*8nNzcKoW>9*gu}&G;>MbvJqa=C@&*0
zmhOXq1?or2^b2P}lOaTXv<P0|bo@k(%cTr?r~yI}V!;rz;K4+e!ApWovp`uB=6dGg
zc{03ZJ!jsi7TpC7GFIB**!v{zcoe}lBbAUUFd2`81MlTbCi|&ycO=y~$9@C@Krv(N
zP|FNbdJ?Y`?JHT{%dC}-MuxP6&rsGy?J;FU-dLqn-?NL7Ju1i1;Yoj&l);j~c9>!n
ztgRnAG4+W(!`mlDtI)6%B}rOXBi10iV=8z~t?Kc0FD*w8W}DKdg{Uv$(+dYZ+S9JT
zLb#>n*wPXqlyS{^;oyUDl=`<lD;KWa2a>CC51-_UnC!%eqq>s_X&FO(`z28Gj#&Xm
zI3ph&;6&-M4~cvyq|+qPPa@1s$(bSzdt{7cN9Cx^Kfamel*#o;|Eu2#O)%xJUw{n+
zwTgBEh4x>YDQ|O1Bu%xCqk6%dS)g7M()e4(<g~7P9de3{zphCtN&@8urf|iSU=We>
zALgyH?hOf{u}`I+s{_wd6aIlw7wi|6DQJzWs&ycr;sNiTStC}hO(ldTDRi=wezE}U
zG;ry$omZQ>UE%3Lp%e27I?t<&rXI1eCO^&IVJ91KNujL4M89z12{vO%l8H`wp127{
zIx08M%Yi>iPPGV8L=9MfcxAwKpxUA9Ub@=+QM9&;^c$t2V1V?ats|Z*9(bmxITAvP
zacwtCEQL?#%RPyVhD#Y>C`QjpN}~0ri!-P!>lXwq*ItSQ&4=^P>hchQIA9&0T?fqo
z@o3Wx1jFHhXDd_#@gfuq9LqcTOSkUgY4(j#$&<fGxpx|$wc|tQN<!!B#B*#lweptw
z6xpM4z@zJWNO5ti(A>lP=UC)n(*9#=<;d(#H6?DCoHkQ1yUSt~<I(kmGm#0*O8XKM
zkq&)DipmK~dB%`FI>Z%?@Merk@<)IN0Z(M1TFiEVzXhS<W5-t!7=#*z1?np;EnaOv
zY<;qc>o}@e`V7k0<nO>`2Z^JXgp@RmCA=1|+RTgE%sZ%+8S`T9XK8;Bpt>3mhG2Zw
zX+=(fQC(jd@XwDNTZreixTLA_ZYi(#8rw&wmci7%82M_6Gg^gvB=0UmB=(WC2VzeH
zUH=o`Lw2uPS|X{Q2a%N5AP{z5T8Nw0Mm#$BoEPE&-)O*5Qo%@nZ49EL%~GEJeTp{E
z6>V9vY=QBab++0K6B<+VgxvN{jpbh&t`nNt+eKb>HuKS&Mr(rtW5vwti+2_0_fv4v
zgc05xr;7b_LmF48zT!3FD-h#;G?zDCQMW0redvN%82|*(%xh8@kZM36U`v_$&syJ$
zto=#?RRCo(GfGlu0&PR2$tg0(8eF(wjrcU!SdfEgmAy}Z)OIaI-B!R<p7hTR7<FN3
z;KIQ}hEA4nk@cey#|HwFDbqfF`h$?*FEfT27J?-Z{;sffe&~$6A*iG+A&bY+3z+b@
zuWUG<DKxr=<lLbr%B(`y%A@TC3Wq3=_K+Uff9jl3&4T(Z0w6J9H4fR0@kg<foe@6^
z1Wvk5!<@L3S;*=LLIZ3$ZhHjq6oL-*UVA=b=>sDK3vFLYOe7T{x(6mTNFB%zHUzvJ
zCnx9pY5Ez&o&l`cQ`7DWHeL`sOH{ug41l-_#hb}A5}vLvB#&v#-W1$C9^O5Lm_T{P
zE-)?VqsKX!MyRr^J7!B`PXc5CYD+%_CO_nVR5G_OmG!l+BA^vv{_7f%B4*I4a>OS)
zwt{t}VnD=h4iG}7Xu(+n7}2D~+>S0m76}e2^PWoZo@)Asa0?^jfK^jy3JIR$tvJ9+
z)75&pP+BB_iJYvlyv#u>*#08?H%D$CK)xvetMhv9LNk$PRV6k15GP3*mFv=<tw3xk
zU>CE4S4avfp>jPyqeamC5E|D=Rs=DJI)_9gu@!M9W&qh85dy+IG2l@Uvkc<?<Qxbv
zT$9MjQUb;(5S*L`03rK5@8cDYKq172<Y=m|cmO(*Yg3^~N+H%cCy})qKEIx9x$>i8
z)-v4$6R$D9G}$sL_xSquxh2V-t}EkR6DXkXtTS2)3kVUAN7FMWX<9(?Z8V+ASoe}Q
zd!8{zedQ5?dB7-)*`8{NKwkq31&;p*s^#WuDzZd;$*Z<2dxlgzGw%trwStyPl~W>h
z${MZ!DZ%E=@gAVGVWs8i#W-HnT<arJsaGF$gJAjOR~b>R7ZJK6SqF|?(xgfp53#5{
zjX&UeL>3GWYR#z4uUh+C=i5@Vz%?okwnV+gP94Z*qCyhVm?S#N&9wD?DAg**lXAfB
zw}HyojY;xT)hN(oLjJJGWkC3#HC5NGHGxV9o&)c$g1lpGuKFuMXYFal=UeR!A7vzm
zv!k-Xli5C3^dvRceu^Nu#rn-{kG}nN8L^y9P32wOib>A_dAmUDq@L+P{LcWj+bx41
zeys~J7b0u@Qdp|2p+VM=pr}u#-An^G3oa#OD&#+L<DM031yOOuqt773g8<6E$A$vH
zdJ1d>t?)tdk5Y4QjLm;EaMX9xFUTKhJ};;R-&$l3s@=cmt0El3B6PTVJig`CK9caz
zN#?yhx!&iIuq+b58*aFiWzR$VY6-rKxWWy52jZ*&z#PaxtN@q*plu{u4&n!2BA!~G
zR3c0jI`C4U&n0^dp=uh~Q$XNlW8l;Hmu>f^%*EEs(g%*$gOl?KF|WO=tE)Zz!P_h@
z?Cs7q%kR?C;2t3S)bJRWmQv(2b}|MeBdPa--irIfot(xE?;mG82L^ABsxD=nC~Gbo
z)9$aXZF%Jt0rFO*rs??68vI2!TN~S7AcCX36^^gKVFiE<3<Ws5QNrc+i0v<sfDzs-
z1kPaai21cZ4TzC0@IPWZ;0O~%V<GgjKsA}(e8Z@vJ$F_T9Fa3S{`>7SD0|21&)yQg
z3Rq#=De$IqB^ef)Q%Pj&87n`=U~j|5vrA*n{0`94c{XuQb5xF04sJ9v`DuGW4K)Z1
z5~dwq;sLv5ODl}A2a~jilwT0Az%w)iV!-kde;UsDQ^>St5RT7;`2TMyk&^_hO+f@)
z<T3yh09tdBCoO-LPp(y6{ZSS+PwDC!m%rqxUGw4FB$00L90z_k=yPz)i~&g$t$Ai!
zh_~ULFm2Bgk8V(SvOHIfZFnzfOk0u~ysABSO5|j=)?!3p!~?U47BNx+9X}BCu^kvB
zI`lQLIe`F7L#BY0q#n?Na)PZhS4<J}-}92J950IMiw`y`Y;vM6&j^v+3Q9@WvSW?#
zZR~O8B~b&l5|)N4$8TB2RNOLw+)NwYFX^KB;Z|_va!FP1<~owNlDOR9UR1>cWXz}y
z#J8>k^G6kT1l%L)r}q5%b<J8HBI14tSilw@JX8us7ou!6)nhWzABV1ShB7?#Twbx2
z&>u%P6Rw%ZI%aKO#jVp{`S5H0+j3H+#h-n<^$&~Yy`8JGJk1wA>_(>NW`3@=(D>%#
zQbiVzt>!j3^eL7l(>YzWFwQiy_~9+hi&q@RYNj|&eQ>&@c>55+o3ylgR<668TPUdl
zEp<<YR`>uC`vdtv=E2Q^^;;>WpGx2a>W#`pfCG>r;Seol47ql_rKRQ7t2QjAs|z1n
z<}()PJ$CY+{^c#sjFG3lQh>z{R9)91w$}_}d&j+sQ%qA9mC`naO{_mx%Sdf4NcgqS
zR(pL;wm559vs`;yr#@3zA>g!vGr1&pEzL}S(_zJC!7jV`Bzz668`f*k%ThM;{uyQ!
z8n^ic+~D|&p>h2%?ID@;+X_v?i>hbON(v-#ak1(@Q~4jbDZ(gdCt_t{q=D)l6OdfE
zPGn>}0*dnr;C_<iHIyxZY(U2=jHY-ba>m9od>j`W8qs=^eisr*^L5TpYg4PnR$w>W
z*534=waHF<D>!p=*Qi!CLzgU!J(+wpm^Yd4)u#E;rc(d4xTCqnycfqBgiLfKu9Ym^
zAF`O2a>}BFp-hwy{Z_0}2y>`+soj-(x4xF1G5A66?m`RX=s$Q`oE|6^)iQ9Ks49SM
zQKC+segT$sSWFBE`;>xyS&`fKA|E?I%~%Zip348Rk^Uhe+*oQP89GJ60Jca>1i7Kb
z*b8gg+S&rxV79gvQ*Zco26fw!^3cI|7IZ8KfbvR7mM2e;t=*z3?{jh2Gji#lr5*|D
zTtP33-5_fxVd6f7&{Gs~%KmEul51g;IjwK?0sR#wDWtE~e-{fg<qf-s-sV$r$*T3q
zTiE(wmP->Pq|kwhc}K?|DRt4tbfjLlWy^ksTZQ{QXFnU8qgO=5Up>~=nzdXhnJ=7^
zxL6GUQ^O&Nz82oqYNYVKM{07t%2-)eSq+nfC_xS&`8RWgB)6OzP3!!_lumBGQX8?S
z?~XKMI*3?q@{<-a7VR76)aK5{TL+}~aoj#F(c_EWfLW?lnhW%oHZ91$!D61csvKYL
zM{Tli-ln-d9P@0ag=G@Fk}l&RM_@gn9m0ZUY49%~>B0aX+SIWmQc_~z_bZpzt0bgE
zH#t|Zq?=)(Q^KA+mGrAG8gE>CI-ZkN{VJQaX94AI8$$N52*Hr_P6Wh^lk1~*7*FQw
z9?gBaEu?&4UfEVDzHFrU0p~#FMud{b+7MQxiH7CPJ>^bH*<J6{mygkch=S3M{15Ce
ze;ZaxTK?eW0x1mHlL`zlj5eYte+{C-y{~d4v2VTn`p{KNQE<A_nPz4{|Nd-uXT(C_
zy@~AD@eD5E^BckxLZ?G}R|glX_B_c8L(aD*qy^<W^Lw2xTYFx%=2yXoy}W4pSWoNe
z)<R7O<{xkvxVVc6LCJBJ$v*|y7QY+)5O3TMNjXR-n1kAcgoOC}1K{fbNNGzjpyT(?
zWIXtHbi+6CDVKMlzMrNR<Q&cd7CwATqxJTD_Qmk@j>OcB*>@D@0rAC8@+YOTw_~42
ze(OmNA4Rz<JndjBFvJR3^r{i&uV$RH8?Cmw$9L)PP34g&O6jEUMLQ4t7Vny6vesb?
z`92V->6b=|qD&hn|C*G@d)Bbn>+O9=2&e%zIy^)qfD_CSCud@`CYfMsOSsv=^1Wbh
zS|17Ia1-7Fy-<MhM}izHXw}f#eV_6g&J{bX_uA9p+A89maV|LVFPqZYF|Zp$emFVQ
zA&rM<8WLv`UC)YjFUWnCej~B3&Gzw%nRTBs-Am3*otKCDha&1eG#ybo?2YQR@4VEr
z0jx}A);c_hx(%64vX{U=3;8hz4(z8Jlol`*>uz>!e|xzP91Pe)M8=SV#PG=!UwHDL
z44+EsIwA(d^CqOFw5(Z(a(a)hkBH`QHk>PA`CO7<gbFQqso@qom=Ld<RBu>X=1IFQ
zG0+(=*0Z&Fc)+$5mqZTf!;0q$c(Y=Kagw7M+k8P8QIy<Y%7=~Dcp6w}CvH#Llg}7q
zF&oz*q(6@pR*xxOAmAcn{u(=bmKSUTOxkuTDT#!c2R8!&W7`!>MzG~(#zN<XIm=Dm
zuI_$-h2Rg5Gy_T%-TZC)S^Hz2*+|_>-8pNI-D$;+7-?xuZL)q#NWw8y!Y@oQg_4te
z=FFV0ETb<X_<YTLdgi>zA71sFU-W*M^6<tc%SRb9c5*F4tU+f;0ybZok_$@7bO4tk
zFpCfP4*F5D0B!5S!3c-;kcJT{37Ow2k&gcnYpj6J!eby^X1dRb!_v~y@<;kYXRTaf
z<Q+8sk#F>H?rU`?Rhq=Un;i(6;tB4yM=u+fVI0W?lQGYhdUg->k3q=2!Kb;)wc+#J
zo2mQuqyt4+??ghKj%Y>l`ecflJKn3HFMEUch$w+><IF>HO3)ODJh))MO31-V*QXmE
z9^Ms#d4enEc$xPAnMxM%{D{)Ul*uj8&HJ{VXz#3h6ILfbX2)Fm&9VD#<(6SV%sDAt
zGT3S?W>Mj!-+}q1vbEUlqggvi#*IPaKjqFy_!lI+iJ7i{IQW*mC*jM~oqj9^vOoQ<
zfCxpf7+5(~d|KK9lDOzIu{^yDpN1}8(Mn^On~d}_i1HfWvD6*U`<VA>r+YznUNm1K
zMyPY|b~cwbc*9&KeT5Fp{n=-$L@pbyd3i|V(o9NUscN#8%704j3}q24W(ABPBamL3
z1rwPWFW|EYl*XisanuhhGdZT5g5ah#x_yRwl;hac5v`T`(s>hkX2Xz)r<mEJ?4B6I
z9rY1)8Qb8yq$W0R{9R<q;bFMf8G*S@QAw(WM{N8RDTHl|T_GzfGythiQnW31GmEbn
zq_J-`%y>*_LR&;q=vmF)az`XRZLMN=?d3fQBX6Gzd}D9r#ZU`@1JbK>X7i}dE9B1@
zvXy?Fz%kKcBgXCC@j~;%fY}nk8c^*)Ef*IE4tN(%et&y}_Ax~<Zy-ZSH-r2U?p>a)
zAo}Y*7Z0(<nI{PRI#1A4QheHD?R*Zdz-4?(g1_<bfNzy9tZ_k^*(J+6M&?>_!e?<O
zse;j>_b-La3#QAiA?x`1fA0BBSd;2#V_sud!En7s*anzC#iq)MM|TXB(c_eI6L%s2
zicBKb59o3y+C%{!0gye?Yay?5o8wrv{SReDj^yN3G54==GP9Eod}Ej7#WdG7x5S3N
z-cH7X`2|KLu^LdF7L`*}X$<cQG$N6ZRc$;a$~<C2jspPgd9&;wH@Ma|71hia#QW$*
zif&WlOS{~OrW02%&m|tVe%3$qX>^m1CHGC){P&NQ`9*+$z(#>a!+{nA;|qYn8Zu9y
zW>CXH-u&+n1PwNa&sD%PAl~7*6OZsK$SS{Smb>D=|K#R9{)p2IVQY&In-{l#c?UWa
zU9R5>+Ai&xFD%J_zwoi_cRSGL6&xVg5$=dcK;txG?l}?A4Y4N|l_x1V^9XmS7K(%{
zQ5Y;3tdk5(MTl^u3=+~~#Pqvi0?}(kNRC75k;rgUNocGCpM2Z>_siGcm(Bdjya)d5
zle~bw4ELnolqf?+v^X5RwfmlOA)!$WEKb^W0#Q5adeQ$aSP;=ADe8eqbD&(B_$k1d
z1q<#dccS7eX3hB4wtlO`pA2>Xh%Afp4Kz5{<Ux?v-cI&>VrYFG4uCu5Si!t@GFGG+
zk(Wf$YxUn9u%v&FB={Gk6*=GqDd7b&1(=5(0FtudmRDnP-I>V;--uXkm!r*QH=+(+
z{1l(RvH7Gq%6fgl*8p)WNLbnaHry4llZXVIkU~mrWT+XSo47A>j3Rdf0piJ-e}Tw)
zjacB?iPVu5WwBpt{lfhr+)?(vch4@uOp$yW1|k&%G-H(zjRCqr!A3U(So9!IJI`C9
zF$O4AHETKKvz0q(vC*;>yG6gilWu<>l3*|Z45C8g3hPHm@W2oh9WVq93k5j0dW|{s
z<tQM-vzm~)9Gz{Wke0;O79|Ya>+e`BM7b#qtt##D7CeA9_=FfVkUt#*pbW#(?W!uq
zH`;U@rUc9+GFboo-edXFRN`O?6YN35U&<`9>M?SLhpadpSHA1B7CSghB?=H75mg$_
zXlt8y2rqv=pW7WHjL1b~A<;5FQ8waqSTctvCjHx(z(2nuO_v8<dJ2kC8(l+}uIG3(
z44Idi%9eTVDE`^kt|u#gRo)`GT*LF0N#VpNtJrKWG+1RgSi!=~0-<2MbI46VNaNG^
z#t`vUCqI7#`Uo+S-K(b9{{27Bd|dUqGimw6+~oIaT}ppx^+mkwKs_&B=F7y%xyH%d
zh!meVHSWjUem~+(?6;386#5!$yS(`n`F&nAw+!GIP}A){5hg!)1_ajP!o*1MDgd7W
z>Qnja489AIC$f-TZOPFJ;=|G}zFC<G3jtaEq4|BEkGxAkUA>F)=t`eH{XwHMTZ_jY
zZ>(FdFRS_!wM$OdgP;gFKs~h4sj!@w8F&ZOiw@nUAEoh=G>Pa7qAIVGDOOEpFDse9
z>esDXTuiWl$5{vsTn+z_mzv)@f43*6qy?^}$`Mg1o)oo=NE8ecmvJY8V_u2npA+1^
zGX6jPY#z0p(KD!CI8~B4R`s@V=5|fSka30<{hxh*Q<VbrKjw49b)piHn6dL5`1#+@
z!3>{9wJ#n93u!}h&CNOq2R)`|E~WXVcutw+-zu#1Z9RH9>cG;JH_kX1c#SLt5h)uW
zTD%AOejiS`>eZ`=y-C6E(;H~~Ht&UNnFZzUYxOQn1qI(MqE^>z2E8n52ItK42MzqB
zdt);Ju}C6%K?hz4;dKS9=q=VXY{|!-cvf=+Og{1}1rmZSEl;oYi+neG7Wk#wICr3K
z-cwKHw_@CArQ8moe!$b~IKiWu_nXYnn)d^S4^%;gg|SSLeN$OF+$e?kpHvV6Y$XuD
zb0E9TY$hX=_+kG7M{ccm#m~ttyDgu@*`0=OGM{p}-=<G5jjuaa*k8`LYQ=p~iLri9
z6sh!&Vgx6+BsS=qqfV9Cq$Ff)L`1C%9vn_*+y2W;e=JKsyV5o%6!pu-4d)kHZ!zW~
zf1$*v3P_4Cl;9rG!rRV-T9%!l6;V=Xyh2?(Rou7E@e?l+nJYB}*Z9U@8JeU{Fq)?~
zY_z|NWX0_GikXa{kQ_-vE3RMw9_JrX$sC!Iot3R;)LHk>dVfjAL$Tz-wbT827tNc0
zeYOxae3E8mVP@cVHCs1cxzpKVwBU)TLB?^*;)i#jx{7Z4_s&~jEzUP_3ozh}1$JKi
zClWL)nWr~|kE%^$d+%;u^}J!6_f28bJLO*X;-JY_due)Ko2EgJ%JF)=F~5TskL;|w
zm&g_122a&m-ZCGZU$Apnmzys(^$V}Hcx#pRF3Nzko4F^y)ZdZr`sD^Ss*?dVrO*GB
zYj~egSLfiY#ml%&cD#x2&a$MbCAY)dw|KEiM!%UwWn!CwmVv&E-P&)yg&+Ti$unS@
zQoaPfA(k*KAt5jTq<;^7V*0a7B6KCKUIUG8&UxAMW(1?5b$mgg)uD~$lCMU1-1x@K
z0^Xqj*C4iV+IZE`Y^hOe=|p(lbUBq9Al`07x?eJJbAdlAI{$SEY!Cu8@VVqv{@Ev}
z5Vi5C&Ou{W>2oa(KRj0_R_8E*KmSC3%cIVt!TIsvVC|fZ9?EN{)0cz$wsX~sGYJMI
z<Vx?4R_Wm@h(sYjBBKCvzEBF)B|ykTmX;nq_vBk`q!dh`yt7t*Hh$~8ATN$rw}1HY
zE8aZ6X;-kIq9lIJdqN$N?;?<J>KGGRG%8rDRgSUwrCqo_W9#y&go~Ad^Gq_yCAa!k
z1A|uaJ6FwTpzfN_w93f$8@WaK3x5}87WkT0!Pk3B>^@#TP5I>O@Mqu2!OlF~Ca=hE
zp+U0%cf82hSc5YwD5mV5y%`m7&DCj4Hs7&ZQ0z5*{*Yq1gYpT9@H^r?*tvk~N;`!0
z{$P}Lsaou$$H1p*Z^2c}w|`~q_w}e#EYqq}`f&_PTd<qS{X*D$_8HSZ`^+VFLo0LF
z1%J&IF7GmYqFDY*7=$(x0<IcrgT6(Abn0ko?0|TH?ur9{nXC<(IBl|1@|R5}eu*tk
z9np|7EI(NwCgCX~)9X+#Gq&Aw%WPKEFR{Tr)ts!TUB78R500*OQ~f#d9948!X2`yE
z9PFmbHQ-;Vw?zIG(fYRjG5Nin=)FyrANb!p556zl7X6{Z-NdIF_=eoTvBHVoAO!y=
z?eN|_1y`jPt4@YqN*3_b5Tw%-{=dg5q?hJmffyUlzpLN719F8|O@=pWp)t~1R0-o-
z`8z^MWd6gWS>wA=%3zfOQ~?zsz=Q1sBMyo*G(KGa&j6lePx8GII?9Il`k<enMb!G*
zw=ihW`1eq~Gqv7#u9TGm#u7QGxbXjZg)s2KKa`kE4jN-+)kdqC&VK8RMzv!BDFUSR
z^?RZwI9?YmEd$kp$Jt8vd1Xr$$?5z1=+N2-N}#GNb*z5}1k~vP2n?o3^`s&DRj05j
zRvBictDn6X%&OkE7=Q3Ex^Emfa56}IP1)#URRc?d%V$(`VfBzQ)3R@_j&I;@rRB3?
z&DfO(96c%r)F^vipXwdY^@SRF_`QC3Xj@>zKEwE{&I5_$x2HuXHzab9nJ{X@gl2R^
zHNH<>>Ur4LW#Haj=d2r*ot>{+ZJRJrb{Q`kvr-7*`>Mzkk21sV`=-Y6ZC)G0nFXuJ
zbcXen{-za*m0c)vB*p3~W~*{e`Sv(|AjB4rRv^_H)tW6k<D7?F%(kK$M?TorJ2;50
zG+G_Gz(=p~(~*)*_j0?>pua=u{mht&2HqR0o%x>LoE68cd-=?_PcAghXehnpZg{{!
z9@e<PS4#hIXhbt1J>E0DZsX@rsiM|&jA5sXb*OhZjxQ88tWBFOUaPNp`6=(uz5q+)
zI@GWE&U?z1>^tGiDhHn%;;yZu+Z3=02IHkFfA-N>-riXZ`_OFm=tGX^`jp{%uEzQi
z$l9p&$q*TJjIi#RrEE42PJ}I+J^izfC?WfP<KR@`tHxb7@0G$p1&Mrh&crNs1<e`(
zsTsuSUNF4KG2TC?Y&97cb~!?gsMy52%9^l$**jkevu14Oo|br#FQ|0<&%Rrm{X6sj
za9_=Ll=NQ7^X^|~c=aY2t=<)yBy8Rk0tn)O`eD0uD>s9uJHDm)TlV`G<<XmQ%Z(q?
zzZv{`m+{SD;Eb{Uv%irxxIVf*S)z>h=@W&^92sUS>RlwVl+>R5YIks<F$6+5iHzxB
zh2KJ4T!KbqDNXA8Izp@=YBq!Rn4N1s>^u_Vj1hzl$<Pi3LE2#cOLKfg>_54~g`)<w
z6}MftB{jlH8xMi|Te=CSmv)*bUk=^V6254!s(u8SEVIgqrL6!wBs2fhO2`lV_wv6N
zx=*{4q=juEN%8-DvMaL_%Pes3I>3|w-<#;&OA8O?`5bmKtqEiUq6|P_{-}IPVG7Hk
z_lF91Nz^D=djvx!KvoT_tltnPWch<mAiA9(ee8zWBK$ZFZt-~Tz8Ul@tF&5lGTY+8
z|Ns7Y_+~=8DG{orUE2Hrk^r9H|M2kQuE(E!pO{**2CTk!j4$8a<vFoH_w(p*{~Z2J
z_^p4~OUQ~@fA)23vGwh~u~6R8-Spc`g6BZ2%b)Tam?(pXq<O#J(fek#F24j%U)$Db
z+)NM7+RdF7{j)EBBiV1^p}@noX}{i$^tFdVyKU1~Hj<-Sa4thGrp`mo(ysWSz=5Ht
zmTNoj;s5Tfp!H_&3ik>*+YUnc6^V`gTlfAm6;$Ixyx7GuYxyo+wL~e?`xk7vnEf^!
z;04<c+pL*j$N!0w{k5Mqq_*1OBB-AtHU|Bk<{tX;6ph19wvbf^I+o?N@?(_~Kk4|R
zY_MiOG`k=bI3ce$vwCQn9*Xh_km4a@mF)YlB8y;dBZRD8&8FLYip?~_B%v`1y)_Y|
zdb4=<7(vaUn#5QW;d8-@Sd!A^nemviv8Lfx-l)!p#zt|%pJ_kSF37XgMYK3W4nJ=~
zbM=Kw%A4O%+^-eZi_8fRhr4zhF17&yzE~+_<p=lNi!^KgixMD07`l1o_hY<j*PATo
z#__SzUveY(Digb5IivE30HrkcVXLxAgGDDpr!0Cde5hxHc+_}KrNOS|4x@g&%xMS-
zuW%(np#CCa)}_y-?;-!T%EqHrk?Er?NAr1yT%_-(#BmMWGK#^(2ot)JVuZ-=zWUyZ
zC?Mb{rZHmIZid3Q%Nz7HofsnJgLm8yl$4FKhfGoh1%wyUHvoD;2C<lO%d`&b81ODo
zO4UHp4*vdCVvr!@_egZV-Tqs)D7-j?Gg@p}Fu8nPQu3BB;mM_1e0XS`S5TT@Xi!!^
z^d#K|m`-f&jU*QwRYPKZX{hxyyT1LXa^gq4Amd)B!yn~F13|0`tsn(L4H$mW>jNL-
zKSWvo9}hb{9X(OkQ2k;L>C^mZmvEaYwLEdL6V^3J;iMw6exZJIHp-*3RQ2VP0_>lC
znwskKC*B}o0wN%g06Q&kR5P?V&S+AX+Md){rGc48ED+_k<_n2#8Xrz{Sg+vuHlc1t
zqD%x&-?>-Oy-G(1%pAQ&Q90cO0fknAxDN|vwsCV}tiO4yb~yV*>n)T5FKR7|&F2xt
zxcjhdP%bFxD;+4z-g#`_hsWS<7*!ipQvZW&nr1H&j*KAr8i;%zPgYnm=A2<l^QA2p
ztGY4Wj`Y2<kQIGHS$mZXt*vFW0{=1BYVddWm{(BYeziuFaSTBR%m;6=W%ZGZ`6Jjw
z!l&`>T5e?)b|2e4ZvIekuzdXGw<2p#$@_(~Ii)IV8=IU1Chi#)-ZljU;AB{J{-1pr
zts17$i_c|x8J8~!ZKbPZrj(E;KD#lc@wxMdh&?SBKUz(cT_&`;h0fR9Twf~-PCuY2
zgo`52k|ImPnMhvK0ThpaG%<FMGrg@Zn)eH!Op5H1)WnQ0N^<ul2h9>=|6a?Esy%py
ze*6i=HBFLdNHf$<!>hMS(fWB}@vBjBj~Hy6@Kl{rc1m|j__%fL6^(_~dmT6%ksL%V
zqLUP$$0O+O(8bt)Zpy0M%ENo*d9=C9T++$oMQ3#j7MTr~a7nn)_{bJ*B#S+LU?LLA
zUywK(pkn;_lCWlwAboriL(Nb~v}~sJO><*wTrf(_U6RftG3;5vi6mxgrPqW7Qpg;1
zFd5@&jDraBMG<M8Dbl>w&Lm5z>=d2MLRmCDWC+G=8KE0jv_j~j<TLRje3aNOUF{*A
z+o)@boWl6)1>-(oQ5YG1Dfle?EYvi9j9pNG`88S>Sl2*v`POChTpFu_P3tA*;g*2M
z+G{x(D0^*)_caWMTQCY*`XLeF>LfH}jg6=GFiGeVQT_0|;p5DwcH~UDUV$V=HFII<
znhq|^lN=iR1M2Ph8Xjo2{VBo&hcWV(1j(Y3lv<StO<7K<WOLEtENOwEh_%26+p4Gq
zF7^SH1HGo=IoeA_9r#+Yas}?82R(q<0qJKKZv0flQ7nSnJ?6IJ3>CBtDnJ1W*|c1q
zLsPiq)EY{CF2Fm^_@WfXj$)1r?o$_2@8B}c!_5WZDm7#h-^3}g&vQ!(6r*gGt#LI3
z-Owbl%%f@o4H$|o+B`=r^hs<Sqr1Y0@RZ(^874_!Li?lU58lpDF@jWqgR&&*u&J1X
zT))^n()Db5JzFISJv9#9(S<?|eZ2W%&uo?emKmrHI+J9Ln7t$Yiwukl=t+2F>i4I}
zttQZozxJ&IFNIf`pHfwOsxM<R32f92_wEzKtnr-4qY!E3v-*;wjOi0-TCW(m^XKWN
z+2>_vmf!~PxRnTYa;xD8gZ3?7pJ*9tMKq)gHTP4-G)zsX*(W?xCZlh1k(q9<xGBX8
z<CV;PdrUBNGP9P?MFqb_62dVnu!&U*c|CSv1?bQ61v(q2#OFT5V+zvgMb)u*8uCTX
z0D*q=HYKLurh=@H&bfj>(+H+mg?lDfgj~Ye2Wj1vBq<w{uU=<4XE~0dNQTgUMN4}!
z;G)!w$eqRpP&N;<!~CvoPEv&jO=m`m?MoQ$`nm1G-Lr9#@me<`L&S3c*rG=?%ew+y
z@xC6Y9tE4^o7_^Bok0Q#9AfHgwb=Pq_Mw|uyfmy>(gnrDaxTW!L}{lKN9YNNfh3zA
zbSBvIXuk?jq4^JvD4Rpi@ij7*o0nX8Ae(fe8)tN7B<e>Ji;!C1cSs{3Hw?ec{YwD)
z?8PpVxX(;4t^Jdmk3WcOQ{W61SDV3J>Z9NdxOF_%dCLo}DG*nc8Ma<RK@c;%m_p6V
zdL$ZO4>zJiTy}^#xLW=44#Lh4+gbLHu-k$njJMUYJ*4h~=@ds{qfLw~s~uK5E<lNl
z8lpKiab~g%$5A-rE*Mx9mL%~?zM*G+?x3@T_4j{t*1F0B%dJ50qQKI!>~JdpoxrOi
z>1*r|;?qSo-1DG1*{QC8Da_@~33^iYSwl8<NNI+LxHNMiVEb$rQrKdI3?{l+*4~)?
z=)wf+Ua}~*ADTrLRTWu^<`rNhIclyO$$IOTW0lVB@|_hY)`%1H78UK|F7uZ4e^D)<
zzkN{)>pl=?Zig!~?$U)}bs3H5B3TxtZt7<#ywq_nC7nkv5XjgWWWfLXbAgclnTx*c
z8nhO-N)<w*pDpH2+Ko_>09%$O1_b}!^@!^cKID#mjF(VamtGb0H0DJWA`28jGCsTB
z1)?=ZrqPNwVTVfGRY*5Ox#1NAeZhSfqP2psBDxN83*gP2IE__-{@2i(LkF?W@pqx+
zQ!GoM7u*l|99HB`EljGSma!GQ((~)Ew*}nudMdU0E=)^HyZ>o6`q{i%b*8P_GE^br
z?}6n(@z_FAEgC?W5!3;YvjI#~6YSKKvqK1`9nYIM$19Q{to|cSF}h1vkJ{G}SOhy~
zhMqwR7)nD>A%Z2|25<otBG{23f@Kj_JBxHqy+ZQr(8qEtt+8YhK;0{9#7LA)BOu9E
zs1^(;bhWxdZy08tN=<|H7AT%WS(1)F0&qBz5Je6_tjOibo;mJb=!UsmfKrdy0px)Y
zUjg$siH2noUbn*m+g~~`P<K<9zU~z2Z!D(XSU9`KBj`v0RH-@zmk3iM4E2q@0g#qi
zm|_;P#o-8mrL8L>znj0(+;>OB&*O<Z+=PGyQ~}H6v8DQZVGOg@SO-!ZQho=c4$-Y5
zWIj(F&V!ni?uLbrf$G4Cho_Wn;1g29KeZyQn3y*YAgfKS|5rf?1L^yT*7^vSD*!D-
zeuu|E0!QQuRUlTN{}z!xXrlo^0J2fTB~S9hk64)4J*^StTJk-R;=NTs9=8*+0V=@a
zy$TRDX-<dUU?dav#y%eN2K%D}DPJI$T$qI$K^Ori!$Ca%9uf-=e<Gjs{@Dk=ksn|Y
z@-L!=FsFcT7^LA@7Xftu{HCPakQ&Z?<(YD*a{jBQ$W_3CS?JM(v#7I2;AEu9HgfKR
zs15e}guPQb_D+T0N{8VW(sO`R8R35<i9qAW4DW5kZXuub!KHgYkXi1y@DxlLLKaYW
zz<@K#%>?Ards?d<)D!!t>f}ouk2+v9)J^<2VYuHH{vF03elK@-0FW<aJ;UvlTVV{5
z-<O84KR}!lqY(vwtC&^z-k`(bqL`nnzo_LFka6T+S}=;hT$b%1WL_fQMV1iB-urpP
z3omw+ktzS#=iUMTk}x}qF*|zHSAX`o!CQd7VbGm6L=e?umJ|9rlm}R0D0m;fj^VeT
zMO&yA#4M~><#9I9GN>^{kHBaSO()JH3V~$Wm(NS>3A|r*ZaAWKaQ&ZsE-*MGwIRGz
zF!;F!Q`j34K5<1}L$({aZyb%!eYhB^Kz`2&>CibqRa+?P?vABl_Oz1hS2g=Y3O=9?
z>(qf+{r7#i_0s$hwbJ)I{oBp8KCD8A0_^b113GLj`6MBtdmruvm-<=w!3IM;=6!$d
zKX7nAJuMy0!TpE!!FPGV-z<_e%&Y=Z{DN%gv(hR?H{AS52W9>?bSJaRUbl87W|U!6
zjqj-0#AKGEJWL3WnqK!#38}|Yw;ukrk5+mA@PLCXH?oIvPTGM>pk_u?G*wpA^Sm#z
z#na3>kTI02+9AbL+*2oRBzx_1VSE3IWwuUo_&6^A>RjNF4_vmlj_5d<kn>GsVUKa^
z5nzOqXy*WI+4ZvbJ+ClfoPD4E;h~;fv~f<Bk#V+5CKo0=)!5e2_(>D&X^tDoP!kM#
zVhXRst4XS<l@B|N7uZF8>Dhl}%h?&`w8|BF>LD{R-8pGE;f75r^P2aBTsRD`v)BiZ
z{QeA^Gc9#e<8<P-P?zQmGt{t@K6{yDJ>eKE1^&prCE@9;fs;p-NC)KD<(KIdxZ}kf
zkPV#?Ck;FFgq>cd!mVNA-Sk%a`jpaqOU={>FEO)4J$m*!<QbCi_{Sg^s*jK`8x*6H
zR6YJ19vbhYrpi-7s+%=Qkx$OA)<@QX3>iM=rDHGcu+;C2ykX{$0IMb$SHlD~1J8@a
ziMRJJ!opxkGM7b)ZwGRjEJ|8kCZnEIH>2A%T-}pBfUGC4TPHbmab8Nw1e@$Wh>Tpo
zE>)KzHHxfyOX$9WFBzU5%UD9rtrf!!I7q|06Y5fGo^OmzRAXoDJNBpp*Pk?rLoSIM
z&0Z7jq|zz-VTXv2YLI%uIE*`Bo8y2RFkOD6!=;PR!Z<bXJUy}!<9giQ#a9c=90DbB
z#f=;765=xqoU#W*I}p|ax60H{5^}Gk&^z^$_TH#a4bs%0cZcgs1uo5*jC*b|zg*5<
z`<KA^#?`$?gmnn^qQ2+NK`3;V43SB-!@WFSrp9@R|GeRB;JG~OtS&`PYBrInONILi
zAS*MjSI`ZQ&B!I^48kATUU|lwPQ{(o1I2^l9sNrXOMS~XF~UhZaO(|9xly{q+P~lm
zP_o?79b>X}R6g9ostMKWw@TzpP}u~F1NlPc34BSvWi~NZpm!qE1qFYbJk3y-$04M+
zno}TtqiCSJRVO(@$3e{27T58GLZv@Q?4`BX&jkpP?<)X%%vMx$uA-<yWt^+ge}zx$
zfA!xi^>Zp^lk#7<a7Wk?X2r{>B&$#biFh`UZ&BxHvb4DsUyU2U<&&d=3l|l_pX5|Z
z%XiOQiB*?!M^WdED;bnS7-*top8iN?G^a0YaWl44FuALHO+LbQ5hvw2C}z44Ctit+
zDx3oIFBLJc%N-f~+3AkRuA@ZNY>pB8SH^deIjgZIC)){Y$oXPs&ME9;@!den7sX2N
zCF<{3a}k_hbn4hiJ51<nXpFc}PPq<mxTMA$yU!XiH~jHP(#dD3@78{Hrj%W~$^KqC
z{6-_`T}C|@;}g>b7$fbx_m6=ssh3MY59dtwdLfY73>`;Bhj$I7@NnEPd-ZNJO5pwr
zCymaTzSleWn7f&Q!y}~GX6o04wDdj+gOH<BGb$k;%caZ2cMm4DUCxsK!HWA?mr`c&
z<tCTz&@IkpKlI6*MX!`H7KHux>8-#@+&A})wYp1{bKql1D|36^XAax9{xKS6kf75)
z*lpTzOC`Q~(wRM8Z6cyDG%e^`+ymWJY~Cq6_Phd(qvo$f>)d2k-*|@HU)UWK&&sK&
zsU?<-UCQFmpY_vfY+Uq$z8_L=Wo2$)-pMhHeSGr4#7jJ;Wg;@?wsb_0%j}(;rHmuP
z!7qheN=5Ze8*iC?M8pYUvY0wnNUkVs6{ewuxv;X9RCa{+TilUhN;NK}XnxYU(tPG*
z?OKxh4;Ee{qfKwRbhiqXsvvWgZ)UP4Pn)@E<ej^1`@LHaC{ak~oPaiN+wzoaX_5BZ
z7wn9b)x2MQeIPC!@$8L@4|@#BWb_yM;sxET_b<9{O}iCY2^wM2Ghz*fY}bp6tr|$J
zT0y&CS;ag1SBw!OcYGwQf}k<q2Gwug!SmIM^|Z3QfhAYYPpE4<N0J0`Nbj3upJ>uO
zdscd*?)Pa-j*t&QFE4ETX7GTKH1=e4l4E#u@2vp6uX5M`7n(&2-=I@>j@M6A@I@J)
z?25Uld0240n~~*|*WLHU!3J}7pZp1Ka=|_DP2(1}YZO`ia7WTP*BhD!HUC7e;j@}z
z&V9R}`9LqBa#_p!UXr=U#~^3?vUloji|OE8uE*<YBBjL4C*=bh<?@1+6K~)4FR}W(
zNhOC>-1NyC_xoW~#;Qozj-Il)$o;WWh*t4<L+A}}J@)A_fu2k~>HLu1RZsd2x#XfZ
zSu%pQF?rD=A?D|8<aLY;HH&0kQ=YsgtBGW6=ji<~5lv(G802bReth|G_nkU@H#g77
zpfZu*$?-*<>^Raf?K1fav|1qVwbWy0j<T<$dK?ngI&|!~>_(!^-K@pV$a!_rxl_QT
zV9Mf?*gHPQN79?kPp$e4Y5vL@{IhR=*US!|-K__*n0yI`>6sRnFCxu?zn+)I49u8+
zKbD#5Al+?#+v=bemw9sfG0j=c`dZsto&E8pW5wc?`dF``o-)dKl)*32BR4Mb;MpI@
zHJg=O5wN|+B2bI6ePqg{^Ys#kk$;(6ZKd&%(Doq^yf5chFAv<Y2qc`M9nMk@8jP7P
zkKo~Ey!mQ2`Q)=3qlsU0|9&>D>W~?7bgnNB#keX^%bu*6e4O$8v`$I~*@J$wQe8_L
zt(~8vnq`^9u5uzgwO*fT(Du#8Y?a=kA=_pjvJQ69o~RQttmaRvP$^Kf)n#h8=9sM%
z!!YE=Qrnp+eITwdm(_)ibO+03Do7HtA%2x#X5f~6Om7nQR<dU?K5ykooI_0c*y#6=
zBg3wlA~uoIy=4zrZ}A*l{BGbdy~M)vJ3K4vrEpyOoq?I;@5cmF9b_-y8*5`V420yJ
z99P@NeJsWsiR`Kggd82iJ`<8_{n^C!632QU_1mYJx~8&JQ)T8wSUX!SD-ITP%Z06Z
zXkRWQF%5kqWU6&wvYs|Sr>Ng4)4%zW*T37x>3*i-Q>T!3sp_{D)Nb>uPZ^EmbNHvz
zh0mQnYyDD!jZD$^KW93-922O0S?kKQmg&VxrRerCa%z_=S`LkM)gv_=Xg95LJU@^W
zQl{D5ZR)A=Y@*-G&R!~+OI<AV7UM_j-)yg+s3$8vaxB9&-+CNjG`FT-)>)<1JUu9>
zNFir-Fs6t~;PvJl+<G`0mPC#<9lDT@W|ynudp+&tqTTq9%(N4;<rCG?9{gN-PcE-@
z_{X0q-MF7m&h)Z0CU*8Jtx3C=-g&3MG3OQ>GJ`((V@L0;$%XC@g1;mt@nDKfm&5AL
zwCAhI#nz7L>NiEDv3n*9A3`VNiu(v(PG?j-mOo-_yOjOLMMH%39gr;ie|bt5IPK{%
z7CIqDoLk0+>EE-E_4{NqJ8nB*yfZ_tr+y4?mY!P`xM5Rq#n30Y{#^%M{B7fc)_`Ra
z&k^oo)-zYukMGy_4Yl@oAUcXp{#l>b9sE+*b)YExNs5ADAK|mweOp4%<;W;@`KOhd
z1+v}h1@z-r8`$Knv)iBbImmy<CD29&ku}aKYDDtn{xUGJF<Z_nr0wT=A}w;Wy6hoF
zUZ6Q_rDn#Lm!nBo2g6a_a4|RRxw=7@^Qc+NM=uGssEXakTy@T)q$6+DI9fU$zLj|K
zpItVydFnG7t4C2O%eYu5lNx^MApWqrb@j`|cdS_%o%&vVWxZ#yV&@~mmj>hX#!R-~
z-Q~D{?pg9Y-58#1r_eK0B>yt^$l9RI=TosxPmW}ls4sEZ1=^`UzBte1|CjI&8AW5I
z%ksjM3umvD>wbwd;tG^JFOs0Ltt;C$(kI8pV#as<gSp^!ty9r$O#SsAq*EP|${43=
zio#QYGT8%a7%9AvjHK8ZPm+9AOooqcX5P~Fvkn^Vq$*pE3bxylC==I@#6g1>{p?m+
zf4|RV48%QVJwEUMy8Qk8119~)l#Y?5vzfa=UZ}gTD$b1^%xG8{00%Mh<6OPE`l|ft
z$klTl7j^~T&bmdK-c5-gx}QQyeyL0_`?yY}j}~Q9u4tDWIM2wyB@$?;QEoof$fPY;
z*Ak`qXP@>5^NVb#M1^F<0DqQ-IVn`O0!HExtGnZZ>{7%j)k+fSz5XM1TkJuPWAF%&
zJ9x%-M`^Zn9i4gO4KBPnomOLXHK}ghfXxdY#4i0L>10pzjAP5RYJ&eMJr(q;=d#Ds
zvIJg-511CUSDlMWZs^xg#he@d7>SiN&ppUe9}+t#B2W}{h&9{nnMcwobdhP0_|5HR
zf!c+^;28V*;}bp>XgPtD<G7BFGBxa_ydV?tFF~%uxiZ(i&oeu`|9gJq`1Yj&&2#!O
zMtOn?9QQ+3HVJM++WP5N4=cPGDuAM09Ft)0F^=%}Qw{td9ykdPH3g@8e&v}Pe#u3S
zIJ~$KGxFogaeM*#fo`!w!&lzJrOLq-=NsO*t=vtuC=Q!;ZqZoXKJ3m=aeYJiSEF2J
z%FoM}e(P<~DAPz0zuY~Uu2tP?%gtHzF)sOM*kM-<yJut84{x8(*uIq|_<j=gJ)qd{
zwx-hl9HDDH!6Q@dib9FuH#16%j6y;+>AGKMs+*ocu}rAi%+=DC8b?e`oDz*^F*-)P
zHr%LpS>JWzbfu!(O_L#!k1ko)+^VkpI!+KW_{)@C-Bv7J=aM!0!}Fk)h;9nW(4iUk
z5T((r;j^Y}X0%@@!s1L4v(q{A4-JHZ=W0<w#nE4-f3rFWmSb{LbDZ12bTRq9am2}T
zotHalU!T?9!Q6Sv%9|4vBKjW9L9>QiINxSa$#j%e@%*op*OeW$J?E`@qs!1L4!LfP
z*Z)_tft8F5X!LAb`4}DiDMZ-Kv_|p*#yeg)5UcS_%VpMB-yzqpLa!8eu8^R<D#X&k
zqNpBd_x};~6;N%ZTiczf0)-YYR*Gw3AV6>i2ol^~ibHTOKE>TFXbHhJxD;q{3GOb%
zp}1TB!`yqne??XnVZnR$+5T)<L$GUyMQ5*YMpS=#SUkyMERl?{t)r)Bzf~Z`%AcHD
z3Z6XT9U!2)Lr!%@88$JuN05?MEOBVJFt1-lQ_tgkh>kLqT7}vbE+cQ~x#knsWk$Cz
zxdpVCJMEtHHuO#yjDF|{3*#T6W@hfU1`)rE;|^TKg#~7EkzuP!Z)Z=`H}-E9w-m=4
z1mG|&CM2%LFKr5m#L1PhtkJWw(UJCse+qkw>5Ai2EPrphqVq1ih&ds^`W{-vwYbEW
zoKlhvKl{AE@aJVYk|LOh-lTmYCQlagEC+8Kk035dA&zwBMEw_@MwA-!Bq-ztUfT=f
zbh5D$mtTAVy@9g?Wgrn9E0<pA&ju`W=dg^sS!SFx1!!#HHe)<E&B1X$He<`RCZY7B
zO>t?jVQx><n{JDvhggZLG&@cL$i8E@ClA<PE>R1YY-!mf4I4GL%u_}P@zQ8BN?APP
zO4Cf%FL`-!pe8}F{j$gTvszcjIlHoPjAf1X><jd)(DD?^N}Yol53kdWSnoG12C%f2
zLN&8^GOa_Kr1xa)e1utql{K{}v>CT!=4TxX|Gb-}WAbOaL#u92VdA*Nm!MV0&bhVv
zHV%z}9YrqONN>i%rP0rZke>&<mQ(M_ma^jA3hg8y4{_yEP-SP){+ZGcW+;p%o`(%(
zEbdAFJ_r=p_%4|YnS$hvO>m`+aKhFEk-EN$9rr5VPh9<~lSEsU*duzQQe3m-3~;%5
zQMafQ`7`O=P8C{SjqVa^7tA`#Uzth)xTDGrtQ!-2ceIzuP!96Sg-ce6G+B^;)F1Em
zLAVw22MNKo%-qDZRGl}FbYdBFnpAHZi(at9?<cA}jo6Y3@{w~vY}=go!@#6`Mq@4Q
zug%4&%`e5fzO~R>^IV2En2+{W(w3pSNU=Ptp&4eu_yw1yjt<$6F1k?5ud8_DBcd5x
z0Y=4b>BFF2WUdxX{Ry74y1=y_bcE*pug#4M5}#%LaJpH2aj1L&RyEM@@XMgCzTNEw
zH<4u$>uKQTYMRl9S^zuh)snAjqAqFZQcvS`k+sjsDN&|FYTjcq9J7qTKXgM(rR_ZX
zs$~*p^hopKtZKVV781S}_rIy+$9jmqo20lyCiP}SpW=GsaCTuVCoWZT2t+d(cN{o&
zc`7h$(wWzx`uL(VlTe;W#682vsB>wobEa8nr+P*b;-0Cw0b*?s78|=Nf+thYYAGuy
zL_xcVebN>nH=<QC?%7$xY`l|t7TjFjThvU_w`Mn&!LqU%8dZwsDE-xskOYR;`OquA
zClrn%omc>6N)uVS1<PR5I%>p)&YZ5?G)eJ|XgZEV_Nb4d+Be@W<5Ba)DDOM1YBayv
z?1*6%LdcBj#rA3a<n@)beN;c}Imo<O>3)mfPb`gA(hAKmdR=0cvuHjiqKEi9{<uFH
zNxvuWz9S)rXpQ)(UKv7beR-tQdEd2Rg>{{o+CPH_vl7>Osm5yI_x*li3;R!iHnYv-
zYUef$6mrz09LLTbobet?{czvl#iFGR!RE)?u$~JKr_mV3k<W)P9{7h=CR=?hs3UT7
zZ^QeFs_Y{o4;Fsr8WK>L$b0=^Q}=@%cS5#hMb!2dw1kdY+y=~Hbbj*9^o2kR4ruh~
zTa5aTqoU3^<H|Lm4-rfL_asMInQKTxNfU((>Z7`MgLk<(^Iw~)<;NX&6NqS8j2S-7
zd_FcFB<OnS^IDKBj73eY<!J4!w5Nr!JhPuh8D<PCHyr!vHgTFM<(@ue>Rm#uY}23F
z&W=Tx$*J=$o&{IU{W(mcOAeUV{3fc5a748cSE`kT(A=Kk?+h|!w7fJ6wHcE+8yO_;
zG7`Iny3AC*c$z8$^vM3QKG-z#IA!=dSl9`By{owHEPSb7B_%l3RC&#9+|XIw%`F&R
zXJ(n26@PGj!6W{D;^qg11jlFHa^P3#mL4|)VKi3Y!+ie7tjXsi2%a)0s9p6%VYXfI
zBh~H8Mme|V&ipP^XKBks^?EJCTMYWXO{hjziMelp_g^3Jwh~b~hqa$Y$`yq^P>%hz
z%vO!5ozwXX78-Yt`D-arwB+nvY(`SLw5=ZFnQ46jvVW4!VDvMVuI3x9t=ir*V|i2V
zLAlRk9^@v32!0tTP4mzOCE-BY2Ho!a%~3tN!7uHNg)K6G!srbTPk<H;4}bef#nD4%
zc7khcVw}2YDW?+K2B`&8LKaMH%uA9&C;t+4+t25-{n$rH8)`m_VeXSOoGnBCTCzm*
z^(GXxu_jL=_n;067G^f?JRxJfIIm{GM_c4(9pKS2YB5YftiQIB8a)^d$y&qdV4?x6
z2r$xmwU$sbN5X5CPQjlpsWO3FNb=MS#K263QruAGl`)?bRVD;M-=$lUqSObl8O9)n
zyTQYAdz|;j!gJ$^MY>swCC}Q9-X^4$|DyX*SeDqxZC&U{l(I4L(`l}ife(B093HVy
zKw|3m<=b?93yzPV{7ji4KHWvx6|2D+@3Pbn!+y`?H$l+vwNgQAEH<sF+U(-78e&l|
zfD*DVc;MV)qaDi`qBe-6nyn@V@065y$^s?cGaL5A(dVYpp`D4F#?qy{>JT-Vfv+$y
zx2i|9!WZhQLRzUa+B(8Rje%Sa)grm9qBT1mgDi$p#cw~~^^n`9^k!IUU*vFy&sJ!6
z&5h|}aB_hq`v#inz-4NP&}k0!%v$2Nu?QnAJI`9;0;<mt4R$ft)OZ?I6l9f`0b<6W
z2Cj}Rvn9B(c~#X_MptOO7SE+e7#kJZ7&;kRoS==i(@E^i7sN>2ww(a-Q-m)p1l`;!
zcI*E(Y~}D0`GcZ%d&h4jCj-Q5n8Sk%Pny&G_;!`5bZm=32Up)nkIm`#6Lm<?m!UmJ
z#-%9r1Z(P%t7OK=8v%<Y7DT(V?j3SX;LmgBcXL<1^z<m&7DhW^8b6M%dBZg`OY7#5
zAuNhD$7JwlvLgie`<B^~UAH|vAz{v0JgTb0-Af)QLKHg^cO#ef!wOvSVWFsk(sqSB
z9V_!vr(^gKXCxMaj|~o!JYz{I(@pJ>Jk!%KDxIMocn#)}311kMkkq+NHinqGc=DQj
z?UZ7P_oq$aPK<*>O!A>l^L_nxI`6aSHIfWYeMo;sRb69Ptx)1HXf<z#ukx~}Xt?s0
zh@0^hXcfjK)8t3Xb!zpYxH*h$ZqVBNVkl3DwJI&m9JLN=HajO%oRFWO3g{eR0TNcz
zVus%Wh^voq=MADCI^39C)uz;P(lMBsg2GskYB?=$&IpMx?KNq9d(q9$3@}v)sU*D|
zX+zx%a18^P%9kAG*PW&9O6J!b-Rg6iVN&in=~NBNsERLbf6{orUMgA&R!%cLyU4t<
z1^99P8R1>N+l%^D-om(?2NS}Gu_4&~I_}Z0SmRagO`&5U^4^(b55^_@kz*<rSmC%Y
zkcAt|lR44mlkYuL#Ai|cCcn?dJI~DSlwrzHvvqVCf&EcV&E0ZJ+>;qx6G29>B7%od
zL`vJ)F|i)gTf8J4pxt)=@?*}ZoU1et#^+u&Tv`d)3tYdq3pu93@ZI&PDT-edhbqX=
zYsjk6uek_tGE)Ulo4auJ;rbrUvzn=?Lo1Bh=}^T<gt29;>X1yitSn&W&^nC1ihgQP
z;Ps4BQ9_ia(s<uy=Lsk<SbF_H)oGGYP<}w~7D$3&be~82^gAY7MuD6PJV~Ui5+y5Q
zYRm%>+N;ei1ti<s29iqT!$AtvvxJ$~8B$1{gEKH5xxxnco&wh^nx}`PEpZ7}@I|GW
zd$v!0W*7*jrcS}!i(4;}3BnKZQ$HrZ6nB>!F(GScs5%sSw+^(EiTrf->ZSbCC&=)#
zTKTZ#ASOZM+Wrk+1r#wmC+;L>%?mbOl*wTItlJ--#?(+Dhh$mNCGX3@2J&bQbw!-4
z)_SgC*t+zC9=sW^1?`evc0@ei5A9JD&h;HCw-<{H-o~-xXA-4zDyNnuWT6hVcs*Ee
znvbZrV(K%W0Qry8%QngnKs2t>lP8bGGlG9VdFt68eE=wYh{8_~YH&+|@VFa|X3rcr
zHDW1*%-H|1-(HI}vxjJV<TmkvY>Z7Y42OOa11QN#N}y~nAlu&VyH?<QCV5%6n>3q7
zU0O`DY`Fqf=Qw|LHL45i>`b2%^~th4AmrQ^dVl82%0c~E9&ep>?-GA$g6Y3G004&3
zZ;0NXJM*?2pywHyROkJyoL0KW!O>fo2OvzOGWrIh#u93hd1^MaUW7wX#H(+3c4M0h
zh{ocyV;rw{TkJbDzAyB<dFv$FIimmBJc^)Iu}ooJ(@8bN=aaM1vXhWf8Ue_VFCmxd
ziY=IIX@Suy#m)B9@tEv7YQXwVE*G`9ZSf~rbK)|p?S}%c6;s9ugGVz-mbpyUaQELP
z&2x@f(E%q}#hc!2yb)@aenod8NS!u3a>J+ijop{I#_S#c$&M!%8pH)2a97!FpGDZL
ztl1A1FVpOlg)R|>acggdyRa_B1z8#Y3=OT^N_$H=N%{Lp`0~r<WiCdg-aa?3j5#=J
zdZNhCOVhYsNPwr5$4uL#ni^Zu6M%*fMqgA7TXs)qQ*%q()bTqigXRl9Trnqf24%7G
zdQ>wAAT;YXnoN?e5-|JB{RJ?Y86$qsA6R)_hF&yjOaBu~WR2rPGm6%xE)Wf-OVa1~
z6@m3Mm2PD9le!C}7v@mqoX$tSOYy=66s#a2mj!EvO00Xo6pIeSluf2BEH{-_h*xCG
zq1OJn-ZpmXG>eNpFRR&-Zxej#+ue$3|08_)X-0}C8ESshbbVv59`GKbQKIf%Z<o$Y
zX|J3Jsg6c&vl#x^;SHlpqlq`s)+0(TxYhR-@%wi}B}s>PntdF)W;1HRz+6F<G2Ha@
z>xiW)4=>_&blxCp`0hngQxKmZI?I|Lo8CX1w%p)0S)Dw&0JVFSnsHFGOPeSkbl5`8
zk3ag2{aFd~$Jq}loPwGy<a5%AybUTU447lZ2gigoELlsV#;a+}GWz0ptj7a_<!GM*
zOt$y_1kx2h+UxP~&2m7$=%*2h;ym!YS>C=48B)ckfi6rIV7G|x@(pQa#9z(=HR_Aa
z^09=dE41QQwniNEIQat7NxRySyWGY%9NN601Jy8+cB^FC1J#I{F8i=%n`}?Y)rRFN
z#YXvCE{!XaM%9+rxm<nQtpd)ScAYG-jd&U)b^9siqn9SN_V!II2RZ-(Ic5dcD>PjT
zwl#DYfc4%A5RT&Yrz-Pzi^iB4kd%DekcsH<6u|s?3!5d6!0rtnQ_#$9LOT3q?3g|7
z%2rfZK8W)MEs3<5qz?rM_AIHYjR7uLBreJdX1(cOsGOz5GQ<ybl7{RyvdJb3GHOlo
zztlDsO+KJi)6aS_Hd|wsW!LdW!4yui7~r5wNSgTqOZJ%c#NbD}dvrT|fSOC|$dQJQ
z+D_g0oG}h>lvZ!o*i<`*t|^GEsCa)Bk>)`@7kow!=hO$xAa(sIS#sC0xEeTp3SzKD
zZWd2XHj};-BG|zIM)%3fsADr)yg~qrUso&s&R|8k^wwYSMLevxoqDzY3l1)*G1?Vn
z*N)GSvkm7~{eJRC{wemh{0Rldr)sR?km4HKs;7h%wtP}^c>IIAG%FI4&?<ORk^16K
z<p@5t2c|0T?uE<Pr2WpVbMh0aMhZbRBB$u}*#5j*E<;-M7y1;aOavx?tkNN{GI^6E
z^kcBbN3RGg8@P4U?Ue-%;%jNyXrUK)67I@BXeRskBKk)1=E4_|1ypGy?e=klvJDGi
zxGh8Aj}^z95g3cx_S!QCz%@qgEW*FdL>*cUgF6?!h&y|WcAo9S9*VqXCk{OThr52_
z(dn*e0|4~#i&Bjg<Y=;62D#-ovSw&r9Wfl6y4%=cP5|P+T_#nA=dL#CicQD&s?M^~
zp@iMGe<qA8b;ctfQ@SVh8@UCyCNkk8X33J!MaWO6X#yC|lC|Z6?L>PFQImsYrMEM;
zy+;4_6M5Um$<;aJ-0Xo5;x)HzW`IMQEG@YTqct`&Ihoaz1rB3ylRu-4*`-b|Vz2bI
zRD1`-p;?juvZ^$e$A`UbYxopy)l^~c9F$?v!k^(OD$<*ItUG@Qz?Fd7PWwM_?J=0J
z%dYzu#*Fv8z^XR>LQ-wA|4Tx&R71eM#`~4MlQC4W5Jk)4RBPj+zJoVuR>MuG6I$Ft
z(V;P5tw~Mq?655lTeG&9;kdZ^Y~pgl%`9Uo#VL^8&U#rPo6>saW~G3?p3Wvkd&<il
zoaz}?N<bfZuRuz^$<NB0puUGsF_MlEzBvqxjdem$L#y!I^v4Nw1?B>1SO`gPOpX1k
zo2084Lc9BznZ6E@h`arg5=D-<z`e+p->6VU4S$V{AXHB1O!a&@o7+atLoW+}w=iyf
zBw}ATp&WfUcU5+IR?rJva`@vVt17Dk6%#&v`r(Tz^$>+0ZZ?!NR;tRyyZGN#06T~t
zca=8>Jn#d(^1^x9)Ck-f{S^0w+%>U?_vEawc(q|-QS4D}78RdMut{Kzk+tW<%3S60
zIMut#G5N3GUe5}i(0(YwQpTuCt96DbkIBXRqb_`-R46*c+BaEau;Lc02+L!FRBIL^
z!(rkwcxoxA5>2GW4~th_+Q_D7J<m@N>k?}j(V3blIb31_e#JwN=ik43=FrUZW*;1%
zKk-gZJ>!(}1&DS6k^Mlv#-&-s2^EmbeL&bNY#0R6N2QTej=SaR_ZI;b8zdd~Y=w&<
z+N&DQR9$Xz*3Luq6`xb8zF(9sOEl98vcWnv?V`Psl=WD&VV>+-3p}-&+@5_%s|)N*
zGgo;tB_LBUxxN`zf^6T|fzuaMR@g8Y;<ngc?%s#EyG=YpDF)ww9C}SC&Abh!>0zLt
zGtZS_BJoUEC0|v}3pXhwZ=+(3w=CBsG3GE#x^e&K$~duBxi_u4YJN3t?<}rXPq9M;
zM@0w`Y%<H(1d=o?jjirf^weL98nGFeX|av&yyag_5e@NITkK50&(Wl|a?a$(Af%?I
zKF@rS0EEz-vQ-|X#S||RWWuS7baQkKHZs^E?s!<y!CgO%srk&}>2`eBTwVw%>&T<%
z)iEEV@}juHDHj5+#HM=V3;K&%B`?n;yA)l&KgihzLvFF@645iu)QZ(8?`N=CZQ6bE
zWG!j5HTRrWcyqHOFT<)Ec_Qk^jd7{j)Z}gpo9nn2u7o+Gin$EU7@1XUhKk*0;Bnco
zDR+Dk&QrbAnVonk=01KL!m^A}X3-2T7pWmDs>+|UyI{=4G<;{LJt{sE*<ff*KR@2;
z+iegNNPaF7LE2XgC&gx#p|MyBk_oFO0@2vD!lHJS%f3+Hzxg|LF)TubjZxLvB_Rgu
zY5c|^K@M+t5l4gZE;OgKm{e(qgo&AuJ1zbf9UD-<gG<q(OmVv~G=cvM*vQM&$E%<I
z=7Q{&oZ;j$#wU#?sS#QtM*C8mu-t?}c(knc2XL3g)4Xp4B&$8G4SrD7@f#aNi_?ha
z$#sTTYDX~w>ked-Zy}nVAIF_5QF!rtRN}+*XZ!qDJjCoIq=D<yjiJT<%skf+_1Nx4
z`q=rPXVM&#Wu)6~8S~>Hj&`ELLF+gjIQ59NiC9{{Goc3ln0^3)dzQl#`L!!8K68>h
zw5VBCGy?=p9?uBlhJ2k-_@}h%4f&m&ZQ3L;)<S|@m=AYoOFj?3t=_0abATrF1<x>%
zEOvuZ_pJu)E(M<Ru4uUnZn;`~F?LfB7O>iCdN$>A7Y^&llnd$G_&QCPDnpWNO=1(0
z?zXE)WXS!{1y^`Zt$bSQ!}&h3dDngLL(j_yPHp_}3B-h%@QZgEf0`=#8-fCDj-3cp
z@)3nD1Wewe-ML@KELFl~whUj6X)VmerVO1OHhLY_9HCI{)<@MW3sj;UVs;0XMlL+|
zI3}MEG{vl1%w@Z{gyV(z5Lb;uVU>1ddb(;wp(dnyW0I=UWVUimCd^lbEA91Mu0bbY
zyMkot$_0sAho;QSpqrB3Sb`EZ^6QI;WE=JG{$ZXH!DyLs$;hyKr~snf{Z$5D-vG@O
z<IIu9MiZ-fhh%4DymM2JgIldJyYidui?Yp0H3f?8ZEM~5O=fisF{J+TJvtYR?&tJ?
zL%1oPt#kMu+uC0bH4PqP9QJwbK2`>O3shKjvoV~p*moH3cX@yHY9Cf@U62^gocFT5
zMjNa%cOJc3IzG%ACOlMpfW(da+ET8fD8)_3mv(fS`W4a{R-cCrh5_!Nb9PP<Ce<KN
zcqIF+d_tWqZ&FnyE&OXj(m<24-9o$~XFad%J}NbWR~a;nI3s!>+1I2U<z#R&C|6g0
z-wS6_V+;-eg!~?R`{T)99eHC?R3lcryhn~)lH660=CQwi2}eiZ@4V4tvsboUwK)h}
zV1(xlcx%<Uq|d?MB049EGIyLzV62gff#C>5d*V$P56$d?(2kXpAGFy9E$x<h>Czy6
zN_2QoHf46Z%`ktnth~eV-z%4Tu{|i|iXVboexTw(KJOiN^g7!y?80pj`-*-~{Ut3a
zTRVa^YTo&qTp5rE5@~nLgqN(@Yia(FzomtMb2=6Kt<?_2v#k={Jm5lt{mT%pMCMj=
zMb!*$s=NGvbXBp%!eWZ&Z2i9^ln|uy%=BVO%&f%aGSsemDJ_+|Vm1u+D0QioLG5H8
znoK;RvvC^FzS!6`tz~XJybe7DZJZx>z;y6^J2-t8dP*H9fQO`mtN)i1Uxx~wngng^
z$v#)n7;T-+H!|bB!9fIr?dZp3D-&3rw4qE@hqEzv#crQuTNypOhxIR@IZw9q;C36-
ze1zS;Khst@JhOTu9XehAOd{h(?k`FncE}B6b?XPX#%s01vmUQ^Ie4q&hE9xZZC7pB
zR#tZQ1+AnaQ~HJCX43N;i7!JEdVuPmx~1-?-l4;LCfQUKTilQq`soV=p;^TD^HgCP
zM^=g(x5S`L8GIo4b8IGJ_BHu8E^)f5=^yF3%THARRn>YWE}=xeFI9CbKJ`H1pJeQR
zd!1X;&*F{FN*NgoPC!om%-}AF8?h2k2N@?CQs*Q2*^AQ>2dB$B_H7L~NsU!y@K@4>
zR~>j%wF~RH8;*KiEOC#DkwJ<`8SSs3D2^^o-{9vVp(!J$RJ78VQK4CoxfU?rqBs%#
zZi{J%Alxm%MscEVLungiJ10|=D4xL_u<uAD{g6n8$$&(0C#Fk^8*V_~=_QDbOd%7n
zi0|uxEKeZ!ZPC?>|H%%o*YoO<$`Yrv5j~CIbw@{?{Qbs{^bYuRnf&tGR_lO%C}#Ln
zxCbKgP)Zrq$?U<f2>G%-3B%T^@a%*Rnu{-M9Lcx)7waxl)n(@m;yNp|N(S55$7K**
zllPO*B%G3=)(SSkwkY{|`!w=1?jtTS$IK|=#_sc=2lMkR=FcR#;{e?v%U+*yhA)Fu
z^u>bM`ud&2t(k+*ALXwIf9!Q=b@(hF53$+tyU^l^9TE!dAbkM2a9neYESGw2Qo}t|
zTJB6CL59T#<|2-9Bc$ee?aq=3J;PqHwVvmctD(-p=ueGT@g!9TH6CUl!NGP~%IXs7
zd2H=+;j<I%ar45bjJ3ZwJu*i%%Lzp0HrbcNFz+WW=Wf@szW<L(4elY0wm9t@U2LO6
zwg}ikHGzP<(kiu1(or7t1gjbVpNoMCSKXR4d1loa%izas81@MtlCwLDe*ZI&7o9gS
z17bDub?|5M3A$r&X_kz=)*9IeHN%&*M#1MR*?jtOBY?bdEf&ck@VkKW5Uw-=msf*s
z#Ot}A#IuM@6PR^=X*9EHc7)Dy=*&j0d~JCb<p!J8t8diR#zYapBJ`60uNAz??Tv9y
zk()7N8GaTU-x>c4w={A+;rPS3R%+Z(Mxw!OPV>zQx1GJm(-lRZiWy*)sM6<V9+7>}
z1uvak=*Suf>qBW$w=g9eN)PY~dL?Py2ECvTQ3Ev->9YH3jPe!6XB01FOn)jrY6Wci
zB&GqO5fyt#@9Hll2Z2J(lDC@Ng(*U2f{`{Rai4YEFej_o#Qyey_iiW;YAK{k=32BQ
zy<}thRK%z##gx>4$!98$0!oj$;FUupf_O*GYJgu6yUiJ#^&&uKsc{+m!Zl%5WF`c2
zdWfenGR!EvG!&&=ElTyV&e@ocgX+&|GCj$`_GF3QPX_!>bYrV478L7Tfl5dgT(9S|
zKufMsHj2+&m@MZs0!;qiaw3Pm)9LM6Ue0)6wG|0a*|2iVCiN_CVIt&ie1bb#yO^Qc
zzDaT~P6Ec7AH0z>RuR@UFF?%6^J*sJ+6WCXRbN#<bsGMfOwym3tGYctAQ-C5OP+~i
zXVWBYFUwqFupq-XSS3JJ7xKedT|;KHk|YA}As{tD4})8q45foyw*peC6EGIH1gJ!-
zw159blbtb>;42436AlqRSGXu79vvE*`dKFQ3M)tnqMkVv^1L^^nB&4SRh=XdhSbwH
z8Dqg$*uh?w(B#ulc#pCvZc(Ac`<OZSUA{yubLr_6y_SApKeI=?baqkcg!=1IwsDZ?
zn6)Zn$mlN?o*@s{u<%*S#r*RZS~JCE!ST>=Eo0YqwR`(7M-P9r2>g#;bXmBAp+Kmx
z&$$E6X{3wKz(3}esF7DLb0Z%~8Pkm|`V(ZxR$*c7*!MPaJ+kp@_`HqFK<UC+q9MNf
zn6Rx74DUfj#s8-O8O6d+uhD^({CBNU5p1iZd*r4m3$$05Ve_vg*CY|F+YV(eT<%(T
zxMba$pS%8KyX>S<?u&P-VKhxK*SIo>l`gDI>w?u6@5!d_@KKc}+9OHqBf|9W4f`c+
zi}|~>?BkgiS}q&+?utMm)(%@t1i~@a;oW?Tc)SAK`J^qDVJ-lAE8%vE`W*g^rSc3X
zDQAEywyLglVx_^%>C@yK8)KP@qA{X>yFv!>Hk+_`!-)*-#2D?nKW2Ib5ml!FvyD43
z>@v%#j#lig;$O59w{BceweQc00Cp#?T^LJ!(YW?Qu4btny@{8`=jcD0!}v;rT;uxV
zh)Xq5yX8(6HLYE571r_FVh0N?o@YtAxp}->{sZ@IBC*BHPbXH$fyY^>MsKxse98Pi
zUIz%MUiKKm3Bom>MkapmMWrnv9WJyd)!$cZFEr;T@k_wYqD{fYYkIPrd0FEylZIzz
z$_()5Hc?I}6Jv=Ki9VFoKbLFP#O^F#wLWQoR*wv@!7XJAE_cJYSje}Pi#BV#!06xz
zO@t=c&~Ho#mD$9d<8d)YONc3GFK$nt3sd`bUtF;N=Mt$*9|lBBNQ+mgdqSdFxpJR{
zCfl$kZcwRim&3T}i=h|3?4@bqzG7lF#}%SNNf!jpTW~_Ea?1c;0{k{Bug(^!AGUh4
z<RAo1yb48kpPGh*b|ayPqd=qIp8|{NT02w>rnEf#Fyxg+stOC#M3GY(=$Dr}&}JG@
z#(v3T3C<aAc@2FY+R`myYRw$-cX2Gh!=g{eG`P$eKPD5${u<5sVZtkC*WqR+lR-cL
zYqC<_cbCoAS;p?4<{=+ds?yQj0Ty1;KisV&A+=Jg**Mhogj3Sl<CZBqzn^TJ?7FXz
zb<HT8^xY@>PFv9MfO{8$CsNB+NZ>(rZU}PllhiPqipo__+)Qkc8d=Io&YHSBkf~6A
zo(Jh2vm&N@zwO)^)w@y#>R4cQuoN1OXaD^q*Q?R*kHM961~r>i`t6tyOc{S8bvqvu
zWrLjp=~;-gLp>%ri!J7U9vxYDJ+F-xRzp*4SWtNLfI&`agh`*LG}`6)+RmK(lzR?$
z;K3*jNH%^w^{k7|OevkZ0N#v$&J7nVrXZGmJ!CUd04<Xe4c(V>f-1`i;^<4SewxLT
zcN*H3owT;U)AyD<7dgUS+h_1F1MZ@2G0<Yb;(1G8u$qneUO;w<ZUA=z!pmzn2xa05
zPT<NRrpm^2+CiCWtjV#ZC$V|O7Y5}|Vh?J3cgbUpv$?q7roh1MV@W>uDujo<z^~6p
z$jRWj#=;cTdUaOJ7`rlO<VMZEPKl>G3}sGjut1z=(AcsafQ3FFnkaJgXIQlq7n5Ef
z&6)YN7s_`<M~Plb38B<!*SG2G!03)2EubVE90k4gMkO`pG26l@Q_148XGueb+cg}1
zUO%f3eX1XmKP<f>4f?^C$@afM7mda|h@a*s?-0~AE*eAfB*4_#0SsY6POw2lWot(a
z4r}kok&HaaQ4Y{3Kp>0ore#}Yk6IAFQcW2&bq=mpp?LmQqXY&CFs-K+58ZGhwAUsY
zeJ_I1PFt>>#LQx$LQzERY}u%9?b>oh65!@T3&)+A#dlRL;E1?XQn(NKTYWK!M=2)<
z$EsDVGq~4&m|LNmY}MS@d@tb;qa}RL7;sT@DsIPa#eL3NZ-D7YEIu+xjqUs3Z`FQQ
zZM8Fc3F2v1bpHMwlJtc5A88VVeloDV&keSoZZ`4>mI*Yo#wEshvmzFRiQ%fIzY30m
zC<X>B&`TyjDe1<LB0+pEl-PrPVSJ$%opOVIMWs{L+$4*%;-Z6T*bGqK%G8ZtVtx`q
zB7yPxML7P!!WaxwmZ~y|x^X})sN^c)H<M$#MSD|g&1a#5eXZKbB?7;2LZc)nEi#wl
z6uQ}O=e^x7ymov$|0TBHFYrZ+{scQlgLA&16SP;u1e(*ZuAg+lxD1?7KClG>Y$(Tg
zCi{yLGq&~F#z^>`bvH86oJ?$^dBw=K=yZ?wO<pq|pE^0zmKlB?M}@RY)G+^B)1Djm
zvlwjF!a1eVMY6V!w`w@&xs<kE)h;fzc2)u}L&xXz^26B56gmj}3ksiD>02hyhg0m3
z93fzEP%CO^`p*n(cOd@|T7MU0$g&15Yx@Vr*5Nhs<-YD=x=(I32Px@7jqV9kmSW>W
zjGOrcnM#?u4E(t%zW4xyHGu8nb|~yEQ)csP{~Pb>_Y>gg1RLW<s1MX^H#7y4K8OLV
z(Op28hpdGIg~QG)#GUeKGnbyf*1~fE1us*5YAn+P^I=9jZ%nO(nlVKJX}&>24zK%|
zF{|HCk|KUTA={W*{tm{f96I~pXWLfK+}cI9qC)vS9mDwn?@t6q($JMO#hN*c8~5}<
z{lgv8z`8OveE`<#AU2C@ogfPqP1V>AV)(19JYx7qJB*obHmPMQEdTk8p-ElGLx~^+
zXj@x;Q!6~LnxyPTa!mE|*7m+p{erRW&)9S#W^M<ns0c3IMA_`4WZz>p_x8UJ@vfFJ
zV}0N2x&U$8iy$thJeiN@Ahmzvk11=GeMjACY}K>YC)qYNTqEORq%s7m*WpD)@-XXr
zY(pR(&KXg1nPck^rls=6xOFPoSClOOnbX@@xzZ}%p<IdAh3#;E>NQ%l0=z{Zsra4s
zcKgQEC^k4#m`2am-$=82zblN=yOiQ5_*`Z$DgIgdc5IkRCpj?Z`DeAhcE7j7oK^t%
zrL4Otxh&5zCVJ&zhezFq<AdW<AUq7pw15wR(G%%_cbd0IpT}KPCU1^p4iSZLkz!+7
zsf4>E0X=Iu`auWeOL<9C_MwXP6O2k<&r|+BxDWQ07Q4bv(k%vDEoRLGJ#G$GpQW7R
z(qq$&c&Y$O(&%2vIpPS>-YNMC{iPozf6%8oAHGMe^yvg>-LiZ3O4gyH2ZYA(AA+Y%
zCY!~mc{=-0)q^iOe7-cK9E4BL=u(p{oAfhSZpY>bxECp46H)WQQiFel<Q36wAS6Q*
ztnu-}@X54=L#T$o;}P-lCTdhX3(rKDFYJ6XcClePPKA@47!;7`P~UZHG~{bc!*$!{
zJm-B?vw~Y+UNJj6Xm$<_b=`HliCmJ*=%13zAV_A7uSwb?P7=dT(o%Z2V$XxgZv`JS
zBU8(qMLyV!R!lCN^*Y-399h|AQ|h<d;N~NY`;O)dfJ5G_DyZ85tzwu2%}5~VoC121
z(gr1zwi$yHL<ckG(g;TKlbCKOA28Qp^475tL5=uM+;VJ^#h4S;rn{jRC|soq)@^%e
zZ6DoVN4%!-(07Jmnt5{Gtk6NC7KkjwT6P>ie}R@n=l#(0R6H3YU9agDNL8u2cM9Fc
zww1WJceGWj6z4Jx+-i`N7~N-(o!T#Gdbg?33*gg9bzpc><AYRrL4?wIzIX0t>Db8@
zzE`^AK#?&1gRE<&@6GFjyFdLL{=K1q0#8zQn3(901Hp}U%T7V40(fS`IS3^<)bn<z
zk6>t+xOa$Lk>>hARkc+$;~wYp)|~S`--SoUso;=ft9i{SbGjM;djZTur#1nQp=gM7
z@Lz_?!xm6~#2CT>PRmg=(!z17=No)wYf|&-;L96n@b4#oo!{H}xB0xXzEoYtx?uVb
zWj_oD@u@d4=W=w05NVl>NJZZ=*T%xb-o_A4>HYPgqiZRjyQ)(zpJnZDgEzUQJ$P7g
z4B3u<3XEQvY>wlA<@`n|BLd1MxBx?9+bYE~o@NC=lS-RWltp(-<_*~#!xGn#WgOn<
zGDqNrdR=yKBIMy6qo<g79_&HBPIn~ogRen~;|+SKH_P0Oed3(h1OCV-)FiWO*CZWb
zCy9Rj>Pu35H{>_(E5}*H1+R&^Q6g^A;p61LpQHuaQP8f-_hA-c^GY^}$FZKI7zwDF
z;qvj5)0)LANGi|B2HQcdG`8mKC1Hv+$y}!l?esp#V*rpS>-Cfn8T|d^fAR7E-5yXQ
zpL(NSr7rhAZESk>r!r~Q`1K;1H={WN4efQ(P6vc-5Yt3c@ZWatJiT7DP#MJ!nvDrf
zNo(=S+y)1|9m$g7S*D_5B^va4X8-5xrA;H%?lz$=J`R|>Fkj>14mmcBwZV7AvI6@j
zKa^$7vy>e)p?gZH>DMqkT7C*Tb5Z`(^mMfm&ubobsf<A@?jQ4>w4jr=3|nC<d`bu3
zgSNR{%*B&+OhL#<lW)TPn0YBrg357^5z6G6`jA`>-I=d<Yb<$~Xlz-3ej9f6>|u5B
z_U!{L*<yd$n6z_3W#L5VI;^oF(Ai+2uhUs69%6GlC_h}YO&?MH*wb1FU{Y?6kSbT2
z41r1zpBxOH6Jb^IVB+VKh__u~tCK*@38IaH6^Z1=PL~tSp(d2|LaQO~wq{d{TSAJ(
zPw=la$lI~HD$t6N*Asom38zK=6iuu*4Pv(SJ=dWl6eOd#Rcc+;l!qJ<H-_f!*H%~0
z4*oqN*W(d~42Yz+jHzVU2!j`BC@{x)9y;_;mv|8Ak)K9gqR}D5r1dpF%XGsN;f!uY
zJleF~Je-FJi(f8}ovnakV5%!O_@Xt3KrNT|V>nOt#edj#`)nDl(4i`gHI41@oNSHJ
zAIqyukCU0-1FOdc9iHvj%rgH+%53YK?+lkXhciLP1qa~fB;9H!oB#F7S~04^9>G-r
zt!o{oBfrS^@ZG>P@TZ`Ga}U0h4BV1;B5a(f20E#eRBg>vRf_R;og!l47)@+DNck~G
zjw5{KG1!Fm*$??t#fK7p-^(BSkDT^!A8JVI`_rpYz0n3Js5C<4y&`|g!HpjNX7euD
z=BE3{m#1Kv{O8p}VtiBDJgQ`b$@)ui<u1?LZ(c>1>GW<=YU6!BexIm!twXR5%LBAP
z9ye3re|n!;YTw$sE)jo7Da?a=UB3&P#Fc1dQ)W|csjRb6*!!ogWjj;hzef;Ru>bdR
zQAe-4rfIk&aEAhC>-pa$g>l*iPa3Q#1a=+KeFybIv|jha@ujhQH_4_vtK~i-ymCw-
zCi4&E)8EVwPjd3)nU!T2;fyJKQk-PTmfF7D>vW+}*;nBo`<%j@V!e#Y2mKkY?G&dj
z>x-8EQ9PhrMm@cay6-&L(AYMJaRwtsA*L3&>MF*3C^(!KMH<*3>5=hM5G^0trEuz~
z>=jPH)cc451Kq2V0EYr?rn*fy0f?JNC5IfZC0nJsW2*Akdsy`)WL;iZ=U@TR)Tw=L
zB*14$UZ<vRoE=71-?7b}xhPB*{PH%xc=$u4!OyoV`@cun^n}*!^AgiXYIe4lzPsYd
zXz~gcGBKUS@s!jki5JT)V=e|?)k0l9Tpl%~trs*K*OJ3g(uRN9(hV$lcRv691RPh(
zutc=pXeX*#E6aJ&$m8?=@YL{@?l}EX`tEOu{0{0b@tczjZfnz`q}4HV)Bw{z;sQAD
z2vVi7;6y-iV!sFgOxP@7#s2@}(Vm5nl3O|Eb*GT3Are)QJF`VxGqGDHSwsy1Y1?AO
zFd(g;IDxQdOz$rDZ(*Y<{r#j%L7d=aU)3H>Zi*LEgs7zp#^WpgJzbjB1NHu_;XTLi
zCl{?CpV<@!LzMmFoiKkm6>;QKrw3}7vhCr+_2{knP3OT=zRl~5Q|}><EDOP5P?kM>
z2>3#G)4A-FZ|XYZr#E1REO?hey556Uo7RdT9gnn;iC`o*l^S!9%q>JQNLu7itSbNa
zFE<^Q55RFTb74*k{^1`o*9ie~nMLo`)L-bXF*NU7$lrG=Mi>v=Z~Cq|6*J=`Xg4*c
z_q{<&@s-AJsQRxRyUL9Xb2{?!TqQ_W>2Gm{aE5R>OM!1PmUk@;L1Ncw`kPkna4GLD
zic<o2v>zDlC-V4I2TXD?1KK+5lyuFzhmUxZZ>H_h3`Kjgqn$@vO|qj--=oMjh0MWd
z&k1|b)K8DBdNTC+%#uZU_o<L47``_eV;JdqXEME()%N!M%AY2y!k{I|oN&mNsy&QU
z0S1*&L{hOMbM_cL``=fM67PJ(^^G5&(lK6**O~?egisXkTcuD5=M0AtzKbze6@pQw
z7M&IPT9k=j2O8#yU&m;NoML7}Lr!0{0dKFJBu(=(X}N67nU9L%*#;i=-PjMk#!*7Y
zK#5#a{kp~B)+MgM1#9-Q#Q_6zy$)4JO|DV5FUN=>#R8eCPMKm3U71A;!4Pg;SJ!B2
zYT0ntG=~OV8=ed8;Gr~YbGNwXpiX>tV`Z%=jfE(W<0rXl!lLa9_Yw)1Cm-Brbouua
zQnb9{4ler4n(ioDlgH{30=WN*cC0GN?*qI>2RqnzIQ+&_i-7N{MVdvGm!fPQaNpIv
zC|FLRqAJrRl{lhrjj)-5liV;dEKt{vTCx4y?L7I5A$P9PPa2p8pAW{Hrg0y&?Qg`2
z8D*M{?fm_ufV;eyUl&tXco*fjkW%bgzf3q^F#~pgb2tO!IeoHE@RJN-+v_)M+x&o}
z9|YtY%dqV}N(A8e=g4DPs;2+vp`u5m-@{V?JpS(+nKZSL#~%O>t^zK=Awf>z`1Cw}
zczj9%B4z2&$oxJ|u?gsE^)%?*gWb*r30*$6J8zIffdB8eApZMFY)0|I*~&4CzQT`6
zs#%Jb@%^hDi66K_P$I3$^!B5&^prv=Vf04Y0F}`ZX6X+ugVFbUc-N`=rcSH{$_AAh
z<W2X{|FIfs%#VUmge?tI1gUtWC7>s=01uA40A42ef5J1rX>AWL`&Xng{v&JJo6e<x
zta<kc4ySIxPsvY(O|mS|c0wf!1;|eh%%!@Z?3iMG;@Mj#penE_+gN|$|BfDy(e%HW
z5&sU4pu?ta{KTOSsJW-OfG&MBmH+CWmyb&5-#6kjau*(9eM=*0n-sNZbILddj_}OR
z26_*Y_K<bET-EPIYLDhGPyS!^3k=wZ66<u)N-!uOKQm0-LfrKT{71xw01<Oy|5xr1
z-ra@S9GZ7shNqOnn|@&U-IB$rM<O7s9%-8Bu~ze>Q?3elp7$Wu=D(5*NVKzG(cnV?
zAm3cFUxf6|ohM^72uG+^beMM7Z?#GuCR=;kycNF_yFZG8;pN-kPuBh48FyQ2*7RV{
zBvcq{8g(boM}W9*neSNWw*Qj&2PJ%ghslX|gvt+ZZ~+Rx$~`xuJ8sAcblG2^WwT8~
zvVaY+RZic-Cl1={XNm7R@sFN&D%?lBxkrm!)6JB=&DdPsrutEfKthU03eW8*nAoDL
z-B{v^B$6bo-*0&NB}?H%;JX$_4InLEo$uukfk?}|bVs;RIedfy&sH|0vt?eLN8$Uc
zPqM{D>l9<)qD;d^FQDpG=m*tnnVh2M>aNnI5Bbc#DYKam#@Gk9f2g#5dSt*#zlC;S
z)_{$?PH>z-q@1j(3_%O8Bz3Q36PY?*idr#gEWkl^|I@<!fO@t-J0CrmOi|tSl(t{T
zo;Miszi)iGB|iP>ZmZ(^^{_#}>HD^qn?k;C&^{(FH-)PLPARp&p9<FmZ2DNgMBhxk
zfuEOBg7&nerecRnXM9Y@_Xtje{O$|No7aVGe?Otx1H_+idwC~g-S4b_PGnr<q36at
zLb2CbBRlcjOEGRYIbfpfg~qF`$<e#v;-B8VKI&wf;_MKK>yaA-!;p{CVa834uk&uq
zWwu(uklA+r-PWYTg9*E&*mYzJ*-P}m=#e10l*f6ZbgNi9Mzh+3d@y~3OZ!13R#>dk
zS3D!&g#1n<_B`1;q#V2<<aJ*#CGtzS+C839r>*Zz8NxSY>NuwCC#9a$sc?PFrjNbl
zbxheWO1|^jf-T|Nn!By3<m_{To1yUsM7Fk$--PNOmeftS=Y8(IMC;Qwv>56A#N8i`
z_-)1%2)w?dj2L^*_YKRj=M&e8hQFU!o%>%?YK!#V3{jmURrj=drcigoWx01fQ*|+^
zH&dghlsY=X&U*q<Lq2Af*TbbW0L^;<nn#^xHIr?rPW|-W^_(!wRMd_*W!l3PHsiYj
zA|jDZzG>hFejBtq<*tAa3!t|sHl3q^k45q_Y85lmhNN#(4hmWe|LfHr0_y)^s@Bsy
z@XZ&ICwh>>TV3p;vGou2MPXNet}*z{L3yM^M}Q0gH%X@|Z#h+uR=FNd7gbpYb-wHY
z>A$XPp3+3HUZzY^Q~gB63<L1z29@P;PWb9Q$j9%Z&3d@<1FvJpmQ%-;K{CGiK(#*%
zZmhPe1<OB=rhUMlSYG#R+qFNkO*w~HwZW?DTLpk$fzAMH_w@5G^KC@-s94yMtj8%u
zakz54)vfs_B<ytvRKr>uea#R7utSMlgeKiSE}mNu+iKkt{q2pu-<Q2(MZ>5~pZ5z7
z94#zkFmV;qkuB0k$K&EUt8y7MMYieO>s-LA?j0G|nbwmrA8pmclYa)LO5a$LM=4FZ
z`rPH-`rHCeKY-!`c|pK707_48P}(^P6h6-T>y$Hk8RSXrkv`SnYwlL}z9vhm)UR?&
z{{%mT)c56!_3#bFow%el{;QlMf9Bs$cHgz_zzSO&<yr`a&j}L!q-cfbzD~{TYgoeN
z)s+@2XA%H>Z85-9@%|b9GcS?fPd4Qu%UBh*<>_E6YX!RQYMH^)c&}*{kVV;fwv-$_
zo{}@`yVARXneV4s+N2#tkWwj<H)zRws?kxAWFEgVDV>Fd&l$xVzqktG=xf`UejL3n
z-D2(gUis7D`nC1`+vL~dc*3kFv;z>uvneS;!k8;fk&of&y`~4Uo-C@JL!)mtLAB!7
zk-uVFO{S^5d&<R6g{(qKsfK++c-xrb+cp?~KS}J16O1;eO3K{SaQ6r!9hKa99RBll
zBsh>OCl8Y<oV3sDjaC?7S{_Vzqffcn;Rcd+3@#&i^WjBnW`uf~1r%7l@ty50$a!3X
zB12z?GBFiKrGlnCADIMrTGC9;h-oN5^2h4iR7d%lzV0dobZ4}hc!sJ@T4Hg66l3M_
z#L#}2e&Y>(=tkFkHLdDvh;_k4{UqDZjLrJ8LOxa$AzCkga{><U;@g{9=Wwt~(F@_E
z^M7WRtl+Yl&euDLzK-Uc#3(w>iFnAx;IAL^Yh=GEeO0;}T1_=89OuuaNkhieSlrCV
z^ljYLEzx-v=FM<_H<!;K+C97%+z{JmZtUOb+!Q%3;$#QkM@nnyP44i&9qe`_NT+FO
z=@H(#%rGHd4i6tyfgpjdbw-t4FHO-DDqxySJRI=6=$oCh7UJ&)$3a{SC_za{2BxGj
ze2}YM`&<!YY0^Y9eQ}h@Vi2LT0YWZvrf4cK?lp7yL33dB-%{MdCseqt@d3EM5)=O1
zj1~!YKJvMVw{b(9GX-;LMJdx+IeV$oi^X7$)h)=jVOJhO1<)KTa~}i_MQF(1=~25P
zfkj*^+LfKb`|@sdX-s?U0|#HjU{y%So^hXdBnEMS-&yCPej30J^@ojk)>LZg<Yfk3
zB9T>`)W4tTx>Ih39KDZ)u|H7cRT;iiN~$CKdcR@5`v7~FJdNKj>G+d<lLdc^vE(}P
zW7b3?^J2pLw#3D13B!IflZbWC+;2l>MQav6a#{#mCC_v3^UvJVhdr<0h>Ea5Ds-jO
zr;v5NFlbU6r{xeH=_GQ0H?>KtRvhR#u+iA>zuip%=006!L`IIA>w4tPvUR2gW(A++
zn|VhQ2co-}Qsb)HJf7c(y9a6U(Vp=3DD1EG$-UYMubk`3*1-wAX|!+|bq22&%g3PA
zOr>~S;}?U6u?-H8f9ZTGQRg2~z}2f_JTvH|ol(~F(Kt7#qN^Tt<i){u;X6?$dhG>%
zwZ13%SpZ9!D4)zV^XOKo3uk27cMI3ji9ubd!@Byx-0#ehV_rC~cR(l{j*RNmq&<ym
zBqI~ayH2%LT72%g8_bJKhAX_gP=rYnSE4alvZC-Y>JuREc>N9DGmVr#bUw^IY=Mb4
zbgr1b_n53g9zvtq5vWFa^Ts52BDi8h)op;n?`)#~ho#{?H|Lp)J%NyfYD=%hA7RUH
z2S@NvN#?#Xz+3Dr0<iZyueg@#Bn+Q{B1pXD=FSftcgGJ^CuY~p%tF@9{>YM4nzIy_
zAy`ksLzLrVp;L@#L_JYEfO7=SL-r`sxUheYh7A&hXGGbdD_ZF4Ws80_+Mwg$T(j`Z
zSsQdhUDe!@DxH`OxT1HQ(@ETs9y*xZO)krVs#R?mDsoer^a^8^*^n-Q(+gY8yS;Md
zfV3CQ)YJT|#+P%0NM7khhT&r}#(mI98a4<UI(Yxw3LY-V^K+jwh=Y=}d-~$-^7bCt
zr<Kz9d@S`iLjHAV%=Z?_M0XfI?M1DelCgu`p^y<ud!pE=rbB}%Vuvw{{xFZ}t{mL~
zb7@w7p<{EH!5hX?l-&7KYYv#<qbD>;_z+#ky>rjuq)K2-YsvZGraJgcdVA*AufBHf
zV<M~@gx`fcF&#+!i&s1s`yFpzJNO*8a^;=^Kj&SX(KXx2XQo6Rk-FjRTUV;iZYei9
zrHXoHzCxC`Mm#4|d7|rfV}Vj@?LYc2N5j%Wv&CIx!E(f%&;obm@b~o1*Eub;>l>Vo
zaG*YUnF}-r=mMo21s$h#Brs13Pe0=z9fJ*>5g41U7QYxLW~-v0`nhueY24vwuN+23
z*QCl}f^M%j3QMtSDy*kw;xeXQ{!wCXB0<XxQI}xA=4`T67mxI8Zjp;rO6(w1X6yOE
zud4@oA2yT!64<~R1Y-2dp>Kz`OH?z1OM5z2B9@@ZL2<(s@D?DpZLxF+zY5Pa67HV>
zR$y=-H<kMT#CY-Af+Gq+)l5m*X;k}n3XEJ$jdSRlk3Misn-rj?DyOpk_N|V{K_|nH
z?%-^9o>bdp8$-|cvg<})D98`D^)g*<{8S^=qL>|$6bDtY*7&j)m+jH;)Je{V{Brv1
zoUmvq1|6sKjid^jt}yHbE4d2OS5R=L9^<Ef65LPQ@;VV*(iaxcJ_%kjplv<V2W!AI
z&)lA>c)w*2Fv$22&;}z*dM#WfSQjLYxhSwXE`Z#{hwX2sP@myT(5J{l^Pn<2{K2wr
zCrJ|E*K_j4M&8Lg{pJMbX0PRG*FjCT+VAwkl-lJfGRNWsP^re$#tPMV9HjLcJA4pt
zZoQ^1<0gfq=V~oL1E<2c>&P@)K!9oGMQSdPVO0U^1an!dt*DTZjmQHUxtbRpWsb;~
zSLdtcOXBo*rp)2hu(-?Lh-U9M2{DZfXJwaZcYpqIQWf+uj1N~rD_Ns<(Y80pvQnq9
zA#_KeP|qP5QqhBPVA3>K#Xwm2`^mTT^805Bgbb7TuHM`Bg9#7C9tjuBC!A`js88UQ
z=gw~vidk;7G1M_WE(WXrB_R=pbuLcMATJc)+HV1Gi%W=1S(NP?$>CD`l*1*vUc*w&
z)k1pG4A4w=$L%<wymK7HKsMl(5k~bbnBK-z!_qBYjk8&x8Z?NU`xQCJ@Cuz6U(IQn
zyuWRFO3oce=bSin-R=_2(HYx0`%VqrR}GR7^XJoW=B;OqOp^O3W_jvKB_N(}+Q)7*
z)GB!<RS{b8MX*^8H%@LY=<Q-);1xy~#-~+-3EbYP)XJKUsKP?$C{9m2b-E}FRJZ14
zu#K350ni7=zJ@4vb0Ih7wzm;^h?=hb{RDB1*G0Fh*Am{$J)>Dmd$^!K%Z%+U&#%8g
zlePm-q94Z^S+yBTvC#f<8?$>Mm}OrxXli=sF_NR8kNGYwUByv1KV@oP{x1=hli4)$
zAm?4W|Hsr<$2I+Z|4V~(kCB5>N)1L!ZDVwbgrdR-M@k!nQiIVONQ;b;@(lw-N+n0@
zC<O#XL>vf;h=>AyelL7~KHtX={@CDkUpLM@_udotJWnf9>|9=+b=o$@Qy%7m36q_+
zsIdb=X1ktPNVI5|UWecd9FGQ__;R)L#tJI4!mMU1>Mz3yQyS_v?wK0`@;L8%E$Rea
zQv4KPsHzQ5c<gQ?$dR{HOw7PxbcrMVlotqcvonVB)--IQfc_t3)Yyl)IS$hJ;C0c?
z=`?xvh5$GmqGO3I>M5`$cJtr9UsT*BxtX+kBf#c$v}Q1==OwSV#SKy<sPJ$XdNg5E
z*S9EFcZ`;6oLK<kkDR?Lw9pPbqp|N132WzbN%$J!d$O$vY!NY*tzvr(C%m2<rNL{V
zsKpm<c~#vKXUbMHxL8&CK`?mS2j*+jV9*0&(|mI&OYUQlyryq(^{mGHvYY4-n`S)*
z!{=(N`%nZCI#ij(%~<1=U0gS$Ya0T<W#5*`{CS4xEHa>5S&RgJ{p22V%meZrr0St;
zG1y{2!S_wg@EI|Gj5g+`&RaVme)=}MR;hA{OhS4mf9<G+-WT3Yk9a1wL8pP)dJA#+
z$Y{eYQyt1gZUOf#Eg<Vh*c#2=9bXX^0aLFL4qC_MDwhtbD?U~%{-+p-k|<d7yaj(V
zmK^?OIkcxI^E6oC#P9+KY%%fLHfwMZ>kW;fs_B#NRCBUokq9u)^j{Flhi&UPVj$4B
zCs#u8Dzoah70b|8Tb=BLGzrTP=eqhk4*0C1qF(7Qq&|~;L!$pi>UyVr?~ixEbFtZ>
zn`Ls1v1^q`=Y7%;#rA6ywY(lbQgNn8;0-FI;96T+!sYx~Dsb{Wmw`W*)c^oF0k})R
zHU#FBJ$<?KMag#sKRB2xaD5WEngjHRV<xz4gH*Mw;5#F$;YKR17c9E!Q{G+kC2&*S
z{da2ircl78DZS%_o_v4Yj|y;{*DL<s)k@Q=^bUdke`X!Pv~jxeDPGy%h3}vK<G)w&
za@k2iDd%O7Sb`nl-rnN!rM6suk+$g*HO|@8dJJrxLqepT{KYAEB8g*xiJJC1G02o=
z>gwJ5dHJ*m1c9@>?(4sQQ9#GsN|8T(=Deuio#`t@vIgmZ;17roMS!AsBiv@*?glN`
zEq93W8S*gx<#;FOXKOnR?fQdlFY@A5?v`7sck`peFP+xp9j$)52{fp+tDTdFuMkj-
z<e*yTAIsUC_;;Xdjy{0?1oQ>yhC0IXM46H!{tFap=hO6z=BIA;+vbD3$f1x$#1w~$
zI`6m30GdV>L04>5zUV%w?3%venzrjt(fm8wqRoXkJM>S;{pvrydoHTk^3{MMS!Gmo
zM{%+v05bZ|?XgPG$KuDeY0o~Bs!k{X%m>oqFTkl>>R+T&Qq^BVonVSST+|a#@W!G2
zuMr%d4I!n^k4)08337#u`3LuFd$x@_oC7d@_O7YoYwNC<S>BiM1saOs3VM6S?|M;P
z-O6=SP3zGIq}<b`{<?3~dAD0C4D>D+<)$6}1B}p80A3_J`!5`7^<G!9;XIXuJo_YV
zWa6JW%i^3_T$|={uFb1uz|YVmi?o?TJ{+0;U}a-t$DmUa`~aVO2N@-jYdP{sVA832
zLDOblbyxSE?e}vE*G-Q(T$jI|7C2%iS=9qu@$1=90P1r#;QYmVYqgG>_vMJG7dYNJ
zk-7%t#F-y!gykvNkMS4ut^=1SGVS=|&fF4x8CJU3gwJFCB?3DKI6V%c>IZHKywwy@
zbc~gA&(zv<szb^Z$u6b=&ekI24Z@_(l*;#8BiEnCWGvQ)v-+^rtpLudo%QNq0Ed)M
zJBOO|zDT-+)+utYTRCHY7kRe+f-Mnu53V>_SN>KzZ&EHCZC|qHJqWzB4?t0FQzvT@
z(-msMwQ~s-fDyGOS;G&=S!ctd1uWsbBa?q7Ew^Ty<cmexsKG@7@Vcr=4l1d{hWTWD
z1FpA&8z&~z1)yoczsAB7RMkrjBY$0qHnOMVgkJkTacWXN!OxicZvo)r(&xvH)pt1S
zo&N8i&$=}Mq~8B}+)h4R?mc`z`L6@+<PlKIi7)71t445>;)&nyWC@*ooPYa6Q}8er
zaAAIK{co8oSN^}}K(VqPKqQ)DjV*AIZ2#4>VW8CV73Y780Q`6I3sj}@@M%4OT>H13
z!yw1*$iF?>dQJGZnG<&X%fSLCI^#Of8BIY=!80z~0C4XKwD7;fTfTDfe@%1#yQ=;!
z^<;xz|8um)%>bkM>)8Tc3;ve^Pn<V*;lOxKS~v~FOZ{(X_79)?16=}~UqDFA^J@Vk
zuQu;J0}B7!SkwvV?=A3U1dfO!o~*4C%+$*^_0hloQVO^`;?%Tg`R-)2ml`6k0|N`L
zyVNlLU$Xu0<Kg`6duL9}yQaajE?bi)#Vogg22c9f4dA#&)w|^Wm5u*Dnk(+hos1ux
zwtU`Y0etUS_20KnTCv=A{{7e9r2231zqADw{9hUZCToC7ClP_cbq!lXCp4P{Fk%7D
zee!yq2B0Pb<NmkgUji5o&jN*k(U01oo7y6~x&?t9^1q}x*~w167M$OT1>Qf2e+TB{
z(CVu1zq18U{l6QFVx;QB`Nb2wUZBGnd3BD@gJ}PwbQg|T03bB0RL>rs0QCZNIO7i>
z*B;l^Olm1co(8V*{~w!mJ@BpnI}InroSNR80h+J=cSkvoDS;otfcJ~jP9~<d=?$=s
zBToweVAF>u$i{!k3p{e!p?`4g|Cm0w?&{FyzY}@V`7<ux;{NRc&`P!CA5~zgfyz!u
zb#>_9?w{2C=*Q93ljkST0BGZX-}zs$`jb)qJ5oV_CI6_-{<kOqG<@*nq^keE39LS$
z&wuH5!n-Feq%B|i4175+ds6S`gYJ{5JZa<q`uO)R$LDE37XKOg_dC#uBezFC{zdu)
zrVx0s;h^Di@z%+*1{U)j!GPE(e}Em%#s)X7K8*@!y|f9G*>w39Rt@kyz{kJ;h@XIh
zpXE74Psd14PshMS2mG7@et=8H5Ey_2E)^QDMj#oJ`*yxfy|?%HFXT6!5rl{`WX$j`
z+L!r9+*>Jc$xE#z;yY5Et?q+Ble5a3xM1yav5(idu~t(fdeBWht9eO*2w^qXAzG`f
z7NoDu>s+^xo7ij|1zY2E7?*UdSH0eAC5-E~&p<g%AmTpL)N}-gsg^#auLQ`f*1$h5
zhOg9{dM5Nu?L{4~Sth+`U5_h1#=i8USiGwNBS=f>O{>BSUmx7;Jlmk!TqZ3Xxu>FM
zMvXng1*I3-dZ|GustLwvS$fN9b7HTu@c0AOPlZSe3L6AonqQ~1%PLVC{b|~XRT~w9
z)Qrc1Pg9}Z6+BZJKqE!cCh2gWYO*Fe#rS<*joLh6D_WS<+x4*vB*{35Qpd1{@%G;n
z3`FQi1xWB1q)H{W0MPR)a1%c1!3%qJ0+~D}36hMQs$SyK=sfmKYu~}ZJ2R5!sbx~d
zH)Zt>d48bnJo$Rwm|9*ml@d$BtQT#~2qDnnTOiG{q`+Tj#@dnPti+0RAOV&Q)llKH
z9`oR<78Eq7aG!FESL0W@t9uenr7UQwrJTx9%o!s55iQozucOD6TfR~LJG*>A!+sH#
zS)x^`#Ix$3{RBbrP89fXfKCQ&gT|G)%YWO)qDPYYwF1$hr9WVzo;pdCzNg&SxMVZq
z-&9ZBNGfVR%_sGZ7UjTNNfShUSebgAK`1M?CNc72dr}E_o-&w`2lsM@Y-XEE6m#Yj
z$(nFun53C-jd47#L@-Y=>cRrwj7);RIDAP4NoZaUEP%I+&RcXEI;f<YiQ&;eKt~<e
zK*4{tN}0z@^BT&L9nW)(DOKugytG~wZ=YzI8A~OQ0>C|imA0APN}Up`*DXtW&!NI4
z_0_<Px(EuiwF(X0K_QGQ3_18Ey~9F5gfS_uY-D+l!$j9@)jO>JIW>(=q-h=}YnF<$
zSWE{edUKPg8u2Y1OQ`p*_G|N^`N3GX<riLgXTE7Eys2ys(iroU3ajP#E-r5|{nt%r
za#O_m?qUnyhjZus>h+e`u{f~idQOOm@m$XD`+wbdG9!qUc~NJdqKV1JyzQtYIc=;L
zvRIN7#IdpgFwmYTM2PkRcIfp+Yd}=WEfe%Ac}ML!i;V<fPg+nrEF&-)<I=)ZIG1|6
z`~_ETMWT<%X+M1?qzoEfi@=FhxZXcae+x1~MM_I&Uyz3+<;?HjfB%djAGDbDf<=pY
z&+VOp-y^u5PIC|Yl(bxqiLfDenhB$jR3G1tsZ?U+f;f;PLGrdqg<j?SaNia-dq{>j
zg5hOgF6A&xq@@&dbkns<k>mR?NiR~zcu4IY1#8_SOGibo`OIP7k8?RTo@Io5vL0_6
zY5_uBkY*s#4nP%)S4QzaDsF%(XrjuTm(SdknZ?O*YJposN9Sye->`>Vhf{EVi^)VK
zH*tBu+X>J?w0GRR&EiRQYkYKN`mS<|Gm_KwMG8FhH0|~XK%~U_#5iW$CA^lC;{w|)
z(Se)F2^>k3Z4PWWvQ4(KoK~yBt1q|W>b%gRP48^!4e1DQTGWm&Bj7gkNBl<~k?k-N
zgUP9!%x$-^YAdc#t=c4ZPEg8)pdn^X63;tAibYE3GrA|pEA~`0!m21(-Z+TEAz#sG
z7s)Yi;^QxN`?elqb@*L<UW_MnXIxsZLdIKZO6HfI8j#`J1PmcySf%0@Gb2ox6-Fe`
zRq>=+FwGCLg!u7A!6N5v3i&I~dW6R-DnTx*vg$gEsoVe-)OP#6$6c4F?6*o}{It9P
z=s6GK>Unpc0{?s8Cd#k!L;iE>CmiQ<0U)NpWq_Pvq(qu=ljpNqe&uoH#5kdm0Qfam
zZN!qQsHUq%a;m@S?wX#SZEn?u$Y;?U$JLQoc~V>0xkp(JoGb0=xC}3JhjTKMy42LP
zRXyhlrh|HhF}ow*wV=S&^AWL#1K>x*TNX$V50+N`J9COPkTd5GT77co)nH?*6eYuI
zj(I2I!X+ghRx5`~d{A$8SOc$Fm1n*bA8yJVqA)Uzt`MOZr3E2vgyG1dR}pMw=`AS<
zjC*IiC+A#6#2uo>!KI*s1lvTgJqL7oOjiLsAaXm<Cq3>ez294TA>Px3Q4y*18M)7x
zWlj)ShREC?kr@%k+yw^5*MY%c&@so5$cB<7vZiA1%7a~_2zjZ!xTVBRjcNBj5`;gE
z`MyFdSNso=eB9s+nSSNd<lRiQVGnXKJCH2?;tB`<KFp%>&#2gksg$eqH+6Zw^i4<H
z7Z8^>U&ZzD=ajcs!gZ0e@|euKC0oHFb5d`Wl+!MJmZ{p{?VFCw!A|F!zx490YMmH{
zkn2R_uM6{fT@<J8r!=x>nM?yjQRYN&cJ_$grC^z9*0MZ>%cM+puR(P^<{pk#Sy!Hg
z5sH>B`K;79tO0Cr!Q*uTKf<R)ns=mttjITDQf-p&ic6x!D#mEU*S14DEGld5=wBs;
zKv%LEdhX`n=^0shaEZ38JYWOv)EE|%Swp(r0WP7TW+`TyL>>1IAM3p;SC2AExfdqX
z-$W=4axuNw3wnOxkjHpq=c>26*P3^j`iH(A`+JIBvNtoY{*;pav;HkDSJ<-(CgzJ&
zIM7hB!xpwuZyaL8MLmeg{k0Dqx~M<(Sg5hg1KucvKAYUJu~9d^VM?LCMmyCBX<d}-
z@F)i#mW{r3m0>eNT!t2LpT+nsSAx@MM#;LSiwI7%`N;l$g;v5MR8(QO)`E6krfO4z
zsGQ3}4I*^$v^zPwhT$l8gOiR6I6(`fOm1vcGTgu)I340kIWeAH8W~Xo3%<RJY$6JY
zqHVgQ7;YYMnd(54@`nhGK&x@F`B%V!g78AiZf3~bEFbW84Z;PwNbB;+dgtIOUF?0Q
zMxol4X^Q3<?l!!=Sqjog91&ECQN@u+x+)4TEP9&i*SlQlt|iIguT>f+qX-uAgIK%h
zS5&!>D_FtOnGU21S#EN@G4&9P6p`^#DK`teuzr_fv^4R4flhi;tnW&eg-A8p;T^NW
zmBPl>^*wUwK{_&WTTFqbXEqz<5ik|bV!RZ=-P9M1heonF2F$ib|EjiU4V9g^FF@s_
z*5#*;OT8F*WAV~d9S9rz0c>pL0Pik|GfvU5c?T8tao)WOxm2!a(j(LtDn+To?W9zD
zN-cR&W6h`=dgu^Mo)Tmrq%}vgShtJ6-O`)+{ZlU5su1-D0pMwQ^EXKQ2apzxiQxJD
z4YZcYRvsnM7Y7GIKf!H=56#CT6Bzu^YZwViJ2YC_Et9#?sy-sS{6hjAuhL8b#>BpP
zDpR2uJAk<;#gnLl8M`pFhLlYF9T=egEpeF*#f!$_nq>4e5gv6Z>OKhH9H{5CR)YZb
z)qT)5y4GtHqhydpiGV|3dy)c?$XhM)LMV1$-?7wTwL=&rP*6{K?BUXAr4D2>J!M{F
znJM&n;#niKY>Y$1$w_KhxfwyUe<G1%osPKsgtM%*enH9Yb>3HnndZ_d5kXx>`Fr3W
z1$w9uU_S)*xpI$LCFbiz%_5L73Kq9A&&L5C%M&EILy)sTbtY7}f6anucuW{97#Ez}
z3`liaCnv6Om4TR7)rOueA(iRwaFOu1ZsDupea#jnGF@{3LI<RY-KZG%j)Gmrdz(qW
z9o&U_i+DDGQ%Tcm6H^M16?z_VN+KHBr$t2d_g4HK*zx+-8(n+aJk{x<bPn893OjkK
zF6ko+&o`8*=gI*fu&A>TvIrfOBFrga10W)f^C5$e@pKI5L7yS>5tp7^TZC(Ts#Q1p
zT4Ux!i}eNfPT%u&)%qwE)`7AceRq9mDZi$Y%)Q@{IZN3hfMs?<B$dRfV2_|a74{MV
zmVMt*v~QN$o(<hBXKy=uJMKN9ek!-32{=+MPA(9c_jU66&y%4G8Rb!+o62*;Tp{i0
zwc7r9(WhCI*l~?nx#cuH=FE%I!cxnkq(e;mB&myE%Ou~+S(CKQzH+lB3ph^n&})b#
z?F8Lx8lv+D9+u-g;1CGSyf59%{C749D$C9_Ujx~)9BFZ2a1eB%`j9<x<edZ&KDY#?
z>9K^7GOX})+|BIJJIxk|K?i{}Aa}1rg^9BMX~)n0rutPpCZvope+qm-R2-*)3ezNR
zbLq*@G*@OAjNg+wmbBxSBMezXs6SV(4`v<lThUwiRD$L|C@pi24Pq347`IwwYI2{h
z@2rklr7!=e2GnW%7?6bVKmHzsk`B*2JX@%*q?R=TrBqZ_&2*yfZYiXD<OGUNXUy^r
zvU+!W0R-SGRz3jv%alJ28ze<$8Bc=Vvfs>?qBLGdLM{sRHUk9+)F&wVdYnFiTj`A>
zzC?PQ*UN*F{LR9K!_CZwS+w4?<2qBj@<$*N8RLv<1;d)?bt<NM#AP^BE%~)gRWVyo
zDc2-8?{Gq9D%Khg5pWDgF;j_h#7jdN^Ef^7fl)cirPXjvw&G1ct26<PQ%>htmO@>y
z9Wlg?R6gZpHQ71>L&6jS$bUE+))kwUVbaHWOB3vi;<FDNniw_>JfiHcC#5nhL!L`y
zY)P6#@;CG@-7Q1LcwD@{$aGrFN`@;fI46A!&Q|0DUJ$EX7`Gk}XV^djW5<%Q*BS0&
zz;Kju{Jza@24<YUi=k08DUflQ$e9=sy2ZL;AK?H<U%8E)tj^Hpwt2^*Q*-%{smb_u
z{&u%a*M&-J-OAMSNP8M-%9MPnFo?7KBiX$~CPI^ZR>>su3J$KgnR@_gi?FAO%5*@k
zGpY~vkhe1eE%%L^sR6wO^_-Fpdm^bejG39xd7NS(8cPjuz@-x}@<UJ-Bi+PuE4DR?
z(p2{7)Lcdy25zq)i(|amH3a67Eu6`}@sZIXN1Y`Av=b4bA#a9^&rkmGqW+onch(#9
z8N3hwm<B)G2Ip3O;^eNQT9Nkn3@e{7F08V#EBfi6T@}e5ujGPlEmJ(1LYpJGt~9#h
zYr1}QA)vvcH#J5KQXPf*tzW9W&vWgg!U1a8tG!9ADwbJ88C4dUjDYI$-m-fX$cZu!
z^xYQjC)^Hy$m)v_NTJ3mG-p_9qp3)UDEBO*d|=)P5)C6ApRTcwu#Z(}HBYBkuImw4
zctO!JBI{$E-Es=&HCF=6%wI5vL;$)LC*f3bmqgNbc3^-vtB{l?zr7ERmc++6mVmmz
z24N#jtM@g}pynW{Wg3nRzYkuqE4Z>V-ZYhNhRY_m>gv{f7DzPY%E-)=o{p(XV42^=
z-mF})@%G9$z4Mf}&cpbfITXBc52=tihUDW|L)?^X3wwYzhyjDesMaY{eVxya3(%iD
zdSUU0l;NKc*&)v>rs6S!MxjA?4GxQkgxtVo4eTV%O14DBxA|d2l5IayD(^)r<{;j9
zC|?p9aUT!{#98P8r8-oqd{I;uRQQq8!G_$%ALVYEiG2;mxUwlY?N(N8NS=@9Sh?Oy
zMPz6N7PX1C>)NZm9Zly1QE+X#^)a43;w&~o0}+UHk4qR)eVmp)`4L`3Aqfr+k)_$O
zn7;)SCJ~~P7Q$(6qzsjfadhx32hOdQ-y9QNe2hG%_91X%BsIliP?j9D$G#ckaG;qk
z04>jFXBonffkesqA0Ty=tDG~Dw<;HQVWe6~^+>eg@PWiiW-I%7=ro8|N{;_lUrfFn
zYe`<lr!`OF1S4PM_dIc4t;1PE#kMwF&D*%7q(%+ab^b4)8f9gk!6bWuv(^GHTeX;-
z@wbH-;tfieuj7n6y)|>Dra4!IzD14VD1J5p;DplTmQR4vIJF_#Hx1}k+ES2^AkG;v
zpR_OWn{3bc7C`*cuA*(~l2a5_QcPBEMT+rn2mdP6vZzUbg_i4!$?~^@{pTUDN-6~h
zR|?Zf)RA=fA<9W$4NL~0b*8wzN<i}jVi9m;J!M@n1z3usWhsfzH0zrfe(k)prIIlg
z4)V;0$|WiyptmZ}Idk^~h`$+)sOGO^lf`flmnJ}o$*_MShFrd3OR4=;`A|lW*UT!b
zh$r-?W|aB$-u)!oeFHXIRskNYJ5!k-le>A%`lNOHP}4c?n2%pKR7Ei833eGFmh&(|
zyRIgibRe9>+uBVnLHZ%CBk106dc$nBQ!fo2N>R2Qxv;C4E`sASaK^;i5`F-}(=`SR
zulk~f0a{{f0IaJnDzeb5g(9<J0VR)i$BcJKNSwv=L@ph{LTut&1m>5?Tdf}2WDN}3
z6-&toKwhkxBLT<Kz$%`H^-Z76{fb{=fb}6s1jAs`M9&2rWs(kf={_kR0oF5owN$L0
zkP@g1aLh~WovV{-sE1A6e3|<#A{tL}NXshz7U6|(?a+ArI`PuOh{Oeqo;YZv${-_N
z)m+kHgJDy@5l7R-?nxqC4HUJcdYg#e4V}&2juF<;+MkRZ*T`o%`i}>G(LCG}OLyHM
zF7Zs5g_l|574JrChIX`&9=eDt$oKJpgs0kK(u(x#YgA6hGjAEDm`uC%0b(435Uv4V
z$Jc>$&lR{OxU9~wXL2830;m=Xq*kP!&L`eMo|D_bhIyB2kf!ZC^X;xr@`F<LVPrKx
zF!sg0f5Z-k8&=ZPX#CJ2mR-fIXv{4>7z7|g?Q8@mMWo1s;9w5rO$LKm>zn5Tby3t^
zVTmXhd*3UI-%8QysEClOrgL~t6{EBLioc{wCZ!@0cTGyBDtBRDa`X&5Zf86EBjwkd
z#oWVP`#W>MkB}IcLbqv^p8K`(`#G15DnfzF=+SGK?MT%wO3{#Y6e?>k^Xs>_{78)g
z=8$jX%0Q*HHvN(;zyq9JATd}mFBJ!vlDNyWSm3=Yl}eoW5QGwQP+osgWKoM2^N6+5
z2<IY*`Xx(NvrXy5XceqMhwWtEvAZS%8kYpLfmNm=-fqN|q^DvG&bUXwCYqVb$QCUy
z|Gfh_UxsS(X6H%GWKL9S9_Lr$XO(IY1<fg+;atf|xHPdV`-!3In1iLGu&}eRNkJ+N
zmN9rKqoSh9arWAfbki$lO?2(thzJ-gE_Fu$Ha*Uux?lKX$I#q+oCaTsRWYp0`7MMk
z#SE|C>;jTqC9mJFB*lvbv#jJ>rI3z;VvUGycO!Q_%tnI(_I)aYl{{0-Mvpc`2ajRr
z1hj@)1ltV|TJ*ky+i9%iZscw8DT;zZLVm)vzniG>R3WRw*}!G?!1GG$9D!cGG%s&A
z3`a1q@FPN4Sg|*0fDAi~j6lhEbXjzXw95xZdx`QH;0J3EU{1ymxkTp_s?Q!YosmrU
zFr<KdmX9DS1m;9na;R@0Wh=0z7cAh|^vIz-b{edS#mwERe?RKnG^VGfxIqM;Gx_tk
zErFaxF!Lu*{T2}iRdtt8HtHMNlvc*-GAy`!VK2ut(Y}VgvtJ}lekgf7KxdTE>UZVk
zzni)xDL)bHk0p#R;GZ+hzPx^?Q(vdwN`5hpa*TH-(+9sC=kSpq`2A)lO;r&?@z#98
z?Nqz=2f>5?&#6wyoPqQ;<YB^AVhxmUTsJZPK8qHtB?!<GcjGBsI<~k}=B)TVKr^L@
zSyV`~1#8??B#)~Qo|eP|i$iLhN3;z_dc?jGmz1ajY$iTWSa?qdiF8P`hruQ@18wJX
z;(-NF$&ajxMY{$f*yxc8@`NaX)H&9>14`<H;}w^E=6_avGKpE{HL^G`srNwHD3kHw
zj7B0rVocBkQ^zPgE#@F@kjG?X4sIw#opd;W;q^0nU$Qe!ke)o4SW_toi=5HmxL6w_
zBV-q}GhFrl&j3>-%Nloo&`0Y>dTd&*#u*P{$Jg&E?}-IlZm`QF+gM?)gd_&V5+$Mh
z{uq<Bk6Kl&J^P9x67P1w<;6+HJ|E=gV`eXOT#fIEjura$tLEsBVJY6#-$-iBOgf^m
zTc+v*k@w8?5U=;U$k=fskdv7V?<AWXzn~JnGGS2d-^~J<#l%n^%QBtFiOY0qPblGC
zR^O*Y>60_@gCd@_2RMLeVjMaw=D#`A7I@k8`RAVvZ(WrxqiD%uoGl@|U?Bd9yO!3$
z$8Vx8c$&3|o`>p5HLT=RUwdrR|ErMJ^Dh0HFC*iCz~H+?abKba1Is1o&E6?SXQ5>g
z2ARQEESSOlbkyc5Qyo5STl$do9+Rx~_Y@7ZGh6%BN`=X}88bEwUGHq}Tn*us2dyj7
zKVg^4hE-&tDI>SZ(ii!H6^L*hJ5N=Ng4fU(a$cGGz}GKz#>>10FJ@D4$i(?R{nc@;
z+=Itq@?a*4xTX+`qwUo0b&8Rxv`^v=LVbx5h*%4wbBplF*f&onZ!nHU_1dlJ%zuMw
z07B@N?J}#iKV^~w8-R#Vzxx6ZEA&`quQL?hz4wN1KxiIE36m!rX9307P>=>uxF+cw
zy9nuI*W-8sa#emG`tarxGB?HqLO%$prTVKcMR;2X%gOVaUa$d!d{V5WVWxoW`YJBB
zp<({HnkeilI*ub61VcqcH*zOJO+DgC70jB9VTQHTe31qYzwEkG2bI*I-meI#T>{p)
zQ$=<=%?NSRQ#{FPiu5Zl@|k*vb)@dc1J)(}c$YAc929F9e#Yl0GeJ+mfD|R`dv24h
zll~daE2(n83kBN$h3Y4$uV>ANH<_-kHF!Jq27mH+RgmkZLMo&4n7r8jh`}e&;#fN3
zLJXbHHy;=@?)X2anll3~eMF%fqn@i<NktL9TTtFUPZ-~NxBNT9!JzV6`v*Zd-R433
z;V9^N9gHD~5c_;N5AeMhZ=}w~y#C5-*D(KsFqs{A4dXl5KamqW)vH6Vqhrf6MLjW1
zoS2i8af)Q6*5&}EJ6@vvTBtlqE|}cF+t*({)dOtY8QRkPmV6?W^D+bovvHm)7H|cs
zjdP52LFJsv>+F(F@A97W&A<psP7!_?6nT4gzv6d;K9IwB^9-YShqL?mZyS%SBrfn#
zQbDgzXNmz#jGq5p1{{RHIXkMpc8MQIB2c4^(g<f9r09=JmLjt!j2!yb{Cl*LI`MIc
zw+jRoZdHbg9*3r8-+0cE4ln3P&1^SzGwv!m;z7G$<i>LY-$^7fO-ILfMiHR_bV^H4
zx!uzbRr@0D20koR09B&c=?9=PAKGek%!RzRtM29QqM2@B=i7Z<!4fwF*qt5oAIuX&
zW2*N9Zy)GPPpSe|U+Jjne`NH5l#+*hRpWM_k78A(HT?#7KULjfwAogX{|ZHf|8B<_
zLk-P7!ZEqW?CL5Tb#dP!8a_)j|DkBf1ttPoR$>$m9-^QfUs)b&HtR{2rqkqEXcrwF
z8P?JP&F3Y`0tcXL8DofA-xG#SJq;zkr22Z-gvv8HsXQV+`6BoDZ*7EB{DNg%;r{%X
z!o)3idKyT4>?c!M$*aQy=;*u{MFD_SS*5Voda19Gh;UR&UUnjWGc>+QKpki>)`Avo
zvT0c3st1b8C_BRZ>5DOUR~ptL8%qC)SIprHP4FOSvvHkKV7t(Gwe+HpmdUYr7HbDs
zgFHOae3eT{Iq+%kmkZ?H1qFlRQ(;nBN4-Pg9B{wZEY?ebO<U)6tgQnHyV&lL2au26
zldT8fev9T`V$*Ue)k+n{R~ik+I$2+{GCt`tzdtW=-MTwdt|<BTZplPeU8$zrETJv$
zK-KKt`t%-zI5}>$c8R3?XRzD;XBIf&3BwL7CH;P^$fE{m>gO>l>%M(U8wMzl4&qCy
zz_PID&PN`66KyO(JSOKzW>?llMRKc^Pf~JUc+9pYh-1ry-hnlBisruut5>G%0LCkT
z$tbkDR$BetA|p@9lP4-JRLU&}06wX-Wxi_iL(*g#hc}T55}dz0gccwRs0}E=^{iyy
zhcwP*rGGXOO8R009`{TJ&<_9*aL@z?<9l-;D|Hn%fz?0~p558P>JF;nh=4)76DJ*4
ziRgDfh5mEuZcWqLOPyt(*S&xr?|mgT77JJj``~fcQbtlR`YL^klO(ydI~SoXV1j2w
z$Cvgof3v`!##xO092smX9ldTZu2@vj2g?2ANM;Znc~X|LrL~~;C;UP;H-TSRB+p9$
z`Mv3e7F<p|`P_9f;ro&{Ti1O4W|%_ZYqm8L`Nw?`+A7daQDpDcKBB{ROyZS0dFLQE
zBnn@fYue}udE|^XX)I)`*|;Nu&q_RLzs>V#Z`D&cjZl}w9Qfo|btl}Xlc&`3qaUHM
zN3HZiKT<@y+L|nW?GeY(pNF4{%t~EWMvZJ;8$T+<N+$S<2LSOtC}~8e(KYDp=<SB%
z)Y+eJenP^=ejKtc80f^Ux>;@MBFxA#vO=P`#(>@wl7MLM+Y@c!Dgq_PNajWMeBmD<
zY?&LU$flyul_vSXl!)sJ@gYJPFF55opDY9ys>v-qp693?&A}I1nmBH@>Ay*_1A9A9
zdjS42-cMqViVTe$SRAc9*_~WGQ`(A{5l5$Qso`T_TN-9x%uWrqWVm^|@(iP|$7z3(
z90|J_mQ8pD7Tiwd9YODibBFb&KHQz3f<C>^U(xCJgE^;&&csjGMI0Z>vW36m;VoP*
z3ib>(PR-{g(sF`0{N1Y`=9xVFcsHRbW(9gHI+~r>ZG7**gOt9x8hmL%M0i)OOx%<E
z?3NfmkouuG`EB8<L-~=0lHEv(6zU(5cpGLiSu5XxtTtF|U0q?K|I%mQ=QT<N)MouC
zb!c|WI=Q;NUEUq{HvL9df(+fF-Bq%}Y}4n^0DswI9-|x;C#xZuJ>uZ|u_qM_Ut}~Z
z<4;$peug@RfBnxX#*5B>hWz#>@pA{&dC#rQ2Qv}@-BNSKjvm_@|D1tlSgF36B$Y4g
zRBk72i>k74N`Nv~a%j->>_;)7jDitU)2wX8mS@cChfP<8_aw8JKB9&bS#l^R^p*j&
zIGM`S_et=s(RMYfV3`rI15SLm1Qd8ogzS^WM%;u<DJ$<P^zODweK@Zg#Y4>%DS4N<
z+RvL4^J2}(=Am@u`K~1X%llaHeyXV@J415!HP2{hCwp@@L2)D@S6#^IU_?P7Q4By}
zGu?$hAP9c<7J>=AdS$g)W7TFyOYLDja!x9snZ22NCi>ISSIM-XZ{$4_9(T7`9-}_l
z0p<(c>LuLUzza#0<nN;|#}LcJFWM=L*{git@f6(&W1lg)rQo*~ilJ8#)}Uuf@$@jT
zJTmQ&VbhR~f^K-SVK0Odw;KxBT0J)?)m7?rN2lM#cNfXNKc?KfEwg-}cdEu$KIqJQ
zj^fP8lr1~OfvYuys@5wh8XMMPNl9l+^ZmvNJjKn)z8lGWk9Kgpqs+!+dIpn+^e3#o
z#Qlitkw+d>Jx!Ny_e=<s%uqhA+F!w*TkT}SCspPP`$O2e!WWHJ11Z|&RuRqTDT3u`
z0HHq!1bj2!fsJgM=i?vo@G-W_w}&(31kt}pS|f=vdug}E@mDRK>8MXLfq9*Zu<@LR
zrzEG<oV~{uJWX_h$L7RCZ(SMnN%FV`!{=V>)n&lY$U{jJd~t&pp_f^uR$l8f!J#r|
zi7z6i!rYJ5p8OctD|mt1c=DL>+A@l<VXeYQ6v1txrOl>XBycRl0lB^CpacET+sZb2
zGcWX~j7rp7>I!GQkoWylereO==@Z1B6|1qm!Q%cXuWb>{UCW!1!DAw_I-dPUm7L$^
zkq55LVo&;eON5=%bqy7b6Nt?L?-=t{#*3S8N%88lmdInEmNgx_XFUUslhaBLy8fUz
zzol`{qoyQYj)`ktyXEvCA<}g0xmo?l4b?p_{2rH?=_6KwrY-b8yQ`Y!F(}jXcJ*v;
z0EGikD@!@ipjfl>(&hlH#AY31MKwHumu}iK#lq2bqkbq`4wlxm$06<caeinFQw;|W
zRdFbRoI);4t>Q7287fO{I8R=u4C{eK7{CVTwMs^UA^UY<eZHbJU;K`oiW(C0Wg-y9
zvd-QAF8rtS%P+k8u^-u#{v?=m`c}igGK@{EsOO6<ETvi^papl|-p{Ji%jwi~j7k~u
z6iE;jx}qoGsMsnw;jQB}qkthPwk;tV)4piSjUUFR2?oV_%FI$zFt$US8F4~YzABC*
zp1vk`uOrOuAU@F1dyzRXW1$sky|7{Q`hna6YTLJ)J?*ANnq?dXpOMGc#kU=l>%Qf1
zQ{L!O&NZc9xxZM=`?h#oSoghCM$Z=aRQsldkF;Ihy2GTSap5S<mwu?+7F0iyQ<m_k
zExSb;TSCuR{EmD#`2D!@LAu&MD*u?DEpQsXW8Yu182NCO>Cv|{2*hQfSEE|OwfXW%
z*|pD-TCBXMj$w--;2z_{c95Jr^V#xjteG@|k)5X&xERNw_B;F0En$AFby7d8Dr+u^
z2ap`qX26&wOP6#I1;R~xUWpo5p1RxXY4MGa;Z4+F_LZg92_&48N?dK6p96!Y7@WK|
zQL(HcI<!4NuNC<r=@=u<5OA@?H1X)AVD{$Z6=|fLzR$0T39~;rPpc(~3O^Nwnzld4
zNL*xzftr`$G4$7fEIL|l#>^HLOrs*TN}qPU?LS|1hPcwT;sgn&bLMPDBeIDY!7!Sg
zjXEu`_r;Xqy$p?aQW>8^Q@!!k_^@K7=)!v&8LuPt9lIdD*)JfeEjNBU3r{B%Tc2L<
zrSmq+`_jo7KF(hq5*Us&_pqAJz1PF4ROk57i2jX?np@Zln8cX5n+pDl>+>YWr)3F$
z#B%RO+k2->dfc);FnZ77RNQ{R-$%Q%k+7l;sY!{nsZ#3tsZA(<DI-vM|8h%=SKnLH
zCF2pq+hkdKYPL@Uhix3Q%u?tvh53_tRk3hS*sN@aWP;y?iB$g=aaFmiL+W5rQ(83R
z2%imZYMXzgfM9KDOg^2O15C$wEg@8`&_uvs(*{JHyYvo0&PsK<Q|_<WS+S<ZE)m@5
zok=aIK-9#59}Xuz?4@ontY>m~S%bcd1-KltMCdpBB+hnnlW3vw4_Qc?w@b?p(lrjh
zng8jTKE+vUm!O|hI&qtqZY$*Vt6`IXp9jJ~3`5PJ>2hOlNqWr9bCOTZ?Y?4@WXSF|
zXR=RWTz}BXt3*{?z4V)X=Ga`#{LK^CT{@J=uJv1+#myp2b6q^+0ylzH2YR<kpJugh
z203%AIWFn1m3~iO%5NlpuD2z5srUZrjA71<^j0y=zG&$J|7S&NF*PdVjn-p48v3Y@
z+q~@RP4OEmB_!70Vk=YmV)_LMHBrGCt|EAjob>{hZE1aF;-OT+D0@Z<Ig=~lCdP^1
z)-#oxNpZ#MkJ|Hi#z~iM5r^-tb_#z^i821?)N3?vY^Ag6itLl`GN<P^Svy_9LiG&i
zQkAXq_@3)Yf5BY4m-jwfd3KDKU%BNEz3WifZYh?J)u4Ll5#ds)Xn83aYR4uKt-P8r
zAEXfYG!7=cYJYc8JVBSo%9`Dg_q4c{Tij`^smsU$lqmI#ZO5yk;h5oo)y+gnNMYGG
z<AJc{mEs*h>~WZz%W|XV<mAYqWmJg>WSyxfR9(Wh_|i3z2Q+R`9z7c-(KKlA1Qtrs
zue`LF2T6^E?qTT&HvPxB{k^jganP(0nbVB^@bTDMDp#l213IqA1qPF`y_-fiUrZCf
z*rHZ_su0h^vMjVDN;D$(1cuus3#y^sSGMI#!Yrr9lZf)mDFLak4(av0+K?A~KxBg~
zA93Q*eyaMD;Pc@OgmVj|+Q%Ye`sOY3G&~xLoQOZWb$O&2UtUE2d@!KcXQM#X>CPRc
zy+Dt}Uu`C-z4yvkB!RqCu8(yE<AZ%dWu860GxDMtrP(CKM$gVBI?Za|rLz3n&&|B{
zwUN>T&-d@4Nv2etZehz8Nsr$4|2YkRaF70lq-Nllh_@EwolR1ykq7Rokm^|lh;Lz`
zm?kAqwnG`NS~zxJ_*_zrn|uV^9QFFz+CO&~idd8Y8CGjC;=?aqo5#~Pwg`(uO@}1W
zgiG-UqJ+iUum^GmT6_gwj=x1i3=<zpn^Nzy<rG>=B{<SoUoRg<qlEdt2}VY)QPlmK
z6u-x*(yvw|w`6a?vPV%oW~H1wu*wK8F%B<bQAh_!5C`H+K?HlaOS9o?#N<MnTgE^^
zenn3oNcbN2(Q(-AR{W!+GM0~Qweb#o1r0<yE?)HCi8}_5p_#fA;q4k@*-9DGJvWL3
zm7CLAU}1EI=JUCC>=*Ki{PxU?MaraY;ak5gQoe{4WHrBQ)yQv`<&H96?XWeS`sl@@
z68?fw_qDDllev_1cNuj?_30ko{yKGSutsHdOOMl}ds(VG-+k(I&Bocx45D?S{`J66
zUSWE~aG_fAYZa8$Xy3HZwp>+?r}O}O+C<*>NKzH$u?AVT<7|T}q6_ChXkhESB09!r
zu=h*EWHdx*8B_K8iF`yI+a1c#k(Au$U5|qAE_u%}N3(?Lmt^<HKH5Cbirkv71&6F>
z9^RPYmpITB<0})#Sl>p1+V?%}cJ$8~R{tViGV|b#EjC=2|C4Mx7Xp%<D=cX^e`Xfa
zT_Iyq{yIK?i8K2uQ<(Y5@giOSuwRg?L}^Gw_GRA#A=q?W(p*c7TvKROAZB#vBiyS2
zG{Kp=lZd+6Cy0$NmWsm}#dn!VNAWACE93Pss?vE(XES%GnJHTOU5?D@my4DrzwSYA
z8pQ;iZI>$(JE+dLt5jC<<Ns~yu$`BFvFxKoR7qUb9(e54SA<9ZD#D7P-lZiRTs?YE
z@OD)fT1duExUBgeAZm76CZYnUI$5iuXDgTk3I$y+mq&@-PfKLnQ5#bM@A>9dw)raW
ze^a|c$C(7_<y^Zm*npR0yjkMSzm*a`Up(Dc_p!o3#YSHR&t)&|9(Z$(ELTi)krpKj
zzd;JB{O44aiJ$a~74!d`A`9KYo&AB#8_A)Yzbu-(%oCdJ8(g>hpeLf-k;WHxLwyU~
zIDqm3f@(7V>|^Z~)vmG|c@>D>xd*Xy$~Gusn$Up=rR2P-m;H10ph{wo=Zzj;ivxz2
zu6!1&HV}%ZP6$Kg`BN);z<_U3%CqE|vp+>6jw^d~8f}+6bQY}O0T?KtzhK$@X+s`9
z8#{0lDuu+gYDQY|GGS(sUdxI%oT6@9Vq%2YriIlKN1hELK9m`T`G`C{=sju_UBcRW
z@~@A7-@C&7PL^o7V-;24akY6vNV20GEr>DdN?+F4cPJ#MeE(f&C;NojSkV0gbw6W&
z&@jjj&u;F-#PczDOP_LXq^^?BJ*~OAI!~lU-P4Xa464&Hr(~tRawDJ1n(5Qs0%$U6
zgFGN64M1y#M(3+ve06bU(oP!uvcB9TJFGXGL_5sTwfV=f_x_ozi%4aq7ZDaVSA6cx
zSARZ_y^}!Oohf^*2HVKW{W?@F6!4?#8?T7gIOz@SnR>)od-LgJHwO09%xg#Kw9YK6
zJLbiLyGk1Z8JA{Dy`-IFmC!E#Bpi3LmT|w!8STXB8Kvn4=R{BvSb6rLYnG_^v%RUa
zSaq6hmHM7-o^Ya#xc${~FUgYM{1(uN9`K6V+YJn$iWyqS4`sxO-8`(68G4(6_2%Tb
zW@*-^<kD(ZZD;Zlg%7!X9%772xzXW!Jq|XId)*|nrMxtK<SC!OoaZ?*&PvsJ>-byR
z?qE`Ocy#4x%3`>#lE7ND+1aFX<>PX{V4dUSn2~b%Y8>>d8vHnc>2BP68FHLFkW<sm
zC}dc#ELGjxC*|SqQnh1}lSK&s&zB(_Z?L~i&9kIGgP5DE*`D9%)p#;NVz#<4KTc|P
zocv-EX?gV*ivm`teewm(k7NEWy4iVK7ux@Z93|}4d^u~Nt@o>K(tP-XT)2hL4G5^H
zdP;9pY~D(h73U~E8Z?;tL?;h>GkQ<yO05NiPkN#Yh2*>PNe$xz$%$erM+z=?df`RK
z_aXRu7yhZ9v#`&RM+yo!vN84$q%0ey8O<HXmFyBw!m@K0rsYEwuLOEk9aunf&Cs+3
z=v+ZkGPxD%(O3}xCt6gBpL>>#MDd!riZE<*c*81yd*O+jx3d8`hp@7Nr0MY)a9=b$
zHSu=%{qZNkq}`n5+5?Xjmr-U=qO(cEFUW{y<I9Sn+@$Px(5W?SKdch1&xCs)krjd5
z%Yj-fJm!dt%M5)*z+L;G6tbJE-f>NEb6}Kq`e?W#!I2`-sMPR9R_tgx<-7g(1G^t*
zyk;_7XCIs~Z+{s?U-+Jnh*Yv*6;H&t7X>i~XR+n1uT^<U&=8lC7y%txJjHKbrGHDM
z{|hFiCJyo<AeLhLY)(gVkLTlyBr()Eloi&kg>uZ)GKBZ;cTr*Sk-4Sv#aX$(TDCP*
zO@7)wWgb9qO1^e9Z94o#e3z55<njQJ9;roaxLv94^yUUg{ly&8lqa=tk!U_{H$6}5
z@dfgk5-s3F>`<Rfh84UTI_(CXwvfxrJU%t@Et_j&N1fS_8K<#|n}`FdJ~eCbzQMC)
z{5bnOb<cnsNqu5g`<rWm=NWwB?NK!9pLx%|fcz;PJ{V>jWkK3VR~U9@bw1kR_i$T{
zA%(;pi>M%F`k!O{^`WlUG|cz!V73NUrjPLKNt&ymR~OX>Dd(jucMC>Ki}bhRX19!%
z^8gGj1i0YWMa8BS3$Z8NcFUg=zuC*4Gn#pyvdsp$&sbHoh*wz5c=(3?)(;0F!90@g
zF>yh3JZoS<o!|I!^8DrGB~<tQ6pwCh>Mx0xjbWl+#2%#VbTYn}mxSNm$ZmTjQ+})}
z$f=qv{mH1=7+AGx195C2dWAlt5J0+SER!|lMRKT7k9eWK=*nr{sCYV(LY@WmK-~{Y
z)W)n7@61v|0eS%>tOQX$4|!2kT`R?1hl@azXcd@yW(MyvBsAGX+QTaOmjqrk{6Nx`
z%D)uYe(12D`2C!7EaYJ~kArKU?8xi;JZy?2=k-aUxBUnmGDo9jf6}vC$1_Y{vi6@&
zpD)TP;>r!Eb0-YoFzBV)6`f)eLZ|$v0dn{(`lw-LkK_6aL%OEZl>2g;fjT~;vSD_4
z<aJ5x%d7FF5BQQBe!UX@+Q!KI`u#5YxdMnWntTw!_Auplgu{1_qB<_8vY@wb*_%eH
zXWr*kmF#;CB)hPS=xcKfhi;=3eC=zw2HGyam|{2YB=$+pG*6^B5c--Qg+>RuYrr{Y
zv3CS+-r#T$U^A_wmoYi<(~NuO4~`1U=JK;v^wbij@T^J}pJbHOm%N8c<haXwe<4@B
zc-H(zxzIg?wQMNYKy%W$*F4MmV(LqU(qrDl6Iw!xwKVu=#?C%q)-weS)4VF@KOot3
zFm9rr&0_IgB9qcsN)%i!)Kq1#n4eFHay?G5Vhdhw6Bic$x`%N_ud{zJgugdDYx_df
z`JWpJKb?vKlH0o6kdccszUPGGy%jhO>C>>d2fc6=rW-Wt0iDrMV_TFzL-9pAJigan
zAImSV2dnwo{O03T`ZjJWexVFFCE;~GEN>Lmr08WucO){VdEHw?q9`+9uAgmu-zjbQ
zZDFX43(J=MRDmSF^i!i5c$s~%a0KkE-HTZx%&mu#XJp^C#p@l+iD)gbSN}1~VhX0q
zK<=(n>H+`{j`?f9DUo*<49c>O&StuA>c;-()O(xE^T`NB#wLs{$}vaQSrBj)qVx2M
zh>(IlY0T*wfJ8H=bByC988(eQ^TA~)<umb>)J<^r$jc0rlYyUD!P+7d_fCq84g8oh
zaJc*~%9;IEjy^NvBw;PZ5CYB2{F4~rW$57raBEp!KSqL`X+p(893PzbY++p2>3;RV
zIB=TBq}>hw2J?*cSq<FNtT!uCchAmKVcXLi%v5aE?!x?Z>dYtQyg?9lZZ^i&J~ZSb
zJk`3vS|vNyj{A8l5aeqVF}x(pDDgp=5+yC*xj2C`kD;*4;0!Va0<0%#(Nz?JPm^7R
zGbA^`rRZ(u!n6LnzGr>M*GhGA{HDEZkyb>aSnk@Q^;?Dw4%^xbE!#RTzvw7V2>$E|
zgR-mkon`;EDg0gi+MBm%_l%ysKTp?57#Bn5uO3wnd{VCK5+4s4ji20%iA~umvX{oG
zW!XOHbJ-(EuO;<+>Le&Ky+7}|qs%Pg(=lHpz4n|xIdyG~b<I+hAroN0p*q%hu!k{l
z3xm->SYZ%NomfpIN-`T4J#WUIr7n7a(jI(IjEP~7&B%CW)1PvHxN>1f#VHr?7d`ii
zxXyXB`sl*cD`unkjDW;h02P_v0P8SkSP{&)mQGU3q8P|sk5eLZ{}Pv(QdcV4et~*1
zeVN$#ZSqSF2kZ7>jt62pwIxXxBWg_3cvS1e9oAe|;Na=$6Ow9Kcs%oSHkdz#uRGt1
zZfKls5Wh|>nUMKe6Y7P7lIf3~ZLTb*vEr8J7Z23Dn@3s-q$6EMAIq)sd#Z&7zJP|h
z;0SKhov!D+o)Wv6I~Cz)@4c(MJEih~$RTmh`y#ACDJ=QduR4(4b#a&_B*XklFQJJ}
zjEsL6iGg19JOr}E&wPT91ECauG&!Hx`Kx}ELKumDOHH?YUdrivX!q{WNbrg;H2szo
zT#0=^cnz<3Wq`}RfP?T@xy}4-w&Z5b#Xs1WsUg~;xhp@Q);RZkd49HJQ_xL|M&6Zq
zPaG(csMWt9+^z<izu($nF)CpmZhZ@aItQ+X+j(Kq-XnOVP$`V8JIKV^6oyqvo&^$t
z%Fm*chu|{C=t`0vpJu(K%MkH;_GYEXcQa?$w7bKm7eIfRzRz~mcdl|K0Sem8>a(X?
zLwL4;oD_zQDR4}d?`B7|?9?TW7TKCb$k6$zS`u7XM<crW+ZQ~2(12UUz%?$`DUoY3
zCA<7=EU2gg?rXpE=G7YWrU)OCPNUYdFO)~(-HAeTnKgm#3rXjH*7)NKE~r!U)ADcq
zth7q}`Etd4?K@jv!Ny1d!|T>_pbv75-uS1ZlI<D_t~HN##rjgUm6wHFZd{mIF?M>d
zCu+Ia0RSFG1dU}bW;<eUi`^dh?3KUl;Xf`hBO7M<jj+y*9c_yLVlZg-i^t7tUHEHQ
zTKMx|OSI9A{OVm{msqxz7>&E6<!#<>%AHiS<>^}`tX8rYzpT;hoKo-18f{+^=1S!O
zX9B?!%@epIzLopJvPAw0#92!2DwR6G(LA7xD^{wx)NfosVC<RYJ$J@Deo3Bic0MPY
z7TUw6+~-+^XjI4GcerUUA%kqM-Vry3?2WYFi#w2}GQ9Q;ad7QRu{~xpLtEnVV=113
zok?-mvc3SIk_QFb=4F!m54oXkL>tl*^`y6;#3$6rFNII1%r<pyA~Wt2*uq;&q`LSz
zm%Kx{o^el9R!sYK?1!4&>9B6~!cnFa&dTvlRrfi}$qNuVWFIpY`s^aFFQuQpG-A<D
zL=FhtgTF=ysJlLvP1V|IIQ%0}$1Xa&7<qg@{PTJ^4_s#XBTjcT_Y&5lR8dcO^|$?P
z(XdLt+aI|Txg9h0tg+*qa+mq=?g!)GUL)*8DCtn@_+`Rz&gfyX{qw+(=de_zE8jGY
z=Hp;I1qypFZXFu6&TgvvIfX!pg8)~0KJpb8nj;lJt*wS+Z<#P4Ia<b*nyDW-Q<I*y
za3-14GrXE$9`0A?Q^#I~>XxgRgz>DUNZXp{to<~g{j6NdHZ+dst&|#<^G6KN#c?T6
zV2jzgh!1Qj$Ss?`p+kb`E^_FG_YVWbJy7ygjrY&hW#vbzNcFD#)x5JG&4Mnf9$BwF
z?JNx}D_!Ls6=%qc3cculLfg4w-@H~0+v2d|ru7Ri1ieciMVxDU^9kukHM!AAj_;9)
zC<0BwN(X;@xd=J^|9JWmXsF&dep{HVW8a3s*vf7q>oA5fwn-F9S%xghmaSrhvF}6H
zGFggBwkTxZ35~6Wlx>KTgzWUczQ6zffA4#S<IZu;``+h$me2EfpU0PI=9-?bawhs3
zXSm<ICJ%kQw!{dX$K`=F%_|!>8u+$;o4+-W&sZj-v$ew`OU*HrNPKZ{+??duB>TYe
z<23ZQ>qAy<Kez8p8N8QuxPi^qjo;==mXuhAQx$8wK@NL|2xWTJDpS_9Fs^CdJmm+V
zofjp-m{FrMGcn5I^9)yls;W}^V;zVdrw%|(3L9|Q0DMXzA)E-=>>hNAkrLa@JFsaC
z)-y|DjSe0eRgzfVn35E)Vu7ygtw}B>o-ZFH94(0%O^&|Qi$hypiZ$GSensDWLuNyU
zi)+n$F4M%9oJ%=@qz#EheGa0fGqYAN#MM6#S~J?3^SCu`S}Vx8^mRk#Yc)`{wCb6c
zj<aCPxJRKBIr^<Ec<aHd{Gg**k@Z)eW*W0m@l*>zWkHK<VVQv#cL-Cd$(OjP(yQ4Z
z@Ry;LP+WJgo0r>pp`;YgLECLTwj73$?TJdr(`=k^UasqlC?O-E8?4t`WtWuvcVt2w
z8L<uKz-w0hhSsWOtr^Umb2vhvYY8zQ4(FW~bmk<*@Oz#2g;h&@N`j@>;9X<Uj;y!)
zJwHyv9`%2|FOY<I|9NRJ-fh6e1xU7n&E`r;%o6e8tX62ikQw*(swCqCdR2-T%kgK0
z=qWz!8-saV``YY_%|?yI?*5dJF{xh$)7szhNv*-``$N=y9KryABrEb&s5r5j9Th)r
zD{GM&-Gue5!V$l9PtMJ5211o<sx59aWlxI#7|f>9KJl%8g=>6j;J0qpSEMa`cs(H(
zOKQ)V;95Y)2#1f*wp+_~7K7jCsNQ|vD*L7@4($RPl)oZT_?_cSt5*Q?;}&&!=HS+x
zGAakt?^<plk;+RKAN9m{WZbko<LRH{Vr<PJGY6iP@`S~PE>=DFc-VPeQaDH+lfH6Y
z0;A)H2<Pk_7MGCk$m;uDu3n~H{h*=EINLkD7u?Kp$j%^zqXVPwyV!p69yIi^dCRS3
zdSW;%y%Wo0LP{`HG=rI2AUEV>dI4r`+?-DVn@UkK4u=yKpin5i0)1%nzQ_ofnH~*<
zmR{|_dIerSoE5i*lYtMBc$XqofMWL;Fl^1tRlde|905&ZiFo5%#JqCF^vb<kzJbT{
z9u~~b36<ReZ1ZocSkkN1VtXg9`63TYTGDIm0@Jx1qN0+gU4xGk-f%?yYJU=Um|klE
zAcYOlvL}|egzqYLOaCyo^wAM(UFG05(cn_jOn7lWl%xISU6*Ta^PGj3s?WgN!r6UL
zrB4V?;Lp4mHIrr?&Voke<yGq{KYd8~x@+k<8qVSOh`fY*f8|Efs*|($2DrkTMHY2=
z*GKI@;0FJEp6=+KNcmz0&-l;1OV^kKb5PAlj7-NV9VIeW(Ct$)w9gPH_V8n(nyQRa
z+~KoFtJ}5{0G3fA&_@O&D^UM$*%--s;;$|T5D!*~Cw)_W@MnK6)(QXPCRV@r+5EG!
zO_IbZxM0Xrin#EHfugH<HpA<rX7e<bn4xFCk|i&hPMk3HxKXlYQ{$UpF8FUR<iVT`
z(jk0Ht+8H97)YLa(>BIG?5UdsTZmKs2bCvD%q_W}=W66_abNpY)2K^KHHYl4<9?)T
z;HdM;>$-N)GU?C9QD)$HZZAxoDRpqNjb-=c4C{~bh^X4Q>d^;P8F{NOLhra<hf-4w
zd~WE^AvJ?9-Za{ddvCR=0;&0iEjpi>@p)ym$pG)Epuq6L93)*GzoD|lXk+99fDMcE
z0xJMFT)B(AI*^Tx8LqzyISaqIAD&RQ>UB`%-h<mt>lhusfP)D1U^uXRK!|*;Fw4o~
zqB}M8b=yydwz^0io%i5h8xw^hS@mF=>R)^B%N5nMZ|3Qa@5UrT*L||}1@Z|yK}Y#`
z1MZCGe2Hu1k$6ja4_4Lrycb+G&rQzTvbKvK3gQM7)y@p|Li$Y$dqKAmC|IIzC^5`<
z*(FUU`O$T^4-7T8SS>v@FE&2y>+ludBEaWttQ+p&WhjR8p9dhMyD2PQ!I4Au;H9Ly
zJ1i<TRDNcQPPU54;~i~^VGc$A?ej*J_hPBfR=<uGq*fYQgv#eXDrU%|n19{M^20Mo
zcfCoV?y1J3&67k#BX#YEq~2*g(Xd_(d*!k6Y~P9ukgR2%@m#tI(o;sq8}_*X=a3jU
z^~t9agDa0>hLXvBXq1pZR@*IcaUHc|y5iDs6W!7Fl|EyHVMcNwZe0)CKHlCwGTx|A
zkHzxm&{xMCt8F$DYp=J7J1)4EBCcgrldomO7RWoaKGe=B74qlX9A1A+Fv`|u$VTtz
z9wZ_cp3p1Z$6F}7K0hR$xQ)GaSk3BLIZ7O%3w@22ysxTW-CHVXQ6$R!<eb}%%SLSW
zz*>H&=C6qjWn8dDAVy+P5$}9k%WZrlM?SNX>Q)P;8A!6l;kb~2)}ZwAVfd!zYu6f;
z2>Kh3nw6NeRE3%9KX?4T9ldKWJnj%XD|r7C!HQDy>^yr>d=m5XdI66kL;m8`&e-dM
z_V2kW>!o%x-!fZgEtS^BM@QdIB#c<YM|wOhR@V%PcQh~lqoLER`AU*DOf5;EV=75l
z$Q#~=%<LvKfL4`1X&p~0rM&sYV{qmJQQE|YKMHdpiuu5>e}h%I3uKj&l8h575m@;V
zwGi9cY4@Y{Poh$h3;U1O_pcz1(E`0n8BHv)+zs3qkh-PRm==1*FxxC+n<IwvI&SL~
zylyP)_QYKxHcH*zR5)s`fI;dfbM=RF1^vC6<#*<;zDvd8kd}dAVlxSFDQ17YIt-ik
zbSg?te3YajdMQqv?bVzsCTBF7TpGK`<WhX7g$%aTxyqv)5?SAasl2^Ep*DCsjMCO!
z?VSYaRYjZ`RLJztk|1~S&8(D$7k7Sr#ly{N`;00Tf^zkadD{BwqKDB{v*tWL>vh9y
z;Y?e4Wc6PS349p~gt8VtBq&_zTwH>IlL+`T;f6Dp&qsFE5>5NQT^4&B`&RrV{;#|T
zq>w%>R;Y6U-^K36#hxZ_y^&lPrzh+80L*GlpiChiwi?$Me%!rS_KW?TFO*i7ege^m
z^^R1#|7V~3H3Pq*nH2JA?hA%f*)`xX5T%WU&@n@M5uAZ4%c<qMwK}rbt`=`y**gFq
z$XwL|B)bGBuNc5?4W?KUsO&|-%+w{38V#2ahLz<!u_sHNZd1|nPVYsaeO0nG?7jK1
z$e_e(eMhH7=iZPGiG+;w`B_#&$>I^i#D(Ke=B4W2*Vqo8ScE;s>`SuR9TK$hpd0^a
zVE2yV>4zeRrgsR(prpv6<T`gudm8b+te?}2dNp^x&aIIxSa4M|5#RZ`)XY><Y9ea~
zZ?GQ}*j?^@<%katj-FKBR|;0Om4Zn-W8-S%3`aF}xC|SzD0g2#V)<tU&DQ!DazGwl
z)(#2gwC)nR_{EAY^ZUH>vhCmUbBRbdOIzA*%Ci?`%b%7e#rpa8Y-0m%$dL#818%lk
zbaE|FwF`<lXDg>bV;3QGlsyCI3sr^JC!uMyT)YsDYyHslN4BGhJ<!N~4hAklQ9P79
z3H6gt*24}cpjuyu-8?Uf;Kh{)`X>i^;8(i)tl(%D>N7g2ewd<j0EpeHUqHB1aQ`M^
z+D~<8;Q_=Z@w&>3Ah&+wq_;W?5<2F}`F-@!Ym@Q1kV1kgk9wsq4pRB)Y79_g^K#M0
zBc?U{Bi=oRQpZ*t%#eTU%{g`p!jP1>E?eHAp-<edT7rbUs)z<9iFHqYJS=@l>^Yja
zPKqwH?NE#=Ej@t1`XqY)Fo^Aot8*1F*WLrUC&G@9(Cy?0I$)m+?7%BM%pZvlFKR{3
zr@9GiaO+ja#`c~2n>n7?Ub07bEEgLVPrR&pHv3D%`gNXq4b(+tABAy|^ODt}3%)j2
zHdQ>puNWU&-a`cpD94Ehl<q0HfxTZgYgwFW|G*>V@Zc@IErvbGD95j?Z1%qO3y@_%
zt0tgYGbT}?!vI=#z{UnzFwcVaS*5UDaW#A(F1Me-=x7&>{z$lIB)LM3Ob!AJcCS{2
zF6htoPkDZdrF+FLvMyN`2iU=leMIYm5qAg>0o~WRFZ>ox3U#fMbJmwgsQQ)Q3fqp^
znV{nBTSx@u?;%gnNVV&atK2)hIV1u(Z;quJrIseB)v{mfbjVcs#^w=%^Aaz@$$%cq
zvR_T^WKU2x198kFkKVRu@vk=ktrnhr-@hke<A&d;A@1j%IOnbN`R_wFCZ)+fA1PXB
z5k1TDeetfa4Ckn?jeNg}tnX&tG0jme==66$+o@4nhjFyBBdAyVtz7L!DumvNw+KV8
z>&l(NS$*>LH^k?Y%u3AG9v*iUuq#VR&YpS5CS4sxS2;0ccQtS3jgSl--=er8$_hMS
zufgr**5M4F(dM<79xfNq2otT8D!%+=^vU~{60-Jrsu?Duq?Hxj*9h-1h<`d{$yxz3
z<`xymFt=A6djdJ^YHKh!=e7+01UT8y#J<O;c%_A1FM+%LLiq|#pbwSd+>(Zancn5W
z3IH%(4d8tP0H#1((W-6a%KgGe$L4>qua)m(M=Do+w_hvCnBwPScS_@PY8J!=L%6Xc
z`6un8OX9GarGhDSvTmw|kozv{)XtTS4jpC{`#_%O*MyQ-5|XeWV(71WsYQ{vl1eMH
zqr|Oi(!YL>c(P?h&=1*w-1Ha`Ux1?ccB3aV1(Iw);`4xA*3WKyOzq^gSd;pNSvQ{a
zj}Z@R@;2>>9v0;@_w)Cm)p$$sXzrbOi!!z_YYF(CCU_&bt-9bvz^tvWYo%8k=Y~r~
zja?>El1<5QUH<&s9H=qzW}Wh!6S1XzC@YQfv?=rAHTA+fQEQT48YnRSb!pTL<VEH!
zze8aV{SH65VNKL9y6&=rxU@~_^X@Rs$MI|Vo}NAYnlndNge#9b-p@{Nkc|`_ED~x|
zR8%orQ96!UV;F$WmF$5%n{FAa*Nb3i%<^ck&q_M009yFbnrtP3K>g^|ED@u}31?(@
z-?zOHhIsK4Tl5qCB9*zt{X4+wTAh~aSmPIDd`0`d+gvIZ&RfO~wX4hi63!altOZsq
zoo4&~;xR1{!id&O&Zoz}ljwKMp%86hRTWb?VS>u4bmW^Ah<Og97RdT?E5y;m`#|yv
z?nMje%;(>?3kQNr7YK?dLTPH=km&LucQc-Yc=5`nq5Dise$+WeG-5e`pmimQbxfuR
z>vr3`)nXoJU*vRjcA<Tk+pONzmUlgo{dw}k>hcEP>eh_&SFgEX>YSwhEH`mgf{FyQ
zFAx5sVV*vb!!;OWHlK8e>cwk;IM1D;<8UIrWCIYZ<t-C~Vn!{gzC_*R*IDHmJh(qs
z@G5_CJ(GJ{Dk-B(Yk}ekpzQ>|jM4pz@kA;~a#d?m#$%mrQ9|azb9_ju(r)~sYcV22
zV}ocew?T2a_(}iUp{ICw5Rq(`w!hi;Wm`D`F1iHm&&eKry`ySv%g>r4GZQ8<e<aKC
z5H9cz+V7Yl8wabz=l3gn?eun+`A?o5Ows?4e$mG3s+;U}E*Uco&e+?kMz=6MaXL%Y
z-7xZ#xMBFU4zWy=NbmAmYRF3d3(iL?E7_i@MliLsIj%L~d_{g)@W`I7h)w4!$-LBm
zG~U-inuW3@4<Ly-P5yVL%oV+n*ua_Hm8%}HuU~{biqewkNO+zg_2@Zy{mAQS8WbQB
zFWz1LZ&%{+05eS`UcnP3(0jpz=k7g`%nun*ag}pzFL-Y9r#<hxst0(a_+FJ%riC;5
zFv$#&gqtJ!0Q7hRmTyz4f5+9urT^%o*lK7#P)Xuiv9ntZ$T|VjrL540-c_RKEwA2*
z&DDG$@U_;LBqG*E?l927?7`hS&8<5WdNV_(66S6DKd+(R&MnmW)P#aB^7Z5A*C+9;
zp#wt{_TQlNO~y7RtUglTGWIFLvQyl7@V1K)a$LCX`ED8}P{bsV{gDy7UD{D!*P#H)
z&g>GGOH^8WX~Rt2-Ip_boVL834o=AmnUZdX%td@SHy-V=KPZh3I?t(*{@N@4pzqQj
zG776*I;k=2e>|+CP}9l%StZ@d_j!I_1{Y`Cz3y$LI#_54Gqd!^!vdK6&t@~-E_tIA
z{q;<bBaEH?U~bGgvn=1Ru|4}*Mcy7m#Qy9*n!st*8DtY^^eS^{sDUUaIty6j%!OW+
z(NqF=N1#BTP4xzqbeB0BEp)|^5ZV{T*;<l_;71z+OWa3aBEpjE5S3^&6u@AX?$GIj
zI!dOxORNEumGc3P@-_Q5U-?icBc&yZMw3tNGWmShawm4ly(m*czLGE+n)|iWOiWcV
zpf6i#cEx%C6HatM<qtL_(F#WP`@7&MF|N12if!_EKKA{c6_H`zO&|t|%V=|_Ry_5d
zm&lhQHrWL!q-rHgjy7^DN4oz&&XJHe&|7DO<xs^Imffb*y8()BJ;L{fg{pt8X88G)
zESGePpR;CYE-f95tR2?tT)3b%!17jWatKe@d3ui4EI`WZZq}2;$Uw{>)L+`<-XW?Y
zDtkg|lmR5wYDAD#Un)&7t>O=XCP>Cd-F^ELIb14d&!s9~LYs)W^A%>*PkOUKcy<DC
z?t}i;^B`SZTwIA3GAn(P`M~y8R|kAaAtAA(nxf^m%<0R;FwRm>QUAXss|ZFdE#PTt
zna!TG%owj+CYOsPq0?1{ADRGnb<tJZYUcXr{<j(9BPUugC@lWEn2@hNn0g&7k;Vt>
zZ8Do?HaHiykNb6?)a%%I9K!UADH?oqe&INcR|s-1f=>8jeBLhtn_~84(pYPuiCU@0
zVE)6+v`2qGr)%B_<6kX?2L>Pl?z31n+sb7s=~AR$ftH53n}vKV=f`(gL7fKb{O%HW
zFxSldun#NAnYL~M9Gx3!$Lh6O#l%55zYEl#Zw;I|^YaHqK-aD_nr&t)v;Wa!Supcf
z>2sl)B)pS#BPQpyu-zx&9sd}k@9C(5u6mxP0)a99{ijw<vUk3Kb8Iy99N2)#f?UH>
z=Ov%C6qI&m+m;Z{e-&6W!)=ufm7=0#|BfF<9yd_oSnCNlhI<{W=okHu!L4w-exJEw
zPt9?$hJ)r4J{~i^hF6l{!uj8>$_{lIF1;Qs!YQfYQ+)FoVH10czYch58I#yoX}fmB
zXa3R9w$c1C#2WhxL?0RZI~~tY8k&4);5l<o+;A%Jj#zi&vEKVG)#b^Io?fnZ+0~9v
zxQx6)$Gr+m)F<MtX90Zveo?N{<I9<>urzm=Ls`v}*|lrDn=CwxLfr(obX@%0Wlb9*
zfBM^yxR;Hu*8EWtjxO!%CRsrkxNt6e8-M?A>7X{r2bs|1KdFrj7tSi|#Kne0?zXUI
zQmX)c$7zHcJY6Q4j$=Mx86a#aqvZOpsy4S2Te9Iwqx!8;$2?X*R9zx)2r(X#zd!yH
z`(i~rT<?+YIc?@CA@^l=lEiU(Y{Zo1=&DAYTSG3D96Kiei+HT+oqS(Lm0*&2^Wq^s
zc7;V!^;Oc2=CKX<lON@?{tUABg7h7(`0Lf8bl3qaxx33KOOasjD=B>IG9H<P1Fpar
zx0RdU+TMK*LG5r&7>l^x5h=WUotNtt<AZyzV@4FyB&8odJzhbbjTNr9iV}IeEou8w
zHVk@Oy60TA#BzWidGWPpk(^g9vBS^a)av17IoSvF>H|=Nkz;lyZuN{oVIu{;$W7Gb
zfHs1%o)*2JB}uhV;D%eWHZnte0tyP!7*5Pfz;?hXA7Ds+T<pcbNHTyn0xYL3GQsS%
zb3cBSt|-*XF-`VZ{z__>z{)BQ@Kghd@BW&UwGFDFg%TxAVLFo4kxzsl@8Ow^?nMw*
zv{Li&ojPfr(?wBxnN7xev!xKH7P-TcuF=PK6@tAb+<D5HM2|~I&!Rw6pEFE<&i3Y>
zm_0d`{Mptq&+tZMnyc$M%FNMu$1i2*0+oq>(NCz~GEPiW@RFMGtx~*9Cp|cGO4f^p
zUop>P!TiPZ>jIq3PgMDnER`g#t6MHR6i?))6b=5$pgw#{;^KOdM|CWWe&^!d@&{|r
zG;RP(HS_7=>lsQI1DcP`x8-|m69CP^h0VHmxS0l$t_8%zq*o;c0Iq->1@bI(awV!G
zeI#W}X0)Vp_9}D5RpviIxIl036?Kif)kNb}byVO$u);8;7-?t9wFz4>!*GGXPrUKi
zxCItO%N<@i&;InhSPG7V#wFXvl5y+0UJN#<=0e3Gr{|Wn`+VBFmCHF+N$>Yr<BsBp
zYe6Yy@^_F2s!2@0$8IU@n#eqB;qyO3@@^qb>%Fh;fv9vkS@mO~J?H8(D)vo53qR{o
zMnaw1qd|RvCMLWWo^jo&wUw||=bXxyYHluLiB!2mN)woVTYe+NHX6coeN9_>YUQ4o
zEH)TKvz!!GXKy$@n&5_g^d&zcm?7dq&`0+FX_M1WyLT&fDx=BX-ayvTLqE$@<SgOY
zsLzF^40!Ha(43LISjB0`v_k1Kq-G?mxWx-xHpo`XFo%E8&cm-t_7|GFDvHxd!hEwn
z_Cq3A4znYCrs1W-Dy`Ce$W<Gua~1I0O=FAcjUr>NUG-=V*6=oD6ZehGtHPxc!HD*8
z)gVUQp$Jx!ug5(uY0aiB`EnB6a<{Zx`n^F);>aqY1pc<ezRySnknEsEAQF?@z_U?u
z-?vd$v-3W+9s{4Ty1phSGx{X%{Bgq6=pV?~3(BW!ijNtFZZl|K^!mQX)E|haHn0Y0
zM!65{B+~;Y2i?u@z~@1RW5pfkP;Obz^539_Jzv*dru{svRlRAIZor_*{3m|^M#K{K
zfO0v~r+cKgcR*Mm&{AjAI8K4Q<_Pbbdm(DI4bWo&dw=@)qHbJ!pEJ>3+|K<C$l`HY
z|9eiB>U9?%<IP~!<ptxu0MjTCpj%Q&Obh>L?j98KX2LV!2Axk5runic!c;=GYu_*A
zvRJC#Z1K_RF`8+8eD^D#m9tnTHtYQt;k71*Wm;y>knJ?Gjm)o=1vIq6?Rd?+@`IW}
zS-&Nwp!&Tc`n3;QN>C*<PKVP%t7FWZn_IBK5SH$3znJ-ZwCqfcfJ_;mOG1mqHg{us
zMX_~-0;cQ0LMAIH^$Gu*b%4s`KQ-$f<~gm)w<Y#Ig0~4-eTwslf=&3x_hp7BPp1et
zF6?n4I3ACHMdjSrH?Hg}F<-Da7CB}zR!If)slXpY5!MjZc-=FRsu<-t^BwL7#R9PN
zNuP1UnOhd057y0WkLPW)=`{+9&JMp$Tktxgh`#FCzKBQxY_Pyv@%C>b&Tbf{<!;0#
zOn$2)ldE`w%XD#?ZA$vqZOIoiEs)rwiAM9AF<H@O5q04a0~>#TRj+Tm9IX%19au=(
z_jvNa)6h1RDg0L%FpY0fe)e|vW8Thimc>#&ZU+^A-T$Qj+I=joh#_3CbPtG7;ec&q
zj0dXyZOS<p#T_Ndnw_(`X=PH?rf{#Xprk}#?^&-3c{nB6`<_@)Jn?a@nW-$!h_Dex
z$St6x=kUfY+0LCLWgfDN*^2p&%4}blL(A0gsc=_Mw)9U};``nu6bPpxw{%jD@)}Y(
z5kCygTAQgC2i*^BbcP&7P2ByKuxq9$2?am!k40(jU>l?xpH`oXRKNwYLZy2e$M7-a
z?MXoCwE*#F;asQI43>Goh<Fa9VJMU?R{coXJM22b5;2_$mtD^(%2|c>;C@t<_G+n2
zCIdxf9|)`r#;vSWKr_jm4xo1uR72(VjFoe!CO`S3?@N0T{sYHM9IpUvRCThHe1o~W
zQRmi+xO%;Se>7ny?~L)iz%PDBPxS5z)RI=|v9JC%46LOG>1{X145`dcA^LUy(ctP<
z(sa0hG794@$0K6RLF}Vldu)#f+D7~T(Ht5qnSWPg$@@I9uXh`kiP^}Eu=sBSslbTJ
zT^#0CcGm(k%3oC#LH3XEQD}gjC|q)p{q%U4hN16K?Ck#K%I`B_X#hg9!&E5-v*S}B
zZ3y|X*;$=94aMaQq-U<H*Q;$g#_fn4<J#_S+t&Kjo~J}V{hRLUPOIikDSb_+oEhmg
zmAD)z(WFl{mD|)Su6z9)t*yQ<u=FaY)MiWShm;JSPA;OGP5z)S9&eXC*Sc5zFfXm1
zySkl})_|!CV<!Y!=6x>x8FBahx>oq~RD>yFQ1TxQ1o1buY-agr<nl>fM0SJ=q6Xq}
zgJUPPZRXLii%yfkN2Q||a)q#uKZq8t#IWZ?3mB<PR2~NiQ{UVV2NfAfLF|YC(P*jZ
ze&tE=%S~K~N07IBpic_ANhLWvRTdek(cU7)^9WVk?T1Ecp^Y<=?!xfaU5BaImC%E>
zW_4nY!K4<G$&cfa8g{Gmq~dbi1y4TtbteSD>QnDd;d~hqidxznST<Xk%eBl+s`QeS
zuQvAeI8T3<NmxY$`P%AwJUT|bB4c+oet?J9BELKLL*NAN#!@1e9{BI`WRDcdiF$9-
z;nX>w8_4RtDZ{I9tjnTuf8;m)>`x1KqU5b!x0<wt#Rr6?Fg_3}B!3U@!cm#qSm8M<
z28VEo-hC7wbk05F=8VPQaYMnYY3_&>c^s9a+m4+Z_nY4@P{P9F$yvvcnHasf+Rq;U
zX!x04@hle6c>&^$O^0G15*ditQ}c|0ovIr$aCKcdt;T6k<XTtrmM}0tmk>ezbntr;
zA`KvTtU;&8%~xD_nbS@k8ffI4eM`;$pvP!0P!;yTN3ZI)b#dTG<K&CN-;G~(#ePFr
z5~G7xn+TUxEngh3os`-9UPJGdPWkIyLZ#>4$<Xacsn%81t%JT)&W-W}v*nJCqxBzs
zoP5*3ekpgAo)K#0@WYcsvi^Gtz1ylG3Rb*8h@b7KHTu<(4y4_O74=F#@pDv9k*d{Q
zQ>N5znSUYreqQ&N9M3ob0egb8+YX^B_SNJ>AB~n(KfKI5w2@T$lV@zz@tgDwFJQ`W
zjGp+Kg=qI4hi?V_&JFcztU#j*lXNN0xJ%GSeQ|0+Q9ys;c^N98X1}r*_Nr`XiNqs|
zLW@G*Z1qu_5!KX_=(Jad-2n@HGH!dCR*a6DhS~A|Xq=z}8_?rSs0bX-4!tON{c=pp
zO^QQXgXQ>|OjNMmM!`dw#WmCnSc5K8EOgE21xs`h1otv<B<A*yh`Wb*C-WS~7?R*F
zyHfXRc-jWDLX+6a*#}iKHWMS6GY{f7KRPSonMNk=kJKB`GX0j?lIq`f)s_f>#5tcQ
z+9HfCqa?-4<?V`Fim4mX{>N*Y5%8a4Gul6QKpVu{TR^LcQ^h8oAk&V`1qdR*87_I{
zL(%Uog68qiD8sHCS%01b)l%@%)?8~6kY*eZSXnvs+5t5I&bajIr2_Mn$azvaLU;Zc
zEwlYN-0_>*f#9=uI<EwszShLw+A5?ATMK82BXnOocbk52-1!EZ{2#7Ruo^X?n4igT
z4Flwr!j3cQP66*=Joy{j!k**Zx;WNwQCL_i4~w69D3aFTFoRJK$0xXEANSxH!!;NA
zH`F-AZOMUc=fPtERgaiXU{ynNsgC{EC%3pm4?$1!{?S<Fo2x7N7I{bwOwCG^CO@|t
z6Hch-mVY><Tl>^r;7vc4B)<EdIi`c1y`(}Gx}Af|4Igs#^qCfAzU*2dN>!L*X)I{6
zM>4$aSd%HYJCw3NHed*-#T)PhA3oE1wac+qAMdIv$l4fi6n;^n+Q>001;}zKcd@Ge
z<j3$;kfS)^nvGfVvN?R^2j*$aFS(#;%p153oS=^v4zjv|pdphJOK(E+IguV2?>S&c
zIdMBPq_6&eBSJr{xU-|HW6CgW^66Pi?E_rHrD!^zfg%|-8@5=K44p;9BCV_N`pH{I
zcs_D|N9N<SOn<=}3uHraK=m<+;j{ePC?ucJf`iI4`3LMyx&&3pi=HnWL00e$XTNWJ
zOYfK!Gdt7e_IjD$n^)=mpbgkx=)RSs(tk69_Q{;2f6(JKqte@tVo?_tP3P%ld;-B<
z=i#Pi0{Dw9$s~*rq?2O`@#pfns`6)>RX@#J<LRFQQwB&yP8|)D46U<LoJhtv#e`;)
zOENY}MWg@AQvL6fH;VBEy+E((Vu|o6nL)g!MkIxBj<fs+;T#2bJiq^&V{IS7bO^|g
zDATVTiO&Ht?VA^3`u!f@?q*#kPX=nToxP5FFP>0oUG!UfiZU|#RhK|0Z?P^7WT)Ow
zjhQc8gDlpC^uq&ks9~xYDXs)m6|boLz%yXm`=&fL^xeb{i}1hMlFi1a(2^^D6n<D9
za?Q-RH!MmKs-5Rw$&59-H{+|nyT;im`}#SMjD8NOk$LJ$AT4UCghsJ&EGh(@@1m7X
zJlCV0dkyNstW<R7$Nj>x*P?Ma@^;ZNJs@#o)uZ&l?y-8>r6OreYtx%#XP)GIE-_<X
zB!Lrl>c%m!{N$wRGDHCkB37IL<#_ZxTe2F2b*;4gN)VDi_RPuXzAwkmdkFf|RVZ<I
zSjF1RN8aZyotR6=z9GHE@a+XSREV9%<<SCN;SVSXD?w_T=$wn`)MBz*g;+livaE`{
zTU0nN{`sarGzNF^NR?htyuPXZ!yVS5@VvuI5nK<(gjTGPcm4|8HpS7GQx4APjVp(G
z?(>T8T{%x&^S;z_+1x^EE%nbW5z@B;^UM*bx&@Nc5k<=ZPElIXxzF+J1`wzQ;vfpB
zb1KPRy{@o$&PWEXQZP`nLWkjABrrvK6erw(0hk~BzYF@=&<5TMXH}+rAybx`(vc-m
z%t#XqKoOoyYvA}0+Or3!%dW0y7Tv<=7ZB!E$lX`-mvSTlrM9IVcU|{;!!D$i#V2x7
zs|>XYp|9bjKKi(#7AoHVrY6GxPtUw3<^eyDSPKwTliAg52#^f~pY62v%~;l~y-9C+
zIBd_sS^X9_5?g25w<*I#--SJ(iI-bopt$7R>Gp_O_sS=CaS1DR{&8<x@>0{BVjazS
z5`hG)7$cBEksP8mk5vH@*TSU<@mFqj*8~=0GkjebI8CCMi_gq)8l5I!(I`<sM>3aQ
zDf;i~cgwbSey+kK(QGAN5!WA4^D5ND=*Tw71zT<WS&5|&&;8?MV?)sZBS{!ggKP2&
zyV#@NWQ>d%rv~?q&blSf>IgTUhbXAY(LSxIGi2twZBdQ85;qppacU3fp9VtERue&D
z(<ZySx}=$tShIgLE{+Fa16{%<m*Yg*5A^m+%gBPgKZiCXs%MBJ#j!S<ewVeSFRjS^
z2Z_UFWbF7%=A2;U#L=kxierPyXL8Di!;f*l(q#_e?)ZsN(XbCCe~^EIZerUt{DG>b
zCBhKiv#Ck&%1oNbbN@}7feV;y1^9q37Ptg%xAR?7rgBB;e`j{i=0z#-&cn%Vet6r?
z-#_f|YClfq)4hoc!3nQ44Zlt?_2&Sc2Q{_TJDJ^`>zx=XSQeOX-{e!x`Bos`H_t;R
ziYuK+Z0y?Au=1X#jl}}BCg20dhVw>cmlCKPoF{#}i;>FGT#s3)je$CU+Y!?98Xe)y
zLr%dAL*7@-Sc<Z~)tb(tXrsHxgMtb_5G0O;2#Yn&pQ~}{Z5NDgT$v2#jr|W`xq=i}
z&G4vKwa?DvD*tasUN%V&`nig^K*UEIo?b}M=Z8({BaHVGIOvc?;ppg1G*w5*b|-SL
z>eXS^gR3u?j8(A=vH~-QWS4sm7nFt6b~-Z`T}(d?hB1Cc14SOyC=XJ1Lf$llu+NLS
zH}7UrvE6h}tX~GDPR_%A0PZA{bzk;-^tnIwZyGic&4R61%7wpXyRwLcMByvPu=*o@
zlFlj#ZtNzHLNQY9z8F6`{vdMP_x3P8`B@AF%QLs}e*T)8^xSBCv(f12WT+C8P1v~J
zJpf;0y&&}2%m9R{qD_)M%XRv`{ye-kwI0Hi`5l%y5BmhbOwt!20OjuGX`RhK7+Dw$
zCjS2vG(3C_9~RW&_>F0<74X>NRI3{VbWNqay^T{~_d%g(+zh7$?Q3?>vanBQ*X2(i
zRK@@V259)L6Y7LldsrrEdXnz?yymYNf0ImF3Bycf=H~S-gYPT$<hCBJp`%hA-B9q(
z{F~0C*3Fx$5oIs6K5{D+<MlEjwsAFST>z(&^`b#qi|DqJ7OOZoW7*I~Nwhrub?lqQ
zUd&quDI1a|;GmR_VS(@q_<3q*y>S?_hbL%M<$e^183riV{{S`EZrZ?}1L-&YpV@1g
zNf4!)&xfJTB8>DRY4!3OYDmWwu^(c;fqNYy);M`c`u1_f9k(8G^8N6e>#%mj5@{lB
z4HdBoL>L(-RwtN~dneA5J7N=Q?v%9%T>WwC=N&{N^8|<D8<8y5yNTDcOx~Qy844$B
zkY9cXF}Y{5<N$uu4Y}9eygyt|2;ePvG$eeM)^kM_j&!T`Htw|lUG%8`Dne8cYxj>P
z1n36r9uP6;<bI&P^1^w1A+4*HF`id`F<(@XlFCp!%e}@W?xM+(Jo&&gl8dQcEg?B9
z2Nw`1m4mz>ooNrtR}BM}Lip5giv<u7VPSy@IJBABu9&kEZ`P5FIxgA5^UEBdj)MM1
z_!;JbgxZu=uSf}vl=3cmutv$boj)EweshdF?mCt{UVOc)#ZYMlxQeh!j6>$BQ^XR*
z&u|fqyx_d_yF<!xnkf_EcjCpdbLr!BWVYNb|HEEK<m6@#>19IV5gnt(dPIC7X=7th
z{14>%#~%C8KJ;=qP~!!4yJOEoNQkQ~iQz(IFI0VrE%0vaOv)L8RIxWS-i>$0tp7br
zb@Bt4z0^IPnsE>Nazl!j>!HwO{?8SYpYZ(>fG2t=4D&HY;Dpz_y}iJfQ7c#S#Y3Cf
zcInX7THgRCPi`;i$I0CDv(|=hyF~r^S8C^^Vm3le$Z6rG^Fj_PuNBxo%UKrOGOKEi
zXb3v_{<lfv?mA-HDq<D8BXhWT{O6?q=V9ND%Iq%3wxbn|KaYY{E-FwkwD8p!K+pI`
z<9ZT>Xo^if+PLtKW&mWVF-5E#MESTKA&<I;ogdevJHmpp1-Y-Aiagb=zEsTN!hLgX
zPQ0$fVs=IRBOxOM7c9-;Ym8oS{m6Hp!~8&C>N6c=DNq{8vj=LL-VWux@kL?p){c4G
zTheg&9zN{C21INE2etV-U$hqr^)O2mrxI40Ucrm_n4ZLQxp7}aK1_G$PwEEf(2+6{
z=kI9>UNnSuX4nAjRmQ}!_DrT=qcyb{m@83TrRhCuzVcy7QHs^s7<-rvuy4E%$w&P^
zkJGp}^eS&I8#K#st|$9dC)4nTMD`KNZ&5faq}>EnyN6wvr{|>`nP+_*kK7s=s5LlB
zuiBoe{8*RUVZM!P=dWJsR_J-35A7=frN3T$wrZy)cmoxW<l*1*?vMBju>Z6e1<rFh
zr)}@ql07B8Ro39Y7~){zlJzl|#s^DVN=c(b8C<K|9jq17)}L7Do6}c2b8p>>j`sRf
z>i>@hescS`r;$$(<AEC8S0bCtl9OTj>&1-8U`Tpm3+H?aOuM*S%edsxXpV$)Y46tp
zak*EVoK8;m0@Z@087GPV0W`iHnHa$f88uB>D&#I)3$wHeT#IlN)vY)Bv7qnzqvJU|
z)8z4}R0bt=`~FA!Z>bZ(CH0W<UuZAw(I2|#ioZ`*{uY)@+)uOrsp}rPj=rz!UIF}}
z5z_y+unFs!O1yu*tbALv#Dk&IW_A+`+&~0F1x&H3<9<R<4n;$=N$MX>{1-0~Jpz&6
zfuZdvAz}e|On;R5-^~qtz5#A<<9qiGH6Zwj=*LL0tbqh%BI3P7JY%^`e?;McLJ-RT
z4d~tXGpI9FwY+8@<L&O3L(>yB(=@k$_X+e=z$=>AaN-1du7siZ>8zbEb%~GHDXQwI
zs&a-n<c?<9X&DK6bZ3Yl;jT#LicjBI0oL{D`RUPGjBtr|Ne3+1&31rW$Q2Bxu4_Av
zLK_RN=2ky{x6vXt#xxi1(6Y+Rn(45^*&&<FSraj?q*}up{8pv88ovE;#*B*HXU=jF
zQGA_nZpvRy$eRj^*KlB%ax8u{sKune0-=Agt2KMKY8UYdF@~TZW)R;HpAT-Sq{x|G
z`@9!@Bz|(~9}Qnb9AcQXfZZ(H?>e$Nk^M)*6Okxjc%{AXN&xqzp(iBXeJ8v)gB2Hc
zbiV?aF<`(><=8b4a4#=o1TT4K)EqIW>8lh~KZ<mPj`o^30Ea&tJhT{0o)z;rnaDMB
zHgle{cP7Ugxq5rINP7(cq>Y+MV24N(Mtj&gBw^XW|1=xJY$^?<buhiSJ-gdh+D=0w
zbLYL*nJDU%>#rx`<67=^KOwk^pwvk6fAbP`f@MzJPo1k*kl5yIP4-BX_B76&=Oy^C
zJ-CQ34f2Elh92K%y9RjTl$CoAiH@JjbI^}eB#);~hW^pqj3_~TBCTO}`wk6{J5Kfh
zTp%QT{BUOV@H_S^f=pV)Zo416IkrD({zqdOQG}Qw{bt{t32FVIv8`6JtJUT|`L(`d
zS~~)F2tJOF=suIccztGmvI(p#_KSN7@s#MP$BHW(w(B$QO)jRtM#yGVlmWLtDLO|c
zM=_Y_vR#yr;<vc;Bc7Qc5o_<3eM8;O8?I7|DJ5cxfpx{XW}@|{VAIju&P2?)gwwS?
z9ma=?n|LLJz>i08a9n4pmT5ti*%!Xj8z3!-*A~s9h@-^h$Aku#{d3kd(fhK~``jix
zTLGLI54{UPN5ouRX&u!XumZP=SyA~tU&otaWrLUvyf=pR+6OOYHk$x;kKX=G3z&1Q
zr=ICqW`j{9r^M438sISll=mG~uU?hb-d@Von#O|^iZAZIu&`kWEZ6{+xm`L?LrTQk
zcE9B?7BF}_mG+ZD2)kTMu^=JSBxPgpdZ^O$WC7cvf;L8d^Is#v+CKso_#N(^A-XE9
z!0nCR0PWq^@ZbN@q{JG|#kG$W^`B5f!sGV7?-gIs2H%NzU(*y6@|!41dc6;UI7XFV
zpPru;7_{k)qLqa8uM;|{{Nn08{feA16)Vszz>PEq%y5n23Q*fmwTrcOlojWv4Dj@O
z2XOZVH#LgL8ex}!YAYBC*GynRu|&`4al|<U$W9kL3Sk>ynilU2C;X#vGqzN!mU0HO
z5YP;PU8aH!OOkYn+!)ECU6F_(1F@Nswjr@Ojt#2VCW#uawnKjtKjSrEVGn)<g}eWX
zZ<|AOv+3U+5Opea%CF^1PFZ533d_4^>>9uMAa>;80Tgk#J-aRx92VQsrc&bGe|vUI
zXy>T60<o;?*<~pp`i`$cdqMZko+0^T^$sEnK0iyl0$!DSD4JF;ng(>|ct>uz<@C|^
zTiQuE;t&9|)}#N?jB+6Hi(_fAx@Y%OD7O8+ogZ$cf2q)zr+p9FW6M9G4^E4peYuzN
zUg_aCZl{#lt$#F;Z~oCJ?P<9GE^33`>$?|sPb^U9W20!uOd6Camm42ZMwuo3-qHCm
zJ1hBYuW$WH;~_8U8SEGYEZzo5H$J~684k7yVX_|!f*?b+VprMb$lM)Z4w>c{>8PHe
z-77|Pr!t$5jTQn@@&eA=0?uP~eUe0DliuDB{asv*GHK){1RE)DqYyeGcz%<xcH{ws
z8gc+G7%jGyGTR>Qdtw+0*m{HN*Hhd+rZcwxXfBDm&#>*g_umr>Q+NN(l(*Y;3*|e&
z)+pX4rE#9{75J_qe&rucKtz=cP)K#g_1Re-8Q4FXZ7H6qL+buvT*P`XC~Oa#e5`q4
zUJoILG$UGQ%x@i-_Z-`QajeGxiVb1;znvCg+^Y}tM%arr&onGuDK{6;LY1?nPZpt(
z%IOKAzMZ$>L4mH~z_jA@yVO12&fRVAlQCqot@S(=tss(8pZjtccneeUkLK?Q!U$24
z#?u)>r=eMUnEXX-_a^s}%m8c*hyg|spp8HrG!p1ON6#t57Ai&ybWUM17z+f2N}7l9
zfDf+5rgzELes~sGp&?zX9&9pm>{+$g_K!wfZAs7e+0XlqotRCRzhg(KF4YJz<FE_c
zt|aon7O<@?fQXol)8MqN*#92@GLXjjzs%jCp-Fh$rKSOGr0cx!0aNs!o+ROaG<$Z?
z(^_;UrTEx8W=*i~>7*)(Q5@x?24%W+0-T~Y%2fF17K2@=WRif?zS1*2HDC&YB}Umn
zsg09@TJ)AB#wFO}BvQXZQ`(5t`HVk|(&&*3jIW<WIT_o}ryDR_2EzIOJA?p`!fpjf
z6t?%qYF!k%WMM=Fq~(*R9+!nA1ngKIQSo`=^ACmX=hfdx6l~u#_n%$5V6m-d(hR>3
z#UoT%q7Dt}lvcJ~PR1h`F9FIsk2#aze15)=#dnbVO+*%NlrQoGyHdS_w~1JDN$W?u
zQS>?$2j|vQ2=3}TDo2dM8-OsA^sMb)`3GE;{;8DhOCOmY*KgFU{)RCiJ0)(7wX=og
z{bA2)@R@Bq)Hl3KVHaQtuSd)zZ>Wj6N}(c^4#`bxCv1F2DWe;vL_8s@S28UlVefE3
zN(ZyG4VHdI$*>!auTGC*mZ;f=Miw&*M8+YRg#`Mp0?{vkSod>r0ZIs%bLMy9mAgIp
zVT&sUXZD^S3BK&H;xTS+)p4n@g8~{67&$=CsX)kLb;!u-H$*RY#Js5`Y?v@@_ZV8o
zUvmfD|L(XWVwIVeptUE*Z>%ccui|-F<7z)Y_4v!2>4`x8Z<FWhw*r|qrV)OZxOt0*
zi;c#=m_=)=Vj71mFWO7q-L>6B@A-`~u1cUcXik{V92Y!4SHufqTl<Fn!W!Y?UsHGd
zu{9Ub$TPE*(@lxeZ=2U|Rk%1ja?`iz-Ye(4Ca#zijxU90%14A{1J9Y3g*FfI(fxs@
z2dRslPxhT34OSW7aWb4%-ui<gn#{N!m9lc}3Gi<q66g^-SypufjRSKusSIAQDfFnX
zf0U1+1-SbEXhzUkH@3xGF$#14Xu1=cKxiwAfv8Sa-){f#XsN1bN?-cB{b;i{)C<8U
zI5*NzpLEv^HZ5JN;51VqsX8+R{ms;Fp@w0aHB%!9cj}Tpp4eL{X<d>nsby5WB)xX6
z;xKpIJr+F~nSA<YJOTxr0aB31>E)Ti>PGM;-oD^y>=}q<tA*E<T=`CKZ0AL}Jqo-9
zh6b29iOEV2w1JJn;Xy>0Nrr^$9xMoA)0CQcgU*jsRCO+SJGciv(hC;!;)e69%-n^3
z=f*@nmW@r77q259()vW_x<*?^T5{CEo$;OHiz|1KPvo~@A!mi_P!BEo^-Feic_QB+
z!mJ&Cr;HtytR8jcqSr{WCgM4thCxmZ1p~_6Uc&2w47N%9P+qJeNSfi%(|a`xS)>_p
zmRGTi<mgEk(!(*LBeSXL$_(G@tq=qBpwP0T3u6XriR18Nwe@0Fi}+6+d>VDAYcr2u
zhnb8}bBzaiM~)}^jyZX8ow+r9VHzJT7X@=XI;sZNpX=C$nE#`h6PvNs-)mBS2XmyB
z<^~F7DbYD}?67Z9!dNR2)$gfG(h2g73F$!GlLyz!q2jc(*%vx`X5Mx^J;*NX_QG7h
z$nDG+AjzMx+q#_VEbz@95u=#ihT}XiZ!{2n$|LuH*`)F_P|BO9td?1_Q|HFD(#wqT
z0xpaI_rke|5rDYT$)gMj@yOy$5{rH$J2s_&y+FhjN{;nL&0i|wYzEzkEdu${3H6(M
z#d%s>&cAj8R;?8Zg^o%xGDyDW3RJC(y_gzlJud)T4@fFiaVTCAq<rg@PW!Araf8s>
z%N>@~U}1@2XXZ&Me{Q7OV3uJ@o?;GR12-~o)JM4sfcxp+SaJ2YZ}3xdbU$pXRGjyY
zt(X9v{mC3z`+$ozKCl02DxJBkm4(58%$zgEg`lkbb39Xe&nTzl)`w(`{x8RKJ3VUw
zwdxKku6lj8))JPPXi0ym$J&B&XUs+AXL?!u%Gw&mzQOY(qF9WpCwtk-T-TKfm<24b
zb7zlLk3X<2SX-JTmshgij`JT%8jYWV<>x0n0M}+}e;(!cHT*cU&l?i<+2pvZT)6w=
zWp$;wn+i&am%c~zH^;L>)<U?(me<XI8b84j>d8czC=VZz1F2w1M$8>PE2-BCTn%iN
z-1zj`@iJ~wdPe0Tx%>RISc_p=SW51jRmutW;cnhWI%z3!wlH8}>Q}B(weq>FHTm~2
zMMjxgUQ8D!j!<9tb5!`*!jYlAK^f&|`aGwaT`($Cr3s_qUaUv3+5>#Q&!>>y>4Duq
z;F#BrG@$zaH!^JtjdK`?3~~m;BIk0KiU#LDYCuJD_bnH~Qu<^~?!qh_?7M}zrPXEh
zeL$r}f&oY$BSoTfH|A~M4<jz)dz?jQGJeTM^09+EpL``KF|fzG$~k#*p$1e-8XmR}
z)GjeX;<<{Ow2Rc~hzt4PC+VL;Jvr87;7PeuSEgP12ei9rm;7q(YHjIh(N^Sl)wyA`
zfE1;VaG`Wwb1tDqQdK&3G!!EshZ|tpDi-s8FG=^5m#YD(b@optYsWodZe?5ZsDJ@4
zPwpvm>2Kot-QIsLUoLeWP$g~?DzEv)I*pz5Gm~y>=>3$Ay`o5!Y-^Xb_~l&PdvExJ
zQExymVukzF^VRU&E&4}~c<W}~iwv*mcJkJm3llG*^r+nKj=SjK04sjWpEWYaaQdm#
z>ns{fn+VPecYOak(-%kFUc@5kYcAiKN)V;rNbh>k95Hl6k{$gPb3_`$QjY}VmW^gN
zu%sv)`j829;3<6f2WJFrM%veL^Buw1ePfO=bMHN|4q8bu*R&HR>ow%!K=O6b2E)Pe
zk-Sh&0@7KvZN`{s?G~028|&-DvB~nIxke7i7zvET4squdJnp>k9c9OMPk&`n;OLq_
zpD|pY++~OaUa?7T-hbBZ)YFbPcCKv{Rabz-$rn33aS7EON%k=O#KdF&m16@wDsNj%
zyJq3Zlj@nocBP0&kXJc(;c0t+mT9Q4XIhs_i}y!1ct8TQwKw-pXS<AvP-O8orni(Q
z#Z=KT5Nhob&0%8OZJ3!6UX-KSUDPbdnip7;66frX0?T`uljtR`Np5N(wQ85+l3v={
z8z%5ex5TL@6)$+cbsLcIGBG_$KL4h{q-fqPCHt8KXL^UCQi@po!%gd8*sVpH(mE%<
z2X-dGcUU;hGQul)RKX*dpQ4xJr+wt^e!kPuq|b+B*nQ<%?P2lThl)MV;#5(qjwV#K
zzkBv{<h^RNILJOKicOq!vzd=&sMx4CfazypoxJo0xsq^8@48aW?PiOjW!K*P!P1|P
zGkr)u&m(Hug>0!;AtJ(l+)u9p{W!Ru)+0~oFO{^9XPtvx>`q`yk?b043{wg6E1?6u
zywfA*lS6R{f!2O(s7;-n$&m+6`XJprr9-#^q#lS52U!FcGceZzwO2C&H95Bb-nMC1
z;FP{)X=(KCQ6MEn#%^FE_E%7#SmXQRfosPPe@{aM`XYgBpj3sLURZ7w#cM=#7&m7}
zk1+Zlo$C~}Cy&C2(im901(yYgC@n2T{84Ib&z_EnE)QoSqv@YV8J@-NiI)8md@HnT
zlx#VvvYJK58_gZ*5FB;qOs^?y970VmU??|qSLzm*Ol9*CE^3G|Pk}pljA(2^`%5oG
zw%3~byUrLkFka|};0S9jG)>}DoZZSQ8Zk9i-x%hk&)0M3o9A?NLAvaVcRU0P6*AAq
z+85~=&g&R5qF^q3w+5Z=Tab$)QABq4R-?Z~o){+-R*~6jx#f>qfB|6^R^XWiZPL4*
z?igkB%{rQwHXs!G_G*3xo4BWhMQ3xutY(KgDs^5QS6y&TWyzEh<iP)4kxVs{H-DoC
zevm`dV^vf{f1fF}kM(5U3fxgTGwnwya|Wr3XWx<|(f_7o8^%T{?yFZCUb|f}gPh9j
zp1G54qHbR=%yTPWMojD*l9!1G(J+*>`TIl}VPc5L^&c+E6`OXKookR5>Aa7dgcRwO
z#vEot6!d!H2Hl8=mh64>9R{GD)OfA&04GVtUtz3~A&vKD)?p^~5vPP<MtefiN($J$
zxz|d<;E6+uYusp=*}Jj+DotB}vor$s{@M9B^*lZ@f?4Tz9KeAN^u~!KljLuvEiI5I
zr{y>HtIL#O1A2;89iykO8PL%VAfgQN)HU6Y0avi(sW7~fD3CN{j3b9#I!J!T(7`=o
z7BxVdE;W!SPM@5fz+@aNVcOMLl4*R#4Q(Q?T})?k$y1OwTHv!6e1L_KC9?5pJS9`g
z!6f%e0E#bG=V4!I)E#!~>pKukd_gDC$p-vvUwo%g`PO&(+xHApLFSCB^qWxCYH#mw
z6A@H5pB&2+$Ls!se>7YN{nU4o(zV)1?Ovnn<B?ZcRV3uN<l2XULzDewGZF(bk&Q+j
zba&$VxYAqCI5RcB)g&OC(ZT|*$qXkMN-mJ4{<|7dFBFpth~&0MEb_o%4JpdIH`T8K
z1kW0zayATo3K!SHMLvnIjf5Qf{U4s*1Rm<|`yU^SWwMQ#l-<l2TXqeSjGY;4v{{mU
z%bJ9;Gxl|6WZ(BnVUi`;g-Obm1_@D7NXSnASMTrV_h)#_!^7jueVudex#ynqJm={5
ztLjt|{l><ZjBj5$<7_g8>UuyiVBHjO#C+M?*7UBd(#lqu_V>BEgNArZNPF^oB&-TK
zf`8w6^9F4=DwHS2ayz4krnnK*`AB{H&EhM=W&DmxRM@q*;ouu5cJH0`wd(-4is@Gu
z@utJ`F-zP8pT{Zy(EjfVi6)P$;bN(RsgRiI9G^Pvn<H*of;rVH5&J1xZZXfaeC+1V
zj2&0>Jv#Z?B+OWcq&|jN4o5&>&kjog)S*JkeIT`Oe0?7iz~9)u?#R57;5C{C$oD@`
zW?Ukgq)P?7*z-WhsnFSZ%tlf9ts|QE5069avOluR%6CnXu@Pg5EZrA<2YJBzA=V<v
znHlNX$WwAt(_Pbp=L?KvK^EwBpgiZLc=SPkuwD#QY?Q`xdTRa!v8R8gM<nBEku(~W
zAit@T2v5ruhOzjfR;}9Ds!p`Qv3J3{DEAHs`g9|4o*V=n%iq4w_fg<5=hWi2cXF6E
zSTX-d34!g1BZS@1wU<=NH&J=3r$_eG&zi47dtxP84z40GqYlpfC?@r1P;o*|vR<N!
zXyMAa`Zp~)*)7)iGXLI%6lcrAWmS=B5qHVeL}i&#T5#mA=v7>p_~>L9N67o-F$QI}
znF;c4B>Z&N&4NopBbm8iLAm+N!VQ~OkQMf$w~UjH#!-+mD-Ix-P{CfW!unHuiisoG
zF*M;mswdb+p1Mg?-{9HVN-ce>u2faBs=OzERwc8!>-(#<k&atEF3aDy;uZEK{(ldL
zWQE=_%hEh^TkthiOGrO$4AGK!c7Y4dEA^_7rtR!0nQ>}c#LS_J{!<0{oi(e-T<^9r
zU~C0|P>DiAdQ@CLP&dUn<>0yUsR8%W+0iD*A)q$5m*=;BsCh#JAk~0>n{`wJ7u*Y%
z=OuEiAdF~NjP}aiCT=yl(dW8nUwR-oZWoQv#(hj1x=Q=ZHVw4>xaQnKrZ?en>XmV2
zr0GCiDrEHA=oZj9gjy#~h9vaGF%FL#(MZ^;Pid9?mFS0L7DpWJA$j!;YN5W+A<o^b
zGyx+|K@KzX%Tr})IUt6(R%n#r7gMnIm`CcA(6;vKXuXIuZ$@nY!@fqVB{Mq@(RU*h
zk4HMqNGwDTvMAhuAC$);C@=2CNxdYaO=`J1M7pF+-_Yyb*)Yz|_zu;iv2lJO@W1ga
zTPPZ3edcG(PZ(FU@Qt$czTA<utyl7sXrZsIIUQA+(Xp>aAgt7$zZ)&{()rX=VRy}X
zBfnNH2`YiSly&*B4@5`>-xzyyb~A1@v0#|<Bia+yt9~t;@2rS2I!`M0I5xGlor5fb
z^C?JmNS;<*ddPhCTUKVzoyZ2<QgL@wzE~gWUpfbX#Z!4^VXg(n(cLlEm(`^5Xkld!
zDah8k-jTTH->WX<);G;LNVT0x(f%}vFFU`yv4a{?P81yUyAT(nuOcGLyUVl3v+OkZ
zdVEqL?gf=)Zb|0t7u}RcY0v&8QJr{x;mblJkB}q8hQu@1xZ8~1>qPgPYL>W-cRwnx
z(W%h(Q;Zv{_xTIby$gMIx?j?IN5aH8-s4mO+hx=Wt7Sp#NLx@jH?8z5>jT+bnD%w5
zTw7U>ypcrJopZ(s(e5%O%RSq|uJ>b&$aEZgMi)-mOu=0I95Sf>qsowNG4cr&ADc8X
zPCrW=V&~BIwzceqW<!T6UX)~u<lVenM043$$_Q6=;Gkm(pwd1gu9`&J_z`YGJfWod
zIen#EWrO6i+A33!%Xi9mE{WT$X8)of`0i8@`a@wV?PL+DD>U*T-t~{R-79G7omN>%
zFWdQuzV~~)e?dIbu<e^#(TDmVSbdr4X*>!q-p?pcGJjD-uuaLk>*wOK8fcl}R;4fT
zGuZiJ)L)QIa+Peh_P!0;5s#JpPb$j;t6ok#ZT7drdtlm5Dpm`JBGUQ3BYURdEXjz<
z%>Fhk^ZM5o(!sUqglo(p4N7j`jG0A=DT>NE4(nC=+DuvY?#gM_e2c<mf#(nKVvTj=
zq=O*j*vCxUq2uT$Z2<BFsJK$pSLjCXNBwtc!A*&XT`v!{QNE;BKV?g*O&kUwD5muu
zDDV?_jCiE(fc~p%O2m6w>hsd`gx1inXUOPb9s;gXa}L_Z%*D$!@w%s{^gIU<M(QDR
ze{?jw(zUawJ<#eei}t^KEBVXlOEC|3Rjme@tYu&VS#UcuVqO%o?^@xd?S=`L-%|tA
zBI*m%>%|t=a(tT{I;b%+pY)XR4OgX7t4rT$Z`16M`F7-!(_Y8XQ(Ky`#qORFjdFiM
zA}5#aqSre{p22wa&Vum@4mf#&Xx$U>VYePUpP9C$=A&uCtjGnjPK`ewZv<CgqN(Tu
zmX^<gxjwD5xc@F|JHT&+MjUOx;Zt~@rGz)*ISg^-A@{0;zE|h6wVp7Oi-X`JL`Q|s
zd~mpNpt)-1z_ZVtj<!{%`)Y#JX0UBZf5G@F_FJGp9llAdH(Wmq*HA}~x+3hA`jkVJ
zZ`oV=!I{Z~7NSg1pW9H#1?M+J3SPXSA^l&x{@-g~VbYO0X<C@Dq&ntOX+#f%5+UxD
zw(;e`md0<E6UsOIt#TRIXL+GEc{+;XT~%I~WUlf?c5l=Um`&`e${ptr<@wH$sk_L9
ziZU@Bk(Y=<Kb@MKD7v!PCk^2fcR6%<&M)Niwu_YA6pU#xsn3mrCo}G_ooD5WYv%hj
zXK)iU;K%8#mf63?r{h(f8Rb<%>0K46rq!blS$^(d%<7x4BhRp1Lv$GNRpt7)?*XD4
z2o$nZbmR()WfZ;eXt8R=@qOrK%466LtN(<DtH4~d4zIs-Ap;8i03&>5&pw+OJxWpp
z9y#k@Z=nIB6nWjMIc?lc+mE7e#rf8Vt3%4h<6blB87S{%?1VS_rXPQ&^Y;8Y?_gJ_
zj@|qcLN}1(_bf4<)*Hs&98YX<IEX%=?8qN!wi_Qbg%SLY(ic9R9=IeWz5%~Obaoy+
z<VBP5kAEjM<iik|nQ0CzFCiW|<0@j7@CpkS(Xv<clLV5Dv>XeXE$QjN`3CSuVK0og
z)MYL3skaShd1=ipJhkl{>n4H>h_1}RmpyC~G*8_)@!!n#qjw)4Rqi?_(|=~8^f<<e
z7wJ@^S?`9$DK2(ys`NhU3<J(p>DePjjZL{a+SQuXvV-FNQo-<^gJXgm{78Y}M3ft7
zoO5OnwpU3vVN;=3I-;GpLK+pzos@*g=Qmui?N#P^obZ04_$hkK6a5j9Qf4mY|BbK3
zw?ReL2pQF9Dv)*fz!4IWoFqN?N?}w4aCvvHV|gV4TFJ0PSNiWBD0T`GjY;d-<##9P
zTYYG;H{qF649K8uZ76hLRC@VaW-vyHc20?@lkbN%&r;iscI2`1;a5uBOOB7;o-mG*
z2evZb4<&pI8@sj2v>D~hxsV=b%TC6Nk+*YJ3KQAk%S8rH(n}G<Cj}UI#VsP<U2@s7
z-%{}%!-1DFk~F`}B`;X2<wDm&5Jzl^T^_LiAxgVRlIU@-WL+3+$+0$3W8k27dcTVJ
zdeO7=N5awoxVGN9MPoX(xC`j7Yk@PftIxW!iW%5I2oz7t#~i>^Q(=mQA_S;87mQE<
z(XK{D8jbp-MGHbv7cBxVx+@4!39Zg*$gUPb1q%*`(`MPYTozraQJyypfbzx2`YzDC
zAGY?c{_v4J>7^0sP1A+&K+WDw^}b#Ov6_GT53{YTd?`iYLH64-m<cj8H_$r}C9Nfk
z@`d=Sls2?+uBuG)U&cu1u&!|)2t=GCOz#m=Tp4`lrsOuLhi*~9yQcl`rHL2c;_^<v
zl7u(xq+Pu=V*I}ME@Xp!Ypp^W!x*IGZz|94;Y<V^;Qf$Ir!q%HCG>Kx!s-xDpPWx^
zA(Ck2Q6U}3h1G2qj{GsuymO}7Wuvq2oE-yH@Xlo+hV&D&4T*faSoR<ENkNI)O!dYa
z7tH<6F`&3(-b8-jqT}M?y~7%*H6@@u$uujld{e|U4cQ|UHK7N+_^}X6@i0)lS+vB$
zwP1canw87{(&gAe!nw1VN%SmoRbmtqw|*d3|IZ4U#bBa;mZnKrjE1wPOzWkN(zXq4
zS#3m)2Wl5qZ5U~2FOt66wb7A$uyPc~RSDq&)^hvXIdw(`E<-JMHE@0JgZ7=S<Ffa<
z$$Px}U+#*HuX;6q!q<2?!OU(U(aP`$`mRH5ABzx3?%uk8JEIzV6G6pu=dJ0jM9<m7
zic7^EQ`Pm2LmTHUY?0h`3-E%9Y8A7k#8fIluy6FiZ#!IlVtJ`53A!VY%Oz_5s*n?8
zTq|}p{{9S$XPkF}z0M8YNly1WsomTNL?z>;l3I+W5!bw?=1uK+7zXLC7jHfh0G%gj
zV=qnDch?4q+!t_92L~en1ZKAr1zYRhob+06{z!}f)jKU3CRuR|sTlLbUcn2#-8`!b
z9|?|`B1Lr=v0P}IN(dCY5>(}gU660J%v0tW;Zv*%Q2YxDZdIHFH~C9CW)cct>KHYM
zS$=iTS5Hm%#hCVn#isOpChhe71$|LYUw*N^Gr!#4)K|U0oE<i%aaX4><;9*3?PHUD
z_9$;eT<?9m!Mw9{WG08up@BiIoFh_1FC&H+#8BQAO|Q2Y!8k|!a4Hp^?0Sd)O6n33
zeh#uP-$TnTrA7;|M(S$DGqWtR%*W^o5ne$qh`ja?2eatl(mE=FyN>ML%8K<=P91Kf
zk0USVqL0yigIcG}wZjQxq1b=fDOWPS+!@#p9)50#kD&QlKPR}X1WVB-ZxfDU7s_1S
zXCkS*qCgh2?%(4Mhjpj4@$IO>I1*a@`E_R?`HAgpe?eWvP7RyL2%1&W_9Nzel^LaL
zN1PIv%1wvT4d-y=*G_VVWB51e?prMve7lf*pidZe<CMK+{g5gCZ_=y;?FV_FLZ%@m
z*P2^5fEEwSulUMGY>E6_8JEbfe<n_TNJ8l*(t~l(gyT!WN5vZYOb;a1c>U@I(!Xyf
z0CO!@2J^XWUz>3Mc}4{U2;jN|QVrh9d#Ex?e@#tPp!X_Bt9Xv*Y3yKn#x<<tj)8`G
zI8hXRaNY)u#oG2}BQ5%veyc{5EFoAW<Foln3Z}#`<4#6u<bB;%wqDglhiRe+WGAI8
zgk^B62cCE<e*LOF{~9g{b%Cc3)?l9nON$1d)*S5Fb_(Gsgx0k0|ERsE&25>vtjHYb
z(Y0xE%e3KJr;c!KfJF7E)?WD=Y|_E01nu9X&?SPo9=9RBmi(_oqJpHE`01j~k}#4e
z0u;aN-G^~${}QCVdmYC1bdRU}i;l|9$o#ZX^bCvgA2%haKkh>EEV5#u5Gn4c>VEyq
z#okG69&H>ZLnY4J339;;^HXpq<t$B6n~tK(xq!5Zt2s_S?Ha8y#pA*S;X6ww#6s;$
z*ux=W=G}C#CI|chc_>{f7ph|H_R-~7r)%ho@#huQ220Ii690m>POt>Fi@g<&sKUAl
z<h5&L1FNkpM2?mszM>ml2EGrpXfDWD@*EuXa=4V<l4jaViBb_<+!v${@y#5jA1J)}
z<xrpRMMU@bBc_NIrDpm8C=coD)4Ip7VdjKX_=1=87^ecKxKoOkGfm;w`J}g!PCspT
za0=r`7V^loL!Qoho3qoHQc=q%lV_n1p;f#xWx&|T`hE@8(Uju60EInVF=5Yy=Y8HF
zLC&#uFbi)`Unv*|?o&@LDZFzKtG5s_-l#z@h_T+<FFQCzyoxjr#x1Y-vp93jBcaLX
zU>OKq&%p_I?BXi+i>eyOc;mRZ$8^w%d;So=E82NK?mhBN;-haY-Xh;&d+cYlWycUk
zgDr-#87NkTr%JCLBU-ztmS*+&FPs~BzH2lDYS2-*#?pFao^wGekJI;v0Psj-p`T8-
zoh9I6!XI6g1t4Rrw16(g`1U@woKkY)f0aJ#TDTviXBKt%`>HlKU-^W@Z68Lrh66R@
zvya8(#_w$hef@o)qIraP&OMNM|J)-~#y_~fwzN$bONP!Z9CQg6lA;|~zKZPyUhCKa
z_al4oDu1A|1Kipm1M4v4H`=f%5asZo+!%RJ3+emW<%?~DlVa?;)u%l07hO+<6vj<a
zXDf#%CGn+4srDlr84u?jN4h04Q4`QFWe`s-rdLx~v+kw5i$P{OLa5rVSUtUKUuu5d
zMnV!3lM)OA%u|!tzQ|8_X%>&Ci`oD{jMq`6Bea9Eq=bO#1_v#PM0zwA{iXDb&|ZdH
zrrnoPulEroTPAR-J+1PCABknO!-9os)IOXlE66bE9ryaZv_E@L-g(p4b##jD%mF1*
zVshrOovY*QGrRoDG_M(<1#EASV2yy#SYbR8@2tcD-F>;Xnvq!g6uRNZ<L+!O+flyt
zBP}iEH5!0O7LstY++rkLPEDa}O1RK60m+hwlpNPrP;@yw-&jx-16<gamiG@f<d050
z*qi>{gKKbfcSmyY^9l8u>epac*j0h8crLc!dbOhFT`Qu<fSN#kzvK691!9Z45MJQ2
zQf=vJxg<Tr3*S!&i%0bmvXwsbFNJ7sY)(!-RBuYSyBIt<DcXn0gOg(+xlc^wjPpYx
z>bYP%o7F1L?*Q;U&CAXWL>&hi%rEy_r#SJ7IL&(zH?fb@l*^#6PC|>LxuJv~ed0Bm
z{mEQs6s?BuXt4YRE$X@b#9-nwVsLkiU?zzhTpKBx1`Vu^8SZD`7SOn^2y`+&(%8GT
zUX@nV=X~X@#h4Y8-Ejie?Ep_`9{E!7`^v(_QPuLOrwz}Ye1@8ghS5im&xH3n7vLL8
z$;g-rAIAE3a}G~WUbmm4S=hH4S)5`C&?`mhJr-GRpg9M3RvlT10QHUr`pOs{@01_8
z=JDC27ijH!c_#CD!<TDvatduFUvshPGF+z)-RnC7TDx!TE@1M^oXOi9nl8IA#Ubnm
z^+(}nhE`=z>WNEnKDfbmXfGXCY7o77prxL$u%o;>*qH~$lmMr4FU2_Oaz&jC7ihl@
z7T8%$5TxzL5B6_b0Ljf#75Z?-k*@~0cM_ZjOTia;?x+0P;rR<1TrthcKG8FLE&cG%
z>4}@?;3HXtrw}e77LjF*GaWG-Ztr7+mS=BrCcRWv2~B~`Dr8<H#+u)@Fz-BITm5YM
zAV7OFuQUAAV?b|W^<Np8GMwhLQA_k>1Mobj%+bdpyY)v5pLWZoQ$kWY7FU6%S>#%Z
z7g@zFsfqw9U7?mr&lB%~&QHC^yu-2B3bjEdst*WI-WhbK-WPVNUxl4M8`X!o$r-n!
z;wutNyJ<v4<R*TnpXMOGf^74=R^AA@Gu%I9!x<ECuXbeF|E$!*h%H;aE|kpjP5NtP
z0;fo&wk!vC3=Fmf#b1wqu&ZOf&9{jG=DOc@n;0=hosweBxo}q5$wQ^Pwn<qIn7G1y
zdMwClEAKI`hR`Q>&C~6gBXd;Zyt}i)B93ruyXV;hz+S32Ty&m<tvCv#gb4LYcWfU5
zQ{4}N<vOg1d=tJ?Ct|AqDisknpq{!E!eKF~h?#*8c9_$22Mgm&EVVzS{W=zYAOp%L
zYzA_~-_1~r3GDA~Lc_s}k>{i6GMN#|H@icdTc(_w;@_Q?Vl>-xe7NKXX6!>-gP*b{
zMEx`sl6{hqK6(ChfO8g~OuBtmUmfb|55UR2A)GNYuw;zxU)vRGD7f=7_UOUJHIj#t
zK{q=6wE_##LRaiTIrK$Rn9c>5qUP3DYZL)+W%3NsqzG-!7-0!)uYy6#VanmiAscp}
zrT1FH4xhi$lE>gaK_=15Ox%5jSg*{+MM(i~&BwI?70;TPyeiVes&bB>>F*08#uc#x
z5+hC?U52-C;>(^ouakI><UgG5?w0eqkQ}JoEs!MX{LRAip<nbHgS}{NcMeda1WX2U
zhLEg_eMAAu29{3B%eR~hVR)%btV8tm*G)1nt0;4CJE9W!d&8(|HE(B9yc~i$FQ_b_
zNnx+xXtS3lHvGI8gU8}lXrh9`wa3-GJYTuE$g4$VojMWayOlXt!_pt9uk2O=-|F$S
zK<BXdPhkVJu>OKn2K-==ezIf0K%WT7%qbMn^9k!fSJB4o_Y#vsq(xj&lMvt;{viTP
z^h|Bwxcp{6uDd>mtby`tsYyR0z4CVIIBqAZtN#w(PPo1}w)V2rOnHSxJE#VOM2gej
z0w)6w^@b>N{y3aO4`8r_uN|M!D4~rLpE&9FQC{~Tb#IJho^skc-|cFVd-TKfm35W!
zEgNBl2Wn$9o_>w89712;xnVKVd8`UI^bvYgK>@BGSCRR%ZkFq!`oskf^Rst?)Q{S^
z;-`!66gzzis|irA33AP*c@9#m0o5x=4IJDQC+_fVDna^E83KgwG`G<F6=o+q2FJCS
zmTzB=W-uPDYMft1&ocDN^KW8rGre~T?+xr<8_$dvzer%epf#j9;@pB_9oQ|kxICC*
z;QPD6O;6!AS11G!*DKaYqwWz=NH8oBOwc7<nomNN0WDiax{uwqtDdGZB|B+t33T6_
zn5_E?YH-Z#9t0}fb%V&x_$H&g2fz2W_77N5(43r<N&F_zA{odhn%xVh@71HZN0WqJ
zZ?hgR?+82W2s_an`T#*?0DE=m4#2uPkyVThJhM+~ut;|~kiC_knGr7j`jh4=X*j+j
zNPdU78};nQl9q!+rpiNIN46z*UvUXHk#PN^)R|IQ9TLgic%;9EBhLL>j(dwS|2dO3
z0>wO<&;VoQddy-tLXNrwxd4OU%D@+p-F!C+{=w892>~Id^ben(1I<=2upua|>9ut9
zgCsF?R-lhm=e9Ttj!Ay1IP&vNPbV9GWh3#S@bh*Nrud4)gsY^`Z;!Iee)ixWJ3ej1
z7#qG44(uw^d0wv-h@`F?<o#1XRlaxn1;ix-kyUxm!I9g%7`8lFolkBe-+5JI_!XsT
zhgmw)$r54l>S_EkJN(K{-*|-IuJKnXhwyKzu+!W`9NH!Q?DWmmwC79x^m`XZzWk0A
zI_GHU$5o$u<u6FIK~q|Wk+2~WQ}OTN#Ociu*<Jr(0mFEJ!KY5Wx4ci%^kcNjxCWbE
zD~rZSpOvzd5k=LH$BKYfZjLKFd7G{!O?vQq{S_>9G88MBuCjQ^9PWsZ6ALBdXT?aa
zB$Qq^Djb;43_lxlOLI1c8P+p%S#)U^sBVrIx%Rw7DG$!<?mIYJ^06(ocl1@Zj#vW;
zaCpCjq&%HX&*zm7d!(}D`+jMOeb9SwcGY`uj-<1$EM|1pG0D9pwqHEX{*r(+v*M`R
zs&HNZBb&?Tx^U+bEO=wDqWutPYj{^o364;9DibLBgBq;d7%Q&yEgQM51Zz@SGC<i>
zAdx0|GG6Dn{(?pd!Z-0Ts%+WCZ+-oCmh(4_zZB+IyeACAK6>f2{BwD*4akNai3hAp
z0W+b>Y72wQ+!NtqPc4=er=Q<t7+)v$x~fFZXa_J6Y~sGYVg^izC+|^u{nF|H4a?>t
z(|d=sIN#6fgY6AB08}mAxnE3q$)#;d**H%T@@0{SwLl?rAf}#=LnS7Vx2`8|_zfHV
zW29CBTwl}yyde^G?{uT+{N<7CsDQEzExFU8sDC0loj!6DEcd~XFOA`renEmN^Mz>$
zK^~Stm=>-6^a?j@dKNmQ@U)?oozM}gVDM{T{?Eb(tcSz6=+=$gE$7MGxr$<9rodBB
z@K{(7o(p44yaj}&NMhpi6QiV}JJFgO`Yu9EBE<SM1NHP5XIs8pY^WCT?%HGiw9B8~
zAd6pe`0b=9PDO>nyW;C9iMvriyCWd`j$n#N(y<Komb%j~HESht?kn_kH2oPusemBr
z!dY{1dQ-*`d{=f95=O5j3Ls5Oe}5IaU)5=V^~Xy@P5>&d4Q-O~vY=%`n<OqL@f{DO
zo_^%ODx90<dS{C7rYmo*wn=KP60!L9(T&HK0FdtfaM%sq{i9T9P5}(1d(H%%Q@d9R
zGjYqaPNE<oAJUT60!4@{<AG>(Bc6&iwPjV?GmEgLAgU{s?R}mrUYoHeAn^dc?H5Oh
zi<zh%O_KqVt<bs+=_g1RcONhTK_YcTUnrTOHwD|GOc^J(&uRt0SW3w0bl_k>0+ql2
z{MkPHfy7|`-w|kry3ajK$LdHwe)O8HOk;I4n?pkcqiF2LntP`;b<pc)(ATZS^}_oi
zLQ*U5GfN-SCS2lrfGn#?!oOVWzm{z#*SO*Ex~?3;k3w#&J6Xpp=2?3@`yT)6c%)84
z&Rg%42hXdL7UA2nbbf3PN>pIHjC-6*#=xRq%SEh8IfObV$Q@nzlLQfD#>JN6q@wIu
zD`CsB(LY4z4bk&@S0bO3L`w;mb~1JpUz;lX3o6Zf%4EHXfg)L!tXUz9Pf}3vT%5-c
z)7KZ-9LVzLV^>df0H32x&MbiX+h*S{z_9i>XxllDkDbW|E=u9Ac?oS#&|gjzs{wj;
z)DW+kTev5pN$!2B5+<b<t2nXItlqr~nM{6uiE9>yeqxYz@OV@c2Qk=0_p+tArJ?_s
z=r#z%x-5p}Cs+4KK%uzS2(ZX|P<&SsYYEX@m=4T^10aRpnh!S3BE$M)Zs}Y51FaR4
zuF_xEc3?BlzH&L+PhJOmIV<k15A|8ChQJM%7dM#egjVV*x4tWp^b>B!q4`s(&KIG2
z*Tj%mT`C;<%mhvTjjwp0R|d^Rp{>fqNM^%m;yiw%%&C^Fy|)pipPb1eK<6O6j25*h
z4OB<9T+|~Juvl|-yV2hy_=(Qjazq7O)Gc5w0X8EnQExs0*op?r)jx;BL)})WSh|Ew
zU5~*x_u+#t8g3>-^c*7ZX&^10_t_3CS;dWDDSVsMCY2EW4ZE26)h4sNaLHM$XZg41
zM!8Rfla;QUxW1Iejj}Uq&H}4e0NSxxBy1Qj6V=QW)JRmgxCALwy!#Yc4+wA265(i)
zInXqb&!hqGYhYf~KR<%u8bi{wmM`i}*m4k&mjKC|f(r!ce>_N#jW!2!qfzJn8I9_?
zN)01Bosa)I1b%d=`ADq!cWB}V({x!`^;po*FNTU47RGKT21*s@>1N{;T4ukJ{mniN
z`+k|aWMP)%SbY22Nd$N2Xnt@6IAiIy5&+v@&C;m^U$%9RzBK+Anu{ixLh2sBk9Hna
z49%!1M4RSv&Dy&MNCRV^9|<w##Ee9yA#C08T`x~vRM#7^WgM~98_@z+fGwc&01BG;
zr+OQ^@@u;jO`c`bFTPVPV$H6~=O383bdBdl#*3HquOZgC$&7C?3Z|(u2DZ|nz25At
zzmrVDK8mq!4w-k#u22R7ikY02hpp&E*i`-}enzWPg<+EO+HiR5GEn$IvL@qOQ2|7l
zi8J|S-RVBO)8lS1^9_cHL=FjCiO6UO*n+hWss#@7J`P&YxD}p4UUIbz8<<XB2h?vI
z7OmYAw0}wq*eH-!Op22lBHUVn)Iolxx7p~I8jMq0X5nF1g6pW5J?x)9RzOBaG8)3p
zWEs}ao263&(5`^q`*M;pOz1-@sKFP|WPf~_^QeV;P9t!WTRca$k~SMnB`$%Zp=B(n
zC5ubhqx;7Z@5h022W-H{>i}FDOh*CtO?OkoIL48H1k9_?if+Z_Tdvj_>Li*%L%D<W
zef2Akhr>OTMwj=iIFpXfR0rG#pvdnh?q$Z)?f$E?$kHi2ZLVbzed*!>HIalP^zE0~
zz{Q^9(M6sro4_Yk6oW^v!FA;-Pp5yBt3;oW@LQrahn)3?oGlZEuQCdwThG7;3&ADv
zx6c_@JU>pqpiB)YZw0)qhWcXk*wVPF?75vFA>Y%*5Z(tzLPxI8zhZunfazjZ0To7a
z+AOFfd6A*ckt$>JyTt3deYE0x#zh{JoFosFqobPhUiGyf#oSj(-d3A-N0Psb$EaA{
zgx*!9CE(cw%S}zYd0A~vH`dV07Q$XtL}6Pl#MnY(MDi=K4z0?{;#U?GO`P|C=Lf%c
z{&;nNt624EgK>5(3tPvcbp7W<7b;6h5(Ec~;T;Qq{uoWP{^GI+|MglJsI$Q0r!XzK
z>U?NzE<hrVbuY~bq(@s;WfkOuM<2)R3_Y<rjv}ieP~kg($Bga0W$+0w_iBW@nwr`f
zl_u7b;{{ip<_>t~mfY?{&Sfd{vlrpdo6U4v1l+s1XSeoUOiDvPz(l-P=sbUErCj^j
zPXW$m(SSSbAms16y(vDJlaoU@go^^wD8w3*s6Yj%`>PLJXd3w&S#MVC`NG_?_#6DO
z^cY^et3RvpkWFbREG`<j_%^PpxmOb(1SFk;oa4^;alE{s`M`qB%hR`=?p11BzwYFK
zF?BABGim;oN`%($g)P%p-zXRHXr>yV@xeWdn;A(gk0H3Klh}^(jbg}e?Z9P|1Y<1)
zMf^MwhQA18GNOHq;d-n3j~^-JaG@N_0*tSkw%@NS)zA-h>%Dc}^e6gp(Vy9?Oh6w(
zzVwzu!SZ!61NZvK4BMW`*Nlkg^);$-VSRDRy$;XWKlk^B<F(LvNkL|}t{B_bA8kC4
zF&_KO_v}b~IY^&c`blv}_Sx0W7_9(=X8OqcmGNY_q`4v<o}8FqoQIckPTa+#jSadg
z^zqQxMf9ZZA6;sh^WIS+8HnX!;eXtQ-Pz6q_7}Sd=xKWWn^wN32}{4YsGkwKm!ZU~
z5hG9jf>6JXIbL$&?lRohRdMuX5Zg4`T+iPecJ-{2-uv{&IQZ^D*>*8x<Dn6oV(%u-
zQ36OE<3t7`OirHYCX&REkOW|29uU??-Lt)jS0Y|eT2#s(^T58gD$6Si&rBkJ$HD<<
zmU}$rkoYaTE7WQo2pxu`xAd-Jmcsg5i2~`JO9o0@I60z~1B%PK^|HhTr|>WK!C3bD
zY)hdKxO(CXZ<{2t@s02OG-aQnp^Hakt9JSGFK-v#sH;>T<%+Wv<8=&WDT@|-RR2O`
zVD3i;_Gts&d9|o-pIa0r=NKYJ3IIx)8jW>#&f#LyA!SJ>+}z$)kGbKsA8#p|{cD2#
z@XN_(_FW!N>Z<%dvu_IAZO^>x-T`{-PrmDRuy*u21BG>NOS!Ifp1aYW8gt0cP790c
z4O9`s|NgTbw)f_7?Z?s5ZyBL`4}QN;ztJhl&+8IrdGCs4<!R`((Od6c$v@b5|3i5E
z2Z@Ts>wY3xX&m6uJNVUEG*MAkybB0n!QoKALU^Lkd4VQq67Z7;Fw(*U*ni@KqZ{Es
zym+7mklr|P7l`SE^;>FF<UOcUn8K>4IkfHTPj}*OMD_S93U%BX@LP&-(w=wqBBDGV
z-}`=1_N_%|gFn7X60=uP^h!1$Xi+K8Cm$<?{(w&Vz-;KrW{fJ(W0i<KNIaH4KD~~Q
zB~ZTrm0UnzLmbffqLtbYFykMIg=4pKG1v0m6Ua8#Jrn_Z_}Mk&@`_URr(I!(n!|Lw
zu$cN%*Z_NmwE<0=R%9AQ(?m_N#a@|rifluYC0;x)&}ev?`nmrT$$4LN)9l_b)}wVJ
zZx|c;K~3!-Kc-VI3a)`B&##C?j>8R_iIKe(*Yv>LEC(9cD>i!}*a!oS67syZGudC4
z>gZe-kR@g~t0;C4#SP~|1&L8`If+<E?U<)1Rg5BL@?7^^oj?fCyrz0JgtO(asCQkX
zFKpmb8}T%YcHjk`FRU3w^gTTh8<?gbAr9spm4;O(AN|EZ9O)kZ;I8fWHwVu=DWPHI
z0aG8uhrTaUr5GZCD$XAx#->j>o`RuKT);RFW%prhcn47N1*4?TXP4da*A*{cGF{ri
z6_C-?e;C9a(-ko)T#+DVY=Qp($T$?8iN}hp>7ENIT9j22zDo;>r-h}B?g(uv0$eMs
zc0Y8^rxPeB-E!%5rLR9zW5X;cIpI_;roX8&!|O9d6)U{KT|6?=e{y~i{b%9V>-{&C
zS><flUd~>$vFXDnh$t5IFuUS%4I|o-+e*m6%MG)J^YnoYWx=EX6Agd-QXxzhUopN!
zWHC)lCc<!qXx%ZK)F|KaU`{Z(68_0$M=1W^8TOI5%athXkZpf>M*Dt^<&vLff+Q<_
z_o3E-Q}M~8RHpV+rb`XYm^X>yoe=T&^SifJ#5{ig3Bru7KVKZ(+Qv#L=#=%gIK&CZ
znI&!9I=WG8XE=uk!m+;JQSdo*Vkwr2HY-)Xn!8-o2YeYXnUYMzNGSIuD>K7zp|fr3
zKSGF0-$E=#y<Dor0bA7$UkxlQU(=bk&E=-{!_>e<hAQ{p_Ujv9csMhBuv*P%s?fIC
zWU*x3z<Az++G6g;;K5wQ&`D2pYKD4$ru_0n9|Fk)k(8nN@Y;>58k4{Nf|5~=fn{iI
zPi^M}GRC+G{O%{fj^eB5Drr%)SovWEp|OzkcFu-Xtd~Qv19@GXxWU=Z)-3xirbL7o
znnpRb<mjUlHG`YI$kgPF+g8-^F^iznxE}i8cb?l1Joda*<<BWBYo19Wf9bfxwBpbP
zRjgi*bzs#XlAsu2@-Z#EyvpO}AAh-dlDQPh@vfsTE)Pw@liV|jpKQ3=gNfzSY0fzR
zkSjt4v>l#ZAa<kEEd3xZX*g9?2(aHA-T$4i;7x2#qbv)!ctedGn;Ou2>)qvjCV%;F
zA$#~uyQ*fwF=w=Abf{ZhCHisg^FEjHfLUO|lEF2=$-O2aoMAv+jVR0OEY+|!3iIgz
zOe7qxW9|}LUyO1LJx>${w-#+L8RR)oA3|lMQO+Tpt&9|b^!iaRKx6NiivX6pXgQCg
zTc_T|^=*`EOk;;y+Gx}-H&33O{yqLp<)wV#Xn+sf;wuNwUR8I8S;>6|n(@_@gzZJ+
z!{vY=rJiXmN@~?<OE`1<<7hGGE%*T^DZ)f3;_ozwje!nC4`Kj;K+sNi{j>HI5ky89
z1<;?%8y=|%p$%<K+N@1|ukUxTm*I||4x||S>W3wK67=V)dT{r~v5ux;Tl<oZj`vUS
z<9GVPBllWUt-PBe>NR{RnpJe*<1J^}xJRSiUy#qZk+pgFEnlNBiiyVM^3s{&FtlBj
zapw0LF0C3*OT&R(myuYz*0s!+%4(huLOqe~x_b)o1GPq!%RPcrrIkQ2XIu6;@2s_4
zwTMmKCMx>)K-2mqUitdUIvd4{?L|SLSD@r+A+t40HF#J{*ovtmeDmc?Q(npR*q^+c
zMe5i-*2@B)N4Dx?Ndw<<FMrYgzUZr?<`?Y4mqy1ZDcKf@uRc!n?%1Iph4}hk&u_zX
zoy^_Vtw0->hP;u?lzM)SY2~mzUEvKk9RnBf=*L|wl?fTJcY`Hplw@QJX%om%5$QdK
zT*^GUwM{9wsMH|ack`>djjpFe%}?*pspO|8o6$7(Ul;v(UwT(I%~{W@jZz}uZ6Y7<
zK>OE!enj%Cm~I92=eYj`rE}rtpJ)lIre&eX9z661l<Gs!n+FZ$g7h;g!pV>Sf-1kZ
zJZpM`aULA+B0oHg!Iw&&Yir^>1gdtkteo(o&A=N@#&}8y{4eOBDpw0pJu_UdQKc;^
zvoorcsmb6v+IdH)%^@)&#bU}pT<IHeAufOO)OewQVkuxvx>Uc~n@uHN3Z9yeX>3eT
zd(F2Jq0BrJ)<~Ih!dLIkkUR^Qn-DKwwC!iVj)HnQS>CI=00h;GC4Z|~GRpk2*%*#s
zEoTTnf7NIC`S!0T@4pR9zu=+f+993%K8B-AILc-Tp{#RFppX+tpK|Sen(|-JFG>JS
z8?W*gG(+(nTQko&{~`5l6IHW!_xiIyK@F1=+WAmJW__uA@s8~C`8OjYA8GAfciUVI
zd%=5i^0u|h1?TujWb}G@nPNa{#X9|rn7q`Qv_8rEiKQ99ldY@Pr@WPRXDXX_-esEz
zuW<hwfEb+&(%!WSe?R*yIt-K3Z1##*b3SPk!$>=KdTOgGn=q&Rc<WtIo^)64#gnN8
z1$B+L6T>@8M+PI_6h-31mLUy<Nx=i2O_!l@XJzx8c+-K;A>*c<x=Ctr)Xv&Iolq+i
z-iGge-o$U^7v~D3nU_v+Rig-XpG+I{b#Gt!SxUY0!HU`FV2*)p-SC#li=D1e<`KKC
zK&fk&45vWixi%^%U#!`Rl{)5ZNd87L1cmeV2%~1fVsk^YwQ(O&fd=0FSjjuP@AdC>
zm)u;9UVU)hAi}e*)H8CO{`5MVTb}@Ts9o;PmG6?CO-m<po%n+Y5K!eNWi!qB@?@4W
zb1o1!OF6hl!F#7hixv!F*=jC7e9P)>i&q&<85g1m#BqLP)I@yBfvyGLa1Vb5guncd
zvlB_h%N;y8$MQ4&xJc>`^PR5sx%{C+>qvR5xZBRO*~`$vETh{%wfiyUjns6{o85gs
z1r>PrusqNGm7mYVccSuw_!yH`SK1;+T#?v!d0&Gs^peT|EXIYP@*dl`hIqkt<DV>7
z^VLnLoqg;;5fPkp6%xvuy_4!K!v4!S3t9x!kJp353*!?;yk)!5@zt^+71sK4W{mG9
zNu5kF*4!;M+L?tyw4wD6xdSP4KGqZ?qfPL+7rwpml-scrvkH+mgGhYSQfg;A*Yq`r
zs8mMr@Y<rJw+sn1m;b8)?E9i=Q6YIGe8&5|e#mqf`@_K7Sh#A%S(%C4Ek2pns^&}G
zY5GwF*>jhFoirQAT%%Qk!gy~FPGMgiD}8IaW?RpG>~7KgJU}@Y9Q$gQl$olsPY^$u
z@xq}aoC|mxmGpKF!!~a~bHW#bx)sP3I*gy?+CL-2hx-<ab@{G8sZ)NQ<3g!9$4s~L
zsMON0&c8Bo;X8!#N?#Z_$Ju?|uZwQVR~JUc?i51{p1!D$d_l2U$D?%)P1a4f$2(@i
znr6J4X={NzPbgMqGQp>mze%$p$XB{WObc|(&r8H>o|QqKXEC6=YWo5nTd|nMbo#;s
z8?Wzg)n+aK%G<)L8DRPkbCwXu3zt-H)J(?bxhDr6K89Tk9lOW>D9;?5vqGK@H<~jg
z&;I#*W{te-zbe1N-YfJIdN!UL7CUhqI4^>^oY9thhE44ZZT;A{UR8<iy3*~413r0D
zQQIIpq{%qZdS(V%H2iUX)9sjIwfiYF)5g28c&%w>P5XTVWJ`)#{xpsdb&8HBZRl+2
z#>L15z0PkTuN%~Y_HM#%)`NWL79TBGK8<)DGVFQRXZ6W%GUhL+dG2UBq9Q+{Vp?;k
z)5Bk^1lBcSb8@s6k?&of@B0_@?|XO3aQVHvMM1sY>o5_AVe`YabUiPA4)g_3H1ytk
zJl(5VWe{*Q$YV!_fkSW8&Q`=f)a%K!y35BcQlT>uwRtvJARPJ^Gz^St@Z%`SZhqsX
zY530JkIP@sTm-=S<`cfZpt1|9!G@|l9vrR~3bze2B81c!d7p?S_5X4*{Qz1h3N`Dr
zLjwtpmk%mM{HGd=)qT#d9d23{wpr7wc|UgssLz;9fv?m%H=pd{eN)U=<w}ZA0Ke(b
zyJ^m9TJo{d#WmKab_4uT<9O$MlF9ZCHzVc|cGIxx$6}89ZlZMG75MSy0~OEf_*Zpd
zZeZWdNyAV1gA5wJo6a`Phu(5KtIIO{e?i}dLpjLi4OGH$_)Rr$U`KiXW6<$_+Qm@&
zQ`v?asTJd#A9{VNwAXfpQ=j<;1q*b8r5>5%JJf$Y4=3-;sE7^UJJn}(G8vv{>qClo
zy5&K=o$Kqid5lm5PMr^Y5)L<~LCL4HMwN2gDf{jJ5pVtp=l}BVi@WuER4sjvTI`02
zYhzJJ=M8H@sJT&~$fK#lsj$s(x~3Tw@wKV6U90x2lNqa%F`M>76RWK!BWcFd(|}k`
z#_x_A`4=V2&w@mzWx}M-Z+@Nw{yO8^x&H_@dg$$OdtDaH;=U~Ka^{n_xa8CBU6^Dt
zCLm(?>z*35B5~#~XyslHd${3n=<Z*T<>%J52JqDG4#U~fH`DlI0K6AP+|RqjwFB!*
zdJ^G|br5a01OD%S{P_!N^Sb16X;%`+%v2G`aX)7*to{@WYez=2(HW{?hurr0rz#R{
z{yatB@Lg*ISlT&bU6i}lf*#u4lzXFLSY0o-^W(F<gfE^DIE7-xgTI2B5R-rMA4~ZH
zmzju;LtoNhjajkXg&(h*|17J_3+cQS!!J(ZhpF*^aQ4J8%{I8$&g1aNs~HG-{Vc<*
zeP0KlK}hqM+hcvoibZnMJd0tcy}^%(XR>c3N4oGBKJN}zl`(K9z#%}fyn!c?xYssp
z*X4VU<B9Q4Kl;iNzaN&Gp6geN!}i3RngHr;Vc5Rd9MFs}#kzR^7XlG+GUoGvFmC7c
zq-ps>#oN3KVS_7QB;%OdhNF8ltGc~%UlvCH1jw&7&;8n22~oW9sU=_q#Pr1OZehLB
zqPl)L^PIN>0~{j>=&$(3YpAw&_#El*<S(cRuMx2`x5|UgOXyVDJ&G#b-=S{hA@84(
zy(4?u2<m+rs(U*BD(9JX6YnOSe*zv_jM(Cz?OPJ>gZ0M}jUFbNXJpU)auAORg?Km3
zD0NCk8{xx0X1(8?!9auo49Z-p>u`AX%KN6bare>Ot}*t<Nmr8hVEtzJZoIjDNsL1z
zMiu!HejN_jHQ>L$DQnBNWr+`}&C6Rz%tsyw{{_W5oQDclPRX<G;T>rPbKbj8D?8>$
z%yVI{4j=2_*C&^4J5~c}uQDKDcGu-Xahz5$6U~eqzJHe=j3yg1z3vhCNj3s(&v?Kq
z+Kpj`#}J__y*EVcIS-2FVkOSPPM6LEvwDFXt(gvgH75eDAdK^HP5N-Np~I=^m+0=>
zl+l?C$R-Sr;NIqb6U1lfpY&@|A~>x}+aA#+k?B>o+H_s5QUiahJS{*<r77pYDQf)=
z&@N2xxo<eraOd3X-;N6rO@~J`_L-ffDA(l>?4eGEcKq!mhNh!}RxlLMh?RZd@`Ij#
zaMCJ!Ip?d(;^5-!rYjLAHZ!FX2vh)5<t9b1qc0v_>c}c$a`-CO_Tj)coO!K1tNX<d
z{4uc4LuoR09ZL+p?|udzF1bJXI{eXWXAhv5K?jaf{YM&jA$$t0zHKi*5L-C;tS$vh
z1~)1=NNqh~>Z#vl-Ew-}Jh4u{m<Z5vaq{#jp8sj8$=Eg*w4HxKw3&TDi2VE)6h3BR
zBOM#oam3y93-yooUJmGgv`KgdLcI$k68Ru8uB3#~qwC|L@ebC`it&RD=}Qixb86j8
zf2C;#AbnKab--cI{F`6B^U#YJXm?DAZk`Ms!`tl6t!E8zH_=?_&?H81sOKdCI`IE3
zoP?*lJF1}(T=hqHoFUi(@BL_;Z}AFC?LaG%UCo8#-ZM5*i1C)TmwqPN`y1>tdsyd8
zU8{Garf_xV+Q}&B&E(4J+z9i|5s3~#Psa&B3DA*17DMa*QOBMCDhWp;k0t0i2iK<*
zWL6zbF6kuz4$noMW6|Xlvfa%s{ZNifG4IXBY>(rUnWuYZjhg&`C8Zt_5uJtoZQsL1
zc9!kg(a{jKwciLR1Rae>`v?F3<oUW^4v1(bZk%O%LC$Xx&C)2Qw+ho9bTND)O^McG
z7h?!{XD3)TH#}`j8ru2>@1S~bns|GYDo1S)=En=oD`r9H3><wYNN{ZfOwvMUK+rJI
z|09mqkhL#X(-)4NaeZ7%NvHu^!7Kt$rPW>(C{9(G9($xExt{fYP?s{a`6X&+Caet~
zfhJ{gXKJ!a*PTp}AP6W9+^@;lUXQYC1wjGg09=6+{Xe#A_IET#d2GzC+ZhCCH6_0A
zJCn`raa9#)67^CAAzqR>b(2;1$DU1j_;B^1zcM*6#=9x*##Jc1w+=`)`rr{H7SIJv
zv`x3jeu>au&_0?ThbHNDI%@t$A9#;9(Rzu;-fQ3R9ixkNs=g_zr%@8qL>5i!<jy!q
z=FjwazbGoZQcVF&{J1}ZH)Tk6Ws1T>Z0=!kKxD9hfc<FM4gM6xuD+q+ov=(|+!e6=
z_eYW@&!PjGFeSs#$?lYACnth8h^tnJ<p0)H(&r$3?VPZeoYb-a61^R`I-A<aNTQ0q
z?3L?A_qa2h?AF$RwOB-=@!)72`b-!2i<aUv&Mg!VrjG(x4~j|vZE%8;UQBV(u#pF$
z-crbkob|-ik0<@2Jen`*5MgFw2~VGgRAuiR?NG(Qlp&YAXy(F&OE0-kzTcq&%w<mR
zmgdj^XJ{cNKxh~q9tmtrKnB2?>A)~Z7jM1K1*z*2u?<e7KCaVrI3d5qBMOQRQp<5-
z^sC86v?=PcmdTbTz-PR;-v!fI9)tWFO`q)*XS@f&(^{~?6S!~HB@PHW15Zc!Z_AT3
z(J&SS2@fi4cEj8F-8N2ncZQCO%Eof$+u5rPAye#Mbq-~2SKv7CkI9nn4|K^clqp%q
z133=KA$}Xc@w)5c91X#YX`$nA2!3%{-(c04ZuGxJ123G4A`X<Hi7qJW_@mJEbvBIb
zUGseElgw<=AJ>_fEej~8%|qZQ@}g*RPNFlE@y<=ub92_W6>iASwl#f<)&$rAX7K>A
zLBPYBpzHpE>vR{{{*N-AUGd)=MC5da%Ffr&WleZx!9#h}&f9`&@et(J8Q;2)hbMsh
z;G9J>9k0qcGb4ep5}7+bYJ!eyk()<gcn}E3NKXf**A%k`fqgX5_ITZJ98(79A5s7R
zJ|ix(7_YfnMYmRL)%LT^f68gsV9VYze}?W}%D)483^)*Rh8nloC=pGQQ#%K1M-(Ut
zKeO|uP7)o7lh3WAJGzI-z|%um5Sus=m==m|5Jb{K!v3R87-{dtr#4-80-Iguk_s~P
zJ9+s<*D!A;3IibacXzyZ0n(i}bt%7^HfNf~<s0kpt|#Q??ZH+w8xA}_2;%E!^}ZnL
zNCzkgH%yE97zZ*o!@zI|dOSL<DA%~h6sH!E@ZsTt{z_DR8mxE@Gw!V^)9LL+vT8oG
z+E^ny$60k80`ooof=ZN%x#WJ{1q7LH?wkQZWP#9c0lsU}zfTk%!$CoKbe}S!ZwJiP
zh30`EQY?Ie2j0=0x1-kQhq<oterSZw%~ecOvz6L_VZfBBlS6#VN{ncn6>vuTo*c%R
zDjG544E};X+4_MqAfRXn2*d(Dr3wD5i5?~L1L@lg3lP!dG>NU`;VT6Dh*Gn!&8DSr
zom_~hG-dQxUp0<22-tGY*)<16>UI;u)-acJ{@U*0xZ__?5nQX^(*m+{WX)?`&w`Gm
zLu6=yKy;uC9GaqqR>TRD7wqZ(+$6anl4O8d@sC=}NR6H;RdJM>vJ9zfd0C^D6mH>R
zWN_?_RJ6I5MYpxW;8GmXe8}Y)G3B*(3wbW)cm}c*Gy<9n>qOH72M!*TK?g+JP!xRI
zS|SLfkMV<pLE7}fwjN{1$`_n#%6$hYElJ;2kYUH>FY?`+`JTV*mEkTGNJoz$pF`iH
zEYb$dTJr|HrO2%Pb5Wdg2Do!PDD79rVJNU}JUSABh{hp`blvW?6R3lrs2#enDXJaY
zqZhLK-ZzU$nuxV}5P)Nt^m=>)GzR!70G!yHaQ1=slpJ9D3bHabV9mSv?s@hzCqHKk
zfQ<uqy|s!YJUW_bPWWUm8iD{g&xZpO5rfQfAL0Y&xMn|xV+HGuQ@uXVG!_uNw6BYO
zC<a`^rWb92Ge|I5wA1H6cgVMY2r#Ngq+cyEE|l=I9dBs4faw4O79&~<@qfCU-f_rD
zMa*l07%sSzm=PJLK1M;`zTp-Wn@#nZJ48<;qUp68v+^U>nwp;n&PalYGHqUmnlr9l
zGhP&%<E$qJjSo8ig4&M`xibkF|F^p}MItp3kvK50d>(vJqL1cMa2JUa4P)#jj+QhI
z%6lOsJ-v(HkV3q&cS>?FQ^%yY?rV)K=!_i6h3!ZqF+i`Sn`S(~&f63sqiFn}lw|9G
z3<w}XG)eQk@yE1~DZsvh=yBizcL$@YnuOp!7@b(d*}kgT;wh$xVVTb9ypZtElk$aP
z_{^qS`xP`D7&OA}bR22qwzKA(Wraj%yH12%zv*<;c4*`LzeQ^;rk@=CJODlg0b>Ev
zE6o#;x|wcUKoKzw^n3zKRE}txp;?=Vx}!rmXP}cq-Vt4d`ou;Y7<0;lfA5Ty*yOKc
z3VntI<Ier%&cN(H1tUsJ|04}h)Ivx7`o|9v4m6@rLa*6PVw8{Oyn>)ml)o1L+MSsu
zdsidXi<oCfA6LACx{&jU7&;I}$Ao=Dc}RThFX*TVHpMt})agU=6xsdBB<}S;(m3$H
zBfa=P-rz7?Y^WZveFg`2J;O_RWm2@+4xL-ijO#E^&}&Zx;(Z(JFE~zYzO5*eLrws1
zFBHW8Yxi)*9UM8uI8(29ObM<&S^n&~`ajy5AQB50R`h?%hBAD$2Q;-L-6Im@^)%}I
z7)%pH<J_imqxy<CM;vNSHONT2&5TxgH;vgGWdZH)K>Wweb9e_ZC`XjRe|G)jA^#r$
z_W)?$e{02~VRUGJkN>?-3oIcc8WVmUL|1Rdv{-TFUC%&w0^^L2IHtrM*ll)Kh$kPf
z?H-2h9<FuFD1+M~nkWB1zP>$>>Gh9)?&LP=h(nBqbS9-j7k9-hb<+8k(aCK{_Ayi<
zX6~0$GE-A2y11Oa-59onO_8jTLc&KzNvUQio6OelS?7HJ`2GI)Wx4M2e%{af`g*^g
z=kt6<+-;@I;J5DR*67Xk;x7j(_y0@TJsa4DjvRXcVLKuBqY!aZK&Mpq-FiFYc%_3u
zeH2jN-HKJYZD3)`<xDFv`>`UJ1Z+;o;x~9T3z>b-6l|sQZlrI6QT0J)qRHV6rvK9R
z=>V`2>^_#$#{NcTPY77P=_&}M`$X|}442L4#U3PE&5xAB*Dm)cZun4wZYgGo1Wm3W
zRKtp@5{_tGarZQ|Ss2R~2_B}v><*g$o&O0$nWlkQlE*2)wq=YcgjXa-_u%Bx+6O8u
zMsP`N0%Rr9FNLYEr}gY!8>8<Zkcnk)Bmx<qsw-)fjU&B*ns<B_gzA%QYkwfv-TCP!
z{wER?O=prO&yDg|e)ct_4L}S(f874jW!Tm_lHZ`pmqyU5cinZkWEorWpVEGqQtu~q
zgq5r$f{5&AgZv>npM<6h(Y2u3>joG9k8M=Cx7$^OvYecczLI4d^?#(Pl-K@c{;)i}
z4f2JSx3;L=Req_mTppMCP(o@3&4qjX;z)@wBHef3u7Jr83gHND25#a^{>zx0o&(LZ
z(!l2*+9-Wr0vCP$-@i8P5sG?ZVTjkjloIGdbN!QSV9sxxpbbE`5-+ZJ9LEfn?WzPy
zl?ayznS1R|*2gXUU&M_*?he^C@KXrxh)i{5s)qdgOoVcA1GiFLJAekk4K#AJK5TBV
z0F2|<n_}3TFO(35*=?Y4L|Im@gzoXl54}#-+6dR#`#DyEtEpJ29Q*p93vHPxMn7r$
zLQ%meq>h>*0);>*D+rg1n}e6jK*tHDpj;hf^M2px;K5FlZ=<dJu7Rb4HW2qEpVTC?
zx|8~v3C;^;juGg(G&yaWo0a_Je$Y07A+|&)Rt8{!w&(2qWH1a0WX+XL%E!Op9nB5W
z=v+&tK!~zYqWAGz80yE4e>fA}pmI%#)26`Yf7FE)MQxdy3DscF8Wz#Yp8QE$SuxIp
z>W<cTQ_d%rOC6R-%OL@)T5tP$_>{QmW6@{WzgaH20>}A*0Q!GNbYFRNZ!>KlR(h1>
z5RF18XJ?7~^p>Ilp!`mrH6UB{Ibcx;4TQ!&65sQuSN%1B)<8L#u7OxnYnZNF1~uN%
zV1h2I`-sJ{*j+dBNOQ*W)|ix-KICRPrp#AVoE8wZ&^~BI?Q6v{k<!Cxm@O47I*=m=
zSK8R7D<J+g6(6Vl=YRzMeaSI|S6RvF$gvR^8s7h~D&_dS4Szys18_K9b%Vft&t#hW
z8k;?w>-fH#3>2)}8Xu+vxEaTmxdlz5p$*dtA=)%|bQQA$5Tv>(vC=`<K!Y+8pm`9u
zkt$^&3Mhq#F!bGz6P6MpYD(sa+*G+pw^h&f!XawAUNtAS&bs>O8Dv;@u$WjMgpEuw
z1osi~Wgnl?S~fF;&S7TDDZ2}?Gn4=Fi~!&SmFaE#7K>8zfuY99Of_C)b+<kmrZD*w
z&_t^A+3aMJ=X~rQdYAtlb+9><nUt|w$dPR+ai9)Pr>=|!$pKXG%B9RoIc=X>3MlXe
zoTqQy5$SFSeIOZc<46VNt4=T^O{XGZX!Tog&^-jq44@E+z9;#aYkBn6yjA?>d!Rz`
zVjNv@U}kX4p+ui6`+@NNHCig>O92}yte@nuJJI$<JxrJ)=F4`YX$lC0hjE$$0;vT<
z95hwk7&_Qzzw4)w$ZZ8&2W*DVV)oS3sxs~Rg2)vOz6m=^B4%C}SnBjx`bNVjTO!Cr
zWbjU<pA(?@q<fBitQWUKpjGtGi(xEvGfsO0Lknnx&)QhsetQ)@B;%6-fASB073X`^
zgH`Bj$GBTLl?eNLv=FJ~-K~2C)oKE~jV-tQjpK$lpa+&Mm$>`GTTD=;B4#z-2|<e%
zhzepD6V(w4y)e}Dv}n0K_O-V)2apF39|GbLaA1LjU%;wlsc9sROoP{y%+Mgk=iu~r
zkCZf8ba6vN(4c@M>*k67kxtb8QuM!y{l_HTf<C6Bl(K-!c2G4AK!e^aF$_FNLK5>S
zA{bh`?=QYz+U#f$ndXcBZ(2#TmG^X)V$e)qbj>my8#5osA8Y(auX1wAG&e-L2AYOI
z$bDZk=$<+<{}>E4RO+h)K^wyL>|h{mP#1_n`wTvHEZF8Ry^mYQW%L2ccf#{>t|J-}
zSZ1@TXz)5C?r#TioUyEbgaT?|00<RO`Wnh0tAj8_bBE))(3w6#5K}qREhg5*Qy~fl
zeL=nukOmTuS|6k#_LOF4b&po6UL`D#ajVuw;}+;O)sx(4*J1#%&}B8O?4JTZK<-0;
zQX8RxMkt`ilXqmz!;;Bbi~T?(N)O{c6J-*m3P2lB1<h57P$qKNJy<glh}ayle7&Yd
zq|r)baIL1Lb+?!mqV&Gt8cQb6w(MWV-F`=k{~vk7@y>(8djN6X?Pdva2F?K1CGTho
zWfF=^Wa%xk`x<oi;Enc(!>_6Y&S-}3?zS(~LMz(AbQnNfaAJ&j1PJgS))D$Z7(mz>
zD18JP2?DsfoBmPoxNYz&j9vz+A+n8xVX#;|l@-%geFVYUg8{?0RQjfFNse5LT-6uF
z#Wq7&!rv4rZDu5eyubhx{DJ8G*A5l_XC_b9<Nuig3ZaeA_dzHqpwdAOp)6aY=`2nU
zx_nYm11&f<=rh21cKN^C9)_puD^RVtdS9bq+p~gJM%qY<R4hpwlPLj#`zWWopS`59
z$_UGFM}q|lCX8nG?*V><Z74Wdc_wUy;i|_D^VR&HtjO7!0=_pN%(J~N)8Q_{A&uXz
zNk^O01}<$46Zqm%1eP2Un<8Y*|3J`=yk=JO&=v)@|6~0B7CbP>pRYY;)_v6#AR0)>
z8(?b@e;A#f_WaS<<&c_|Yot9DsTZ0m!+U%*Q%JVWLWzVTl8{7jJCl`nXTMwH|A#Vl
zga9(%DM>>gut}g@I6^cCqpQF4`7J4fEFb0-JE^T)E|b9tl?W7c)K~x<fh^)nIX@5w
zSTy$&G;o^>6N^Dyx~i|Y)*Bvul2&be#$3ti(}Rc4r`CI(Ty{9R`o3ffpe};RGB`@y
zhqJ9D$>1UFYtk4u!FX~ee~I`t(#mHY_NXgBS0HXMC1gOI#;gjX7!-dRJ9-4v!oTwN
z_1x!_iRq`LvLy-~rhvXL30Rd-%BHaA0ePWZ=syFafGxsC(D1f*9lWEn&U=UXC#87?
z1@7%3Dn)Pdstk(c3qcIRfw-v1nl>Xo)H!p4F11>Io4QpDI@mD80*f$wsazBi`BH=Y
zLqcJS(S5=H{2>1mXAld~aS??~@Q~2?(@{HuT$CtDdj&H(&{It1@LpIUN+bj`2?R3%
z?gvSPzz;?8g%mjnKAFiUgYJ&}dkO&FA{YV_0jx_>dpn6VEQ<}8kV={J&o1q-#@wnL
zo38<<b7Y0c_VS^nU_>cEqqY^;uwVhu0$^~6DUn|-0f__XW?l%G7sDjLB*5PP^3Mkm
z7nXvzNyM9{a}6hHewLy>DeF5VoA+=tqY-aaU#01BJ|fk|zm$oDUyrBLpWHp#oN5&*
zl}SkAkt(1$IqTIDvK3Gd_=ydJp<t<u57p{Jjm;lOT!HO=;kxKTj7nt2oD?ju*1N~*
zsWu~AE0C^?)fuSKsIskQj&=6jS><B8!7pl)vVB}2NRmvlgC(!60d)!=XdnCs<bkN9
z%s!(66y@Qc!_81*RKwZbsM7e^W=Edp%?64H9_RkbO<!B%{@0t=<j8$o+LHU2x~9@M
zW{@;JJ$9bBYjXM7uB@ZlRU8S*E_al1sOEv0jA}{U3&+0Heh+DqsPDN|l9mK0LBX;L
ztd{BY#pDogX}^8Pp}0o4e`n<J(N{Pmh&kfL*xmM5^-2!aynwjpu1`M!7YQRquPLn4
zsFA@mR?TRG{mHMC<(Fr1Yi}-7&zztZ3OYD~y}&HVZ!B3oTfcqGhP{KXb-@uxn+J|c
zT_GdoT*BZjhwi0-Bl8?Se$QUU1HS@@SU@cC!q)siq+hy*a6{1)gHo<x7ij%cFA#Vp
zzrnA<FD7~`Cq)p!sd?!ySd^g#gTDWF^M_x9@{|u8zK>k|{m2oV^yAFw84a72f50?1
z<6*`hzot-P&36;@{kO6NM88|ZP$9w{rLRdLA`1$4?`R#`DQs9on_T>5?cUP)-@|R$
zsl5(K>H+4gu`$V^4}J@c>CS<c;>XXg-w4~E#HXbtW|TT`hSXiT0R}3#Akvo7*zF08
zvS}$m0viP6ab-oUZSlbre4UZDY-V5UQ{^3@rn~WqYVptCBsm^vqK4P2zk0#6-Z#P9
z7Q0c4ykpZdoeNsZyb~qKP(;OYSt6C@P;}((OFHL0p@MvH&pLNkQk{J@9bkp;D1A5E
z44iOZG@+g|L2j`9^5o-~s!G<4Dx;5{BU3t^4f`ziMvYr~=g-?iFOCm|A1tpRFYP>N
zm<?(*sBES`QDHdfer$2Jj@<&fA~th<rH^s!C3}a<z@1r4(A`fxM=xF|*zxf<^4x!S
z-?=-O0&hDW7Pi%2cDE?bB<&1OJNEt`maGoD$N#;En?W90?Al(_D8=O_f5nM9f=H9n
zhb~`&n*UPRG1M0npb})D>1MfT3nJ>^kP2-`o4pAvbzqW=q+c`nA=!@cEotLl9<Tqp
z|CMXAU5sgpgL|!>fi*vMux0@5U~@~!Y*mr<QvS)+ktES1KB`BUhCg{<NORlKRg!`o
zaQj<LN+{MKyGY0&wxrU(_So1wi@giRdS(9i@9jZ}*Qs8fvj!^u{okvx`YSmt$b*Wj
z%BiWI&hHGCN<R2WIf6R8f<v*ZafkwNI_cb0>?7oQx`YzJz%|lGRRtpoI|Pn$^d#et
zkwP?l+l&NEzOH}b8i^?Tbmi;+xGgSEvuM3tI`9hx<;o9vk01E|rh<(=*EdYykQP&(
z{<byiIRTVeKx=bt#M$k+PdJVcEvS)ceL5`P$5<W_A@&mTLMe$k$h&!@fc1?hl;A}{
z=LcT|epKnxQw>zuc5XjobF<6U!WW|lMc*5#lz9Tnl0#t-c<8Jh7TJ&K^1uUfLwl3<
zCx5D9V)cc;`Q{pe@5U@PUnrKP56~M*`|!W*dDK`N;LR`K4XZrr$9H_`RI4=HXmr}M
zW_!DzD0BW(d4-_mJn3O{6;$>EQSXH(UO5q0JT(Xl#1g%)zLR|iX-fV_NALH4RMICJ
zOIHJb7B6LLhTXT~OJ%LkA0}&FD6ksTy{}*Iz5bqs@iofdZfJyU>MqIh?jMM;H<b-k
z1Fo#6(Y7qLpTMh^rL|tjcs_2&f=jGK@BI)3&gmz%b7NoHpyT=k20$h(8BHl<>y$*w
znSV<v`;w_~xV`s{eSv|Rv#;^B;%jc;NfWlqUS-Q_K<lIFTc`#+uzRDC*u32Dg>M$c
zmaPbQq}Ish7a!%mHMl}bMSoU@WW_eu@O0tPU`r++0K~qibciFA*jyKv;c|@Zk(Z+z
zE-E-&_KT$vK=Ki=VEx@M1*IK0s4!qpVWn5A;9)dZ^t!TGKkN9Lydb}1aQg!1T4^*&
zZ=nD@1}vpIp;{^}s}V~SebAX+qW}fYZ5yRm^9QhGdit-})Qh&&u-~1_1S}|*L9RvY
zo+I%mgCg$oR12!Tnn3>}h}pk|N<(z264y6Qj3pG0pteS|S&#h}v3rN8#6-%GKx}@%
z<>;A4zJMc<!30VRlM7u#g3ySAK%oXU;aBj8bm;;=)B6qaO?I(-;{-gT-0VCb%`5L|
zT)%bCir<?qhyR7?!!=wsPEGVkd_+D>%dqPCnRMkm4fXjQX>7*IV4O$-H8OC7bR_8B
zDq^krvBJ6v9Htg(1mW2Gd+g}75;iPk@>^8O?t(kr=>pbzhn4<^vtu9Pj<jJp%`3<s
zSbjAtPJzCqfW!j%OU7L(#%}qANn!KTKma4RFnB1?xv;4$!8(-K1cwEIo{#iio4%U(
z*=Pk-jW4a_#3maMJqSKXhqUdoRS#sLO`hxZyaG^{X&rsoQ<5Q0A8d{Sb}s>GT#zN=
zqR%=|I1&<Yryqz$8Vsl-G%CxmOqzCuB*+IOPfE?lOf_-9Kp9mPCf_ZqOxE9^t*ob6
znx^Ub(GuSIeMOPpwOA78KMwrVEXp&Hh--sD(^4qRah^z0eU-CZ5(N7Fqy=UdC|EqO
zXgIpM&x<9KER6&SzPhCkUSIB{D8)*a-!OwnLbzNad1<WH-~4q~8L1yteJnWe{5~NQ
zP6M1RFhN5{w5244EStoN_zsuP$mkLPB`8wHh#Lyw3yxEU9AGy``9zM6R#29_^v7<_
z6s2U4BwzNpl7&#0cx3d(g^Z$-|NPo^JTXE@3mzH-4#R<$-_VAobS_)uP=b}wLgWPC
z$^KK<yaDEcd7$`kLm<n*gKw}7Wmr%Vf*3ike>o8^`gXJXdJU#%a@&q;$(qILPN?Dg
zUHzNxXr{3D^{@ae1C}9&B`mHKP1l(3LDQl^3j^ZtQ!fWnR~Sn<Fpog%a#u!_MOXG=
ztEt-H%|J2y1~?HX%TiszB#ZB+{N<rS_>E-&DW1=()ZKq2CQolKsJ{4+Troe3F#ydY
zXe;NZ>Ayk_CDFhn`BDaD>s<idBv=AHT?0++2Ud>V0$$~O3X@-nh2#?qUdpCXG4;@z
zw)*Q8WK+#s_gg!zgQu(+z@+<tGzSPq1aK4+CNm`@3a#^@2>HyfdISrAq44X0JkaI@
zZ^03nR8R+923X&(vJXP=0ovkMdH|Q=P*#|V9Ez9`o6uhy>D1@B4(~p=om{zv4huI(
zegbnTkd7Rm0W&9)M%Tk|L%$!h#0z5a0gh`>Uwt2B6&!*21))5m<i=g6!R!m(vgZ1h
z^UZ<7_B}4Qtp1Q5E#>8xe!IKsp$D`6=7J>lO<~|~!9o)7nn4Mf1p{Y~)vzcu4g)M#
z(xNL%LIhwaHoRLM^?sQH_F*r(p`Iy*44Z3Imr$w?P1mmBWEwi`=<TiE#~FI{-xlA!
z6+{DzrT)#0mnqAI0WhCLg1?l?@jR)uY}H8mf&L(Xy^&=Q`jRUJFblls^8>FI)e#8z
z63I$JsVtz}=R$KBN7?+$wbk3{qC82Ezhe9rPV#wo$T-PHQPD38G(y2fWQf87v1#5{
z3=D?Dx2~&nuQLW4t5SfaN%SvAGhZ5ms4A}?qU*hG%D$%Z+qTNRcjq<I$y>t3b&kvj
z&-@Qo##UYxr+ia%ujmgxas}vbYcnq#yETj=WJ?4x2}L9t0Y%6L7@bhKe?FKzpCS}V
z5T4Q1v_uH_znl*WRO%SjOg1+I`r`*G&vC;opKWBS$}X{%E51ZjyqbGR$r}?i*+?;*
z<;w{{fcFfh1nk4W%bDSbPBzqH3rUrYtwM=k4X{tv1AC;eUjxk_IIvJ2%sxM;vSUEe
zu3zXCxY%i|&E~+B^etKiLLjfymQq}k{npnb&^M4oiDj~qV4NK+lnX@0=h^|g8eC{x
z7r)jzkChC4jjj?&8tV)cHIy69(?L{_2-z^iO5D2Mo!qp&XCg6ce#^{;H!O0Q;Nijl
ze6tx6TH<Z{;AIAmHQfLc&?AJPdOq+&l6Vkej#XYne|*$j!I3n8N@kvr-jA(0ic$nm
z$Q_^sfmx7&gUJ#se+#B8(8TNfi!YQABkuwho5RWoZZ5WquRE|r34WOl(x`xmi)NPX
z4yr8!iUU`&K|%guu=1s)O(6%k2=JaN1_99zHHM<OmIax^4ne??0r$WkL`jNC_;TG*
zbpt&nJflUE?V_Tz%ozJP<PU?xBuOP4WHsW|K*Kr=8<2Z}d4bll2p--R@ib(|NQH!1
zf^E3$*8qDV)e%%2foEBucu612k^qCJF#BdaT=!W#ba-K)FsHwB7o&_vZ?&XM?gbr5
zRv*urU)@ik4p}n${2Ypz0suKkVo?1_aP^3V=!950TseZZ>hr5C^P;+ehKd*28rJt?
z3PnJj3k(vQzlHwycuWGkQ0YAL@<EhjYb1xv;yMy&!$c-7l4}KavGzmNG;9f>SxVwd
zrP+#xe~-T&`>9xwAnkH=Whs|QMeDB!+0vg#wu6z{bjnhYbb&z@!&9Z#_pV47Zd^r9
zI`kfdil``9HiDx-%waSgXVv2n<OhHOx-43cSOFvmg9d9=`hR5W&kd4g^5)(2%w?=q
zxuE(Yf~w?&9yy5rM)SQu8wSQkA&Fo@*-YsV#J0IV9nM_gZmGzL;^VBwi!qF0TUroU
zVrK~&XkL~5(M%dPQ<?DtVRd9uJ1PTehM1Bd01jn>N*D|B7!p_@zpudu4L34<UNMK+
ze3G>Y2j)6@>&<3k=-y<&SaYKtoHjVc0}UBV2KXEVICB^wfQ3`55x;aTI^{R`7)EV)
zgS^W2lSzaC;#*yYw!k6j2xaD=Xbb2nf$Ip2ATgNX1{k&y32f=uV_4N;ZJ~%E2fvsK
zyd@0_F<^*J5l=JwKq8E8C?QmB$8W0s6@U_8>5Vd&0&F?<wWOgRYc=d(*_^Nii&jJ+
zNCXBK&E#@mC{~8wFetz<vFjn~OB)zGBatMU$J<tLiA=mD9f(}Y5uiOFbRU)pD_1S5
zTxd+gF=44#-VWeHGI)86-vD3(Rp0XK!AcDj6{`%oUQ#rW$siX^AC9OX*`O6i{6Ik<
zuguBp7fO~4yd@KFOXEf`A@;PQt^jp8=u=?RvjTgtl1~9G-4A>UXb}v96u;!R1?RO@
zGziu!XrTM)jwUZN1-48e%Xu7{1`{|G6e^R3#R66YEV&H7;VkKRTLund1VzwDGC>1>
zS{XhScqAhrH-Sq6!r%*q5}r(g2N4GBqQY)bB(Rtwv^wa4f*nn0VIvbH2yT>!Yg<8D
zrd8tn9Qr|4bCCcXhHs!6VVGP34M(KG5p*EcLHzs?8sp?|PiO*=&*TI_xIQI!5e_V6
zf-HnUSIqlrfZi<{p{@*eIY=95!=R}YI}a1f<bGsj3{?ZDcnX%ou;B%2yDbd{#EEn+
z=rCFjX54m0rKC<bFaVI1viTG+%acrC#v%y?e3AJetjgyD)Db@=gUED8376?XL?#UI
zG6YJD>B_!nbYHZ}Prfh=VFY6s^lFKK{W4rEm$c!@9cD&ph=Kgi@(;OwSbV7n7F);M
z1)-n`g&55iSh!Jrlo4R90t6VWGU$>9*~-aK2xUUC0ALFMJuZl0A(1A;&~ZSk5sZLc
z9GF=61EJ&j!S)3*#9qqeLm-K9VBmbGKJ`S1B=TK!qm_^a0jy5|nd^gnLI^a)l7<Hc
z89^V81+ibwkQGfHKtN}OFKB5V7WeU@4hE`R16=aIZ^v3drjAjt9IjAgKy(1OQGiA%
zY&npcZ<KMVLug)eh`s`frmn27A>SoM#cDvn!O;v{1f6FsZ_+h@etsF&Q3go1l<`FK
zK^x{_44rpxFq-66U1{uSEfD}QlSF(FQ9)x3mK!BNM*ToeTtqPn&v4TRQc*ypW6?mj
z=?GiF0&O_54;UuJ4tNIN>N2*n4_j5AB5W)Z$oOz0BOoB{50#SZ&ww_;Bp(Jff;Oz2
zCdiTiQV3-g&;y%vtTqlz33@<C_mM9VDFPvZ-oKI`Ny^|__i+hK0WdWZ8%AIDv+9E^
zB^2Q@2aJYmq$$5xeJH!+*ch-w8Q{1%xP}SK5sDO~G5|~2OmZDqK(oP%CD6kVeGQQ8
z5L6!&h-K*>5Rls-x0N<*%fJE|aQM|DkX5n97Md5D?lm;l+`LS^MjOy(0Y{KCERRWm
z=+A5ft_0x#Y#=WOzpO>!#C)h8TX|8rQe8P63l<fXks1j7eo)s8;-ySHfrgD>0D*1+
zD`h2+6)n1<Z@lYj;Vs)JutgLHlq(g<<pG$MHw(r8$VWaT@T%5Z|BPO%j2FR_uYf_6
zl>!Q>u8dGe0aa7M(Kw|Np>-c{0(?XTnKixK2dyfJ-f|^_-kuO{`b+tMnG`@FnH<YO
zfNQc?0+<IQf?mjA+C_Bri)~;?Fc8Sim9NLQ_@FDX^1uMhGhIO$q;WJK7LY_iAj?@+
zfM_<J2K$`{ApVa6`ikui)Bh=NDI+_A#wnlx42KNR4<H1-2!PB4*5c)h=!Tcu!0__1
z(Sws#SVSezEJ8V51MHMT0bfPYZ;_dOJPZfhSOIaSH}<7a%lQ*`b{Zsd-RJ$K3l%Xk
z3Gh&$e+j_L0_INxm9k(N7G2%%Wqs604z59X5Q3#d4X{rJo$iKGbVnddq8-4w4X<tq
zS%X1@GVB5eOncG-K0+&e{fc*U?hpmrOp(?HNkk$kkh~CB4H!oZoE8`wM>6A%sxEP>
z3f%^#1BzHMm&Qtcb!9LD6@dc0Bf#<n3=YhO#J~!K%pQ0N%9?klKj+5YIv!?~0@?8a
zBtIqU5wglad<4Nj`cpD;6XI`Or=5wg0sGF<+|9_q8-Rh$0(B~bB`HOppHlGvK@0=}
zzmq>N67VF^D<$qprT1Q%gt<jYfM0>Q@}Av85?A~LCnO0^1jYakB$JR)+BAf1G1Q#q
zW()=c%z+>}grNC=Erh@-!LpiigQp)T{(f{Itn?JXKZK&9lKcz!git`}AyMWVH@Ug*
z|2;H5B%}EH1h_F&T><>f70JUeM1}O-hj0ARJZyOWe4fC1W@IZ=c=t9mJzj$Binu^M
z?`!Qd)SbQd@83z9L8<oKftkKRe~$qFzJ*Z3x^c9s-r37Rp-@3LjhmtqSboJ^t1~1g
zL*=jE;7hCqs6}0$=Wn-vq(D_yMN|>z9$6Cc)TecKm>P1Up#itP>HYchyT^+6QZcrl
zp0DV}We_)&TevGwpI2`k-`HWJ%5w@!Ry#9injE#VXZFw1o_XGOEkRXI8OA=cv14lg
z0%c}}W<CL9Tg8M;VCX}01P0AOy~_hnZadwIx*o4?sLg2(oq|b5gj}5EUmhOuPAm&`
zYH4~~`OP&sIZhp$S}xYswvN5?@v_lT`t>glLH(_xM|^y(9SEnhJ<YGU|Fu6pw?kFc
z!(-r*<_bOQ-{12>9zULaJdBRkI-iR*&OfGftUKIz;V6|h@?vV=UV;g#!xU38$=2;S
zg<(ymu70%BOq&U(uIwrFw7~ioMBEU0P`O>dQ>ia+I{^{T1)(?pJ)DnS*ML9$SD1gN
zmZA1dXod&n@-*ReCk*Y3zWva}_WWB&bL0J|9%N)pNh}q+TP@BLvXN~eEipIRzT$ZY
zFcyaNy`dp(8L`hRcj~XYFn!c(bB9G)p?ieUt2^}uADY8f>Y#|MH^Kqhvqtk!lj;fB
zl67aP7K20u)LD79Us(y+e!^Pw=qD48a2&w4&)V-1G&m)r*aD}dtGcOYS|wERmr9JP
z62yc_9wxcY-JX_ts0dp8PQfkpT+dwfH_gNyFB7(=kfJekO}vIi4}I1~#b!mHsyVy!
z@iTk8f72#RvD3l|PxQncEswtp+D{YOiSI2}Iyw!|@H_Q`W3X8NuDw=d&lUKcDqD{Z
zhh=ugxLo(h>j+^C*#{7hFp-{yX9Lh&Lj5nXqfUtz6Bl*N;-3sGzr%c5bUj<6_aI|A
zYBA&7*=?kJc-)fOb(zMqG;pZx@@h>SG~8|dh7LnaD&CyNEx|Afb`{>zAliGTw|lr{
zx0=tjaJ94xEA*=}Y|ox;&-L+C*3O*Y$WO#(WY9hQN53^#P`xUV?jf5V5eyAYF*pn^
z)Z*$j!+?#Z=F|}%ADksFHH?Z;{Wb*ITAlZ4zoJ7m&uojlc1dyl;cB>Zf;j}`!lAk5
zXnO;sp69om(Cwoave*x_K0Y<O>T+mhdHV1CL~3n-u38z?0;g&vU%An)tTou!@p^!&
z;p2s@-B^@3G*LJ+C^j!Kr#+6_zwT1&NSnLITU8}w*vdCE9)V0jfmVY4$^viGyFLVq
zy^5VTGj=iiG{aUt(&)L=S^P;4UAb}h&4Wya7G2dyL!;@~P+V84kB6SB=V}91e=e1q
zinO_{g?t|QshhdV9{TvKFR;76&^#-YIh3@6xUs#f%X|N@UuX2&wb;uy@K!il+`C!p
z=j;t1{L%K@b@V{AwRwWJcFJ+%(chrFW{5dwZx~X#MN~jIyYH3;*5ZuCuPUJN8}x$a
zm5Yo1ZQXfhz*U`1S~SCr0otOVAf1TpQMX4n>v-tBrzijRb!*E|nA{JxO=e`AKTr3$
zvS4`D2isw&rB;6nxl=*0^EEBx=}}eHJ_+^t;&rq}*f*~Y8{0zcwPs>&G4PlRPMzOI
zcrI%D6t^eoz`Cw+MLKB{UESdPY@VCs!cq49ro~|E_hXxqJS}rQSAUASo1JX|f`?m(
z1FX~D!yF15C={l<t7IBlV%J?b9oMnS%}G-wy`AW>l9V{&pmj0V*Z`09>Tz1-M6meQ
zR;N8Q8#r8lHeX9$zvR;9>y`F;>TmT{_^%l5+@o%3X<6bNXJLd{7h1T>E_ziPk!bCl
zlADx?yhyYUn7nXwV#O-j0<zQI(8-AzM_;_UQ+--Dzg?H@QnxK7@5W<u&m2wr&hCnw
z`Lx3fGnLQwZL>k3%-MBA&jy36eL<&dk&Ih_QIADr=k{i50zK3<K7QiA9ifHZbgJDd
zl=gUpi@xE-__jN2g^7!zdq(uJH_b-di#3&=XyCkm^|Co*s-&uk{19cNg~5OTtv}>b
zy<PE9`eTP7kCE9h{JM7o4(F~VsrGq&di_^HgfP?S9SAs`_72>~y?fW})G<|hnRjN?
zDXpqR{AheO5e{3ez4ZH{zTbS>pW}(f(D-q*5Bw^(T}gSR;oIZHMsTh_O-ZHj@hOPa
z)+vhr6i<DmWD!%){r1~OFAM(w3`VWfp%XTw672D|S0>-?jRvv%TIDz}@+v1W3Y<+A
z=MnFSDa^_BTuU7#b%@Sq0#m-z-TIiyJ#A^eaVRvD=JC?<6463WXS-R<Zk*-Erc3n4
z=CnP5BPN^s^Y$rqr>aU4mvGki^FO2$9Ba&76_Xv{xq{I8OHpbdr~w~MrV&54Dbw+U
z8-v4^XPvS<+(J#EyTG9NdiGA0v;zO<_Dgl<p}OfW1_O4R<n?^oJ7EZEB;waK{$^yf
z>hAzgWmV0tIWg+_IKiHVvotu8Kki|N^k~Z(9{98)0BLDZNg#MO8e&xSYH72B`^|}s
zPD54Zh&GbnnSk3Dj#m8MN!(_q*WNbK-hED6ly{GVO&Om(RW@s9Ry-R7%>Ze-fe4@1
zed-bGb-JXM))kWRaRSo{b$P9-bWwa1vQwKWPQE+y<dc#GPIFU)zTj(1sDe7Ruq{mT
z?G5|=5Hw94#%P(Gr+%>S8}hQ(vsMVB-Za(+QDJrFbIX-3cXsKi=d3UcTR9@?s=7X&
zedF8JsoDap)2fWR(}a!j@!MJn%)wRkD~R^c+V)2sQ}G&6Z4={h6H`fK;jQ7*rEINj
zkEVb{ij%$z*t&<>p?L%UXL?%a-?~3eiGz>WFBP2)_)8O``s9;GDyj}^sek4T!$>Q8
zmzKdg9L^T<B$~h>7cn~x@CiJ9Uiiid+7;Dx>2V(~K;mvA%qP<oI7~67Ve*D${zgMB
zL&w%?QN5-Tno;1L>rt#uz!+i-L=#${2Jsp;rdpeHUTkEVnwNW>_q9vaI&fWmG~Dv)
zaJ#9lQg+-q6Bmme>Jm0>fqeI4`=i;hv|{nwWzt_*_BP;{OIq;};5@d!)B`YU4#vd9
z4mid8`lq-P9gMVcy|hdY4-FG-j%H@&U<{N}yqus~UQEQzkRd{?8xQ?9K03N5Op*S$
zTkDw3UQ5YEI!;MV+1lRPdE4J!v^YbIXI%SHE@9(N(|D&kR^gDpk>(984~d7p%~8r>
z6JJ|=PiVXOtoiNLx3u!Eb-r)XG0Ag#Rk<*p3LYTq6!&#)j`%E@kDInj^CWKkn!M!A
zKQjT6an@vo#^afj(U@Ba1-l9`>4dWSIUO$>pTo5wwZ^LZj8Fb|KjwTO{l=wS&-Av?
z>v!53-<`&zpC%X{u`#zqN84fZ6TGwxwbVD}mygC@#fDBYR$aLC$QIy>%Gh;=7?0DD
zO6KE?f{4PFt{jtMca`*!BbA%)*{q`nj6Bs}Rk>BAcI-9F(l=*EPgi$j-|_LdxwUyp
zs9AN#OX0e43p{qIFwZ-Sq?VFaBjkR6J#OJYo17I<Y)NZxTNUzsGjVF<u`TuOszOJt
zGg@>{r57=#+UCXX9{Ct8&!=VW#MXd_Dpc+G?xn!^JL|kG_97m4-k?s1kG9*c&3tCL
zvTSo<jybZ@Ld!#EO{<T+kyg2;CEYsfZj%KyXG72c-Bac4)bY;UBkj2-w=jkr8x9>W
zxJTq#&N(F&w`Yv6(fTOX{r$sq+G3Kf_qG<!0r8}41N;&M1E!f$`o4GP03h_zjA*s*
zJMv$B{Q~37<;86Ws9LI;3VAVEqmx^iwC9s(V8+G)p-$`07+%lKQdAC(al%<<jH?@P
z50u|9x!9qFL~Sgr%Ef6uiojt=iHnvtN~+p739pYE#IMV;%^kBwgtXO?qA&JRC;GEb
ze2la2Iae$uC#A}k;!<_Uar;<jX2Gq#ZvaoM!Um=>h*U|=Msc#;&=uaOh0%(2*E`1@
zXnlChlRYtI-X7-Ei4Lt}j$EIbF-4uwP-?rbvgMkvJ_9|ibb0{lFK{1VeUv}dt;@&v
z%5g(~10$`{0-X+fExLiRM)y=0L65j@|Im51NGsR#(fcbynQvXL*Jn*SotRj&(=#tU
zh23(hPdZFEaXLvuG?&Wc|5CbxxtOtH6_PsI7!>g(hgC+>&6o964Dr8oUk)7k8vemZ
z=a+ky?V)wPdl$cq`^KlVZgYy&Gs?*9s%>Z}c#u-?<_=I8tsu(maBRnVx}Jg}5KfC9
zt*z}DZe2tCf`$?DHd;L+glXrGccAgsv5ro)BXewgW7|{qgdces-ov5`?JTyRm^IZI
zdzjSi9N#;->@`c?$Ik>R{9f{oxp>3#`JE~x(!^aMCnI`1^`x|?ckKQ7*b_XQt@m=A
zWlf2hi><9KrZC&XA_vJ=sItmxH+pj0Hao}MB*?r&OMMQi&t@2g64BQBXSOexUZ>{!
zbCEggm|Y+q=qjHFPD{UXMl0KMZM=>VWTZvc!6ZlGBknkLAD~`u2#Kt_Z^BHNUt6>H
zTwId#PTdFX1JXEY?>YSVKD7bqLIe+5#4ZlKrZafwea{Cqnp3;Hypm1NX9Sgt+9`V$
zQg*bpvIUQaqLd^>?~WSVEUb_k(CL=<pAKc3KiTlQp`moNb6xSbdRzFlzs@SRM<E-D
zPwiq)lcKdQI%O3^+&bOrS&W-j|9DnarObd1wA_c+@M4gIPUjAIP=88QKeApU;zmbZ
z?of`+BcbUy{$e)?JHIwhXU+DcH7?g@R$n)fvfVyP=Vp^+red9tE&>D1u-bYj{unt)
z+Vp;*k6ir3z$5E`g;uVI^pO+}Oxu75L9oG->0yy_r0h`cygu)Mj@8IxbL5TldVf#4
zL-@yi)LI{3zu2fP<NkW;dFZ6w@h^*UZja<Z@-r~mu1XvBCR7(;Px!e6Ev8|I2epz1
z&H7BV=k2{}GP`zW(}Icg{_A#nk}ls&t%yfYF4I-jv}Iz)XFM&ZmgXc&i|4)y|JDj6
zo0eXaS&zyXA{?37wB6%Fl-=KT-;DWU(o&-|@QzFtq4M9pc8fn4k3~TPRW?5A$dC>z
z;YNaefYB|*UvB&{wZ_+<iZM{uTn&y^vqxL{VsOJ7-})nSRLY1GcVZ0oQaj+JMqKwf
zz4l5YwS+Evox1FOX2~G(?ezJKxl~aYnbMlV{F<tk!4#ENHNR`25dS9cKK58T(R*vH
zjJtFuJ!`<OO7t9ReqRR~6JxN1-7Yb4U#K`Jwe_}j+bbJy4@`5s{fZheCJ1DV1l~zZ
z{-9l$>tWt*F^!z`3mhWa_tDVLd=o}_m{w{&VcqYGCej;zwOm5n(>!`m%(1|=sVhA9
zZ>*&~Up8=m%=^ixseAX^-FkNSTn0~J>br_oZl1%`JCC)R{t{Z7pCFEbYC)K3c>e3+
z1jQaJVkYt9)bgK_8ZmGG00(i@9rL_PjiH{bc<sE6zTNv~kqEpwdv^+6*H~<Nm9Fm^
zL>7MHeR9uvJs|v2znq;d8!Ns)(<`2L%z>dg*%1!wzMyD+pj(!|x_{Hf9Op$vEmf5>
zxZOQheF*V?-10xOYeuoZL~n)1`^>pB{h`}0cHTQ4<>+Lt?!S7hr~YwMZmLq=-r}|?
zFC(>dFT4AipX=1@d6@Z~x+U{27`I35<{g>}nR8$U%!ujVw$6pVGpp_p?QRyaC(J}}
zC()eUwO8ls=XInc^>5&0&FV+J)g6X`)TOnWW{r$3?ECESrvpol%_Qd|cUnhUzUfp6
z3>RG3O<-eT;CNGd*-_bss9d#AuO-`MUtF)?DU4`h4jrG;XpX$@nYXHP1OND0Iw*-V
z-<OpAX}m&DD@VuN*I4@#Zfjw9J0^2*z#m!pn;omo>BO|Dw|y6CNRquVZ<PJebX!#M
zcxpxQTv+&_4f`>5jVO@)v{m(ArC`flPmp`33G^dE&qPhJis9!^u7sU`lD%DM5xO7g
z>v*)#OBIp-aV{~~*Z-Z;Myb8*@}R;1p6q3{E15S07Jbk9rQ#L6=JWi<hNX9AEMmp0
z(of$SWbY_U3Pwsw%qOfZSfQ?^s-+5RXnl(L!x!W+{jvN5dOqp{dsuJI8NT{@k7<~@
z6Wwg5);3|Xw(`WZni48&l$;p+XM#@NIlSt3eg!larW9Hi>1lqsgWGCJH_%jH7k{cl
z5`WM$>s)UY9UDPE<F6!E(-gUn54(p+Dr$GkpcN=3n<T-aZaY?!_IM}RxEpp=OCs|R
zq!?@RJV#UNYF`Xi<ZCT)CUd00vm9}hgdpt|SqqMtKfvj3ZSc%d&(ksYIXu*AkJmqK
zdwfDiJ$skAZyc=3vr65(y=C)c+&R6z?I4k+<VAfhYA}dH&EUt4-cx=#12K)0O9l%j
z4=JDRJtw$W5zY5H8>c1Jgg-3|6H*e$aS7zF7>0V*r$NASsK`yWYg%&tlCy70@E&8P
zfDy{XS7a<aD*pIcOj%z261t&iLix?^RZ~oO%;F``SLk5RX_NKbEt^dBS5>V;)e`4!
zhHknOb1CBX$}*zIsvL8V&dsKxrnBF#%4NC6LdSUeIsEw=KFUMqefi17;0nMWG@djT
z-hu84-B}Tps~@!T)D|?uZuoR?qQ;C_%DTp;F!G}o@>i!1BRou_i@>PP0>s>63yHD!
zCqCXZS3K}^aJampO(Ohk%YJu#lcZ!s>X!E9=2E?O^rDNPl`oyEm{03?SxDYcedYM2
zl<|Cmy}6Hn$w=Qxi!iIY1Dm&9>VZ7hZdw7J!e`w*y=HBV&-9v&f~8Wm{50F|3o}WD
z0EM(9NtYGxl95fKogIYSz8=t+SHqfKbibq~QhcZ6G;kCSJ{Wv>lgk)dF+O4j8Qa!I
zek$^S9f_ye;|pgEo73K!{k}8=eRiBxS!0`Z-z@F^C}mr1L6>r?-Kbea%f0)YW(rRC
z_48Wep|tyy<%_RqRR-w0x07tt0i*3H{KP#mfv;DdBO0_Do=u2zo;TU<4Y*ue<E>Q7
z-y7U^k2fo51wF#qZcQy?91a&M2Tnz1oQ)E(Y3awS9YJF0Q}&Z|moFyL<)nm;G8yr1
z*(XgUkI*l58Al7DyFAl-!vsW|6rYm01sbkX`{v;(n{c_PRS`SZdrJ~PR(&3I7xcfC
zASG1P#^>bLxFE`q_otT?nXVP59+HO|2n@WvRbvr`VV78maf%-`yo?XyZT;GFp0Rl4
zUru*FcJ^vYrpLK#U*^4M_U2X%(Rl>>bzxbMUhcw+-kPUhW<148r^bd%$0>19(~J1<
z%;Ygb?vQkHE9^Y{rM{b?T{m5HKmcQEQ)r!!b;VX@Um7Hh(vh@xABzqxpN+^u6&mb0
zereJ394tYTogbSl)i!RcnO}(3pa?0a_-$@sr8t~Zc;GAjyQK^<G00?v2Xa95iP$1$
ze8}_m_=$7HZ4-Uly>$`iny9Jw3sQrv?;FkU>8!I)dXtl>lz!&0YUrF~``S-n%h_%5
zJn2q0w@2~#SkSrD2R=!brNk4pX;q{FvtervqiyK*tD*vZ%?P@K+3&6ooG6TyUvd?x
z<sy6OSy$Rj@I5PI3eRPi^KN1rF)$gLb^<4tVkaKwdt6<=*N142?uq9aU4bDlJ!H0X
zayAlUhb_(MuRKwtRC(f@2{Qk4#pdx~>vpKTC2GPM6SI25VaDO6{RF;Q{hWPo2TwC*
zbF=rWVtT9fXN<k(wm4Q(cv*N)60IPDUW$$jnMmt$?Fu4|T6{@)^4Ws7zxqpx*{dtP
zwmCyfE>#6za(-#vNH-Gs4ylbk*rW~dKHojZIA4V_G${Q1sIl4UkV?x?*s3b)dkMXl
z+5tOj)@HP~873TItKz2?gSA<+qA|xd=+omzwOkta?c+u16`1_t`>=VP)$jr`t`ixK
zY9oqc$4K7JJoXnx*Q?S8cB5K$!)hWwCGy7DcC+tVD;L7}Cv|7&DbMpp%<jB!u6uuL
zJ1Oc-v*}Ll@P*S+n~e&uJYTUcKQ6y&d&66(G}q<uHs-AVvYJkDpA!&Khmm+u?J6@(
zoAnf0OoUTaL1HwWyppz@_B^7(tbg67EoWZXie2Nr?CAc1P}7Kx`GH6@JFwU6z&E4q
zuP*ek%g7E-9lYBy4Bng488xvPLsJy+9Cc1`Q!7o#$$~WOZhr3#U+q+9{jv7qVBMJu
zM=yl;oU_&kfll4pKD^g7<8&MdbpT1OZF9`?Nkc92e;H2u6S(8QFXI%(oMcYos)S+m
zwDKA4%Xg^V)`hty4YE579%dFSN$}oeo6WcqD1?9?hzDjhd1L$`Nxe9YDVE07S-+;K
z2yTXk7F&fM@!PAmdHX<|jrP0&dC}moGkh9Y2M__WYx>b*RHqm!orF`pS7;fY_4IHk
zy?3gb*Z%HH;hpe2Nzc?WzBd)7tc8~EnD#}a-G#5<Bj`!*K@Vu{CtWaSeQEHEyv?K$
zr=|Oc$E#47jmbS{G)=aiJ>0pzbMR?d%rO9@b8WX_7~jCOLUS<;3w6{uDpRLePe(0#
z2OS@k@Z9<w+nChNK5AX^o2EDBy2oFJNaBgqw2#q_A1l&6z_rIUvHR{n=02GbLtrtg
zD%T&V101K(i4TuD=l$jjThy_{Nn)42a=pES`N5R=mRger85>xa{kmv{?^~&(cGJEK
zhzgZ|PT5@DJwM-RXR6l@;*K?p-r19-JIB_QYsDN|fB1oyM(jXrs>hu?in2pLcOdzm
zXZ2Nnd#~;C70U<KxfhP9-XHKitHFtXAbD#1DtbNM@u2e%b127&I*V}xkI}yK(kkwf
z)#h!in&Pj>sXtlQyDG63t8$bzkZ#3VH^X}W92#jIwk)@6>0vGkIEdvPy@@*s4*D2u
zNo0&+Wa^=nDOa}I=5emXFQyAQt1>rpC+fb8rL@ZQ*Om&miNAM6-07V=-ClG$JJ-{i
z?%d6@Zq~lz-kt}HiG0VXh|==3xG?<P9>#Oyp2q&v^AoE(b5;y60?+5^n5b_Ih|zBR
zM7U&K)Y8jia_8jsB?p0DF;0=IYl_}{KRu|mFvTwYZYo{0dX$?)J~?%qpUAiTGYb_D
z_aC}@rBtOTYSHS?TfGj(BfYjUzkaB|Z*J-VJF0B<q74mJ-Wuq<7bcipR{at_ZltE>
zc{t{3qSLBz4{F?l&k8xUL!qWFJ4oaAfqTt>+XxqPqf?TaTI*FbEGuQ6(km`9j}!G~
zkM{Yv=O(Md3-f02ncqM4=DDuk$>OCo=?2_9r(*6K-?!j2w%mMiu!ZqF&%rnhnPa{w
zc8JI%%szS6NV?f`|EzlQG<(%-r#MFQ*nt14o0gXJzW$<i=5n*a6$dRIxt-4JF-{ta
zm?96-`N4;lIpLE^nqs#59rROIjjeoFw;zc8;;5FXC(Nh$UH+?H30C4XHSTxRCT(ha
z>wmt|_|+K~y*pvuNjrUC`R$Ln-LqIE6%QEcdY`&K!AanmJn9>;-*$dLt&MtSO8cOM
z_v*9tYqq2n2>JWHq|9=zSn$=k9Y05UZWcT#B@dThy1!-*&%SHw<lnh#Gxl07f<?kN
zUz{SS`1b5gsy6B#8YB~HiABd52lU=AT^C=s4=vZvJ4KK{)SQZ#=-kwN@m7LhXiNZ^
z8jpzP4!`<RKh}v_g32?O+)IRM`$*{vFXtru`RcDhi>|?kTHfB7n2lt;rf)XJbj`po
za%{T3SoB)wT-8L4L3PNvr23UlXhQ|%J9#_#PtF)%0_q~46sgRnc~9^(HPoEytvUu<
zhUT>9C24^q{w4BgYv=b!_~~ezgwAd$B&YcV3pSo!UOD~huGo7m$KWfb{!wA-N`MnF
zQ|%<BRh8RH!g$*!O|-_d<4*HdZZ7A0?U|c`->@Dw9(#5BApDkX*R^PO4u}fu#QBPO
z|F)ZS->iO7ts4HmmQGH-k1V?P;oWZr7dzvY&4&3$L=}eDj=!0TFFF%q0*5lUJDGHO
zXt|*9YDVQIHYXMqy~j__&GOGLI+j7qZ!k15=`lRl$#hNBux>uJi?gpNb#nzfoIJ!o
zJVttZHma;AZFkDD9iN;s7GDm9=5bdfI9<`yMW$}VoFlBUFjqfm(m7VY(`hM5H#j@d
z%<;aN_V;~Rrw0ee9Q#4n8+qWJC@F3u&soS5T`>Q!V5(LVaj!zrdfG^r-z#2pjmrBq
z&C~4guh6QeW!!@f_;+l#x5sy`HNX=L@ckG@*O}znr>bVZe0DuJo3tok!e2SY9rH#7
z^ESSFhLW~B@R4c3QTZ0%Vy!sbICzx9>MHv@p4PMQm2CV0^I(3DtL{skwJ$7ACOcvF
z7MD1sv9*>}myWMZ8EcJy@bT$$e3VjE9q>55LM?#pT{St#ad+KAk7o0V#szG<&i2VG
zR;i`yUrmRH%e%Oqwc{~d(aiBJ&yT+T>Nu;muz0Rz<Kl}yr=klM?v^x9i$!>u-&{bn
zt>eY%>6)f-UK)E7dD~}hMHTaH@E@njU16L~Q4y#&K`IR$pEg%Txkp@?I)%A3AI0Xc
z`ntB6G`@K;pg2r)d2r{*>)ZYgMHeJfc!dNqVadUH`q#49x4YTb&E_30Qc}P6wbyjo
zESTZ->G#;K@t=&WH*O)i2TGGT2m0Ug7CM)<EqNX<)8=SQJea!_LC1I3H<PF*vXI&4
zYDH`{{Ja{wLSYI&<(k_|$48WJi=YR+VG<Wr8}Ff?Uy&T&Ntryo5gaC^^hOA5<Od@6
z^k!~MP405pyP2g$m+~gjw;{jBB|i|17c#4*ZC{S?jP3SW0Q2N;R)ui@{+wN7VHjrN
zbTX=KuX9ViYi?_>%J+R%PEQ@1iOvq-eelXlJK!3Z(SRGajSHk|{x0!W$)f7xNdBPV
zm{q8h^IpPBu6|EH{$@s;0wVG9!qc5PNBIStXL_kI1GVcpqJG(>*|HPi?^MCmz$+@z
z82ac3GCt$EGLocdp>6>NFKxq_w`_L(i><jKHJOmSsnaQ@4Gc|6hm*pF=h7C9KD}v8
zB{gHR>`vWq<^CtgIf7j^v)mLxKh6g{vSv%XI|Ac$Yg><A{m;pnQ%S$RU*I3nRs3f7
zZSD+oWhTDJM2;>%10*!h7W7khZU+y(an~{?tciq^61A3h4W}K-v+vC*GB3(jf~Fa~
z(~F!`cY4enY4AZx8DQCYOv3z5a-4XSXEN@0vdhfT`+AYKQb{j;*3P}?@SmrgDwK`>
zo!x<(Q`;U*=&5_GW17~FC!o2<&n*7-b*Ibjo#c_m)%)LHe>*q)F<x>>@9_@=UBXpp
z;XmW|B9`Xc-@fkqt~5Qn#@Ssrf%XFI&$0esSaW;2>GW*r?mk-}3>P<TrZG`IjcU9K
z9X~;hn>I1;n~Qo9bNWhTB*dCn%l)*h*)|0)?s)X^n4stN$z!L6$LqyCr${MvH``pm
z?YLwocU?;Hg4t=<+ivIwf;YBlT63`T`mbA<{j7dST+tlPf7`+}e5*Dp5han%Me%Nu
zr9qr<nJ4?V<b~vlQ&q=arxIuIADFOiKHz9H6Nt4}sWJ|g|Jg2a@bp-X(WNqI(Puu*
z?XB!jS?8w0=(6Lt>s?cwAYs&JsMJ<mF-}Tj-@%BLoz4C_wRxfKxSz$1NQ&$6Sofw`
z<)FueYp&!&g7+=XP1+G`3P(3Q#Uz5BoL6|&UVhNfPUe`->}jF{{D`3m;LnxFun=z4
z+D{ShAh!7gb0INU<=w0cA*m(mR`Kkkx+^>l4SRG^hHGkgKlA9>a>gFxrIHhpABbN(
zVe-S?r)r|oY8Bag(OaWQL!oLMNznDu@aZTyN!Wj>>QF*DxS^+bVqs>X`y6>Jtqh)K
z!aXctZ}_NGMsNCYUMSO)TBhZ7;@#$zI_;6V2X>~ZfcE(85suP3x>r(5<l`>Ss}B6L
zh~WsA<zTjMWZ*SB&Y>F{B0h>uK?S|im)JWo?sEL&whdwRU>AA4__5_vQQ)m@xldo`
z)lS+QHUzwtoL&$sEFeF)%$VK}rvAFvt<C&t#0;$CPd*fNRA=+g=^4QGFwwp!&N;r~
z*`KA&q=GqgS$n40My(*ypR8O=xg9@Yse+Q|`Q=eACEslcs&<y`=djsVNRCeqq`BQL
zSlCv>k-1g;-isLTlxs5^xKju4skiu_2JNnvPVn+pKLcHwO-|V}QSmG|f6@NAwT}9n
zY3kV%CWfgF!$71q;rL~zx-*Mo<8g|v@CoqbbV9Tr`Fqsy%fD9)3BZ}3_qFE8$)qzM
z$WNm$PXi&g1Ju|GC++AD1wD|wtZ`3W@1p$4-r(8)L)Lr8HJNnp!!!XUbT)uMLPvK)
zUnvqg3J8MYK1x985EWu53ZeHVy=(x1uqui^h(M5_LLd;Tp(rB7P!gJg0-<;I9elpO
zzg~<n_(^iloH=vml<Qn~JOdd|mF+>S(j!b5^zOqA--0)hbIqiwq44Abcr&aejkI%H
zWWtJjW$nX{o_}zsmdU-jUG$@{O!32rfFoDlvYQeg{p?!=4F}GGkfN?#bCnaZD$SC@
zB#q)Uerm8hWRhD~r6u=%99?C3mma?Z*m$CqS5%X$V0EQ&a8&hVE1|k!#~8D5q!z>n
zBqA8nh#_%`0n#B}uyp(P_E-D&!gtJ62rRyp;l0s|pTV8w2r8Al`#YC`{cGq#ETg7@
zH89OadC3TH$?#?hc?tJ6JZ)XPF$j;)+KeceiO`uUTt^=7<l|@yLA2J)surh4&c55m
z>K>>Q_gcgw(b|m2pzxN&rr3i-5y7f&BYlG#)jFeK(_waObta23AYy@;QsTpe{46B7
zr1gr_p?WCaNbHp0jh-mWSsF4+n}%7ZM-brE;ww}|`bz9dw0@wW>B>Z;YxXC_NdF81
z$aGHB3cs5*!nSnn>2;YNn`YqC(qU5A)TJgFa3xUXhY51a>sdl^di2Gu<m&zwzIizN
z96ofZIUJiu-JJfHEn~~XAadl>?#br&4X>h&L*Czl|I3DqIf7?K>QQ5$;J|VNiUf}W
z>U2MdiuwNSqD+#!LP9`6eEOl~Ta_&FdBNCS5TL^PigoU|O;)>bJ7WVQVd^{VGv!%E
zlg8+T{pxqSq3HRe{kOD5F#ELu4X|S0u@o4WkcBX}>G1Vcd{i|qpe!|lr{mySyW%QM
z)oDpct+)ZE@6!toSw@(^R@rm*m4@=<UEyoI5~|528uJ4V@7t5V4%uIK42$*OPg__}
zylc`tu;~K(mfrjrNRGb&Ec!NPm8K`@UBZW8@utMd#<%)RYOCL9#MBv|qLuOORHPc+
zsbj@>mrC3ImWA5g0*7D7)I@n-^B2DOW&4#o>aX1+4_aTFcYSIa+$ZZqz>fHL3-?&?
z*GoXQ|9dnWfEQREu;sEi<Q3u}M3#|_Q8+ed`oL5gQAa`4y+dcB#<9V4P!9yBtHwnm
zK_)s7s0<AmIk^(jywpU;-gq5$z~8;$z15$No_c95;HW+`N5E{jHb)ihxB*2(p$T*h
zS(*jI)WWzdEUocjyS8*}H?9SGe^oFK!E)8^OGnyIujow492_ep`0gWo6}{o!M769(
zmt>s}aH2uUtYH@W->98P1s27P8wGG+_z151nZiPJzq+;^L<8Qtz{s<MWiRyI3;w$`
z8C|IsO7KJf=-6GK)O>10VeX5hIjVfgI2hi+77Rul*0>BD#5)Ic!*Uu~OI1}XI>T4D
zeU|~l&F)A{RP~dnoxKZvSzT;e0~%QZ`uXK@0trRl0~`%5l4WTa7Sffg2l(T<k6GRX
z>tVmTzOvW@|FB>~1L`Nd<#XtB-Gh+92)1{g-KXpC4n1Xb(>HS~UBY`w8{R*63KsWf
zGAw40pOGy<;rtwHIZmYL$U4?}42p<+E}|v}3dnFN%O&fDhMVW$(ToUl*<B#+RRQmu
zfvL3dIwqRoE!ggcsgc5{f&=x#o_+EZ<94o-^j?G%{5lkhK-EfZp!}NOyS~1#iBbRL
zOY!x+`{l)>nd?;{<9}R#tF}9(Vk#ioy_TJb1n{!C$@M{PZI+ST8u07TMc@*YRTm7|
zl|305jGaD*;M`Sz^F}f%yXH+o*^9?32hrs_kw<L97j1aT>=X9ZvEkj3_xC1qx79g?
z=l-8gVR<gnS8;*)&(2Q5pf1AU>KB%$?6lW`5|=^hD6Er+bsEw>4YMW%TtK-4{{Qze
zpoicQt+`hw*g`o!D76W7wU7U@vF7Ev8*2Z$%x2Iv&{`OtBtwtj^$<%Oa>zVu=ea;0
zCzo)O!e)&1dE!~6ygGb{y4dl$cV1CCpQbo>U`M&FZ^AH}H7##xHXJ$oli#fslc>*+
zbpD_Aljz3Rm|HtXWrClXd$_V2Szi`szZhQ=h8Oy0rW;DQGgwSDKF8hxo`=@pun4Uv
z#3ixTjujL<^vY5USuL@}%Kho!mwpXDQ$kBSfE-Yl`dD;Kfr@`~3%9FlJhmdaX|D-e
z!SklqBFeo@?mP8Ul5~=EX0yFx7?S`tw!Q3*=sPbNJ_N%n;{P@aYl%4EDs*%zd7OL7
z`8J)sVRisgR|I^`|6Tdla}SVH19f9&b4O=y?0AnE(HCZ-4zT2np9eD(rjUh@h3ScG
z8)Jt}nfRf@UY0Wm-|p(sj1YB26yiXNY&SBn|M{+9M~gr-&l&rlu2xi%amX0Pa+iOL
zWi-QxYCgXgp)x{Uh@3n;5M9sWOt66Z13w+o{B3cMWmNrUfG2ZlsRylPZDbqA4+O%%
zaS8dsIRcLTu|_OUPZ@C!Cb+*cbhrZ#U?Gjl*b6>0_R3rZpKXO&Fb_VrJ7c~>U>r{V
z0ef_FJMR)nU~J@hf)WrcmG<T1blAskJ(QO;4XM?SX;N*N#@52Cd01fKSW_~9FSB`)
zE5aVESp+Qa2XkZnjQ`OchJenPy|8&b=8pGrq$##44?(B`4oiF$No5K`;MzuH!X(j!
z_jl@wFf|82_vn6Pg;7>i3+It*73n77URP@w4EIfoW&p&z9J0jB`?e=%{Nd9<x%fsu
z&(`1K%lD&$rzWo$^-v6<`H>NFj{6B$j9x`E&vYD4z1%)Ie*9WCE^>f!$pIG`Vf=hw
zDalwvPxuqFD9en6c($L{9<>tu*xAqQ&-gQCF`3Ws5zOpRm`WR%Q**c<S^Y7%LpI0E
z;x(??kZsTA6~BEBL6jIEE>KyTzU@Q*p);Z#>Ga&Ma>4t?@<<3KBxL-|G9^+co@b=(
z?{bc(+rAom`K_RS(ePHaYxywwWyFoej;(DkxlLB|>wRUR1KVFpd){>LnwB+}8JE!P
zwbE5Ss1m|iBf%Z=xU3S_?jLn*?ah0aQE&mI$*(<vAgjAG4gsRvIT+Yufabei<pj)f
zWALwkDz8^L*B}4ql2csdl)bGTP*K$X@8Pc<`(+G01uBs7MQFjRCu=iLb=6@~WFJmb
zJ8VaTV!7#9bJ<m-9ZV&5Rpk+9FV8breCytUV7QuJl(t(-^sat)cuwHTKHSx||M&vv
z;~*3~vQ4=+aV0d_xB;O!K3SUVygx9>ahhQ(_gVSHemavS7_y*3J98QbXE)Z4q<zO3
zyT;?Aj8N|G?%YwpEx@DPz44BYDDOl(c>497Xsus+`x~7y(9XkDBq;dl_cBa*1PD9=
z=@D9_$)7swp(LuG&KNp&9_O9I;sQ34x~;ScM6@ROrl@w`OO!fz|40`8kYFz4#*{vf
zla>e+x$k6490rKoNf0>r>2#%p5+uE%?i$~;(_PMW8|$?n3g2iQm0FHOL^}V=)_#a1
z5X!>8M}@K~0{e^57v(6JRXw2u1(}`P&=R?MDt`@KAPAFua6hU^H?7&=-a%uZ`gOc<
z!=XATakeZ)19~UWGw*vejF(#Oh>fa>MnvOV3J$7woDvSLBC|^cFSc2mV}Q#Knly$~
z7QvlOHt0WU3RF~4iaIBX^&)%Vfstv-Q2Ijd{tDp~Xw~uLispmU;QjhzwFfP$(ev%S
z1E4*#ckj@3=lgcn)AfNo1c{Cz@*;IcaY!j}-%X4@skg~qA;AE0JYOoNhJ|T3aF`lf
zcHuN$GX`;Gw=3w2D7FV=QEJ;q^ds6)<5Akt{!!%-&2<EHNEjbK!H554tAu|kTj-4=
z9$sMIt2>B`dZyHJ<3N4Kb*+Vo-i>bSTI*VCqXK?_!@A9b^;KY1CwXGOYf?m~=MjzG
z1O<kX0uYv;26%isE=5cgAa-p;OqVy^CSL`#bfx$n)*p=>x`1AjhIfw8ZO`aU^Z~ie
zo92i0&d5m5C_9i^YHk@Y77Ej#V>w$XvweZMs8zDgXxK4wS1^eVPA;&b;2G@SV^{58
z(04cmHQqVnMV`FVF}f-9R*kwF%X&0}VHpX}V8|CkJUf7|1+qCH0{}i)L-j-cQVWf5
zAh~v&K;Bi~RqO&>bacB1Vz#Qucearooy|U|wFD_9zA7NIs7^MA$`m*Uwp{SM_ph(Q
zkbp-H6bne1?sqJ3LEZQoI!Gl8Y|x|G$<`}O^8o~~As`7!c6o(RZRp5KlM=6>@RzGL
zK?jdMmNj2YJL6nXuB9(HQ5t#KH|%mRxrGx`Q&WFXe{=y4`oa*hk*1fTk5oZl3}C<j
z6`QTKPj-g3o<0K{x>)?<wucvLQ(5W5=bB0MS>PeE!bu=Q_G@y-Q#@7xAR$4<-i5aZ
zLjSU9BUWYT4NP5Z7rT#bnvTb*0F|%q{!h-GvPs(*jjkYktPX;B(^t0dZjJhzY%BQ8
zBF4t2ZFhn)qE(~iYFe`YWy@}~1nVz$8vfy5w)}4s`=pzpN2W&s3wtRhb%Z(Bo6$3r
zbVt@xJujZ$Un@)`rfGdENxv5aqKauGkT8IkACIm{3LwofNm2lHr#*ezY4y<{DBh+;
z+14>=`oO}(fQ{E~3W6_QK0aB0LL!g!{fWk}md$iqz1}_y2A#+PY5v#ymM?=1&4pYo
za())PP)MHmemJJoJl{J%`OhTSUiAbLn*EFPRNDp2hKwh;;kN6%YhUG+R){{PI%Stf
z@X!>r*oZg!bj<e=R)PoN)xV8389y=hf-1L9TVtRqQsK_6q{-tL_1F?qvE0(h#ezJI
z*rHXRg0DQXk3X=?WSo+Wq=D}tVxQ7={HC)KyOB$pKenY#{=GVyMj0Hm$b2L{y*a&M
zyw%5CXkZC$xy~&ay^7n62O8|NaX8TM+zw9HUhLU44i_J>Z_N5{9F>Gw(X0Ef7Gk9O
zM*W!mMEZVb2U9@E%U_2+Yq%NqrjGLiTj)=}Xi$m$@~mtON-d~(YiZ~qG5n?RdO&uM
zmkw0BXmbW^hIJt6RtB|(719XwdI_Xz>U#7Vs8%MPH&N&$DuSjm0p8Wm)2!Mg4IR@l
zbjI?q&jdPq$G4Y61__r+;3NHS)uo&Gbj+w%N{YH#HK<AnHp^ZsygK7W^x)el_zv#t
zvgrb9(#x7^*d^V=KW=Pf3Pw+w>=|h0B$59!u++>b+M;a;mG!C*>n^E}DRwz-CPeP#
z^p%!)MW$_cUp=heN6mtJ2!hhr<fo^HnCJ-Ka8<&|knWYCy~?c>dVXu|Lw4%?ekrx%
z<R252p``7IPKls+OcR_Ph#G`}TT`O1tz{&<YZ_AS?tiCiO_G`o#LIoQ>iqJ~6Xz<x
zQ8G<)*0GVxNxcL^dUyDIC)T@00My}!2d$|Idj*F3Z}3&y-R_jO@H!7ofgD39{$y0%
zVa1;Pva3DM6#LaD+4cplji2@@k6Tyv$H?OHlG<<ga!+sUc@Fco+%t(PF&Mi+w~xUQ
z=GwYGf7w!kLJM9j{QTh?T?q$u`lD8W@VahLHtq>R`a+ktdu!+6x4WLJJy_iCdgqeY
z>kB(rFZO!q#K$M8-H6qpM<fqmlJ$X237M7mxd|v%iS3RvydC*`pM6m1<OLW6@+fRt
zzX?TwmDG~eZwGG{IbCjxboOo{<Bk3AbQZb5UPjyP=cyt_;a*FPDvNA}15u;aF@7Q3
zB6h+_)Tr62t&F+4KfY{-`+n(Ec5=yy+fOK7_+wjTiEBKYEVMLsD7Dz*41dA%SMTif
zc9Ft0`?>IFE0=JzccY^;JO4&Aqj^HNawDNN2Qz<0e_L`ddp|}+8g+=-?<1=RaUum}
zR7sy1d<bS(`$kKVbIXv{{7fvleCltA;BQKK&lWc^#h+NmmKOxE{G=VYB#h@xZfHC-
zRn^n-A+})nYIFVei3Nz0h-l@uo@|;jVY>O-rnn6RKheG2c~d)R=wa3nL3BZDRJPS<
zDg1QYo~x<C;-4=67{Dfnml{OK7SHjvUXhAP9G%)L?K)jwJB076G%tycE2hCWji0zA
z?8Rx67N~}A8YswImUfE_-!t1VqYzOUuECB|?&0JCVaGl~m9+gKBl^m~2**?<Z_U^0
zNiWMEvRN(FoZkdR%lw%KPR94|Eab1p9-zXQ6|{`ytJ!W|B$2ew86=q`*s)H62RKHW
z&DUPh!%<o|@6wK#j2d(@9wjEzoVVCNso@u(kV&<RZjwClj?(eH#q5jvSLF#(jVA>V
z08d$0J(1aO{<{AussY`osqq4~Bwe$#f9DQGG~u_hn_Co7UY!#aL!-JiZqlb}2CrS~
z)uCkDzOwQeGNfxs2zM()^?g4>SV0y1x4t>|hLn<Gnqr4>4I-3pBF}S?JU<%sZA)bf
z>!r2HXXUv}(|N$Y%%v%kvpf~`^eD~QCKQh=<NkG8H1ZC5*5-f7M^Ci0;v-bEHH;l{
zucv*E{bdZpf7z1%&Gk$7w&JQ0yS2_BE)*icq4&eRBU#VrPMf0tWWo4;T>@E~Kh|b^
zBiXBG8=Fj<T6FN%XtNQ#GIe95VyV~Bt54Aofqwn?Sz`Y1SNkR1as|DZdcmL76J^z2
zH6j{vT&L&uw3`{p*6l?!3zWA+(SBC6gL_m3*1^5)pHZ>5|6CWbx#p;Un_${<rzO;W
z{HSkVz)N@JFZ&mMIGeNEa@&4a_O{_qhwf<z4u!AM6jr7|25@i2bqbxGEaQ%*M+r{D
zIWf~a>MowXa`-&W_Js)mn@H~7fuAc{934_f1s-XxwFEAODzPJuU>I8bnd5Sp47sG0
zboZe&V+>Oq^40(<E&g~heDhEBisX?+Wv}nKe@s2uPcb|5ckpQaMcn18j~NZm1Gc)J
zOuD=Cu|vBeCuuxi3Wk2?MXW3;3%-S-Ax`!aZex+#xBAQXdfGQlNn^kF%_wxULhhW&
zccHm|*@zb*4oiR(#EuJcyu>qGa+YmVUpPJEBRR;~W$Awk*Q};pX&qQW+;l%)m1Y&n
zF5;c`IKwm-n}lkg(E@%fL|Kx%HT}=WZPHnd4|3Vj{?0#*o~|mhlDAwZl80W4!h`FU
z$H|X%mi3c$_8R^c6$`&#B=QgJ4^N+|U`N&@KK-4SywNk)2$a7m2lbClwx0sSc`f5L
zX;67D#pH|reRYV2^P$qT^H;Nb3ZDplKOL6tWZo>diVQ7>PM-EUOnepD9n1f;z?B;u
zxc?h7c%C1fmK-X7+8ZSjF*ZX*%m|9*MWB>wGkFU<M>6r{duTt)79pJ%biI&Rkxm~+
zV&}(L5juuYeeXG;(t7*EBacpytgdmAMw?_U+ud1`sPkxN{pX#ded6h-&RC929!^cI
zejzGBr43ic{w?p_$O(kag?z6c3L?Wsw#3l-%BTe1eW`nFhEtVeJQUhfh7_jJ8}!>O
zTE)?Fv0imXGhb@HQS6gYow(ItD_0lm**tBzmqAM9+X(!oqvLL3%7`@$ur`!Nk}6^f
zTm7VLtOC0v)vuUCg%mkNE~K(f5D&~6iUz-U^`zZtV8&9p+a<WXc(s6;*qm6rA7P)c
zYQ)*A5Bl>21iXdKov8wt>dy6GW!*8OpA?r2MR5P;#;J~V_gbR8>;~D(>d{MI8%$Li
z{e1yXMf+x%9O8#cAc&RvOJ=_aC1G#Euc9#cw+<aC%sc0Up|<QECvw~6QFon`lx*IB
zfN={y#-&<USGzb-7bZ6UAnD}iFN+{t2nELtFH2znk(ZouP(i_Qn=)XMnw4QL{oLRl
z+5X1ue${O|io+iu5))6f3-P2XOlbMD^64JU4Byiucsi!43XhXuajvMA8mYY6QIT4N
zeQVS9p(<ummG!uxB6CYh6V0usXhhRf&JDj`LyWRoy*QOSQbtaPT4Z|o-0!cp2hPa?
z6Yn39!jfI5DfTE7WBVg`VsJc}&b^wpAA&YDx1jI<4R|68VQyH$>-<lV9j{_{-nsO@
zNX~bM`;sQ-z$Q(D0>fL%cZe3vT&g+ZGh+LRv^L_lZhug+H97k76aGHKWQVO(!twaW
zf5+i6Y0T&v6Dc6AKmorj(*@f>8k2>zS8!rIKBW&qKn=$lzEsk~^E)89Cb4eclycG{
z>X~F~1hK7+9)=+gYISaZ?0Np-P(aG=*&3YUm51vW+BAZ^Sua!3SciNchzX?ofmpvT
zxgC#EwqApu1pQJl9s;U;4W6*WyTHH^F3+2Can+La&oyv}Ke3k04!QQ{^Zzi;(-4#1
zrF3TuaU@=k#>Zy>bFP5j7K4v-i0DmG=@AZgy6!W}M*cLU`6>;u8`wWrc9wCUC6P(6
zq&2}snMOBRXhSD+dCQ6Yv5_GvMg;cLW$tVK*T3)55VWA@Ku9~Dx1A<eZre}%{ru{F
z*~<y*Bpscn<@)&h#{5xG^bk^F+vru@03r#bv1eF7y>{(6D^g{USq0&wjUD@vNUY0G
z+@IJNSWp@BT`528<6CsCDp!9C^%||e3x?iBad-FAx@22DM6O!uH;&}xq)erO(k#sQ
zl(q2b_-If-;acde>yX{a%mD+}^LHP}CJu-u+htL(Ql;0>WiA!<LtR%hBk8O!C4yfw
z%gUy;A+d5rhNG=fvrRf$32^~uRpo<j5**Q~ol!ii_V7f-6t`q!u>(jQOQ4L+uV@v{
z{+Yu31WHF~AZWkOlESQRoy)k{LC2pXuj|RZ$W*u1>Psk=i%*i=#p`nOr?*{qBQ`%%
zt@ib`z4xIb?URh4^s3$f<w))ai-^*o;^|)S6%Fh4B-1uMOM#_kSx_B8O8qioU%xIR
zY!#$&1@)v=<x}URyG>eSMbSN#XG;2fF8fMUUeS4irFxeRXwT4OSw;XH=+XkU2A@rW
zZ>&wF#@Qft&CC5WVFtd_Jn`k*AUyKye1OpUnf>%_uY)xCCln2x<j;sLWL7QIw8F3U
z?h&c!K_#LHmcX~7b#?m>xPx?jP?+)AojXS`KoxP4(JV{sCO=*aJSW``y67g4%!a$b
zEt~UK*Tg}Nn?Vm>Mo9<MCUV05k)<T@;y_3mPudL2TWv53$)e@j8gWISnSxAEgaKcs
z-<lc2*v?!N`?ff^L5`66^G#`sRu->hN3r^iN?d2>m)FTIVQ!a1B^5=K)x^#^6uoZg
z=Edz4wCf-xSL@bftPPs<CgP(w4==CN^oqGny-VfdWMwCxf)H4xiWOh%SKK3@w^Yn$
z6A}9viqz^=ML^wSm3?8CJx4YEWh)?c<rJS@D73+(%t!bgB%|`;J9@i=7{)#HDAk>d
z{PDd>QqEVIgh6alkOD0Tkvm2@k?c({>Dj!am~D%$=00cp()~j{i>6SMKs#@_GnZ~A
zHdpi!Z8w+Ie}H~yt=S4TQ&c24f*J-etNM5s0)O^q&%ATV#sX>J?a&LaVh9N7y3fmS
z^%c&e!pUF1`e7^~&=V!x?DCcu0k(g1`SNkqn}%4x<BGBNASW8Ul|gDhn*#j!*%rx}
zTr;_T;a?#bJ<70w#goFCAU~1zVd*n?gOvkue6}3{cXVZsKVP$b{VAod_(WW9X4Q6q
z+LWqufqJQt8miwEq{B|&?{^!C7NKXB$g<x}a$xwi7LZ+NZ=$1FD8;&`WWX-K1n?<J
z0~PeKB7@p7)l#|slFAzr#BFX%)Fm7{qbtE14|sl1qKKOLT(9n0bdnL<0qm8>4k%6j
zU%qWx)JTv<T37zEbo!y~PViKRO!5r4fQw>@G@~o!KniQwyGKG&_3;)^lwh`(h^h3c
z8!uL)pcdVTT)KduR{yR$qEj<VC3DHSLG3|!{V+)61?fQpjx*%|qsV7~kCM}792j8B
z#AZ46zD=wg=!CT-lyXVK)a_+R`=HQtqX-?NIQov~q<0SIbDT`@NQ$BCs>v?_%VxNY
zmlD!!xcC>ud}=ec$xWbGIsgK0*<Vmm*<%o-k^hg8Vqn>-ljz<gi_W2Ix9qRuS4jsd
z42^?VJ3L+ZP(|5k5C!W2TxK`;*1Gl}iomI&6Qx>uUgkCP0UarbAFYbt*Fo07J27!H
ztT)Jrtt&!NUyqK(g1LkouQPF=01>}B*&=~L+m0rj$WwN~vzoliB-b!xM;s0&qtb3<
z$+T8UlBj#NLSSbYe4rLN2Aq8`J0o7d1e3)3Yk|v7a}0K*eNO0CuFrUIzHnE+$*(LG
zAIdYg)Qkdk_M8VoOa0nAjbI|`aR)rHOiZnj&1#FNMqx_4kbm8Cdu~%N(Ln{l6CFRi
z@ehjbf&BdO3i>rG1L)EEc41}k(t#W>R?;@d<J}1yNRXYJE2ZhdbMPp}rE5tD@rtyT
zLgJ?Pz~5N|mx=u_*sv3M=e*qsq{4B^IVA|O!=4#L?a9&&5K1&4B#yRkfHavD(p;7}
zKoQK|;ha|n)rznn+1iKqI?}X0H)7|JMz<Q6h69y|9r0C%9%VgCIU#@ZRI2)gUn4uN
zP%hJH(>ln>g0$Zt^HAX>5>*`t0<1W77Nq!1*9h+GdB>nJ@{|0;zM`(i2_lAc6hxf^
z`?8vMXDW84tD^dmwIb^=V{UsBz{@CLIb87HbOr}IQqw(yKB#o6`l5gXV=xPkvF0h>
zO-`cEh9Kf2IJ(}QG7Fo!PCq(12Z9x_PXha!6lS7$vLt4_^H}99jm=A;Cb;;?i4xpJ
zHDviny0+i0Dfbb(A`CkZm-HsEmwtHgO*ae6->^Qw-@yD;&|lTtDT#m?Moe+dtSx2F
zUbdEo*fn!PJehg%oxP6U%P8*>fg<!Q{113cgdC+VR$w(@%kC#Fh$X%Tmm^IXl3XD`
zSAW9~q;|E=jP!lq1SdGr4&b;L$x_-j5l~=_njrz&#opQ0^FmSXYqdMTVfZ-7CCunb
zcAua8=#2f)lDkuZ2XA8sm<8nEWw2RQ`XWT1PFn&;04Q&%!c!*cfZe++2A&-iMdvC(
z5D_V6V&&SfMj)h}R}p+OBpMUs))*=bW3~rcHprA^)M^f<2?iA9JUl@NI}3-QcK)%3
z!5oC3P-o1N03ExF2z~Vq9Cr*TYP^mmVy)Y*B^b;6xYI>BMqY)M!(-qKI1CKR^kYc!
z_=OUhYG9z8eS)z;D>#DfTfry8NjqS4J2OM8f{DzviqzG%V;uk$$n)6|Or9McW^(KT
z<X%9}B{ONNhsx6oAP5r7*kFdVOZ>(#{68?ou6@pGEvt?NMe#7;I$*AX{UBe`2+^6k
zX|>r~PYWPeatN*QHynzBT<lVldLRu6ABf1x$Yi3^jLv>$4Nz!E@dFu>J!dRK@@1l2
z?>B-L9}ZlJX8cKKa*0I$ICHF+@NRlUnfQ3v0SD`V3KyQ$_*S$-$7UXz(9in#$2(ft
z<+2X|tIVB|^<)-l3RKEvyO~F#vpa-uBmFY)D@UlT6c!z4gl1yM^l<!rP*K#=&#p*a
z(N&$n;9=@%bNDEe1F*>f?3)fSBFZ);#%&R<ptxoS)HF)jSQ|4Pf>?mFGj<~_1>Yia
zg)_+Q`ipj#%!>-!gTRsfA9N3<p%DN-0LFZ&WyVOIA;_%VrS^h)t7Rs=jqYMNJiO23
zMfGNxH0KCV{ZW_(a$_rLs@t^{97Qa;cY!KMnb(1(i!R*Nq0ig5+ioMW)`19`a5A*P
z$t*2MYKhD<xl3lEU%*1N$Q_vjpcgh1NF3BH|7C+?)}lnB<k0}#BLjBTT!~wJcuD?z
zTM4gOeoSp2_{f36K@vS;iw<BDh`K|WhUo~0%Lg1_8GCn0Q^|;RaP=Zg@n=1n6vBOb
z=<e3T``HEnvDiR55<sojG6Mc(<1ItfW#Dlt47lWO5dh{Fp)vHVSV1TPieTv;cG73S
zfC#`8pjMZf5jg4SHkCQ_4E)dI1H%YS#jHw$8O9fL3854vebHhSO%5;@8Fk&mFTb)E
z7?NIeQcFqR4r0ffaJGHTZ50VXf4eb!$j5RoXMTu1Q-8K89aJos30faXo5$f%@RVrs
zj*VKB8hsuaCEgk({%#sH^=2>AdjSfS+3Es7z?|%i15W^*XaE^MSFo~}#h)PC3Y5HV
zm0FD5%epZg21R`u#o^!rC~CXhH@$hYHwkBX&q$=skd8QK!1SL2EEEwST7gHO-*RwP
z-YpBH=_6Tf;GFJ!&vh?U?Aduv8s^~XLDe!)TKWu7fc7J2P^gF(gkN0-n3#ybZX8V^
z`N>D3+{pwV$UF`(vV@b4+}D<x4X`udR9R{c1tLRpwjSJS=$JX;rtcU7%BZu)lu^fw
zQEcE3cy;_&SV&G*Q^Umc%2ju_fSkv%txQ(!FV-lIW7ep=oa|KISO}DpJ$HRn{o0PA
zAs$YO!mhg4c@xlAi+Ou3PG-wGLQDa0CG&~NWzBHneob7Do-MJ*+QvX{EL-9tO%;RL
z>ELkvSvKmPZRlp>O`<9xe*WX`d38Mf#o*V0A$y119#-<zOsJt<(MgH^(XW^2&Q?~o
zK~zN*`Ha-}OMYLS29V`Xd{ZrIx|wd6##s^6NmZvY3yY4{^aq`T4yY&E6qoHgDiOSZ
z4d|O_Oq2+(LQFRjo*jC85^&Irtaa!*B_5!08#R;5;S@EM6}H17JT^OECKqB)@OgRB
z({28|4s$(vd>9zxnipkd!pOxY-?(v|Dp%qY8=G+v6k^|rC`8)sl|5Tfbqdv}d83vq
zq?a0-B((f5TOfhy?)MFW)^?8Twg`CINnuSi+H&(0btQ_j$C%)ClsS3(wHzIBVmb1+
z6Q1g0rKDoUh;nY8%pgR*Pj?bSvr>=e%@wG)P5Cw9w`oM7R?S(>DT;+9`}CndfZYZ5
z>$Zd4H5(`|Qo_jxflA5ZWbF;Fs&8c1)OsfnJDR0<lP;l5xuASq!RAUCq*Q@{wXW@S
zrYdQYQ&Ac5kDHqtiFU{L1K*n1QTwV#XaBjg`eN6f#%`YzswMXPjwtNkxvQ_=`Mn~1
zeDQ%OA97Hn-(6G$FRJh^xX!0B33|snH+9gVU!EJf63lwv&`^RuQ*ud1^CHDhvm%+M
zWYzAYdlI0d>@|gOR}?!tR}yA5VGwD}HJ;R-bzrxSYi6+}f7Z(7=2G9x=>Bn!rm*Fj
z8kX8)bwv*;*-zJ(9Tm4a=7w?ejDq~v>EL$R^*|9Qw28am=40Lx!dD$#X>GS>A=;m?
zi=7U>E)ayQjfJRGN}-h96|b5aQV?ER!DCb6p;XG?@E}c55}`@VBk)T<6iugF>8Oio
zXa>GQd0et`?ril8UP^+(q9tvvT&=qJ%^@8>I4H_rQxnhC0;*akD{>|7FeGXL#k&63
z^gh$ah>al|?^l<XH!p8geZiOjf5N_OaoEx+xl99smBJd_b#OqrCqa0!-a1NN?J;CW
z|ExW%_0lq(!8CvkV`bsr8q2ubnoVgNFy>W*v~}QDYkI7Q?Ra@13Z2?75fH!jgz_hz
z1`TT2JxPH^vTi>8y%q@DJdsq3aoRiUP7g`Z*Kb44jazr-=1Du^Q>{}*C4{(bKe^$)
zI$S+{%MUT_W~wLIl%(Sk=rFXPjri+fuLM`7zV<JFOYx;evdCP|lDxx-LR{1>Zz6vg
zXLrh8%wEfDS6};}-4%OyU7YCJ*ls_Hil`xtl&Y#u%R5|E6bdxJXhA1wABDT*?40$U
z;e*mDD^)SMxg{1~ojM;AN4>3Pg|Z9BiEWE04xdD#Xilw$<ClzF2}jU)*OTE{B>rNM
zLvgO@^0R7LuNrFST;gD>_qbR>t!9m*-&m@9M1WJPmBoRR$?AAKCqz1~=fd0BSNGrK
zyCtMRt`_)wm5Yh}BgD6r(F>?VZ9Q{E6s>bS;C5{4V+=K<e1W5*=1UebCF_MgU}BI>
zf^bhNZsurzcFjO+T@t@>UHv*ZA|_t3q|?n50j*RLCwrsIEX5tyaq3?-zQeIPs-GXR
zJMhz4In{Is1S;Hsc0fTc*Z&lMk)3T$WN+=82^5yduT9Mq;l!S{V|scM#80-f!V={~
zq5em0ZI+^vuV>tSvh!{9A(!j|&Y!tAQ8<$GCZWJtODtKkjney|zMc`PDBlW=kf%`G
zBvqH`XY2(9<Fy$BkUW)>N<YG>FMRJ`_P|{sU66>~rs%c8Ed2cgBMx7w(k?ua6tLOH
zwyMnPPE<6qRxW7j|LHoDgz_#5tLsvG)u<}eqeS3!b`co4BUV0j{is}4E4N>gVf$w0
z%dj+8oj>QD6OAa%!)KR>n<BS{eJTBKg-@I|8&u{yQD4+){`-w@3W*8BUiez8^tm^F
zP+iY9NeF~Lzx-V(raSg+YQ|Sba<{dcJMK#MWv(PEJBzl?$79)UZhjS7&?>8d*Ok`e
zNxUk_$*n~!bgN2En9Jue8P6{yD;D?CiK3h4&Q@y*@$q>e1mU7%W)S3Cs=2wW5^hfR
zj7!X7{l$%IiqYzu?q2;;{W>VLlz>=yxrT<RTa6?jDA7Q&#h%H(T!KzXv3OR3K=5at
zD7Bl_a<OpDt`N7@LvzUGiRM_ex{;QOk@9V<Xj^Pgyo+P`nYsLhkJ%Y`yK<8pEvrjP
z1<oUE&))d)7fnGP_)-8RlTgZq5(|Xt<Wi%PlasBT^>2!*SF(7LTbazFIf7^cSxHUM
zpW1~W0(!%%l;O+7ZblZ{Hw1$?kmc;?*?#sURz{@T`cLze*lmoC_jjd8^LRwPHzCsL
zQotB5-oZsEG37E{$H9pg;iZ(9X-gaof1mRCt%crPlkHt)*5ya#^$n+TQ`?8{6T2NG
zIiiFxo+19Wck}*Xn4!*1TXnImUu^HtMRS=^Iosw2eg0vjJ_aYD7+MmM#Ovp$idWRS
zmg0OzTA!0sO4P0K@ic1(iPT2cF$=1`%#gd@K2SN?iSoh+l(VomON6^a@hD2@k1gtE
zLkzl6k=RKO9h?kN70E5(<UWIdE_vO|G%?P`u9Pjgdvs(5_CHXo>Gmq&k>=(LCigU5
z<?N2TgpvnvT`9C%eXNCSjU&RdQ(LJ0Yp)Gaq~8|f!JD0*ks3$A`SkhTGHol*?Xi^Z
zwn&)EUm3gN#*f#2H!cL&$F532vhfx#5S)lK&1po!v($UE7?fL0`f3H+D$+<0vNj+X
z-}P*XI&P4BvqBPm(z}dJKrn`}N<(rc{7l-Ab|@>+3Z)^paSuF}hd-TFEKyKMo?IwB
zy0q3~ZEaDP25cIcwb)wIASaZ1Qtu+)iAMiEM)?Z~zvoJJp>4J)DLG%C%H@IdDL0>Y
zt|Uam@zP~qX~5eE20x>tEA=MbYdXn>OZ3BKtn-lknc0suicp!lhh8=2tqIe;>892Q
z1XOJxP|nS*w(x#F>9Rf_dt(4(6&C@MoFl-wiXW?e6IzzBZu25|X}9z0#xwMc*y8wW
zx=!+Awup}p$p6_LcA-6;Xqm|K`9p2E<NcQ>Ty3dnNJ>Y7XAG|dAOiETa(BaBIAvx!
z)J}VSIX9^0gOyDuxF}z6t)HW}2}^yJ@1$PCA(8fFaaa<PO-%j!L>!%ZjgPOJgKMPd
z<vj<pGlh<jyW8Cpa=7abSI>6)XrskaPozCxzWBf(mT89aekq{Yrs1giwWDzLK`u&O
zQA_e(fs17lE)<8xhoZCW*}}<sc7XuWx<8riZ%II*c_=u6s~n0~TWZQi{d6Z9h|&Dt
zpGLZ-WqXwt8Zb3E2A!N>CvweD2*8AvovNtE&fu&6`XALlTIF+72c&apdi2W5A=7NY
z7nPXNxkP$^^pwx^R#Xyo>MvJiT(K0kxji~0p1J#*!g{uuS&&{~wxX7U!?4b|(;0M<
zx)@Qy<v+@reW^lR2X2%xQvVruH>PLNg_n?Q2KPB}o0D2{7{6I5ZoN>LBy)~QK+O@b
z&9G0)8{ZJ$6hWeH-=!pH1|L)cXJ`HN(B?~!jiX@HJ|iFz`bybt-JwFZXY!o@RSG)6
zt)@mo^=n^Ew;N8x@yau+)x?6=I{iEfBDq55oScxS;nR3?K0e?Xfgu*9DbWHY<<4@6
z7`wmT`iZ}6%l{_fSl<)hT)Je=g-}geXk?Brb3?7crq|EKOLLxxnOOc=t2zDZ$<;IY
znR=AmPTk=CB|mq9x;muEh>yTmLZs&{ZclqMqvR+^0RaIU#JZp=z#)wW_cg?%c*#o&
zpzazTgykS;C}#PaHyV!CfNo3nu}JsDwy%LFpStJc<D|}BL?K_*lGkVw76}PNQb+og
zCQ--oG}MbrcFMJ6l!v*T$svQAn<sO0Ot#0}eNK9Sr;-Q`Ib(?$WC+g3%B!Z0^;q+f
zT8|Z4NW*c+t|;5h-J>X7{?qLOxzjP7yFndu%(>NDtXoVbK6fSmfpoKVXMi40Y-?*z
zKWa5u5}o1|$U4(J<<bLqyOfgL9y>b83H7t*@UzFU6p4-!FsPCeBHy2;xZY%MfVv84
zKV~ZproDUV?vA@I_V;jr3IyYxn;Y=^Ur^z>@lS3^Z4Q9{M1J9{T)U74N$PoUPZp1L
z;4?r>I4t}DaBe+l9a=wuzbdbj(tGP*1u}r>1;&GBRPkjg%H`9KS!qIxBm>92<6W}Y
z5A-<?8Awyd*4=aNT*^IbZEfYJl$$1?k;*HVVKQ15-uU5?l^61lvu6s2A;ioH)q1&H
z5ouWprPU*ZnvS=q3{_NA5iRE9(;81OiRr;gai8;T)d}I!@PCPT?>}}s!OFUmn=>Sp
z#Gho&$#Z7<>TN&+^G@_?Fc1Z|&4&k3+^pWU-d+}~30b!od8_z5x!P)Br%l>0f&&DC
zdFezwnjVDMAJ{VupDhV%5#gD8I_8d+)B;gi_#{F9{>4(tq3gE7;b_#Y=o`@^Bc|Cs
z?rsdTJI@i%(xLYi&!s)bi7Jc7T3g4zR_FF3J5wy=!zCmnAkd}Y?ukAdPCi8W6Ej?0
z%&eBj2Pm(U>euDq%cYkkBo*^*5Ev`-?sP~B|L4WFe)X6WxmSao(mOrk#<0QC5{o_>
zmXFqY2jcv}*e^x8tR?<HgZd9?fQM(|2e&E3bY3U`ABf|!&_B^82A@O(x18Si=pR2M
zW%&(KLte3m{nOHc&wA9IB$9Ol0Qro)vm{%G%8Np^dzJkiScx&6uSY`eAd=HnPFdNg
zh!!yd&3aQ`LhufH3^yHjW;$s8=KO$2=#;l|kmM~+A9W+aB%6eK+!K>yt3KToW=G&j
zwN#Ro7MQBuO*^$|bG_n}yGy)X-C)FCdD>K3*^QR7i-tQG(i+P@a<axB&KALw*I7kP
z_Jl~tYDgd!ue*pR=BF~8#She)orR|&2cX4As4Wu>#7d<>eZSD_S4Rz&FRxb2wS1j=
z9WR$l>0xqRk>GO;B(olE%1l75&u6y*X0qR}s!d5dQ)+rnS}|i2<G$*QkuE<tpL7z4
zS9y~(eo}xv=XXA~u@I!Hr#K?tS>;y{<6hIIGv?KGz3F!)5v7-YwQ1$SmhC%6khLA7
z<%B(Qb$3WuSK2HXb}b_?0^R!M*|W693q<KN7L!8!T_W)vx1$FP8<Kb$>9KY+(2eRw
zwBi`r+;Uvc;kwjoJa~ZA*-ELil0b;(gILyvEAzLKe&q(eyUW6mTpKHiajE*DrLPuv
zZh;H!)4unevabL#PCiPSHjudulKbr}V9ork+~JO<H*f%@p9_&b82)c?ESh@YVx-IV
zY&cn=10Z((UJC1q?O82TMq!$M2wCX)SKX+NZEaSm)c?)1O-{++;#WR|mu3z`tItv{
z*BrBlS83#nZeIBb5NhO+na$7lKELE|d3mPRV_@YZ1^V0lG4!<yu?&>gI}4&`K)r&M
zS9!S*^-`_G1Z&avmI>>{-)Hc*{1Sm#HV0`2%tW3OAT>bX?XNdoGUMQ5>+Q<di;rib
z3xKJ@joG6%xx&frE7LAgTN{iueWV~;x4u5#afWeKvfw&?)~;`8m1~GCBW9Dl7tknp
zQ~dkh-}FzlW0KsgfV*9>RzX9H*ElYd#W#c1N&C57I`+%0TcvdN{8F0_U-xori5f{4
zbWeY)JPE<`!o(0br{2r$Z%j<G@lYtIc<{okjZ%_$A~?K?PMOJx2(?OOs*>6)3KcI0
z-Os<3or;K1Q_44C?4ai6a5&UjFxF;pn+#%s;~WtQ6_j*H)<b66bAsc5Ghr5O>~}b7
zVr4=EjV-{%0Xr+sLTEXxyNh&J=t0?dfjXr`KMTE4Tz19d{k>(p+qPPNm0U~Xr>@<o
zQPi`qU(%178t^5*7h$d5lWtTtI7l`LRMUmn7iyxMj+|;M_o@y=_>P+Y3rXrt9eBBc
z@YAn5>5k@Ze1zn^gttKofboL~@UbVP&oM*J=bW<u=U8Kc<0uOP6&Y-^e$;s`?TyRx
zKNCKYSUiHo+S*hqQvHvTm)21(Bd@{<I-{Tq5b(gYG9t)xv(}qu&+6X>x#s^FH-!Mb
zq4yQ(b#`WJDoe>E`GJcHd8$dVexs8oZ)Xv|oTfPw$AYny)z8n}bJBgg*mrM0&yiVq
z9T)ui&V#Cudo@}%4(Q9N8i8Fa!<dZ0h2;mBb7_ilmh4@PXb4fl5tV@gY7fr7>{LCI
zR$QJZjNe8sPuWvqCOLr3iuEXC9Wf?<a_aZaWX}=Vxpf~O9L@(7)EazHU<@{(Yu&WQ
zp(G>Xaf}%yrWK>AMC)mJVrQS6y!LS-OFH$o_?4N;)<YFb!#8(^s_%+FKe)pac;Tm4
z!1CB$rRmfCZShx)e#tSj7e*$QGmf6HwTvIs*Hfi+yAb;4JiC)IE`kDuI(_diH7{rN
z3@mE2EZqi8jHQu(Nlp;XtJ?VQ1`qZ_ZnF@?InkR=^$NnN*0PE5>~kfjJKz8Pdw?Du
zcrN8<U+AbRj;7-z)4aJNAZxv>-W}wthVr*cr7q**eA@lT>eR|YX0ZV%mb;T&c8Uej
zKSfunzMkHbMgH8yZr}w~%My5%XD4X$G*5Z<uF}$5-JiCawZppDyMnvH>eb8KExStO
zpLHu33C{#V0p_J|62f@~4<^vLdQ`4B^I*}$8gCwi^`-x)t$kmU=RT)H_ruA_<#yww
z2ZS^3d7b4=GGlOxCCajTytH3JMnuzsb)FHW|A;cc@~6iMCK6Bt$ugeABC`6u=<H>%
z2L}{l;`mpMAjHcvQZV2+D#dbhb9O|jS^PE(VUG36)bQ(WnFPI96tS+YzNx$Pv?N`{
zBk+$U(b9qTvS@+x@>}iU9b@5y^?f~q_gr;VL>d43O<z5aj^<;<k&<%8)On+uk0z^X
z=ms>pURdp6-9{&XwExQ{j_uxihgL>S7k9k!J)QfEUfU>t3UEFG`gK34)+$fOcS<6P
zb!n$P&Z#Cv*sifyy}bkKMop<vmd%hR49KPOJOpHoO85wUFOW@zyqV#%X>_#Ey6_%m
zMBp&gfE5~#={ksY3XgS6RbKmVN5UV9n(6n<!s8d*0w)&X1VNAc0UZ61Te=<`S1Vq+
z43+bI`J}nUCp;RS5U;*qJf2lQ=G&8I6QR}CrHs61;D;zcCukqUKidxp*$kcpE>13X
zQ`(?YL{h}ditxuxoA<YXXM4tlLqE+cRRbw;K?nnV1{Xy(A+@!&X>GJhK!aRKj|0`$
zU&B_RNYD0=K)4tP_N6B9I*dw=?))Xtg|9IxR38-#na)`ed89>_GJlh1EsAQ?JbcWE
z4yf?FqKelFv$*Y4Y*^t!Gy4(c)nLyic&pXN(m-wGrSD5ytw5>I?(Yn}Q~7+8R8?6t
z=|{DBww|?Z^urd(W&S)w;$i$q*WuK1+k*SONHJR{Bzqh;RRVNab!j_w^s7K=MDf&=
z1dy@3gDH_%$8z%G@)*6Wfi!Ip=!Q*x)?75~g6u%L6a&k2P^*s>&K%&Q{Aq}9AYz~X
zH3uEOce<6gWC^8~5m_TM!V6iZ@rUt0V;AJq2&OfD%524M%STn^#&3^)z{g2n-{54*
z8Lm&l%#@L5xRMP0*|u5)jNiWhnV{23AKzd%6w6f&QH8$s_}qo?|56FlIW4TbeT%U<
zkyw(p#L@S3{d`Zun~=NaNmkZe2nWxk36#f!^LgibM?}M%vb(*^#2&fKpX9X=6p4@|
zNUr*zlh9c<U#(lzZ!-y?3QJVTpF!*~+(>yBX#TGf63XVXW}ghrt_81#1wu<%rVA|}
zl%F+6evL3Vu@G~ZHE2G@yJ)}I?a3Qjd}pw)uu;%|e`*QyiGyCPQcHc3nUQ1E+A7@9
zbML!B<yys9X`KI)pKK7D>g8xn(19yF`I?Hs_;*xfLiO%;cG9m8glxF)1-z2i+>IXQ
z+dq96hhF};Ma`R1nBu&1?<%6+^LIxoqmzqQHR%(vqaZZH)9IyGqZCov?6(YE<G3AQ
z@~6SN@U@YjyGyMnfi`DMW>gLKf2c9@Rs_+}+~0(PQN2ziD%!f1z)I#)v}dnfq;By(
zX*(MNdQI{z;Lmxs1RM8Hs@b>qXrn)0;X{Z%6r^vBrj015s>Cohavn{Ulbgb$o`kh;
z{Z<qA9Q(6CLR4hK`a!x|&|!1~I=ITe<5{zWm46bh{$A$*zfkv(PZzv~x6sS<-1Lv6
zpN&c8a%~SCU{@8jP#L~j%YVJQzPY0wk3<?F1|T~|Z|gqnG0PIZ{h*+W7%=wP5<JS6
za)oK0!s{N-&FNiokDyZhGJ*ZaVj@tYnAo2U8>CYoEV5)KpM5gCwTsX4vJ6JqM`-T_
ziYmnjOT2$Ldg6Q9wnEqQ<t-tEb$Isn1FuAPG4+Lz+q0jN)hF2$r%hX3{%eTP@$(;l
zu{f~#`}yS64;L+)PfyHiR{f%WY*fA1bVAOQz0Nb8seG==SKD()rH6%1PVQhbebC9U
z`A~81hS{wd02GL&gwB<ec;{&i4)z<=14>ZyWC3~@?#S8Dvg*jd(bzWX#UZ0+%i)iw
zZEV|}=hGX-nNr?wTm7W{B>cap(0D(|Z@F|vDOTTOyFKyqpTgXaQ6JFz9*6Z^*Ia+J
zEOzPG&J5Bf9+d)WWd2gqCdJ$D{ix>&7QwL`=lYtwQh~*h)OKWjuaz^C>yVr29Ygb?
zxk15{8;6T<k;M7<L`bT{t+qhFPEK*jPH_lkAJ<bsJ<FCzlaeJrZ4a9<GJWnie-W{t
zsL5Zz-%v#kD5JzKWL=FtOni@D?s`Foq)nQinVjLb`P_4QsyoK@W^zhtxcXgnO5Reg
z+4him-d8*7yTJ(cV7IP@{h2TOy!SrHb-L%8#(<0<MsHybH#%G!JO|bFeszt;)|Jh&
z=fUGZzQf1I$D06aR<>r95F|_~*g_l>B)E=iVcx&Ypm)I=T$ZaPqJ@s2s!APPFBg0+
zxWzXy+6sRx;5IwlYN!LiB)hzfrRB&~O3ng<ePL2~DL-}j*7@{BYvW3(L6_xq%h*gc
zy!V)2l6j(-kYjSvz4cVl$~T?$ncjqxEpm(^6?FuQ1!7n5Gr9eWz`4q!qK8ZJmrhRY
zNA&}Yv7$}kMY~HMCdSZuby?vfUF>gowgp}u;_e-wn54suh9%w&N|@WfZ0`H&Kb67@
z_EkQ!A0B&<Ambc4P$RAI`2l<ZP%?7og`E8n_w&!``+c6L=l^<np;E%JT<#RFjub!0
zvq^e&)~Da90fqeIxq~}Z<@z755KW7wP1R<osL}iBJ<~x1_Us^hq_F0nN%ch1v_;b0
zx!kmC#gm(>{BkC(5C3Hg7;Xr~U)Jnsk%H2v&pw*~J?RHoFVt;$p3Cg<9-h=KcQ?j>
zTKDXa<y$M{vlk}>Z5dh*5T5l-?jAIyTDiP)uf1u1d){@D%i%REsmc`bq?k#t_yaL@
z6yj>0M5kst4bge73L9(~x{o#R!<BrCi3B+kkNb%Tvp9%^kgSf>^A0|=^lE21;N{p5
zGwh0LB1$hc%Pc5#l{PG(@rOC~SE34yM_p$2g^rlf?va{MvboUYKd}o*Z=zh*p{v}l
zxH&mE@3?nfE~)aBeD~ja&yZ7^?ax5TvLnSKP71^H15#Oq<PLBTr;h{{dH3F~+3xIg
z=Sem7>-bVb$36_i@yM-v=cTDVRa<JfCwAt_W9sZe$m)0X32fwZbyxkt+s)Vujk#zS
zeXYqgXqw4PW6P6Gfnuz)Vfg;!KV;4C8itf`wTWI+n~yb2z}$WIls{JLPN$<)5dgI~
zP5-!SuF!5NmV9z1gGBeH<7oQM$<PL<9y3qgC(pT>?>}d<vvX={8q?fU)bFXN$Ze+o
zT15nLcqCRlq$2f4SJaEoyll}0ElO0ZbxZS^H~5Ck9htcqy_M32ZiS`8XV+Akq8s*Q
zN;`9!kDBS&wlAa%;skLbWBg1&3g9r+k>IZoK(z$|8q@!1hxk57zi>u=E*6Hi(~c=*
zl4z}R6r4`8W^d;c+al>T2WXl_X``@Epfn8KbG)Sh`zvVP;sXj}>+^&ga%4RIlW&IL
zX>9Fj|Kw5HuHmj*&i)bZ`Pdv8-3SYUy<Hq26O5|XMD7Om;cdJNJI~E~f=CLVlA!;V
zNm`NWvK_9^`ZM56y(*Musc*%nBa4dVK5J**$r3z)3@^5^7iM~RX-UXWOQ+20BL@m-
zX_B+<?ttq{$Z(RNkVq=9zo|C0(v$5*MdEcFr=AqcNPZ)SvR#aZ%C|kn%;+iQwRP5K
z{PkqauTkIjf_`XxyR}w8i9~1ZE6>!9)cZ5lii+k5$T?ZJv0AD$yN~`iSe2zfmA|J7
zH_UV+lY{<hIFHf+s?1e8e#s%#4;h&|+lK`<KoApEpc!wEJRk-u)TR<A#rfapOsRg0
zSVtb7Bey&hZZF*tV`Vhp$K>3Va(jI#Bhs2=XI1Llxj8@53ZIts`O;qBo3=KHQ0~sJ
z;Aj2Rklyvj&KP>)z3~8_zCs<pb<NBwh90l%l<Y3Ao}4K+1hD#2gKI%u?NP5(btbot
z73qy!V2JbR=no?q=AYd^7|>)YffLRDt(w6~2)_0IG4&qsRR7WcxD}N>GO~B-+GXTg
zWh6q1TzlV&YlbV=-r3|LH(E*|adQ!w*Iu8>>>Br)rEo9dn*Cn-e*fRc|9X47!+nkO
z+UGpa^Vmh`M`JFfbpnRf<wSJ)cpQYx>fP1#0IPwhU2f!sEqa-xxfnCx4F-rCI)$ws
zLO@I0hYY=MUwe8A=naH4;u4q=^ZmHTzYM7ob>EbfPAI~mk2QyO^08&&vx3Cu+jgIg
z8+dgMm+$(Y9Zzyl8ErItp#g9#I6@z}JEp>$e@s%6T)qxY>Ua(hZoWF2_U&R?MzW{@
z5z5X2Ajkj~46uI3OGwC!l+Xq1Uvm%l*k7)mFv!%Fq8Qf+z{gZS(!WKw7%qRI9nBR{
zPp?2lq_2#LpSH?X4gtdklGB@pv>Vezn^~{?Tw(}xix`eu6C>^!Gtmygwn5TEW@KAO
z<N6<zF#$=lSbw`IpC6IHv=Vnng!l=r5s<U=KepwTl=j)p_AD-pJhbOp7aZc1GRbXA
zM>+(IejTavYsI7kbS0@+sj$M`ZcG{jF_zKTBX1{zOc+E2Jkb%i;^@;L-O--KVp^Y3
z77ovS31g_1(NHR#_GFj;#UAlYVM+sW{Fl<UNZ21$QV?U$OvmDEdNHpVsnx7?KI2AR
zB5>;O(h;JlLKYEJ6g)o1L@LLe>zMbEcAQs2r@)v=0M3;1XTagD=L>H@aHZjKoRN+3
zL~jtBeS6w#y=;BFC-~Rk79ZWi-3-z~#z<7qg7&iDVhhKJgnk85y$~M6S#@>zmjK6h
zBN_f59IxQG$)gdkVXhj7$nS*ISa7)ac{#BQI>~0$^ec*cVmMp3I+HVBarpQni)Ftu
zFv};hGu=R&rK)ID2botnbC1jJ(!kzN7QcV2L;5zb*HSmzf%%{o+I2uD*|i|GE-u;K
zV&w?9fH)@l?`xYsIvU&YLb-&`SII<>)f2o2yq4Udez6*CbePV0$RgAV$W>XYM9eWi
zM>03=SGxw(B8>vIc-E8|{rqYIdrHAeS3_~y-rxmof5!y&zcijduN~+%klCHqjc~y&
zc*dyFrTU~D?XYl){!c|SJ=JgB+YG6&-ye<da2W;^>(sbJ8E5!4tEQ3Rvy2bO)v|dc
zZ&6OqEDEl>_|y{G2as2J+l}ck7|Sw^$NT#WVLVG{=a40rshM%m;M%1TEz3FX;0cPh
z{YlEWfa}_g9hm~cSlCWz7eG$6$qYv-EL&b}VcpnSV9E@v@@oy39A6jN7|81{h}!Nu
z`W7BQ2nddG`-UNbey*dm3Bk=U9v|fqID4QRI&NwcsRgk(B%A4b56(Yq=2urdbGyKP
zfkIoeGQm&y{)eLNA2N1eYE%;NJIl62ee_#x(qc68*ZGHyC+grcW}%awm{9NlN$z}M
z{x%e}0_#SFDj?aWQ5hL5qApQr=Rbv7HERuf$yONI<E%HRvVb0>6b<s<tm*f`{u_V&
zJ^HQi7=H;#Vn1}qq69c`3*(T4$O0OgwLcX3B*e0g5H@W#(9h=jizxp;Jpobo)~8%j
zHWtw!H;}d8SH_IY_*3@qc-F7KpOVyQ+Iwr(*7MSnd@B{|heWO#t)kQ_7OtkfVGC2!
z?APc=kTlG>@!V-OCenpqElKS$PF*^gsoF^a9iVl?xwPCtb&;lH>LCTvQoGkO#XmDl
zY4Ah`OwVfhp(!o&NguL54>O`)R!D27=@!eMwP)vR21bDy5l5WD&K$l8Kukm#842uY
zLf>&5N98m(6JS3zmK+=q%M_}C+CvsH%-QK%!`L~gYQUx5Rqj%%3S{Hg(*~R8X`d(>
z-)!jp?1dW;E$|U7zv&1Q^MjCIB~D1KVm)C|`jnNSL*+62$yvDl?4c9&TMNf7w#P4j
z*YkLn<VW|fX+fGW2mmy6skRzG&F0$xg%c9=sy3o13>813bGepJO>CkrPC_pWp3*@t
zHNoT3e)KbVpWX~x5jQqn2U&{>XGX{NTRm4u3uP<X`ct$!l=&v>HE-~IGo4Pe^YF}X
z3)4f)Qz%oJd-nthWE<B(DF7gFc^sh^H{cE#08?r%gCGNvf!|z*b^{|6FKU56J5Zpv
zgRcAY6ky@QBK2STLzu?*{al5&qFP$Riw`GmtPIs`{rV-4<j2B<?67Y<JTlT^f?joy
z9&Zz3&3d=NZm!x&axKk8)MYe@aQ(dG{WvLk6HZbY7Q$k%Pv`qJ9C0wvmL$*3VoWA-
zhf~ySVL@z<9S^0~@XSYf-=Dg0=kC_rLn7S+*T~E*ZPBlMOsn<o)Z6eHSxd;?j|j7!
zc-^(b@9X%0N!ufhFmsC)eT9$~6u*%hrTTGu>wDyjwsSiVTYhzZB2-DjGYEh57)X#p
zQqB;&I2c5v%qI{1e>jo#Ise3JYO=pLpaNDSrgEz*8r@agF%Lc$u4q>`Zb9w=UIR&n
zo<r@ohba5`->h*D)%)+f7o<0S-K)peFn1a-$<@dIVBML0JL_@_CBPK#K6FSKk4D|e
zMI;*@kJ^4IQcxZm22LF24$FX(JtdqNUwjXsc!@~S%ZE^Y%7JZxetuO-7c5+*f5$aV
zHvyS5Fu12DQgOWFREzQj9gZvvUmWkQx%DLzVEY=XN$Wk^05qwo+_%BMq0*x<3E)#<
z{2&}+qNghKL#BX-0IP3&IB^l}&kK|K7gZo4q7JR2J2k!ARyNO`a&RlD0h{UIx)ta5
zv)x+ejUkH{HO|&F^<|o%=!zfHUz#vLx;zslkDFCDtJWw6oMZsfs@bopGQ|C~5Gc4j
zbAahem1tmy>pr2g%U%{3LEi}|_Q;?s2TR;Y6>%-d<ZQ?1S4!`JBVAKcWxj4~7;y2c
zJDM%WQC+U3dAx`3+^?P!TEjO}-NQ1T(SC|LD6Kpak#}}x=7(SdTt%Ijnm%E)h=PcP
z*}-Ul4egey>6Ph~QBLzhnq&rWdS>@GC5>nTq<LH?iZA_G%mfr|2nhIy%Ha0Njp)Ti
zPL7$pCyYhWgD9wx&gHKu382`&im3!d_E*p8?j!v~5i#LIs=jDkMj~uHZ2D6&JWh*B
zzcH+oG|x^zI^t$RCZ!6&!*kN>ngpjT9Si9R-Wa&Ob|>%ZnAYqzK|z*_Ra)S_5LjJ3
zSv`Gp^#CYWJP9jD1j+>jV3jx&!ops;QPrDe6Kw-MlfX_%Mh*0L;KoJpW0nUen|^T0
zDnv1g#k!ts(>a+5!Tu1rI=8FXO5Q~@ODe{2&jmj5ObcEa+8$V&*4l4<&q>JFJ-oRu
zqPs`_-o6ev8WsDC7Gg!6J@=s*tVyJPfW$Y$_OQ6C^g{||6VPTk9wZ9ewf>P8VwusJ
z7SRj4B7B|z9gfLwO`+%}{-ycxM7FqP$MKg=eIqZKSASaEb>qszeTA<*#ED3MdQdY2
zg%<|4Of@D_y&6yv5do-iEZ5dKFkpr(vPno$fPwGLmAPU2Z!0=Faw7guW>ouUBjMi^
zkoKIP=wUwKx0nUrAFd#O@ZmZh>z)l=U>MTaqsBe+6ABBx9P_h?ve8MQS7SJKoh4(T
z>}Tc?yW6t>Unmtc-$N&F%jJF`*I4<4xuv&0SaI!@o?}!w_PwnZ6(2Pb8=STLN=$U^
zFbv(&HSRQ4lzZ5c7sf{B&IP+T#R3-WJTK@Fi2UBdLL>osQbsJJ?p6!~sw%q;INcEd
z0`_u3FQCmqiPMjdsu2)-4a$cQ?H+9ayX`Xm?Blon1osrx&x+0T4FZfn!UuwYsdL?Q
z3;-~Wb&NoRfdp~}FaF0aLsBspC@jn|(YU6;l5sL^d6w=ZRb`k7zd*eM-G(g#zCDEe
z@qc6SkcEdOQFs1*^Z5IX|NA%=H*V!uMsw`FwDpD%r8I2AwE5Q`5h&~+Y3E_Uepn)i
zx3Gv=1TsX!`i^fh8@Z|g$tPnX#WBOgAU?7jo&3L9=A-VU&x0%@i&nG`E9ViE*`oi;
zPhsu&vF;7Et#<1yjv&-}w^rKKy1V~TfhW2B-i>1i+-Im(s3-$TJw7)bgfs@B&fUb}
zI`cxA%_k3J6&164D91(Zuc7LA*MKL7cSgeZ{K|fF-EjXFh!+l}e=eavojI-Ef%@D`
ze<RZN=`bmzNUMlKauwU5!zN4*cnub7)v30A{awO0?>?j+0`>Mju6(mG%CZZ};zm%;
zWbq<%o`TYuJz~_SusJzPW>26(CQ;6pcAXz@=^Q;DdE&9{Q4~(H9{W9Ec_h3_>}4ea
ze&zMO&7}dI62{!Dwy*eDN8icslPo)aaVzlR;k3f_`TaUT!t8Jc+(K4uCnkmlD**@9
zK+OP%2ttO(O!-#pB}-zkah)6D%YY+)@?U$*W+KR_z+u&q{k{0#yeT$PuNm@d#<$!h
zqBz1Sf2b$(OL4tT;V6OJ^$vS`OAT?~>!JOsJ=j)YNr3Vf7U}2~%M}YzLtCQViAF%R
zXWON;D6pWA?IRY~0U=VtoWRsI69QxiCL2J22!ucaSmdkV6fzutxwzzQk;>PtM!%;y
zs#<PbgbIOE`&V`*rF2?4iVwm|7?=I`bGz%>_c!@HRhzX@7BO*15N74yAVZslz3c^B
z)arCpi0yQ~^~mQr$qq0SaFZcUAiK<zpw7^zAUCjTfS*V(xkGABt!`;W*#E2b@dw9O
zi~o)YQ&o%_9`d=FZQW0I_E+X?(n^>^qKWRm{=1lCDx0p_HFl{IsWQZ-koq><O>&Ol
zNo8lP>jl~5cY{sgiG8M)5xW8Rp(UO(zj)o*^=U3AMu$r!;-mQXxmEW5zpQWsALFD~
zD5qI=?Bc%a@EggbHEf6MsXh;Y@idV!(Y}ggx0+$_Hw9B?QO6=~6SvVYw}~TDnu<U{
z*^6PDB7bRa)f<<w@T)S?#)-s5Rlp)~%scUURpj`G<cNS~K}0nn`^C@C&8*a_DE52H
z-?BS)V5D3rlGF?r(#u?g37N<{VBl{`!cjBX+du~7Mnsd28TcMZUxq-Wo<N5&7|)JO
zIBLnIXvZ1@q9uW!QZFYr;J_0cIQf9__<tAYua0k|ZH2+35}@3UA7VKk_VI2}cUsbR
zPwfvsF@@ADfPP09(TcCPSLSR}%pF-GxQ8~2W**O09f<q{QcyplE~c(+0pN=>Ti#|6
z_^*ij(GoNy;TE^v>fSu{v;<$=B<g%>ZB2A<@8(F<$_}L%aA}2YngH;khH^2+4e7Z2
z3LI(YR>Bwfi3g3qSB0zqWKH!^1HMAAh48;LZQ4-oZs<eZBa~`5iaj|z5XBg|356zL
zv`cfAlxsb@Q?*{Y7`ya{_k-@Kjz8r;7ipNEj&sZh9mjJr@(dBNVUe{%)&bK}v*3J7
z`$MEov%+7RBW41i?bE_`ZI_6bG!3(BGGx_EF0j<#+L=oyeax3z!Gr|^$gpA_i(*0_
z6;X4*Ou~_IgdW0yN+ja*LdZhs3SmdKDvAviHV>p4ga$5ym_4NLK+IvTUxV>Zd(<Z{
zk)Fok9v+cYzP$zgz0a9VkZY0Le`)3(p7@z993FF9SN@yGn`cptqJJ`WbRmI%X+rgz
zMP|fVnsmbo<HX1(&?ZvqF%=GreuJZ<McmE;BJ=`c#9`3VyU=F#9x9Hom9<N_sJ_7-
zwtkd7ZczEvj$qX9cqIF+J9PT<YE=ut@vD&Q@Xc|Xt$Zv**CcqI6ain@cK7|X<9pc%
z{s*IXR64$YwWy><pzy)#BV;%-UWI(9{Xb(02r!GxB<RznasxRn0~NSG!lIxO##8e-
zJBN)0xK*+%3i?n1uO2vbH7yp4!;4}3;bdJRolv5NvRh}Wh!}9I*D>JLv7$NsA_95Y
z>EOoyrVCmZc+>n~FxK+v1kVyrl10t6ftmo8CY;`^)?~0@ab`FHiQ4EjKt&UlaTL)=
zrvLElE${2#4!zFlg!S+fS6JKqSZA^0gX5z*A^(!29N)wKC*=eR+ewh_Jk-$xsX!TL
zs4>IYzj}?(Fu!0IsF+MZI`JW$PoN!0)Z5B^2QPt+t0|y^7vkTUsib^wTaSk3#LuV-
z`j?Re*PoB~clGF<#6e=m*Z1Q;|5gC73V>JM;CUr@$8V=sgnjbZQ8s?Tm}TIAon^rF
zbC`){FH}E88Uu)pNo3R*0p1zuikpd0jDk>Ak05(#$r_T7&<;#C@zAkuUW6&Vu182!
zb*`yNb)<&Mnnr+-K=+fCF;Ui3O={bK1rp$Gk#9;@7yN(Qeg$z6xDyu`9w4UUY>x^6
zFBJbU9W-#b>;SmWfii9s^^naLGwEBs&tApcvg{ZlC@P+knUqGuq|h+1x_0#I((dWx
z*9`?v@7J|}Hv|QpN2>tVh50~n19#9e*zyIqFz>g3iQ~?Z^KY<wJB-?ms`^W#xbv50
z@#rtjLCY5+T}13(8l51&71$oohL{Zh)HsYj$}O2>YRFtuJ}iDIDOk3?vEmRU)uTT8
zYs3FjgoV?B-emh<nvKzePY;cnQ)@(j`~38AnKgZR`Qt}W?5M^T;Cr$?yxlcqgsbyk
zmkL`fG1*Nb0oS!jk6D%+U<T=08_i}=Ml@RpNTW@pa{zFWKgWM#xKQy`_;4)$pGJdO
zz~a1@6$z3t21Tv=OS3ThmnIhczMEbCOEcCFc6)?_zchzg2NOqr<k|V^gKLqxpqh$D
z&VNAFj_YgjM|UIY)n6J=(sJ;@Udx94w%x7mdv~7uW)|`umi&Hvh(0V?&pT`ZBzfM4
zihpWrYwM1f2vHef{M|9>-j2W%vOZTt<=BPQ#1km-Od$(k8ts=RN0#lBuoMI%&}2Wx
zO5cit$Y~9@EH86Z>0cUC(b4fO_&$6;*cHC->Us$9a~1?$g3O@2E(wLDF4=qHhUvyr
zd3`pwh!juE8vv!pNRh$m-!sRoSH=TvLFW%P1j~Ouzd1745vpExNNuJsfl;@?rV>I%
zed~Z=F<>JImQHZ>LKb=<^HMc{45A+#RUkE{QaSxnIm7Qn@;?GvJ<5EF3RuX9UsBSq
z01n@QLnZOHO|#smMC{PY@W18v7~G=)DhARr0r!93K7Ot#`eN(zUz!r|e6+mL9<pq2
zZ|^Krrz?H4E~K<&v1OSJ#BghnT|L^_pPh^W^1E*Q*5Yk!ZFL+?{*L0|HEjY*H`}@Z
zrM4EEUWD^m8(SOem!1t&L}aceZR_tVZetH?TE3#X#E@x|1<kBxdHw{PT>{U&J2n9W
zpkm7qpoJPz`JXz0Wh^bH7lO?OL6cyABK)G3AABV9SGx_Ss`-SuR!lb@Afn_;ALT93
z@4NKuBcek0XV<;=qrARN4Npb!A5>kHx~wPc!7$*`0$OLQ><4h_`@+6n$euhmSjgoi
z;%ShgqETn!IJ`5w{XKH_XJ->IUL75Du#2%Xg$8sWB`k%+M4l@=PZujCs)qo`<Zv8V
zSApPw&_NN8+W~vL^$+X^g~pOx`#zc@?D9G^;c~=gdp|+I1V1{?N*Ti57+STf^Myfh
z9SdiQ8PS!2Qdo;LJHu2ZWSm=jM^;>~<`6sm5N@*O)zH!PBmHAnFW}+`J3tf_lZM1y
zXH-kpV<Qii%eO5+ETWK>Mw?gp(4aKzJTwlm*pqSMRgsnuVC0;VxRu7jOFQ4p?E|zO
zol;=#IWA!?C?SxhDUj^0u{=c0!{iBBxx&q)56PtE7rP1cJ`I-obF9JbOYK)WQy>Mr
zkiv_fvT4Fx*$e=$jcj8Jz3Wvxu(d33ncc{;V85v<-y<%jE2*8eaG)9Ely+u+?Y(he
z0Q5m}U|8tc?A;LS@;42cEBL|?w*a&W2_1x+bSJXGNa1zfQX*C6BoFy7ZWDYqynHsc
zIej4BddCMp4cHv!O$H30v^>xz?Z6@k?*_J;6oVVdWF7vH4KH$zKgX2;O21fcT3o)l
z$}mqXpvoOqHl|k@QgI9DB6x@NA&|CeYfQh_rc~~Yz7paRSR2G#G2{$6(<l$n>reX2
zb3Pmf#B9cY=3#f=7Gkkqkv=l<XEV@Pdl~&9qC;Qn?Ov+()hl+9&hsK1@I;@94<Jm-
zaDUMUEr`9?LX8jR;|m*26x&NKG}rTrCquwIstIOcV7A40Vq{>zaR3e5vO!Zn6->QR
zS%AJ$n*1;votqMrH|fTjD_g}9drG!Lo&=@$l0(t^FslR;Pw{8->T||rDILmkEHpyC
zwa@}6uV;GY>wq>D2+m|BgrF|{@W)K|>66>ldznUTv0lET>dnt)Ym~Eh;rvE(n9A#w
z@`bKjJ?d0PT}^GcPvd-J13?ht1Gd((Keci8+kGef;~00I4dPHw{Ar`pc0_+O(hu4C
z7kVBa=h_2{x?sR_(<8_4SkQEn24EfUfTf=N)iXeaY_Yt;MnB3)mCk|3gki#KrjpG9
zAZmQ?*->l(MXj14(GyOU1fL0gw?xCSKA-vwlGK%pBxSs+v5ngoKf%kf0^&nBgRE;V
z9S<{34lThV{arrwO5gI^nb5|EyKCdW{gfQ=Qs#Nm=M@YW9LWlr9$_Rz3IUhrOhu`!
zM~78=CMm6CPq+&b%AU>QA!W25AC2&(g5C=d_Wvd;5OkA!*>atMpYkxV$49*Q>ioKE
z%ZUaSK{(sihY2NeuCG6)sL4UR2VZZ3nW}QoGIFiq>ih)rkJn1UL`c7<6*hWv%YrsB
ztMUy`e5i-d#IH0sbJvG{WoWc(Puty(*T^M=&Ir>DNQq75HGEX%(a!cON5YLgOPw#j
zuN5o}%vVk_BhW3lqt{O!=D49WkNYd5Ms8AmCW<Sne9uXLi`iWIPkJ_S$T|As$B(rK
zF?3&f!Qu9JEav>XHdTfMk5BYH8tk-5@^#&QfqtA-jS%dBJ)U|QX>M%8t?^;PXT4lC
z?+sIDorvetDke<Yeqq8J_Jp+GLk|)i(LdQvvwo<lLE93U-wE&+cO!!|!i}C~^NC#z
zDomdkRG;33{Pz9I?h99&x4JbtJ6dtH;g2qK@X{CJUgcW6D()dA{_<8R^Gnw5(H~M#
z?(C6XVW<uwJI$+i!XC5U+`3jCs+wK<zV=`}Z;|P-z0yaTE|NJuZg^lobv;YyhhWPX
zc1ZyE`+)DR65S-SgqLtJpOm;vgte^=C%qSL;I`p+s%-R^F}H6+U$r-h>Gz)1{w=FC
zjHnRrzo*}))S+M$R;~ZEo=L(rC79R`sW7K+1}u6W8iQ%oRzjphE|}9QTh*ZFY<!Eq
z?-FkH>XpTsj*Qowa`g03hN+DEB+*y<uWBAr;NbW|3PUll)m+~D%usbLno@9r;Hg<n
zR2j}JFFSe8i6~zx64=r9Z?68y#FSp(I?Rb<B}!vNmD>{bTpuq9Wl*2mel6~9HoEFn
zJy(hJRF%B-zy#OtXXaTwjS(1PjejTpp|Kx3n#9aP)wcB)`CZc)pY~rD+1>L&V`JjI
z?2ps800PFA$kH0CCn4c6p+T^Rg*eA7qOZ7}6-;|n62)=@y8Vr$u><+o?y{5Co&0S*
z+WM{sHUz*w#E++uFa}M2BC{zo!ebts!(VgwF{KwDTR{Yoj@cdXft}V<dq!SmkEt<p
z{NoNg7A`{%L<9qez6;0Xd1?nVAiB-f2pX4MSJ46M(XXmRL-cB-)6;R^c>Y`aD*QoY
zi8oh<uAM<#{IQS1`zp#^T<8UFchCGF(6luNijePiMq-sjcmJY2AsH#G=(B+DQ*~a?
zPkoQ%O+U0rR%Ol>bWQ<N259=@D@(trW=+gesm=y?;?I|e_Y!saDLEoMMd6g+#aV%(
zBEPDcU;HM+y=A7k->tNL`h-^E5M<O+g*?8RAommj5j^wi4)r@e%W}2zoC}h{hWUaT
z#Fn_pzu{yALz+l!fMAa#l&Cyh_N0sLXa&2#YIs1>sSP3C8)<Q)Wp~rxSN`PSZWW_O
zZ}dZ|UA@Tt{AWJiq{|{TJh&PHwo=PIfq@vXw_nm?(I;B)|H7+u*{i<$LH$FVM)d14
z+B|>a6OXIxTQnl2K;(-~q(Z~+JpT2F^4722(bLma^w;wm8v#7wMvaL|zlKkah!ubp
z@%2)jnTAb0#RtU^ib3N&5wd9&yXMR)fdOkw4Q(zvQAHPv>yzA05>>z)itpEC#LERR
zN-{Ge&#J;+2!-j&&Dpo3iddUmi(iJiyE8{GViY@lXO$8%#o}neHbzS|PD;s?nVFZD
zjlV>hKy+_a1)A_<)i)IVb+Ux14W%}tG8{v(h@qgI8IfZ{?J_JKJdz{b%&OC)sn8*F
zUNugfws?D#C7-{Yx(x_5?pgUt|7uDBrwJP6k{?y0^ZPSdh#YwfpQvGx>zXY7Hrs0;
zr^_t)iJBSFLtogmqtWL3f@b2AqAE^gA&$zK1XMx&5}ue<9Dw1>)ht7(P)N;kB7uYs
z(~-*wYgSAp4k!7~3!SwKZ`_|(2k>fmVQ+iy)9W2-@k3j!4>T+*JMsE@(I4v)p}s-5
zU95a0l3%B(7aeFZ0DZ$mPv*dDD1$aqMvBmEd_TCriX%k&gSab^SYo3hJIgRT0GG?g
zkz44=&2l{p?vK@2?y@Z4mjZ%aCLHa9FUQn=B*GTfOzlN%`=ML+`z2FVrbr2?ruN7u
zr7BtCbHXU8g9ZQW^=zsd{{m1G0GB>5!u<4X2O8A@h;tJOf1FP&k_t(S8w8{|cRneS
ziG&JzN`Ta6<ru+O*y*_Ruef$3^mNmz1n?dRxC0~!T+2_V2qzeQ^J?q|QWH~>q_bY~
zhJ-*)uTBIgdgv-(+4Spfp`$i6L7`187o>9nsXD+jsGo$}Y?^m>SGZ<F$HRCb%{_BG
zSL~P>0&E$hfnNSbL0!SM(b|t1&&1HCFT43cEcwW6PS0W{!B!JES@AodC!NhiI-kjh
zIys4mI5`(Va`W5BDDW)7SR*Fc67pzEcHw8c+X=HS&td^!jX^Z25#+C2xtbxS@2G(0
zMJkM+DG{Q;e_)DF4H1Oi^aCaHSxRYBdh;oYV$l*6x>%yMj3z8&K9QQGgsv1br}8qq
zd_cUK#jNRm*~}oJv=sN<$Nsi-*-g^|HD+c61*qO5!Fi?RRPQ`GP-(GAb~9`UkSAw8
zqE<94?KZP#02U1FGEfxXDzJJSKUh!?`B**BrThsvZN(z8_*s%-3|@@Z`_Iv}(aJ#x
zFmR|4JXTTHby9&yHX~_f*kcx46FnA+5PMbRA|ItiU@|PCRI#%k>nCu>3Si74pjhWx
zn-%$D7G}z9QlzLQWQMe*>}1gBr{npPQkC7l+9PUfakDQ<&ZE}b1w`qI#sabohoRH}
z>TF6F5_lZ~VkQ`ZsKq#W%;sS(6bM)-nplv<jNVD!YC{%Q_GI_V*DVk|97%#e-3)pu
z0!MDq*I5DKMS6)!9hk*mM|4UH$99+@0vQ-I$tTDnGxU!(ls*8i73isAcfl&|E`oe2
zcVSts1RQ3DyQMMY@5*$nunPAZ?bqQUiWLKr4;70F=&MQi0gdZKWC$!Xb0(x=mDm$>
z3IUKW{9RDi(PckWlcJzgWTj&r(o9C^9EXQVw4Ou(mih-LK+612RB}N}bt`1H1@z7?
zV{prbl%fefWEBwMpjE6VDLYd+OttHKpnHZ-P-rc}KAw=+;i4Z$CznZ^3;0%e$(Y}b
z%G`E`=TMoFt;;OEy8Zt<!)J@Y$SNkvWP#o+7(8P)$VqJyQ4+Uld*d~MO~^~e<;t}W
zwi>4g8tW1XeoWNmMCB@Obwu6I5(5-Aeop{sjzIf^y*qNTI2?ht_hSYEY<5=}L<g<>
z>;=uqT9*z&x5z***EZJr3fEiCWpTJiziRIQ`aMJ)xP`%X<9;ooJ-?;0Ns2J7vX>x;
zsG!HY8^cg626U4DyN+MU*I^)<1cW~UfhL$D3O3ayD<>lX=MJI6-Uq}XXukF2<nuVj
z!Bk$MBEZC=23itaGa-aXmt7#HnqlF(?2P*Rwl+hj;FCIuFrsoVI7|%Jp~HYEhG3xe
z<&W*ugboC@6B^J%-69cu-`D>{G!a7G?+eMm5;PZec#qfU|KD{SKIc#s1bbEMrq4p%
zBI~;B4d0w9>O#Tbnx1G>qhCAtcaWyfzc2Z8x7txwyt^xL2Tboznp4=6^rQ8~On5PC
zNVVA)fXD$PhFwBFnZ6+ag{Oi@&6ExnY&(##CuX694GecI0(U?o!dlnS<fomPq>QNZ
zB_KY1w+lel);4}5xB~ET)+-t0Dvm$_zlfUO;MTO-a&wnG2F$*dsAtAmyDH#BOX^9A
zpN%_~jZ+8!R1i>62y~dBA7G?(9~##o^nnUO>=BJ2wfCW_N<OVMjv5?E>A1)c(6m}U
zEy26&XNq~7!VyiLm?WmGefHLf9R9%GlrH=K5e+%|-(ND7-Z?(%U%i)PKBz&1*)!^S
zUde4kK<b3ZOB<2>U@M7(c{Zsn^EP?6&;&+gEkl5(VkG@<49ksNsa)wHkRgs>563ev
z(RWef!Y<VffKC&KS`=rKpkr{L3=3&GGZHpeL7c~5ens2%h)w>@X+krweu>Rk#6fo3
zS*f$Ct7)1<w0{kGmS%&m6`anGMS^J3LNv|e!LlXSeoMJmPGv~_CrD+8um#(Qd=F}Q
zp_sD>(QL5WEPf!_1tUgeFQ5uNi{GgBpjttRhK|*TL=k=~9%VKm+YcEgO~8>BnD+Ml
zrXnMbJ2m1Xh3!ZH-fB^_fFo=N4#$vneo$4VdQW*23<7C~5H#+Oi<1n*NeeQlazu;u
zergTS-0p+`s9vH>6Z<Hlg}XJv3QX{RtyEDq*cK!3J(kMN%LHB|r_GRbUNXGAz~<gH
zd29+-oQRw|M0^@V&Ulg05l`!SV_Ek=*RzM>W>a)-?7dv*B|0Y@1^mH6uR?%r1`wC?
z5+dh!N>W|O1g~ZYY`+06$28inNr+6|5am5|T}Dujjj>?KdP@G+Qo?n4`|C44HT~@J
zln|_gC{b;eC+^20+BOiR_9t+7ahrfRy0M=E*X&v-mN)CtHAF{9?S+B<56ZvU2>!|M
zcp*|a^!c!PmQvSLm$9nmcj`a~wh7X(_tWy*4EO76l*b(!5u#H2b-=MulVIw>-A=i*
zFZ)XcaNpr(xdnAg2$9x%>lDr7VFjr2lC&1oV=}q5+qxq1sf^$aP%(5=N3rOK-UEC2
zx)K{obp~T?rr=J}WWNsR;RsyU@IpS7Dd{&<mb~lHY*^uaIvs3-rYCnYiQ6-Q!_*6Z
zYK9lhuwVsnZ|#CAs={OYbz`B7BI+QN+4c-@e;KBl9xTDgtH<r%neNU{R<=j>OAN7-
z*ls-~Mhan%nc6VeBYv>v4rhS*WC@c~375~8sRqDWGUCHu8hJ2Df>GQPfR4h8mLQI_
z(~z5P?mPr9?+!p#v5>Tj0w-c1%)c~gx;o&jZZXvl4fSh%jdW6L`o~z20Z#G$<S<b{
z%mm8O!Up?G!{dWpX}JZ0)q!!*HC9au8)i9H`LvRV8@g%WO%iCwqjTg4W6XlNN<ZNL
zT!yNBwMXOx`~rqTz9ahMDe9n*xR<Hb+XT-YA}BA^roqD+5w&$~B}2z+FNoaLA_6;j
zPiQ-k17Mv+DIiO-mk;H2Se2k{&0m_<V?wpzm_1qA){c^X(bm<b>_4Cm#jLom-&$)k
z&%WPj@GM~knq0<%sxO*OOuJ9())p~8fvE^EX#oI&XI-Lf3^}BlNQfdn?}7n)Is2Gy
zJ|Xgma4cysd)0t$T1|8haU;xug{BzP`P6Z@M2S{JsU37~9Fr>jGirj^Bk~zqx$V;$
zmx!~ksJREnZ2*#kD~|W;7DX}wYs4{`S}$&>NrvE4Lk^Qi0{T9N22zO$MRpg8oj;bA
zX5@#c3xJvG0>?2g6&)=DAg2NxRe+ZYFjI*u>)&+c2#CpkUfo6(`$8cp=~=q`<E8>1
z>vDvdNxK&aTb&#7;;DhaWbrQiUp&`z&a*sTh$`T?ua4?g)8sq#Zj)enAJ*x(#1;9|
z0ETjal!c33?7wi8(Z>ncNoo}E<{t(w2~NPcaf%WgW_C4t(;{AmAk3FGI&H2exdrMa
z&9oMzviRz&>CXp4tOL)m_T(;X<V|mBj1gn}{oySZLzcF4MIBL`i7A?j{<Q1wZ<b4x
zz7rlf$G+}g!LJygQn?$=-=Y%x^`Ilf6nY_6?MU*DJ3erKE$95}A&Eiu<TKX0Vls7{
z4{kTkY@KgXS5nz4aFS8xw~ySis!XK_&5OLdjb(nY#3tK$UKkaYUU<fpHGh8i8FoW)
z#@eGrHD-B$nenpA0IO(9D146L7pE0Udb}^qj~rj}^PFrW$CvZG%6D^KVM>?FUo$`E
z%YAC79KCjXOwQrFh#PU=H9<76Txb{L7U(gjnju3z)PJ&lbqVGl@j|c)kiPYv{5eIg
zt}<}qY}5X{<N(ui%2Y{)y=19i6po{Bjd>5f*Tvg$G5J%pH@WDI8t5p9p*~6fR7gV_
zALscyB3?7+k~T{Akn9(dF&veq6;~cSbWgZuZ5*q7*BIK+ql~IYuO94iU}l$Gq!Z@|
zV&CIe)a{-oJqxP;<;Jq)!UN%BdQ6`hTL5<x%T9d$sW0Fp-^~-=P(2~<0rxI(4CMKg
z$elh(rgLcu2j<RUUM~FP_KM}$Gb@Z8Gqw?PPBwib)++E#J{$ZB#pC;!`EE+rg_5#z
z?6OvDQ#n8WB4L*M0&?oALQui&OIt^!EB5|b|5dQjSygDPh+S7KW7Z$Jn#!(xJ~!jO
zc<u9=_j0|JGmH5h^q0ndO!eg!i!teb6`+w`p7VS(^r3T1xUnoQf41z2*`G5){M|oO
zLLbd@eHLEv=!Z}1(Hdqdsl4#Cw(e9(U7r}~TzXa&XvKQMHF-w$oJO}&Lp16T@9Yxk
zrqHO!36T|%^z<LP_UUUw8;yK(JBKBdSistHhTGauy=)SM$*sDDc{Xt6qxrSRZFL4v
zJcr$d<WOrno3$6e1O$3tTrRm~MS8!ALkDKLF<NbR--0-Pu1}_+wQ;JRQs%0C+K0Mv
zo%R9j+O3+!x83!ICqf)Jx^-NGH^r^9zcIgYb~};Y7OZONl$zqRuQPvNX{qAi%J~jd
zo;)#%s|z!9pLNu272n~9{jLS^yySY{vUatr>AL6z+auWT;`?&$xVwo%shytb0h1jq
z9NiTszW7@X_;)c?S~geQ%aa;?kat&bO>%PcT;E~aBZ~r=;lk|Ka2L;>H+cDprP6t1
z!%Yf$W!%dx`TXdU#|mG@RW#%)yKptvjxL%iJFJvWC>7O*J-#xVcAZYxOvL2*%iDd8
zZTZS#_sq(L`$idPusf&5*Y2H6G7uG~^MT{%l5ecHUn%;mUt_a%K@GPgaTe$JU~$Q-
zk!$wu<oM;X?I+U8!<%wH_@*veNLdP_TCv;Ly}9a6IT|YoNp6a~nxWSiAE~+C?x2eJ
z{38D@wWu9}dk*KUvU`$(ee0B(sp?aG{u)Hbp}i)Om>}@h#ILMa?1|~!*=yFR{Q*Lq
z9Ivn3a(m{<doy-`>-m3C=QPv)OXlqjal7?M`&7@_WG|jM9|VV+twfO<v8EE6VGxw;
z@GR#sQJn1cfRjyP<9c`UYiV4Y&m8>#i-v(<Ojydp1dc@UI>YNWBNH55)m@T#P8;uD
zzZ1c#@OwGf=dJH1KUl24cQ0bFhD*<nBhFAsKK^!0{~dhzLi29&+t&4D;;A$Tgu)*R
zEo<#)5LCpk%*l|kW#rR;mVIa3%ST-7cJr<ILfLZC&K$iVA<<@XWPE#rfW0DzeK6(x
z&x>ISFJGSs<@))q)0Zx>?t=W6=F*e3j9Yg2itMCel}e*ObsYJb_3t|2np1Ktq8^-b
z6+vw8;@j}$;lA%-P4YoP<*z**5`wL;DC@s8WpQr|Xe)RYmgpS<(|?KzxP4Q+97D?F
zJaNg}+SldMC&`YJXxe)^FNBV~q$_L`18d@nrRnuC(!NqXn%_9p?D$vs;yg)Tg#WW%
z+K)jrs1HfpAJIro_%bKwKXa8+q2FBbW|DhJl(GUfptFlx-tAFpwVt;&HN8E*WdFR{
z7xm=Cd-uO52O)lacR(lm%#M8Gt#^QaaPoccXr<`~DD}186eQp8EN7{jRweG%bM`LX
z6tf5`79N1|wXs`BrM`NT&(XMv%zMJTs{C7&Kkl=)sz!*6+E~!rCUG;rTO0gkFCv}`
zY3x(f)FNJdP*xjhV|ahwQ_gPGP1|L6Q_ax7$)L3*bigimGvLJ^B_$3vmA2rBzGsm{
zhW+QZSqw~K{A}_0I7R&Mft+<q7+ahBh4eXxHJwr2@|4e2o3!1(PRW04A3fRXuzcaR
z;Dh<M0j6)G)l<u2V3*TlU(~erKc24UIruMEv_2qdilys5y+{(CWJHrU;25wXZn$bc
z5QzT#yrkMHn*BjNX`nJHEpTOgPWsNDwu{Y~DywgnIZ-N_2u@2UVl5|j=$-+G#V4WU
zRD-FMMy`z*<{0_+e`z=fkpW5{PEo^(bmPnI43yq*+_$<A^47#lhm@6Y7c<0Npm~LT
z;Qcw?&q`%7$>Dhla!m$H9E<YA$a$o5{eKsxZk>9p+egpjqQ93{CMG;Yd%{k(;4$<w
zm;Zga1iS|C(ivELbr(@HI<%gNvy60d-fC*(PV&dwfgV=)QQklwL_r0DLGeFTUehW^
z{Jo-Imcom4zcq_Ge#YXecOP|4&nsP+=hT16q43ghH}G~{{_2U5xbN(-E{P)}&6|lF
zx58g&^c`aQ?PY8G`02lEW0>Ry2K*Gt4*K81DzY!qkDT6o$)ElrZ#ns*M1ltD`t*?m
z%^MxB(6q66EI*gbxFjbOGAHg^K5IGk`s;faM|EuX6lYk4o^6M}Jbkbc>&QDB=Y1t5
z=&<q|iriSo9k~}fn{?753+0;ZR?*e>Myk`Q&SoaMM0cNIC6D#I=MJstTQrvOq?tYY
z=v{f0a%*pc&&H*q-IP1scsf{rDw;8X=Dly=g-e0`HTwg1FY>(aDY$TFwcv==DY=mD
zC*ib>vUL@{_EUJqec<BrZCg_Dviyil*_GD|!r|SJ%b2N$t;kK)x3B-wG_}&N1vu*Q
ze0K7tJ$iXB|Kr!Y!9MpdnY*-(ei^fEjCgHNd+%Na$2*$2MmBX0Vw1-0+cbB^ceu45
ze7k4(v=KKCXV=kHeinu1;i)YP<Rz=uD;sWms$HQ!kg!l#UZE*0MZU!x&^g{@GlJa~
zJt?$2dgCR^Z29En?~RW&+56Q6+-}c^xNYT?b26LS-0j{<eF?X|IS&iupetwHRC&wW
zG^BUSo0Vzw&`78ArXI{WCfr447^%7c{L>KaWmuEK<@`GM#~Y(@xTLAnMGH=|`2y?y
z#)P+!oq{^7y5`wX7CGu}a(Am_y0vxE{v((dQpP&LJz(R@?{2*Z8bgbQdCJW{IN{ng
zy|A0{cj9B-y)jgm@mHM_uAN#_nVCW+<#PF7r2d(Q3CzL2ZJnf~Wj*^5-EdV+`?q@=
zNv>b|!3D@cM{t5mM_xdYQc7p(+^MHO-U+_Jvxk0UwK=e$-#SN<w0nL{LjBHuI^COr
zkc-#*xntXLdSAl21fI~+$HaeB;CtNt?&&8(=96RMUc72x9HgD+`GS7!MuW#0YGlr-
z8ldJZjg!9FTelu!vs}v@+t%m@)O`dC@6+<Ts3&j7zx}R>=NcV6(NS0?e?_CIKcp{G
zY>syHM)lDfqXLEwCR4ien!&dK$mOvzE|}S~`FVvO-v8TP{)5bv#=UOlq?GGjcT!?`
zPO)mIAoQqd@~<yvA{xI2(Z@-(S*1_a5`+`iF5k;sbG>07%<a=w=9H8+cq)A0)jg=G
zZQR*B*!;VZ(~s0w>m9ZuOAB>^FUZfl$DWy&g}i&GXQ=!#KLvMoyKt%YJ?Uxvc_if9
zI<0<)?~?H%MD6qK7WxUd_rC)A8pqtJ^vq{xlTV)x=2%OcO;+@w7Qmd8dCujZYxNI4
z+Z5x#H8Q5yb+R_liG0QX?1owAr9oebGQLkwE5Bvx`YZinl=!%?^n%`IT(`{LE~=rX
zrsxHyD{>%VqWH%b5j`!*<OHQnjuW)s&U7F$#6F35xxcB~dt9V8?Iuord|#HK(oMcx
z=YGg)&C6y{0l%{Na@~~nAnU{3I5#vRic`<+$%v&T5A1M7koUjK_vt27nwv}AYJ-*}
z)O8g~d3_;w(?k&32DG<>=)RT@zUNQ2;CGeIUE*;&Xjf4jP*HL&;5|c<Ui?Ki9@XK8
zrrI$K#%Rh+G=@BO(ix=}&-~c<aoBEGx8OtrzEM8t%<l`ZL_3|$^LO$u;Vq{Jl|npl
z4j;uG=A^6+`}9vg@b94M`x0=LY~5EyIPZ_@s|cSeKm0FOpj-N$k=qxm_6~~TIbprN
z|3Z@IN(cQ?f-X{{0bI_1QzOx5$>t)P`&x-cp~6J`m(``q`LXnqo`yd9OL8~(`GkJy
zxTOggY3{e1sV<#$-?<cP^Qb_gbh@x3^5ugvRl@_*P4Ynhn+6rq)!z?SEQwPa37zNQ
zIj`g4u1`kw&t+6^Y|e;8PKYN>aXh~$o@A$4@aM}zIKH{m^buMJWpsPbi1l`r((9AD
zymtyRW>+9~Wom^LFT&eTia+tlfAO*lb9-F>w=TzjPoe~fg_laW=5l=}hc23(em>A@
zPov5=z%jtB&Y^mG#DXhBg0oQ&<I3|%BF$mhK6;JSFJS6Jv1gaNW!j7S{1f^lYEc8q
zpze%vu2PyKZT%64YCu?eN7~$98mBCF3A;ER^qEf)dg-$ITOutZ51nuRiZCSar8Vii
z7>s<GRT^$uE_y3;%XogU4CqT3RQas$pP8Ohj}94`h&BzNzwPj)L|ye^Ll>j8*NSUE
zRhs_Lz2&=d_nrov86D;rc!TG;gCh=FE~C$tF6Pa%n*~)bEA{Zv4)S^@TP3Un--#--
zRMHvpr2E9JQlb9zgF;QnB^p1cElx(auIf8@Gvx@p(7N3te;&4H$ZfQf`d*588s1DH
z*bEUzXDKdcY_4^QcOPo{sGJ_7F9dK`w$ID8Y#S<_JZZz22lXzx`-U>7&Quo`|LksR
z;CEV0@OIkxX!fKr9TIu+0(!M$i|L_%8?y?A<w#QVP2F~9`7}oSzhQ@V&QkfiYbOGu
zC#b5@{i@c1aVoV_9Jh@9Y23A<3hvZAHTxMAfj|B0(2dXNpgxWFRH~=ZXlTXti>XMX
zu;}}w8{aT3H`}c8oFv7cWxzz0TbrJCJZYFJzwo;5oI>$$9#tKeC5u9AnKf25$%$N1
zqU<?$FIwnB<d3lUx6I4@gG=hCLb_@Z3T=cl1%&Q$1*a`SP)#qN*m|0QZ#hMoHi!E7
zW7H+yj%Q0ja{~9JE#ubT-q?3p`Lub0Z!>ROv_QFNiMs+Ym#U@Iidv3~mgOawZJr$}
z-69YQa98K}4)neamzgRAv*jU+L>xNF;l5T4{+*$%D6?@se2`ZFkIGBFfQL38yf_&z
zDGmtc(7Bf=4V?OR^Oxxb)wm@`YlZvys_8G|T$f69sWHyK)aP%m)9n^hF?bka^DMX1
z#IA3BoZ;)mOQL}<*&ANz`cJ9Mfc|{N@yZ~_p5mM)1Axj3R2Zk{$@8x$+$Sz51hM$(
zq?KcLF3zt75t3A7PV#1&3wF=>;T`hMP4dMm-Yj|?%s<4L2MIp&IBUoyXUt8K8aG1j
z*6`Z?JbyOxq0i*24{KdP7ef76uWQBd-NbOf83tZxUH2>>uCK3GLeTZZi7n9RX)-XU
z7+YmXj*29&mJzH)$}+S$hYcR4w8`YjBuEQMKqWUVVtFO)<5K+0j6cNn8IlQe95l2e
zmq5^}-$6|VXV{b9%X{EIzUX|GWnOpN%~4_UUCOEW<=`cc^4&E{iIvmu>y}&%=L*n7
z1=^_8LZPvofJjxk*L*1B#xV)Iv4)Ir`#BjiPs&Z!q^O%J@b+5|yl<Vj-R3VI`?>y6
zU6@u`v9)ys{%b4mc)<0bBhtGws4bO#^%xB=Tfq}cx9&xUhB|I?Qu|NCJ1GNKWu>ME
z<ampRTxsg7-Nek}5t2`DARbxC&DiF%+6Ub^7q6h+kjKCxjCiSjpBU~JYp?Jz>UpBG
z@L!sE#F>rrEnI027pu>XI|mk=zm*30zG^+^uvnGjSuJ{3#;`c0rHG;`e70+zk#(An
zv+>&{yu(gQvN2nt+`BKSk0#tpSpK{7s1l{;>N4r?_`+8%>y#7h-O}@-+kx$U?w|YP
zF03=i1$3M^tG>i|Gtz5NMpR%^jwIfjJ;!&0`eYf`<>M51BSpANGBNhkYo}+<qA3U0
z%O)$<)y$1PZWyW><9lx?;%kdBhJxJ##xjcd2MoL4XsuS7+9@f!Pn32Z?+H0PW8G1y
zSPT~0%~RjGQcJ~f`OF1~Cf{;%{z*r;{pGvw_od`c!tfcUz_Jm)fp&!z`6=ZKYTM!;
zz}l-cc8Re%H2Bu#h)@o>2k-*&&C%)#-HUIr8+|2{7me2hUwuAx`I=GIK}v*mV#Yp1
zzJ%*gkfLxt6Ys?SD8(Adl!X6qqtn0C>%zy|b^J*u8I4}@+psL8`1qG$?%NU%3~^Sp
zZ9fecMY(>zvK!&8`hH<k^Huk0krodzNxPS-@p?5`zSlYvU$B0se;H5_&&%I&dnxD}
zV`pE0LSVA-x%A`?j>_g_K6S`1WudDIucwSxlpn>yq{CWFha`TMIaKr4t1ErQ^lf}f
za&u#eSz?%@rO8{dR8~ubb$t2wRr;ZXL4CINoIk$oTrxhn&A@fl!1rDN$I==}IW3sx
zn%S9G%+eUa6`0#>a>S+Z>y+0Vr%~Q}`e*byZ5C6VPM!O2SR?w4UB|gaGbU??mNoj+
zAqrIBahES8uAnY=w(!m%B{zVkrtjp~BfF7++n?R!8?5fQcqA7KmZjvT!0xZWVuBRy
z>*sDIa&k&q)1EKkWEU2mx`)BE-yAklrOUo~|7T@~k-cka;O-iO%dpyg8nug)$!E$f
zhM+^x%L9!HyU4uzspp0~Cw<vYwCBrR8+GWI*!_H+Sh*=cpA~vO)$gtiLBsVgjfeD;
zz6YjdtNN*jr(7&W_!vr=A4$CFW$^JVaFH}%Gb!$#*^OUBm&X3`zx(N_shpzGJK;LQ
zI!zN~Of&s4tc%kGVe`AoP5){~y1^>bo$;+lZkuyA(f=)^SYoGm{5DS&+7p;goD=HP
za|}JNKU{EckZ@r$r~%7up8eHqusTxuT^>d8EuF14r07YbbeSLO`BcIk%}Ca?V4hD0
z?#(|Qlc#7>TjrGH&2Hax-4T*x6f5GgiKd-m;RvZMAVqPXkza=dBQ^7Q!S=$*Lg~=;
z#Oc^@{)OAjcjlaI_wsLWE+eNtIi0s{-;qq`3>C0CtcEO}{p3Ao`CW{JKMP3n%%rQ&
zZ9Y~z=sIU&(!1oEeg4A}3JXc1i93)xp?@GkhDibu>zBbteyY^OHeq%$`--ZFPLD6;
z{;e4|uBs2HzTYxwA4uACtQ_&L<~UO=ZD((I-JX2xTUyGAF?@8C6FbgXO`B<SiSDFn
z4i$6Tu05EOP1^{;VjnVOYE|>CHdY+d7Wk?hf7_f+H}=j8fwmLKjE^gVwvTXmj8@fp
zIGWieTKfEf%N$vFy3@TY)o!0pV=b<t9!g&q!na&sk!&z9=g)>3l;trB+|KK~JEfws
z{TLa$2p7z_*)DCtz~?z&8UN7*fuTNnq;vjuk}jv^N5@mtLIxSJvjMR;OQMicAF7sa
zjyV@4-z=ZLu4bjMn~*u7*Ogr8LrJuE;~g)`ONv>M;81*O+&uJxIs3*O-A8~`cM3Ec
z^Y?@5J3PM6{EL;En9A6gkF`}^=THj@$>yyNToRI{B+GkKgz|IL>1VbwT)s})Lh&`|
z^_$8t>AH81&lsN*Oz@p$e4bTMzWsP%?vJ%89-2(gtomMt<8{!Ih(x8I3OYgU>|+nY
zC;nDvWWOa=jNac;RCC2<@--G2%j2S*AAC-koM4qdq0;R^PQCrvG0Q-5kbgd5F^F@@
zL4I1%=}5dm!RCThLf`b%m*DxC@M8B1eqqhe8zQKK_;-k*ll5xBWp87I;SKdC)tii(
zE^YBLeh5-<b=o<ZQDrSsEjQ9hb7D0kozl~mI1CPSy>hgp4zIB#(AMkh18=dklO;;L
z3|H~0($H+U_`;)wb*`@bDfIR?JnTlsv++Fx<km?Wd3h(&xgOu!|9!w$IF^-u3ZQ?!
zHrM~On^R}&gs_t*JCm?+4E@YaJHH0|;N5s$on^lLCmmV~?ekKe%>irXpYjXXKb8%>
zGKsx2A{zO8^vRWx!oM^rXvU9T_A=V@&z>2Qt9fR*o)83i`^sZeMg1j3>um~)#w<?z
zr@-UCrEcfv-yRiBmeuGQ%}lW#<d+0-(PwY@e3EF8IjE7%>FEs5sff}rF=BA*K%1pW
zImf!4zsulzP39`o^V=OJ*!u4>1#xrIyta$U9(c<={$c^lf||5kn?n@mS!p}Pxl3)q
z=jSe)X+o|PydI+;;44s6a+7>z)EmIlr018sL?_q5FwYTs{lZ!4tG!C;H^j_!JatJT
z8FN8gFZ{dxVZsKa6w6ybOjB-3+@`^ve^Z{`@t8X#ZG`&xWZ|P^<7p)$ZoH4znQK?9
zN}O^|ztY0@-w%3w<H-su-+S?*+B~~w0%?i8$qvY5p{8uC(O`$0f@|?JWOFH9duQPV
zdsm0@iY39uv*F8lbC#~GyZ5V#9%K3ax*|ZiN=B-yl^+#%Ag;vMR`J(Q_P_BDw<f(s
zsgv^!P?_3GulwHM(8?MYFizTYXE%QBFR=!tz^Zo6S$X5Hy)P_#e*M`nOAsUD>rzxn
z|89!@Y`5?Ygrd;ol*ztWmb16&_32Rmth|q(^}|lgh#T%QPhE}aY&Ux2?Q;DI|L3)f
zmP6`0r{znXR21m3+O1Wje1$vVmOfP<RYwVLluO%I&i2^#T1tjtO5gpZ8K5t`dEeKE
zIqkrRtKC%oqLQ*v;{OA|Kt8`fKL)B}qWauTtsdnHsqqebY2;;rYs<vNXlveAmrvp(
z3|AK)Y<=S(bLLfJ_b8X{gXuHCfu<ZGE^I#JExWuC7m;$&qwYpBpJ=;j?m^7IYW9gp
zOJ_momK6QTLg!sn;U9<_D@Rc#EySl)xT}?F`$3C9^SBvfSYY2}xWGGkg9Y*2BGlY-
zR2jx46j0)EmTZK&`W~5e*ydhZd`eIBoGdBYY|H8y&byk0_Z%|!8QvL>nbk@=l2hQ^
zZF0g4U`8{K!&!;uoHPSZsc-yZbp^T^VRGgg#LknF8_E^IQ;T?+3qkEuaAB;^`jc{C
zI1`jT3fULnjT}80QKAbqEk7woDRdyh{$(Cmo>izSw4l$t<CC0+LRk>*D}pCPHv#yH
zaftlsE71)rMX?CxT|jw+^8o8IshEAn(Hn}z8H%(ed`j-+6duxpP&t8KmCZ_Gp6GEC
zhC7MRqqv?TTj-TEiQx1~iE%0?iMCUFQ!0WxMGclPPh^;pgt)7T7`Cc%M}$k3LNt>N
zE%6tpSD0IPU^Xtda1&|fu2+qIBbSbuShR5h&*`~M^A?q9d+{vh`ObAR@8&dRbYrNL
z)?mqu*Y%VIxAx8&8Jo3yVhVCx-kQ&H;@lhzKCKl6D+eDl12w%tZzaUYstpNTOnVyk
zAyRoL#7b*F)U}+utq}}cEUqFN*Ls5f+JgDut~^WEZEm5pXBM@XCm=frN<>z2!O*U8
zxX3i$9wAtBF^7n*1*1kuxqhA^l+PK(wE+bj>zLJ!7j?gxpjjN4d`!@}=RY#Pag#N1
z67w&2nP#I{xKYd9$AxdsphcVamBk;Kfm7yhGIdM|fu7;{vDq}|=#<)ToX^P75w%Ye
z{+4-)Zw%(9TMW$oA(vud!}Acx$5m6o@!^?kI$e?M&fGTuzoIE(X1(B5YL+&&T=f!I
z+7*UmOi=1B8iU!{yur&9)@bu6@zw4EVfO{9u&c5Gre@faKtgh#64J={BDYNHa+kR*
za=|pG#K^g0>R`r^0?a+9zK6Q<)G?33Rl<J}+>)jj>R9E(Sg-;i&JLqHN{x;WFw*}3
zDZ{?~5>}a<WR8^G1lXC!zNH<{Xj4li{p-|YboU@$MB#?&>M4NyOrUA%Ic3h+sn5SW
zMzXO9hx33G<}_LRnqf78fVN6~M};_oap=8ANYqmnmmj84_-c4(SxmCrxr_FS6rz=E
zMS=XF1UBUPgyZs@^cR!R=_ANX!Vd%$;tO#`*Hbe@7C|7qU6DY&LhTCz&LQ^=s8=%1
zWvI3&h$0L}h9^-v+%Z{>vjWY-V&QFJU0g=?fO#O?#1{={fT|^7i9`i|i+RFnHva$y
z(@6IdnCfj3;&UFNMB$F(rI~QDsez`-ujg|Racb@<Zot%_#JHTq>OG_37)y_6o;?ER
znPc{WU2w!KS3Jx-YkkzBQTdrR^Wu8~1sBJDCOH?{A?!EiX_o|a23$2C&i6Aj`oR@Q
znj0$PjClK-uw17L1@XRWA)vL0t=?%nl)7!-V;pA4YiJS>4xiK$fTPE8?YibQd%A^N
zv>RN@H6zIgD@sZuEK^KlnQ&I@VG_@rQ8X)kaTRUkm?2qa-l7EtrMU^>p#@RmWVxq)
zYGzvQsDR{Qw-H8D(ic+}N4d|Lw1ME5idBv^P>kWVH;AExUMlVc+j|#!>Unk6@iLEd
zk_5t2RT#sgcEj&$Igjmv*uiyfuZYohzHV?&-!Qy3`GJY{N}FhR6NVsp_)t4b*h@y=
zh&!j)fVle@jy-sRX<C(AS#A^F2-%%#TYhjVyvAg4O?CK|hx^J!E3d@H=wes_@Js_@
zzT*5jBSj*dkrg~<u2kSJxwd`nl}h7r^-1$8F#DAp-hCh&S)&ouNsXbGHW_%-^XVHz
z55(NMI*egwxeE2K5c2_=oIU&zLh|QOLwgX$(x^3if!lSqX2mMe*S;WvoJ_Y4b1Uq9
z!;1{ydGjzqnJ`N86M`n-PBHZ_6X_7VzGb%Z>e2B$wjWpGV$Ef43WQdwzcF3p4kaaA
z=jCw`Gy9anqk`}AD=a~^%ml%jCR*k_NOqG*Js26Hpj=vRuQ+Y>Ezz$LDXk?V&vKSD
znzg;oQHe<k2%W|WuiVTKG^NB;WLrTlp|erQ_R;lBTZ!AwWhzp`hbTdSTnnZk#bTp4
zg19y5v%vgCH~56Hb+6(ri1;i)nm|aU4a{hCRY0N#1m`}kii<O3@izYe1Fru7#k9|e
zhoD~)-j1EcL5mU<wyp!C3^KlmG0bVWoZLf*kqY7pi4r+tBj{&h4Ue0ib)TpRS^1Sf
zU@;2F9QP`+j&mxs-?YVh`GrnTnb_s1?yifJrxkM6j`uBee8eSIE(0d`hyv>$iFi#O
zB{)sqAps6H^Bz;h^)saiR$vnq5M7bGwVBqV#!fd1^G9-xRR<l-_vZotd$Cg8<Pg8m
zLwQc6y7S0Ht?#P;0B9;S*ZvU)>%B%W%h*||sI$UA*^!8qn%*Id*7K594uX{d!uLdT
z4XDqUh8*td<q?hy7RO6=RHF=YoyRFY>VJ5J0-M^v83|Z(HN~+QjRZJp<~plY^(g1T
z;toOK(#CWHh+u_{USpu9oZAB4yfMLHb+|GCcbq{^{{Wd#{zz$U4a#Sz0|FO;6F%44
zU)|(F%AX`L!u2dZhGSr*Zpb+WJWDr>Gf|fmyphqf^#BpED!M2+nS~s5aU4pTwPHF(
z_vRW62(^m2Di8%*A|_KXzj5)i-c(upg9UTu52xIwvon;3B#xy+G&6D~{u%KYW}lgu
z3V4@S_(v>P%*l#+o=`+Kmw%a_+_%(ysP_HEt!pQk4dC!f6-%CF$Ss~?`{HljURcn6
zNrZk$TW8Ft!VzGa5%&nM;t#2}64s7mu83@b7TTj6u2G{=oC;TvuHfEAUyE2+=GgNq
z3t7aZxAO-CXz%ibn9BMRn6g|MwuFBP#346Sh13IY>M6DLGeemxG}my$%-t>`nM^Az
zMNu{eaELKi1c;*CMw*G@4^a&fjv{qafUZ3wyJOjB1;ld?cL6s5@<chryQt;C3A{_S
z50;=f`h;c9=Y9*mAZdwF2Oh2SDHL+t7ae+O>en8Q{a(Et#m>DQdOB4U0jq(lBKxR@
zE+NJ+j6;Z%-6)>OnTgCn3b~1Sn+x6C!2qjs0*f2ZQ8fN#6=v6%fLQD1VT0mO?0en8
zTi@b5lW_*q;$uZtA-4n#sh*&6=Jd_+jP)p%c-25V-|iOJti@(p8YcZC{UU{2XEnsC
zR$N>Ks1GvA1vjpsN&p|Y-l+p0jmtP@v)eZcaNMc@q|Z|AhL+SBY6ezd@=9Fs2}Zlj
z7^mh_sC>gg9vXrcuc{#Y-cV)IXR{OP8pM}1hZIYzHRTfU#&e_$fa@86=$D=`3a%7Y
zftkZsP=%WLfwl+CTEh5aBS3FySQU|!K=Ulj0ccxJadMoa7Pd-yJFyvo6bX#Ll$>Io
zB82)y2QjK}M{plIgcstBXV`m!7GEXHdu0^|%%`*WD~f&1ibHP58G)GV(>Dv^b&n)o
zw~foD&xvPg@=IFZ5b2^3m>Z{#VJ9Dn#^h@gEvvhjZk{OWRfc&?x2U`fa~)Sxq~oG!
zAKQol!JW$dzV#@DeaFSWaAAKbTvzT>W0}T2;QC6*WO~pHh;wEP(fF5a`6iAeS1OKT
zjeZ%kgbp&)uN);N52#DYcLKL*q8vj_d}nhAaN-MirA4xu%r$NImDf*rWukEi4TXmw
zl%SfNB5`;o1YQrs76S~n{-*9e)BB0TP?tp058M;BG8T;0vF2A=AY$WSb1QM0K{QOZ
zTNAL4xW2|%;S_Az3jVQ7vzj`{=NByV5UYL1vayP`BMc@r(5G-hQrQv2<D<BP!5eiP
z+*H^^;kwzdWAf@>%rqc8#6+PxiyD~-yu<|51_Ke;r{Yv7lt6X<3vqg^^nLHu?lsJN
z^mQ_N8spIK-YOoIKNBFltiJ;(Va%w`rUTTM#M&kza}@UyquMZU3l2|+E7uaa+NI1t
z2Xd~g%obT&+*<*PEao?#%CH|TUSg%;P`=<|t?p$^oEAh<)7iKxm&WQX*eW0uG{31p
zZ@*?#&NKb^m2GRgh)}n<nZ;Kf!HU&Eh0)Kvvqj;mjHEBm5nK<R<(hHli0YkmaT~LW
z;U-{Py&U6Gm{D4%ejwD~Y<8W)ro&XqkiQCy6br+7mut{vInL%b!L907U>&lG)T<%z
z_%2c#iFa_7KX4-<<`@ZQGLD1`s278N^D{cGPQ_KPa~qlQ>+`=sb#jha9Vgso&esfP
zzTzl5Jhuucd8ZNJu+^--RC(cz!RNcUO}9Zvch)EBAX#0m=4yn>j0)4JIao7Mycdh&
zElKw%3w(?y()pFReaei`yHn;9RGnfvRTap7CQ8S36xm=Gd-o>?_DgC<w4-eJm@7yb
z-`tyUXPSY}wU@4%)kVeoaUA3A9_t84NnT~ErVDKN%u<JW=2wkG%P5Rz^Ma+}H|IWO
zRt(_3aYYP~5~(9CL`V>vcj|CvXUek9lIR04ibmEw;vR0F6QuW>Qfu&woOp^*R9%Y?
z<|BpI+~xAB+-Ohk7(Xj3?93%*X1RiFo#^$Z$TNaYKlLmqRJNe*18xGwP7c%ahHkU%
z7REY`xc$yqC{<0;`<RRS!Ha?CKqoB;DRnq0We9|E6w&CE&Rh)eK<Zn=GxsSi=4H$?
zaHs*eCUFMpBFtMM6~)G8k4?@a97i2Wb&o_I*mhvUyV6yNSd3J25I`V6#HfK^;O;L?
zCedlcSh0M^-dh~S;EQqhi*ejqi{sLgml!tAWhoVc%a_bN983aR)JpUv#3QXn7;=IR
zdzliKuH{Sxx8esjZ814FnDPcsxc>m8qJybTTNRDKwKJMA`<Q5NH>fGgP;;QpaRuQD
zbt{|2RZOibTZ*nyu*K>&usQjONIY{EF;^0{HGGqS`A8A6-VgT>5Ca;cP!QnzfV2)j
z5YRxO<1(&`!IJJNfN)+qmJ;<?6Z`#Qg+JXAvVeI10C7uA>2DIt8e=a%?kWyi-l4Za
zIPV&OwiGjtCH#P5?|;NZ4638eri;`*&w<3c$y>~%2gfm{$#c0}H5MO9Yon;Pu-<)m
z&#$}br>*&xoWr@ACRdsG>Skxo3oG6wtN;u;b3AaBCTS~$zxOE`*BNmEDG+H)EGTe1
zpb7`sm_gr%QjrpOn1!_LE?2gc57{fJ$DPDMA99ly=2PT`T_Ech9V%fNGhlwEOs}*D
zcg(iLGbp@xnO1#3kaEFZIZU)o8#m%vj?s+m#K6N1$`~+3CGirn#F}EMQDIO5*W5zw
z`^P@zz;PHpOd_i^2QVfQEjTYuT;ugK1%0OYHSIP}>Sd=n+cxafZ`u-9E#haZnWBXz
z*qsmVVJ>rtv23slDG$p48vVoYVYfzd#LKC}L$w5|eM`p)PLIU8;R?&oiNM8fqL_kw
zKU2<_OK~;|ZJ)eMT)%#TP*D4d<cBh4j74!#d=ZeYH{uTAA$vx=LvK-ai-;M`NAkn%
zX1ii5FrIe-<^|?i5Ms9-q8jRS6&t9&5s18z<UnnJz`p1Q7YKYzM5G{rb365I9m6fo
zKC2ezzA5OuMXyCfRm570ewsyURu?KQg5uTDnU;<c;lXgeCXwHx-a3xGG>K4kIRa+)
z6Hjnf*E*DKtg{<=Wg}E8IDw3*%;z%}2enHCX8g|ykeFIk)(F-r_cm`d{KlcDea6?r
zpDY+o^A*;~d&b;f?qIi6%r++xDRN_R#b*Uoa|LSd89A;TLCTtQxm95hhGW(<s;Ze(
zDDlK_wz}7M0QqTf2KLlsp+m-|UDqDp+Lb72&rz%cg3C83a50#%%JSw2?dUTKv~X(W
zC>727K&-WWOe5LUy&LcG5l1WM&#I5{q^th`4`crTfb3>P4`{`aI)(%_#6DiG*-cPz
zcL-#8SQ4Vl=P@KPISO?L8+i~7KV^1>+J{VZwW(fcu4PrHi-w_e=W@8C#mXT$lqDPU
zHbI<H8sa#GO@wX4*^hdP{&L$7aT&JI`wxg#{{Ymq_dvgF{z6f>?7UKv-Yd`+6j?~w
zZs4-j5e4MLz^lwe7xx^i+fBuV@a_XhgcwdQ55W6^@<**Ok;P{8{X|_#7TyQE#;!Jh
zgbCn{#+THiDNnStQz+m@8FtisrF}-rbWNw$<ux;e%^8|8IRXouN3A$S-UQScwiLr?
z{6gCdZGA$DxQaKaLyN>yX*pJH7F;5*M5HBrCrKB~%2{Mb0~N$}h<!>phS@o4A*ojy
zg_vR$aY_~sEO#+nkb8w2mOjuJt|bZJi5~R<#2+uzPq}k(Y<rlngZwkzeS5)d+9k)^
z&_{lhp2)nh-=gyty%weJJY1_Z0WJ(*QuTQ18%lF4R2!Df>(cK`T9=BBCXwHuznRgB
z)4GO>t9-z4a7=D<kH6+xs-12HSB_;P<(rKxUyi2rk7$*JH*vRxD||6wb?xs5N%I>h
z53hKPa}&W%dWy{t`-y6Ay17L*cPYb!YjH7qFy6~G2329x8U&)M)-);4m^!<@V`eO|
z?j3_n`$w|O?-4z57+AOCbCtglRo3+!+lpeylqV0VzkEbw72*QHQy%cDpS;pq`IS2u
z`HH=IiZ`R4r5rbGYmfIi&C;A>(+{STjKR6SJ$c8j@Upn6<v+r@^?Z}fdULsM;29Y9
zyO9y1m}tDBqBwt08ZU+<h~;e@7pE;|3?`M9<|(U_OO*&4DqIw)le5m^=1BlCMyJb}
zNn<``S0|WeMrRy`f=!_&z(QLx=Lqdm7|ZcBrH5s!;FZ}WbVnRgZ-lI`4(f7^ObufV
zkciW2o2CfOtjvB%SCm*4`Hw~ZQFU-}W^o_6pg(hvC6^Ih)B*&5gyDZtdJ%I(8LQ2r
zf;7CrykR*A>wY5_kC@tfl-4daIuK%4s{$wr`<lq=iC2u_@}nkT^_Y-X2zn!edUBhj
z?2t+B%2MJ9Xfen*mbsYQO`^;;*ezUDLVxw>0i~m4Td1aLbfdV1!5gTBwG_ogHFA#N
z`;ac<a?D$R>40$qyMmIB%pN5dQP$K4M59EtL^&*}SV{z<QR$8PDWlS&J;bP-#JHCj
z8D-|@$}1Kv`YlU4p2XWJ_9H(Vr_8Qw-X-2>YucPu!Iz8lPG`a}`ZV-&hdK1FU`JkH
zE}Fmn)W|LW0PGJ?yRYV87hhS3ifT}-M9uAhx+|^RtE&G1)N*0x+B;!G_bQOKqEmM3
z+5*9`!sQoN+yLIYV^?*9Im9cV-z0nHpycMrt<}6{3T@BeSb(v0@2D9S-%wRwwLr$(
z$P;H;@)4zb;^~L3BB>HA<PX9il$hRd2$*p#43y+JhSi^lNlj3Syz!i34SmwW@O`GR
z8O=S*&*n!(c;itPz*nCVjT*Q3VVl{<EvZv#vl#E1s=K?#!>w9>B-7MAqVoD1)b_tH
z$#dQR04F&A0O6mxgqFZsSctLWkwK)<d0GtB<K<$`c=>^^lmjR-TxR7MiealV47Rg`
zZx7*RJ8){5Q+m6Y1ow&~O@EZA!|rj%<`b;Z2p>_-LUBoNjL{#6F`_PSpQz?g)km~n
z`kas9I(C?P)U>~cbDUy0>5dh;;EQeJGL{PNS5ltYDJ|oeIEE!Nh5f*_nsW|OGx?7i
zcm&%CwJpY7R{E5zKFIRt2IX#ik5rL4KrA)MHuJepkt;0!0CDPGJi^fzg)+Mzxvw`k
z<mC@QzUn7|kK!)ynG{9f^aBx9;x3INt#BWoxt+FcmJ@DewHyL-5gfremP&m@Y>MI|
zh;E5b5&HZ@&5@>MTEy=_-A^+t49X_qZeV$t#+VGK#1Jq_fvv%eK(AL(!E<QtA4Is7
zA83&?65#95N{#dBx2BOQG;tj^Q1`@Cl?UDXn;Xtx#a^0a)E^K>bJ^-l>Lo!fS({<{
zAxlELcPjBYEPvdsWNSIxGhR8UYQ8=u4SU1`8MaVqg<h~ic5ZC5WXkD$K#c|a%&mKs
z&mBc@jwRbei;63Ld4Wq?f7Ai<s7n-XCMmnPJSwTU1gpoG*jwK+lZD$3AH4w-XUr%Q
z_bSQ1XhCr1pcMPz24@`ch+UuAxWjX;vD+wg@dIiXnzT`A?_?^o#t>Oo_<(KH3t(8w
zQsCb&+}7rk8uT0_9w)bML0-9z(`NRBF)5bm$W`4Vt@5QG2_V239{rUU2IxikLpj7d
zewm3@%~RwmEd$t6e0tltqR;cl%<34|qWhPeY9Dgmn@jNe9``xi$pF(Tm%J$iG$mow
zOtV-km0%uniKaPd=>|Gk%0Y(T#e)@J4P|NusfO8rcM7~c++9Ml@`IO0yujA|;J7{^
ztUl%RLA4c9CuzQ>thi+MgvcLLINQWF(eXY+x&`a;5BH0A@WgEdxRGm!w+n_ESB>Ul
z2vKE?=2TmhML#fFxHl$LW1llpb2tP!(w8xQ34o3fIH%O((%>x@@fd>NpHioj?J;SH
z#?SnKx`ec-aw>8JXDU?+mVYGT9+WdkzDPeaJ_yZxOKe2(EYTFyIOR$>h;ap?RLA0S
zOr*FhtT${_6bC3IqcGwv#9I{&%|q&S412oNZlW2?3=*xulYB5AFG{`2%mBnJK(Fz9
z$C=G>G@j2_aXIv8j^bQOf+Aug=}E)U)1L@spz_B~a85)&5$JD^N_&>~EyVZ2^RM#}
z7g6^sc+{s7v?^RI#R*vaN*o!?0C45aK<<`Au`BLSZ8eXXRMzu#5E>6;R`ks%tQnR@
z<t9%!fR45CDx0BqoJQ$cPpAg$uW46?Ij&&Nan(vP`nD!p$Gq0Qe8tPKKQi;l+)Hpk
zT_=wa6`FhuDA9_wtVMyuV%clM6rmhu0x9HOKxGF65(aEpaiDT5m@z?qVkKnrFpBA$
zeAL3SA?z8*p9MfH8eoyE;gjzwkjT%>e&(LMW?74&y2~x&LXDOO#8HBxD?nk?JH3ig
z4b#NZyIhZT6w*~%4j5jDpzQNf<8WQc#yFVT5%7#}g2tofr!*wiKMW}-)g+DYmQU=P
z8eDJkA!F=+*$tSR!u_6%ulTvot3Q5)b2-GodOS@ru4lKV_dVgg`rC#+Bz!d}YYhXK
zV`wXt!Ezn`W1%>+N6Qnlg=!ioO<*kNPr)jaD~*Ax{G&DdW89y)un@`&cj?8*mP>t4
z5^#ySjwAIMs!W80;=*lxMKJyo`w5vpNEvE%8HUXy31Nv%R<hF;Od#X+c<FzfQK#~Y
zaLOC};9wa|Msfr>Qkld@1aQTH0BJaIO&Em6yu~p7GduiY-BTOdaGs9`Xuk4-{{Sdz
zv_|5NjG)4D(~_1;BAi8VM{zG*M>Izv#;PphCRHiPbFhyYW1D6`SZ>%)FdZ-~5teEx
z5d)}wRHE^yu(NtJW8y)Wiv^VgIJj&49Y-IfJr<(!$8mV{+B@}YskBR;eRxGqUao9H
zD>)?~)UAEJ3P$+!+G*&s*%qU;T*_YIy0Z;C<f&a6*Srjh9^q%7{DGR)WuDKN-n;!w
zfc@q<WS3>`FFR}S#8q<fe~6r)sX?o*qu3wMh?u3X5LmZUW{ez@OLyUla_T-B^8kBs
za|{~YvXphP)U1rN36s4zjg_IUpjb@fs6C2YZ!l{bb8&_;8MEG8{hx*zhxhoLC<$hv
z)?(OnZrx4stK2NF7^q|%{rQ;#55D8Y9c~0P&zVH4X09esfo0-r@F_I(c)vqdt#2Ic
zwXY&4AV8`iEGL^(wYKqM1k_#(Z4B94h)~3N2=9XzfP=>dxtFu3BC_BpzF#p*%e}E~
zhj*-}nQAC&@wik)LkCWah^zv<o=D!fatFG?WMv|Vd@x(w2lEnE2546Mg>tQT@HaV7
zbjRICVOtn~KBh)zUbg=L4{7FOS212DnVrk-S?TfVqaK2i+(bnq;i%z&(71?|*Z{xI
z<*{`G^w}J0Y_@(%VuH4ezhIDtsmdIEH~5dK2Jrl)Lqvt2s~e7Ng>Sg35%(!<!Axe1
zzcWA}hR;R86O2o2KBibP+=zC=@eH^0g0+8BveBm|ew@toR5*YJ-|7irSX<ux8Bc7$
ztL|dw7+g(W@ZDyF&M^e!gT--)!yb_A5#uPxW)Dal>loTIoI=!c*R%qp7N9i@=a`#S
zgxdob9fEL(o?<z;B+4zp5yVj#XqenWaS-A(%|_0pjBy089l#l8Gb}FPJit84yvnB%
z&Y?U(;uE+vKQ#9va8#^WRTKztLteizd_~-RO_0=H<)YMlF<7@3m(h5OUZ2&+an#a2
z(!)}x?I;x^;jS(q-TcFwxue_C^HTA+w-Te=#cFBjys=ol<<m#zh$_6ys`Qx)q45I>
z6;Lg!&zYYW;!&jF#Golv?;ICyCQM<KYl%(=cPf~2;#6yMV4CX@wOjSv7h>OcC^&ti
zO2NM1t(xW{T@#Yqzr?L%qeZ~kXR^w{!mz#}9iDN!lrFuiiIXn7?f~qDYCSe*80(+J
z#?phwFaVy%q6kP`{6x$NdF+*sE*?l<bMeapf;y~9h3wpNsJ&ANWgjd-I3D!?tly~U
zDdO&<fXj>Qc;-9eX)sQ81nOjXV#$`72)R+rP_@Gv&80WX03Y@V=ZJmiN{_lG2C&=j
z4__0|Z1<Irm>aWrWAJ*#eZyH*LNI0cZINur+6RoHqEi=5if;1VOJRg`A-EYbdV{c<
zr4YHSVp&6~)0Y)8iDS|aJrwWZ8$AR93!Kd8#&hE8?iDy#i}I<CAYBi&L>u%P?x@K2
zW(O4ZY7QH3y^9o7n;Sla&iy_;57hHh%sQVR<DU~AC3$^)xt+(_V=M#EzcB;~O(qza
z@iklO>OXD;OZHPADtiyAC7X;GQ{^efjZ}XR$pEWb)PB#zwJ|P_<Q4gV1V7aoS#<X*
zRA1%jy$OVAIbwTJ;vZ9lMevE^8+8m_KM>BW9@o^t6kE;?T6~djvl!#*V3FSv))pMM
z6LW%4+M5uIf^Y%%0RI4at20pp^#N?00XS*H5ql8?lXO5{E)RG{w$wufB{`@Iq6o+C
zVC{-+n}ajug5nfIIU&e{OD(xe<|Bx%A~R4riPTeLJTXXwJD^;!3Ro`S)bh-<#KpKI
zL5Xz<#DEM+0vfMXsc89*DrfSWMY*I{v1%_YT*cxoMY%|&k!+6r7Nru&GneLEzi=@|
z4r5$RUeQ{X_ZFq5T95oodzNs=F{_Ia%O4L(Qg{4JKSh>YyzjY|1$#v3$LdvK&B~^p
zu>*OPgA3;})Ui%t6swMNDmRPXAlXJtM#ZHH$r{;Gha-E4v#eYTq_vGcpsf=E(QzCp
ze36$8*}<uGqPYpULs-WUm&NrC7yFj^R_b8p!{P$xofR&~f8^-Ou_!5iFvaVEc>e%U
zvKt!lQoI|?TFo(n;s!4rks~6ZV6i1({aod%t|ew(aS{=I?yeHWs(FIF=k7b#r{WF8
zdY{e$=n|FM7fS9RMgveTp<Jj6uZVM+frb%r-8RPoHn8xFR9%JBlEo2?-Iqm0PczzG
zvXn7}i`&Gs=velH8pJZ-j@--pg_&K5NodT!R!c1yp!rySp%*iegNt{XznCE^c2OAc
zcC!o-C6mDSP?<wVD*KFOwsmn0QeSI&g>Jw_CI^HnV2e(vJAw?G4sF$!vQ}#?qdCe{
zeKxBXG}AKbZp5461hmDYA7V0sR)pV(*brM!V+?!?smIO{)-523@Wm(0qI-H<*RPLS
zKcxBJr^;WMS<LQZPp|G@BL%IULWY3u%tl9K3ZF|*(=odJ`ahXl1yz17iA`~ai|zg>
z>l3%|pO}COc*$S8@hD7!hw=dY!*3ZIZ>58R-t0ikVEWAffwpE_l(a!KONawV?NOPr
z`h|HwLL1}MFZ_B%+CVypXq;tz=Dy0Bmt0EAP<vBEKlYxEQv)%1vKq{?FVtRf(RNaz
zV7P$Us826RPAV+asl*CAP5Q?&u`evMY~>+2xDPN7BqfKK!ARu92Q>$&Mo62erx6K~
zSlqvGrrBD%hYR%4=4La@!eU?`@_O6ou~BCeY2^y2_>TPx<}Yl#++HK7z01YL>Nmt*
z2(=XMEL=l9jK@ydj8eJt6`XDw!}yO6X@7}^*!fE)5DurpTm5CG1_-lOYf$HmN}7mp
zYT=jh0MmGZ!n3HB>bm~`QR7r<JcbAhY16V%V7dH8*uE%~g59-`{fMdy_LgH;JRfny
zvm1`ts@di|sIDM4N56<XHbms0?k#>N4+_k+3Q?+J)3xvBA$XzYS-;C3`PLGYF?_=1
z7R}syx9tIvQgMyzFy0u<zx^ZAcs@UfmexH*wDJDs%h}eV*6!DcwUPBNYDs%BFhn?U
ziI|`kdu741ZA{!7nAf9JG$Q&5b;Tw}WIJUUWCeRbA6bT4uJO28gHp>fv66o7R%Krl
zlO5)B`*<CaQCt|evxfv0!X<{0gN0ItbB%>XWcCXWybMwSQC?v~OL<;k8L@&KKTxqA
z8Ech<v*mD2Dgl^XlVP!x--H*5biNVufbfgNPuoGrm&xsjH3dS!hzn)aC%JxQT=6jZ
zP@z^0;U#vBR*0(C!Iv#_66rx;@~<%UFb_NLMxb);AZW#!M%ejPF$K3=$`W?RZ@ARr
zl{2)|CMs30K#R=zs@n+-)O~Hp%K459k*$0u^9;v^r^;eHXiwgro6n{-1I+uL^HQEY
zH$EPn6WKkV;BTK%Oj|A8z!)Rhhwf0*nEg3Z@jGY){sZ}*HYuW2nr-}&{{RtoH-D^1
zD!s^)^L`~zfWoc%5P}CH{urz}_r%uU<~x(_3!5PQMPl%$33ZJB0Kh_Sh()3fE88VZ
z4_}Ez)gg~)1yvKuA$V93N+DMJf&q*}WY~HtRs$EzyP51owG`qbf+vDAQR0kTFv3EZ
z33DMh*9Kj)8EgkLfnl|93<Ft!;vNZPMH2B6@d4sv)a2$N#Bj_B6%EQSK9H|+%|OwJ
z9v+v}x2mY++nA{IT8qS5i`y3B@fM=;#i+e8V%*X%QEQmIv2evvNws6BilZ;?RtGoF
z5lenxqZRmz%Pr}zUY@>}W-aO>F4*l{d0Zmk+W{)hbdr}?4yH+1yxdh=e#{YV^Bzi8
zqGuX)IcHL}bQyr);)8gI<kyK=4jYKkb{L+2n}~nfR|4ueQHa<e^N5_8$_}D7+E>&H
z)FFAi{$ME{c!4Mw6<Mz34a*_<_uyyNqY+sr!TrUq!^{f53X>h~%*=ndDPsXuw^1yd
zGDnc}1#7-v<|V>1%IDNNTP;y9Y85+xC@8n@(~SC;xZ;4c)E>NHW^Lr-DJ*9dm|%#l
z0H$1VBZUJj6Ddlb$l$jP@JwLtiP*}(@#sd0L^m57WnM{InoUzBr<CI#x~^*Yh|Uy?
zJQ-18kZ!ppqlef}asbDmqs}WVR_)U}K0!~}3o8_=H28(o&XfmeQc<GQeZeA+3&CaC
zz+4l7nLj-_yDlc8P*bV-!V^yYiklC3b3-eOC*^FWCk*$dIZdmzK!s+Oi5ojd0}TP8
z9CmxeA8q3(3(Rs@5LU9r>xflA3A)+bbGlGG(L{+u&z1O&M=%iwHj>+>f`iFX6JC_V
z?80vHgpZRj6)h4z@c`f!AB&dB=GuQ@F#hBI(vRut<JC3!{{R!&{zp>y^zjSfs8Lsb
z<e*hF;Qhr4vqOX7Y7~93zrg-yF9k$?lyi=s%UJ#;{wA7d)nAy9&w`iQVHT&i`lJ%*
zSb+RRboZQca!`CqeNF;!#C&kysNEG1E}-uiEx)PX6)?ShMZ5V#`11!^eWxPgax-kP
zEEK>@!uU$)X}`=6+!6~*zvNShjw85-!5^vH3T6;>7I=W>QeqwGM7A_G3(PM~z}_L}
zDD@hMJC_=r1P+O7h?Nw~YMJ_o1|}j3EBscXJB!TQ(6<&WyNhvni&1%E++HHZJBygD
z;fogH)Ok))U{0g9o0uy%4Db<r#=G=4(=p~=UR#NIm$Yqh0z8RD;DMcU8X5geiU@1T
zjLe#-qc`kCQ2zi(ZN>SO#Z<1DL9h87<LXguU!EdoJBn?k4k9&Aargn$Ziv{=d4N@`
zl}5~xsapuv^Nt~^y~-VLJKRtlZcrCjO*xgt`lXc}5VDr@1Tgt$4A*l4uXu52Jwu!v
zO@?m7$sP758TF<SvvUKgi0RA~ehdfg1{0(snt7WwS$bffHRzZaocTeviM<Jr`#}R0
z^BE;ATDY#bWxT;R%!6(#TB@K+k_QUU6?NPm0fYzIRax+=<J=3*y|v6cZUBrDqd+$K
zgv5tz@Wk2i&_f_%WSx(3I2zTPV5zi7i`phWbYFV9mCxS!2U702WCy!4)*`B*_hltL
zsd3>ZoI9iVnjUI`Vm<CADXyzB;QKe~roo$u8)Cew5Ajxyi3Kdj%zd`|QI>ygNr*@;
zrNt~%msNIPdX@{vF#Y&}+%F^-s_IeXQBvdWF>8Y#CL}O1`iT?pD8iQUMHiI}M+Bwf
zzZX)4iwgVEa5mSJ54%G2aZtY%o1)`G_KJ2euKOYdiYMlKrn0a*^!Gh4vKZ&m@8Wft
zjimUP!=HJ-czw;YEXd14bAhjz`IXwI@e!k%1U{RNh_uBHJe3yaFgE@z8xb&p{J)81
zdCs-=MPWQFeKGQ_U;+ANDQ_UoXn|t9!<D&9sJ>{6GDh%;#Ud_<xuOm^lScml3H`+I
zM`To#GqlvutixM~N)?ZJW46S5qoEwZIfG0(iF%4`i*XgiKBJsPIAZe(a7zrL1&A%h
zyrlBaEX~}j?=w8bz0}Jxi;0UGj<8B*tC~v9%1t8FTZ%h}h`dFMn70$hp=vEf>Ms#$
zFDzWe?G~ckT8kD^uVt9cZ}Ab6eWZ3(lW>;T1b8y*h_~q1Q)s1$rdh0hk?k13$9$It
zp8nt%`rHwcoK6s`u4O8+PGt=#_>X~ZV4`o5K36E#q9SgpB5m>QG>*1rBHTnX#%PF&
z0i4`(&F3(k?~9Z?CU;OGD~tA>BD$Jgz-zq53~7wF2YO*37*G6+HEtWf`4pEu@OXy=
z^Ogz*)kW91+$_E(XA9+&*xo^&Gw&T#{mwDg;n#7k&VBQUaEG%t#Q6qLNT*TJAS0ru
zFSa82^zrE0g&&!NaLQ>-d`2EYA>s%}qag7VhN0YR)4ZW^m<k1`r&VF3f&lP>2Wn+H
z=WWds-Xj@ltqM!lSa?&Ip+>YRB|rhv<^0sixPi(d*bZe3ve+iB6S&TKaF8RLoENw>
zKhsRLO+#gQfVT=kTv`%A7F1izOrw)4p|~%EiV4z)@SGqgeN2;qK@}!y84fL)sPG@C
z4llXvFTf}6VjS}xmB1DW;q}umxdo?uPOI$AYCXd)G9A)WY>vXe%0glaQjC##*c@C~
zi`VL1EDG1!g=xa}n7`r1<y#v(_V8B?z@dTL3dg|&8I<JJnvD|-41LJ$OQ-JuOi0?5
z^+6?>=xB7q2m{rNA8RK){j>H4=QP3?`NAv<+JyLLpWF$j)7#NJPW^7`U2{13m(;ve
z=WMsRWX7fGmYP{_3<RR~k_4paNVb*&SxUC9+`n=9=(qkSfSzEEENTH57f%;Kgl*Fd
ztAb48xQg&Z@J7NoA#n_3i_oywi<EH{z{EUCq9wL+lt68rtWlrJF~kF=1^0qVCgmuG
z3lQjl@dmXii|Q<OsIa`taF!qta^7R-DSMdnF!b1s5}Jn)*QOcA%)b2(5qhq17UJ<1
zEk)&vh`dFu%f&^wyhW(Iv1`$8Wai~d;g}+DCg9%jGp)SV2r2v#(2b(?EUm}hFT{Q3
z*2T%hK0cLcoE5o&GZm;>zG?+<b#SwiQRh;*#rsNY1sq1(D?CT(?+`Myo2Z=E;v<~I
zSN7sw+(c@kE}Q=1BV{cdM+%8cR^k^v>_+!=+lZkYS2&67ypAAJtL7u`T@ba9KQIT1
z=E%Cy(Ni4p7HHEfHM{c;?cRBv(7=!^<i22KEg$MBV$05>B6nM;EoQv2Qq!B6+8h+H
z6M9=)h6i{WOX^l^Jurq!+vcVQ<1a=vex-@h!ie9*P)SV}ZmJ^_5R@JxTl+KgK`sNV
z{6aIew0ChNtZ5Y`--!b%uN5q<GsW*0<_hhYsSuTO@f%r~DVb}fbmA7|2x^dW!2_4L
z`xt%CHzX7uu<^fvUZ#E=7{@gp6B@9E6u=oVQ}GL~S|cxcJW4Z<Dljb#P<JSEaxO~R
zfDI>9%7Ai^VXegH0%$twK9JLHZ1pmS5fC;_$Nqs(wxjPvSbtb<%`yJ~7#lO92qs!X
ze9HuN*Wi^Kbzzb7Q-+`Im^QqPT;4CpdH@W7eV<V2p5*-<Dj0&dOt8xKS$XpkrJYa9
z07WLM+(K)HA$d;l%9*Ysu;LShk!@IF1%8_<xCxn%RSP2IsDhamvmCxJh`OrV74rsj
z=p_qRb#W3M=U<9+H;{+Rck?@I!Ec*>rl-27z619GkQqdFUBrH#r2VPs?>I5z)81BY
zafy|cx$`mS*7KQ<9)(n@(LaR3?y6cCY5?Jup?L^Wjp0ghwwskxD$^zgrsB#(8sSiV
z!j0arf`PiBh2X#(YG)S2QgVQb%sYsAV+IJE$4HUkSn4rGCbmchmlI^p>lE7s+Z~&T
z<_nk=s0LW(QHw^XE@~%&cw%&sdW$y#8jAPnP=q>5nwD!YVE+IM7ahgoDDf213&dKT
zBKj{ZTZ_a}_Z7(&;_(;EURb<EsI?UCP@*hzOhv8B0`o0T1>a<$$6+l=XuPu7jk#jS
z@|1a>!Ygve#49Y<5h^l|5NC%TV8x#>(>^sQd(Pu-BGdCaV=>L{znHI{rEz(Cl~$X(
ziJmo?UNl}mP&ZWj#JZ;$n{^th>Lv|ihcef)0NCF$lARj)g4QkfxmUX^&^{}Qm<{|u
zAMy>iXccw1s?9Is61BQN5U3vr+@kS}ea71r-ME<n^i3#IMTG!=d6pb#;-Riwp%#fO
z?V-ZJ8+W)YpB_lS*qQ<JIfXO0C<?27=97&2Q`|H>-k~VxgMV=(hR#>w5-sf7{7(F#
zihykhje<Jtw&7)~adVhn<hAj^P_(la(tQzm$wGy0;({w^_97+0Q1cTMGY`t<YBbyu
zgot?vSXzv)#^njPBTQ5$L}Ow}M&=8nVEf7`tb$tSxSW+ol2Oa3;{N~!Sg$vQiUMoe
zr!e3XjG+O{u9B>dSwaPgO@xkrvSxh8w!j)wSY=hR1$4WJQGu+$JUfS(S7#y$?6O|Q
zEU3{)_=Z78XBQYWgE;99qcHhQ_9Z=ZQBP@NnRJ*njp0yB1GtCt#r~!PH$fox@Q5aZ
z?D|mbg;%{3U_RKExVz23niJI!QiDVXG<*d?NkQDg7SQaln<q30bP%Uw;#gRDGMzW6
zdqJRXoj{p=T(44=w1=jnd!WCKOw+5MH=2Vpw2w#G#N%cU!wObd*thLvr?`*tV-@W}
zr`Qr!Kjg2bd%^P!#<-s|K7BpeiiX*XntIyqai2oDns+GE^9-VroUWG|gTvJ!`G;=M
zhQ89?00S=f)HlCkSdnm?UBNkna|KH}i0UhXCy1^ga75}Mh*NOeh`rRQ#G$L3Y0N@x
z#Jt=maJ6t9!1n<uUh>FB;#e;bI+gM0CC-<kM!Bho#58)X^t@l8N7UMBHk(E2FA?{P
zpLn^7#pR80=yeyCFA-T}TIM&*RG3TD1uUy#>Z_J$Amq3}>xi+J(-^l|uSK||Ll=C_
zE-y0-M#p4!FuOZ}zAm1%6P=wvzVHM(=#CLA<1;MN;Fjq3iFIEDr#Z|_(J*iEQL~$|
zaT9A{juOnDH7eeJ+!#>r5icitJBg6gc3=-OhL;^mCgmB<7>!m_xkG_#wl$C};tH#L
z)Ezxxpw0N0S050o^_k5twkFyb`GA#;)l>_z&k?w<Gd=xf=GJOAAhXRyqU`?wFbci*
z1**r0C1g?82r~JeU%2d?{{XLAmy`MWo|h^g=o8(Mo5g;}G8IG5_@Lp83_Cw~OrfJ{
zPvQXGihCaw6Ny@&xkx2fR64SD%Zd)O5#v!64p<RpZbyw=C17aJlGNemN^AYgMp{1p
zm~N{{2&)AgbkR$!Y8u}IZe@km65K<@7kAXV6~hnaU4vSpD$QA2x|o*qGVuOT?LA|r
z6U@Un3D}HAveTIGx5cCZ&r}?0=3D_dS11foT2!EO^;7$VpIb>w?JIu-fNHvz?RpI*
zX@n~gQK$NNoT^knmHbA6kye9r3^?f|Y+|?&k)W0+Xgoc_Fl)%gwD*;Qa;}FP?j%fD
zptL^`0zs1lsGA`B&*p0y?I;|4$Ml#_y8Wl%*ufnm=!am>%|M%Sd#VF~_sq6WbzjuW
zOUcP)N8W@2+P4<>8wWN0I7+8<NC{2KNsSf?3Z?>5Q0%ThFm~%Su;6)`itb|&>m{{<
zKF3jH;k#d&i&exB1(aJ*FNEpGgYq+n@Wj3na*!ual@@O?`ywcyCl99@gMZ<8^=iE>
zEj@|v=~&;yUg@zNFjw;Mt_6VXK&~L`aZRizaF}MT2P-0=hTyDAA|4`~MYxFK4dPQ5
zsJ%v#{1S~pFdKl}Q<-Kj&<g>5;36GVv6N><V7O&!>Lua_2}NQW<NQ`>InUu1=96zt
zvFNQuxV**gE-~n=cbK?~#9YOwtb3FxUsXiBu~&lPOeIu4=_m<l;$ra^IhXAp5o#}p
znz+2NNV$uvj94)go;3=~bpylaKT#~rGU4sis?F*qUL|9eC7Sn*-IW3D_aIdlzUGdR
z$#h5W{Y1<K7GJcin>dX&wm5)yEzfzgnM<;xLwka<FXAP?8EaDpS2&opi}r!#!<nB0
z#v{$IY|I*asGzz}X`BI$#%kSCATXhm8-i8na!R_;>S23oteXb${;W>3m8@kFWV}Ub
zU|H=q`M2-WEaM)P9|!XEWzU0>Ze=Lu+O0a_5`g?kUPO$$^k$=%%px4~L6G>5a$F)^
zkv_O8QlIeI?Kb<p42X`G(k|n6K@Eo(^v8RFao|^WKZtNsVK2m8aMIL^KGG-LKXYM<
z8Wtf68mU^`K`3q6dx*=W=mq4|6gS=G8q_ma(wE}|{*_@IDcwzZDeyW-f(mI@>fw!@
zz3&kK3<%;oU^Io0(lo<`JXjOrPmuora=~<*XPAV*(r13e5U9fjbM{b=FSvyr%ld(k
ziIf1X&~`!7am%5Q8heE2R>|zk()<KBcNqO-!lD`ArY)RAs~j&k%u-Y<WX2oubs00O
zs7+OCBr5aQv}%sKhm73@Er;Q$Rb#7(qOh@3QQhEG0XU906XIwG=KYiQxToQmh5diJ
zWWA(5uCV))W~2DYf;n@*GVAs4;#eX6+{^l<#T++jd0_neyH9DHPuWodhu|r2%u>W?
zF^CfdPzzuA0uQKAJWVuA%dcqAU#x)p(pQpUYCap3j{^XmT~4s2lkBO{ZOHHq#u)CT
z`wET+@TGk};BI?+&b?2G?>P9E+<hh>=_a5JcGj4tt%>|VI+_KTYhZT7?gL8+;R&qb
zBbWwRrdo(TlFUR7qB@Jy6RU~VWx9%#oXZ{{&BQ9%<%Qg`mryR45&KS(kXecx52l&y
z^jNhNUYmL?MHb@JSAr=Qn7Q0uBJ&r_Sg~#`#o{X{QvqpYMb-A^Cv5o!C0izsXtgwE
zUvYDaj|MG8ZevaJ7P*dy<@V+$H5=8-H&7k0GJqG~a4Thjv^=md-8aiCIL0WR$dCPn
zGuEXwn(+~zJ@XTeDhyuwh^Ak}OBUcc3S*lLVmG_R=M!rO3%(#sHC|<cxZjy(YudFo
zxq(97cL*5|C2AWv4;2OS<HV?=?I{HP=1bj-PoJn}o3mB=pX-o^(`lInd(s&ziHH5m
z*c{kg#HHQB%n*$*rih*}>Jj6OOXomtJF6K=Wj#i{*Yf(KRUKUbkk|m007))GF*Xf9
zaMHjf&C|kb&a62>a7yB=14a<*+jlikNDu(OKASzJ-*hbU1EEY@SV`Lka#rI10A}&l
zM~HZ3U<Dw6K^-UgpzIjn+pw4-U2XpWR$RDYzv5a8(v*BLbxl+Fly3ud#+cNo12>%5
z!T9!VbP$|KC0AOHO@PFD)MW}4%%0w63RDz6FkL{9Ozq0ck~cB!v9B{ZYCGE602>I6
zHozNNgSWZDR$=?4+Sn`?;tbM>cWgyAV<>Yf=vuNe70xe~nUpA($8iC;s6^aA2NX26
zOzmSWbt=qY3L49(VU$!*D(k;6AlX2&gx<EtA*c-*0wytuj1UoMS!T__&afyWVb0_0
zS6*0VUE&KnF`^GExv6-*A)A-6P+A`ns5USE04&1!RQ~`lKa;=eVFG-gu|E(-2<h||
zneI>1@_w{1>J#B*vZunrYGc5VM9flcBdN<lR`(Ec4UfbSDGCx%6t#5Aeu(rSa~0>A
zR!6eyxY4U%vRGU@Tl;Msr~d%q)qW+R?NT2Um1CdC5A>ZG<csi7mUsSrX}N<XKFErs
zk4flPFzeHw637v?nKKlCJl&xsNT(GPRy7dDSQIy8lwKoSgwoFT;PSyu#d8Ga1Iz=c
zE2%@RL>P`phlrk{c_Wllj$+LbE+wUiw+Gz3uP$XTbqN5$bi=5qhqZcZ(P}8VihDgv
z7NXQrEk~5LFA;l-QDTu)T8qWSs5JpROmNlXPzBcy@jdmNFp!zf<yLhs1oubI<@FXS
z6vf3wzePBU&SHu!wKa1Ak*&(UA8A@R-Abxf{iQ28hbm8bV*xhfGK<*|acK|?%HJ8{
zBD?#EeBwU~h?Hp~zCJtg1qNH^5p%=~qwOlTYF$571AcbEIok_#UEgyNx87Te&U2Yo
z3Ghb@m3m^sBkwC0TQ$is`8Bz=81txcXYLnOerGn^AhYf1xHaxfq3?}F4F&Ydiupyx
z2>9xuGS01PQ{{gBUpVwN=1)@4Cw2bOIW43^7`2|k=s6agf(KxxtJ{fLgQW7L04Vg?
z?Kk_QlBGoiV~fiQY83$lAGc&K>ikR+Fo3Dm%%I~@7}O)Xu$<6px`m7aQt$r&pfqQa
z;HYPIzlfWckza_XAW2B73!<s_EUVg4`GRZMEOjZ45mQB9)B&pUsJGf5!pT`%H4{rG
zH80{i0@$FH<@%K}>$MyMbzI9OSY6bPUCO2IRZFW9lQF=*#$6?t$R(PdCrV*`I2}hQ
ze_U7s#!Y8tgEzP+7;3Hk#J8nUu*!{_Ut>|Rd~Y+{TdAc6?JI)gquM*YyO~Qc_=C*6
zd{)xJsNl>YMz0ig9l6{vkl8EfZXg3lnt6yt&oqj7j7H^LV`Qft^=O^5#2_a?L)Wr#
z)wE~gZSTHldxkS!Z&*O@+J~YJ$-2JqGAB61&b6R%U8TU9(h&U2ED2$cBh+w+Y^n7Q
zS}!!ss5>StUgJ6H$C9C(FVCy2LPoy{G@mhlkTb!HgWw1?KvY2TraU;70a6-(7m$67
zFpy$wAVp@86T>rE`G9N%{9`+GitLNL5xA+qh8#k2f-*(I$5Q4cj>so>4e7}+4P1WV
zyuo>Z^8>gR1$&k=9wHHFo}e+2c$8`{Q4%B=p}3LWC8&c~^tY{%d5Sot=I4<Xvlpp-
z+<Zmz7Ws<aBMWhAV2oc8NW4cVyNhz4_Dhg*%v+;-jLBw7z99uVYI36asJAZ{A2Dt=
z)LddMi891mk4#Sg08w$6?(<PWE|&pCc7&qtwF1h%F)6F7`JPRA@f*>$se<D^2!*yl
zH=Rbh`G~pVFLZtGHai_k#tq5>s|KBBa9_Dmv0+~Dw%|TyaC72WZEJ`)rQADA-*5p`
zz9rs&+;h%I<!hfT4LG-bLzQXND;BKhIhg~5+g*9g$(Fm~EwS?{GG7{$Krg&CU-HaF
zUvY?J@XE*ch8V!Kn@eI?Z;8_r@>8A6KBl~@`2PUuv)XU>KxhYS9>{oZQM&a(*%|C$
zlx7B=O80;H0MkG$zbe6aKiUQpZ~U=ciX#62h#K$3KA5Sm!|?+&sWgc$6fG5wrf6|n
zN$m+CA%W9~Y@0R%x46_)y5xtv@inPp!F{3%g6I&GnP%H?%d`MuwBkG{#JauiDF76e
zBQ0;6+;kfU@tAJ+3ipNxfZWiVC(6-GmG))NWmpR85>PU*=_efA3z&(FwM!W;d1jWL
z)NtDA@d1iAUCN<OQ@HGxAfm3@CKcchWD|xRDT>~0uWSfYyvZ*y`4pKd8YcA1iXr=&
zX=1H1ua?WGKJI0~?Ii;9QNVNRsIbTPX37aD>=&-0>@96CtF1<tcA4fE+%crvE_|fR
zAndtGe+hu$i)^&MDsnl91#x`9h(q#~Ot31#i&>ubt4cORg|HsX;!kLWsShkt<>AC`
zv2t{u?10oMEE5WSN3^njJt0jBHSn+$G8vS(JhaOq+)ji;qHR<Mh#V7yMK(l@MH(W@
znYeSz2PMIGISk{TSUteJz&y$`E@hYKgbMKof;?tO11pLG3}3COEf(UjMHJ=evhx+i
z;wbJfb6bj;mw1XVEPhc(D7ATt++W0_B(xWsmErs`7cZzpW0~0Fal$r_mSXYDq<KZ+
zEk(0GsIO5@vner{-evOzC<V%@@O2AUzU2oTOa{1yS4OWB7j@#I2e*g;Kh)7WjjzXS
zJkjwJELc|m08_OLtILQ#IDw<$WF99(Lg;Q=mSArN4tta+YmG;-F>CvRlw7v*nE03&
zFK|ewhFa`rIgeGIC5@MT%p6nWsaQ5~oPHp&V>Sdx4p?j2Jf)uE!YbmYJdY*bcMpv!
zE*Mg+>R>$EpFW=+s?@5}x`u+6X<&wcUYA79d8O!o@!9P+d!lX?Wk`F=6}3U`^O>1=
zXq!ieoW<z#YYf3w?ZqF5xweT+33v*X8P1F%#_%8i07?o1bi+~Z{{WOGbz3$+5F~Zx
z&2YmQkG6^Qj>RT*Y(zeJiB;SOMRgv#5xB;V3nTEzIFqLtfe~x4dZe<dA?U&P9*rzq
z`0VoqhX%w8x7>{z4RT?~2TJH0E>ykj6NvE9l<r*@AwojDlG~!#hUQ6V7UqTmKz0(j
zs@80zpg1=vz?-@(tO)ZE8)$-P=I35sA*{n8kV8p_Ra6C4Tpq3x?CPJ1aye5q+ovSW
zYFiCsaCkS0uwIDp$|SA|TDvu<gxDaKYT+}A2jv`)zkUo{T~}1SSy+Tu3)s`-OJcE(
zP=Rja-!NcOzU8%xu5F+p-wY>?S#PJX(Nf!eN^Veq3XHn$XeQ`aE8XY~L)HQy)%=-|
z8~stoD-qA49l|4$4a_?ro0KsOOT=4<j8smEc50<MBF;4s(G+NxIAu&J+!36>IjAtt
zp=1lp2JU6dZ_H96rZ3E)YNhh1D6jHgF>l0Ki@!mrxSV{;^A_Us7l^*`dSdYwqSRRU
zMdgp-J&{`$?=q?&0eH-@rvgS?8@{0{jp|UlsIKF}S~f8*;RLi=i{Ei`a`DVZh_6I;
zZc!X=8@e(|t_qlBbt;@k4okR&4l_NsDcaoLW|!A-@UCSR{{U_WHT4ipMeV+BWT0vw
zwfP{$YP?L3iQxP_!428s<7sQ3Xn7QbFdvwy5L1jwy1sdc0Qeowg<k83oS}xFFkFp$
zaWAp2%yHWIg1Sd@onCq+j#hqRt1y9Z*7G?mK?T#4#$b#lyv+feazR@2+zSq4GXa<6
zzklJCjq^>S*Ae9z@WBG;Z3PsH;fQH{lWaa<j-T;v(MT6T0%Q=SP2T9m(pO4F;&>H?
z@O6j{32aq<JVC;W&{51d$jT)%P!Vx$tHMepByuL|AGa6*?+d_P7@dg~THINQkp$6#
zXh7ntno~C1W{}p=fwkJ^52;=&(nWq>z?pmgmI&m3{Q%MLLmdO!-Tomoy^Hvob5bDq
zWv7+FIz7g{C3J;V#e;Y~_e^f)jYlXGE>*1|Na9=xFtXBd(A?v(_DV<?31`$rXnmbU
zovu=*@dA69Q-#+tR1<+r*F0yX7yUq~7ldqEIZ`Y%+NCH09AzuQ&EQ!|@Jdq~UGiCb
zvr+VD(NMj0619zUP1E9Ma&;LBP;RDEd9VVN*#m6LfN@c&c1-%G2yI#jF>FP*&CBqJ
z0W9S3#33<`rvPF_xE1t(yn^B$v0CsjxFL1gf4GLP7@h$AkkB`b_K2hqdGY9nZJQ<Y
z6P6NXjyDy_5J24eS4%1(7LMwSmf|JR2Bkbji9=U1#}dN=gT1iJa>$C@Lmw%A4Atqw
z{4d@+i^NfSEtHFKc#F##f4KIHD~P;B6eb9#p!iLtoJFXpTl5RlqS<#Be8Lx(#}Hdq
z+0f#B!M~a0h%zy2F?@W+n2XIsaU7|SOvUOWS8=tI5m|P^T^qaf3~HrYmLaUfwpVA=
zqGxpz5X(t2`5}h>Se3i;3F6LTSGO_U^HSRHrV7s-Q@Psi4m9^J*K(nJ_=;XN$C+#H
zdrkqr0UFzVh+p;d3pSIPM9pW&_KnQKjML^QX-^TjQ<&o5r^KgXjd3k0BB=nl-I)CZ
z2m=dDlQ$}|e=%)sx9({g$EmMWJImagFQy|;*vh3pkxQH}d`?fdjuG~5G@>aR2^}!4
zDox(#^&&SoWP@sb!4SV8g|S+p;(LOh6$*?eWmPOc4&vUEs*Vuxk^UCIG_VbO;4|~4
zCGykEhTAw=a8037a0$e8?Chp!;M;8ZmRpC^Oc3Z&g8lbd_{mr!ksojW06GrAi2%Dl
zXiiK?xA#-HFctcW0PPQe&Q$$4G+71onL_XG0P9uSMHGf@FhG2SK%n3AL>oXoELOiM
z)eoS@{{X2^KT^&Q{-LscB7(`<N~W_`N(!@uPt2hPZw<rI+BHfsw{<|2CDV$gI1d3+
z8F3jEd-ET`6JEt?QJZUIt-0|iJ|RX{hLoK2(A$CLnA4DYfA^Ldi`gerB(#U=7kPU=
z#NMbYg_|QykEEgJ5{*L|cTlyMC~jDIxCc-Um<`+t?g;{VP@V{fH3la21E?;eOw@J|
z5U{3Nw=mSGxa#U=6%HyJ^>rQkEk_hzQt=kz++y(-;}2-tn8Fy>afP_>m~#{}C>B(b
zr)}{ort#NNVxMdC4L=D$`$n0cIM*}5DOVdstTNd-CRdw|hN92K%ukrV9%D0d*I&c}
zwoG^D+H8&U_Ce?I5zZxE<}ZvfD(nb|)oY$1g|1!1Gsh9l?_9?{JV)@9rQhNqYlVKL
z+QoazWyjPhy~|ayJVGwb%AW$k$<68`RfiV_D==%S`qDRN+AE4)Fp!#GW^KMQX30lr
z@6&cf@BX8ExoSVcIOi#q>`p1j>BOP%+yc<gRTFx|JUpdl{{X<zKHSYE9??p%8vDbG
zO%Ruu6bOrvs8g$j?m$e-7)ThhhRB)HT?PLDjS(?Hb-J6q-iAwtuh39LGPSy*AT!_~
zoHr}VywYz|9M|sR8lQ4)65HR|np5!=p!X-137bF24JfYz@0o=5a(;i0;Vj$ziX0u#
z(KKgL>9nl!rW*0(2(|M`QS}qE^a_>xTz@Kl8WsSseV_jTI5dAi#OT`>{6g&84SphN
zPE@anW^K>_fpp^k03sx`h6VeHpnVtd8dq(v_={Q1pSUOePekjifBKIay>bme$vk30
ztFn-CvsAyBFsN}`^9}+}c3Kc_D;sKX(S=JY=`T<mQr~U)9%IW@Rig!u+bovPC-OmL
zyMKgRWLVTrY9Z9?BK0=AL_DILMI1#ON;!gggoDmtIgV|I+(CB&^8mm+z%q=nxYVKI
zC#Z%GB}(&9I3+rZcTq~mFwjRqD_NfZ0L-H)+@xV1fcuH=SC^?U?M1nZa}aYW;v=}e
zVvBbj@jemgkz&1~HAHDM=h9TXxi3%-Fg<Qvwk|V?Q!9MRkF<Mz%kdY?ZMvUmuZZA3
zsQe`iR9_1h7Z-@VqdSiedVsy|0Kns^T!!(Bg}8`!SN$btB1$a{#H``)z^7wAPU07m
zXV309<T{NZec}yk;sW)od&8XbshV#vb67|c>cS=2j8q9#bt+o&d`uGuOBWx@xaEcT
ziD}o&Ns@fRhxe2SeZVr4cuSVo+)2iK41bCvoHybXm50o!kGvCCirrr$EU)03BBzxU
z4nD{uIV>lNoU7aS>6P@s4@a+H;E<&BIJ(GH$+936Kw<^$V)NW7g#yIJ1vr=nTQ*uH
z<Sl`I+<%j&+J0x#@sQM7J8deJ7`U1;o5ZJSu!!<ZInQDID2*Hf4&yA+h^oXPR?%!O
z;=!VqhlulE8T4#CYkfhYMdB&DzGvhDeu^`1@j%ociBooalg5B_pW-Q{mtk+-6IZ<~
zyUcS^BWw21BI-02KQm?nLB>P@#h2<~3OT3uFm!uB%yK?7p}cr%{KM}1p@7&YhyMW1
zkaMs<XkpE=KLk^f1pfdLHAAdp?j%Cszepfyp(*=}oS}L7fro61_>Gkt$9<6%B<U&{
zugWYeX!Ks0KVx7)+th!fHU`y)3>83i1fWuFyv7^XV1F?p?&k!aMsU>7wlC&h{vX9b
zp|O_~JjFPVMCeY0=|ph`^*RV6QA1EpqtPhFNxtBJ5G-d9T-;NiOden!U|wZc4ERcR
zL`<T1f(KAn+F?qVmf)10*?yzrJ+jUi&WU$&mosQ*Y8RQ@fy|}=Y{2j6fOGUpOsV1}
zy(ZHvl`S7}kbV=}ox&SwFX{ZibZQ?Cdvg|st|)5R*>ITXy3;W)u42{`5z42F9PrEN
zm%6yyQ)%Ne=TXWoF7dhTW-l2%Exe#}h829=46`)QOgXuRHp(l1QkNw1H4>d3aZ;P0
z<K}Fv3)}}ELj!i`iHyr#W8NXlf@Fg6HeGi#Fu1R2GHr7I0B%{brCWvbT}uk~L`>pR
zXnrR2qZo~20|>|21HI75pd8$+UHzfZ)9xh{{lsRza}CM+o79^aG%N0Kgh@-XwJTnG
z4(2E29Pu0CZ+@B#4S}02kLZq@gKeqklDiMgr}iaI6Wo+-J(*tLhGVDk4n;l4K7<oT
z?kJ5sP2TTM#zS70RaS_3n0$Pd`8-7^+)CfG)AOUI3-U6p6f41&DYe6{Y1~wgBJ{0X
z0-d0i&$Jf}1CJIEfH@%%q7jD@h>c_{ArzGuD&nO-jC}%IkPoVlLpW|cEAKKxO{M*r
z`c_4Be-q6F(tnM;$~j@w7m&}%Xo=d+)AW~ZylX>CO$cE+zA61pcATP%fo6~iMM{EX
zD)lPC4<E1~*X;iQ?0{Lm2mb)f4FY*0_HCcKBEfb8`=mpZYVU^P>CS`)+&8mF@*z4@
z2|g(sHYx|<iJonb_fXXpeZ@nJ7f{tI&9uoptr+e(yJcL5n<JjMn{1yF`+LFakLFHJ
zCWZDg$C}QyG+Qrk(+YrVF<in!b1Y&G;@m_$M}VCP$Raq2>RZHF#8ILp#7l^e7?w7H
zV&GVaV&_W%0`n@J#IY3$uq+^BGU8GJ0?Rf}9D1c9dLlZB<{pp49={MB5IX!zSO|xN
zOe2gdU#R_#^%2MFFaH2Cfkhr=`W3ih7`Rcb?-O;N^4Za-U#YQ}RT|>NwkEV%h|KoO
ziGVA6xGHG8Fio9zE6SOcI*Z&|ly8qq+E_8>H&es8$Q(wT&vc_J#YW!J-8z^saTYj^
zA&N8lnC-Y=sYPUWDwt=D?l)SQ;^ti4aWiy&A+q%o!4b=dD}2Vw*NK4hm_%w&8QH|S
zpj(`^RS|RiO<Xso3|mEMijD``BTh5XIH4{1KQh;WuXv1yFz6TOm=@0EF;1}qg+CD5
zR?(={TkcR&>pa2fd&({d0M1a&erIRp3I71z<B?+<a`)i1`;T*4n0*)1Dy*Gd%23MU
zno$)OsQ9~Wz(QJiedmjR$xV-_?tKw{zSH4>bMl^wk?91YSqSD1o8nVsR`m3TpHIw=
zr{{ewHqx$$V35qN(5Flz@4V8CMsV9oc?tMGOhQ*pr1IufPXX9(ConJqm<6jlZZ88j
zRIgIBVuZj=k+8)EqDLN4!TS<e^Bei%axSh24PY9~()_g%(mXdUsrJA@R+SMFx*^W{
z+m6P2kZgM<ZC{3ISHz&wC%HT+PS5ca(!ehUxZ<VjIiV>DtoI9A`|xiLC1tp<>$#3s
z0GX6GiW~W#m4ex|rzpbIhdGbLdYk^HA~c)D58O7#dSCwe0V<ODgBApNzw#1}@PD*i
z4{J;FQ<Wqo{G!xbIezVkR{b3TH28pg9XD1!>T8((py;bbb18*gK*KP3whxvHcQD<t
zT##3A4<rN3qvlbVW;H#Mm#CH{;!?o}K?AQ;3o!)5r(+s(PzGFz8K&ZObDksW;Q@qP
zGfWQPD{wNM!8Ve<B|9Z$Wn#Xg<0$G`2H=D%9|T*7iD;CT!eW^SU49dy`hsco8sz;<
zc&Eg-edx0EMehhJd*Vy{mz0vE_(f2oUe;}e`~*W9@aAawen`CsvJh4mOj6MHhia>}
z50!UteWaj=boQ0YDTj9yOhD^XE^x8Oyf3-orXu-eJydTA%Z$XcvQ`4TMEj_U!S^b?
z;&B0Pq7`>s69}F&;trgfs)z>IXvdyodlxaZydA}H{{Uf1&1KXrpwp-kwy(??ZPv(*
zS(T#3aM2pM(xpWzn1&5Ilzy=-&&~|uC@L>h6?101J|!!`JVl}`2RW}50JhW!Ri68l
zl)O|h?PKB^KQB&xeKN<BR%&$K@uuSKKFp_2;&cy)ESd%np)7Rzx?}sEiPpPZD#VWE
z?oI?8f$Y!YSRdyJmQ6Xvy#y3pv2w>r0`QT#8pO;RC0-Qbh!aQ#fYInaukX`eKvlOz
zqH0u8mLGDJ3?vXsCg89F=i&a7@mWIEm>KF=BFdDUCd3?OQUdC|pfn1lhpLB)KDOzc
zz@~EXF9W53!-sG@5#&gE`;Y>&m@m4^EQ2+uWM;$d*cO+hOM`PtD=6VV6(=l*17QCE
zH6PRrNARF%4<VM07|^!Q2Qc!bjO%$C%s^0sd@|05t*a&QBrQX?kuY!GHashpRXBGp
zfhI6$)7n~v=EHFM_Eni1U6hSl{AutgHGXDgDZwzpu5*;Z^LI)8&zWX``iuuoHA+2>
zDgD5&+lC0_Z~RmRbVi8lv$i>cQAZau+VbuEBL4suo?|Fvf~`YX_o^l=9oZcP$^I_z
z{8Up>L=<<&N&`eoq*d(@#PMnc3Tjuj4a*12>`yEUxDPPyfq8*>&%C248jU%*N{NW-
zA>tw82Lv9bd#IzRhY%*BH5(s3@Xi#A8A=%F46cB%W}rbhMDT<MLI=2TN19T3y#auE
zf!qwQbKNTh;sXPu5vVEXc_Oi6NWTPMgkOYrL#2c|eMIs4n}Z+2>NkrJ>-9E;_?H&`
zCCw4>h|_GuJ8pR<_P;2%;d24gnL`6Gn?#-)frs9rIK{(*sOPLRWi!Y1l-1Kvp{JR4
z1aN0kn$g=G%V9^vTyFTp$-Df)MTUK*9NOg`cPKouETargYySWxYRjm~tg}kb@f8Xl
z?iFlH1=H50#mSkYtMxCxz=)$lJenOu_y=7|>^@>Q_Nm^l%s8e_W0IeQ(+AWtaQCR&
zAyFD+BOR^YS&i}N^5@V+GHk2)q8p?;ZGk*PwIGTc$x$V-SzlR!WH~s??FoeD2y#Vs
zUx>cMctrMP4L_Mym&rJZ?+|FyvVM2afV7K>96gxgttoUKh!sX?wGy(<@)F9x{pC8}
zXtiAhJt{8U8q5*5J)jJy&S9wDNN;;4e;P1~;MwSLRhnShPnl+e^BTlK0*A1PGU|=q
zXsh)67|Yvd;D0`XVEWRNOYti8NtA<K9Qq(sU$p)2+&7+3U~>42z^t1ic6f$PTG-(o
zf)yd|d&>kpENzQsho8~|Il=^cK{rf9SCv(Ox5EyCE07!VVeF0(w}?{?k^}JqEztp9
zn=|n?a!=qH!|;F3LSoJjL>+^k=8gPCO)qkI)5w2?y~{gp8AbS6$~RSx%l*t6G#Ugy
zGf4)6jMXlYuw4{${@8r8Nd6;~eWe|?UKKx>VQuLD0C36#QP%g&;z~FDTT>Hn+B9D8
z7?>b@;u}xqR>-bsQy1dpoHzLjh)JaSJqXM6=A*=0iDwZLq38p_6Q(3Xh!12!@~KC}
zvD~XlIAB?}a*&d8%OD!e1Iz_VGLpw|u47!pIE2HV32Ue>$Q%<sh~|hXgf1?HA<lb>
z6sG3><CK_&*=CwW@A8P@_Z|u{JRtgnY6w^8!Z{&E$PVYaH-vKmcXHlfdz9`|xDMc6
zXTAfuSx%*8dY2~rP7k7_bW~RmO%ePNw*aDkrG>AEa^^WO$596mUM+D7YT#SPw7132
z<jT*#h;Ov>D0BQrzTV<syvD)jHFE~}j<{o-d}b#xS{45QGO72MX7=|1Rqq<me8F0;
z^%oVN5qzgHIlY_A$ae8A{{R?>UJB7rN=Sy=6XGXec_z&th(5eWx4JaVM3sq)kgsTQ
ztUOdYFXAQIejxJKwk8}Q(47G563Cks^*Pmc{rY2mtZQ{+f}Xfs4cY#bYHD%HHF4YH
z-k)!85g@#@o&NxvrhZe?@DS8QigSqQfFRodhY=zN^$(b)5|sjRQHwlcuY)i0JuG6w
zo{>hG!&o;8mOV64i`fOxT7i*yBL?8=SppxpD)d5&DbYD!QbAu?14`U?xdW0HbR3T1
zQZ|gTJd7i!xg7v>mPcMb2NYH6So0lC-tXKt^%r_WQ!jx)*RSKo>%-FQ_@PVOxGgM2
zIZhd_ewzkZK3j>vCEdi<@c#hh?HA%~U&P}_v|j%JG!8es4)?h<-pQLa?LSXat=aBN
zxJw;B;YTpaAHd6O-)1ptyHC-BudUGgkJ>9hm})`XKTtoGRrw~oO{PIMo^d|ORhIDY
z`I+0k_vwKx#9r9%YpCIwf3>=p@hF}lrINMr0o*kV3(N<h3{ceOsP#a2ohY2*BdOC8
zDs-ZbBE10}!Ryfl%p{BVDd|||JjAGl%EU!S!dhw<Qtf&IPaIE}<~1Du0NITLzxgfQ
zzjBxNK}CnYU^x=?kG;b0Bh05;{LBb(;lFt5!gSwpusy=oq&DT1{GxGKtr&2~@R%2v
zE}$JCKk8SqQ=|_J2cZYDQdd_4%PG5_Np~KE1Bq&=h^kp8Gnig=12Hl9_ntzI<yM&A
zGPj-cQS-W#^50Wht2iRwVs`2@f5@vr<1yxqaT|2jKBHK9lqFKehvp;2O>EiQ2e)vU
zTb`of9DGHk?fZ=uZ^mZG`$VYcscTk;Pfv)iPiT0QgK_sGt!jwojdc)qYplRKSF};n
z;wSziY*8`H9W-d_Ae2VOGxDFf^Zpw`;OPNJ)f@`D9Ylyb5n}6@Mv-<6?aVP_Vuj$B
zWzS|+uLI=wB|2}3M$_6=v*H~O#A393lUvKv@Q~5zKmbtfhkM|d7r*g}b<GQ?v^z)~
zm(*7RKvr5<)e(^|k7za0#b9*D%IFr2H%j?t8YblG`NS$tqK)}r1~Dy4Y`IsHbs~2e
zF9Q2%bx}#e@K!fAt_ICTW6^UXfCyjQTWa|Mihe?J;r!AoCWE~9rc%2u*SIYEgFk^8
zLtZJY+#q%g&_hI@F^wqZ{mqVtqZudTLiIScVl`bn!v)`;OasUN0K|i^n<4Q(jW95B
zp{Cxm5LkX?i~EmGCt!OSp<fZ;KIHPjG(W=L*tekjmoWasvwmIN{6Y4g8ox4>Y5*T&
z1rYu*{2^RVCJC38;E4SG;6d&S2Xqf`XK+bmvr>&>BdDID8^lFw3yO(&h`m6E!ds}L
zh^<ucN{nhyxnqfVEyw==bG$|(dznQeRp=gobpxmssDAJsCoNALI><j0n3*$msZSf3
z*n!xwfLrq@cjD!sc+3Nb_c)DFO0ihnFs7mnHK;EdM>MhKB9{A#$&^)pC>{w1`)3PZ
znDXoQH6P9axZ$VVF4yjKKXEvx++K&=A4l#MYxf4@_YJ4n1=0J0?ET8Ne&b%haGCs*
z_W>ROS!+VLA&o$8{-!H9h-T_n%wgxmOfxyAxrvR;Rv6~vwRaFK4Z-5PM;ZPiahXh6
zitZq2cPu-Os0ZFUu_@q|Zt)znV(}Ha%uCNz%qTa{oJA}0Lx<sV%DO&dLiY0;n*GHf
zjO#G$uzpD5L*^Pdom1{jH{%d)_JD5!k_>H#M8y2$(k)DQpHWH;nzc6R5Z8UYz-1a(
z4T(2yyjdCdm*GLH>3UqT9Fh)dJ;k$xQ|mRBUb|$)JFoDgsL-@(Z+UuPXrPNwf{wX{
zhusKzU17;_o=CP0;p_Zs_B}x4WocCWJ$HMbxuNYZCgc`4iWfK=cZp^)tt`|KA`;{W
zVF0?uSRoYqh}uMlBL3h7yQ$Wv<1+8?cvFnbo}RAzeT>71En=-cCF|5O?U#%-w0MI*
z9?G{-Hfq3J!80cp9)T4%qG9rbdvzWu_GbqDqQABfhWl~l8Mcj&OaouIfywxyAAn~H
z`!@o|zC-&Es@FgMFg#Ovc_YLa7?+4u!F~pdC6bt?F9P%aF2H@swLcSLUeojmoImfF
z9q)2zJ|=8e*}0%llVW?2eF#+!;2G0<pXi2sMw~}X;>x|tfel}{9AF<1PS_3?(I-4l
zBp&J`m<LP;h+0+wmVaMFA|+xv^pVt0Q5&e?bsr5y{l$@I5|iR4EAcJN&#20uFnRPB
zn5)E5@G<#_O-!`HR3W%Q&S7jzU<QH}Ji(g=5wqqa&&<4M^)2>*j=kYmsH7JjW2+l#
zu3VL!53xH9adQ^ib9XB?D_&-f+RQjn^D+KQhAG*(S_?XWgLmDTvi{*}+wK-&{4gpY
zmY3W}Pt7RBA21frx){qVDZBfin(|94H?tNgUokR$zcSHk!+1SD;$ACcu79MZX(zuh
zJ$uKAS-Pv9&oQp~k6+9l`ngbW5qNVlsacvF5w{tQWa~2{DUK(T&$Y~*_<*W0)B;&V
zlymt&)mbnNm?c|b%&kjV<_5CR<sfR4d(6ROT;8A;?n8(QJ<|dE=5W<OR(J0^e=SE1
zz8LI&(fmH(NlieG4U+hjJ;(TlR~qA_{K||Uc}A`7N<6ZTZ<r#$%0*lAFxmV=lpf?C
zf$s;`*#^-2iX)l%&qU>CQtn}nLHHy$FJuWgBRlUY+V>^EyLji&Rg?rjVL+Wd$T%jq
zAZ<6yqokjhe&%D^3KROTM}Px7wZuzC&LXF=CyBwbDEq%mQ_5`inm?vvfP?QC!2oq`
zqFRQoHq%jPkr_gFQkhy;hqOmqa@%Ge_8zx|^cNh`K00pBh*D=5>}oG6j{tQ75X^wb
zWy*vXquqwctt9=ym{T?=wAYxJ99JclVT+l9@LWMmw}RTaU*MSM6u*D}03D?qUKr4m
zqTUBkZkjCHgUn5#uJ~X5whQ8a8s>=##KQOb9vVkWIP+02u!<14PEMlwh)1d{H7s!z
z6lX-MmK+!tF!R8<lrsm*E#?;H7t{*w2Dd3JVBe)3&t#-!IfXeR_)Me9phl4(v_$G#
z&rvm8$3$t9raufwr*sjc(sjhMPA(&_F&T!jTlt2snPT4KRf6x1rgw8P{xN!)1)inL
zVquQsXJ0)+16eU}=S|E#ypSsu_>ME;9cyIpPqFU<AnqE}_Qx;`Z*bV|n#@;kmRnek
zRk&SJ_?>0`Cpat2F~^C#eC`Yoqay<IUiAZv&l&rH-?RYOoyx54W9A=%8!44qYcVaN
zXT9+o;tYRr5!vmC;JTS1Yf_bDd#!aVxa%$$(WN0StLh?~XJ#f@t+U-IV}vV@mzaUe
zxkW1P8r-@TYxM&AtxjWyJVBcM!B*A%!JZ4mV|MF_lnp(=X})R&t$w8^8PplP^9;j#
z#9M#38fHwfj<l8D=ap8J_2R#YOYH{lY!NJP{QLx4e^g(DctrMMboMTOXVYJ@QCzM-
z@Wo5v<@ZGk)o0*{l+_ALT*icS@m^t_b^sM!5g#PdC#AwwDur2W5;1cZ?Gt`v7h~?J
zrry$+$S#zDKy?+17(LI_NUI+gFw`c|Y_|8QqQ2ocL*7+d={9>$?0NKR-jxx$z9XAG
zP)SF_*N3G)J?n2*lUaP4W1v3dc~IJlxNq(KvrqQS9ttaV8x)ULmqA5L2<2sv1F*9U
zY8NZI2FBkpGHHtSO!_%CEbay9TH&eV0lePKqx2<BKZqvO_aNF3ZGF<t&;BHarrs;8
za|NATKd`~%a1>W>{{VzWmOVeue&u1Jb`bBT0-hox)gGvmh^G^zM7&0keQqn_Jreyz
z)VU~ykl0)n;dR>w%p^Kzz8B5I3GS9uTOt#Z2T%rMoK44g9YN|7pG(CPsHASU7NJZx
z@hx5aM4QC?9wU#o{KbXniwlUiS;QMRo?>&Ao8nTH-Qj|;USOgp`-f99yqV5!Gb+=A
z4sjvk@3?t?QiACCoK`>bHF?wAXdOiDiJQGl@hhL=8m0<ypNI}T?-92L+%h!gC9pA6
z*)dO;Rk)(6pjKsP7rx<|A9<s$;CPk8q6RLZqbJELH(JcriCkk+^L}71<zFcsU3@Vu
z#g&+d(}p?7O>Yq>t@FLjx4!0|aVu_SntaSMUY;fexPt7+seq2JiAP%?#jbx*V&WY0
z3v`}-VQN{M`-w*!xAz0lzM<e@o(^T3;GIsTPA3Ki`Ab;~3n?ru3x)2>COjF$DoSnU
zqFPvdkXAQs#<`jC>Z=^T()ovJW<l-MLD7_qQ&;+m3Co(p{7u?csc-=Tkbjnj5;-HM
z+J1A>PqJEvA*B1wrUNqu>_A%n5&6y0gDcBpl<^nY7FtuNVa2xdewhORZMNdG5ogFo
zZMF#WP$j@8G4mP)@R&@_iAwTS5%^I^jCS4#p#_vWEgos5i$`AY28%yXq30h=;AV3}
z>gnhZY}F1>?ft@Vz2Pix=T6b=%C-I@LhPW%vZ$90PqG?~^910Asy9pRe!th|Y<eHK
zYtV<5Eff(=E#e54bLsaNqo!8c+Sn2>X2k%!e;x<K7<JI3VtV&PT@T@nn?0ES00PSW
zm)t{w9k6-ds5~U6VfJM|p*oMmA9VL2sR8sp<!r8{4u}DR{{X{*tbMTm0J(gW*83u2
zps`ED6<-7gaBNR(2Q0Es%P|uX)x`8fbry(tB6uQrC0#|1rS)F2(w?BOZ3Tu3vdT<1
zFS0kpOX5~)Fe(me2!~KWfUSCEIH9hgR;4%zwqj)x@lvmHr&R>7i(07Qi(U0C%&WS%
z+juyLy7`QM9K?{hTzhTc>&zJ0Rs=Uki_A64<$<8Dh?Qzzr@dt2VQ=PA87ekn@lRTv
zVgwXZ6n89sA(vdt9A<0UQLFqw#@{fl)?jya0C{{utpbiSD52+=Ui@NKDdHV|<!-kq
zGr3fm%Mfu`m70c1<G9~~c0yJ;#MQ3I<Ilu6)mOx8fjJ;JKZx)(?;F_dh^3f1VqTxE
z!A;ZNr3UrpR;uHdBe`PNEJ|J?2-EcjH&3*qHHf69#3_n`-CWM`Ma&Hr=HhtKn`ZGh
zusupUC1@y*@J!8o&DgkUX|ZQ3cKyqFJ$S^SpU}qUpi>KunzjRRDlXPPQ37iq3aZYf
zGf{od@fLO}U-b<#d@<AQKOyO_*)k80L?voPwQix;E|uC(EHq#E^rJxg#}`F{?YJYq
z5*NKcG1HqDinCF@w)gBxz(rqV{9+PK4w^zQ9OMkf!5Hx?xLS)<*j{nm#Nj%}0~&&P
z!Z>qYSRzn63`ZhFL0rryUq@64O&H!%e-X19D%>3o*tb)`^Hdm}upCRFTmlzt#_LEg
zhwMS$Sts%U!<T!InBs~dWO5;a@fn(n6a^qI1k;$T1vX3OGO*$FbvA!&zy)b4QwuU_
z<+(%LWW3pB5woiepEB6%pCN4d#YGH=6>4YG1azRX?21%i)VbnPU{`REs1;SYARNB%
z>U)x+{<Oxw>>?6lSBU=rIZHsIVHOWP0psSB@_RD9KZtV=#2<n01=4)M9Wu`U0Qds2
z{QXQRN72gn46v|cyaWgRgPvLBf!q!l2p9(!0Lwe|qf(Vpy%7wguTedENMq2K>SWJ+
zzx0;4xW2uAY;VM6by@TUW_&$4v|eR%D>E@E%K&1aUZ8)-2QWB1O~IO<bwj%Qg7Xsd
zcEQQ>J+3QmH3z{l9fVRX6|L{aVPFTe7(W?@MZrd5B5s_R#PL-yE*OrgAmjMdHJ&H!
z;-Rd-d2Us4s2IX$#4_sTUpi%XpEFs*2M-dt(Won!8h<qmYO|S6EU8$y1J%_;@$Vhv
zl#a9F1>&_3IhAfd6MK#^QA|sCd5$96T*`f7B9o9XM;f>&Ok=1yFya~*uA|vmuX)Mb
z2Kn}hW=>Wcf7HW=m>aBkjIn4P2j&k7eWieh#7{orrGrrygA-oSRj6UDOZE2!s;_@Y
zg0p8)Mx(ol+`O}>*E7NC&fuW_w3Z>O^H){WZfRoG$q6GefPR?BFoBb^h^GG3VR=Rb
zNT780u|*gOOLKqV>JPQ)P!<~w;84WI8HS(4Mvyp079*tlOkNMN4W#*uYe)Pi(!4nC
zGXCRRGIZyZ&Wh)MBkTVF4L=?F^-6q-puc3;n8PQurL+>G+`&8Ujw3aE<wFwG2e_};
z?FX0}aH|Kw&S4y|gxoEVwpar5S@hN^qR*(+fKa5R4<rP~yh|+uv#2`_TN65)Y;<L$
zAp4wMMsb-H<WKhz`UWCdm@hDO%FHP&iT&Wmcg6_0OKwuSZ`9HB{c>;=s|D1$VTFTa
z`63P(dhycMt|fP-*0Jfh`j)F|FpM`MxA2cGMhmf-X$Z3=l<|DbS-EUoYF1da#fx(+
zZfkkxiwU>nnI*3B`d%@<$iEZWhjGHYD-VdxH3B6q8{rb4<J4c(1mFo~aKweNT`*1)
zyNJ{B!Gxzj8I*1KiyA)=ZKK?X09)p2zwkgdlE};sIf%>G4^80Bz=040+6fNNMC~kr
zIe~eA?p1(u2a;uFr6G8(ruy{Lsh){xq+RNJBjY<pA3&AqCtiS~+GU94+>)!9n~ppG
z08-2ErXu3wh~m66+gwD(WjN!Qn==xy`()-eMowixi>8(gmebpxs3O05(F_LZ3cfq6
zLcNmZd5OSd#C59XIBWTjTa;Q2Vgpay7fnEW`jpCBrS^f0-aN|9gHoxw%%g>=ma8)g
zvf+DUH3N#M73bay$kPKEHp;DUQ_m8(<lOwSth(QrYTUB1gT(7mFE#HHu(dUWsPn7y
z6Z0&#ADH7O?kX=+Dj#`<#^!3gM;YG|&Mf$i-QJ>=QM*+Nn_+_}+_8#@;^I>FhhSOe
zQONT)jB@kKmEneyS2k(#O!qHxEVJ*6>+_pIXz+az3>Wtx^r%6|R_-AUY`d&L9^yO9
z!6`A~3O#<5Mu{&en%Zqw^#Vsg8&0NiqLOnwwu=$ky`g3fCWVp*0R;|)e}k#1<t<pX
z!2|sBf^t3459KWFe<bLysQ&<<#X5U18e1aYK&rmdu5rE51abJIu)Uf50Vw>mbf61M
zm-L0M$}idprumk40BDtim1B+i?z|(Y-<jwvjDwz_u4SASk7urw)8%4hA)!qB$2!Jw
z3|YLm7tMDJ(uTqcKXIfWwlSyfBPz~HvlH<l0E@);QK^fx9NFQiM%2_JYk7EM3SR&R
zIQotJ(2Y8<VHgX^>Ikt}dz^>uAHu8vkRyqSqvJ*4_cTys;pTxtQaP6@VHjcna$}jF
zypH{csWd1P0?NV#CIeYB5UW9Pkt9uHOJ@)x0cs1Ty)aKt(V~WJ0n6H5$(8IjQGkm`
za|_~wt(9zw{{ViQep4XwfSxEU3z#<EJW6j`jDb;f*&M~kMxbK5)(oRxuwYWcT~$L%
z3SPB6w|+^CYg667%s03!T_ZifJCP~WdXbBD5aM{Ey3D-4GQ^<=NCY_;IFL`Gm;@k#
zvpMaR^s@Zp(3PI}!w-a8kJhJ)&@(fAkvfJP>R(qoam2IC+V2r36I<?BT4kJHGm+*d
z()`X^ZX>a-B`>wiFRmfn!;Rpcbl1(p8)H}843@1Bj)}og0lh?Za?Gt^m>iKij#m&V
z{$Obn+9iMNp|AH>DL)DFQ5=+*nO$a~yuhod94RyZ0ARVi!25t+Tk3KC<qoP{hdjh8
z@W59z%vIMMOmae;4(Aw%RLx$#Hxaw2oK_}yQa@8HJ9jdf+qOH;9LoLk1`_X>)=gZ)
z^{Hcm&(zM5-p=AVvKQR!j&oMaqqKNBXDGxoYpw4RkZzPXFU;hWPX*kfHX~5C+-8UJ
zg^6Aq<F~(<ul>L@nFNJQ8j2L@XT%?W(;huVANH)mwRuA=Qqp<8(*Y0%c6U;&*G!<o
zN7iz}tJlO_HV$xOsZ`C6cpd@aLKJDXhknxiP&hu0r{%pUc1K}*lVCm*hJA{P-FrnJ
z(o?`5`JL_@52Kv#V@bdtV>koYxliX5KVc;PTZW2!!8W~_Xh(72XR{yHQBI%C=P$W9
z9^i)Cfjt%$SR9h6%P~j1F8zqBTUcu^%r%4aKN&H9FI815fDkHk$F4us*P(s`(B<j^
z(t_U^fdE1uGYbi(vp+fY#2K)(Lr-j6k))gec_%C6P8WMI{sa=9S=Eqav+Dl<P^K0F
zj{t`63WSmc7J64XJ)+ATQnJorIDxPS5m?Ynkcs4FwO8C$pfuR;-n}$Ec*`SKP4D78
zY6~S;+v|dRkl1)*V^@cEz9o?4bGV%-HiqSIE`Z^@#;mZ`fGAw<X<D_&V^Kg`VQKLd
z`%>ed_?Ty4Ts`UZ#9IB3{B@LdDJ#sQ#IIA@N2+jCMe0|n;h1_?>J!>Tih3Zx<@6i$
zE15*1Arj&f<rBnCV+nDzOb<jE(nr-#1l#_g@<8YPPnrPl-V#{#C~Q6D;`xk;<|jG6
z8HFd@9|$at!-;X{F~km{2usn2@W8s&LEpqVF;~Q_dwwNwbJXJQ*oP<PS9h3F(XOC=
zAY-U(UO0(c;uv1wJ<RQic;~B?m}l>nR%n14VPnh!^Tai7r3FVH`zfudxl~(;?v<j;
zfMzPVmv&BUmA?FvzB-5_drB(mI->LWlrX=UWp#Z-Ij9~jgFL4ZaOMQfR2yj^K|c{j
z=so3!I@C8uzo>><)U9p#lq)^&FssTN*YyHw);fXwryzc1ss^fXHsQzICVtUMw8wnF
zxkW=8*SttA<{xXgOsZ4D*Kx18MpzY>?mb+?FhHq<DPcj_Vd*N;V2F8%!l(c;$6!%I
zGd%wQaT2?P*%Dh_J0aLiTJ?yIu~y{i3cQJNUXGdh2>M1Fyr#~01RA^4O~0{daNCn1
z)q6#sCeQ~S;6^LnLQ&Gc4E%iw_>T<R4`x{DBfMX7ZI{ArKDeft?9b*Q_=P`^*EyTq
zPuqG+{zyNGYBT&QjK)*_`9q9*;%T4cp7-i@{{U%bne4-Wa<yBPXxgzMp?`Sdd%}OT
zrx1OaSLsEsS!Ezn3vDTs5H|(a-6$t%R!VIBLP20#*!0}>ssl%%WLbr_oIT?}q#;Kl
zc$K?=EELUr#3O@Z6<kEPauyEyMy$zsVL3nmAb`j);#{Mq8tV}mTFc59w*<wL3*))M
z_XNG4IzOlqDaQ5~G`DDR&!RxLft{b;rC*dG0P0O7Lw%|MdlIdGV&zSHqlorV&LgSG
zAxgh8$4{UvM)n%n2;_AQL;nDqh*aVn9)SXZ<hTSB5IVBqz0Lj0;#FVBpQ!gCcK&7I
zGI!vCd4TQ*xDMrIkV=++Sx5Aq&q_L;$!SS$r7+J>(gflFdSqp?lK!W@Qc_dV@6kDl
zaX4aeJQH-ch-o}GEaE8YRSCLvEU|{15Sy7d1H+rSdb-5Pmv<^!9^!1`A?6!8cep3Q
z2FSS7fV&;dhmNWR=`UF@L!Cf49sA6e{kWBi&$L3@)J}CVck=+d+&!)XmA9LeaBg@A
z*tGV6Ry8UsH7eW?Gmd2|!~@y~vj7VPtiZgIvzhLddHu|@&zbKirm60GMQog1{{ZYt
z`-xbIdty^D+TiHPh%ep-v7^SAmHUn`o0bae%vgGhu<J7|^Ws+2GXVMKI>Ug2+Z@Nf
ztjVZe@bNE9SHuy!N{Yh#L0wh+OcIPO<btF4OHlnz08{viS|uTX;QnB`i`Fpyq4#A#
zYn}+VEOtGI%-8ey%y*Og0-%O=e&qncxx>6(pgI=bB8_ACxo0pWg0raLgyc#s9zh_c
zD3p(1;_7}*UmovJt+aqRSExv=(SI$J)A|8>Vo=HoLr;l}l-O7<?p)l=U8kfSik7^L
zFwD>ay|BTq1Dg&>hy%eZu3}9pV*ZSC)bca(Od#9GK*5jUXl>B)+8Wi|PtL&@KHbck
z(e^sWM*b&tyQl7c5sds`78^_1h&u@FKg8H5SBu*ckJM8c593wO+(@tDX*r(Ke~kkz
z{D}|T3JbdXi48Bh4yWpm@b)XDdokl)(O>OL2~E|1i-2gaKtHLXD9>=A=9Jt<+TAM{
z8(<No8_W@}#%4Kbi^0^o0-2U6mTm-9PT$Hki=fck5_dq&Tg<^xQ0vMc!wFsVj3fjt
zJsYm%4HYRYzjjvdh?^47;sLT0LBu&1-k4~6$g%v%e6c`v>1|pxgScmpnvg$W5qiDA
z%0D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
XTdN}e0t*0GsX|4%|Bk)(zlHw;vn+8r

literal 0
HcmV?d00001

diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index acbf407fd62..139b3e463b8 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -117,6 +117,7 @@ ImportFromToLine=Import line numbers (from - to)
 SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
 KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for update attempt
+UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert) 
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilteredFields=Filtered fields
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index fc6e9ecb743..a886dcf475b 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -241,8 +241,10 @@ else
 			
 			dol_banner_tab($act, 'element_id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref, '&element='.$element, 0, '', '');
 
+			print '<div class="fichecenter">';
+				
 			print '<div class="underbanner clearboth"></div>';
-
+				
 			print '<table class="border" width="100%">';
 
 			// Type
@@ -312,6 +314,8 @@ else
 
 			print '</table>';
 
+			print '</div>';
+			
 			dol_fiche_end();
 		}
 	}
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index c9fb0de6edf..bb043076157 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1670,7 +1670,7 @@ else
 
             // Zip / Town
             print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
-            print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+            print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth50onsmartphone');
             print '</td><td>'.fieldLabel('Town','town').'</td><td>';
             print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
             print '</td></tr>';
@@ -2346,7 +2346,7 @@ else
         if (! empty($conf->adherent->enabled))
         {
             $langs->load("members");
-            print '<tr><td class="tdtop">'.$langs->trans("LinkedToDolibarrMember").'</td>';
+            print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
             print '<td colspan="3">';
             $adh=new Adherent($db);
             $result=$adh->fetch('','',$object->id);
@@ -2357,7 +2357,7 @@ else
             }
             else
             {
-                print $langs->trans("ThirdpartyNotLinkedToMember");
+                print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
             }
             print '</td>';
             print "</tr>\n";
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ed3fdad13c4..dce0e5c19bc 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1854,7 +1854,14 @@ class Societe extends CommonObject
         $result=''; $label='';
         $linkstart=''; $linkend='';
 
-        $label.= '<div width="100%">';
+        if (! empty($this->logo) && class_exists('Form'))
+        {
+            $label.= '<div class="photointooltip">';
+            $label.= Form::showphoto('societe', $this, 80, 0, 0, 'photowithmargin', 'mini');
+            $label.= '</div><div style="clear: both;"></div>';
+        }
+        
+        $label.= '<div class="centpercent">';
 
         if ($option == 'customer' || $option == 'compta' || $option == 'category' || $option == 'category_supplier')
         {
@@ -1908,12 +1915,6 @@ class Societe extends CommonObject
         if (! empty($conf->accounting->enabled) && $this->fournisseur)
             $label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
             
-        if (! empty($this->logo) && class_exists('Form'))
-        {
-            $label.= '</br><div class="photointooltip">';
-            $label.= Form::showphoto('societe', $this, 80, 0, 0, 'photowithmargin', 'mini');
-            $label.= '</div><div style="clear: both;"></div>';
-        }
         $label.= '</div>';
 
         // Add type of canvas
diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
index d8d4b4b08bb..34a7ce3f4c4 100644
--- a/htdocs/societe/tpl/linesalesrepresentative.tpl.php
+++ b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
@@ -37,5 +37,5 @@
                 if ($i < $nbofsalesrepresentative) print ', ';
             }
         }
-        else print $langs->trans("NoSalesRepresentativeAffected");
+        else print '<span class="opacitymedium">'.$langs->trans("NoSalesRepresentativeAffected").'</span>';
         print '</td></tr>';
diff --git a/htdocs/theme/eldy/img/refresh.png b/htdocs/theme/eldy/img/refresh.png
index 9994475cdfe0fb8c646eb1877a84443066a73d93..a4fac077e7aa050f4a84419d6d3df6af9af4d16d 100644
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mrg*wIhEy;fJ!7wTyg;VmVfw;#
z3XjYVH8e}Kd|^AApH(;6IMmbY==^!jM;xqceSE*Jp1kz@pJ!X=+3pO>|DZB`;RK5-
zoKu5Viru@@@#Ruwc}hu^K;{(g;6rYIdZVU#Do$GzmwC{Bk^A<b-dkt37QESB{P2*^
zv#agGi;d?;SqrhpwOB_-e?PRjmfI*?uIA^p9b2+>?Gw(Lap^d8T>-j}!PC{xWt~$(
F695yoR&f9T

literal 722
zcmV;@0xkWCP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0007+Nkl<ZD9>YH
zKm%ON42;6;44maEEON_y_)3;}a?MFlVvu6M2S6HfG??{Q1@TrKZ_qjae0RaWBQ;JJ
z3v{?_RJj@Wd6{r%^pjyw+!)2X_{kcRZ-39Z|NnbB?%&Jx$=}a5yPjL)FIN>K$D+u~
z!oY~3QJs&0x5JJ-`a-wjxgUqk|NPly@&Elw+y6h-2K|3JHSq1GaD{$%ekMs)kYXMd
z2IfR%2I&N429-E@22od02JS9PR==~&ve(|O()+q2mS_8w3h67~X4(C}*I@N#vMG0z
z01E>vgD5AX=+;<?tw$RiPOb=)Dz^}3;FslOV4G~q?6ED8??9t5gHOCJOZ1I$>D%AB
z^#AV(5m+h8!63*W!ObXlp+fP?>+Pw(w<PO#S_m<4gIprW#=zXd$sm!$%D`zQ!XUCc
zf_M7IR>eOTlLQ|~a4||Th;uPWpUIVY_-S?E-#wW+^DRXfB>7kwm_^tb1O-?bz~N}X
z!@#`EovY$ii^A8NSt4I0ftE3da4-n$4Ch|*ZNB~g>+ROJVzfEJYxNm)SNn@Bm|)Is
zDb3EnVj;l5zQUEg@O-Aom4gvHr^LA!B^iW(9-VK@5`M2v>CKk~ZvRi0=$%^QFEahk
zoRp8p>)g(^8gsh<1B@eHfk81@jlm{Sjlmcgpll2rK&M3TGe~U>;+p!RP2=O&S&sjo
zOmzMEV^iM0uN%{TpQ>>@)?&>csLBiRI|=|sDpP_oqxu$qj?SxvlK0+q>;3*a-R$4L
zX}bU4PImaUJzjCEuPlQO)>Oj>Oc5IV45G!lOfH9G_)dOoRrq^7TlnpcVD5#pj5xfV
z*%|oprq@VW2JYo9EXy|du+8r_W3&MU9xxnO*wNGh0HJEuBo)&9!2kdN07*qoM6N<$
Eg5ua`M*si-

diff --git a/htdocs/theme/eldy/img/reload.png b/htdocs/theme/eldy/img/reload.png
deleted file mode 100644
index a4029f119def5d9ca4c5f7f1bc6a452176bf5b06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 704
zcmb7??@Lor9LBF`=^U1<g|?!+fuy1`QM5v%%}t#@hE16?A~Y)(HV`){n)$*ekxcT(
ztzI~bU}G<Gmc+6j+!tzGFzRLrhYGzCrI#={h~%l9eLL$v=)-fK=kV}-^*!fCt+_lY
zQIp6pOp>X>V4<mso`hKHP03y7XvDirHO6?9ppId+)x`r}Xr*YYIO${<C7o5OV%{%w
zMQ9n<qN~v{%=k@Zq-h(&#3*a4>y5N$e2{G6k^_+1%BMO-*2b|;o^^|?8?hdl^<dUZ
zSPnA1I5Px!9x;z2c_BCw20e%MVW<p%g^CB857~UOEkJA`XcfR2CeAQ81#pM4n<s7_
z+#+}=Jn;zN6^NI*2wnu70GtRM0-p#zL;?r`5`-v-gb;)z5|SV+1CKB-Q4wAOUIsw|
zK_-F>qD(~U7?6ySOppu+gG7<Bgo#A&1Z0e5Ok_d@7!ypW00WRHKp;xp_3|fl8wD<l
zx$a-_f5ucb9E?84Pm@7cpE~E5T{TZ>)!Q4hvMSYQj|No=(Kykg?MTQ)Jvq%YX^x9`
z<~II3e3`G%>{>ifvstipIJmpH^0&q~lxANZzwr5ye<^4kE@;2R-G0>>G;ihPIQy!4
zPOU`7?hhi(v26Y5#Cl)v*noY9_R!V0D-$zQvwQt=_^YF8PlvI>ZY}jIQu5~uf4Ht}
zo_Tsr-L__EPhx)dj^+;R&tEea_v^b=+0TwYzo$4q)c;r;XZ_XkX7U7UEu8!?m_9wd
z{6H*CU+OGAZO<qhap+=;hAzM8eqHkE)`BzQ&rmIXgl~q<`PGrTuALiQ!|O%xE@j_v
US;_ar_=f10G8xT=F@0nAU#iiNa{vGU

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3ea40470708..d0b423804cf 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -73,13 +73,12 @@ $dol_hide_leftmenu=$conf->dol_hide_leftmenu;
 $dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
 $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 
-
 //$conf->global->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //var_dump($user->conf->THEME_ELDY_RGB);
 
 // Colors
-$colorbackhmenu1='110,120,160';      // topmenu
+$colorbackhmenu1='90,100,130';      // topmenu
 $colorbackvmenu1='255,255,255';      // vmenu
 $colortopbordertitle1='120,120,120';    // top border of title
 $colorbacktitle1='240,240,240';      // title of tables,list
@@ -97,7 +96,6 @@ $colortext='0,0,0';
 $colortextlink='0,0,120';
 $fontsize='13';
 $fontsizesmaller='12';
-$usegradienttop=(isset($conf->global->THEME_ELDY_TOPMENU_BACK1)?0:1);
 $useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
 $borderwith=2;
 
@@ -125,7 +123,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
     $conf->global->THEME_ELDY_FONT_SIZE2='12';
 }
 
-
+ 
 // Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
 $colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
 $colorbackvmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1)   :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$user->conf->THEME_ELDY_VERMENU_BACK1);
@@ -137,7 +135,6 @@ $colorbacklineimpair1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty(
 $colorbacklineimpair2=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR2)  ?$colorbacklineimpair2:$conf->global->THEME_ELDY_LINEIMPAIR2):(empty($user->conf->THEME_ELDY_LINEIMPAIR2)?$colorbacklineimpair2:$user->conf->THEME_ELDY_LINEIMPAIR2);
 $colorbacklinepair1  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR1)    ?$colorbacklinepair1:$conf->global->THEME_ELDY_LINEPAIR1)    :(empty($user->conf->THEME_ELDY_LINEPAIR1)?$colorbacklinepair1:$user->conf->THEME_ELDY_LINEPAIR1);
 $colorbacklinepair2  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR2)    ?$colorbacklinepair2:$conf->global->THEME_ELDY_LINEPAIR2)    :(empty($user->conf->THEME_ELDY_LINEPAIR2)?$colorbacklinepair2:$user->conf->THEME_ELDY_LINEPAIR2);
-$colorbacklinepairhover=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIRHOVER)    ?$colorbacklinepairhover:$conf->global->THEME_ELDY_LINEPAIRHOVER)    :(empty($user->conf->THEME_ELDY_LINEPAIRHOVER)?$colorbacklinepairhover:$user->conf->THEME_ELDY_LINEPAIRHOVER);
 $colorbackbody       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY)     ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY)          :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY);
 $colortexttitlenotab =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLENOTAB)?$colortexttitlenotab:$conf->global->THEME_ELDY_TEXTTITLENOTAB)             :(empty($user->conf->THEME_ELDY_TEXTTITLENOTAB)?$colortexttitlenotab:$user->conf->THEME_ELDY_TEXTTITLENOTAB);
 $colortexttitle      =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLE)    ?$colortexttitle:$conf->global->THEME_ELDY_TEXTTITLE)             :(empty($user->conf->THEME_ELDY_TEXTTITLE)?$colortexttitle:$user->conf->THEME_ELDY_TEXTTITLE);
@@ -145,6 +142,7 @@ $colortext           =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty(
 $colortextlink       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTLINK)     ?$colortextlink:$conf->global->THEME_ELDY_TEXTLINK)              :(empty($user->conf->THEME_ELDY_TEXTLINK)?$colortextlink:$user->conf->THEME_ELDY_TEXTLINK);
 $fontsize            =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1)             :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2)             :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2);
+
 // Hover color
 $colorbacklinepairhover=((! isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '0')?'':($conf->global->THEME_ELDY_USE_HOVER === '1'?'edf4fb':$conf->global->THEME_ELDY_USE_HOVER));
 if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
@@ -271,6 +269,9 @@ input.select2-input {
 .liste_titre input[name=monthvalid], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
+input[type=submit] {
+	margin-left: 5px;
+}
 input, input.flat, form.flat select, select, select.flat, .dataTables_length label select {
 	<?php if (empty($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)) 
 		print "border: none;" 
@@ -519,6 +520,9 @@ textarea.centpercent {
 .nowrap {
 	white-space: <?php print ($dol_optimize_smallscreen?'normal':'nowrap'); ?>;
 }
+.nowraponall {
+	white-space: nowrap;
+}
 .nobold {
 	font-weight: normal !important;
 }
@@ -534,6 +538,9 @@ textarea.centpercent {
 .cursorpointer {
 	cursor: pointer;
 }
+.cursormove {
+	cursor: move;
+}
 .badge {
 	display: inline-block;
 	min-width: 10px;
@@ -548,9 +555,6 @@ textarea.centpercent {
 	background-color: #777;
 	border-radius: 10px;
 }
-.movable {
-	cursor: move;
-}
 .borderrightlight
 {
 	border-right: 1px solid #DDD;
@@ -876,7 +880,7 @@ td.showDragHandle {
 }
 #id-right, #id-left {
 	padding-top: 16px;
-	padding-bottom: 8px;
+	padding-bottom: 16px;
 	
 	display: table-cell;			/* DOL_XXX Empeche fonctionnement correct du scroll horizontal sur tableau, avec datatable ou CSS */
 	float: none;
@@ -1100,6 +1104,9 @@ div.statusref {
 	margin-bottom: 10px;
 	clear: both;
 }
+div.statusref img {
+    padding-left: 8px;
+}
 img.photoref, div.photoref {
 	border: 1px solid #CCC;
 	-moz-box-shadow: 3px 3px 4px #DDD;
@@ -1156,14 +1163,14 @@ div#id-top {
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
 	/*-webkit-box-shadow: 0 0 6px rgba(0,0,0,0.4);
     box-shadow: 0 0 6px rgba(0,0,0,0.4); */
-	<?php if ($usegradienttop) { ?>
+	/*
 	background-image: linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
 	background-image: -o-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
 	background-image: -moz-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
 	background-image: -webkit-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
 	background-image: -ms-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
 	background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.1)), color-stop(1, rgba(0,0,0,.4)) );
-	<?php } ?>
+	*/
 	/*<?php if ($disableimages) { ?>
 	height: 34px;
 	<?php } else { ?>
@@ -1240,15 +1247,15 @@ ul.tmenu {	/* t r b l */
 	display: table;
 }
 ul.tmenu li {	/* We need this to have background color when menu entry wraps on new lines */
-/*	background: rgb(<?php echo $colorbackhmenu1 ?>);
-	<?php if ($usegradienttop) { ?>
+	/*	background: rgb(<?php echo $colorbackhmenu1 ?>);
+	/*
 	background-image: linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
 	background-image: -o-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
 	background-image: -moz-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
 	background-image: -webkit-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
 	background-image: -ms-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
 	background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.1)), color-stop(1, rgba(0,0,0,.4)) );
-	<?php } ?>*/
+	*/
 }
 li.tmenu, li.tmenusel {
 	<?php print $minwidthtmenu?'min-width: '.$minwidthtmenu.'px;':''; ?>
@@ -1293,7 +1300,7 @@ div.tmenuleft
 div.tmenucenter
 {
 	padding-left: 0px;
-	padding-right: 0px;
+	padding-right: 3px;
 	<?php if ($disableimages) { ?>
 	padding-top: 8px;
 	height: 26px;
@@ -1335,7 +1342,7 @@ div.mainmenu {
 	position : relative;
 	background-repeat:no-repeat;
 	background-position:center top;
-	height: <?php echo ($heightmenu-19); ?>px;
+	height: <?php echo ($heightmenu-22); ?>px;
 	margin-left: 0px;
 	min-width: 40px;
 }
@@ -1526,9 +1533,9 @@ form#login {
 
 	background-color: #FFFFFF;
 
-	-moz-box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.1), 0 2px 6px rgba(60,60,60,0.15);
-	-webkit-box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.1), 0 2px 6px rgba(60,60,60,0.15);
-	box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.1), 0 2px 6px rgba(60,60,60,0.15);
+	-moz-box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
+	-webkit-box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
+	box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
 
 	border-radius: 5px;
 	/*border-top:solid 1px rgba(180,180,180,.4);
@@ -2063,82 +2070,32 @@ span.butAction, span.butActionDelete {
 	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
 	padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
 	font-family: <?php print $fontlist ?>;
-/*  for bootstrap look
-  color: #fff;
-  background-color: #337ab7;
-  border-color: #2e6da4;
-  display: inline-block;
-  padding: 6px 12px;
-  margin-bottom: 0;
-  font-weight: normal;
-  line-height: 1.42857143;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: middle;
-  -ms-touch-action: manipulation;
-  touch-action: manipulation;
-  cursor: pointer;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  background-image: none;
-  border: 1px solid transparent;
-  border-radius: 4px;
-  */
-
-  font-weight: normal;
-  border-color: #c5c5c5;
-  border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
-  display: inline-block;
-  text-align: center;
-  cursor: pointer;
-  color: #fff;
-  background: rgb(<?php echo $colorbackhmenu1 ?>);
-  background-image: linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
-    background-image: -o-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
-    background-image: -moz-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
-    background-image: -webkit-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
-    background-image: -ms-linear-gradient(top, rgba(255,255,255,.1) 0%, rgba(0,0,0,.4) 100%);
-
-  color: #333333;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  background-color: #f5f5f5;
-  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
-  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  border: 1px solid #bbbbbb;
-  border-bottom-color: #a2a2a2;
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+    font-weight: normal;
+    border-color: #c5c5c5;
+    border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
+    display: inline-block;
+    text-align: center;
+    cursor: pointer;
+    color: #fff;
+    background: rgb(<?php echo $colorbackhmenu1 ?>);
+    border: 1px solid rgb(<?php echo $colorbackhmenu1 ?>);
 }
 
 .butAction:hover   {
-  -moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
-  -webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
-  box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
+  -moz-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
+  -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
+  box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
 }
 
 .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete {
-   color: #800 !important;
+    background: #633;
+    border: 1px solid #633;
 }
 
 .butActionDelete:hover {
-  -moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
-  -webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
-  box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
+  -moz-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
+  -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
+  box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
 }
 
 .butActionRefused {
@@ -2148,130 +2105,14 @@ span.butAction, span.butActionDelete {
 	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
 	padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
     font-family: <?php print $fontlist ?> !important;
-/* for bootstrap look
-  color: #333;
-  background-color: #e6e6e6;
-  border-color: #adadad;
-  display: inline-block;
-  margin-bottom: 0;
-  font-weight: normal !important;
-  line-height: 1.42857143;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: middle;
-  -ms-touch-action: manipulation;
-  touch-action: manipulation;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  background-image: none;
-  border: 1px solid transparent;
-  border-radius: 4px;
-*/
-
-  font-weight: normal !important;
-  border-color: #c5c5c5;
-  border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
-  display: inline-block;
-  margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
-  padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
-  text-align: center;
-  cursor: pointer;
-  color: #999 !important;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  background-color: #f5f5f5;
-  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
-  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  border: 1px solid #bbbbbb;
-  border-bottom-color: #a2a2a2;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-
+    font-weight: normal !important;
+    display: inline-block;
+    text-align: center;
+    cursor: pointer;
+    color: #999 !important;
+    border: 1px solid #bbb;
 }
 
-/* Prepare for bootstrap look
-.butAction, .butActionDelete, .butActionRefused {
-	border-color: #c5c5c5;
-	border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
-	display: inline-block;
-	padding: 4px 14px;
-	margin-bottom: 0;
-	line-height: 20px;
-	text-align: center;
-	vertical-align: middle;
-	cursor: pointer;
-	color: #333333;
-	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-	background-color: #f5f5f5;
-	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-	background-repeat: repeat-x;
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
-	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
-	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-	border: 1px solid #bbbbbb;
-	border-bottom-color: #a2a2a2;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border-radius: 4px;
-	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.butAction {
-	color: #ffffff;
-	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-	background-color: #006dcc;
-	background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
-	background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
-	background-image: -o-linear-gradient(top, #0088cc, #0044cc);
-	background-image: linear-gradient(to bottom, #0088cc, #0044cc);
-	background-repeat: repeat-x;
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
-	border-color: #0044cc #0044cc #002a80;
-	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-
-.butActionDelete {
-	color: #ffffff;
-	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-	background-color: #cc6d00;
-	background-image: -moz-linear-gradient(top, #cc8800, #cc4400);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cc8800), to(#cc4400));
-	background-image: -webkit-linear-gradient(top, #cc8800, #cc4400);
-	background-image: -o-linear-gradient(top, #cc8800, #cc4400);
-	background-image: linear-gradient(to bottom, #cc8800, #cc4400);
-	background-repeat: repeat-x;
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffcc8800', endColorstr='#ffcc4400', GradientType=0);
-	border-color: #cc4400 #cc4400 #802a00;
-	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active {
-	color: #FFFFFF;
-}
-End bootstrap */
-
 <?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (! $user->admin)) { ?>
 .butActionRefused {
 	display: none;
@@ -2531,14 +2372,12 @@ div.pagination li.pagination span.inactive {
   cursor: default;
   color: #ccc;
 }
+li.noborder.litext, li.noborder.litext a,
 div.pagination li a.inactive:hover,
 div.pagination li span.inactive:hover {
-	background-color: #f5f5f5;
-	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+	-moz-box-shadow: none !important;
+  	-webkit-box-shadow: none !important;
+  	box-shadow: none !important;
 }
 /*div.pagination li.litext {
 	padding-top: 8px;
@@ -2563,7 +2402,7 @@ div.pagination li.noborder a:hover {
 }
 div.pagination li a,
 div.pagination li span {
-  background-color: #fff;
+  /* background-color: #fff; */
   /* border: 1px solid #ddd; */
 }
 div.pagination li:first-child a,
@@ -2581,6 +2420,10 @@ div.pagination li a:hover,
 div.pagination li span:hover,
 div.pagination li a:focus,
 div.pagination li span:focus {
+  -moz-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
+  -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
+  box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
+  /*
   color: #000;
   background-color: #eee;
   border-color: #ccc;
@@ -2591,7 +2434,7 @@ div.pagination li span:focus {
 	background-image: -o-linear-gradient(top, #eee, #ddd);
 	background-image: linear-gradient(to bottom, #eee, #ddd);
 	background-repeat: repeat-x;
-
+*/
 }
 div.pagination li .active a,
 div.pagination li .active span,
@@ -3123,15 +2966,13 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
 	margin-bottom: 2px;
 	margin-top: 10px;
 }
-.photowithmargin {
-/*	-webkit-box-shadow: 0px 0px 3px #777;
-	-moz-box-shadow: 0px 0px 3px #777;
-	box-shadow: 0px 0px 3px #777;*/
-}
-.photointoolitp {
+.photointooltip {
 	margin-top: 6px;
-	float: left;
-	/*text-align: center; */
+	margin-bottom: 6px;
+	text-align: center;
+	/*-moz-box-shadow: 3px 3px 4px #DDD;
+    -webkit-box-shadow: 3px 3px 4px #DDD;
+    box-shadow: 3px 3px 4px #DDD;*/
 }
 .photodelete {
 	margin-top: 6px !important;
@@ -4651,7 +4492,7 @@ border-top-right-radius: 6px;
 
 /* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */
 /* rule to reduce top menu - 1st reduction */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 6.9, 0) + 20; ?>px)
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 6.9, 0) + 20; ?>px)	/* reduction 1 */
 {
 	div.tmenucenter {
 	    width: <?php echo round($fontsize * 4); ?>px;	/* size of viewport */
@@ -4680,7 +4521,7 @@ border-top-right-radius: 6px;
 	}
 }
 /* rule to reduce top menu - 2nd reduction */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 4.5, 0) + 8; ?>px)
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 4.9, 0) + 10; ?>px)	/* reduction 2 */
 {
 	div.mainmenu {
 		height: 23px;
@@ -4689,6 +4530,9 @@ border-top-right-radius: 6px;
 	    max-width: <?php echo round($fontsize * 2); ?>px;	/* size of viewport */
   		text-overflow: clip;
 	}
+	span.mainmenuaspan {
+    	margin-left: 1px;
+	}
 	.mainmenuaspan {
     	/*display: none;*/
   		font-size: 10px;
@@ -4696,10 +4540,11 @@ border-top-right-radius: 6px;
     .topmenuimage {
     	background-size: 20px auto;
     	margin-top: 2px;
+    	left: 4px;
 	}
 }
 /* rule to reduce top menu - 3rd reduction */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 8; ?>px)
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 8; ?>px)	/* reduction 3 */
 {
 	/* Reduce login top right info */
 	.usertextatoplogin {
@@ -4743,6 +4588,7 @@ border-top-right-radius: 6px;
     .topmenuimage {
     	background-size: 20px auto;
     	margin-top: 2px !important;
+    	left: 2px;
 	}
 	div.mainmenu {
     	min-width: 20px;
diff --git a/htdocs/theme/md/img/edit.png b/htdocs/theme/md/img/edit.png
index 7012f52be5ae6acc556b223c8a822b5883ce62ac..6334689a36e2cc1be67f0f5ea5233231e0d99130 100644
GIT binary patch
delta 278
zcmbQjxQuCnWIY=L14G!kzHlJLmgMd3!tfsi7wla=87RV8;1OBOz`!jG!i)^F=12eq
z*-JcqUD+Qp%k#3b=v?_T5h%3T)5S5w;`G@|8+i{I2(&)57jstF$iQsC^yXv05``l!
z4b6F+Tv}Q)8grc{dmM9>k>-kty!LbV=bsPi-B+L5n~=tr(a5`D+83q*)|2NO8dwX=
zH>YZTVc1n?&z{Gyx##(uhUH7TXNK0MiWbZb3GA;}z_w@R)k#qc82b(=-h9JwlkK?d
z1&>dOYfihgJy~sWFIDOA`nQvdO&D)_zH(a_^o02rTW57h&yfJbNm3_Ho{*T*`saBS
a^R&mF4IlX1PKp3Mz~JfX=d#Wzp$Pz}xNtoH

delta 130
zcmV-|0Db?a0+a!e8G8f(008{QM%(}Z09#2!K~#7F#m(IbfG`jQ;fd8)ms*nq@uxOH
zu#1aJp3NB$ap(1e<=q-K4q6{ABz5|%!!p}TN3#g@nT_{kC1D~k5D6usFcH8biug<>
k!jFU+LJgsYP#_=d0-J70jk-!ing9R*07*qoM6N<$f-|=>8~^|S

diff --git a/htdocs/theme/md/img/reload.png b/htdocs/theme/md/img/reload.png
deleted file mode 100644
index a4fac077e7aa050f4a84419d6d3df6af9af4d16d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mrg*wIhEy;fJ!7wTyg;VmVfw;#
z3XjYVH8e}Kd|^AApH(;6IMmbY==^!jM;xqceSE*Jp1kz@pJ!X=+3pO>|DZB`;RK5-
zoKu5Viru@@@#Ruwc}hu^K;{(g;6rYIdZVU#Do$GzmwC{Bk^A<b-dkt37QESB{P2*^
zv#agGi;d?;SqrhpwOB_-e?PRjmfI*?uIA^p9b2+>?Gw(Lap^d8T>-j}!PC{xWt~$(
F695yoR&f9T

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 28c3c6c0193..94f0b11b560 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -521,6 +521,9 @@ textarea.centpercent {
 .nowrap {
 	white-space: <?php print ($dol_optimize_smallscreen?'normal':'nowrap'); ?>;
 }
+.nowraponall {
+	white-space: nowrap;
+}
 .nobold {
 	font-weight: normal !important;
 }
@@ -536,6 +539,9 @@ textarea.centpercent {
 .cursorpointer {
 	cursor: pointer;
 }
+.cusormove {
+	cursor: move;
+}
 .badge {
 	display: inline-block;
 	min-width: 10px;
@@ -550,9 +556,6 @@ textarea.centpercent {
 	background-color: #777;
 	border-radius: 10px;
 }
-.movable {
-	cursor: move;
-}
 
 .borderrightlight
 {
@@ -1145,6 +1148,9 @@ div.statusref {
 	margin-bottom: 10px;
 	clear: both;
 }
+div.statusref img {
+    padding-left: 8px;
+}
 img.photoref, div.photoref {
 	border: 1px solid #CCC;
 	-moz-box-shadow: 3px 3px 4px #DDD;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 26af6c659ff..811f39b3c88 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1986,12 +1986,18 @@ class User extends CommonObject
 
 		if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg=0;
 
-		$result = '';
-		$companylink = '';
-		$link = '';
-
-		$label = '<u>' . $langs->trans("User") . '</u>';
-		$label.= '<div width="100%">';
+        $result=''; $label='';
+        $linkstart=''; $linkend='';
+		
+		if (! empty($this->photo))
+		{
+		    $label.= '<div class="photointooltip">';
+		    $label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
+		    $label.= '</div><div style="clear: both;"></div>';
+		}
+		
+		$label.= '<div class="centpercent">';
+		$label.= '<u>' . $langs->trans("User") . '</u><br>';
 		$label.= '<b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs,'','');
 		if (! empty($this->login))
 			$label.= '<br><b>' . $langs->trans('Login') . ':</b> ' . $this->login;
@@ -2008,12 +2014,6 @@ class User extends CommonObject
 		$type=($this->societe_id?$langs->trans("External").$company:$langs->trans("Internal"));
 		$label.= '<br><b>' . $langs->trans("Type") . ':</b> ' . $type;
 		$label.='</div>';
-		if (! empty($this->photo))
-		{
-			$label.= '<div class="photointooltip">';
-			$label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
-			$label.= '</div><div style="clear: both;"></div>';
-		}
 
 		// Info Login
 		if ($infologin)

From ee86b7bcefe182574dac69a4bb13a35d16302446 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 31 Mar 2017 17:50:54 +0200
Subject: [PATCH 0512/1163] Avoid javascript warning when in stable mode.

---
 htdocs/main.inc.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ab156334c4f..bc1af5cc340 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1146,8 +1146,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             print '<!-- Includes JS for JQuery -->'."\n";
             if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            if (constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            if (! empty($conf->global->MAIN_FEATURES_LEVEL))
+            {
+                if (constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            }
             if (constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";

From 9d193924bdaac93976cd53998d1fdffdea9f15eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 31 Mar 2017 18:05:20 +0200
Subject: [PATCH 0513/1163] Fix bad constants

---
 htdocs/main.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index bc1af5cc340..c8dac96f11e 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1144,14 +1144,14 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         {
             // JQuery. Must be before other includes
             print '<!-- Includes JS for JQuery -->'."\n";
-            if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            if (defined('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             if (! empty($conf->global->MAIN_FEATURES_LEVEL))
             {
-                if (constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                if (defined('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                 else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
-            if (constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            if (defined('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             if (! defined('DISABLE_JQUERY_TIPTIP')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/jquery.tipTip.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";

From 2903518fb1329b4b8e6f4851b19ebd052d03c21f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 31 Mar 2017 18:11:01 +0200
Subject: [PATCH 0514/1163] Fix bad links

---
 htdocs/main.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c8dac96f11e..074f626f299 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1144,14 +1144,14 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         {
             // JQuery. Must be before other includes
             print '<!-- Includes JS for JQuery -->'."\n";
-            if (defined('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             if (! empty($conf->global->MAIN_FEATURES_LEVEL))
             {
-                if (defined('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                 else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
-            if (defined('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             if (! defined('DISABLE_JQUERY_TIPTIP')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/jquery.tipTip.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";

From 93687997c98ef4a60d88aea568f2d2f60f916374 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 31 Mar 2017 18:40:53 +0200
Subject: [PATCH 0515/1163] Work on 6.0 look and feel

---
 htdocs/adherents/stats/index.php          |  2 +-
 htdocs/comm/propal/stats/index.php        |  2 +-
 htdocs/commande/stats/index.php           |  2 +-
 htdocs/compta/deplacement/stats/index.php |  2 +-
 htdocs/compta/facture/fiche-rec.php       | 29 +++++++++++------------
 htdocs/compta/facture/stats/index.php     |  2 +-
 htdocs/don/stats/index.php                |  2 +-
 htdocs/expedition/stats/index.php         |  2 +-
 htdocs/expensereport/stats/index.php      |  2 +-
 htdocs/fichinter/stats/index.php          |  2 +-
 htdocs/projet/stats/index.php             |  2 +-
 11 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 6acdd1e56b7..aec8cd588f6 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -141,7 +141,7 @@ if (! $mesg)
 
 $head = member_stats_prepare_head($adh);
 
-dol_fiche_head($head, 'statssubscription', $langs->trans("Statistics"), 0, 'user');
+dol_fiche_head($head, 'statssubscription', $langs->trans("Statistics"), -1, 'user');
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 04c1af11e1d..2ec1a3d660b 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -242,7 +242,7 @@ $h++;
 
 complete_head_from_modules($conf,$langs,null,$head,$h,'propal_stats');
 
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index d900709b835..534011d73fe 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -253,7 +253,7 @@ if ($mode == 'supplier') $type='supplier_order_stats';
 
 complete_head_from_modules($conf,$langs,null,$head,$h,$type);
 
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index 216988b6a7a..36bc107d672 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -223,7 +223,7 @@ $h++;
 
 complete_head_from_modules($conf,$langs,null,$head,$h,'trip_stats');
 
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 9d4329a671b..46a7bc299f6 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1637,21 +1637,8 @@ else
 			print '<div class="div-table-responsive">';
             print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-			print '<tr class="liste_titre">';
-			print_liste_field_titre($langs->trans("Ref"),$_SERVER['PHP_SELF'],"f.titre","",$param,"",$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER['PHP_SELF'],"s.nom","",$param,"",$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("AmountHT"),$_SERVER['PHP_SELF'],"f.total","",$param,'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("AmountVAT"),$_SERVER['PHP_SELF'],"f.tva","",$param,'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER['PHP_SELF'],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("RecurringInvoiceTemplate"),$_SERVER['PHP_SELF'],"f.frequency","",$param,'align="center"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("DateLastGeneration"),$_SERVER['PHP_SELF'],"f.date_last_gen","",$param,'align="center"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("NextDateToExecution"),$_SERVER['PHP_SELF'],"f.date_when","",$param,'align="center"',$sortfield,$sortorder);
-			print_liste_field_titre('');		// Field may contains ling text
-			print "</tr>\n";
-
-
 			// Filters lines
-			print '<tr class="liste_titre">';
+			print '<tr class="liste_titre_filter">';
 			// Ref
 			if (! empty($arrayfields['f.titre']['checked']))
 			{
@@ -1756,7 +1743,19 @@ else
 			print '</td>';
 			print "</tr>\n";
 
-
+			print '<tr class="liste_titre">';
+			print_liste_field_titre($langs->trans("Ref"),$_SERVER['PHP_SELF'],"f.titre","",$param,"",$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER['PHP_SELF'],"s.nom","",$param,"",$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("AmountHT"),$_SERVER['PHP_SELF'],"f.total","",$param,'align="right"',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("AmountVAT"),$_SERVER['PHP_SELF'],"f.tva","",$param,'align="right"',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER['PHP_SELF'],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("RecurringInvoiceTemplate"),$_SERVER['PHP_SELF'],"f.frequency","",$param,'align="center"',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("DateLastGeneration"),$_SERVER['PHP_SELF'],"f.date_last_gen","",$param,'align="center"',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("NextDateToExecution"),$_SERVER['PHP_SELF'],"f.date_when","",$param,'align="center"',$sortfield,$sortorder);
+			print_liste_field_titre('');		// Field may contains ling text
+			print "</tr>\n";
+			
+			
 			if ($num > 0)
 			{
 				$var=true;
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 5c5aa8489be..767082997d8 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -225,7 +225,7 @@ if ($mode == 'supplier') $type='supplier_invoice_stats';
 
 complete_head_from_modules($conf,$langs,null,$head,$h,$type);
 
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 $tmp_companies = $form->select_thirdparty_list($socid,'socid',$filter,1, 0, 0, array(), '', 1);
 //Array passed as an argument to Form::selectarray to build a proper select input
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 7da3fadcc6e..b8cd532d35a 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -224,7 +224,7 @@ $type='donation_stats';
 
 complete_head_from_modules($conf,$langs,null,$head,$h,$type);
 
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index 3dfe5af6b48..f4e8d45f5a1 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -223,7 +223,7 @@ $type='shipment_stats';
 
 complete_head_from_modules($conf,$langs,null,$head,$h,$type);
 
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index c81996fda3b..f0448db1771 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -206,7 +206,7 @@ $h++;
 
 complete_head_from_modules($conf,$langs,null,$head,$h,'trip_stats');
 
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index c053239de1c..e6e1470b47a 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -231,7 +231,7 @@ if ($mode == 'supplier') $type='supplier_order_stats';
 
 complete_head_from_modules($conf,$langs,null,$head,$h,$type);
 
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"));
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index 15a2f3403c4..e9aad0d0b7e 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -271,7 +271,7 @@ $h++;
 
 complete_head_from_modules($conf,$langs,null,$head,$h,$type);
 
-dol_fiche_head($head,'byyear',$langs->trans("Statistics"), 0, '');
+dol_fiche_head($head,'byyear',$langs->trans("Statistics"), -1, '');
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';

From 7254b54a0401c37fdd0bbe37c144658cc26d4276 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Apr 2017 00:35:05 +0200
Subject: [PATCH 0516/1163] Work on 6.0 look and feel

---
 htdocs/comm/action/index.php      | 154 +++++++++++++++++-------------
 htdocs/theme/eldy/graph-color.php |   2 +-
 htdocs/theme/eldy/style.css.php   |  24 +++--
 htdocs/theme/md/style.css.php     |  23 +++--
 htdocs/user/card.php              |  59 ++++++------
 htdocs/user/class/user.class.php  |   6 +-
 6 files changed, 152 insertions(+), 116 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 87fc887560c..cb93f8bffab 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -364,12 +364,19 @@ if (! empty($conf->use_javascript_ajax))	// If javascript on
     $s.='<!-- Div to calendars selectors -->'."\n";
 	$s.='<script type="text/javascript">' . "\n";
 	$s.='jQuery(document).ready(function () {' . "\n";
-	$s.='jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
+	$s.='jQuery("#check_birthday").click(function() { console.log("Toggle birthday"); jQuery(".family_birthday").toggle(); });' . "\n";
 	$s.='jQuery(".family_birthday").toggle();' . "\n";
 	if ($action=="show_week" || $action=="show_month" || empty($action))
 	{
-    	$s.='jQuery( "td.sortable" ).sortable({connectWith: ".sortable", placeholder: "ui-state-highlight", items: "div.movable", receive: function( event, ui ) {';
-    	$s.='var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
+	    // Code to enable drag and drop
+    	$s.='jQuery( "div.sortable" ).sortable({connectWith: ".sortable", placeholder: "ui-state-highlight", items: "div.movable", receive: function( event, ui ) {';
+        	// Code to submit form
+        	$s.='console.log("submit form to record new event");';
+        	//$s.='console.log(event.target);';
+        	$s.='var newval = jQuery(event.target).closest("div.dayevent").attr("id");';
+        	$s.='console.log("found parent div.dayevent with id = "+newval);';
+    	    $s.='var frm=jQuery("#move_event"); frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(newval);frm.submit();}';
+	    $s.='});'."\n";
 	}
   	$s.='});' . "\n";
 	$s.='</script>' . "\n";
@@ -384,7 +391,6 @@ if (! empty($conf->use_javascript_ajax))	// If javascript on
 		$s.='jQuery(document).ready(function () {
 				jQuery("table input[name^=\"check_ext\"]").click(function() {
 					var name = $(this).attr("name");
-
 					jQuery(".family_ext" + name.replace("check_ext", "")).toggle();
 				});
 			});' . "\n";
@@ -1007,10 +1013,10 @@ if (empty($action) || $action == 'show_month')      // View by month
             print $langs->trans($labelshort[$numdayinweek]);
         }
         else print $langs->trans("Day".$numdayinweek);
-        print "</td>\n";
+        print '  </td>'."\n";
         $i++;
     }
-    echo " </tr>\n";
+    echo ' </tr>'."\n";
 
     $todayarray=dol_getdate($now,'fast');
     $todaytms=dol_mktime(0, 0, 0, $todayarray['mon'], $todayarray['mday'], $todayarray['year']);
@@ -1193,21 +1199,23 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
     global $theme_datacolor;
     global $cachethirdparties, $cachecontacts, $cacheusers, $colorindexused;
 
-    print "\n".'<div id="dayevent_'.sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day).'" class="dayevent">';
+    $dateint = sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day);
+    
+    print "\n";
 
     // Line with title of day
     $curtime = dol_mktime(0, 0, 0, $month, $day, $year);
-    print '<table class="nobordernopadding" width="100%">'."\n";
+    print '<div id="dayevent_'.$dateint.'" class="dayevent tagtable centpercent nobordernopadding">'."\n";
 
-    print '<tr><td align="left" class="nowrap">';
-    print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?';
+    print '<div class="tagtr"><div class="nowrap float">';
+    print '<a style="color: #666" href="'.DOL_URL_ROOT.'/comm/action/index.php?';
     print 'action=show_day&day='.str_pad($day, 2, "0", STR_PAD_LEFT).'&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
     print $newparam;
     print '">';
     if ($showinfo) print dol_print_date($curtime,'daytextshort');
     else print dol_print_date($curtime,'%d');
     print '</a>';
-    print '</td><td align="right" class="nowrap">';
+    print '</div><div class="floatright nowrap">';
     if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
     {
     	$newparam.='&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
@@ -1218,11 +1226,11 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
         print img_picto($langs->trans("NewAction"),'edit_add.png');
         print '</a>';
     }
-    print '</td></tr>'."\n";
+    print '</div></div>'."\n";
 
     // Line with td contains all div of each events
-    print '<tr height="'.$minheight.'"><td valign="top" colspan="2" class="sortable" style="padding-bottom: 2px;">';
-    print '<div style="width: 100%; position: relative;">';
+    print '<div class="tagtr">';
+    print '<div class="tagtd centpercent agendacell sortable">';
 
     //$curtime = dol_mktime (0, 0, 0, $month, $day, $year);
     $i=0; $nummytasks=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array();
@@ -1242,26 +1250,26 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
             {
                 if ($i < $maxprint || $maxprint == 0 || ! empty($conf->global->MAIN_JS_SWITCH_AGENDA))
                 {
-		    $keysofuserassigned=array_keys($event->userassigned);
+                    $keysofuserassigned=array_keys($event->userassigned);
 
                     $ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
 
                     // Define $color (Hex string like '0088FF') and $cssclass of event
                     $color=-1; $colorindex=-1;
-       		    if (in_array($user->id, $keysofuserassigned))
-		    {
-			$nummytasks++; $cssclass='family_mytasks';
-
-			if (empty($cacheusers[$event->userownerid]))
-			{
-				$newuser=new User($db);
-				$newuser->fetch($event->userownerid);
-				$cacheusers[$event->userownerid]=$newuser;
-			}
-			//var_dump($cacheusers[$event->userownerid]->color);
-
-                    	// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-                    	if (! empty($cacheusers[$event->userownerid]->color)) $color=$cacheusers[$event->userownerid]->color;
+                    if (in_array($user->id, $keysofuserassigned))
+                    {
+                    $nummytasks++; $cssclass='family_mytasks';
+                    
+                    if (empty($cacheusers[$event->userownerid]))
+                    {
+                    	$newuser=new User($db);
+                    	$newuser->fetch($event->userownerid);
+                    	$cacheusers[$event->userownerid]=$newuser;
+                    }
+                    //var_dump($cacheusers[$event->userownerid]->color);
+                    
+                    // We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
+                    if (! empty($cacheusers[$event->userownerid]->color)) $color=$cacheusers[$event->userownerid]->color;
                     }
                     else if ($event->type_code == 'ICALEVENT')      // Event come from external ical file
                     {
@@ -1352,19 +1360,25 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
                     // Show rect of event
                     print "\n";
-                    print '<!-- start event '.$i.' --><div id="event_'.$ymd.'_'.$i.'" class="event '.$cssclass.'"';
+                    print '<!-- start event '.$i.' -->'."\n";
+                    print '<div id="event_'.$ymd.'_'.$i.'" class="event '.$cssclass.'"';
                     //print ' style="height: 100px;';
                     //print ' position: absolute; top: 40px; width: 50%;';
                     //print '"';
                     print '>';
-                    print '<ul class="cal_event" style="'.$h.'">';	// always 1 li per ul, 1 ul per event
-                    print '<li class="cal_event" style="'.$h.'">';
-                    print '<table class="cal_event'.(empty($event->transparency)?'':' cal_event_busy').'" style="'.$h;
-                    print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -3).'), to(#'.dol_color_minus($color, -3).'));';
+                    print '<table class="centpercent cal_event'.(empty($event->transparency)?'':' cal_event_busy').'" style="'.$h;
+                    print 'background: #'.$color.';';
+                    //print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -5).'), to(#'.dol_color_minus($color, -5).'));';
                     //if (! empty($event->transparency)) print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
                     //else print 'background-color: transparent !important; background: none; border: 1px solid #bbb;';
-                    print ' -moz-border-radius:4px;" width="100%"><tr>';
-                    print '<td class="tdoverflow centpercent '.($nowrapontd?'nowrap ':'').'cal_event'.($event->type_code == 'BIRTHDAY'?' cal_event_birthday':'').'">';
+                    //print ' -moz-border-radius:4px;"';
+                    //print 'border: 1px solid #ccc" width="100%"';
+                    print '">';
+                    print '<tr>';
+                    print '<td class="tdoverflow nobottom centpercent '.($nowrapontd?'nowrap ':'').'cal_event'.($event->type_code == 'BIRTHDAY'?' cal_event_birthday':'').'">';
+                    
+                    $daterange='';
+                    
                     if ($event->type_code == 'BIRTHDAY') // It's a birthday
                     {
                         print $event->getNomUrl(1,$maxnbofchar,'cal_event','birthday','contact');
@@ -1380,9 +1394,6 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                         // Date
                         if (empty($event->fulldayevent))
                         {
-                            //print '<strong>';
-                            $daterange='';
-
                             // Show hours (start ... end)
                             $tmpyearstart  = date('Y',$event->date_start_in_calendar);
                             $tmpmonthstart = date('m',$event->date_start_in_calendar);
@@ -1415,22 +1426,6 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                                 if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour)
                                 $daterange.=dol_print_date($event->date_end_in_calendar,'%H:%M');	// Il faudrait utiliser ici tzuser, mais si on ne peut pas car qd on rentre un date dans fiche action, en input la conversion local->gmt se base sur le TZ server et non user
                             }
-                            //print $daterange;
-                            if ($event->type_code != 'ICALEVENT')
-                            {
-                                $savlabel=$event->libelle;
-                                $event->libelle=$daterange;
-                                //print '<strong>';
-                                print $event->getNomUrl(0);
-                                //print '</strong>';
-                                $event->libelle=$savlabel;
-                            }
-                            else
-                            {
-                                print $daterange;
-                            }
-                            //print '</strong> ';
-                            print " ";
                         }
                         else
 						{
@@ -1441,9 +1436,36 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                         }
 
                         // Show title
-                        if ($event->type_code == 'ICALEVENT') print dol_trunc($event->libelle,$maxnbofchar);
-                        else print $event->getNomUrl(0,$maxnbofchar,'cal_event');
+                        $titletoshow = $daterange;
+                        $titletoshow.=($titletoshow?' ':'').$event->libelle;
+                        
+                        if ($event->type_code == 'ICALEVENT') print $titletoshow;
+                        else 
+                        {
+                            $savlabel=$event->libelle;
+                            $event->libelle=$titletoshow;
+                            print $event->getNomUrl(0,$maxnbofchar,'cal_event','',0,1);
+                            $event->libelle=$savlabel;
+                        }
 
+                        // Loop on each assigned user
+                        $listofusertoshow='';
+                        $posuserassigned=0;
+                        foreach($event->userassigned as $tmpid => $tmpdata)
+                        {
+                            if (! $posuserassigned && $titletoshow) $listofusertoshow.='<br>';
+                            $posuserassigned++;
+                            if (empty($cacheusers[$tmpid]))
+                            {
+                                $newuser=new User($db);
+                                $newuser->fetch($tmpid);
+                                $cacheusers[$tmpid]=$newuser;
+                            }
+                            
+                            $listofusertoshow.=$cacheusers[$tmpid]->getNomUrl(-3, '', 0, 0, 0, 0, '', 'valigntextbottom');
+                        }
+                        print $listofusertoshow;
+                        
                         if ($event->type_code == 'ICALEVENT') print '<br>('.dol_trunc($event->icalname,$maxnbofchar).')';
 
                         // If action related to company / contact
@@ -1486,12 +1508,16 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
                     print '</td>';
                     // Status - Percent
-                    print '<td align="right" class="nowrap cal_event_right">';
-                    if ($event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT') print $event->getLibStatut(3,1);
+                    $withstatus=0;
+                    if ($event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT')
+                    {
+                        $withstatus=1;
+                        if ($event->percentage >= 0) $withstatus=2; 
+                    }
+                    print '<td class="nobottom right nowrap cal_event_right'.($withstatus >= 2 ?' cal_event_right_status':'').'">';
+                    if ($withstatus) print $event->getLibStatut(3,1);
                     else print '&nbsp;';
                     print '</td></tr></table>';
-                    print '</li>';
-                    print '</ul>';
                     print '</div><!-- end event '.$i.' -->'."\n";
                     $i++;
                 }
@@ -1533,10 +1559,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
         print '</script>'."\n";
     }
 
-    print '</div>';
-    print '</td></tr>';
+    print '</div></div>';       // td tr
 
-    print '</table></div>'."\n";
+    print '</div>';             // table
+    print "\n";
 }
 
 
diff --git a/htdocs/theme/eldy/graph-color.php b/htdocs/theme/eldy/graph-color.php
index 42989907747..d270936aedc 100644
--- a/htdocs/theme/eldy/graph-color.php
+++ b/htdocs/theme/eldy/graph-color.php
@@ -28,7 +28,7 @@
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
 $theme_bordercolor = array(235,235,224);
-$theme_datacolor = array(array(120,140,220), array(190,120,120), array(0,160,140), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
+$theme_datacolor = array(array(136,102,136), array(140,140,180), array(190,120,120), array(0,160,140), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
 $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
 $theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index d0b423804cf..913bcac5f30 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1670,11 +1670,22 @@ img.login, img.printer, img.entity {
 .userimgatoplogin img.userphoto {		/* size for user photo in login bar */
 	width: 16px;
     height: 16px;
+    border-radius: 8px;
+    background-size: contain;
+    background-size: contain;
 }
 img.userphoto {			/* size for user photo in lists */
-	border-radius: 2px;
+	border-radius: 9px;
 	width: 18px;
     height: 18px;
+    background-size: contain;
+    vertical-align: middle;
+}
+img.userphotosmall {			/* size for user photo in lists */
+	border-radius: 6px;
+	width: 12px;
+    height: 12px;
+    background-size: contain;
     vertical-align: middle;
 }
 .span-icon-user {
@@ -3271,6 +3282,7 @@ a.websitebuttonsitepreview img {
 /*  Module agenda                                                                 */
 /* ============================================================================== */
 
+.agendacell { height: 60px; }
 table.cal_month    { border-spacing: 0px;  }
 table.cal_month td:first-child  { border-left: 0px; }
 table.cal_month td:last-child   { border-right: 0px; }
@@ -3294,18 +3306,10 @@ table.cal_month td:last-child   { border-right: 0px; }
 .cal_today_peruser_impair { background: #F8F8F0; }
 .peruser_busy      { background: #CC8888; }
 .peruser_notbusy   { background: #EEDDDD; opacity: 0.5; }
-table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px;
-						-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
-						moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
-						box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
-						background: -webkit-gradient(linear, left top, left bottom, from(#006aac), to(#00438d));
-						min-height: 20px;
-						}
+table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; min-height: 20px; }
 table.cal_event td { border: none; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event td.cal_event { padding: 4px 4px !important; }
 table.cal_event td.cal_event_right { padding: 4px 4px !important; }
-ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -moz-padding-start: 0px; -webkit-padding-start: 0px; }
-li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:link    { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:active  { color: #111111; font-size: 11px; font-weight: normal !important; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 94f0b11b560..947b8a57168 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1701,14 +1701,24 @@ img.login, img.printer, img.entity {
 	font-weight: bold;
 }
 .userimgatoplogin img.userphoto {		/* size for user photo in login bar */
-	border-radius: 5px;
+	border-radius: 8px;
 	width: 16px;
 	height: 16px;
+    background-size: contain;
 	vertical-align: text-bottom;
 }
 img.userphoto {			/* size for user photo in lists */
+    border-radius: 9px;
     width: 18px;
     height: 18px;
+    background-size: contain;
+    vertical-align: middle;
+}
+img.userphotosmall {			/* size for user photo in lists */
+	border-radius: 6px;
+	width: 12px;
+    height: 12px;
+    background-size: contain;
     vertical-align: middle;
 }
 .span-icon-user {
@@ -3366,6 +3376,7 @@ a.websitebuttonsitepreview img {
 /*  Module agenda                                                                 */
 /* ============================================================================== */
 
+.agendacell { height: 60px; }
 table.cal_month    { border-spacing: 0px; }
 table.cal_month td:first-child  { border-left: 0px; }
 table.cal_month td:last-child   { border-right: 0px; }
@@ -3389,18 +3400,10 @@ table.cal_month td:last-child   { border-right: 0px; }
 .cal_today_peruser_impair { background: #F8F8F0; }
 .peruser_busy      { background: #CC8888; }
 .peruser_notbusy   { background: #EEDDDD; opacity: 0.5; }
-table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 3px; border-radius: 3px;
-						-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
-						moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
-						box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
-						background: -webkit-gradient(linear, left top, left bottom, from(#006aac), to(#00438d));
-						min-height: 20px;
-						}
+table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 3px; border-radius: 3px; min-height: 20px;	}
 table.cal_event td { border: none; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event td.cal_event { padding: 4px 4px !important; }
 table.cal_event td.cal_event_right { padding: 4px 4px !important; }
-ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -moz-padding-start: 0px; -webkit-padding-start: 0px; }
-li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:link    { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:active  { color: #111111; font-size: 11px; font-weight: normal !important; }
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 839d09ee9c7..37a0042c137 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2346,35 +2346,38 @@ else
             print '</form>';
         }
 
-        print '<div class="fichecenter"><div class="fichehalfleft">';
-        /*
-         * Documents generes
-        */
-        $filename = dol_sanitizeFileName($object->ref);
-        $filedir = $conf->user->dir_output . "/" . dol_sanitizeFileName($object->ref);
-        $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-        $genallowed = $user->rights->user->user->creer;
-        $delallowed = $user->rights->user->user->supprimer;
-
-        $var = true;
-
-        $somethingshown = $formfile->show_documents('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
-
-		// Show links to link elements
-		$linktoelem = $form->showLinkToObjectBlock($object, null, null);
-		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-
-        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-		// List of actions on element
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'user', $socid);
+        if ($action != 'edit')
+        {
+            print '<div class="fichecenter"><div class="fichehalfleft">';
+            /*
+             * Documents generes
+            */
+            $filename = dol_sanitizeFileName($object->ref);
+            $filedir = $conf->user->dir_output . "/" . dol_sanitizeFileName($object->ref);
+            $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+            $genallowed = $user->rights->user->user->creer;
+            $delallowed = $user->rights->user->user->supprimer;
+    
+            $var = true;
+    
+            $somethingshown = $formfile->show_documents('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+    
+    		// Show links to link elements
+    		$linktoelem = $form->showLinkToObjectBlock($object, null, null);
+    		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+    
+            print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+    
+    		// List of actions on element
+    		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+    		$formactions = new FormActions($db);
+    		$somethingshown = $formactions->showactions($object, 'user', $socid);
+            
+            
+            print '</div></div></div>';
+        }
         
-        
-        print '</div></div></div>';
-
-		if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close;
+		if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close();
     }
     
 }
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 811f39b3c88..112609ce521 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1968,7 +1968,7 @@ class User extends CommonObject
 	 *  Return a link to the user card (with optionaly the picto)
 	 * 	Use this->id,this->lastname, this->firstname
 	 *
-	 *	@param	int		$withpictoimg		Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo)
+	 *	@param	int		$withpictoimg		Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
 	 *	@param	string	$option				On what the link point to
      *  @param  integer $infologin      	Add complete info tooltip
      *  @param	integer	$notooltip			1=Disable tooltip on picto and name
@@ -2074,10 +2074,10 @@ class User extends CommonObject
         	// Only picto
 			if ($withpictoimg > 0) $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
         	// Picto must be a photo
-			else $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto', 'mini', 0, 1).'</div>';
+			else $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg==-3?'small':''), 'mini', 0, 1).'</div>';
             $result.=$picto;
 		}
-		if (abs($withpictoimg) != 2)
+		if ($withpictoimg > -2 && $withpictoimg != 2)
 		{
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='<div class="inline-block nopadding valignmiddle'.((! isset($this->statut) || $this->statut)?'':' strikefordisabled').($morecss?' usertext'.$morecss:'').'">';
 			if ($mode == 'login') $result.=dol_trunc($this->login, $maxlen);

From 65be3107c36cb0299fe1909d1a926d10c0cec506 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Apr 2017 00:51:16 +0200
Subject: [PATCH 0517/1163] Fix phpunit

---
 test/phpunit/FunctionsLibTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index a53f971904c..28e55fd793b 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -712,15 +712,15 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
 
         $s=img_picto('title','/fullpath/img.png','',1);
         print __METHOD__." s=".$s."\n";
-        $this->assertEquals('<img src="/fullpath/img.png" alt="" title="title">',$s,'testImgPicto3');
+        $this->assertEquals('<img src="/fullpath/img.png" alt="" title="title" class="inline-block valigntextbottom">',$s,'testImgPicto3');
 
         $s=img_picto('title','/fullpath/img.png','',true);
         print __METHOD__." s=".$s."\n";
-        $this->assertEquals('<img src="/fullpath/img.png" alt="" title="title">',$s,'testImgPicto4');
+        $this->assertEquals('<img src="/fullpath/img.png" alt="" title="title" class="inline-block valigntextbottom">',$s,'testImgPicto4');
 
         $s=img_picto('title:alt','/fullpath/img.png','',true);
         print __METHOD__." s=".$s."\n";
-        $this->assertEquals('<img src="/fullpath/img.png" alt="alt" title="title">',$s,'testImgPicto5');
+        $this->assertEquals('<img src="/fullpath/img.png" alt="alt" title="title" class="inline-block valigntextbottom">',$s,'testImgPicto5');
     }
 
     /**

From e221c48997c195389d122814e26f6d4796ea3b42 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Apr 2017 00:59:21 +0200
Subject: [PATCH 0518/1163] Css

---
 htdocs/comm/action/index.php      | 2 +-
 htdocs/theme/eldy/graph-color.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index cb93f8bffab..d365acef38b 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1368,7 +1368,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     print '>';
                     print '<table class="centpercent cal_event'.(empty($event->transparency)?'':' cal_event_busy').'" style="'.$h;
                     print 'background: #'.$color.';';
-                    //print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -5).'), to(#'.dol_color_minus($color, -5).'));';
+                    print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, 0).'), to(#'.dol_color_minus($color, 1).'));';
                     //if (! empty($event->transparency)) print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
                     //else print 'background-color: transparent !important; background: none; border: 1px solid #bbb;';
                     //print ' -moz-border-radius:4px;"';
diff --git a/htdocs/theme/eldy/graph-color.php b/htdocs/theme/eldy/graph-color.php
index d270936aedc..5995303c34a 100644
--- a/htdocs/theme/eldy/graph-color.php
+++ b/htdocs/theme/eldy/graph-color.php
@@ -28,7 +28,7 @@
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
 $theme_bordercolor = array(235,235,224);
-$theme_datacolor = array(array(136,102,136), array(140,140,180), array(190,120,120), array(0,160,140), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
+$theme_datacolor = array(array(136,102,136), array(140,140,220), array(190,120,120), array(0,160,140), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
 $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
 $theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
 

From d975e7f442f959d2eb4c4e6944a29fbe6c06b32f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Apr 2017 12:46:47 +0200
Subject: [PATCH 0519/1163] Work on 6.0 look and feel

---
 htdocs/accountancy/admin/account.php         | 28 +++++------
 htdocs/accountancy/admin/categories_list.php | 12 +++--
 htdocs/accountancy/admin/productaccount.php  | 43 ++++++++---------
 htdocs/accountancy/bookkeeping/balance.php   | 41 +++++++---------
 htdocs/accountancy/bookkeeping/list.php      | 36 +++++++-------
 htdocs/accountancy/customer/lines.php        | 43 +++++++++--------
 htdocs/accountancy/customer/list.php         | 35 +++++++-------
 htdocs/accountancy/expensereport/lines.php   | 33 ++++++-------
 htdocs/accountancy/expensereport/list.php    | 32 +++++++------
 htdocs/accountancy/supplier/lines.php        | 44 +++++++++---------
 htdocs/accountancy/supplier/list.php         | 40 +++++++++-------
 htdocs/compta/paiement/list.php              | 49 ++++++++++----------
 htdocs/compta/salaries/index.php             | 26 +++++------
 htdocs/compta/sociales/index.php             | 27 ++++++-----
 htdocs/compta/tva/reglement.php              | 30 ++++++------
 htdocs/core/class/html.form.class.php        |  2 +-
 htdocs/core/get_menudiv.php                  |  8 +++-
 htdocs/core/lib/company.lib.php              |  3 +-
 htdocs/core/lib/functions.lib.php            |  4 +-
 htdocs/core/menus/standard/eldy.lib.php      | 31 ++++++++-----
 htdocs/don/list.php                          | 37 +++++++--------
 htdocs/fourn/facture/paiement.php            | 28 +++++------
 htdocs/loan/card.php                         | 47 +++++++++++++------
 htdocs/loan/class/loan.class.php             |  4 +-
 htdocs/loan/document.php                     |  2 +-
 htdocs/loan/index.php                        | 22 ++++-----
 htdocs/loan/info.php                         |  2 +-
 htdocs/loan/note.php                         |  2 +-
 htdocs/theme/eldy/style.css.php              | 36 +++-----------
 htdocs/theme/md/style.css.php                | 12 +++--
 30 files changed, 386 insertions(+), 373 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 4e05b019d08..b10463361f8 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -242,20 +242,8 @@ if ($resql)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-	print '<tr class="liste_titre">';
-
-	if (! empty($arrayfields['aa.account_number']['checked']))	print_liste_field_titre($arrayfields['aa.account_number']['label'], $_SERVER["PHP_SELF"],"aa.account_number","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['aa.label']['checked']))			print_liste_field_titre($arrayfields['aa.label']['label'], $_SERVER["PHP_SELF"],"aa.label","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['aa.account_parent']['checked']))	print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"],"aa.account_parent", "", $param,'align="left"',$sortfield,$sortorder);
-	if (! empty($arrayfields['aa.pcg_type']['checked']))		print_liste_field_titre($arrayfields['aa.pcg_type']['label'],$_SERVER["PHP_SELF"],'aa.pcg_type','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['aa.pcg_subtype']['checked']))		print_liste_field_titre($arrayfields['aa.pcg_subtype']['label'],$_SERVER["PHP_SELF"],'aa.pcg_subtype','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['aa.active']['checked']))			print_liste_field_titre($arrayfields['aa.active']['label'],$_SERVER["PHP_SELF"],'aa.active','',$param,'',$sortfield,$sortorder);
-
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
-
 	// Line for search fields
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	if (! empty($arrayfields['aa.account_number']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_account" value="' . $search_account . '"></td>';
 	if (! empty($arrayfields['aa.label']['checked']))			print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="' . $search_label . '"></td>';
 	if (! empty($arrayfields['aa.account_parent']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_accountparent" value="' . $search_accountparent . '"></td>';
@@ -268,8 +256,16 @@ if ($resql)
 	print '</td>';
 	print '</tr>';
 	
-	$var = false;
-	
+    print '<tr class="liste_titre">';
+	if (! empty($arrayfields['aa.account_number']['checked']))	print_liste_field_titre($arrayfields['aa.account_number']['label'], $_SERVER["PHP_SELF"],"aa.account_number","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['aa.label']['checked']))			print_liste_field_titre($arrayfields['aa.label']['label'], $_SERVER["PHP_SELF"],"aa.label","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['aa.account_parent']['checked']))	print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"],"aa.account_parent", "", $param,'align="left"',$sortfield,$sortorder);
+	if (! empty($arrayfields['aa.pcg_type']['checked']))		print_liste_field_titre($arrayfields['aa.pcg_type']['label'],$_SERVER["PHP_SELF"],'aa.pcg_type','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['aa.pcg_subtype']['checked']))		print_liste_field_titre($arrayfields['aa.pcg_subtype']['label'],$_SERVER["PHP_SELF"],'aa.pcg_subtype','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['aa.active']['checked']))			print_liste_field_titre($arrayfields['aa.active']['label'],$_SERVER["PHP_SELF"],'aa.active','',$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print "</tr>\n";
+
 	$accountstatic = new AccountingAccount($db);
 	$accountparent = new AccountingAccount($db);
 
@@ -281,7 +277,7 @@ if ($resql)
 		$accountstatic->label = $obj->label;
 		$accountstatic->account_number = $obj->account_number;
 		
-		print '<tr ' . $bc[$var] . '>';
+		print '<tr class="oddeven">';
 
 		// Account number
 		if (! empty($arrayfields['aa.account_number']['checked']))
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 3a775149987..30466926f0a 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -806,7 +806,7 @@ if ($id)
         print '</tr>';
 
         // Title line with search boxes
-        print '<tr class="liste_titre">';
+        print '<tr class="liste_titre_filter">';
         $filterfound=0;
         foreach ($fieldlist as $field => $value)
         {
@@ -831,14 +831,16 @@ if ($id)
         }
         if ($id == 4) print '<td></td>';
         print '<td class="liste_titre"></td>';
-    	print '<td class="liste_titre" colspan="3" align="center">';
+        print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre" align="center">';
     	if ($filterfound)
     	{
         	$searchpitco=$form->showFilterAndCheckAddButtons(0);
         	print $searchpitco;
     	}
     	print '</td>';
-        print '</tr>';
+    	print '</tr>';
             
         if ($num)
         {
@@ -860,7 +862,9 @@ if ($id)
                     // Show fields
                     if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
 
-                    print '<td colspan="3" align="center">';
+                    print '<td></td>';
+                    print '<td></td>';
+                    print '<td align="center">';
                     print '<input type="hidden" name="page" value="'.$page.'">';
                     print '<input type="hidden" name="rowid" value="'.$rowid.'">';
                     print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index cae9295229b..dda7d545043 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -312,22 +312,8 @@ if ($result)
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 	
 	print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
-    if (! empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "p.description", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("OnSell"), $_SERVER["PHP_SELF"], "p.tosell", "", $param, 'align="center"', $sortfield, $sortorder);
-   	print_liste_field_titre($langs->trans("OnBuy"), $_SERVER["PHP_SELF"], "p.tobuy", "", $param, 'align="center"', $sortfield, $sortorder);
-   	if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
-   	    $fieldtosortaccount="p.accountancy_code_buy";
-   	}
-   	else $fieldtosortaccount="p.accountancy_code_sell";
-   	print_liste_field_titre($langs->trans("CurrentDedicatedAccountingAccount"), $_SERVER["PHP_SELF"], $fieldtosortaccount, "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("AssignDedicatedAccountingAccount"));
-	print_liste_field_titre('', '', '', '', '', 'align="center"');
-	print '</tr>';
-	
-	print '<tr class="liste_titre">';
+
+	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat" size="8" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	if (! empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
@@ -342,12 +328,28 @@ if ($result)
 	print ' '.$langs->trans("or").' '.$form->selectarray('search_current_account_valid', $listofvals, $search_current_account_valid, 1);
 	print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td align="right" class="liste_titre">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(1, 'checkforselect', 1);
+	print '<td align="center" class="liste_titre">';
+	$searchpitco=$form->showFilterButtons();
 	print $searchpitco;
 	print '</td>';
 	print '</tr>';
 	
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
+    if (! empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "p.description", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("OnSell"), $_SERVER["PHP_SELF"], "p.tosell", "", $param, 'align="center"', $sortfield, $sortorder);
+   	print_liste_field_titre($langs->trans("OnBuy"), $_SERVER["PHP_SELF"], "p.tobuy", "", $param, 'align="center"', $sortfield, $sortorder);
+   	if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
+   	    $fieldtosortaccount="p.accountancy_code_buy";
+   	}
+   	else $fieldtosortaccount="p.accountancy_code_sell";
+   	print_liste_field_titre($langs->trans("CurrentDedicatedAccountingAccount"), $_SERVER["PHP_SELF"], $fieldtosortaccount, "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("AssignDedicatedAccountingAccount"));
+	$clickpitco=$form->showCheckAddButtons('checkforselect', 1);
+	print_liste_field_titre($clickpitco, '', '', '', '', 'align="center"');
+	print '</tr>';
+	
 	$product_static = new Product($db);
 	
 	$var = true;
@@ -381,8 +383,7 @@ if ($result)
 			$compta_prodbuy_id = $aarowid_servbuy;
 		}
 		
-		$var = ! $var;
-		print '<tr '. $bc[$var].'>';
+		print '<tr class="oddeven">';
 		
 		print '<td>';
 		print $product_static->getNomUrl(1);
@@ -440,7 +441,7 @@ if ($result)
 		}
 		
 		// Checkbox select
-		print '<td align="right">';
+		print '<td align="center">';
 		print '<input type="checkbox" class="checkforselect" name="chk_prod[]" value="' . $obj->rowid . '"/></td>';
 		print "</tr>";
 		$i ++;
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 8f6fab3ec3f..5f4801da32c 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -182,6 +182,22 @@ else {
     }
     
     print '<table class="liste ' . ($moreforfilter ? "listwithfilterbefore" : "") . '">';
+
+    print '<tr class="liste_titre_filter">';
+    print '<td class="liste_titre" colspan="5">';
+    print $langs->trans('From');
+    print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
+    print ' ';
+    print $langs->trans('to');
+    print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
+    print '</td>';
+    print '<td align="right" class="liste_titre">';
+	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+	print $searchpitco;
+    print '</td>';
+    
+    print '</tr>';
+    
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("AccountAccounting"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
     print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $options, "", $sortfield, $sortorder);
@@ -191,28 +207,6 @@ else {
     print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
     print "</tr>\n";
     
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre" colspan="2">';
-    print $langs->trans('From');
-    print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
-    print '<br>';
-    print $langs->trans('to');
-    print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
-    print '</td>';
-    
-    print '<td class="liste_titre center">&nbsp;</td>';
-    print '<td class="liste_titre center">&nbsp;</td>';
-    print '<td class="liste_titre center">&nbsp;</td>';
-    
-    print '<td align="right" class="liste_titre">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-	print $searchpitco;
-    print '</td>';
-    
-    print '</tr>';
-    
-    $var = True;
-    
     $total_debit = 0;
     $total_credit = 0;
     $sous_total_debit = 0;
@@ -220,7 +214,6 @@ else {
     $displayed_account = "";
     
     foreach ($object->lines as $line) {
-        $var = ! $var;
         $link = '';
         $total_debit += $line->debit;
         $total_credit += $line->credit;
@@ -229,7 +222,7 @@ else {
         if (empty($description)) {
             $link = '<a href="../admin/card.php?action=create&compte=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
         }
-        print '<tr ' . $bc[$var] . '>';
+        print '<tr class="oddeven">';
         
         // Permet d'afficher le compte comptable
         if ($root_account_description != $displayed_account) {
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index ae38233afac..9cd649ce4be 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -371,20 +371,8 @@ print '<div class="inline-block divButAction"><a class="butActionDelete" name="b
 print '</div>';
 
 print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print_liste_field_titre($langs->trans("TransactionNumShort"), $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $param, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("AccountAccountingShort"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Code_tiers"), $_SERVER['PHP_SELF'], "t.code_tiers", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
-print "</tr>\n";
 
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="' . dol_escape_htmltag($search_mvt_num) . '"></td>';
 print '<td class="liste_titre center">';
 print $langs->trans('From') . ': ';
@@ -415,12 +403,26 @@ print '<td class="liste_titre center">&nbsp;</td>';
 print '<td class="liste_titre center">&nbsp;</td>';
 print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
 print '<td class="liste_titre center">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterButtons();
+print $searchpicto;
 print '</td>';
 print '</tr>';
 
-$var = True;
+print '<tr class="liste_titre">';
+print_liste_field_titre($langs->trans("TransactionNumShort"), $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("AccountAccountingShort"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Code_tiers"), $_SERVER['PHP_SELF'], "t.code_tiers", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
+$checkpicto='';
+if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
+print_liste_field_titre($checkpicto, $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
+print "</tr>\n";
+
 
 $total_debit = 0;
 $total_credit = 0;
@@ -431,7 +433,7 @@ foreach ($object->lines as $line ) {
 	$total_debit += $line->debit;
 	$total_credit += $line->credit;
 
-	print '<tr '. $bc[$var].'>';
+	print '<tr class="oddeven">';
 
 	print '<td><a href="./card.php?piece_num=' . $line->piece_num . '">' . $line->piece_num . '</a></td>';
 	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index a759472304e..a015fa05929 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -256,22 +256,7 @@ if ($result) {
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 	
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "fd.rowid", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.facnumber", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"], "f.datef, f.facnumber, fd.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("ProductRef"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
-	//print_liste_field_titre($langs->trans("ProductLabel"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "fd.description", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "fd.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "fd.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Country"), $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("VATIntra"), $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre('', '', '', '', '', 'align="center"');
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
@@ -284,16 +269,30 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tavintra" value="' . dol_escape_htmltag($search_tavintra) . '"></td>';
 	print '<td class="liste_titre" align="center">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(1);
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print "</td></tr>\n";
+	
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "fd.rowid", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.facnumber", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"], "f.datef, f.facnumber, fd.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("ProductRef"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+	//print_liste_field_titre($langs->trans("ProductLabel"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "fd.description", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "fd.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "fd.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Country"), $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("VATIntra"), $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
+	$clickpicto=$form->showCheckAddButtons();
+	print_liste_field_titre($clickpicto, '', '', '', '', 'align="center"');
+	print "</tr>\n";
 
 	$facture_static = new Facture($db);
 	$product_static = new Product($db);
 
-	$var = True;
 	while ( $objp = $db->fetch_object($result) ) {
-		$var = ! $var;
 		$codecompta = length_accountg($objp->account_number) . ' - ' . $objp->label_compte;
 
 		$facture_static->ref = $objp->facnumber;
@@ -304,7 +303,7 @@ if ($result) {
 		$product_static->type = $objp->product_type;
 		$product_static->label = $objp->product_label;
 		
-		print '<tr '. $bc[$var].'>';
+		print '<tr class="oddeven">';
 
 		print '<td>' . $objp->rowid . '</td>';
 		
@@ -335,7 +334,7 @@ if ($result) {
 		print '</td>';
 		print '<td>' . $objp->country .'</td>';
 		print '<td>' . $objp->tva_intra . '</td>';
-		print '<td align="right"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->fdid . '"/></td>';
+		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->fdid . '"/></td>';
 
 		print "</tr>";
 		$i ++;
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 09ad316a398..e8e10b4a0be 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -271,22 +271,9 @@ if ($result) {
 	
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.facnumber", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"], "f.datef, f.facnumber, l.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("ProductRef"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
-	//print_liste_field_titre($langs->trans("ProductLabel"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("AccountAccountingSuggest"), '', '', '', '', 'align="center"');
-	print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"');
-	print_liste_field_titre('', '', '', '', '', 'align="center"');
-	print "</tr>\n";
 
 	// We add search filter
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
@@ -298,11 +285,27 @@ if ($result) {
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td align="center" class="liste_titre">';
-	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-	print $searchpitco;
+	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	print $searchpicto;
 	print '</td>';
 	print '</tr>';
 
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.facnumber", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"], "f.datef, f.facnumber, l.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("ProductRef"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+	//print_liste_field_titre($langs->trans("ProductLabel"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("AccountAccountingSuggest"), '', '', '', '', 'align="center"');
+	print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"');
+	$checkpicto='';
+	if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
+	print_liste_field_titre($checkpitco, '', '', '', '', 'align="center"');
+	print "</tr>\n";
+	
 	$facture_static = new Facture($db);
 	$product_static = new Product($db);
 	$form = new Form($db);
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 56298045532..20994d76a93 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -233,20 +233,7 @@ if ($result) {
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("ExpenseReport"), $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("TypeFees"), $_SERVER["PHP_SELF"], "f.label", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre('');
-	print_liste_field_titre('', '', '', '', '', 'align="center"');
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"></td>';
 	print '<td><input type="text" class="flat maxwidth50" name="search_expensereport" value="' . dol_escape_htmltag($search_expensereport) . '"></td>';
 	print '<td class="liste_titre" align="right"></td>';
@@ -257,11 +244,25 @@ if ($result) {
 	print '<td class="liste_titre" align="center"><input type="text" class="right flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
     print '<td class="liste_titre" align="right"></td>';
     print '<td class="liste_titre" align="right">';
-    $searchpicto=$form->showFilterAndCheckAddButtons(1);
+    $searchpicto=$form->showFilterButtons();
     print $searchpicto;
     print '</td>';
 	print "</tr>\n";
 
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("ExpenseReport"), $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("TypeFees"), $_SERVER["PHP_SELF"], "f.label", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre('');
+    $checkpicto=$form->showCheckAddButtons();
+	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+	print "</tr>\n";
+
 	$expensereport_static = new ExpenseReport($db);
 
 	$var = True;
@@ -300,7 +301,7 @@ if ($result) {
 		print img_edit();
 		print '</a></td>';
 		
-		print '<td align="right"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
+		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
 		
 		print "</tr>";
 		$i ++;
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 5bb232fc7c1..49a63a15698 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -259,21 +259,9 @@ if ($result) {
 
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("ExpenseReport"), $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("TypeFees"), $_SERVER["PHP_SELF"], "f.label", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("AccountAccountingSuggest"), '', '', '', '', 'align="center"');
-	print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"');
-	print_liste_field_titre('', '', '', '', '', 'align="center"');
-	print "</tr>\n";
 
 	// We add search filter
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_expensereport" value="' . dol_escape_htmltag($search_expensereport) . '"></td>';
 	print '<td class="liste_titre"></td>';
@@ -284,11 +272,27 @@ if ($result) {
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td align="center" class="liste_titre">';
-	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
 	print '</tr>';
 
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("ExpenseReport"), $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("TypeFees"), $_SERVER["PHP_SELF"], "f.label", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("AccountAccountingSuggest"), '', '', '', '', 'align="center"');
+	print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"');
+	$checkpicto='';
+	if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
+	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+	print "</tr>\n";
+	
+	
 	$expensereport_static = new ExpenseReport($db);
 	$form = new Form($db);
 
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 121ba0e9f46..1f0d06fbec6 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -239,21 +239,7 @@ if ($result) {
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 	
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("InvoiceLabel"), $_SERVER["PHP_SELF"], "f.libelle", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("ProductRef"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
-	//print_liste_field_titre($langs->trans("ProductLabel"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre('', '', '', '', '', 'align="center"');
-	print "</tr>\n";
-	
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
     print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
@@ -265,18 +251,32 @@ if ($result) {
 	print '<td class="liste_titre" align="center"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
     print '<td class="liste_titre" align="center">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(1);
-    print $searchpitco;
+    $searchpicto=$form->showFilterButtons();
+    print $searchpicto;
     print '</td>';
 	print "</tr>\n";
 	
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("InvoiceLabel"), $_SERVER["PHP_SELF"], "f.libelle", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("ProductRef"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+	//print_liste_field_titre($langs->trans("ProductLabel"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
+    $checkpicto=$form->showCheckAddButtons();
+	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+	print "</tr>\n";
+	
 	$facturefournisseur_static = new FactureFournisseur($db);
 	$product_static = new Product($db);
 	
-	$var = True;
-	while ( $i < min($num_lines, $limit) ) {
+	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
-		$var = ! $var;
+
 		$codecompta = length_accountg($objp->account_number) . ' - ' . $objp->label;
 		
 		$facturefournisseur_static->ref = $objp->facnumber;
@@ -287,7 +287,7 @@ if ($result) {
 		$product_static->type = $objp->type;
 		$product_static->label = $objp->product_label;
 		
-		print '<tr '. $bc[$var].'>';
+		print '<tr class="oddeven">';
 		
 		print '<td>' . $objp->rowid . '</td>';
 		
@@ -320,7 +320,7 @@ if ($result) {
 		print img_edit();
 		print '</a></td>';
 		
-		print '<td align="right"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
+		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
 		
 		print "</tr>";
 		$i ++;
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 19ef52f0d85..9b42337852c 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -267,24 +267,11 @@ if ($result) {
 	$moreforfilter = '';
 	
     print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("InvoiceLabel"), $_SERVER["PHP_SELF"], "f.libelle", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("ProductRef"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
-	//print_liste_field_titre($langs->trans("ProductLabel"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("AccountAccountingSuggest"), '', '', '', '', 'align="center"');
-	print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"');
-	print_liste_field_titre('', '', '', '', '', 'align="center"');
-	print "</tr>\n";
+
+    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	// We add search filter
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
@@ -297,11 +284,28 @@ if ($result) {
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td align="center" class="liste_titre">';
-	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 	print '</tr>';
 
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("InvoiceLabel"), $_SERVER["PHP_SELF"], "f.libelle", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("ProductRef"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+	//print_liste_field_titre($langs->trans("ProductLabel"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("AccountAccountingSuggest"), '', '', '', '', 'align="center"');
+	print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"');
+	$checkpicto='';
+	if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
+	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+	print "</tr>\n";
+
 	$facturefourn_static = new FactureFournisseur($db);
 	$productfourn_static = new ProductFournisseur($db);
 	$form = new Form($db);
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 4cb63b7d905..d0ba0373457 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -225,29 +225,8 @@ if ($resql)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"p.rowid","",$param,"",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"dp","",$param,'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"c.libelle","",$param,"",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Numero"),$_SERVER["PHP_SELF"],"p.num_paiement","",$param,"",$sortfield,$sortorder);
-    if (! empty($conf->banque->enabled))
-    {
-    	print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
-    }
-    print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"p.amount","",$param,'align="right"',$sortfield,$sortorder);
-    //print_liste_field_titre($langs->trans("Invoices"),"","","",$param,'align="left"',$sortfield,$sortorder);
-
-	$parameters=array();
-    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-
-    if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut","",$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
-
     // Lines for filters fields
-    print '<tr class="liste_titre">';
+    print '<tr class="liste_titre_filter">';
     print '<td class="liste_titre" align="left">';
     print '<input class="flat" type="text" size="4" name="search_ref" value="'.$search_ref.'">';
     print '</td>';
@@ -285,12 +264,32 @@ if ($resql)
     }
     print "</tr>\n";
 
-    $var=true;
+    print '<tr class="liste_titre">';
+    print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"p.rowid","",$param,"",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"dp","",$param,'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"c.libelle","",$param,"",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Numero"),$_SERVER["PHP_SELF"],"p.num_paiement","",$param,"",$sortfield,$sortorder);
+    if (! empty($conf->banque->enabled))
+    {
+        print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
+    }
+    print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"p.amount","",$param,'align="right"',$sortfield,$sortorder);
+    //print_liste_field_titre($langs->trans("Invoices"),"","","",$param,'align="left"',$sortfield,$sortorder);
+    
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    
+    if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut","",$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+    print "</tr>\n";
+    
     while ($i < min($num,$limit))
     {
         $objp = $db->fetch_object($resql);
-        $var=!$var;
-        print "<tr ".$bc[$var].">";
+
+        print '<tr class="oddeven">';
 
         print '<td>';
         $paymentstatic->id=$objp->rowid;
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 88414e45566..a6d99cbdaad 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -85,7 +85,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
  * View
  */
 
-llxHeader();
+llxHeader('', $langs->trans("Salaries"));
 
 $form = new Form($db);
 $salstatic = new PaymentSalary($db);
@@ -155,18 +155,7 @@ if ($result)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Employee"),$_SERVER["PHP_SELF"],"u.rowid","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
-    if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("BankAccount"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-    print "</tr>\n";
-
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	// Ref
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat" type="text" size="3" name="search_ref" value="'.$search_ref.'">';
@@ -198,6 +187,17 @@ if ($result)
     print $searchpitco;
     print '</td>';
     
+    print '<tr class="liste_titre">';
+    print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Employee"),$_SERVER["PHP_SELF"],"u.rowid","",$param,"",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'align="left"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
+    if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("BankAccount"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+    print "</tr>\n";
+    
 	print "</tr>\n";
 
     while ($i < min($num,$limit))
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 66d6a65dd56..706c75fab07 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -177,18 +177,7 @@ if ($resql)
 	    print '<div class="div-table-responsive">';
 	    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 	    
-		print '<tr class="liste_titre">';
-		print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"id","",$param,"",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"cs.libelle","",$param,'align="left"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"periode","",$param,'align="center"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"cs.amount","",$param,'align="right"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"cs.date_ech","",$param,'align="center"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cs.paye","",$param,'align="right"',$sortfield,$sortorder);
-		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-		print "</tr>\n";
-
-		print '<tr class="liste_titre">';
+		print '<tr class="liste_titre_filter">';
 		// Ref
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="3" name="search_ref" value="'.$search_ref.'">';
@@ -218,14 +207,24 @@ if ($resql)
         print '</td>';
 		print "</tr>\n";
 
+		print '<tr class="liste_titre">';
+		print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"id","",$param,"",$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"cs.libelle","",$param,'align="left"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"periode","",$param,'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"cs.amount","",$param,'align="right"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"cs.date_ech","",$param,'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cs.paye","",$param,'align="right"',$sortfield,$sortorder);
+		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+		print "</tr>\n";
+		
 		$i=0;
 		$totalarray=array();
 		while ($i < min($num,$limit))
 		{
 			$obj = $db->fetch_object($resql);
 
-			$var = !$var;
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 
 			// Ref
 			print '<td width="60">';
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 1a45b8a91c7..15a6df0a717 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -157,19 +157,10 @@ if ($result)
 	
 	print_barre_liste($langs->trans("VATPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines, 'title_accountancy', 0, '', '', $limit);
 	
+	print '<div class="div-table-responsive">';
 	print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateValue"),$_SERVER["PHP_SELF"],"dv","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"dp","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
-    if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"t.amount","",$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
 
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat" size="4" name="search_ref" value="'.$search_ref.'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.$search_label.'"></td>';
 	print '<td class="liste_titre"></td>';
@@ -196,10 +187,20 @@ if ($result)
     print '</td>';
 	print "</tr>\n";
 
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DateValue"),$_SERVER["PHP_SELF"],"dv","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"dp","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
+	if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"t.amount","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+	print "</tr>\n";
+	
 	while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($result);
-        $var=!$var;
 
 		if ($obj->payment_code <> '')
 		{
@@ -210,7 +211,7 @@ if ($result)
 			$type = '<td>&nbsp;</td>';
 		}
 
-        print "<tr ".$bc[$var].">";
+        print '<tr class="oddeven">';
 
 		$tva_static->id=$obj->rowid;
 		$tva_static->ref=$obj->rowid;
@@ -254,7 +255,8 @@ if ($result)
 	print "<td>&nbsp;</td></tr>";
 
     print "</table>";
-
+    print '</div>';
+    
 	print '</form>';
 
     $db->free($result);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 99b27c20822..a01d54f0bef 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1634,7 +1634,7 @@ class Form
 		{
 			if ($value['id'] == $ownerid) continue;
 			$userstatic->fetch($value['id']);
-			$out.=$userstatic->getNomUrl(1);
+			$out.=$userstatic->getNomUrl(-1);
 			if ($i == 0) { $ownerid = $value['id']; $out.=' ('.$langs->trans("Owner").')'; }
 			if ($nbassignetouser > 1 && $action != 'view') $out.=' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Remove"), 'delete', '', 0, 1).'" value="'.$userstatic->id.'" class="removedassigned" id="removedassigned_'.$userstatic->id.'" name="removedassigned_'.$userstatic->id.'">';
 			//$out.=' '.($value['mandatory']?$langs->trans("Mandatory"):$langs->trans("Optional"));
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index d8a7cb1b34c..fd80124e7df 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -93,11 +93,15 @@ print '
         padding: 1em 15px 1em 40px;
     }
     li.lilevel1 {
-        padding: 1em 15px 0.5em 20px;
-        border-top: 1px solid #ccc;
+        padding: 1em 15px 0.5em 40px;
+        border-top: 1px solid #aaa;
         margin-right: 20px;
         border-right: 0px ! important;
     }
+    li.lilevel1:first-child {
+        margin-right: 0px;
+        margin-left: 0px;
+    }
     li.lilevel1 a {
         padding-bottom: 5px;
     }
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index bbe9febd481..e6e154220b8 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -763,7 +763,6 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
         while ($i < $num)
         {
             $obj = $db->fetch_object($result);
-            $var = !$var;
             
             $contactstatic->id = $obj->rowid;
             $contactstatic->ref = $obj->ref;
@@ -789,7 +788,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 
             $contactstatic->setGenderFromCivility();
             
-            print "<tr ".$bc[$var].">";
+            print "<tr>";
 
 			// Photo - Name
 			print '<td>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6028f9bcabc..e51541272bd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2038,12 +2038,12 @@ function dol_print_address($address, $htmlid, $mode, $id, $noprint=0, $charfornl
             if ($showgmap)
             {
                 $url=dol_buildpath('/google/gmaps.php?mode='.$mode.'&id='.$id,1);
-                $out.=' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'" border="0" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';
+                $out.=' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'" class="valigntextbottom" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';
             }
             if ($showomap)
             {
                 $url=dol_buildpath('/openstreetmap/maps.php?mode='.$mode.'&id='.$id,1);
-                $out.=' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'_openstreetmap" border="0" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';
+                $out.=' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'_openstreetmap" class="valigntextbottom" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';
             }
         }
 	}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 3874afb5198..7207f8f2189 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1005,18 +1005,25 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 						$i = 0;
 
 						if ($numr > 0)
-						while ($i < $numr)
 						{
-							$objp = $db->fetch_object($resql);
-
-							if ($objp->nature == 1) $nature="sells";
-							if ($objp->nature == 2) $nature="purchases";
-							if ($objp->nature == 3) $nature="bank";
-							if ($objp->nature == 4) $nature="various";
-							if ($objp->nature == 9) $nature="hasnew";
-
-							if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
-							$i++;
+    						while ($i < $numr)
+    						{
+    							$objp = $db->fetch_object($resql);
+    
+    							if ($objp->nature == 1) $nature="sells";
+    							if ($objp->nature == 2) $nature="purchases";
+    							if ($objp->nature == 3) $nature="bank";
+    							if ($objp->nature == 4) $nature="various";
+    							if ($objp->nature == 9) $nature="hasnew";
+    
+    							if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
+    							$i++;
+    						}
+						}
+						else
+						{
+						    // Should not happend. Entries are added
+						    $newmenu->add('',$langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
 						}
 					}
 					else dol_print_error($db);
@@ -1075,7 +1082,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				// Fiscal year
 				if ($conf->global->MAIN_FEATURES_LEVEL > 0)     // Not yet used. In a future will lock some periods.
 				{
-				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"),1,$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');
+				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_periods", $langs->trans("FiscalPeriod"),1,$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');
 				}
 			}
 
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index d925573b859..1e08cbae121 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -160,23 +160,8 @@ if ($resql)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid","", $param,"",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"d.societe","", $param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"d.lastname","", $param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.datedon","", $param,'align="center"',$sortfield,$sortorder);
-	if (! empty($conf->projet->enabled))
-	{
-		$langs->load("projects");
-		print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"fk_projet","", $param,"",$sortfield,$sortorder);
-	}
-	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"d.amount","", $param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.fk_statut","", $param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
-	print "</tr>\n";
-
     // Filters lines
-    print '<tr class="liste_titre">';
+    print '<tr class="liste_titre_filter">';
     print '<td class="liste_titre">';
     print '<input class="flat" size="10" type="text" name="search_ref" value="'.$search_ref.'">';
     print '</td>';
@@ -203,12 +188,26 @@ if ($resql)
     print '</td>';
 	print "</tr>\n";
 
-	$var=True;
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid","", $param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"d.societe","", $param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"d.lastname","", $param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.datedon","", $param,'align="center"',$sortfield,$sortorder);
+	if (! empty($conf->projet->enabled))
+	{
+	    $langs->load("projects");
+	    print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"fk_projet","", $param,"",$sortfield,$sortorder);
+	}
+	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"d.amount","", $param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.fk_statut","", $param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
+	
 	while ($i < min($num,$limit))
 	{
 		$objp = $db->fetch_object($resql);
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+
+		print '<tr class="oddeven">';
 		$donationstatic->id=$objp->rowid;
 		$donationstatic->ref=$objp->rowid;
 		$donationstatic->lastname=$objp->lastname;
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 8d55404659e..952d1e13dbd 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -700,20 +700,8 @@ if (empty($action))
         print '<div class="div-table-responsive">';
         print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-        print '<tr class="liste_titre">';
-        print_liste_field_titre($langs->trans('RefPayment'),$_SERVER["PHP_SELF"],'p.rowid','',$param,'',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'dp','',$param,'align="center"',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans('ThirdParty'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans('Type'),$_SERVER["PHP_SELF"],'c.libelle','',$param,'',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans("Numero"),$_SERVER["PHP_SELF"],"p.num_paiement","",$param,"",$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans('Account'),$_SERVER["PHP_SELF"],'ba.label','',$param,'',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'p.amount','',$param,'align="right"',$sortfield,$sortorder);
-        //print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'ref_supplier','',$param,'',$sortfield,$sortorder);
-		print_liste_field_titre('');
-		print "</tr>\n";
-
         // Lines for filters fields
-        print '<tr class="liste_titre">';
+        print '<tr class="liste_titre_filter">';
         print '<td  class="liste_titre" align="left">';
         print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
         print '</td>';
@@ -739,11 +727,23 @@ if (empty($action))
         print '</td>';
         print "</tr>\n";
 
+        print '<tr class="liste_titre">';
+        print_liste_field_titre($langs->trans('RefPayment'),$_SERVER["PHP_SELF"],'p.rowid','',$param,'',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'dp','',$param,'align="center"',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans('ThirdParty'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans('Type'),$_SERVER["PHP_SELF"],'c.libelle','',$param,'',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans("Numero"),$_SERVER["PHP_SELF"],"p.num_paiement","",$param,"",$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans('Account'),$_SERVER["PHP_SELF"],'ba.label','',$param,'',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'p.amount','',$param,'align="right"',$sortfield,$sortorder);
+        //print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'ref_supplier','',$param,'',$sortfield,$sortorder);
+        print_liste_field_titre('');
+        print "</tr>\n";
+        
         while ($i < min($num,$limit))
         {
             $objp = $db->fetch_object($resql);
             $var=!$var;
-            print '<tr '.$bc[$var].'>';
+            print '<tr class="oddeven">';
 
             // Ref payment
             print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$objp->pid.'">'.img_object($langs->trans('ShowPayment'),'payment').' '.$objp->pid.'</a></td>';
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 4b1384aeedb..e063734cc51 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -98,13 +98,30 @@ if (empty($reshook))
     		$datestart	= dol_mktime(12, 0, 0, GETPOST('startmonth','int'), GETPOST('startday','int'), GETPOST('startyear','int'));
     		$dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int'));
     		$capital 	= price2num(GETPOST('capital'));
-    
+            $rate       = GETPOST('rate');
+            
     		if (! $capital)
     		{
+    		    $error++; $action = 'create';
     			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
-    			$action = 'create';
     		}
-    		else
+    		if (! $datestart)
+    		{
+    		    $error++; $action = 'create';
+    		    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateStart")), null, 'errors');
+    		}
+    		if (! $dateend)
+    		{
+    		    $error++; $action = 'create';
+    		    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateEnd")), null, 'errors');
+    		}
+    		if ($rate == '')
+    		{
+    		    $error++; $action = 'create';
+    		    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Rate")), null, 'errors');
+    		}
+    		
+    		if (! $error)
     		{
     			$object->label					= GETPOST('label');
     			$object->fk_bank				= GETPOST('accountid');
@@ -112,7 +129,7 @@ if (empty($reshook))
     			$object->datestart				= $datestart;
     			$object->dateend				= $dateend;
     			$object->nbterm					= GETPOST('nbterm');
-    			$object->rate					= GETPOST('rate');
+    			$object->rate					= $rate;
     			$object->note_private 			= GETPOST('note_private');
     			$object->note_public 			= GETPOST('note_public');
     			$object->fk_project 			= GETPOST('fk_project');
@@ -128,7 +145,9 @@ if (empty($reshook))
     			$id=$object->create($user);
     			if ($id <= 0)
     			{
+    			    $error++;
     				setEventMessages($object->error, $object->errors, 'errors');
+    				$action = 'create';
     			}
     		}
     	}
@@ -263,21 +282,21 @@ if ($action == 'create')
 
 	// Date Start
 	print "<tr>";
-    print '<td>'.$langs->trans("DateStart").'</td><td>';
+    print '<td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>';
     print $form->select_date($datestart?$datestart:-1,'start','','','','add',1,1,1);
     print '</td></tr>';
 
 	// Date End
 	print "<tr>";
-    print '<td>'.$langs->trans("DateEnd").'</td><td>';
+    print '<td class="fieldrequired">'.$langs->trans("DateEnd").'</td><td>';
     print $form->select_date($dateend?$dateend:-1,'end','','','','add',1,1,1);
     print '</td></tr>';
 
 	// Number of terms
-	print '<tr><td>'.$langs->trans("Nbterms").'</td><td><input name="nbterm" size="5" value="' . GETPOST('nbterm') . '"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Nbterms").'</td><td><input name="nbterm" size="5" value="' . GETPOST('nbterm') . '"></td></tr>';
 
 	// Rate
-    print '<tr><td>'.$langs->trans("Rate").'</td><td><input name="rate" size="5" value="' . GETPOST("rate") . '"> %</td></tr>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("Rate").'</td><td><input name="rate" size="5" value="' . GETPOST("rate") . '"> %</td></tr>';
 
     // Project
     if (! empty($conf->projet->enabled))
@@ -296,8 +315,8 @@ if ($action == 'create')
     
     // Note Private
     print '<tr>';
-    print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
-    print '<td class="tdtop">';
+    print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
+    print '<td>';
 
     $doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, true, ROWS_6, '90%');
     print $doleditor->Create(1);
@@ -306,8 +325,8 @@ if ($action == 'create')
 
     // Note Public
     print '<tr>';
-    print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
-    print '<td class="tdtop">';
+    print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
+    print '<td>';
     $doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, true, ROWS_6, '90%');
     print $doleditor->Create(1);
     print '</td></tr>';
@@ -463,7 +482,7 @@ if ($id > 0)
 		}
 
     	// Date start
-		print "<tr><td>".$langs->trans("DateStart")."</td>";
+		print '<tr><td>'.$langs->trans("DateStart")."</td>";
 		print "<td>";
 		if ($action == 'edit')
 		{
@@ -476,7 +495,7 @@ if ($id > 0)
 		print "</td></tr>";
 
 		// Date end
-		print "<tr><td>".$langs->trans("DateEnd")."</td>";
+		print '<tr><td>'.$langs->trans("DateEnd")."</td>";
 		print "<td>";
 		if ($action == 'edit')
 		{
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index bb51cf3b8f1..d9d4da6fb20 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -129,7 +129,7 @@ class Loan extends CommonObject
      */
     function create($user)
     {
-    	global $conf;
+    	global $conf, $langs;
 
 		$error=0;
 
@@ -155,7 +155,7 @@ class Loan extends CommonObject
         }
 		if (($conf->accounting->enabled) && empty($this->account_capital) && empty($this->account_insurance) && empty($this->account_interest))
 		{
-            $this->error="ErrorAccountingParameter";
+            $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Accounting"));
             return -2;
 		}
 
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 575be293de0..3e0654ace3f 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -85,7 +85,7 @@ if ($object->id)
 
     $head = loan_prepare_head($object);
 
-    dol_fiche_head($head, 'documents',  $langs->trans("Loan"), 0, 'bill');
+    dol_fiche_head($head, 'documents',  $langs->trans("Loan"), -1, 'bill');
 
 	$morehtmlref='<div class="refidno">';
 	// Ref loan
diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index d2a60973a7f..fdc8cf67073 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -124,17 +124,8 @@ if ($resql)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"l.rowid","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"l.label","",$param,'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("LoanCapital"),$_SERVER["PHP_SELF"],"l.capital","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"l.datestart","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"l.paid","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
-    print "</tr>\n";
-
 	// Filters lines
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input class="flat" size="4" type="text" name="search_ref" value="'.$search_ref.'"></td>';
 	print '<td class="liste_titre"><input class="flat" size="12" type="text" name="search_label" value="'.$search_label.'"></td>';
 	print '<td class="liste_titre" align="right" ><input class="flat" size="8" type="text" name="search_amount" value="'.$search_amount.'"></td>';
@@ -146,6 +137,15 @@ if ($resql)
 	print '</td>';
 	print '</tr>';
 
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"l.rowid","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"l.label","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("LoanCapital"),$_SERVER["PHP_SELF"],"l.capital","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"l.datestart","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"l.paid","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
+	
 	while ($i < min($num,$limit))
 	{
 		$obj = $db->fetch_object($resql);
@@ -154,7 +154,7 @@ if ($resql)
         $loan_static->label = $obj->label;
 
 		$var = !$var;
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 
 		// Ref
 		print '<td>'.$loan_static->getNomUrl(1, 42).'</td>';
diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index 87bd25fbe3b..f61b9312432 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -53,7 +53,7 @@ $object->info($id);
 
 $head = loan_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("Loan"), 0, 'bill');
+dol_fiche_head($head, 'info', $langs->trans("Loan"), -1, 'bill');
 
 $morehtmlref='<div class="refidno">';
 // Ref loan
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index b03880a832e..e28320470a2 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -70,7 +70,7 @@ if ($id > 0)
 
     $head = loan_prepare_head($object);
 
-    dol_fiche_head($head, 'note', $langs->trans("Loan"), 0, 'bill');
+    dol_fiche_head($head, 'note', $langs->trans("Loan"), -1, 'bill');
 
 	$morehtmlref='<div class="refidno">';
 	// Ref loan
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 913bcac5f30..e270cc3b030 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -590,7 +590,8 @@ div.myavailability {
 .checkallactions {
 	vertical-align: text-bottom;
     margin-top: 6px;
-    margin-left: 4px;
+    margin-left: 4px;		/* left must be same than right to keep checkbox centered */
+    margin-right: 4px;		/* left must be same than right to keep checkbox centered */
 }
 .selectlimit, .marginrightonly {
 	margin-right: 10px !important;
@@ -1736,7 +1737,7 @@ div.vmenu, td.vmenu {
 }
 #menu_contenu_logo { padding-top: 0; }
 .companylogo { }
-.searchform { padding-top: 4px; }
+.searchform { padding-top: 10px; }
 
 a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { white-space: nowrap; font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; }
 font.vmenudisabled  { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; }
@@ -2434,18 +2435,7 @@ div.pagination li span:focus {
   -moz-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
   -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
   box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
-  /*
-  color: #000;
-  background-color: #eee;
-  border-color: #ccc;
-
-	background-image: -moz-linear-gradient(top, #eee, #ddd);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eee), to(#ddd));
-	background-image: -webkit-linear-gradient(top, #eee, #ddd);
-	background-image: -o-linear-gradient(top, #eee, #ddd);
-	background-image: linear-gradient(to bottom, #eee, #ddd);
-	background-repeat: repeat-x;
-*/
+	padding-top: 8px;
 }
 div.pagination li .active a,
 div.pagination li .active span,
@@ -2622,7 +2612,7 @@ tr.liste_titre_topborder td {
 .liste_titre td a.notasortlink:hover {
 	background: transparent;
 }
-tr.liste_titre:last-child th.liste_titre, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd {				/* For last line of table headers only */
+tr.liste_titre:last-child th.liste_titre, tr.liste_titre:last-child th.liste_titre_sel, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd {				/* For last line of table headers only */
     border-bottom: 1px solid #ddd;
 }
 
@@ -4316,6 +4306,7 @@ ul.ulmenu {
 }
 .alilevel0 {
     color: rgb(<?php echo $colortexttitle; ?>) !important;
+    background: #f8f8f8
 }
 .ulmenu {
 	box-shadow: none !important;
@@ -4339,24 +4330,9 @@ ul.ulmenu {
 	color: #<?php echo $colorshadowtitle; ?> !important;
 	text-shadow: none !important;
 }
-/*
-.ui-btn-up-c {
-	background: transparent;
-}
-*/
 div.tabsElem a.tab {
 	background: transparent;
 }
-
-/*.ui-controlgroup-horizontal .ui-btn.ui-first-child {
--webkit-border-top-left-radius: 6px;
-border-top-left-radius: 6px;
-}
-.ui-controlgroup-horizontal .ui-btn.ui-last-child {
--webkit-border-top-right-radius: 6px;
-border-top-right-radius: 6px;
-}*/
-
 .alilevel1 {
     color: rgb(<?php print $colortexttitlenotab; ?>) !important;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 947b8a57168..6885bfad144 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1768,7 +1768,7 @@ div.vmenu, td.vmenu {
 }
 #menu_contenu_logo { padding-right: 4px; }
 .companylogo { padding-top: 4px; }
-.searchform { padding-top: 8px; }
+.searchform { padding-top: 10px; }
 
 a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { white-space: nowrap; font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; }
 font.vmenudisabled  { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; }
@@ -2447,6 +2447,7 @@ div.pagination li {
 div.pagination li.pagination a,
 div.pagination li.pagination span {
   padding: 6px 12px;
+  padding-top: 8px;
   line-height: 1.42857143;
   color: #000;
   text-decoration: none;
@@ -2486,9 +2487,10 @@ div.pagination li a:hover,
 div.pagination li span:hover,
 div.pagination li a:focus,
 div.pagination li span:focus {
-  color: #000;
-  background-color: #eee;
-  border-color: #ddd;
+    color: #000;
+    background-color: #eee;
+    border-color: #ddd;
+  	padding-top: 8px;
 }
 div.pagination li .active a,
 div.pagination li .active span,
@@ -2700,7 +2702,7 @@ tr.liste_titre_topborder td {
 .liste_titre td a.notasortlink:hover {
 	background: transparent;
 }
-tr.liste_titre:last-child th.liste_titre, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd {				/* For last line of table headers only */
+tr.liste_titre:last-child th.liste_titre, tr.liste_titre:last-child th.liste_titre_sel, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd {				/* For last line of table headers only */
     border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
 }
 

From 17a1874e36810047f0ab66d9e3ea9b89f81e823f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Apr 2017 13:43:05 +0200
Subject: [PATCH 0520/1163] FIX Counter of notification of a thirdparty

---
 htdocs/core/class/notify.class.php | 80 ++++++++++++++++--------------
 htdocs/societe/notify/card.php     | 16 ++++--
 2 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index fd3b1e7187d..1205f0c5c63 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -117,9 +117,10 @@ class Notify
      * @param	int		$socid			Id of third party or 0 for all thirdparties or -1 for no thirdparties
      * @param	Object	$object			Object the notification is about (need it to check threshold value of some notifications)
      * @param	int		$userid         Id of user or 0 for all users or -1 for no users
+     * @param   array   $scope          Scope where to search
      * @return	array|int				<0 if KO, array of notifications to send if OK
      */
-	function getNotificationsArray($notifcode,$socid=0,$object=null,$userid=0)
+	function getNotificationsArray($notifcode, $socid=0, $object=null, $userid=0, $scope=array('thirdparty', 'user', 'global'))
 	{
 		global $conf, $user;
 
@@ -131,7 +132,7 @@ class Notify
 
         if (! $error)
         {
-            if ($socid >= 0)
+            if ($socid >= 0 && in_array('thirdparty', $scope))
             {
     	        $sql = "SELECT a.code, c.email, c.rowid";
     	        $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
@@ -178,7 +179,7 @@ class Notify
         
         if (! $error)
         {
-            if ($userid >= 0)
+            if ($userid >= 0 && in_array('user', $scope))
             {
     			$sql = "SELECT a.code, c.email, c.rowid";
     			$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
@@ -223,42 +224,45 @@ class Notify
 
 		if (! $error)
 		{
-		    // List of notifications enabled for fixed email
-		    foreach($conf->global as $key => $val)
+		    if (in_array('global', $scope))
 		    {
-		    	if ($notifcode)
-		    	{
-		    		if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
-		    	}
-		    	else
-		    	{
-		    		if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
-		    	}
-
-    			$threshold = (float) $reg[1];
-    			if ($valueforthreshold < $threshold) continue;
-
-		    	$tmpemail=explode(',',$val);
-		    	foreach($tmpemail as $key2 => $val2)
-		    	{
-		    		$newval2=trim($val2);
-		    		if ($newval2 == '__SUPERVISOREMAIL__')
-		    		{
-		    			if ($user->fk_user > 0)
-		    			{
-							$tmpuser=new User($this->db);
-							$tmpuser->fetch($user->fk_user);
-							if ($tmpuser->email) $newval2=trim($tmpuser->email);
-							else $newval2='';
-		    			}
-		    			else $newval2='';
-		    		}
-		    		if ($newval2)
-		    		{
-		    			$isvalid=isValidEmail($newval2, 0);
-		    			if (empty($resarray[$newval2])) $resarray[$newval2]=array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
-		    		}
-		    	}
+    		    // List of notifications enabled for fixed email
+    		    foreach($conf->global as $key => $val)
+    		    {
+    		    	if ($notifcode)
+    		    	{
+    		    		if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+    		    	}
+    		    	else
+    		    	{
+    		    		if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+    		    	}
+    
+        			$threshold = (float) $reg[1];
+        			if ($valueforthreshold < $threshold) continue;
+    
+    		    	$tmpemail=explode(',',$val);
+    		    	foreach($tmpemail as $key2 => $val2)
+    		    	{
+    		    		$newval2=trim($val2);
+    		    		if ($newval2 == '__SUPERVISOREMAIL__')
+    		    		{
+    		    			if ($user->fk_user > 0)
+    		    			{
+    							$tmpuser=new User($this->db);
+    							$tmpuser->fetch($user->fk_user);
+    							if ($tmpuser->email) $newval2=trim($tmpuser->email);
+    							else $newval2='';
+    		    			}
+    		    			else $newval2='';
+    		    		}
+    		    		if ($newval2)
+    		    		{
+    		    			$isvalid=isValidEmail($newval2, 0);
+    		    			if (empty($resarray[$newval2])) $resarray[$newval2]=array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
+    		    		}
+    		    	}
+    		    }
 		    }
 		}
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 63d33dcee1d..d7445233c71 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -188,11 +188,16 @@ if ($result > 0)
         print '</td></tr>';
     }
 
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';
+    print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
     print '<td colspan="3">';
+    $nbofrecipientemails=0;
     $notify=new Notify($db);
-    $tmparray = $notify->getNotificationsArray('', $object->id);
-    print count($tmparray);
+    $tmparray = $notify->getNotificationsArray('', $object->id, null, 0, array('thirdparty'));
+    foreach($tmparray as $tmpkey => $tmpval)
+    {
+        if (! empty($tmpkey)) $nbofrecipientemails++;
+    }
+    print $nbofrecipientemails;
     print '</td></tr>';
     print '</table>';
 
@@ -394,13 +399,14 @@ if ($result > 0)
 		print '<td align="right">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</td>';
 		print '</tr>';
     }*/
-    if ($user->admin)
+    
+    /*if ($user->admin)
     {
 	    $var = ! $var;
 		print '<tr '.$bc[$var].'><td colspan="4">';
 		print '+ <a href="'.DOL_URL_ROOT.'/admin/notification.php">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</a>';
 		print '</td></tr>';
-    }
+    }*/
 
     print '</table>';
     

From ed898528071881d29380715d9903dd19e3da3fa9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Apr 2017 13:49:17 +0200
Subject: [PATCH 0521/1163] Work on look and feel v6

---
 htdocs/user/document.php    |  6 ++++--
 htdocs/user/info.php        |  2 +-
 htdocs/user/note.php        |  4 +++-
 htdocs/user/notify/card.php | 30 +++---------------------------
 4 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 081bf2bc408..5b86c7d490d 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -129,12 +129,13 @@ if ($object->id)
 
 	$form=new Form($db);
 
-	dol_fiche_head($head, 'document', $langs->trans("User"),0,'user');
+	dol_fiche_head($head, 'document', $langs->trans("User"), -1, 'user');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
 
     dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
 
+    print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
 
 	// Construit liste des fichiers
@@ -158,7 +159,8 @@ if ($object->id)
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
 
 	print '</table>';
-
+    print '</div>';
+    
 	dol_fiche_end();
 
 
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 5ea7200a0f7..ff4c44c6e23 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -65,7 +65,7 @@ llxHeader();
 $head = user_prepare_head($object);
 
 $title = $langs->trans("User");
-dol_fiche_head($head, 'info', $title, 0, 'user');
+dol_fiche_head($head, 'info', $title, -1, 'user');
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 38aef489b87..3f9be2b4142 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -88,7 +88,7 @@ if ($id)
 	$head = user_prepare_head($object);
 
 	$title = $langs->trans("User");
-	dol_fiche_head($head, 'note', $title, 0, 'user');
+	dol_fiche_head($head, 'note', $title, -1, 'user');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
 	
@@ -99,6 +99,7 @@ if ($id)
     print "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
+	print '<div class="fichecenter">';
     print '<table class="border" width="100%">';
 
     // Login
@@ -123,6 +124,7 @@ if ($id)
 	print "</td></tr>";
 
     print "</table>";
+    print '</div>';
 
 	dol_fiche_end();
 
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 4e84a8b83fa..305bb3d226b 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -135,36 +135,12 @@ if ($result > 0)
 
     $head = user_prepare_head($object);
 
-    dol_fiche_head($head, 'notify', $langs->trans("User"),0,'user');
+    dol_fiche_head($head, 'notify', $langs->trans("User"), 0, 'user');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
     
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
-    
-    /*print '<table class="border"width="100%">';
-
-    // Ref
-    print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
-    print '<td colspan="3">';
-    print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
-    print '</td>';
-    print '</tr>'."\n";
-
-    print '<tr><td>'.$langs->trans("Lastname").'</td>';
-    print '<td colspan="2">'.$object->lastname.'</td>';
-
-    // Firstname
-    print '<tr><td>'.$langs->trans("Firstname").'</td>';
-    print '<td colspan="2">'.$object->firstname.'</td>';
-    print '</tr>'."\n";
-
-    // EMail
-    print '<tr><td>'.$langs->trans("EMail").'</td>';
-    print '<td colspan="2">'.dol_print_email($object->email,0,0,1).'</td>';
-    print "</tr>\n";
-
-    print '</table>';*/
-
+    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', '', '', 0, '', '', 1, '');
+        
     dol_fiche_end();
 
     print "\n";

From 4902df7e3faf7d9ceb1018cecb28cef799129383 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Apr 2017 19:28:38 +0200
Subject: [PATCH 0522/1163] Work on look and feel v6

---
 htdocs/langs/en_US/mails.lang  |  4 +-
 htdocs/societe/agenda.php      |  4 +-
 htdocs/societe/list.php        |  2 +-
 htdocs/societe/notify/card.php | 62 +++++++++++++++--------
 htdocs/user/card.php           |  6 +--
 htdocs/user/notify/card.php    | 91 +++++++++++++++++++++++++++-------
 6 files changed, 121 insertions(+), 48 deletions(-)

diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 93c3e584ff6..e546965d60d 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -116,8 +116,8 @@ Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
 ANotificationsWillBeSent=1 notification will be sent by email
 SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=List all active targets for email notification
+AddNewNotification=Activate a new email notification target/event
+ListOfActiveNotifications=List all active targets/events for email notification
 ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 36fbe790bf3..e1dc1c12671 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -58,7 +58,7 @@ if ($page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='a.datep, a.id';
+if (! $sortfield) $sortfield='a.datep,a.id';
 if (! $sortorder) $sortorder='DESC';
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
@@ -190,7 +190,7 @@ if ($socid > 0)
 		$filters=array();
         $filters['search_agenda_label']=$search_agenda_label;
 
-        // TODO Replace this with smae code then into listactions.php
+        // TODO Replace this with same code than into listactions.php
         show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
     }
 }
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 1a9980bbf12..9bde47887ed 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -88,7 +88,7 @@ $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="s.nom";
-if (empty($page) || $page == -1) { $page = 0 ; }
+if (empty($page) || $page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index d7445233c71..8b77c8f52a4 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -44,15 +44,16 @@ $actionid=GETPOST('actionid');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield=GETPOST("sortfield",'alpha');
+$sortorder=GETPOST("sortorder",'alpha');
+$page=GETPOST("page",'int');
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="n.daten";
+if (empty($page) || $page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
 
 $now=dol_now();
 
@@ -188,7 +189,7 @@ if ($result > 0)
         print '</td></tr>';
     }
 
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
+    /*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
     print '<td colspan="3">';
     $nbofrecipientemails=0;
     $notify=new Notify($db);
@@ -198,7 +199,8 @@ if ($result > 0)
         if (! empty($tmpkey)) $nbofrecipientemails++;
     }
     print $nbofrecipientemails;
-    print '</td></tr>';
+    print '</td></tr>';*/
+    
     print '</table>';
 
     print '</div>';
@@ -286,7 +288,7 @@ if ($result > 0)
     $sql.= " WHERE a.rowid = n.fk_action";
     $sql.= " AND c.rowid = n.fk_contact";
     $sql.= " AND c.fk_soc = ".$object->id;
-    
+
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -299,8 +301,7 @@ if ($result > 0)
     
     // List of active notifications
     print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')','','');
-    $var=true;
-
+    
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
@@ -321,14 +322,12 @@ if ($result > 0)
 
         while ($i < $num)
         {
-            $var = !$var;
-
             $obj = $db->fetch_object($resql);
 
             $contactstatic->id=$obj->contactid;
             $contactstatic->lastname=$obj->lastname;
             $contactstatic->firstname=$obj->firstname;
-            print '<tr '.$bc[$var].'><td>'.$contactstatic->getNomUrl(1);
+            print '<tr class="oddeven"><td>'.$contactstatic->getNomUrl(1);
             if ($obj->type == 'email')
             {
                 if (isValidEmail($obj->email))
@@ -425,6 +424,16 @@ if ($result > 0)
     $sql.= " AND n.fk_soc = ".$object->id;
     $sql.= $db->order($sortfield, $sortorder);
 
+    // Count total nb of records
+    $nbtotalofrecords = '';
+    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+    {
+        $result = $db->query($sql);
+        $nbtotalofrecords = $db->num_rows($result);
+    }
+    
+    $sql.= $db->plimit($limit+1, $offset);
+    
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -435,9 +444,20 @@ if ($result > 0)
         dol_print_error($db);
     }
     
-    // List of notifications done
-    print load_fiche_titre($langs->trans("ListOfNotificationsDone").' ('.$num.')','','');
-    $var=true;
+    $param='&socid='.$object->id;
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    
+    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="socid" value="'.$object->id.'">';
+    
+    // List of active notifications
+    print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
     // Line with titles
     print '<table width="100%" class="noborder">';
@@ -457,11 +477,9 @@ if ($result > 0)
 
         while ($i < $num)
         {
-            $var = !$var;
-
             $obj = $db->fetch_object($resql);
 
-            print '<tr '.$bc[$var].'><td>';
+            print '<tr class="oddeven"><td>';
             if ($obj->id > 0)
             {
 	            $contactstatic->id=$obj->id;
@@ -501,6 +519,8 @@ if ($result > 0)
     }
 
     print '</table>';
+    
+    print '</form>';
 }
 else dol_print_error('','RecordNotFound');
 
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 37a0042c137..e213578b860 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -723,11 +723,10 @@ if (($action == 'create') || ($action == 'adduserldap'))
 
     print dol_set_focus('#lastname');
 
-    print '<table class="border" width="100%">';
-
-    print '<tr>';
+    print '<table class="border centpercent">';
 
     // Lastname
+    print '<tr>';
     print '<td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td>';
     print '<td>';
     if (! empty($ldap_lastname))
@@ -1257,7 +1256,6 @@ else
 
             dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
 
-
 	        print '<div class="fichecenter">';
 	        print '<div class="fichehalfleft">';
 
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 305bb3d226b..f18197dccc8 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -44,15 +44,16 @@ $actionid=GETPOST('actionid');
 if ($user->societe_id) $id=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield=GETPOST("sortfield",'alpha');
+$sortorder=GETPOST("sortorder",'alpha');
+$page=GETPOST("page",'int');
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="n.daten";
+if (empty($page) || $page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
 
 $now=dol_now();
 
@@ -135,12 +136,45 @@ if ($result > 0)
 
     $head = user_prepare_head($object);
 
-    dol_fiche_head($head, 'notify', $langs->trans("User"), 0, 'user');
+    dol_fiche_head($head, 'notify', $langs->trans("User"), -1, 'user');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
     
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', '', '', 0, '', '', 1, '');
+    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', '', '', 0, '', '', 0, '');
         
+    print '<div class="fichecenter">';
+    
+    print '<div class="underbanner clearboth"></div>';
+    print '<table class="border centpercent">';
+    
+    // Login
+    print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
+    if (! empty($object->ldap_sid) && $object->statut==0)
+    {
+        print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
+    }
+    else
+    {
+        print '<td>'.$object->login.'</td>';
+    }
+    print '</tr>'."\n";
+            
+    /*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
+    print '<td colspan="3">';
+    $nbofrecipientemails=0;
+    $notify=new Notify($db);
+    $tmparray = $notify->getNotificationsArray('', 0, null, $object->id, array('user'));
+    foreach($tmparray as $tmpkey => $tmpval)
+    {
+        $nbofrecipientemails++;
+    }
+    print $nbofrecipientemails;
+    print '</td></tr>';*/
+    
+    print '</table>';
+    
+    print '</div>';
+    
     dol_fiche_end();
 
     print "\n";
@@ -345,13 +379,13 @@ if ($result > 0)
 		print '<td align="right">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</td>';
 		print '</tr>';
     }*/
-    if ($user->admin)
+    /*if ($user->admin)
     {
 	    $var = ! $var;
 		print '<tr '.$bc[$var].'><td colspan="4">';
 		print '+ <a href="'.DOL_URL_ROOT.'/admin/notification.php">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</a>';
 		print '</td></tr>';
-    }
+    }*/
 
     print '</table>';
     
@@ -364,12 +398,22 @@ if ($result > 0)
     $sql.= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
     $sql.= " a.code, a.label";
     $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql.= " ".MAIN_DB_PREFIX."notify as n ";
+    $sql.= " ".MAIN_DB_PREFIX."notify as n";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as c ON n.fk_user = c.rowid";
     $sql.= " WHERE a.rowid = n.fk_action";
     $sql.= " AND n.fk_user = ".$object->id;
     $sql.= $db->order($sortfield, $sortorder);
     
+    // Count total nb of records
+    $nbtotalofrecords = '';
+    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+    {
+        $result = $db->query($sql);
+        $nbtotalofrecords = $db->num_rows($result);
+    }
+    
+    $sql.= $db->plimit($limit+1, $offset);
+    
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -380,10 +424,21 @@ if ($result > 0)
         dol_print_error($db);
     }
     
+    $param='&id='.$object->id;
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    
+    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="id" value="'.$object->id.'">';
+    
     // List of notifications done
-    print_fiche_titre($langs->trans("ListOfNotificationsDone").' ('.$num.')','','');
-    $var=true;
-
+    print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
+    
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
@@ -402,11 +457,9 @@ if ($result > 0)
 
         while ($i < $num)
         {
-            $var = !$var;
-
             $obj = $db->fetch_object($resql);
 
-            print '<tr '.$bc[$var].'><td>';
+            print '<tr class="oddeven"><td>';
             if ($obj->id > 0)
             {
 	            $userstatic->id=$obj->id;
@@ -446,6 +499,8 @@ if ($result > 0)
     }
 
     print '</table>';
+    
+    print '</form>';
 }
 else dol_print_error('','RecordNotFound');
 

From 9678c2128ec8de77de62766b65af14d255e04c80 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Apr 2017 10:29:20 +0200
Subject: [PATCH 0523/1163] Add field langs into extrafields definition table

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql  | 1 +
 htdocs/install/mysql/tables/llx_extrafields.sql | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 3a2359fccb4..78f378e8c1a 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -24,6 +24,7 @@
 -- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
+ALTER TABLE llx_extrafields ADD COLUMN langs varchar(24);
 
 ALTER TABLE llx_supplier_proposaldet ADD COLUMN fk_unit integer DEFAULT NULL;
 
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index b7a7288980b..2cc144db092 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -34,5 +34,6 @@ create table llx_extrafields
 	alwayseditable  integer DEFAULT 0,							-- 1 if field can be edited whatever is element status
 	param			text,										-- extra parameters to define possible values of field
 	list			integer DEFAULT 0,							-- list of values for field that are combo lists
+	langs			varchar(24),								-- example: fileofmymodule@mymodule
 	ishidden		integer DEFAULT 0							-- ??? example of use case ???
 )ENGINE=innodb;

From d99b0461c714afe791632cd36f22b4735d223162 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Apr 2017 10:47:25 +0200
Subject: [PATCH 0524/1163] Extrafields multilanguage support.

---
 dev/skeletons/skeleton_list.php                  |  2 +-
 htdocs/adherents/list.php                        |  2 +-
 htdocs/comm/propal/list.php                      |  2 +-
 htdocs/commande/list.php                         |  2 +-
 htdocs/compta/bank/bankentries.php               |  2 +-
 htdocs/compta/bank/index.php                     |  2 +-
 htdocs/compta/facture/list.php                   |  2 +-
 htdocs/contact/list.php                          |  2 +-
 htdocs/contrat/list.php                          |  2 +-
 htdocs/contrat/services.php                      |  2 +-
 htdocs/core/lib/functions.lib.php                |  6 +++---
 htdocs/expedition/list.php                       |  2 +-
 htdocs/expensereport/list.php                    |  2 +-
 htdocs/fichinter/list.php                        |  2 +-
 htdocs/fourn/commande/list.php                   |  2 +-
 htdocs/fourn/facture/list.php                    |  2 +-
 htdocs/modulebuilder/skeletons/skeleton_list.php | 14 +++++++-------
 htdocs/product/list.php                          |  2 +-
 htdocs/product/stock/mouvement.php               |  2 +-
 htdocs/product/stock/productlot_list.php         |  2 +-
 htdocs/projet/list.php                           |  2 +-
 htdocs/projet/tasks/list.php                     |  2 +-
 htdocs/projet/tasks/time.php                     |  2 +-
 htdocs/resource/list.php                         |  2 +-
 htdocs/societe/list.php                          |  2 +-
 htdocs/user/index.php                            |  2 +-
 26 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php
index 77485c6d638..ca66990a9f7 100644
--- a/dev/skeletons/skeleton_list.php
+++ b/dev/skeletons/skeleton_list.php
@@ -354,7 +354,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
        if (! empty($arrayfields["ef.".$key]['checked'])) 
        {
 			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
        }
    }
 }
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 8d00194993b..e492e31b440 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -583,7 +583,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index fdcbdde5ca8..d1ccf6547ce 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -726,7 +726,7 @@ if ($resql)
            if (! empty($arrayfields["ef.".$key]['checked'])) 
            {
 				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
            }
 	   }
 	}
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 37170e0af84..fa94541cdbf 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1021,7 +1021,7 @@ if ($resql)
            if (! empty($arrayfields["ef.".$key]['checked'])) 
            {
 				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
            }
 	   }
 	}
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index c7596a0aee2..ca786c1e3e0 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -826,7 +826,7 @@ if ($resql)
 	        if (! empty($arrayfields["ef.".$key]['checked']))
 	        {
 	            $align=$extrafields->getAlignFlag($key);
-	            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+	            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
 	        }
 	    }
 	}
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 71397f695d6..e67441036c4 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -403,7 +403,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index eafd8900d37..03612cbb932 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -939,7 +939,7 @@ if ($resql)
             if (! empty($arrayfields["ef.".$key]['checked']))
             {
                 $align=$extrafields->getAlignFlag($key);
-                print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
             }
         }
     }
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index e7d4f603618..917c59006f2 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -631,7 +631,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
        if (! empty($arrayfields["ef.".$key]['checked']))
        {
 			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
        }
    }
 }
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 0224da7d88c..af68e789da2 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -534,7 +534,7 @@ if ($resql)
            if (! empty($arrayfields["ef.".$key]['checked'])) 
            {
 				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
            }
 	   }
 	}
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 42ff4b04e83..62b9fddf743 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -371,7 +371,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e51541272bd..8c27b101fa4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3106,7 +3106,7 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar
 /**
  *	Get title line of an array
  *
- *	@param	string	$name        Label of field
+ *	@param	string	$name        Translation key of field
  *	@param	int		$thead		 0=To use with standard table format, 1=To use inside <thead><tr>, 2=To use with <div>
  *	@param	string	$file        Url used when we click on sort picto
  *	@param	string	$field       Field to use for new sorting. Empty if this field is not sortable.
@@ -3120,7 +3120,7 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar
  */
 function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $moreparam="", $moreattrib="", $sortfield="", $sortorder="", $prefix="")
 {
-	global $conf;
+	global $conf, $langs;
 	//print "$name, $file, $field, $begin, $options, $moreattrib, $sortfield, $sortorder<br>\n";
 
 	$sortorder=strtoupper($sortorder);
@@ -3154,7 +3154,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 		}
 	}
 
-	$out.=$name;
+	$out.=$langs->trans($name);
 
 	if (empty($thead) && $field)    // If this is a sort field
 	{
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 4166bbb3791..29f6978b24e 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -446,7 +446,7 @@ if ($resql)
 	        if (! empty($arrayfields["ef.".$key]['checked']))
 	        {
 	            $align=$extrafields->getAlignFlag($key);
-	            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+	            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
 	        }
 	    }
 	}
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 8e2b46459b0..9339b33ee7f 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -363,7 +363,7 @@ if ($resql)
            if (! empty($arrayfields["ef.".$key]['checked'])) 
            {
 				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
            }
 	   }
 	}
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 2ec1eb2af70..4a24f0d0c6d 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -356,7 +356,7 @@ if ($result)
             if (! empty($arrayfields["ef.".$key]['checked']))
             {
                 $align=$extrafields->getAlignFlag($key);
-                print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
             }
         }
     }
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index f8062cc70bc..be3cb384e96 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -672,7 +672,7 @@ if ($resql)
 	        if (! empty($arrayfields["ef.".$key]['checked']))
 	        {
 	            $align=$extrafields->getAlignFlag($key);
-	            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+	            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
 	        }
 	    }
 	}
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index dbfc9d8fd3c..52320ec9580 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -677,7 +677,7 @@ if ($resql)
 	        if (! empty($arrayfields["ef.".$key]['checked']))
 	        {
 	            $align=$extrafields->getAlignFlag($key);
-	            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+	            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
 	        }
 	    }
 	}
diff --git a/htdocs/modulebuilder/skeletons/skeleton_list.php b/htdocs/modulebuilder/skeletons/skeleton_list.php
index 77485c6d638..561dc98da35 100644
--- a/htdocs/modulebuilder/skeletons/skeleton_list.php
+++ b/htdocs/modulebuilder/skeletons/skeleton_list.php
@@ -109,12 +109,12 @@ if (empty($user->socid)) $fieldstosearchall["t.note_private"]="NotePrivate";
 
 // Definition of fields for list
 $arrayfields=array(
-    't.field1'=>array('label'=>$langs->trans("Field1"), 'checked'=>1),
-    't.field2'=>array('label'=>$langs->trans("Field2"), 'checked'=>1),
-    //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
-    't.datec'=>array('label'=>$langs->trans("DateCreationShort"), 'checked'=>0, 'position'=>500),
-    't.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-    //'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+    't.field1'=>array('label'=>"Field1", 'checked'=>1),
+    't.field2'=>array('label'=>"Field2", 'checked'=>1),
+    //'t.entity'=>array('label'=>"Entity", 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+    't.datec'=>array('label'=>"DateCreationShort", 'checked'=>0, 'position'=>500),
+    't.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+    //'t.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
@@ -354,7 +354,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
        if (! empty($arrayfields["ef.".$key]['checked'])) 
        {
 			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
        }
    }
 }
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 69108a893d9..2e651398766 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -610,7 +610,7 @@ else
     		        if (! empty($arrayfields["ef.".$key]['checked']))
     		        {
     		            $align=$extrafields->getAlignFlag($key);
-    		            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    		            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
     		        }
     		    }
     		}
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index a3742dcc00d..45ace2031cb 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -888,7 +888,7 @@ if ($resql)
            if (! empty($arrayfields["ef.".$key]['checked'])) 
            {
 				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
            }
 	   }
 	}
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 58bb6f6a3cb..ac6bc7b9948 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -422,7 +422,7 @@ if ($resql)
            if (! empty($arrayfields["ef.".$key]['checked'])) 
            {
 				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
            }
 	   }
 	}
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index c8335676700..790dde6e1aa 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -603,7 +603,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index a6a4c855474..13e15eb7eb6 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -575,7 +575,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 22293039c86..4b2b0b4c21e 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -731,7 +731,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
                if (! empty($arrayfields["ef.".$key]['checked'])) 
                {
     				$align=$extrafields->getAlignFlag($key);
-    				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+    				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
                }
     	   }
     	}*/
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 5a3d5390bb0..2d93a0ab2df 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -248,7 +248,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 9bde47887ed..ae77ec3148c 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -875,7 +875,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
        if (! empty($arrayfields["ef.".$key]['checked']))
        {
 			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
        }
    }
 }
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 3e1da6a7431..312416afa29 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -447,7 +447,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }

From 17bd393965fe961b4f33484e5ef587141c09f684 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Apr 2017 12:48:09 +0200
Subject: [PATCH 0525/1163] Fix typo

---
 build/debian/dolibarr.postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/debian/dolibarr.postinst b/build/debian/dolibarr.postinst
index 4b946fda433..6ee2a89931f 100644
--- a/build/debian/dolibarr.postinst
+++ b/build/debian/dolibarr.postinst
@@ -61,7 +61,7 @@ apache_install() {
 	# Enable dolibarr conf
 	if which a2enconf >/dev/null 2>&1 ;then
 		# a2enconf exists for ubuntu only
-		echo "Enable link for Apache config file with a3enconf"
+		echo "Enable link for Apache config file with a2enconf"
 		a2enconf dolibarr
 	else 
 		if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then

From 761ece3125000fec1827c02d3b6b296bceecdc63 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Apr 2017 16:59:22 +0200
Subject: [PATCH 0526/1163] Remove $maxfilenamelength replace with auto
 overflow.

---
 htdocs/core/class/html.formfile.class.php | 24 +++++++++++------------
 htdocs/theme/eldy/style.css.php           |  2 +-
 htdocs/theme/md/style.css.php             |  2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 1dfb5a08855..258c2c9c962 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -229,7 +229,7 @@ class FormFile
      *      @param      integer				$allowgenifempty	Show warning if no model activated
      *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
      *      @param      int					$iconPDF            Show only PDF icon with link (1/0)
-     * 		@param		int					$maxfilenamelength	Max length for filename shown
+     * 		@param		int					$notused	        Not used
      * 		@param		integer				$noform				Do not output html form tags
      * 		@param		string				$param				More param on http links
      * 		@param		string				$title				Title to show on top of form
@@ -238,10 +238,10 @@ class FormFile
      * 		@return		int										<0 if KO, number of shown files if OK
      *      @deprecated                                         Use print xxx->showdocuments() instead.
      */
-    function show_documents($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='')
+    function show_documents($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='')
     {
         $this->numoffiles=0;
-        print $this->showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang);
+        print $this->showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$notused,$noform,$param,$title,$buttonlabel,$codelang);
         return $this->numoffiles;
     }
 
@@ -259,7 +259,7 @@ class FormFile
      *      @param      integer				$allowgenifempty	Allow generation even if list of template ($genallowed) is empty (show however a warning)
      *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
      *      @param      int					$iconPDF            Deprecated, see getDocumentsLink
-     * 		@param		int					$maxfilenamelength	Max length for filename shown
+     * 		@param		int					$notused	        Not used
      * 		@param		integer				$noform				Do not output html form tags
      * 		@param		string				$param				More param on http links
      * 		@param		string				$title				Title to show on top of form
@@ -269,7 +269,7 @@ class FormFile
      *      @param      Object              $object             Object when method is called from an object card.
      * 		@return		string              					Output string with HTML array of documents (might be empty string)
      */
-    function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null)
+    function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null)
     {
 		// Deprecation warning
 		if (0 !== $iconPDF) {
@@ -297,7 +297,6 @@ class FormFile
         $hookmanager->initHooks(array('formfile'));
         $forname='builddoc';
         $out='';
-        $var=true;
 
         $headershown=0;
         $showempty=0;
@@ -691,27 +690,26 @@ class FormFile
 			{
 				foreach($file_list as $file)
 				{
-					$var=!$var;
-
 					// Define relative path for download link (depends on module)
 					$relativepath=$file["name"];										// Cas general
                     if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
 					if ($modulepart == 'export') $relativepath = $file["name"];			// Other case
 
-					$out.= "<tr ".$bc[$var].">";
+					$out.= '<tr class="oddeven">';
 
 					$documenturl = DOL_URL_ROOT.'/document.php';
 					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;
 					
 					// Show file name with link to download
-					$out.= '<td class="nowrap">';
-					$out.= '<a data-ajax="false" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
+					$out.= '<td class="tdoverflowmax300">';
+                    $tmp = $this->showPreview($file,$modulepart,$relativepath);
+                    $out.= ($tmp?$tmp.' ':'');
+					$out.= '<a href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
 					$mime=dol_mimetype($relativepath,'',0);
 					if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
 					$out.= ' target="_blank">';
-					$out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]).' '.dol_trunc($file["name"],$maxfilenamelength);
+					$out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]).' '.$file["name"];
 					$out.= '</a>'."\n";
-                    $out.= $this->showPreview($file,$modulepart,$relativepath);
 					$out.= '</td>';
 
 					// Show file size
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index e270cc3b030..dac7cf43f5e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1068,7 +1068,7 @@ div.nopadding {
 .pictowarning, .pictopreview {
     padding-<?php echo $left; ?>: 3px;
 }
-.pictoedit, .pictowarning, .pictopreview, .pictodelete {
+.pictoedit, .pictowarning, .pictodelete {
     vertical-align: text-bottom;
 }
 .colorthumb {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 6885bfad144..f4b38d08012 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1112,7 +1112,7 @@ table.noborder tr.liste_titre td {
 .pictowarning, .pictopreview {
     padding-<?php echo $left; ?>: 3px;
 }
-.pictoedit, .pictowarning, .pictopreview, .pictodelete {
+.pictoedit, .pictowarning, .pictodelete {
     vertical-align: text-bottom;
 }
 .colorthumb {

From 422bdd1ef64b4416f4de41d47cf7426f4db58fd1 Mon Sep 17 00:00:00 2001
From: delcroix Patrick <delcroip@gmail.com>
Date: Tue, 4 Apr 2017 09:06:29 +0200
Subject: [PATCH 0527/1163] FIX: Supplier is not the project customer

---
 htdocs/projet/element.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 1efc4465d81..ee2fc06c2b2 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -308,7 +308,7 @@ $listofreferent=array(
 	'margin'=>'minus',
 	'table'=>'facture_fourn',
 	'datefieldname'=>'datef',
-    'urlnew'=>DOL_URL_ROOT.'/fourn/facture/card.php?action=create&projectid='.$id.'&socid='.$socid,
+    'urlnew'=>DOL_URL_ROOT.'/fourn/facture/card.php?action=create&projectid='.$id,
     'lang'=>'suppliers',
     'buttonnew'=>'AddSupplierInvoice',
     'testnew'=>$user->rights->fournisseur->facture->creer,

From 9df4bac2028e6f5d90b41ddae74da13dbd6f7b12 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Apr 2017 11:56:19 +0200
Subject: [PATCH 0528/1163] NEW Bookmarks are into a combo list.

---
 htdocs/bookmarks/bookmarks.lib.php      | 42 ++++++++++++++++++++---
 htdocs/bookmarks/card.php               | 10 ++++--
 htdocs/bookmarks/list.php               |  4 +--
 htdocs/core/class/html.form.class.php   |  2 +-
 htdocs/core/lib/ajax.lib.php            |  3 +-
 htdocs/core/menus/standard/eldy.lib.php | 20 +++++------
 htdocs/langs/en_US/bookmarks.lang       |  4 ++-
 htdocs/theme/eldy/style.css.php         | 44 ++++++++++++++++---------
 htdocs/theme/md/style.css.php           | 36 ++++++++++++++------
 9 files changed, 116 insertions(+), 49 deletions(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 3cee534e797..d84713d1e62 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -41,9 +41,12 @@ function printBookmarksList($aDb, $aLangs)
 	$langs->load("bookmarks");
 
 	$url= $_SERVER["PHP_SELF"].(! empty($_SERVER["QUERY_STRING"])?'?'.$_SERVER["QUERY_STRING"]:'');
-
+    // TODO Add post param to $url
+    
 	$ret = '';
+	
 	// Menu bookmark
+	/*
 	$ret.= '<div class="menu_titre">';
 	$ret.= '<table class="nobordernopadding" width="100%" summary="bookmarkstable"><tr><td>';
 	$ret.= '<a class="vmenu" href="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</a>';
@@ -56,9 +59,18 @@ function printBookmarksList($aDb, $aLangs)
 	}
 	$ret.= '</td></tr></table>';
 	$ret.= '</div>';
-
+    */
 	$ret.= '<div class="menu_top"></div>'."\n";
 
+	$ret.= '<form id="actionbookmark" name="actionbookmark" method="POST" action="">';
+	$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo">';
+	$ret.= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
+    $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_js(DOL_URL_ROOT.'/bookmarks/list.php').'">'.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
+	if ($user->rights->bookmark->creer)
+	{
+    	$urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url);
+    	$ret.= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_js($urltoadd).'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'...</option>';
+	}
 	// Menu with all bookmarks
 	if (! empty($conf->global->BOOKMARKS_SHOW_IN_MENU))
 	{
@@ -71,9 +83,12 @@ function printBookmarksList($aDb, $aLangs)
 			$i=0;
 			while ($i < $conf->global->BOOKMARKS_SHOW_IN_MENU && $obj = $db->fetch_object($resql))
 			{
-				$ret.='<div class="menu_contenu"><a class="vsmenu" title="'.$obj->title.'" href="'.$obj->url.'"'.($obj->target == 1?' target="_blank"':'').'>';
+				//$ret.='<div class="menu_contenu">';
+			    $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_js($obj->url).'">'.img_picto('','object_bookmark').' '.$obj->title.'</option>';
+				/*$ret.='<a class="vsmenu" title="'.$obj->title.'" href="'.$obj->url.'"'.($obj->target == 1?' target="_blank"':'').'>';
 				if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $ret.=' '.img_object('','bookmark').' ';
-				$ret.= dol_trunc($obj->title, 20).'</a><br></div>';
+				$ret.= dol_trunc($obj->title, 20).'</a><br>';*/
+				//$ret.='</div>';
 				$i++;
 			}
 		}
@@ -82,7 +97,24 @@ function printBookmarksList($aDb, $aLangs)
 			dol_print_error($db);
 		}
 	}
-
+	
+	$ret.= '</select>';
+	$ret.= '</form>';
+	
+	$ret.=ajax_combobox('boxbookmark');
+	
+	$ret.='<script type="text/javascript">
+        	$(document).ready(function () {';
+	$ret.='    jQuery("#boxbookmark").change(function() {
+	            var urlselected = jQuery("#boxbookmark option:selected").attr("rel");
+	            var urltarget = jQuery("#boxbookmark option:selected").attr("target");
+	            if (! urltarget) { urltarget=""; }
+	            console.log("We change select bookmark. We choose "+urlselected+" with target "+urltarget);
+                jQuery("form#actionbookmark").attr("target",urltarget);
+	            jQuery("form#actionbookmark").attr("action",urlselected);
+	            jQuery("#actionbookmark").submit();
+	       });';
+	$ret.='})</script>';
 	$ret .= '<div class="menu_end"></div>';
 
 	return $ret;
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index cf5a52cf9c6..a9d4a39ef85 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -157,15 +157,19 @@ if ($action == 'create')
 
 	print '<table class="border" width="100%">';
 
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input class="flat" name="title" size="30" value="'.$title.'"></td><td class="hideonsmartphone">'.$langs->trans("SetHereATitleForLink").'</td></tr>';
-
-	print '<tr><td class="fieldrequired">'.$langs->trans("UrlOrLink").'</td><td><input class="flat" name="url" class="quatrevingtpercent" value="'.$url.'"></td><td class="hideonsmartphone">'.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'</td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input id="titlebookmark" class="flat minwidth100" name="title" value="'.$title.'"></td><td class="hideonsmartphone">'.$langs->trans("SetHereATitleForLink").'</td></tr>';
+	dol_set_focus('#titlebookmark');
+	
+	// Url
+	print '<tr><td class="fieldrequired">'.$langs->trans("UrlOrLink").'</td><td><input class="flat quatrevingtpercent" name="url" value="'.$url.'"></td><td class="hideonsmartphone">'.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'</td></tr>';
 
+	// Target
 	print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>';
 	$liste=array(0=>$langs->trans("ReplaceWindow"),1=>$langs->trans("OpenANewWindow"));
 	print $form->selectarray('target',$liste,1);
 	print '</td><td class="hideonsmartphone">'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'</td></tr>';
 
+	// Owner
 	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
 	print $form->select_dolusers(isset($_POST['userid'])?$_POST['userid']:$user->id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index d72fb19a6e5..b0cda58951c 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -71,9 +71,9 @@ if ($_GET["action"] == 'delete')
 
 $userstatic=new User($db);
 
-llxHeader();
+llxHeader('', $langs->trans("ListOfBookmarks"));
 
-print load_fiche_titre($langs->trans("Bookmarks"));
+print load_fiche_titre($langs->trans("ListOfBookmarks"));
 
 $sql = "SELECT b.fk_soc as rowid, b.dateb, b.rowid as bid, b.fk_user, b.url, b.target, b.title, b.favicon, b.position,";
 $sql.= " u.login, u.lastname, u.firstname";
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2771161572f..f58bd0953ab 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5087,7 +5087,7 @@ class Form
      *  @param	string	$morecss				Add more class to css styles
      *  @param  int     $callurlonselect        If set to 1, some code is added so an url return by the ajax is called when value is selected.
      *  @param  string  $placeholder            String to use as placeholder
-     *  @param  integer  $acceptdelayedhtml      1 if caller request to have html delayed content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
+     *  @param  integer $acceptdelayedhtml      1 if caller request to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
      * 	@return	string   						HTML select string
      */
     static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0, $placeholder='', $acceptdelayedhtml=0)
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index a1041e9358b..942c17f5df9 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -401,7 +401,7 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
 	if ($forcefocus) $msg.= '.select2(\'focus\')';
 	$msg.= ';'."\n";
 
-	if (count($events))
+	if (count($events))    // If an array of js events to do were provided.
 	{
 		$msg.= '
 			jQuery("#'.$htmlname.'").change(function () {
@@ -414,6 +414,7 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
 			});
 
 			function runJsCodeForEvent'.$htmlname.'(obj) {
+			    console.log("Run runJsCodeForEvent'.$htmlname.'");
 				var id = $("#'.$htmlname.'").val();
 				var method = obj.method;
 				var url = obj.url;
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 7207f8f2189..f78a38d20b0 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -494,6 +494,16 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
         print "<!-- End SearchForm -->\n";
 	}
 
+	if (is_array($moredata) && ! empty($moredata['bookmarks']))
+	{
+	    print "\n";
+	    print "<!-- Begin Bookmarks -->\n";
+	    print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
+	    print $moredata['bookmarks'];
+	    print '</div>'."\n";
+	    print "<!-- End Bookmarks -->\n";
+	}
+	
 	/**
 	 * We update newmenu with entries found into database
 	 * --------------------------------------------------
@@ -1632,16 +1642,6 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 		if ($altok) print '<div class="blockvmenuend"></div>';
 	}
 
-	if (is_array($moredata) && ! empty($moredata['bookmarks']))
-	{
-	        print "\n";
-	        print "<!-- Begin Bookmarks -->\n";
-	        print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
-	        print $moredata['bookmarks'];
-	        print '</div>'."\n";
-	        print "<!-- End Bookmarks -->\n";
-	}
-
 	return count($menu_array);
 }
 
diff --git a/htdocs/langs/en_US/bookmarks.lang b/htdocs/langs/en_US/bookmarks.lang
index e529130e1bc..0b6216c6be4 100644
--- a/htdocs/langs/en_US/bookmarks.lang
+++ b/htdocs/langs/en_US/bookmarks.lang
@@ -1,7 +1,9 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Add this page to bookmarks
+AddThisPageToBookmarks=Add current page to bookmarks
 Bookmark=Bookmark
 Bookmarks=Bookmarks
+ListOfBookmarks=List of bookmarks
+EditBookmarks=Edit bookmarks
 NewBookmark=New bookmark
 ShowBookmark=Show bookmark
 OpenANewWindow=Open a new window
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index dac7cf43f5e..a797d6f760b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -349,6 +349,12 @@ span.timesheetalreadyrecorded input {
 select.flat, form.flat select {
 	font-weight: normal;
 }
+.optionblue {
+	color: rgb(<?php echo $colortextlink; ?>) !important;
+}
+.select2-results .select2-highlighted.optionblue {
+	color: #FFF !important;
+}
 .optiongrey, .opacitymedium {
 	opacity: 0.5;
 }
@@ -906,14 +912,14 @@ div.blockvmenulogo
 {
 	border-bottom: 0 !important;
 }
-div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks {
+div.blockvmenupair, div.blockvmenuimpair {
 	border-top: none !important;
 	border-left: none !important;
 	border-right: none !important;
 	border-bottom: 1px solid #e0e0e0;
 	padding-left: 0 !important;
 }
-div.blockvmenuend {
+div.blockvmenuend, div.blockvmenubookmarks {
 	border: none !important;
 	padding-left: 0 !important;
 }
@@ -1718,14 +1724,19 @@ div.vmenu, td.vmenu {
 }
 
 .vmenu {
+    width: 190px;
 	margin-left: 4px;
 	<?php if (GETPOST("optioncss") == 'print') { ?>
     display: none;
 	<?php } ?>
 }
 
+/* Force vmenusearchselectcombo with type=text differently than without because beautify with select2 affect vmenusearchselectcombo differently */ 
+input.vmenusearchselectcombo[type=text] {
+	width: 180px !important;
+}
 .vmenusearchselectcombo {
-	width: 188px;
+	width: 188px; 
 }
 
 .menu_contenu {
@@ -1757,10 +1768,6 @@ a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:
 a.vsmenu.addbookmarkpicto {
     padding-right: 10px;
 }
-.vmenu div.blockvmenubookmarks, .vmenu div.blockvmenuend, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone
-{
-/*	border-bottom: 1px solid #BBB; */
-}
 div.blockvmenusearchphone
 {
 	border-bottom: none !important;
@@ -1771,7 +1778,7 @@ div.blockvmenusearchphone
 }
 .vmenu div.blockvmenusearch
 {
-	padding-bottom: 14px;
+	padding-bottom: 4px;
 /*	border-bottom: 1px solid #e0e0e0;  */
 }
 .vmenu div.blockvmenuend
@@ -1785,7 +1792,7 @@ div.blockvmenusearchphone
 }
 div.blockvmenubookmarks
 {
-	padding-bottom: 6px !important;
+	padding-bottom: 16px !important;
 }
 div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend
 {
@@ -3862,14 +3869,19 @@ div.dataTables_length select {
 /*  Select2                                                                       */
 /* ============================================================================== */
 
+.select2-default {
+    color: #999 !important;
+    /*opacity: 0.2;*/
+}
 .select2-choice, .select2-container .select2-choice {
-	border-bottom: solid 1px rgba(0,0,0,.2);
+	border-bottom: solid 1px rgba(0,0,0,.4);
 }
 .select2-container .select2-choice > .select2-chosen {
     margin-right: 23px;
 }
 .select2-container .select2-choice .select2-arrow {
 	border-radius: 0;
+    background: transparent;
 }
 .select2-container-multi .select2-choices {
 	background-image: none;
@@ -3988,18 +4000,18 @@ a span.select2-chosen
 
 
 /* Special case for the select2 add widget */
-#addbox .select2-container .select2-choice > .select2-chosen {
+#addbox .select2-container .select2-choice > .select2-chosen, #actionbookmark .select2-container .select2-choice > .select2-chosen {
     text-align: left;
-    opacity: 0.2;
+    opacity: 0.4;
 }
 /* Style used before the select2 js is executed on boxcombo */
-#boxcombo.boxcombo {
+#boxbookmark.boxcombo, #boxcombo.boxcombo {
     text-align: left;
-    opacity: 0.2;
-    border-bottom: 1px solid #000;
+    opacity: 0.4;
+    border-bottom: solid 1px rgba(0,0,0,.4) !important;
     height: 26px;
     line-height: 24px;
-    padding: 0 0 5px 5px;
+    padding: 0 0 2px 0;
     vertical-align: top;
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index f4b38d08012..6e85ca8eb7d 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -346,6 +346,12 @@ span.timesheetalreadyrecorded input {
 select.flat, form.flat select {
 	font-weight: normal;
 }
+.optionblue {
+	color: rgb(<?php echo $colortextlink; ?>) !important;
+}
+.select2-results .select2-highlighted.optionblue {
+	color: #FFF !important;
+}
 .optiongrey, .opacitymedium {
 	opacity: 0.5;
 }
@@ -1782,7 +1788,7 @@ font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
 a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }
 
 
-div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
+div.blockvmenupair, div.blockvmenuimpair
 {
 	font-family: <?php print $fontlist ?>;
 	color: #000000;
@@ -1797,11 +1803,21 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
     padding-bottom: 10px;
     border-bottom: 1px solid #e0e0e0;
 }
+div.blockvmenubookmarks
+{
+	padding-bottom: 16px !important;
+}
+div.blockvmenuend {
+	border: none !important;
+	padding-left: 0 !important;
+}
 a.vsmenu.addbookmarkpicto {
     padding-right: 10px;
 }
-
-div.blockvmenusearch
+div.blockvmenufirst {
+	padding-top: 10px;
+}
+div.blockvmenusearch, div.blockvmenubookmarks
 {
 	font-family: <?php print $fontlist ?>;
 	color: #000000;
@@ -1811,7 +1827,7 @@ div.blockvmenusearch
     padding-right: 1px;
     padding-top: 3px;
     padding-bottom: 3px;
-    margin: 1px 0px 12px 0px;
+    margin: 1px 0px 2px 0px;
 
     padding-bottom: 10px;
     /* border-bottom: 1px solid #f4f4f4; */
@@ -4103,15 +4119,15 @@ a span.select2-chosen
 
 
 /* Special case for the select2 add widget */
-#addbox .select2-container .select2-choice > .select2-chosen {
+#addbox .select2-container .select2-choice > .select2-chosen, #actionbookmark .select2-container .select2-choice > .select2-chosen {
     text-align: left;
-    opacity: 0.2;
+    opacity: 0.3;
 }
 /* Style used before the select2 js is executed on boxcombo */
-#boxcombo.boxcombo {
+#boxbookmark.boxcombo, #boxcombo.boxcombo {
     text-align: left;
-    opacity: 0.2;
-    border-bottom: 1px solid #000;
+    opacity: 0.3;
+    border-bottom: solid 1px rgba(0,0,0,.4) !important;
     height: 26px;
     line-height: 24px;
     padding: 0 0 5px 5px;
@@ -4124,7 +4140,7 @@ a span.select2-chosen
   margin: 0 0 2px 3px;
   position: relative;
   line-height: 13px;
-  color: #333;
+  color: #444;
   cursor: default;
   border: 1px solid #ddd;
   border-radius: 3px;

From 89716a86a5642d7506177b6cbce6068ac738dea4 Mon Sep 17 00:00:00 2001
From: Widee <WideeFr@users.noreply.github.com>
Date: Tue, 4 Apr 2017 12:22:51 +0200
Subject: [PATCH 0529/1163] Avoid (DEPOSIT) (1) & (2) descriptions

When splitting a rebate into two parts, the word "DEPOSIT" is no longer translated on the invoices.
---
 htdocs/comm/remx.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 8c35c6c9e1f..6481c891d45 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -92,7 +92,7 @@ if ($action == 'confirm_split' && GETPOST("confirm") == 'yes')
 		$newdiscount2->fk_facture=$discount->fk_facture;
 		$newdiscount1->fk_facture_line=$discount->fk_facture_line;
 		$newdiscount2->fk_facture_line=$discount->fk_facture_line;
-		if ($discount->description == '(CREDIT_NOTE)')
+		if ($discount->description == '(CREDIT_NOTE)' || $discount->description == '(DEPOSIT)')
 		{
 			$newdiscount1->description=$discount->description;
 			$newdiscount2->description=$discount->description;

From c4d48569970197784d07f114615871aa2548f35f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Apr 2017 12:23:44 +0200
Subject: [PATCH 0530/1163] FIX sql errors on user card

---
 htdocs/core/class/html.form.class.php | 28 +++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f58bd0953ab..06405f28b01 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5547,20 +5547,24 @@ class Form
 
 		if (! is_object($object->thirdparty)) $object->fetch_thirdparty();
 
-		$possiblelinks=array(
-			'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
-			'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
-			'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.facnumber as ref, t.ref_client, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
-			'contrat'=>array('enabled'=>$conf->contrat->enabled , 'perms'=>1, 'label'=>'LinkToContract', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
-			'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
-			'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled , 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
-			'order_supplier'=>array('enabled'=>$conf->fournisseur->commande->enabled , 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
-			'invoice_supplier'=>array('enabled'=>$conf->fournisseur->facture->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id)
-		);
-
+		$possiblelinks=array();
+		if (is_object($object->thirdparty) && ! empty($object->thirdparty->id) && $object->thirdparty->id > 0)
+		{
+		    $possiblelinks=array(
+    			'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
+    			'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
+    			'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.facnumber as ref, t.ref_client, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
+    			'contrat'=>array('enabled'=>$conf->contrat->enabled , 'perms'=>1, 'label'=>'LinkToContract', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
+    			'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
+    			'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled , 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
+    			'order_supplier'=>array('enabled'=>$conf->fournisseur->commande->enabled , 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
+    			'invoice_supplier'=>array('enabled'=>$conf->fournisseur->facture->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id)
+    		);
+		}
+		
 		global $action;
 
-		// Can complet the possiblelink array
+		// Can complete the possiblelink array
 		$hookmanager->initHooks(array('commonobject'));
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('showLinkToObjectBlock',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook

From 01d69e4b58173750f314db3f5a1335fae7ad4e85 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Apr 2017 12:55:54 +0200
Subject: [PATCH 0531/1163] NEW Better reponsive design

---
 htdocs/core/lib/functions.lib.php |  4 +--
 htdocs/theme/eldy/style.css.php   | 43 +++++++++++++++++++++++--------
 htdocs/theme/md/style.css.php     |  4 +--
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8c27b101fa4..67713d7bd2c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5618,11 +5618,11 @@ function printCommonFooter($zone='private')
     	
     	if (empty($conf->dol_use_jmobile))
     	{
-        	print '<!-- Set handler to switch left menu page -->'."\n";
+        	print '<!-- Set handler to switch left menu page (menuhider) -->'."\n";
         	print 'jQuery(".menuhider").click(function() {';
         	print '  console.log("We click on .menuhider");'."\n";
         	print "  $('.side-nav').toggle();";
-        	if ($conf->theme == 'md') print "  $('.login_block').toggle();";
+        	print "  $('.login_block').toggle();";
         	print '});'."\n";
     	}
     	
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a797d6f760b..a63593292b6 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -691,7 +691,7 @@ div.fiche>form>div.div-table-responsive {
     justify-content: flex-start;
 }
 .thumbstat {
-	flex: 1 1 120px;
+	flex: 1 1 114px;
 }
 .thumbstat150 {
 	flex: 1 1 170px;
@@ -4538,10 +4538,17 @@ div.tabsElem a.tab {
 /* rule to reduce top menu - 3rd reduction */
 @media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 8; ?>px)	/* reduction 3 */
 {
-	/* Reduce login top right info */
-	.usertextatoplogin {
-		display: none;
+	.side-nav {
+		z-index: 200;
+    	background: #FFF;
+		padding-top: 70px;
+    }
+	#id-left {
+    	z-index: 201;
+        background: #FFF;
 	}
+	    
+	/* Reduce login top right info */
 	.help {
 	<?php if ($disableimages) {  ?>
 		display: none;
@@ -4551,19 +4558,33 @@ div.tabsElem a.tab {
 	<?php if (GETPOST("optioncss") == 'print') {  ?>
 		display:none;
 	<?php } else { ?>
-		padding-<?php echo $right; ?>: 78px;
+		padding-<?php echo $right; ?>: 0;
 	<?php } ?>
 	}
 	div.login_block_user {
 		min-width: 0;
+		width: 100%;
 	}
 	div.login_block {
-		top: 2px;
-		<?php if ($disableimages) {  ?>
-			max-width: 100px;
-		<?php } else { ?>
-			max-width: 82px;
-		<?php } ?>
+		display: none;
+		top: inherit !important;
+		left: 0 !important;
+		text-align: center;
+        vertical-align: middle;
+        background: #FFF;
+        height: 42px;
+		padding-top: 20px;
+		padding-left: 20px;
+    	padding-right: 20px;
+    	z-index: 202;
+    	min-width: 190px;
+    	max-width: 190px;
+    	width: 190px;
+    }
+	div.login_block_user, div.login_block_other { clear: both; }
+	.atoplogin, .atoplogin:hover
+	{
+		color: #000 !important;
 	}
 	.login_block_elem {
 		padding: 0 !important;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 6e85ca8eb7d..26c4c4d0a93 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -692,7 +692,7 @@ div.fiche>form>div.div-table-responsive {
     justify-content: flex-start;
 }
 .thumbstat {
-	flex: 1 1 120px;
+	flex: 1 1 114px;
 }
 .thumbstat150 {
 	flex: 1 1 150px;
@@ -1681,7 +1681,7 @@ div.login_block_other { padding-top: 3px; }
 	height: 16px;
 }
 .login_block_elem_name {
-	margin-top: 5px;
+	margin-top: 1px;
 }
 .atoplogin, .atoplogin:hover {
 	color: #<?php echo $colortextbackvmenu; ?> !important;

From 13333ffd73ff9de16db36667684bd6ce20502595 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Apr 2017 00:39:32 +0200
Subject: [PATCH 0532/1163] Add multipart text version into html emails.

---
 htdocs/core/class/conf.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 1692b58c5f9..08763cc346b 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -390,7 +390,8 @@ class Conf
 		// Set some default values
 
 		$this->global->MAIN_ACTIVATE_HTML5=1;
-
+        $this->global->MAIN_MAIL_USE_MULTI_PART=1;
+        
 		// societe
 		if (empty($this->global->SOCIETE_CODECLIENT_ADDON))       $this->global->SOCIETE_CODECLIENT_ADDON="mod_codeclient_leopard";
 		if (empty($this->global->SOCIETE_CODECOMPTA_ADDON))       $this->global->SOCIETE_CODECOMPTA_ADDON="mod_codecompta_panicum";

From 1dc2cae3a5f92bbf68afc2e6716d65e9fa4a9475 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Apr 2017 11:51:55 +0200
Subject: [PATCH 0533/1163] NEW Show company into combo list of projects

---
 htdocs/core/class/html.formprojet.class.php | 22 ++++++++++-----------
 htdocs/expensereport/card.php               |  9 ++++-----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 7cdd745193e..30481497163 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -150,10 +150,9 @@ class FormProjets
 			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
 		}
 
-
 		// Search all projects
-		$sql = 'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p';
+		$sql = 'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias';
+		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p LEFT JOIN '.MAIN_DB_PREFIX .'societe as s ON s.rowid = p.fk_soc';
 		$sql.= " WHERE p.entity IN (".getEntity('project', 1).")";
 		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
 		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
@@ -165,15 +164,9 @@ class FormProjets
 		        $sql.= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
 		    }
 		}
-		if (!empty($filterkey)) {
-			$sql .= ' AND (';
-			$sql .= ' p.title LIKE "%'.$this->db->escape($filterkey).'%"';
-			$sql .= ' OR p.ref LIKE "%'.$this->db->escape($filterkey).'%"';
-			$sql .= ')';
-		}
+		if (!empty($filterkey)) $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
 		$sql.= " ORDER BY p.ref ASC";
 
-		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -219,8 +212,13 @@ class FormProjets
 						$labeltoshow=dol_trunc($obj->ref,18);
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
-						$labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
-
+						$labeltoshow.=', '.dol_trunc($obj->title, $maxlength);
+						if ($obj->name) 
+						{
+						    $labeltoshow.=' - '.$obj->name;
+						    if ($obj->name_alias) $labeltoshow.=' ('.$obj->name_alias.')';
+						}
+						
 						$disabled=0;
 						if ($obj->fk_statut == 0)
 						{
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index fa6018fcd07..488c4c547ed 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1896,15 +1896,15 @@ else
 						}
 						print '</tr>';
 
-						$var=true;
 						while ($i < $num_lignes)
 						{
 							$piece_comptable = $i + 1;
 							$objp = $db->fetch_object($resql);
-							$var=!$var;
+
 							if ($action != 'editline' || $objp->rowid != GETPOST('rowid'))
 							{
-								print '<tr '.$bc[$var].'>';
+								print '<tr class="oddeven">';
+								
 								print '<td style="text-align:center;">';
 								print img_picto($langs->trans("Document"), "object_generic");
 								print ' <span>'.$piece_comptable.'</span></td>';
@@ -1953,8 +1953,7 @@ else
 
 							if ($action == 'editline' && $objp->rowid == GETPOST('rowid'))
 							{
-									//modif ligne!!!!!
-									print '<tr '.$bc[$var].'>';
+									print '<tr class="oddeven">';
 									
 									print '<td></td>';
 

From 736800dd669e8827d316f3218f09052860af529c Mon Sep 17 00:00:00 2001
From: Alexis ALGOUD <alexis@atm-consulting.fr>
Date: Wed, 5 Apr 2017 12:16:10 +0200
Subject: [PATCH 0534/1163] little fix

for param into list pagination
---
 htdocs/core/class/listview.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index a5af2d6f758..dc2dbbcd161 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -251,7 +251,7 @@ class Listview
 					if (isset($TParam['type'][$field]) && ($TParam['type'][$field]==='date' || $TParam['type'][$field]==='datetime'))
 					{
 						$k = 'Listview_'.$this->id.'_search_'.$field;
-						if ($info['recherche'] === 'calendars')
+						if ($info['search_type'] === 'calendars')
 						{
 							$value = array();
 							
@@ -338,7 +338,7 @@ class Listview
 			$value = isset($ListPOST[$this->id]['search'][$key]) ? $ListPOST[$this->id]['search'][$key] : '';
 			if ($removeFilter) $value = '';
 			
-			$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search;  
+			$typeRecherche = (is_array($param_search) && isset($param_search['search_type'])) ? $param_search['search_type'] : $param_search;  
 			
 			if(is_array($typeRecherche))
 			{
@@ -599,7 +599,7 @@ class Listview
 		
 		$dolibarr_decalage = $this->totalRow > $this->totalRowToShow ? 1 : 0;
 		ob_start();
-		print_barre_liste($TParam['list']['title'], $TParam['limit']['page']-1, $_SERVER["PHP_SELF"], '&param', $TParam['sortfield'], $TParam['sortorder'], '', $this->totalRowToShow+$dolibarr_decalage, $this->totalRow, $TParam['list']['image'], 0, '', '', $TParam['limit']['nbLine']);
+		print_barre_liste($TParam['list']['title'], $TParam['limit']['page']-1, $_SERVER["PHP_SELF"], '&'.$TParam['list']['param_url'], $TParam['sortfield'], $TParam['sortorder'], '', $this->totalRowToShow+$dolibarr_decalage, $this->totalRow, $TParam['list']['image'], 0, '', '', $TParam['limit']['nbLine']);
 		$out .= ob_get_clean();
 		
 	
@@ -621,7 +621,7 @@ class Listview
 			if (empty($head['width'])) $head['width'] = 'auto';
 			if (!empty($head['width']) && !empty($head['text-align'])) $moreattrib .= 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
 
-			if (isset($TParam['search'][$field]['recherche']) && $TParam['search'][$field]['recherche'] !== false)
+			if (isset($TParam['search'][$field]['search_type']) && $TParam['search'][$field]['search_type'] !== false)
 			{
 				$TsKey = $this->getSearchKey($field, $TParam);
 				if (!empty($TsKey)) $search = implode(',', $TsKey);

From 22503da8b4499a6f385d1d7f383233b0ca8842fd Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Wed, 5 Apr 2017 12:25:00 +0200
Subject: [PATCH 0535/1163] Fix search_type on inventory list

---
 htdocs/inventory/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/inventory/list.php b/htdocs/inventory/list.php
index ff2c5e4d8d4..d55996d0407 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/inventory/list.php
@@ -84,9 +84,9 @@ echo $list->render(Inventory::getSQL('All'), array(
 		
 	),
     'search'=>array(
-		'rowid' => array('recherche' => true, 'table' => array('i'), 'field' => array('title')),
-        'date_inventory'=>array('recherche' => 'calendars', 'table' => array('i'), 'field' => array('date_inventory')),
-        'status'=>array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft"))
+		'rowid' => array('search_type' => true, 'table' => array('i'), 'field' => array('title')),
+		'date_inventory'=>array('search_type' => 'calendars', 'table' => array('i'), 'field' => array('date_inventory')),
+		'status'=>array('search_type' => array(1=>$langs->trans("inventoryValidate"), 0=>$langs->trans("inventoryDraft")))
     )
 ));
 

From ae2e40e5e760ff34d6c80dd6bfac831eaf85cb75 Mon Sep 17 00:00:00 2001
From: De Coninck Laurent <laurent@adlogix.eu>
Date: Wed, 5 Apr 2017 19:06:21 +0200
Subject: [PATCH 0536/1163] mark expense report as paid if payement set the
 remaining sold to 0

---
 htdocs/expensereport/payment/payment.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index ebcc1056fe4..56a5b1c7fb3 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -134,6 +134,18 @@ if ($action == 'add_payment')
                 }
             }
 
+            if (!$error) {
+                $payment->fetch($paymentid);
+                if ($expensereport->total_ttc - $payment->amount == 0) {
+                    $result = $expensereport->set_paid($expensereport->id, $user);
+                    if (!$result > 0) {
+                        $errmsg = $payment->error;
+                        $error++;
+                    }
+                }
+
+            }
+
     	    if (! $error)
             {
                 $db->commit();

From dae08285433bd6170f883565723c03b82970e388 Mon Sep 17 00:00:00 2001
From: delcroix Patrick <delcroip@gmail.com>
Date: Wed, 5 Apr 2017 20:50:18 +0200
Subject: [PATCH 0537/1163] NEW : show files in the bank statement + download

---
 htdocs/compta/bank/releve.php | 134 +++++++++++++++++++++++++++++++++-
 1 file changed, 133 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index ffadceafb2e..2ab6df9047f 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2017      Patrick Delcroix	<pmpdelcroix@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
+//show files
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 
 $langs->load("banks");
 $langs->load("categories");
@@ -88,7 +92,36 @@ if ($id > 0 || ! empty($ref))
 
 // Initialize technical object to manage context to save list fields
 $contextpage='banktransactionlist'.(empty($object->ref)?'':'-'.$object->id);
+/*
+*ZIP creation
+*/
+if($action=="dl" && $num>0 && isset($_SESSION["releve"][$num])){
+        unset($zip);
+    $log='';
+        $filearray=$_SESSION["releve"][$num];
+        $zipname = $num.'.zip';
+        $zip = new ZipArchive;
+        $zip->open($zipname, ZipArchive::OVERWRITE);
+        foreach ($filearray as $key=> $files) {
+            if(is_array($files)){
+                foreach ($files as $file) {
+                    $zip->addFile($file["fullname"],$file["name"]);//
+                    $log.=$key.','.$file["name"]."\n";
+                }
+            }else{
+                $log.=$key.','.$langs->trans("Nofile")."\n";
+            }
+        }
+        $zip->addFromString('log.csv', $log);
+        $zip->close();
 
+        ///Then download the zipped file.
+        header('Content-Type: application/zip');
+        header('Content-disposition: attachment; filename='.$zipname);
+        header('Content-Length: ' . filesize($zipname));
+        readfile($zipname);
+}
+unset($_SESSION["releve"][$num]);
 
 /*
  * View
@@ -519,7 +552,7 @@ else
 					dol_print_error($db);
 				}
 			}
-
+                        print Get_attach_files($db,$objp->rowid,$objp->label);
 			print "</td>";
 
 			if ($objp->amount < 0)
@@ -568,3 +601,102 @@ else
 llxFooter();
 
 $db->close();
+
+/*Function to generate the HTML code used to show the file name & download link attached to the Item covered by the bank line
+ * @param $db       Object          database object   
+ * @param $bankId   int             bank line id
+ * @param $label      
+ * 
+ */
+function Get_attach_files($db, $bankId,$label=''){
+    $out='';
+    global$conf;
+     $sql='SELECT u.url_id, u.type,ff.rowid as id , ff.`ref` AS reff, f.facnumber AS `ref`,';
+     $sql.=' e.`ref` AS refe, sp.rowid AS ids, d.rowid AS idd';
+     $sql.=' FROM '.MAIN_DB_PREFIX.'bank_url AS u';
+    if ( !empty($label) || $label=='(CustomerInvoicePayment)'){
+     $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement AS p ON p.fk_bank = u.fk_bank';
+     $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture AS pf ON pf.fk_paiement = p.rowid';
+    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'facture AS f ON f.rowid = pf.fk_facture';
+    }
+    if( !empty($label) || $label=='(SupplierInvoicePayment)'){
+    //invoice suplier (SupplierInvoicePayment)
+    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn AS fp ON fp.fk_bank = u.fk_bank';
+     $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn AS fpf ON fpf.fk_paiementfourn = fp.rowid';
+    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn AS ff ON ff.rowid = fpf.fk_facturefourn';
+    }
+    if( !empty($label) || $label=='(ExpenseReportPayment)'){
+    //EXPENSEs (ExpenseReportPayment)
+    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_expensereport AS ep ON ep.fk_bank = u.fk_bank';
+    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'expensereport AS e ON e.rowid = ep.fk_expensereport';
+    }
+    if( !empty($label) || $label=='(DonationPayment)'){
+    //donation
+    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_donation AS dp ON dp.fk_bank = u.fk_bank';
+    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'don AS d ON d.rowid = dp.fk_donation';
+    }
+    if( !empty($label) || $label=='(SalaryPayment)'){
+    //loan
+//    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_loan AS lp ON lp.fk_bank = u.fk_bank';
+    //salary
+    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_salary AS sp ON sp.fk_bank = u.fk_bank';
+    }
+    //END SQL
+    $sql.=" WHERE u.fk_bank in('".$bankId."')AND  u.type in ('payment','payment_supplier','payment_expensereport','payment_salary','payment_donation' )";
+    $resd = $db->query($sql);
+    $files=array(); 
+    $link='';
+    if ($resd)
+     {
+         $numd = $db->num_rows($resd);
+        $upload_dir ='';
+         $i=0;
+         if($numd>0)
+         {
+            
+            
+            $objd = $db->fetch_object($resd);
+          
+            switch($objd->type){
+            case "payment":    
+                $subdir=dol_sanitizeFileName($objd->ref);
+                $upload_dir = $conf->facture->dir_output.'/'.$subdir;
+                $link="../../document.php?modulepart=facture&file=".str_replace('/','%2F',$subdir).'%2F';
+                break;
+               
+            case "payment_supplier":      
+                $subdir=get_exdir($objd->id,2,0,0,$objd,'invoice_supplier').$objd->reff;
+                $upload_dir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
+                $link="../../document.php?modulepart=facture_fournisseur&file=".str_replace('/','%2F',$subdir).'%2F';
+                break;  
+            case "payment_expensereport":
+                $subdir=dol_sanitizeFileName($objd->refe);
+                $upload_dir = $conf->expensereport->dir_output.'/'.$subdir;
+                $link="../../document.php?modulepart=expensereport&file=".str_replace('/','%2F',$subdir).'%2F';
+                break;
+            case "payment_salary":
+                $subdir=dol_sanitizeFileName($objd->ids);
+                $upload_dir = $conf->salaries->dir_output.'/'.$subdir;
+                $link="../../document.php?modulepart=salaries&file=".str_replace('/','%2F',$subdir).'%2F';
+                break;
+            case "payment_donation":
+                $subdir=get_exdir(null,2,0,1,$objd,'donation'). '/'. dol_sanitizeFileName($objd->idd);
+                $upload_dir = $conf->don->dir_output . '/' . $subdir;
+                $link="../../document.php?modulepart=don&file=".str_replace('/','%2F',$subdir).'%2F';
+                break;
+            default:
+                break;
+            }
+            
+            if(!empty($upload_dir)){
+                $files=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$','',SORT_ASC,1);
+                foreach ($files as $key => $file){
+                    $out.= '<br><a href="'.$link.$file['name'].'">'.$file['name'].'</a>';
+                }
+                $_SESSION["releve"][$num][]=$files;
+            }
+         }
+     } 
+     $db->free($resd);
+       return $out;
+}

From ca72e5e19f04dd908c7fcd542d2c610164fcd151 Mon Sep 17 00:00:00 2001
From: delcroix Patrick <delcroip@gmail.com>
Date: Wed, 5 Apr 2017 20:53:41 +0200
Subject: [PATCH 0538/1163] NEW : download button

---
 htdocs/compta/bank/releve.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 2ab6df9047f..4eb52dd2178 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -595,6 +595,9 @@ else
 	print "</div>";
 	
 	print "</form>\n";
+	 // download button
+         echo  '<a href="releve.php?num='.$num.'&account='.$id.'&action=dl" class="butAction" name="Send" >'.$langs->trans('DownloadFile')." </a>\n";
+
 }
 
 

From 337eac30c17a8f08d38f8eed856423cc0b3f8ee0 Mon Sep 17 00:00:00 2001
From: delcroix Patrick <delcroip@gmail.com>
Date: Wed, 5 Apr 2017 21:14:41 +0200
Subject: [PATCH 0539/1163] Update releve.php

---
 htdocs/compta/bank/releve.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 4eb52dd2178..2acb0b327ce 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -552,7 +552,7 @@ else
 					dol_print_error($db);
 				}
 			}
-                        print Get_attach_files($db,$objp->rowid,$objp->label);
+                        print Get_attach_files($db,$objp->rowid,$num,$objp->label);
 			print "</td>";
 
 			if ($objp->amount < 0)
@@ -608,10 +608,11 @@ $db->close();
 /*Function to generate the HTML code used to show the file name & download link attached to the Item covered by the bank line
  * @param $db       Object          database object   
  * @param $bankId   int             bank line id
- * @param $label      
+ * @param $num      int 	    bank statement      
+ * @param $label    string	    label used to optimise the sql querry
  * 
  */
-function Get_attach_files($db, $bankId,$label=''){
+function Get_attach_files($db, $bankId,$num,$label=''){
     $out='';
     global$conf;
      $sql='SELECT u.url_id, u.type,ff.rowid as id , ff.`ref` AS reff, f.facnumber AS `ref`,';

From e2ea5945ddc772a60ef2e5229fbe302c8126bb6b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Apr 2017 14:48:24 +0200
Subject: [PATCH 0540/1163] Work on look and feel v6

---
 htdocs/adherents/class/adherent.class.php |  85 ++++++++---
 htdocs/adherents/list.php                 |   6 +-
 htdocs/categories/photos.php              |  16 +--
 htdocs/categories/traduction.php          |   4 +-
 htdocs/categories/viewcat.php             |   4 +-
 htdocs/compta/bank/ligne.php              |  16 ++-
 htdocs/core/class/commonobject.class.php  |   4 +-
 htdocs/core/class/html.form.class.php     |   4 +-
 htdocs/core/class/html.formfile.class.php |  19 ++-
 htdocs/core/lib/functions.lib.php         |   3 +-
 htdocs/core/tpl/contacts.tpl.php          |   4 +-
 htdocs/main.inc.php                       |   2 +-
 htdocs/projet/card.php                    |  13 +-
 htdocs/projet/class/task.class.php        |  11 ++
 htdocs/projet/contact.php                 |  13 +-
 htdocs/projet/element.php                 |  18 +--
 htdocs/projet/ganttchart.inc.php          |   4 +-
 htdocs/projet/ganttview.php               |  13 +-
 htdocs/projet/tasks.php                   |  11 +-
 htdocs/projet/tasks/contact.php           |  44 +++---
 htdocs/projet/tasks/document.php          |  31 +++-
 htdocs/projet/tasks/note.php              |  31 ++--
 htdocs/projet/tasks/task.php              |  42 ++++--
 htdocs/projet/tasks/time.php              | 163 ++++++++++++----------
 htdocs/user/class/user.class.php          |   4 +-
 25 files changed, 355 insertions(+), 210 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 833b5bf224e..f3dfd857973 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1570,40 +1570,85 @@ class Adherent extends CommonObject
     /**
      *    	Return clicable name (with picto eventually)
      *
-     *		@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-     *		@param	int		$maxlen			length max libelle
-     *		@param	string	$option			Page lien
+     *		@param	int		$withpictoimg	0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
+     *		@param	int		$maxlen			length max label
+     *		@param	string	$option			Page for link
+     *      @param  string  $mode           ''=Show firstname and lastname, 'firstname'=Show only firstname, 'login'=Show login, 'ref'=Show ref
+     *      @param  string  $morecss        Add more css on link
      *		@return	string					Chaine avec URL
      */
-    function getNomUrl($withpicto=0,$maxlen=0,$option='card')
+    function getNomUrl($withpictoimg=0,$maxlen=0,$option='card',$mode='ref',$morecss='')
     {
-        global $langs;
+        global $conf, $langs;
 
-        $result='';
-        $label = '<u>' . $langs->trans("ShowMember") . '</u>';
+        if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg=0;
+        
+        $result=''; $label='';
+        $link=''; $linkstart=''; $linkend='';
+
+        if (! empty($this->photo))
+        {
+            $label.= '<div class="photointooltip">';
+            $label.= Form::showphoto('memberphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
+            $label.= '</div><div style="clear: both;"></div>';
+        }
+        
+        $label.= '<div class="centpercent">';
+        $label.= '<u>' . $langs->trans("Member") . '</u>';
         if (! empty($this->ref))
             $label.= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
         if (! empty($this->firstname) || ! empty($this->lastname))
             $label.= '<br><b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs);
-        $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-
-        $link=''; $linkend='';
+        $label.='</div>';
+        
         if ($option == 'card' || $option == 'category')
         {
-            $link = '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id.$linkclose;
-            $linkend='</a>';
+            $link = '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id.'"';
         }
         if ($option == 'subscription')
         {
-            $link = '<a href="'.DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$this->id.$linkclose;
-            $linkend='</a>';
+            $link = '<a href="'.DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$this->id.'"';
         }
-
-        $picto='user';
-
-        if ($withpicto) $result.=($link.img_object('', $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        $result.=$link.(($withpicto != 2) ? ($maxlen?dol_trunc($this->ref,$maxlen):$this->ref) : '').$linkend;
+        
+        $linkclose="";
+        if (empty($notooltip))
+        {
+            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            {
+                $langs->load("users");
+                $label=$langs->trans("ShowUser");
+                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+            }
+            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose.= ' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+        }
+        
+        $link.=$linkclose.'>';
+        $linkend='</a>';
+        
+        //if ($withpictoimg == -1) $result.='<div class="nowrap">';
+        $result.=$link;
+        if ($withpictoimg)
+        {
+            $paddafterimage='';
+            if (abs($withpictoimg) == 1) $paddafterimage='style="margin-right: 3px;"';
+            // Only picto
+            if ($withpictoimg > 0) $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
+            // Picto must be a photo
+            else $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('memberphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg==-3?'small':''), 'mini', 0, 1).'</div>';
+            $result.=$picto;
+        }
+        if ($withpictoimg > -2 && $withpictoimg != 2)
+        {
+            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='<div class="inline-block nopadding valignmiddle'.((! isset($this->statut) || $this->statut)?'':' strikefordisabled').($morecss?' usertext'.$morecss:'').'">';
+            if ($mode == 'login') $result.=dol_trunc($this->login, $maxlen);
+            elseif ($mode == 'ref') $result.=$this->id;
+            else $result.=$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen);
+            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='</div>';
+        }
+        $result.=$linkend;
+        //if ($withpictoimg == -1) $result.='</div>';
+        
         return $result;
     }
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index e492e31b440..4589cdc754f 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -611,6 +611,7 @@ while ($i < min($num, $limit))
 	$memberstatic->statut=$obj->statut;
 	$memberstatic->datefin= $datefin;
 	$memberstatic->socid = $obj->fk_soc;
+	$memberstatic->photo = $obj->photo;
 	
 	if (! empty($obj->fk_soc)) {
 	    $memberstatic->fetch_thirdparty();
@@ -619,8 +620,7 @@ while ($i < min($num, $limit))
 		$companyname=$obj->company;
 	}
 
-	$var=!$var;
-	print "<tr>";
+	print '<tr class="oddeven">';
 	
 	if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 	{
@@ -631,7 +631,7 @@ while ($i < min($num, $limit))
 	if (! empty($arrayfields['d.ref']['checked'])) 
 	{
    		print "<td>";
-		print $memberstatic->getNomUrl(1);
+		print $memberstatic->getNomUrl(-1);
 		print "</td>\n";
 	}		
 	// Firstname
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index ee03f9f4771..100d2d0d48e 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -105,7 +105,7 @@ if ($object->id)
 	$head = categories_prepare_head($object,$type);
 
 
-	dol_fiche_head($head, 'photos', $title, 0, 'category');
+	dol_fiche_head($head, 'photos', $title, -1, 'category');
 	
 	$linkback = '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("BackToList").'</a>';
 	
@@ -130,6 +130,7 @@ if ($object->id)
 
 	print '<br>';
 	
+	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 
@@ -146,7 +147,8 @@ if ($object->id)
 	print '</td></tr>';
 
 	print "</table>\n";
-
+    print '</div>';
+    
 	print dol_fiche_end();
 
 
@@ -198,7 +200,7 @@ if ($object->id)
 		$dir = $upload_dir.'/'.$pdir;
 
 		print '<br>';
-		print '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
+		print '<table width="100%" valign="top" align="center">';
 
 		foreach ($object->liste_photos($dir) as $key => $obj)
 		{
@@ -255,14 +257,12 @@ if ($object->id)
 			$nbphoto++;
 		}
 
+		print '</table>';
+	
 		if ($nbphoto < 1)
 		{
-			print '<tr align=center valign=middle border=1><td class="photo">';
-			print "<br>".$langs->trans("NoPhotoYet")."<br><br>";
-			print '</td></tr>';
+			print '<div class="opacitymedium">'.$langs->trans("NoPhotoYet")."</div>";
 		}
-
-		print '</table>';
 	}
 }
 else
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index a239b357045..7dbe6325e1d 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -167,7 +167,7 @@ if (! empty($object->multilangs))
     }
 }
 
-dol_fiche_head($head, 'translation', $title, 0, 'category');
+dol_fiche_head($head, 'translation', $title, -1, 'category');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("BackToList").'</a>';
 
@@ -184,6 +184,7 @@ dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', 'ref',
 
 print '<br>';
 
+print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 
 print '<table class="border" width="100%">';
@@ -201,6 +202,7 @@ print $formother->showColor($object->color);
 print '</td></tr>';
 
 print '</table>';
+print '</div>';
 
 dol_fiche_end();
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index a1c33c568f3..a256b362361 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -192,7 +192,7 @@ else                                        $title=$langs->trans("Category");
 $head = categories_prepare_head($object,$type);
 
 
-dol_fiche_head($head, 'card', $title, 0, 'category');
+dol_fiche_head($head, 'card', $title, -1, 'category');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("BackToList").'</a>';
 
@@ -219,6 +219,7 @@ if ($action == 'delete')
 
 print '<br>';
 
+print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 print '<table width="100%" class="border">';
 
@@ -241,6 +242,7 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 }
 
 print '</table>';
+print '</div>';
 
 dol_fiche_end();
 
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index f403f676f07..f77ac86af7f 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -228,7 +228,6 @@ $tabs = array(
     )
 );
 
-dol_fiche_head($tabs, 0, $langs->trans('LineRecord'), 0, 'account');
 
 $sql = "SELECT b.rowid,b.dateo as do,b.datev as dv, b.amount, b.label, b.rappro,";
 $sql.= " b.num_releve, b.fk_user_author, b.num_chq, b.fk_type, b.fk_account, b.fk_bordereau as receiptid,";
@@ -269,11 +268,14 @@ if ($result)
         print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
         print '<input type="hidden" name="id" value="'.$acct->id.'">';
 
+        dol_fiche_head($tabs, 0, $langs->trans('LineRecord'), 0, 'account');
+        
         $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries.php">'.$langs->trans("BackToList").'</a>';
 
         
         dol_banner_tab($bankline, 'rowid', $linkback);
         
+
         print '<div class="underbanner clearboth"></div>';       
         print '<table class="border" width="100%">';
 
@@ -542,8 +544,10 @@ if ($result)
         print "</tr>";
 
         print "</table>";
-
-        print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';
+        
+        dol_fiche_end();
+        
+        print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div><br>';
 
         print "</form>";
 
@@ -596,7 +600,7 @@ if ($result)
             print '</tr>';
             print '</table>';
 
-			print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';
+            print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div><br>';
 
 			print '</form>';
         }
@@ -606,7 +610,6 @@ if ($result)
     $db->free($result);
 }
 else dol_print_error($db);
-print '</div>';
 
 
 
@@ -641,8 +644,7 @@ if ($result)
     {
         $objp = $db->fetch_object($result);
 
-        $var=!$var;
-        print "<tr ".$bc[$var].">";
+        print '<tr clas"oddeven">';
 
         print "<td>".$objp->label."</td>";
         print "<td align=\"center\"><a href=\"budget.php?bid=".$objp->rowid."\">".$langs->trans("ListBankTransactions")."</a></td>";
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e6a5b5d6b92..634f27b1985 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -781,7 +781,7 @@ abstract class CommonObject
         $tab=array();
 
         $sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user
-        if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact";
+        if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
         if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact";
         $sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
         $sql.= ", tc.source, tc.element, tc.code, tc.libelle";
@@ -815,7 +815,7 @@ abstract class CommonObject
                     $libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
                     $tab[$i]=array('source'=>$obj->source,'socid'=>$obj->socid,'id'=>$obj->id,
 					               'nom'=>$obj->lastname,      // For backward compatibility
-					               'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'statuscontact'=>$obj->statuscontact,
+					               'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,
 					               'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);
                 }
                 else
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 06405f28b01..eba2fda5049 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4920,7 +4920,7 @@ class Form
         }
         elseif ($typehour=='text' || $typehour=='textselect')
         {
-        	$retstring.='<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">';
+        	$retstring.='<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat maxwidth50" value="'.($hourSelected?((int) $hourSelected):'').'">';
         }
         else return 'BadValueForParameterTypeHour';
 
@@ -4944,7 +4944,7 @@ class Form
         }
         elseif ($typehour=='text' )
         {
-        	$retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat" value="'.($minSelected?((int) $minSelected):'').'">';
+        	$retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat maxwidth50" value="'.($minSelected?((int) $minSelected):'').'">';
         }
         
         if ($typehour!='text') $retstring.=' '.$langs->trans('MinuteShort');
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 258c2c9c962..3eef315d48a 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1103,19 +1103,16 @@ class FormFile
 			        // Do we have entry into database ?
 			        print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";
 					print '<tr id="row-'.($filearray[$key]['rowid']>0?$filearray[$key]['rowid']:'-AFTER'.$lastrowid.'POS'.($i+1)).'" '.$bcdd[$var].'>';
-					print '<td class="tdoverflow">';
+					print '<td class="tdoverflowmax300">';
+					
+					$filepath=$relativepath.$file['name'];
+					
+					if (! $editline) print $this->showPreview($file,$modulepart,$filepath);
 					
 					//print "XX".$file['name'];	//$file['name'] must be utf8
-					print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
+					print '<a class="paddingleft" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 					if ($forcedownload) print '&attachment=1';
 					if (! empty($object->entity)) print '&entity='.$object->entity;
-					$filepath=$relativepath.$file['name'];
-					/* Restore old code: When file is at level 2+, full relative path (and not only level1) must be into url
-					if ($file['level1name'] <> $object->id)
-						$filepath=$object->id.'/'.$file['level1name'].'/'.$file['name'];
-					else
-						$filepath=$object->id.'/'.$file['name'];
-					*/
 					print '&file='.urlencode($filepath);
 					print '">';
 
@@ -1135,10 +1132,10 @@ class FormFile
 					    print '</a>';
 					}
 					
-                    if (! $editline) print $this->showPreview($file,$modulepart,$filepath);
-
 					print "</td>\n";
+					
 					print '<td align="right" width="80px">'.dol_print_size($file['size'],1,1).'</td>';
+					
 					print '<td align="center" width="130px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';
 				
 					// Preview
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 67713d7bd2c..66eca2409f3 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1176,7 +1176,8 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	}
 	if (! empty($object->name_alias)) $morehtmlref.='<div class="refidno">'.$object->name_alias.'</div>';      // For thirdparty
 	
-	if ($object->element == 'product' || $object->element == 'bank_account')
+	// Add label
+	if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task')
 	{
 		if (! empty($object->label)) $morehtmlref.='<div class="refidno">'.$object->label.'</div>';
 	}
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 0a17a8c07c2..3077e49bf89 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -196,7 +196,9 @@ if ($permission) {
 				$userstatic->id=$tab[$i]['id'];
 				$userstatic->lastname=$tab[$i]['lastname'];
 				$userstatic->firstname=$tab[$i]['firstname'];
-				echo $userstatic->getNomUrl(1);
+				$userstatic->photo=$tab[$i]['photo'];
+				$userstatic->login=$tab[$i]['login'];
+				echo $userstatic->getNomUrl(-1);
 			}
 			if ($tab[$i]['source']=='external')
 			{
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 074f626f299..f44f2f70acf 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -848,7 +848,7 @@ if (! defined('NOREQUIRETRAN'))
 
 // Define some constants used for style of arrays
 $bc=array(0=>'class="impair"',1=>'class="pair"');
-$bcdd=array(0=>'class="drag drop"',1=>'class="drag drop"');
+$bcdd=array(0=>'class="drag drop oddeven"',1=>'class="drag drop oddeven"');
 $bcnd=array(0=>'class="nodrag nodrop nohover"',1=>'class="nodrag nodrop nohoverpair"');		// Used for tr to add new lines
 $bctag=array(0=>'class="tagtr"',1=>'class="pair tagtr"');
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 9407fc716c1..791cd6855f0 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -892,13 +892,12 @@ elseif ($object->id > 0)
     
         // Date start - end
         print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-        print dol_print_date($object->date_start,'day');
-        $end=dol_print_date($object->date_end,'day');
-        if ($end) 
-        {
-            print ' - '.$end;
-            if ($object->hasDelay()) print img_warning($langs->trans('Late'));
-        }
+		$start = dol_print_date($object->date_start,'dayhour');
+		print ($start?$start:'?');
+		$end = dol_print_date($object->date_end,'dayhour');
+		print ' - ';
+		print ($end?$end:'?');
+		if ($object->hasDelay()) print img_warning("Late");
         print '</td></tr>';
     	     
         // Budget
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 7c986e4d9a2..a5e4cb69492 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1635,6 +1635,17 @@ class Task extends CommonObject
 			if ($statut==4) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
 			if ($statut==5) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut5');
 		}
+		if ($mode == 6)
+		{
+			/*if ($statut==0) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
+			if ($statut==1) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut1');
+			if ($statut==2) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut3');
+			if ($statut==3) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			if ($statut==4) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
+			if ($statut==5) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut5');*/
+		    //return $this->progress.' %';
+		    return '&nbsp;';
+		}
 	}
 
 	/**
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index e9de1f7f787..e843d4951e4 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -146,7 +146,7 @@ if ($id > 0 || ! empty($ref))
 	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
 	$head = project_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("Project"), 0, ($object->public?'projectpub':'project'));
+	dol_fiche_head($head, 'contact', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
 
     // Project card
@@ -206,9 +206,12 @@ if ($id > 0 || ! empty($ref))
     
     // Date start - end
     print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-    print dol_print_date($object->date_start,'day');
-    $end=dol_print_date($object->date_end,'day');
-    if ($end) print ' - '.$end;
+	$start = dol_print_date($object->date_start,'dayhour');
+	print ($start?$start:'?');
+	$end = dol_print_date($object->date_end,'dayhour');
+	print ' - ';
+	print ($end?$end:'?');
+	if ($object->hasDelay()) print img_warning("Late");
     print '</td></tr>';
 
     // Budget
@@ -235,7 +238,7 @@ if ($id > 0 || ! empty($ref))
     print '</td></tr>';
     
     // Categories
-    if($conf->categorie->enabled) {
+    if ($conf->categorie->enabled) {
         print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
         print $form->showCategories($object->id,'project',1);
         print "</td></tr>";
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 1efc4465d81..7be3cebd46c 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -183,9 +183,12 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 
 // Date start - end
 print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-print dol_print_date($object->date_start,'day');
-$end=dol_print_date($object->date_end,'day');
-if ($end) print ' - '.$end;
+$start = dol_print_date($object->date_start,'dayhour');
+print ($start?$start:'?');
+$end = dol_print_date($object->date_end,'dayhour');
+print ' - ';
+print ($end?$end:'?');
+if ($object->hasDelay()) print img_warning("Late");
 print '</td></tr>';
 
 // Budget
@@ -770,7 +773,6 @@ foreach ($listofreferent as $key => $value)
 		$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee);
 		if (is_array($elementarray) && count($elementarray)>0)
 		{
-			$var=true;
 			$total_ht = 0;
 			$total_ttc = 0;
 
@@ -813,7 +815,6 @@ foreach ($listofreferent as $key => $value)
 				if ($breakline && $saved_third_id != $element->thirdparty->id)
 				{
 					print $breakline;
-					$var = true;
 
 					$saved_third_id = $element->thirdparty->id;
 					$breakline = '';
@@ -829,8 +830,7 @@ foreach ($listofreferent as $key => $value)
 					if (! empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal=false;	// Replacement invoice, do not include into total
 				}
 
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				// Remove link
 				print '<td style="width: 24px">';
 				if ($tablename != 'projet_task' && $tablename != 'stock_mouvement')
@@ -909,7 +909,9 @@ foreach ($listofreferent as $key => $value)
 				else if (in_array($tablename, array('projet_task'))) 
 				{
 				    $tmpprojtime = $element->getSumOfAmount($elementuser, $dates, $datee);	// $element is a task. $elementuser may be empty
+                    print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$idofelement.'&withproject=1">';
 				    print convertSecondToTime($tmpprojtime['nbseconds'], 'allhourmin');
+                	print '</a>';
 				    $total_time_by_line = $tmpprojtime['nbseconds'];
 				}
 				else print dol_print_date($date,'day');
@@ -935,7 +937,7 @@ foreach ($listofreferent as $key => $value)
                 }
                 else if ($tablename == 'projet_task' && $key == 'project_task_time')	// if $key == 'project_task', we don't want details per user
                 {
-                	print $elementuser->getNomUrl(1);
+                    print $elementuser->getNomUrl(1);
                 }
 				print '</td>';
 
diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php
index f60ada41bb1..4e1b53d3f24 100644
--- a/htdocs/projet/ganttchart.inc.php
+++ b/htdocs/projet/ganttchart.inc.php
@@ -167,8 +167,8 @@ function constructGanttLine($tarr,$task,$project_dependencies,$level=0,$project_
     $parent = $task["task_parent"];
     // Define percent
     $percent = $task['task_percent_complete']?$task['task_percent_complete']:0;
-    // Link
-    $link=DOL_URL_ROOT.'/projet/tasks/task.php?withproject=1&id='.$task["task_id"];
+    // Link (more information)
+    $link=DOL_URL_ROOT.'/projet/tasks/contact.php?withproject=1&id='.$task["task_id"];
 
     // Name
     $name=$task['task_name'];
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index d96e21cf194..36fbfccca77 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -94,7 +94,7 @@ if ($id > 0 || ! empty($ref))
     $tab='gantt';
 
     $head=project_prepare_head($object);
-    dol_fiche_head($head, $tab, $langs->trans("Project"),0,($object->public?'projectpub':'project'));
+    dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
     $param=($mode=='mine'?'&mode=mine':'');
 
@@ -138,9 +138,12 @@ if ($id > 0 || ! empty($ref))
     
     // Date start - end
     print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-    print dol_print_date($object->date_start,'day');
-    $end=dol_print_date($object->date_end,'day');
-    if ($end) print ' - '.$end;
+	$start = dol_print_date($object->date_start,'dayhour');
+	print ($start?$start:'?');
+	$end = dol_print_date($object->date_end,'dayhour');
+	print ' - ';
+	print ($end?$end:'?');
+	if ($object->hasDelay()) print img_warning("Late");
     print '</td></tr>';
     
     // Budget
@@ -253,7 +256,7 @@ if (count($tasksarray)>0)
 		$tasks[$taskcursor]['task_percent_complete']=$val->progress;
 		//$tasks[$taskcursor]['task_name']=$task->getNomUrl(1);
 		//print dol_print_date($val->date_start).dol_print_date($val->date_end).'<br>'."\n";
-		$tasks[$taskcursor]['task_name']=$val->label;
+		$tasks[$taskcursor]['task_name']=$val->ref.' - '.$val->label;
 		$tasks[$taskcursor]['task_start_date']=$val->date_start;
 		$tasks[$taskcursor]['task_end_date']=$val->date_end;
 		$tasks[$taskcursor]['task_color']='b4d1ea';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index b742b5a3acb..8b72a6448ec 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -207,7 +207,7 @@ if ($id > 0 || ! empty($ref))
 	$tab=GETPOST('tab')?GETPOST('tab'):'tasks';
 
 	$head=project_prepare_head($object);
-	dol_fiche_head($head, $tab, $langs->trans("Project"),0,($object->public?'projectpub':'project'));
+	dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
 	$param=($mode=='mine'?'&mode=mine':'');
 
@@ -268,9 +268,12 @@ if ($id > 0 || ! empty($ref))
 
     // Date start - end
     print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-    print dol_print_date($object->date_start,'day');
-    $end=dol_print_date($object->date_end,'day');
-    if ($end) print ' - '.$end;
+    $start = dol_print_date($object->date_start,'dayhour');
+    print ($start?$start:'?');
+    $end = dol_print_date($object->date_end,'dayhour');
+    print ' - ';
+    print ($end?$end:'?');
+    if ($object->hasDelay()) print img_warning("Late");
     print '</td></tr>';
     
     // Budget
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 060155d6507..02b31ea83ff 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -279,35 +279,31 @@ if ($id > 0 || ! empty($ref))
 		//$arrayofuseridoftask=$object->getListContactId('internal');
 
 		$head = task_prepare_head($object);
-		dol_fiche_head($head, 'task_contact', $langs->trans("Task"), 0, 'projecttask');
+		dol_fiche_head($head, 'task_contact', $langs->trans("Task"), -1, 'projecttask');
 
 
-		/*
-		 *   Projet synthese pour rappel
-		 */
-		print '<table class="border" width="100%">';
-
 		$param=(GETPOST('withproject')?'&withproject=1':'');
 		$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
-
-		// Ref
-		print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td><td colspan="3">';
+		
 		if (! GETPOST('withproject') || empty($projectstatic->id))
 		{
 		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
 		    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 		}
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-		print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
-		print '</td></tr>';
-
-		// Label
-		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
-
-		// Project
-		if (empty($withproject))
+		
+		$morehtmlref='';
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param, 0, '', '', 1);
+		
+		if (empty($withproject)) 
 		{
-    		print '<tr><td>'.$langs->trans("Project").'</td><td>';
+		    print '<div class="fichecenter">';
+		
+		    print '<div class="underbanner clearboth"></div>';
+		    print '<table class="border" width="100%">';
+
+		    // Project
+		    print '<tr><td class="titlefield">'.$langs->trans("Project").'</td><td>';
     		print $projectstatic->getNomUrl(1);
     		print '</td></tr>';
 
@@ -317,16 +313,18 @@ if ($id > 0 || ! empty($ref))
     		if ($projectstatic->thirdparty->id > 0) print $projectstatic->thirdparty->getNomUrl(1);
     		else print '&nbsp;';
     		print '</td></tr>';
+		
+    		print "</table>";
+		
+    		print '</div>';
 		}
 
-		print "</table>";
-
+		
 		dol_fiche_end();
 
 		/*
 		 * Lignes de contacts
 		 */
-		print '<br>';
 /*
 		// Contacts lines (modules that overwrite templates must declare this into descriptor)
 		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
@@ -481,7 +479,9 @@ if ($id > 0 || ! empty($ref))
                     $userstatic->id=$tab[$i]['id'];
                     $userstatic->lastname=$tab[$i]['lastname'];
                     $userstatic->firstname=$tab[$i]['firstname'];
-                    print $userstatic->getNomUrl(1);
+    				$userstatic->photo=$tab[$i]['photo'];
+    				$userstatic->login=$tab[$i]['login'];
+                    print $userstatic->getNomUrl(-1);
                 }
                 if ($tab[$i]['source']=='external')
                 {
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index d985454119d..af7d35ab378 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -218,10 +218,7 @@ if ($object->id > 0)
 	}
 
 	$head = task_prepare_head($object);
-	dol_fiche_head($head, 'task_document', $langs->trans("Task"), 0, 'projecttask');
-
-	$param=(GETPOST('withproject')?'&withproject=1':'');
-	$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
+	dol_fiche_head($head, 'task_document', $langs->trans("Task"), -1, 'projecttask');
 
 	// Files list constructor
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
@@ -230,10 +227,27 @@ if ($object->id > 0)
 	{
 		$totalsize+=$file['size'];
 	}
+	
+	$param=(GETPOST('withproject')?'&withproject=1':'');
+	$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
 
+	if (! GETPOST('withproject') || empty($projectstatic->id))
+	{
+	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
+	    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
+	}
+	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
+	
+	$morehtmlref='';
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
+	
+	print '<div class="fichecenter">';
+	
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 
 	// Ref
+	/*
 	print '<tr><td class="titlefield">';
 	print $langs->trans("Ref");
 	print '</td><td colspan="3">';
@@ -249,11 +263,12 @@ if ($object->id > 0)
 
 	// Label
 	print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
-
+    */
+	
 	// Project
 	if (empty($withproject))
 	{
-		print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
+		print '<tr><td class="titlefield">'.$langs->trans("Project").'</td><td colspan="3">';
 		print $projectstatic->getNomUrl(1);
 		print '</td></tr>';
 
@@ -265,11 +280,13 @@ if ($object->id > 0)
 	}
 
 	// Files infos
-	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
 
 	print "</table>\n";
 
+	print '</div>';
+	
 	dol_fiche_end();
 
 	print '<br>';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index f595f43bc2b..ebdd3d0c5a3 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -110,7 +110,7 @@ if ($object->id > 0)
 		// Tabs for project
 		$tab='tasks';
 		$head=project_prepare_head($projectstatic);
-		dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project'));
+		dol_fiche_head($head, $tab, $langs->trans("Project"), 0, ($projectstatic->public?'projectpub':'project'));
 
 		$param=($mode=='mine'?'&mode=mine':'');
 		// Project card
@@ -197,13 +197,27 @@ if ($object->id > 0)
 	}
 
 	$head = task_prepare_head($object);
-	dol_fiche_head($head, 'task_notes', $langs->trans('Task'), 0, 'projecttask');
-
-	print '<table class="border" width="100%">';
+	dol_fiche_head($head, 'task_notes', $langs->trans('Task'), -1, 'projecttask');
 
+	
 	$param=(GETPOST('withproject')?'&withproject=1':'');
 	$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
-
+	
+	if (! GETPOST('withproject') || empty($projectstatic->id))
+	{
+	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
+	    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
+	}
+	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
+	
+	$morehtmlref='';
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
+	
+	print '<div class="fichecenter">';
+	
+    print '<div class="underbanner clearboth"></div>';
+	print '<table class="border" width="100%">';
+    /*
 	// Ref
 	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
 	if (empty($withproject) || empty($projectstatic->id))
@@ -217,7 +231,8 @@ if ($object->id > 0)
 
 	// Label
 	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
-
+    */
+	
 	// Project
 	if (empty($withproject))
 	{
@@ -234,12 +249,12 @@ if ($object->id > 0)
 
 	print "</table>";
 
-	print '<br>';
-
 	$cssclass='titlefield';
     $moreparam=$param;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
+	print '</div>';
+	
 	dol_fiche_end();
 }
 
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 2665b0b33b5..3e6d658bcc1 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -221,7 +221,7 @@ if ($id > 0 || ! empty($ref))
 			// Tabs for project
 			$tab='tasks';
 			$head=project_prepare_head($projectstatic);
-			dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project'));
+			dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public?'projectpub':'project'));
 
 			$param=($mode=='mine'?'&mode=mine':'');
 
@@ -306,6 +306,8 @@ if ($id > 0 || ! empty($ref))
             print '<div class="clearboth"></div>';
         
 			dol_fiche_end();
+
+			print '<br>';
 		}
 
 		/*
@@ -437,9 +439,22 @@ if ($id > 0 || ! empty($ref))
 				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&withproject='.$withproject,$langs->trans("DeleteATask"),$langs->trans("ConfirmDeleteATask"),"confirm_delete");
 			}
 
+			if (! GETPOST('withproject') || empty($projectstatic->id))
+			{
+			    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
+			    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
+			}
+			else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
+			
+			$morehtmlref='';
+			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
+			
 			print '<div class="fichecenter">';
+			
+			print '<div class="underbanner clearboth"></div>';			
 			print '<table class="border" width="100%">';
 
+			/*
 			// Ref
 			print '<tr><td class="titlefield">';
 			print $langs->trans("Ref");
@@ -456,11 +471,12 @@ if ($id > 0 || ! empty($ref))
 
 			// Label
 			print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
-
+            */
+			
 			// Project
 			if (empty($withproject))
 			{
-				print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
+				print '<tr><td class="titlefield">'.$langs->trans("Project").'</td><td colspan="3">';
 				print $projectstatic->getNomUrl(1);
 				print '</td></tr>';
 
@@ -471,15 +487,14 @@ if ($id > 0 || ! empty($ref))
 				print '</td></tr>';
 			}
 
-			// Date start
-			print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">';
-			print dol_print_date($object->date_start,'dayhour');
-			print '</td></tr>';
-
-			// Date end
-			print '<tr><td>'.$langs->trans("DateEnd").'</td><td colspan="3">';
-			print dol_print_date($object->date_end,'dayhour');
-        	if ($object->hasDelay()) print img_warning("Late");
+			// Date start - Date end
+			print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td colspan="3">';
+			$start = dol_print_date($object->date_start,'dayhour');
+    		print ($start?$start:'?');
+			$end = dol_print_date($object->date_end,'dayhour');
+    		print ' - ';
+    		print ($end?$end:'?');
+    		if ($object->hasDelay()) print img_warning("Late");
 			print '</td></tr>';
 
 			// Planned workload
@@ -523,7 +538,8 @@ if ($id > 0 || ! empty($ref))
 			}
 
 			print '</table>';
-            print '</div>';
+            
+			print '</div>';
             
 			dol_fiche_end();
 		}
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 4b2b0b4c21e..73aba634c4d 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -49,6 +49,9 @@ $search_datewithhour='';
 $search_note=GETPOST('search_note','alpha');
 $search_duration=GETPOST('search_duration','int');
 $search_value=GETPOST('search_value','int');
+$search_task_ref=GETPOST('search_task_ref','alpha');
+$search_task_label=GETPOST('search_task_label','alpha');
+$search_user=GETPOST('search_user','int');
 
 // Security check
 $socid=0;
@@ -103,6 +106,9 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPO
     $search_value='';
     $search_date_creation='';
     $search_date_update='';
+    $search_task_ref='';
+    $search_task_label='';
+    $search_user=0;
     $toselect='';
     $search_array_options=array();
     $action='';
@@ -299,7 +305,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			// Tabs for project
 			$tab='tasks';
 			$head=project_prepare_head($projectstatic);
-			dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project'));
+			dol_fiche_head($head, $tab, $langs->trans("Project"), 0, ($projectstatic->public?'projectpub':'project'));
 
 			$param=($mode=='mine'?'&mode=mine':'');
 
@@ -418,43 +424,51 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 	if (empty($projectidforalltimes))
 	{
 		$head=task_prepare_head($object);
-		dol_fiche_head($head, 'task_time', $langs->trans("Task"),0,'projecttask');
+		dol_fiche_head($head, 'task_time', $langs->trans("Task"), -1, 'projecttask');
 
 		if ($action == 'deleteline')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.'&lineid='.$_GET["lineid"].($withproject?'&withproject=1':''),$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
 		}
 
-		print '<div class="fichecenter">';
-		print '<table class="border" width="100%">';
-
 		$param=($withproject?'&withproject=1':'');
 		$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
 
-		// Ref
-		print '<tr><td class="titlefield">';
-		print $langs->trans("Ref");
-		print '</td><td colspan="3">';
 		if (! GETPOST('withproject') || empty($projectstatic->id))
 		{
 			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
 			$object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 		}
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
+		
+		$morehtmlref='';
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
+		
+		print '<div class="fichecenter">';
+		
+        print '<div class="underbanner clearboth"></div>';
+		print '<table class="border" width="100%">';
+
+		// Ref
+		/*
+		print '<tr><td class="titlefield">';
+		print $langs->trans("Ref");
+		print '</td><td colspan="3">';
 		print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
 		print '</td></tr>';
 
 		// Label
 		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
-
-		// Date start
-		print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">';
-		print dol_print_date($object->date_start,'dayhour');
-		print '</td></tr>';
-
-		// Date end
-		print '<tr><td>'.$langs->trans("DateEnd").'</td><td colspan="3">';
-		print dol_print_date($object->date_end,'dayhour');
+        */
+		
+		// Date start - Date end
+		print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td colspan="3">';
+		$start = dol_print_date($object->date_start,'dayhour');
+		print ($start?$start:'?');
+		$end = dol_print_date($object->date_end,'dayhour');
+		print ' - ';
+		print ($end?$end:'?');
+		if ($object->hasDelay()) print img_warning("Late");
 		print '</td></tr>';
 
 		// Planned workload
@@ -517,11 +531,12 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			print '<td>'.$langs->trans("Date").'</td>';
 			print '<td>'.$langs->trans("By").'</td>';
 			print '<td>'.$langs->trans("Note").'</td>';
+			print '<td>'.$langs->trans("NewTimeSpent").'</td>';
 			print '<td>'.$langs->trans("ProgressDeclared").'</td>';
-			print '<td align="right" colspan="2">'.$langs->trans("NewTimeSpent").'</td>';
+			print '<td></td>';
 			print "</tr>\n";
 
-			print '<tr '.$bc[false].'>';
+			print '<tr class="oddeven">';
 
 			// Date
 			print '<td class="maxwidthonsmartphone">';
@@ -550,16 +565,16 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			print '<textarea name="timespent_note" class="maxwidth100onsmartphone" rows="'.ROWS_2.'">'.($_POST['timespent_note']?$_POST['timespent_note']:'').'</textarea>';
 			print '</td>';
 
+			// Duration - Time spent
+			print '<td>';
+			print $form->select_duration('timespent_duration', ($_POST['timespent_duration']?$_POST['timespent_duration']:''), 0, 'text');
+			print '</td>';
+
 			// Progress declared
 			print '<td class="nowrap">';
 			print $formother->select_percent(GETPOST('progress')?GETPOST('progress'):$object->progress,'progress');
 			print '</td>';
 
-			// Duration - Time spent
-			print '<td class="nowrap" align="right">';
-			print $form->select_duration('timespent_duration', ($_POST['timespent_duration']?$_POST['timespent_duration']:''), 0, 'text');
-			print '</td>';
-
 			print '<td align="center">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
 			print '</td></tr>';
@@ -609,13 +624,16 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		
 		$sql = "SELECT t.rowid, t.fk_task, t.task_date, t.task_datehour, t.task_date_withhour, t.task_duration, t.fk_user, t.note, t.thm,";
 		$sql .= " pt.ref, pt.label,";
-		$sql .= " u.lastname, u.firstname";
+		$sql .= " u.lastname, u.firstname, u.login, u.photo";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
 		$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
 		if (empty($projectidforalltimes)) $sql .= " AND t.fk_task =".$object->id;
 		else $sql.= " AND pt.fk_projet IN (".$projectidforalltimes.")";
 		if ($search_ref) $sql .= natural_search('c.ref', $search_ref);
 		if ($search_note) $sql .= natural_search('t.note', $search_note);
+		if ($search_task_ref) $sql .= natural_search('pt.ref', $search_task_ref);
+		if ($search_task_label) $sql .= natural_search('pt.label', $search_task_label);
+		if ($search_user > 0) $sql .= natural_search('t.fk_user', $search_user);
 		$sql .= $db->order($sortfield, $sortorder);
         
 		$var=true;
@@ -711,50 +729,23 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
         print '<div class="div-table-responsive">';
 		print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 		
-		print '<tr class="liste_titre">';
-		if (! empty($arrayfields['t.task_date']['checked'])) print_liste_field_titre($arrayfields['t.task_date']['label'],$_SERVER['PHP_SELF'],'t.task_date,t.task_datehour,t.rowid','',$params,'',$sortfield,$sortorder);
-		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
-        {
-            if (! empty($arrayfields['t.task_ref']['checked'])) print_liste_field_titre($arrayfields['t.task_ref']['label'],$_SERVER['PHP_SELF'],'pt.ref','',$params,'',$sortfield,$sortorder);            
-            if (! empty($arrayfields['t.task_label']['checked'])) print_liste_field_titre($arrayfields['t.task_label']['label'],$_SERVER['PHP_SELF'],'pt.label','',$params,'',$sortfield,$sortorder);            
-        }
-        if (! empty($arrayfields['author']['checked'])) print_liste_field_titre($arrayfields['author']['label'],$_SERVER['PHP_SELF'],'','',$params,'',$sortfield,$sortorder);
-		if (! empty($arrayfields['t.note']['checked'])) print_liste_field_titre($arrayfields['t.note']['label'],$_SERVER['PHP_SELF'],'t.note','',$params,'',$sortfield,$sortorder);
-		if (! empty($arrayfields['t.task_duration']['checked'])) print_liste_field_titre($arrayfields['t.task_duration']['label'],$_SERVER['PHP_SELF'],'t.task_duration','',$params,'align="right"',$sortfield,$sortorder);
-		if (! empty($arrayfields['value']['checked'])) print_liste_field_titre($arrayfields['value']['label'],$_SERVER['PHP_SELF'],'','',$params,'align="right"',$sortfield,$sortorder);
-		// Extra fields
-		/*
-    	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-    	{
-    	   foreach($extrafields->attribute_label as $key => $val) 
-    	   {
-               if (! empty($arrayfields["ef.".$key]['checked'])) 
-               {
-    				$align=$extrafields->getAlignFlag($key);
-    				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-               }
-    	   }
-    	}*/
-	    // Hook fields
-    	$parameters=array('arrayfields'=>$arrayfields);
-        $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-    	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-		print "</tr>\n";
-
 		// Fields title search
-		print '<tr class="liste_titre">';
-		// LIST_OF_TD_TITLE_SEARCH
+		print '<tr class="liste_titre_filter">';
+		// Date
 		if (! empty($arrayfields['t.task_date']['checked'])) print '<td class="liste_titre"></td>';
 		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
         {
-            if (! empty($arrayfields['t.task_ref']['checked'])) print '<td class="liste_titre"></td>';
-            if (! empty($arrayfields['t.task_label']['checked'])) print '<td class="liste_titre"></td>';
+            if (! empty($arrayfields['t.task_ref']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
+            if (! empty($arrayfields['t.task_label']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
         }
-        if (! empty($arrayfields['author']['checked'])) print '<td class="liste_titre"></td>';
-		if (! empty($arrayfields['t.note']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_note" value="'.$search_note.'"></td>';
-		if (! empty($arrayfields['t.task_duration']['checked'])) print '<td class="liste_titre right"></td>';
-		if (! empty($arrayfields['value']['checked'])) print '<td class="liste_titre"></td>';
+        // Author
+        if (! empty($arrayfields['author']['checked'])) print '<td class="liste_titre">'.$form->select_dolusers($search_user > 0 ? $search_user : -1, 'search_user', 1).'</td>';
+		// Note
+        if (! empty($arrayfields['t.note']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_note" value="'.dol_escape_htmltag($search_note).'"></td>';
+		// Duration
+        if (! empty($arrayfields['t.task_duration']['checked'])) print '<td class="liste_titre right"></td>';
+		// Value in currency
+        if (! empty($arrayfields['value']['checked'])) print '<td class="liste_titre"></td>';
 		// Extra fields
 		/*
 		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
@@ -784,11 +775,42 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
-		print '<td class="liste_titre" align="right">';
+		print '<td class="liste_titre center">';
 		$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
 		print $searchpitco;
 		print '</td>';
-		print '</tr>'."\n";		
+		print '</tr>'."\n";	
+		
+		print '<tr class="liste_titre">';
+		if (! empty($arrayfields['t.task_date']['checked'])) print_liste_field_titre($arrayfields['t.task_date']['label'],$_SERVER['PHP_SELF'],'t.task_date,t.task_datehour,t.rowid','',$params,'',$sortfield,$sortorder);
+		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
+        {
+            if (! empty($arrayfields['t.task_ref']['checked']))   print_liste_field_titre($arrayfields['t.task_ref']['label'],$_SERVER['PHP_SELF'],'pt.ref','',$params,'',$sortfield,$sortorder);            
+            if (! empty($arrayfields['t.task_label']['checked'])) print_liste_field_titre($arrayfields['t.task_label']['label'],$_SERVER['PHP_SELF'],'pt.label','',$params,'',$sortfield,$sortorder);            
+        }
+        if (! empty($arrayfields['author']['checked'])) print_liste_field_titre($arrayfields['author']['label'],$_SERVER['PHP_SELF'],'','',$params,'',$sortfield,$sortorder);
+		if (! empty($arrayfields['t.note']['checked'])) print_liste_field_titre($arrayfields['t.note']['label'],$_SERVER['PHP_SELF'],'t.note','',$params,'',$sortfield,$sortorder);
+		if (! empty($arrayfields['t.task_duration']['checked'])) print_liste_field_titre($arrayfields['t.task_duration']['label'],$_SERVER['PHP_SELF'],'t.task_duration','',$params,'align="right"',$sortfield,$sortorder);
+		if (! empty($arrayfields['value']['checked'])) print_liste_field_titre($arrayfields['value']['label'],$_SERVER['PHP_SELF'],'','',$params,'align="right"',$sortfield,$sortorder);
+		// Extra fields
+		/*
+    	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+    	{
+    	   foreach($extrafields->attribute_label as $key => $val) 
+    	   {
+               if (! empty($arrayfields["ef.".$key]['checked'])) 
+               {
+    				$align=$extrafields->getAlignFlag($key);
+    				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+               }
+    	   }
+    	}*/
+	    // Hook fields
+    	$parameters=array('arrayfields'=>$arrayfields);
+        $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+    	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center" width="80"',$sortfield,$sortorder,'maxwidthsearch ');
+		print "</tr>\n";
 
 		$tasktmp = new Task($db);
 		
@@ -802,7 +824,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		foreach ($tasks as $task_time)
 		{
 			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 
 			$date1=$db->jdate($task_time->task_date);
 			$date2=$db->jdate($task_time->task_datehour);
@@ -873,7 +895,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     				$userstatic->id         = $task_time->fk_user;
     				$userstatic->lastname	= $task_time->lastname;
     				$userstatic->firstname 	= $task_time->firstname;
-    				print $userstatic->getNomUrl(1);
+    				$userstatic->photo      = $task_time->photo;
+    				print $userstatic->getNomUrl(-1);
     			}
     			print '</td>';
     			if (! $i) $totalarray['nbfield']++;
@@ -932,7 +955,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			print $hookmanager->resPrint;
 		
             // Action column
-			print '<td class="right" valign="middle" width="80">';
+			print '<td class="center"">';
 			if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
 			{
 				print '<input type="hidden" name="lineid" value="'.$_GET['lineid'].'">';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 112609ce521..8529a0c0cfc 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1987,7 +1987,7 @@ class User extends CommonObject
 		if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg=0;
 
         $result=''; $label='';
-        $linkstart=''; $linkend='';
+        $link=''; $linkstart=''; $linkend='';
 		
 		if (! empty($this->photo))
 		{
@@ -2086,7 +2086,9 @@ class User extends CommonObject
 		}
 		$result.=$linkend;
 		//if ($withpictoimg == -1) $result.='</div>';
+		
 		$result.=$companylink;
+		
 		return $result;
 	}
 

From a99a4be9e01594d075216d767edf2e6f7177215d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 Apr 2017 22:31:45 +0200
Subject: [PATCH 0541/1163] Work on 6.0 look and feel

---
 htdocs/compta/bank/class/account.class.php |  5 +--
 htdocs/compta/bank/ligne.php               |  2 +-
 htdocs/compta/bank/releve.php              | 37 ++++++++++++----------
 htdocs/core/lib/functions.lib.php          | 18 +++++------
 htdocs/theme/eldy/style.css.php            |  1 +
 htdocs/theme/md/style.css.php              |  1 +
 6 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 8925a67d593..d360dc5207e 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1243,9 +1243,10 @@ class Account extends CommonObject
      *
      *		@param	int		$withpicto		Include picto into link
      *      @param  string	$mode           ''=Link to card, 'transactions'=Link to transactions card
+     *      @param  string  $option         ''=Show ref, 'reflabel'=Show ref+label
      *		@return	string					Chaine avec URL
      */
-    function getNomUrl($withpicto=0, $mode='')
+    function getNomUrl($withpicto=0, $mode='', $option='')
     {
         global $conf, $langs;
 
@@ -1279,7 +1280,7 @@ class Account extends CommonObject
         }
 
         if ($withpicto) $result.=($link.img_object($label, 'account', 'class="classfortooltip"').$linkend.' ');
-        $result.=$link.$this->ref.$linkend;
+        $result.=$link.$this->ref.($option == 'reflabel' && $this->label ? ' - '.$this->label : '').$linkend;
         return $result;
     }
 
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index f77ac86af7f..360a0d15a00 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -293,7 +293,7 @@ if ($result)
         // Bank account
         print '<tr><td class="titlefield">'.$langs->trans("Account").'</td>';
         print '<td>';
-        print $acct->getNomUrl(1,'transactions');
+        print $acct->getNomUrl(1,'transactions','reflabel');
         print '</td>';
         print '</tr>';
 
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index ffadceafb2e..cfe05e28ec3 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -44,7 +44,7 @@ $action=GETPOST('action', 'alpha');
 $id=GETPOST('account');
 $ref=GETPOST('ref');
 $dvid=GETPOST('dvid');
-$num=GETPOST('num');
+$numref=GETPOST('num');
 
 // Security check
 $fieldid = (! empty($ref)?$ref:$id);
@@ -116,7 +116,7 @@ if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 if ($id > 0) $param.='&id='.urlencode($id);
 
 
-if (empty($num))
+if (empty($numref))
 {
 	/*
 	 *	Vue liste tous releves confondus
@@ -176,14 +176,14 @@ if (empty($num))
 		while ($i < min($numrows,$conf->liste_limit))
 		{
 			$objp = $db->fetch_object($result);
-			$var=!$var;
+
 			if (! isset($objp->numr))
 			{
 				//
 			}
 			else
 			{
-				print '<tr '.$bc[$var].'><td><a href="releve.php?num='.$objp->numr.'&amp;account='.$object->id.'">'.$objp->numr.'</a></td>';
+				print '<tr class="oddeven"><td><a href="releve.php?num='.$objp->numr.'&amp;account='.$object->id.'">'.$objp->numr.'</a></td>';
 
 				// Calculate start amount
 				$sql = "SELECT sum(b.amount) as amount";
@@ -240,7 +240,7 @@ else
 		// Recherche valeur pour num = numero releve precedent
 		$sql = "SELECT DISTINCT(b.num_releve) as num";
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
-		$sql.= " WHERE b.num_releve < '".$db->escape($num)."'";
+		$sql.= " WHERE b.num_releve < '".$db->escape($numref)."'";
 		$sql.= " AND b.fk_account = ".$object->id;
 		$sql.= " ORDER BY b.num_releve DESC";
 
@@ -252,7 +252,7 @@ else
 			if ($numrows > 0)
 			{
 				$obj = $db->fetch_object($resql);
-				$num = $obj->num;
+				$numref = $obj->num;
 				$found=true;
 			}
 		}
@@ -262,7 +262,7 @@ else
 		// Recherche valeur pour num = numero releve precedent
 		$sql = "SELECT DISTINCT(b.num_releve) as num";
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
-		$sql.= " WHERE b.num_releve > '".$db->escape($num)."'";
+		$sql.= " WHERE b.num_releve > '".$db->escape($numref)."'";
 		$sql.= " AND b.fk_account = ".$object->id;
 		$sql.= " ORDER BY b.num_releve ASC";
 
@@ -274,7 +274,7 @@ else
 			if ($numrows > 0)
 			{
 				$obj = $db->fetch_object($resql);
-				$num = $obj->num;
+				$numref = $obj->num;
 				$found=true;
 			}
 		}
@@ -286,13 +286,16 @@ else
 
     $mesprevnext='';
 	$mesprevnext.='<div class="pagination"><ul>';
-	$mesprevnext.='<li class="pagination"><a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$_SERVER["PHP_SELF"].'?rel=prev&amp;num='.$num.'&amp;ve='.$ve.'&amp;account='.$object->id.'"><</a></li>';
+	$mesprevnext.='<li class="pagination"><a class="paginationnext" href="'.$_SERVER["PHP_SELF"].'?rel=prev&amp;num='.$numref.'&amp;ve='.$ve.'&amp;account='.$object->id.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
 	//$mesprevnext.=' &nbsp; ';
-	$mesprevnext.='<li class="pagination"><span class="active">'.$langs->trans("AccountStatement")." ".$num.'</span></li>';
+	$mesprevnext.='<li class="pagination"><span class="active">'.$langs->trans("AccountStatement")." ".$numref.'</span></li>';
 	//$mesprevnext.=' &nbsp; ';
-    $mesprevnext.='<li class="pagination"><a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$_SERVER["PHP_SELF"].'?rel=next&amp;num='.$num.'&amp;ve='.$ve.'&amp;account='.$object->id.'">></a></li>';
+    $mesprevnext.='<li class="pagination"><a class="paginationnext" href="'.$_SERVER["PHP_SELF"].'?rel=next&amp;num='.$numref.'&amp;ve='.$ve.'&amp;account='.$object->id.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
     $mesprevnext.='</ul></div>';
-	print load_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : '.$object->getNomUrl(0, 'receipts'), $mesprevnext, 'title_bank.png');
+    
+    $title=$langs->trans("AccountStatement").' '.$numref.', '.$langs->trans("BankAccount").' : '.$object->getNomUrl(0, 'receipts');
+	print load_fiche_titre($title, $mesprevnext, 'title_bank.png');
+	//print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, 0, $nbtotalofrecords, 'title_bank.png', 0, '', '', 0, 1);
 	print '<br>';
 
 	print "<form method=\"post\" action=\"releve.php\">";
@@ -315,7 +318,7 @@ else
 	// Calcul du solde de depart du releve
 	$sql = "SELECT sum(b.amount) as amount";
 	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
-	$sql.= " WHERE b.num_releve < '".$db->escape($num)."'";
+	$sql.= " WHERE b.num_releve < '".$db->escape($numref)."'";
 	$sql.= " AND b.fk_account = ".$object->id;
 
 	$resql=$db->query($sql);
@@ -335,8 +338,8 @@ else
 	$sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
 	$sql.= ", ".MAIN_DB_PREFIX."bank as b";
     $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bordereau_cheque as bc ON bc.rowid=b.fk_bordereau';
-	$sql.= " WHERE b.num_releve='".$db->escape($num)."'";
-	if (!isset($num))	$sql.= " OR b.num_releve is null";
+	$sql.= " WHERE b.num_releve='".$db->escape($numref)."'";
+	if (!isset($numref))	$sql.= " OR b.num_releve is null";
 	$sql.= " AND b.fk_account = ".$object->id;
 	$sql.= " AND b.fk_account = ba.rowid";
 	$sql.= $db->order("b.datev, b.datec", "ASC");  // We add date of creation to have correct order when everything is done the same day
@@ -368,9 +371,9 @@ else
 			// Date de valeur
 			print '<td align="center" valign="center" class="nowrap">';
 			print dol_print_date($db->jdate($objp->dv),"day") .' ';
-			print '<a href="releve.php?action=dvprev&amp;num='.$num.'&amp;account='.$object->id.'&amp;dvid='.$objp->rowid.'">';
+			print '<a href="releve.php?action=dvprev&amp;num='.$numref.'&amp;account='.$object->id.'&amp;dvid='.$objp->rowid.'">';
 			print img_edit_remove() . "</a> ";
-			print '<a href="releve.php?action=dvnext&amp;num='.$num.'&amp;account='.$object->id.'&amp;dvid='.$objp->rowid.'">';
+			print '<a href="releve.php?action=dvnext&amp;num='.$numref.'&amp;account='.$object->id.'&amp;dvid='.$objp->rowid.'">';
 			print img_edit_add() ."</a>";
 			print "</td>\n";
 			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvnext&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 66eca2409f3..7c428968c34 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3347,20 +3347,20 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 
 			if ($cpt>=1)
 			{
-				$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a '.(($conf->dol_use_jmobile != 4)?'':'data-role="button" ').'href="'.$file.'?page=0'.$options.'">1</a></li>';
-				if ($cpt > 2) $pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'data-role="button"').'>...</span></li>';
-				else if ($cpt == 2) $pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a '.(($conf->dol_use_jmobile != 4)?'':'data-role="button" ').'href="'.$file.'?page=1'.$options.'">2</a></li>';
+				$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page=0'.$options.'">1</a></li>';
+				if ($cpt > 2) $pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'').'>...</span></li>';
+				else if ($cpt == 2) $pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page=1'.$options.'">2</a></li>';
 			}
 
 			do
 			{
 				if ($cpt==$page)
 				{
-					$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="active"':'data-role="button"').'>'.($page+1).'</span></li>';
+					$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="active"':'').'>'.($page+1).'</span></li>';
 				}
 				else
 				{
-					$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a '.(($conf->dol_use_jmobile != 4)?'':'data-role="button" ').'href="'.$file.'?page='.$cpt.$options.'">'.($cpt+1).'</a></li>';
+					$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt+1).'</a></li>';
 				}
 				$cpt++;
 			}
@@ -3368,14 +3368,14 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 
 			if ($cpt<$nbpages)
 			{
-				if ($cpt<$nbpages-2) $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'data-role="button"').'>...</span></li>';
-				else if ($cpt == $nbpages-2) $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a '.(($conf->dol_use_jmobile != 4)?'':'data-role="button" ').'href="'.$file.'?page='.($nbpages-2).$options.'">'.($nbpages - 1).'</a></li>';
-				$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a '.(($conf->dol_use_jmobile != 4)?'':'data-role="button" ').'href="'.$file.'?page='.($nbpages-1).$options.'">'.$nbpages.'</a></li>';
+				if ($cpt<$nbpages-2) $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'').'>...</span></li>';
+				else if ($cpt == $nbpages-2) $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page='.($nbpages-2).$options.'">'.($nbpages - 1).'</a></li>';
+				$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page='.($nbpages-1).$options.'">'.$nbpages.'</a></li>';
 			}
 		}
 		else
 		{
-			$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="active"':'data-role="button"').'>'.($page+1)."</li>";
+			$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="active"':'').'>'.($page+1)."</li>";
 		}
 	}
 	print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtml, $savlimit, $totalnboflines, $hideselectlimit);		// output the div and ul for previous/last completed with page numbers into $pagelist
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a63593292b6..77c779b268e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2469,6 +2469,7 @@ div.pagination .disabled a:focus {
 }
 div.pagination li.pagination .active {
   text-decoration: underline;
+  box-shadow: none;
 }
 div.pagination li.paginationafterarrows {
 	margin-left: 10px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 26c4c4d0a93..553d2560790 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2533,6 +2533,7 @@ div.pagination .disabled a:focus {
 }
 div.pagination li.pagination .active {
   text-decoration: underline;
+  box-shadow: none;
 }
 div.pagination li.paginationafterarrows {
 	margin-left: 10px;

From 216bce608d38fa3c88ab1341e714c08dc43ccf4c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 Apr 2017 23:28:06 +0200
Subject: [PATCH 0542/1163] Work on v6 look and feel

---
 htdocs/compta/bank/releve.php                 | 268 ++++++++++--------
 .../compta/paiement/class/paiement.class.php  |  12 +-
 htdocs/compta/salaries/card.php               |  26 +-
 .../salaries/class/paymentsalary.class.php    |  91 +++++-
 htdocs/fourn/class/paiementfourn.class.php    |  12 +-
 htdocs/fourn/paiement/card.php                |  18 +-
 6 files changed, 268 insertions(+), 159 deletions(-)

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index fdf1ac27e7a..9d9826d0729 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -92,36 +92,46 @@ if ($id > 0 || ! empty($ref))
 
 // Initialize technical object to manage context to save list fields
 $contextpage='banktransactionlist'.(empty($object->ref)?'':'-'.$object->id);
-/*
-*ZIP creation
-*/
-if($action=="dl" && $num>0 && isset($_SESSION["releve"][$num])){
-        unset($zip);
-    $log='';
-        $filearray=$_SESSION["releve"][$num];
-        $zipname = $num.'.zip';
-        $zip = new ZipArchive;
-        $zip->open($zipname, ZipArchive::OVERWRITE);
-        foreach ($filearray as $key=> $files) {
-            if(is_array($files)){
-                foreach ($files as $file) {
-                    $zip->addFile($file["fullname"],$file["name"]);//
-                    $log.=$key.','.$file["name"]."\n";
-                }
-            }else{
-                $log.=$key.','.$langs->trans("Nofile")."\n";
-            }
-        }
-        $zip->addFromString('log.csv', $log);
-        $zip->close();
 
-        ///Then download the zipped file.
-        header('Content-Type: application/zip');
-        header('Content-disposition: attachment; filename='.$zipname);
-        header('Content-Length: ' . filesize($zipname));
-        readfile($zipname);
+
+// ZIP creation
+if ($action=="dl" && $numref > 0)
+{
+	// TODO Replace this with a standard builddoc action that use a document generation module to build the ZIP
+    $log = '';
+    
+    getAttachedFiles($db, $numref); // Build array $_SESSION["releve"][$numref] with all files to includes
+    
+    $filearray = $_SESSION["releve"][$numref];
+    $zipname = $numref . '.zip';
+    
+    $zip = new ZipArchive();
+    $zip->open($zipname, ZipArchive::OVERWRITE);
+    foreach ($filearray as $key => $files) {
+        if (is_array($files)) {
+            foreach ($files as $file) {
+                $zip->addFile($file["fullname"], $file["name"]); //
+                $log .= $key . ',' . $file["name"] . "\n";
+            }
+        } else {
+            $log .= $key . ',' . $langs->trans("Nofile") . "\n";
+        }
+    }
+    $zip->addFromString('log '.$numref.'.csv', $log);
+    $zip->close();
+    
+    // /Then download the zipped file.
+    header('Content-Type: application/zip');
+    header('Content-disposition: attachment; filename=' . $zipname);
+    header('Content-Length: ' . filesize($zipname));
+    
+    readfile($zipname);
+    
+    unset($_SESSION["releve"][$numref]);
+    
+    exit;
 }
-unset($_SESSION["releve"][$num]);
+
 
 /*
  * View
@@ -151,9 +161,7 @@ if ($id > 0) $param.='&id='.urlencode($id);
 
 if (empty($numref))
 {
-	/*
-	 *	Vue liste tous releves confondus
-	 */
+	// List of all standing receipts
 	$sql = "SELECT DISTINCT(b.num_releve) as numr";
 	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 	$sql.= " WHERE b.fk_account = ".$object->id;
@@ -470,6 +478,14 @@ else
 					$paymentvatstatic->ref=$langs->trans("Payment");
 					print ' '.$paymentvatstatic->getNomUrl(1);
 				}
+				elseif ($links[$key]['type']=='payment_salary')
+				{
+					print '<a href="'.DOL_URL_ROOT.'/compta/salaries/card.php?id='.$links[$key]['url_id'].'">';
+					print ' '.img_object($langs->trans('ShowPayment'),'payment').' ';
+					print $langs->trans("Payment");
+					print '</a>';
+					$newline=0;
+				}
 				elseif ($links[$key]['type']=='banktransfert') {
 					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
 					if ($objp->amount > 0)
@@ -512,6 +528,13 @@ else
 					print '</a>';
 					$newline=0;
 				}
+				elseif ($links[$key]['type']=='user') {
+					print '<a href="'.DOL_URL_ROOT.'/user/card.php?rowid='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('ShowUser'),'user').' ';
+					print $links[$key]['label'];
+					print '</a>';
+					$newline=0;
+				}
 				elseif ($links[$key]['type']=='sc') {
 					print '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$links[$key]['url_id'].'">';
 					print img_object($langs->trans('ShowBill'),'bill').' ';
@@ -555,7 +578,6 @@ else
 					dol_print_error($db);
 				}
 			}
-                        print Get_attach_files($db,$objp->rowid,$num,$objp->label);
 			print "</td>";
 
 			if ($objp->amount < 0)
@@ -598,9 +620,13 @@ else
 	print "</div>";
 	
 	print "</form>\n";
-	 // download button
-         echo  '<a href="releve.php?num='.$num.'&account='.$id.'&action=dl" class="butAction" name="Send" >'.$langs->trans('DownloadFile')." </a>\n";
-
+	
+	// Add a download button
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)   // Started a rewrite to make this feature more Dolibarr compliant. Still need dev to be completed.
+	{
+	    // TODO Replace this with standard box to generate document.
+	   print '<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$numref.'&account='.$id.'&action=dl" class="butAction" name="Send" >'.$langs->trans('DownloadPackageWithAllDocuments')." </a>\n";
+	}
 }
 
 
@@ -608,102 +634,102 @@ llxFooter();
 
 $db->close();
 
-/*Function to generate the HTML code used to show the file name & download link attached to the Item covered by the bank line
- * @param $db       Object          database object   
- * @param $bankId   int             bank line id
- * @param $num      int 	    bank statement      
- * @param $label    string	    label used to optimise the sql querry
+
+
+
+/**
+ * Function to generate the HTML code used to show the file name & download link attached to the Item covered by the bank line
  * 
+ * @param DoliDB    $db         database object   
+ * @param int       $bankId     bank line id
+ * @param int       $num        bank statement      
+ * @param string    $label     label used to optimise the sql querry
  */
-function Get_attach_files($db, $bankId,$num,$label=''){
-    $out='';
-    global$conf;
-     $sql='SELECT u.url_id, u.type,ff.rowid as id , ff.`ref` AS reff, f.facnumber AS `ref`,';
-     $sql.=' e.`ref` AS refe, sp.rowid AS ids, d.rowid AS idd';
-     $sql.=' FROM '.MAIN_DB_PREFIX.'bank_url AS u';
-    if ( !empty($label) || $label=='(CustomerInvoicePayment)'){
-     $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement AS p ON p.fk_bank = u.fk_bank';
-     $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture AS pf ON pf.fk_paiement = p.rowid';
-    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'facture AS f ON f.rowid = pf.fk_facture';
+function getAttachedFiles($db, $numref, $label='')
+{
+    $out = '';
+    global $conf;
+    $sql = 'SELECT u.url_id, u.type,ff.rowid as id , ff.`ref` AS reff, f.facnumber AS `ref`,';
+    $sql .= ' e.`ref` AS refe, sp.rowid AS ids, d.rowid AS idd';
+    $sql .= ' FROM ' . MAIN_DB_PREFIX . 'bank_url AS u, ' . MAIN_DB_PREFIX . 'bank AS b';
+    if (! empty($label) || $label == '(CustomerInvoicePayment)') {
+        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'paiement AS p ON p.fk_bank = u.fk_bank';
+        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'paiement_facture AS pf ON pf.fk_paiement = p.rowid';
+        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'facture AS f ON f.rowid = pf.fk_facture';
     }
-    if( !empty($label) || $label=='(SupplierInvoicePayment)'){
-    //invoice suplier (SupplierInvoicePayment)
-    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn AS fp ON fp.fk_bank = u.fk_bank';
-     $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn AS fpf ON fpf.fk_paiementfourn = fp.rowid';
-    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn AS ff ON ff.rowid = fpf.fk_facturefourn';
+    if (! empty($label) || $label == '(SupplierInvoicePayment)') {
+        // invoice suplier (SupplierInvoicePayment)
+        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'paiementfourn AS fp ON fp.fk_bank = u.fk_bank';
+        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'paiementfourn_facturefourn AS fpf ON fpf.fk_paiementfourn = fp.rowid';
+        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'facture_fourn AS ff ON ff.rowid = fpf.fk_facturefourn';
     }
-    if( !empty($label) || $label=='(ExpenseReportPayment)'){
-    //EXPENSEs (ExpenseReportPayment)
-    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_expensereport AS ep ON ep.fk_bank = u.fk_bank';
-    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'expensereport AS e ON e.rowid = ep.fk_expensereport';
+    if (! empty($label) || $label == '(ExpenseReportPayment)') {
+        // EXPENSEs (ExpenseReportPayment)
+        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'payment_expensereport AS ep ON ep.fk_bank = u.fk_bank';
+        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'expensereport AS e ON e.rowid = ep.fk_expensereport';
     }
-    if( !empty($label) || $label=='(DonationPayment)'){
-    //donation
-    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_donation AS dp ON dp.fk_bank = u.fk_bank';
-    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'don AS d ON d.rowid = dp.fk_donation';
+    if (! empty($label) || $label == '(DonationPayment)') {
+        // donation
+        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'payment_donation AS dp ON dp.fk_bank = u.fk_bank';
+        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'don AS d ON d.rowid = dp.fk_donation';
     }
-    if( !empty($label) || $label=='(SalaryPayment)'){
-    //loan
-//    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_loan AS lp ON lp.fk_bank = u.fk_bank';
-    //salary
-    $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_salary AS sp ON sp.fk_bank = u.fk_bank';
+    if (! empty($label) || $label == '(SalaryPayment)') {
+        // loan
+        // $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_loan AS lp ON lp.fk_bank = u.fk_bank';
+        // salary
+        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'payment_salary AS sp ON sp.fk_bank = u.fk_bank';
     }
-    //END SQL
-    $sql.=" WHERE u.fk_bank in('".$bankId."')AND  u.type in ('payment','payment_supplier','payment_expensereport','payment_salary','payment_donation' )";
+    // END SQL
+    $sql .= " WHERE u.fk_bank = b.rowid AND u.type in ('payment','payment_supplier','payment_expensereport','payment_salary','payment_donation' )";
     $resd = $db->query($sql);
-    $files=array(); 
-    $link='';
-    if ($resd)
-     {
-         $numd = $db->num_rows($resd);
-        $upload_dir ='';
-         $i=0;
-         if($numd>0)
-         {
-            
-            
+    $files = array();
+    $link = '';
+    if ($resd) {
+        $numd = $db->num_rows($resd);
+        $upload_dir = '';
+        $i = 0;
+        if ($numd > 0) 
+        {
             $objd = $db->fetch_object($resd);
-          
-            switch($objd->type){
-            case "payment":    
-                $subdir=dol_sanitizeFileName($objd->ref);
-                $upload_dir = $conf->facture->dir_output.'/'.$subdir;
-                $link="../../document.php?modulepart=facture&file=".str_replace('/','%2F',$subdir).'%2F';
-                break;
-               
-            case "payment_supplier":      
-                $subdir=get_exdir($objd->id,2,0,0,$objd,'invoice_supplier').$objd->reff;
-                $upload_dir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
-                $link="../../document.php?modulepart=facture_fournisseur&file=".str_replace('/','%2F',$subdir).'%2F';
-                break;  
-            case "payment_expensereport":
-                $subdir=dol_sanitizeFileName($objd->refe);
-                $upload_dir = $conf->expensereport->dir_output.'/'.$subdir;
-                $link="../../document.php?modulepart=expensereport&file=".str_replace('/','%2F',$subdir).'%2F';
-                break;
-            case "payment_salary":
-                $subdir=dol_sanitizeFileName($objd->ids);
-                $upload_dir = $conf->salaries->dir_output.'/'.$subdir;
-                $link="../../document.php?modulepart=salaries&file=".str_replace('/','%2F',$subdir).'%2F';
-                break;
-            case "payment_donation":
-                $subdir=get_exdir(null,2,0,1,$objd,'donation'). '/'. dol_sanitizeFileName($objd->idd);
-                $upload_dir = $conf->don->dir_output . '/' . $subdir;
-                $link="../../document.php?modulepart=don&file=".str_replace('/','%2F',$subdir).'%2F';
-                break;
-            default:
-                break;
+            
+            switch ($objd->type) {
+                case "payment":
+                    $subdir = dol_sanitizeFileName($objd->ref);
+                    $upload_dir = $conf->facture->dir_output . '/' . $subdir;
+                    $link = DOL_URL_ROOT."/document.php?modulepart=facture&file=" . str_replace('/', '%2F', $subdir) . '%2F';
+                    break;
+                case "payment_supplier":
+                    $subdir = get_exdir($objd->id, 2, 0, 0, $objd, 'invoice_supplier') . $objd->reff;
+                    $upload_dir = $conf->fournisseur->facture->dir_output . '/' . $subdir;
+                    $link = DOL_URL_ROOT."/document.php?modulepart=facture_fournisseur&file=" . str_replace('/', '%2F', $subdir) . '%2F';
+                    break;
+                case "payment_expensereport":
+                    $subdir = dol_sanitizeFileName($objd->refe);
+                    $upload_dir = $conf->expensereport->dir_output . '/' . $subdir;
+                    $link = DOL_URL_ROOT."/document.php?modulepart=expensereport&file=" . str_replace('/', '%2F', $subdir) . '%2F';
+                    break;
+                case "payment_salary":
+                    $subdir = dol_sanitizeFileName($objd->ids);
+                    $upload_dir = $conf->salaries->dir_output . '/' . $subdir;
+                    $link = DOL_URL_ROOT."/document.php?modulepart=salaries&file=" . str_replace('/', '%2F', $subdir) . '%2F';
+                    break;
+                case "payment_donation":
+                    $subdir = get_exdir(null, 2, 0, 1, $objd, 'donation') . '/' . dol_sanitizeFileName($objd->idd);
+                    $upload_dir = $conf->don->dir_output . '/' . $subdir;
+                    $link = DOL_URL_ROOT."/document.php?modulepart=don&file=" . str_replace('/', '%2F', $subdir) . '%2F';
+                    break;
+                default:
+                    break;
             }
             
-            if(!empty($upload_dir)){
-                $files=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$','',SORT_ASC,1);
-                foreach ($files as $key => $file){
-                    $out.= '<br><a href="'.$link.$file['name'].'">'.$file['name'].'</a>';
-                }
-                $_SESSION["releve"][$num][]=$files;
+            if (! empty($upload_dir)) 
+            {
+                $files = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview\.png)$', '', SORT_ASC, 1);
+                $_SESSION["releve"][$numref][] = $files;
             }
-         }
-     } 
-     $db->free($resd);
-       return $out;
+        }
+    }
+
+    $db->free($resd);
+    return $out;
 }
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 099d05cfa84..61d2b5a3b8a 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -37,7 +37,8 @@ class Paiement extends CommonObject
 {
     public $element='payment';
     public $table_element='paiement';
-
+    public $picto = 'payment';
+    
 	var $facid;
 	var $datepaye;
 	/**
@@ -1016,7 +1017,7 @@ class Paiement extends CommonObject
 		global $langs;	// TODO Renvoyer le libelle anglais et faire traduction a affichage
 
 		$langs->load('compta');
-		if ($mode == 0)
+		/*if ($mode == 0)
 		{
 			if ($status == 0) return $langs->trans('ToValidate');
 			if ($status == 1) return $langs->trans('Validated');
@@ -1046,7 +1047,12 @@ class Paiement extends CommonObject
 			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
 			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
 		}
-		return $langs->trans('Unknown');
+		if ($mode == 6)
+	    {
+	        if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+	        if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+	    }*/
+		return '';
 	}
 
 }
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index df83f5b9958..569aa81629e 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -202,11 +202,7 @@ if ($id)
 	}
 }
 
-/* ************************************************************************** */
-/*                                                                            */
-/* create mode                                                                */
-/*                                                                            */
-/* ************************************************************************** */
+// Create
 if ($action == 'create')
 {
 	$year_current = strftime("%Y",dol_now());
@@ -332,19 +328,19 @@ if ($id)
 
 	$head=salaries_prepare_head($object);
 
-	dol_fiche_head($head, 'card', $langs->trans("SalaryPayment"), 0, 'payment');
-
-	print '<table class="border" width="100%">';
+	dol_fiche_head($head, 'card', $langs->trans("SalaryPayment"), -1, 'payment');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 	
-    print "<tr>";
-	print '<td class="titlefield">'.$langs->trans("Ref").'</td><td colspan="3">';
-	print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
-	print '</td></tr>';
+    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '');
+    
+    print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+    print '<table class="border" width="100%">';
 
 	// Employee
-	print '<tr><td>'.$langs->trans("Employee").'</td><td>';
+	print '<tr><td class="titlefield">'.$langs->trans("Employee").'</td><td>';
 	$usersal=new User($db);
 	$usersal->fetch($object->fk_user);
 	print $usersal->getNomUrl(1);
@@ -394,7 +390,9 @@ if ($id)
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
 	print '</table>';
-
+	
+	print '</div>';
+    
 	dol_fiche_end();
 
 	
diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php
index a4bee09d7de..6c151272035 100644
--- a/htdocs/compta/salaries/class/paymentsalary.class.php
+++ b/htdocs/compta/salaries/class/paymentsalary.class.php
@@ -33,20 +33,21 @@ class PaymentSalary extends CommonObject
 {
 	//public $element='payment_salary';			//!< Id that identify managed objects
 	//public $table_element='payment_salary';	//!< Name of table without prefix where object is stored
-
-	var $tms;
-	var $fk_user;
-	var $datep;
-	var $datev;
-	var $amount;
-	var $type_payment;
-	var $num_payment;
-	var $label;
-	var $datesp;
-	var $dateep;
-	var $fk_bank;
-	var $fk_user_author;
-	var $fk_user_modif;
+    public $picto='payment';
+    
+	public $tms;
+	public $fk_user;
+	public $datep;
+	public $datev;
+	public $amount;
+	public $type_payment;
+	public $num_payment;
+	public $label;
+	public $datesp;
+	public $dateep;
+	public $fk_bank;
+	public $fk_user_author;
+	public $fk_user_modif;
 
 
 	/**
@@ -547,4 +548,66 @@ class PaymentSalary extends CommonObject
 		}
 	}
 
+	
+	/**
+	 * Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
+	 *
+	 * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return  string				Libelle
+	 */
+	function getLibStatut($mode=0)
+	{
+	    return $this->LibStatut($this->statut,$mode);
+	}
+	
+	/**
+	 * Renvoi le libelle d'un statut donne
+	 *
+	 * @param   int		$status     Statut
+	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return	string  		    Libelle du statut
+	 */
+	function LibStatut($status,$mode=0)
+	{
+	    global $langs;	// TODO Renvoyer le libelle anglais et faire traduction a affichage
+	
+	    $langs->load('compta');
+	    /*if ($mode == 0)
+	    {
+	        if ($status == 0) return $langs->trans('ToValidate');
+	        if ($status == 1) return $langs->trans('Validated');
+	    }
+	    if ($mode == 1)
+	    {
+	        if ($status == 0) return $langs->trans('ToValidate');
+	        if ($status == 1) return $langs->trans('Validated');
+	    }
+	    if ($mode == 2)
+	    {
+	        if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
+	        if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
+	    }
+	    if ($mode == 3)
+	    {
+	        if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1');
+	        if ($status == 1) return img_picto($langs->trans('Validated'),'statut4');
+	    }
+	    if ($mode == 4)
+	    {
+	        if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
+	        if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
+	    }
+	    if ($mode == 5)
+	    {
+	        if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+	        if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+	    }
+		if ($mode == 6)
+	    {
+	        if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+	        if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+	    }*/
+	    return '';
+	}
+	
 }
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 5d8279b1c54..be87fbc7512 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -36,7 +36,8 @@ class PaiementFourn extends Paiement
 {
     public $element='payment_supplier';
     public $table_element='paiementfourn';
-
+    public $picto = 'payment';
+    
     var $statut;        //Status of payment. 0 = unvalidated; 1 = validated
 	// fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...)
 	// fk_paiement dans llx_paiement_facture est le rowid du paiement
@@ -486,7 +487,7 @@ class PaiementFourn extends Paiement
 		global $langs;
 
 		$langs->load('compta');
-		if ($mode == 0)
+		/*if ($mode == 0)
 		{
 			if ($status == 0) return $langs->trans('ToValidate');
 			if ($status == 1) return $langs->trans('Validated');
@@ -516,7 +517,12 @@ class PaiementFourn extends Paiement
 			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
 			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
 		}
-		return $langs->trans('Unknown');
+		if ($mode == 6)
+		{
+			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+		}*/
+		return '';
 	}
 
 
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 9cb44a92bb8..c8e882e5003 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -179,7 +179,7 @@ $formfile = new FormFile($db);
 
 $head = payment_supplier_prepare_head($object);
 
-dol_fiche_head($head, 'payment', $langs->trans('SupplierPayment'), 0, 'payment');
+dol_fiche_head($head, 'payment', $langs->trans('SupplierPayment'), -1, 'payment');
 
 if ($result > 0)
 {
@@ -201,15 +201,23 @@ if ($result > 0)
 
 	}
 
+	$linkback = '<a href="' . DOL_URL_ROOT . '/fourn/facture/paiement.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	
+	
+	dol_banner_tab($object,'id',$linkback,1,'rowid','ref');
+	
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+	
 	print '<table class="border" width="100%">';
 
-	print '<tr>';
+	/*print '<tr>';
 	print '<td width="20%" colspan="2">'.$langs->trans('Ref').'</td><td colspan="3">';
     print $form->showrefnav($object,'id','',1,'rowid','ref');
-	print '</td></tr>';
+	print '</td></tr>';*/
 
 	// Date payment
-    print '<tr><td colspan="2">'.$form->editfieldkey("Date",'datep',$object->date,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
+    print '<tr><td class="titlefield" colspan="2">'.$form->editfieldkey("Date",'datep',$object->date,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
     print $form->editfieldval("Date",'datep',$object->date,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer,'datepicker','',null,$langs->trans('PaymentDateUpdateSucceeded'));
     print '</td></tr>';
 
@@ -270,6 +278,8 @@ if ($result > 0)
 
 	print '</table>';
 
+	print '</div>';
+	
 	print '<br>';
 
 	/**

From ea44e14b605725457bf6cf5f6293c9acf47184e3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Apr 2017 11:01:12 +0200
Subject: [PATCH 0543/1163] Start debug the variant module

---
 htdocs/compta/index.php                   |  12 +-
 htdocs/core/class/html.formfile.class.php |   2 +
 htdocs/langs/en_US/products.lang          |   3 +
 htdocs/product/card.php                   |   1 +
 htdocs/product/class/product.class.php    |   5 +
 htdocs/product/index.php                  |  16 +--
 htdocs/variants/combinations.php          | 162 ++++++++++++++--------
 htdocs/variants/generator.php             |  46 +++---
 8 files changed, 143 insertions(+), 104 deletions(-)

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index ea8d47b264e..736d5696c3e 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -233,7 +233,6 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 
 	if ( $resql )
 	{
-		$var = false;
 		$num = $db->num_rows($resql);
 
 		print '<table class="noborder" width="100%">';
@@ -248,7 +247,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				print '<tr '.$bc[$var].'><td class="nowrap">';
+				print '<tr class="oddeven"><td class="nowrap">';
 				$facturesupplierstatic->ref=$obj->ref;
 				$facturesupplierstatic->id=$obj->rowid;
                 $facturesupplierstatic->total_ht=$obj->total_ht;
@@ -269,7 +268,6 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 				print '</tr>';
 				$tot_ttc+=$obj->total_ttc;
 				$i++;
-				$var=!$var;
 			}
 
 			print '<tr class="liste_total"><td align="left">'.$langs->trans("Total").'</td>';
@@ -278,7 +276,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 		}
 		else
 		{
-			print '<tr '.$bc[$var].'><td colspan="3" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print "</table><br>";
 		$db->free($resql);
@@ -768,6 +766,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 		$num = $db->num_rows($resql);
 		$i = 0;
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BillsCustomersUnpaid",$num).' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status=1"><span class="badge">'.$num.'</span></a></th>';
 		print '<th align="right">'.$langs->trans("DateDue").'</th>';
@@ -848,7 +847,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 			if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr '.$bc[$var].'><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
-		print '</table><br>';
+		print '</table></div><br>';
 		$db->free($resql);
 	}
 	else
@@ -890,6 +889,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 		$var=false;
 		$num = $db->num_rows($resql);
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BillsSuppliersUnpaid",$num).' <a href="'.DOL_URL_ROOT.'/fourn/facture/impayees.php"><span class="badge">'.$num.'</span></a></th>';
 		print '<th align="right">'.$langs->trans("DateDue").'</th>';
@@ -948,7 +948,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 			if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr '.$bc[$var].'><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
-		print '</table><br>';
+		print '</table></div><br>';
 	}
 	else
 	{
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 1e2dc1c4938..647d0cf6a76 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -593,6 +593,7 @@ class FormFile
             $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             
             $out.= load_fiche_titre($titletoshow, '', '');
+            $out.= '<div class="div-table-responsive-no-min">';
             $out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
 
             $out.= '<tr class="liste_titre">';
@@ -802,6 +803,7 @@ class FormFile
         {
             // Affiche pied du tableau
             $out.= "</table>\n";
+            $out.= "</div>\n";
             if ($genallowed)
             {
                 if (empty($noform)) $out.= '</form>'."\n";
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 046521e398e..ef4c13c89cc 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -287,6 +287,9 @@ HideProductCombinations=Hide products variant in the products selector
 ProductCombination=Variant
 NewProductCombination=New variant
 EditProductCombination=Editing variant
+NewProductCombinations=New variants
+EditProductCombinations=Editing variants
+SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index ac260fc99fb..0c6109ba64a 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -2015,6 +2015,7 @@ if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action =
 /*
  * Documents generes
  */
+
 if ($action != 'edit' && $action != 'delete')
 {
     print '<div class="fichecenter"><div class="fichehalfleft">';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 23be6de5111..5f5b6f6eae9 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3559,6 +3559,11 @@ class Product extends CommonObject
 			if ($status == 0) return ($type==0 ? $langs->trans('ProductStatusNotOnSellShort'):$langs->trans('ProductStatusNotOnBuyShort')).' '.img_picto(($type==0 ? $langs->trans('ProductStatusNotOnSell'):$langs->trans('ProductStatusNotOnBuy')), 'statut5', 'class="pictostatus"');
 			if ($status == 1) return ($type==0 ? $langs->trans('ProductStatusOnSellShort'):$langs->trans('ProductStatusOnBuyShort')).' '.img_picto(($type==0 ? $langs->trans('ProductStatusOnSell'):$langs->trans('ProductStatusOnBuy')),'statut4', 'class="pictostatus"');
 		}
+		if ($mode == 6)
+		{
+			if ($status == 0) return ($type==0 ? $langs->trans('ProductStatusNotOnSellShort'):$langs->trans('ProductStatusNotOnBuyShort')).' '.img_picto(($type==0 ? $langs->trans('ProductStatusNotOnSell'):$langs->trans('ProductStatusNotOnBuy')), 'statut5', 'class="pictostatus"');
+			if ($status == 1) return ($type==0 ? $langs->trans('ProductStatusOnSellShort'):$langs->trans('ProductStatusOnBuyShort')).' '.img_picto(($type==0 ? $langs->trans('ProductStatusOnSell'):$langs->trans('ProductStatusOnBuy')),'statut4', 'class="pictostatus"');
+		}
 		return $langs->trans('Unknown');
 	}
 
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 355e0d2757f..73447e456e6 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -130,26 +130,26 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
 if (! empty($conf->product->enabled))
 {
-	$statProducts = "<tr ".$bc[0].">";
+	$statProducts = '<tr class="oddeven">';
 	$statProducts.= '<td><a href="list.php?type=0&amp;tosell=0&amp;tobuy=0">'.$langs->trans("ProductsNotOnSell").'</a></td><td align="right">'.round($prodser[0][0]).'</td>';
 	$statProducts.= "</tr>";
-	$statProducts.= "<tr ".$bc[1].">";
+	$statProducts.= '<tr class="oddeven">';
 	$statProducts.= '<td><a href="list.php?type=0">'.$langs->trans("ProductsOnSell").'</a></td><td align="right">'.round($prodser[0][1]).'</td>';
 	$statProducts.= "</tr>";
-	$statProducts.= "<tr ".$bc[0].">";
+	$statProducts.= '<tr class="oddeven">';
 	$statProducts.= '<td><a href="list.php?type=0&amp;tosell=1&amp;tobuy=1">'.$langs->trans("ProductsOnSellAndOnBuy").'</a></td><td align="right">'.round($prodser[0][2]).'</td>';
 	$statProducts.= "</tr>";
 
 }
 if (! empty($conf->service->enabled))
 {
-	$statServices = "<tr ".$bc[1].">";
+	$statServices = '<tr class="oddeven">';
 	$statServices.= '<td><a href="list.php?type=1&amp;tosell=0&amp;tobuy=0">'.$langs->trans("ServicesNotOnSell").'</a></td><td align="right">'.round($prodser[1][0]).'</td>';
 	$statServices.= "</tr>";
-	$statServices.= "<tr ".$bc[0].">";
+	$statServices.= '<tr class="oddeven">';
 	$statServices.= '<td><a href="list.php?type=1">'.$langs->trans("ServicesOnSell").'</a></td><td align="right">'.round($prodser[1][1]).'</td>';
 	$statServices.= "</tr>";
-	$statServices.= "<tr ".$bc[1].">";
+	$statServices.= '<tr class="oddeven">';
 	$statServices.= '<td><a href="list.php?type=1&amp;tosell=1&amp;tobuy=1">'.$langs->trans("ServicesOnSellAndOnBuy").'</a></td><td align="right">'.round($prodser[1][2]).'</td>';
 	$statServices.= "</tr>";
 
@@ -325,10 +325,10 @@ if ($result)
     			print '</td>';
 			}
 			print '<td align="right" class="nowrap">';
-			print $product_static->LibStatut($objp->tosell,5,0);
+			print $product_static->LibStatut($objp->tosell,3,0);
 			print "</td>";
             print '<td align="right" class="nowrap">';
-            print $product_static->LibStatut($objp->tobuy,5,1);
+            print $product_static->LibStatut($objp->tobuy,3,1);
             print "</td>";
 			print "</tr>\n";
 			$i++;
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index dabace75ac0..cfbec4a8016 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -36,6 +36,7 @@ $price_impact = (float) GETPOST('price_impact');
 $price_impact_percent = (bool) GETPOST('price_impact_percent');
 $form = new Form($db);
 $action = GETPOST('action');
+$cancel = GETPOST('cancel');
 
 // Security check
 $fieldvalue = (! empty($id) ? $id : $ref);
@@ -57,6 +58,10 @@ if ($id > 0 || $ref)
  * Actions
  */
 
+if ($cancel) {
+    $action='';
+}
+    
 if (! $object->isProduct()) {
 	header('Location: '.dol_buildpath('/product/card.php?id='.$object->id, 2));
 	exit();
@@ -107,7 +112,7 @@ if ($_POST) {
 			$db->begin();
 
 			if (!$prodcomb->fetchByProductCombination2ValuePairs($id, $sanit_features)) {
-				if (ProductCombination::createProductCombination($product, $sanit_features, array(), $price_impact_percent, $price_impact, $weight_impact)) {
+				if (ProductCombination::createProductCombination($object, $sanit_features, array(), $price_impact_percent, $price_impact, $weight_impact)) {
 					$db->commit();
 					setEventMessage($langs->trans('RecordSaved'));
 					header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2));
@@ -175,7 +180,7 @@ if ($_POST) {
 			setEventMessage($langs->trans('RecordSaved'));
 		}
 
-	} else {
+	} elseif ($valueid > 0) {
 
 		if ($prodcomb->fetch($valueid) < 0) {
 			dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
@@ -256,6 +261,9 @@ if ($action === 'confirm_deletecombination') {
  *	View
  */
 
+$form = new Form($db);
+
+
 if (! empty($id) || ! empty($ref)) {
 
 	llxHeader("", "", $langs->trans("CardProduct".$object->type));
@@ -342,6 +350,7 @@ if (! empty($id) || ! empty($ref)) {
 				var select = jQuery("select#features");
 
 				select.empty();
+
 				jQuery("form#combinationform input[type=hidden]").detach();
 
 				jQuery.each(variants_selected.index, function (key, val) {
@@ -359,11 +368,12 @@ if (! empty($id) || ! empty($ref)) {
 
 			jQuery(document).ready(function() {
 				jQuery("select#attribute").change(function () {
-					console.log("Change of field attribute");
+					console.log("Change of field variant attribute");
 					var select = jQuery("select#value");
 
 					if (!jQuery(this).val().length || jQuery(this).val() == '-1') {
 						select.empty();
+						select.append('<option value="-1">&nbsp;</option>');
 						return;
 					}
 
@@ -373,22 +383,27 @@ if (! empty($id) || ! empty($ref)) {
 						id: jQuery(this).val()
 					}, function(data) {
 						if (data.error) {
-							jQuery("select#value").empty();
+							select.empty();
+							select.append('<option value="-1">&nbsp;</option>');
 							return alert(data.error);
 						}
 
 						select.empty();
-						/* console.log(data.length); */
+						select.append('<option value="-1">&nbsp;</option>');
 
 						jQuery(data).each(function (key, val) {
 							keyforoption = val.id
 							valforoption = val.value
-							jQuery("select#value").append('<option value="' + keyforoption + '">' + valforoption + '</option>');
+							select.append('<option value="' + keyforoption + '">' + valforoption + '</option>');
 						});
 					});
 				});
 
+				/* Click on button Add combination
+				@FIXME Not compatible with all browsers.
+				 */
 				jQuery("#addfeature").click(function () {
+					console.log("Click on add");
 					var selectedattr = jQuery("select[name=attribute] option:selected");
 					var selectedvalu = jQuery("select[name=value] option:selected");
 
@@ -438,54 +453,69 @@ if (! empty($id) || ! empty($ref)) {
 		<?php 
 		}
 		
-        print '<form method="post" id="combinationform">';		
+		print '<form method="post" id="combinationform">';
+		print '<input type="hidden" name="id" value="'.dol_escape_htmltag($id).'">';
+		
 		print dol_fiche_head();
 		
 		?>
 		
 		<table class="border" style="width: 100%">
 			<?php if ($action == 'add') { ?>
+			<!--  Variant -->
 			<tr>
 				<td class="titlefieldcreate fieldrequired"><label for="attribute"><?php echo $langs->trans('ProductAttribute') ?></label></td>
-				<td colspan="2"><select class="flat minwidth100" id="attribute" name="attribute">
+				<td><select class="flat minwidth100" id="attribute" name="attribute">
 					<option value="-1">&nbsp;</option>
 					<?php foreach ($prodattr_all as $attr): ?>
 					<option value="<?php echo $attr->id ?>"><?php echo $attr->label ?></option>
 					<?php endforeach ?>
 				</select></td>
 			</tr>
+			<!-- Value -->
 			<tr>
 				<td class="fieldrequired"><label for="value"><?php echo $langs->trans('Value') ?></label></td>
-				<td colspan="2">
+				<td>
 					<select class="flat minwidth100" id="value" name="value">
 						<option value="-1">&nbsp;</option>
 					</select>
 				</td>
 			</tr>
-			<?php } ?>
 			<tr>
-				<td class="titlefieldcreate fieldrequired"><label for="features"><?php echo $langs->trans('Features') ?></label></td>
-				<td><select multiple style="width: 100%" id="features">
+				<td></td><td>
+					<a href="#" class="button" id="addfeature"><?php echo $langs->trans("SelectCombination"); ?></a>
+				</td>
+			</tr>
+		</table>
+		<hr>
+			<?php } 
+			?>
+		<table class="border" style="width: 100%">
+			<tr>
+				<td class="titlefieldcreate fieldrequired tdtop"><label for="features"><?php echo $langs->trans('Variant') ?></label></td>
+				<td class="valignmiddle">
+					<div class="inline-block valignmiddle quatrevingtpercent">
+					<select multiple class="centpercent" id="features">
 						<?php
 						foreach ($productCombination2ValuePairs1 as $pc2v): ?>
 							<option value="<?php echo $pc2v->fk_prod_attr ?>:<?php echo $pc2v->fk_prod_attr_val ?>"><?php echo dol_htmlentities($pc2v) ?></option>
 						<?php endforeach ?>
-					</select></td>
+					</select></div>
+					<div class="inline-block valignmiddle">
+					<a href="#" class="inline-block valignmiddle button" id="delfeature"><?php echo img_edit_remove() ?></a>
+					</div>
+				</td>
 				<td>
-					<?php if ($action == 'add'): ?>
-					<a href="#" class="button" id="addfeature"><?php echo img_edit_add() ?></a><br><br>
-					<a href="#" class="button" id="delfeature"><?php echo img_edit_remove() ?></a>
-					<?php endif; ?>
 				</td>
 			</tr>
 			<tr>
 				<td><label for="price_impact"><?php echo $langs->trans('PriceImpact') ?></label></td>
-				<td colspan="2"><input type="text" id="price_impact" name="price_impact" value="<?php echo price($price_impact) ?>">
+				<td><input type="text" id="price_impact" name="price_impact" value="<?php echo price($price_impact) ?>">
 				<input type="checkbox" id="price_impact_percent" name="price_impact_percent" <?php echo $price_impact_percent ? ' checked' : '' ?>> <label for="price_impact_percent"><?php echo $langs->trans('PercentageVariation') ?></label></td>
 			</tr>
 			<tr>
 				<td><label for="weight_impact"><?php echo $langs->trans('WeightImpact') ?></label></td>
-				<td colspan="2"><input type="text" id="weight_impact" name="weight_impact" value="<?php echo price($weight_impact) ?>"></td>
+				<td><input type="text" id="weight_impact" name="weight_impact" value="<?php echo price($weight_impact) ?>"></td>
 			</tr>
 		</table>
 
@@ -494,8 +524,10 @@ if (! empty($id) || ! empty($ref)) {
         ?>
 
 		<div style="text-align: center">
-		
-		<input type="submit" value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans('Save') ?>" class="button"></div>
+		<input type="submit" value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans('Save') ?>" class="button">
+		&nbsp;
+		<input type="submit" name="cancel" value="<?php echo $langs->trans('Cancel'); ?>" class="button">
+		</div>
 		
 		<?php foreach ($productCombination2ValuePairs1 as $pc2v): ?>
 				<input type="hidden" name="features[]" value="<?php echo $pc2v->fk_prod_attr.':'.$pc2v->fk_prod_attr_val ?>">
@@ -509,7 +541,6 @@ if (! empty($id) || ! empty($ref)) {
 		if ($action === 'delete') {
 
 			if ($prodcomb->fetch($valueid) > 0) {
-				$form = new Form($db);
 				$prodstatic->fetch($prodcomb->fk_product_child);
 
 				print $form->formconfirm(
@@ -524,8 +555,6 @@ if (! empty($id) || ! empty($ref)) {
 			}
 		} elseif ($action === 'copy') {
 
-			$form = new Form($db);
-
 			print $form->formconfirm(
 				'combinations.php?id='.$id,
 				$langs->trans('CloneCombinationsProduct'),
@@ -570,50 +599,64 @@ if (! empty($id) || ! empty($ref)) {
 				});
 			</script>
 
-		<form method="post">
-		<label for="bulk_action"><?php echo $langs->trans('BulkActions') ?></label>
-		<select id="bulk_action" name="bulk_action" class="flat">
-			<option value="not_buy"><?php echo $langs->trans('ProductStatusNotOnBuy') ?></option>
-			<option value="not_sell"><?php echo $langs->trans('ProductStatusNotOnSell') ?></option>
-			<option value="on_buy"><?php echo $langs->trans('ProductStatusOnBuy') ?></option>
-			<option value="on_sell"><?php echo $langs->trans('ProductStatusOnSell') ?></option>
-			<option value="delete"><?php echo $langs->trans('Delete') ?></option>
-		</select>
-		<input type="hidden" name="action" value="bulk_actions">
-		<input type="submit" value="<?php echo $langs->trans("Apply") ?>" class="button">
-		<br>
-		<br>
 		<?php } 
 		
-
+        // Buttons
 		print '<div class="tabsAction">';
+		
 		print '	<div class="inline-block divButAction">';
 		if ($productCombinations) {
 		    print '<a href="combinations.php?id='.$id.'&action=copy" class="butAction">'.$langs->trans('Copy').'</a>';
 		}
+		
 		print '<a href="combinations.php?id='.$id.'&action=add" class="butAction">'.$langs->trans('NewProductCombination').'</a>';
-		print '<a href="generator.php?id='.$id.'" class="butAction">'.$langs->trans('ProductCombinationGenerator').'</a>';
+		
+		if (empty($conf->dol_optimize_smallscreen) && $conf->use_javascript_ajax)     // Bugged page. Too much useless javascript.
+		{
+		  print '<a href="generator.php?id='.$id.'" class="butAction">'.$langs->trans('ProductCombinationGenerator').'</a>';
+		}
+		
 		print '	</div>';
+		
 		print '</div>';
 		
+		print '<form method="post">';
 		
+		$aaa='';
+		if (count($productCombinations))
+		{
+    		$aaa = '<label for="bulk_action">'.$langs->trans('BulkActions').'</label>';
+    		$aaa .= '<select id="bulk_action" name="bulk_action" class="flat">';
+    		$aaa .= '	<option value="not_buy">'.$langs->trans('ProductStatusNotOnBuy').'</option>';
+    		$aaa .= '	<option value="not_sell">'.$langs->trans('ProductStatusNotOnSell').'</option>';
+    		$aaa .= '	<option value="on_buy">'.$langs->trans('ProductStatusOnBuy').'</option>';
+    		$aaa .= '	<option value="on_sell">'.$langs->trans('ProductStatusOnSell').'</option>';
+    		$aaa .= '	<option value="delete">'.$langs->trans('Delete').'</option>';
+    		$aaa .= '</select>';
+    		$aaa .= '<input type="hidden" name="action" value="bulk_actions">';
+    		$aaa .= '<input type="submit" value="'.dol_escape_htmltag($langs->trans("Apply")).'" class="button">';
+		}
 		
+		$title = $langs->trans("ProductCombinations");
+		
+		print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $aaa, 0);
+		
+		print '<div class="div-table-responsive">';
 		?>
-
 		<table class="liste">
 			<tr class="liste_titre">
-				<th class="liste_titre">
+				<th class="liste_titre"><?php echo $langs->trans('Product') ?></th>
+				<th class="liste_titre"><?php echo $langs->trans('Combination') ?></th>
+				<th class="liste_titre right"><?php echo $langs->trans('PriceImpact') ?></th>
+				<th class="liste_titre right"><?php echo $langs->trans('WeightImpact') ?></th>
+				<th class="liste_titre center"><?php echo $langs->trans('OnSell') ?></th>
+				<th class="liste_titre center"><?php echo $langs->trans('OnBuy') ?></th>
+				<th class="liste_titre"></th>
+				<th class="liste_titre center">
 					<?php if ($productCombinations): ?>
 					<input type="checkbox" name="select_all">
 					<?php endif ?>
 				</th>
-				<th class="liste_titre"><?php echo $langs->trans('Product') ?></th>
-				<th class="liste_titre"><?php echo $langs->trans('Combination') ?></th>
-				<th class="liste_titre" style="text-align: center"><?php echo $langs->trans('PriceImpact') ?></th>
-				<th class="liste_titre" style="text-align: center"><?php echo $langs->trans('WeightImpact') ?></th>
-				<th class="liste_titre" style="text-align: center;"><?php echo $langs->trans('OnSell') ?></th>
-				<th class="liste_titre" style="text-align: center;"><?php echo $langs->trans('OnBuy') ?></th>
-				<th class="liste_titre"></th>
 			</tr>
 			<?php
 			
@@ -622,8 +665,7 @@ if (! empty($id) || ! empty($ref)) {
     			foreach ($productCombinations as $currcomb) {
     				$prodstatic->fetch($currcomb->fk_product_child); 
     				?>
-    				<tr <?php echo $bc[!$var] ?>>
-    				<td><input type="checkbox" name="select[<?php echo $prodstatic->id ?>]"></td>
+    				<tr class="oddeven">
     				<td><?php echo $prodstatic->getNomUrl(1) ?></td>
     				<td>
     					<?php
@@ -639,17 +681,17 @@ if (! empty($id) || ! empty($ref)) {
     						}
     					} ?>
     				</td>
-    				<td style="text-align: right"><?php echo ($currcomb->variation_price >= 0 ? '+' : '').price($currcomb->variation_price).($currcomb->variation_price_percentage ? ' %' : '') ?></td>
-    				<td style="text-align: right"><?php echo ($currcomb->variation_weight >= 0 ? '+' : '').price($currcomb->variation_weight).' '.measuring_units_string($prodstatic->weight_units, 'weight') ?></td>
+    				<td class="right"><?php echo ($currcomb->variation_price >= 0 ? '+' : '').price($currcomb->variation_price).($currcomb->variation_price_percentage ? ' %' : '') ?></td>
+    				<td class="right"><?php echo ($currcomb->variation_weight >= 0 ? '+' : '').price($currcomb->variation_weight).' '.measuring_units_string($prodstatic->weight_units, 'weight') ?></td>
     				<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 0) ?></td>
     				<td style="text-align: center;"><?php echo $prodstatic->getLibStatut(2, 1) ?></td>
-    				<td style="text-align: right">
-    					<a href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=edit&valueid='.$currcomb->id, 2) ?>"><?php echo img_edit() ?></a>
-    					<a href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=delete&valueid='.$currcomb->id, 2) ?>"><?php echo img_delete() ?></a>
+    				<td class="right">
+    					<a class="paddingleft paddingright" href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=edit&valueid='.$currcomb->id, 2) ?>"><?php echo img_edit() ?></a>
+    					<a class="paddingleft paddingright" href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=delete&valueid='.$currcomb->id, 2) ?>"><?php echo img_delete() ?></a>
     				</td>
+    				<td class="center"><input type="checkbox" name="select[<?php echo $prodstatic->id ?>]"></td>
     			</tr>
     			<?php
-    			$var = !$var; 
 			    }
 			}
 			else
@@ -659,12 +701,12 @@ if (! empty($id) || ! empty($ref)) {
 			?>
 		</table>
 
-		<?php if ($productCombinations): ?>
-		</form>
-		<?php endif ?>
-
 		<?php
+		print '</div>';
+		print '</form>';
 	}
 }
 
 llxFooter();
+
+$db->close();
diff --git a/htdocs/variants/generator.php b/htdocs/variants/generator.php
index b709f240551..7b0358fd176 100644
--- a/htdocs/variants/generator.php
+++ b/htdocs/variants/generator.php
@@ -130,6 +130,8 @@ if ($_POST) {
 	}
 }
 
+
+
 /*
  *	View
  */
@@ -140,37 +142,21 @@ if (! empty($id) || ! empty($ref)) {
 
 	llxHeader("", "", $langs->trans("CardProduct".$object->type));
 
-	if ($result) {
-		$head = product_prepare_head($object);
-		$titre = $langs->trans("CardProduct".$object->type);
-		$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
-
+	if ($result > 0)
+	{
+		$showbarcode=empty($conf->barcode->enabled)?0:1;
+		if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+		 
+		$head=product_prepare_head($object);
+		$titre=$langs->trans("CardProduct".$object->type);
+		$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
 		dol_fiche_head($head, 'combinations', $titre, 0, $picto);
-
-		print '<table class="border" width="100%">';
-
-		// Reference
-		print '<tr>';
-		print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
-		print $form->showrefnav($object, 'id', '', 0);
-		print '</td>';
-		print '</tr>';
-
-		// Label
-		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
-
-		// Status (to sell)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
-		print $object->getLibStatut(2, 0);
-		print '</td></tr>';
-
-		// Status (to buy)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td>';
-		print $object->getLibStatut(2, 1);
-		print '</td></tr>';
-
-		print '</table>';
-
+		 
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
+		$object->next_prev_filter=" fk_product_type = ".$object->type;
+		 
+		dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1);
+		
 		dol_fiche_end();
 	}
 

From aa47575b13f64e2b062a796168be7feb2fd8252c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Apr 2017 12:22:59 +0200
Subject: [PATCH 0544/1163] Serious debug of variant module. No more fu.. js
 errors on smarpthone.

---
 htdocs/langs/en_US/products.lang |   3 +-
 htdocs/variants/combinations.php | 282 +++++++++++++++----------------
 2 files changed, 140 insertions(+), 145 deletions(-)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index ef4c13c89cc..72ec89c55d3 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -283,6 +283,7 @@ ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s"
 ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
 ProductCombinations=Variants
+PropagateVariant=Propagate variants
 HideProductCombinations=Hide products variant in the products selector
 ProductCombination=Variant
 NewProductCombination=New variant
@@ -307,7 +308,7 @@ NbOfDifferentValues=Nb of different values
 NbProducts=Nb. of products
 ParentProduct=Parent product
 HideChildProducts=Hide variant products
-ConfirmCloneProductCombinations=Would you like to copy all the product variant to the product with the given reference?
+ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
 CloneDestinationReference=Destination product reference
 ErrorCopyProductCombinations=There was an error while copying the product variants
 ErrorDestinationProductNotFound=Destination product not found
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index cfbec4a8016..4342b352478 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -1,6 +1,6 @@
 <?php
-
-/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+/* Copyright (C) 2016	Marcos García	      <marcosgdf@gmail.com>
+ * Copyright (C) 2017	Laurent Destailleur   <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,12 @@ $weight_impact = (float) GETPOST('weight_impact');
 $price_impact = (float) GETPOST('price_impact');
 $price_impact_percent = (bool) GETPOST('price_impact_percent');
 $form = new Form($db);
-$action = GETPOST('action');
+
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
 $cancel = GETPOST('cancel');
 
 // Security check
@@ -53,6 +58,8 @@ if ($id > 0 || $ref)
     $object->fetch($id, $ref);
 }
 
+$selectedvariant = $_SESSION['addvariant_'.$object->id];
+
 
 /*
  * Actions
@@ -60,13 +67,25 @@ if ($id > 0 || $ref)
 
 if ($cancel) {
     $action='';
+    $massactions='';
+    unset($_SESSION['addvariant_'.$object->id]);
 }
-    
+
 if (! $object->isProduct()) {
 	header('Location: '.dol_buildpath('/product/card.php?id='.$object->id, 2));
 	exit();
 }
 
+if (GETPOST('selectvariant'))
+{
+    $action = 'add';
+    if (GETPOST('attribute') != '-1' && GETPOST('value') != '-1')
+    {
+        $selectedvariant[GETPOST('attribute').':'.GETPOST('value')]=GETPOST('attribute').':'.GETPOST('value');
+        $_SESSION['addvariant_'.$object->id]=$selectedvariant;
+    }
+}
+
 
 $prodcomb = new ProductCombination($db);
 $prodcomb2val = new ProductCombination2ValuePair($db);
@@ -75,13 +94,16 @@ $productCombination2ValuePairs1 = array();
 
 if ($_POST) {
 
-	if ($action == 'add') {
+	if (($action == 'add' || $action == 'create') && empty($massaction) && ! GETPOST('selectvariant')) {
 
-		$features = GETPOST('features', 'array');
+		//$features = GETPOST('features', 'array');
+        $features = $_SESSION['addvariant_'.$object->id];
 
 		if (!$features) {
 			setEventMessage($langs->trans('ErrorFieldsRequired'), 'errors');
-		} else {
+		} 
+		else 
+		{
 			$weight_impact = price2num($weight_impact);
 			$price_impact = price2num($price_impact);
 			$sanit_features = array();
@@ -115,6 +137,7 @@ if ($_POST) {
 				if (ProductCombination::createProductCombination($object, $sanit_features, array(), $price_impact_percent, $price_impact, $weight_impact)) {
 					$db->commit();
 					setEventMessage($langs->trans('RecordSaved'));
+					unset($_SESSION['addvariant_'.$object->id]);
 					header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2));
 					exit();
 				} else {
@@ -126,17 +149,17 @@ if ($_POST) {
 
 			$db->rollback();
 		}
-	} elseif ($action == 'bulk_actions') {
-
-		$prodarray = array_keys(GETPOST('select', 'array'));
-		$bulkaction = GETPOST('bulk_action');
+	} 
+	elseif (! empty($massaction)) 
+	{
+		$bulkaction = $massaction;
 		$error = 0;
 
 		$prodstatic = new Product($db);
 
 		$db->begin();
 
-		foreach ($prodarray as $prodid) {
+		foreach ($toselect as $prodid) {
 
 			if ($prodstatic->fetch($prodid) < 0) {
 				continue;
@@ -180,7 +203,8 @@ if ($_POST) {
 			setEventMessage($langs->trans('RecordSaved'));
 		}
 
-	} elseif ($valueid > 0) {
+	} 
+	elseif ($valueid > 0) {
 
 		if ($prodcomb->fetch($valueid) < 0) {
 			dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
@@ -201,6 +225,7 @@ if ($_POST) {
 	}
 }
 
+// Reload variants
 $productCombinations = $prodcomb->fetchAllByFkProductParent($object->id);
 
 if ($action === 'confirm_deletecombination') {
@@ -263,29 +288,26 @@ if ($action === 'confirm_deletecombination') {
 
 $form = new Form($db);
 
-
-if (! empty($id) || ! empty($ref)) {
-
+if (! empty($id) || ! empty($ref)) 
+{
 	llxHeader("", "", $langs->trans("CardProduct".$object->type));
 
-	if ($result) 
-	{
-	    $showbarcode=empty($conf->barcode->enabled)?0:1;
-	    if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
-	    
-	    $head=product_prepare_head($object);
-	    $titre=$langs->trans("CardProduct".$object->type);
-	    $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-	    dol_fiche_head($head, 'combinations', $titre, 0, $picto);
-	    
-	    $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
-	    $object->next_prev_filter=" fk_product_type = ".$object->type;
-	    
-	    dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1);
-	     
-		dol_fiche_end();
-	}
+    $showbarcode=empty($conf->barcode->enabled)?0:1;
+    if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+    
+    $head=product_prepare_head($object);
+    $titre=$langs->trans("CardProduct".$object->type);
+    $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
+    dol_fiche_head($head, 'combinations', $titre, 0, $picto);
+    
+    $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
+    $object->next_prev_filter=" fk_product_type = ".$object->type;
+    
+    dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1);
+     
+	dol_fiche_end();
 
+	
 	// Create or edit a varian
 	if ($action == 'add' || ($action == 'edit')) {
 
@@ -295,6 +317,7 @@ if (! empty($id) || ! empty($ref)) {
 			$title = $langs->trans('EditProductCombination');
 		}
 
+		print '<div id="parttoaddvariant"></div>';
 		print_fiche_titre($title);
 
 		if ($action == 'add') {
@@ -312,7 +335,7 @@ if (! empty($id) || ! empty($ref)) {
 
 		?>
 
-		<script>
+		<script type="text/javascript">
 
 			variants_available = <?php echo json_encode($prodattr_alljson) ?>;
 			variants_selected = {
@@ -346,26 +369,7 @@ if (! empty($id) || ! empty($ref)) {
 				});
 			};
 
-			paintAttributes = function() {
-				var select = jQuery("select#features");
-
-				select.empty();
-
-				jQuery("form#combinationform input[type=hidden]").detach();
-
-				jQuery.each(variants_selected.index, function (key, val) {
-					var attr_info = variants_selected.info[val];
-
-					var opt_key = val + ':' + attr_info.value.id;
-					var opt_label = attr_info.attribute.label + ': ' + attr_info.value.label;
-
-					//Add combination to the list
-					select.append('<option value="' + opt_key + '">' + opt_label + '</option>');
-					//Add hidden input to catch the new combination
-					jQuery("form#combinationform").append('<input type="hidden" name="features[]" value="' + opt_key + '">');
-				});
-			};
-
+			
 			jQuery(document).ready(function() {
 				jQuery("select#attribute").change(function () {
 					console.log("Change of field variant attribute");
@@ -398,63 +402,15 @@ if (! empty($id) || ! empty($ref)) {
 						});
 					});
 				});
-
-				/* Click on button Add combination
-				@FIXME Not compatible with all browsers.
-				 */
-				jQuery("#addfeature").click(function () {
-					console.log("Click on add");
-					var selectedattr = jQuery("select[name=attribute] option:selected");
-					var selectedvalu = jQuery("select[name=value] option:selected");
-
-					if (!selectedattr.val().length || !selectedvalu.val().length) {
-						return;
-					}
-
-					var selectedattr_val = parseInt(selectedattr.val());
-
-					if (jQuery.inArray(selectedattr_val, variants_selected.index) != -1) {
-						return;
-					}
-
-					variants_selected.index.push(selectedattr_val);
-					variants_selected.info[selectedattr_val] = {
-						attribute: variants_available[selectedattr_val],
-						value: {
-							id: selectedvalu.val(),
-							label: selectedvalu.html()
-						}
-					};
-
-					paintAttributes();
-
-					selectedattr.detach();
-					jQuery("select[name=value] option").detach();
-				});
-
-				jQuery("#delfeature").click(function() {
-					jQuery("#features option:selected").each(function (key, val) {
-						var explode = jQuery(val).val().split(':');
-						var indexOf = variants_selected.index.indexOf(parseInt(explode[0]));
-
-						if (indexOf != -1) {
-							variants_selected.index.splice(indexOf, 1);
-							jQuery(variants_selected.info[parseInt(explode[0])]).detach();
-						}
-
-						jQuery(val).detach();
-					});
-
-					restoreAttributes();
-					paintAttributes();
-				});
 			});
 		</script>
+		
 		<?php 
 		}
 		
-		print '<form method="post" id="combinationform">';
-		print '<input type="hidden" name="id" value="'.dol_escape_htmltag($id).'">';
+		print '<form method="post" id="combinationform" action="'.$_SERVER["PHP_SELF"].'#parttoaddvariant">'."\n";
+		print '<input type="hidden" name="id" value="'.dol_escape_htmltag($id).'">'."\n";
+		print '<input type="hidden" name="action" value="add">'."\n";
 		
 		print dol_fiche_head();
 		
@@ -483,7 +439,8 @@ if (! empty($id) || ! empty($ref)) {
 			</tr>
 			<tr>
 				<td></td><td>
-					<a href="#" class="button" id="addfeature"><?php echo $langs->trans("SelectCombination"); ?></a>
+					<input type="submit" class="button" name="selectvariant" id="selectvariant" value="<?php echo dol_escape_htmltag($langs->trans("SelectCombination")); ?>">
+					<!-- <a href="#" class="button" id="addfeature"><?php echo $langs->trans("SelectCombination"); ?></a> -->
 				</td>
 			</tr>
 		</table>
@@ -493,17 +450,27 @@ if (! empty($id) || ! empty($ref)) {
 		<table class="border" style="width: 100%">
 			<tr>
 				<td class="titlefieldcreate fieldrequired tdtop"><label for="features"><?php echo $langs->trans('Variant') ?></label></td>
-				<td class="valignmiddle">
+				<td class="tdtop">
 					<div class="inline-block valignmiddle quatrevingtpercent">
-					<select multiple class="centpercent" id="features">
-						<?php
-						foreach ($productCombination2ValuePairs1 as $pc2v): ?>
-							<option value="<?php echo $pc2v->fk_prod_attr ?>:<?php echo $pc2v->fk_prod_attr_val ?>"><?php echo dol_htmlentities($pc2v) ?></option>
-						<?php endforeach ?>
-					</select></div>
-					<div class="inline-block valignmiddle">
-					<a href="#" class="inline-block valignmiddle button" id="delfeature"><?php echo img_edit_remove() ?></a>
+					<?php
+					if (is_array($selectedvariant))
+					{
+    					foreach ($selectedvariant as $key => $val) {
+    				        $tmp = explode(':',$val);
+    				        $result1 = $prodattr->fetch($tmp[0]);
+    				        $result2 = $prodattr_val->fetch($tmp[1]);
+    				        if ($result1 > 0 && $result2 > 0)
+    				        {
+    					       print $prodattr->label . ' - '.$prodattr_val->value.'<br>';
+    					       // TODO Add delete link
+    				        }
+    					}
+					}
+					?>
 					</div>
+					<!-- <div class="inline-block valignmiddle">
+					<a href="#" class="inline-block valignmiddle button" id="delfeature"><?php echo img_edit_remove() ?></a>
+					</div>-->
 				</td>
 				<td>
 				</td>
@@ -524,15 +491,12 @@ if (! empty($id) || ! empty($ref)) {
         ?>
 
 		<div style="text-align: center">
-		<input type="submit" value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans('Save') ?>" class="button">
+		<input type="submit" name="create" <?php if (! is_array($selectedvariant)) print ' disabled="disabled"'; ?> value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans('Save') ?>" class="button">
 		&nbsp;
 		<input type="submit" name="cancel" value="<?php echo $langs->trans('Cancel'); ?>" class="button">
 		</div>
 		
-		<?php foreach ($productCombination2ValuePairs1 as $pc2v): ?>
-				<input type="hidden" name="features[]" value="<?php echo $pc2v->fk_prod_attr.':'.$pc2v->fk_prod_attr_val ?>">
-		<?php endforeach; ?>
-<?php
+		<?php
 
         print '</form>';
 	}
@@ -606,36 +570,56 @@ if (! empty($id) || ! empty($ref)) {
 		
 		print '	<div class="inline-block divButAction">';
 		if ($productCombinations) {
-		    print '<a href="combinations.php?id='.$id.'&action=copy" class="butAction">'.$langs->trans('Copy').'</a>';
+		    print '<a href="combinations.php?id='.$object->id.'&action=copy" class="butAction">'.$langs->trans('PropagateVariant').'</a>';
 		}
 		
-		print '<a href="combinations.php?id='.$id.'&action=add" class="butAction">'.$langs->trans('NewProductCombination').'</a>';
+		print '<a href="combinations.php?id='.$object->id.'&action=add#parttoaddvariant" class="butAction">'.$langs->trans('NewProductCombination').'</a>'; // NewVariant
 		
-		if (empty($conf->dol_optimize_smallscreen) && $conf->use_javascript_ajax)     // Bugged page. Too much useless javascript.
-		{
-		  print '<a href="generator.php?id='.$id.'" class="butAction">'.$langs->trans('ProductCombinationGenerator').'</a>';
-		}
+		// Too much bugged page.
+		/*
+		print '<a href="generator.php?id='.$object->id.'" class="butAction">'.$langs->trans('ProductCombinationGenerator').'</a>';
+		*/
 		
 		print '	</div>';
 		
 		print '</div>';
 		
-		print '<form method="post">';
+		
+		
+		$arrayofselected=is_array($toselect)?$toselect:array();
+		
+		
+		// List of variants
+		print '<form method="POST" action="#parttoaddvariant">';
+		
+		
+		// List of mass actions available
+		/*
+		$arrayofmassactions =  array(
+		    'presend'=>$langs->trans("SendByMail"),
+		    'builddoc'=>$langs->trans("PDFMerge"),
+		);
+		if ($user->rights->product->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+		if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+		$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+		*/
 		
 		$aaa='';
 		if (count($productCombinations))
 		{
-    		$aaa = '<label for="bulk_action">'.$langs->trans('BulkActions').'</label>';
-    		$aaa .= '<select id="bulk_action" name="bulk_action" class="flat">';
+    		$aaa = '<label for="massaction">'.$langs->trans('BulkActions').'</label>';
+    		$aaa .= '<select id="bulk_action" name="massaction" class="flat">';
+    		$aaa .= '	<option value="nothing">&nbsp;</option>';
     		$aaa .= '	<option value="not_buy">'.$langs->trans('ProductStatusNotOnBuy').'</option>';
     		$aaa .= '	<option value="not_sell">'.$langs->trans('ProductStatusNotOnSell').'</option>';
     		$aaa .= '	<option value="on_buy">'.$langs->trans('ProductStatusOnBuy').'</option>';
     		$aaa .= '	<option value="on_sell">'.$langs->trans('ProductStatusOnSell').'</option>';
     		$aaa .= '	<option value="delete">'.$langs->trans('Delete').'</option>';
     		$aaa .= '</select>';
-    		$aaa .= '<input type="hidden" name="action" value="bulk_actions">';
+    		$aaa .= '<input type="hidden" name="action" value="massaction">';
     		$aaa .= '<input type="submit" value="'.dol_escape_htmltag($langs->trans("Apply")).'" class="button">';
 		}
+		$massactionbutton = $aaa;
 		
 		$title = $langs->trans("ProductCombinations");
 		
@@ -645,18 +629,19 @@ if (! empty($id) || ! empty($ref)) {
 		?>
 		<table class="liste">
 			<tr class="liste_titre">
-				<th class="liste_titre"><?php echo $langs->trans('Product') ?></th>
-				<th class="liste_titre"><?php echo $langs->trans('Combination') ?></th>
-				<th class="liste_titre right"><?php echo $langs->trans('PriceImpact') ?></th>
-				<th class="liste_titre right"><?php echo $langs->trans('WeightImpact') ?></th>
-				<th class="liste_titre center"><?php echo $langs->trans('OnSell') ?></th>
-				<th class="liste_titre center"><?php echo $langs->trans('OnBuy') ?></th>
-				<th class="liste_titre"></th>
-				<th class="liste_titre center">
-					<?php if ($productCombinations): ?>
-					<input type="checkbox" name="select_all">
-					<?php endif ?>
-				</th>
+				<td class="liste_titre"><?php echo $langs->trans('Product') ?></td>
+				<td class="liste_titre"><?php echo $langs->trans('Combination') ?></td>
+				<td class="liste_titre right"><?php echo $langs->trans('PriceImpact') ?></td>
+				<td class="liste_titre right"><?php echo $langs->trans('WeightImpact') ?></td>
+				<td class="liste_titre center"><?php echo $langs->trans('OnSell') ?></td>
+				<td class="liste_titre center"><?php echo $langs->trans('OnBuy') ?></td>
+				<td class="liste_titre"></td>
+        		<?php 
+        		print '<td class="liste_titre" align="middle">';
+        		$searchpitco=$form->showCheckAddButtons('checkforselect', 1);
+        		print $searchpitco;
+        		print '</td>';
+                ?>
 			</tr>
 			<?php
 			
@@ -689,7 +674,16 @@ if (! empty($id) || ! empty($ref)) {
     					<a class="paddingleft paddingright" href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=edit&valueid='.$currcomb->id, 2) ?>"><?php echo img_edit() ?></a>
     					<a class="paddingleft paddingright" href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=delete&valueid='.$currcomb->id, 2) ?>"><?php echo img_delete() ?></a>
     				</td>
-    				<td class="center"><input type="checkbox" name="select[<?php echo $prodstatic->id ?>]"></td>
+    				<?php 
+    				print '<td class="nowrap" align="center">';
+    				if ($productCombinations || $massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+    				{
+    				    $selected=0;
+    				    if (in_array($prodstatic->id, $arrayofselected)) $selected=1;
+    				    print '<input id="cb'.$prodstatic->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$prodstatic->id.'"'.($selected?' checked="checked"':'').'>';
+    				}
+    				print '</td>';
+    				?>
     			</tr>
     			<?php
 			    }

From d3719a01a2fb6b6e0094b41edb8bfa6ad880af5f Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Fri, 7 Apr 2017 13:56:41 +0200
Subject: [PATCH 0545/1163] Update code using new css class

---
 dev/skeletons/skeleton_list.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php
index ca66990a9f7..e5e0f925a9c 100644
--- a/dev/skeletons/skeleton_list.php
+++ b/dev/skeletons/skeleton_list.php
@@ -435,10 +435,8 @@ while ($i < min($num, $limit))
     $obj = $db->fetch_object($resql);
     if ($obj)
     {
-        $var = !$var;
-        
         // Show here line of result
-        print '<tr '.$bc[$var].'>';
+        print '<tr class="oddeven">';
         // LIST_OF_TD_FIELDS_LIST
         /*
         if (! empty($arrayfields['t.field1']['checked'])) 

From 60a54041c20f8ac0cb5c7822a1cc0e4f0a105985 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Apr 2017 14:09:19 +0200
Subject: [PATCH 0546/1163] NEW Enable bulk actions delete on supplier invoices

---
 htdocs/comm/propal/list.php                   |   7 +-
 htdocs/commande/list.php                      |   8 +-
 htdocs/compta/facture/list.php                |  33 +--
 htdocs/core/class/html.formfile.class.php     |   8 +-
 htdocs/core/lib/functions.lib.php             |   2 +-
 .../class/api_supplier_invoices.class.php     |   2 +-
 .../class/fournisseur.commande.class.php      |  27 +-
 .../fourn/class/fournisseur.facture.class.php |  62 ++--
 htdocs/fourn/class/paiementfourn.class.php    |   2 +-
 htdocs/fourn/facture/list.php                 | 274 ++++++++++++++----
 htdocs/main.inc.php                           |   2 +-
 htdocs/theme/eldy/style.css.php               |   6 +
 htdocs/theme/md/style.css.php                 |   6 +
 13 files changed, 305 insertions(+), 134 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index d1ccf6547ce..c06ea117d01 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -556,7 +556,8 @@ if ($resql)
 
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	
+    if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+    
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -695,7 +696,7 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	$searchpitco=$form->showFilterButtons();
 	print $searchpitco;
 	print '</td>';
 	
@@ -807,7 +808,7 @@ if ($resql)
 		// Thirdparty
 		if (! empty($arrayfields['s.nom']['checked']))
 		{
-    		print '<td>';
+    		print '<td class="tdoverflowmax200">';
     		print $companystatic->getNomUrl(1,'customer');
     		print '</td>';
     		if (! $i) $totalarray['nbfield']++;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index fa94541cdbf..27033254dba 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -789,7 +789,6 @@ if ($resql)
 		print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
 		print '</div>';
 		print '<br>';
-		
 	}
 	
 	if ($sall)
@@ -841,7 +840,8 @@ if ($resql)
 
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	
+    if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+    
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -992,7 +992,7 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	$searchpitco=$form->showFilterButtons();
 	print $searchpitco;
 	print '</td>';
 	
@@ -1222,7 +1222,7 @@ if ($resql)
 		// Third party
 		if (! empty($arrayfields['s.nom']['checked']))
 		{
-    		print '<td>';
+    		print '<td class="tdoverflowmax200">';
     		print $companystatic->getNomUrl(1,'customer');
     
     		// If module invoices enabled and user with invoice creation permissions
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 03612cbb932..92fcf4fc511 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -738,7 +738,8 @@ if ($resql)
 
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-
+    if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+    
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -748,14 +749,14 @@ if ($resql)
 	if (! empty($arrayfields['f.facnumber']['checked'])) 
 	{
         print '<td class="liste_titre" align="left">';
-        print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
+        print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
         print '</td>';
 	}
 	// Ref customer
 	if (! empty($arrayfields['f.ref_client']['checked'])) 
 	{
     	print '<td class="liste_titre">';
-    	print '<input class="flat" size="6" type="text" name="search_refcustomer" value="'.$search_refcustomer.'">';
+    	print '<input class="flat" size="6" type="text" name="search_refcustomer" value="'.dol_escape_htmltag($search_refcustomer).'">';
     	print '</td>';
 	}
 	// Type
@@ -776,8 +777,8 @@ if ($resql)
 	if (! empty($arrayfields['f.date']['checked'])) 
 	{
     	print '<td class="liste_titre" align="center">';
-        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-        print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
+        print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
         $formother->select_year($year?$year:-1,'year',1, 20, 5);
         print '</td>';
 	}
@@ -785,8 +786,8 @@ if ($resql)
 	if (! empty($arrayfields['f.date_lim_reglement']['checked'])) 
 	{
     	print '<td class="liste_titre" align="center">';
-        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_lim" value="'.$day_lim.'">';
-        print '<input class="flat" type="text" size="1" maxlength="2" name="month_lim" value="'.$month_lim.'">';
+        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
+        print '<input class="flat" type="text" size="1" maxlength="2" name="month_lim" value="'.dol_escape_htmltag($month_lim).'">';
         $formother->select_year($year_lim?$year_lim:-1,'year_lim',1, 20, 5);
     	print '<br><input type="checkbox" name="option" value="late"'.($option == 'late'?' checked':'').'> '.$langs->trans("Late");
         print '</td>';
@@ -797,9 +798,9 @@ if ($resql)
 	   print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_societe" value="'.$search_societe.'"></td>';
 	}
 	// Town
-	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
 	// Zip
-	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';
+	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
 	// State
 	if (! empty($arrayfields['state.nom']['checked']))
 	{
@@ -832,21 +833,21 @@ if ($resql)
 	{
     	// Amount
     	print '<td class="liste_titre" align="right">';
-    	print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.$search_montant_ht.'">';
+    	print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
     	print '</td>';
 	}
 	if (! empty($arrayfields['f.total_vat']['checked']))
 	{
     	// Amount
     	print '<td class="liste_titre" align="right">';
-    	print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.$search_montant_vat.'">';
+    	print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
     	print '</td>';
 	}
 	if (! empty($arrayfields['f.total_ttc']['checked']))
 	{
     	// Amount
     	print '<td class="liste_titre" align="right">';
-    	print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.$search_montant_ttc.'">';
+    	print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
     	print '</td>';
 	}
     if (! empty($arrayfields['dynamount_payed']['checked']))
@@ -908,7 +909,7 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	$searchpitco=$form->showFilterButtons();
 	print $searchpitco;
     print '</td>';
     print "</tr>\n";
@@ -956,12 +957,10 @@ if ($resql)
     if ($num > 0)
     {
         $i=0;
-        $var=true;
         $totalarray=array();
         while ($i < min($num,$limit))
         {
             $obj = $db->fetch_object($resql);
-            $var=!$var;
 
             $datelimit=$db->jdate($obj->datelimite);
             $facturestatic->id=$obj->facid;
@@ -978,7 +977,7 @@ if ($resql)
             $totalpay = $paiement + $totalcreditnotes + $totaldeposits;
             $remaintopay = $obj->total_ttc - $totalpay;
             
-            print '<tr '.$bc[$var].'>';
+            print '<tr class="oddeven">';
     		if (! empty($arrayfields['f.facnumber']['checked']))
     		{
                 print '<td class="nowrap">';
@@ -1045,7 +1044,7 @@ if ($resql)
     		// Third party
     		if (! empty($arrayfields['s.nom']['checked']))
     		{
-                print '<td>';
+                print '<td class="tdoverflowmax200">';
                 $thirdparty=new Societe($db);
                 $thirdparty->id=$obj->socid;
                 $thirdparty->name=$obj->name;
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 647d0cf6a76..73e854248fe 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -871,8 +871,12 @@ class FormFile
     			else $this->infofiles['extensions'][$ext]++;
 
     			// Preview
-    			$urladvanced = getAdvancedPreviewUrl($modulepart, $relativepath);
-    		    if ($urladvanced) $tmpout.= '<li><a href="'.$urladvanced.'">'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
+    			if (! empty($conf->use_javascript_ajax) && ! empty($conf->browser->layout != 'phone'))
+    			{
+                    $tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1);
+                    if ($tmparray && $tmparray['url']) $tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
+    			}
+    			
     			// Download
     		    $tmpout.= '<li><a class="pictopreview" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
     			$mime=dol_mimetype($relativepath,'',0);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7c428968c34..df3dac377a4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5913,7 +5913,7 @@ function getImageFileNameForSize($file, $extName, $extImgTarget='')
  *
  * @param   string    $modulepart     propal, facture, facture_fourn, ...
  * @param   string    $relativepath   Relative path of docs.
- * @param	int		  $alldata		  Return array with all components (1 is recommended)  
+ * @param	int		  $alldata		  Return array with all components (1 is recommended, then use a simple a href link with the class, target and mime attribute added. 'documentpreview' css class is handled by jquery code into main.inc.php)  
  * @return  string|array              Output string with href link or array with all components of link
  */
 function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata=0)
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 59e9db1324d..3bf5c3f5934 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -262,7 +262,7 @@ class SupplierInvoices extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         
-        if( $this->invoice->delete($id) < 0)
+        if( $this->invoice->delete(DolibarrApiAccess::$user) < 0)
         {
             throw new RestException(500);
         }
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 1da9854791b..7b732dd05a6 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1724,28 +1724,31 @@ class CommandeFournisseur extends CommonOrder
      *  Delete an order
      *
      *	@param	User	$user		Object user
+     *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *	@return	int					<0 if KO, >0 if OK
      */
-    public function delete($user='')
+    public function delete(User $user, $notrigger=0)
     {
         global $langs,$conf;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
         $error = 0;
 
-        // Call trigger
-        $result=$this->call_trigger('ORDER_SUPPLIER_DELETE',$user);
-        if ($result < 0)
-        {
-        	$this->errors[]='ErrorWhenRunningTrigger';
-        	dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
-        	return -1;
-        }
-        // End call triggers
-
-
         $this->db->begin();
 
+        if (empty($notrigger))
+        {
+            // Call trigger
+            $result=$this->call_trigger('ORDER_SUPPLIER_DELETE',$user);
+            if ($result < 0)
+            {
+            	$this->errors[]='ErrorWhenRunningTrigger';
+            	dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+            	return -1;
+            }
+            // End call triggers
+        }
+
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =". $this->id ;
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         if (! $this->db->query($sql) )
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 5f435da9daf..42daafe9c2d 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -849,14 +849,15 @@ class FactureFournisseur extends CommonInvoice
     /**
      *	Delete invoice from database
      *
-     *	@param     	int		$rowid      	Id of invoice to delete
+     *  @param      User	$user		    User object
+     *	@param	    int		$notrigger	    1=Does not execute triggers, 0= execute triggers
      *	@return		int						<0 if KO, >0 if OK
      */
-    public function delete($rowid)
+    public function delete(User $user, $notrigger=0)
     {
-        global $user,$langs,$conf;
+        global $langs,$conf;
 
-        if (! $rowid) $rowid=$this->id;
+        $rowid=$this->id;
 
         dol_syslog("FactureFournisseur::delete rowid=".$rowid, LOG_DEBUG);
 
@@ -865,22 +866,37 @@ class FactureFournisseur extends CommonInvoice
         $error=0;
         $this->db->begin();
 
-        $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det WHERE fk_facture_fourn = '.$rowid.';';
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
+        if (! $error && ! $notrigger)
         {
-            $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE rowid = '.$rowid;
+            // Call trigger
+            $result=$this->call_trigger('BILL_SUPPLIER_DELETE',$user);
+            if ($result < 0)
+            {
+                $this->db->rollback();
+                return -1;
+            }
+            // Fin appel triggers
+        }
+        
+        if (! $error)
+        {
+            $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det WHERE fk_facture_fourn = '.$rowid.';';
             dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql2 = $this->db->query($sql);
-            if (! $resql2) {
+            $resql = $this->db->query($sql);
+            if ($resql)
+            {
+                $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE rowid = '.$rowid;
+                dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+                $resql2 = $this->db->query($sql);
+                if (! $resql2) {
+                	$error++;
+                }
+            }
+            else {
             	$error++;
             }
         }
-        else {
-        	$error++;
-        }
-
+        
 		if (! $error)
 		{
 			// Delete linked object
@@ -888,18 +904,6 @@ class FactureFournisseur extends CommonInvoice
 			if ($res < 0) $error++;
 		}
 
-        if (! $error)
-        {
-            // Call trigger
-            $result=$this->call_trigger('BILL_SUPPLIER_DELETE',$user);
-            if ($result < 0)
-            {
-        		$this->db->rollback();
-        	    return -1;
-        	}
-        	// Fin appel triggers
-        }
-
         if (! $error)
         {
         	// Delete linked object
@@ -2452,13 +2456,11 @@ class SupplierInvoiceLine extends CommonObjectLine
 	/**
 	 * Deletes a line
 	 *
-	 * @param     bool|int    $notrigger    1=Does not execute triggers, 0= execute triggers
+	 * @param     bool|int   $notrigger     1=Does not execute triggers, 0= execute triggers
 	 * @return    int                       0 if KO, 1 if OK
 	 */
 	public function delete($notrigger = 0)
 	{
-		global $user;
-
 		dol_syslog(get_class($this)."::deleteline rowid=".$this->id, LOG_DEBUG);
 
 		$error = 0;
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index be87fbc7512..12fccab91d8 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -349,7 +349,7 @@ class PaiementFourn extends Paiement
     			$result=$accline->fetch($bank_line_id);
     			if ($result > 0) // If result = 0, record not found, we don't try to delete
     			{
-    				$result=$accline->delete();
+    				$result=$accline->delete($user);
     			}
     			if ($result < 0)
     			{
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 52320ec9580..1eb2dfaeb4a 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -48,6 +48,12 @@ $langs->load("companies");
 $langs->load('products');
 $langs->load('projects');
 
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
+
 $socid = GETPOST('socid','int');
 
 // Security check
@@ -110,7 +116,7 @@ if (! $sortfield) $sortfield="f.datef,f.rowid";
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $contextpage='supplierinvoicelist';
 
-$diroutputmassaction=$conf->facture->dir_output . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction=$conf->fournisseur->facture->dir_output . '/temp/massgeneration/'.$user->id;
 
 $object=new FactureFournisseur($db);
 
@@ -171,67 +177,62 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
  */
 
 if (GETPOST('cancel')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction')) { $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction=''; }
 
 $parameters=array('socid'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter") || GETPOST("button_removefilter.x"))		// All test must be present to be compatible with all browsers
-{
-    $search_all="";
-    $search_user='';
-    $search_sale='';
-    $search_product_category='';
-    $search_ref="";
-    $search_refsupplier="";
-    $search_label="";
-    $search_project='';
-    $search_societe="";
-    $search_company="";
-    $search_amount_no_tax="";
-    $search_amount_all_tax="";
-    $search_montant_ht='';
-    $search_montant_vat='';
-    $search_montant_ttc='';
-    $search_status='';
-    $search_paymentmode='';
-    $search_town='';
-    $search_zip="";
-    $search_state="";
-    $search_type='';
-    $search_country='';
-    $search_type_thirdparty='';
-    $year="";
-    $month="";
-    $day="";
-    $year_lim="";
-    $month_lim="";
-    $day_lim="";
-    $search_array_options=array();
-    $filter='';
-    $option='';
-}
-
 if (empty($reshook))
 {
-    // Mass actions. Controls on number of lines checked
-    $maxformassaction=1000;
-    if (! empty($massaction) && count($toselect) < 1)
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+    
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter") || GETPOST("button_removefilter.x"))		// All test must be present to be compatible with all browsers
     {
-        $error++;
-        setEventMessages($langs->trans("NoLineChecked"), null, "warnings");
+        $search_all="";
+        $search_user='';
+        $search_sale='';
+        $search_product_category='';
+        $search_ref="";
+        $search_refsupplier="";
+        $search_label="";
+        $search_project='';
+        $search_societe="";
+        $search_company="";
+        $search_amount_no_tax="";
+        $search_amount_all_tax="";
+        $search_montant_ht='';
+        $search_montant_vat='';
+        $search_montant_ttc='';
+        $search_status='';
+        $search_paymentmode='';
+        $search_town='';
+        $search_zip="";
+        $search_state="";
+        $search_type='';
+        $search_country='';
+        $search_type_thirdparty='';
+        $year="";
+        $month="";
+        $day="";
+        $year_lim="";
+        $month_lim="";
+        $day_lim="";
+        $toselect='';
+        $search_array_options=array();
+        $filter='';
+        $option='';
     }
-    if (! $error && count($toselect) > $maxformassaction)
-    {
-        setEventMessages($langs->trans('TooManyRecordForMassAction',$maxformassaction), null, 'errors');
-        $error++;
-    }
-
-
+    
+    // Mass actions
+    $objectclass='FactureFournisseur';
+    $objectlabel='SupplierInvoices';
+    $permtoread = $user->rights->fournisseur->facture->lire;
+    $permtodelete = $user->rights->fournisseur->facture->supprimer;
+    $uploaddir = $conf->fournisseur->facture->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
+
     
 /*
  * View
@@ -424,7 +425,15 @@ if ($resql)
 	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 	}
 	
-	$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
+	// List of mass actions available
+	$arrayofmassactions =  array(
+	    //'presend'=>$langs->trans("SendByMail"),
+	    //'builddoc'=>$langs->trans("PDFMerge"),
+	);
+	//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
+	if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+	//if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 	
 	$i = 0;
 	print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -437,7 +446,144 @@ if ($resql)
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 	print '<input type="hidden" name="socid" value="'.$socid.'">';
 
-	print_barre_liste($langs->trans("BillsSuppliers").($socid?" - $soc->name":""), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
+	print_barre_liste($langs->trans("BillsSuppliers").($socid?" - $soc->name":""), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
+	
+	if ($massaction == 'presend')
+	{
+	    $langs->load("mails");
+	
+	    if (! GETPOST('cancel'))
+	    {
+	        $objecttmp=new Commande($db);
+	        $listofselectedid=array();
+	        $listofselectedthirdparties=array();
+	        $listofselectedref=array();
+	        foreach($arrayofselected as $toselectid)
+	        {
+	            $result=$objecttmp->fetch($toselectid);
+	            if ($result > 0)
+	            {
+	                $listofselectedid[$toselectid]=$toselectid;
+	                $thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
+	                $listofselectedthirdparties[$thirdpartyid]=$thirdpartyid;
+	                $listofselectedref[$thirdpartyid][$toselectid]=$objecttmp->ref;
+	            }
+	        }
+	    }
+	
+	    print '<input type="hidden" name="massaction" value="confirm_presend">';
+	
+	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+	    $formmail = new FormMail($db);
+	
+	    dol_fiche_head(null, '', '');
+	
+	    $topicmail="SendOrderRef";
+	    $modelmail="order_send";
+	
+	    // Cree l'objet formulaire mail
+	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+	    $formmail = new FormMail($db);
+	    $formmail->withform=-1;
+	    $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+	
+	    if($formmail->fromtype === 'user'){
+	        $formmail->fromid = $user->id;
+	
+	    }
+	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
+	    {
+	        $formmail->trackid='ord'.$object->id;
+	    }
+	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+	    {
+	        include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	        $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
+	    }
+	    $formmail->withfrom=1;
+	    $liste=$langs->trans("AllRecipientSelected");
+	    if (count($listofselectedthirdparties) == 1)
+	    {
+	        $liste=array();
+	        $thirdpartyid=array_shift($listofselectedthirdparties);
+	        $soc=new Societe($db);
+	        $soc->fetch($thirdpartyid);
+	        foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+	        {
+	            $liste[$key]=$value;
+	        }
+	        $formmail->withtoreadonly=0;
+	    }
+	    else
+	    {
+	        $formmail->withtoreadonly=1;
+	    }
+	    $formmail->withto=$liste;
+	    $formmail->withtofree=0;
+	    $formmail->withtocc=1;
+	    $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
+	    $formmail->withtopic=$langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
+	    $formmail->withfile=$langs->trans("OnlyPDFattachmentSupported");
+	    $formmail->withbody=1;
+	    $formmail->withdeliveryreceipt=1;
+	    $formmail->withcancel=1;
+	    // Tableau des substitutions
+	    $formmail->substit['__REF__']='__REF__';	// We want to keep the tag
+	    $formmail->substit['__SIGNATURE__']=$user->signature;
+	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
+	    $formmail->substit['__PERSONALIZED__']='';
+	    $formmail->substit['__CONTACTCIVNAME__']='';
+	
+	    // Tableau des parametres complementaires du post
+	    $formmail->param['action']=$action;
+	    $formmail->param['models']=$modelmail;
+	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
+	    $formmail->param['id']=join(',',$arrayofselected);
+	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+	
+	    print $formmail->get_form();
+	
+	    dol_fiche_end();
+	}
+	elseif ($massaction == 'createbills')
+	{
+	    //var_dump($_REQUEST);
+	    print '<input type="hidden" name="massaction" value="confirm_createbills">';
+	
+	    print '<table class="border" width="100%" >';
+	    print '<tr>';
+	    print '<td class="titlefieldmiddle">';
+	    print $langs->trans('DateInvoice');
+	    print '</td>';
+	    print '<td>';
+	    print $form->select_date('', '', '', '', '', '', 1, 1);
+	    print '</td>';
+	    print '</tr>';
+	    print '<tr>';
+	    print '<td>';
+	    print $langs->trans('CreateOneBillByThird');
+	    print '</td>';
+	    print '<td>';
+	    print $form->selectyesno('createbills_onebythird', '', 1);
+	    print '</td>';
+	    print '</tr>';
+	    print '<tr>';
+	    print '<td>';
+	    print $langs->trans('ValidateInvoices');
+	    print '</td>';
+	    print '<td>';
+	    print $form->selectyesno('valdate_invoices', 1, 1);
+	    print '</td>';
+	    print '</tr>';
+	    print '</table>';
+	
+	    print '<br>';
+	    print '<div class="center">';
+	    print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
+	    print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
+	    print '</div>';
+	    print '<br>';
+	}
 	
 	if ($search_all)
     {
@@ -487,11 +633,11 @@ if ($resql)
 
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	
+    if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+    
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-
 	// Line for filters
 	print '<tr class="liste_titre_filter">';
 	// Ref
@@ -646,7 +792,7 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(0, 'checkforselect', 0);
+	$searchpitco=$form->showFilterButtons('checkforselect', 0);
 	print $searchpitco;
 	print '</td>';
 
@@ -688,7 +834,7 @@ if ($resql)
 	if (! empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'],$_SERVER["PHP_SELF"],"f.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'],$_SERVER["PHP_SELF"],"fk_statut,paye","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";	
 	
     $facturestatic=new FactureFournisseur($db);
@@ -944,11 +1090,15 @@ if ($resql)
             }
             
     		// Action column
+            // Action column
             print '<td class="nowrap" align="center">';
-            $selected=0;
-    		if (in_array($obj->facid, $arrayofselected)) $selected=1;
-    		//print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected?' checked="checked"':'').'>';
-    		print '</td>' ;
+            if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+            {
+                $selected=0;
+                if (in_array($obj->facid, $arrayofselected)) $selected=1;
+                print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected?' checked="checked"':'').'>';
+            }
+            print '</td>';
     		if (! $i) $totalarray['nbfield']++;
     		
 			print "</tr>\n";
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index f44f2f70acf..8fe2125251c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1922,7 +1922,7 @@ if (! function_exists("llxFooter"))
         }
         
         // Wrapper to manage document_preview
-        if (! empty($conf->use_javascript_ajax))
+        if (! empty($conf->use_javascript_ajax) && ! empty($conf->browser->layout != 'phone'))
         {
             print "\n<!-- JS CODE TO ENABLE document_preview -->\n";
             print '<script type="text/javascript">
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 77c779b268e..38d50962086 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -624,6 +624,12 @@ div.myavailability {
     text-overflow: ellipsis;
     white-space: nowrap;
 }
+.tdoverflowmax200 {			/* For tdoverflow, the max-midth become a minimum ! */
+    max-width: 200px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 .tdoverflowmax300 {			/* For tdoverflow, the max-midth become a minimum ! */
     max-width: 300px;
     overflow: hidden;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 553d2560790..f3232b31d6b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -625,6 +625,12 @@ div.myavailability {
     text-overflow: ellipsis;
     white-space: nowrap;
 }
+.tdoverflowmax200 {			/* For tdoverflow, the max-midth become a minimum ! */
+    max-width: 200px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 .tdoverflowmax300 {
     max-width: 300px;
     overflow: hidden;

From 8154521a22b6401a3430799b62775a0d4d499496 Mon Sep 17 00:00:00 2001
From: dolibarr95 <onajid@1blow-services.com>
Date: Fri, 7 Apr 2017 14:15:36 +0200
Subject: [PATCH 0547/1163] Fix typo

Fix typo error in trigger name.
---
 htdocs/societe/class/companybankaccount.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 398cf41bdaa..652cd8d5d7e 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -275,7 +275,7 @@ class CompanyBankAccount extends Account
         if (! $error && ! $notrigger)
         {
             // Call trigger
-            $result=$this->call_trigger('COMAPNY_RIB_DELETE',$user);
+            $result=$this->call_trigger('COMPANY_RIB_DELETE',$user);
             if ($result < 0) $error++;
             // End call triggers
         }

From 3715fcdd5f15f04275b1b37ff45cad17d836889b Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Fri, 7 Apr 2017 14:25:33 +0200
Subject: [PATCH 0548/1163] Update code using new css class

---
 htdocs/accountancy/admin/accountmodel.php    |  9 +++------
 htdocs/accountancy/admin/categories.php      |  3 +--
 htdocs/accountancy/admin/categories_list.php |  4 +---
 htdocs/accountancy/admin/defaultaccounts.php |  3 +--
 htdocs/accountancy/admin/export.php          | 13 +++++--------
 htdocs/accountancy/admin/fiscalyear.php      |  4 ++--
 htdocs/accountancy/admin/importaccounts.php  |  3 +--
 htdocs/accountancy/admin/index.php           | 16 +++++-----------
 htdocs/accountancy/admin/journal.php         |  7 ++-----
 htdocs/accountancy/admin/journals.php        |  6 ++----
 10 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 75d3be10444..e037549add8 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -911,11 +911,9 @@ if ($id)
             // Lines with values
             while ($i < $num)
             {
-                $var = ! $var;
-
                 $obj = $db->fetch_object($resql);
                 //print_r($obj);
-                print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
+                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
                 if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
                 {
                     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
@@ -1198,14 +1196,13 @@ else
         {
         	if ($showemptyline)
         	{
-        		$var=!$var;
-        		print '<tr '.$bc[$var].'><td width="30%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
+        		print '<tr class="oddeven"><td width="30%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
         		$showemptyline=0;
         	}
 
             $var=!$var;
             $value=$tabname[$i];
-            print '<tr '.$bc[$var].'><td width="50%">';
+            print '<tr class="oddeven"><td width="50%">';
             if (! empty($tabcond[$i]))
             {
                 print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 85c342992c0..19c33d848c8 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -146,8 +146,7 @@ if ($action == 'display' || $action == 'delete') {
 
 		if (is_array($accountingcategory->lines_display) && count($accountingcategory->lines_display) > 0) {
 			foreach ( $accountingcategory->lines_display as $cpt ) {
-				$var = ! $var;
-				print '<tr ' . $bc[$var] . '>';
+				print '<tr class="oddeven">';
 				print '<td>' . length_accountg($cpt->account_number) . '</td>';
 				print '<td>' . $cpt->label . '</td>';
 				print '<td align="right">';
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 30466926f0a..0580a9688ed 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -847,11 +847,9 @@ if ($id)
             // Lines with values
             while ($i < $num)
             {
-                $var = ! $var;
-
                 $obj = $db->fetch_object($resql);
                 //print_r($obj);
-                print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
+                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
                 if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
                 {
                     $tmpaction='edit';
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 08ce543c525..4b733bee5a6 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -135,9 +135,8 @@ print '<input type="hidden" name="action" value="update">';
 print '<table class="noborder" width="100%">';
 
 foreach ( $list_account as $key ) {
-	$var = ! $var;
 	
-	print '<tr ' . $bc[$var] . ' class="value">';
+	print '<tr class="oddeven value">';
 	// Param
 	$label = $langs->trans($key);
 	print '<td>' . $label . '</td>';
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index 9e57830b94d..f7bbbb97969 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -148,9 +148,8 @@ $var = ! $var;
 $num = count($main_option);
 if ($num) {
 	foreach ( $main_option as $key ) {
-		$var = ! $var;
 		
-		print '<tr ' . $bc[$var] . ' class="value">';
+		print '<tr class="oddeven value">';
 		
 		// Param
 		$label = $langs->trans($key);
@@ -178,7 +177,7 @@ print '</tr>';
 
 $var = ! $var;
 
-print '<tr ' . $bc[$var] . '>';
+print '<tr class="oddeven">';
 print '<td width="50%">' . $langs->trans("Selectmodelcsv") . '</td>';
 if (! $conf->use_javascript_ajax) {
 	print '<td class="nowrap">';
@@ -212,7 +211,7 @@ if ($num2) {
 		print '<tr><td colspan="2" bgcolor="red"><b>' . $langs->trans('OptionsDeactivatedForThisExportModel') . '</b></td></tr>';
 	}
 	
-	print '<tr ' . $bc[$var] . '>';
+	print '<tr class="oddeven">';
 	print '<td width="50%">' . $langs->trans("Selectformat") . '</td>';
 	if (! $conf->use_javascript_ajax) {
 	    print '<td class="nowrap">';
@@ -230,10 +229,8 @@ if ($num2) {
 	}
 	print "</td></tr>";
 	
-	foreach ( $model_option as $key ) {
-		$var = ! $var;
-		
-		print '<tr ' . $bc[$var] . ' class="value">';
+	foreach ( $model_option as $key ) {		
+		print '<tr class="oddeven value">';
 		
 		// Param
 		$label = $langs->trans($key);
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 4b2b57ee7db..507a68a3c01 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -125,7 +125,7 @@ if ($result) {
 		while ( $i < $num && $i < $max ) {
 			$obj = $db->fetch_object($result);
 			$fiscalyearstatic->id = $obj->rowid;
-			print '<tr ' . $bc[$var] . '>';
+			print '<tr class="oddeven">';
 			print '<td><a href="fiscalyear_card.php?id=' . $obj->rowid . '">' . img_object($langs->trans("ShowFiscalYear"), "technic") . ' ' . $obj->rowid . '</a></td>';
 			print '<td align="left">' . $obj->label . '</td>';
 			print '<td align="left">' . dol_print_date($db->jdate($obj->date_start), 'day') . '</td>';
@@ -136,7 +136,7 @@ if ($result) {
 			$i ++;
 		}
 	} else {
-		print '<tr ' . $bc[$var] . '><td colspan="5" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
+		print '<tr class="oddeven"><td colspan="5" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
 	}
 	print '</table>';
 } else {
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 99b491688cb..4a6c82cb581 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -145,8 +145,7 @@ if ($result) {
 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
-		$var = ! $var;
-		print '<tr'. $bc[$var].'>';
+		print '<tr class="oddeven">';
 		
 		print '<td align="left">';
 		print $objp->accounting;
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index e6bae2f73d8..3ea77a24b43 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -214,8 +214,7 @@ print "</tr>\n";
 if (! empty($user->admin))
 {
     // TO DO Mutualize code for yes/no constants
-    $var = ! $var;
-    print "<tr " . $bc[$var] . ">";
+    print '<tr class="oddeven">';
     print '<td>' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_TODO") . '</td>';
     if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) {
         print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsorttodo&value=0">';
@@ -228,8 +227,7 @@ if (! empty($user->admin))
     }
     print '</tr>';
 
-    $var = ! $var;
-    print "<tr " . $bc[$var] . ">";
+    print '<tr class="oddeven">';
     print '<td>' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_DONE") . '</td>';
     if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) {
         print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsortdone&value=0">';
@@ -242,8 +240,7 @@ if (! empty($user->admin))
     }
     print '</tr>';
 
-	$var = ! $var;
-	print "<tr " . $bc[$var] . ">";
+	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("BANK_DISABLE_DIRECT_INPUT") . '</td>';
 	if (! empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
 		print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=0">';
@@ -256,8 +253,7 @@ if (! empty($user->admin))
 	}
 	print '</tr>';
 
-    $var = ! $var;
-    print "<tr " . $bc[$var] . ">";
+    print '<tr class="oddeven">';
     print '<td>' . $langs->trans("ACCOUNTING_MANAGE_ZERO") . '</td>';
     if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
         print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setmanagezero&value=0">';
@@ -275,9 +271,7 @@ if (! empty($user->admin))
 // Param a user $user->rights->accountancy->chartofaccount can access
 foreach ($list as $key) 
 {
-    $var = ! $var;
-
-    print '<tr ' . $bc[$var] . ' class="value">';
+    print '<tr class="oddeven value">';
     
     if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO) && ($key == 'ACCOUNTING_LENGTH_GACCOUNT' || $key == 'ACCOUNTING_LENGTH_AACCOUNT')) continue;
 
diff --git a/htdocs/accountancy/admin/journal.php b/htdocs/accountancy/admin/journal.php
index 2a868969c3d..8e19a3e3e87 100644
--- a/htdocs/accountancy/admin/journal.php
+++ b/htdocs/accountancy/admin/journal.php
@@ -125,9 +125,8 @@ print '<td colspan="2">' . $langs->trans('Journaux') . '</td>';
 print "</tr>\n";
 
 foreach ( $list as $key ) {
-	$var = ! $var;
 
-	print '<tr ' . $bc[$var] . ' class="value">';
+	print '<tr class="oddeven value">';
 
 	// Param
 	$label = $langs->trans($key);
@@ -167,8 +166,6 @@ if ($resql) {
 	while ( $i < $numr ) {
 		$objp = $db->fetch_object($resql);
 
-		$var = ! $var;
-
 		$bankaccountstatic->rowid = $objp->rowid;
 		$bankaccountstatic->id = $objp->rowid;
 		$bankaccountstatic->ref = $objp->ref;
@@ -177,7 +174,7 @@ if ($resql) {
 		$bankaccountstatic->account_number = $objp->account_number;
 		$bankaccountstatic->accountancy_journal = $objp->accountancy_journal;
 
-		print '<tr ' . $bc[$var] . ' class="value">';
+		print '<tr class="oddeven value">';
 
 		// Param
 		print '<td width="50%"><label for="' . $objp->rowid . '">' . $langs->trans("Journal");
diff --git a/htdocs/accountancy/admin/journals.php b/htdocs/accountancy/admin/journals.php
index 72f81dc90ba..03b51089d9a 100644
--- a/htdocs/accountancy/admin/journals.php
+++ b/htdocs/accountancy/admin/journals.php
@@ -113,7 +113,6 @@ $sql.= $db->plimit($limit+1, $offset);
 
 $result = $db->query($sql);
 if ($result) {
-	$var = false;
 	$num = $db->num_rows($result);
 
 	$i = 0;
@@ -136,16 +135,15 @@ if ($result) {
 		while ( $i < $num && $i < $max ) {
 			$obj = $db->fetch_object($result);
 			$accountingjournalstatic->id = $obj->rowid;
-			print '<tr ' . $bc[$var] . '>';
+			print '<tr class="oddeven">';
 			print '<td><a href="journals_card.php?id=' . $obj->rowid . '">' . img_object($langs->trans("ShowJournal"), "technic") . ' ' . $obj->code . '</a></td>';
 			print '<td align="left">' . $obj->label . '</td>';
 			print '<td>' . $accountingjournalstatic->LibType($obj->nature, 0) . '</td>';
 			print '</tr>';
-			$var = ! $var;
 			$i ++;
 		}
 	} else {
-		print '<tr ' . $bc[$var] . '><td colspan="3" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
+		print '<tr class="oddeven"><td colspan="3" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
 	}
 	print '</table>';
 } else {

From a1c1aa054ffeadc4fdbd6285313bdf6223bf3be4 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 7 Apr 2017 14:55:14 +0200
Subject: [PATCH 0549/1163] new : select2 for contract selector

---
 htdocs/core/class/html.formcontract.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index ace00b77caa..3805b2e6706 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -66,6 +66,7 @@ class FormContract
 		//if ($contratListId) $sql.= " AND c.rowid IN (".$contratListId.")";
 		if ($socid == 0) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
 		if ($socid > 0)  $sql.= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
+		$sql.= " ORDER BY c.ref ";
 
 		dol_syslog(get_class($this)."::select_contract", LOG_DEBUG);
 		$resql=$db->query($sql);
@@ -129,6 +130,11 @@ class FormContract
 			}
 			print '</select>';
 			$db->free($resql);
+			
+			// Make select dynamic
+			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+			print ajax_combobox($htmlname);
+			
 			return $num;
 		}
 		else

From e76a00845d17d8de41d8b2f74017a9a579fef41d Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 7 Apr 2017 14:55:59 +0200
Subject: [PATCH 0550/1163] better test

---
 htdocs/core/class/html.formcontract.class.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index 3805b2e6706..f4902e4912e 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -131,9 +131,12 @@ class FormContract
 			print '</select>';
 			$db->free($resql);
 			
-			// Make select dynamic
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-			print ajax_combobox($htmlname);
+			if (!empty($conf->use_javascript_ajax))
+			{
+				// Make select dynamic
+				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				print ajax_combobox($htmlname);
+			}
 			
 			return $num;
 		}

From be439f62522815c29e3f3e8e006508d98a02057d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Apr 2017 14:18:04 +0200
Subject: [PATCH 0551/1163] Work on look and feel v6

---
 dev/skeletons/.gitignore                      |   2 -
 dev/skeletons/README                          |  34 -
 dev/skeletons/README.md                       |   1 +
 dev/skeletons/build_api_class.php             | 123 ----
 dev/skeletons/build_class_from_table.php      | 677 ------------------
 dev/skeletons/build_webservice_from_class.php | 179 -----
 dev/skeletons/modMyModule.class.php           | 291 --------
 dev/skeletons/skeleton_api_class.class.php    | 289 --------
 dev/skeletons/skeleton_card.php               | 351 ---------
 dev/skeletons/skeleton_class.class.php        | 593 ---------------
 dev/skeletons/skeleton_list.php               | 569 ---------------
 dev/skeletons/skeleton_script.php             | 166 -----
 dev/skeletons/skeleton_webservice_server.php  | 272 -------
 htdocs/accountancy/admin/account.php          |   2 +-
 htdocs/adherents/list.php                     |   2 +-
 htdocs/comm/propal/list.php                   |   4 +-
 htdocs/commande/list.php                      |   2 +-
 htdocs/compta/bank/bankentries.php            |   2 +-
 htdocs/compta/bank/index.php                  |   2 +-
 htdocs/compta/facture/list.php                |   2 +-
 htdocs/compta/paiement/card.php               |  25 +-
 .../compta/paiement/class/paiement.class.php  |   2 +-
 htdocs/compta/paiement/info.php               |  28 +-
 htdocs/contact/list.php                       |   2 +-
 htdocs/contrat/list.php                       |   2 +-
 htdocs/contrat/services.php                   |   2 +-
 htdocs/core/boxes/box_commandes.php           |   2 +-
 htdocs/core/boxes/box_propales.php            |   4 +-
 htdocs/core/class/html.formfile.class.php     |   4 +-
 htdocs/core/tpl/objectline_create.tpl.php     |  16 +-
 htdocs/core/tpl/objectline_view.tpl.php       |   2 +-
 htdocs/expedition/list.php                    |   2 +-
 htdocs/expensereport/list.php                 |  74 +-
 htdocs/fichinter/list.php                     |   2 +-
 htdocs/fourn/commande/list.php                |   2 +-
 htdocs/holiday/list.php                       |  35 +-
 .../modulebuilder/skeletons/skeleton_list.php |   2 +-
 htdocs/product/list.php                       |   2 +-
 htdocs/product/stock/mouvement.php            |   2 +-
 htdocs/product/stock/productlot_list.php      |   2 +-
 htdocs/projet/list.php                        |   2 +-
 htdocs/projet/tasks/list.php                  |   2 +-
 htdocs/resource/list.php                      |   2 +-
 htdocs/societe/list.php                       |   2 +-
 htdocs/supplier_proposal/list.php             |   2 +-
 htdocs/theme/eldy/ckeditor/config.js          |  12 +-
 htdocs/theme/eldy/style.css.php               |  15 +-
 htdocs/theme/md/ckeditor/config.js            |  16 +-
 htdocs/user/index.php                         |   2 +-
 49 files changed, 149 insertions(+), 3681 deletions(-)
 delete mode 100644 dev/skeletons/.gitignore
 delete mode 100644 dev/skeletons/README
 create mode 100644 dev/skeletons/README.md
 delete mode 100755 dev/skeletons/build_api_class.php
 delete mode 100755 dev/skeletons/build_class_from_table.php
 delete mode 100755 dev/skeletons/build_webservice_from_class.php
 delete mode 100644 dev/skeletons/modMyModule.class.php
 delete mode 100644 dev/skeletons/skeleton_api_class.class.php
 delete mode 100644 dev/skeletons/skeleton_card.php
 delete mode 100644 dev/skeletons/skeleton_class.class.php
 delete mode 100644 dev/skeletons/skeleton_list.php
 delete mode 100644 dev/skeletons/skeleton_script.php
 delete mode 100644 dev/skeletons/skeleton_webservice_server.php

diff --git a/dev/skeletons/.gitignore b/dev/skeletons/.gitignore
deleted file mode 100644
index 2dda6229d24..00000000000
--- a/dev/skeletons/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-out.*
-socpeople*
diff --git a/dev/skeletons/README b/dev/skeletons/README
deleted file mode 100644
index 5b5b992d91e..00000000000
--- a/dev/skeletons/README
+++ /dev/null
@@ -1,34 +0,0 @@
-README (English)
---------------------------------
-This directory contains PHP script samples that can be used to start a development on Dolibarr.
-
-
-*** build_class_from_table.php:
-
-This is the script to use to generate PHP code of a PHP POJO class
-object, a PHP script that use this POJO. This script use the files
-skeleton_*.php to build its generated code. 
-
-
-*** modMyModule.class.php:
-
-Is a sample of module descriptor that you can use if you want to build a new module/plugin for
-Dolibarr.
-
-
-*** skeleton_script.php:
-
-Is a sample you can use as an example if you need to build a script to run on command line
-
-
-*** skeleton_page.php:
-
-Is a sample you can use as an example if you need to build an HTML page to include in Dolibarr GUI.
-
-
-*** skeleton_class.class.php:
-
-Is a sample you can use as an example if you need to build a class file to access a new table required by a Dolibarr development.
-However it is better to run the build_class_from_table.php script that accepts a table name as a parameter and will uses the description table within database and the skeleton_class.class.php file to generate full code for your class file.
-After running this script, the class to access your table (insert a record, update, delete and select) is directly finished and can be used by your module's code. 
-No more coding is needed to get access to table with this script because the file is completely generated once.
diff --git a/dev/skeletons/README.md b/dev/skeletons/README.md
new file mode 100644
index 00000000000..68fe9c093fb
--- /dev/null
+++ b/dev/skeletons/README.md
@@ -0,0 +1 @@
+Files and tools were moved into htdocs/modulebuilder/skeletons
\ No newline at end of file
diff --git a/dev/skeletons/build_api_class.php b/dev/skeletons/build_api_class.php
deleted file mode 100755
index 6263eabcd6e..00000000000
--- a/dev/skeletons/build_api_class.php
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2015   Jean-François Ferry <jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_api_class.php
- *  \ingroup    core
- *  \brief      Create a complete API class file from existant class file
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='1';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_API_FROM_CLASS --------------------
-
-// Check parameters
-if (! isset($argv[1]) && ! isset($argv[2]))
-{
-    print "Usage: $script_file phpClassFile phpClassName\n";
-    exit;
-}
-// Show parameters
-print 'Classfile='.$argv[1]."\n";
-print 'Classname='.$argv[2]."\n";
-
-$classfile=$argv[1];
-$classname=$argv[2];
-$classmin=strtolower($classname);
-$classnameApi = $classname.'Api';
-$property=array();
-$targetcontent='';
-
-// Load the class and read properties
-require_once($classfile);
-
-$property=array();
-$class = new $classname($db);
-$values=get_class_vars($classname);
-
-unset($values['db']);
-unset($values['error']);
-unset($values['errors']);
-unset($values['element']);
-unset($values['table_element']);
-unset($values['table_element_line']);
-unset($values['fk_element']);
-unset($values['ismultientitymanaged']);
-
-// Read skeleton_api_class.class.php file
-$skeletonfile=$path.'skeleton_api_class.class.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile='out.api_'.$classmin.'.class.php';
-$targetcontent=$sourcecontent;
-
-// Substitute class name
-$targetcontent=preg_replace('/skeleton_api_class\.class\.php/', 'api_'.$classmin.'.class.php', $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-//$targetcontent=preg_replace('/\$table_element=\'skeleton\'/', '\$table_element=\''.$tablenoprefix.'\'', $targetcontent);
-$targetcontent=preg_replace('/SkeletonApi/', $classnameApi, $targetcontent);
-$targetcontent=preg_replace('/Skeleton/', $classname, $targetcontent);
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "\n";
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You can now rename generated files by removing the 'out.' prefix in their name and store them into directory /module/class.\n";
-return $error;
diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php
deleted file mode 100755
index 0e5a6d82a82..00000000000
--- a/dev/skeletons/build_class_from_table.php
+++ /dev/null
@@ -1,677 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2008-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_class_from_table.php
- *  \ingroup    core
- *  \brief      Create a complete class file from a table in database
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='3.2';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-// Check parameters
-if (! isset($argv[1]) || ! isset($argv[2]) || (isset($argv[3]) && ! isset($argv[7])))
-{
-    print "Usage: $script_file tablename modulename [server port databasename user pass]\n";
-    exit;
-}
-
-if (isset($argv[3]) && isset($argv[4]) && isset($argv[5]) && isset($argv[6]) && isset($argv[7]))
-{
-	print 'Use specific database ids'."\n";
-	$db=getDoliDBInstance('mysqli',$argv[3],$argv[6],$argv[7],$argv[5],$argv[4]);
-}
-
-if ($db->type != 'mysql' && $db->type != 'mysqli')
-{
-	print "Error: This script works with mysql or mysqli driver only\n";
-	exit;
-}
-
-$table=$argv[1];
-$module=$argv[2];
-
-// Show parameters
-print 'Tablename: '.$table."\n";
-print 'Modulename: '.$module."\n";
-print "Current dir: ".getcwd()."\n";
-print "Database name: ".$db->database_name."\n";
-
-
-// Define array with list of properties
-$property=array();
-$foundprimary=0;
-$resql=$db->DDLDescTable($table);
-if ($resql)
-{
-	$i=0;
-	while($obj=$db->fetch_object($resql))
-	{
-		//var_dump($obj);
-		$i++;
-		$property[$i]['field']=$obj->Field;
-		if ($obj->Key == 'PRI')
-		{
-			$property[$i]['primary']=1;
-			$foundprimary=1;
-		}
-		else
-		{
-			$property[$i]['primary']=1;
-		}
-		$property[$i]['type'] =$obj->Type;
-		$property[$i]['null'] =$obj->Null;
-		$property[$i]['extra']=$obj->Extra;
-		if ($property[$i]['type'] == 'date'
-			|| $property[$i]['type'] == 'datetime'
-			|| $property[$i]['type'] == 'timestamp')
-		{
-			$property[$i]['istime']=true;
-		}
-		else
-		{
-			$property[$i]['istime']=false;
-		}
-		if (preg_match('/varchar/i',$property[$i]['type'])
-			|| preg_match('/text/i',$property[$i]['type']))
-		{
-			$property[$i]['ischar']=true;
-		}
-		else
-		{
-			$property[$i]['ischar']=false;
-		}
-		if (preg_match('/int/i',$property[$i]['type']))
-		{
-			$property[$i]['isint']=true;
-		}
-		else
-		{
-			$property[$i]['isint']=false;
-		}
-	}
-}
-else
-{
-	print "Error: Failed to get description for table '".$table."'.\n";
-	return false;
-}
-//var_dump($property);
-
-// Define substitute fetch/select parameters
-$varpropselect="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-    $i++;
-    if ($prop['field'] != 'rowid')
-    {
-        $varpropselect.="\t\t\$sql .= \" ";
-        $varpropselect.="t.".$prop['field'];
-        if ($i < count($property)) $varpropselect.=",";
-        $varpropselect.="\";";
-        $varpropselect.="\n";
-    }
-}
-
-
-
-//--------------------------------
-// Build skeleton_class.class.php
-//--------------------------------
-
-// Define working variables
-$table=strtolower($table);
-$tablenoprefix=preg_replace('/'.preg_quote(MAIN_DB_PREFIX,'/').'/i','',$table);
-$classname=preg_replace('/_/','',ucfirst($tablenoprefix));
-$classmin=preg_replace('/_/','',strtolower($classname));
-
-
-// Read skeleton_class.class.php file
-$skeletonfile=$path.'skeleton_class.class.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile=$classmin.'.class.php';
-$targetcontent=$sourcecontent;
-
-// Substitute module name
-$targetcontent=preg_replace('/dev\/skeletons/', $module, $targetcontent);
-$targetcontent=preg_replace('/mymodule othermodule1 othermodule2/', $module, $targetcontent);
-$targetcontent=preg_replace('/mymodule/', $module, $targetcontent);
-
-// Substitute class name
-$targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
-$targetcontent=preg_replace('/\$element = \'skeleton\'/', '\$element = \''.$classmin.'\'', $targetcontent);
-$targetcontent=preg_replace('/\$table_element = \'skeleton\'/', '\$table_element = \''.$tablenoprefix.'\'', $targetcontent);
-$targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
-$targetcontent=preg_replace('/skeletons/', $classmin, $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-
-// Substitute comments
-$targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
-$targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
-$targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
-
-// Substitute table name
-$targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
-
-// Substitute declaration parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\tpublic \$".$prop['field'];
-		if ($prop['istime']) $varprop.=" = ''";
-		$varprop.=";";
-		if ($prop['comment']) $varprop.="\t// ".$prop['extra'];
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/'.preg_quote('public $prop1;','/').'/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/'.preg_quote('public $prop2;','/').'/', '', $targetcontent);
-
-$targetcontent=preg_replace('/\*((\s|\n|\r|\t)*)\@var mixed Sample property 1((\s|\n|\r|\t)*)/', '', $targetcontent);
-$targetcontent=preg_replace('/\*((\s|\n|\r|\t)*)\@var mixed Sample property 2((\s|\n|\r|\t)*)/', '', $targetcontent);
-
-// Substitute clean parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-	{
-		$varprop.="\t\tif (isset(\$this->".$prop['field'].")) {\n\t\t\t \$this->".$prop['field']." = trim(\$this->".$prop['field'].");\n\t\t}";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/if \(isset\(\$this->prop1\)\) {((\n|\r|\t)*)\$this->prop1 = trim\(\$this->prop1\);((\n|\r|\t)*)}/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/if \(isset\(\$this->prop2\)\) {((\n|\r|\t)*)\$this->prop2 = trim\(\$this->prop2\);((\n|\r|\t)*)}/', '', $targetcontent);
-
-
-$no_output_field=0;
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] == 'tms') $no_output_field++;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $no_output_field++;
-}
-// Substitute insert into parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	$i++;
-	$addfield=1;
-	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-
-	if ($addfield)
-	{
-		$varprop.="\t\t\$sql.= '".$prop['field'];
-		if ($i < (count($property)-$no_output_field)) $varprop.=",";
-		$varprop.="';";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$sql \.= \' field1,\';/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= \' field2\';/', '', $targetcontent);
-
-// Substitute insert values parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-//Count nb field to output to manage commat at end SQL instruction
-
-
-foreach($property as $key => $prop)
-{
-	
-	$addfield=1;
-	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-	
-	if ($addfield)
-	{
-		$i++;
-		
-		$varprop.="\t\t\$sql .= ' ";
-		if ($prop['field']=='datec')
-		{
-			$varprop.='\'."\'".$this->db->idate(dol_now())."\'"';
-		}
-		elseif ($prop['istime'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].')==0?\'NULL\':"\'".$this->db->idate(';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.=").\"'\")";
-		}
-		elseif ($prop['ischar'])
-		{
-			$varprop.="'.(! isset(\$this->".$prop['field'].")?'NULL':\"'\".";
-			$varprop.="\$this->db->escape(\$this->".$prop['field'].")";
-			$varprop.=".\"'\")";
-		}
-		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_m' ||  $prop['field']=='fk_user_author')
-		{
-			$varprop.="'.\$user->id";
-		}
-		elseif ($prop['isint'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.=')';
-		}
-		else
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':"\'".';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.='."\'")';
-		}
-		
-		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
-		$varprop.=';';
-		$varprop.="\n";
-	}
-}
-
-$patern1='/\$sql \.= \' (.*)\' \. \$this->prop1 \. \'(.*),\';/';
-$patern2='/\$sql \.= \' (.*)\' \. \$this->prop2 \. \'(.*)\';/';
-$targetcontent=preg_replace($patern1, $varprop, $targetcontent);
-$targetcontent=preg_replace($patern2, '', $targetcontent);
-
-// Substitute update values parameters
-
-//Count nb field to output to manage commat at end SQL instruction
-$no_output_field=0;
-foreach($property as $key => $prop)
-{
-	if ($prop['extra'] == 'auto_increment') $no_output_field++;
-}
-
-$varprop="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	
-	$addfield=1;
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-	
-	if ($addfield)
-	{
-		$i++;
-		
-		$varprop.="\t\t\$sql .= ' ";
-		$varprop.=$prop['field'].' = ';
-		if ($prop['field']=='tms') {
-			$varprop.='\'.(dol_strlen($this->'.$prop['field'].') != 0 ? "\'".$this->db->idate(';
-			$varprop.='$this->'.$prop['field'];
-			$varprop.=')."\'" : "\'".$this->db->idate(dol_now())."\'")';
-		}
-		elseif ($prop['istime'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].') != 0 ? "\'".$this->db->idate(';
-			$varprop.='$this->'.$prop['field'];
-			$varprop.=')."\'" : \'null\')';
-		}
-		
-		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_m') {
-			$varprop.="'.\$user->id";
-		}
-		else
-		{
-			$varprop.="'.";
-			if ($prop['ischar']) $varprop.='(isset($this->'.$prop['field'].')?"\'".$this->db->escape($this->'.$prop['field'].')."\'":"null")';
-			elseif ($prop['isint']) $varprop.='(isset($this->'.$prop['field'].')?$this->'.$prop['field'].':"null")';
-			else $varprop.='(isset($this->'.$prop['field'].')?$this->'.$prop['field'].':"null")';
-		}
-
-		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
-		$varprop.=';';
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$sql \.= " field1=".\(isset\(\$this->field1\)\?"\'".\$this->db->escape\(\$this->field1\)."\'":"null"\).",";/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= " field2=".\(isset\(\$this->field2\)\?"\'".\$this->db->escape\(\$this->field2\)."\'":"null"\)."";/', '', $targetcontent);
-
-// Substitute fetch/select parameters
-$targetcontent=preg_replace('/\$sql \.= \' t\.field1,\';/', $varpropselect, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= \' t\.field2\';/', '', $targetcontent);
-
-// Substitute select set parameters
-$varprop="\n";
-$varpropline="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	$i++;
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\t\t\t\t\$this->".$prop['field']." = ";
-		if ($prop['istime']) $varprop.='$this->db->jdate(';
-		$varprop.='$obj->'.$prop['field'];
-		if ($prop['istime']) $varprop.=')';
-		$varprop.=";";
-		$varprop.="\n";
-		
-		$varpropline.="\t\t\t\t\$line->".$prop['field']." = ";
-		if ($prop['istime']) $varpropline.='$this->db->jdate(';
-		$varpropline.='$obj->'.$prop['field'];
-		if ($prop['istime']) $varpropline.=')';
-		$varpropline.=";";
-		$varpropline.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$this->prop1 = \$obj->field1;/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$this->prop2 = \$obj->field2;/', '', $targetcontent);
-
-//Substirute fetchAll
-$targetcontent=preg_replace('/\$line->prop1 = \$obj->field1;/', $varpropline, $targetcontent);
-$targetcontent=preg_replace('/\$line->prop2 = \$obj->field2;/', '', $targetcontent);
-
-
-// Substitute initasspecimen parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\t\t\$this->".$prop['field']." = '';";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$this->prop1 = \'prop1\';/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$this->prop2 = \'prop2\';/', '', $targetcontent);
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "\n";
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-
-
-//--------------------------------------------------------------------
-// Build skeleton_script.php, skeleton_list.php and skeleton_card.php
-//--------------------------------------------------------------------
-
-$skeletonfiles=array(
-    $path.'skeleton_script.php' => $classmin.'_script.php', 
-    $path.'skeleton_list.php' => $classmin.'_list.php', 
-    $path.'skeleton_card.php' => $classmin.'_card.php'
-    );
-    
-foreach ($skeletonfiles as $skeletonfile => $outfile)
-{
-    $sourcecontent=file_get_contents($skeletonfile);
-    if (! $sourcecontent)
-    {
-    	print "\n";
-    	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-    	print "Try to run script from skeletons directory.\n";
-    	exit;
-    }
-    
-    // Define output variables
-    $targetcontent=$sourcecontent;
-    
-    // Substitute module name
-    $targetcontent=preg_replace('/dev\/skeletons/', $module, $targetcontent);
-    $targetcontent=preg_replace('/mymodule othermodule1 othermodule2/', $module, $targetcontent);
-    $targetcontent=preg_replace('/mymodule/', $module, $targetcontent);
-    
-    // Substitute class name
-    $targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
-    $targetcontent=preg_replace('/skeleton_script\.php/', $classmin.'_script.php', $targetcontent);
-    $targetcontent=preg_replace('/\$element = \'skeleton\'/', '\$element=\''.$classmin.'\'', $targetcontent);
-    $targetcontent=preg_replace('/\$table_element = \'skeleton\'/', '\$table_element=\''.$classmin.'\'', $targetcontent);
-    $targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
-    $targetcontent=preg_replace('/skeletons/', $classmin, $targetcontent);
-    $targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-    
-    // Substitute comments
-    $targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
-    $targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
-    $targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
-    
-    // Substitute table name
-    $targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
-        
-    // Substitute GETPOST search_fieldx
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    if ($prop['isint']) $varprop.='$search_'.$prop['field']."=GETPOST('search_".$prop['field']."','int');\n";
-    	    else $varprop.='$search_'.$prop['field']."=GETPOST('search_".$prop['field']."','alpha');\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$search_field1=GETPOST("search_field1");','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$search_field2=GETPOST("search_field2");','/').'/', '', $targetcontent);
-    
-    // Substitute GETPOST fieldx
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    if ($prop['isint']) $varprop.="\t\$object->".$prop['field']."=GETPOST('".$prop['field']."','int');\n";
-    	    else $varprop.="\t\$object->".$prop['field']."=GETPOST('".$prop['field']."','alpha');\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$object->prop1=GETPOST("field1");','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$object->prop2=GETPOST("field2");','/').'/', '', $targetcontent);
-    
-    // Substitute reset search_field = '';
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.='$search_'.$prop['field']."='';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$search_field1=\'\';','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$search_field2=\'\';','/').'/', '', $targetcontent);
-    
-    // Substitute fetch/select parameters
-    $targetcontent=preg_replace('/\$sql\s*\.= " t\.field1,";/', $varpropselect, $targetcontent);
-    $targetcontent=preg_replace('/\$sql\s*\.= " t\.field2";/', '', $targetcontent);
-    
-    // Substitute where for search
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.='if ($search_'.$prop['field'].') $sql.= natural_search("'.$prop['field'].'",$search_'.$prop['field'].');'."\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('if ($search_field1) $sql.= natural_search("field1",$search_field1);','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('if ($search_field2) $sql.= natural_search("field2",$search_field2);','/').'/', '', $targetcontent);
-    
-    // substitute $params.=
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (\$search_".$prop['field']." != '') \$params.= '&amp;search_".$prop['field']."='.urlencode(\$search_".$prop['field'].");\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("if (\$search_field1 != '') \$params.= '&amp;search_field1='.urlencode(\$search_field1);",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("if (\$search_field2 != '') \$params.= '&amp;search_field2='.urlencode(\$search_field2);",'/').'/', '', $targetcontent);
-    
-    // Substitute arrayfields
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="'t.".$prop['field']."'=>array('label'=>\$langs->trans(\"Field".$prop['field']."\"), 'checked'=>1),\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("'t.field1'=>array('label'=>\$langs->trans(\"Field1\"), 'checked'=>1),",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("'t.field2'=>array('label'=>\$langs->trans(\"Field2\"), 'checked'=>1),",'/').'/', '', $targetcontent);
-    
-    // Substitute print_liste_field_titre
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print_liste_field_titre(\$arrayfields['t.".$prop['field']."']['label'],\$_SERVER['PHP_SELF'],'t.".$prop['field']."','',\$params,'',\$sortfield,\$sortorder);\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_TITLE_FIELDS/', $varprop, $targetcontent);
-    
-    // Substitute fields title search
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td class=\"liste_titre\"><input type=\"text\" class=\"flat\" name=\"search_".$prop['field']."\" value=\"'.\$search_".$prop['field'].".'\" size=\"10\"></td>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_TITLE_SEARCH/', $varprop, $targetcontent);
-    
-    // Substitute where for <td>.fieldx.</td>
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td>'.\$obj->".$prop['field'].".'</td>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field1']['checked'])) print '<td>'.\$obj->field1.'</td>';",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field2']['checked'])) print '<td>'.\$obj->field2.'</td>';",'/').'/', '', $targetcontent);
-
-    // LIST_OF_TD_LABEL_FIELDS_CREATE - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td><input class=\"flat\" type=\"text\" name=\"".$prop['field']."\" value=\"'.GETPOST('".$prop['field']."').'\"></td></tr>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_CREATE/', $varprop, $targetcontent);
-
-    // LIST_OF_TD_LABEL_FIELDS_EDIT - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-            $baseString = 'print "<tr><td class=\"fieldrequired\">".\$langs->trans("Field%s")."</td><td><input class=\"flat\" type=\"text\" name=\"%s\" value=\"".$object->%s."\"></td></tr>";';
-            $varprop.= sprintf("\t ".$baseString." \n", $prop['field'], $prop['field'], $prop['field']);
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_EDIT/', $varprop, $targetcontent);
-    
-    // LIST_OF_TD_LABEL_FIELDS_VIEW - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.=sprintf("\t print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field%s\").'</td><td>'.\$object->%s.'</td></tr>';\n",$prop['field'],$prop['field']);
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_VIEW/', $varprop, $targetcontent);
-    
-    
-    // LIST_OF_TD_FIELDS_LIST
-    
-    
-    
-    // Build file
-    $fp=fopen($outfile,"w");
-    if ($fp)
-    {
-    	fputs($fp, $targetcontent);
-    	fclose($fp);
-    	print "File '".$outfile."' has been built in current directory.\n";
-    }
-    else $error++;
-}
-
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You can now move generated files to store them into directory /yourmodule/class (for .class.php file) or /yourmodule.\n";
-return $error;
diff --git a/dev/skeletons/build_webservice_from_class.php b/dev/skeletons/build_webservice_from_class.php
deleted file mode 100755
index c91347a424d..00000000000
--- a/dev/skeletons/build_webservice_from_class.php
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_webservice_from_class.php
- *  \ingroup    core
- *  \brief      Create a complete webservice file from CRUD functions of a PHP class
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='1.8';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-// Check parameters
-if (! isset($argv[1]) && ! isset($argv[2]))
-{
-    print "Usage: $script_file phpClassFile phpClassName\n";
-    exit;
-}
-
-// Show parameters
-print 'Classfile='.$argv[1]."\n";
-print 'Classname='.$argv[2]."\n";
-
-$classfile=$argv[1];
-$classname=$argv[2];
-$classmin=strtolower($classname);
-$property=array();
-$targetcontent='';
-
-// Load the class and read properties
-require_once($classfile);
-
-$property=array();
-$class = new $classname($db);
-$values=get_class_vars($classname);
-
-unset($values['db']);
-unset($values['error']);
-unset($values['errors']);
-unset($values['element']);
-unset($values['table_element']);
-unset($values['table_element_line']);
-unset($values['fk_element']);
-unset($values['ismultientitymanaged']);
-
-$properties=array_keys($values);
-
-// Read skeleton_class.class.php file
-$skeletonfile='skeleton_webservice_server.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile='out.server_'.$classmin.'.php';
-$targetcontent=$sourcecontent;
-
-
-
-// Substitute class name
-$targetcontent=preg_replace('/Skeleton/', $classname, $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-
-// Substitute declaration parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-		$varprop.="'".$properties[$i]."' => array('name'=>'".$properties[$i]."','type'=>'xsd:string')";
-		$i++;
-
-		if ($i == count($properties))
-			$varprop.="\n";
-		else
-			$varprop.=",\n";
-}
-
-$targetcontent=preg_replace('/\'prop1\'=>\'xxx\',/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\'prop2\'=>\'xxx\',/', '', $targetcontent);
-// Substitute get method parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-		$varprop.="'".$properties[$i]."' => $".$classmin."->".$properties[$i];
-
-		$i++;
-		if ($i == count($properties))
-			$varprop.="\n";
-		else
-			$varprop.=",\n";
-}
-
-$targetcontent=preg_replace('/\'prop1\'=>\$'.$classmin.'->prop1,/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\'prop2\'=>\$'.$classmin.'->prop2,/', '', $targetcontent);
-
-// Substitute get method parameters
-$varprop="\n\t\t";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-
-	$varprop.='$newobject->'.$properties[$i].'=$'.$classmin.'->'.$properties[$i].';';
-
-	$i++;
-	if ($i == count($properties))
-		$varprop.="\n";
-	else
-		$varprop.="\n\t\t";
-}
-$targetcontent=preg_replace('/\$newobject->prop1=\$'.$classmin.'->prop1;/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$newobject->prop2=\$'.$classmin.'->prop2;/', '', $targetcontent);
-
-
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You must rename files by removing the 'out.' prefix in their name.\n";
-return $error;
diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
deleted file mode 100644
index 4f994c7c654..00000000000
--- a/dev/skeletons/modMyModule.class.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * 	\defgroup   mymodule     Module MyModule
- *  \brief      Example of a module descriptor.
- *				Such a file must be copied into htdocs/mymodule/core/modules directory.
- *  \file       htdocs/mymodule/core/modules/modMyModule.class.php
- *  \ingroup    mymodule
- *  \brief      Description and activation file for module MyModule
- */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
-
-
-/**
- *  Description and activation class for module MyModule
- */
-class modMyModule extends DolibarrModules
-{
-	/**
-	 * Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 * @param DoliDB $db Database handler
-	 */
-	public function __construct($db)
-	{
-        global $langs,$conf;
-
-        $this->db = $db;
-
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 500000;		// TODO Go on page http://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'mymodule';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','interface','other'
-		// It is used to group modules by family in module setup page
-		$this->family = "other";
-		// Module position in the family
-		$this->module_position = 500;
-		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
-		//$this->familyinfo = array('myownfamily' => array('position' => '001', 'label' => $langs->trans("MyOwnFamily")));
-
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Description of module MyModule";
-		$this->descriptionlong = "A very long description. Can be a full HTML content";
-		$this->editor_name = 'Editor name';
-		$this->editor_url = 'https://www.dolibarr.org';
-		
-		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = '1.0';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Name of image file used for this module.
-		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='generic';
-
-		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-		// for default path (eg: /mymodule/core/xxxxx) (0=disable, 1=enable)
-		// for specific path of parts (eg: /mymodule/core/modules/barcode)
-		// for specific css file (eg: /mymodule/css/mymodule.css.php)
-		//$this->module_parts = array(
-		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
-		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
-		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
-		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
-		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
-		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
-		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
-		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
-		//							'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
-	 	//							'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
-		//							'hooks' => array('hookcontext1','hookcontext2',...) // Set here all hooks context managed by module. You can also set hook context 'all'
-		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
-		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@mymodule')) // Set here all workflow context managed by module
-		//                        );
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/mymodule/temp");
-		$this->dirs = array();
-
-		// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
-		$this->config_page_url = array("mysetuppage.php@mymodule");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("mylangfile@mymodule");
-
-		// Constants
-		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array();
-
-		// Array to add new pages in new tabs
-		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-		// where objecttype can be
-		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-		// 'contact'          to add a tab in contact view
-		// 'contract'         to add a tab in contract view
-		// 'group'            to add a tab in group view
-		// 'intervention'     to add a tab in intervention view
-		// 'invoice'          to add a tab in customer invoice view
-		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
-		// 'opensurveypoll'	  to add a tab in opensurvey poll view
-		// 'order'            to add a tab in customer order view
-		// 'order_supplier'   to add a tab in supplier order view
-		// 'payment'		  to add a tab in payment view
-		// 'payment_supplier' to add a tab in supplier payment view
-		// 'product'          to add a tab in product view
-		// 'propal'           to add a tab in propal view
-		// 'project'          to add a tab in project view
-		// 'stock'            to add a tab in stock view
-		// 'thirdparty'       to add a tab in third party view
-		// 'user'             to add a tab in user view
-        $this->tabs = array();
-
-		if (! isset($conf->mymodule) || ! isset($conf->mymodule->enabled))
-        {
-        	$conf->mymodule=new stdClass();
-        	$conf->mymodule->enabled=0;
-        }
-        
-        // Dictionaries
-		$this->dictionaries=array();
-        /* Example:
-        $this->dictionaries=array(
-            'langs'=>'mylangfile@mymodule',
-            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->mymodule->enabled,$conf->mymodule->enabled,$conf->mymodule->enabled)												// Condition to show each dictionary
-        );
-        */
-
-        // Boxes
-		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array();			// List of boxes
-		// Example:
-		//$this->boxes=array(
-		//    0=>array('file'=>'myboxa.php@mymodule','note'=>'','enabledbydefaulton'=>'Home'),
-		//    1=>array('file'=>'myboxb.php@mymodule','note'=>''),
-		//    2=>array('file'=>'myboxc.php@mymodule','note'=>'')
-		//);
-
-		// Cronjobs
-		$this->cronjobs = array();			// List of cron jobs entries to add
-		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true),
-		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true)
-		// );
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		// $this->rights[$r][1] = 'Permision label';	// Permission label
-		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $r++;
-
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
-
-		// Add here entries to declare new menus
-		//
-		// Example to declare a new Top Menu entry and its Left menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'top',			                // This is a Top menu entry
-		//							'titre'=>'MyModule top menu',
-		//							'mainmenu'=>'mymodule',
-		//							'leftmenu'=>'mymodule',
-		//							'url'=>'/mymodule/pagetop.php',
-		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->mymodule->enabled',	// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-		//
-		// Example to declare a Left Menu entry into an existing Top menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'left',			                // This is a Left menu entry
-		//							'titre'=>'MyModule left menu',
-		//							'mainmenu'=>'xxx',
-		//							'leftmenu'=>'mymodule',
-		//							'url'=>'/mymodule/pagelevel2.php',
-		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->mymodule->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-
-
-		// Exports
-		$r=1;
-
-		// Example:
-		// $this->export_code[$r]=$this->rights_class.'_'.$r;
-		// $this->export_label[$r]='MyModule';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
-        // $this->export_icon[$r]='generic:MyModule';					// Put here code of icon then string for translation key of module name
-		// $this->export_permission[$r]=array(array("mymodule","level1","level2"));
-		// $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef');
-		// $this->export_TypeFields_array[$r]=array('t.date'=>'Date', 't.qte'=>'Numeric', 't.poids'=>'Numeric', 't.fad'=>'Numeric', 't.paq'=>'Numeric', 't.stockage'=>'Numeric', 't.fadparliv'=>'Numeric', 't.livau100'=>'Numeric', 't.forfait'=>'Numeric', 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text');
-		// $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product');
-		// $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		// $this->export_sql_start[$r]='SELECT DISTINCT ';
-		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
-		// $r++;
-	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	public function init($options='')
-	{
-		$sql = array();
-
-		//$this->_load_tables('/mymodule/sql/');
-
-		return $this->_init($sql, $options);
-	}
-
-	/**
-	 * Function called when module is disabled.
-	 * Remove from database constants, boxes and permissions from Dolibarr database.
-	 * Data directories are not deleted
-	 *
-	 * @param      string	$options    Options when enabling module ('', 'noboxes')
-	 * @return     int             	1 if OK, 0 if KO
-	 */
-	public function remove($options = '')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
-
-}
-
diff --git a/dev/skeletons/skeleton_api_class.class.php b/dev/skeletons/skeleton_api_class.class.php
deleted file mode 100644
index a40b00af72c..00000000000
--- a/dev/skeletons/skeleton_api_class.class.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
- use Luracast\Restler\RestException;
-
-
-/**
- * API class for skeleton object
- *
- * @smart-auto-routing false
- * @access protected 
- * @class  DolibarrApiAccess {@requires user,external}
- * 
- *
- */
-class SkeletonApi extends DolibarrApi
-{
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
-     */
-    static $FIELDS = array(
-        'name'
-    );
-
-    /**
-     * @var Skeleton $skeleton {@type Skeleton}
-     */
-    public $skeleton;
-
-    /**
-     * Constructor
-     *
-     * @url     GET skeleton/
-     * 
-     */
-    function __construct()
-    {
-		global $db, $conf;
-		$this->db = $db;
-        $this->skeleton = new Skeleton($this->db);
-    }
-
-    /**
-     * Get properties of a skeleton object
-     *
-     * Return an array with skeleton informations
-     *
-     * @param 	int 	$id ID of skeleton
-     * @return 	array|mixed data without useless information
-	 * 
-     * @url	GET skeleton/{id}
-     * @throws 	RestException
-     */
-    function get($id)
-    {		
-		if(! DolibarrApiAccess::$user->rights->skeleton->read) {
-			throw new RestException(401);
-		}
-			
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		return $this->_cleanObjectDatas($this->skeleton);
-    }
-
-    /**
-     * List skeletons
-     * 
-     * Get a list of skeletons
-     * 
-     * @param int		$mode		Use this param to filter list
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') or (t.import_key:=:'20160101')"
-     * @return array Array of skeleton objects
-     *
-     * @url	GET /skeletons/
-     */
-    function index($mode, $sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '') {
-        global $db, $conf;
-        
-        $obj_ret = array();
-        
-        $socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
-            
-        // If the internal user must only see his customers, force searching by him
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-
-        $sql = "SELECT s.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."skeleton as s";
-        
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-        $sql.= " WHERE s.fk_stcomm = st.id";
-        
-		// Example of use $mode
-        //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
-        //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
-
-        $sql.= ' AND s.entity IN ('.getEntity('skeleton', 1).')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
-        if ($socid) $sql.= " AND s.fk_soc = ".$socid;
-        if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        if ($sqlfilters)
-        {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql.= $db->plimit($limit + 1, $offset);
-        }
-
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($result);
-                $skeleton_static = new Skeleton($db);
-                if($skeleton_static->fetch($obj->rowid)) {
-                    $obj_ret[] = parent::_cleanObjectDatas($skeleton_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve skeleton list');
-        }
-        if( ! count($obj_ret)) {
-            throw new RestException(404, 'No skeleton found');
-        }
-		return $obj_ret;
-    }
-    
-    /**
-     * Create skeleton object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of skeleton
-     * 
-     * @url	POST skeleton/
-     */
-    function post($request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->create) {
-			throw new RestException(401);
-		}
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-        
-        foreach($request_data as $field => $value) {
-            $this->skeleton->$field = $value;
-        }
-        if( ! $this->skeleton->create(DolibarrApiAccess::$user)) {
-            throw new RestException(500);
-        }
-        return $this->skeleton->id;
-    }
-
-    /**
-     * Update skeleton
-     *
-     * @param int   $id             Id of skeleton to update
-     * @param array $request_data   Datas   
-     * @return int 
-     * 
-     * @url	PUT skeleton/{id}
-     */
-    function put($id, $request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->create) {
-			throw new RestException(401);
-		}
-        
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-        foreach($request_data as $field => $value) {
-            $this->skeleton->$field = $value;
-        }
-        
-        if($this->skeleton->update($id, DolibarrApiAccess::$user))
-            return $this->get ($id);
-        
-        return false;
-    }
-    
-    /**
-     * Delete skeleton
-     *
-     * @param   int     $id   Skeleton ID
-     * @return  array
-     * 
-     * @url	DELETE skeleton/{id}
-     */
-    function delete($id)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->supprimer) {
-			throw new RestException(401);
-		}
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-        
-        if( !$this->skeleton->delete($id))
-        {
-            throw new RestException(500);
-        }
-        
-         return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Skeleton deleted'
-            )
-        );
-        
-    }
-    
-    /**
-     * Validate fields before create or update object
-     * 
-     * @param array $data   Data to validate
-     * @return array
-     * 
-     * @throws RestException
-     */
-    function _validate($data)
-    {
-        $skeleton = array();
-        foreach (SkeletonApi::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $skeleton[$field] = $data[$field];
-        }
-        return $skeleton;
-    }
-}
diff --git a/dev/skeletons/skeleton_card.php b/dev/skeletons/skeleton_card.php
deleted file mode 100644
index f0a9dd23c26..00000000000
--- a/dev/skeletons/skeleton_card.php
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *   	\file       dev/skeletons/skeleton_card.php
- *		\ingroup    mymodule othermodule1 othermodule2
- *		\brief      This file is an example of a php page
- *					Put here some comments
- */
-
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-
-// Change this following line to use the correct relative path (../, ../../, etc)
-$res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
-if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
-if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
-if (! $res) die("Include of main fails");
-// Change this following line to use the correct relative path from htdocs
-include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
-dol_include_once('/mymodule/class/skeleton_class.class.php');
-
-// Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
-
-// Get parameters
-$id			= GETPOST('id','int');
-$action		= GETPOST('action','alpha');
-$cancel     = GETPOST('cancel');
-$backtopage = GETPOST('backtopage');
-$myparam	= GETPOST('myparam','alpha');
-
-$search_field1=GETPOST("search_field1");
-$search_field2=GETPOST("search_field2");
-
-if (empty($action) && empty($id) && empty($ref)) $action='view';
-
-// Protection if external user
-if ($user->societe_id > 0)
-{
-	//accessforbidden();
-}
-//$result = restrictedArea($user, 'mymodule', $id);
-
-
-$object = new Skeleton_Class($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-
-// Load object
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-
-// Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('skeleton'));
-
-
-
-/*******************************************************************
-* ACTIONS
-*
-* Put here all code to do according to value of "action" parameter
-********************************************************************/
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
-	if ($cancel) 
-	{
-		if ($action != 'addlink')
-		{
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-			header("Location: ".$urltogo);
-			exit;
-		}		
-		if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
-		$action='';
-	}
-	
-	// Action to add record
-	if ($action == 'add')
-	{
-		if (GETPOST('cancel'))
-		{
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-			header("Location: ".$urltogo);
-			exit;
-		}
-
-		$error=0;
-
-		/* object_prop_getpost_prop */
-		$object->prop1=GETPOST("field1");
-		$object->prop2=GETPOST("field2");
-
-		if (empty($object->ref))
-		{
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
-		}
-
-		if (! $error)
-		{
-			$result=$object->create($user);
-			if ($result > 0)
-			{
-				// Creation OK
-				$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-				header("Location: ".$urltogo);
-				exit;
-			}
-			{
-				// Creation KO
-				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-				else  setEventMessages($object->error, null, 'errors');
-				$action='create';
-			}
-		}
-		else
-		{
-			$action='create';
-		}
-	}
-
-	// Action to update record
-	if ($action == 'update')
-	{
-		$error=0;
-
-		$object->prop1=GETPOST("field1");
-		$object->prop2=GETPOST("field2");
-
-		if (empty($object->ref))
-		{
-			$error++;
-			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
-		}
-
-		if (! $error)
-		{
-			$result=$object->update($user);
-			if ($result > 0)
-			{
-				$action='view';
-			}
-			else
-			{
-				// Creation KO
-				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-				else setEventMessages($object->error, null, 'errors');
-				$action='edit';
-			}
-		}
-		else
-		{
-			$action='edit';
-		}
-	}
-
-	// Action to delete
-	if ($action == 'confirm_delete')
-	{
-		$result=$object->delete($user);
-		if ($result > 0)
-		{
-			// Delete OK
-			setEventMessages("RecordDeleted", null, 'mesgs');
-			header("Location: ".dol_buildpath('/mymodule/list.php',1));
-			exit;
-		}
-		else
-		{
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else setEventMessages($object->error, null, 'errors');
-		}
-	}
-}
-
-
-
-
-/***************************************************
-* VIEW
-*
-* Put here all code to build page
-****************************************************/
-
-llxHeader('','MyPageName','');
-
-$form=new Form($db);
-
-
-// Put here content of your page
-
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
-
-// Part to create
-if ($action == 'create')
-{
-	print load_fiche_titre($langs->trans("NewMyModule"));
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-
-	dol_fiche_head();
-
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_CREATE
-	print '</table>'."\n";
-
-	dol_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
-
-	print '</form>';
-}
-
-
-
-// Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
-	print load_fiche_titre($langs->trans("MyModule"));
-    
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	
-	dol_fiche_head();
-
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_EDIT
-	print '</table>';
-	
-	dol_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
-
-	print '</form>';
-}
-
-
-
-// Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
-    $res = $object->fetch_optionals($object->id, $extralabels);
-
-	$head = commande_prepare_head($object);
-	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), 0, 'order');
-		
-	print load_fiche_titre($langs->trans("MyModule"));
-    
-	dol_fiche_head();
-
-	if ($action == 'delete') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
-		print $formconfirm;
-	}
-	
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_VIEW
-	print '</table>';
-	
-	dol_fiche_end();
-
-
-	// Buttons
-	print '<div class="tabsAction">'."\n";
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-	if (empty($reshook))
-	{
-		if ($user->rights->mymodule->write)
-		{
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-		}
-
-		if ($user->rights->mymodule->delete)
-		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-		}
-	}
-	print '</div>'."\n";
-
-
-	// Example 2 : Adding links to objects
-	// Show links to link elements
-	//$linktoelem = $form->showLinkToObjectBlock($object, null, array('skeleton'));
-	//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-
-}
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php
deleted file mode 100644
index 01b48c35f75..00000000000
--- a/dev/skeletons/skeleton_class.class.php
+++ /dev/null
@@ -1,593 +0,0 @@
-<?php
-/* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
- * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    dev/skeletons/skeleton_class.class.php
- * \ingroup mymodule othermodule1 othermodule2
- * \brief   This file is an example for a CRUD class file (Create/Read/Update/Delete)
- *          Put some comments here
- */
-
-// Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-
-/**
- * Class Skeleton_Class
- *
- * Put here description of your class
- *
- * @see CommonObject
- */
-class Skeleton_Class extends CommonObject
-{
-	/**
-	 * @var string Id to identify managed objects
-	 */
-	public $element = 'skeleton';
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'skeleton';
-
-	/**
-	 * @var Skeleton_ClassLine[] Lines
-	 */
-	public $lines = array();
-
-	/**
-	 * @var mixed Sample property 1
-	 */
-	public $prop1;
-	/**
-	 * @var mixed Sample property 2
-	 */
-	public $prop2;
-	//...
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		// Clean parameters
-		if (isset($this->prop1)) {
-			$this->prop1 = trim($this->prop1);
-		}
-		if (isset($this->prop2)) {
-			$this->prop2 = trim($this->prop2);
-		}
-		//...
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
-		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
-		$sql .= ' field1,';
-		$sql .= ' field2';
-		//...
-		$sql .= ') VALUES (';
-		$sql .= ' \'' . $this->prop1 . '\',';
-		$sql .= ' \'' . $this->prop2 . '\'';
-		//...
-		$sql .= ')';
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action to call a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-				//if ($result < 0) $error++;
-				//// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return $this->id;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id  Id object
-	 * @param string $ref Ref
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id, $ref = null)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-		$sql .= ' t.field1,';
-		$sql .= ' t.field2';
-		//...
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		$sql.= ' WHERE 1 = 1';
-		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("skeleton", 1) . ")";
-		}
-		if (null !== $ref) {
-			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
-		} else {
-			$sql .= ' AND t.rowid = ' . $id;
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$numrows = $this->db->num_rows($resql);
-			if ($numrows) {
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id = $obj->rowid;
-				$this->prop1 = $obj->field1;
-				$this->prop2 = $obj->field2;
-				//...
-			}
-			
-			// Retrieve all extrafields for invoice
-			// fetch optionals attributes and labels
-			/*
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields=new ExtraFields($this->db);
-			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-			$this->fetch_optionals($this->id,$extralabels);
-            */
-			
-			// $this->fetch_lines();
-			
-			$this->db->free($resql);
-
-			if ($numrows) {
-				return 1;
-			} else {
-				return 0;
-			}
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-		$sql .= ' t.field1,';
-		$sql .= ' t.field2';
-		//...
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
-			}
-		}
-		$sql.= ' WHERE 1 = 1';
-		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("skeleton", 1) . ")";
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
-		}
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
-		}
-		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new self($this->db);
-
-				$line->id = $obj->rowid;
-				$line->prop1 = $obj->field1;
-				$line->prop2 = $obj->field2;
-				//...
-			}
-			$this->db->free($resql);
-
-			return $num;
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		$error = 0;
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		// Clean parameters
-		if (isset($this->prop1)) {
-			$this->prop1 = trim($this->prop1);
-		}
-		if (isset($this->prop2)) {
-			$this->prop2 = trim($this->prop2);
-		}
-		//...
-
-		// Check parameters
-		// Put here code to add a control on parameters values
-
-		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-		$sql .= " field1=".(isset($this->field1)?"'".$this->db->escape($this->field1)."'":"null").",";
-        $sql .= " field2=".(isset($this->field2)?"'".$this->db->escape($this->field2)."'":"null")."";
-		//...
-		$sql .= ' WHERE rowid=' . $this->id;
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error && !$notrigger) {
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action calls a trigger.
-
-			//// Call triggers
-			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-			//// End call triggers
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		$this->db->begin();
-
-		if (!$error) {
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action calls a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-				//// End call triggers
-			}
-		}
-
-		// If you need to delete child tables to, you can insert them here
-		
-		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE rowid=' . $this->id;
-
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Load an object from its id and create a new one in database
-	 *
-	 * @param int $fromid Id of object to clone
-	 *
-	 * @return int New id of clone
-	 */
-	public function createFromClone($fromid)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		global $user;
-		$error = 0;
-		$object = new Skeleton_Class($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetch($fromid);
-		// Reset object
-		$object->id = 0;
-
-		// Clear fields
-		// ...
-
-		// Create clone
-		$result = $object->create($user);
-
-		// Other options
-		if ($result < 0) {
-			$error ++;
-			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		// End
-		if (!$error) {
-			$this->db->commit();
-
-			return $object->id;
-		} else {
-			$this->db->rollback();
-
-			return - 1;
-		}
-	}
-
-	/**
-	 *  Return a link to the object card (with optionaly the picto)
-	 *
-	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *	@param	string	$option				On what the link point to
-     *  @param	int  	$notooltip			1=Disable tooltip
-     *  @param	int		$maxlen				Max length of visible user name
-     *  @param  string  $morecss            Add more css on link
-	 *	@return	string						String with URL
-	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
-	{
-		global $db, $conf, $langs;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
-
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
-        $result = '';
-        $companylink = '';
-
-        $label = '<u>' . $langs->trans("MyModule") . '</u>';
-        $label.= '<br>';
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-
-        $url = DOL_URL_ROOT.'/mymodule/'.$this->table_name.'_card.php?id='.$this->id;
-        
-        $linkclose='';
-        if (empty($notooltip))
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label=$langs->trans("ShowProject");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
-        }
-        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
-        
-		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
-
-        if ($withpicto)
-        {
-            $result.=($linkstart.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result.=' ';
-		}
-		$result.= $linkstart . $this->ref . $linkend;
-		return $result;
-	}
-
-	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
-	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return	string 			       Label of status
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
-
-	/**
-	 *  Return the status
-	 *
-	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
-	 *  @return string 			       	Label of status
-	 */
-	static function LibStatut($status,$mode=0)
-	{
-		global $langs;
-
-		if ($mode == 0)
-		{
-			$prefix='';
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		if ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-		if ($mode == 6)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-	}
-
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->id = 0;
-		$this->prop1 = 'prop1';
-		$this->prop2 = 'prop2';
-	}
-
-}
-
-/**
- * Class Skeleton_ClassLine
- */
-class Skeleton_ClassLine
-{
-	/**
-	 * @var int ID
-	 */
-	public $id;
-	/**
-	 * @var mixed Sample line property 1
-	 */
-	public $prop1;
-	/**
-	 * @var mixed Sample line property 2
-	 */
-	public $prop2;
-}
diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php
deleted file mode 100644
index ca66990a9f7..00000000000
--- a/dev/skeletons/skeleton_list.php
+++ /dev/null
@@ -1,569 +0,0 @@
-<?php
-/* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2016 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2016      Jean-François Ferry	<jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *   	\file       dev/skeletons/skeleton_list.php
- *		\ingroup    mymodule othermodule1 othermodule2
- *		\brief      This file is an example of a php page
- *					Put here some comments
- */
-
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-
-// Change this following line to use the correct relative path (../, ../../, etc)
-$res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
-if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
-if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
-if (! $res) die("Include of main fails");
-// Change this following line to use the correct relative path from htdocs
-require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-dol_include_once('/mymodule/class/skeleton_class.class.php');
-
-// Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
-
-$action=GETPOST('action','alpha');
-$massaction=GETPOST('massaction','alpha');
-$show_files=GETPOST('show_files','int');
-$confirm=GETPOST('confirm','alpha');
-$toselect = GETPOST('toselect', 'array');
-
-$id			= GETPOST('id','int');
-$backtopage = GETPOST('backtopage');
-$myparam	= GETPOST('myparam','alpha');
-
-$search_all=trim(GETPOST("sall"));
-$search_field1=GETPOST("search_field1");
-$search_field2=GETPOST("search_field2");
-$search_myfield=GETPOST('search_myfield');
-$optioncss = GETPOST('optioncss','alpha');
-
-// Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortfield) $sortfield="t.rowid"; // Set here default search field
-if (! $sortorder) $sortorder="ASC";
-
-// Protection if external user
-$socid=0;
-if ($user->societe_id > 0)
-{
-    $socid = $user->societe_id;
-	//accessforbidden();
-}
-
-// Initialize technical object to manage context to save list fields
-$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'mymodulelist';
-
-// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
-$hookmanager->initHooks(array('mymodulelist'));
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('mymodule');
-$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
-
-// List of fields to search into when doing a "search in all"
-$fieldstosearchall = array(
-    't.ref'=>'Ref',
-    't.note_public'=>'NotePublic',
-);
-if (empty($user->socid)) $fieldstosearchall["t.note_private"]="NotePrivate";
-
-// Definition of fields for list
-$arrayfields=array(
-    't.field1'=>array('label'=>$langs->trans("Field1"), 'checked'=>1),
-    't.field2'=>array('label'=>$langs->trans("Field2"), 'checked'=>1),
-    //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
-    't.datec'=>array('label'=>$langs->trans("DateCreationShort"), 'checked'=>0, 'position'=>500),
-    't.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-    //'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-    foreach($extrafields->attribute_label as $key => $val)
-    {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
-    }
-}
-
-
-// Load object if id or ref is provided as parameter
-$object=new Skeleton_Class($db);
-if (($id > 0 || ! empty($ref)) && $action != 'add')
-{
-	$result=$object->fetch($id,$ref);
-	if ($result < 0) dol_print_error($db);
-}
-
-
-
-
-/*******************************************************************
-* ACTIONS
-*
-* Put here all code to do according to value of "action" parameter
-********************************************************************/
-
-if (GETPOST('cancel')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-    // Purge search criteria
-    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
-    {
-    	$search_field1='';
-    	$search_field2='';
-    	$search_date_creation='';
-    	$search_date_update='';
-        $toselect='';
-        $search_array_options=array();
-    }
-
-    // Mass actions
-    $objectclass='Skeleton';
-    $objectlabel='Skeleton';
-    $permtoread = $user->rights->skeleton->read;
-    $permtodelete = $user->rights->skeleton->delete;
-    $uploaddir = $conf->skeleton->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-}
-
-
-
-/***************************************************
-* VIEW
-*
-* Put here all code to build page
-****************************************************/
-
-$now=dol_now();
-
-$form=new Form($db);
-
-//$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
-$help_url='';
-$title = $langs->trans('MyModuleListTitle');
-
-// Put here content of your page
-
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
-
-$sql = "SELECT";
-$sql.= " t.rowid,";
-$sql.= " t.field1,";
-$sql.= " t.field2";
-// Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
-// Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mytable_extrafields as ef on (t.rowid = ef.fk_object)";
-$sql.= " WHERE 1 = 1";
-//$sql.= " WHERE u.entity IN (".getEntity('mytable',1).")";
-if ($search_field1) $sql.= natural_search("field1",$search_field1);
-if ($search_field2) $sql.= natural_search("field2",$search_field2);
-if ($sall)          $sql.= natural_search(array_keys($fieldstosearchall), $sall);
-// Add where from extra fields
-foreach ($search_array_options as $key => $val)
-{
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    $typ=$extrafields->attribute_type[$tmpkey];
-    $mode=0;
-    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
-    {
-        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
-    }
-}
-// Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.=$db->order($sortfield,$sortorder);
-//$sql.= $db->plimit($conf->liste_limit+1, $offset);
-
-// Count total nb of records
-$nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-}	
-
-$sql.= $db->plimit($limit+1, $offset);
-
-dol_syslog($script_file, LOG_DEBUG);
-$resql=$db->query($sql);
-if (! $resql)
-{
-    dol_print_error($db);
-    exit;
-}
-
-$num = $db->num_rows($resql);
-
-// Direct jump if only one record found
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
-{
-    $obj = $db->fetch_object($resql);
-    $id = $obj->rowid;
-    header("Location: ".DOL_URL_ROOT.'/skeleton/card.php?id='.$id);
-    exit;
-}
-
-llxHeader('', $title, $help_url);
-
-$arrayofselected=is_array($toselect)?$toselect:array();
-
-$param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($search_field1 != '') $param.= '&amp;search_field1='.urlencode($search_field1);
-if ($search_field2 != '') $param.= '&amp;search_field2='.urlencode($search_field2);
-if ($optioncss != '') $param.='&optioncss='.$optioncss;
-// Add $param from extra fields
-foreach ($search_array_options as $key => $val)
-{
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-} 
-
-$arrayofmassactions =  array(
-    'presend'=>$langs->trans("SendByMail"),
-    'builddoc'=>$langs->trans("PDFMerge"),
-);
-if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-if ($massaction == 'presend') $arrayofmassactions=array();
-$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-print '<input type="hidden" name="action" value="list">';
-print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
-
-if ($sall)
-{
-    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-    print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
-}
-
-$moreforfilter = '';
-$moreforfilter.='<div class="divsearchfield">';
-$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
-$moreforfilter.= '</div>';
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
-
-if (! empty($moreforfilter))
-{
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-    print '</div>';
-}
-
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-
-print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-
-// Fields title
-print '<tr class="liste_titre">';
-// LIST_OF_TD_TITLE_FIELDS
-//if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($arrayfields['t.field1']['label'],$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($arrayfields['t.field2']['label'],$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val) 
-   {
-       if (! empty($arrayfields["ef.".$key]['checked'])) 
-       {
-			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-print '</tr>'."\n";
-
-// Fields title search
-print '<tr class="liste_titre">';
-// LIST_OF_TD_TITLE_SEARCH
-//if (! empty($arrayfields['t.field1']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field1" value="'.$search_field1.'" size="10"></td>';
-//if (! empty($arrayfields['t.field2']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field2" value="'.$search_field2.'" size="10"></td>';
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-    foreach($extrafields->attribute_label as $key => $val) 
-    {
-        if (! empty($arrayfields["ef.".$key]['checked']))
-        {
-            $align=$extrafields->getAlignFlag($key);
-            $typeofextrafield=$extrafields->attribute_type[$key];
-            print '<td class="liste_titre'.($align?' '.$align:'').'">';
-        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
-			{
-			    $crit=$val;
-				$tmpkey=preg_replace('/search_options_/','',$key);
-				$searchclass='';
-				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
-			}
-            print '</td>';
-        }
-    }
-}
-// Fields from hook
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))
-{
-    // Date creation
-    print '<td class="liste_titre">';
-    print '</td>';
-}
-if (! empty($arrayfields['t.tms']['checked']))
-{
-    // Date modification
-    print '<td class="liste_titre">';
-    print '</td>';
-}
-/*if (! empty($arrayfields['u.statut']['checked']))
-{
-    // Status
-    print '<td class="liste_titre" align="center">';
-    print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
-    print '</td>';
-}*/
-// Action column
-print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-print $searchpitco;
-print '</td>';
-print '</tr>'."\n";
-    
-
-$i=0;
-$var=true;
-$totalarray=array();
-while ($i < min($num, $limit))
-{
-    $obj = $db->fetch_object($resql);
-    if ($obj)
-    {
-        $var = !$var;
-        
-        // Show here line of result
-        print '<tr '.$bc[$var].'>';
-        // LIST_OF_TD_FIELDS_LIST
-        /*
-        if (! empty($arrayfields['t.field1']['checked'])) 
-        {
-            print '<td>'.$obj->field1.'</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        if (! empty($arrayfields['t.field2']['checked'])) 
-        {
-            print '<td>'.$obj->field2.'</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }*/
-    	// Extra fields
-		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-		{
-		   foreach($extrafields->attribute_label as $key => $val) 
-		   {
-				if (! empty($arrayfields["ef.".$key]['checked'])) 
-				{
-					print '<td';
-					$align=$extrafields->getAlignFlag($key);
-					if ($align) print ' align="'.$align.'"';
-					print '>';
-					$tmpkey='options_'.$key;
-					print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
-					print '</td>';
-		            if (! $i) $totalarray['nbfield']++;
-				}
-		   }
-		}
-        // Fields from hook
-	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-    	// Date creation
-        if (! empty($arrayfields['t.datec']['checked']))
-        {
-            print '<td align="center">';
-            print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
-            print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        // Date modification
-        if (! empty($arrayfields['t.tms']['checked']))
-        {
-            print '<td align="center">';
-            print dol_print_date($db->jdate($obj->date_update), 'dayhour');
-            print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        // Status
-        /*
-        if (! empty($arrayfields['u.statut']['checked']))
-        {
-		  $userstatic->statut=$obj->statut;
-          print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
-        }*/
-
-        // Action column
-        print '<td class="nowrap" align="center">';
-	    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-        {
-	        $selected=0;
-			if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-        }
-	    print '</td>';
-        if (! $i) $totalarray['nbfield']++;
-
-        print '</tr>';
-    }
-    $i++;
-}
-
-// Show total line
-if (isset($totalarray['totalhtfield']))
-{
-    print '<tr class="liste_total">';
-    $i=0;
-    while ($i < $totalarray['nbfield'])
-    {
-        $i++;
-        if ($i == 1)
-        {
-            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-        }
-        elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
-        elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
-        elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
-        else print '<td></td>';
-    }
-    print '</tr>';
-}
-
-$db->free($resql);
-
-$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-
-print '</table>'."\n";
-print '</div>'."\n";
-
-print '</form>'."\n";
-
-
-if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-{
-    // Show list of available documents
-    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-    $urlsource.=str_replace('&amp;','&',$param);
-
-    $filedir=$diroutputmassaction;
-    $genallowed=$user->rights->facture->lire;
-    $delallowed=$user->rights->facture->lire;
-
-    print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-}
-else
-{
-    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-}
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/dev/skeletons/skeleton_script.php b/dev/skeletons/skeleton_script.php
deleted file mode 100644
index 5eb1565d4a3..00000000000
--- a/dev/skeletons/skeleton_script.php
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2007-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       dev/skeletons/skeleton_script.php
- *		\ingroup    mymodule
- *      \brief      This file is an example for a command line script
- *					Put here some comments
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
-}
-
-// Global variables
-$version='1.0';
-$error=0;
-
-
-// -------------------- START OF YOUR CODE HERE --------------------
-@set_time_limit(0);							// No timeout for this script
-define('EVEN_IF_ONLY_LOGIN_ALLOWED',1);		// Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
-
-// Include and load Dolibarr environment variables
-require_once($path."../../htdocs/master.inc.php");
-// After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file).
-// $user is created but empty.
-
-//$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
-
-// Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
-$user->getrights();
-
-
-print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-if (! isset($argv[1])) {	// Check parameters
-    print "Usage: ".$script_file." param1 param2 ...\n";
-	exit(-1);
-}
-print '--- start'."\n";
-print 'Argument 1='.$argv[1]."\n";
-print 'Argument 2='.$argv[2]."\n";
-
-
-// Start of transaction
-$db->begin();
-
-
-// Examples for manipulating class skeleton_class
-require_once(DOL_DOCUMENT_ROOT."/../dev/skeletons/skeleton_class.class.php");
-$myobject=new Skeleton_Class($db);
-
-// Example for inserting creating object in database
-/*
-dol_syslog($script_file." CREATE", LOG_DEBUG);
-$myobject->prop1='value_prop1';
-$myobject->prop2='value_prop2';
-$id=$myobject->create($user);
-if ($id < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object created with id=".$id."\n";
-*/
-
-// Example for reading object from database
-/*
-dol_syslog($script_file." FETCH", LOG_DEBUG);
-$result=$myobject->fetch($id);
-if ($result < 0) { $error; dol_print_error($db,$myobject->error); }
-else print "Object with id=".$id." loaded\n";
-*/
-
-// Example for updating object in database ($myobject must have been loaded by a fetch before)
-/*
-dol_syslog($script_file." UPDATE", LOG_DEBUG);
-$myobject->prop1='newvalue_prop1';
-$myobject->prop2='newvalue_prop2';
-$result=$myobject->update($user);
-if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object with id ".$myobject->id." updated\n";
-*/
-
-// Example for deleting object in database ($myobject must have been loaded by a fetch before)
-/*
-dol_syslog($script_file." DELETE", LOG_DEBUG);
-$result=$myobject->delete($user);
-if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object with id ".$myobject->id." deleted\n";
-*/
-
-
-// An example of a direct SQL read without using the fetch method
-/*
-$sql = "SELECT field1, field2";
-$sql.= " FROM ".MAIN_DB_PREFIX."skeleton";
-$sql.= " WHERE field3 = 'xxx'";
-$sql.= " ORDER BY field1 ASC";
-
-dol_syslog($script_file, LOG_DEBUG);
-$resql=$db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	$i = 0;
-	if ($num)
-	{
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
-				// You can use here results
-				print $obj->field1;
-				print $obj->field2;
-			}
-			$i++;
-		}
-	}
-}
-else
-{
-	$error++;
-	dol_print_error($db);
-}
-*/
-
-
-// -------------------- END OF YOUR CODE --------------------
-
-if (! $error)
-{
-	$db->commit();
-	print '--- end ok'."\n";
-}
-else
-{
-	print '--- end error code='.$error."\n";
-	$db->rollback();
-}
-
-$db->close();	// Close $db database opened handler
-
-exit($error);
diff --git a/dev/skeletons/skeleton_webservice_server.php b/dev/skeletons/skeleton_webservice_server.php
deleted file mode 100644
index 54a050ff9da..00000000000
--- a/dev/skeletons/skeleton_webservice_server.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/* Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/webservices/server_skeleton.php
- *       \brief      File that is entry point to call Dolibarr WebServices
- *       \version    $Id: server_skeleton.php,v 1.7 2010/12/19 11:49:37 eldy Exp $
- */
-
-// This is to make Dolibarr working with Plesk
-set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
-
-require_once("../master.inc.php");
-require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
-require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/skeleton/class/skeleton.class.php");
-
-
-dol_syslog("Call Skeleton webservices interfaces");
-
-// Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
-{
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
-}
-
-// Create the soap Object
-$server = new nusoap_server();
-$server->soap_defencoding='UTF-8';
-$server->decode_utf8=false;
-$ns='http://www.dolibarr.org/ns/';
-$server->configureWSDL('WebServicesDolibarrSkeleton',$ns);
-$server->wsdl->schemaTargetNamespace=$ns;
-
-
-// Define WSDL Authentication object
-$server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-    	'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
-    )
-);
-
-// Define WSDL Return object
-$server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
-    )
-);
-
-// Define other specific objects
-$server->wsdl->addComplexType(
-    'skeleton',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-	    'prop1'=>'xxx',
-		'prop2'=>'xxx',
-    //...
-    )
-);
-
-
-
-// 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
-// Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
-// http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
-$styledoc='rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
-$styleuse='encoded';   // encoded/literal/literal wrapped
-// Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
-
-
-// Register WSDL
-$server->register(
-    'getSkeleton',
-    // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','skeleton'=>'tns:skeleton'),
-    $ns,
-    $ns.'#getSkeleton',
-    $styledoc,
-    $styleuse,
-    'WS to get skeleton'
-);
-
-// Register WSDL
-$server->register(
-	'createSkeleton',
-	// Entry values
-	array('authentication'=>'tns:authentication','skeleton'=>'tns:skeleton'),
-	// Exit values
-	array('result'=>'tns:result','id'=>'xsd:string'),
-	$ns,
-	$ns.'#createSkeleton',
-	$styledoc,
-	$styleuse,
-	'WS to create a skeleton'
-);
-
-
-
-
-/**
- * Get Skeleton
- *
- * @param	array		$authentication		Array of authentication information
- * @param	int			$id					Id of object
- * @param	string		$ref				Ref of object
- * @param	string		$ref_ext			Ref external of object
- * @return	mixed
- */
-function getSkeleton($authentication,$id,$ref='',$ref_ext='')
-{
-    global $db,$conf,$langs;
-
-    dol_syslog("Function: getSkeleton login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
-
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
-    if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
-    {
-        $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
-
-    if (! $error)
-    {
-        $fuser->getrights();
-
-        if ($fuser->rights->skeleton->read)
-        {
-            $skeleton=new Skeleton($db);
-            $result=$skeleton->fetch($id,$ref,$ref_ext);
-            if ($result > 0)
-            {
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'skeleton'=>array(
-				    'prop1'=>$skeleton->prop1,
-				    'prop2'=>$skeleton->prop2,
-                    //...
-                    )
-                );
-            }
-            else
-            {
-                $error++;
-                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
-            }
-        }
-        else
-        {
-            $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
-        }
-    }
-
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
-
-    return $objectresp;
-}
-
-
-/**
- * Create Skeleton
- *
- * @param	array		$authentication		Array of authentication information
- * @param	Skeleton	$skeleton		    $skeleton
- * @return	array							Array result
- */
-function createSkeleton($authentication,$skeleton)
-{
-	global $db,$conf,$langs;
-
-	$now=dol_now();
-
-	dol_syslog("Function: createSkeleton login=".$authentication['login']);
-
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-	// Init and check authentication
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-	// Check parameters
-
-
-	if (! $error)
-	{
-		$newobject=new Skeleton($db);
-		$newobject->prop1=$skeleton->prop1;
-		$newobject->prop2=$skeleton->prop2;
-		//...
-
-		$db->begin();
-
-		$result=$newobject->create($fuser);
-		if ($result <= 0)
-		{
-			$error++;
-		}
-
-		if (! $error)
-		{
-			$db->commit();
-			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-		}
-		else
-		{
-			$db->rollback();
-			$error++;
-			$errorcode='KO';
-			$errorlabel=$newobject->error;
-		}
-	}
-
-	if ($error)
-	{
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-	}
-
-	return $objectresp;
-}
-
-// Return the results.
-$server->service(file_get_contents("php://input"));
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index b10463361f8..7f909cd2f13 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -263,7 +263,7 @@ if ($resql)
 	if (! empty($arrayfields['aa.pcg_type']['checked']))		print_liste_field_titre($arrayfields['aa.pcg_type']['label'],$_SERVER["PHP_SELF"],'aa.pcg_type','',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['aa.pcg_subtype']['checked']))		print_liste_field_titre($arrayfields['aa.pcg_subtype']['label'],$_SERVER["PHP_SELF"],'aa.pcg_subtype','',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['aa.active']['checked']))			print_liste_field_titre($arrayfields['aa.active']['label'],$_SERVER["PHP_SELF"],'aa.active','',$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
 	$accountstatic = new AccountingAccount($db);
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 4589cdc754f..bf3d61cd6f2 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -594,7 +594,7 @@ print $hookmanager->resPrint;
 if (! empty($arrayfields['d.datec']['checked']))     print_liste_field_titre($arrayfields['d.datec']['label'],$_SERVER["PHP_SELF"],"d.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['d.tms']['checked']))       print_liste_field_titre($arrayfields['d.tms']['label'],$_SERVER["PHP_SELF"],"d.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['d.statut']['checked']))    print_liste_field_titre($arrayfields['d.statut']['label'],$_SERVER["PHP_SELF"],"d.statut","",$param,'align="right"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
 $i = 0;
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index c06ea117d01..ba01033eee5 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -738,7 +738,7 @@ if ($resql)
 	if (! empty($arrayfields['p.datec']['checked']))     print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['p.tms']['checked']))       print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print '</tr>'."\n";
 	
 	$now = dol_now();
@@ -780,7 +780,7 @@ if ($resql)
     			print '</td>';
     		}
     		// Other picto tool
-    		print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
+    		print '<td width="16" align="right" class="nobordernopadding">';
     		$filename=dol_sanitizeFileName($obj->ref);
     		$filedir=$conf->propal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
     		$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 27033254dba..fcd68992b38 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1033,7 +1033,7 @@ if ($resql)
 	if (! empty($arrayfields['c.tms']['checked']))       print_liste_field_titre($arrayfields['c.tms']['label'],$_SERVER["PHP_SELF"],"c.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'],$_SERVER["PHP_SELF"],"c.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	if (! empty($arrayfields['c.facture']['checked']))   print_liste_field_titre($arrayfields['c.facture']['label'],$_SERVER["PHP_SELF"],'c.facture','',$param,'align="center"',$sortfield,$sortorder,'');
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print '</tr>'."\n";
     
 	$total=0;
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index ca786c1e3e0..44ff8934831 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -835,7 +835,7 @@ if ($resql)
 	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 	
 	
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index e67441036c4..0f4e8b825b2 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -415,7 +415,7 @@ if (! empty($arrayfields['b.datec']['checked']))          print_liste_field_titr
 if (! empty($arrayfields['b.tms']['checked']))            print_liste_field_titre($arrayfields['b.tms']['label'],$_SERVER["PHP_SELF"],"b.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['b.clos']['checked']))           print_liste_field_titre($arrayfields['b.clos']['label'],$_SERVER["PHP_SELF"],'b.clos','',$param,'align="center"',$sortfield,$sortorder);
 if (! empty($arrayfields['balance']['checked']))          print_liste_field_titre($arrayfields['balance']['label'],$_SERVER["PHP_SELF"],'','',$param,'align="right"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 92fcf4fc511..a8cd12c1884 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -951,7 +951,7 @@ if ($resql)
     if (! empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'],$_SERVER["PHP_SELF"],"f.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
     if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
     if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'],$_SERVER["PHP_SELF"],"fk_statut,paye,type,dynamount_payed","",$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
     print "</tr>\n";    
     
     if ($num > 0)
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 8a58b842ab6..3c651ec7eb3 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -38,10 +38,12 @@ $langs->load('bills');
 $langs->load('banks');
 $langs->load('companies');
 
-// Security check
 $id=GETPOST('id','int');
+$ref=GETPOST('ref', 'alpha');
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
+
+// Security check
 if ($user->societe_id) $socid=$user->societe_id;
 // TODO ajouter regle pour restreindre acces paiement
 //$result = restrictedArea($user, 'facture', $id,'');
@@ -163,11 +165,11 @@ if ($action == 'setdatep' && ! empty($_POST['datepday']))
  * View
  */
 
-llxHeader();
+llxHeader('', $langs->trans("Payment"));
 
 $thirdpartystatic=new Societe($db);
 
-$result=$object->fetch($id);
+$result=$object->fetch($id, $ref);
 if ($result <= 0)
 {
 	dol_print_error($db,'Payement '.$id.' not found in database');
@@ -178,7 +180,7 @@ $form = new Form($db);
 
 $head = payment_prepare_head($object);
 
-dol_fiche_head($head, 'payment', $langs->trans("PaymentCustomerInvoice"), 0, 'payment');
+dol_fiche_head($head, 'payment', $langs->trans("PaymentCustomerInvoice"), -1, 'payment');
 
 /*
  * Confirmation de la suppression du paiement
@@ -199,19 +201,18 @@ if ($action == 'valide')
 
 }
 
-
 $linkback = '<a href="' . DOL_URL_ROOT . '/compta/paiement/list.php">' . $langs->trans("BackToList") . '</a>';
 
+dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '');
+
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 
 print '<table class="border centpercent">'."\n";
 
-// Ref
-print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td><td colspan="3">';
-print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
-print '</td></tr>';
-
 // Date payment
-print '<tr><td>'.$form->editfieldkey("Date",'datep',$object->date,$object,$user->rights->facture->paiement).'</td><td colspan="3">';
+print '<tr><td class="titlefield">'.$form->editfieldkey("Date",'datep',$object->date,$object,$user->rights->facture->paiement).'</td><td colspan="3">';
 print $form->editfieldval("Date",'datep',$object->date,$object,$user->rights->facture->paiement,'datepicker','',null,$langs->trans('PaymentDateUpdateSucceeded'));
 print '</td></tr>';
 
@@ -280,6 +281,8 @@ if (! empty($conf->banque->enabled))
 
 print '</table>';
 
+print '</div>';
+
 dol_fiche_end();
 
 
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 61d2b5a3b8a..b229f756b25 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -96,7 +96,7 @@ class Paiement extends CommonObject
 		if ($id > 0)
 			$sql.= ' AND p.rowid = '.$id;
 		else if ($ref)
-			$sql.= ' AND p.rowid = '.$ref;
+			$sql.= " AND p.ref = '".$ref."'";
 		else if ($fk_bank)
 			$sql.= ' AND p.fk_bank = '.$fk_bank;
 
diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php
index e1b12225aad..d0bda152b21 100644
--- a/htdocs/compta/paiement/info.php
+++ b/htdocs/compta/paiement/info.php
@@ -32,33 +32,39 @@ $langs->load("bills");
 $langs->load("companies");
 
 $id=GETPOST('id');
+$ref=GETPOST('ref', 'alpha');
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
+
+/*
+ * Actions
+ */
+
+// None
 
 
 /*
  * View
  */
 
-llxHeader();
+llxHeader('', $langs->trans("Payment"));
 
 $object = new Paiement($db);
-$object->fetch($id);
-$object->info($id);
+$object->fetch($id, $ref);
+$object->info($object->id);
 
 $head = payment_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("PaymentCustomerInvoice"), 0, 'payment');
+dol_fiche_head($head, 'info', $langs->trans("PaymentCustomerInvoice"), -1, 'payment');
 
-print '<table class="border" width="100%">';
 
 $linkback = '<a href="' . DOL_URL_ROOT . '/compta/paiement/list.php">' . $langs->trans("BackToList") . '</a>';
 
+dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '');
 
-// Ref
-print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td><td colspan="3">';
-print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
-print '</td></tr>';
 
-print '</table>';
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 
 print '<br>';
 
@@ -68,5 +74,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
+dol_fiche_end();
+
 llxFooter();
 $db->close();
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 917c59006f2..ef26c9c80e2 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -642,7 +642,7 @@ print $hookmanager->resPrint;
 if (! empty($arrayfields['p.datec']['checked']))  print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['p.tms']['checked']))    print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['p.statut']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index af68e789da2..be1b2e5fccf 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -551,7 +551,7 @@ if ($resql)
         print_liste_field_titre($staticcontratligne->LibStatut(4,3,1), '', '', '', '', 'width="16"');
         print_liste_field_titre($staticcontratligne->LibStatut(5,3), '', '', '', '', 'width="16"');
     }
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
     print "</tr>\n";
 
     while ($i < min($num,$limit))
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 62b9fddf743..1e2820f10e0 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -382,7 +382,7 @@ print $hookmanager->resPrint;
 if (! empty($arrayfields['cd.datec']['checked']))  print_liste_field_titre($arrayfields['cd.datec']['label'],$_SERVER["PHP_SELF"],"cd.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['cd.tms']['checked']))    print_liste_field_titre($arrayfields['cd.tms']['label'],$_SERVER["PHP_SELF"],"cd.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['status']['checked'])) print_liste_field_titre($arrayfields['status']['label'],$_SERVER["PHP_SELF"],"cd.statut,c.statut","",$param,'align="right"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index fe460f7d512..be9a868109d 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -121,7 +121,7 @@ class box_commandes extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => '',
+                        'td' => 'class="tdoverflowmax100"',
                         'text' => $societestatic->getNomUrl(1),
                         'asis' => 1,
                     );
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index d3945ddb940..3f7b37f186a 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -116,8 +116,8 @@ class box_propales extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $societestatic->getNomUrl(1,'',40),
+                        'td' => 'class="tdoverflowmax100"',
+                        'text' => $societestatic->getNomUrl(1),
                         'asis' => 1,
                     );
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 73e854248fe..7dc69a82b23 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -834,8 +834,8 @@ class FormFile
     	$out='';
     	$this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
 
-    	if (! empty($conf->dol_use_jmobile)) return '';
-    	 
+    	//if (! empty($conf->dol_use_jmobile)) return '';
+  	 
 		$file_list=dol_dir_list($filedir, 'files', 0, preg_quote(basename($modulesubdir),'/').'[^\-]+', '\.meta$|\.png$');	// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files)
 
     	// For ajax treatment
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index ed6bb2c9979..178a3629d23 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -57,7 +57,10 @@ $nolinesbefore=(count($this->lines) == 0 || $forcetoshowtitlelines);
 if ($nolinesbefore) {
 ?>
 <tr class="liste_titre<?php echo (($nolinesbefore || $object->element=='contrat')?'':' liste_titre_add') ?> nodrag nodrop">
-	<td class="linecoldescription" <?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
+	<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
+	<td class="linecolnum" align="center"></td>
+	<?php } ?>
+	<td class="linecoldescription minwidth500imp">
 	<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span><?php // echo $langs->trans("FreeZone"); ?>
 	</td>
 	<?php if ($object->element == 'supplier_proposal') { ?>
@@ -114,12 +117,17 @@ if ($nolinesbefore) {
 <tr class="pair nodrag nodrop nohoverpair<?php echo ($nolinesbefore || $object->element=='contrat')?'':' liste_titre_add'; ?>">
 <?php
 if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
-	$coldisplay=2; }
+	$coldisplay=2;
+	?>
+	<td class="linecolnum" align="center" width="5">
+	<?php 
+}
 else {
-	$coldisplay=0; }
+	$coldisplay=0; 
+}
 ?>
 
-	<td class="nobottom linecoldescription"<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
+	<td class="nobottom linecoldescription minwidth500imp">
 
 	<?php
 
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index e928f8d64fc..c347c693691 100755
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -54,7 +54,7 @@ if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax=0;
 	<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
 	<td class="linecolnum" align="center"><?php $coldisplay++; ?><?php echo ($i+1); ?></td>
 	<?php } ?>
-	<td class="linecoldescription"><?php $coldisplay++; ?><div id="line_<?php echo $line->id; ?>"></div>
+	<td class="linecoldescription minwidth300imp"><?php $coldisplay++; ?><div id="line_<?php echo $line->id; ?>"></div>
 	<?php 
 	if (($line->info_bits & 2) == 2) {
 	?>
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 29f6978b24e..853c047b23c 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -458,7 +458,7 @@ if ($resql)
 	if (! empty($arrayfields['e.tms']['checked']))    print_liste_field_titre($arrayfields['e.tms']['label'],$_SERVER["PHP_SELF"],"e.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'],$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	if (! empty($arrayfields['l.fk_statut']['checked'])) print_liste_field_titre($arrayfields['l.fk_statut']['label'], $_SERVER["PHP_SELF"],"l.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 	
 	$i=0;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 9339b33ee7f..c04a2fc3b61 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -342,43 +342,13 @@ if ($resql)
 
 	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-
+	if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+	
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	print "<tr class=\"liste_titre\">";
-	if (! empty($arrayfields['d.ref']['checked']))                  print_liste_field_titre($arrayfields['d.ref']['label'],$_SERVER["PHP_SELF"],"d.ref","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['user']['checked']))                   print_liste_field_titre($arrayfields['user']['label'],$_SERVER["PHP_SELF"],"u.lastname","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['d.date_debut']['checked']))           print_liste_field_titre($arrayfields['d.date_debut']['label'],$_SERVER["PHP_SELF"],"d.date_debut","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['d.date_fin']['checked']))             print_liste_field_titre($arrayfields['d.date_fin']['label'],$_SERVER["PHP_SELF"],"d.date_fin","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['d.date_valid']['checked']))           print_liste_field_titre($arrayfields['d.date_valid']['label'],$_SERVER["PHP_SELF"],"d.date_valid","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['d.date_approve']['checked']))         print_liste_field_titre($arrayfields['d.date_approve']['label'],$_SERVER["PHP_SELF"],"d.date_approve","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['d.total_ht']['checked']))             print_liste_field_titre($arrayfields['d.total_ht']['label'],$_SERVER["PHP_SELF"],"d.total_ht","",$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['d.total_vat']['checked']))            print_liste_field_titre($arrayfields['d.total_vat']['label'],$_SERVER["PHP_SELF"],"d.total_tva","",$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['d.total_ttc']['checked']))            print_liste_field_titre($arrayfields['d.total_ttc']['label'],$_SERVER["PHP_SELF"],"d.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
-	// Extra fields
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-	   foreach($extrafields->attribute_label as $key => $val) 
-	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
-           {
-				$align=$extrafields->getAlignFlag($key);
-				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-           }
-	   }
-	}
-	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields);
-    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-	if (! empty($arrayfields['d.datec']['checked']))     print_liste_field_titre($arrayfields['d.datec']['label'],$_SERVER["PHP_SELF"],"d.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['d.tms']['checked']))       print_liste_field_titre($arrayfields['d.tms']['label'],$_SERVER["PHP_SELF"],"d.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['d.fk_statut']['checked'])) print_liste_field_titre($arrayfields['d.fk_statut']['label'],$_SERVER["PHP_SELF"],"d.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
-
+	
 	// Filters
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	if (! empty($arrayfields['d.ref']['checked']))
 	{
     	print '<td class="liste_titre" align="left">';
@@ -491,13 +461,43 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	$searchpitco=$form->showFilterButtons();
 	print $searchpitco;
 	print '</td>';
 
 	print "</tr>\n";
 
-	$var=true;
+	print '<tr class="liste_titre">';
+	if (! empty($arrayfields['d.ref']['checked']))                  print_liste_field_titre($arrayfields['d.ref']['label'],$_SERVER["PHP_SELF"],"d.ref","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['user']['checked']))                   print_liste_field_titre($arrayfields['user']['label'],$_SERVER["PHP_SELF"],"u.lastname","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['d.date_debut']['checked']))           print_liste_field_titre($arrayfields['d.date_debut']['label'],$_SERVER["PHP_SELF"],"d.date_debut","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['d.date_fin']['checked']))             print_liste_field_titre($arrayfields['d.date_fin']['label'],$_SERVER["PHP_SELF"],"d.date_fin","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['d.date_valid']['checked']))           print_liste_field_titre($arrayfields['d.date_valid']['label'],$_SERVER["PHP_SELF"],"d.date_valid","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['d.date_approve']['checked']))         print_liste_field_titre($arrayfields['d.date_approve']['label'],$_SERVER["PHP_SELF"],"d.date_approve","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['d.total_ht']['checked']))             print_liste_field_titre($arrayfields['d.total_ht']['label'],$_SERVER["PHP_SELF"],"d.total_ht","",$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['d.total_vat']['checked']))            print_liste_field_titre($arrayfields['d.total_vat']['label'],$_SERVER["PHP_SELF"],"d.total_tva","",$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['d.total_ttc']['checked']))            print_liste_field_titre($arrayfields['d.total_ttc']['label'],$_SERVER["PHP_SELF"],"d.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	    foreach($extrafields->attribute_label as $key => $val)
+	    {
+	        if (! empty($arrayfields["ef.".$key]['checked']))
+	        {
+	            $align=$extrafields->getAlignFlag($key);
+	            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+	        }
+	    }
+	}
+	// Hook fields
+	$parameters=array('arrayfields'=>$arrayfields);
+	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (! empty($arrayfields['d.datec']['checked']))     print_liste_field_titre($arrayfields['d.datec']['label'],$_SERVER["PHP_SELF"],"d.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['d.tms']['checked']))       print_liste_field_titre($arrayfields['d.tms']['label'],$_SERVER["PHP_SELF"],"d.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['d.fk_statut']['checked'])) print_liste_field_titre($arrayfields['d.fk_statut']['label'],$_SERVER["PHP_SELF"],"d.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+	print "</tr>\n";	
 
 	$total_total_ht = 0;
 	$total_total_ttc = 0;
@@ -528,7 +528,7 @@ if ($resql)
 			$expensereportstatic->note_public=$obj->note_public;
 				
 			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			// Ref
 			if (! empty($arrayfields['d.ref']['checked'])) {
     			print '<td>';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 4a24f0d0c6d..88584a4f954 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -367,7 +367,7 @@ if ($result)
     if (! empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"f.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
     if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
     if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
     print "</tr>\n";
     
 	$total = 0;
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index be3cb384e96..5c4c8aae11c 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -684,7 +684,7 @@ if ($resql)
 	if (! empty($arrayfields['cf.tms']['checked']))       print_liste_field_titre($arrayfields['cf.tms']['label'],$_SERVER["PHP_SELF"],"cf.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['cf.fk_statut']['checked'])) print_liste_field_titre($arrayfields['cf.fk_statut']['label'],$_SERVER["PHP_SELF"],"cf.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	if (! empty($arrayfields['cf.billed']['checked']))    print_liste_field_titre($arrayfields['cf.billed']['label'],$_SERVER["PHP_SELF"],'cf.billed','',$param,'align="center"',$sortfield,$sortorder,'');
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 	
 	
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 131dcc3651b..d9c5fdf43c0 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2011	   Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2013-2016 Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2013-2017 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2016 Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -82,7 +82,7 @@ $fieldstosearchall = array(
  * Actions
  */
 
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
 	$search_ref="";
 	$month_create="";
@@ -292,21 +292,8 @@ if ($sall)
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-print '<tr class="liste_titre">';
-print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cp.rowid","",'','',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("DateCreateCP"),$_SERVER["PHP_SELF"],"cp.date_create","",'','align="center"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Employee"),$_SERVER["PHP_SELF"],"cp.fk_user","",'','',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("ValidatorCP"),$_SERVER["PHP_SELF"],"cp.fk_validator","",'','',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],'','','','',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],'','','','align="right"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("DateDebCP"),$_SERVER["PHP_SELF"],"cp.date_debut","",'','align="center"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("DateFinCP"),$_SERVER["PHP_SELF"],"cp.date_fin","",'','align="center"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="right"',$sortfield,$sortorder);
-print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-print "</tr>\n";
-
 // FILTRES
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 print '<td class="liste_titre" align="left">';
 print '<input class="flat" size="4" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 print '</td>';
@@ -391,6 +378,18 @@ print '</td>';
 
 print "</tr>\n";
 
+print '<tr class="liste_titre">';
+print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cp.rowid","",'','',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("DateCreateCP"),$_SERVER["PHP_SELF"],"cp.date_create","",'','align="center"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Employee"),$_SERVER["PHP_SELF"],"cp.fk_user","",'','',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("ValidatorCP"),$_SERVER["PHP_SELF"],"cp.fk_validator","",'','',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],'','','','',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],'','','','align="right"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("DateDebCP"),$_SERVER["PHP_SELF"],"cp.date_debut","",'','align="center"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("DateFinCP"),$_SERVER["PHP_SELF"],"cp.date_fin","",'','align="center"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="right"',$sortfield,$sortorder);
+print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+print "</tr>\n";
 
 // Lines
 if (! empty($holiday->holiday))
@@ -400,8 +399,6 @@ if (! empty($holiday->holiday))
 
 	foreach($holiday->holiday as $infos_CP)
 	{
-		$var=!$var;
-
 		// Utilisateur
 		$userstatic->id=$infos_CP['fk_user'];
 		$userstatic->lastname=$infos_CP['user_lastname'];
@@ -420,7 +417,7 @@ if (! empty($holiday->holiday))
 		
 		$date = $infos_CP['date_create'];
 
-		print '<tr '.$bc[$var].'>';
+		print '<tr class="oddeven">';
 		print '<td>';
 		$holidaystatic->id=$infos_CP['rowid'];
 		$holidaystatic->ref=$infos_CP['rowid'];
diff --git a/htdocs/modulebuilder/skeletons/skeleton_list.php b/htdocs/modulebuilder/skeletons/skeleton_list.php
index 561dc98da35..fb2ec136bbe 100644
--- a/htdocs/modulebuilder/skeletons/skeleton_list.php
+++ b/htdocs/modulebuilder/skeletons/skeleton_list.php
@@ -365,7 +365,7 @@ print $hookmanager->resPrint;
 if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 //if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print '</tr>'."\n";
 
 // Fields title search
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 2e651398766..7789849da99 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -622,7 +622,7 @@ else
     		if (! empty($arrayfields['p.tms']['checked']))    print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
     		if (! empty($arrayfields['p.tosell']['checked'])) print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Sell").')',$_SERVER["PHP_SELF"],"p.tosell","",$param,'align="right"',$sortfield,$sortorder);
     		if (! empty($arrayfields['p.tobuy']['checked']))  print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Buy").')',$_SERVER["PHP_SELF"],"p.tobuy","",$param,'align="right"',$sortfield,$sortorder);
-    		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+    		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
     		print "</tr>\n";
     		
     		
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 45ace2031cb..bc4099f66ec 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -898,7 +898,7 @@ if ($resql)
     print $hookmanager->resPrint;
 	if (! empty($arrayfields['m.datec']['checked']))     print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['m.tms']['checked']))       print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
     print "</tr>\n";
 
 
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index ac6bc7b9948..b6a51233fa2 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -433,7 +433,7 @@ if ($resql)
 	if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
     print '</tr>'."\n";
 
 	$productlot = new Productlot($db);
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 790dde6e1aa..fb6453e8159 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -614,7 +614,7 @@ print $hookmanager->resPrint;
 if (! empty($arrayfields['p.datec']['checked']))  print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['p.tms']['checked']))    print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
 $i=0;
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 13e15eb7eb6..ca7cff35a0a 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -585,7 +585,7 @@ $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // No
 print $hookmanager->resPrint;
 if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
 
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 2d93a0ab2df..e1047d22981 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -252,7 +252,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         }
     }
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 5c5f6f8e1c8..88e7a7a631e 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -886,7 +886,7 @@ print $hookmanager->resPrint;
 if (! empty($arrayfields['s.datec']['checked']))  print_liste_field_titre($arrayfields['s.datec']['label'],$_SERVER["PHP_SELF"],"s.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['s.tms']['checked']))    print_liste_field_titre($arrayfields['s.tms']['label'],$_SERVER["PHP_SELF"],"s.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['s.status']['checked'])) print_liste_field_titre($arrayfields['s.status']['label'],$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
 
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 09dd0eb240c..3624101d7cf 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -568,7 +568,7 @@ if ($result)
 	print_liste_field_titre($langs->trans('AmountHT'),$_SERVER["PHP_SELF"],'sp.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'sp.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 	
 	$now = dol_now();
diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js
index a1bb5fdcf0b..eabd0c58bd3 100644
--- a/htdocs/theme/eldy/ckeditor/config.js
+++ b/htdocs/theme/eldy/ckeditor/config.js
@@ -31,7 +31,7 @@ CKEDITOR.editorConfig = function( config )
 	    ['Templates','NewPage'],
 	    ['Save'],
 	    ['Source','Maximize','Preview'],
-	    ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print', 'SpellChecker', 'Scayt'],
+	    ['PasteText','PasteFromWord','-','Print', 'SpellChecker', 'Scayt'],	// 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone
 	    ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
 	 	['CreateDiv','ShowBlocks'],
 	    ['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'],
@@ -42,14 +42,14 @@ CKEDITOR.editorConfig = function( config )
 	    ['Link','Unlink','Anchor'],
 	    ['Image','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'],
 	    ['Styles','Format','Font','FontSize'],
-	    ['TextColor','BGColor'],
+	    ['TextColor','BGColor']
 	];
 
 	// Used for mailing fields
 	config.toolbar_dolibarr_mailings = 
 	[
 	 	['Source','Maximize','Preview'],
-	 	['Cut','Copy','Paste','-','SpellChecker', 'Scayt'],
+	 	['SpellChecker', 'Scayt'],
 	 	['Undo','Redo','-','Find','Replace'],
 	 	['CreateDiv','ShowBlocks'],
 	    ['Format','Font','FontSize'],
@@ -63,7 +63,7 @@ CKEDITOR.editorConfig = function( config )
 	config.toolbar_dolibarr_notes =
 	[
 	 	['Source','Maximize'],
-	 	['Cut','Copy','Paste','-','SpellChecker', 'Scayt'],
+	 	['SpellChecker', 'Scayt'],		// 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone
 	 	['Undo','Redo','-','Find','Replace'],
 	    ['Format','Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
@@ -76,9 +76,9 @@ CKEDITOR.editorConfig = function( config )
 	config.toolbar_dolibarr_details =
 	[
 	 	['Source','Maximize'],
-	 	['Cut','Copy','Paste','-','SpellChecker', 'Scayt'],
+	 	['SpellChecker', 'Scayt'],		// 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone
 	    ['Format','Font','FontSize'],
-	    ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
+	    ['Bold','Italic','Underline','Strike','-','TextColor','RemoveFormat'],	// ,'Subscript','Superscript' useless
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['Link','Unlink','SpecialChar']
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 38d50962086..793e17c8f72 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -411,7 +411,6 @@ hr { border: 0; border-top: 1px solid #ccc; }
 	margin-top: 0;
 	text-align: center;
 	cursor: pointer;
-	color: #333333 !important;
 	text-decoration: none !important;
 	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
 	background-color: #f5f5f5;
@@ -430,9 +429,6 @@ hr { border: 0; border-top: 1px solid #ccc; }
 	-webkit-border-radius: 2px;
 	-moz-border-radius: 2px;
 	border-radius: 2px;
-	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 .button:focus, .buttonDelete:focus  {
 	-moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
@@ -775,8 +771,8 @@ div.fiche>form>div.div-table-responsive {
     .minwidth100imp { min-width: 80px !important; }
     .minwidth200imp { min-width: 100px !important; }
     .minwidth300imp { min-width: 100px !important; }
-    .minwidth400imp { min-width: 100px !important; }
-    .minwidth500imp { min-width: 100px !important; }
+    .minwidth400imp { min-width: 150px !important; }
+    .minwidth500imp { min-width: 250px !important; }
 }
 
 /* Force values for small screen 570 */
@@ -826,9 +822,9 @@ div.fiche>form>div.div-table-responsive {
 	.minwidth75imp  { min-width: 60px !important; }
     .minwidth100imp { min-width: 60px !important; }
     .minwidth200imp { min-width: 60px !important; }
-    .minwidth300imp { min-width: 60px !important; }
-    .minwidth400imp { min-width: 60px !important; }
-    .minwidth500imp { min-width: 60px !important; }
+    .minwidth300imp { min-width: 100px !important; }
+    .minwidth400imp { min-width: 150px !important; }
+    .minwidth500imp { min-width: 250px !important; }
     .titlefield { width: auto; }
     .titlefieldcreate { width: auto; }
 
@@ -2115,6 +2111,7 @@ span.butAction, span.butActionDelete {
 .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete {
     background: #633;
     border: 1px solid #633;
+    color: #FFF;
 }
 
 .butActionDelete:hover {
diff --git a/htdocs/theme/md/ckeditor/config.js b/htdocs/theme/md/ckeditor/config.js
index eb88af48a04..6f1bbe7fb30 100644
--- a/htdocs/theme/md/ckeditor/config.js
+++ b/htdocs/theme/md/ckeditor/config.js
@@ -31,25 +31,25 @@ CKEDITOR.editorConfig = function( config )
 	    ['Templates','NewPage'],
 	    ['Save'],
 	    ['Source','Maximize','Preview'],
-	    ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print', 'SpellChecker', 'Scayt'],
+	    ['PasteText','PasteFromWord','-','Print', 'SpellChecker', 'Scayt'],		// 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone
 	    ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
+	    ['CreateDiv','ShowBlocks'],
 	    ['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'],
 	    ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],
-	    ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'],
+	    ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],
 	    ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['BidiLtr', 'BidiRtl'],
 	    ['Link','Unlink','Anchor'],
 	    ['Image','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'],
 	    ['Styles','Format','Font','FontSize'],
-	    ['TextColor','BGColor'],
-	    ['Maximize', 'ShowBlocks']
+	    ['TextColor','BGColor']
 	];
 
 	// Used for mailing fields
 	config.toolbar_dolibarr_mailings = 
 	[
 	 	['Source','Maximize','Preview'],
-	 	['Cut','Copy','Paste','-','SpellChecker', 'Scayt'],
+	 	['SpellChecker', 'Scayt'],		// 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone
 	 	['Undo','Redo','-','Find','Replace'],
 	    ['Format','Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
@@ -62,7 +62,7 @@ CKEDITOR.editorConfig = function( config )
 	config.toolbar_dolibarr_notes =
 	[
 	 	['Source','Maximize'],
-	 	['Cut','Copy','Paste','-','SpellChecker', 'Scayt'],
+	 	['SpellChecker', 'Scayt'],		// 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone
 	 	['Undo','Redo','-','Find','Replace'],
 	    ['Format','Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
@@ -75,9 +75,9 @@ CKEDITOR.editorConfig = function( config )
 	config.toolbar_dolibarr_details =
 	[
 	 	['Source','Maximize'],
-	 	['Cut','Copy','Paste','-','SpellChecker', 'Scayt'],
+	 	['SpellChecker', 'Scayt'],		// 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone
 	    ['Format','Font','FontSize'],
-	    ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
+	    ['Bold','Italic','Underline','Strike','-','TextColor','RemoveFormat'],		// ,'Subscript','Superscript' useless
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['Link','Unlink','SpecialChar']
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 312416afa29..c3a32ae02fc 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -458,7 +458,7 @@ print $hookmanager->resPrint;
 if (! empty($arrayfields['u.datec']['checked']))  print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"u.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['u.tms']['checked']))    print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"u.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['u.statut']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"u.statut","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
 

From 1ab3086fcafa9cd342a3ea6d5ad6343db2ece6ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Apr 2017 16:44:43 +0200
Subject: [PATCH 0552/1163] Work on website module

---
 htdocs/websites/index.php | 225 ++++++++++++++++++++------------------
 1 file changed, 120 insertions(+), 105 deletions(-)

diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index e6bfec0d84a..b55f81f5b7f 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2016-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -143,6 +143,8 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain
  */
 
 if (GETPOST('refreshsite')) $pageid=0;      // If we change the site, we reset the pageid.
+if (GETPOST('refreshpage')) $action='preview'; 
+
 
 // Add page
 if ($action == 'add')
@@ -434,7 +436,7 @@ if ($action == 'updatemeta')
 }
 
 // Update page
-if ($action == 'updatecontent')
+if ($action == 'updatecontent' || GETPOST('refreshsite') || GETPOST('refreshpage') || GETPOST('preview'))
 {
     $db->begin();
     $object->fetch(0, $website);
@@ -444,110 +446,123 @@ if ($action == 'updatecontent')
     $res = $objectpage->fetch($pageid, $object->fk_website);
     if ($res > 0)
     {
-        $objectpage->content = GETPOST('PAGE_CONTENT');
-
-        // Clean data. We remove all the head section.
-        $objectpage->content = preg_replace('/<head.*<\/head>/s', '', $objectpage->content);
-        /* $objectpage->content = preg_replace('/<base\s+href=[\'"][^\'"]+[\'"]\s/?>/s', '', $objectpage->content); */
-        
-        $res = $objectpage->update($user);
-        if ($res < 0)
+        if ($action == 'updatecontent')
         {
-            $error++;
-            setEventMessages($objectpage->error, $objectpage->errors, 'errors');
-        }
-
-    	if (! $error)
-    	{
-    		$db->commit();
-    	    
-    		$filemaster=$pathofwebsite.'/master.inc.php';
-    		//$fileoldalias=$pathofwebsite.'/'.$objectpage->old_object->pageurl.'.php';
-    		$filealias=$pathofwebsite.'/'.$objectpage->pageurl.'.php';
-    		
-    	    dol_mkdir($pathofwebsite);
-    		
-    		
-    		// Now generate the master.inc.php page
-    		dol_syslog("We regenerate the master file");
-    		dol_delete_file($filemaster);
-    		
-    		$mastercontent = '<?php'."\n";
-    		$mastercontent.= '// File generated to link to the master file'."\n";
-    		$mastercontent.= "if (! defined('USEDOLIBARRSERVER')) require '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
-    		$mastercontent.= '?>'."\n";
-    		$result = file_put_contents($filemaster, $mastercontent);
-    		if (! empty($conf->global->MAIN_UMASK))
-    		    @chmod($filemaster, octdec($conf->global->MAIN_UMASK));
-    		
-		    if (! $result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
-		
-		
-		    // Now generate the alias.php page
-            if (! empty($fileoldalias))
-            {
-    		    dol_syslog("We regenerate alias page new name=".$filealias.", old name=".$fileoldalias);
-    		    dol_delete_file($fileoldalias);
-            }
+            $objectpage->content = GETPOST('PAGE_CONTENT');
+    
+            // Clean data. We remove all the head section.
+            $objectpage->content = preg_replace('/<head.*<\/head>/s', '', $objectpage->content);
+            /* $objectpage->content = preg_replace('/<base\s+href=[\'"][^\'"]+[\'"]\s/?>/s', '', $objectpage->content); */
             
-		    $aliascontent = '<?php'."\n";
-		    $aliascontent.= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a copy of database page content\n";
-		    $aliascontent.= "include_once './page".$objectpage->id.".tpl.php';\n";
-		    $aliascontent.= '?>'."\n";
-		    $result = file_put_contents($filealias, $aliascontent);
-		    if (! empty($conf->global->MAIN_UMASK))
-		        @chmod($filealias, octdec($conf->global->MAIN_UMASK));
-		
-            if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
-		
-    		        
-    	    // Now create the .tpl file with code to be able to make dynamic changes
-    	    dol_delete_file($filetpl);
-
-            $tplcontent ='';
-            $tplcontent.= "<?php // BEGIN PHP\n";
-            $tplcontent.= "if (! defined('USEDOLIBARRSERVER')) { require './master.inc.php'; } // Not already loaded"."\n";
-            $tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-            $tplcontent.= "ob_start();\n";
-            $tplcontent.= "// END PHP ?>\n";
-    	    $tplcontent.= '<html>'."\n";
-    	    $tplcontent.= '<header>'."\n";
-    	    $tplcontent.= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
-    	    $tplcontent.= '<meta name="robots" content="index, follow" />'."\n";
-    	    $tplcontent.= '<meta name="viewport" content="width=device-width, initial-scale=0.8">'."\n";
-    	    $tplcontent.= '<meta name="keywords" content="'.join(', ', explode(',',$objectpage->keywords)).'" />'."\n";
-    	    $tplcontent.= '<meta name="title" content="'.dol_escape_htmltag($objectpage->title).'" />'."\n";
-    	    $tplcontent.= '<meta name="description" content="'.dol_escape_htmltag($objectpage->description).'" />'."\n";
-    	    $tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.'" />'."\n";
-    	    $tplcontent.= '<link rel="stylesheet" href="styles.css.php?website='.$website.'" type="text/css" />'."\n";
-    	    $tplcontent.= '<title>'.dol_escape_htmltag($objectpage->title).'</title>'."\n";
-    	    $tplcontent.= '</header>'."\n";
-    	    	
-    	    $tplcontent.= '<body>'."\n";
-    	    $tplcontent.= $objectpage->content."\n";
-    	    $tplcontent.= '</body>'."\n";
-    	    
-    	    $tplcontent.= '<?php // BEGIN PHP'."\n";
-    	    $tplcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
-    	    $tplcontent.= "// END PHP ?>"."\n";
-    	    
-            //var_dump($filetpl);exit;	    
-    	    $result = file_put_contents($filetpl, $tplcontent);
-    	    if (! empty($conf->global->MAIN_UMASK))
-    	        @chmod($filetpl, octdec($conf->global->MAIN_UMASK));
-                 
-    	    if ($result)
-    	    {
-    	        setEventMessages($langs->trans("Saved"), null, 'mesgs');
-    	        header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
-   	            exit;
-    	    }
-    	    else setEventMessages('Failed to write file '.$filetpl, null, 'errors');    	        
-    	}
-    	else
-    	{
-    		$db->rollback();
-    	}
+            $res = $objectpage->update($user);
+            if ($res < 0)
+            {
+                $error++;
+                setEventMessages($objectpage->error, $objectpage->errors, 'errors');
+            }
+    
+        	if (! $error)
+        	{
+        		$db->commit();
+        	    
+        		$filemaster=$pathofwebsite.'/master.inc.php';
+        		//$fileoldalias=$pathofwebsite.'/'.$objectpage->old_object->pageurl.'.php';
+        		$filealias=$pathofwebsite.'/'.$objectpage->pageurl.'.php';
+        		
+        	    dol_mkdir($pathofwebsite);
+        		
+        		
+        		// Now generate the master.inc.php page
+        		dol_syslog("We regenerate the master file");
+        		dol_delete_file($filemaster);
+        		
+        		$mastercontent = '<?php'."\n";
+        		$mastercontent.= '// File generated to link to the master file'."\n";
+        		$mastercontent.= "if (! defined('USEDOLIBARRSERVER')) require '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
+        		$mastercontent.= '?>'."\n";
+        		$result = file_put_contents($filemaster, $mastercontent);
+        		if (! empty($conf->global->MAIN_UMASK))
+        		    @chmod($filemaster, octdec($conf->global->MAIN_UMASK));
+        		
+    		    if (! $result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+    		
+    		
+    		    // Now generate the alias.php page
+                if (! empty($fileoldalias))
+                {
+        		    dol_syslog("We regenerate alias page new name=".$filealias.", old name=".$fileoldalias);
+        		    dol_delete_file($fileoldalias);
+                }
+                
+    		    $aliascontent = '<?php'."\n";
+    		    $aliascontent.= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a copy of database page content\n";
+    		    $aliascontent.= "include_once './page".$objectpage->id.".tpl.php';\n";
+    		    $aliascontent.= '?>'."\n";
+    		    $result = file_put_contents($filealias, $aliascontent);
+    		    if (! empty($conf->global->MAIN_UMASK))
+    		        @chmod($filealias, octdec($conf->global->MAIN_UMASK));
+    		
+                if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
+    		
+        		        
+        	    // Now create the .tpl file with code to be able to make dynamic changes
+        	    dol_delete_file($filetpl);
+    
+                $tplcontent ='';
+                $tplcontent.= "<?php // BEGIN PHP\n";
+                $tplcontent.= "if (! defined('USEDOLIBARRSERVER')) { require './master.inc.php'; } // Not already loaded"."\n";
+                $tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+                $tplcontent.= "ob_start();\n";
+                $tplcontent.= "// END PHP ?>\n";
+        	    $tplcontent.= '<html>'."\n";
+        	    $tplcontent.= '<header>'."\n";
+        	    $tplcontent.= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
+        	    $tplcontent.= '<meta name="robots" content="index, follow" />'."\n";
+        	    $tplcontent.= '<meta name="viewport" content="width=device-width, initial-scale=0.8">'."\n";
+        	    $tplcontent.= '<meta name="keywords" content="'.join(', ', explode(',',$objectpage->keywords)).'" />'."\n";
+        	    $tplcontent.= '<meta name="title" content="'.dol_escape_htmltag($objectpage->title).'" />'."\n";
+        	    $tplcontent.= '<meta name="description" content="'.dol_escape_htmltag($objectpage->description).'" />'."\n";
+        	    $tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.'" />'."\n";
+        	    $tplcontent.= '<link rel="stylesheet" href="styles.css.php?website='.$website.'" type="text/css" />'."\n";
+        	    $tplcontent.= '<title>'.dol_escape_htmltag($objectpage->title).'</title>'."\n";
+        	    $tplcontent.= '</header>'."\n";
+        	    	
+        	    $tplcontent.= '<body>'."\n";
+        	    $tplcontent.= $objectpage->content."\n";
+        	    $tplcontent.= '</body>'."\n";
+        	    
+        	    $tplcontent.= '<?php // BEGIN PHP'."\n";
+        	    $tplcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
+        	    $tplcontent.= "// END PHP ?>"."\n";
+        	    
+                //var_dump($filetpl);exit;	    
+        	    $result = file_put_contents($filetpl, $tplcontent);
+        	    if (! empty($conf->global->MAIN_UMASK))
+        	        @chmod($filetpl, octdec($conf->global->MAIN_UMASK));
+                     
+        	    if ($result)
+        	    {
+        	        setEventMessages($langs->trans("Saved"), null, 'mesgs');
+        	        header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
+       	            exit;
+        	    }
+        	    else 
+        	    {
+        	        setEventMessages('Failed to write file '.$filetpl, null, 'errors');    	        
+        	        header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
+       	            exit;
+        	    }
+        	}
+        	else
+        	{
+        		$db->rollback();
+        	}
+        }
+        else
+        {
+            header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
+            exit;
+        }
     }
     else
     {
@@ -603,7 +618,7 @@ if ($action == 'edit')
 $style='';
 if ($action != 'preview' && $action != 'editcontent') $style=' margin-bottom: 5px;';
 
-
+//var_dump($objectpage);exit;
 print '<div class="centpercent websitebar">';
 
 if (count($object->records) > 0)

From a0e75d0af053851c08c6efa2bd266e6a6ddbd9b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Apr 2017 16:44:43 +0200
Subject: [PATCH 0553/1163] Work on look and feel v6

---
 htdocs/categories/class/categorie.class.php |  93 +++++---
 htdocs/compta/bank/ligne.php                | 169 +++++++--------
 htdocs/compta/bank/releve.php               |   7 +-
 htdocs/core/class/html.form.class.php       |  34 ++-
 htdocs/websites/index.php                   | 225 +++++++++++---------
 5 files changed, 299 insertions(+), 229 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 0263395ec50..b2cd3d3dd31 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -49,9 +49,10 @@ class Categorie extends CommonObject
 	const TYPE_MEMBER = 3;     // TODO Replace this value with 'member'
 	const TYPE_CONTACT = 4;    // TODO Replace this value with 'contact'
 	const TYPE_USER = 4;       // categorie contact and user are same !   TODO Replace this value with 'user'
-    const TYPE_ACCOUNT = 5;    // for bank account TODO Replace this value with 'account'
-    const TYPE_PROJECT = 6;
-    public $picto = 'category';
+    const TYPE_ACCOUNT = 5;    // TODO Replace this value with 'bank_account'
+	const TYPE_PROJECT = 6;
+    const TYPE_BANK_LINE = 'bank_line';
+	public $picto = 'category';
     
 
 	/**
@@ -1337,34 +1338,68 @@ class Categorie extends CommonObject
 			$type = $map_type[$type];
 		}
 
-		$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_" . $this->MAP_CAT_TABLE[$type] . " as ct, " . MAIN_DB_PREFIX . "categorie as c";
-		$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_" . $this->MAP_CAT_FK[$type] . " = " . (int) $id . " AND c.type = " . $this->MAP_ID[$type];
-		$sql .= " AND c.entity IN (" . getEntity( 'category', 1 ) . ")";
-
-		$res = $this->db->query($sql);
-		if ($res)
+		if ($type == Categorie::TYPE_BANK_LINE)   // TODO Remove this with standard category code
 		{
-			while ($obj = $this->db->fetch_object($res))
-			{
-				if ($mode == 'id') {
-					$cats[] = $obj->rowid;
-				} else if ($mode == 'label') {
-					$cats[] = $obj->label;
-				} else {
-					$cat = new Categorie($this->db);
-					$cat->fetch($obj->fk_categorie);
-					$cats[] = $cat;
-				}
-			}
-
-			return $cats;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
+		    // Load bank groups
+		    $sql = "SELECT c.label, c.rowid";
+		    $sql.= " FROM ".MAIN_DB_PREFIX."bank_class as a, ".MAIN_DB_PREFIX."bank_categ as c";
+		    $sql.= " WHERE a.lineid=".$id." AND a.fk_categ = c.rowid";
+		    $sql.= " ORDER BY c.label";
+		    
+		    $res = $this->db->query($sql);
+		    if ($res)
+		    {
+		        while ($obj = $this->db->fetch_object($res))
+		        {
+    				if ($mode == 'id') {
+    				    $cats[] = $obj->rowid;
+    				} else if ($mode == 'label') {
+    				    $cats[] = $obj->label;
+    				} else {
+    				    $cat = new Categorie($this->db);
+    				    $cat->id = $obj->rowid;
+    				    $cat->label = $obj->label;
+    				    $cats[] = $cat;
+    				}
+		        }
+		    }
+		    else
+		    {
+		        dol_print_error($this->db);
+		        return -1;
+		    }		    
 		}
+        else
+        {
+    		$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
+    		$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_" . $this->MAP_CAT_TABLE[$type] . " as ct, " . MAIN_DB_PREFIX . "categorie as c";
+    		$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_" . $this->MAP_CAT_FK[$type] . " = " . (int) $id . " AND c.type = " . $this->MAP_ID[$type];
+    		$sql .= " AND c.entity IN (" . getEntity( 'category', 1 ) . ")";
+    
+    		$res = $this->db->query($sql);
+    		if ($res)
+    		{
+    			while ($obj = $this->db->fetch_object($res))
+    			{
+    				if ($mode == 'id') {
+    					$cats[] = $obj->rowid;
+    				} else if ($mode == 'label') {
+    					$cats[] = $obj->label;
+    				} else {
+    					$cat = new Categorie($this->db);
+    					$cat->fetch($obj->fk_categorie);
+    					$cats[] = $cat;
+    				}
+    			}
+    		}
+    		else
+    		{
+    			dol_print_error($this->db);
+    			return -1;
+    		}
+        }
+    
+        return $cats;
 	}
 
 
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 360a0d15a00..b50bf07d31a 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Xavier DUTOIT        <doli@sydesy.com>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Christophe Combelles <ccomb@free.fr>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2015-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
@@ -30,6 +30,7 @@
 
 require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 $langs->load("banks");
 $langs->load("categories");
@@ -47,6 +48,8 @@ $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
 $rowid=GETPOST("rowid",'int');
 $orig_account=GETPOST("orig_account");
+$backtopage=GETPOST('backtopage');
+$cancel=GETPOSt('cancel');
 
 // Security check
 $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref :''));
@@ -59,6 +62,14 @@ if (! $user->rights->banque->lire && ! $user->rights->banque->consolidate) acces
 /*
  * Actions
  */
+if ($cancel)
+{
+    if ($backtopage)
+    {
+        header("Location: ".$backtopage);
+        exit;
+    }
+}
 
 if ($user->rights->banque->consolidate && $action == 'dvnext')
 {
@@ -81,21 +92,6 @@ if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->ban
     }
 }
 
-if ($user->rights->banque->modifier && $action == 'class')
-{
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".$rowid." AND fk_categ = ".GETPOST('cat1', 'int');
-    if (! $db->query($sql))
-    {
-        dol_print_error($db);
-    }
-
-    $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (lineid, fk_categ) VALUES (".$rowid.", ".GETPOST('cat1', 'int').")";
-    if (! $db->query($sql))
-    {
-        dol_print_error($db);
-    }
-}
-
 if ($user->rights->banque->modifier && $action == "update")
 {
 	$error=0;
@@ -145,7 +141,36 @@ if ($user->rights->banque->modifier && $action == "update")
 		$sql.= " WHERE rowid = ".$rowid;
 
 		$result = $db->query($sql);
-		if ($result)
+		if (! $result)
+		{
+		    $error++;
+		}
+		
+		if (! $error)
+		{
+            $arrayofcategs=GETPOST('custcats', 'array');
+    		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".$rowid;
+    		if (! $db->query($sql))
+    		{
+    		    $error++;
+    		    dol_print_error($db);
+    		}
+    		if (count($arrayofcategs))
+    		{
+        		foreach($arrayofcategs as $val)
+        		{
+            		$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (lineid, fk_categ) VALUES (".$rowid.", ".$val.")";
+            		if (! $db->query($sql))
+            		{
+            		    $error++;
+            		    dol_print_error($db);
+            		}
+        		}
+        		// $arrayselected will be loaded after in page output
+    		}
+		}		
+		
+		if (! $error)
 		{
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$db->commit();
@@ -204,19 +229,14 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action ==
 
 $form = new Form($db);
 
-llxHeader();
+llxHeader('', $langs->trans("BankTransaction"));
 
-// Load bank groups
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
-$bankcateg = new BankCateg($db);
-$options = array();
-
-foreach ($bankcateg->fetchAll() as $bankcategory) {
-    $options[$bankcategory->id] = $bankcategory->label;
+$c = new Categorie($db);
+$cats = $c->containing($rowid, Categorie::TYPE_BANK_LINE);
+foreach ($cats as $cat) {
+    $arrayselected[] = $cat->id;
 }
 
-$var=false;
-
 $tabs = array(
     array(
         DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$rowid,
@@ -300,7 +320,7 @@ if ($result)
         // Show links of bank transactions
         if (count($links))
         {
-            print "<tr><td>".$langs->trans("Links")."</td>";
+            print '<tr><td class="tdtop">'.$langs->trans("Links").'</td>';
             print '<td>';
             foreach($links as $key=>$val)
             {
@@ -430,7 +450,7 @@ if ($result)
         if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
         {
             print '<td>';
-            print '<input type="text" class="flat" size="40" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
+            print '<input type="text" class="flat minwidth200" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
             print '</td>';
         }
         else
@@ -444,7 +464,7 @@ if ($result)
         if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
         {
             print '<td>';
-            print '<input type="text" class="flat" size="40" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
+            print '<input type="text" class="flat minwidth200" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
             print '</td>';
         }
         else
@@ -498,7 +518,7 @@ if ($result)
         if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
         {
             print '<td>';
-            print '<input name="label" class="flat" '.($objp->rappro?' disabled':'').' value="';
+            print '<input name="label" class="flat minwidth300" '.($objp->rappro?' disabled':'').' value="';
             if (preg_match('/^\((.*)\)$/i',$objp->label,$reg))
             {
                 // Label generique car entre parentheses. On l'affiche en le traduisant
@@ -508,7 +528,7 @@ if ($result)
             {
                 print $objp->label;
             }
-            print '" size="50">';
+            print '">';
             print '</td>';
         }
         else
@@ -532,7 +552,7 @@ if ($result)
         if ($user->rights->banque->modifier)
         {
             print '<td>';
-            print '<input name="amount" class="flat" size="10" '.($objp->rappro?' disabled':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code);
+            print '<input name="amount" class="flat maxwidth100" '.($objp->rappro?' disabled':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code);
             print '</td>';
         }
         else
@@ -543,25 +563,41 @@ if ($result)
         }
         print "</tr>";
 
+        // Categories
+        if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
+        {
+            $langs->load('categories');
+        
+            // Bank line
+            print '<tr><td class="toptd">' . fieldLabel('RubriquesTransactions', 'custcats') . '</td><td>';
+            $cate_arbo = $form->select_all_categories(Categorie::TYPE_BANK_LINE, null, 'parent', null, null, 1);
+            print $form->multiselectarray('custcats', $cate_arbo, $arrayselected, null, null, null, null, "90%");
+            print "</td></tr>";
+        }
+
         print "</table>";
         
         dol_fiche_end();
         
+        
         print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div><br>';
-
+        
         print "</form>";
 
+        
+        
         // Releve rappro
         if ($acct->canBeConciliated() > 0)  // Si compte rapprochable
         {
-            print '<br><hr>'."\n";
-            
             print load_fiche_titre($langs->trans("Reconciliation"), '', 'title_bank.png');
+            print '<hr>'."\n";
+            
             print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$objp->rowid.'">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="setreconcile">';
             print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
-
+            print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+            
             print '<table class="border" width="100%">';
 
             print '<tr><td class="titlefield">'.$langs->trans("Conciliation")."</td>";
@@ -600,7 +636,15 @@ if ($result)
             print '</tr>';
             print '</table>';
 
-            print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div><br>';
+            print '<div class="center">';
+            
+            print '<input type="submit" class="button" value="'.$langs->trans("Update").'">';
+            if ($backtopage)
+            {
+                print ' &nbsp; ';
+                print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+            }            
+            print '</div>';
 
 			print '</form>';
         }
@@ -611,55 +655,6 @@ if ($result)
 }
 else dol_print_error($db);
 
-
-
-// List of bank categories
-print '<br>';
-
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$rowid.'&amp;id='.$id.'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="class">';
-print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Rubriques").'</td><td colspan="2">';
-if ($user->rights->banque->modifier)
-{
-    print Form::selectarray('cat1', $options, '', 1).' ';
-    print '<input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
-}
-print '</tr>';
-
-$sql = "SELECT c.label, c.rowid";
-$sql.= " FROM ".MAIN_DB_PREFIX."bank_class as a, ".MAIN_DB_PREFIX."bank_categ as c";
-$sql.= " WHERE a.lineid=".$rowid." AND a.fk_categ = c.rowid";
-$sql.= " ORDER BY c.label";
-$result = $db->query($sql);
-if ($result)
-{
-    $var=True;
-    $num = $db->num_rows($result);
-    $i = 0; $total = 0;
-    while ($i < $num)
-    {
-        $objp = $db->fetch_object($result);
-
-        print '<tr clas"oddeven">';
-
-        print "<td>".$objp->label."</td>";
-        print "<td align=\"center\"><a href=\"budget.php?bid=".$objp->rowid."\">".$langs->trans("ListBankTransactions")."</a></td>";
-        if ($user->rights->banque->modifier)
-        {
-            print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=delete_categ&amp;rowid='.$rowid.'&amp;fk_categ='.$objp->rowid.'">'.img_delete($langs->trans("Remove")).'</a></td>';
-        }
-        print '</tr>';
-
-        $i++;
-    }
-    $db->free($result);
-}
-print '</table></form>';
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 9d9826d0729..5abbcb2512e 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2017      Patrick Delcroix	<pmpdelcroix@gmail.com>
@@ -403,8 +403,7 @@ else
 			$objp = $db->fetch_object($result);
 			$total = $total + $objp->amount;
 
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 
 			// Date operation
 			print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->do),"day").'</td>';
@@ -595,7 +594,7 @@ else
 
 			if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
 			{
-				print "<td align=\"center\"><a href=\"ligne.php?rowid=$objp->rowid&amp;account=".$object->id."\">";
+				print '<td align="center"><a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?account='.$object->id.'&num='.$numref).'">';
 				print img_edit();
 				print "</a></td>";
 			}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index eba2fda5049..6bd2d3036b9 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3395,7 +3395,7 @@ class Form
      */
     function select_all_categories($type, $selected='', $htmlname="parent", $maxlength=64, $excludeafterid=0, $outputmode=0)
     {
-        global $langs;
+        global $conf, $langs;
         $langs->load("categories");
 
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
@@ -3406,9 +3406,35 @@ class Form
 		    dol_syslog(__METHOD__ . ': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
 		}
 
-        $cat = new Categorie($this->db);
-        $cate_arbo = $cat->get_full_arbo($type,$excludeafterid);
-
+		if ($type == Categorie::TYPE_BANK_LINE)
+		{
+		    // TODO Move this into common category feature
+		    $categids=array();
+		    $sql = "SELECT c.label, c.rowid";
+		    $sql.= " FROM ".MAIN_DB_PREFIX."bank_categ as c";
+		    $sql.= " WHERE entity = ".$conf->entity;
+		    $sql.= " ORDER BY c.label";
+		    $result = $this->db->query($sql);
+		    if ($result)
+		    {
+		        $num = $this->db->num_rows($result);
+		        $i = 0;
+		        while ($i < $num)
+		        {
+		            $objp = $this->db->fetch_object($result);
+		            if ($objp) $cate_arbo[$objp->rowid]=array('id'=>$objp->rowid, 'fulllabel'=>$objp->label);
+		            $i++;
+		        }
+		        $this->db->free($result);
+		    }
+		    else dol_print_error($this->db);
+		}
+		else
+		{
+            $cat = new Categorie($this->db);
+            $cate_arbo = $cat->get_full_arbo($type,$excludeafterid);
+		}
+		
         $output = '<select class="flat" name="'.$htmlname.'">';
 		$outarray=array();
         if (is_array($cate_arbo))
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index e6bfec0d84a..b55f81f5b7f 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2016-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -143,6 +143,8 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain
  */
 
 if (GETPOST('refreshsite')) $pageid=0;      // If we change the site, we reset the pageid.
+if (GETPOST('refreshpage')) $action='preview'; 
+
 
 // Add page
 if ($action == 'add')
@@ -434,7 +436,7 @@ if ($action == 'updatemeta')
 }
 
 // Update page
-if ($action == 'updatecontent')
+if ($action == 'updatecontent' || GETPOST('refreshsite') || GETPOST('refreshpage') || GETPOST('preview'))
 {
     $db->begin();
     $object->fetch(0, $website);
@@ -444,110 +446,123 @@ if ($action == 'updatecontent')
     $res = $objectpage->fetch($pageid, $object->fk_website);
     if ($res > 0)
     {
-        $objectpage->content = GETPOST('PAGE_CONTENT');
-
-        // Clean data. We remove all the head section.
-        $objectpage->content = preg_replace('/<head.*<\/head>/s', '', $objectpage->content);
-        /* $objectpage->content = preg_replace('/<base\s+href=[\'"][^\'"]+[\'"]\s/?>/s', '', $objectpage->content); */
-        
-        $res = $objectpage->update($user);
-        if ($res < 0)
+        if ($action == 'updatecontent')
         {
-            $error++;
-            setEventMessages($objectpage->error, $objectpage->errors, 'errors');
-        }
-
-    	if (! $error)
-    	{
-    		$db->commit();
-    	    
-    		$filemaster=$pathofwebsite.'/master.inc.php';
-    		//$fileoldalias=$pathofwebsite.'/'.$objectpage->old_object->pageurl.'.php';
-    		$filealias=$pathofwebsite.'/'.$objectpage->pageurl.'.php';
-    		
-    	    dol_mkdir($pathofwebsite);
-    		
-    		
-    		// Now generate the master.inc.php page
-    		dol_syslog("We regenerate the master file");
-    		dol_delete_file($filemaster);
-    		
-    		$mastercontent = '<?php'."\n";
-    		$mastercontent.= '// File generated to link to the master file'."\n";
-    		$mastercontent.= "if (! defined('USEDOLIBARRSERVER')) require '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
-    		$mastercontent.= '?>'."\n";
-    		$result = file_put_contents($filemaster, $mastercontent);
-    		if (! empty($conf->global->MAIN_UMASK))
-    		    @chmod($filemaster, octdec($conf->global->MAIN_UMASK));
-    		
-		    if (! $result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
-		
-		
-		    // Now generate the alias.php page
-            if (! empty($fileoldalias))
-            {
-    		    dol_syslog("We regenerate alias page new name=".$filealias.", old name=".$fileoldalias);
-    		    dol_delete_file($fileoldalias);
-            }
+            $objectpage->content = GETPOST('PAGE_CONTENT');
+    
+            // Clean data. We remove all the head section.
+            $objectpage->content = preg_replace('/<head.*<\/head>/s', '', $objectpage->content);
+            /* $objectpage->content = preg_replace('/<base\s+href=[\'"][^\'"]+[\'"]\s/?>/s', '', $objectpage->content); */
             
-		    $aliascontent = '<?php'."\n";
-		    $aliascontent.= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a copy of database page content\n";
-		    $aliascontent.= "include_once './page".$objectpage->id.".tpl.php';\n";
-		    $aliascontent.= '?>'."\n";
-		    $result = file_put_contents($filealias, $aliascontent);
-		    if (! empty($conf->global->MAIN_UMASK))
-		        @chmod($filealias, octdec($conf->global->MAIN_UMASK));
-		
-            if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
-		
-    		        
-    	    // Now create the .tpl file with code to be able to make dynamic changes
-    	    dol_delete_file($filetpl);
-
-            $tplcontent ='';
-            $tplcontent.= "<?php // BEGIN PHP\n";
-            $tplcontent.= "if (! defined('USEDOLIBARRSERVER')) { require './master.inc.php'; } // Not already loaded"."\n";
-            $tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-            $tplcontent.= "ob_start();\n";
-            $tplcontent.= "// END PHP ?>\n";
-    	    $tplcontent.= '<html>'."\n";
-    	    $tplcontent.= '<header>'."\n";
-    	    $tplcontent.= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
-    	    $tplcontent.= '<meta name="robots" content="index, follow" />'."\n";
-    	    $tplcontent.= '<meta name="viewport" content="width=device-width, initial-scale=0.8">'."\n";
-    	    $tplcontent.= '<meta name="keywords" content="'.join(', ', explode(',',$objectpage->keywords)).'" />'."\n";
-    	    $tplcontent.= '<meta name="title" content="'.dol_escape_htmltag($objectpage->title).'" />'."\n";
-    	    $tplcontent.= '<meta name="description" content="'.dol_escape_htmltag($objectpage->description).'" />'."\n";
-    	    $tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.'" />'."\n";
-    	    $tplcontent.= '<link rel="stylesheet" href="styles.css.php?website='.$website.'" type="text/css" />'."\n";
-    	    $tplcontent.= '<title>'.dol_escape_htmltag($objectpage->title).'</title>'."\n";
-    	    $tplcontent.= '</header>'."\n";
-    	    	
-    	    $tplcontent.= '<body>'."\n";
-    	    $tplcontent.= $objectpage->content."\n";
-    	    $tplcontent.= '</body>'."\n";
-    	    
-    	    $tplcontent.= '<?php // BEGIN PHP'."\n";
-    	    $tplcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
-    	    $tplcontent.= "// END PHP ?>"."\n";
-    	    
-            //var_dump($filetpl);exit;	    
-    	    $result = file_put_contents($filetpl, $tplcontent);
-    	    if (! empty($conf->global->MAIN_UMASK))
-    	        @chmod($filetpl, octdec($conf->global->MAIN_UMASK));
-                 
-    	    if ($result)
-    	    {
-    	        setEventMessages($langs->trans("Saved"), null, 'mesgs');
-    	        header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
-   	            exit;
-    	    }
-    	    else setEventMessages('Failed to write file '.$filetpl, null, 'errors');    	        
-    	}
-    	else
-    	{
-    		$db->rollback();
-    	}
+            $res = $objectpage->update($user);
+            if ($res < 0)
+            {
+                $error++;
+                setEventMessages($objectpage->error, $objectpage->errors, 'errors');
+            }
+    
+        	if (! $error)
+        	{
+        		$db->commit();
+        	    
+        		$filemaster=$pathofwebsite.'/master.inc.php';
+        		//$fileoldalias=$pathofwebsite.'/'.$objectpage->old_object->pageurl.'.php';
+        		$filealias=$pathofwebsite.'/'.$objectpage->pageurl.'.php';
+        		
+        	    dol_mkdir($pathofwebsite);
+        		
+        		
+        		// Now generate the master.inc.php page
+        		dol_syslog("We regenerate the master file");
+        		dol_delete_file($filemaster);
+        		
+        		$mastercontent = '<?php'."\n";
+        		$mastercontent.= '// File generated to link to the master file'."\n";
+        		$mastercontent.= "if (! defined('USEDOLIBARRSERVER')) require '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
+        		$mastercontent.= '?>'."\n";
+        		$result = file_put_contents($filemaster, $mastercontent);
+        		if (! empty($conf->global->MAIN_UMASK))
+        		    @chmod($filemaster, octdec($conf->global->MAIN_UMASK));
+        		
+    		    if (! $result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+    		
+    		
+    		    // Now generate the alias.php page
+                if (! empty($fileoldalias))
+                {
+        		    dol_syslog("We regenerate alias page new name=".$filealias.", old name=".$fileoldalias);
+        		    dol_delete_file($fileoldalias);
+                }
+                
+    		    $aliascontent = '<?php'."\n";
+    		    $aliascontent.= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a copy of database page content\n";
+    		    $aliascontent.= "include_once './page".$objectpage->id.".tpl.php';\n";
+    		    $aliascontent.= '?>'."\n";
+    		    $result = file_put_contents($filealias, $aliascontent);
+    		    if (! empty($conf->global->MAIN_UMASK))
+    		        @chmod($filealias, octdec($conf->global->MAIN_UMASK));
+    		
+                if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
+    		
+        		        
+        	    // Now create the .tpl file with code to be able to make dynamic changes
+        	    dol_delete_file($filetpl);
+    
+                $tplcontent ='';
+                $tplcontent.= "<?php // BEGIN PHP\n";
+                $tplcontent.= "if (! defined('USEDOLIBARRSERVER')) { require './master.inc.php'; } // Not already loaded"."\n";
+                $tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+                $tplcontent.= "ob_start();\n";
+                $tplcontent.= "// END PHP ?>\n";
+        	    $tplcontent.= '<html>'."\n";
+        	    $tplcontent.= '<header>'."\n";
+        	    $tplcontent.= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
+        	    $tplcontent.= '<meta name="robots" content="index, follow" />'."\n";
+        	    $tplcontent.= '<meta name="viewport" content="width=device-width, initial-scale=0.8">'."\n";
+        	    $tplcontent.= '<meta name="keywords" content="'.join(', ', explode(',',$objectpage->keywords)).'" />'."\n";
+        	    $tplcontent.= '<meta name="title" content="'.dol_escape_htmltag($objectpage->title).'" />'."\n";
+        	    $tplcontent.= '<meta name="description" content="'.dol_escape_htmltag($objectpage->description).'" />'."\n";
+        	    $tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.'" />'."\n";
+        	    $tplcontent.= '<link rel="stylesheet" href="styles.css.php?website='.$website.'" type="text/css" />'."\n";
+        	    $tplcontent.= '<title>'.dol_escape_htmltag($objectpage->title).'</title>'."\n";
+        	    $tplcontent.= '</header>'."\n";
+        	    	
+        	    $tplcontent.= '<body>'."\n";
+        	    $tplcontent.= $objectpage->content."\n";
+        	    $tplcontent.= '</body>'."\n";
+        	    
+        	    $tplcontent.= '<?php // BEGIN PHP'."\n";
+        	    $tplcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
+        	    $tplcontent.= "// END PHP ?>"."\n";
+        	    
+                //var_dump($filetpl);exit;	    
+        	    $result = file_put_contents($filetpl, $tplcontent);
+        	    if (! empty($conf->global->MAIN_UMASK))
+        	        @chmod($filetpl, octdec($conf->global->MAIN_UMASK));
+                     
+        	    if ($result)
+        	    {
+        	        setEventMessages($langs->trans("Saved"), null, 'mesgs');
+        	        header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
+       	            exit;
+        	    }
+        	    else 
+        	    {
+        	        setEventMessages('Failed to write file '.$filetpl, null, 'errors');    	        
+        	        header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
+       	            exit;
+        	    }
+        	}
+        	else
+        	{
+        		$db->rollback();
+        	}
+        }
+        else
+        {
+            header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website.'&pageid='.$pageid);
+            exit;
+        }
     }
     else
     {
@@ -603,7 +618,7 @@ if ($action == 'edit')
 $style='';
 if ($action != 'preview' && $action != 'editcontent') $style=' margin-bottom: 5px;';
 
-
+//var_dump($objectpage);exit;
 print '<div class="centpercent websitebar">';
 
 if (count($object->records) > 0)

From 56a4b7a1fd9bb9a84e71d4873d5cdaa6ea969d88 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 Apr 2017 14:03:38 +0200
Subject: [PATCH 0554/1163] Work on v6 look and feel

---
 htdocs/compta/bank/releve.php                 | 308 ++++++++++--------
 .../compta/paiement/class/paiement.class.php  |  29 +-
 htdocs/theme/eldy/style.css.php               |  17 +-
 htdocs/theme/md/style.css.php                 |  12 +-
 htdocs/user/class/user.class.php              |   4 +-
 5 files changed, 208 insertions(+), 162 deletions(-)

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 5abbcb2512e..008fdec874b 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -35,6 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 //show files
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
@@ -93,6 +95,27 @@ if ($id > 0 || ! empty($ref))
 // Initialize technical object to manage context to save list fields
 $contextpage='banktransactionlist'.(empty($object->ref)?'':'-'.$object->id);
 
+$sql = "SELECT b.rowid, b.dateo as do, b.datev as dv,";
+$sql.= " b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
+$sql.= " b.fk_bordereau,";
+$sql.= " bc.ref,";
+$sql.= " ba.rowid as bankid, ba.ref as bankref, ba.label as banklabel";
+$sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
+$sql.= ", ".MAIN_DB_PREFIX."bank as b";
+$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bordereau_cheque as bc ON bc.rowid=b.fk_bordereau';
+$sql.= " WHERE b.num_releve='".$db->escape($numref)."'";
+if (!isset($numref))	$sql.= " OR b.num_releve is null";
+$sql.= " AND b.fk_account = ".$object->id;
+$sql.= " AND b.fk_account = ba.rowid";
+$sql.= $db->order("b.datev, b.datec", "ASC");  // We add date of creation to have correct order when everything is done the same day
+
+$sqlrequestforbankline = $sql;
+
+
+
+/*
+ * Actions
+ */
 
 // ZIP creation
 if ($action=="dl" && $numref > 0)
@@ -100,36 +123,161 @@ if ($action=="dl" && $numref > 0)
 	// TODO Replace this with a standard builddoc action that use a document generation module to build the ZIP
     $log = '';
     
-    getAttachedFiles($db, $numref); // Build array $_SESSION["releve"][$numref] with all files to includes
+    $outdir = $conf->bank->dir_temp.'/'.$numref.'-'.$object->label;
+    $outdirinvoices = $outdir.'/'.$langs->trans("BillsCustomers");
+    $outdirsupplierinvoices = $outdir.'/'.$langs->trans("BillsSuppliers");
+
+    dol_mkdir($outdir);
+    dol_mkdir($outdirinvoices);
+    dol_mkdir($outdirsupplierinvoices);
     
-    $filearray = $_SESSION["releve"][$numref];
-    $zipname = $numref . '.zip';
+    //$zipname = $object->label.'-'.$numref . '.zip';
+    //$zip = new ZipArchive();
+    //$zip->open($zipname, ZipArchive::OVERWRITE);
+
+    $sql = $sqlrequestforbankline;
+
+    $facturestatic=new Facture($db);
     
-    $zip = new ZipArchive();
-    $zip->open($zipname, ZipArchive::OVERWRITE);
-    foreach ($filearray as $key => $files) {
-        if (is_array($files)) {
-            foreach ($files as $file) {
-                $zip->addFile($file["fullname"], $file["name"]); //
-                $log .= $key . ',' . $file["name"] . "\n";
+    $resd = $db->query($sql);
+    if ($resd) {
+        $numd = $db->num_rows($resd);
+        $i = 0;
+        if ($numd > 0)
+        {
+            $objd = $db->fetch_object($resd);
+            
+            $log.='Transaction '.$objd->rowid;
+            $links = $object->get_url($objd->rowid);
+
+            foreach($links as $key=>$val)
+            {
+                $link = ''; $upload_dir = '';
+
+                switch ($val['type']) {
+                    case "payment":
+                        $payment = new Paiement($db);
+                        $payment->fetch($val['url_id']);
+                        $arraybill = $payment->getBillsArray();
+                        if (count($arraybill) > 0)
+                        {
+                            foreach ($arraybill as $billid)
+                            {
+                                $facturestatic->fetch($billid);
+                                $subdir = get_exdir($facturestatic->id, 2, 0, 0, $facturestatic, 'invoice');
+                                
+                                $arrayofinclusion=array();              // TODO Find a way to get doc ODT or other
+                                // TODO Use get_exdir
+                                $arrayofinclusion[]=preg_quote($facturestatic->ref.'.pdf','/');
+                                $listoffiles = dol_dir_list($conf->facture->dir_output.$subdir,'all',1,implode('|',$arrayofinclusion),'\.meta$|\.png','date',SORT_DESC,0,true);
+                                // build list of files with full path
+                                $files = array();
+                                foreach($listoffiles as $filefound)
+                                {
+                                    if (strstr($filefound["name"],$facturestatic->ref))
+                                    {
+                                        $files[] = $uploaddir.'/'.$facturestatic->ref.'/'.$filefound["name"];
+                                        break;
+                                    }
+                                }
+                                /*var_dump($files);*/
+                                //var_dump($listoffiles);
+                                foreach($listoffiles as $key => $srcfileobj)
+                                {
+                                    $srcfile = $srcfileobj['fullname'];
+                                    $destfile = $outdirinvoices.'/'.$srcfileobj['name'];
+                                    //var_dump($srcfile.' - '.$destfile);
+                                    dol_copy($srcfile, $destfile);
+                                }
+                            }
+                        }
+                        break;
+                    case "payment_supplier":
+                        $payment = new PaiementFourn($db);
+                        $payment->fetch($val['url_id']);
+                        $arraybill = $payment->getBillsArray();
+                        if (count($arraybill) > 0)
+                        {
+                            foreach ($arraybill as $billid)
+                            {
+                                $facturestatic->fetch($billid);
+                                $subdir = get_exdir($facturestatic->id, 2, 0, 0, $facturestatic, 'invoice_supplier');
+                                
+                                $arrayofinclusion=array();              // TODO Find a way to get doc ODT or other
+                                // TODO Use get_exdir
+                                $arrayofinclusion[]=preg_quote($facturestatic->ref.'.pdf','/');
+                                $listoffiles = dol_dir_list($conf->fournisseur->facture->dir_output.$subdir,'all',1,implode('|',$arrayofinclusion),'\.meta$|\.png','date',SORT_DESC,0,true);
+                                // build list of files with full path
+                                $files = array();
+                                foreach($listoffiles as $filefound)
+                                {
+                                    if (strstr($filefound["name"],$facturestatic->ref))
+                                    {
+                                        $files[] = $uploaddir.'/'.$facturestatic->ref.'/'.$filefound["name"];
+                                        break;
+                                    }
+                                }
+                                /*var_dump($files);*/
+                                //var_dump($listoffiles);
+                                foreach($listoffiles as $key => $srcfileobj)
+                                {
+                                    $srcfile = $srcfileobj['fullname'];
+                                    $destfile = $outdirinvoices.'/'.$srcfileobj['name'];
+                                    //var_dump($srcfile.' - '.$destfile);
+                                    dol_copy($srcfile, $destfile);
+                                }
+                            }
+                        }                        
+                        break;
+                    case "payment_expensereport":
+                        /*$subdir = dol_sanitizeFileName($objd->refe);
+                        $upload_dir = $conf->expensereport->dir_output . '/' . $subdir;*/
+                        break;
+                    case "payment_salary":
+                        /*$subdir = dol_sanitizeFileName($objd->ids);
+                        $upload_dir = $conf->salaries->dir_output . '/' . $subdir;*/
+                        break;
+                    case "payment_donation":
+                        /*$subdir = get_exdir(null, 2, 0, 1, $objd, 'donation') . '/' . dol_sanitizeFileName($objd->idd);
+                        $upload_dir = $conf->don->dir_output . '/' . $subdir;*/
+                        break;
+                    default:
+                        break;
+                }
             }
-        } else {
-            $log .= $key . ',' . $langs->trans("Nofile") . "\n";
+            $log.="\n";
+            
+            /*if (! empty($upload_dir))
+            {
+                $files = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview\.png)$', '', SORT_ASC, 1);
+
+                if (is_array($files)) {
+                    foreach ($files as $file) {
+                        $zip->addFile($file["fullname"], $file["name"]); //
+                        $log .= $key . ',' . $file["name"] . "\n";
+                    }
+                } else {
+                    $log .= $key . ',' . $langs->trans("Nofile") . "\n";
+                }
+                
+            }*/
         }
     }
-    $zip->addFromString('log '.$numref.'.csv', $log);
-    $zip->close();
+    
+    $db->free($resd);
+    
+    
+    //$zip->addFromString('log '.$numref.'.csv', $log);
+    //$zip->close();
     
     // /Then download the zipped file.
-    header('Content-Type: application/zip');
+    /*header('Content-Type: application/zip');
     header('Content-disposition: attachment; filename=' . $zipname);
     header('Content-Length: ' . filesize($zipname));
     
     readfile($zipname);
     
-    unset($_SESSION["releve"][$numref]);
-    
-    exit;
+    exit;*/
 }
 
 
@@ -371,20 +519,8 @@ else
 	}
 
 	// Recherche les ecritures pour le releve
-	$sql = "SELECT b.rowid, b.dateo as do, b.datev as dv,";
-	$sql.= " b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
-	$sql.= " b.fk_bordereau,";
-    $sql.= " bc.ref,";
-	$sql.= " ba.rowid as bankid, ba.ref as bankref, ba.label as banklabel";
-	$sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
-	$sql.= ", ".MAIN_DB_PREFIX."bank as b";
-    $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bordereau_cheque as bc ON bc.rowid=b.fk_bordereau';
-	$sql.= " WHERE b.num_releve='".$db->escape($numref)."'";
-	if (!isset($numref))	$sql.= " OR b.num_releve is null";
-	$sql.= " AND b.fk_account = ".$object->id;
-	$sql.= " AND b.fk_account = ba.rowid";
-	$sql.= $db->order("b.datev, b.datec", "ASC");  // We add date of creation to have correct order when everything is done the same day
-
+    $sql = $sqlrequestforbankline;
+    
 	$result = $db->query($sql);
 	if ($result)
 	{
@@ -393,9 +529,9 @@ else
 		$i = 0;
 
 		// Ligne Solde debut releve
-		print "<tr ".$bc[$var]."><td colspan=\"3\"></td>";
-		print "<td colspan=\"3\"><b>".$langs->trans("InitialBankBalance")." :</b></td>";
-		print '<td align="right"><b>'.price($total).'</b></td><td>&nbsp;</td>';
+		print '<tr class="oddeven"><td colspan="3"></td>';
+		print '<td colspan="3"><b>'.$langs->trans("InitialBankBalance")." :</b></td>";
+		print '<td class="right"><b>'.price($total).'</b></td><td>&nbsp;</td>';
 		print "</tr>\n";
 
 		while ($i < $numrows)
@@ -613,7 +749,7 @@ else
 
 	// Line Balance
 	print "\n<tr><td align=\"right\" colspan=\"3\">&nbsp;</td><td colspan=\"3\"><b>".$langs->trans("EndBankBalance")." :</b></td>";
-	print "<td align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td>";
+	print '<td class="right"><b>'.price($total)."</b></td><td>&nbsp;</td>";
 	print "</tr>\n";
 	print "</table>";
 	print "</div>";
@@ -632,103 +768,3 @@ else
 llxFooter();
 
 $db->close();
-
-
-
-
-/**
- * Function to generate the HTML code used to show the file name & download link attached to the Item covered by the bank line
- * 
- * @param DoliDB    $db         database object   
- * @param int       $bankId     bank line id
- * @param int       $num        bank statement      
- * @param string    $label     label used to optimise the sql querry
- */
-function getAttachedFiles($db, $numref, $label='')
-{
-    $out = '';
-    global $conf;
-    $sql = 'SELECT u.url_id, u.type,ff.rowid as id , ff.`ref` AS reff, f.facnumber AS `ref`,';
-    $sql .= ' e.`ref` AS refe, sp.rowid AS ids, d.rowid AS idd';
-    $sql .= ' FROM ' . MAIN_DB_PREFIX . 'bank_url AS u, ' . MAIN_DB_PREFIX . 'bank AS b';
-    if (! empty($label) || $label == '(CustomerInvoicePayment)') {
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'paiement AS p ON p.fk_bank = u.fk_bank';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'paiement_facture AS pf ON pf.fk_paiement = p.rowid';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'facture AS f ON f.rowid = pf.fk_facture';
-    }
-    if (! empty($label) || $label == '(SupplierInvoicePayment)') {
-        // invoice suplier (SupplierInvoicePayment)
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'paiementfourn AS fp ON fp.fk_bank = u.fk_bank';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'paiementfourn_facturefourn AS fpf ON fpf.fk_paiementfourn = fp.rowid';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'facture_fourn AS ff ON ff.rowid = fpf.fk_facturefourn';
-    }
-    if (! empty($label) || $label == '(ExpenseReportPayment)') {
-        // EXPENSEs (ExpenseReportPayment)
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'payment_expensereport AS ep ON ep.fk_bank = u.fk_bank';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'expensereport AS e ON e.rowid = ep.fk_expensereport';
-    }
-    if (! empty($label) || $label == '(DonationPayment)') {
-        // donation
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'payment_donation AS dp ON dp.fk_bank = u.fk_bank';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'don AS d ON d.rowid = dp.fk_donation';
-    }
-    if (! empty($label) || $label == '(SalaryPayment)') {
-        // loan
-        // $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_loan AS lp ON lp.fk_bank = u.fk_bank';
-        // salary
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'payment_salary AS sp ON sp.fk_bank = u.fk_bank';
-    }
-    // END SQL
-    $sql .= " WHERE u.fk_bank = b.rowid AND u.type in ('payment','payment_supplier','payment_expensereport','payment_salary','payment_donation' )";
-    $resd = $db->query($sql);
-    $files = array();
-    $link = '';
-    if ($resd) {
-        $numd = $db->num_rows($resd);
-        $upload_dir = '';
-        $i = 0;
-        if ($numd > 0) 
-        {
-            $objd = $db->fetch_object($resd);
-            
-            switch ($objd->type) {
-                case "payment":
-                    $subdir = dol_sanitizeFileName($objd->ref);
-                    $upload_dir = $conf->facture->dir_output . '/' . $subdir;
-                    $link = DOL_URL_ROOT."/document.php?modulepart=facture&file=" . str_replace('/', '%2F', $subdir) . '%2F';
-                    break;
-                case "payment_supplier":
-                    $subdir = get_exdir($objd->id, 2, 0, 0, $objd, 'invoice_supplier') . $objd->reff;
-                    $upload_dir = $conf->fournisseur->facture->dir_output . '/' . $subdir;
-                    $link = DOL_URL_ROOT."/document.php?modulepart=facture_fournisseur&file=" . str_replace('/', '%2F', $subdir) . '%2F';
-                    break;
-                case "payment_expensereport":
-                    $subdir = dol_sanitizeFileName($objd->refe);
-                    $upload_dir = $conf->expensereport->dir_output . '/' . $subdir;
-                    $link = DOL_URL_ROOT."/document.php?modulepart=expensereport&file=" . str_replace('/', '%2F', $subdir) . '%2F';
-                    break;
-                case "payment_salary":
-                    $subdir = dol_sanitizeFileName($objd->ids);
-                    $upload_dir = $conf->salaries->dir_output . '/' . $subdir;
-                    $link = DOL_URL_ROOT."/document.php?modulepart=salaries&file=" . str_replace('/', '%2F', $subdir) . '%2F';
-                    break;
-                case "payment_donation":
-                    $subdir = get_exdir(null, 2, 0, 1, $objd, 'donation') . '/' . dol_sanitizeFileName($objd->idd);
-                    $upload_dir = $conf->don->dir_output . '/' . $subdir;
-                    $link = DOL_URL_ROOT."/document.php?modulepart=don&file=" . str_replace('/', '%2F', $subdir) . '%2F';
-                    break;
-                default:
-                    break;
-            }
-            
-            if (! empty($upload_dir)) 
-            {
-                $files = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview\.png)$', '', SORT_ASC, 1);
-                $_SESSION["releve"][$numref][] = $files;
-            }
-        }
-    }
-
-    $db->free($resd);
-    return $out;
-}
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index b229f756b25..53035dca96f 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -965,26 +965,29 @@ class Paiement extends CommonObject
 	 *
 	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param	string	$option			Sur quoi pointe le lien
+	 *  @param  string  $mode           'withlistofinvoices'=Include list of invoices into tooltip
 	 *	@return	string					Chaine avec URL
 	 */
-	function getNomUrl($withpicto=0,$option='')
+	function getNomUrl($withpicto=0,$option='',$mode='withlistofinvoices')
 	{
 		global $langs;
 
 		$result='';
         $label = $langs->trans("ShowPayment").': '.$this->ref;
-	$arraybill = $this->getBillsArray();
-	if (count($arraybill) >0)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-		$facturestatic=new Facture($this->db);
-		foreach ($arraybill as $billid)
-		{
-			$facturestatic->fetch($billid);
-			$label .='<br> '.$facturestatic->getNomUrl(1).' '.$facturestatic->getLibStatut(2,1);
-		}
-	}
-
+        if ($mode == 'withlistofinvoices')
+        {
+            $arraybill = $this->getBillsArray();
+            if (count($arraybill) > 0)
+            {
+            	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+            	$facturestatic=new Facture($this->db);
+            	foreach ($arraybill as $billid)
+            	{
+            		$facturestatic->fetch($billid);
+            		$label .='<br> '.$facturestatic->getNomUrl(1).' '.$facturestatic->getLibStatut(2,1);
+            	}
+            }
+        }
         $link = '<a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 793e17c8f72..38ab27f844c 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -932,7 +932,7 @@ div.vmenu, td.vmenu {
 
 
 /* For smartphone (testmenuhider is on) */
-<?php if ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
+<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 #id-container {
 	width: 100%;
 }
@@ -4540,7 +4540,7 @@ div.tabsElem a.tab {
 	}
 }
 /* rule to reduce top menu - 3rd reduction */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 8; ?>px)	/* reduction 3 */
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 3.6, 0) + 12; ?>px)	/* reduction 3 */
 {
 	.side-nav {
 		z-index: 200;
@@ -4570,16 +4570,23 @@ div.tabsElem a.tab {
 		width: 100%;
 	}
 	div.login_block {
+		<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 		display: none;
+		padding-top: 20px;
+		padding-left: 20px;
+    	padding-right: 20px;
+		<?php } else { ?>
+		padding-top: 10px;
+		padding-left: 5px;
+    	padding-right: 5px;
+    	<?php } ?>
 		top: inherit !important;
 		left: 0 !important;
 		text-align: center;
         vertical-align: middle;
         background: #FFF;
         height: 42px;
-		padding-top: 20px;
-		padding-left: 20px;
-    	padding-right: 20px;
+        
     	z-index: 202;
     	min-width: 190px;
     	max-width: 190px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index f3232b31d6b..a681fcc0ee4 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -929,7 +929,7 @@ td.showDragHandle {
 	display: block;
 	font-family: "RobotoDraft","Roboto",sans-serif;
 	left: 0;
-<?php if ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
+<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 <?php } else { ?>
 	position: fixed;
 	top: 50px;
@@ -958,7 +958,7 @@ td.showDragHandle {
 	-moz-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 	transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 	-webkit-overflow-scrolling: touch;
-<?php if ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
+<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 <?php } else { ?>
 	overflow-x: hidden;
 	overflow-y: auto;
@@ -970,7 +970,7 @@ td.showDragHandle {
 }
 
 /* For smartphone (testmenuhider is on) */
-<?php if ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
+<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 #id-container {
 	width: 100%;
 }
@@ -982,7 +982,7 @@ div.login_block {
 	top: inherit !important;
 }
 .side-nav {
-<?php if ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
+<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 <?php } else { ?>
 	overflow-x: initial !important;
 	overflow-y: scroll;
@@ -1004,7 +1004,7 @@ div.login_block {
 	z-index: 201;
 	background: #FFF;
 	border-right: 1px solid rgba(0,0,0,0.3);
-<?php if ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
+<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 	top: 50px ! important;
 <?php } else { ?>
 	top: 60px ! important;
@@ -1647,7 +1647,7 @@ div.login_block {
     padding-bottom: 3px;
 	<?php print $left; ?>: 0;
 	top: 0px;
-<?php if ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
+<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 	position: absolute;
 <?php } else { ?>
 	position: fixed;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 8529a0c0cfc..594c7e090d6 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2072,9 +2072,9 @@ class User extends CommonObject
 	      	$paddafterimage='';
 			if (abs($withpictoimg) == 1) $paddafterimage='style="margin-right: 3px;"';
         	// Only picto
-			if ($withpictoimg > 0) $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
+			if ($withpictoimg > 0) $picto='<div class="inline-block nopadding '.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
         	// Picto must be a photo
-			else $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg==-3?'small':''), 'mini', 0, 1).'</div>';
+			else $picto='<div class="inline-block nopadding '.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg==-3?'small':''), 'mini', 0, 1).'</div>';
             $result.=$picto;
 		}
 		if ($withpictoimg > -2 && $withpictoimg != 2)

From bb7c164752db62c32a26f0f4de505c144536bfb1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 Apr 2017 14:18:10 +0200
Subject: [PATCH 0555/1163] Work on page to set/edit default values

---
 htdocs/admin/defaultvalues.php          | 279 ++++++++++++++++++++++++
 htdocs/admin/translation.php            |   4 -
 htdocs/core/lib/admin.lib.php           |  29 +++
 htdocs/core/menus/standard/eldy.lib.php |   1 +
 4 files changed, 309 insertions(+), 4 deletions(-)
 create mode 100644 htdocs/admin/defaultvalues.php

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
new file mode 100644
index 00000000000..4a4815e726b
--- /dev/null
+++ b/htdocs/admin/defaultvalues.php
@@ -0,0 +1,279 @@
+<?php
+/* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/admin/defaultvalues.php
+ *       \brief      Page to set default values used used in a create form
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+
+$langs->load("companies");
+$langs->load("products");
+$langs->load("admin");
+$langs->load("sms");
+$langs->load("other");
+$langs->load("errors");
+
+if (!$user->admin) accessforbidden();
+
+$id=GETPOST('rowid','int');
+$action=GETPOST('action','alpha');
+
+$mode = GETPOST('mode')?GETPOST('mode'):'overwrite';
+
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield='lang,transkey';
+if (! $sortorder) $sortorder='ASC';
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
+$parameters=array('socid'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+// Purge search criteria
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+{
+    $transkey='';
+    $transvalue='';
+    $toselect='';
+    $search_array_options=array();
+}
+
+
+if ($action == 'add' || (GETPOST('add') && $action != 'update'))
+{
+	$error=0;
+
+	if (empty($langcode))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Language")), null, 'errors');
+		$error++;
+	}
+	if ($transkey == '')
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Key")), null, 'errors');
+		$error++;
+	}
+	if ($transvalue == '')
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NewTranslationStringToShow")), null, 'errors');
+		$error++;
+	}
+	if (! $error)
+	{
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."')";
+		$result = $db->query($sql);
+		if ($result > 0)
+		{
+			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+			$action="";
+			$transkey="";
+			$transvalue="";
+		}
+		else
+		{
+			dol_print_error($db);
+			$action='';
+		}
+	}
+}
+
+// Delete line from delete picto
+if ($action == 'delete')
+{
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."overwrite_trans WHERE rowid = ".$db->escape($id);
+	$result = $db->query($sql);
+	if ($result >= 0)
+	{
+		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+
+
+
+
+
+/*
+ * View
+ */
+
+$formadmin = new FormAdmin($db);
+
+$wikihelp='EN:Setup|FR:Paramétrage|ES:Configuración';
+llxHeader('',$langs->trans("Setup"),$wikihelp);
+
+print load_fiche_titre($langs->trans("DefaultValues"),'','title_setup');
+
+print $langs->trans("DefaultValuesDesc")."<br>\n";
+print "<br>\n";
+
+$param='&mode='.$mode;
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+if ($optioncss != '') $param.='&optioncss='.$optioncss;
+if ($langcode)        $param.='&langcode='.urlencode($langcode);
+if ($transkey)        $param.='&transkey='.urlencode($transkey);
+if ($transvalue)      $param.='&transvalue='.urlencode($transvalue);
+
+
+print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug)?'?debug=1':'').'" method="POST">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+
+$head=defaultvalues_prepare_head();
+    
+dol_fiche_head($head, 'overwrite', '', -1, '');
+
+
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" id="action" name="action" value="">';
+print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print_liste_field_titre($langs->trans("Language").' (en_US, es_MX, ...)',$_SERVER["PHP_SELF"],'lang,transkey','',$param,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Key"),$_SERVER["PHP_SELF"],'transkey','',$param,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("NewTranslationStringToShow"),$_SERVER["PHP_SELF"],'transvalue','',$param,'',$sortfield,$sortorder);
+//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],'entity,transkey','',$param,'',$sortfield,$sortorder);
+print '<td align="center"></td>';
+print "</tr>\n";
+
+
+// Line to add new record
+print "\n";
+
+print '<tr class="oddeven"><td>';
+print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, 0, 'maxwidthonsmartphone', 1);
+print '</td>'."\n";
+print '<td>';
+print '<input type="text" class="flat maxwidthonsmartphone" name="transkey" value="">';
+print '</td><td>';
+print '<input type="text" class="quatrevingtpercent" name="transvalue" value="">';
+print '</td>';
+// Limit to superadmin
+/*if (! empty($conf->multicompany->enabled) && !$user->entity)
+{
+	print '<td>';
+	print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">';
+	print '</td>';
+	print '<td align="center">';
+}
+else
+{*/
+	print '<td align="center">';
+	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
+//}
+print '<input type="submit" class="button" value="'.$langs->trans("Add").'" name="add">';
+print "</td>\n";
+print '</tr>';
+
+
+// Show constants
+$sql = "SELECT";
+$sql.= " rowid";
+$sql.= ", lang";
+$sql.= ", transkey";
+$sql.= ", transvalue";
+$sql.= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
+$sql.= " WHERE 1 = 1";
+//$sql.= " AND entity IN (".$user->entity.",".$conf->entity.")";
+//if ((empty($user->entity) || $user->admin) && $debug) {} 										// to force for superadmin to debug
+//else if (! GETPOST('visible') || GETPOST('visible') != 'all') $sql.= " AND visible = 1";		// We must always have this. Otherwise, array is too large and submitting data fails due to apache POST or GET limits
+//if (GETPOST('name')) $sql.=natural_search("name", GETPOST('name'));
+//$sql.= " ORDER BY entity, name ASC";
+$sql.= $db->order($sortfield, $sortorder);
+
+dol_syslog("translation::select from table", LOG_DEBUG);
+$result = $db->query($sql);
+if ($result)
+{
+	$num = $db->num_rows($result);
+	$i = 0;
+	$var=false;
+
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($result);
+		$var=!$var;
+
+		print "\n";
+
+		print '<tr '.$bc[$var].'>';
+		
+		print '<td>'.$obj->lang.'</td>'."\n";
+		print '<td>'.$obj->transkey.'</td>'."\n";
+
+		// Value
+		print '<td>';
+		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
+		print '<input type="hidden" name="const['.$i.'][lang]" value="'.$obj->lang.'">';
+		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
+		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
+		*/
+		print $obj->transvalue;
+		print '</td>';
+
+		print '<td align="center">';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_delete().'</a>';
+		print '</td>';
+		
+		print "</tr>\n";
+		print "\n";
+		$i++;
+	}
+}
+
+
+print '</table>';
+
+dol_fiche_end();
+
+print "</form>\n";
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 4dbfc53c821..bb485c41999 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -57,10 +57,6 @@ if (! $sortfield) $sortfield='lang,transkey';
 if (! $sortorder) $sortorder='ASC';
 
 
-/*
- * Actions
- */
-
 /*
  * Actions
  */
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index edfeef064f2..5c4df1bcd91 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -598,6 +598,35 @@ function translation_prepare_head()
 }
 
 
+/**
+ * Prepare array with list of tabs
+ *
+ * @return  array				Array of tabs to show
+ */
+function defaultvalues_prepare_head()
+{
+    global $langs, $conf, $user;
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=overwrite";
+    $head[$h][1] = $langs->trans("DefaultValuesOverwriteKey");
+    $head[$h][2] = 'overwrite';
+    $h++;
+
+    /*$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";
+    $head[$h][1] = $langs->trans("TranslationKeySearch");
+    $head[$h][2] = 'searchkey';
+    $h++;*/
+
+    complete_head_from_modules($conf,$langs,null,$head,$h,'defaultvalues_admin');
+
+    complete_head_from_modules($conf,$langs,null,$head,$h,'defaultvalues_admin','remove');
+
+
+    return $head;
+}
+
 
 /**
  * 	Return list of session
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index c0da3e8af0e..f85885def1d 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -545,6 +545,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"),1);
 
 				$newmenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"),1);
+				$newmenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"),1, $conf->global->MAIN_FEATURES_LEVEL);
 				$newmenu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"),1);
 				$newmenu->add("/admin/delais.php?mainmenu=home",$langs->trans("MenuWarnings"),1);
 				$newmenu->add("/admin/security_other.php?mainmenu=home", $langs->trans("Security"),1);

From ff75077b340888a079b1a61c541b1c90bb83d03b Mon Sep 17 00:00:00 2001
From: vvnt <vivien.texier@gmail.com>
Date: Sat, 8 Apr 2017 20:15:14 +0200
Subject: [PATCH 0556/1163] Fix: bug #6653 situation invoice miscalculation

Bug (#6653)

In price.lib.php (htdocs\core\lib\price.lib.php), the function calcul_price_total() is defined (line 76). The 7th parameter is **$remise_percent_global**.

However, this function is called on facture.class.php (htdocs\compta\facture\class\facture.class.php) and the 7th parameter used is **$line->product_type**. Consequently, invoice situation is correct when user sells a product (product_type = 0) and is wrong when user sells a service (product_type = 1).
Effectively, in the latter case, the total situation invoice will be wrong by 1%.

In order to correct this, we can add 0 as the 7th parameter and move **$line->product_type** to the 10th parameter.
---
 htdocs/compta/facture/class/facture.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 963534da934..5838bb9bcf3 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2872,7 +2872,7 @@ class Facture extends CommonInvoice
 		// Cap percentages to 100
 		if ($percent > 100) $percent = 100;
 		$line->situation_percent = $percent;
-		$tabprice = calcul_price_total($line->qty, $line->subprice, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->product_type, 'HT', 0, 0, $mysoc, '', $percent);
+		$tabprice = calcul_price_total($line->qty, $line->subprice, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 0, 'HT', 0, $line->product_type, $mysoc, '', $percent);
 		$line->total_ht = $tabprice[0];
 		$line->total_tva = $tabprice[1];
 		$line->total_ttc = $tabprice[2];

From feebd4252a0d364f18cfcbb520d8e4c3248d74f8 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sun, 9 Apr 2017 11:29:54 +0200
Subject: [PATCH 0557/1163] add invoice_rec_prepare_head for reccuring invoice

---
 htdocs/core/lib/invoice.lib.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 6e5640d1e0a..453b27aefee 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2015      Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2017      	Charlie Benke		<charlie@patas-monkey.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -157,4 +158,27 @@ function invoice_admin_prepare_head()
 }
 
 
+function invoice_rec_prepare_head($object)
+{
+	global $db, $langs, $conf;
+	
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/fiche-rec.php?facid='.$object->id;
+	$head[$h][1] = $langs->trans('Card');
+	$head[$h][2] = 'compta';
+	$h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice-rec');
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice-rec','remove');
+
+	return $head;
+}
+
 

From 54780ff205b5ab18b8a25b11318c08b8cb50c788 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sun, 9 Apr 2017 11:33:09 +0200
Subject: [PATCH 0558/1163] Update fiche-rec.php

---
 htdocs/compta/facture/fiche-rec.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 88cb39bd7a9..90938242f5f 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -38,6 +38,7 @@ if (! empty($conf->projet->enabled)) {
     require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 }
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php';
 
 $langs->load('bills');
 $langs->load('compta');
@@ -1109,11 +1110,7 @@ else
 		$author = new User($db);
 		$author->fetch($object->user_author);
 
-		$head=array();
-		$h=0;
-		$head[$h][0] = $_SERVER["PHP_SELF"].'?id='.$object->id;
-		$head[$h][1] = $langs->trans("CardBill");
-		$head[$h][2] = 'card';
+		$head=invoice_rec_prepare_head($object);
 
 		dol_fiche_head($head, 'card', $langs->trans("RepeatableInvoice"),0,'bill');	// Add a div
 

From a0a9c8fa0c35e5c122fa5ee5a3c4c077cdcee77a Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sun, 9 Apr 2017 11:33:56 +0200
Subject: [PATCH 0559/1163] Update invoice.lib.php

---
 htdocs/core/lib/invoice.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 453b27aefee..564e909a2da 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -165,9 +165,9 @@ function invoice_rec_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/fiche-rec.php?facid='.$object->id;
-	$head[$h][1] = $langs->trans('Card');
-	$head[$h][2] = 'compta';
+	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/fiche-rec.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("CardBill");
+	$head[$h][2] = 'card';
 	$h++;
 
     // Show more tabs from modules

From e4ed626912dcd6d070eeb286e15a124d94d110c8 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sun, 9 Apr 2017 12:50:09 +0200
Subject: [PATCH 0560/1163] Fix: Travis error

---
 test/phpunit/FactureFournisseurTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/phpunit/FactureFournisseurTest.php b/test/phpunit/FactureFournisseurTest.php
index 199d397f50d..7985e8f0931 100644
--- a/test/phpunit/FactureFournisseurTest.php
+++ b/test/phpunit/FactureFournisseurTest.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2017 Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -259,7 +260,7 @@ class FactureFournisseurTest extends PHPUnit_Framework_TestCase
 
 		$localobject=new FactureFournisseur($this->savdb);
     	$result=$localobject->fetch($id);
-		$result=$localobject->delete($id);
+		$result=$localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);

From 52c86cb3f5af57c26e691241adf9bfde3e1bd2ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 Apr 2017 13:12:25 +0200
Subject: [PATCH 0561/1163] NEW Bulk actions available on supplier orders

---
 htdocs/comm/card.php                      |   2 +-
 htdocs/comm/remise.php                    |  38 +-
 htdocs/comm/remx.php                      | 262 ++++++-----
 htdocs/commande/list.php                  | 449 ++++++++++---------
 htdocs/core/class/html.form.class.php     |   2 +-
 htdocs/core/class/html.formfile.class.php |  10 +-
 htdocs/core/lib/files.lib.php             |  24 +
 htdocs/core/lib/functions.lib.php         |  16 +
 htdocs/fourn/commande/list.php            | 517 +++++++++++++++++++---
 htdocs/societe/class/societe.class.php    |   2 +-
 htdocs/theme/eldy/style.css.php           |  23 +-
 htdocs/theme/md/style.css.php             |  14 +-
 12 files changed, 913 insertions(+), 446 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index aa6c2729745..52fdaa6eceb 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -460,7 +460,7 @@ if ($id > 0)
         }
         else
         {
-            print $langs->trans("ThirdpartyNotLinkedToMember");
+            print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
         }
         print '</td>';
         print "</tr>\n";
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index cf93c87dabb..2be1981c5ae 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -107,7 +107,7 @@ if ($socid > 0)
 	print '<input type="hidden" name="action" value="setremise">';
     print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-	dol_fiche_head($head, 'relativediscount', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'relativediscount', $langs->trans("ThirdParty"), 0, 'company');
 
     dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom');
 
@@ -119,7 +119,6 @@ if ($socid > 0)
 	// Discount
 	print '<tr><td class="titlefield">';
 	print $langs->trans("CustomerRelativeDiscount").'</td><td>'.price2num($object->remise_percent)."%</td></tr>";
-
 	print '</table>';
 	print '<br>';
 
@@ -130,11 +129,11 @@ if ($socid > 0)
 	print '<table class="border centpercent">';
 
 	// New value
-	print '<tr><td class="titlefield">';
+	print '<tr><td class="titlefield fieldrequired">';
 	print $langs->trans("NewValue").'</td><td><input type="text" size="5" name="remise" value="'.dol_escape_htmltag(GETPOST("remise")).'">%</td></tr>';
 
 	// Motif/Note
-	print '<tr><td>';
+	print '<tr><td class="fieldrequired">';
 	print $langs->trans("NoteReason").'</td><td><input type="text" size="60" name="note" value="'.dol_escape_htmltag(GETPOST("note")).'"></td></tr>';
 
 	print "</table>";
@@ -179,21 +178,26 @@ if ($socid > 0)
 		print '<td align="left">'.$langs->trans("NoteReason").'</td>';
 		print '<td align="center">'.$langs->trans("User").'</td>';
 		print '</tr>';
-		$i = 0 ;
 		$num = $db->num_rows($resql);
-
-		while ($i < $num )
-		{
-			$obj = $db->fetch_object($resql);
-			$tag = !$tag;
-			print '<tr '.$bc[$tag].'>';
-			print '<td>'.dol_print_date($db->jdate($obj->dc),"dayhour").'</td>';
-			print '<td align="center">'.price2num($obj->remise_percent).'%</td>';
-			print '<td align="left">'.$obj->note.'</td>';
-			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
-			print '</tr>';
-			$i++;
+        if ($num > 0)
+        {
+		    $i = 0;
+            while ($i < $num)
+    		{
+    			$obj = $db->fetch_object($resql);
+    			print '<tr class="oddeven">';
+    			print '<td>'.dol_print_date($db->jdate($obj->dc),"dayhour").'</td>';
+    			print '<td align="center">'.price2num($obj->remise_percent).'%</td>';
+    			print '<td align="left">'.$obj->note.'</td>';
+    			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
+    			print '</tr>';
+    			$i++;
+    		}
 		}
+		else
+		{
+		    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}		
 		$db->free($resql);
 		print "</table>";
 	}
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 6481c891d45..375b4d0ecb8 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -235,7 +235,7 @@ if ($socid > 0)
 	print '<input type="hidden" name="action" value="setremise">';
     print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-	dol_fiche_head($head, 'absolutediscount', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'absolutediscount', $langs->trans("ThirdParty"), 0, 'company');
 
     dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom');
 
@@ -274,6 +274,8 @@ if ($socid > 0)
 	}
 	print '</table>';
 
+	print '</div>';
+	
 	if ($user->rights->societe->creer)
 	{
     	print '<br>';
@@ -294,7 +296,6 @@ if ($socid > 0)
     
     	print "</table>";
 	}
-	print '</div>';
 
 	dol_fiche_end();
 
@@ -342,8 +343,8 @@ if ($socid > 0)
 		print load_fiche_titre($langs->trans("DiscountStillRemaining"));
 		print '<table width="100%" class="noborder">';
 		print '<tr class="liste_titre">';
-		print '<td width="120" align="left">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
-		print '<td align="left">'.$langs->trans("ReasonDiscount").'</td>';
+		print '<td class="widthdate">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
+		print '<td>'.$langs->trans("ReasonDiscount").'</td>';
 		print '<td width="150" class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 		print '<td width="120" align="right">'.$langs->trans("AmountHT").'</td>';
 		print '<td width="80" align="right">'.$langs->trans("VATRate").'</td>';
@@ -354,73 +355,79 @@ if ($socid > 0)
 
 		$showconfirminfo=array();
 
-		$var = true;
 		$i = 0;
 		$num = $db->num_rows($resql);
-		while ($i < $num)
+		if ($num > 0)
 		{
-			$obj = $db->fetch_object($resql);
-			$var = !$var;
-			print "<tr ".$bc[$var].">";
-			print '<td>'.dol_print_date($db->jdate($obj->dc),'dayhour').'</td>';
-			if (preg_match('/\(CREDIT_NOTE\)/',$obj->description))
-			{
-				print '<td class="nowrap">';
-				$facturestatic->id=$obj->fk_facture_source;
-				$facturestatic->ref=$obj->ref;
-				$facturestatic->type=$obj->type;
-				print preg_replace('/\(CREDIT_NOTE\)/',$langs->trans("CreditNote"),$obj->description).' '.$facturestatic->getNomURl(1);
-				print '</td>';
-			}
-			elseif (preg_match('/\(DEPOSIT\)/',$obj->description))
-			{
-				print '<td class="nowrap">';
-				$facturestatic->id=$obj->fk_facture_source;
-				$facturestatic->ref=$obj->ref;
-				$facturestatic->type=$obj->type;
-				print preg_replace('/\(DEPOSIT\)/',$langs->trans("InvoiceDeposit"),$obj->description).' '.$facturestatic->getNomURl(1);
-				print '</td>';
-			}
-			elseif (preg_match('/\(EXCESS RECEIVED\)/',$obj->description))
-			{
-				print '<td class="nowrap">';
-				$facturestatic->id=$obj->fk_facture_source;
-				$facturestatic->ref=$obj->ref;
-				$facturestatic->type=$obj->type;
-				print preg_replace('/\(EXCESS RECEIVED\)/',$langs->trans("Invoice"),$obj->description).' '.$facturestatic->getNomURl(1);
-				print '</td>';
-			}
-			else
-			{
-				print '<td>';
-				print $obj->description;
-				print '</td>';
-			}
-			print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
-			print '<td align="right">'.price($obj->amount_ht).'</td>';
-			print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
-			print '<td align="right">'.price($obj->amount_ttc).'</td>';
-			print '<td align="center">';
-			print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a>';
-			print '</td>';
-			if ($user->rights->societe->creer || $user->rights->facture->creer)
-			{
-				print '<td class="nowrap">';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=split&amp;remid='.$obj->rowid.'">'.img_picto($langs->trans("SplitDiscount"),'split').'</a>';
-				print ' &nbsp; ';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;remid='.$obj->rowid.'">'.img_delete($langs->trans("RemoveDiscount")).'</a>';
-				print '</td>';
-			}
-			else print '<td>&nbsp;</td>';
-			print '</tr>';
-
-			if ($_GET["action"]=='split' && GETPOST('remid') == $obj->rowid)
-			{
-				$showconfirminfo['rowid']=$obj->rowid;
-				$showconfirminfo['amount_ttc']=$obj->amount_ttc;
-			}
-			$i++;
+    		while ($i < $num)
+    		{
+    			$obj = $db->fetch_object($resql);
+    
+    			print '<tr class="oddeven">';
+    			print '<td>'.dol_print_date($db->jdate($obj->dc),'dayhour').'</td>';
+    			if (preg_match('/\(CREDIT_NOTE\)/',$obj->description))
+    			{
+    				print '<td class="nowrap">';
+    				$facturestatic->id=$obj->fk_facture_source;
+    				$facturestatic->ref=$obj->ref;
+    				$facturestatic->type=$obj->type;
+    				print preg_replace('/\(CREDIT_NOTE\)/',$langs->trans("CreditNote"),$obj->description).' '.$facturestatic->getNomURl(1);
+    				print '</td>';
+    			}
+    			elseif (preg_match('/\(DEPOSIT\)/',$obj->description))
+    			{
+    				print '<td class="nowrap">';
+    				$facturestatic->id=$obj->fk_facture_source;
+    				$facturestatic->ref=$obj->ref;
+    				$facturestatic->type=$obj->type;
+    				print preg_replace('/\(DEPOSIT\)/',$langs->trans("InvoiceDeposit"),$obj->description).' '.$facturestatic->getNomURl(1);
+    				print '</td>';
+    			}
+    			elseif (preg_match('/\(EXCESS RECEIVED\)/',$obj->description))
+    			{
+    				print '<td class="nowrap">';
+    				$facturestatic->id=$obj->fk_facture_source;
+    				$facturestatic->ref=$obj->ref;
+    				$facturestatic->type=$obj->type;
+    				print preg_replace('/\(EXCESS RECEIVED\)/',$langs->trans("Invoice"),$obj->description).' '.$facturestatic->getNomURl(1);
+    				print '</td>';
+    			}
+    			else
+    			{
+    				print '<td>';
+    				print $obj->description;
+    				print '</td>';
+    			}
+    			print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
+    			print '<td align="right">'.price($obj->amount_ht).'</td>';
+    			print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
+    			print '<td align="right">'.price($obj->amount_ttc).'</td>';
+    			print '<td align="center">';
+    			print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a>';
+    			print '</td>';
+    			if ($user->rights->societe->creer || $user->rights->facture->creer)
+    			{
+    				print '<td class="nowrap">';
+    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=split&amp;remid='.$obj->rowid.'">'.img_split($langs->trans("SplitDiscount")).'</a>';
+    				print ' &nbsp; ';
+    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;remid='.$obj->rowid.'">'.img_delete($langs->trans("RemoveDiscount")).'</a>';
+    				print '</td>';
+    			}
+    			else print '<td>&nbsp;</td>';
+    			print '</tr>';
+    
+    			if ($_GET["action"]=='split' && GETPOST('remid') == $obj->rowid)
+    			{
+    				$showconfirminfo['rowid']=$obj->rowid;
+    				$showconfirminfo['amount_ttc']=$obj->amount_ttc;
+    			}
+    			$i++;
+    		}
 		}
+		else
+		{
+		    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}		
 		$db->free($resql);
 		print "</table>";
 
@@ -491,8 +498,8 @@ if ($socid > 0)
 		print load_fiche_titre($langs->trans("DiscountAlreadyCounted"));
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td width="120" align="left">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
-		print '<td align="left">'.$langs->trans("ReasonDiscount").'</td>';
+		print '<td class="widthdate">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
+		print '<td>'.$langs->trans("ReasonDiscount").'</td>';
 		print '<td width="150" class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 		print '<td width="120" align="right">'.$langs->trans("AmountHT").'</td>';
 		print '<td width="80" align="right">'.$langs->trans("VATRate").'</td>';
@@ -501,15 +508,17 @@ if ($socid > 0)
 		print '<td width="50">&nbsp;</td>';
 		print '</tr>';
 
-		$var = true;
 		$tab_sqlobj=array();
 		$tab_sqlobjOrder=array();
 		$num = $db->num_rows($resql);
-		for ($i = 0;$i < $num;$i++)
+		if ($num > 0)
 		{
-			$sqlobj = $db->fetch_object($resql);
-			$tab_sqlobj[] = $sqlobj;
-			$tab_sqlobjOrder[]=$db->jdate($sqlobj->dc);
+    		for ($i = 0;$i < $num; $i++)
+    		{
+    			$sqlobj = $db->fetch_object($resql);
+    			$tab_sqlobj[] = $sqlobj;
+    			$tab_sqlobjOrder[]=$db->jdate($sqlobj->dc);
+    		}
 		}
 		$db->free($resql);
 
@@ -524,57 +533,64 @@ if ($socid > 0)
 		array_multisort($tab_sqlobjOrder,SORT_DESC,$tab_sqlobj);
 
 		$num = count($tab_sqlobj);
-		$i = 0 ;
-		while ($i < $num )
+		if ($num > 0)
 		{
-			$obj = array_shift($tab_sqlobj);
-			$var = !$var;
-			print "<tr ".$bc[$var].">";
-			print '<td>'.dol_print_date($db->jdate($obj->dc),'dayhour').'</td>';
-			if (preg_match('/\(CREDIT_NOTE\)/',$obj->description))
-			{
-				print '<td class="nowrap">';
-				$facturestatic->id=$obj->fk_facture_source;
-				$facturestatic->ref=$obj->ref;
-				$facturestatic->type=$obj->type;
-				print preg_replace('/\(CREDIT_NOTE\)/',$langs->trans("CreditNote"),$obj->description).' '.$facturestatic->getNomURl(1);
-				print '</td>';
-			}
-			elseif (preg_match('/\(DEPOSIT\)/',$obj->description))
-			{
-				print '<td class="nowrap">';
-				$facturestatic->id=$obj->fk_facture_source;
-				$facturestatic->ref=$obj->ref;
-				$facturestatic->type=$obj->type;
-				print preg_replace('/\(DEPOSIT\)/',$langs->trans("InvoiceDeposit"),$obj->description).' '.$facturestatic->getNomURl(1);
-				print '</td>';
-			}
-			elseif (preg_match('/\(EXCESS RECEIVED\)/',$obj->description))
-			{
-				print '<td class="nowrap">';
-				$facturestatic->id=$obj->fk_facture_source;
-				$facturestatic->ref=$obj->ref;
-				$facturestatic->type=$obj->type;
-				print preg_replace('/\(EXCESS RECEIVED\)/',$langs->trans("Invoice"),$obj->description).' '.$facturestatic->getNomURl(1);
-				print '</td>';
-			}
-			else
-			{
-				print '<td>';
-				print $obj->description;
-				print '</td>';
-			}
-			print '<td align="left" class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.'</a></td>';
-			print '<td align="right">'.price($obj->amount_ht).'</td>';
-			print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
-			print '<td align="right">'.price($obj->amount_ttc).'</td>';
-			print '<td align="center">';
-			print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a>';
-			print '</td>';
-			print '<td>&nbsp;</td>';
-			print '</tr>';
-			$i++;
+		    $i = 0 ;
+    		while ($i < $num )
+    		{
+    			$obj = array_shift($tab_sqlobj);
+    			print '<tr class="oddeven">';
+    			print '<td>'.dol_print_date($db->jdate($obj->dc),'dayhour').'</td>';
+    			if (preg_match('/\(CREDIT_NOTE\)/',$obj->description))
+    			{
+    				print '<td class="nowrap">';
+    				$facturestatic->id=$obj->fk_facture_source;
+    				$facturestatic->ref=$obj->ref;
+    				$facturestatic->type=$obj->type;
+    				print preg_replace('/\(CREDIT_NOTE\)/',$langs->trans("CreditNote"),$obj->description).' '.$facturestatic->getNomURl(1);
+    				print '</td>';
+    			}
+    			elseif (preg_match('/\(DEPOSIT\)/',$obj->description))
+    			{
+    				print '<td class="nowrap">';
+    				$facturestatic->id=$obj->fk_facture_source;
+    				$facturestatic->ref=$obj->ref;
+    				$facturestatic->type=$obj->type;
+    				print preg_replace('/\(DEPOSIT\)/',$langs->trans("InvoiceDeposit"),$obj->description).' '.$facturestatic->getNomURl(1);
+    				print '</td>';
+    			}
+    			elseif (preg_match('/\(EXCESS RECEIVED\)/',$obj->description))
+    			{
+    				print '<td class="nowrap">';
+    				$facturestatic->id=$obj->fk_facture_source;
+    				$facturestatic->ref=$obj->ref;
+    				$facturestatic->type=$obj->type;
+    				print preg_replace('/\(EXCESS RECEIVED\)/',$langs->trans("Invoice"),$obj->description).' '.$facturestatic->getNomURl(1);
+    				print '</td>';
+    			}
+    			else
+    			{
+    				print '<td>';
+    				print $obj->description;
+    				print '</td>';
+    			}
+    			print '<td align="left" class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.'</a></td>';
+    			print '<td align="right">'.price($obj->amount_ht).'</td>';
+    			print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
+    			print '<td align="right">'.price($obj->amount_ttc).'</td>';
+    			print '<td align="center">';
+    			print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a>';
+    			print '</td>';
+    			print '<td>&nbsp;</td>';
+    			print '</tr>';
+    			$i++;
+    		}
 		}
+		else
+		{
+		    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		
 		print "</table>";
 	}
 	else
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index fcd68992b38..6d8f42edffb 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -199,227 +199,226 @@ if (empty($reshook))
     $permtodelete = $user->rights->commande->supprimer;
     $uploaddir = $conf->commande->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-}
 
-
-if ($massaction == 'confirm_createbills') {
-	
-	$orders = GETPOST('toselect');
-	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
-	$validate_invoices = GETPOST('valdate_invoices', 'int');
-	
-	$TFact = array();
-	$TFactThird = array();
-	
-	$nb_bills_created = 0;
-	
-	$db->begin();
-	
-	foreach($orders as $id_order) {
-		
-		$cmd = new Commande($db);
-		if($cmd->fetch($id_order) <= 0) continue;
-		
-		$object = new Facture($db);
-		if(!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $object = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
-		else {
-			
-			$object->socid = $cmd->socid;
-			$object->type = Facture::TYPE_STANDARD;
-			$object->cond_reglement_id	= $cmd->cond_reglement_id;
-			$object->mode_reglement_id	= $cmd->mode_reglement_id;
-			$object->fk_project			= $cmd->fk_project;
-			
-			$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
-			if (empty($datefacture))
-			{
-				$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
-			}
-			
-			$object->date = $datefacture;
-			$object->origin    = 'commande';
-			$object->origin_id = $id_order;
-			
-			$res = $object->create($user);
-			
-			if($res > 0) $nb_bills_created++;
-			
-		}
-		
-		if($object->id > 0) {
-			
-			$db->begin();
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
-			$sql.= "fk_source";
-			$sql.= ", sourcetype";
-			$sql.= ", fk_target";
-			$sql.= ", targettype";
-			$sql.= ") VALUES (";
-			$sql.= $id_order;
-			$sql.= ", '".$object->origin."'";
-			$sql.= ", ".$object->id;
-			$sql.= ", '".$object->element."'";
-			$sql.= ")";
-
-			if ($db->query($sql))
-			{
-				$db->commit();
-			}
-			else
-			{
-				$db->rollback();
-			}
-			
-			$lines = $cmd->lines;
-			if (empty($lines) && method_exists($cmd, 'fetch_lines'))
-			{
-				$cmd->fetch_lines();
-				$lines = $cmd->lines;
-			}
-			
-			$fk_parent_line=0;
-			$num=count($lines);
-			
-			for ($i=0;$i<$num;$i++)
-			{
-				$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
-				if ($lines[$i]->subprice < 0)
-				{
-					// Negative line, we create a discount line
-					$discount = new DiscountAbsolute($db);
-					$discount->fk_soc=$object->socid;
-					$discount->amount_ht=abs($lines[$i]->total_ht);
-					$discount->amount_tva=abs($lines[$i]->total_tva);
-					$discount->amount_ttc=abs($lines[$i]->total_ttc);
-					$discount->tva_tx=$lines[$i]->tva_tx;
-					$discount->fk_user=$user->id;
-					$discount->description=$desc;
-					$discountid=$discount->create($user);
-					if ($discountid > 0)
-					{
-						$result=$object->insert_discount($discountid);
-						//$result=$discount->link_to_invoice($lineid,$id);
-					}
-					else
-					{
-						setEventMessages($discount->error, $discount->errors, 'errors');
-						$error++;
-						break;
-					}
-				}
-				else
-				{
-					// Positive line
-					$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
-					// Date start
-					$date_start=false;
-					if ($lines[$i]->date_debut_prevue) $date_start=$lines[$i]->date_debut_prevue;
-					if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
-					if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
-					//Date end
-					$date_end=false;
-					if ($lines[$i]->date_fin_prevue) $date_end=$lines[$i]->date_fin_prevue;
-					if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
-					if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
-					// Reset fk_parent_line for no child products and special product
-					if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
-					{
-						$fk_parent_line = 0;
-					}
-					$result = $object->addline(
-							$desc,
-							$lines[$i]->subprice,
-							$lines[$i]->qty,
-							$lines[$i]->tva_tx,
-							$lines[$i]->localtax1_tx,
-							$lines[$i]->localtax2_tx,
-							$lines[$i]->fk_product,
-							$lines[$i]->remise_percent,
-							$date_start,
-							$date_end,
-							0,
-							$lines[$i]->info_bits,
-							$lines[$i]->fk_remise_except,
-							'HT',
-							0,
-							$product_type,
-							$ii,
-							$lines[$i]->special_code,
-							$object->origin,
-							$lines[$i]->rowid,
-							$fk_parent_line,
-							$lines[$i]->fk_fournprice,
-							$lines[$i]->pa_ht,
-							$lines[$i]->label
-					);
-					if ($result > 0)
-					{
-						$lineid=$result;
-					}
-					else
-					{
-						$lineid=0;
-						$error++;
-						break;
-					}
-					// Defined the new fk_parent_line
-					if ($result > 0 && $lines[$i]->product_type == 9)
-					{
-						$fk_parent_line = $result;
-					}
-				}
-			}			
-			
-		}
-		 
-		$cmd->classifyBilled($user);
-
-		if(!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $object;
-		else $TFact[$object->id] = $object;
-	}
-	
-	// Build doc with all invoices
-	$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
-	$toselect = array();
-	
-	if(!empty($validate_invoices)) {
-		
-		$massaction = $action = 'builddoc';
-		
-		foreach($TAllFact as &$object) {
-			$object->validate($user);
-			$toselect[] = $object->id; // For builddoc action
-			
-			// Fac builddoc
-			$upload_dir = $conf->facture->dir_output;
-		    $permissioncreate=$user->rights->facture->creer;
-		    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-		}
-		
-		$objectclass='Facture';
-	    $objectlabel='Invoice';
-	    $permtoread = $user->rights->facture->lire;
-	    $permtodelete = $user->rights->facture->supprimer;
-	    $uploaddir = $conf->facture->dir_output;
-		include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-		
-	}
-	
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessage($langs->trans('BillCreated', $nb_bills_created));
-	}
-	else
-	{
-		$db->rollback();
-		$action='create';
-		$_GET["origin"]=$_POST["origin"];
-		$_GET["originid"]=$_POST["originid"];
-		setEventMessages($object->error, $object->errors, 'errors');
-		$error++;
-	}
-	
+	// TODO Move this into mass action include
+    if ($massaction == 'confirm_createbills') {
+    	
+    	$orders = GETPOST('toselect');
+    	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
+    	$validate_invoices = GETPOST('valdate_invoices', 'int');
+    	
+    	$TFact = array();
+    	$TFactThird = array();
+    	
+    	$nb_bills_created = 0;
+    	
+    	$db->begin();
+    	
+    	foreach($orders as $id_order) {
+    		
+    		$cmd = new Commande($db);
+    		if($cmd->fetch($id_order) <= 0) continue;
+    		
+    		$object = new Facture($db);
+    		if(!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $object = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
+    		else {
+    			
+    			$object->socid = $cmd->socid;
+    			$object->type = Facture::TYPE_STANDARD;
+    			$object->cond_reglement_id	= $cmd->cond_reglement_id;
+    			$object->mode_reglement_id	= $cmd->mode_reglement_id;
+    			$object->fk_project			= $cmd->fk_project;
+    			
+    			$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+    			if (empty($datefacture))
+    			{
+    				$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
+    			}
+    			
+    			$object->date = $datefacture;
+    			$object->origin    = 'commande';
+    			$object->origin_id = $id_order;
+    			
+    			$res = $object->create($user);
+    			
+    			if($res > 0) $nb_bills_created++;
+    			
+    		}
+    		
+    		if($object->id > 0) {
+    			
+    			$db->begin();
+    			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
+    			$sql.= "fk_source";
+    			$sql.= ", sourcetype";
+    			$sql.= ", fk_target";
+    			$sql.= ", targettype";
+    			$sql.= ") VALUES (";
+    			$sql.= $id_order;
+    			$sql.= ", '".$object->origin."'";
+    			$sql.= ", ".$object->id;
+    			$sql.= ", '".$object->element."'";
+    			$sql.= ")";
+    
+    			if ($db->query($sql))
+    			{
+    				$db->commit();
+    			}
+    			else
+    			{
+    				$db->rollback();
+    			}
+    			
+    			$lines = $cmd->lines;
+    			if (empty($lines) && method_exists($cmd, 'fetch_lines'))
+    			{
+    				$cmd->fetch_lines();
+    				$lines = $cmd->lines;
+    			}
+    			
+    			$fk_parent_line=0;
+    			$num=count($lines);
+    			
+    			for ($i=0;$i<$num;$i++)
+    			{
+    				$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
+    				if ($lines[$i]->subprice < 0)
+    				{
+    					// Negative line, we create a discount line
+    					$discount = new DiscountAbsolute($db);
+    					$discount->fk_soc=$object->socid;
+    					$discount->amount_ht=abs($lines[$i]->total_ht);
+    					$discount->amount_tva=abs($lines[$i]->total_tva);
+    					$discount->amount_ttc=abs($lines[$i]->total_ttc);
+    					$discount->tva_tx=$lines[$i]->tva_tx;
+    					$discount->fk_user=$user->id;
+    					$discount->description=$desc;
+    					$discountid=$discount->create($user);
+    					if ($discountid > 0)
+    					{
+    						$result=$object->insert_discount($discountid);
+    						//$result=$discount->link_to_invoice($lineid,$id);
+    					}
+    					else
+    					{
+    						setEventMessages($discount->error, $discount->errors, 'errors');
+    						$error++;
+    						break;
+    					}
+    				}
+    				else
+    				{
+    					// Positive line
+    					$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+    					// Date start
+    					$date_start=false;
+    					if ($lines[$i]->date_debut_prevue) $date_start=$lines[$i]->date_debut_prevue;
+    					if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
+    					if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
+    					//Date end
+    					$date_end=false;
+    					if ($lines[$i]->date_fin_prevue) $date_end=$lines[$i]->date_fin_prevue;
+    					if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
+    					if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
+    					// Reset fk_parent_line for no child products and special product
+    					if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
+    					{
+    						$fk_parent_line = 0;
+    					}
+    					$result = $object->addline(
+    							$desc,
+    							$lines[$i]->subprice,
+    							$lines[$i]->qty,
+    							$lines[$i]->tva_tx,
+    							$lines[$i]->localtax1_tx,
+    							$lines[$i]->localtax2_tx,
+    							$lines[$i]->fk_product,
+    							$lines[$i]->remise_percent,
+    							$date_start,
+    							$date_end,
+    							0,
+    							$lines[$i]->info_bits,
+    							$lines[$i]->fk_remise_except,
+    							'HT',
+    							0,
+    							$product_type,
+    							$ii,
+    							$lines[$i]->special_code,
+    							$object->origin,
+    							$lines[$i]->rowid,
+    							$fk_parent_line,
+    							$lines[$i]->fk_fournprice,
+    							$lines[$i]->pa_ht,
+    							$lines[$i]->label
+    					);
+    					if ($result > 0)
+    					{
+    						$lineid=$result;
+    					}
+    					else
+    					{
+    						$lineid=0;
+    						$error++;
+    						break;
+    					}
+    					// Defined the new fk_parent_line
+    					if ($result > 0 && $lines[$i]->product_type == 9)
+    					{
+    						$fk_parent_line = $result;
+    					}
+    				}
+    			}			
+    			
+    		}
+    		 
+    		$cmd->classifyBilled($user);
+    
+    		if(!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $object;
+    		else $TFact[$object->id] = $object;
+    	}
+    	
+    	// Build doc with all invoices
+    	$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
+    	$toselect = array();
+    	
+    	if(!empty($validate_invoices)) {
+    		
+    		$massaction = $action = 'builddoc';
+    		
+    		foreach($TAllFact as &$object) {
+    			$object->validate($user);
+    			$toselect[] = $object->id; // For builddoc action
+    			
+    			// Fac builddoc
+    			$upload_dir = $conf->facture->dir_output;
+    		    $permissioncreate=$user->rights->facture->creer;
+    		    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+    		}
+    		
+    		$objectclass='Facture';
+    	    $objectlabel='Invoice';
+    	    $permtoread = $user->rights->facture->lire;
+    	    $permtodelete = $user->rights->facture->supprimer;
+    	    $uploaddir = $conf->facture->dir_output;
+    		include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+    		
+    	}
+    	
+    	if (! $error)
+    	{
+    		$db->commit();
+    		setEventMessage($langs->trans('BillCreated', $nb_bills_created));
+    	}
+    	else
+    	{
+    		$db->rollback();
+    		$action='create';
+    		$_GET["origin"]=$_POST["origin"];
+    		$_GET["originid"]=$_POST["originid"];
+    		setEventMessages($object->error, $object->errors, 'errors');
+    		$error++;
+    	}
+    }	
 }
 
 
@@ -435,8 +434,9 @@ $formfile = new FormFile($db);
 $companystatic = new Societe($db);
 $formcompany=new FormCompany($db);
 
+$title=$langs->trans("Orders");
 $help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
-llxHeader('',$langs->trans("Orders"),$help_url);
+llxHeader('',$title,$help_url);
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
@@ -622,7 +622,6 @@ if ($resql)
     if ($show_files)            $param.='&show_files=' .$show_files;
     if ($optioncss != '')       $param.='&optioncss='.$optioncss;
 	if ($billed != '')			$param.='&billed='.$billed;
-
 	// Add $param from extra fields
 	foreach ($search_array_options as $key => $val)
 	{
@@ -654,6 +653,7 @@ if ($resql)
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 	
+	// TODO Move this into an invluce
 	if ($massaction == 'presend')
 	{
 	    $langs->load("mails");
@@ -679,9 +679,6 @@ if ($resql)
 	
 	    print '<input type="hidden" name="massaction" value="confirm_presend">';
 	
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	    $formmail = new FormMail($db);
-	
 	    dol_fiche_head(null, '', '');
 	
 	    $topicmail="SendOrderRef";
@@ -1428,8 +1425,6 @@ if ($resql)
 	
 	print '</form>'."\n";
 
-	//print '<br>'.img_help(1,'').' '.$langs->trans("ToBillSeveralOrderSelectCustomer", $langs->transnoentitiesnoconv("CreateInvoiceForThisCustomer")).'<br>';
-	
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
 	{
 	    /*
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6bd2d3036b9..9ee36f783d2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6218,7 +6218,7 @@ class Form
         global $conf, $langs;
     
         $out='';
-        if (! empty($conf->use_javascript_ajax)) $out.='<input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions">';
+        if (! empty($conf->use_javascript_ajax)) $out.='<div class="inline-block checkallactions"><input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions"></div>';
         $out.='<script type="text/javascript">
             $(document).ready(function() {
             	$("#checkallactions").click(function() {
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 7dc69a82b23..6bb35e7a9d2 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -312,7 +312,7 @@ class FormFile
 
         if (preg_match('/massfilesarea_/', $modulepart))
         {
-	        $out.='<br><a name="show_files"></a>';
+	        $out.='<div id="show_files"><br></div>';
 			$title=$langs->trans("MassFilesArea").' <a href="" id="togglemassfilesarea" ref="shown">('.$langs->trans("Hide").')</a>';
 			$title.='<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function() {
@@ -337,7 +337,7 @@ class FormFile
         
         $titletoshow=$langs->trans("Documents");
         if (! empty($title)) $titletoshow=$title;
-        
+
         // Show table
         if ($genallowed)
         {
@@ -461,7 +461,7 @@ class FormFile
                     $modellist=ModeleExports::liste_modeles($this->db);
                 }
             }
-            else if ($modulepart == 'commande_fournisseur')
+            else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
             {
                 if (is_array($genallowed)) $modellist=$genallowed;
                 else
@@ -470,7 +470,7 @@ class FormFile
                     $modellist=ModelePDFSuppliersOrders::liste_modeles($this->db);
                 }
             }
-            else if ($modulepart == 'facture_fournisseur')
+            else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
             {
                 if (is_array($genallowed)) $modellist=$genallowed;
                 else
@@ -688,7 +688,7 @@ class FormFile
             {
                 $headershown=1;
                 $out.= '<div class="titre">'.$titletoshow.'</div>'."\n";
-                $out.= '<table class="border" summary="listofdocumentstable" id="'.$modulepart.'_table" width="100%">'."\n";
+                $out.= '<table class="noborder" summary="listofdocumentstable" id="'.$modulepart.'_table" width="100%">'."\n";
             }
 
             // Loop on each file found
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 0d4c1dff71e..955bffecb67 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1815,6 +1815,30 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	    }
 	    $original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
+	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->propal->dir_output))
+	{
+	    if ($fuser->rights->supplier_proposal->lire || preg_match('/^specimen/i',$original_file))
+	    {
+	        $accessallowed=1;
+	    }
+	    $original_file=$conf->propal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	}
+	else if ($modulepart == 'massfilesarea_supplier_order')
+	{
+	    if ($fuser->rights->fournisseur->commande->lire || preg_match('/^specimen/i',$original_file))
+	    {
+	        $accessallowed=1;
+	    }
+	    $original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	}
+	else if ($modulepart == 'massfilesarea_supplier_invoice')
+	{
+	    if ($fuser->rights->fournisseur->facture->lire || preg_match('/^specimen/i',$original_file))
+	    {
+	        $accessallowed=1;
+	    }
+	    $original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	}
 	
 	// Wrapping for interventions
 	else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index df3dac377a4..1ca8c7758a8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2649,6 +2649,22 @@ function img_printer($titlealt = "default", $other='')
     return img_picto($titlealt,'printer.png',$other);
 }
 
+/**
+ *  Show delete logo
+ *
+ *  @param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
+ *	@param  string	$other      Add more attributes on img
+ *  @return string      		Retourne tag img
+ */
+function img_split($titlealt = 'default', $other = 'class="pictosplit"')
+{
+	global $conf, $langs;
+
+	if ($titlealt == 'default') $titlealt = $langs->trans('Split');
+
+	return img_picto($titlealt, 'split.png', $other);
+}
+
 /**
  *	Show help logo with cursor "?"
  *
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 5c4c8aae11c..a1324d250ab 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -48,6 +48,12 @@ $langs->load('compta');
 $langs->load('bills');
 $langs->load('projects');
 
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
+
 $orderyear=GETPOST("orderyear","int");
 $ordermonth=GETPOST("ordermonth","int");
 $orderday=GETPOST("orderday","int");
@@ -92,7 +98,7 @@ $orderid = GETPOST('orderid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
 
-$diroutputmassaction=$conf->commande->dir_output . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction=$conf->fournisseur->commande->dir_output . '/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
@@ -172,63 +178,285 @@ $parameters=array('socid'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-// Purge search criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
-{
-    $ordermonth='';
-    $orderyear='';
-    $orderday='';
-    $search_categ='';
-    $search_user='';
-    $search_sale='';
-    $search_product_category='';
-    $search_ref='';
-    $search_refsupp='';
-    $search_company='';
-    $search_town='';
-    $search_zip="";
-    $search_state="";
-    $search_type='';
-    $search_country='';
-    $search_type_thirdparty='';
-    $search_request_author='';
-    $search_total_ht='';
-    $search_total_vat='';
-    $search_total_ttc='';
-    $search_status=-1;
-    $orderyear='';
-    $ordermonth='';
-    $orderday='';
-    $deliveryday='';
-    $deliverymonth='';
-    $deliveryyear='';
-    $billed='';
-	$search_project_ref='';
-    $search_array_options=array();
-
-}
-
 if (empty($reshook))
 {
-    // Mass actions. Controls on number of lines checked
-    $maxformassaction=1000;
-    if (! empty($massaction) && count($toselect) < 1)
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Purge search criteria
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
-        $error++;
-        setEventMessages($langs->trans("NoLineChecked"), null, "warnings");
-    }
-    if (! $error && count($toselect) > $maxformassaction)
-    {
-        setEventMessages($langs->trans('TooManyRecordForMassAction',$maxformassaction), null, 'errors');
-        $error++;
+        $ordermonth='';
+        $orderyear='';
+        $orderday='';
+        $search_categ='';
+        $search_user='';
+        $search_sale='';
+        $search_product_category='';
+        $search_ref='';
+        $search_refsupp='';
+        $search_company='';
+        $search_town='';
+        $search_zip="";
+        $search_state="";
+        $search_type='';
+        $search_country='';
+        $search_type_thirdparty='';
+        $search_request_author='';
+        $search_total_ht='';
+        $search_total_vat='';
+        $search_total_ttc='';
+        $search_status=-1;
+        $orderyear='';
+        $ordermonth='';
+        $orderday='';
+        $deliveryday='';
+        $deliverymonth='';
+        $deliveryyear='';
+        $billed='';
+        $toselect='';
+    	$search_project_ref='';
+        $search_array_options=array();
+    
+        // Mass actions
+        $objectclass='Commande';
+        $objectlabel='Orders';
+        $permtoread = $user->rights->commande->lire;
+        $permtodelete = $user->rights->commande->supprimer;
+        $uploaddir = $conf->commande->dir_output;
+    	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
     }
 
+    // Mass actions
+    $objectclass='CommandeFournisseur';
+    $objectlabel='SupplierOrders';
+    $permtoread = $user->rights->fournisseur->commande->lire;
+    $permtodelete = $user->rights->fournisseur->commande->supprimer;
+    $uploaddir = $conf->fournisseur->commande->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+    
+    // TODO Move this into mass action include
+    if ($massaction == 'confirm_createbills') 
+    {
+        $orders = GETPOST('toselect');
+        $createbills_onebythird = GETPOST('createbills_onebythird', 'int');
+        $validate_invoices = GETPOST('valdate_invoices', 'int');
+         
+        $TFact = array();
+        $TFactThird = array();
+         
+        $nb_bills_created = 0;
+         
+        $db->begin();
+         
+        foreach($orders as $id_order) {
+    
+            $cmd = new Commande($db);
+            if($cmd->fetch($id_order) <= 0) continue;
+    
+            $object = new Facture($db);
+            if(!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $object = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
+            else {
+                 
+                $object->socid = $cmd->socid;
+                $object->type = Facture::TYPE_STANDARD;
+                $object->cond_reglement_id	= $cmd->cond_reglement_id;
+                $object->mode_reglement_id	= $cmd->mode_reglement_id;
+                $object->fk_project			= $cmd->fk_project;
+                 
+                $datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+                if (empty($datefacture))
+                {
+                    $datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
+                }
+                 
+                $object->date = $datefacture;
+                $object->origin    = 'commande';
+                $object->origin_id = $id_order;
+                 
+                $res = $object->create($user);
+                 
+                if($res > 0) $nb_bills_created++;
+                 
+            }
+    
+            if($object->id > 0) {
+                 
+                $db->begin();
+                $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
+                $sql.= "fk_source";
+                $sql.= ", sourcetype";
+                $sql.= ", fk_target";
+                $sql.= ", targettype";
+                $sql.= ") VALUES (";
+                $sql.= $id_order;
+                $sql.= ", '".$object->origin."'";
+                $sql.= ", ".$object->id;
+                $sql.= ", '".$object->element."'";
+                $sql.= ")";
+    
+                if ($db->query($sql))
+                {
+                    $db->commit();
+                }
+                else
+                {
+                    $db->rollback();
+                }
+                 
+                $lines = $cmd->lines;
+                if (empty($lines) && method_exists($cmd, 'fetch_lines'))
+                {
+                    $cmd->fetch_lines();
+                    $lines = $cmd->lines;
+                }
+                 
+                $fk_parent_line=0;
+                $num=count($lines);
+                 
+                for ($i=0;$i<$num;$i++)
+                {
+                    $desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
+                    if ($lines[$i]->subprice < 0)
+                    {
+                        // Negative line, we create a discount line
+                        $discount = new DiscountAbsolute($db);
+                        $discount->fk_soc=$object->socid;
+                        $discount->amount_ht=abs($lines[$i]->total_ht);
+                        $discount->amount_tva=abs($lines[$i]->total_tva);
+                        $discount->amount_ttc=abs($lines[$i]->total_ttc);
+                        $discount->tva_tx=$lines[$i]->tva_tx;
+                        $discount->fk_user=$user->id;
+                        $discount->description=$desc;
+                        $discountid=$discount->create($user);
+                        if ($discountid > 0)
+                        {
+                            $result=$object->insert_discount($discountid);
+                            //$result=$discount->link_to_invoice($lineid,$id);
+                        }
+                        else
+                        {
+                            setEventMessages($discount->error, $discount->errors, 'errors');
+                            $error++;
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        // Positive line
+                        $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+                        // Date start
+                        $date_start=false;
+                        if ($lines[$i]->date_debut_prevue) $date_start=$lines[$i]->date_debut_prevue;
+                        if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
+                        if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
+                        //Date end
+                        $date_end=false;
+                        if ($lines[$i]->date_fin_prevue) $date_end=$lines[$i]->date_fin_prevue;
+                        if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
+                        if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
+                        // Reset fk_parent_line for no child products and special product
+                        if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
+                        {
+                            $fk_parent_line = 0;
+                        }
+                        $result = $object->addline(
+                            $desc,
+                            $lines[$i]->subprice,
+                            $lines[$i]->qty,
+                            $lines[$i]->tva_tx,
+                            $lines[$i]->localtax1_tx,
+                            $lines[$i]->localtax2_tx,
+                            $lines[$i]->fk_product,
+                            $lines[$i]->remise_percent,
+                            $date_start,
+                            $date_end,
+                            0,
+                            $lines[$i]->info_bits,
+                            $lines[$i]->fk_remise_except,
+                            'HT',
+                            0,
+                            $product_type,
+                            $ii,
+                            $lines[$i]->special_code,
+                            $object->origin,
+                            $lines[$i]->rowid,
+                            $fk_parent_line,
+                            $lines[$i]->fk_fournprice,
+                            $lines[$i]->pa_ht,
+                            $lines[$i]->label
+                            );
+                        if ($result > 0)
+                        {
+                            $lineid=$result;
+                        }
+                        else
+                        {
+                            $lineid=0;
+                            $error++;
+                            break;
+                        }
+                        // Defined the new fk_parent_line
+                        if ($result > 0 && $lines[$i]->product_type == 9)
+                        {
+                            $fk_parent_line = $result;
+                        }
+                    }
+                }
+                 
+            }
+             
+            $cmd->classifyBilled($user);
+    
+            if(!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $object;
+            else $TFact[$object->id] = $object;
+        }
+         
+        // Build doc with all invoices
+        $TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
+        $toselect = array();
+         
+        if(!empty($validate_invoices)) {
+    
+            $massaction = $action = 'builddoc';
+    
+            foreach($TAllFact as &$object) {
+                $object->validate($user);
+                $toselect[] = $object->id; // For builddoc action
+                 
+                // Fac builddoc
+                $upload_dir = $conf->facture->dir_output;
+                $permissioncreate=$user->rights->facture->creer;
+                include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+            }
+    
+            $objectclass='Facture';
+            $objectlabel='Invoice';
+            $permtoread = $user->rights->facture->lire;
+            $permtodelete = $user->rights->facture->supprimer;
+            $uploaddir = $conf->facture->dir_output;
+            include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+    
+        }
+         
+        if (! $error)
+        {
+            $db->commit();
+            setEventMessage($langs->trans('BillCreated', $nb_bills_created));
+        }
+        else
+        {
+            $db->rollback();
+            $action='create';
+            $_GET["origin"]=$_POST["origin"];
+            $_GET["originid"]=$_POST["originid"];
+            setEventMessages($object->error, $object->errors, 'errors');
+            $error++;
+        }
+    }
 }
 
 
-
 /*
  *	View
  */
@@ -382,6 +610,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 }
 
 $sql.= $db->plimit($limit+1, $offset);
+
 $resql = $db->query($sql);
 if ($resql)
 {
@@ -398,6 +627,8 @@ if ($resql)
 
 	$num = $db->num_rows($resql);
 
+	$arrayofselected=is_array($toselect)?$toselect:array();
+	
 	$param='';
 	if ($socid > 0)             $param.='&socid='.$socid;
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
@@ -419,7 +650,8 @@ if ($resql)
 	if ($search_refsupp) 		$param.="&search_refsupp=".$search_refsupp;
 	if ($search_status >= 0)  	$param.="&search_status=".$search_status;
 	if ($billed != '')          $param.="&billed=".$billed;
-	if ($optioncss != '') $param.='&optioncss='.$optioncss;
+    if ($show_files)            $param.='&show_files=' .$show_files;
+    if ($optioncss != '')       $param.='&optioncss='.$optioncss;
 	// Add $param from extra fields
 	foreach ($search_array_options as $key => $val)
 	{
@@ -428,8 +660,16 @@ if ($resql)
 	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 	}
 
-	//$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
-
+	// List of mass actions available
+	$arrayofmassactions =  array(
+	    //'presend'=>$langs->trans("SendByMail"),
+	    'builddoc'=>$langs->trans("PDFMerge"),
+	);
+	//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
+	if ($user->rights->fournisseur->commande->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+	if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+	
 	// Lignes des champs de filtre
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -440,8 +680,143 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 
+	// TODO Move this into an invluce
+	if ($massaction == 'presend')
+	{
+	    $langs->load("mails");
+	
+	    if (! GETPOST('cancel'))
+	    {
+	        $objecttmp=new CommandeFournisseur($db);
+	        $listofselectedid=array();
+	        $listofselectedthirdparties=array();
+	        $listofselectedref=array();
+	        foreach($arrayofselected as $toselectid)
+	        {
+	            $result=$objecttmp->fetch($toselectid);
+	            if ($result > 0)
+	            {
+	                $listofselectedid[$toselectid]=$toselectid;
+	                $thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
+	                $listofselectedthirdparties[$thirdpartyid]=$thirdpartyid;
+	                $listofselectedref[$thirdpartyid][$toselectid]=$objecttmp->ref;
+	            }
+	        }
+	    }
+	
+	    print '<input type="hidden" name="massaction" value="confirm_presend">';
+	
+	    dol_fiche_head(null, '', '');
+	
+	    $topicmail="SendOrderRef";
+	    $modelmail="order_send";
+	
+	    // Cree l'objet formulaire mail
+	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+	    $formmail = new FormMail($db);
+	    $formmail->withform=-1;
+	    $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+	
+	    if($formmail->fromtype === 'user'){
+	        $formmail->fromid = $user->id;
+	
+	    }
+	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
+	    {
+	        $formmail->trackid='ord'.$object->id;
+	    }
+	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+	    {
+	        include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	        $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
+	    }
+	    $formmail->withfrom=1;
+	    $liste=$langs->trans("AllRecipientSelected");
+	    if (count($listofselectedthirdparties) == 1)
+	    {
+	        $liste=array();
+	        $thirdpartyid=array_shift($listofselectedthirdparties);
+	        $soc=new Societe($db);
+	        $soc->fetch($thirdpartyid);
+	        foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+	        {
+	            $liste[$key]=$value;
+	        }
+	        $formmail->withtoreadonly=0;
+	    }
+	    else
+	    {
+	        $formmail->withtoreadonly=1;
+	    }
+	    $formmail->withto=$liste;
+	    $formmail->withtofree=0;
+	    $formmail->withtocc=1;
+	    $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
+	    $formmail->withtopic=$langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
+	    $formmail->withfile=$langs->trans("OnlyPDFattachmentSupported");
+	    $formmail->withbody=1;
+	    $formmail->withdeliveryreceipt=1;
+	    $formmail->withcancel=1;
+	    // Tableau des substitutions
+	    $formmail->substit['__REF__']='__REF__';	// We want to keep the tag
+	    $formmail->substit['__SIGNATURE__']=$user->signature;
+	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
+	    $formmail->substit['__PERSONALIZED__']='';
+	    $formmail->substit['__CONTACTCIVNAME__']='';
+	
+	    // Tableau des parametres complementaires du post
+	    $formmail->param['action']=$action;
+	    $formmail->param['models']=$modelmail;
+	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
+	    $formmail->param['id']=join(',',$arrayofselected);
+	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+	
+	    print $formmail->get_form();
+	
+	    dol_fiche_end();
+	}
+	elseif ($massaction == 'createbills')
+	{
+	    //var_dump($_REQUEST);
+	    print '<input type="hidden" name="massaction" value="confirm_createbills">';
+	
+	    print '<table class="border" width="100%" >';
+	    print '<tr>';
+	    print '<td class="titlefieldmiddle">';
+	    print $langs->trans('DateInvoice');
+	    print '</td>';
+	    print '<td>';
+	    print $form->select_date('', '', '', '', '', '', 1, 1);
+	    print '</td>';
+	    print '</tr>';
+	    print '<tr>';
+	    print '<td>';
+	    print $langs->trans('CreateOneBillByThird');
+	    print '</td>';
+	    print '<td>';
+	    print $form->selectyesno('createbills_onebythird', '', 1);
+	    print '</td>';
+	    print '</tr>';
+	    print '<tr>';
+	    print '<td>';
+	    print $langs->trans('ValidateInvoices');
+	    print '</td>';
+	    print '<td>';
+	    print $form->selectyesno('valdate_invoices', 1, 1);
+	    print '</td>';
+	    print '</tr>';
+	    print '</table>';
+	
+	    print '<br>';
+	    print '<div class="center">';
+	    print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
+	    print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
+	    print '</div>';
+	    print '<br>';
+	}
+	
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
@@ -481,6 +856,7 @@ if ($resql)
     $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
     if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
     else $moreforfilter = $hookmanager->resPrint;
+    
     if (! empty($moreforfilter))
     {
         print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -490,6 +866,7 @@ if ($resql)
 
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+    if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -641,7 +1018,7 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+	$searchpitco=$form->showFilterButtons();
 	print $searchpitco;
 	print '</td>';
 
@@ -916,7 +1293,14 @@ if ($resql)
         }
 
         // Action column
-        print '<td></td>';
+        print '<td class="nowrap" align="center">';
+        if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+        {
+            $selected=0;
+    		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+    		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+        }
+        print '</td>';
         if (! $i) $totalarray['nbfield']++;
 
 		print "</tr>\n";
@@ -926,8 +1310,25 @@ if ($resql)
 	print '</div>';
 	print "</form>\n";
 
-	if (! empty($conf->facture->enable)) print '<br>'.img_help(1,'').' '.$langs->trans("ToBillSeveralOrderSelectCustomer", $langs->transnoentitiesnoconv("CreateInvoiceForThisCustomer")).'<br>';
-
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
+	{
+	    /*
+	     * Show list of available documents
+	     */
+	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	    $urlsource.=str_replace('&amp;','&',$param);
+	
+	    $filedir=$diroutputmassaction;
+	    $genallowed=$user->rights->fournisseur->commande->lire;
+	    $delallowed=$user->rights->fournisseur->commande->lire;
+	
+	    print $formfile->showdocuments('massfilesarea_supplier_order','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+	}
+	else
+	{
+	    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
+	}
+	
 	$db->free($resql);
 }
 else
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 93462528e64..74aef09e7a9 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1559,7 +1559,7 @@ class Societe extends CommonObject
         $note=trim($note);
         if (! $note)
         {
-            $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Note"));
+            $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
             return -2;
         }
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 38ab27f844c..dc45420d90c 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -590,10 +590,10 @@ div.myavailability {
 	padding-bottom: 4px;
 }
 .checkallactions {
-	vertical-align: text-bottom;
-    margin-top: 6px;
-    margin-left: 4px;		/* left must be same than right to keep checkbox centered */
-    margin-right: 4px;		/* left must be same than right to keep checkbox centered */
+	/* vertical-align: text-bottom;
+    margin-top: 6px; */
+    margin-left: 2px;		/* left must be same than right to keep checkbox centered */
+    margin-right: 2px;		/* left must be same than right to keep checkbox centered */
 }
 .selectlimit, .marginrightonly {
 	margin-right: 10px !important;
@@ -607,6 +607,9 @@ div.myavailability {
 .strikefordisabled {
 	text-decoration: line-through;
 }
+.widthdate {
+	width: 130px;
+}
 /* using a tdoverflowxxx make the min-width not working */
 .tdoverflow {
     max-width: 0;
@@ -1611,7 +1614,7 @@ div.login_block {
 	position: absolute;
 	text-align: <?php print $right; ?>;
 	<?php print $right; ?>: 5px;
-	top: 3px;
+	top: 4px;
 	font-weight: bold;
 	max-width: <?php echo $maxwidthloginblock; ?>px;
 	<?php if (GETPOST("optioncss") == 'print') { ?>
@@ -2346,7 +2349,7 @@ div.refid  {
   	font-size: 160%;
 }
 div.refidno  {
-	padding-top: 8px;
+	padding-top: 3px;
 	font-weight: normal;
   	color: #444;
   	font-size: <?php print $fontsize ?>px;
@@ -4097,8 +4100,10 @@ ul.ulselectedfields {
 }
 dl.dropdown {
     margin:0px;
+	margin-left: 2px;
+    margin-right: 2px;
     padding:0px;
-    vertical-align: middle;
+    vertical-align: text-bottom;
     display: inline-block;
 }
 .dropdown dd, .dropdown dt {
@@ -4488,7 +4493,7 @@ div.tabsElem a.tab {
 
 /* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */
 /* rule to reduce top menu - 1st reduction */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 6.9, 0) + 20; ?>px)	/* reduction 1 */
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 6.9, 0) + 24; ?>px)	/* reduction 1 */
 {
 	div.tmenucenter {
 	    width: <?php echo round($fontsize * 4); ?>px;	/* size of viewport */
@@ -4517,7 +4522,7 @@ div.tabsElem a.tab {
 	}
 }
 /* rule to reduce top menu - 2nd reduction */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 4.9, 0) + 10; ?>px)	/* reduction 2 */
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 5, 0) + 24; ?>px)	/* reduction 2 */
 {
 	div.mainmenu {
 		height: 23px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index a681fcc0ee4..e2aa999f071 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -596,9 +596,10 @@ div.myavailability {
 	padding-bottom: 4px;
 }
 .checkallactions {
-	vertical-align: text-bottom;
-    margin-top: 6px;
-    margin-left: 4px;
+	/*vertical-align: text-bottom;
+    margin-top: 6px;*/
+    margin-left: 2px;		/* left must be same than right to keep checkbox centered */
+    margin-right: 2px;		/* left must be same than right to keep checkbox centered */
 }
 .selectlimit, .marginrightonly {
 	margin-right: 10px !important;
@@ -612,6 +613,9 @@ div.myavailability {
 .strikefordisabled {
 	text-decoration: line-through;
 }
+.widthdate {
+	width: 130px;
+}
 /* using a tdoverflowxxx make the min-width not working */
 .tdoverflow {
     max-width: 0;
@@ -4219,7 +4223,9 @@ ul.ulselectedfields {
 dl.dropdown {
     margin:0px;
     padding:0px;
-    vertical-align: middle;
+	margin-left: 2px;
+    margin-right: 2px;
+    vertical-align: text-bottom;
     display: inline-block;
 }
 .dropdown dd, .dropdown dt {

From ddd101757e71a84adf9aebc8b74190665f0b50e6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 Apr 2017 13:26:26 +0200
Subject: [PATCH 0562/1163] FIX Bulk pdf merge on supplier proposals

---
 htdocs/core/actions_massactions.inc.php   |  5 ++++-
 htdocs/core/lib/files.lib.php             |  2 +-
 htdocs/langs/en_US/supplier_proposal.lang |  2 +-
 htdocs/supplier_proposal/list.php         | 12 ++++++------
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 95c0c59a9cd..a44e5f2450e 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -434,8 +434,11 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
     // Create output dir if not exists
     dol_mkdir($diroutputmassaction);
 
-    // Save merged file
+    // Defined name of merged file
     $filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
+    $filename=preg_replace('/\s/','_',$filename);
+    
+    // Save merged file
     if ($filter=='paye:0')
     {
         if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 955bffecb67..3310aa8e2c4 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1821,7 +1821,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	    {
 	        $accessallowed=1;
 	    }
-	    $original_file=$conf->propal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	    $original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_supplier_order')
 	{
diff --git a/htdocs/langs/en_US/supplier_proposal.lang b/htdocs/langs/en_US/supplier_proposal.lang
index 621d7784e35..dc3eae23672 100644
--- a/htdocs/langs/en_US/supplier_proposal.lang
+++ b/htdocs/langs/en_US/supplier_proposal.lang
@@ -47,7 +47,7 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposal=List of supplier proposal requests
+ListOfSupplierProposals=List of supplier proposal requests
 ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 3624101d7cf..10ac76b48dd 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2013 Regis Houssin         <regis.houssin@capnetworks.com>
@@ -316,11 +316,11 @@ if ($result)
 	{
 	    $soc = new Societe($db);
 	    $soc->fetch($socid);
-	    $title = $langs->trans('ListOfProposals') . ' - '.$soc->name;
+	    $title = $langs->trans('ListOfSupplierProposals') . ' - '.$soc->name;
 	}
 	else
 	{
-	    $title = $langs->trans('ListOfProposals');
+	    $title = $langs->trans('ListOfSupplierProposals');
 	}
 	
 	$num = $db->num_rows($result);
@@ -706,10 +706,10 @@ if ($result)
 	    $urlsource.=str_replace('&amp;','&',$param);
 	
 	    $filedir=$diroutputmassaction;
-	    $genallowed=$user->rights->propal->lire;
-	    $delallowed=$user->rights->propal->lire;
+	    $genallowed=$user->rights->supplier_proposal->lire;
+	    $delallowed=$user->rights->supplier_proposal->lire;
 	
-	    print $formfile->showdocuments('massfilesarea_proposals','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,'','');
+	    print $formfile->showdocuments('massfilesarea_supplier_proposal','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,'','');
 	}
 	else
 	{

From 0a47245ba5f4904ce25e3800b2ddc5ce7e549975 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 Apr 2017 14:31:56 +0200
Subject: [PATCH 0563/1163] NEW Add mass actions (pdf merge and delete) for
 interventions

---
 htdocs/commande/list.php      |   5 +-
 htdocs/core/lib/files.lib.php |   9 ++
 htdocs/fichinter/list.php     | 179 +++++++++++++++++++++++++---------
 3 files changed, 146 insertions(+), 47 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 6d8f42edffb..140d1d379c7 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -563,8 +563,8 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 }
 
 $sql.= $db->plimit($limit + 1,$offset);
-
 //print $sql;
+
 $resql = $db->query($sql);
 if ($resql)
 {
@@ -1435,7 +1435,7 @@ if ($resql)
 	
 	    $filedir=$diroutputmassaction;
 	    $genallowed=$user->rights->commande->lire;
-	    $delallowed=$user->rights->commande->lire;
+	    $delallowed=$user->rights->commande->supprimer;
 	
 	    print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
 	}
@@ -1450,6 +1450,5 @@ else
 	dol_print_error($db);
 }
 
-// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 3310aa8e2c4..9888b261faa 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1783,6 +1783,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 		$original_file=$conf->facture->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
+	// Wrapping for mass actions
 	else if ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->dir_output))
 	{
 	    if ($fuser->rights->propal->lire || preg_match('/^specimen/i',$original_file))
@@ -1815,6 +1816,14 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	    }
 	    $original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
+	else if ($modulepart == 'massfilesarea_interventions')
+	{
+	    if ($fuser->rights->ficheinter->lire || preg_match('/^specimen/i',$original_file))
+	    {
+	        $accessallowed=1;
+	    }
+	    $original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	}
 	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->propal->dir_output))
 	{
 	    if ($fuser->rights->supplier_proposal->lire || preg_match('/^specimen/i',$original_file))
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 88584a4f954..07ca1a02e9f 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -36,12 +36,26 @@ $langs->load("companies");
 $langs->load("bills");
 $langs->load("interventions");
 
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
+
+$search_ref=GETPOST('search_ref')?GETPOST('search_ref','alpha'):GETPOST('search_inter','alpha');
+$search_company=GETPOST('search_company','alpha');
+$search_desc=GETPOST('search_desc','alpha');
+$search_status=GETPOST('search_status');
+$sall=GETPOST('sall');
+$optioncss = GETPOST('optioncss','alpha');
 $socid=GETPOST('socid','int');
 
 // Security check
-$fichinterid = GETPOST('id','int');
+$id = GETPOST('id','int');
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'ficheinter', $fichinterid,'fichinter');
+$result = restrictedArea($user, 'ficheinter', $id,'fichinter');
+
+$diroutputmassaction=$conf->ficheinter->dir_output . '/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
@@ -58,15 +72,11 @@ if (! $sortfield)
  	else $sortfield="f.ref";
 }
 
-$search_ref=GETPOST('search_ref')?GETPOST('search_ref','alpha'):GETPOST('search_inter','alpha');
-$search_company=GETPOST('search_company','alpha');
-$search_desc=GETPOST('search_desc','alpha');
-$search_status=GETPOST('search_status');
-$sall=GETPOST('sall');
-$optioncss = GETPOST('optioncss','alpha');
+// Initialize technical object to manage context to save list fields
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'interventionlist';
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('interventionlist'));
+$hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
@@ -108,24 +118,41 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 
 
 /*
- * Acions
+ * Actions
  */
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters);    // Note that $action and $object may have been modified by some hooks
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction=''; }
+
+$parameters=array('socid'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+if (empty($reshook))
 {
-	$search_ref="";
-	$search_company="";
-	$search_project="";
-	$search_contract="";
-	$search_desc="";
-	$search_status="";
-    $search_array_options=array();
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Purge search criteria
+	if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+	{
+		$search_ref="";
+		$search_company="";
+		$search_project="";
+		$search_contract="";
+		$search_desc="";
+		$search_status="";
+        $toselect='';
+		$search_array_options=array();
+	}
+
+	// Mass actions
+	$objectclass='Fichinter';
+	$objectlabel='Interventions';
+	$permtoread = $user->rights->ficheinter->lire;
+	$permtodelete = $user->rights->ficheinter->supprimer;
+	$uploaddir = $conf->ficheinter->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -134,13 +161,15 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
  *	View
  */
 
+$now=dol_now();
+
 $form = new Form($db);
 $formfile = new FormFile($db);
 $objectstatic=new Fichinter($db);
 $companystatic=new Societe($db);
 
-
-llxHeader('', $langs->trans("Intervention"));
+$title=$langs->trans("ListOfInterventions");
+llxHeader('', $title);
 
 
 $sql = "SELECT";
@@ -199,21 +228,24 @@ $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // No
 $sql.=$hookmanager->resPrint;
 $sql.= $db->order($sortfield,$sortorder);
 
-$totalnboflines=0;
-$result=$db->query($sql);
-if ($result)
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $totalnboflines = $db->num_rows($result);
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
 }
 
 $sql.= $db->plimit($limit+1, $offset);
 //print $sql;
 
-$result=$db->query($sql);
-if ($result)
+$resql=$db->query($sql);
+if ($resql)
 {
-	$num = $db->num_rows($result);
+	$num = $db->num_rows($resql);
 
+	$arrayofselected=is_array($toselect)?$toselect:array();
+	
 	$param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -223,6 +255,7 @@ if ($result)
 	if ($search_company) $param.="&search_company=".urlencode($search_company);
 	if ($search_desc) $param.="&search_desc=".urlencode($search_desc);
 	if ($search_status != '' && $search_status > -1) $param.="&search_status=".urlencode($search_status);
+    if ($show_files)            $param.='&show_files=' .$show_files;
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
     // Add $param from extra fields
     foreach ($search_array_options as $key => $val)
@@ -231,16 +264,28 @@ if ($result)
         $tmpkey=preg_replace('/search_options_/','',$key);
         if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
     } 	
-	
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+
+    // List of mass actions available
+    $arrayofmassactions =  array(
+        //'presend'=>$langs->trans("SendByMail"),
+        'builddoc'=>$langs->trans("PDFMerge"),
+    );
+    //if($user->rights->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
+    if ($user->rights->ficheinter->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+    //if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+    $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+    
+	// Lines of title fields
+    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
-	print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_commercial.png', 0, '', '', $limit);
+    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+    
+	print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 	
 	if ($sall)
     {
@@ -250,9 +295,22 @@ if ($result)
 
     $moreforfilter='';
     
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+    else $moreforfilter = $hookmanager->resPrint;
+    
+    if (! empty($moreforfilter))
+    {
+        print '<div class="liste_titre liste_titre_bydiv centpercent">';
+        print $moreforfilter;
+        print '</div>';
+    }
+    
 	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-    
+	if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+	
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -327,6 +385,7 @@ if ($result)
         print '<td class="liste_titre">';
         print '</td>';
     }
+    // Status
 	if (! empty($arrayfields['f.fk_statut']['checked']))
     {
 		print '<td class="liste_titre" align="right">';
@@ -336,9 +395,10 @@ if ($result)
 		print '</td>';
     }
 	print '<td class="liste_titre" align="right">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+	$searchpitco=$form->showFilterButtons();
 	print $searchpitco;
 	print '</td>';
+	
     print "</tr>\n";
 
     print '<tr class="liste_titre">';
@@ -375,14 +435,14 @@ if ($result)
 	$totalarray=array();
 	while ($i < min($num, $limit))
 	{
-		$obj = $db->fetch_object($result);
+		$obj = $db->fetch_object($resql);
 		
 		$objectstatic->id=$obj->rowid;
 		$objectstatic->ref=$obj->ref;
 		$objectstatic->statut=$obj->fk_statut;
 		
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
+		
         if (! empty($arrayfields['f.ref']['checked']))
 		{
 			print "<td>";
@@ -499,7 +559,14 @@ if ($result)
         	if (! $i) $totalarray['nbfield']++;
         }
         // Action column
-        print '<td></td>';
+        print '<td class="nowrap" align="center">';
+        if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+        {
+            $selected=0;
+    		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+    		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+        }
+        print '</td>';
         if (! $i) $totalarray['nbfield']++;
         
 		print "</tr>\n";
@@ -527,11 +594,36 @@ if ($result)
 	    print '</tr>';
 	}
 
-	print '</table>';
+	$db->free($resql);
+	
+	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+				
+	print '</table>'."\n";
 	print '</div>';
 	
 	print "</form>\n";
-	$db->free($result);
+
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
+	{
+	    /*
+	     * Show list of available documents
+	     */
+	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	    $urlsource.=str_replace('&amp;','&',$param);
+	
+	    $filedir=$diroutputmassaction;
+	    $genallowed=$user->rights->ficheinter->lire;
+	    $delallowed=$user->rights->ficheinter->supprimer;
+	
+	    print $formfile->showdocuments('massfilesarea_interventions','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+	}
+	else
+	{
+	    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
+	}
+	
 }
 else
 {
@@ -540,5 +632,4 @@ else
 
 
 llxFooter();
-
 $db->close();

From b054ca82675e37d36f4a03cf8075e36b36f3dab6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 Apr 2017 15:02:55 +0200
Subject: [PATCH 0564/1163] NEW Introduce mass action on product list ('delete'
 for the moment)

---
 ChangeLog                                     |   2 +
 htdocs/categories/viewcat.php                 |   2 +-
 htdocs/commande/list.php                      |   2 +-
 htdocs/product/card.php                       |   2 +-
 .../class/api_deprecated_product.class.php    |   2 +-
 htdocs/product/class/api_products.class.php   |   2 +-
 htdocs/product/class/product.class.php        |   6 +-
 .../class/price_expression.class.php          |   5 +-
 htdocs/product/dynamic_price/editor.php       |   3 +-
 htdocs/product/list.php                       | 136 +++++++++++-------
 10 files changed, 101 insertions(+), 61 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a0ffcdd1e43..31ddbd56bdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ Following changes may create regression for some external modules, but were nece
 * The trigger USER_SETINGROUP and USER_REMOVEFROMGROUP has been replaced with trigger USER_MODIFY.
 * The page societe/soc.php was renamed into societe/card.php to match page naming conventions.
 * The page compta/facture.php was renamed into compta/facture/card.php to match page naming conventions.
+* The signature of method ->delete() of class Product and PriceExpression was changed from 
+  ->delete($id, notrigger) to ->delete(User, notrigger) to match standard dev rules.
 
 
 ***** ChangeLog for 5.0.1 compared to 5.0.0 *****
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index a256b362361..e138107fd3f 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -224,7 +224,7 @@ print '<div class="underbanner clearboth"></div>';
 print '<table width="100%" class="border">';
 
 // Description
-print '<tr><td class="titlefield notopnoleft">';
+print '<tr><td class="titlefield notopnoleft tdtop">';
 print $langs->trans("Description").'</td><td>';
 print dol_htmlentitiesbr($object->description);
 print '</td></tr>';
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 140d1d379c7..4185518b721 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1389,7 +1389,7 @@ if ($resql)
 	}
 
 	// Show total line
-    	if (isset($totalarray['totalhtfield'])
+    if (isset($totalarray['totalhtfield'])
  	   || isset($totalarray['totalvatfield'])
  	   || isset($totalarray['totalttcfield'])
  	   || isset($totalarray['totalamfield'])
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 0c6109ba64a..7797e6802d4 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -562,7 +562,7 @@ if (empty($reshook))
     {
         if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
         {
-            $result = $object->delete($object->id);
+            $result = $object->delete(DolibarrApiAccess::$user);
         }
 
         if ($result > 0)
diff --git a/htdocs/product/class/api_deprecated_product.class.php b/htdocs/product/class/api_deprecated_product.class.php
index 49af8c73123..e2ee97e0100 100644
--- a/htdocs/product/class/api_deprecated_product.class.php
+++ b/htdocs/product/class/api_deprecated_product.class.php
@@ -339,7 +339,7 @@ class ProductApi extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         
-        return $this->product->delete($id);
+        return $this->product->delete(DolibarrApiAccess::$user);
     }
     
     /**
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 38b65ddfb4b..14885532952 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -246,7 +246,7 @@ class Products extends DolibarrApi
         global $user;
         $user = DolibarrApiAccess::$user;
 
-        return $this->product->delete($id);
+        return $this->product->delete(DolibarrApiAccess::$user);
     }
     
     /**
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5f5b6f6eae9..44024025ec0 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1012,18 +1012,18 @@ class Product extends CommonObject
 	/**
 	 *  Delete a product from database (if not used)
 	 *
-	 *	@param      int		$id         Product id (usage of this is deprecated, delete should be called without parameters on a fetched object)
+	 *	@param      User	$user       Product id (usage of this is deprecated, delete should be called without parameters on a fetched object)
 	 *  @param      int     $notrigger  Do not execute trigger
 	 * 	@return		int					< 0 if KO, 0 = Not possible, > 0 if OK
 	 */
-	function delete($id=0, $notrigger=0)
+	function delete(User $user, $notrigger=0)
 	{
 		// Deprecation warning
 		if ($id > 0) {
 			dol_syslog(__METHOD__ . " with parameter is deprecated", LOG_WARNING);
 		}
 
-		global $conf,$user,$langs;
+		global $conf, $langs;
 		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
 		$error=0;
diff --git a/htdocs/product/dynamic_price/class/price_expression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php
index bd4fa62692f..cd5c8bb25de 100644
--- a/htdocs/product/dynamic_price/class/price_expression.class.php
+++ b/htdocs/product/dynamic_price/class/price_expression.class.php
@@ -283,15 +283,16 @@ class PriceExpression
  	/**
 	 *  Delete object in database
 	 *
-     * 	@param	int		$rowid		 Row id of expression
      *	@param  User	$user        User that deletes
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-	function delete($rowid, $user, $notrigger=0)
+	function delete(User $user, $notrigger=0)
 	{
 		$error=0;
 
+		$rowid = $this->id;
+		
 		$this->db->begin();
 
 		if (! $error)
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index 055da4a3ad7..bcf18750981 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -149,7 +149,8 @@ if ($action == 'delete')
 {
 	if ($eid != 0)
 	{
-		$result = $price_expression->delete($eid, $user);
+	    $price_expression->fetch($eid);
+		$result = $price_expression->delete($user);
 		if ($result < 0)
 		{
 			setEventMessages("delete: ".$price_expression->error, $price_expression->errors, 'errors');
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 7789849da99..10d819738ca 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -45,7 +45,12 @@ $langs->load("suppliers");
 $langs->load("companies");
 if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
 
-$action = GETPOST('action');
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
+
 $sref=GETPOST("sref");
 $sbarcode=GETPOST("sbarcode");
 $snom=GETPOST("snom");
@@ -69,6 +74,8 @@ if (!$_POST) {
 	$search_hidechildproducts = GETPOST('search_hidechildproducts');
 }
 
+$diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
+
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -209,6 +216,16 @@ if (empty($reshook))
     	$search_accountancy_code_buy='';
     	$search_array_options=array();
     }
+    
+    // Mass actions
+    $objectclass='Product';
+    if ((string) $type == '1') { $objectlabel='Services'; }
+    if ((string) $type == '0') { $objectlabel='Products'; }
+    
+    $permtoread = $user->rights->produit->lire;
+    $permtodelete = $user->rights->produit->supprimer;
+    $uploaddir = $conf->product->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';    
 }
 
 
@@ -340,6 +357,8 @@ else
     {
     	$num = $db->num_rows($resql);
 
+    	$arrayofselected=is_array($toselect)?$toselect:array();
+    	 
     	if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
     	{
     	    $obj = $db->fetch_object($resql);
@@ -394,6 +413,15 @@ else
 	        if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 	    } 	
 		
+	    // List of mass actions available
+	    $arrayofmassactions =  array(
+	        //'presend'=>$langs->trans("SendByMail"),
+	        //'builddoc'=>$langs->trans("PDFMerge"),
+	    );
+	    if ($user->rights->produit->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+	    if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+	    $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+	     
 		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
         if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -403,7 +431,7 @@ else
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 		print '<input type="hidden" name="type" value="'.$type.'">';
 
-	    print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_products.png', 0, '', '', $limit);
+	    print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, '', '', $limit);
 
     	if (! empty($catid))
     	{
@@ -470,7 +498,8 @@ else
 
 			$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
             $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-
+            if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+            
             print '<div class="div-table-responsive">';
             print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
     		
@@ -581,8 +610,8 @@ else
 	            print $form->selectarray('tobuy', array('0'=>$langs->trans('ProductStatusNotOnBuyShort'),'1'=>$langs->trans('ProductStatusOnBuyShort')),$tobuy,1);
 	            print '</td>';
     		}
-            print '<td class="liste_titre" align="right">';
-            $searchpitco=$form->showFilterAndCheckAddButtons(0);
+            print '<td class="liste_titre" align="middle">';
+	        $searchpitco=$form->showFilterButtons();
             print $searchpitco;
             print '</td>';
 
@@ -632,14 +661,14 @@ else
     	    $i = 0;
     		while ($i < min($num,$limit))
     		{
-    			$objp = $db->fetch_object($resql);
+    			$obj = $db->fetch_object($resql);
 
     			// Multilangs
     			if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
     			{
     				$sql = "SELECT label";
     				$sql.= " FROM ".MAIN_DB_PREFIX."product_lang";
-    				$sql.= " WHERE fk_product=".$objp->rowid;
+    				$sql.= " WHERE fk_product=".$obj->rowid;
     				$sql.= " AND lang='". $langs->getDefaultLang() ."'";
     				$sql.= " LIMIT 1";
 
@@ -647,22 +676,22 @@ else
     				if ($result)
     				{
     					$objtp = $db->fetch_object($result);
-    					if (! empty($objtp->label)) $objp->label = $objtp->label;
+    					if (! empty($objtp->label)) $obj->label = $objtp->label;
     				}
     			}
 
-    			$product_static->id = $objp->rowid;
-    			$product_static->ref = $objp->ref;
-    			$product_static->ref_fourn = $objp->ref_supplier;
-                $product_static->label = $objp->label;
-    			$product_static->type = $objp->fk_product_type;
-    			$product_static->status_buy = $objp->tobuy;
-                $product_static->status     = $objp->tosell;
-				$product_static->entity = $objp->entity;
+    			$product_static->id = $obj->rowid;
+    			$product_static->ref = $obj->ref;
+    			$product_static->ref_fourn = $obj->ref_supplier;
+                $product_static->label = $obj->label;
+    			$product_static->type = $obj->fk_product_type;
+    			$product_static->status_buy = $obj->tobuy;
+                $product_static->status     = $obj->tosell;
+				$product_static->entity = $obj->entity;
 
 				if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1)	// To optimize call of load_stock
 				{
-				    if ($objp->fk_product_type != 1)    // Not a service
+				    if ($obj->fk_product_type != 1)    // Not a service
 				    {
 				        $product_static->load_stock('nobatch');             // Load stock_reel + stock_warehouse. This also call load_virtual_stock()
 				    }
@@ -688,27 +717,27 @@ else
     			// Label
 			    if (! empty($arrayfields['p.label']['checked']))
 			    {
-			    	print '<td>'.dol_trunc($objp->label,40).'</td>';
+			    	print '<td>'.dol_trunc($obj->label,40).'</td>';
 			    }
 			    
     			// Barcode
 			    if (! empty($arrayfields['p.barcode']['checked']))
 			    {
-    				print '<td>'.$objp->barcode.'</td>';
+    				print '<td>'.$obj->barcode.'</td>';
     			}
 
     			// Duration
  			    if (! empty($arrayfields['p.duration']['checked']))
     			{
     				print '<td align="center">';
-    				if (preg_match('/([0-9]+)[a-z]/i',$objp->duration))
+    				if (preg_match('/([0-9]+)[a-z]/i',$obj->duration))
     				{
-	    				if (preg_match('/([0-9]+)y/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationYear");
-	    				elseif (preg_match('/([0-9]+)m/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationMonth");
-	    				elseif (preg_match('/([0-9]+)w/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationWeek");
-	    				elseif (preg_match('/([0-9]+)d/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationDay");
-	    				//elseif (preg_match('/([0-9]+)h/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationHour");
-	    				else print $objp->duration;
+	    				if (preg_match('/([0-9]+)y/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationYear");
+	    				elseif (preg_match('/([0-9]+)m/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationMonth");
+	    				elseif (preg_match('/([0-9]+)w/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationWeek");
+	    				elseif (preg_match('/([0-9]+)d/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationDay");
+	    				//elseif (preg_match('/([0-9]+)h/i',$obj->duration,$regs)) print $regs[1].' '.$langs->trans("DurationHour");
+	    				else print $obj->duration;
     				}
     				print '</td>';
     			}
@@ -717,10 +746,10 @@ else
  			    if (! empty($arrayfields['p.sellprice']['checked']))
     			{
     			    print '<td align="right">';
-    			    if ($objp->tosell)
+    			    if ($obj->tosell)
     			    {
-        				if ($objp->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
-        				else print price($objp->price).' '.$langs->trans("HT");
+        				if ($obj->price_base_type == 'TTC') print price($obj->price_ttc).' '.$langs->trans("TTC");
+        				else print price($obj->price).' '.$langs->trans("HT");
     			    }
         			print '</td>';
     			}
@@ -729,10 +758,10 @@ else
  			    if (! empty($arrayfields['p.minbuyprice']['checked']))
     			{
         			print  '<td align="right">';
-    			    if ($objp->tobuy && $objp->minsellprice != '')
+    			    if ($obj->tobuy && $obj->minsellprice != '')
         			{
-    					//print price($objp->minsellprice).' '.$langs->trans("HT");
-    					if ($product_fourn->find_min_price_product_fournisseur($objp->rowid) > 0)
+    					//print price($obj->minsellprice).' '.$langs->trans("HT");
+    					if ($product_fourn->find_min_price_product_fournisseur($obj->rowid) > 0)
     					{
     						if ($product_fourn->product_fourn_price_id > 0)
     						{
@@ -752,9 +781,9 @@ else
 		        if (! empty($arrayfields['p.seuil_stock_alerte']['checked']))
         		{
                     print '<td align="right">';
-    				if ($objp->fk_product_type != 1)
+    				if ($obj->fk_product_type != 1)
     				{
-                        print $objp->seuil_stock_alerte;
+                        print $obj->seuil_stock_alerte;
     				}
     				print '</td>';
         		}
@@ -762,9 +791,9 @@ else
 		        if (! empty($arrayfields['p.desiredstock']['checked']))
         		{
                     print '<td align="right">';
-    				if ($objp->fk_product_type != 1)
+    				if ($obj->fk_product_type != 1)
     				{
-                        print $objp->desiredstock;
+                        print $obj->desiredstock;
     				}
     				print '</td>';
         		}
@@ -772,9 +801,9 @@ else
 		        if (! empty($arrayfields['p.stock']['checked']))
         		{
    					print '<td align="right">';
-    				if ($objp->fk_product_type != 1)
+    				if ($obj->fk_product_type != 1)
     				{
-   						if ($objp->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $objp->seuil_stock_alerte) print img_warning($langs->trans("StockTooLow")).' ';
+   						if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockTooLow")).' ';
       					print $product_static->stock_reel;
     				}
     				print '</td>';
@@ -783,9 +812,9 @@ else
 		        if (! empty($arrayfields['stock_virtual']['checked']))
         		{
    					print '<td align="right">';
-    				if ($objp->fk_product_type != 1)
+    				if ($obj->fk_product_type != 1)
     				{
-   						if ($objp->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $objp->seuil_stock_alerte) print img_warning($langs->trans("StockTooLow")).' ';
+   						if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockTooLow")).' ';
       					print $product_static->stock_theorique;
     				}
     				print '</td>';
@@ -794,13 +823,13 @@ else
 		        if (! empty($arrayfields['p.tobatch']['checked']))
         		{
                     print '<td align="center">';
-    				print yn($objp->tobatch);
+    				print yn($obj->tobatch);
     				print '</td>';
         		}
     			// Accountancy code sell
-		        if (! empty($arrayfields['p.accountancy_code_sell']['checked'])) print '<td>'.$objp->accountancy_code_sell.'</td>';
+		        if (! empty($arrayfields['p.accountancy_code_sell']['checked'])) print '<td>'.$obj->accountancy_code_sell.'</td>';
     			// Accountancy code sell
-		        if (! empty($arrayfields['p.accountancy_code_buy']['checked'])) print '<td>'.$objp->accountancy_code_buy.'</td>';
+		        if (! empty($arrayfields['p.accountancy_code_buy']['checked'])) print '<td>'.$obj->accountancy_code_buy.'</td>';
 		        // Extra fields
 				if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 				{
@@ -813,7 +842,7 @@ else
 							if ($align) print ' align="'.$align.'"';
 							print '>';
 							$tmpkey='options_'.$key;
-							print $extrafields->showOutputField($key, $objp->$tmpkey, '', 1);
+							print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 							print '</td>';
 						}
 				   }
@@ -826,14 +855,14 @@ else
 		        if (! empty($arrayfields['p.datec']['checked']))
 		        {
 		            print '<td align="center">';
-		            print dol_print_date($objp->date_creation, 'dayhour');
+		            print dol_print_date($obj->date_creation, 'dayhour');
 		            print '</td>';
 		        }
 		        // Date modification
 		        if (! empty($arrayfields['p.tms']['checked']))
 		        {
 		            print '<td align="center">';
-		            print dol_print_date($objp->date_update, 'dayhour');
+		            print dol_print_date($obj->date_update, 'dayhour');
 		            print '</td>';
 		        }    			
     			
@@ -844,7 +873,7 @@ else
 	                if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
 	                    print ajax_object_onoff($product_static, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
 	                } else {
-	                    print $product_static->LibStatut($objp->tosell,5,0);
+	                    print $product_static->LibStatut($obj->tosell,5,0);
 	                }
 	                print '</td>';
         		}
@@ -855,12 +884,19 @@ else
 	                if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
 	                    print ajax_object_onoff($product_static, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
 	                } else {
-	                    print $product_static->LibStatut($objp->tobuy,5,1);
+	                    print $product_static->LibStatut($obj->tobuy,5,1);
 	                }
 	                print '</td>';
         		}
-        		// Action	
-                print '<td>&nbsp;</td>';
+        		// Action
+        		print '<td class="nowrap" align="center">';
+        		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+        		{
+        		    $selected=0;
+        		    if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+        		    print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+        		}
+        		print '</td>';
 
                 print "</tr>\n";
     			$i++;

From f460d2e705ede1ee91420f48fb0a92606f01ee78 Mon Sep 17 00:00:00 2001
From: mikee2 <mikee2@users.noreply.github.com>
Date: Sun, 9 Apr 2017 21:39:15 +0200
Subject: [PATCH 0565/1163] Update Segment.php

---
 htdocs/includes/odtphp/Segment.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index 39761aa4d04..2ef40b2cd66 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -139,6 +139,8 @@ class Segment implements IteratorAggregate, Countable
         }
         $reg = "/\[!--\sBEGIN\s$this->name\s--\](.*)\[!--\sEND\s$this->name\s--\]/sm";
         $this->xmlParsed = preg_replace($reg, '$1', $this->xmlParsed);
+	// Miguel Erill 09704/2017 - Add macro replacement to invoice lines
+        $this->xmlParsed = $this->macroReplace($this->xmlParsed);
         $this->file->open($this->odf->getTmpfile());
         foreach ($this->images as $imageKey => $imageValue) {
 			if ($this->file->getFromName('Pictures/' . $imageValue) === false) {
@@ -152,6 +154,29 @@ class Segment implements IteratorAggregate, Countable
         
         return $this->xmlParsed;
     }
+   /**
+    * Function to replace macros for invoice short and long month, invoice year
+    * 
+    * Substitution occur when the invoice is generated, not considering the invoice date
+    * so do not (re)generate in a diferent date than the one that the invoice belongs to
+    * Perhaps it would be better to use the invoice issued date but I still do not know
+    * how to get it here
+    *
+    * Miguel Erill 09/04/2017
+    * 
+    * @param	string	$value	String to convert
+    */
+    public function macroReplace($text)
+    {
+        global $langs;
+
+        $patterns=array( '/\[%M\]/','/\[%F\]/','/\[%Y\]/' );
+        $values=array( $langs->trans(date('M')), $langs->trans(date('F')), date('Y') );
+
+        $text=preg_replace($patterns, $values, $text);
+
+	return $text;
+    }
     /**
      * Analyse the XML code in order to find children
      *

From 199067e4b8258fc29387d9f3dade2f3d716688e1 Mon Sep 17 00:00:00 2001
From: guillaume-uH57J9 <guillaume-uH57J9@users.noreply.github.com>
Date: Sun, 9 Apr 2017 22:00:19 +0200
Subject: [PATCH 0566/1163] members/new.php : non-public by default

in the form, disable public by default, to be consistent with class Adherent's default value
---
 htdocs/public/members/new.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index e01201ccea3..c307512e257 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -223,7 +223,7 @@ if ($action == 'add')
         // email a peu pres correct et le login n'existe pas
         $adh = new Adherent($db);
         $adh->statut      = -1;
-        $adh->public      = $_POST["public"];
+        $adh->public      = $public;
         $adh->firstname   = $_POST["firstname"];
         $adh->lastname    = $_POST["lastname"];
         $adh->civility_id = $_POST["civility_id"];
@@ -508,7 +508,7 @@ print '</td></tr>'."\n";
 // Photo
 print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" size="40" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
 // Public
-print '<tr><td>'.$langs->trans("Public").'</td><td><input type="checkbox" name="public" value="1" checked></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Public").'</td><td><input type="checkbox" name="public"></td></tr>'."\n";
 // Extrafields
 foreach($extrafields->attribute_label as $key=>$value)
 {

From e335b757fd23efac8e6e7cad747276484a5ebb9a Mon Sep 17 00:00:00 2001
From: guillaume-uH57J9 <guillaume-uH57J9@users.noreply.github.com>
Date: Sun, 9 Apr 2017 22:37:17 +0200
Subject: [PATCH 0567/1163] Add UI to configure MEMBER_NEWFORM_FORCETYPE

Use tertiary operator ($var?: -1) instead of (!empty($var) ? $var : -1)
---
 htdocs/adherents/admin/public.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index a23c1f40def..47ad7a00a97 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -29,6 +29,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
 $langs->load("members");
 $langs->load("admin");
@@ -49,12 +50,15 @@ if ($action == 'update')
 	$editamount=GETPOST('MEMBER_NEWFORM_EDITAMOUNT');
 	$payonline=GETPOST('MEMBER_NEWFORM_PAYONLINE');
 	$email=GETPOST('MEMBER_PAYONLINE_SENDEMAIL');
+        $forcetype=GETPOST('MEMBER_NEWFORM_FORCETYPE');
 
     $res=dolibarr_set_const($db, "MEMBER_ENABLE_PUBLIC",$public,'chaine',0,'',$conf->entity);
     $res=dolibarr_set_const($db, "MEMBER_NEWFORM_AMOUNT",$amount,'chaine',0,'',$conf->entity);
     $res=dolibarr_set_const($db, "MEMBER_NEWFORM_EDITAMOUNT",$editamount,'chaine',0,'',$conf->entity);
     $res=dolibarr_set_const($db, "MEMBER_NEWFORM_PAYONLINE",$payonline,'chaine',0,'',$conf->entity);
     $res=dolibarr_set_const($db, "MEMBER_PAYONLINE_SENDEMAIL",$email,'chaine',0,'',$conf->entity);
+    if ($forcetype < 0) $res=dolibarr_del_const($db, "MEMBER_NEWFORM_FORCETYPE",$conf->entity);
+    else                $res=dolibarr_set_const($db, "MEMBER_NEWFORM_FORCETYPE",$forcetype,'chaine',0,'',$conf->entity);
 
     if (! $res > 0) $error++;
 
@@ -152,14 +156,18 @@ print '</td><td align="right">';
 print $form->selectyesno("MEMBER_ENABLE_PUBLIC",(! empty($conf->global->MEMBER_ENABLE_PUBLIC)?$conf->global->MEMBER_ENABLE_PUBLIC:0),1);
 print "</td></tr>\n";
 
-// Type
-/*$var=! $var;
+// Force Type
+$var=! $var;
+$adht = new AdherentType($db);
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr '.$bc[$var].' class="drag"><td>';
-print $langs->trans("EnablePublicSubscriptionForm");
+print $langs->trans("ForceMemberType");
 print '</td><td width="60" align="center">';
-print $form->selectyesno("forcedate",$conf->global->MEMBER_NEWFORM_FORCETYPE,1);
-print "</td></tr>\n"; */
+$listofval = array(-1 => $langs->trans("Undefined"));
+$listofval += $adht->liste_array();
+$forcetype = $conf->global->MEMBER_NEWFORM_FORCETYPE ?: -1;
+print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, count($listetype)>1?1:0);
+print "</td></tr>\n";
 
 // Amount
 $var=! $var;

From f427c8441a267409d44c56217871e6fd93eb0b2f Mon Sep 17 00:00:00 2001
From: Guillaume <guillaume@atto.be>
Date: Sun, 9 Apr 2017 22:49:48 +0200
Subject: [PATCH 0568/1163] add translation strings for ForceMemberType

---
 htdocs/langs/en_US/members.lang | 1 +
 htdocs/langs/fr_FR/members.lang | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index d306d6e4998..db3aefa9363 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -90,6 +90,7 @@ PublicMemberList=Public member list
 BlankSubscriptionForm=Public auto-subscription form
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
 EnablePublicSubscriptionForm=Enable the public auto-subscription form
+ForceMemberType=Force the member type
 ExportDataset_member_1=Members and subscriptions
 ImportDataset_member_1=Members
 LastMembersModified=Latest %s modified members
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 45dc1ad0c45..3f74da84dd4 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -90,6 +90,7 @@ PublicMemberList=Liste des membres publics
 BlankSubscriptionForm=Formulaire d'auto-inscription public
 BlankSubscriptionFormDesc=Dolibarr peut offrir une URL de page publique permettant de postuler à une adhésion pour les visiteurs externes. S'il existe un module de paiement en ligne, un formulaire de paiement sera également automatiquement proposé.
 EnablePublicSubscriptionForm=Activer le formulaire d'auto-inscription public
+ForceMemberType=Forcer le type de membre
 ExportDataset_member_1=Adhérents et adhésions
 ImportDataset_member_1=Adhérents
 LastMembersModified=Les %s derniers adhérents modifiés

From f1ae0eb7c6159ecb03e502bafbd05f4681f260a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 Apr 2017 12:51:52 +0200
Subject: [PATCH 0569/1163] Default value

---
 htdocs/admin/defaultvalues.php | 44 +++++++++++++++++++++-------------
 htdocs/core/lib/admin.lib.php  | 16 ++++++++++---
 htdocs/langs/en_US/admin.lang  |  4 ++++
 htdocs/langs/en_US/main.lang   |  4 ++++
 4 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 4a4815e726b..3056b981535 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -50,6 +50,10 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='lang,transkey';
 if (! $sortorder) $sortorder='ASC';
 
+$defaulturl = GETPOST('defaulturl');
+$defaultkey = GETPOST('defaultkey','alpha');
+$defaultvalue = GETPOST('defaultvalue');
+
 
 /*
  * Actions
@@ -67,8 +71,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
 {
-    $transkey='';
-    $transvalue='';
+    $defaulturl='';
+    $defaultkey='';
+    $defaultvalue='';
     $toselect='';
     $search_array_options=array();
 }
@@ -101,8 +106,9 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 		{
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$action="";
-			$transkey="";
-			$transvalue="";
+			$defaulturl='';
+			$defaultkey='';
+			$defaultvalue='';
 		}
 		else
 		{
@@ -136,6 +142,7 @@ if ($action == 'delete')
  * View
  */
 
+$form=new Form($db);
 $formadmin = new FormAdmin($db);
 
 $wikihelp='EN:Setup|FR:Paramétrage|ES:Configuración';
@@ -149,10 +156,10 @@ print "<br>\n";
 $param='&mode='.$mode;
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($optioncss != '') $param.='&optioncss='.$optioncss;
-if ($langcode)        $param.='&langcode='.urlencode($langcode);
-if ($transkey)        $param.='&transkey='.urlencode($transkey);
-if ($transvalue)      $param.='&transvalue='.urlencode($transvalue);
+if ($optioncss != '')  $param.='&optioncss='.$optioncss;
+if (defaulturl)        $param.='&defaulturl='.urlencode(defaulturl);
+if (defaultkey)        $param.='&defaultkey='.urlencode(defaultkey);
+if (defaultvalue)      $param.='&defaultvalue='.urlencode(defaultvalue);
 
 
 print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug)?'?debug=1':'').'" method="POST">';
@@ -165,7 +172,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 $head=defaultvalues_prepare_head();
     
-dol_fiche_head($head, 'overwrite', '', -1, '');
+dol_fiche_head($head, $mode, '', -1, '');
 
 
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -174,9 +181,13 @@ print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print_liste_field_titre($langs->trans("Language").' (en_US, es_MX, ...)',$_SERVER["PHP_SELF"],'lang,transkey','',$param,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Key"),$_SERVER["PHP_SELF"],'transkey','',$param,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("NewTranslationStringToShow"),$_SERVER["PHP_SELF"],'transvalue','',$param,'',$sortfield,$sortorder);
+$texthelp=$langs->trans("PageUrlForDefaultValues");
+if ($mode == 'createform') $texthelp.=$langs->trans("PageUrlForDefaultValuesCreate", 'societe/card.php');
+else $texthelp.=$langs->trans("PageUrlForDefaultValuesList", 'societe/list.php');
+$texturl=$form->textwithpicto($langs->trans("Url"), $texthelp);
+print_liste_field_titre($texturl,$_SERVER["PHP_SELF"],'defaulturl','',$param,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Key"),$_SERVER["PHP_SELF"],'defaultkey','',$param,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Value"),$_SERVER["PHP_SELF"],'defaultvalue','',$param,'',$sortfield,$sortorder);
 //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],'entity,transkey','',$param,'',$sortfield,$sortorder);
 print '<td align="center"></td>';
 print "</tr>\n";
@@ -185,13 +196,14 @@ print "</tr>\n";
 // Line to add new record
 print "\n";
 
-print '<tr class="oddeven"><td>';
-print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, 0, 'maxwidthonsmartphone', 1);
+print '<tr class="oddeven">';
+print '<td>';
+print '<input type="text" class="flat minwidth200 maxwidthonsmartphone" name="defaulturl" value="">';
 print '</td>'."\n";
 print '<td>';
-print '<input type="text" class="flat maxwidthonsmartphone" name="transkey" value="">';
+print '<input type="text" class="flat maxwidth100" name="defaultkey" value="">';
 print '</td><td>';
-print '<input type="text" class="quatrevingtpercent" name="transvalue" value="">';
+print '<input type="text" class="flat maxwidthonsmartphone" name="defaultvalue" value="">';
 print '</td>';
 // Limit to superadmin
 /*if (! empty($conf->multicompany->enabled) && !$user->entity)
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 5c4df1bcd91..63b06dbd737 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -609,9 +609,19 @@ function defaultvalues_prepare_head()
     $h = 0;
     $head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=overwrite";
-    $head[$h][1] = $langs->trans("DefaultValuesOverwriteKey");
-    $head[$h][2] = 'overwrite';
+    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=createform";
+    $head[$h][1] = $langs->trans("DefaultCreateForm");
+    $head[$h][2] = 'createform';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=filters";
+    $head[$h][1] = $langs->trans("DefaultSearchFilters");
+    $head[$h][2] = 'filters';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=sortorder";
+    $head[$h][1] = $langs->trans("DefaultSortOrder");
+    $head[$h][2] = 'sortorder';
     $h++;
 
     /*$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index ded46d762d9..9ab6408714c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1338,6 +1338,10 @@ CacheByServer=Cache by server
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers 
+DefaultValuesDesc=You can defined here the default value you want to get when your create a new record, and/or defaut filters or soting order when your list record. 
+DefaultCreateForm=Create forms
+DefaultSearchFilters=Search filters
+DefaultSortOrder=Sort orders
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 918f46a44b7..85d86d77abf 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -309,6 +309,10 @@ Copy=Copy
 Paste=Paste
 Default=Default
 DefaultValue=Default value
+DefaultValues=Default values
+PageUrlForDefaultValues=You must enter here the relative url of the page. Examples:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>.
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>.
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)

From 06f9c1989be2a8992f1ab1c455649609a034410c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 Apr 2017 13:14:31 +0200
Subject: [PATCH 0570/1163] Work on default values

---
 htdocs/admin/defaultvalues.php    | 53 +++++++++++++++++++------------
 htdocs/bookmarks/list.php         |  9 ++----
 htdocs/langs/en_US/bookmarks.lang |  2 +-
 htdocs/langs/en_US/main.lang      |  1 +
 4 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 3056b981535..2fb7002adbd 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -83,25 +83,23 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 {
 	$error=0;
 
-	if (empty($langcode))
+	if (empty($defaulturl))
 	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Language")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
 		$error++;
 	}
-	if ($transkey == '')
+	if (empty($defaultkey))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Key")), null, 'errors');
 		$error++;
 	}
-	if ($transvalue == '')
-	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NewTranslationStringToShow")), null, 'errors');
-		$error++;
-	}
 	if (! $error)
 	{
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."')";
-		$result = $db->query($sql);
+		//$sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."')";
+		//$result = $db->query($sql);
+		
+	    // TODO Insert var
+	    
 		if ($result > 0)
 		{
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
@@ -121,7 +119,8 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 // Delete line from delete picto
 if ($action == 'delete')
 {
-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."overwrite_trans WHERE rowid = ".$db->escape($id);
+	//$sql = "DELETE FROM ".MAIN_DB_PREFIX."overwrite_trans WHERE rowid = ".$db->escape($id);
+	// Delete const
 	$result = $db->query($sql);
 	if ($result >= 0)
 	{
@@ -186,8 +185,15 @@ if ($mode == 'createform') $texthelp.=$langs->trans("PageUrlForDefaultValuesCrea
 else $texthelp.=$langs->trans("PageUrlForDefaultValuesList", 'societe/list.php');
 $texturl=$form->textwithpicto($langs->trans("Url"), $texthelp);
 print_liste_field_titre($texturl,$_SERVER["PHP_SELF"],'defaulturl','',$param,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Key"),$_SERVER["PHP_SELF"],'defaultkey','',$param,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Value"),$_SERVER["PHP_SELF"],'defaultvalue','',$param,'',$sortfield,$sortorder);
+if ($mode != 'sortorder')
+{
+    $texthelp=$langs->trans("TheKeyIsTheNameOfHtmlField");
+    $textkey=$form->textwithpicto($langs->trans("Key"), $texthelp);
+    print_liste_field_titre($textkey,$_SERVER["PHP_SELF"],'defaultkey','',$param,'',$sortfield,$sortorder);
+}
+$texthelp=$langs->trans("YouCanUseSubstitutionValue");
+$textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp);
+print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'defaultvalue', '', $param, '', $sortfield, $sortorder);
 //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],'entity,transkey','',$param,'',$sortfield,$sortorder);
 print '<td align="center"></td>';
 print "</tr>\n";
@@ -200,9 +206,13 @@ print '<tr class="oddeven">';
 print '<td>';
 print '<input type="text" class="flat minwidth200 maxwidthonsmartphone" name="defaulturl" value="">';
 print '</td>'."\n";
+if ($mode != 'sortorder')
+{
+    print '<td>';
+    print '<input type="text" class="flat maxwidth100" name="defaultkey" value="">';
+    print '</td>';
+}
 print '<td>';
-print '<input type="text" class="flat maxwidth100" name="defaultkey" value="">';
-print '</td><td>';
 print '<input type="text" class="flat maxwidthonsmartphone" name="defaultvalue" value="">';
 print '</td>';
 // Limit to superadmin
@@ -224,13 +234,13 @@ print '</tr>';
 
 
 // Show constants
-$sql = "SELECT";
+/*$sql = "SELECT";
 $sql.= " rowid";
 $sql.= ", lang";
 $sql.= ", transkey";
 $sql.= ", transvalue";
 $sql.= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
-$sql.= " WHERE 1 = 1";
+$sql.= " WHERE 1 = 1";*/
 //$sql.= " AND entity IN (".$user->entity.",".$conf->entity.")";
 //if ((empty($user->entity) || $user->admin) && $debug) {} 										// to force for superadmin to debug
 //else if (! GETPOST('visible') || GETPOST('visible') != 'all') $sql.= " AND visible = 1";		// We must always have this. Otherwise, array is too large and submitting data fails due to apache POST or GET limits
@@ -253,11 +263,14 @@ if ($result)
 
 		print "\n";
 
-		print '<tr '.$bc[$var].'>';
+		print '<tr class="oddeven">';
 		
 		print '<td>'.$obj->lang.'</td>'."\n";
-		print '<td>'.$obj->transkey.'</td>'."\n";
-
+        if ($mode != 'sortorder')
+        {
+	   	   print '<td>'.$obj->transkey.'</td>'."\n";
+        }
+        
 		// Value
 		print '<td>';
 		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index b0cda58951c..7002c42e737 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -101,11 +101,8 @@ if ($resql)
     //print "<td>&nbsp;</td>";
     print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bid","", $param,'align="left"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Title"),'','');
-    print "</td>";
     print_liste_field_titre($langs->trans("Link"),'','');
-    print "</td>";
     print_liste_field_titre($langs->trans("Target"),'','','','','align="center"');
-    print "</td>";
     print_liste_field_titre($langs->trans("Owner"),$_SERVER["PHP_SELF"],"u.lastname","", $param,'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"b.dateb","", $param,'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Position"),$_SERVER["PHP_SELF"],"b.position","", $param,'align="right"',$sortfield,$sortorder);
@@ -126,8 +123,8 @@ if ($resql)
         print '</td>';
 
         $linkintern=0;
-        $title=dol_trunc($obj->title,24);
-        $link=dol_trunc($obj->url,24);
+        $title=$obj->title;
+        $link=$obj->url;
 
         // Title
         print "<td>";
@@ -152,7 +149,7 @@ if ($resql)
         print "</td>\n";
 
         // Url
-        print "<td>";
+        print '<td class="tdoverflowmax200">';
         if (! $linkintern) print '<a href="'.$obj->url.'"'.($obj->target?' target="newlink"':'').'>';
         print $link;
         if (! $linkintern) print '</a>';
diff --git a/htdocs/langs/en_US/bookmarks.lang b/htdocs/langs/en_US/bookmarks.lang
index 0b6216c6be4..d15ed3e1148 100644
--- a/htdocs/langs/en_US/bookmarks.lang
+++ b/htdocs/langs/en_US/bookmarks.lang
@@ -3,7 +3,7 @@ AddThisPageToBookmarks=Add current page to bookmarks
 Bookmark=Bookmark
 Bookmarks=Bookmarks
 ListOfBookmarks=List of bookmarks
-EditBookmarks=Edit bookmarks
+EditBookmarks=List/edit bookmarks
 NewBookmark=New bookmark
 ShowBookmark=Show bookmark
 OpenANewWindow=Open a new window
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 85d86d77abf..1589f378025 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -310,6 +310,7 @@ Paste=Paste
 Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
+TheKeyIsTheNameOfHtmlField=The key is the name of the html field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
 PageUrlForDefaultValues=You must enter here the relative url of the page. Examples:
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>.
 PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>.

From 20202871ebdb029fec4dcf214b07035fe4cd5b35 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Mon, 10 Apr 2017 15:54:02 +0200
Subject: [PATCH 0571/1163] expedition->dir_output is used by livraison

not livraison->dir_output who not exist
---
 htdocs/core/lib/files.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 9888b261faa..e9bcccce798 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1977,7 +1977,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 
 	// Wrapping pour les bons de livraison
-	else if ($modulepart == 'livraison' && !empty($conf->livraison->dir_output))
+	else if ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
 	{
 		if ($fuser->rights->expedition->livraison->lire || preg_match('/^specimen/i',$original_file))
 		{

From 9b45776941f3c64a3a15afa58a1687b4d66a9ca9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 Apr 2017 17:25:53 +0200
Subject: [PATCH 0572/1163] Fix responsive

---
 htdocs/admin/ihm.php               | 24 ++++++++++------------
 htdocs/comm/action/listactions.php | 32 +++++++++++++++---------------
 htdocs/theme/eldy/style.css.php    |  4 ++--
 htdocs/theme/md/style.css.php      |  4 ++--
 4 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 65d168815c3..24c5516dea7 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -420,22 +420,21 @@ if ($action == 'edit')	// Edit
 	$doleditor->Create();
 	print '</td></tr>'."\n";
 	
-	// Logo
+	// Background
 	$var=!$var;
-	print '<tr'.dol_bc($var,'hideonsmartphone').'><td><label for="imagebackground">'.$langs->trans("BackgroundImageLogin").' (png,jpg)</label></td><td colspan="2">';
-	print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
+	print '<tr><td><label for="imagebackground">'.$langs->trans("BackgroundImageLogin").' (png,jpg)</label></td><td colspan="2">';
+    print '<div class="centpercent inline-block">';
 	print '<input type="file" class="flat class=minwidth200" name="imagebackground" id="imagebackground">';
-	print '</td><td class="nocellnopadd" valign="middle" align="right">';
 	if (! empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
 	    print '<a href="'.$_SERVER["PHP_SELF"].'?action=removebackgroundlogin">'.img_delete($langs->trans("Delete")).'</a>';
 	    if (file_exists($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_LOGIN_BACKGROUND)) {
 	        print ' &nbsp; ';
-	        print '<img width="100px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('/'.$conf->global->MAIN_LOGIN_BACKGROUND).'">';
+	        print '<img class="paddingleft valignmiddle" width="100px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('/'.$conf->global->MAIN_LOGIN_BACKGROUND).'">';
 	    }
 	} else {
-	    print '<img width="100" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+	    print '<img class="paddingleft valignmiddle" width="100" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
 	}
-	print '</td></tr></table>';
+	print '</div>';
 	print '</td></tr>';
 	
 	print '</table>'."\n";
@@ -604,22 +603,19 @@ else	// Show
     print '</td></tr>'."\n";
     
     // Background login
-    // Logo
     $var=!$var;
     print '<tr class="oddeven"><td>'.$langs->trans("BackgroundImageLogin").'</td><td colspan="2">';
-    print '<div class="tagtable centpercent"><div class="tagtr inline-block centpercent valignmiddle"><div class="tagtd inline-block valignmiddle left">';
+    print '<div class="centpercent inline-block">';
     print $conf->global->MAIN_LOGIN_BACKGROUND;
-    print '</div><div class="tagtd inline-block valignmiddle left">';
-    // It offers the generation of the thumbnail if it does not exist
     if ($conf->global->MAIN_LOGIN_BACKGROUND && is_file($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_LOGIN_BACKGROUND))
     {
-        print '<img class="img_logo" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($conf->global->MAIN_LOGIN_BACKGROUND).'">';
+        print '<img class="img_logo paddingleft valignmiddle" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($conf->global->MAIN_LOGIN_BACKGROUND).'">';
     }
     else
     {
-        print '<img class="img_logo" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+        print '<img class="img_logo paddingleft valignmiddle" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
     }
-    print '</div></div></div>';
+    print '</div>';
     print '</td></tr>';
     
     print '</table>'."\n";
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 8776984345b..ef260cb2197 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -343,21 +343,7 @@ if ($resql)
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-    print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"a.id",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder);
-	//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) 
-	print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"c.libelle",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"a.datep",$param,'','align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"a.fk_contact",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("ActionsOwnedByShort"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre("");
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" name="search_title" value="'.$search_title.'"></td>';
     print '<td class="liste_titre"></td>';
@@ -375,10 +361,24 @@ if ($resql)
     print '</td>';
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+	$searchpitco=$form->showFilterButtons();
 	print $searchpitco;
 	print '</td>';
 	print "</tr>\n";
+	
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"a.id",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder);
+	//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) 
+	print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"c.libelle",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"a.datep",$param,'','align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"a.fk_contact",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("ActionsOwnedByShort"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre("");
+	print "</tr>\n";
 
 	$contactstatic = new Contact($db);
 	$now=dol_now();
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index dc45420d90c..b50e193547b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3297,8 +3297,8 @@ table.cal_month td:last-child   { border-right: 0px; }
 .cal_other_month_peruserleft { border-top: 0; border-left: solid 2px #6C7C7B !important; border-right: 0; }
 .cal_current_month_right { border-right: solid 1px #E0E0E0; }
 .cal_other_month_right   { border-right: solid 1px #C0C0C0; }
-.cal_other_month   { opacity: 0.6; background: #EAEAEA; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_past_month    { opacity: 0.6; background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_other_month   { /* opacity: 0.6; */ background: #EAEAEA; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_past_month    { /* opacity: 0.6; */ background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_current_month_peruserleft { background: #FFFFFF; border-left: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_today         { background: #FDFDF0; border-left: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e2aa999f071..e9a9e115293 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3416,8 +3416,8 @@ table.cal_month td:last-child   { border-right: 0px; }
 .cal_other_month_peruserleft { border-top: 0; border-left: solid 2px #6C7C7B !important; border-right: 0; }
 .cal_current_month_right { border-right: solid 1px #E0E0E0; }
 .cal_other_month_right   { border-right: solid 1px #C0C0C0; }
-.cal_other_month   { opacity: 0.6; background: #EAEAEA; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_past_month    { opacity: 0.6; background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_other_month   { /* opacity: 0.6; */ background: #EAEAEA; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_past_month    { /* opacity: 0.6; */ background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_current_month_peruserleft { background: #FFFFFF; border-left: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_today         { background: #FDFDF0; border-left: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }

From d15792bdf488a46fcb170971ab9ee223afd37899 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Apr 2017 00:59:47 +0200
Subject: [PATCH 0573/1163] Minor fix

---
 htdocs/admin/ihm.php               | 68 +++++++++++++++---------------
 htdocs/core/lib/usergroups.lib.php |  4 +-
 htdocs/langs/en_US/admin.lang      |  2 +-
 htdocs/langs/en_US/commercial.lang |  3 +-
 htdocs/projet/list.php             |  2 +-
 htdocs/theme/md/style.css.php      |  5 ++-
 6 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 24c5516dea7..1036d1057a9 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -256,14 +256,14 @@ if ($action == 'edit')	// Edit
 	print '</tr>';
 
     // Default language
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultLanguage").'</td><td>';
     print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'main_lang_default', 1, 0, 0, 0, 0, 'minwidth300');
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Multilingual GUI
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("EnableMultilangInterface").'</td><td>';
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableMultilangInterface").'</td><td>';
     print $form->selectyesno('main_multilangs',$conf->global->MAIN_MULTILANGS,1);
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
@@ -279,10 +279,10 @@ if ($action == 'edit')	// Edit
     if (! empty($searchform))
     {
         print '<table summary="search" class="noborder" width="100%">';
-        print '<tr class="liste_titre"><td width="35%">'.$langs->trans("PermanentLeftSearchForm").'</td><td colspan="2">'.$langs->trans("Activated").'</td></tr>';
+        print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("PermanentLeftSearchForm").'</td><td colspan="2">'.$langs->trans("Activated").'</td></tr>';
         foreach ($searchform as $key => $value)
         {
-            print '<tr><td width="35%">'.$searchformtitle[$key].'</td><td colspan="2">';
+            print '<tr><td class="titlefield">'.$searchformtitle[$key].'</td><td colspan="2">';
             print $form->selectyesno($searchform[$key],$searchformconst[$key],1);
             print '</td></tr>';
         }
@@ -292,7 +292,7 @@ if ($action == 'edit')	// Edit
     
     // Other
     print '<table summary="edit" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
+    print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
@@ -323,28 +323,28 @@ if ($action == 'edit')	// Edit
 	print '</tr>';
 
     // First day for weeks
-    print '<tr><td width="35%">'.$langs->trans("WeekStartOnDay").'</td><td>';
+    print '<tr><td class="titlefield">'.$langs->trans("WeekStartOnDay").'</td><td>';
     print $formother->select_dayofweek((isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'),'MAIN_START_WEEK',0);
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
     // DefaultWorkingDays
-    print '<tr><td width="35%">'.$langs->trans("DefaultWorkingDays").'</td><td>';
+    print '<tr><td class="titlefield">'.$langs->trans("DefaultWorkingDays").'</td><td>';
     print '<input type="text" name="MAIN_DEFAULT_WORKING_DAYS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_DAYS)?$conf->global->MAIN_DEFAULT_WORKING_DAYS:'1-5').'">';
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
     // DefaultWorkingHours
-    print '<tr><td width="35%">'.$langs->trans("DefaultWorkingHours").'</td><td>';
+    print '<tr><td class="titlefield">'.$langs->trans("DefaultWorkingHours").'</td><td>';
     print '<input type="text" name="MAIN_DEFAULT_WORKING_HOURS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_HOURS)?$conf->global->MAIN_DEFAULT_WORKING_HOURS:'9-18').'">';
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Firstname/Name
-    print '<tr><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>';
+    print '<tr><td class="titlefield">'.$langs->trans("FirstnameNamePosition").'</td><td>';
 	$array=array(0=>$langs->trans("Firstname").' '.$langs->trans("Lastname"),1=>$langs->trans("Lastname").' '.$langs->trans("Firstname"));
     print $form->selectarray('MAIN_FIRSTNAME_NAME_POSITION',$array,(isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?$conf->global->MAIN_FIRSTNAME_NAME_POSITION:0));
     print '</td>';
@@ -352,14 +352,14 @@ if ($action == 'edit')	// Edit
 	print '</tr>';
 
 	// Hide unauthorized button
-	print '<tr><td width="35%">'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
+	print '<tr><td class="titlefield">'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
 	print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED',isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)?$conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED:0,1);
 	print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Show logo
-	print '<tr><td width="35%">'.$langs->trans("EnableShowLogo").'</td><td>';
+	print '<tr><td class="titlefield">'.$langs->trans("EnableShowLogo").'</td><td>';
 	print $form->selectyesno('MAIN_SHOW_LOGO',$conf->global->MAIN_SHOW_LOGO,1);
 	print '</td>';
 	print '<td width="20">&nbsp;</td>';
@@ -368,7 +368,7 @@ if ($action == 'edit')	// Edit
 	// Hide version link
 	/*
 	
-	print '<tr><td width="35%">'.$langs->trans("HideVersionLink").'</td><td>';
+	print '<tr><td class="titlefield">'.$langs->trans("HideVersionLink").'</td><td>';
 	print $form->selectyesno('MAIN_HIDE_VERSION',$conf->global->MAIN_HIDE_VERSION,1);
 	print '</td>';
 	print '<td width="20">&nbsp;</td>';
@@ -376,28 +376,28 @@ if ($action == 'edit')	// Edit
     */
 	
 	// Show bugtrack link
-	print '<tr><td width="35%">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
+	print '<tr><td class="titlefield">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
 	print $form->selectyesno('MAIN_BUGTRACK_ENABLELINK',$conf->global->MAIN_BUGTRACK_ENABLELINK,1);
 	print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Hide wiki link on login page
-    print '<tr><td width="35%">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td>';
+    print '<tr><td class="titlefield">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td>';
     print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0,1);
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Hide helpcenter link on login page
-	print '<tr><td width="35%">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
+	print '<tr><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
 	print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK',isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0,1);
 	print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 	
 	// Message of the day on home page
-    print '<tr><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
+    print '<tr><td class="titlefield">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
 
     $doleditor = new DolEditor('main_motd', (isset($conf->global->MAIN_MOTD)?$conf->global->MAIN_MOTD:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
 	$doleditor->Create();
@@ -410,7 +410,7 @@ if ($action == 'edit')	// Edit
 	
 	// Other
 	print '<table summary="edit" class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td width="35%">'.$langs->trans("LoginPage").'</td><td></td>';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("LoginPage").'</td><td></td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 	
@@ -454,7 +454,7 @@ else	// Show
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Language").'</td><td></td><td>&nbsp;</td></tr>';
 
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultLanguage").'</td><td>';
     $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
     print ($s?$s.' ':'');
     print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
@@ -464,7 +464,7 @@ else	// Show
 	print '</td>';
 	print "</tr>";
     
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("EnableMultilangInterface").'</td><td>' . yn($conf->global->MAIN_MULTILANGS) . '</td>';
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableMultilangInterface").'</td><td>' . yn($conf->global->MAIN_MULTILANGS) . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
@@ -480,11 +480,11 @@ else	// Show
     if (! empty($searchform))
     {
         print '<table class="noborder" width="100%">';
-        print '<tr class="liste_titre"><td width="35%">'.$langs->trans("PermanentLeftSearchForm").'</td><td>'.$langs->trans("Activated").'</td><td>&nbsp;</td></tr>';
+        print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("PermanentLeftSearchForm").'</td><td>'.$langs->trans("Activated").'</td><td>&nbsp;</td></tr>';
         foreach ($searchform as $key => $value)
         {
             
-            print '<tr class="oddeven"><td width="35%">'.$searchformtitle[$key].'</td><td>'.yn($searchformconst[$key]).'</td>';
+            print '<tr class="oddeven"><td class="titlefield">'.$searchformtitle[$key].'</td><td>'.yn($searchformconst[$key]).'</td>';
     		print '<td align="left">';
     		if (! empty($searchformmodule[$key])) print $langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key]));
             print '</td></tr>';
@@ -495,7 +495,7 @@ else	// Show
 
     // Other
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameters").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>';
+    print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameters").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>';
 
     print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '</td>';
 	print '<td width="20">&nbsp;</td>';
@@ -513,34 +513,34 @@ else	// Show
 	*/
 	
     // Disable javascript/ajax
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableJavascript").'</td><td>';
     print yn($conf->global->MAIN_DISABLE_JAVASCRIPT)."</td>";
     print '<td width="20">&nbsp;</td>';
     print "</tr>";
 
 	// First day for weeks
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("WeekStartOnDay").'</td><td>';
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("WeekStartOnDay").'</td><td>';
     print $langs->trans("Day".(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'));
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
     // DefaultWorkingDays
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("DefaultWorkingDays").'</td><td>';
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultWorkingDays").'</td><td>';
     print isset($conf->global->MAIN_DEFAULT_WORKING_DAYS)?$conf->global->MAIN_DEFAULT_WORKING_DAYS:'1-5';
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
     // DefaultWorkingHours
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("DefaultWorkingHours").'</td><td>';
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultWorkingHours").'</td><td>';
     print isset($conf->global->MAIN_DEFAULT_WORKING_HOURS)?$conf->global->MAIN_DEFAULT_WORKING_HOURS:'9-18';
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Firstname / Name position
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>';
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("FirstnameNamePosition").'</td><td>';
     if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { print $langs->trans("Firstname").' '.$langs->trans("Lastname"); }
     else { print $langs->trans("Lastname").' '.$langs->trans("Firstname"); }
     print '</td>';
@@ -548,7 +548,7 @@ else	// Show
 	print '</tr>';
 
 	// Hide unauthorized button
-	print '<tr class="oddeven"><td width="35%">'.$langs->trans("ButtonHideUnauthorized").'</td><td colspan="2">';
+	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ButtonHideUnauthorized").'</td><td colspan="2">';
 	print yn((isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)?$conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED:0),1);
 	print '</td></tr>';
 
@@ -559,7 +559,7 @@ else	// Show
 
 	// Hide version link
 	/*
-	 print '<tr><td width="35%">'.$langs->trans("HideVersionLink").'</td><td>';
+	 print '<tr><td class="titlefield">'.$langs->trans("HideVersionLink").'</td><td>';
 	 print yn($conf->global->MAIN_HIDE_VERSION);
 	 print '</td>';
 	 print '<td width="20">&nbsp;</td>';
@@ -567,23 +567,23 @@ else	// Show
 	 */
 	
     // Show bugtrack link
-	print '<tr class="oddeven"><td width="35%">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
+	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
 	print yn($conf->global->MAIN_BUGTRACK_ENABLELINK)."</td>";
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
     // Link to wiki help
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td colspan="2">';
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td colspan="2">';
     print yn((isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0),1);
     print '</td></tr>';
 
 	// Link to help center
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("DisableLinkToHelpCenter").'</td><td colspan="2">';
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td colspan="2">';
     print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0),1);
     print '</td></tr>';
 
     // Message of the day
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
     if (isset($conf->global->MAIN_MOTD)) print dol_htmlcleanlastbr($conf->global->MAIN_MOTD);
     else print '&nbsp;';
     print '</td></tr>'."\n";
@@ -597,7 +597,7 @@ else	// Show
     print '<tr class="liste_titre"><td>'.$langs->trans("LoginPage").'</td><td></td><td>&nbsp;</td></tr>';
 
     // Message login
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
     if (isset($conf->global->MAIN_HOME)) print dol_htmlcleanlastbr($conf->global->MAIN_HOME);
     else print '&nbsp;';
     print '</td></tr>'."\n";
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index d2567f30c04..b07b6fce821 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -337,7 +337,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     // Title
     if ($foruserprofile)
     {
-    	print '<tr class="liste_titre"><th width="25%">'.$langs->trans("Parameter").'</th><th width="25%">'.$langs->trans("DefaultValue").'</th>';
+    	print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("Parameter").'</th><th>'.$langs->trans("DefaultValue").'</th>';
     	print '<th colspan="2">&nbsp;</th>';
 	    print '</tr>';
 
@@ -350,7 +350,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     }
     else
     {
-    	print '<tr class="liste_titre"><th width="35%">'.$langs->trans("DefaultSkin").'</th>';
+    	print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("DefaultSkin").'</th>';
     	print '<th align="right">';
     	$url='https://www.dolistore.com/lang-en/4-skins';
     	if (preg_match('/fr/i',$langs->defaultlang)) $url='https://www.dolistore.com/fr/4-themes';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9ab6408714c..894b087d55a 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1338,7 +1338,7 @@ CacheByServer=Cache by server
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers 
-DefaultValuesDesc=You can defined here the default value you want to get when your create a new record, and/or defaut filters or soting order when your list record. 
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or soting order when your list record. 
 DefaultCreateForm=Create forms
 DefaultSearchFilters=Search filters
 DefaultSortOrder=Sort orders
diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang
index 16a6611db4a..deb66143b82 100644
--- a/htdocs/langs/en_US/commercial.lang
+++ b/htdocs/langs/en_US/commercial.lang
@@ -18,7 +18,8 @@ TaskRDVWith=Meeting with %s
 ShowTask=Show task
 ShowAction=Show event
 ActionsReport=Events report
-ThirdPartiesOfSaleRepresentative=Thirdparties with sales representative
+ThirdPartiesOfSaleRepresentative=Third parties with sales representative
+SaleRepresentativesOfThirdParty=Sales representatives of third party
 SalesRepresentative=Sales representative
 SalesRepresentatives=Sales representatives
 SalesRepresentativeFollowUp=Sales representative (follow-up)
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index fb6453e8159..038e9b8cdd5 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -116,7 +116,7 @@ $arrayfields=array(
     'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
     'p.title'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
     's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'enabled'=>$conf->societe->enabled),
-    'commercial'=>array('label'=>$langs->trans("ThirdPartiesOfSaleRepresentative"), 'checked'=>1),
+    'commercial'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>1),
 	'p.dateo'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>100),
     'p.datee'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1, 'position'=>101),
     'p.public'=>array('label'=>$langs->trans("Visibility"), 'checked'=>1, 'position'=>102),
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e9a9e115293..611ae895872 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1797,7 +1797,10 @@ font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }
 
-
+div.blockvmenulogo
+{
+	border-bottom: 0 !important;
+}
 div.blockvmenupair, div.blockvmenuimpair
 {
 	font-family: <?php print $fontlist ?>;

From 37939e7cbd2a8be9d91c45a62d0f5a676dfa57ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Apr 2017 02:17:47 +0200
Subject: [PATCH 0574/1163] NEW Add key __USERID__ and __ENTITYID__ as key for
 dynamic filters.

---
 htdocs/core/lib/functions.lib.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1ca8c7758a8..ea348fb31d1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -274,6 +274,8 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 
 	if (! empty($check))
 	{
+	    // Replace vars like __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__
+	    // TODO Add more var like __PREVIOUSDAY__, __PREVIOUSMONTH__, __PREVIOUSYEAR__
 	    if (! is_array($out) && preg_match('/^__([a-z0-9]+)__$/i', $out, $reg))
 	    {
 	        if ($reg[1] == 'DAY')
@@ -296,6 +298,16 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 	            global $mysoc;
 	            $out = $mysoc->country_id;
 	        }
+	        elseif ($reg[1] == 'USERID')
+	        {
+	            global $user;
+	            $out = $user->id;
+	        }
+	        elseif ($reg[1] == 'ENTITYID')
+	        {
+	            global $conf;
+	            $out = $conf->entity;
+	        }
 	    }
 
 	    switch ($check)

From 759315aef514aee450348c8d41c853c26a247eaa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Apr 2017 02:48:16 +0200
Subject: [PATCH 0575/1163] NEW Mass action delete available on project and
 tasks

---
 htdocs/core/actions_massactions.inc.php |  3 +-
 htdocs/core/ajax/row.php                |  3 +-
 htdocs/core/lib/project.lib.php         | 15 ++++++
 htdocs/langs/en_US/projects.lang        |  1 +
 htdocs/projet/class/project.class.php   |  3 +-
 htdocs/projet/list.php                  | 47 ++++++++++++----
 htdocs/projet/tasks.php                 | 72 +++++++++++++++++--------
 htdocs/projet/tasks/list.php            | 46 +++++++++++++---
 htdocs/projet/tasks/task.php            | 13 +++--
 htdocs/societe/list.php                 | 55 +++++++++++++++----
 10 files changed, 201 insertions(+), 57 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index a44e5f2450e..74badc6daae 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -489,7 +489,8 @@ if (! $error && $massaction == 'delete' && $permtodelete)
         $result=$objecttmp->fetch($toselectid);
         if ($result > 0)
         {
-            $result = $objecttmp->delete($user);
+            if ($objecttmp->element == 'societe') $result = $objecttmp->delete($objecttmp->id, $user, 1);
+            else $result = $objecttmp->delete($user);
             if ($result <= 0)
             {
                 setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
diff --git a/htdocs/core/ajax/row.php b/htdocs/core/ajax/row.php
index 41d411f01fd..331b4ceaac8 100644
--- a/htdocs/core/ajax/row.php
+++ b/htdocs/core/ajax/row.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2010-2015 Regis Houssin  <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2015 Regis Houssin       <regis.houssin@capnetworks.com>
+ * Copyright (C) 2017      Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 42e2ad57498..592988da9b9 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -150,8 +150,23 @@ function task_prepare_head($object)
 	$head[$h][2] = 'task_contact';
 	$h++;
 
+	// Is there timespent ?
+	$nbTimeSpent=0;
+	$sql = "SELECT t.rowid";
+	$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
+	$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
+	$sql .= " AND t.fk_task =".$object->id;
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+	    $obj = $db->fetch_object($resql);
+	    if ($obj) $nbTimeSpent=1;
+	}
+	else dol_print_error($db);
+	
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 	$head[$h][1] = $langs->trans("TimeSpent");
+	if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
 	$head[$h][2] = 'task_time';
 	$h++;
 
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index af02afaa44a..97d47589d53 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -170,6 +170,7 @@ ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
+TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
 AssignTask=Assign
 ProjectOverview=Overview
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 7748534c970..4bc4718368f 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -593,7 +593,8 @@ class Project extends CommonObject
 
         // Set fk_projet into elements to null
         $listoftables=array(
-        		'facture'=>'fk_projet','propal'=>'fk_projet','commande'=>'fk_projet','facture_fourn'=>'fk_projet','commande_fournisseur'=>'fk_projet',
+        		'facture'=>'fk_projet','propal'=>'fk_projet','commande'=>'fk_projet',
+                'facture_fourn'=>'fk_projet','commande_fournisseur'=>'fk_projet','supplier_proposal'=>'fk_projet',
         		'expensereport_det'=>'fk_projet','contrat'=>'fk_projet','fichinter'=>'fk_projet','don'=>'fk_projet'
         		);
         foreach($listoftables as $key => $value)
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 038e9b8cdd5..3310b6d8cf7 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -32,9 +32,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
-$langs->load('projects');
-$langs->load('companies');
-$langs->load('commercial');
+$langs->loadLangs(array('projects', 'companies', 'commercial'));
+
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
 
 $title = $langs->trans("Projects");
 
@@ -49,6 +53,7 @@ if ($socid > 0)
 }
 if (!$user->rights->projet->lire) accessforbidden();
 
+$diroutputmassaction=$conf->projet->dir_output . '/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield","alpha");
@@ -155,7 +160,7 @@ if (empty($reshook))
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
     // Purge search criteria
-    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
     	$search_all='';
     	$search_categ='';
@@ -177,8 +182,18 @@ if (empty($reshook))
     	$day="";
     	$month="";
     	$year="";
+    	$toselect='';
     	$search_array_options=array();
     }
+    
+
+    // Mass actions
+    $objectclass='Project';
+    $objectlabel='Project';
+    $permtoread = $user->rights->projet->lire;
+    $permtodelete = $user->rights->projet->supprimer;
+    $uploaddir = $conf->projet->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -341,6 +356,8 @@ if (! $resql)
 
 $num = $db->num_rows($resql);
 
+$arrayofselected=is_array($toselect)?$toselect:array();
+
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
 {
     $obj = $db->fetch_object($resql);
@@ -349,7 +366,8 @@ if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) &&
     exit;
 }
 
-llxHeader("",$title,"EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos");
+$help_url="EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
+llxHeader("", $title, $help_url);
 
 $param='';
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
@@ -382,6 +400,16 @@ foreach ($search_array_options as $key => $val)
     if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 }
 
+// List of mass actions available
+$arrayofmassactions =  array(
+//    'presend'=>$langs->trans("SendByMail"),
+//    'builddoc'=>$langs->trans("PDFMerge"),
+);
+//if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
+if ($user->rights->societe->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+if ($massaction == 'presend') $arrayofmassactions=array();
+$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -392,7 +420,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'title_project', 0, '', '', $limit);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_project', 0, '', '', $limit);
 
 // Show description of content
 if ($search_project_user == $user->id) print $langs->trans("MyProjectsDesc").'<br><br>';
@@ -450,6 +478,7 @@ if (! empty($moreforfilter))
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -577,7 +606,7 @@ if (! empty($arrayfields['p.fk_statut']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
+$searchpitco=$form->showFilterButtons();
 print $searchpitco;
 print '</td>';
 
@@ -831,8 +860,8 @@ while ($i < min($num,$limit))
         if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
         {
             $selected=0;
-    		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-    		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    		if (in_array($obj->projectid, $arrayofselected)) $selected=1;
+    		print '<input id="cb'.$obj->projectid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->projectid.'"'.($selected?' checked="checked"':'').'>';
         }
         print '</td>';
 		if (! $i) $totalarray['nbfield']++;
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 8b72a6448ec..e76ed9b2e00 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -41,8 +41,8 @@ $taskref = GETPOST('taskref', 'alpha');
 $backtopage=GETPOST('backtopage','alpha');
 $cancel=GETPOST('cancel');
 
-$mode = GETPOST('mode', 'alpha');
-$mine = ($mode == 'mine' ? 1 : 0);
+$search_user_id = GETPOST('search_user_id', 'int');
+    
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
 $object = new Project($db);
@@ -62,7 +62,7 @@ $extralabels_task=$extrafields_task->fetch_name_optionals_label($taskstatic->tab
 // Security check
 $socid=0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-$result = restrictedArea($user, 'projet', $id,'projet&project');
+$result = restrictedArea($user, 'projet', $id, 'projet&project');
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('projecttaskcard','globalcard'));
@@ -80,6 +80,14 @@ $userAccess=0;
  * Actions
  */
 
+// Purge search criteria
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+{
+    $search_user_id="";
+    $toselect='';
+    $search_array_options=array();
+}
+
 if ($action == 'createtask' && $user->rights->projet->creer)
 {
 	$error=0;
@@ -209,8 +217,8 @@ if ($id > 0 || ! empty($ref))
 	$head=project_prepare_head($object);
 	dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
-	$param=($mode=='mine'?'&mode=mine':'');
-
+	$param='';
+    if ($search_user_id > 0) $param.='&search_user_id='.dol_escape_htmltag($search_user_id);
 
     // Project card
     
@@ -330,7 +338,6 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print '<input type="hidden" name="action" value="createtask">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if (! empty($object->id)) print '<input type="hidden" name="id" value="'.$object->id.'">';
-	if (! empty($mode)) print '<input type="hidden" name="mode" value="'.$mode.'">';
 	
 	dol_fiche_head('');
 
@@ -450,7 +457,16 @@ else if ($id > 0 || ! empty($ref))
 
 	print '</div>';
 
-
+	
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	
 	$title=$langs->trans("ListOfTasks");
 	$linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$object->id.'&withproject=1">'.$langs->trans("GoToListOfTimeConsumed").'</a>';
 	//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
@@ -461,7 +477,10 @@ else if ($id > 0 || ! empty($ref))
 	$filteronthirdpartyid = $socid;
 	$tasksarray=$taskstatic->getTasksArray(0, 0, $object->id, $filteronthirdpartyid, 0);
 	// We load also tasks limited to a particular user
-	$tasksrole=($mode=='mine' ? $taskstatic->getUserRolesForProjectsOrTasks(0,$user,$object->id,0) : '');
+	$tmpuser=new User($db);
+	if ($search_user_id > 0) $tmpuser->fetch($search_user_id);
+	
+	$tasksrole=($tmpuser->id > 0 ? $taskstatic->getUserRolesForProjectsOrTasks(0, $tmpuser, $object->id, 0) : '');
 	//var_dump($tasksarray);
 	//var_dump($tasksrole);
 
@@ -471,6 +490,22 @@ else if ($id > 0 || ! empty($ref))
 	}
 
 	print '<table id="tablelines" class="noborder" width="100%">';
+	
+	if (count($tasksarray) > 0)
+	{
+    	// Link to switch in "my task" / "all task"
+    	print '<tr class="liste_titre_filter nodrag nodrop"><td colspan="8">';
+   	    print $langs->trans("TasksAssignedTo");
+   	    print $form->select_dolusers($tmpuser->id > 0 ? $tmpuser->id : '', 'search_user_id', 1);
+    	print '</td>';
+
+        // Action column
+        print '<td class="liste_titre" align="right">';
+        $searchpitco=$form->showFilterButtons();
+        print $searchpitco;
+        print '</td>';
+	}
+	
 	print '<tr class="liste_titre nodrag nodrop">';
 	// print '<td>'.$langs->trans("Project").'</td>';
 	print '<td width="100">'.$langs->trans("RefTask").'</td>';
@@ -483,37 +518,28 @@ else if ($id > 0 || ! empty($ref))
 	print '<td align="right">'.$langs->trans("ProgressDeclared").'</td>';
 	print '<td>&nbsp;</td>';
 	print "</tr>\n";
-
+	
 	if (count($tasksarray) > 0)
 	{
-    	// Link to switch in "my task" / "all task"
-    	print '<tr class="liste_titre nodrag nodrop"><td colspan="9">';
-    	if ($mode == 'mine')
-    	{
-    	    print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("DoNotShowMyTasksOnly").'</a>';
-    	}
-    	else
-    	{
-    	    print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&mode=mine">'.$langs->trans("ShowMyTasksOnly").'</a>';
-    	}
-    	print '</td></tr>';
-	
 	    // Show all lines in taskarray (recursive function to go down on tree)
 		$j=0; $level=0;
 		$nboftaskshown=projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id);
 	}
 	else
 	{
-		print '<tr '.$bc[false].'><td colspan="9" class="opacitymedium">'.$langs->trans("NoTasks").'</td></tr>';
+		print '<tr class="oddeven"><td colspan="9" class="opacitymedium">'.$langs->trans("NoTasks").'</td></tr>';
 	}
+	
 	print "</table>";
 
+	print '</form>';
+	
 
 	// Test if database is clean. If not we clean it.
 	//print 'mode='.$_REQUEST["mode"].' $nboftaskshown='.$nboftaskshown.' count($tasksarray)='.count($tasksarray).' count($tasksrole)='.count($tasksrole).'<br>';
 	if (! empty($user->rights->projet->all->lire))	// We make test to clean only if user has permission to see all (test may report false positive otherwise)
 	{
-		if ($mode=='mine')
+		if ($search_user_id == $user->id)
 		{
 			if ($nboftaskshown < count($tasksrole))
 			{
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index ca7cff35a0a..59c6d1e6afa 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -30,9 +30,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
-$langs->load('projects');
-$langs->load('users');
-$langs->load('companies');
+$langs->loadLangs(array('projects', 'users', 'companies'));
+
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
 
 $id=GETPOST('id','int');
 
@@ -79,6 +83,8 @@ $socid=0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 if (!$user->rights->projet->lire) accessforbidden();
 
+$diroutputmassaction=$conf->projet->dir_output . '/tasks/temp/massgeneration/'.$user->id;
+
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -162,8 +168,17 @@ if (empty($reshook))
         $day='';
         $month='';
         $year='';
+        $toselect='';
         $search_array_options=array();
     }
+    
+    // Mass actions
+    $objectclass='Task';
+    $objectlabel='Tasks';
+    $permtoread = $user->rights->projet->lire;
+    $permtodelete = $user->rights->projet->supprimer;
+    $uploaddir = $conf->projet->dir_output.'/tasks';
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';    
 }
 
 if (empty($search_projectstatus) && $search_projectstatus == '') $search_projectstatus=1;
@@ -337,6 +352,8 @@ if (! $resql)
 
 $num = $db->num_rows($resql);
 
+$arrayofselected=is_array($toselect)?$toselect:array();
+
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
 {
     $obj = $db->fetch_object($resql);
@@ -345,7 +362,8 @@ if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) &&
     exit;
 }
 
-llxHeader("",$title,"Projet");
+$help_url="EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
+llxHeader("", $title, $help_url);
 
 $param='';
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
@@ -377,6 +395,16 @@ foreach ($search_array_options as $key => $val)
     if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 }
     
+// List of mass actions available
+$arrayofmassactions =  array(
+//    'presend'=>$langs->trans("SendByMail"),
+//    'builddoc'=>$langs->trans("PDFMerge"),
+);
+//if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
+if ($user->rights->societe->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+if ($massaction == 'presend') $arrayofmassactions=array();
+$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -385,8 +413,9 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'title_project', 0, '', '', $limit);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_project', 0, '', '', $limit);
 
 // Show description of content
 if ($search_task_user == $user->id) print $langs->trans("MyTasksDesc").'<br><br>';
@@ -442,6 +471,7 @@ if (! empty($moreforfilter))
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
@@ -549,7 +579,7 @@ if (! empty($arrayfields['t.tms']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
+$searchpitco=$form->showFilterButtons();
 print $searchpitco;
 print '</td>';
 print "</tr>\n";
@@ -804,8 +834,8 @@ while ($i < min($num,$limit))
         if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
         {
             $selected=0;
-    		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-    		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    		if (in_array($obj->id, $arrayofselected)) $selected=1;
+    		print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected?' checked="checked"':'').'>';
         }
         print '</td>';
         if (! $i) $totalarray['nbfield']++;
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 3e6d658bcc1..243881821e0 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -569,9 +569,16 @@ if ($id > 0 || ! empty($ref))
 				}
 	
 				// Delete
-				if ($user->rights->projet->supprimer && ! $object->hasChildren() && ! $object->hasTimeSpent())
+				if ($user->rights->projet->supprimer)
 				{
-					print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;withproject='.$withproject.'">'.$langs->trans('Delete').'</a>';
+				    if (! $object->hasChildren() && ! $object->hasTimeSpent())
+				    {
+					   print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;withproject='.$withproject.'">'.$langs->trans('Delete').'</a>';
+				    }
+				    else
+				    {
+				        print '<a class="butActionRefused" href="#" title="'.$langs->trans("ProjecHasChild").'">'.$langs->trans('Delete').'</a>';
+				    }
 				}
 				else
 				{
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 88e7a7a631e..19b26a3ceeb 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -35,12 +35,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 
-$langs->load("companies");
-$langs->load("commercial");
-$langs->load("customers");
-$langs->load("suppliers");
-$langs->load("bills");
-$langs->load("compta");
+$langs->loadLangs(array("companies", "commercial", "customers", "suppliers", "bills", "compta"));
+
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
 
 // Security check
 $socid = GETPOST('socid','int');
@@ -80,7 +81,8 @@ $search_stcomm=GETPOST('search_stcomm','int');
 $type=GETPOST('type');
 $optioncss=GETPOST('optioncss','alpha');
 $mode=GETPOST("mode");
-$action=GETPOST('action');
+
+$diroutputmassaction=$conf->societe->dir_output . '/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
@@ -230,9 +232,18 @@ if (empty($reshook))
     	$search_stcomm='';
      	$search_level_from='';
      	$search_level_to='';
+     	$toselect='';
     	$search_array_options=array();
     }
 
+    // Mass actions
+    $objectclass='Societe';
+    $objectlabel='ThirdParty';
+    $permtoread = $user->rights->societe->lire;
+    $permtodelete = $user->rights->societe->supprimer;
+    $uploaddir = $conf->societe->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+    
     if ($action == 'setstcomm')
     {
         $object = new Client($db);
@@ -457,6 +468,8 @@ if (! $resql)
 
 $num = $db->num_rows($resql);
 
+$arrayofselected=is_array($toselect)?$toselect:array();
+
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && $action != 'list')
 {
     $obj = $db->fetch_object($resql);
@@ -513,6 +526,16 @@ if (GETPOST('delsoc'))
     setEventMessages($langs->trans("CompanyDeleted",GETPOST('delsoc')), null, 'mesgs');
 }
 
+// List of mass actions available
+$arrayofmassactions =  array(
+//    'presend'=>$langs->trans("SendByMail"),
+//    'builddoc'=>$langs->trans("PDFMerge"),
+);
+//if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
+if ($user->rights->societe->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+if ($massaction == 'presend') $arrayofmassactions=array();
+$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -520,7 +543,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
 
 $langs->load("other");
 $textprofid=array();
@@ -586,6 +609,7 @@ if (! empty($moreforfilter))
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
 if (empty($arrayfields['customerorsupplier']['checked'])) print '<input type="hidden" name="type" value="'.$type.'">';
 
@@ -837,7 +861,7 @@ if (! empty($arrayfields['s.status']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
+$searchpitco=$form->showFilterButtons();
 print $searchpitco;
 print '</td>';
 
@@ -1100,9 +1124,18 @@ while ($i < min($num, $limit))
     {
         print '<td align="center" class="nowrap">'.$companystatic->getLibStatut(3).'</td>';
     }
-    // Action column
-    print '<td></td>';
 
+    // Action column
+    print '<td class="nowrap" align="center">';
+    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+    {
+        $selected=0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    }
+    print '</td>';
+    if (! $i) $totalarray['nbfield']++;
+    
 	print '</tr>'."\n";
 	$i++;
 }

From 3749a7a1d1735d5f06a63ac37cacecaf1f20e75a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Apr 2017 02:51:44 +0200
Subject: [PATCH 0576/1163] New look

---
 htdocs/projet/tasks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index e76ed9b2e00..35a7812d4fa 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -215,7 +215,7 @@ if ($id > 0 || ! empty($ref))
 	$tab=GETPOST('tab')?GETPOST('tab'):'tasks';
 
 	$head=project_prepare_head($object);
-	dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
+	dol_fiche_head($head, $tab, $langs->trans("Project"), 0, ($object->public?'projectpub':'project'));
 
 	$param='';
     if ($search_user_id > 0) $param.='&search_user_id='.dol_escape_htmltag($search_user_id);

From 0de77fa4608692e73c769aed2b9758d8be5668c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Apr 2017 09:55:45 +0200
Subject: [PATCH 0577/1163] Fix look and feel v6

---
 htdocs/adherents/class/adherent.class.php |   2 +-
 htdocs/adherents/list.php                 |  21 +++-
 htdocs/adherents/subscription/list.php    | 132 +++++++++++++++-------
 3 files changed, 109 insertions(+), 46 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index f3dfd857973..020dbc58474 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1577,7 +1577,7 @@ class Adherent extends CommonObject
      *      @param  string  $morecss        Add more css on link
      *		@return	string					Chaine avec URL
      */
-    function getNomUrl($withpictoimg=0,$maxlen=0,$option='card',$mode='ref',$morecss='')
+    function getNomUrl($withpictoimg=0,$maxlen=0,$option='card',$mode='',$morecss='')
     {
         global $conf, $langs;
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index bf3d61cd6f2..e3aad3c4ccc 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -170,6 +170,7 @@ if (empty($reshook))
     	$catid="";
     	$sall="";
     	$statut='';
+    	$toselect='';
     	$search_array_options=array();
     }
 }
@@ -270,6 +271,8 @@ if (! $resql)
 
 $num = $db->num_rows($resql);
 
+$arrayofselected=is_array($toselect)?$toselect:array();
+
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
 {
     $obj = $db->fetch_object($resql);
@@ -333,7 +336,15 @@ foreach ($search_array_options as $key => $val)
     if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 }
 
-//$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
+// List of mass actions available
+$arrayofmassactions =  array(
+//    'presend'=>$langs->trans("SendByMail"),
+//    'builddoc'=>$langs->trans("PDFMerge"),
+);
+//if($user->rights->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
+if ($user->rights->adherent->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+//if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -342,8 +353,9 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
+print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
 
 if ($sall)
 {
@@ -374,6 +386,7 @@ if (! empty($moreforfilter))
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -547,7 +560,7 @@ if (! empty($arrayfields['d.statut']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="middle">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
+$searchpitco=$form->showFilterButtons();
 print $searchpitco;
 print '</td>';
 
@@ -631,7 +644,7 @@ while ($i < min($num, $limit))
 	if (! empty($arrayfields['d.ref']['checked'])) 
 	{
    		print "<td>";
-		print $memberstatic->getNomUrl(-1);
+		print $memberstatic->getNomUrl(-1, 0, 'card', 'ref');
 		print "</td>\n";
 	}		
 	// Firstname
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 0705a035ba0..e5abe964d7f 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -40,6 +40,8 @@ $search_account=GETPOST('search_account','int');
 $search_amount=GETPOST('search_amount','alpha');
 $optioncss = GETPOST('optioncss','alpha');
 
+$date_select=isset($_GET["date_select"])?$_GET["date_select"]:$_POST["date_select"];
+
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -51,7 +53,19 @@ $pagenext = $page + 1;
 if (! $sortorder) {  $sortorder="DESC"; }
 if (! $sortfield) {  $sortfield="c.dateadh"; }
 
-$date_select=isset($_GET["date_select"])?$_GET["date_select"]:$_POST["date_select"];
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('subscriptionlist'));
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('subscription');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+);
+$arrayfields=array(
+);
 
 // Security check
 $result=restrictedArea($user,'adherent','','','cotisation');
@@ -61,16 +75,32 @@ $result=restrictedArea($user,'adherent','','','cotisation');
  *	Actions
  */
 
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction=''; }
+
+$parameters=array('socid'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
 {
-    $search="";
-	$search_ref="";
-    $search_lastname="";
-	$search_firstname="";
-	$search_login="";
-    $search_note="";
-	$search_amount="";
-	$search_account="";
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Purge search criteria
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+    {
+        $search="";
+    	$search_ref="";
+        $search_lastname="";
+    	$search_firstname="";
+    	$search_login="";
+        $search_note="";
+    	$search_amount="";
+    	$search_account="";
+       	$toselect='';
+       	$search_array_options=array();
+    }
 }
 
 
@@ -84,7 +114,7 @@ llxHeader('',$langs->trans("ListOfSubscriptions"),'EN:Module_Foundations|FR:Modu
 
 
 // List of subscriptions
-$sql = "SELECT d.rowid, d.login, d.firstname, d.lastname, d.societe,";
+$sql = "SELECT d.rowid, d.login, d.firstname, d.lastname, d.societe, d.photo,";
 $sql.= " c.rowid as crowid, c.subscription,";
 $sql.= " c.dateadh,";
 $sql.= " c.datef,";
@@ -123,7 +153,10 @@ $result = $db->query($sql);
 if ($result)
 {
     $num = $db->num_rows($result);
-    $i = 0;
+
+	$arrayofselected=is_array($toselect)?$toselect:array();
+    
+	$i = 0;
 
     $title=$langs->trans("ListOfSubscriptions");
     if (! empty($date_select)) $title.=' ('.$langs->trans("Year").' '.$date_select.')';
@@ -139,6 +172,16 @@ if ($result)
 	if ($search_amount)   $param.="&search_amount=".$search_amount;
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
     
+	// List of mass actions available
+	$arrayofmassactions =  array(
+	    //'presend'=>$langs->trans("SendByMail"),
+	    //'builddoc'=>$langs->trans("PDFMerge"),
+	);
+	//if($user->rights->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
+	if ($user->rights->adherent->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+	//if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+	
     print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -146,8 +189,9 @@ if ($result)
     print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
     
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
 
 	if ($sall)
 	{
@@ -156,23 +200,27 @@ if ($result)
 
     $moreforfilter = '';
     
+    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+    if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+    
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	// Line for filters fields
-	print '<tr class="liste_titre">';
+	print '<tr class="liste_titre_filter">';
 
 	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" name="search_ref" value="'.$search_ref.'" size="4"></td>';
+	print '<input class="flat" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'" size="4"></td>';
 
 	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" name="search_lastname" value="'.$search_lastname.'" size="12"></td>';
+	print '<input class="flat" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'" size="12"></td>';
 
 	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" name="search_login" value="'.$search_login.'" size="7"></td>';
+	print '<input class="flat" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'" size="7"></td>';
 
 	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" name="search_note" value="'.$search_note.'" size="7"></td>';
+	print '<input class="flat" type="text" name="search_note" value="'.dol_escape_htmltag($search_note).'" size="7"></td>';
 
     if (! empty($conf->banque->enabled))
     {
@@ -186,12 +234,12 @@ if ($result)
 	print '<td class="liste_titre">&nbsp;</td>';
 
 	print '<td align="right" class="liste_titre">';
-	print '<input class="flat" type="text" name="search_amount" value="'.$search_amount.'" size="4">';
+	print '<input class="flat" type="text" name="search_amount" value="'.dol_escape_htmltag($search_amount).'" size="4">';
 	print '</td>';
 	
     // Action column
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    $searchpitco=$form->showFilterButtons();
     print $searchpitco;
     print '</td>';  
 
@@ -210,7 +258,8 @@ if ($result)
 	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"c.dateadh",$param,"",'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"c.datef",$param,"",'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"c.subscription",$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
+	//print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 	
 	
@@ -219,48 +268,49 @@ if ($result)
     $adherent=new Adherent($db);
     $accountstatic=new Account($db);
 
-    $var=true;
     $total=0;
     while ($i < min($num, $limit))
     {
-        $objp = $db->fetch_object($result);
-        $total+=$objp->subscription;
+        $obj = $db->fetch_object($result);
+        $total+=$obj->subscription;
 
-        $subscription->ref=$objp->crowid;
-        $subscription->id=$objp->crowid;
+        $subscription->ref=$obj->crowid;
+        $subscription->id=$obj->crowid;
 
-        $adherent->lastname=$objp->lastname;
-        $adherent->firstname=$objp->firstname;
-        $adherent->ref=$adherent->getFullName($langs);
-        $adherent->id=$objp->rowid;
-        $adherent->login=$objp->login;
+        $adherent->lastname=$obj->lastname;
+        $adherent->firstname=$obj->firstname;
+        $adherent->ref=$obj->rowid;
+        $adherent->id=$obj->rowid;
+        $adherent->statut=$obj->statut;
+        $adherent->login=$obj->login;
+        $adherent->photo=$obj->photo;
 
         $var=!$var;
 
-        print "<tr ".$bc[$var].">";
+        print '<tr class="oddeven">';
 
         // Ref
         print '<td>'.$subscription->getNomUrl(1).'</td>';
 
         // Lastname
-        print '<td>'.$adherent->getNomUrl(1).'</td>';
+        print '<td>'.$adherent->getNomUrl(-1).'</td>';
 
         // Login
         print '<td>'.$adherent->login.'</td>';
 
         // Libelle
         print '<td>';
-        print dol_trunc($objp->note,32);
+        print dol_trunc($obj->note,32);
         print '</td>';
 
         // Banque
         if (! empty($conf->banque->enabled))
         {
-            if ($objp->fk_account)
+            if ($obj->fk_account)
             {
-                $accountstatic->id=$objp->fk_account;
-                $accountstatic->fetch($objp->fk_account);
-                //$accountstatic->label=$objp->label;
+                $accountstatic->id=$obj->fk_account;
+                $accountstatic->fetch($obj->fk_account);
+                //$accountstatic->label=$obj->label;
                 print '<td>'.$accountstatic->getNomUrl(1).'</td>';
             }
             else
@@ -271,13 +321,13 @@ if ($result)
         }
 
         // Date start
-        print '<td align="center">'.dol_print_date($db->jdate($objp->dateadh),'day')."</td>\n";
+        print '<td align="center">'.dol_print_date($db->jdate($obj->dateadh),'day')."</td>\n";
 
         // Date end
-        print '<td align="center">'.dol_print_date($db->jdate($objp->datef),'day')."</td>\n";
+        print '<td align="center">'.dol_print_date($db->jdate($obj->datef),'day')."</td>\n";
 
         // Price
-        print '<td align="right">'.price($objp->subscription).'</td>';
+        print '<td align="right">'.price($obj->subscription).'</td>';
         
         print '<td></td>';
 

From 6aa56ce0faf51d3ee87e9c5a46c3622105129786 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Apr 2017 10:57:17 +0200
Subject: [PATCH 0578/1163] NEW Add a tracking id into mass emailing Prepare
 code to use a dedicated SMTP server according to context.

---
 htdocs/comm/mailing/card.php          |  7 +++---
 htdocs/core/class/CMailFile.class.php | 33 +++++++++++++++++++--------
 scripts/emailings/mailing-send.php    |  7 +++++-
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 2ce6a638191..13ea930dc5e 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -259,8 +259,8 @@ if (empty($reshook))
 						}
 
 						// Fabrication du mail
-						$trackid='';  // TODO Define a trackid for mass emailing too. We can use source type for this.
-						$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid);
+						$trackid='emailing-'.$obj2->source_type.$obj2->source_id;
+						$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, '', 'emailing');
 
 						if ($mail->error)
 						{
@@ -433,7 +433,8 @@ if (empty($reshook))
 				}
 			}
 
-			$mailfile = new CMailFile($tmpsujet,$object->sendto,$object->email_from,$tmpbody, $arr_file,$arr_mime,$arr_name,'', '', 0, $msgishtml,$object->email_errorsto,$arr_css);
+			$trackid='emailingtest';
+			$mailfile = new CMailFile($tmpsujet, $object->sendto, $object->email_from, $tmpbody, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $object->email_errorsto, $arr_css, $trackid, '', 'emailing');
 
 			$result=$mailfile->sendfile();
 			if ($result)
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 878e0372ab3..3acdc342284 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -102,13 +102,16 @@ class CMailFile
 	 *	@param 	int		$msgishtml           1=String IS already html, 0=String IS NOT html, -1=Unknown make autodetection (with fast mode, not reliable)
 	 *	@param 	string	$errors_to      	 Email for errors-to
 	 *	@param	string	$css                 Css option
-	 *	@param	string	$trackid             Tracking string
+	 *	@param	string	$trackid             Tracking string (contains type and id of related element)
 	 *  @param  string  $moreinheader        More in header. $moreinheader must contains the "\r\n" (TODO not supported for other MAIL_SEND_MODE different than 'phpmail' and 'smtps' for the moment)
+	 *  @param  string  $sendingcontext      'standard', 'emailing', ...
 	 */
-	function __construct($subject,$to,$from,$msg,$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='',$trackid='',$moreinheader='')
+	function __construct($subject,$to,$from,$msg,$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='',$trackid='',$moreinheader='',$sendingcontext='standard')
 	{
 		global $conf, $dolibarr_main_data_root;
 
+		$this->sendingcontext = $sendingcontext;
+		
 		// We define end of line (RFC 821).
 		$this->eol="\r\n";
 		// We define end of line for header fields (RFC 822bis section 2.3 says header must contains \r\n).
@@ -132,7 +135,7 @@ class CMailFile
 		// If ending method not defined
 		if (empty($conf->global->MAIN_MAIL_SENDMODE)) $conf->global->MAIN_MAIL_SENDMODE='mail';
 
-		dol_syslog("CMailFile::CMailfile: MAIN_MAIL_SENDMODE=".$conf->global->MAIN_MAIL_SENDMODE." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid", LOG_DEBUG);
+		dol_syslog("CMailFile::CMailfile: MAIN_MAIL_SENDMODE=".$conf->global->MAIN_MAIL_SENDMODE." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid sendingcontext=$sendingcontext", LOG_DEBUG);
 		dol_syslog("CMailFile::CMailfile: subject=$subject, deliveryreceipt=$deliveryreceipt, msgishtml=$msgishtml", LOG_DEBUG);
 
 		if (empty($subject))
@@ -604,20 +607,31 @@ class CMailFile
 				// ------------------------------------------
 				$this->smtps->setTransportType(0);	// Only this method is coded in SMTPs library
 
-				// Forcage parametres
+				// Clean parameters
 				if (empty($conf->global->MAIN_MAIL_SMTP_SERVER)) $conf->global->MAIN_MAIL_SMTP_SERVER=ini_get('SMTP');
 				if (empty($conf->global->MAIN_MAIL_SMTP_PORT))   $conf->global->MAIN_MAIL_SMTP_PORT=ini_get('smtp_port');
 
+				// TODO Manage alternative parameters
+				
 				// If we use SSL/TLS
 				$server=$conf->global->MAIN_MAIL_SMTP_SERVER;
 				if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server;
-
+                $port=$conf->global->MAIN_MAIL_SMTP_PORT;
+                
 				$this->smtps->setHost($server);
-				$this->smtps->setPort($conf->global->MAIN_MAIL_SMTP_PORT); // 25, 465...;
+				$this->smtps->setPort($port); // 25, 465...;
 
-				if (! empty($conf->global->MAIN_MAIL_SMTPS_ID)) $this->smtps->setID($conf->global->MAIN_MAIL_SMTPS_ID);
-				if (! empty($conf->global->MAIN_MAIL_SMTPS_PW)) $this->smtps->setPW($conf->global->MAIN_MAIL_SMTPS_PW);
-				//$smtps->_msgReplyTo  = 'reply@web.com';
+				$loginid=''; $loginpass='';
+				if (! empty($conf->global->MAIN_MAIL_SMTPS_ID)) 
+				{
+				    $loginid = $conf->global->MAIN_MAIL_SMTPS_ID;
+				    $this->smtps->setID($loginid);
+				}
+				if (! empty($conf->global->MAIN_MAIL_SMTPS_PW)) 
+				{
+				    $loginpass = $conf->global->MAIN_MAIL_SMTPS_PW;
+				    $this->smtps->setPW($loginpass);
+				}
 
 				$res=true;
 				$from=$this->smtps->getFrom('org');
@@ -638,6 +652,7 @@ class CMailFile
 				if ($res)
 				{
 					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
+					
 					$result=$this->smtps->sendMsg();
 					//print $result;
 
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index fb8612977a8..27cc22448e6 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -189,6 +189,7 @@ if ($resql)
 						$substitutionisok=true;
 
 						// Fabrication du mail
+						$trackid='emailing-'.$obj2->source_type.$obj2->source_id;
 						$mail = new CMailFile(
 						    $newsubject,
 						    $sendto,
@@ -201,7 +202,11 @@ if ($resql)
 						    '',
 						    0,
 						    $msgishtml,
-						    $errorsto
+						    $errorsto,
+						    '',
+						    $trackid,
+						    '',
+						    'emailing'
 						);
 
 						if ($mail->error)

From 4d31759ff989e1baaa1066fd1a64f926f03aeab7 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Tue, 11 Apr 2017 14:35:10 +0200
Subject: [PATCH 0579/1163] Update code using new css class

---
 htdocs/accountancy/bookkeeping/card.php              | 6 ++----
 htdocs/accountancy/bookkeeping/listbyaccount.php     | 3 +--
 htdocs/accountancy/bookkeeping/listbyyear.php        | 3 +--
 htdocs/accountancy/customer/index.php                | 6 ++----
 htdocs/accountancy/customer/list.php                 | 3 +--
 htdocs/accountancy/expensereport/index.php           | 6 ++----
 htdocs/accountancy/expensereport/lines.php           | 3 +--
 htdocs/accountancy/expensereport/list.php            | 3 +--
 htdocs/accountancy/journal/bankjournal.php           | 8 +++-----
 htdocs/accountancy/journal/expensereportsjournal.php | 9 +++------
 htdocs/accountancy/journal/purchasesjournal.php      | 9 +++------
 htdocs/accountancy/journal/sellsjournal.php          | 9 +++------
 htdocs/accountancy/report/result.php                 | 3 +--
 htdocs/accountancy/supplier/index.php                | 6 ++----
 htdocs/accountancy/supplier/list.php                 | 3 +--
 15 files changed, 27 insertions(+), 53 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 0ec4fb07a12..116e071e42f 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -369,8 +369,7 @@ if ($action == 'create') {
 				print "</tr>\n";
 
 				foreach ($book->linesmvt as $line) {
-					$var = ! $var;
-					print '<tr ' . $bc[$var] . '>';
+					print '<tr class="oddeven">';
 
 					$total_debit += $line->debit;
 					$total_credit += $line->credit;
@@ -420,8 +419,7 @@ if ($action == 'create') {
 				}
 
 				if ($action == "" || $action == 'add') {
-					$var = ! $var;
-					print '<tr ' . $bc[$var] . '>';
+					print '<tr class="oddeven">';
 					print '<td>';
 					print $formventilation->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
 					print '</td>';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 61753d1c39d..cbb83ba269e 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -265,7 +265,6 @@ $sous_total_credit = 0;
 $displayed_account_number = null;       // Start with undefined to be able to distinguish with empty 
 
 foreach ( $object->lines as $line ) {
-	$var = ! $var;
 
 	$total_debit += $line->debit;
 	$total_credit += $line->credit;
@@ -298,7 +297,7 @@ foreach ( $object->lines as $line ) {
         $sous_total_credit = 0;
     }
 
-	print '<tr '. $bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>&nbsp;</td>';
 	print '<td align="right">'.$line->piece_num.'</td>';
 	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index f716339bdc8..263f293043a 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -267,9 +267,8 @@ print "</tr>\n";
 $var = True;
 
 foreach ( $object->lines as $line ) {
-	$var = ! $var;
 
-	print '<tr '. $bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>' . $line->piece_num . '</td>' . "\n";
 	print '<td>' . $line->doc_type . '</td>' . "\n";
 	print '<td align="center">' . dol_print_date($line->doc_date) . '</td>';
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index dddc7c896c0..82a406d4a0b 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -244,8 +244,7 @@ if ($resql) {
 
 	while ( $row = $db->fetch_row($resql)) {
 
-		$var = ! $var;
-		print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
+		print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
 		print '<td align="left">' . $row[1] . '</td>';
 		for($i = 2; $i <= 12; $i ++) {
 			print '<td align="right">' . price($row[$i]) . '</td>';
@@ -301,8 +300,7 @@ if ($resql) {
 
     while ( $row = $db->fetch_row($resql)) {
 
-        $var = ! $var;
-        print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
+        print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
         print '<td align="left">' . $row[1] . '</td>';
         for($i = 2; $i <= 12; $i ++) {
             print '<td align="right">' . price($row[$i]) . '</td>';
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index e8e10b4a0be..845e0a62540 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -313,7 +313,6 @@ if ($result) {
 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
-		$var = ! $var;
 
 		$objp->code_sell_l = '';
 		$objp->code_sell_p = '';
@@ -354,7 +353,7 @@ if ($result) {
 		// $objp->code_sell_p is now code of product/service
 		// $objp->code_sell_l is now default code of product/service
 					
-		print '<tr '. $bc[$var].'>';
+		print '<tr class="oddeven">';
 
 		// Line id
 		print '<td>' . $objp->rowid . '</td>';
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index b4d7c0bbb7a..4bfeb630b02 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -217,8 +217,7 @@ if ($resql) {
 
     while ( $row = $db->fetch_row($resql)) {
 
-        $var = ! $var;
-        print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
+        print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
         print '<td align="left">' . $row[1] . '</td>';
         for($i = 2; $i <= 12; $i ++) {
             print '<td align="right">' . price($row[$i]) . '</td>';
@@ -271,8 +270,7 @@ if ($resql) {
 
     while ( $row = $db->fetch_row($resql)) {
 
-        $var = ! $var;
-        print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
+        print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
         print '<td align="left">' . $row[1] . '</td>';
         for($i = 2; $i <= 12; $i ++) {
             print '<td align="right">' . price($row[$i]) . '</td>';
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 20994d76a93..4205a497c1a 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -268,13 +268,12 @@ if ($result) {
 	$var = True;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
-		$var = ! $var;
 		$codeCompta = length_accountg($objp->account_number) . ' - ' . $objp->label;
 
 		$expensereport_static->ref = $objp->ref;
 		$expensereport_static->id = $objp->erid;
 		
-		print '<tr '. $bc[$var].'>';
+		print '<tr class="oddeven">';
 
 		print '<td>' . $objp->rowid . '</td>';
 
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 49a63a15698..114fd2c99ea 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -299,7 +299,6 @@ if ($result) {
 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
-		$var = ! $var;
 
 		$objp->aarowid_suggest = '';
 		$objp->aarowid_suggest = $objp->aarowid;
@@ -307,7 +306,7 @@ if ($result) {
 		$expensereport_static->ref = $objp->ref;
 		$expensereport_static->id = $objp->erid;
 
-		print '<tr '. $bc[$var].'>';
+		print '<tr class="oddeven">';
 
 		// Line id
 		print '<td>' . $objp->rowid . '</td>';
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index dc18a3417e8..b9567cd50a7 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -749,7 +749,6 @@ if (empty($action) || $action == 'view') {
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
 
-	$var = true;
 	$r = '';
 
 	foreach ( $tabpay as $key => $val ) {      // $key is rowid in llx_bank
@@ -826,7 +825,7 @@ if (empty($action) || $action == 'view') {
 		// Bank
 		foreach ( $tabbq[$key] as $k => $mt ) 
 		{
-		    print "<tr " . $bc[$var] . ">";
+		    print '<tr class="oddeven">';
 		    print "<td><!-- Bank bank.rowid=".$key."--></td>";
 		    print "<td>" . $date . "</td>";
 			print "<td>" . $ref . "</td>";
@@ -853,7 +852,7 @@ if (empty($action) || $action == 'view') {
 		if (is_array($tabtp[$key])) {
 			foreach ( $tabtp[$key] as $k => $mt ) {
 				if ($k != 'type') {
-					print "<tr " . $bc[$var] . ">";
+					print '<tr class="oddeven">';
 					print "<td><!-- Thirdparty bank.rowid=".$key." --></td>";
 					print "<td>" . $date . "</td>";
 					print "<td>" . $ref . "</td>";
@@ -874,7 +873,7 @@ if (empty($action) || $action == 'view') {
 			}
 		} else {
 			foreach ( $tabbq[$key] as $k => $mt ) {
-				print "<tr " . $bc[$var] . ">";
+				print '<tr class="oddeven">';
 				print "<td><!-- Wait bank.rowid=".$key." --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $ref . "</td>";
@@ -892,7 +891,6 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-		$var = ! $var;
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 8d657ee6d11..a281b7fef8d 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -449,7 +449,6 @@ if (empty($action) || $action == 'view') {
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
 
-	$var = true;
 	$r = '';
 
 	$expensereportstatic = new ExpenseReport($db);
@@ -468,7 +467,7 @@ if (empty($action) || $action == 'view') {
 			$accountingaccount->fetch(null, $k, true);
 
 			if ($mt) {
-				print "<tr " . $bc[$var] . " >";
+				print '<tr class="oddeven">';
 				print "<td><!-- Fees --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
@@ -494,7 +493,7 @@ if (empty($action) || $action == 'view') {
 		// VAT
 		foreach ( $tabtva[$key] as $k => $mt ) {
 			if ($mt) {
-				print "<tr " . $bc[$var] . " >";
+				print '<tr class="oddeven">';
 				print "<td><!-- VAT --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
@@ -512,7 +511,7 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-		print "<tr " . $bc[$var] . ">";
+		print '<tr class="oddeven">';
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
@@ -534,8 +533,6 @@ if (empty($action) || $action == 'view') {
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 		}
 		print "</tr>";
-
-		$var = ! $var;
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 9790d124d56..a00fc9a70d8 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -498,7 +498,6 @@ if (empty($action) || $action == 'view') {
 	print "<t><td>" . $langs->trans("Type") . "</td><td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
 
-	$var = true;
 	$r = '';
 
 	$invoicestatic = new FactureFournisseur($db);
@@ -521,7 +520,7 @@ if (empty($action) || $action == 'view') {
 			$accountingaccount->fetch(null, $k, true);
 
 			if ($mt) {
-				print "<tr " . $bc[$var] . " >";
+				print '<tr class="oddeven">';
 				print "<td><!-- Product --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
@@ -545,7 +544,7 @@ if (empty($action) || $action == 'view') {
 		// VAT
 		foreach ( $tabtva[$key] as $k => $mt ) {
 			if ($mt) {
-				print "<tr " . $bc[$var] . " >";
+				print '<tr class="oddeven">';
 				print "<td><!-- VAT --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
@@ -563,7 +562,7 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-		print "<tr " . $bc[$var] . ">";
+		print '<tr class="oddeven">';
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
@@ -588,8 +587,6 @@ if (empty($action) || $action == 'view') {
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 		}
 		print "</tr>";
-
-		$var = ! $var;
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index fc3a511d670..235af8eeb41 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -517,7 +517,6 @@ if (empty($action) || $action == 'view') {
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
 
-	$var = true;
 	$r = '';
 
 	$invoicestatic = new Facture($db);
@@ -532,7 +531,7 @@ if (empty($action) || $action == 'view') {
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-			print "<tr " . $bc[$var] . ">";
+			print '<tr class="oddeven">';
 			print "<td><!-- Thirdparty --></td>";
 			print "<td>" . $date . "</td>";
 			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
@@ -562,7 +561,7 @@ if (empty($action) || $action == 'view') {
 			$accountingaccount->fetch(null, $k, true);
 
 			if ($mt) {
-				print "<tr " . $bc[$var] . ">";
+				print '<tr class="oddeven">';
 				print "<td><!-- Product --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
@@ -585,7 +584,7 @@ if (empty($action) || $action == 'view') {
 		// VAT
 		foreach ( $tabtva[$key] as $k => $mt ) {
 			if ($mt) {
-				print "<tr " . $bc[$var] . ">";
+				print '<tr class="oddeven">';
 				print "<td><!-- VAT --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
@@ -604,8 +603,6 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-
-		$var = ! $var;
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/report/result.php b/htdocs/accountancy/report/result.php
index 317b7193ff3..a487cb641ff 100644
--- a/htdocs/accountancy/report/result.php
+++ b/htdocs/accountancy/report/result.php
@@ -127,7 +127,6 @@ if (!empty($cats))
 		$position = -1;
 		$code = -1;
 		foreach($cpts as $i => $cpt){
-			$var = ! $var;
 
 			$position = $cpt['position'];
 			$code = $cpt['code'];
@@ -149,7 +148,7 @@ if (!empty($cats))
 			}
 			$sommes[$code]['NP'] += $resultNP;
 			$sommes[$code]['N'] += $resultN;
-			print '<tr'. $bc[$var].'>';
+			print '<tr class="oddeven">';
 			print '<td>' . $cpt['account_number'] . '</td>';
 			print '<td>' . $cpt['name_cpt'] . '</td>';
 			print '<td>' . price($resultNP)  . '</td>';
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index a747342a508..2d36399c9b5 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -215,8 +215,7 @@ if ($resql) {
 
 	while ( $row = $db->fetch_row($resql)) {
 
-		$var = ! $var;
-		print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
+		print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
 		print '<td align="left">' . $row[1] . '</td>';
 		for($i = 2; $i <= 12; $i ++) {
 			print '<td align="right">' . price($row[$i]) . '</td>';
@@ -270,8 +269,7 @@ if ($resql) {
 
     while ( $row = $db->fetch_row($resql)) {
 
-        $var = ! $var;
-        print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
+        print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
         print '<td align="left">' . $row[1] . '</td>';
         for($i = 2; $i <= 12; $i ++) {
             print '<td align="right">' . price($row[$i]) . '</td>';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 9b42337852c..beae148c01b 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -313,7 +313,6 @@ if ($result) {
 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
-		$var = ! $var;
 
 		// product_type: 0 = service ? 1 = product
 		// if product does not exist we use the value of product_type provided in facturedet to define if this is a product or service
@@ -355,7 +354,7 @@ if ($result) {
 		// $objp->code_buy_p is now code of product/service
 		// $objp->code_buy_l is now default code of product/service
 					
-		print '<tr '. $bc[$var].'>';
+		print '<tr class="oddeven">';
 
 		// Line id
 		print '<td>' . $objp->rowid . '</td>';

From 06c91cdaf20f19baf5fcd86c0fab8b0cb804622d Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Tue, 11 Apr 2017 14:47:11 +0200
Subject: [PATCH 0580/1163] ref column was missing for specimen and some update

---
 htdocs/comm/propal/class/propal.class.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 3489860e1dd..9aad218e66f 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2006      Andre Cianfarani			<acianfa@free.fr>
  * Copyright (C) 2008      Raphael Bertrand			<raphael.bertrand@resultic.fr>
  * Copyright (C) 2010-2014 Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2010-2016 Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2010-2017 Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2014 Christophe Battarel  	<christophe.battarel@altairis.fr>
  * Copyright (C) 2012      Cedric Salvador          <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
@@ -3113,21 +3113,21 @@ class Propal extends CommonObject
             $line->qty=1;
             $line->subprice=100;
             $line->price=100;
-            $line->tva_tx=19.6;
+            $line->tva_tx=20;
             $line->localtax1_tx=0;
             $line->localtax2_tx=0;
             if ($xnbp == 2)
             {
                 $line->total_ht=50;
-                $line->total_ttc=59.8;
-                $line->total_tva=9.8;
+                $line->total_ttc=60;
+                $line->total_tva=10;
                 $line->remise_percent=50;
             }
             else
             {
                 $line->total_ht=100;
-                $line->total_ttc=119.6;
-                $line->total_tva=19.6;
+                $line->total_ttc=120;
+                $line->total_tva=20;
                 $line->remise_percent=00;
             }
 
@@ -3135,6 +3135,7 @@ class Propal extends CommonObject
             {
             	$prodid = mt_rand(1, $num_prods);
             	$line->fk_product=$prodids[$prodid];
+				$line->product_ref='SPECIMEN';
             }
 
             $this->lines[$xnbp]=$line;

From c3387cb4e64704e958d39320d27e76ddecea287e Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Tue, 11 Apr 2017 14:54:34 +0200
Subject: [PATCH 0581/1163] ref column was missing for specimen and some update

---
 htdocs/commande/class/commande.class.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index e87923beb8c..bf1f993bcdc 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3541,25 +3541,26 @@ class Commande extends CommonOrder
             $line->qty=1;
             $line->subprice=100;
             $line->price=100;
-            $line->tva_tx=19.6;
+            $line->tva_tx=20;
             if ($xnbp == 2)
             {
                 $line->total_ht=50;
-                $line->total_ttc=59.8;
-                $line->total_tva=9.8;
+                $line->total_ttc=60;
+                $line->total_tva=10;
                 $line->remise_percent=50;
             }
             else
             {
                 $line->total_ht=100;
-                $line->total_ttc=119.6;
-                $line->total_tva=19.6;
+                $line->total_ttc=120;
+                $line->total_tva=20;
                 $line->remise_percent=0;
             }
             if ($num_prods > 0)
             {
             	$prodid = mt_rand(1, $num_prods);
             	$line->fk_product=$prodids[$prodid];
+				$line->product_ref='SPECIMEN';
             }
 
             $this->lines[$xnbp]=$line;

From 551d79f1e22dad34d7595b97d7195e9999d685f2 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 11 Apr 2017 17:36:21 +0200
Subject: [PATCH 0582/1163] FIX : close supplier makes no sense. we just need
 to know if it is accepted or not

---
 htdocs/supplier_proposal/card.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 9ed38461180..b306a7149e2 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -452,14 +452,6 @@ if (empty($reshook))
 		}
 	}
 
-	// Close proposal
-	else if ($action == 'close' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) {
-		// prevent browser refresh from reopening proposal several times
-		if ($object->statut == 2) {
-			$object->setStatut(4);
-		}
-	}
-
 	// Set accepted/refused
 	else if ($action == 'setstatut' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) {
 		if (! GETPOST('statut')) {
@@ -1779,12 +1771,6 @@ if ($action == 'create')
 					print '>' . $langs->trans('SetAcceptedRefused') . '</a></div>';
 				}
 
-				// Close
-				if ($object->statut == 2 && $user->rights->supplier_proposal->cloturer) {
-				    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=close' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close') . '"';
-				    print '>' . $langs->trans('Close') . '</a></div>';
-				}
-
 				// Clone
 				if ($user->rights->supplier_proposal->creer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=' . $object->element . '">' . $langs->trans("ToClone") . '</a></div>';

From 423ffefbf3e38ce28c1ef178bf3b479f5f50ee85 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Apr 2017 18:18:36 +0200
Subject: [PATCH 0583/1163] NEW Add hidden option
 THIRDPARTY_INCLUDE_PARENT_IN_LINKTO

---
 htdocs/admin/defaultvalues.php        |  4 ++--
 htdocs/core/class/html.form.class.php | 21 ++++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 2fb7002adbd..237f235f99c 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ if (!$user->admin) accessforbidden();
 $id=GETPOST('rowid','int');
 $action=GETPOST('action','alpha');
 
-$mode = GETPOST('mode')?GETPOST('mode'):'overwrite';
+$mode = GETPOST('mode')?GETPOST('mode'):'createform';
 
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 9ee36f783d2..b9f9a6115ee 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5576,16 +5576,19 @@ class Form
 		$possiblelinks=array();
 		if (is_object($object->thirdparty) && ! empty($object->thirdparty->id) && $object->thirdparty->id > 0)
 		{
+		    $listofidcompanytoscan=$object->thirdparty->id;
+		    if (($object->thirdparty->parent > 0) && ! empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) $listofidcompanytoscan.=','.$object->thirdparty->parent;
+		    
 		    $possiblelinks=array(
-    			'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
-    			'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
-    			'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.facnumber as ref, t.ref_client, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
-    			'contrat'=>array('enabled'=>$conf->contrat->enabled , 'perms'=>1, 'label'=>'LinkToContract', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
-    			'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
-    			'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled , 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
-    			'order_supplier'=>array('enabled'=>$conf->fournisseur->commande->enabled , 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id),
-    			'invoice_supplier'=>array('enabled'=>$conf->fournisseur->facture->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc = ".$object->thirdparty->id)
-    		);
+		        'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.')'),
+		        'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.')'),
+		        'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.facnumber as ref, t.ref_client, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.')'),
+		        'contrat'=>array('enabled'=>$conf->contrat->enabled , 'perms'=>1, 'label'=>'LinkToContract', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.')'),
+		        'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.')'),
+		        'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled , 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.')'),
+		        'order_supplier'=>array('enabled'=>$conf->fournisseur->commande->enabled , 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.')'),
+		        'invoice_supplier'=>array('enabled'=>$conf->fournisseur->facture->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.')')
+		    );
 		}
 		
 		global $action;

From 4eaa1d4f46541cca297a83e2229f20d63ec126b5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Apr 2017 20:07:35 +0200
Subject: [PATCH 0584/1163] Add nb of generation into list of template invoices

---
 htdocs/compta/facture/card.php        |  4 +--
 htdocs/compta/facture/fiche-rec.php   | 47 ++++++++++++++++++---------
 htdocs/core/class/html.form.class.php |  4 +--
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 663c0374b9a..9592f17a188 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2645,7 +2645,7 @@ if ($action == 'create')
 
 	// Public note
 	print '<tr>';
-	print '<td class="border tdtop">';
+	print '<td class="tdtop">';
 	print $form->textwithpicto($langs->trans('NotePublic'), $htmltext);
 	print '</td>';
 	print '<td valign="top" colspan="2">';
@@ -2656,7 +2656,7 @@ if ($action == 'create')
 	if (empty($user->societe_id))
 	{
 		print '<tr>';
-		print '<td class="border tdtop">';
+		print '<td class="tdtop">';
 		print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext);
 		print '</td>';
 		print '<td valign="top" colspan="2">';
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 90938242f5f..db10f0c1ca0 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -110,6 +110,7 @@ $arrayfields=array(
     'f.tva'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>1),
     'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>1),
     'f.frequency'=>array('label'=>$langs->trans("RecurringInvoiceTemplate"), 'checked'=>1),
+    'f.nb_gen_done'=>array('label'=>$langs->trans("NbGeneration"), 'checked'=>1),
     'f.date_last_gen'=>array('label'=>$langs->trans("DateLastGeneration"), 'checked'=>1),
     'f.date_when'=>array('label'=>$langs->trans("NextDateToExecution"), 'checked'=>1),
     'f.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
@@ -948,7 +949,7 @@ if ($action == 'create')
 		// Public note
 		print '<tr>';
 		print '<td class="border tdtop">';
-		print $form->textwithpicto($langs->trans('NotePublic'), $htmltext);
+		print $form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic');
 		print '</td>';
 		print '<td valign="top" colspan="2">';
 		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
@@ -959,7 +960,7 @@ if ($action == 'create')
 		{
 		    print '<tr>';
 		    print '<td class="border tdtop">';
-		    print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext);
+		    print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext, 1, 'help', '', 0, 2, 'noteprivate');
 		    print '</td>';
 		    print '<td valign="top" colspan="2">';
 		    $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
@@ -1250,7 +1251,7 @@ else
 
 		// Note public
 		print '<tr><td>';
-		print $form->editfieldkey($form->textwithpicto($langs->trans('NotePublic'), $htmltext), 'note_public', $object->note_public, $object, $user->rights->facture->creer);
+		print $form->editfieldkey($form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic'), 'note_public', $object->note_public, $object, $user->rights->facture->creer);
 		print '</td><td colspan="5">';
 		print $form->editfieldval($langs->trans("NotePublic"), 'note_public', $object->note_public, $object, $user->rights->facture->creer, 'textarea:'.ROWS_4.':60');
 		print '</td>';
@@ -1258,7 +1259,7 @@ else
 
 		// Note private
 		print '<tr><td>';
-		print $form->editfieldkey($form->textwithpicto($langs->trans("NotePrivate"), $htmltext), 'note_private', $object->note_private, $object, $user->rights->facture->creer);
+		print $form->editfieldkey($form->textwithpicto($langs->trans("NotePrivate"), $htmltext, 1, 'help', '', 0, 2, 'noteprivate'), 'note_private', $object->note_private, $object, $user->rights->facture->creer);
 		print '</td><td colspan="5">';
 		print $form->editfieldval($langs->trans("NotePrivate"), 'note_private', $object->note_private, $object, $user->rights->facture->creer, 'textarea:'.ROWS_4.':60');
 		print '</td>';
@@ -1291,16 +1292,17 @@ else
     	print '<div class="ficheaddleft">';
     	print '<div class="underbanner clearboth"></div>';
 
-    	print '<table class="border centpercent">';
 
 		/*
 		 * Recurrence
 		 */
 		$title = $langs->trans("Recurrence");
-		print load_fiche_titre($title, '', 'calendar');
+		//print load_fiche_titre($title, '', 'calendar');
 
 		print '<table class="border" width="100%">';
 
+		print '<tr><td colspan="2"><span class="fa fa-calendar"></span> '.$title.'</td></tr>';
+		
 		// if "frequency" is empty or = 0, the reccurence is disabled
 		print '<tr><td style="width: 50%">';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -1535,7 +1537,7 @@ else
 		 *  List mode
 		 */
 		$sql = "SELECT s.nom as name, s.rowid as socid, f.rowid as facid, f.titre, f.total, f.tva as total_vat, f.total_ttc, f.frequency,";
-		$sql.= " f.date_last_gen, f.date_when";
+		$sql.= " f.nb_gen_done, f.nb_gen_max, f.date_last_gen, f.date_when";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
 		if (! $user->rights->societe->client->voir && ! $socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -1646,42 +1648,48 @@ else
 			if (! empty($arrayfields['f.titre']['checked']))
 			{
 			    print '<td class="liste_titre" align="left">';
-			    print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
+			    print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 			    print '</td>';
 			}
 			// Thirpdarty
 			if (! empty($arrayfields['s.nom']['checked']))
 			{
-			    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="8" name="search_societe" value="'.$search_societe.'"></td>';
+			    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
 			}
 			if (! empty($arrayfields['f.total']['checked']))
 			{
 			    // Amount
 			    print '<td class="liste_titre" align="right">';
-			    print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.$search_montant_ht.'">';
+			    print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
 			    print '</td>';
 			}
 			if (! empty($arrayfields['f.tva']['checked']))
 			{
 			    // Amount
 			    print '<td class="liste_titre" align="right">';
-			    print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.$search_montant_vat.'">';
+			    print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
 			    print '</td>';
 			}
 			if (! empty($arrayfields['f.total_ttc']['checked']))
 			{
 			    // Amount
 			    print '<td class="liste_titre" align="right">';
-			    print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.$search_montant_ttc.'">';
+			    print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 			    print '</td>';
 			}
 			if (! empty($arrayfields['f.frequency']['checked']))
 			{
-			    // Amount
+			    // Recurring or not
 			    print '<td class="liste_titre" align="center">';
 			    print $form->selectyesno('search_frequency', $search_frequency, 1, false, 1);
 			    print '</td>';
 			}
+			if (! empty($arrayfields['f.nb_gen_done']['checked']))
+			{
+			    // Nb generation
+			    print '<td class="liste_titre" align="center">';
+			    print '</td>';
+			}
 			// Date invoice
 			if (! empty($arrayfields['f.date_last_gen']['checked']))
 			{
@@ -1753,6 +1761,10 @@ else
 			print_liste_field_titre($langs->trans("AmountVAT"),$_SERVER['PHP_SELF'],"f.tva","",$param,'align="right"',$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER['PHP_SELF'],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("RecurringInvoiceTemplate"),$_SERVER['PHP_SELF'],"f.frequency","",$param,'align="center"',$sortfield,$sortorder);
+			if (! empty($arrayfields['f.nb_gen_done']['checked']))
+			{
+    			print_liste_field_titre($langs->trans("NbOfGenerationDone"),$_SERVER['PHP_SELF'],"f.nb_gen_done","",$param,'align="center"',$sortfield,$sortorder);
+			}
 			print_liste_field_titre($langs->trans("DateLastGeneration"),$_SERVER['PHP_SELF'],"f.date_last_gen","",$param,'align="center"',$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("NextDateToExecution"),$_SERVER['PHP_SELF'],"f.date_when","",$param,'align="center"',$sortfield,$sortorder);
 			print_liste_field_titre('');		// Field may contains ling text
@@ -1765,21 +1777,24 @@ else
 				while ($i < min($num,$limit))
 				{
 					$objp = $db->fetch_object($resql);
-					$var=!$var;
 
-					print "<tr ".$bc[$var].">";
+					print '<tr class="oddeven">';
 
 					print '<td><a href="'.$_SERVER['PHP_SELF'].'?id='.$objp->facid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$objp->titre;
 					print "</a></td>\n";
 
 					$companystatic->id=$objp->socid;
 					$companystatic->name=$objp->name;
-					print '<td>'.$companystatic->getNomUrl(1,'customer').'</td>';
+					print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1,'customer').'</td>';
 
 					print '<td align="right">'.price($objp->total).'</td>'."\n";
 					print '<td align="right">'.price($objp->total_vat).'</td>'."\n";
 					print '<td align="right">'.price($objp->total_ttc).'</td>'."\n";
 					print '<td align="center">'.yn($objp->frequency?1:0).'</td>';
+					if (! empty($arrayfields['f.nb_gen_done']['checked']))
+					{
+					    print '<td align="center">'.($objp->frequency ? $objp->nb_gen_done.($objp->nb_gen_max>0?' / '. $objp->nb_gen_max:'') : '').'</td>';
+					}
 					print '<td align="center">'.($objp->frequency ? dol_print_date($objp->date_last_gen,'day') : '').'</td>';
 					print '<td align="center">'.($objp->frequency ? dol_print_date($objp->date_when,'day') : '').'</td>';
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b9f9a6115ee..35edc1178dc 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -404,7 +404,7 @@ class Form
      *	@param	int			$notabs				0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
      *	@param	string		$incbefore			Include code before the text
      *	@param	int			$noencodehtmltext	Do not encode into html entity the htmltext
-     *  @param  int         $tooltiptrigger     ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
+     *  @param  string      $tooltiptrigger     ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
      *	@return	string							Code html du tooltip (texte+picto)
      *	@see	Use function textwithpicto if you can.
      *  TODO Move this as static as soon as everybody use textwithpicto or @Form::textwithtooltip
@@ -487,7 +487,7 @@ class Form
      *  @param  string	$extracss           Add a CSS style to td, div or span tag
      *  @param  int		$noencodehtmltext   Do not encode into html entity the htmltext
      *  @param	int		$notabs				0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
-     *  @param  int     $tooltiptrigger     ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
+     *  @param  string  $tooltiptrigger     ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
      * 	@return	string						HTML code of text, picto, tooltip
      */
     function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 2, $tooltiptrigger='')

From b0f2d2310b106454fce2cc06a899df78c078c425 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Wed, 12 Apr 2017 10:28:05 +0200
Subject: [PATCH 0585/1163] Update code using new css class

---
 htdocs/adherents/admin/adherent.php     | 19 ++++++-------------
 htdocs/adherents/admin/public.php       | 19 ++++++-------------
 htdocs/adherents/index.php              | 17 ++++-------------
 htdocs/adherents/stats/byproperties.php |  4 +---
 htdocs/adherents/stats/geo.php          |  4 +---
 htdocs/adherents/stats/index.php        |  7 ++-----
 htdocs/adherents/subscription.php       |  4 +---
 htdocs/adherents/type.php               |  8 ++------
 8 files changed, 23 insertions(+), 59 deletions(-)

diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 8e265eb70f7..2754c2d3690 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -125,15 +125,13 @@ print '<td>'.$langs->trans("Description").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print '<td align="center">'.$langs->trans("Action").'</td>';
 print "</tr>\n";
-$var=true;
 
 // Login/Pass required for members
-$var=!$var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="constname" value="ADHERENT_LOGIN_NOT_REQUIRED">';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("AdherentLoginRequired").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("AdherentLoginRequired").'</td><td>';
 print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1);
 print '</td><td align="center" width="80">';
 print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
@@ -141,12 +139,11 @@ print "</td></tr>\n";
 print '</form>';
 
 // Mail required for members
-$var=!$var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="constname" value="ADHERENT_MAIL_REQUIRED">';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("AdherentMailRequired").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("AdherentMailRequired").'</td><td>';
 print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_MAIL_REQUIRED)?$conf->global->ADHERENT_MAIL_REQUIRED:0),1);
 print '</td><td align="center" width="80">';
 print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
@@ -154,12 +151,11 @@ print "</td></tr>\n";
 print '</form>';
 
 // Send mail information is on by default
-$var=!$var;
 print '<form action="adherent.php" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="constname" value="ADHERENT_DEFAULT_SENDINFOBYMAIL">';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("MemberSendInformationByMailByDefault").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("MemberSendInformationByMailByDefault").'</td><td>';
 print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?$conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL:0),1);
 print '</td><td align="center" width="80">';
 print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
@@ -167,12 +163,11 @@ print "</td></tr>\n";
 print '</form>';
 
 // Insert subscription into bank account
-$var=!$var;
 print '<form action="adherent.php" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="constname" value="ADHERENT_BANK_USE">';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("MoreActionsOnSubscription").'</td>';
+print '<tr class="oddeven"><td>'.$langs->trans("MoreActionsOnSubscription").'</td>';
 $arraychoices=array('0'=>$langs->trans("None"));
 if (! empty($conf->banque->enabled)) $arraychoices['bankdirect']=$langs->trans("MoreActionBankDirect");
 if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $arraychoices['invoiceonly']=$langs->trans("MoreActionInvoiceOnly");
@@ -188,12 +183,11 @@ print '</form>';
 // Use vat for invoice creation
 if ($conf->facture->enabled)
 {
-	$var=!$var;
 	print '<form action="adherent.php" method="POST">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="constname" value="ADHERENT_VAT_FOR_SUBSCRIPTIONS">';
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
 	if (! empty($conf->banque->enabled))
 	{
 		print '<td>';
@@ -213,12 +207,11 @@ if ($conf->facture->enabled)
 
 	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 	{
-		$var=!$var;
 		print '<form action="adherent.php" method="POST">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="update">';
 		print '<input type="hidden" name="constname" value="ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS">';
-		print '<tr '.$bc[$var].'><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
+		print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
 		print '<td>';
 		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
 		print '</td><td align="center" width="80">';
diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 47ad7a00a97..5c16a34793c 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -145,22 +145,19 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="right">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
-$var=true;
 
 // Allow public form
-$var=! $var;
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("EnablePublicSubscriptionForm");
 print '</td><td align="right">';
 print $form->selectyesno("MEMBER_ENABLE_PUBLIC",(! empty($conf->global->MEMBER_ENABLE_PUBLIC)?$conf->global->MEMBER_ENABLE_PUBLIC:0),1);
 print "</td></tr>\n";
 
 // Force Type
-$var=! $var;
 $adht = new AdherentType($db);
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<tr '.$bc[$var].' class="drag"><td>';
+print '<tr class="oddeven drag"><td>';
 print $langs->trans("ForceMemberType");
 print '</td><td width="60" align="center">';
 $listofval = array(-1 => $langs->trans("Undefined"));
@@ -170,18 +167,16 @@ print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, cou
 print "</td></tr>\n";
 
 // Amount
-$var=! $var;
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<tr '.$bc[$var].' id="tramount"><td>';
+print '<tr class="oddeven" id="tramount"><td>';
 print $langs->trans("DefaultAmount");
 print '</td><td align="right">';
 print '<input type="text" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT" size="5" value="'.(! empty($conf->global->MEMBER_NEWFORM_AMOUNT)?$conf->global->MEMBER_NEWFORM_AMOUNT:'').'">';
 print "</td></tr>\n";
 
 // Can edit
-$var=! $var;
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<tr '.$bc[$var].' id="tredit"><td>';
+print '<tr class="oddeven" id="tredit"><td>';
 print $langs->trans("CanEditAmount");
 print '</td><td align="right">';
 print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT",(! empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)?$conf->global->MEMBER_NEWFORM_EDITAMOUNT:0),1);
@@ -190,8 +185,7 @@ print "</td></tr>\n";
 if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
 {
 	// Jump to an online payment page
-	$var=! $var;
-	print '<tr '.$bc[$var].' id="trpayment"><td>';
+	print '<tr class="oddeven" id="trpayment"><td>';
 	print $langs->trans("MEMBER_NEWFORM_PAYONLINE");
 	print '</td><td align="right">';
 	$listofval=array();
@@ -204,8 +198,7 @@ if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
 if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
 {
     // Jump to an online payment page
-    $var=! $var;
-    print '<tr '.$bc[$var].' id="tremail"><td>';
+    print '<tr class="oddeven" id="tremail"><td>';
     print $langs->trans("MEMBER_PAYONLINE_SENDEMAIL");
     print '</td><td align="right">';
     print '<input type="text" id="MEMBER_PAYONLINE_SENDEMAIL" name="MEMBER_PAYONLINE_SENDEMAIL" size="24" value="'.(! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL)?$conf->global->MEMBER_PAYONLINE_SENDEMAIL:'').'">';
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 9c1b0bb01e1..76368fc5673 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -246,8 +246,7 @@ $var=true;
 krsort($Total);
 foreach ($Total as $key=>$value)
 {
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
+    print '<tr class="oddeven">';
     print "<td><a href=\"./subscription/list.php?date_select=$key\">$key</a></td>";
     print "<td align=\"right\">".$Number[$key]."</td>";
     print "<td align=\"right\">".price($value)."</td>";
@@ -267,9 +266,6 @@ print "</table><br>\n";
 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
-
-$var=true;
-
 /*
  * Last modified members
  */
@@ -295,12 +291,10 @@ if ($resql)
 	if ($num)
 	{
 		$i = 0;
-		$var = True;
 		while ($i < $num)
 		{
-			$var=!$var;
 			$obj = $db->fetch_object($resql);
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			$staticmember->id=$obj->rowid;
 			$staticmember->lastname=$obj->lastname;
 			$staticmember->firstname=$obj->firstname;
@@ -358,12 +352,10 @@ if ($resql)
 	if ($num)
 	{
 		$i = 0;
-		$var = True;
 		while ($i < $num)
 		{
-			$var=!$var;
 			$obj = $db->fetch_object($resql);
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			$subscriptionstatic->id=$obj->cid;
 			$subscriptionstatic->ref=$obj->cid;
 			$staticmember->id=$obj->rowid;
@@ -407,8 +399,7 @@ print "</tr>\n";
 
 foreach ($AdherentType as $key => $adhtype)
 {
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	print '<tr class="oddeven">';
 	print '<td>'.$adhtype->getNomUrl(1, dol_size(32)).'</td>';
 	print '<td align="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->subscription,0,3).'</td>';
 	print '<td align="right">'.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0) > 0) ? $MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0):'').' '.$staticmember->LibStatut(1,$adhtype->subscription,0,3).'</td>';
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index c717d20be84..6f896e186bb 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -127,12 +127,10 @@ if (! $foundphy) $data[]=array('label'=>'phy','nb'=>'0','lastdate'=>'');
 if (! $foundmor) $data[]=array('label'=>'mor','nb'=>'0','lastdate'=>'');
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
 	$year = $val['year'];
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.$memberstatic->getmorphylib($val['label']).'</td>';
 	print '<td align="right">'.$val['nb'].'</td>';
 	print '<td align="center">'.dol_print_date($val['lastdate'],'dayhour').'</td>';
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index ae128d940e8..8e3d0862490 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -291,12 +291,10 @@ if ($mode)
     print '</tr>';
 
     $oldyear=0;
-    $var=true;
     foreach ($data as $val)
     {
         $year = $val['year'];
-        $var=!$var;
-        print '<tr '.$bc[$var].'>';
+        print '<tr class="oddeven">';
         print '<td>'.$val['label'].'</td>';
         if ($label2) print '<td align="center">'.$val['label2'].'</td>';
         print '<td align="right">'.$val['nb'].'</td>';
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index aec8cd588f6..4126fc6e68c 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -176,15 +176,13 @@ print '<td align="right">'.$langs->trans("AmountAverage").'</td>';
 print '</tr>';
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
     $year = $val['year'];
     while ($oldyear > $year+1)
     {	// If we have empty year
         $oldyear--;
-        $var=!$var;
-        print '<tr '.$bc[$var].' height="24">';
+        print '<tr class="oddeven" height="24">';
         print '<td align="center">';
         print '<a href="month.php?year='.$oldyear.'&amp;mode='.$mode.'">';
         print $oldyear;
@@ -195,8 +193,7 @@ foreach ($data as $val)
         print '<td align="right">0</td>';
         print '</tr>';
     }
-    $var=!$var;
-    print '<tr '.$bc[$var].' height="24">';
+    print '<tr class="oddeven" height="24">';
     print '<td align="center">';
     //print '<a href="month.php?year='.$year.'">';
     print $year;
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 0c9c8467f1f..dc66e080f48 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -821,12 +821,10 @@ if ($rowid > 0)
             }
             print "</tr>\n";
 
-            $var=True;
             while ($i < $num)
             {
                 $objp = $db->fetch_object($result);
-                $var=!$var;
-                print "<tr ".$bc[$var].">";
+                print '<tr class="oddeven">';
                 $subscriptionstatic->ref=$objp->crowid;
                 $subscriptionstatic->id=$objp->crowid;
                 print '<td>'.$subscriptionstatic->getNomUrl(1).'</td>';
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 846b0dab7a9..ab6bfcc0704 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -206,12 +206,10 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 		print '<th>&nbsp;</th>';
 		print "</tr>\n";
 
-		$var=True;
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($result);
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			print '<td><a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a></td>';
 			print '<td>'.dol_escape_htmltag($objp->libelle).'</td>';
 			print '<td align="center">'.yn($objp->subscription).'</td>';
@@ -518,7 +516,6 @@ if ($rowid > 0)
 
 			print "</tr>\n";
 
-		    $var=True;
 		    while ($i < $num && $i < $conf->liste_limit)
 		    {
 		        $objp = $db->fetch_object($resql);
@@ -530,8 +527,7 @@ if ($rowid > 0)
 		        $adh->firstname=$objp->firstname;
 
 		        // Lastname
-		        $var=!$var;
-		        print '<tr '.$bc[$var].'>';
+		        print '<tr class="oddeven">';
 		        if ($objp->societe != '')
 		        {
 		            print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"),"user").' '.$adh->getFullName($langs,0,-1,20).' / '.dol_trunc($objp->societe,12).'</a></td>'."\n";

From 26a9999fbfb9c32be7e807630e707691b5577d87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 Apr 2017 11:30:33 +0200
Subject: [PATCH 0586/1163] Support of preview for pdf with several pages

---
 htdocs/adherents/agenda.php                   | 29 --------
 htdocs/adherents/document.php                 |  2 +-
 htdocs/comm/action/document.php               |  2 +-
 htdocs/comm/propal/document.php               |  2 +-
 htdocs/commande/document.php                  |  2 +-
 htdocs/compta/bank/releve.php                 |  2 +-
 .../compta/bank/various_payment/document.php  |  2 +-
 htdocs/compta/deplacement/document.php        |  2 +-
 htdocs/compta/facture/card.php                | 68 +++++++++----------
 htdocs/compta/facture/document.php            |  2 +-
 htdocs/compta/facture/fiche-rec.php           |  2 +-
 htdocs/compta/salaries/document.php           |  2 +-
 htdocs/compta/sociales/document.php           |  2 +-
 htdocs/contact/document.php                   |  2 +-
 htdocs/contrat/class/contrat.class.php        |  8 +--
 htdocs/contrat/document.php                   |  2 +-
 htdocs/core/ajax/ajaxdirpreview.php           |  4 +-
 htdocs/core/class/html.formfile.class.php     |  2 +-
 htdocs/core/lib/agenda.lib.php                |  2 +-
 htdocs/core/lib/bank.lib.php                  |  4 +-
 htdocs/core/lib/company.lib.php               |  2 +-
 htdocs/core/lib/contact.lib.php               |  2 +-
 htdocs/core/lib/contract.lib.php              |  2 +-
 htdocs/core/lib/donation.lib.php              |  2 +-
 htdocs/core/lib/expensereport.lib.php         |  2 +-
 htdocs/core/lib/fichinter.lib.php             |  2 +-
 htdocs/core/lib/files.lib.php                 |  8 +--
 htdocs/core/lib/fourn.lib.php                 |  4 +-
 htdocs/core/lib/functions.lib.php             |  8 ++-
 htdocs/core/lib/holiday.lib.php               |  2 +-
 htdocs/core/lib/invoice.lib.php               |  2 +-
 htdocs/core/lib/loan.lib.php                  |  2 +-
 htdocs/core/lib/member.lib.php                |  2 +-
 htdocs/core/lib/order.lib.php                 |  2 +-
 htdocs/core/lib/product.lib.php               |  4 +-
 htdocs/core/lib/project.lib.php               |  4 +-
 htdocs/core/lib/propal.lib.php                |  2 +-
 htdocs/core/lib/resource.lib.php              |  2 +-
 htdocs/core/lib/salaries.lib.php              |  2 +-
 htdocs/core/lib/supplier_proposal.lib.php     |  2 +-
 htdocs/core/lib/tax.lib.php                   |  2 +-
 htdocs/core/lib/usergroups.lib.php            |  2 +-
 .../doc/doc_generic_project_odt.modules.php   |  4 +-
 .../task/doc/doc_generic_task_odt.modules.php |  4 +-
 htdocs/don/document.php                       |  2 +-
 htdocs/ecm/class/ecmdirectory.class.php       |  2 +-
 htdocs/ecm/docmine.php                        |  2 +-
 htdocs/ecm/search.php                         |  2 +-
 htdocs/expensereport/document.php             |  2 +-
 htdocs/fichinter/document.php                 |  2 +-
 htdocs/fourn/commande/document.php            |  2 +-
 htdocs/fourn/facture/document.php             |  2 +-
 htdocs/holiday/document.php                   |  2 +-
 htdocs/install/repair.php                     |  2 +-
 htdocs/loan/document.php                      |  2 +-
 htdocs/product/class/product.class.php        |  4 +-
 htdocs/product/document.php                   |  4 +-
 htdocs/projet/class/project.class.php         |  2 +-
 htdocs/projet/class/task.class.php            |  2 +-
 htdocs/projet/document.php                    |  2 +-
 htdocs/projet/tasks/document.php              |  2 +-
 htdocs/resource/document.php                  |  2 +-
 htdocs/societe/document.php                   |  2 +-
 htdocs/supplier_proposal/document.php         |  2 +-
 htdocs/user/document.php                      |  2 +-
 65 files changed, 114 insertions(+), 145 deletions(-)

diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index f85761ff266..145bcf4e497 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -91,35 +91,6 @@ if ($object->id > 0)
 	
 	dol_banner_tab($object, 'rowid', $linkback);
     
-	/*
-    print '<div class="fichecenter">';
-    
-    print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
-
-	// Login
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-	{
-	    print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
-	}
-
-	// Type
-	print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
-
-	// Morphy
-	print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
-	print '</tr>';
-
-	// Company
-	print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->societe.'</td></tr>';
-
-	// Civility
-	print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
-	print '</tr>';
-
-	print '</table>';
-    */
-	
 	print '<div class="fichecenter">';
 	
 	print '<div class="underbanner clearboth"></div>';
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index cbc6d7f090c..dd22a74577d 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -96,7 +96,7 @@ if ($id > 0)
 	{
 			
 		// Construit liste des fichiers
-		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 		$totalsize=0;
 		foreach($filearray as $key => $file)
 		{
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 3edc08d87cb..2caa55bcd59 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -241,7 +241,7 @@ if ($object->id > 0)
 	print '<table class="border" width="100%">';
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 82978daf2c1..82244886763 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -92,7 +92,7 @@ if ($object->id > 0)
 	dol_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal');
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 199cb6d43c3..ef4f220f3e4 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -95,7 +95,7 @@ if ($id > 0 || ! empty($ref))
 		dol_fiche_head($head, 'documents', $langs->trans('CustomerOrder'), -1, 'order');
 
 		// Construit liste des fichiers
-		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 		$totalsize=0;
 		foreach($filearray as $key => $file)
 		{
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 008fdec874b..4e5fc5dea81 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -249,7 +249,7 @@ if ($action=="dl" && $numref > 0)
             
             /*if (! empty($upload_dir))
             {
-                $files = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview\.png)$', '', SORT_ASC, 1);
+                $files = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
 
                 if (is_array($files)) {
                     foreach ($files as $file) {
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 3fa15deb9c2..5311aca0618 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -85,7 +85,7 @@ if ($object->id)
 
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 4154778306e..6fa539ba297 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -94,7 +94,7 @@ if ($object->id)
 
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 9592f17a188..905bd8caf31 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3360,33 +3360,29 @@ else if ($id > 0 || ! empty($ref))
 		}
 		print '</td></tr>';
 
-		// Multicurrency rate
-		//if ($object->multicurrency_code != $conf->currency)
-		//{
-    		print '<tr>';
-    		print '<td>';
-    		print '<table class="nobordernopadding" width="100%"><tr><td>';
-    		print fieldLabel('CurrencyRate','multicurrency_tx');
-    		print '</td>';
-    		if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)
-    			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
-    		print '</tr></table>';
-    		print '</td><td>';
-    		if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
-    			if($action == 'actualizemulticurrencyrate') {
-    				list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
-    			}
-    			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);
-    		} else {
-    			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
-				if($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
-					print '<div class="inline-block"> &nbsp; &nbsp; &nbsp; &nbsp; ';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=actualizemulticurrencyrate">'.$langs->trans("ActualizeCurrency").'</a>';
-					print '</div>';
-				}
-    		}
-    		print '</td></tr>';
-		//}
+		print '<tr>';
+		print '<td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print fieldLabel('CurrencyRate','multicurrency_tx');
+		print '</td>';
+		if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
+			if($action == 'actualizemulticurrencyrate') {
+				list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
+			}
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);
+		} else {
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
+			if($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
+				print '<div class="inline-block"> &nbsp; &nbsp; &nbsp; &nbsp; ';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=actualizemulticurrencyrate">'.$langs->trans("ActualizeCurrency").'</a>';
+				print '</div>';
+			}
+		}
+		print '</td></tr>';
 	}
 
 	// Bank Account
@@ -3499,38 +3495,38 @@ else if ($id > 0 || ! empty($ref))
 	{
 	    // Multicurrency Amount HT
 	    print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
-	    print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+	    print '<td class="nowrap amountcard">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
 	
 	    // Multicurrency Amount VAT
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
-	    print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+	    print '<td class="nowrap amountcard">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
 	
 	    // Multicurrency Amount TTC
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
-	    print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+	    print '<td class="nowrap amountcard">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
 	}
 
 	// Amount
-	print '<tr><td class="titlefield">' . $langs->trans('AmountHT') . '</td>';
-	print '<td class="nowrap">' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+	print '<tr><td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
+	print '<td class="nowrap amountcard">' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
 
 	// Vat
-	print '<tr><td>' . $langs->trans('AmountVAT') . '</td><td colspan="3" class="nowrap">' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+	print '<tr><td>' . $langs->trans('AmountVAT') . '</td><td colspan="3" class="nowrap amountcard">' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
 	print '</tr>';
 
 	// Amount Local Taxes
 	if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) 	// Localtax1
 	{
 	    print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-	    print '<td class="nowrap">' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+	    print '<td class="nowrap amountcard">' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
 	}
 	if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) 	// Localtax2
 	{
 	    print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-	    print '<td class=nowrap">' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+	    print '<td class=nowrap amountcard">' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
 	}
 
 	// Revenue stamp
@@ -3561,7 +3557,7 @@ else if ($id > 0 || ! empty($ref))
 	}
 
 	// Total with tax
-	print '<tr><td>' . $langs->trans('AmountTTC') . '</td><td class="nowrap">' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+	print '<tr><td>' . $langs->trans('AmountTTC') . '</td><td class="nowrap amountcard">' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
 
 	print '</table>';
 
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 45c6102ce1c..2d2ff5cc073 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -102,7 +102,7 @@ if ($id > 0 || ! empty($ref))
     	$totalpaye = $object->getSommePaiement();
 		
 		// Construit liste des fichiers
-		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 		$totalsize=0;
 		foreach($filearray as $key => $file)
 		{
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index db10f0c1ca0..26c60436adf 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1113,7 +1113,7 @@ else
 
 		$head=invoice_rec_prepare_head($object);
 
-		dol_fiche_head($head, 'card', $langs->trans("RepeatableInvoice"),0,'bill');	// Add a div
+		dol_fiche_head($head, 'card', $langs->trans("RepeatableInvoice"), -1, 'bill');	// Add a div
 
 		// Recurring invoice content
 
diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php
index 9e48533846a..7b24a0762f3 100644
--- a/htdocs/compta/salaries/document.php
+++ b/htdocs/compta/salaries/document.php
@@ -94,7 +94,7 @@ if ($object->id)
 
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 4d3f908e73c..cf42a11b515 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -117,7 +117,7 @@ if ($object->id)
 	print '<div class="underbanner clearboth"></div>';
 
     // Construit liste des fichiers
-    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
     $totalsize=0;
     foreach($filearray as $key => $file)
     {
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 8d003e14cf5..b0067d81ec1 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -100,7 +100,7 @@ if ($object->id)
 
 
     // Construit liste des fichiers
-    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
     $totalsize=0;
     foreach($filearray as $key => $file)
     {
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index d4d41b2f60c..f0a34e982c8 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1819,13 +1819,13 @@ class Contrat extends CommonObject
 				$text.=': &nbsp; &nbsp; ';
 			}
 			$text.=($mode == 7?'<div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofserviceswait > 0) ? $this->nbofserviceswait.' '.$line->LibStatut(0,3).' &nbsp; ' : '';
+			$text.=($mode != 7 || $this->nbofserviceswait > 0) ? $this->nbofserviceswait.' '.$line->LibStatut(0,3).(($this->nbofservicesopened || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
 			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesopened > 0) ? $this->nbofservicesopened.' '.$line->LibStatut(4,3,0).' &nbsp; ' : '';
+			$text.=($mode != 7 || $this->nbofservicesopened > 0) ? $this->nbofservicesopened.' '.$line->LibStatut(4,3,0).(($this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
 			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesexpired > 0) ? $this->nbofservicesexpired.' '.$line->LibStatut(4,3,1).' &nbsp; ' : '';
+			$text.=($mode != 7 || $this->nbofservicesexpired > 0) ? $this->nbofservicesexpired.' '.$line->LibStatut(4,3,1).(($this->nbofservicesclosed)?' &nbsp; ':'') : '';
 			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesclosed > 0) ? $this->nbofservicesclosed.' '.$line->LibStatut(5,3).' &nbsp; ' : '';
+			$text.=($mode != 7 || $this->nbofservicesclosed > 0) ? $this->nbofservicesclosed.' '.$line->LibStatut(5,3) : '';
 			$text.=($mode == 7?'</div>':'');
 			return $text;
 		}
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 35fbdf065b9..7c0263f8376 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -97,7 +97,7 @@ if ($object->id)
 
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 52411613e0b..3fec57091cb 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -150,7 +150,7 @@ if ($type == 'directory')
     $formfile=new FormFile($db);
 
     $maxlengthname=40;
-    $excludefiles = array('^SPECIMEN\.pdf$','^\.','(\.meta|_preview\.png)$','^temp$','^payments$','^CVS$','^thumbs$');
+    $excludefiles = array('^SPECIMEN\.pdf$','^\.','(\.meta|_preview.*\.png)$','^temp$','^payments$','^CVS$','^thumbs$');
     $sorting = (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC);
 
     // Right area. If module is defined, we are in automatic ecm.
@@ -212,7 +212,7 @@ if ($type == 'directory')
         {
             $filearray=array();
         }
-        else $filearray=dol_dir_list($upload_dir,"files",0,'',array('^\.','(\.meta|_preview\.png)$','^temp$','^CVS$'),$sortfield, $sorting,1);
+        else $filearray=dol_dir_list($upload_dir,"files",0,'',array('^\.','(\.meta|_preview.*\.png)$','^temp$','^CVS$'),$sortfield, $sorting,1);
 
         if ($section)
         {
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 6bb35e7a9d2..a7a9221babc 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -670,7 +670,7 @@ class FormFile
         // Get list of files
         if (! empty($filedir))
         {
-            $file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview\.png)$','date',SORT_DESC);
+            $file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
 
             $link_list = array();
             if (is_object($object))
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 6c6f2d2f1d8..408e671dfef 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -472,7 +472,7 @@ function actions_prepare_head($object)
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     $upload_dir = $conf->agenda->dir_output . "/" . $object->id;
-    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Documents");
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index ed13b736a7d..c88a0b7afed 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -77,7 +77,7 @@ function bank_prepare_head(Account $object)
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     $upload_dir = $conf->bank->dir_output . "/" . dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = DOL_URL_ROOT . "/compta/bank/document.php?account=" . $object->id;
     $head[$h][1] = $langs->trans("Documents");
@@ -166,7 +166,7 @@ function various_payment_prepare_head($object) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->banque->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index e6e154220b8..8ee372d1178 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -215,7 +215,7 @@ function societe_prepare_head(Societe $object)
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
         $upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id ;
-        $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+        $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
         $nbLinks=Link::count($db, $object->element, $object->id);
         
         $head[$h][0] = DOL_URL_ROOT.'/societe/document.php?socid='.$object->id;
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index c507e2e66ee..f951439f0c5 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -76,7 +76,7 @@ function contact_prepare_head(Contact $object)
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     $upload_dir = $conf->societe->dir_output . "/contact/" . dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$tab][0] = DOL_URL_ROOT.'/contact/document.php?id='.$object->id;
     $head[$tab][1] = $langs->trans("Documents");
diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
index 2d328ea7097..9d986e983bc 100644
--- a/htdocs/core/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -71,7 +71,7 @@ function contract_prepare_head(Contrat $object)
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php
index 51f6858eafd..665ff7cb4e3 100644
--- a/htdocs/core/lib/donation.lib.php
+++ b/htdocs/core/lib/donation.lib.php
@@ -81,7 +81,7 @@ function donation_prepare_head($object)
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->don->dir_output . '/' . get_exdir($filename,2,0,1,$object,'donation'). '/'. dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/don/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index cc60f9feb13..f253f077243 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -48,7 +48,7 @@ function expensereport_prepare_head($object)
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index 4e91c02f4f2..8507a85292a 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -102,7 +102,7 @@ function fichinter_prepare_head($object)
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->ficheinter->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index e9bcccce798..99bf8848d99 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -45,7 +45,7 @@ function dol_basename($pathfile)
  *  @param	string		$types        	Can be "directories", "files", or "all"
  *  @param	int			$recursive		Determines whether subdirectories are searched
  *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function. Filter is checked into basename only.
- *  @param	array		$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.')). Exclude is checked into fullpath.
+ *  @param	array		$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview.*\.png)$','^\.')). Exclude is checked into fullpath.
  *  @param	string		$sortcriteria	Sort criteria ("","fullname","name","date","size")
  *  @param	string		$sortorder		Sort order (SORT_ASC, SORT_DESC)
  *	@param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only
@@ -208,7 +208,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
  *
  *  @param	string		$path        	Starting path from which to search. Example: 'produit/MYPROD'
  *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function
- *  @param	array|null	$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.'))
+ *  @param	array|null	$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview.*\.png)$','^\.'))
  *  @param	string		$sortcriteria	Sort criteria ("","fullname","name","date","size")
  *  @param	string		$sortorder		Sort order (SORT_ASC, SORT_DESC)
  *	@param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like description
@@ -1549,11 +1549,11 @@ function dol_uncompress($inputfile,$outputdir)
  *
  * @param 	string		$dir			Directory to scan
  * @param	string		$regexfilter	Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function
- * @param	array		$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.')). This regex value must be escaped for '/', since this char is used for preg_match function
+ * @param	array		$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview.*\.png)$','^\.')). This regex value must be escaped for '/', since this char is used for preg_match function
  * @param	int			$nohook			Disable all hooks
  * @return	string						Full path to most recent file
  */
-function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta|_preview\.png)$','^\.'),$nohook=false)
+function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta|_preview.*\.png)$','^\.'),$nohook=false)
 {
     $tmparray=dol_dir_list($dir,'files',0,$regexfilter,$excludefilter,'date',SORT_DESC,'',$nohook);
     return $tmparray[0];
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 3ac3cf49a9c..44e7774cae6 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -74,7 +74,7 @@ function facturefourn_prepare_head($object)
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').$object->ref;
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
@@ -151,7 +151,7 @@ function ordersupplier_prepare_head($object)
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ea348fb31d1..bb27acd936b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1064,7 +1064,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                     
                     // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")
                     $fileimage = $file.'_preview.png';              // If PDF has 1 page
-                    $fileimagebis = $file.'_preview-0.pdf.png';     // If PDF has more than one page
+                    $fileimagebis = $file.'_preview-0.png';         // If PDF has more than one page
                     $relativepathimage = $relativepath.'_preview.png';
                     
                     // Si fichier PDF existe
@@ -1072,9 +1072,11 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                     {
                         $encfile = urlencode($file);
                         // Conversion du PDF en image png si fichier png non existant
-                        if ((! file_exists($fileimage) && ! file_exists($fileimagebis)) || (filemtime($fileimage) < filemtime($file)))
+                        if ( (! file_exists($fileimage) || (filemtime($fileimage) < filemtime($file)))
+                          && (! file_exists($fileimagebis) || (filemtime($fileimagebis) < filemtime($file)))
+                           )
                         {
-                            $ret = dol_convert_file($file,'png',$fileimage);
+                            $ret = dol_convert_file($file, 'png', $fileimage);
                             if ($ret < 0) $error++;
                         }
     
diff --git a/htdocs/core/lib/holiday.lib.php b/htdocs/core/lib/holiday.lib.php
index 605c37520d8..56d19d0e0f1 100644
--- a/htdocs/core/lib/holiday.lib.php
+++ b/htdocs/core/lib/holiday.lib.php
@@ -43,7 +43,7 @@ function holiday_prepare_head($object)
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     $upload_dir = $conf->holiday->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = DOL_URL_ROOT.'/holiday/document.php?id='.$object->id;
     $head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 564e909a2da..220cc5aeccc 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -96,7 +96,7 @@ function facture_prepare_head($object)
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php
index f1748a0dfb9..3f7029dd26b 100644
--- a/htdocs/core/lib/loan.lib.php
+++ b/htdocs/core/lib/loan.lib.php
@@ -50,7 +50,7 @@ function loan_prepare_head($object)
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->loan->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$tab][0] = DOL_URL_ROOT.'/loan/document.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Documents");
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index 574f7a5b950..550ec6ad534 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -79,7 +79,7 @@ function member_prepare_head(Adherent $object)
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     $upload_dir = $conf->adherent->multidir_output[$object->entity].'/'.get_exdir(0,0,0,1,$object,'member');
-    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id;
     $head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 6bfb2541c11..89bbe24ea47 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -91,7 +91,7 @@ function commande_prepare_head(Commande $object)
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index aaf3ae0bb9d..5aec64f3ce0 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -149,11 +149,11 @@ function product_prepare_head($object)
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
     if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
         if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->produit->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
         if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
-        $nbFiles += count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+        $nbFiles += count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     }
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$object->id;
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 592988da9b9..29cdad35bc3 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -82,7 +82,7 @@ function project_prepare_head($object)
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
@@ -192,7 +192,7 @@ function task_prepare_head($object)
 	$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . '/' .dol_sanitizeFileName($object->ref);
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index 66ef1146850..f0d42888745 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -87,7 +87,7 @@ function propal_prepare_head($object)
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->propal->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/core/lib/resource.lib.php b/htdocs/core/lib/resource.lib.php
index a6c63dc51e4..78cd0af3a12 100644
--- a/htdocs/core/lib/resource.lib.php
+++ b/htdocs/core/lib/resource.lib.php
@@ -70,7 +70,7 @@ function resource_prepare_head($object)
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	$upload_dir = $conf->resource->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
 	$head[$h][0] = DOL_URL_ROOT.'/resource/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
 	if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
diff --git a/htdocs/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php
index 2e230ad2302..eaaa90a710e 100644
--- a/htdocs/core/lib/salaries.lib.php
+++ b/htdocs/core/lib/salaries.lib.php
@@ -45,7 +45,7 @@ function salaries_prepare_head($object) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->salaries->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/core/lib/supplier_proposal.lib.php b/htdocs/core/lib/supplier_proposal.lib.php
index 1e48edcb87d..580fecf0667 100644
--- a/htdocs/core/lib/supplier_proposal.lib.php
+++ b/htdocs/core/lib/supplier_proposal.lib.php
@@ -65,7 +65,7 @@ function supplier_proposal_prepare_head($object)
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->supplier_proposal->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 0fc401f0280..4764d1bfb65 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -55,7 +55,7 @@ function tax_prepare_head(ChargeSociales $object)
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->tax->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index b07b6fce821..c5f14090a92 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -149,7 +149,7 @@ function user_prepare_head($object)
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
         $upload_dir = $conf->user->dir_output . "/" . $object->id;
-        $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+        $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
         $nbLinks=Link::count($db, $object->element, $object->id);
         $head[$h][0] = DOL_URL_ROOT.'/user/document.php?userid='.$object->id;
         $head[$h][1] = $langs->trans("Documents");
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 32be29b082c..7d0fe1a41e6 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -734,7 +734,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						$listtasksfiles = $listlines->__get('tasksfiles');
 
 						$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref).'/'.dol_sanitizeFileName($task->ref);
-						$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$','name',SORT_ASC,1);
+						$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
 
 
 						foreach ($filearray as $filedetail)
@@ -778,7 +778,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 					$listlines = $odfHandler->setSegment('projectfiles');
 
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
-					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$','name',SORT_ASC,1);
+					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
 
 					foreach ($filearray as $filedetail)
 					{
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 1dba105217d..187018e0031 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -665,7 +665,7 @@ class doc_generic_task_odt extends ModelePDFTask
 					$listtasksfiles = $odfHandler->setSegment('tasksfiles');
 
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($object->ref);
-					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$','name',SORT_ASC,1);
+					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
 
 
 					foreach ($filearray as $filedetail)
@@ -707,7 +707,7 @@ class doc_generic_task_odt extends ModelePDFTask
 					$listlines = $odfHandler->setSegment('projectfiles');
 
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
-					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$','name',SORT_ASC,1);
+					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
 
 
 					foreach ($filearray as $filedetail)
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index c7ab85b069c..0f4166a4cde 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -108,7 +108,7 @@ if ($object->id)
 
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 1644b58075e..82fd7f49d58 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -667,7 +667,7 @@ class EcmDirectory // extends CommonObject
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$dir=$conf->ecm->dir_output.'/'.$this->getRelativePath();
-		$filelist=dol_dir_list($dir,'files',0,'','(\.meta|_preview\.png)$');
+		$filelist=dol_dir_list($dir,'files',0,'','(\.meta|_preview.*\.png)$');
 
 		// Test if filelist is in database
 
diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php
index 0099e831776..1e7613991e4 100644
--- a/htdocs/ecm/docmine.php
+++ b/htdocs/ecm/docmine.php
@@ -202,7 +202,7 @@ $form=new Form($db);
 
 
 // Built the file List
-$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 $totalsize=0;
 foreach($filearray as $key => $file)
 {
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 0d5cf7a4f55..15266395026 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -187,7 +187,7 @@ print '</td><td class="tdtop">';
 // Right area
 $relativepath=$ecmdir->getRelativePath();
 $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
-$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 
 $formfile=new FormFile($db);
 $param='&amp;section='.$section;
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index eb622867f54..227bdec8bc9 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -103,7 +103,7 @@ if ($object->id)
 	
 	
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index f24283e8aa1..03c7f83a827 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -93,7 +93,7 @@ if ($object->id)
 
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index fb11f5abff5..0f99d747b51 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -104,7 +104,7 @@ if ($object->id > 0)
 
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 52c44fc67b0..2563a176346 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -144,7 +144,7 @@ if ($object->id > 0)
     print '<div class="underbanner clearboth"></div>';
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index d39a6e566b1..57ab947c8e7 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -101,7 +101,7 @@ if ($object->id)
 
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 0338945df0f..dc9cece981f 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -438,7 +438,7 @@ if ($ok && GETPOST('clean_orphelin_dir'))
 
         print '<tr><td colspan="2"><br>*** Clean orphelins files into files '.$upload_dir.'</td></tr>';
 
-        $filearray=dol_dir_list($upload_dir,"files",1,'',array('^SPECIMEN\.pdf$','^\.','(\.meta|_preview\.png)$','^temp$','^payments$','^CVS$','^thumbs$'),'',SORT_DESC,1,true);
+        $filearray=dol_dir_list($upload_dir,"files",1,'',array('^SPECIMEN\.pdf$','^\.','(\.meta|_preview.*\.png)$','^temp$','^payments$','^CVS$','^thumbs$'),'',SORT_DESC,1,true);
 
         // To show ref or specific information according to view to show (defined by $module)
         if ($modulepart == 'company')
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 3e0654ace3f..e6446e366fa 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -104,7 +104,7 @@ if ($object->id)
 
 
     // Construit liste des fichiers
-    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
     $totalsize=0;
     foreach($filearray as $key => $file)
     {
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 44024025ec0..0ee5c8f26ed 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3984,11 +3984,11 @@ class Product extends CommonObject
 		$return ='<!-- Photo -->'."\n";
 		$nbphoto=0;
 
-		$filearray=dol_dir_list($dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+		$filearray=dol_dir_list($dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 		
 		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
 		{
-		    $filearrayold=dol_dir_list($dirold,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+		    $filearrayold=dol_dir_list($dirold,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 		    $filearray=array_merge($filearray, $filearrayold);
 		}
 
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index c7199c99868..e9ae9073835 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -195,11 +195,11 @@ if ($object->id)
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 	
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 
 	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
 	{
-		$filearrayold=dol_dir_list($upload_dirold,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+		$filearrayold=dol_dir_list($upload_dirold,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 		$filearray=array_merge($filearray, $filearrayold);
 	}
 
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 4bc4718368f..309107ed233 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1348,7 +1348,7 @@ class Project extends CommonObject
 
 				if (dol_mkdir($clone_project_dir) >= 0)
 				{
-					$filearray=dol_dir_list($ori_project_dir,"files",0,'','(\.meta|_preview\.png)$','',SORT_ASC,1);
+					$filearray=dol_dir_list($ori_project_dir,"files",0,'','(\.meta|_preview.*\.png)$','',SORT_ASC,1);
 					foreach($filearray as $key => $file)
 					{
 						$rescopy = dol_copy($ori_project_dir . '/' . $file['name'], $clone_project_dir . '/' . $file['name'],0,1);
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index a5e4cb69492..9a1819fc46c 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1481,7 +1481,7 @@ class Task extends CommonObject
 				$clone_task_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($clone_project_ref). "/" . dol_sanitizeFileName($clone_task_ref);
 				$ori_task_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($ori_project_ref). "/" . dol_sanitizeFileName($fromid);
 
-				$filearray=dol_dir_list($ori_task_dir,"files",0,'','(\.meta|_preview\.png)$','',SORT_ASC,1);
+				$filearray=dol_dir_list($ori_task_dir,"files",0,'','(\.meta|_preview.*\.png)$','',SORT_ASC,1);
 				foreach($filearray as $key => $file)
 				{
 					if (!file_exists($clone_task_dir))
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index ab43a752d15..2d5a6cd71d0 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -99,7 +99,7 @@ if ($object->id > 0)
 	dol_fiche_head($head, 'document', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
 	// Files list constructor
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index af7d35ab378..684b7648ab8 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -221,7 +221,7 @@ if ($object->id > 0)
 	dol_fiche_head($head, 'task_document', $langs->trans("Task"), -1, 'projecttask');
 
 	// Files list constructor
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 099fb4f7d2b..1078e8bb94a 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -93,7 +93,7 @@ if ($object->id)
 
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 48f5fd79621..a43db2da318 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -102,7 +102,7 @@ if ($object->id)
 
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 1f21693246b..62ff5e0c71a 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -86,7 +86,7 @@ if ($object->id > 0)
 	dol_fiche_head($head, 'document', $langs->trans('CommRequest'), -1, 'supplier_proposal');
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 5b86c7d490d..94a9db840e3 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -139,7 +139,7 @@ if ($object->id)
     print '<div class="underbanner clearboth"></div>';
 
 	// Construit liste des fichiers
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{

From d78f3923eebac4850f890182194a9e36b8d03fee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 Apr 2017 12:13:38 +0200
Subject: [PATCH 0587/1163] Support of preview for pdf with several pages

---
 htdocs/compta/facture/card.php            | 12 +++++-------
 htdocs/core/lib/functions.lib.php         | 11 ++++-------
 htdocs/core/tpl/objectline_create.tpl.php |  4 ++--
 htdocs/theme/eldy/style.css.php           |  6 ++++++
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 905bd8caf31..6e8c3b6d895 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3692,8 +3692,6 @@ else if ($id > 0 || ! empty($ref))
     print '<td class="liste_titre" width="18">&nbsp;</td>';
     print '</tr>';
 
-    $var = true;
-
     // Payments already done (from payment on this invoice)
     $sql = 'SELECT p.datep as dp, p.ref, p.num_paiement, p.rowid, p.fk_bank,';
     $sql .= ' c.code as payment_code, c.libelle as payment_label,';
@@ -3715,8 +3713,7 @@ else if ($id > 0 || ! empty($ref))
         if ($num > 0) {
             while ($i < $num) {
                 $objp = $db->fetch_object($result);
-                $var = ! $var;
-                print '<tr ' . $bc[$var] . '><td>';
+                print '<tr class="oddeven"><td>';
                 $paymentstatic->id = $objp->rowid;
                 $paymentstatic->datepaye = $db->jdate($objp->dp);
                 $paymentstatic->ref = $objp->ref;
@@ -3741,9 +3738,10 @@ else if ($id > 0 || ! empty($ref))
                 print '</tr>';
                 $i ++;
             }
-        } else {
-            print '<tr ' . $bc[false] . '><td colspan="' . $nbcols . '" class="opacitymedium">' . $langs->trans("None") . '</td><td></td><td></td></tr>';
-        }
+        } 
+        /*else {
+            print '<tr class="oddeven"><td colspan="' . $nbcols . '" class="opacitymedium">' . $langs->trans("None") . '</td><td></td><td></td></tr>';
+        }*/
         // }
         $db->free($result);
     } else {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bb27acd936b..4cec1ce7de2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1090,13 +1090,10 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                         // Si fichier png PDF de plus d'1 page trouve
                         elseif (file_exists($fileimagebis))
                         {
-                            $preview = preg_replace('/\.png/','',$relativepath) . "-0.png";
-                            if (file_exists($dir_output.$preview))
-                            {
-                                $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
-                                $phototoshow.= '<img height="70" class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';
-                                $phototoshow.= '</div></div>';
-                            }
+                            $preview = preg_replace('/\.png/','',$relativepathimage) . "-0.png";
+                            $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
+                            $phototoshow.= '<img height="70" class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';
+                            $phototoshow.= '</div></div>';
                         }
                     }
                 }
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 178a3629d23..d02f820d0d5 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -56,7 +56,7 @@ if (in_array($object->element,array('propal', 'supplier_proposal','facture','fac
 $nolinesbefore=(count($this->lines) == 0 || $forcetoshowtitlelines);
 if ($nolinesbefore) {
 ?>
-<tr class="liste_titre<?php echo (($nolinesbefore || $object->element=='contrat')?'':' liste_titre_add') ?> nodrag nodrop">
+<tr class="liste_titre<?php echo (($nolinesbefore || $object->element=='contrat')?'':' liste_titre_add_') ?> nodrag nodrop">
 	<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
 	<td class="linecolnum" align="center"></td>
 	<?php } ?>
@@ -114,7 +114,7 @@ if ($nolinesbefore) {
 <?php
 }
 ?>
-<tr class="pair nodrag nodrop nohoverpair<?php echo ($nolinesbefore || $object->element=='contrat')?'':' liste_titre_add'; ?>">
+<tr class="pair nodrag nodrop nohoverpair<?php echo ($nolinesbefore || $object->element=='contrat')?'':' liste_titre_create'; ?>">
 <?php
 if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 	$coldisplay=2;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b50e193547b..0bbfdd82514 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2281,6 +2281,12 @@ table.paddingtopbottomonly tr td {
 tr.liste_titre_filter td.liste_titre {
     border-bottom: 1px solid #ddd;
 }
+.liste_titre_create td, .liste_titre_create th, .liste_titre_create .tagtd
+{
+    /*border-top-width: 1px;
+    border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
+    border-top-style: solid;*/
+}
 .liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd
 {
     border-top-width: 2px;

From 77dfb05647180effa5ed6e1c1d60ab62b86aea0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 Apr 2017 12:35:13 +0200
Subject: [PATCH 0588/1163] Work on v6 look and feel

---
 htdocs/bookmarks/list.php       | 24 ++++++++++++++++--------
 htdocs/theme/eldy/style.css.php |  2 +-
 htdocs/theme/md/style.css.php   |  8 +++++++-
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 7002c42e737..4e1996cf658 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -27,32 +27,40 @@ require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
 $langs->load("bookmarks");
 $langs->load("admin");
 
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
+
 // Security check
 if (! $user->rights->bookmark->lire) {
     restrictedArea($user, 'bookmarks');
 }
 $optioncss = GETPOST('optioncss','alpha');
 
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
-$offset = $conf->liste_limit * $page ;
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="position";
-$limit=$conf->liste_limit;
+if (! $sortfield) $sortfield='position';
+if (! $sortorder) $sortorder='ASC';
+
+$id = GETPOST("bid",'int');
 
 
 /*
  * Actions
  */
 
-if ($_GET["action"] == 'delete')
+if ($action == 'delete')
 {
     $bookmark=new Bookmark($db);
-    $res=$bookmark->remove($_GET["bid"]);
+    $res=$bookmark->remove($id);
     if ($res > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
@@ -100,7 +108,7 @@ if ($resql)
     print "<tr class=\"liste_titre\">";
     //print "<td>&nbsp;</td>";
     print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bid","", $param,'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Title"),'','');
+    print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"title","", $param,'align="left"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Link"),'','');
     print_liste_field_titre($langs->trans("Target"),'','','','','align="center"');
     print_liste_field_titre($langs->trans("Owner"),$_SERVER["PHP_SELF"],"u.lastname","", $param,'align="center"',$sortfield,$sortorder);
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 0bbfdd82514..9dba03c5978 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -78,7 +78,7 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 //var_dump($user->conf->THEME_ELDY_RGB);
 
 // Colors
-$colorbackhmenu1='90,100,130';      // topmenu
+$colorbackhmenu1='80,90,120';      // topmenu
 $colorbackvmenu1='255,255,255';      // vmenu
 $colortopbordertitle1='120,120,120';    // top border of title
 $colorbacktitle1='240,240,240';      // title of tables,list
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 611ae895872..546cff1d9c7 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -90,7 +90,7 @@ $colorbacklineimpair2='255,255,255';    // line impair
 $colorbacklinepair1='250,250,250';    // line pair
 $colorbacklinepair2='248,248,248';    // line pair
 $colorbacklinepairhover='244,244,244';    // line pair
-$colorbackbody='248,248,248';
+$colorbackbody='240,240,240';
 $colortexttitlenotab='90,90,90';
 $colortexttitle='20,20,20';
 $colortext='0,0,0';
@@ -2367,6 +2367,12 @@ table.paddingtopbottomonly tr td {
 tr.liste_titre_filter td.liste_titre {
     border-bottom: 1px solid #FDFFFF;
 }
+.liste_titre_create td, .liste_titre_create th, .liste_titre_create .tagtd
+{
+    /*border-top-width: 1px;
+    border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
+    border-top-style: solid;*/
+}
 .liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd
 {
     border-top-width: 2px;

From d74baea1d34adda3291a5cd4be62079ebab8ed32 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 Apr 2017 13:01:41 +0200
Subject: [PATCH 0589/1163] Fix error management on direct print

---
 htdocs/core/actions_printing.inc.php | 30 +++++----
 htdocs/theme/eldy/style.css.php      |  2 +-
 htdocs/theme/md/style.css.php        |  2 +-
 htdocs/variants/card.php             | 94 +++++++++++++++++-----------
 4 files changed, 77 insertions(+), 51 deletions(-)

diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
index 061b98d1e9c..dbf446d2112 100644
--- a/htdocs/core/actions_printing.inc.php
+++ b/htdocs/core/actions_printing.inc.php
@@ -36,7 +36,7 @@ if ($action == 'print_file' and $user->rights->printing->read)
     $list = $objectprint->listDrivers($db, 10);
     if (! empty($list)) {
         $errorprint=0;
-        $printed=0;
+        $printerfound=0;
         foreach ($list as $driver) {
             require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
             $langs->load($driver);
@@ -46,27 +46,35 @@ if ($action == 'print_file' and $user->rights->printing->read)
 
             if (! empty($conf->global->{$printer->active})) 
             {
+                $printerfound++;
+                
                 $subdir=(GETPOST('printer', 'alpha')=='expedition'?'sending':'');
                 $module = GETPOST('printer', 'alpha');
                 if ($module =='commande_fournisseur') {
                     $module = 'fournisseur';
                     $subdir = 'commande';
                 }
-                $ret = $printer->print_file(GETPOST('file', 'alpha'), $module, $subdir);
-                if ($ret > 0) {
-                    //print '<pre>'.print_r($printer->errors, true).'</pre>';
-                    setEventMessages($printer->error, $printer->errors, 'errors');
+                try {
+                    $ret = $printer->print_file(GETPOST('file', 'alpha'), $module, $subdir);
+                    if ($ret > 0) {
+                        //print '<pre>'.print_r($printer->errors, true).'</pre>';
+                        setEventMessages($printer->error, $printer->errors, 'errors');
+                    }
+                    if ($ret==0) 
+                    {
+                        //print '<pre>'.print_r($printer->errors, true).'</pre>';
+                        setEventMessages($printer->error, $printer->errors);
+                        setEventMessages($langs->trans("FileWasSentToPrinter", basename(GETPOST('file'))).' '.$langs->transnoentitiesnoconv("ViaModule").' '.$printer->name, null);
+                    }
                 }
-                if ($ret==0) 
+                catch(Exception $e)
                 {
-                    //print '<pre>'.print_r($printer->errors, true).'</pre>';
-                    setEventMessages($printer->error, $printer->errors);
-                    setEventMessages($langs->trans("FileWasSentToPrinter", basename(GETPOST('file'))).' '.$langs->transnoentitiesnoconv("ViaModule").' '.$printer->name, null);
-                    $printed++;
+                    $ret = 1;
+                    setEventMessages($e->getMessage(), null, 'errors');
                 }
             }
         }
-        if ($printed==0) setEventMessages($langs->trans("NoActivePrintingModuleFound"), null, 'warnings');
+        if ($printerfound==0) setEventMessages($langs->trans("NoActivePrintingModuleFound"), null, 'warnings');
     } else {
         setEventMessages($langs->trans("NoModuleFound"), null, 'warnings');
     }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9dba03c5978..b0249452a70 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2205,7 +2205,7 @@ table.borderplus {
 	border: 1px solid #BBB;
 }
 .border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
-	height: 20px;
+	height: 22px;
 }
 div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar .table-val-border-col {
 	vertical-align: middle;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 546cff1d9c7..a4341ab317d 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2292,7 +2292,7 @@ table.borderplus {
 }
 
 .border tbody tr, .border tbody tr td, div.tabBar table.border tr {
-	height: 20px;
+	height: 22px;
 }
 
 table.border td, div.border div div.tagtd {
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index ae921114d6b..a611767cf2f 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28,10 +27,10 @@ $ref = GETPOST('ref');
 $confirm = GETPOST('confirm');
 $cancel = GETPOST('cancel');
 
-$prodattr = new ProductAttribute($db);
-$prodattrval = new ProductAttributeValue($db);
+$object = new ProductAttribute($db);
+$objectval = new ProductAttributeValue($db);
 
-if ($prodattr->fetch($id) < 1) {
+if ($object->fetch($id) < 1) {
 	dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
 	exit();
 }
@@ -47,10 +46,10 @@ if ($_POST) {
 
 	if ($action == 'edit') {
 
-		$prodattr->label = $label;
-		$prodattr->ref = $ref;
+		$object->label = $label;
+		$object->ref = $ref;
 
-		if ($prodattr->update() < 1) {
+		if ($object->update() < 1) {
 			setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
 		} else {
 			setEventMessage($langs->trans('RecordSaved'));
@@ -59,19 +58,19 @@ if ($_POST) {
 		}
 	} elseif ($action == 'edit_value') {
 
-		if ($prodattrval->fetch($valueid) > 0) {
+		if ($objectval->fetch($valueid) > 0) {
 
-			$prodattrval->ref = $ref;
-			$prodattrval->value = GETPOST('value');
+			$objectval->ref = $ref;
+			$objectval->value = GETPOST('value');
 
-			if ($prodattrval->update() > 0) {
+			if ($objectval->update() > 0) {
 				setEventMessage($langs->trans('RecordSaved'));
 			} else {
 				setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
 			}
 		}
 
-		header('Location: '.dol_buildpath('/variants/card.php?id='.$prodattr->id, 2));
+		header('Location: '.dol_buildpath('/variants/card.php?id='.$object->id, 2));
 		exit();
 	}
 
@@ -82,12 +81,12 @@ if ($confirm == 'yes') {
 
 		$db->begin();
 
-		$res = $prodattrval->deleteByFkAttribute($prodattr->id);
+		$res = $objectval->deleteByFkAttribute($object->id);
 
-		if ($res < 1 || ($prodattr->delete() < 1)) {
+		if ($res < 1 || ($object->delete() < 1)) {
 			$db->rollback();
 			setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
-			header('Location: '.dol_buildpath('/variants/card.php?id='.$prodattr->id, 2));
+			header('Location: '.dol_buildpath('/variants/card.php?id='.$object->id, 2));
 		} else {
 			$db->commit();
 			setEventMessage($langs->trans('RecordSaved'));
@@ -97,15 +96,15 @@ if ($confirm == 'yes') {
 		exit();
 	} elseif ($action == 'confirm_deletevalue') {
 
-		if ($prodattrval->fetch($valueid) > 0) {
+		if ($objectval->fetch($valueid) > 0) {
 
-			if ($prodattrval->delete() < 1) {
+			if ($objectval->delete() < 1) {
 				setEventMessage($langs->trans('CoreErrorMessage'), 'errors');
 			} else {
 				setEventMessage($langs->trans('RecordSaved'));
 			}
 
-			header('Location: '.dol_buildpath('/variants/card.php?id='.$prodattr->id, 2));
+			header('Location: '.dol_buildpath('/variants/card.php?id='.$object->id, 2));
 			exit();
 		}
 	}
@@ -118,38 +117,50 @@ if ($confirm == 'yes') {
 
 $langs->load('products');
 
-$title = $langs->trans('ProductAttributeName', dol_htmlentities($prodattr->label));
+$title = $langs->trans('ProductAttributeName', dol_htmlentities($object->label));
 $var = false;
 
 llxHeader('', $title);
 
-print_fiche_titre($title);
+//print_fiche_titre($title);
 
-dol_fiche_head();
+$h=0;
+$head[$h][0] = DOL_URL_ROOT.'/variants/card.php?id='.$object->id;
+$head[$h][1] = $langs->trans("Card");
+$head[$h][2] = 'variant';
+$h++;
+
+dol_fiche_head($head, 'variant', $langs->trans('ProductAttributeName'), -1, 'generic');
 
 if ($action == 'edit') {
-	print '<form method="post">';
+    print '<form method="POST">';
 }
 
+
+if ($action != 'edit')
+{
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
+}
 ?>
 	<table class="border" style="width: 100%">
 		<tr>
-			<td style="width: 15%" class="fieldrequired"><?php echo $langs->trans('Ref') ?></td>
+			<td class="titlefield fieldrequired"><?php echo $langs->trans('Ref') ?></td>
 			<td>
 				<?php if ($action == 'edit') {
-					print '<input type="text" name="ref" value="'.$prodattr->ref.'">';
+					print '<input type="text" name="ref" value="'.$object->ref.'">';
 				} else {
-					print dol_htmlentities($prodattr->ref);
+					print dol_htmlentities($object->ref);
 				} ?>
 			</td>
 		</tr>
 		<tr>
-			<td style="width: 15%" class="fieldrequired"><?php echo $langs->trans('Label') ?></td>
+			<td class="fieldrequired"><?php echo $langs->trans('Label') ?></td>
 			<td>
 				<?php if ($action == 'edit') {
-					print '<input type="text" name="label" value="'.$prodattr->label.'">';
+					print '<input type="text" name="label" value="'.$object->label.'">';
 				} else {
-					print dol_htmlentities($prodattr->label);
+					print dol_htmlentities($object->label);
 				} ?>
 			</td>
 		</tr>
@@ -157,6 +168,12 @@ if ($action == 'edit') {
 	</table>
 
 <?php
+
+if ($action != 'edit')
+{
+    print '</div>';
+}
+
 dol_fiche_end();
 
 if ($action == 'edit') { ?>
@@ -173,7 +190,7 @@ if ($action == 'edit') { ?>
 		$form = new Form($db);
 
 		print $form->formconfirm(
-			"card.php?id=".$prodattr->id,
+			"card.php?id=".$object->id,
 			$langs->trans('Delete'),
 			$langs->trans('ProductAttributeDeleteDialog'),
 			"confirm_delete",
@@ -183,14 +200,14 @@ if ($action == 'edit') { ?>
 		);
 	} elseif ($action == 'delete_value') {
 
-		if ($prodattrval->fetch($valueid) > 0) {
+		if ($objectval->fetch($valueid) > 0) {
 
 			$form = new Form($db);
 
 			print $form->formconfirm(
-				"card.php?id=".$prodattr->id."&valueid=".$prodattrval->id,
+				"card.php?id=".$object->id."&valueid=".$objectval->id,
 				$langs->trans('Delete'),
-				$langs->trans('ProductAttributeValueDeleteDialog', dol_htmlentities($prodattrval->value), dol_htmlentities($prodattrval->ref)),
+				$langs->trans('ProductAttributeValueDeleteDialog', dol_htmlentities($objectval->value), dol_htmlentities($objectval->ref)),
 				"confirm_deletevalue",
 				'',
 				0,
@@ -203,8 +220,8 @@ if ($action == 'edit') { ?>
 
 	<div class="tabsAction">
 		<div class="inline-block divButAction">
-			<a href="card.php?id=<?php echo $prodattr->id ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
-			<a href="card.php?id=<?php echo $prodattr->id ?>&action=delete" class="butAction"><?php echo $langs->trans('Delete') ?></a>
+			<a href="card.php?id=<?php echo $object->id ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
+			<a href="card.php?id=<?php echo $object->id ?>&action=delete" class="butAction"><?php echo $langs->trans('Delete') ?></a>
 		</div>
 	</div>
 
@@ -219,7 +236,7 @@ if ($action == 'edit') { ?>
 			<th class="liste_titre"></th>
 		</tr>
 
-		<?php foreach ($prodattrval->fetchAllByProductAttribute($prodattr->id) as $attrval): ?>
+		<?php foreach ($objectval->fetchAllByProductAttribute($object->id) as $attrval): ?>
 		<tr <?php echo $bc[!$var] ?>>
 			<?php if ($action == 'edit_value' && ($valueid == $attrval->id)): ?>
 				<td><input type="text" name="ref" value="<?php echo $attrval->ref ?>"></td>
@@ -233,8 +250,8 @@ if ($action == 'edit') { ?>
 				<td><?php echo dol_htmlentities($attrval->ref) ?></td>
 				<td><?php echo dol_htmlentities($attrval->value) ?></td>
 				<td style="text-align: right">
-					<a href="card.php?id=<?php echo $prodattr->id ?>&action=edit_value&valueid=<?php echo $attrval->id ?>"><?php echo img_edit() ?></a>
-					<a href="card.php?id=<?php echo $prodattr->id ?>&action=delete_value&valueid=<?php echo $attrval->id ?>"><?php echo img_delete() ?></a>
+					<a href="card.php?id=<?php echo $object->id ?>&action=edit_value&valueid=<?php echo $attrval->id ?>"><?php echo img_edit() ?></a>
+					<a href="card.php?id=<?php echo $object->id ?>&action=delete_value&valueid=<?php echo $attrval->id ?>"><?php echo img_delete() ?></a>
 				</td>
 			<?php endif; ?>
 		</tr>
@@ -250,7 +267,7 @@ if ($action == 'edit') { ?>
 
 	<div class="tabsAction">
 		<div class="inline-block divButAction">
-			<a href="create_val.php?id=<?php echo $prodattr->id ?>" class="butAction"><?php echo $langs->trans('Create') ?></a>
+			<a href="create_val.php?id=<?php echo $object->id ?>" class="butAction"><?php echo $langs->trans('Create') ?></a>
 		</div>
 	</div>
 
@@ -258,3 +275,4 @@ if ($action == 'edit') { ?>
 }
 
 llxFooter();
+$db->close();

From edaa3ae67213b9bb41114756ee54c4a8daebb48c Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Wed, 12 Apr 2017 17:44:01 +0200
Subject: [PATCH 0590/1163] Update code using new css class

---
 htdocs/admin/menus/other.php            |   4 +-
 htdocs/admin/system/browser.php         |  28 +++----
 htdocs/admin/system/constall.php        |   7 +-
 htdocs/admin/system/database-tables.php |  12 +--
 htdocs/admin/system/database.php        |   4 +-
 htdocs/admin/system/dbtable.php         |   4 +-
 htdocs/admin/system/dolibarr.php        | 101 ++++++++----------------
 7 files changed, 49 insertions(+), 111 deletions(-)

diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php
index 0a3cb6b99bc..7789c3fb21c 100644
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@@ -81,7 +81,6 @@ dol_fiche_head($head, 'misc', $langs->trans("Menus"), -1);
 
 
 // Other Options
-$var=true;
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -90,8 +89,7 @@ print '<td align="center" width="80">'.$langs->trans("Status").'</td>';
 print '</tr>';
 
 // Hide unauthorized menu
-$var=!$var;
-print "<tr ".$bc[$var].">";
+print '<tr class="oddeven">';
 print '<td colspan="3">'.$langs->trans("HideUnauthorizedMenu").'</td>';
 print '<td align="center">';
 if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))
diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php
index b2b5499d298..32d342df121 100644
--- a/htdocs/admin/system/browser.php
+++ b/htdocs/admin/system/browser.php
@@ -47,28 +47,18 @@ print load_fiche_titre($langs->trans("InfoBrowser"),'','title_setup');
 $tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
 
 // Browser
-$var=true;
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("UserAgent").'</td><td colspan="2">'.$_SERVER['HTTP_USER_AGENT'].'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("BrowserName").'</td><td colspan="2">'.$tmp['browsername'].'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("BrowserOS").'</td><td colspan="2">'.$tmp['browseros'].'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Version").'</td><td colspan="2">'.$tmp['browserversion'].'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Layout").' (phone/tablet/classic)</td><td colspan="2">'.$tmp['layout'].'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("IPAddress").'</td><td colspan="2">'.$_SERVER['REMOTE_ADDR'].'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Screen").'</td><td colspan="2">';
+print '<tr class="oddeven"><td width="300">'.$langs->trans("UserAgent").'</td><td colspan="2">'.$_SERVER['HTTP_USER_AGENT'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("BrowserName").'</td><td colspan="2">'.$tmp['browsername'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("BrowserOS").'</td><td colspan="2">'.$tmp['browseros'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("Version").'</td><td colspan="2">'.$tmp['browserversion'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("Layout").' (phone/tablet/classic)</td><td colspan="2">'.$tmp['layout'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("IPAddress").'</td><td colspan="2">'.$_SERVER['REMOTE_ADDR'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("Screen").'</td><td colspan="2">';
 print $_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
 print '</td></tr>'."\n";
 print '</table>';
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index 0fb3a6c9a7b..c7c7542ccaa 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -170,8 +170,7 @@ foreach($configfileparameters as $key)
             continue;
         }
 
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		if ($newkey == 'separator')
 		{
 			print '<td colspan="3">&nbsp;</td>';
@@ -233,14 +232,12 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	$var=True;
 
 	while ($i < $num)
     {
     	$obj = $db->fetch_object($resql);
-    	$var=!$var;
 
-    	print '<tr '.$bc[$var].'>';
+    	print '<tr class="oddeven">';
     	print '<td>'.$obj->name.'</td>'."\n";
     	print '<td>'.$obj->value.'</td>'."\n";
     	if (empty($conf->multicompany->enabled) || !$user->entity) print '<td>'.$obj->entity.'</td>'."\n";	// If superadmin or multicompany disabled
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 6e528c73094..b625b69d8ff 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -103,13 +103,11 @@ else
 		if ($resql)
 		{
 			$num = $db->num_rows($resql);
-			$var=True;
 			$i=0;
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 
 				print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
 				print '<td>'.$obj->Engine.'</td>';
@@ -158,13 +156,10 @@ else
 		if ($resql)
 		{
 			$num = $db->num_rows($resql);
-			$var=True;
 			$i=0;
 			while ($i < $num)
 			{
-				$row = $db->fetch_row($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td>'.$row[0].'</td>';
 				print '<td align="right">'.$row[1].'</td>';
 				print '<td align="right">'.$row[2].'</td>';
@@ -194,7 +189,6 @@ else
 
 		if ($resql)
 		{
-			$var=True;
 			while ($row = $db->fetch_row($resql)) {
 
 				$rescount = $db->query("SELECT COUNT(*) FROM " . $row[0]);
@@ -205,7 +199,7 @@ else
 					$count = '?';
 				}
 
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td>'.$row[0].'</td>';
 				print '<td>'.$count.'</td>';
 				print '</tr>';
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index c50e6ca9e4c..45ce3c087e6 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -100,11 +100,9 @@ else
 		if ($listname == 'listofvars') $listtouse=$listofvars;
 		if ($listname == 'listofstatus') $listtouse=$listofstatus;
 
-		$var=true;
 		foreach($listtouse as $param => $paramval)
 		{
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			print '<tr class="oddeven">';
 			print '<td>';
 			print $param;
 			print '</td>';
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 3fc10bb0f3f..2e7d5b3f8aa 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -106,13 +106,11 @@ else
 		if ($resql)
 		{
 			$num = $db->num_rows($resql);
-			$var=True;
 			$i=0;
 			while ($i < $num)
 			{
 				$row = $db->fetch_row($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 
 				print "<td>$row[0]</td>";
 				print "<td>$row[1]</td>";
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 6a5384da69a..36260c0a228 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -68,12 +68,10 @@ llxHeader('', $title);
 print load_fiche_titre($title,'','title_setup');
 
 // Version
-$var=true;
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").')</td><td>'.DOL_VERSION;
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").')</td><td>'.DOL_VERSION;
 // If current version differs from last upgrade
 if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
 {
@@ -123,42 +121,31 @@ if (function_exists('curl_init'))
 }
 
 print '</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
 print '</table>';
 print '</div>';
 print '<br>';
 
 // Session
-$var=true;
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Session").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("SessionSavePath").'</td><td colspan="2">'.session_save_path().'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentSessionTimeOut").'</td><td>'.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds");
+print '<tr class="oddeven"><td>'.$langs->trans("SessionSavePath").'</td><td colspan="2">'.session_save_path().'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentSessionTimeOut").'</td><td>'.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds");
 print '</td><td align="right">';
 print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
 print "</td></tr>\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentTheme").'</td><td colspan="2">'.$conf->theme.'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentMenuHandler").'</td><td colspan="2">';
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentTheme").'</td><td colspan="2">'.$conf->theme.'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentMenuHandler").'</td><td colspan="2">';
 print $conf->standard_menu;
 print '</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("Screen").'</td><td colspan="2">';
+print '<tr class="oddeven"><td>'.$langs->trans("Screen").'</td><td colspan="2">';
 print $_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
 print '</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("Session").'</td><td colspan="2">';
+print '<tr class="oddeven"><td>'.$langs->trans("Session").'</td><td colspan="2">';
 $i=0;
 foreach($_SESSION as $key => $val)
 {
@@ -177,7 +164,6 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
 {
 	$shmoparray=dol_listshmop();
 
-	$var=true;
     print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
@@ -188,8 +174,7 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
 
 	foreach($shmoparray as $key => $val)
 	{
-		$var=!$var;
-		print '<tr '.$bc[$var].'><td>'.$key.'</td>';
+		print '<tr class="oddeven"><td>'.$key.'</td>';
 		print '<td>'.count($val).'</td>';
 		print '<td align="right">'.dol_getshmopaddress($key).'</td>';
 		print '</tr>'."\n";
@@ -202,44 +187,34 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
 
 
 // Localisation
-$var=true;
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("LocalisationDolibarrParameters").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LanguageBrowserParameter","HTTP_ACCEPT_LANGUAGE").'</td><td>'.$_SERVER["HTTP_ACCEPT_LANGUAGE"].'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentUserLanguage").'</td><td>'.$langs->getDefaultLang().'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("LanguageBrowserParameter","HTTP_ACCEPT_LANGUAGE").'</td><td>'.$_SERVER["HTTP_ACCEPT_LANGUAGE"].'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentUserLanguage").'</td><td>'.$langs->getDefaultLang().'</td></tr>'."\n";
 // Thousands
-$var=!$var;
 $thousand=$langs->transnoentitiesnoconv("SeparatorThousand");
 if ($thousand == 'SeparatorThousand') $thousand=' ';	// ' ' does not work on trans method
 if ($thousand == 'None') $thousand='';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentValueSeparatorThousand").'</td><td>'.($thousand==' '?$langs->transnoentitiesnoconv("Space"):$thousand).'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentValueSeparatorThousand").'</td><td>'.($thousand==' '?$langs->transnoentitiesnoconv("Space"):$thousand).'</td></tr>'."\n";
 // Decimals
-$var=!$var;
 $dec=$langs->transnoentitiesnoconv("SeparatorDecimal");
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentValueSeparatorDecimal").'</td><td>'.$dec.'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentValueSeparatorDecimal").'</td><td>'.$dec.'</td></tr>'."\n";
 // Show results of functions to see if everything works
-$var=!$var;
-print '<tr '.$bc[$var].'><td>&nbsp; => price2num(1233.56+1)</td><td>'.price2num(1233.56+1,'2').'</td></tr>'."\n";
-$var=!$var;
-print "<tr ".$bc[$var].'><td>&nbsp; => price2num('."'1".$thousand."234".$dec."56')</td><td>".price2num("1".$thousand."234".$dec."56",'2')."</td></tr>\n";
+print '<tr class="oddeven"><td>&nbsp; => price2num(1233.56+1)</td><td>'.price2num(1233.56+1,'2').'</td></tr>'."\n";
+print '<tr class="oddeven"><td>&nbsp; => price2num('."'1".$thousand."234".$dec."56')</td><td>".price2num("1".$thousand."234".$dec."56",'2')."</td></tr>\n";
 if (($thousand != ',' && $thousand != '.') || ($thousand != ' '))
 {
-	$var=!$var;
-	print "<tr ".$bc[$var].'><td>&nbsp; => price2num('."'1 234.56')</td><td>".price2num("1 234.56",'2')."</td>";
+	print '<tr class="oddeven"><td>&nbsp; => price2num('."'1 234.56')</td><td>".price2num("1 234.56",'2')."</td>";
 	print "</tr>\n";
 }
-$var=!$var;
-print '<tr '.$bc[$var].'><td>&nbsp; => price(1234.56)</td><td>'.price(1234.56).'</td></tr>'."\n";
+print '<tr class="oddeven"><td>&nbsp; => price(1234.56)</td><td>'.price(1234.56).'</td></tr>'."\n";
 // Timezone
 $txt =$langs->trans("OSTZ").' (variable system TZ): '.(! empty($_ENV["TZ"])?$_ENV["TZ"]:$langs->trans("NotDefined")).'<br>'."\n";
 $txt.=$langs->trans("PHPTZ").' (php.ini date.timezone): '.(ini_get("date.timezone")?ini_get("date.timezone"):$langs->trans("NotDefined")).''."<br>\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 $txt.=$langs->trans("Dolibarr constant MAIN_SERVER_TZ").': '.(empty($conf->global->MAIN_SERVER_TZ)?$langs->trans("NotDefined"):$conf->global->MAIN_SERVER_TZ);
 //$txt.=$langs->trans("YouCanEditPHPTZ"); // deprecated
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
 $a=getServerTimeZoneInt('now');
 $b=getServerTimeZoneInt('winter');
 $c=getServerTimeZoneInt('summer');
@@ -251,19 +226,14 @@ $val.=' &nbsp; &nbsp; &nbsp; '.getServerTimeZoneString();
 $val.=' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': '.($daylight==='unknown'?'unknown':($a==$c?yn($daylight):yn(0).($daylight?'  &nbsp; &nbsp; ('.$langs->trans('YesInSummer').')':'')));
 print $form->textwithtooltip($val,$txt,2,1,img_info(''));
 print '</td></tr>'."\n";	// value defined in http://fr3.php.net/manual/en/timezones.europe.php
-$var=!$var;
-print '<tr '.$bc[$var].'><td>&nbsp; => '.$langs->trans("CurrentHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzserver').'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>&nbsp; => dol_print_date(0,"dayhourtext")</td><td>'.dol_print_date(0,"dayhourtext").'</td>';
-$var=!$var;
-print '<tr '.$bc[$var].'><td>&nbsp; => dol_get_first_day(1970,1,false)</td><td>'.dol_get_first_day(1970,1,false).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,false),'dayhour').')</td>';
-$var=!$var;
-print '<tr '.$bc[$var].'><td>&nbsp; => dol_get_first_day(1970,1,true)</td><td>'.dol_get_first_day(1970,1,true).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,true),'dayhour').')</td>';
+print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("CurrentHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzserver').'</td></tr>'."\n";
+print '<tr class="oddeven"><td>&nbsp; => dol_print_date(0,"dayhourtext")</td><td>'.dol_print_date(0,"dayhourtext").'</td>';
+print '<tr class="oddeven"><td>&nbsp; => dol_get_first_day(1970,1,false)</td><td>'.dol_get_first_day(1970,1,false).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,false),'dayhour').')</td>';
+print '<tr class="oddeven"><td>&nbsp; => dol_get_first_day(1970,1,true)</td><td>'.dol_get_first_day(1970,1,true).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,true),'dayhour').')</td>';
 // Database timezone
 if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
 {
-	$var=!$var;
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MySQLTimeZone").' (database)</td><td>';	// Timezone server base
+	print '<tr class="oddeven"><td>'.$langs->trans("MySQLTimeZone").' (database)</td><td>';	// Timezone server base
 	$sql="SHOW VARIABLES where variable_name = 'system_time_zone'";
 	$resql = $db->query($sql);
 	if ($resql)
@@ -274,9 +244,8 @@ if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
 	print '</td></tr>'."\n";
 }
 // Client
-$var=!$var;
 $tz=(int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst'];
-print '<tr '.$bc[$var].'><td>'.$langs->trans("ClientTZ").'</td><td>'.($tz?($tz>=0?'+':'').$tz:'').' ('.($tz>=0?'+':'').($tz*60*60).')';
+print '<tr class="oddeven"><td>'.$langs->trans("ClientTZ").'</td><td>'.($tz?($tz>=0?'+':'').$tz:'').' ('.($tz>=0?'+':'').($tz*60*60).')';
 print ' &nbsp; &nbsp; &nbsp; '.$_SESSION['dol_tz_string'];
 print ' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': ';
 if ($_SESSION['dol_dst']>0) print yn(1);
@@ -284,19 +253,16 @@ else print yn(0);
 if (! empty($_SESSION['dol_dst_first'])) print ' &nbsp; &nbsp; ('.dol_print_date(dol_stringtotime($_SESSION['dol_dst_first']),'dayhour','gmt').' - '.dol_print_date(dol_stringtotime($_SESSION['dol_dst_second']),'dayhour','gmt').')';
 print '</td></tr>'."\n";
 print '</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>&nbsp; => '.$langs->trans("ClientHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzuser').'</td></tr>'."\n";
+print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("ClientHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzuser').'</td></tr>'."\n";
 
-$var=!$var;
 $filesystemencoding=ini_get("unicode.filesystem_encoding");	// Disponible avec PHP 6.0
-print '<tr '.$bc[$var].'><td>'.$langs->trans("File encoding").' (php.ini unicode.filesystem_encoding)</td><td>'.$filesystemencoding.'</td></tr>'."\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
+print '<tr class="oddeven"><td>'.$langs->trans("File encoding").' (php.ini unicode.filesystem_encoding)</td><td>'.$filesystemencoding.'</td></tr>'."\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 
-$var=!$var;
 $tmp=ini_get("unicode.filesystem_encoding");						// Disponible avec PHP 6.0
 if (empty($tmp) && ! empty($_SERVER["WINDIR"])) $tmp='iso-8859-1';	// By default for windows
 if (empty($tmp)) $tmp='utf-8';										// By default for other
 if (! empty($conf->global->MAIN_FILESYSTEM_ENCODING)) $tmp=$conf->global->MAIN_FILESYSTEM_ENCODING;
-print '<tr '.$bc[$var].'><td>&nbsp; => '.$langs->trans("File encoding").'</td><td>'.$tmp.'</td></tr>'."\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
+print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("File encoding").'</td><td>'.$tmp.'</td></tr>'."\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 
 print '</table>';
 print '</div>';
@@ -384,8 +350,7 @@ foreach($configfileparameters as $key => $value)
 		}
 		if (strpos($newkey, 'separator') !== false && $lastkeyshown == 'separator') continue;
 
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		if (strpos($newkey, 'separator') !== false)
 		{
 			print '<td colspan="3">&nbsp;</td>';
@@ -463,14 +428,12 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	$var=True;
 
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
-		$var=!$var;
 
-		print '<tr '.$bc[$var].'>';
+		print '<tr class="oddeven">';
 		print '<td class="tdoverflow">'.$obj->name.'</td>'."\n";
 		print '<td class="tdoverflow">'.$obj->value.'</td>'."\n";
 		if (empty($conf->multicompany->enabled) || !$user->entity) print '<td align="center" width="80px">'.$obj->entity.'</td>'."\n";	// If superadmin or multicompany disabled

From deb309ab7e5efa787b9e27ad4d59abc67f043f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?= <joseplluis@lliuretic.cat>
Date: Thu, 13 Apr 2017 08:30:48 +0200
Subject: [PATCH 0591/1163] NEW Show local taxes in facture list

Show localtax1 and localtax2 in facture list, only if they are enabled in company config
---
 htdocs/compta/facture/list.php | 57 +++++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index a8cd12c1884..d6e0706b703 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -7,10 +7,11 @@
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2010-2012 Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
- * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
+ * Copyright (C) 2013      Florian Henry         <florian.henry@open-concept.pro>
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2015-2016 Ferran Marcet		<fmarcet@2byte.es>
+ * Copyright (C) 2015      Jean-François Ferry   <jfefe@aternatik.fr>
+ * Copyright (C) 2015-2016 Ferran Marcet         <fmarcet@2byte.es>
+ * Copyright (C) 2017      Josep Lluís Amador    <joseplluis@lliuretic.cat>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -74,6 +75,8 @@ $search_type=GETPOST('search_type','int');
 $search_societe=GETPOST('search_societe','alpha');
 $search_montant_ht=GETPOST('search_montant_ht','alpha');
 $search_montant_vat=GETPOST('search_montant_vat','alpha');
+$search_montant_localtax1=GETPOST('search_montant_localtax1','alpha');
+$search_montant_localtax2=GETPOST('search_montant_localtax2','alpha');
 $search_montant_ttc=GETPOST('search_montant_ttc','alpha');
 $search_status=GETPOST('search_status','int');
 $search_paymentmode=GETPOST('search_paymentmode','int');
@@ -155,6 +158,8 @@ $arrayfields=array(
     'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1),
     'f.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
     'f.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
+    'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj=="1"),
+    'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax2_assuj=="1"),
     'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
     'dynamount_payed'=>array('label'=>$langs->trans("Received"), 'checked'=>0),
     'rtp'=>array('label'=>$langs->trans("Rest"), 'checked'=>0),
@@ -198,6 +203,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter") || GETPOS
     $search_societe='';
     $search_montant_ht='';
     $search_montant_vat='';
+    $search_montant_localtax1='';
+    $search_montant_localtax2='';
     $search_montant_ttc='';
     $search_status='';
     $search_paymentmode='';
@@ -344,6 +351,7 @@ llxHeader('',$langs->trans('CustomersInvoices'),'EN:Customers_Invoices|FR:Factur
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
 $sql.= ' f.rowid as facid, f.facnumber, f.ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.total as total_ht, f.tva as total_vat, f.total_ttc,';
+$sql.= ' f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,';
 $sql.= ' f.datef as df, f.date_lim_reglement as datelimite,';
 $sql.= ' f.paye as paye, f.fk_statut,';
 $sql.= ' f.datec as date_creation, f.tms as date_update,';
@@ -415,6 +423,8 @@ if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdp
 if ($search_company) $sql .= natural_search('s.nom', $search_company);
 if ($search_montant_ht != '') $sql.= natural_search('f.total', $search_montant_ht, 1);
 if ($search_montant_vat != '') $sql.= natural_search('f.tva', $search_montant_vat, 1);
+if ($search_montant_localtax1 != '') $sql.= natural_search('f.localtax1', $search_montant_localtax1, 1);
+if ($search_montant_localtax2 != '') $sql.= natural_search('f.localtax2', $search_montant_localtax2, 1); 
 if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
 if ($search_status != '' && $search_status >= 0)
 {
@@ -478,6 +488,7 @@ $sql.=$hookmanager->resPrint;
 if (! $sall)
 {
     $sql.= ' GROUP BY f.rowid, f.facnumber, ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.total, f.tva, f.total_ttc,';
+    $sql.= ' f.localtax1, f.localtax2,';
     $sql.= ' f.datef, f.date_lim_reglement,';
     $sql.= ' f.paye, f.fk_statut,';
     $sql.= ' f.datec, f.tms,';
@@ -541,6 +552,8 @@ if ($resql)
     if ($search_product_category > 0)   $param.='$search_product_category=' .urlencode($search_product_category);
     if ($search_montant_ht != '')  $param.='&search_montant_ht='.urlencode($search_montant_ht);
     if ($search_montant_vat != '')  $param.='&search_montant_vat='.urlencode($search_montant_vat);
+    if ($search_montant_localtax1 != '')  $param.='&search_montant_localtax1='.urlencode($search_montant_localtax1);
+    if ($search_montant_localtax2 != '')  $param.='&search_montant_localtax2='.urlencode($search_montant_localtax2);
     if ($search_montant_ttc != '') $param.='&search_montant_ttc='.urlencode($search_montant_ttc);
 	if ($search_status != '') $param.='&search_status='.urlencode($search_status);
 	if ($search_paymentmode > 0) $param.='search_paymentmode='.urlencode($search_paymentmode);
@@ -843,6 +856,20 @@ if ($resql)
     	print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
     	print '</td>';
 	}
+	if (! empty($arrayfields['f.total_localtax1']['checked']))
+	{
+    	// Amount
+    	print '<td class="liste_titre" align="right">';
+    	print '<input class="flat" type="text" size="5" name="search_montant_localtax1" value="'.$search_montant_localtax1.'">';
+    	print '</td>';
+	}
+	if (! empty($arrayfields['f.total_localtax2']['checked']))
+	{
+    	// Amount
+    	print '<td class="liste_titre" align="right">';
+    	print '<input class="flat" type="text" size="5" name="search_montant_localtax2" value="'.$search_montant_localtax2.'">';
+    	print '</td>';
+	}
 	if (! empty($arrayfields['f.total_ttc']['checked']))
 	{
     	// Amount
@@ -929,6 +956,8 @@ if ($resql)
     if (! empty($arrayfields['f.fk_mode_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'],$_SERVER["PHP_SELF"],"f.fk_mode_reglement","",$param,"",$sortfield,$sortorder);
     if (! empty($arrayfields['f.total_ht']['checked']))           print_liste_field_titre($arrayfields['f.total_ht']['label'],$_SERVER['PHP_SELF'],'f.total','',$param,'align="right"',$sortfield,$sortorder);
     if (! empty($arrayfields['f.total_vat']['checked']))          print_liste_field_titre($arrayfields['f.total_vat']['label'],$_SERVER['PHP_SELF'],'f.tva','',$param,'align="right"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.total_localtax1']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax1']['label'],$_SERVER['PHP_SELF'],'f.localtax1','',$param,'align="right"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.total_localtax2']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax2']['label'],$_SERVER['PHP_SELF'],'f.localtax2','',$param,'align="right"',$sortfield,$sortorder);
     if (! empty($arrayfields['f.total_ttc']['checked']))          print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],'f.total_ttc','',$param,'align="right"',$sortfield,$sortorder);
     if (! empty($arrayfields['dynamount_payed']['checked']))      print_liste_field_titre($arrayfields['dynamount_payed']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
     if (! empty($arrayfields['rtp']['checked']))                  print_liste_field_titre($arrayfields['rtp']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
@@ -1120,6 +1149,22 @@ if ($resql)
     		    if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
     		    $totalarray['totalvat'] += $obj->total_vat;
             }
+            // Amount LocalTax1
+            if (! empty($arrayfields['f.total_localtax1']['checked']))
+            {
+                print '<td align="right">'.price($obj->total_localtax1)."</td>\n";
+                if (! $i) $totalarray['nbfield']++;
+    		    if (! $i) $totalarray['totallocaltax1field']=$totalarray['nbfield'];
+    		    $totalarray['totallocaltax1'] += $obj->total_localtax1;
+            }
+            // Amount LocalTax2
+            if (! empty($arrayfields['f.total_localtax2']['checked']))
+            {
+                print '<td align="right">'.price($obj->total_localtax2)."</td>\n";
+                if (! $i) $totalarray['nbfield']++;
+    		    if (! $i) $totalarray['totallocaltax2field']=$totalarray['nbfield'];
+    		    $totalarray['totallocaltax2'] += $obj->total_localtax2;
+            }
             // Amount TTC
             if (! empty($arrayfields['f.total_ttc']['checked']))
             {
@@ -1211,6 +1256,8 @@ if ($resql)
     	// Show total line
     	if (isset($totalarray['totalhtfield'])
 	   || isset($totalarray['totalvatfield'])
+	   || isset($totalarray['totallocaltax1field'])
+	   || isset($totalarray['totallocaltax2field'])
 	   || isset($totalarray['totalttcfield'])
 	   || isset($totalarray['totalamfield'])
 	   || isset($totalarray['totalrtpfield'])
@@ -1228,9 +1275,11 @@ if ($resql)
     	       }
     		   elseif ($totalarray['totalhtfield'] == $i)  print '<td align="right">'.price($totalarray['totalht']).'</td>';
     		   elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
+    		   elseif ($totalarray['totallocaltax1field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax1']).'</td>';
+    		   elseif ($totalarray['totallocaltax2field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax2']).'</td>';
     		   elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
     		   elseif ($totalarray['totalamfield'] == $i)  print '<td align="right">'.price($totalarray['totalam']).'</td>';
-			   elseif ($totalarray['totalrtpfield'] == $i)  print '<td align="right">'.price($totalarray['totalrtp']).'</td>';
+    		   elseif ($totalarray['totalrtpfield'] == $i)  print '<td align="right">'.price($totalarray['totalrtp']).'</td>';
     		   else print '<td></td>';
     		}
     		print '</tr>';

From e67ae3665e6d2a5daf660fd1376215099688d371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?= <joseplluis@lliuretic.cat>
Date: Thu, 13 Apr 2017 09:12:01 +0200
Subject: [PATCH 0592/1163] NEW Show local taxes in supplier facture list

Show localtax1 and localtax2 in supplier facture list, only if they are enabled in company config
---
 htdocs/fourn/facture/list.php | 60 +++++++++++++++++++++++++++++++----
 1 file changed, 54 insertions(+), 6 deletions(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 1eb2dfaeb4a..1aecc895dfc 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -2,13 +2,14 @@
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2013	   Philippe Grand		<philippe.grand@atoo-net.com>
- * Copyright (C) 2013	   Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013	   Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013	   Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2015-2007 Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015 	   Abbes Bahfir 	<bafbes@gmail.com>
- * Copyright (C) 2015-2016 Ferran Marcet		<fmarcet@2byte.es>
+ * Copyright (C) 2015-2007 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2015 	   Abbes Bahfir         <bafbes@gmail.com>
+ * Copyright (C) 2015-2016 Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2017      Josep Lluís Amador   <joseplluis@lliuretic.cat>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -73,6 +74,8 @@ $search_project=GETPOST('search_project','alpha');
 $search_societe=GETPOST('search_societe','alpha');
 $search_montant_ht=GETPOST('search_montant_ht','alpha');
 $search_montant_vat=GETPOST('search_montant_vat','alpha');
+$search_montant_localtax1=GETPOST('search_montant_localtax1','alpha');
+$search_montant_localtax2=GETPOST('search_montant_localtax2','alpha');
 $search_montant_ttc=GETPOST('search_montant_ttc','alpha');
 $search_status=GETPOST('search_status','int');
 $search_paymentmode=GETPOST('search_paymentmode','int');
@@ -157,6 +160,8 @@ $arrayfields=array(
     'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1),
     'f.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
     'f.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
+    'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj=="1"),
+    'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax2_assuj=="1"),
     'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
     'f.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
     'f.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
@@ -203,6 +208,8 @@ if (empty($reshook))
         $search_amount_all_tax="";
         $search_montant_ht='';
         $search_montant_vat='';
+        $search_montant_localtax1='';
+        $search_montant_localtax2='';
         $search_montant_ttc='';
         $search_status='';
         $search_paymentmode='';
@@ -251,6 +258,7 @@ $sql = "SELECT";
 if ($search_all || $search_product_category > 0) $sql = 'SELECT DISTINCT';
 $sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.datef, f.date_lim_reglement as datelimite, f.fk_mode_reglement,";
 $sql.= " f.total_ht, f.total_ttc, f.total_tva as total_vat, f.paye as paye, f.fk_statut as fk_statut, f.libelle as label, f.datec as date_creation, f.tms as date_update,";
+$sql.= " f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,";
 $sql.= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client,";
 $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
@@ -304,6 +312,8 @@ if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdp
 if ($search_company) $sql .= natural_search('s.nom', $search_company);
 if ($search_montant_ht != '') $sql.= natural_search('f.total_ht', $search_montant_ht, 1);
 if ($search_montant_vat != '') $sql.= natural_search('f.total_tva', $search_montant_vat, 1);
+if ($search_montant_localtax1 != '') $sql.= natural_search('f.localtax1', $search_montant_localtax1, 1);
+if ($search_montant_localtax2 != '') $sql.= natural_search('f.localtax2', $search_montant_localtax2, 1);
 if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
 if ($search_status != '' && $search_status >= 0) $sql.= " AND f.fk_statut = ".$db->escape($search_status);
 if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode."";
@@ -412,6 +422,8 @@ if ($resql)
 	if ($search_company)      	$param.='&search_company='.urlencode($search_company);
     if ($search_montant_ht != '')  $param.='&search_montant_ht='.urlencode($search_montant_ht);
     if ($search_montant_vat != '')  $param.='&search_montant_vat='.urlencode($search_montant_vat);
+    if ($search_montant_localtax1 != '')  $param.='&search_montant_localtax1='.urlencode($search_montant_localtax1);
+    if ($search_montant_localtax2 != '')  $param.='&search_montant_localtax2='.urlencode($search_montant_localtax2);
     if ($search_montant_ttc != '') $param.='&search_montant_ttc='.urlencode($search_montant_ttc);
 	if ($search_amount_no_tax)	$param.='&search_amount_no_tax='.urlencode($search_amount_no_tax);
 	if ($search_amount_all_tax)	$param.='&search_amount_all_tax='.urlencode($search_amount_all_tax);
@@ -736,6 +748,20 @@ if ($resql)
 	    print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.$search_montant_vat.'">';
 	    print '</td>';
 	}
+	if (! empty($arrayfields['f.total_localtax1']['checked']))
+	{
+	    // Amount
+	    print '<td class="liste_titre" align="right">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_localtax1" value="'.$search_montant_localtax1.'">';
+	    print '</td>';
+	}
+	if (! empty($arrayfields['f.total_localtax2']['checked']))
+	{
+	    // Amount
+ 	    print '<td class="liste_titre" align="right">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_localtax2" value="'.$search_montant_localtax2.'">';
+	    print '</td>';
+	}
 	if (! empty($arrayfields['f.total_ttc']['checked']))
 	{
 	    // Amount
@@ -814,6 +840,8 @@ if ($resql)
 	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'],$_SERVER["PHP_SELF"],"f.fk_mode_reglement","",$param,"",$sortfield,$sortorder);
 	if (! empty($arrayfields['f.total_ht']['checked']))           print_liste_field_titre($arrayfields['f.total_ht']['label'],$_SERVER['PHP_SELF'],'f.total','',$param,'align="right"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.total_vat']['checked']))          print_liste_field_titre($arrayfields['f.total_vat']['label'],$_SERVER['PHP_SELF'],'f.tva','',$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.total_localtax1']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax1']['label'],$_SERVER['PHP_SELF'],'f.localtax1','',$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['f.total_localtax2']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax2']['label'],$_SERVER['PHP_SELF'],'f.localtax2','',$param,'align="right"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.total_ttc']['checked']))          print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],'f.total_ttc','',$param,'align="right"',$sortfield,$sortorder);
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
@@ -1016,6 +1044,22 @@ if ($resql)
     		    if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
     		    $totalarray['totalvat'] += $obj->total_vat;
             }
+            // Amount LocalTax1
+            if (! empty($arrayfields['f.total_localtax1']['checked']))
+            {
+                print '<td align="right">'.price($obj->total_localtax1)."</td>\n";
+                if (! $i) $totalarray['nbfield']++;
+    		    if (! $i) $totalarray['totallocaltax1field']=$totalarray['nbfield'];
+    		    $totalarray['totallocaltax1'] += $obj->total_localtax1;
+            }
+            // Amount LocalTax2
+            if (! empty($arrayfields['f.total_localtax2']['checked']))
+            {
+                print '<td align="right">'.price($obj->total_localtax2)."</td>\n";
+                if (! $i) $totalarray['nbfield']++;
+    		    if (! $i) $totalarray['totallocaltax2field']=$totalarray['nbfield'];
+    		    $totalarray['totallocaltax2'] += $obj->total_localtax2;
+            }
             // Amount TTC
             if (! empty($arrayfields['f.total_ttc']['checked']))
             {
@@ -1109,6 +1153,8 @@ if ($resql)
 	    // Show total line
     	if (isset($totalarray['totalhtfield'])
  	   || isset($totalarray['totalvatfield'])
+ 	   || isset($totalarray['totallocaltax1field'])
+ 	   || isset($totalarray['totallocaltax2field'])
  	   || isset($totalarray['totalttcfield'])
  	   || isset($totalarray['totalamfield'])
  	   || isset($totalarray['totalrtpfield'])
@@ -1126,9 +1172,11 @@ if ($resql)
     	       }
     		   elseif ($totalarray['totalhtfield'] == $i)  print '<td align="right">'.price($totalarray['totalht']).'</td>';
     		   elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
+    		   elseif ($totalarray['totallocaltax1field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax1']).'</td>'; 
+    		   elseif ($totalarray['totallocaltax2field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax2']).'</td>';
     		   elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
     		   elseif ($totalarray['totalamfield'] == $i)  print '<td align="right">'.price($totalarray['totalam']).'</td>';
-			   elseif ($totalarray['totalrtpfield'] == $i)  print '<td align="right">'.price($totalarray['totalrtp']).'</td>';
+    		   elseif ($totalarray['totalrtpfield'] == $i)  print '<td align="right">'.price($totalarray['totalrtp']).'</td>';
     		   else print '<td></td>';
     		}
     		print '</tr>';

From 3e9ccc186aec57c7a96dcc8abf2979818df52a35 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 Apr 2017 19:30:01 +0200
Subject: [PATCH 0593/1163] NEW Small PDF template for products

---
 htdocs/commande/card.php                      |   5 -
 htdocs/core/class/html.form.class.php         |   2 +-
 htdocs/core/class/html.formfile.class.php     |   6 +-
 htdocs/core/lib/files.lib.php                 |   6 +-
 .../doc/doc_generic_product_odt.modules.php   |   2 +-
 .../product/doc/pdf_standard.modules.php      | 851 ++++++++++++++++++
 htdocs/fichinter/card.php                     |  36 +-
 htdocs/langs/en_US/products.lang              |   2 +
 htdocs/product/admin/product.php              |  54 +-
 htdocs/product/admin/product_extrafields.php  |   2 +-
 htdocs/product/card.php                       | 142 +--
 htdocs/product/class/product.class.php        |   1 +
 htdocs/theme/eldy/img/statut3.png             | Bin 684 -> 639 bytes
 htdocs/theme/eldy/img/statut4.png             | Bin 598 -> 476 bytes
 14 files changed, 953 insertions(+), 156 deletions(-)
 create mode 100644 htdocs/core/modules/product/doc/pdf_standard.modules.php

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 01a33e550a2..e369a1a7217 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1255,10 +1255,6 @@ if (empty($reshook))
     include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 
-	/*
-	 * Send mail
-	 */
-
 	// Actions to send emails
 	$actiontypecode='AC_COM';
 	$trigger_name='ORDER_SENTBYMAIL';
@@ -2589,7 +2585,6 @@ if ($action == 'create' && $user->rights->commande->creer)
 			print '<a name="builddoc"></a>'; // ancre
 			// Documents
 			$comref = dol_sanitizeFileName($object->ref);
-			$file = $conf->commande->dir_output . '/' . $comref . '/' . $comref . '.pdf';
 			$relativepath = $comref . '/' . $comref . '.pdf';
 			$filedir = $conf->commande->dir_output . '/' . $comref;
 			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 35edc1178dc..939d8300661 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3406,7 +3406,7 @@ class Form
 		    dol_syslog(__METHOD__ . ': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
 		}
 
-		if ($type == Categorie::TYPE_BANK_LINE)
+		if ($type === Categorie::TYPE_BANK_LINE)
 		{
 		    // TODO Move this into common category feature
 		    $categids=array();
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index a7a9221babc..2af32bf9be6 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -775,9 +775,7 @@ class FormFile
                     
                 foreach($link_list as $file)
                 {
-                    $var=!$var;
-                    
-                    $out.= "<tr ".$bc[$var].">";
+                    $out.='<tr class="oddeven">';
                     $out.='<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
                     $out.='<a data-ajax="false" href="' . $link->url . '" target="_blank">';
                     $out.=$file->label;
@@ -794,7 +792,7 @@ class FormFile
             
 		 	if (count($file_list) == 0 && count($link_list) == 0 && $headershown)
             {
-	        	$out.='<tr '.$bc[0].'><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+	        	$out.='<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     	    }
 
         }
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 99bf8848d99..41cec2f06a3 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1588,7 +1588,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	if (empty($refname)) $refname=basename(dirname($original_file)."/");
 
 	$relative_original_file = $original_file;
-	
+
 	// Wrapping for some images
 	if (($modulepart == 'mycompany' || $modulepart == 'companylogo') && !empty($conf->mycompany->dir_output))
 	{
@@ -1683,13 +1683,13 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 		if ($fuser->rights->produit->lire || $fuser->rights->service->lire) $accessallowed=1;
 		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
 	}
-	// Wrapping for products or services
+	// Wrapping for taxes
 	elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
 	{
 		if ($fuser->rights->tax->charges->lire) $accessallowed=1;
 		$original_file=$conf->tax->dir_output.'/'.$original_file;
 	}
-	// Wrapping for products or services
+	// Wrapping for events
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
 		if ($fuser->rights->agenda->myactions->read) $accessallowed=1;
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index 3341ad20f08..811a99d5b2a 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -20,7 +20,7 @@
 /**
  *	\file       htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
  *	\ingroup    societe
- *	\brief      File of class to build ODT documents for third parties
+ *	\brief      File of class to build ODT documents for products/services
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
new file mode 100644
index 00000000000..ec0ed850df2
--- /dev/null
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -0,0 +1,851 @@
+<?php
+/* Copyright (C) 2017 	Laurent Destailleur <eldy@products.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *	\file       htdocs/core/modules/product/doc/pdf_standard.modules.php
+ *	\ingroup    societe
+ *	\brief      File of class to build PDF documents for products/services
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+
+/**
+ *	Class to build documents using ODF templates generator
+ */
+class pdf_standard extends ModelePDFProduct
+{
+    /**
+     * @var DoliDb Database handler
+     */
+    public $db;
+	
+	/**
+     * @var string model name
+     */
+    public $name;
+	
+	/**
+     * @var string model description (short text)
+     */
+    public $description;
+	
+	/**
+     * @var string document type
+     */
+    public $type;
+	
+	/**
+     * @var array() Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.3 = array(5, 3)
+     */
+	public $phpmin = array(5, 2); 
+	
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
+	public $version = 'dolibarr';
+
+    public $page_largeur;
+    public $page_hauteur;
+    public $format;
+	public $marge_gauche;
+	public $marge_droite;
+	public $marge_haute;
+	public $marge_basse;
+
+    public $emetteur;	// Objet societe qui emet
+    
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf,$langs,$mysoc;
+
+		$langs->load("main");
+		$langs->load("companies");
+
+		$this->db = $db;
+		$this->name = "PDF template";
+		$this->description = $langs->trans("DocumentModelPdf");
+
+		// Dimension page pour format A4
+		$this->type = 'pdf';
+		$formatarray=pdf_getFormat();
+		$this->page_largeur = $formatarray['width'];
+		$this->page_hauteur = $formatarray['height'];
+		$this->format = array($this->page_largeur,$this->page_hauteur);
+		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+		
+		$this->option_logo = 1;                    // Affiche logo
+		$this->option_tva = 0;                     // Gere option tva PRODUCT_TVAOPTION
+		$this->option_modereg = 0;                 // Affiche mode reglement
+		$this->option_condreg = 0;                 // Affiche conditions reglement
+		$this->option_codeproduitservice = 0;      // Affiche code produit-service
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
+		$this->option_escompte = 0;                // Affiche si il y a eu escompte
+		$this->option_credit_note = 0;             // Support credit notes
+		$this->option_freetext = 1;				   // Support add of a personalised text
+		$this->option_draft_watermark = 1;		   // Support add of a watermark on drafts
+
+		// Recupere emetteur
+		$this->emetteur=$mysoc;
+		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+	}
+
+
+	/**
+	 *	Function to build a document on disk using the generic odt module.
+	 *
+	 *	@param		Product		$object				Object source to build document
+	 *	@param		Translate	$outputlangs		Lang output object
+	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *	@return		int         					1 if OK, <=0 if KO
+	 */
+	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	{
+		global $user,$langs,$conf,$mysoc,$db,$hookmanager;
+
+		if (! is_object($outputlangs)) $outputlangs=$langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+
+		$outputlangs->load("main");
+		$outputlangs->load("dict");
+		$outputlangs->load("companies");
+		$outputlangs->load("bills");
+		$outputlangs->load("products");
+		$outputlangs->load("orders");
+		$outputlangs->load("deliveries");
+
+		$nblignes = count($object->lines);
+    
+		if ($conf->produit->dir_output)
+		{
+		    // Definition of $dir and $file
+			if ($object->specimen)
+			{
+				$dir = $conf->produit->dir_output;
+				$file = $dir . "/SPECIMEN.pdf";
+			}
+			else
+			{
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->produit->dir_output . "/" . $objectref;
+				$file = $dir . "/" . $objectref . ".pdf";
+			}
+		    
+			$productFournisseur = new ProductFournisseur($this->db);
+			$supplierprices = $productFournisseur->list_product_fournisseur_price($object->id);
+			$object->supplierprices = $supplierprices;
+
+			if (! file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					return -1;
+				}
+			}
+
+			if (file_exists($dir))
+			{
+							// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+				// Create pdf instance
+				$pdf=pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1,0);
+				
+				$heightforinfotot = 40;	// Height reserved to output the info and total part
+		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
+	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+                
+                if (class_exists('TCPDF'))
+                {
+                    $pdf->setPrintHeader(false);
+                    $pdf->setPrintFooter(false);
+                }
+                $pdf->SetFont(pdf_getPDFFont($outputlangs));
+                // Set path to the background PDF File
+                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                {
+                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+                    $tplidx = $pdf->importPage(1);
+                }
+
+				$pdf->Open();
+				$pagenb=0;
+				$pdf->SetDrawColor(128,128,128);
+
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("Order"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+
+
+				// New page
+				$pdf->AddPage();
+				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				$pagenb++;
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
+				$pdf->SetFont('','', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, '');		// Set interline to 3
+				$pdf->SetTextColor(0,0,0);
+
+
+				$tab_top = 42;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+				$tab_height = 130;
+				$tab_height_newpage = 150;
+
+				//
+				$pdf->SetFont('','B', $default_font_size);
+				$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $tab_top, dol_htmlentitiesbr($object->label), 0, 1);
+				$nexY = $pdf->GetY();
+				
+				$pdf->SetFont('','', $default_font_size);
+				$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, dol_htmlentitiesbr($object->description), 0, 1);
+				$nexY = $pdf->GetY();
+
+				$nexY+=5;
+
+				if ($object->weight)
+				{
+				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Weight").': '.dol_htmlentitiesbr($object->weight), 0, 1);
+				    $nexY = $pdf->GetY();
+				}
+				if ($object->weight)
+				{
+				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.$object->length.'x'.$object->width.'x'.$object->height, 0, 1);
+				    $nexY = $pdf->GetY();
+				}
+				if ($object->surface)
+				{
+				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Area").': '.dol_htmlentitiesbr($object->surface), 0, 1);
+				    $nexY = $pdf->GetY();
+				}
+				if ($object->volume)
+				{
+    				$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume), 0, 1);
+	   			    $nexY = $pdf->GetY();
+				}
+
+				
+				// Affiche notes
+				// TODO There is no public note on product yet
+				$notetoshow=empty($object->note_public)?'':$object->note_public;
+				if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
+				{
+					// Get first sale rep
+					if (is_object($object->thirdparty))
+					{
+						$salereparray=$object->thirdparty->getSalesRepresentatives($user);
+						$salerepobj=new User($this->db);
+						$salerepobj->fetch($salereparray[0]['id']);
+						if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+					}
+				}
+				if ($notetoshow)
+				{
+					$tab_top = 88;
+
+					$pdf->SetFont('','', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					$nexY = $pdf->GetY();
+					$height_note=$nexY-$tab_top;
+
+					// Rect prend une longueur en 3eme param
+					$pdf->SetDrawColor(192,192,192);
+					$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $nexY+6;
+				}
+				else
+				{
+					$height_note=0;
+				}
+
+				$iniY = $tab_top + 7;
+				$curY = $tab_top + 7;
+				$nexY = $tab_top + 7;
+
+				// Loop on each lines
+				/*
+				for ($i = 0 ; $i < $nblignes ; $i++)
+				{
+					$curY = $nexY;
+					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+					$pdf->SetTextColor(0,0,0);
+
+					$pdf->setTopMargin($tab_top_newpage);
+					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
+					$pageposbefore=$pdf->getPage();
+
+					// Description of product line
+					$curX = $this->posxdesc-1;
+
+					$showpricebeforepagebreak=1;
+
+					$pdf->startTransaction();
+					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
+					$pageposafter=$pdf->getPage();
+					if ($pageposafter > $pageposbefore)	// There is a pagebreak
+					{
+						$pdf->rollbackTransaction(true);
+						$pageposafter=$pageposbefore;
+						//print $pageposafter.'-'.$pageposbefore;exit;
+						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc);
+						$pageposafter=$pdf->getPage();
+						$posyafter=$pdf->GetY();
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+						{
+							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+							{
+								$pdf->AddPage('','',true);
+								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								$pdf->setPage($pageposafter+1);
+							}
+						}
+						else
+						{
+							// We found a page break
+							$showpricebeforepagebreak=0;
+						}
+					}
+					else	// No pagebreak
+					{
+						$pdf->commitTransaction();
+					}
+
+					$nexY = $pdf->GetY();
+					$pageposafter=$pdf->getPage();
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+
+					// We suppose that a too long description is moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+					}
+
+					$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
+
+					// VAT Rate
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+					{
+						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
+						$pdf->SetXY($this->posxtva, $curY);
+						$pdf->MultiCell($this->posxup-$this->posxtva-0.8, 3, $vat_rate, 0, 'R');
+					}
+
+					// Unit price before discount
+					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
+					$pdf->SetXY($this->posxup, $curY);
+					$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
+
+					// Quantity
+					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+					$pdf->SetXY($this->posxqty, $curY);
+					// Enough for 6 chars
+					if($conf->global->PRODUCT_USE_UNITS)
+					{
+						$pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $qty, 0, 'R');
+					}
+					else
+					{
+						$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R');
+					}
+
+					// Unit
+					if($conf->global->PRODUCT_USE_UNITS)
+					{
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$pdf->SetXY($this->posxunit, $curY);
+						$pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L');
+					}
+
+					// Discount on line
+					$pdf->SetXY($this->posxdiscount, $curY);
+					if ($object->lines[$i]->remise_percent)
+					{
+						$pdf->SetXY($this->posxdiscount-2, $curY);
+						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+						$pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
+					}
+
+					// Total HT line
+					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
+					$pdf->SetXY($this->postotalht, $curY);
+					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+
+					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
+					else $tvaligne=$object->lines[$i]->total_tva;
+					
+					$localtax1ligne=$object->lines[$i]->total_localtax1;
+					$localtax2ligne=$object->lines[$i]->total_localtax2;
+					$localtax1_rate=$object->lines[$i]->localtax1_tx;
+					$localtax2_rate=$object->lines[$i]->localtax2_tx;
+					$localtax1_type=$object->lines[$i]->localtax1_type;
+					$localtax2_type=$object->lines[$i]->localtax2_type;
+
+					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
+					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
+					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+
+					$vatrate=(string) $object->lines[$i]->tva_tx;
+
+					// Retrieve type from database for backward compatibility with old records
+					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
+					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
+					{
+						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
+						$localtax1_type = $localtaxtmp_array[0];
+						$localtax2_type = $localtaxtmp_array[2];
+					}
+
+				    // retrieve global local tax
+					if ($localtax1_type && $localtax1ligne != 0)
+						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+					if ($localtax2_type && $localtax2ligne != 0)
+						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
+					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]=0;
+					$this->tva[$vatrate] += $tvaligne;
+
+					// Add line
+					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					{
+						$pdf->setPage($pageposafter);
+						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
+					$nexY+=2;    // Passe espace entre les lignes
+
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter)
+					{
+						$pdf->setPage($pagenb);
+						if ($pagenb == 1)
+						{
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
+						}
+						else
+						{
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+						}
+						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$pagenb++;
+						$pdf->setPage($pagenb);
+						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+					{
+						if ($pagenb == 1)
+						{
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
+						}
+						else
+						{
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+						}
+						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						// New page
+						$pdf->AddPage();
+						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						$pagenb++;
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+				}
+
+				// Show square
+				if ($pagenb == 1)
+				{
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
+					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+				else
+				{
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+                */
+					
+				// Affiche zone infos
+				//$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
+
+				// Affiche zone totaux
+				//$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+
+				// Pied de page
+				$this->_pagefoot($pdf,$object,$outputlangs);
+				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+
+				$pdf->Close();
+
+				$pdf->Output($file,'F');
+
+				// Add pdfgeneration hook
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				if (! empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				return 1;   // Pas d'erreur
+			}
+			else
+			{
+				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error=$langs->trans("ErrorConstantNotDefined","PRODUCT_OUTPUTDIR");
+			return 0;
+		}
+
+		return -1;
+	}
+
+	
+	/**
+	 *   Show table for lines
+	 *
+	 *   @param		TCPDF		$pdf     		Object PDF
+	 *   @param		string		$tab_top		Top position of table
+	 *   @param		string		$tab_height		Height of table (rectangle)
+	 *   @param		int			$nexY			Y (not used)
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
+	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		string		$currency		Currency code
+	 *   @return	void
+	 */
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
+	{
+	    global $conf;
+	
+	    // Force to disable hidetop and hidebottom
+	    $hidebottom=0;
+	    if ($hidetop) $hidetop=-1;
+	
+	    $currency = !empty($currency) ? $currency : $conf->currency;
+	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+	
+	    // Amount in (at tab_top - 1)
+	    $pdf->SetTextColor(0,0,0);
+	    $pdf->SetFont('','', $default_font_size - 2);
+	
+	    if (empty($hidetop))
+	    {
+	        $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
+	        $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
+	        $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+	
+	        //$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+	        if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+	    }
+	
+	    $pdf->SetDrawColor(128,128,128);
+	    $pdf->SetFont('','', $default_font_size - 1);
+	
+	    // Output Rect
+	    $this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
+	
+	    if (empty($hidetop))
+	    {
+	        $pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
+	
+	        $pdf->SetXY($this->posxdesc-1, $tab_top+1);
+	        $pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
+	    }
+	
+	    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+	    {
+	        $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+	        if (empty($hidetop))
+	        {
+	            $pdf->SetXY($this->posxtva-3, $tab_top+1);
+	            $pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
+	        }
+	    }
+	
+	    $pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+	    if (empty($hidetop))
+	    {
+	        $pdf->SetXY($this->posxup-1, $tab_top+1);
+	        $pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
+	    }
+	
+	    $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+	    if (empty($hidetop))
+	    {
+	        $pdf->SetXY($this->posxqty-1, $tab_top+1);
+	        if($conf->global->PRODUCT_USE_UNITS)
+	        {
+	            $pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+	        }
+	        else
+	        {
+	            $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+	        }
+	    }
+	
+	    if($conf->global->PRODUCT_USE_UNITS) {
+	        $pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
+	        if (empty($hidetop)) {
+	            $pdf->SetXY($this->posxunit - 1, $tab_top + 1);
+	            $pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '',
+	                'C');
+	        }
+	    }
+	
+	    $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+	    if (empty($hidetop))
+	    {
+	        if ($this->atleastonediscount)
+	        {
+	            $pdf->SetXY($this->posxdiscount-1, $tab_top+1);
+	            $pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
+	        }
+	    }
+	
+	    if ($this->atleastonediscount)
+	    {
+	        $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+	    }
+	    if (empty($hidetop))
+	    {
+	        $pdf->SetXY($this->postotalht-1, $tab_top+1);
+	        $pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHT"),'','C');
+	    }
+	}
+	
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	TCPDF		$pdf     		Object PDF
+	 *  @param  Object		$object     	Object to show
+	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param	string		$titlekey		Translation key to show as title of document
+	 *  @return	void
+	 */
+	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey="")
+	{
+	    global $conf,$langs,$hookmanager;
+	
+	    $outputlangs->load("main");
+	    $outputlangs->load("bills");
+	    $outputlangs->load("propal");
+	    $outputlangs->load("companies");
+	    $outputlangs->load("orders");
+	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+	
+	    if ($object->type == 1) $titlekey='ServiceSheet';
+	    else $titlekey='ProductSheet';
+	        
+	    pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+	
+	    // Show Draft Watermark
+	    if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
+	    {
+	        pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
+	    }
+	
+	    $pdf->SetTextColor(0,0,60);
+	    $pdf->SetFont('','B', $default_font_size + 3);
+	
+	    $posy=$this->marge_haute;
+	    $posx=$this->page_largeur-$this->marge_droite-100;
+	
+	    $pdf->SetXY($this->marge_gauche,$posy);
+	
+	    // Logo
+	    $logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+	    if ($this->emetteur->logo)
+	    {
+	        if (is_readable($logo))
+	        {
+	            $height=pdf_getHeightForLogo($logo);
+	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+	        }
+	        else
+	        {
+	            $pdf->SetTextColor(200,0,0);
+	            $pdf->SetFont('','B', $default_font_size -2);
+	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+	        }
+	    }
+	    else
+	    {
+	        $text=$this->emetteur->name;
+	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+	    }
+	
+	    $pdf->SetFont('','B', $default_font_size + 3);
+	    $pdf->SetXY($posx,$posy);
+	    $pdf->SetTextColor(0,0,60);
+	    $title=$outputlangs->transnoentities($titlekey);
+	    $pdf->MultiCell(100, 3, $title, '', 'R');
+	
+	    $pdf->SetFont('','B',$default_font_size);
+	
+	    $posy+=5;
+	    $pdf->SetXY($posx,$posy);
+	    $pdf->SetTextColor(0,0,60);
+	    $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+	
+	    $posy+=1;
+	    $pdf->SetFont('','', $default_font_size - 1);
+	
+	    /*if ($object->ref_client)
+	    {
+	        $posy+=5;
+	        $pdf->SetXY($posx,$posy);
+	        $pdf->SetTextColor(0,0,60);
+	        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+	    }*/
+	
+	    /*$posy+=4;
+	    $pdf->SetXY($posx,$posy);
+	    $pdf->SetTextColor(0,0,60);
+	    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R');
+	    */
+	    
+	    // Get contact
+	    /*
+	    if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
+	    {
+	        $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+	        if (count($arrayidcontact) > 0)
+	        {
+	            $usertmp=new User($this->db);
+	            $usertmp->fetch($arrayidcontact[0]);
+	            $posy+=4;
+	            $pdf->SetXY($posx,$posy);
+	            $pdf->SetTextColor(0,0,60);
+	            $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+	        }
+	    }*/
+	
+	    $posy+=2;
+	
+	    // Show list of linked objects
+	    $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+	
+	    if ($showaddress)
+	    {
+	        /*
+	        // Sender properties
+	        $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
+	
+	        // Show sender
+	        $posy=42;
+	        $posx=$this->marge_gauche;
+	        if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+	        $hautcadre=40;
+	
+	        // Show sender frame
+	        $pdf->SetTextColor(0,0,0);
+	        $pdf->SetFont('','', $default_font_size - 2);
+	        $pdf->SetXY($posx,$posy-5);
+	        $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+	        $pdf->SetXY($posx,$posy);
+	        $pdf->SetFillColor(230,230,230);
+	        $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+	        $pdf->SetTextColor(0,0,60);
+	
+	        // Show sender name
+	        $pdf->SetXY($posx+2,$posy+3);
+	        $pdf->SetFont('','B', $default_font_size);
+	        $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+	        $posy=$pdf->getY();
+	
+	        // Show sender information
+	        $pdf->SetXY($posx+2,$posy);
+	        $pdf->SetFont('','', $default_font_size - 1);
+	        $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+	        */
+	    }
+	
+	    $pdf->SetTextColor(0,0,0);
+	}
+	
+	/**
+	 *   	Show footer of page. Need this->emetteur object
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
+	 * 		@param	Object		$object				Object to show
+	 *      @param	Translate	$outputlangs		Object lang for output
+	 *      @param	int			$hidefreetext		1=Hide free text
+	 *      @return	int								Return height of bottom margin including footer text
+	 */
+	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	{
+	    global $conf;
+	    $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+	    return pdf_pagefoot($pdf,$outputlangs,'PRODUCT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+	}
+	
+}
+
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index cd10e704d90..e5bfa57d2f7 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1400,9 +1400,9 @@ else if ($id > 0 || ! empty($ref))
 						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=ask_deleteline&amp;line_id='.$objp->rowid.'">';
 						print img_delete();
 						print '</a></td>';
+						print '<td align="center">';
 						if ($num > 1)
 						{
-							print '<td align="center">';
 							if ($i > 0)
 							{
 								print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=up&amp;line_id='.$objp->rowid.'">';
@@ -1415,8 +1415,8 @@ else if ($id > 0 || ! empty($ref))
 								print img_down();
 								print '</a>';
 							}
-							print '</td>';
 						}
+						print '</td>';
 					}
 					else
 					{
@@ -1441,7 +1441,7 @@ else if ($id > 0 || ! empty($ref))
 				// Line in update mode
 				if ($object->statut == 0 && $action == 'editline' && $user->rights->ficheinter->creer && GETPOST('line_id','int') == $objp->rowid)
 				{
-					print '<tr '.$bc[$var].'>';
+					print '<tr class="oddeven">';
 					print '<td>';
 					print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
 
@@ -1490,21 +1490,21 @@ else if ($id > 0 || ! empty($ref))
 			// Add new line
 			if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline' && empty($conf->global->FICHINTER_DISABLE_DETAILS))
 			{
-				if (! $num) print '<br><table class="noborder" width="100%">';
+				if (! $num) 
+				{
+				    print '<br><table class="noborder" width="100%">';
 
-				print '<tr class="liste_titre">';
-				print '<td>';
-				print '<a name="add"></a>'; // ancre
-				print $langs->trans('Description').'</td>';
-				print '<td align="center">'.$langs->trans('Date').'</td>';
-				print '<td align="right">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION)?$langs->trans('Duration'):'').'</td>';
-
-				print '<td colspan="4">&nbsp;</td>';
-				print "</tr>\n";
-
-				$var=true;
-
-				print '<tr '.$bcnd[$var] . ">\n";
+    				print '<tr class="liste_titre">';
+    				print '<td>';
+    				print '<a name="add"></a>'; // ancre
+    				print $langs->trans('Description').'</td>';
+    				print '<td align="center">'.$langs->trans('Date').'</td>';
+    				print '<td align="right">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION)?$langs->trans('Duration'):'').'</td>';
+      				print '<td colspan="3">&nbsp;</td>';
+    				print "</tr>\n";
+				}
+				
+				print '<tr class="oddeven">'."\n";
                 print '<td>';
                 // editeur wysiwyg
                 if (empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
@@ -1533,7 +1533,7 @@ else if ($id > 0 || ! empty($ref))
                 }
                 print '</td>';
 
-                print '<td align="center" valign="middle" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline"></td>';
+                print '<td align="center" valign="middle" colspan="3"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline"></td>';
 				print '</tr>';
 
 				//Line extrafield
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 72ec89c55d3..48ced509c47 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -272,6 +272,8 @@ SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
 SubProduct=Sub product
+ProductSheet=Product sheet
+ServiceSheet=Service sheet
 
 #Attributes
 VariantAttributes=Variant attributes
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index c879ab54059..d0294dd3a70 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -33,6 +33,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
 
 $langs->load("admin");
@@ -66,6 +67,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_
 	dolibarr_set_const($db, 'PRODUIT_MULTIPRICES_LIMIT', 5, 'chaine', 0, '', $conf->entity);
 }
 
+$error = 0;
 
 
 /*
@@ -118,10 +120,12 @@ if ($action == 'setModuleOptions')
 if ($action == 'other' && GETPOST('value_PRODUIT_LIMIT_SIZE') >= 0)
 {
 	$res = dolibarr_set_const($db, "PRODUIT_LIMIT_SIZE", GETPOST('value_PRODUIT_LIMIT_SIZE'),'chaine',0,'',$conf->entity);
+	if (! $res > 0) $error++;
 }
 if ($action == 'other' && GETPOST('value_PRODUIT_MULTIPRICES_LIMIT') > 0)
 {
 	$res = dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", GETPOST('value_PRODUIT_MULTIPRICES_LIMIT'),'chaine',0,'',$conf->entity);
+	if (! $res > 0) $error++;
 }
 if ($action == 'other')
 {
@@ -154,28 +158,19 @@ if ($action == 'other')
 		}
 
 	}
-}
-if ($action == 'other')
-{
+
 	$value = GETPOST('activate_sousproduits','alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $value,'chaine',0,'',$conf->entity);
-}
-if ($action == 'other')
-{
+
 	$value = GETPOST('activate_viewProdDescInForm','alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_DESC_IN_FORM", $value,'chaine',0,'',$conf->entity);
-}
-if ($action == 'other')
-{
+
 	$value = GETPOST('activate_viewProdTextsInThirdpartyLanguage','alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE", $value,'chaine',0,'',$conf->entity);
-}
-if ($action == 'other') {
+
 	$value = GETPOST('activate_mergePropalProductCard','alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_PDF_MERGE_PROPAL", $value,'chaine',0,'',$conf->entity);
-}
-if ($action == 'other')
-{
+
 	$value = GETPOST('activate_usesearchtoselectproduct','alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_USE_SEARCH_TO_SELECT", $value,'chaine',0,'',$conf->entity);
 }
@@ -184,8 +179,8 @@ if ($action == 'specimen') // For products
 {
 	$modele= GETPOST('module','alpha');
 
-	$inter = new Fichinter($db);
-	$inter->initAsSpecimen();
+	$product = new Product($db);
+	$product->initAsSpecimen();
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
@@ -207,9 +202,9 @@ if ($action == 'specimen') // For products
 
 		$module = new $classname($db);
 
-		if ($module->write_file($inter,$langs) > 0)
+		if ($module->write_file($product, $langs, '') > 0)
 		{
-			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=products&file=SPECIMEN.pdf");
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=product&file=SPECIMEN.pdf");
 			return;
 		}
 		else
@@ -265,24 +260,19 @@ if ($action == 'set')
 	$value = GETPOST('value');
 	if (GETPOST('value','alpha')) $res = dolibarr_set_const($db, $const, $value,'chaine',0,'',$conf->entity);
 	else $res = dolibarr_del_const($db, $const,$conf->entity);
+	if (! $res > 0) $error++;
 }
-/*else if ($action == 'useecotaxe')
-{
-	$ecotaxe = GETPOST("activate_useecotaxe");
-	$res = dolibarr_set_const($db, "PRODUIT_USE_ECOTAXE", $ecotaxe,'chaine',0,'',$conf->entity);
-}*/
 
 if ($action == 'other')
 {
     $value = GETPOST('activate_units', 'alpha');
     $res = dolibarr_set_const($db, "PRODUCT_USE_UNITS", $value, 'chaine', 0, '', $conf->entity);
+	if (! $res > 0) $error++;
 }
 
 if ($action)
 {
-	if (! $res > 0) $error++;
-
- 	if (! $error)
+    if (! $error)
     {
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
@@ -317,13 +307,11 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print load_fiche_titre($title,$linkback,'title_setup');
 
 $head = product_admin_prepare_head();
-dol_fiche_head($head, 'general', $tab, 0, 'product');
+dol_fiche_head($head, 'general', $tab, -1, 'product');
 
 $form=new Form($db);
 
-/*
- * Module to manage product / services code
- */
+// Module to manage product / services code
 $dirproduct=array('/core/modules/product/');
 $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 
@@ -403,7 +391,7 @@ foreach ($dirproduct as $dirroot)
 }
 print '</table>';
 
-// Defini tableau def des modeles
+// Module to build doc
 $def = array();
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
@@ -426,6 +414,10 @@ else
 	dol_print_error($db);
 }
 
+print '<br>';
+
+print load_fiche_titre($langs->trans("ProductDocumentTemplates"), '', '');
+
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php
index ca5944c421f..304b0d68333 100644
--- a/htdocs/product/admin/product_extrafields.php
+++ b/htdocs/product/admin/product_extrafields.php
@@ -84,7 +84,7 @@ print load_fiche_titre($title,$linkback,'title_setup');
 
 $head = product_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $textobject, 0, 'product');
+dol_fiche_head($head, 'attributes', $textobject, -1, 'product');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 7797e6802d4..536bcece10f 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -140,32 +140,13 @@ if (empty($reshook))
     	exit;
     }
 
-    /*
-	 * Build doc
-	 */
-	else if ($action == 'builddoc' && $user->rights->produit->creer)
-	{
-		// Save last template used to generate document
-		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-		// Define output language
-		$outputlangs = $langs;
-		$newlang='';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
-		if (! empty($newlang))
-		{
-			$outputlangs = new Translate("",$conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-		$ret = $object->fetch($id); // Reload to get new records
-		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-		if ($result <= 0)
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-	        $action='';
-		}
-	}
-	
+    // Actions to build doc
+    $upload_dir = $conf->produit->dir_output;
+    $permissioncreate = $user->rights->produit->creer;
+    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+    
+    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+    
     // Barcode type
     if ($action ==	'setfk_barcode_type' && $createbarcode)
     {
@@ -197,20 +178,6 @@ if (empty($reshook))
 			setEventMessages($errors, null, 'errors');
 		}
     }
-	
-	// Remove file in doc form
-	if ($action == 'remove_file' && $user->rights->produit->creer) {
-		if ($object->id > 0) {
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-	
-			$langs->load("other");
-			$upload_dir = $conf->product->dir_output;
-			$file = $upload_dir . '/' . GETPOST('file');
-			$ret = dol_delete_file($file, 0, 0, 0, $object);
-			if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
-			else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
-		}
-	}
 
     // Add a product or service
     if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service->creer))
@@ -1841,51 +1808,48 @@ $parameters=array();
 $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 if (empty($reshook))
 {
-	if ($action == '' || $action == 'view')
-	{
-	    if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) || 
-	       ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))
-	    {
-	        if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
+    if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) || 
+       ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))
+    {
+        if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
 
-	        if (! isset($object->no_button_copy) || $object->no_button_copy <> 1)
-	        {
-	            if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
-	            {
-	                print '<div class="inline-block divButAction"><span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span></div>'."\n";
-	            }
-	            else
-				{
-	                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
-	            }
-	        }
-	    }
-	    $object_is_used = $object->isObjectUsed($object->id);
-
-	    if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer)
-	    || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
-	    {
-	        if (empty($object_is_used) && (! isset($object->no_button_delete) || $object->no_button_delete <> 1))
-	        {
-	            if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
-	            {
-	                print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
-	            }
-	            else
-				{
-	                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
-	            }
-	        }
-	        else
+        if (! isset($object->no_button_copy) || $object->no_button_copy <> 1)
+        {
+            if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+            {
+                print '<div class="inline-block divButAction"><span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span></div>'."\n";
+            }
+            else
 			{
-	            print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a></div>';
-	        }
-	    }
-	    else
+                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
+            }
+        }
+    }
+    $object_is_used = $object->isObjectUsed($object->id);
+
+    if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer)
+    || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
+    {
+        if (empty($object_is_used) && (! isset($object->no_button_delete) || $object->no_button_delete <> 1))
+        {
+            if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+            {
+                print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
+            }
+            else
+			{
+                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
+            }
+        }
+        else
 		{
-	        print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a></div>';
-	    }
-	}
+            print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a></div>';
+        }
+    }
+    else
+	{
+        print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a></div>';
+    }
 }
 
 print "\n</div>\n";
@@ -1908,12 +1872,10 @@ if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action =
 
         $langs->load("propal");
 
-        $var=true;
         $otherprop = $propal->liste_array(2,1,0);
 
         if (is_array($otherprop) && count($otherprop))
         {
-        	$var=!$var;
         	$html .= '<tr><td style="width: 200px;">';
         	$html .= $langs->trans("AddToDraftProposals").'</td><td>';
         	$html .= $form->selectarray("propalid", $otherprop, 0, 1);
@@ -1935,11 +1897,9 @@ if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action =
 
         $langs->load("orders");
 
-        $var=true;
         $othercom = $commande->liste_array(2, 1, null);
         if (is_array($othercom) && count($othercom))
         {
-        	$var=!$var;
         	$html .= '<tr><td style="width: 200px;">';
         	$html .= $langs->trans("AddToDraftOrders").'</td><td>';
         	$html .= $form->selectarray("commandeid", $othercom, 0, 1);
@@ -1961,11 +1921,9 @@ if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action =
 
     	$langs->load("bills");
 
-    	$var=true;
     	$otherinvoice = $invoice->liste_array(2, 1, null);
     	if (is_array($otherinvoice) && count($otherinvoice))
     	{
-    		$var=!$var;
     		$html .= '<tr><td style="width: 200px;">';
     		$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
     		$html .= $form->selectarray("factureid", $otherinvoice, 0, 1);
@@ -2021,14 +1979,14 @@ if ($action != 'edit' && $action != 'delete')
     print '<div class="fichecenter"><div class="fichehalfleft">';
     print '<a name="builddoc"></a>'; // ancre
 
-    $filedir=$upload_dir;
-
+    // Documents
+    $objectref = dol_sanitizeFileName($object->ref);
+    $relativepath = $comref . '/' . $objectref . '.pdf';
+    $filedir = $conf->produit->dir_output . '/' . $objectref;
     $urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
     $genallowed=$user->rights->produit->creer;
     $delallowed=$user->rights->produit->supprimer;
 
-    $var=true;
-    
     print $formfile->showdocuments($modulepart,$object->ref,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang, '', $object);
     $somethingshown=$formfile->numoffiles;
     
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 0ee5c8f26ed..e25ad186369 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4363,6 +4363,7 @@ class Product extends CommonObject
         $now=dol_now();
 
         // Initialize parameters
+        $this->specimen=1;
         $this->id=0;
         $this->ref = 'PRODUCT_SPEC';
         $this->label = 'PRODUCT SPECIMEN';
diff --git a/htdocs/theme/eldy/img/statut3.png b/htdocs/theme/eldy/img/statut3.png
index bf4f7b8e854c74fb2b2bbce3d7489bb8286171b1..158c640bb60720ddd8d2fefacdf4f807399e45a0 100644
GIT binary patch
delta 569
zcmV-90>=HU1^)z)QGekC4G0xB;5t690006ENkl<ZILn2T%}Z2a6vlt=d+(h)-El0x
zFtteyTa`qRP=vN960$INEpq8fNF)g9g9=(y(84HO2odxLh<zY|o2(W=MWKs!nWdJW
z=;-Lo-1nXqA~xoX&+@?UIfv)rDE`%Ko5h>)5?rf;g;XnnRDS@V)j0W~XQYE}8p@|B
z>NV?#$}s3_>SA*FG6}z!trT@;DD@t2{?*+~gV{FC%hB7+C$HlNn{78FfUTjxy~Ek6
zn-uj1763;|&#{o~A!V||>+3{7XehVBCjMl2Nb$Nk!qmzDe-iaM;k7K#O1L1uXss-c
zFV>zev$1uIM1Q)T?c`_<J1exCZ&c|x{>)@FHeJ_bqi7+X&Ut!4#OJ;mquNY>UYogC
zgvIKzSxgn?T3qI(xo1WwSIe1sieYK#d)UrO+L{yL1+JM9v@%(1vB?k3Z63Rx#U=fN
zMl%KkTNk1%B3{gBgg&CqTF1Z+7ap0<G@8+@FhELDB!5<?9%}sHC!X^bt%!sb-F&55
z$8#1U0(P`=b$8vB7n;WYWgPuDlxNc;AKAAJ90-KMg?I-q_U_+x?6(Fuv!}AZbLZ-p
z3Ol_m>^Kpo_SOy@t-aNm@k}D(z8`G)kQ^O6gujA_`7gAPS4OJl)bo?apEhs#jUr+V
zf4b2+H!?BQrIPbC;wLRF3gzY*<CTnfvHFg>16SWEwbAQe@wB}isWCB$00000NkvXX
Hu0mjfaG)8}

delta 614
zcmV-s0-62)1gr&+QGehG3J(GhoZtrR0006xNkl<ZILn2T%WG3%5XH~;eK(KZBtD|G
zNkiIAf|8`@!kCIg3Kc~~q=E?2{sCPT5hN7fh`4c~QeC(ycI8UcMHd!@sz?!`kXkII
zDz-^u(k8J@bCcV9@3;^#2_~8C%<s%$hQm-%L?lMy=UeS2=YLS5_+>yf6b}HHc}t>Q
z-ZQ4?Yxf3&Pcn=#{V&5R1s=}y$3ACYU(6`Uovf+@5CLtncO|gB=k8!=>`s*c5%H@Z
zBR3L-*~^MnKrLJ;(jwX6u?KG53{PESj2Qv|9A~CaEpN;{Dr~OSg#myuKqD2NqV=!=
zRUduuYLY#jAAh#Z=H86Y<v&Du0~i1-%#Pjb7VJ;`0$lsnS3^hLl1W&-*>WP<goTr}
zBbqT|M}7$)4O%Ad@Mgj%B@Wh?D*k|p*N5GP3nv!KAT{~V4Fs$tV$yPP-dWE&hd@AS
z!+}H^L|V;3brcHUtWv$LTWBjHSsC7J3V=~(iXgdVe}C2>KvcNsBtN<nE3hd)>%xo)
z*krHH4bU@}+ySCLjbO=x-i5EQDY*ul0hLq~OX>T3Q!gz#EuObl*l{fHLu4rhklyek
zM1bVzEV;s$Uh;GP+Z(&MYvk-&5T49JQ`jKDY;{5o^*{D+JDB1Ca9s2}CzCPFxM&KS
zOg5xDx?je-yRKiT3KJ1o-cR&RmA_Byg{FXNoG>O}mfcW&M_%+E8a@5rG!l`Bf4VY|
zO-{yGIp-s-EI2VRi(S{{)*0Cw9SR4B-&Mx>H`KA_aLbf5-~a#s07*qoM6N<$g4z5S
Ay8r+H

diff --git a/htdocs/theme/eldy/img/statut4.png b/htdocs/theme/eldy/img/statut4.png
index 7a680ad2b2d64ad5c22b2292c1d900249d1741c8..d0df7e40aefe3fe43215b8bb097930c2dcaf42ee 100644
GIT binary patch
delta 405
zcmV;G0c!r%1l$9VQGekC4G0zibE?Q=0004LNkl<ZILoDzy-NaN9LGQR++F6GL9aqq
z^bfSPDnyV(MY-4LRM61k5Jce6U_($eG}hK&ff2ctdrMQ$5J`o-qT)&3b=Pn?WF=~!
z@%i!L_ww+S0JbmZSQy@imx#>ST@NmKiClRe%k~2xq&wPM_J1&}O@e(-bnSjr94U3X
z#rWVN03;@(JQSDF&2E0ft3Kn?HkdtL2T0v+Ap!6b5hQQccza*LwD@}ci47<MI$SZP
zhF0m?wPXNBeADFKcPM}SErV0DZLkTFEnRSMeI;=^<KeM%LRJsdl&dH4X=!@h69PpH
zpc?@iMK=N{Vt+s&5vE{JclXLFjuRH-%bhffZgvX(iJ-mZwP{;ZUIjJ@ysC3q8u$gr
zNeE0UgQlh%@2;jXt&AXaRKz96(Ukh-HWl1ToX}CxIpSD<5|0`~7PVKg0a-w+9Ang<
z1ggSxI2k3YFH<lY3)8napWpYOiY4;(#rYF|`i@{BC=PH&00000NkvXXu0mjf5m>o4

delta 528
zcmV+r0`L9Y1J(qPQGehG3Jx?ku{21<0005wNkl<ZILoDzKTH#07{;IXJInpyF!pSV
z_PlOQ42oN2!Z^7()P=-=JJAFa7=(yMX@~<3CPkdZg~S90rVb7=iHR{ml&0H}D+=uy
zrM>oO@B18#rWhe@e3Ey1^LyU+86E<F`SoGk?0*3vgfzc?J%6f)j4{XC9NFhJ69BrH
z>cq9Pi?!g#lhJd}cZn$Y%}~zH;!5Hc0O0Az;X51d>+#)MF+zj`5(4PetWsb2^5fC-
zi;n;xXJ<jbmV(`TH}Jrze7aj}R`566YN8&~Vd{OEhpD&siHJ)8&~xp>)$MA2q0%TH
z3IhNU&=mUsaDVCZ_c!lz&+>V;RG8}C^LHl7bqDRLTz9bN?@TNern*^3QY_bZ1_|wp
z0Jy$07?Ko=F;M!8XCL|czoLBgY!HxU+g`z7ot$qm`Q{f5hW`{httDM9ItPUS!gAbY
z9Af#DmVgkQ!M$1n0$65^puT0u=4vNTZ~%sEt~P@D7JnN`&Q^Qm*xX6QY}+8Jp1}zv
zJ~xz{tug=@zwm0sP|S=X=|@Hp0#GC!;jVb*cK^#20AM*g3nJn(7uTj!vGim_wMtD6
z1mfT{IS^5;QYx07oEcb~CL;c)Os#cZ*tii@rQ>5oZ*!!<eG>peOg^;EKLPCx(C43G
S2>Sp400{s|MNUMnLSTY{mHnmw


From 6c069e9a1ac671a9df66073262285f4a911f3bff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Apr 2017 15:15:44 +0200
Subject: [PATCH 0594/1163] Fix label of long status

---
 htdocs/core/class/commoninvoice.class.php |  7 ++++---
 htdocs/core/lib/functions.lib.php         | 14 +-------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index ac7bb3175fb..3e9d56f8f8c 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -307,7 +307,7 @@ abstract class CommonInvoice extends CommonObject
 	 *
 	 *	@param    	int  	$paye          	Status field paye
 	 *	@param      int		$status        	Id status
-	 *	@param      int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto
+	 *	@param      int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto
 	 *	@param		integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
 	 *	@param		int		$type			Type invoice
 	 *	@return     string        			Libelle du statut
@@ -408,9 +408,10 @@ abstract class CommonInvoice extends CommonObject
 				else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('BillStatusPaid');
 			}
 		}
-		if ($mode == 5)
+		if ($mode == 5 || $mode == 6)
 		{
-			$prefix='Short';
+			$prefix='';
+			if ($mode == 5) $prefix='Short';
 			if (! $paye)
 			{
 				if ($status == 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'),'statut0');
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4cec1ce7de2..6b17f6eec50 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1157,24 +1157,12 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
             $morehtmlstatus.=$object->getLibStatut(5,1);
         }
 	}
-	elseif ($object->element == 'facture' || $object->element == 'invoice' || $object->element == 'invoice_supplier')
+	elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
 	{
 	    $tmptxt=$object->getLibStatut(6, $object->totalpaye);
 	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye);
 		$morehtmlstatus.=$tmptxt;
 	}
-	elseif ($object->element == 'chargesociales')
-	{
-	    $tmptxt=$object->getLibStatut(6, $object->totalpaye);
-	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye); 
-		$morehtmlstatus.=$tmptxt;
-	}
-	elseif ($object->element == 'loan')
-	{
-	    $tmptxt=$object->getLibStatut(6, $object->totalpaye);
-	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye); 
-		$morehtmlstatus.=$tmptxt;
-	}
 	elseif ($object->element == 'contrat' || $object->element == 'contract') 
 	{
         if ($object->statut==0) $morehtmlstatus.=$object->getLibStatut(2);

From 1d546462dd31a558bd6f767eef9f48f48eab6267 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Thu, 13 Apr 2017 15:59:51 +0200
Subject: [PATCH 0595/1163] Update code using new css class

---
 htdocs/admin/system/filecheck.php | 34 ++++++++++---------------------
 htdocs/admin/system/modules.php   |  3 +--
 htdocs/admin/system/phpinfo.php   |  9 +++-----
 3 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 62d0999170f..4d32e10b174 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -46,15 +46,11 @@ print load_fiche_titre($langs->trans("FileCheckDolibarr"),'','title_setup');
 print $langs->trans("FileCheckDesc").'<br><br>';
 
 // Version
-$var = true;
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
-$var = ! $var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
-$var = ! $var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("VersionLastUpgrade").'</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
-$var = ! $var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("VersionProgram").'</td><td>'.DOL_VERSION;
+print '<tr class="oddeven"><td width="300">'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("VersionLastUpgrade").'</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("VersionProgram").'</td><td>'.DOL_VERSION;
 // If current version differs from last upgrade
 if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) {
     // Compare version with last install database version (upgrades never occured)
@@ -172,7 +168,6 @@ if ($xml)
         $out.='<td align="center">' . $langs->trans("ExpectedValue") . '</td>';
         $out.='<td align="center">' . $langs->trans("Value") . '</td>';
         $out.='</tr>'."\n";
-        $var = true;
 
         $i = 0;
         foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
@@ -188,8 +183,7 @@ if ($xml)
             $checksumconcat[]=$valueforchecksum;
             
             $i++;
-            $var = !$var;
-            $out.='<tr ' . $bc[$var] . '>';
+            $out.='<tr class="oddeven">';
             $out.='<td>'.$i.'</td>' . "\n";
             $out.='<td>'.$constname.'</td>' . "\n";
             $out.='<td align="center">'.$constvalue.'</td>' . "\n";
@@ -199,7 +193,7 @@ if ($xml)
 
         if ($i==0)
         {
-            $out.='<tr ' . $bc[false] . '><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+            $out.='<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out.='</table>';
         
@@ -239,7 +233,6 @@ if ($xml)
         $out.='<td>' . $langs->trans("Filename") . '</td>';
         $out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
         $out.='</tr>'."\n";
-        $var = true;
         $tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
         if (is_array($tmpfilelist) && count($tmpfilelist))
         {
@@ -247,8 +240,7 @@ if ($xml)
 	        foreach ($tmpfilelist as $file)
 	        {
 	            $i++;
-	            $var = !$var;
-	            $out.='<tr ' . $bc[$var] . '>';
+	            $out.='<tr class="oddeven">';
 	            $out.='<td>'.$i.'</td>' . "\n";
 	            $out.='<td>'.$file['filename'].'</td>' . "\n";
 	            $out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
@@ -257,7 +249,7 @@ if ($xml)
         }
         else 
         {
-            $out.='<tr ' . $bc[false] . '><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+            $out.='<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }            
         $out.='</table>';
 
@@ -276,7 +268,6 @@ if ($xml)
         $out.='<td align="right">' . $langs->trans("Size") . '</td>';
         $out.='<td align="right">' . $langs->trans("DateModification") . '</td>';
         $out.='</tr>'."\n";
-        $var = true;
         $tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
         if (is_array($tmpfilelist2) && count($tmpfilelist2))
         {
@@ -284,8 +275,7 @@ if ($xml)
 	        foreach ($tmpfilelist2 as $file)
 	        {
 	            $i++;
-	            $var = !$var;
-	            $out.='<tr ' . $bc[$var] . '>';
+	            $out.='<tr class="oddeven">';
 	            $out.='<td>'.$i.'</td>' . "\n";
 	            $out.='<td>'.$file['filename'].'</td>' . "\n";
 	            $out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
@@ -307,7 +297,7 @@ if ($xml)
         }
         else 
         {
-            $out.='<tr ' . $bc[false] . '><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+            $out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out.='</table>';
         
@@ -326,7 +316,6 @@ if ($xml)
         $out.='<td align="right">' . $langs->trans("Size") . '</td>';
         $out.='<td align="right">' . $langs->trans("DateModification") . '</td>';
         $out.='</tr>'."\n";
-        $var = true;
         $tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
         if (is_array($tmpfilelist3) && count($tmpfilelist3))
         {
@@ -334,8 +323,7 @@ if ($xml)
             foreach ($tmpfilelist3 as $file)
             {
                 $i++;
-                $var = !$var;
-                $out.='<tr ' . $bc[$var] . '>';
+                $out.='<tr class="oddeven">';
                 $out.='<td>'.$i.'</td>' . "\n";
                 $out.='<td>'.$file['filename'].'</td>' . "\n";
                 $out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
@@ -357,7 +345,7 @@ if ($xml)
         }
         else
         {
-            $out.='<tr ' . $bc[false] . '><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+            $out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out.='</table>';
         
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 706e0215059..4a6967089e2 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -118,9 +118,8 @@ $rights_ids = array();
 foreach($sortorder as $numero=>$name)
 {
 	$idperms="";
-	$var=!$var;
 	// Module
-	print "<tr ".$bc[$var].'><td width="300" class="nowrap">';
+	print '<tr class="oddeven"><td width="300" class="nowrap">';
 	$alt=$name.' - '.$modules_files[$numero];
     if (! empty($picto[$numero]))
     {
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 3e9ccbc895f..8664a28b28a 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -57,7 +57,7 @@ $var=false;
 
 // Recupere la version de PHP
 $phpversion=version_php();
-print "<tr ".$bc[$var].'><td  width="220px">'.$langs->trans("Version")."</td><td>".$phpversion."</td></tr>\n";
+print '<tr class="oddeven"><td  width="220px">'.$langs->trans("Version")."</td><td>".$phpversion."</td></tr>\n";
 
 print '</table>';
 print '<br>';
@@ -76,14 +76,12 @@ foreach($phparray as $key => $value)
 	print '<td colspan="2">'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
 
-	$var=true;
 	//var_dump($value);
 	foreach($value as $keyparam => $keyvalue)
 	{
 		if (! is_array($keyvalue))
 		{
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			print '<tr class="oddeven">';
 			print '<td>'.$keyparam.'</td>';
 			$valtoshow=$keyvalue;
 			if ($keyparam == 'X-ChromePhp-Data') $valtoshow=dol_trunc($keyvalue,80);
@@ -97,8 +95,7 @@ foreach($phparray as $key => $value)
 		}
 		else
 		{
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			print '<tr class="oddeven">';
 			print '<td>'.$keyparam.'</td>';
 			$i=0;
 			foreach($keyvalue as $keyparam2 => $keyvalue2)

From a73d72f243766c9cb97bcfe4e3e9cf73b7d1599b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 10:14:23 +0200
Subject: [PATCH 0596/1163] Add tables for default values

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   | 14 +++++++++
 .../mysql/tables/llx_default_values.key.sql   | 21 +++++++++++++
 .../mysql/tables/llx_default_values.sql       | 30 +++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 htdocs/install/mysql/tables/llx_default_values.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_default_values.sql

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 78f378e8c1a..82ba61f8281 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -158,4 +158,18 @@ create table llx_payment_various
 )ENGINE=innodb;
 
 
+create table llx_default_values
+(
+  rowid           integer AUTO_INCREMENT PRIMARY KEY,
+  entity          integer DEFAULT 1 NOT NULL,		-- multi company id
+  type			  varchar(10),                      -- 'createform', 'filter', 'sortorder'
+  user_id         integer DEFAULT 0 NOT NULL,       -- 0 or user id
+  page            varchar(255),                     -- relative url of page
+  param           varchar(255),                     -- parameter
+  value		      varchar(128)                      -- value
+)ENGINE=innodb;
+
+ALTER TABLE llx_default_values ADD UNIQUE INDEX uk_default_values(type, entity, user_id, page, param);
+
+
 
diff --git a/htdocs/install/mysql/tables/llx_default_values.key.sql b/htdocs/install/mysql/tables/llx_default_values.key.sql
new file mode 100644
index 00000000000..fe60f75884d
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_default_values.key.sql
@@ -0,0 +1,21 @@
+-- ============================================================================
+-- Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===========================================================================
+
+
+ALTER TABLE llx_default_values ADD UNIQUE INDEX uk_default_values(type, entity, user_id, page, param);
+
diff --git a/htdocs/install/mysql/tables/llx_default_values.sql b/htdocs/install/mysql/tables/llx_default_values.sql
new file mode 100644
index 00000000000..e693609702c
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_default_values.sql
@@ -0,0 +1,30 @@
+-- ============================================================================
+-- Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-- ============================================================================
+
+
+create table llx_default_values
+(
+  rowid           integer AUTO_INCREMENT PRIMARY KEY,
+  entity          integer DEFAULT 1 NOT NULL,		-- multi company id
+  type			  varchar(10),                      -- 'createform', 'filter', 'sortorder'
+  user_id         integer DEFAULT 0 NOT NULL,       -- 0 or user id
+  page            varchar(255),                     -- relative url of page
+  param           varchar(255),                     -- parameter
+  value		      varchar(128)                      -- value
+)ENGINE=innodb;
+
+

From 39ebaec06402957a03a92f818958b58062e2a138 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 11:22:48 +0200
Subject: [PATCH 0597/1163] Replace usage of $bc[$var] with class="oddeven"

---
 htdocs/accountancy/admin/accountmodel.php     |   2 +-
 htdocs/adherents/admin/adherent.php           |  12 +-
 htdocs/adherents/index.php                    |  16 +--
 htdocs/adherents/stats/byproperties.php       |   4 +-
 htdocs/adherents/stats/geo.php                |   4 +-
 htdocs/adherents/stats/index.php              |   4 +-
 htdocs/adherents/subscription.php             |   4 +-
 htdocs/adherents/subscription/list.php        |   4 +-
 .../adherents/tpl/linkedobjectblock.tpl.php   |   2 +-
 htdocs/adherents/type.php                     |   8 +-
 htdocs/admin/agenda.php                       |   4 +-
 htdocs/admin/agenda_extsites.php              |  12 +-
 htdocs/admin/agenda_other.php                 |  16 +--
 htdocs/admin/bank.php                         |   2 +-
 htdocs/admin/barcode.php                      |  16 +--
 htdocs/admin/boxes.php                        |   8 +-
 htdocs/admin/clicktodial.php                  |   4 +-
 htdocs/admin/commande.php                     |  16 +--
 htdocs/admin/company.php                      | 128 +++++++++---------
 htdocs/admin/compta.php                       |   2 +-
 htdocs/admin/const.php                        |   2 +-
 htdocs/admin/contract.php                     |   4 +-
 htdocs/admin/defaultvalues.php                |  98 +++++++-------
 htdocs/admin/delais.php                       |  12 +-
 htdocs/admin/dict.php                         |   4 +-
 htdocs/admin/ecm.php                          |   4 +-
 htdocs/admin/events.php                       |   4 +-
 htdocs/admin/expensereport.php                |   6 +-
 htdocs/admin/external_rss.php                 |  16 +--
 htdocs/admin/facture.php                      |  12 +-
 htdocs/admin/fckeditor.php                    |   4 +-
 htdocs/admin/fichinter.php                    |   6 +-
 htdocs/admin/geoipmaxmind.php                 |   2 +-
 htdocs/admin/ihm.php                          |   4 +-
 htdocs/admin/ldap.php                         |  24 ++--
 htdocs/admin/ldap_contacts.php                |  32 ++---
 htdocs/admin/ldap_groups.php                  |  12 +-
 htdocs/admin/ldap_members.php                 |  58 ++++----
 htdocs/admin/ldap_users.php                   |  36 ++---
 htdocs/admin/limits.php                       |  16 +--
 htdocs/admin/livraison.php                    |   4 +-
 htdocs/admin/loan.php                         |   2 +-
 htdocs/admin/mailing.php                      |   8 +-
 htdocs/admin/mails.php                        |  60 ++++----
 htdocs/admin/menus.php                        |  10 +-
 htdocs/admin/menus/other.php                  |   4 +-
 htdocs/admin/modulehelp.php                   |   2 +-
 htdocs/admin/modules.php                      |   6 +-
 htdocs/admin/multicurrency.php                |  40 +++---
 htdocs/admin/notification.php                 |  10 +-
 htdocs/admin/oauthlogintokens.php             |  16 +--
 htdocs/admin/pdf.php                          |  56 ++++----
 htdocs/admin/perms.php                        |   2 +-
 htdocs/admin/prelevement.php                  |   6 +-
 htdocs/admin/propal.php                       |  12 +-
 htdocs/admin/proxy.php                        |  20 +--
 htdocs/admin/receiptprinter.php               |   6 +-
 htdocs/admin/resource.php                     |  12 +-
 htdocs/admin/salaries.php                     |   2 +-
 htdocs/admin/security.php                     |  38 +++---
 htdocs/admin/security_file.php                |  14 +-
 htdocs/admin/security_other.php               |  16 +--
 htdocs/admin/sms.php                          |  20 +--
 htdocs/admin/stock.php                        |  64 ++++-----
 htdocs/admin/supplier_invoice.php             |   4 +-
 htdocs/admin/supplier_order.php               |  10 +-
 htdocs/admin/supplier_payment.php             |   2 +-
 htdocs/admin/supplier_proposal.php            |   8 +-
 htdocs/admin/syslog.php                       |   6 +-
 htdocs/admin/system/browser.php               |  18 +--
 htdocs/admin/system/constall.php              |   8 +-
 htdocs/admin/system/database-tables.php       |  10 +-
 htdocs/admin/system/database.php              |   4 +-
 htdocs/admin/system/dbtable.php               |   4 +-
 htdocs/admin/system/dolibarr.php              |  68 +++++-----
 htdocs/admin/system/modules.php               |   2 +-
 htdocs/admin/system/phpinfo.php               |   8 +-
 htdocs/admin/taxes.php                        |   2 +-
 htdocs/admin/tools/eaccelerator.php           |  28 ++--
 htdocs/admin/tools/listevents.php             |   4 +-
 htdocs/admin/tools/listsessions.php           |   4 +-
 htdocs/admin/translation.php                  |  41 ++----
 htdocs/admin/triggers.php                     |   4 +-
 htdocs/admin/user.php                         |   4 +-
 htdocs/bookmarks/admin/bookmark.php           |   2 +-
 htdocs/bookmarks/list.php                     |   4 +-
 htdocs/cashdesk/admin/cashdesk.php            |  12 +-
 htdocs/categories/admin/categorie.php         |   4 +-
 htdocs/categories/viewcat.php                 |  16 +--
 htdocs/comm/action/listactions.php            |   4 +-
 htdocs/comm/action/rapport/index.php          |   4 +-
 htdocs/comm/card.php                          |  22 +--
 htdocs/comm/contact.php                       |   4 +-
 htdocs/comm/index.php                         |  42 +++---
 htdocs/comm/mailing/cibles.php                |   8 +-
 htdocs/comm/mailing/index.php                 |   6 +-
 htdocs/comm/mailing/list.php                  |   2 +-
 htdocs/comm/propal/index.php                  |  24 ++--
 htdocs/comm/propal/list.php                   |   2 +-
 htdocs/comm/propal/stats/index.php            |   2 +-
 .../comm/propal/tpl/linkedobjectblock.tpl.php |   2 +-
 htdocs/comm/prospect/index.php                |  10 +-
 htdocs/commande/customer.php                  |   4 +-
 htdocs/commande/index.php                     |  22 +--
 htdocs/commande/orderstoinvoice.php           |   4 +-
 htdocs/commande/stats/index.php               |   4 +-
 htdocs/commande/tpl/linkedobjectblock.tpl.php |   2 +-
 htdocs/compta/bank/annuel.php                 |   4 +-
 htdocs/compta/bank/bankentries.php            |   4 +-
 htdocs/compta/bank/bilan.php                  |   8 +-
 htdocs/compta/bank/budget.php                 |   4 +-
 htdocs/compta/bank/categ.php                  |   8 +-
 htdocs/compta/bank/index.php                  |   2 +-
 htdocs/compta/bank/treso.php                  |  10 +-
 htdocs/compta/bank/various_payment/index.php  |   4 +-
 htdocs/compta/charges/index.php               |  14 +-
 htdocs/compta/clients.php                     |   4 +-
 htdocs/compta/deplacement/index.php           |   4 +-
 htdocs/compta/deplacement/list.php            |   4 +-
 htdocs/compta/facture/prelevement.php         |   8 +-
 htdocs/compta/facture/stats/index.php         |   4 +-
 .../facture/tpl/linkedobjectblock.tpl.php     |   2 +-
 .../tpl/linkedobjectblockForRec.tpl.php       |   2 +-
 htdocs/compta/index.php                       |  22 +--
 htdocs/compta/localtax/clients.php            |   8 +-
 htdocs/compta/localtax/index.php              |   8 +-
 htdocs/compta/localtax/quadri_detail.php      |   8 +-
 htdocs/compta/localtax/reglement.php          |   4 +-
 htdocs/compta/paiement.php                    |   8 +-
 htdocs/compta/paiement/avalider.php           |   4 +-
 htdocs/compta/paiement/card.php               |   6 +-
 htdocs/compta/paiement/cheque/card.php        |   8 +-
 htdocs/compta/paiement/cheque/index.php       |   4 +-
 htdocs/compta/paiement/cheque/list.php        |   6 +-
 htdocs/compta/paiement/rapport.php            |   2 +-
 htdocs/compta/paiement_charge.php             |   4 +-
 htdocs/compta/payment_sc/card.php             |   6 +-
 htdocs/compta/prelevement/bons.php            |   2 +-
 htdocs/compta/prelevement/card.php            |   4 +-
 htdocs/compta/prelevement/create.php          |   8 +-
 htdocs/compta/prelevement/demandes.php        |   4 +-
 htdocs/compta/prelevement/factures.php        |   4 +-
 htdocs/compta/prelevement/fiche-rejet.php     |   2 +-
 htdocs/compta/prelevement/fiche-stat.php      |   2 +-
 htdocs/compta/prelevement/index.php           |  10 +-
 htdocs/compta/prelevement/list.php            |   2 +-
 htdocs/compta/prelevement/rejets.php          |   2 +-
 htdocs/compta/prelevement/stats.php           |   4 +-
 htdocs/compta/recap-compta.php                |   4 +-
 htdocs/compta/resultat/clientfourn.php        |  10 +-
 htdocs/compta/resultat/index.php              |   8 +-
 htdocs/compta/salaries/index.php              |   4 +-
 htdocs/compta/sociales/card.php               |   4 +-
 htdocs/compta/sociales/payments.php           |  14 +-
 htdocs/compta/stats/cabyprodserv.php          |   4 +-
 htdocs/compta/stats/cabyuser.php              |   4 +-
 htdocs/compta/stats/casoc.php                 |   4 +-
 htdocs/compta/stats/index.php                 |  12 +-
 htdocs/compta/tva/clients.php                 |   8 +-
 htdocs/compta/tva/index.php                   |   8 +-
 htdocs/compta/tva/quadri.php                  |   8 +-
 htdocs/compta/tva/quadri_detail.php           |   8 +-
 htdocs/compta/tva/quarter_report.php          |   8 +-
 htdocs/contrat/card.php                       |   2 +-
 htdocs/contrat/index.php                      |  28 ++--
 htdocs/contrat/services.php                   |   4 +-
 htdocs/contrat/tpl/linkedobjectblock.tpl.php  |   2 +-
 htdocs/core/boxes/box_actions.php             |   2 +-
 htdocs/core/boxes/modules_boxes.php           |   2 +-
 htdocs/core/class/commonobject.class.php      |   4 +-
 htdocs/core/class/dolprintipp.class.php       |   4 +-
 htdocs/core/class/html.formactions.class.php  |   4 +-
 htdocs/core/class/html.formfile.class.php     |   6 +-
 htdocs/core/class/translate.class.php         |  38 +++---
 htdocs/core/lib/admin.lib.php                 |   4 +-
 htdocs/core/lib/agenda.lib.php                |   8 +-
 htdocs/core/lib/company.lib.php               |  10 +-
 htdocs/core/lib/doleditor.lib.php             |   4 +-
 htdocs/core/lib/functions.lib.php             |   2 +-
 htdocs/core/lib/ldap.lib.php                  |   2 +-
 htdocs/core/lib/project.lib.php               |   4 +-
 htdocs/core/lib/sendings.lib.php              |   4 +-
 htdocs/core/lib/usergroups.lib.php            |   2 +-
 .../modules/printing/printipp.modules.php     |   2 +-
 .../modules/rapport/pdf_paiement.class.php    |   2 +-
 .../rapport/pdf_paiement_fourn.class.php      |   2 +-
 .../core/tpl/admin_extrafields_view.tpl.php   |   4 +-
 htdocs/core/tpl/contacts.tpl.php              |   4 +-
 htdocs/core/tpl/resource_view.tpl.php         |   2 +-
 htdocs/cron/list.php                          |   2 +-
 htdocs/don/admin/donation.php                 |   8 +-
 htdocs/don/card.php                           |   2 +-
 htdocs/don/index.php                          |   8 +-
 htdocs/don/payment/card.php                   |   6 +-
 htdocs/don/payment/payment.php                |   4 +-
 htdocs/expedition/card.php                    |  10 +-
 htdocs/expedition/index.php                   |  10 +-
 htdocs/expedition/list.php                    |   4 +-
 htdocs/expedition/shipment.php                |   4 +-
 htdocs/expedition/stats/index.php             |   4 +-
 .../expedition/tpl/linkedobjectblock.tpl.php  |   2 +-
 htdocs/expensereport/card.php                 |   2 +-
 htdocs/expensereport/index.php                |   4 +-
 htdocs/expensereport/list.php                 |   2 +-
 htdocs/expensereport/payment/card.php         |   6 +-
 htdocs/expensereport/payment/payment.php      |   4 +-
 htdocs/expensereport/stats/index.php          |   4 +-
 .../tpl/linkedobjectblock.tpl.php             |   2 +-
 htdocs/exports/class/export.class.php         |   2 +-
 htdocs/exports/export.php                     |  20 +--
 htdocs/exports/index.php                      |   6 +-
 htdocs/externalsite/admin/externalsite.php    |   8 +-
 htdocs/fichinter/card.php                     |   4 +-
 htdocs/fichinter/index.php                    |  16 +--
 htdocs/fichinter/stats/index.php              |   4 +-
 .../fichinter/tpl/linkedobjectblock.tpl.php   |   2 +-
 htdocs/fourn/card.php                         |  16 +--
 htdocs/fourn/commande/index.php               |  24 ++--
 htdocs/fourn/commande/list.php                |   4 +-
 .../commande/tpl/linkedobjectblock.tpl.php    |   2 +-
 htdocs/fourn/contact.php                      |   4 +-
 htdocs/fourn/facture/card.php                 |   2 +-
 htdocs/fourn/facture/impayees.php             |   4 +-
 htdocs/fourn/facture/list.php                 |   4 +-
 htdocs/fourn/facture/paiement.php             |   6 +-
 htdocs/fourn/facture/rapport.php              |   2 +-
 .../facture/tpl/linkedobjectblock.tpl.php     |   2 +-
 htdocs/fourn/index.php                        |  16 +--
 htdocs/fourn/paiement/card.php                |   6 +-
 htdocs/fourn/product/list.php                 |   4 +-
 htdocs/fourn/recap-fourn.php                  |   8 +-
 htdocs/ftp/admin/ftpclient.php                |  24 ++--
 htdocs/ftp/index.php                          |   2 +-
 htdocs/holiday/define_holiday.php             |   4 +-
 htdocs/holiday/view_log.php                   |   4 +-
 htdocs/hrm/admin/admin_establishment.php      |   4 +-
 htdocs/hrm/index.php                          |  12 +-
 htdocs/imports/import.php                     |  20 +--
 htdocs/imports/index.php                      |   4 +-
 htdocs/index.php                              |   2 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   2 +-
 .../mysql/tables/llx_default_values.sql       |   2 +-
 htdocs/install/upgrade2.php                   |   2 +-
 htdocs/livraison/card.php                     |   6 +-
 htdocs/loan/calc.php                          |   2 +-
 htdocs/loan/card.php                          |   4 +-
 htdocs/loan/payment/card.php                  |   6 +-
 htdocs/loan/payment/payment.php               |   2 +-
 htdocs/margin/admin/margin.php                |  24 ++--
 htdocs/margin/agentMargins.php                |   4 +-
 htdocs/margin/customerMargins.php             |   6 +-
 htdocs/margin/productMargins.php              |   6 +-
 htdocs/margin/tabs/productMargins.php         |   6 +-
 htdocs/margin/tabs/thirdpartyMargins.php      |   6 +-
 htdocs/paybox/admin/paybox.php                |  22 +--
 htdocs/paypal/admin/paypal.php                |  30 ++--
 htdocs/printing/admin/printing.php            |  16 +--
 htdocs/product/admin/dynamic_prices.php       |   2 +-
 htdocs/product/admin/product.php              |  38 +++---
 htdocs/product/admin/product_tools.php        |   6 +-
 .../product/canvas/product/tpl/list.tpl.php   |   2 +-
 .../product/canvas/service/tpl/list.tpl.php   |   2 +-
 htdocs/product/composition/card.php           |   2 +-
 htdocs/product/fournisseurs.php               |   4 +-
 htdocs/product/index.php                      |  10 +-
 htdocs/product/price.php                      |  10 +-
 htdocs/product/stats/commande.php             |   4 +-
 htdocs/product/stats/contrat.php              |   4 +-
 htdocs/product/stats/facture.php              |   4 +-
 htdocs/product/stock/card.php                 |   4 +-
 htdocs/product/stock/index.php                |   8 +-
 htdocs/product/stock/list.php                 |   4 +-
 htdocs/product/stock/massstockmove.php        |   6 +-
 htdocs/product/stock/product.php              |   6 +-
 htdocs/product/stock/productlot_list.php      |   2 +-
 htdocs/product/stock/replenish.php            |   2 +-
 htdocs/product/stock/valo.php                 |   4 +-
 htdocs/projet/activity/index.php              |  24 ++--
 htdocs/projet/admin/project.php               |  22 +--
 htdocs/projet/element.php                     |   2 +-
 htdocs/projet/graph_opportunities.inc.php     |   4 +-
 htdocs/projet/index.php                       |   4 +-
 htdocs/projet/stats/index.php                 |   4 +-
 htdocs/projet/tasks/contact.php               |   6 +-
 htdocs/projet/tasks/time.php                  |   2 +-
 htdocs/public/donations/donateurs_code.php    |   4 +-
 htdocs/public/members/public_list.php         |   4 +-
 htdocs/public/paybox/newpayment.php           |  62 ++++-----
 htdocs/public/paypal/newpayment.php           |  52 +++----
 htdocs/resource/list.php                      |   2 +-
 htdocs/societe/admin/societe.php              |  24 ++--
 htdocs/societe/commerciaux.php                |   2 +-
 htdocs/societe/consumption.php                |   4 +-
 htdocs/societe/index.php                      |   6 +-
 htdocs/societe/notify/index.php               |   4 +-
 htdocs/societe/rib.php                        |   2 +-
 htdocs/societe/societecontact.php             |   4 +-
 .../admin/supplier_proposal_extrafields.php   |   4 +-
 .../supplier_proposaldet_extrafields.php      |   4 +-
 htdocs/supplier_proposal/index.php            |  16 +--
 htdocs/supplier_proposal/list.php             |   8 +-
 .../tpl/linkedobjectblock.tpl.php             |   2 +-
 htdocs/user/agenda_extsites.php               |   4 +-
 htdocs/user/card.php                          |   4 +-
 htdocs/user/group/card.php                    |   4 +-
 htdocs/user/group/index.php                   |   4 +-
 htdocs/user/home.php                          |   8 +-
 htdocs/user/param_ihm.php                     |  12 +-
 scripts/bank/export-bank-receipts.php         |   2 +-
 309 files changed, 1444 insertions(+), 1453 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index e037549add8..d2b039a28e0 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -1200,7 +1200,7 @@ else
         		$showemptyline=0;
         	}
 
-            $var=!$var;
+            
             $value=$tabname[$i];
             print '<tr class="oddeven"><td width="50%">';
             if (! empty($tabcond[$i]))
diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 8e265eb70f7..3958e80964a 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -128,7 +128,7 @@ print "</tr>\n";
 $var=true;
 
 // Login/Pass required for members
-$var=!$var;
+
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
@@ -141,7 +141,7 @@ print "</td></tr>\n";
 print '</form>';
 
 // Mail required for members
-$var=!$var;
+
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
@@ -154,7 +154,7 @@ print "</td></tr>\n";
 print '</form>';
 
 // Send mail information is on by default
-$var=!$var;
+
 print '<form action="adherent.php" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
@@ -167,7 +167,7 @@ print "</td></tr>\n";
 print '</form>';
 
 // Insert subscription into bank account
-$var=!$var;
+
 print '<form action="adherent.php" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
@@ -188,7 +188,7 @@ print '</form>';
 // Use vat for invoice creation
 if ($conf->facture->enabled)
 {
-	$var=!$var;
+	
 	print '<form action="adherent.php" method="POST">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="update">';
@@ -213,7 +213,7 @@ if ($conf->facture->enabled)
 
 	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 	{
-		$var=!$var;
+		
 		print '<form action="adherent.php" method="POST">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="update">';
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 9c1b0bb01e1..6440fb72cb8 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -246,8 +246,8 @@ $var=true;
 krsort($Total);
 foreach ($Total as $key=>$value)
 {
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
+    
+    print '<tr class="oddeven">';
     print "<td><a href=\"./subscription/list.php?date_select=$key\">$key</a></td>";
     print "<td align=\"right\">".$Number[$key]."</td>";
     print "<td align=\"right\">".price($value)."</td>";
@@ -298,9 +298,9 @@ if ($resql)
 		$var = True;
 		while ($i < $num)
 		{
-			$var=!$var;
+			
 			$obj = $db->fetch_object($resql);
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			$staticmember->id=$obj->rowid;
 			$staticmember->lastname=$obj->lastname;
 			$staticmember->firstname=$obj->firstname;
@@ -361,9 +361,9 @@ if ($resql)
 		$var = True;
 		while ($i < $num)
 		{
-			$var=!$var;
+			
 			$obj = $db->fetch_object($resql);
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			$subscriptionstatic->id=$obj->cid;
 			$subscriptionstatic->ref=$obj->cid;
 			$staticmember->id=$obj->rowid;
@@ -407,8 +407,8 @@ print "</tr>\n";
 
 foreach ($AdherentType as $key => $adhtype)
 {
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 	print '<td>'.$adhtype->getNomUrl(1, dol_size(32)).'</td>';
 	print '<td align="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->subscription,0,3).'</td>';
 	print '<td align="right">'.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0) > 0) ? $MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0):'').' '.$staticmember->LibStatut(1,$adhtype->subscription,0,3).'</td>';
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index c717d20be84..bd731e771f3 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -131,8 +131,8 @@ $var=true;
 foreach ($data as $val)
 {
 	$year = $val['year'];
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td>'.$memberstatic->getmorphylib($val['label']).'</td>';
 	print '<td align="right">'.$val['nb'].'</td>';
 	print '<td align="center">'.dol_print_date($val['lastdate'],'dayhour').'</td>';
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index ae128d940e8..d2254b4afd6 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -295,8 +295,8 @@ if ($mode)
     foreach ($data as $val)
     {
         $year = $val['year'];
-        $var=!$var;
-        print '<tr '.$bc[$var].'>';
+        
+        print '<tr class="oddeven">';
         print '<td>'.$val['label'].'</td>';
         if ($label2) print '<td align="center">'.$val['label2'].'</td>';
         print '<td align="right">'.$val['nb'].'</td>';
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index aec8cd588f6..d1a8e707e43 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -183,7 +183,7 @@ foreach ($data as $val)
     while ($oldyear > $year+1)
     {	// If we have empty year
         $oldyear--;
-        $var=!$var;
+        
         print '<tr '.$bc[$var].' height="24">';
         print '<td align="center">';
         print '<a href="month.php?year='.$oldyear.'&amp;mode='.$mode.'">';
@@ -195,7 +195,7 @@ foreach ($data as $val)
         print '<td align="right">0</td>';
         print '</tr>';
     }
-    $var=!$var;
+    
     print '<tr '.$bc[$var].' height="24">';
     print '<td align="center">';
     //print '<a href="month.php?year='.$year.'">';
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 0c9c8467f1f..cc7fbef58f5 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -825,8 +825,8 @@ if ($rowid > 0)
             while ($i < $num)
             {
                 $objp = $db->fetch_object($result);
-                $var=!$var;
-                print "<tr ".$bc[$var].">";
+                
+                print '<tr class="oddeven">';
                 $subscriptionstatic->ref=$objp->crowid;
                 $subscriptionstatic->id=$objp->crowid;
                 print '<td>'.$subscriptionstatic->getNomUrl(1).'</td>';
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index e5abe964d7f..750ad483461 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -285,7 +285,7 @@ if ($result)
         $adherent->login=$obj->login;
         $adherent->photo=$obj->photo;
 
-        $var=!$var;
+        
 
         print '<tr class="oddeven">';
 
@@ -337,7 +337,7 @@ if ($result)
     }
 
     // Total
-    $var=!$var;
+    
     print '<tr class="liste_total">';
     print "<td>".$langs->trans("Total")."</td>\n";
     print "<td align=\"right\">&nbsp;</td>\n";
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index f593e72faa9..19324812beb 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -33,7 +33,7 @@ $var=true;
 $total=0;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
-	$var=!$var;
+	
 ?>
 <tr <?php echo $GLOBALS['bc'][$var]; ?> >
     <td><?php echo $langs->trans("Subscription"); ?></td>
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 846b0dab7a9..164c921d766 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -210,8 +210,8 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($result);
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 			print '<td><a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a></td>';
 			print '<td>'.dol_escape_htmltag($objp->libelle).'</td>';
 			print '<td align="center">'.yn($objp->subscription).'</td>';
@@ -530,8 +530,8 @@ if ($rowid > 0)
 		        $adh->firstname=$objp->firstname;
 
 		        // Lastname
-		        $var=!$var;
-		        print '<tr '.$bc[$var].'>';
+		        
+		        print '<tr class="oddeven">';
 		        if ($objp->societe != '')
 		        {
 		            print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"),"user").' '.$adh->getFullName($langs,0,-1,20).' / '.dol_trunc($objp->societe,12).'</a></td>'."\n";
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index c11cbeff3a4..d076fcf7e26 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -173,8 +173,8 @@ if (! empty($triggers))
 			if ($trigger['code'] == 'FICHINTER_CLASSIFY_BILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;
 			if ($trigger['code'] == 'FICHINTER_CLASSIFY_UNBILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;
 
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			
+			print '<tr class="oddeven">';
 			print '<td>'.$trigger['code'].'</td>';
 			print '<td>'.$trigger['label'].'</td>';
 			print '<td align="right" width="40">';
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 79e6d3dbd6c..1e595b5088e 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -155,8 +155,8 @@ print '<td align="center">'.$langs->trans("Value")."</td>";
 print "</tr>";
 
 // Show external agenda
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print "<td>".$langs->trans("ExtSitesEnableThisTool")."</td>";
 print '<td align="center">';
 if ($conf->use_javascript_ajax)
@@ -178,8 +178,8 @@ print "</td>";
 print "</tr>";
 
 // Nb of agenda
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print "<td>".$langs->trans("ExtSitesNbOfAgenda")."</td>";
 print '<td align="center">';
 print '<input class="flat hideifnotset" type="text" size="2" id="AGENDA_EXT_NB" name="AGENDA_EXT_NB" value="'.$conf->global->AGENDA_EXT_NB.'">';
@@ -210,8 +210,8 @@ while ($i <= $MAXAGENDA)
 	$color='AGENDA_EXT_COLOR'.$key;
 	$enabled='AGENDA_EXT_ENABLED'.$key;
 
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 	// Nb
 	print '<td width="180" class="nowrap">'.$langs->trans("AgendaExtNb",$key)."</td>";
 	// Name
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 9bf3a4ddc16..17f94ef30cb 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -265,7 +265,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			require_once $dir.'/'.$file;
             			$module = new $classname($db, new ActionComm($db));
             			
-            			$var=!$var;
+            			
             			print "<tr ".$bc[$var].">\n";
             			print "<td>";
             			print (empty($module->name)?$name:$module->name);
@@ -351,7 +351,7 @@ print '<td align="right">'.$langs->trans("Value").'</td>'."\n";
 print '</tr>'."\n";
 
 // Manual or automatic
-$var=!$var;
+
 print '<tr '.$bc[$var].'>'."\n";
 print '<td>'.$langs->trans("AGENDA_USE_EVENT_TYPE").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
@@ -369,7 +369,7 @@ print '</td></tr>'."\n";
 
 if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
-    $var=!$var;
+    
     print '<!-- AGENDA_USE_EVENT_TYPE_DEFAULT -->';
     print '<tr '.$bc[$var].'>'."\n";
     print '<td>'.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").'</td>'."\n";
@@ -380,7 +380,7 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 }
 
 // AGENDA_DEFAULT_FILTER_TYPE
-$var=!$var;
+
 print '<tr '.$bc[$var].'>'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
@@ -389,7 +389,7 @@ $formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AG
 print '</td></tr>'."\n";
 
 // AGENDA_DEFAULT_FILTER_STATUS
-$var=!$var;
+
 print '<tr '.$bc[$var].'>'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
@@ -398,7 +398,7 @@ $formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_
 print '</td></tr>'."\n";
 
 // AGENDA_DEFAULT_VIEW
-$var=!$var;
+
 print '<tr '.$bc[$var].'>'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_VIEW").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
@@ -410,7 +410,7 @@ print '</td></tr>'."\n";
 // AGENDA NOTIFICATION
 if ($conf->global->MAIN_FEATURES_LEVEL > 0)
 {
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'>'."\n";
     print '<td>'.$langs->trans('AGENDA_NOTIFICATION').'</td>'."\n";
     print '<td align="center">&nbsp;</td>'."\n";
@@ -422,7 +422,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0)
     } else {
         print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_NOTIFICATION">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
         print '</td></tr>'."\n";
-    	$var=!$var;
+    	
         print '<tr '.$bc[$var].'>'."\n";
         print '<td>'.$langs->trans('AGENDA_NOTIFICATION_SOUND').'</td>'."\n";
         print '<td align="center">&nbsp;</td>'."\n";
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 58d97842017..98cecb2f44b 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -199,7 +199,7 @@ while ($i < $nbofbank)
 {
 	$var = !$var;
 
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.$bankorder[$i][0]."</td><td>\n";
 	print $bankorder[$i][1];
 	print '</td>';
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 29475d712df..a5fb5ef8d69 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -276,7 +276,7 @@ if ($resql)
 		print '<td align="center">';
 		print $formbarcode->setBarcodeEncoder($obj->coder,$barcodelist,$obj->rowid,'form'.$i);
 		print "</td></tr>\n";
-		$var=!$var;
+		
 		$i++;
 	}
 }
@@ -312,8 +312,8 @@ print '</tr>';
 // Chemin du binaire genbarcode sous linux
 if (! isset($_SERVER['WINDIR']))
 {
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("GenbarcodeLocation").'</td>';
 	print '<td width="60" align="center">';
 	print '<input type="text" size="40" name="GENBARCODE_LOCATION" value="'.$conf->global->GENBARCODE_LOCATION.'">';
@@ -328,8 +328,8 @@ if (! isset($_SERVER['WINDIR']))
 // Module products
 if (! empty($conf->product->enabled))
 {
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("SetDefaultBarcodeTypeProducts").'</td>';
 	print '<td width="60" align="right">';
 	$formbarcode->select_barcode_type($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE,"PRODUIT_DEFAULT_BARCODE_TYPE",1);
@@ -339,8 +339,8 @@ if (! empty($conf->product->enabled))
 // Module thirdparty
 if (! empty($conf->societe->enabled))
 {
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("SetDefaultBarcodeTypeThirdParties").'</td>';
 	print '<td width="60" align="right">';
 	print $formbarcode->select_barcode_type($conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY,"GENBARCODE_BARCODETYPE_THIRDPARTY",1);
@@ -397,7 +397,7 @@ if ($conf->produit->enabled)
 	    			$modBarCode = new $file();
 	    			$var = !$var;
 
-	    			print '<tr '.$bc[$var].'>';
+	    			print '<tr class="oddeven">';
 	    			print '<td>'.(isset($modBarCode->name)?$modBarCode->name:$modBarCode->nom)."</td><td>\n";
 	    			print $modBarCode->info($langs);
 	    			print '</td>';
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 9785e945a6a..72957aa77d3 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -342,7 +342,7 @@ print "</tr>\n";
 $var=true;
 foreach($boxtoadd as $box)
 {
-    $var=!$var;
+    
 
     if (preg_match('/^([^@]+)@([^@]+)$/i',$box->boximg))
     {
@@ -421,7 +421,7 @@ foreach($boxactivated as $key => $box)
 	}
 
     print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.img_object("",$logo).' '.$langs->transnoentitiesnoconv($box->boxlabel);
 	if (! empty($box->class) && preg_match('/graph_/',$box->class)) print ' ('.$langs->trans("Graph").')';
 	print '</td>';
@@ -468,7 +468,7 @@ print '<td class="liste_titre">'.$langs->trans("Parameter").'</td>';
 print '<td class="liste_titre">'.$langs->trans("Value").'</td>';
 print '</tr>';
 
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>';
 print $langs->trans("MaxNbOfLinesForBoxes");
 print '</td>'."\n";
@@ -479,7 +479,7 @@ print '</tr>';
 
 // Activate FileCache - Developement
 if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("EnableFileCache").'</td><td>';
     print $form->selectyesno('MAIN_ACTIVATE_FILECACHE',$conf->global->MAIN_ACTIVATE_FILECACHE,1);
     print '</td>';
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index a77fb706a71..808471e3e6c 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -80,7 +80,7 @@ print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("ClickToDialUseTelLink").'</td><td>';
 print $form->selectyesno("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", $conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS, 1).'<br>';
@@ -88,7 +88,7 @@ print '<br>';
 print $langs->trans("ClickToDialUseTelLinkDesc");
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("DefaultLink").'</td><td>';
 print '<input style="width: 90%" type="text" name="CLICKTODIAL_URL"'.($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS?' disabled="disabled"':'').' value="'.$conf->global->CLICKTODIAL_URL.'"><br>';
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index a9041f5272b..65638ca1d77 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -330,7 +330,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						$var=!$var;
+						
 						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -588,7 +588,7 @@ print "</td></tr>\n";
 print '</form>';
 
 //Use draft Watermark
-$var=!$var;
+
 print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_COMMANDE_DRAFT_WATERMARK\">";
@@ -603,8 +603,8 @@ print '</form>';
 // Shippable Icon in List
 /* Kept as hidden feature for the moment, result seems bugged. 
 Whet is definition of "shippable" according to all different STOCK_CALCULATE_... options ?
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ShippableOrderIconInList").'</td>';
 print '<td>&nbsp</td>';
 print '<td align="center">';
@@ -623,7 +623,7 @@ print '</tr>';
 // Ask for payment bank during order
 if ($conf->banque->enabled)
 {
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp</td><td align="center">';
     if (! empty($conf->use_javascript_ajax))
@@ -645,7 +645,7 @@ if ($conf->banque->enabled)
 }
 else
 {
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
@@ -653,7 +653,7 @@ else
 // Ask for warehouse during order
 if ($conf->stock->enabled)
 {
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").'</td><td>&nbsp</td><td align="center">';
     if (! empty($conf->use_javascript_ajax))
@@ -675,7 +675,7 @@ if ($conf->stock->enabled)
 }
 else
 {
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index d73f23d0ef7..ad25c3620c3 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -309,72 +309,72 @@ if ($action == 'edit' || $action == 'updateedit')
 	print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
 
 	// Name
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
 	print '<input name="nom" id="name" class="minwidth200" value="'. ($conf->global->MAIN_INFO_SOCIETE_NOM?$conf->global->MAIN_INFO_SOCIETE_NOM:$_POST["nom"]) . '" autofocus="autofocus"></td></tr>'."\n";
 
 	// Addresse
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
 	print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_SOCIETE_ADDRESS?$conf->global->MAIN_INFO_SOCIETE_ADDRESS:$_POST["address"]) . '</textarea></td></tr>'."\n";
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
 	print '<input class="minwidth100" name="zipcode" id="zipcode" value="'. ($conf->global->MAIN_INFO_SOCIETE_ZIP?$conf->global->MAIN_INFO_SOCIETE_ZIP:$_POST["zipcode"]) . '"></td></tr>'."\n";
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
 	print '<input name="town" class="minwidth100" id="town" value="'. ($conf->global->MAIN_INFO_SOCIETE_TOWN?$conf->global->MAIN_INFO_SOCIETE_TOWN:$_POST["town"]) . '"></td></tr>'."\n";
 
 	// Country
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
 	//if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
 	print $form->select_country($mysoc->country_id,'country_id');
 	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 	print '</td></tr>'."\n";
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
 	$formcompany->select_departement($conf->global->MAIN_INFO_SOCIETE_STATE,$mysoc->country_code,'state_id');
 	print '</td></tr>'."\n";
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="currency">'.$langs->trans("CompanyCurrency").'</label></td><td>';
 	print $form->selectCurrency($conf->currency,"currency");
 	print '</td></tr>'."\n";
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 	print '<input name="tel" id="phone" value="'. $conf->global->MAIN_INFO_SOCIETE_TEL . '"></td></tr>';
 	print '</td></tr>'."\n";
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
 	print '<input name="fax" id="fax" value="'. $conf->global->MAIN_INFO_SOCIETE_FAX . '"></td></tr>';
 	print '</td></tr>'."\n";
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
 	print '<input name="mail" id="email" class="minwidth200" value="'. $conf->global->MAIN_INFO_SOCIETE_MAIL . '"></td></tr>';
 	print '</td></tr>'."\n";
 
 	// Web
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
 	print '<input name="web" id="web" class="minwidth300" value="'. $conf->global->MAIN_INFO_SOCIETE_WEB . '"></td></tr>';
 	print '</td></tr>'."\n";
 
 	// Barcode
 	if (! empty($conf->barcode->enabled)) {
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td><label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
 		print '<input name="barcode" id="barcode" class="minwidth150" value="'. $conf->global->MAIN_INFO_SOCIETE_GENCOD . '"></td></tr>';
 		print '</td></tr>';
 	}
 
 	// Logo
-	$var=!$var;
+	
 	print '<tr'.dol_bc($var,'hideonsmartphone').'><td><label for="logo">'.$langs->trans("Logo").' (png,jpg)</label></td><td>';
 	print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
 	print '<input type="file" class="flat class=minwidth200" name="logo" id="logo">';
@@ -392,7 +392,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	print '</td></tr>';
 
 	// Note
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
 	print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? $conf->global->MAIN_INFO_SOCIETE_NOTE : '').'</textarea></td></tr>';
 	print '</td></tr>';
@@ -409,17 +409,17 @@ if ($action == 'edit' || $action == 'updateedit')
 	$langs->load("companies");
 
 	// Managing Director(s)
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
 	print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" class="minwidth200" value="' . $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '"></td></tr>';
 
 	// Capital
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
 	print '<input name="capital" id="capital" class="minwidth100" value="' . $conf->global->MAIN_INFO_CAPITAL . '"></td></tr>';
 
 	// Juridical Status
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="forme_juridique_code">'.$langs->trans("JuridicalStatus").'</label></td><td>';
 	if ($mysoc->country_code) {
 		print $formcompany->select_juridicalstatus($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE, $mysoc->country_code, '', 'forme_juridique_code');
@@ -431,7 +431,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	// ProfID1
 	if ($langs->transcountry("ProfId1",$mysoc->country_code) != '-')
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td><label for="profid1">'.$langs->transcountry("ProfId1",$mysoc->country_code).'</label></td><td>';
 		if (! empty($mysoc->country_code))
 		{
@@ -447,7 +447,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	// ProfId2
 	if ($langs->transcountry("ProfId2",$mysoc->country_code) != '-')
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td><label for="profid2">'.$langs->transcountry("ProfId2",$mysoc->country_code).'</label></td><td>';
 		if (! empty($mysoc->country_code))
 		{
@@ -463,7 +463,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	// ProfId3
 	if ($langs->transcountry("ProfId3",$mysoc->country_code) != '-')
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td><label for="profid3">'.$langs->transcountry("ProfId3",$mysoc->country_code).'</label></td><td>';
 		if (! empty($mysoc->country_code))
 		{
@@ -479,7 +479,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	// ProfId4
 	if ($langs->transcountry("ProfId4",$mysoc->country_code) != '-')
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td><label for="profid4">'.$langs->transcountry("ProfId4",$mysoc->country_code).'</label></td><td>';
 		if (! empty($mysoc->country_code))
 		{
@@ -495,7 +495,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	// ProfId5
 	if ($langs->transcountry("ProfId5",$mysoc->country_code) != '-')
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td><label for="profid5">'.$langs->transcountry("ProfId5",$mysoc->country_code).'</label></td><td>';
 		if (! empty($mysoc->country_code))
 		{
@@ -511,7 +511,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	// ProfId6
 	if ($langs->transcountry("ProfId6",$mysoc->country_code) != '-')
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td><label for="profid6">'.$langs->transcountry("ProfId6",$mysoc->country_code).'</label></td><td>';
 		if (! empty($mysoc->country_code))
 		{
@@ -525,13 +525,13 @@ if ($action == 'edit' || $action == 'updateedit')
 	}
 
 	// TVA Intra
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="intra_vat">'.$langs->trans("VATIntra").'</label></td><td>';
 	print '<input name="tva" id="intra_vat" class="minwidth200" value="' . (! empty($conf->global->MAIN_INFO_TVAINTRA) ? $conf->global->MAIN_INFO_TVAINTRA : '') . '">';
 	print '</td></tr>';
 	
 	// Object of the company
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="object">'.$langs->trans("CompanyObject").'</label></td><td>';
 	print '<textarea class="flat quatrevingtpercent" name="object" id="object" rows="'.ROWS_5.'">'.(! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? $conf->global->MAIN_INFO_SOCIETE_OBJECT : '').'</textarea></td></tr>';
 	print '</td></tr>';
@@ -547,7 +547,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	print "</tr>\n";
 	$var=true;
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td><label for="fiscalmonthstart">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
 	print $formother->select_month($conf->global->SOCIETE_FISCAL_MONTH_START,'fiscalmonthstart',0,1) . '</td></tr>';
 
@@ -563,7 +563,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	print "</tr>\n";
 	$var=true;
 
-	$var=!$var;
+	
 	print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
 	print '<td colspan="2">';
 	print "<table>";
@@ -572,7 +572,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	print "</table>";
 	print "</td></tr>\n";
 
-	$var=!$var;
+	
 	print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
 	print '<td colspan="2">';
 	print "<table>";
@@ -596,7 +596,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
 		$var=true;
-		$var=!$var;
+		
 		// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
 		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
@@ -619,7 +619,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print "</table>";
 		print "</td></tr>\n";
 
-		$var=!$var;
+		
 		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
@@ -641,7 +641,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print "</tr>\n";
 		$var=true;
 
-		$var=!$var;
+		
 		// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
 		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
@@ -661,7 +661,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print "</table>";
 		print "</td></tr>\n";
 
-		$var=!$var;
+		
 		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
@@ -698,22 +698,22 @@ else
 	print '<tr class="liste_titre"><td>'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>';
 	$var=true;
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td class="titlefield">'.$langs->trans("CompanyName").'</td><td>';
 	if (! empty($conf->global->MAIN_INFO_SOCIETE_NOM)) print $conf->global->MAIN_INFO_SOCIETE_NOM;
 	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyName")).'</font>';
 	print '</td></tr>';
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyAddress").'</td><td>' . nl2br(empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS) . '</td></tr>';
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyZip").'</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP) . '</td></tr>';
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyTown").'</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN) . '</td></tr>';
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyCountry").'</td><td>';
 	if ($mysoc->country_code)
 	{
@@ -724,13 +724,13 @@ else
 	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 	print '</td></tr>';
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("State").'</td><td>';
 	if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE)) print getState($conf->global->MAIN_INFO_SOCIETE_STATE);
 	else print '&nbsp;';
 	print '</td></tr>';
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyCurrency").'</td><td>';
 	print currency_name($conf->currency,1);
 	print ' ('.$conf->currency;
@@ -738,28 +738,28 @@ else
 	print ')';
 	print '</td></tr>';
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("Phone").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_TEL,$mysoc->country_code) . '</td></tr>';
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("Fax").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_FAX,$mysoc->country_code) . '</td></tr>';
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("Mail").'</td><td>' . dol_print_email($conf->global->MAIN_INFO_SOCIETE_MAIL,0,0,0,80) . '</td></tr>';
 
 	// Web
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("Web").'</td><td>' . dol_print_url($conf->global->MAIN_INFO_SOCIETE_WEB,'_blank',80) . '</td></tr>';
 
 	// Barcode
 	if (! empty($conf->barcode->enabled))
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td>'.$langs->trans("Gencod").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_GENCOD . '</td></tr>';
 	}
 
 	// Logo
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("Logo").'</td><td>';
 
 	$tagtd='tagtd ';
@@ -785,7 +785,7 @@ else
 
 	print '</td></tr>';
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td class="tdtop">'.$langs->trans("Note").'</td><td>' . (! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? nl2br($conf->global->MAIN_INFO_SOCIETE_NOTE) : '') . '</td></tr>';
 
 	print '</table>';
@@ -802,17 +802,17 @@ else
 	$var=true;
 
 	// Managing Director(s)
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("ManagingDirectors").'</td><td>';
 	print $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '</td></tr>';
 
 	// Capital
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("Capital").'</td><td>';
 	print $conf->global->MAIN_INFO_CAPITAL . '</td></tr>';
 
 	// Juridical Status
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("JuridicalStatus").'</td><td>';
 	print getFormeJuridiqueLabel($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE);
 	print '</td></tr>';
@@ -820,7 +820,7 @@ else
 	// ProfId1
 	if ($langs->transcountry("ProfId1",$mysoc->country_code) != '-')
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td>'.$langs->transcountry("ProfId1",$mysoc->country_code).'</td><td>';
 		if (! empty($conf->global->MAIN_INFO_SIREN))
 		{
@@ -836,7 +836,7 @@ else
 	// ProfId2
 	if ($langs->transcountry("ProfId2",$mysoc->country_code) != '-')
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td>'.$langs->transcountry("ProfId2",$mysoc->country_code).'</td><td>';
 		if (! empty($conf->global->MAIN_INFO_SIRET))
 		{
@@ -852,7 +852,7 @@ else
 	// ProfId3
 	if ($langs->transcountry("ProfId3",$mysoc->country_code) != '-')
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td>'.$langs->transcountry("ProfId3",$mysoc->country_code).'</td><td>';
 		if (! empty($conf->global->MAIN_INFO_APE))
 		{
@@ -868,7 +868,7 @@ else
 	// ProfId4
 	if ($langs->transcountry("ProfId4",$mysoc->country_code) != '-')
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td>'.$langs->transcountry("ProfId4",$mysoc->country_code).'</td><td>';
 		if (! empty($conf->global->MAIN_INFO_RCS))
 		{
@@ -884,7 +884,7 @@ else
 	// ProfId5
 	if ($langs->transcountry("ProfId5",$mysoc->country_code) != '-')
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td>'.$langs->transcountry("ProfId5",$mysoc->country_code).'</td><td>';
 		if (! empty($conf->global->MAIN_INFO_PROFID5))
 		{
@@ -900,7 +900,7 @@ else
 	// ProfId6
 	if ($langs->transcountry("ProfId6",$mysoc->country_code) != '-')
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td>'.$langs->transcountry("ProfId6",$mysoc->country_code).'</td><td>';
 		if (! empty($conf->global->MAIN_INFO_PROFID6))
 		{
@@ -914,7 +914,7 @@ else
 	}
 
 	// VAT
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("VATIntra").'</td>';
 	print '<td>';
 	if (! empty($conf->global->MAIN_INFO_TVAINTRA))
@@ -951,7 +951,7 @@ else
 	print '</td>';
 	print '</tr>';
 	
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td class="tdtop">'.$langs->trans("CompanyObject").'</td><td>' . (! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? nl2br($conf->global->MAIN_INFO_SOCIETE_OBJECT) : '') . '</td></tr>';
 
 	print '</table>';
@@ -967,7 +967,7 @@ else
 	print "</tr>\n";
 	$var=true;
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("FiscalMonthStart").'</td><td>';
 	$monthstart=(! empty($conf->global->SOCIETE_FISCAL_MONTH_START)) ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1;
 	print dol_print_date(dol_mktime(12,0,0,$monthstart,1,2000,1),'%B','gm') . '</td></tr>';
@@ -985,7 +985,7 @@ else
 	print "</tr>\n";
 	$var=true;
 
-	$var=!$var;
+	
 	print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
 	print '<td colspan="2">';
 	print "<table>";
@@ -994,7 +994,7 @@ else
 	print "</table>";
 	print "</td></tr>\n";
 
-	$var=!$var;
+	
 	print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
 	print '<td colspan="2">';
 	print "<table>";
@@ -1020,7 +1020,7 @@ else
 		print "</tr>\n";
 		$var=true;
 
-		$var=!$var;
+		
 		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
@@ -1048,7 +1048,7 @@ else
 		print "</table>";
 		print "</td></tr>\n";
 
-		$var=!$var;
+		
 		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
@@ -1071,7 +1071,7 @@ else
 		print "</tr>\n";
 		$var=true;
 
-		$var=!$var;
+		
 		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
@@ -1100,7 +1100,7 @@ else
 		print "</table>";
 		print "</td></tr>\n";
 
-		$var=!$var;
+		
 		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index abe5663084b..c097b9f39b1 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -148,7 +148,7 @@ print "</tr>\n";
 
 foreach ($list as $key)
 {
-	$var=!$var;
+	
 
 	print '<tr '.$bc[$var].' class="value">';
 
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 7fa47724c3d..c7b943625ae 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -247,7 +247,7 @@ if ($result)
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($result);
-		$var=!$var;
+		
 
 		print "\n";
 
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 487203c9f4d..043450bdda4 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -266,7 +266,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						$var=!$var;
+						
 						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -519,7 +519,7 @@ else
 print '</td></tr>'."\n";
 
 //Use draft Watermark
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("WatermarkOnDraftContractCards").'</td><td>';
 print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 237f235f99c..266ebac9100 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -37,7 +37,7 @@ if (!$user->admin) accessforbidden();
 $id=GETPOST('rowid','int');
 $action=GETPOST('action','alpha');
 
-$mode = GETPOST('mode')?GETPOST('mode'):'createform';
+$mode = GETPOST('mode')?GETPOST('mode'):'createform';   // 'createform', 'filters', 'sortorder'
 
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
@@ -47,13 +47,15 @@ if ($page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='lang,transkey';
+if (! $sortfield) $sortfield='page,param';
 if (! $sortorder) $sortorder='ASC';
 
 $defaulturl = GETPOST('defaulturl');
 $defaultkey = GETPOST('defaultkey','alpha');
 $defaultvalue = GETPOST('defaultvalue');
 
+$defaulturl=preg_replace('/^\//', '', $defaulturl);
+
 
 /*
  * Actions
@@ -69,7 +71,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Purge search criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
     $defaulturl='';
     $defaultkey='';
@@ -95,13 +97,13 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 	}
 	if (! $error)
 	{
-		//$sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."')";
-		//$result = $db->query($sql);
-		
-	    // TODO Insert var
-	    
+	    $db->begin();
+	     
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."default_values(type, user_id, page, param, value, entity) VALUES ('".$db->escape($mode)."', 0, '".$db->escape($defaulturl)."','".$db->escape($defaultkey)."','".$db->escape($defaultvalue)."', ".$db->escape($conf->entity).")";
+		$result = $db->query($sql);
 		if ($result > 0)
 		{
+		    $db->commit();
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$action="";
 			$defaulturl='';
@@ -110,7 +112,8 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 		}
 		else
 		{
-			dol_print_error($db);
+	        $db->rollback();
+		    setEventMessages($db->lasterror(), null, 'errors');
 			$action='';
 		}
 	}
@@ -119,7 +122,7 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 // Delete line from delete picto
 if ($action == 'delete')
 {
-	//$sql = "DELETE FROM ".MAIN_DB_PREFIX."overwrite_trans WHERE rowid = ".$db->escape($id);
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."default_values WHERE rowid = ".$db->escape($id);
 	// Delete const
 	$result = $db->query($sql);
 	if ($result >= 0)
@@ -176,7 +179,7 @@ dol_fiche_head($head, $mode, '', -1, '');
 
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" id="action" name="action" value="">';
-print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
+print '<input type="hidden" id="mode" name="mode" value="'.dol_escape_htmltag($mode).'">';
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -185,16 +188,29 @@ if ($mode == 'createform') $texthelp.=$langs->trans("PageUrlForDefaultValuesCrea
 else $texthelp.=$langs->trans("PageUrlForDefaultValuesList", 'societe/list.php');
 $texturl=$form->textwithpicto($langs->trans("Url"), $texthelp);
 print_liste_field_titre($texturl,$_SERVER["PHP_SELF"],'defaulturl','',$param,'',$sortfield,$sortorder);
+$texthelp=$langs->trans("TheKeyIsTheNameOfHtmlField");
+if ($mode != 'sortorder') $textkey=$form->textwithpicto($langs->trans("Key"), $texthelp);
+else $textkey=$form->textwithpicto($langs->trans("Key"), $texthelp);
+print_liste_field_titre($textkey,$_SERVER["PHP_SELF"],'defaultkey','',$param,'',$sortfield,$sortorder);
 if ($mode != 'sortorder')
 {
-    $texthelp=$langs->trans("TheKeyIsTheNameOfHtmlField");
-    $textkey=$form->textwithpicto($langs->trans("Key"), $texthelp);
-    print_liste_field_titre($textkey,$_SERVER["PHP_SELF"],'defaultkey','',$param,'',$sortfield,$sortorder);
+    $texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+    // See list into GETPOST
+    $texthelp.='__USERID__<br>';
+    $texthelp.='__MYCOUNTRYID__<br>';
+    $texthelp.='__DAY__<br>';
+    $texthelp.='__MONTH__<br>';
+    $texthelp.='__YEAR__<br>';
+    if (! empty($conf->multicompany->enabled)) $texthelp.='__ENTITYID__<br>';
+    $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp);
+}
+else
+{
+    $texthelp='ASC or DESC';
+    $textvalue=$form->textwithpicto($langs->trans("SortOrder"), $texthelp);
 }
-$texthelp=$langs->trans("YouCanUseSubstitutionValue");
-$textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp);
 print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'defaultvalue', '', $param, '', $sortfield, $sortorder);
-//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],'entity,transkey','',$param,'',$sortfield,$sortorder);
+if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],'entity,page','',$param,'',$sortfield,$sortorder);
 print '<td align="center"></td>';
 print "</tr>\n";
 
@@ -206,17 +222,14 @@ print '<tr class="oddeven">';
 print '<td>';
 print '<input type="text" class="flat minwidth200 maxwidthonsmartphone" name="defaulturl" value="">';
 print '</td>'."\n";
-if ($mode != 'sortorder')
-{
-    print '<td>';
-    print '<input type="text" class="flat maxwidth100" name="defaultkey" value="">';
-    print '</td>';
-}
+print '<td>';
+print '<input type="text" class="flat maxwidth100" name="defaultkey" value="">';
+print '</td>';
 print '<td>';
 print '<input type="text" class="flat maxwidthonsmartphone" name="defaultvalue" value="">';
 print '</td>';
 // Limit to superadmin
-/*if (! empty($conf->multicompany->enabled) && !$user->entity)
+if (! empty($conf->multicompany->enabled) && !$user->entity)
 {
 	print '<td>';
 	print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">';
@@ -224,28 +237,20 @@ print '</td>';
 	print '<td align="center">';
 }
 else
-{*/
+{
 	print '<td align="center">';
 	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
-//}
+}
 print '<input type="submit" class="button" value="'.$langs->trans("Add").'" name="add">';
 print "</td>\n";
 print '</tr>';
 
 
 // Show constants
-/*$sql = "SELECT";
-$sql.= " rowid";
-$sql.= ", lang";
-$sql.= ", transkey";
-$sql.= ", transvalue";
-$sql.= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
-$sql.= " WHERE 1 = 1";*/
-//$sql.= " AND entity IN (".$user->entity.",".$conf->entity.")";
-//if ((empty($user->entity) || $user->admin) && $debug) {} 										// to force for superadmin to debug
-//else if (! GETPOST('visible') || GETPOST('visible') != 'all') $sql.= " AND visible = 1";		// We must always have this. Otherwise, array is too large and submitting data fails due to apache POST or GET limits
-//if (GETPOST('name')) $sql.=natural_search("name", GETPOST('name'));
-//$sql.= " ORDER BY entity, name ASC";
+$sql = "SELECT rowid, entity, type, page, param, value";
+$sql.= " FROM ".MAIN_DB_PREFIX."default_values";
+$sql.= " WHERE type = '".$db->escape($mode)."'";
+$sql.= " AND entity IN (".$user->entity.",".$conf->entity.")";
 $sql.= $db->order($sortfield, $sortorder);
 
 dol_syslog("translation::select from table", LOG_DEBUG);
@@ -259,17 +264,14 @@ if ($result)
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($result);
-		$var=!$var;
+		
 
 		print "\n";
 
 		print '<tr class="oddeven">';
 		
-		print '<td>'.$obj->lang.'</td>'."\n";
-        if ($mode != 'sortorder')
-        {
-	   	   print '<td>'.$obj->transkey.'</td>'."\n";
-        }
+		print '<td>'.$obj->page.'</td>'."\n";
+   	    print '<td>'.$obj->param.'</td>'."\n";
         
 		// Value
 		print '<td>';
@@ -278,11 +280,11 @@ if ($result)
 		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
 		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
 		*/
-		print $obj->transvalue;
+		print $obj->value;
 		print '</td>';
 
 		print '<td align="center">';
-		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_delete().'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_delete().'</a>';
 		print '</td>';
 		
 		print "</tr>\n";
@@ -290,6 +292,10 @@ if ($result)
 		$i++;
 	}
 }
+else
+{
+    dol_print_error($db);
+}
 
 
 print '</table>';
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 597327c04ba..0280673906b 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -173,9 +173,9 @@ if ($action == 'edit')
     	{
     		foreach($delays as $delay)
     		{
-    			$var=!$var;
+    			
 				$value=(! empty($conf->global->{$delay['code']})?$conf->global->{$delay['code']}:0);
-    			print '<tr '.$bc[$var].'>';
+    			print '<tr class="oddeven">';
     			print '<td width="20px">'.img_object('',$delay['img']).'</td>';
     			print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td>';
     			print '<input size="5" name="'.$delay['code'].'" value="'.$value.'"> '.$langs->trans("days").'</td></tr>';
@@ -192,7 +192,7 @@ if ($action == 'edit')
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="120px">'.$langs->trans("Value").'</td></tr>';
 
 	$var=false;
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td>' .$form->selectyesno('MAIN_DISABLE_METEO',(empty($conf->global->MAIN_DISABLE_METEO)?0:1),1) . '</td></tr>';
 
 	print '</table>';
@@ -220,9 +220,9 @@ else
     	{
     		foreach($delays as $delay)
     		{
-    			$var=!$var;
+    			
 				$value=(! empty($conf->global->{$delay['code']})?$conf->global->{$delay['code']}:0);
-    			print '<tr '.$bc[$var].'>';
+    			print '<tr class="oddeven">';
     			print '<td width="20px">'.img_object('',$delay['img']).'</td>';
     			print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td>';
     			print '<td>'.$value.' '.$langs->trans("days").'</td></tr>';
@@ -239,7 +239,7 @@ else
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="120px">'.$langs->trans("Value").'</td></tr>';
 
 	$var=false;
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td>' . yn($conf->global->MAIN_DISABLE_METEO) . '</td></tr>';
 
 	print '</table>';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 7392ca23905..d1a2709e221 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1570,12 +1570,12 @@ else
         {
         	if ($showemptyline)
         	{
-        		$var=!$var;
+        		
         		print '<tr '.$bc[$var].'><td width="30%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
         		$showemptyline=0;
         	}
 
-            $var=!$var;
+            
             $value=$tabname[$i];
             print '<tr '.$bc[$var].'><td width="50%">';
             if (! empty($tabcond[$i]))
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index 41824fea4c6..7b7357ee9eb 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -84,8 +84,8 @@ $var=true;
 $form = new Form($db);
 
 // Mail required for members
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ECMAutoTree").'</td>';
 print '<td align="center" width="20">&nbsp;</td>';
 
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 892e0860cbd..161b1aac45d 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -99,8 +99,8 @@ foreach ($eventstolog as $key => $arr)
 {
 	if ($arr['id'])
 	{
-		$var=!$var;
-		print '<tr '.$bc[$var].'>';
+		
+		print '<tr class="oddeven">';
 		print '<td>'.$arr['id'].'</td>';
 		print '<td>';
 		$key='MAIN_LOGEVENTS_'.$arr['id'];
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index a26a21fbede..746f7183123 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -275,7 +275,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-						$var=!$var;
+						
 						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -398,7 +398,7 @@ foreach ($dirmodels as $reldir)
 
 		    		if (file_exists($dir.'/'.$file))
 		    		{
-		    			$var=!$var;
+		    			
 
 		    			$name = substr($file, 4, dol_strlen($file) -16);
 		    			$classname = substr($file, 0, dol_strlen($file) -12);
@@ -522,7 +522,7 @@ else
 print '</td></tr>'."\n";
 
 //Use draft Watermark
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td colspan="2">';
 print $langs->trans("WatermarkOnDraftOrders").'<br>';
 print '<input size="50" class="flat" type="text" name="EXPENSEREPORT_DRAFT_WATERMARK" value="'.$conf->global->EXPENSEREPORT_DRAFT_WATERMARK.'">';
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 8e550f98c99..7f81a5d0fef 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -266,20 +266,20 @@ if ($resql)
 		print '</td>';
 		print "</tr>";
 
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 		print "<td width=\"100px\">".$langs->trans("Title")."</td>";
 		print "<td><input type=\"text\" class=\"flat\" name=\"external_rss_title_" . $idrss . "\" value=\"" . @constant("EXTERNAL_RSS_TITLE_" . $idrss) . "\" size=\"64\"></td>";
 		print "</tr>";
 
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 		print "<td>".$langs->trans("URL")."</td>";
 		print "<td><input type=\"text\" class=\"flat\" name=\"external_rss_urlrss_" . $idrss . "\" value=\"" . @constant("EXTERNAL_RSS_URLRSS_" . $idrss) . "\" size=\"64\"></td>";
 		print "</tr>";
 
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 		print "<td>".$langs->trans("Status")."</td>";
 		print "<td>";
 	    if ($result > 0 && empty($rss->error))
@@ -299,8 +299,8 @@ if ($resql)
 		// Logo
 	    if ($result > 0 && empty($rss->error))
 	    {
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 			print "<td>".$langs->trans("Logo")."</td>";
 			print '<td>';
 			$imageurl=$rssparser->getImageUrl();
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index c95d8297cf9..65f8f31dd0a 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -628,8 +628,8 @@ print '<input type="hidden" name="action" value="setribchq">';
 print $langs->trans("PaymentMode").'</td>';
 print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print "<td>".$langs->trans("SuggestPaymentByRIBOnAccount")."</td>";
 print "<td>";
 if (! empty($conf->banque->enabled))
@@ -671,8 +671,8 @@ else
     print $langs->trans("BankModuleNotActive");
 }
 print "</td></tr>";
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print "<td>".$langs->trans("SuggestPaymentByChequeToAddress")."</td>";
 print "<td>";
 print '<select class="flat" name="chq" id="chq">';
@@ -692,7 +692,7 @@ if ($resql)
     $i = 0;
     while ($i < $num)
     {
-        $var=!$var;
+        
         $row = $db->fetch_row($resql);
 
         print '<option value="'.$row[0].'"';
@@ -755,7 +755,7 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" /
 print "</td></tr>\n";
 print '</form>';
 
-$var=!$var;
+
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_FACTURE_DRAFT_WATERMARK" />';
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 23ff67f92e7..9f1d3913630 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -159,8 +159,8 @@ else
         // Si condition non remplie, on ne propose pas l'option
         if (! $conditions[$const]) continue;
 
-        $var=!$var;
-        print "<tr ".$bc[$var].">";
+        
+        print '<tr class="oddeven">';
         print '<td width="16">'.img_object("",$picto[$const]).'</td>';
         print '<td>'.$langs->trans($desc).'</td>';
         print '<td align="center" width="100">';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 8d31db0d3af..cbcf925b907 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -310,7 +310,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-						$var=!$var;
+						
 						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -433,7 +433,7 @@ foreach ($dirmodels as $reldir)
 		    	{
 		    		if (file_exists($dir.'/'.$file))
 		    		{
-		    			$var=!$var;
+		    			
 
 		    			$name = substr($file, 4, dol_strlen($file) -16);
 		    			$classname = substr($file, 0, dol_strlen($file) -12);
@@ -557,7 +557,7 @@ print "</td></tr>\n";
 print '</form>';
 
 //Use draft Watermark
-$var=!$var;
+
 print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_FICHINTER_DRAFT_WATERMARK\">";
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index b4d379e15d1..7626148b9da 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -105,7 +105,7 @@ print '<td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td
 print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width=\"50%\">'.$langs->trans("PathToGeoIPMaxmindCountryDataFile").'</td>';
 print '<td colspan="2">';
 
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 1036d1057a9..193ee35a80f 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -421,7 +421,7 @@ if ($action == 'edit')	// Edit
 	print '</td></tr>'."\n";
 	
 	// Background
-	$var=!$var;
+	
 	print '<tr><td><label for="imagebackground">'.$langs->trans("BackgroundImageLogin").' (png,jpg)</label></td><td colspan="2">';
     print '<div class="centpercent inline-block">';
 	print '<input type="file" class="flat class=minwidth200" name="imagebackground" id="imagebackground">';
@@ -603,7 +603,7 @@ else	// Show
     print '</td></tr>'."\n";
     
     // Background login
-    $var=!$var;
+    
     print '<tr class="oddeven"><td>'.$langs->trans("BackgroundImageLogin").'</td><td colspan="2">';
     print '<div class="centpercent inline-block">';
     print $conf->global->MAIN_LOGIN_BACKGROUND;
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 5c1b0fcad11..5eeab2a2838 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -110,7 +110,7 @@ print '<td colspan="3">'.$langs->trans("LDAPSynchronization").'</td>';
 print "</tr>\n";
 
 // Synchro utilisateurs/groupes active
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPDnSynchroActive").'</td><td>';
 $arraylist=array();
 $arraylist['0']=$langs->trans("No");
@@ -127,7 +127,7 @@ print '</td></tr>';
 // Synchro contact active
 if (! empty($conf->societe->enabled))
 {
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPDnContactActive").'</td><td>';
 	$arraylist=array();
 	$arraylist['0']=$langs->trans("No");
@@ -139,7 +139,7 @@ if (! empty($conf->societe->enabled))
 // Synchro member active
 if (! empty($conf->adherent->enabled))
 {
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPDnMemberActive").'</td><td>';
 	$arraylist=array();
 	$arraylist['0']=$langs->trans("No");
@@ -156,7 +156,7 @@ print '<td>'.$langs->trans("Example").'</td>';
 print "</tr>\n";
 
 // Type
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("Type").'</td><td>';
 $arraylist=array();
 $arraylist['activedirectory']='Active Directory';
@@ -166,7 +166,7 @@ print $form->selectarray('type',$arraylist,$conf->global->LDAP_SERVER_TYPE);
 print '</td><td>&nbsp;</td></tr>';
 
 // Version
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("Version").'</td><td>';
 $arraylist=array();
 $arraylist['3']='Version 3';
@@ -175,21 +175,21 @@ print $form->selectarray('LDAP_SERVER_PROTOCOLVERSION',$arraylist,$conf->global-
 print '</td><td>'.$langs->trans("LDAPServerProtocolVersion").'</td></tr>';
 
 // Serveur primaire
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("LDAPPrimaryServer").'</td><td>';
 print '<input size="25" type="text" name="host" value="'.$conf->global->LDAP_SERVER_HOST.'">';
 print '</td><td>'.$langs->trans("LDAPServerExample").'</td></tr>';
 
 // Serveur secondaire
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("LDAPSecondaryServer").'</td><td>';
 print '<input size="25" type="text" name="slave" value="'.$conf->global->LDAP_SERVER_HOST_SLAVE.'">';
 print '</td><td>'.$langs->trans("LDAPServerExample").'</td></tr>';
 
 // Port
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPServerPort").'</td><td>';
 if (! empty($conf->global->LDAP_SERVER_PORT))
 {
@@ -202,13 +202,13 @@ else
 print '</td><td>'.$langs->trans("LDAPServerPortExample").'</td></tr>';
 
 // DNserver
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPServerDn").'</td><td>';
 print '<input size="25" type="text" name="dn" value="'.$conf->global->LDAP_SERVER_DN.'">';
 print '</td><td>'.$langs->trans("LDAPServerDnExample").'</td></tr>';
 
 // Utiliser TLS
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPServerUseTLS").'</td><td>';
 $arraylist=array();
 $arraylist['0']=$langs->trans("No");
@@ -221,13 +221,13 @@ print '<td colspan="3">'.$langs->trans("ForANonAnonymousAccess").'</td>';
 print "</tr>\n";
 
 // DNAdmin
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPAdminDn").'</td><td>';
 print '<input size="25" type="text" name="admin" value="'.$conf->global->LDAP_ADMIN_DN.'">';
 print '</td><td>'.$langs->trans("LDAPAdminDnExample").'</td></tr>';
 
 // Pass
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPPassword").'</td><td>';
 if (! empty($conf->global->LDAP_ADMIN_PASS))
 {
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 4901c127e8b..fdc25346863 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -125,7 +125,7 @@ print "</tr>\n";
 
 
 // DN Pour les contacts
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPContactDn").'</span></td><td>';
 print '<input size="48" type="text" name="contactdn" value="'.$conf->global->LDAP_CONTACT_DN.'">';
 print '</td><td>'.$langs->trans("LDAPContactDnExample").'</td>';
@@ -133,7 +133,7 @@ print '<td>&nbsp;</td>';
 print '</tr>';
 
 // List of object class used to define attributes in structure
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPContactObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_CONTACT_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPContactObjectClassListExample").'</td>';
@@ -152,7 +152,7 @@ print '<td align="right">'.$langs->trans("LDAPNamingAttribute").'</td>';
 print "</tr>\n";
 
 // Common name
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFullname").'</td><td>';
 print '<input size="25" type="text" name="fieldfullname" value="'.$conf->global->LDAP_CONTACT_FIELD_FULLNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFullnameExample").'</td>';
@@ -160,7 +160,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Name
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldname" value="'.$conf->global->LDAP_CONTACT_FIELD_NAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldNameExample").'</td>';
@@ -168,7 +168,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Firstname
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFirstName").'</td><td>';
 print '<input size="25" type="text" name="fieldfirstname" value="'.$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFirstNameExample").'</td>';
@@ -176,7 +176,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Company
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldCompany").'</td><td>';
 print '<input size="25" type="text" name="fieldcompany" value="'.$conf->global->LDAP_CONTACT_FIELD_COMPANY.'">';
 print '</td><td>'.$langs->trans("LDAPFieldCompanyExample").'</td>';
@@ -184,7 +184,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Mail
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldMail").'</td><td>';
 print '<input size="25" type="text" name="fieldmail" value="'.$conf->global->LDAP_CONTACT_FIELD_MAIL.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMailExample").'</td>';
@@ -192,7 +192,7 @@ print '<td align="right"><input type="radio" name="key" value=">LDAP_CONTACT_FIE
 print '</tr>';
 
 // Phone pro
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldPhone").'</td><td>';
 print '<input size="25" type="text" name="fieldphone" value="'.$conf->global->LDAP_CONTACT_FIELD_PHONE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPhoneExample").'</td>';
@@ -200,7 +200,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Phone home
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldHomePhone").'</td><td>';
 print '<input size="25" type="text" name="fieldhomephone" value="'.$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldHomePhoneExample").'</td>';
@@ -208,7 +208,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Mobile
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldMobile").'</td><td>';
 print '<input size="25" type="text" name="fieldmobile" value="'.$conf->global->LDAP_CONTACT_FIELD_MOBILE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMobileExample").'</td>';
@@ -216,7 +216,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Skype
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldSkype").'</td><td>';
 print '<input size="25" type="text" name="fieldskype" value="'.$conf->global->LDAP_CONTACT_FIELD_SKYPE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldSkypeExample").'</td>';
@@ -224,7 +224,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Fax
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFax").'</td><td>';
 print '<input size="25" type="text" name="fieldfax" value="'.$conf->global->LDAP_CONTACT_FIELD_FAX.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFaxExample").'</td>';
@@ -232,7 +232,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // Address
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldAddress").'</td><td>';
 print '<input size="25" type="text" name="fieldaddress" value="'.$conf->global->LDAP_CONTACT_FIELD_ADDRESS.'">';
 print '</td><td>'.$langs->trans("LDAPFieldAddressExample").'</td>';
@@ -240,7 +240,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // ZIP
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldZip").'</td><td>';
 print '<input size="25" type="text" name="fieldzip" value="'.$conf->global->LDAP_CONTACT_FIELD_ZIP.'">';
 print '</td><td>'.$langs->trans("LDAPFieldZipExample").'</td>';
@@ -248,7 +248,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // TOWN
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldTown").'</td><td>';
 print '<input size="25" type="text" name="fieldtown" value="'.$conf->global->LDAP_CONTACT_FIELD_TOWN.'">';
 print '</td><td>'.$langs->trans("LDAPFieldTownExample").'</td>';
@@ -256,7 +256,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIEL
 print '</tr>';
 
 // COUNTRY
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldCountry").'</td><td>';
 print '<input size="25" type="text" name="fieldcountry" value="'.$conf->global->LDAP_CONTACT_FIELD_COUNTRY.'">';
 print '</td><td>&nbsp;</td>';
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 90946f5ea44..919ae1c0552 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -116,7 +116,7 @@ print '<td colspan="4">'.$langs->trans("LDAPSynchronizeGroups").'</td>';
 print "</tr>\n";
 
 // DN pour les groupes
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPGroupDn").'</span></td><td>';
 print '<input size="48" type="text" name="group" value="'.$conf->global->LDAP_GROUP_DN.'">';
 print '</td><td>'.$langs->trans("LDAPGroupDnExample").'</td>';
@@ -124,7 +124,7 @@ print '<td>&nbsp;</td>';
 print '</tr>';
 
 // List of object class used to define attributes in structure
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPGroupObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_GROUP_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPGroupObjectClassListExample").'</td>';
@@ -145,7 +145,7 @@ print "</tr>\n";
 // Filtre
 
 // Common name
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldfullname" value="'.$conf->global->LDAP_GROUP_FIELD_FULLNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldCommonNameExample").'</td>';
@@ -153,7 +153,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_GROUP_FIELD_
 print '</tr>';
 
 // Name
-/*$var=!$var;
+/*
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldname" value="'.$conf->global->LDAP_GROUP_FIELD_NAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldNameExample").'</td>';
@@ -162,7 +162,7 @@ print '</tr>';
 */
 
 // Description
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldDescription").'</td><td>';
 print '<input size="25" type="text" name="fielddescription" value="'.$conf->global->LDAP_GROUP_FIELD_DESCRIPTION.'">';
 print '</td><td>'.$langs->trans("LDAPFieldDescriptionExample").'</td>';
@@ -170,7 +170,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_GROUP_FIELD_
 print '</tr>';
 
 // User group
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldGroupMembers").'</td><td>';
 print '<input size="25" type="text" name="fieldgroupmembers" value="'.$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS.'">';
 print '</td><td>'.$langs->trans("LDAPFieldGroupMembersExample").'</td>';
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index 52117961b54..ff09f233afd 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -142,7 +142,7 @@ print '<td colspan="4">'.$langs->trans("LDAPSynchronizeMembers").'</td>';
 print "</tr>\n";
 
 // DN Pour les adherents
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberDn").'</span></td><td>';
 print '<input size="48" type="text" name="user" value="'.$conf->global->LDAP_MEMBER_DN.'">';
 print '</td><td>'.$langs->trans("LDAPMemberDnExample").'</td>';
@@ -150,7 +150,7 @@ print '<td>&nbsp;</td>';
 print '</tr>';
 
 // List of object class used to define attributes in structure
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_MEMBER_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPMemberObjectClassListExample").'</td>';
@@ -158,7 +158,7 @@ print '<td>&nbsp;</td>';
 print '</tr>';
 
 // Filter, used to filter search
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFilterConnection").'</td><td>';
 print '<input size="48" type="text" name="filterconnection" value="'.$conf->global->LDAP_MEMBER_FILTER.'">';
 print '</td><td>'.$langs->trans("LDAPFilterConnectionExample").'</td>';
@@ -179,7 +179,7 @@ print "</tr>\n";
 // Filtre
 
 // Common name
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFullname").'</td><td>';
 print '<input size="25" type="text" name="fieldfullname" value="'.$conf->global->LDAP_MEMBER_FIELD_FULLNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFullnameExample").'</td>';
@@ -187,7 +187,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD
 print '</tr>';
 
 // Name
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldname" value="'.$conf->global->LDAP_MEMBER_FIELD_NAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldNameExample").'</td>';
@@ -195,7 +195,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD
 print '</tr>';
 
 // Firstname
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFirstName").'</td><td>';
 print '<input size="25" type="text" name="fieldfirstname" value="'.$conf->global->LDAP_MEMBER_FIELD_FIRSTNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFirstNameExample").'</td>';
@@ -203,7 +203,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Login unix
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldLoginUnix").'</td><td>';
 print '<input size="25" type="text" name="fieldlogin" value="'.$conf->global->LDAP_MEMBER_FIELD_LOGIN.'">';
 print '</td><td>'.$langs->trans("LDAPFieldLoginExample").'</td>';
@@ -211,7 +211,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD
 print '</tr>';
 
 // Login samba
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldLoginSamba").'</td><td>';
 print '<input size="25" type="text" name="fieldloginsamba" value="'.$conf->global->LDAP_MEMBER_FIELD_LOGIN_SAMBA.'">';
 print '</td><td>'.$langs->trans("LDAPFieldLoginSambaExample").'</td>';
@@ -219,7 +219,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD
 print '</tr>';
 
 // Password not crypted
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td><td>';
 print '<input size="25" type="text" name="fieldpassword" value="'.$conf->global->LDAP_MEMBER_FIELD_PASSWORD.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPasswordExample").'</td>';
@@ -227,7 +227,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Password crypted
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldPasswordCrypted").'</td><td>';
 print '<input size="25" type="text" name="fieldpasswordcrypted" value="'.$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPasswordExample").'</td>';
@@ -235,7 +235,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Mail
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldMail").'</td><td>';
 print '<input size="25" type="text" name="fieldmail" value="'.$conf->global->LDAP_MEMBER_FIELD_MAIL.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMailExample").'</td>';
@@ -243,7 +243,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD
 print '</tr>';
 
 // Phone pro
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldPhone").'</td><td>';
 print '<input size="25" type="text" name="fieldphone" value="'.$conf->global->LDAP_MEMBER_FIELD_PHONE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPhoneExample").'</td>';
@@ -251,7 +251,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Phone perso
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldHomePhone").'</td><td>';
 print '<input size="25" type="text" name="fieldphoneperso" value="'.$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO.'">';
 print '</td><td>'.$langs->trans("LDAPFieldHomePhoneExample").'</td>';
@@ -259,7 +259,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Mobile
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldMobile").'</td><td>';
 print '<input size="25" type="text" name="fieldmobile" value="'.$conf->global->LDAP_MEMBER_FIELD_MOBILE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMobileExample").'</td>';
@@ -267,7 +267,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Skype
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldSkype").'</td><td>';
 print '<input size="25" type="text" name="fieldskype" value="'.$conf->global->LDAP_MEMBER_FIELD_SKYPE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldSkypeExample").'</td>';
@@ -275,7 +275,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Fax
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFax").'</td><td>';
 print '<input size="25" type="text" name="fieldfax" value="'.$conf->global->LDAP_MEMBER_FIELD_FAX.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFaxExample").'</td>';
@@ -283,7 +283,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Address
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldAddress").'</td><td>';
 print '<input size="25" type="text" name="fieldaddress" value="'.$conf->global->LDAP_MEMBER_FIELD_ADDRESS.'">';
 print '</td><td>'.$langs->trans("LDAPFieldAddressExample").'</td>';
@@ -291,7 +291,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // ZIP
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldZip").'</td><td>';
 print '<input size="25" type="text" name="fieldzip" value="'.$conf->global->LDAP_MEMBER_FIELD_ZIP.'">';
 print '</td><td>'.$langs->trans("LDAPFieldZipExample").'</td>';
@@ -299,7 +299,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // TOWN
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldTown").'</td><td>';
 print '<input size="25" type="text" name="fieldtown" value="'.$conf->global->LDAP_MEMBER_FIELD_TOWN.'">';
 print '</td><td>'.$langs->trans("LDAPFieldTownExample").'</td>';
@@ -307,7 +307,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // COUNTRY
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldCountry").'</td><td>';
 print '<input size="25" type="text" name="fieldcountry" value="'.$conf->global->LDAP_MEMBER_FIELD_COUNTRY.'">';
 print '</td><td>&nbsp;</td>';
@@ -315,7 +315,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Description
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldDescription").'</td><td>';
 print '<input size="25" type="text" name="fielddescription" value="'.$conf->global->LDAP_MEMBER_FIELD_DESCRIPTION.'">';
 print '</td><td>'.$langs->trans("LDAPFieldDescriptionExample").'</td>';
@@ -323,7 +323,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Public Note
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldNotePublic").'</td><td>';
 print '<input size="25" type="text" name="fieldnotepublic" value="'.$conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC.'">';
 print '</td><td>'.$langs->trans("LDAPFieldNotePublicExample").'</td>';
@@ -331,7 +331,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Birthday
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldBirthdate").'</td><td>';
 print '<input size="25" type="text" name="fieldbirthdate" value="'.$conf->global->LDAP_MEMBER_FIELD_BIRTHDATE.'">';
 print '</td><td>&nbsp;</td>';
@@ -339,7 +339,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Status
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldStatus").'</td><td>';
 print '<input size="25" type="text" name="fieldstatus" value="'.$conf->global->LDAP_FIELD_MEMBER_STATUS.'">';
 print '</td><td>&nbsp;</td>';
@@ -347,7 +347,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // First subscription date
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFirstSubscriptionDate").'</td><td>';
 print '<input size="25" type="text" name="fieldfirstsubscriptiondate" value="'.$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE.'">';
 print '</td><td>&nbsp;</td>';
@@ -355,7 +355,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // First subscription amount
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFirstSubscriptionAmount").'</td><td>';
 print '<input size="25" type="text" name="fieldfirstsubscriptionamount" value="'.$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT.'">';
 print '</td><td>&nbsp;</td>';
@@ -363,7 +363,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Last subscription date
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldLastSubscriptionDate").'</td><td>';
 print '<input size="25" type="text" name="fieldlastsubscriptiondate" value="'.$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE.'">';
 print '</td><td>&nbsp;</td>';
@@ -371,7 +371,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // Last subscription amount
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldLastSubscriptionAmount").'</td><td>';
 print '<input size="25" type="text" name="fieldlastsubscriptionamount" value="'.$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT.'">';
 print '</td><td>&nbsp;</td>';
@@ -379,7 +379,7 @@ print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
 // End last subscriptions
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldEndLastSubscription").'</td><td>';
 print '<input size="25" type="text" name="fieldendlastsubscription" value="'.$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION.'">';
 print '</td><td>&nbsp;</td>';
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 45043b8a52b..cc99edfe3a7 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -129,7 +129,7 @@ print '<td colspan="4">'.$langs->trans("LDAPSynchronizeUsers").'</td>';
 print "</tr>\n";
 
 // DN Pour les utilisateurs
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPUserDn").'</span></td><td>';
 print '<input size="48" type="text" name="user" value="'.$conf->global->LDAP_USER_DN.'">';
 print '</td><td>'.$langs->trans("LDAPUserDnExample").'</td>';
@@ -137,7 +137,7 @@ print '<td>&nbsp;</td>';
 print '</tr>';
 
 // List of object class used to define attributes in structure
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPUserObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_USER_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPUserObjectClassListExample").'</td>';
@@ -145,7 +145,7 @@ print '<td>&nbsp;</td>';
 print '</tr>';
 
 // Filter, used to filter search
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFilterConnection").'</td><td>';
 print '<input size="48" type="text" name="filterconnection" value="'.$conf->global->LDAP_FILTER_CONNECTION.'">';
 print '</td><td>'.$langs->trans("LDAPFilterConnectionExample").'</td>';
@@ -164,7 +164,7 @@ print '<td align="right">'.$langs->trans("LDAPNamingAttribute").'</td>';
 print "</tr>\n";
 
 // Common name
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFullname").'</td><td>';
 print '<input size="25" type="text" name="fieldfullname" value="'.$conf->global->LDAP_FIELD_FULLNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFullnameExample").'</td>';
@@ -172,7 +172,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_FULLNA
 print '</tr>';
 
 // Name
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldname" value="'.$conf->global->LDAP_FIELD_NAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldNameExample").'</td>';
@@ -180,7 +180,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_NAME"'
 print '</tr>';
 
 // Firstname
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFirstName").'</td><td>';
 print '<input size="25" type="text" name="fieldfirstname" value="'.$conf->global->LDAP_FIELD_FIRSTNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFirstNameExample").'</td>';
@@ -188,7 +188,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_FIRSTN
 print '</tr>';
 
 // Login unix
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldLoginUnix").'</td><td>';
 print '<input size="25" type="text" name="fieldlogin" value="'.$conf->global->LDAP_FIELD_LOGIN.'">';
 print '</td><td>'.$langs->trans("LDAPFieldLoginExample").'</td>';
@@ -196,7 +196,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_LOGIN"
 print '</tr>';
 
 // Login samba
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldLoginSamba").'</td><td>';
 print '<input size="25" type="text" name="fieldloginsamba" value="'.$conf->global->LDAP_FIELD_LOGIN_SAMBA.'">';
 print '</td><td>'.$langs->trans("LDAPFieldLoginSambaExample").'</td>';
@@ -204,7 +204,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_LOGIN_
 print '</tr>';
 
 // Password not crypted
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td><td>';
 print '<input size="25" type="text" name="fieldpassword" value="'.$conf->global->LDAP_FIELD_PASSWORD.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPasswordExample").'</td>';
@@ -212,7 +212,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_PASSWO
 print '</tr>';
 
 // Password crypted
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldPasswordCrypted").'</td><td>';
 print '<input size="25" type="text" name="fieldpasswordcrypted" value="'.$conf->global->LDAP_FIELD_PASSWORD_CRYPTED.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPasswordExample").'</td>';
@@ -220,7 +220,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_PASSWO
 print '</tr>';
 
 // Mail
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldMail").'</td><td>';
 print '<input size="25" type="text" name="fieldmail" value="'.$conf->global->LDAP_FIELD_MAIL.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMailExample").'</td>';
@@ -228,7 +228,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_MAIL"'
 print '</tr>';
 
 // Phone
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldPhone").'</td><td>';
 print '<input size="25" type="text" name="fieldphone" value="'.$conf->global->LDAP_FIELD_PHONE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPhoneExample").'</td>';
@@ -236,7 +236,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_PHONE"
 print '</tr>';
 
 // Mobile
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldMobile").'</td><td>';
 print '<input size="25" type="text" name="fieldmobile" value="'.$conf->global->LDAP_FIELD_MOBILE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMobileExample").'</td>';
@@ -244,7 +244,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_MOBILE
 print '</tr>';
 
 // Skype
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldSkype").'</td><td>';
 print '<input size="25" type="text" name="fieldskype" value="'.$conf->global->LDAP_FIELD_SKYPE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldSkypeExample").'</td>';
@@ -252,7 +252,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_SKYPE"
 print '</tr>';
 
 // Fax
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFax").'</td><td>';
 print '<input size="25" type="text" name="fieldfax" value="'.$conf->global->LDAP_FIELD_FAX.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFaxExample").'</td>';
@@ -260,7 +260,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_FAX"'.
 print '</tr>';
 
 // Title
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldTitle").'</td><td>';
 print '<input size="25" type="text" name="fieldtitle" value="'.$conf->global->LDAP_FIELD_TITLE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldTitleExample").'</td>';
@@ -268,7 +268,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_TITLE"
 print '</tr>';
 
 // Note
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("Note").'</td><td>';
 print '<input size="25" type="text" name="fielddescription" value="'.$conf->global->LDAP_FIELD_DESCRIPTION.'">';
 print '</td><td>'.$langs->trans("LDAPFieldDescriptionExample").'</td>';
@@ -276,7 +276,7 @@ print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_DESCRI
 print '</tr>';
 
 // Sid
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldSid").'</td><td>';
 print '<input size="25" type="text" name="fieldsid" value="'.$conf->global->LDAP_FIELD_SID.'">';
 print '</td><td>'.$langs->trans("LDAPFieldSidExample").'</td>';
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 3806258d246..3dcefa65a11 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -106,20 +106,20 @@ if ($action == 'edit')
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly"));
     print '</td><td><input class="flat" name="MAIN_MAX_DECIMALS_UNIT" size="3" value="' . $conf->global->MAIN_MAX_DECIMALS_UNIT . '"></td></tr>';
 
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
     print '</td><td><input class="flat" name="MAIN_MAX_DECIMALS_TOT" size="3" value="' . $conf->global->MAIN_MAX_DECIMALS_TOT . '"></td></tr>';
 
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td><td><input class="flat" name="MAIN_MAX_DECIMALS_SHOWN" size="3" value="' . $conf->global->MAIN_MAX_DECIMALS_SHOWN . '"></td></tr>';
 
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
     print '</td><td><input class="flat" name="MAIN_ROUNDING_RULE_TOT" size="3" value="' . $conf->global->MAIN_ROUNDING_RULE_TOT . '"></td></tr>';
@@ -140,20 +140,20 @@ else
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly"));
     print '</td><td align="right">'.$conf->global->MAIN_MAX_DECIMALS_UNIT.'</td></tr>';
 
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
     print '</td><td align="right">'.$conf->global->MAIN_MAX_DECIMALS_TOT.'</td></tr>';
 
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td><td align="right">'.$conf->global->MAIN_MAX_DECIMALS_SHOWN.'</td></tr>';
 
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
     print '</td><td align="right">'.$conf->global->MAIN_ROUNDING_RULE_TOT.'</td></tr>';
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index e49f25d7ef8..10d86f1b373 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -258,7 +258,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-                        $var=!$var;
+                        
                         print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
                         print $module->info();
                         print '</td>';
@@ -385,7 +385,7 @@ foreach ($dirmodels as $reldir)
                 {
                 	if (file_exists($dir.'/'.$file))
                 	{
-                		$var=!$var;
+                		
 
 		    			$name = substr($file, 4, dol_strlen($file) -16);
 		    			$classname = substr($file, 0, dol_strlen($file) -12);
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index 3213503835d..ee6b9ef74ee 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -96,7 +96,7 @@ print "</tr>\n";
 
 foreach ($list as $key)
 {
-	$var=!$var;
+	
 
 	print '<tr '.$bc[$var].' class="value">';
 
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 541c8aa1b2d..ebb49e8385e 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -113,21 +113,21 @@ print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("MailingEMailFrom").'</td><td>';
 print '<input size="32" type="text" name="MAILING_EMAIL_FROM" value="'.$conf->global->MAILING_EMAIL_FROM.'">';
 if (!empty($conf->global->MAILING_EMAIL_FROM) && ! isValidEmail($conf->global->MAILING_EMAIL_FROM)) print ' '.img_warning($langs->trans("BadEMail"));
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("MailingEMailError").'</td><td>';
 print '<input size="32" type="text" name="MAILING_EMAIL_ERRORSTO" value="'.$conf->global->MAILING_EMAIL_ERRORSTO.'">';
 if (!empty($conf->global->MAILING_EMAIL_ERRORSTO) && ! isValidEmail($conf->global->MAILING_EMAIL_ERRORSTO)) print ' '.img_warning($langs->trans("BadEMail"));
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("MailingDelay").'</td><td>';
 print '<input size="32" type="text" name="MAILING_DELAY" value="'.$conf->global->MAILING_DELAY.'">';
@@ -135,7 +135,7 @@ print '</td></tr>';
 
 // Constant to add salt into the unsubscribe and check read tag.
 // It is also used as a security key parameter.
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("ActivateCheckReadKey").'</td><td>';
 print '<input size="32" type="text" name="MAILING_EMAIL_UNSUBSCRIBE_KEY" id="MAILING_EMAIL_UNSUBSCRIBE_KEY" value="'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY.'">';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 6c01935ec39..4bc7627ceca 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -241,17 +241,17 @@ if ($action == 'edit')
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	// Disable
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>';
 	print $form->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1);
 	print '</td></tr>';
 
 	// Separator
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
 
 	// Method
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 
 	// SuperAdministrator access only
@@ -270,7 +270,7 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	// Host server
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>';
 	if (! $conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
 	{
@@ -303,7 +303,7 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	// Port
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>';
 	if (! $conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
 	{
@@ -338,7 +338,7 @@ if ($action == 'edit')
 	// ID
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
-		$var=!$var;
+		
 		$mainstmpid=(! empty($conf->global->MAIN_MAIL_SMTPS_ID)?$conf->global->MAIN_MAIL_SMTPS_ID:'');
 		print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>';
 		// SuperAdministrator access only
@@ -358,7 +358,7 @@ if ($action == 'edit')
 	// PW
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
-		$var=!$var;
+		
 		$mainsmtppw=(! empty($conf->global->MAIN_MAIL_SMTPS_PW)?$conf->global->MAIN_MAIL_SMTPS_PW:'');
 		print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
 		// SuperAdministrator access only
@@ -376,7 +376,7 @@ if ($action == 'edit')
 	}
 
 	// TLS
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
@@ -390,7 +390,7 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	// STARTTLS
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
@@ -404,17 +404,17 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	// Separator
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
 	
 	// From
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_EMAIL_FROM" size="32" value="' . (! empty($conf->global->MAIN_MAIL_EMAIL_FROM)?$conf->global->MAIN_MAIL_EMAIL_FROM:'');
 	print '"></td></tr>';
 
     // Default from type
-    $var=!$var;
+    
     $liste = array();
     $liste['user'] = $langs->trans('UserEmail');
     $liste['company'] = $langs->trans('CompanyEmail').' ('.(empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?$langs->trans("NotDefined"):$conf->global->MAIN_INFO_SOCIETE_MAIL).')';
@@ -424,17 +424,17 @@ if ($action == 'edit')
     print '</td></tr>';
 
     // Separator
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
     
 	// From
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_ERRORS_TO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_ERRORS_TO)?$conf->global->MAIN_MAIL_ERRORS_TO:'');
 	print '"></td></tr>';
 
 	// Autocopy to
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_AUTOCOPY_TO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)?$conf->global->MAIN_MAIL_AUTOCOPY_TO:'');
 	print '"></td></tr>';
@@ -465,15 +465,15 @@ else
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	// Disable
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_MAILS).'</td></tr>';
 
 	// Separator
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
 
 	// Method
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 	$text=$listofmethods[$conf->global->MAIN_MAIL_SENDMODE];
 	if (empty($text)) $text=$langs->trans("Undefined").img_warning();
@@ -481,7 +481,7 @@ else
 	print '</td></tr>';
 
 	// Host server
-	$var=!$var;
+	
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
 		print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
@@ -492,7 +492,7 @@ else
 	}
 
 	// Port
-	$var=!$var;
+	
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
 		print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
@@ -503,21 +503,21 @@ else
 	}
 
 	// SMTPS ID
-	$var=!$var;
+	
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
 		print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>';
 	}
 
 	// SMTPS PW
-	$var=!$var;
+	
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
 		print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./','*',$conf->global->MAIN_MAIL_SMTPS_PW).'</td></tr>';
 	}
 
 	// TLS
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
@@ -531,7 +531,7 @@ else
 	print '</td></tr>';
 
 	// STARTTLS
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
@@ -545,18 +545,18 @@ else
 	print '</td></tr>';
 
 	// Separator
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
 
 	// From
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_EMAIL_FROM;
 	if (! empty($conf->global->MAIN_MAIL_EMAIL_FROM) && ! isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail"));
 	print '</td></tr>';
 
 	// Default from type
-    $var=!$var;
+    
     print '<tr '.$bc[$var?1:0].'><td>'.$langs->trans('MAIN_MAIL_DEFAULT_FROMTYPE').'</td>';
     print '<td>';
     if($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'user'){
@@ -567,18 +567,18 @@ else
     print '</td></tr>';
 
 	// Separator
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
 
     // Errors To
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_ERRORS_TO;
 	if (! empty($conf->global->MAIN_MAIL_ERRORS_TO) && ! isValidEmail($conf->global->MAIN_MAIL_ERRORS_TO)) print img_warning($langs->trans("ErrorBadEMail"));
 	print '</td></tr>';
 
 	// Autocopy to
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 	print '<td>';
 	if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO))
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 0d6ff4d34a0..506bc5fb2d8 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -179,7 +179,7 @@ if ($action == 'edit')
 	print '</tr>';
 
 	// Menu top
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuManager").'</td>';
 	print '<td>';
 	$formadmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirstandard, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled');
@@ -190,7 +190,7 @@ if ($action == 'edit')
 	print '</tr>';
 
 	// Menu smartphone
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuSmartphoneManager").'</td>';
 	print '<td>';
 	$formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled');
@@ -217,7 +217,7 @@ else
 	print '</td>';
 	print '</tr>';
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuManager").'</td>';
 	print '<td>';
 	$filelib=preg_replace('/.php$/i','',(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED));
@@ -229,8 +229,8 @@ else
 	print '</td>';
 	print '</tr>';
 
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("DefaultMenuSmartphoneManager").'</td>';
 	print '<td>';
 	$filelib=preg_replace('/.php$/i','',(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED));
diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php
index 0a3cb6b99bc..82457a27bdf 100644
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@@ -90,8 +90,8 @@ print '<td align="center" width="80">'.$langs->trans("Status").'</td>';
 print '</tr>';
 
 // Hide unauthorized menu
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td colspan="3">'.$langs->trans("HideUnauthorizedMenu").'</td>';
 print '<td align="center">';
 if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 3fe6addea2d..94bfa8e05bb 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -285,7 +285,7 @@ if (isset($objMod->langfiles) && is_array($objMod->langfiles))
 	}
 }
 
-$var=!$var;
+
 
 
 // Version (with picto warning or not)
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index ddaf940492f..4eb82e6183c 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -584,7 +584,7 @@ if ($mode == 'common')
         	$oldfamily=$familykey;
         }
 
-        $var=!$var;
+        
 
         
         // Version (with picto warning or not)
@@ -781,7 +781,7 @@ if ($mode == 'marketplace')
     print '<td>'.$langs->trans("URL").'</td>';
     print '</tr>';
 
-    $var=!$var;
+    
     print "<tr ".$bc[$var].">\n";
     $url='https://www.dolistore.com';
     print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
@@ -789,7 +789,7 @@ if ($mode == 'marketplace')
     print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
     print '</tr>';
 
-    $var=!$var;
+    
     print "<tr ".$bc[$var].">\n";
     $url='https://partners.dolibarr.org';
     print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png"></a></td>';
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 5b86bcdc1c3..3aa6ad5dc26 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -183,8 +183,8 @@ print '<td>'.$langs->trans("Parameters").'</td>'."\n";
 print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->transnoentitiesnoconv("multicurrency_useRateOnDocumentDate").'</td>';
 print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="right" width="400">';
@@ -197,8 +197,8 @@ print '</form>';
 print '</td></tr>';
 
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->transnoentitiesnoconv("multicurrency_useOriginTx").'</td>';
 print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="right" width="400">';
@@ -211,8 +211,8 @@ print '</form>';
 print '</td></tr>';
 
 /* TODO uncomment when the functionality will integrated
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->transnoentitiesnoconv("multicurrency_buyPriceInCurrency").'</td>';
 print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="right" width="400">';
@@ -226,8 +226,8 @@ print '</td></tr>';
 */
 
 /* TODO uncomment when the functionality will integrated 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->transnoentitiesnoconv("multicurrency_modifyRateApplication").'</td>';
 print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="right" width="400">';
@@ -260,8 +260,8 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 	print '</td></tr>';
 	
 	
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td><a target="_blank" href="https://currencylayer.com">'.$langs->transnoentitiesnoconv("multicurrency_appId").'</a></td>';
 	print '<td align="center" width="20">&nbsp;</td>';
 	print '<td align="right" width="400">';
@@ -273,8 +273,8 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 	print '</form>';
 	print '</td></tr>';
 	
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->transnoentitiesnoconv("multicurrency_appCurrencySource").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
 	print '<td align="right" width="400">';
@@ -286,8 +286,8 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 	print '</form>';
 	print '</td></tr>';
 	
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->transnoentitiesnoconv("multicurrency_alternateCurrencySource").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
 	print '<td align="right" width="400">';
@@ -311,8 +311,8 @@ print '<td>'.$form->textwithpicto($langs->trans("CurrenciesUsed"), $langs->trans
 print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="center" width="100">'.$langs->trans("Rate").'</td>'."\n";
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="add_currency">';
@@ -323,8 +323,8 @@ print '<input type="text" name="rate" value="" size="13" placeholder="'.$langs->
 print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
 print '</td></form></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$conf->currency.$form->textwithpicto(' ', $langs->trans("BaseCurrency")).'</td>';
 print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="right" width="300">1';
@@ -334,8 +334,8 @@ foreach ($TCurrency as &$currency)
 {
 	if($currency->code == $conf->currency) continue;
 	
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td>'.$currency->code.' - '.$currency->name.'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
 	print '<td align="right" width="400">';
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index a3b3eb50df6..9d75070a956 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -135,7 +135,7 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("NotificationEMailFrom").'</td>';
 print '<td>';
@@ -165,14 +165,14 @@ print "</tr>\n";
 $notificationtrigger=new InterfaceNotification($db);
 $listofnotifiedevents=$notificationtrigger->getListOfManagedEvents();
 
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>';
 
 $var=true;
 $i=0;
 foreach($listofnotifiedevents as $notifiedevent)
 {
-    $var=!$var;
+    
     $label=$langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
 
     if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder');
@@ -213,7 +213,7 @@ $listofnotifiedevents=$notificationtrigger->getListOfManagedEvents();
 $var=true;
 foreach($listofnotifiedevents as $notifiedevent)
 {
-    $var=!$var;
+    
     $label=$langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
 
     if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder');
@@ -222,7 +222,7 @@ foreach($listofnotifiedevents as $notifiedevent)
     elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order');
 	elseif ($notifiedevent['elementtype'] == 'ficheinter') $elementLabel = $langs->trans('Intervention');
 
-    print '<tr '.$bc[$var].'>';
+    print '<tr class="oddeven">';
     print '<td>'.$elementLabel.'</td>';
     print '<td>'.$notifiedevent['code'].'</td>';
     print '<td>'.$label.'</td>';
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index 2433575e553..06315222825 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -211,7 +211,7 @@ if ($mode == 'setup' && $user->admin)
         print '<th></th>';
         print "</tr>\n";
         
-        print '<tr '.$bc[$var].'>';
+        print '<tr class="oddeven">';
         print '<td'.($key['required']?' class="required"':'').'>';
         //var_dump($key);
         print $langs->trans("OAuthIDSecret").'</td>';
@@ -223,7 +223,7 @@ if ($mode == 'setup' && $user->admin)
         print '</tr>'."\n";
         
         $var = ! $var;
-        print '<tr '.$bc[$var].'>';
+        print '<tr class="oddeven">';
         print '<td'.($key['required']?' class="required"':'').'>';
         //var_dump($key);
         print $langs->trans("IsTokenGenerated");
@@ -250,7 +250,7 @@ if ($mode == 'setup' && $user->admin)
         print '</tr>';
         
         $var = ! $var;
-        print '<tr '.$bc[$var].'>';
+        print '<tr class="oddeven">';
         print '<td'.($key['required']?' class="required"':'').'>';
         //var_dump($key);
         print $langs->trans("Token").'</td>';
@@ -273,7 +273,7 @@ if ($mode == 'setup' && $user->admin)
         {
             // Token refresh
             $var = ! $var;
-            print '<tr '.$bc[$var].'>';
+            print '<tr class="oddeven">';
             print '<td'.($key['required']?' class="required"':'').'>';
             //var_dump($key);
             print $langs->trans("TOKEN_REFRESH").'</td>';
@@ -284,7 +284,7 @@ if ($mode == 'setup' && $user->admin)
     
             // Token expired
             $var = ! $var;
-            print '<tr '.$bc[$var].'>';
+            print '<tr class="oddeven">';
             print '<td'.($key['required']?' class="required"':'').'>';
             //var_dump($key);
             print $langs->trans("TOKEN_EXPIRED").'</td>';
@@ -295,7 +295,7 @@ if ($mode == 'setup' && $user->admin)
             
             // Token expired at
             $var = ! $var;
-            print '<tr '.$bc[$var].'>';
+            print '<tr class="oddeven">';
             print '<td'.($key['required']?' class="required"':'').'>';
             //var_dump($key);
             print $langs->trans("TOKEN_EXPIRE_AT").'</td>';
@@ -368,8 +368,8 @@ if ($mode == 'userconf' && $user->admin)
     $sql = 'SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid';
     $resql = $db->query($sql);
     while ($row=$db->fetch_array($resql)) {
-        $var=!$var;
-        print '<tr '.$bc[$var].'>';
+        
+        print '<tr class="oddeven">';
         print '<td>'.$row['login'].'</td>';
         print '<td>'.$row['module'].'</td>';
         print '<td>'.$row['driver'].'</td>';
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 55bd83cbc19..500281e0a10 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -128,7 +128,7 @@ if ($action == 'edit')	// Edit
     if (empty($selected)) $selected=dol_getDefaultFormat();
 
     // Show pdf format
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("DictionaryPaperFormat").'</td><td>';
     print $formadmin->select_paper_format($selected,'MAIN_PDF_FORMAT');
     print '</td></tr>';
@@ -145,13 +145,13 @@ if ($action == 'edit')	// Edit
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
     // Hide VAT Intra on address
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td>';
     print $form->selectyesno('MAIN_TVAINTRA_NOT_IN_ADDRESS',(! empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))?$conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS:0,1);
     print '</td></tr>';
 
     // Show prof id 1 in address into pdf
-    $var=!$var;
+    
     if (! $noCountryCode)
     {
     	$pid1=$langs->transcountry("ProfId1",$mysoc->country_code);
@@ -169,7 +169,7 @@ if ($action == 'edit')	// Edit
     }
 
     // Show prof id 2 in address into pdf
-    $var=!$var;
+    
     if (! $noCountryCode)
     {
     	$pid2=$langs->transcountry("ProfId2",$mysoc->country_code);
@@ -187,7 +187,7 @@ if ($action == 'edit')	// Edit
     }
 
     // Show prof id 3 in address into pdf
-    $var=!$var;
+    
     if (! $noCountryCode)
     {
     	$pid3=$langs->transcountry("ProfId3",$mysoc->country_code);
@@ -205,7 +205,7 @@ if ($action == 'edit')	// Edit
     }
 
     // Show prof id 4 in address into pdf
-    $var=!$var;
+    
     if (! $noCountryCode)
     {
     	$pid4=$langs->transcountry("ProfId4",$mysoc->country_code);
@@ -233,36 +233,36 @@ if ($action == 'edit')	// Edit
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
     // Hide any PDF informations
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td>';
 	print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0,1);
     print '</td></tr>';
 
     //Desc
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("HideDescOnPDF").'</td><td>';
     print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DESC',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC:0,1);
     print '</td></tr>';
 
     //Ref
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("HideRefOnPDF").'</td><td>';
     print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_REF',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF:0,1);
     print '</td></tr>';
 
     //Details
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("HideDetailsOnPDF").'</td><td>';
     print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS:0,1);
     print '</td></tr>';
 
  	// Place customer adress to the ISO location
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td>';
 	print $form->selectyesno('MAIN_PDF_USE_ISO_LOCATION',(! empty($conf->global->MAIN_PDF_USE_ISO_LOCATION))?$conf->global->MAIN_PDF_USE_ISO_LOCATION:0,1);
     print '</td></tr>';
 	
-	$var=!$var;
+	
     print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td><td>';
 	print $form->selectarray('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', $arraydetailsforpdffoot, $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS);
 	print '</td></tr>';
@@ -287,7 +287,7 @@ else	// Show
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
     // Show pdf format
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("DictionaryPaperFormat").'</td><td>';
 
     $pdfformatlabel='';
@@ -323,13 +323,13 @@ else	// Show
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
 	// Hide Intra VAT on address
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td colspan="2">';
 	print yn($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS,1);
 	print '</td></tr>';
 
     // Show prof id 1 in address into pdf
-    $var=!$var;
+    
     if (! $noCountryCode)
     {
     	$pid1=$langs->transcountry("ProfId1",$mysoc->country_code);
@@ -347,7 +347,7 @@ else	// Show
     }
 
     // Show prof id 2 in address into pdf
-    $var=!$var;
+    
     if (! $noCountryCode)
     {
     	$pid2=$langs->transcountry("ProfId2",$mysoc->country_code);
@@ -365,7 +365,7 @@ else	// Show
     }
 
     // Show prof id 3 in address into pdf
-    $var=!$var;
+    
     if (! $noCountryCode)
     {
     	$pid3=$langs->transcountry("ProfId3",$mysoc->country_code);
@@ -383,7 +383,7 @@ else	// Show
     }
 
     // Show prof id 4 in address into pdf
-    $var=!$var;
+    
     if (! $noCountryCode)
     {
     	$pid4=$langs->transcountry("ProfId4",$mysoc->country_code);
@@ -412,8 +412,8 @@ else	// Show
 
 
 	// Encrypt and protect PDF
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 	print '<td>';
 	$text = $langs->trans("ProtectAndEncryptPdfFiles");
 	$desc = $form->textwithpicto($text,$langs->transnoentities("ProtectAndEncryptPdfFilesDesc"),1);
@@ -440,35 +440,35 @@ else	// Show
 	print '</tr>';
 
     // Hide any PDF informations
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td colspan="2">';
     print yn($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT,1);
     print '</td></tr>';
 
 	//Desc
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("HideDescOnPDF").'</td><td colspan="2">';
 	print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC,1);
 	print '</td></tr>';
 
 	//Ref
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("HideRefOnPDF").'</td><td colspan="2">';
 	print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF,1);
 	print '</td></tr>';
 
 	//Details
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("HideDetailsOnPDF").'</td><td colspan="2">';
 	print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS,1);
 	print '</td></tr>';
 
-	$var=!$var;
+	
     print '<tr '.$bc[$var].'><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td colspan="2">';
 	print yn($conf->global->MAIN_PDF_USE_ISO_LOCATION,1);
 	print '</td></tr>';
 	
-	$var=!$var;
+	
     print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td><td colspan="2">';
 	print $arraydetailsforpdffoot[$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS];
 	print '</td></tr>';
@@ -492,7 +492,7 @@ else	// Show
 	$var=false;
 	if (! empty($dolibarr_pdf_force_fpdf))
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'>'."\n";
 		print '<td>dolibarr_pdf_force_fpdf</td>'."\n";
 		print '<td>';
@@ -501,7 +501,7 @@ else	// Show
 		print '</tr>';
 	}
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'>'."\n";
 	print '<td>'.$langs->trans("LibraryToBuildPDF").'</td>'."\n";
 	print '<td>';
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 84cb9ed8bf2..daafab71053 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -186,7 +186,7 @@ if ($result)
             print "</tr>\n";
         }
 
-        $var=!$var;
+        
         print '<tr '. $bc[$var].'>';
 
         print '<td>'.img_object('',$picto).' '.$objMod->getName();
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 6d5c915dae2..1c557a83296 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -422,7 +422,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
         while ($i < $num)
         {
             $obj = $db->fetch_object($resql);
-            $var=!$var;
+            
             if (!$obj->fk_soc)
             {
                 $username=dolGetFirstLastname($obj->firstname,$obj->lastname);
@@ -495,9 +495,9 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
 	    while ($i < $num)
 	    {
 	        $obj = $db->fetch_object($resql);
-	        $var=!$var;
+	        
 
-	        print "<tr ".$bc[$var].">";
+	        print '<tr class="oddeven">';
 	        print '<td>'.dolGetFirstLastname($obj->firstname,$obj->lastname).'</td>';
 	        $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
 	        print '<td>'.$label.'</td>';
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index c6ccb4f639c..0d041cad2b7 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -310,7 +310,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						$var=!$var;
+						
 						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -546,11 +546,11 @@ print '<td width="60" align="center">'.$langs->trans("Value")."</td>\n";
 print "<td>&nbsp;</td>\n";
 print "</tr>";
 
-$var=!$var;
+
 print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"setdefaultduration\">";
-print "<tr ".$bc[$var].">";
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DefaultProposalDurationValidity").'</td>';
 print '<td width="60" align="center">'."<input size=\"3\" class=\"flat\" type=\"text\" name=\"value\" value=\"".$conf->global->PROPALE_VALIDITY_DURATION."\"></td>";
 print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
@@ -594,7 +594,7 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
 print "</td></tr>\n";
 print '</form>';
 
-$var=!$var;
+
 print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_PROPALE_DRAFT_WATERMARK\">";
@@ -609,7 +609,7 @@ print '</form>';
 /* Seems to be not so used. So kept hidden for the moment to avoid dangerous options inflation.
 if ($conf->banque->enabled)
 {
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td>&nbsp</td><td align="right">';
     if (! empty($conf->use_javascript_ajax))
@@ -631,7 +631,7 @@ if ($conf->banque->enabled)
 }
 else
 {
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 84836407499..224fac14ce7 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -133,8 +133,8 @@ print '<td colspan="2">'.$langs->trans("Parameters").'</td>';
 print '<td width="200">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ConnectionTimeout").'</td><td align="right">';
 print '</td>';
 print '<td class="nowrap">';
@@ -143,8 +143,8 @@ print ' '.strtolower($langs->trans("Seconds"));
 print '</td>';
 print '</tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ResponseTimeout").'</td><td align="right">';
 print '</td>';
 print '<td class="nowrap">';
@@ -153,8 +153,8 @@ print ' '.strtolower($langs->trans("Seconds"));
 print '</td>';
 print '</tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_USE").'</td><td align="right">';
 print '</td>';
 print '<td class="nowrap">';
@@ -162,7 +162,7 @@ print $form->selectyesno('MAIN_PROXY_USE',$conf->global->MAIN_PROXY_USE,1);
 print '</td>';
 print '</tr>';
 
-$var=!$var;
+
 print '<tr '.$bcdd[$var].'>';
 print '<td>'.$langs->trans("MAIN_PROXY_HOST").'</td><td align="right">';
 print '</td>';
@@ -171,7 +171,7 @@ print '<input class="flat" name="MAIN_PROXY_HOST" type="text" size="16" value="'
 print '</td>';
 print '</tr>';
 
-$var=!$var;
+
 print '<tr '.$bcdd[$var].'>';
 print '<td>'.$langs->trans("MAIN_PROXY_PORT").'</td><td align="right">';
 print '</td>';
@@ -180,7 +180,7 @@ print '<input class="flat" name="MAIN_PROXY_PORT" type="text" size="4" value="'.
 print '</td>';
 print '</tr>';
 
-$var=!$var;
+
 print '<tr '.$bcdd[$var].'>';
 print '<td>'.$langs->trans("MAIN_PROXY_USER").'</td><td align="right">';
 print '</td>';
@@ -189,7 +189,7 @@ print '<input class="flat" name="MAIN_PROXY_USER" type="text" size="16" value="'
 print '</td>';
 print '</tr>';
 
-$var=!$var;
+
 print '<tr '.$bcdd[$var].'>';
 print '<td>'.$langs->trans("MAIN_PROXY_PASS").'</td><td align="right">';
 print '</td>';
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index b86023aa49a..1bac9d80bee 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -250,7 +250,7 @@ if ($mode == 'config' && $user->admin)
     } else {
         for ($line=0; $line < $nbofprinters; $line++) {
             $var = !$var;
-            print '<tr '.$bc[$var].'>';
+            print '<tr class="oddeven">';
             if ($action=='editprinter' && $printer->listprinters[$line]['rowid']==$printerid) {
                 print '<input type="hidden" name="printerid" value="'.$printer->listprinters[$line]['rowid'].'">';
                 print '<td><input size="50" type="text" name="printername" value="'.$printer->listprinters[$line]['name'].'"></td>';
@@ -381,7 +381,7 @@ if ($mode == 'template' && $user->admin)
         $max = count($printer->listprinterstemplates);
         for ($line=0; $line < $max; $line++) {
             $var = !$var;
-            print '<tr '.$bc[$var].'>';
+            print '<tr class="oddeven">';
             if ($action=='edittemplate' && $printer->listprinterstemplates[$line]['rowid']==$templateid) {
                 print '<input type="hidden" name="templateid" value="'.$printer->listprinterstemplates[$line]['rowid'].'">';
                 print '<td><input size="50" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
@@ -427,7 +427,7 @@ if ($mode == 'template' && $user->admin)
     $max = count($printer->tags);
     for ($tag=0; $tag < $max; $tag++) {
         $var = !$var;
-        print '<tr '.$bc[$var].'>';
+        print '<tr class="oddeven">';
         print '<td>&lt;'.$printer->tags[$tag].'&gt;</td><td>'.$langs->trans(strtoupper($printer->tags[$tag])).'</td>';
         print '</tr>';
     }
diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index d8fdddd2bb5..3f057bbdbb9 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -85,8 +85,8 @@ print '<td></td>';
 
 
 // Utilisation formulaire Ajax sur choix produit
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("UseSearchToSelectResource").'</td>';
 if (empty($conf->use_javascript_ajax))
 {
@@ -111,8 +111,8 @@ else
 }
 print '</tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans('DisabledResourceLinkUser').'</td>';
 print '<td>';
 echo ajax_constantonoff('RESOURCE_HIDE_ADD_CONTACT_USER');
@@ -120,8 +120,8 @@ print '</td>';
 print '<td></td>';
 print '</tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans('DisabledResourceLinkContact').'</td>';
 print '<td>';
 echo ajax_constantonoff('RESOURCE_HIDE_ADD_CONTACT_THIPARTY');
diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php
index b09f4820312..a04b23ce4fe 100644
--- a/htdocs/admin/salaries.php
+++ b/htdocs/admin/salaries.php
@@ -97,7 +97,7 @@ print "</tr>\n";
 
 foreach ($list as $key)
 {
-	$var=!$var;
+	
 
 	print '<tr '.$bc[$var].' class="value">';
 
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 3aa0bdf33bf..449180d25da 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -283,7 +283,7 @@ print '</form>';
 //if($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK == 1)
 // Patter for Password Perso
 if ($conf->global->USER_PASSWORD_GENERATED == "Perso"){
-$var=!$var;
+
 
 	$tabConf = explode(";",$conf->global->USER_PASSWORD_PATTERN);
 	/*$this->length2 = $tabConf[0];
@@ -299,38 +299,38 @@ $var=!$var;
 	print '<td colspan="3"> '.$langs->trans("PasswordPatternDesc").'</td>';
 	print '</tr>';
 
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("MinLength")."</td>";
 	print '<td colspan="2"><input type="number" value="'.$tabConf[0].'" id="minlenght" min="1"></td>';
 	print '</tr>';
 
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("NbMajMin")."</td>";
 	print '<td colspan="2"><input type="number" value="'.$tabConf[1].'" id="NbMajMin" min="0"></td>';
 	print '</tr>';
 
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("NbNumMin")."</td>";
 	print '<td colspan="2"><input type="number" value="'.$tabConf[2].'" id="NbNumMin" min="0"></td>';
 	print '</tr>';
 
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("NbSpeMin")."</td>";
 	print '<td colspan="2"><input type="number" value="'.$tabConf[3].'" id="NbSpeMin" min="0"></td>';
 	print '</tr>';
 
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("NbIteConsecutive")."</td>";
 	print '<td colspan="2"><input type="number" value="'.$tabConf[4].'" id="NbIteConsecutive" min="0"></td>';
 	print '</tr>';
 
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("NoAmbiCaracAutoGeneration")."</td>";
 	print '<td colspan="2"><input type="checkbox" id="NoAmbiCaracAutoGeneration" '.($tabConf[5] ? "checked" : "").' min="0"> <span id="textcheckbox">'.($tabConf[5] ? $langs->trans("Activated") : $langs->trans("Disabled")).'</span></td>';
 	print '</tr>';
@@ -407,8 +407,8 @@ print '<td align="center">'.$langs->trans("Action").'</td>';
 print '</tr>';
 
 // Disable clear password in database
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td colspan="3">'.$langs->trans("DoNotStoreClearPassword").'</td>';
 print '<td align="center" width="60">';
 if (! empty($conf->global->DATABASE_PWD_ENCRYPTED))
@@ -441,8 +441,8 @@ print "</td>";
 print '</tr>';
 
 // Cryptage du mot de base de la base dans conf.php
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td colspan="3">'.$langs->trans("MainDbPasswordFileConfEncrypted").'</td>';
 print '<td align="center" width="60">';
 if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass))
@@ -476,8 +476,8 @@ print '</tr>';
 
 
 // Disable link "Forget password" on logon
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td colspan="3">'.$langs->trans("DisableForgetPasswordLinkOnLogonPage").'</td>';
 print '<td align="center" width="60">';
 if(! empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index 0114bbb74b8..8c1b1fa5b07 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -136,7 +136,7 @@ print '<td colspan="2">'.$langs->trans("Parameters").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print '</tr>';
 
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td colspan="2">'.$langs->trans("MaxSizeForUploadedFiles").'.';
 $max=@ini_get('upload_max_filesize');
 if ($max) print ' '.$langs->trans("MustBeLowerThanPHPLimit",$max*1024,$langs->trans("Kb")).'.';
@@ -147,8 +147,8 @@ print '<input class="flat" name="MAIN_UPLOAD_DOC" type="text" size="6" value="'.
 print '</td>';
 print '</tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("UMask").'</td><td align="right">';
 print $form->textwithpicto('',$langs->trans("UMaskExplanation"));
 print '</td>';
@@ -158,8 +158,8 @@ print '</td>';
 print '</tr>';
 
 // Use anti virus
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td colspan="2">'.$langs->trans("AntiVirusCommand").'<br>';
 print $langs->trans("AntiVirusCommandExample");
 // Check command in inside safe_mode
@@ -181,8 +181,8 @@ print "</td>";
 print '</tr>';
 
 // Use anti virus
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td colspan="2">'.$langs->trans("AntiVirusParam").'<br>';
 print $langs->trans("AntiVirusParamExample");
 print '</td>';
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 9ce79359a7c..e5c66d9e24b 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -116,8 +116,8 @@ print '<td align="right" width="100">'.$langs->trans("Status").'</td>';
 print '</tr>';
 
 // Enable Captcha code
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td colspan="3">'.$langs->trans("UseCaptchaCode").'</td>';
 print '<td align="right">';
 if (function_exists("imagecreatefrompng"))
@@ -146,8 +146,8 @@ else
 print '</td></tr>';
 
 // Enable advanced perms
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td colspan="3">'.$langs->trans("UseAdvancedPerms").'</td>';
 print '<td align="right">';
 if (! empty($conf->use_javascript_ajax))
@@ -182,10 +182,10 @@ print '<td colspan="2">'.$langs->trans("Parameters").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-$var=!$var;
+
 $sessiontimeout=ini_get("session.gc_maxlifetime");
 if (empty($conf->global->MAIN_SESSION_TIMEOUT)) $conf->global->MAIN_SESSION_TIMEOUT=$sessiontimeout;
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("SessionTimeOut").'</td><td align="right">';
 print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
 print '</td>';
@@ -194,10 +194,10 @@ print '<input class="flat" name="MAIN_SESSION_TIMEOUT" type="text" size="6" valu
 print '</td>';
 print '</tr>';
 
-$var=!$var;
+
 $sessiontimeout=ini_get("session.gc_maxlifetime");
 if (empty($conf->global->MAIN_APPLICATION_TITLE)) $conf->global->MAIN_APPLICATION_TITLE="";
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_APPLICATION_TITLE").'</td><td align="right">';
 print '</td>';
 print '<td class="nowrap">';
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 05fe548daff..4227116eaea 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -175,30 +175,30 @@ if ($action == 'edit')
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	// Disable
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_SMS").'</td><td>';
 	print $form->selectyesno('MAIN_DISABLE_ALL_SMS',$conf->global->MAIN_DISABLE_ALL_SMS,1);
 	print '</td></tr>';
 
 	// Separator
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
 
 	// Method
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
 	if (count($listofmethods)) print $form->selectarray('MAIN_SMS_SENDMODE',$listofmethods,$conf->global->MAIN_SMS_SENDMODE,1);
 	else print '<font class="error">'.$langs->trans("None").'</font>';
     print '</td></tr>';
 
 	// From
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMS_FROM",$langs->transnoentities("Undefined")).'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_SMS_FROM" size="32" value="' . $conf->global->MAIN_MAIL_SMS_FROM;
 	print '"></td></tr>';
 
 	// Autocopy to
-	/*$var=!$var;
+	/*
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_AUTOCOPY_TO" size="32" value="' . $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 	print '"></td></tr>';
@@ -224,15 +224,15 @@ else
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	// Disable
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_SMS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_SMS).'</td></tr>';
 
 	// Separator
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
 
 	// Method
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
 	$text=$listofmethods[$conf->global->MAIN_SMS_SENDMODE];
 	if (empty($text)) $text=$langs->trans("Undefined").' '.img_warning();
@@ -240,14 +240,14 @@ else
 	print '</td></tr>';
 
 	// From
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMS_FROM",$langs->transnoentities("Undefined")).'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_SMS_FROM;
 	if (!empty($conf->global->MAIN_MAIL_SMS_FROM) && ! isValidPhone($conf->global->MAIN_MAIL_SMS_FROM)) print ' '.img_warning($langs->trans("ErrorBadPhone"));
 	print '</td></tr>';
 
 	// Autocopy to
-	/*$var=!$var;
+	/*
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_AUTOCOPY_TO;
 	if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && ! isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail"));
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index f2a6d165bd5..1c5a92fb0e8 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -161,8 +161,8 @@ $var=true;
 
 $found=0;
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("DeStockOnBill").'</td>';
 print '<td width="160" align="right">';
 if (! empty($conf->facture->enabled))
@@ -181,8 +181,8 @@ else
 print "</td>\n</tr>\n";
 $found++;
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("DeStockOnValidateOrder").'</td>';
 print '<td width="160" align="right">';
 if (! empty($conf->commande->enabled))
@@ -203,8 +203,8 @@ $found++;
 
 //if (! empty($conf->expedition->enabled))
 //{
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("DeStockOnShipment").'</td>';
 print '<td width="160" align="right">';
 if (! empty($conf->expedition->enabled))
@@ -223,8 +223,8 @@ else
 print "</td>\n</tr>\n";
 $found++;
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("DeStockOnShipmentOnClosing").'</td>';
 print '<td width="160" align="right">';
 if (! empty($conf->expedition->enabled))
@@ -245,8 +245,8 @@ $found++;
 
 /*if (! $found)
 {
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 	print '<td colspan="2">'.$langs->trans("NoModuleToManageStockDecrease").'</td>';
 	print "</tr>\n";
 }*/
@@ -265,8 +265,8 @@ $var=true;
 
 $found=0;
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("ReStockOnBill").'</td>';
 print '<td width="160" align="right">';
 if (! empty($conf->fournisseur->enabled))
@@ -286,8 +286,8 @@ print "</td>\n</tr>\n";
 $found++;
 
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("ReStockOnValidateOrder").'</td>';
 print '<td width="160" align="right">';
 if (! empty($conf->fournisseur->enabled))
@@ -306,8 +306,8 @@ else
 print "</td>\n</tr>\n";
 $found++;
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("ReStockOnDispatchOrder").'</td>';
 print '<td width="160" align="right">';
 if (! empty($conf->fournisseur->enabled))
@@ -328,8 +328,8 @@ $found++;
 
 /*if (! $found)
 {
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 	print '<td colspan="2">'.$langs->trans("NoModuleToManageStockIncrease").'</td>';
 	print "</tr>\n";
 }*/
@@ -343,8 +343,8 @@ print "  <td>".$langs->trans("RuleForStockAvailability")."</td>\n";
 print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
 print '</tr>'."\n";
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("WarehouseAllowNegativeTransfer").'</td>';
 print '<td width="160" align="right">';
 print "<form method=\"post\" action=\"stock.php\">";
@@ -359,7 +359,7 @@ print "</tr>\n";
 // Option to force stock to be enough before adding a line into document
 if($conf->invoice->enabled) {
 	$var = !$var;
-	print "<tr ".$bc[$var].">";
+	print '<tr class="oddeven">';
 	print '<td width="60%">'.$langs->trans("StockMustBeEnoughForInvoice").'</td>';
 	print '<td width="160" align="right">';
 	print "<form method=\"post\" action=\"stock.php\">";
@@ -374,7 +374,7 @@ if($conf->invoice->enabled) {
 
 if($conf->order->enabled) {
 	$var = !$var;
-	print "<tr ".$bc[$var].">";
+	print '<tr class="oddeven">';
 	print '<td width="60%">'.$langs->trans("StockMustBeEnoughForOrder").'</td>';
 	print '<td width="160" align="right">';
 	print "<form method=\"post\" action=\"stock.php\">";
@@ -389,7 +389,7 @@ if($conf->order->enabled) {
 
 if($conf->expedition->enabled) {
 	$var = !$var;
-	print "<tr ".$bc[$var].">";
+	print '<tr class="oddeven">';
 	print '<td width="60%">'.$langs->trans("StockMustBeEnoughForShipment").'</td>';
 	print '<td width="160" align="right">';
 	print "<form method=\"post\" action=\"stock.php\">";
@@ -417,7 +417,7 @@ if ($virtualdiffersfromphysical)
 	print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
 	print '</tr>'."\n";
 	$var = !$var;
-	print "<tr ".$bc[$var].">";
+	print '<tr class="oddeven">';
 	print '<td width="60%">'.$langs->trans("UseVirtualStockByDefault").'</td>';
 	print '<td width="160" align="right">';
 	print "<form method=\"post\" action=\"stock.php\">";
@@ -441,8 +441,8 @@ print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
 print '</tr>'."\n";
 
 if (! empty($conf->fournisseur->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
+    
+    print '<tr class="oddeven">';
     print '<td width="60%">'.$langs->trans("UseDispatchStatus").'</td>';
     print '<td width="160" align="right">';
     print "<form method=\"post\" action=\"stock.php\">";
@@ -454,9 +454,9 @@ if (! empty($conf->fournisseur->enabled) && !empty($conf->global->STOCK_CALCULAT
     print "</td>\n</tr>\n";
 }
 
-$var=!$var;
 
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("UserWarehouseAutoCreate").'</td>';
 print '<td width="160" align="right">';
 print "<form method=\"post\" action=\"stock.php\">";
@@ -468,9 +468,9 @@ print '</form>';
 print "</td>\n";
 print "</tr>\n";
 
-$var=!$var;
 
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("AllowAddLimitStockByWarehouse").'</td>';
 
 print '<td width="160" align="right">';
@@ -489,9 +489,9 @@ print '<br>';
 If not used by a module, I still need to understand in which case user may need this now we can set rule on product page.
 if ($conf->global->PRODUIT_SOUSPRODUITS)
 {
-	$var=!$var;
+	
 
-	print "<tr ".$bc[$var].">";
+	print '<tr class="oddeven">';
 	print '<td width="60%">'.$langs->trans("IndependantSubProductStock").'</td>';
 
 	print '<td width="160" align="right">';
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 7510bfe37ef..e20b92be95e 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -250,7 +250,7 @@ foreach ($dirmodels as $reldir)
                         if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
                         if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-                        $var=!$var;
+                        
                         print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
                         print $module->info();
                         print '</td>';
@@ -378,7 +378,7 @@ foreach ($dirmodels as $reldir)
 	                require_once $dir.'/'.$file;
 	                $module = new $classname($db, new FactureFournisseur($db));
 
-                    $var=!$var;
+                    
                     print "<tr ".$bc[$var].">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 1ac6ae86989..fe7d06ed6a8 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -279,7 +279,7 @@ foreach ($dirmodels as $reldir)
                         if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
                         if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-                        $var=!$var;
+                        
                         print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
                         print $module->info();
                         print '</td>';
@@ -402,7 +402,7 @@ foreach ($dirmodels as $reldir)
 	                require_once $dir.'/'.$file;
 	                $module = new $classname($db, new CommandeFournisseur($db));
 
-                    $var=!$var;
+                    
                     print "<tr ".$bc[$var].">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
@@ -501,14 +501,14 @@ $var=false;
 	print '</td><td align="right">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 	print "</td></tr>\n";
-	$var=!$var;
+	
 //}
 
 // Ask for payment bank during supplier order
 /* Kept as hidden for the moment
 if ($conf->banque->enabled)
 {
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp</td><td align="center">';
     if (! empty($conf->use_javascript_ajax))
@@ -530,7 +530,7 @@ if ($conf->banque->enabled)
 }
 else
 {
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 933ee22a062..14e13789887 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -384,7 +384,7 @@ foreach ($dirmodels as $reldir)
 	                require_once $dir.'/'.$file;
 	                $module = new $classname($db, new PaiementFourn($db));
 
-                    $var=!$var;
+                    
                     print "<tr ".$bc[$var].">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 7963aa7fabc..621dd302ccb 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -288,7 +288,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						$var=!$var;
+						
 						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -545,7 +545,7 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
 print "</td></tr>\n";
 print '</form>';
 
-$var=!$var;
+
 print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK\">";
@@ -559,7 +559,7 @@ print '</form>';
 
 if ($conf->banque->enabled)
 {
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp</td><td align="right">';
     if (! empty($conf->use_javascript_ajax))
@@ -581,7 +581,7 @@ if ($conf->banque->enabled)
 }
 else
 {
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index ae32c073349..d8927c552b6 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -204,8 +204,8 @@ foreach ($syslogModules as $moduleName)
 	//print $moduleName." = ".$moduleactive." - ".$module->getName()." ".($moduleactive == -1)."<br>\n";
 	if (($moduleactive == -1) && empty($conf->global->MAIN_FEATURES_LEVEL)) continue;		// Some modules are hidden if not activable and not into debug mode (end user must not see them)
 
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td width="140">';
 	print '<input '.$bc[$var].' type="checkbox" name="SYSLOG_HANDLERS[]" value="'.$moduleName.'" '.(in_array($moduleName, $activeModules) ? 'checked' : '').($moduleactive <= 0 ? 'disabled' : '').'> ';
 	print $module->getName();
@@ -257,7 +257,7 @@ print '<td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td
 print '<td align="right"><input type="submit" class="button" '.$option.' value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 $var=true;
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="140">'.$langs->trans("SyslogLevel").'</td>';
 print '<td colspan="2"><select class="flat" name="level" '.$option.'>';
 print '<option value="'.LOG_EMERG.'" '.($conf->global->SYSLOG_LEVEL==LOG_EMERG?'SELECTED':'').'>LOG_EMERG ('.LOG_EMERG.')</option>';
diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php
index b2b5499d298..7676cf34ac5 100644
--- a/htdocs/admin/system/browser.php
+++ b/htdocs/admin/system/browser.php
@@ -51,23 +51,23 @@ $var=true;
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("UserAgent").'</td><td colspan="2">'.$_SERVER['HTTP_USER_AGENT'].'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("BrowserName").'</td><td colspan="2">'.$tmp['browsername'].'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("BrowserOS").'</td><td colspan="2">'.$tmp['browseros'].'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Version").'</td><td colspan="2">'.$tmp['browserversion'].'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Layout").' (phone/tablet/classic)</td><td colspan="2">'.$tmp['layout'].'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("IPAddress").'</td><td colspan="2">'.$_SERVER['REMOTE_ADDR'].'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Screen").'</td><td colspan="2">';
 print $_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
 print '</td></tr>'."\n";
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index 0fb3a6c9a7b..9590260f005 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -170,8 +170,8 @@ foreach($configfileparameters as $key)
             continue;
         }
 
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 		if ($newkey == 'separator')
 		{
 			print '<td colspan="3">&nbsp;</td>';
@@ -238,9 +238,9 @@ if ($resql)
 	while ($i < $num)
     {
     	$obj = $db->fetch_object($resql);
-    	$var=!$var;
+    	
 
-    	print '<tr '.$bc[$var].'>';
+    	print '<tr class="oddeven">';
     	print '<td>'.$obj->name.'</td>'."\n";
     	print '<td>'.$obj->value.'</td>'."\n";
     	if (empty($conf->multicompany->enabled) || !$user->entity) print '<td>'.$obj->entity.'</td>'."\n";	// If superadmin or multicompany disabled
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 6e528c73094..1e70cbab6cc 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -108,8 +108,8 @@ else
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				
+				print '<tr class="oddeven">';
 
 				print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
 				print '<td>'.$obj->Engine.'</td>';
@@ -163,8 +163,8 @@ else
 			while ($i < $num)
 			{
 				$row = $db->fetch_row($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				
+				print '<tr class="oddeven">';
 				print '<td>'.$row[0].'</td>';
 				print '<td align="right">'.$row[1].'</td>';
 				print '<td align="right">'.$row[2].'</td>';
@@ -205,7 +205,7 @@ else
 					$count = '?';
 				}
 
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td>'.$row[0].'</td>';
 				print '<td>'.$count.'</td>';
 				print '</tr>';
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index c50e6ca9e4c..39511e8a814 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -103,8 +103,8 @@ else
 		$var=true;
 		foreach($listtouse as $param => $paramval)
 		{
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			
+			print '<tr class="oddeven">';
 			print '<td>';
 			print $param;
 			print '</td>';
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 3fc10bb0f3f..624edc2f38e 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -111,8 +111,8 @@ else
 			while ($i < $num)
 			{
 				$row = $db->fetch_row($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				
+				print '<tr class="oddeven">';
 
 				print "<td>$row[0]</td>";
 				print "<td>$row[1]</td>";
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 6a5384da69a..52d25986567 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -72,7 +72,7 @@ $var=true;
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").')</td><td>'.DOL_VERSION;
 // If current version differs from last upgrade
 if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
@@ -123,9 +123,9 @@ if (function_exists('curl_init'))
 }
 
 print '</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
 print '</table>';
 print '</div>';
@@ -136,28 +136,28 @@ $var=true;
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Session").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("SessionSavePath").'</td><td colspan="2">'.session_save_path().'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentSessionTimeOut").'</td><td>'.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds");
 print '</td><td align="right">';
 print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
 print "</td></tr>\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentTheme").'</td><td colspan="2">'.$conf->theme.'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentMenuHandler").'</td><td colspan="2">';
 print $conf->standard_menu;
 print '</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("Screen").'</td><td colspan="2">';
 print $_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
 print '</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("Session").'</td><td colspan="2">';
 $i=0;
 foreach($_SESSION as $key => $val)
@@ -188,7 +188,7 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
 
 	foreach($shmoparray as $key => $val)
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td>'.$key.'</td>';
 		print '<td>'.count($val).'</td>';
 		print '<td align="right">'.dol_getshmopaddress($key).'</td>';
@@ -206,39 +206,39 @@ $var=true;
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("LocalisationDolibarrParameters").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LanguageBrowserParameter","HTTP_ACCEPT_LANGUAGE").'</td><td>'.$_SERVER["HTTP_ACCEPT_LANGUAGE"].'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentUserLanguage").'</td><td>'.$langs->getDefaultLang().'</td></tr>'."\n";
 // Thousands
-$var=!$var;
+
 $thousand=$langs->transnoentitiesnoconv("SeparatorThousand");
 if ($thousand == 'SeparatorThousand') $thousand=' ';	// ' ' does not work on trans method
 if ($thousand == 'None') $thousand='';
 print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentValueSeparatorThousand").'</td><td>'.($thousand==' '?$langs->transnoentitiesnoconv("Space"):$thousand).'</td></tr>'."\n";
 // Decimals
-$var=!$var;
+
 $dec=$langs->transnoentitiesnoconv("SeparatorDecimal");
 print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentValueSeparatorDecimal").'</td><td>'.$dec.'</td></tr>'."\n";
 // Show results of functions to see if everything works
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>&nbsp; => price2num(1233.56+1)</td><td>'.price2num(1233.56+1,'2').'</td></tr>'."\n";
-$var=!$var;
+
 print "<tr ".$bc[$var].'><td>&nbsp; => price2num('."'1".$thousand."234".$dec."56')</td><td>".price2num("1".$thousand."234".$dec."56",'2')."</td></tr>\n";
 if (($thousand != ',' && $thousand != '.') || ($thousand != ' '))
 {
-	$var=!$var;
+	
 	print "<tr ".$bc[$var].'><td>&nbsp; => price2num('."'1 234.56')</td><td>".price2num("1 234.56",'2')."</td>";
 	print "</tr>\n";
 }
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>&nbsp; => price(1234.56)</td><td>'.price(1234.56).'</td></tr>'."\n";
 // Timezone
 $txt =$langs->trans("OSTZ").' (variable system TZ): '.(! empty($_ENV["TZ"])?$_ENV["TZ"]:$langs->trans("NotDefined")).'<br>'."\n";
 $txt.=$langs->trans("PHPTZ").' (php.ini date.timezone): '.(ini_get("date.timezone")?ini_get("date.timezone"):$langs->trans("NotDefined")).''."<br>\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 $txt.=$langs->trans("Dolibarr constant MAIN_SERVER_TZ").': '.(empty($conf->global->MAIN_SERVER_TZ)?$langs->trans("NotDefined"):$conf->global->MAIN_SERVER_TZ);
 //$txt.=$langs->trans("YouCanEditPHPTZ"); // deprecated
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
 $a=getServerTimeZoneInt('now');
 $b=getServerTimeZoneInt('winter');
@@ -251,18 +251,18 @@ $val.=' &nbsp; &nbsp; &nbsp; '.getServerTimeZoneString();
 $val.=' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': '.($daylight==='unknown'?'unknown':($a==$c?yn($daylight):yn(0).($daylight?'  &nbsp; &nbsp; ('.$langs->trans('YesInSummer').')':'')));
 print $form->textwithtooltip($val,$txt,2,1,img_info(''));
 print '</td></tr>'."\n";	// value defined in http://fr3.php.net/manual/en/timezones.europe.php
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>&nbsp; => '.$langs->trans("CurrentHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzserver').'</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>&nbsp; => dol_print_date(0,"dayhourtext")</td><td>'.dol_print_date(0,"dayhourtext").'</td>';
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>&nbsp; => dol_get_first_day(1970,1,false)</td><td>'.dol_get_first_day(1970,1,false).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,false),'dayhour').')</td>';
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>&nbsp; => dol_get_first_day(1970,1,true)</td><td>'.dol_get_first_day(1970,1,true).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,true),'dayhour').')</td>';
 // Database timezone
 if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
 {
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MySQLTimeZone").' (database)</td><td>';	// Timezone server base
 	$sql="SHOW VARIABLES where variable_name = 'system_time_zone'";
 	$resql = $db->query($sql);
@@ -274,7 +274,7 @@ if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
 	print '</td></tr>'."\n";
 }
 // Client
-$var=!$var;
+
 $tz=(int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst'];
 print '<tr '.$bc[$var].'><td>'.$langs->trans("ClientTZ").'</td><td>'.($tz?($tz>=0?'+':'').$tz:'').' ('.($tz>=0?'+':'').($tz*60*60).')';
 print ' &nbsp; &nbsp; &nbsp; '.$_SESSION['dol_tz_string'];
@@ -284,14 +284,14 @@ else print yn(0);
 if (! empty($_SESSION['dol_dst_first'])) print ' &nbsp; &nbsp; ('.dol_print_date(dol_stringtotime($_SESSION['dol_dst_first']),'dayhour','gmt').' - '.dol_print_date(dol_stringtotime($_SESSION['dol_dst_second']),'dayhour','gmt').')';
 print '</td></tr>'."\n";
 print '</td></tr>'."\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>&nbsp; => '.$langs->trans("ClientHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzuser').'</td></tr>'."\n";
 
-$var=!$var;
+
 $filesystemencoding=ini_get("unicode.filesystem_encoding");	// Disponible avec PHP 6.0
 print '<tr '.$bc[$var].'><td>'.$langs->trans("File encoding").' (php.ini unicode.filesystem_encoding)</td><td>'.$filesystemencoding.'</td></tr>'."\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 
-$var=!$var;
+
 $tmp=ini_get("unicode.filesystem_encoding");						// Disponible avec PHP 6.0
 if (empty($tmp) && ! empty($_SERVER["WINDIR"])) $tmp='iso-8859-1';	// By default for windows
 if (empty($tmp)) $tmp='utf-8';										// By default for other
@@ -384,8 +384,8 @@ foreach($configfileparameters as $key => $value)
 		}
 		if (strpos($newkey, 'separator') !== false && $lastkeyshown == 'separator') continue;
 
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 		if (strpos($newkey, 'separator') !== false)
 		{
 			print '<td colspan="3">&nbsp;</td>';
@@ -468,9 +468,9 @@ if ($resql)
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
-		$var=!$var;
+		
 
-		print '<tr '.$bc[$var].'>';
+		print '<tr class="oddeven">';
 		print '<td class="tdoverflow">'.$obj->name.'</td>'."\n";
 		print '<td class="tdoverflow">'.$obj->value.'</td>'."\n";
 		if (empty($conf->multicompany->enabled) || !$user->entity) print '<td align="center" width="80px">'.$obj->entity.'</td>'."\n";	// If superadmin or multicompany disabled
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 706e0215059..68a01340303 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -118,7 +118,7 @@ $rights_ids = array();
 foreach($sortorder as $numero=>$name)
 {
 	$idperms="";
-	$var=!$var;
+	
 	// Module
 	print "<tr ".$bc[$var].'><td width="300" class="nowrap">';
 	$alt=$name.' - '.$modules_files[$numero];
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 3e9ccbc895f..6bb431bfdfb 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -82,8 +82,8 @@ foreach($phparray as $key => $value)
 	{
 		if (! is_array($keyvalue))
 		{
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			
+			print '<tr class="oddeven">';
 			print '<td>'.$keyparam.'</td>';
 			$valtoshow=$keyvalue;
 			if ($keyparam == 'X-ChromePhp-Data') $valtoshow=dol_trunc($keyvalue,80);
@@ -97,8 +97,8 @@ foreach($phparray as $key => $value)
 		}
 		else
 		{
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			
+			print '<tr class="oddeven">';
 			print '<td>'.$keyparam.'</td>';
 			$i=0;
 			foreach($keyvalue as $keyparam2 => $keyvalue2)
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 00bf0635293..788d8604584 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -204,7 +204,7 @@ print "</tr>\n";
 
 foreach ($list as $key)
 {
-	$var=!$var;
+	
 
 	print '<tr '.$bc[$var].' class="value">';
 
diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php
index 5a142f3e51e..68d56bd2ded 100644
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@@ -174,7 +174,7 @@ function create_script_table($list)
 
     foreach($list as $script) {
         $var = ! $var;
-        print '<tr '.$bc[$var].'>';
+        print '<tr class="oddeven">';
         print '<td>'.dol_trunc($script['file'],80,'left').'</td>';
         print '<td align="center" class="nowrap">'.dol_print_date($script['mtime'],'dayhour').'</td>';
         print '<td align="right" class="nowrap">'.number_format($script['size'] / 1024, 2).'KB</td>';
@@ -207,7 +207,7 @@ function create_key_table($list)
 
     foreach($list as $key) {
         $var = !$var;
-        print '<tr '.$bc[$var].'>';
+        print '<tr class="oddeven">';
         print '<td>'.dol_trunc($key['name'],80,'left').'</td>';
         print '<td align="center" class="nowrap">'.dol_print_date($key['created'],'dayhour').'</td>';
         print '<td align="right" class="nowrap">'.number_format($key['size']/1024, 3).'KB</td>';
@@ -239,37 +239,37 @@ print '<tr class="liste_titre">';
 print '<td colspan="2">Information</td>';
 print '</tr>';
 $var = !$var;
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>Caching enabled</td>';
 print '<td align="right">'.($info['cache']?'yes':'no').'</td>';
 print '</tr>';
 $var = !$var;
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>Optimizer enabled</td>';
 print '<td align="right">'.$info['optimizer']?'yes':'no'.'</td>';
 print '</tr>';
 $var = !$var;
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>Memory usage</td>';
 print '<td align="right">'.number_format(100 * $info['memoryAllocated']/$info['memorySize'], 2).'%('.number_format($info['memoryAllocated'] / (1024*1024), 2).'MB / '.number_format($info['memorySize']/(1024*1024), 2).'MB)</td>';
 print '</tr>';
 $var = ! $var;
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>Free memory in reserved cache</td>';
 print '<td align="right">'.number_format($info['memoryAvailable']/(1024*1024), 2).'MB</td>';
 print '</tr>';
 $var = ! $var;
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>Cached scripts</td>';
 print '<td align="right">'.$info['cachedScripts'].'</td>';
 print '</tr>';
 $var = ! $var;
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>Removed scripts</td>';
 print '<td align="right">'.$info['removedScripts'].'</td>';
 print '</tr>';
 $var = ! $var;
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>Cached keys</td>';
 print '<td align="right">'.(isset($info['cachedKeys'])?$info['cachedKeys']:'').'</td>';
 print '</tr>';
@@ -289,12 +289,12 @@ if (is_array($resCached) || is_array($resRemoved)) {
 
     if (is_array($resCached)) {
         $var = ! $var;
-        print "<tr ".$bc[$var].">";
+        print '<tr class="oddeven">';
         print "<td>Caching</td>";
         print '<td align="right"><input type="submit" class="butAction" name="caching" value="'. ($info['cache']?'disable':'enable') .'" /></td>';
         print "</tr>";
         $var = ! $var;
-        print "<tr ".$bc[$var].">";
+        print '<tr class="oddeven">';
         print "<td>Optimizer</td>";
         print '<td align="right"><input type="submit" class="butAction" name="optimizer" value="'. ($info['optimizer']?'disable':'enable') .'" /></td>';
         print "</tr>";
@@ -302,17 +302,17 @@ if (is_array($resCached) || is_array($resRemoved)) {
 
     if (is_array($resRemoved)) {
         $var = ! $var;
-        print "<tr ".$bc[$var].">";
+        print '<tr class="oddeven">';
         print "<td>Clear cache</td>";
         print '<td align="right"><input type="submit" class="butAction" name="clear" value="clear" title="remove all unused scripts and data from shared memory and disk cache" /></td>';
         print "</tr>";
         $var = ! $var;
-        print "<tr ".$bc[$var].">";
+        print '<tr class="oddeven">';
         print "<td>Clean cache</td>";
         print '<td align="right"><input type="submit" class="butAction" name="clean" value="clean" title=" remove all expired scripts and data from shared memory and disk cache" /></td>';
         print "</tr>";
         $var = ! $var;
-        print "<tr ".$bc[$var].">";
+        print '<tr class="oddeven">';
         print "<td>Purge cache</td>";
         print '<td align="right"><input type="submit" class="butAction" name="purge" value="purge" title="remove all \'removed\' scripts from shared memory" /></td>';
         print "</tr></table></form>";
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 4e0651597ee..f5e6afd36b1 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -261,9 +261,9 @@ if ($result)
 	{
 		$obj = $db->fetch_object($result);
 
-		$var=!$var;
+		
 
-		print '<tr '.$bc[$var].'>';
+		print '<tr class="oddeven">';
 
 		// Date
 		print '<td align="left" class="nowrap">'.dol_print_date($db->jdate($obj->dateevent),'%Y-%m-%d %H:%M:%S').'</td>';
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index c313c91a7bd..56db6eb2ad7 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -141,9 +141,9 @@ if ($savehandler == 'files')
 
 	foreach ($listofsessions as $key => $sessionentry)
 	{
-		$var=!$var;
+		
 
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 
 		// Login
 		print '<td>'.$sessionentry['login'].'</td>';
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index bb485c41999..6d3ee6ced8e 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -79,7 +79,6 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
     $search_array_options=array();
 }
 
-
 if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 {
 	$error=0;
@@ -101,18 +100,22 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 	}
 	if (! $error)
 	{
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."')";
+	    $db->begin();
+	    
+	    $sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue, entity) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."', ".$db->escape($conf->entity).")";
 		$result = $db->query($sql);
 		if ($result > 0)
 		{
-			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+		    $db->commit();
+		    setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$action="";
 			$transkey="";
 			$transvalue="";
 		}
 		else
 		{
-			dol_print_error($db);
+	        $db->rollback();
+		    setEventMessages($db->lasterror(), null, 'errors');
 			$action='';
 		}
 	}
@@ -206,10 +209,9 @@ if ($mode == 'overwrite')
     
     
     // Line to add new record
-    $var=false;
     print "\n";
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, 0, 'maxwidthonsmartphone', 1);
     print '</td>'."\n";
     print '<td>';
@@ -236,18 +238,10 @@ if ($mode == 'overwrite')
     
     
     // Show constants
-    $sql = "SELECT";
-    $sql.= " rowid";
-    $sql.= ", lang";
-    $sql.= ", transkey";
-    $sql.= ", transvalue";
+    $sql = "SELECT rowid, entity, lang, transkey, transvalue";
     $sql.= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
     $sql.= " WHERE 1 = 1";
     //$sql.= " AND entity IN (".$user->entity.",".$conf->entity.")";
-    //if ((empty($user->entity) || $user->admin) && $debug) {} 										// to force for superadmin to debug
-    //else if (! GETPOST('visible') || GETPOST('visible') != 'all') $sql.= " AND visible = 1";		// We must always have this. Otherwise, array is too large and submitting data fails due to apache POST or GET limits
-    //if (GETPOST('name')) $sql.=natural_search("name", GETPOST('name'));
-    //$sql.= " ORDER BY entity, name ASC";
     $sql.= $db->order($sortfield, $sortorder);
     
     dol_syslog("translation::select from table", LOG_DEBUG);
@@ -256,16 +250,14 @@ if ($mode == 'overwrite')
     {
     	$num = $db->num_rows($result);
     	$i = 0;
-    	$var=false;
     
     	while ($i < $num)
     	{
     		$obj = $db->fetch_object($result);
-    		$var=!$var;
     
     		print "\n";
     
-    		print '<tr '.$bc[$var].'>';
+    		print '<tr class="oddeven">';
     		
     		print '<td>'.$obj->lang.'</td>'."\n";
     		print '<td>'.$obj->transkey.'</td>'."\n";
@@ -332,8 +324,8 @@ if ($mode == 'searchkey')
             foreach($filearray as $file)
             {
                 $tmpfile=preg_replace('/.lang/i', '', basename($file['name']));
-                $newlang->load($tmpfile, 0, 0, '', 0);
-                $newlangfileonly->load($tmpfile, 0, 0, '', 1);
+                $newlang->load($tmpfile, 0, 0, '', 0);                              // Load translation files + database overwrite
+                $newlangfileonly->load($tmpfile, 0, 0, '', 1);                      // Load translation files only
                 //print 'After loading lang '.$tmpfile.', newlang has '.count($newlang->tab_translate).' records<br>'."\n";
             }
         }
@@ -372,10 +364,9 @@ if ($mode == 'searchkey')
     print "</tr>\n";
 
     // Line to search new record
-    $var=false;
     print "\n";
 
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     //print $formadmin->select_language($langcode,'langcode',0,null,$langs->trans("All"),0,0,'',1);
     print $formadmin->select_language($langcode,'langcode', 0, null, 0, 0, 0, 'maxwidthonsmartphone', 1);
     print '</td>'."\n";
@@ -408,14 +399,12 @@ if ($mode == 'searchkey')
     
     // Show result
     $i=0;
-    $var=false;
     foreach($recordtoshow as $key => $val)
     {
         $i++;
         if ($i <= $offset) continue;
         if ($i > ($offset + $limit)) break;
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langcode.'</td><td>'.$key.'</td><td>';
+        print '<tr class="oddeven"><td>'.$langcode.'</td><td>'.$key.'</td><td>';
         print dol_escape_htmltag($val);
         print '</td><td align="right">';
         if ($val != $newlangfileonly->tab_translate[$key]) 
@@ -425,7 +414,7 @@ if ($mode == 'searchkey')
         }
         /*if (! empty($conf->multicompany->enabled) && !$user->entity)
         {
-            print $val;
+            print '<td>'.$val.'</td>';
         }*/
         print '</td></tr>'."\n";
     }
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index c1224bffe89..0aae9c6915e 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -64,8 +64,8 @@ print '<table class="noborder">
 $var=True;
 foreach ($triggers as $trigger)
 {
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td valign="top" width="14" align="center">'.$trigger['picto'].'</td>';
 	print '<td class="tdtop">'.$trigger['file'].'</td>';
 	print '<td valign="top" align="center">'.$trigger['status'].'</td>';
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index d237ca3e727..e3998f6e37c 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -180,8 +180,8 @@ $var=true;
 $form = new Form($db);
 
 // Mail required for members
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("UserMailRequired").'</td>';
 print '<td align="center" width="20">&nbsp;</td>';
 
diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index b622aa1d9dd..e013fbcacc8 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -75,7 +75,7 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("NbOfBoomarkToShow").'</td><td>';
 print '<input size="3" type="text" name="BOOKMARKS_SHOW_IN_MENU" value="'.$conf->global->BOOKMARKS_SHOW_IN_MENU.'">';
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 4e1996cf658..40a316d881b 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -122,8 +122,8 @@ if ($resql)
     {
         $obj = $db->fetch_object($resql);
 
-        $var=!$var;
-        print "<tr ".$bc[$var].">";
+        
+        print '<tr class="oddeven">';
 
         // Id
         print '<td align="left">';
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index de60e8b80cf..0f6da77fa43 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -100,26 +100,26 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td width=\"50%\">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
 print '<td colspan="2">';
 print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY,'socid','s.client in (1,3)',1,0,1,array(),0);
 print '</td></tr>';
 if (! empty($conf->banque->enabled))
 {
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
 	print '<td colspan="2">';
 	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CASH,'CASHDESK_ID_BANKACCOUNT_CASH',0,"courant=2",1);
 	print '</td></tr>';
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskBankAccountForCheque").'</td>';
 	print '<td colspan="2">';
 	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE,'CASHDESK_ID_BANKACCOUNT_CHEQUE',0,"courant=1",1);
 	print '</td></tr>';
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskBankAccountForCB").'</td>';
 	print '<td colspan="2">';
 	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CB,'CASHDESK_ID_BANKACCOUNT_CB',0,"courant=1",1);
@@ -128,7 +128,7 @@ if (! empty($conf->banque->enabled))
 
 if (! empty($conf->stock->enabled))
 {
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>';	// Force warehouse (this is not a default value)
 	print '<td colspan="2">';
 	if (empty($conf->productbatch->enabled)) {
@@ -145,7 +145,7 @@ if (! empty($conf->stock->enabled))
 
 	$disabled=$conf->global->CASHDESK_NO_DECREASE_STOCK;
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskIdWareHouse").'</td>';	// Force warehouse (this is not a default value)
 	print '<td colspan="2">';
 	if (! $disabled)
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index d1af6bdafb2..bc27be9bb12 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -96,8 +96,8 @@ $var=true;
 $form = new Form($db);
 
 // Mail required for members
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("CategorieRecursiv").'</td>';
 print '<td align="center" width="20">'. $form->textwithpicto('',$langs->trans("CategorieRecursivHelp"),1,'help').'</td>';
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index e138107fd3f..ebd5fa9991c 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -292,7 +292,7 @@ else
 		$var=true;
 		foreach ($cats as $cat)
 		{
-			$var=!$var;
+			
 			print "\t<tr ".$bc[$var].">\n";
 			print "\t\t".'<td class="nowrap">';
 			print "<a href='viewcat.php?id=".$cat->id."&amp;type=".$type."'>".$cat->label."</a>";
@@ -363,7 +363,7 @@ if ($object->type == Categorie::TYPE_PRODUCT)
 			$var=true;
 			foreach ($prods as $prod)
 			{
-				$var=!$var;
+				
 				print "\t<tr ".$bc[$var].">\n";
 				print '<td class="nowrap" valign="top">';
 				print $prod->getNomUrl(1);
@@ -414,7 +414,7 @@ if ($object->type == Categorie::TYPE_SUPPLIER)
 			$var=true;
 			foreach ($socs as $soc)
 			{
-				$var=!$var;
+				
 				print "\t<tr ".$bc[$var].">\n";
 
 				print '<td class="nowrap" valign="top">';
@@ -470,7 +470,7 @@ if($object->type == Categorie::TYPE_CUSTOMER)
 				if ($user->societe_id > 0 && $soc->id != $user->societe_id)	continue; 	// External user always see only themself
 
 				$i++;
-				$var=!$var;
+				
 				print "\t<tr ".$bc[$var].">\n";
 				print '<td class="nowrap" valign="top">';
 				print $soc->getNomUrl(1);
@@ -523,7 +523,7 @@ if ($object->type == Categorie::TYPE_MEMBER)
 			$var=true;
 			foreach ($prods as $key => $member)
 			{
-				$var=!$var;
+				
 				print "\t<tr ".$bc[$var].">\n";
 				print '<td class="nowrap" valign="top">';
 				$member->ref=$member->login;
@@ -578,7 +578,7 @@ if($object->type == Categorie::TYPE_CONTACT)
 			foreach ($contacts as $key => $contact)
 			{
 				$i++;
-				$var=!$var;
+				
 				print "\t<tr ".$bc[$var].">\n";
 				print '<td class="nowrap" valign="top">';
 				print $contact->getNomUrl(1,'category');
@@ -632,7 +632,7 @@ if ($object->type == Categorie::TYPE_ACCOUNT)
             $var=true;
             foreach ($accounts as $key => $account)
             {
-                $var=!$var;
+                
                 print "\t<tr ".$bc[$var].">\n";
                 print '<td class="nowrap" valign="top">';
                 print $account->getNomUrl(1,0);
@@ -687,7 +687,7 @@ if ($object->type == Categorie::TYPE_PROJECT)
 			$var=true;
 			foreach ($projects as $key => $project)
 			{
-				$var=!$var;
+				
 				print "\t<tr ".$bc[$var].">\n";
 				print '<td class="nowrap" valign="top">';
 				print $project->getNomUrl(1,0);
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index ef260cb2197..8b1dc424239 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -400,7 +400,7 @@ if ($resql)
         	continue;
         }
 
-		$var=!$var;
+		
 
 		$actionstatic->id=$obj->id;
 		$actionstatic->ref=$obj->id;
@@ -409,7 +409,7 @@ if ($resql)
 		$actionstatic->type_picto=$obj->type_picto;
 		$actionstatic->label=$obj->label;
 		
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 
 		// Action (type)
 		print '<td>';
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 97f255abe14..760d82f0246 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -135,8 +135,8 @@ if ($resql)
 
 		if ($obj)
 		{
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 
 			print "<td>".$obj->df."</td>\n";
 			print '<td align="center">'.$obj->cc.'</td>';
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 52fdaa6eceb..31def3d1b29 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -639,8 +639,8 @@ if ($id > 0)
 			while ($i < $num && $i < $MAXLIST)
 			{
 				$objp = $db->fetch_object($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				
+				print '<tr class="oddeven">';
                 print '<td class="nowrap">';
                 $propal_static->id = $objp->propalid;
                 $propal_static->ref = $objp->ref;
@@ -723,8 +723,8 @@ if ($id > 0)
 			while ($i < $num && $i < $MAXLIST)
 			{
 				$objp = $db->fetch_object($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				
+				print '<tr class="oddeven">';
                 print '<td class="nowrap">';
                 $commande_static->id = $objp->cid;
                 $commande_static->ref = $objp->ref;
@@ -850,8 +850,8 @@ if ($id > 0)
 				$contrat=new Contrat($db);
 
 				$objp = $db->fetch_object($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				
+				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 				$contrat->id=$objp->id;
 				$contrat->ref=$objp->ref?$objp->ref:$objp->id;
@@ -906,7 +906,7 @@ if ($id > 0)
 				print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/fichinter/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
 				print '</tr></table></td>';
 				print '</tr>';
-				$var=!$var;
+				
 			}
 			$i = 0;
 			while ($i < $num && $i < $MAXLIST)
@@ -916,13 +916,13 @@ if ($id > 0)
 				$fichinter_static->id=$objp->id;
                 $fichinter_static->statut=$objp->fk_statut;
 
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fichinter/card.php?id='.$objp->id.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.'</a></td>'."\n";
                 //print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n";
 				print '<td align="right" style="min-width: 60px">'.convertSecondToTime($objp->duration).'</td>'."\n";
 				print '<td align="right" class="nowrap" style="min-width: 60px">'.$fichinter_static->getLibStatut(5).'</td>'."\n";
 				print '</tr>';
-				$var=!$var;
+				
 				$i++;
 			}
 			$db->free($resql);
@@ -978,8 +978,8 @@ if ($id > 0)
 			while ($i < $num && $i < $MAXLIST)
 			{
 				$objp = $db->fetch_object($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				
+				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 				$facturestatic->id = $objp->facid;
 				$facturestatic->ref = $objp->facnumber;
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 7b71e3ade9c..fe66e3ac243 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -150,9 +150,9 @@ if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
 
-		$var=!$var;
+		
 
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowContact"),"contact");
 		print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.$obj->name.'</a></td>';
 		print "<td>$obj->firstname</TD>";
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index f8f987f1222..848aa2c05a5 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -167,7 +167,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				$var=!$var;
+				
 				print '<tr '.$bc[$var].'><td  class="nowrap">';
 				$propalstatic->id=$obj->rowid;
 				$propalstatic->ref=$obj->ref;
@@ -192,13 +192,13 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 			}
 			if ($total>0)
 			{
-				$var=!$var;
+				
 				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
 			}
 		}
 		else
 		{
-			$var=!$var;
+			
 			print '<tr '.$bc[$var].'><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
 		}
 		print "</table><br>";
@@ -248,7 +248,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
             while ($i < $num)
             {
                 $obj = $db->fetch_object($resql);
-                $var=!$var;
+                
                 print '<tr '.$bc[$var].'><td  class="nowrap">';
                 $supplierproposalstatic->id=$obj->rowid;
                 $supplierproposalstatic->ref=$obj->ref;
@@ -272,13 +272,13 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
             }
             if ($total>0)
             {
-                $var=!$var;
+                
                 print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
             }
         }
         else
         {
-            $var=!$var;
+            
             print '<tr '.$bc[$var].'><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
         }
         print "</table><br>";
@@ -326,7 +326,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 			$var = true;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$obj = $db->fetch_object($resql);
 				print '<tr '.$bc[$var].'><td class="nowrap">';
                 $orderstatic->id=$obj->rowid;
@@ -352,13 +352,13 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 			}
 			if ($total>0)
 			{
-				$var=!$var;
+				
 				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
 			}
 		}
 		else
 		{
-			$var=!$var;
+			
 			print '<tr '.$bc[$var].'><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
 		}
 		print "</table><br>";
@@ -407,7 +407,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
             $var = true;
             while ($i < $num)
             {
-                $var=!$var;
+                
                 $obj = $db->fetch_object($resql);
                 print '<tr '.$bc[$var].'><td class="nowrap">';
                 $supplierorderstatic->id=$obj->rowid;
@@ -433,13 +433,13 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
             }
             if ($total>0)
             {
-                $var=!$var;
+                
                 print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
             }
         }
         else
         {
-			$var=!$var;
+			
             print '<tr '.$bc[$var].'><td colspan="3" class="opacitymedium">'.$langs->trans("NoSupplierOrder").'</td></tr>';
         }
         print "</table><br>";
@@ -503,7 +503,7 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
                 $companystatic->code_client = $objp->code_client;
                 $companystatic->code_fournisseur = $objp->code_fournisseur;
                 $companystatic->canvas=$objp->canvas;
-				print '<tr '.$bc[$var].'>';
+				print '<tr class="oddeven">';
 				print '<td class="nowrap">'.$companystatic->getNomUrl(1,'customer',48).'</td>';
 				print '<td align="right" nowrap>';
 				print $companystatic->getLibCustProspStatut();
@@ -511,7 +511,7 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
 				print '<td align="right" nowrap>'.dol_print_date($db->jdate($objp->tms),'day')."</td>";
 				print '</tr>';
 				$i++;
-				$var=!$var;
+				
 
 			}
 
@@ -562,11 +562,11 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
                 $companystatic->code_client = $objp->code_client;
                 $companystatic->code_fournisseur = $objp->code_fournisseur;
                 $companystatic->canvas=$objp->canvas;
-                print '<tr '.$bc[$var].'>';
+                print '<tr class="oddeven">';
 				print '<td class="nowrap">'.$companystatic->getNomUrl(1,'supplier',44).'</td>';
 				print '<td align="right">'.dol_print_date($db->jdate($objp->dm),'day').'</td>';
 				print '</tr>';
-				$var=!$var;
+				
 				$i++;
 			}
 
@@ -647,7 +647,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO
                 print $companystatic->getNomUrl(1,'customer',44);
 				print '</td>'."\n";
 				print "<td align=\"right\">".$staticcontrat->LibStatut($obj->statut,3)."</td></tr>\n";
-				$var=!$var;
+				
 				$i++;
 			}
 			print "</table><br>";
@@ -695,8 +695,8 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 			while ($i < $nbofloop)
 			{
 				$obj = $db->fetch_object($result);
-				$var=!$var;
-				print '<tr '.$bc[$var].'>';
+				
+				print '<tr class="oddeven">';
 
 				// Ref
 				print '<td class="nowrap" width="140">';
@@ -794,8 +794,8 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 			while ($i < $nbofloop)
 			{
 				$obj = $db->fetch_object($result);
-				$var=!$var;
-				print '<tr '.$bc[$var].'>';
+				
+				print '<tr class="oddeven">';
 
 				// Ref
 				print '<td class="nowrap" width="140">';
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 470ee2a4ec1..16f3f4db561 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -229,7 +229,7 @@ if ($object->fetch($id) >= 0)
 
 	print "</div>";
 
-	$var=!$var;
+	
 
 	$allowaddtarget=($object->statut == 0);
 
@@ -311,7 +311,7 @@ if ($object->fetch($id) >= 0)
 				if ($qualified)
 				{
 					$var = !$var;
-					//print '<tr '.$bc[$var].'>';
+					//print '<tr class="oddeven">';
 //					print '<div '.$bctag[$var].'>';
 
 					if ($allowaddtarget)
@@ -523,9 +523,9 @@ if ($object->fetch($id) >= 0)
 			{
 				$obj = $db->fetch_object($resql);
 
-				$var=!$var;
+				
 
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td>'.$obj->email.'</td>';
 				print '<td>'.$obj->lastname.'</td>';
 				print '<td>'.$obj->firstname.'</td>';
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 0ea109960e7..b114cf92895 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -110,7 +110,7 @@ if (is_resource($handle))
 
                     foreach ($mailmodule->getSqlArrayForStats() as $sql)
                     {
-                        print '<tr '.$bc[$var].'>';
+                        print '<tr class="oddeven">';
 
                         $result=$db->query($sql);
                         if ($result)
@@ -176,9 +176,9 @@ if ($result)
       while ($i < $num )
 	{
 	  $obj = $db->fetch_object($result);
-	  $var=!$var;
+	  
 
-	  print "<tr ".$bc[$var].">";
+	  print '<tr class="oddeven">';
 	  print '<td class="nowrap"><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.'</a></td>';
 	  print '<td>'.dol_trunc($obj->titre,38).'</td>';
 	  print '<td align="center">'.dol_print_date($db->jdate($obj->date_creat),'day').'</td>';
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 622783d7ca5..99af5749963 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -158,7 +158,7 @@ if ($result)
 	{
 		$obj = $db->fetch_object($result);
 
-		$var=!$var;
+		
 
 		print "<tr>";
 		print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$obj->rowid.'">';
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 82d57f721da..07779753c0d 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -122,8 +122,8 @@ if ($resql)
         $dataseries[]=array('label'=>$propalstatic->LibStatut($status,1),'data'=>(isset($vals[$status])?(int) $vals[$status]:0));
         if (! $conf->use_javascript_ajax)
         {
-            $var=!$var;
-            print "<tr ".$bc[$var].">";
+            
+            print '<tr class="oddeven">';
             print '<td>'.$propalstatic->LibStatut($status,0).'</td>';
             print '<td align="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status])?$vals[$status]:0).'</a></td>';
             print "</tr>\n";
@@ -176,9 +176,9 @@ if (! empty($conf->propal->enabled))
 			$var = True;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$obj = $db->fetch_object($resql);
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 
 				$propalstatic->id=$obj->rowid;
 				$propalstatic->ref=$obj->ref;
@@ -236,10 +236,10 @@ if ($resql)
 		$var = True;
 		while ($i < $num)
 		{
-			$var=!$var;
+			
 			$obj = $db->fetch_object($resql);
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			print '<td width="20%" class="nowrap">';
 
 			$propalstatic->id=$obj->rowid;
@@ -317,8 +317,8 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 			while ($i < $nbofloop)
 			{
 				$obj = $db->fetch_object($result);
-				$var=!$var;
-				print '<tr '.$bc[$var].'>';
+				
+				print '<tr class="oddeven">';
 
 				// Ref
 				print '<td class="nowrap" width="140">';
@@ -405,9 +405,9 @@ if (! empty($conf->propal->enabled))
 			$var = True;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$obj = $db->fetch_object($resql);
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 
 				$propalstatic->id=$obj->rowid;
@@ -477,9 +477,9 @@ if (! empty($conf->propal->enabled))
 			$var = True;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$obj = $db->fetch_object($resql);
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td width="20%" class="nowrap">';
 
 				$propalstatic->id=$obj->rowid;
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index ba01033eee5..ce6d6e2bc72 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -747,7 +747,7 @@ if ($resql)
 	while ($i < min($num,$limit))
 	{
 		$obj = $db->fetch_object($resql);
-		$var=!$var;
+		
 		
     	$objectstatic->id=$obj->rowid;
     	$objectstatic->ref=$obj->ref;
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 2ec1a3d660b..abb24b8ffa4 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -300,7 +300,7 @@ foreach ($data as $val)
     while (! empty($year) && $oldyear > $year+1)
     {	// If we have empty year
         $oldyear--;
-        $var=!$var;
+        
         print '<tr '.$bc[$var].' height="24">';
         print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
         print '<td align="right">0</td>';
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index dd325da7297..f797025a5de 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -40,7 +40,7 @@ $var=true;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
-    $var=!$var;
+    
     $trclass=($var?'pair':'impair');
     if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
 ?>
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index b68bdb9135e..b28f86bc412 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -96,7 +96,7 @@ if ($resql)
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
-			$var=!$var;
+			
 			print '<tr '.$bc[$var].'><td>';
 			print '<a href="prospects.php?page=0&amp;stcomm='.$obj->id.'">';
 			print img_action($langs->trans("Show"),$obj->id).' ';
@@ -140,7 +140,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				$var=!$var;
+				
 				print '<tr '.$bc[$var].'><td>';
 				print '<a href="'.DOL_URL_ROOT.'/comm/propal/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.'</a>';
 				print '</td><td align="right">';
@@ -150,7 +150,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 				$total += $obj->price;
 			}
 			if ($total>0) {
-				$var=!$var;
+				
 				print '<tr class="liste_total"><td>'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td></tr>";
 			}
 			print "</table><br>";
@@ -205,7 +205,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				$var=!$var;
+				
 				print '<tr '.$bc[$var].'><td>';
 				print '<a href="../propal.php?id='.$obj->propalid.'">';
 				print img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.'</a></td>';
@@ -263,7 +263,7 @@ if ($resql)
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
-			$var=!$var;
+			
 			print '<tr '.$bc[$var].'><td width="12%">';
             $companystatic->id=$obj->socid;
             $companystatic->name=$obj->name;
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 5f9a5a570ff..b5672f276e7 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -155,9 +155,9 @@ if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
 
-		$var=!$var;
+		
 
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		print '<td>';
 
         $result='';
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index f24202f7fff..a1a4d33bfb1 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -141,8 +141,8 @@ if ($resql)
     {
         if (! $conf->use_javascript_ajax)
         {
-            $var=!$var;
-            print "<tr ".$bc[$var].">";
+            
+            print '<tr class="oddeven">';
             print '<td>'.$commandestatic->LibStatut($status,$bool,0).'</td>';
             print '<td align="right"><a href="list.php?viewstatut='.$status.'">'.(isset($vals[$status.$bool])?$vals[$status.$bool]:0).' ';
             print $commandestatic->LibStatut($status,$bool,3);
@@ -196,7 +196,7 @@ if (! empty($conf->commande->enabled))
 			$var = true;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$obj = $db->fetch_object($resql);
 
                 $commandestatic->id=$obj->rowid;
@@ -208,7 +208,7 @@ if (! empty($conf->commande->enabled))
 				$companystatic->code_client=$obj->code_client;
 				$companystatic->canvas=$obj->canvas;
 
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 				print $commandestatic->getNomUrl(1);
                 print "</td>";
@@ -220,7 +220,7 @@ if (! empty($conf->commande->enabled))
 		}
 		else
 		{
-			$var=!$var;
+			
 			print '<tr '.$bc[$var].'><td colspan="3">'.$langs->trans("NoOrder").'</td></tr>';
 		}
 		print "</table><br>";
@@ -268,10 +268,10 @@ if ($resql)
 		$var = true;
 		while ($i < $num)
 		{
-			$var=!$var;
+			
 			$obj = $db->fetch_object($resql);
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			print '<td width="20%" class="nowrap">';
 
 			$commandestatic->id=$obj->rowid;
@@ -349,9 +349,9 @@ if (! empty($conf->commande->enabled))
 			$var = true;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$obj = $db->fetch_object($resql);
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td class="nowrap" width="20%">';
 
 				$commandestatic->id=$obj->rowid;
@@ -431,9 +431,9 @@ if (! empty($conf->commande->enabled))
 			$var = true;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$obj = $db->fetch_object($resql);
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td width="20%" class="nowrap">';
 
 				$commandestatic->id=$obj->rowid;
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 17c73c82698..c6b93cb8f0f 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -653,8 +653,8 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			
+			print '<tr class="oddeven">';
 			print '<td class="nowrap">';
 
 			$generic_commande->id=$objp->rowid;
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 534011d73fe..dd79ee54ba1 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -323,7 +323,7 @@ foreach ($data as $val)
 	while (! empty($year) && $oldyear > $year+1)
 	{ // If we have empty year
 		$oldyear--;
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].' height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 		print '<td align="right">0</td>';
@@ -335,7 +335,7 @@ foreach ($data as $val)
 		print '</tr>';
 	}
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].' height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 38efbc91ca2..629cd3c0fb0 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -36,7 +36,7 @@ $var=true;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
-    $var=!$var;
+    
     $trclass=($var?'pair':'impair');
     if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
 ?>
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index a81a0072302..cb10fd8c3c7 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -203,8 +203,8 @@ print '</tr>';
 $var=true;
 for ($mois = 1 ; $mois < 13 ; $mois++)
 {
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print "<td>".dol_print_date(dol_mktime(1,1,1,$mois,1,2000),"%B")."</td>";
 	for ($annee = $year_start ; $annee <= $year_end ; $annee++)
 	{
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index 485e6738faf..bddf1292214 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -899,9 +899,9 @@ if ($resql)
             $bankaccount = $cachebankaccount[$objp->bankid];
         }
          
-        $var=!$var;
+        
 
-        print "<tr ".$bc[$var].">";
+        print '<tr class="oddeven">';
 
         // Ref
     	if (! empty($arrayfields['b.rowid']['checked']))            
diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index c1d668df8d7..eb6aea4f2dc 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -66,22 +66,22 @@ print "<tr class=\"liste_titre\">";
 echo '<td colspan="2">'.$langs->trans("Summary").'</td>';
 print "</tr>\n";
 
-$var=!$var;
+
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."paiement";
 $paiem = valeur($sql);
 print "<tr ".$bc[$var]."><td>Somme des paiements (associes a une facture)</td><td align=\"right\">".price($paiem)."</td></tr>";
 
-$var=!$var;
+
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount > 0";
 $credits = valeur($sql);
 print "<tr ".$bc[$var]."><td>Somme des credits</td><td align=\"right\">".price($credits)."</td></tr>";
 
-$var=!$var;
+
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount < 0";
 $debits = valeur($sql);
 print "<tr ".$bc[$var]."><td>Somme des debits</td><td align=\"right\">".price($debits)."</td></tr>";
 
-$var=!$var;
+
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank ";
 $solde = valeur($sql);
 print "<tr ".$bc[$var]."><td>".$langs->trans("BankBalance")."</td><td align=\"right\">".price($solde)."</td></tr>";
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index cd6d2adb796..699edd31b7a 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -74,8 +74,8 @@ if ($result)
 	while ($i < $num)
 	{
 		$objp = $db->fetch_object($result);
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 		print "<td><a href=\"".DOL_URL_ROOT."/compta/bank/bankentries.php?bid=$objp->rowid\">$objp->label</a></td>";
 		print '<td align="right">'.$objp->nombre.'</td>';
 		print '<td align="right">'.price(abs($objp->somme))."</td>";
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index ae35eee80fa..0cf88224e63 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -105,8 +105,8 @@ if ($result)
 	while ($i < $num)
 	{
 		$objp = $db->fetch_object($result);
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 		print '<td><a href="'.DOL_URL_ROOT.'/compta/bank/budget.php?bid='.$objp->rowid.'">'.$objp->rowid.'</a></td>';
 		if (GETPOST("action") == 'edit' && GETPOST("categid")== $objp->rowid)
 		{
@@ -136,8 +136,8 @@ if ($result)
  */
 if ($action != 'edit')
 {
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td>&nbsp;</td><td><input name="label" type="text" size="45"></td>';
 	print '<td align="center"><input type="submit" name="add" class="button" value="'.$langs->trans("Add").'"></td>';
 	print '</tr>';
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 0f4e8b825b2..d840a6abf51 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -442,7 +442,7 @@ foreach ($accounts as $key=>$type)
 		$lastcurrencycode=$acc->currency_code;
 	}
 	
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 
     // Ref
     if (! empty($arrayfields['b.ref']['checked']))
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 5a42e516020..1dbe17d6a13 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -120,13 +120,13 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	$var=true;
 
 	// Current balance
-	$var=!$var;
+	
 	print '<tr class="liste_total">';
 	print '<td align="left" colspan="5">'.$langs->trans("CurrentBalance").'</td>';
 	print '<td align="right" class="nowrap">'.price($solde).'</td>';
 	print '</tr>';
 
-	$var=!$var;
+	
 	print '<tr class="liste_titre">';
 	print '<td align="left" colspan="5">'.$langs->trans("RemainderToPay").'</td>';
 	print '<td align="right" class="nowrap">&nbsp;</td>';
@@ -293,10 +293,10 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 			// We discard lines with a remainder to pay to 0
 			if (price2num($total_ttc) != 0)
 			{
-                $var=!$var;
+                
 
     			// Show line
-    			print "<tr ".$bc[$var].">";
+    			print '<tr class="oddeven">';
     			print '<td>';
     			if ($obj->dlr) print dol_print_date($db->jdate($obj->dlr),"day");
     			else print $langs->trans("NotDefined");
@@ -318,7 +318,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	}
 
 	// Solde actuel
-	$var=!$var;
+	
 	print '<tr class="liste_total">';
 	print '<td align="left" colspan="5">'.$langs->trans("FutureBalance").' ('.$object->currency_code.')</td>';
 	print '<td align="right" class="nowrap">'.price($solde, 0, $langs, 0, 0, -1, $object->currency_code).'</td>';
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index 7366c0cf2a5..6c4b41333f1 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -193,8 +193,8 @@ if ($result)
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($result);
-        $var=!$var;
-        print "<tr ".$bc[$var].">";
+        
+        print '<tr class="oddeven">';
 
         $variousstatic->id=$obj->rowid;
 		$variousstatic->ref=$obj->rowid;
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 6215f2343e8..ee71290be2d 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -171,7 +171,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		{
 			$obj = $db->fetch_object($resql);
 			$var = !$var;
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			// Date
 			$date=$obj->periode;
 			if (empty($date)) $date=$obj->date_ech;
@@ -293,8 +293,8 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 
 		        $total = $total + $obj->amount;
 
-		        $var=!$var;
-		        print "<tr ".$bc[$var].">";
+		        
+		        print '<tr class="oddeven">';
 		        print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
 
 		        print "<td>".$obj->label."</td>\n";
@@ -423,8 +423,8 @@ while($j<$numlt)
 
 				$total = $total + $obj->amount;
 
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				
+				print '<tr class="oddeven">';
 				print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
 
 				print "<td>".$obj->label."</td>\n";
@@ -507,8 +507,8 @@ if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
 
                 $total = $total + $obj->amount;
 
-                $var=!$var;
-                print "<tr ".$bc[$var].">";
+                
+                print '<tr class="oddeven">';
 
                 print '<td align="left">'.dol_print_date($db->jdate($obj->dateep),'day').'</td>'."\n";
 
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 6a3052a938d..28eaa0a7c9b 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -178,9 +178,9 @@ if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
 
-		$var=!$var;
+		
 
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		print '<td>';
 		$thirdpartystatic->id=$obj->rowid;
 		$thirdpartystatic->name=$obj->name;
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 63556eeaee6..0748616f255 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -173,14 +173,14 @@ if ($result)
             $userstatic->id=$obj->uid;
             $userstatic->lastname=$obj->lastname;
             $userstatic->firstname=$obj->firstname;
-            print '<tr '.$bc[$var].'>';
+            print '<tr class="oddeven">';
             print '<td>'.$deplacementstatic->getNomUrl(1).'</td>';
             print '<td>'.$userstatic->getNomUrl(1).'</td>';
             print '<td align="right">'.$obj->km.'</td>';
             print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
             print '<td>'.$deplacementstatic->LibStatut($obj->fk_statut,3).'</td>';
             print '</tr>';
-            $var=!$var;
+            
             $i++;
         }
 
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 66fab1b9279..95f4082e082 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -178,8 +178,8 @@ if ($resql)
         $soc = new Societe($db);
         if ($obj->socid) $soc->fetch($obj->socid);
 
-        $var=!$var;
-        print '<tr '.$bc[$var].'>';
+        
+        print '<tr class="oddeven">';
         // Id
         print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowTrip"),"trip").' '.$obj->rowid.'</a></td>';
         // Type
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index ea886fbd65c..f3d83278885 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -612,9 +612,9 @@ if ($object->id > 0)
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($result_sql);
-			$var=!$var;
+			
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			print '<td align="left">'.dol_print_date($db->jdate($obj->date_demande),'day')."</td>\n";
 			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
 			print '<td align="center">'.price($obj->amount).'</td>';
@@ -663,9 +663,9 @@ if ($object->id > 0)
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($result);
-			$var=!$var;
+			
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 
 			print '<td align="left">'.dol_print_date($db->jdate($obj->date_demande),'day')."</td>\n";
 
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 767082997d8..77191136338 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -300,7 +300,7 @@ foreach ($data as $val)
 	while ($year && $oldyear > $year+1)
 	{	// If we have empty year
 		$oldyear--;
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].' height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 		print '<td align="right">0</td>';
@@ -311,7 +311,7 @@ foreach ($data as $val)
 		print '<td align="right"></td>';
 		print '</tr>';
 	}
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].' height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 2fb2a7089ea..63c16afae15 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -36,7 +36,7 @@ $var=true;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
-    $var=!$var;
+    
     $trclass=($var?'pair':'impair');
     if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
 ?>
diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
index 781f5609915..2e7858fdb08 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
@@ -36,7 +36,7 @@ $var=true;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
-    $var=!$var;
+    
     $trclass=($var?'pair':'impair');
     if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
 ?>
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 736d5696c3e..a73265288a2 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -193,7 +193,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 				print '</tr>';
 				$tot_ttc+=$obj->total_ttc;
 				$i++;
-				$var=!$var;
+				
 			}
 
 			print '<tr class="liste_total"><td align="left">'.$langs->trans("Total").'</td>';
@@ -335,7 +335,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 			{
 				$obj = $db->fetch_object($resql);
 
-				print '<tr '.$bc[$var].'>';
+				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 
 				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
@@ -380,7 +380,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 				$total_ttc +=  $obj->total_ttc;
 				$total += $obj->total;
 				$totalam +=  $obj->am;
-				$var=!$var;
+				
 				$i++;
 			}
 		}
@@ -525,8 +525,8 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
 			while ($i < $num && $i < $max)
 			{
 				$objp = $db->fetch_object($result);
-				$var=!$var;
-				print '<tr '.$bc[$var].'>';
+				
+				print '<tr class="oddeven">';
 				$donationstatic->id=$objp->rowid;
 				$donationstatic->lastname=$objp->lastname;
 				$donationstatic->firstname=$objp->firstname;
@@ -592,7 +592,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 				while ($i < $num)
 				{
 					$obj = $db->fetch_object($resql);
-					print "<tr ".$bc[$var].">";
+					print '<tr class="oddeven">';
 					$chargestatic->id=$obj->rowid;
 					$chargestatic->ref=$obj->libelle;
 					$chargestatic->lib=$obj->libelle;
@@ -677,7 +677,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
 			{
 				$obj = $db->fetch_object($resql);
 
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 
 				$commandestatic->id=$obj->rowid;
@@ -717,7 +717,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
 				//print "x".$tot_ttc."z".$obj->tot_fttc;
 				$tot_tobill += ($obj->total_ttc-$obj->tot_fttc);
 				$i++;
-				$var=!$var;
+				
 			}
 
 			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToBill").': '.price($tot_tobill).')</font> </td>';
@@ -783,7 +783,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 			{
 				$obj = $db->fetch_object($resql);
 
-				print '<tr '.$bc[$var].'>';
+				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 
 				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
@@ -829,7 +829,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 				$total_ttc +=  $obj->total_ttc;
 				$total += $obj->total_ht;
 				$totalam +=  $obj->am;
-				$var=!$var;
+				
 				$i++;
 			}
 
@@ -970,7 +970,7 @@ if ($resql)
 	while ($i < $db->num_rows($resql))
 	{
 		$obj = $db->fetch_object($resql);
-		$var=!$var;
+		
 
 		print "<tr ".$bc[$var]."><td>".dol_print_date($db->jdate($obj->da),"day")."</td>";
 		print '<td><a href="action/card.php">'.$obj->libelle.' '.$obj->label.'</a></td></tr>';
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index 5c21b67a891..40a5805f2b3 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -183,7 +183,7 @@ if($calc ==0 || $calc == 2)
 		{
 			if(($min == 0 or ($min > 0 && $coll->amount > $min)) && ($local==1?$coll->localtax1:$coll->localtax2) !=0)
 			{
-				$var=!$var;
+				
 				$intra = str_replace($find,$replace,$coll->tva_intra);
 				if(empty($intra))
 				{
@@ -196,7 +196,7 @@ if($calc ==0 || $calc == 2)
 						$intra = '';
 					}
 				}
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td class="nowrap">'.$i."</td>";
 				$company_static->id=$coll->socid;
 				$company_static->name=$coll->name;
@@ -258,7 +258,7 @@ if($calc ==0 || $calc == 1){
 		{
 			if(($min == 0 or ($min > 0 && $coll->amount > $min)) && ($local==1?$coll->localtax1:$coll->localtax2) != 0)
 			{
-				$var=!$var;
+				
 				$intra = str_replace($find,$replace,$coll->tva_intra);
 				if(empty($intra))
 				{
@@ -271,7 +271,7 @@ if($calc ==0 || $calc == 1){
 						$intra = '';
 					}
 				}
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td class="nowrap">'.$i."</td>";
 				$company_static->id=$coll->socid;
 				$company_static->name=$coll->name;
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index 642c37b9d65..5d17688fc68 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -81,8 +81,8 @@ function pt ($db, $sql, $date)
         $var=True;
         while ($i < $num) {
             $obj = $db->fetch_object($result);
-            $var=!$var;
-            print '<tr '.$bc[$var].'>';
+            
+            print '<tr class="oddeven">';
             print '<td class="nowrap">'.$obj->dm."</td>\n";
             $total = $total + $obj->mm;
 
@@ -190,8 +190,8 @@ for ($m = 1 ; $m < 13 ; $m++ ) {
         break;
     }
 
-    $var=!$var;
-    print '<tr '.$bc[$var].'>';
+    
+    print '<tr class="oddeven">';
     print '<td class="nowrap">'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'</td>';
     if($CalcLT==0) {
         $x_coll = 0;
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 175ff6cf98f..13c753db464 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -338,8 +338,8 @@ else
 					if (! empty($fields['ddate_start'])) $type=1;
 					if (! empty($fields['ddate_end'])) $type=1;
 
-					$var=!$var;
-					print '<tr '.$bc[$var].'>';
+					
+					print '<tr class="oddeven">';
 
 					// Ref
 					print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
@@ -501,8 +501,8 @@ else
 					if (! empty($fields['ddate_start'])) $type=1;
 					if (! empty($fields['ddate_end'])) $type=1;
 
-					$var=!$var;
-					print '<tr '.$bc[$var].'>';
+					
+					print '<tr class="oddeven">';
 
 					// Ref
 					print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
diff --git a/htdocs/compta/localtax/reglement.php b/htdocs/compta/localtax/reglement.php
index df96d0b7d67..54183ef72b9 100644
--- a/htdocs/compta/localtax/reglement.php
+++ b/htdocs/compta/localtax/reglement.php
@@ -66,8 +66,8 @@ if ($result)
     while ($i < $num)
     {
         $obj = $db->fetch_object($result);
-        $var=!$var;
-        print "<tr ".$bc[$var].">";
+        
+        print '<tr class="oddeven">';
 
 		$localtax_static->id=$obj->rowid;
 		$localtax_static->ref=$obj->rowid;
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 6a3e0e1a433..96f77e85758 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -599,7 +599,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 while ($i < $num)
                 {
                     $objp = $db->fetch_object($resql);
-                    $var=!$var;
+                    
 
 					$soc = new Societe($db);
 					$soc->fetch($objp->socid);
@@ -622,7 +622,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                    $multicurrency_remaintopay=price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits,'MT');
 					}
 					
-                    print '<tr '.$bc[$var].'>';
+                    print '<tr class="oddeven">';
 
                     print '<td>';
                     print $invoice->getNomUrl(1,'');
@@ -859,8 +859,8 @@ if (! GETPOST('action'))
         while ($i < min($num,$limit))
         {
             $objp = $db->fetch_object($resql);
-            $var=!$var;
-            print '<tr '.$bc[$var].'>';
+            
+            print '<tr class="oddeven">';
             print '<td><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$objp->facid.'">'.$objp->facnumber."</a></td>\n";
             print '<td>'.dol_print_date($db->jdate($objp->dp))."</td>\n";
             print '<td>'.$objp->paiement_type.' '.$objp->num_paiement."</td>\n";
diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php
index a244a1feb60..1f00da90a8c 100644
--- a/htdocs/compta/paiement/avalider.php
+++ b/htdocs/compta/paiement/avalider.php
@@ -111,8 +111,8 @@ if ($resql)
     while ($i < min($num,$limit))
     {
         $objp = $db->fetch_object($resql);
-        $var=!$var;
-        print "<tr ".$bc[$var].">";
+        
+        print '<tr class="oddeven">';
         print '<td><a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid.'</a></td>';
         print '<td width="80" align="center">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
         print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 3c651ec7eb3..523d5256816 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -327,8 +327,8 @@ if ($resql)
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			
+			print '<tr class="oddeven">';
 
             $invoice=new Facture($db);
             $invoice->fetch($objp->facid);
@@ -372,7 +372,7 @@ if ($resql)
 			$i++;
 		}
 	}
-	$var=!$var;
+	
 
 	print "</table>\n";
 	print '</div>';
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 58a6cc3e747..625b2be518e 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -494,14 +494,14 @@ if ($action == 'new')
 
 		foreach ($lines[$bid] as $lid => $value)
 		{
-			$var=!$var;
+			
 
 			$account_id = $bid;
 			if (! isset($accounts[$bid]))
 				$accounts[$bid]=0;
 			$accounts[$bid] += 1;
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			print '<td>'.dol_print_date($value["date"],'day').'</td>';
 			print '<td>'.$value["numero"]."</td>\n";
 			print '<td>'.$value["emetteur"]."</td>\n";
@@ -694,7 +694,7 @@ else
 				$accounts[$objp->bid]=0;
 			$accounts[$objp->bid] += 1;
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			print '<td align="center">'.$i.'</td>';
 			print '<td align="center">'.dol_print_date($db->jdate($objp->date),'day').'</td>';	// Date operation
 			print '<td align="center">'.($objp->num_chq?$objp->num_chq:'&nbsp;').'</td>';
@@ -742,7 +742,7 @@ else
 			}
 		    print '</td>';
 			print '</tr>';
-			$var=!$var;
+			
 			$i++;
 		}
 		print "</table>";
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index bba49827104..2d77cb71061 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -77,7 +77,7 @@ if ($resql)
     {
       $num = $row[0];
     }
-  print "<tr ".$bc[$var].">";
+  print '<tr class="oddeven">';
   print '<td>'.$langs->trans("BankChecksToReceipt").'</td>';
   print '<td align="right">';
   print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';
@@ -129,7 +129,7 @@ if ($resql)
 		$accountstatic->id=$objp->bid;
 		$accountstatic->label=$objp->label;
 
-		$var=!$var;
+		
 		print "<tr ".$bc[$var].">\n";
 
 		print '<td>'.$checkdepositstatic->getNomUrl(1).'</td>';
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index ae9bc315877..f1a9a839792 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -186,8 +186,8 @@ if ($resql)
     	while ($i < min($num,$limit))
     	{
     		$objp = $db->fetch_object($resql);
-    		$var=!$var;
-    		print "<tr ".$bc[$var].">";
+    		
+    		print '<tr class="oddeven">';
     
     		// Num ref cheque
     		print '<td>';
@@ -225,7 +225,7 @@ if ($resql)
     }
     else
     {
-   		print "<tr ".$bc[$var].">";
+   		print '<tr class="oddeven">';
    		print '<td colspan="7" class="opacitymedium">'.$langs->trans("None")."</td>";
    		print '</tr>';
     }
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 27f34bef269..e9a90667e69 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -152,7 +152,7 @@ if ($year)
             {
                 if (preg_match('/^payment/i',$file))
                 {
-                    $var=!$var;
+                    
                     $tfile = $dir . '/'.$year.'/'.$file;
                     $relativepath = $year.'/'.$file;
                     print "<tr ".$bc[$var].">".'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 342294dfc12..bd262eaa675 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -266,9 +266,9 @@ if ($action == 'create')
 	{
 		$objp = $charge;
 
-		$var=!$var;
+		
 
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 
 		if ($objp->date_ech > 0)
 		{
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index b64d92d873f..2d653f2ba05 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -239,8 +239,8 @@ if ($resql)
 		{
 			$objp = $db->fetch_object($resql);
 
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			
+			print '<tr class="oddeven">';
 			// Ref
 			print '<td>';
 			$socialcontrib->fetch($objp->scid);
@@ -268,7 +268,7 @@ if ($resql)
 			$i++;
 		}
 	}
-	$var=!$var;
+	
 
 	print "</table>\n";
 	$db->free($resql);
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 8f90183f0f7..dbbf9d09ac7 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -134,7 +134,7 @@ if ($result)
   while ($i < min($num,$limit))
   {
       $obj = $db->fetch_object($result);
-      $var=!$var;
+      
 
       print "<tr ".$bc[$var]."><td>";
 
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index bd16ec0e23b..62e57813886 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -322,7 +322,7 @@ if ($id > 0)
 		{
 			$obj = $db->fetch_object($result);
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 
 			// Status of line
 			print "<td>";
@@ -354,7 +354,7 @@ if ($id > 0)
 			print '</td></tr>';
 
 			$total += $obj->amount;
-			$var=!$var;
+			
 			$i++;
 		}
 
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index b45a49dbe69..5d77a9b9771 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -194,8 +194,8 @@ if ($resql)
         while ($i < $num && $i < 20)
         {
             $obj = $db->fetch_object($resql);
-            $var=!$var;
-            print '<tr '.$bc[$var].'>';
+            
+            print '<tr class="oddeven">';
             print '<td>';
             $invoicestatic->id=$obj->rowid;
             $invoicestatic->ref=$obj->facnumber;
@@ -268,9 +268,9 @@ if ($result)
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($result);
-        $var=!$var;
+        
 
-        print "<tr ".$bc[$var].">";
+        print '<tr class="oddeven">';
 
         print "<td>";
         $bprev->id=$obj->rowid;
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index e104ba75a1a..c1c8bd7e929 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -136,8 +136,8 @@ if ($resql)
 	while ($i < min($num,$limit))
 	{
 		$obj = $db->fetch_object($resql);
-		$var=!$var;
-		print '<tr '.$bc[$var].'>';
+		
+		print '<tr class="oddeven">';
 
 		// Ref facture
 		print '<td>';
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 33a7a4486a0..72d775a49c3 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -197,7 +197,7 @@ if ($result)
      	$thirdpartytmp->id = $obj->socid;
      	$thirdpartytmp->name = $obj->name;
      	
-      	print "<tr ".$bc[$var].">";
+      	print '<tr class="oddeven">';
       	
       	print "<td>";
       	print $invoicetmp->getNomUrl(1);
@@ -233,7 +233,7 @@ if ($result)
       	print "</tr>\n";
 
       	$total += $obj->total_ttc;
-      	$var=!$var;
+      	
       	$i++;
     }
 
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index d013f605504..064f41e41e8 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -164,7 +164,7 @@ if ($resql)
     		print "</tr>\n";
     
     		$total += $obj->amount;
-    		$var=!$var;
+    		
     		$i++;
     	}
 	}
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index a86280e66bd..c5d441e3260 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -146,7 +146,7 @@ if ($prev_id)
 
 			print "</tr>\n";
 
-			$var=!$var;
+			
 			$i++;
 		}
 
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 440af1cdbaf..2997667ab60 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -75,14 +75,14 @@ $var=true;
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>';
 print '<td align="right">';
 print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0">';
 print $bprev->NbFactureAPrelever();
 print '</a>';
 print '</td></tr>';
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>'.$langs->trans("AmountToWithdraw").'</td>';
 print '<td align="right">';
 print price($bprev->SommeAPrelever(),'','',1,-1,-1,'auto');
@@ -129,7 +129,7 @@ if ($resql)
             $invoicestatic->type=$obj->type;
             $alreadypayed=$invoicestatic->getSommePaiement();
 
-            $var=!$var;
+            
             print '<tr '.$bc[$var].'><td>';
             print $invoicestatic->getNomUrl(1,'withdraw');
             print '</td>';
@@ -197,9 +197,9 @@ if ($result)
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($result);
-        $var=!$var;
+        
 
-        print "<tr ".$bc[$var].">";
+        print '<tr class="oddeven">';
 
         print "<td>";
         $bprev->id=$obj->rowid;
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index d5ae2514034..f7fe4b77e7d 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -165,7 +165,7 @@ if ($result)
     {
         $obj = $db->fetch_object($result);
 
-        $var=!$var;
+        
 
         print "<tr ".$bc[$var]."><td>";
 
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 78a11e898df..ef72ca8f6e5 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -112,7 +112,7 @@ if ($result)
 
 		print '<td>'.$rej->motifs[$obj->motif].'</td>';
 		print "</tr>\n";
-		$var=!$var;
+		
 		$i++;
 	}
 
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index ceeef191aee..b666b355e24 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -120,7 +120,7 @@ if ($resql)
 		print round($row[0]/$total*100,2)." %";
 		print '</td></tr>';
 
-		$var=!$var;
+		
 		$i++;
 	}
 
@@ -218,7 +218,7 @@ if ($resql)
 
 		print '</td></tr>';
 
-		$var=!$var;
+		
 		$i++;
 	}
 
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index aec371ac0b3..2a1234fccc1 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -198,8 +198,8 @@ if ($id > 0)
 			
 			// Display array
 			foreach($TData as $data) {
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				
+				print '<tr class="oddeven">';
 	
 				print "<td align=\"center\">".dol_print_date($data['date'],'day')."</td>\n";
 				print '<td>'.$data['link']."</td>\n";
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 6f780de554b..5c77bbba21d 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -235,7 +235,7 @@ if ($result) {
     while ($i < $num)
     {
         $objp = $db->fetch_object($result);
-        $var=!$var;
+        
 
         print "<tr ".$bc[$var]."><td>&nbsp;</td>";
         print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
@@ -280,7 +280,7 @@ if ($modecompta != 'CREANCES-DETTES')
             while ($i < $num)
             {
                 $objp = $db->fetch_object($result);
-                $var=!$var;
+                
 
                 print "<tr ".$bc[$var]."><td>&nbsp;</td>";
                 print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
@@ -304,7 +304,7 @@ if ($modecompta != 'CREANCES-DETTES')
 
 if ($total_ttc == 0)
 {
-    $var=!$var;
+    
     print "<tr ".$bc[$var]."><td>&nbsp;</td>";
     print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
     print '</tr>';
@@ -367,7 +367,7 @@ if ($result) {
         while ($i < $num)
         {
             $objp = $db->fetch_object($result);
-            $var=!$var;
+            
 
             print "<tr ".$bc[$var]."><td>&nbsp;</td>";
             print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
@@ -387,7 +387,7 @@ if ($result) {
     }
     else
     {
-        $var=!$var;
+        
         print "<tr ".$bc[$var]."><td>&nbsp;</td>";
         print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
         print '</tr>';
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 5b2c6b70a13..fe64bb7b999 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -671,8 +671,8 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 {
 	$mois_modulo = $mois;
 	if($mois>12) {$mois_modulo = $mois-12;}
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print "<td>".dol_print_date(dol_mktime(12,0,0,$mois_modulo,1,$annee),"%B")."</td>";
 	for ($annee = $year_start ; $annee <= $year_end ; $annee++)
 	{
@@ -704,7 +704,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 }
 
 // Total
-$var=!$var;
+
 $nbcols=0;
 print '<tr class="liste_total impair"><td>'.$langs->trans("TotalTTC").'</td>';
 for ($annee = $year_start ; $annee <= $year_end ; $annee++)
@@ -721,7 +721,7 @@ print '<td colspan="'.$nbcols.'">&nbsp;</td>';
 print "</tr>\n";
 
 // Balance
-$var=!$var;
+
 print '<tr class="liste_total"><td>'.$langs->trans("AccountingResult").'</td>';
 for ($annee = $year_start ; $annee <= $year_end ; $annee++)
 {
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index a6d99cbdaad..597b8aabad0 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -203,8 +203,8 @@ if ($result)
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($result);
-        $var=!$var;
-        print "<tr ".$bc[$var].">";
+        
+        print '<tr class="oddeven">';
 
         $userstatic->id=$obj->uid;
         $userstatic->lastname=$obj->lastname;
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 76456aee99b..de70ce2a808 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -602,7 +602,7 @@ if ($id > 0)
     		    while ($i < $num)
     		    {
     		        $objp = $db->fetch_object($resql);
-    		        $var=!$var;
+    		        
     		        print "<tr ".$bc[$var]."><td>";
     		        print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
     		        print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
@@ -616,7 +616,7 @@ if ($id > 0)
             }
             else
 		    {
-		        $var=!$var;
+		        
 		        print '<tr '.$bc[$var].'><td colspan="'.$nbcols.'" class="opacitymedium">'.$langs->trans("None").'</td><td></td><td></td><td></td></tr>';
 		    }
                 
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 017bcb7686e..eda1633480a 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -163,7 +163,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		{
 			$obj = $db->fetch_object($resql);
 			$var = !$var;
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			// Ref payment
 			$payment_sc_static->id=$obj->pid;
 			$payment_sc_static->ref=$obj->pid;
@@ -259,8 +259,8 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 
 		        $total = $total + $obj->amount;
 
-		        $var=!$var;
-		        print "<tr ".$bc[$var].">";
+		        
+		        print '<tr class="oddeven">';
 		        print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
 
 		        print "<td>".$obj->label."</td>\n";
@@ -361,8 +361,8 @@ while($j<$numlt)
 
 				$total = $total + $obj->amount;
 
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				
+				print '<tr class="oddeven">';
 				print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
 
 				print "<td>".$obj->label."</td>\n";
@@ -443,8 +443,8 @@ if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
 
                 $total = $total + $obj->amount;
 
-                $var=!$var;
-                print "<tr ".$bc[$var].">";
+                
+                print '<tr class="oddeven">';
 
                 print '<td align="left">'.dol_print_date($db->jdate($obj->dateep),'day').'</td>'."\n";
 
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 236e22ba981..ee6e7f1be27 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -357,8 +357,8 @@ if ($modecompta == 'CREANCES-DETTES')
 
 	if (count($name)) {
 		foreach($name as $key=>$value) {
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 
 			// Product
 			$fullname=$name[$key];
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index d72b06a1bb0..fff94c898c2 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -352,8 +352,8 @@ if (count($amount)) {
     $i = 0;
     
     foreach($arrayforsort as $key => $value) {
-        $var=!$var;
-        print "<tr ".$bc[$var].">";
+        
+        print '<tr class="oddeven">';
 
         // Third party
         $fullname=$name[$key];
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 636c4e29d17..548809f4317 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -517,8 +517,8 @@ if (count($amount)) {
 	}
 
 	foreach($arrayforsort as $key=>$value) {
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 
 		// Third party
 		$fullname=$name[$key];
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 9d942caf57a..2bb9a7d50a0 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -222,8 +222,8 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 {
 	$mois_modulo = $mois;// ajout
 	if($mois>12){$mois_modulo = $mois-12;} // ajout
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 
 	print "<td>".dol_print_date(dol_mktime(12,0,0,$mois_modulo,1,2000),"%B")."</td>";
 	for ($annee = $year_start -1 ; $annee <= $year_end ; $annee++)	// We start one year before to have data to be able to make delta
@@ -312,8 +312,8 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 /*
  for ($mois = 1 ; $mois < 13 ; $mois++)
  {
- $var=!$var;
- print "<tr ".$bc[$var].">";
+ 
+ print '<tr class="oddeven">';
 
  print "<td>".dol_print_date(dol_mktime(12,0,0,$mois,1,2000),"%B")."</td>";
  for ($annee = $year_start ; $annee <= $year_end ; $annee++)
@@ -480,7 +480,7 @@ print '</div>';
  $totalam_Rac +=  $obj->am;
  $i++;
  }
- $var=!$var;
+ 
  print "<tr ".$bc[$var]."><td align=\"right\" colspan=\"5\"><i>Facture a encaisser : </i></td><td align=\"right\"><i>".price($total_ttc_Rac)."</i></td><td colspan=\"5\"><-- bug ici car n'exclut pas le deja r�gl� des factures partiellement r�gl�es</td></tr>";
  }
  $db->free($resql);
@@ -530,7 +530,7 @@ print '</div>';
  $total_pr +=  $obj->total_ttc-$obj->tot_fttc;
  $i++;
  }
- $var=!$var;
+ 
  print "<tr ".$bc[$var]."><td align=\"right\" colspan=\"5\"><i>Signe et non facture:</i></td><td align=\"right\"><i>".price($total_pr)."</i></td><td colspan=\"5\"><-- bug ici, ca devrait exclure le deja facture</td></tr>";
  }
  $db->free($resql);
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 84940bae414..0ede7fa091e 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -260,7 +260,7 @@ if (is_array($coll_list)) {
 	$i = 1;
 	foreach ($coll_list as $coll) {
 		if ($min == 0 or ($min > 0 && $coll->amount > $min)) {
-			$var=!$var;
+			
 			$intra = str_replace($find,$replace,$coll->tva_intra);
 			if(empty($intra)) {
 				if($coll->assuj == '1') {
@@ -270,7 +270,7 @@ if (is_array($coll_list)) {
 					$intra = '';
 				}
 			}
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			print '<td class="nowrap">'.$i."</td>";
 			$company_static->id=$coll->socid;
 			$company_static->name=$coll->name;
@@ -340,7 +340,7 @@ if (is_array($coll_list)) {
 	$i = 1;
 	foreach ($coll_list as $coll) {
 		if ($min == 0 or ($min > 0 && $coll->amount > $min)) {
-			$var=!$var;
+			
 			$intra = str_replace($find,$replace,$coll->tva_intra);
 			if (empty($intra)) {
 				if ($coll->assuj == '1') {
@@ -350,7 +350,7 @@ if (is_array($coll_list)) {
 					$intra = '';
 				}
 			}
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			print '<td class="nowrap">'.$i."</td>";
 			$company_static->id=$coll->socid;
 			$company_static->name=$coll->name;
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index c9a65ac2f03..105bfcb2bf6 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -83,8 +83,8 @@ function pt ($db, $sql, $date)
         while ($i < $num)
         {
             $obj = $db->fetch_object($result);
-            $var=!$var;
-            print '<tr '.$bc[$var].'>';
+            
+            print '<tr class="oddeven">';
             print '<td class="nowrap">'.$obj->dm."</td>\n";
             $total = $total + $obj->mm;
 
@@ -171,8 +171,8 @@ for ($m = 1 ; $m < 13 ; $m++ )
         break;
     }
 
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
+    
+    print '<tr class="oddeven">';
     print '<td class="nowrap"><a href="quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'</a></td>';
 
     $x_coll = 0;
diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php
index 57ce32b72fe..6d33c358af2 100644
--- a/htdocs/compta/tva/quadri.php
+++ b/htdocs/compta/tva/quadri.php
@@ -259,8 +259,8 @@ if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES")
 		$x_paye_sum = 0;
 		$x_paye_ht = 0;
 		foreach($x_both as $rate => $both){
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 			print "<td>$rate%</td>";
 			print "<td class=\"nowrap\" align=\"right\">".price($both['coll']['totalht'])."</td>";
 			print "<td class=\"nowrap\" align=\"right\">".price($both['coll']['vat'])."</td>";
@@ -282,8 +282,8 @@ if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES")
 		$total = $total + $diff;
 		$subtotal = $subtotal + $diff;
 
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 		print '<td colspan="7"></td>';
 		print "<td class=\"nowrap\" align=\"right\">".price($diff)."</td>\n";
 		print "</tr>\n";
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index e0a19d7a0f3..513eb25ff7e 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -396,8 +396,8 @@ else
 				if (! empty($fields['ddate_start'])) $type=1;
 				if (! empty($fields['ddate_end'])) $type=1;
 
-				$var=!$var;
-				print '<tr '.$bc[$var].'>';
+				
+				print '<tr class="oddeven">';
 
 				// Ref
 				print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
@@ -553,8 +553,8 @@ else
 				if (! empty($fields['ddate_start'])) $type=1;
 				if (! empty($fields['ddate_end'])) $type=1;
 
-				$var=!$var;
-				print '<tr '.$bc[$var].'>';
+				
+				print '<tr class="oddeven">';
 
 				// Ref
 				print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
diff --git a/htdocs/compta/tva/quarter_report.php b/htdocs/compta/tva/quarter_report.php
index 626a0fd6c34..a3d902ed3f3 100644
--- a/htdocs/compta/tva/quarter_report.php
+++ b/htdocs/compta/tva/quarter_report.php
@@ -408,8 +408,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 					$type=1;
 				}
 
-				$var=!$var;
-				print '<tr '.$bc[$var].'>';
+				
+				print '<tr class="oddeven">';
 
 				// Ref
 				print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
@@ -576,8 +576,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 					$type=1;
 				}
 
-				$var=!$var;
-				print '<tr '.$bc[$var].'>';
+				
+				print '<tr class="oddeven">';
 
 				// Ref
 				print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index dc3ea846eee..0e5f3fca093 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1507,7 +1507,7 @@ else
 
                 $objp = $db->fetch_object($result);
 
-                //$var=!$var;
+                //
 
                 if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
                 {
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 9ec924254a9..3a779190679 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -82,7 +82,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     	print '<table class="noborder nohover" width="100%">';
     	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    	print '<tr '.$bc[$var].'>';
+    	print '<tr class="oddeven">';
     	print '<td class="nowrap">'.$langs->trans("Contract").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
     	print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
     	print "</table></form>\n";
@@ -188,8 +188,8 @@ foreach($listofstatus as $status)
     $dataseries[]=array('label'=>$staticcontratligne->LibStatut($status,1,($bool?1:0)),'data'=>(isset($nb[$status.$bool])?(int) $nb[$status.$bool]:0));
     if (empty($conf->use_javascript_ajax))
     {
-        $var=!$var;
-        print '<tr '.$bc[$var].'>';
+        
+        print '<tr class="oddeven">';
         print '<td>'.$staticcontratligne->LibStatut($status,0,($bool?1:0)).'</td>';
         print '<td align="right"><a href="services.php?mode='.$status.($bool?'&filter=expired':'').'">'.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'</a></td>';
         print "</tr>\n";
@@ -210,8 +210,8 @@ foreach($listofstatus as $status)
 {
     if (empty($conf->use_javascript_ajax))
     {
-        $var=!$var;
-    	print '<tr '.$bc[$var].'>';
+        
+    	print '<tr class="oddeven">';
     	print '<td>'.$staticcontratligne->LibStatut($status,0,($bool?1:0)).'</td>';
     	print '<td align="right"><a href="services.php?mode='.$status.($bool?'&filter=expired':'').'">'.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'</a></td>';
     	if ($status==4 && ! $bool) $bool=true;
@@ -272,7 +272,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 				print '</tr>';
 				//$tot_ttc+=$obj->total_ttc;
 				$i++;
-				$var=!$var;
+				
 			}
 		}
 		else
@@ -334,9 +334,9 @@ if ($result)
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($result);
-		$var=!$var;
+		
 
-		print '<tr '.$bc[$var].'>';
+		print '<tr class="oddeven">';
 		print '<td width="110" class="nowrap">';
 		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->cid);
 		$staticcontrat->id=$obj->cid;
@@ -401,8 +401,8 @@ if ($resql)
 	while ($i < min($num,$max))
 	{
 		$obj = $db->fetch_object($resql);
-		$var=!$var;
-		print '<tr '.$bc[$var].'>';
+		
+		print '<tr class="oddeven">';
 		print '<td width="110" class="nowrap">';
 		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
 		$staticcontrat->id=$obj->fk_contrat;
@@ -482,8 +482,8 @@ if ($resql)
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
-		$var=!$var;
-		print '<tr '.$bc[$var].'>';
+		
+		print '<tr class="oddeven">';
 
 		print '<td width="110" class="nowrap">';
 		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
@@ -563,8 +563,8 @@ if ($resql)
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
-		$var=!$var;
-		print '<tr '.$bc[$var].'>';
+		
+		print '<tr class="oddeven">';
 
 		print '<td width="110" class="nowrap">';
 		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 1e2820f10e0..d92bcd16679 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -519,9 +519,9 @@ while ($i < min($num,$limit))
 	$contractstatic->id=$obj->cid;
 	$contractstatic->ref=$obj->ref?$obj->ref:$obj->cid;
 	
-	$var=!$var;
+	
 
-	print "<tr ".$bc[$var].">";
+	print '<tr class="oddeven">';
 	
 	// Ref
     if (! empty($arrayfields['c.ref']['checked'])) 
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index 1257e3503a9..a2da6cef24e 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -33,7 +33,7 @@ $var=true;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
-    $var=!$var;
+    
     $trclass=($var?'pair':'impair');
     if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
 ?>
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index b6d38d17b53..e856d52c2b6 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -191,7 +191,7 @@ class box_actions extends ModeleBoxes
 						// on affiche que les évènement du jours ou passé
 						// qui ne sont pas à 100%
 						$actioncejour=true;
-						$var=!$var;
+						
 						// TR
 						$logo=$contents[$line][0]['logo'];
 						$label=$contents[$line][1]['text'];
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 39f39524b41..f5fa32e590d 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -278,7 +278,7 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
                 {
                     if (isset($contents[$i]))
                     {
-                        $var=!$var;
+                        
 
                         // TR
                         if (isset($contents[$i][0]['tr'])) $out.= '<tr valign="top" '.$contents[$i][0]['tr'].'>';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 634f27b1985..97586e31a7e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3422,7 +3422,7 @@ abstract class CommonObject
 			//Line extrafield
 			$line->fetch_optionals($line->id,$extralabelslines);
 
-			$var=!$var;
+			
 
 			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
             if (is_object($hookmanager))   // Old code is commented on preceding line.
@@ -3603,7 +3603,7 @@ abstract class CommonObject
 
         foreach ($this->lines as $line)
         {
-            $var=!$var;
+            
 
             if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
             {
diff --git a/htdocs/core/class/dolprintipp.class.php b/htdocs/core/class/dolprintipp.class.php
index 869b26e2f75..99f3c14f15c 100644
--- a/htdocs/core/class/dolprintipp.class.php
+++ b/htdocs/core/class/dolprintipp.class.php
@@ -116,8 +116,8 @@ class dolprintIPP
         {
 	        foreach ($jobs as $value)
 	        {
-	            $var=!$var;
-	            print "<tr ".$bc[$var].">";
+	            
+	            print '<tr class="oddeven">';
 	            print '<td>'.$value->job_id->_value0.'</td>';
 	            print '<td>'.$value->job_originating_user_name->_value0.'</td>';
 	            print '<td>'.$value->printer_uri->_value0.'</td>';
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 6050679631f..b799e0e2359 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -207,8 +207,8 @@ class FormActions
         		$ref=$action->getNomUrl(1,-1);
         		$label=$action->getNomUrl(0,38);
                 
-        		$var=!$var;
-        		print '<tr '.$bc[$var].'>';
+        		
+        		print '<tr class="oddeven">';
 				print '<td>'.$ref.'</td>';
         		print '<td>'.$label.'</td>';
         		print '<td>'.$action->type.'</td>';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 2af32bf9be6..c982e3d4bb2 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1102,7 +1102,7 @@ class FormFile
 						&& $file['name'] != '..'
 						&& ! preg_match('/\.meta$/i',$file['name']))
 				{
-					$var=!$var;
+					
 					
 					if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
 					
@@ -1446,9 +1446,9 @@ class FormFile
 
                 if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue;    // We do not show orphelins files
 
-                $var=!$var;
+                
                 print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
-                print '<tr '.$bc[$var].'>';
+                print '<tr class="oddeven">';
                 print '<td>';
                 if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
                 else print $langs->trans("ObjectDeleted",($id?$id:$ref));
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 66d438d3ffe..a77740eafb8 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -175,18 +175,20 @@ class Translate
 	{
 		global $conf,$db;
 
-		// Load $this->tab_translate[] from database
-		if (empty($loadfromfileonly) && count($this->tab_translate) == 0) $this->loadFromDatabase($db);      // Nothing was loaded yet, so we load database.
-
+		//dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang);
+		
 		// Check parameters
 		if (empty($domain))
 		{
-			dol_print_error('',get_class($this)."::Load ErrorWrongParameters");
-			return -1;
+		    dol_print_error('',get_class($this)."::Load ErrorWrongParameters");
+		    return -1;
 		}
 		if ($this->defaultlang == 'none_NONE') return 0;    // Special language code to not translate keys
+		
+		
+		// Load $this->tab_translate[] from database
+		if (empty($loadfromfileonly) && count($this->tab_translate) == 0) $this->loadFromDatabase($db);      // Nothing was loaded yet, so we load database.
 
-		//dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang);
 
 		$newdomain = $domain;
 		$modulename = '';
@@ -275,12 +277,15 @@ class Translate
 						 * and split the rest until a line feed.
 						 * This is more efficient than fgets + explode + trim by a factor of ~2.
 						 */
-						while ($line = fscanf($fp, "%[^= ]%*[ =]%[^\n]")) {
-							if (isset($line[1])) {
+						while ($line = fscanf($fp, "%[^= ]%*[ =]%[^\n]")) 
+						{
+							if (isset($line[1])) 
+							{
 								list($key, $value) = $line;
 								//if ($domain == 'orders') print "Domain=$domain, found a string for $tab[0] with value $tab[1]. Currently in cache ".$this->tab_translate[$key]."<br>";
 								//if ($key == 'Order') print "Domain=$domain, found a string for key=$key=$tab[0] with value $tab[1]. Currently in cache ".$this->tab_translate[$key]."<br>";
-								if (empty($this->tab_translate[$key])) { // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)
+								if (empty($this->tab_translate[$key])) 
+								{ // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)
 									$value = preg_replace('/\\n/', "\n", $value); // Parse and render carriage returns
 									if ($key == 'DIRECTION') { // This is to declare direction of language
 										if ($alt < 2 || empty($this->tab_translate[$key])) { // We load direction only for primary files or if not yet loaded
@@ -391,8 +396,6 @@ class Translate
 
 		$domain='database';
 		
-		if ($this->defaultlang == 'none_NONE') return 0;    // Special language code to not translate keys
-		
 		// Check parameters
 		if (empty($db)) return 0;    // Database handler can't be used
 
@@ -450,7 +453,7 @@ class Translate
 				$this->tab_translate+=$tmparray;	// Faster than array_merge($tmparray,$this->tab_translate). Note: If a valuer already exists into tab_translate, value into tmparaay is not added.
 				//print $newdomain."\n";
 				//var_dump($this->tab_translate);
-				if ($alt == 2) $fileread=1;
+				$fileread=1;
 				$found=true;						// Found in dolibarr PHP cache
 			}
 		}
@@ -509,16 +512,9 @@ class Translate
 		    }
 		}
 
-		if ($alt == 2)
-		{
-			if ($fileread) $this->_tab_loaded[$newdomain]=1;	// Set domain file as loaded
+		if ($fileread) $this->_tab_loaded[$newdomain]=1;	// Set domain file as loaded
 
-			if (empty($this->_tab_loaded[$newdomain])) $this->_tab_loaded[$newdomain]=2;           // Marque ce cas comme non trouve (no lines found for language)
-		}
-
-        // Check to be sure that SeparatorDecimal differs from SeparatorThousand
-		if (! empty($this->tab_translate["SeparatorDecimal"]) && ! empty($this->tab_translate["SeparatorThousand"])
-		&& $this->tab_translate["SeparatorDecimal"] == $this->tab_translate["SeparatorThousand"]) $this->tab_translate["SeparatorThousand"]='';
+		if (empty($this->_tab_loaded[$newdomain])) $this->_tab_loaded[$newdomain]=2;           // Marque ce cas comme non trouve (no lines found for language)
 
 		return 1;
 	}
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 63b06dbd737..2a734b5f161 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1212,7 +1212,7 @@ function form_constantes($tableau,$strictw3c=0)
         if ($result)
         {
             $obj = $db->fetch_object($result);	// Take first result of select
-            $var=!$var;
+            
 
             // For avoid warning in strict mode
             if (empty($obj)) {
@@ -1221,7 +1221,7 @@ function form_constantes($tableau,$strictw3c=0)
 
             if (empty($strictw3c)) print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 
-            print "<tr ".$bc[$var].">";
+            print '<tr class="oddeven">';
 
             // Show constant
             print '<td>';
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 408e671dfef..8d1705ca4d4 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -251,9 +251,9 @@ function show_array_actions_to_do($max=5)
         while ($i < $num)
         {
             $obj = $db->fetch_object($resql);
-            $var=!$var;
+            
 
-            print '<tr '.$bc[$var].'>';
+            print '<tr class="oddeven">';
 
             $staticaction->type_code=$obj->code;
             $staticaction->label=($obj->label?$obj->label:$obj->type_label);
@@ -347,9 +347,9 @@ function show_array_last_actions_done($max=5)
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
-			$var=!$var;
+			
 
-			print '<tr '.$bc[$var].'>';
+			print '<tr class="oddeven">';
 
 			$staticaction->type_code=$obj->code;
 			$staticaction->libelle=$obj->label;
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 8ee372d1178..17b904da9db 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -576,7 +576,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
                     if ($user->rights->projet->lire && $userAccess > 0)
                     {
                         $var = !$var;
-                        print "<tr ".$bc[$var].">";
+                        print '<tr class="oddeven">';
 
                         // Ref
                         print '<td><a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$projecttmp->id.'">'.img_object($langs->trans("ShowProject"),($obj->public?'projectpub':'project'))." ".$obj->ref.'</a></td>';
@@ -893,7 +893,7 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='')
 		{
 			$var = !$var;
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 
 			print '<td>';
 			$addressstatic->id = $address->id;
@@ -929,7 +929,7 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='')
 	}
 	else
 	{
-		//print "<tr ".$bc[$var].">";
+		//print '<tr class="oddeven">';
 		//print '<td>'.$langs->trans("NoAddressYetDefined").'</td>';
 		//print "</tr>\n";
 	}
@@ -1245,7 +1245,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
 		
         foreach ($histo as $key=>$value)
         {
-            $var=!$var;
+            
 			$actionstatic->fetch($histo[$key]['id']);    // TODO Do we need this, we already have a lot of data of line into $histo
 
             $out.="<tr ".$bc[$var].">";
@@ -1454,7 +1454,7 @@ function show_subsidiaries($conf,$langs,$db,$object)
 			$obj = $db->fetch_object($result);
 			$var = !$var;
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 
 			print '<td>';
 			$socstatic->id = $obj->rowid;
diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
index 5ba8570ab57..43a53ee7f6f 100644
--- a/htdocs/core/lib/doleditor.lib.php
+++ b/htdocs/core/lib/doleditor.lib.php
@@ -71,7 +71,7 @@ function show_skin($fuser,$edit=0)
    	print '</a>';*/
    	print '</th></tr>';
 
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
    	print '<td>'.$langs->trans("ThemeDir").'</td>';
    	print '<td>';
    	foreach($dirskins as $dirskin)
@@ -81,7 +81,7 @@ function show_skin($fuser,$edit=0)
    	print '</td>';
    	print '</tr>';
 
-    //$var=!$var;
+    //
     print '<tr '.$bc[$var].'><td colspan="'.$colspan.'">';
 
     print '<table class="nobordernopadding" width="100%"><tr><td><div align="center">';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6b17f6eec50..aa39e060563 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -129,7 +129,7 @@ function getEntity($element=false, $shared=0)
 	else
 	{
 		$out='';
-		$addzero = array('user', 'usergroup');
+		$addzero = array('user', 'usergroup', 'email_template', 'default_values');
 		if (in_array($element, $addzero)) $out.= '0,';
 		$out.= $conf->entity;
 		return $out;
diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
index d5a362663b7..d4ef7a2ed7a 100644
--- a/htdocs/core/lib/ldap.lib.php
+++ b/htdocs/core/lib/ldap.lib.php
@@ -147,7 +147,7 @@ function show_ldap_content($result,$level,$count,$var,$hide=0,$subcount=0)
 			$hide=0;
 			if (! is_numeric($key))
 			{
-				$var=!$var;
+				
 				print '<tr '.$bc[$var].' valign="top">';
 				print '<td>';
 				print $key;
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 29cdad35bc3..96bcbaa00c4 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -1149,8 +1149,8 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 			    $projectstatic->datee = $db->jdate($objp->datee);
 			    $projectstatic->dateo = $db->jdate($objp->dateo);
 			     
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				
+				print '<tr class="oddeven">';
 				print '<td>';
 				print $projectstatic->getNomUrl(1);
 				if (! in_array('projectlabel', $hiddenfields)) print '<br>'.dol_trunc($objp->title,24);
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 488a74b76a3..3455979afbe 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -233,9 +233,9 @@ function show_list_sending_receive($origin,$origin_id,$filter='')
 			$var=True;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$objp = $db->fetch_object($resql);
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 
 				// Sending id
 				print '<td align="left" class="nowrap">';
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index c5f14090a92..4350edc3797 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -499,7 +499,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	{
 	    $default='5a6482';
 	    if ($conf->theme == 'md') $default='5a3278';
-	    $var=!$var;
+	    
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index eaf655d7edf..5c5ea2a8ecd 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -163,7 +163,7 @@ class printing_printipp extends PrintingDriver
         $var = true;
         foreach ($list as $value)
         {
-            $var=!$var;
+            
             $printer_det = $this->get_printer_detail($value);
             $html.= "<tr ".$bc[$var].">";
             $html.= '<td>'.$value.'</td>';
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index cc47c9570a6..11ee8a32d7d 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -199,7 +199,7 @@ class pdf_paiement
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($result);
-				$var=!$var;
+				
 
 				$lines[$i][0] = $objp->facnumber;
 				$lines[$i][1] = dol_print_date($this->db->jdate($objp->dp),"day",false,$outputlangs,true);
diff --git a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
index 1d9f2333300..f20e912e1ed 100644
--- a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
@@ -197,7 +197,7 @@ class pdf_paiement_fourn
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($result);
-				$var=!$var;
+				
 
 				$lines[$i][0] = $objp->ref;
 				$lines[$i][1] = dol_print_date($this->db->jdate($objp->dp),"day",false,$outputlangs,true);
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index d20184c70b4..c33d79d062b 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -52,8 +52,8 @@ print "</tr>\n";
 $var=True;
 foreach($extrafields->attribute_type as $key => $value)
 {
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
+    
+    print '<tr class="oddeven">';
     print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
     print "<td>".$extrafields->attribute_label[$key]."</td>\n";
     print "<td>".$key."</td>\n";
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 3077e49bf89..d6defba0fa9 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -72,7 +72,7 @@ if ($permission) {
 	$var=true;
 	if (empty($hideaddcontactforuser))
 	{
-		$var=!$var;
+		
 	?>
 	<form class="tagtr impair" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
 	<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
@@ -98,7 +98,7 @@ if ($permission) {
 
 	if (empty($hideaddcontactforthirdparty))
 	{
-		$var=!$var;
+		
 	?>
 
 	<form class="tagtr pair" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index cad54932c71..f718e431b39 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -34,7 +34,7 @@ if( (array) $linked_resources && count($linked_resources) > 0)
 
 	foreach ($linked_resources as $linked_resource)
 	{
-		$var=!$var;
+		
 		$object_resource = fetchObjectByElement($linked_resource['resource_id'],$linked_resource['resource_type']);
 		
 		//$element_id = $linked_resource['rowid'];
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 4703641de20..630430e8d59 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -349,7 +349,7 @@ if ($num > 0)
 	while ($i < min($num,$limit))
 	{
 		$obj = $db->fetch_object($result);
-		$var=!$var;
+		
 
 		if (! verifCond($obj->test)) continue;        // Discard line with test = false
 	    
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index ecc651c1f16..8d4f697deff 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -360,7 +360,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_DONATION_ACCOUNTINGACCOUNT" />';
 
 $var=! $var;
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 
 print '<td>';
 $label = $langs->trans("AccountAccounting");
@@ -407,7 +407,7 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 	print '<td colspan="3">' . $langs->trans('Parameters') . '</td>';
 	print "</tr>\n";
 
-	$var=!$var;
+	
 	print "<tr " . $bc[$var] . ">";
 	print '<td width="80%">' . $langs->trans("DONATION_ART200") . '</td>';
 	if (! empty($conf->global->DONATION_ART200)) {
@@ -421,7 +421,7 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 	}
 	print '</tr>';
 
-	$var=!$var;
+	
 	print "<tr " . $bc[$var] . ">";
 	print '<td width="80%">' . $langs->trans("DONATION_ART238") . '</td>';
 	if (! empty($conf->global->DONATION_ART238)) {
@@ -435,7 +435,7 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 	}
 	print '</tr>';
 
-	$var=!$var;
+	
 	print "<tr " . $bc[$var] . ">";
 	print '<td width="80%">' . $langs->trans("DONATION_ART885") . '</td>';
 	if (! empty($conf->global->DONATION_ART885)) {
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 0ace5c88e76..f6584628d25 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -703,7 +703,7 @@ if (! empty($id) && $action != 'edit')
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
-			$var=!$var;
+			
 			print "<tr ".$bc[$var]."><td>";
 			print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
 			print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index de4d84529fe..4912b6d8f1a 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -141,8 +141,8 @@ $totalnb=0;
 $var=true;
 foreach ($listofstatus as $status)
 {
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
+    
+    print '<tr class="oddeven">';
     print '<td><a href="list.php?statut='.$status.'">'.$donstatic->LibStatut($status,4).'</a></td>';
     print '<td align="right">'.(! empty($nb[$status])?$nb[$status]:'&nbsp;').'</td>';
     print '<td align="right">'.(! empty($nb[$status])?price($somme[$status],'MT'):'&nbsp;').'</td>';
@@ -191,10 +191,10 @@ if ($resql)
         $var = True;
         while ($i < $num)
         {
-            $var=!$var;
+            
             $obj = $db->fetch_object($resql);
 
-            print "<tr ".$bc[$var].">";
+            print '<tr class="oddeven">';
 
             $donation_static->id=$obj->rowid;
             $donation_static->ref=$obj->ref?$obj->ref:$obj->rowid;
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index d3a9e7eb198..2e7d2a001fd 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -231,8 +231,8 @@ if ($resql)
 		{
 			$objp = $db->fetch_object($resql);
 
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			
+			print '<tr class="oddeven">';
 			// Ref
 			print '<td>';
 			$don->fetch($objp->did);
@@ -253,7 +253,7 @@ if ($resql)
 			$i++;
 		}
 	}
-	$var=!$var;
+	
 
 	print "</table>\n";
 	$db->free($resql);
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index 7eae70c9629..23526fd926d 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -257,9 +257,9 @@ if (GETPOST("action") == 'create')
 	{
 		$objp = $don;
 
-		$var=!$var;
+		
 
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 
 		print '<td align="right">'.price($objp->amount)."</td>";
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 727f4ae669d..619a0089e1e 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -856,7 +856,7 @@ if ($action == 'create')
                 $product = new Product($db);
 
                 $line = $object->lines[$indiceAsked];
-                $var=!$var;
+                
 
                 // Show product and description
                 $type=$line->product_type?$line->product_type:$line->fk_product_type;
@@ -1272,7 +1272,7 @@ if ($action == 'create')
 					$colspan=5;
 					$line = new ExpeditionLigne($db);
 					$line->fetch_optionals($object->id,$extralabelslines);
-					print '<tr '.$bc[$var].'>';
+					print '<tr class="oddeven">';
 					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
 					print '</tr>';
 				}
@@ -1788,7 +1788,7 @@ else if ($id || $ref)
 		// Loop on each product to send/sent
 		for ($i = 0 ; $i < $num_prod ; $i++)
 		{
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 
 			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 			{
@@ -1953,12 +1953,12 @@ else if ($id || $ref)
 				$colspan= empty($conf->productbatch->enabled) ? 5 : 6;
 				$line = new ExpeditionLigne($db);
 				$line->fetch_optionals($lines[$i]->id,$extralabelslines);
-				print '<tr '.$bc[$var].'>';
+				print '<tr class="oddeven">';
 				print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
 				print '</tr>';
 			}
 
-			$var=!$var;
+			
 		}
 		
 		// TODO Show also lines ordered but not delivered
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 17f349348ff..481a6df9d00 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -99,7 +99,7 @@ if ($resql)
 			$shipment->ref=$obj->ref;
 			$shipment->ref_customer=$obj->ref_customer;
 				
-			$var=!$var;
+			
 			print "<tr ".$bc[$var].'><td class="nowrap">';
 			print $shipment->getNomUrl(1);
 			print "</td>";
@@ -156,8 +156,8 @@ if ($resql)
 			$companystatic->name=$obj->name;
 			$companystatic->id=$obj->socid;
 			
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 			print '<td class="nowrap">';
 			print $orderstatic->getNomUrl(1);
 			print '</td>';
@@ -218,7 +218,7 @@ if ( $resql )
             $companystatic->name=$obj->name;
 			$companystatic->id=$obj->socid;
 				
-			$var=!$var;
+			
 			print "<tr ".$bc[$var]."><td>";
 			print $orderstatic->getNomUrl(1);
 			print '</td>';
@@ -274,7 +274,7 @@ if ($resql)
 			$shipment->ref=$obj->ref;
 			$shipment->ref_customer=$obj->ref_customer;
 				
-			$var=!$var;
+			
 			print '<tr '.$bc[$var].'><td>';
 			print $shipment->getNomUrl(1);
 			print '</td>';
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 853c047b23c..b9ecc9e089c 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -475,9 +475,9 @@ if ($resql)
     	$companystatic->ref=$obj->name;
     	$companystatic->name=$obj->name;
 		
-		$var=!$var;
+		
 
-    	print "<tr ".$bc[$var].">";
+    	print '<tr class="oddeven">';
     	 
 		// Ref
 		if (! empty($arrayfields['e.ref']['checked']))
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index f53b80b927d..da103ae98d1 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -654,7 +654,7 @@ if ($id > 0 || ! empty($ref))
 			while ($i < $num)
 			{
 				$objp = $db->fetch_object($resql);
-				$var=!$var;
+				
 
 				// Show product and description
 				$type=isset($objp->type)?$objp->type:$objp->product_type;
@@ -664,7 +664,7 @@ if ($id > 0 || ! empty($ref))
 				if (! empty($objp->date_start)) $type=1;
 				if (! empty($objp->date_end)) $type=1;
 
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 
 				// Product label
 				if ($objp->fk_product > 0)
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index f4e8d45f5a1..cccfc0d90a0 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -277,7 +277,7 @@ foreach ($data as $val)
 	{ // If we have empty year
 		$oldyear--;
 		
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].' height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
 	
@@ -287,7 +287,7 @@ foreach ($data as $val)
 		print '</tr>';
 	}
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].' height="24">';
 	print '<td align="center">';
 	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a>';
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index f66ff148d66..b55654f4786 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -34,7 +34,7 @@ $var=true;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
-    $var=!$var;
+    
     $trclass=($var?'pair':'impair');
     if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
 ?>
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 488c4c547ed..12956ee5764 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1803,7 +1803,7 @@ else
 				    while ($i < $num)
 				    {
 				        $objp = $db->fetch_object($resql);
-				        $var=!$var;
+				        
 				        print "<tr ".$bc[$var]."><td>";
 				        print '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
 				        print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 3f37be8fb8d..1ecf77252f3 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -197,7 +197,7 @@ if ($result)
             $userstatic->login=$obj->login;
             $userstatic->statut=$obj->statut;
             $userstatic->photo=$obj->photo;
-            print '<tr '.$bc[$var].'>';
+            print '<tr class="oddeven">';
             print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
             print '<td>'.$userstatic->getNomUrl(-1).'</td>';
             print '<td align="right">'.price($obj->total_ht).'</td>';
@@ -208,7 +208,7 @@ if ($result)
 			print $expensereportstatic->LibStatut($obj->fk_status,3);
             print '</td>';
             print '</tr>';
-            $var=!$var;
+            
             $i++;
         }
 
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index c04a2fc3b61..7f7b633577e 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -527,7 +527,7 @@ if ($resql)
 			$expensereportstatic->note_private=$obj->note_private;
 			$expensereportstatic->note_public=$obj->note_public;
 				
-			$var=!$var;
+			
 			print '<tr class="oddeven">';
 			// Ref
 			if (! empty($arrayfields['d.ref']['checked'])) {
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index f9ba5af3dc0..4450f1644bf 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -226,8 +226,8 @@ if ($resql)
 		{
 			$objp = $db->fetch_object($resql);
 
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			
+			print '<tr class="oddeven">';
 			// Ref
 			print '<td>';
 			$expensereport->fetch($objp->did);
@@ -248,7 +248,7 @@ if ($resql)
 			$i++;
 		}
 	}
-	$var=!$var;
+	
 
 	print "</table>\n";
 	$db->free($resql);
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 56a5b1c7fb3..82c3fc16e30 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -273,9 +273,9 @@ if (GETPOST("action") == 'create')
 	{
 		$objp = $expensereport;
 
-		$var=!$var;
+		
 
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 
 		print '<td align="right">'.price($objp->total_ttc)."</td>";
 
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index f0448db1771..e158e4728a8 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -262,7 +262,7 @@ foreach ($data as $val)
 	while ($year && $oldyear > $year+1)
 	{	// If we have empty year
 		$oldyear--;
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].' height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
 		print '<td align="right">0</td>';
@@ -271,7 +271,7 @@ foreach ($data as $val)
 		print '</tr>';
 	}
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].' height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
diff --git a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
index b31b90e5a88..7fec53bf3d8 100644
--- a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
@@ -32,7 +32,7 @@ $var=true;
 $total=0;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
-	$var=!$var;
+	
 ?>
 <tr <?php echo $GLOBALS['bc'][$var]; ?> >
 	<td><?php echo $langs->trans("ExpenseReport"); ?></td>
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index dd9dc38efdf..298950abe8e 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -591,7 +591,7 @@ class Export
 
 				while ($objp = $this->db->fetch_object($resql))
 				{
-					$var=!$var;
+					
 
 					// Process special operations
 					if (! empty($this->array_export_special[$indice]))
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 152e095afa6..63792e2c61f 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -585,8 +585,8 @@ if ($step == 2 && $datatoexport)
 
     foreach($fieldsarray as $code=>$label)
     {
-        $var=!$var;
-        print "<tr ".$bc[$var].">";
+        
+        print '<tr class="oddeven">';
 
         $i++;
 
@@ -766,8 +766,8 @@ if ($step == 3 && $datatoexport)
 	// on boucle sur les champs
 	foreach($fieldsarray as $code => $label)
 	{
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 
 		$i++;
 		$entity=(! empty($objexport->array_export_entities[0][$code])?$objexport->array_export_entities[0][$code]:$objexport->array_export_icon[0]);
@@ -951,8 +951,8 @@ if ($step == 4 && $datatoexport)
     $var=true;
     foreach($array_selected as $code=>$value)
     {
-        $var=!$var;
-        print "<tr ".$bc[$var].">";
+        
+        print '<tr class="oddeven">';
 
         $entity=(! empty($objexport->array_export_entities[0][$code])?$objexport->array_export_entities[0][$code]:$objexport->array_export_icon[0]);
         $entityicon=(! empty($entitytoicon[$entity])?$entitytoicon[$entity]:$entity);
@@ -1032,7 +1032,7 @@ if ($step == 4 && $datatoexport)
 		print '<td>&nbsp;</td>';
 		print '</tr>';
 		$var=false;
-		print '<tr '.$bc[$var].'>';
+		print '<tr class="oddeven">';
 		print '<td><input name="export_name" size="32" value=""></td><td align="right">';
         print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
         print '</td></tr>';
@@ -1050,7 +1050,7 @@ if ($step == 4 && $datatoexport)
 			$var=false;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$obj = $db->fetch_object($resql);
 				print '<tr '.$bc[$var].'><td>';
 				print $obj->label;
@@ -1204,8 +1204,8 @@ if ($step == 5 && $datatoexport)
     		unset($liste[$key]);
     	}
 
-        $var=!$var;
-        print '<tr '.$bc[$var].'>';
+        
+        print '<tr class="oddeven">';
         print '<td width="16">'.img_picto_common($key,$objmodelexport->getPictoForKey($key)).'</td>';
 	    $text=$objmodelexport->getDriverDescForKey($key);
 	    $label=$listeall[$key];
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index ca3bcea1458..0fd45794e02 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -67,7 +67,7 @@ if (count($export->array_export_code))
 {
 	foreach ($export->array_export_code as $key => $value)
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].'><td>';
 		//print img_object($export->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
 		print $export->array_export_module[$key]->getName();
@@ -134,8 +134,8 @@ foreach($liste as $key => $val)
     	$liste[$key]=preg_replace('/__\(Disabled\)__/','('.$langs->transnoentitiesnoconv("Disabled").')',$liste[$key]);
     }
 
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).'</td>';
 	$text=$model->getDriverDescForKey($key);
 	$label=$liste[$key];
diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index bd0449dc028..99791a499fb 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -95,15 +95,15 @@ print "</tr>";
 
 $var=true;
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("Label")."</td>";
 print "<td><input type=\"text\" class=\"flat\" name=\"EXTERNALSITE_LABEL\" value=\"". (GETPOST('EXTERNALSITE_LABEL','alpha')?GETPOST('EXTERNALSITE_LABEL','alpha'):((empty($conf->global->EXTERNALSITE_LABEL) || $conf->global->EXTERNALSITE_LABEL=='ExternalSite')?'':$conf->global->EXTERNALSITE_LABEL)) . "\" size=\"12\"></td>";
 print "<td>".$langs->trans("ExampleMyMenuEntry")."</td>";
 print "</tr>";
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("ExternalSiteURL")."</td>";
 print "<td><input type=\"text\" class=\"flat\" name=\"EXTERNALSITE_URL\" value=\"". (GETPOST('EXTERNALSITE_URL','alpha')?GETPOST('EXTERNALSITE_URL','alpha'):(empty($conf->global->EXTERNALSITE_URL)?'':$conf->global->EXTERNALSITE_URL)) . "\" size=\"40\"></td>";
 print "<td>http://localhost/myurl/";
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index e5bfa57d2f7..91e094c1a50 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1369,12 +1369,12 @@ else if ($id > 0 || ! empty($ref))
 			while ($i < $num)
 			{
 				$objp = $db->fetch_object($resql);
-				$var=!$var;
+				
 
 				// Ligne en mode visu
 				if ($action != 'editline' || GETPOST('line_id','int') != $objp->rowid)
 				{
-					print '<tr '.$bc[$var].'>';
+					print '<tr class="oddeven">';
 					print '<td>';
 					print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
 					print dol_htmlentitiesbr($objp->description);
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 59f94df5f7b..86706dd1eff 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -138,8 +138,8 @@ if ($resql)
     {
         if (! $conf->use_javascript_ajax)
         {
-            $var=!$var;
-            print "<tr ".$bc[$var].">";
+            
+            print '<tr class="oddeven">';
             print '<td>'.$fichinterstatic->LibStatut($status,$bool,0).'</td>';
             print '<td align="right"><a href="list.php?viewstatut='.$status.'">'.(isset($vals[$status.$bool])?$vals[$status.$bool]:0).' ';
             print $fichinterstatic->LibStatut($status,$bool,3);
@@ -190,9 +190,9 @@ if (! empty($conf->ficheinter->enabled))
 			$var = true;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$obj = $db->fetch_object($resql);
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 				print "<a href=\"card.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowFichinter"),"intervention").' '.$obj->ref."</a></td>";
 				print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).'</a></td></tr>';
@@ -240,10 +240,10 @@ if ($resql)
 		$var = true;
 		while ($i < $num)
 		{
-			$var=!$var;
+			
 			$obj = $db->fetch_object($resql);
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			print '<td width="20%" class="nowrap">';
 
 			$fichinterstatic->id=$obj->rowid;
@@ -311,9 +311,9 @@ if (! empty($conf->ficheinter->enabled))
 			$var = true;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$obj = $db->fetch_object($resql);
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td class="nowrap" width="20%">';
 
 				$fichinterstatic->id=$obj->rowid;
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index e6e1470b47a..4daa0b7e00d 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -291,7 +291,7 @@ foreach ($data as $val)
 	while (! empty($year) && $oldyear > $year+1)
 	{ // If we have empty year
 		$oldyear--;
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].' height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 
@@ -304,7 +304,7 @@ foreach ($data as $val)
 		print '</tr>';
 	}
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].' height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
index 40ee1a1690b..455f383fd4a 100644
--- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
@@ -33,7 +33,7 @@ $var=true;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
-    $var=!$var;
+    
     $trclass=($var?'pair':'impair');
     if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
 ?>
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 390872bb836..a9ba1ef80aa 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -407,7 +407,7 @@ if ($object->id > 0)
 
 			while ($objp = $db->fetch_object($query)) {
 
-				$var=!$var;
+				
 
 				$productstatic->id = $objp->rowid;
 				$productstatic->ref = $objp->ref;
@@ -415,7 +415,7 @@ if ($object->id > 0)
 				$productstatic->type = $objp->fk_product_type;
 				$productstatic->entity = $objp->entity;
 
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 				print $productstatic->getNomUrl(1);
 				print '</td>';
@@ -483,9 +483,9 @@ if ($object->id > 0)
 	        while ($i < $num && $i <= $MAXLIST)
 	        {
 	            $obj = $db->fetch_object($resql);
-	            $var=!$var;
+	            
 	
-	            print "<tr ".$bc[$var].">";
+	            print '<tr class="oddeven">';
 	            print '<td class="nowrap">';
 	            $proposalstatic->id = $obj->rowid;
 	            $proposalstatic->ref = $obj->ref;
@@ -587,9 +587,9 @@ if ($object->id > 0)
 			while ($i < $num && $i < $MAXLIST)
 			{
 				$obj = $db->fetch_object($resql);
-				$var=!$var;
+				
 
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
                 print '<td class="nowrap">';
                 $orderstatic->id = $obj->rowid;
                 $orderstatic->ref = $obj->ref;
@@ -660,8 +660,8 @@ if ($object->id > 0)
 			while ($i < min($num,$MAXLIST))
 			{
 				$obj = $db->fetch_object($resql);
-				$var=!$var;
-				print '<tr '.$bc[$var].'>';
+				
+				print '<tr class="oddeven">';
 				print '<td>';
 				print '<a href="facture/card.php?facid='.$obj->rowid.'">';
 				$facturestatic->id=$obj->rowid;
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index be27733294f..f7323cc8996 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -119,8 +119,8 @@ if ($resql)
 		$dataseries[]=array('label'=>$commandestatic->LibStatut($statut,1),'data'=>(isset($vals[$statut])?(int) $vals[$statut]:0));
 		if (! $conf->use_javascript_ajax)
 		{
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 			print '<td>'.$commandestatic->LibStatut($statut,0).'</td>';
 			print '<td align="right"><a href="list.php?statut='.$statut.'">'.(isset($vals[$statut])?$vals[$statut]:0).'</a></td>';
 			print "</tr>\n";
@@ -177,9 +177,9 @@ if ($resql)
 	while ($i < $num)
 	{
 		$row = $db->fetch_row($resql);
-		$var=!$var;
+		
 
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans($commandestatic->statuts[$row[1]]).'</td>';
 		print '<td align="right"><a href="list.php?statut='.$row[1].'">'.$row[0].' '.$commandestatic->LibStatut($row[1],3).'</a></td>';
 
@@ -225,9 +225,9 @@ if (! empty($conf->fournisseur->enabled))
 			$var = True;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$obj = $db->fetch_object($resql);
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 				print "<a href=\"card.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."</a></td>";
 				print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).'</a></td></tr>';
@@ -268,9 +268,9 @@ if ($resql)
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
-		$var=!$var;
+		
 
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		print '<td>';
 		$userstatic->id=$obj->rowid;
 		$userstatic->lastname=$obj->lastname;
@@ -324,10 +324,10 @@ if ($resql)
 		$var = True;
 		while ($i < $num)
 		{
-			$var=!$var;
+			
 			$obj = $db->fetch_object($resql);
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			print '<td width="20%" class="nowrap">';
 
 			$commandestatic->id=$obj->rowid;
@@ -393,9 +393,9 @@ $i = 0;
 $var = True;
 while ($i < $num)
 {
-$var=!$var;
+
 $obj = $db->fetch_object($resql);
-print "<tr ".$bc[$var].">";
+print '<tr class="oddeven">';
 print '<td class="nowrap">';
 
 $commandestatic->id=$obj->rowid;
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index a1324d250ab..8af15b92bc2 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1079,7 +1079,7 @@ if ($resql)
 	while ($i < min($num,$limit))
 	{
 		$obj = $db->fetch_object($resql);
-		$var=!$var;
+		
 
         $objectstatic->id=$obj->rowid;
         $objectstatic->ref=$obj->ref;
@@ -1090,7 +1090,7 @@ if ($resql)
         $objectstatic->date_delivery = $db->jdate($obj->date_delivery);
         $objectstatic->statut = $obj->fk_statut;
 
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 
 		// Ref
         if (! empty($arrayfields['cf.ref']['checked']))
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index ff16f267431..232d12fad3d 100644
--- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
@@ -35,7 +35,7 @@ $var=true;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
-    $var=!$var;
+    
     $trclass=($var?'pair':'impair');
     if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
 ?>
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index e6f6b288b14..b1db17f3754 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -111,9 +111,9 @@ if ($result)
     {
         $obj = $db->fetch_object($result);
 
-        $var=!$var;
+        
 
-        print "<tr ".$bc[$var].">";
+        print '<tr class="oddeven">';
 
         print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'">'.img_object($langs->trans("ShowContact"),"contact").' '.$obj->lastname.'</a></td>';
         print '<td>'.$obj->firstname.'</td>';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index afc2dda78ea..5ca38304495 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2380,7 +2380,7 @@ else
     	        while ($i < $num)
     	        {
     	            $objp = $db->fetch_object($result);
-    	            $var=!$var;
+    	            
     	            print '<tr '.$bc[$var].'><td>';
     	            $paymentstatic->id=$objp->rowid;
     	            $paymentstatic->datepaye=$db->jdate($objp->dp);
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index a5ea3b88286..4538351b6ad 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -235,9 +235,9 @@ if ($user->rights->fournisseur->facture->lire)
 				$facturestatic->statut = $objp->fk_statut;
 				$facturestatic->date_echeance = $db->jdate($objp->datelimite);
 
-				$var=!$var;
+				
 
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				$classname = "impayee";
 
 				print '<td class="nowrap">';
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 1eb2dfaeb4a..bbe7c662e92 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -850,7 +850,7 @@ if ($resql)
 		while ($i < min($num,$limit))
 		{
 			$obj = $db->fetch_object($resql);
-			$var=!$var;
+			
 		
 			$datelimit=$db->jdate($obj->datelimite);
 			$facturestatic->id=$obj->facid;
@@ -859,7 +859,7 @@ if ($resql)
 			$facturestatic->date_echeance = $db->jdate($obj->datelimite);
 			$facturestatic->statut = $obj->fk_statut;
 	
-            print '<tr '.$bc[$var].'>';
+            print '<tr class="oddeven">';
     		if (! empty($arrayfields['f.ref']['checked']))
     		{
                 print '<td class="nowrap">';
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 952d1e13dbd..5f1d8cd2d99 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -447,8 +447,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                    while ($i < $num)
 	                    {
 	                        $objp = $db->fetch_object($resql);
-	                        $var=!$var;
-	                        print '<tr '.$bc[$var].'>';
+	                        
+	                        print '<tr class="oddeven">';
 	                        
 	                        // Ref
 	                        print '<td>';
@@ -742,7 +742,7 @@ if (empty($action))
         while ($i < min($num,$limit))
         {
             $objp = $db->fetch_object($resql);
-            $var=!$var;
+            
             print '<tr class="oddeven">';
 
             // Ref payment
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index b0b0436af1b..a7241a1ecf4 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -152,7 +152,7 @@ if ($year)
             {
                 if (preg_match('/^supplier_payment/i',$file))
                 {
-                    $var=!$var;
+                    
                     $tfile = $dir . '/'.$year.'/'.$file;
                     $relativepath = $year.'/'.$file;
                     print "<tr ".$bc[$var].">".'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_fournisseur&amp;file=payments/'.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index e54623e1993..e8154cd8259 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -36,7 +36,7 @@ $var=true;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
-    $var=!$var;
+    
     $trclass=($var?'pair':'impair');
     if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
 ?>
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index bc16806cdc2..47f95104398 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -81,9 +81,9 @@ if ($resql)
 	while ($i < $num)
 	{
 		$row = $db->fetch_row($resql);
-		$var=!$var;
+		
 
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans($commande->statuts[$row[1]]).'</td>';
 		print '<td align="center">'.$row[0].'</td>';
 		print '<td align="center"><a href="'.DOL_URL_ROOT.'/fourn/commande/list.php?statut='.$row[1].'">'.$commande->LibStatut($row[1],3).'</a></td>';
@@ -132,7 +132,7 @@ if (! empty($conf->fournisseur->enabled))
 			$var = true;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$obj = $db->fetch_object($resql);
 				print '<tr '.$bc[$var].'><td  class="nowrap">';
 				$commandestatic->id=$obj->rowid;
@@ -151,7 +151,7 @@ if (! empty($conf->fournisseur->enabled))
 			}
 			if ($total>0)
 			{
-				$var=!$var;
+				
 				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
 			}
 			print "</table>";
@@ -190,7 +190,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 			while ($i < $num && $i < 20)
 			{
 				$obj = $db->fetch_object($resql);
-				$var=!$var;
+				
 				print '<tr '.$bc[$var].'><td class="nowrap">';
 				$facturestatic->ref=$obj->ref;
 				$facturestatic->id=$obj->rowid;
@@ -263,9 +263,9 @@ if ($resql)
 
 	while ($obj = $db->fetch_object($resql) )
 	{
-		$var=!$var;
+		
 
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		print '<td><a href="card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowSupplier"),"company").'</a>';
 		print "&nbsp;<a href=\"card.php?socid=".$obj->socid."\">".$obj->name."</a></td>\n";
 		print '<td align="left">'.$obj->code_fournisseur.'&nbsp;</td>';
@@ -300,7 +300,7 @@ if (count($companystatic->SupplierCategories))
 
 	foreach ($companystatic->SupplierCategories as $rowid => $label)
 	{
-		$var=!$var;
+		
 		print "<tr ".$bc[$var].">\n";
 		print '<td>';
 		$categstatic->id=$rowid;
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index c8e882e5003..339fc1cb6fd 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -316,8 +316,8 @@ if ($result > 0)
 			while ($i < $num)
 			{
 				$objp = $db->fetch_object($resql);
-				$var=!$var;
-				print '<tr '.$bc[$var].'>';
+				
+				print '<tr class="oddeven">';
 				// Ref
 				print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objp->facid.'">'.img_object($langs->trans('ShowBill'),'bill').' ';
 				print ($objp->ref?$objp->ref:$objp->rowid);
@@ -342,7 +342,7 @@ if ($result > 0)
 				$i++;
 			}
 		}
-		$var=!$var;
+		
 
 		print "</table>\n";
 		$db->free($resql);
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 0e17a48b356..94302eca4be 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -208,8 +208,8 @@ if ($resql)
 	while ($i < min($num,$limit))
 	{
 		$objp = $db->fetch_object($resql);
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 
 		print '<td>';
 		$productstatic->id=$objp->rowid;
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index 1137f0de14b..470e6c64cc4 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -114,8 +114,8 @@ if ($socid > 0)
                 }
                 $totalpaye = $fac->getSommePaiement();
 
-                $var=!$var;
-                print "<tr ".$bc[$var].">";
+                
+                print '<tr class="oddeven">';
 
                 print "<td align=\"center\">".dol_print_date($fac->date)."</td>\n";
                 print "<td><a href=\"facture/card.php?facid=$fac->id\">".img_object($langs->trans("ShowBill"),"bill")." ".$fac->ref."</a></td>\n";
@@ -150,8 +150,8 @@ if ($socid > 0)
                     while ($j < $nump)
                     {
                         $objp = $db->fetch_object($resqlp);
-                        //$var=!$var;
-                        print "<tr ".$bc[$var].">";
+                        //
+                        print '<tr class="oddeven">';
                         print '<td align="center">'.dol_print_date($db->jdate($objp->dp))."</td>\n";
                         print '<td>';
                         print '&nbsp; &nbsp; &nbsp; '; // Decalage
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 01ada4f3185..158d9fed3da 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -247,38 +247,38 @@ else
 			print '<td></td>';
 			print "</tr>";
 
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 			print "<td>".$langs->trans("Name")."</td>";
 			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_NAME_" . $idrss . "\" value=\"" . @constant("FTP_NAME_" . $idrss) . "\" size=\"64\"></td>";
 			print "</tr>";
 
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 			print "<td>".$langs->trans("Server")."</td>";
 			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_SERVER_" . $idrss . "\" value=\"" . @constant("FTP_SERVER_" . $idrss) . "\" size=\"64\"></td>";
 			print "</tr>";
 
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("Port")."</td>";
 			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_PORT_" . $idrss . "\" value=\"" . @constant("FTP_PORT_" . $idrss) . "\" size=\"64\"></td>";
 			print "</tr>";
 
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("User")."</td>";
 			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_USER_" . $idrss . "\" value=\"" . @constant("FTP_USER_" . $idrss) . "\" size=\"24\"></td>";
 			print "</tr>";
 
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("Password")."</td>";
 			print "<td><input type=\"password\" class=\"flat\" name=\"FTP_PASSWORD_" . $idrss . "\" value=\"" . @constant("FTP_PASSWORD_" . $idrss) . "\" size=\"24\"></td>";
 			print "</tr>";
 
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("FTPPassiveMode")."</td>";
 			print '<td>'.$form->selectyesno('FTP_PASSIVE_'.$idrss, @constant("FTP_PASSIVE_" . $idrss), 1).'</td>';
 			print "</tr>";
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 4658e9d09ec..c8ba7c6b786 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -554,7 +554,7 @@ else
 					$is_directory=ftp_isdir($conn_id, $newremotefileiso);
 				}
 
-				$var=!$var;
+				
 				print '<tr '.$bc[$var].' height="18">';
 				// Name
 				print '<td>';
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 414bcf709f4..804ad55e10a 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -212,7 +212,7 @@ else
     
     foreach($listUsers as $users)
     {
-        $var=!$var;
+        
 
         // If user has not permission to edit/read all, we must see only subordinates
         if (empty($user->rights->holiday->read_all))  
@@ -220,7 +220,7 @@ else
             if (($users['rowid'] != $user->id) && (! in_array($users['rowid'], $userchilds))) continue;     // This user is not into hierarchy of current user, we hide it.
         }
         
-        print '<tr '.$bc[$var].'>';
+        print '<tr class="oddeven">';
         
         // User
         print '<td>';
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 51d3e2d0be3..7fcf6a48a97 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -104,7 +104,7 @@ $var=true;
 
 foreach($cp->logs as $logs_CP)
 {
-   	$var=!$var;
+   	
 
    	$user_action = new User($db);
    	$user_action->fetch($logs_CP['fk_user_action']);
@@ -112,7 +112,7 @@ foreach($cp->logs as $logs_CP)
    	$user_update = new User($db);
    	$user_update->fetch($logs_CP['fk_user_update']);
 
-   	print '<tr '.$bc[$var].'>';
+   	print '<tr class="oddeven">';
    	print '<td>'.$logs_CP['rowid'].'</td>';
    	print '<td style="text-align: center;">'.$logs_CP['date_action'].'</td>';
    	print '<td>'.$user_action->getNomUrl(-1).'</td>';
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 25c2fbf24c7..5d1d0f89488 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -112,8 +112,8 @@ if ($result)
 			$establishmentstatic->name=$obj->name;
 			$establishmentstatic->status=$obj->status;
 			
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			
+			print '<tr class="oddeven">';
 			print '<td>'.$establishmentstatic->getNomUrl(1).'</td>';
             print '<td align="left">'.$obj->address.'</td>';
 			print '<td align="left">'.$obj->zip.'</td>';
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 63700629fd8..5364f510026 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -198,7 +198,7 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
                 $userstatic->login=$obj->login;
                 $userstatic->photo=$obj->photo;
                 $userstatic->statut=$obj->statut;
-                print '<tr '.$bc[$var].'>';
+                print '<tr class="oddeven">';
                 print '<td>'.$holidaystatic->getNomUrl(1).'</td>';
                 print '<td>'.$userstatic->getNomUrl(-1, 'leave').'</td>';
                 print '<td>'.$typeleaves[$obj->fk_type]['label'].'</td>';
@@ -211,7 +211,7 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
                 print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
                 print '<td>'.$holidaystatic->LibStatut($obj->status,3).'</td>';
                 print '</tr>';
-                $var=!$var;
+                
                 $i++;
             }
 
@@ -272,14 +272,14 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
 				$userstatic->login=$obj->login;
 				$userstatic->statut=$obj->statut;
 				$userstatic->photo=$obj->photo;
-				print '<tr '.$bc[$var].'>';
+				print '<tr class="oddeven">';
 				print '<td>'.$deplacementstatic->getNomUrl(1).'</td>';
 				print '<td>'.$userstatic->getNomUrl(-1).'</td>';
 				print '<td align="right">'.$obj->km.'</td>';
 				print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
 				print '<td>'.$deplacementstatic->LibStatut($obj->fk_statut,3).'</td>';
 				print '</tr>';
-				$var=!$var;
+				
 				$i++;
 			}
 
@@ -339,14 +339,14 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
 				$userstatic->login=$obj->login;
 				$userstatic->statut=$obj->statut;
 				$userstatic->photo=$obj->photo;
-				print '<tr '.$bc[$var].'>';
+				print '<tr class="oddeven">';
 				print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
 				print '<td>'.$userstatic->getNomUrl(-1).'</td>';
 				print '<td align="right">'.price($obj->total_ttc).'</td>';
 				print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
 				print '<td>'.$expensereportstatic->LibStatut($obj->status,3).'</td>';
 				print '</tr>';
-				$var=!$var;
+				
 				$i++;
 			}
 
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 29bcc04d54b..8cbc3d742a3 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -446,8 +446,8 @@ if ($step == 2 && $datatoimport)
 	$liste=$objmodelimport->liste_modeles($db);
 	foreach($liste as $key)
 	{
-		$var=!$var;
-		print '<tr '.$bc[$var].'>';
+		
+		print '<tr class="oddeven">';
 		print '<td width="16">'.img_picto_common($key,$objmodelimport->getPictoForKey($key)).'</td>';
     	$text=$objmodelimport->getDriverDescForKey($key);
     	print '<td>'.$form->textwithpicto($objmodelimport->getDriverLabelForKey($key),$text).'</td>';
@@ -601,8 +601,8 @@ if ($step == 3 && $datatoimport)
 			$modulepart='import';
 			$urlsource=$_SERVER["PHP_SELF"].'?step='.$step.$param.'&filetoimport='.urlencode($filetoimport);
 			$relativepath=$file;
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			
+			print '<tr class="oddeven">';
 			print '<td width="16">'.img_mime($file).'</td>';
 			print '<td>';
     		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=3'.$param.'" target="_blank">';
@@ -854,7 +854,7 @@ if ($step == 4 && $datatoimport)
 	$lefti=1;
 	foreach ($array_match_file_to_database as $key => $val)
 	{
-		$var=!$var;
+		
 		show_elem($fieldssource,$key,$val,$var);		// key is field number in source file
 		//print '> '.$lefti.'-'.$key.'-'.$val;
 		$listofkeys[$key]=1;
@@ -871,7 +871,7 @@ if ($step == 4 && $datatoimport)
 	$num=count($fieldssource);
 	while ($lefti <= $num)
 	{
-		$var=!$var;
+		
 		$newkey=getnewkey($fieldssource,$listofkeys);
 		show_elem($fieldssource,$newkey,'',$var);	// key start after field number in source file
 		//print '> '.$lefti.'-'.$newkey;
@@ -894,7 +894,7 @@ if ($step == 4 && $datatoimport)
 	print '<table width="100%" class="nobordernopadding">';
 	foreach($fieldstarget as $code=>$label)
 	{
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].' height="'.$height.'">';
 
 		$i++;
@@ -995,7 +995,7 @@ if ($step == 4 && $datatoimport)
 	{
 		if (empty($fieldsplaced[$key]))
 		{
-			//$var=!$var;
+			//
 			$nbofnotimportedfields++;
 			show_elem($fieldssource,$key,'',$var,'nostyle');
 			//print '> '.$lefti.'-'.$key;
@@ -1111,7 +1111,7 @@ if ($step == 4 && $datatoimport)
 		print '<td>&nbsp;</td>';
 		print '</tr>';
 		$var=false;
-		print '<tr '.$bc[$var].'>';
+		print '<tr class="oddeven">';
 		print '<td><input name="import_name" size="48" value=""></td><td align="right">';
 		print '<input type="submit" class="button" value="'.$langs->trans("SaveImportProfile").'">';
 		print '</td></tr>';
@@ -1129,7 +1129,7 @@ if ($step == 4 && $datatoimport)
 			$var=false;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$obj = $db->fetch_object($resql);
 				print '<tr '.$bc[$var].'><td>';
 				print $obj->label;
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index 98da9584308..32f08d5bda5 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -119,8 +119,8 @@ $liste=$model->liste_modeles($db);
 
 foreach($liste as $key)
 {
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).'</td>';
 	$text=$model->getDriverDescForKey($key);
 	print '<td>'.$form->textwithpicto($model->getDriverLabelForKey($key),$text).'</td>';
diff --git a/htdocs/index.php b/htdocs/index.php
index e0609c91274..460082399ba 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -332,7 +332,7 @@ if (empty($user->societe_id))
 	                $board=$boardloaded[$classe];
 	            }
 
-	            $var=!$var;
+	            
 	            if (!empty($langfile[$key])) $langs->load($langfile[$key]);
 	            $text=$langs->trans($titres[$key]);
 	            $boxstat.='<a href="'.$links[$key].'" class="boxstatsindicator thumbstat nobold nounderline">';
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 82ba61f8281..91a0c36aaeb 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -162,7 +162,7 @@ create table llx_default_values
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   entity          integer DEFAULT 1 NOT NULL,		-- multi company id
-  type			  varchar(10),                      -- 'createform', 'filter', 'sortorder'
+  type			  varchar(10),                      -- 'createform', 'filters', 'sortorder'
   user_id         integer DEFAULT 0 NOT NULL,       -- 0 or user id
   page            varchar(255),                     -- relative url of page
   param           varchar(255),                     -- parameter
diff --git a/htdocs/install/mysql/tables/llx_default_values.sql b/htdocs/install/mysql/tables/llx_default_values.sql
index e693609702c..ca9849c681d 100644
--- a/htdocs/install/mysql/tables/llx_default_values.sql
+++ b/htdocs/install/mysql/tables/llx_default_values.sql
@@ -20,7 +20,7 @@ create table llx_default_values
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   entity          integer DEFAULT 1 NOT NULL,		-- multi company id
-  type			  varchar(10),                      -- 'createform', 'filter', 'sortorder'
+  type			  varchar(10),                      -- 'createform', 'filters', 'sortorder'
   user_id         integer DEFAULT 0 NOT NULL,       -- 0 or user id
   page            varchar(255),                     -- relative url of page
   param           varchar(255),                     -- parameter
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index c9391256f66..f535bf27ebd 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -1291,7 +1291,7 @@ function migrate_paiementfourn_facturefourn($db,$langs,$conf)
                             print '<tr><td>fk_paiementfourn</td><td>fk_facturefourn</td><td>'.$langs->trans('Amount').'</td><td>&nbsp;</td></tr>';
                         }
 
-                        print '<tr '.$bc[$var].'>';
+                        print '<tr class="oddeven">';
                         print '<td>'.$select_obj->rowid.'</td><td>'.$select_obj->fk_facture_fourn.'</td><td>'.$select_obj->amount.'</td>';
 
                         $insert_sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn_facturefourn SET ';
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index b6097886529..4bfcc4611e6 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -594,9 +594,9 @@ else
 			$var=true;
 			while ($i < $num_prod)
 			{
-				$var=!$var;
+				
 
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				if ($object->lines[$i]->fk_product > 0)
 				{
 					$product = new Product($db);
@@ -665,7 +665,7 @@ else
 					$mode = ($object->statut == 0) ? 'edit' : 'view';
 					$line = new LivraisonLigne($db);
 					$line->fetch_optionals($object->lines[$i]->id,$extralabelslines);
-					print '<tr '.$bc[$var].'>';
+					print '<tr class="oddeven">';
 					print $line->showOptionals($extrafieldsline, $mode, array('style'=>$bc[$var], 'colspan'=>$colspan),$i);
 					print '</tr>';
 				}
diff --git a/htdocs/loan/calc.php b/htdocs/loan/calc.php
index 76b4c989aa7..434d57b43c2 100644
--- a/htdocs/loan/calc.php
+++ b/htdocs/loan/calc.php
@@ -345,7 +345,7 @@ if ($form_complete && $show_progress) {
 		$this_year_principal_paid = $this_year_principal_paid + $principal_paid;
 
 		$var = !$var;
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		print '<td align="right">' . $current_month . '</td>';
 		print '<td align="right">' . number_format($interest_paid, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '</td>';
 		print '<td align="right">' . number_format($principal_paid, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '</td>';
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index e063734cc51..cc407b9f054 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -652,8 +652,8 @@ if ($id > 0)
 			while ($i < $num)
 			{
 				$objp = $db->fetch_object($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				
+				print '<tr class="oddeven">';
 				print '<td><a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
 				print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
 				print "<td>".$objp->paiement_type.' '.$objp->num_payment."</td>\n";
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 4a5faf4665f..5a9558222dc 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -226,8 +226,8 @@ if ($resql)
 		{
 			$objp = $db->fetch_object($resql);
 
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
+			
+			print '<tr class="oddeven">';
 			// Ref
 			print '<td>';
 			$loan->fetch($objp->id);
@@ -250,7 +250,7 @@ if ($resql)
 			$i++;
 		}
 	}
-	$var=!$var;
+	
 
 	print "</table>\n";
 	$db->free($resql);
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 408fe3c646f..8c7a0af6cef 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -248,7 +248,7 @@ if ($action == 'create')
 	$var=True;
 
 
-	print "<tr ".$bc[$var].">";
+	print '<tr class="oddeven">';
 
 	if ($loan->datestart > 0)
 	{
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index 3a61ee0e72e..8f39f695952 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -133,11 +133,11 @@ $var=true;
 $form = new Form($db);
 
 // GLOBAL DISCOUNT MANAGEMENT
-$var=!$var;
+
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"typemarges\">";
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MARGIN_TYPE").'</td>';
 print '<td>';
 print ' <input type="radio" name="MARGIN_TYPE" value="1" ';
@@ -165,8 +165,8 @@ print '</tr>';
 print '</form>';
 
 // DISPLAY MARGIN RATES
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DisplayMarginRates").'</td>';
 print '<td colspan="2" align="center">';
 if (! empty($conf->use_javascript_ajax))
@@ -189,8 +189,8 @@ print '<td>'.$langs->trans('MarginRate').' = '.$langs->trans('Margin').' / '.$la
 print '</tr>';
 
 // DISPLAY MARK RATES
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DisplayMarkRates").'</td>';
 print '<td colspan="2" align="center">';
 if (! empty($conf->use_javascript_ajax))
@@ -212,8 +212,8 @@ print '</td>';
 print '<td>'.$langs->trans('MarkRate').' = '.$langs->trans('Margin').' / '.$langs->trans('SellingPrice').'</td>';
 print '</tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ForceBuyingPriceIfNull").'</td>';
 print '<td colspan="2" align="center">';
 if (! empty($conf->use_javascript_ajax))
@@ -242,11 +242,11 @@ $methods = array(
 	3 => $langs->trans('UseDiscountOnTotal')
 );
 
-$var=!$var;
+
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"remises\">";
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MARGIN_METHODE_FOR_DISCOUNT").'</td>';
 print '<td align="left">';
 print Form::selectarray('MARGIN_METHODE_FOR_DISCOUNT', $methods, $conf->global->MARGIN_METHODE_FOR_DISCOUNT);
@@ -259,11 +259,11 @@ print '</tr>';
 print '</form>';
 
 // INTERNAL CONTACT TYPE USED AS COMMERCIAL AGENT
-$var=!$var;
+
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"contact\">";
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("AgentContactType").'</td>';
 print '<td align="left">';
 $formcompany = new FormCompany($db);
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index c7a0af0b605..846daad7806 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -220,9 +220,9 @@ if ($result)
 				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
 			}
 
-			$var=!$var;
+			
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			if ($agentid > 0) {
 				$companystatic->id=$objp->socid;
 				$companystatic->name=$objp->name;
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index abfb89171dd..bcb3cc65699 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -260,9 +260,9 @@ if ($result)
 				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
 			}
 
-			$var=!$var;
+			
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			if ($client) {
 		        print '<td>';
 				$invoicestatic->id=$objp->facid;
@@ -295,7 +295,7 @@ if ($result)
 	}
 
 	// affichage totaux marges
-	$var=!$var;
+	
 	$totalMargin = $cumul_vente - $cumul_achat;
 	/*if ($totalMargin < 0)
 	{
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index ff06d6ce69e..efcb35b802f 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -259,9 +259,9 @@ if ($result)
 				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
 			}
 
-			$var=!$var;
+			
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			if ($id > 0) {
 				print '<td>';
 				$invoicestatic->id=$objp->facid;
@@ -307,7 +307,7 @@ if ($result)
 	}
 
 	// affichage totaux marges
-	$var=!$var;
+	
 	$totalMargin = $cumul_vente - $cumul_achat;
 
 	$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index bac8bebe52a..b1023839eca 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -196,12 +196,12 @@ if ($id > 0 || ! empty($ref))
                     $var=True;
                     while ($i < $num /*&& $i < $conf->liste_limit*/) {
                         $objp = $db->fetch_object($result);
-                        $var=!$var;
+                        
 
 						$marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
 						$markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
 
-                        print '<tr '.$bc[$var].'>';
+                        print '<tr class="oddeven">';
                         print '<td>';
                         $invoicestatic->id=$objp->facid;
                         $invoicestatic->ref=$objp->facnumber;
@@ -229,7 +229,7 @@ if ($id > 0 || ! empty($ref))
                 }
 
                 // affichage totaux marges
-                $var=!$var;
+                
                 $totalMargin = $cumul_vente - $cumul_achat;
                 if ($totalMargin < 0)
                 {
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 99df684342d..45ce972bbc3 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -206,9 +206,9 @@ if ($socid > 0)
     			$marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
     			$markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
 
-    			$var=!$var;
+    			
 
-    			print "<tr ".$bc[$var].">";
+    			print '<tr class="oddeven">';
     			print '<td>';
     			$invoicestatic->id=$objp->facid;
     			$invoicestatic->ref=$objp->facnumber;
@@ -232,7 +232,7 @@ if ($socid > 0)
     	}
 
     	// affichage totaux marges
-    	$var=!$var;
+    	
     	$totalMargin = $cumul_vente - $cumul_achat;
     	if ($totalMargin < 0)
     	{
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 8abcac5a6f1..6446e6c20c5 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -110,21 +110,21 @@ print '<td>'.$langs->trans("AccountParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYBOX_PBX_SITE").'</span></td><td>';
 print '<input size="32" type="text" name="PAYBOX_IBS_SITE" value="'.$conf->global->PAYBOX_IBS_SITE.'">';
 print '<br>'.$langs->trans("Example").': 1999888 ('.$langs->trans("Test").')';
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYBOX_PBX_RANG").'</span></td><td>';
 print '<input size="32" type="text" name="PAYBOX_IBS_RANG" value="'.$conf->global->PAYBOX_IBS_RANG.'">';
 print '<br>'.$langs->trans("Example").': 99 ('.$langs->trans("Test").')';
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYBOX_PBX_IDENTIFIANT").'</span></td><td>';
 print '<input size="32" type="text" name="PAYBOX_PBX_IDENTIFIANT" value="'.$conf->global->PAYBOX_PBX_IDENTIFIANT.'">';
@@ -138,7 +138,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 /*
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("PAYBOX_IBS_DEVISE").'</td><td>';
 print '<input size="32" type="text" name="PAYBOX_IBS_DEVISE" value="'.$conf->global->PAYBOX_IBS_DEVISE.'">';
@@ -147,7 +147,7 @@ print '</td></tr>';
 */
 
 /*
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("PAYBOX_CGI_URL_V1").'</td><td>';
 print '<input size="64" type="text" name="PAYBOX_CGI_URL_V1" value="'.$conf->global->PAYBOX_CGI_URL_V1.'">';
@@ -155,42 +155,42 @@ print '<br>'.$langs->trans("Example").': http://mysite/cgi-bin/module_linux.cgi'
 print '</td></tr>';
 */
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYBOX_CGI_URL_V2").'</span></td><td>';
 print '<input size="64" type="text" name="PAYBOX_CGI_URL_V2" value="'.$conf->global->PAYBOX_CGI_URL_V2.'">';
 print '<br>'.$langs->trans("Example").': http://mysite/cgi-bin/modulev2_redhat72.cgi';
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("VendorName").'</td><td>';
 print '<input size="64" type="text" name="PAYBOX_CREDITOR" value="'.$conf->global->PAYBOX_CREDITOR.'">';
 print '<br>'.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="PAYBOX_CSS_URL" value="'.$conf->global->PAYBOX_CSS_URL.'">';
 print '<br>'.$langs->trans("Example").': http://mysite/mycss.css';
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("MessageOK").'</td><td>';
 $doleditor=new DolEditor('PAYBOX_MESSAGE_OK',$conf->global->PAYBOX_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
 $doleditor->Create();
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("MessageKO").'</td><td>';
 $doleditor=new DolEditor('PAYBOX_MESSAGE_KO',$conf->global->PAYBOX_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
 $doleditor->Create();
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("PAYBOX_PAYONLINE_SENDEMAIL").'</td><td>';
 print '<input size="32" type="email" name="PAYBOX_PAYONLINE_SENDEMAIL" value="'.$conf->global->PAYBOX_PAYONLINE_SENDEMAIL.'">';
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index e63fb3e85c7..87ca506e653 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -128,33 +128,33 @@ print '<td>'.$langs->trans("AccountParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_SANDBOX").'</td><td>';
 print $form->selectyesno("PAYPAL_API_SANDBOX",$conf->global->PAYPAL_API_SANDBOX,1);
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_USER").'</td><td>';
 print '<input size="32" type="text" name="PAYPAL_API_USER" value="'.$conf->global->PAYPAL_API_USER.'">';
 print ' &nbsp; '.$langs->trans("Example").': paypal_api1.mywebsite.com';
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_PASSWORD").'</td><td>';
 print '<input size="32" type="text" name="PAYPAL_API_PASSWORD" value="'.$conf->global->PAYPAL_API_PASSWORD.'">';
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_SIGNATURE").'</td><td>';
 print '<input size="64" type="text" name="PAYPAL_API_SIGNATURE" value="'.$conf->global->PAYPAL_API_SIGNATURE.'">';
 print '<br>'.$langs->trans("Example").': ASsqXEmw4KzmX-CPChWSVDNCNfd.A3YNR7uz-VncXXAERFDFDFDF';
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td class="fieldrequired">';
 print $langs->trans("PAYPAL_SSLVERSION").'</td><td>';
 print $form->selectarray("PAYPAL_SSLVERSION",array('1'=> $langs->trans('TLSv1'),'6'=> $langs->trans('TLSv1.2')),$conf->global->PAYPAL_SSLVERSION);
@@ -167,54 +167,54 @@ print '<td>'.$langs->trans("UsageParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_INTEGRAL_OR_PAYPALONLY").'</td><td>';
 print $form->selectarray("PAYPAL_API_INTEGRAL_OR_PAYPALONLY",array('integral'=> $langs->trans('PaypalModeIntegral'),'paypalonly'=> $langs->trans('PaypalModeOnlyPaypal')),$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY);
 print '</td></tr>';
 
-/*$var=!$var;
+/*
 print '<tr '.$bc[$var].'><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYPAL_API_EXPRESS").'</span></td><td>';
 print $form->selectyesno("PAYPAL_API_EXPRESS",$conf->global->PAYPAL_API_EXPRESS);
 print '</td></tr>';
 */
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("VendorName").'</td><td>';
 print '<input size="64" type="text" name="PAYPAL_CREDITOR" value="'.$conf->global->PAYPAL_CREDITOR.'">';
 print ' &nbsp; '.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="PAYPAL_CSS_URL" value="'.$conf->global->PAYPAL_CSS_URL.'">';
 print ' &nbsp; '.$langs->trans("Example").': http://mysite/mycss.css';
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("PAYPAL_ADD_PAYMENT_URL").'</td><td>';
 print $form->selectyesno("PAYPAL_ADD_PAYMENT_URL",$conf->global->PAYPAL_ADD_PAYMENT_URL,1);
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("MessageOK").'</td><td>';
 $doleditor=new DolEditor('PAYPAL_MESSAGE_OK',$conf->global->PAYPAL_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_4,'90%');
 $doleditor->Create();
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("MessageKO").'</td><td>';
 $doleditor=new DolEditor('PAYPAL_MESSAGE_KO',$conf->global->PAYPAL_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_4,'90%');
 $doleditor->Create();
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("PAYPAL_PAYONLINE_SENDEMAIL").'</td><td>';
 print '<input size="32" type="email" name="PAYPAL_PAYONLINE_SENDEMAIL" value="'.$conf->global->PAYPAL_PAYONLINE_SENDEMAIL.'">';
@@ -227,7 +227,7 @@ print '<td>'.$langs->trans("UrlGenerationParameters").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("SecurityToken").'</td><td>';
 print '<input size="48" type="text" id="PAYPAL_SECURITY_TOKEN" name="PAYPAL_SECURITY_TOKEN" value="'.$conf->global->PAYPAL_SECURITY_TOKEN.'">';
@@ -235,7 +235,7 @@ if (! empty($conf->use_javascript_ajax))
 	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 print '</td></tr>';
 
-$var=!$var;
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("SecurityTokenIsUnique").'</td><td>';
 print $form->selectyesno("PAYPAL_SECURITY_TOKEN_UNIQUE",(empty($conf->global->PAYPAL_SECURITY_TOKEN)?0:$conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE),1);
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index 8d9609459ed..23a958211b2 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -147,11 +147,11 @@ if ($mode == 'setup' && $user->admin)
         $submit_enabled=0;
         foreach ($printer->conf as $key)
         {
-            $var=!$var;
+            
             switch ($key['type']) {
                 case "text":
                 case "password":
-                    print '<tr '.$bc[$var].'>';
+                    print '<tr class="oddeven">';
                     print '<td'.($key['required']?' class=required':'').'>'.$langs->trans($key['varname']).'</td>';
                     print '<td><input size="32" type="'.(empty($key['type'])?'text':$key['type']).'" name="setupdriver['.$i.'][value]" value="'.$conf->global->{$key['varname']}.'"';
                     print isset($key['moreattributes'])?' '.$key['moreattributes']:'';
@@ -160,7 +160,7 @@ if ($mode == 'setup' && $user->admin)
                     print '</tr>'."\n";
                     break;
                 case "info":    // Google Api setup or Google OAuth Token
-                    print '<tr '.$bc[$var].'>';
+                    print '<tr class="oddeven">';
                     print '<td'.($key['required']?' class=required':'').'>';
                     if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
                     {
@@ -195,7 +195,7 @@ if ($mode == 'setup' && $user->admin)
             if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
             {
                 // Token
-                print '<tr '.$bc[$var].'>';
+                print '<tr class="oddeven">';
                 print '<td>'.$langs->trans("Token").'</td>';
                 print '<td colspan="2">';
                 $tokenobj=null;
@@ -265,8 +265,8 @@ if ($mode == 'config' && $user->admin)
         $langs->load($driver);
         $printer = new $classname($db);
         //print '<pre>'.print_r($printer, true).'</pre>';
-        $var=!$var;
-        print '<tr '.$bc[$var].'>';
+        
+        print '<tr class="oddeven">';
         print '<td>'.img_picto('', $printer->picto).' '.$langs->trans($printer->desc).'</td>';
         print '<td class="center">';
         if (! empty($conf->use_javascript_ajax))
@@ -348,8 +348,8 @@ if ($mode == 'userconf' && $user->admin)
     $sql = 'SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid';
     $resql = $db->query($sql);
     while ($row=$db->fetch_array($resql)) {
-        $var=!$var;
-        print '<tr '.$bc[$var].'>';
+        
+        print '<tr class="oddeven">';
         print '<td>'.$row['login'].'</td>';
         print '<td>'.$row['module'].'</td>';
         print '<td>'.$row['driver'].'</td>';
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index 4345ea095ae..24f1d64e30c 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -166,7 +166,7 @@ if ($action != 'create_updater' && $action != 'edit_updater') {
     {
 	    foreach ($arrayglobalvars as $i=>$entry) {
 	        $var = !$var;
-	        print '<tr '.$bc[$var].'>';
+	        print '<tr class="oddeven">';
 	        print '<td>'.$entry->code.'</td>';
 	        print '<td>'.$entry->description.'</td>';
 	        print '<td>'.price($entry->value).'</td>';
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index d0294dd3a70..ecdefb189b3 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -578,8 +578,8 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) $rowspan++;
 if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) $rowspan++;
 if (! empty($conf->global->MAIN_MULTILANGS)) $rowspan++;
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("PricingRule").'</td>';
 print '<td width="60" align="right">';
 $current_rule = 'PRODUCT_PRICE_UNIQ';
@@ -601,16 +601,16 @@ print '</tr>';
 // multiprix nombre de prix a proposer
 if (! empty($conf->global->PRODUIT_MULTIPRICES))
 {
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("MultiPricesNumPrices").'</td>';
 	print '<td align="right"><input size="3" type="text" class="flat" name="value_PRODUIT_MULTIPRICES_LIMIT" value="'.$conf->global->PRODUIT_MULTIPRICES_LIMIT.'"></td>';
 	print '</tr>';
 }
 
 // sousproduits activation/desactivation
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("AssociatedProductsAbility").'</td>';
 print '<td width="60" align="right">';
 print $form->selectyesno("activate_sousproduits",$conf->global->PRODUIT_SOUSPRODUITS,1);
@@ -618,8 +618,8 @@ print '</td>';
 print '</tr>';
 
 // Utilisation formulaire Ajax sur choix produit
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$form->textwithpicto($langs->trans("UseSearchToSelectProduct"),$langs->trans('UseSearchToSelectProductTooltip'),1).'</td>';
 if (empty($conf->use_javascript_ajax))
 {
@@ -643,16 +643,16 @@ print '</tr>';
 
 if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
 {
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("NumberOfProductShowInSelect").'</td>';
 	print '<td align="right"><input size="3" type="text" class="flat" name="value_PRODUIT_LIMIT_SIZE" value="'.$conf->global->PRODUIT_LIMIT_SIZE.'"></td>';
 	print '</tr>';
 }
 
 // Visualiser description produit dans les formulaires activation/desactivation
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ViewProductDescInFormAbility").'</td>';
 print '<td width="60" align="right">';
 print $form->selectyesno("activate_viewProdDescInForm",$conf->global->PRODUIT_DESC_IN_FORM,1);
@@ -661,8 +661,8 @@ print '</tr>';
 
 // Activate propal merge produt card
 /* Kept as hidden feature only. PRODUIT_PDF_MERGE_PROPAL can be added manually. Still did not understand how this feature works.
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MergePropalProductCard").'</td>';
 print '<td width="60" align="right">';
 print $form->selectyesno("activate_mergePropalProductCard",$conf->global->PRODUIT_PDF_MERGE_PROPAL,1);
@@ -672,8 +672,8 @@ print '</tr>';
 
 // Use units
 /* Kept as hidden feature only. PRODUCT_USE_UNITS is hidden for the moment. Because it seems to be a duplicated feature with already existing field to store unit of product
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("UseUnits").'</td>';
 print '<td width="60" align="right">';
 print $form->selectyesno("activate_units",$conf->global->PRODUCT_USE_UNITS,1);
@@ -684,8 +684,8 @@ print '</tr>';
 // View product description in thirdparty language
 if (! empty($conf->global->MAIN_MULTILANGS))
 {
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("ViewProductDescInThirdpartyLanguageAbility").'</td>';
 	print '<td width="60" align="right">';
 	print $form->selectyesno("activate_viewProdTextsInThirdpartyLanguage", (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)?$conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE:0), 1);
@@ -726,7 +726,7 @@ if (! empty($conf->global->PRODUCT_CANVAS_ABILITY))
 
     				if ($conf->$module->enabled)
     				{
-    					$var=!$var;
+    					
     					print "<tr ".$bc[$var]."><td>";
 
     					print $object->description;
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index cc6f1b5116d..b6f469a893a 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -271,7 +271,7 @@ else
 	print '<td align="right" width="60">'.$langs->trans("Value").'</td>'."\n";
 	print '</tr>'."\n";
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'>'."\n";
 	print '<td>'.$langs->trans("OldVATRates").'</td>'."\n";
 	print '<td width="60" align="right">'."\n";
@@ -279,7 +279,7 @@ else
 	print '</td>'."\n";
 	print '</tr>'."\n";
 
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'>'."\n";
 	print '<td>'.$langs->trans("NewVATRates").'</td>'."\n";
 	print '<td width="60" align="right">'."\n";
@@ -288,7 +288,7 @@ else
 	print '</tr>'."\n";
 
 	/*
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].'>'."\n";
 	print '<td>'.$langs->trans("PriceBaseTypeToChange").'</td>'."\n";
 	print '<td width="60" align="right">'."\n";
diff --git a/htdocs/product/canvas/product/tpl/list.tpl.php b/htdocs/product/canvas/product/tpl/list.tpl.php
index e57fd5adfab..ad00d75259e 100644
--- a/htdocs/product/canvas/product/tpl/list.tpl.php
+++ b/htdocs/product/canvas/product/tpl/list.tpl.php
@@ -84,7 +84,7 @@
 <?php
 $var=true;
 foreach($datas as $line) {
-	$var=!$var;	?>
+		?>
 	<tr <?php echo $bc[$var]; ?>>
    		<?php
    		foreach($line as $key => $value) {
diff --git a/htdocs/product/canvas/service/tpl/list.tpl.php b/htdocs/product/canvas/service/tpl/list.tpl.php
index 4fc875e15bf..a7efe4f86ba 100644
--- a/htdocs/product/canvas/service/tpl/list.tpl.php
+++ b/htdocs/product/canvas/service/tpl/list.tpl.php
@@ -84,7 +84,7 @@
 <?php
 $var=True;
 foreach($datas as $line) {
-	$var=!$var;	?>
+		?>
 	<tr <?php echo $bc[$var]; ?>>
    		<?php
    		foreach($line as $key => $value) {
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 230a3dbee23..37068a1daca 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -571,7 +571,7 @@ if ($id > 0 || ! empty($ref))
 								continue;
 							}
 						}
-						$var=!$var;
+						
 						print "\n<tr ".$bc[$var].">";
 						$productstatic->id=$objp->rowid;
 						$productstatic->ref=$objp->ref;
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index afabf209897..75596bf9eca 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -621,9 +621,9 @@ if ($id > 0 || $ref)
 
 					foreach($product_fourn_list as $productfourn)
 					{
-						$var=!$var;
+						
 
-						print "<tr ".$bc[$var].">";
+						print '<tr class="oddeven">';
 
 						// Supplier
 						print '<td>'.$productfourn->getSocNomUrl(1,'supplier').'</td>';
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 73447e456e6..dc2628f4dc0 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -220,7 +220,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($result);
-				$var=!$var;
+				
 				print '<tr $bc[$var]><td>'.$obj->label.'</td><td>'.$obj->nb.'</td></tr>';
 				$total+=$obj->nb;
 				$i++;
@@ -292,8 +292,8 @@ if ($result)
 				}
 			}
 
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 			print '<td class="nowrap">';
 			$product_static->id=$objp->rowid;
 			$product_static->ref=$objp->ref;
@@ -427,7 +427,7 @@ function activitytrim($product_type)
 			{
 				if ($trim1+$trim2+$trim3+$trim4 > 0)
 				{
-				    $var=!$var;
+				    
 					print '<tr '.$bc[$var].'><td align=left>'.$tmpyear.'</td>';
 					print '<td align=right>'.price($trim1).'</td>';
 					print '<td align=right>'.price($trim2).'</td>';
@@ -461,7 +461,7 @@ function activitytrim($product_type)
 		}
 		if ($trim1+$trim2+$trim3+$trim4 > 0)
 		{
-		    $var=!$var;
+		    
 			print '<tr '.$bc[$var].'><td align=left>'.$tmpyear.'</td>';
 			print '<td align=right>'.price($trim1).'</td>';
 			print '<td align=right>'.price($trim2).'</td>';
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 90adaa96856..0f42c6fb445 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -761,7 +761,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 		{
 		    $var = ! $var;
 		    
-			print '<tr '.$bc[$var].'>';
+			print '<tr class="oddeven">';
 
 			// Label of price
 			print '<td>';
@@ -1243,7 +1243,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		{
 			$var = !$var;
 
-			print '<tr '.$bc[$var].'>';
+			print '<tr class="oddeven">';
 			print '<td>';
 			print $form->textwithpicto($langs->trans('SellingPrice') . ' ' . $i, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
 			print '</td>';
@@ -1724,7 +1724,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			foreach ($prodcustprice->lines as $line)
 			{
 				$var = ! $var;
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				// Date
 				$staticsoc = new Societe($db);
 				$staticsoc->fetch($line->fk_soc);
@@ -1805,7 +1805,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		
 		
 		// Line for default price
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		print "<td>" . $langs->trans("Default") . "</td>";
 		print "<td>" . "</td>";
 		
@@ -1840,7 +1840,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			{
 			    $var = ! $var;
 			    
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 				// Date
 				$staticsoc = new Societe($db);
 				$staticsoc->fetch($line->fk_soc);
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 192017af2a5..341d002a1af 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -211,9 +211,9 @@ if ($id > 0 || ! empty($ref))
 					while ($i < $num && $i < $conf->liste_limit)
 					{
 						$objp = $db->fetch_object($result);
-						$var=!$var;
+						
 
-						print '<tr '.$bc[$var].'>';
+						print '<tr class="oddeven">';
 	 					print '<td>';
 	                    $orderstatic->id=$objp->commandeid;
 	                    $orderstatic->ref=$objp->ref;
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 8c5f1a3ba86..6a8183ca7de 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -177,9 +177,9 @@ if ($id > 0 || ! empty($ref))
 				while ($i < $num && $i < $conf->liste_limit)
 				{
 					$objp = $db->fetch_object($result);
-					$var=!$var;
+					
 
-					print "<tr ".$bc[$var].">";
+					print '<tr class="oddeven">';
 					print '<td><a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowContract"),"contract").' ';
 					print $objp->rowid;
 					print "</a></td>\n";
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 53e5b0ab0a6..f0e5b0f13c4 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -234,9 +234,9 @@ if ($id > 0 || ! empty($ref))
                     while ($i < min($num,$conf->liste_limit))
 					{
                         $objp = $db->fetch_object($result);
-                        $var=!$var;
+                        
 
-                        print '<tr '.$bc[$var].'>';
+                        print '<tr class="oddeven">';
                         print '<td>';
                         $invoicestatic->id=$objp->facid;
                         $invoicestatic->ref=$objp->facnumber;
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index eb853539e01..95f74352305 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -474,9 +474,9 @@ else
 						}
 					}
 
-					$var=!$var;
+					
 					//print '<td>'.dol_print_date($objp->datem).'</td>';
-					print "<tr ".$bc[$var].">";
+					print '<tr class="oddeven">';
 					print "<td>";
 					$productstatic->id=$objp->rowid;
                     $productstatic->ref = $objp->ref;
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index b2ecaf3afd1..a6e20aabcab 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -87,8 +87,8 @@ if ($result)
         while ($i < $num)
         {
             $objp = $db->fetch_object($result);
-            $var=!$var;
-            print "<tr ".$bc[$var].">";
+            
+            print '<tr class="oddeven">';
             print "<td><a href=\"card.php?id=$objp->rowid\">".img_object($langs->trans("ShowStock"),"stock")." ".$objp->label."</a></td>\n";
             print '<td align="right">'.$entrepot->LibStatut($objp->statut,5).'</td>';
             print "</tr>\n";
@@ -149,8 +149,8 @@ if ($resql)
 	while ($i < min($num,$max))
 	{
 		$objp = $db->fetch_object($resql);
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 		print '<td>'.dol_print_date($db->jdate($objp->datem),'dayhour').'</td>';
 		print "<td><a href=\"../card.php?id=$objp->rowid\">";
 		print img_object($langs->trans("ShowProduct"),"product").' '.$objp->produit;
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index f31b7c9eb6e..f1c625308e7 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -197,7 +197,7 @@ if ($result)
             $warehouse->lieu = $objp->lieu;
             $warehouse->fk_parent = $objp->fk_parent;
             
-            print "<tr ".$bc[$var].">";
+            print '<tr class="oddeven">';
             print '<td>' . $warehouse->getNomUrl(1) . '</td>';
             // Location
             print '<td>'.$objp->lieu.'</td>';
@@ -224,7 +224,7 @@ if ($result)
 
             print "</tr>\n";
 
-            $var=!$var;
+            
             $i++;
 		}
 
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 03c0ebd78ba..2ab78ac735d 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -361,7 +361,7 @@ print getTitleFieldOfList('',0);
 print '</tr>';
 
 
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 // Product
 print '<td class="titlefield">';
 $filtertype=0;
@@ -402,13 +402,13 @@ print '</tr>';
 
 foreach($listofdata as $key => $val)
 {
-	$var=!$var;
+	
 
 	$productstatic->fetch($val['id_product']);
 	$warehousestatics->fetch($val['id_sw']);
 	$warehousestatict->fetch($val['id_tw']);
 
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>';
 	print $productstatic->getNomUrl(1).' - '.$productstatic->label;
 	print '</td>';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 6c5040c1589..912ee7a7cc0 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -831,7 +831,7 @@ if ($resql)
 		$entrepotstatic->libelle=$obj->label;
 		$entrepotstatic->lieu=$obj->lieu;
 		$stock_real = price2num($obj->reel, 'MS');
-		print '<tr '.$bc[$var].'>';
+		print '<tr class="oddeven">';
 		print '<td colspan="4">'.$entrepotstatic->getNomUrl(1).'</td>';
 		print '<td align="right">'.$stock_real.($stock_real < 0 ?' '.img_warning():'').'</td>';
 		// PMP
@@ -897,7 +897,7 @@ if ($resql)
 			}
 		}
 		$i++;
-		$var=!$var;
+		
 	}
 }
 else dol_print_error($db);
@@ -956,7 +956,7 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
 			print '<td align="right">'.$line['desiredstock'].'</td>';
 			print '<td align="right"><a href="?id='.GETPOST('id').'&fk_productstockwarehouse='.$line['id'].'&action=delete_productstockwarehouse">'.img_delete().'</a></td>';
 			print '</tr>';
-			$var=!$var;
+			
 		}
 	}
 	
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index b6a51233fa2..b3c4737b1a5 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -452,7 +452,7 @@ if ($resql)
             $productlot->batch = $obj->batch;
             
             // You can use here results
-            print '<tr '.$bc[$var].'>';
+            print '<tr class="oddeven">';
             if (! empty($arrayfields['t.entity']['checked'])) 
             {
                 print '<td>'.$obj->entity.'</td>';
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index ded0feec881..2de8bbb19b7 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -612,7 +612,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 			$picto = img_picto($langs->trans("NoPendingReceptionOnSupplierOrder"), './img/no', '', 1);
 		}
 
-		print '<tr '.$bc[$var].'>';
+		print '<tr class="oddeven">';
 
 		// Select field
 		//print '<td><input type="checkbox" class="check" name="' . $i . '"' . $disabled . '></td>';
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index be56636ee57..a523e2c66fc 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -102,7 +102,7 @@ if ($result)
         while ($i < min($num,$limit))
         {
             $objp = $db->fetch_object($result);
-            print "<tr ".$bc[$var].">";
+            print '<tr class="oddeven">';
             print '<td><a href="card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowWarehouse"),'stock').' '.$objp->ref.'</a></td>';
             print '<td>'.$objp->lieu.'</td>';
             // PMP value
@@ -120,7 +120,7 @@ if ($result)
             print "</tr>\n";
             $total += price2num($objp->estimatedvalue,'MU');
             $totalsell += price2num($objp->sellvalue,'MU');
-            $var=!$var;
+            
             $i++;
         }
 
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 495337b4a7b..7bea4bf3213 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -148,8 +148,8 @@ if ( $resql )
 
 	while ($row = $db->fetch_object($resql))
 	{
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 		print '<td>';
 		$projectstatic->id=$row->rowid;
 		$projectstatic->ref=$row->ref;
@@ -205,8 +205,8 @@ if ( $resql )
 
 	while ($row = $db->fetch_object($resql))
 	{
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 		print '<td>';
 		$projectstatic->id=$row->rowid;
 		$projectstatic->ref=$row->ref;
@@ -265,8 +265,8 @@ if ($db->type != 'pgsql')
     
     	while ($row = $db->fetch_object($resql))
     	{
-    		$var=!$var;
-    		print "<tr ".$bc[$var].">";
+    		
+    		print '<tr class="oddeven">';
     		print '<td>';
     		$projectstatic->id=$row->rowid;
     		$projectstatic->ref=$row->ref;
@@ -322,7 +322,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_MONTH))
     
     	while ($row = $db->fetch_object($resql))
     	{
-    		print "<tr ".$bc[$var].">";
+    		print '<tr class="oddeven">';
     		print '<td>';
     		$projectstatic->id=$row->rowid;
     		$projectstatic->ref=$row->ref;
@@ -331,7 +331,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_MONTH))
     		print '</td>';
     		print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
     		print "</tr>\n";
-    		$var=!$var;
+    		
     	}
     	$db->free($resql);
     }
@@ -373,7 +373,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR))
 	{
 		while ($row = $db->fetch_object($resql))
 		{
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			print '<td>';
 			$projectstatic->id=$row->rowid;
 			$projectstatic->ref=$row->ref;
@@ -383,7 +383,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR))
 			print '</td>';
 			print '<td align="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
 			print "</tr>\n";
-			$var=!$var;
+			
 		}
 		$db->free($resql);
 	}
@@ -489,7 +489,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S
 		while ($i < $num && $i < $max)
 		{
 			$obj = $db->fetch_object($resql);
-			$var=!$var;
+			
 
 			$username='';
 			if ($obj->userid && $userstatic->id != $obj->userid)	// We have a user and it is not last loaded user
@@ -499,7 +499,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S
 			}
 			if ($userstatic->id) $username = $userstatic->getNomUrl(0,0);
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			//print '<td>'.$username.'</td>';
 			print '<td>';
 			$projectstatic->id=$obj->projectid;
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index fca5eeb22f6..5295e1a5516 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -337,8 +337,8 @@ print '<td align="right" width="60">'.$langs->trans("Value").'</td>'."\n";
 print '<td width="80">&nbsp;</td></tr>'."\n";
 
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("ManageOpportunitiesStatus").'</td>';
 print '<td width="60" align="right">';
 $arrval=array('0'=>$langs->trans("No"),
@@ -350,8 +350,8 @@ print '<input type="submit" class="button" name="modifyPROJECT_USE_OPPORTUNITIES
 print "</td>";
 print '</tr>';
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("ManageTasks").'</td>';
 print '<td width="60" align="right">';
 $arrval=array('0'=>$langs->trans("No"),
@@ -414,7 +414,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						$var=!$var;
+						
 						print '<tr '.$bc[$var].'><td>'.$module->name."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -518,7 +518,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 
 						if ($module->isEnabled())
 						{
-							$var=!$var;
+							
 							print '<tr '.$bc[$var].'><td>'.$module->name."</td><td>\n";
 							print $module->info();
 							print '</td>';
@@ -660,7 +660,7 @@ foreach ($dirmodels as $reldir)
 
 							if ($modulequalified)
 							{
-								$var=!$var;
+								
 								print '<tr '.$bc[$var].'><td width="100">';
 								print (empty($module->name)?$name:$module->name);
 								print "</td><td>\n";
@@ -911,8 +911,8 @@ print '<td align="right" width="60">'.$langs->trans("Value").'</td>'."\n";
 print '<td width="80">&nbsp;</td></tr>'."\n";
 
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("UseSearchToSelectProject").'</td>';
 if (! $conf->use_javascript_ajax)
 {
@@ -935,8 +935,8 @@ else
 }
 print '</tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("AllowToSelectProjectFromOtherCompany").'</td>';
 
 print '<td align="center" width="300">';
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index a2725e744f8..09a3fecc4bd 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -640,7 +640,7 @@ foreach ($listofreferent as $key => $value)
 			}
 
 			$var = ! $var;
-			print '<tr '.$bc[$var].'>';
+			print '<tr class="oddeven">';
 			// Module
 			print '<td align="left">'.$langs->trans($newclassname).'</td>';
 			// Nb
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 668e96d2958..10bec155ded 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -67,8 +67,8 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 	        $dataseries[]=array('label'=>$labelstatus,'data'=>(isset($valsamount[$status])?(float) $valsamount[$status]:0));
 	        if (! $conf->use_javascript_ajax)
 	        {
-	            $var=!$var;
-	            print "<tr ".$bc[$var].">";
+	            
+	            print '<tr class="oddeven">';
 	            print '<td>'.$labelstatus.'</td>';
 	            print '<td align="right"><a href="list.php?statut='.$status.'">'.price((isset($valsamount[$status])?(float) $valsamount[$status]:0), 0, '', 1, -1, -1, $conf->currency).'</a></td>';
 	            print "</tr>\n";
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 8292e4d31a8..8295e106be9 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -185,8 +185,8 @@ if ( $resql )
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 		print '<td class="nowrap">';
 		if ($obj->socid)
 		{
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index e9aad0d0b7e..67504974759 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -322,7 +322,7 @@ foreach ($data_all_year as $val)
 	while ($year && $oldyear > $year+1)
 	{	// If we have empty year
 		$oldyear--;
-		$var=!$var;
+		
 		print '<tr '.$bc[$var].' height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
@@ -334,7 +334,7 @@ foreach ($data_all_year as $val)
 		print '<td align="right">0</td>';
 		print '</tr>';
 	}
-	$var=!$var;
+	
 	print '<tr '.$bc[$var].' height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 02b31ea83ff..e2f94406558 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -361,7 +361,7 @@ if ($id > 0 || ! empty($ref))
 			if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 
 			// Ligne ajout pour contact interne
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 
 			print '<td class="nowrap">';
 			print img_object('','user').' '.$langs->trans("Users");
@@ -395,8 +395,8 @@ if ($id > 0 || ! empty($ref))
 				print '<input type="hidden" name="id" value="'.$object->id.'">';
 				if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
+				
+				print '<tr class="oddeven">';
 
 				print '<td class="nowrap">';
 				print img_object('','contact').' '.$langs->trans("ThirdPartyContacts");
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 73aba634c4d..b090680b6bc 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -823,7 +823,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		$totalarray=array();
 		foreach ($tasks as $task_time)
 		{
-			$var=!$var;
+			
 			print '<tr class="oddeven">';
 
 			$date1=$db->jdate($task_time->task_date);
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index ca50b39d061..3780481e23c 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -80,8 +80,8 @@ if ($resql)
 		{
 			$objp = $db->fetch_object($resql);
 
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
+			
+			print '<tr class="oddeven">';
 			if ($objp->public)
 			{
 				print "<td>".dolGetFirstLastname($objp->firstname, $objp->lastname)." ".$objp->societe."</td>\n";
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 404b7085bdb..ed1c8139e2f 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -143,8 +143,8 @@ if ($result)
 	while ($i < $num && $i < $conf->liste_limit)
 	{
 		$objp = $db->fetch_object($result);
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 		print '<td><a href="public_card.php?id='.$objp->rowid.'">'.dolGetFirstLastname($objp->firstname, $objp->lastname).'</a></td>'."\n";
 		print '<td>'.$objp->societe.'</td>'."\n";
 		print '<td>'.$objp->email.'</td>'."\n";
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 5f83855529d..b4b978009b7 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -247,14 +247,14 @@ if (! GETPOST("source") && $valid)
     $fulltag=$tag;
 
 	// Creditor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Amount
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -275,7 +275,7 @@ if (! GETPOST("source") && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -283,7 +283,7 @@ if (! GETPOST("source") && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
 	print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><input class="flat" type="text" name="email" size="48" value="'.GETPOST("email").'"></td></tr>'."\n";
@@ -320,19 +320,19 @@ if (GETPOST("source") == 'order' && $valid)
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
 
 	// Object
-	$var=!$var;
+	
 	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -341,7 +341,7 @@ if (GETPOST("source") == 'order' && $valid)
 	print '</td></tr>'."\n";
 
 	// Amount
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -361,7 +361,7 @@ if (GETPOST("source") == 'order' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -369,7 +369,7 @@ if (GETPOST("source") == 'order' && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
 	print ' ('.$langs->trans("ToComplete").')';
 	$email=$order->thirdparty->email;
@@ -408,19 +408,19 @@ if (GETPOST("source") == 'invoice' && $valid)
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
 
 	// Object
-	$var=!$var;
+	
 	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -429,7 +429,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 	print '</td></tr>'."\n";
 
 	// Amount
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -449,7 +449,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -457,7 +457,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
 	print ' ('.$langs->trans("ToComplete").')';
     $email=$invoice->thirdparty->email;
@@ -542,19 +542,19 @@ if (GETPOST("source") == 'contractline' && $valid)
 	if (GETPOST('qty')) $qty=GETPOST('qty');
 
 	// Creditor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
 
 	// Object
-	$var=!$var;
+	
 	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
 	if ($contractline->fk_product)
 	{
@@ -577,7 +577,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</td></tr>'."\n";
 
 	// Quantity
-	$var=!$var;
+	
 	$label=$langs->trans("Quantity");
 	$qty=1;
 	$duration='';
@@ -605,7 +605,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</b></td></tr>'."\n";
 
 	// Amount
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -625,7 +625,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -633,7 +633,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
 	print ' ('.$langs->trans("ToComplete").')';
     $email=$contract->thirdparty->email;
@@ -673,14 +673,14 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
 	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
@@ -688,7 +688,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	print '</b>';
 
 	// Object
-	$var=!$var;
+	
 	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -699,13 +699,13 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	if ($member->last_subscription_date || $member->last_subscription_amount)
 	{
 		// Last subscription date
-		$var=!$var;
+		
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
 		print '</td></tr>'."\n";
 
 		// Last subscription amount
-		$var=!$var;
+		
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
@@ -714,7 +714,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	}
 
 	// Amount
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -738,7 +738,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -746,7 +746,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
     $email=$member->email;
     $email=(GETPOST("email")?GETPOST("email"):(isValidEmail($email)?$email:''));
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 8313c39bb95..4acce4ac803 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -350,14 +350,14 @@ if (! GETPOST("source") && $valid)
 	$fulltag=$tag;
 
 	// Creditor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Amount
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -377,7 +377,7 @@ if (! GETPOST("source") && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -419,19 +419,19 @@ if (GETPOST("source") == 'order' && $valid)
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
 
 	// Object
-	$var=!$var;
+	
 	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -440,7 +440,7 @@ if (GETPOST("source") == 'order' && $valid)
 	print '</td></tr>'."\n";
 
 	// Amount
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -460,7 +460,7 @@ if (GETPOST("source") == 'order' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -526,19 +526,19 @@ if (GETPOST("source") == 'invoice' && $valid)
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
 
 	// Object
-	$var=!$var;
+	
 	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -547,7 +547,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 	print '</td></tr>'."\n";
 
 	// Amount
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -567,7 +567,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -679,19 +679,19 @@ if (GETPOST("source") == 'contractline' && $valid)
 	if (GETPOST('qty')) $qty=GETPOST('qty');
 
 	// Creditor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
 
 	// Object
-	$var=!$var;
+	
 	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
 	if ($contractline->fk_product)
 	{
@@ -714,7 +714,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</td></tr>'."\n";
 
 	// Quantity
-	$var=!$var;
+	
 	$label=$langs->trans("Quantity");
 	$qty=1;
 	$duration='';
@@ -742,7 +742,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</b></td></tr>'."\n";
 
 	// Amount
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -762,7 +762,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -827,14 +827,14 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
 	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
@@ -842,7 +842,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	print '</b>';
 
 	// Object
-	$var=!$var;
+	
 	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -853,13 +853,13 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	if ($member->last_subscription_date || $member->last_subscription_amount)
 	{
 		// Last subscription date
-		$var=!$var;
+		
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
 		print '</td></tr>'."\n";
 
 		// Last subscription amount
-		$var=!$var;
+		
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
@@ -868,7 +868,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	}
 
 	// Amount
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount))
 	{
@@ -897,7 +897,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	$var=!$var;
+	
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index e1047d22981..559dbce4b06 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -260,7 +260,7 @@ if ($ret)
 {
     foreach ($object->lines as $resource)
     {
-            $var=!$var;
+            
 
             $style='';
             if ($resource->id == GETPOST('lineid')) $style='style="background: orange;"';
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 8e7fe40859b..b949d5a27ba 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -431,7 +431,7 @@ foreach ($dirsociete as $dirroot)
     			$modCodeCompta = new $file;
     			$var = !$var;
 
-    			print '<tr '.$bc[$var].'>';
+    			print '<tr class="oddeven">';
     			print '<td>'.$modCodeCompta->name."</td><td>\n";
     			print $modCodeCompta->info($langs);
     			print '</td>';
@@ -646,7 +646,7 @@ while ($i < $nbofloop)
 	{
 		$var = !$var;
 
-		print '<tr '.$bc[$var].'>';
+		print '<tr class="oddeven">';
 		print '<td>'.$profid[$i][0]."</td><td>\n";
 		print $profid[$i][1];
 		print '</td>';
@@ -722,8 +722,8 @@ print '<td align="right" width="60">'.$langs->trans("Value").'</td>'."\n";
 print '<td width="80">&nbsp;</td></tr>'."\n";
 
 // Utilisation formulaire Ajax sur choix societe
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="80%">'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectCompany"),$langs->trans('UseSearchToSelectCompanyTooltip'),1).' </td>';
 if (! $conf->use_javascript_ajax)
 {
@@ -746,8 +746,8 @@ else
 }
 print '</tr>';
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="80%">'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectContact"),$langs->trans('UseSearchToSelectContactTooltip'),1).'</td>';
 if (! $conf->use_javascript_ajax)
 {
@@ -771,8 +771,8 @@ else
 print '</tr>';
 
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("AddRefInList").'</td>';
 print '<td>&nbsp</td>';
 print '<td align="center">';
@@ -791,8 +791,8 @@ print '</a></td>';
 print '</tr>';
 
 
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("AskForPreferredShippingMethod").'</td>';
 print '<td>&nbsp</td>';
 print '<td align="center">';
@@ -813,8 +813,8 @@ print '</tr>';
 
 /*
 // COMPANY_USE_SEARCH_TO_SELECT
-$var=!$var;
-print "<tr ".$bc[$var].">";
+
+print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("HideClosedThirdpartyComboBox").'</td>';
 if (! empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX))
 {
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 2126c81ddfe..89bb836d119 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -267,7 +267,7 @@ if (! empty($socid))
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				$var=!$var;
+				
 				print "<tr ".$bc[$var]."><td>";
 				$tmpuser->id=$obj->rowid;
 				$tmpuser->firstname=$obj->firstname;
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 0bff649d7d3..d0f92bb9c14 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -407,8 +407,8 @@ if ($sql_select)
 
 		if (is_object($documentstaticline)) $documentstaticline->statut=$objp->status;
 
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
+		
+		print '<tr class="oddeven">';
 		print '<td class="nobordernopadding nowrap" width="100">';
 		print $documentstatic->getNomUrl(1);
 		print '</td>';
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 5fa0fd37210..0f1450c491a 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -219,7 +219,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($result);
-				$var=!$var;
+				
 				print '<tr '.$bc[$var].'><td>'.$obj->label.'</td><td>'.$obj->nb.'</td></tr>';
 				$total+=$obj->nb;
 				$i++;
@@ -281,8 +281,8 @@ if ($result)
         {
             $objp = $db->fetch_object($result);
 
-            $var=!$var;
-            print "<tr ".$bc[$var].">";
+            
+            print '<tr class="oddeven">';
             // Name
             print '<td class="nowrap">';
             $thirdparty_static->id=$objp->rowid;
diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php
index a1042087faf..02125e8fad8 100644
--- a/htdocs/societe/notify/index.php
+++ b/htdocs/societe/notify/index.php
@@ -90,9 +90,9 @@ if ($result)
 	{
 		$obj = $db->fetch_object($result);
 
-		$var=!$var;
+		
 
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		print "<td><a href=\"card.php?socid=".$obj->socid."\">".$obj->name."</a></td>\n";
 		print "<td>".dolGetFirstLastname($obj->firstname, $obj->lastname)."</td>\n";
 		print "<td>".$obj->titre."</td>\n";
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 42860abb98a..185589f01cb 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -460,7 +460,7 @@ if ($socid && $action != 'edit' && $action != "create")
 
         foreach ($rib_list as $rib)
         {
-            print "<tr ".$bc[$var].">";
+            print '<tr class="oddeven">';
             // Label
             print '<td>'.$rib->label.'</td>';
             // Bank name
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 876c383031a..2bda75867dc 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -259,8 +259,8 @@ if ($id > 0 || ! empty($ref))
 
 						$companyname=$objp->company;
 
-						$var=!$var;
-						print "<tr ".$bc[$var].">";
+						
+						print '<tr class="oddeven">';
 
 						// Ref
 						print "<td>";
diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
index ceb86d102bd..8d6d437f466 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
@@ -90,8 +90,8 @@ print "</tr>\n";
 $var=True;
 foreach($extrafields->attribute_type as $key => $value)
 {
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
+    
+    print '<tr class="oddeven">';
     print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
     print "<td>".$extrafields->attribute_label[$key]."</td>\n";
     print "<td>".$key."</td>\n";
diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
index 12e5d2c23e6..2b0a22c51fa 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
@@ -94,8 +94,8 @@ print "</tr>\n";
 $var=True;
 foreach($extrafields->attribute_type as $key => $value)
 {
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
+    
+    print '<tr class="oddeven">';
     print "<td>".$extrafields->attribute_label[$key]."</td>\n";
     print "<td>".$key."</td>\n";
     print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index f6ca9aaee45..09c7e230739 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -125,8 +125,8 @@ if ($resql)
         $dataseries[]=array('label'=>$supplier_proposalstatic->LibStatut($status,1),'data'=>(isset($vals[$status])?(int) $vals[$status]:0));
         if (! $conf->use_javascript_ajax)
         {
-            $var=!$var;
-            print "<tr ".$bc[$var].">";
+            
+            print '<tr class="oddeven">';
             print '<td>'.$supplier_proposalstatic->LibStatut($status,0).'</td>';
             print '<td align="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status])?$vals[$status]:0).'</a></td>';
             print "</tr>\n";
@@ -178,9 +178,9 @@ if (! empty($conf->supplier_proposal->enabled))
 			$var = True;
 			while ($i < $num)
 			{
-				$var=!$var;
+				
 				$obj = $db->fetch_object($resql);
-				print "<tr ".$bc[$var].">";
+				print '<tr class="oddeven">';
 
 				$supplier_proposalstatic->id=$obj->rowid;
 				$supplier_proposalstatic->ref=$obj->ref;
@@ -236,10 +236,10 @@ if ($resql)
 		$var = True;
 		while ($i < $num)
 		{
-			$var=!$var;
+			
 			$obj = $db->fetch_object($resql);
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			print '<td width="20%" class="nowrap">';
 
 			$supplier_proposalstatic->id=$obj->rowid;
@@ -317,8 +317,8 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
 			while ($i < $nbofloop)
 			{
 				$obj = $db->fetch_object($result);
-				$var=!$var;
-				print '<tr '.$bc[$var].'>';
+				
+				print '<tr class="oddeven">';
 
 				// Ref
 				print '<td class="nowrap" width="140">';
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 10ac76b48dd..c0e9611e6b6 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -579,12 +579,12 @@ if ($result)
 	while ($i < min($num,$limit))
 	{
 		$obj = $db->fetch_object($result);
-		$var=!$var;
+		
 
 		$objectstatic->id=$obj->rowid;
 		$objectstatic->ref=$obj->ref;
 
-		print '<tr '.$bc[$var].'>';
+		print '<tr class="oddeven">';
 		print '<td class="nowrap">';
 
 		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
@@ -671,14 +671,14 @@ if ($result)
 	if ($total>0)
 	{
 		if($num<$limit){
-			$var=!$var;
+			
 			print '<tr class="liste_total"><td align="left">'.$langs->trans("TotalHT").'</td>';
 			print '<td colspan="4" align="right">'.price($total).'</td><td colspan="3"></td>';
 			print '</tr>';
 		}
 		else
 		{
-			$var=!$var;
+			
 			print '<tr class="liste_total"><td align="left">'.$langs->trans("TotalHTforthispage").'</td>';
 			print '<td colspan="4" align="right">'.price($total).'</td><td colspan="3"></td>';
 			print '</tr>';
diff --git a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
index 8ba1f958918..d313eca10bd 100644
--- a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
@@ -33,7 +33,7 @@ $var=true;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
-    $var=!$var;
+    
     $trclass=($var?'pair':'impair');
     if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
 ?>
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 62efff2f88f..0942bbf7ed8 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -185,8 +185,8 @@ while ($i <= $MAXAGENDA)
 	$offsettz='AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key;
 	$color='AGENDA_EXT_COLOR_'.$id.'_'.$key;
 
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
+	
+	print '<tr class="oddeven">';
 	// Nb
 	print '<td class="maxwidth50onsmartphone">'.$langs->trans("AgendaExtNb",$key)."</td>";
 	// Name
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index e213578b860..c245f162de9 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1716,9 +1716,9 @@ else
 
                     foreach($groupslist as $group)
                     {
-                        $var=!$var;
+                        
 
-                        print "<tr ".$bc[$var].">";
+                        print '<tr class="oddeven">';
                         print '<td>';
                         if ($caneditgroup)
                         {
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 192d681ca81..eacb954e007 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -454,9 +454,9 @@ else
 
             	foreach($object->members as $useringroup)
             	{
-            		$var=!$var;
+            		
 
-            		print "<tr ".$bc[$var].">";
+            		print '<tr class="oddeven">';
             		print '<td>';
             		print $useringroup->getNomUrl(-1, '', 0, 0, 24, 0, 'login');
             		if ($useringroup->admin  && ! $useringroup->entity) print img_picto($langs->trans("SuperAdministrator"),'redstar');
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 94c12147f1a..539c1f2be23 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -171,9 +171,9 @@ if ($resql)
     while ($i < $num)
     {
         $obj = $db->fetch_object($resql);
-        $var=!$var;
+        
 
-        print "<tr ".$bc[$var].">";
+        print '<tr class="oddeven">';
         print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->name.'</a>';
         if (! $obj->entity)
         {
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 29ef7dac061..66a4448491e 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -124,9 +124,9 @@ if ($resql)
 	while ($i < $num && $i < $max)
 	{
 		$obj = $db->fetch_object($resql);
-		$var=!$var;
+		
 
-		print "<tr ".$bc[$var].">";
+		print '<tr class="oddeven">';
 		print '<td>';
         $fuserstatic->id = $obj->rowid;
         $fuserstatic->statut = $obj->statut;
@@ -237,9 +237,9 @@ if ($canreadperms)
 		while ($i < $num && (! $max || $i < $max))
 		{
 			$obj = $db->fetch_object($resql);
-			$var=!$var;
+			
 
-			print "<tr ".$bc[$var].">";
+			print '<tr class="oddeven">';
 			print '<td><a href="'.DOL_URL_ROOT.'/user/group/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->name.'</a>';
 			if (! $obj->entity)
 			{
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index f0ca0f17c31..0441ede1563 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -239,7 +239,7 @@ if ($action == 'edit')
     print '<tr class="liste_titre"><td width="25%">'.$langs->trans("Parameter").'</td><td width="25%">'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
 
     // Landing page
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("LandingPage").'</td>';
     print '<td>';
     print (empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE);
@@ -253,7 +253,7 @@ if ($action == 'edit')
     print '</td></tr>';
     
     // Langue par defaut
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("Language").'</td>';
     print '<td>';
     $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
@@ -268,7 +268,7 @@ if ($action == 'edit')
     print '</td></tr>';
 
     // Taille max des listes
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("MaxSizeList").'</td>';
     print '<td>'.$conf->global->MAIN_SIZE_LISTE_LIMIT.'</td>';
     print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_SIZE_LISTE_LIMIT" id="check_SIZE_LISTE_LIMIT" type="checkbox" '.(! empty($object->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"");
@@ -305,7 +305,7 @@ else
     print '<tr class="liste_titre"><td width="25%">'.$langs->trans("Parameter").'</td><td width="25%">'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
 
     // Landing page
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("LandingPage").'</td>';
     print '<td>';
     print (empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE);
@@ -323,7 +323,7 @@ else
     print '</td></tr>';
     
     // Language
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("Language").'</td>';
     print '<td>';
     $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
@@ -337,7 +337,7 @@ else
     print (isset($object->conf->MAIN_LANG_DEFAULT) && $object->conf->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):(! empty($object->conf->MAIN_LANG_DEFAULT)?$langs->trans("Language_".$object->conf->MAIN_LANG_DEFAULT):''));
     print '</td></tr>';
 
-    $var=!$var;
+    
     print '<tr '.$bc[$var].'><td>'.$langs->trans("MaxSizeList").'</td>';
     print '<td>'.(! empty($conf->global->MAIN_SIZE_LISTE_LIMIT)?$conf->global->MAIN_SIZE_LISTE_LIMIT:'&nbsp;').'</td>';
     print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' type="checkbox" disabled '.(! empty($object->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 2116d51e65b..ad70190b689 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -262,7 +262,7 @@ if ($resql)
 		$totalbefore = $total;
 		$total = $total + $objp->amount;
 
-		$var=!$var;
+		
 
 		// Date operation
 		$dateop=$db->jdate($objp->do);

From 4e021c123b759f79e8939e14e2f4d42d964b02f4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 11:28:19 +0200
Subject: [PATCH 0598/1163] Fix travis error

---
 htdocs/core/class/html.formfile.class.php | 2 +-
 htdocs/main.inc.php                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index c982e3d4bb2..56d3b5e29fb 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -869,7 +869,7 @@ class FormFile
     			else $this->infofiles['extensions'][$ext]++;
 
     			// Preview
-    			if (! empty($conf->use_javascript_ajax) && ! empty($conf->browser->layout != 'phone'))
+    			if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
     			{
                     $tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1);
                     if ($tmparray && $tmparray['url']) $tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 8fe2125251c..5e015cd9f62 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1899,7 +1899,7 @@ if (! function_exists("llxFooter"))
 
         if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
 
-        // TODO Move this in lib_head.js
+        // TODO Move this in lib_head.js.php
 
         // Wrapper to show tooltips (html or onclick popup)
         if (! empty($conf->use_javascript_ajax) && empty($conf->dol_no_mouse_hover))
@@ -1922,7 +1922,7 @@ if (! function_exists("llxFooter"))
         }
         
         // Wrapper to manage document_preview
-        if (! empty($conf->use_javascript_ajax) && ! empty($conf->browser->layout != 'phone'))
+        if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
         {
             print "\n<!-- JS CODE TO ENABLE document_preview -->\n";
             print '<script type="text/javascript">

From e6b20840a3d66db0bcf8053fcc2aa7540cd46b63 Mon Sep 17 00:00:00 2001
From: mikee2 <mikee2@users.noreply.github.com>
Date: Fri, 14 Apr 2017 11:49:30 +0200
Subject: [PATCH 0599/1163] Update Segment.php

---
 htdocs/includes/odtphp/Segment.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index 2ef40b2cd66..81e9dad9f97 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -170,8 +170,8 @@ class Segment implements IteratorAggregate, Countable
     {
         global $langs;
 
-        $patterns=array( '/\[%M\]/','/\[%F\]/','/\[%Y\]/' );
-        $values=array( $langs->trans(date('M')), $langs->trans(date('F')), date('Y') );
+        $patterns=array( '__CURRENTDAY__','__CURRENTDAYTEXT__','__CURRENTMONTHSHORT__','__CURRENTMONTH__','__CURRENTYEAR__' );
+        $values=array( date('j'), $langs->trans(date('l')), $langs->trans(date('M')), $langs->trans(date('F')), date('Y') );
 
         $text=preg_replace($patterns, $values, $text);
 

From e6e9b655943bdc6a10df71c5b47b9da6ab993ec8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 12:38:52 +0200
Subject: [PATCH 0600/1163] NEW Reduce memory usage by removing deprecated
 constant loading.

---
 htdocs/core/class/commonobject.class.php      | 42 +++++++++----------
 htdocs/core/class/conf.class.php              | 22 ++++------
 htdocs/core/class/extrafields.class.php       |  1 -
 .../core/modules/syslog/mod_syslog_file.php   |  7 ++--
 .../core/modules/syslog/mod_syslog_syslog.php |  8 +---
 htdocs/langs/en_US/admin.lang                 |  8 +++-
 htdocs/langs/en_US/main.lang                  |  4 --
 htdocs/main.inc.php                           | 15 ++++---
 htdocs/master.inc.php                         |  8 +---
 9 files changed, 50 insertions(+), 65 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 97586e31a7e..99fc6829899 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -42,50 +42,59 @@ abstract class CommonObject
      * @var DoliDb		Database handler (result of a new DoliDB)
      */
 	public $db;
-
 	/**
 	 * @var int The object identifier
 	 */
 	public $id;
-
     /**
      * @var string 		Error string
      * @deprecated		Use instead the array of error strings
      * @see             errors
      */
     public $error;
-
 	/**
      * @var string[]	Array of error strings
      */
     public $errors=array();
-
+	/**
+	 * @var string
+	 */
+	public $element;
+	/**
+	 * @var string
+	 */
+	public $table_element;
+	/**
+	 * @var
+	 */
+	public $table_element_line;
     /**
      * @var string		Key value used to track if data is coming from import wizard
      */
     public $import_key;
-
     /**
      * @var mixed		Contains data to manage extrafields
      */
     public $array_options=array();
-
     /**
      * @var int[]		Array of linked objects ids. Loaded by ->fetchObjectLinked
      */
     public $linkedObjectsIds;
-
     /**
      * @var mixed		Array of linked objects. Loaded by ->fetchObjectLinked
      */
     public $linkedObjects;
-
+    /**
+     * @var Object      To store a cloned copy of object before to edit it and keep track of old properties
+     */
+    public $oldcopy;
+   
     /**
      * @var string		Column name of the ref field.
      */
     protected $table_ref_field = '';
 
-
+    
 
     // Following vars are used by some objects only. We keep this property here in CommonObject to be able to provide common method using them.
 
@@ -166,19 +175,6 @@ abstract class CommonObject
 	 */
 	public $ref_ext;
 
-	/**
-	 * @var string
-	 */
-	public $element;
-	/**
-	 * @var string
-	 */
-	public $table_element;
-	/**
-	 * @var
-	 */
-	public $table_element_line;
-
 	/**
 	 * @var int The object's status
 	 * @see setStatut()
@@ -332,8 +328,10 @@ abstract class CommonObject
     public $firstname;
     public $civility_id;
 
+    
     // No constructor as it is an abstract class
 
+    
     /**
      * Check an object id/ref exists
      * If you don't need/want to instantiate object and just need to know if object exists, use this method instead of fetch
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 08763cc346b..9446020e3ff 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -128,11 +128,7 @@ class Conf
 
 		dol_syslog(get_class($this)."::setValues");
 
-		/*
-		 * Definition de toutes les constantes globales d'environnement
-		 * - En constante php (TODO a virer)
-		 * - En $this->global->key=value
-		 */
+		//Define all global constants into $this->global->key=value
 		$sql = "SELECT ".$db->decrypt('name')." as name,";
 		$sql.= " ".$db->decrypt('value')." as value, entity";
 		$sql.= " FROM ".MAIN_DB_PREFIX."const";
@@ -158,7 +154,7 @@ class Conf
 				$value=$objp->value;
 				if ($key)
 				{
-					if (! defined("$key")) define("$key", $value);	// In some cases, the constant might be already forced (Example: SYSLOG_HANDLERS during install)
+					//if (! defined("$key")) define("$key", $value);	// In some cases, the constant might be already forced (Example: SYSLOG_HANDLERS during install)
 					$this->global->$key=$value;
 
 					if ($value && preg_match('/^MAIN_MODULE_/',$key))
@@ -207,7 +203,7 @@ class Conf
 		    $db->free($resql);
 		}
 
-        // Include other local consts.php files and fetch their values to the corresponding database constants
+        // Include other local consts.php files and fetch their values to the corresponding database constants.
         if (! empty($this->global->LOCAL_CONSTS_FILES)) {
             $filesList = explode(":", $this->global->LOCAL_CONSTS_FILES);
             foreach ($filesList as $file) {
@@ -333,13 +329,12 @@ class Conf
 		$this->propal->dir_output=$rootfordata."/propale";
 		$this->propal->dir_temp=$rootfordata."/propale/temp";
 
-		// Exception: Some dir are not the name of module. So we keep exception here
-		// for backward compatibility.
+		// Exception: Some dir are not the name of module. So we keep exception here for backward compatibility.
 
 		// Sous module bons d'expedition
-		$this->expedition_bon->enabled= defined("MAIN_SUBMODULE_EXPEDITION")?MAIN_SUBMODULE_EXPEDITION:0;
+		$this->expedition_bon->enabled=$this->global->MAIN_SUBMODULE_EXPEDITION?$this->global->MAIN_SUBMODULE_EXPEDITION:0;
 		// Sous module bons de livraison
-		$this->livraison_bon->enabled=defined("MAIN_SUBMODULE_LIVRAISON")?MAIN_SUBMODULE_LIVRAISON:0;
+		$this->livraison_bon->enabled=$this->global->MAIN_SUBMODULE_LIVRAISON?$this->global->MAIN_SUBMODULE_LIVRAISON:0;
 
 		// Module fournisseur
 		if (! empty($this->fournisseur))
@@ -599,8 +594,8 @@ class Conf
         }
 
 		// We init log handlers
-		if (defined('SYSLOG_HANDLERS')) {
-			$handlers = json_decode(constant('SYSLOG_HANDLERS'));
+		if (! empty($this->global->SYSLOG_HANDLERS)) {
+			$handlers = json_decode($this->global->SYSLOG_HANDLERS);
 		} else {
 			$handlers = array();
 		}
@@ -632,6 +627,7 @@ class Conf
 				$this->loghandlers[$handler] = $loghandlerinstance;
 			}
 		}
+		
 	}
 }
 
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index acdf648362e..a2ce21a8971 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -641,7 +641,6 @@ class ExtraFields
 		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";
 		$sql.= " ORDER BY pos";
 
-		dol_syslog(get_class($this)."::fetch_name_optionals_label", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 1e8d2b3a91c..c81fa4c2ba5 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -103,7 +103,8 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	 */
 	private function getFilename($suffixinfilename='')
 	{
-		$tmp=str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, SYSLOG_FILE);
+	    global $conf;
+		$tmp=str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
 		return $suffixinfilename?preg_replace('/\.log$/i', $suffixinfilename.'.log', $tmp):$tmp;
 	}
 
@@ -122,12 +123,12 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 
 		$logfile = $this->getFilename($suffixinfilename);
 
-		if (defined("SYSLOG_FILE_NO_ERROR")) $filefd = @fopen($logfile, 'a+');
+		if (! empty($conf->global->SYSLOG_FILE_NO_ERROR)) $filefd = @fopen($logfile, 'a+');
 		else $filefd = fopen($logfile, 'a+');
 
 		if (! $filefd)
 		{
-			if (! defined("SYSLOG_FILE_NO_ERROR"))
+			if (empty($conf->global->SYSLOG_FILE_NO_ERROR))
 			{
 				// Do not break dolibarr usage if log fails
 				//throw new Exception('Failed to open log file '.basename($logfile));
diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php
index 0f0848f3afd..c2885f1c89a 100644
--- a/htdocs/core/modules/syslog/mod_syslog_syslog.php
+++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php
@@ -111,13 +111,9 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 
 		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return;	// Global option to disable output of this handler
 
-		if (defined("SYSLOG_FACILITY") && constant("SYSLOG_FACILITY"))
+		if (! empty($conf->global->SYSLOG_FACILITY))
 		{
-			if (constant(constant('SYSLOG_FACILITY')))
-			{
-				$facility = constant(constant("SYSLOG_FACILITY"));
-			}
-			else $facility = LOG_USER;
+			$facility = constant($conf->global->SYSLOG_FACILITY);
 		}
 		else $facility = LOG_USER;
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 894b087d55a..f9f69ce2548 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -427,6 +427,11 @@ WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
+TheKeyIsTheNameOfHtmlField=The key is the name of the html field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter here the relative url of the page. Examples:
+PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -1338,7 +1343,7 @@ CacheByServer=Cache by server
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers 
-DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or soting order when your list record. 
+DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record. 
 DefaultCreateForm=Create forms
 DefaultSearchFilters=Search filters
 DefaultSortOrder=Sort orders
@@ -1535,7 +1540,6 @@ BankOrderGlobalDesc=General display order
 BankOrderES=Spanish
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
-
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 1589f378025..73c34f7101e 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -310,10 +310,6 @@ Paste=Paste
 Default=Default
 DefaultValue=Default value
 DefaultValues=Default values
-TheKeyIsTheNameOfHtmlField=The key is the name of the html field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter here the relative url of the page. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>.
-PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>.
 Price=Price
 UnitPrice=Unit price
 UnitPriceHT=Unit price (net)
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 5e015cd9f62..2174e6a5c55 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -29,10 +29,10 @@
 /**
  *	\file       htdocs/main.inc.php
  *	\ingroup	core
- *	\brief      File that defines environment for Dolibarr pages only (variables not required by scripts)
+ *	\brief      File that defines environment for Dolibarr GUI pages only (file not required by scripts)
  */
 
-//@ini_set('memory_limit', '64M');	// This may be useless if memory is hard limited by your PHP
+//@ini_set('memory_limit', '128M');	// This may be useless if memory is hard limited by your PHP
 
 // For optional tuning. Enabled if environment variable MAIN_SHOW_TUNING_INFO is defined.
 $micro_start_time=0;
@@ -48,7 +48,7 @@ if (! empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
 }
 
 // Removed magic_quotes
-if (function_exists('get_magic_quotes_gpc'))	// magic_quotes_* removed in PHP6
+if (function_exists('get_magic_quotes_gpc'))	// magic_quotes_* deprecated in PHP 5.0 and removed in PHP 5.5
 {
     if (get_magic_quotes_gpc())
     {
@@ -172,7 +172,7 @@ if (! empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6)
 // Include the conf.php and functions.lib.php
 require_once 'filefunc.inc.php';
 
-// If there is a POST parameter to tell to save automatically some POST parameters into a cookies, we do it
+// If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it
 if (! empty($_POST["DOL_AUTOSET_COOKIE"]))
 {
 	$tmpautoset=explode(':',$_POST["DOL_AUTOSET_COOKIE"],2);
@@ -198,7 +198,7 @@ $sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
 if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
 session_name($sessionname);
 session_start();
-if (ini_get('register_globals'))    // To solve bug in using $_SESSION
+if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
 {
     foreach ($_SESSION as $key=>$value)
     {
@@ -206,8 +206,7 @@ if (ini_get('register_globals'))    // To solve bug in using $_SESSION
     }
 }
 
-// Init the 5 global objects
-// This include will make the new and set properties for: $conf, $db, $langs, $user, $mysoc objects
+// Init the 5 global objects, this include will make the new and set properties for: $conf, $db, $langs, $user, $mysoc
 require_once 'master.inc.php';
 
 // Activate end of page function
@@ -735,7 +734,7 @@ if (! defined('NOLOGIN'))
     }
 
     /*
-     * Overwrite configs global by personal configs
+     * Overwrite configs global by personal configs (Note: Some conf->global personal vars were overwrote by the user->fetch)
      */
 
     // Set liste_limit
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 80fc5d9a1d4..ebb99eb9807 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -114,7 +114,7 @@ if (! defined('NOREQUIRESOC'))  require_once DOL_DOCUMENT_ROOT .'/societe/class/
  */
 if (! defined('NOREQUIRETRAN'))
 {
-	$langs = new Translate('',$conf);	// A mettre apres lecture de la conf
+	$langs = new Translate('',$conf);	// Must be after reading conf
 }
 
 /*
@@ -180,7 +180,7 @@ if (! defined('NOREQUIREDB'))
 
 	//print "Will work with data into entity instance number '".$conf->entity."'";
 
-	// Here we read database (llx_const table) and define $conf->global->XXX var.
+	// Here we read database (llx_const table and llx_default_values) and define $conf->global->XXX var.
 	$conf->setValues($db);
 }
 
@@ -258,7 +258,3 @@ $hookmanager=new HookManager($db);
 
 if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR','NPR');
 
-
-// We force FPDF
-if (! empty($dolibarr_pdf_force_fpdf)) $conf->global->MAIN_USE_FPDF=$dolibarr_pdf_force_fpdf;
-

From 4818b1ba44ed68f9df7fc4202e3041e9843ed89d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 12:39:11 +0200
Subject: [PATCH 0601/1163] Load default values into $user->default_values

---
 htdocs/admin/defaultvalues.php   |  1 -
 htdocs/user/class/user.class.php | 35 ++++++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 266ebac9100..0bc620c41bf 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -259,7 +259,6 @@ if ($result)
 {
 	$num = $db->num_rows($result);
 	$i = 0;
-	$var=false;
 
 	while ($i < $num)
 	{
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 594c7e090d6..ac03847583d 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -104,16 +104,17 @@ class User extends CommonObject
 	public $lang;
 
 	public $rights;                        // Array of permissions user->rights->permx
-	public $all_permissions_are_loaded;	/**< \private all_permissions_are_loaded */
-	private $_tab_loaded=array();		// Array of cache of already loaded permissions
-	public $nb_rights;			// Number of rights granted to the user
-
+	public $all_permissions_are_loaded;	   // All permission are loaded
+	public $nb_rights;			           // Number of rights granted to the user
+	private $_tab_loaded=array();		   // Cache array of already loaded permissions
+	
 	public $conf;           		// To store personal config
-	var $oldcopy;                	// To contains a clone of this when we need to save old properties of object
-
+	public $default_values;         // To store default values for user
+	
 	public $users;					// To store all tree of users hierarchy
 	public $parentof;				// To store an array of all parents for all ids.
-
+	private $cache_childids;
+	
 	public $accountancy_code;			// Accountancy code in prevision of the complete accountancy module
 
 	public $thm;					// Average cost of employee - Used for valuation of time spent
@@ -127,7 +128,6 @@ class User extends CommonObject
 
 	public $dateemployment;			// Define date of employment by company
 
-	private $cache_childids;
 
 
 	/**
@@ -339,6 +339,7 @@ class User extends CommonObject
 		// To get back the global configuration unique to the user
 		if ($loadpersonalconf)
 		{
+		    // Load user->conf for user
 			$sql = "SELECT param, value FROM ".MAIN_DB_PREFIX."user_param";
 			$sql.= " WHERE fk_user = ".$this->id;
 			$sql.= " AND entity = ".$conf->entity;
@@ -362,6 +363,24 @@ class User extends CommonObject
 				$this->error=$this->db->error();
 				return -2;
 			}
+			
+			// Load user->default_values for user. TODO Save this in memcached ?
+			$sql = "SELECT rowid, entity, type, page, param, value";
+			$sql.= " FROM ".MAIN_DB_PREFIX."default_values";
+			$sql.= " WHERE entity IN (".$this->entity.",".$conf->entity.")";
+			$sql.= " AND user_id IN (0, ".$this->id.")";
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+			    while ($obj = $this->db->fetch_object($resql))
+			    {
+			        if (! empty($obj->page) && ! empty($obj->type) && ! empty($obj->param)) 
+			        {
+			            $user->default_values[$obj->page][$obj->type][$obj->param]=$obj->value;
+			        }
+			    }
+			    $this->db->free($resql);
+			}
 		}
 
 		return 1;

From aabfc2f0db3a1eebcc1311f33bd66de4dda0300c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 12:52:32 +0200
Subject: [PATCH 0602/1163] Perf. Do not load personal conf of user by default.

---
 htdocs/main.inc.php              |  8 ++++----
 htdocs/user/class/user.class.php | 11 ++++++++---
 htdocs/user/param_ihm.php        |  6 ++++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2174e6a5c55..f5acdeac02b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -522,7 +522,7 @@ if (! defined('NOLOGIN'))
             exit;
         }
 
-        $resultFetchUser=$user->fetch('', $login, '', 1, ($entitytotest ? $entitytotest : -1));
+        $resultFetchUser=$user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
         if ($resultFetchUser <= 0)
         {
             dol_syslog('User not found, connexion refused');
@@ -579,7 +579,7 @@ if (! defined('NOLOGIN'))
         $entity=$_SESSION["dol_entity"];
         dol_syslog("This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
-        $resultFetchUser=$user->fetch('',$login,'',1,($entity > 0 ? $entity : -1));
+        $resultFetchUser=$user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
         if ($resultFetchUser <= 0)
         {
             // Account has been removed after login
@@ -734,11 +734,11 @@ if (! defined('NOLOGIN'))
     }
 
     /*
-     * Overwrite configs global by personal configs (Note: Some conf->global personal vars were overwrote by the user->fetch)
+     * Overwrite some configs globals (try to avoid this and have code to use instead $user->conf->xxx)
      */
 
     // Set liste_limit
-    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;		// Can be 0
+    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;	// Can be 0
     if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;	// Can be 0
 
     // Replace conf->css by personalized value if theme not forced
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index ac03847583d..a3006d6ebcd 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -164,11 +164,11 @@ class User extends CommonObject
 	 *	@param	int		$id		       		If defined, id to used for search
 	 * 	@param  string	$login       		If defined, login to used for search
 	 *	@param  string	$sid				If defined, sid to used for search
-	 * 	@param	int		$loadpersonalconf	1=also load personal conf of user (in $user->conf->xxx)
+	 * 	@param	int		$loadpersonalconf	1=also load personal conf of user (in $user->conf->xxx), 0=do not load personal conf.
 	 *  @param  int     $entity             If a value is >= 0, we force the search on a specific entity. If -1, means search depens on default setup.
 	 * 	@return	int							<0 if KO, 0 not found, >0 if OK
 	 */
-	function fetch($id='', $login='',$sid='',$loadpersonalconf=1, $entity=-1)
+	function fetch($id='', $login='', $sid='', $loadpersonalconf=0, $entity=-1)
 	{
 		global $conf, $user;
 
@@ -360,7 +360,7 @@ class User extends CommonObject
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error=$this->db->lasterror();
 				return -2;
 			}
 			
@@ -381,6 +381,11 @@ class User extends CommonObject
 			    }
 			    $this->db->free($resql);
 			}
+			else
+			{
+				$this->error=$this->db->lasterror();
+				return -3;
+			}
 		}
 
 		return 1;
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 0441ede1563..0208046c482 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010-2015 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013	   Florian Henry        <florian.henry@open-concept.pro.com>
  *
@@ -65,7 +65,7 @@ $dirleft = "../core/menus/standard";
 
 // Charge utilisateur edite
 $object = new User($db);
-$object->fetch($id);
+$object->fetch($id, '', '', 1);
 $object->getrights();
 
 // Liste des zone de recherche permanentes supportees
@@ -81,9 +81,11 @@ $formadmin=new FormAdmin($db);
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('usercard','globalcard'));
 
+
 /*
  * Actions
  */
+
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

From c52f4644e18122c5302073099b9d65d20d849882 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 13:00:39 +0200
Subject: [PATCH 0603/1163] Look and feel v6

---
 htdocs/user/agenda_extsites.php |  2 +-
 htdocs/user/bank.php            | 24 ++++++++++++++----------
 htdocs/user/clicktodial.php     |  4 +++-
 htdocs/user/param_ihm.php       |  2 +-
 htdocs/user/perms.php           |  2 +-
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 0942bbf7ed8..a3288e99c26 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -151,7 +151,7 @@ print '<input type="hidden" name="id" value="'.$id.'">';
 
 $head=user_prepare_head($object);
 
-dol_fiche_head($head, 'extsites', $langs->trans("User"), 0, 'user');
+dol_fiche_head($head, 'extsites', $langs->trans("User"), -1, 'user');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 63cdacf958d..2fe30d6e9f8 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -131,7 +131,7 @@ if ($id && $action == 'create' && $user->rights->user->user->creer)
 if ($id && $action != 'edit')
 {
 	$title = $langs->trans("User");
-	dol_fiche_head($head, 'bank', $title, 0, 'user');
+	dol_fiche_head($head, 'bank', $title, -1, 'user');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
 	
@@ -232,14 +232,14 @@ if ($id && $action == 'edit' && $user->rights->user->user->creer)
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
 	
-    dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
+    dol_banner_tab($object, 'id', $linkback,$user->rights->user->user->lire || $user->admin);
         
-    print '<div class="fichecenter">';
+    //print '<div class="fichecenter">';
     
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-    print '<tr><td valign="top" width="35%" class="fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+    print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
     print '<td colspan="4"><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>';
 
     print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
@@ -271,29 +271,29 @@ if ($id && $action == 'edit' && $user->rights->user->user->creer)
 	}
 
     // IBAN
-    print '<tr><td class="tdtop fieldrequired">'.$langs->trans("IBAN").'</td>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("IBAN").'</td>';
     print '<td colspan="4"><input size="30" type="text" name="iban" value="'.$account->iban.'"></td></tr>';
 
-    print '<tr><td class="tdtop fieldrequired">'.$langs->trans("BIC").'</td>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("BIC").'</td>';
     print '<td colspan="4"><input size="12" type="text" name="bic" value="'.$account->bic.'"></td></tr>';
 
     print '<tr><td class="tdtop">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
-    print '<textarea name="domiciliation" rows="4" cols="40">';
+    print '<textarea name="domiciliation" rows="4" class="quatrevingtpercent">';
     print $account->domiciliation;
     print "</textarea></td></tr>";
 
-    print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwner").'</td>';
+    print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
     print '<td colspan="4"><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>';
     print "</td></tr>\n";
 
     print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
-    print "<textarea name=\"owner_address\" rows=\"4\" cols=\"40\">";
+    print '<textarea name="owner_address" rows="4" class="quatrevingtpercent">';
     print $account->owner_address;
     print "</textarea></td></tr>";
 
     print '</table>';
 
-    print '</div>';
+    //print '</div>';
     
     dol_fiche_end();
 
@@ -304,6 +304,10 @@ if ($id && $action == 'edit' && $user->rights->user->user->creer)
     print '</div>';
 }
 
+if ($id && $action == 'edit' && $user->rights->user->user->creer) print '</form>';
+
+if ($id && $action == 'edit' && $user->rights->user->user->creer) print '</form>';
+    
 llxFooter();
 
 $db->close();
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index cb1e9f875aa..c7a36777699 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -96,12 +96,13 @@ if ($id > 0)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="update">';
 	
-	dol_fiche_head($head, 'clicktodial', $title, 0, 'user');
+	dol_fiche_head($head, 'clicktodial', $title, -1, 'user');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
 	
     dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
 	
+    print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
     
     // Edit mode
@@ -193,6 +194,7 @@ if ($id > 0)
         print '</div>';
     }    
     
+    print '</div>';
     print '</form>';
     
     /*
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 0208046c482..0348eb0e288 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -295,7 +295,7 @@ if ($action == 'edit')
 }
 else
 {
-    dol_fiche_head($head, 'guisetup', $title, 0, 'user');
+    dol_fiche_head($head, 'guisetup', $title, -1, 'user');
     
     $linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
     
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 95c3eb6c87f..55bdbbceff7 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -125,7 +125,7 @@ $form=new Form($db);
 $head = user_prepare_head($object);
 
 $title = $langs->trans("User");
-dol_fiche_head($head, 'rights', $title, 0, 'user');
+dol_fiche_head($head, 'rights', $title, -1, 'user');
 
 
 $db->begin();

From 846204bdb48d4cc8d02f7db9b38c815ed483ee04 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 13:02:29 +0200
Subject: [PATCH 0604/1163] Replace usage of $bc[$var] with class="oddeven"

---
 htdocs/adherents/admin/adherent.php      |  12 +--
 htdocs/adherents/admin/public.php        |   2 +-
 htdocs/admin/agenda_other.php            |  14 ++--
 htdocs/admin/barcode.php                 |   2 +-
 htdocs/admin/boxes.php                   |   4 +-
 htdocs/admin/chequereceipts.php          |   4 +-
 htdocs/admin/clicktodial.php             |   4 +-
 htdocs/admin/commande.php                |  18 ++--
 htdocs/admin/company.php                 | 102 +++++++++++------------
 htdocs/admin/const.php                   |   4 +-
 htdocs/admin/contract.php                |   8 +-
 htdocs/admin/dict.php                    |   4 +-
 htdocs/admin/expensereport.php           |   8 +-
 htdocs/admin/facture.php                 |  12 +--
 htdocs/admin/fichinter.php               |  10 +--
 htdocs/admin/geoipmaxmind.php            |   2 +-
 htdocs/admin/ldap.php                    |  24 +++---
 htdocs/admin/ldap_contacts.php           |  32 +++----
 htdocs/admin/ldap_groups.php             |  12 +--
 htdocs/admin/ldap_members.php            |  58 ++++++-------
 htdocs/admin/ldap_users.php              |  36 ++++----
 htdocs/admin/limits.php                  |  16 ++--
 htdocs/admin/livraison.php               |   6 +-
 htdocs/admin/mailing.php                 |   8 +-
 htdocs/admin/mails.php                   |  56 ++++++-------
 htdocs/admin/menus.php                   |   6 +-
 htdocs/admin/notification.php            |   2 +-
 htdocs/admin/payment.php                 |   6 +-
 htdocs/admin/pdf.php                     |  52 ++++++------
 htdocs/admin/prelevement.php             |   2 +-
 htdocs/admin/propal.php                  |  16 ++--
 htdocs/admin/security.php                |   2 +-
 htdocs/admin/sms.php                     |  20 ++---
 htdocs/admin/supplier_invoice.php        |   6 +-
 htdocs/admin/supplier_order.php          |  12 +--
 htdocs/admin/supplier_payment.php        |   2 +-
 htdocs/admin/supplier_proposal.php       |  12 +--
 htdocs/admin/syslog.php                  |   2 +-
 htdocs/admin/system/browser.php          |  18 ++--
 htdocs/admin/system/dolibarr.php         |  56 ++++++-------
 htdocs/admin/system/filecheck.php        |   6 +-
 htdocs/admin/user.php                    |   2 +-
 htdocs/admin/usergroup.php               |   2 +-
 htdocs/bookmarks/admin/bookmark.php      |   2 +-
 htdocs/cashdesk/admin/cashdesk.php       |  16 ++--
 htdocs/comm/index.php                    |  20 ++---
 htdocs/comm/mailing/index.php            |   4 +-
 htdocs/comm/propal/index.php             |   2 +-
 htdocs/comm/prospect/index.php           |  12 +--
 htdocs/commande/index.php                |   4 +-
 htdocs/compta/bank/index.php             |   2 +-
 htdocs/compta/bank/transfer.php          |   2 +-
 htdocs/compta/deplacement/index.php      |   2 +-
 htdocs/compta/index.php                  |  20 ++---
 htdocs/compta/prelevement/index.php      |   6 +-
 htdocs/compta/sociales/card.php          |   2 +-
 htdocs/contrat/index.php                 |   2 +-
 htdocs/core/lib/company.lib.php          |   2 +-
 htdocs/core/lib/doleditor.lib.php        |   2 +-
 htdocs/don/admin/donation.php            |   4 +-
 htdocs/expedition/card.php               |   4 +-
 htdocs/expedition/index.php              |   4 +-
 htdocs/expedition/shipment.php           |   2 +-
 htdocs/expensereport/index.php           |   2 +-
 htdocs/exports/export.php                |   2 +-
 htdocs/exports/index.php                 |   2 +-
 htdocs/fichinter/index.php               |   2 +-
 htdocs/fourn/commande/index.php          |   2 +-
 htdocs/fourn/facture/card.php            |   4 +-
 htdocs/fourn/index.php                   |   4 +-
 htdocs/hrm/admin/admin_establishment.php |   2 +-
 htdocs/hrm/index.php                     |   6 +-
 htdocs/imports/import.php                |   4 +-
 htdocs/paybox/admin/paybox.php           |  22 ++---
 htdocs/paypal/admin/paypal.php           |  30 +++----
 htdocs/product/admin/product.php         |   4 +-
 htdocs/product/admin/product_tools.php   |   6 +-
 htdocs/product/index.php                 |   4 +-
 htdocs/product/stock/product.php         |   2 +-
 htdocs/projet/admin/project.php          |   8 +-
 htdocs/societe/admin/societe.php         |   4 +-
 htdocs/societe/index.php                 |   2 +-
 htdocs/societe/notify/card.php           |   8 +-
 htdocs/supplier_proposal/index.php       |   2 +-
 htdocs/user/notify/card.php              |  10 +--
 htdocs/user/param_ihm.php                |  12 +--
 86 files changed, 470 insertions(+), 470 deletions(-)

diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 3958e80964a..1169c379e59 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -133,7 +133,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="constname" value="ADHERENT_LOGIN_NOT_REQUIRED">';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("AdherentLoginRequired").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("AdherentLoginRequired").'</td><td>';
 print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1);
 print '</td><td align="center" width="80">';
 print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
@@ -146,7 +146,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="constname" value="ADHERENT_MAIL_REQUIRED">';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("AdherentMailRequired").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("AdherentMailRequired").'</td><td>';
 print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_MAIL_REQUIRED)?$conf->global->ADHERENT_MAIL_REQUIRED:0),1);
 print '</td><td align="center" width="80">';
 print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
@@ -159,7 +159,7 @@ print '<form action="adherent.php" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="constname" value="ADHERENT_DEFAULT_SENDINFOBYMAIL">';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("MemberSendInformationByMailByDefault").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("MemberSendInformationByMailByDefault").'</td><td>';
 print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?$conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL:0),1);
 print '</td><td align="center" width="80">';
 print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
@@ -172,7 +172,7 @@ print '<form action="adherent.php" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="constname" value="ADHERENT_BANK_USE">';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("MoreActionsOnSubscription").'</td>';
+print '<tr class="oddeven"><td>'.$langs->trans("MoreActionsOnSubscription").'</td>';
 $arraychoices=array('0'=>$langs->trans("None"));
 if (! empty($conf->banque->enabled)) $arraychoices['bankdirect']=$langs->trans("MoreActionBankDirect");
 if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $arraychoices['invoiceonly']=$langs->trans("MoreActionInvoiceOnly");
@@ -193,7 +193,7 @@ if ($conf->facture->enabled)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="constname" value="ADHERENT_VAT_FOR_SUBSCRIPTIONS">';
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
 	if (! empty($conf->banque->enabled))
 	{
 		print '<td>';
@@ -218,7 +218,7 @@ if ($conf->facture->enabled)
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="update">';
 		print '<input type="hidden" name="constname" value="ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS">';
-		print '<tr '.$bc[$var].'><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
+		print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
 		print '<td>';
 		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
 		print '</td><td align="center" width="80">';
diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 47ad7a00a97..74cd048de31 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -150,7 +150,7 @@ $var=true;
 // Allow public form
 $var=! $var;
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("EnablePublicSubscriptionForm");
 print '</td><td align="right">';
 print $form->selectyesno("MEMBER_ENABLE_PUBLIC",(! empty($conf->global->MEMBER_ENABLE_PUBLIC)?$conf->global->MEMBER_ENABLE_PUBLIC:0),1);
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 17f94ef30cb..6e0a62610aa 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -352,7 +352,7 @@ print '</tr>'."\n";
 
 // Manual or automatic
 
-print '<tr '.$bc[$var].'>'."\n";
+print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_USE_EVENT_TYPE").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
 print '<td align="right">'."\n";
@@ -371,7 +371,7 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
     
     print '<!-- AGENDA_USE_EVENT_TYPE_DEFAULT -->';
-    print '<tr '.$bc[$var].'>'."\n";
+    print '<tr class="oddeven">'."\n";
     print '<td>'.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").'</td>'."\n";
     print '<td align="center">&nbsp;</td>'."\n";
     print '<td align="right" class="nowrap">'."\n";
@@ -381,7 +381,7 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 
 // AGENDA_DEFAULT_FILTER_TYPE
 
-print '<tr '.$bc[$var].'>'."\n";
+print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
 print '<td align="right" class="nowrap">'."\n";
@@ -390,7 +390,7 @@ print '</td></tr>'."\n";
 
 // AGENDA_DEFAULT_FILTER_STATUS
 
-print '<tr '.$bc[$var].'>'."\n";
+print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
 print '<td align="right">'."\n";
@@ -399,7 +399,7 @@ print '</td></tr>'."\n";
 
 // AGENDA_DEFAULT_VIEW
 
-print '<tr '.$bc[$var].'>'."\n";
+print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_VIEW").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
 print '<td align="right">'."\n";
@@ -411,7 +411,7 @@ print '</td></tr>'."\n";
 if ($conf->global->MAIN_FEATURES_LEVEL > 0)
 {
     
-    print '<tr '.$bc[$var].'>'."\n";
+    print '<tr class="oddeven">'."\n";
     print '<td>'.$langs->trans('AGENDA_NOTIFICATION').'</td>'."\n";
     print '<td align="center">&nbsp;</td>'."\n";
     print '<td align="right">'."\n";
@@ -423,7 +423,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0)
         print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_NOTIFICATION">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
         print '</td></tr>'."\n";
     	
-        print '<tr '.$bc[$var].'>'."\n";
+        print '<tr class="oddeven">'."\n";
         print '<td>'.$langs->trans('AGENDA_NOTIFICATION_SOUND').'</td>'."\n";
         print '<td align="center">&nbsp;</td>'."\n";
         print '<td align="right">'."\n";
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index a5fb5ef8d69..db81c9a325f 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -215,7 +215,7 @@ if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
 
-		print '<tr '.$bc[$var].'><td width="100">';
+		print '<tr class="oddeven"><td width="100">';
 		print $obj->libelle;
 		print "</td><td>\n";
 		print $langs->trans('BarcodeDesc'.$obj->encoding);
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 72957aa77d3..c76c35dfdeb 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -354,7 +354,7 @@ foreach($boxtoadd as $box)
     }
 
     print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
-    print '<tr '.$bc[$var].'>'."\n";
+    print '<tr class="oddeven">'."\n";
     print '<td>'.img_object("",$logo).' '.$langs->transnoentitiesnoconv($box->boxlabel);
     if (! empty($box->class) && preg_match('/graph_/',$box->class)) print ' ('.$langs->trans("Graph").')';
     print '</td>'."\n";
@@ -480,7 +480,7 @@ print '</tr>';
 // Activate FileCache - Developement
 if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
     
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("EnableFileCache").'</td><td>';
+    print '<tr class="oddeven"><td width="35%">'.$langs->trans("EnableFileCache").'</td><td>';
     print $form->selectyesno('MAIN_ACTIVATE_FILECACHE',$conf->global->MAIN_ACTIVATE_FILECACHE,1);
     print '</td>';
     print '</tr>';
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index f319692f27d..3b205f49cd2 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -166,7 +166,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->isEnabled())
 						{
 							$var = !$var;
-							print '<tr '.$bc[$var].'><td width="100">';
+							print '<tr class="oddeven"><td width="100">';
 							print (empty($module->name)?$name:$module->name);
 							print "</td><td>\n";
 
@@ -257,7 +257,7 @@ $var=true;
 
 $var=! $var;
 
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeLegalTextOnChequeReceipts").' ('.$langs->trans("AddCRIfTooLong").')<br>';
 $variablename='BANK_CHEQUERECEIPT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 808471e3e6c..060c910753a 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -81,7 +81,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("ClickToDialUseTelLink").'</td><td>';
 print $form->selectyesno("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", $conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS, 1).'<br>';
 print '<br>';
@@ -89,7 +89,7 @@ print $langs->trans("ClickToDialUseTelLinkDesc");
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("DefaultLink").'</td><td>';
 print '<input style="width: 90%" type="text" name="CLICKTODIAL_URL"'.($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS?' disabled="disabled"':'').' value="'.$conf->global->CLICKTODIAL_URL.'"><br>';
 print '<br>';
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 65638ca1d77..a6ca7871ae4 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -331,7 +331,7 @@ foreach ($dirmodels as $reldir)
 					if ($module->isEnabled())
 					{
 						
-						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
 
@@ -471,7 +471,7 @@ foreach ($dirmodels as $reldir)
 	                        if ($modulequalified)
 	                        {
 	                            $var = !$var;
-	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print '<tr class="oddeven"><td width="100">';
 	                            print (empty($module->name)?$name:$module->name);
 	                            print "</td><td>\n";
 	                            if (method_exists($module,'info')) print $module->info($langs);
@@ -569,7 +569,7 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_ORDER_FREE_TEXT">';
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 $variablename='ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
@@ -592,7 +592,7 @@ print '</form>';
 print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_COMMANDE_DRAFT_WATERMARK\">";
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("WatermarkOnDraftOrders").'</td><td>';
 print '<input size="50" class="flat" type="text" name="COMMANDE_DRAFT_WATERMARK" value="'.$conf->global->COMMANDE_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
@@ -624,7 +624,7 @@ print '</tr>';
 if ($conf->banque->enabled)
 {
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp</td><td align="center">';
     if (! empty($conf->use_javascript_ajax))
     {
@@ -646,7 +646,7 @@ if ($conf->banque->enabled)
 else
 {
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
 
@@ -654,7 +654,7 @@ else
 if ($conf->stock->enabled)
 {
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").'</td><td>&nbsp</td><td align="center">';
     if (! empty($conf->use_javascript_ajax))
     {
@@ -676,7 +676,7 @@ if ($conf->stock->enabled)
 else
 {
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
 */
@@ -697,7 +697,7 @@ print '<td align="center" width="60"></td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'<br>';
 print '</td><td align="right">';
 print "</td></tr>\n";
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index ad25c3620c3..8c29fe67a1c 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -310,65 +310,65 @@ if ($action == 'edit' || $action == 'updateedit')
 
 	// Name
 	
-	print '<tr '.$bc[$var].'><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
+	print '<tr class="oddeven"><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
 	print '<input name="nom" id="name" class="minwidth200" value="'. ($conf->global->MAIN_INFO_SOCIETE_NOM?$conf->global->MAIN_INFO_SOCIETE_NOM:$_POST["nom"]) . '" autofocus="autofocus"></td></tr>'."\n";
 
 	// Addresse
 	
-	print '<tr '.$bc[$var].'><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
+	print '<tr class="oddeven"><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
 	print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_SOCIETE_ADDRESS?$conf->global->MAIN_INFO_SOCIETE_ADDRESS:$_POST["address"]) . '</textarea></td></tr>'."\n";
 
 	
-	print '<tr '.$bc[$var].'><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
+	print '<tr class="oddeven"><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
 	print '<input class="minwidth100" name="zipcode" id="zipcode" value="'. ($conf->global->MAIN_INFO_SOCIETE_ZIP?$conf->global->MAIN_INFO_SOCIETE_ZIP:$_POST["zipcode"]) . '"></td></tr>'."\n";
 
 	
-	print '<tr '.$bc[$var].'><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
+	print '<tr class="oddeven"><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
 	print '<input name="town" class="minwidth100" id="town" value="'. ($conf->global->MAIN_INFO_SOCIETE_TOWN?$conf->global->MAIN_INFO_SOCIETE_TOWN:$_POST["town"]) . '"></td></tr>'."\n";
 
 	// Country
 	
-	print '<tr '.$bc[$var].'><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
+	print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
 	//if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
 	print $form->select_country($mysoc->country_id,'country_id');
 	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 	print '</td></tr>'."\n";
 
 	
-	print '<tr '.$bc[$var].'><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
+	print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
 	$formcompany->select_departement($conf->global->MAIN_INFO_SOCIETE_STATE,$mysoc->country_code,'state_id');
 	print '</td></tr>'."\n";
 
 	
-	print '<tr '.$bc[$var].'><td><label for="currency">'.$langs->trans("CompanyCurrency").'</label></td><td>';
+	print '<tr class="oddeven"><td><label for="currency">'.$langs->trans("CompanyCurrency").'</label></td><td>';
 	print $form->selectCurrency($conf->currency,"currency");
 	print '</td></tr>'."\n";
 
 	
-	print '<tr '.$bc[$var].'><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
+	print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 	print '<input name="tel" id="phone" value="'. $conf->global->MAIN_INFO_SOCIETE_TEL . '"></td></tr>';
 	print '</td></tr>'."\n";
 
 	
-	print '<tr '.$bc[$var].'><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
+	print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
 	print '<input name="fax" id="fax" value="'. $conf->global->MAIN_INFO_SOCIETE_FAX . '"></td></tr>';
 	print '</td></tr>'."\n";
 
 	
-	print '<tr '.$bc[$var].'><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
+	print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
 	print '<input name="mail" id="email" class="minwidth200" value="'. $conf->global->MAIN_INFO_SOCIETE_MAIL . '"></td></tr>';
 	print '</td></tr>'."\n";
 
 	// Web
 	
-	print '<tr '.$bc[$var].'><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
+	print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
 	print '<input name="web" id="web" class="minwidth300" value="'. $conf->global->MAIN_INFO_SOCIETE_WEB . '"></td></tr>';
 	print '</td></tr>'."\n";
 
 	// Barcode
 	if (! empty($conf->barcode->enabled)) {
 		
-		print '<tr '.$bc[$var].'><td><label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
+		print '<tr class="oddeven"><td><label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
 		print '<input name="barcode" id="barcode" class="minwidth150" value="'. $conf->global->MAIN_INFO_SOCIETE_GENCOD . '"></td></tr>';
 		print '</td></tr>';
 	}
@@ -393,7 +393,7 @@ if ($action == 'edit' || $action == 'updateedit')
 
 	// Note
 	
-	print '<tr '.$bc[$var].'><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
+	print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
 	print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? $conf->global->MAIN_INFO_SOCIETE_NOTE : '').'</textarea></td></tr>';
 	print '</td></tr>';
 
@@ -410,17 +410,17 @@ if ($action == 'edit' || $action == 'updateedit')
 
 	// Managing Director(s)
 	
-	print '<tr '.$bc[$var].'><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
+	print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
 	print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" class="minwidth200" value="' . $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '"></td></tr>';
 
 	// Capital
 	
-	print '<tr '.$bc[$var].'><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
+	print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
 	print '<input name="capital" id="capital" class="minwidth100" value="' . $conf->global->MAIN_INFO_CAPITAL . '"></td></tr>';
 
 	// Juridical Status
 	
-	print '<tr '.$bc[$var].'><td><label for="forme_juridique_code">'.$langs->trans("JuridicalStatus").'</label></td><td>';
+	print '<tr class="oddeven"><td><label for="forme_juridique_code">'.$langs->trans("JuridicalStatus").'</label></td><td>';
 	if ($mysoc->country_code) {
 		print $formcompany->select_juridicalstatus($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE, $mysoc->country_code, '', 'forme_juridique_code');
 	} else {
@@ -432,7 +432,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	if ($langs->transcountry("ProfId1",$mysoc->country_code) != '-')
 	{
 		
-		print '<tr '.$bc[$var].'><td><label for="profid1">'.$langs->transcountry("ProfId1",$mysoc->country_code).'</label></td><td>';
+		print '<tr class="oddeven"><td><label for="profid1">'.$langs->transcountry("ProfId1",$mysoc->country_code).'</label></td><td>';
 		if (! empty($mysoc->country_code))
 		{
 			print '<input name="siren" id="profid1" class="minwidth200" value="' . (! empty($conf->global->MAIN_INFO_SIREN) ? $conf->global->MAIN_INFO_SIREN : '') . '">';
@@ -448,7 +448,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	if ($langs->transcountry("ProfId2",$mysoc->country_code) != '-')
 	{
 		
-		print '<tr '.$bc[$var].'><td><label for="profid2">'.$langs->transcountry("ProfId2",$mysoc->country_code).'</label></td><td>';
+		print '<tr class="oddeven"><td><label for="profid2">'.$langs->transcountry("ProfId2",$mysoc->country_code).'</label></td><td>';
 		if (! empty($mysoc->country_code))
 		{
 			print '<input name="siret" id="profid2" class="minwidth200" value="' . (! empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '' ) . '">';
@@ -464,7 +464,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	if ($langs->transcountry("ProfId3",$mysoc->country_code) != '-')
 	{
 		
-		print '<tr '.$bc[$var].'><td><label for="profid3">'.$langs->transcountry("ProfId3",$mysoc->country_code).'</label></td><td>';
+		print '<tr class="oddeven"><td><label for="profid3">'.$langs->transcountry("ProfId3",$mysoc->country_code).'</label></td><td>';
 		if (! empty($mysoc->country_code))
 		{
 			print '<input name="ape" id="profid3" class="minwidth200" value="' . (! empty($conf->global->MAIN_INFO_APE) ? $conf->global->MAIN_INFO_APE : '') . '">';
@@ -480,7 +480,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	if ($langs->transcountry("ProfId4",$mysoc->country_code) != '-')
 	{
 		
-		print '<tr '.$bc[$var].'><td><label for="profid4">'.$langs->transcountry("ProfId4",$mysoc->country_code).'</label></td><td>';
+		print '<tr class="oddeven"><td><label for="profid4">'.$langs->transcountry("ProfId4",$mysoc->country_code).'</label></td><td>';
 		if (! empty($mysoc->country_code))
 		{
 			print '<input name="rcs" id="profid4" class="minwidth200" value="' . (! empty($conf->global->MAIN_INFO_RCS) ? $conf->global->MAIN_INFO_RCS : '') . '">';
@@ -496,7 +496,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	if ($langs->transcountry("ProfId5",$mysoc->country_code) != '-')
 	{
 		
-		print '<tr '.$bc[$var].'><td><label for="profid5">'.$langs->transcountry("ProfId5",$mysoc->country_code).'</label></td><td>';
+		print '<tr class="oddeven"><td><label for="profid5">'.$langs->transcountry("ProfId5",$mysoc->country_code).'</label></td><td>';
 		if (! empty($mysoc->country_code))
 		{
 			print '<input name="MAIN_INFO_PROFID5" id="profid5" class="minwidth200" value="' . (! empty($conf->global->MAIN_INFO_PROFID5) ? $conf->global->MAIN_INFO_PROFID5 : '') . '">';
@@ -512,7 +512,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	if ($langs->transcountry("ProfId6",$mysoc->country_code) != '-')
 	{
 		
-		print '<tr '.$bc[$var].'><td><label for="profid6">'.$langs->transcountry("ProfId6",$mysoc->country_code).'</label></td><td>';
+		print '<tr class="oddeven"><td><label for="profid6">'.$langs->transcountry("ProfId6",$mysoc->country_code).'</label></td><td>';
 		if (! empty($mysoc->country_code))
 		{
 			print '<input name="MAIN_INFO_PROFID6" id="profid6" class="minwidth200" value="' . (! empty($conf->global->MAIN_INFO_PROFID6) ? $conf->global->MAIN_INFO_PROFID6 : '') . '">';
@@ -526,13 +526,13 @@ if ($action == 'edit' || $action == 'updateedit')
 
 	// TVA Intra
 	
-	print '<tr '.$bc[$var].'><td><label for="intra_vat">'.$langs->trans("VATIntra").'</label></td><td>';
+	print '<tr class="oddeven"><td><label for="intra_vat">'.$langs->trans("VATIntra").'</label></td><td>';
 	print '<input name="tva" id="intra_vat" class="minwidth200" value="' . (! empty($conf->global->MAIN_INFO_TVAINTRA) ? $conf->global->MAIN_INFO_TVAINTRA : '') . '">';
 	print '</td></tr>';
 	
 	// Object of the company
 	
-	print '<tr '.$bc[$var].'><td><label for="object">'.$langs->trans("CompanyObject").'</label></td><td>';
+	print '<tr class="oddeven"><td><label for="object">'.$langs->trans("CompanyObject").'</label></td><td>';
 	print '<textarea class="flat quatrevingtpercent" name="object" id="object" rows="'.ROWS_5.'">'.(! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? $conf->global->MAIN_INFO_SOCIETE_OBJECT : '').'</textarea></td></tr>';
 	print '</td></tr>';
 
@@ -548,7 +548,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	$var=true;
 
 	
-	print '<tr '.$bc[$var].'><td><label for="fiscalmonthstart">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
+	print '<tr class="oddeven"><td><label for="fiscalmonthstart">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
 	print $formother->select_month($conf->global->SOCIETE_FISCAL_MONTH_START,'fiscalmonthstart',0,1) . '</td></tr>';
 
 	print "</table>";
@@ -699,22 +699,22 @@ else
 	$var=true;
 
 	
-	print '<tr '.$bc[$var].'><td class="titlefield">'.$langs->trans("CompanyName").'</td><td>';
+	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("CompanyName").'</td><td>';
 	if (! empty($conf->global->MAIN_INFO_SOCIETE_NOM)) print $conf->global->MAIN_INFO_SOCIETE_NOM;
 	else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyName")).'</font>';
 	print '</td></tr>';
 
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyAddress").'</td><td>' . nl2br(empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS) . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CompanyAddress").'</td><td>' . nl2br(empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS) . '</td></tr>';
 
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyZip").'</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP) . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CompanyZip").'</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP) . '</td></tr>';
 
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyTown").'</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN) . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CompanyTown").'</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN) . '</td></tr>';
 
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyCountry").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CompanyCountry").'</td><td>';
 	if ($mysoc->country_code)
 	{
 		$img=picto_from_langcode($mysoc->country_code);
@@ -725,13 +725,13 @@ else
 	print '</td></tr>';
 
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("State").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("State").'</td><td>';
 	if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE)) print getState($conf->global->MAIN_INFO_SOCIETE_STATE);
 	else print '&nbsp;';
 	print '</td></tr>';
 
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyCurrency").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CompanyCurrency").'</td><td>';
 	print currency_name($conf->currency,1);
 	print ' ('.$conf->currency;
 	print ($conf->currency != $langs->getCurrencySymbol($conf->currency) ? ' - '.$langs->getCurrencySymbol($conf->currency) : '');
@@ -739,28 +739,28 @@ else
 	print '</td></tr>';
 
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("Phone").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_TEL,$mysoc->country_code) . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("Phone").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_TEL,$mysoc->country_code) . '</td></tr>';
 
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("Fax").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_FAX,$mysoc->country_code) . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("Fax").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_FAX,$mysoc->country_code) . '</td></tr>';
 
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("Mail").'</td><td>' . dol_print_email($conf->global->MAIN_INFO_SOCIETE_MAIL,0,0,0,80) . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("Mail").'</td><td>' . dol_print_email($conf->global->MAIN_INFO_SOCIETE_MAIL,0,0,0,80) . '</td></tr>';
 
 	// Web
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("Web").'</td><td>' . dol_print_url($conf->global->MAIN_INFO_SOCIETE_WEB,'_blank',80) . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("Web").'</td><td>' . dol_print_url($conf->global->MAIN_INFO_SOCIETE_WEB,'_blank',80) . '</td></tr>';
 
 	// Barcode
 	if (! empty($conf->barcode->enabled))
 	{
 		
-		print '<tr '.$bc[$var].'><td>'.$langs->trans("Gencod").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_GENCOD . '</td></tr>';
+		print '<tr class="oddeven"><td>'.$langs->trans("Gencod").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_GENCOD . '</td></tr>';
 	}
 
 	// Logo
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("Logo").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("Logo").'</td><td>';
 
 	$tagtd='tagtd ';
 	if ($conf->browser->layout == 'phone') $tagtd='';
@@ -786,7 +786,7 @@ else
 	print '</td></tr>';
 
 	
-	print '<tr '.$bc[$var].'><td class="tdtop">'.$langs->trans("Note").'</td><td>' . (! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? nl2br($conf->global->MAIN_INFO_SOCIETE_NOTE) : '') . '</td></tr>';
+	print '<tr class="oddeven"><td class="tdtop">'.$langs->trans("Note").'</td><td>' . (! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? nl2br($conf->global->MAIN_INFO_SOCIETE_NOTE) : '') . '</td></tr>';
 
 	print '</table>';
 
@@ -803,17 +803,17 @@ else
 
 	// Managing Director(s)
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("ManagingDirectors").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("ManagingDirectors").'</td><td>';
 	print $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '</td></tr>';
 
 	// Capital
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("Capital").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("Capital").'</td><td>';
 	print $conf->global->MAIN_INFO_CAPITAL . '</td></tr>';
 
 	// Juridical Status
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("JuridicalStatus").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("JuridicalStatus").'</td><td>';
 	print getFormeJuridiqueLabel($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE);
 	print '</td></tr>';
 
@@ -821,7 +821,7 @@ else
 	if ($langs->transcountry("ProfId1",$mysoc->country_code) != '-')
 	{
 		
-		print '<tr '.$bc[$var].'><td>'.$langs->transcountry("ProfId1",$mysoc->country_code).'</td><td>';
+		print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId1",$mysoc->country_code).'</td><td>';
 		if (! empty($conf->global->MAIN_INFO_SIREN))
 		{
 			print $conf->global->MAIN_INFO_SIREN;
@@ -837,7 +837,7 @@ else
 	if ($langs->transcountry("ProfId2",$mysoc->country_code) != '-')
 	{
 		
-		print '<tr '.$bc[$var].'><td>'.$langs->transcountry("ProfId2",$mysoc->country_code).'</td><td>';
+		print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId2",$mysoc->country_code).'</td><td>';
 		if (! empty($conf->global->MAIN_INFO_SIRET))
 		{
 			print $conf->global->MAIN_INFO_SIRET;
@@ -853,7 +853,7 @@ else
 	if ($langs->transcountry("ProfId3",$mysoc->country_code) != '-')
 	{
 		
-		print '<tr '.$bc[$var].'><td>'.$langs->transcountry("ProfId3",$mysoc->country_code).'</td><td>';
+		print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId3",$mysoc->country_code).'</td><td>';
 		if (! empty($conf->global->MAIN_INFO_APE))
 		{
 			print $conf->global->MAIN_INFO_APE;
@@ -869,7 +869,7 @@ else
 	if ($langs->transcountry("ProfId4",$mysoc->country_code) != '-')
 	{
 		
-		print '<tr '.$bc[$var].'><td>'.$langs->transcountry("ProfId4",$mysoc->country_code).'</td><td>';
+		print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId4",$mysoc->country_code).'</td><td>';
 		if (! empty($conf->global->MAIN_INFO_RCS))
 		{
 			print $conf->global->MAIN_INFO_RCS;
@@ -885,7 +885,7 @@ else
 	if ($langs->transcountry("ProfId5",$mysoc->country_code) != '-')
 	{
 		
-		print '<tr '.$bc[$var].'><td>'.$langs->transcountry("ProfId5",$mysoc->country_code).'</td><td>';
+		print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId5",$mysoc->country_code).'</td><td>';
 		if (! empty($conf->global->MAIN_INFO_PROFID5))
 		{
 			print $conf->global->MAIN_INFO_PROFID5;
@@ -901,7 +901,7 @@ else
 	if ($langs->transcountry("ProfId6",$mysoc->country_code) != '-')
 	{
 		
-		print '<tr '.$bc[$var].'><td>'.$langs->transcountry("ProfId6",$mysoc->country_code).'</td><td>';
+		print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId6",$mysoc->country_code).'</td><td>';
 		if (! empty($conf->global->MAIN_INFO_PROFID6))
 		{
 			print $conf->global->MAIN_INFO_PROFID6;
@@ -915,7 +915,7 @@ else
 
 	// VAT
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("VATIntra").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("VATIntra").'</td>';
 	print '<td>';
 	if (! empty($conf->global->MAIN_INFO_TVAINTRA))
 	{
@@ -952,7 +952,7 @@ else
 	print '</tr>';
 	
 	
-	print '<tr '.$bc[$var].'><td class="tdtop">'.$langs->trans("CompanyObject").'</td><td>' . (! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? nl2br($conf->global->MAIN_INFO_SOCIETE_OBJECT) : '') . '</td></tr>';
+	print '<tr class="oddeven"><td class="tdtop">'.$langs->trans("CompanyObject").'</td><td>' . (! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? nl2br($conf->global->MAIN_INFO_SOCIETE_OBJECT) : '') . '</td></tr>';
 
 	print '</table>';
 	print '</form>';
@@ -968,7 +968,7 @@ else
 	$var=true;
 
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("FiscalMonthStart").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("FiscalMonthStart").'</td><td>';
 	$monthstart=(! empty($conf->global->SOCIETE_FISCAL_MONTH_START)) ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1;
 	print dol_print_date(dol_mktime(12,0,0,$monthstart,1,2000,1),'%B','gm') . '</td></tr>';
 
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index c7b943625ae..7d7b8a8510c 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -197,7 +197,7 @@ print "</tr>\n";
 $var=false;
 print "\n";
 
-print '<tr '.$bc[$var].'><td><input type="text" class="flat" size="24" name="constname" value="'.$constname.'"></td>'."\n";
+print '<tr class="oddeven"><td><input type="text" class="flat" size="24" name="constname" value="'.$constname.'"></td>'."\n";
 print '<td>';
 print '<input type="text" class="flat" size="30" name="constvalue" value="'.$constvalue.'">';
 print '</td><td>';
@@ -251,7 +251,7 @@ if ($result)
 
 		print "\n";
 
-		print '<tr '.$bc[$var].'><td>'.$obj->name.'</td>'."\n";
+		print '<tr class="oddeven"><td>'.$obj->name.'</td>'."\n";
 
 		// Value
 		print '<td>';
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 043450bdda4..bc3ea402704 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -267,7 +267,7 @@ foreach ($dirmodels as $reldir)
 					if ($module->isEnabled())
 					{
 						
-						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
 
@@ -406,7 +406,7 @@ foreach ($dirmodels as $reldir)
 	                        if ($modulequalified)
 	                        {
 	                            $var = !$var;
-	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print '<tr class="oddeven"><td width="100">';
 	                            print (empty($module->name)?$name:$module->name);
 	                            print "</td><td>\n";
 	                            if (method_exists($module,'info')) print $module->info($langs);
@@ -503,7 +503,7 @@ print "</tr>\n";
 $var=true;
 
 $var=! $var;
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeLegalTextOnContracts").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 $variablename='CONTRACT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
@@ -520,7 +520,7 @@ print '</td></tr>'."\n";
 
 //Use draft Watermark
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("WatermarkOnDraftContractCards").'</td><td>';
 print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index d1a2709e221..df127ed1a91 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1571,13 +1571,13 @@ else
         	if ($showemptyline)
         	{
         		
-        		print '<tr '.$bc[$var].'><td width="30%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
+        		print '<tr class="oddeven"><td width="30%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
         		$showemptyline=0;
         	}
 
             
             $value=$tabname[$i];
-            print '<tr '.$bc[$var].'><td width="50%">';
+            print '<tr class="oddeven"><td width="50%">';
             if (! empty($tabcond[$i]))
             {
                 print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 746f7183123..eda3c6bd6ae 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -276,7 +276,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
 						
-						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
 
@@ -412,7 +412,7 @@ foreach ($dirmodels as $reldir)
 
 		    			if ($modulequalified)
 		    			{
-		    				print '<tr '.$bc[$var].'><td width="100">';
+		    				print '<tr class="oddeven"><td width="100">';
 		    				print (empty($module->name)?$name:$module->name);
 		    				print "</td><td>\n";
 		    				if (method_exists($module,'info')) print $module->info($langs);
@@ -506,7 +506,7 @@ print "</tr>\n";
 $var=true;
 
 $var=! $var;
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeLegalTextOnExpenseReports").' ('.$langs->trans("AddCRIfTooLong").')<br>';
 $variablename='EXPENSEREPORT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
@@ -523,7 +523,7 @@ print '</td></tr>'."\n";
 
 //Use draft Watermark
 
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("WatermarkOnDraftOrders").'<br>';
 print '<input size="50" class="flat" type="text" name="EXPENSEREPORT_DRAFT_WATERMARK" value="'.$conf->global->EXPENSEREPORT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 65f8f31dd0a..4e9b007ee14 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -339,7 +339,7 @@ foreach ($dirmodels as $reldir)
                         if ($module->isEnabled())
                         {
                             $var = !$var;
-                            print '<tr '.$bc[$var].'><td width="100">';
+                            print '<tr class="oddeven"><td width="100">';
                             echo preg_replace('/\-.*$/','',preg_replace('/mod_facture_/','',preg_replace('/\.php$/','',$file)));
                             print "</td><td>\n";
 
@@ -530,7 +530,7 @@ foreach ($dirmodels as $reldir)
 	                        if ($modulequalified)
 	                        {
 	                            $var = !$var;
-	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print '<tr class="oddeven"><td width="100">';
 	                            print (empty($module->name)?$name:$module->name);
 	                            print "</td><td>\n";
 	                            if (method_exists($module,'info')) print $module->info($langs);
@@ -724,7 +724,7 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="setforcedate" />';
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("ForceInvoiceDate");
 print '</td><td width="60" align="center">';
 print $form->selectyesno("forcedate",$conf->global->FAC_FORCE_DATE_VALIDATION,1);
@@ -737,7 +737,7 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_INVOICE_FREE_TEXT" />';
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeLegalTextOnInvoices").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 $variablename='INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
@@ -759,7 +759,7 @@ print '</form>';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_FACTURE_DRAFT_WATERMARK" />';
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("WatermarkOnDraftBill").'</td>';
 print '<td><input size="50" class="flat" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.$conf->global->FACTURE_DRAFT_WATERMARK.'" />';
 print '</td><td align="right">';
@@ -800,7 +800,7 @@ print '<td align="center" width="60"></td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'<br>';
 print '</td><td align="right">';
 print "</td></tr>\n";
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index cbcf925b907..6c73afcf8f5 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -311,7 +311,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
 						
-						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
 
@@ -447,7 +447,7 @@ foreach ($dirmodels as $reldir)
 
 		    			if ($modulequalified)
 		    			{
-		    				print '<tr '.$bc[$var].'><td width="100">';
+		    				print '<tr class="oddeven"><td width="100">';
 		    				print (empty($module->name)?$name:$module->name);
 		    				print "</td><td>\n";
 		    				if (method_exists($module,'info')) print $module->info($langs);
@@ -538,7 +538,7 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_FICHINTER_FREE_TEXT">';
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeLegalTextOnInterventions").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 $variablename='FICHINTER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
@@ -561,7 +561,7 @@ print '</form>';
 print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_FICHINTER_DRAFT_WATERMARK\">";
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("WatermarkOnDraftInterventionCards").'</td><td>';
 print '<input size="50" class="flat" type="text" name="FICHINTER_DRAFT_WATERMARK" value="'.$conf->global->FICHINTER_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
@@ -573,7 +573,7 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_FICHINTER_PRINT_PRODUCTS">';
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("PrintProductsOnFichinter").' ('.$langs->trans("PrintProductsOnFichinterDetails").')</td>';
 print '<td align="center"><input type="checkbox" name="FICHINTER_PRINT_PRODUCTS" ';
 if ($conf->global->FICHINTER_PRINT_PRODUCTS)
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 7626148b9da..5a69a356777 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -106,7 +106,7 @@ print '<td align="right"><input type="submit" class="button" value="'.$langs->tr
 print "</tr>\n";
 
 
-print '<tr '.$bc[$var].'><td width=\"50%\">'.$langs->trans("PathToGeoIPMaxmindCountryDataFile").'</td>';
+print '<tr class="oddeven"><td width=\"50%\">'.$langs->trans("PathToGeoIPMaxmindCountryDataFile").'</td>';
 print '<td colspan="2">';
 
 if ($geointernal) print 'Using geoip PHP internal functions. Value must be '.geoip_db_filename(GEOIP_COUNTRY_EDITION).' or '.geoip_db_filename(GEOIP_CITY_EDITION_REV1).'<br>';
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 5eeab2a2838..770d91d1d11 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -111,7 +111,7 @@ print "</tr>\n";
 
 // Synchro utilisateurs/groupes active
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPDnSynchroActive").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnSynchroActive").'</td><td>';
 $arraylist=array();
 $arraylist['0']=$langs->trans("No");
 $arraylist['ldap2dolibarr']=$langs->trans("LDAPToDolibarr");
@@ -128,7 +128,7 @@ print '</td></tr>';
 if (! empty($conf->societe->enabled))
 {
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPDnContactActive").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnContactActive").'</td><td>';
 	$arraylist=array();
 	$arraylist['0']=$langs->trans("No");
 	$arraylist['1']=$langs->trans("DolibarrToLDAP");
@@ -140,7 +140,7 @@ if (! empty($conf->societe->enabled))
 if (! empty($conf->adherent->enabled))
 {
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPDnMemberActive").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnMemberActive").'</td><td>';
 	$arraylist=array();
 	$arraylist['0']=$langs->trans("No");
 	$arraylist['1']=$langs->trans("DolibarrToLDAP");
@@ -157,7 +157,7 @@ print "</tr>\n";
 
 // Type
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("Type").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("Type").'</td><td>';
 $arraylist=array();
 $arraylist['activedirectory']='Active Directory';
 $arraylist['openldap']='OpenLdap';
@@ -167,7 +167,7 @@ print '</td><td>&nbsp;</td></tr>';
 
 // Version
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("Version").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("Version").'</td><td>';
 $arraylist=array();
 $arraylist['3']='Version 3';
 $arraylist['2']='Version 2';
@@ -176,21 +176,21 @@ print '</td><td>'.$langs->trans("LDAPServerProtocolVersion").'</td></tr>';
 
 // Serveur primaire
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("LDAPPrimaryServer").'</td><td>';
 print '<input size="25" type="text" name="host" value="'.$conf->global->LDAP_SERVER_HOST.'">';
 print '</td><td>'.$langs->trans("LDAPServerExample").'</td></tr>';
 
 // Serveur secondaire
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("LDAPSecondaryServer").'</td><td>';
 print '<input size="25" type="text" name="slave" value="'.$conf->global->LDAP_SERVER_HOST_SLAVE.'">';
 print '</td><td>'.$langs->trans("LDAPServerExample").'</td></tr>';
 
 // Port
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPServerPort").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPServerPort").'</td><td>';
 if (! empty($conf->global->LDAP_SERVER_PORT))
 {
   print '<input size="25" type="text" name="port" value="'.$conf->global->LDAP_SERVER_PORT.'">';
@@ -203,13 +203,13 @@ print '</td><td>'.$langs->trans("LDAPServerPortExample").'</td></tr>';
 
 // DNserver
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPServerDn").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPServerDn").'</td><td>';
 print '<input size="25" type="text" name="dn" value="'.$conf->global->LDAP_SERVER_DN.'">';
 print '</td><td>'.$langs->trans("LDAPServerDnExample").'</td></tr>';
 
 // Utiliser TLS
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPServerUseTLS").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPServerUseTLS").'</td><td>';
 $arraylist=array();
 $arraylist['0']=$langs->trans("No");
 $arraylist['1']=$langs->trans("Yes");
@@ -222,13 +222,13 @@ print "</tr>\n";
 
 // DNAdmin
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPAdminDn").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPAdminDn").'</td><td>';
 print '<input size="25" type="text" name="admin" value="'.$conf->global->LDAP_ADMIN_DN.'">';
 print '</td><td>'.$langs->trans("LDAPAdminDnExample").'</td></tr>';
 
 // Pass
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPPassword").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPPassword").'</td><td>';
 if (! empty($conf->global->LDAP_ADMIN_PASS))
 {
 	print '<input size="25" type="password" name="pass" value="'.$conf->global->LDAP_ADMIN_PASS.'">';// je le met en visible pour test
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index fdc25346863..27e32f8cd7c 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -126,7 +126,7 @@ print "</tr>\n";
 
 // DN Pour les contacts
 
-print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPContactDn").'</span></td><td>';
+print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPContactDn").'</span></td><td>';
 print '<input size="48" type="text" name="contactdn" value="'.$conf->global->LDAP_CONTACT_DN.'">';
 print '</td><td>'.$langs->trans("LDAPContactDnExample").'</td>';
 print '<td>&nbsp;</td>';
@@ -134,7 +134,7 @@ print '</tr>';
 
 // List of object class used to define attributes in structure
 
-print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPContactObjectClassList").'</span></td><td>';
+print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPContactObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_CONTACT_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPContactObjectClassListExample").'</td>';
 print '<td>&nbsp;</td>';
@@ -153,7 +153,7 @@ print "</tr>\n";
 
 // Common name
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFullname").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFullname").'</td><td>';
 print '<input size="25" type="text" name="fieldfullname" value="'.$conf->global->LDAP_CONTACT_FIELD_FULLNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFullnameExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIELD_FULLNAME"'.($conf->global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_FULLNAME?' checked':'')."></td>";
@@ -161,7 +161,7 @@ print '</tr>';
 
 // Name
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldName").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldname" value="'.$conf->global->LDAP_CONTACT_FIELD_NAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldNameExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIELD_NAME"'.($conf->global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_NAME?' checked':'')."></td>";
@@ -169,7 +169,7 @@ print '</tr>';
 
 // Firstname
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFirstName").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFirstName").'</td><td>';
 print '<input size="25" type="text" name="fieldfirstname" value="'.$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFirstNameExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIELD_FIRSTNAME"'.($conf->global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME?' checked':'')."></td>";
@@ -177,7 +177,7 @@ print '</tr>';
 
 // Company
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldCompany").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldCompany").'</td><td>';
 print '<input size="25" type="text" name="fieldcompany" value="'.$conf->global->LDAP_CONTACT_FIELD_COMPANY.'">';
 print '</td><td>'.$langs->trans("LDAPFieldCompanyExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIELD_COMPANY"'.($conf->global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_COMPANY?' checked':'')."></td>";
@@ -185,7 +185,7 @@ print '</tr>';
 
 // Mail
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldMail").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldMail").'</td><td>';
 print '<input size="25" type="text" name="fieldmail" value="'.$conf->global->LDAP_CONTACT_FIELD_MAIL.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMailExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value=">LDAP_CONTACT_FIELD_MAIL"'.($conf->global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_MAIL?' checked':'')."></td>";
@@ -193,7 +193,7 @@ print '</tr>';
 
 // Phone pro
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldPhone").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPhone").'</td><td>';
 print '<input size="25" type="text" name="fieldphone" value="'.$conf->global->LDAP_CONTACT_FIELD_PHONE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPhoneExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIELD_PHONE"'.($conf->global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_PHONE?' checked':'')."></td>";
@@ -201,7 +201,7 @@ print '</tr>';
 
 // Phone home
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldHomePhone").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldHomePhone").'</td><td>';
 print '<input size="25" type="text" name="fieldhomephone" value="'.$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldHomePhoneExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIELD_HOMEPHONE"'.($conf->global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE?' checked':'')."></td>";
@@ -209,7 +209,7 @@ print '</tr>';
 
 // Mobile
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldMobile").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldMobile").'</td><td>';
 print '<input size="25" type="text" name="fieldmobile" value="'.$conf->global->LDAP_CONTACT_FIELD_MOBILE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMobileExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIELD_MOBILE"'.($conf->global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_MOBILE?' checked':'')."></td>";
@@ -217,7 +217,7 @@ print '</tr>';
 
 // Skype
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldSkype").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldSkype").'</td><td>';
 print '<input size="25" type="text" name="fieldskype" value="'.$conf->global->LDAP_CONTACT_FIELD_SKYPE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldSkypeExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIELD_SKYPE"'.($conf->global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_SKYPE?' checked':'')."></td>";
@@ -225,7 +225,7 @@ print '</tr>';
 
 // Fax
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFax").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFax").'</td><td>';
 print '<input size="25" type="text" name="fieldfax" value="'.$conf->global->LDAP_CONTACT_FIELD_FAX.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFaxExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIELD_FAX"'.($conf->global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_FAX?' checked':'')."></td>";
@@ -233,7 +233,7 @@ print '</tr>';
 
 // Address
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldAddress").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldAddress").'</td><td>';
 print '<input size="25" type="text" name="fieldaddress" value="'.$conf->global->LDAP_CONTACT_FIELD_ADDRESS.'">';
 print '</td><td>'.$langs->trans("LDAPFieldAddressExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIELD_ADDRESS"'.($conf->global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_ADDRESS?' checked':'')."></td>";
@@ -241,7 +241,7 @@ print '</tr>';
 
 // ZIP
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldZip").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldZip").'</td><td>';
 print '<input size="25" type="text" name="fieldzip" value="'.$conf->global->LDAP_CONTACT_FIELD_ZIP.'">';
 print '</td><td>'.$langs->trans("LDAPFieldZipExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIELD_ZIP"'.($conf->global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_ZIP?' checked':'')."></td>";
@@ -249,7 +249,7 @@ print '</tr>';
 
 // TOWN
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldTown").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldTown").'</td><td>';
 print '<input size="25" type="text" name="fieldtown" value="'.$conf->global->LDAP_CONTACT_FIELD_TOWN.'">';
 print '</td><td>'.$langs->trans("LDAPFieldTownExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIELD_TOWN"'.($conf->global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_TOWN?' checked':'')."></td>";
@@ -257,7 +257,7 @@ print '</tr>';
 
 // COUNTRY
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldCountry").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldCountry").'</td><td>';
 print '<input size="25" type="text" name="fieldcountry" value="'.$conf->global->LDAP_CONTACT_FIELD_COUNTRY.'">';
 print '</td><td>&nbsp;</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_CONTACT_FIELD_COUNTRY"'.($conf->global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_COUNTRY?' checked':'')."></td>";
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 919ae1c0552..192b11bfd8d 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -117,7 +117,7 @@ print "</tr>\n";
 
 // DN pour les groupes
 
-print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPGroupDn").'</span></td><td>';
+print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPGroupDn").'</span></td><td>';
 print '<input size="48" type="text" name="group" value="'.$conf->global->LDAP_GROUP_DN.'">';
 print '</td><td>'.$langs->trans("LDAPGroupDnExample").'</td>';
 print '<td>&nbsp;</td>';
@@ -125,7 +125,7 @@ print '</tr>';
 
 // List of object class used to define attributes in structure
 
-print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPGroupObjectClassList").'</span></td><td>';
+print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPGroupObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_GROUP_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPGroupObjectClassListExample").'</td>';
 print '<td>&nbsp;</td>';
@@ -146,7 +146,7 @@ print "</tr>\n";
 
 // Common name
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldName").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldfullname" value="'.$conf->global->LDAP_GROUP_FIELD_FULLNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldCommonNameExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_GROUP_FIELD_FULLNAME"'.(($conf->global->LDAP_KEY_GROUPS && $conf->global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_FULLNAME)?' checked':'')."></td>";
@@ -154,7 +154,7 @@ print '</tr>';
 
 // Name
 /*
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldName").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldname" value="'.$conf->global->LDAP_GROUP_FIELD_NAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldNameExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="'.$conf->global->LDAP_GROUP_FIELD_NAME.'"'.($conf->global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_NAME?' checked':'')."></td>";
@@ -163,7 +163,7 @@ print '</tr>';
 
 // Description
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldDescription").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldDescription").'</td><td>';
 print '<input size="25" type="text" name="fielddescription" value="'.$conf->global->LDAP_GROUP_FIELD_DESCRIPTION.'">';
 print '</td><td>'.$langs->trans("LDAPFieldDescriptionExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_GROUP_FIELD_DESCRIPTION"'.(($conf->global->LDAP_KEY_GROUPS && $conf->global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_DESCRIPTION)?' checked':'')."></td>";
@@ -171,7 +171,7 @@ print '</tr>';
 
 // User group
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldGroupMembers").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldGroupMembers").'</td><td>';
 print '<input size="25" type="text" name="fieldgroupmembers" value="'.$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS.'">';
 print '</td><td>'.$langs->trans("LDAPFieldGroupMembersExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_GROUP_FIELD_GROUPMEMBERS"'.(($conf->global->LDAP_KEY_GROUPS && $conf->global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS)?' checked':'')."></td>";
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index ff09f233afd..8c7291c3dc4 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -143,7 +143,7 @@ print "</tr>\n";
 
 // DN Pour les adherents
 
-print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberDn").'</span></td><td>';
+print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberDn").'</span></td><td>';
 print '<input size="48" type="text" name="user" value="'.$conf->global->LDAP_MEMBER_DN.'">';
 print '</td><td>'.$langs->trans("LDAPMemberDnExample").'</td>';
 print '<td>&nbsp;</td>';
@@ -151,7 +151,7 @@ print '</tr>';
 
 // List of object class used to define attributes in structure
 
-print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberObjectClassList").'</span></td><td>';
+print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_MEMBER_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPMemberObjectClassListExample").'</td>';
 print '<td>&nbsp;</td>';
@@ -159,7 +159,7 @@ print '</tr>';
 
 // Filter, used to filter search
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFilterConnection").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFilterConnection").'</td><td>';
 print '<input size="48" type="text" name="filterconnection" value="'.$conf->global->LDAP_MEMBER_FILTER.'">';
 print '</td><td>'.$langs->trans("LDAPFilterConnectionExample").'</td>';
 print '<td></td>';
@@ -180,7 +180,7 @@ print "</tr>\n";
 
 // Common name
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFullname").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFullname").'</td><td>';
 print '<input size="25" type="text" name="fieldfullname" value="'.$conf->global->LDAP_MEMBER_FIELD_FULLNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFullnameExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD_FULLNAME"'.(($conf->global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_FULLNAME)?' checked':'')."></td>";
@@ -188,7 +188,7 @@ print '</tr>';
 
 // Name
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldName").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldname" value="'.$conf->global->LDAP_MEMBER_FIELD_NAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldNameExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD_NAME"'.(($conf->global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_NAME)?' checked':'')."></td>";
@@ -196,7 +196,7 @@ print '</tr>';
 
 // Firstname
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFirstName").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFirstName").'</td><td>';
 print '<input size="25" type="text" name="fieldfirstname" value="'.$conf->global->LDAP_MEMBER_FIELD_FIRSTNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFirstNameExample").'</td>';
 print '<td align="right">&nbsp;</td>';
@@ -204,7 +204,7 @@ print '</tr>';
 
 // Login unix
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldLoginUnix").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldLoginUnix").'</td><td>';
 print '<input size="25" type="text" name="fieldlogin" value="'.$conf->global->LDAP_MEMBER_FIELD_LOGIN.'">';
 print '</td><td>'.$langs->trans("LDAPFieldLoginExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD_LOGIN"'.(($conf->global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_LOGIN)?' checked':'')."></td>";
@@ -212,7 +212,7 @@ print '</tr>';
 
 // Login samba
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldLoginSamba").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldLoginSamba").'</td><td>';
 print '<input size="25" type="text" name="fieldloginsamba" value="'.$conf->global->LDAP_MEMBER_FIELD_LOGIN_SAMBA.'">';
 print '</td><td>'.$langs->trans("LDAPFieldLoginSambaExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD_LOGIN_SAMBA"'.(($conf->global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_LOGIN_SAMBA)?' checked':'')."></td>";
@@ -220,7 +220,7 @@ print '</tr>';
 
 // Password not crypted
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td><td>';
 print '<input size="25" type="text" name="fieldpassword" value="'.$conf->global->LDAP_MEMBER_FIELD_PASSWORD.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPasswordExample").'</td>';
 print '<td align="right">&nbsp;</td>';
@@ -228,7 +228,7 @@ print '</tr>';
 
 // Password crypted
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldPasswordCrypted").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPasswordCrypted").'</td><td>';
 print '<input size="25" type="text" name="fieldpasswordcrypted" value="'.$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPasswordExample").'</td>';
 print '<td align="right">&nbsp;</td>';
@@ -236,7 +236,7 @@ print '</tr>';
 
 // Mail
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldMail").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldMail").'</td><td>';
 print '<input size="25" type="text" name="fieldmail" value="'.$conf->global->LDAP_MEMBER_FIELD_MAIL.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMailExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_MEMBER_FIELD_MAIL"'.(($conf->global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_MAIL)?' checked':'')."></td>";
@@ -244,7 +244,7 @@ print '</tr>';
 
 // Phone pro
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldPhone").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPhone").'</td><td>';
 print '<input size="25" type="text" name="fieldphone" value="'.$conf->global->LDAP_MEMBER_FIELD_PHONE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPhoneExample").'</td>';
 print '<td align="right">&nbsp;</td>';
@@ -252,7 +252,7 @@ print '</tr>';
 
 // Phone perso
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldHomePhone").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldHomePhone").'</td><td>';
 print '<input size="25" type="text" name="fieldphoneperso" value="'.$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO.'">';
 print '</td><td>'.$langs->trans("LDAPFieldHomePhoneExample").'</td>';
 print '<td align="right">&nbsp;</td>';
@@ -260,7 +260,7 @@ print '</tr>';
 
 // Mobile
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldMobile").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldMobile").'</td><td>';
 print '<input size="25" type="text" name="fieldmobile" value="'.$conf->global->LDAP_MEMBER_FIELD_MOBILE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMobileExample").'</td>';
 print '<td align="right">&nbsp;</td>';
@@ -268,7 +268,7 @@ print '</tr>';
 
 // Skype
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldSkype").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldSkype").'</td><td>';
 print '<input size="25" type="text" name="fieldskype" value="'.$conf->global->LDAP_MEMBER_FIELD_SKYPE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldSkypeExample").'</td>';
 print '<td align="right">&nbsp;</td>';
@@ -276,7 +276,7 @@ print '</tr>';
 
 // Fax
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFax").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFax").'</td><td>';
 print '<input size="25" type="text" name="fieldfax" value="'.$conf->global->LDAP_MEMBER_FIELD_FAX.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFaxExample").'</td>';
 print '<td align="right">&nbsp;</td>';
@@ -284,7 +284,7 @@ print '</tr>';
 
 // Address
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldAddress").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldAddress").'</td><td>';
 print '<input size="25" type="text" name="fieldaddress" value="'.$conf->global->LDAP_MEMBER_FIELD_ADDRESS.'">';
 print '</td><td>'.$langs->trans("LDAPFieldAddressExample").'</td>';
 print '<td align="right">&nbsp;</td>';
@@ -292,7 +292,7 @@ print '</tr>';
 
 // ZIP
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldZip").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldZip").'</td><td>';
 print '<input size="25" type="text" name="fieldzip" value="'.$conf->global->LDAP_MEMBER_FIELD_ZIP.'">';
 print '</td><td>'.$langs->trans("LDAPFieldZipExample").'</td>';
 print '<td align="right">&nbsp;</td>';
@@ -300,7 +300,7 @@ print '</tr>';
 
 // TOWN
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldTown").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldTown").'</td><td>';
 print '<input size="25" type="text" name="fieldtown" value="'.$conf->global->LDAP_MEMBER_FIELD_TOWN.'">';
 print '</td><td>'.$langs->trans("LDAPFieldTownExample").'</td>';
 print '<td align="right">&nbsp;</td>';
@@ -308,7 +308,7 @@ print '</tr>';
 
 // COUNTRY
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldCountry").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldCountry").'</td><td>';
 print '<input size="25" type="text" name="fieldcountry" value="'.$conf->global->LDAP_MEMBER_FIELD_COUNTRY.'">';
 print '</td><td>&nbsp;</td>';
 print '<td align="right">&nbsp;</td>';
@@ -316,7 +316,7 @@ print '</tr>';
 
 // Description
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldDescription").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldDescription").'</td><td>';
 print '<input size="25" type="text" name="fielddescription" value="'.$conf->global->LDAP_MEMBER_FIELD_DESCRIPTION.'">';
 print '</td><td>'.$langs->trans("LDAPFieldDescriptionExample").'</td>';
 print '<td align="right">&nbsp;</td>';
@@ -324,7 +324,7 @@ print '</tr>';
 
 // Public Note
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldNotePublic").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldNotePublic").'</td><td>';
 print '<input size="25" type="text" name="fieldnotepublic" value="'.$conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC.'">';
 print '</td><td>'.$langs->trans("LDAPFieldNotePublicExample").'</td>';
 print '<td align="right">&nbsp;</td>';
@@ -332,7 +332,7 @@ print '</tr>';
 
 // Birthday
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldBirthdate").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldBirthdate").'</td><td>';
 print '<input size="25" type="text" name="fieldbirthdate" value="'.$conf->global->LDAP_MEMBER_FIELD_BIRTHDATE.'">';
 print '</td><td>&nbsp;</td>';
 print '<td align="right">&nbsp;</td>';
@@ -340,7 +340,7 @@ print '</tr>';
 
 // Status
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldStatus").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldStatus").'</td><td>';
 print '<input size="25" type="text" name="fieldstatus" value="'.$conf->global->LDAP_FIELD_MEMBER_STATUS.'">';
 print '</td><td>&nbsp;</td>';
 print '<td align="right">&nbsp;</td>';
@@ -348,7 +348,7 @@ print '</tr>';
 
 // First subscription date
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFirstSubscriptionDate").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFirstSubscriptionDate").'</td><td>';
 print '<input size="25" type="text" name="fieldfirstsubscriptiondate" value="'.$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE.'">';
 print '</td><td>&nbsp;</td>';
 print '<td align="right">&nbsp;</td>';
@@ -356,7 +356,7 @@ print '</tr>';
 
 // First subscription amount
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFirstSubscriptionAmount").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFirstSubscriptionAmount").'</td><td>';
 print '<input size="25" type="text" name="fieldfirstsubscriptionamount" value="'.$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT.'">';
 print '</td><td>&nbsp;</td>';
 print '<td align="right">&nbsp;</td>';
@@ -364,7 +364,7 @@ print '</tr>';
 
 // Last subscription date
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldLastSubscriptionDate").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldLastSubscriptionDate").'</td><td>';
 print '<input size="25" type="text" name="fieldlastsubscriptiondate" value="'.$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE.'">';
 print '</td><td>&nbsp;</td>';
 print '<td align="right">&nbsp;</td>';
@@ -372,7 +372,7 @@ print '</tr>';
 
 // Last subscription amount
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldLastSubscriptionAmount").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldLastSubscriptionAmount").'</td><td>';
 print '<input size="25" type="text" name="fieldlastsubscriptionamount" value="'.$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT.'">';
 print '</td><td>&nbsp;</td>';
 print '<td align="right">&nbsp;</td>';
@@ -380,7 +380,7 @@ print '</tr>';
 
 // End last subscriptions
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldEndLastSubscription").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldEndLastSubscription").'</td><td>';
 print '<input size="25" type="text" name="fieldendlastsubscription" value="'.$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION.'">';
 print '</td><td>&nbsp;</td>';
 print '<td align="right">&nbsp;</td>';
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index cc99edfe3a7..79f34001a63 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -130,7 +130,7 @@ print "</tr>\n";
 
 // DN Pour les utilisateurs
 
-print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPUserDn").'</span></td><td>';
+print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPUserDn").'</span></td><td>';
 print '<input size="48" type="text" name="user" value="'.$conf->global->LDAP_USER_DN.'">';
 print '</td><td>'.$langs->trans("LDAPUserDnExample").'</td>';
 print '<td>&nbsp;</td>';
@@ -138,7 +138,7 @@ print '</tr>';
 
 // List of object class used to define attributes in structure
 
-print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPUserObjectClassList").'</span></td><td>';
+print '<tr class="oddeven"><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPUserObjectClassList").'</span></td><td>';
 print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_USER_OBJECT_CLASS.'">';
 print '</td><td>'.$langs->trans("LDAPUserObjectClassListExample").'</td>';
 print '<td>&nbsp;</td>';
@@ -146,7 +146,7 @@ print '</tr>';
 
 // Filter, used to filter search
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFilterConnection").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFilterConnection").'</td><td>';
 print '<input size="48" type="text" name="filterconnection" value="'.$conf->global->LDAP_FILTER_CONNECTION.'">';
 print '</td><td>'.$langs->trans("LDAPFilterConnectionExample").'</td>';
 print '<td></td>';
@@ -165,7 +165,7 @@ print "</tr>\n";
 
 // Common name
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFullname").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFullname").'</td><td>';
 print '<input size="25" type="text" name="fieldfullname" value="'.$conf->global->LDAP_FIELD_FULLNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFullnameExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_FULLNAME"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_FULLNAME)?' checked':'')."></td>";
@@ -173,7 +173,7 @@ print '</tr>';
 
 // Name
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldName").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldName").'</td><td>';
 print '<input size="25" type="text" name="fieldname" value="'.$conf->global->LDAP_FIELD_NAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldNameExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_NAME"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_NAME)?' checked':'')."></td>";
@@ -181,7 +181,7 @@ print '</tr>';
 
 // Firstname
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFirstName").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFirstName").'</td><td>';
 print '<input size="25" type="text" name="fieldfirstname" value="'.$conf->global->LDAP_FIELD_FIRSTNAME.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFirstNameExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_FIRSTNAME"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_FIRSTNAME)?' checked':'')."></td>";
@@ -189,7 +189,7 @@ print '</tr>';
 
 // Login unix
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldLoginUnix").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldLoginUnix").'</td><td>';
 print '<input size="25" type="text" name="fieldlogin" value="'.$conf->global->LDAP_FIELD_LOGIN.'">';
 print '</td><td>'.$langs->trans("LDAPFieldLoginExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_LOGIN"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_LOGIN)?' checked':'')."></td>";
@@ -197,7 +197,7 @@ print '</tr>';
 
 // Login samba
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldLoginSamba").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldLoginSamba").'</td><td>';
 print '<input size="25" type="text" name="fieldloginsamba" value="'.$conf->global->LDAP_FIELD_LOGIN_SAMBA.'">';
 print '</td><td>'.$langs->trans("LDAPFieldLoginSambaExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_LOGIN_SAMBA"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_LOGIN_SAMBA)?' checked':'')."></td>";
@@ -205,7 +205,7 @@ print '</tr>';
 
 // Password not crypted
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td><td>';
 print '<input size="25" type="text" name="fieldpassword" value="'.$conf->global->LDAP_FIELD_PASSWORD.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPasswordExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_PASSWORD"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_PASSWORD)?' checked':'')."></td>";
@@ -213,7 +213,7 @@ print '</tr>';
 
 // Password crypted
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldPasswordCrypted").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPasswordCrypted").'</td><td>';
 print '<input size="25" type="text" name="fieldpasswordcrypted" value="'.$conf->global->LDAP_FIELD_PASSWORD_CRYPTED.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPasswordExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_PASSWORD_CRYPTED"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_PASSWORD_CRYPTED)?' checked':'')."></td>";
@@ -221,7 +221,7 @@ print '</tr>';
 
 // Mail
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldMail").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldMail").'</td><td>';
 print '<input size="25" type="text" name="fieldmail" value="'.$conf->global->LDAP_FIELD_MAIL.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMailExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_MAIL"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_MAIL)?' checked':'')."></td>";
@@ -229,7 +229,7 @@ print '</tr>';
 
 // Phone
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldPhone").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPhone").'</td><td>';
 print '<input size="25" type="text" name="fieldphone" value="'.$conf->global->LDAP_FIELD_PHONE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldPhoneExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_PHONE"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_PHONE)?' checked':'')."></td>";
@@ -237,7 +237,7 @@ print '</tr>';
 
 // Mobile
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldMobile").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldMobile").'</td><td>';
 print '<input size="25" type="text" name="fieldmobile" value="'.$conf->global->LDAP_FIELD_MOBILE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldMobileExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_MOBILE"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_MOBILE)?' checked':'')."></td>";
@@ -245,7 +245,7 @@ print '</tr>';
 
 // Skype
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldSkype").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldSkype").'</td><td>';
 print '<input size="25" type="text" name="fieldskype" value="'.$conf->global->LDAP_FIELD_SKYPE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldSkypeExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_SKYPE"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_SKYPE)?' checked':'')."></td>";
@@ -253,7 +253,7 @@ print '</tr>';
 
 // Fax
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldFax").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFax").'</td><td>';
 print '<input size="25" type="text" name="fieldfax" value="'.$conf->global->LDAP_FIELD_FAX.'">';
 print '</td><td>'.$langs->trans("LDAPFieldFaxExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_FAX"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_FAX)?' checked':'')."></td>";
@@ -261,7 +261,7 @@ print '</tr>';
 
 // Title
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldTitle").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldTitle").'</td><td>';
 print '<input size="25" type="text" name="fieldtitle" value="'.$conf->global->LDAP_FIELD_TITLE.'">';
 print '</td><td>'.$langs->trans("LDAPFieldTitleExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_TITLE"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_TITLE)?' checked':'')."></td>";
@@ -269,7 +269,7 @@ print '</tr>';
 
 // Note
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("Note").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("Note").'</td><td>';
 print '<input size="25" type="text" name="fielddescription" value="'.$conf->global->LDAP_FIELD_DESCRIPTION.'">';
 print '</td><td>'.$langs->trans("LDAPFieldDescriptionExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_DESCRIPTION"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_DESCRIPTION)?' checked':'')."></td>";
@@ -277,7 +277,7 @@ print '</tr>';
 
 // Sid
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldSid").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldSid").'</td><td>';
 print '<input size="25" type="text" name="fieldsid" value="'.$conf->global->LDAP_FIELD_SID.'">';
 print '</td><td>'.$langs->trans("LDAPFieldSidExample").'</td>';
 print '<td align="right"><input type="radio" name="key" value="LDAP_FIELD_SID"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_SID)?' checked':'')."></td>";
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 3dcefa65a11..1d4b5cee8d4 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -107,20 +107,20 @@ if ($action == 'edit')
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly"));
     print '</td><td><input class="flat" name="MAIN_MAX_DECIMALS_UNIT" size="3" value="' . $conf->global->MAIN_MAX_DECIMALS_UNIT . '"></td></tr>';
 
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
     print '</td><td><input class="flat" name="MAIN_MAX_DECIMALS_TOT" size="3" value="' . $conf->global->MAIN_MAX_DECIMALS_TOT . '"></td></tr>';
 
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td><td><input class="flat" name="MAIN_MAX_DECIMALS_SHOWN" size="3" value="' . $conf->global->MAIN_MAX_DECIMALS_SHOWN . '"></td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td><td><input class="flat" name="MAIN_MAX_DECIMALS_SHOWN" size="3" value="' . $conf->global->MAIN_MAX_DECIMALS_SHOWN . '"></td></tr>';
 
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
     print '</td><td><input class="flat" name="MAIN_ROUNDING_RULE_TOT" size="3" value="' . $conf->global->MAIN_ROUNDING_RULE_TOT . '"></td></tr>';
 
@@ -141,20 +141,20 @@ else
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly"));
     print '</td><td align="right">'.$conf->global->MAIN_MAX_DECIMALS_UNIT.'</td></tr>';
 
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
     print '</td><td align="right">'.$conf->global->MAIN_MAX_DECIMALS_TOT.'</td></tr>';
 
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td><td align="right">'.$conf->global->MAIN_MAX_DECIMALS_SHOWN.'</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td><td align="right">'.$conf->global->MAIN_MAX_DECIMALS_SHOWN.'</td></tr>';
 
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
     print '</td><td align="right">'.$conf->global->MAIN_ROUNDING_RULE_TOT.'</td></tr>';
 
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 10d86f1b373..281f1934296 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -259,7 +259,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
                         
-                        print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+                        print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
                         print $module->info();
                         print '</td>';
 
@@ -399,7 +399,7 @@ foreach ($dirmodels as $reldir)
 
 		    			if ($modulequalified)
 		    			{
-		    				print '<tr '.$bc[$var].'><td width="100">';
+		    				print '<tr class="oddeven"><td width="100">';
 		    				print (empty($module->name)?$name:$module->name);
 		    				print "</td><td>\n";
 		    				if (method_exists($module,'info')) print $module->info($langs);
@@ -483,7 +483,7 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_DELIVERY_FREE_TEXT">';
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeLegalTextOnDeliveryReceipts").' ('.$langs->trans("AddCRIfTooLong").')<br>';
 $variablename='DELIVERY_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index ebb49e8385e..972b7ee73a6 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -114,21 +114,21 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("MailingEMailFrom").'</td><td>';
 print '<input size="32" type="text" name="MAILING_EMAIL_FROM" value="'.$conf->global->MAILING_EMAIL_FROM.'">';
 if (!empty($conf->global->MAILING_EMAIL_FROM) && ! isValidEmail($conf->global->MAILING_EMAIL_FROM)) print ' '.img_warning($langs->trans("BadEMail"));
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("MailingEMailError").'</td><td>';
 print '<input size="32" type="text" name="MAILING_EMAIL_ERRORSTO" value="'.$conf->global->MAILING_EMAIL_ERRORSTO.'">';
 if (!empty($conf->global->MAILING_EMAIL_ERRORSTO) && ! isValidEmail($conf->global->MAILING_EMAIL_ERRORSTO)) print ' '.img_warning($langs->trans("BadEMail"));
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("MailingDelay").'</td><td>';
 print '<input size="32" type="text" name="MAILING_DELAY" value="'.$conf->global->MAILING_DELAY.'">';
 print '</td></tr>';
@@ -136,7 +136,7 @@ print '</td></tr>';
 // Constant to add salt into the unsubscribe and check read tag.
 // It is also used as a security key parameter.
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("ActivateCheckReadKey").'</td><td>';
 print '<input size="32" type="text" name="MAILING_EMAIL_UNSUBSCRIBE_KEY" id="MAILING_EMAIL_UNSUBSCRIBE_KEY" value="'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY.'">';
 if (! empty($conf->use_javascript_ajax)) print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 4bc7627ceca..219cd85c2fe 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -242,17 +242,17 @@ if ($action == 'edit')
 
 	// Disable
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>';
 	print $form->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1);
 	print '</td></tr>';
 
 	// Separator
 	
-	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
+	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// Method
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 
 	// SuperAdministrator access only
 	if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
@@ -271,7 +271,7 @@ if ($action == 'edit')
 
 	// Host server
 	
-	print '<tr '.$bc[$var].'><td>';
+	print '<tr class="oddeven"><td>';
 	if (! $conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
 	{
 		print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
@@ -304,7 +304,7 @@ if ($action == 'edit')
 
 	// Port
 	
-	print '<tr '.$bc[$var].'><td>';
+	print '<tr class="oddeven"><td>';
 	if (! $conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
 	{
 		print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
@@ -377,7 +377,7 @@ if ($action == 'edit')
 
 	// TLS
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
 		if (function_exists('openssl_open'))
@@ -391,7 +391,7 @@ if ($action == 'edit')
 
 	// STARTTLS
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
 		if (function_exists('openssl_open'))
@@ -405,11 +405,11 @@ if ($action == 'edit')
 
 	// Separator
 	
-	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
+	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 	
 	// From
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_EMAIL_FROM" size="32" value="' . (! empty($conf->global->MAIN_MAIL_EMAIL_FROM)?$conf->global->MAIN_MAIL_EMAIL_FROM:'');
 	print '"></td></tr>';
 
@@ -425,17 +425,17 @@ if ($action == 'edit')
 
     // Separator
     
-    print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
+    print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
     
 	// From
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_ERRORS_TO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_ERRORS_TO)?$conf->global->MAIN_MAIL_ERRORS_TO:'');
 	print '"></td></tr>';
 
 	// Autocopy to
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_AUTOCOPY_TO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)?$conf->global->MAIN_MAIL_AUTOCOPY_TO:'');
 	print '"></td></tr>';
 
@@ -466,15 +466,15 @@ else
 
 	// Disable
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_MAILS).'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_MAILS).'</td></tr>';
 
 	// Separator
 	
-	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
+	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// Method
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 	$text=$listofmethods[$conf->global->MAIN_MAIL_SENDMODE];
 	if (empty($text)) $text=$langs->trans("Undefined").img_warning();
 	print $text;
@@ -484,41 +484,41 @@ else
 	
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
-		print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
 	}
 	else
 	{
-		print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER",ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined")).'</td><td>'.(! empty($conf->global->MAIN_MAIL_SMTP_SERVER)?$conf->global->MAIN_MAIL_SMTP_SERVER:'').'</td></tr>';
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER",ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined")).'</td><td>'.(! empty($conf->global->MAIN_MAIL_SMTP_SERVER)?$conf->global->MAIN_MAIL_SMTP_SERVER:'').'</td></tr>';
 	}
 
 	// Port
 	
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
-		print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
 	}
 	else
 	{
-		print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT",ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined")).'</td><td>'.(! empty($conf->global->MAIN_MAIL_SMTP_PORT)?$conf->global->MAIN_MAIL_SMTP_PORT:'').'</td></tr>';
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT",ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined")).'</td><td>'.(! empty($conf->global->MAIN_MAIL_SMTP_PORT)?$conf->global->MAIN_MAIL_SMTP_PORT:'').'</td></tr>';
 	}
 
 	// SMTPS ID
 	
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
-		print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>';
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>';
 	}
 
 	// SMTPS PW
 	
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
-		print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./','*',$conf->global->MAIN_MAIL_SMTPS_PW).'</td></tr>';
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./','*',$conf->global->MAIN_MAIL_SMTPS_PW).'</td></tr>';
 	}
 
 	// TLS
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
 		if (function_exists('openssl_open'))
@@ -532,7 +532,7 @@ else
 
 	// STARTTLS
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
 		if (function_exists('openssl_open'))
@@ -546,11 +546,11 @@ else
 
 	// Separator
 	
-	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
+	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// From
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_EMAIL_FROM;
 	if (! empty($conf->global->MAIN_MAIL_EMAIL_FROM) && ! isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail"));
 	print '</td></tr>';
@@ -568,18 +568,18 @@ else
 
 	// Separator
 	
-	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
+	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
     // Errors To
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_ERRORS_TO;
 	if (! empty($conf->global->MAIN_MAIL_ERRORS_TO) && ! isValidEmail($conf->global->MAIN_MAIL_ERRORS_TO)) print img_warning($langs->trans("ErrorBadEMail"));
 	print '</td></tr>';
 
 	// Autocopy to
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 	print '<td>';
 	if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO))
 	{
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 506bc5fb2d8..ddfb4d0cd62 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -180,7 +180,7 @@ if ($action == 'edit')
 
 	// Menu top
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuManager").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuManager").'</td>';
 	print '<td>';
 	$formadmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirstandard, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled');
 	print '</td>';
@@ -191,7 +191,7 @@ if ($action == 'edit')
 
 	// Menu smartphone
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuSmartphoneManager").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuSmartphoneManager").'</td>';
 	print '<td>';
 	$formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled');
 	print '</td>';
@@ -218,7 +218,7 @@ else
 	print '</tr>';
 
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMenuManager").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuManager").'</td>';
 	print '<td>';
 	$filelib=preg_replace('/.php$/i','',(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED));
 	print $filelib;
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 9d75070a956..c82e64d48ea 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -136,7 +136,7 @@ print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("NotificationEMailFrom").'</td>';
 print '<td>';
 print '<input size="32" type="email" name="email_from" value="'.$conf->global->NOTIFICATION_EMAIL_FROM.'">';
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 93f7c301519..a5166ec69f2 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -177,7 +177,7 @@ foreach ($dirmodels as $reldir)
                         if ($module->isEnabled())
                         {
                             $var = !$var;
-                            print '<tr '.$bc[$var].'><td width="100">';
+                            print '<tr class="oddeven"><td width="100">';
                             echo preg_replace('/\-.*$/','',preg_replace('/mod_payment_/','',preg_replace('/\.php$/','',$file)));
                             print "</td><td>\n";
 
@@ -263,7 +263,7 @@ print "</tr>\n";
 
 // Allow payments on different thirdparties bills but same parent company
 $var=! $var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("PaymentOnDifferentThirdBills");
 print '</td><td width="60" align="center">';
 print $form->selectyesno("FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS",$conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS,1);
@@ -273,7 +273,7 @@ print "</td></tr>\n";
 // Add js auto fill amount on paiement form
 /* always on now
 $var=! $var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("JSOnPaimentBill");
 print '</td><td width="60" align="center">';
 print $form->selectyesno("INVOICE_AUTO_FILLJS",$conf->global->INVOICE_AUTO_FILLJS,1);
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 500281e0a10..b0c32a344ff 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -129,7 +129,7 @@ if ($action == 'edit')	// Edit
 
     // Show pdf format
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("DictionaryPaperFormat").'</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("DictionaryPaperFormat").'</td><td>';
     print $formadmin->select_paper_format($selected,'MAIN_PDF_FORMAT');
     print '</td></tr>';
 
@@ -146,7 +146,7 @@ if ($action == 'edit')	// Edit
 
     // Hide VAT Intra on address
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td>';
     print $form->selectyesno('MAIN_TVAINTRA_NOT_IN_ADDRESS',(! empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))?$conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS:0,1);
     print '</td></tr>';
 
@@ -163,7 +163,7 @@ if ($action == 'edit')	// Edit
     }
     if ($pid1)
     {
-    	print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid1.'</td><td>';
+    	print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid1.'</td><td>';
     	print $form->selectyesno('MAIN_PROFID1_IN_ADDRESS',isset($conf->global->MAIN_PROFID1_IN_ADDRESS)?$conf->global->MAIN_PROFID1_IN_ADDRESS:0,1,$noCountryCode);
     	print '</td></tr>';
     }
@@ -181,7 +181,7 @@ if ($action == 'edit')	// Edit
     }
     if ($pid2)
     {
-    	print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid2.'</td><td>';
+    	print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid2.'</td><td>';
     	print $form->selectyesno('MAIN_PROFID2_IN_ADDRESS',isset($conf->global->MAIN_PROFID2_IN_ADDRESS)?$conf->global->MAIN_PROFID2_IN_ADDRESS:0,1,$noCountryCode);
     	print '</td></tr>';
     }
@@ -199,7 +199,7 @@ if ($action == 'edit')	// Edit
     }
     if ($pid3)
     {
-    	print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid3.'</td><td>';
+    	print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid3.'</td><td>';
     	print $form->selectyesno('MAIN_PROFID3_IN_ADDRESS',isset($conf->global->MAIN_PROFID3_IN_ADDRESS)?$conf->global->MAIN_PROFID3_IN_ADDRESS:0,1,$noCountryCode);
     	print '</td></tr>';
     }
@@ -217,7 +217,7 @@ if ($action == 'edit')	// Edit
     }
     if ($pid4)
     {
-    	print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid4.'</td><td>';
+    	print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid4.'</td><td>';
     	print $form->selectyesno('MAIN_PROFID4_IN_ADDRESS',isset($conf->global->MAIN_PROFID4_IN_ADDRESS)?$conf->global->MAIN_PROFID4_IN_ADDRESS:0,1,$noCountryCode);
     	print '</td></tr>';
     }
@@ -234,36 +234,36 @@ if ($action == 'edit')	// Edit
 
     // Hide any PDF informations
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td>';
 	print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0,1);
     print '</td></tr>';
 
     //Desc
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("HideDescOnPDF").'</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("HideDescOnPDF").'</td><td>';
     print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DESC',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC:0,1);
     print '</td></tr>';
 
     //Ref
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("HideRefOnPDF").'</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("HideRefOnPDF").'</td><td>';
     print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_REF',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF:0,1);
     print '</td></tr>';
 
     //Details
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("HideDetailsOnPDF").'</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("HideDetailsOnPDF").'</td><td>';
     print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS:0,1);
     print '</td></tr>';
 
  	// Place customer adress to the ISO location
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td>';
 	print $form->selectyesno('MAIN_PDF_USE_ISO_LOCATION',(! empty($conf->global->MAIN_PDF_USE_ISO_LOCATION))?$conf->global->MAIN_PDF_USE_ISO_LOCATION:0,1);
     print '</td></tr>';
 	
 	
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td><td>';
 	print $form->selectarray('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', $arraydetailsforpdffoot, $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS);
 	print '</td></tr>';
 
@@ -288,7 +288,7 @@ else	// Show
 
     // Show pdf format
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("DictionaryPaperFormat").'</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("DictionaryPaperFormat").'</td><td>';
 
     $pdfformatlabel='';
     if (empty($conf->global->MAIN_PDF_FORMAT))
@@ -324,7 +324,7 @@ else	// Show
 
 	// Hide Intra VAT on address
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td colspan="2">';
+	print '<tr class="oddeven"><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td colspan="2">';
 	print yn($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS,1);
 	print '</td></tr>';
 
@@ -341,7 +341,7 @@ else	// Show
     }
     if ($pid1)
     {
-    	print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid1.'</td><td>';
+    	print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid1.'</td><td>';
     	print yn($conf->global->MAIN_PROFID1_IN_ADDRESS,1);
     	print '</td></tr>';
     }
@@ -359,7 +359,7 @@ else	// Show
     }
     if ($pid2)
     {
-    	print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid2.'</td><td>';
+    	print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid2.'</td><td>';
     	print yn($conf->global->MAIN_PROFID2_IN_ADDRESS,1);
     	print '</td></tr>';
     }
@@ -377,7 +377,7 @@ else	// Show
     }
     if ($pid3)
     {
-    	print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid3.'</td><td>';
+    	print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid3.'</td><td>';
     	print yn($conf->global->MAIN_PROFID3_IN_ADDRESS,1);
     	print '</td></tr>';
     }
@@ -395,7 +395,7 @@ else	// Show
     }
     if ($pid4)
     {
-    	print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid4.'</td><td>';
+    	print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid4.'</td><td>';
     	print yn($conf->global->MAIN_PROFID4_IN_ADDRESS,1);
     	print '</td></tr>';
     }
@@ -441,35 +441,35 @@ else	// Show
 
     // Hide any PDF informations
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td colspan="2">';
+    print '<tr class="oddeven"><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td colspan="2">';
     print yn($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT,1);
     print '</td></tr>';
 
 	//Desc
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("HideDescOnPDF").'</td><td colspan="2">';
+	print '<tr class="oddeven"><td>'.$langs->trans("HideDescOnPDF").'</td><td colspan="2">';
 	print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC,1);
 	print '</td></tr>';
 
 	//Ref
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("HideRefOnPDF").'</td><td colspan="2">';
+	print '<tr class="oddeven"><td>'.$langs->trans("HideRefOnPDF").'</td><td colspan="2">';
 	print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF,1);
 	print '</td></tr>';
 
 	//Details
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("HideDetailsOnPDF").'</td><td colspan="2">';
+	print '<tr class="oddeven"><td>'.$langs->trans("HideDetailsOnPDF").'</td><td colspan="2">';
 	print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS,1);
 	print '</td></tr>';
 
 	
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td colspan="2">';
+    print '<tr class="oddeven"><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td colspan="2">';
 	print yn($conf->global->MAIN_PDF_USE_ISO_LOCATION,1);
 	print '</td></tr>';
 	
 	
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td><td colspan="2">';
+    print '<tr class="oddeven"><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td><td colspan="2">';
 	print $arraydetailsforpdffoot[$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS];
 	print '</td></tr>';
 
@@ -493,7 +493,7 @@ else	// Show
 	if (! empty($dolibarr_pdf_force_fpdf))
 	{
 		
-		print '<tr '.$bc[$var].'>'."\n";
+		print '<tr class="oddeven">'."\n";
 		print '<td>dolibarr_pdf_force_fpdf</td>'."\n";
 		print '<td>';
 		print $dolibarr_pdf_force_fpdf;
@@ -502,7 +502,7 @@ else	// Show
 	}
 
 	
-	print '<tr '.$bc[$var].'>'."\n";
+	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("LibraryToBuildPDF").'</td>'."\n";
 	print '<td>';
 	$i=0;
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 1c557a83296..86108be0136 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -313,7 +313,7 @@ foreach ($dirmodels as $reldir)
                             if ($modulequalified)
                             {
                                 $var = !$var;
-                                print '<tr '.$bc[$var].'><td width="100">';
+                                print '<tr class="oddeven"><td width="100">';
                                 print (empty($module->name)?$name:$module->name);
                                 print "</td><td>\n";
                                 if (method_exists($module,'info')) print $module->info($langs);
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 0d041cad2b7..bff56b4f776 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -311,7 +311,7 @@ foreach ($dirmodels as $reldir)
 					if ($module->isEnabled())
 					{
 						
-						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
 
@@ -450,7 +450,7 @@ foreach ($dirmodels as $reldir)
 	                        if ($modulequalified)
 	                        {
 	                            $var = !$var;
-	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print '<tr class="oddeven"><td width="100">';
 	                            print (empty($module->name)?$name:$module->name);
 	                            print "</td><td>\n";
 	                            if (method_exists($module,'info')) print $module->info($langs);
@@ -562,7 +562,7 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="setusecustomercontactasrecipient">';
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("UseCustomerContactAsPropalRecipientIfExist");
 print '</td><td width="60" align="center">';
 print $form->selectyesno("value",$conf->global->PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT,1);
@@ -576,7 +576,7 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_PROPOSAL_FREE_TEXT">';
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeLegalTextOnProposal").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 $variablename='PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
@@ -598,7 +598,7 @@ print '</form>';
 print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_PROPALE_DRAFT_WATERMARK\">";
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("WatermarkOnDraftProposal").'</td><td>';
 print '<input size="50" class="flat" type="text" name="PROPALE_DRAFT_WATERMARK" value="'.$conf->global->PROPALE_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
@@ -610,7 +610,7 @@ print '</form>';
 if ($conf->banque->enabled)
 {
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td>&nbsp</td><td align="right">';
     if (! empty($conf->use_javascript_ajax))
     {
@@ -632,7 +632,7 @@ if ($conf->banque->enabled)
 else
 {
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
 */
@@ -668,7 +668,7 @@ print '<td align="center" width="60"></td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'<br>';
 print '</td><td align="right">';
 print "</td></tr>\n";
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 449180d25da..4d0415dbd01 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -250,7 +250,7 @@ foreach ($arrayhandler as $key => $module)
 	if ($module->isEnabled())
 	{
         $var = !$var;
-        print '<tr '.$bc[$var].'><td width="100">';
+        print '<tr class="oddeven"><td width="100">';
         print ucfirst($key);
         print "</td><td>\n";
         print $module->getDescription().'<br>';
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 4227116eaea..faf05b7fb0f 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -176,30 +176,30 @@ if ($action == 'edit')
 
 	// Disable
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_SMS").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_SMS").'</td><td>';
 	print $form->selectyesno('MAIN_DISABLE_ALL_SMS',$conf->global->MAIN_DISABLE_ALL_SMS,1);
 	print '</td></tr>';
 
 	// Separator
 	
-	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
+	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// Method
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
 	if (count($listofmethods)) print $form->selectarray('MAIN_SMS_SENDMODE',$listofmethods,$conf->global->MAIN_SMS_SENDMODE,1);
 	else print '<font class="error">'.$langs->trans("None").'</font>';
     print '</td></tr>';
 
 	// From
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMS_FROM",$langs->transnoentities("Undefined")).'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMS_FROM",$langs->transnoentities("Undefined")).'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_SMS_FROM" size="32" value="' . $conf->global->MAIN_MAIL_SMS_FROM;
 	print '"></td></tr>';
 
 	// Autocopy to
 	/*
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_AUTOCOPY_TO" size="32" value="' . $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 	print '"></td></tr>';
 	*/
@@ -225,15 +225,15 @@ else
 
 	// Disable
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_SMS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_SMS).'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_SMS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_SMS).'</td></tr>';
 
 	// Separator
 	
-	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
+	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// Method
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
 	$text=$listofmethods[$conf->global->MAIN_SMS_SENDMODE];
 	if (empty($text)) $text=$langs->trans("Undefined").' '.img_warning();
 	print $text;
@@ -241,14 +241,14 @@ else
 
 	// From
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMS_FROM",$langs->transnoentities("Undefined")).'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMS_FROM",$langs->transnoentities("Undefined")).'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_SMS_FROM;
 	if (!empty($conf->global->MAIN_MAIL_SMS_FROM) && ! isValidPhone($conf->global->MAIN_MAIL_SMS_FROM)) print ' '.img_warning($langs->trans("ErrorBadPhone"));
 	print '</td></tr>';
 
 	// Autocopy to
 	/*
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_AUTOCOPY_TO;
 	if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && ! isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail"));
 	print '</td></tr>';
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index e20b92be95e..2619951e1b5 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -251,7 +251,7 @@ foreach ($dirmodels as $reldir)
                         if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
                         
-                        print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+                        print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
                         print $module->info();
                         print '</td>';
 
@@ -471,7 +471,7 @@ print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeLegalTextOnInvoices").' '.img_info($langs->trans("AddCRIfTooLong")).'</br>';
 $variablename='SUPPLIER_INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
@@ -505,7 +505,7 @@ print '<td align="center" width="60"></td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'<br>';
 print '</td><td align="right">';
 print "</td></tr>\n";
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index fe7d06ed6a8..d54f0e367aa 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -280,7 +280,7 @@ foreach ($dirmodels as $reldir)
                         if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
                         
-                        print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+                        print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
                         print $module->info();
                         print '</td>';
 
@@ -493,7 +493,7 @@ print "</tr>\n";
 $var=false;
 //if ($conf->global->MAIN_FEATURES_LEVEL > 0)
 //{
-	print '<tr '.$bc[$var].'><td>';
+	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("UseDoubleApproval"), $langs->trans("Use3StepsApproval"), 1, 'help').'<br>';
 	print $langs->trans("IfSetToYesDontForgetPermission");
 	print '</td><td>';
@@ -509,7 +509,7 @@ $var=false;
 if ($conf->banque->enabled)
 {
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp</td><td align="center">';
     if (! empty($conf->use_javascript_ajax))
     {
@@ -531,12 +531,12 @@ if ($conf->banque->enabled)
 else
 {
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
 */
 
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 $variablename='SUPPLIER_ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
@@ -571,7 +571,7 @@ print '<td align="center" width="60"></td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'<br>';
 print '</td><td align="right">';
 print "</td></tr>\n";
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 14e13789887..40caa94c8a8 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -279,7 +279,7 @@ foreach ($dirmodels as $reldir)
                         if ($module->isEnabled())
                         {
                             $var = !$var;
-                            print '<tr '.$bc[$var].'><td width="100">';
+                            print '<tr class="oddeven"><td width="100">';
                             echo preg_replace('/\-.*$/','',preg_replace('/mod_supplier_payment_/','',preg_replace('/\.php$/','',$file)));
                             print "</td><td>\n";
 
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 621dd302ccb..703fbc482e9 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -289,7 +289,7 @@ foreach ($dirmodels as $reldir)
 					if ($module->isEnabled())
 					{
 						
-						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
 
@@ -427,7 +427,7 @@ foreach ($dirmodels as $reldir)
 	                        if ($modulequalified)
 	                        {
 	                            $var = !$var;
-	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print '<tr class="oddeven"><td width="100">';
 	                            print (empty($module->name)?$name:$module->name);
 	                            print "</td><td>\n";
 	                            if (method_exists($module,'info')) print $module->info($langs);
@@ -527,7 +527,7 @@ $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_SUPPLIER_PROPOSAL_FREE_TEXT">';
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeLegalTextOnSupplierProposal").' '.img_info($langs->trans("AddCRIfTooLong")).'</br>';
 $variablename='SUPPLIER_PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
@@ -549,7 +549,7 @@ print '</form>';
 print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK\">";
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("WatermarkOnDraftSupplierProposal").'</td><td>';
 print '<input size="50" class="flat" type="text" name="SUPPLIER_PROPOSAL_DRAFT_WATERMARK" value="'.$conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
@@ -560,7 +560,7 @@ print '</form>';
 if ($conf->banque->enabled)
 {
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp</td><td align="right">';
     if (! empty($conf->use_javascript_ajax))
     {
@@ -582,7 +582,7 @@ if ($conf->banque->enabled)
 else
 {
     
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
 
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index d8927c552b6..71d06ae8e64 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -258,7 +258,7 @@ print '<td align="right"><input type="submit" class="button" '.$option.' value="
 print "</tr>\n";
 $var=true;
 
-print '<tr '.$bc[$var].'><td width="140">'.$langs->trans("SyslogLevel").'</td>';
+print '<tr class="oddeven"><td width="140">'.$langs->trans("SyslogLevel").'</td>';
 print '<td colspan="2"><select class="flat" name="level" '.$option.'>';
 print '<option value="'.LOG_EMERG.'" '.($conf->global->SYSLOG_LEVEL==LOG_EMERG?'SELECTED':'').'>LOG_EMERG ('.LOG_EMERG.')</option>';
 print '<option value="'.LOG_ALERT.'" '.($conf->global->SYSLOG_LEVEL==LOG_ALERT?'SELECTED':'').'>LOG_ALERT ('.LOG_ALERT.')</option>';
diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php
index 7676cf34ac5..4051392c82c 100644
--- a/htdocs/admin/system/browser.php
+++ b/htdocs/admin/system/browser.php
@@ -52,23 +52,23 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("UserAgent").'</td><td colspan="2">'.$_SERVER['HTTP_USER_AGENT'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("UserAgent").'</td><td colspan="2">'.$_SERVER['HTTP_USER_AGENT'].'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("BrowserName").'</td><td colspan="2">'.$tmp['browsername'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("BrowserName").'</td><td colspan="2">'.$tmp['browsername'].'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("BrowserOS").'</td><td colspan="2">'.$tmp['browseros'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("BrowserOS").'</td><td colspan="2">'.$tmp['browseros'].'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Version").'</td><td colspan="2">'.$tmp['browserversion'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("Version").'</td><td colspan="2">'.$tmp['browserversion'].'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Layout").' (phone/tablet/classic)</td><td colspan="2">'.$tmp['layout'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("Layout").' (phone/tablet/classic)</td><td colspan="2">'.$tmp['layout'].'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("IPAddress").'</td><td colspan="2">'.$_SERVER['REMOTE_ADDR'].'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("IPAddress").'</td><td colspan="2">'.$_SERVER['REMOTE_ADDR'].'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Screen").'</td><td colspan="2">';
+print '<tr class="oddeven"><td width="300">'.$langs->trans("Screen").'</td><td colspan="2">';
 print $_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
 print '</td></tr>'."\n";
 print '</table>';
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 52d25986567..c96a085456a 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -73,7 +73,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").')</td><td>'.DOL_VERSION;
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").')</td><td>'.DOL_VERSION;
 // If current version differs from last upgrade
 if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
 {
@@ -124,9 +124,9 @@ if (function_exists('curl_init'))
 
 print '</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
 print '</table>';
 print '</div>';
 print '<br>';
@@ -137,28 +137,28 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Session").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("SessionSavePath").'</td><td colspan="2">'.session_save_path().'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("SessionSavePath").'</td><td colspan="2">'.session_save_path().'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentSessionTimeOut").'</td><td>'.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds");
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentSessionTimeOut").'</td><td>'.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds");
 print '</td><td align="right">';
 print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
 print "</td></tr>\n";
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentTheme").'</td><td colspan="2">'.$conf->theme.'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentTheme").'</td><td colspan="2">'.$conf->theme.'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentMenuHandler").'</td><td colspan="2">';
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentMenuHandler").'</td><td colspan="2">';
 print $conf->standard_menu;
 print '</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("Screen").'</td><td colspan="2">';
+print '<tr class="oddeven"><td>'.$langs->trans("Screen").'</td><td colspan="2">';
 print $_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
 print '</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("Session").'</td><td colspan="2">';
+print '<tr class="oddeven"><td>'.$langs->trans("Session").'</td><td colspan="2">';
 $i=0;
 foreach($_SESSION as $key => $val)
 {
@@ -189,7 +189,7 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
 	foreach($shmoparray as $key => $val)
 	{
 		
-		print '<tr '.$bc[$var].'><td>'.$key.'</td>';
+		print '<tr class="oddeven"><td>'.$key.'</td>';
 		print '<td>'.count($val).'</td>';
 		print '<td align="right">'.dol_getshmopaddress($key).'</td>';
 		print '</tr>'."\n";
@@ -207,22 +207,22 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("LocalisationDolibarrParameters").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("LanguageBrowserParameter","HTTP_ACCEPT_LANGUAGE").'</td><td>'.$_SERVER["HTTP_ACCEPT_LANGUAGE"].'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("LanguageBrowserParameter","HTTP_ACCEPT_LANGUAGE").'</td><td>'.$_SERVER["HTTP_ACCEPT_LANGUAGE"].'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentUserLanguage").'</td><td>'.$langs->getDefaultLang().'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentUserLanguage").'</td><td>'.$langs->getDefaultLang().'</td></tr>'."\n";
 // Thousands
 
 $thousand=$langs->transnoentitiesnoconv("SeparatorThousand");
 if ($thousand == 'SeparatorThousand') $thousand=' ';	// ' ' does not work on trans method
 if ($thousand == 'None') $thousand='';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentValueSeparatorThousand").'</td><td>'.($thousand==' '?$langs->transnoentitiesnoconv("Space"):$thousand).'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentValueSeparatorThousand").'</td><td>'.($thousand==' '?$langs->transnoentitiesnoconv("Space"):$thousand).'</td></tr>'."\n";
 // Decimals
 
 $dec=$langs->transnoentitiesnoconv("SeparatorDecimal");
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentValueSeparatorDecimal").'</td><td>'.$dec.'</td></tr>'."\n";
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentValueSeparatorDecimal").'</td><td>'.$dec.'</td></tr>'."\n";
 // Show results of functions to see if everything works
 
-print '<tr '.$bc[$var].'><td>&nbsp; => price2num(1233.56+1)</td><td>'.price2num(1233.56+1,'2').'</td></tr>'."\n";
+print '<tr class="oddeven"><td>&nbsp; => price2num(1233.56+1)</td><td>'.price2num(1233.56+1,'2').'</td></tr>'."\n";
 
 print "<tr ".$bc[$var].'><td>&nbsp; => price2num('."'1".$thousand."234".$dec."56')</td><td>".price2num("1".$thousand."234".$dec."56",'2')."</td></tr>\n";
 if (($thousand != ',' && $thousand != '.') || ($thousand != ' '))
@@ -232,14 +232,14 @@ if (($thousand != ',' && $thousand != '.') || ($thousand != ' '))
 	print "</tr>\n";
 }
 
-print '<tr '.$bc[$var].'><td>&nbsp; => price(1234.56)</td><td>'.price(1234.56).'</td></tr>'."\n";
+print '<tr class="oddeven"><td>&nbsp; => price(1234.56)</td><td>'.price(1234.56).'</td></tr>'."\n";
 // Timezone
 $txt =$langs->trans("OSTZ").' (variable system TZ): '.(! empty($_ENV["TZ"])?$_ENV["TZ"]:$langs->trans("NotDefined")).'<br>'."\n";
 $txt.=$langs->trans("PHPTZ").' (php.ini date.timezone): '.(ini_get("date.timezone")?ini_get("date.timezone"):$langs->trans("NotDefined")).''."<br>\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 $txt.=$langs->trans("Dolibarr constant MAIN_SERVER_TZ").': '.(empty($conf->global->MAIN_SERVER_TZ)?$langs->trans("NotDefined"):$conf->global->MAIN_SERVER_TZ);
 //$txt.=$langs->trans("YouCanEditPHPTZ"); // deprecated
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
+print '<tr class="oddeven"><td>'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
 $a=getServerTimeZoneInt('now');
 $b=getServerTimeZoneInt('winter');
 $c=getServerTimeZoneInt('summer');
@@ -252,18 +252,18 @@ $val.=' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': '.($dayligh
 print $form->textwithtooltip($val,$txt,2,1,img_info(''));
 print '</td></tr>'."\n";	// value defined in http://fr3.php.net/manual/en/timezones.europe.php
 
-print '<tr '.$bc[$var].'><td>&nbsp; => '.$langs->trans("CurrentHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzserver').'</td></tr>'."\n";
+print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("CurrentHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzserver').'</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td>&nbsp; => dol_print_date(0,"dayhourtext")</td><td>'.dol_print_date(0,"dayhourtext").'</td>';
+print '<tr class="oddeven"><td>&nbsp; => dol_print_date(0,"dayhourtext")</td><td>'.dol_print_date(0,"dayhourtext").'</td>';
 
-print '<tr '.$bc[$var].'><td>&nbsp; => dol_get_first_day(1970,1,false)</td><td>'.dol_get_first_day(1970,1,false).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,false),'dayhour').')</td>';
+print '<tr class="oddeven"><td>&nbsp; => dol_get_first_day(1970,1,false)</td><td>'.dol_get_first_day(1970,1,false).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,false),'dayhour').')</td>';
 
-print '<tr '.$bc[$var].'><td>&nbsp; => dol_get_first_day(1970,1,true)</td><td>'.dol_get_first_day(1970,1,true).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,true),'dayhour').')</td>';
+print '<tr class="oddeven"><td>&nbsp; => dol_get_first_day(1970,1,true)</td><td>'.dol_get_first_day(1970,1,true).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,true),'dayhour').')</td>';
 // Database timezone
 if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
 {
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("MySQLTimeZone").' (database)</td><td>';	// Timezone server base
+	print '<tr class="oddeven"><td>'.$langs->trans("MySQLTimeZone").' (database)</td><td>';	// Timezone server base
 	$sql="SHOW VARIABLES where variable_name = 'system_time_zone'";
 	$resql = $db->query($sql);
 	if ($resql)
@@ -276,7 +276,7 @@ if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
 // Client
 
 $tz=(int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst'];
-print '<tr '.$bc[$var].'><td>'.$langs->trans("ClientTZ").'</td><td>'.($tz?($tz>=0?'+':'').$tz:'').' ('.($tz>=0?'+':'').($tz*60*60).')';
+print '<tr class="oddeven"><td>'.$langs->trans("ClientTZ").'</td><td>'.($tz?($tz>=0?'+':'').$tz:'').' ('.($tz>=0?'+':'').($tz*60*60).')';
 print ' &nbsp; &nbsp; &nbsp; '.$_SESSION['dol_tz_string'];
 print ' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': ';
 if ($_SESSION['dol_dst']>0) print yn(1);
@@ -285,18 +285,18 @@ if (! empty($_SESSION['dol_dst_first'])) print ' &nbsp; &nbsp; ('.dol_print_date
 print '</td></tr>'."\n";
 print '</td></tr>'."\n";
 
-print '<tr '.$bc[$var].'><td>&nbsp; => '.$langs->trans("ClientHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzuser').'</td></tr>'."\n";
+print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("ClientHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzuser').'</td></tr>'."\n";
 
 
 $filesystemencoding=ini_get("unicode.filesystem_encoding");	// Disponible avec PHP 6.0
-print '<tr '.$bc[$var].'><td>'.$langs->trans("File encoding").' (php.ini unicode.filesystem_encoding)</td><td>'.$filesystemencoding.'</td></tr>'."\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
+print '<tr class="oddeven"><td>'.$langs->trans("File encoding").' (php.ini unicode.filesystem_encoding)</td><td>'.$filesystemencoding.'</td></tr>'."\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 
 
 $tmp=ini_get("unicode.filesystem_encoding");						// Disponible avec PHP 6.0
 if (empty($tmp) && ! empty($_SERVER["WINDIR"])) $tmp='iso-8859-1';	// By default for windows
 if (empty($tmp)) $tmp='utf-8';										// By default for other
 if (! empty($conf->global->MAIN_FILESYSTEM_ENCODING)) $tmp=$conf->global->MAIN_FILESYSTEM_ENCODING;
-print '<tr '.$bc[$var].'><td>&nbsp; => '.$langs->trans("File encoding").'</td><td>'.$tmp.'</td></tr>'."\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
+print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("File encoding").'</td><td>'.$tmp.'</td></tr>'."\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 
 print '</table>';
 print '</div>';
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 62d0999170f..c64379a96f1 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -50,11 +50,11 @@ $var = true;
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
 $var = ! $var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
 $var = ! $var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("VersionLastUpgrade").'</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
+print '<tr class="oddeven"><td width="300">'.$langs->trans("VersionLastUpgrade").'</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
 $var = ! $var;
-print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("VersionProgram").'</td><td>'.DOL_VERSION;
+print '<tr class="oddeven"><td width="300">'.$langs->trans("VersionProgram").'</td><td>'.DOL_VERSION;
 // If current version differs from last upgrade
 if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) {
     // Compare version with last install database version (upgrades never occured)
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index e3998f6e37c..42feea8f8ec 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -284,7 +284,7 @@ foreach ($dirmodels as $reldir)
 	                        if ($modulequalified)
 	                        {
 	                            $var = !$var;
-	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print '<tr class="oddeven"><td width="100">';
 	                            print (empty($module->name)?$name:$module->name);
 	                            print "</td><td>\n";
 	                            if (method_exists($module,'info')) print $module->info($langs);
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 72365726d25..db5ef3cbf59 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -231,7 +231,7 @@ foreach ($dirmodels as $reldir)
 	                        if ($modulequalified)
 	                        {
 	                            $var = !$var;
-	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print '<tr class="oddeven"><td width="100">';
 	                            print (empty($module->name)?$name:$module->name);
 	                            print "</td><td>\n";
 	                            if (method_exists($module,'info')) print $module->info($langs);
diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index e013fbcacc8..14b6dabf5e5 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -76,7 +76,7 @@ print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("NbOfBoomarkToShow").'</td><td>';
 print '<input size="3" type="text" name="BOOKMARKS_SHOW_IN_MENU" value="'.$conf->global->BOOKMARKS_SHOW_IN_MENU.'">';
 print '</td></tr>';
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 0f6da77fa43..0d1dbf2de53 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -101,26 +101,26 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-print '<tr '.$bc[$var].'><td width=\"50%\">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
+print '<tr class="oddeven"><td width=\"50%\">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
 print '<td colspan="2">';
 print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY,'socid','s.client in (1,3)',1,0,1,array(),0);
 print '</td></tr>';
 if (! empty($conf->banque->enabled))
 {
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
 	print '<td colspan="2">';
 	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CASH,'CASHDESK_ID_BANKACCOUNT_CASH',0,"courant=2",1);
 	print '</td></tr>';
 
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskBankAccountForCheque").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCheque").'</td>';
 	print '<td colspan="2">';
 	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE,'CASHDESK_ID_BANKACCOUNT_CHEQUE',0,"courant=1",1);
 	print '</td></tr>';
 
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskBankAccountForCB").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCB").'</td>';
 	print '<td colspan="2">';
 	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CB,'CASHDESK_ID_BANKACCOUNT_CB',0,"courant=1",1);
 	print '</td></tr>';
@@ -129,7 +129,7 @@ if (! empty($conf->banque->enabled))
 if (! empty($conf->stock->enabled))
 {
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>';	// Force warehouse (this is not a default value)
+	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>';	// Force warehouse (this is not a default value)
 	print '<td colspan="2">';
 	if (empty($conf->productbatch->enabled)) {
 	   print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK',$conf->global->CASHDESK_NO_DECREASE_STOCK,1);
@@ -146,7 +146,7 @@ if (! empty($conf->stock->enabled))
 	$disabled=$conf->global->CASHDESK_NO_DECREASE_STOCK;
 
 	
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskIdWareHouse").'</td>';	// Force warehouse (this is not a default value)
+	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskIdWareHouse").'</td>';	// Force warehouse (this is not a default value)
 	print '<td colspan="2">';
 	if (! $disabled)
 	{
@@ -163,7 +163,7 @@ if (! empty($conf->stock->enabled))
 if (! empty($conf->service->enabled))
 {
     $var=! $var;
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("CashdeskShowServices");
     print '<td colspan="2">';
     print $form->selectyesno("CASHDESK_SERVICES",$conf->global->CASHDESK_SERVICES,1);
@@ -174,7 +174,7 @@ if (! empty($conf->service->enabled))
 if (! empty($conf->receiptprinter->enabled))
 {
     $var=! $var;
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("DolibarrReceiptPrinter").' ('.$langs->trans("FeatureNotYetAvailable").')';
     print '<td colspan="2">';
     print $form->selectyesno("CASHDESK_DOLIBAR_RECEIPT_PRINTER",$conf->global->CASHDESK_DOLIBAR_RECEIPT_PRINTER,1);
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 848aa2c05a5..3309598a27d 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -168,7 +168,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 			{
 				$obj = $db->fetch_object($resql);
 				
-				print '<tr '.$bc[$var].'><td  class="nowrap">';
+				print '<tr class="oddeven"><td  class="nowrap">';
 				$propalstatic->id=$obj->rowid;
 				$propalstatic->ref=$obj->ref;
                 $propalstatic->ref_client=$obj->ref_client;
@@ -199,7 +199,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 		else
 		{
 			
-			print '<tr '.$bc[$var].'><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
 		}
 		print "</table><br>";
 
@@ -249,7 +249,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
             {
                 $obj = $db->fetch_object($resql);
                 
-                print '<tr '.$bc[$var].'><td  class="nowrap">';
+                print '<tr class="oddeven"><td  class="nowrap">';
                 $supplierproposalstatic->id=$obj->rowid;
                 $supplierproposalstatic->ref=$obj->ref;
                 $supplierproposalstatic->total_ht = $obj->total_ht;
@@ -279,7 +279,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
         else
         {
             
-            print '<tr '.$bc[$var].'><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
+            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
         }
         print "</table><br>";
 
@@ -328,7 +328,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 			{
 				
 				$obj = $db->fetch_object($resql);
-				print '<tr '.$bc[$var].'><td class="nowrap">';
+				print '<tr class="oddeven"><td class="nowrap">';
                 $orderstatic->id=$obj->rowid;
                 $orderstatic->ref=$obj->ref;
                 $orderstatic->ref_client=$obj->ref_client;
@@ -359,7 +359,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 		else
 		{
 			
-			print '<tr '.$bc[$var].'><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
 		}
 		print "</table><br>";
 
@@ -409,7 +409,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
             {
                 
                 $obj = $db->fetch_object($resql);
-                print '<tr '.$bc[$var].'><td class="nowrap">';
+                print '<tr class="oddeven"><td class="nowrap">';
                 $supplierorderstatic->id=$obj->rowid;
                 $supplierorderstatic->ref=$obj->ref;
                 $supplierorderstatic->ref_supplier=$obj->ref_suppliert;
@@ -440,7 +440,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
         else
         {
 			
-            print '<tr '.$bc[$var].'><td colspan="3" class="opacitymedium">'.$langs->trans("NoSupplierOrder").'</td></tr>';
+            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoSupplierOrder").'</td></tr>';
         }
         print "</table><br>";
 
@@ -519,7 +519,7 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
 		}
 		else
 		{
-			print '<tr '.$bc[$var].'><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print "</table><br>";
 	}
@@ -573,7 +573,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
 		}
 		else
 		{
-			print '<tr '.$bc[$var].'><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table><br>';
 	}
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index b114cf92895..52eacf6c115 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -57,10 +57,10 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<table class="noborder nohover" width="100%">';
     print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAMailing").'</td></tr>';
-    print '<tr '.$bc[$var].'><td class="nowrap">';
+    print '<tr class="oddeven"><td class="nowrap">';
     print $langs->trans("Ref").':</td><td><input type="text" class="flat inputsearch" name="sref"></td>';
     print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print '<tr '.$bc[$var].'><td class="nowrap">';
+    print '<tr class="oddeven"><td class="nowrap">';
     print $langs->trans("Other").':</td><td><input type="text" class="flat inputsearch" name="sall"></td>';
     
     print "</table></form><br>\n";
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 07779753c0d..145d1891be3 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -66,7 +66,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<table class="noborder nohover" width="100%">';
     print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("Proposal").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
     print "</table></form><br>\n";
 }
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index b28f86bc412..2364672ccf9 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -58,9 +58,9 @@ if (! empty($conf->propal->enabled))
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<table class="noborder nohover" width="100%">';
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAProposal").'</td></tr>';
-	print '<tr '.$bc[$var].'><td>';
+	print '<tr class="oddeven"><td>';
 	print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sf_ref" size="18"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
+	print '<tr class="oddeven"><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
 	print '</tr>';
 	print "</table></form><br>\n";
 }
@@ -97,7 +97,7 @@ if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			
-			print '<tr '.$bc[$var].'><td>';
+			print '<tr class="oddeven"><td>';
 			print '<a href="prospects.php?page=0&amp;stcomm='.$obj->id.'">';
 			print img_action($langs->trans("Show"),$obj->id).' ';
 			print $langs->trans("StatusProspect".$obj->id);
@@ -141,7 +141,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 			{
 				$obj = $db->fetch_object($resql);
 				
-				print '<tr '.$bc[$var].'><td>';
+				print '<tr class="oddeven"><td>';
 				print '<a href="'.DOL_URL_ROOT.'/comm/propal/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.'</a>';
 				print '</td><td align="right">';
 				print price($obj->price);
@@ -206,7 +206,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 			{
 				$obj = $db->fetch_object($resql);
 				
-				print '<tr '.$bc[$var].'><td>';
+				print '<tr class="oddeven"><td>';
 				print '<a href="../propal.php?id='.$obj->propalid.'">';
 				print img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.'</a></td>';
 
@@ -264,7 +264,7 @@ if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			
-			print '<tr '.$bc[$var].'><td width="12%">';
+			print '<tr class="oddeven"><td width="12%">';
             $companystatic->id=$obj->socid;
             $companystatic->name=$obj->name;
             $companystatic->client=$obj->client;
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index a1a4d33bfb1..9f7f36f78ca 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -70,7 +70,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<table class="noborder nohover" width="100%">';
     print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("CustomerOrder").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
     print "</table></form><br>\n";
 }
@@ -221,7 +221,7 @@ if (! empty($conf->commande->enabled))
 		else
 		{
 			
-			print '<tr '.$bc[$var].'><td colspan="3">'.$langs->trans("NoOrder").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="3">'.$langs->trans("NoOrder").'</td></tr>';
 		}
 		print "</table><br>";
 	}
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index d840a6abf51..a92b23fc617 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -576,7 +576,7 @@ foreach ($accounts as $key=>$type)
 	$i++;
 }
 
-if (! $found) print '<tr '.$bc[$var].'><td colspan="'.$totalarray['nbfield'].'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+if (! $found) print '<tr class="oddeven"><td colspan="'.$totalarray['nbfield'].'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 
 // Show total line
 if (isset($totalarray['totalbalancefield']) && $lastcurrencycode != 'various')	// If there is several currency, $lastcurrencycode is set to 'various' before
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index 9e26d532348..73e94a3d197 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -168,7 +168,7 @@ print '<td>'.$langs->trans("TransferFrom").'</td><td>'.$langs->trans("TransferTo
 print '</tr>';
 
 $var=false;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 $form->select_comptes($account_from,'account_from',0,'',1);
 print "</td>";
 
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 0748616f255..bb6d58293b6 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -187,7 +187,7 @@ if ($result)
     }
     else
     {
-        print '<tr '.$bc[$var].'><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+        print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print '</table><br>';
 }
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index a73265288a2..321c2456ddd 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -172,7 +172,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				print '<tr '.$bc[$var].'><td class="nowrap">';
+				print '<tr class="oddeven"><td class="nowrap">';
 				$facturestatic->ref=$obj->facnumber;
 				$facturestatic->id=$obj->rowid;
                 $facturestatic->total_ht=$obj->total_ht;
@@ -202,7 +202,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 		}
 		else
 		{
-			print '<tr '.$bc[$var].'><td colspan="3" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print "</table><br>";
 		$db->free($resql);
@@ -388,7 +388,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 		{
 			$colspan=5;
 			if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
-			print '<tr '.$bc[$var].'><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table><br>';
 		$db->free($resql);
@@ -443,7 +443,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				print '<tr '.$bc[$var].'><td>';
+				print '<tr class="oddeven"><td>';
 				$facstatic->ref=$obj->ref;
                 $facstatic->id = $obj->rowid;
                 $facstatic->total_ht = $obj->total_ht;
@@ -475,7 +475,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 		{
 			$colspan=5;
 			if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
-			print '<tr '.$bc[$var].'><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table><br>';
 	}
@@ -545,7 +545,7 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
 		}
 		else
 		{
-			print '<tr '.$bc[$var].'><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table><br>';
 	}
@@ -616,7 +616,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			}
 			else
 			{
-				print '<tr '.$bc[$var].'><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			print "</table><br>";
 			$db->free($resql);
@@ -845,7 +845,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 		{
 			$colspan=6;
 			if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
-			print '<tr '.$bc[$var].'><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
 		$db->free($resql);
@@ -907,7 +907,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 			{
 				$obj = $db->fetch_object($resql);
 
-				print '<tr '.$bc[$var].'><td>';
+				print '<tr class="oddeven"><td>';
 				$facstatic->ref=$obj->ref;
 				$facstatic->id = $obj->rowid;
                 $facstatic->total_ht = $obj->total_ht;
@@ -946,7 +946,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 		{
 			$colspan=6;
 			if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
-			print '<tr '.$bc[$var].'><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
 	}
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 2997667ab60..32257a71a0f 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -76,14 +76,14 @@ $var=true;
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>';
+print '<tr class="oddeven"><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>';
 print '<td align="right">';
 print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0">';
 print $bprev->NbFactureAPrelever();
 print '</a>';
 print '</td></tr>';
 
-print '<tr '.$bc[$var].'><td>'.$langs->trans("AmountToWithdraw").'</td>';
+print '<tr class="oddeven"><td>'.$langs->trans("AmountToWithdraw").'</td>';
 print '<td align="right">';
 print price($bprev->SommeAPrelever(),'','',1,-1,-1,'auto');
 print '</td></tr></table><br>';
@@ -130,7 +130,7 @@ if ($resql)
             $alreadypayed=$invoicestatic->getSommePaiement();
 
             
-            print '<tr '.$bc[$var].'><td>';
+            print '<tr class="oddeven"><td>';
             print $invoicestatic->getNomUrl(1,'withdraw');
             print '</td>';
 
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index de70ce2a808..aa479ec4369 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -617,7 +617,7 @@ if ($id > 0)
             else
 		    {
 		        
-		        print '<tr '.$bc[$var].'><td colspan="'.$nbcols.'" class="opacitymedium">'.$langs->trans("None").'</td><td></td><td></td><td></td></tr>';
+		        print '<tr class="oddeven"><td colspan="'.$nbcols.'" class="opacitymedium">'.$langs->trans("None").'</td><td></td><td></td><td></td></tr>';
 		    }
                 
 		    //if ($object->status == ChargeSociales::STATUS_DRAFT)
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 3a779190679..ea9c06d0b2f 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -258,7 +258,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				print '<tr '.$bc[$var].'><td class="nowrap">';
+				print '<tr class="oddeven"><td class="nowrap">';
 				$staticcontrat->ref=$obj->ref;
 				$staticcontrat->id=$obj->rowid;
 				print $staticcontrat->getNomUrl(1,'');
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 17b904da9db..809a045bacf 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -612,7 +612,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
             else
 			{
                 $var = false;
-            	print '<tr '.$bc[$var].'><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+            	print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
             }
             $db->free($result);
         }
diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
index 43a53ee7f6f..1981ae63d09 100644
--- a/htdocs/core/lib/doleditor.lib.php
+++ b/htdocs/core/lib/doleditor.lib.php
@@ -82,7 +82,7 @@ function show_skin($fuser,$edit=0)
    	print '</tr>';
 
     //
-    print '<tr '.$bc[$var].'><td colspan="'.$colspan.'">';
+    print '<tr class="oddeven"><td colspan="'.$colspan.'">';
 
     print '<table class="nobordernopadding" width="100%"><tr><td><div align="center">';
 
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 8d4f697deff..98000ad6e98 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -270,7 +270,7 @@ if (is_resource($handle))
 
 			if ($module->isEnabled())
 			{
-				print '<tr '.$bc[$var].'><td width=\"100\">';
+				print '<tr class="oddeven"><td width=\"100\">';
 				echo $module->name;
 				print '</td>';
 				print '<td>';
@@ -384,7 +384,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_DONATION_MESSAGE" />';
 
 $var=! $var;
-print '<tr '.$bc[$var].'><td colspan="2">';
+print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeTextOnDonations").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 print '<textarea name="DONATION_MESSAGE" class="flat" cols="80">'.$conf->global->DONATION_MESSAGE.'</textarea>';
 print '</td><td align="right">';
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 619a0089e1e..c7893aefd2f 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1067,7 +1067,7 @@ if ($action == 'create')
 						else
 						{
 						    print '<!-- Case there is no details of lot at all -->';
-						    print '<tr '.$bc[$var].'><td colspan="3"></td><td align="center">';
+						    print '<tr class="oddeven"><td colspan="3"></td><td align="center">';
 							print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
 							print '</td>';
 							
@@ -1227,7 +1227,7 @@ if ($action == 'create')
 					if ($subj == 0) // Line not shown yet, we show it
 					{
 					    print '<!-- line not shown yet, we show it -->';
-						print '<tr '.$bc[$var].'><td colspan="3" ></td><td align="center">';
+						print '<tr class="oddeven"><td colspan="3" ></td><td align="center">';
 						if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
 						    $disabled='';
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 481a6df9d00..c3e277ad7b0 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -53,7 +53,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<table class="noborder nohover" width="100%">';
     print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("Shipment").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
     print "</table></form><br>\n";
 }
@@ -275,7 +275,7 @@ if ($resql)
 			$shipment->ref_customer=$obj->ref_customer;
 				
 			
-			print '<tr '.$bc[$var].'><td>';
+			print '<tr class="oddeven"><td>';
 			print $shipment->getNomUrl(1);
 			print '</td>';
 			print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index da103ae98d1..57ad04a8a1a 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -804,7 +804,7 @@ if ($id > 0 || ! empty($ref))
 							{
 								$img=img_warning($langs->trans("StockTooLow"));
 							}
-							print '<tr '.$bc[$var].'><td>&nbsp; &nbsp; &nbsp; -> <a href="'.DOL_URL_ROOT."/product/card.php?id=".$value['id'].'">'.$value['fullpath'].'</a> ('.$value['nb'].')</td>';
+							print '<tr class="oddeven"><td>&nbsp; &nbsp; &nbsp; -> <a href="'.DOL_URL_ROOT."/product/card.php?id=".$value['id'].'">'.$value['fullpath'].'</a> ('.$value['nb'].')</td>';
 							print '<td align="center"> '.$value['nb_total'].'</td>';
 							print '<td>&nbsp</td>';
 							print '<td>&nbsp</td>';
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 1ecf77252f3..724fb234798 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -215,7 +215,7 @@ if ($result)
     }
     else
     {
-        print '<tr '.$bc[$var].'><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+        print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print '</table><br>';
 }
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 63792e2c61f..e9f19f49ef4 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -1052,7 +1052,7 @@ if ($step == 4 && $datatoexport)
 			{
 				
 				$obj = $db->fetch_object($resql);
-				print '<tr '.$bc[$var].'><td>';
+				print '<tr class="oddeven"><td>';
 				print $obj->label;
 				print '</td><td align="right">';
 				print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=deleteprof&id='.$obj->rowid.'">';
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 0fd45794e02..58810ee84c0 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -68,7 +68,7 @@ if (count($export->array_export_code))
 	foreach ($export->array_export_code as $key => $value)
 	{
 		
-		print '<tr '.$bc[$var].'><td>';
+		print '<tr class="oddeven"><td>';
 		//print img_object($export->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
 		print $export->array_export_module[$key]->getName();
 		print '</td><td>';
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 86706dd1eff..fe00c046117 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -67,7 +67,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     print '<form method="post" action="'.DOL_URL_ROOT.'/fichinter/list.php">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("Intervention").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
     print "</form></table><br>\n";
 }
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index f7323cc8996..ccb54930573 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -60,7 +60,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<table class="noborder nohover" width="100%">';
     print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("SupplierOrder").':</td><td><input type="text" class="flat" name="search_all" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
     print "</table></form><br>\n";
 }
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 5ca38304495..29afe337e88 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2381,7 +2381,7 @@ else
     	        {
     	            $objp = $db->fetch_object($result);
     	            
-    	            print '<tr '.$bc[$var].'><td>';
+    	            print '<tr class="oddeven"><td>';
     	            $paymentstatic->id=$objp->rowid;
     	            $paymentstatic->datepaye=$db->jdate($objp->dp);
     	            $paymentstatic->ref=($objp->ref ? $objp->ref : $objp->rowid);;
@@ -2418,7 +2418,7 @@ else
     	    }
     	    else
     	    {
-    	        print '<tr '.$bc[$var].'><td colspan="'.$nbcols.'" class="opacitymedium">'.$langs->trans("None").'</td><td></td><td></td></tr>';
+    	        print '<tr class="oddeven"><td colspan="'.$nbcols.'" class="opacitymedium">'.$langs->trans("None").'</td><td></td><td></td></tr>';
     	    }
 
 			/*
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 47f95104398..32f785460ba 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -134,7 +134,7 @@ if (! empty($conf->fournisseur->enabled))
 			{
 				
 				$obj = $db->fetch_object($resql);
-				print '<tr '.$bc[$var].'><td  class="nowrap">';
+				print '<tr class="oddeven"><td  class="nowrap">';
 				$commandestatic->id=$obj->rowid;
 				$commandestatic->ref=$obj->ref;
 				print $commandestatic->getNomUrl(1,'',16);
@@ -191,7 +191,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 			{
 				$obj = $db->fetch_object($resql);
 				
-				print '<tr '.$bc[$var].'><td class="nowrap">';
+				print '<tr class="oddeven"><td class="nowrap">';
 				$facturestatic->ref=$obj->ref;
 				$facturestatic->id=$obj->rowid;
 				$facturestatic->type=$obj->type;
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 5d1d0f89488..291169aa30d 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -130,7 +130,7 @@ if ($result)
     }
     else
     {
-        print '<tr '.$bc[$var].'><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+        print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
 
 	print '</table>';
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 5364f510026..839d65d2f5a 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -218,7 +218,7 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
         }
         else
         {
-            print '<tr '.$bc[$var].'><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+            print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         print '</table><br>';
     }
@@ -286,7 +286,7 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
 		}
 		else
 		{
-			print '<tr '.$bc[$var].'><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table><br>';
 	}
@@ -353,7 +353,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
 		}
 		else
 		{
-			print '<tr '.$bc[$var].'><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table>';
 	}
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 8cbc3d742a3..3916770de8a 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -553,7 +553,7 @@ if ($step == 3 && $datatoimport)
 
 	// Input file name box
 	$var=false;
-	print '<tr '.$bc[$var].'><td colspan="6">';
+	print '<tr class="oddeven"><td colspan="6">';
 	print '<input type="file"   name="userfile" size="20" maxlength="80"> &nbsp; &nbsp; ';
 	$out = (empty($conf->global->MAIN_UPLOAD_DOC)?' disabled':'');
 	print '<input type="submit" class="button" value="'.$langs->trans("AddFile").'"'.$out.' name="sendit">';
@@ -1131,7 +1131,7 @@ if ($step == 4 && $datatoimport)
 			{
 				
 				$obj = $db->fetch_object($resql);
-				print '<tr '.$bc[$var].'><td>';
+				print '<tr class="oddeven"><td>';
 				print $obj->label;
 				print '</td><td align="right">';
 				print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.$param.'&action=deleteprof&id='.$obj->rowid.'&filetoimport='.urlencode($filetoimport).'">';
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 6446e6c20c5..1a020ab86bf 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -111,21 +111,21 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYBOX_PBX_SITE").'</span></td><td>';
 print '<input size="32" type="text" name="PAYBOX_IBS_SITE" value="'.$conf->global->PAYBOX_IBS_SITE.'">';
 print '<br>'.$langs->trans("Example").': 1999888 ('.$langs->trans("Test").')';
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYBOX_PBX_RANG").'</span></td><td>';
 print '<input size="32" type="text" name="PAYBOX_IBS_RANG" value="'.$conf->global->PAYBOX_IBS_RANG.'">';
 print '<br>'.$langs->trans("Example").': 99 ('.$langs->trans("Test").')';
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYBOX_PBX_IDENTIFIANT").'</span></td><td>';
 print '<input size="32" type="text" name="PAYBOX_PBX_IDENTIFIANT" value="'.$conf->global->PAYBOX_PBX_IDENTIFIANT.'">';
 print '<br>'.$langs->trans("Example").': 2 ('.$langs->trans("Test").')';
@@ -139,7 +139,7 @@ print "</tr>\n";
 
 /*
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("PAYBOX_IBS_DEVISE").'</td><td>';
 print '<input size="32" type="text" name="PAYBOX_IBS_DEVISE" value="'.$conf->global->PAYBOX_IBS_DEVISE.'">';
 print '<br>'.$langs->trans("Example").': 978 (EUR)';
@@ -148,7 +148,7 @@ print '</td></tr>';
 
 /*
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("PAYBOX_CGI_URL_V1").'</td><td>';
 print '<input size="64" type="text" name="PAYBOX_CGI_URL_V1" value="'.$conf->global->PAYBOX_CGI_URL_V1.'">';
 print '<br>'.$langs->trans("Example").': http://mysite/cgi-bin/module_linux.cgi';
@@ -156,42 +156,42 @@ print '</td></tr>';
 */
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYBOX_CGI_URL_V2").'</span></td><td>';
 print '<input size="64" type="text" name="PAYBOX_CGI_URL_V2" value="'.$conf->global->PAYBOX_CGI_URL_V2.'">';
 print '<br>'.$langs->trans("Example").': http://mysite/cgi-bin/modulev2_redhat72.cgi';
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("VendorName").'</td><td>';
 print '<input size="64" type="text" name="PAYBOX_CREDITOR" value="'.$conf->global->PAYBOX_CREDITOR.'">';
 print '<br>'.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="PAYBOX_CSS_URL" value="'.$conf->global->PAYBOX_CSS_URL.'">';
 print '<br>'.$langs->trans("Example").': http://mysite/mycss.css';
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("MessageOK").'</td><td>';
 $doleditor=new DolEditor('PAYBOX_MESSAGE_OK',$conf->global->PAYBOX_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
 $doleditor->Create();
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("MessageKO").'</td><td>';
 $doleditor=new DolEditor('PAYBOX_MESSAGE_KO',$conf->global->PAYBOX_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
 $doleditor->Create();
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("PAYBOX_PAYONLINE_SENDEMAIL").'</td><td>';
 print '<input size="32" type="email" name="PAYBOX_PAYONLINE_SENDEMAIL" value="'.$conf->global->PAYBOX_PAYONLINE_SENDEMAIL.'">';
 print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com';
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 87ca506e653..4942d15a9ce 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -129,33 +129,33 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 
-print '<tr '.$bc[$var].'><td class="fieldrequired">';
+print '<tr class="oddeven"><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_SANDBOX").'</td><td>';
 print $form->selectyesno("PAYPAL_API_SANDBOX",$conf->global->PAYPAL_API_SANDBOX,1);
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td class="fieldrequired">';
+print '<tr class="oddeven"><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_USER").'</td><td>';
 print '<input size="32" type="text" name="PAYPAL_API_USER" value="'.$conf->global->PAYPAL_API_USER.'">';
 print ' &nbsp; '.$langs->trans("Example").': paypal_api1.mywebsite.com';
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td class="fieldrequired">';
+print '<tr class="oddeven"><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_PASSWORD").'</td><td>';
 print '<input size="32" type="text" name="PAYPAL_API_PASSWORD" value="'.$conf->global->PAYPAL_API_PASSWORD.'">';
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td class="fieldrequired">';
+print '<tr class="oddeven"><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_SIGNATURE").'</td><td>';
 print '<input size="64" type="text" name="PAYPAL_API_SIGNATURE" value="'.$conf->global->PAYPAL_API_SIGNATURE.'">';
 print '<br>'.$langs->trans("Example").': ASsqXEmw4KzmX-CPChWSVDNCNfd.A3YNR7uz-VncXXAERFDFDFDF';
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td class="fieldrequired">';
+print '<tr class="oddeven"><td class="fieldrequired">';
 print $langs->trans("PAYPAL_SSLVERSION").'</td><td>';
 print $form->selectarray("PAYPAL_SSLVERSION",array('1'=> $langs->trans('TLSv1'),'6'=> $langs->trans('TLSv1.2')),$conf->global->PAYPAL_SSLVERSION);
 print '</td></tr>';
@@ -168,54 +168,54 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 
-print '<tr '.$bc[$var].'><td class="fieldrequired">';
+print '<tr class="oddeven"><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_INTEGRAL_OR_PAYPALONLY").'</td><td>';
 print $form->selectarray("PAYPAL_API_INTEGRAL_OR_PAYPALONLY",array('integral'=> $langs->trans('PaypalModeIntegral'),'paypalonly'=> $langs->trans('PaypalModeOnlyPaypal')),$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY);
 print '</td></tr>';
 
 /*
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYPAL_API_EXPRESS").'</span></td><td>';
 print $form->selectyesno("PAYPAL_API_EXPRESS",$conf->global->PAYPAL_API_EXPRESS);
 print '</td></tr>';
 */
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("VendorName").'</td><td>';
 print '<input size="64" type="text" name="PAYPAL_CREDITOR" value="'.$conf->global->PAYPAL_CREDITOR.'">';
 print ' &nbsp; '.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="PAYPAL_CSS_URL" value="'.$conf->global->PAYPAL_CSS_URL.'">';
 print ' &nbsp; '.$langs->trans("Example").': http://mysite/mycss.css';
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("PAYPAL_ADD_PAYMENT_URL").'</td><td>';
 print $form->selectyesno("PAYPAL_ADD_PAYMENT_URL",$conf->global->PAYPAL_ADD_PAYMENT_URL,1);
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("MessageOK").'</td><td>';
 $doleditor=new DolEditor('PAYPAL_MESSAGE_OK',$conf->global->PAYPAL_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_4,'90%');
 $doleditor->Create();
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("MessageKO").'</td><td>';
 $doleditor=new DolEditor('PAYPAL_MESSAGE_KO',$conf->global->PAYPAL_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_4,'90%');
 $doleditor->Create();
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("PAYPAL_PAYONLINE_SENDEMAIL").'</td><td>';
 print '<input size="32" type="email" name="PAYPAL_PAYONLINE_SENDEMAIL" value="'.$conf->global->PAYPAL_PAYONLINE_SENDEMAIL.'">';
 print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com';
@@ -228,7 +228,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityToken").'</td><td>';
 print '<input size="48" type="text" id="PAYPAL_SECURITY_TOKEN" name="PAYPAL_SECURITY_TOKEN" value="'.$conf->global->PAYPAL_SECURITY_TOKEN.'">';
 if (! empty($conf->use_javascript_ajax))
@@ -236,7 +236,7 @@ if (! empty($conf->use_javascript_ajax))
 print '</td></tr>';
 
 
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityTokenIsUnique").'</td><td>';
 print $form->selectyesno("PAYPAL_SECURITY_TOKEN_UNIQUE",(empty($conf->global->PAYPAL_SECURITY_TOKEN)?0:$conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE),1);
 print '</td></tr>';
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index ecdefb189b3..3582f8b25b6 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -356,7 +356,7 @@ foreach ($dirproduct as $dirroot)
     			if ($modCodeProduct->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
     			$var = !$var;
-    			print '<tr '.$bc[$var].'>'."\n";
+    			print '<tr class="oddeven">'."\n";
     			print '<td width="140">'.$modCodeProduct->name.'</td>'."\n";
     			print '<td>'.$modCodeProduct->info($langs).'</td>'."\n";
     			print '<td class="nowrap">'.$modCodeProduct->getExample($langs).'</td>'."\n";
@@ -468,7 +468,7 @@ foreach ($dirmodels as $reldir)
 	                        if ($modulequalified)
 	                        {
 	                            $var = !$var;
-	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print '<tr class="oddeven"><td width="100">';
 	                            print (empty($module->name)?$name:$module->name);
 	                            print "</td><td>\n";
 	                            if (method_exists($module,'info')) print $module->info($langs);
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index b6f469a893a..671bb9779a7 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -272,7 +272,7 @@ else
 	print '</tr>'."\n";
 
 	
-	print '<tr '.$bc[$var].'>'."\n";
+	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("OldVATRates").'</td>'."\n";
 	print '<td width="60" align="right">'."\n";
 	print $form->load_tva('oldvatrate', $oldvatrate, $mysoc);
@@ -280,7 +280,7 @@ else
 	print '</tr>'."\n";
 
 	
-	print '<tr '.$bc[$var].'>'."\n";
+	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("NewVATRates").'</td>'."\n";
 	print '<td width="60" align="right">'."\n";
 	print $form->load_tva('newvatrate', $newvatrate, $mysoc);
@@ -289,7 +289,7 @@ else
 
 	/*
 	
-	print '<tr '.$bc[$var].'>'."\n";
+	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("PriceBaseTypeToChange").'</td>'."\n";
 	print '<td width="60" align="right">'."\n";
 	print $form->selectPriceBaseType($price_base_type);
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index dc2628f4dc0..34da4f857b9 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -428,7 +428,7 @@ function activitytrim($product_type)
 				if ($trim1+$trim2+$trim3+$trim4 > 0)
 				{
 				    
-					print '<tr '.$bc[$var].'><td align=left>'.$tmpyear.'</td>';
+					print '<tr class="oddeven"><td align=left>'.$tmpyear.'</td>';
 					print '<td align=right>'.price($trim1).'</td>';
 					print '<td align=right>'.price($trim2).'</td>';
 					print '<td align=right>'.price($trim3).'</td>';
@@ -462,7 +462,7 @@ function activitytrim($product_type)
 		if ($trim1+$trim2+$trim3+$trim4 > 0)
 		{
 		    
-			print '<tr '.$bc[$var].'><td align=left>'.$tmpyear.'</td>';
+			print '<tr class="oddeven"><td align=left>'.$tmpyear.'</td>';
 			print '<td align=right>'.price($trim1).'</td>';
 			print '<td align=right>'.price($trim2).'</td>';
 			print '<td align=right>'.price($trim3).'</td>';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 912ee7a7cc0..7c524a167b9 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -951,7 +951,7 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
 		{
 			$ent = new Entrepot($db);
 			$ent->fetch($line['fk_entrepot']);
-			print '<tr '.$bc[$var].'><td width="40%" colspan="4">'.$ent->getNomUrl(3).'</td>';
+			print '<tr class="oddeven"><td width="40%" colspan="4">'.$ent->getNomUrl(3).'</td>';
 			print '<td align="right">'.$line['seuil_stock_alerte'].'</td>';
 			print '<td align="right">'.$line['desiredstock'].'</td>';
 			print '<td align="right"><a href="?id='.GETPOST('id').'&fk_productstockwarehouse='.$line['id'].'&action=delete_productstockwarehouse">'.img_delete().'</a></td>';
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 5295e1a5516..42cacc19272 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -415,7 +415,7 @@ foreach ($dirmodels as $reldir)
 					if ($module->isEnabled())
 					{
 						
-						print '<tr '.$bc[$var].'><td>'.$module->name."</td><td>\n";
+						print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
 						print $module->info();
 						print '</td>';
 
@@ -519,7 +519,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 						if ($module->isEnabled())
 						{
 							
-							print '<tr '.$bc[$var].'><td>'.$module->name."</td><td>\n";
+							print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
 							print $module->info();
 							print '</td>';
 
@@ -661,7 +661,7 @@ foreach ($dirmodels as $reldir)
 							if ($modulequalified)
 							{
 								
-								print '<tr '.$bc[$var].'><td width="100">';
+								print '<tr class="oddeven"><td width="100">';
 								print (empty($module->name)?$name:$module->name);
 								print "</td><td>\n";
 								if (method_exists($module,'info')) print $module->info($langs);
@@ -820,7 +820,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 								if ($modulequalified)
 								{
 									$var = !$var;
-									print '<tr '.$bc[$var].'><td width="100">';
+									print '<tr class="oddeven"><td width="100">';
 									print (empty($module->name)?$name:$module->name);
 									print "</td><td>\n";
 									if (method_exists($module,'info')) print $module->info($langs);
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index b949d5a27ba..517672d14ed 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -354,7 +354,7 @@ foreach ($dirsociete as $dirroot)
     			if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
     			$var = !$var;
-    			print '<tr '.$bc[$var].'>'."\n";
+    			print '<tr class="oddeven">'."\n";
     			print '<td width="140">'.$modCodeTiers->name.'</td>'."\n";
     			print '<td>'.$modCodeTiers->info($langs).'</td>'."\n";
     			print '<td class="nowrap">'.$modCodeTiers->getExample($langs).'</td>'."\n";
@@ -534,7 +534,7 @@ foreach ($dirsociete as $dirroot)
 				if ($modulequalified)
 				{
 					$var = !$var;
-					print '<tr '.$bc[$var].'><td width="100">';
+					print '<tr class="oddeven"><td width="100">';
 					print $module->name;
 					print "</td><td>\n";
 					if (method_exists($module,'info')) print $module->info($langs);
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 0f1450c491a..c3508bd0cef 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -220,7 +220,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
 			{
 				$obj = $db->fetch_object($result);
 				
-				print '<tr '.$bc[$var].'><td>'.$obj->label.'</td><td>'.$obj->nb.'</td></tr>';
+				print '<tr class="oddeven"><td>'.$obj->label.'</td><td>'.$obj->nb.'</td></tr>';
 				$total+=$obj->nb;
 				$i++;
 			}
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 8b77c8f52a4..d547d9e57dc 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -251,7 +251,7 @@ if ($result > 0)
  			$label=($langs->trans("Notify_".$managedeventfornotification['code'])!="Notify_".$managedeventfornotification['code']?$langs->trans("Notify_".$managedeventfornotification['code']):$managedeventfornotification['label']);
             $actions[$managedeventfornotification['rowid']]=$label;
         }
-        print '<tr '.$bc[$var].'><td class="maxwidthonsmartphone">';
+        print '<tr class="oddeven"><td class="maxwidthonsmartphone">';
         print $form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
         print '</td>';
         print '<td class="maxwidthonsmartphone">';
@@ -266,7 +266,7 @@ if ($result > 0)
     }
     else
     {
-        print '<tr '.$bc[$var].'><td colspan="4" class="opacitymedium">';
+        print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
         print $langs->trans("YouMustCreateContactFirst");
         print '</td></tr>';
     }
@@ -362,7 +362,7 @@ if ($result > 0)
     {
     	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
     	$var = ! $var;
-		print '<tr '.$bc[$var].'><td>';
+		print '<tr class="oddeven"><td>';
 		$listtmp=explode(',',$val);
 		$first=1;
 		foreach($listtmp as $keyemail => $valemail)
@@ -402,7 +402,7 @@ if ($result > 0)
     /*if ($user->admin)
     {
 	    $var = ! $var;
-		print '<tr '.$bc[$var].'><td colspan="4">';
+		print '<tr class="oddeven"><td colspan="4">';
 		print '+ <a href="'.DOL_URL_ROOT.'/admin/notification.php">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</a>';
 		print '</td></tr>';
     }*/
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 09c7e230739..1c16d48e086 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -68,7 +68,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<table class="noborder nohover" width="100%">';
     print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr '.$bc[$var].'><td>';
+    print '<tr class="oddeven"><td>';
     print $langs->trans("SupplierProposal").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
     print '</tr>';
     print "</table></form><br>\n";
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index f18197dccc8..4f47578f543 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -221,7 +221,7 @@ if ($result > 0)
  			$label=($langs->trans("Notify_".$notifiedevent['code'])!="Notify_".$notifiedevent['code']?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label']);
             $actions[$notifiedevent['rowid']]=$label;
         }
-        print '<tr '.$bc[$var].'><td>';
+        print '<tr class="oddeven"><td>';
         print $object->getNomUrl(1);
         if (isValidEmail($object->email))
         {
@@ -245,7 +245,7 @@ if ($result > 0)
     }
     else
     {
-        print '<tr '.$bc[$var].'><td colspan="4">';
+        print '<tr class="oddeven"><td colspan="4">';
         print $langs->trans("YouMustAssignUserMailFirst");
         print '</td></tr>';
     }
@@ -307,7 +307,7 @@ if ($result > 0)
             $userstatic->id=$obj->userid;
             $userstatic->lastname=$obj->lastname;
             $userstatic->firstname=$obj->firstname;
-            print '<tr '.$bc[$var].'><td>'.$userstatic->getNomUrl(1);
+            print '<tr class="oddeven"><td>'.$userstatic->getNomUrl(1);
             if ($obj->type == 'email')
             {
                 if (isValidEmail($obj->email))
@@ -343,7 +343,7 @@ if ($result > 0)
     {
     	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
     	$var = ! $var;
-		print '<tr '.$bc[$var].'><td>';
+		print '<tr class="oddeven"><td>';
 		$listtmp=explode(',',$val);
 		$first=1;
 		foreach($listtmp as $keyemail => $valemail)
@@ -382,7 +382,7 @@ if ($result > 0)
     /*if ($user->admin)
     {
 	    $var = ! $var;
-		print '<tr '.$bc[$var].'><td colspan="4">';
+		print '<tr class="oddeven"><td colspan="4">';
 		print '+ <a href="'.DOL_URL_ROOT.'/admin/notification.php">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</a>';
 		print '</td></tr>';
     }*/
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 0348eb0e288..956291f1e9d 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -242,7 +242,7 @@ if ($action == 'edit')
 
     // Landing page
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("LandingPage").'</td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("LandingPage").'</td>';
     print '<td>';
     print (empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE);
     print '</td>';
@@ -256,7 +256,7 @@ if ($action == 'edit')
     
     // Langue par defaut
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("Language").'</td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("Language").'</td>';
     print '<td>';
     $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
     print $s?$s.' ':'';
@@ -271,7 +271,7 @@ if ($action == 'edit')
 
     // Taille max des listes
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("MaxSizeList").'</td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MaxSizeList").'</td>';
     print '<td>'.$conf->global->MAIN_SIZE_LISTE_LIMIT.'</td>';
     print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_SIZE_LISTE_LIMIT" id="check_SIZE_LISTE_LIMIT" type="checkbox" '.(! empty($object->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"");
     print empty($dolibarr_main_demo)?'':' disabled="disabled"';	// Disabled for demo
@@ -308,7 +308,7 @@ else
 
     // Landing page
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("LandingPage").'</td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("LandingPage").'</td>';
     print '<td>';
     print (empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE);
     print '</td>';
@@ -326,7 +326,7 @@ else
     
     // Language
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("Language").'</td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("Language").'</td>';
     print '<td>';
     $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
     print ($s?$s.' ':'');
@@ -340,7 +340,7 @@ else
     print '</td></tr>';
 
     
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("MaxSizeList").'</td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MaxSizeList").'</td>';
     print '<td>'.(! empty($conf->global->MAIN_SIZE_LISTE_LIMIT)?$conf->global->MAIN_SIZE_LISTE_LIMIT:'&nbsp;').'</td>';
     print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' type="checkbox" disabled '.(! empty($object->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
     print '<td>' . (! empty($object->conf->MAIN_SIZE_LISTE_LIMIT)?$object->conf->MAIN_SIZE_LISTE_LIMIT:'&nbsp;') . '</td></tr>';

From 5931bc4068cec7394e5d024892a7218deb3ab1e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 13:21:02 +0200
Subject: [PATCH 0605/1163] NEW Feature to crop/resize images available on user
 and expense reports

---
 htdocs/core/class/html.formfile.class.php     |  5 +-
 htdocs/core/js/lib_photosresize.js            |  1 +
 htdocs/core/photos_resize.php                 | 62 +++++++++++++++----
 .../tpl/document_actions_post_headers.tpl.php |  6 ++
 htdocs/user/document.php                      |  3 +-
 5 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 56d3b5e29fb..8d90892cfb6 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -999,6 +999,7 @@ class FormFile
 			    print '<input type="hidden" name="id" value="'.$object->id.'">';
 			    print '<input type="hidden" name="modulepart" value="'.$modulepart.'">';
 			}
+			print '<div class="div-table-responsive-no-min">';
 			print '<table width="100%" id="tablelines" class="'.($useinecm?'liste noborder':'liste').'">'."\n";
 			
 			print '<tr class="liste_titre nodrag nodrop">';
@@ -1182,7 +1183,7 @@ class FormFile
         					if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
     						
         					$disablecrop=1; 
-        					if (in_array($modulepart, array('product','produit','service','holiday','project'))) $disablecrop=0;
+        					if (in_array($modulepart, array('product','produit','service','expensereport','holiday','project','user'))) $disablecrop=0;
         					
     					    if (! $disablecrop && image_format_supported($file['name']) > 0)
     						{
@@ -1256,7 +1257,7 @@ class FormFile
 				print '</td></tr>';
 			}
 			print "</table>";
-			
+			print '</div>';
 			
 			if (! $editline && $nboflines > 1) { 
 				if (! empty($conf->use_javascript_ajax) && $permtoeditline) {
diff --git a/htdocs/core/js/lib_photosresize.js b/htdocs/core/js/lib_photosresize.js
index 3463b82931f..9c4c6671b1e 100644
--- a/htdocs/core/js/lib_photosresize.js
+++ b/htdocs/core/js/lib_photosresize.js
@@ -33,6 +33,7 @@ function updateCoords(c)
 	//alert(parseInt(jQuery("#ratioforcrop").val()));
 	ratio=1;
 	if (parseInt(jQuery("#ratioforcrop").val()) > 0) ratio = parseInt(jQuery("#ratioforcrop").val());
+	//console.log(ratio);
 	jQuery('#x').val(Math.ceil(c.x * ratio));
 	jQuery('#y').val(Math.ceil(c.y * ratio));
 	jQuery('#x2').val(Math.ceil(c.x2 * ratio));
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 8fcd0d2b930..5b29d25202e 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -59,6 +59,18 @@ elseif ($modulepart == 'holiday')
 	if (! $user->rights->holiday->read) accessforbidden();
 	$accessallowed=1;
 }
+elseif ($modulepart == 'expensereport')
+{
+	$result=restrictedArea($user,'expensereport',$id,'expensereport');
+	if (! $user->rights->expensereport->lire) accessforbidden();
+	$accessallowed=1;
+}
+elseif ($modulepart == 'user')
+{
+    $result=restrictedArea($user,'user',$id,'user');
+    if (! $user->rights->user->user->lire) accessforbidden();
+    $accessallowed=1;
+}
 
 // Security:
 // Limit access if permissions are wrong
@@ -103,12 +115,36 @@ elseif ($modulepart == 'holiday')
 		$dir=$conf->holiday->dir_output;	// By default
 	}
 }
+elseif ($modulepart == 'user')
+{
+    require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+    $object = new User($db);
+    if ($id > 0)
+    {
+        $result = $object->fetch($id);
+        if ($result <= 0) dol_print_error($db,'Failed to load object');
+        $dir=$conf->user->dir_output;	// By default
+    }
+}
+elseif ($modulepart == 'expensereport')
+{
+    require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+    $object = new ExpenseReport($db);
+    if ($id > 0)
+    {
+        $result = $object->fetch($id);
+        if ($result <= 0) dol_print_error($db,'Failed to load object');
+        $dir=$conf->expensereport->dir_output;	// By default
+    }
+}
 
 if (empty($backtourl))
 {
     if (in_array($modulepart, array('product','produit','service','produit|service'))) $backtourl=DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    else if (in_array($modulepart, array('expensereport'))) $backtourl=DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
     else if (in_array($modulepart, array('holiday'))) $backtourl=DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
     else if (in_array($modulepart, array('project'))) $backtourl=DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    else if (in_array($modulepart, array('user'))) $backtourl=DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
 }
 
 
@@ -185,7 +221,7 @@ if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POS
 		}
 		else
 		{
-    	    dol_print_error('', 'Cancel on photo_resize with a not supported value of modulepart='.$modulepart);
+    	    dol_print_error('', 'confirm_resize on photo_resize without backtourl defined for modulepart='.$modulepart);
     	    exit;
 		}
 	}
@@ -253,7 +289,7 @@ if ($action == 'confirm_crop')
 		}
 		else
 		{
-    	    dol_print_error('', 'Cancel on photo_resize with a not supported value of modulepart='.$modulepart);
+    	    dol_print_error('', 'confirm_crop on photo_resize without backtourl defined for modulepart='.$modulepart);
     	    exit;
 		}
 	}
@@ -294,8 +330,8 @@ print '<form name="redim_file" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" meth
 print '<fieldset id="redim_file">';
 print '<legend>'.$langs->trans("Resize").'</legend>';
 print $langs->trans("ResizeDesc").'<br>';
-print $langs->trans("NewLength").': <input class="flat" name="sizex" size="10" type="text" > px  &nbsp; '.$langs->trans("or").' &nbsp; ';
-print $langs->trans("NewHeight").': <input class="flat" name="sizey" size="10" type="text" > px &nbsp; <br>';
+print $langs->trans("NewLength").': <input name="sizex" type="number" class="flat maxwidth50"> px  &nbsp; '.$langs->trans("or").' &nbsp; ';
+print $langs->trans("NewHeight").': <input name="sizey" type="number" class="flat maxwidth50"> px &nbsp; <br>';
 
 print '<input type="hidden" name="file" value="'.dol_escape_htmltag(GETPOST('file')).'" />';
 print '<input type="hidden" name="action" value="confirm_resize" />';
@@ -323,11 +359,12 @@ if (! empty($conf->use_javascript_ajax))
 	$height=$infoarray['height'];
 	$width=$infoarray['width'];
 	$widthforcrop=$width; $refsizeforcrop='orig'; $ratioforcrop=1;
+	// If image is too large, we use another scale.
 	if (! empty($_SESSION['dol_screenwidth']) && ($widthforcrop > round($_SESSION['dol_screenwidth']/2)))
 	{
-		$widthforcrop=min(round($_SESSION['dol_screenwidth']/2),$widthforcrop);
+		$widthforcrop=round($_SESSION['dol_screenwidth']/2);
 		$refsizeforcrop='screenwidth';
-		$ratioforcrop=2;
+		$ratioforcrop=1;
 	}
 
 	print '<!-- Form to crop -->'."\n";
@@ -342,12 +379,12 @@ if (! empty($conf->use_javascript_ajax))
 	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">
 	      <div class="jc_coords">
 	         '.$langs->trans("NewSizeAfterCropping").':
-	         <label>X1 <input type="text" size="4" id="x" name="x" /></label>
-	         <label>Y1 <input type="text" size="4" id="y" name="y" /></label>
-	         <label>X2 <input type="text" size="4" id="x2" name="x2" /></label>
-	         <label>Y2 <input type="text" size="4" id="y2" name="y2" /></label>
-	         <label>W <input type="text" size="4" id="w" name="w" /></label>
-	         <label>H <input type="text" size="4" id="h" name="h" /></label>
+	         <label>X1 <input type="number" class="flat maxwidth50" id="x" name="x" /></label>
+	         <label>Y1 <input type="number" class="flat maxwidth50" id="y" name="y" /></label>
+	         <label>X2 <input type="number" class="flat maxwidth50" id="x2" name="x2" /></label>
+	         <label>Y2 <input type="number" class="flat maxwidth50" id="y2" name="y2" /></label>
+	         <label>W  <input type="number" class="flat maxwidth50" id="w" name="w" /></label>
+	         <label>H  <input type="number" class="flat maxwidth50" id="h" name="h" /></label>
 	      </div>
 
 	      <input type="hidden" id="file" name="file" value="'.dol_escape_htmltag($original_file).'" />
@@ -370,6 +407,7 @@ if (! empty($conf->use_javascript_ajax))
 print '<script type="text/javascript" language="javascript">
 jQuery(document).ready(function() {
 	$("#submitcrop").click(function(e) {
+        console.log("We click on submitcrop");
 	    var idClicked = e.target.id;
 	    if (parseInt(jQuery(\'#w\').val())) return true;
 	    alert(\''.dol_escape_js($langs->trans("ErrorFieldRequired", $langs->trans("Dimension"))).'\');
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index c4e2dbc89f9..064eda8e5b5 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -18,6 +18,12 @@
  * or see http://www.gnu.org/
  */
 
+// Following var can be set
+// $permission = permission or not to add a file
+// $permtoedit = permission or not to edit file name, crop file
+// $modulepart = for download
+// $param      = param to add to download links
+
 $langs->load("link");
 if (empty($relativepathwithnofile)) $relativepathwithnofile='';
 if (empty($permtoedit)) $permtoedit=-1;
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 94a9db840e3..fa4946b8dc4 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
@@ -166,6 +166,7 @@ if ($object->id)
 
 	$modulepart = 'user';
 	$permission = $user->rights->user->user->creer;
+	$permtoedit = $user->rights->user->user->creer;
 	$param = '&id=' . $object->id;
 	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 }

From aef3592698712bdc159adc966630f9116a709f5f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 13:56:26 +0200
Subject: [PATCH 0606/1163] Fix travis

---
 test/phpunit/ProductTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/ProductTest.php b/test/phpunit/ProductTest.php
index 199aace802c..87f290593f0 100644
--- a/test/phpunit/ProductTest.php
+++ b/test/phpunit/ProductTest.php
@@ -232,7 +232,7 @@ class ProductTest extends PHPUnit_Framework_TestCase
         $localobject=new Product($this->savdb);
         $result=$localobject->fetch($id);
 
-        $result=$localobject->delete($id);
+        $result=$localobject->delete($user);
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 

From 62394abb8b39ced6322ad61127755ab91eadcbdc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 14:11:52 +0200
Subject: [PATCH 0607/1163] Introduce skeleton for a collab module. Volunteer
 wanted.

---
 htdocs/core/modules/modCollab.class.php | 126 ++++++++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 htdocs/core/modules/modCollab.class.php

diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
new file mode 100644
index 00000000000..490caeccea2
--- /dev/null
+++ b/htdocs/core/modules/modCollab.class.php
@@ -0,0 +1,126 @@
+<?php
+/* Copyright (C) 2017      Laurent Destailleur <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	\defgroup   collab     Module collab
+ *  \brief      Collab module descriptor.
+ *  \file       htdocs/core/modules/modCollab.class.php
+ *  \ingroup    collab
+ *  \brief      Description and activation file for module Collab
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ *	Class to describe Websites module
+ */
+class modCollab extends DolibarrModules
+{
+
+    /**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+    	global $langs,$conf;
+
+        $this->db = $db;
+        $this->numero = 30000;
+        
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+        $this->family = "portal";
+        $this->module_position = 50;
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Enable the public collaboration features, like shared pad, shared online sheets, etc...";
+        $this->version = 'development';                        // 'experimental' or 'dolibarr' or version
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
+        $this->special = 0;
+        // Name of image file used for this module.
+        $this->picto='globe';
+
+		// Data directories to create when module is enabled
+		$this->dirs = array("/collab/temp");
+
+        // Config pages
+        //-------------
+        $this->config_page_url = array('collab.php');
+
+        // Dependancies
+        //-------------
+		$this->hidden = ! empty($conf->global->MODULE_COLLAB_DISABLED);	// A condition to disable module
+		$this->depends = array();		// List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of modules id to disable if this one is disabled
+		$this->conflictwith = array();	// List of modules id this module is in conflict with
+        $this->langfiles = array("collab");
+
+        // Constants
+        //-----------
+       	$this->const = array();
+
+        // New pages on tabs
+        // -----------------
+        $this->tabs = array();
+
+        // Boxes
+        //------
+        $this->boxes = array();
+
+		// Permissions
+		$this->rights = array();		// Permission array used by this module
+		$this->rights_class = 'websites';
+		$r=0;
+
+		/*$this->rights[$r][0] = 30001;
+		$this->rights[$r][1] = 'Read website content';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'read';
+		$r++;
+
+		$this->rights[$r][0] = 30002;
+		$this->rights[$r][1] = 'Create/modify website content';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'write';
+		$r++;
+
+		$this->rights[$r][0] = 30003;
+		$this->rights[$r][1] = 'Delete website content';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'delete';
+		$r++;*/
+
+        // Main menu entries
+        $r=0;
+        $this->menu[$r]=array(	'fk_menu'=>'0',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+						        'type'=>'top',			                // This is a Left menu entry
+						        'titre'=>'Collab',
+                                'mainmenu'=>'collab',
+						        'url'=>'/collab/index.php',
+						        'langs'=>'collab',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+						        'position'=>100,
+						        'enabled'=>'$conf->collab->enabled',  		// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+						        'perms'=>'1',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+						        'target'=>'',
+						        'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+        $r++;
+    }
+}

From c7160ad2b9c78d02616ce9afe7cdb04f1a716ac4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 14:19:21 +0200
Subject: [PATCH 0608/1163] Avoid warning

---
 htdocs/core/modules/syslog/mod_syslog_file.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index c81fa4c2ba5..91af81ef178 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -104,8 +104,9 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	private function getFilename($suffixinfilename='')
 	{
 	    global $conf;
-		$tmp=str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
-		return $suffixinfilename?preg_replace('/\.log$/i', $suffixinfilename.'.log', $tmp):$tmp;
+	    if (! empty($conf->global->SYSLOG_FILE)) $tmp=str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
+	    else $tmp='dolibarr.log';
+	    return $suffixinfilename?preg_replace('/\.log$/i', $suffixinfilename.'.log', $tmp):$tmp;
 	}
 
 	/**

From 12ca11e2fa89626c4035edef11de2fcdd517890f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 15:42:58 +0200
Subject: [PATCH 0609/1163] Fix regression

---
 htdocs/webservices/server_productorservice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index 385c7dc3b95..cf926c6409e 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -872,7 +872,7 @@ function deleteProductOrService($authentication,$listofidstring)
 	        }
 	        else
 			{
-		        $result=$newobject->delete();
+		        $result=$newobject->delete($user);
 		        if ($result <= 0)
 		        {
 		            $error++;

From db73eeba5cda17ec892dd650f17b585f8e1fe728 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 16:31:16 +0200
Subject: [PATCH 0610/1163] NEW Can filter on code in dictionnaries

---
 htdocs/admin/dict.php | 110 ++++++++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 51 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index df127ed1a91..7df4fed113c 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -78,6 +78,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 $search_country_id = GETPOST('search_country_id','int');
+$search_code = GETPOST('search_code','alpha');
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('admin'));
@@ -569,6 +570,7 @@ if ($id == 10)
 if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
 {
     $search_country_id = '';    
+    $search_code = '';    
 }
 
 // Actions add or modify an entry into a dictionary
@@ -803,7 +805,7 @@ if ($action == $acts[0])
         $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
     }
     elseif ($_GET["code"]) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$_GET["code"]."'";
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".dol_escape_htmltag($_GET["code"])."'";
     }
 
     $result = $db->query($sql);
@@ -823,7 +825,7 @@ if ($action == $acts[1])
         $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
     }
     elseif ($_GET["code"]) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$_GET["code"]."'";
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".dol_escape_htmltag($_GET["code"])."'";
     }
 
     $result = $db->query($sql);
@@ -843,7 +845,7 @@ if ($action == 'activate_favorite')
         $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$rowid."'";
     }
     elseif ($_GET["code"]) {
-        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".$_GET["code"]."'";
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".dol_escape_htmltag($_GET["code"])."'";
     }
 
     $result = $db->query($sql);
@@ -863,7 +865,7 @@ if ($action == 'disable_favorite')
         $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$rowid."'";
     }
     elseif ($_GET["code"]) {
-        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".$_GET["code"]."'";
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".dol_escape_htmltag($_GET["code"])."'";
     }
 
     $result = $db->query($sql);
@@ -915,7 +917,7 @@ print "<br>\n";
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$_GET["code"].'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.urlencode($_GET["code"]).'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
 }
 //var_dump($elementList);
 
@@ -927,12 +929,9 @@ if ($id)
     // Complete requete recherche valeurs avec critere de tri
     $sql=$tabsql[$id];
 
-    if ($search_country_id > 0)
-    {
-        if (preg_match('/ WHERE /',$sql)) $sql.= " AND ";
-        else $sql.=" WHERE ";
-        $sql.= " c.rowid = ".$search_country_id;
-    }
+    $sql.=" WHERE 1 = 1";
+    if ($search_country_id > 0) $sql.= " AND c.rowid = ".$search_country_id;
+    if ($search_code != '')     $sql.= natural_search("code", $search_code);
     
     if ($sortfield)
     {
@@ -1126,6 +1125,7 @@ if ($id)
 
         $param = '&id='.$id;
         if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
+        if ($search_code != '')     $param.= '&search_code='.urlencode($search_country_id);
         $paramwithsearch = $param;
         if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
         if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
@@ -1139,8 +1139,51 @@ if ($id)
             print '</td></tr>';
         }
 
+        // Title line with search boxes
+        print '<tr class="liste_titre_filter liste_titre_add">';
+        $filterfound=0;
+        foreach ($fieldlist as $field => $value)
+        {
+            $showfield=1;							  	// By defaut
+            
+            if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
+            
+            if ($showfield)
+            {
+                if ($value == 'country')
+                {
+                    print '<td class="liste_titre">';
+                    print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
+                    print '</td>';
+                    $filterfound++;
+                }
+                elseif ($value == 'code')
+                {
+                    print '<td class="liste_titre">';
+                    print '<input type="text" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
+                    print '</td>';
+                    $filterfound++;
+                }
+                else
+                {
+                    print '<td class="liste_titre">';
+                    print '</td>';
+                }
+            }
+        }
+        if ($id == 4) print '<td></td>';
+        print '<td class="liste_titre"></td>';
+    	print '<td class="liste_titre" colspan="2" align="right">';
+    	if ($filterfound)
+    	{
+        	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+        	print $searchpitco;
+    	}
+    	print '</td>';
+        print '</tr>';
+            
         // Title of lines
-        print '<tr class="liste_titre liste_titre_add">';
+        print '<tr class="liste_titre">';
         foreach ($fieldlist as $field => $value)
         {
             // Determine le nom du champ par rapport aux noms possibles
@@ -1229,51 +1272,14 @@ if ($id)
         print getTitleFieldOfList('');
         print '</tr>';
 
-        // Title line with search boxes
-        print '<tr class="liste_titre">';
-        $filterfound=0;
-        foreach ($fieldlist as $field => $value)
-        {
-            $showfield=1;							  	// By defaut
-            
-            if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
-            
-            if ($showfield)
-            {
-                if ($value == 'country')
-                {
-                    print '<td class="liste_titre">';
-                    print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
-                    print '</td>';
-                    $filterfound++;
-                }
-                else
-                {
-                    print '<td class="liste_titre"></td>';
-                }
-            }
-        }
-        if ($id == 4) print '<td></td>';
-        print '<td class="liste_titre"></td>';
-    	print '<td class="liste_titre" colspan="2" align="right">';
-    	if ($filterfound)
-    	{
-        	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-        	print $searchpitco;
-    	}
-    	print '</td>';
-        print '</tr>';
-            
         if ($num)
         {
             // Lines with values
             while ($i < $num)
             {
-                $var = ! $var;
-
                 $obj = $db->fetch_object($resql);
                 //print_r($obj);
-                print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
+                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
                 if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
                 {
                     $tmpaction='edit';
@@ -1491,8 +1497,10 @@ if ($id)
                     $canbemodified=$iserasable;
                     if ($obj->code == 'RECEP') $canbemodified=1;
 
+                    // Url 
                     $rowidcol=$tabrowid[$id];
-                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->{$rowidcol})?$obj->{$rowidcol}:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
+                    if ($id == 17) $rowidcol='rowid';
+                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->{$rowidcol})?$obj->{$rowidcol}:(! empty($obj->code)?urlencode($obj->code):'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
                     if ($param) $url .= '&'.$param;
                     $url.='&';
 

From 8c07f514c831825701be4c12ce260310f482794e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 16:50:30 +0200
Subject: [PATCH 0611/1163] Add php unit tests on expense reports

---
 htdocs/api/class/api.class.php                |   1 -
 .../doc/pdf_standard.modules.php              |   2 -
 htdocs/expensereport/card.php                 |   2 +-
 .../class/expensereport.class.php             | 144 ++++----
 test/phpunit/AllTests.php                     |   3 +
 test/phpunit/CommandeFournisseurTest.php      |   2 +-
 test/phpunit/ExpenseReportTest.php            | 316 ++++++++++++++++++
 7 files changed, 394 insertions(+), 76 deletions(-)
 create mode 100644 test/phpunit/ExpenseReportTest.php

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 1204fded0aa..7aef2671c8d 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -90,7 +90,6 @@ class DolibarrApi
         // Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses
         unset($object->linkedObjects);
         
-        unset($object->lignes); // should be ->lines
         unset($object->oldline);
         
         unset($object->error);
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index bd48e33a11d..e4ad7b7db36 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -186,8 +186,6 @@ class pdf_standard extends ModeleExpenseReport
 				}
 			}
 
-			if (isset($object->lignes) && ! isset($object->lines)) $object->lines=$object->lignes;
-
 			if (file_exists($dir))
 			{
 				// Add pdfgeneration hook
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 12956ee5764..db2328cdfb4 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2141,7 +2141,7 @@ if ($action != 'create' && $action != 'edit')
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
 
 			// Validate
-			if (count($object->lines) > 0 || count($object->lignes) > 0)
+			if (count($object->lines) > 0)
 			{
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=save&id='.$object->id.'">'.$langs->trans('ValidateAndSubmit').'</a></div>';
 			}
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index e4754f4ab60..f88c667352c 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -182,10 +182,10 @@ class ExpenseReport extends CommonObject
             $resql=$this->db->query($sql);
             if (!$resql) $error++;
 
-            foreach ($this->lignes as $i => $val)
+            foreach ($this->lines as $i => $val)
             {
                 $newndfline=new ExpenseReportLine($this->db);
-                $newndfline=$this->lignes[$i];
+                $newndfline=$this->lines[$i];
                 $newndfline->fk_expensereport=$this->id;
                 if ($result >= 0)
                 {
@@ -241,11 +241,10 @@ class ExpenseReport extends CommonObject
         }
         else
         {
-            $this->error=$this->db->error()." sql=".$sql;
+            $this->error=$this->db->lasterror()." sql=".$sql;
             $this->db->rollback();
             return -1;
         }
-
     }
 
 
@@ -266,57 +265,58 @@ class ExpenseReport extends CommonObject
         $this->db->begin();
     
         // get extrafields so they will be clone
-        foreach($this->lines as $line)
+        //foreach($this->lines as $line)
             //$line->fetch_optionals($line->rowid);
     
-            // Load source object
-            $objFrom = clone $this;
-    
-            $this->id=0;
-            $this->ref = '';
-            $this->statut=0;
-    
-            // Clear fields
-            $this->fk_user_author     = $user->id;     // Note fk_user_author is not the 'author' but the guy the expense report is for.
-            $this->fk_user_valid      = '';
-            $this->date_create  	  = '';
-            $this->date_creation      = '';
-            $this->date_validation    = '';
-    
-            // Create clone
-            $result=$this->create($user);
+        // Load source object
+        $objFrom = clone $this;
+
+        $this->id=0;
+        $this->ref = '';
+        $this->status=0;
+        $this->fk_statut=0;
+
+        // Clear fields
+        $this->fk_user_author     = $user->id;     // Note fk_user_author is not the 'author' but the guy the expense report is for.
+        $this->fk_user_valid      = '';
+        $this->date_create  	  = '';
+        $this->date_creation      = '';
+        $this->date_validation    = '';
+
+        // Create clone
+        $result=$this->create($user);
+        if ($result < 0) $error++;
+
+        if (! $error)
+        {
+            // Hook of thirdparty module
+            if (is_object($hookmanager))
+            {
+                $parameters=array('objFrom'=>$objFrom);
+                $action='';
+                $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                if ($reshook < 0) $error++;
+            }
+
+            // Call trigger
+            $result=$this->call_trigger('EXPENSEREPORT_CLONE',$user);
             if ($result < 0) $error++;
-    
-            if (! $error)
-            {
-                // Hook of thirdparty module
-                if (is_object($hookmanager))
-                {
-                    $parameters=array('objFrom'=>$objFrom);
-                    $action='';
-                    $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-                    if ($reshook < 0) $error++;
-                }
-    
-                // Call trigger
-                $result=$this->call_trigger('EXPENSEREPORT_CLONE',$user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
-    
-            unset($this->context['createfromclone']);
-    
-            // End
-            if (! $error)
-            {
-                $this->db->commit();
-                return $this->id;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -1;
-            }
+            // End call triggers
+        }
+
+        unset($this->context['createfromclone']);
+
+        // End
+        if (! $error)
+        {
+            $this->db->commit();
+            return $this->id;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
     }
     
     
@@ -475,7 +475,6 @@ class ExpenseReport extends CommonObject
                 $this->code_statut      = $obj->code_statut;
                 $this->code_paiement    = $obj->code_paiement;
 
-                $this->lignes = array();    // deprecated
                 $this->lines = array();
 
                 $result=$this->fetch_lines();
@@ -698,6 +697,8 @@ class ExpenseReport extends CommonObject
         $this->date_fin = $now;
         $this->date_approve = $now;
 
+        $type_fees_id = 2;  // TF_TRIP 
+        
         $this->status = 5;
         $this->fk_statut = 5;
 
@@ -723,6 +724,7 @@ class ExpenseReport extends CommonObject
             $line->value_unit=120;
             $line->fk_expensereport=0;
             $line->type_fees_code='TRA';
+            $line->fk_c_type_fees=$type_fees_id;
 
             $line->projet_ref = 'ABC';
 
@@ -748,7 +750,7 @@ class ExpenseReport extends CommonObject
 
         $langs->load('trips');
 
-        if($user->rights->expensereport->lire) {
+        if ($user->rights->expensereport->lire) {
 
             $sql = "SELECT de.fk_expensereport, de.date, de.comments, de.total_ht, de.total_ttc";
             $sql.= " FROM ".MAIN_DB_PREFIX."expensereport_det as de";
@@ -834,7 +836,7 @@ class ExpenseReport extends CommonObject
             }
             else
             {
-                $this->error=$db->error();
+                $this->error=$db->lasterror();
                 return -1;
             }
         }
@@ -856,8 +858,6 @@ class ExpenseReport extends CommonObject
 
         $total_ht = 0; $total_tva = 0; $total_ttc = 0;
 
-        dol_syslog('ExpenseReport::recalculer sql='.$sql,LOG_DEBUG);
-
         $result = $this->db->query($sql);
         if($result)
         {
@@ -881,15 +881,15 @@ class ExpenseReport extends CommonObject
             $this->db->free($result);
             return 1;
             else:
-            $this->error=$this->db->error();
-            dol_syslog('ExpenseReport::recalculer: Error '.$this->error,LOG_ERR);
+            $this->error=$this->db->lasterror();
+            dol_syslog(get_class($this)."::recalculer: Error ".$this->error,LOG_ERR);
             return -3;
             endif;
         }
         else
         {
-            $this->error=$this->db->error();
-            dol_syslog('ExpenseReport::recalculer: Error '.$this->error,LOG_ERR);
+            $this->error=$this->db->lasterror();
+            dol_syslog(get_class($this)."::recalculer: Error ".$this->error,LOG_ERR);
             return -3;
         }
     }
@@ -914,7 +914,6 @@ class ExpenseReport extends CommonObject
         $sql.= ' WHERE de.'.$this->fk_element.' = '.$this->id;
 		$sql.= ' ORDER BY de.date ASC';
 
-        dol_syslog('ExpenseReport::fetch_lines sql='.$sql, LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -947,7 +946,6 @@ class ExpenseReport extends CommonObject
                 $deplig->projet_ref         = $objp->ref_projet;
                 $deplig->projet_title       = $objp->title_projet;
 
-                $this->lignes[$i] = $deplig;
                 $this->lines[$i] = $deplig;
 
                 $i++;
@@ -958,7 +956,7 @@ class ExpenseReport extends CommonObject
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog('ExpenseReport::fetch_lines: Error '.$this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::fetch_lines: Error ".$this->error, LOG_ERR);
             return -3;
         }
     }
@@ -989,7 +987,7 @@ class ExpenseReport extends CommonObject
             else
             {
                 $this->error=$this->db->error()." sql=".$sql;
-                dol_syslog("ExpenseReport.class::delete ".$this->error, LOG_ERR);
+                dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -6;
             }
@@ -997,7 +995,7 @@ class ExpenseReport extends CommonObject
         else
         {
             $this->error=$this->db->error()." sql=".$sql;
-            dol_syslog("ExpenseReport.class::delete ".$this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -4;
         }
@@ -1008,7 +1006,7 @@ class ExpenseReport extends CommonObject
      *
      * @param   User    $fuser      User
 	 * @param   int     $notrigger  Disable triggers
-     * @return  int                 <0 if KO, >0 if OK
+     * @return  int                 <0 if KO, 0 if nothing done, >0 if OK
      */
     function setValidate($fuser, $notrigger=0)
     {
@@ -1051,7 +1049,7 @@ class ExpenseReport extends CommonObject
             $dirdest = $conf->expensereport->dir_output.'/'.$newref;
             if (file_exists($dirsource))
             {
-                dol_syslog(get_class($this)."::valid() rename dir ".$dirsource." into ".$dirdest);
+                dol_syslog(get_class($this)."::setValidate() rename dir ".$dirsource." into ".$dirdest);
 
                 if (@rename($dirsource, $dirdest))
                 {
@@ -1116,8 +1114,10 @@ class ExpenseReport extends CommonObject
         }
         else
         {
-            dol_syslog(get_class($this)."::set_save expensereport already with save status", LOG_WARNING);
+            dol_syslog(get_class($this)."::setValidate expensereport already with validated status", LOG_WARNING);
         }
+        
+        return 0;
     }
 
     /**
@@ -1170,7 +1170,7 @@ class ExpenseReport extends CommonObject
      *
      * @param   User    $fuser      User
 	 * @param   int     $notrigger  Disable triggers
-     * @return  int                 <0 if KO, >0 if OK
+     * @return  int                 <0 if KO, 0 if nothing done, >0 if OK
      */
     function setApproved($fuser, $notrigger=0)
     {
@@ -1221,8 +1221,10 @@ class ExpenseReport extends CommonObject
         }
         else
         {
-            dol_syslog(get_class($this)."::set_valide expensereport already with valide status", LOG_WARNING);
+            dol_syslog(get_class($this)."::setApproved expensereport already with approve status", LOG_WARNING);
         }
+        
+        return 0;
     }
 
     /**
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 2dfdf4cb5c2..99f9faf260d 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -176,6 +176,9 @@ class AllTests
         $suite->addTestSuite('ChargeSocialesTest');
         require_once dirname(__FILE__).'/HolidayTest.php';
         $suite->addTestSuite('HolidayTest');
+        require_once dirname(__FILE__).'/ExpenseReportTest.php';
+        $suite->addTestSuite('ExpenseReportTest');
+        
         require_once dirname(__FILE__).'/EntrepotTest.php';
         $suite->addTestSuite('EntrepotTest');
         require_once dirname(__FILE__).'/MouvementStockTest.php';
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index 03880a56eca..2d615e0bd06 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -264,7 +264,7 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
      * @param   Object  $localobject        Supplier order
      * @return  void
      *
-     * @depends testCommandeFournisseurValid
+     * @depends testCommandeFournisseurApprove
      * The depends says test is run only if previous is ok
      */
     public function testCommandeFournisseurCancel($localobject)
diff --git a/test/phpunit/ExpenseReportTest.php b/test/phpunit/ExpenseReportTest.php
new file mode 100644
index 00000000000..b9af3dc1078
--- /dev/null
+++ b/test/phpunit/ExpenseReportTest.php
@@ -0,0 +1,316 @@
+<?php
+/* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/ExpenseReportTest.php
+ *      \ingroup    test
+ *      \brief      PHPUnit test
+ *      \remarks    To run this script as CLI:  phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/expensereport/class/expensereport.class.php';
+
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class ExpenseReportTest extends PHPUnit_Framework_TestCase
+{
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return ExpenseReportTest
+     */
+    function __construct()
+    {
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
+    public static function tearDownAfterClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->rollback();
+
+        print __METHOD__."\n";
+    }
+
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
+    protected function setUp()
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        print __METHOD__."\n";
+        //print $db->getVersion()."\n";
+    }
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
+    protected function tearDown()
+    {
+        print __METHOD__."\n";
+    }
+
+    /**
+     * testExpenseReportCreate
+     *
+     * @return	void
+     */
+    public function testExpenseReportCreate()
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        // Set supplier and product to use
+        $socid=1;
+
+        // Create supplier order with a too low quantity
+        $localobject=new ExpenseReport($db);
+        $localobject->initAsSpecimen();         // Init a speciment with lines
+        $localobject->status = 0;
+        $localobject->fk_statut = 0;
+        $localobject->date_fin = null;  // Force bad value
+
+        $result=$localobject->create($user);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(-1, $result);       // must be -1 because of missing mandatory fields
+
+        $sql="DELETE FROM ".MAIN_DB_PREFIX."expensereport where ref=''";
+        $db->query($sql);
+
+        // Create supplier order
+        $localobject2=new ExpenseReport($db);
+        $localobject2->initAsSpecimen();        // Init a speciment with lines
+        $localobject2->status = 0;
+        $localobject2->fk_statut = 0;
+        
+        $result=$localobject2->create($user);
+        print __METHOD__." result=".$result."\n";
+        $this->assertGreaterThanOrEqual(0, $result);
+
+        return $result;
+    }
+
+
+    /**
+     * testExpenseReportFetch
+     *
+     * @param   int $id     Id of supplier order
+     * @return  void
+     *
+     * @depends testExpenseReportCreate
+     * The depends says test is run only if previous is ok
+     */
+    public function testExpenseReportFetch($id)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new ExpenseReport($this->savdb);
+        $result=$localobject->fetch($id);
+
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
+    }
+
+    /**
+     * testExpenseReportValid
+     *
+     * @param   Object $localobject     Supplier order
+     * @return  void
+     *
+     * @depends testExpenseReportFetch
+     * The depends says test is run only if previous is ok
+     */
+    public function testExpenseReportValid($localobject)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $result=$localobject->setValidate($user);
+
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
+    }
+
+    /**
+     * testExpenseReportApprove
+     *
+     * @param   Object $localobject Supplier order
+     * @return  void
+     *
+     * @depends testExpenseReportValid
+     * The depends says test is run only if previous is ok
+     */
+    public function testExpenseReportApprove($localobject)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $result=$localobject->setApproved($user);
+
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
+    }
+
+    /**
+     * testExpenseReportCancel
+     *
+     * @param   Object  $localobject        Supplier order
+     * @return  void
+     *
+     * @depends testExpenseReportApprove
+     * The depends says test is run only if previous is ok
+     */
+    public function testExpenseReportCancel($localobject)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $result=$localobject->set_cancel($user, 'Because...');
+
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
+    }
+
+    /**
+     * testExpenseReportOther
+     *
+     * @param   Object $localobject     Supplier order
+     * @return  void
+     *
+     * @depends testExpenseReportCancel
+     * The depends says test is run only if previous is ok
+     */
+    public function testExpenseReportOther($localobject)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        /*$result=$localobject->setstatus(0);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        */
+
+        /*$localobject->info($localobject->id);
+        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+        $this->assertNotEquals($localobject->date_creation, '');
+        */
+
+        return $localobject->id;
+    }
+
+    /**
+     * testExpenseReportDelete
+     *
+     * @param   int $id     Id of order
+     * @return  void
+     *
+     * @depends testExpenseReportOther
+     * The depends says test is run only if previous is ok
+     */
+    public function testExpenseReportDelete($id)
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new ExpenseReport($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($user);
+
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
+    }
+
+}

From 436f60a784ded05039732a820e9e42c17720c3d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 18:08:02 +0200
Subject: [PATCH 0612/1163] FIX Cache to load currencies was not working when
 loading all currencies

---
 htdocs/core/class/translate.class.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index a77740eafb8..30cedf57d51 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -39,7 +39,7 @@ class Translate
 
 	public $cache_labels=array();         // Cache for labels return by getLabelFromKey method
 	public $cache_currencies=array();     // Cache to store currency symbols
-
+    private $cache_currencies_all_loaded=false;
 
 
 	/**
@@ -961,7 +961,8 @@ class Translate
 	{
 		global $db;
 
-		if (! empty($currency_code) && isset($this->cache_currencies[$currency_code])) return 0;    // Value already into cache
+		if ($this->cache_currencies_all_loaded) return 0;                                           // Cache already loaded for all
+		if (! empty($currency_code) && isset($this->cache_currencies[$currency_code])) return 0;    // Cache already loaded for the currency
 
 		$sql = "SELECT code_iso, label, unicode";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_currencies";
@@ -975,7 +976,7 @@ class Translate
 		{
 			$this->load("dict");
 			$label=array();
-			foreach($this->cache_currencies as $key => $val) $label[$key]=$val['label'];
+			if (! empty($currency_code)) foreach($this->cache_currencies as $key => $val) $label[$key]=$val['label']; // Label in already loaded cache
 
 			$num = $db->num_rows($resql);
 			$i = 0;
@@ -989,7 +990,10 @@ class Translate
 				$label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label'];
 				$i++;
 			}
+			if (empty($currency_code)) $this->cache_currencies_all_loaded=true;
 			//print count($label).' '.count($this->cache_currencies);
+
+			// Resort cache
 			array_multisort($label, SORT_ASC, $this->cache_currencies);
 			//var_dump($this->cache_currencies);	$this->cache_currencies is now sorted onto label
 			return $num;

From e2c31b5f23ec6405d64e6061c055cddb0dc98c66 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 18:43:34 +0200
Subject: [PATCH 0613/1163] Fix regression

---
 htdocs/admin/dict.php           | 82 ++++++++++++++++++---------------
 htdocs/theme/eldy/style.css.php |  6 +++
 htdocs/theme/md/style.css.php   |  6 +++
 3 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 7df4fed113c..fe3179babd8 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -929,7 +929,7 @@ if ($id)
     // Complete requete recherche valeurs avec critere de tri
     $sql=$tabsql[$id];
 
-    $sql.=" WHERE 1 = 1";
+    if (! preg_match('/ WHERE /',$sql)) $sql.= " WHERE 1 = 1";
     if ($search_country_id > 0) $sql.= " AND c.rowid = ".$search_country_id;
     if ($search_code != '')     $sql.= natural_search("code", $search_code);
     
@@ -960,16 +960,15 @@ if ($id)
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
     
-    print '<table class="noborder" width="100%">';
-
     // Form to add a new line
     if ($tabname[$id])
     {
         $alabelisused=0;
-        $var=false;
-
+        
         $fieldlist=explode(',',$tabfield[$id]);
 
+        print '<table class="noborder" width="100%">';
+        
         // Line for title
         print '<tr class="liste_titre">';
         foreach ($fieldlist as $field => $value)
@@ -978,25 +977,25 @@ if ($id)
             // dans les dictionnaires de donnees
             $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
             $valuetoshow=$langs->trans($valuetoshow);   // try to translate
-            $align="left";
+            $class='';
             if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
             if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
             if ($fieldlist[$field]=='taux')            {
 				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
 				else $valuetoshow=$langs->trans("Amount");
-				$align='center';
+				$class='center';
             }
-            if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 2"; $align="center"; $sortable=0; }
-            if ($fieldlist[$field]=='localtax1')       { $valuetoshow=$langs->trans("Rate")." 2"; $align="center"; }
-            if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 3"; $align="center"; $sortable=0; }
-            if ($fieldlist[$field]=='localtax2')       { $valuetoshow=$langs->trans("Rate")." 3"; $align="center"; }
+            if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 2"; $class="center"; $sortable=0; }
+            if ($fieldlist[$field]=='localtax1')       { $valuetoshow=$langs->trans("Rate")." 2"; $class="center"; }
+            if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 3"; $class="center"; $sortable=0; }
+            if ($fieldlist[$field]=='localtax2')       { $valuetoshow=$langs->trans("Rate")." 3"; $class="center"; }
             if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
             if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
             if ($fieldlist[$field]=='type')            {
 				if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") $valuetoshow=$form->textwithtooltip($langs->trans("Type"),$langs->trans("TypePaymentDesc"),2,1,img_help(1,''));
 				else $valuetoshow=$langs->trans("Type");
             }
-            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); $class='width100'; }
             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
             {
             	$valuetoshow=$langs->trans("Label");
@@ -1007,9 +1006,9 @@ if ($id)
                 if (in_array('region_id',$fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
                 $valuetoshow=$langs->trans("Country");
             }
-            if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=$langs->trans("NPR"); $align="center"; }
+            if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=$langs->trans("NPR"); $class="center"; }
             if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
-            if ($fieldlist[$field]=='type_cdr')        { $valuetoshow=$langs->trans("AtEndOfMonth"); $align="center"; }
+            if ($fieldlist[$field]=='type_cdr')        { $valuetoshow=$langs->trans("AtEndOfMonth"); $class="center"; }
             if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
             if ($fieldlist[$field]=='width' || $fieldlist[$field]=='nx')    { $valuetoshow=$langs->trans("Width"); }
             if ($fieldlist[$field]=='height' || $fieldlist[$field]=='ny')   { $valuetoshow=$langs->trans("Height"); }
@@ -1050,7 +1049,7 @@ if ($id)
 
             if ($valuetoshow != '')
             {
-                print '<td align="'.$align.'">';
+                print '<td'.($class?' class="'.$class.'"':'').'>';
             	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
             	else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
             	else print $valuetoshow;
@@ -1068,7 +1067,7 @@ if ($id)
         print '</tr>';
 
         // Line to enter new values
-        print "<tr ".$bcnd[$var].">";
+        print '<tr class="oddeven nodrag nodrop nohover">';
 
         $obj = new stdClass();
         // If data was already input, we define them in obj to populate input fields.
@@ -1086,7 +1085,7 @@ if ($id)
         $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
         $error=$hookmanager->error; $errors=$hookmanager->errors;
 
-        if ($id == 3) unset($fieldlist[2]); // Remove field ??? if ???
+        if ($id == 3) unset($fieldlist[2]); // Remove field ??? if dictionnary Regions
 
         if (empty($reshook))
         {
@@ -1105,15 +1104,22 @@ if ($id)
         $colspan=count($fieldlist)+3;
         if ($id == 4) $colspan++;
 
+        print '</table>';
+        
         if (! empty($alabelisused) && $id != 25)  // If there is one label among fields, we show legend of *
         {
-        	print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
+        	print '* '.$langs->trans("LabelUsedByDefault").'.<br>';
         }
-        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
     }
 
+    print '</form>';
 
-
+    print '<br>';
+    
+    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
+    
     // List of available record in database
     dol_syslog("htdocs/admin/dict", LOG_DEBUG);
     $resql=$db->query($sql);
@@ -1121,7 +1127,6 @@ if ($id)
     {
         $num = $db->num_rows($resql);
         $i = 0;
-        $var=true;
 
         $param = '&id='.$id;
         if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
@@ -1134,13 +1139,13 @@ if ($id)
         // There is several pages
         if ($num > $listlimit)
         {
-            print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
             print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
-            print '</td></tr>';
         }
 
+        print '<table class="noborder" width="100%">';
+        
         // Title line with search boxes
-        print '<tr class="liste_titre_filter liste_titre_add">';
+        print '<tr class="liste_titre_filter">';
         $filterfound=0;
         foreach ($fieldlist as $field => $value)
         {
@@ -1301,7 +1306,7 @@ if ($id)
                 else
                 {
 	              	$tmpaction = 'view';
-                    $parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                    $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
                     $reshook=$hookmanager->executeHooks('viewDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
 
                     $error=$hookmanager->error; $errors=$hookmanager->errors;
@@ -1310,7 +1315,6 @@ if ($id)
                     {
                         foreach ($fieldlist as $field => $value)
                         {
-                            
                             $showfield=1;
                         	$align="left";
                             $valuetoshow=$obj->{$fieldlist[$field]};
@@ -1478,7 +1482,8 @@ if ($id)
 
                             $class='tddict';
                             if ($fieldlist[$field] == 'tracking') $class.=' tdoverflowauto';
-							// Show value for field
+                            if ($fieldlist[$field] == 'code') $class.=' width100';
+                            // Show value for field
 							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
                         }
                     }
@@ -1499,8 +1504,9 @@ if ($id)
 
                     // Url 
                     $rowidcol=$tabrowid[$id];
-                    if ($id == 17) $rowidcol='rowid';
-                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->{$rowidcol})?$obj->{$rowidcol}:(! empty($obj->code)?urlencode($obj->code):'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
+                    // If rowidcol not defined
+                    if (empty($rowidcol) || in_array($id, array(6,7,8,13,17,19,27))) $rowidcol='rowid';
+                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((! empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0')?$obj->{$rowidcol}:(! empty($obj->code)?urlencode($obj->code):'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
                     if ($param) $url .= '&'.$param;
                     $url.='&';
 
@@ -1545,12 +1551,13 @@ if ($id)
                 $i++;
             }
         }
+    
+        print '</table>';
     }
     else {
         dol_print_error($db);
     }
 
-    print '</table>';
 
     print '</form>';
 }
@@ -1560,7 +1567,6 @@ else
      * Show list of dictionary to show
      */
 
-    $var=true;
     $lastlineisempty=false;
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
@@ -1665,7 +1671,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			if (! in_array('country',$fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
 			{
 				$country_id = (! empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : 0);
-				print '<td>';
+				print '<td class="tdoverflowmax100">';
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
 				print '</td>';
 			}
@@ -1739,7 +1745,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			print '<td><input type="text" class="flat minwidth75" value="'.price((! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'')).'" name="'.$fieldlist[$field].'"></td>';
 		}
 		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
-			print '<td><input type="text" class="flat minwidth100" value="'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
+			print '<td class="maxxxx"><input type="text" class="flat minwidth75" value="'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
 		}
 		elseif ($fieldlist[$field]=='unit') {
 			print '<td>';
@@ -1777,16 +1783,16 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 		}
 		else
 		{
-			print '<td>';
-			$size=''; $class='';
-			if ($fieldlist[$field]=='code') $class='maxwidth100';
+			$classtd=''; $class='';
+			if ($fieldlist[$field]=='code') $classtd='width100';
 			if ($fieldlist[$field]=='affect') $class='maxwidth50';
 			if ($fieldlist[$field]=='delay') $class='maxwidth50';
 			if ($fieldlist[$field]=='position') $class='maxwidth50';
 			if ($fieldlist[$field]=='libelle') $class='quatrevingtpercent';
 			if ($fieldlist[$field]=='tracking') $class='quatrevingtpercent';
-			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $size='size="2" ';
-			print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="'.(isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
+			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $class='maxwidth50';
+			print '<td class="'.$classtd.'">';
+			print '<input type="text" class="flat'.($class?' '.$class:'').'" value="'.(isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		}
 	}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b0249452a70..9fe43395c5e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -720,6 +720,9 @@ div.fiche>form>div.div-table-responsive {
 /* rule for not too small screen only */
 @media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7; ?>px)
 {
+    .width50  { width: 50px; }
+    .width100 { width: 100px; }
+    .width200 { width: 200px; }
     .minwidth100 { min-width: 100px; }
     .minwidth200 { min-width: 200px; }
     .minwidth300 { min-width: 300px; }
@@ -733,6 +736,9 @@ div.fiche>form>div.div-table-responsive {
     .minwidth400imp { min-width: 400px !important; }
     .minwidth500imp { min-width: 500px !important; }
 }
+.width50  { width: 50px; }
+.width100 { width: 100px; }
+.width200 { width: 200px; }
 .maxwidth25  { max-width: 25px; }
 .maxwidth50  { max-width: 50px; }
 .maxwidth75  { max-width: 75px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index a4341ab317d..852b729bba9 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -727,6 +727,9 @@ div.fiche>form>div.div-table-responsive {
 /* rule for not too small screen only */
 @media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7; ?>px)
 {
+    .width50  { width: 50px; }
+    .width100 { width: 100px; }
+    .width200 { width: 200px; }
 	.minwidth100 { min-width: 100px; }
 	.minwidth200 { min-width: 200px; }
 	.minwidth300 { min-width: 300px; }
@@ -740,6 +743,9 @@ div.fiche>form>div.div-table-responsive {
 	.minwidth400imp { min-width: 400px !important; }
 	.minwidth500imp { min-width: 500px !important; }
 }
+.width50  { width: 50px; }
+.width100 { width: 100px; }
+.width200 { width: 200px; }
 .maxwidth25  { max-width: 25px; }
 .maxwidth50  { max-width: 50px; }
 .maxwidth75  { max-width: 75px; }

From cbc6684ea78f0f8a30b70bdec278ce121647fb8e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 18:59:01 +0200
Subject: [PATCH 0614/1163] Fix error management

---
 htdocs/expensereport/class/expensereport.class.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index f88c667352c..898b5c4cd1f 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -129,6 +129,13 @@ class ExpenseReport extends CommonObject
 
         $error = 0;
 		
+        // Check parameters
+        if (empty($this->date_debut) || empty($this->date_fin)) 
+        {
+            $this->error='ErrorFieldRequired';
+            return -1;
+        }
+        
         $fuserid = $this->fk_user_author;       // Note fk_user_author is not the 'author' but the guy the expense report is for.
         if (empty($fuserid)) $fuserid = $user->id;
         
@@ -170,7 +177,6 @@ class ExpenseReport extends CommonObject
         $sql.= ", ".$conf->entity;
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -178,7 +184,6 @@ class ExpenseReport extends CommonObject
             $this->ref='(PROV'.$this->id.')';
 
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET ref='".$this->ref."' WHERE rowid=".$this->id;
-            dol_syslog(get_class($this)."::create sql=".$sql);
             $resql=$this->db->query($sql);
             if (!$resql) $error++;
 

From b0442aa56a1e34cc4fe7e6456457c02970206954 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Apr 2017 19:48:01 +0200
Subject: [PATCH 0615/1163] Better explanation on label that are translated.

---
 htdocs/admin/dict.php         | 62 +++++++++++++++++++++++++++++------
 htdocs/langs/en_US/admin.lang |  2 +-
 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index fe3179babd8..95692672523 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -998,10 +998,12 @@ if ($id)
             if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); $class='width100'; }
             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
             {
-            	$valuetoshow=$langs->trans("Label");
-            	if ($id != 25) $valuetoshow.="*";
+            	if ($id != 25) $valuetoshow=$form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
+            	else $valuetoshow=$langs->trans("Label"); 
+            }
+            if ($fieldlist[$field]=='libelle_facture') { 
+                $valuetoshow=$form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
             }
-            if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
             if ($fieldlist[$field]=='country')         {
                 if (in_array('region_id',$fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
                 $valuetoshow=$langs->trans("Country");
@@ -1106,10 +1108,10 @@ if ($id)
 
         print '</table>';
         
-        if (! empty($alabelisused) && $id != 25)  // If there is one label among fields, we show legend of *
+        /*if (! empty($alabelisused) && $id != 25)  // If there is one label among fields, we show legend of *
         {
         	print '* '.$langs->trans("LabelUsedByDefault").'.<br>';
-        }
+        }*/
     }
 
     print '</form>';
@@ -1223,10 +1225,14 @@ if ($id)
             if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
             {
-            	$valuetoshow=$langs->trans("Label");
-               	if ($id != 25) $valuetoshow.="*";
+                //if ($id != 25) $valuetoshow=$form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
+                //else $valuetoshow=$langs->trans("Label");
+                $valuetoshow=$langs->trans("Label");
+            }
+            if ($fieldlist[$field]=='libelle_facture') { 
+                //$valuetoshow=$form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
+                $valuetoshow=$langs->trans("LabelOnDocuments");
             }
-            if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
             if ($fieldlist[$field]=='country')         { $valuetoshow=$langs->trans("Country"); }
             if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=$langs->trans("NPR"); $align="center"; }
             if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
@@ -1739,7 +1745,23 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			print '</td>';
 		}
 		elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
-			print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea></td>';
+		    print '<td>';
+		    $transfound=0;
+	        // Special case for labels
+	        if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
+	            $langs->load("bills");
+	            $transkey="PaymentCondition".strtoupper($obj->code);
+	        }
+	        if ($langs->trans($transkey) != $transkey)
+            {
+                $transfound=1;
+                print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
+            }
+		    if (! $transfound)
+		    {
+		        print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
+		    }
+		    print '</td>';
 		}
 		elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i',$fieldlist[$field])) {
 			print '<td><input type="text" class="flat minwidth75" value="'.price((! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'')).'" name="'.$fieldlist[$field].'"></td>';
@@ -1792,7 +1814,27 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			if ($fieldlist[$field]=='tracking') $class='quatrevingtpercent';
 			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $class='maxwidth50';
 			print '<td class="'.$classtd.'">';
-			print '<input type="text" class="flat'.($class?' '.$class:'').'" value="'.(isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
+			$transfound=0;
+			if (in_array($fieldlist[$field], array('label','libelle')))
+			{
+			    // Special case for labels
+			    if ($tabname == MAIN_DB_PREFIX.'c_civility') {
+			        $transkey="Civility".strtoupper($obj->code);
+			    }
+			    if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
+			        $langs->load("bills");
+			        $transkey="PaymentCondition".strtoupper($obj->code);
+			    }
+			    if ($langs->trans($transkey) != $transkey)
+			    {
+			        $transfound=1;
+			        print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
+			    }
+			}
+			if (! $transfound)
+			{
+                print '<input type="text" class="flat'.($class?' '.$class:'').'" value="'.(isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
+			}
 			print '</td>';
 		}
 	}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index f9f69ce2548..4653a22d814 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -431,7 +431,7 @@ TheKeyIsTheNameOfHtmlField=The key is the name of the html field. This need to h
 PageUrlForDefaultValues=You must enter here the relative url of the page. Examples:
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
-
+GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management

From 1e4dd5d095f2789aa06204b084b087b7b25fdf9a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 15 Apr 2017 03:05:04 +0200
Subject: [PATCH 0616/1163] Fix bug reported by scrutinizer

---
 htdocs/core/lib/functions.lib.php | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index aa39e060563..87039a3d454 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -862,7 +862,7 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
 	$limittoshow=(empty($conf->global->MAIN_MAXTABS_IN_CARD)?99:$conf->global->MAIN_MAXTABS_IN_CARD);
 	$displaytab=0;
 	$nbintab=0;
-    $popuptab=0;
+    $popuptab=0; $outmore='';
 	for ($i = 0 ; $i <= $maxkey ; $i++)
 	{
 		if ((is_numeric($active) && $i == $active) || (! empty($links[$i][2]) && ! is_numeric($active) && $active == $links[$i][2]))
@@ -1012,6 +1012,8 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 {
 	global $conf, $form, $user, $langs;
 
+	$error = 0;
+	
 	$maxvisiblephotos=1;
 	$showimage=1;
 	$showbarcode=empty($conf->barcode->enabled)?0:($object->barcode?1:0);
@@ -1043,7 +1045,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 			}
 			elseif ($conf->browser->layout != 'phone') {    // Show no photo link
 				$nophoto='/public/theme/common/nophoto.png';
-				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
+				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
 			}
         }
 	}
@@ -1053,6 +1055,8 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
         {
             if ($modulepart != 'unknown')
             {
+                $phototoshow='';
+                
                 // Check if a preview file is available
                 if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter')) && class_exists("Imagick"))
                 {
@@ -1115,9 +1119,10 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                 $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">';
                 if ($object->element == 'action')
                 {
+                    $width=80;
                     $cssclass='photorefcenter';
                     $nophoto=img_picto('', 'title_agenda', '', false, 1);
-                    $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.$nophoto.'"></div></div>';
+                    $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').' src="'.$nophoto.'"></div></div>';
                 }
                 else
                 {
@@ -1125,7 +1130,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                     $picto = $object->picto;
                     if ($object->element == 'project' && ! $object->public) $picto = 'project'; // instead of projectpub
     				$nophoto=img_picto('', 'object_'.$picto, '', false, 1);
-    				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.$nophoto.'"></div></div>';
+    				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').' src="'.$nophoto.'"></div></div>';
                 }
                 $morehtmlleft.='</div>';
             }
@@ -1627,6 +1632,7 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)
  */
 function dol_now($mode='gmt')
 {
+    $ret='';
 	// Note that gmmktime and mktime return same value (GMT) when used without parameters
 	//if ($mode == 'gmt') $ret=gmmktime(); // Strict Standards: gmmktime(): You should be using the time() function instead
 	if ($mode == 'gmt') $ret=time();	// Time for now at greenwich.
@@ -2434,7 +2440,6 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		if (preg_match('/:[^\s0-9]/',$titlealt)) $tmparray=explode(':',$titlealt);		// We explode if we have TextA:TextB. Not if we have TextA: TextB
 		$title=$tmparray[0];
 		$alt=empty($tmparray[1])?'':$tmparray[1];
-		if ($picto == 'refresh') var_dump($moreatt);
 		return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($title).'"').($moreatt?' '.$moreatt:' class="inline-block valigntextbottom"').'>';	// Alt is used for accessibility, title for popup
 	}
 }
@@ -3864,7 +3869,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";
    	$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
    	if ($vatratecode) $sql.= " AND t.code ='".$vatratecode."'";		// If we have the code, we use it in priority
-   	else $sql.= " AND t.recuperableonly ='".$npr."'";
+   	else $sql.= " AND t.recuperableonly ='".$vatnpr."'";
    	dol_syslog("get_localtax", LOG_DEBUG);
    	$resql=$db->query($sql);
 
@@ -3983,6 +3988,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 	dol_syslog("getLocalTaxesFromRate vatrate=".$vatrate." local=".$local);
 
 	$vatratecleaned = $vatrate;
+	$vatratecode = '';
 	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
 	{
 	    $vatratecleaned = $reg[1];
@@ -4381,7 +4387,7 @@ function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $id
 function yn($yesno, $case=1, $color=0)
 {
 	global $langs;
-	$result='unknown';
+	$result='unknown'; $classname='';
 	if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') 	// A mettre avant test sur no a cause du == 0
 	{
 		$result=$langs->trans('yes');
@@ -5102,7 +5108,7 @@ function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb
 {
 	global $conf, $langs;
 
-	$ret='';
+	$ret=0; $return='';
 	$out='';
 	$divstart=$divend='';
 
@@ -5272,7 +5278,8 @@ function dol_sort_array(&$array, $index, $order='asc', $natsort=0, $case_sensiti
 	$sizearray=count($array);
 	if (is_array($array) && $sizearray>0)
 	{
-		foreach(array_keys($array) as $key) $temp[$key]=$array[$key][$index];
+        $temp = array();
+        foreach(array_keys($array) as $key) $temp[$key]=$array[$key][$index];
 
 		if (!$natsort) ($order=='asc') ? asort($temp) : arsort($temp);
 		else
@@ -5732,6 +5739,7 @@ function dolExplodeIntoArray($string, $delimiter = ';', $kv = '=')
 {
 	if ($a = explode($delimiter, $string))
 	{
+	    $ka = array();
 		foreach ($a as $s) { // each part
 			if ($s) {
 				if ($pos = strpos($s, $kv)) { // key/value delimiter

From 7354cb148a09a8d52084aac31c3a35770d4a940d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 15 Apr 2017 03:13:17 +0200
Subject: [PATCH 0617/1163] Fix scrutinizer

---
 htdocs/core/modules/product/doc/pdf_standard.modules.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index ec0ed850df2..5dca2b8378e 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -561,8 +561,6 @@ class pdf_standard extends ModelePDFProduct
 			$this->error=$langs->trans("ErrorConstantNotDefined","PRODUCT_OUTPUTDIR");
 			return 0;
 		}
-
-		return -1;
 	}
 
 	

From 4490477cfbf0b9524e7bd37e9b34efc825cbb013 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 15 Apr 2017 03:14:31 +0200
Subject: [PATCH 0618/1163] Fix scrutinizer warning

---
 htdocs/core/lib/functionsnumtoword.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index 3314aa94631..f4319b7d11a 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -96,7 +96,8 @@ function dol_convertToWord($num, $langs, $currency=false, $centimes=false)
     $max_length = $levels * 3;
     $num = substr('00' . $num, -$max_length);
     $num_levels = str_split($num, 3);
-    for ($i = 0; $i < count($num_levels); $i++) {
+    $nboflevels = count($num_levels);
+    for ($i = 0; $i < $nboflevels; $i++) {
         $levels--;
         $hundreds = (int) ($num_levels[$i] / 100);
         $hundreds = ($hundreds ? ' ' . $list1[$hundreds] . ' '.$langs->transnoentities('hundred') . ( $hundreds == 1 ? '' : 's' ) . ' ': '');

From f68c408dbc528ce0381414c1c05f298467e6658c Mon Sep 17 00:00:00 2001
From: rassakali <rezki.assakali@gmail.com>
Date: Sat, 15 Apr 2017 08:35:23 +0200
Subject: [PATCH 0619/1163] Update subscription.php

Fix issue #6694
---
 htdocs/adherents/subscription.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index cc7fbef58f5..3d22ae336fb 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -89,14 +89,14 @@ if ($rowid)
     $caneditfieldmember=$user->rights->adherent->creer;
 }
 
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('subscription'));
+
 // PDF
 $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
 $hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
 $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
-
-
-
 /*
  * 	Actions
  */

From e97e202debdc80f3242985ac016b81c6be3122c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Apr 2017 04:22:53 +0200
Subject: [PATCH 0620/1163] NEW Can import users

---
 htdocs/core/modules/modUser.class.php         | 39 ++++++++++-
 htdocs/core/tpl/login.tpl.php                 | 33 +++++----
 htdocs/core/tpl/passwordforgotten.tpl.php     | 28 ++++----
 htdocs/imports/import.php                     | 69 ++++++++++++++-----
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  3 +-
 .../mysql/tables/llx_product_price_by_qty.sql |  2 +-
 htdocs/install/mysql/tables/llx_user.sql      |  4 +-
 htdocs/langs/en_US/exports.lang               |  4 +-
 htdocs/theme/eldy/style.css.php               |  3 +-
 htdocs/theme/md/style.css.php                 |  3 +-
 10 files changed, 131 insertions(+), 57 deletions(-)

diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index f4e9b0d7356..55d4d45d28e 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -68,7 +68,7 @@ class modUser extends DolibarrModules
 		// Dependancies
 		$this->depends = array();
 		$this->requiredby = array();
-		$this->langfiles = array("main","users","companies","members");
+		$this->langfiles = array("main","users","companies","members",'salaries');
 
 		// Constants
 		$this->const = array();
@@ -230,6 +230,43 @@ class modUser extends DolibarrModules
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'user as u';
 		$this->export_sql_end[$r] .=' WHERE u.entity IN ('.getEntity('user',1).')';
+		
+		// Imports
+		//--------
+		$r=0;
+
+		// Import list of users attributes
+		$r++;
+		$this->import_code[$r]=$this->rights_class.'_'.$r;
+		$this->import_label[$r]='ImportDataset_user_1';
+		$this->import_icon[$r]='user';
+		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r]=array('u'=>MAIN_DB_PREFIX.'user','extra'=>MAIN_DB_PREFIX.'user_extrafields');	// List of tables to insert into (insert done in same order)
+		$this->import_fields_array[$r]=array('u.lastname'=>"Name*",'u.firstname'=>"Firstname",'u.employee'=>"Employee*",'u.job'=>"Job",'u.gender'=>"Gender",'u.login'=>"Login*",'u.pass_crypted'=>"Password",'u.admin'=>"Administrator",'u.fk_soc'=>"Company*",'u.address'=>"Address",'u.zip'=>"Zip",'u.town'=>"Town",'u.fk_state'=>"StateId",'u.fk_country'=>"CountryCode",'u.office_phone'=>"Phone",'u.user_mobile'=>"Mobile",'u.office_fax'=>"Fax",'u.email'=>"Email",'u.note'=>"Note",'u.signature'=>'Signature','u.fk_user'=>'Supervisor','u.thm'=>'THM','u.tjm'=>'TJM','u.dateemployment'=>'DateEmployment','u.salary'=>'Salary','u.color'=>'Color','u.api_key'=>'ApiKey','u.datec'=>"DateCreation");
+		// Add extra fields
+		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'user' AND entity = ".$conf->entity;
+		$resql=$this->db->query($sql);
+		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		{
+		    while ($obj=$this->db->fetch_object($resql))
+		    {
+		        $fieldname='extra.'.$obj->name;
+		        $fieldlabel=ucfirst($obj->label);
+		        $this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
+		    }
+		}
+		// End add extra fields
+		$this->import_fieldshidden_array[$r]=array('u.fk_user_creat'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'user');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+		$this->import_convertvalue_array[$r]=array(
+			'u.fk_state'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cstate.class.php','class'=>'Cstate','method'=>'fetch','dict'=>'DictionaryState'),
+		    'u.fk_country'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'),
+		    'u.salary'=>array('rule'=>'numeric')
+		);
+		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
+		$this->import_regex_array[$r]=array('u.employee'=>'^[0|1]','u.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
+		$this->import_examplevalues_array[$r]=array('u.lastname'=>"Doe",'u.firstname'=>'John','u.login'=>'jdoe','u.employee'=>'0 or 1','u.status'=>"0 (closed) or 1 (active)",'u.fk_soc'=>'0 (internal user) or company name (external user)','u.datec'=>dol_print_date(dol_now(),'%Y-%m-%d'),'u.address'=>"61 jump street",'u.zip'=>"123456",'u.town'=>"Big town",'u.fk_country'=>'US, FR, DE...','u.office_phone'=>"0101010101",'u.office_fax'=>"0101010102",'u.email'=>"test@mycompany.com",'u.salary'=>"10000",'u.note'=>"This is an example of note for record",'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00");
+		$this->import_updatekeys_array[$r]=array('u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>'Login');
+		
 	}
 
 
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index a23d14a979d..1245041d98a 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -77,18 +77,27 @@ $(document).ready(function () {
 <input type="hidden" name="dol_use_jmobile" id="dol_use_jmobile" value="<?php echo $dol_use_jmobile; ?>" />
 
 
+
+<!-- Title with version -->
+<div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
+<?php
+if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+echo dol_escape_htmltag($title); 
+if ($disablenofollow) echo '</a>';
+?>
+</div>
+
+
+
 <div class="login_table">
 
 <div id="login_line1">
 
 <div id="login_left">
-
 <img alt="" src="<?php echo $urllogo; ?>" id="img_logo" />
-
 </div>
 
 
-
 <div id="login_right">
 
 <table class="left centpercent" title="<?php echo $langs->trans("EnterLoginDetail"); ?>">
@@ -146,10 +155,10 @@ if (! empty($hookmanager->resArray['options'])) {
 <?php } ?>
 </table>
 
-</div> <!-- end div left -->
+</div> <!-- end div login-right -->
 
+</div> <!-- end div login-line1 -->
 
-</div>
 
 <div id="login_line2" style="clear: both">
 
@@ -209,19 +218,9 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
 
 ?>
 
-</div>
+</div> <!-- end login line 2 -->
 
-</div>
-
-
-<!-- Title with version -->
-<div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
-<?php
-if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
-echo dol_escape_htmltag($title); 
-if ($disablenofollow) echo '</a>';
-?>
-</div>
+</div> <!-- end login table -->
 
 
 </form>
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 8a403d675d7..bdc38b08873 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -52,18 +52,25 @@ $(document).ready(function () {
 <input type="hidden" name="action" value="buildnewpassword">
 
 
+<!-- Title with version -->
+<div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
+<?php
+if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+echo dol_escape_htmltag($title); 
+if ($disablenofollow) echo '</a>';
+?>
+</div>
+
+
 
 <div class="login_table">
 
 <div id="login_line1">
 
 <div id="login_left">
-
 <img alt="Logo" title="" src="<?php echo $urllogo; ?>" id="img_logo" />
-
 </div>
 
-
 <div id="login_right">
 
 <table summary="Login pass" class="centpercent">
@@ -114,13 +121,11 @@ if (! empty($hookmanager->resArray['options'])) {
 
 </table>
 
-</div> <!-- end div left -->
+</div> <!-- end div login right -->
 
+</div> <!-- end div login_line1 -->
 
 
-
-</div>
-
 <div id="login_line2" style="clear: both">
 
 <!-- Button "Regenerate and Send password" -->
@@ -143,15 +148,6 @@ if (! empty($hookmanager->resArray['options'])) {
 
 </div>
 
-<!-- Title with version -->
-<div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
-<?php
-if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
-echo dol_escape_htmltag($title); 
-if ($disablenofollow) echo '</a>';
-?>
-</div>
-
 </form>
 
 
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 3916770de8a..82ecad62417 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -340,7 +340,7 @@ if ($step == 1 || ! $datatoimport)
 
     $head = import_prepare_head($param, 1);
 
-	dol_fiche_head($head, 'step1', $langs->trans("NewImport"));
+	dol_fiche_head($head, 'step1', $langs->trans("NewImport"), -1);
 
 
 	print $langs->trans("SelectImportDataSet").'<br>';
@@ -403,8 +403,10 @@ if ($step == 2 && $datatoimport)
 
     $head = import_prepare_head($param,2);
 
-	dol_fiche_head($head, 'step2', $langs->trans("NewImport"));
+	dol_fiche_head($head, 'step2', $langs->trans("NewImport"), -1);
 
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
 
 	print '<table width="100%" class="border">';
 
@@ -426,6 +428,8 @@ if ($step == 2 && $datatoimport)
 
 	print '</table>';
 
+	print '</div><br>';
+	
 	dol_fiche_end();
 	
 
@@ -478,7 +482,7 @@ if ($step == 3 && $datatoimport)
 
     $head = import_prepare_head($param, 3);
 
-	dol_fiche_head($head, 'step3', $langs->trans("NewImport"));
+	dol_fiche_head($head, 'step3', $langs->trans("NewImport"), -1);
 
 	/*
 	 * Confirm delete file
@@ -489,6 +493,9 @@ if ($step == 3 && $datatoimport)
 
 	}
 
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	
 	print '<table width="100%" class="border">';
 
 	// Module
@@ -508,10 +515,14 @@ if ($step == 3 && $datatoimport)
 	print '</td></tr>';
 
 	print '</table>';
+	print '</div>';
 	
 	print '<br>';
 	
-	print '<b>'.$langs->trans("InformationOnSourceFile").'</b><hr>';
+	print '<b>'.$langs->trans("InformationOnSourceFile").'</b>';
+	
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
 	print '<table width="100%" class="border">';
 	//print '<tr><td colspan="2"><b>'.$langs->trans("InformationOnSourceFile").'</b></td></tr>';
 
@@ -525,6 +536,7 @@ if ($step == 3 && $datatoimport)
 	print '</td></tr>';
 
 	print '</table>';
+	print '</div>';
 	
 	dol_fiche_end();
 
@@ -735,7 +747,10 @@ if ($step == 4 && $datatoimport)
 
     $head = import_prepare_head($param,4);
 
-	dol_fiche_head($head, 'step4', $langs->trans("NewImport"));
+	dol_fiche_head($head, 'step4', $langs->trans("NewImport"), -1);
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
 
 	print '<table width="100%" class="border">';
 
@@ -756,10 +771,13 @@ if ($step == 4 && $datatoimport)
 	print '</td></tr>';
 
 	print '</table>';
-	
+	print '</div>';
+		
 	print '<br>';
 	
-	print '<b>'.$langs->trans("InformationOnSourceFile").'</b><hr>';
+	print '<b>'.$langs->trans("InformationOnSourceFile").'</b>';
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
 	print '<table width="100%" class="border">';
 	//print '<tr><td colspan="2"><b>'.$langs->trans("InformationOnSourceFile").'</b></td></tr>';
 
@@ -801,6 +819,7 @@ if ($step == 4 && $datatoimport)
 	print '</td></tr>';
 
 	print '</table>';
+	print '</div>';
 	
 	dol_fiche_end();
 	
@@ -1204,8 +1223,10 @@ if ($step == 5 && $datatoimport)
     print '<input type="hidden" name="step" value="5">';    // step 5
     print '<input type="hidden" name="action" value="launchsimu">';    // step 5
     
-	dol_fiche_head($head, 'step5', $langs->trans("NewImport"));
+	dol_fiche_head($head, 'step5', $langs->trans("NewImport"), -1);
 
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
 
 	print '<table width="100%" class="border">';
 
@@ -1226,10 +1247,13 @@ if ($step == 5 && $datatoimport)
 	print '</td></tr>';
 
 	print '</table>';
-	
+	print '</div>';
+		
 	print '<br>';
 	
-	print '<b>'.$langs->trans("InformationOnSourceFile").'</b><hr>';
+	print '<b>'.$langs->trans("InformationOnSourceFile").'</b>';
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
 	print '<table width="100%" class="border">';
 	//print '<tr><td colspan="2"><b>'.$langs->trans("InformationOnSourceFile").'</b></td></tr>';
 
@@ -1276,7 +1300,6 @@ if ($step == 5 && $datatoimport)
 	{
 	    print '<input type="number" class="maxwidth50" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
 	    print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
-        print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	}
 	else
 	{
@@ -1288,20 +1311,27 @@ if ($step == 5 && $datatoimport)
 	{
 	    print '<input type="text" class="maxwidth50" name="endatlinenbbis" disabled="disabled" value="'.$endatlinenb.'">';
 	    print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
-        print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	}
 	else
 	{
 	    print '<input type="text" class="maxwidth50" name="endatlinenb" value="'.$endatlinenb.'">';
 	    print $form->textwithpicto("", $langs->trans("KeepEmptyToGoToEndOfFile"));
 	}
+    if ($action == 'launchsimu') print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	print '</td></tr>';
 
 	print '<tr><td>';
 	print $langs->trans("KeysToUseForUpdates");
 	print '</td><td>';
 	if($action=='launchsimu') {
-		print $form->multiselectarray('updatekeysbis', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '', 'disabled');
+		if (count($updatekeys))
+		{
+			print $form->multiselectarray('updatekeysbis', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '', 'disabled');
+		}
+		else
+		{
+			print '<span class="opacitymedium">'.$langs->trans("NoUpdateAttempt").'</span> &nbsp; -';
+		}
 		foreach($updatekeys as $val) {
 			print '<input type="hidden" name="updatekeys[]" value="'.$val.'">';
 		}
@@ -1323,15 +1353,19 @@ if ($step == 5 && $datatoimport)
 	print '</td></tr>';
 	
 	print '</table>';
-
+	print '</div>';
+	
 	print '<br>';
 
-	print '<b>'.$langs->trans("InformationOnTargetTables").'</b><hr>';
+	print '<b>'.$langs->trans("InformationOnTargetTables").'</b>';
+	print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	
 	print '<table width="100%" class="border">';
 	//print '<tr><td colspan="2"><b>'.$langs->trans("InformationOnTargetTables").'</b></td></tr>';
 
 	// Tables imported
-	print '<tr><td width="25%">';
+	print '<tr><td class="titlefield">';
 	print $langs->trans("TablesTarget");
 	print '</td><td>';
 	$listtables=array();
@@ -1391,7 +1425,8 @@ if ($step == 5 && $datatoimport)
 	print '</td></tr>';
 
 	print '</table>';
-
+	print '</div>';
+	
     dol_fiche_end();
 
 
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 91a0c36aaeb..e73c0df2add 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -59,8 +59,9 @@ ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_user_creat integer;
 ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_product_price_by_qty DROP COLUMN date_price;
 ALTER TABLE llx_product_price_by_qty ADD COLUMN tms timestamp;
-ALTER TABLE llx_product_price_by_qty ADD COLUMN import_key integer;
+ALTER TABLE llx_product_price_by_qty ADD COLUMN import_key varchar(14);
 
+ALTER TABLE llx_user ADD COLUMN import_key varchar(14);
 
 
 CREATE TABLE llx_product_attribute
diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
index 8543f1720b2..2b91647b80a 100644
--- a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
+++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
@@ -31,5 +31,5 @@ create table llx_product_price_by_qty
   fk_user_creat 	integer,
   fk_user_modif 	integer,
   tms				timestamp,
-  import_key    	integer
+  import_key    	varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index e711c1e9ad9..d033ba5eca4 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -83,5 +83,7 @@ create table llx_user
   salary			double(24,8),			-- denormalized value coming from llx_user_employment
   salaryextra		double(24,8),			-- denormalized value coming from llx_user_employment
   dateemployment	date,					-- denormalized value coming from llx_user_employment
-  weeklyhours		double(16,8)			-- denormalized value coming from llx_user_employment
+  weeklyhours		double(16,8),			-- denormalized value coming from llx_user_employment
+
+  import_key        varchar(14)                          		-- import key
 )ENGINE=innodb;
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index 139b3e463b8..a2e208673bd 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -117,7 +117,9 @@ ImportFromToLine=Import line numbers (from - to)
 SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
 KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for update attempt
-UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert) 
+UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
+NoUpdateAttempt=No update attempt was performed, only insert 
+ImportDataset_user_1=Users (employees or not) and properties
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilteredFields=Filtered fields
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9fe43395c5e..971a4d2ed40 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1526,6 +1526,7 @@ foreach($mainmenuusedarray as $val)
 }
 .login_vertical_align {
 	padding: 10px;
+	padding-bottom: 80px;
 }
 form#login {
 	padding-bottom: 30px;
@@ -1535,7 +1536,7 @@ form#login {
 .login_table_title {
 	max-width: 530px;
 	color: #aaa !important;
-	padding-top: 30px;
+	padding-bottom: 20px;
 	/* text-shadow: 1px 1px 1px #FFF; */
 }
 .login_table label {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 852b729bba9..27c4713742a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1562,6 +1562,7 @@ foreach($mainmenuusedarray as $val)
 }	
 .login_vertical_align {
 	padding: 10px;
+	padding-bottom: 80px;
 }
 form#login {
 	padding-bottom: 30px;
@@ -1571,7 +1572,7 @@ form#login {
 .login_table_title {
 	max-width: 530px;
 	color: #aaa !important;
-	padding-top: 30px;
+	padding-bottom: 20px;
 	/* text-shadow: 1px 1px 1px #FFF; */
 }
 .login_table label {

From 0994622bf88b8ee49abd5c61f274a65cca66f892 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Apr 2017 13:02:40 +0200
Subject: [PATCH 0621/1163] NEW Can use translations into all substitutions
 (watermark, freetext...)

---
 htdocs/adherents/class/adherent.class.php     | 28 +++++--
 htdocs/admin/commande.php                     | 12 ++-
 htdocs/admin/facture.php                      | 10 ++-
 htdocs/admin/order_extrafields.php            |  2 +-
 htdocs/admin/orderdet_extrafields.php         |  2 +-
 htdocs/admin/propal.php                       | 23 +++---
 htdocs/comm/admin/propal_extrafields.php      |  2 +-
 htdocs/comm/admin/propaldet_extrafields.php   |  2 +-
 htdocs/comm/mailing/card.php                  | 29 ++++---
 htdocs/comm/mailing/cibles.php                | 28 ++-----
 htdocs/comm/mailing/info.php                  |  6 +-
 htdocs/compta/facture/class/facture.class.php |  1 -
 htdocs/compta/facture/fiche-rec.php           |  6 +-
 htdocs/core/lib/functions.lib.php             | 82 +++++++++++++------
 htdocs/core/lib/pdf.lib.php                   | 50 ++++++++---
 .../modules/facture/doc/pdf_crabe.modules.php | 10 ++-
 htdocs/core/modules/modCommande.class.php     |  7 ++
 htdocs/core/modules/modFacture.class.php      |  7 ++
 htdocs/core/modules/modPropale.class.php      |  9 +-
 htdocs/langs/en_US/main.lang                  |  1 +
 htdocs/main.inc.php                           |  2 +-
 htdocs/theme/eldy/style.css.php               | 22 ++---
 htdocs/theme/md/style.css.php                 | 21 ++---
 23 files changed, 239 insertions(+), 123 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 020dbc58474..852b051e3dd 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -209,6 +209,23 @@ class Adherent extends CommonObject
 
 		// Substitutions
 		$substitutionarray=array(
+				'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
+				'__ID__'=>$msgishtml?dol_htmlentitiesbr($this->id):$this->id,
+				'__CIVILITY__'=>$this->getCivilityLabel(),
+				'__FIRSTNAME__'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
+				'__LASTNAME__'=>$msgishtml?dol_htmlentitiesbr($this->lastname):$this->lastname,
+				'__FULLNAME__'=>$msgishtml?dol_htmlentitiesbr($this->getFullName($langs)):$this->getFullName($langs),
+				'__COMPANY__'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe,
+				'__ADDRESS__'=>$msgishtml?dol_htmlentitiesbr($this->address):$this->address,
+				'__ZIP__'=>$msgishtml?dol_htmlentitiesbr($this->zip):$this->zip,
+				'__TOWN_'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town,
+				'__COUNTRY__'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country,
+				'__EMAIL__'=>$msgishtml?dol_htmlentitiesbr($this->email):$this->email,
+				'__BIRTH__'=>$msgishtml?dol_htmlentitiesbr($birthday):$birthday,
+				'__PHOTO__'=>$msgishtml?dol_htmlentitiesbr($this->photo):$this->photo,
+				'__LOGIN__'=>$msgishtml?dol_htmlentitiesbr($this->login):$this->login,
+				'__PASSWORD__'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass,
+				// For backward compatibility
 				'%DOL_MAIN_URL_ROOT%'=>DOL_MAIN_URL_ROOT,
 				'%ID%'=>$msgishtml?dol_htmlentitiesbr($this->id):$this->id,
 				'%CIVILITY%'=>$this->getCivilityLabel(),
@@ -225,7 +242,6 @@ class Adherent extends CommonObject
 				'%PHOTO%'=>$msgishtml?dol_htmlentitiesbr($this->photo):$this->photo,
 				'%LOGIN%'=>$msgishtml?dol_htmlentitiesbr($this->login):$this->login,
 				'%PASSWORD%'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass,
-				// For backward compatibility
 				'%INFOS%'=>$msgishtml?dol_htmlentitiesbr($infos):$infos,
 				'%SOCIETE%'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe,
 				'%PRENOM%'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
@@ -234,16 +250,10 @@ class Adherent extends CommonObject
 				'%VILLE%'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town,
 				'%PAYS%'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country,
 		);
-		// Add extrafields as substitution key %EXTRA_XXX%
-		foreach($this->array_options as $key => $val)
-		{
-			$keyshort=preg_replace('/^(options|extra)_/','',$key);
-			$substitutionarray['%EXTRA_'.$keyshort.'%']=$val;
-		}
 
-		complete_substitutions_array($substitutionarray, $langs);
+		complete_substitutions_array($substitutionarray, $langs, $this);
 
-		return make_substitutions($text,$substitutionarray);
+		return make_substitutions($text, $substitutionarray, $langs);
 	}
 
 
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index a6ca7871ae4..3933f5d00ab 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -284,7 +284,7 @@ print load_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
 
 $head = order_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Orders"), 0, 'order');
+dol_fiche_head($head, 'general', $langs->trans("Orders"), -1, 'order');
 
 /*
  * Orders Numbering model
@@ -593,8 +593,14 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_COMMANDE_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-print $langs->trans("WatermarkOnDraftOrders").'</td><td>';
-print '<input size="50" class="flat" type="text" name="COMMANDE_DRAFT_WATERMARK" value="'.$conf->global->COMMANDE_DRAFT_WATERMARK.'">';
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val) $htmltext.=$key.'<br>';
+$htmltext.='</i>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftOrders"), $htmltext);
+print '</td><td>';
+print '<input class="flat minwidth200" type="text" name="COMMANDE_DRAFT_WATERMARK" value="'.$conf->global->COMMANDE_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 4e9b007ee14..e7f74f85e5e 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -279,7 +279,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
 
 $head = invoice_admin_prepare_head();
-dol_fiche_head($head, 'general', $langs->trans("Invoices"), 0, 'invoice');
+dol_fiche_head($head, 'general', $langs->trans("Invoices"), -1, 'invoice');
 
 /*
  *  Numbering module
@@ -760,7 +760,13 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_FACTURE_DRAFT_WATERMARK" />';
 print '<tr class="oddeven"><td>';
-print $langs->trans("WatermarkOnDraftBill").'</td>';
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftBill"), $htmltext);
+print '</td>';
 print '<td><input size="50" class="flat" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.$conf->global->FACTURE_DRAFT_WATERMARK.'" />';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php
index 5d7358ae051..043d6bbadd9 100644
--- a/htdocs/admin/order_extrafields.php
+++ b/htdocs/admin/order_extrafields.php
@@ -75,7 +75,7 @@ print "<br>\n";
 
 $head = order_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Orders"), 0, 'order');
+dol_fiche_head($head, 'attributes', $langs->trans("Orders"), -1, 'order');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php
index f966af78bf3..5120fd5c931 100644
--- a/htdocs/admin/orderdet_extrafields.php
+++ b/htdocs/admin/orderdet_extrafields.php
@@ -76,7 +76,7 @@ print "<br>\n";
 
 $head = order_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("OrderLines"), 0, 'order');
+dol_fiche_head($head, 'attributeslines', $langs->trans("OrderLines"), -1, 'order');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index bff56b4f776..76179fac66c 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -248,16 +248,15 @@ else if ($action == 'setmod')
 
 
 /*
- * Affiche page
+ * View
  */
 
+$form=new Form($db);
+
 $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 
-
 llxHeader('',$langs->trans("PropalSetup"));
 
-$form=new Form($db);
-
 //if ($mesg) print $mesg;
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@@ -265,7 +264,7 @@ print load_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
 
 $head = propal_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Proposals"), 0, 'propal');
+dol_fiche_head($head, 'general', $langs->trans("Proposals"), -1, 'propal');
 
 /*
  *  Module numerotation
@@ -534,11 +533,10 @@ print '<br>';
 
 /*
  * Other options
- *
  */
+
 print load_fiche_titre($langs->trans("OtherOptions"),'','');
 
-$var=true;
 print "<table class=\"noborder\" width=\"100%\">";
 print "<tr class=\"liste_titre\">";
 print "<td>".$langs->trans("Parameter")."</td>\n";
@@ -572,7 +570,6 @@ print "</td></tr>\n";
 print '</form>';
 */
 
-$var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_PROPOSAL_FREE_TEXT">';
@@ -599,8 +596,14 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_PROPALE_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-print $langs->trans("WatermarkOnDraftProposal").'</td><td>';
-print '<input size="50" class="flat" type="text" name="PROPALE_DRAFT_WATERMARK" value="'.$conf->global->PROPALE_DRAFT_WATERMARK.'">';
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext);
+print '</td><td>';
+print '<input class="flat minwidth200" type="text" name="PROPALE_DRAFT_WATERMARK" value="'.$conf->global->PROPALE_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index 784512d6d1e..8d2ecd88277 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -69,7 +69,7 @@ print load_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
 
 $head = propal_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Proposals"), 0, 'propal');
+dol_fiche_head($head, 'attributes', $langs->trans("Proposals"), -1, 'propal');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index 633c4fab581..80f5afdaeed 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -76,7 +76,7 @@ print load_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
 
 $head = propal_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("Proposals"), 0, 'propal');
+dol_fiche_head($head, 'attributeslines', $langs->trans("Proposals"), -1, 'propal');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 13ea930dc5e..7f22898a458 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -57,6 +57,7 @@ $hookmanager->initHooks(array('mailingcard','globalcard'));
 
 // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 $object->substitutionarray=FormMail::getAvailableSubstitKey('emailing');
+$object->substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 
 $object->substitutionarrayfortest=array(
     '__ID__' => 'TESTIdRecord',
@@ -72,7 +73,7 @@ $object->substitutionarrayfortest=array(
 	'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:''),
     '__CHECK_READ__' => 'TagCheckMail',
 	'__UNSUBSCRIBE__' => 'TagUnsubscribe'
-	//,'__PERSONALIZED__' => 'TESTPersonalized'	// Not used yet
+		//,'__PERSONALIZED__' => 'TESTPersonalized'	// Not used yet
 );
 
 // List of sending methods
@@ -237,7 +238,7 @@ if (empty($reshook))
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
 						}
-						$substitutionisok=true;
+						//$substitutionisok=true;
 	                    complete_substitutions_array($substitutionarray, $langs);
 						$newsubject=make_substitutions($subject,$substitutionarray);
 						$newmessage=make_substitutions($message,$substitutionarray);
@@ -266,11 +267,11 @@ if (empty($reshook))
 						{
 							$res=0;
 						}
-						if (! $substitutionisok)
+						/*if (! $substitutionisok)
 						{
 							$mail->error='Some substitution failed';
 							$res=0;
-						}
+						}*/
 
 						// Send mail
 						if ($res)
@@ -754,8 +755,6 @@ else
 
 		$head = emailing_prepare_head($object);
 
-		dol_fiche_head($head, 'card', $langs->trans("Mailing"), 0, 'email');
-
 		// Confirmation back to draft
 		if ($action == 'settodraft')
 		{
@@ -780,6 +779,8 @@ else
 
 		if ($action != 'edit')
 		{
+			dol_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
+
 			/*
 			 * Mailing en mode visu
 			 */
@@ -842,7 +843,8 @@ else
 			if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
 			
 			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
-			
+
+			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 			
 			print '<table class="border" width="100%">';
@@ -903,8 +905,10 @@ else
 			print '</table>';
 
 			print "</div>";
+			
+			dol_fiche_end();
 
-
+			
 			// Clone confirmation
 			if ($action == 'clone')
 			{
@@ -1106,7 +1110,9 @@ else
 			/*
 			 * Mailing en mode edition
 			 */
-
+			
+			dol_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
+			
 			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
 			$morehtmlright='';
@@ -1114,6 +1120,7 @@ else
 			
 			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
 			
+			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 
 			print '<table class="border" width="100%">';
@@ -1132,9 +1139,6 @@ else
 			// To
 			print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto,0,0,0,0,1).'</td></tr>';
 
-			// Status
-			print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
-
 			// Nb of distinct emails
 			print '<tr><td>';
 			print $langs->trans("TotalNbOfDistinctRecipients");
@@ -1160,6 +1164,7 @@ else
 			}
 
 			print '</table>';
+			print '</div>';
 
 			dol_fiche_end();
 
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 16f3f4db561..d3642c50393 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -177,7 +177,7 @@ if ($object->fetch($id) >= 0)
 {
 	$head = emailing_prepare_head($object);
 
-	dol_fiche_head($head, 'targets', $langs->trans("Mailing"), 0, 'email');
+	dol_fiche_head($head, 'targets', $langs->trans("Mailing"), -1, 'email');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
@@ -186,16 +186,11 @@ if ($object->fetch($id) >= 0)
 	
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
 
-	
+	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 	
 	print '<table class="border" width="100%">';
-/*
-	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td>';
-	print '<td colspan="3">';
-	print $form->showrefnav($object,'id', $linkback);
-	print '</td></tr>';
-*/
+
 	print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from,0,0,0,0,1).'</td></tr>';
@@ -204,11 +199,6 @@ if ($object->fetch($id) >= 0)
 	print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto,0,0,0,0,1);
 	print '</td></tr>';
 
-	// Status
-/*	print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4);
-	if ($object->statut == 2) print ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.')';
-	print '</td></tr>';
-*/
 	// Nb of distinct emails
 	print '<tr><td>';
 	print $langs->trans("TotalNbOfDistinctRecipients");
@@ -229,6 +219,7 @@ if ($object->fetch($id) >= 0)
 
 	print "</div>";
 
+	dol_fiche_end();
 	
 
 	$allowaddtarget=($object->statut == 0);
@@ -256,8 +247,8 @@ if ($object->fetch($id) >= 0)
 		
 		clearstatcache();
 
-		$var=true;
-
+		$var = true;
+		
 		foreach ($modulesdir as $dir)
 		{
 		    $modulenames=array();
@@ -316,7 +307,7 @@ if ($object->fetch($id) >= 0)
 
 					if ($allowaddtarget)
 					{
-						print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
+						print '<form aa '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
 						print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 					}
 					else
@@ -514,7 +505,6 @@ if ($object->fetch($id) >= 0)
 		print '</td>';
 		print '</tr>';
 
-		$var = true;
 		$i = 0;
 
 		if ($num)
@@ -523,8 +513,6 @@ if ($object->fetch($id) >= 0)
 			{
 				$obj = $db->fetch_object($resql);
 
-				
-
 				print '<tr class="oddeven">';
 				print '<td>'.$obj->email.'</td>';
 				print '<td>'.$obj->lastname.'</td>';
@@ -599,7 +587,7 @@ if ($object->fetch($id) >= 0)
 		{
 			if ($object->statut < 2) 
 			{
-			    print '<tr '.$bc[false].'><td colspan="8" class="opacitymedium">';
+			    print '<tr><td colspan="8" class="opacitymedium">';
     			print $langs->trans("NoTargetYet");
     			print '</td></tr>';
 			}
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index 5280fcfad59..ddb0d4a8fc6 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -27,6 +27,8 @@ require_once DOL_DOCUMENT_ROOT .'/comm/mailing/class/mailing.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
 
+$id=GETPOST('id');
+
 $langs->load("mails");
 
 // Security check
@@ -45,11 +47,11 @@ $form = new Form($db);
 
 $object = new Mailing($db);
 
-if ($object->fetch($_REQUEST["id"]) >= 0)
+if ($object->fetch($id) >= 0)
 {
 	$head = emailing_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $langs->trans("Mailing"), 0, 'email');
+	dol_fiche_head($head, 'info', $langs->trans("Mailing"), -1, 'email');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 5838bb9bcf3..4b9ced1c4c0 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -359,7 +359,6 @@ class Facture extends CommonInvoice
 			    '__INVOICE_NEXT_YEAR__' => dol_print_date(dol_time_plus_duree($this->date, 1, 'y'), '%Y'),
 			);
 			
-			$substitutionisok=true;
 			complete_substitutions_array($substitutionarray, $outputlangs);
 			
 			$this->note_public=make_substitutions($this->note_public,$substitutionarray);
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 392ba507036..706807c8f02 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -938,7 +938,8 @@ if ($action == 'create')
 		    '__INVOICE_YEAR__' =>  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date,'%Y').')',
 		    '__INVOICE_NEXT_YEAR__' => $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'y'),'%Y').')'
 		);
-
+		$substitutionarray['__(TRANSKEY)__']=$langs->trans("TransKey");
+		
 		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
 		foreach($substitutionarray as $key => $val)
 		{
@@ -1241,7 +1242,8 @@ else
 		    '__INVOICE_YEAR__' =>  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample,'%Y').')',
 		    '__INVOICE_NEXT_YEAR__' => $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'),'%Y').')'
 		);
-
+		$substitutionarray['__(TRANSKEY)__']=$langs->trans("TransKey");
+		
 		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
 		foreach($substitutionarray as $key => $val)
 		{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 87039a3d454..d430a8ea53b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1025,11 +1025,15 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	if ($object->element == 'member')    $modulepart='memberphoto';
 	if ($object->element == 'user')      $modulepart='userphoto';
 	if ($object->element == 'product')   $modulepart='product';
-	if ($object->element == 'propal')    $modulepart='propal';
-	if ($object->element == 'commande')  $modulepart='commande';
-	if ($object->element == 'facture')   $modulepart='facture';
-	if ($object->element == 'fichinter') $modulepart='ficheinter';
-	
+	if (class_exists("Imagick"))
+	{
+		if ($object->element == 'propal')    $modulepart='propal';
+		if ($object->element == 'commande')  $modulepart='commande';
+		if ($object->element == 'facture')   $modulepart='facture';
+		if ($object->element == 'fichinter') $modulepart='ficheinter';
+		if ($object->element == 'contrat')   $modulepart='contract';
+	}
+
 	if ($object->element == 'product')
 	{
 	    $width=80; $cssclass='photoref';
@@ -1051,14 +1055,14 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	}
 	else
 	{
-        if ($showimage)
+		if ($showimage)
         {
-            if ($modulepart != 'unknown')
+        	if ($modulepart != 'unknown')
             {
                 $phototoshow='';
                 
                 // Check if a preview file is available
-                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter')) && class_exists("Imagick"))
+                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract')) && class_exists("Imagick"))
                 {
                     $objectref = dol_sanitizeFileName($object->ref);
                     $dir_output = $conf->$modulepart->dir_output . "/";
@@ -1083,7 +1087,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                             $ret = dol_convert_file($file, 'png', $fileimage);
                             if ($ret < 0) $error++;
                         }
-    
+
                         // Si fichier png PDF d'1 page trouve
                         if (file_exists($fileimage))
                         {
@@ -4865,45 +4869,77 @@ function dol_concatdesc($text1,$text2,$forxml=false)
 /**
  *  Make substition into a string replacing key with vals from $substitutionarray (oldval=>newval)
  *
- *  @param	string	$chaine      			Source string in which we must do substitution
- *  @param  array	$substitutionarray		Array with key->val to substitute
- * 	@return string  		    			Output string after subsitutions
+ *  @param	string		$text	      			Source string in which we must do substitution
+ *  @param  array		$substitutionarray		Array with key->val to substitute
+ *  @param	Translate	$outputlangs			Output language
+ * 	@return string  		    				Output string after substitutions
  *  @see	complete_substitutions_array
  */
-function make_substitutions($chaine,$substitutionarray)
+function make_substitutions($text, $substitutionarray, $outputlangs=null)
 {
-	global $conf;
+	global $conf, $langs;
 
 	if (! is_array($substitutionarray)) return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
-
-	// Make substitition
+	
+	if (empty($outputlangs)) $outputlangs=$langs;
+	
+	// Make substitution for language keys
+	if (is_object($outputlangs))
+	{
+		while (preg_match('/__\((.*)\)__/', $text, $reg))
+		{
+			$msgishtml = 0;
+			if (dol_textishtml($text,1)) $msgishtml = 1;
+			$text = preg_replace('/__\('.preg_quote($reg[1]).'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text);	
+		}
+	}
+		
+	// Make substitition for array $substitutionarray
 	foreach ($substitutionarray as $key => $value)
 	{
 		if ($key == '__SIGNATURE__' && (! empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value='';
-		$chaine=str_replace("$key","$value",$chaine);	// We must keep the " to work when value is 123.5 for example
+		$text=str_replace("$key","$value",$text);	// We must keep the " to work when value is 123.5 for example
 	}
 
-	return $chaine;
+	return $text;
 }
 
 /**
  *  Complete the $substitutionarray with more entries
  *
  *  @param  array		$substitutionarray		Array substitution old value => new value value
- *  @param  Translate	$outputlangs            If we want substitution from special constants, we provide a language
- *  @param  object		$object                 If we want substitution from special constants, we provide data in a source object
- *  @param  Mixed		$parameters       		Add more parameters (useful to pass product lines)
+ *  @param  Translate	$outputlangs            Output language
+ *  @param  Object		$object                 Source object
+ *  @param  mixed		$parameters       		Add more parameters (useful to pass product lines)
  *  @param  string      $callfunc               What is the name of the custom function that will be called? (default: completesubstitutionarray)
  *  @return	void
  *  @see 	make_substitutions
  */
-function complete_substitutions_array(&$substitutionarray,$outputlangs,$object='',$parameters=null,$callfunc="completesubstitutionarray")
+function complete_substitutions_array(&$substitutionarray, $outputlangs, $object=null, $parameters=null, $callfunc="completesubstitutionarray")
 {
 	global $conf,$user;
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	// Check if there is external substitution to do asked by plugins
+	// Add a substitution key for each object property
+	if (is_object($object))
+	{
+		// TODO
+	}
+	
+	// Add a substitution key for each extrafields, using key __EXTRA_XXX__
+	if (is_object($object) && is_array($object->array_options))
+	{
+		foreach($object->array_options as $key => $val)
+		{
+			$keyshort=preg_replace('/^(options|extra)_/','',$key);
+			$substitutionarray['__EXTRA_'.$keyshort.'__']=$val;
+			// For backward compatibiliy
+			$substitutionarray['%EXTRA_'.$keyshort.'%']=$val;
+		}
+	}
+	
+	// Check if there is external substitution to do, requested by plugins
 	$dirsubstitutions=array_merge(array(),(array) $conf->modules_parts['substitutions']);
 
 	foreach($dirsubstitutions as $reldir)
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 6855cef5f1a..282bdec690e 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -586,6 +586,29 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height)
 	}
 }
 
+
+/**
+ *   	Return array of possible substitutions
+ *
+ *		@param	Translate	$outputlangs	Output language
+ *      @return	array						Array of substitutions
+ */
+function pdf_getSubstitutionArray($outputlangs)
+{
+	global $conf, $mysoc, $user;
+	$substitutionarray=array(
+		'__MYCOMPANY_NAME__' => $mysoc->name,
+		'__MYCOMPANY_EMAIL__' => $mysoc->email,
+		'__USER_ID__' => $user->id,
+		'__USER_LOGIN__' => $user->login,
+		'__USER_LASTNAME__' => $user->lastname,
+		'__USER_FIRSTNAME__' => $user->firstname,
+		'__USER_FULLNAME__' => $user->getFullName($outputlangs)
+	);
+	return $substitutionarray;
+}
+
+
 /**
  *      Add a draft watermark on PDF files
  *
@@ -599,12 +622,20 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height)
  */
 function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 {
+	global $langs, $mysoc, $user;
+	
 	// Print Draft Watermark
 	if ($unit=='pt') $k=1;
 	elseif ($unit=='mm') $k=72/25.4;
 	elseif ($unit=='cm') $k=72/2.54;
 	elseif ($unit=='in') $k=72;
 
+	// Make substitution
+	$substitutionarray=pdf_getSubstitutionArray($outputlangs);
+	complete_substitutions_array($substitutionarray,$outputlangs,$object);
+	$text=make_substitutions($text,$substitutionarray,$outputlangs);
+	$text=$outputlangs->convToOutputCharset($text);
+	
 	$savx=$pdf->getX(); $savy=$pdf->getY();
 
 	$watermark_angle=atan($h/$w)/2;
@@ -819,7 +850,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
  */
 function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_basse,$marge_gauche,$page_hauteur,$object,$showdetails=0,$hidefreetext=0)
 {
-	global $conf,$user;
+	global $conf,$user,$mysoc;
 
 	$outputlangs->load("dict");
 	$line='';
@@ -829,16 +860,15 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	// Line of free text
 	if (empty($hidefreetext) && ! empty($conf->global->$paramfreetext))
 	{
-		// Make substitution
-		$substitutionarray=array(
-			'__FROM_NAME__' => $fromcompany->name,
-			'__FROM_EMAIL__' => $fromcompany->email,
-			'__TOTAL_TTC__' => $object->total_ttc,
-			'__TOTAL_HT__' => $object->total_ht,
-			'__TOTAL_VAT__' => $object->total_vat
-		);
+		$substitutionarray=pdf_getSubstitutionArray($outputlangs);
+		// More substitution keys
+		$substitutionarray['__FROM_NAME__']=$fromcompany->name;
+		$substitutionarray['__FROM_EMAIL__']=$fromcompany->email;
+		$substitutionarray['__TOTAL_TTC__']=$object->total_ttc;
+		$substitutionarray['__TOTAL_HT__']=$object->total_ht;
+		$substitutionarray['__TOTAL_VAT__']=$object->total_vat;
 		complete_substitutions_array($substitutionarray,$outputlangs,$object);
-		$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+		$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray,$outputlangs);
 		$line.=$outputlangs->convToOutputCharset($newfreetext);
 	}
 
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 9ee00df696e..693dd2e412f 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1499,7 +1499,7 @@ class pdf_crabe extends ModelePDFFactures
 		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
 		// Show Draft Watermark
-		if($object->statut==0 && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
+		if($object->statut==Facture::STATUS_DRAFT && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
         {
 		      pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->FACTURE_DRAFT_WATERMARK);
         }
@@ -1553,7 +1553,13 @@ class pdf_crabe extends ModelePDFFactures
 		$posy+=5;
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell($w, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$textref=$outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref);
+		if ($object->statut == Facture::STATUS_DRAFT) 
+		{
+			$pdf->SetTextColor(128,0,0);
+			$textref.=' - '.$outputlangs->trans("NotValidated");
+		}
+		$pdf->MultiCell($w, 4, $textref, '', 'R');
 
 		$posy+=1;
 		$pdf->SetFont('','', $default_font_size - 2);
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 810bc7f3364..f9c10eef6de 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -98,6 +98,13 @@ class modCommande extends DolibarrModules
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 
+		/*$r++;
+		$this->const[$r][0] = "COMMANDE_DRAFT_WATERMARK";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "__(Draft)__";
+		$this->const[$r][3] = 'Watermark to show on draft orders';
+		$this->const[$r][4] = 0;*/
+		
 		// Boxes
 		$this->boxes = array(
 			0=>array('file'=>'box_commandes.php','enabledbydefaulton'=>'Home'),
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 8022b21279f..148dd965abb 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -100,6 +100,13 @@ class modFacture extends DolibarrModules
 		$this->const[$r][4] = 0;
 		$r++;
 		
+		/*$this->const[$r][0] = "FACTURE_DRAFT_WATERMARK";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "__(Draft)__";
+		$this->const[$r][3] = 'Watermark to show on draft invoices';
+		$this->const[$r][4] = 0;
+		$r++;*/
+
 		
 		// Boxes
 		//$this->boxes = array(0=>array(1=>'box_factures_imp.php'),1=>array(1=>'box_factures.php'));
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index fe520e00925..ce23e996e0a 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -100,7 +100,14 @@ class modPropale extends DolibarrModules
 		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/proposals";
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
-
+		$r++;
+		
+		/*$this->const[$r][0] = "PROPALE_DRAFT_WATERMARK";
+		$this->const[$r][2] = "__(Draft)__";
+		$this->const[$r][3] = 'Watermark to show on draft proposals';
+		$this->const[$r][4] = 0;
+		$r++;*/
+				
 		// Boxes
 		$this->boxes = array(
            	0=>array('file'=>'box_graph_propales_permonth.php','enabledbydefaulton'=>'Home'),
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 73c34f7101e..71788071a2d 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -153,6 +153,7 @@ Edit=Edit
 Validate=Validate
 ValidateAndApprove=Validate and Approve
 ToValidate=To validate
+NotValidated=Not validated
 Save=Save
 SaveAs=Save As
 TestConnection=Test connection
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index f5acdeac02b..72a5f39e02c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -849,7 +849,7 @@ if (! defined('NOREQUIRETRAN'))
 $bc=array(0=>'class="impair"',1=>'class="pair"');
 $bcdd=array(0=>'class="drag drop oddeven"',1=>'class="drag drop oddeven"');
 $bcnd=array(0=>'class="nodrag nodrop nohover"',1=>'class="nodrag nodrop nohoverpair"');		// Used for tr to add new lines
-$bctag=array(0=>'class="tagtr"',1=>'class="pair tagtr"');
+$bctag=array(0=>'class="impair tagtr"',1=>'class="pair tagtr"');
 
 // Define messages variables
 $mesg=''; $warning=''; $error=0;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 971a4d2ed40..5c7f1f446ae 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2501,21 +2501,20 @@ div.pagination li.paginationafterarrows {
 
 
 /* Set the color for hover lines */
-.oddeven:hover, .odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover,
-table.dataTable tr.even:hover, table.dataTable tr.odd:hover
+.oddeven:hover, .evenodd:hover, .impair:hover, .pair:hover
 {
 <?php if ($colorbacklinepairhover) { ?>
 	background: rgb(<?php echo $colorbacklinepairhover; ?>) !important;		/* Must be background to be stronger than background of odd or even */
 <?php } ?>
 }
 
-.oddeven, .odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
+.oddeven, .evenodd, .impair, .nohover .impair:hover, tr.impair td.nohover
 {
 	font-family: <?php print $fontlist ?>;
 	margin-bottom: 1px;
 	color: #202020;
 }
-.odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
+.impair, .nohover .impair:hover, tr.impair td.nohover
 {
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
@@ -2523,16 +2522,16 @@ table.dataTable tr.even:hover, table.dataTable tr.odd:hover
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
 
-.oddeven, .even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
+.oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover {
 	font-family: <?php print $fontlist ?>;
 	margin-bottom: 1px;
 	color: #202020;
 }
-.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
+.pair, .nohover .pair:hover, tr.pair td.nohover {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>;
 }
 
-table.dataTable tr.odd, table.dataTable tr.oddeven {
+table.dataTable tr.oddeven {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
 
@@ -2541,7 +2540,7 @@ td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.imp
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
 }
-tr.nohoverpair td {
+td.evenodd, tr.nohoverpair td {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
@@ -2550,17 +2549,17 @@ tr.nohoverpair td {
 table.dataTable td {
     padding: 5px 2px 5px 3px !important;
 }
-tr.even td, tr.pair td, tr.odd td, tr.impair td, form.odd div.tagtd, form.impair div.tagtd, form.pair div.tagtd, div.impair div.tagtd, div.pair div.tagtd, div.liste_titre div.tagtd {
+tr.pair td, tr.impair td, form.impair div.tagtd, form.pair div.tagtd, div.impair div.tagtd, div.pair div.tagtd, div.liste_titre div.tagtd {
     padding: 7px 2px 7px 3px;
     border-bottom: 1px solid #ddd;
 }
 form.pair, form.impair {
 	font-weight: normal;
 }
-form.tagtr:last-of-type div.tagtd, tr.even:last-of-type td, tr.pair:last-of-type td, tr.odd:last-of-type td, tr.impair:last-of-type td {
+form.tagtr:last-of-type div.tagtd, tr.pair:last-of-type td, tr.impair:last-of-type td {
     border-bottom: 0px !important;
 }
-tr.even td .nobordernopadding tr td, tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td, tr.odd td .nobordernopadding tr td {
+tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td {
     border-bottom: 0px !important;
 }
 td.nobottom, td.nobottom {
@@ -2620,6 +2619,7 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
     font-family: <?php print $fontlist ?>;
     font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
     vertical-align: middle;
+    height: 24px;
 }
 tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a {
 	text-shadow: none !important;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 27c4713742a..8cc95628561 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2596,21 +2596,21 @@ div.pagination li.paginationafterarrows {
 */
 
 /* Set the color for hover lines */
-.oddeven:hover, .odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover, table.dataTable tr.even:hover, table.dataTable tr.odd:hover
+.oddeven:hover, .evenodd:hover, .impair:hover, .pair:hover
 {
 <?php if ($colorbacklinepairhover) { ?>
 	background: rgb(<?php echo $colorbacklinepairhover; ?>) !important;
 <?php } ?>
 }
 
-.oddeven, .odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
+.oddeven, .evenodd, .impair, .nohover .impair:hover, tr.impair td.nohover
 {
 	font-family: <?php print $fontlist ?>;
 	border: 0px;
 	margin-bottom: 1px;
 	color: #202020;
 }
-.odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
+.impair, .nohover .impair:hover, tr.impair td.nohover
 {
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
@@ -2618,15 +2618,15 @@ div.pagination li.paginationafterarrows {
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
 
-.oddeven, .even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
+.oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover {
 	font-family: <?php print $fontlist ?>;
 	margin-bottom: 1px;
 	color: #202020;
 }
-.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
+.pair, .nohover .pair:hover, tr.pair td.nohover {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>;
 }
-table.dataTable tr.odd, table.dataTable tr.oddeven {
+table.dataTable tr.oddeven {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
 
@@ -2635,7 +2635,7 @@ td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.imp
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
 }
-tr.nohoverpair td {
+td.evenodd, tr.nohoverpair td {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
@@ -2643,17 +2643,17 @@ tr.nohoverpair td {
 table.dataTable td {
     padding: 5px 2px 5px 3px !important;
 }
-tr.even td, tr.pair td, tr.odd td, tr.impair td, form.odd div.tagtd, form.impair div.tagtd, form.pair div.tagtd, div.impair div.tagtd, div.pair div.tagtd, div.liste_titre div.tagtd {
+tr.pair td, tr.impair td, form.impair div.tagtd, form.pair div.tagtd, div.impair div.tagtd, div.pair div.tagtd, div.liste_titre div.tagtd {
     padding: 5px 2px 5px 3px;
     border-bottom: 1px solid #eee;
 }
 form.pair, form.impair {
 	font-weight: normal;
 }
-tr.even:last-of-type td, tr.pair:last-of-type td, tr.odd:last-of-type td, tr.impair:last-of-type td {
+tr.pair:last-of-type td, tr.impair:last-of-type td {
     border-bottom: 0px !important;
 }
-tr.even td .nobordernopadding tr td, tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td, tr.odd td .nobordernopadding tr td {
+tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td {
     border-bottom: 0px !important;
 }
 td.nobottom, td.nobottom {
@@ -2726,6 +2726,7 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
     font-family: <?php print $fontlist ?>;
     font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
     vertical-align: middle;
+    height: 24px;
 }
 tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a {
 	text-shadow: none !important;

From 3da0aea1683e41f8bceb5857d254b501804d3c89 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Apr 2017 01:39:06 +0200
Subject: [PATCH 0622/1163] Prepare code to use different SMTP servers.

---
 htdocs/admin/mails_templates.php      |   4 +-
 htdocs/comm/mailing/card.php          |   4 +-
 htdocs/core/class/CMailFile.class.php | 681 +++++++++++++-------------
 3 files changed, 351 insertions(+), 338 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 90949c7980d..f0bf5609adf 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -27,7 +27,7 @@
  */
 
 /**
- *	    \file       htdocs/admin/dict.php
+ *	    \file       htdocs/admin/mails_templates.php
  *		\ingroup    setup
  *		\brief      Page to administer data tables
  */
@@ -119,12 +119,14 @@ $formmail=new FormMail($db);
 if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
 {
     $tmp=$formmail->getAvailableSubstitKey('form');
+    $tmp['__(AnyTransKey)__']='__(AnyTransKey)__';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
     $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
 }
 else
 {
     $tmp=$formmail->getAvailableSubstitKey('formwithlines');
+    $tmp['__(AnyTransKey)__']='__(AnyTransKey)__';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
     $tmp=$formmail->getAvailableSubstitKey('formforlines');
     $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 7f22898a458..fe582d56656 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -787,8 +787,8 @@ else
 			if ($action == 'sendall')
 			{
                 // Define message to recommand from command line
-
-				$sendingmode=$conf->global->MAIN_MAIL_SENDMODE;
+				$sendingmode=$conf->global->EMAILING_MAIL_SENDMODE;
+				if (empty($sendingmode)) $sendingmode=$conf->global->MAIN_MAIL_SENDMODE;
 				if (empty($sendingmode)) $sendingmode='mail';	// If not defined, we use php mail function
 
 				// MAILING_NO_USING_PHPMAIL may be defined or not.
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 3acdc342284..3da7f3abcf3 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -31,16 +31,20 @@
 
 /**
  *	Class to send emails (with attachments or not)
- *  Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to,$css,$trackid);
+ *  Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to,$css,$trackid,$moreinheader,$sendcontext);
  *         $mailfile->sendfile();
  */
 class CMailFile
 {
+	public $sendcontext;
+	public $sendmode;
+	public $sendsetup;
+	
 	var $subject;      	// Topic:       Subject of email
 	var $addr_from;    	// From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
-	                   	// Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
-	                   	//              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
-	                   	// Return-Path: Email where to send bounds.
+	// Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
+	//              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
+	// Return-Path: Email where to send bounds.
 	var $reply_to;		// Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
 	var $errors_to;		// Errors-To:	Email where to send errors.
 	var $addr_to;
@@ -77,13 +81,13 @@ class CMailFile
 	var $html_images=array();
 	var $images_encoded=array();
 	var $image_types = array('gif'  => 'image/gif',
-                           'jpg'  => 'image/jpeg',
-                           'jpeg' => 'image/jpeg',
-                           'jpe'  => 'image/jpeg',
-                           'bmp'  => 'image/bmp',
-                           'png'  => 'image/png',
-                           'tif'  => 'image/tiff',
-                           'tiff' => 'image/tiff');
+			'jpg'  => 'image/jpeg',
+			'jpeg' => 'image/jpeg',
+			'jpe'  => 'image/jpeg',
+			'bmp'  => 'image/bmp',
+			'png'  => 'image/png',
+			'tif'  => 'image/tiff',
+			'tiff' => 'image/tiff');
 
 
 	/**
@@ -104,14 +108,22 @@ class CMailFile
 	 *	@param	string	$css                 Css option
 	 *	@param	string	$trackid             Tracking string (contains type and id of related element)
 	 *  @param  string  $moreinheader        More in header. $moreinheader must contains the "\r\n" (TODO not supported for other MAIL_SEND_MODE different than 'phpmail' and 'smtps' for the moment)
-	 *  @param  string  $sendingcontext      'standard', 'emailing', ...
+	 *  @param  string  $sendcontext      	 'standard', 'emailing', ...
 	 */
-	function __construct($subject,$to,$from,$msg,$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='',$trackid='',$moreinheader='',$sendingcontext='standard')
+	function __construct($subject,$to,$from,$msg,$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='',$trackid='',$moreinheader='',$sendcontext='standard')
 	{
 		global $conf, $dolibarr_main_data_root;
 
-		$this->sendingcontext = $sendingcontext;
+		$this->sendcontext = $sendcontext;
 		
+		$this->sendmode = '';
+		if ($this->sendcontext == 'emailing') $this->sendmode = $conf->global->EMAILING_MAIL_SENDMODE;	
+		if (empty($this->sendmode)) $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
+		if (empty($this->sendmode)) $this->sendmode='mail';
+		
+		$this->sendsetup = array();
+		
+
 		// We define end of line (RFC 821).
 		$this->eol="\r\n";
 		// We define end of line for header fields (RFC 822bis section 2.3 says header must contains \r\n).
@@ -132,17 +144,14 @@ class CMailFile
 		// On defini alternative_boundary
 		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);	// Force md5 hash (does not contains special chars)
 
-		// If ending method not defined
-		if (empty($conf->global->MAIN_MAIL_SENDMODE)) $conf->global->MAIN_MAIL_SENDMODE='mail';
-
-		dol_syslog("CMailFile::CMailfile: MAIN_MAIL_SENDMODE=".$conf->global->MAIN_MAIL_SENDMODE." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid sendingcontext=$sendingcontext", LOG_DEBUG);
+		dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);
 		dol_syslog("CMailFile::CMailfile: subject=$subject, deliveryreceipt=$deliveryreceipt, msgishtml=$msgishtml", LOG_DEBUG);
 
 		if (empty($subject))
 		{
-            dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
-            $this->error='ErrorSubjectIsRequired';
-            return;
+			dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
+			$this->error='ErrorSubjectIsRequired';
+			return;
 		}
 
 		// Detect if message is HTML (use fast method)
@@ -163,11 +172,11 @@ class CMailFile
 		{
 			$this->html = $msg;
 
-            if (! empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
-            {
-                $findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
-            }
-            
+			if (! empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
+			{
+				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
+			}
+
 			// Define if there is at least one file
 			if ($findimg)
 			{
@@ -196,7 +205,7 @@ class CMailFile
 		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
 
 		// Action according to choosed sending method
-		if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
+		if ($this->sendmode == 'mail')
 		{
 			// Use mail php function (default PHP method)
 			// ------------------------------------------
@@ -216,9 +225,9 @@ class CMailFile
 			$this->addr_bcc = $addr_bcc;
 			$this->deliveryreceipt = $deliveryreceipt;
 			$this->trackid = $trackid;
-			
+				
 			$smtp_headers = $this->write_smtpheaders();
-            if (! empty($moreinheader)) $smtp_headers.=$moreinheader;   // $moreinheader contains the \r\n
+			if (! empty($moreinheader)) $smtp_headers.=$moreinheader;   // $moreinheader contains the \r\n
 
 			// Define mime_headers
 			$mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
@@ -254,7 +263,7 @@ class CMailFile
 			$this->message.= $text_body . $files_encoded;
 			$this->message.= "--" . $this->mixed_boundary . "--" . $this->eol;
 		}
-		else if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
+		else if ($this->sendmode == 'smtps')
 		{
 			// Use SMTPS library
 			// ------------------------------------------
@@ -310,7 +319,7 @@ class CMailFile
 			$this->smtps=$smtps;
 		}
 		// TODO not stable, in progress
-		else if ($conf->global->MAIN_MAIL_SENDMODE == 'phpmailer')
+		else if ($this->sendmode == 'phpmailer')
 		{
 			// Use PHPMailer library
 			// ------------------------------------------
@@ -325,7 +334,7 @@ class CMailFile
 			$this->phpmailer->SetReplyTo($this->getValidAddress($from,0,1));   // Set property with this->phpmailer->setReplyTo after constructor if you want to use another value than the From
 			// TODO Add trackid into smtp header
 			// TODO if (! empty($moreinheader)) ...
-					
+				
 			if (! empty($this->html))
 			{
 				if (!empty($css))
@@ -362,94 +371,94 @@ class CMailFile
 			$this->phpmailer->setErrorsTo($errors_to);
 			$this->phpmailer->setDeliveryReceipt($deliveryreceipt);
 		}
-        else if ($conf->global->MAIN_MAIL_SENDMODE == 'swiftmailer')
-        {
-            // Use Swift Mailer library
-            // ------------------------------------------
-            
-            $host = dol_getprefix('email');
-            
-            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
-            // Create the message
-            $this->message = Swift_Message::newInstance();
+		else if ($this->sendmode == 'swiftmailer')
+		{
+			// Use Swift Mailer library
+			// ------------------------------------------
 
-            // Adding a trackid header to a message
-            $headers = $this->message->getHeaders();
-            $headers->addTextHeader('X-Dolibarr-TRACKID', $trackid);
-            $headerID = time() . '.swiftmailer-dolibarr-' . $trackid . '@' . $host;
-            $msgid = $headers->get('Message-ID');
-            $msgid->setId($headerID);
-            $headers->addIdHeader('References', $headerID);
-            // TODO if (! empty($moreinheader)) ...
-            
-            // Give the message a subject
-            $this->message->setSubject($this->encodetorfc2822($subject));
+			$host = dol_getprefix('email');
 
-            // Set the From address with an associative array
-            //$this->message->setFrom(array('john@doe.com' => 'John Doe'));
-            if (! empty($from)) $this->message->setFrom($this->getArrayAddress($from));
+			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
+			// Create the message
+			$this->message = Swift_Message::newInstance();
 
-            // Set the To addresses with an associative array
-            if (! empty($to)) $this->message->setTo($this->getArrayAddress($to));
+			// Adding a trackid header to a message
+			$headers = $this->message->getHeaders();
+			$headers->addTextHeader('X-Dolibarr-TRACKID', $trackid);
+			$headerID = time() . '.swiftmailer-dolibarr-' . $trackid . '@' . $host;
+			$msgid = $headers->get('Message-ID');
+			$msgid->setId($headerID);
+			$headers->addIdHeader('References', $headerID);
+			// TODO if (! empty($moreinheader)) ...
 
-            if (! empty($from)) $this->message->SetReplyTo($this->getArrayAddress($from));
+			// Give the message a subject
+			$this->message->setSubject($this->encodetorfc2822($subject));
 
-            $this->message->setCharSet($conf->file->character_set_client);
+			// Set the From address with an associative array
+			//$this->message->setFrom(array('john@doe.com' => 'John Doe'));
+			if (! empty($from)) $this->message->setFrom($this->getArrayAddress($from));
 
-            if (! empty($this->html))
-            {
-                if (!empty($css))
-                {
-                    $this->css = $css;
-                    $this->buildCSS();
-                }
-                $msg = $this->html;
-                $msg = $this->checkIfHTML($msg);
-            }
+			// Set the To addresses with an associative array
+			if (! empty($to)) $this->message->setTo($this->getArrayAddress($to));
 
-            if ($this->atleastoneimage)
-            {
-                foreach ($this->images_encoded as $img)
-                {
-                    //$img['fullpath'],$img['image_encoded'],$img['name'],$img['content_type'],$img['cid']
-                    $attachment = Swift_Image::fromPath($img['fullpath'], $img['content_type']);
-                    // embed image
-                    $imgcid = $this->message->embed($attachment);
-                    // replace cid by the one created by swiftmail in html message
-                    $msg = str_replace("cid:".$img['cid'], $imgcid, $msg);
-                }
-            }
+			if (! empty($from)) $this->message->SetReplyTo($this->getArrayAddress($from));
 
-            if ($this->msgishtml) {
-                $this->message->setBody($msg,'text/html');
-                // And optionally an alternative body
-                //$this->message->addPart('Here is the message itself', 'text/plain');
-            } else {
-                $this->message->setBody($msg,'text/plain');
-                // And optionally an alternative body
-                //$this->message->addPart('<q>Here is the message itself</q>', 'text/html');
-            }
+			$this->message->setCharSet($conf->file->character_set_client);
 
-            if ($this->atleastonefile)
-            {
-                foreach ($filename_list as $i => $val)
-                {
-                    //$this->message->attach(Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]));
-                    $attachment = Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]);
-                    $this->message->attach($attachment);
-                }
-            }
+			if (! empty($this->html))
+			{
+				if (!empty($css))
+				{
+					$this->css = $css;
+					$this->buildCSS();
+				}
+				$msg = $this->html;
+				$msg = $this->checkIfHTML($msg);
+			}
 
-            if (! empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
-            if (! empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
-            //if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
-            if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
-        }
+			if ($this->atleastoneimage)
+			{
+				foreach ($this->images_encoded as $img)
+				{
+					//$img['fullpath'],$img['image_encoded'],$img['name'],$img['content_type'],$img['cid']
+					$attachment = Swift_Image::fromPath($img['fullpath'], $img['content_type']);
+					// embed image
+					$imgcid = $this->message->embed($attachment);
+					// replace cid by the one created by swiftmail in html message
+					$msg = str_replace("cid:".$img['cid'], $imgcid, $msg);
+				}
+			}
+
+			if ($this->msgishtml) {
+				$this->message->setBody($msg,'text/html');
+				// And optionally an alternative body
+				//$this->message->addPart('Here is the message itself', 'text/plain');
+			} else {
+				$this->message->setBody($msg,'text/plain');
+				// And optionally an alternative body
+				//$this->message->addPart('<q>Here is the message itself</q>', 'text/html');
+			}
+
+			if ($this->atleastonefile)
+			{
+				foreach ($filename_list as $i => $val)
+				{
+					//$this->message->attach(Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]));
+					$attachment = Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]);
+					$this->message->attach($attachment);
+				}
+			}
+
+			if (! empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
+			if (! empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
+			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
+			if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
+		}
 		else
 		{
 			// Send mail method not correctly defined
 			// --------------------------------------
-            $this->error = 'Bad value for MAIN_MAIL_SENDMODE constant';
+			$this->error = 'Bad value for sendmode';
 		}
 
 	}
@@ -471,55 +480,55 @@ class CMailFile
 
 		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS))
 		{
-            require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
-            $hookmanager = new HookManager($db);
-            $hookmanager->initHooks(array(
-                'maildao'
-            ));
-            $reshook = $hookmanager->executeHooks('doactions', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-            if (! empty($reshook))
-            {
-                $this->error = "Error in hook maildao doactions " . $reshook;
-                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
+			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($db);
+			$hookmanager->initHooks(array(
+					'maildao'
+			));
+			$reshook = $hookmanager->executeHooks('doactions', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+			if (! empty($reshook))
+			{
+				$this->error = "Error in hook maildao doactions " . $reshook;
+				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
 
-                return $reshook;
-            }
+				return $reshook;
+			}
 
-            // Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
-            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
-            $tmparray1 = explode(',', $this->addr_to);
-            if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
-            {
-                $this->error = 'Too much recipients in to:';
-                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-                return false;
-            }
-            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
-            $tmparray2 = explode(',', $this->addr_cc);
-            if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
-            {
-                $this->error = 'Too much recipients in cc:';
-                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-                return false;
-            }
-            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
-            $tmparray3 = explode(',', $this->addr_bcc);
-            if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
-            {
-                $this->error = 'Too much recipients in bcc:';
-                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-                return false;
-            }
-            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
-            if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
-            {
-                $this->error = 'Too much recipients in to:, cc:, bcc:';
-                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-                return false;
-            }
+			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
+			$tmparray1 = explode(',', $this->addr_to);
+			if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
+			{
+				$this->error = 'Too much recipients in to:';
+				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				return false;
+			}
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
+			$tmparray2 = explode(',', $this->addr_cc);
+			if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
+			{
+				$this->error = 'Too much recipients in cc:';
+				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				return false;
+			}
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
+			$tmparray3 = explode(',', $this->addr_bcc);
+			if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
+			{
+				$this->error = 'Too much recipients in bcc:';
+				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				return false;
+			}
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
+			if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
+			{
+				$this->error = 'Too much recipients in to:, cc:, bcc:';
+				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				return false;
+			}
 
 			// Action according to choosed sending method
-			if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
+			if ($this->sendmode == 'mail')
 			{
 				// Use mail php function (default PHP method)
 				// ------------------------------------------
@@ -555,15 +564,15 @@ class CMailFile
 						// Having this variable not defined may create problems with some other sendmail (option -f required)
 						$additionnalparam .= ($additionnalparam?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
 					}
-                    if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
-                    {
-                        $additionnalparam .= ($additionnalparam?' ':'').'-ba';
-                    }
+					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
+					{
+						$additionnalparam .= ($additionnalparam?' ':'').'-ba';
+					}
+
+					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
+
+					dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
 
-                    if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
-                    
-                    dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
-                    
 					$this->message=stripslashes($this->message);
 
 					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
@@ -600,7 +609,7 @@ class CMailFile
 				if (! empty($conf->global->MAIN_MAIL_SMTP_SERVER))	ini_restore('SMTP');
 				if (! empty($conf->global->MAIN_MAIL_SMTP_PORT)) 	ini_restore('smtp_port');
 			}
-			else if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
+			else if ($this->sendmode == 'smtps')
 			{
 
 				// Use SMTPS library
@@ -612,25 +621,25 @@ class CMailFile
 				if (empty($conf->global->MAIN_MAIL_SMTP_PORT))   $conf->global->MAIN_MAIL_SMTP_PORT=ini_get('smtp_port');
 
 				// TODO Manage alternative parameters
-				
+
 				// If we use SSL/TLS
 				$server=$conf->global->MAIN_MAIL_SMTP_SERVER;
 				if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server;
-                $port=$conf->global->MAIN_MAIL_SMTP_PORT;
-                
+				$port=$conf->global->MAIN_MAIL_SMTP_PORT;
+
 				$this->smtps->setHost($server);
 				$this->smtps->setPort($port); // 25, 465...;
 
 				$loginid=''; $loginpass='';
-				if (! empty($conf->global->MAIN_MAIL_SMTPS_ID)) 
+				if (! empty($conf->global->MAIN_MAIL_SMTPS_ID))
 				{
-				    $loginid = $conf->global->MAIN_MAIL_SMTPS_ID;
-				    $this->smtps->setID($loginid);
+					$loginid = $conf->global->MAIN_MAIL_SMTPS_ID;
+					$this->smtps->setID($loginid);
 				}
-				if (! empty($conf->global->MAIN_MAIL_SMTPS_PW)) 
+				if (! empty($conf->global->MAIN_MAIL_SMTPS_PW))
 				{
-				    $loginpass = $conf->global->MAIN_MAIL_SMTPS_PW;
-				    $this->smtps->setPW($loginpass);
+					$loginpass = $conf->global->MAIN_MAIL_SMTPS_PW;
+					$this->smtps->setPW($loginpass);
 				}
 
 				$res=true;
@@ -652,7 +661,7 @@ class CMailFile
 				if ($res)
 				{
 					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
-					
+						
 					$result=$this->smtps->sendMsg();
 					//print $result;
 
@@ -668,63 +677,63 @@ class CMailFile
 					}
 				}
 			}
-            else if ($conf->global->MAIN_MAIL_SENDMODE == 'swiftmailer')
-            {
+			else if ($this->sendmode == 'swiftmailer')
+			{
 
-                // Use Swift Mailer library
-                // ------------------------------------------
-                require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
+				// Use Swift Mailer library
+				// ------------------------------------------
+				require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
 
-                // Forcage parametres
-                if (empty($conf->global->MAIN_MAIL_SMTP_SERVER)) $conf->global->MAIN_MAIL_SMTP_SERVER=ini_get('SMTP');
-                if (empty($conf->global->MAIN_MAIL_SMTP_PORT))   $conf->global->MAIN_MAIL_SMTP_PORT=ini_get('smtp_port');
+				// Forcage parametres
+				if (empty($conf->global->MAIN_MAIL_SMTP_SERVER)) $conf->global->MAIN_MAIL_SMTP_SERVER=ini_get('SMTP');
+				if (empty($conf->global->MAIN_MAIL_SMTP_PORT))   $conf->global->MAIN_MAIL_SMTP_PORT=ini_get('smtp_port');
 
-                // If we use SSL/TLS
-                $server=$conf->global->MAIN_MAIL_SMTP_SERVER;
-                $secure='';
-                //var_dump(stream_get_transports());
-                if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $secure='ssl';
-                if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $secure='tls';
+				// If we use SSL/TLS
+				$server=$conf->global->MAIN_MAIL_SMTP_SERVER;
+				$secure='';
+				//var_dump(stream_get_transports());
+				if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $secure='ssl';
+				if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $secure='tls';
 
-                $this->transport = Swift_SmtpTransport::newInstance($server, $conf->global->MAIN_MAIL_SMTP_PORT, $secure);
+				$this->transport = Swift_SmtpTransport::newInstance($server, $conf->global->MAIN_MAIL_SMTP_PORT, $secure);
 
-                if (! empty($conf->global->MAIN_MAIL_SMTPS_ID)) $this->transport->setUsername($conf->global->MAIN_MAIL_SMTPS_ID);
-                if (! empty($conf->global->MAIN_MAIL_SMTPS_PW)) $this->transport->setPassword($conf->global->MAIN_MAIL_SMTPS_PW);
-                //$smtps->_msgReplyTo  = 'reply@web.com';
+				if (! empty($conf->global->MAIN_MAIL_SMTPS_ID)) $this->transport->setUsername($conf->global->MAIN_MAIL_SMTPS_ID);
+				if (! empty($conf->global->MAIN_MAIL_SMTPS_PW)) $this->transport->setPassword($conf->global->MAIN_MAIL_SMTPS_PW);
+				//$smtps->_msgReplyTo  = 'reply@web.com';
 
-                // Create the Mailer using your created Transport
-                $this->mailer = Swift_Mailer::newInstance($this->transport);
+				// Create the Mailer using your created Transport
+				$this->mailer = Swift_Mailer::newInstance($this->transport);
 
-                if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
-                    // To use the ArrayLogger
-                    $this->logger = new Swift_Plugins_Loggers_ArrayLogger();
-                    // Or to use the Echo Logger
-                    //$this->logger = new Swift_Plugins_Loggers_EchoLogger();
-                    $this->mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($this->logger));
-                }
-                // send mail
-                try {
-                    $result = $this->mailer->send($this->message);
-                } catch (Exception $e) {
-                    $this->error =  $e->getMessage();
-                }
-                if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+				if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+					// To use the ArrayLogger
+					$this->logger = new Swift_Plugins_Loggers_ArrayLogger();
+					// Or to use the Echo Logger
+					//$this->logger = new Swift_Plugins_Loggers_EchoLogger();
+					$this->mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($this->logger));
+				}
+				// send mail
+				try {
+					$result = $this->mailer->send($this->message);
+				} catch (Exception $e) {
+					$this->error =  $e->getMessage();
+				}
+				if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
 
-                $res = true;
-                if (! empty($this->error) && ! $result) {
-                    dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-                    $res=false;
-                } else {
-                    $this->error = sprintf ("Sent %d messages\n", $result);
-                }
-            }
+				$res = true;
+				if (! empty($this->error) && ! $result) {
+					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+					$res=false;
+				} else {
+					$this->error = sprintf ("Sent %d messages\n", $result);
+				}
+			}
 			else
 			{
 
 				// Send mail method not correctly defined
 				// --------------------------------------
 
-				return 'Bad value for MAIN_MAIL_SENDMODE constant';
+				return 'Bad value for sendmode';
 			}
 
 		}
@@ -792,81 +801,81 @@ class CMailFile
 			$outputfile=$dolibarr_main_data_root."/dolibarr_mail.log";
 			$fp = fopen($outputfile,"w");
 
-			if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
+			if ($this->sendmode == 'mail')
 			{
 				fputs($fp, $this->headers);
 				fputs($fp, $this->eol);			// This eol is added by the mail function, so we add it in log
 				fputs($fp, $this->message);
 			}
-			elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
+			elseif ($this->sendmode == 'smtps')
 			{
 				fputs($fp, $this->smtps->log);	// this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
 			}
-            elseif ($conf->global->MAIN_MAIL_SENDMODE == 'swiftmailer')
-            {
-                fputs($fp, $this->logger->dump());	// this->logger is filled only if MAIN_MAIL_DEBUG was set to on
-            }
+			elseif ($this->sendmode == 'swiftmailer')
+			{
+				fputs($fp, $this->logger->dump());	// this->logger is filled only if MAIN_MAIL_DEBUG was set to on
+			}
 
 			fclose($fp);
 			if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 	}
 
 
-    /**
-     * Correct an uncomplete html string
-     *
-     * @param	string	$msg	String
-     * @return	string			Completed string
-     */
-    function checkIfHTML($msg)
-    {
-        if (!preg_match('/^[\s\t]*<html/i',$msg))
-        {
-            $out = "<html><head><title></title>";
-            if (!empty($this->styleCSS)) $out.= $this->styleCSS;
-            $out.= "</head><body";
-            if (!empty($this->bodyCSS)) $out.= $this->bodyCSS;
-            $out.= ">";
-            $out.= $msg;
-            $out.= "</body></html>";
-        }
-        else
-        {
-            $out = $msg;
-        }
+	/**
+	 * Correct an uncomplete html string
+	 *
+	 * @param	string	$msg	String
+	 * @return	string			Completed string
+	 */
+	function checkIfHTML($msg)
+	{
+		if (!preg_match('/^[\s\t]*<html/i',$msg))
+		{
+			$out = "<html><head><title></title>";
+			if (!empty($this->styleCSS)) $out.= $this->styleCSS;
+			$out.= "</head><body";
+			if (!empty($this->bodyCSS)) $out.= $this->bodyCSS;
+			$out.= ">";
+			$out.= $msg;
+			$out.= "</body></html>";
+		}
+		else
+		{
+			$out = $msg;
+		}
 
-        return $out;
-    }
+		return $out;
+	}
 
-    /**
-     * Build a css style (mode = all) into this->styleCSS and this->bodyCSS
-     *
-     * @return css
-     */
-    function buildCSS()
-    {
-        if (! empty($this->css))
-        {
-            // Style CSS
-            $this->styleCSS = '<style type="text/css">';
-            $this->styleCSS.= 'body {';
+	/**
+	 * Build a css style (mode = all) into this->styleCSS and this->bodyCSS
+	 *
+	 * @return css
+	 */
+	function buildCSS()
+	{
+		if (! empty($this->css))
+		{
+			// Style CSS
+			$this->styleCSS = '<style type="text/css">';
+			$this->styleCSS.= 'body {';
 
-            if ($this->css['bgcolor'])
-            {
-                $this->styleCSS.= '  background-color: '.$this->css['bgcolor'].';';
-                $this->bodyCSS.= ' bgcolor="'.$this->css['bgcolor'].'"';
-            }
-            if ($this->css['bgimage'])
-            {
-                // TODO recuperer cid
-                $this->styleCSS.= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
-            }
-            $this->styleCSS.= '}';
-            $this->styleCSS.= '</style>';
-        }
-    }
+			if ($this->css['bgcolor'])
+			{
+				$this->styleCSS.= '  background-color: '.$this->css['bgcolor'].';';
+				$this->bodyCSS.= ' bgcolor="'.$this->css['bgcolor'].'"';
+			}
+			if ($this->css['bgimage'])
+			{
+				// TODO recuperer cid
+				$this->styleCSS.= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
+			}
+			$this->styleCSS.= '}';
+			$this->styleCSS.= '</style>';
+		}
+	}
 
 
 	/**
@@ -924,7 +933,7 @@ class CMailFile
 
 		$out.= "Content-Type: multipart/mixed; boundary=\"".$this->mixed_boundary."\"".$this->eol2;
 		$out.= "Content-Transfer-Encoding: 8bit".$this->eol2;
-		
+
 		dol_syslog("CMailFile::write_smtpheaders smtp_header=\n".$out);
 		return $out;
 	}
@@ -992,14 +1001,14 @@ class CMailFile
 		{
 			$strContentAltText = html_entity_decode(strip_tags($strContent));
 			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n"));
-		    
-		    // Check if html header already in message, if not complete the message
+
+			// Check if html header already in message, if not complete the message
 			$strContent = $this->checkIfHTML($strContent);
 		}
 
 		// Make RFC2045 Compliant, split lines
-        //$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
-        $strContent = rtrim(wordwrap($strContent));   // TODO Using this method creates unexpected line break on text/plain content.
+		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
+		$strContent = rtrim(wordwrap($strContent));   // TODO Using this method creates unexpected line break on text/plain content.
 
 		if ($this->msgishtml)
 		{
@@ -1012,23 +1021,23 @@ class CMailFile
 				$out.= $this->eol;
 				$out.= "--" . $this->related_boundary . $this->eol;
 			}
-			
+				
 			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
 			{
 				$out.= "Content-Type: multipart/alternative; boundary=\"".$this->alternative_boundary."\"".$this->eol;
 				$out.= $this->eol;
 				$out.= "--" . $this->alternative_boundary . $this->eol;
 				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
-			    $out.= $this->eol.$strContentAltText.$this->eol;
-			    $out.= "--" . $this->alternative_boundary . $this->eol;
+				$out.= $this->eol.$strContentAltText.$this->eol;
+				$out.= "--" . $this->alternative_boundary . $this->eol;
 			}
-			
+				
 			$out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol;
 			$out.= $this->eol.$strContent.$this->eol;
-		
+
 			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
 			{
-			    $out.= "--" . $this->alternative_boundary . "--". $this->eol;
+				$out.= "--" . $this->alternative_boundary . "--". $this->eol;
 			}
 		}
 		else
@@ -1042,13 +1051,13 @@ class CMailFile
 		// Encode images
 		if ($this->atleastoneimage)
 		{
-		    $out .= $this->write_images($this->images_encoded);
-		    // always end related and end alternative after inline images
-		    $out .= "--" . $this->related_boundary . "--" . $this->eol;
-		    $out .= $this->eol . "--" . $this->alternative_boundary . "--" . $this->eol;
-		    $out .= $this->eol;
+			$out .= $this->write_images($this->images_encoded);
+			// always end related and end alternative after inline images
+			$out .= "--" . $this->related_boundary . "--" . $this->eol;
+			$out .= $this->eol . "--" . $this->alternative_boundary . "--" . $this->eol;
+			$out .= $this->eol;
 		}
-		
+
 		return $out;
 	}
 
@@ -1074,10 +1083,12 @@ class CMailFile
 				if ($encoded >= 0)
 				{
 					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
-					if (! $mimetype_list[$i]) { $mimetype_list[$i] = "application/octet-stream"; }
+					if (! $mimetype_list[$i]) {
+						$mimetype_list[$i] = "application/octet-stream";
+					}
 
 					$out.= "--" . $this->mixed_boundary . $this->eol;
-                    $out.= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
+					$out.= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
 					$out.= "Content-Type: " . $mimetype_list[$i] . "; name=\"".$filename_list[$i]."\"".$this->eol;
 					$out.= "Content-Transfer-Encoding: base64".$this->eol;
 					$out.= "Content-Description: File Attachment".$this->eol;
@@ -1137,25 +1148,25 @@ class CMailFile
 	 */
 	function check_server_port($host,$port)
 	{
-        global $conf;
+		global $conf;
 		$_retVal=0;
 		$timeout=5;	// Timeout in seconds
 
 		if (function_exists('fsockopen'))
 		{
-            // If we use SSL/TLS
-            if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $host='ssl://'.$host;
-            // tls smtp start with no encryption
-            //if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
+			// If we use SSL/TLS
+			if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $host='ssl://'.$host;
+			// tls smtp start with no encryption
+			//if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
 
 			dol_syslog("Try socket connection to host=".$host." port=".$port);
 			//See if we can connect to the SMTP server
 			if ($socket = @fsockopen(
-			    $host,       // Host to test, IP or domain. Add ssl:// for SSL/TLS.
-			    $port,       // which Port number to use
-			    $errno,      // actual system level error
-			    $errstr,     // and any text that goes with the error
-			    $timeout
+					$host,       // Host to test, IP or domain. Add ssl:// for SSL/TLS.
+					$port,       // which Port number to use
+					$errno,      // actual system level error
+					$errstr,     // and any text that goes with the error
+					$timeout
 			))  // timeout for reading/writing data over the socket
 			{
 				// Windows still does not have support for this timeout function
@@ -1225,7 +1236,7 @@ class CMailFile
 			foreach ($matches[1] as $full)
 			{
 
-                if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))   // If xxx is 'file=aaa'
+				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))   // If xxx is 'file=aaa'
 				{
 					$img = $regs[1];
 
@@ -1306,7 +1317,7 @@ class CMailFile
 	 * @param	string		$address		     Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
 	 * @param	int			$format			     0=auto, 1=emails with <>, 2=emails without <>, 3=auto + label between "
 	 * @param	int			$encode			     0=No encode name, 1=Encode name to RFC2822
-	 * @param   int         $maxnumberofemail    0=No limit. Otherwise, maximum number of emails returned ($address may contains several email separated with ','). Add '...' if there is more. 
+	 * @param   int         $maxnumberofemail    0=No limit. Otherwise, maximum number of emails returned ($address may contains several email separated with ','). Add '...' if there is more.
 	 * @return	string						     If format 0: '<john@doe.com>' or 'John Doe <john@doe.com>' or '=?UTF-8?B?Sm9obiBEb2U=?= <john@doe.com>'
 	 * 										     If format 1: '<john@doe.com>'
 	 *										     If format 2: 'john@doe.com'
@@ -1338,12 +1349,12 @@ class CMailFile
 
 			if ($email)
 			{
-			    $i++;
-			    
+				$i++;
+				 
 				$newemail='';
 				if ($format == 4)
 				{
-				    $newemail = $name?$name:$email;
+					$newemail = $name?$name:$email;
 				}
 				if ($format == 2)
 				{
@@ -1361,12 +1372,12 @@ class CMailFile
 				}
 
 				$ret=($ret ? $ret.',' : '').$newemail;
-				
+
 				// Stop if we have too much records
 				if ($maxnumberofemail && $i >= $maxnumberofemail)
 				{
-				    if (count($arrayaddress) > $maxnumberofemail) $ret.='...';
-				    break;
+					if (count($arrayaddress) > $maxnumberofemail) $ret.='...';
+					break;
 				}
 			}
 		}
@@ -1374,38 +1385,38 @@ class CMailFile
 		return $ret;
 	}
 
-    /**
-     * Return a formatted array of address string for SMTP protocol
-     *
-     * @param   string      $address        Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
-     * @return  array                       array of email => name
-     */
-    function getArrayAddress($address)
-    {
-        global $conf;
+	/**
+	 * Return a formatted array of address string for SMTP protocol
+	 *
+	 * @param   string      $address        Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
+	 * @return  array                       array of email => name
+	 */
+	function getArrayAddress($address)
+	{
+		global $conf;
 
-        $ret=array();
+		$ret=array();
 
-        $arrayaddress=explode(',',$address);
+		$arrayaddress=explode(',',$address);
 
-        // Boucle sur chaque composant de l'adresse
-        foreach($arrayaddress as $val)
-        {
-            if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
-            {
-                $name  = trim($regs[1]);
-                $email = trim($regs[2]);
-            }
-            else
-            {
-                $name  = null;
-                $email = trim($val);
-            }
+		// Boucle sur chaque composant de l'adresse
+		foreach($arrayaddress as $val)
+		{
+			if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
+			{
+				$name  = trim($regs[1]);
+				$email = trim($regs[2]);
+			}
+			else
+			{
+				$name  = null;
+				$email = trim($val);
+			}
 
-            $ret[$email]=empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)?$name:null;
-        }
+			$ret[$email]=empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)?$name:null;
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 }
 

From d0e27f67e719395e7cb1f8f1b72ed7e308fc7831 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Tue, 18 Apr 2017 05:44:08 +0200
Subject: [PATCH 0623/1163] Add plugins Stripe

---
 COPYRIGHT                                     |    1 +
 htdocs/core/modules/modStripe.class.php       |    5 +-
 htdocs/includes/stripe/.coveralls.yml         |    4 +
 htdocs/includes/stripe/.gitignore             |   14 +
 htdocs/includes/stripe/.travis.yml            |   18 +
 htdocs/includes/stripe/CHANGELOG.md           |  430 ++
 htdocs/includes/stripe/LICENSE                |   21 +
 htdocs/includes/stripe/README.md              |  153 +
 htdocs/includes/stripe/VERSION                |    1 +
 htdocs/includes/stripe/build.php              |   36 +
 htdocs/includes/stripe/composer.json          |   36 +
 .../includes/stripe/data/ca-certificates.crt  | 3919 +++++++++++++++++
 htdocs/includes/stripe/data/test.png          |  Bin 0 -> 95 bytes
 htdocs/includes/stripe/init.php               |   73 +
 htdocs/includes/stripe/lib/Account.php        |  132 +
 htdocs/includes/stripe/lib/AlipayAccount.php  |   13 +
 htdocs/includes/stripe/lib/ApiRequestor.php   |  292 ++
 htdocs/includes/stripe/lib/ApiResource.php    |  203 +
 htdocs/includes/stripe/lib/ApiResponse.php    |   32 +
 htdocs/includes/stripe/lib/ApplePayDomain.php |   65 +
 htdocs/includes/stripe/lib/ApplicationFee.php |   69 +
 .../stripe/lib/ApplicationFeeRefund.php       |   44 +
 htdocs/includes/stripe/lib/AttachedObject.php |   31 +
 htdocs/includes/stripe/lib/Balance.php        |   26 +
 .../stripe/lib/BalanceTransaction.php         |   57 +
 htdocs/includes/stripe/lib/BankAccount.php    |   25 +
 .../includes/stripe/lib/BitcoinReceiver.php   |   85 +
 .../stripe/lib/BitcoinTransaction.php         |   13 +
 htdocs/includes/stripe/lib/Card.php           |   13 +
 htdocs/includes/stripe/lib/Charge.php         |  184 +
 htdocs/includes/stripe/lib/Collection.php     |   87 +
 htdocs/includes/stripe/lib/CountrySpec.php    |   44 +
 htdocs/includes/stripe/lib/Coupon.php         |   77 +
 htdocs/includes/stripe/lib/Customer.php       |  190 +
 htdocs/includes/stripe/lib/Dispute.php        |   83 +
 htdocs/includes/stripe/lib/Error/Api.php      |    7 +
 .../stripe/lib/Error/ApiConnection.php        |    7 +
 .../stripe/lib/Error/Authentication.php       |    7 +
 htdocs/includes/stripe/lib/Error/Base.php     |   60 +
 htdocs/includes/stripe/lib/Error/Card.php     |   41 +
 .../stripe/lib/Error/InvalidRequest.php       |   23 +
 .../includes/stripe/lib/Error/Permission.php  |    7 +
 .../includes/stripe/lib/Error/RateLimit.php   |    7 +
 htdocs/includes/stripe/lib/Event.php          |   43 +
 .../includes/stripe/lib/ExternalAccount.php   |   89 +
 htdocs/includes/stripe/lib/FileUpload.php     |   61 +
 .../stripe/lib/HttpClient/ClientInterface.php |   18 +
 .../stripe/lib/HttpClient/CurlClient.php      |  282 ++
 htdocs/includes/stripe/lib/Invoice.php        |   92 +
 htdocs/includes/stripe/lib/InvoiceItem.php    |   77 +
 .../includes/stripe/lib/JsonSerializable.php  |   18 +
 htdocs/includes/stripe/lib/Order.php          |   87 +
 htdocs/includes/stripe/lib/OrderReturn.php    |   33 +
 htdocs/includes/stripe/lib/Payout.php         |   97 +
 htdocs/includes/stripe/lib/Plan.php           |   90 +
 htdocs/includes/stripe/lib/Product.php        |   77 +
 htdocs/includes/stripe/lib/Recipient.php      |   92 +
 .../includes/stripe/lib/RecipientTransfer.php |   38 +
 htdocs/includes/stripe/lib/Refund.php         |   79 +
 htdocs/includes/stripe/lib/SKU.php            |   77 +
 .../stripe/lib/SingletonApiResource.php       |   36 +
 htdocs/includes/stripe/lib/Source.php         |  115 +
 htdocs/includes/stripe/lib/Stripe.php         |  126 +
 htdocs/includes/stripe/lib/StripeObject.php   |  294 ++
 htdocs/includes/stripe/lib/Subscription.php   |   97 +
 .../includes/stripe/lib/SubscriptionItem.php  |   88 +
 htdocs/includes/stripe/lib/ThreeDSecure.php   |   36 +
 htdocs/includes/stripe/lib/Token.php          |   43 +
 htdocs/includes/stripe/lib/Transfer.php       |  104 +
 .../includes/stripe/lib/TransferReversal.php  |   53 +
 .../stripe/lib/Util/AutoPagingIterator.php    |   61 +
 .../stripe/lib/Util/RequestOptions.php        |   79 +
 htdocs/includes/stripe/lib/Util/Set.php       |   44 +
 htdocs/includes/stripe/lib/Util/Util.php      |  146 +
 .../includes/stripe/phpunit.no_autoload.xml   |   15 +
 htdocs/includes/stripe/phpunit.xml            |   15 +
 htdocs/includes/stripe/tests/AccountTest.php  |  300 ++
 .../stripe/tests/ApiRequestorTest.php         |   68 +
 .../stripe/tests/ApplePayDomainTest.php       |   72 +
 .../stripe/tests/ApplicationFeeRefundTest.php |   18 +
 .../stripe/tests/ApplicationFeeTest.php       |   22 +
 .../stripe/tests/AuthenticationErrorTest.php  |   16 +
 htdocs/includes/stripe/tests/BalanceTest.php  |   15 +
 .../stripe/tests/BalanceTransactionTest.php   |   13 +
 .../includes/stripe/tests/BankAccountTest.php |   32 +
 .../stripe/tests/BitcoinReceiverTest.php      |  120 +
 .../includes/stripe/tests/CardErrorTest.php   |   41 +
 htdocs/includes/stripe/tests/ChargeTest.php   |  204 +
 .../includes/stripe/tests/CollectionTest.php  |  105 +
 .../includes/stripe/tests/CountrySpecTest.php |   31 +
 htdocs/includes/stripe/tests/CouponTest.php   |   29 +
 .../includes/stripe/tests/CurlClientTest.php  |  100 +
 htdocs/includes/stripe/tests/CustomerTest.php |  278 ++
 htdocs/includes/stripe/tests/DiscountTest.php |   31 +
 htdocs/includes/stripe/tests/DisputeTest.php  |   96 +
 htdocs/includes/stripe/tests/ErrorTest.php    |   61 +
 .../stripe/tests/ExternalAccountTest.php      |   30 +
 .../includes/stripe/tests/FileUploadTest.php  |   44 +
 .../stripe/tests/InvalidRequestErrorTest.php  |   26 +
 htdocs/includes/stripe/tests/InvoiceTest.php  |   56 +
 htdocs/includes/stripe/tests/PayoutTest.php   |   94 +
 .../stripe/tests/PermissionsErrorTest.php     |   22 +
 htdocs/includes/stripe/tests/PlanTest.php     |   51 +
 htdocs/includes/stripe/tests/ProductTest.php  |  158 +
 .../stripe/tests/RateLimitErrorTest.php       |   22 +
 .../includes/stripe/tests/RecipientTest.php   |  112 +
 htdocs/includes/stripe/tests/RefundTest.php   |  131 +
 .../stripe/tests/RequestOptionsTest.php       |   69 +
 htdocs/includes/stripe/tests/SourceTest.php   |  218 +
 .../stripe/tests/StripeObjectTest.php         |  108 +
 .../stripe/tests/SubscriptionItemTest.php     |   38 +
 .../stripe/tests/SubscriptionTest.php         |  132 +
 htdocs/includes/stripe/tests/TestCase.php     |  271 ++
 .../stripe/tests/ThreeDSecureTest.php         |   46 +
 htdocs/includes/stripe/tests/TokenTest.php    |   13 +
 .../stripe/tests/TransferReversalTest.php     |   19 +
 htdocs/includes/stripe/tests/TransferTest.php |   46 +
 htdocs/includes/stripe/tests/UtilTest.php     |   45 +
 .../stripe/tests/bootstrap.no_autoload.php    |    4 +
 htdocs/includes/stripe/tests/bootstrap.php    |    3 +
 htdocs/stripe/admin/stripe.php                |    1 +
 htdocs/stripe/checkout.php                    |  241 +
 htdocs/stripe/config.php                      |   36 +
 htdocs/stripe/paymnt_link.php                 |   72 +
 124 files changed, 13094 insertions(+), 3 deletions(-)
 create mode 100644 htdocs/includes/stripe/.coveralls.yml
 create mode 100644 htdocs/includes/stripe/.gitignore
 create mode 100644 htdocs/includes/stripe/.travis.yml
 create mode 100644 htdocs/includes/stripe/CHANGELOG.md
 create mode 100644 htdocs/includes/stripe/LICENSE
 create mode 100644 htdocs/includes/stripe/README.md
 create mode 100644 htdocs/includes/stripe/VERSION
 create mode 100644 htdocs/includes/stripe/build.php
 create mode 100644 htdocs/includes/stripe/composer.json
 create mode 100644 htdocs/includes/stripe/data/ca-certificates.crt
 create mode 100644 htdocs/includes/stripe/data/test.png
 create mode 100644 htdocs/includes/stripe/init.php
 create mode 100644 htdocs/includes/stripe/lib/Account.php
 create mode 100644 htdocs/includes/stripe/lib/AlipayAccount.php
 create mode 100644 htdocs/includes/stripe/lib/ApiRequestor.php
 create mode 100644 htdocs/includes/stripe/lib/ApiResource.php
 create mode 100644 htdocs/includes/stripe/lib/ApiResponse.php
 create mode 100644 htdocs/includes/stripe/lib/ApplePayDomain.php
 create mode 100644 htdocs/includes/stripe/lib/ApplicationFee.php
 create mode 100644 htdocs/includes/stripe/lib/ApplicationFeeRefund.php
 create mode 100644 htdocs/includes/stripe/lib/AttachedObject.php
 create mode 100644 htdocs/includes/stripe/lib/Balance.php
 create mode 100644 htdocs/includes/stripe/lib/BalanceTransaction.php
 create mode 100644 htdocs/includes/stripe/lib/BankAccount.php
 create mode 100644 htdocs/includes/stripe/lib/BitcoinReceiver.php
 create mode 100644 htdocs/includes/stripe/lib/BitcoinTransaction.php
 create mode 100644 htdocs/includes/stripe/lib/Card.php
 create mode 100644 htdocs/includes/stripe/lib/Charge.php
 create mode 100644 htdocs/includes/stripe/lib/Collection.php
 create mode 100644 htdocs/includes/stripe/lib/CountrySpec.php
 create mode 100644 htdocs/includes/stripe/lib/Coupon.php
 create mode 100644 htdocs/includes/stripe/lib/Customer.php
 create mode 100644 htdocs/includes/stripe/lib/Dispute.php
 create mode 100644 htdocs/includes/stripe/lib/Error/Api.php
 create mode 100644 htdocs/includes/stripe/lib/Error/ApiConnection.php
 create mode 100644 htdocs/includes/stripe/lib/Error/Authentication.php
 create mode 100644 htdocs/includes/stripe/lib/Error/Base.php
 create mode 100644 htdocs/includes/stripe/lib/Error/Card.php
 create mode 100644 htdocs/includes/stripe/lib/Error/InvalidRequest.php
 create mode 100644 htdocs/includes/stripe/lib/Error/Permission.php
 create mode 100644 htdocs/includes/stripe/lib/Error/RateLimit.php
 create mode 100644 htdocs/includes/stripe/lib/Event.php
 create mode 100644 htdocs/includes/stripe/lib/ExternalAccount.php
 create mode 100644 htdocs/includes/stripe/lib/FileUpload.php
 create mode 100644 htdocs/includes/stripe/lib/HttpClient/ClientInterface.php
 create mode 100644 htdocs/includes/stripe/lib/HttpClient/CurlClient.php
 create mode 100644 htdocs/includes/stripe/lib/Invoice.php
 create mode 100644 htdocs/includes/stripe/lib/InvoiceItem.php
 create mode 100644 htdocs/includes/stripe/lib/JsonSerializable.php
 create mode 100644 htdocs/includes/stripe/lib/Order.php
 create mode 100644 htdocs/includes/stripe/lib/OrderReturn.php
 create mode 100644 htdocs/includes/stripe/lib/Payout.php
 create mode 100644 htdocs/includes/stripe/lib/Plan.php
 create mode 100644 htdocs/includes/stripe/lib/Product.php
 create mode 100644 htdocs/includes/stripe/lib/Recipient.php
 create mode 100644 htdocs/includes/stripe/lib/RecipientTransfer.php
 create mode 100644 htdocs/includes/stripe/lib/Refund.php
 create mode 100644 htdocs/includes/stripe/lib/SKU.php
 create mode 100644 htdocs/includes/stripe/lib/SingletonApiResource.php
 create mode 100644 htdocs/includes/stripe/lib/Source.php
 create mode 100644 htdocs/includes/stripe/lib/Stripe.php
 create mode 100644 htdocs/includes/stripe/lib/StripeObject.php
 create mode 100644 htdocs/includes/stripe/lib/Subscription.php
 create mode 100644 htdocs/includes/stripe/lib/SubscriptionItem.php
 create mode 100644 htdocs/includes/stripe/lib/ThreeDSecure.php
 create mode 100644 htdocs/includes/stripe/lib/Token.php
 create mode 100644 htdocs/includes/stripe/lib/Transfer.php
 create mode 100644 htdocs/includes/stripe/lib/TransferReversal.php
 create mode 100644 htdocs/includes/stripe/lib/Util/AutoPagingIterator.php
 create mode 100644 htdocs/includes/stripe/lib/Util/RequestOptions.php
 create mode 100644 htdocs/includes/stripe/lib/Util/Set.php
 create mode 100644 htdocs/includes/stripe/lib/Util/Util.php
 create mode 100644 htdocs/includes/stripe/phpunit.no_autoload.xml
 create mode 100644 htdocs/includes/stripe/phpunit.xml
 create mode 100644 htdocs/includes/stripe/tests/AccountTest.php
 create mode 100644 htdocs/includes/stripe/tests/ApiRequestorTest.php
 create mode 100644 htdocs/includes/stripe/tests/ApplePayDomainTest.php
 create mode 100644 htdocs/includes/stripe/tests/ApplicationFeeRefundTest.php
 create mode 100644 htdocs/includes/stripe/tests/ApplicationFeeTest.php
 create mode 100644 htdocs/includes/stripe/tests/AuthenticationErrorTest.php
 create mode 100644 htdocs/includes/stripe/tests/BalanceTest.php
 create mode 100644 htdocs/includes/stripe/tests/BalanceTransactionTest.php
 create mode 100644 htdocs/includes/stripe/tests/BankAccountTest.php
 create mode 100644 htdocs/includes/stripe/tests/BitcoinReceiverTest.php
 create mode 100644 htdocs/includes/stripe/tests/CardErrorTest.php
 create mode 100644 htdocs/includes/stripe/tests/ChargeTest.php
 create mode 100644 htdocs/includes/stripe/tests/CollectionTest.php
 create mode 100644 htdocs/includes/stripe/tests/CountrySpecTest.php
 create mode 100644 htdocs/includes/stripe/tests/CouponTest.php
 create mode 100644 htdocs/includes/stripe/tests/CurlClientTest.php
 create mode 100644 htdocs/includes/stripe/tests/CustomerTest.php
 create mode 100644 htdocs/includes/stripe/tests/DiscountTest.php
 create mode 100644 htdocs/includes/stripe/tests/DisputeTest.php
 create mode 100644 htdocs/includes/stripe/tests/ErrorTest.php
 create mode 100644 htdocs/includes/stripe/tests/ExternalAccountTest.php
 create mode 100644 htdocs/includes/stripe/tests/FileUploadTest.php
 create mode 100644 htdocs/includes/stripe/tests/InvalidRequestErrorTest.php
 create mode 100644 htdocs/includes/stripe/tests/InvoiceTest.php
 create mode 100644 htdocs/includes/stripe/tests/PayoutTest.php
 create mode 100644 htdocs/includes/stripe/tests/PermissionsErrorTest.php
 create mode 100644 htdocs/includes/stripe/tests/PlanTest.php
 create mode 100644 htdocs/includes/stripe/tests/ProductTest.php
 create mode 100644 htdocs/includes/stripe/tests/RateLimitErrorTest.php
 create mode 100644 htdocs/includes/stripe/tests/RecipientTest.php
 create mode 100644 htdocs/includes/stripe/tests/RefundTest.php
 create mode 100644 htdocs/includes/stripe/tests/RequestOptionsTest.php
 create mode 100644 htdocs/includes/stripe/tests/SourceTest.php
 create mode 100644 htdocs/includes/stripe/tests/StripeObjectTest.php
 create mode 100644 htdocs/includes/stripe/tests/SubscriptionItemTest.php
 create mode 100644 htdocs/includes/stripe/tests/SubscriptionTest.php
 create mode 100644 htdocs/includes/stripe/tests/TestCase.php
 create mode 100644 htdocs/includes/stripe/tests/ThreeDSecureTest.php
 create mode 100644 htdocs/includes/stripe/tests/TokenTest.php
 create mode 100644 htdocs/includes/stripe/tests/TransferReversalTest.php
 create mode 100644 htdocs/includes/stripe/tests/TransferTest.php
 create mode 100644 htdocs/includes/stripe/tests/UtilTest.php
 create mode 100644 htdocs/includes/stripe/tests/bootstrap.no_autoload.php
 create mode 100644 htdocs/includes/stripe/tests/bootstrap.php
 create mode 100644 htdocs/stripe/checkout.php
 create mode 100644 htdocs/stripe/config.php
 create mode 100644 htdocs/stripe/paymnt_link.php

diff --git a/COPYRIGHT b/COPYRIGHT
index 6f8a595897d..61a0f2de6bd 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -31,6 +31,7 @@ Restler                3.0.0RC6      LGPL-3+                     Yes
 TCPDF                  6.2.12        LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
+Stripe                 4.7.0         MIT licence                 Yes             Library for Stripe module
 
 JS libraries:
 jQuery                 1.11.3        MIT License                 Yes             JS library
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 11dd6ee68e4..4b498629017 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -1,7 +1,6 @@
 <?php
-/* Copyright (C) 2003		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2016		Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/includes/stripe/.coveralls.yml b/htdocs/includes/stripe/.coveralls.yml
new file mode 100644
index 00000000000..a343c9a7466
--- /dev/null
+++ b/htdocs/includes/stripe/.coveralls.yml
@@ -0,0 +1,4 @@
+service_name: travis-ci
+src_dir: .
+coverage_clover: clover.xml
+json_path: coveralls-upload.json
diff --git a/htdocs/includes/stripe/.gitignore b/htdocs/includes/stripe/.gitignore
new file mode 100644
index 00000000000..93251c95077
--- /dev/null
+++ b/htdocs/includes/stripe/.gitignore
@@ -0,0 +1,14 @@
+# Mac OS X dumps these all over the place.
+.DS_Store
+
+# Ignore the SimpleTest library if it is installed to /test/.
+/test/simpletest/
+
+# Ignore the /vendor/ directory for people using composer
+/vendor/
+
+# If the vendor directory isn't being commited the composer.lock file should also be ignored
+composer.lock
+
+# Ignore PHPUnit coverage file
+clover.xml
diff --git a/htdocs/includes/stripe/.travis.yml b/htdocs/includes/stripe/.travis.yml
new file mode 100644
index 00000000000..934b517bfea
--- /dev/null
+++ b/htdocs/includes/stripe/.travis.yml
@@ -0,0 +1,18 @@
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - 7.1
+  - hhvm
+
+env:
+  - AUTOLOAD=1
+  - AUTOLOAD=0
+
+script: ./build.php ${AUTOLOAD}
+after_script: ./vendor/bin/coveralls -v
+sudo: false
diff --git a/htdocs/includes/stripe/CHANGELOG.md b/htdocs/includes/stripe/CHANGELOG.md
new file mode 100644
index 00000000000..3650c21d1c2
--- /dev/null
+++ b/htdocs/includes/stripe/CHANGELOG.md
@@ -0,0 +1,430 @@
+### 4.7.0 2017-04-10
+
+* Add support for payouts and recipient transfers
+
+### 4.6.0 2017-04-06
+
+* Please see 4.7.0 instead (no-op release)	
+
+### 4.5.1 2017-03-22
+
+* Remove hard dependency on cURL
+
+### 4.5.0 2017-03-20
+
+* Support for detaching sources from customers
+
+### 4.4.2 2017-02-27
+
+* Correct handling of `owner` parameter when updating sources
+
+### 4.4.1 2017-02-24
+
+* Correct the error check on a bad JSON decoding
+
+### 4.4.0 2017-01-18
+
+* Add support for updating sources
+
+### 4.3.0 2016-11-30
+
+* Add support for verifying sources
+
+### 4.2.0 2016-11-21
+
+* Add retrieve method for 3-D Secure resources
+
+### 4.1.1 2016-10-21
+
+* Add docblock with model properties for `Plan`
+
+### 4.1.0 2016-10-18
+
+* Support for 403 status codes (permission denied)
+
+### 4.0.1 2016-10-17
+
+* Fix transfer reversal materialization
+* Fixes for some property definitions in docblocks
+
+### 4.0.0 2016-09-28
+
+* Support for subscription items
+* Drop attempt to force TLS 1.2: please note that this could be breaking if you're using old OS distributions or packages and upgraded recently (so please make sure to test your integration!)
+
+### 3.23.0 2016-09-15
+
+* Add support for Apple Pay domains
+
+### 3.22.0 2016-09-13
+
+* Add `Stripe::setAppInfo` to allow plugins to register user agent information
+
+### 3.21.0 2016-08-25
+
+* Add `Source` model for generic payment sources
+
+### 3.20.0 2016-08-08
+
+* Add `getDeclineCode` to card errors
+
+### 3.19.0 2016-07-29
+
+* Opt requests directly into TLS 1.2 where OpenSSL >= 1.0.1 (see #277 for context)
+
+### 3.18.0 2016-07-28
+
+* Add new `STATUS_` constants for subscriptions
+
+### 3.17.1 2016-07-28
+
+* Fix auto-paging iterator so that it plays nicely with `iterator_to_array`
+
+### 3.17.0 2016-07-14
+
+* Add field annotations to model classes for better editor hinting
+
+### 3.16.0 2016-07-12
+
+* Add `ThreeDSecure` model for 3-D secure payments
+
+### 3.15.0 2016-06-29
+
+* Add static `update` method to all resources that can be changed.
+
+### 3.14.3 2016-06-20
+
+* Make sure that cURL never sends `Expects: 100-continue`, even on large request bodies
+
+### 3.14.2 2016-06-03
+
+* Add `inventory` under `SKU` to list of keys that have nested data and can be updated
+
+### 3.14.1 2016-05-27
+
+* Fix some inconsistencies in PHPDoc
+
+### 3.14.0 2016-05-25
+
+* Add support for returning Relay orders
+
+### 3.13.0 2016-05-04
+
+* Add `list`, `create`, `update`, `retrieve`, and `delete` methods to the Subscription class
+
+### 3.12.1 2016-04-07
+
+* Additional check on value arrays for some extra safety
+
+### 3.12.0 2016-03-31
+
+* Fix bug `refreshFrom` on `StripeObject` would not take an `$opts` array
+* Fix bug where `$opts` not passed to parent `save` method in `Account`
+* Fix bug where non-existent variable was referenced in `reverse` in `Transfer`
+* Update CA cert bundle for compatibility with OpenSSL versions below 1.0.1
+
+### 3.11.0 2016-03-22
+
+* Allow `CurlClient` to be initialized with default `CURLOPT_*` options
+
+### 3.10.1 2016-03-22
+
+* Fix bug where request params and options were ignored in `ApplicationFee`'s `refund.`
+
+### 3.10.0 2016-03-15
+
+* Add `reject` on `Account` to support the new API feature
+
+### 3.9.2 2016-03-04
+
+* Fix error when an object's metadata is set more than once
+
+### 3.9.1 2016-02-24
+
+* Fix encoding behavior of nested arrays for requests (see #227)
+
+### 3.9.0 2016-02-09
+
+* Add automatic pagination mechanism with `autoPagingIterator()`
+* Allow global account ID to be set with `Stripe::setAccountId()`
+
+### 3.8.0 2016-02-08
+
+* Add `CountrySpec` model for looking up country payment information
+
+### 3.7.1 2016-02-01
+
+* Update bundled CA certs
+
+### 3.7.0 2016-01-27
+
+* Support deleting Relay products and SKUs
+
+### 3.6.0 2016-01-05
+
+* Allow configuration of HTTP client timeouts
+
+### 3.5.0 2015-12-01
+
+* Add a verification routine for external accounts
+
+### 3.4.0 2015-09-14
+
+* Products, SKUs, and Orders -- https://stripe.com/relay
+
+### 3.3.0 2015-09-11
+
+* Add support for 429 Rate Limit response
+
+### 3.2.0 2015-08-17
+
+* Add refund listing and retrieval without an associated charge
+
+### 3.1.0 2015-08-03
+
+* Add dispute listing and retrieval
+* Add support for manage account deletion
+
+### 3.0.0 2015-07-28
+
+* Rename `\Stripe\Object` to `\Stripe\StripeObject` (PHP 7 compatibility)
+* Rename `getCode` and `getParam` in exceptions to `getStripeCode` and `getStripeParam`
+* Add support for calling `json_encode` on Stripe objects in PHP 5.4+
+* Start supporting/testing PHP 7
+
+### 2.3.0 2015-07-06
+
+* Add request ID to all Stripe exceptions
+
+### 2.2.0 2015-06-01
+
+* Add support for Alipay accounts as sources
+* Add support for bank accounts as sources (private beta)
+* Add support for bank accounts and cards as external_accounts on Account objects
+
+### 2.1.4 2015-05-13
+
+* Fix CA certificate file path (thanks @lphilps & @matthewarkin)
+
+### 2.1.3 2015-05-12
+
+* Fix to account updating to permit `tos_acceptance` and `personal_address` to be set properly
+* Fix to Transfer reversal creation (thanks @neatness!)
+* Network requests are now done through a swappable class for easier mocking
+
+### 2.1.2 2015-04-10
+
+* Remove SSL cert revokation checking (all pre-Heartbleed certs have expired)
+* Bug fixes to account updating
+
+### 2.1.1 2015-02-27
+* Support transfer reversals
+
+### 2.1.0 2015-02-19
+
+* Support new API version (2015-02-18)
+* Added Bitcoin Receiever update and delete actions
+* Edited tests to prefer "source" over "card" as per new API version
+
+### 2.0.1 2015-02-16
+
+* Fix to fetching endpoints that use a non-default baseUrl (`FileUpload`)
+
+### 2.0.0 2015-02-14
+
+* Bumped minimum version to 5.3.3
+* Switched to Stripe namespace instead of Stripe_ class name prefiexes (thanks @chadicus!)
+* Switched tests to PHPUnit (thanks @chadicus!)
+* Switched style guide to PSR2 (thanks @chadicus!)
+* Added $opts hash to the end of most methods: this permits passing 'idempotency_key', 'stripe_account', or 'stripe_version'. The last 2 will persist across multiple object loads.
+* Added support for retrieving Account by ID
+
+### 1.18.0 2015-01-21
+
+* Support making bitcoin charges through BitcoinReceiver source object
+
+### 1.17.5 2014-12-23
+
+* Adding support for creating file uploads.
+
+### 1.17.4 2014-12-15
+
+* Saving objects fetched with a custom key now works (thanks @JustinHook & @jpasilan)
+* Added methods for reporting charges as safe or fraudulent and for specifying the reason for refunds
+
+### 1.17.3 2014-11-06
+
+* Better handling of HHVM support for SSL certificate blacklist checking.
+
+### 1.17.2 2014-09-23
+
+* Coupons now are backed by a `Stripe_Coupon` instead of `Stripe_Object`, and support updating metadata
+* Running operations (`create`, `retrieve`, `all`) on upcoming invoice items now works
+
+### 1.17.1 2014-07-31
+
+* Requests now send Content-Type header
+
+### 1.17.0 2014-07-29
+
+* Application Fee refunds now a list instead of array
+* HHVM now works
+* Small bug fixes (thanks @bencromwell & @fastest963)
+* __toString now returns the name of the object in addition to its JSON representation
+
+### 1.16.0 2014-06-17
+
+* Add metadata for refunds and disputes
+
+### 1.15.0 2014-05-28
+
+* Support canceling transfers
+
+### 1.14.1 2014-05-21
+
+* Support cards for recipients.
+
+### 1.13.1 2014-05-15
+
+* Fix bug in account resource where `id` wasn't in the result
+
+### 1.13.0 2014-04-10
+
+* Add support for certificate blacklisting
+* Update ca bundle
+* Drop support for HHVM (Temporarily)
+
+### 1.12.0 2014-04-01
+
+* Add Stripe_RateLimitError for catching rate limit errors.
+* Update to Zend coding style (thanks,  @jpiasetz)
+
+### 1.11.0 2014-01-29
+
+* Add support for multiple subscriptions per customer
+
+### 1.10.1 2013-12-02
+
+* Add new ApplicationFee
+
+### 1.9.1 2013-11-08
+
+* Fix a bug where a null nestable object causes warnings to fire.
+
+### 1.9.0 2013-10-16
+
+* Add support for metadata API.
+
+### 1.8.4 2013-09-18
+
+* Add support for closing disputes.
+
+### 1.8.3 2013-08-13
+
+* Add new Balance and BalanceTransaction
+
+### 1.8.2 2013-08-12
+
+* Add support for unsetting attributes by updating to NULL.
+  Setting properties to a blank string is now an error.
+
+### 1.8.1 2013-07-12
+
+* Add support for multiple cards API (Stripe API version 2013-07-12: https://stripe.com/docs/upgrades#2013-07-05)
+
+### 1.8.0 2013-04-11
+
+* Allow Transfers to be creatable
+* Add new Recipient resource
+
+### 1.7.15 2013-02-21
+
+* Add 'id' to the list of permanent object attributes
+
+### 1.7.14 2013-02-20
+
+* Don't re-encode strings that are already encoded in UTF-8. If you
+  were previously using plan or coupon objects with UTF-8 IDs, they
+  may have been treated as ISO-8859-1 (Latin-1) and encoded to UTF-8 a
+  2nd time. You may now need to pass the IDs to utf8_encode before
+  passing them to Stripe_Plan::retrieve or Stripe_Coupon::retrieve.
+* Ensure that all input is encoded in UTF-8 before submitting it to
+  Stripe's servers. (github issue #27)
+
+### 1.7.13 2013-02-01
+
+* Add support for passing options when retrieving Stripe objects
+  e.g., Stripe_Charge::retrieve(array("id"=>"foo", "expand" => array("customer")))
+  Stripe_Charge::retrieve("foo") will continue to work
+
+### 1.7.12 2013-01-15
+
+* Add support for setting a Stripe API version override
+
+### 1.7.11 2012-12-30
+
+* Version bump to cleanup constants and such (github issue #26)
+
+### 1.7.10 2012-11-08
+
+* Add support for updating charge disputes.
+* Fix bug preventing retrieval of null attributes
+
+### 1.7.9 2012-11-08
+
+* Fix usage under autoloaders such as the one generated by composer
+  (github issue #22)
+
+### 1.7.8 2012-10-30
+* Add support for creating invoices.
+* Add support for new invoice lines return format
+* Add support for new list objects
+
+### 1.7.7 2012-09-14
+
+* Get all of the various version numbers in the repo in sync (no other
+  changes)
+
+### 1.7.6 2012-08-31
+
+* Add update and pay methods to Invoice resource
+
+### 1.7.5 2012-08-23
+
+* Change internal function names so that Stripe_SingletonApiRequest is
+  E_STRICT-clean (github issue #16)
+
+### 1.7.4 2012-08-21
+
+* Bugfix so that Stripe objects (e.g. Customer, Charge objects) used
+  in API calls are transparently converted to their object IDs
+
+### 1.7.3 2012-08-15
+
+* Add new Account resource
+
+### 1.7.2 2012-06-26
+
+* Make clearer that you should be including lib/Stripe.php, not
+  test/Stripe.php (github issue #14)
+
+### 1.7.1 2012-05-24
+
+* Add missing argument to Stripe_InvalidRequestError constructor in
+  Stripe_ApiResource::instanceUrl. Fixes a warning when
+  Stripe_ApiResource::instanceUrl is called on a resource with no ID
+  (github issue #12)
+
+### 1.7.0 2012-05-17
+
+* Support Composer and Packagist (github issue #9)
+
+* Add new deleteDiscount method to Stripe_Customer
+
+* Add new Transfer resource
+
+* Switch from using HTTP Basic auth to Bearer auth. (Note: Stripe will
+  support Basic auth for the indefinite future, but recommends Bearer
+  auth when possible going forward)
+
+* Numerous test suite improvements
diff --git a/htdocs/includes/stripe/LICENSE b/htdocs/includes/stripe/LICENSE
new file mode 100644
index 00000000000..a21757e4fcd
--- /dev/null
+++ b/htdocs/includes/stripe/LICENSE
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2010-2015 Stripe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/htdocs/includes/stripe/README.md b/htdocs/includes/stripe/README.md
new file mode 100644
index 00000000000..16642900a1f
--- /dev/null
+++ b/htdocs/includes/stripe/README.md
@@ -0,0 +1,153 @@
+# Stripe PHP bindings
+
+[![Build Status](https://travis-ci.org/stripe/stripe-php.svg?branch=master)](https://travis-ci.org/stripe/stripe-php)
+[![Latest Stable Version](https://poser.pugx.org/stripe/stripe-php/v/stable.svg)](https://packagist.org/packages/stripe/stripe-php)
+[![Total Downloads](https://poser.pugx.org/stripe/stripe-php/downloads.svg)](https://packagist.org/packages/stripe/stripe-php)
+[![License](https://poser.pugx.org/stripe/stripe-php/license.svg)](https://packagist.org/packages/stripe/stripe-php)
+[![Code Coverage](https://coveralls.io/repos/stripe/stripe-php/badge.svg?branch=master)](https://coveralls.io/r/stripe/stripe-php?branch=master)
+
+You can sign up for a Stripe account at https://stripe.com.
+
+## Requirements
+
+PHP 5.3.3 and later.
+
+## Composer
+
+You can install the bindings via [Composer](http://getcomposer.org/). Run the following command:
+
+```bash
+composer require stripe/stripe-php
+```
+
+To use the bindings, use Composer's [autoload](https://getcomposer.org/doc/00-intro.md#autoloading):
+
+```php
+require_once('vendor/autoload.php');
+```
+
+## Manual Installation
+
+If you do not wish to use Composer, you can download the [latest release](https://github.com/stripe/stripe-php/releases). Then, to use the bindings, include the `init.php` file.
+
+```php
+require_once('/path/to/stripe-php/init.php');
+```
+
+## Dependencies
+
+The bindings require the following extension in order to work properly:
+
+- [`curl`](https://secure.php.net/manual/en/book.curl.php), although you can use your own non-cURL client if you prefer
+- [`json`](https://secure.php.net/manual/en/book.json.php)
+- [`mbstring`](https://secure.php.net/manual/en/book.mbstring.php) (Multibyte String)
+
+If you use Composer, these dependencies should be handled automatically. If you install manually, you'll want to make sure that these extensions are available.
+
+## Getting Started
+
+Simple usage looks like:
+
+```php
+\Stripe\Stripe::setApiKey('sk_test_BQokikJOvBiI2HlWgH4olfQ2');
+$charge = \Stripe\Charge::create(array('amount' => 2000, 'currency' => 'usd', 'source' => 'tok_189fqt2eZvKYlo2CTGBeg6Uq' ));
+echo $charge;
+```
+
+## Documentation
+
+Please see https://stripe.com/docs/api for up-to-date documentation.
+
+## Legacy Version Support
+
+If you are using PHP 5.2, you can download v1.18.0 ([zip](https://github.com/stripe/stripe-php/archive/v1.18.0.zip), [tar.gz](https://github.com/stripe/stripe-php/archive/v1.18.0.tar.gz)) from our [releases page](https://github.com/stripe/stripe-php/releases). This version will continue to work with new versions of the Stripe API for all common uses.
+
+This legacy version may be included via `require_once("/path/to/stripe-php/lib/Stripe.php");`, and used like:
+
+```php
+Stripe::setApiKey('d8e8fca2dc0f896fd7cb4cb0031ba249');
+$myCard = array('number' => '4242424242424242', 'exp_month' => 8, 'exp_year' => 2018);
+$charge = Stripe_Charge::create(array('card' => $myCard, 'amount' => 2000, 'currency' => 'usd'));
+echo $charge;
+```
+
+## Custom Request Timeouts
+
+*NOTE:* We do not recommend decreasing the timeout for non-read-only calls (e.g. charge creation), since even if you locally timeout, the request on Stripe's side can still complete. If you are decreasing timeouts on these calls, make sure to use [idempotency tokens](https://stripe.com/docs/api/php#idempotent_requests) to avoid executing the same transaction twice as a result of timeout retry logic.
+
+To modify request timeouts (connect or total, in seconds) you'll need to tell the API client to use a CurlClient other than its default. You'll set the timeouts in that CurlClient.
+
+```php
+// set up your tweaked Curl client
+$curl = new \Stripe\HttpClient\CurlClient();
+$curl->setTimeout(10); // default is \Stripe\HttpClient\CurlClient::DEFAULT_TIMEOUT
+$curl->setConnectTimeout(5); // default is \Stripe\HttpClient\CurlClient::DEFAULT_CONNECT_TIMEOUT
+
+echo $curl->getTimeout(); // 10
+echo $curl->getConnectTimeout(); // 5
+
+// tell Stripe to use the tweaked client
+\Stripe\ApiRequestor::setHttpClient($curl);
+
+// use the Stripe API client as you normally would
+```
+
+## Custom cURL Options (e.g. proxies)
+
+Need to set a proxy for your requests? Pass in the requisite `CURLOPT_*` array to the CurlClient constructor, using the same syntax as `curl_stopt_array()`. This will set the default cURL options for each HTTP request made by the SDK, though many more common options (e.g. timeouts; see above on how to set those) will be overridden by the client even if set here.
+
+```php
+// set up your tweaked Curl client
+$curl = new \Stripe\HttpClient\CurlClient(array(CURLOPT_PROXY => 'proxy.local:80'));
+// tell Stripe to use the tweaked client
+\Stripe\ApiRequestor::setHttpClient($curl);
+```
+
+Alternately, a callable can be passed to the CurlClient constructor that returns the above array based on request inputs. See `testDefaultOptions()` in `tests/CurlClientTest.php` for an example of this behavior. Note that the callable is called at the beginning of every API request, before the request is sent.
+
+### SSL / TLS compatibility issues
+
+Stripe's API now requires that [all connections use TLS 1.2](https://stripe.com/blog/upgrading-tls). Some systems (most notably some older CentOS and RHEL versions) are capable of using TLS 1.2 but will use TLS 1.0 or 1.1 by default. In this case, you'd get an `invalid_request_error` with the following error message: "Stripe no longer supports API requests made with TLS 1.0. Please initiate HTTPS connections with TLS 1.2 or later. You can learn more about this at [https://stripe.com/blog/upgrading-tls](https://stripe.com/blog/upgrading-tls).".
+
+The recommended course of action is to [upgrade your cURL and OpenSSL packages](https://support.stripe.com/questions/how-do-i-upgrade-my-stripe-integration-from-tls-1-0-to-tls-1-2#php) so that TLS 1.2 is used by default, but if that is not possible, you might be able to solve the issue by setting the `CURLOPT_SSLVERSION` option to either `CURL_SSLVERSION_TLSv1` or `CURL_SSLVERSION_TLSv1_2`:
+
+```php
+$curl = new \Stripe\HttpClient\CurlClient(array(CURLOPT_SSLVERSION => CURL_SSLVERSION_TLSv1));
+\Stripe\ApiRequestor::setHttpClient($curl);
+```
+
+## Development
+
+Install dependencies:
+
+``` bash
+composer install
+```
+
+## Tests
+
+Install dependencies as mentioned above (which will resolve [PHPUnit](http://packagist.org/packages/phpunit/phpunit)), then you can run the test suite:
+
+```bash
+./vendor/bin/phpunit
+```
+
+Or to run an individual test file:
+
+```bash
+./vendor/bin/phpunit tests/UtilTest.php
+```
+
+## Attention plugin developers
+
+Are you writing a plugin that integrates Stripe and embeds our library? Then please use the `setAppInfo` function to identify your plugin. For example:
+
+```php
+\Stripe\Stripe::setAppInfo("MyAwesomePlugin", "1.2.34", "https://myawesomeplugin.info");
+```
+
+The method should be called once, before any request is sent to the API. The second and third parameters are optional.
+
+### SSL / TLS configuration option
+
+See the "SSL / TLS compatibility issues" paragraph above for full context. If you want to ensure that your plugin can be used on all systems, you should add a configuration option to let your users choose between different values for `CURLOPT_SSLVERSION`: none (default), `CURL_SSLVERSION_TLSv1` and `CURL_SSLVERSION_TLSv1_2`.
diff --git a/htdocs/includes/stripe/VERSION b/htdocs/includes/stripe/VERSION
new file mode 100644
index 00000000000..f6cdf40983f
--- /dev/null
+++ b/htdocs/includes/stripe/VERSION
@@ -0,0 +1 @@
+4.7.0
diff --git a/htdocs/includes/stripe/build.php b/htdocs/includes/stripe/build.php
new file mode 100644
index 00000000000..4401bb4b81f
--- /dev/null
+++ b/htdocs/includes/stripe/build.php
@@ -0,0 +1,36 @@
+#!/usr/bin/env php
+<?php
+chdir(dirname(__FILE__));
+
+$autoload = (int)$argv[1];
+$returnStatus = null;
+
+if (!$autoload) {
+    // Modify composer to not autoload Stripe
+    $composer = json_decode(file_get_contents('composer.json'), true);
+    unset($composer['autoload']);
+    unset($composer['require-dev']['squizlabs/php_codesniffer']);
+    file_put_contents('composer.json', json_encode($composer));
+}
+
+passthru('composer install', $returnStatus);
+if ($returnStatus !== 0) {
+    exit(1);
+}
+
+if ($autoload) {
+    // Only run CS on 1 of the 2 environments
+    passthru(
+        './vendor/bin/phpcs --standard=PSR2 -n lib tests *.php',
+        $returnStatus
+    );
+    if ($returnStatus !== 0) {
+        exit(1);
+    }
+}
+
+$config = $autoload ? 'phpunit.xml' : 'phpunit.no_autoload.xml';
+passthru("./vendor/bin/phpunit -c $config", $returnStatus);
+if ($returnStatus !== 0) {
+    exit(1);
+}
diff --git a/htdocs/includes/stripe/composer.json b/htdocs/includes/stripe/composer.json
new file mode 100644
index 00000000000..8cfc38a048d
--- /dev/null
+++ b/htdocs/includes/stripe/composer.json
@@ -0,0 +1,36 @@
+{
+  "name": "stripe/stripe-php",
+  "description": "Stripe PHP Library",
+  "keywords": [
+    "stripe",
+    "payment processing",
+    "api"
+  ],
+  "homepage": "https://stripe.com/",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Stripe and contributors",
+      "homepage": "https://github.com/stripe/stripe-php/contributors"
+    }
+  ],
+  "require": {
+    "php": ">=5.3.3",
+    "ext-curl": "*",
+    "ext-json": "*",
+    "ext-mbstring": "*"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "~4.0",
+    "satooshi/php-coveralls": "~0.6.1",
+    "squizlabs/php_codesniffer": "~2.0"
+  },
+  "autoload": {
+    "psr-4": { "Stripe\\" : "lib/" }
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "2.0-dev"
+    }
+  }
+}
diff --git a/htdocs/includes/stripe/data/ca-certificates.crt b/htdocs/includes/stripe/data/ca-certificates.crt
new file mode 100644
index 00000000000..1c4e5b22673
--- /dev/null
+++ b/htdocs/includes/stripe/data/ca-certificates.crt
@@ -0,0 +1,3919 @@
+##
+## Bundle of CA Root Certificates
+##
+## Certificate data from Mozilla as of: Fri Jan 22 20:39:57 2016
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt).  This file can be found in the mozilla source tree:
+## http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
+##
+## It contains the certificates in PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+## Conversion done with mk-ca-bundle.pl version 1.25.
+## SHA1: 0ab47e2f41518f8d223eab517cb799e5b071231e
+##
+
+
+GlobalSign Root CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
+GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
+b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
+BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
+VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
+DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
+THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
+Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
+c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
+gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
+AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
+Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
+j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
+hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
+X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
+ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
+s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
+S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
+TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
+ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
+YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
+BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
+9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
+01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
+9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
+EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
+cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
+EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
+055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
+j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
+xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
+t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+Entrust.net Premium 2048 Secure Server CA
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
+ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
+bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
+BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
+NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
+d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
+MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
+ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
+Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
+hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
+nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
+VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
+KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
+T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
+J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
+nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
+
+Baltimore CyberTrust Root
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
+ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
+ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
+SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
+dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
+uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
+UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
+G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
+XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
+l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
+VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
+cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
+hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
+Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
+RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+AddTrust Low-Value Services Root
+================================
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU
+cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw
+CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO
+ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6
+54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr
+oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1
+Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui
+GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w
+HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD
+AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT
+RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw
+HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt
+ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph
+iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr
+mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj
+ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----
+
+AddTrust External Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
+VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
+NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
+cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
+Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
+Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
+aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
+2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
+7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
+VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
+VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
+j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
+e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
+G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+AddTrust Public Services Root
+=============================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSAwHgYDVQQDExdBZGRU
+cnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAxMDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJ
+BgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5l
+dHdvcmsxIDAeBgNVBAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV6tsfSlbu
+nyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nXGCwwfQ56HmIexkvA/X1i
+d9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnPdzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSG
+Aa2Il+tmzV7R/9x98oTaunet3IAIx6eH1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAw
+HM+A+WD+eeSI8t0A65RF62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0G
+A1UdDgQWBBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29yazEgMB4G
+A1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4
+JNojVhaTdt02KLmuG7jD8WS6IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL
++YPoRNWyQSW/iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
+GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh4SINhwBk/ox9
+Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQmXiLsks3/QppEIW1cxeMiHV9H
+EufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
+-----END CERTIFICATE-----
+
+AddTrust Qualified Certificates Root
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSMwIQYDVQQDExpBZGRU
+cnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcx
+CzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQ
+IE5ldHdvcmsxIzAhBgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwqxBb/4Oxx
+64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G87B4pfYOQnrjfxvM0PC3
+KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i2O+tCBGaKZnhqkRFmhJePp1tUvznoD1o
+L/BLcHwTOK28FSXx1s6rosAx1i+f4P8UWfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GR
+wVY18BTcZTYJbqukB8c10cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HU
+MIHRMB0GA1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6FrpGkwZzELMAkGA1UE
+BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29y
+azEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlmaWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQAD
+ggEBABmrder4i2VhlRO6aQTvhsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxG
+GuoYQ992zPlmhpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3P6CxB9bpT9ze
+RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB
+iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE=
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
+b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
+A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
+MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
+MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
+Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
+dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
+A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
+Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
+j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
+rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
+MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
+hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
+Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
+v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
+W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
+tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+RSA Security 2048 v3
+====================
+-----BEGIN CERTIFICATE-----
+MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK
+ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMjA0OCBWMzAeFw0wMTAy
+MjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb
+BgNVBAsTFFJTQSBTZWN1cml0eSAyMDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAt49VcdKA3XtpeafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7
+Jylg/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGlwSMiuLgb
+WhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnhAMFRD0xS+ARaqn1y07iH
+KrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP
++Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpuAWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/
+MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4E
+FgQUB8NRMKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYcHnmY
+v/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/Zb5gEydxiKRz44Rj
+0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+f00/FGj1EVDVwfSQpQgdMWD/YIwj
+VAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVOrSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395
+nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA
+pKnXwiJPZ9d37CAFYd4=
+-----END CERTIFICATE-----
+
+GeoTrust Global CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
+MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
+BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
+8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
+T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
+vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
+DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
+zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
+d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
+mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
+XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
+Mw==
+-----END CERTIFICATE-----
+
+GeoTrust Global CA 2
+====================
+-----BEGIN CERTIFICATE-----
+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUw
+MDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/
+NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1k
+LUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFA
+Vvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/b
+HdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNH
+K266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7
+srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6Yvh
+ZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqL
+OzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkC
+x1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqF
+H4z1Ir+rzoPz4iIprn2DQKi6bA==
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
+MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
+Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
+JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
+RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
+7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
+8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
+qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
+Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
+Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
+KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
+ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
+XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
+hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
+qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
+oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
+xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
+KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
+DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
+xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
+p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
+P/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA 2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
+MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
+SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
+DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
+j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
+JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
+QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
+WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
+20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
+ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
+SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
+8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
++/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
+BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
+4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
+A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
+Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
+pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
+FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
+gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
+X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+Visa eCommerce Root
+===================
+-----BEGIN CERTIFICATE-----
+MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQG
+EwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2Ug
+QXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2
+WhcNMjIwNjI0MDAxNjEyWjBrMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMm
+VmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
+bW1lcmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h2mCxlCfL
+F9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4ElpF7sDPwsRROEW+1QK8b
+RaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdVZqW1LS7YgFmypw23RuwhY/81q6UCzyr0
+TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI
+/k4+oKsGGelT84ATB+0tvz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzs
+GHxBvfaLdXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG
+MB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUFAAOCAQEAX/FBfXxc
+CLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcRzCSs00Rsca4BIGsDoo8Ytyk6feUW
+YFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pz
+zkWKsKZJ/0x9nXGIxHYdkFsd7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBu
+YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
+398znM/jra6O1I7mT1GvFpLgXPYHDw==
+-----END CERTIFICATE-----
+
+Certum Root CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQK
+ExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2Mzla
+Fw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8u
+by4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6x
+wS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdL
+kKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ
+89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/K
+Uz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7P
+NSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+
+GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvg
+GrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/
+0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoS
+qFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----
+
+Comodo AAA Services root
+========================
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
+MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
+c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
+C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
+i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
+Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
+Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
+Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
+BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
+cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
+LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
+7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
+8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
+12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+Comodo Secure Services root
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAw
+MDAwMFoXDTI4MTIzMTIzNTk1OVowfjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFu
+Y2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAi
+BgNVBAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPMcm3ye5drswfxdySRXyWP
+9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3SHpR7LZQdqnXXs5jLrLxkU0C8j6ysNstc
+rbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rC
+oznl2yY4rYsK7hljxxwk3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3V
+p6ea5EQz6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNVHQ4E
+FgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+gYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL1NlY3VyZUNlcnRpZmlj
+YXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRwOi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlm
+aWNhdGVTZXJ2aWNlcy5jcmwwDQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm
+4J4oqF7Tt/Q05qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
+Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtIgKvcnDe4IRRL
+DXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJaD61JlfutuC23bkpgHl9j6Pw
+pCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDlizeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1H
+RR3B7Hzs/Sk=
+-----END CERTIFICATE-----
+
+Comodo Trusted Services root
+============================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEw
+MDAwMDBaFw0yODEyMzEyMzU5NTlaMH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1h
+bmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUw
+IwYDVQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWWfnJSoBVC21ndZHoa0Lh7
+3TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMtTGo87IvDktJTdyR0nAducPy9C1t2ul/y
+/9c3S0pgePfw+spwtOpZqqPOSC+pw7ILfhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6
+juljatEPmsbS9Is6FARW1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsS
+ivnkBbA7kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0GA1Ud
+DgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21vZG9jYS5jb20vVHJ1c3RlZENlcnRp
+ZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRodHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENl
+cnRpZmljYXRlU2VydmljZXMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8Ntw
+uleGFTQQuS9/HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
+pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxISjBc/lDb+XbDA
+BHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+xqFx7D+gIIxmOom0jtTYsU0l
+R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O
+9y5Xt5hwXsjEeLBi
+-----END CERTIFICATE-----
+
+QuoVadis Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
+ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
+MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
+cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
+EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
+J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
+F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
+YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
+AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
+PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
+ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
+MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
+YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
+ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
+Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
+BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
+FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
+tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
+fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
+LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
+gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
+5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
+5nrQNiOKSnQ2+Q==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3
+==================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+Security Communication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
+8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
+DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
+5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
+DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
+JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
+0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
+mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
+s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
+6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
+FL39vmwLAw==
+-----END CERTIFICATE-----
+
+Sonera Class 2 Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
+U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
+NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
+IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
+/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
+dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
+f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
+tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
+nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
+XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
+0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
+cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
+Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
+EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
+llpwrN9M
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA
+=============================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE
+ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w
+HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh
+bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt
+vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P
+jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca
+C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth
+vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6
+22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV
+HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v
+dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN
+BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR
+EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw
+MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y
+nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
+iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
+-----END CERTIFICATE-----
+
+UTN USERFirst Hardware Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
+IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd
+BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx
+OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0
+eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz
+ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI
+wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd
+tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8
+i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf
+Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw
+gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF
+lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF
+UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF
+BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW
+XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2
+lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn
+iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67
+nfhmqA==
+-----END CERTIFICATE-----
+
+Camerfirma Chambers of Commerce Root
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
+QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
+ZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAx
+NjEzNDNaFw0zNzA5MzAxNjEzNDRaMH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZp
+cm1hIFNBIENJRiBBODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3Jn
+MSIwIAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0BAQEFAAOC
+AQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtbunXF/KGIJPov7coISjlU
+xFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0dBmpAPrMMhe5cG3nCYsS4No41XQEMIwRH
+NaqbYE6gZj3LJgqcQKH0XZi/caulAGgq7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jW
+DA+wWFjbw2Y3npuRVDM30pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFV
+d9oKDMyXroDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIGA1Ud
+EwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5jaGFtYmVyc2lnbi5v
+cmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p26EpW1eLTXYGduHRooowDgYDVR0P
+AQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hh
+bWJlcnNpZ24ub3JnMCcGA1UdEgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYD
+VR0gBFEwTzBNBgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEBAAxBl8IahsAi
+fJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZdp0AJPaxJRUXcLo0waLIJuvvD
+L8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wN
+UPf6s+xCX6ndbcj0dc97wXImsQEcXCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/n
+ADydb47kMgkdTXg0eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1
+erfutGWaIZDgqtCYvDi1czyL+Nw=
+-----END CERTIFICATE-----
+
+Camerfirma Global Chambersign Root
+==================================
+-----BEGIN CERTIFICATE-----
+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
+QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
+ZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYx
+NDE4WhcNMzcwOTMwMTYxNDE4WjB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJt
+YSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEg
+MB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAw
+ggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0Mi+ITaFgCPS3CU6gSS9J
+1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/sQJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8O
+by4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpVeAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl
+6DJWk0aJqCWKZQbua795B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c
+8lCrEqWhz0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0TAQH/
+BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1iZXJzaWduLm9yZy9j
+aGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4wTcbOX60Qq+UDpfqpFDAOBgNVHQ8B
+Af8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBj
+aGFtYmVyc2lnbi5vcmcwKgYDVR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9y
+ZzBbBgNVHSAEVDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
+bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0BAQUFAAOCAQEA
+PDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUMbKGKfKX0j//U2K0X1S0E0T9Y
+gOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXiryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJ
+PJ7oKXqJ1/6v/2j1pReQvayZzKWGVwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4
+IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
+t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
+-----END CERTIFICATE-----
+
+NetLock Notary (Class A) Root
+=============================
+-----BEGIN CERTIFICATE-----
+MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI
+EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
+dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j
+ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX
+DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH
+EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD
+VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz
+cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM
+D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ
+z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC
+/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7
+tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6
+4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG
+A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC
+Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv
+bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
+IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn
+LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0
+ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz
+IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh
+IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu
+b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh
+bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg
+Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp
+bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5
+ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP
+ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB
+CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr
+KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM
+8CgHrTwXZoi1/baI
+-----END CERTIFICATE-----
+
+XRamp Global CA Root
+====================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
+dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
+HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
+U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
+IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
+foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
+zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
+AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
+xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
+AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
+/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
+nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
+8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+Go Daddy Class 2 CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
+VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
+A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
+ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
+2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
+qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
+YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
+vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
+BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
+atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
+MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
+PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
+Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
+vZ8=
+-----END CERTIFICATE-----
+
+Starfield Class 2 CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
+U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
+MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
+A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
+SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
+bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
+JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
+epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
+F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
+MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
+hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
+bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
+afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
+PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
+KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
+QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+StartCom Certification Authority
+================================
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
+U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
+ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
+NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
+LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
+U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
+o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
+Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
+eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
+2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
+6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
+osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
+untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
+UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
+37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNj
+YS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUH
+AgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRw
+Oi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYg
+U3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5
+LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3Rh
+cnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilT
+dGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOC
+AgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh
+3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXm
+vB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHk
+fY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3
+fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZ
+EoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl
+1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/
+lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38coro
+g14=
+-----END CERTIFICATE-----
+
+Taiwan GRCA
+===========
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
+EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
+DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
+dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
+w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
+BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
+1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
+htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
+J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
+Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
+B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
+O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
+lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
+HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
+09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
+Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
+Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
+D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
+DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
+Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
+7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
+CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
++fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
+-----END CERTIFICATE-----
+
+Swisscom Root CA 1
+==================
+-----BEGIN CERTIFICATE-----
+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
+NY6E0F/6MBr1mmz0DlP5OlvRHA==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
+MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
+9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
+UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
+/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
+oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
+GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
+66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
+hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
+EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
+SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
+8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+DigiCert Global Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
+MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
+TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
+BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
+4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
+7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
+o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
+8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
+BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
+EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
+tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
+UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+DigiCert High Assurance EV Root CA
+==================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
+KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
+MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
+MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
+Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
+Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
+OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
+MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
+NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
+h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
+Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
+JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
+V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
+myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
+mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
+-----END CERTIFICATE-----
+
+Certplus Class 2 Primary CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
+BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
+OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
+dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
+5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
+Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
+YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
+e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
+CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
+YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
+L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
+P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
+TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
+7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
+//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+l7+ijrRU
+-----END CERTIFICATE-----
+
+DST Root CA X3
+==============
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
+ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
+DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
+cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
+rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
+UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
+xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
+utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
+dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
+GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
+RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
+fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+DST ACES CA X6
+==============
+-----BEGIN CERTIFICATE-----
+MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QxETAPBgNVBAsTCERTVCBBQ0VT
+MRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0wMzExMjAyMTE5NThaFw0xNzExMjAyMTE5NTha
+MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UE
+CxMIRFNUIEFDRVMxFzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPuktKe1jzI
+DZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7gLFViYsx+tC3dr5BPTCa
+pCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZHfAjIgrrep4c9oW24MFbCswKBXy314pow
+GCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4aahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPy
+MjwmR/onJALJfh1biEITajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rkc3Qu
+Y29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnRy
+dXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMtaW5kZXguaHRtbDAdBgNVHQ4EFgQU
+CXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZIhvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V2
+5FYrnJmQ6AgwbN99Pe7lv7UkQIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6t
+Fr8hlxCBPeP/h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
+nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpRrscL9yuwNwXs
+vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
+oKfN5XozNmr6mis=
+-----END CERTIFICATE-----
+
+SwissSign Gold CA - G2
+======================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+SwissSign Silver CA - G2
+========================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
+cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
+b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
+nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
+RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
+tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
+hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
+Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
+NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
+Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
+1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+thawte Primary Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
+MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
+SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
+KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
+FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
+oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
+1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
+q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
+aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
+afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
+AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
+uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
+jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
+z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G5
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
+biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
+dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
+j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
+Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
+Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
+fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
+Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
+SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
+KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
+Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
+ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+SecureTrust CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
+dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
+BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
+OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
+DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
+GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
+01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
+ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
+aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
+SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
+mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
+nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+Secure Global CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
+bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
+MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
+YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
+bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
+8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
+HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
+0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
+oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
+CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
+3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+COMODO Certification Authority
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
+MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
+T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
++7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
+xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
+4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
+1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
+rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
+b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
+AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
+OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
+IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
++8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
+-----END CERTIFICATE-----
+
+Network Solutions Certificate Authority
+=======================================
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
+EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
+IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
+MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
+jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
+aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
+crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
+/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
+AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
+bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
+A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
+4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
+GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
+ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+WellsSecure Public Root Certificate Authority
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM
+F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw
+NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
+MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl
+bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD
+VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1
+iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13
+i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8
+bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB
+K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB
+AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu
+cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm
+lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB
+i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww
+GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI
+K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0
+bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj
+qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es
+E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ
+tylv2G0xffX8oRAHh84vWdw+WNs=
+-----END CERTIFICATE-----
+
+COMODO ECC Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
+GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
+4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
+wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
+FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
+U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+IGC/A
+=====
+-----BEGIN CERTIFICATE-----
+MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD
+VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE
+Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy
+MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI
+EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT
+STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2
+TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCW
+So7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYy
+HF2fYPepraX/z9E0+X1bF8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd
+frGoRpAxVs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ
+tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB
+egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC
+iQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RK
+q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3Q
+MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
+Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR+FwNI
+lQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs/FZTEYYKKuF
+0mBWWg==
+-----END CERTIFICATE-----
+
+Security Communication EV RootCA1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIzMloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UE
+BhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNl
+Y3VyaXR5IENvbW11bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSERMqm4miO
+/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gOzXppFodEtZDkBp2uoQSX
+WHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4z
+ZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDFMxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4
+bepJz11sS6/vmsJWXMY1VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK
+9U2vP9eCOKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
+SIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HWtWS3irO4G8za+6xm
+iEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZq51ihPZRwSzJIxXYKLerJRO1RuGG
+Av8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDbEJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnW
+mHyojf6GPgcWkuF75x3sM3Z+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEW
+T1MKZPlO9L9OVL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GA CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
+BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
+A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
+bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
+VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
+IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
+IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
+Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
+Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
+d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
+/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
+LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
+MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
+okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE
+BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL
+EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0
+MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz
+dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT
+GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG
+d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N
+oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc
+QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ
+PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb
+MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG
+IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD
+VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3
+LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A
+dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
+AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA
+4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg
+AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA
+egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6
+Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO
+PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv
+c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h
+cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw
+IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT
+WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV
+MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER
+MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp
+Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal
+HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT
+nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE
+aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
+86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK
+yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB
+S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
+-----END CERTIFICATE-----
+
+Certigna
+========
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
+EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
+MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
+Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
+XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
+GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
+ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
+DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
+Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
+tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
+BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
+SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
+hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
+PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
+1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+Deutsche Telekom Root CA 2
+==========================
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
+RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
+A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
+MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
+A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
+b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
+bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
+KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
+AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
+Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
+jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
+HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
+E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
+zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
+rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
+dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
+Cybertrust Global Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
+ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
+MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
+ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
+0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
+AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
+89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
+8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
+MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
+A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
+lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
+5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
+hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
+X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+ePKI Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
+MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
+MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
+IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
+lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
+qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
+12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
+WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
+lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
+vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
+Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
+MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
+1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
+KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
+xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
+NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
+GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
+xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
+gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
+sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
+BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3
+=============================================================================================================================
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH
+DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q
+aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry
+b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV
+BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg
+S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4
+MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl
+IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF
+n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl
+IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft
+dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl
+cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO
+Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1
+xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR
+6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd
+BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4
+N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT
+y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh
+LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
+dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
+
+Buypass Class 2 CA 1
+====================
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2
+MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
+c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M
+cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83
+0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4
+0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/R
+uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P
+AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV
+1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+DKhQ7SLHrQVMdvvt
+7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo+28TOPX2EZL2
+fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
+wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
+-----END CERTIFICATE-----
+
+EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
+==========================================================================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+certSIGN ROOT CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
+VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
+Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
+CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
+JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
+rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
+ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
+0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
+AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
+Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
+AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
+SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
+x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
+vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
+TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+CNNIC ROOT
+==========
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE
+ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw
+OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD
+o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz
+VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT
+VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or
+czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK
+y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC
+wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S
+lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5
+Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM
+O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8
+BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2
+G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m
+mxE=
+-----END CERTIFICATE-----
+
+ApplicationCA - Japanese Government
+===================================
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT
+SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw
+MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl
+cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4
+fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN
+wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE
+jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu
+nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU
+WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV
+BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD
+vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs
+o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g
+/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD
+io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW
+dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+rosot4LKGAfmt1t06SAZf7IbiVQ=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G3
+=============================================
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
+NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
+YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
+LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
+K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
+c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
+IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
+dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
+2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
+cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
+Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
+t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
+VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
+IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
+Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
+MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
+IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
+LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
+8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
+mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
+G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
+rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
+ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
+VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
+A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
+P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
+7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
+vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
+KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
+A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
+8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
+er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
+OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
+b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
+BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
+KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
+EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
+ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
+npaqBA+K
+-----END CERTIFICATE-----
+
+VeriSign Universal Root Certification Authority
+===============================================
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
+1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
+MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
+9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
+AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
+tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
+CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
+a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
+Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
+Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
+P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
+wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
+mJO37M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G4
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
+VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
+b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
+ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
+cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
+b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
+Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
+rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
+HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
+Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
+A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
+AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+NetLock Arany (Class Gold) Főtanúsítvány
+============================================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G2
+==================================
+-----BEGIN CERTIFICATE-----
+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
+66+KAQ==
+-----END CERTIFICATE-----
+
+CA Disig
+========
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK
+QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw
+MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz
+bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm
+GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD
+Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo
+hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt
+ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w
+gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P
+AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz
+aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff
+ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa
+BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t
+WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3
+mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
+CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K
+ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA
+4Z7CRneC9VkGjCFMhwnN5ag=
+-----END CERTIFICATE-----
+
+Juur-SK
+=======
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA
+c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw
+DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG
+SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy
+aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf
+TQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkzABpTpyHhOEvWgxutr2TC
++Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvHLCu3GFH+4Hv2qEivbDtPL+/40UceJlfw
+UR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa
+Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQF
+MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD
+HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh
+AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA
+cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr
+AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw
+cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
+FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2/v6X2+MA4G
+A1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP+JmeaUOTDBS8rNXiRTHyo
+ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL
+abVAyJRld/JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678
+IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkh
+Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2
+yyqcjg==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 1
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
+DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
+NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
+IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
+ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
+auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
+qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
+V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
+HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
+h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
+l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
+IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
+T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
+c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
+-----END CERTIFICATE-----
+
+SecureSign RootCA11
+===================
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
+SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
+b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
+KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
+cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
+TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
+wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
+g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
+O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
+bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
+t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
+OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
+bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
+Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
+y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
+lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+ACEDICOM Root
+=============
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
+DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
+bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
+ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
+51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
+R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
+T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
+Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
+osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
+crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
+saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
+KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
+6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+Izenpe.com
+==========
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+Chambers of Commerce Root - 2008
+================================
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
+Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
+ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
+EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
+cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
+XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
+h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
+ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
+NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
+D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
+lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
+0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
+EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
+G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
+BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
+bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
+bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
+CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
+AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
+wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
+3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
+RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
+M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
+YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
+9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
+zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
+nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
+-----END CERTIFICATE-----
+
+Global Chambersign Root - 2008
+==============================
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
+NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
+Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
+QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
+VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
+XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
+ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
+/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
+TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
+H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
+Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
+HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
+AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
+BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
+BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
+aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
+aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
+1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
+dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
+/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
+ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
+dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
+9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
+foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
+qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
+P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
+c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+Go Daddy Root Certificate Authority - G2
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
+MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
+A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
+9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
+fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
+NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
+BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
+vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
+5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
+N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+Starfield Root Certificate Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
+eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
+DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
+VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
+dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
+W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
+bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
+N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
+ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
+JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
+TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
+4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
+F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
+c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+Starfield Services Root Certificate Authority - G2
+==================================================
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
+IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
+dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
+h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
+hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
+LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
+rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
+SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
+E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
+xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
+YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
+-----END CERTIFICATE-----
+
+AffirmTrust Commercial
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
+MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
+DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
+C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
+BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
+MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
+HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
+hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
+qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
+0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
+sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+AffirmTrust Networking
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
+MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
+Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
+dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
+/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
+h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
+HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
+UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
+12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
+WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
+/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+AffirmTrust Premium
+===================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
+OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
+dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
+BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
+5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
++7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
+GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
+p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
+S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
+6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
+/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
++Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
+MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
+6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
+L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
++4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
+BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
+IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
+g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
+zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+AffirmTrust Premium ECC
+=======================
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
+BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
+MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
+cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
+N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
+BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
+BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
+57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
+eQ==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
+ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
+MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
+ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
+l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
+J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
+fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
+cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
+jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
+mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
+Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+Certinomis - Autorité Racine
+=============================
+-----BEGIN CERTIFICATE-----
+MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg
+LSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkG
+A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYw
+JAYDVQQDDB1DZXJ0aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jYF1AMnmHa
+wE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N8y4oH3DfVS9O7cdxbwly
+Lu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWerP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw
+2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92N
+jMD2AR5vpTESOH2VwnHu7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9q
+c1pkIuVC28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6lSTC
+lrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1Enn1So2+WLhl+HPNb
+xxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB0iSVL1N6aaLwD4ZFjliCK0wi1F6g
+530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql095gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna
+4NH4+ej9Uji29YnfAgMBAAGjWzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBQNjLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
+KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9sov3/4gbIOZ/x
+WqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZMOH8oMDX/nyNTt7buFHAAQCva
+R6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40
+nJ+U8/aGH88bc62UeYdocMMzpXDn2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1B
+CxMjidPJC+iKunqjo3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjv
+JL1vnxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG5ERQL1TE
+qkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWqpdEdnV1j6CTmNhTih60b
+WfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZbdsLLO7XSAPCjDuGtbkD326C00EauFddE
+wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/
+vgt2Fl43N+bYdJeimUV5
+-----END CERTIFICATE-----
+
+Root CA Generalitat Valenciana
+==============================
+-----BEGIN CERTIFICATE-----
+MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJFUzEfMB0GA1UE
+ChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290
+IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcNMDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3
+WjBoMQswCQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UE
+CxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+WmmmO3I2
+F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKjSgbwJ/BXufjpTjJ3Cj9B
+ZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGlu6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQ
+D0EbtFpKd71ng+CT516nDOeB0/RSrFOyA8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXte
+JajCq+TA81yc477OMUxkHl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMB
+AAGjggM7MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBraS5n
+dmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIICIwYKKwYBBAG/VQIB
+ADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBl
+AHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIAYQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIA
+YQBsAGkAdABhAHQAIABWAGEAbABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQBy
+AGEAYwBpAPMAbgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
+aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMAaQBvAG4AYQBt
+AGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQAZQAgAEEAdQB0AG8AcgBpAGQA
+YQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBu
+AHQAcgBhACAAZQBuACAAbABhACAAZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAA
+OgAvAC8AdwB3AHcALgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0
+dHA6Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+yeAT8MIGV
+BgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQswCQYDVQQGEwJFUzEfMB0G
+A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5S
+b290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRh
+TvW1yEICKrNcda3FbcrnlD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdz
+Ckj+IHLtb8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg9J63
+NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XFducTZnV+ZfsBn5OH
+iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt
++GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
+-----END CERTIFICATE-----
+
+TWCA Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
+VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
+EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
+IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
+QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
+oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
+4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
+y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
+9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
+mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
+QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
+T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
+Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+Security Communication RootCA2
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
+SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
+aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
+3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
+spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
+EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
+QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
+u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
+3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
+tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
+mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+EC-ACC
+======
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
+BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
+ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
+VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
+CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
+BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
+MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
+SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
+Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
+cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
+w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
+ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
+HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
+E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
+0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
+VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
+Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
+dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
+lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
+Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
+l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
+E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
+5EI=
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2011
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
+O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
+aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
+AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
+IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
+1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
+71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
+8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
+3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
+MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
+MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
+b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
+XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
+/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
+7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+
+Actalis Authentication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+Trustis FPS Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
+EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
+IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
+BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
+RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
+H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
+cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
+o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
+AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
+BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
+GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
+yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
+8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
+l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
+iB6XzCGcKQENZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+
+StartCom Certification Authority
+================================
+-----BEGIN CERTIFICATE-----
+MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
+U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
+ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
+NjM3WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
+LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
+U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
+o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
+Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
+eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
+2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
+6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
+osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
+untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
+UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
+37uMdBNSSwIDAQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFulF2mHMMo0aEPQ
+Qa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCCATgwLgYIKwYBBQUHAgEWImh0
+dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cu
+c3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENv
+bW1lcmNpYWwgKFN0YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0
+aGUgc2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0
+aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29t
+L3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBG
+cmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5
+fPGFf59Jb2vKXfuM/gTFwWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWm
+N3PH/UvSTa0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst0OcN
+Org+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNcpRJvkrKTlMeIFw6T
+tn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKlCcWw0bdT82AUuoVpaiF8H3VhFyAX
+e2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVFP0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA
+2MFrLH9ZXF2RsXAiV+uKa0hK1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBs
+HvUwyKMQ5bLmKhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
+JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ8dCAWZvLMdib
+D4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnmfyWl8kgAwKQB2j8=
+-----END CERTIFICATE-----
+
+StartCom Certification Authority G2
+===================================
+-----BEGIN CERTIFICATE-----
+MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
+U3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+RzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UE
+ChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgRzIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8O
+o1XJJZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsDvfOpL9HG
+4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnooD/Uefyf3lLE3PbfHkffi
+Aez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/Q0kGi4xDuFby2X8hQxfqp0iVAXV16iul
+Q5XqFYSdCI0mblWbq9zSOdIxHWDirMxWRST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbs
+O+wmETRIjfaAKxojAuuKHDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8H
+vKTlXcxNnw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM0D4L
+nMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/iUUjXuG+v+E5+M5iS
+FGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9Ha90OrInwMEePnWjFqmveiJdnxMa
+z6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHgTuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJ
+KoZIhvcNAQELBQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
+2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfXUfEpY9Z1zRbk
+J4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl6/2o1PXWT6RbdejF0mCy2wl+
+JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG
+/+gyRr61M3Z3qAFdlsHB1b6uJcDJHgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTc
+nIhT76IxW1hPkWLIwpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/Xld
+blhYXzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5lIxKVCCIc
+l85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoohdVddLHRDiBYmxOlsGOm
+7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulrso8uBtjRkcfGEvRM/TAXw8HaOFvjqerm
+obp573PYtlNXLfbQ4ddI
+-----END CERTIFICATE-----
+
+Buypass Class 2 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
+DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
+g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
+9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
+/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
+CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
+awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
+zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
+Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
+Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
+M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
+osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
+aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
+DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
+LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
+oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
+wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
+CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
+rJgWVqA=
+-----END CERTIFICATE-----
+
+Buypass Class 3 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
+DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
+sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
+5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
+7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
+ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
+2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
+/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
+RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
+Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
+j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
+uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
+Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
+ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
+KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
+6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
+UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
+eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
+Cp/HuZc=
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 3
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
+MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
+9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
+NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
+iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
+0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
+AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
+fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
+ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
+P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
+-----END CERTIFICATE-----
+
+EE Certification Centre Root CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
+dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
+MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
+UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
+ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
+TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
+rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
+93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
+P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
+MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
+BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
+xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
+lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
+3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
+dcGWxZ0=
+-----END CERTIFICATE-----
+
+TURKTRUST Certificate Services Provider Root 2007
+=================================================
+-----BEGIN CERTIFICATE-----
+MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
+MA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
+QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4X
+DTA3MTIyNTE4MzcxOVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxl
+a3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMCVFIxDzAN
+BgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
+bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4gKGMpIEFyYWzEsWsgMjAwNzCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9N
+YvDdE3ePYakqtdTyuTFYKTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQv
+KUmi8wUG+7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveGHtya
+KhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6PIzdezKKqdfcYbwnT
+rqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M733WB2+Y8a+xwXrXgTW4qhe04MsC
+AwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHkYb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/s
+Px+EnWVUXKgWAkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
+aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5mxRZNTZPz/OO
+Xl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsaXRik7r4EW5nVcV9VZWRi1aKb
+BFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZqxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAK
+poRq0Tl9
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
+Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
+LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
+ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
+BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
+KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
+p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
+AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
+4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
+eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
+MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
+PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
+OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
+2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
+dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
+X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 EV 2009
+=================================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
+egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
+zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
+7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
+sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
+11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
+cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
+ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
+MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
+b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
+c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
+PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
+ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
+NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
+w9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+PSCProcert
+==========
+-----BEGIN CERTIFICATE-----
+MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1dG9yaWRhZCBk
+ZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9sYW5vMQswCQYDVQQGEwJWRTEQ
+MA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlzdHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lz
+dGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBl
+cmludGVuZGVuY2lhIGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUw
+IwYJKoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEwMFoXDTIw
+MTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHByb2NlcnQubmV0LnZlMQ8w
+DQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGExKjAoBgNVBAsTIVByb3ZlZWRvciBkZSBD
+ZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZp
+Y2FjaW9uIEVsZWN0cm9uaWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo97BVC
+wfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74BCXfgI8Qhd19L3uA
+3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38GieU89RLAu9MLmV+QfI4tL3czkkoh
+RqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmO
+EO8GqQKJ/+MMbpfg353bIdD0PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG2
+0qCZyFSTXai20b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
+0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/6mnbVSKVUyqU
+td+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1mv6JpIzi4mWCZDlZTOpx+FIyw
+Bm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvp
+r2uKGcfLFFb14dq12fy/czja+eevbqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/
+AgEBMDcGA1UdEgQwMC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAz
+Ni0wMB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFDgBStuyId
+xuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0b3JpZGFkIGRlIENlcnRp
+ZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xhbm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQH
+EwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5h
+Y2lvbmFsIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5k
+ZW5jaWEgZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkqhkiG
+9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQDAgEGME0GA1UdEQRG
+MESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0wMDAwMDKgGwYFYIZeAgKgEgwQUklG
+LUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEagRKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52
+ZS9sY3IvQ0VSVElGSUNBRE8tUkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNy
+YWl6LnN1c2NlcnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
+Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsGAQUFBwIBFh5o
+dHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcNAQELBQADggIBACtZ6yKZu4Sq
+T96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmN
+g7+mvTV+LFwxNG9s2/NkAZiqlCxB3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4q
+uxtxj7mkoP3YldmvWb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1
+n8GhHVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHmpHmJWhSn
+FFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXzsOfIt+FTvZLm8wyWuevo
+5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bEqCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq
+3TNWOByyrYDT13K9mmyZY+gAu0F2BbdbmRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5
+poLWccret9W6aAjtmcz9opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3Y
+eMLEYC/HYvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
+-----END CERTIFICATE-----
+
+China Internet Network Information Center EV Certificates Root
+==============================================================
+-----BEGIN CERTIFICATE-----
+MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMCQ04xMjAwBgNV
+BAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyMUcwRQYDVQQDDD5D
+aGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMg
+Um9vdDAeFw0xMDA4MzEwNzExMjVaFw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAG
+A1UECgwpQ2hpbmEgSW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMM
+PkNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRpZmljYXRl
+cyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z7r07eKpkQ0H1UN+U8i6y
+jUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV
+98YPjUesWgbdYavi7NifFy2cyjw1l1VxzUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2H
+klY0bBoQCxfVWhyXWIQ8hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23
+KzhmBsUs4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54ugQEC
+7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oYNJKiyoOCWTAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUfHJLOcfA22KlT5uqGDSSosqD
+glkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd5
+0XPFtQO3WKwMVC/GVhMPMdoG52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM
+7+czV0I664zBechNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
+ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrIzo9uoV1/A3U0
+5K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATywy39FCqQmbkHzJ8=
+-----END CERTIFICATE-----
+
+Swisscom Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+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
+5OfNeOI5wSsSnqaeG8XmDtkx2Q==
+-----END CERTIFICATE-----
+
+Swisscom Root EV CA 2
+=====================
+-----BEGIN CERTIFICATE-----
+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
+l8PVP3wbI+2ksx0WckNLIOFZfsLorSa/ovc=
+-----END CERTIFICATE-----
+
+CA Disig Root R1
+================
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQyMDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy
+3QRkD2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/oOI7bm+V8
+u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3AfQ+lekLZWnDZv6fXARz2
+m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJeIgpFy4QxTaz+29FHuvlglzmxZcfe+5nk
+CiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8noc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTa
+YVKvJrT1cU/J19IG32PK/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6
+vpmumwKjrckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD3AjL
+LhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE7cderVC6xkGbrPAX
+ZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkCyC2fg69naQanMVXVz0tv/wQFx1is
+XxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLdqvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ
+04IwDQYJKoZIhvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
+xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaASfX8MPWbTx9B
+LxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXoHqJPYNcHKfyyo6SdbhWSVhlM
+CrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpBemOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5Gfb
+VSUZP/3oNn6z4eGBrxEWi1CXYBmCAMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85
+YmLLW1AL14FABZyb7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKS
+ds+xDzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvkF7mGnjix
+lAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqFa3qdnom2piiZk4hA9z7N
+UaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsTQ6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJ
+a7+h89n07eLw4+1knj0vllJPgFOL
+-----END CERTIFICATE-----
+
+CA Disig Root R2
+================
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
+w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
+xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
+A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
+GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
+g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
+5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
+koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
+Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
+Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
+Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
+sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
+dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
+1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
+mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
+utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
+sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
+UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
+7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+
+ACCVRAIZ1
+=========
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
+SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
+MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
+UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
+jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
+RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
+aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
+0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
+WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
+8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
+5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
+9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
+Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
+Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
+Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
+Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
+QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
+AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
+YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
+AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
+IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
+aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
+dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
+MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
+hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
+R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
+YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
+nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
+TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
+sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
+Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
+3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
+EfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+
+TWCA Global Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
+CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
+QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
+EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
+nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
+r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
+Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
+tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
+KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
+sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
+yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
+kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
+zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
+cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
+8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
+/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
+lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
+A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
+i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
+EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
+zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
+-----END CERTIFICATE-----
+
+TeliaSonera Root CA v1
+======================
+-----BEGIN CERTIFICATE-----
+MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE
+CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4
+MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW
+VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+
+6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA
+3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k
+B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn
+Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH
+oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3
+F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ
+oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7
+gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc
+TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB
+AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW
+DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm
+zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
+0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW
+pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV
+G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc
+c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT
+JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2
+qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6
+Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
+WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
+-----END CERTIFICATE-----
+
+E-Tugra Certification Authority
+===============================
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w
+DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls
+ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
+ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw
+NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx
+QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl
+cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD
+DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd
+hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K
+CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g
+ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ
+BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0
+E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz
+rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq
+jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
+rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5
+dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB
+/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG
+MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK
+kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO
+XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807
+VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo
+a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc
+dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV
+KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT
+Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0
+8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G
+C7TbO6Orb1wdtn7os4I07QZcJA==
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 2
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
+MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
+SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
+vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
+2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
+WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
+YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
+r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
+vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
+3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
+9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
+-----END CERTIFICATE-----
+
+Atos TrustedRoot 2011
+=====================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU
+cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4
+MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG
+A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
+hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr
+54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+
+DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320
+HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR
+z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R
+l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ
+bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
+CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h
+k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh
+TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
+61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
+3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 1 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
+PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
+PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
+Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
+ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
+g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
+7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
+9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
+iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
+t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
+hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
+MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
+GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
+Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
++V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
+3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
+wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
+O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
+FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
+hMJKzRwuJIczYOXD
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
+ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
+NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
+oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
+MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
+V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
+L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
+sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
+6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
+lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
+hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
+AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
+pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
+x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
+dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
+U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
+mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
+zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
+JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
+O3jtZsSOeWmD3n+M
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
+IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
+Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
+6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
+I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
+VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
+5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
+Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
+dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
+rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
+hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
+KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
+t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
+TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
+DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
+Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
+hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
+0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
+dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
+PpxxVJkES/1Y+Zj0
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
+MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
+35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
+bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
+VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
+YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
+lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
+w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
+0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
+d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
+hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
+jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
+VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
+BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
+RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
+KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
+UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
+YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
+1vUhZscv6pZjamVFkpUBtA==
+-----END CERTIFICATE-----
+
+DigiCert Global Root G2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
+MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
+kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
+3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
+BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
+UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
+5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
+F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
+WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
+QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
+iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
+
+DigiCert Global Root G3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
+VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
+MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
+aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
+AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
+YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
+Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
+3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
+VOKa5Vt8sycX
+-----END CERTIFICATE-----
+
+DigiCert Trusted Root G4
+========================
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
+HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
+pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
+k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
+vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
+QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
+MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
+mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
+f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
+dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
+oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
+ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
+yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
+7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
+ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
+5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
+/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
+5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
+G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
+82Z+
+-----END CERTIFICATE-----
+
+WoSign
+======
+-----BEGIN CERTIFICATE-----
+MIIFdjCCA16gAwIBAgIQXmjWEXGUY1BWAGjzPsnFkTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
+EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIUNlcnRpZmljYXRpb24g
+QXV0aG9yaXR5IG9mIFdvU2lnbjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMFUxCzAJ
+BgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEqMCgGA1UEAxMhQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgb2YgV29TaWduMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
+vcqNrLiRFVaXe2tcesLea9mhsMMQI/qnobLMMfo+2aYpbxY94Gv4uEBf2zmoAHqLoE1UfcIiePyO
+CbiohdfMlZdLdNiefvAA5A6JrkkoRBoQmTIPJYhTpA2zDxIIFgsDcSccf+Hb0v1naMQFXQoOXXDX
+2JegvFNBmpGN9J42Znp+VsGQX+axaCA2pIwkLCxHC1l2ZjC1vt7tj/id07sBMOby8w7gLJKA84X5
+KIq0VC6a7fd2/BVoFutKbOsuEo/Uz/4Mx1wdC34FMr5esAkqQtXJTpCzWQ27en7N1QhatH/YHGkR
++ScPewavVIMYe+HdVHpRaG53/Ma/UkpmRqGyZxq7o093oL5d//xWC0Nyd5DKnvnyOfUNqfTq1+ez
+EC8wQjchzDBwyYaYD8xYTYO7feUapTeNtqwylwA6Y3EkHp43xP901DfA4v6IRmAR3Qg/UDaruHqk
+lWJqbrDKaiFaafPz+x1wOZXzp26mgYmhiMU7ccqjUu6Du/2gd/Tkb+dC221KmYo0SLwX3OSACCK2
+8jHAPwQ+658geda4BmRkAjHXqc1S+4RFaQkAKtxVi8QGRkvASh0JWzko/amrzgD5LkhLJuYwTKVY
+yrREgk/nkR4zw7CT/xH8gdLKH3Ep3XZPkiWvHYG3Dy+MwwbMLyejSuQOmbp8HkUff6oZRZb9/D0C
+AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFOFmzw7R
+8bNLtwYgFP6HEtX2/vs+MA0GCSqGSIb3DQEBBQUAA4ICAQCoy3JAsnbBfnv8rWTjMnvMPLZdRtP1
+LOJwXcgu2AZ9mNELIaCJWSQBnfmvCX0KI4I01fx8cpm5o9dU9OpScA7F9dY74ToJMuYhOZO9sxXq
+T2r09Ys/L3yNWC7F4TmgPsc9SnOeQHrAK2GpZ8nzJLmzbVUsWh2eJXLOC62qx1ViC777Y7NhRCOj
+y+EaDveaBk3e1CNOIZZbOVtXHS9dCF4Jef98l7VNg64N1uajeeAz0JmWAjCnPv/So0M/BVoG6kQC
+2nz4SNAzqfkHx5Xh9T71XXG68pWpdIhhWeO/yloTunK0jF02h+mmxTwTv97QRCbut+wucPrXnbes
+5cVAWubXbHssw1abR80LzvobtCHXt2a49CUwi1wNuepnsvRtrtWhnk/Yn+knArAdBtaP4/tIEp9/
+EaEQPkxROpaw0RPxx9gmrjrKkcRpnd8BKWRRb2jaFOwIQZeQjdCygPLPwj2/kWjFgGcexGATVdVh
+mVd8upUPYUk6ynW8yQqTP2cOEvIo4jEbwFcW3wh8GcF+Dx+FHgo2fFt+J7x6v+Db9NpSvd4MVHAx
+kUOVyLzwPt0JfjBkUO1/AaQzZ01oT74V77D2AhGiGxMlOtzCWfHjXEa7ZywCRuoeSKbmW9m1vFGi
+kpbbqsY3Iqb+zCB0oy2pLmvLwIIRIbWTee5Ehr7XHuQe+w==
+-----END CERTIFICATE-----
+
+WoSign China
+============
+-----BEGIN CERTIFICATE-----
+MIIFWDCCA0CgAwIBAgIQUHBrzdgT/BtOOzNy0hFIjTANBgkqhkiG9w0BAQsFADBGMQswCQYDVQQG
+EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMMEkNBIOayg+mAmuagueiv
+geS5pjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMEYxCzAJBgNVBAYTAkNOMRowGAYD
+VQQKExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAwwSQ0Eg5rKD6YCa5qC56K+B5LmmMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0EkhHiX8h8EqwqzbdoYGTufQdDTc7WU1/FDWiD+k
+8H/rD195L4mx/bxjWDeTmzj4t1up+thxx7S8gJeNbEvxUNUqKaqoGXqW5pWOdO2XCld19AXbbQs5
+uQF/qvbW2mzmBeCkTVL829B0txGMe41P/4eDrv8FAxNXUDf+jJZSEExfv5RxadmWPgxDT74wwJ85
+dE8GRV2j1lY5aAfMh09Qd5Nx2UQIsYo06Yms25tO4dnkUkWMLhQfkWsZHWgpLFbE4h4TV2TwYeO5
+Ed+w4VegG63XX9Gv2ystP9Bojg/qnw+LNVgbExz03jWhCl3W6t8Sb8D7aQdGctyB9gQjF+BNdeFy
+b7Ao65vh4YOhn0pdr8yb+gIgthhid5E7o9Vlrdx8kHccREGkSovrlXLp9glk3Kgtn3R46MGiCWOc
+76DbT52VqyBPt7D3h1ymoOQ3OMdc4zUPLK2jgKLsLl3Az+2LBcLmc272idX10kaO6m1jGx6KyX2m
++Jzr5dVjhU1zZmkR/sgO9MHHZklTfuQZa/HpelmjbX7FF+Ynxu8b22/8DU0GAbQOXDBGVWCvOGU6
+yke6rCzMRh+yRpY/8+0mBe53oWprfi1tWFxK1I5nuPHa1UaKJ/kR8slC/k7e3x9cxKSGhxYzoacX
+GKUN5AXlK8IrC6KVkLn9YDxOiT7nnO4fuwECAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFOBNv9ybQV0T6GTwp+kVpOGBwboxMA0GCSqGSIb3DQEBCwUA
+A4ICAQBqinA4WbbaixjIvirTthnVZil6Xc1bL3McJk6jfW+rtylNpumlEYOnOXOvEESS5iVdT2H6
+yAa+Tkvv/vMx/sZ8cApBWNromUuWyXi8mHwCKe0JgOYKOoICKuLJL8hWGSbueBwj/feTZU7n85iY
+r83d2Z5AiDEoOqsuC7CsDCT6eiaY8xJhEPRdF/d+4niXVOKM6Cm6jBAyvd0zaziGfjk9DgNyp115
+j0WKWa5bIW4xRtVZjc8VX90xJc/bYNaBRHIpAlf2ltTW/+op2znFuCyKGo3Oy+dCMYYFaA6eFN0A
+kLppRQjbbpCBhqcqBT/mhDn4t/lXX0ykeVoQDF7Va/81XwVRHmyjdanPUIPTfPRm94KNPQx96N97
+qA4bLJyuQHCH2u2nFoJavjVsIE4iYdm8UXrNemHcSxH5/mc0zy4EZmFcV5cjjPOGG0jfKq+nwf/Y
+jj4Du9gqsPoUJbJRa4ZDhS4HIxaAjUz7tGM7zMN07RujHv41D198HRaG9Q7DlfEvr10lO1Hm13ZB
+ONFLAzkopR6RctR9q5czxNM+4Gm2KHmgCY0c0f9BckgG/Jou5yD5m6Leie2uPAmvylezkolwQOQv
+T8Jwg0DXJCxr5wkf09XHwQj02w47HAcLQxGEIYbpgNR12KvxAmLBsX5VYc8T1yaw15zLKYs4SgsO
+kI26oQ==
+-----END CERTIFICATE-----
+
+COMODO RSA Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
+dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
+FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
+5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
+x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
+2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
+OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
+sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
+GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
+WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
+rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
+tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
+sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
+pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
+zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
+ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
+7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
+LaZRfyHBNVOFBkpdn627G190
+-----END CERTIFICATE-----
+
+USERTrust RSA Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+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
+Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----
+
+USERTrust ECC Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2
+0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez
+nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV
+HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB
+HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
+9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R4
+===========================
+-----BEGIN CERTIFICATE-----
+MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
+OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
+AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
+MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
+JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R5
+===========================
+-----BEGIN CERTIFICATE-----
+MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6
+SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS
+h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
+uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
+yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G3
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
+olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
+x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
+EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
+Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
+mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
+1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
+07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
+FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
+41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
+yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
+U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
+KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
+v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
+8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
+8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
+mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
+1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
+JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
+tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden EV Root CA
+================================
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
+MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
+cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
+SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
+O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
+0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
+Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
+XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
+08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
+0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
+74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
+fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
+ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
+eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
+c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
+5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
+b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
+f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
+5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
+WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
+DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
+eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
+-----END CERTIFICATE-----
+
+IdenTrust Commercial Root CA 1
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
+b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
+IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
+hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
+mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
+1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
+XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
+3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
+NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
+WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
+xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
+uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
+hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
+ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
+ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
+YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
+feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
+kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
+2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
+Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
+cGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
+
+IdenTrust Public Sector Root CA 1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
+ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
+b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
+P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
+Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
+rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
+qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
+mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
+ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
+LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
+iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
+4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
+Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
+DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
+mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
+GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
+m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
+NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
+Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
+ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
+ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
+3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
+bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
+b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
+HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
+DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
+OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
+/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
+HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
+s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
+TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
+AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
+0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
+iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
+nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
+e4pIb4tF9g==
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - EC1
+==========================================
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
+FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
+YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
+FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
+LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
+dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
+IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
+AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
+9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
+vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
+kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
+-----END CERTIFICATE-----
+
+CFCA EV ROOT
+============
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
+CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
+IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
+MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
+DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
+BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
+7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
+uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
+ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
+xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
+py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
+gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
+hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
+tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
+BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
+ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
+ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
+4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
+E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
+BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
+aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
+PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
+kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
+ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
+-----END CERTIFICATE-----
+
+TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIEJzCCAw+gAwIBAgIHAI4X/iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVFIxDzAN
+BgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
+bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4xQjBABgNVBAMMOVTDnFJLVFJVU1Qg
+RWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSBINTAeFw0xMzA0MzAw
+ODA3MDFaFw0yMzA0MjgwODA3MDFaMIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMU0w
+SwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnE
+n2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBFbGVrdHJvbmlrIFNlcnRp
+ZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApCUZ4WWe60ghUEoI5RHwWrom/4NZzkQqL/7hzmAD/I0Dpe3/a6i6zDQGn1k19uwsu537
+jVJp45wnEFPzpALFp/kRGml1bsMdi9GYjZOHp3GXDSHHmflS0yxjXVW86B8BSLlg/kJK9siArs1m
+ep5Fimh34khon6La8eHBEJ/rPCmBp+EyCNSgBbGM+42WAA4+Jd9ThiI7/PS98wl+d+yG6w8z5UNP
+9FR1bSmZLmZaQ9/LXMrI5Tjxfjs1nQ/0xVqhzPMggCTTV+wVunUlm+hkS7M0hO8EuPbJbKoCPrZV
+4jI3X/xml1/N1p7HIL9Nxqw/dV8c7TKcfGkAaZHjIxhT6QIDAQABo0IwQDAdBgNVHQ4EFgQUVpkH
+HtOsDGlktAxQR95DLL4gwPswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAJ5FdnsXSDLyOIspve6WSk6BGLFRRyDN0GSxDsnZAdkJzsiZ3GglE9Rc8qPo
+BP5yCccLqh0lVX6Wmle3usURehnmp349hQ71+S4pL+f5bFgWV1Al9j4uPqrtd3GqqpmWRgqujuwq
+URawXs3qZwQcWDD1YIq9pr1N5Za0/EKJAWv2cMhQOQwt1WbZyNKzMrcbGW3LM/nfpeYVhDfwwvJl
+lpKQd/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CFYv4HAqGEVka+lgqaE9chTLd8
+B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW+qtB4Uu2NQvAmxU=
+-----END CERTIFICATE-----
+
+TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIEJjCCAw6gAwIBAgIGfaHyZeyKMA0GCSqGSIb3DQEBCwUAMIGxMQswCQYDVQQGEwJUUjEPMA0G
+A1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
+acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg2MB4XDTEzMTIxODA5
+MDQxMFoXDTIzMTIxNjA5MDQxMFowgbExCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExTTBL
+BgNVBAoMRFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSf
+aSBIaXptZXRsZXJpIEEuxZ4uMUIwQAYDVQQDDDlUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2VydGlm
+aWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLEgSDYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCdsGjW6L0UlqMACprx9MfMkU1xeHe59yEmFXNRFpQJRwXiM/VomjX/3EsvMsew7eKC5W/a
+2uqsxgbPJQ1BgfbBOCK9+bGlprMBvD9QFyv26WZV1DOzXPhDIHiTVRZwGTLmiddk671IUP320EED
+wnS3/faAz1vFq6TWlRKb55cTMgPp1KtDWxbtMyJkKbbSk60vbNg9tvYdDjTu0n2pVQ8g9P0pu5Fb
+HH3GQjhtQiht1AH7zYiXSX6484P4tZgvsycLSF5W506jM7NE1qXyGJTtHB6plVxiSvgNZ1GpryHV
++DKdeboaX+UEVU0TRv/yz3THGmNtwx8XEsMeED5gCLMxAgMBAAGjQjBAMB0GA1UdDgQWBBTdVRcT
+9qzoSCHK77Wv0QAy7Z6MtTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQsFAAOCAQEAb1gNl0OqFlQ+v6nfkkU/hQu7VtMMUszIv3ZnXuaqs6fvuay0EBQNdH49ba3R
+fdCaqaXKGDsCQC4qnFAUi/5XfldcEQlLNkVS9z2sFP1E34uXI9TDwe7UU5X+LEr+DXCqu4svLcsy
+o4LyVN/Y8t3XSHLuSqMplsNEzm61kod2pLv0kmzOLBQJZo6NrRa1xxsJYTvjIKIDgI6tflEATseW
+hvtDmHd9KMeP2Cpu54Rvl0EpABZeTeIT6lnAY2c6RPuY/ATTMHKm9ocJV612ph1jmv3XZch4gyt1
+O6VbuA1df74jrlZVlFjvH4GMKrLN5ptjnhi85WsGtAuYSyher4hYyw==
+-----END CERTIFICATE-----
+
+Certinomis - Root CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg
+LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx
+EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD
+ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos
+P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo
+d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap
+z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00
+8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x
+RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE
+6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t
+FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV
+PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH
+i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj
+YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I
+6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
+AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV
+WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw
+Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX
+lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ
+y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9
+Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng
+DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi
+I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM
+cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr
+hkIGuUE=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GB CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
+EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
+MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
+b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
+scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
+rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
+9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
+Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
+GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
+hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
+dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
+VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
+HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
+Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
+-----END CERTIFICATE-----
+
+Certification Authority of WoSign G2
+====================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQayXaioidfLwPBbOxemFFRDANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
+EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxLTArBgNVBAMTJENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5IG9mIFdvU2lnbiBHMjAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMFgx
+CzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEtMCsGA1UEAxMkQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkgb2YgV29TaWduIEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvsXEoCKASU+/2YcRxlPhuw+9YH+v9oIOH9ywjj2X4FA8jzrvZjtFB5sg+OPXJYY1kBai
+XW8wGQiHC38Gsp1ij96vkqVg1CuAmlI/9ZqD6TRay9nVYlzmDuDfBpgOgHzKtB0TiGsOqCR3A9Du
+W/PKaZE1OVbFbeP3PU9ekzgkyhjpJMuSA93MHD0JcOQg5PGurLtzaaNjOg9FD6FKmsLRY6zLEPg9
+5k4ot+vElbGs/V6r+kHLXZ1L3PR8du9nfwB6jdKgGlxNIuG12t12s9R23164i5jIFFTMaxeSt+BK
+v0mUYQs4kI9dJGwlezt52eJ+na2fmKEG/HgUYFf47oB3sQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU+mCp62XF3RYUCE4MD42b4Pdkr2cwDQYJKoZI
+hvcNAQELBQADggEBAFfDejaCnI2Y4qtAqkePx6db7XznPWZaOzG73/MWM5H8fHulwqZm46qwtyeY
+P0nXYGdnPzZPSsvxFPpahygc7Y9BMsaV+X3avXtbwrAh449G3CE4Q3RM+zD4F3LBMvzIkRfEzFg3
+TgvMWvchNSiDbGAtROtSjFA9tWwS1/oJu2yySrHFieT801LYYRf+epSEj3m2M1m6D8QL4nCgS3gu
++sif/a+RZQp4OBXllxcU3fngLDT4ONCEIgDAFFEYKwLcMFrw6AF8NTojrwjkr6qOKEJJLvD1mTS+
+7Q9LGOHSJDy7XUe3IfKN0QqZjuNuPq1w4I+5ysxugTH2e5x6eeRncRg=
+-----END CERTIFICATE-----
+
+CA WoSign ECC Root
+==================
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY+gAwIBAgIQaEpYcIBr8I8C+vbe6LCQkDAKBggqhkjOPQQDAzBGMQswCQYDVQQGEwJD
+TjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMTEkNBIFdvU2lnbiBFQ0MgUm9v
+dDAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMEYxCzAJBgNVBAYTAkNOMRowGAYDVQQK
+ExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAxMSQ0EgV29TaWduIEVDQyBSb290MHYwEAYHKoZI
+zj0CAQYFK4EEACIDYgAE4f2OuEMkq5Z7hcK6C62N4DrjJLnSsb6IOsq/Srj57ywvr1FQPEd1bPiU
+t5v8KB7FVMxjnRZLU8HnIKvNrCXSf4/CwVqCXjCLelTOA7WRf6qU0NGKSMyCBSah1VES1ns2o0Iw
+QDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUqv3VWqP2h4syhf3R
+MluARZPzA7gwCgYIKoZIzj0EAwMDaAAwZQIxAOSkhLCB1T2wdKyUpOgOPQB0TKGXa/kNUTyh2Tv0
+Daupn75OcsqF1NnstTJFGG+rrQIwfcf3aWMvoeGY7xMQ0Xk/0f7qO3/eVvSQsRUR2LIiFdAvwyYu
+a/GRspBl9JrmkO5K
+-----END CERTIFICATE-----
+
+================================================================
+C: US
+O: GTE Corporation
+OU: GTE CyberTrust Solutions, Inc.
+CN: GTE CyberTrust Global Root
+--
+Not Before: 1998-08-13
+Not After:  2018-08-13
+Signature: md5WithRSAEncryption
+Key: RSA:1024
+-----BEGIN CERTIFICATE-----
+MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD
+VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
+bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv
+b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV
+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
+cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
+b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH
+iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS
+r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4
+04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r
+GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9
+3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P
+lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
+-----END CERTIFICATE-----
diff --git a/htdocs/includes/stripe/data/test.png b/htdocs/includes/stripe/data/test.png
new file mode 100644
index 0000000000000000000000000000000000000000..1914264c08781d1f30ee0b8482bccf44586f2dc1
GIT binary patch
literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga%mF?ju0VQumF+E%TuG2$FoVOh
l8)-lem#2$k2*>s01R$G<f$@>z9%CSj!PC{xWt~$(697H@6ZHT9

literal 0
HcmV?d00001

diff --git a/htdocs/includes/stripe/init.php b/htdocs/includes/stripe/init.php
new file mode 100644
index 00000000000..3e7f93e4e85
--- /dev/null
+++ b/htdocs/includes/stripe/init.php
@@ -0,0 +1,73 @@
+<?php
+
+// Stripe singleton
+require(dirname(__FILE__) . '/lib/Stripe.php');
+
+// Utilities
+require(dirname(__FILE__) . '/lib/Util/AutoPagingIterator.php');
+require(dirname(__FILE__) . '/lib/Util/RequestOptions.php');
+require(dirname(__FILE__) . '/lib/Util/Set.php');
+require(dirname(__FILE__) . '/lib/Util/Util.php');
+
+// HttpClient
+require(dirname(__FILE__) . '/lib/HttpClient/ClientInterface.php');
+require(dirname(__FILE__) . '/lib/HttpClient/CurlClient.php');
+
+// Errors
+require(dirname(__FILE__) . '/lib/Error/Base.php');
+require(dirname(__FILE__) . '/lib/Error/Api.php');
+require(dirname(__FILE__) . '/lib/Error/ApiConnection.php');
+require(dirname(__FILE__) . '/lib/Error/Authentication.php');
+require(dirname(__FILE__) . '/lib/Error/Card.php');
+require(dirname(__FILE__) . '/lib/Error/InvalidRequest.php');
+require(dirname(__FILE__) . '/lib/Error/Permission.php');
+require(dirname(__FILE__) . '/lib/Error/RateLimit.php');
+
+// Plumbing
+require(dirname(__FILE__) . '/lib/ApiResponse.php');
+require(dirname(__FILE__) . '/lib/JsonSerializable.php');
+require(dirname(__FILE__) . '/lib/StripeObject.php');
+require(dirname(__FILE__) . '/lib/ApiRequestor.php');
+require(dirname(__FILE__) . '/lib/ApiResource.php');
+require(dirname(__FILE__) . '/lib/SingletonApiResource.php');
+require(dirname(__FILE__) . '/lib/AttachedObject.php');
+require(dirname(__FILE__) . '/lib/ExternalAccount.php');
+
+// Stripe API Resources
+require(dirname(__FILE__) . '/lib/Account.php');
+require(dirname(__FILE__) . '/lib/AlipayAccount.php');
+require(dirname(__FILE__) . '/lib/ApplePayDomain.php');
+require(dirname(__FILE__) . '/lib/ApplicationFee.php');
+require(dirname(__FILE__) . '/lib/ApplicationFeeRefund.php');
+require(dirname(__FILE__) . '/lib/Balance.php');
+require(dirname(__FILE__) . '/lib/BalanceTransaction.php');
+require(dirname(__FILE__) . '/lib/BankAccount.php');
+require(dirname(__FILE__) . '/lib/BitcoinReceiver.php');
+require(dirname(__FILE__) . '/lib/BitcoinTransaction.php');
+require(dirname(__FILE__) . '/lib/Card.php');
+require(dirname(__FILE__) . '/lib/Charge.php');
+require(dirname(__FILE__) . '/lib/Collection.php');
+require(dirname(__FILE__) . '/lib/CountrySpec.php');
+require(dirname(__FILE__) . '/lib/Coupon.php');
+require(dirname(__FILE__) . '/lib/Customer.php');
+require(dirname(__FILE__) . '/lib/Dispute.php');
+require(dirname(__FILE__) . '/lib/Event.php');
+require(dirname(__FILE__) . '/lib/FileUpload.php');
+require(dirname(__FILE__) . '/lib/Invoice.php');
+require(dirname(__FILE__) . '/lib/InvoiceItem.php');
+require(dirname(__FILE__) . '/lib/Order.php');
+require(dirname(__FILE__) . '/lib/OrderReturn.php');
+require(dirname(__FILE__) . '/lib/Payout.php');
+require(dirname(__FILE__) . '/lib/Plan.php');
+require(dirname(__FILE__) . '/lib/Product.php');
+require(dirname(__FILE__) . '/lib/Recipient.php');
+require(dirname(__FILE__) . '/lib/RecipientTransfer.php');
+require(dirname(__FILE__) . '/lib/Refund.php');
+require(dirname(__FILE__) . '/lib/SKU.php');
+require(dirname(__FILE__) . '/lib/Source.php');
+require(dirname(__FILE__) . '/lib/Subscription.php');
+require(dirname(__FILE__) . '/lib/SubscriptionItem.php');
+require(dirname(__FILE__) . '/lib/ThreeDSecure.php');
+require(dirname(__FILE__) . '/lib/Token.php');
+require(dirname(__FILE__) . '/lib/Transfer.php');
+require(dirname(__FILE__) . '/lib/TransferReversal.php');
diff --git a/htdocs/includes/stripe/lib/Account.php b/htdocs/includes/stripe/lib/Account.php
new file mode 100644
index 00000000000..3899b8233a6
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Account.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Account
+ *
+ * @property string $id
+ * @property string $object
+ * @property mixed $business_logo
+ * @property string $business_name
+ * @property mixed $business_url
+ * @property bool $charges_enabled
+ * @property string $country
+ * @property bool $debit_negative_balances
+ * @property mixed $decline_charge_on
+ * @property string $default_currency
+ * @property bool $details_submitted
+ * @property string $display_name
+ * @property string $email
+ * @property mixed $external_accounts
+ * @property mixed $legal_entity
+ * @property bool $managed
+ * @property mixed $payout_schedule
+ * @property mixed $payout_statement_descriptor
+ * @property bool $payouts_enabled
+ * @property mixed $product_description
+ * @property mixed $statement_descriptor
+ * @property mixed $support_email
+ * @property mixed $support_phone
+ * @property string $timezone
+ * @property mixed $tos_acceptance
+ * @property mixed $verification
+ * @property mixed $keys
+ *
+ * @package Stripe
+ */
+class Account extends ApiResource
+{
+    public function instanceUrl()
+    {
+        if ($this['id'] === null) {
+            return '/v1/account';
+        } else {
+            return parent::instanceUrl();
+        }
+    }
+
+    /**
+     * @param string|null $id
+     * @param array|string|null $opts
+     *
+     * @return Account
+     */
+    public static function retrieve($id = null, $opts = null)
+    {
+        if (!$opts && is_string($id) && substr($id, 0, 3) === 'sk_') {
+            $opts = $id;
+            $id = null;
+        }
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Account
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the account to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Account The updated account.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Account
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Account The deleted account.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Account The rejected account.
+     */
+    public function reject($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/reject';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Accounts
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/AlipayAccount.php b/htdocs/includes/stripe/lib/AlipayAccount.php
new file mode 100644
index 00000000000..1ba34bfa646
--- /dev/null
+++ b/htdocs/includes/stripe/lib/AlipayAccount.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class AlipayAccount
+ *
+ * @package Stripe
+ */
+class AlipayAccount extends ExternalAccount
+{
+
+}
diff --git a/htdocs/includes/stripe/lib/ApiRequestor.php b/htdocs/includes/stripe/lib/ApiRequestor.php
new file mode 100644
index 00000000000..03c718f4e1e
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApiRequestor.php
@@ -0,0 +1,292 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ApiRequestor
+ *
+ * @package Stripe
+ */
+class ApiRequestor
+{
+    private $_apiKey;
+
+    private $_apiBase;
+
+    private static $_httpClient;
+
+    public function __construct($apiKey = null, $apiBase = null)
+    {
+        $this->_apiKey = $apiKey;
+        if (!$apiBase) {
+            $apiBase = Stripe::$apiBase;
+        }
+        $this->_apiBase = $apiBase;
+    }
+
+    private static function _encodeObjects($d)
+    {
+        if ($d instanceof ApiResource) {
+            return Util\Util::utf8($d->id);
+        } elseif ($d === true) {
+            return 'true';
+        } elseif ($d === false) {
+            return 'false';
+        } elseif (is_array($d)) {
+            $res = array();
+            foreach ($d as $k => $v) {
+                $res[$k] = self::_encodeObjects($v);
+            }
+            return $res;
+        } else {
+            return Util\Util::utf8($d);
+        }
+    }
+
+    /**
+     * @param string $method
+     * @param string $url
+     * @param array|null $params
+     * @param array|null $headers
+     *
+     * @return array An array whose first element is an API response and second
+     *    element is the API key used to make the request.
+     */
+    public function request($method, $url, $params = null, $headers = null)
+    {
+        if (!$params) {
+            $params = array();
+        }
+        if (!$headers) {
+            $headers = array();
+        }
+        list($rbody, $rcode, $rheaders, $myApiKey) =
+        $this->_requestRaw($method, $url, $params, $headers);
+        $json = $this->_interpretResponse($rbody, $rcode, $rheaders);
+        $resp = new ApiResponse($rbody, $rcode, $rheaders, $json);
+        return array($resp, $myApiKey);
+    }
+
+    /**
+     * @param string $rbody A JSON string.
+     * @param int $rcode
+     * @param array $rheaders
+     * @param array $resp
+     *
+     * @throws Error\InvalidRequest if the error is caused by the user.
+     * @throws Error\Authentication if the error is caused by a lack of
+     *    permissions.
+     * @throws Error\Permission if the error is caused by insufficient
+     *    permissions.
+     * @throws Error\Card if the error is the error code is 402 (payment
+     *    required)
+     * @throws Error\RateLimit if the error is caused by too many requests
+     *    hitting the API.
+     * @throws Error\Api otherwise.
+     */
+    public function handleApiError($rbody, $rcode, $rheaders, $resp)
+    {
+        if (!is_array($resp) || !isset($resp['error'])) {
+            $msg = "Invalid response object from API: $rbody "
+              . "(HTTP response code was $rcode)";
+            throw new Error\Api($msg, $rcode, $rbody, $resp, $rheaders);
+        }
+
+        $error = $resp['error'];
+        $msg = isset($error['message']) ? $error['message'] : null;
+        $param = isset($error['param']) ? $error['param'] : null;
+        $code = isset($error['code']) ? $error['code'] : null;
+
+        switch ($rcode) {
+            case 400:
+                // 'rate_limit' code is deprecated, but left here for backwards compatibility
+                // for API versions earlier than 2015-09-08
+                if ($code == 'rate_limit') {
+                    throw new Error\RateLimit($msg, $param, $rcode, $rbody, $resp, $rheaders);
+                }
+
+                // intentional fall-through
+            case 404:
+                throw new Error\InvalidRequest($msg, $param, $rcode, $rbody, $resp, $rheaders);
+            case 401:
+                throw new Error\Authentication($msg, $rcode, $rbody, $resp, $rheaders);
+            case 402:
+                throw new Error\Card($msg, $param, $code, $rcode, $rbody, $resp, $rheaders);
+            case 403:
+                throw new Error\Permission($msg, $rcode, $rbody, $resp, $rheaders);
+            case 429:
+                throw new Error\RateLimit($msg, $param, $rcode, $rbody, $resp, $rheaders);
+            default:
+                throw new Error\Api($msg, $rcode, $rbody, $resp, $rheaders);
+        }
+    }
+
+    private static function _formatAppInfo($appInfo)
+    {
+        if ($appInfo !== null) {
+            $string = $appInfo['name'];
+            if ($appInfo['version'] !== null) {
+                $string .= '/' . $appInfo['version'];
+            }
+            if ($appInfo['url'] !== null) {
+                $string .= ' (' . $appInfo['url'] . ')';
+            }
+            return $string;
+        } else {
+            return null;
+        }
+    }
+
+    private static function _defaultHeaders($apiKey)
+    {
+        $appInfo = Stripe::getAppInfo();
+
+        $uaString = 'Stripe/v1 PhpBindings/' . Stripe::VERSION;
+
+        $langVersion = phpversion();
+        $uname = php_uname();
+
+        $httplib = 'unknown';
+        $ssllib = 'unknown';
+
+        if (function_exists('curl_version')) {
+            $curlVersion = curl_version();
+            $httplib = 'curl ' . $curlVersion['version'];
+            $ssllib = $curlVersion['ssl_version'];
+        }
+
+        $appInfo = Stripe::getAppInfo();
+        $ua = array(
+            'bindings_version' => Stripe::VERSION,
+            'lang' => 'php',
+            'lang_version' => $langVersion,
+            'publisher' => 'stripe',
+            'uname' => $uname,
+            'httplib' => $httplib,
+            'ssllib' => $ssllib,
+        );
+        if ($appInfo !== null) {
+            $uaString .= ' ' . self::_formatAppInfo($appInfo);
+            $ua['application'] = $appInfo;
+        }
+
+        $defaultHeaders = array(
+            'X-Stripe-Client-User-Agent' => json_encode($ua),
+            'User-Agent' => $uaString,
+            'Authorization' => 'Bearer ' . $apiKey,
+        );
+        return $defaultHeaders;
+    }
+
+    private function _requestRaw($method, $url, $params, $headers)
+    {
+        $myApiKey = $this->_apiKey;
+        if (!$myApiKey) {
+            $myApiKey = Stripe::$apiKey;
+        }
+
+        if (!$myApiKey) {
+            $msg = 'No API key provided.  (HINT: set your API key using '
+              . '"Stripe::setApiKey(<API-KEY>)".  You can generate API keys from '
+              . 'the Stripe web interface.  See https://stripe.com/api for '
+              . 'details, or email support@stripe.com if you have any questions.';
+            throw new Error\Authentication($msg);
+        }
+
+        $absUrl = $this->_apiBase.$url;
+        $params = self::_encodeObjects($params);
+        $defaultHeaders = $this->_defaultHeaders($myApiKey);
+        if (Stripe::$apiVersion) {
+            $defaultHeaders['Stripe-Version'] = Stripe::$apiVersion;
+        }
+
+        if (Stripe::$accountId) {
+            $defaultHeaders['Stripe-Account'] = Stripe::$accountId;
+        }
+
+        $hasFile = false;
+        $hasCurlFile = class_exists('\CURLFile', false);
+        foreach ($params as $k => $v) {
+            if (is_resource($v)) {
+                $hasFile = true;
+                $params[$k] = self::_processResourceParam($v, $hasCurlFile);
+            } elseif ($hasCurlFile && $v instanceof \CURLFile) {
+                $hasFile = true;
+            }
+        }
+
+        if ($hasFile) {
+            $defaultHeaders['Content-Type'] = 'multipart/form-data';
+        } else {
+            $defaultHeaders['Content-Type'] = 'application/x-www-form-urlencoded';
+        }
+
+        $combinedHeaders = array_merge($defaultHeaders, $headers);
+        $rawHeaders = array();
+
+        foreach ($combinedHeaders as $header => $value) {
+            $rawHeaders[] = $header . ': ' . $value;
+        }
+
+        list($rbody, $rcode, $rheaders) = $this->httpClient()->request(
+            $method,
+            $absUrl,
+            $rawHeaders,
+            $params,
+            $hasFile
+        );
+        return array($rbody, $rcode, $rheaders, $myApiKey);
+    }
+
+    private function _processResourceParam($resource, $hasCurlFile)
+    {
+        if (get_resource_type($resource) !== 'stream') {
+            throw new Error\Api(
+                'Attempted to upload a resource that is not a stream'
+            );
+        }
+
+        $metaData = stream_get_meta_data($resource);
+        if ($metaData['wrapper_type'] !== 'plainfile') {
+            throw new Error\Api(
+                'Only plainfile resource streams are supported'
+            );
+        }
+
+        if ($hasCurlFile) {
+            // We don't have the filename or mimetype, but the API doesn't care
+            return new \CURLFile($metaData['uri']);
+        } else {
+            return '@'.$metaData['uri'];
+        }
+    }
+
+    private function _interpretResponse($rbody, $rcode, $rheaders)
+    {
+        $resp = json_decode($rbody, true);
+        $jsonError = json_last_error();
+        if ($resp === null && $jsonError !== JSON_ERROR_NONE) {
+            $msg = "Invalid response body from API: $rbody "
+              . "(HTTP response code was $rcode, json_last_error() was $jsonError)";
+            throw new Error\Api($msg, $rcode, $rbody);
+        }
+
+        if ($rcode < 200 || $rcode >= 300) {
+            $this->handleApiError($rbody, $rcode, $rheaders, $resp);
+        }
+        return $resp;
+    }
+
+    public static function setHttpClient($client)
+    {
+        self::$_httpClient = $client;
+    }
+
+    private function httpClient()
+    {
+        if (!self::$_httpClient) {
+            self::$_httpClient = HttpClient\CurlClient::instance();
+        }
+        return self::$_httpClient;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ApiResource.php b/htdocs/includes/stripe/lib/ApiResource.php
new file mode 100644
index 00000000000..0c03d49c3b9
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApiResource.php
@@ -0,0 +1,203 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ApiResource
+ *
+ * @package Stripe
+ */
+abstract class ApiResource extends StripeObject
+{
+    private static $HEADERS_TO_PERSIST = array('Stripe-Account' => true, 'Stripe-Version' => true);
+
+    public static function baseUrl()
+    {
+        return Stripe::$apiBase;
+    }
+
+    /**
+     * @return ApiResource The refreshed resource.
+     */
+    public function refresh()
+    {
+        $requestor = new ApiRequestor($this->_opts->apiKey, static::baseUrl());
+        $url = $this->instanceUrl();
+
+        list($response, $this->_opts->apiKey) = $requestor->request(
+            'get',
+            $url,
+            $this->_retrieveOptions,
+            $this->_opts->headers
+        );
+        $this->setLastResponse($response);
+        $this->refreshFrom($response->json, $this->_opts);
+        return $this;
+    }
+
+    /**
+     * @return string The name of the class, with namespacing and underscores
+     *    stripped.
+     */
+    public static function className()
+    {
+        $class = get_called_class();
+        // Useful for namespaces: Foo\Charge
+        if ($postfixNamespaces = strrchr($class, '\\')) {
+            $class = substr($postfixNamespaces, 1);
+        }
+        // Useful for underscored 'namespaces': Foo_Charge
+        if ($postfixFakeNamespaces = strrchr($class, '')) {
+            $class = $postfixFakeNamespaces;
+        }
+        if (substr($class, 0, strlen('Stripe')) == 'Stripe') {
+            $class = substr($class, strlen('Stripe'));
+        }
+        $class = str_replace('_', '', $class);
+        $name = urlencode($class);
+        $name = strtolower($name);
+        return $name;
+    }
+
+    /**
+     * @return string The endpoint URL for the given class.
+     */
+    public static function classUrl()
+    {
+        $base = static::className();
+        return "/v1/${base}s";
+    }
+
+    /**
+     * @return string The instance endpoint URL for the given class.
+     */
+    public static function resourceUrl($id)
+    {
+        if ($id === null) {
+            $class = get_called_class();
+            $message = "Could not determine which URL to request: "
+               . "$class instance has invalid ID: $id";
+            throw new Error\InvalidRequest($message, null);
+        }
+        $id = Util\Util::utf8($id);
+        $base = static::classUrl();
+        $extn = urlencode($id);
+        return "$base/$extn";
+    }
+
+    /**
+     * @return string The full API URL for this API resource.
+     */
+    public function instanceUrl()
+    {
+        return static::resourceUrl($this['id']);
+    }
+
+    protected static function _validateParams($params = null)
+    {
+        if ($params && !is_array($params)) {
+            $message = "You must pass an array as the first argument to Stripe API "
+               . "method calls.  (HINT: an example call to create a charge "
+               . "would be: \"Stripe\\Charge::create(array('amount' => 100, "
+               . "'currency' => 'usd', 'card' => array('number' => "
+               . "4242424242424242, 'exp_month' => 5, 'exp_year' => 2015)))\")";
+            throw new Error\Api($message);
+        }
+    }
+
+    protected function _request($method, $url, $params = array(), $options = null)
+    {
+        $opts = $this->_opts->merge($options);
+        list($resp, $options) = static::_staticRequest($method, $url, $params, $opts);
+        $this->setLastResponse($resp);
+        return array($resp->json, $options);
+    }
+
+    protected static function _staticRequest($method, $url, $params, $options)
+    {
+        $opts = Util\RequestOptions::parse($options);
+        $requestor = new ApiRequestor($opts->apiKey, static::baseUrl());
+        list($response, $opts->apiKey) = $requestor->request($method, $url, $params, $opts->headers);
+        foreach ($opts->headers as $k => $v) {
+            if (!array_key_exists($k, self::$HEADERS_TO_PERSIST)) {
+                unset($opts->headers[$k]);
+            }
+        }
+        return array($response, $opts);
+    }
+
+    protected static function _retrieve($id, $options = null)
+    {
+        $opts = Util\RequestOptions::parse($options);
+        $instance = new static($id, $opts);
+        $instance->refresh();
+        return $instance;
+    }
+
+    protected static function _all($params = null, $options = null)
+    {
+        self::_validateParams($params);
+        $url = static::classUrl();
+
+        list($response, $opts) = static::_staticRequest('get', $url, $params, $options);
+        $obj = Util\Util::convertToStripeObject($response->json, $opts);
+        if (!is_a($obj, 'Stripe\\Collection')) {
+            $class = get_class($obj);
+            $message = "Expected type \"Stripe\\Collection\", got \"$class\" instead";
+            throw new Error\Api($message);
+        }
+        $obj->setLastResponse($response);
+        $obj->setRequestParams($params);
+        return $obj;
+    }
+
+    protected static function _create($params = null, $options = null)
+    {
+        self::_validateParams($params);
+        $url = static::classUrl();
+
+        list($response, $opts) = static::_staticRequest('post', $url, $params, $options);
+        $obj = Util\Util::convertToStripeObject($response->json, $opts);
+        $obj->setLastResponse($response);
+        return $obj;
+    }
+
+    /**
+     * @param string $id The ID of the API resource to update.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApiResource the updated API resource
+     */
+    protected static function _update($id, $params = null, $options = null)
+    {
+        self::_validateParams($params);
+        $url = static::resourceUrl($id);
+
+        list($response, $opts) = static::_staticRequest('post', $url, $params, $options);
+        $obj = Util\Util::convertToStripeObject($response->json, $opts);
+        $obj->setLastResponse($response);
+        return $obj;
+    }
+
+    protected function _save($options = null)
+    {
+        $params = $this->serializeParameters();
+        if (count($params) > 0) {
+            $url = $this->instanceUrl();
+            list($response, $opts) = $this->_request('post', $url, $params, $options);
+            $this->refreshFrom($response, $opts);
+        }
+        return $this;
+    }
+
+    protected function _delete($params = null, $options = null)
+    {
+        self::_validateParams($params);
+
+        $url = $this->instanceUrl();
+        list($response, $opts) = $this->_request('delete', $url, $params, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ApiResponse.php b/htdocs/includes/stripe/lib/ApiResponse.php
new file mode 100644
index 00000000000..31f54a50df0
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApiResponse.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ApiResponse
+ *
+ * @package Stripe
+ */
+class ApiResponse
+{
+    public $headers;
+    public $body;
+    public $json;
+    public $code;
+
+    /**
+     * @param string $body
+     * @param integer $code
+     * @param array|null $headers
+     * @param array|null $json
+     *
+     * @return obj An APIResponse
+     */
+    public function __construct($body, $code, $headers, $json)
+    {
+        $this->body = $body;
+        $this->code = $code;
+        $this->headers = $headers;
+        $this->json = $json;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ApplePayDomain.php b/htdocs/includes/stripe/lib/ApplePayDomain.php
new file mode 100644
index 00000000000..8c522c8b933
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApplePayDomain.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ApplePayDomain
+ *
+ * @package Stripe
+ */
+class ApplePayDomain extends ApiResource
+{
+    
+    /**
+     * @return string The class URL for this resource. It needs to be special
+     *    cased because it doesn't fit into the standard resource pattern.
+     */
+    public static function classUrl()
+    {
+        return '/v1/apple_pay/domains';
+    }
+
+    /**
+     * @param string $id The ID of the domain to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return ApplePayDomain
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApplePayDomain The created domain.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApplePayDomain The deleted domain.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of ApplePayDomains
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ApplicationFee.php b/htdocs/includes/stripe/lib/ApplicationFee.php
new file mode 100644
index 00000000000..8145541c17e
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApplicationFee.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ApplicationFee
+ *
+ * @package Stripe
+ */
+class ApplicationFee extends ApiResource
+{
+    /**
+     * This is a special case because the application fee endpoint has an
+     *    underscore in it. The parent `className` function strips underscores.
+     *
+     * @return string The name of the class.
+     */
+    public static function className()
+    {
+        return 'application_fee';
+    }
+
+    /**
+     * @param string $id The ID of the application fee to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return ApplicationFee
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the application fee to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return ApplicationFee The updated application fee.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of ApplicationFees
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApplicationFee The refunded application fee.
+     */
+    public function refund($params = null, $opts = null)
+    {
+        $this->refunds->create($params, $opts);
+        $this->refresh();
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ApplicationFeeRefund.php b/htdocs/includes/stripe/lib/ApplicationFeeRefund.php
new file mode 100644
index 00000000000..44695ef88cd
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ApplicationFeeRefund.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ApplicationFeeRefund
+ *
+ * @package Stripe
+ */
+class ApplicationFeeRefund extends ApiResource
+{
+    /**
+     * @return string The API URL for this Stripe refund.
+     */
+    public function instanceUrl()
+    {
+        $id = $this['id'];
+        $fee = $this['fee'];
+        if (!$id) {
+            throw new Error\InvalidRequest(
+                "Could not determine which URL to request: " .
+                "class instance has invalid ID: $id",
+                null
+            );
+        }
+        $id = Util\Util::utf8($id);
+        $fee = Util\Util::utf8($fee);
+
+        $base = ApplicationFee::classUrl();
+        $feeExtn = urlencode($fee);
+        $extn = urlencode($id);
+        return "$base/$feeExtn/refunds/$extn";
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return ApplicationFeeRefund The saved refund.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/AttachedObject.php b/htdocs/includes/stripe/lib/AttachedObject.php
new file mode 100644
index 00000000000..489517d6693
--- /dev/null
+++ b/htdocs/includes/stripe/lib/AttachedObject.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class AttachedObject
+ *
+ * e.g. metadata on Stripe objects.
+ *
+ * @package Stripe
+ */
+class AttachedObject extends StripeObject
+{
+    /**
+     * Updates this object.
+     *
+     * @param array $properties A mapping of properties to update on this object.
+     */
+    public function replaceWith($properties)
+    {
+        $removed = array_diff(array_keys($this->_values), array_keys($properties));
+        // Don't unset, but rather set to null so we send up '' for deletion.
+        foreach ($removed as $k) {
+            $this->$k = null;
+        }
+
+        foreach ($properties as $k => $v) {
+            $this->$k = $v;
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Balance.php b/htdocs/includes/stripe/lib/Balance.php
new file mode 100644
index 00000000000..3b551eb84df
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Balance.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Balance
+ *
+ * @property string $object
+ * @property mixed $available
+ * @property bool $livedmode
+ * @property mixed $pending
+ *
+ * @package Stripe
+ */
+class Balance extends SingletonApiResource
+{
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Balance
+     */
+    public static function retrieve($opts = null)
+    {
+        return self::_singletonRetrieve($opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/BalanceTransaction.php b/htdocs/includes/stripe/lib/BalanceTransaction.php
new file mode 100644
index 00000000000..b84619ece81
--- /dev/null
+++ b/htdocs/includes/stripe/lib/BalanceTransaction.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class BalanceTransaction
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property int $available_on
+ * @property int $created
+ * @property string $currency
+ * @property string $description
+ * @property int $fee
+ * @property mixed $fee_details
+ * @property int $net
+ * @property string $source
+ * @property mixed $sourced_transfers
+ * @property string $status
+ * @property string $type
+ *
+ * @package Stripe
+ */
+class BalanceTransaction extends ApiResource
+{
+    /**
+     * @return string The class URL for this resource. It needs to be special
+     *    cased because it doesn't fit into the standard resource pattern.
+     */
+    public static function classUrl()
+    {
+        return "/v1/balance/history";
+    }
+
+    /**
+     * @param string $id The ID of the balance transaction to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return BalanceTransaction
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of BalanceTransactions
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/BankAccount.php b/htdocs/includes/stripe/lib/BankAccount.php
new file mode 100644
index 00000000000..2f11c067c36
--- /dev/null
+++ b/htdocs/includes/stripe/lib/BankAccount.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class BankAccount
+ *
+ * @package Stripe
+ */
+class BankAccount extends ExternalAccount
+{
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return BankAccount The verified bank account.
+     */
+    public function verify($params = null, $options = null)
+    {
+        $url = $this->instanceUrl() . '/verify';
+        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/BitcoinReceiver.php b/htdocs/includes/stripe/lib/BitcoinReceiver.php
new file mode 100644
index 00000000000..3f2c835b96f
--- /dev/null
+++ b/htdocs/includes/stripe/lib/BitcoinReceiver.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class BitcoinReceiver
+ *
+ * @package Stripe
+ */
+class BitcoinReceiver extends ExternalAccount
+{
+    /**
+     * @return string The class URL for this resource. It needs to be special
+     *    cased because it doesn't fit into the standard resource pattern.
+     */
+    public static function classUrl()
+    {
+        return "/v1/bitcoin/receivers";
+    }
+
+    /**
+     * @return string The instance URL for this resource. It needs to be special
+     *    cased because it doesn't fit into the standard resource pattern.
+     */
+    public function instanceUrl()
+    {
+        $result = parent::instanceUrl();
+        if ($result) {
+            return $result;
+        } else {
+            $id = $this['id'];
+            $id = Util\Util::utf8($id);
+            $extn = urlencode($id);
+            $base = BitcoinReceiver::classUrl();
+            return "$base/$extn";
+        }
+    }
+
+    /**
+     * @param string $id The ID of the Bitcoin Receiver to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return BitcoinReceiver
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of BitcoinReceivers
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return BitcoinReceiver The created Bitcoin Receiver item.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return BitcoinReceiver The refunded Bitcoin Receiver item.
+     */
+    public function refund($params = null, $options = null)
+    {
+        $url = $this->instanceUrl() . '/refund';
+        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/BitcoinTransaction.php b/htdocs/includes/stripe/lib/BitcoinTransaction.php
new file mode 100644
index 00000000000..6b8e5421124
--- /dev/null
+++ b/htdocs/includes/stripe/lib/BitcoinTransaction.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class BitcoinTransaction
+ *
+ * @package Stripe
+ */
+class BitcoinTransaction extends ApiResource
+{
+
+}
diff --git a/htdocs/includes/stripe/lib/Card.php b/htdocs/includes/stripe/lib/Card.php
new file mode 100644
index 00000000000..227bee13873
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Card.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Card
+ *
+ * @package Stripe
+ */
+class Card extends ExternalAccount
+{
+
+}
diff --git a/htdocs/includes/stripe/lib/Charge.php b/htdocs/includes/stripe/lib/Charge.php
new file mode 100644
index 00000000000..ab1d5a33f8a
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Charge.php
@@ -0,0 +1,184 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Charge
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property int $amount_refunded
+ * @property mixed $application_fee
+ * @property string $balance_transaction
+ * @property bool $captured
+ * @property int $created
+ * @property string $currency
+ * @property string $customer
+ * @property mixed $description
+ * @property mixed $destination
+ * @property string|null $dispute
+ * @property mixed $failure_code
+ * @property mixed $failure_message
+ * @property mixed $fraud_details
+ * @property mixed $invoice
+ * @property bool $livemode
+ * @property mixed $metadata
+ * @property mixed $order
+ * @property bool $paid
+ * @property mixed $receipt_email
+ * @property mixed $receipt_number
+ * @property bool $refunded
+ * @property mixed $refunds
+ * @property mixed $shipping
+ * @property mixed $source
+ * @property mixed $source_transfer
+ * @property mixed $statement_descriptor
+ * @property string $status
+ *
+ * @package Stripe
+ */
+class Charge extends ApiResource
+{
+    /**
+     * @param string $id The ID of the charge to retrieve.
+     * @param array|string|null $options
+     *
+     * @return Charge
+     */
+    public static function retrieve($id, $options = null)
+    {
+        return self::_retrieve($id, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Collection of Charges
+     */
+    public static function all($params = null, $options = null)
+    {
+        return self::_all($params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Charge The created charge.
+     */
+    public static function create($params = null, $options = null)
+    {
+        return self::_create($params, $options);
+    }
+
+    /**
+     * @param string $id The ID of the charge to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Charge The updated charge.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $options
+     *
+     * @return Charge The saved charge.
+     */
+    public function save($options = null)
+    {
+        return $this->_save($options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Charge The refunded charge.
+     */
+    public function refund($params = null, $options = null)
+    {
+        $url = $this->instanceUrl() . '/refund';
+        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Charge The captured charge.
+     */
+    public function capture($params = null, $options = null)
+    {
+        $url = $this->instanceUrl() . '/capture';
+        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @deprecated Use the `save` method on the Dispute object
+     *
+     * @return array The updated dispute.
+     */
+    public function updateDispute($params = null, $options = null)
+    {
+        $url = $this->instanceUrl() . '/dispute';
+        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        $this->refreshFrom(array('dispute' => $response), $opts, true);
+        return $this->dispute;
+    }
+
+    /**
+     * @param array|string|null $options
+     *
+     * @deprecated Use the `close` method on the Dispute object
+     *
+     * @return Charge The updated charge.
+     */
+    public function closeDispute($options = null)
+    {
+        $url = $this->instanceUrl() . '/dispute/close';
+        list($response, $opts) = $this->_request('post', $url, null, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Charge The updated charge.
+     */
+    public function markAsFraudulent($opts = null)
+    {
+        $params = array('fraud_details' => array('user_report' => 'fraudulent'));
+        $url = $this->instanceUrl();
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Charge The updated charge.
+     */
+    public function markAsSafe($opts = null)
+    {
+        $params = array('fraud_details' => array('user_report' => 'safe'));
+        $url = $this->instanceUrl();
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Collection.php b/htdocs/includes/stripe/lib/Collection.php
new file mode 100644
index 00000000000..0beb3a18918
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Collection.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Collection
+ *
+ * @property string $object
+ * @property string $url
+ * @property bool $has_more
+ * @property mixed $data
+ *
+ * @package Stripe
+ */
+class Collection extends ApiResource
+{
+    protected $_requestParams = array();
+
+    public function setRequestParams($params)
+    {
+        $this->_requestParams = $params;
+    }
+
+    public function all($params = null, $opts = null)
+    {
+        list($url, $params) = $this->extractPathAndUpdateParams($params);
+
+        list($response, $opts) = $this->_request('get', $url, $params, $opts);
+        $this->_requestParams = $params;
+        return Util\Util::convertToStripeObject($response, $opts);
+    }
+
+    public function create($params = null, $opts = null)
+    {
+        list($url, $params) = $this->extractPathAndUpdateParams($params);
+
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->_requestParams = $params;
+        return Util\Util::convertToStripeObject($response, $opts);
+    }
+
+    public function retrieve($id, $params = null, $opts = null)
+    {
+        list($url, $params) = $this->extractPathAndUpdateParams($params);
+
+        $id = Util\Util::utf8($id);
+        $extn = urlencode($id);
+        list($response, $opts) = $this->_request(
+            'get',
+            "$url/$extn",
+            $params,
+            $opts
+        );
+        $this->_requestParams = $params;
+        return Util\Util::convertToStripeObject($response, $opts);
+    }
+
+    /**
+     * @return AutoPagingIterator An iterator that can be used to iterate
+     *    across all objects across all pages. As page boundaries are
+     *    encountered, the next page will be fetched automatically for
+     *    continued iteration.
+     */
+    public function autoPagingIterator()
+    {
+        return new Util\AutoPagingIterator($this, $this->_requestParams);
+    }
+
+    private function extractPathAndUpdateParams($params)
+    {
+        $url = parse_url($this->url);
+        if (!isset($url['path'])) {
+            throw new Error\Api("Could not parse list url into parts: $url");
+        }
+
+        if (isset($url['query'])) {
+            // If the URL contains a query param, parse it out into $params so they
+            // don't interact weirdly with each other.
+            $query = array();
+            parse_str($url['query'], $query);
+            // PHP 5.2 doesn't support the ?: operator :(
+            $params = array_merge($params ? $params : array(), $query);
+        }
+
+        return array($url['path'], $params);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/CountrySpec.php b/htdocs/includes/stripe/lib/CountrySpec.php
new file mode 100644
index 00000000000..dabb88b4522
--- /dev/null
+++ b/htdocs/includes/stripe/lib/CountrySpec.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class CountrySpec
+ *
+ * @package Stripe
+ */
+class CountrySpec extends ApiResource
+{
+    /**
+     * This is a special case because the country specs endpoint has an
+     *    underscore in it. The parent `className` function strips underscores.
+     *
+     * @return string The name of the class.
+     */
+    public static function className()
+    {
+        return 'country_spec';
+    }
+
+    /**
+     * @param string $country The ISO country code of the country we retrieve the CountrySpec for.
+     * @param array|string|null $opts
+     *
+     * @return CountrySpec
+     */
+    public static function retrieve($country, $opts = null)
+    {
+        return self::_retrieve($country, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of CountrySpecs
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Coupon.php b/htdocs/includes/stripe/lib/Coupon.php
new file mode 100644
index 00000000000..079cc10b478
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Coupon.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Coupon
+ *
+ * @package Stripe
+ */
+class Coupon extends ApiResource
+{
+    /**
+     * @param string $id The ID of the coupon to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Coupon
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Coupon The created coupon.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the coupon to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Coupon The updated coupon.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Coupon The deleted coupon.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Coupon The saved coupon.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Coupons
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Customer.php b/htdocs/includes/stripe/lib/Customer.php
new file mode 100644
index 00000000000..1dfbfc6a16b
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Customer.php
@@ -0,0 +1,190 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Customer
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $account_balance
+ * @property string $business_vat_id
+ * @property string $created
+ * @property string $currency
+ * @property string $default_source
+ * @property bool $delinquent
+ * @property string $description
+ * @property mixed $discount
+ * @property string $email
+ * @property bool $livemode
+ * @property array $metadata
+ * @property mixed $shipping
+ * @property Collection $sources
+ * @property Collection $subscriptions
+ *
+ * @package Stripe
+ */
+class Customer extends ApiResource
+{
+    /**
+     * @param string $id The ID of the customer to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Customer
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Customers
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Customer The created customer.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the customer to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Customer The updated customer.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Customer The saved customer.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Customer The deleted customer.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return InvoiceItem The resulting invoice item.
+     */
+    public function addInvoiceItem($params = null)
+    {
+        if (!$params) {
+            $params = array();
+        }
+        $params['customer'] = $this->id;
+        $ii = InvoiceItem::create($params, $this->_opts);
+        return $ii;
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return array An array of the customer's Invoices.
+     */
+    public function invoices($params = null)
+    {
+        if (!$params) {
+            $params = array();
+        }
+        $params['customer'] = $this->id;
+        $invoices = Invoice::all($params, $this->_opts);
+        return $invoices;
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return array An array of the customer's InvoiceItems.
+     */
+    public function invoiceItems($params = null)
+    {
+        if (!$params) {
+            $params = array();
+        }
+        $params['customer'] = $this->id;
+        $iis = InvoiceItem::all($params, $this->_opts);
+        return $iis;
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return array An array of the customer's Charges.
+     */
+    public function charges($params = null)
+    {
+        if (!$params) {
+            $params = array();
+        }
+        $params['customer'] = $this->id;
+        $charges = Charge::all($params, $this->_opts);
+        return $charges;
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return Subscription The updated subscription.
+     */
+    public function updateSubscription($params = null)
+    {
+        $url = $this->instanceUrl() . '/subscription';
+        list($response, $opts) = $this->_request('post', $url, $params);
+        $this->refreshFrom(array('subscription' => $response), $opts, true);
+        return $this->subscription;
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return Subscription The cancelled subscription.
+     */
+    public function cancelSubscription($params = null)
+    {
+        $url = $this->instanceUrl() . '/subscription';
+        list($response, $opts) = $this->_request('delete', $url, $params);
+        $this->refreshFrom(array('subscription' => $response), $opts, true);
+        return $this->subscription;
+    }
+
+    /**
+     * @return Customer The updated customer.
+     */
+    public function deleteDiscount()
+    {
+        $url = $this->instanceUrl() . '/discount';
+        list($response, $opts) = $this->_request('delete', $url);
+        $this->refreshFrom(array('discount' => null), $opts, true);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Dispute.php b/htdocs/includes/stripe/lib/Dispute.php
new file mode 100644
index 00000000000..ce70d499b35
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Dispute.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Dispute
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property mixed $balance_transactions
+ * @property string $charge
+ * @property int $created
+ * @property string $currency
+ * @property mixed $evidence
+ * @property mixed $evidence_details
+ * @property bool $is_charge_refundable
+ * @property bool $livemode
+ * @property mixed $metadata
+ * @property string $reason
+ * @property string $status
+ *
+ * @package Stripe
+ */
+class Dispute extends ApiResource
+{
+    /**
+     * @param string $id The ID of the dispute to retrieve.
+     * @param array|string|null $options
+     *
+     * @return Dispute
+     */
+    public static function retrieve($id, $options = null)
+    {
+        return self::_retrieve($id, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return array An array of Disputes.
+     */
+    public static function all($params = null, $options = null)
+    {
+        return self::_all($params, $options);
+    }
+
+    /**
+     * @param string $id The ID of the dispute to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Dispute The updated dispute.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $options
+     *
+     * @return Dispute The saved charge.
+     */
+    public function save($options = null)
+    {
+        return $this->_save($options);
+    }
+
+    /**
+     * @param array|string|null $options
+     *
+     * @return Dispute The closed dispute.
+     */
+    public function close($options = null)
+    {
+        $url = $this->instanceUrl() . '/close';
+        list($response, $opts) = $this->_request('post', $url, null, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Error/Api.php b/htdocs/includes/stripe/lib/Error/Api.php
new file mode 100644
index 00000000000..dc7d069efde
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/Api.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Stripe\Error;
+
+class Api extends Base
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/ApiConnection.php b/htdocs/includes/stripe/lib/Error/ApiConnection.php
new file mode 100644
index 00000000000..06d097eac58
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/ApiConnection.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Stripe\Error;
+
+class ApiConnection extends Base
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/Authentication.php b/htdocs/includes/stripe/lib/Error/Authentication.php
new file mode 100644
index 00000000000..c50b4f09552
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/Authentication.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Stripe\Error;
+
+class Authentication extends Base
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/Base.php b/htdocs/includes/stripe/lib/Error/Base.php
new file mode 100644
index 00000000000..44106ecca50
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/Base.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Stripe\Error;
+
+use Exception;
+
+abstract class Base extends Exception
+{
+    public function __construct(
+        $message,
+        $httpStatus = null,
+        $httpBody = null,
+        $jsonBody = null,
+        $httpHeaders = null
+    ) {
+        parent::__construct($message);
+        $this->httpStatus = $httpStatus;
+        $this->httpBody = $httpBody;
+        $this->jsonBody = $jsonBody;
+        $this->httpHeaders = $httpHeaders;
+        $this->requestId = null;
+
+        if ($httpHeaders && isset($httpHeaders['Request-Id'])) {
+            $this->requestId = $httpHeaders['Request-Id'];
+        }
+    }
+
+    public function getHttpStatus()
+    {
+        return $this->httpStatus;
+    }
+
+    public function getHttpBody()
+    {
+        return $this->httpBody;
+    }
+
+    public function getJsonBody()
+    {
+        return $this->jsonBody;
+    }
+
+    public function getHttpHeaders()
+    {
+        return $this->httpHeaders;
+    }
+
+    public function getRequestId()
+    {
+        return $this->requestId;
+    }
+
+    public function __toString()
+    {
+        $id = $this->requestId ? " from API request '{$this->requestId}'": "";
+        $message = explode("\n", parent::__toString());
+        $message[0] .= $id;
+        return implode("\n", $message);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Error/Card.php b/htdocs/includes/stripe/lib/Error/Card.php
new file mode 100644
index 00000000000..9004db271e3
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/Card.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Stripe\Error;
+
+class Card extends Base
+{
+    public function __construct(
+        $message,
+        $stripeParam,
+        $stripeCode,
+        $httpStatus,
+        $httpBody,
+        $jsonBody,
+        $httpHeaders = null
+    ) {
+        parent::__construct($message, $httpStatus, $httpBody, $jsonBody, $httpHeaders);
+        $this->stripeParam = $stripeParam;
+        $this->stripeCode = $stripeCode;
+
+        // This one is not like the others because it was added later and we're
+        // trying to do our best not to change the public interface of this class'
+        // constructor. We should consider changing its implementation on the
+        // next major version bump of this library.
+        $this->declineCode = isset($jsonBody["error"]["decline_code"]) ? $jsonBody["error"]["decline_code"] : null;
+    }
+
+    public function getDeclineCode()
+    {
+        return $this->declineCode;
+    }
+
+    public function getStripeCode()
+    {
+        return $this->stripeCode;
+    }
+
+    public function getStripeParam()
+    {
+        return $this->stripeParam;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Error/InvalidRequest.php b/htdocs/includes/stripe/lib/Error/InvalidRequest.php
new file mode 100644
index 00000000000..493bc184cbd
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/InvalidRequest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Stripe\Error;
+
+class InvalidRequest extends Base
+{
+    public function __construct(
+        $message,
+        $stripeParam,
+        $httpStatus = null,
+        $httpBody = null,
+        $jsonBody = null,
+        $httpHeaders = null
+    ) {
+        parent::__construct($message, $httpStatus, $httpBody, $jsonBody, $httpHeaders);
+        $this->stripeParam = $stripeParam;
+    }
+
+    public function getStripeParam()
+    {
+        return $this->stripeParam;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Error/Permission.php b/htdocs/includes/stripe/lib/Error/Permission.php
new file mode 100644
index 00000000000..df2b7874842
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/Permission.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Stripe\Error;
+
+class Permission extends Base
+{
+}
diff --git a/htdocs/includes/stripe/lib/Error/RateLimit.php b/htdocs/includes/stripe/lib/Error/RateLimit.php
new file mode 100644
index 00000000000..2fa3be4ecdc
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Error/RateLimit.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Stripe\Error;
+
+class RateLimit extends InvalidRequest
+{
+}
diff --git a/htdocs/includes/stripe/lib/Event.php b/htdocs/includes/stripe/lib/Event.php
new file mode 100644
index 00000000000..6a1ed6c44ba
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Event.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Event
+ *
+ * @property string $id
+ * @property string $object
+ * @property string $api_version
+ * @property int $created
+ * @property mixed $data
+ * @property bool $livemode
+ * @property int $pending_webhooks
+ * @property string $request
+ * @property string $type
+ *
+ * @package Stripe
+ */
+class Event extends ApiResource
+{
+    /**
+     * @param string $id The ID of the event to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Event
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Events
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ExternalAccount.php b/htdocs/includes/stripe/lib/ExternalAccount.php
new file mode 100644
index 00000000000..23ddf9b2e82
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ExternalAccount.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class ExternalAccount
+ *
+ * @package Stripe
+ */
+abstract class ExternalAccount extends ApiResource
+{
+    /**
+     * @return string The instance URL for this resource. It needs to be special
+     *    cased because it doesn't fit into the standard resource pattern.
+     */
+    public function instanceUrl()
+    {
+        $id = $this['id'];
+        if (!$id) {
+            $class = get_class($this);
+            $msg = "Could not determine which URL to request: $class instance "
+             . "has invalid ID: $id";
+            throw new Error\InvalidRequest($msg, null);
+        }
+
+        if ($this['customer']) {
+            $parent = $this['customer'];
+            $base = Customer::classUrl();
+            $path = 'sources';
+        } elseif ($this['account']) {
+            $parent = $this['account'];
+            $base = Account::classUrl();
+            $path = 'external_accounts';
+        } elseif ($this['recipient']) {
+            $parent = $this['recipient'];
+            $base = Recipient::classUrl();
+            $path = 'cards';
+        } else {
+            return null;
+        }
+
+        $parent = Util\Util::utf8($parent);
+        $id = Util\Util::utf8($id);
+
+        $parentExtn = urlencode($parent);
+        $extn = urlencode($id);
+        return "$base/$parentExtn/$path/$extn";
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ExternalAccount The deleted external account.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return ExternalAccount The saved external account.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ExternalAccount The verified (or not) external account.
+     */
+    public function verify($params = null, $opts = null)
+    {
+        if ($this['customer']) {
+            $url = $this->instanceUrl() . '/verify';
+            list($response, $options) = $this->_request('post', $url, $params, $opts);
+            $this->refreshFrom($response, $options);
+            return $this;
+        } else {
+            $message = 'Only customer external accounts can be verified in this manner.';
+            throw new Error\Api($message);
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/lib/FileUpload.php b/htdocs/includes/stripe/lib/FileUpload.php
new file mode 100644
index 00000000000..7dc98c78d1c
--- /dev/null
+++ b/htdocs/includes/stripe/lib/FileUpload.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class FileUpload
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $created
+ * @property string $purpose
+ * @property int $size
+ * @property string $type
+ *
+ * @package Stripe
+ */
+class FileUpload extends ApiResource
+{
+    public static function baseUrl()
+    {
+        return Stripe::$apiUploadBase;
+    }
+
+    public static function className()
+    {
+        return 'file';
+    }
+
+    /**
+     * @param string $id The ID of the file upload to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return FileUpload
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return FileUpload The created file upload.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of FileUploads
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/HttpClient/ClientInterface.php b/htdocs/includes/stripe/lib/HttpClient/ClientInterface.php
new file mode 100644
index 00000000000..dc4af5d1dc2
--- /dev/null
+++ b/htdocs/includes/stripe/lib/HttpClient/ClientInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Stripe\HttpClient;
+
+interface ClientInterface
+{
+    /**
+     * @param string $method The HTTP method being used
+     * @param string $absUrl The URL being requested, including domain and protocol
+     * @param array $headers Headers to be used in the request (full strings, not KV pairs)
+     * @param array $params KV pairs for parameters. Can be nested for arrays and hashes
+     * @param boolean $hasFile Whether or not $params references a file (via an @ prefix or
+     *                         CurlFile)
+     * @throws Error\Api & Error\ApiConnection
+     * @return array($rawBody, $httpStatusCode, $httpHeader)
+     */
+    public function request($method, $absUrl, $headers, $params, $hasFile);
+}
diff --git a/htdocs/includes/stripe/lib/HttpClient/CurlClient.php b/htdocs/includes/stripe/lib/HttpClient/CurlClient.php
new file mode 100644
index 00000000000..e070d324d72
--- /dev/null
+++ b/htdocs/includes/stripe/lib/HttpClient/CurlClient.php
@@ -0,0 +1,282 @@
+<?php
+
+namespace Stripe\HttpClient;
+
+use Stripe\Stripe;
+use Stripe\Error;
+use Stripe\Util;
+
+// cURL constants are not defined in PHP < 5.5
+
+// @codingStandardsIgnoreStart
+// PSR2 requires all constants be upper case. Sadly, the CURL_SSLVERSION
+// constants do not abide by those rules.
+
+// Note the values 1 and 6 come from their position in the enum that
+// defines them in cURL's source code.
+if (!defined('CURL_SSLVERSION_TLSv1')) {
+    define('CURL_SSLVERSION_TLSv1', 1);
+}
+if (!defined('CURL_SSLVERSION_TLSv1_2')) {
+    define('CURL_SSLVERSION_TLSv1_2', 6);
+}
+// @codingStandardsIgnoreEnd
+
+class CurlClient implements ClientInterface
+{
+    private static $instance;
+
+    public static function instance()
+    {
+        if (!self::$instance) {
+            self::$instance = new self();
+        }
+        return self::$instance;
+    }
+
+    protected $defaultOptions;
+
+    /**
+     * CurlClient constructor.
+     *
+     * Pass in a callable to $defaultOptions that returns an array of CURLOPT_* values to start
+     * off a request with, or an flat array with the same format used by curl_setopt_array() to
+     * provide a static set of options. Note that many options are overridden later in the request
+     * call, including timeouts, which can be set via setTimeout() and setConnectTimeout().
+     *
+     * Note that request() will silently ignore a non-callable, non-array $defaultOptions, and will
+     * throw an exception if $defaultOptions returns a non-array value.
+     *
+     * @param array|callable|null $defaultOptions
+     */
+    public function __construct($defaultOptions = null)
+    {
+        $this->defaultOptions = $defaultOptions;
+    }
+
+    public function getDefaultOptions()
+    {
+        return $this->defaultOptions;
+    }
+
+    // USER DEFINED TIMEOUTS
+
+    const DEFAULT_TIMEOUT = 80;
+    const DEFAULT_CONNECT_TIMEOUT = 30;
+
+    private $timeout = self::DEFAULT_TIMEOUT;
+    private $connectTimeout = self::DEFAULT_CONNECT_TIMEOUT;
+
+    public function setTimeout($seconds)
+    {
+        $this->timeout = (int) max($seconds, 0);
+        return $this;
+    }
+
+    public function setConnectTimeout($seconds)
+    {
+        $this->connectTimeout = (int) max($seconds, 0);
+        return $this;
+    }
+
+    public function getTimeout()
+    {
+        return $this->timeout;
+    }
+
+    public function getConnectTimeout()
+    {
+        return $this->connectTimeout;
+    }
+
+    // END OF USER DEFINED TIMEOUTS
+
+    public function request($method, $absUrl, $headers, $params, $hasFile)
+    {
+        $curl = curl_init();
+        $method = strtolower($method);
+
+        $opts = array();
+        if (is_callable($this->defaultOptions)) { // call defaultOptions callback, set options to return value
+            $opts = call_user_func_array($this->defaultOptions, func_get_args());
+            if (!is_array($opts)) {
+                throw new Error\Api("Non-array value returned by defaultOptions CurlClient callback");
+            }
+        } elseif (is_array($this->defaultOptions)) { // set default curlopts from array
+            $opts = $this->defaultOptions;
+        }
+
+        if ($method == 'get') {
+            if ($hasFile) {
+                throw new Error\Api(
+                    "Issuing a GET request with a file parameter"
+                );
+            }
+            $opts[CURLOPT_HTTPGET] = 1;
+            if (count($params) > 0) {
+                $encoded = self::encode($params);
+                $absUrl = "$absUrl?$encoded";
+            }
+        } elseif ($method == 'post') {
+            $opts[CURLOPT_POST] = 1;
+            $opts[CURLOPT_POSTFIELDS] = $hasFile ? $params : self::encode($params);
+        } elseif ($method == 'delete') {
+            $opts[CURLOPT_CUSTOMREQUEST] = 'DELETE';
+            if (count($params) > 0) {
+                $encoded = self::encode($params);
+                $absUrl = "$absUrl?$encoded";
+            }
+        } else {
+            throw new Error\Api("Unrecognized method $method");
+        }
+
+        // Create a callback to capture HTTP headers for the response
+        $rheaders = array();
+        $headerCallback = function ($curl, $header_line) use (&$rheaders) {
+            // Ignore the HTTP request line (HTTP/1.1 200 OK)
+            if (strpos($header_line, ":") === false) {
+                return strlen($header_line);
+            }
+            list($key, $value) = explode(":", trim($header_line), 2);
+            $rheaders[trim($key)] = trim($value);
+            return strlen($header_line);
+        };
+
+        // By default for large request body sizes (> 1024 bytes), cURL will
+        // send a request without a body and with a `Expect: 100-continue`
+        // header, which gives the server a chance to respond with an error
+        // status code in cases where one can be determined right away (say
+        // on an authentication problem for example), and saves the "large"
+        // request body from being ever sent.
+        //
+        // Unfortunately, the bindings don't currently correctly handle the
+        // success case (in which the server sends back a 100 CONTINUE), so
+        // we'll error under that condition. To compensate for that problem
+        // for the time being, override cURL's behavior by simply always
+        // sending an empty `Expect:` header.
+        array_push($headers, 'Expect: ');
+
+        $absUrl = Util\Util::utf8($absUrl);
+        $opts[CURLOPT_URL] = $absUrl;
+        $opts[CURLOPT_RETURNTRANSFER] = true;
+        $opts[CURLOPT_CONNECTTIMEOUT] = $this->connectTimeout;
+        $opts[CURLOPT_TIMEOUT] = $this->timeout;
+        $opts[CURLOPT_HEADERFUNCTION] = $headerCallback;
+        $opts[CURLOPT_HTTPHEADER] = $headers;
+        if (!Stripe::$verifySslCerts) {
+            $opts[CURLOPT_SSL_VERIFYPEER] = false;
+        }
+
+        curl_setopt_array($curl, $opts);
+        $rbody = curl_exec($curl);
+
+        if (!defined('CURLE_SSL_CACERT_BADFILE')) {
+            define('CURLE_SSL_CACERT_BADFILE', 77);  // constant not defined in PHP
+        }
+
+        $errno = curl_errno($curl);
+        if ($errno == CURLE_SSL_CACERT ||
+            $errno == CURLE_SSL_PEER_CERTIFICATE ||
+            $errno == CURLE_SSL_CACERT_BADFILE
+        ) {
+            array_push(
+                $headers,
+                'X-Stripe-Client-Info: {"ca":"using Stripe-supplied CA bundle"}'
+            );
+            $cert = self::caBundle();
+            curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+            curl_setopt($curl, CURLOPT_CAINFO, $cert);
+            $rbody = curl_exec($curl);
+        }
+
+        if ($rbody === false) {
+            $errno = curl_errno($curl);
+            $message = curl_error($curl);
+            curl_close($curl);
+            $this->handleCurlError($absUrl, $errno, $message);
+        }
+
+        $rcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        return array($rbody, $rcode, $rheaders);
+    }
+
+    /**
+     * @param number $errno
+     * @param string $message
+     * @throws Error\ApiConnection
+     */
+    private function handleCurlError($url, $errno, $message)
+    {
+        switch ($errno) {
+            case CURLE_COULDNT_CONNECT:
+            case CURLE_COULDNT_RESOLVE_HOST:
+            case CURLE_OPERATION_TIMEOUTED:
+                $msg = "Could not connect to Stripe ($url).  Please check your "
+                 . "internet connection and try again.  If this problem persists, "
+                 . "you should check Stripe's service status at "
+                 . "https://twitter.com/stripestatus, or";
+                break;
+            case CURLE_SSL_CACERT:
+            case CURLE_SSL_PEER_CERTIFICATE:
+                $msg = "Could not verify Stripe's SSL certificate.  Please make sure "
+                 . "that your network is not intercepting certificates.  "
+                 . "(Try going to $url in your browser.)  "
+                 . "If this problem persists,";
+                break;
+            default:
+                $msg = "Unexpected error communicating with Stripe.  "
+                 . "If this problem persists,";
+        }
+        $msg .= " let us know at support@stripe.com.";
+
+        $msg .= "\n\n(Network error [errno $errno]: $message)";
+        throw new Error\ApiConnection($msg);
+    }
+
+    private static function caBundle()
+    {
+        return dirname(__FILE__) . '/../../data/ca-certificates.crt';
+    }
+
+    /**
+     * @param array $arr An map of param keys to values.
+     * @param string|null $prefix
+     *
+     * Only public for testability, should not be called outside of CurlClient
+     *
+     * @return string A querystring, essentially.
+     */
+    public static function encode($arr, $prefix = null)
+    {
+        if (!is_array($arr)) {
+            return $arr;
+        }
+
+        $r = array();
+        foreach ($arr as $k => $v) {
+            if (is_null($v)) {
+                continue;
+            }
+
+            if ($prefix) {
+                if ($k !== null && (!is_int($k) || is_array($v))) {
+                    $k = $prefix."[".$k."]";
+                } else {
+                    $k = $prefix."[]";
+                }
+            }
+
+            if (is_array($v)) {
+                $enc = self::encode($v, $k);
+                if ($enc) {
+                    $r[] = $enc;
+                }
+            } else {
+                $r[] = urlencode($k)."=".urlencode($v);
+            }
+        }
+
+        return implode("&", $r);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Invoice.php b/htdocs/includes/stripe/lib/Invoice.php
new file mode 100644
index 00000000000..e994566cd96
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Invoice.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Invoice
+ *
+ * @package Stripe
+ */
+class Invoice extends ApiResource
+{
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Invoice The created invoice.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the invoice to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Invoice
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Invoices
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the invoice to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Invoice The updated invoice.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Invoice The upcoming invoice.
+     */
+    public static function upcoming($params = null, $opts = null)
+    {
+        $url = static::classUrl() . '/upcoming';
+        list($response, $opts) = static::_staticRequest('get', $url, $params, $opts);
+        $obj = Util\Util::convertToStripeObject($response->json, $opts);
+        $obj->setLastResponse($response);
+        return $obj;
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Invoice The saved invoice.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @return Invoice The paid invoice.
+     */
+    public function pay($opts = null)
+    {
+        $url = $this->instanceUrl() . '/pay';
+        list($response, $opts) = $this->_request('post', $url, null, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/InvoiceItem.php b/htdocs/includes/stripe/lib/InvoiceItem.php
new file mode 100644
index 00000000000..ab9c4ba3327
--- /dev/null
+++ b/htdocs/includes/stripe/lib/InvoiceItem.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class InvoiceItem
+ *
+ * @package Stripe
+ */
+class InvoiceItem extends ApiResource
+{
+    /**
+     * @param string $id The ID of the invoice item to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return InvoiceItem
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of InvoiceItems
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return InvoiceItem The created invoice item.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the invoice item to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return InvoiceItem The updated invoice item.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return InvoiceItem The saved invoice item.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return InvoiceItem The deleted invoice item.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/JsonSerializable.php b/htdocs/includes/stripe/lib/JsonSerializable.php
new file mode 100644
index 00000000000..2fdf8526703
--- /dev/null
+++ b/htdocs/includes/stripe/lib/JsonSerializable.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Stripe;
+
+// JsonSerializable only exists in PHP 5.4+. Stub if out if it doesn't exist
+if (interface_exists('\JsonSerializable', false)) {
+    interface JsonSerializable extends \JsonSerializable
+    {
+    }
+} else {
+    // PSR2 wants each interface to have its own file.
+    // @codingStandardsIgnoreStart
+    interface JsonSerializable
+    {
+        // @codingStandardsIgnoreEnd
+        public function jsonSerialize();
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Order.php b/htdocs/includes/stripe/lib/Order.php
new file mode 100644
index 00000000000..9fc65e2e166
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Order.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Order
+ *
+ * @package Stripe
+ */
+class Order extends ApiResource
+{
+    /**
+     * @param string $id The ID of the Order to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Order
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Order The created Order.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the order to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Order The updated order.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Order The saved Order.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Orders
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @return Order The paid order.
+     */
+    public function pay($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/pay';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @return OrderReturn The newly created return.
+     */
+    public function returnOrder($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/returns';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        return Util\Util::convertToStripeObject($response, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/OrderReturn.php b/htdocs/includes/stripe/lib/OrderReturn.php
new file mode 100644
index 00000000000..aa7fd4e9b99
--- /dev/null
+++ b/htdocs/includes/stripe/lib/OrderReturn.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class OrderReturn
+ *
+ * @package Stripe
+ */
+class OrderReturn extends ApiResource
+{
+    /**
+     * @param string $id The ID of the OrderReturn to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Order
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of OrderReturns
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Payout.php b/htdocs/includes/stripe/lib/Payout.php
new file mode 100644
index 00000000000..90dd0fcecc3
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Payout.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Payout
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property string $balance_transaction
+ * @property string $cancellation_balance_transaction
+ * @property int $created
+ * @property string $currency
+ * @property int $arrival_date
+ * @property string $destination
+ * @property string $failure_code
+ * @property string $failure_message
+ * @property bool $livemode
+ * @property mixed $metadata
+ * @property string $method
+ * @property string $recipient
+ * @property string $source_type
+ * @property string $statement_descriptor
+ * @property string $status
+ * @property string $type
+ *
+ * @package Stripe
+ */
+class Payout extends ApiResource
+{
+    /**
+     * @param string $id The ID of the payout to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Payout
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Payouts
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Payout The created payout.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the payout to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Payout The updated payout.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @return Payout The canceled payout.
+     */
+    public function cancel()
+    {
+        $url = $this->instanceUrl() . '/cancel';
+        list($response, $opts) = $this->_request('post', $url);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Payout The saved payout.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Plan.php b/htdocs/includes/stripe/lib/Plan.php
new file mode 100644
index 00000000000..b911e17cbe6
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Plan.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Plan
+ *
+ * @package Stripe
+ *
+ * @property $id
+ * @property $object
+ * @property $amount
+ * @property $created
+ * @property $currency
+ * @property $interval
+ * @property $interval_count
+ * @property $livemode
+ * @property AttachedObject $metadata
+ * @property $name
+ * @property $statement_descriptor
+ * @property $trial_period_days
+ */
+class Plan extends ApiResource
+{
+    /**
+     * @param string $id The ID of the plan to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Plan
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Plan The created plan.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the plan to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Plan The updated plan.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Plan The deleted plan.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Plan The saved plan.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Plans
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Product.php b/htdocs/includes/stripe/lib/Product.php
new file mode 100644
index 00000000000..2fdd22a0827
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Product.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Product
+ *
+ * @package Stripe
+ */
+class Product extends ApiResource
+{
+    /**
+     * @param string $id The ID of the Product to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Product
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Product The created Product.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the product to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Product The updated product.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Product The saved Product.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Products
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Product The deleted product.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Recipient.php b/htdocs/includes/stripe/lib/Recipient.php
new file mode 100644
index 00000000000..04bcb7bb289
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Recipient.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Recipient
+ *
+ * @package Stripe
+ */
+class Recipient extends ApiResource
+{
+    /**
+     * @param string $id The ID of the recipient to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Recipient
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Recipients
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Recipient The created recipient.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the recipient to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Recipient The updated recipient.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Recipient The saved recipient.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return Recipient The deleted recipient.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+
+    /**
+     * @param array|null $params
+     *
+     * @return Collection of the Recipient's Transfers
+     */
+    public function transfers($params = null)
+    {
+        if ($params === null) {
+            $params = array();
+        }
+        $params['recipient'] = $this->id;
+        $transfers = Transfer::all($params, $this->_opts);
+        return $transfers;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/RecipientTransfer.php b/htdocs/includes/stripe/lib/RecipientTransfer.php
new file mode 100644
index 00000000000..f4e46db38dd
--- /dev/null
+++ b/htdocs/includes/stripe/lib/RecipientTransfer.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class RecipientTransfer
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property int $amount_reversed
+ * @property string $balance_transaction
+ * @property string $bank_account
+ * @property string $card
+ * @property int $created
+ * @property string $currency
+ * @property int $date
+ * @property string $description
+ * @property string $destination
+ * @property string $failure_code
+ * @property string $failure_message
+ * @property bool $livemode
+ * @property mixed $metadata
+ * @property string $method
+ * @property string $recipient
+ * @property mixed $reversals
+ * @property bool $reversed
+ * @property string $source_type
+ * @property string $statement_descriptor
+ * @property string $status
+ * @property string $type
+ *
+ * @package Stripe
+ */
+class RecipientTransfer extends ApiResource
+{
+
+}
diff --git a/htdocs/includes/stripe/lib/Refund.php b/htdocs/includes/stripe/lib/Refund.php
new file mode 100644
index 00000000000..b4e0e76a7b0
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Refund.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Refund
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property mixed $balance_transaction
+ * @property string $charge
+ * @property int $created
+ * @property string $currency
+ * @property mixed $metadata
+ * @property mixed $reason
+ * @property mixed $receipt_number
+ * @property string $status
+ *
+ * @package Stripe
+ */
+class Refund extends ApiResource
+{
+
+    /**
+     * @param string $id The ID of the refund to retrieve.
+     * @param array|string|null $options
+     *
+     * @return Refund
+     */
+    public static function retrieve($id, $options = null)
+    {
+        return self::_retrieve($id, $options);
+    }
+
+    /**
+     * @param string $id The ID of the refund to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Refund The updated refund.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Collection of Refunds
+     */
+    public static function all($params = null, $options = null)
+    {
+        return self::_all($params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Refund The created refund.
+     */
+    public static function create($params = null, $options = null)
+    {
+        return self::_create($params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Refund The saved refund.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/SKU.php b/htdocs/includes/stripe/lib/SKU.php
new file mode 100644
index 00000000000..7089604e62a
--- /dev/null
+++ b/htdocs/includes/stripe/lib/SKU.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class SKU
+ *
+ * @package Stripe
+ */
+class SKU extends ApiResource
+{
+    /**
+     * @param string $id The ID of the SKU to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return SKU
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return SKU The created SKU.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the SKU to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return SKU The updated SKU.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return SKU The saved SKU.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of SKUs
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return SKU The deleted sku.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/SingletonApiResource.php b/htdocs/includes/stripe/lib/SingletonApiResource.php
new file mode 100644
index 00000000000..c6de4448332
--- /dev/null
+++ b/htdocs/includes/stripe/lib/SingletonApiResource.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class SingletonApiResource
+ *
+ * @package Stripe
+ */
+abstract class SingletonApiResource extends ApiResource
+{
+    protected static function _singletonRetrieve($options = null)
+    {
+        $opts = Util\RequestOptions::parse($options);
+        $instance = new static(null, $opts);
+        $instance->refresh();
+        return $instance;
+    }
+
+    /**
+     * @return string The endpoint associated with this singleton class.
+     */
+    public static function classUrl()
+    {
+        $base = static::className();
+        return "/v1/${base}";
+    }
+
+    /**
+     * @return string The endpoint associated with this singleton API resource.
+     */
+    public function instanceUrl()
+    {
+        return static::classUrl();
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Source.php b/htdocs/includes/stripe/lib/Source.php
new file mode 100644
index 00000000000..946586dec45
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Source.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Source
+ *
+ * @package Stripe
+ */
+class Source extends ApiResource
+{
+    /**
+     * @param string $id The ID of the Source to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Source
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Sources
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Source The created Source.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the source to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Source The updated source.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Source The saved source.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Source The deleted source.
+     */
+    public function delete($params = null, $options = null)
+    {
+        self::_validateParams($params);
+
+        $id = $this['id'];
+        if (!$id) {
+            $class = get_class($this);
+            $msg = "Could not determine which URL to request: $class instance "
+             . "has invalid ID: $id";
+            throw new Error\InvalidRequest($msg, null);
+        }
+
+        if ($this['customer']) {
+            $base = Customer::classUrl();
+            $parentExtn = urlencode(Util\Util::utf8($this['customer']));
+            $extn = urlencode(Util\Util::utf8($id));
+            $url = "$base/$parentExtn/sources/$extn";
+
+            list($response, $opts) = $this->_request('delete', $url, $params, $options);
+            $this->refreshFrom($response, $opts);
+            return $this;
+        } else {
+            $message = "Source objects cannot be deleted, they can only be "
+               . "detached from customer objects. This source object does not "
+               . "appear to be currently attached to a customer object.";
+            throw new Error\Api($message);
+        }
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return BankAccount The verified bank account.
+     */
+    public function verify($params = null, $options = null)
+    {
+        $url = $this->instanceUrl() . '/verify';
+        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Stripe.php b/htdocs/includes/stripe/lib/Stripe.php
new file mode 100644
index 00000000000..9c85c08ea04
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Stripe.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Stripe
+ *
+ * @package Stripe
+ */
+class Stripe
+{
+    // @var string The Stripe API key to be used for requests.
+    public static $apiKey;
+
+    // @var string The base URL for the Stripe API.
+    public static $apiBase = 'https://api.stripe.com';
+
+    // @var string The base URL for the Stripe API uploads endpoint.
+    public static $apiUploadBase = 'https://uploads.stripe.com';
+
+    // @var string|null The version of the Stripe API to use for requests.
+    public static $apiVersion = null;
+
+    // @var string|null The account ID for connected accounts requests.
+    public static $accountId = null;
+
+    // @var boolean Defaults to true.
+    public static $verifySslCerts = true;
+
+    // @var array The application's information (name, version, URL)
+    public static $appInfo = null;
+
+    const VERSION = '4.7.0';
+
+    /**
+     * @return string The API key used for requests.
+     */
+    public static function getApiKey()
+    {
+        return self::$apiKey;
+    }
+
+    /**
+     * Sets the API key to be used for requests.
+     *
+     * @param string $apiKey
+     */
+    public static function setApiKey($apiKey)
+    {
+        self::$apiKey = $apiKey;
+    }
+
+    /**
+     * @return string The API version used for requests. null if we're using the
+     *    latest version.
+     */
+    public static function getApiVersion()
+    {
+        return self::$apiVersion;
+    }
+
+    /**
+     * @param string $apiVersion The API version to use for requests.
+     */
+    public static function setApiVersion($apiVersion)
+    {
+        self::$apiVersion = $apiVersion;
+    }
+
+    /**
+     * @return boolean
+     */
+    public static function getVerifySslCerts()
+    {
+        return self::$verifySslCerts;
+    }
+
+    /**
+     * @param boolean $verify
+     */
+    public static function setVerifySslCerts($verify)
+    {
+        self::$verifySslCerts = $verify;
+    }
+
+    /**
+     * @return string | null The Stripe account ID for connected account
+     *   requests.
+     */
+    public static function getAccountId()
+    {
+        return self::$accountId;
+    }
+
+    /**
+     * @param string $accountId The Stripe account ID to set for connected
+     *   account requests.
+     */
+    public static function setAccountId($accountId)
+    {
+        self::$accountId = $accountId;
+    }
+
+    /**
+     * @return array | null The application's information
+     */
+    public static function getAppInfo()
+    {
+        return self::$appInfo;
+    }
+
+    /**
+     * @param string $appName The application's name
+     * @param string $appVersion The application's version
+     * @param string $appUrl The application's URL
+     */
+    public static function setAppInfo($appName, $appVersion = null, $appUrl = null)
+    {
+        if (self::$appInfo === null) {
+            self::$appInfo = array();
+        }
+        self::$appInfo['name'] = $appName;
+        self::$appInfo['version'] = $appVersion;
+        self::$appInfo['url'] = $appUrl;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/StripeObject.php b/htdocs/includes/stripe/lib/StripeObject.php
new file mode 100644
index 00000000000..42e37f694e8
--- /dev/null
+++ b/htdocs/includes/stripe/lib/StripeObject.php
@@ -0,0 +1,294 @@
+<?php
+
+namespace Stripe;
+
+use ArrayAccess;
+use InvalidArgumentException;
+
+/**
+ * Class StripeObject
+ *
+ * @package Stripe
+ */
+class StripeObject implements ArrayAccess, JsonSerializable
+{
+    /**
+     * @var Util\Set Attributes that should not be sent to the API because
+     *    they're not updatable (e.g. API key, ID).
+     */
+    public static $permanentAttributes;
+    /**
+     * @var Util\Set Attributes that are nested but still updatable from
+     *    the parent class's URL (e.g. metadata).
+     */
+    public static $nestedUpdatableAttributes;
+
+    public static function init()
+    {
+        self::$permanentAttributes = new Util\Set(array('_opts', 'id'));
+        self::$nestedUpdatableAttributes = new Util\Set(array(
+            'metadata', 'legal_entity', 'address', 'dob', 'transfer_schedule', 'verification',
+            'tos_acceptance', 'personal_address',
+            // will make the array into an AttachedObject: weird, but works for now
+            'additional_owners', 0, 1, 2, 3, 4, // Max 3, but leave the 4th so errors work properly
+            'inventory',
+            'owner',
+        ));
+    }
+
+    /**
+     * @return object The last response from the Stripe API
+     */
+    public function getLastResponse()
+    {
+        return $this->_lastResponse;
+    }
+
+    /**
+     * @param ApiResponse
+     *
+     * @return void Set the last response from the Stripe API
+     */
+    public function setLastResponse($resp)
+    {
+        $this->_lastResponse = $resp;
+    }
+
+    protected $_opts;
+    protected $_values;
+    protected $_unsavedValues;
+    protected $_transientValues;
+    protected $_retrieveOptions;
+    protected $_lastResponse;
+
+    public function __construct($id = null, $opts = null)
+    {
+        $this->_opts = $opts ? $opts : new Util\RequestOptions();
+        $this->_values = array();
+        $this->_unsavedValues = new Util\Set();
+        $this->_transientValues = new Util\Set();
+
+        $this->_retrieveOptions = array();
+        if (is_array($id)) {
+            foreach ($id as $key => $value) {
+                if ($key != 'id') {
+                    $this->_retrieveOptions[$key] = $value;
+                }
+            }
+            $id = $id['id'];
+        }
+
+        if ($id !== null) {
+            $this->id = $id;
+        }
+    }
+
+    // Standard accessor magic methods
+    public function __set($k, $v)
+    {
+        if ($v === "") {
+            throw new InvalidArgumentException(
+                'You cannot set \''.$k.'\'to an empty string. '
+                .'We interpret empty strings as NULL in requests. '
+                .'You may set obj->'.$k.' = NULL to delete the property'
+            );
+        }
+
+        if (self::$nestedUpdatableAttributes->includes($k)
+                && isset($this->$k) && $this->$k instanceof AttachedObject && is_array($v)) {
+            $this->$k->replaceWith($v);
+        } else {
+            // TODO: may want to clear from $_transientValues (Won't be user-visible).
+            $this->_values[$k] = $v;
+        }
+        if (!self::$permanentAttributes->includes($k)) {
+            $this->_unsavedValues->add($k);
+        }
+    }
+
+    public function __isset($k)
+    {
+        return isset($this->_values[$k]);
+    }
+    public function __unset($k)
+    {
+        unset($this->_values[$k]);
+        $this->_transientValues->add($k);
+        $this->_unsavedValues->discard($k);
+    }
+    public function &__get($k)
+    {
+        // function should return a reference, using $nullval to return a reference to null
+        $nullval = null;
+        if (!empty($this->_values) && array_key_exists($k, $this->_values)) {
+            return $this->_values[$k];
+        } else if (!empty($this->_transientValues) && $this->_transientValues->includes($k)) {
+            $class = get_class($this);
+            $attrs = join(', ', array_keys($this->_values));
+            $message = "Stripe Notice: Undefined property of $class instance: $k. "
+                    . "HINT: The $k attribute was set in the past, however. "
+                    . "It was then wiped when refreshing the object "
+                    . "with the result returned by Stripe's API, "
+                    . "probably as a result of a save(). The attributes currently "
+                    . "available on this object are: $attrs";
+            error_log($message);
+            return $nullval;
+        } else {
+            $class = get_class($this);
+            error_log("Stripe Notice: Undefined property of $class instance: $k");
+            return $nullval;
+        }
+    }
+
+    // ArrayAccess methods
+    public function offsetSet($k, $v)
+    {
+        $this->$k = $v;
+    }
+
+    public function offsetExists($k)
+    {
+        return array_key_exists($k, $this->_values);
+    }
+
+    public function offsetUnset($k)
+    {
+        unset($this->$k);
+    }
+    public function offsetGet($k)
+    {
+        return array_key_exists($k, $this->_values) ? $this->_values[$k] : null;
+    }
+
+    public function keys()
+    {
+        return array_keys($this->_values);
+    }
+
+    /**
+     * This unfortunately needs to be public to be used in Util\Util
+     *
+     * @param array $values
+     * @param array $opts
+     *
+     * @return StripeObject The object constructed from the given values.
+     */
+    public static function constructFrom($values, $opts)
+    {
+        $obj = new static(isset($values['id']) ? $values['id'] : null);
+        $obj->refreshFrom($values, $opts);
+        return $obj;
+    }
+
+    /**
+     * Refreshes this object using the provided values.
+     *
+     * @param array $values
+     * @param array|Util\RequestOptions $opts
+     * @param boolean $partial Defaults to false.
+     */
+    public function refreshFrom($values, $opts, $partial = false)
+    {
+        if (is_array($opts)) {
+            $opts = Util\RequestOptions::parse($opts);
+        }
+
+        $this->_opts = $opts;
+
+        // Wipe old state before setting new.  This is useful for e.g. updating a
+        // customer, where there is no persistent card parameter.  Mark those values
+        // which don't persist as transient
+        if ($partial) {
+            $removed = new Util\Set();
+        } else {
+            $removed = array_diff(array_keys($this->_values), array_keys($values));
+        }
+
+        foreach ($removed as $k) {
+            if (self::$permanentAttributes->includes($k)) {
+                continue;
+            }
+
+            unset($this->$k);
+        }
+
+        foreach ($values as $k => $v) {
+            if (self::$permanentAttributes->includes($k) && isset($this[$k])) {
+                continue;
+            }
+
+            if (self::$nestedUpdatableAttributes->includes($k) && is_array($v)) {
+                $this->_values[$k] = AttachedObject::constructFrom($v, $opts);
+            } else {
+                $this->_values[$k] = Util\Util::convertToStripeObject($v, $opts);
+            }
+
+            $this->_transientValues->discard($k);
+            $this->_unsavedValues->discard($k);
+        }
+    }
+
+    /**
+     * @return array A recursive mapping of attributes to values for this object,
+     *    including the proper value for deleted attributes.
+     */
+    public function serializeParameters()
+    {
+        $params = array();
+        if ($this->_unsavedValues) {
+            foreach ($this->_unsavedValues->toArray() as $k) {
+                $v = $this->$k;
+                if ($v === null) {
+                    $v = '';
+                }
+
+                $params[$k] = $v;
+            }
+        }
+
+        // Get nested updates.
+        foreach (self::$nestedUpdatableAttributes->toArray() as $property) {
+            if (isset($this->$property)) {
+                if ($this->$property instanceof StripeObject) {
+                    $serialized = $this->$property->serializeParameters();
+                    if ($serialized) {
+                        $params[$property] = $serialized;
+                    }
+                }
+            }
+        }
+
+        return $params;
+    }
+
+    public function jsonSerialize()
+    {
+        return $this->__toArray(true);
+    }
+
+    public function __toJSON()
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            return json_encode($this->__toArray(true), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode($this->__toArray(true));
+        }
+    }
+
+    public function __toString()
+    {
+        $class = get_class($this);
+        return $class . ' JSON: ' . $this->__toJSON();
+    }
+
+    public function __toArray($recursive = false)
+    {
+        if ($recursive) {
+            return Util\Util::convertStripeObjectToArray($this->_values);
+        } else {
+            return $this->_values;
+        }
+    }
+}
+
+StripeObject::init();
diff --git a/htdocs/includes/stripe/lib/Subscription.php b/htdocs/includes/stripe/lib/Subscription.php
new file mode 100644
index 00000000000..a95ab0911c9
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Subscription.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Subscription
+ *
+ * @package Stripe
+ */
+class Subscription extends ApiResource
+{
+    /**
+     * These constants are possible representations of the status field.
+     *
+     * @link https://stripe.com/docs/api#subscription_object-status
+     */
+    const STATUS_ACTIVE = 'active';
+    const STATUS_CANCELED = 'canceled';
+    const STATUS_PAST_DUE = 'past_due';
+    const STATUS_TRIALING = 'trialing';
+    const STATUS_UNPAID = 'unpaid';
+
+    /**
+     * @param string $id The ID of the subscription to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Subscription
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Subscriptions
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Subscription The created subscription.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the subscription to retrieve.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Subscription The updated subscription.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|null $params
+     *
+     * @return Subscription The deleted subscription.
+     */
+    public function cancel($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Subscription The saved subscription.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @return Subscription The updated subscription.
+     */
+    public function deleteDiscount()
+    {
+        $url = $this->instanceUrl() . '/discount';
+        list($response, $opts) = $this->_request('delete', $url);
+        $this->refreshFrom(array('discount' => null), $opts, true);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/SubscriptionItem.php b/htdocs/includes/stripe/lib/SubscriptionItem.php
new file mode 100644
index 00000000000..947d83fcb5f
--- /dev/null
+++ b/htdocs/includes/stripe/lib/SubscriptionItem.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class SubscriptionItem
+ *
+ * @package Stripe
+ */
+class SubscriptionItem extends ApiResource
+{
+    /**
+     * This is a special case because the subscription items endpoint has an
+     *    underscore in it. The parent `className` function strips underscores.
+     *
+     * @return string The name of the class.
+     */
+    public static function className()
+    {
+        return 'subscription_item';
+    }
+
+    /**
+     * @param string $id The ID of the subscription item to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return SubscriptionItem
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of SubscriptionItems
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return SubscriptionItem The created subscription item.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the subscription item to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return SubscriptionItem The updated subscription item.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return SubscriptionItem The saved subscription item.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return SubscriptionItem The deleted subscription item.
+     */
+    public function delete($params = null, $opts = null)
+    {
+        return $this->_delete($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/ThreeDSecure.php b/htdocs/includes/stripe/lib/ThreeDSecure.php
new file mode 100644
index 00000000000..1f189b7daeb
--- /dev/null
+++ b/htdocs/includes/stripe/lib/ThreeDSecure.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Stripe;
+
+class ThreeDSecure extends ApiResource
+{
+    /**
+     * @return string The endpoint URL for the given class.
+     */
+    public static function classUrl()
+    {
+        return "/v1/3d_secure";
+    }
+
+    /**
+     * @param string $id The ID of the 3DS auth to retrieve.
+     * @param array|string|null $options
+     *
+     * @return ThreeDSecure
+     */
+    public static function retrieve($id, $options = null)
+    {
+        return self::_retrieve($id, $options);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ThreeDSecure The created 3D Secure object.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Token.php b/htdocs/includes/stripe/lib/Token.php
new file mode 100644
index 00000000000..d3e5a4bcef9
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Token.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Token
+ *
+ * @property string $id
+ * @property string $object
+ * @property mixed $bank_account
+ * @property mixed $card
+ * @property mixed $client_ip
+ * @property int $created
+ * @property bool $livemode
+ * @property string $type
+ * @property bool $used
+ *
+ * @package Stripe
+ */
+class Token extends ApiResource
+{
+    /**
+     * @param string $id The ID of the token to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Token
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Token The created token.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Transfer.php b/htdocs/includes/stripe/lib/Transfer.php
new file mode 100644
index 00000000000..2f483f30169
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Transfer.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class Transfer
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property int $amount_reversed
+ * @property string $balance_transaction
+ * @property int $created
+ * @property string $currency
+ * @property int $date
+ * @property mixed $destination
+ * @property mixed $destination_payment
+ * @property bool $livemode
+ * @property mixed $metadata
+ * @property mixed $reversals
+ * @property bool $reversed
+ * @property mixed $source_transaction
+ *
+ * @package Stripe
+ */
+class Transfer extends ApiResource
+{
+    /**
+     * @param string $id The ID of the transfer to retrieve.
+     * @param array|string|null $opts
+     *
+     * @return Transfer
+     */
+    public static function retrieve($id, $opts = null)
+    {
+        return self::_retrieve($id, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection of Transfers
+     */
+    public static function all($params = null, $opts = null)
+    {
+        return self::_all($params, $opts);
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Transfer The created transfer.
+     */
+    public static function create($params = null, $opts = null)
+    {
+        return self::_create($params, $opts);
+    }
+
+    /**
+     * @param string $id The ID of the transfer to update.
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return Transfer The updated transfer.
+     */
+    public static function update($id, $params = null, $options = null)
+    {
+        return self::_update($id, $params, $options);
+    }
+
+    /**
+     * @return TransferReversal The created transfer reversal.
+     */
+    public function reverse($params = null, $opts = null)
+    {
+        $url = $this->instanceUrl() . '/reversals';
+        list($response, $opts) = $this->_request('post', $url, $params, $opts);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @return Transfer The canceled transfer.
+     */
+    public function cancel()
+    {
+        $url = $this->instanceUrl() . '/cancel';
+        list($response, $opts) = $this->_request('post', $url);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return Transfer The saved transfer.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/TransferReversal.php b/htdocs/includes/stripe/lib/TransferReversal.php
new file mode 100644
index 00000000000..33948c93e14
--- /dev/null
+++ b/htdocs/includes/stripe/lib/TransferReversal.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class TransferReversal
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property string $balance_transaction
+ * @property int $created
+ * @property string $currency
+ * @property mixed $metadata
+ * @property string $transfer
+ *
+ * @package Stripe
+ */
+class TransferReversal extends ApiResource
+{
+    /**
+     * @return string The API URL for this Stripe transfer reversal.
+     */
+    public function instanceUrl()
+    {
+        $id = $this['id'];
+        $transfer = $this['transfer'];
+        if (!$id) {
+            throw new Error\InvalidRequest(
+                "Could not determine which URL to request: " .
+                "class instance has invalid ID: $id",
+                null
+            );
+        }
+        $id = Util\Util::utf8($id);
+        $transfer = Util\Util::utf8($transfer);
+
+        $base = Transfer::classUrl();
+        $transferExtn = urlencode($transfer);
+        $extn = urlencode($id);
+        return "$base/$transferExtn/reversals/$extn";
+    }
+
+    /**
+     * @param array|string|null $opts
+     *
+     * @return TransferReversal The saved reversal.
+     */
+    public function save($opts = null)
+    {
+        return $this->_save($opts);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Util/AutoPagingIterator.php b/htdocs/includes/stripe/lib/Util/AutoPagingIterator.php
new file mode 100644
index 00000000000..80877e6742e
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Util/AutoPagingIterator.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Stripe\Util;
+
+class AutoPagingIterator implements \Iterator
+{
+    private $lastId = null;
+    private $page = null;
+    private $pageOffset = 0;
+    private $params = array();
+
+    public function __construct($collection, $params)
+    {
+        $this->page = $collection;
+        $this->params = $params;
+    }
+
+    public function rewind()
+    {
+        // Actually rewinding would require making a copy of the original page.
+    }
+
+    public function current()
+    {
+        $item = current($this->page->data);
+        $this->lastId = $item !== false ? $item['id'] : null;
+
+        return $item;
+    }
+
+    public function key()
+    {
+        return key($this->page->data) + $this->pageOffset;
+    }
+
+    public function next()
+    {
+        $item = next($this->page->data);
+        if ($item === false) {
+            // If we've run out of data on the current page, try to fetch another one
+            // and increase the offset the new page would start at
+            $this->pageOffset += count($this->page->data);
+            if ($this->page['has_more']) {
+                $this->params = array_merge(
+                    $this->params ? $this->params : array(),
+                    array('starting_after' => $this->lastId)
+                );
+                $this->page = $this->page->all($this->params);
+            } else {
+                return false;
+            }
+        }
+    }
+
+    public function valid()
+    {
+        $key = key($this->page->data);
+        $valid = ($key !== null && $key !== false);
+        return $valid;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Util/RequestOptions.php b/htdocs/includes/stripe/lib/Util/RequestOptions.php
new file mode 100644
index 00000000000..14af2b8a0e8
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Util/RequestOptions.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Stripe\Util;
+
+use Stripe\Error;
+
+class RequestOptions
+{
+    public $headers;
+    public $apiKey;
+
+    public function __construct($key = null, $headers = array())
+    {
+        $this->apiKey = $key;
+        $this->headers = $headers;
+    }
+
+    /**
+     * Unpacks an options array and merges it into the existing RequestOptions
+     * object.
+     * @param array|string|null $options a key => value array
+     *
+     * @return RequestOptions
+     */
+    public function merge($options)
+    {
+        $other_options = self::parse($options);
+        if ($other_options->apiKey === null) {
+            $other_options->apiKey = $this->apiKey;
+        }
+        $other_options->headers = array_merge($this->headers, $other_options->headers);
+        return $other_options;
+    }
+
+    /**
+     * Unpacks an options array into an RequestOptions object
+     * @param array|string|null $options a key => value array
+     *
+     * @return RequestOptions
+     */
+    public static function parse($options)
+    {
+        if ($options instanceof self) {
+            return $options;
+        }
+
+        if (is_null($options)) {
+            return new RequestOptions(null, array());
+        }
+
+        if (is_string($options)) {
+            return new RequestOptions($options, array());
+        }
+
+        if (is_array($options)) {
+            $headers = array();
+            $key = null;
+            if (array_key_exists('api_key', $options)) {
+                $key = $options['api_key'];
+            }
+            if (array_key_exists('idempotency_key', $options)) {
+                $headers['Idempotency-Key'] = $options['idempotency_key'];
+            }
+            if (array_key_exists('stripe_account', $options)) {
+                $headers['Stripe-Account'] = $options['stripe_account'];
+            }
+            if (array_key_exists('stripe_version', $options)) {
+                $headers['Stripe-Version'] = $options['stripe_version'];
+            }
+            return new RequestOptions($key, $headers);
+        }
+
+        $message = 'The second argument to Stripe API method calls is an '
+           . 'optional per-request apiKey, which must be a string, or '
+           . 'per-request options, which must be an array. (HINT: you can set '
+           . 'a global apiKey by "Stripe::setApiKey(<apiKey>)")';
+        throw new Error\Api($message);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Util/Set.php b/htdocs/includes/stripe/lib/Util/Set.php
new file mode 100644
index 00000000000..2a500cd639b
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Util/Set.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Stripe\Util;
+
+use IteratorAggregate;
+use ArrayIterator;
+
+class Set implements IteratorAggregate
+{
+    private $_elts;
+
+    public function __construct($members = array())
+    {
+        $this->_elts = array();
+        foreach ($members as $item) {
+            $this->_elts[$item] = true;
+        }
+    }
+
+    public function includes($elt)
+    {
+        return isset($this->_elts[$elt]);
+    }
+
+    public function add($elt)
+    {
+        $this->_elts[$elt] = true;
+    }
+
+    public function discard($elt)
+    {
+        unset($this->_elts[$elt]);
+    }
+
+    public function toArray()
+    {
+        return array_keys($this->_elts);
+    }
+
+    public function getIterator()
+    {
+        return new ArrayIterator($this->toArray());
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Util/Util.php b/htdocs/includes/stripe/lib/Util/Util.php
new file mode 100644
index 00000000000..1c8235df9bd
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Util/Util.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace Stripe\Util;
+
+use Stripe\StripeObject;
+
+abstract class Util
+{
+    private static $isMbstringAvailable = null;
+
+    /**
+     * Whether the provided array (or other) is a list rather than a dictionary.
+     *
+     * @param array|mixed $array
+     * @return boolean True if the given object is a list.
+     */
+    public static function isList($array)
+    {
+        if (!is_array($array)) {
+            return false;
+        }
+
+      // TODO: generally incorrect, but it's correct given Stripe's response
+        foreach (array_keys($array) as $k) {
+            if (!is_numeric($k)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Recursively converts the PHP Stripe object to an array.
+     *
+     * @param array $values The PHP Stripe object to convert.
+     * @return array
+     */
+    public static function convertStripeObjectToArray($values)
+    {
+        $results = array();
+        foreach ($values as $k => $v) {
+            // FIXME: this is an encapsulation violation
+            if ($k[0] == '_') {
+                continue;
+            }
+            if ($v instanceof StripeObject) {
+                $results[$k] = $v->__toArray(true);
+            } elseif (is_array($v)) {
+                $results[$k] = self::convertStripeObjectToArray($v);
+            } else {
+                $results[$k] = $v;
+            }
+        }
+        return $results;
+    }
+
+    /**
+     * Converts a response from the Stripe API to the corresponding PHP object.
+     *
+     * @param array $resp The response from the Stripe API.
+     * @param array $opts
+     * @return StripeObject|array
+     */
+    public static function convertToStripeObject($resp, $opts)
+    {
+        $types = array(
+            'account' => 'Stripe\\Account',
+            'alipay_account' => 'Stripe\\AlipayAccount',
+            'apple_pay_domain' => 'Stripe\\ApplePayDomain',
+            'bank_account' => 'Stripe\\BankAccount',
+            'balance_transaction' => 'Stripe\\BalanceTransaction',
+            'card' => 'Stripe\\Card',
+            'charge' => 'Stripe\\Charge',
+            'country_spec' => 'Stripe\\CountrySpec',
+            'coupon' => 'Stripe\\Coupon',
+            'customer' => 'Stripe\\Customer',
+            'dispute' => 'Stripe\\Dispute',
+            'list' => 'Stripe\\Collection',
+            'invoice' => 'Stripe\\Invoice',
+            'invoiceitem' => 'Stripe\\InvoiceItem',
+            'event' => 'Stripe\\Event',
+            'file' => 'Stripe\\FileUpload',
+            'token' => 'Stripe\\Token',
+            'transfer' => 'Stripe\\Transfer',
+            'transfer_reversal' => 'Stripe\\TransferReversal',
+            'order' => 'Stripe\\Order',
+            'order_return' => 'Stripe\\OrderReturn',
+            'payout' => 'Stripe\\Payout',
+            'plan' => 'Stripe\\Plan',
+            'product' => 'Stripe\\Product',
+            'recipient' => 'Stripe\\Recipient',
+            'recipient_transfer' => 'Stripe\\RecipientTransfer',
+            'refund' => 'Stripe\\Refund',
+            'sku' => 'Stripe\\SKU',
+            'source' => 'Stripe\\Source',
+            'subscription' => 'Stripe\\Subscription',
+            'subscription_item' => 'Stripe\\SubscriptionItem',
+            'three_d_secure' => 'Stripe\\ThreeDSecure',
+            'fee_refund' => 'Stripe\\ApplicationFeeRefund',
+            'bitcoin_receiver' => 'Stripe\\BitcoinReceiver',
+            'bitcoin_transaction' => 'Stripe\\BitcoinTransaction',
+        );
+        if (self::isList($resp)) {
+            $mapped = array();
+            foreach ($resp as $i) {
+                array_push($mapped, self::convertToStripeObject($i, $opts));
+            }
+            return $mapped;
+        } elseif (is_array($resp)) {
+            if (isset($resp['object']) && is_string($resp['object']) && isset($types[$resp['object']])) {
+                $class = $types[$resp['object']];
+            } else {
+                $class = 'Stripe\\StripeObject';
+            }
+            return $class::constructFrom($resp, $opts);
+        } else {
+            return $resp;
+        }
+    }
+
+    /**
+     * @param string|mixed $value A string to UTF8-encode.
+     *
+     * @return string|mixed The UTF8-encoded string, or the object passed in if
+     *    it wasn't a string.
+     */
+    public static function utf8($value)
+    {
+        if (self::$isMbstringAvailable === null) {
+            self::$isMbstringAvailable = function_exists('mb_detect_encoding');
+
+            if (!self::$isMbstringAvailable) {
+                trigger_error("It looks like the mbstring extension is not enabled. " .
+                    "UTF-8 strings will not properly be encoded. Ask your system " .
+                    "administrator to enable the mbstring extension, or write to " .
+                    "support@stripe.com if you have any questions.", E_USER_WARNING);
+            }
+        }
+
+        if (is_string($value) && self::$isMbstringAvailable && mb_detect_encoding($value, "UTF-8", true) != "UTF-8") {
+            return utf8_encode($value);
+        } else {
+            return $value;
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/phpunit.no_autoload.xml b/htdocs/includes/stripe/phpunit.no_autoload.xml
new file mode 100644
index 00000000000..f418611df5e
--- /dev/null
+++ b/htdocs/includes/stripe/phpunit.no_autoload.xml
@@ -0,0 +1,15 @@
+<phpunit bootstrap="tests/bootstrap.no_autoload.php" colors="true">
+    <testsuites>
+        <testsuite name="Stripe PHP Test Suite">
+            <directory suffix="Test.php">tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory>lib</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-clover" target="clover.xml"/>
+    </logging>
+</phpunit>
diff --git a/htdocs/includes/stripe/phpunit.xml b/htdocs/includes/stripe/phpunit.xml
new file mode 100644
index 00000000000..7a73276d0b1
--- /dev/null
+++ b/htdocs/includes/stripe/phpunit.xml
@@ -0,0 +1,15 @@
+<phpunit bootstrap="tests/bootstrap.php" colors="true">
+    <testsuites>
+        <testsuite name="Stripe PHP Test Suite">
+            <directory suffix="Test.php">tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory>lib</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-clover" target="clover.xml"/>
+    </logging>
+</phpunit>
diff --git a/htdocs/includes/stripe/tests/AccountTest.php b/htdocs/includes/stripe/tests/AccountTest.php
new file mode 100644
index 00000000000..994ba6f6a8a
--- /dev/null
+++ b/htdocs/includes/stripe/tests/AccountTest.php
@@ -0,0 +1,300 @@
+<?php
+
+namespace Stripe;
+
+class AccountTest extends TestCase
+{
+    private function managedAccountResponse($id)
+    {
+        return array(
+            'id' => $id,
+            'currencies_supported' => array('usd', 'aed', 'afn', '...'),
+            'object' => 'account',
+            'business_name' => 'Stripe.com',
+            'bank_accounts' => array(
+                'object' => 'list',
+                'total_count' => 0,
+                'has_more' => false,
+                'url' => '/v1/accounts/' . $id . '/bank_accounts',
+                'data' => array()
+            ),
+            'verification' => array(
+                'fields_needed' => array(
+                    'product_description',
+                    'business_url',
+                    'support_phone',
+                    'bank_account',
+                    'tos_acceptance.ip',
+                    'tos_acceptance.date'
+                ),
+                'due_by' => null,
+                'contacted' => false
+            ),
+            'tos_acceptance' => array(
+                'ip' => null,
+                'date' => null,
+                'user_agent' => null
+            ),
+            'legal_entity' => array(
+                'type' => null,
+                'business_name' => null,
+                'address' => array(
+                    'line1' => null,
+                    'line2' => null,
+                    'city' => null,
+                    'state' => null,
+                    'postal_code' => null,
+                    'country' => 'US'
+                ),
+                'first_name' => null,
+                'last_name' => null,
+                'additional_owners' => null,
+                'verification' => array(
+                    'status' => 'unverified',
+                    'document' => null,
+                    'details' => null
+                )
+            )
+        );
+    }
+
+    private function deletedAccountResponse($id)
+    {
+        return array(
+            'id' => $id,
+            'deleted' => true
+        );
+    }
+
+    public function testBasicRetrieve()
+    {
+        $this->mockRequest('GET', '/v1/account', array(), $this->managedAccountResponse('acct_ABC'));
+        $account = Account::retrieve();
+        $this->assertSame($account->id, 'acct_ABC');
+    }
+
+    public function testIDRetrieve()
+    {
+        $this->mockRequest('GET', '/v1/accounts/acct_DEF', array(), $this->managedAccountResponse('acct_DEF'));
+        $account = Account::retrieve('acct_DEF');
+        $this->assertSame($account->id, 'acct_DEF');
+    }
+
+    public function testCreate()
+    {
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts',
+            array('managed' => 'true'),
+            $this->managedAccountResponse('acct_ABC')
+        );
+        $account = Account::create(array(
+            'managed' => true
+        ));
+        $this->assertSame($account->id, 'acct_ABC');
+    }
+
+    public function testDelete()
+    {
+        $account = self::createTestAccount();
+
+        $this->mockRequest(
+            'DELETE',
+            '/v1/accounts/' . $account->id,
+            array(),
+            $this->deletedAccountResponse('acct_ABC')
+        );
+        $deleted = $account->delete();
+        $this->assertSame($deleted->id, $account->id);
+        $this->assertTrue($deleted->deleted);
+    }
+
+    public function testReject()
+    {
+        $account = self::createTestAccount();
+
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/' . $account->id . '/reject',
+            array('reason' => 'fraud'),
+            $this->deletedAccountResponse('acct_ABC')
+        );
+        $rejected = $account->reject(array('reason' => 'fraud'));
+        $this->assertSame($rejected->id, $account->id);
+    }
+
+    public function testSaveLegalEntity()
+    {
+        $response = $this->managedAccountResponse('acct_ABC');
+        $this->mockRequest('POST', '/v1/accounts', array('managed' => 'true'), $response);
+
+        $response['legal_entity']['first_name'] = 'Bob';
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/acct_ABC',
+            array('legal_entity' => array('first_name' => 'Bob')),
+            $response
+        );
+
+        $account = Account::create(array('managed' => true));
+        $account->legal_entity->first_name = 'Bob';
+        $account->save();
+
+        $this->assertSame('Bob', $account->legal_entity->first_name);
+    }
+
+    public function testUpdateLegalEntity()
+    {
+        $response = $this->managedAccountResponse('acct_ABC');
+        $this->mockRequest('POST', '/v1/accounts', array('managed' => 'true'), $response);
+
+        $response['legal_entity']['first_name'] = 'Bob';
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/acct_ABC',
+            array('legal_entity' => array('first_name' => 'Bob')),
+            $response
+        );
+
+        $account = Account::create(array('managed' => true));
+        $account = Account::update($account['id'], array(
+          'legal_entity' => array(
+            'first_name' => 'Bob'
+          )
+        ));
+
+        $this->assertSame('Bob', $account->legal_entity->first_name);
+    }
+
+    public function testCreateAdditionalOwners()
+    {
+        $request = array(
+            'managed' => true,
+            'country' => 'GB',
+            'legal_entity' => array(
+                'additional_owners' => array(
+                    0 => array(
+                        'dob' => array(
+                            'day' => 12,
+                            'month' => 5,
+                            'year' => 1970,
+                        ),
+                        'first_name' => 'xgvukvfrde',
+                        'last_name' => 'rtcyvubhy',
+                    ),
+                    1 => array(
+                        'dob' => array(
+                            'day' => 8,
+                            'month' => 4,
+                            'year' => 1979,
+                        ),
+                        'first_name' => 'yutreuk',
+                        'last_name' => 'dfcgvhbjihmv',
+                    ),
+                ),
+            ),
+        );
+
+        $acct = Account::create($request);
+        $response = $acct->__toArray(true);
+
+        $req_ao = $request['legal_entity']['additional_owners'];
+        $resp_ao = $response['legal_entity']['additional_owners'];
+
+        $this->assertSame($req_ao[0]['dob'], $resp_ao[0]['dob']);
+        $this->assertSame($req_ao[1]['dob'], $resp_ao[1]['dob']);
+
+        $this->assertSame($req_ao[0]['first_name'], $resp_ao[0]['first_name']);
+        $this->assertSame($req_ao[1]['first_name'], $resp_ao[1]['first_name']);
+    }
+
+    public function testUpdateAdditionalOwners()
+    {
+        $response = $this->managedAccountResponse('acct_ABC');
+        $this->mockRequest('POST', '/v1/accounts', array('managed' => 'true'), $response);
+
+        $response['legal_entity']['additional_owners'] = array(array(
+            'first_name' => 'Bob',
+            'last_name' => null,
+            'address' => array(
+                'line1' => null,
+                'line2' => null,
+                'city' => null,
+                'state' => null,
+                'postal_code' => null,
+                'country' => null
+            ),
+            'verification' => array(
+                'status' => 'unverified',
+                'document' => null,
+                'details' => null
+            )
+        ));
+
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/acct_ABC',
+            array('legal_entity' => array('additional_owners' => array(array('first_name' => 'Bob')))),
+            $response
+        );
+
+        $response['legal_entity']['additional_owners'][0]['last_name'] = 'Smith';
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/acct_ABC',
+            array('legal_entity' => array('additional_owners' => array(array('last_name' => 'Smith')))),
+            $response
+        );
+
+        $response['legal_entity']['additional_owners'][0]['last_name'] = 'Johnson';
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/acct_ABC',
+            array('legal_entity' => array('additional_owners' => array(array('last_name' => 'Johnson')))),
+            $response
+        );
+
+        $response['legal_entity']['additional_owners'][0]['verification']['document'] = 'file_123';
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/acct_ABC',
+            array('legal_entity' => array('additional_owners' => array(array('verification' => array('document' => 'file_123'))))),
+            $response
+        );
+
+        $response['legal_entity']['additional_owners'][1] = array(
+            'first_name' => 'Jane',
+            'last_name' => 'Doe'
+        );
+        $this->mockRequest(
+            'POST',
+            '/v1/accounts/acct_ABC',
+            array('legal_entity' => array('additional_owners' => array(1 => array('first_name' => 'Jane')))),
+            $response
+        );
+
+        $account = Account::create(array('managed' => true));
+        $account->legal_entity->additional_owners = array(array('first_name' => 'Bob'));
+        $account->save();
+        $this->assertSame(1, count($account->legal_entity->additional_owners));
+        $this->assertSame('Bob', $account->legal_entity->additional_owners[0]->first_name);
+
+        $account->legal_entity->additional_owners[0]->last_name = 'Smith';
+        $account->save();
+        $this->assertSame(1, count($account->legal_entity->additional_owners));
+        $this->assertSame('Smith', $account->legal_entity->additional_owners[0]->last_name);
+
+        $account['legal_entity']['additional_owners'][0]['last_name'] = 'Johnson';
+        $account->save();
+        $this->assertSame(1, count($account->legal_entity->additional_owners));
+        $this->assertSame('Johnson', $account->legal_entity->additional_owners[0]->last_name);
+
+        $account->legal_entity->additional_owners[0]->verification->document = 'file_123';
+        $account->save();
+        $this->assertSame('file_123', $account->legal_entity->additional_owners[0]->verification->document);
+
+        $account->legal_entity->additional_owners[1] = array('first_name' => 'Jane');
+        $account->save();
+        $this->assertSame('Jane', $account->legal_entity->additional_owners[1]->first_name);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ApiRequestorTest.php b/htdocs/includes/stripe/tests/ApiRequestorTest.php
new file mode 100644
index 00000000000..859fb63a347
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ApiRequestorTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Stripe;
+
+use Stripe\HttpClient\CurlClient;
+
+class ApiRequestorTest extends TestCase
+{
+    public function testEncodeObjects()
+    {
+        $reflector = new \ReflectionClass('Stripe\\ApiRequestor');
+        $method = $reflector->getMethod('_encodeObjects');
+        $method->setAccessible(true);
+
+        $a = array('customer' => new Customer('abcd'));
+        $enc = $method->invoke(null, $a);
+        $this->assertSame($enc, array('customer' => 'abcd'));
+
+        // Preserves UTF-8
+        $v = array('customer' => "☃");
+        $enc = $method->invoke(null, $v);
+        $this->assertSame($enc, $v);
+
+        // Encodes latin-1 -> UTF-8
+        $v = array('customer' => "\xe9");
+        $enc = $method->invoke(null, $v);
+        $this->assertSame($enc, array('customer' => "\xc3\xa9"));
+    }
+
+    public function testHttpClientInjection()
+    {
+        $reflector = new \ReflectionClass('Stripe\\ApiRequestor');
+        $method = $reflector->getMethod('httpClient');
+        $method->setAccessible(true);
+
+        $curl = new CurlClient();
+        $curl->setTimeout(10);
+        ApiRequestor::setHttpClient($curl);
+
+        $injectedCurl = $method->invoke(new ApiRequestor());
+        $this->assertSame($injectedCurl, $curl);
+    }
+
+    public function testDefaultHeaders()
+    {
+        $reflector = new \ReflectionClass('Stripe\\ApiRequestor');
+        $method = $reflector->getMethod('_defaultHeaders');
+        $method->setAccessible(true);
+
+        // no way to stub static methods with PHPUnit 4.x :(
+        Stripe::setAppInfo('MyTestApp', '1.2.34', 'https://mytestapp.example');
+        $apiKey = 'sk_test_notarealkey';
+
+        $headers = $method->invoke(null, $apiKey);
+
+        $ua = json_decode($headers['X-Stripe-Client-User-Agent']);
+        $this->assertSame($ua->application->name, 'MyTestApp');
+        $this->assertSame($ua->application->version, '1.2.34');
+        $this->assertSame($ua->application->url, 'https://mytestapp.example');
+
+        $this->assertSame(
+            $headers['User-Agent'],
+            'Stripe/v1 PhpBindings/' . Stripe::VERSION . ' MyTestApp/1.2.34 (https://mytestapp.example)'
+        );
+
+        $this->assertSame($headers['Authorization'], 'Bearer ' . $apiKey);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ApplePayDomainTest.php b/htdocs/includes/stripe/tests/ApplePayDomainTest.php
new file mode 100644
index 00000000000..ebb3e7cfa9d
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ApplePayDomainTest.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Stripe;
+
+class ApplePayDomainTest extends TestCase
+{
+    public function testCreation()
+    {
+        $this->mockRequest(
+            'POST',
+            '/v1/apple_pay/domains',
+            array('domain_name' => 'test.com'),
+            array(
+                'id' => 'apwc_create',
+                'object' => 'apple_pay_domain'
+            )
+        );
+        $d = ApplePayDomain::create(array(
+            'domain_name' => 'test.com'
+        ));
+        $this->assertSame('apwc_create', $d->id);
+        $this->assertInstanceOf('Stripe\\ApplePayDomain', $d);
+    }
+
+    public function testRetrieve()
+    {
+        $this->mockRequest(
+            'GET',
+            '/v1/apple_pay/domains/apwc_retrieve',
+            array(),
+            array(
+                'id' => 'apwc_retrieve',
+                'object' => 'apple_pay_domain'
+            )
+        );
+        $d = ApplePayDomain::retrieve('apwc_retrieve');
+        $this->assertSame('apwc_retrieve', $d->id);
+        $this->assertInstanceOf('Stripe\\ApplePayDomain', $d);
+    }
+
+    public function testDeletion()
+    {
+        self::authorizeFromEnv();
+        $d = ApplePayDomain::create(array(
+            'domain_name' => 'jackshack.website'
+        ));
+        $this->assertInstanceOf('Stripe\\ApplePayDomain', $d);
+        $this->mockRequest(
+            'DELETE',
+            '/v1/apple_pay/domains/' . $d->id,
+            array(),
+            array('deleted' => true)
+        );
+        $d->delete();
+        $this->assertTrue($d->deleted);
+    }
+
+    public function testList()
+    {
+        $this->mockRequest(
+            'GET',
+            '/v1/apple_pay/domains',
+            array(),
+            array(
+                'url' => '/v1/apple_pay/domains',
+                'object' => 'list'
+            )
+        );
+        $all = ApplePayDomain::all();
+        $this->assertSame($all->url, '/v1/apple_pay/domains');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ApplicationFeeRefundTest.php b/htdocs/includes/stripe/tests/ApplicationFeeRefundTest.php
new file mode 100644
index 00000000000..b8d266ad1eb
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ApplicationFeeRefundTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Stripe;
+
+class ApplicationFeeRefundTest extends TestCase
+{
+    public function testUrls()
+    {
+        $refund = new ApplicationFeeRefund();
+        $refund->id = 'refund_id';
+        $refund->fee = 'fee_id';
+
+        $this->assertSame(
+            $refund->instanceUrl(),
+            '/v1/application_fees/fee_id/refunds/refund_id'
+        );
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ApplicationFeeTest.php b/htdocs/includes/stripe/tests/ApplicationFeeTest.php
new file mode 100644
index 00000000000..fe6df923084
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ApplicationFeeTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Stripe;
+
+class ApplicationFeeTest extends TestCase
+{
+    public function testUrls()
+    {
+        $applicationFee = new ApplicationFee('abcd/efgh');
+        $this->assertSame(
+            $applicationFee->instanceUrl(),
+            '/v1/application_fees/abcd%2Fefgh'
+        );
+    }
+
+    public function testList()
+    {
+        self::authorizeFromEnv();
+        $d = ApplicationFee::all();
+        $this->assertSame($d->url, '/v1/application_fees');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/AuthenticationErrorTest.php b/htdocs/includes/stripe/tests/AuthenticationErrorTest.php
new file mode 100644
index 00000000000..1003d6990c8
--- /dev/null
+++ b/htdocs/includes/stripe/tests/AuthenticationErrorTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Stripe;
+
+class AuthenticationErrorTest extends TestCase
+{
+    public function testInvalidCredentials()
+    {
+        Stripe::setApiKey('invalid');
+        try {
+            Customer::create();
+        } catch (Error\Authentication $e) {
+            $this->assertSame(401, $e->getHttpStatus());
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/tests/BalanceTest.php b/htdocs/includes/stripe/tests/BalanceTest.php
new file mode 100644
index 00000000000..3d6a2a668f0
--- /dev/null
+++ b/htdocs/includes/stripe/tests/BalanceTest.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Stripe;
+
+class BalanceTest extends TestCase
+{
+    public function testRetrieve()
+    {
+        self::authorizeFromEnv();
+        $d = Balance::retrieve();
+        $this->assertSame($d->object, "balance");
+        $this->assertTrue(Util\Util::isList($d->available));
+        $this->assertTrue(Util\Util::isList($d->pending));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/BalanceTransactionTest.php b/htdocs/includes/stripe/tests/BalanceTransactionTest.php
new file mode 100644
index 00000000000..b196a288014
--- /dev/null
+++ b/htdocs/includes/stripe/tests/BalanceTransactionTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Stripe;
+
+class BalanceTransactionTest extends TestCase
+{
+    public function testList()
+    {
+        self::authorizeFromEnv();
+        $d = BalanceTransaction::all();
+        $this->assertSame($d->url, '/v1/balance/history');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/BankAccountTest.php b/htdocs/includes/stripe/tests/BankAccountTest.php
new file mode 100644
index 00000000000..285078f00ad
--- /dev/null
+++ b/htdocs/includes/stripe/tests/BankAccountTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Stripe;
+
+class BankAccountTest extends TestCase
+{
+    public function testVerify()
+    {
+        self::authorizeFromEnv();
+
+        $customer = self::createTestCustomer();
+
+        $bankAccount = $customer->sources->create(array(
+            'source' => array(
+                'object' => 'bank_account',
+                'account_holder_type' => 'individual',
+                'account_number' => '000123456789',
+                'account_holder_name' => 'John Doe',
+                'routing_number' => '110000000',
+                'country' => 'US'
+            )
+        ));
+
+        $this->assertSame($bankAccount->status, 'new');
+
+        $bankAccount = $bankAccount->verify(array(
+            'amounts' => array(32, 45)
+        ));
+
+        $this->assertSame($bankAccount->status, 'verified');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/BitcoinReceiverTest.php b/htdocs/includes/stripe/tests/BitcoinReceiverTest.php
new file mode 100644
index 00000000000..fc71cf973a5
--- /dev/null
+++ b/htdocs/includes/stripe/tests/BitcoinReceiverTest.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace Stripe;
+
+class BitcoinReceiverTest extends TestCase
+{
+    public function testUrls()
+    {
+        $classUrl = BitcoinReceiver::classUrl('Stripe_BitcoinReceiver');
+        $this->assertSame($classUrl, '/v1/bitcoin/receivers');
+        $receiver = new BitcoinReceiver('abcd/efgh');
+        $instanceUrl = $receiver->instanceUrl();
+        $this->assertSame($instanceUrl, '/v1/bitcoin/receivers/abcd%2Fefgh');
+    }
+
+    public function testCreate()
+    {
+        self::authorizeFromEnv();
+
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $this->assertSame(100, $receiver->amount);
+        $this->assertNotNull($receiver->id);
+    }
+
+    public function testRetrieve()
+    {
+        self::authorizeFromEnv();
+
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $r = BitcoinReceiver::retrieve($receiver->id);
+        $this->assertSame($receiver->id, $r->id);
+
+        $this->assertInstanceOf('Stripe\\BitcoinTransaction', $r->transactions->data[0]);
+    }
+
+    public function testList()
+    {
+        self::authorizeFromEnv();
+
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $receivers = BitcoinReceiver::all();
+        $this->assertGreaterThan(0, count($receivers->data));
+    }
+
+    public function testListTransactions()
+    {
+        self::authorizeFromEnv();
+
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+        $this->assertSame(0, count($receiver->transactions->data));
+
+        $transactions = $receiver->transactions->all(array("limit" => 1));
+        $this->assertSame(1, count($transactions->data));
+    }
+
+    public function testDeleteWithCustomer()
+    {
+        self::authorizeFromEnv();
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+        $customer = Customer::create(array("source" => $receiver->id));
+        $charge = Charge::create(array(
+            "customer" => $customer->id,
+            "amount" => $receiver->amount,
+            "currency" => $receiver->currency
+        ));
+        $receiver = BitcoinReceiver::retrieve($receiver->id);
+        $response = $receiver->delete();
+        $this->assertTrue($response->deleted);
+    }
+
+    public function testUpdateWithCustomer()
+    {
+        self::authorizeFromEnv();
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+        $customer = Customer::create(array("source" => $receiver->id));
+        $receiver = BitcoinReceiver::retrieve($receiver->id);
+
+        $receiver->description = "a new description";
+        $receiver->save();
+
+        $base = Customer::classUrl();
+        $parentExtn = $receiver['customer'];
+        $extn = $receiver['id'];
+        $this->assertEquals("$base/$parentExtn/sources/$extn", $receiver->instanceUrl());
+
+        $updatedReceiver = BitcoinReceiver::retrieve($receiver->id);
+        $this->assertEquals($receiver["description"], $updatedReceiver["description"]);
+    }
+
+    public function testUpdateWithoutCustomer()
+    {
+        self::authorizeFromEnv();
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $receiver->description = "a new description";
+        $receiver->save();
+
+        $this->assertEquals(BitcoinReceiver::classUrl() . "/" . $receiver['id'], $receiver->instanceUrl());
+
+        $updatedReceiver = BitcoinReceiver::retrieve($receiver->id);
+        $this->assertEquals($receiver["description"], $updatedReceiver["description"]);
+    }
+
+    public function testRefund()
+    {
+        self::authorizeFromEnv();
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $receiver = BitcoinReceiver::retrieve($receiver->id);
+        $this->assertNull($receiver->refund_address);
+
+        $refundAddress = "REFUNDHERE";
+        $receiver->refund(array("refund_address" => $refundAddress));
+
+        $this->assertSame($refundAddress, $receiver->refund_address);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/CardErrorTest.php b/htdocs/includes/stripe/tests/CardErrorTest.php
new file mode 100644
index 00000000000..a0de752e512
--- /dev/null
+++ b/htdocs/includes/stripe/tests/CardErrorTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Stripe;
+
+class CardErrorTest extends TestCase
+{
+    public function testDecline()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4000000000000002',
+            'exp_month' => '3',
+            'exp_year' => '2020'
+        );
+
+        $charge = array(
+            'amount' => 100,
+            'currency' => 'usd',
+            'card' => $card
+        );
+
+        try {
+            Charge::create($charge);
+        } catch (Error\Card $e) {
+            $this->assertSame(402, $e->getHttpStatus());
+            $this->assertTrue(strpos($e->getRequestId(), "req_") === 0, $e->getRequestId());
+            $actual = $e->getJsonBody();
+            $this->assertSame(
+                array('error' => array(
+                    'message' => 'Your card was declined.',
+                    'type' => 'card_error',
+                    'code' => 'card_declined',
+                    'decline_code' => 'generic_decline',
+                    'charge' => $actual['error']['charge'],
+                )),
+                $actual
+            );
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ChargeTest.php b/htdocs/includes/stripe/tests/ChargeTest.php
new file mode 100644
index 00000000000..6ec0fa1f1d4
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ChargeTest.php
@@ -0,0 +1,204 @@
+<?php
+
+namespace Stripe;
+
+class ChargeTest extends TestCase
+{
+    public function testUrls()
+    {
+        $this->assertSame(Charge::classUrl(), '/v1/charges');
+        $charge = new Charge('abcd/efgh');
+        $this->assertSame($charge->instanceUrl(), '/v1/charges/abcd%2Fefgh');
+    }
+
+    public function testCreate()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4242424242424242',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $c = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            )
+        );
+        $this->assertTrue($c->paid);
+        $this->assertFalse($c->refunded);
+    }
+
+    public function testIdempotentCreate()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4242424242424242',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $c = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            ),
+            array(
+                'idempotency_key' => self::generateRandomString(),
+            )
+        );
+
+        $this->assertTrue($c->paid);
+        $this->assertSame(200, $c->getLastResponse()->code);
+    }
+
+    public function testRetrieve()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4242424242424242',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $c = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            )
+        );
+        $d = Charge::retrieve($c->id);
+        $this->assertSame(200, $d->getLastResponse()->code);
+        $this->assertSame($d->id, $c->id);
+    }
+
+    public function testUpdateMetadata()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4242424242424242',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $charge = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            )
+        );
+
+        $charge->metadata['test'] = 'foo bar';
+        $charge->save();
+
+        $updatedCharge = Charge::retrieve($charge->id);
+        $this->assertSame('foo bar', $updatedCharge->metadata['test']);
+    }
+
+    public function testUpdateMetadataAll()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4242424242424242',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $charge = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            )
+        );
+
+        $charge->metadata = array('test' => 'foo bar');
+        $charge->save();
+        $this->assertSame(200, $charge->getLastResponse()->code);
+
+        $updatedCharge = Charge::retrieve($charge->id);
+        $this->assertSame('foo bar', $updatedCharge->metadata['test']);
+    }
+
+    public function testMarkAsFraudulent()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4242424242424242',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $charge = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            )
+        );
+
+        $charge->refunds->create();
+        $charge->markAsFraudulent();
+
+        $updatedCharge = Charge::retrieve($charge->id);
+        $this->assertSame(
+            'fraudulent',
+            $updatedCharge['fraud_details']['user_report']
+        );
+    }
+
+    public function testCreateWithBitcoinReceiverSource()
+    {
+        self::authorizeFromEnv();
+
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $charge = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'source' => $receiver->id
+            )
+        );
+
+        $this->assertSame($receiver->id, $charge->source->id);
+        $this->assertSame("bitcoin_receiver", $charge->source->object);
+        $this->assertSame("succeeded", $charge->status);
+        $this->assertInstanceOf('Stripe\\BitcoinReceiver', $charge->source);
+    }
+
+    public function markAsSafe()
+    {
+        self::authorizeFromEnv();
+
+        $card = array(
+            'number' => '4242424242424242',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $charge = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            )
+        );
+
+        $charge->markAsSafe();
+
+        $updatedCharge = Charge::retrieve($charge->id);
+        $this->assertSame('safe', $updatedCharge['fraud_details']['user_report']);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/CollectionTest.php b/htdocs/includes/stripe/tests/CollectionTest.php
new file mode 100644
index 00000000000..f8f923ff00d
--- /dev/null
+++ b/htdocs/includes/stripe/tests/CollectionTest.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Stripe;
+
+class CollectionTest extends TestCase
+{
+    private function pageableModelResponse($ids, $hasMore)
+    {
+        $data = array();
+        foreach ($ids as $id) {
+            array_push($data, array(
+                'id' => $id,
+                'object' => 'pageablemodel'
+            ));
+        }
+        return array(
+            'object' => 'list',
+            'url' => '/v1/pageablemodels',
+            'data' => $data,
+            'has_more' => $hasMore
+        );
+    }
+
+    public function testAutoPagingOnePage()
+    {
+        $collection = Collection::constructFrom(
+            $this->pageableModelResponse(array('pm_123', 'pm_124'), false),
+            new Util\RequestOptions()
+        );
+
+        $seen = array();
+        foreach ($collection->autoPagingIterator() as $item) {
+            array_push($seen, $item['id']);
+        }
+
+        $this->assertSame($seen, array('pm_123', 'pm_124'));
+    }
+
+    public function testAutoPagingThreePages()
+    {
+        $collection = Collection::constructFrom(
+            $this->pageableModelResponse(array('pm_123', 'pm_124'), true),
+            new Util\RequestOptions()
+        );
+        $collection->setRequestParams(array('foo' => 'bar'));
+
+        $this->mockRequest(
+            'GET',
+            '/v1/pageablemodels',
+            array(
+                  'foo' => 'bar',
+                  'starting_after' => 'pm_124'
+            ),
+            $this->pageableModelResponse(array('pm_125', 'pm_126'), true)
+        );
+        $this->mockRequest(
+            'GET',
+            '/v1/pageablemodels',
+            array(
+                  'foo' => 'bar',
+                  'starting_after' => 'pm_126'
+            ),
+            $this->pageableModelResponse(array('pm_127'), false)
+        );
+
+        $seen = array();
+        foreach ($collection->autoPagingIterator() as $item) {
+            array_push($seen, $item['id']);
+        }
+
+        $this->assertSame($seen, array('pm_123', 'pm_124', 'pm_125', 'pm_126', 'pm_127'));
+    }
+
+    public function testIteratorToArray()
+    {
+        $collection = Collection::constructFrom(
+            $this->pageableModelResponse(array('pm_123', 'pm_124'), true),
+            new Util\RequestOptions()
+        );
+
+        $this->mockRequest(
+            'GET',
+            '/v1/pageablemodels',
+            array(
+                  'starting_after' => 'pm_124'
+            ),
+            $this->pageableModelResponse(array('pm_125', 'pm_126'), true)
+        );
+        $this->mockRequest(
+            'GET',
+            '/v1/pageablemodels',
+            array(
+                  'starting_after' => 'pm_126'
+            ),
+            $this->pageableModelResponse(array('pm_127'), false)
+        );
+
+        $seen = array();
+        foreach (iterator_to_array($collection->autoPagingIterator()) as $item) {
+            array_push($seen, $item['id']);
+        }
+
+        $this->assertSame($seen, array('pm_123', 'pm_124', 'pm_125', 'pm_126', 'pm_127'));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/CountrySpecTest.php b/htdocs/includes/stripe/tests/CountrySpecTest.php
new file mode 100644
index 00000000000..19dc37062e5
--- /dev/null
+++ b/htdocs/includes/stripe/tests/CountrySpecTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Stripe;
+
+class CountrySpecTest extends TestCase
+{
+    public function testRetrieve()
+    {
+        self::authorizeFromEnv();
+
+        $country = "US";
+        $d = CountrySpec::retrieve($country);
+        $this->assertSame($d->object, "country_spec");
+        $this->assertSame($d->id, $country);
+        $this->assertGreaterThan(0, count($d->supported_bank_account_currencies));
+        $this->assertGreaterThan(0, count($d->supported_payment_currencies));
+        $this->assertGreaterThan(0, count($d->supported_payment_methods));
+        $this->assertGreaterThan(0, count($d->verification_fields));
+    }
+
+    public function testList()
+    {
+        self::authorizeFromEnv();
+
+        $d = CountrySpec::all();
+        $this->assertSame($d->object, "list");
+        $this->assertGreaterThan(0, count($d->data));
+        $this->assertSame($d->data[0]->object, "country_spec");
+        $this->assertInstanceOf("Stripe\\CountrySpec", $d->data[0]);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/CouponTest.php b/htdocs/includes/stripe/tests/CouponTest.php
new file mode 100644
index 00000000000..d23163e338e
--- /dev/null
+++ b/htdocs/includes/stripe/tests/CouponTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Stripe;
+
+class CouponTest extends TestCase
+{
+    public function testSave()
+    {
+        self::authorizeFromEnv();
+        $id = 'test_coupon-' . self::generateRandomString(20);
+        $c = Coupon::create(
+            array(
+                'percent_off' => 25,
+                'duration' => 'repeating',
+                'duration_in_months' => 5,
+                'id' => $id,
+            )
+        );
+        $this->assertSame($id, $c->id);
+        // @codingStandardsIgnoreStart
+        $this->assertSame(25, $c->percent_off);
+        // @codingStandardsIgnoreEnd
+        $c->metadata['foo'] = 'bar';
+        $c->save();
+
+        $stripeCoupon = Coupon::retrieve($id);
+        $this->assertEquals($c->metadata, $stripeCoupon->metadata);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/CurlClientTest.php b/htdocs/includes/stripe/tests/CurlClientTest.php
new file mode 100644
index 00000000000..864607f088c
--- /dev/null
+++ b/htdocs/includes/stripe/tests/CurlClientTest.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Stripe;
+
+use Stripe\HttpClient\CurlClient;
+
+class CurlClientTest extends TestCase
+{
+    public function testTimeout()
+    {
+        $curl = new CurlClient();
+        $this->assertSame(CurlClient::DEFAULT_TIMEOUT, $curl->getTimeout());
+        $this->assertSame(CurlClient::DEFAULT_CONNECT_TIMEOUT, $curl->getConnectTimeout());
+
+        // implicitly tests whether we're returning the CurlClient instance
+        $curl = $curl->setConnectTimeout(1)->setTimeout(10);
+        $this->assertSame(1, $curl->getConnectTimeout());
+        $this->assertSame(10, $curl->getTimeout());
+
+        $curl->setTimeout(-1);
+        $curl->setConnectTimeout(-999);
+        $this->assertSame(0, $curl->getTimeout());
+        $this->assertSame(0, $curl->getConnectTimeout());
+    }
+
+    public function testDefaultOptions()
+    {
+        // make sure options array loads/saves properly
+        $optionsArray = array(CURLOPT_PROXY => 'localhost:80');
+        $withOptionsArray = new CurlClient($optionsArray);
+        $this->assertSame($withOptionsArray->getDefaultOptions(), $optionsArray);
+
+        // make sure closure-based options work properly, including argument passing
+        $ref = null;
+        $withClosure = new CurlClient(function ($method, $absUrl, $headers, $params, $hasFile) use (&$ref) {
+            $ref = func_get_args();
+            return array();
+        });
+
+        $withClosure->request('get', 'https://httpbin.org/status/200', array(), array(), false);
+        $this->assertSame($ref, array('get', 'https://httpbin.org/status/200', array(), array(), false));
+
+        // this is the last test case that will run, since it'll throw an exception at the end
+        $withBadClosure = new CurlClient(function () {
+            return 'thisShouldNotWork';
+        });
+        $this->setExpectedException('Stripe\Error\Api', "Non-array value returned by defaultOptions CurlClient callback");
+        $withBadClosure->request('get', 'https://httpbin.org/status/200', array(), array(), false);
+    }
+
+    public function testEncode()
+    {
+        $a = array(
+            'my' => 'value',
+            'that' => array('your' => 'example'),
+            'bar' => 1,
+            'baz' => null
+        );
+
+        $enc = CurlClient::encode($a);
+        $this->assertSame('my=value&that%5Byour%5D=example&bar=1', $enc);
+
+        $a = array('that' => array('your' => 'example', 'foo' => null));
+        $enc = CurlClient::encode($a);
+        $this->assertSame('that%5Byour%5D=example', $enc);
+
+        $a = array('that' => 'example', 'foo' => array('bar', 'baz'));
+        $enc = CurlClient::encode($a);
+        $this->assertSame('that=example&foo%5B%5D=bar&foo%5B%5D=baz', $enc);
+
+        $a = array(
+            'my' => 'value',
+            'that' => array('your' => array('cheese', 'whiz', null)),
+            'bar' => 1,
+            'baz' => null
+        );
+
+        $enc = CurlClient::encode($a);
+        $expected = 'my=value&that%5Byour%5D%5B%5D=cheese'
+              . '&that%5Byour%5D%5B%5D=whiz&bar=1';
+        $this->assertSame($expected, $enc);
+
+        // Ignores an empty array
+        $enc = CurlClient::encode(array('foo' => array(), 'bar' => 'baz'));
+        $expected = 'bar=baz';
+        $this->assertSame($expected, $enc);
+
+        $a = array('foo' => array(array('bar' => 'baz'), array('bar' => 'bin')));
+        $enc = CurlClient::encode($a);
+        $this->assertSame('foo%5B0%5D%5Bbar%5D=baz&foo%5B1%5D%5Bbar%5D=bin', $enc);
+    }
+
+    public function testSslOption()
+    {
+        // make sure options array loads/saves properly
+        $optionsArray = array(CURLOPT_SSLVERSION => CURL_SSLVERSION_TLSv1);
+        $withOptionsArray = new CurlClient($optionsArray);
+        $this->assertSame($withOptionsArray->getDefaultOptions(), $optionsArray);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/CustomerTest.php b/htdocs/includes/stripe/tests/CustomerTest.php
new file mode 100644
index 00000000000..606536ee86f
--- /dev/null
+++ b/htdocs/includes/stripe/tests/CustomerTest.php
@@ -0,0 +1,278 @@
+<?php
+
+namespace Stripe;
+
+class CustomerTest extends TestCase
+{
+    public function testDeletion()
+    {
+        $customer = self::createTestCustomer();
+        $customer->delete();
+
+        $this->assertTrue($customer->deleted);
+        $this->assertNull($customer['active_card']);
+    }
+
+    public function testSave()
+    {
+        $customer = self::createTestCustomer();
+
+        $customer->email = 'gdb@stripe.com';
+        $customer->save();
+        $this->assertSame($customer->email, 'gdb@stripe.com');
+
+        $stripeCustomer = Customer::retrieve($customer->id);
+        $this->assertSame($customer->email, $stripeCustomer->email);
+
+        Stripe::setApiKey(null);
+        $customer = Customer::create(null, self::API_KEY);
+        $customer->email = 'gdb@stripe.com';
+        $customer->save();
+
+        self::authorizeFromEnv();
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $this->assertSame($updatedCustomer->email, 'gdb@stripe.com');
+    }
+
+    /**
+     * @expectedException Stripe\Error\InvalidRequest
+     */
+    public function testBogusAttribute()
+    {
+        $customer = self::createTestCustomer();
+        $customer->bogus = 'bogus';
+        $customer->save();
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testUpdateDescriptionEmpty()
+    {
+        $customer = self::createTestCustomer();
+        $customer->description = '';
+    }
+
+    public function testUpdateDescriptionNull()
+    {
+        $customer = self::createTestCustomer(array('description' => 'foo bar'));
+        $customer->description = null;
+
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $this->assertSame(null, $updatedCustomer->description);
+    }
+
+    public function testUpdateMetadata()
+    {
+        $customer = self::createTestCustomer();
+
+        $customer->metadata['test'] = 'foo bar';
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $this->assertSame('foo bar', $updatedCustomer->metadata['test']);
+    }
+
+    public function testDeleteMetadata()
+    {
+        $customer = self::createTestCustomer();
+
+        $customer->metadata = null;
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $this->assertSame(0, count($updatedCustomer->metadata->keys()));
+    }
+
+    public function testUpdateSomeMetadata()
+    {
+        $customer = self::createTestCustomer();
+        $customer->metadata['shoe size'] = '7';
+        $customer->metadata['shirt size'] = 'XS';
+        $customer->save();
+
+        $customer->metadata['shoe size'] = '9';
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $this->assertSame('XS', $updatedCustomer->metadata['shirt size']);
+        $this->assertSame('9', $updatedCustomer->metadata['shoe size']);
+    }
+
+    public function testUpdateAllMetadata()
+    {
+        $customer = self::createTestCustomer();
+        $customer->metadata['shoe size'] = '7';
+        $customer->metadata['shirt size'] = 'XS';
+        $customer->save();
+
+        $customer->metadata = array('shirt size' => 'XL');
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $this->assertSame('XL', $updatedCustomer->metadata['shirt size']);
+        $this->assertFalse(isset($updatedCustomer->metadata['shoe size']));
+    }
+
+    /**
+     * @expectedException Stripe\Error\InvalidRequest
+     */
+    public function testUpdateInvalidMetadata()
+    {
+        $customer = self::createTestCustomer();
+        $customer->metadata = 'something';
+        $customer->save();
+    }
+
+    public function testCancelSubscription()
+    {
+        $planID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($planID);
+
+        $customer = self::createTestCustomer(
+            array(
+                'plan' => $planID,
+            )
+        );
+
+        $customer->cancelSubscription(array('at_period_end' => true));
+        $this->assertSame($customer->subscription->status, 'active');
+        $this->assertTrue($customer->subscription->cancel_at_period_end);
+        $customer->cancelSubscription();
+        $this->assertSame($customer->subscription->status, 'canceled');
+    }
+
+    public function testCustomerAddCard()
+    {
+        $token = Token::create(
+            array("card" => array(
+                "number" => "4242424242424242",
+                "exp_month" => 5,
+                "exp_year" => date('Y') + 3,
+                "cvc" => "314"
+            ))
+        );
+
+        $customer = $this->createTestCustomer();
+        $createdCard = $customer->sources->create(array("card" => $token->id));
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $updatedCards = $updatedCustomer->sources->all();
+        $this->assertSame(count($updatedCards["data"]), 2);
+    }
+
+    public function testCustomerUpdateCard()
+    {
+        $customer = $this->createTestCustomer();
+        $customer->save();
+
+        $sources = $customer->sources->all();
+        $this->assertSame(count($sources["data"]), 1);
+
+        $card = $sources['data'][0];
+        $card->name = "Jane Austen";
+        $card->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $updatedCards = $updatedCustomer->sources->all();
+        $this->assertSame($updatedCards["data"][0]->name, "Jane Austen");
+    }
+
+    public function testCustomerDeleteCard()
+    {
+        $token = Token::create(
+            array("card" => array(
+                "number" => "4242424242424242",
+                "exp_month" => 5,
+                "exp_year" => date('Y') + 3,
+                "cvc" => "314"
+            ))
+        );
+
+        $customer = $this->createTestCustomer();
+        $createdCard = $customer->sources->create(array("card" => $token->id));
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $updatedCards = $updatedCustomer->sources->all();
+        $this->assertSame(count($updatedCards["data"]), 2);
+
+        $deleteStatus = $updatedCustomer->sources->retrieve($createdCard->id)->delete();
+        $this->assertTrue($deleteStatus->deleted);
+        $updatedCustomer->save();
+
+        $postDeleteCustomer = Customer::retrieve($customer->id);
+        $postDeleteCards = $postDeleteCustomer->sources->all();
+        $this->assertSame(count($postDeleteCards["data"]), 1);
+    }
+
+    public function testCustomerAddSource()
+    {
+        self::authorizeFromEnv();
+        $token = Token::create(
+            array("card" => array(
+                "number" => "4242424242424242",
+                "exp_month" => 5,
+                "exp_year" => date('Y') + 3,
+                "cvc" => "314"
+            ))
+        );
+
+        $customer = $this->createTestCustomer();
+        $createdSource = $customer->sources->create(array("source" => $token->id));
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $updatedSources = $updatedCustomer->sources->all();
+        $this->assertSame(count($updatedSources["data"]), 2);
+    }
+
+    public function testCustomerUpdateSource()
+    {
+        $customer = $this->createTestCustomer();
+        $customer->save();
+
+        $sources = $customer->sources->all();
+        $this->assertSame(count($sources["data"]), 1);
+
+        $source = $sources['data'][0];
+        $source->name = "Jane Austen";
+        $source->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $updatedSources = $updatedCustomer->sources->all();
+        $this->assertSame($updatedSources["data"][0]->name, "Jane Austen");
+    }
+
+    public function testCustomerDeleteSource()
+    {
+        self::authorizeFromEnv();
+        $token = Token::create(
+            array("card" => array(
+                "number" => "4242424242424242",
+                "exp_month" => 5,
+                "exp_year" => date('Y') + 3,
+                "cvc" => "314"
+            ))
+        );
+
+        $customer = $this->createTestCustomer();
+        $createdSource = $customer->sources->create(array("source" => $token->id));
+        $customer->save();
+
+        $updatedCustomer = Customer::retrieve($customer->id);
+        $updatedSources = $updatedCustomer->sources->all();
+        $this->assertSame(count($updatedSources["data"]), 2);
+
+        $deleteStatus = $updatedCustomer->sources->retrieve($createdSource->id)->delete();
+        $this->assertTrue($deleteStatus->deleted);
+        $updatedCustomer->save();
+
+        $postDeleteCustomer = Customer::retrieve($customer->id);
+        $postDeleteSources = $postDeleteCustomer->sources->all();
+        $this->assertSame(count($postDeleteSources["data"]), 1);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/DiscountTest.php b/htdocs/includes/stripe/tests/DiscountTest.php
new file mode 100644
index 00000000000..1e77029ad2d
--- /dev/null
+++ b/htdocs/includes/stripe/tests/DiscountTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Stripe;
+
+class DiscountTest extends TestCase
+{
+    public function testDeletion()
+    {
+        self::authorizeFromEnv();
+        $id = 'test-coupon-' . self::generateRandomString(20);
+        $coupon = Coupon::create(
+            array(
+                'percent_off' => 25,
+                'duration' => 'repeating',
+                'duration_in_months' => 5,
+                'id' => $id,
+            )
+        );
+        $customer = self::createTestCustomer(array('coupon' => $id));
+
+        $this->assertTrue(isset($customer->discount));
+        $this->assertTrue(isset($customer->discount->coupon));
+        $this->assertSame($id, $customer->discount->coupon->id);
+
+        $customer->deleteDiscount();
+        $this->assertFalse(isset($customer->discount));
+
+        $customer = Customer::retrieve($customer->id);
+        $this->assertFalse(isset($customer->discount));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/DisputeTest.php b/htdocs/includes/stripe/tests/DisputeTest.php
new file mode 100644
index 00000000000..3c4f29678ea
--- /dev/null
+++ b/htdocs/includes/stripe/tests/DisputeTest.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Stripe;
+
+class DisputeTest extends TestCase
+{
+    public function testUrls()
+    {
+        $this->assertSame(Dispute::classUrl(), '/v1/disputes');
+        $dispute = new Dispute('dp_123');
+        $this->assertSame($dispute->instanceUrl(), '/v1/disputes/dp_123');
+    }
+
+    private function createDisputedCharge()
+    {
+        $card = array(
+            'number' => '4000000000000259',
+            'exp_month' => 5,
+            'exp_year' => date('Y') + 1
+        );
+
+        $c = Charge::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'card' => $card
+            )
+        );
+        $c = Charge::retrieve($c->id);
+
+        $attempts = 0;
+
+        while ($c->dispute === null) {
+            if ($attempts > 5) {
+                throw new \Exception("Charge is taking too long to be disputed");
+            }
+            sleep(1);
+            $c = Charge::retrieve($c->id);
+            $attempts += 1;
+        }
+
+        return $c;
+    }
+
+    public function testAll()
+    {
+        self::authorizeFromEnv();
+
+        $sublist = Dispute::all(
+            array(
+                'limit' => 3,
+            )
+        );
+        $this->assertSame(3, count($sublist->data));
+    }
+
+
+    public function testUpdate()
+    {
+        self::authorizeFromEnv();
+
+        $c = $this->createDisputedCharge();
+
+        $d = Dispute::retrieve($c->dispute);
+        $d->evidence["customer_name"] = "Bob";
+        $s = $d->save();
+
+        $this->assertSame($c->dispute, $s->id);
+        $this->assertSame("Bob", $s->evidence["customer_name"]);
+    }
+
+    public function testClose()
+    {
+        self::authorizeFromEnv();
+
+        $c = $this->createDisputedCharge();
+        $d = Dispute::retrieve($c->dispute);
+
+        $this->assertNotSame("lost", $d->status);
+
+        $d->close();
+
+        $this->assertSame("lost", $d->status);
+    }
+
+    public function testRetrieve()
+    {
+        self::authorizeFromEnv();
+
+        $c = $this->createDisputedCharge();
+
+        $d = Dispute::retrieve($c->dispute);
+
+        $this->assertSame($c->dispute, $d->id);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ErrorTest.php b/htdocs/includes/stripe/tests/ErrorTest.php
new file mode 100644
index 00000000000..75362427510
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ErrorTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Stripe;
+
+class ErrorTest extends TestCase
+{
+    public function testCreation()
+    {
+        try {
+            throw new Error\Api(
+                "hello",
+                500,
+                "{'foo':'bar'}",
+                array('foo' => 'bar')
+            );
+            $this->fail("Did not raise error");
+        } catch (Error\Api $e) {
+            $this->assertSame("hello", $e->getMessage());
+            $this->assertSame(500, $e->getHttpStatus());
+            $this->assertSame("{'foo':'bar'}", $e->getHttpBody());
+            $this->assertSame(array('foo' => 'bar'), $e->getJsonBody());
+            $this->assertSame(null, $e->getHttpHeaders());
+            $this->assertSame(null, $e->getRequestId());
+        }
+    }
+
+    public function testResponseHeaders()
+    {
+        try {
+            throw new Error\Api(
+                "hello",
+                500,
+                "{'foo':'bar'}",
+                array('foo' => 'bar'),
+                array('Request-Id' => 'req_bar')
+            );
+            $this->fail("Did not raise error");
+        } catch (Error\Api $e) {
+            $this->assertSame(array('Request-Id' => 'req_bar'), $e->getHttpHeaders());
+            $this->assertSame('req_bar', $e->getRequestId());
+        }
+    }
+
+    public function testCode()
+    {
+        try {
+            throw new Error\Card(
+                "hello",
+                "some_param",
+                "some_code",
+                400,
+                "{'foo':'bar'}",
+                array('foo' => 'bar')
+            );
+            $this->fail("Did not raise error");
+        } catch (Error\Card $e) {
+            $this->assertSame("some_param", $e->getStripeParam());
+            $this->assertSame('some_code', $e->getStripeCode());
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ExternalAccountTest.php b/htdocs/includes/stripe/tests/ExternalAccountTest.php
new file mode 100644
index 00000000000..70c0068bc45
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ExternalAccountTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Stripe;
+
+class ExternalAccountTest extends TestCase
+{
+    public function testVerify()
+    {
+        self::authorizeFromEnv();
+        $bankAccountToken = Token::create(
+            array(
+                'bank_account' => array(
+                'country' => 'US',
+                'routing_number' => '110000000',
+                'account_number' => '000123456789',
+                'account_holder_name' => 'Jane Austen',
+                'account_holder_type' => 'company'
+                )
+            )
+        );
+        $customer = Customer::create();
+        $externalAccount = $customer->sources->create(array('bank_account' => $bankAccountToken->id));
+        $verifiedAccount = $externalAccount->verify(array('amounts' => array(32, 45)), null);
+
+        $base = Customer::classUrl();
+        $parentExtn = $externalAccount['customer'];
+        $extn = $externalAccount['id'];
+        $this->assertEquals("$base/$parentExtn/sources/$extn", $externalAccount->instanceUrl());
+    }
+}
diff --git a/htdocs/includes/stripe/tests/FileUploadTest.php b/htdocs/includes/stripe/tests/FileUploadTest.php
new file mode 100644
index 00000000000..7d1faf3b00f
--- /dev/null
+++ b/htdocs/includes/stripe/tests/FileUploadTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Stripe;
+
+class FileUploadTest extends TestCase
+{
+    public function testCreateFile()
+    {
+        $fp = fopen(dirname(__FILE__).'/../data/test.png', 'r');
+        self::authorizeFromEnv();
+        $file = FileUpload::create(
+            array(
+                'purpose' => 'dispute_evidence',
+                'file' => $fp,
+            )
+        );
+        fclose($fp);
+        $this->assertSame(95, $file->size);
+        $this->assertSame('png', $file->type);
+    }
+
+    public function testCreateAndRetrieveCurlFile()
+    {
+        if (!class_exists('\CurlFile', false)) {
+            // Older PHP versions don't support this
+            return;
+        }
+
+        $curlFile = new \CurlFile(dirname(__FILE__).'/../data/test.png');
+        self::authorizeFromEnv();
+        $file = FileUpload::create(
+            array(
+                'purpose' => 'dispute_evidence',
+                'file' => $curlFile,
+            )
+        );
+        $this->assertSame(95, $file->size);
+        $this->assertSame('png', $file->type);
+
+        // Just check that we don't get exceptions
+        $file = FileUpload::retrieve($file->id);
+        $file->refresh();
+    }
+}
diff --git a/htdocs/includes/stripe/tests/InvalidRequestErrorTest.php b/htdocs/includes/stripe/tests/InvalidRequestErrorTest.php
new file mode 100644
index 00000000000..6cc6d682911
--- /dev/null
+++ b/htdocs/includes/stripe/tests/InvalidRequestErrorTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Stripe;
+
+class InvalidRequestErrorTest extends TestCase
+{
+    public function testInvalidObject()
+    {
+        self::authorizeFromEnv();
+        try {
+            Customer::retrieve('invalid');
+        } catch (Error\InvalidRequest $e) {
+            $this->assertSame(404, $e->getHttpStatus());
+        }
+    }
+
+    public function testBadData()
+    {
+        self::authorizeFromEnv();
+        try {
+            Charge::create();
+        } catch (Error\InvalidRequest $e) {
+            $this->assertSame(400, $e->getHttpStatus());
+        }
+    }
+}
diff --git a/htdocs/includes/stripe/tests/InvoiceTest.php b/htdocs/includes/stripe/tests/InvoiceTest.php
new file mode 100644
index 00000000000..a55ab83e4ac
--- /dev/null
+++ b/htdocs/includes/stripe/tests/InvoiceTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Stripe;
+
+class InvoiceTest extends TestCase
+{
+    public function testUpcoming()
+    {
+        self::authorizeFromEnv();
+        $customer = self::createTestCustomer();
+
+        InvoiceItem::create(array(
+            'customer'  => $customer->id,
+            'amount'    => 0,
+            'currency'  => 'usd',
+        ));
+
+        $invoice = Invoice::upcoming(array(
+            'customer' => $customer->id,
+        ));
+        $this->assertSame($invoice->customer, $customer->id);
+        $this->assertSame($invoice->attempted, false);
+    }
+
+    public function testItemsAccessWithParameter()
+    {
+        self::authorizeFromEnv();
+        $customer = self::createTestCustomer();
+
+        InvoiceItem::create(array(
+            'customer'  => $customer->id,
+            'amount'    => 100,
+            'currency'  => 'usd',
+        ));
+
+        $invoice = Invoice::upcoming(
+            array(
+            'customer' => $customer->id,
+            )
+        );
+
+        $lines = $invoice->lines->all(array('limit' => 10));
+
+        $this->assertSame(count($lines->data), 1);
+        $this->assertSame($lines->data[0]->amount, 100);
+    }
+
+    // This is really just making sure that this operation does not trigger any
+    // warnings, as it's highly nested.
+    public function testAll()
+    {
+        self::authorizeFromEnv();
+        $invoices = Invoice::all();
+        $this->assertGreaterThan(0, count($invoices));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/PayoutTest.php b/htdocs/includes/stripe/tests/PayoutTest.php
new file mode 100644
index 00000000000..5e99faede87
--- /dev/null
+++ b/htdocs/includes/stripe/tests/PayoutTest.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace Stripe;
+
+class PayoutTest extends TestCase
+{
+    private $managedAccount = null;
+
+    /**
+     * Create a managed account and put enough funds in the balance
+     * to be able to create a payout afterwards. Also try to re-use
+     * the managed account across the tests to avoid hitting the
+     * rate limit for account creation.
+     */
+    private function createAccountWithBalance()
+    {
+        if ($this->managedAccount === null) {
+            self::authorizeFromEnv();
+            $account = self::createTestManagedAccount();
+
+            $charge = \Stripe\Charge::create(array(
+                'currency' => 'usd',
+                'amount' => '10000',
+                'source' => array(
+                    'object' => 'card',
+                    'number' => '4000000000000077',
+                    'exp_month' => '09',
+                    'exp_year' => date('Y') + 3,
+                ),
+                'destination' => array(
+                    'account' => $account->id
+                )
+            ));
+
+            $this->managedAccount = $account;
+        }
+
+        return $this->managedAccount;
+    }
+
+    private function createPayoutFromManagedAccount($accountId)
+    {
+        $payout = Payout::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+            ),
+            array(
+                'stripe_account' => $accountId
+            )
+        );
+
+        return $payout;
+    }
+
+    public function testCreate()
+    {
+        $account = self::createAccountWithBalance();
+        $payout =  self::createPayoutFromManagedAccount($account->id);
+
+        $this->assertSame('pending', $payout->status);
+    }
+
+    public function testRetrieve()
+    {
+        $account = self::createAccountWithBalance();
+        $payout =  self::createPayoutFromManagedAccount($account->id);
+        $reloaded = Payout::retrieve($payout->id, array('stripe_account' => $account->id));
+        $this->assertSame($reloaded->id, $payout->id);
+    }
+
+    public function testPayoutUpdateMetadata()
+    {
+        $account = self::createAccountWithBalance();
+        $payout =  self::createPayoutFromManagedAccount($account->id);
+        $payout->metadata['test'] = 'foo bar';
+        $payout->save();
+
+        $updatedPayout = Payout::retrieve($payout->id, array('stripe_account' => $account->id));
+        $this->assertSame('foo bar', $updatedPayout->metadata['test']);
+    }
+
+    public function testPayoutUpdateMetadataAll()
+    {
+        $account = self::createAccountWithBalance();
+        $payout =  self::createPayoutFromManagedAccount($account->id);
+
+        $payout->metadata = array('test' => 'foo bar');
+        $payout->save();
+
+        $updatedPayout = Payout::retrieve($payout->id, array('stripe_account' => $account->id));
+        $this->assertSame('foo bar', $updatedPayout->metadata['test']);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/PermissionsErrorTest.php b/htdocs/includes/stripe/tests/PermissionsErrorTest.php
new file mode 100644
index 00000000000..cc8a5cd0be0
--- /dev/null
+++ b/htdocs/includes/stripe/tests/PermissionsErrorTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Stripe;
+
+class PermissionErrorTest extends TestCase
+{
+    private function permissionErrorResponse()
+    {
+        return array(
+            'error' => array(),
+        );
+    }
+
+    /**
+     * @expectedException Stripe\Error\Permission
+     */
+    public function testPermission()
+    {
+        $this->mockRequest('GET', '/v1/accounts/acct_DEF', array(), $this->permissionErrorResponse(), 403);
+        Account::retrieve('acct_DEF');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/PlanTest.php b/htdocs/includes/stripe/tests/PlanTest.php
new file mode 100644
index 00000000000..9aa3589c719
--- /dev/null
+++ b/htdocs/includes/stripe/tests/PlanTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Stripe;
+
+class PlanTest extends TestCase
+{
+    public function testDeletion()
+    {
+        self::authorizeFromEnv();
+        $p = Plan::create(array(
+            'amount' => 2000,
+            'interval' => 'month',
+            'currency' => 'usd',
+            'name' => 'Plan',
+            'id' => 'gold-' . self::generateRandomString(20)
+        ));
+        $p->delete();
+        $this->assertTrue($p->deleted);
+    }
+
+    public function testFalseyId()
+    {
+        try {
+            $retrievedPlan = Plan::retrieve('0');
+        } catch (Error\InvalidRequest $e) {
+            // Can either succeed or 404, all other errors are bad
+            if ($e->httpStatus !== 404) {
+                $this->fail();
+            }
+        }
+    }
+
+    public function testSave()
+    {
+        self::authorizeFromEnv();
+        $planID = 'gold-' . self::generateRandomString(20);
+        $p = Plan::create(array(
+            'amount'   => 2000,
+            'interval' => 'month',
+            'currency' => 'usd',
+            'name'     => 'Plan',
+            'id'       => $planID
+        ));
+        $p->name = 'A new plan name';
+        $p->save();
+        $this->assertSame($p->name, 'A new plan name');
+
+        $stripePlan = Plan::retrieve($planID);
+        $this->assertSame($p->name, $stripePlan->name);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ProductTest.php b/htdocs/includes/stripe/tests/ProductTest.php
new file mode 100644
index 00000000000..668d015e380
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ProductTest.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace Stripe;
+
+class ProductSKUOrderTest extends TestCase
+{
+    public function testProductFalseyId()
+    {
+        try {
+            Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
+            $retrievedProduct = Product::retrieve('0');
+        } catch (Error\InvalidRequest $e) {
+            // Can either succeed or 404, all other errors are bad
+            if ($e->httpStatus !== 404) {
+                $this->fail();
+            }
+        }
+    }
+
+    public function testProductCreateUpdateRead()
+    {
+
+        Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
+        $ProductID = 'gold-' . self::generateRandomString(20);
+        $p = Product::create(array(
+            'name'     => 'Gold Product',
+            'id'       => $ProductID,
+            'url'      => 'www.stripe.com/gold'
+        ));
+        $this->assertSame($p->url, 'www.stripe.com/gold');
+
+        $p->name = 'A new Product name';
+        $p->save();
+        $this->assertSame($p->name, 'A new Product name');
+        $this->assertSame($p->url, 'www.stripe.com/gold');
+
+        $stripeProduct = Product::retrieve($ProductID);
+        $this->assertSame($p->name, $stripeProduct->name);
+        $this->assertSame($stripeProduct->url, 'www.stripe.com/gold');
+    }
+
+    public function testSKUCreateUpdateRead()
+    {
+        Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
+        $ProductID = 'silver-' . self::generateRandomString(20);
+        $p = Product::create(array(
+            'name'     => 'Silver Product',
+            'id'       => $ProductID,
+            'url'      => 'www.stripe.com/silver'
+        ));
+
+        $SkuID = 'silver-sku-' . self::generateRandomString(20);
+        $sku = SKU::create(array(
+            'price'     => 500,
+            'currency'  => 'usd',
+            'id'        => $SkuID,
+            'inventory' => array(
+                'type'     => 'finite',
+                'quantity' => 40
+            ),
+            'product'   => $ProductID
+        ));
+
+        $sku->price = 600;
+        $sku->inventory->quantity = 50;
+        $sku->save();
+        $this->assertSame($sku->price, 600);
+        $this->assertSame(50, $sku->inventory->quantity);
+
+        $stripeSku = SKU::retrieve($SkuID);
+        $this->assertSame($sku->price, 600);
+        $this->assertSame('finite', $sku->inventory->type);
+        $this->assertSame(50, $sku->inventory->quantity);
+    }
+
+    public function testSKUProductDelete()
+    {
+        Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
+        $ProductID = 'silver-' . self::generateRandomString(20);
+        $p = Product::create(array(
+            'name'     => 'Silver Product',
+            'id'       => $ProductID,
+            'url'      => 'stripe.com/silver'
+        ));
+
+        $SkuID = 'silver-sku-' . self::generateRandomString(20);
+        $sku = SKU::create(array(
+            'price'     => 500,
+            'currency'  => 'usd',
+            'id'        => $SkuID,
+            'inventory' => array(
+                'type'     => 'finite',
+                'quantity' => 40
+            ),
+            'product'   => $ProductID
+        ));
+
+        $deletedSku = $sku->delete();
+        $this->assertTrue($deletedSku->deleted);
+
+        $deletedProduct = $p->delete();
+        $this->assertTrue($deletedProduct->deleted);
+    }
+
+    public function testOrderCreateUpdateRetrievePayReturn()
+    {
+        Stripe::setApiKey('sk_test_JieJALRz7rPz7boV17oMma7a');
+        $ProductID = 'silver-' . self::generateRandomString(20);
+        $p = Product::create(array(
+            'name'      => 'Silver Product',
+            'id'        => $ProductID,
+            'url'       => 'www.stripe.com/silver',
+            'shippable' => false,
+        ));
+
+        $SkuID = 'silver-sku-' . self::generateRandomString(20);
+        $sku = SKU::create(array(
+            'price'     => 500,
+            'currency'  => 'usd',
+            'id'        => $SkuID,
+            'inventory' => array(
+                'type'     => 'finite',
+                'quantity' => 40
+            ),
+            'product'   => $ProductID
+        ));
+
+        $order = Order::create(array(
+            'items' => array(
+                0 => array(
+                    'type' => 'sku',
+                    'parent' => $SkuID,
+                ),
+            ),
+            'currency' => 'usd',
+            'email' => 'foo@bar.com',
+        ));
+
+        $order->metadata->foo = "bar";
+        $order->save();
+
+        $stripeOrder = Order::retrieve($order->id);
+        $this->assertSame($order->metadata->foo, "bar");
+
+        $order->pay(array(
+            'source' => array(
+                'object' => 'card',
+                'number' => '4242424242424242',
+                'exp_month' => '05',
+                'exp_year' => '2017'
+            ),
+        ));
+        $this->assertSame($order->status, 'paid');
+
+        $orderReturn = $order->returnOrder();
+        $this->assertSame($orderReturn->order, $order->id);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/RateLimitErrorTest.php b/htdocs/includes/stripe/tests/RateLimitErrorTest.php
new file mode 100644
index 00000000000..2d6a6b22a2b
--- /dev/null
+++ b/htdocs/includes/stripe/tests/RateLimitErrorTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Stripe;
+
+class RateLimitErrorTest extends TestCase
+{
+    private function rateLimitErrorResponse()
+    {
+        return array(
+            'error' => array(),
+        );
+    }
+
+    /**
+     * @expectedException Stripe\Error\RateLimit
+     */
+    public function testRateLimit()
+    {
+        $this->mockRequest('GET', '/v1/accounts/acct_DEF', array(), $this->rateLimitErrorResponse(), 429);
+        Account::retrieve('acct_DEF');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/RecipientTest.php b/htdocs/includes/stripe/tests/RecipientTest.php
new file mode 100644
index 00000000000..e26bfe8cddd
--- /dev/null
+++ b/htdocs/includes/stripe/tests/RecipientTest.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace Stripe;
+
+class RecipientTest extends TestCase
+{
+    public function testDeletion()
+    {
+        $recipient = self::createTestRecipient();
+        $recipient->delete();
+
+        $this->assertTrue($recipient->deleted);
+    }
+
+    public function testSave()
+    {
+        $recipient = self::createTestRecipient();
+
+        $recipient->email = 'gdb@stripe.com';
+        $recipient->save();
+        $this->assertSame($recipient->email, 'gdb@stripe.com');
+
+        $stripeRecipient = Recipient::retrieve($recipient->id);
+        $this->assertSame($recipient->email, $stripeRecipient->email);
+    }
+
+    /**
+     * @expectedException Stripe\Error\InvalidRequest
+     */
+    public function testBogusAttribute()
+    {
+        $recipient = self::createTestRecipient();
+        $recipient->bogus = 'bogus';
+        $recipient->save();
+    }
+
+    public function testRecipientAddCard()
+    {
+        $token = Token::create(
+            array("card" => array(
+                "number" => "4000056655665556",
+                "exp_month" => 5,
+                "exp_year" => date('Y') + 3,
+                "cvc" => "314"
+            ))
+        );
+
+        $recipient = $this->createTestRecipient();
+        $createdCard = $recipient->cards->create(array("card" => $token->id));
+        $recipient->save();
+
+        $updatedRecipient = Recipient::retrieve($recipient->id);
+        $updatedCards = $updatedRecipient->cards->all();
+        $this->assertSame(count($updatedCards["data"]), 1);
+    }
+
+    public function testRecipientUpdateCard()
+    {
+        $token = Token::create(
+            array("card" => array(
+                "number" => "4000056655665556",
+                "exp_month" => 5,
+                "exp_year" => date('Y') + 3,
+                "cvc" => "314"
+            ))
+        );
+
+        $recipient = $this->createTestRecipient();
+        $createdCard = $recipient->cards->create(array("card" => $token->id));
+        $recipient->save();
+
+        $createdCards = $recipient->cards->all();
+        $this->assertSame(count($createdCards["data"]), 1);
+
+        $card = $createdCards['data'][0];
+        $card->name = "Jane Austen";
+        $card->save();
+
+        $updatedRecipient = Recipient::retrieve($recipient->id);
+        $updatedCards = $updatedRecipient->cards->all();
+        $this->assertSame($updatedCards["data"][0]->name, "Jane Austen");
+    }
+
+    public function testRecipientDeleteCard()
+    {
+        $token = Token::create(
+            array("card" => array(
+                "number" => "4000056655665556",
+                "exp_month" => 5,
+                "exp_year" => date('Y') + 3,
+                "cvc" => "314"
+            ))
+        );
+
+        $recipient = $this->createTestRecipient();
+        $createdCard = $recipient->cards->create(array("card" => $token->id));
+        $recipient->save();
+
+        $updatedRecipient = Recipient::retrieve($recipient->id);
+        $updatedCards = $updatedRecipient->cards->all();
+        $this->assertSame(count($updatedCards["data"]), 1);
+
+        $deleteStatus =
+        $updatedRecipient->cards->retrieve($createdCard->id)->delete();
+        $this->assertTrue($deleteStatus->deleted);
+        $updatedRecipient->save();
+
+        $postDeleteRecipient = Recipient::retrieve($recipient->id);
+        $postDeleteCards = $postDeleteRecipient->cards->all();
+        $this->assertSame(count($postDeleteCards["data"]), 0);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/RefundTest.php b/htdocs/includes/stripe/tests/RefundTest.php
new file mode 100644
index 00000000000..e9dd8509cd3
--- /dev/null
+++ b/htdocs/includes/stripe/tests/RefundTest.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace Stripe;
+
+class RefundTest extends TestCase
+{
+
+    public function testCreate()
+    {
+        $charge = self::createTestCharge();
+        $refund = Refund::create(array('amount' => 100, 'charge' => $charge->id));
+        $this->assertSame(100, $refund->amount);
+        $this->assertSame($charge->id, $refund->charge);
+    }
+
+    public function testUpdateAndRetrieve()
+    {
+        $charge = self::createTestCharge();
+        $ref = Refund::create(array('amount' => 100, 'charge' => $charge->id));
+        $ref->metadata["key"] = "value";
+        $ref->save();
+        $ref = Refund::retrieve($ref->id);
+        $this->assertSame("value", $ref->metadata["key"], "value");
+    }
+
+    public function testListForCharge()
+    {
+        $charge = self::createTestCharge();
+        $refA = Refund::create(array('amount' => 100, 'charge' => $charge->id));
+        $refB = Refund::create(array('amount' => 50, 'charge' => $charge->id));
+
+        $all = Refund::all(array('charge' => $charge));
+        $this->assertSame(false, $all['has_more']);
+        $this->assertSame(2, count($all->data));
+        $this->assertSame($refB->id, $all->data[0]->id);
+        $this->assertSame($refA->id, $all->data[1]->id);
+    }
+
+    public function testList()
+    {
+        $all = Refund::all();
+
+        // Fetches all refunds on this test account.
+        $this->assertSame(true, $all['has_more']);
+        $this->assertSame(10, count($all->data));
+    }
+
+    public function testCreateForBitcoin()
+    {
+        self::authorizeFromEnv();
+
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $charge = Charge::create(
+            array(
+                'amount' => $receiver->amount,
+                'currency' => $receiver->currency,
+                'description' => $receiver->description,
+                'source' => $receiver->id
+            )
+        );
+
+        $ref = Refund::create(
+            array(
+                'amount' => $receiver->amount,
+                'refund_address' => 'ABCDEF',
+                'charge' => $charge->id
+            )
+        );
+        $this->assertSame($receiver->amount, $ref->amount);
+        $this->assertNotNull($ref->id);
+    }
+
+    // Deprecated charge endpoints:
+
+    public function testCreateViaCharge()
+    {
+        $charge = self::createTestCharge();
+        $ref = $charge->refunds->create(array('amount' => 100));
+        $this->assertSame(100, $ref->amount);
+        $this->assertSame($charge->id, $ref->charge);
+    }
+
+    public function testUpdateAndRetrieveViaCharge()
+    {
+        $charge = self::createTestCharge();
+        $ref = $charge->refunds->create(array('amount' => 100));
+        $ref->metadata["key"] = "value";
+        $ref->save();
+        $ref = $charge->refunds->retrieve($ref->id);
+        $this->assertSame("value", $ref->metadata["key"], "value");
+    }
+
+    public function testListViaCharge()
+    {
+        $charge = self::createTestCharge();
+        $refA = $charge->refunds->create(array('amount' => 50));
+        $refB = $charge->refunds->create(array('amount' => 50));
+
+        $all = $charge->refunds->all();
+        $this->assertSame(false, $all['has_more']);
+        $this->assertSame(2, count($all->data));
+        $this->assertSame($refB->id, $all->data[0]->id);
+        $this->assertSame($refA->id, $all->data[1]->id);
+    }
+
+    public function testCreateForBitcoinViaCharge()
+    {
+        self::authorizeFromEnv();
+
+        $receiver = $this->createTestBitcoinReceiver("do+fill_now@stripe.com");
+
+        $charge = Charge::create(
+            array(
+                'amount' => $receiver->amount,
+                'currency' => $receiver->currency,
+                'description' => $receiver->description,
+                'source' => $receiver->id
+            )
+        );
+
+        $ref = $charge->refunds->create(
+            array(
+                'amount' => $receiver->amount,
+                'refund_address' => 'ABCDEF'
+            )
+        );
+        $this->assertSame($receiver->amount, $ref->amount);
+        $this->assertNotNull($ref->id);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/RequestOptionsTest.php b/htdocs/includes/stripe/tests/RequestOptionsTest.php
new file mode 100644
index 00000000000..11546dd6ece
--- /dev/null
+++ b/htdocs/includes/stripe/tests/RequestOptionsTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Stripe;
+
+class RequestOptionsTest extends TestCase
+{
+    public function testStringAPIKey()
+    {
+        $opts = Util\RequestOptions::parse("foo");
+        $this->assertSame("foo", $opts->apiKey);
+        $this->assertSame(array(), $opts->headers);
+    }
+
+    public function testNull()
+    {
+        $opts = Util\RequestOptions::parse(null);
+        $this->assertSame(null, $opts->apiKey);
+        $this->assertSame(array(), $opts->headers);
+    }
+
+    public function testEmptyArray()
+    {
+        $opts = Util\RequestOptions::parse(array());
+        $this->assertSame(null, $opts->apiKey);
+        $this->assertSame(array(), $opts->headers);
+    }
+
+    public function testAPIKeyArray()
+    {
+        $opts = Util\RequestOptions::parse(
+            array(
+                'api_key' => 'foo',
+            )
+        );
+        $this->assertSame('foo', $opts->apiKey);
+        $this->assertSame(array(), $opts->headers);
+    }
+
+    public function testIdempotentKeyArray()
+    {
+        $opts = Util\RequestOptions::parse(
+            array(
+                'idempotency_key' => 'foo',
+            )
+        );
+        $this->assertSame(null, $opts->apiKey);
+        $this->assertSame(array('Idempotency-Key' => 'foo'), $opts->headers);
+    }
+
+    public function testKeyArray()
+    {
+        $opts = Util\RequestOptions::parse(
+            array(
+                'idempotency_key' => 'foo',
+                'api_key' => 'foo'
+            )
+        );
+        $this->assertSame('foo', $opts->apiKey);
+        $this->assertSame(array('Idempotency-Key' => 'foo'), $opts->headers);
+    }
+
+    /**
+     * @expectedException Stripe\Error\Api
+     */
+    public function testWrongType()
+    {
+        $opts = Util\RequestOptions::parse(5);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/SourceTest.php b/htdocs/includes/stripe/tests/SourceTest.php
new file mode 100644
index 00000000000..5ba142b9be2
--- /dev/null
+++ b/htdocs/includes/stripe/tests/SourceTest.php
@@ -0,0 +1,218 @@
+<?php
+
+namespace Stripe;
+
+class SourceTest extends TestCase
+{
+    public function testRetrieve()
+    {
+        $this->mockRequest(
+            'GET',
+            '/v1/sources/src_foo',
+            array(),
+            array(
+                'id' => 'src_foo',
+                'object' => 'source',
+            )
+        );
+        $source = Source::retrieve('src_foo');
+        $this->assertSame($source->id, 'src_foo');
+    }
+
+    public function testCreate()
+    {
+        $this->mockRequest(
+            'POST',
+            '/v1/sources',
+            array(
+                'type' => 'bitcoin',
+                'amount' => 1000,
+                'currency' => 'usd',
+                'owner' => array('email' => 'jenny.rosen@example.com'),
+            ),
+            array(
+                'id' => 'src_foo',
+                'object' => 'source'
+            )
+        );
+        $source = Source::create(array(
+            'type' => 'bitcoin',
+            'amount' => 1000,
+            'currency' => 'usd',
+            'owner' => array('email' => 'jenny.rosen@example.com'),
+        ));
+        $this->assertSame($source->id, 'src_foo');
+    }
+
+    public function testSave()
+    {
+        $response = array(
+            'id' => 'src_foo',
+            'object' => 'source',
+            'metadata' => array(),
+        );
+        $this->mockRequest(
+            'GET',
+            '/v1/sources/src_foo',
+            array(),
+            $response
+        );
+
+        $response['metadata'] = array('foo' => 'bar');
+        $this->mockRequest(
+            'POST',
+            '/v1/sources/src_foo',
+            array(
+                'metadata' => array('foo' => 'bar'),
+            ),
+            $response
+        );
+
+        $source = Source::retrieve('src_foo');
+        $source->metadata['foo'] = 'bar';
+        $source->save();
+        $this->assertSame($source->metadata['foo'], 'bar');
+    }
+
+    public function testSaveOwner()
+    {
+        $response = array(
+            'id' => 'src_foo',
+            'object' => 'source',
+            'owner' => array(
+                'name' => null,
+                'address' => null,
+            ),
+        );
+        $this->mockRequest(
+            'GET',
+            '/v1/sources/src_foo',
+            array(),
+            $response
+        );
+
+        $response['owner'] = array(
+            'name' => "Stripey McStripe",
+            'address' => array(
+                'line1' => "Test Address",
+                'city' => "Test City",
+                'postal_code' => "12345",
+                'state' => "Test State",
+                'country' => "Test Country",
+            )
+        );
+        $this->mockRequest(
+            'POST',
+            '/v1/sources/src_foo',
+            array(
+                'owner' => array(
+                    'name' => "Stripey McStripe",
+                    'address' => array(
+                        'line1' => "Test Address",
+                        'city' => "Test City",
+                        'postal_code' => "12345",
+                        'state' => "Test State",
+                        'country' => "Test Country",
+                    ),
+                ),
+            ),
+            $response
+        );
+
+        $source = Source::retrieve('src_foo');
+        $source->owner['name'] = "Stripey McStripe";
+        $source->owner['address'] = array(
+            'line1' => "Test Address",
+            'city' => "Test City",
+            'postal_code' => "12345",
+            'state' => "Test State",
+            'country' => "Test Country",
+        );
+        $source->save();
+        $this->assertSame($source->owner['name'], "Stripey McStripe");
+        $this->assertSame($source->owner['address']['line1'], "Test Address");
+        $this->assertSame($source->owner['address']['city'], "Test City");
+        $this->assertSame($source->owner['address']['postal_code'], "12345");
+        $this->assertSame($source->owner['address']['state'], "Test State");
+        $this->assertSame($source->owner['address']['country'], "Test Country");
+    }
+
+    public function testDeleteAttached()
+    {
+        $response = array(
+            'id' => 'src_foo',
+            'object' => 'source',
+            'customer' => 'cus_bar',
+        );
+        $this->mockRequest(
+            'GET',
+            '/v1/sources/src_foo',
+            array(),
+            $response
+        );
+
+        unset($response['customer']);
+        $this->mockRequest(
+            'DELETE',
+            '/v1/customers/cus_bar/sources/src_foo',
+            array(),
+            $response
+        );
+
+        $source = Source::retrieve('src_foo');
+        $source->delete();
+        $this->assertFalse(array_key_exists('customer', $source));
+    }
+
+    /**
+     * @expectedException Stripe\Error\Api
+     */
+    public function testDeleteUnattached()
+    {
+        $response = array(
+            'id' => 'src_foo',
+            'object' => 'source',
+        );
+        $this->mockRequest(
+            'GET',
+            '/v1/sources/src_foo',
+            array(),
+            $response
+        );
+
+        $source = Source::retrieve('src_foo');
+        $source->delete();
+    }
+
+    public function testVerify()
+    {
+        $response = array(
+            'id' => 'src_foo',
+            'object' => 'source',
+            'verification' => array('status' => 'pending'),
+        );
+        $this->mockRequest(
+            'GET',
+            '/v1/sources/src_foo',
+            array(),
+            $response
+        );
+
+        $response['verification']['status'] = 'succeeded';
+        $this->mockRequest(
+            'POST',
+            '/v1/sources/src_foo/verify',
+            array(
+                'values' => array(32, 45),
+            ),
+            $response
+        );
+
+        $source = Source::retrieve('src_foo');
+        $this->assertSame($source->verification->status, 'pending');
+        $source->verify(array(
+            'values' => array(32, 45),
+        ));
+        $this->assertSame($source->verification->status, 'succeeded');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/StripeObjectTest.php b/htdocs/includes/stripe/tests/StripeObjectTest.php
new file mode 100644
index 00000000000..5f922228270
--- /dev/null
+++ b/htdocs/includes/stripe/tests/StripeObjectTest.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Stripe;
+
+class StripeObjectTest extends TestCase
+{
+    public function testArrayAccessorsSemantics()
+    {
+        $s = new StripeObject();
+        $s['foo'] = 'a';
+        $this->assertSame($s['foo'], 'a');
+        $this->assertTrue(isset($s['foo']));
+        unset($s['foo']);
+        $this->assertFalse(isset($s['foo']));
+    }
+
+    public function testNormalAccessorsSemantics()
+    {
+        $s = new StripeObject();
+        $s->foo = 'a';
+        $this->assertSame($s->foo, 'a');
+        $this->assertTrue(isset($s->foo));
+        unset($s->foo);
+        $this->assertFalse(isset($s->foo));
+    }
+
+    public function testArrayAccessorsMatchNormalAccessors()
+    {
+        $s = new StripeObject();
+        $s->foo = 'a';
+        $this->assertSame($s['foo'], 'a');
+
+        $s['bar'] = 'b';
+        $this->assertSame($s->bar, 'b');
+    }
+
+    public function testKeys()
+    {
+        $s = new StripeObject();
+        $s->foo = 'a';
+        $this->assertSame($s->keys(), array('foo'));
+    }
+
+    public function testToArray()
+    {
+        $s = new StripeObject();
+        $s->foo = 'a';
+
+        $converted = $s->__toArray();
+
+        $this->assertInternalType('array', $converted);
+        $this->assertArrayHasKey('foo', $converted);
+        $this->assertEquals('a', $converted['foo']);
+    }
+
+    public function testRecursiveToArray()
+    {
+        $s = new StripeObject();
+        $z = new StripeObject();
+
+        $s->child = $z;
+        $z->foo = 'a';
+
+        $converted = $s->__toArray(true);
+
+        $this->assertInternalType('array', $converted);
+        $this->assertArrayHasKey('child', $converted);
+        $this->assertInternalType('array', $converted['child']);
+        $this->assertArrayHasKey('foo', $converted['child']);
+        $this->assertEquals('a', $converted['child']['foo']);
+    }
+
+    public function testNonexistentProperty()
+    {
+        $s = new StripeObject();
+        $this->assertNull($s->nonexistent);
+    }
+
+    public function testPropertyDoesNotExists()
+    {
+        $s = new StripeObject();
+        $this->assertNull($s['nonexistent']);
+    }
+
+    public function testJsonEncode()
+    {
+        // We can only JSON encode our objects in PHP 5.4+. 5.3 must use ->__toJSON()
+        if (version_compare(phpversion(), '5.4.0', '<')) {
+            return;
+        }
+
+        $s = new StripeObject();
+        $s->foo = 'a';
+
+        $this->assertEquals('{"foo":"a"}', json_encode($s->__toArray()));
+    }
+
+    public function testReplaceNewNestedUpdatable()
+    {
+        StripeObject::init(); // Populate the $nestedUpdatableAttributes Set
+        $s = new StripeObject();
+
+        $s->metadata = array('bar');
+        $this->assertSame($s->metadata, array('bar'));
+        $s->metadata = array('baz', 'qux');
+        $this->assertSame($s->metadata, array('baz', 'qux'));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/SubscriptionItemTest.php b/htdocs/includes/stripe/tests/SubscriptionItemTest.php
new file mode 100644
index 00000000000..4e4a545a5b1
--- /dev/null
+++ b/htdocs/includes/stripe/tests/SubscriptionItemTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Stripe;
+
+class SubscriptionItemTest extends TestCase
+{
+    public function testCreateUpdateRetrieveListCancel()
+    {
+        $plan0ID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($plan0ID);
+
+        $customer = self::createTestCustomer();
+        $sub = Subscription::create(array('plan' => $plan0ID, 'customer' => $customer->id));
+
+        $plan1ID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($plan1ID);
+
+        $subItem = SubscriptionItem::create(array('plan' => $plan1ID, 'subscription' => $sub->id));
+        $this->assertSame($subItem->plan->id, $plan1ID);
+
+        $subItem->quantity = 2;
+        $subItem->save();
+
+        $subItem = SubscriptionItem::retrieve($subItem->id);
+        $this->assertSame($subItem->quantity, 2);
+
+        // Update the quantity parameter one more time
+        $subItem = SubscriptionItem::update($subItem->id, array('quantity' => 3));
+        $this->assertSame($subItem->quantity, 3);
+
+        $subItems = SubscriptionItem::all(array('subscription'=>$sub->id, 'limit'=>3));
+        $this->assertSame(get_class($subItems->data[0]), 'Stripe\SubscriptionItem');
+        $this->assertSame(2, count($subItems->data));
+
+        $subItem->delete();
+        $this->assertTrue($subItem->deleted);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/SubscriptionTest.php b/htdocs/includes/stripe/tests/SubscriptionTest.php
new file mode 100644
index 00000000000..08f74108061
--- /dev/null
+++ b/htdocs/includes/stripe/tests/SubscriptionTest.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace Stripe;
+
+class SubscriptionTest extends TestCase
+{
+
+    public function testCustomerCreateUpdateListCancel()
+    {
+        $planID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($planID);
+
+        $customer = self::createTestCustomer();
+
+        $sub = $customer->subscriptions->create(array('plan' => $planID));
+
+        $this->assertSame($sub->status, 'active');
+        $this->assertSame($sub->plan->id, $planID);
+
+        $sub->quantity = 2;
+        $sub->save();
+
+        $sub = $customer->subscriptions->retrieve($sub->id);
+        $this->assertSame($sub->status, 'active');
+        $this->assertSame($sub->plan->id, $planID);
+        $this->assertSame($sub->quantity, 2);
+
+        $subs = $customer->subscriptions->all(array('limit'=>3));
+        $this->assertSame(get_class($subs->data[0]), 'Stripe\Subscription');
+
+        $sub->cancel(array('at_period_end' => true));
+
+        $sub = $customer->subscriptions->retrieve($sub->id);
+        $this->assertSame($sub->status, 'active');
+        // @codingStandardsIgnoreStart
+        $this->assertTrue($sub->cancel_at_period_end);
+        // @codingStandardsIgnoreEnd
+    }
+
+    public function testCreateUpdateListCancel()
+    {
+        $planID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($planID);
+
+        $customer = self::createTestCustomer();
+
+        $sub = Subscription::create(array('plan' => $planID, 'customer' => $customer->id));
+
+        $this->assertSame($sub->status, 'active');
+        $this->assertSame($sub->plan->id, $planID);
+
+        $sub->quantity = 2;
+        $sub->save();
+
+        $sub = Subscription::retrieve($sub->id);
+        $this->assertSame($sub->status, 'active');
+        $this->assertSame($sub->plan->id, $planID);
+        $this->assertSame($sub->quantity, 2);
+
+        // Update the quantity parameter one more time
+        $sub = Subscription::update($sub->id, array("quantity" => 3));
+        $this->assertSame($sub->status, 'active');
+        $this->assertSame($sub->plan->id, $planID);
+        $this->assertSame($sub->quantity, 3);
+
+        $subs = Subscription::all(array('customer'=>$customer->id, 'plan'=>$planID, 'limit'=>3));
+        $this->assertSame(get_class($subs->data[0]), 'Stripe\Subscription');
+
+        $sub->cancel(array('at_period_end' => true));
+
+        $sub = Subscription::retrieve($sub->id);
+        $this->assertSame($sub->status, 'active');
+        $this->assertTrue($sub->cancel_at_period_end);
+    }
+
+    public function testCreateUpdateListCancelWithItems()
+    {
+        $plan0ID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($plan0ID);
+
+        $customer = self::createTestCustomer();
+
+        $sub = Subscription::create(array(
+          'customer' => $customer->id,
+          'items' => array(
+            array('plan' => $plan0ID),
+          ),
+        ));
+
+        $this->assertSame(count($sub->items->data), 1);
+        $this->assertSame($sub->items->data[0]->plan->id, $plan0ID);
+
+        $plan1ID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($plan1ID);
+
+        $sub = Subscription::update($sub->id, array(
+          'items' => array(
+            array('plan' => $plan1ID),
+          ),
+        ));
+
+        $this->assertSame(count($sub->items->data), 2);
+        $this->assertSame($sub->items->data[0]->plan->id, $plan0ID);
+        $this->assertSame($sub->items->data[1]->plan->id, $plan1ID);
+    }
+
+    public function testDeleteDiscount()
+    {
+        $planID = 'gold-' . self::generateRandomString(20);
+        self::retrieveOrCreatePlan($planID);
+
+        $couponID = '25off-' . self::generateRandomString(20);
+        self::retrieveOrCreateCoupon($couponID);
+
+        $customer = self::createTestCustomer();
+
+        $sub = $customer->subscriptions->create(
+            array(
+                'plan' => $planID,
+                'coupon' => $couponID
+            )
+        );
+
+        $this->assertSame($sub->status, 'active');
+        $this->assertSame($sub->plan->id, $planID);
+        $this->assertSame($sub->discount->coupon->id, $couponID);
+
+        $sub->deleteDiscount();
+        $sub = $customer->subscriptions->retrieve($sub->id);
+        $this->assertNull($sub->discount);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/TestCase.php b/htdocs/includes/stripe/tests/TestCase.php
new file mode 100644
index 00000000000..a1fdc94f917
--- /dev/null
+++ b/htdocs/includes/stripe/tests/TestCase.php
@@ -0,0 +1,271 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Base class for Stripe test cases, provides some utility methods for creating
+ * objects.
+ */
+class TestCase extends \PHPUnit_Framework_TestCase
+{
+    const API_KEY = 'tGN0bIwXnHdwOa85VABjPdSn8nWY7G7I';
+
+    private $mock;
+
+    protected static function authorizeFromEnv()
+    {
+        $apiKey = getenv('STRIPE_API_KEY');
+        if (!$apiKey) {
+            $apiKey = self::API_KEY;
+        }
+
+        Stripe::setApiKey($apiKey);
+    }
+
+    protected function setUp()
+    {
+        ApiRequestor::setHttpClient(HttpClient\CurlClient::instance());
+
+        // Peg the API version so that it can be varied independently of the
+        // one set on the test account.
+        Stripe::setApiVersion('2017-04-06');
+
+        $this->mock = null;
+        $this->call = 0;
+    }
+
+    protected function mockRequest($method, $path, $params = array(), $return = array('id' => 'myId'), $rcode = 200)
+    {
+        $mock = $this->setUpMockRequest();
+        $mock->expects($this->at($this->call++))
+             ->method('request')
+             ->with(strtolower($method), 'https://api.stripe.com' . $path, $this->anything(), $params, false)
+             ->willReturn(array(json_encode($return), $rcode, array()));
+    }
+
+    private function setUpMockRequest()
+    {
+        if (!$this->mock) {
+            self::authorizeFromEnv();
+            $this->mock = $this->getMock('\Stripe\HttpClient\ClientInterface');
+            ApiRequestor::setHttpClient($this->mock);
+        }
+        return $this->mock;
+    }
+
+    /**
+     * Create a valid test charge.
+     */
+    protected static function createTestCharge(array $attributes = array())
+    {
+        self::authorizeFromEnv();
+
+        return Charge::create(
+            $attributes + array(
+                'amount' => 2000,
+                'currency' => 'usd',
+                'description' => 'Charge for test@example.com',
+                'card' => array(
+                    'number' => '4242424242424242',
+                    'exp_month' => 5,
+                    'exp_year' => date('Y') + 3,
+                ),
+            )
+        );
+    }
+
+    /**
+     * Create a valid test transfer.
+     */
+    protected static function createTestTransfer(array $attributes = array(), $opts = null)
+    {
+        self::authorizeFromEnv();
+
+        $recipient = self::createTestRecipient();
+
+        return Transfer::create(
+            $attributes + array(
+                'amount' => 2000,
+                'currency' => 'usd',
+                'description' => 'Transfer to test@example.com',
+                'recipient' => $recipient->id
+            ),
+            $opts
+        );
+    }
+
+    /**
+     * Create a valid test customer.
+     */
+    protected static function createTestCustomer(array $attributes = array())
+    {
+        self::authorizeFromEnv();
+
+        return Customer::create(
+            $attributes + array(
+                'card' => array(
+                    'number' => '4242424242424242',
+                    'exp_month' => 5,
+                    'exp_year' => date('Y') + 3,
+                ),
+            )
+        );
+    }
+
+    /**
+     * Create a valid test recipient
+     */
+    protected static function createTestRecipient(array $attributes = array())
+    {
+        self::authorizeFromEnv();
+
+        return Recipient::create(
+            $attributes + array(
+                'name' => 'PHP Test',
+                'type' => 'individual',
+                'tax_id' => '000000000',
+                'bank_account' => array(
+                    'country' => 'US',
+                    'routing_number' => '110000000',
+                    'account_number' => '000123456789'
+                ),
+            )
+        );
+    }
+
+    /**
+     * Create a test account
+     */
+    protected static function createTestAccount(array $attributes = array())
+    {
+        self::authorizeFromEnv();
+
+        return Account::create(
+            $attributes + array(
+                'managed' => false,
+                'country' => 'US',
+                'email' => self::generateRandomEmail(),
+            )
+        );
+    }
+
+    /**
+     * Create a test account
+     */
+    protected static function createTestManagedAccount(array $attributes = array())
+    {
+        self::authorizeFromEnv();
+
+        return Account::create(
+            $attributes + array(
+                'managed' => true,
+                'country' => 'US',
+                'external_account' => array(
+                    'object' => 'bank_account',
+                    'country' => 'US',
+                    'currency' => 'usd',
+                    'routing_number' => '110000000',
+                    'account_number' => '000123456789'
+                ),
+                'legal_entity' => array(
+                    'type'               => 'individual',
+                    'personal_id_number' => '000000000',
+                    'type'               => 'individual',
+                    'dob'                => array('year' => '1980', 'month' => '01', 'day' => '01'),
+                    'first_name'         => 'John',
+                    'last_name'          => 'Doe',
+                    'address'            => array(
+                        'line1'          => '1234 Main Street',
+                        'postal_code'    => '94110',
+                        'city'           => 'San Francisco'
+                    ),
+                    'personal_address'   => array(
+                        'line1'          => '1234 Main Street',
+                        'postal_code'    => '94110',
+                        'city'           => 'San Francisco'
+                    )
+                ),
+                'tos_acceptance' => array('date' => time(), 'ip' => '127.0.0.1')
+            )
+        );
+    }
+
+    /**
+     * Verify that a plan with a given ID exists, or create a new one if it does
+     * not.
+     */
+    protected static function retrieveOrCreatePlan($id)
+    {
+        self::authorizeFromEnv();
+
+        try {
+            $plan = Plan::retrieve($id);
+        } catch (Error\InvalidRequest $exception) {
+            $plan = Plan::create(
+                array(
+                    'id' => $id,
+                    'amount' => 0,
+                    'currency' => 'usd',
+                    'interval' => 'month',
+                    'name' => 'Gold Test Plan',
+                )
+            );
+        }
+    }
+
+    /**
+     * Verify that a coupon with a given ID exists, or create a new one if it
+     * does not.
+     */
+    protected static function retrieveOrCreateCoupon($id)
+    {
+        self::authorizeFromEnv();
+
+        try {
+            $coupon = Coupon::retrieve($id);
+        } catch (Error\InvalidRequest $exception) {
+            $coupon = Coupon::create(
+                array(
+                    'id' => $id,
+                    'duration' => 'forever',
+                    'percent_off' => 25,
+                )
+            );
+        }
+    }
+
+    /**
+     * Generate a semi-random string
+     */
+    protected static function generateRandomString($length = 24)
+    {
+        $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTU';
+        $charactersLength = strlen($characters);
+        $randomString = '';
+        for ($i = 0; $i < $length; $i++) {
+            $randomString .= $characters[rand(0, $charactersLength - 1)];
+        }
+        return $randomString;
+    }
+
+    /**
+     * Generate a semi-random email.
+     */
+    protected static function generateRandomEmail()
+    {
+        return 'dev-platform-bots+php-'.self::generateRandomString(12).'@stripe.com';
+    }
+
+    protected static function createTestBitcoinReceiver($email)
+    {
+        $receiver = BitcoinReceiver::create(
+            array(
+                'amount' => 100,
+                'currency' => 'usd',
+                'description' => 'some details',
+                'email' => $email
+            )
+        );
+        return $receiver;
+    }
+}
diff --git a/htdocs/includes/stripe/tests/ThreeDSecureTest.php b/htdocs/includes/stripe/tests/ThreeDSecureTest.php
new file mode 100644
index 00000000000..ebdd62335ee
--- /dev/null
+++ b/htdocs/includes/stripe/tests/ThreeDSecureTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Stripe;
+
+class ThreeDSecureTest extends TestCase
+{
+    public function testRetrieve()
+    {
+        $this->mockRequest(
+            'GET',
+            '/v1/3d_secure/tdsrc_test',
+            array(),
+            array(
+                'id' => 'tdsrc_test',
+                'object' => 'three_d_secure'
+            )
+        );
+        $three_d_secure = ThreeDSecure::retrieve('tdsrc_test');
+        $this->assertSame($three_d_secure->id, 'tdsrc_test');
+    }
+
+    public function testCreate()
+    {
+        $this->mockRequest(
+            'POST',
+            '/v1/3d_secure',
+            array(
+                'card' => 'tok_test',
+                'amount' => 1500,
+                'currency' => 'usd',
+                'return_url' => 'https://example.org/3d-secure-result'
+            ),
+            array(
+                'id' => 'tdsrc_test',
+                'object' => 'three_d_secure'
+            )
+        );
+        $three_d_secure = ThreeDSecure::create(array(
+                'card' => 'tok_test',
+                'amount' => 1500,
+                'currency' => 'usd',
+                'return_url' => 'https://example.org/3d-secure-result'
+        ));
+        $this->assertSame($three_d_secure->id, 'tdsrc_test');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/TokenTest.php b/htdocs/includes/stripe/tests/TokenTest.php
new file mode 100644
index 00000000000..60ec76a1544
--- /dev/null
+++ b/htdocs/includes/stripe/tests/TokenTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Stripe;
+
+class TokenTest extends TestCase
+{
+    public function testUrls()
+    {
+        $this->assertSame(Token::classUrl(), '/v1/tokens');
+        $token = new Token('abcd/efgh');
+        $this->assertSame($token->instanceUrl(), '/v1/tokens/abcd%2Fefgh');
+    }
+}
diff --git a/htdocs/includes/stripe/tests/TransferReversalTest.php b/htdocs/includes/stripe/tests/TransferReversalTest.php
new file mode 100644
index 00000000000..86d746650f5
--- /dev/null
+++ b/htdocs/includes/stripe/tests/TransferReversalTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Stripe;
+
+class TransferReversalTest extends TestCase
+{
+    // The resource that was traditionally called "transfer" became a "payout"
+    // in API version 2017-04-06. We're testing traditional transfers here, so
+    // we force the API version just prior anywhere that we need to.
+    private $opts = array('stripe_version' => '2017-02-14');
+
+    public function testList()
+    {
+        $transfer = self::createTestTransfer(array(), $this->opts);
+        $all = $transfer->reversals->all();
+        $this->assertSame(false, $all['has_more']);
+        $this->assertSame(0, count($all->data));
+    }
+}
diff --git a/htdocs/includes/stripe/tests/TransferTest.php b/htdocs/includes/stripe/tests/TransferTest.php
new file mode 100644
index 00000000000..f4fd347dc4e
--- /dev/null
+++ b/htdocs/includes/stripe/tests/TransferTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Stripe;
+
+class TransferTest extends TestCase
+{
+    // The resource that was traditionally called "transfer" became a "payout"
+    // in API version 2017-04-06. We're testing traditional transfers here, so
+    // we force the API version just prior anywhere that we need to.
+    private $opts = array('stripe_version' => '2017-02-14');
+
+    public function testCreate()
+    {
+        $transfer = self::createTestTransfer(array(), $this->opts);
+        $this->assertSame('transfer', $transfer->object);
+    }
+
+    public function testRetrieve()
+    {
+        $transfer = self::createTestTransfer(array(), $this->opts);
+        $reloaded = Transfer::retrieve($transfer->id, $this->opts);
+        $this->assertSame($reloaded->id, $transfer->id);
+    }
+
+    public function testTransferUpdateMetadata()
+    {
+        $transfer = self::createTestTransfer(array(), $this->opts);
+
+        $transfer->metadata['test'] = 'foo bar';
+        $transfer->save();
+
+        $updatedTransfer = Transfer::retrieve($transfer->id, $this->opts);
+        $this->assertSame('foo bar', $updatedTransfer->metadata['test']);
+    }
+
+    public function testTransferUpdateMetadataAll()
+    {
+        $transfer = self::createTestTransfer(array(), $this->opts);
+
+        $transfer->metadata = array('test' => 'foo bar');
+        $transfer->save();
+
+        $updatedTransfer = Transfer::retrieve($transfer->id, $this->opts);
+        $this->assertSame('foo bar', $updatedTransfer->metadata['test']);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/UtilTest.php b/htdocs/includes/stripe/tests/UtilTest.php
new file mode 100644
index 00000000000..a1206d698f7
--- /dev/null
+++ b/htdocs/includes/stripe/tests/UtilTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Stripe;
+
+class UtilTest extends TestCase
+{
+    public function testIsList()
+    {
+        $list = array(5, 'nstaoush', array());
+        $this->assertTrue(Util\Util::isList($list));
+
+        $notlist = array(5, 'nstaoush', array(), 'bar' => 'baz');
+        $this->assertFalse(Util\Util::isList($notlist));
+    }
+
+    public function testThatPHPHasValueSemanticsForArrays()
+    {
+        $original = array('php-arrays' => 'value-semantics');
+        $derived = $original;
+        $derived['php-arrays'] = 'reference-semantics';
+
+        $this->assertSame('value-semantics', $original['php-arrays']);
+    }
+
+    public function testConvertStripeObjectToArrayIncludesId()
+    {
+        $customer = self::createTestCustomer();
+        $this->assertTrue(array_key_exists("id", $customer->__toArray(true)));
+    }
+
+    public function testUtf8()
+    {
+        // UTF-8 string
+        $x = "\xc3\xa9";
+        $this->assertSame(Util\Util::utf8($x), $x);
+
+        // Latin-1 string
+        $x = "\xe9";
+        $this->assertSame(Util\Util::utf8($x), "\xc3\xa9");
+
+        // Not a string
+        $x = true;
+        $this->assertSame(Util\Util::utf8($x), $x);
+    }
+}
diff --git a/htdocs/includes/stripe/tests/bootstrap.no_autoload.php b/htdocs/includes/stripe/tests/bootstrap.no_autoload.php
new file mode 100644
index 00000000000..7358058780a
--- /dev/null
+++ b/htdocs/includes/stripe/tests/bootstrap.no_autoload.php
@@ -0,0 +1,4 @@
+<?php
+
+require_once __DIR__ . '/../init.php';
+require_once __DIR__ . '/TestCase.php';
diff --git a/htdocs/includes/stripe/tests/bootstrap.php b/htdocs/includes/stripe/tests/bootstrap.php
new file mode 100644
index 00000000000..de6ff4e253c
--- /dev/null
+++ b/htdocs/includes/stripe/tests/bootstrap.php
@@ -0,0 +1,3 @@
+<?php
+
+require_once __DIR__ . '/TestCase.php';
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 481f6634227..719c623e146 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/stripe/checkout.php b/htdocs/stripe/checkout.php
new file mode 100644
index 00000000000..0989d55b76f
--- /dev/null
+++ b/htdocs/stripe/checkout.php
@@ -0,0 +1,241 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <2016> SaaSprov.ma  <saasprov@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+// Load Dolibarr environment
+
+
+require_once('config.php');
+require_once('stripe/init.php');
+
+define("NOLOGIN",1);
+define("NOCSRFCHECK",1);
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("stripe");
+
+$SOURCE=GETPOST("source",'alpha');
+$ref=$REF=GETPOST('ref','alpha');
+
+$form = new Form($db);
+
+/**
+ * Header empty
+ *
+ * @return	void
+ */
+function llxHeader() { }
+/**
+ * Footer empty
+ *
+ * @return	void
+ */
+function llxFooter() { }
+
+$invoice = null;
+
+// Payment on customer invoice
+if (GETPOST("source") == 'invoice')
+{
+	$found=true;
+	$langs->load("bills");
+
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+	$invoice=new Facture($db);
+	$result=$invoice->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$invoice->error;
+		$error++;
+	}
+	else
+	{
+		$result=$invoice->fetch_thirdparty($invoice->socid);
+	}
+
+
+}
+
+$pay = false;
+$ttc = $invoice->total_ttc ;
+$ttc = $ttc * 100;
+if (GETPOST("action") == 'charge')
+{
+  $token = GETPOST("stripeToken");
+  $email = GETPOST("stripeEmail");
+
+  $customer = \Stripe\Customer::create(array(
+      'email' => $email,
+      'card'  => $token
+  ));
+	
+	$ttc = round($ttc, 2);
+  $charge = \Stripe\Charge::create(array(
+      'customer' => $customer->id,
+      'amount'   => $ttc,
+      'currency' => $conf->currency,
+      'description' => 'Invoice payment N: '.$ref
+  ));
+
+	$pay = true;
+	
+}
+
+
+
+?>
+
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title><?php echo $langs->trans('PaymentForm'); ?></title>
+    <link rel='stylesheet' type='text/css' href='css/style.css' />
+</head>
+
+<body>
+    <div class="invoice-box">		
+        <table cellpadding="0" cellspacing="0">
+            <tr class="top">
+                <td colspan="2">
+                    <table>
+                        <tr>
+                            <td class="title">                                
+								<?php 
+									if(empty($pay)):
+									print '<form  action="' . $_SERVER['REQUEST_URI'] . '" method="POST">';
+									print '<input type="hidden" name="action" value="charge" />';
+									
+								?>
+								  <script src="https://checkout.stripe.com/checkout.js" 
+										class="stripe-button"
+										data-key="<?php echo $stripe['publishable_key']; ?>"
+										data-amount="<?php echo $ttc; ?>"
+										data-currency="<?php echo $conf->currency; ?>"
+										data-description="<?php echo 'Invoice payment N: '.$ref; ?>">
+									</script>
+								</form>
+								<?php endif; ?>
+                            </td>
+                            
+                            <td>
+                                Invoice #: <?php echo $invoice->ref; ?><br>
+                                <?php echo $langs->trans('Date') . ' : ' . dol_print_date($invoice->date, 'day'); ?><br>
+                                <?php echo $langs->trans('DateMaxPayment') . ' : ' . dol_print_date($invoice->date_validation, 'day'); ?>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            
+            <tr class="information">
+                <td colspan="2">
+                    <table>
+                        <tr>
+                            <td>
+                                <?php echo $invoice->thirdparty->name; ?><br>
+                                <?php echo $invoice->thirdparty->address; ?><br>
+								<?php echo $invoice->thirdparty->zip . ', ' . $invoice->thirdparty->town .' '. $invoice->thirdparty->country_code ; ?>
+                            </td>
+                            
+                            <td>
+                               
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            
+            <tr class="heading">
+                <td>
+                    <?php echo $langs->trans('PaymentConditionsShort'); ?>
+                </td>
+                
+                <td>
+                    <?php echo $form->form_conditions_reglement('', $invoice->cond_reglement_id, 'none'); ?>
+                </td>
+            </tr>
+            
+            
+            <tr class="heading">
+                <td>
+                    TOTAL
+                </td>
+                
+                <td>
+                </td>
+            </tr>
+            
+            <tr class="item">
+                <td>
+                   <?php echo $langs->trans('AmountHT'); ?>
+                </td>
+                
+                <td>
+                    <?php echo price($invoice->total_ht, 1, '', 1, - 1, - 1, $conf->currency); ?>
+                </td>
+            </tr>
+            
+            <tr class="item">
+                <td>
+                    <?php echo $langs->trans('AmountVAT'); ?>
+                </td>
+                
+                <td>
+                    <?php echo price($invoice->total_tva, 1, '', 1, - 1, - 1, $conf->currency); ?>
+                </td>
+            </tr>
+            
+            <tr class="item last">
+                <td>
+                    <?php echo $langs->trans('AmountTTC'); ?>
+                </td>
+                
+                <td>
+                   <?php echo price($invoice->total_ttc, 1, '', 1, - 1, - 1, $conf->currency); ?>
+                </td>
+            </tr>
+            
+            <tr class="total">
+                <td></td>
+                
+                <td>
+                   Total: <?php echo price($invoice->total_ttc, 1, '', 1, - 1, - 1, $conf->currency); ?>
+                </td>
+            </tr>
+			
+			
+        </table>
+		<?php //var_dump($mysoc); ?>
+		
+		<span class="center">
+			<?php html_print_paypal_footer($mysoc,$langs); ?>
+		</span>
+		
+		<?php //echo var_dump($mysoc); ?>
+		
+    </div>
+
+</body>
+</html>
+
+
+
+
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
new file mode 100644
index 00000000000..9cc083051ec
--- /dev/null
+++ b/htdocs/stripe/config.php
@@ -0,0 +1,36 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <2016>  <jamelbaz@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+// Load Dolibarr environment
+if (false === (@include '../main.inc.php')) {  // From htdocs directory
+	require '../../main.inc.php'; // From "custom" directory
+}
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+dol_include_once('/stripe/lib/stripe.lib.php');
+require_once('stripe/init.php');
+
+//use \Stripe\Stripe as Stripe;
+$stripe = array(
+  "secret_key"      => $conf->global->TEST_SECRET_KEY,
+  "publishable_key" => $conf->global->TEST_PUBLISHABLE_KEY
+);
+
+\Stripe\Stripe::setApiKey($stripe['secret_key']);
+?>
\ No newline at end of file
diff --git a/htdocs/stripe/paymnt_link.php b/htdocs/stripe/paymnt_link.php
new file mode 100644
index 00000000000..68adbf47a3c
--- /dev/null
+++ b/htdocs/stripe/paymnt_link.php
@@ -0,0 +1,72 @@
+<?php
+/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+// Load Dolibarr environment
+if (false === (@include '../main.inc.php')) {  // From htdocs directory
+	require '../../main.inc.php'; // From "custom" directory
+}
+require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+
+// Load traductions files requiredby by page
+$langs->load("mymodule");
+$langs->load("other");
+
+// Get parameters
+$id = GETPOST('id', 'int'); // For backward compatibility
+
+$object = new Facture($db);
+// Load object
+if ($id > 0 || ! empty($ref)) {
+	$ret = $object->fetch($id, $ref, '', '', $conf->global->INVOICE_USE_SITUATION);
+}
+
+
+
+
+/***************************************************
+* VIEW
+*
+* Put here all code to build page
+****************************************************/
+
+llxHeader('','StripePaymentLink','');
+
+
+// Part to show record
+if ($id)
+{
+	print load_fiche_titre($langs->trans("StripePaymentLink"));
+    
+	dol_fiche_head();
+	
+	$link = $dolibarr_main_url_root . '/custom/stripe/checkout.php?source=invoice&ref=' . $object->ref;
+	print '<table class="border centpercent">'."\n";
+	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentLink").'</td><td><input class="flat" type="text" size="100%" name="label" value="'.$link.'"></td></tr>';
+	// LIST_OF_TD_LABEL_FIELDS_VIEW
+	print '</table>';
+	
+	dol_fiche_end();
+
+
+
+
+}
+
+llxFooter();
+$db->close();

From 04e119d7a67e9b679a9fedbb6977e405a4e00964 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Tue, 18 Apr 2017 07:03:57 +0200
Subject: [PATCH 0624/1163] New : Add search of accountancy code in main
 thirdparty search

---
 htdocs/societe/list.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 1799fadf9bd..ef162beb750 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -118,7 +118,9 @@ $fieldstosearchall = array(
 	's.nom'=>"ThirdPartyName",
 	's.name_alias'=>"AliasNameShort",
 	's.code_client'=>"CustomerCode",
-    "s.code_fournisseur"=>"SupplierCode",
+    's.code_fournisseur'=>"SupplierCode",
+	's.code_compta'=>"CustomerAccountancyCodeShort",
+	's.code_compta_fournisseur'=>"SupplierAccountancyCodeShort",
 	's.email'=>"EMail",
 	's.url'=>"URL",
     's.tva_intra'=>"VATIntra",

From a52db08cd6d0620b6069b8e89e04722874c48cb6 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Tue, 18 Apr 2017 15:25:04 +0200
Subject: [PATCH 0625/1163] NEW : Add module resources import/export

---
 htdocs/core/class/ctyperesource.class.php | 500 ++++++++++++++++++++++
 htdocs/core/modules/modResource.class.php | 163 +++----
 htdocs/langs/en_US/resource.lang          |   5 +
 3 files changed, 561 insertions(+), 107 deletions(-)
 create mode 100644 htdocs/core/class/ctyperesource.class.php

diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
new file mode 100644
index 00000000000..ee899ad6b86
--- /dev/null
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -0,0 +1,500 @@
+<?php
+/* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    resource/ctyperesource.class.php
+ * \ingroup resource
+ */
+
+/**
+ * Class Ctyperesource
+ *
+ * Put here description of your class
+ *
+ * @see CommonObject
+ */
+class Ctyperesource
+{
+	/**
+	 * @var string Id to identify managed objects
+	 */
+	public $element = 'ctyperesource';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'c_type_resource';
+
+	/**
+	 * @var CtyperesourceLine[] Lines
+	 */
+	public $lines = array();
+
+	/**
+	 */
+	
+	public $code;
+	public $label;
+	public $active;
+
+	/**
+	 */
+	
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+
+		// Clean parameters
+		
+		if (isset($this->code)) {
+			 $this->code = trim($this->code);
+		}
+		if (isset($this->label)) {
+			 $this->label = trim($this->label);
+		}
+		if (isset($this->active)) {
+			 $this->active = trim($this->active);
+		}
+
+		
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Insert request
+		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		
+		$sql.= 'code,';
+		$sql.= 'label';
+		$sql.= 'active';
+
+		
+		$sql .= ') VALUES (';
+		
+		$sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
+		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
+		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
+
+		
+		$sql .= ')';
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+
+			if (!$notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action to call a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) $error++;
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id  Id object
+	 * @param string $ref Ref
+	 *
+	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id,$code='',$label='')
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		
+		$sql .= " t.code,";
+		$sql .= " t.label,";
+		$sql .= " t.active";
+
+		
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		if ($id)   $sql.= " WHERE t.id = ".$id;
+		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		
+		
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$numrows = $this->db->num_rows($resql);
+			if ($numrows) {
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				
+				$this->code = $obj->code;
+				$this->label = $obj->label;
+				$this->active = $obj->active;
+
+				
+			}
+			
+			// Retrieve all extrafields for invoice
+			// fetch optionals attributes and labels
+			/*
+			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+			$extrafields=new ExtraFields($this->db);
+			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+			$this->fetch_optionals($this->id,$extralabels);
+            */
+			
+			// $this->fetch_lines();
+			
+			$this->db->free($resql);
+
+			if ($numrows) {
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param string $sortorder Sort Order
+	 * @param string $sortfield Sort field
+	 * @param int    $limit     offset limit
+	 * @param int    $offset    offset limit
+	 * @param array  $filter    filter array
+	 * @param string $filtermode filter mode (AND or OR)
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		
+		$sql .= " t.code,";
+		$sql .= " t.label,";
+		$sql .= " t.active";
+
+		
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+			}
+		}
+		
+		if (count($sqlwhere) > 0) {
+			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+		}
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield,$sortorder);
+		}
+		if (!empty($limit)) {
+		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+
+			while ($obj = $this->db->fetch_object($resql)) {
+				$line = new self($this->db);
+
+				$line->id = $obj->rowid;
+				
+				$line->code = $obj->code;
+				$line->label = $obj->label;
+				$line->active = $obj->active;
+
+				
+			}
+			$this->db->free($resql);
+
+			return $num;
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		// Clean parameters
+		
+		if (isset($this->code)) {
+			 $this->code = trim($this->code);
+		}
+		if (isset($this->label)) {
+			 $this->label = trim($this->label);
+		}
+		if (isset($this->active)) {
+			 $this->active = trim($this->active);
+		}
+
+		// Check parameters
+		// Put here code to add a control on parameters values
+
+		// Update request
+		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		
+		$sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
+		$sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
+		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
+
+        
+		$sql .= ' WHERE rowid=' . $this->id;
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error && !$notrigger) {
+			// Uncomment this and change MYOBJECT to your own tag if you
+			// want this action calls a trigger.
+
+			//// Call triggers
+			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+			//// End call triggers
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user      User that deletes
+	 * @param bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+
+		$this->db->begin();
+
+		if (!$error) {
+			if (!$notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
+
+		// If you need to delete child tables to, you can insert them here
+		
+		if (!$error) {
+			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+			$sql .= ' WHERE rowid=' . $this->id;
+
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Load an object from its id and create a new one in database
+	 *
+	 * @param int $fromid Id of object to clone
+	 *
+	 * @return int New id of clone
+	 */
+	public function createFromClone($fromid)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		global $user;
+		$error = 0;
+		$object = new Ctyperesource($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$object->fetch($fromid);
+		// Reset object
+		$object->id = 0;
+
+		// Clear fields
+		// ...
+
+		// Create clone
+		$result = $object->create($user);
+
+		// Other options
+		if ($result < 0) {
+			$error ++;
+			$this->errors = $object->errors;
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+
+			return $object->id;
+		} else {
+			$this->db->rollback();
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		
+		$this->code = '';
+		$this->label = '';
+		$this->active = '';
+	}
+
+}
+
+/**
+ * Class CtyperesourceLine
+ */
+class CtyperesourceLine
+{
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	/**
+	 * @var mixed Sample line property 1
+	 */
+	
+	public $code;
+	public $label;
+	public $active;
+
+	/**
+	 * @var mixed Sample line property 2
+	 */
+	
+}
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index d3aa3405d0b..f6674bdcfd7 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -201,22 +201,6 @@ class modResource extends DolibarrModules
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
 
 
-		// Add here list of permission defined by
-		// an id, a label, a boolean and two constant strings.
-		// Example:
-		//// Permission id (must not be already used)
-		//$this->rights[$r][0] = 2000;
-		//// Permission label
-		//$this->rights[$r][1] = 'Permision label';
-		//// Permission by default for new user (0/1)
-		//$this->rights[$r][3] = 0;
-		//// In php code, permission will be checked by test
-		//// if ($user->rights->permkey->level1->level2)
-		//$this->rights[$r][4] = 'level1';
-		//// In php code, permission will be checked by test
-		//// if ($user->rights->permkey->level1->level2)
-		//$this->rights[$r][5] = 'level2';
-		//$r++;
 		// Main menu entries
 		$this->menu = array(); // List of menus to add
 		$r = 0;
@@ -267,98 +251,63 @@ class modResource extends DolibarrModules
 			'user'=> 0
 		);
 
-		// Exports
-		$r = 1;
 
-		// Example:
-		//$this->export_code[$r]=$this->rights_class.'_'.$r;
-		//// Translation key (used only if key ExportDataset_xxx_z not found)
-		//$this->export_label[$r]='CustomersInvoicesAndInvoiceLines';
-		//// Condition to show export in list (ie: '$user->id==3').
-		//// Set to 1 to always show when module is enabled.
-		//$this->export_enabled[$r]='1';
-		//$this->export_permission[$r]=array(array("facture","facture","export"));
-		//$this->export_fields_array[$r]=array(
-		//	's.rowid'=>"IdCompany",
-		//	's.nom'=>'CompanyName',
-		//	's.address'=>'Address',
-		//	's.cp'=>'Zip',
-		//	's.ville'=>'Town',
-		//	's.fk_pays'=>'Country',
-		//	's.tel'=>'Phone',
-		//	's.siren'=>'ProfId1',
-		//	's.siret'=>'ProfId2',
-		//	's.ape'=>'ProfId3',
-		//	's.idprof4'=>'ProfId4',
-		//	's.code_compta'=>'CustomerAccountancyCode',
-		//	's.code_compta_fournisseur'=>'SupplierAccountancyCode',
-		//	'f.rowid'=>"InvoiceId",
-		//	'f.facnumber'=>"InvoiceRef",
-		//	'f.datec'=>"InvoiceDateCreation",
-		//	'f.datef'=>"DateInvoice",
-		//	'f.total'=>"TotalHT",
-		//	'f.total_ttc'=>"TotalTTC",
-		//	'f.tva'=>"TotalVAT",
-		//	'f.paye'=>"InvoicePaid",
-		//	'f.fk_statut'=>'InvoiceStatus',
-		//	'f.note'=>"InvoiceNote",
-		//	'fd.rowid'=>'LineId',
-		//	'fd.description'=>"LineDescription",
-		//	'fd.price'=>"LineUnitPrice",
-		//	'fd.tva_tx'=>"LineVATRate",
-		//	'fd.qty'=>"LineQty",
-		//	'fd.total_ht'=>"LineTotalHT",
-		//	'fd.total_tva'=>"LineTotalTVA",
-		//	'fd.total_ttc'=>"LineTotalTTC",
-		//	'fd.date_start'=>"DateStart",
-		//	'fd.date_end'=>"DateEnd",
-		//	'fd.fk_product'=>'ProductId',
-		//	'p.ref'=>'ProductRef'
-		//);
-		//$this->export_entities_array[$r]=array('s.rowid'=>"company",
-		//	's.nom'=>'company',
-		//	's.address'=>'company',
-		//	's.cp'=>'company',
-		//	's.ville'=>'company',
-		//	's.fk_pays'=>'company',
-		//	's.tel'=>'company',
-		//	's.siren'=>'company',
-		//	's.siret'=>'company',
-		//	's.ape'=>'company',
-		//	's.idprof4'=>'company',
-		//	's.code_compta'=>'company',
-		//	's.code_compta_fournisseur'=>'company',
-		//	'f.rowid'=>"invoice",
-		//	'f.facnumber'=>"invoice",
-		//	'f.datec'=>"invoice",
-		//	'f.datef'=>"invoice",
-		//	'f.total'=>"invoice",
-		//	'f.total_ttc'=>"invoice",
-		//	'f.tva'=>"invoice",
-		//	'f.paye'=>"invoice",
-		//	'f.fk_statut'=>'invoice',
-		//	'f.note'=>"invoice",
-		//	'fd.rowid'=>'invoice_line',
-		//	'fd.description'=>"invoice_line",
-		//	'fd.price'=>"invoice_line",
-		//	'fd.total_ht'=>"invoice_line",
-		//	'fd.total_tva'=>"invoice_line",
-		//	'fd.total_ttc'=>"invoice_line",
-		//	'fd.tva_tx'=>"invoice_line",
-		//	'fd.qty'=>"invoice_line",
-		//	'fd.date_start'=>"invoice_line",
-		//	'fd.date_end'=>"invoice_line",
-		//	'fd.fk_product'=>'product',
-		//	'p.ref'=>'product'
-		//);
-		//$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-		//$this->export_sql_end[$r] = ' FROM (' . MAIN_DB_PREFIX . 'facture as f, '
-		//	. MAIN_DB_PREFIX . 'facturedet as fd, ' . MAIN_DB_PREFIX . 'societe as s)';
-		//$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX
-		//	. 'product as p on (fd.fk_product = p.rowid)';
-		//$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid '
-		//	. 'AND f.rowid = fd.fk_facture';
-		//$r++;
+		// Exports
+		//--------
+		$r=0;
+		
+		$r++;
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]="ResourceSingular";	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_permission[$r]=array(array("resource","read"));
+		$this->export_fields_array[$r]=array('r.rowid'=>'IdResource','r.ref'=>'ResourceFormLabel_ref','c.code'=>'ResourceTypeCode','c.label'=>'ResourceType','r.description'=>'ResourceFormLabel_description','r.note_private'=>"NotePrivate",'r.note_public'=>"NotePublic",'r.asset_number'=>'AssetNumber','r.datec'=>"DateCreation",'r.tms'=>"DateLastModification");
+		$this->export_TypeFields_array[$r]=array('r.rowid'=>'List:resource:ref','r.ref'=>'Text','r.asset_number'=>'Text','r.description'=>'Text','c.code'=>'Text','c.label'=>'List:c_type_resource:label','r.datec'=>'Date','r.tms'=>'Date','r.note_private'=>'Text','r.note_public'=>'Text');
+		$this->export_entities_array[$r]=array('r.rowid'=>'resource','r.ref'=>'resource','c.code'=>'resource','c.label'=>'resource','r.description'=>'resource','r.note_private'=>"resource",'r.resource'=>"resource",'r.asset_number'=>'resource','r.datec'=>"resource",'r.tms'=>"resource");
+		$keyforselect='resource'; $keyforelement='resource'; $keyforaliasextra='extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		
+		$this->export_dependencies_array[$r]=array('resource'=>array('r.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'resource as r ';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_resource as c ON c.rowid=r.fk_code_type_resource';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'resource_extrafields as extra ON extra.fk_object = c.rowid';
+		$this->export_sql_end[$r] .=' AND r.entity IN ('.getEntity('resource',1).')';
+		
+
+		// Imports
+		//--------
+		$r=0;
+		
+		// Import list of third parties and attributes
+		$r++;
+		$this->import_code[$r]=$this->rights_class.'_'.$r;
+		$this->import_label[$r]='ImportDataset_resource_1';
+		$this->import_icon[$r]='resource';
+		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r]=array('r'=>MAIN_DB_PREFIX.'resource','extra'=>MAIN_DB_PREFIX.'resource_extrafields');	// List of tables to insert into (insert done in same order)
+		$this->import_fields_array[$r]=array('r.ref'=>"ResourceFormLabel_ref*",'r.fk_code_type_resource'=>'ResourceTypeCode','r.description'=>'ResourceFormLabel_description','r.note_private'=>"NotePrivate",'r.note_public'=>"NotePublic",'r.asset_number'=>'AssetNumber','r.datec'=>'DateCreation');
+		// Add extra fields
+		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'resource' AND entity = ".$conf->entity;
+		$resql=$this->db->query($sql);
+		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		{
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$fieldname='extra.'.$obj->name;
+				$fieldlabel=ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
+			}
+		}
+		// End add extra fields
+		$this->import_fieldshidden_array[$r]=array('r.fk_user_author'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'resource');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+		$this->import_convertvalue_array[$r]=array(
+				'r.fk_code_type_resource'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/core/class/ctyperesource.class.php','class'=>'Ctyperesource','method'=>'fetch','dict'=>'DictionaryResourceType'),
+		);
+		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
+		$this->import_regex_array[$r]=array('s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
+		$this->import_examplevalues_array[$r]=array('r.ref'=>"REF1",'r.fk_code_type_resource'=>"Code from dictionnary resource type",'r.datec'=>"2017-01-01 or 2017-01-01 12:30:00");
+		$this->import_updatekeys_array[$r]=array('r.rf'=>'ResourceFormLabel_ref');
+		
 	}
 
 	/**
diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang
index f95121db351..5a907f6ba23 100644
--- a/htdocs/langs/en_US/resource.lang
+++ b/htdocs/langs/en_US/resource.lang
@@ -29,3 +29,8 @@ RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
 SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Resources

From 4efb1ba23a2193df98529da643a8848d30ffbdf7 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Tue, 18 Apr 2017 15:27:18 +0200
Subject: [PATCH 0626/1163] update credentials

---
 htdocs/core/class/ctyperesource.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index ee899ad6b86..553c0f0d0cd 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -1,9 +1,8 @@
 <?php
 /* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
- * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2016       Florian Henry       <florian.henry@atm-consulting.fr>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 8bb7f858d96c7eca0ab038a760cac031732e22c7 Mon Sep 17 00:00:00 2001
From: David <dvasseur@users.noreply.github.com>
Date: Tue, 18 Apr 2017 16:47:06 +0200
Subject: [PATCH 0627/1163] fix params order for tha addline() function

please check to last param "$request_data->fk_remise_except", I couldn't find a corresponding parameter name in the addline() function
---
 htdocs/comm/propal/class/api_proposals.class.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 0440793ceac..ec7ca53357a 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -260,12 +260,9 @@ class Proposals extends DolibarrApi
                         $request_data->localtax2_tx,
                         $request_data->fk_product,
                         $request_data->remise_percent,
-                        $request_data->info_bits,
-                        $request_data->fk_remise_except,
                         'HT',
                         0,
-                        $request_data->date_start,
-                        $request_data->date_end,
+                        $request_data->info_bits,
                         $request_data->product_type,
                         $request_data->rang,
                         $request_data->special_code,
@@ -273,10 +270,14 @@ class Proposals extends DolibarrApi
                         $request_data->fk_fournprice,
                         $request_data->pa_ht,
                         $request_data->label,
+                        $request_data->date_start,
+                        $request_data->date_end,
                         $request_data->array_options,
                         $request_data->fk_unit,
                         $this->element,
                         $request_data->id
+                        // not used anymore ?
+                        // $request_data->fk_remise_except
       );
 
       if ($updateRes > 0) {

From 50210d0dd6dfec45185770d60a047e7fece7015f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Apr 2017 17:04:56 +0200
Subject: [PATCH 0628/1163] NEW Add tooltip help on shipment weight and volume
 calculation

---
 htdocs/expedition/card.php       | 30 +++++++++++++++++++-----------
 htdocs/langs/en_US/products.lang |  1 +
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index c7893aefd2f..cbe602f7313 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -726,7 +726,9 @@ if ($action == 'create')
             print '<tr><td>';
             print $langs->trans("Weight");
             print '</td><td><input name="weight" size="4" value="'.GETPOST('weight','int').'"> ';
-            print $formproduct->select_measuring_units("weight_units","weight",GETPOST('weight_units','int'));
+            $text=$formproduct->select_measuring_units("weight_units","weight",GETPOST('weight_units','int'));
+            $htmltext=$langs->trans("KeepEmptyForAutoCalculation");
+            print $form->textwithpicto($text, $htmltext);
             print '</td></tr>';
             // Dim
             print '<tr><td>';
@@ -735,7 +737,9 @@ if ($action == 'create')
             print ' x <input name="sizeH" size="4" value="'.GETPOST('sizeH','int').'">';
             print ' x <input name="sizeS" size="4" value="'.GETPOST('sizeS','int').'">';
             print ' ';
-            print $formproduct->select_measuring_units("size_units","size");
+            $text=$formproduct->select_measuring_units("size_units","size");
+            $htmltext=$langs->trans("KeepEmptyForAutoCalculation");
+            print $form->textwithpicto($text, $htmltext);
             print '</td></tr>';
 
             // Delivery method
@@ -865,7 +869,7 @@ if ($action == 'create')
                 if (! empty($line->date_start)) $type=1;
                 if (! empty($line->date_end)) $type=1;
 
-                print "<tr ".$bc[$var].">\n";
+                print '<tr class="oddeven">'."\n";
                 
                 // Product label
                 if ($line->fk_product > 0)  // If predefined product
@@ -1096,10 +1100,10 @@ if ($action == 'create')
                                 $nbofsuggested++;
 						    }
 						}
+						$tmpwarehouseObject=new Entrepot($db);
 						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)    // $stock_warehouse is product_stock
 						{
-							$warehouseObject=new Entrepot($db);
-							$warehouseObject->fetch($warehouse_id);
+							$tmpwarehouseObject->fetch($warehouse_id);
 							if ($stock_warehouse->real > 0) 
 							{
 								$stock = + $stock_warehouse->real; // Convert it to number
@@ -1122,7 +1126,7 @@ if ($action == 'create')
 									print '<td align="left">';
 									if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 									{
-										print $warehouseObject->getNomUrl(0).' ';
+										print $tmpwarehouseObject->getNomUrl(0).' ';
 										 
 										print '<!-- Show details of stock -->';
 										print '('.$stock.')';
@@ -1158,7 +1162,7 @@ if ($action == 'create')
 									{
 										$img=img_warning($langs->trans("StockTooLow"));
 									}
-									print "<tr ".$bc[$var]."><td>";
+									print '<tr class"oddeven"><td>';
 									print "&nbsp; &nbsp; &nbsp; ->
 									<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
 									</a> (".$value['nb'].")</td><td align=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
@@ -1175,7 +1179,7 @@ if ($action == 'create')
 						$subj=0;
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 						
-						$warehouseObject=new Entrepot($db);
+						$tmpwarehouseObject=new Entrepot($db);
 						$productlotObject=new Productlot($db);
 						// Define nb of lines suggested for this order line
 						$nbofsuggested=0;
@@ -1190,7 +1194,7 @@ if ($action == 'create')
 						}
 						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse) 
 						{
-							$warehouseObject->fetch($warehouse_id);
+							$tmpwarehouseObject->fetch($warehouse_id);
 							if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
 						        foreach ($stock_warehouse->detail_batch as $dbatch)
 								{
@@ -1203,7 +1207,7 @@ if ($action == 'create')
 									 
 									print '<td align="left">';
 									 
-									print $warehouseObject->getNomUrl(0).' / ';
+									print $tmpwarehouseObject->getNomUrl(0).' / ';
 									 
 									print '<!-- Show details of lot -->';
 									print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
@@ -1223,6 +1227,7 @@ if ($action == 'create')
 								}
 							}
 						}
+						
 					}
 					if ($subj == 0) // Line not shown yet, we show it
 					{
@@ -1246,8 +1251,11 @@ if ($action == 'create')
 						print '<td align="left">';
 						if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
-    						if ($warehouseObject) 
+							$warehouse_selected_id = GETPOST('entrepot_id','int');							
+    						if ($warehouse_selected_id > 0) 
     						{
+    							$warehouseObject=new Entrepot($db);
+    							$warehouseObject->fetch($warehouse_selected_id);
     							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->libelle);
     						}
     						else
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 48ced509c47..0ab21cae322 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -198,6 +198,7 @@ MultipriceRules=Price segment rules
 UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
+KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
 ### composition fabrication
 Build=Produce
 ProductsMultiPrice=Products and prices for each price segment

From 529ae1fa92b4da7f3baae2cc3a13bfdb4f8f1dc4 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Wed, 19 Apr 2017 10:01:43 +0200
Subject: [PATCH 0629/1163] Update propal.class.php

---
 htdocs/comm/propal/class/propal.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 9aad218e66f..46c6a55cf2f 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3135,7 +3135,7 @@ class Propal extends CommonObject
             {
             	$prodid = mt_rand(1, $num_prods);
             	$line->fk_product=$prodids[$prodid];
-				$line->product_ref='SPECIMEN';
+		$line->product_ref='SPECIMEN';
             }
 
             $this->lines[$xnbp]=$line;

From 213e0d28708d7997e8eec1653dfc3a1db2fb27d6 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Wed, 19 Apr 2017 14:49:12 +0200
Subject: [PATCH 0630/1163] fix travis

---
 htdocs/core/class/ctyperesource.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index 553c0f0d0cd..1de616210e4 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -154,7 +154,8 @@ class Ctyperesource
 	 * Load object in memory from the database
 	 *
 	 * @param int    $id  Id object
-	 * @param string $ref Ref
+	 * @param string $code code
+	 * @param string $label Label
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */

From b7f1e74f6f347697bb4b1e7efe3723cf0701f7d4 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 20 Apr 2017 10:27:44 +0200
Subject: [PATCH 0631/1163] New SITUATION_DISPLAY_DIFF_ON_PDF feature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

allow to display or
the progress situation percent value
the diférential situation percent value
---
 htdocs/core/lib/pdf.lib.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 282bdec690e..d1a5e64dce2 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1808,8 +1808,17 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->situation_percent . '%';
+        	if ($object->lines[$i]->special_code == 3) return '';
+		if (empty($hidedetails) || $hidedetails > 1)
+		{
+			if($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)
+			{
+			 	$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+			 	$result = ($prev_progress - $object->lines[$i]->situation_percent) . '%';
+			}
+			else
+				$result = $object->lines[$i]->situation_percent . '%';
+	  	}
 	}
 	return $result;
 }

From 635894cf10bf2435371de8c78b475e8fdec62469 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Thu, 20 Apr 2017 14:51:36 +0200
Subject: [PATCH 0632/1163] Update code using new css class

---
 htdocs/admin/agenda.php       |  3 +--
 htdocs/admin/agenda_other.php |  3 +--
 htdocs/admin/bank.php         |  4 +---
 htdocs/admin/company.php      | 33 ++++++++++++---------------------
 htdocs/admin/compta.php       | 10 ++++------
 htdocs/admin/events.php       |  2 +-
 htdocs/admin/fichinter.php    |  8 ++------
 7 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index d076fcf7e26..051179d61ca 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -150,7 +150,6 @@ print $langs->trans("AgendaAutoActionDesc")."<br>\n";
 print $langs->trans("OnlyActiveElementsAreShown").'<br>';
 print "<br>\n";
 
-$var=true;
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans("ActionsEvents").'</td>';
@@ -180,7 +179,7 @@ if (! empty($triggers))
 			print '<td align="right" width="40">';
 			$key='MAIN_AGENDA_ACTIONAUTO_'.$trigger['code'];
 			$value=$conf->global->$key;
-			print '<input '.$bc[$var].' type="checkbox" name="'.$key.'" value="1"'.((($action=='selectall'||$value) && $action!="selectnone")?' checked':'').'>';
+			print '<input class="oddeven" type="checkbox" name="'.$key.'" value="1"'.((($action=='selectall'||$value) && $action!="selectnone")?' checked':'').'>';
 			print '</td></tr>'."\n";
 		}
 	}
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 6e0a62610aa..1e2247514d9 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -245,7 +245,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     
     clearstatcache();
     
-    $var=true;
     foreach ($dirmodels as $reldir)
     {
     	$dir = dol_buildpath($reldir."core/modules/action/doc/");
@@ -266,7 +265,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			$module = new $classname($db, new ActionComm($db));
             			
             			
-            			print "<tr ".$bc[$var].">\n";
+            			print '<tr class="oddeven">\n';
             			print "<td>";
             			print (empty($module->name)?$name:$module->name);
             			print "</td>\n";
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 98cecb2f44b..8ed1e3cd9ac 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -273,7 +273,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var = true;
 foreach ($dirmodels as $reldir) 
 {
     foreach (array('', '/doc') as $valdir) {
@@ -305,8 +304,7 @@ foreach ($dirmodels as $reldir)
                                 $modulequalified = 0;
                             
                             if ($modulequalified) {
-                                $var = ! $var;
-                                print '<tr ' . $bc[$var] . '><td width="100">';
+                                print '<tr class="oddeven"><td width="100">';
                                 print(empty($module->name) ? $name : $module->name);
                                 print "</td><td>\n";
                                 if (method_exists($module, 'info'))
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 8c29fe67a1c..94cc66fd755 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -545,7 +545,6 @@ if ($action == 'edit' || $action == 'updateedit')
 	print '<tr class="liste_titre">';
 	print '<td class="titlefield">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
 	print '<tr class="oddeven"><td><label for="fiscalmonthstart">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
@@ -561,10 +560,9 @@ if ($action == 'edit' || $action == 'updateedit')
 	print '<td class="titlefield">'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
 	print '<td align="right">&nbsp;</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
-	print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
+	print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
@@ -573,7 +571,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	print "</td></tr>\n";
 
 	
-	print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
+	print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label for=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
@@ -595,10 +593,9 @@ if ($action == 'edit' || $action == 'updateedit')
 		print '<td>'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 		
 		// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print '<table class="nobordernopadding">';
 		print "<tr><td><label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -620,7 +617,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"nolt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -639,11 +636,10 @@ if ($action == 'edit' || $action == 'updateedit')
 		print '<td>'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 
 		
 		// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print '<table class="nobordernopadding">';
 		print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -662,7 +658,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -696,7 +692,6 @@ else
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>';
-	$var=true;
 
 	
 	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("CompanyName").'</td><td>';
@@ -965,7 +960,6 @@ else
 	print '<tr class="liste_titre">';
 	print '<td class="titlefield">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
 	print '<tr class="oddeven"><td>'.$langs->trans("FiscalMonthStart").'</td><td>';
@@ -983,10 +977,9 @@ else
 	print '<td>'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
 	print '<td align="right">&nbsp;</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
-	print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
+	print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
@@ -995,7 +988,7 @@ else
 	print "</td></tr>\n";
 
 	
-	print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
+	print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
@@ -1018,10 +1011,9 @@ else
 		print '<td>'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td></label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1049,7 +1041,7 @@ else
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"no_lt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1069,10 +1061,9 @@ else
 		print '<td>'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1101,7 +1092,7 @@ else
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index c097b9f39b1..4c289ee25c7 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2013 Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2013-2016 Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2017 Philippe Grand	    <philippe.grand@atoo-net.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -119,7 +119,7 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans('OptionMode').'</td><td>'.$langs->trans('Description').'</td>';
 print "</tr>\n";
-print '<tr '.$bc[false].'><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
+print '<tr class=\"oddeven\"><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 // Write info on way to count VAT
 //if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
@@ -133,7 +133,7 @@ print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 //	//	print nl2br($langs->trans('OptionModeTrueInfoExpert'));
 //}
 print "</td></tr>\n";
-print '<tr '.$bc[true].'><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
+print '<tr class=\"oddeven\"><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
 
 print "</table>\n";
@@ -148,9 +148,7 @@ print "</tr>\n";
 
 foreach ($list as $key)
 {
-	
-
-	print '<tr '.$bc[$var].' class="value">';
+	print '<tr class="oddeven value">';
 
 	// Param
 	$libelle = $langs->trans($key);
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 161b1aac45d..74525a6855b 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -105,7 +105,7 @@ foreach ($eventstolog as $key => $arr)
 		print '<td>';
 		$key='MAIN_LOGEVENTS_'.$arr['id'];
 		$value=$conf->global->$key;
-		print '<input '.$bc[$var].' type="checkbox" name="'.$key.'" value="1"'.($value?' checked':'').'>';
+		print '<input class="oddeven" type="checkbox" name="'.$key.'" value="1"'.($value?' checked':'').'>';
 		print '</td></tr>'."\n";
 	}
 }
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 6c73afcf8f5..fce15178cdb 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2014 Regis Houssin                <regis.houssin@capnetworks.com>
  * Copyright (C) 2008      Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
- * Copyright (C) 2011-2015 Philippe Grand			    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2017 Philippe Grand			    <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -410,7 +410,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var=true;
 foreach ($dirmodels as $reldir)
 {
 	$dir = dol_buildpath($reldir."core/modules/fichinter/doc/");
@@ -532,9 +531,7 @@ print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "<td>&nbsp;</td>\n";
 print "</tr>\n";
-$var=true;
 
-$var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_FICHINTER_FREE_TEXT">';
@@ -583,11 +580,10 @@ print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 // Use services duration
-$var = !$var;
 print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="set_FICHINTER_USE_SERVICE_DURATION">';
-print '<tr ' . $bc[$var] . '>';
+print '<tr class="oddeven">';
 print '<td>';
 print $langs->trans("UseServicesDurationOnFichinter");
 print '</td>';

From 1792ff2d3b77ef56e80fa23bb84a767dfb9b799a Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 21 Apr 2017 09:41:08 +0200
Subject: [PATCH 0633/1163] oups inverted value

---
 htdocs/core/lib/pdf.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index d1a5e64dce2..c490a2f66c5 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1814,7 +1814,7 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 			if($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)
 			{
 			 	$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-			 	$result = ($prev_progress - $object->lines[$i]->situation_percent) . '%';
+			 	$result = ( $object->lines[$i]->situation_percent - $prev_progress) . '%';
 			}
 			else
 				$result = $object->lines[$i]->situation_percent . '%';

From 3b626b75c42a1ad6ce05b5dcbf650bdd0a72e0c5 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 22 Apr 2017 06:58:44 +0200
Subject: [PATCH 0634/1163] Update works

---
 htdocs/{stripe => core}/lib/stripe.lib.php |  0
 htdocs/core/modules/modStripe.class.php    |  4 +-
 htdocs/stripe/checkout.php                 | 23 ++++---
 htdocs/stripe/config.php                   | 25 ++++----
 htdocs/stripe/lib/index.html               |  0
 htdocs/stripe/paymnt_link.php              | 72 ----------------------
 6 files changed, 26 insertions(+), 98 deletions(-)
 rename htdocs/{stripe => core}/lib/stripe.lib.php (100%)
 delete mode 100644 htdocs/stripe/lib/index.html
 delete mode 100644 htdocs/stripe/paymnt_link.php

diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/core/lib/stripe.lib.php
similarity index 100%
rename from htdocs/stripe/lib/stripe.lib.php
rename to htdocs/core/lib/stripe.lib.php
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 4b498629017..4f4b15fa0a4 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -73,8 +73,8 @@ class modStripe extends DolibarrModules
         // Dependencies
         $this->depends = array();		// List of modules id that must be enabled if this module is enabled
         $this->requiredby = array();	// List of modules id to disable if this one is disabled
-        $this->phpmin = array(4,1);					// Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(2,6);	// Minimum version of Dolibarr required by module
+        $this->phpmin = array(5,3);					// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(5,0);	// Minimum version of Dolibarr required by module
         $this->langfiles = array("stripe");
 
         // Constants
diff --git a/htdocs/stripe/checkout.php b/htdocs/stripe/checkout.php
index 0989d55b76f..f7f547afae9 100644
--- a/htdocs/stripe/checkout.php
+++ b/htdocs/stripe/checkout.php
@@ -1,6 +1,6 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <2016> SaaSprov.ma  <saasprov@gmail.com>
+/* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
+require '../main.inc.php';
+ 
 // Load Dolibarr environment
-
-
-require_once('config.php');
-require_once('stripe/init.php');
+require_once DOL_DOCUMENT_ROOT.'/stripe/config.php');
+require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php');
 
 define("NOLOGIN",1);
 define("NOCSRFCHECK",1);
@@ -30,8 +29,8 @@ $langs->load("main");
 $langs->load("other");
 $langs->load("stripe");
 
-$SOURCE=GETPOST("source",'alpha');
-$ref=$REF=GETPOST('ref','alpha');
+$source=GETPOST("source",'alpha');
+$ref=GETPOST('ref','alpha');
 
 $form = new Form($db);
 
@@ -40,18 +39,18 @@ $form = new Form($db);
  *
  * @return	void
  */
-function llxHeader() { }
+function llxHeader() {}
 /**
  * Footer empty
  *
  * @return	void
  */
-function llxFooter() { }
+function llxFooter() {}
 
 $invoice = null;
 
 // Payment on customer invoice
-if (GETPOST("source") == 'invoice')
+if ($source == 'invoice')
 {
 	$found=true;
 	$langs->load("bills");
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index 9cc083051ec..78d394feb53 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -1,6 +1,6 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <2016>  <jamelbaz@gmail.com>
+/* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,21 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+*  \file       stripe/config.php
+*  \ingroup    Stripe
+*  \brief      Page to move config in api
+*/
 
-// Load Dolibarr environment
-if (false === (@include '../main.inc.php')) {  // From htdocs directory
-	require '../../main.inc.php'; // From "custom" directory
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 dol_include_once('/stripe/lib/stripe.lib.php');
-require_once('stripe/init.php');
+require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php');
 
-//use \Stripe\Stripe as Stripe;
+//use \includes\stripe as stripe;
 $stripe = array(
-  "secret_key"      => $conf->global->TEST_SECRET_KEY,
-  "publishable_key" => $conf->global->TEST_PUBLISHABLE_KEY
+  "secret_key"      => $conf->global->STRIPE_TEST_SECRET_KEY,
+  "publishable_key" => $conf->global->STRIPE_TEST_PUBLISHABLE_KEY
 );
 
-\Stripe\Stripe::setApiKey($stripe['secret_key']);
-?>
\ No newline at end of file
+\includes\stripe::setApiKey($stripe['secret_key']);
\ No newline at end of file
diff --git a/htdocs/stripe/lib/index.html b/htdocs/stripe/lib/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/stripe/paymnt_link.php b/htdocs/stripe/paymnt_link.php
deleted file mode 100644
index 68adbf47a3c..00000000000
--- a/htdocs/stripe/paymnt_link.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-// Load Dolibarr environment
-if (false === (@include '../main.inc.php')) {  // From htdocs directory
-	require '../../main.inc.php'; // From "custom" directory
-}
-require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
-
-// Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
-
-// Get parameters
-$id = GETPOST('id', 'int'); // For backward compatibility
-
-$object = new Facture($db);
-// Load object
-if ($id > 0 || ! empty($ref)) {
-	$ret = $object->fetch($id, $ref, '', '', $conf->global->INVOICE_USE_SITUATION);
-}
-
-
-
-
-/***************************************************
-* VIEW
-*
-* Put here all code to build page
-****************************************************/
-
-llxHeader('','StripePaymentLink','');
-
-
-// Part to show record
-if ($id)
-{
-	print load_fiche_titre($langs->trans("StripePaymentLink"));
-    
-	dol_fiche_head();
-	
-	$link = $dolibarr_main_url_root . '/custom/stripe/checkout.php?source=invoice&ref=' . $object->ref;
-	print '<table class="border centpercent">'."\n";
-	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentLink").'</td><td><input class="flat" type="text" size="100%" name="label" value="'.$link.'"></td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_VIEW
-	print '</table>';
-	
-	dol_fiche_end();
-
-
-
-
-}
-
-llxFooter();
-$db->close();

From fbdfbed02c0a77175846139c31ba5cc67e472f63 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Apr 2017 02:44:38 +0200
Subject: [PATCH 0635/1163] Add code to prepare a generic payment solution

---
 htdocs/public/payment/index.php      |   28 +
 htdocs/public/payment/newpayment.php | 1002 ++++++++++++++++++++++++++
 htdocs/public/payment/paymentko.php  |  146 ++++
 htdocs/public/payment/paymentok.php  |  308 ++++++++
 4 files changed, 1484 insertions(+)
 create mode 100644 htdocs/public/payment/index.php
 create mode 100644 htdocs/public/payment/newpayment.php
 create mode 100644 htdocs/public/payment/paymentko.php
 create mode 100644 htdocs/public/payment/paymentok.php

diff --git a/htdocs/public/payment/index.php b/htdocs/public/payment/index.php
new file mode 100644
index 00000000000..cc491b860d3
--- /dev/null
+++ b/htdocs/public/payment/index.php
@@ -0,0 +1,28 @@
+<?php
+/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/payment/index.php
+ *		\ingroup    core
+ *		\brief      A redirect page to an error
+ *		\author	    Laurent Destailleur
+ */
+
+require '../../master.inc.php';
+
+header("Location: ".DOL_URL_ROOT.'/public/error-404.php');
+
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
new file mode 100644
index 00000000000..4c4b6863aaa
--- /dev/null
+++ b/htdocs/public/payment/newpayment.php
@@ -0,0 +1,1002 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For test: https://developer.paypal.com/
+ */
+
+/**
+ *     	\file       htdocs/public/payment/newpayment.php
+ *		\ingroup    core
+ *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
+ *		\author	    Laurent Destailleur
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+// Security check
+//if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("errors");
+
+// Input are:
+// type ('invoice','order','contractline'),
+// id (object id),
+// amount (required if id is empty),
+// tag (a free text, required if type is empty)
+// currency (iso code)
+
+$suffix=GETPOST("suffix",'alpha');
+$amount=price2num(GETPOST("amount"));
+if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
+else $currency=GETPOST("currency",'alpha');
+
+if (! GETPOST("action"))
+{
+    if (! GETPOST("amount") && ! GETPOST("source"))
+    {
+    	dol_print_error('',$langs->trans('ErrorBadParameters')." - amount or source");
+    	exit;
+    }
+    if (is_numeric($amount) && ! GETPOST("tag") && ! GETPOST("source"))
+    {
+    	dol_print_error('',$langs->trans('ErrorBadParameters')." - tag or source");
+    	exit;
+    }
+    if (GETPOST("source") && ! GETPOST("ref"))
+    {
+    	dol_print_error('',$langs->trans('ErrorBadParameters')." - ref");
+    	exit;
+    }
+}
+
+// Define $urlwithroot
+//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
+
+$urlok=$urlwithroot.'/public/payment/paymentok.php?';
+$urlko=$urlwithroot.'/public/payment/paymentko.php?';
+
+// Complete urls for post treatment
+$SOURCE=GETPOST("source",'alpha');
+$ref=$REF=GETPOST('ref','alpha');
+$TAG=GETPOST("tag",'alpha');
+$FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
+$SECUREKEY=GETPOST("securekey");	        // Secure key
+
+if (! empty($SOURCE))
+{
+    $urlok.='source='.urlencode($SOURCE).'&';
+    $urlko.='source='.urlencode($SOURCE).'&';
+}
+if (! empty($REF))
+{
+    $urlok.='ref='.urlencode($REF).'&';
+    $urlko.='ref='.urlencode($REF).'&';
+}
+if (! empty($TAG))
+{
+    $urlok.='tag='.urlencode($TAG).'&';
+    $urlko.='tag='.urlencode($TAG).'&';
+}
+if (! empty($FULLTAG))
+{
+    $urlok.='fulltag='.urlencode($FULLTAG).'&';
+    $urlko.='fulltag='.urlencode($FULLTAG).'&';
+}
+if (! empty($SECUREKEY))
+{
+    $urlok.='securekey='.urlencode($SECUREKEY).'&';
+    $urlko.='securekey='.urlencode($SECUREKEY).'&';
+}
+if (! empty($entity))
+{
+	$urlok.='entity='.urlencode($entity).'&';
+	$urlko.='entity='.urlencode($entity).'&';
+}
+$urlok=preg_replace('/&$/','',$urlok);  // Remove last &
+$urlko=preg_replace('/&$/','',$urlko);  // Remove last &
+
+$paymentmethod=array();
+
+// Check parameters
+if (! empty($conf->paypal->enabled))
+{
+	$langs->load("paypal");
+	
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
+	
+	$PAYPAL_API_OK="";
+	if ($urlok) $PAYPAL_API_OK=$urlok;
+	$PAYPAL_API_KO="";
+	if ($urlko) $PAYPAL_API_KO=$urlko;
+	if (empty($PAYPAL_API_USER))
+	{
+	    dol_print_error('',"Paypal setup param PAYPAL_API_USER not defined");
+	    return -1;
+	}
+	if (empty($PAYPAL_API_PASSWORD))
+	{
+	    dol_print_error('',"Paypal setup param PAYPAL_API_PASSWORD not defined");
+	    return -1;
+	}
+	if (empty($PAYPAL_API_SIGNATURE))
+	{
+	    dol_print_error('',"Paypal setup param PAYPAL_API_SIGNATURE not defined");
+	    return -1;
+	}
+	
+	// Check security token
+	$valid=true;
+	if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+	{
+	    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
+	    {
+		    if ($SOURCE && $REF) $token = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $SOURCE . $REF, 2);    // Use the source in the hash to avoid duplicates if the references are identical
+		    else $token = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+	    }
+	    else
+	    {
+	        $token = $conf->global->PAYPAL_SECURITY_TOKEN;
+	    }
+		if ($SECUREKEY != $token) $valid=false;
+	
+		if (! $valid)
+		{
+	    	print '<div class="error">Bad value for key.</div>';
+		    //print 'SECUREKEY='.$SECUREKEY.' token='.$token.' valid='.$valid;
+	    	exit;
+		}
+		else
+		{
+			$paymentmethod[]='paypal';
+		}
+	}
+}
+if (! empty($conf->paybox->enabled))
+{
+	$langs->load("paybox");
+	
+}
+// TODO Add check of other payment mode
+
+
+if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST("action") == 'dopayment')
+{
+	if (GETPOST('paymentmethod') == 'paypal')
+	{ 
+		$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
+	    $PAYPAL_PAYMENT_TYPE='Sale';
+	
+	    $shipToName=GETPOST("shipToName");
+	    $shipToStreet=GETPOST("shipToStreet");
+	    $shipToCity=GETPOST("shipToCity");
+	    $shipToState=GETPOST("shipToState");
+	    $shipToCountryCode=GETPOST("shipToCountryCode");
+	    $shipToZip=GETPOST("shipToZip");
+	    $shipToStreet2=GETPOST("shipToStreet2");
+	    $phoneNum=GETPOST("phoneNum");
+	    $email=GETPOST("email");
+	    $desc=GETPOST("desc");
+	
+		$mesg='';
+		if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))   $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
+		//elseif (empty($EMAIL))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
+		//elseif (! isValidEMail($EMAIL)) $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
+		elseif (empty($FULLTAG))        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
+	
+	    //var_dump($_POST);
+		if (empty($mesg))
+		{
+			dol_syslog("newpayment.php call paypal api and do redirect", LOG_DEBUG);
+	
+			// Other
+			$PAYPAL_API_DEVISE="USD";
+			//if ($currency == 'EUR') $PAYPAL_API_DEVISE="EUR";
+			//if ($currency == 'USD') $PAYPAL_API_DEVISE="USD";
+	        if (! empty($currency)) $PAYPAL_API_DEVISE=$currency;
+	
+		    dol_syslog("Submit Paypal form", LOG_DEBUG);
+		    dol_syslog("PAYPAL_API_USER: $PAYPAL_API_USER", LOG_DEBUG);
+		    //dol_syslog("PAYPAL_API_PASSWORD: $PAYPAL_API_PASSWORD", LOG_DEBUG);  // No password into log files
+		    dol_syslog("PAYPAL_API_SIGNATURE: $PAYPAL_API_SIGNATURE", LOG_DEBUG);
+		    dol_syslog("PAYPAL_API_SANDBOX: $PAYPAL_API_SANDBOX", LOG_DEBUG);
+		    dol_syslog("PAYPAL_API_OK: $PAYPAL_API_OK", LOG_DEBUG);
+		    dol_syslog("PAYPAL_API_KO: $PAYPAL_API_KO", LOG_DEBUG);
+		    dol_syslog("PAYPAL_API_PRICE: $PAYPAL_API_PRICE", LOG_DEBUG);
+		    dol_syslog("PAYPAL_API_DEVISE: $PAYPAL_API_DEVISE", LOG_DEBUG);
+	        dol_syslog("shipToName: $shipToName", LOG_DEBUG);
+	        dol_syslog("shipToStreet: $shipToStreet", LOG_DEBUG);
+	        dol_syslog("shipToCity: $shipToCity", LOG_DEBUG);
+	        dol_syslog("shipToState: $shipToState", LOG_DEBUG);
+	        dol_syslog("shipToCountryCode: $shipToCountryCode", LOG_DEBUG);
+	        dol_syslog("shipToZip: $shipToZip", LOG_DEBUG);
+	        dol_syslog("shipToStreet2: $shipToStreet2", LOG_DEBUG);
+	        dol_syslog("phoneNum: $phoneNum", LOG_DEBUG);
+	        dol_syslog("email: $email", LOG_DEBUG);
+	        dol_syslog("desc: $desc", LOG_DEBUG);
+	
+	        dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG);	// If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO
+		    //$_SESSION["PaymentType"]=$PAYPAL_PAYMENT_TYPE;
+		    //$_SESSION["currencyCodeType"]=$PAYPAL_API_DEVISE;
+		    //$_SESSION["Payment_Amount"]=$PAYPAL_API_PRICE;
+	
+		    // A redirect is added if API call successfull
+	        print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
+	
+			exit;
+		}
+	}
+}
+
+
+/*
+ * View
+ */
+
+llxHeaderPaypal($langs->trans("PaymentForm"));
+
+if (! empty($conf->paypal->enabled))
+{
+	if (! empty($PAYPAL_API_SANDBOX))
+	{
+		dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
+	}
+
+	// Common variables
+	$creditor=$mysoc->name;
+	$paramcreditor='PAYPAL_CREDITOR_'.$suffix;
+	if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
+	else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR;
+}
+
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+print '<input type="hidden" name="action" value="dopayment">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
+print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print "\n";
+print '<!-- Form to send a payment -->'."\n";
+if (! empty($conf->paypal->enabled))
+{
+	print '<!-- PAYPAL_API_SANDBOX = '.$conf->global->PAYPAL_API_SANDBOX.' -->'."\n";
+	print '<!-- PAYPAL_API_INTEGRAL_OR_PAYPALONLY = '.$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY.' -->'."\n";
+	print '<!-- creditor = '.$creditor.' -->'."\n";
+}
+print '<!-- urlok = '.$urlok.' -->'."\n";
+print '<!-- urlko = '.$urlko.' -->'."\n";
+print "\n";
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
+// Show logo (search order: logo defined by PAYBOX_LOGO_suffix, then PAYBOX_LOGO, then small company logo, large company logo, theme logo, common logo)
+$width=0;
+// Define logo and logosmall
+$logosmall=$mysoc->logo_small;
+$logo=$mysoc->logo;
+$paramlogo='PAYMENT_LOGO_'.$suffix;
+if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
+else if (! empty($conf->global->PAYMENT_LOGO)) $logosmall=$conf->global->PAYBOX_LOGO;
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo='';
+if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
+{
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
+}
+elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+{
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
+	$width=96;
+}
+// Output html code for logo
+if ($urllogo)
+{
+	print '<tr>';
+	print '<td align="center"><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
+	if ($width) print ' width="'.$width.'"';
+	print '></td>';
+	print '</tr>'."\n";
+}
+
+// Output introduction text
+$text='';
+if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
+{
+    $langs->load("members");
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+}
+if (empty($text))
+{
+    $text.='<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnPaymentPage").'</strong><br></td></tr>'."\n";
+    $text.='<tr><td class="textpublicpayment"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+}
+print $text;
+
+// Output payment summary form
+print '<tr><td align="center">';
+print '<table with="100%" id="tablepublicpayment">';
+print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
+
+$found=false;
+$error=0;
+$var=false;
+
+// Free payment
+if (! GETPOST("source") && $valid)
+{
+	$found=true;
+	$tag=GETPOST("tag");
+	$fulltag=$tag;
+
+	// Creditor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Amount
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // We do not add fields shipToName, shipToStreet, shipToCity, shipToState, shipToCountryCode, shipToZip, shipToStreet2, phoneNum
+    // as they don't exists (buyer is unknown, tag is free).
+}
+
+
+// Payment on customer order
+if (GETPOST("source") == 'order' && $valid)
+{
+	$found=true;
+	$langs->load("orders");
+
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
+	$order=new Commande($db);
+	$result=$order->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$order->error;
+		$error++;
+	}
+	else
+	{
+		$result=$order->fetch_thirdparty($order->socid);
+	}
+
+	$amount=$order->total_ttc;
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
+	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	// Creditor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
+
+	// Object
+	
+	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$order->ref.'">';
+	print '</td></tr>'."\n";
+
+	// Amount
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+	// Shipping address
+	$shipToName=$order->thirdparty->name;
+    $shipToStreet=$order->thirdparty->address;
+    $shipToCity=$order->thirdparty->town;
+    $shipToState=$order->thirdparty->state_code;
+    $shipToCountryCode=$order->thirdparty->country_code;
+    $shipToZip=$order->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$order->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$order->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Order").' '.$order->ref.'">'."\n";
+}
+
+
+// Payment on customer invoice
+if (GETPOST("source") == 'invoice' && $valid)
+{
+	$found=true;
+	$langs->load("bills");
+
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+	$invoice=new Facture($db);
+	$result=$invoice->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$invoice->error;
+		$error++;
+	}
+	else
+	{
+		$result=$invoice->fetch_thirdparty($invoice->socid);
+	}
+
+	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
+	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	// Creditor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
+
+	// Object
+	
+	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$invoice->ref.'">';
+	print '</td></tr>'."\n";
+
+	// Amount
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$invoice->thirdparty->name;
+    $shipToStreet=$invoice->thirdparty->address;
+    $shipToCity=$invoice->thirdparty->town;
+    $shipToState=$invoice->thirdparty->state_code;
+    $shipToCountryCode=$invoice->thirdparty->country_code;
+    $shipToZip=$invoice->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$invoice->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$invoice->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Invoice").' '.$invoice->ref.'">'."\n";
+}
+
+// Payment on contract line
+if (GETPOST("source") == 'contractline' && $valid)
+{
+	$found=true;
+	$langs->load("contracts");
+
+	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+
+	$contractline=new ContratLigne($db);
+	$result=$contractline->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$contractline->error;
+		$error++;
+	}
+	else
+	{
+		if ($contractline->fk_contrat > 0)
+		{
+			$contract=new Contrat($db);
+			$result=$contract->fetch($contractline->fk_contrat);
+			if ($result > 0)
+			{
+				$result=$contract->fetch_thirdparty($contract->socid);
+			}
+			else
+			{
+				$mesg=$contract->error;
+				$error++;
+			}
+		}
+		else
+		{
+			$mesg='ErrorRecordNotFound';
+			$error++;
+		}
+	}
+
+	$amount=$contractline->total_ttc;
+	if ($contractline->fk_product)
+	{
+		$product=new Product($db);
+		$result=$product->fetch($contractline->fk_product);
+
+		// We define price for product (TODO Put this in a method in product class)
+		if (! empty($conf->global->PRODUIT_MULTIPRICES))
+		{
+			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
+			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
+			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
+		}
+		else
+		{
+			$pu_ht = $product->price;
+			$pu_ttc = $product->price_ttc;
+			$price_base_type = $product->price_base_type;
+		}
+
+		$amount=$pu_ttc;
+		if (empty($amount))
+		{
+			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+			exit;
+		}
+	}
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+	//$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	$qty=1;
+	if (GETPOST('qty')) $qty=GETPOST('qty');
+
+	// Creditor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
+
+	// Debitor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
+
+	// Object
+	
+	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
+	if ($contractline->fk_product)
+	{
+		$text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
+	}
+	if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
+	//if ($contractline->date_fin_validite) {
+	//	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
+	//	$text.=dol_print_date($contractline->date_fin_validite);
+	//}
+	if ($contractline->date_fin_validite)
+	{
+		$text.='<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
+	}
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$contractline->ref.'">';
+	print '</td></tr>'."\n";
+
+	// Quantity
+	
+	$label=$langs->trans("Quantity");
+	$qty=1;
+	$duration='';
+	if ($contractline->fk_product)
+	{
+		if ($product->isService() && $product->duration_value > 0)
+		{
+			$label=$langs->trans("Duration");
+
+			// TODO Put this in a global method
+			if ($product->duration_value > 1)
+			{
+				$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
+			}
+			else
+			{
+				$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
+			}
+			$duration=$product->duration_value.' '.$dur[$product->duration_unit];
+		}
+	}
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$label.'</td>';
+	print '<td class="CTableRow'.($var?'1':'2').'"><b>'.($duration?$duration:$qty).'</b>';
+	print '<input type="hidden" name="newqty" value="'.dol_escape_htmltag($qty).'">';
+	print '</b></td></tr>'."\n";
+
+	// Amount
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$contract->thirdparty->name;
+    $shipToStreet=$contract->thirdparty->address;
+    $shipToCity=$contract->thirdparty->town;
+    $shipToState=$contract->thirdparty->state_code;
+    $shipToCountryCode=$contract->thirdparty->country_code;
+    $shipToZip=$contract->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$contract->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$contract->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Contract").' '.$contract->ref.'">'."\n";
+}
+
+// Payment on member subscription
+if (GETPOST("source") == 'membersubscription' && $valid)
+{
+	$found=true;
+	$langs->load("members");
+
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
+
+	$member=new Adherent($db);
+	$result=$member->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$member->error;
+		$error++;
+	}
+	else
+	{
+		$subscription=new Subscription($db);
+	}
+
+	$amount=$subscription->total_ttc;
+    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    $amount=price2num($amount);
+
+	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	// Creditor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
+	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
+	else print $member->getFullName($langs);
+	print '</b>';
+
+	// Object
+	
+	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$member->ref.'">';
+	print '</td></tr>'."\n";
+
+	if ($member->last_subscription_date || $member->last_subscription_amount)
+	{
+		// Last subscription date
+		
+		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
+		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
+		print '</td></tr>'."\n";
+
+		// Last subscription amount
+		
+		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
+		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
+		print '</td></tr>'."\n";
+
+		if (empty($amount) && ! GETPOST('newamount')) $_GET['newamount']=$member->last_subscription_amount;
+	}
+
+	// Amount
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount))
+	{
+		print ' ('.$langs->trans("ToComplete");
+		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		print ')';
+	}
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+	    $valtoshow=GETPOST("newamount",'int');
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
+	}
+	else {
+	    $valtoshow=$amount;
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    print '<b>'.price($valtoshow).'</b>';
+        print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
+		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$member->getFullName($langs);
+    $shipToStreet=$member->address;
+    $shipToCity=$member->town;
+    $shipToState=$member->state_code;
+    $shipToCountryCode=$member->country_code;
+    $shipToZip=$member->zip;
+    $shipToStreet2='';
+    $phoneNum=$member->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$member->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("PaymentSubscription").'">'."\n";
+}
+
+
+
+
+if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
+
+if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
+
+print '</table>'."\n";
+print "\n";
+
+if ($found && ! $error)	// We are in a management option and no error
+{
+	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+
+	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
+	{
+		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
+	}
+	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
+	{
+		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("PaypalDoPayment").'">';
+	}
+}
+else
+{
+	dol_print_error_email('ERRORNEWPAYMENTPAYPAL');
+}
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
+
+
+html_print_paypal_footer($mysoc,$langs);
+
+llxFooterPaypal();
+
+$db->close();
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
new file mode 100644
index 00000000000..70dac3c960b
--- /dev/null
+++ b/htdocs/public/payment/paymentko.php
@@ -0,0 +1,146 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/payment/paymentko.php
+ *		\ingroup    core
+ *		\brief      File to show page after a failed payment.
+ *                  This page is called by payment system with url provided to it competed with parameter TOKEN=xxx
+ *                  This token can be used to get more informations.
+ *		\author	    Laurent Destailleur
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+if (! empty($conf->paypal->enabled))
+{
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
+}
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("paybox");
+$langs->load("paypal");
+
+$PAYPALTOKEN=GETPOST('TOKEN');
+if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
+$PAYPALPAYERID=GETPOST('PAYERID');
+if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
+$PAYPALFULLTAG=GETPOST('FULLTAG');
+if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
+
+$paymentmethod=array();
+if (! empty($conf->paypal->enabled)) $paymentmethod['paypal']='paypal';
+if (! empty($conf->paybox->enabled)) $paymentmethod['paybox']='paybox';
+
+
+// Security check
+if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
+
+
+/*
+ * Actions
+ */
+
+
+
+
+/*
+ * View
+ */
+
+dol_syslog("Callback url when a PayPal payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_payment');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
+
+
+// Send an email
+if (! empty($conf->paypal->enabled))
+{
+	if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
+	{
+	    // Get on url call
+	    $token              = $PAYPALTOKEN;
+	    $fulltag            = $PAYPALFULLTAG;
+	    $payerID            = $PAYPALPAYERID;
+	    // Set by newpayment.php
+	    $paymentType        = $_SESSION['PaymentType'];
+	    $currencyCodeType   = $_SESSION['currencyCodeType'];
+	    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+	    // From env
+	    $ipaddress          = $_SESSION['ipaddress'];
+	    
+	    
+		$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+		$from=$conf->global->MAILING_EMAIL_FROM;
+	
+		$urlback=$_SERVER["REQUEST_URI"];
+		$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentFailed");
+		$content=$langs->transnoentitiesnoconv("NewPaypalPaymentFailed")."\ntag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($topic, $sendto, $from, $content);
+	
+		$result=$mailfile->sendfile();
+		if ($result)
+		{
+			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+		}
+		else
+		{
+			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+		}
+	}
+}
+
+$head='';
+if (! empty($conf->global->PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+llxHeader($head, $langs->trans("PaymentForm"));
+
+
+// Show ko message
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div id="dolpaymentdiv" align="center">'."\n";
+print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
+
+if (! empty($conf->global->PAYPAL_MESSAGE_KO)) print $conf->global->PAYPAL_MESSAGE_KO;
+print "\n</div>\n";
+
+
+html_print_paypal_footer($mysoc,$langs);
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
new file mode 100644
index 00000000000..ce3fcd8bb29
--- /dev/null
+++ b/htdocs/public/payment/paymentok.php
@@ -0,0 +1,308 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/payment/paymentok.php
+ *		\ingroup    core
+ *		\brief      File to show page after a successful payment
+ *                  This page is called by payment system with url provided to it completed with parameter TOKEN=xxx
+ *                  This token can be used to get more informations.
+ *		\author	    Laurent Destailleur
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+if (! empty($conf->paypal->enabled))
+{
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
+}
+
+// Security check
+//if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("paybox");
+$langs->load("paypal");
+
+// Clean parameters
+if (! empty($conf->paypal->enabled))
+{
+	$PAYPAL_API_USER="";
+	if (! empty($conf->global->PAYPAL_API_USER)) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
+	$PAYPAL_API_PASSWORD="";
+	if (! empty($conf->global->PAYPAL_API_PASSWORD)) $PAYPAL_API_PASSWORD=$conf->global->PAYPAL_API_PASSWORD;
+	$PAYPAL_API_SIGNATURE="";
+	if (! empty($conf->global->PAYPAL_API_SIGNATURE)) $PAYPAL_API_SIGNATURE=$conf->global->PAYPAL_API_SIGNATURE;
+	$PAYPAL_API_SANDBOX="";
+	if (! empty($conf->global->PAYPAL_API_SANDBOX)) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
+	$PAYPAL_API_OK="";
+	if ($urlok) $PAYPAL_API_OK=$urlok;
+	$PAYPAL_API_KO="";
+	if ($urlko) $PAYPAL_API_KO=$urlko;
+	if (empty($PAYPAL_API_USER))
+	{
+	    dol_print_error('',"Paypal setup param PAYPAL_API_USER not defined");
+	    return -1;
+	}
+	if (empty($PAYPAL_API_PASSWORD))
+	{
+	    dol_print_error('',"Paypal setup param PAYPAL_API_PASSWORD not defined");
+	    return -1;
+	}
+	if (empty($PAYPAL_API_SIGNATURE))
+	{
+	    dol_print_error('',"Paypal setup param PAYPAL_API_SIGNATURE not defined");
+	    return -1;
+	}
+}
+
+$source=GETPOST('source');
+$ref=GETPOST('ref');
+$PAYPALTOKEN=GETPOST('TOKEN');
+if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
+$PAYPALPAYERID=GETPOST('PAYERID');
+if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
+$PAYPALFULLTAG=GETPOST('FULLTAG');
+if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
+
+$paymentmethod=array();
+if (! empty($conf->paypal->enabled)) $paymentmethod['paypal']='paypal';
+if (! empty($conf->paybox->enabled)) $paymentmethod['paybox']='paybox';
+
+
+// Security check
+if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
+
+
+/*
+ * Actions
+ */
+
+
+
+/*
+ * View
+ */
+
+dol_syslog("Callback url when a payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_payment');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
+
+$head='';
+if (! empty($conf->global->PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+llxHeader($head, $langs->trans("PaymentForm"));
+
+
+// Show message
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div id="dolpaymentdiv" align="center">'."\n";
+
+if (! empty($conf->paypal->enabled))
+{
+	if ($PAYPALTOKEN)
+	{
+	    // Get on url call
+	    $token              = $PAYPALTOKEN;
+	    $fulltag            = $PAYPALFULLTAG;
+	    $payerID            = $PAYPALPAYERID;
+	    // Set by newpayment.php
+	    $paymentType        = $_SESSION['PaymentType'];
+	    $currencyCodeType   = $_SESSION['currencyCodeType'];
+	    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+	    // From env
+	    $ipaddress          = $_SESSION['ipaddress'];
+	
+		dol_syslog("Call paymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
+	
+	
+		// Validate record
+	    if (! empty($paymentType))
+	    {
+	        dol_syslog("We call GetExpressCheckoutDetails", LOG_DEBUG, 0, '_payment');
+	        $resArray=getDetails($token);
+	        //var_dump($resarray);
+	
+	        dol_syslog("We call DoExpressCheckoutPayment token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_payment');
+	        $resArray=confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
+	
+	        $ack = strtoupper($resArray["ACK"]);
+	        if($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
+	        {
+	        	$object = new stdClass();
+	
+	        	$object->source		= $source;
+	        	$object->ref		= $ref;
+	        	$object->payerID	= $payerID;
+	        	$object->fulltag	= $fulltag;
+	        	$object->resArray	= $resArray;
+	
+	            // resArray was built from a string like that
+	            // TOKEN=EC%2d1NJ057703V9359028&TIMESTAMP=2010%2d11%2d01T11%3a40%3a13Z&CORRELATIONID=1efa8c6a36bd8&ACK=Success&VERSION=56&BUILD=1553277&TRANSACTIONID=9B994597K9921420R&TRANSACTIONTYPE=expresscheckout&PAYMENTTYPE=instant&ORDERTIME=2010%2d11%2d01T11%3a40%3a12Z&AMT=155%2e57&FEEAMT=5%2e54&TAXAMT=0%2e00&CURRENCYCODE=EUR&PAYMENTSTATUS=Completed&PENDINGREASON=None&REASONCODE=None
+	            $PAYMENTSTATUS=urldecode($resArray["PAYMENTSTATUS"]);   // Should contains 'Completed'
+	            $TRANSACTIONID=urldecode($resArray["TRANSACTIONID"]);
+	            $TAXAMT=urldecode($resArray["TAXAMT"]);
+	            $NOTE=urldecode($resArray["NOTE"]);
+	
+	            print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
+	            print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
+	            if (! empty($conf->global->PAYPAL_MESSAGE_OK)) print $conf->global->PAYPAL_MESSAGE_OK;
+	
+	            // Appel des triggers
+	            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+	            $interface=new Interfaces($db);
+	            $result=$interface->run_triggers('PAYPAL_PAYMENT_OK',$object,$user,$langs,$conf);
+	            if ($result < 0) { $error++; $errors=$interface->errors; }
+	            // Fin appel triggers
+	
+	        	// Send an email
+				if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
+				{
+					$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+					$from=$conf->global->MAILING_EMAIL_FROM;
+					// Define $urlwithroot
+					$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+					$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+					//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+	
+					$urlback=$_SERVER["REQUEST_URI"];
+					$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentReceived");
+					$tmptag=dolExplodeIntoArray($fulltag,'.','=');
+					$content="";
+					if (! empty($tmptag['MEM']))
+					{
+						$langs->load("members");
+						$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
+						$content.=$langs->trans("PaymentSubscription")."<br>\n";
+						$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
+						$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
+					}
+					else
+					{
+						$content.=$langs->transnoentitiesnoconv("NewPaypalPaymentReceived")."<br>\n";
+					}
+					$content.="<br>\n";
+					$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+					$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
+					$content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+	
+					$ishtml=dol_textishtml($content);	// May contain urls
+	
+					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+					$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+	
+					$result=$mailfile->sendfile();
+					if ($result)
+					{
+						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+					}
+					else
+					{
+						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+					}
+				}
+	        }
+	        else
+			{
+	            //Display a user friendly Error on the page using any of the following error information returned by PayPal
+	            $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
+	            $ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
+	            $ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);
+	            $ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
+	
+	            echo $langs->trans('DoExpressCheckoutPaymentAPICallFailed') . "<br>\n";
+	            echo $langs->trans('DetailedErrorMessage') . ": " . $ErrorLongMsg."<br>\n";
+	            echo $langs->trans('ShortErrorMessage') . ": " . $ErrorShortMsg."<br>\n";
+	            echo $langs->trans('ErrorCode') . ": " . $ErrorCode."<br>\n";
+	            echo $langs->trans('ErrorSeverityCode') . ": " . $ErrorSeverityCode."<br>\n";
+	
+	            if ($mysoc->email) echo "\nPlease, send a screenshot of this page to ".$mysoc->email."<br>\n";
+	
+	           	// Send an email
+				if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
+				{
+					$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+					$from=$conf->global->MAILING_EMAIL_FROM;
+					// Define $urlwithroot
+					$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+					$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+					//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+	
+					$urlback=$_SERVER["REQUEST_URI"];
+					$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("ValidationOfPaypalPaymentFailed");
+					$content="";
+					$content.=$langs->transnoentitiesnoconv("PaypalConfirmPaymentPageWasCalledButFailed")."\n";
+					$content.="\n";
+					$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+					$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
+					$content.="tag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+	
+					$ishtml=dol_textishtml($content);	// May contain urls
+	
+					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+					$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+	
+					$result=$mailfile->sendfile();
+					if ($result)
+					{
+						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+					}
+					else
+					{
+						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+					}
+				}
+	        }
+	    }
+	    else
+	    {
+	        dol_print_error('','Session expired');
+	    }
+	}
+}
+else
+{
+    // No TOKEN parameter in URL
+    dol_print_error('','No TOKEN parameter in URL');
+}
+
+print "\n</div>\n";
+
+html_print_paypal_footer($mysoc,$langs);
+
+
+llxFooter();
+
+$db->close();

From 10e2b128d1f2f2d9e786a1c92a54009cb926398e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Apr 2017 05:20:45 +0200
Subject: [PATCH 0636/1163] Fix warning during install

---
 htdocs/core/modules/syslog/mod_syslog_file.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 91af81ef178..195cab19f7f 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -104,8 +104,10 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	private function getFilename($suffixinfilename='')
 	{
 	    global $conf;
-	    if (! empty($conf->global->SYSLOG_FILE)) $tmp=str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
-	    else $tmp='dolibarr.log';
+
+	    if (empty($conf->global->SYSLOG_FILE)) $tmp=DOL_DATA_ROOT.'/dolibarr.log';
+	    else $tmp=str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
+
 	    return $suffixinfilename?preg_replace('/\.log$/i', $suffixinfilename.'.log', $tmp):$tmp;
 	}
 

From d9cdaeb851671771c6a7ef483ebfe9fba03a0c9b Mon Sep 17 00:00:00 2001
From: AlainRnet <alainrihs@sunrise.ch>
Date: Mon, 24 Apr 2017 15:43:36 +0200
Subject: [PATCH 0637/1163] without html.formprojet.class.php called, not
 possible create invoice template

cf. https://github.com/Dolibarr/dolibarr/issues/6614
without this class AND module Projects disabled, it's not possible to create an invoice template. So I pulled out the call of the class from the condition.
---
 htdocs/compta/facture/fiche-rec.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 706807c8f02..d164019b64d 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -35,8 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 if (! empty($conf->projet->enabled)) {
     require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+    //require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 }
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php';
 

From 0c7cfdb03753bcf5ab5550d94eb848c33e4c5921 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Mon, 24 Apr 2017 16:36:58 +0200
Subject: [PATCH 0638/1163] Update code using new css class

---
 htdocs/admin/agenda.php       |  3 +--
 htdocs/admin/agenda_other.php | 11 ++---------
 htdocs/admin/bank.php         |  4 +---
 htdocs/admin/company.php      | 36 +++++++++++++----------------------
 htdocs/admin/compta.php       |  9 ++++-----
 htdocs/admin/events.php       |  2 +-
 htdocs/admin/fichinter.php    |  9 ++-------
 7 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index d076fcf7e26..051179d61ca 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -150,7 +150,6 @@ print $langs->trans("AgendaAutoActionDesc")."<br>\n";
 print $langs->trans("OnlyActiveElementsAreShown").'<br>';
 print "<br>\n";
 
-$var=true;
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans("ActionsEvents").'</td>';
@@ -180,7 +179,7 @@ if (! empty($triggers))
 			print '<td align="right" width="40">';
 			$key='MAIN_AGENDA_ACTIONAUTO_'.$trigger['code'];
 			$value=$conf->global->$key;
-			print '<input '.$bc[$var].' type="checkbox" name="'.$key.'" value="1"'.((($action=='selectall'||$value) && $action!="selectnone")?' checked':'').'>';
+			print '<input class="oddeven" type="checkbox" name="'.$key.'" value="1"'.((($action=='selectall'||$value) && $action!="selectnone")?' checked':'').'>';
 			print '</td></tr>'."\n";
 		}
 	}
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 6e0a62610aa..17ccd64d000 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -245,7 +245,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     
     clearstatcache();
     
-    $var=true;
     foreach ($dirmodels as $reldir)
     {
     	$dir = dol_buildpath($reldir."core/modules/action/doc/");
@@ -263,10 +262,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			$classname = substr($file, 0, dol_strlen($file) -12);
             			
             			require_once $dir.'/'.$file;
-            			$module = new $classname($db, new ActionComm($db));
+            			$module = new $classname($db, new ActionComm($db));           			
             			
-            			
-            			print "<tr ".$bc[$var].">\n";
+            			print '<tr class="oddeven">\n';
             			print "<td>";
             			print (empty($module->name)?$name:$module->name);
             			print "</td>\n";
@@ -338,8 +336,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     print '</table><br>';
 }
 
-$var=true;
-
 print '<form action="'.$_SERVER["PHP_SELF"].'" name="agenda">';
 print '<input type="hidden" name="action" value="set">';
 
@@ -380,7 +376,6 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 }
 
 // AGENDA_DEFAULT_FILTER_TYPE
-
 print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
@@ -389,7 +384,6 @@ $formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AG
 print '</td></tr>'."\n";
 
 // AGENDA_DEFAULT_FILTER_STATUS
-
 print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
@@ -398,7 +392,6 @@ $formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_
 print '</td></tr>'."\n";
 
 // AGENDA_DEFAULT_VIEW
-
 print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_VIEW").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 98cecb2f44b..8ed1e3cd9ac 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -273,7 +273,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var = true;
 foreach ($dirmodels as $reldir) 
 {
     foreach (array('', '/doc') as $valdir) {
@@ -305,8 +304,7 @@ foreach ($dirmodels as $reldir)
                                 $modulequalified = 0;
                             
                             if ($modulequalified) {
-                                $var = ! $var;
-                                print '<tr ' . $bc[$var] . '><td width="100">';
+                                print '<tr class="oddeven"><td width="100">';
                                 print(empty($module->name) ? $name : $module->name);
                                 print "</td><td>\n";
                                 if (method_exists($module, 'info'))
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 8c29fe67a1c..ef22d8ecb4a 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2011-2016	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2017	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -545,7 +545,6 @@ if ($action == 'edit' || $action == 'updateedit')
 	print '<tr class="liste_titre">';
 	print '<td class="titlefield">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
 	print '<tr class="oddeven"><td><label for="fiscalmonthstart">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
@@ -561,10 +560,9 @@ if ($action == 'edit' || $action == 'updateedit')
 	print '<td class="titlefield">'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
 	print '<td align="right">&nbsp;</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
-	print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
+	print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
@@ -573,7 +571,7 @@ if ($action == 'edit' || $action == 'updateedit')
 	print "</td></tr>\n";
 
 	
-	print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
+	print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label for=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
@@ -595,10 +593,9 @@ if ($action == 'edit' || $action == 'updateedit')
 		print '<td>'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 		
 		// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print '<table class="nobordernopadding">';
 		print "<tr><td><label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -620,7 +617,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"nolt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -639,11 +636,10 @@ if ($action == 'edit' || $action == 'updateedit')
 		print '<td>'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 
 		
 		// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print '<table class="nobordernopadding">';
 		print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -662,7 +658,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -696,7 +692,6 @@ else
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>';
-	$var=true;
 
 	
 	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("CompanyName").'</td><td>';
@@ -799,7 +794,6 @@ else
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
-	$var=true;
 
 	// Managing Director(s)
 	
@@ -965,7 +959,6 @@ else
 	print '<tr class="liste_titre">';
 	print '<td class="titlefield">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
 	print '<tr class="oddeven"><td>'.$langs->trans("FiscalMonthStart").'</td><td>';
@@ -983,10 +976,9 @@ else
 	print '<td>'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
 	print '<td align="right">&nbsp;</td>';
 	print "</tr>\n";
-	$var=true;
 
 	
-	print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
+	print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
@@ -995,7 +987,7 @@ else
 	print "</td></tr>\n";
 
 	
-	print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
+	print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
 	print '<td colspan="2">';
 	print "<table>";
 	print "<tr><td><label=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
@@ -1018,10 +1010,9 @@ else
 		print '<td>'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td></label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1049,7 +1040,7 @@ else
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"no_lt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1069,10 +1060,9 @@ else
 		print '<td>'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 		print '<td align="right">&nbsp;</td>';
 		print "</tr>\n";
-		$var=true;
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1101,7 +1091,7 @@ else
 		print "</td></tr>\n";
 
 		
-		print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
+		print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
 		print '<td colspan="2">';
 		print "<table>";
 		print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index c097b9f39b1..0c42659357a 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2013 Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2013-2016 Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2017 Philippe Grand	    <philippe.grand@atoo-net.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -119,7 +119,7 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans('OptionMode').'</td><td>'.$langs->trans('Description').'</td>';
 print "</tr>\n";
-print '<tr '.$bc[false].'><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
+print '<tr class="oddeven"><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 // Write info on way to count VAT
 //if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
@@ -133,7 +133,7 @@ print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 //	//	print nl2br($langs->trans('OptionModeTrueInfoExpert'));
 //}
 print "</td></tr>\n";
-print '<tr '.$bc[true].'><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
+print '<tr class="oddeven"><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
 
 print "</table>\n";
@@ -149,8 +149,7 @@ print "</tr>\n";
 foreach ($list as $key)
 {
 	
-
-	print '<tr '.$bc[$var].' class="value">';
+	print '<tr class="oddeven value">';
 
 	// Param
 	$libelle = $langs->trans($key);
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 161b1aac45d..74525a6855b 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -105,7 +105,7 @@ foreach ($eventstolog as $key => $arr)
 		print '<td>';
 		$key='MAIN_LOGEVENTS_'.$arr['id'];
 		$value=$conf->global->$key;
-		print '<input '.$bc[$var].' type="checkbox" name="'.$key.'" value="1"'.($value?' checked':'').'>';
+		print '<input class="oddeven" type="checkbox" name="'.$key.'" value="1"'.($value?' checked':'').'>';
 		print '</td></tr>'."\n";
 	}
 }
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 6c73afcf8f5..3695a593ece 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2014 Regis Houssin                <regis.houssin@capnetworks.com>
  * Copyright (C) 2008      Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
- * Copyright (C) 2011-2015 Philippe Grand			    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2017 Philippe Grand			    <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -291,7 +291,6 @@ foreach ($dirmodels as $reldir)
 		$handle = opendir($dir);
 		if (is_resource($handle))
 		{
-			$var=true;
 
 			while (($file = readdir($handle))!==false)
 			{
@@ -410,7 +409,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var=true;
 foreach ($dirmodels as $reldir)
 {
 	$dir = dol_buildpath($reldir."core/modules/fichinter/doc/");
@@ -532,9 +530,7 @@ print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "<td>&nbsp;</td>\n";
 print "</tr>\n";
-$var=true;
 
-$var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_FICHINTER_FREE_TEXT">';
@@ -583,11 +579,10 @@ print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 // Use services duration
-$var = !$var;
 print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="set_FICHINTER_USE_SERVICE_DURATION">';
-print '<tr ' . $bc[$var] . '>';
+print '<tr class="oddeven">';
 print '<td>';
 print $langs->trans("UseServicesDurationOnFichinter");
 print '</td>';

From e2dbcb2b5a68083711a373f2eaee78513eb20fcb Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Tue, 25 Apr 2017 11:59:18 +0200
Subject: [PATCH 0639/1163] Update code using new css class

---
 htdocs/admin/loan.php             |  4 +---
 htdocs/admin/mails_templates.php  |  9 ++++-----
 htdocs/admin/modules.php          |  6 ++----
 htdocs/admin/oauth.php            | 13 ++++---------
 htdocs/admin/perms.php            |  4 +---
 htdocs/admin/salaries.php         |  2 +-
 htdocs/admin/supplier_invoice.php |  5 ++---
 htdocs/admin/supplier_order.php   |  5 ++---
 htdocs/admin/supplier_payment.php |  3 +--
 htdocs/admin/syslog.php           |  3 +--
 htdocs/admin/taxes.php            | 10 +++++-----
 htdocs/admin/websites.php         |  4 +---
 htdocs/admin/workflow.php         |  3 +--
 13 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index ee6b9ef74ee..86d963ed54f 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -96,9 +96,7 @@ print "</tr>\n";
 
 foreach ($list as $key)
 {
-	
-
-	print '<tr '.$bc[$var].' class="value">';
+	print '<tr class="oddeven value">';
 
 	// Param
 	$label = $langs->trans($key); 
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index f0bf5609adf..a4ec423b42f 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2016  Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2011-2015  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2017  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2011       Remy Younes             <ryounes@gmail.com>
  * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@ltairis.fr>
@@ -651,11 +651,10 @@ if ($resql)
         // Lines with values
         while ($i < $num)
         {
-            $var = ! $var;
 
             $obj = $db->fetch_object($resql);
             //print_r($obj);
-            print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
+            print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
             if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
             {
                 $tmpaction='edit';
@@ -689,7 +688,7 @@ if ($resql)
                     // Show value for field
                     if ($showfield) {
                 
-                        print '</tr><tr '.$bc[$var].' nohover tr-'.$tmpfieldlist.'-'.$rowid.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
+                        print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$rowid.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
                         $okforextended = true;
                         if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
                             $okforextended = false;
@@ -781,7 +780,7 @@ if ($resql)
                     // Show value for field
                     if ($showfield) {
                         
-                        print '</tr><tr '.$bc[$var].' nohover tr-'.$tmpfieldlist.'-'.$i.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
+                        print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$i.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
                         $okforextended = true;
                         if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
                             $okforextended = false;
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 4eb82e6183c..c47586b2b2a 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -428,8 +428,6 @@ $h++;
 print "<br>\n";
 
 
-$var=true;
-
 if ($mode == 'common')
 {
     
@@ -782,7 +780,7 @@ if ($mode == 'marketplace')
     print '</tr>';
 
     
-    print "<tr ".$bc[$var].">\n";
+    print "<tr class=\"oddeven\">\n";
     $url='https://www.dolistore.com';
     print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
     print '<td>'.$langs->trans("DoliStoreDesc").'</td>';
@@ -790,7 +788,7 @@ if ($mode == 'marketplace')
     print '</tr>';
 
     
-    print "<tr ".$bc[$var].">\n";
+    print "<tr class=\"oddeven\">\n";
     $url='https://partners.dolibarr.org';
     print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png"></a></td>';
     print '<td>'.$langs->trans("DoliPartnersDesc").'</td>';
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 34aa49ea237..c1bb5909e15 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -93,7 +93,6 @@ print $langs->trans("ListOfSupportedOauthProviders").'<br><br>';
 
 print '<table class="noborder" width="100%">';
 
-$var = true;
 $i=0;
 
 foreach ($list as $key)
@@ -116,31 +115,27 @@ foreach ($list as $key)
     if ($supported)
     {
         $redirect_uri=$urlwithroot.'/core/modules/oauth/'.$supportedoauth2array[$key[0]].'_oauthcallback.php';
-        $var = !$var;
-        print '<tr '.$bc[$var].' class="value">';
+        print '<tr class="oddeven value">';
         print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
         print '<td><input style="width: 80%" type"text" name="uri'.$key[0].'" value="'.$redirect_uri.'">';
         print '</td></tr>';
     }
     else
     {
-        $var = !$var;
-        print '<tr '.$bc[$var].' class="value">';
+        print '<tr class="oddeven value">';
         print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
         print '<td>'.$langs->trans("FeatureNotYetSupported").'</td>';
         print '</td></tr>';
     }
         
     // Api Id
-    $var = !$var;
-    print '<tr '.$bc[$var].' class="value">';
+    print '<tr class="oddeven value">';
     print '<td><label for="'.$key[1].'">'.$langs->trans($key[1]).'</label></td>';
     print '<td><input type="text" size="100" id="'.$key[1].'" name="'.$key[1].'" value="'.$conf->global->{$key[1]}.'">';
     print '</td></tr>';
 
     // Api Secret
-    $var = !$var;
-    print '<tr '.$bc[$var].' class="value">';
+    print '<tr class="oddeven value">';
     print '<td><label for="'.$key[2].'">'.$langs->trans($key[2]).'</label></td>';
     print '<td><input type="password" size="100" id="'.$key[2].'" name="'.$key[2].'" value="'.$conf->global->{$key[2]}.'">';
     print '</td></tr>';
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index daafab71053..5acbeb2e627 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -140,7 +140,6 @@ if ($result)
 {
     $num	= $db->num_rows($result);
     $i		= 0;
-    $var	= True;
     $oldmod	= "";
 
     while ($i < $num)
@@ -187,8 +186,7 @@ if ($result)
         }
 
         
-        print '<tr '. $bc[$var].'>';
-
+        print '<tr class="oddeven">';
         print '<td>'.img_object('',$picto).' '.$objMod->getName();
         print '<a name="'.$objMod->getName().'">&nbsp;</a>';
 
diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php
index a04b23ce4fe..52470be4106 100644
--- a/htdocs/admin/salaries.php
+++ b/htdocs/admin/salaries.php
@@ -99,7 +99,7 @@ foreach ($list as $key)
 {
 	
 
-	print '<tr '.$bc[$var].' class="value">';
+	print '<tr class="oddeven value">';
 
 	// Param
 	$label = $langs->trans($key);
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 2619951e1b5..9e717ee125a 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio     <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2010-2013 Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2011-2015 Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2017 Philippe Grand          <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -361,7 +361,6 @@ foreach ($dirmodels as $reldir)
 
     if (is_dir($dir))
     {
-        $var=true;
 
         $handle=opendir($dir);
 
@@ -379,7 +378,7 @@ foreach ($dirmodels as $reldir)
 	                $module = new $classname($db, new FactureFournisseur($db));
 
                     
-                    print "<tr ".$bc[$var].">\n";
+                    print "<tr class=\"oddeven\">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
 	                print "</td>\n";
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index d54f0e367aa..7bca2418df3 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio     <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2010-2013 Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2011-2015 Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2017 Philippe Grand          <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -382,7 +382,6 @@ print '</tr>'."\n";
 
 clearstatcache();
 
-$var=true;
 foreach ($dirmodels as $reldir)
 {
 	$dir = dol_buildpath($reldir."core/modules/supplier_order/pdf/");
@@ -403,7 +402,7 @@ foreach ($dirmodels as $reldir)
 	                $module = new $classname($db, new CommandeFournisseur($db));
 
                     
-                    print "<tr ".$bc[$var].">\n";
+                    print "<tr class=\"oddeven\">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
 	                print "</td>\n";
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 40caa94c8a8..0f6cbff6179 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -367,7 +367,6 @@ foreach ($dirmodels as $reldir)
 
     if (is_dir($dir))
     {
-        $var=true;
 
         $handle=opendir($dir);
 
@@ -385,7 +384,7 @@ foreach ($dirmodels as $reldir)
 	                $module = new $classname($db, new PaiementFourn($db));
 
                     
-                    print "<tr ".$bc[$var].">\n";
+                    print "<tr class=\"oddeven\">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
 	                print "</td>\n";
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 71d06ae8e64..40a94bffc71 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -194,7 +194,6 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Type").'</td><td>'.$langs->trans("Value").'</td>';
 print '<td align="right" colspan="2"><input type="submit" class="button" '.$option.' value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
-$var=true;
 
 foreach ($syslogModules as $moduleName)
 {
@@ -207,7 +206,7 @@ foreach ($syslogModules as $moduleName)
 	
 	print '<tr class="oddeven">';
 	print '<td width="140">';
-	print '<input '.$bc[$var].' type="checkbox" name="SYSLOG_HANDLERS[]" value="'.$moduleName.'" '.(in_array($moduleName, $activeModules) ? 'checked' : '').($moduleactive <= 0 ? 'disabled' : '').'> ';
+	print '<input class="oddeven" type="checkbox" name="SYSLOG_HANDLERS[]" value="'.$moduleName.'" '.(in_array($moduleName, $activeModules) ? 'checked' : '').($moduleactive <= 0 ? 'disabled' : '').'> ';
 	print $module->getName();
 	print '</td>';
 
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 788d8604584..dbdce59c3c5 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -136,10 +136,10 @@ else
     print '<tr class="liste_titre">';
     print '<td colspan="2">'.$langs->trans('OptionVatMode').'</td><td>'.$langs->trans('Description').'</td>';
     print "</tr>\n";
-    print '<tr '.$bc[false].'><td width="200"><input type="radio" name="tax_mode" value="0"'.($tax_mode != 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDefault').'</td>';
+    print '<tr class="oddeven"><td width="200"><input type="radio" name="tax_mode" value="0"'.($tax_mode != 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDefault').'</td>';
     print '<td colspan="2">'.nl2br($langs->trans('OptionVatDefaultDesc'));
     print "</td></tr>\n";
-    print '<tr '.$bc[true].'><td width="200"><input type="radio" name="tax_mode" value="1"'.($tax_mode == 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDebitOption').'</td>';
+    print '<tr class="oddeven"><td width="200"><input type="radio" name="tax_mode" value="1"'.($tax_mode == 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDebitOption').'</td>';
     print '<td colspan="2">'.nl2br($langs->trans('OptionVatDebitOptionDesc'))."</td></tr>\n";
 
     print "</table>\n";
@@ -152,7 +152,7 @@ else
     print '<tr class="liste_titre"><td>&nbsp;</td><td>'.$langs->trans("Buy").'</td><td>'.$langs->trans("Sell").'</td></tr>';
 
     // Products
-    print '<tr '.$bc[false].'><td>'.$langs->trans("Product").'</td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("Product").'</td>';
     print '<td>';
     print $langs->trans("OnDelivery");
     print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
@@ -163,7 +163,7 @@ else
     print '</td></tr>';
 
     // Services
-    print '<tr '.$bc[true].'><td>'.$langs->trans("Services").'</td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("Services").'</td>';
     print '<td>';
     if ($tax_mode == 0)
     {
@@ -206,7 +206,7 @@ foreach ($list as $key)
 {
 	
 
-	print '<tr '.$bc[$var].' class="value">';
+	print '<tr class="oddeven value">';
 
 	// Param
 	$label = $langs->trans($key); 
diff --git a/htdocs/admin/websites.php b/htdocs/admin/websites.php
index b0c81ec18af..f7e71555943 100644
--- a/htdocs/admin/websites.php
+++ b/htdocs/admin/websites.php
@@ -450,7 +450,6 @@ if ($id)
     {
         $num = $db->num_rows($resql);
         $i = 0;
-        $var=true;
         if ($num)
         {
             // There is several pages
@@ -499,11 +498,10 @@ if ($id)
             // Lines with values
             while ($i < $num)
             {
-                $var = ! $var;
 
                 $obj = $db->fetch_object($resql);
                 //print_r($obj);
-                print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
+                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
                 if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
                 {
                     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index d9595cd7fb0..af104fd4bfe 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -120,8 +120,7 @@ foreach($workflowcodes as $key => $params)
 		$oldfamily = $family;
    	}
 
-   	$var = !$var;
-   	print "<tr ".$bc[$var].">\n";
+   	print "<tr class=\"oddeven\">\n";
    	print "<td>".img_object('', $picto).$langs->trans('desc'.$key);
    	if (! empty($params['warning']))
    	{

From 84e774ff32aa0147ef6ac1b8b4c17294b3203933 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Apr 2017 12:57:20 +0200
Subject: [PATCH 0640/1163] Better translation

---
 htdocs/install/check.php          | 4 ++--
 htdocs/install/default.css        | 9 +++++----
 htdocs/langs/en_US/bookmarks.lang | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index b37837df663..bc7082b8d9d 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -363,7 +363,7 @@ else
 		// Show first install line
 		$choice = '<tr class="listofchoices"><td class="listofchoices nowrap" align="center"><b>'.$langs->trans("FreshInstall").'</b>';
 		$choice .= '</td>';
-		$choice .= '<td class="listofchoices">';
+		$choice .= '<td class="listofchoices listofchoicesdesc">';
 		$choice .= $langs->trans("FreshInstallDesc");
 		if (empty($dolibarr_main_db_host))	// This means install process was not run
 		{
@@ -459,7 +459,7 @@ else
 
             $choice .= '<tr class="listofchoices '.($recommended_choice ? 'choiceselected' : '').'">';
             $choice .= '<td class="listofchoices nowrap" align="center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>';
-            $choice .= '<td class="listofchoices">';
+            $choice .= '<td class="listofchoices listofchoicesdesc">';
             $choice .= $langs->trans("UpgradeDesc");
 
             if ($recommended_choice)
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 257f2d99af8..9725b06b8bc 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -1,5 +1,5 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org> 
- * Copyright (C) 2009-2016 Laurent Destailleur  <eldy@users.sourceforge.net> 
+ * Copyright (C) 2009-2017 Laurent Destailleur  <eldy@users.sourceforge.net> 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -210,7 +210,9 @@ table.listofchoices, tr.listofchoices, td.listofchoices {
 tr.listofchoices {
     height: 42px;	
 }
-
+.listofchoicesdesc {
+	color: #999 !important;
+}
 .blinkwait {
 	font-weight: bold;
 	text-decoration:blink !important;	
@@ -244,9 +246,8 @@ font.warning {
 div.error {
 	color: #550000;
 	font-weight: bold;
-	padding: 0.2em 0.2em 0.2em 0.2em;
+	padding: 0.2em 0.2em 0.2em 0;
 	margin: 0.5em 0 0.5em 0;
-	border: 1px solid #6C7C8B;
 }
 font.error {
 	color: #550000;
diff --git a/htdocs/langs/en_US/bookmarks.lang b/htdocs/langs/en_US/bookmarks.lang
index d15ed3e1148..9d2003f34d3 100644
--- a/htdocs/langs/en_US/bookmarks.lang
+++ b/htdocs/langs/en_US/bookmarks.lang
@@ -12,7 +12,7 @@ BookmarkTargetNewWindowShort=New window
 BookmarkTargetReplaceWindowShort=Current window
 BookmarkTitle=Bookmark title
 UrlOrLink=URL
-BehaviourOnClick=Behaviour when a URL is clicked
+BehaviourOnClick=Behaviour when a bookmark URL is selected
 CreateBookmark=Create bookmark
 SetHereATitleForLink=Set a title for the bookmark
 UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL

From aa4b967e172c1a5d4d306d968648ba1b5cb73dab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Apr 2017 11:46:12 +0200
Subject: [PATCH 0641/1163] FIX image of rss when link is relative Fix
 regression after disabling constant init.

---
 htdocs/admin/external_rss.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 7f81a5d0fef..30646b749fa 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -206,13 +206,13 @@ print '<td>'.$langs->trans("Example").'</td>';
 print '</tr>';
 print '<tr class="impair">';
 print '<td width="100">'.$langs->trans("Title").'</td>';
-print '<td><input type="text" name="external_rss_title_'.($lastexternalrss+1).'" value="'.@constant("EXTERNAL_RSS_TITLE_" . ($lastexternalrss+1)).'" size="64"></td>';
+print '<td><input type="text" class="flat minwidth300" name="external_rss_title_'.($lastexternalrss+1).'" value=""></td>';
 print '<td>'.$langs->trans('RSSUrlExample').'</td>';
 print '</tr>';
 
 print '<tr class="pair">';
 print '<td>'.$langs->trans('RSSUrl').'</td>';
-print '<td><input type="text" name="external_rss_urlrss_'.($lastexternalrss+1).'" value="'.@constant("EXTERNAL_RSS_URLRSS_" . ($lastexternalrss+1)).'" size="64"></td>';
+print '<td><input type="text" class="flat minwidth300" name="external_rss_urlrss_'.($lastexternalrss+1).'" value=""></td>';
 print '<td>http://news.google.com/news?ned=us&topic=h&output=rss<br>http://www.dolibarr.org/rss</td>';
 print '</tr>';
 print '</table>';
@@ -243,10 +243,12 @@ if ($resql)
 
 	    preg_match('/^([0-9]+)/i',$obj->note,$reg);
 		$idrss = $reg[1];
-		//print "x".$idrss;
+        $keyrssurl="EXTERNAL_RSS_URLRSS_".$idrss;
+        $keyrsstitle="EXTERNAL_RSS_URLRSS_".$idrss;
+        //print "x".$idrss;
 
         $rssparser=new RssParser($db);
-		$result = $rssparser->parser(@constant("EXTERNAL_RSS_URLRSS_".$idrss), 5, 300, $conf->externalrss->dir_temp);
+		$result = $rssparser->parser($conf->global->$keyrssurl, 5, 300, $conf->externalrss->dir_temp);
 
 		$var=true;
 
@@ -269,13 +271,13 @@ if ($resql)
 		
 		print '<tr class="oddeven">';
 		print "<td width=\"100px\">".$langs->trans("Title")."</td>";
-		print "<td><input type=\"text\" class=\"flat\" name=\"external_rss_title_" . $idrss . "\" value=\"" . @constant("EXTERNAL_RSS_TITLE_" . $idrss) . "\" size=\"64\"></td>";
+		print "<td><input type=\"text\" class=\"flat minwidth300\" name=\"external_rss_title_" . $idrss . "\" value=\"" . $conf->global->$keyrsstitle . "\"></td>";
 		print "</tr>";
 
 		
 		print '<tr class="oddeven">';
 		print "<td>".$langs->trans("URL")."</td>";
-		print "<td><input type=\"text\" class=\"flat\" name=\"external_rss_urlrss_" . $idrss . "\" value=\"" . @constant("EXTERNAL_RSS_URLRSS_" . $idrss) . "\" size=\"64\"></td>";
+		print "<td><input type=\"text\" class=\"flat minwidth300\" name=\"external_rss_urlrss_" . $idrss . "\" value=\"" . $conf->global->$keyrssurl . "\"></td>";
 		print "</tr>";
 
 		
@@ -304,6 +306,8 @@ if ($resql)
 			print "<td>".$langs->trans("Logo")."</td>";
 			print '<td>';
 			$imageurl=$rssparser->getImageUrl();
+			$linkrss=$rssparser->getLink();
+			if (! preg_match('/^http/', $imageurl)) $imageurl=$linkrss.$imageurl;
 			if ($imageurl) print '<img height="32" src="'.$imageurl.'">';
 			else print $langs->trans("None");
 			print '</td>';

From 1c20bbb2871808e3e6ee4d5ecf7874a3721c5f4e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Apr 2017 12:07:32 +0200
Subject: [PATCH 0642/1163] NEW Add index and constraints keys on supplier
 proposal detail table

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  5 ++++
 .../tables/llx_supplier_proposaldet.key.sql   | 26 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 htdocs/install/mysql/tables/llx_supplier_proposaldet.key.sql

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index e73c0df2add..9ff9de4e70d 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -173,4 +173,9 @@ create table llx_default_values
 ALTER TABLE llx_default_values ADD UNIQUE INDEX uk_default_values(type, entity, user_id, page, param);
 
 
+ALTER TABLE llx_supplier_proposaldet ADD INDEX idx_supplier_proposaldet_fk_supplier_proposal (fk_supplier_proposal);
+ALTER TABLE llx_supplier_proposaldet ADD INDEX idx_supplier_proposaldet_fk_product (fk_product);
+
+ALTER TABLE llx_supplier_proposaldet ADD CONSTRAINT fk_supplier_proposaldet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
+ALTER TABLE llx_supplier_proposaldet ADD CONSTRAINT fk_supplier_proposaldet_fk_supplier_proposal FOREIGN KEY (fk_supplier_proposal) REFERENCES llx_supplier_proposal (rowid);
 
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet.key.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet.key.sql
new file mode 100644
index 00000000000..e6af3c7e515
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet.key.sql
@@ -0,0 +1,26 @@
+-- ===================================================================
+-- Copyright (C) 2009-2011 Regis Houssin  <regis.houssin@capnetworks.com>
+-- Copyright (C) 2012      Cédric Salvador      <csalvador@gpcsolutions.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+
+
+ALTER TABLE llx_supplier_proposaldet ADD INDEX idx_supplier_proposaldet_fk_supplier_proposal (fk_supplier_proposal);
+ALTER TABLE llx_supplier_proposaldet ADD INDEX idx_supplier_proposaldet_fk_product (fk_product);
+
+ALTER TABLE llx_supplier_proposaldet ADD CONSTRAINT fk_supplier_proposaldet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
+ALTER TABLE llx_supplier_proposaldet ADD CONSTRAINT fk_supplier_proposaldet_fk_supplier_proposal FOREIGN KEY (fk_supplier_proposal) REFERENCES llx_supplier_proposal (rowid);

From 508109d5b1201c925fde31cbf35fab0df65f6c36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 00:21:00 +0200
Subject: [PATCH 0643/1163] Translation

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 4653a22d814..42c6eedae08 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1527,7 +1527,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
 WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it. 

From 1758b836042a3e1776af77a655bb2bc866e99b69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 13:50:13 +0200
Subject: [PATCH 0644/1163] Clean explanation for accounting module setup.

---
 htdocs/accountancy/index.php        |  9 ++++++---
 htdocs/langs/en_US/accountancy.lang | 18 +++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 54772ebf1a4..ff9ca6fa1a3 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -129,15 +129,18 @@ if (! empty($conf->don->enabled))
     print "<br>\n";
     print "<br>\n";
 }*/
+
 $step++;
-$textlink='<strong>'.$langs->transnoentitiesnoconv("Home").'-'.$langs->transnoentitiesnoconv("MenuBankCash").'</strong>';
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, $textlink);
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("ProductsBinding").'</strong>');
 print "<br>\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("ProductsBinding").'</strong>')."<br>\n";
+$textlink='<strong>'.$langs->transnoentitiesnoconv("MenuBankCash").'</strong>';
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, $textlink);
 print "<br>\n";
+print "<br>\n";
+
 
 print "<br>\n";
 print_fiche_titre($langs->trans("AccountancyAreaDescActionFreq"), '', 'object_calendarweek');
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 42c5c519d2c..57f220f943c 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -36,15 +36,15 @@ AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in f
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
 AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
 AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
-AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescVat=STEP %s: Check the binding between vat rates and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.    
-AccountancyAreaDescExpenseReport=STEP %s: Check the binding between type of expense report and accounting account is done. Complete missing bindings. You can set accounting accounts to use for each VAT from page %s.
-AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.    
-AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (miscellaneous taxes) and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.    
-AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. You can set the account dedicated for that from the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Check the default binding between miscellaneous transaction lines and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Check the binding between loans payment and accounting account is done. Complete missing bindings. For this you can use the menu entry %s. 
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this you can use the menu entry %s.    
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for type of expense report. For this you can use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this you can use the menu entry %s.    
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (miscellaneous taxes). For this you can use the menu entry %s.    
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this you can use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define default accounting accounts for miscellaneous transactions. For this you can use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this you can use the menu entry %s. 
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products. For this you can use the menu entry %s.
 
 AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
 AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.

From 2f23b36ca1b4d31d92822332201c084844dad3d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 14:20:06 +0200
Subject: [PATCH 0645/1163] Fix typo in var name picto

---
 htdocs/accountancy/admin/accountmodel.php | 4 ++--
 htdocs/accountancy/customer/list.php      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index d2b039a28e0..0b4aa70e548 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -901,8 +901,8 @@ if ($id)
         if ($id == 4) print '<td></td>';
         print '<td class="liste_titre"></td>';
     	print '<td class="liste_titre" colspan="2" align="right">';
-    	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-    	print $searchpitco;
+    	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+    	print $searchpicto;
     	print '</td>';
         print '</tr>';
             
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 845e0a62540..c5830b0b003 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -285,7 +285,7 @@ if ($result) {
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td align="center" class="liste_titre">';
-	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
 	print '</tr>';
@@ -303,7 +303,7 @@ if ($result) {
 	print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"');
 	$checkpicto='';
 	if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
-	print_liste_field_titre($checkpitco, '', '', '', '', 'align="center"');
+	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
 	print "</tr>\n";
 	
 	$facture_static = new Facture($db);

From 4c5e78a2cee5c883c7718e8152fbede3554d1b5d Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 27 Apr 2017 16:30:57 +0200
Subject: [PATCH 0646/1163] NEW use pdktk to concat mass pdf because tcpdf
 generate avoid to split large file into multiple smaller file (all have same
 size) encounter issue with mailer provider virtual delivery service

---
 htdocs/core/actions_massactions.inc.php | 141 ++++++++++++++++--------
 1 file changed, 93 insertions(+), 48 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 74badc6daae..58e47a29ec8 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -406,60 +406,105 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
         $outputlangs->setDefaultLang($newlang);
     }
 
-    // Create empty PDF
-    $pdf=pdf_getInstance();
-    if (class_exists('TCPDF'))
-    {
-        $pdf->setPrintHeader(false);
-        $pdf->setPrintFooter(false);
+    if(!empty($conf->global->USE_PDFTK_FOR_PDF_CONCAT)) {
+    	// Create output dir if not exists
+	dol_mkdir($diroutputmassaction);
+
+	// Defined name of merged file
+	$filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
+	$filename=preg_replace('/\s/','_',$filename);
+
+	// Save merged file
+	if ($filter=='paye:0')
+	{
+	if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+	else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+	}
+	if ($year) $filename.='_'.$year;
+	if ($month) $filename.='_'.$month;
+
+    	if (count($files)>0)
+    	{
+    	
+    		$now=dol_now();
+    		$file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
+    		
+    		$input_files = '';
+    		foreach($files as $f) {
+    			$input_files.=' '.escapeshellarg($f);
+    		}
+    		
+    		$cmd = 'pdftk '.$input_files.' cat output '.escapeshellarg($file);
+    		exec($cmd);
+    		
+    		if (! empty($conf->global->MAIN_UMASK))
+    			@chmod($file, octdec($conf->global->MAIN_UMASK));
+    			
+    			$langs->load("exports");
+    			setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
+    	}
+    	else
+    	{
+    		setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
+    	}
+    	
     }
-    $pdf->SetFont(pdf_getPDFFont($outputlangs));
+    else {
+	    // Create empty PDF
+	    $pdf=pdf_getInstance();
+	    if (class_exists('TCPDF'))
+	    {
+		$pdf->setPrintHeader(false);
+		$pdf->setPrintFooter(false);
+	    }
+	    $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-    if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+	    if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-    // Add all others
-    foreach($files as $file)
-    {
-        // Charge un document PDF depuis un fichier.
-        $pagecount = $pdf->setSourceFile($file);
-        for ($i = 1; $i <= $pagecount; $i++)
-        {
-            $tplidx = $pdf->importPage($i);
-            $s = $pdf->getTemplatesize($tplidx);
-            $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
-            $pdf->useTemplate($tplidx);
-        }
-    }
+	    // Add all others
+	    foreach($files as $file)
+	    {
+		// Charge un document PDF depuis un fichier.
+		$pagecount = $pdf->setSourceFile($file);
+		for ($i = 1; $i <= $pagecount; $i++)
+		{
+		    $tplidx = $pdf->importPage($i);
+		    $s = $pdf->getTemplatesize($tplidx);
+		    $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
+		    $pdf->useTemplate($tplidx);
+		}
+	    }
 
-    // Create output dir if not exists
-    dol_mkdir($diroutputmassaction);
+	    // Create output dir if not exists
+	    dol_mkdir($diroutputmassaction);
 
-    // Defined name of merged file
-    $filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
-    $filename=preg_replace('/\s/','_',$filename);
-    
-    // Save merged file
-    if ($filter=='paye:0')
-    {
-        if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
-        else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
-    }
-    if ($year) $filename.='_'.$year;
-    if ($month) $filename.='_'.$month;
-    if ($pagecount)
-    {
-        $now=dol_now();
-        $file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
-        $pdf->Output($file,'F');
-        if (! empty($conf->global->MAIN_UMASK))
-            @chmod($file, octdec($conf->global->MAIN_UMASK));
+	    // Defined name of merged file
+	    $filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
+	    $filename=preg_replace('/\s/','_',$filename);
+	    
+	    // Save merged file
+	    if ($filter=='paye:0')
+	    {
+		if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+		else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+	    }
+	    if ($year) $filename.='_'.$year;
+	    if ($month) $filename.='_'.$month;
+	    if ($pagecount)
+	    {
+		$now=dol_now();
+		$file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
+		$pdf->Output($file,'F');
+		if (! empty($conf->global->MAIN_UMASK))
+		    @chmod($file, octdec($conf->global->MAIN_UMASK));
 
-            $langs->load("exports");
-            setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
+		    $langs->load("exports");
+		    setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
+	    }
+	    else
+	    {
+		setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
+	    }
     }
 }
 

From 5e856e692369eaf33c5ffa327b63a70792357397 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 17:16:19 +0200
Subject: [PATCH 0647/1163] More complete tooltip help to describe available
 substitution vars

---
 htdocs/admin/chequereceipts.php                   |  8 +++++++-
 htdocs/admin/commande.php                         | 13 +++++++------
 htdocs/admin/contract.php                         | 11 +++++++++--
 htdocs/admin/expedition.php                       | 10 ++++++++--
 htdocs/admin/expensereport.php                    | 10 ++++++++--
 htdocs/admin/facture.php                          | 13 +++++++------
 htdocs/admin/fichinter.php                        | 11 +++++++++--
 htdocs/admin/livraison.php                        |  8 +++++++-
 htdocs/admin/payment.php                          |  2 +-
 htdocs/admin/propal.php                           | 15 ++++++++-------
 htdocs/admin/supplier_invoice.php                 |  8 +++++++-
 htdocs/admin/supplier_order.php                   |  9 ++++++++-
 htdocs/admin/supplier_proposal.php                | 11 +++++++++--
 .../facture/admin/facture_cust_extrafields.php    |  2 +-
 .../facture/admin/facturedet_cust_extrafields.php |  2 +-
 htdocs/fourn/card.php                             |  1 -
 htdocs/langs/en_US/companies.lang                 |  8 ++++----
 htdocs/societe/agenda.php                         |  8 +-------
 htdocs/theme/eldy/style.css.php                   |  4 ++++
 htdocs/theme/md/style.css.php                     |  3 +++
 20 files changed, 109 insertions(+), 48 deletions(-)

diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 3b205f49cd2..fd1da0c328b 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -257,8 +257,14 @@ $var=true;
 
 $var=! $var;
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnChequeReceipts").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnChequeReceipts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='BANK_CHEQUERECEIPT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 3933f5d00ab..a4680f4d16e 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -565,12 +565,18 @@ print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 $var=true;
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_ORDER_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -593,11 +599,6 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_COMMANDE_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-$substitutionarray=pdf_getSubstitutionArray($langs);
-$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
-$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
-foreach($substitutionarray as $key => $val) $htmltext.=$key.'<br>';
-$htmltext.='</i>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftOrders"), $htmltext);
 print '</td><td>';
 print '<input class="flat minwidth200" type="text" name="COMMANDE_DRAFT_WATERMARK" value="'.$conf->global->COMMANDE_DRAFT_WATERMARK.'">';
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index bc3ea402704..ddd8c6f1c00 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -502,9 +502,15 @@ print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 $var=true;
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 $var=! $var;
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnContracts").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='CONTRACT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -521,7 +527,8 @@ print '</td></tr>'."\n";
 //Use draft Watermark
 
 print '<tr class="oddeven"><td>';
-print $langs->trans("WatermarkOnDraftContractCards").'</td><td>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext);
+print '</td><td>';
 print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
 
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index ef8b10c411f..d31b788a1ab 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -502,8 +502,14 @@ print "<tr class=\"liste_titre\">";
 print "<td>".$langs->trans("Parameter")."</td>\n";
 print "</tr>";
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 print '<tr><td>';
-print $langs->trans("FreeLegalTextOnShippings").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnShippings"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='SHIPPING_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -518,7 +524,7 @@ else
 print "</td></tr>\n";
 
 print '<tr><td>';
-print $langs->trans("WatermarkOnDraft").'<br>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext).'<br>';
 print '<input size="50" class="flat" type="text" name="SHIPPING_DRAFT_WATERMARK" value="'.$conf->global->SHIPPING_DRAFT_WATERMARK.'">';
 print "</td></tr>\n";
 
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index eda3c6bd6ae..dad17585e2e 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -505,9 +505,15 @@ print '<td align="center" width="60"></td>';
 print "</tr>\n";
 $var=true;
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 $var=! $var;
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnExpenseReports").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnExpenseReports"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='EXPENSEREPORT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -524,7 +530,7 @@ print '</td></tr>'."\n";
 //Use draft Watermark
 
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("WatermarkOnDraftOrders").'<br>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftExpenseReports"), $htmltext).'<br>';
 print '<input size="50" class="flat" type="text" name="EXPENSEREPORT_DRAFT_WATERMARK" value="'.$conf->global->EXPENSEREPORT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index e7f74f85e5e..d89c9711e3f 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -733,12 +733,18 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" /
 print "</td></tr>\n";
 print '</form>';
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_INVOICE_FREE_TEXT" />';
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnInvoices").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -760,11 +766,6 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_FACTURE_DRAFT_WATERMARK" />';
 print '<tr class="oddeven"><td>';
-$substitutionarray=pdf_getSubstitutionArray($langs);
-$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
-$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
-foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
-$htmltext.='</i>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftBill"), $htmltext);
 print '</td>';
 print '<td><input size="50" class="flat" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.$conf->global->FACTURE_DRAFT_WATERMARK.'" />';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 6c73afcf8f5..0b01f56857e 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -534,12 +534,18 @@ print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 $var=true;
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_FICHINTER_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnInterventions").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnInterventions"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='FICHINTER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -562,7 +568,8 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_FICHINTER_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-print $langs->trans("WatermarkOnDraftInterventionCards").'</td><td>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftInterventionCards"), $htmltext).'<br>';
+print '</td><td>';
 print '<input size="50" class="flat" type="text" name="FICHINTER_DRAFT_WATERMARK" value="'.$conf->global->FICHINTER_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 281f1934296..143c54ec24d 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -479,12 +479,18 @@ print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 $var=true;
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_DELIVERY_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnDeliveryReceipts").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnDeliveryReceipts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='DELIVERY_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index a5166ec69f2..88f2d8cd1c1 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -117,7 +117,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
 
 $head = invoice_admin_prepare_head();
-dol_fiche_head($head, 'payment', $langs->trans("Invoices"), 0, 'invoice');
+dol_fiche_head($head, 'payment', $langs->trans("Invoices"), -1, 'invoice');
 
 /*
  *  Numbering module
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 76179fac66c..6a9884e263c 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -570,11 +570,17 @@ print "</td></tr>\n";
 print '</form>';
 */
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_PROPOSAL_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnProposal").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnProposal"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -596,12 +602,7 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_PROPALE_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-$substitutionarray=pdf_getSubstitutionArray($langs);
-$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
-$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
-foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
-$htmltext.='</i>';
-print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext);
+print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext).'<br>';
 print '</td><td>';
 print '<input class="flat minwidth200" type="text" name="PROPALE_DRAFT_WATERMARK" value="'.$conf->global->PROPALE_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 2619951e1b5..19f0e6fc8e2 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -471,8 +471,14 @@ print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnInvoices").' '.img_info($langs->trans("AddCRIfTooLong")).'</br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='SUPPLIER_INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index d54f0e367aa..a30e7de2654 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -491,6 +491,7 @@ print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 $var=false;
+
 //if ($conf->global->MAIN_FEATURES_LEVEL > 0)
 //{
 	print '<tr class="oddeven"><td>';
@@ -536,8 +537,14 @@ else
 }
 */
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='SUPPLIER_ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 703fbc482e9..345f622a533 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -523,12 +523,18 @@ print '<td width="60" align="center">'.$langs->trans("Value")."</td>\n";
 print "<td>&nbsp;</td>\n";
 print "</tr>";
 
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
 $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_SUPPLIER_PROPOSAL_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("FreeLegalTextOnSupplierProposal").' '.img_info($langs->trans("AddCRIfTooLong")).'</br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnSupplierProposal"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
 $variablename='SUPPLIER_PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -550,7 +556,8 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-print $langs->trans("WatermarkOnDraftSupplierProposal").'</td><td>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext).'<br>';
+print '</td><td>';
 print '<input size="50" class="flat" type="text" name="SUPPLIER_PROPOSAL_DRAFT_WATERMARK" value="'.$conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php
index ae545c695c3..c7a43c737de 100644
--- a/htdocs/compta/facture/admin/facture_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
 
 $head = invoice_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Invoices"), 0, 'invoice');
+dol_fiche_head($head, 'attributes', $langs->trans("Invoices"), -1, 'invoice');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
index d7fd3367b67..3a5f8c3387f 100644
--- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
@@ -71,7 +71,7 @@ print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
 
 $head = invoice_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("Invoices"), 0, 'invoice');
+dol_fiche_head($head, 'attributeslines', $langs->trans("Invoices"), -1, 'invoice');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index a9ba1ef80aa..4c2716e311a 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -753,7 +753,6 @@ if ($object->id > 0)
 	
 	print '</div>';
 	
-	print '<br>';
 
 	if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
 	{
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 38d7a81ab9a..12d1ea188e6 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -77,10 +77,10 @@ VATIsNotUsed=VAT is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
-OverAllProposals=Total proposals
-OverAllOrders=Total orders
-OverAllInvoices=Total invoices
-OverAllSupplierProposals=Total price requests
+OverAllProposals=Proposals
+OverAllOrders=Orders
+OverAllInvoices=Invoices
+OverAllSupplierProposals=Price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index e1dc1c12671..32d13356654 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -83,7 +83,7 @@ if (empty($reshook))
     }
 
     // Purge search criteria
-    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
         $actioncode='';
         $search_agenda_label='';
@@ -180,12 +180,6 @@ if ($socid > 0)
         
 		print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
 		
-        // List of todo actions
-        //show_actions_todo($conf,$langs,$db,$object,null,0,$actioncode);
-
-        // List of done actions
-        //show_actions_done($conf,$langs,$db,$object,null,0,$actioncode);
-     
         // List of all actions
 		$filters=array();
         $filters['search_agenda_label']=$search_agenda_label;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 5c7f1f446ae..f0e615f29ce 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1973,6 +1973,10 @@ div.tabBar {
 	width: auto;
 	background: rgb(<?php echo $colorbacktabcard1; ?>);
 }
+div.tabBar div.titre {
+	padding-top: 10px;    
+}
+
 div.tabBarWithBottom {
 	padding-bottom: 18px;
 	border-bottom: 1px solid #aaa; 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8cc95628561..d38391504fa 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1992,6 +1992,9 @@ div.tabBar {
 	padding-bottom: 12px;
 	border-bottom: 1px solid #aaa; 
 }
+div.tabBar div.titre {
+	padding-top: 10px;    
+}
 div.tabBarWithBottom {
 	padding-bottom: 18px;
 	border-bottom: 1px solid #aaa; 

From b87eb07b08963056e9da19b20e9599b95b784a42 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 17:51:11 +0200
Subject: [PATCH 0648/1163] Look and feel v6

---
 htdocs/accountancy/admin/export.php   | 2 +-
 htdocs/accountancy/admin/index.php    | 4 ++--
 htdocs/accountancy/admin/journals.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index f7bbbb97969..eaf69f34f1f 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -130,7 +130,7 @@ print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head($head, 'export', $langs->trans("Configuration"), 0, 'cron');
+dol_fiche_head($head, 'export', $langs->trans("Configuration"), -1, 'cron');
 
 $var = true;
 
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 3ea77a24b43..899aaa1a3d2 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -171,7 +171,7 @@ print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head($head, 'general', $langs->trans("Configuration"), 0, 'cron');
+dol_fiche_head($head, 'general', $langs->trans("Configuration"), -1, 'cron');
 
 
 // Default mode for calculating turnover (parameter ACCOUNTING_MODE)
@@ -299,7 +299,7 @@ print '<div class="center"><input type="submit" class="button" value="' . $langs
 print '<br>';
 print '<br>';
 
-print $langs->trans("AccountancySetupDoneFromAccountancyMenu", $langs->transnoentitiesnoconv("Home").'-'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy"));
+print '<div class="opacitymedium">'.$langs->trans("AccountancySetupDoneFromAccountancyMenu", $langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")).'</div>';
 
 print '<br>';
 print '</form>';
diff --git a/htdocs/accountancy/admin/journals.php b/htdocs/accountancy/admin/journals.php
index 03b51089d9a..677f2a743e5 100644
--- a/htdocs/accountancy/admin/journals.php
+++ b/htdocs/accountancy/admin/journals.php
@@ -94,7 +94,7 @@ print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'titl
 
 $head = admin_accounting_prepare_head(null);
 
-dol_fiche_head($head, 'journal', $langs->trans("Configuration"), 0, 'cron');
+dol_fiche_head($head, 'journal', $langs->trans("Configuration"), -1, 'cron');
 
 $sql = "SELECT j.rowid, j.code, j.label, j.nature, j.active";
 $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_journal as j";

From 853c8a8e07661edce38393dc2e31d9bbd81baf61 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Apr 2017 18:05:53 +0200
Subject: [PATCH 0649/1163] Fix typo

---
 htdocs/langs/en_US/sendings.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index ef6fe44856b..ac180cb5fe6 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -53,7 +53,7 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do
 ShipmentLine=Shipment line
 ProductQtyInCustomersOrdersRunning=Product quantity into open customers orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into open suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from oped customer order already sent
+ProductQtyInShipmentAlreadySent=Product quantity from open customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse. 
 WeightVolShort=Weight/Vol.

From 0ba6433a6166853b4b8a7a4d019c0b9e29a2b68f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 28 Apr 2017 13:10:08 +0200
Subject: [PATCH 0650/1163] Work on module website

---
 htdocs/admin/websites.php                     |  49 +++++--------
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   3 +
 htdocs/install/mysql/tables/llx_website.sql   |   7 +-
 .../mysql/tables/llx_website_pages.sql        |   6 +-
 htdocs/langs/en_US/website.lang               |   4 +-
 htdocs/theme/eldy/img/save.png                | Bin 0 -> 264 bytes
 htdocs/theme/md/img/save.png                  | Bin 0 -> 264 bytes
 htdocs/websites/class/website.class.php       |  47 +++++-------
 htdocs/websites/class/websitepage.class.php   |  13 ++--
 htdocs/websites/index.php                     |  68 +++++++++++++-----
 10 files changed, 105 insertions(+), 92 deletions(-)
 create mode 100644 htdocs/theme/eldy/img/save.png
 create mode 100644 htdocs/theme/md/img/save.png

diff --git a/htdocs/admin/websites.php b/htdocs/admin/websites.php
index b0c81ec18af..06e9a7b93a4 100644
--- a/htdocs/admin/websites.php
+++ b/htdocs/admin/websites.php
@@ -375,11 +375,11 @@ if ($id)
             // dans les dictionnaires de donnees
             $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
             $valuetoshow=$langs->trans($valuetoshow);   // try to translate
-            $align="left";
+            $align='';
             if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
             if ($valuetoshow != '')
             {
-                print '<td align="'.$align.'">';
+                print '<td class="'.$align.'">';
             	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
             	else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
             	else print $valuetoshow;
@@ -413,14 +413,11 @@ if ($id)
         $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
         $error=$hookmanager->error; $errors=$hookmanager->errors;
 
-        if ($id == 3) unset($fieldlist[2]);
-
         if (empty($reshook))
         {
        		fieldListWebsites($fieldlist,$obj,$tabname[$id],'add');
         }
 
-        if ($id == 4) print '<td></td>';
         print '<td colspan="3" align="right">';
         if ($action != 'edit')
         {
@@ -430,15 +427,9 @@ if ($id)
         print "</tr>";
 
         $colspan=count($fieldlist)+2;
-        if ($id == 4) $colspan++;
-
-        if (! empty($alabelisused) && $id != 25)  // If there is one label among fields, we show legend of *
-        {
-        	print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
-        }
-        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
     }
 
+    print '</table>';
     print '</form>';
 
 
@@ -453,6 +444,15 @@ if ($id)
         $var=true;
         if ($num)
         {
+            print '<br>';
+            
+            print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="page" value="'.$page.'">';
+            print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+            
+            print '<table class="noborder" width="100%">';
+        
             // There is several pages
             if ($num > $listlimit)
             {
@@ -503,14 +503,9 @@ if ($id)
 
                 $obj = $db->fetch_object($resql);
                 //print_r($obj);
-                print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
+                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
                 if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
                 {
-                    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                    print '<input type="hidden" name="page" value="'.$page.'">';
-                    print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-
                     $tmpaction='edit';
                     $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
                     $reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
@@ -548,16 +543,6 @@ if ($id)
 
                     $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&amp;code='.(! empty($obj->code)?urlencode($obj->code):'').'&amp;id='.$id.'&amp;';
 
-					// Favorite
-					// Only activated on country dictionary
-                    if ($id == 4)
-					{
-						print '<td align="center" class="nowrap">';
-						if ($iserasable) print '<a href="'.$url.'action='.$acts[$obj->favorite].'_favorite">'.$actl[$obj->favorite].'</a>';
-						else print $langs->trans("AlwaysActive");
-						print '</td>';
-					}
-
                     // Active
                     print '<td align="center" class="nowrap">';
                     print '<a href="'.$url.'action='.$acts[$obj->status].'">'.$actl[$obj->status].'</a>';
@@ -575,15 +560,15 @@ if ($id)
                 }
                 $i++;
             }
+            
+            print '</table>';
+            
+            print '</form>';
         }
     }
     else {
         dol_print_error($db);
     }
-
-    print '</table>';
-
-    print '</form>';
 }
 
 print '<br>';
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 9ff9de4e70d..c2edae8b592 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -137,6 +137,9 @@ ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
 
 ALTER TABLE llx_cronjob ADD COLUMN processing integer NOT NULL DEFAULT 0;
 
+ALTER TABLE llx_website ADD COLUMN fk_user_create integer;
+ALTER TABLE llx_website ADD COLUMN fk_user_modif integer;
+
 
 create table llx_payment_various
 (
diff --git a/htdocs/install/mysql/tables/llx_website.sql b/htdocs/install/mysql/tables/llx_website.sql
index 331e6b085bd..84a9dd47188 100644
--- a/htdocs/install/mysql/tables/llx_website.sql
+++ b/htdocs/install/mysql/tables/llx_website.sql
@@ -26,7 +26,8 @@ CREATE TABLE llx_website
 	status		  integer,
 	fk_default_home integer, 
 	virtualhost   varchar(255), 
-    date_creation     datetime,
-    date_modification datetime,
-	tms           timestamp
+    fk_user_create integer,
+    fk_user_modif  integer,
+    date_creation  datetime,
+	tms            timestamp
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_website_pages.sql b/htdocs/install/mysql/tables/llx_website_pages.sql
index 982420dd507..69b6c417528 100644
--- a/htdocs/install/mysql/tables/llx_website_pages.sql
+++ b/htdocs/install/mysql/tables/llx_website_pages.sql
@@ -27,6 +27,8 @@ CREATE TABLE llx_website_page
 	keywords      varchar(255),
 	content		  mediumtext,		-- text is not enough in size
     status        integer,
-    date_creation     datetime,
-	tms           timestamp
+    fk_user_create integer,
+    fk_user_modif  integer,
+    date_creation  datetime,
+	tms            timestamp
 ) ENGINE=innodb;
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index fcb09c8d5c1..03069d6f649 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -24,5 +24,5 @@ SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
+PreviewSiteServedByWebServer=Preview %s in a new tab.<br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab.<br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and clicking on the other preview button.  
diff --git a/htdocs/theme/eldy/img/save.png b/htdocs/theme/eldy/img/save.png
new file mode 100644
index 0000000000000000000000000000000000000000..eca2d92eccc5665b070d3c04e7241fbc2cbb71d5
GIT binary patch
literal 264
zcmV+j0r&oiP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002bNkl<ZcmeI#
zO=^Qc9ER~{CtgGfq69zgmkWsEMKnE9vD;E=K(m^-$RZ4r!H{<oI?ucR|H2RgL0%~I
z!N?!x$sPBf|Mi>^5To~qfUqA&PMF*F<|kx;Md$&W&;x!#4;TRufSvnyKmY=;&`=O<
zD`{EPz!xd^WlTz7A;m7|q5~RSbvmHHRiy(WT*Yq$l(?#OK#Qwh2dre+9fV)gZ4<e5
z{#*T1vC>fyZ>#A&pWX|cF@nuJ>{9{^+CL!nen`MaoS0vDoPmT;NZb{N*U=t-36Ko{
O0000<MNUMnLSTYx4QnL;

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/save.png b/htdocs/theme/md/img/save.png
new file mode 100644
index 0000000000000000000000000000000000000000..eca2d92eccc5665b070d3c04e7241fbc2cbb71d5
GIT binary patch
literal 264
zcmV+j0r&oiP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002bNkl<ZcmeI#
zO=^Qc9ER~{CtgGfq69zgmkWsEMKnE9vD;E=K(m^-$RZ4r!H{<oI?ucR|H2RgL0%~I
z!N?!x$sPBf|Mi>^5To~qfUqA&PMF*F<|kx;Md$&W&;x!#4;TRufSvnyKmY=;&`=O<
zD`{EPz!xd^WlTz7A;m7|q5~RSbvmHHRiy(WT*Yq$l(?#OK#Qwh2dre+9fV)gZ4<e5
z{#*T1vC>fyZ>#A&pWX|cF@nuJ>{9{^+CL!nen`MaoS0vDoPmT;NZb{N*U=t-36Ko{
O0000<MNUMnLSTYx4QnL;

literal 0
HcmV?d00001

diff --git a/htdocs/websites/class/website.class.php b/htdocs/websites/class/website.class.php
index 51a61d90112..a77079c94a6 100644
--- a/htdocs/websites/class/website.class.php
+++ b/htdocs/websites/class/website.class.php
@@ -73,10 +73,6 @@ class Website extends CommonObject
 	 * @var mixed
 	 */
 	public $date_creation;
-	/**
-	 * @var mixed
-	 */
-	public $date_modification;
 	/**
 	 * @var mixed
 	 */
@@ -123,7 +119,6 @@ class Website extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		
 		if (isset($this->entity)) {
 			 $this->entity = trim($this->entity);
 		}
@@ -136,36 +131,30 @@ class Website extends CommonObject
 		if (isset($this->status)) {
 			 $this->status = trim($this->status);
 		}
-
-		
+		if (empty($this->date_creation)) $this->date_creation = dol_now();
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
-		
 		$sql.= 'entity,';
 		$sql.= 'ref,';
 		$sql.= 'description,';
 		$sql.= 'status,';
 		$sql.= 'fk_default_home,';
 		$sql.= 'virtualhost,';
-		$sql.= 'date_creation,';
-		$sql.= 'date_modification';
-		
+		$sql.= 'fk_user_create';
+		$sql.= 'date_creation';
 		$sql .= ') VALUES (';
-		
 		$sql .= ' '.(! isset($this->entity)?'NULL':$this->entity).',';
 		$sql .= ' '.(! isset($this->ref)?'NULL':"'".$this->db->escape($this->ref)."'").',';
 		$sql .= ' '.(! isset($this->description)?'NULL':"'".$this->db->escape($this->description)."'").',';
 		$sql .= ' '.(! isset($this->status)?'NULL':$this->status).',';
 		$sql .= ' '.(! isset($this->fk_default_home)?'NULL':$this->fk_default_home).',';
 		$sql .= ' '.(! isset($this->virtualhost)?'NULL':$this->virtualhost).',';
-		$sql .= ' '.(! isset($this->date_creation) || dol_strlen($this->date_creation)==0?'NULL':"'".$this->db->idate($this->date_creation)."'").',';
-		$sql .= ' '.(! isset($this->date_modification) || dol_strlen($this->date_modification)==0?'NULL':"'".$this->db->idate($this->date_modification)."'");
-
-		
+		$sql .= ' '.(! isset($this->fk_user_create)?$user->id:$this->fk_user_create).',';
+		$sql .= ' '.(! isset($this->date_creation) || dol_strlen($this->date_creation)==0?'NULL':"'".$this->db->idate($this->date_creation)."'");
 		$sql .= ')';
 
 		$this->db->begin();
@@ -223,8 +212,9 @@ class Website extends CommonObject
 		$sql .= " t.status,";
 		$sql .= " t.fk_default_home,";
 		$sql .= " t.virtualhost,";
+		$sql .= " t.fk_user_create,";
+		$sql .= " t.fk_user_modif,";
 		$sql .= " t.date_creation,";
-		$sql .= " t.date_modification,";
 		$sql .= " t.tms";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		if (null !== $ref) {
@@ -247,11 +237,10 @@ class Website extends CommonObject
 				$this->status = $obj->status;
 				$this->fk_default_home = $obj->fk_default_home;
 				$this->virtualhost = $obj->virtualhost;
+				$this->fk_user_create = $obj->fk_user_create;
+				$this->fk_user_modif = $obj->fk_user_modif;
 				$this->date_creation = $this->db->jdate($obj->date_creation);
-				$this->date_modification = $this->db->jdate($obj->date_modification);
 				$this->tms = $this->db->jdate($obj->tms);
-
-				
 			}
 			$this->db->free($resql);
 
@@ -292,8 +281,9 @@ class Website extends CommonObject
 		$sql .= " t.status,";
 		$sql .= " t.fk_default_home,";
 		$sql .= " t.virtualhost,";
+		$sql .= " t.fk_user_create,";
+		$sql .= " t.fk_user_modif,";
 		$sql .= " t.date_creation,";
-		$sql .= " t.date_modification,";
 		$sql .= " t.tms";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
 
@@ -331,8 +321,9 @@ class Website extends CommonObject
 				$line->status = $obj->status;
 				$line->fk_default_home = $obj->fk_default_home;
 				$line->virtualhost = $obj->virtualhost;
+				$this->fk_user_create = $obj->fk_user_create;
+				$this->fk_user_modif = $obj->fk_user_modif;
 				$line->date_creation = $this->db->jdate($obj->date_creation);
-				$line->date_modification = $this->db->jdate($obj->date_modification);
 				$line->tms = $this->db->jdate($obj->tms);
 
 				$this->records[$line->id] = $line;
@@ -377,25 +368,20 @@ class Website extends CommonObject
 			 $this->status = trim($this->status);
 		}
 
-		
-
 		// Check parameters
 		// Put here code to add a control on parameters values
 
 		// Update request
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-		
 		$sql .= ' entity = '.(isset($this->entity)?$this->entity:"null").',';
 		$sql .= ' ref = '.(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").',';
 		$sql .= ' description = '.(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").',';
 		$sql .= ' status = '.(isset($this->status)?$this->status:"null").',';
 		$sql .= ' fk_default_home = '.(($this->fk_default_home > 0)?$this->fk_default_home:"null").',';
 		$sql .= ' virtualhost = '.(($this->virtualhost != '')?"'".$this->db->escape($this->virtualhost)."'":"null").',';
+		$sql .= ' fk_user_modif = '.(! isset($this->fk_user_modif) ? $user->id : $this->fk_user_modif).',';
 		$sql .= ' date_creation = '.(! isset($this->date_creation) || dol_strlen($this->date_creation) != 0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').',';
-		$sql .= ' date_modification = '.(! isset($this->date_modification) || dol_strlen($this->date_modification) != 0 ? "'".$this->db->idate($this->date_modification)."'" : 'null').',';
 		$sql .= ' tms = '.(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : "'".$this->db->idate(dol_now())."'");
-
-        
 		$sql .= ' WHERE rowid=' . $this->id;
 
 		$this->db->begin();
@@ -631,6 +617,8 @@ class Website extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
+	    global $user;
+	    
 		$this->id = 0;
 		
 		$this->entity = 1;
@@ -639,8 +627,9 @@ class Website extends CommonObject
 		$this->status = '';
 		$this->fk_default_home = null;
 		$this->virtualhost = 'http://myvirtualhost';
+		$this->fk_user_create = $user->id;
+		$this->fk_user_modif = $user->id;
 		$this->date_creation = dol_now();
-		$this->date_modification = dol_now();
 		$this->tms = dol_now();
 
 		
diff --git a/htdocs/websites/class/websitepage.class.php b/htdocs/websites/class/websitepage.class.php
index 883b6495c53..c80d20fe44b 100644
--- a/htdocs/websites/class/websitepage.class.php
+++ b/htdocs/websites/class/websitepage.class.php
@@ -181,7 +181,7 @@ class WebsitePage extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param int    $id           Id object
+	 * @param int    $id           Id object. If this is 0, the default page of website_id will be used, if not defined, the first one. found
 	 * @param string $website_id   Web site id
 	 * @param string $page         Page name
 	 *
@@ -205,13 +205,16 @@ class WebsitePage extends CommonObject
 		$sql .= " t.tms as date_modification";
 
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		//$sql .= ' WHERE entity IN ('.getEntity('website', 1).')';       // entity is on website level
+		$sql .= ' WHERE 1 = 1';
 		if (null !== $website_id) {
-		    $sql .= ' WHERE t.fk_website = ' . '\'' . $website_id . '\'';
-		    $sql .= ' AND t.pageurl = ' . '\'' . $page . '\'';
+		    $sql .= " AND t.fk_website = '" . $this->db->escape($website_id) . "'";
+		    if ($page) $sql .= " AND t.pageurl = '" . $this->db->escape($page) . "'";
 		} else {
-			$sql .= ' WHERE t.rowid = ' . $id;
+			$sql .= ' AND t.rowid = ' . $id;
 		}
-
+        $sql .= $this->db->plimit(1);
+        
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$numrows = $this->db->num_rows($resql);
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index b55f81f5b7f..b78a172e01f 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -438,16 +438,34 @@ if ($action == 'updatemeta')
 // Update page
 if ($action == 'updatecontent' || GETPOST('refreshsite') || GETPOST('refreshpage') || GETPOST('preview'))
 {
-    $db->begin();
     $object->fetch(0, $website);
 
+    /*if (GETPOST('savevirtualhost') && $object->virtualhost != GETPOST('previewsite'))
+    {
+        $object->virtualhost = GETPOST('previewsite', 'alpha');
+        $object->update($user);
+    }*/
+    
     $objectpage->fk_website = $object->id;
 
-    $res = $objectpage->fetch($pageid, $object->fk_website);
+    if ($pageid > 0) 
+    {
+        $res = $objectpage->fetch($pageid);
+    }
+    else 
+    {
+        $res = $objectpage->fetch($object->fk_default_home);
+        if (! $res > 0)
+        {
+            $res = $objectpage->fetch(0, $object->fk_website);
+        }
+    }
     if ($res > 0)
     {
         if ($action == 'updatecontent')
         {
+            $db->begin();
+            
             $objectpage->content = GETPOST('PAGE_CONTENT');
     
             // Clean data. We remove all the head section.
@@ -632,7 +650,7 @@ if (count($object->records) > 0)
     // List of websites
     print '<div class="websiteselection">';
     $out='';
-    $out.='<select name="website" id="website">';
+    $out.='<select name="website" class="minwidth100" id="website">';
     if (empty($object->records)) $out.='<option value="-1">&nbsp;</option>';
     // Loop on each sites
     $i=0;
@@ -654,9 +672,9 @@ if (count($object->records) > 0)
 
     if ($website)
     {
-        $realurl=$urlwithroot.'/public/websites/index.php?website='.$website;
+        $virtualurl='';
         $dataroot=DOL_DATA_ROOT.'/websites/'.$website;
-        if (! empty($object->virtualhost)) $realurl=$object->virtualhost; 
+        if (! empty($object->virtualhost)) $virtualurl=$object->virtualhost;
     }
     
     if ($website && $action == 'preview')
@@ -680,20 +698,23 @@ if (count($object->records) > 0)
     if ($action == 'preview')
     {
         print '<div class="websiteinputurl">';
-        print '<input type="text" id="previewsiteurl" class="minwidth200imp" name="previewsite" value="'.$realurl.'">';
+        print '<input type="text" id="previewsiteurl" class="minwidth200imp" name="previewsite" placeholder="'.$langs->trans("http://myvirtualhost").'" value="'.$virtualurl.'">';
         //print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
         $htmltext=$langs->trans("SetHereVirtualHost", $dataroot);
         print $form->textwithpicto('', $htmltext);
         print '</div>';
         
-        $urlext=$realurl;
-        $urlint=DOL_URL_ROOT.'/public/websites/index.php?website='.$website;
-        print '<a class="websitebuttonsitepreview" id="previewsiteext" href="'.$urlext.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer")).'">';
-        print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $urlext), 1, 'preview_ext');
-        print '</a>';
+        $urlext=$virtualurl;
+        $urlint=$urlwithroot.'/public/websites/index.php?website='.$website;
+        //if (! empty($object->virtualhost))
+        //{
+            print '<a class="websitebuttonsitepreview" id="previewsiteext" href="'.$urlext.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext)).'">';
+            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
+            print '</a>';
+        //}
         
-        print '<a class="websitebuttonsitepreview" id="previewsite" href="'.DOL_URL_ROOT.'/public/websites/index.php?website='.$website.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr")).'">';
-        print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $urlint), 1, 'preview');
+        print '<a class="websitebuttonsitepreview" id="previewsite" href="'.$urlwithroot.'/public/websites/index.php?website='.$website.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint)).'">';
+        print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint, $dataroot), 1, 'preview');
         print '</a>';
     }
 
@@ -803,13 +824,22 @@ if (count($object->records) > 0)
             print $form->textwithpicto('', $htmltext);
             print '</div>';
             
-            $urlext=$realurl.'/'.$pagealias.'.php';
-            print '<a class="websitebuttonsitepreview" id="previewpageext" href="'.$urlext.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer")).'">';
-            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $urlext), 1, 'preview_ext');
-            print '</a>';
+            if (! empty($object->virtualhost))
+            {
+                $urlext=$virtualurl.'/'.$pagealias.'.php';
+                print '<a class="websitebuttonsitepreview" id="previewpageext" href="'.$urlext.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext)).'">';
+                print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
+                print '</a>';
+            }
+            else
+            {
+                print '<a class="websitebuttonsitepreview" id="previewpageextnoclick" href="#">';
+                print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
+                print '</a>';
+            }
             
-            print '<a class="websitebuttonsitepreview" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$website.'">';
-            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage), 1, 'preview'); 
+            print '<a class="websitebuttonsitepreview" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage)).'">';
+            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot), 1, 'preview'); 
             print '</a>';       // View page in new Tab
             //print '<input type="submit" class="button" name="previewpage" target="tab'.$website.'"value="'.$langs->trans("ViewPageInNewTab").'">';
             

From c722286bcb584868d7603f16571299fa327c04a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 28 Apr 2017 13:37:36 +0200
Subject: [PATCH 0651/1163] Fix regressions

---
 htdocs/comm/card.php                  | 2 +-
 htdocs/compta/facture/card.php        | 2 +-
 htdocs/core/class/html.form.class.php | 2 +-
 htdocs/langs/en_US/main.lang          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 67ab40f4946..aae1398109d 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -1098,7 +1098,7 @@ if ($id > 0)
     				    else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
     				}
 
-    				if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
+    				if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
     				else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
     
     			}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6e8c3b6d895..70eea532a79 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2191,7 +2191,7 @@ if ($action == 'create')
 	else
 	{
 		print '<td colspan="2">';
-		print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty');
+		print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// Option to reload page to retrieve customer informations. Note, this clear other input
 		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
 		{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b839e46dc8b..3275ee0f303 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -994,7 +994,7 @@ class Form
     				print img_picto($langs->trans("Search"), 'search');
     			}
     		}
-            print '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->THIRDPARTY_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
+            print '<input type="text" class="'.$morecss.'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->THIRDPARTY_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
     		if ($hidelabel == 3) {
     			print img_picto($langs->trans("Search"), 'search');
     		}
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 71788071a2d..1a3eea413df 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -823,5 +823,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
-
+SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
\ No newline at end of file

From defce63a24456d2f57e14bdfa09faa282ed138aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 28 Apr 2017 14:05:28 +0200
Subject: [PATCH 0652/1163] Work on management of default values

---
 htdocs/admin/defaultvalues.php    |  9 ++++---
 htdocs/core/lib/functions.lib.php | 43 ++++++++++++++++++++++++-------
 htdocs/langs/en_US/admin.lang     |  2 +-
 htdocs/master.inc.php             |  2 +-
 htdocs/user/class/user.class.php  |  4 +--
 5 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 0bc620c41bf..96fef57e7cf 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -187,29 +187,30 @@ $texthelp=$langs->trans("PageUrlForDefaultValues");
 if ($mode == 'createform') $texthelp.=$langs->trans("PageUrlForDefaultValuesCreate", 'societe/card.php');
 else $texthelp.=$langs->trans("PageUrlForDefaultValuesList", 'societe/list.php');
 $texturl=$form->textwithpicto($langs->trans("Url"), $texthelp);
-print_liste_field_titre($texturl,$_SERVER["PHP_SELF"],'defaulturl','',$param,'',$sortfield,$sortorder);
+print_liste_field_titre($texturl,$_SERVER["PHP_SELF"],'page,param','',$param,'',$sortfield,$sortorder);
 $texthelp=$langs->trans("TheKeyIsTheNameOfHtmlField");
 if ($mode != 'sortorder') $textkey=$form->textwithpicto($langs->trans("Key"), $texthelp);
 else $textkey=$form->textwithpicto($langs->trans("Key"), $texthelp);
-print_liste_field_titre($textkey,$_SERVER["PHP_SELF"],'defaultkey','',$param,'',$sortfield,$sortorder);
+print_liste_field_titre($textkey,$_SERVER["PHP_SELF"],'param','',$param,'',$sortfield,$sortorder);
 if ($mode != 'sortorder')
 {
     $texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
     // See list into GETPOST
     $texthelp.='__USERID__<br>';
+    $texthelp.='__SUPERVISORID__<br>';
     $texthelp.='__MYCOUNTRYID__<br>';
     $texthelp.='__DAY__<br>';
     $texthelp.='__MONTH__<br>';
     $texthelp.='__YEAR__<br>';
     if (! empty($conf->multicompany->enabled)) $texthelp.='__ENTITYID__<br>';
-    $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp);
+    $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');
 }
 else
 {
     $texthelp='ASC or DESC';
     $textvalue=$form->textwithpicto($langs->trans("SortOrder"), $texthelp);
 }
-print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'defaultvalue', '', $param, '', $sortfield, $sortorder);
+print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
 if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],'entity,page','',$param,'',$sortfield,$sortorder);
 print '<td align="center"></td>';
 print "</tr>\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d430a8ea53b..7743da27c2d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -253,17 +253,35 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 		$out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
 		
 		// Management of default values
-		if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+		if (! isset($_GET['sortfield']))	// If we did a click on a field so sort, we do no appl default values
 		{
-			$relativepathstring = preg_replace('/\.[a-z]+$/', '', $_SERVER["PHP_SELF"]);
-			if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-			$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-			$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-			$relativepathstring=dol_string_nospecial($relativepathstring, '-');
-			// $relativepathstring is now string that identify the page: '_societe_card', '_agenda_card', ...
-			$keyfordefaultvalue = 'MAIN_DEFAULT_FOR_'.$relativepathstring.'_'.$paramname;
-			global $conf;
-			if (isset($conf->global->$keyfordefaultvalue)) $out = $conf->global->$keyfordefaultvalue;
+			if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+			{
+				$relativepathstring = $_SERVER["PHP_SELF"];
+				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+				global $user;
+				if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first 
+				{
+					//var_dump($user->default_values[$relativepathstring]['createform']);
+					if (isset($user->default_values[$relativepathstring]['createform'][$paramname])) $out = $user->default_values[$relativepathstring]['createform'][$paramname];
+				}
+			}
+			// Management of default search_filters
+			elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+			{
+				$relativepathstring = $_SERVER["PHP_SELF"];
+				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+				global $user;
+				if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first 
+				{
+					//var_dump($user->default_values[$relativepathstring]);
+					if (isset($user->default_values[$relativepathstring]['filters'][$paramname])) $out = $user->default_values[$relativepathstring]['filters'][$paramname];
+				}
+			}
 		}
 	}
 	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
@@ -303,6 +321,11 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 	            global $user;
 	            $out = $user->id;
 	        }
+	    	elseif ($reg[1] == 'SUPERVISORID')
+	        {
+	            global $user;
+	            $out = $user->fk_user;
+	        }
 	        elseif ($reg[1] == 'ENTITYID')
 	        {
 	            global $conf;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index af23343398b..1bfa5c0230c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -428,7 +428,7 @@ ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=The key is the name of the html field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter here the relative url of the page. Examples:
+PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index ebb99eb9807..61e51999479 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -180,7 +180,7 @@ if (! defined('NOREQUIREDB'))
 
 	//print "Will work with data into entity instance number '".$conf->entity."'";
 
-	// Here we read database (llx_const table and llx_default_values) and define $conf->global->XXX var.
+	// Here we read database (llx_const table) and define $conf->global->XXX var.
 	$conf->setValues($db);
 }
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a3006d6ebcd..f23c8aca0b6 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -376,7 +376,7 @@ class User extends CommonObject
 			    {
 			        if (! empty($obj->page) && ! empty($obj->type) && ! empty($obj->param)) 
 			        {
-			            $user->default_values[$obj->page][$obj->type][$obj->param]=$obj->value;
+			            $this->default_values[$obj->page][$obj->type][$obj->param]=$obj->value;
 			        }
 			    }
 			    $this->db->free($resql);
@@ -387,7 +387,7 @@ class User extends CommonObject
 				return -3;
 			}
 		}
-
+		
 		return 1;
 	}
 

From 88515c306fdf759abd5cf97797db7b92a461b97f Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 28 Apr 2017 14:33:06 +0200
Subject: [PATCH 0653/1163] Fix Propal class doesn't have fetch_lines method
 yet

---
 htdocs/comm/propal/class/propal.class.php | 204 ++++++++++++----------
 1 file changed, 111 insertions(+), 93 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 46c6a55cf2f..348ca1938b0 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1366,102 +1366,13 @@ class Propal extends CommonObject
                 $this->lines = array();
 
                 /*
-                 * Lignes propales liees a un produit ou non
+                 * Lines
                  */
-                $sql = "SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
-				$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
-	            $sql.= " d.fk_unit,";
-                $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
-                $sql.= ' d.date_start, d.date_end';
-				$sql.= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
-                $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d";
-                $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
-                $sql.= " WHERE d.fk_propal = ".$this->id;
-                $sql.= " ORDER by d.rang";
-
-                $result = $this->db->query($sql);
-                if ($result)
+                $result=$this->fetch_lines();
+                if ($result < 0)
                 {
-                	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-                	$extrafieldsline=new ExtraFields($this->db);
-                	$line = new PropaleLigne($this->db);
-                	$extralabelsline=$extrafieldsline->fetch_name_optionals_label($line->table_element,true);
-
-                    $num = $this->db->num_rows($result);
-                    $i = 0;
-
-                    while ($i < $num)
-                    {
-                        $objp                   = $this->db->fetch_object($result);
-
-                        $line                   = new PropaleLigne($this->db);
-
-                        $line->rowid			= $objp->rowid; //Deprecated
-                        $line->id				= $objp->rowid;
-                        $line->fk_propal		= $objp->fk_propal;
-                        $line->fk_parent_line	= $objp->fk_parent_line;
-                        $line->product_type     = $objp->product_type;
-                        $line->label            = $objp->custom_label;
-                        $line->desc             = $objp->description;  // Description ligne
-                        $line->qty              = $objp->qty;
-                        $line->tva_tx           = $objp->tva_tx;
-                        $line->localtax1_tx		= $objp->localtax1_tx;
-                        $line->localtax2_tx		= $objp->localtax2_tx;
-                        $line->subprice         = $objp->subprice;
-                        $line->fk_remise_except = $objp->fk_remise_except;
-                        $line->remise_percent   = $objp->remise_percent;
-                        $line->price            = $objp->price;		// TODO deprecated
-
-                        $line->info_bits        = $objp->info_bits;
-                        $line->total_ht         = $objp->total_ht;
-                        $line->total_tva        = $objp->total_tva;
-                        $line->total_localtax1	= $objp->total_localtax1;
-                        $line->total_localtax2	= $objp->total_localtax2;
-                        $line->total_ttc        = $objp->total_ttc;
-      					$line->fk_fournprice 	= $objp->fk_fournprice;
-						$marginInfos			= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
-						$line->pa_ht 			= $marginInfos[0];
-						$line->marge_tx			= $marginInfos[1];
-						$line->marque_tx		= $marginInfos[2];
-                        $line->special_code     = $objp->special_code;
-                        $line->rang             = $objp->rang;
-
-                        $line->fk_product       = $objp->fk_product;
-
-                        $line->ref				= $objp->product_ref;		// TODO deprecated
-                        $line->product_ref		= $objp->product_ref;
-                        $line->libelle			= $objp->product_label;		// TODO deprecated
-                        $line->product_label	= $objp->product_label;
-                        $line->product_desc     = $objp->product_desc; 		// Description produit
-                        $line->fk_product_type  = $objp->fk_product_type;
-	                    $line->fk_unit          = $objp->fk_unit;
-
-                        $line->date_start  		= $this->db->jdate($objp->date_start);
-                        $line->date_end  		= $this->db->jdate($objp->date_end);
-
-						// Multicurrency
-						$line->fk_multicurrency 		= $objp->fk_multicurrency;
-						$line->multicurrency_code 		= $objp->multicurrency_code;
-						$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
-						$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
-						$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
-						$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
-
-                        $line->fetch_optionals($line->id,$extralabelsline);
-
-                        $this->lines[$i]        = $line;
-                        //dol_syslog("1 ".$line->fk_product);
-                        //print "xx $i ".$this->lines[$i]->fk_product;
-                        $i++;
-                    }
-                    $this->db->free($result);
+                    return -3;
                 }
-                else
-                {
-                    $this->error=$this->db->lasterror();
-                    return -1;
-                }
-
 
                 return 1;
             }
@@ -1475,6 +1386,113 @@ class Propal extends CommonObject
             return -1;
         }
     }
+	
+	/**
+	 * Load array lines
+	 * 
+	 * @param		int		$only_product	Return only physical products
+	 * @return		int						<0 if KO, >0 if OK
+	 */
+	function fetch_lines($only_product=0)
+	{
+		$this->lines=array();
+		
+		$sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,';
+		$sql.= ' d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,';
+		$sql.= ' d.fk_unit,';
+		$sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
+		$sql.= ' d.date_start, d.date_end';
+		$sql.= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as d';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (d.fk_product = p.rowid)';
+		$sql.= ' WHERE d.fk_propal = '.$this->id;
+		if ($only_product) $sql .= ' AND p.fk_product_type = 0';
+		$sql.= ' ORDER by d.rang';
+
+		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+			$num = $this->db->num_rows($result);
+			
+			$i = 0;
+			while ($i < $num)
+			{
+				$objp                   = $this->db->fetch_object($result);
+
+				$line                   = new PropaleLigne($this->db);
+
+				$line->rowid			= $objp->rowid; //Deprecated
+				$line->id				= $objp->rowid;
+				$line->fk_propal		= $objp->fk_propal;
+				$line->fk_parent_line	= $objp->fk_parent_line;
+				$line->product_type     = $objp->product_type;
+				$line->label            = $objp->custom_label;
+				$line->desc             = $objp->description;  // Description ligne
+				$line->qty              = $objp->qty;
+				$line->tva_tx           = $objp->tva_tx;
+				$line->localtax1_tx		= $objp->localtax1_tx;
+				$line->localtax2_tx		= $objp->localtax2_tx;
+				$line->subprice         = $objp->subprice;
+				$line->fk_remise_except = $objp->fk_remise_except;
+				$line->remise_percent   = $objp->remise_percent;
+				$line->price            = $objp->price;		// TODO deprecated
+
+				$line->info_bits        = $objp->info_bits;
+				$line->total_ht         = $objp->total_ht;
+				$line->total_tva        = $objp->total_tva;
+				$line->total_localtax1	= $objp->total_localtax1;
+				$line->total_localtax2	= $objp->total_localtax2;
+				$line->total_ttc        = $objp->total_ttc;
+				$line->fk_fournprice 	= $objp->fk_fournprice;
+				$marginInfos			= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
+				$line->pa_ht 			= $marginInfos[0];
+				$line->marge_tx			= $marginInfos[1];
+				$line->marque_tx		= $marginInfos[2];
+				$line->special_code     = $objp->special_code;
+				$line->rang             = $objp->rang;
+
+				$line->fk_product       = $objp->fk_product;
+
+				$line->ref				= $objp->product_ref;		// TODO deprecated
+				$line->product_ref		= $objp->product_ref;
+				$line->libelle			= $objp->product_label;		// TODO deprecated
+				$line->product_label	= $objp->product_label;
+				$line->product_desc     = $objp->product_desc; 		// Description produit
+				$line->fk_product_type  = $objp->fk_product_type;
+				$line->fk_unit          = $objp->fk_unit;
+
+				$line->date_start  		= $this->db->jdate($objp->date_start);
+				$line->date_end  		= $this->db->jdate($objp->date_end);
+
+				// Multicurrency
+				$line->fk_multicurrency 		= $objp->fk_multicurrency;
+				$line->multicurrency_code 		= $objp->multicurrency_code;
+				$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
+				$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
+				$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+				$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+
+				$line->fetch_optionals();
+
+				$this->lines[$i]        = $line;
+				//dol_syslog("1 ".$line->fk_product);
+				//print "xx $i ".$this->lines[$i]->fk_product;
+				$i++;
+			}
+			
+			$this->db->free($result);
+			
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			return -3;
+		}
+	}
 
     /**
      *	Update value of extrafields on the proposal

From 058b43f342e895edde8fb483ca8686371430b9ff Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Fri, 28 Apr 2017 16:50:30 +0200
Subject: [PATCH 0654/1163] display the good value on pdf

---
 htdocs/core/lib/pdf.lib.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index c490a2f66c5..2fc447daffd 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1853,7 +1853,7 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
 		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
 	}
     if (empty($reshook))
-	{
+    {
 	    if ($object->lines[$i]->special_code == 3)
     	{
     		return $outputlangs->transnoentities("Option");
@@ -1861,9 +1861,16 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
         if (empty($hidedetails) || $hidedetails > 1)
         {
         	$total_ht = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
+        	if ($object->lines[$i]->situation_percent > 0 )
+        	{
+		 	$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+		 	$progress = ( $object->lines[$i]->situation_percent - $prev_progress) /100;
+		 	$result.=price($sign * ($total_ht/($object->lines[$i]->situation_percent/100)) * $progress, 0, $outputlangs);
+		}
+        	else
 			$result.=price($sign * $total_ht, 0, $outputlangs);
-        }
 	}
+    }
 	return $result;
 }
 

From 2e6d865c7d07b48254228cba07e082d42a53ed28 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 00:44:25 +0200
Subject: [PATCH 0655/1163] NEW Can define default values for create forms. NEW
 Can define default filters for list pages. NEW Can define default sort order
 for list pages.

---
 htdocs/admin/defaultvalues.php    | 95 +++++++++++++++++++++++++------
 htdocs/admin/dict.php             |  2 +-
 htdocs/core/db/DoliDB.class.php   | 17 ++++--
 htdocs/core/lib/functions.lib.php | 53 ++++++++++++-----
 htdocs/langs/en_US/admin.lang     |  4 +-
 htdocs/theme/eldy/style.css.php   |  2 +-
 6 files changed, 135 insertions(+), 38 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 96fef57e7cf..8a9bd4f209b 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -56,6 +56,10 @@ $defaultvalue = GETPOST('defaultvalue');
 
 $defaulturl=preg_replace('/^\//', '', $defaulturl);
 
+$urlpage = GETPOST('urlpage');
+$key = GETPOST('key');
+$value = GETPOST('value');
+
 
 /*
  * Actions
@@ -81,25 +85,51 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 }
 
 
-if ($action == 'add' || (GETPOST('add') && $action != 'update'))
+if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('actionmodify'))
 {
 	$error=0;
 
-	if (empty($defaulturl))
+	if (($action == 'add' || (GETPOST('add') && $action != 'update')))
 	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
-		$error++;
+    	if (empty($defaulturl))
+    	{
+    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
+    		$error++;
+    	}
+    	if (empty($defaultkey))
+    	{
+    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
+    		$error++;
+    	}
 	}
-	if (empty($defaultkey))
+	if (GETPOST('actionmodify'))
 	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Key")), null, 'errors');
-		$error++;
+	    if (empty($urlpage))
+	    {
+	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
+	        $error++;
+	    }
+	    if (empty($key))
+	    {
+	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
+	        $error++;
+	    }
 	}
+	
 	if (! $error)
 	{
 	    $db->begin();
-	     
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."default_values(type, user_id, page, param, value, entity) VALUES ('".$db->escape($mode)."', 0, '".$db->escape($defaulturl)."','".$db->escape($defaultkey)."','".$db->escape($defaultvalue)."', ".$db->escape($conf->entity).")";
+	    
+	    if ($action == 'add' || (GETPOST('add') && $action != 'update'))
+	    {
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."default_values(type, user_id, page, param, value, entity) VALUES ('".$db->escape($mode)."', 0, '".$db->escape($defaulturl)."','".$db->escape($defaultkey)."','".$db->escape($defaultvalue)."', ".$db->escape($conf->entity).")";
+	    }
+	    if (GETPOST('actionmodify'))
+	    {
+		    $sql = "UPDATE ".MAIN_DB_PREFIX."default_values SET page = '".$db->escape($urlpage)."', param = '".$db->escape($key)."', value = '".$db->escape($value)."'";
+		    $sql.= " WHERE rowid = ".$id;
+	    }
+		
 		$result = $db->query($sql);
 		if ($result > 0)
 		{
@@ -176,6 +206,10 @@ $head=defaultvalues_prepare_head();
     
 dol_fiche_head($head, $mode, '', -1, '');
 
+if ($mode == 'sortorder')
+{
+    print info_admin($langs->trans("WarningSettingSortOrder")).'<br>';
+}
 
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" id="action" name="action" value="">';
@@ -189,8 +223,15 @@ else $texthelp.=$langs->trans("PageUrlForDefaultValuesList", 'societe/list.php')
 $texturl=$form->textwithpicto($langs->trans("Url"), $texthelp);
 print_liste_field_titre($texturl,$_SERVER["PHP_SELF"],'page,param','',$param,'',$sortfield,$sortorder);
 $texthelp=$langs->trans("TheKeyIsTheNameOfHtmlField");
-if ($mode != 'sortorder') $textkey=$form->textwithpicto($langs->trans("Key"), $texthelp);
-else $textkey=$form->textwithpicto($langs->trans("Key"), $texthelp);
+if ($mode != 'sortorder') 
+{
+    $textkey=$form->textwithpicto($langs->trans("Field"), $texthelp);
+}
+else 
+{
+    $texthelp='field or alias.field';
+    $textkey=$form->textwithpicto($langs->trans("Field"), $texthelp);
+}
 print_liste_field_titre($textkey,$_SERVER["PHP_SELF"],'param','',$param,'',$sortfield,$sortorder);
 if ($mode != 'sortorder')
 {
@@ -270,9 +311,17 @@ if ($result)
 
 		print '<tr class="oddeven">';
 		
-		print '<td>'.$obj->page.'</td>'."\n";
-   	    print '<td>'.$obj->param.'</td>'."\n";
-        
+		print '<td>';
+		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->page;
+		else print '<input type="text" name="urlpage" value="'.dol_escape_htmltag($obj->page).'">';
+		print '</td>'."\n";
+   	    
+		// Key
+		print '<td>';
+		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->param;
+		else print '<input type="text" name="key" value="'.dol_escape_htmltag($obj->param).'">';
+		print '</td>'."\n";
+
 		// Value
 		print '<td>';
 		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
@@ -280,11 +329,25 @@ if ($result)
 		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
 		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
 		*/
-		print $obj->value;
+		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->value;
+		else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
 		print '</td>';
 
 		print '<td align="center">';
-		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_delete().'</a>';
+		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid)
+		{
+    		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=edit'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_edit().'</a>';
+    		print ' &nbsp; ';
+    		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_delete().'</a>';
+		}
+		else
+		{
+		    print '<input type="hidden" name="page" value="'.$page.'">';
+		    print '<input type="hidden" name="rowid" value="'.$id.'">';
+		    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:'none').'"></div>';
+		    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+		    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+		}
 		print '</td>';
 		
 		print "</tr>\n";
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index c8632f57772..125f913eb8d 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1306,10 +1306,10 @@ if ($id)
                     if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
 
                     print '<td colspan="3" align="center">';
+                    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
                     print '<input type="hidden" name="page" value="'.$page.'">';
                     print '<input type="hidden" name="rowid" value="'.$rowid.'">';
                     print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
                     print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                     print '</td>';
                 }
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index c63227e1601..9fc1739334c 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -220,9 +220,9 @@ abstract class DoliDB implements Database
 	/**
 	 * Define sort criteria of request
 	 *
-	 * @param	string	$sortfield  List of sort fields, separated by comma. Example: 't1.fielda, t2.fieldb'
+	 * @param	string	        $sortfield  List of sort fields, separated by comma. Example: 't1.fielda, t2.fieldb'
 	 * @param	'ASC'|'DESC'	$sortorder  Sort order
-	 * @return	string      		String to provide syntax of a sort sql string
+	 * @return	string      		        String to provide syntax of a sort sql string
 	 */
 	function order($sortfield=null,$sortorder=null)
 	{
@@ -230,18 +230,25 @@ abstract class DoliDB implements Database
 		{
 			$return='';
 			$fields=explode(',',$sortfield);
+			$orders=explode(',',$sortorder);
+			$i=0;
 			foreach($fields as $val)
 			{
 				if (! $return) $return.=' ORDER BY ';
-				else $return.=',';
+				else $return.=', ';
 
 				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
+				
+				$tmpsortorder = trim($orders[$i]);
+				
 				// Only ASC and DESC values are valid SQL
-				if (strtoupper($sortorder) === 'ASC') {
+				if (strtoupper($tmpsortorder) === 'ASC') {
 					$return .= ' ASC';
-				} elseif (strtoupper($sortorder) === 'DESC') {
+				} elseif (strtoupper($tmpsortorder) === 'DESC') {
 					$return .= ' DESC';
 				}
+				
+				$i++;
 			}
 			return $return;
 		}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7743da27c2d..0d54593f0db 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -246,16 +246,16 @@ function dol_shutdown()
  *  @param  mixed   $options     Options to pass to filter_var when $check is set to custom
  *  @return string|string[]      Value found (string or array), or '' if check fails
  */
-function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
+function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 {
 	if (empty($method))
 	{
 		$out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
-		
+
 		// Management of default values
-		if (! isset($_GET['sortfield']))	// If we did a click on a field so sort, we do no appl default values
+		if (! isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values
 		{
-			if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+		    if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 			{
 				$relativepathstring = $_SERVER["PHP_SELF"];
 				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
@@ -268,18 +268,40 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 					if (isset($user->default_values[$relativepathstring]['createform'][$paramname])) $out = $user->default_values[$relativepathstring]['createform'][$paramname];
 				}
 			}
-			// Management of default search_filters
+			// Management of default search_filters and sort order
 			elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 			{
-				$relativepathstring = $_SERVER["PHP_SELF"];
+			    $relativepathstring = $_SERVER["PHP_SELF"];
 				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
 				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 				global $user;
 				if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first 
 				{
-					//var_dump($user->default_values[$relativepathstring]);
-					if (isset($user->default_values[$relativepathstring]['filters'][$paramname])) $out = $user->default_values[$relativepathstring]['filters'][$paramname];
+				    //var_dump($user->default_values[$relativepathstring]);
+        			if ($paramname == 'sortfield')
+        			{
+        			    if (isset($user->default_values[$relativepathstring]['sortorder'])) 
+        			    {
+        			        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
+        			        {
+        			            if ($out) $out.=', ';
+        			            $out.=$key;
+        			        }
+        			    }
+        			}
+        			elseif ($paramname == 'sortorder')
+        			{
+        			    if (isset($user->default_values[$relativepathstring]['sortorder'])) 
+        			    {
+        			        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
+        			        {
+        			            if ($out) $out.=', ';
+        			            $out.=$val;
+        			        }
+        			    }
+        			}
+				    elseif (isset($user->default_values[$relativepathstring]['filters'][$paramname])) $out = $user->default_values[$relativepathstring]['filters'][$paramname];
 				}
 			}
 		}
@@ -3178,6 +3200,9 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 	$tag='th';
 	if ($thead==2) $tag='div';
 
+	$tmpsortfield=explode(',',$sortfield);
+	$sortfield=trim($tmpsortfield[0]);
+	
 	// If field is used as sort criteria we use a specific class
 	// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
 	if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field))) $out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
@@ -3192,13 +3217,13 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 
 		if ($field != $sortfield)
 		{
-            if ($sortorder == 'DESC') $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
-            if ($sortorder == 'ASC' || ! $sortorder) $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
+            if (preg_match('/^DESC/', $sortorder)) $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
+            else $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
 		}
 		else
 		{
-            if ($sortorder == 'DESC' || ! $sortorder) $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
-            if ($sortorder == 'ASC') $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
+            if (preg_match('/^ASC/', $sortorder)) $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
+		    else $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
 		}
 	}
 
@@ -3227,12 +3252,12 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 		}
 		else
 		{
-			if ($sortorder == 'DESC' ) {
+			if (preg_match('/^DESC/', $sortorder)) {
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>';
 				$sortimg.= '<span class="nowrap">'.img_up("Z-A",0).'</span>';
 			}
-			if ($sortorder == 'ASC' ) {
+			if (preg_match('/^ASC/', $sortorder)) {
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",1).'</a>';
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
 				$sortimg.= '<span class="nowrap">'.img_down("A-Z",0).'</span>';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1bfa5c0230c..69c72fc7aad 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -427,11 +427,13 @@ WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to
 ClickToShowDescription=Click to show description
 DependsOn=This module need the module(s)
 RequiredBy=This module is required by module(s)
-TheKeyIsTheNameOfHtmlField=The key is the name of the html field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
 PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order to retreive default behavior. 
+Field=Field
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f0e615f29ce..4d711599992 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -253,7 +253,7 @@ a.tab { font-weight: bold !important; }
 a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: normal; color: rgb(<?php print $colortextlink; ?>); text-decoration: none;  }
 a:hover { text-decoration: underline; color: rgb(<?php print $colortextlink; ?>); }
 a.commonlink { color: rgb(<?php print $colortextlink; ?>) !important; text-decoration: none; }
-
+th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decoration: underline; }
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
     background-color: #FFF;
 }

From 47089a4d550517aef1a166848151f9996cac641e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 29 Apr 2017 07:04:34 +0200
Subject: [PATCH 0656/1163] Modle Stripe : Work in progress

---
 htdocs/core/lib/stripe.lib.php          | 147 ----
 htdocs/{ => public}/stripe/checkout.php |  31 +-
 htdocs/{ => public}/stripe/config.php   |   6 +-
 htdocs/public/stripe/newpayment.php     | 977 ------------------------
 htdocs/public/stripe/paymentko.php      | 115 ---
 htdocs/public/stripe/paymentok.php      | 172 -----
 htdocs/stripe/admin/stripe.php          |  22 +-
 7 files changed, 27 insertions(+), 1443 deletions(-)
 rename htdocs/{ => public}/stripe/checkout.php (94%)
 rename htdocs/{ => public}/stripe/config.php (88%)
 delete mode 100644 htdocs/public/stripe/newpayment.php
 delete mode 100644 htdocs/public/stripe/paymentko.php
 delete mode 100644 htdocs/public/stripe/paymentok.php

diff --git a/htdocs/core/lib/stripe.lib.php b/htdocs/core/lib/stripe.lib.php
index d2d138cc8b3..175df3554ce 100644
--- a/htdocs/core/lib/stripe.lib.php
+++ b/htdocs/core/lib/stripe.lib.php
@@ -229,153 +229,6 @@ function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
 }
 
 
-/**
- * Create a redirect form to paybox form
- *
- * @param	int   	$PRICE		Price
- * @param   string	$CURRENCY	Currency
- * @param   string	$EMAIL		EMail
- * @param   string	$urlok		Url to go back if payment is OK
- * @param   string	$urlko		Url to go back if payment is KO
- * @param   string	$TAG		Tag
- * @return  int              	1 if OK, -1 if ERROR
- */
-function print_stripe_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
-{
-	global $conf, $langs, $db;
-
-	dol_syslog("Stripe.lib::print_paybox_redirect", LOG_DEBUG);
-
-	// Clean parameters
-	$PBX_IDENTIFIANT="2";	// Identifiant pour v2 test
-	if (! empty($conf->global->PAYBOX_PBX_IDENTIFIANT)) $PBX_IDENTIFIANT=$conf->global->PAYBOX_PBX_IDENTIFIANT;
-	$IBS_SITE="1999888";    // Site test
-	if (! empty($conf->global->PAYBOX_IBS_SITE)) $IBS_SITE=$conf->global->PAYBOX_IBS_SITE;
-	$IBS_RANG="99";         // Rang test
-	if (! empty($conf->global->PAYBOX_IBS_RANG)) $IBS_RANG=$conf->global->PAYBOX_IBS_RANG;
-	$IBS_DEVISE="840";		// Currency (Dollar US by default)
-	if ($CURRENCY == 'EUR') $IBS_DEVISE="978";
-	if ($CURRENCY == 'USD') $IBS_DEVISE="840";
-
-	$URLPAYBOX="";
-	if ($conf->global->PAYBOX_CGI_URL_V1) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL_V1;
-	if ($conf->global->PAYBOX_CGI_URL_V2) $URLPAYBOX=$conf->global->PAYBOX_CGI_URL_V2;
-
-	if (empty($IBS_DEVISE))
-	{
-		dol_print_error('',"Paybox setup param PAYBOX_IBS_DEVISE not defined");
-		return -1;
-	}
-	if (empty($URLPAYBOX))
-	{
-		dol_print_error('',"Paybox setup param PAYBOX_CGI_URL_V1 and PAYBOX_CGI_URL_V2 undefined");
-		return -1;
-	}
-	if (empty($IBS_SITE))
-	{
-		dol_print_error('',"Paybox setup param PAYBOX_IBS_SITE not defined");
-		return -1;
-	}
-	if (empty($IBS_RANG))
-	{
-		dol_print_error('',"Paybox setup param PAYBOX_IBS_RANG not defined");
-		return -1;
-	}
-
-	// Definition des parametres vente produit pour paybox
-    $IBS_CMD=$TAG;
-    $IBS_TOTAL=$PRICE*100;     	// En centimes
-    $IBS_MODE=1;            	// Mode formulaire
-    $IBS_PORTEUR=$EMAIL;
-	$IBS_RETOUR="montant:M;ref:R;auto:A;trans:T";   // Format des parametres du get de validation en reponse (url a definir sous paybox)
-    $IBS_TXT=' ';	// Use a space
-    $IBS_BOUTPI=$langs->trans("Wait");
-    //$IBS_BOUTPI='';
-    $IBS_EFFECTUE=$urlok;
-    $IBS_ANNULE=$urlko;
-    $IBS_REFUSE=$urlko;
-    $IBS_BKGD="#FFFFFF";
-    $IBS_WAIT="2000";
-	$IBS_LANG="GBR"; 	// By default GBR=english (FRA, GBR, ESP, ITA et DEU...)
-	if (preg_match('/^FR/i',$langs->defaultlang)) $IBS_LANG="FRA";
-	if (preg_match('/^ES/i',$langs->defaultlang)) $IBS_LANG="ESP";
-	if (preg_match('/^IT/i',$langs->defaultlang)) $IBS_LANG="ITA";
-	if (preg_match('/^DE/i',$langs->defaultlang)) $IBS_LANG="DEU";
-	if (preg_match('/^NL/i',$langs->defaultlang)) $IBS_LANG="NLD";
-	if (preg_match('/^SE/i',$langs->defaultlang)) $IBS_LANG="SWE";
-	$IBS_OUTPUT='E';
-	$PBX_SOURCE='HTML';
-	$PBX_TYPEPAIEMENT='CARTE';
-
-    dol_syslog("Soumission Paybox", LOG_DEBUG);
-    dol_syslog("IBS_MODE: $IBS_MODE", LOG_DEBUG);
-    dol_syslog("IBS_SITE: $IBS_SITE", LOG_DEBUG);
-    dol_syslog("IBS_RANG: $IBS_RANG", LOG_DEBUG);
-    dol_syslog("IBS_TOTAL: $IBS_TOTAL", LOG_DEBUG);
-    dol_syslog("IBS_DEVISE: $IBS_DEVISE", LOG_DEBUG);
-    dol_syslog("IBS_CMD: $IBS_CMD", LOG_DEBUG);
-    dol_syslog("IBS_PORTEUR: $IBS_PORTEUR", LOG_DEBUG);
-    dol_syslog("IBS_RETOUR: $IBS_RETOUR", LOG_DEBUG);
-    dol_syslog("IBS_EFFECTUE: $IBS_EFFECTUE", LOG_DEBUG);
-    dol_syslog("IBS_ANNULE: $IBS_ANNULE", LOG_DEBUG);
-    dol_syslog("IBS_REFUSE: $IBS_REFUSE", LOG_DEBUG);
-    dol_syslog("IBS_BKGD: $IBS_BKGD", LOG_DEBUG);
-    dol_syslog("IBS_WAIT: $IBS_WAIT", LOG_DEBUG);
-    dol_syslog("IBS_LANG: $IBS_LANG", LOG_DEBUG);
-    dol_syslog("IBS_OUTPUT: $IBS_OUTPUT", LOG_DEBUG);
-    dol_syslog("PBX_IDENTIFIANT: $PBX_IDENTIFIANT", LOG_DEBUG);
-    dol_syslog("PBX_SOURCE: $PBX_SOURCE", LOG_DEBUG);
-    dol_syslog("PBX_TYPEPAIEMENT: $PBX_TYPEPAIEMENT", LOG_DEBUG);
-
-    header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
-    print '<html>'."\n";
-    print '<head>'."\n";
-    print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=".$conf->file->character_set_client."\">\n";
-    print '</head>'."\n";
-    print '<body>'."\n";
-    print "\n";
-
-    // Formulaire pour module Paybox
-    print '<form action="'.$URLPAYBOX.'" NAME="Submit" method="POST">'."\n";
-
-    // For Paybox V2 (PBX_xxx)
-    print '<!-- Param for Paybox v2 -->'."\n";
-    print '<input type="hidden" name="PBX_IDENTIFIANT" value="'.$PBX_IDENTIFIANT.'">'."\n";
-    print '<input type="hidden" name="PBX_MODE" value="'.$IBS_MODE.'">'."\n";
-    print '<input type="hidden" name="PBX_SITE" value="'.$IBS_SITE.'">'."\n";
-    print '<input type="hidden" name="PBX_RANG" value="'.$IBS_RANG.'">'."\n";
-    print '<input type="hidden" name="PBX_TOTAL" value="'.$IBS_TOTAL.'">'."\n";
-    print '<input type="hidden" name="PBX_DEVISE" value="'.$IBS_DEVISE.'">'."\n";
-    print '<input type="hidden" name="PBX_CMD" value="'.$IBS_CMD.'">'."\n";
-    print '<input type="hidden" name="PBX_PORTEUR" value="'.$IBS_PORTEUR.'">'."\n";
-    print '<input type="hidden" name="PBX_RETOUR" value="'.$IBS_RETOUR.'">'."\n";
-    print '<input type="hidden" name="PBX_EFFECTUE" value="'.$IBS_EFFECTUE.'">'."\n";
-    print '<input type="hidden" name="PBX_ANNULE" value="'.$IBS_ANNULE.'">'."\n";
-    print '<input type="hidden" name="PBX_REFUSE" value="'.$IBS_REFUSE.'">'."\n";
-    print '<input type="hidden" name="PBX_TXT" value="'.$IBS_TXT.'">'."\n";
-    print '<input type="hidden" name="PBX_BKGD" value="'.$IBS_BKGD.'">'."\n";
-    print '<input type="hidden" name="PBX_WAIT" value="'.$IBS_WAIT.'">'."\n";
-    print '<input type="hidden" name="PBX_LANGUE" value="'.$IBS_LANG.'">'."\n";
-    print '<input type="hidden" name="PBX_OUTPUT" value="'.$IBS_OUTPUT.'">'."\n";
-    print '<input type="hidden" name="PBX_SOURCE" value="'.$PBX_SOURCE.'">'."\n";
-    print '<input type="hidden" name="PBX_TYPEPAIEMENT" value="'.$PBX_TYPEPAIEMENT.'">'."\n";
-
-    print '</form>'."\n";
-
-
-    print "\n";
-    print '<script type="text/javascript" language="javascript">'."\n";
-    print '	document.Submit.submit();'."\n";
-    print '</script>'."\n";
-    print "\n";
-    print '</body></html>'."\n";
-    print "\n";
-
-	return;
-}
-
-
 /**
  * Show footer of company in HTML pages
  *
diff --git a/htdocs/stripe/checkout.php b/htdocs/public/stripe/checkout.php
similarity index 94%
rename from htdocs/stripe/checkout.php
rename to htdocs/public/stripe/checkout.php
index f7f547afae9..4bea80bce6c 100644
--- a/htdocs/stripe/checkout.php
+++ b/htdocs/public/stripe/checkout.php
@@ -16,15 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-require '../main.inc.php';
- 
-// Load Dolibarr environment
-require_once DOL_DOCUMENT_ROOT.'/stripe/config.php');
-require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php');
-
 define("NOLOGIN",1);
 define("NOCSRFCHECK",1);
 
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/public/stripe/config.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
+
+// Security check
+if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
+
 $langs->load("main");
 $langs->load("other");
 $langs->load("stripe");
@@ -34,19 +36,6 @@ $ref=GETPOST('ref','alpha');
 
 $form = new Form($db);
 
-/**
- * Header empty
- *
- * @return	void
- */
-function llxHeader() {}
-/**
- * Footer empty
- *
- * @return	void
- */
-function llxFooter() {}
-
 $invoice = null;
 
 // Payment on customer invoice
@@ -68,8 +57,6 @@ if ($source == 'invoice')
 	{
 		$result=$invoice->fetch_thirdparty($invoice->socid);
 	}
-
-
 }
 
 $pay = false;
@@ -225,7 +212,7 @@ if (GETPOST("action") == 'charge')
 		<?php //var_dump($mysoc); ?>
 		
 		<span class="center">
-			<?php html_print_paypal_footer($mysoc,$langs); ?>
+			<?php html_print_stripe_footer($mysoc,$langs); ?>
 		</span>
 		
 		<?php //echo var_dump($mysoc); ?>
diff --git a/htdocs/stripe/config.php b/htdocs/public/stripe/config.php
similarity index 88%
rename from htdocs/stripe/config.php
rename to htdocs/public/stripe/config.php
index 78d394feb53..ac315762b29 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/public/stripe/config.php
@@ -22,11 +22,11 @@
 *  \brief      Page to move config in api
 */
 
-require '../main.inc.php';
+require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-dol_include_once('/stripe/lib/stripe.lib.php');
-require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
 
 //use \includes\stripe as stripe;
 $stripe = array(
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
deleted file mode 100644
index 33499fe7098..00000000000
--- a/htdocs/public/stripe/newpayment.php
+++ /dev/null
@@ -1,977 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For test: https://stripe.com/docs
- */
-
-/**
- *     	\file       htdocs/public/stripe/newpayment.php
- *		\ingroup    stripe
- *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
- */
-
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
-// require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripefunctions.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-// Security check
-if (empty($conf->stripe->enabled)) accessforbidden('',0,0,1);
-
-$langs->load("main");
-$langs->load("other");
-$langs->load("dict");
-$langs->load("bills");
-$langs->load("companies");
-$langs->load("errors");
-$langs->load("paybox");
-$langs->load("paypal");
-$langs->load("stripe");
-
-// Input are:
-// type ('invoice','order','contractline'),
-// id (object id),
-// amount (required if id is empty),
-// tag (a free text, required if type is empty)
-// currency (iso code)
-
-$suffix=GETPOST("suffix",'alpha');
-$amount=price2num(GETPOST("amount"));
-if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
-else $currency=GETPOST("currency",'alpha');
-
-if (! GETPOST("action"))
-{
-    if (! GETPOST("amount") && ! GETPOST("source"))
-    {
-    	dol_print_error('',$langs->trans('ErrorBadParameters')." - amount or source");
-    	exit;
-    }
-    if (is_numeric($amount) && ! GETPOST("tag") && ! GETPOST("source"))
-    {
-    	dol_print_error('',$langs->trans('ErrorBadParameters')." - tag or source");
-    	exit;
-    }
-    if (GETPOST("source") && ! GETPOST("ref"))
-    {
-    	dol_print_error('',$langs->trans('ErrorBadParameters')." - ref");
-    	exit;
-    }
-}
-
-// Define $urlwithroot
-//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
-
-$urlok=$urlwithroot.'/public/stripe/paymentok.php?';
-$urlko=$urlwithroot.'/public/stripe/paymentko.php?';
-
-// Complete urls for post treatment
-$SOURCE=GETPOST("source",'alpha');
-$ref=$REF=GETPOST('ref','alpha');
-$TAG=GETPOST("tag",'alpha');
-$FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
-$SECUREKEY=GETPOST("securekey");	        // Secure key
-
-if (! empty($SOURCE))
-{
-    $urlok.='source='.urlencode($SOURCE).'&';
-    $urlko.='source='.urlencode($SOURCE).'&';
-}
-if (! empty($REF))
-{
-    $urlok.='ref='.urlencode($REF).'&';
-    $urlko.='ref='.urlencode($REF).'&';
-}
-if (! empty($TAG))
-{
-    $urlok.='tag='.urlencode($TAG).'&';
-    $urlko.='tag='.urlencode($TAG).'&';
-}
-if (! empty($FULLTAG))
-{
-    $urlok.='fulltag='.urlencode($FULLTAG).'&';
-    $urlko.='fulltag='.urlencode($FULLTAG).'&';
-}
-if (! empty($SECUREKEY))
-{
-    $urlok.='securekey='.urlencode($SECUREKEY).'&';
-    $urlko.='securekey='.urlencode($SECUREKEY).'&';
-}
-if (! empty($entity))
-{
-	$urlok.='entity='.urlencode($entity).'&';
-	$urlko.='entity='.urlencode($entity).'&';
-}
-$urlok=preg_replace('/&$/','',$urlok);  // Remove last &
-$urlko=preg_replace('/&$/','',$urlko);  // Remove last &
-
-// Check parameters
-$PAYPAL_API_OK="";
-if ($urlok) $PAYPAL_API_OK=$urlok;
-$PAYPAL_API_KO="";
-if ($urlko) $PAYPAL_API_KO=$urlko;
-/*
-if (empty($PAYPAL_API_USER))
-{
-    dol_print_error('',"Paypal setup param PAYPAL_API_USER not defined");
-    return -1;
-}
-if (empty($PAYPAL_API_PASSWORD))
-{
-    dol_print_error('',"Paypal setup param PAYPAL_API_PASSWORD not defined");
-    return -1;
-}
-if (empty($PAYPAL_API_SIGNATURE))
-{
-    dol_print_error('',"Paypal setup param PAYPAL_API_SIGNATURE not defined");
-    return -1;
-}
-*/
-
-// Check security token
-$valid=true;
-if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-{
-    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
-    {
-	    if ($SOURCE && $REF) $token = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $SOURCE . $REF, 2);    // Use the source in the hash to avoid duplicates if the references are identical
-	    else $token = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-    }
-    else
-    {
-        $token = $conf->global->PAYPAL_SECURITY_TOKEN;
-    }
-	if ($SECUREKEY != $token) $valid=false;
-
-	if (! $valid)
-	{
-    	print '<div class="error">Bad value for key.</div>';
-	    //print 'SECUREKEY='.$SECUREKEY.' token='.$token.' valid='.$valid;
-    	exit;
-	}
-}
-
-
-
-/*
- * Actions
- */
-
-if (GETPOST("action") == 'dopayment')
-{
-	$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
-    $PAYPAL_PAYMENT_TYPE='Sale';
-
-    $shipToName=GETPOST("shipToName");
-    $shipToStreet=GETPOST("shipToStreet");
-    $shipToCity=GETPOST("shipToCity");
-    $shipToState=GETPOST("shipToState");
-    $shipToCountryCode=GETPOST("shipToCountryCode");
-    $shipToZip=GETPOST("shipToZip");
-    $shipToStreet2=GETPOST("shipToStreet2");
-    $phoneNum=GETPOST("phoneNum");
-    $email=GETPOST("email");
-    $desc=GETPOST("desc");
-
-	$mesg='';
-	if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))   $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
-	//elseif (empty($EMAIL))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
-	//elseif (! isValidEMail($EMAIL)) $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
-	elseif (empty($FULLTAG))        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
-
-    //var_dump($_POST);
-	if (empty($mesg))
-	{
-		dol_syslog("newpayment.php call paypal api and do redirect", LOG_DEBUG);
-
-		// Other
-		$PAYPAL_API_DEVISE="USD";
-		//if ($currency == 'EUR') $PAYPAL_API_DEVISE="EUR";
-		//if ($currency == 'USD') $PAYPAL_API_DEVISE="USD";
-        if (! empty($currency)) $PAYPAL_API_DEVISE=$currency;
-
-	    dol_syslog("Submit Paypal form", LOG_DEBUG);
-	    dol_syslog("PAYPAL_API_USER: $PAYPAL_API_USER", LOG_DEBUG);
-	    //dol_syslog("PAYPAL_API_PASSWORD: $PAYPAL_API_PASSWORD", LOG_DEBUG);  // No password into log files
-	    dol_syslog("PAYPAL_API_SIGNATURE: $PAYPAL_API_SIGNATURE", LOG_DEBUG);
-	    dol_syslog("PAYPAL_API_SANDBOX: $PAYPAL_API_SANDBOX", LOG_DEBUG);
-	    dol_syslog("PAYPAL_API_OK: $PAYPAL_API_OK", LOG_DEBUG);
-	    dol_syslog("PAYPAL_API_KO: $PAYPAL_API_KO", LOG_DEBUG);
-	    dol_syslog("PAYPAL_API_PRICE: $PAYPAL_API_PRICE", LOG_DEBUG);
-	    dol_syslog("PAYPAL_API_DEVISE: $PAYPAL_API_DEVISE", LOG_DEBUG);
-        dol_syslog("shipToName: $shipToName", LOG_DEBUG);
-        dol_syslog("shipToStreet: $shipToStreet", LOG_DEBUG);
-        dol_syslog("shipToCity: $shipToCity", LOG_DEBUG);
-        dol_syslog("shipToState: $shipToState", LOG_DEBUG);
-        dol_syslog("shipToCountryCode: $shipToCountryCode", LOG_DEBUG);
-        dol_syslog("shipToZip: $shipToZip", LOG_DEBUG);
-        dol_syslog("shipToStreet2: $shipToStreet2", LOG_DEBUG);
-        dol_syslog("phoneNum: $phoneNum", LOG_DEBUG);
-        dol_syslog("email: $email", LOG_DEBUG);
-        dol_syslog("desc: $desc", LOG_DEBUG);
-
-        dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG);	// If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO
-	    //$_SESSION["PaymentType"]=$PAYPAL_PAYMENT_TYPE;
-	    //$_SESSION["currencyCodeType"]=$PAYPAL_API_DEVISE;
-	    //$_SESSION["Payment_Amount"]=$PAYPAL_API_PRICE;
-
-	    // A redirect is added if API call successfull
-        print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
-
-		exit;
-	}
-}
-
-
-
-/*
- * View
- */
-
-llxHeaderStripe($langs->trans("PaymentForm"));
-
-if (! empty($PAYPAL_API_SANDBOX))
-{
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
-}
-
-// Common variables
-$creditor=$mysoc->name;
-$paramcreditor='PAYPAL_CREDITOR_'.$suffix;
-if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
-else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR;
-
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div class="center">'."\n";
-print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
-print '<input type="hidden" name="action" value="dopayment">'."\n";
-print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
-print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
-print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
-print '<input type="hidden" name="entity" value="'.$entity.'" />';
-print "\n";
-print '<!-- Form to send a Paypal payment -->'."\n";
-print '<!-- PAYPAL_API_SANDBOX = '.$conf->global->PAYPAL_API_SANDBOX.' -->'."\n";
-print '<!-- PAYPAL_API_INTEGRAL_OR_PAYPALONLY = '.$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY.' -->'."\n";
-print '<!-- creditor = '.$creditor.' -->'."\n";
-print '<!-- urlok = '.$urlok.' -->'."\n";
-print '<!-- urlko = '.$urlko.' -->'."\n";
-print "\n";
-
-print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
-
-// Show logo (search order: logo defined by PAYBOX_LOGO_suffix, then PAYBOX_LOGO, then small company logo, large company logo, theme logo, common logo)
-$width=0;
-// Define logo and logosmall
-$logosmall=$mysoc->logo_small;
-$logo=$mysoc->logo;
-$paramlogo='PAYBOX_LOGO_'.$suffix;
-if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
-else if (! empty($conf->global->PAYBOX_LOGO)) $logosmall=$conf->global->PAYBOX_LOGO;
-//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
-// Define urllogo
-$urllogo='';
-if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
-{
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('thumbs/'.$logosmall);
-}
-elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
-{
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode($logo);
-	$width=96;
-}
-// Output html code for logo
-if ($urllogo)
-{
-	print '<tr>';
-	print '<td align="center"><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
-	if ($width) print ' width="'.$width.'"';
-	print '></td>';
-	print '</tr>'."\n";
-}
-
-// Output introduction text
-$text='';
-if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
-{
-    $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
-    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
-}
-if (empty($text))
-{
-    $text.='<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnPaymentPage").'</strong><br></td></tr>'."\n";
-    $text.='<tr><td class="textpublicpayment"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
-}
-print $text;
-
-// Output payment summary form
-print '<tr><td align="center">';
-print '<table with="100%" id="tablepublicpayment">';
-print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
-
-$found=false;
-$error=0;
-$var=false;
-
-// Free payment
-if (! GETPOST("source") && $valid)
-{
-	$found=true;
-	$tag=GETPOST("tag");
-	$fulltag=$tag;
-
-	// Creditor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-    print '</td></tr>'."\n";
-
-	// Amount
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
-	{
-        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
-	}
-	else {
-		print '<b>'.price($amount).'</b>';
-        print '<input type="hidden" name="amount" value="'.$amount.'">';
-		print '<input type="hidden" name="newamount" value="'.$amount.'">';
-	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
-	print '<input type="hidden" name="currency" value="'.$currency.'">';
-	print '</td></tr>'."\n";
-
-	// Tag
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
-	print '<input type="hidden" name="tag" value="'.$tag.'">';
-	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
-	print '</td></tr>'."\n";
-
-    // We do not add fields shipToName, shipToStreet, shipToCity, shipToState, shipToCountryCode, shipToZip, shipToStreet2, phoneNum
-    // as they don't exists (buyer is unknown, tag is free).
-}
-
-
-// Payment on customer order
-if (GETPOST("source") == 'order' && $valid)
-{
-	$found=true;
-	$langs->load("orders");
-
-	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-
-	$order=new Commande($db);
-	$result=$order->fetch('',$ref);
-	if ($result < 0)
-	{
-		$mesg=$order->error;
-		$error++;
-	}
-	else
-	{
-		$result=$order->fetch_thirdparty($order->socid);
-	}
-
-	$amount=$order->total_ttc;
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
-	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
-	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
-	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
-	$fulltag=dol_string_unaccent($fulltag);
-
-	// Creditor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-    print '</td></tr>'."\n";
-
-	// Debitor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
-
-	// Object
-	$var=!$var;
-	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
-	print '<input type="hidden" name="ref" value="'.$order->ref.'">';
-	print '</td></tr>'."\n";
-
-	// Amount
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
-	{
-        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
-	}
-	else {
-		print '<b>'.price($amount).'</b>';
-        print '<input type="hidden" name="amount" value="'.$amount.'">';
-		print '<input type="hidden" name="newamount" value="'.$amount.'">';
-	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
-	print '<input type="hidden" name="currency" value="'.$currency.'">';
-	print '</td></tr>'."\n";
-
-	// Tag
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
-	print '<input type="hidden" name="tag" value="'.$tag.'">';
-	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
-	print '</td></tr>'."\n";
-
-	// Shipping address
-	$shipToName=$order->thirdparty->name;
-    $shipToStreet=$order->thirdparty->address;
-    $shipToCity=$order->thirdparty->town;
-    $shipToState=$order->thirdparty->state_code;
-    $shipToCountryCode=$order->thirdparty->country_code;
-    $shipToZip=$order->thirdparty->zip;
-    $shipToStreet2='';
-    $phoneNum=$order->thirdparty->phone;
-    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
-    {
-        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
-        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
-        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
-        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
-        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
-        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
-        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
-        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-    }
-    else
-    {
-        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
-    }
-    print '<input type="hidden" name="email" value="'.$order->thirdparty->email.'">'."\n";
-    print '<input type="hidden" name="desc" value="'.$langs->trans("Order").' '.$order->ref.'">'."\n";
-}
-
-
-// Payment on customer invoice
-if (GETPOST("source") == 'invoice' && $valid)
-{
-	$found=true;
-	$langs->load("bills");
-
-	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-
-	$invoice=new Facture($db);
-	$result=$invoice->fetch('',$ref);
-	if ($result < 0)
-	{
-		$mesg=$invoice->error;
-		$error++;
-	}
-	else
-	{
-		$result=$invoice->fetch_thirdparty($invoice->socid);
-	}
-
-	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
-	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
-	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
-	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
-	$fulltag=dol_string_unaccent($fulltag);
-
-	// Creditor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-    print '</td></tr>'."\n";
-
-	// Debitor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
-
-	// Object
-	$var=!$var;
-	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
-	print '<input type="hidden" name="ref" value="'.$invoice->ref.'">';
-	print '</td></tr>'."\n";
-
-	// Amount
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
-	{
-        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
-	}
-	else {
-		print '<b>'.price($amount).'</b>';
-        print '<input type="hidden" name="amount" value="'.$amount.'">';
-		print '<input type="hidden" name="newamount" value="'.$amount.'">';
-	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
-	print '<input type="hidden" name="currency" value="'.$currency.'">';
-	print '</td></tr>'."\n";
-
-	// Tag
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
-	print '<input type="hidden" name="tag" value="'.$tag.'">';
-	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
-	print '</td></tr>'."\n";
-
-    // Shipping address
-    $shipToName=$invoice->thirdparty->name;
-    $shipToStreet=$invoice->thirdparty->address;
-    $shipToCity=$invoice->thirdparty->town;
-    $shipToState=$invoice->thirdparty->state_code;
-    $shipToCountryCode=$invoice->thirdparty->country_code;
-    $shipToZip=$invoice->thirdparty->zip;
-    $shipToStreet2='';
-    $phoneNum=$invoice->thirdparty->phone;
-    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
-    {
-        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
-        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
-        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
-        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
-        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
-        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
-        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
-        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-    }
-    else
-    {
-        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
-    }
-    print '<input type="hidden" name="email" value="'.$invoice->thirdparty->email.'">'."\n";
-    print '<input type="hidden" name="desc" value="'.$langs->trans("Invoice").' '.$invoice->ref.'">'."\n";
-}
-
-// Payment on contract line
-if (GETPOST("source") == 'contractline' && $valid)
-{
-	$found=true;
-	$langs->load("contracts");
-
-	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-
-	$contractline=new ContratLigne($db);
-	$result=$contractline->fetch('',$ref);
-	if ($result < 0)
-	{
-		$mesg=$contractline->error;
-		$error++;
-	}
-	else
-	{
-		if ($contractline->fk_contrat > 0)
-		{
-			$contract=new Contrat($db);
-			$result=$contract->fetch($contractline->fk_contrat);
-			if ($result > 0)
-			{
-				$result=$contract->fetch_thirdparty($contract->socid);
-			}
-			else
-			{
-				$mesg=$contract->error;
-				$error++;
-			}
-		}
-		else
-		{
-			$mesg='ErrorRecordNotFound';
-			$error++;
-		}
-	}
-
-	$amount=$contractline->total_ttc;
-	if ($contractline->fk_product)
-	{
-		$product=new Product($db);
-		$result=$product->fetch($contractline->fk_product);
-
-		// We define price for product (TODO Put this in a method in product class)
-		if (! empty($conf->global->PRODUIT_MULTIPRICES))
-		{
-			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
-			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
-			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
-		}
-		else
-		{
-			$pu_ht = $product->price;
-			$pu_ttc = $product->price_ttc;
-			$price_base_type = $product->price_base_type;
-		}
-
-		$amount=$pu_ttc;
-		if (empty($amount))
-		{
-			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
-			exit;
-		}
-	}
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
-	$fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
-	//$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
-	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
-	$fulltag=dol_string_unaccent($fulltag);
-
-	$qty=1;
-	if (GETPOST('qty')) $qty=GETPOST('qty');
-
-	// Creditor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-	print '</td></tr>'."\n";
-
-	// Debitor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
-
-	// Object
-	$var=!$var;
-	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
-	if ($contractline->fk_product)
-	{
-		$text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
-	}
-	if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
-	//if ($contractline->date_fin_validite) {
-	//	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
-	//	$text.=dol_print_date($contractline->date_fin_validite);
-	//}
-	if ($contractline->date_fin_validite)
-	{
-		$text.='<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
-	}
-
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
-	print '<input type="hidden" name="ref" value="'.$contractline->ref.'">';
-	print '</td></tr>'."\n";
-
-	// Quantity
-	$var=!$var;
-	$label=$langs->trans("Quantity");
-	$qty=1;
-	$duration='';
-	if ($contractline->fk_product)
-	{
-		if ($product->isService() && $product->duration_value > 0)
-		{
-			$label=$langs->trans("Duration");
-
-			// TODO Put this in a global method
-			if ($product->duration_value > 1)
-			{
-				$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
-			}
-			else
-			{
-				$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
-			}
-			$duration=$product->duration_value.' '.$dur[$product->duration_unit];
-		}
-	}
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$label.'</td>';
-	print '<td class="CTableRow'.($var?'1':'2').'"><b>'.($duration?$duration:$qty).'</b>';
-	print '<input type="hidden" name="newqty" value="'.dol_escape_htmltag($qty).'">';
-	print '</b></td></tr>'."\n";
-
-	// Amount
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
-	{
-        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
-	}
-	else {
-		print '<b>'.price($amount).'</b>';
-        print '<input type="hidden" name="amount" value="'.$amount.'">';
-		print '<input type="hidden" name="newamount" value="'.$amount.'">';
-	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
-	print '<input type="hidden" name="currency" value="'.$currency.'">';
-	print '</td></tr>'."\n";
-
-	// Tag
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
-	print '<input type="hidden" name="tag" value="'.$tag.'">';
-	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
-	print '</td></tr>'."\n";
-
-    // Shipping address
-    $shipToName=$contract->thirdparty->name;
-    $shipToStreet=$contract->thirdparty->address;
-    $shipToCity=$contract->thirdparty->town;
-    $shipToState=$contract->thirdparty->state_code;
-    $shipToCountryCode=$contract->thirdparty->country_code;
-    $shipToZip=$contract->thirdparty->zip;
-    $shipToStreet2='';
-    $phoneNum=$contract->thirdparty->phone;
-    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
-    {
-        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
-        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
-        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
-        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
-        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
-        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
-        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
-        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-    }
-    else
-    {
-        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
-    }
-    print '<input type="hidden" name="email" value="'.$contract->thirdparty->email.'">'."\n";
-    print '<input type="hidden" name="desc" value="'.$langs->trans("Contract").' '.$contract->ref.'">'."\n";
-}
-
-// Payment on member subscription
-if (GETPOST("source") == 'membersubscription' && $valid)
-{
-	$found=true;
-	$langs->load("members");
-
-	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
-
-	$member=new Adherent($db);
-	$result=$member->fetch('',$ref);
-	if ($result < 0)
-	{
-		$mesg=$member->error;
-		$error++;
-	}
-	else
-	{
-		$subscription=new Subscription($db);
-	}
-
-	$amount=$subscription->total_ttc;
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
-	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
-	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
-	$fulltag=dol_string_unaccent($fulltag);
-
-	// Creditor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-    print '</td></tr>'."\n";
-
-	// Debitor
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
-	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
-	else print $member->getFullName($langs);
-	print '</b>';
-
-	// Object
-	$var=!$var;
-	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
-	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
-	print '<input type="hidden" name="ref" value="'.$member->ref.'">';
-	print '</td></tr>'."\n";
-
-	if ($member->last_subscription_date || $member->last_subscription_amount)
-	{
-		// Last subscription date
-		$var=!$var;
-		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
-		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
-		print '</td></tr>'."\n";
-
-		// Last subscription amount
-		$var=!$var;
-		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
-		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
-		print '</td></tr>'."\n";
-
-		if (empty($amount) && ! GETPOST('newamount')) $_GET['newamount']=$member->last_subscription_amount;
-	}
-
-	// Amount
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount))
-	{
-		print ' ('.$langs->trans("ToComplete");
-		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
-		print ')';
-	}
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
-	{
-	    $valtoshow=GETPOST("newamount",'int');
-	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
-        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-	    print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
-	}
-	else {
-	    $valtoshow=$amount;
-	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
-	    print '<b>'.price($valtoshow).'</b>';
-        print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
-		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
-	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
-	print '<input type="hidden" name="currency" value="'.$currency.'">';
-	print '</td></tr>'."\n";
-
-	// Tag
-	$var=!$var;
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
-	print '<input type="hidden" name="tag" value="'.$tag.'">';
-	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
-	print '</td></tr>'."\n";
-
-    // Shipping address
-    $shipToName=$member->getFullName($langs);
-    $shipToStreet=$member->address;
-    $shipToCity=$member->town;
-    $shipToState=$member->state_code;
-    $shipToCountryCode=$member->country_code;
-    $shipToZip=$member->zip;
-    $shipToStreet2='';
-    $phoneNum=$member->phone;
-    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
-    {
-        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
-        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
-        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
-        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
-        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
-        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
-        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
-        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-    }
-    else
-    {
-        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
-    }
-    print '<input type="hidden" name="email" value="'.$member->email.'">'."\n";
-    print '<input type="hidden" name="desc" value="'.$langs->trans("PaymentSubscription").'">'."\n";
-}
-
-
-
-
-if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
-
-if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
-
-print '</table>'."\n";
-print "\n";
-
-if ($found && ! $error)	// We are in a management option and no error
-{
-	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
-
-	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
-	{
-		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("StripeOrCBDoPayment").'">';
-	}
-	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'stripeonly')
-	{
-		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("StripeDoPayment").'">';
-	}
-}
-else
-{
-	dol_print_error_email('ERRORNEWPAYMENTPAYPAL');
-}
-
-print '</td></tr>'."\n";
-
-print '</table>'."\n";
-print '</form>'."\n";
-print '</div>'."\n";
-print '<br>';
-
-
-html_print_stripe_footer($mysoc,$langs);
-
-llxFooterStripe();
-
-$db->close();
diff --git a/htdocs/public/stripe/paymentko.php b/htdocs/public/stripe/paymentko.php
deleted file mode 100644
index 09de4525b39..00000000000
--- a/htdocs/public/stripe/paymentko.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paybox/paymentko.php
- *		\ingroup    paybox
- *		\brief      File to show page after a failed payment
- *		\author	    Laurent Destailleur
- */
-
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-// Security check
-if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
-
-$langs->load("main");
-$langs->load("other");
-$langs->load("dict");
-$langs->load("bills");
-$langs->load("companies");
-$langs->load("paybox");
-$langs->load("paypal");
-
-
-
-
-/*
- * Actions
- */
-
-
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a PayBox payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paybox');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
-
-
-// Send an email
-if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
-{
-	$sendto=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
-	$from=$conf->global->MAILING_EMAIL_FROM;
-
-	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentFailed");
-	$content=$langs->transnoentitiesnoconv("NewPayboxPaymentFailed")."\n".$fulltag;
-	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	$mailfile = new CMailFile($topic, $sendto, $from, $content);
-
-	$result=$mailfile->sendfile();
-	if ($result)
-	{
-		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
-	}
-	else
-	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
-	}
-}
-
-
-llxHeaderPayBox($langs->trans("PaymentForm"));
-
-
-// Show message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-
-print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>\n";
-
-if (! empty($conf->global->PAYBOX_MESSAGE_KO)) print $conf->global->PAYBOX_MESSAGE_KO;
-
-print "\n</div>\n";
-
-
-html_print_paybox_footer($mysoc,$langs);
-
-
-llxFooterPayBox();
-
-$db->close();
diff --git a/htdocs/public/stripe/paymentok.php b/htdocs/public/stripe/paymentok.php
deleted file mode 100644
index 9c3030a86ba..00000000000
--- a/htdocs/public/stripe/paymentok.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paybox/paymentok.php
- *		\ingroup    paybox
- *		\brief      File to show page after a successful payment
- *		\author	    Laurent Destailleur
- */
-
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-// Security check
-if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
-
-$langs->load("main");
-$langs->load("other");
-$langs->load("dict");
-$langs->load("bills");
-$langs->load("companies");
-$langs->load("paybox");
-$langs->load("paypal");
-
-/*$source=GETPOST('source');
-$ref=GETPOST('ref');
-$PAYBOXTOKEN=GETPOST('TOKEN');
-if (empty($PAYBOXTOKEN)) $PAYBOXTOKEN=GETPOST('token');
-$PAYBOXPAYERID=GETPOST('PAYERID');
-if (empty($PAYBOXPAYERID)) $PAYBOXPAYERID=GETPOST('PayerID');
-*/
-$PAYBOXFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYBOXFULLTAG)) $PAYBOXFULLTAG=GETPOST('fulltag');
-
-
-/*
- * Actions
- */
-
-
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a PayBox payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paybox');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
-
-llxHeaderPayBox($langs->trans("PaymentForm"));
-
-
-// Show message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-
-// Get on url call
-/*
-$token              = $PAYBOXTOKEN;
-*/
-$fulltag            = $PAYBOXFULLTAG;
-/*$payerID            = $PAYBOXPAYERID;
-// Set by newpayment.php
-$paymentType        = $_SESSION['PaymentType'];
-$currencyCodeType   = $_SESSION['currencyCodeType'];
-$FinalPaymentAmt    = $_SESSION["Payment_Amount"];
-// From env
-$ipaddress          = $_SESSION['ipaddress'];
-
-dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
-*/
-
-
-print $langs->trans("YourPaymentHasBeenRecorded")."<br><br>\n";
-
-if (! empty($conf->global->PAYBOX_MESSAGE_OK)) print $conf->global->PAYBOX_MESSAGE_OK;
-
-// Appel des triggers
-include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-$interface=new Interfaces($db);
-$result=$interface->run_triggers('PAYBOX_PAYMENT_OK',$object,$user,$langs,$conf);
-if ($result < 0) { $error++; $errors=$interface->errors; }
-// Fin appel triggers
-
-
-// Send an email
-if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
-{
-	$sendto=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
-	$from=$conf->global->MAILING_EMAIL_FROM;
-	// Define $urlwithroot
-	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentReceived");
-	$tmptag=dolExplodeIntoArray($fulltag,'.','=');
-	$content="";
-	if (! empty($tmptag['MEM']))
-	{
-		$langs->load("members");
-		$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
-		$content.=$langs->trans("PaymentSubscription")."<br>\n";
-		$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
-		$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-	}
-	else
-	{
-		$content.=$langs->transnoentitiesnoconv("NewPayboxPaymentReceived")."<br>\n";
-	}
-	$content.="<br>\n";
-	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-	$content.="tag=".$fulltag."<br>\n";
-
-	$ishtml=dol_textishtml($content);	// May contain urls
-
-	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
-
-	// Send an email
-	$result=$mailfile->sendfile();
-	if ($result)
-	{
-		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
-	}
-	else
-	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
-	}
-}
-
-
-
-print "\n</div>\n";
-
-html_print_paybox_footer($mysoc,$langs);
-
-
-llxFooterPayBox();
-
-$db->close();
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 719c623e146..4da06e61de8 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -23,7 +23,7 @@
  */
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
@@ -31,6 +31,8 @@ $servicename='Stripe';
 
 $langs->load("admin");
 $langs->load("other");
+$langs->load("paypal");
+$langs->load("paybox");
 $langs->load("stripe");
 
 if (!$user->admin)
@@ -43,7 +45,7 @@ if ($action == 'setvalue' && $user->admin)
 {
 	$db->begin();
 
-    $result=dolibarr_set_const($db, "STRIPE_API_SANDBOX",GETPOST('STRIPE_API_SANDBOX','alpha'),'chaine',0,'',$conf->entity);
+    $result=dolibarr_set_const($db, "STRIPE_TEST",GETPOST('STRIPE_TEST','alpha'),'chaine',0,'',$conf->entity);
     if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY",GETPOST('STRIPE_TEST_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
@@ -118,8 +120,8 @@ print "</tr>\n";
 
 $var=!$var;
 print '<tr '.$bc[$var].'><td class="fieldrequired">';
-print $langs->trans("STRIPE_API_SANDBOX").'</td><td>';
-print $form->selectyesno("STRIPE_API_SANDBOX",$conf->global->STRIPE_API_SANDBOX,1);
+print $langs->trans("STRIPE_TEST").'</td><td>';
+print $form->selectyesno("STRIPE_TEST",$conf->global->STRIPE_TEST,1);
 print '</td></tr>';
 
 $var=!$var;
@@ -150,7 +152,11 @@ print '<input size="32" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.
 print '<br>'.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
-$var=true;
+print '</table>';
+
+print '<br>';
+
+print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("UsageParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
@@ -173,14 +179,14 @@ print '</td></tr>';
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("MessageOK").'</td><td>';
-$doleditor=new DolEditor('STRIPE_MESSAGE_OK',$conf->global->STRIPE_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_2,60);
+$doleditor=new DolEditor('STRIPE_MESSAGE_OK',$conf->global->STRIPE_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
 $doleditor->Create();
 print '</td></tr>';
 
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("MessageKO").'</td><td>';
-$doleditor=new DolEditor('STRIPE_MESSAGE_KO',$conf->global->STRIPE_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_2,60);
+$doleditor=new DolEditor('STRIPE_MESSAGE_KO',$conf->global->STRIPE_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
 $doleditor->Create();
 print '</td></tr>';
 
@@ -194,6 +200,7 @@ print '</form>';
 
 print '<br><br>';
 
+/*
 print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
 print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
 print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount=<i>9.99</i>&tag=<i>your_free_tag</i></b>'."<br>\n";
@@ -220,6 +227,7 @@ if (! empty($conf->adherent->enabled))
 
 print "<br>";
 print info_admin($langs->trans("YouCanAddTagOnUrl"));
+*/
 
 llxFooter();
 

From d73374cc5b2865ee9eabfff0a29dc00b3a20f7c8 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 29 Apr 2017 07:34:30 +0200
Subject: [PATCH 0657/1163] Uniformize link to stripe.lib

---
 htdocs/public/stripe/checkout.php          |  2 +-
 htdocs/public/stripe/config.php            |  2 +-
 htdocs/stripe/admin/stripe.php             |  2 +-
 htdocs/stripe/lib/index.html               |  0
 htdocs/{core => stripe}/lib/stripe.lib.php | 60 ++++++++++------------
 5 files changed, 31 insertions(+), 35 deletions(-)
 create mode 100644 htdocs/stripe/lib/index.html
 rename htdocs/{core => stripe}/lib/stripe.lib.php (99%)

diff --git a/htdocs/public/stripe/checkout.php b/htdocs/public/stripe/checkout.php
index 4bea80bce6c..3f0b6f84016 100644
--- a/htdocs/public/stripe/checkout.php
+++ b/htdocs/public/stripe/checkout.php
@@ -20,7 +20,7 @@ define("NOLOGIN",1);
 define("NOCSRFCHECK",1);
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/public/stripe/config.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
 
diff --git a/htdocs/public/stripe/config.php b/htdocs/public/stripe/config.php
index ac315762b29..b94617b4c69 100644
--- a/htdocs/public/stripe/config.php
+++ b/htdocs/public/stripe/config.php
@@ -25,7 +25,7 @@
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
 
 //use \includes\stripe as stripe;
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 4da06e61de8..1882d1065b0 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -23,7 +23,7 @@
  */
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/stripe.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
diff --git a/htdocs/stripe/lib/index.html b/htdocs/stripe/lib/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
similarity index 99%
rename from htdocs/core/lib/stripe.lib.php
rename to htdocs/stripe/lib/stripe.lib.php
index 175df3554ce..0ab73437e17 100644
--- a/htdocs/core/lib/stripe.lib.php
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -21,7 +21,35 @@
  *  \brief			Library for common stripe functions
  */
 
+/**
+ *  Define head array for tabs of stripe tools setup pages
+ *
+ *  @return			Array of head
+ */
+function stripeadmin_prepare_head()
+{
+	global $langs, $conf;
 
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT."/stripe/admin/stripe.php";
+	$head[$h][1] = $langs->trans("Stripe");
+	$head[$h][2] = 'stripeaccount';
+	$h++;
+
+	$object=new stdClass();
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin');
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin','remove');
+
+    return $head;
+}
 
 /**
  * Show header
@@ -70,38 +98,6 @@ function llxFooterStripe()
 	print "</html>\n";
 }
 
-/**
- *  Define head array for tabs of stripe tools setup pages
- *
- *  @return			Array of head
- */
-function stripeadmin_prepare_head()
-{
-	global $langs, $conf;
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT."/stripe/admin/stripe.php";
-	$head[$h][1] = $langs->trans("Stripe");
-	$head[$h][2] = 'stripeaccount';
-	$h++;
-
-	$object=new stdClass();
-
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin');
-
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin','remove');
-
-    return $head;
-}
-
-
-
 /**
  * Return string with full Url
  *

From ce62736e6b46e9442d4aa01133339895c9630474 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 29 Apr 2017 07:57:36 +0200
Subject: [PATCH 0658/1163] Correct link and renamed checkout by newpayment

---
 .../stripe/{checkout.php => newpayment.php}   | 14 ++++--
 htdocs/stripe/lib/stripe.lib.php              | 50 +------------------
 2 files changed, 11 insertions(+), 53 deletions(-)
 rename htdocs/public/stripe/{checkout.php => newpayment.php} (94%)

diff --git a/htdocs/public/stripe/checkout.php b/htdocs/public/stripe/newpayment.php
similarity index 94%
rename from htdocs/public/stripe/checkout.php
rename to htdocs/public/stripe/newpayment.php
index 3f0b6f84016..71f581000b2 100644
--- a/htdocs/public/stripe/checkout.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -16,6 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+*  \file       htdocs/public/stripe/newpayment.php
+*  \ingroup    Stripe
+*  \brief      Page to do payment with Stripe
+*/
+
 define("NOLOGIN",1);
 define("NOCSRFCHECK",1);
 
@@ -25,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/public/stripe/config.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
 
 // Security check
-if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->stripe->enabled)) accessforbidden('',0,0,1);
 
 $langs->load("main");
 $langs->load("other");
@@ -67,13 +73,13 @@ if (GETPOST("action") == 'charge')
   $token = GETPOST("stripeToken");
   $email = GETPOST("stripeEmail");
 
-  $customer = \Stripe\Customer::create(array(
+  $customer = \stripe\Customer::create(array(
       'email' => $email,
       'card'  => $token
   ));
 	
 	$ttc = round($ttc, 2);
-  $charge = \Stripe\Charge::create(array(
+  $charge = \stripe\Charge::create(array(
       'customer' => $customer->id,
       'amount'   => $ttc,
       'currency' => $conf->currency,
@@ -122,7 +128,7 @@ if (GETPOST("action") == 'charge')
                             </td>
                             
                             <td>
-                                Invoice #: <?php echo $invoice->ref; ?><br>
+                                <?php echo $langs->trans("Invoice") . ' : ' . $invoice->ref; ?><br>
                                 <?php echo $langs->trans('Date') . ' : ' . dol_print_date($invoice->date, 'day'); ?><br>
                                 <?php echo $langs->trans('DateMaxPayment') . ' : ' . dol_print_date($invoice->date_validation, 'day'); ?>
                             </td>
diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
index 0ab73437e17..c454296a304 100644
--- a/htdocs/stripe/lib/stripe.lib.php
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -112,6 +112,7 @@ function showStripePaymentUrl($type,$ref)
 	$langs->load("paypal");
     $langs->load("paybox");
 	$langs->load("stripe");
+
     $servicename='Stripe';
     $out='<br><br>';
     $out.=img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
@@ -139,11 +140,6 @@ function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
     if ($type == 'free')
     {
 	    $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
-	    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-	    {
-	    	if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-	    	else $out.='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-	    }
     }
     if ($type == 'order')
     {
@@ -151,17 +147,6 @@ function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
         if ($mode == 1) $out.='order_ref';
         if ($mode == 0) $out.=urlencode($ref);
 	    $out.=($mode?'</font>':'');
-        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
-                $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
-                $out.=($mode?'</font>':'');
-            }
-        }
     }
     if ($type == 'invoice')
     {
@@ -169,17 +154,6 @@ function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
         if ($mode == 1) $out.='invoice_ref';
         if ($mode == 0) $out.=urlencode($ref);
 	    $out.=($mode?'</font>':'');
-        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
-                $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
-                $out.=($mode?'</font>':'');
-            }
-        }
     }
     if ($type == 'contractline')
     {
@@ -187,17 +161,6 @@ function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
         if ($mode == 1) $out.='contractline_ref';
         if ($mode == 0) $out.=urlencode($ref);
 	    $out.=($mode?'</font>':'');
-        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
-                $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
-                $out.=($mode?'</font>':'');
-            }
-        }
     }
     if ($type == 'membersubscription')
     {
@@ -205,17 +168,6 @@ function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
         if ($mode == 1) $out.='member_ref';
         if ($mode == 0) $out.=urlencode($ref);
 	    $out.=($mode?'</font>':'');
-        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
-                $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
-                $out.=($mode?'</font>':'');
-            }
-        }
     }
 
     // For multicompany

From faddcb28ac9fafb54ad8124f0eef77f2561926f1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 14:53:29 +0200
Subject: [PATCH 0659/1163] FIX serious bugs in accounting (error management,
 transactions, bad values set)

---
 .../accountancy/class/bookkeeping.class.php   |  15 +-
 htdocs/accountancy/customer/lines.php         |  16 +-
 htdocs/accountancy/customer/list.php          |   9 +-
 htdocs/accountancy/journal/bankjournal.php    | 291 +++++++++---------
 .../journal/expensereportsjournal.php         | 250 ++++++++-------
 .../accountancy/journal/purchasesjournal.php  | 259 +++++++++-------
 htdocs/accountancy/journal/sellsjournal.php   | 240 +++++++++------
 htdocs/accountancy/supplier/lines.php         |   9 +-
 htdocs/accountancy/supplier/list.php          |   9 +-
 htdocs/core/lib/accounting.lib.php            |  92 ++++++
 htdocs/core/lib/functions.lib.php             |   2 +-
 11 files changed, 731 insertions(+), 461 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 754dd262369..8f31b40bc54 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -169,7 +169,15 @@ class BookKeeping extends CommonObject
 		if (empty($this->numero_compte) || $this->numero_compte == '-1')
 		{
 		    $langs->load("errors");
-            $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet);		    
+            if (in_array($this->doc_type, array('bank', 'expense_report')))
+            {
+		        $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet,  $this->doc_type);
+            }
+            else
+            {
+                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->fk_doc,  $this->doc_type);		    
+            }
+		    
 		    return -1;
 		}
 		
@@ -178,11 +186,12 @@ class BookKeeping extends CommonObject
 		
 		$this->piece_num = 0;
 		
-		// first check if line not yet in bookkeeping
+		// First check if line not yet already in bookkeeping
 		$sql = "SELECT count(*) as nb";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE doc_type = '" . $this->doc_type . "'";
-		$sql .= " AND fk_docdet = " . $this->fk_docdet;
+		$sql .= " AND fk_doc = " . $this->fk_doc;
+		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines 
 		$sql .= " AND numero_compte = '" . $this->numero_compte . "'";
 	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 		
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index a015fa05929..428e490aff7 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -43,6 +43,7 @@ $langs->load("productbatch");
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
 // Search Getpost
+$search_lineid = GETPOST('search_lineid', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -86,6 +87,7 @@ $formventilation = new FormVentilation($db);
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
+    $search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -151,7 +153,7 @@ print '<script type="text/javascript">
  * Customer Invoice lines
  */
 $sql = "SELECT f.rowid, f.facnumber, f.type, f.datef, f.ref_client,";
-$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc,";
+$sql .= " fd.rowid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,";
 $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number, aa.label as label_compte,";
 $sql .= " fd.situation_percent, co.label as country, s.tva_intra";
@@ -169,6 +171,9 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 } else {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
+if ($search_lineid) {
+    $sql .= natural_search("fd.rowid", $search_lineid, 1);
+}
 if (strlen(trim($search_invoice))) {
 	$sql .= natural_search("f.facnumber", $search_invoice);
 }
@@ -257,7 +262,7 @@ if ($result) {
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 	
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
@@ -328,13 +333,16 @@ if ($result) {
 		print '<td align="right">' . price($objp->total_ht) . '</td>';
 		print '<td align="center">' . price($objp->tva_tx) . '</td>';
 		print '<td>';
-		print $codecompta . ' <a href="./card.php?id=' . $objp->fdid . '">';
+		print $codecompta . ' <a href="./card.php?id=' . $objp->rowid . '">';
 		print img_edit();
 		print '</a>';
 		print '</td>';
+		
 		print '<td>' . $objp->country .'</td>';
+		
 		print '<td>' . $objp->tva_intra . '</td>';
-		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->fdid . '"/></td>';
+		
+		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
 
 		print "</tr>";
 		$i ++;
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index c5830b0b003..46cb19c2ae1 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -52,6 +52,7 @@ $toselect = GETPOST('toselect', 'array');
 $mesCasesCochees = GETPOST('toselect', 'array');
 
 // Search Getpost
+$search_lineid = GETPOST('search_lineid', 'int');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -100,6 +101,7 @@ if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction !=
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
 {
+    $search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -177,7 +179,7 @@ llxHeader('', $langs->trans("Ventilation"));
 
 // Customer Invoice lines
 $sql = "SELECT f.facnumber, f.rowid as facid, f.datef, f.type as ftype,";
-$sql .= " l.fk_product, l.description, l.total_ht, l.rowid, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line,";
+$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line,";
 $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_sell as code_sell, p.tva_tx as tva_tx_prod,";
 $sql .= " aa.rowid as aarowid";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
@@ -189,6 +191,9 @@ $sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 $sql .= " AND product_type <= 2";
 $sql .= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_sell ='')";
 // Add search filter like
+if ($search_lineid) {
+    $sql .= natural_search("l.rowid", $search_lineid, 1);
+}
 if (strlen(trim($search_invoice))) {
     $sql .= natural_search("f.facnumber",$search_invoice);
 }
@@ -274,7 +279,7 @@ if ($result) {
 
 	// We add search filter
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index b9567cd50a7..7dc6f652c73 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -106,7 +106,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 $p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 $idpays = $p[0];
 
-$sql  = "SELECT b.rowid , b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
+$sql  = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
 $sql .= " ba.courant, ba.ref as baref, ba.account_number,";
 $sql .= " soc.code_compta, soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, bu1.type as typeop,";
 $sql .= " u.accountancy_code, u.rowid as userid, u.lastname as name, u.firstname as firstname, bu2.type as typeop";
@@ -341,79 +341,81 @@ if (! $error && $action == 'writebookkeeping') {
 		    // Line into bank account
     		foreach ( $tabbq[$key] as $k => $mt ) 
     		{
-    			$bookkeeping = new BookKeeping($db);
-    			$bookkeeping->doc_date = $val["date"];
-    			$bookkeeping->doc_ref = $val["ref"];
-    			$bookkeeping->doc_type = 'bank';
-    			$bookkeeping->fk_doc = $key;
-    			$bookkeeping->fk_docdet = $val["fk_bank"];
-    			$bookkeeping->numero_compte = $k;
-    			$bookkeeping->label_compte = $compte->label;
-    			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-    			$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-    			$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
-    			$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
-    			$bookkeeping->code_journal = $journal;
-    			$bookkeeping->fk_user_author = $user->id;
-    			$bookkeeping->date_create = $now;
+    			if ($mt) {
+        		    $bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->doc_type = 'bank';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = $val["fk_bank"];
+        			$bookkeeping->numero_compte = $k;
+        			$bookkeeping->label_compte = $compte->label;
+        			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+        			$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+        			$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
+        			$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
+        			$bookkeeping->code_journal = $journal;
+        			$bookkeeping->fk_user_author = $user->id;
+        			$bookkeeping->date_create = $now;
+        
+        			if ($tabtype[$key] == 'payment') {
+        			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
     
-    			if ($tabtype[$key] == 'payment') {
-    			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-
-    				$sqlmid = 'SELECT fac.facnumber';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON payfac.fk_facture=fac.rowid";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-    				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->facnumber;    // Ref of invoice
-    				}
-    			} else if ($tabtype[$key] == 'payment_supplier') {
-    			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-
-    				$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON payfacf.fk_facturefourn=facf.rowid";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-    				$sqlmid .= " WHERE payf.fk_bank=" . $key;
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
-    				}
-    			} else if ($tabtype[$key] == 'payment_expensereport') {
-    			    $bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
-
-    				$sqlmid = 'SELECT e.ref';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
-    				$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
-    				}
-    			}
+        				$sqlmid = 'SELECT fac.facnumber';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON payfac.fk_facture=fac.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+        				$sqlmid .= " WHERE pay.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->facnumber;    // Ref of invoice
+        				}
+        			} else if ($tabtype[$key] == 'payment_supplier') {
+        			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
     
-    			$result = $bookkeeping->create($user);
-    			if ($result < 0) {
-    				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-    				{
-    					$error++;
-    					$errorforline++;
-    					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-    				}
-    				else
-    				{
-	    				$error++;
-	    				$errorforline++;
-	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-    				}
+        				$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON payfacf.fk_facturefourn=facf.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+        				$sqlmid .= " WHERE payf.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
+        				}
+        			} else if ($tabtype[$key] == 'payment_expensereport') {
+        			    $bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
+    
+        				$sqlmid = 'SELECT e.ref';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
+        				$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
+        				}
+        			}
+        
+        			$result = $bookkeeping->create($user);
+        			if ($result < 0) {
+        				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        				{
+        					$error++;
+        					$errorforline++;
+        					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        				}
+        				else
+        				{
+    	    				$error++;
+    	    				$errorforline++;
+    	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        				}
+        			}
     			}
     		}
 		}
@@ -423,65 +425,76 @@ if (! $error && $action == 'writebookkeeping') {
 		{
 		    // Line into thirdparty account
     		foreach ( $tabtp[$key] as $k => $mt ) {
-    			$bookkeeping = new BookKeeping($db);
-    			$bookkeeping->doc_date = $val["date"];
-    			$bookkeeping->doc_ref = $val["ref"];
-    			$bookkeeping->doc_type = 'bank';
-    			$bookkeeping->fk_doc = $key;
-    			$bookkeeping->fk_docdet = $val["fk_bank"];
-    			$bookkeeping->label_compte = $tabcompany[$key]['name'];
-    			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-    			$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-    			$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
-    			$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-    			$bookkeeping->code_journal = $journal;
-    			$bookkeeping->fk_user_author = $user->id;
-    			$bookkeeping->date_create = $now;
-    
-    			if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
-    				$bookkeeping->code_tiers = '';
-    				$bookkeeping->numero_compte = $k;
-    			} else if ($tabtype[$key] == 'payment') {    // If payment is payment of customer invoice, we get ref of invoice
-    				$sqlmid = 'SELECT fac.facnumber';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-    				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->facnumber;
-    				}
-    				$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-    				$bookkeeping->numero_compte = $k;
-    			} else if ($tabtype[$key] == 'payment_supplier') {           // If payment is payment of supplier invoice, we get ref of invoice
-    
-    				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
-    				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
-    				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-    				$sqlmid .= " WHERE payf.fk_bank=" . $key;
-    				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-    				$resultmid = $db->query($sqlmid);
-    				if ($resultmid) {
-    					$objmid = $db->fetch_object($resultmid);
-    					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
-    				}
-                    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-    				$bookkeeping->numero_compte = $k;
-    			} else {
-    			    // FIXME Should be a temporary account ???
-    				$bookkeeping->doc_ref = $k;
-    				//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-    				$bookkeeping->numero_compte = 'CodeNotDef';
-    			}
-    
-    			$result = $bookkeeping->create($user);
-    			if ($result < 0) {
-    				$error++;
-    				$errorforline++;
-    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+    			if ($mt) {
+        		    $bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->doc_type = 'bank';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = $val["fk_bank"];
+        			$bookkeeping->label_compte = $tabcompany[$key]['name'];
+        			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+        			$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+        			$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
+        			$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+        			$bookkeeping->code_journal = $journal;
+        			$bookkeeping->fk_user_author = $user->id;
+        			$bookkeeping->date_create = $now;
+        
+        			if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
+        				$bookkeeping->code_tiers = '';
+        				$bookkeeping->numero_compte = $k;
+        			} else if ($tabtype[$key] == 'payment') {    // If payment is payment of customer invoice, we get ref of invoice
+        				$sqlmid = 'SELECT fac.facnumber';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+        				$sqlmid .= " WHERE pay.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->facnumber;
+        				}
+        				$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+        				$bookkeeping->numero_compte = $k;
+        			} else if ($tabtype[$key] == 'payment_supplier') {           // If payment is payment of supplier invoice, we get ref of invoice
+        
+        				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+        				$sqlmid .= " WHERE payf.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
+        				}
+                        $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+        				$bookkeeping->numero_compte = $k;
+        			} else {
+        			    // FIXME Should be a temporary account ???
+        				$bookkeeping->doc_ref = $k;
+        				//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+        				$bookkeeping->numero_compte = 'CodeNotDef';
+        			}
+        
+        			$result = $bookkeeping->create($user);
+        			if ($result < 0) {
+        				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        				{
+        					$error++;
+        					$errorforline++;
+        					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        				}
+        				else
+        				{
+    	    				$error++;
+    	    				$errorforline++;
+    	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        				}
+        			}
     			}
     		}
 		}
@@ -512,6 +525,7 @@ if (! $error && $action == 'writebookkeeping') {
 }
 
 // Export
+/*
 if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 
@@ -678,7 +692,7 @@ if ($action == 'export_csv') {
 		}
 	}
 }
-
+*/
 
 
 
@@ -702,18 +716,19 @@ if (empty($action) || $action == 'view') {
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
 
 	$varlink = 'id_account=' . $id_bank_account;
-	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => ''
-	), '', $varlink);
+	
+	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
+	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans('Export') . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	}
+	}*/
 
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-
+    print '</div>';
+    
 	// TODO Avoid using js. We can use a direct link with $param
 	print '
 	<script type="text/javascript">
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index a281b7fef8d..6488c6c4fd3 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -157,100 +157,140 @@ if ($action == 'writebookkeeping') {
 	{
 		$errorforline = 0;
 
-		foreach ( $tabttc[$key] as $k => $mt ) {
-			// get compte id and label
-
-			$bookkeeping = new BookKeeping($db);
-			$bookkeeping->doc_date = $val["date"];
-			$bookkeeping->doc_ref = $val["ref"];
-			$bookkeeping->date_create = $now;
-			$bookkeeping->doc_type = 'expense_report';
-			$bookkeeping->fk_doc = $key;
-			$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-			$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
-			$bookkeeping->label_compte = $tabuser[$key]['name'];
-			$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
-			$bookkeeping->montant = $mt;
-			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
-			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
-			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
-			$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-			$bookkeeping->fk_user_author = $user->id;
-
-			$result = $bookkeeping->create($user);
-			if ($result < 0) {
-				$error++;
-				$errorforline++;
-				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-			}
-		}
-
-		// Fees
-		foreach ( $tabht[$key] as $k => $mt ) {
-			$accountingaccount = new AccountingAccount($db);
-			$accountingaccount->fetch(null, $k, true);
-			if ($mt) {
-				// get compte id and label
-				$accountingaccount = new AccountingAccount($db);
-				if ($accountingaccount->fetch(null, $k, true)) {
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->date_create = $now;
-					$bookkeeping->doc_type = 'expense_report';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-					$bookkeeping->code_tiers = '';
-					$bookkeeping->label_compte = $accountingaccount->label;
-					$bookkeeping->numero_compte = $k;
-					$bookkeeping->montant = $mt;
-					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-					$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-					$bookkeeping->fk_user_author = $user->id;
-
-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						$error++;
-						$errorforline++;
-						setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-					}
-				}
-			}
-		}
-
-		// VAT
-		// var_dump($tabtva);
-		foreach ( $tabtva[$key] as $k => $mt ) {
-			if ($mt) {
-				// get compte id and label
-				$bookkeeping = new BookKeeping($db);
-				$bookkeeping->doc_date = $val["date"];
-				$bookkeeping->doc_ref = $val["ref"];
-				$bookkeeping->date_create = $now;
-				$bookkeeping->doc_type = 'expense_report';
-				$bookkeeping->fk_doc = $key;
-				$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-				$bookkeeping->code_tiers = '';
-				$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
-				$bookkeeping->numero_compte = $k;
-				$bookkeeping->montant = $mt;
-				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-				$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-				$bookkeeping->fk_user_author = $user->id;
-
-				$result = $bookkeeping->create($user);
-				if ($result < 0) {
-					$error++;
-					$errorforline++;
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-		}
-
+	    $db->begin();
+	     
+        if (! $errorforline)
+        {
+    	    foreach ( $tabttc[$key] as $k => $mt ) {
+    			if ($mt) {
+        	        // get compte id and label
+        
+        			$bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->date_create = $now;
+        			$bookkeeping->doc_type = 'expense_report';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+        			$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
+        			$bookkeeping->label_compte = $tabuser[$key]['name'];
+        			$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+        			$bookkeeping->montant = $mt;
+        			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+        			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
+        			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
+        			$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
+        			$bookkeeping->fk_user_author = $user->id;
+        
+        			$result = $bookkeeping->create($user);
+        			if ($result < 0) {
+        			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        			    }
+        			    else
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        			    }
+        			}
+    			}
+    		}
+        }
+        
+        if (! $errorforline)
+        {
+            // Fees
+    		foreach ( $tabht[$key] as $k => $mt ) {
+    			$accountingaccount = new AccountingAccount($db);
+    			$accountingaccount->fetch(null, $k, true);
+    			if ($mt) {
+    				// get compte id and label
+    				$accountingaccount = new AccountingAccount($db);
+    				if ($accountingaccount->fetch(null, $k, true)) {
+    					$bookkeeping = new BookKeeping($db);
+    					$bookkeeping->doc_date = $val["date"];
+    					$bookkeeping->doc_ref = $val["ref"];
+    					$bookkeeping->date_create = $now;
+    					$bookkeeping->doc_type = 'expense_report';
+    					$bookkeeping->fk_doc = $key;
+    					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+    					$bookkeeping->code_tiers = '';
+    					$bookkeeping->label_compte = $accountingaccount->label;
+    					$bookkeeping->numero_compte = $k;
+    					$bookkeeping->montant = $mt;
+    					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    					$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
+    					$bookkeeping->fk_user_author = $user->id;
+    
+    					$result = $bookkeeping->create($user);
+	        			if ($result < 0) {
+            			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+            			    }
+            			    else
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+            			    }
+	        			}
+    				}
+    			}
+    		}
+        }
+        
+        if (! $errorforline)
+        {
+            // VAT
+    		// var_dump($tabtva);
+    		foreach ( $tabtva[$key] as $k => $mt ) {
+    			if ($mt) {
+    				// get compte id and label
+    				$bookkeeping = new BookKeeping($db);
+    				$bookkeeping->doc_date = $val["date"];
+    				$bookkeeping->doc_ref = $val["ref"];
+    				$bookkeeping->date_create = $now;
+    				$bookkeeping->doc_type = 'expense_report';
+    				$bookkeeping->fk_doc = $key;
+    				$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+    				$bookkeeping->code_tiers = '';
+    				$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
+    				$bookkeeping->numero_compte = $k;
+    				$bookkeeping->montant = $mt;
+    				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    				$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
+    				$bookkeeping->fk_user_author = $user->id;
+    
+    				$result = $bookkeeping->create($user);
+    				if ($result < 0) {
+           			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        			    }
+        			    else
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        			    }
+    				}
+    			}
+    		}
+        }
+        
 		if (! $errorforline)
 		{
 		    $db->commit();
@@ -286,7 +326,7 @@ $form = new Form($db);
 $userstatic = new User($db);
 
 // Export
-if ($action == 'export_csv') {
+/*if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
 
@@ -393,6 +433,7 @@ if ($action == 'export_csv') {
 		}
 	}
 }
+*/
 
 if (empty($action) || $action == 'view') {
 
@@ -406,18 +447,19 @@ if (empty($action) || $action == 'view') {
 	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => ''
-	));
 
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
+	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+
+	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	}
+	}*/
 
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-
+    print '</div>';
+    
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -511,11 +553,11 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-		print '<tr class="oddeven">';
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-			print "<td><!-- Thirdparty --></td>";
+		    print '<tr class="oddeven">';
+		    print "<td><!-- Thirdparty --></td>";
 		    print "<td>" . $date . "</td>";
 			print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
 			$userstatic->id = $tabuser[$key]['id'];
@@ -531,8 +573,8 @@ if (empty($action) || $action == 'view') {
 			print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("Code_tiers") . "</td>";
 			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+		    print "</tr>";
 		}
-		print "</tr>";
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index a00fc9a70d8..c5069644cef 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -109,6 +109,7 @@ dol_syslog('accountancy/journal/purchasesjournal.php:: $sql=' . $sql);
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
+
 	// les variables
 	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef");
 	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : $langs->trans("CodeNotDef");
@@ -123,8 +124,10 @@ if ($result) {
 	$i = 0;
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
+
 		// contrôles
 		$compta_soc = (! empty($obj->code_compta_fournisseur)) ? $obj->code_compta_fournisseur : $cptfour;
+		
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
@@ -144,14 +147,21 @@ if ($result) {
 
 		$tabfac[$obj->rowid]["type"] = $obj->type;
 		$tabfac[$obj->rowid]["description"] = $obj->description;
-		$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
+		//$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
+		
+        // Avoid warnings
+        if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
+        if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
+        if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
+
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
 		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
 		$tabcompany[$obj->rowid] = array (
 				'id' => $obj->socid,
 				'name' => $obj->name,
-				'code_fournisseur' => $obj->code_compta_fournisseur
+				'code_fournisseur' => $obj->code_fournisseur,
+				'code_compta_fournisseur' => $compta_soc
 		);
 
 		$i ++;
@@ -165,7 +175,7 @@ if ($action == 'writebookkeeping') {
 	$now = dol_now();
 	$error = 0;
 
-	foreach ($tabfac as $key => $val)
+	foreach ($tabfac as $key => $val)  // Loop on each invoice
 	{
 	    $errorforline = 0;
 	     
@@ -188,101 +198,136 @@ if ($action == 'writebookkeeping') {
 		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
 		$companystatic->client = $tabcompany[$key]['code_client'];
 
-		foreach ( $tabttc[$key] as $k => $mt ) {
-			// get compte id and label
-
-			$bookkeeping = new BookKeeping($db);
-			$bookkeeping->doc_date = $val["date"];
-			$bookkeeping->doc_ref = $val["ref"];
-			$bookkeeping->date_create = $now;
-			$bookkeeping->doc_type = 'supplier_invoice';
-			$bookkeeping->fk_doc = $key;
-			$bookkeeping->fk_docdet = $val["fk_facturefourndet"];
-			$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
-			$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
-			$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
-			$bookkeeping->montant = $mt;
-			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
-			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
-			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
-			$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-			$bookkeeping->fk_user_author = $user->id;
-
-			$result = $bookkeeping->create($user);
-			if ($result < 0) {
-			    $error++;
-			    $errorforline++;
-			    setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-			}
-		}
-
+        if (! $errorforline)
+        {
+    		foreach ( $tabttc[$key] as $k => $mt ) {
+    			// get compte id and label
+    		    if ($mt) {
+        			$bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->date_create = $now;
+        			$bookkeeping->doc_type = 'supplier_invoice';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+        			$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
+        			$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
+        			$bookkeeping->numero_compte = $tabcompany[$key]['code_compta_fournisseur'];
+        			$bookkeeping->montant = $mt;
+        			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+        			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
+        			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
+        			$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+        			$bookkeeping->fk_user_author = $user->id;
+        
+        			$result = $bookkeeping->create($user);
+           			if ($result < 0) {
+                        if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+                        {
+                            $error++;
+                            $errorforline++;
+                            //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                        }
+                        else
+                        {
+                            $error++;
+                            $errorforline++;
+                            setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                        }
+        			}
+    		    }
+    		}
+        }
+        
 		// Product / Service
-		foreach ( $tabht[$key] as $k => $mt ) {
-			$accountingaccount = new AccountingAccount($db);
-			$accountingaccount->fetch(null, $k, true);
-			if ($mt) {
-				// get compte id and label
-				$accountingaccount = new AccountingAccount($db);
-				if ($accountingaccount->fetch(null, $k, true)) {
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->date_create = $now;
-					$bookkeeping->doc_type = 'supplier_invoice';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = $val["fk_facturefourndet"];
-					$bookkeeping->code_tiers = '';
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
-					$bookkeeping->numero_compte = $k;
-					$bookkeeping->montant = $mt;
-					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-					$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-					$bookkeeping->fk_user_author = $user->id;
-
-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						$error++;
-						$errorforline++;
-						setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-					}
-				}
-			}
-		}
-
+        if (! $errorforline)
+        {
+            foreach ( $tabht[$key] as $k => $mt ) {
+    			$accountingaccount = new AccountingAccount($db);
+    			$accountingaccount->fetch(null, $k, true);
+    			if ($mt) {
+    				// get compte id and label
+    				$accountingaccount = new AccountingAccount($db);
+    				if ($accountingaccount->fetch(null, $k, true)) {
+    					$bookkeeping = new BookKeeping($db);
+    					$bookkeeping->doc_date = $val["date"];
+    					$bookkeeping->doc_ref = $val["ref"];
+    					$bookkeeping->date_create = $now;
+    					$bookkeeping->doc_type = 'supplier_invoice';
+    					$bookkeeping->fk_doc = $key;
+    					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+    					$bookkeeping->code_tiers = '';
+    					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
+    					$bookkeeping->numero_compte = $k;
+    					$bookkeeping->montant = $mt;
+    					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    					$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+    					$bookkeeping->fk_user_author = $user->id;
+    
+    					$result = $bookkeeping->create($user);
+    					if ($result < 0) {
+    					    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+            			    }
+            			    else
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+            			    }
+    					}
+    				}
+    			}
+    		}
+        }
+        
 		// VAT
 		// var_dump($tabtva);
-		foreach ( $tabtva[$key] as $k => $mt ) {
-			if ($mt) {
-				// get compte id and label
-				$bookkeeping = new BookKeeping($db);
-				$bookkeeping->doc_date = $val["date"];
-				$bookkeeping->doc_ref = $val["ref"];
-				$bookkeeping->date_create = $now;
-				$bookkeeping->doc_type = 'supplier_invoice';
-				$bookkeeping->fk_doc = $key;
-				$bookkeeping->fk_docdet = $val["fk_facturefourndet"];
-				$bookkeeping->code_tiers = '';
-				$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
-				$bookkeeping->numero_compte = $k;
-				$bookkeeping->montant = $mt;
-				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-				$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-				$bookkeeping->fk_user_author = $user->id;
-
-				$result = $bookkeeping->create($user);
-				if ($result < 0) {
-					$error++;
-					$errorforline++;
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-		}
-		
-
+        if (! $errorforline)
+        {
+            foreach ( $tabtva[$key] as $k => $mt ) {
+    			if ($mt) {
+    				// get compte id and label
+    				$bookkeeping = new BookKeeping($db);
+    				$bookkeeping->doc_date = $val["date"];
+    				$bookkeeping->doc_ref = $val["ref"];
+    				$bookkeeping->date_create = $now;
+    				$bookkeeping->doc_type = 'supplier_invoice';
+    				$bookkeeping->fk_doc = $key;
+    				$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+    				$bookkeeping->code_tiers = '';
+    				$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
+    				$bookkeeping->numero_compte = $k;
+    				$bookkeeping->montant = $mt;
+    				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    				$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+    				$bookkeeping->fk_user_author = $user->id;
+    
+    				$result = $bookkeeping->create($user);
+    				if ($result < 0) {
+    				    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+    				    {
+    				        $error++;
+    				        $errorforline++;
+    				        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+    				    }
+    				    else
+    				    {
+    				        $error++;
+    				        $errorforline++;
+    				        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+    				    }
+    				}
+    			}
+    		}
+        }
 
 		if (! $errorforline)
 		{
@@ -319,7 +364,7 @@ $form = new Form($db);
 $companystatic = new Fournisseur($db);
 
 // Export
-if ($action == 'export_csv') {
+/*if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
 
@@ -437,6 +482,7 @@ if ($action == 'export_csv') {
 		}
 	}
 }
+*/
 
 if (empty($action) || $action == 'view') {
 
@@ -456,18 +502,19 @@ if (empty($action) || $action == 'view') {
 	}
 
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => ''
-	));
+	
+	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
 
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
+	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	}
+	}*/
 
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-
+    print '</div>';
+    
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -485,7 +532,7 @@ if (empty($action) || $action == 'view') {
 	/*
 	 * Show result array
 	 */
-	print '<br><br>';
+	print '<br>';
 
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
@@ -562,11 +609,11 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-		print '<tr class="oddeven">';
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-			print "<td><!-- Thirdparty --></td>";
+		    print '<tr class="oddeven">';
+		    print "<td><!-- Thirdparty --></td>";
 		    print "<td>" . $date . "</td>";
 			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 			$companystatic->id = $tabcompany[$key]['id'];
@@ -585,8 +632,8 @@ if (empty($action) || $action == 'view') {
 			// print "</td>";
 			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+		    print "</tr>";
 		}
-		print "</tr>";
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 235af8eeb41..b16c71d2f7b 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -100,7 +100,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " WHERE fd.fk_code_ventilation > 0";
 $sql .= " AND f.entity IN (".getEntity('facture', 0).')';    // We don't share object for accountancy
-$sql .= " AND f.fk_statut > 0";
+$sql .= " AND f.fk_statut > 0"; // TODO Facture annulée ?
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
     $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
@@ -124,10 +124,12 @@ if ($result) {
     $num = $db->num_rows($result);
     $i = 0;
 
+    $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
+    
     while ( $i < $num ) {
         $obj = $db->fetch_object($result);
+        
         // les variables
-        $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
         $compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
 
         $compta_prod = $obj->compte;
@@ -164,23 +166,24 @@ if ($result) {
         $tabfac[$obj->rowid]["ref"] = $obj->facnumber;
         $tabfac[$obj->rowid]["type"] = $obj->type;
         $tabfac[$obj->rowid]["description"] = $obj->label_compte;
-        $tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
-        if (! isset($tabttc[$obj->rowid][$compta_soc]))
-            $tabttc[$obj->rowid][$compta_soc] = 0;
-            if (! isset($tabht[$obj->rowid][$compta_prod]))
-                $tabht[$obj->rowid][$compta_prod] = 0;
-                if (! isset($tabtva[$obj->rowid][$compta_tva]))
-                    $tabtva[$obj->rowid][$compta_tva] = 0;
-                    $tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
-                    $tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
-                    $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
-                    $tabcompany[$obj->rowid] = array (
-                        'id' => $obj->socid,
-                        'name' => $obj->name,
-                        'code_client' => $obj->code_compta
-                    );
+        //$tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
+       
+        // Avoid warnings
+        if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
+        if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
+        if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
 
-                    $i ++;
+        $tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
+        $tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
+        $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
+        $tabcompany[$obj->rowid] = array (
+            'id' => $obj->socid,
+            'name' => $obj->name,
+            'code_client' => $obj->code_client,
+            'code_compta' => $compta_soc
+        );
+
+        $i ++;
     }
 } else {
     dol_print_error($db);
@@ -191,7 +194,7 @@ if ($action == 'writebookkeeping') {
     $now = dol_now();
     $error = 0;
 
-    foreach ( $tabfac as $key => $val ) {
+    foreach ( $tabfac as $key => $val ) {   // Loop on each invoice
          
         $errorforline = 0;
 
@@ -211,97 +214,135 @@ if ($action == 'writebookkeeping') {
         $invoicestatic->id = $key;
         $invoicestatic->ref = (string) $val["ref"];
 
-        foreach ( $tabttc[$key] as $k => $mt ) {
-            $bookkeeping = new BookKeeping($db);
-            $bookkeeping->doc_date = $val["date"];
-            $bookkeeping->doc_ref = $val["ref"];
-            $bookkeeping->date_create = $now;
-            $bookkeeping->doc_type = 'customer_invoice';
-            $bookkeeping->fk_doc = $key;
-            $bookkeeping->fk_docdet = $val["fk_facturedet"];
-            $bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
-            $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-            // $bookkeeping->label_compte = $tabcompany[$key]['name'];
-            $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
-            $bookkeeping->montant = $mt;
-            $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-            $bookkeeping->debit = ($mt >= 0) ? $mt : 0;
-            $bookkeeping->credit = ($mt < 0) ? $mt : 0;
-            $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-            $bookkeeping->fk_user_author = $user->id;
-
-            $result = $bookkeeping->create($user);
-            if ($result < 0) {
-                $error++;
-                $errorforline++;
-                setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-            }
-        }
-
-        // Product / Service
-        foreach ( $tabht[$key] as $k => $mt ) {
-            if ($mt) {
-                // get compte id and label
-                $accountingaccount = new AccountingAccount($db);
-                if ($accountingaccount->fetch(null, $k, true)) {
+        // Thirdparty
+        if (! $errorforline)
+        {
+            foreach ( $tabttc[$key] as $k => $mt ) {
+                if ($mt) {
                     $bookkeeping = new BookKeeping($db);
                     $bookkeeping->doc_date = $val["date"];
                     $bookkeeping->doc_ref = $val["ref"];
                     $bookkeeping->date_create = $now;
                     $bookkeeping->doc_type = 'customer_invoice';
                     $bookkeeping->fk_doc = $key;
-                    $bookkeeping->fk_docdet = $val["fk_facturedet"];
+                    $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+                    $bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
+                    $bookkeeping->numero_compte = $tabcompany[$key]['code_compta'];
+                    // $bookkeeping->label_compte = $tabcompany[$key]['name'];
+                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
+                    $bookkeeping->montant = $mt;
+                    $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+                    $bookkeeping->debit = ($mt >= 0) ? $mt : 0;
+                    $bookkeeping->credit = ($mt < 0) ? $mt : 0;
+                    $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+                    $bookkeeping->fk_user_author = $user->id;
+    
+                    $result = $bookkeeping->create($user);
+           			if ($result < 0) {
+                        if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+                        {
+                            $error++;
+                            $errorforline++;
+                            //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                        }
+                        else
+                        {
+                            $error++;
+                            $errorforline++;
+                            setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                        }
+        			}
+                }
+            }
+        }
+        
+        // Product / Service
+        if (! $errorforline)
+        {
+            foreach ( $tabht[$key] as $k => $mt ) {
+                if ($mt) {
+                    // get compte id and label
+                    $accountingaccount = new AccountingAccount($db);
+                    if ($accountingaccount->fetch(null, $k, true)) {
+                        $bookkeeping = new BookKeeping($db);
+                        $bookkeeping->doc_date = $val["date"];
+                        $bookkeeping->doc_ref = $val["ref"];
+                        $bookkeeping->date_create = $now;
+                        $bookkeeping->doc_type = 'customer_invoice';
+                        $bookkeeping->fk_doc = $key;
+                        $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add;
+                        $bookkeeping->code_tiers = '';
+                        $bookkeeping->numero_compte = $k;
+                        $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
+                        $bookkeeping->montant = $mt;
+                        $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+                        $bookkeeping->debit = ($mt < 0) ? $mt : 0;
+                        $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+                        $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+                        $bookkeeping->fk_user_author = $user->id;
+    
+                        $result = $bookkeeping->create($user);
+            			if ($result < 0) {
+                            if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+                            {
+                                $error++;
+                                $errorforline++;
+                                //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                            }
+                            else
+                            {
+                                $error++;
+                                $errorforline++;
+                                setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                            }
+            			}                        
+                    }
+                }
+            }
+        }
+        
+        // VAT
+        // var_dump($tabtva);
+        if (! $errorforline)
+        {
+            foreach ( $tabtva[$key] as $k => $mt ) {
+                if ($mt) {
+                    $bookkeeping = new BookKeeping($db);
+                    $bookkeeping->doc_date = $val["date"];
+                    $bookkeeping->doc_ref = $val["ref"];
+                    $bookkeeping->date_create = $now;
+                    $bookkeeping->doc_type = 'customer_invoice';
+                    $bookkeeping->fk_doc = $key;
+                    $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
                     $bookkeeping->code_tiers = '';
                     $bookkeeping->numero_compte = $k;
-                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
+                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
                     $bookkeeping->montant = $mt;
                     $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
                     $bookkeeping->debit = ($mt < 0) ? $mt : 0;
                     $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
                     $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
                     $bookkeeping->fk_user_author = $user->id;
-
+    
                     $result = $bookkeeping->create($user);
                     if ($result < 0) {
-                        $error++;
-                        $errorforline++;
-                        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+           			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        			    }
+        			    else
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        			    }
                     }
                 }
             }
         }
 
-        // VAT
-        // var_dump($tabtva);
-        foreach ( $tabtva[$key] as $k => $mt ) {
-            if ($mt) {
-                $bookkeeping = new BookKeeping($db);
-                $bookkeeping->doc_date = $val["date"];
-                $bookkeeping->doc_ref = $val["ref"];
-                $bookkeeping->date_create = $now;
-                $bookkeeping->doc_type = 'customer_invoice';
-                $bookkeeping->fk_doc = $key;
-                $bookkeeping->fk_docdet = $val["fk_facturedet"];
-                $bookkeeping->code_tiers = '';
-                $bookkeeping->numero_compte = $k;
-                $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
-                $bookkeeping->montant = $mt;
-                $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-                $bookkeeping->debit = ($mt < 0) ? $mt : 0;
-                $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-                $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-                $bookkeeping->fk_user_author = $user->id;
-
-                $result = $bookkeeping->create($user);
-                if ($result < 0) {
-                    $error++;
-                    $errorforline++;
-                    setEventMessages($object->error, $object->errors, 'errors');
-                }
-            }
-        }
-
-
         if (! $errorforline)
         {
             $db->commit();
@@ -337,7 +378,7 @@ if ($action == 'writebookkeeping') {
 $form = new Form($db);
 
 // Export
-if ($action == 'export_csv') {
+/*if ($action == 'export_csv') {
 
     $sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
     $sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
@@ -457,6 +498,7 @@ if ($action == 'export_csv') {
         }
     }
 }
+*/
 
 if (empty($action) || $action == 'view') {
 
@@ -474,18 +516,18 @@ if (empty($action) || $action == 'view') {
 	else
 		$description .= $langs->trans("DepositsAreIncluded");
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => ''
-	));
+	
+	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
 
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
+	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	}
-
+	}*/
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-
+    print '</div>';
+    
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -503,7 +545,7 @@ if (empty($action) || $action == 'view') {
 	/*
 	 * Show result array
 	 */
-	print '<br><br>';
+	print '<br>';
 
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
@@ -552,8 +594,8 @@ if (empty($action) || $action == 'view') {
 			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . "</td>";
 			print "</td><td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
+		    print "</tr>";
 		}
-		print "</tr>";
 
 		// Product / Service
 		foreach ( $tabht[$key] as $k => $mt ) {
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 1f0d06fbec6..09cf552c7bb 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -44,6 +44,7 @@ $langs->load("productbatch");
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
 // Search Getpost
+$search_lineid = GETPOST('search_lineid', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -85,6 +86,7 @@ $formventilation = new FormVentilation($db);
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
+    $search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -148,7 +150,7 @@ print '<script type="text/javascript">
  * Supplier Invoice lines
  */
 $sql = "SELECT f.rowid as facid, f.ref as facnumber, f.ref_supplier, f.libelle as invoice_label, f.datef,";
-$sql.= " l.fk_product, l.description, l.total_ht , l.qty, l.rowid, l.tva_tx, aa.label, aa.account_number, ";
+$sql.= " l.rowid, l.fk_product, l.description, l.total_ht , l.qty, l.tva_tx, aa.label, aa.account_number, ";
 $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type";
 $sql.= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
 $sql.= " , " . MAIN_DB_PREFIX . "accounting_account as aa";
@@ -156,6 +158,9 @@ $sql.= " , " . MAIN_DB_PREFIX . "facture_fourn_det as l";
 $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
 $sql.= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
 $sql.= " AND aa.rowid = l.fk_code_ventilation";
+if ($search_lineid) {
+    $sql .= natural_search("l.rowid", $search_lineid, 1);
+}
 if (strlen(trim($search_invoice))) {
 	$sql .= natural_search("f.ref", $search_invoice);
 }
@@ -240,7 +245,7 @@ if ($result) {
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 	
 	print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index beae148c01b..e702aa8add8 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -52,6 +52,7 @@ $toselect = GETPOST('toselect', 'array');
 $mesCasesCochees = GETPOST('toselect', 'array');
 
 // Search Getpost
+$search_lineid = GETPOST('search_lineid', 'int');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -101,6 +102,7 @@ if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction !=
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
 {
+    $search_lineid = '';
     $search_ref = '';
     $search_invoice = '';    
     $search_label = '';
@@ -179,7 +181,7 @@ llxHeader('', $langs->trans("SuppliersVentilation"));
 
 // Supplier Invoice Lines
 $sql = "SELECT f.rowid as facid, f.ref, f.ref_supplier, f.libelle as invoice_label, f.datef,";
-$sql.= " l.fk_product, l.description, l.total_ht as price, l.rowid, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, ";
+$sql.= " l.rowid, l.fk_product, l.description, l.total_ht as price, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, ";
 $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_buy as code_buy, p.tva_tx as tva_tx_prod,";
 $sql.= " aa.rowid as aarowid";
 $sql.= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
@@ -191,6 +193,9 @@ $sql.= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 $sql.= " AND product_type <= 2";
 $sql.= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_buy IS NULL OR p.accountancy_code_buy ='')";
 // Add search filter like
+if ($search_lineid) {
+    $sql .= natural_search("l.rowid", $search_lineid, 1);
+}
 if (strlen(trim($search_invoice))) {
     $sql .= natural_search("f.ref",$search_invoice);
 }
@@ -272,7 +277,7 @@ if ($result) {
 
 	// We add search filter
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 56fdc8e6de9..dc112cc4e33 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -202,3 +202,95 @@ function length_accounta($accounta)
 		return $accounta;
 	}
 }
+
+
+
+/**
+ *	Show header of a VAT report
+ *
+ *	@param	string				$nom            Name of report
+ *	@param 	string				$variante       Link for alternate report
+ *	@param 	string				$period         Period of report
+ *	@param 	string				$periodlink     Link to switch period
+ *	@param 	string				$description    Description
+ *	@param 	timestamp|integer	$builddate      Date generation
+ *	@param 	string				$exportlink     Link for export or ''
+ *	@param	array				$moreparam		Array with list of params to add into form
+ *	@param	string				$calcmode		Calculation mode
+ *  @param  string              $varlink        Add a variable into the address of the page
+ *	@return	void
+ */
+function journalHead($nom,$variante,$period,$periodlink,$description,$builddate,$exportlink='',$moreparam=array(),$calcmode='', $varlink='')
+{
+    global $langs;
+
+    if (empty($hselected)) $hselected='report';
+
+    print "\n\n<!-- debut cartouche journal -->\n";
+
+    if(! empty($varlink)) $varlink = '?'.$varlink;
+
+    $h=0;
+    $head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
+    $head[$h][1] = $langs->trans("Journal");
+    $head[$h][2] = 'journal';
+
+    dol_fiche_head($head, 'journal');
+
+    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">';
+    foreach($moreparam as $key => $value)
+    {
+        print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+    }
+    print '<table width="100%" class="border">';
+
+    // Ligne de titre
+    print '<tr>';
+    print '<td width="110">'.$langs->trans("Name").'</td>';
+    if (! $variantexxx) print '<td colspan="3">';
+    else print '<td>';
+    print $nom;
+    if ($variantexxx) print '</td><td colspan="2">'.$variantexxx;
+    print '</td>';
+    print '</tr>';
+
+    // Calculation mode
+    if ($calcmode)
+    {
+        print '<tr>';
+        print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
+        if (! $variante) print '<td colspan="3">';
+        else print '<td>';
+        print $calcmode;
+        if ($variante) print '</td><td colspan="2">'.$variante;
+        print '</td>';
+        print '</tr>';
+    }
+
+    // Ligne de la periode d'analyse du rapport
+    print '<tr>';
+    print '<td>'.$langs->trans("ReportPeriod").'</td>';
+    if (! $periodlink) print '<td colspan="3">';
+    else print '<td>';
+    if ($period) print $period;
+    if ($periodlink) print '</td><td colspan="2">'.$periodlink;
+    print '</td>';
+    print '</tr>';
+
+    // Ligne de description
+    print '<tr>';
+    print '<td>'.$langs->trans("ReportDescription").'</td>';
+    print '<td colspan="3">'.$description.'</td>';
+    print '</tr>';
+
+    print '</table>';
+
+    print '<br><div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';
+
+    print '</form>';
+
+    dol_fiche_end();
+
+    print "\n<!-- fin cartouche journal -->\n\n";
+}
+
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0d54593f0db..2620a3b3efc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3328,7 +3328,7 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
 
 	$return.= "\n";
 	$return.= '<table '.($id?'id="'.$id.'" ':'').'summary="" class="centpercent notopnoleftnoright'.($morecssontable?' '.$morecssontable:'').'" style="margin-bottom: 2px;"><tr>';
-	if ($picto) $return.= '<td class="nobordernopadding widthpictotitle" valign="middle">'.img_picto('',$picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
+	if ($picto) $return.= '<td class="nobordernopadding widthpictotitle" valign="middle">'.img_picto('',$picto, 'class="valignmiddle" id="pictotitle"', $pictoisfullpath).'</td>';
 	$return.= '<td class="nobordernopadding" valign="middle">';
 	$return.= '<div class="titre">'.$titre.'</div>';
 	$return.= '</td>';

From 8ec44615cdd4b328e36aae62c47f4dae5bf97986 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 14:54:21 +0200
Subject: [PATCH 0660/1163] FIX serious bugs in accounting (error management,
 transactions, bad values set)

---
 htdocs/core/lib/report.lib.php      | 28 ++++++++++++++--------------
 htdocs/langs/en_US/accountancy.lang |  4 ++--
 htdocs/langs/en_US/errors.lang      |  3 ++-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index f58aa180d88..2c13485d0e9 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -24,20 +24,20 @@
 
 
 /**
-*	Show header of a VAT report
-*
-*	@param	string				$nom            Name of report
-*	@param 	string				$variante       Link for alternate report
-*	@param 	string				$period         Period of report
-*	@param 	string				$periodlink     Link to switch period
-*	@param 	string				$description    Description
-*	@param 	timestamp|integer	$builddate      Date generation
-*	@param 	string				$exportlink     Link for export or ''
-*	@param	array				$moreparam		Array with list of params to add into form
-*	@param	string				$calcmode		Calculation mode
-*   @param  string              $varlink        Add a variable into the address of the page
-*	@return	void
-*/
+ *	Show header of a VAT report
+ *
+ *	@param	string				$nom            Name of report
+ *	@param 	string				$variante       Link for alternate report
+ *	@param 	string				$period         Period of report
+ *	@param 	string				$periodlink     Link to switch period
+ *	@param 	string				$description    Description
+ *	@param 	timestamp|integer	$builddate      Date generation
+ *	@param 	string				$exportlink     Link for export or ''
+ *	@param	array				$moreparam		Array with list of params to add into form
+ *	@param	string				$calcmode		Calculation mode
+ *   @param  string              $varlink        Add a variable into the address of the page
+ *	@return	void
+ */
 function report_header($nom,$variante,$period,$periodlink,$description,$builddate,$exportlink='',$moreparam=array(),$calcmode='', $varlink='')
 {
 	global $langs;
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 57f220f943c..bd1e41c5464 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -189,8 +189,8 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the general ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
-NoNewRecordSaved=No new record saved
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
+NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
 
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 8aeb8dab65c..4f700109c33 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -177,7 +177,8 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s t
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
 ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source bank line %s
+ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.

From 983c72c91874e07ac232862d59e4505db330c337 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 14:55:23 +0200
Subject: [PATCH 0661/1163] Look and feel v6

---
 htdocs/user/param_ihm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 473c06e7368..9ffeb05f280 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -181,7 +181,7 @@ if ($action == 'edit')
 
 if ($action == 'edit')
 {
-    dol_fiche_head($head, 'guisetup', $title, 0, 'user');
+    dol_fiche_head($head, 'guisetup', $title, -1, 'user');
 
 	$linkback = '';
 

From afc5ab024205f128961a4da70b4e8f8b8a257dd0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 15:10:24 +0200
Subject: [PATCH 0662/1163] Fix label

---
 htdocs/core/lib/accounting.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index dc112cc4e33..b7ceaa0982e 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -232,7 +232,7 @@ function journalHead($nom,$variante,$period,$periodlink,$description,$builddate,
 
     $h=0;
     $head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
-    $head[$h][1] = $langs->trans("Journal");
+    $head[$h][1] = $langs->trans("Journalization");
     $head[$h][2] = 'journal';
 
     dol_fiche_head($head, 'journal');

From ff0f40ab3709dca11dadda28536299583a460785 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 16:07:34 +0200
Subject: [PATCH 0663/1163] Look and feel v6

---
 htdocs/accountancy/bookkeeping/card.php       |  8 +++-
 htdocs/accountancy/bookkeeping/list.php       |  4 +-
 .../accountancy/bookkeeping/listbyaccount.php | 48 ++++++++++---------
 htdocs/theme/eldy/style.css.php               |  4 ++
 htdocs/theme/md/style.css.php                 |  3 ++
 5 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 116e071e42f..ce0bd4d3aa2 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -305,6 +305,8 @@ if ($action == 'create') {
 
 		dol_fiche_head();
 		
+		print '<div class="fichecenter">';
+		
 		print '<table class="border" width="100%">';
 		print '<tr class="pair">';
 		print '<td class="titlefield">' . $langs->trans("NumMvts") . '</td>';
@@ -328,6 +330,8 @@ if ($action == 'create') {
 		print '</tr>';
 		print '</table>';
 		
+		print '</div>';
+		
 		dol_fiche_end();
 
 		print '<br>';
@@ -427,8 +431,8 @@ if ($action == 'create') {
 					print $formventilation->select_auxaccount($code_tiers, 'code_tiers', 1);
 					print '</td>';
 					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
-					print '<td align="right"><input type="text" size="6" name="debit" value="' . price($debit) . '"/></td>';
-					print '<td align="right"><input type="text" size="6" name="credit" value="' . price($credit) . '"/></td>';
+					print '<td align="right"><input type="text" class="right maxwidth50" name="debit" value="' . price($debit) . '"/></td>';
+					print '<td align="right"><input type="text" class="right maxwidth50" name="credit" value="' . price($credit) . '"/></td>';
 					print '<td></td>';
 					print '<td></td>';
 					print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Add") . '"></td>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 9cd649ce4be..75d0a63bf39 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -360,7 +360,7 @@ if (count($filter)) $button.= $langs->trans("ExportFilteredList");
 else $button.= $langs->trans("ExportList");
 $button.= '</a>';
 
-$groupby = ' <a href="./listbyaccount.php">' . $langs->trans("GroupByAccountAccounting") . '</a>';
+$groupby = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php"">' . $langs->trans("GroupByAccountAccounting") . '</a>';
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, $groupby, '', $limit);
 
@@ -437,7 +437,7 @@ foreach ($object->lines as $line ) {
 
 	print '<td><a href="./card.php?piece_num=' . $line->piece_num . '">' . $line->piece_num . '</a></td>';
 	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
-	print '<td>' . $line->doc_ref . '</td>';
+	print '<td class="nowrap">' . $line->doc_ref . '</td>';
 	print '<td>' . length_accountg($line->numero_compte) . '</td>';
 	print '<td>' . length_accounta($line->code_tiers) . '</td>';
 	print '<td>' . $line->label_compte . '</td>';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index cbb83ba269e..2323f3afcb8 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -207,7 +207,7 @@ if ($action == 'delbookkeepingyear') {
 
 print '<form method="GET" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
 
-$viewflat = ' <a href="./list.php">' . $langs->trans("ViewFlatList") . '</a>';
+$viewflat = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php">' . $langs->trans("ViewFlatList") . '</a>';
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords,'title_accountancy',0,$viewflat,'',$limit);
 
@@ -222,17 +222,6 @@ print '<div class="inline-block divButAction"><a class="butAction" href="./card.
 print '</div>';
 
 print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>' . $langs->trans("AccountAccounting") . '</td>';
-print_liste_field_titre($langs->trans("TransactionNumShort"), $_SERVER['PHP_SELF'], "t.piece_num", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $options, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $options, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("SuppliersInvoices") . ' / ' . $langs->trans("CustomersInvoices"));
-print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
-print "</tr>\n";
 
 print '<tr class="liste_titre">';
 print '<td class="liste_titre">' . $object->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '') . '</td>';
@@ -254,6 +243,18 @@ $searchpitco=$form->showFilterAndCheckAddButtons(0);
 print $searchpitco;
 print '</td>';
 
+print '<tr class="liste_titre">';
+print_liste_field_titre($langs->trans("AccountAccountingShort"), $_SERVER['PHP_SELF']);
+print_liste_field_titre($langs->trans("TransactionNumShort"), $_SERVER['PHP_SELF'], "t.piece_num", "", $options, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $options, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Label"));
+print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
+print "</tr>\n";
+
 print '</tr>';
 
 $var = True;
@@ -277,9 +278,10 @@ foreach ( $object->lines as $line ) {
         
         // Affiche un Sous-Total par compte comptable
         if (isset($displayed_account_number)) {
-          print '<tr class="liste_total"><td align="right" colspan="4">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
-          print "<td>&nbsp;</td>\n";
-          print '</tr>';
+            print '<tr class="liste_total"><td align="right" colspan="5">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
+            print "<td>&nbsp;</td>\n";
+            print "<td>&nbsp;</td>\n";
+            print '</tr>';
         }
         
         // Show the break account
@@ -299,17 +301,18 @@ foreach ( $object->lines as $line ) {
 
 	print '<tr class="oddeven">';
 	print '<td>&nbsp;</td>';
-	print '<td align="right">'.$line->piece_num.'</td>';
+	print '<td align="right"><a href="./card.php?piece_num=' . $line->piece_num . '">'.$line->piece_num.'</a></td>';
 	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
-	print '<td><a href="./card.php?piece_num=' . $line->piece_num . '">' . $line->doc_ref . '</a></td>';
+	
+	// TODO Add a link according to doc_type and fk_doc
+	print '<td class="nowrap">';
+    //if ($line->doc_type == 'supplier_invoice')
+    //if ($line->doc_type == 'customer_invoice')
+	print $line->doc_ref;
+    print '</td>';
     
     // Affiche un lien vers la facture client/fournisseur
     $doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-    if ($line->doc_type == 'supplier_invoice')
-     print strlen(length_accounta($line->code_tiers)) == 0 ? '<td><a href="/fourn/facture/list.php?search_ref_supplier=' . $doc_ref . '">' . $line->label_compte . '</a></td>' : '<td><a href="/fourn/facture/list.php?search_ref_supplier=' . $doc_ref . '">' . $line->label_compte . '</a><br /><span style="font-size:0.8em">(' . length_accounta($line->code_tiers) . ')</span></td>';
-    elseif ($line->doc_type == 'customer_invoice')
-    print strlen(length_accounta($line->code_tiers)) == 0 ? '<td><a href="/compta/facture/list.php?search_ref=' . $doc_ref . '">' . $line->label_compte . '</a></td>' : '<td><a href="/compta/facture/list.php?search_ref=' . $doc_ref . '">' . $line->label_compte . '</a><br /><span style="font-size:0.8em">(' . length_accounta($line->code_tiers) . ')</span></td>';
-    else
     print strlen(length_accounta($line->code_tiers)) == 0 ? '<td>' . $line->label_compte . '</td>' : '<td>' . $line->label_compte . '<br /><span style="font-size:0.8em">(' . length_accounta($line->code_tiers) . ')</span></td>';
 
 
@@ -332,6 +335,7 @@ foreach ( $object->lines as $line ) {
 print '<tr class="liste_total">';
 print '<td align="right" colspan="5">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
 print "<td>&nbsp;</td>\n";
+print "<td>&nbsp;</td>\n";
 print '</tr>';
 
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4d711599992..41744ae0037 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2494,6 +2494,10 @@ div.pagination li.pagination .active {
   text-decoration: underline;
   box-shadow: none;
 }
+.paginationafterarrows .nohover {
+  box-shadow: none !important;
+}
+
 div.pagination li.paginationafterarrows {
 	margin-left: 10px;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index d38391504fa..53e3ec0154c 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2564,6 +2564,9 @@ div.pagination li.pagination .active {
   text-decoration: underline;
   box-shadow: none;
 }
+.paginationafterarrows .nohover {
+  box-shadow: none !important;
+}
 div.pagination li.paginationafterarrows {
 	margin-left: 10px;
 }

From a8c775dcbda7b8d3c20d12d883d874e24d73c4e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 18:30:36 +0200
Subject: [PATCH 0664/1163] Fix compatibility with the removal of "constant".

---
 htdocs/admin/syslog.php                       | 19 ++++++++++++------
 htdocs/core/boxes/box_external_rss.php        |  7 +++++--
 htdocs/core/class/conf.class.php              |  2 +-
 htdocs/core/lib/files.lib.php                 |  6 +++---
 htdocs/core/lib/functions.lib.php             |  4 ++--
 htdocs/core/lib/security2.lib.php             |  4 ++--
 .../modules/syslog/mod_syslog_chromephp.php   |  4 ++--
 .../core/modules/syslog/mod_syslog_file.php   |  3 ++-
 .../modules/syslog/mod_syslog_firephp.php     |  4 ++--
 .../core/modules/syslog/mod_syslog_syslog.php |  8 +++++---
 htdocs/ftp/admin/ftpclient.php                | 20 ++++++++++++-------
 htdocs/main.inc.php                           |  2 +-
 12 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 71d06ae8e64..e3ad8a3616c 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -40,7 +40,7 @@ $action = GETPOST("action");
 $syslogModules = array();
 $activeModules = array();
 
-if (defined('SYSLOG_HANDLERS')) $activeModules = json_decode(constant('SYSLOG_HANDLERS'));
+if (! empty($conf->global->SYSLOG_HANDLERS)) $activeModules = json_decode($conf->global->SYSLOG_HANDLERS);
 
 $dirsyslogs = array_merge(array('/core/modules/syslog/'), $conf->modules_parts['syslog']);
 foreach ($dirsyslogs as $reldir) {
@@ -88,7 +88,8 @@ if ($action == 'set')
 
 	$newActiveModules = array();
 	$selectedModules = (isset($_POST['SYSLOG_HANDLERS']) ? $_POST['SYSLOG_HANDLERS'] : array());
-	//var_dump($selectedModules);
+	
+	// Save options of handler
 	foreach ($syslogModules as $syslogHandler)
 	{
 		if (in_array($syslogHandler, $syslogModules))
@@ -101,7 +102,7 @@ if ($action == 'set')
 				if (isset($_POST[$option['constant']]))
 				{
 					$_POST[$option['constant']] = trim($_POST[$option['constant']]);
-					dolibarr_del_const($db, $option['constant'], 0);
+					dolibarr_del_const($db, $option['constant'], -1);
 					dolibarr_set_const($db, $option['constant'], $_POST[$option['constant']], 'chaine',0, '', 0);
 				}
 			}
@@ -109,7 +110,9 @@ if ($action == 'set')
 	}
 
 	$activeModules = $newActiveModules;
-	dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine',0,'',0);
+
+    dolibarr_del_const($db, 'SYSLOG_HANDLERS', -1);  // To be sure ther is not a setup into another entity	
+    dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine',0,'',0);
 
 	// Check configuration
 	foreach ($activeModules as $modulename) {
@@ -217,8 +220,12 @@ foreach ($syslogModules as $moduleName)
 	{
 		foreach ($setuparray as $option)
 		{
-			if (isset($_POST[$option['constant']])) $value=$_POST[$option['constant']];
-			else if (defined($option['constant'])) $value = constant($option['constant']);
+		    $tmpoption=$option['constant'];
+		    if (! empty($tmpoption))
+		    {
+    			if (isset($_POST[$tmpoption])) $value=$_POST[$tmpoption];
+    			else if (! empty($conf->global->$tmpoption)) $value = $conf->global->$tmpoption;
+		    }
 			else $value = (isset($option['default']) ? $option['default'] : '');
 
 			print $option['name'].': <input type="text" class="flat" name="'.$option['constant'].'" value="'.$value.'"'.(isset($option['attr']) ? ' '.$option['attr'] : '').'>';
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index 71b643665b3..14e542ff101 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -80,8 +80,11 @@ class box_external_rss extends ModeleBoxes
 		// documents/externalrss is created by module activation
 		// documents/externalrss/tmp is created by rssparser
 
+		$keyforparamurl="EXTERNAL_RSS_URLRSS_".$site;
+		$keyforparamtitle="EXTERNAL_RSS_TITLE_".$site;
+		
 		// Get RSS feed
-        $url=@constant("EXTERNAL_RSS_URLRSS_".$site);
+		$url=$conf->global->$keyforparamurl;
 
         $rssparser=new RssParser($this->db);
 		$result = $rssparser->parser($url, $this->max, $cachedelay, $conf->externalrss->dir_temp);
@@ -90,7 +93,7 @@ class box_external_rss extends ModeleBoxes
 		$description=$rssparser->getDescription();
 		$link=$rssparser->getLink();
 
-        $title=$langs->trans("BoxTitleLastRssInfos",$max, @constant("EXTERNAL_RSS_TITLE_". $site));
+        $title=$langs->trans("BoxTitleLastRssInfos", $max, $conf->global->$keyforparamtitle);
         if ($result < 0 || ! empty($rssparser->error))
         {
             // Show warning
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 9446020e3ff..6bca5b7d5a4 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -210,7 +210,7 @@ class Conf
                 $file=dol_sanitizeFileName($file);
                 include_once DOL_DOCUMENT_ROOT . "/".$file."/".$file."_consts.php";
                 foreach ($file2bddconsts as $key=>$value) {
-                    $this->global->$key=constant($value);
+                    $this->global->$key=$value;
                 }
             }
         }
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 77da09b3d64..cbf4af402ae 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1495,10 +1495,10 @@ function dol_uncompress($inputfile,$outputdir)
 {
     global $conf, $langs;
 
-    if (defined('ODTPHP_PATHTOPCLZIP'))
+    if (! empty($conf->global->ODTPHP_PATHTOPCLZIP))
     {
-    	dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".constant('ODTPHP_PATHTOPCLZIP').", so we use Pclzip to unzip into ".$outputdir);
-        include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
+    	dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".$conf->global->ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
+        include_once $conf->global->ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
         $archive = new PclZip($inputfile);
         $result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
         //var_dump($result);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2620a3b3efc..857ddc6eec2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3570,14 +3570,14 @@ function vatrate($rate, $addpercent=false, $info_bits=0, $usestarfornpr=0)
 	    $morelabel=' ('.$reg[1].')';
 	    $rate=preg_replace('/\s*'.preg_quote($morelabel,'/').'/','',$rate);
 	}
-	if (preg_match('/\*/',$rate) || preg_match('/'.constant('MAIN_LABEL_MENTION_NPR').'/i',$rate))
+	if (preg_match('/\*/',$rate))
 	{
 		$rate=str_replace('*','',$rate);
 		$info_bits |= 1;
 	}
 
 	$ret=price($rate,0,'',0,0).($addpercent?'%':'');
-	if ($info_bits & 1) $ret.=' '.($usestarfornpr?'*':constant('MAIN_LABEL_MENTION_NPR'));
+	if ($info_bits & 1) $ret.=' *';
 	$ret.=$morelabel;
 	return $ret;
 }
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index cadf133169d..5139128a5d8 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -150,9 +150,9 @@ function dol_loginfunction($langs,$conf,$mysoc)
 
 	// Title
 	$appli=constant('DOL_APPLICATION_TITLE');
-	$title=$appli.' '.DOL_VERSION;
+	$title=$appli.' '.constant('DOL_VERSION');
 	if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
-	$titletruedolibarrversion=DOL_VERSION;	// $title used by login template after the @ to inform of true Dolibarr version
+	$titletruedolibarrversion=constant('DOL_VERSION');	// $title used by login template after the @ to inform of true Dolibarr version
 
 	// Note: $conf->css looks like '/theme/eldy/style.css.php'
 	$conf->css = "/theme/".(GETPOST('theme')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
diff --git a/htdocs/core/modules/syslog/mod_syslog_chromephp.php b/htdocs/core/modules/syslog/mod_syslog_chromephp.php
index 42a660ab0ae..a9b9ccd5836 100644
--- a/htdocs/core/modules/syslog/mod_syslog_chromephp.php
+++ b/htdocs/core/modules/syslog/mod_syslog_chromephp.php
@@ -48,7 +48,7 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
 	{
 		global $langs;
 
-		return $this->isActive()?'':$langs->trans('ClassNotFoundIntoPathWarning','ChromePhp.class.php');
+		return ($this->isActive() == 1)?'':$langs->trans('ClassNotFoundIntoPathWarning','ChromePhp.class.php');
 	}
 	
 	/**
@@ -73,7 +73,7 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
 
 		    if ($res)
 		    {
-		        return 1;
+        		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP to 1 to disable this loghandler
 		    }
 		    else
 		    {
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 195cab19f7f..68493fd4eb4 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -51,7 +51,8 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	 */
 	public function isActive()
 	{
-		return 1;
+	    global $conf;
+		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_FILE)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_FILE to 1 to disable this loghandler
 	}
 
 	/**
diff --git a/htdocs/core/modules/syslog/mod_syslog_firephp.php b/htdocs/core/modules/syslog/mod_syslog_firephp.php
index fa6111c80a3..69bc98230af 100644
--- a/htdocs/core/modules/syslog/mod_syslog_firephp.php
+++ b/htdocs/core/modules/syslog/mod_syslog_firephp.php
@@ -56,7 +56,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface
 	{
 		global $langs;
 
-		return $this->isActive()?'':$langs->trans('ClassNotFoundIntoPathWarning', self::$firephp_class_path);
+		return ($this->isActive() == 1)?'':$langs->trans('ClassNotFoundIntoPathWarning', self::$firephp_class_path);
 	}
 
 	/**
@@ -76,7 +76,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface
 			$res = @include_once self::$firephp_class_path;
 			restore_include_path();
 			if ($res) {
-				return 1;
+        		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_FIREPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_FIREPHP to 1 to disable this loghandler
 			} else {
 				return 0;
 			}
diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php
index c2885f1c89a..e0283ac9a9f 100644
--- a/htdocs/core/modules/syslog/mod_syslog_syslog.php
+++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php
@@ -48,10 +48,12 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 	 */
 	public function isActive()
 	{
+	    global $conf;
+	    
 		// This function does not exists on some ISP (Ex: Free in France)
 		if (!function_exists('openlog')) return 0;
 
-		return 1;
+		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
 	}
 
 	/**
@@ -111,11 +113,11 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 
 		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return;	// Global option to disable output of this handler
 
-		if (! empty($conf->global->SYSLOG_FACILITY))
+		if (! empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
 		{
 			$facility = constant($conf->global->SYSLOG_FACILITY);
 		}
-		else $facility = LOG_USER;
+		else $facility = constant('LOG_USER');
 
 		// (int) is required to avoid error parameter 3 expected to be long
 		openlog('dolibarr', LOG_PID | LOG_PERROR, (int) $facility);
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 158d9fed3da..845760c26b7 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -247,40 +247,46 @@ else
 			print '<td></td>';
 			print "</tr>";
 
-			
+			$keyforname="FTP_NAME_" . $idrss;
+			$keyforserver="FTP_SERVER_" . $idrss;
+			$keyforport="FTP_PORT_" . $idrss;
+			$keyforuser="FTP_USER_" . $idrss;
+			$keyforpassword="FTP_PASSWORD_" . $idrss;
+			$keyforpassive="FTP_PASSIVE_" . $idrss;
+				
 			print '<tr class="oddeven">';
 			print "<td>".$langs->trans("Name")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_NAME_" . $idrss . "\" value=\"" . @constant("FTP_NAME_" . $idrss) . "\" size=\"64\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_NAME_" . $idrss . "\" value=\"" . $conf->global->$keyforname . "\" size=\"64\"></td>";
 			print "</tr>";
 
 			
 			print '<tr class="oddeven">';
 			print "<td>".$langs->trans("Server")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_SERVER_" . $idrss . "\" value=\"" . @constant("FTP_SERVER_" . $idrss) . "\" size=\"64\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_SERVER_" . $idrss . "\" value=\"" . $conf->global->$keyforserver . "\" size=\"64\"></td>";
 			print "</tr>";
 
 			
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("Port")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_PORT_" . $idrss . "\" value=\"" . @constant("FTP_PORT_" . $idrss) . "\" size=\"64\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_PORT_" . $idrss . "\" value=\"" . $conf->global->$keyforport . "\" size=\"64\"></td>";
 			print "</tr>";
 
 			
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("User")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_USER_" . $idrss . "\" value=\"" . @constant("FTP_USER_" . $idrss) . "\" size=\"24\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_USER_" . $idrss . "\" value=\"" . $conf->global->$keyforuser . "\" size=\"24\"></td>";
 			print "</tr>";
 
 			
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("Password")."</td>";
-			print "<td><input type=\"password\" class=\"flat\" name=\"FTP_PASSWORD_" . $idrss . "\" value=\"" . @constant("FTP_PASSWORD_" . $idrss) . "\" size=\"24\"></td>";
+			print "<td><input type=\"password\" class=\"flat\" name=\"FTP_PASSWORD_" . $idrss . "\" value=\"" . $conf->global->$keyforpassword . "\" size=\"24\"></td>";
 			print "</tr>";
 
 			
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("FTPPassiveMode")."</td>";
-			print '<td>'.$form->selectyesno('FTP_PASSIVE_'.$idrss, @constant("FTP_PASSIVE_" . $idrss), 1).'</td>';
+			print '<td>'.$form->selectyesno('FTP_PASSIVE_'.$idrss, $conf->global->$keyforpassive, 1).'</td>';
 			print "</tr>";
 
 			print "<tr>";
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 72a5f39e02c..6a92e0f4eed 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1865,7 +1865,7 @@ if (! function_exists("llxFooter"))
         dol_htmloutput_events();
 
         // Core error message
-        if (defined("MAIN_CORE_ERROR") && constant("MAIN_CORE_ERROR") == 1)
+        if (! empty($conf->global->MAIN_CORE_ERROR))
         {
             // Ajax version
             if ($conf->use_javascript_ajax)

From 92b5f8d85e7ebd5dfacd05177bf59dd92913c21e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Apr 2017 21:53:01 +0200
Subject: [PATCH 0665/1163] Move new feature inventory into module stock.

---
 htdocs/core/class/coreobject.class.php        |   4 +-
 htdocs/core/menus/standard/eldy.lib.php       |   9 +
 htdocs/core/modules/modInventory.class.php    | 316 ------------------
 htdocs/core/modules/modStock.class.php        |  84 +++++
 htdocs/langs/en_US/inventory.lang             |  54 ---
 htdocs/langs/en_US/stocks.lang                |  49 +++
 .../inventory/ajax/ajax.inventory.php         |   4 +-
 .../inventory/card.php}                       |  52 +--
 .../inventory/class/inventory.class.php       |   4 +-
 .../{ => product}/inventory/img/bt-save.png   | Bin
 .../{ => product}/inventory/img/inventory.png | Bin
 htdocs/{ => product}/inventory/img/plus.png   | Bin
 htdocs/{ => product}/inventory/img/plus16.png | Bin
 .../inventory/lib/inventory.lib.php           |   6 +-
 htdocs/{ => product}/inventory/list.php       |  12 +-
 .../inventory/tpl/inventory.tpl.php           |   4 +-
 16 files changed, 185 insertions(+), 413 deletions(-)
 delete mode 100644 htdocs/core/modules/modInventory.class.php
 delete mode 100644 htdocs/langs/en_US/inventory.lang
 rename htdocs/{ => product}/inventory/ajax/ajax.inventory.php (86%)
 rename htdocs/{inventory/inventory.php => product/inventory/card.php} (90%)
 rename htdocs/{ => product}/inventory/class/inventory.class.php (98%)
 rename htdocs/{ => product}/inventory/img/bt-save.png (100%)
 rename htdocs/{ => product}/inventory/img/inventory.png (100%)
 rename htdocs/{ => product}/inventory/img/plus.png (100%)
 rename htdocs/{ => product}/inventory/img/plus16.png (100%)
 rename htdocs/{ => product}/inventory/lib/inventory.lib.php (92%)
 rename htdocs/{ => product}/inventory/list.php (91%)
 rename htdocs/{ => product}/inventory/tpl/inventory.tpl.php (98%)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 396caf029cc..384374b1893 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *	\file       htdocs/core/class/coreobject.inventory.php
+ *	\file       htdocs/core/class/coreobject.class.php
  *	\ingroup    core
  *	\brief      File of class to manage all object. Might be replace or merge into commonobject
  */
@@ -663,7 +663,7 @@ class CoreObject extends CommonObject
 			}
 			else
             {
-				$this->{$key} = @stripslashes($value);
+				$this->{$key} = $value;
 			}
 		}
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 360a93cf61b..10d1e53475b 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1252,6 +1252,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
                 if ($conf->supplier_order->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
 			}
 
+			// Inventory
+			if (! empty($conf->stock->enabled))
+			{
+				$langs->load("stocks");
+				$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
+				$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
+				$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
+			}
+			
 			// Expeditions
 			if (! empty($conf->expedition->enabled))
 			{
diff --git a/htdocs/core/modules/modInventory.class.php b/htdocs/core/modules/modInventory.class.php
deleted file mode 100644
index 11b4c992e6a..00000000000
--- a/htdocs/core/modules/modInventory.class.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * 	\defgroup   inventory     Module inventory
- *  \brief      Example of a module descriptor.
- *				Such a file must be copied into htdocs/inventory/core/modules directory.
- *  \file       htdocs/inventory/core/modules/modinventory.class.php
- *  \ingroup    inventory
- *  \brief      Description and activation file for module inventory
- */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
-
-
-/**
- *  Description and activation class for module inventory
- */
-class modinventory extends DolibarrModules
-{
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-        global $langs,$conf;
-
-        $this->db = $db;
-
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 104420; // 104000 to 104999 for ATM CONSULTING
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'inventory';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
-		$this->family = "products";
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Description of module inventory";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-		$this->special = 0;
-		// Name of image file used for this module.
-		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='inventory';
-
-		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-		// for default path (eg: /inventory/core/xxxxx) (0=disable, 1=enable)
-		// for specific path of parts (eg: /inventory/core/modules/barcode)
-		// for specific css file (eg: /inventory/css/inventory.css.php)
-		//$this->module_parts = array(
-		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
-		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
-		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
-		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
-		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
-		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
-		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
-		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
-		//							'css' => array('/inventory/css/inventory.css.php'),	// Set this to relative path of css file if module has its own css file
-	 	//							'js' => array('/inventory/js/inventory.js'),          // Set this to relative path of js file if module must load a js on all pages
-		//							'hooks' => array('hookcontext1','hookcontext2')  	// Set here all hooks context managed by module
-		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
-		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@inventory')) // Set here all workflow context managed by module
-		//                        );
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/inventory/temp");
-		$this->dirs = array();
-
-		// Config pages. Put here list of php page, stored into inventory/admin directory, to use to setup module.
-		$this->config_page_url = array("inventory.php");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array('modStock');		// List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of modules id to disable if this one is disabled
-		$this->conflictwith = array();	// List of modules id this module is in conflict with
-		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("inventory");
-
-		// Constants
-		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array();
-
-		// Array to add new pages in new tabs
-		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@inventory:$user->rights->inventory->read:/inventory/mynewtab1.php?id=__ID__',  	// To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:Title2:mylangfile@inventory:$user->rights->othermodule->read:/inventory/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2
-        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     						// To remove an existing tab identified by code tabname
-		// where objecttype can be
-		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-		// 'contact'          to add a tab in contact view
-		// 'contract'         to add a tab in contract view
-		// 'group'            to add a tab in group view
-		// 'intervention'     to add a tab in intervention view
-		// 'invoice'          to add a tab in customer invoice view
-		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
-		// 'opensurveypoll'	  to add a tab in opensurvey poll view
-		// 'order'            to add a tab in customer order view
-		// 'order_supplier'   to add a tab in supplier order view
-		// 'payment'		  to add a tab in payment view
-		// 'payment_supplier' to add a tab in supplier payment view
-		// 'product'          to add a tab in product view
-		// 'propal'           to add a tab in propal view
-		// 'project'          to add a tab in project view
-		// 'stock'            to add a tab in stock view
-		// 'thirdparty'       to add a tab in third party view
-		// 'user'             to add a tab in user view
-        $this->tabs = array();
-
-        // Dictionaries
-	    if (! isset($conf->inventory->enabled))
-        {
-        	$conf->inventory=new stdClass();
-        	$conf->inventory->enabled=0;
-        }
-		$this->dictionaries=array();
-        /* Example:
-        if (! isset($conf->inventory->enabled)) $conf->inventory->enabled=0;	// This is to avoid warnings
-        $this->dictionaries=array(
-            'langs'=>'mylangfile@inventory',
-            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->inventory->enabled,$conf->inventory->enabled,$conf->inventory->enabled)												// Condition to show each dictionary
-        );
-        */
-
-        // Boxes
-		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array();			// List of boxes
-		// Example:
-		//$this->boxes=array(array(0=>array('file'=>'myboxa.php','note'=>'','enabledbydefaulton'=>'Home'),1=>array('file'=>'myboxb.php','note'=>''),2=>array('file'=>'myboxc.php','note'=>'')););
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		// $this->rights[$r][1] = 'Permision label';	// Permission label
-		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $r++;
-		
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'inventoryReadPermission';	// Permission label
-		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-		
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'inventoryCreatePermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-	
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'inventoryWritePermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-		
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'inventoryValidatePermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'inventoryChangePMPPermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
-
-
-        $this->menu[$r]=array(
-            'fk_menu'=>'fk_mainmenu=products',			                // Put 0 if this is a top menu
-            'type'=>'left',			                // This is a Top menu entry
-            'titre'=>'Inventory',
-            'mainmenu'=>'products',
-            'leftmenu'=>'inventory_left',
-            'url'=>'/inventory/list.php',
-            'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-            'position'=>100+$r,
-            'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-            'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-            'target'=>'',
-            'user'=>2
-        );				                // 0=Menu for internal users, 1=external users, 2=both
-        $r++;
-		
-		$this->menu[$r]=array(
-		    'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
-            'type'=>'left',			                // This is a Top menu entry
-            'titre'=>'NewInventory',
-            'mainmenu'=>'products',
-            'leftmenu'=>'inventory_left_create',
-            'url'=>'/inventory/inventory.php?action=create',
-            'position'=>100+$r,
-            'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-            'perms'=>'$user->rights->inventory->create',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-            'target'=>'',
-            'user'=>2
-        );				                // 0=Menu for internal users, 1=external users, 2=both
-		$r++;
-
-        $this->menu[$r]=array(
-            'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
-            'type'=>'left',			                // This is a Top menu entry
-            'titre'=>'ListInventory',
-            'mainmenu'=>'products',
-            'leftmenu'=>'inventory_left_list',
-            'url'=>'/inventory/list.php',
-            'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-            'position'=>100+$r,
-            'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-            'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-            'target'=>'',
-            'user'=>2
-        );				                // 0=Menu for internal users, 1=external users, 2=both
-        $r++;
-
-		// Exports
-		$r=1;
-
-		// Example:
-		// $this->export_code[$r]=$this->rights_class.'_'.$r;
-		// $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
-		// $this->export_permission[$r]=array(array("facture","facture","export"));
-		// $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef');
-		// $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product');
-		// $this->export_sql_start[$r]='SELECT DISTINCT ';
-		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
-		// $r++;
-	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		$sql = array();
-		define('INC_FROM_DOLIBARR', true);
-		dol_include_once('/inventory/config.php');
-		dol_include_once("/inventory/script/create-maj-base.php");
-		
-		return $this->_init($sql, $options);
-	}
-
-	/**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function remove($options='')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
-
-}
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 8fe4eb52abe..cfdc6db298c 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -117,6 +117,90 @@ class modStock extends DolibarrModules
 		$this->rights[4][4] = 'mouvement';
 		$this->rights[4][5] = 'creer';
 
+		/*
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryReadPermission';	// Permission label
+		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+		
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryCreatePermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+		
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryWritePermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+		
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryValidatePermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+		
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'inventoryChangePMPPermission';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
+		*/
+		
+		// Main menu entries
+		$this->menu = array();			// List of menus to add
+		$r=0;
+		
+		/*
+		$this->menu[$r]=array(
+		    'fk_menu'=>'fk_mainmenu=products',			                // Put 0 if this is a top menu
+		    'type'=>'left',			                // This is a Top menu entry
+		    'titre'=>'Inventory',
+		    'mainmenu'=>'products',
+		    'leftmenu'=>'inventory_left',
+		    'url'=>'/inventory/list.php',
+		    'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		    'position'=>100+$r,
+		    'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+		    'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+		    'target'=>'',
+		    'user'=>2
+		);				                // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
+		
+		$this->menu[$r]=array(
+		    'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
+		    'type'=>'left',			                // This is a Top menu entry
+		    'titre'=>'NewInventory',
+		    'mainmenu'=>'products',
+		    'leftmenu'=>'inventory_left_create',
+		    'url'=>'/inventory/inventory.php?action=create',
+		    'position'=>100+$r,
+		    'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+		    'perms'=>'$user->rights->inventory->create',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+		    'target'=>'',
+		    'user'=>2
+		);				                // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
+		
+		$this->menu[$r]=array(
+		    'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
+		    'type'=>'left',			                // This is a Top menu entry
+		    'titre'=>'ListInventory',
+		    'mainmenu'=>'products',
+		    'leftmenu'=>'inventory_left_list',
+		    'url'=>'/inventory/list.php',
+		    'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		    'position'=>100+$r,
+		    'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
+		    'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
+		    'target'=>'',
+		    'user'=>2
+		);				                // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
+		*/
 		
 		// Menus
 		//-------
diff --git a/htdocs/langs/en_US/inventory.lang b/htdocs/langs/en_US/inventory.lang
deleted file mode 100644
index db92cb9a14a..00000000000
--- a/htdocs/langs/en_US/inventory.lang
+++ /dev/null
@@ -1,54 +0,0 @@
-# Dolibarr language file - Source file is en_US - inventory
-
-Module104420Name = Inventory
-Module104420Desc = Create and manage your inventory
-
-inventorySetup = Inventory Setup
-
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-
-inventoryTitle=Inventory
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
-inventoryEdit=Edit
-inventoryValidate=Validated
-inventoryDraft=Running
-inventorySelectWarehouse=Warehouse choice
-inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
-SelectCategory=Category filter
-SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory 
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock mouvment have date of inventory
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
-AddProduct=Add
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
-inventoryDeleteLine=Delete line
-RegulateStock=Regulate Stock
-ListInventory=List
-NewInventory=New inventory
\ No newline at end of file
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index aeb83b925bd..943debdd14c 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -146,3 +146,52 @@ ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock cor
 ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
 AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
 AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+
+Module104420Name = Inventory
+Module104420Desc = Create and manage your inventory
+NewInventory=New inventory
+inventorySetup = Inventory Setup
+inventoryCreatePermission=Create new inventory
+inventoryReadPermission=View inventories
+inventoryWritePermission=Update inventories
+inventoryValidatePermission=Validate inventory
+inventoryTitle=Inventory
+inventoryListTitle=Inventories
+inventoryListEmpty=No inventory in progress
+inventoryCreateDelete=Create/Delete inventory
+inventoryCreate=Create new
+inventoryEdit=Edit
+inventoryValidate=Validated
+inventoryDraft=Running
+inventorySelectWarehouse=Warehouse choice
+inventoryConfirmCreate=Create
+inventoryOfWarehouse=Inventory for warehouse : %s
+inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryMvtStock=By inventory
+inventoryWarningProductAlreadyExists=This product is already into list
+SelectCategory=Category filter
+SelectFournisseur=Supplier filter
+inventoryOnDate=Inventory 
+INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock mouvment have date of inventory
+inventoryChangePMPPermission=Allow to change PMP value for a product
+ColumnNewPMP=New unit PMP
+OnlyProdsInStock=Do not add product without stock
+TheoricalQty=Theorique qty
+TheoricalValue=Theorique qty
+LastPA=Last BP
+CurrentPA=Curent BP
+RealQty=Real Qty
+RealValue=Real Value
+RegulatedQty=Regulated Qty
+AddInventoryProduct=Add product to inventory
+AddProduct=Add
+ApplyPMP=Apply PMP
+FlushInventory=Flush inventory
+ConfirmFlushInventory=Do you confirm this action ?
+InventoryFlushed=Inventory flushed
+ExitEditMode=Exit edition
+inventoryDeleteLine=Delete line
+RegulateStock=Regulate Stock
+ListInventory=List
diff --git a/htdocs/inventory/ajax/ajax.inventory.php b/htdocs/product/inventory/ajax/ajax.inventory.php
similarity index 86%
rename from htdocs/inventory/ajax/ajax.inventory.php
rename to htdocs/product/inventory/ajax/ajax.inventory.php
index c1f372806c8..0d0e7040d97 100644
--- a/htdocs/inventory/ajax/ajax.inventory.php
+++ b/htdocs/product/inventory/ajax/ajax.inventory.php
@@ -9,7 +9,7 @@
     switch ($put)
     {
         case 'qty':
-            if (empty($user->rights->inventory->write)) { echo -1; exit; }
+            if (empty($user->rights->stock->write)) { echo -1; exit; }
             
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
@@ -29,7 +29,7 @@
             break;
 			
         case 'pmp':
-            if (!$user->rights->inventory->write || !$user->rights->inventory->changePMP) { echo -1; exit; }
+            if (!$user->rights->stock->write || !$user->rights->stock->changePMP) { echo -1; exit; }
             
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
diff --git a/htdocs/inventory/inventory.php b/htdocs/product/inventory/card.php
similarity index 90%
rename from htdocs/inventory/inventory.php
rename to htdocs/product/inventory/card.php
index c10cbd1ab20..eb1ad21a8a0 100644
--- a/htdocs/inventory/inventory.php
+++ b/htdocs/product/inventory/card.php
@@ -16,27 +16,27 @@
  */
 
 /**
- *	\file       htdocs/inventory/inventory.php
+ *	\file       htdocs/inventory/card.php
  *	\ingroup    product
  *	\brief      File of class to manage inventory
  */
  
-require_once '../main.inc.php';
+require_once '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php';
-require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php';
-require_once DOL_DOCUMENT_ROOT.'/inventory/lib/inventory.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
 
 $langs->load('stock');
 $langs->load('inventory');
 
-if(empty($user->rights->inventory->read)) accessforbidden();
+if(empty($user->rights->stock->read)) accessforbidden();
 
 _action();
 
@@ -54,7 +54,7 @@ function _action()
 	
 	switch($action) {
 		case 'create':
-			if (empty($user->rights->inventory->create)) accessforbidden();
+			if (empty($user->rights->stock->create)) accessforbidden();
 			
 			$inventory = new Inventory($db);
 			
@@ -63,7 +63,7 @@ function _action()
 			break;
 		
 		case 'confirmCreate':
-			if (empty($user->rights->inventory->create)) accessforbidden();
+			if (empty($user->rights->stock->create)) accessforbidden();
 		
 			$inventory = new Inventory($db);
 			$inventory->setValues($_POST);
@@ -79,19 +79,19 @@ function _action()
             	$inventory->addProductsFor($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
             	$inventory->update($user);
             	
-            	header('Location: '.dol_buildpath('/inventory/inventory.php?id='.$inventory->id.'&action=edit', 1));
+            	header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$inventory->id.'&action=edit', 1));
             	
             }
             else{
             	
             	setEventMessage($inventory->error,'errors');
-            	header('Location: '.dol_buildpath('/inventory/inventory.php?action=create', 1));
+            	header('Location: '.dol_buildpath('/product/inventory/card.php?action=create', 1));
             }
             
 			break;
 			
 		case 'edit':
-			if (!$user->rights->inventory->write) accessforbidden();
+			if (!$user->rights->stock->write) accessforbidden();
 			
 			
 			$inventory = new Inventory($db);
@@ -102,7 +102,7 @@ function _action()
 			break;
 			
 		case 'save':
-			if (!$user->rights->inventory->write) accessforbidden();
+			if (!$user->rights->stock->write) accessforbidden();
 			
 			
 			$id = GETPOST('id');
@@ -120,13 +120,13 @@ function _action()
 			else 
 			{
 				$inventory->udpate($user);
-				header('Location: '.dol_buildpath('inventory/inventory.php?id='.$inventory->getId().'&action=view', 1));
+				header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$inventory->getId().'&action=view', 1));
 			}
 			
 			break;
 			
 		case 'confirm_regulate':
-			if (!$user->rights->inventory->write) accessforbidden();
+			if (!$user->rights->stock->write) accessforbidden();
 			$id = GETPOST('id');
 			
 			$inventory = new Inventory($db);
@@ -160,7 +160,7 @@ function _action()
 			break;
 			
 		case 'add_line':
-			if (!$user->rights->inventory->write) accessforbidden();
+			if (!$user->rights->stock->write) accessforbidden();
 			
 			$id = GETPOST('id');
 			$fk_warehouse = GETPOST('fk_warehouse');
@@ -212,7 +212,7 @@ function _action()
 			break;
 			
 		case 'confirm_delete_line':
-			if (!$user->rights->inventory->write) accessforbidden();
+			if (!$user->rights->stock->write) accessforbidden();
 			
 			
 			//Cette action devrais se faire uniquement si le status de l'inventaire est à 0 mais aucune vérif
@@ -230,7 +230,7 @@ function _action()
 			
 			break;
         case 'confirm_flush':
-            if (!$user->rights->inventory->create) accessforbidden();
+            if (!$user->rights->stock->create) accessforbidden();
             
             
             $id = GETPOST('id');
@@ -247,7 +247,7 @@ function _action()
             
             break;
 		case 'confirm_delete':
-			if (!$user->rights->inventory->create) accessforbidden();
+			if (!$user->rights->stock->create) accessforbidden();
             
 			
 			$id = GETPOST('id');
@@ -276,7 +276,7 @@ function _action()
 			break;
 			
 		default:
-			if (!$user->rights->inventory->write) accessforbidden();
+			if (!$user->rights->stock->write) accessforbidden();
 				
 			$id = GETPOST('id');
 				
@@ -395,13 +395,13 @@ function card(&$inventory, $action='edit')
 		
 	);
 	
-	$can_validate = !empty($user->rights->inventory->validate);
-	$view_url = dol_buildpath('/inventory/inventory.php', 1);
+	$can_validate = !empty($user->rights->stock->validate);
+	$view_url = dol_buildpath('/product/inventory/card.php', 1);
 	
 	$view = array(
 		'mode' => $action
-		,'url' => dol_buildpath('/inventory/inventory.php', 1)
-		,'can_validate' => (int) $user->rights->inventory->validate
+		,'url' => dol_buildpath('/product/inventory/card.php', 1)
+		,'can_validate' => (int) $user->rights->stock->validate
 		,'is_already_validate' => (int) $inventory->status
 		,'token'=>$_SESSION['newtoken']
 	);
@@ -446,10 +446,10 @@ function card_line(&$inventory, &$lines, $mode)
 			'qty_view' => ($Inventorydet->qty_view ? $Inventorydet->qty_view : 0),
 			'qty_stock' => $stock,
 			'qty_regulated' => ($Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0),
-			'action' => ($user->rights->inventory->write && $mode=='edit' ? '<a href="'.dol_buildpath('inventory/inventory.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : ''),
+			'action' => ($user->rights->stock->write && $mode=='edit' ? '<a href="'.dol_buildpath('/product/inventory/card.php?id='.$inventory->id.'&action=delete_line&rowid='.$Inventorydet->id, 1).'">'.img_picto($langs->trans('inventoryDeleteLine'), 'delete').'</a>' : ''),
 			'pmp_stock'=>round($pmp_actual,2),
             'pmp_actual'=> round($pmp * $Inventorydet->qty_view,2),
-			'pmp_new'=>(!empty($user->rights->inventory->changePMP) && $mode == 'edit' ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" /> <a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' :  price($Inventorydet->new_pmp)),
+			'pmp_new'=>(!empty($user->rights->stock->changePMP) && $mode == 'edit' ? '<input type="text" name="new_pmp['.$k.']" value="'.$Inventorydet->new_pmp.'" size="8" style="text-align:right;" /> <a id="a_save_new_pmp_'.$k.'" href="javascript:save_pmp('.$k.')">'.img_picto($langs->trans('Save'), 'bt-save.png@inventory').'</a>' :  price($Inventorydet->new_pmp)),
             'pa_stock'=>round($last_pa * $stock,2),
             'pa_actual'=>round($last_pa * $Inventorydet->qty_view,2),
 			'current_pa_stock'=>round($current_pa * $stock,2),
@@ -551,7 +551,7 @@ function _footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actu
             <th>&nbsp;</th>
             <th align="right"><?php echo price($total_pmp_actual) ?></th>
             <?php
-            if(!empty($user->rights->inventory->changePMP)) {
+            if(!empty($user->rights->stock->changePMP)) {
                	echo '<th>&nbsp;</th>';	
 			}
 			?>
@@ -626,7 +626,7 @@ function _headerList($view) {
 	    	    <th>&nbsp;</th>
 	    	    <th><?php echo $langs->trans('PMP'); ?></th>
 	    	    <?php
-	    	    if(!empty($user->rights->inventory->changePMP)) {
+	    	    if(!empty($user->rights->stock->changePMP)) {
 	    	    	echo '<th rel="newPMP">'.$langs->trans('ColumnNewPMP').'</th>';
 	    	    }
 	    	    ?>
diff --git a/htdocs/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
similarity index 98%
rename from htdocs/inventory/class/inventory.class.php
rename to htdocs/product/inventory/class/inventory.class.php
index 14230d90893..b652066d4a4 100644
--- a/htdocs/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -16,7 +16,7 @@
  */
 
 /**
- *	\file       htdocs/inventory/class/product.inventory.php
+ *	\file       htdocs/inventory/class/product.class.php
  *	\ingroup    product
  *	\brief      File of class to manage predefined products stock
  */
@@ -434,7 +434,7 @@ class Inventory extends CoreObject
      */
 	public function getNomUrl($withpicto = 1)
     {
-        return '<a href="'.dol_buildpath('/inventory/inventory.php?id='.$this->id, 1).'">'.($withpicto ? img_picto('','object_list.png','',0).' ' : '').$this->getTitle().'</a>';
+        return '<a href="'.DOL_URL_ROOT.'/product/inventory/card.php?id='.$this->id.'">'.($withpicto ? img_picto('','object_list.png','',0).' ' : '').$this->getTitle().'</a>';
 	}
 
     /**
diff --git a/htdocs/inventory/img/bt-save.png b/htdocs/product/inventory/img/bt-save.png
similarity index 100%
rename from htdocs/inventory/img/bt-save.png
rename to htdocs/product/inventory/img/bt-save.png
diff --git a/htdocs/inventory/img/inventory.png b/htdocs/product/inventory/img/inventory.png
similarity index 100%
rename from htdocs/inventory/img/inventory.png
rename to htdocs/product/inventory/img/inventory.png
diff --git a/htdocs/inventory/img/plus.png b/htdocs/product/inventory/img/plus.png
similarity index 100%
rename from htdocs/inventory/img/plus.png
rename to htdocs/product/inventory/img/plus.png
diff --git a/htdocs/inventory/img/plus16.png b/htdocs/product/inventory/img/plus16.png
similarity index 100%
rename from htdocs/inventory/img/plus16.png
rename to htdocs/product/inventory/img/plus16.png
diff --git a/htdocs/inventory/lib/inventory.lib.php b/htdocs/product/inventory/lib/inventory.lib.php
similarity index 92%
rename from htdocs/inventory/lib/inventory.lib.php
rename to htdocs/product/inventory/lib/inventory.lib.php
index eb79ae67cc4..aa8c9c9677d 100644
--- a/htdocs/inventory/lib/inventory.lib.php
+++ b/htdocs/product/inventory/lib/inventory.lib.php
@@ -31,12 +31,12 @@ function inventoryAdminPrepareHead()
 {
     global $langs, $conf;
 
-    $langs->load("inventory@inventory");
+    $langs->load("inventory");
 
     $h = 0;
     $head = array();
 
-    $head[$h][0] = dol_buildpath("/admin/inventory.php", 1);
+    $head[$h][0] = DOL_URL_ROOT."/admin/inventory.php";
     $head[$h][1] = $langs->trans("Parameters");
     $head[$h][2] = 'settings';
     $h++;
@@ -60,7 +60,7 @@ function inventoryPrepareHead(&$inventory, $title='Inventory', $get='')
 	global $langs;
 	
 	return array(
-		array(dol_buildpath('/inventory/inventory.php?id='.$inventory->id.$get, 1), $langs->trans($title),'inventory')
+		array(dol_buildpath('/product/inventory/card.php?id='.$inventory->id.$get, 1), $langs->trans($title),'inventory')
 	);
 }
 
diff --git a/htdocs/inventory/list.php b/htdocs/product/inventory/list.php
similarity index 91%
rename from htdocs/inventory/list.php
rename to htdocs/product/inventory/list.php
index d55996d0407..46c41637da0 100644
--- a/htdocs/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -16,27 +16,27 @@
  */
 
 /**
- *	\file       htdocs/inventory/inventory.php
+ *	\file       htdocs/inventory/list.php
  *	\ingroup    product
  *	\brief      File of class to manage inventory
  */
  
-require_once '../main.inc.php';
+require_once '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php';
-require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php';
-require_once DOL_DOCUMENT_ROOT.'/inventory/lib/inventory.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
 
 $langs->load("stock");
 $langs->load("inventory");
 
-if (empty($user->rights->inventory->read)) accessforbidden();
+if (empty($user->rights->stock->read)) accessforbidden();
 		
 llxHeader('',$langs->trans('inventoryListTitle'),'','');
 
@@ -91,7 +91,7 @@ echo $list->render(Inventory::getSQL('All'), array(
 ));
 
 
-/*if (!empty($user->rights->inventory->create))
+/*if (!empty($user->rights->stock->create))
 {
     print '<div class="tabsAction">';
     print '<a class="butAction" href="inventory.php?action=create">'.$langs->trans('inventoryCreate').'</a>';
diff --git a/htdocs/inventory/tpl/inventory.tpl.php b/htdocs/product/inventory/tpl/inventory.tpl.php
similarity index 98%
rename from htdocs/inventory/tpl/inventory.tpl.php
rename to htdocs/product/inventory/tpl/inventory.tpl.php
index e3fa8e5421d..d55454bd39a 100644
--- a/htdocs/inventory/tpl/inventory.tpl.php
+++ b/htdocs/product/inventory/tpl/inventory.tpl.php
@@ -136,7 +136,7 @@
                 <?php if ($can_validate == 1) { ?>
                     <td align="right"><?php echo price($row['pmp_actual']); ?></td>
                     <?php
-                    if(!empty($user->rights->inventory->changePMP)) {
+                    if(!empty($user->rights->stock->changePMP)) {
                     	echo '<td align="right">'.$row['pmp_new'].'</td>';	
 					}
                     ?>
@@ -169,7 +169,7 @@
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
 				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
 				<?php 
-				 if(!empty($user->rights->inventory->changePMP)) {
+				 if(!empty($user->rights->stock->changePMP)) {
 				 	echo '<a href="'.$view_url.'?id='.$inventory->id.'&action=changePMP" class="butAction">'.$langs->trans('ApplyPMP').'</a>';
 				 }
 				

From 4993a43025467973b725f45320e577f4edfd75c2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 02:15:13 +0200
Subject: [PATCH 0666/1163] Move new feature inventory into module stock.

---
 htdocs/core/class/coreobject.class.php        |  16 +-
 htdocs/core/class/listview.class.php          |  87 ++-
 htdocs/core/js/listview.js                    |  20 +
 htdocs/core/menus/standard/eldy.lib.php       |  13 +-
 htdocs/langs/en_US/stocks.lang                |   4 +-
 .../modulebuilder/skeletons/skeleton_card.php |  12 +-
 .../product/inventory/ajax/ajax.inventory.php |   4 +-
 htdocs/product/inventory/card.php             | 576 ++++++++++--------
 .../inventory/class/inventory.class.php       |   7 +-
 htdocs/product/inventory/list.php             |  44 +-
 .../product/inventory/tpl/inventory.tpl.php   |  34 +-
 11 files changed, 450 insertions(+), 367 deletions(-)

diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 384374b1893..8aa0cfe2ad6 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -32,7 +32,7 @@ class CoreObject extends CommonObject
 	/**
 	 *  @var Array $_fields Fields to synchronize with Database
 	 */
-	protected $__fields=array();
+	protected $fields=array();
 
     /**
 	 *  Constructor
@@ -55,9 +55,9 @@ class CoreObject extends CommonObject
 		$this->datec = 0;
 		$this->tms = 0;
 		
-		if (!empty($this->__fields))
+		if (!empty($this->fields))
 		{
-			foreach ($this->__fields as $field=>$info)
+			foreach ($this->fields as $field=>$info)
 			{
 		        if ($this->is_date($info)) $this->{$field} = time();
 		        elseif ($this->is_array($info)) $this->{$field} = array();
@@ -87,9 +87,9 @@ class CoreObject extends CommonObject
      */
     private function checkFieldType($field, $type)
     {
-		if (isset($this->__fields[$field]) && method_exists($this, 'is_'.$type))
+		if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
 		{
-			return $this->{'is_'.$type}($this->__fields[$field]);
+			return $this->{'is_'.$type}($this->fields[$field]);
 		}
 		else
         {
@@ -214,7 +214,7 @@ class CoreObject extends CommonObject
     private function set_save_query()
     {
 		$query=array();
-		foreach ($this->__fields as $field=>$info)
+		foreach ($this->fields as $field=>$info)
 		{
 			if($this->is_date($info))
 			{
@@ -260,7 +260,7 @@ class CoreObject extends CommonObject
      */
     private function get_field_list()
     {
-		$keys = array_keys($this->__fields);
+		$keys = array_keys($this->fields);
 	    return implode(',', $keys);
 	}
 
@@ -272,7 +272,7 @@ class CoreObject extends CommonObject
      */
     private function set_vars_by_db(&$obj)
     {
-		foreach ($this->__fields as $field => $info)
+		foreach ($this->fields as $field => $info)
 		{
 			if($this->is_date($info))
 			{
diff --git a/htdocs/core/class/listview.class.php b/htdocs/core/class/listview.class.php
index dc2dbbcd161..91dd182fc56 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/core/class/listview.class.php
@@ -294,15 +294,27 @@ class Listview
      */
     public function render($sql, $TParam=array())
     {
+        global $conf;
+        
 		$TField=array();
 		
 		$this->init($TParam);
-		$THeader = $this->initHeader($TParam);
+
+        $THeader = $this->initHeader($TParam);
 		
 		$sql = $this->search($sql,$TParam);
-		$sql = $this->order_by($sql, $TParam);		
+		$sql.= $this->db->order($TParam['param']['sortfield'], $TParam['param']['sortorder']);
+
+		$nbtotalofrecords = '';
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+		    $result = $this->db->query($sql);
+		    $nbtotalofrecords = $this->db->num_rows($result);
+		}
+		$sql.= $this->db->plimit($TParam['param']['limit'] + 1, $TParam['param']['offset']);
+		
+		$this->parse_sql($THeader, $TField, $TParam, $sql);
 		
-		$this->parse_sql($THeader, $TField, $TParam, $sql);	
 		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
 		return $this->renderList($THeader, $TField, $TTotal, $TTotalGroup, $TParam);
@@ -468,6 +480,7 @@ class Listview
     /**
      * @return string
      */
+	/*
     private function getJS()
     {
 		$javaScript = '<script language="javascript">
@@ -479,7 +492,8 @@ class Listview
 
 		return $javaScript;
 	}
-
+    */
+	
     /**
      * @param $TParam
      * @param $TField
@@ -595,7 +609,7 @@ class Listview
 		$TExport = $this->setExport($TParam, $TField, $THeader);
 		$TField = $this->addTotalGroup($TField,$TTotalGroup);
 		
-		$out = $this->getJS();
+		//$out = $this->getJS();
 		
 		$dolibarr_decalage = $this->totalRow > $this->totalRowToShow ? 1 : 0;
 		ob_start();
@@ -605,6 +619,26 @@ class Listview
 	
 		$out.= '<table id="'.$this->id.'" class="liste" width="100%"><thead>';
 			
+    	if(count($TSearch)>0)
+		{
+			$out.='<tr class="liste_titre liste_titre_search barre-recherche">';
+			
+			foreach ($THeader as $field => $head)
+			{
+				if ($field === 'selectedfields')
+				{
+					$out.= '<td class="liste_titre" align="right">'.$this->form->showFilterAndCheckAddButtons(0).'</td>';
+				}
+				else
+				{
+					$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
+					$out .= '<td class="liste_titre" '.$moreattrib.'>'.$TSearch[$field].'</td>';
+				}
+			}
+			
+			$out.='</tr>';
+		}
+				
 		$out.= '<tr class="liste_titre">';
 		foreach($THeader as $field => $head)
 		{
@@ -635,31 +669,11 @@ class Listview
 		//$out .= '<th aligne="right" class="maxwidthsearch liste_titre">--</th>';
 		$out .= '</tr>';
 		
-		if(count($TSearch)>0)
-		{
-			$out.='<tr class="liste_titre barre-recherche">';
-			
-			foreach ($THeader as $field => $head)
-			{
-				if ($field === 'selectedfields')
-				{
-					$out.= '<td class="liste_titre" align="right">'.$this->form->showFilterAndCheckAddButtons(0).'</td>';
-				}
-				else
-				{
-					$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
-					$out .= '<td class="liste_titre" '.$moreattrib.'>'.$TSearch[$field].'</td>';
-				}
-			}
-			
-			$out.='</tr>';
-		}
-				
 		$out.='</thead><tbody>';
 		
 		if(empty($TField))
 		{
-			if (!empty($TParam['list']['messageNothing'])) $out .= '<tr class="pair" align="center"><td colspan="'.(count($TParam['title'])+1).'">'.$TParam['list']['messageNothing'].'</td></tr>';
+			if (!empty($TParam['list']['messageNothing'])) $out .= '<tr class="oddeven"><td colspan="'.(count($TParam['title'])+1).'"><span class="opacitymedium">'.$TParam['list']['messageNothing'].'</span></td></tr>';
 		}
 		else
         {
@@ -729,27 +743,6 @@ class Listview
 	}
 
 
-    /**
-     * @param $sql
-     * @param $TParam
-     * @return string
-     */
-    private function order_by($sql, &$TParam)
-    {
-		global $db;
-		
-		if (!empty($TParam['sortfield']))
-		{
-			if(strpos($sql,'LIMIT ') !== false) list($sql, $sqlLIMIT) = explode('LIMIT ', $sql);
-			
-			$sql .= $db->order($TParam['sortfield'], $TParam['sortorder']);
-			
-			if (!empty($sqlLIMIT)) $sql .= ' LIMIT '.$sqlLIMIT;
-		}
-		
-		return $sql;
-	}
-
     /**
      * @param $THeader
      * @param $TField
diff --git a/htdocs/core/js/listview.js b/htdocs/core/js/listview.js
index d68a7993218..de3113d0fae 100644
--- a/htdocs/core/js/listview.js
+++ b/htdocs/core/js/listview.js
@@ -1,3 +1,23 @@
+// Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+// or see http://www.gnu.org/
+
+//
+// \file       htdocs/core/js/listview.js
+// \brief      File that include javascript functions for lists
+//
 var Listview_include = true;
 
 function Listview_OrderDown(idListe, column) {
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 10d1e53475b..1e88601604f 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1253,12 +1253,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			}
 
 			// Inventory
-			if (! empty($conf->stock->enabled))
+			if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
 			{
-				$langs->load("stocks");
-				$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
-				$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
-				$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
+    			if (! empty($conf->stock->enabled))
+    			{
+    				$langs->load("stocks");
+    				$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
+    				$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
+    				$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
+    			}
 			}
 			
 			// Expeditions
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 943debdd14c..9c9f82f6efb 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -146,9 +146,7 @@ ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock cor
 ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
 AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
 AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
-
-Module104420Name = Inventory
-Module104420Desc = Create and manage your inventory
+InventoryDate=Inventory date
 NewInventory=New inventory
 inventorySetup = Inventory Setup
 inventoryCreatePermission=Create new inventory
diff --git a/htdocs/modulebuilder/skeletons/skeleton_card.php b/htdocs/modulebuilder/skeletons/skeleton_card.php
index f0a9dd23c26..42fce48e2cb 100644
--- a/htdocs/modulebuilder/skeletons/skeleton_card.php
+++ b/htdocs/modulebuilder/skeletons/skeleton_card.php
@@ -109,9 +109,9 @@ if (empty($reshook))
 	}
 	
 	// Action to add record
-	if ($action == 'add')
+	if ($action == 'add' && ! empty($user->rights->mymodule->create))
 	{
-		if (GETPOST('cancel'))
+		if ($cancel)
 		{
 			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
 			header("Location: ".$urltogo);
@@ -154,7 +154,7 @@ if (empty($reshook))
 	}
 
 	// Action to update record
-	if ($action == 'update')
+	if ($action == 'update' && ! empty($user->rights->mymodule->create))
 	{
 		$error=0;
 
@@ -189,7 +189,7 @@ if (empty($reshook))
 	}
 
 	// Action to delete
-	if ($action == 'confirm_delete')
+	if ($action == 'confirm_delete' && ! empty($user->rights->mymodule->delete))
 	{
 		$result=$object->delete($user);
 		if ($result > 0)
@@ -216,10 +216,10 @@ if (empty($reshook))
 * Put here all code to build page
 ****************************************************/
 
-llxHeader('','MyPageName','');
-
 $form=new Form($db);
 
+llxHeader('','MyPageName','');
+
 
 // Put here content of your page
 
diff --git a/htdocs/product/inventory/ajax/ajax.inventory.php b/htdocs/product/inventory/ajax/ajax.inventory.php
index 0d0e7040d97..c0d8443f433 100644
--- a/htdocs/product/inventory/ajax/ajax.inventory.php
+++ b/htdocs/product/inventory/ajax/ajax.inventory.php
@@ -1,7 +1,7 @@
 <?php
 
-    require '../../main.inc.php';
-    require_once DOL_DOCUMENT_ROOT.'/inventory/class/inventory.class.php';
+    require '../../../main.inc.php';
+    require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
     
     $get = GETPOST('get');
     $put = GETPOST('put');
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index eb1ad21a8a0..e89a59bb505 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -32,277 +32,303 @@ include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
 
 $langs->load('stock');
 $langs->load('inventory');
 
-if(empty($user->rights->stock->read)) accessforbidden();
+$id=GETPOST('id', 'int');
+$ref=GETPOST('ref', 'alpha');
+$action=(GETPOST('action','alpha') ? GETPOST('action','alpha') : 'view');
+$cancel=GETPOST('cancel');
+$confirm=GETPOST('confirm','alpha');
+$socid=GETPOST('socid','int');
+if (! empty($user->societe_id)) $socid=$user->societe_id;
 
-_action();
+if (empty($action) && empty($id) && empty($ref)) $action='view';
 
-function _action() 
+// Protection if external user
+if ($user->societe_id > 0)
 {
-	global $user, $db, $conf, $langs;	
-	
-	/*******************************************************************
-	* ACTIONS
-	*
-	* Put here all code to do according to value of "action" parameter
-	********************************************************************/
+    //accessforbidden();
+}
+$result = restrictedArea($user, 'stock', $id);
 
-	$action=GETPOST('action');
-	
-	switch($action) {
-		case 'create':
-			if (empty($user->rights->stock->create)) accessforbidden();
-			
-			$inventory = new Inventory($db);
-			
-			card_warehouse( $inventory);
 
-			break;
+$object = new Inventory($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+// Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('inventory'));
+
+
+
+/*
+ * Actions
+ */
+
+$parameters=array('id'=>$id, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    if ($cancel)
+    {
+        if ($action != 'addlink')
+        {
+            $urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+            header("Location: ".$urltogo);
+            exit;
+        }
+        if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
+        $action='';
+    }
+    
+    if ($action == 'confirmCreate')
+    {
+		if (empty($user->rights->stock->creer)) accessforbidden();
+	
+		if ($cancel)
+		{
+		    $urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+		    header("Location: ".$urltogo);
+		    exit;
+		}
 		
-		case 'confirmCreate':
-			if (empty($user->rights->stock->create)) accessforbidden();
+		$error=0;
 		
-			$inventory = new Inventory($db);
-			$inventory->setValues($_POST);
-			
-            $fk_inventory = $inventory->create($user);
-			if($fk_inventory>0) {
-            	
-            	$fk_category = (int) GETPOST('fk_category');
-            	$fk_supplier = (int) GETPOST('fk_supplier');
-            	$fk_warehouse = (int) GETPOST('fk_warehouse');
-            	$only_prods_in_stock = (int) GETPOST('OnlyProdsInStock');
-            	
-            	$inventory->addProductsFor($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
-            	$inventory->update($user);
-            	
-            	header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$inventory->id.'&action=edit', 1));
-            	
-            }
-            else{
-            	
-            	setEventMessage($inventory->error,'errors');
-            	header('Location: '.dol_buildpath('/product/inventory/card.php?action=create', 1));
-            }
+		$object->setValues($_POST);
+		
+        $fk_inventory = $object->create($user);
+		if ($fk_inventory>0)
+		{
+        	$fk_category = (int) GETPOST('fk_category');
+        	$fk_supplier = (int) GETPOST('fk_supplier');
+        	$fk_warehouse = (int) GETPOST('fk_warehouse');
+        	$only_prods_in_stock = (int) GETPOST('OnlyProdsInStock');
+        	
+        	$object->addProductsFor($fk_warehouse,$fk_category,$fk_supplier,$only_prods_in_stock);
+        	$object->update($user);
+        	
+        	header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$object->id.'&action=edit', 1));
+            exit;        	
+        }
+        else
+        {
+        	setEventMessage($object->error,'errors');
+        	header('Location: '.dol_buildpath('/product/inventory/card.php?action=create', 1));
+        	exit;
+        }
+        
+		break;
+    }
+    
+    switch($action) {
+    	case 'save':
+    		if (!$user->rights->stock->creer) accessforbidden();
+    		
+    		
+    		$id = GETPOST('id');
+    		
+    		$object = new Inventory($db);
+    		$object->fetch($id);
+    		
+    		$object->setValues($_REQUEST);
+    		
+    		if ($object->errors)
+    		{
+    			setEventMessage($object->errors, 'errors');
+    			card( $object, 'edit');
+    		}
+    		else 
+    		{
+    			$object->udpate($user);
+    			header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$object->getId().'&action=view', 1));
+    		}
+    		
+    		break;
+    		
+    	case 'confirm_regulate':
+    		if (!$user->rights->stock->creer) accessforbidden();
+    		$id = GETPOST('id');
+    		
+    		$object = new Inventory($db);
+    		$object->fetch($id);
             
-			break;
-			
-		case 'edit':
-			if (!$user->rights->stock->write) accessforbidden();
-			
-			
-			$inventory = new Inventory($db);
-			$inventory->fetch(GETPOST('id'));
-			
-			card($inventory, GETPOST('action'));
-			
-			break;
-			
-		case 'save':
-			if (!$user->rights->stock->write) accessforbidden();
-			
-			
-			$id = GETPOST('id');
-			
-			$inventory = new Inventory($db);
-			$inventory->fetch($id);
-			
-			$inventory->setValues($_REQUEST);
-			
-			if ($inventory->errors)
-			{
-				setEventMessage($inventory->errors, 'errors');
-				card( $inventory, 'edit');
-			}
-			else 
-			{
-				$inventory->udpate($user);
-				header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$inventory->getId().'&action=view', 1));
-			}
-			
-			break;
-			
-		case 'confirm_regulate':
-			if (!$user->rights->stock->write) accessforbidden();
-			$id = GETPOST('id');
-			
-			$inventory = new Inventory($db);
-			$inventory->fetch($id);
-            
-            if($inventory->status == 0) {
-                $inventory->status = 1;
-                $inventory->update($user);
+            if($object->status == 0) {
+                $object->status = 1;
+                $object->update($user);
                 
-                card( $inventory, 'view');
+                card( $object, 'view');
                 
             
             }
             else {
-               card( $inventory, 'view');
+               card( $object, 'view');
             }
             
-			break;
-			
-		case 'confirm_changePMP':
-			
-			$id = GETPOST('id');
-			
-			$inventory = new Inventory($db);
-			$inventory->fetch( $id );
-			
-			$inventory->changePMP($user);
-			
-			card( $inventory, 'view');
-			
-			break;
-			
-		case 'add_line':
-			if (!$user->rights->stock->write) accessforbidden();
-			
-			$id = GETPOST('id');
-			$fk_warehouse = GETPOST('fk_warehouse');
-			
-			$inventory = new Inventory($db);
-			$inventory->fetch( $id );
-			
-			$fk_product = GETPOST('fk_product');
-			if ($fk_product>0)
-			{
-				$product = new Product($db);
-				if($product->fetch($fk_product)<=0 || $product->type != 0) {
-					setEventMessage($langs->trans('ThisIsNotAProduct'),'errors');
-				}
-				else{
-					
-					//Check product not already exists
-					$alreadyExists = false;
-					if(!empty($inventory->Inventorydet)) {
-						foreach ($inventory->Inventorydet as $invdet)
-						{
-							if ($invdet->fk_product == $product->id
-								&& $invdet->fk_warehouse == $fk_warehouse)
-							{
-								$alreadyExists = true;
-								break;
-							}
-						}
-					}
-					if (!$alreadyExists)
-					{
-					    if($inventory->addProduct($product->id, $fk_warehouse)) {
-					    	setEventMessage($langs->trans('ProductAdded'));
-					    }
-					}
-					else
-					{
-						setEventMessage($langs->trans('inventoryWarningProductAlreadyExists'), 'warnings');
-					}
-					
-				}
-				
-				$inventory->update($user);
-				$inventory->sortDet();
-			}
-			
-			card( $inventory, 'edit');
-			
-			break;
-			
-		case 'confirm_delete_line':
-			if (!$user->rights->stock->write) accessforbidden();
-			
-			
-			//Cette action devrais se faire uniquement si le status de l'inventaire est à 0 mais aucune vérif
-			$rowid = GETPOST('rowid');
-			$Inventorydet = new Inventorydet($db);
-			if($Inventorydet->fetch($rowid)>0) {
-				$Inventorydet->delete($user);
-				setEventMessage("ProductDeletedFromInventory");
-			}
-			$id = GETPOST('id');
-			$inventory = new Inventory($db);
-			$inventory->fetch( $id);
-			
-			card($inventory, 'edit');
-			
-			break;
+    		break;
+    		
+    	case 'confirm_changePMP':
+    		
+    		$id = GETPOST('id');
+    		
+    		$object = new Inventory($db);
+    		$object->fetch( $id );
+    		
+    		$object->changePMP($user);
+    		
+    		card( $object, 'view');
+    		
+    		break;
+    		
+    	case 'add_line':
+    		if (!$user->rights->stock->creer) accessforbidden();
+    		
+    		$id = GETPOST('id');
+    		$fk_warehouse = GETPOST('fk_warehouse');
+    		
+    		$object = new Inventory($db);
+    		$object->fetch( $id );
+    		
+    		$fk_product = GETPOST('fk_product');
+    		if ($fk_product>0)
+    		{
+    			$product = new Product($db);
+    			if($product->fetch($fk_product)<=0 || $product->type != 0) {
+    				setEventMessage($langs->trans('ThisIsNotAProduct'),'errors');
+    			}
+    			else{
+    				
+    				//Check product not already exists
+    				$alreadyExists = false;
+    				if(!empty($object->Inventorydet)) {
+    					foreach ($object->Inventorydet as $invdet)
+    					{
+    						if ($invdet->fk_product == $product->id
+    							&& $invdet->fk_warehouse == $fk_warehouse)
+    						{
+    							$alreadyExists = true;
+    							break;
+    						}
+    					}
+    				}
+    				if (!$alreadyExists)
+    				{
+    				    if($object->addProduct($product->id, $fk_warehouse)) {
+    				    	setEventMessage($langs->trans('ProductAdded'));
+    				    }
+    				}
+    				else
+    				{
+    					setEventMessage($langs->trans('inventoryWarningProductAlreadyExists'), 'warnings');
+    				}
+    				
+    			}
+    			
+    			$object->update($user);
+    			$object->sortDet();
+    		}
+    		
+    		card( $object, 'edit');
+    		
+    		break;
+    		
+    	case 'confirm_delete_line':
+    		if (!$user->rights->stock->creer) accessforbidden();
+    		
+    		
+    		//Cette action devrais se faire uniquement si le status de l'inventaire est à 0 mais aucune vérif
+    		$rowid = GETPOST('rowid');
+    		$objectdet = new Inventorydet($db);
+    		if($objectdet->fetch($rowid)>0) {
+    			$objectdet->delete($user);
+    			setEventMessage("ProductDeletedFromInventory");
+    		}
+    		$id = GETPOST('id');
+    		$object = new Inventory($db);
+    		$object->fetch( $id);
+    		
+    		card($object, 'edit');
+    		
+    		break;
         case 'confirm_flush':
-            if (!$user->rights->stock->create) accessforbidden();
+            if (!$user->rights->stock->creer) accessforbidden();
             
             
             $id = GETPOST('id');
             
-            $inventory = new Inventory($db);
-            $inventory->fetch($id);
+            $object = new Inventory($db);
+            $object->fetch($id);
             
-            $inventory->deleteAllLine($user);
+            $object->deleteAllLine($user);
             
             setEventMessage($langs->trans('InventoryFlushed'));
             
-            card( $inventory, 'edit');
+            card( $object, 'edit');
            
             
             break;
-		case 'confirm_delete':
-			if (!$user->rights->stock->create) accessforbidden();
+    	case 'confirm_delete':
+    		if (!$user->rights->stock->supprimer) accessforbidden();
             
-			
-			$id = GETPOST('id');
-			
-			$inventory = new Inventory($db);
-			$inventory->fetch($id);
-			
-			$inventory->delete($user);
-			
-			setEventMessage($langs->trans('InventoryDeleted'));
-			
-			header('Location: '.dol_buildpath('/inventory/list.php', 1));
-			exit;
-			
-			break;
-		case 'exportCSV':
-			
-			$id = GETPOST('id');
-			
-			$inventory = new Inventory($db);
-			$inventory->fetch($id);
-			
-			_exportCSV($inventory);
-			
-			exit;
-			break;
-			
-		default:
-			if (!$user->rights->stock->write) accessforbidden();
-				
-			$id = GETPOST('id');
-				
-			$inventory = new Inventory($db);
-			$inventory->fetch($id);
-				
-			card($inventory, $action );
-				
-			
-			break;
-	}
-	
+    		
+    		$id = GETPOST('id');
+    		
+    		$object = new Inventory($db);
+    		$object->fetch($id);
+    		
+    		$object->delete($user);
+    		
+    		setEventMessage($langs->trans('InventoryDeleted'));
+    		
+    		header('Location: '.dol_buildpath('/inventory/list.php', 1));
+    		exit;
+    		
+    		break;
+    	/*case 'exportCSV':
+    		
+    		$id = GETPOST('id');
+    		
+    		$object = new Inventory($db);
+    		$object->fetch($id);
+    		
+    		_exportCSV($object);
+    		
+    		exit;
+    		break;
+    		*/
+    }
 }
 
-function card_warehouse(&$inventory)
+
+/*
+ * Views
+ */
+
+$form=new Form($db);
+
+llxHeader('',$langs->trans('Inventory'),'','');
+	
+if ($action == 'create')
 {
-	global $langs,$conf,$db, $user, $form;
+    if (empty($user->rights->stock->creer)) accessforbidden();
+
+    print load_fiche_titre($langs->trans("NewInventory"));
 	
-	dol_include_once('/categories/class/categorie.class.php');    
-        
-	llxHeader('',$langs->trans('inventorySelectWarehouse'),'','');
-	print dol_get_fiche_head(inventoryPrepareHead($inventory));
-	
-	echo '<form name="confirmCreate" action="'.$_SERVER['PHP_SELF'].'" method="post" />';
+    echo '<form name="confirmCreate" action="'.$_SERVER['PHP_SELF'].'" method="post" />';
 	echo '<input type="hidden" name="action" value="confirmCreate" />';
 	
+	dol_fiche_head();
+	
     $formproduct = new FormProduct($db);
     
     ?>
@@ -337,61 +363,63 @@ function card_warehouse(&$inventory)
     </table>
     <?php
     
-	print '<div class="tabsAction">';
-	print '<input type="submit" class="butAction" value="'.$langs->trans('inventoryConfirmCreate').'" />';
-	print '</div>';
-	
+    dol_fiche_end();
+    
+    print '<div class="center">';
+    print '<input type="submit" class="button" value="'.$langs->trans('inventoryConfirmCreate').'" />';
+    print ' &nbsp; &nbsp; ';
+    print '<input type="submit" class="button" value="'.$langs->trans('inventoryConfirmCreate').'" />';
+    print '</div>';
+    
 	echo '</form>';
 	
-	llxFooter('');
 }
 
-function card(&$inventory, $action='edit')
+if ($action == 'view' || $action == 'edit' ||  empty($action))
 {
-	global $langs, $conf, $db, $user,$form;
-	
-	llxHeader('',$langs->trans('inventoryEdit'),'','');
-	
+    $object = new Inventory($db);
+    $object->fetch($id);
+
 	if($action == 'changePMP')
 	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id, $langs->trans('ApplyNewPMP'), $langs->trans('ConfirmApplyNewPMP', $inventory->getTitle()), 'confirm_changePMP', array(),'no',1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ApplyNewPMP'), $langs->trans('ConfirmApplyNewPMP', $object->getTitle()), 'confirm_changePMP', array(),'no',1);
 	}
 	else if($action == 'flush')
 	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('FlushInventory'),$langs->trans('ConfirmFlushInventory',$inventory->getTitle()),'confirm_flush',array(),'no',1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('FlushInventory'),$langs->trans('ConfirmFlushInventory',$object->getTitle()),'confirm_flush',array(),'no',1);
 	}
 	else if($action == 'delete')
 	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('Delete'),$langs->trans('ConfirmDelete',$inventory->getTitle()),'confirm_delete',array(),'no',1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('Delete'),$langs->trans('ConfirmDelete',$object->getTitle()),'confirm_delete',array(),'no',1);
 	}
 	else if($action == 'delete_line')
 	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id.'&rowid='.GETPOST('rowid'),$langs->trans('DeleteLine'),$langs->trans('ConfirmDeleteLine',$inventory->getTitle()),'confirm_delete_line',array(),'no',1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&rowid='.GETPOST('rowid'),$langs->trans('DeleteLine'),$langs->trans('ConfirmDeleteLine',$object->getTitle()),'confirm_delete_line',array(),'no',1);
 	}
 	else if($action == 'regulate')
 	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$inventory->id,$langs->trans('RegulateStock'),$langs->trans('ConfirmRegulateStock',$inventory->getTitle()),'confirm_regulate',array(),'no',1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('RegulateStock'),$langs->trans('ConfirmRegulateStock',$object->getTitle()),'confirm_regulate',array(),'no',1);
 	}
 	
 	$warehouse = new Entrepot($db);
-	$warehouse->fetch($inventory->fk_warehouse);
+	$warehouse->fetch($object->fk_warehouse);
 	
-	print dol_get_fiche_head(inventoryPrepareHead($inventory, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), empty($action) ? '': '&action='.$action));
+	print dol_get_fiche_head(inventoryPrepareHead($object, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), empty($action) ? '': '&action='.$action));
 	
 	$lines = array();
-	card_line($inventory, $lines, $action);
+	card_line($object, $lines, $action);
 	
-	print '<b>'.$langs->trans('inventoryOnDate')." ".$inventory->getDate('date_inventory').'</b><br><br>';
+	print '<b>'.$langs->trans('inventoryOnDate')." ".$object->getDate('date_inventory').'</b><br><br>';
 	
-	$inventoryTPL = array(
-		'id'=> $inventory->id
-		,'date_cre' => $inventory->getDate('date_cre', 'd/m/Y')
-		,'date_maj' => $inventory->getDate('date_maj', 'd/m/Y H:i')
-		,'fk_warehouse' => $inventory->fk_warehouse
-		,'status' => $inventory->status
-		,'entity' => $inventory->entity
-		,'amount' => price( round($inventory->amount,2) )
-		,'amount_actual'=>price (round($inventory->amount_actual,2))
+	$objectTPL = array(
+		'id'=> $object->id
+		,'date_cre' => $object->getDate('date_cre', 'd/m/Y')
+		,'date_maj' => $object->getDate('date_maj', 'd/m/Y H:i')
+		,'fk_warehouse' => $object->fk_warehouse
+		,'status' => $object->status
+		,'entity' => $object->entity
+		,'amount' => price( round($object->amount,2) )
+		,'amount_actual'=>price (round($object->amount_actual,2))
 		
 	);
 	
@@ -402,15 +430,18 @@ function card(&$inventory, $action='edit')
 		'mode' => $action
 		,'url' => dol_buildpath('/product/inventory/card.php', 1)
 		,'can_validate' => (int) $user->rights->stock->validate
-		,'is_already_validate' => (int) $inventory->status
+		,'is_already_validate' => (int) $object->status
 		,'token'=>$_SESSION['newtoken']
 	);
 	
 	include './tpl/inventory.tpl.php';
-	
-	llxFooter('');
 }
 
+// End of page
+llxFooter();
+$db->close();
+
+
 
 function card_line(&$inventory, &$lines, $mode)
 {
@@ -421,7 +452,6 @@ function card_line(&$inventory, &$lines, $mode)
 
 	foreach ($inventory->Inventorydet as $k => $Inventorydet)
 	{
-	    
         $product = & $Inventorydet->product;
 		$stock = $Inventorydet->qty_stock;
 	
@@ -442,7 +472,7 @@ function card_line(&$inventory, &$lines, $mode)
 			'produit' => $product->getNomUrl(1).'&nbsp;-&nbsp;'.$product->label,
 			'entrepot'=>$e->getNomUrl(1),
 			'barcode' => $product->barcode,
-			'qty' =>($mode == 'edit' ? '<input type="text" name="qty_to_add['.$k.']" value="'.$qty.'" size="8" style="text-align:center;" /> <a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto($langs->trans('Add'), 'plus16@inventory').'</a>' : '' ),
+			'qty' =>($mode == 'edit' ? '<input type="text" name="qty_to_add['.$k.']" value="'.$qty.'" size="8" style="text-align:center;" /> <a id="a_save_qty_'.$k.'" href="javascript:save_qty('.$k.')">'.img_picto($langs->trans('Add'), 'edit_add').'</a>' : '' ),
 			'qty_view' => ($Inventorydet->qty_view ? $Inventorydet->qty_view : 0),
 			'qty_stock' => $stock,
 			'qty_regulated' => ($Inventorydet->qty_regulated ? $Inventorydet->qty_regulated : 0),
@@ -461,7 +491,10 @@ function card_line(&$inventory, &$lines, $mode)
 
 }
 
-function _exportCSV(&$inventory) {
+
+/*
+function _exportCSV(&$inventory) 
+{
 	global $conf;
 	
 	header('Content-Type: application/octet-stream');
@@ -531,8 +564,10 @@ function _exportCSV(&$inventory) {
 	
 	exit;
 }
+*/
 
-function _footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actual, $total_current_pa,$total_current_pa_actual) {
+function _footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actual, $total_current_pa,$total_current_pa_actual) 
+{
 	global $conf,$user,$langs;
 	
 	    if ($view['can_validate'] == 1) { ?>
@@ -569,7 +604,10 @@ function _footerList($view,$total_pmp,$total_pmp_actual,$total_pa,$total_pa_actu
         </tr>
         <?php } 
 }
-function _headerList($view) {
+
+
+function _headerList($view) 
+{
 	global $conf,$user,$langs;
 	
 	?>
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index b652066d4a4..93bbb38f6e7 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -67,7 +67,7 @@ class Inventory extends CoreObject
      * Attribute object linked with database
      * @var array
      */
-	protected $__fields=array(
+	protected $fields=array(
 		'fk_warehouse'=>array('type'=>'integer','index'=>true)
 		,'entity'=>array('type'=>'integer','index'=>true)
 		,'status'=>array('type'=>'integer','index'=>true)
@@ -503,6 +503,7 @@ class Inventory extends CoreObject
 
     /**
      * Function to get the sql select of inventory
+     * 
      * @param   string  $type   'All' to get all data
      * @return  string
      */
@@ -516,7 +517,7 @@ class Inventory extends CoreObject
 			$sql = 'SELECT i.rowid,i.title, e.label, i.date_inventory, i.fk_warehouse, i.datec, i.tms, i.status';
             $sql.= ' FROM '.MAIN_DB_PREFIX.'inventory i';
             $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot e ON (e.rowid = i.fk_warehouse)';
-            $sql.= ' WHERE i.entity = '.(int) $conf->entity;
+            $sql.= ' WHERE i.entity IN ('.getEntity('inventory', 1).')';
 		}
 	
 		return $sql;	
@@ -541,7 +542,7 @@ class Inventorydet extends CoreObject
 	public $pa;
 	public $new_pmp;
 	
-	protected $__fields=array(
+	protected $fields=array(
 		'fk_inventory'=>array('type'=>'int')
 		,'fk_warehouse'=>array('type'=>'int')
 		,'fk_product'=>array('type'=>'int')
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 46c41637da0..36a185d7fd1 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -36,8 +36,31 @@ require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
 $langs->load("stock");
 $langs->load("inventory");
 
-if (empty($user->rights->stock->read)) accessforbidden();
-		
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="i.title";
+if (! $sortorder) $sortorder="ASC";
+
+if (empty($user->rights->stock->lire)) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
 llxHeader('',$langs->trans('inventoryListTitle'),'','');
 
 echo '<form name="formListInvetory" action="'.$_SERVER['PHP_SELF'].'" method="post" >';
@@ -48,8 +71,15 @@ $list = new ListView($db, 'listInventory');
 $THide = array('label','title');
 
 echo $list->render(Inventory::getSQL('All'), array(
-	'limit' => array(
-		'nbLine' => GETPOST('limit')
+    'param' => array(
+        'limit' => $limit,
+        'offset' => $offset,
+        'sortfield' => $sortfield,
+        'sortorder'=> $sortorder,
+        'page'=>$page
+    ),
+    'limit' => array(
+	    'nbLine' => $limit,
 	),
 	'allow-field-select' => true,
     'link'=>array(
@@ -65,14 +95,14 @@ echo $list->render(Inventory::getSQL('All'), array(
     'list'=>array(
         'title'=>$langs->trans('inventoryListTitle'),
         'messageNothing'=>$langs->trans('inventoryListEmpty'),
-		'image' => 'inventory.png@inventory'
+		'image' => 'title_products.png'
     ),
     'title'=>array(
         'rowid'=>$langs->trans('Title'),
 		'date_inventory'=>$langs->trans('InventoryDate'),
-        'datec'=>$langs->trans('DateCreation'),
         'fk_warehouse'=>$langs->trans('Warehouse'),
-        'tms'=>$langs->trans('DateUpdate'),
+        'datec'=>$langs->trans('DateCreation'),
+        'tms'=>$langs->trans('DateModification'),
         'status'=>$langs->trans('Status')
     ),
     'eval'=>array(
diff --git a/htdocs/product/inventory/tpl/inventory.tpl.php b/htdocs/product/inventory/tpl/inventory.tpl.php
index d55454bd39a..2a1c3bc3ee4 100644
--- a/htdocs/product/inventory/tpl/inventory.tpl.php
+++ b/htdocs/product/inventory/tpl/inventory.tpl.php
@@ -71,15 +71,15 @@
     }
 </script>
 
-<?php if ($inventory->status != 1) { ?>
+<?php if ($object->status != 1) { ?>
 	<strong><?php echo $langs->trans('AddInventoryProduct'); ?> : </strong>
 	<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
 		<input type="hidden" name="action" value="add_line" />
-		<input type="hidden" name="id" value="<?php echo $inventory->id; ?>" />
+		<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 	
-		<?php echo inventorySelectProducts($inventory); ?>
+		<?php echo inventorySelectProducts($object); ?>
 		
-			<input class="butAction" type="submit" value="<?php echo $langs->trans('AddProduct'); ?>" />
+			<input class="button" type="submit" value="<?php echo $langs->trans('AddProduct'); ?>" />
 	</form>
 <?php } ?>
 
@@ -90,7 +90,7 @@
 	<?php } ?>
 	
 	<input type="hidden" name="action" value="save" />
-	<input type="hidden" name="id" value="<?php echo $inventory->id; ?>" />
+	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 	
 	<table width="100%" class="border workstation">
 		<?php
@@ -163,43 +163,43 @@
 		?>
 	</table>
 	
-	<?php if ($inventory->status != 1) { ?>
+	<?php if ($object->status != 1) { ?>
 		<div class="tabsAction" style="height:30px;">
 			<?php if ($action!= 'edit') { ?>
-				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
-				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
+				<!-- <a href="<?php echo $view_url; ?>?id=<?php echo $object->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a> -->
+				<a href="<?php echo $view_url; ?>?id=<?php echo $object->id; ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
 				<?php 
 				 if(!empty($user->rights->stock->changePMP)) {
-				 	echo '<a href="'.$view_url.'?id='.$inventory->id.'&action=changePMP" class="butAction">'.$langs->trans('ApplyPMP').'</a>';
+				 	echo '<a href="'.$view_url.'?id='.$object->id.'&action=changePMP" class="butAction">'.$langs->trans('ApplyPMP').'</a>';
 				 }
 				
 				if ($can_validate == 1) { ?>
-					<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=regulate&token=" class="butAction"><?php echo $langs->trans('RegulateStock') ?></a>
+					<a href="<?php echo $view_url; ?>?id=<?php echo $object->id; ?>&action=regulate&token=" class="butAction"><?php echo $langs->trans('RegulateStock') ?></a>
 				<?php } ?>
 			<?php } ?>
 			<?php if ($action == 'edit') { ?>
-				<input name="back" type="button" class="butAction" value="<?php echo $langs->trans('ExitEditMode'); ?>" onclick="document.location='?id=<?php echo $inventory->id; ?>&action=view';" />
+				<input name="back" type="button" class="butAction" value="<?php echo $langs->trans('ExitEditMode'); ?>" onclick="document.location='?id=<?php echo $object->id; ?>&action=view';" />
 			<?php } ?>
 			<?php if ($can_validate == 1) { ?>
-                <a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=flush" class="butActionDelete"><?php  echo $langs->trans('Flush'); ?></a>
+                <a href="<?php echo $view_url; ?>?id=<?php echo $object->id; ?>&action=flush" class="butActionDelete"><?php  echo $langs->trans('Flush'); ?></a>
                 &nbsp;&nbsp;&nbsp;
-                <a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=delete" class="butActionDelete"><?php echo $langs->trans('Delete') ?></a>
+                <a href="<?php echo $view_url; ?>?id=<?php echo $object->id; ?>&action=delete" class="butActionDelete"><?php echo $langs->trans('Delete') ?></a>
         	<?php } ?>
 		</div>
 	<?php } ?>
-	<?php if ($inventory->status == 1) { ?>
+	<?php if ($object->status == 1) { ?>
 		<div class="tabsAction">
 			<?php if ($can_validate == 1) { ?>
 
-				<a href="<?php echo $view_url; ?>?id=<?php echo $inventory->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a>
+				<!-- <a href="<?php echo $view_url; ?>?id=<?php echo $object->id; ?>&action=exportCSV" class="butAction"><?php echo $langs->trans('ExportCSV') ?></a> -->
 				<a href="#" title="<?php echo $langs->trans('InventoryAlreadyValidated'); ?>" class="butActionRefused"><?php echo $langs->trans('Delete') ?></a>
 				
 			<?php } ?>
 		</div>
 	<?php } ?>
 </form>
-<p>Date de création : <?php echo $inventory->getDate('datec') ?>
-<br />Dernière mise à jour : <?php echo $inventory->getDate('tms') ?></p>
+<p>Date de création : <?php echo $object->getDate('datec') ?>
+<br />Dernière mise à jour : <?php echo $object->getDate('tms') ?></p>
 	
 
 	

From b57bf6460bd6f73339030ad83ed35de6d6843056 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 02:34:00 +0200
Subject: [PATCH 0667/1163] Start debug inventory

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 +-
 .../install/mysql/tables/llx_inventorydet.sql |  2 +-
 htdocs/product/inventory/card.php             | 19 ++++++++-----------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 4a383fcb505..b20da8b9b89 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -204,7 +204,7 @@ tms timestamp,
 fk_inventory integer DEFAULT 0, 
 fk_warehouse integer DEFAULT 0,
 fk_product integer DEFAULT 0,  
-entity integer DEFAULT 0, 
+batch varchar(30) DEFAULT NULL,
 qty_view double DEFAULT 0, 
 qty_stock double DEFAULT 0, 
 qty_regulated double DEFAULT 0, 
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.sql b/htdocs/install/mysql/tables/llx_inventorydet.sql
index 20e48b877b5..2b203e0c58b 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet.sql
@@ -25,7 +25,7 @@ tms timestamp,
 fk_inventory integer DEFAULT 0, 
 fk_warehouse integer DEFAULT 0,
 fk_product integer DEFAULT 0,  
-entity integer DEFAULT 0, 
+batch varchar(30) DEFAULT NULL,		-- Lot or serial number
 qty_view double DEFAULT 0, 
 qty_stock double DEFAULT 0, 
 qty_regulated double DEFAULT 0, 
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index e89a59bb505..f7e4cbecb0a 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -146,12 +146,13 @@ if (empty($reshook))
     		if ($object->errors)
     		{
     			setEventMessage($object->errors, 'errors');
-    			card( $object, 'edit');
+    			$action = 'edit';
     		}
     		else 
     		{
     			$object->udpate($user);
     			header('Location: '.dol_buildpath('/product/inventory/card.php?id='.$object->getId().'&action=view', 1));
+    			exit;
     		}
     		
     		break;
@@ -167,12 +168,10 @@ if (empty($reshook))
                 $object->status = 1;
                 $object->update($user);
                 
-                card( $object, 'view');
-                
-            
+                $action='view';
             }
             else {
-               card( $object, 'view');
+               $action='view';
             }
             
     		break;
@@ -186,7 +185,7 @@ if (empty($reshook))
     		
     		$object->changePMP($user);
     		
-    		card( $object, 'view');
+    		$action='view';
     		
     		break;
     		
@@ -238,7 +237,7 @@ if (empty($reshook))
     			$object->sortDet();
     		}
     		
-    		card( $object, 'edit');
+    		$action='edit';
     		
     		break;
     		
@@ -257,7 +256,7 @@ if (empty($reshook))
     		$object = new Inventory($db);
     		$object->fetch( $id);
     		
-    		card($object, 'edit');
+    		$action='edit';
     		
     		break;
         case 'confirm_flush':
@@ -273,14 +272,12 @@ if (empty($reshook))
             
             setEventMessage($langs->trans('InventoryFlushed'));
             
-            card( $object, 'edit');
-           
+            $action='edit';
             
             break;
     	case 'confirm_delete':
     		if (!$user->rights->stock->supprimer) accessforbidden();
             
-    		
     		$id = GETPOST('id');
     		
     		$object = new Inventory($db);

From 865c8140d1bf0900d59906de1b01f4416d360b1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 03:18:49 +0200
Subject: [PATCH 0668/1163] Clean code

---
 ChangeLog                                     |   4 +-
 htdocs/comm/propal/contact.php                |   4 +-
 htdocs/commande/contact.php                   |   5 +-
 htdocs/core/class/commonobject.class.php      | 119 +++++++++---------
 htdocs/core/lib/company.lib.php               |  49 ++++++++
 htdocs/expedition/contact.php                 |   4 +-
 htdocs/expedition/shipment.php                |   4 +-
 .../skeletons/skeleton_class.class.php        |  49 +++++---
 htdocs/product/card.php                       |  77 ++++++------
 htdocs/societe/class/societe.class.php        |  12 --
 htdocs/societe/societecontact.php             |   5 +-
 11 files changed, 197 insertions(+), 135 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31ddbd56bdd..3eb284ccc80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,7 +13,9 @@ Following changes may create regression for some external modules, but were nece
 * The page compta/facture.php was renamed into compta/facture/card.php to match page naming conventions.
 * The signature of method ->delete() of class Product and PriceExpression was changed from 
   ->delete($id, notrigger) to ->delete(User, notrigger) to match standard dev rules.
-
+* Removed CommonObject::displayMarginInfos (was deprecated in 3.8). Use same method into
+  html.formmargin.class.php
+* Removed Societe::set_commnucation_level (was deprecated in 4.0). Was not used.
 
 ***** ChangeLog for 5.0.1 compared to 5.0.0 *****
 FIX: #6503: SQL error in "Last pending payment invoices"
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 3c3aa6aef88..3e9e5a1205d 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -130,12 +130,12 @@ else if ($action == 'deletecontact' && $user->rights->propale->creer)
 		dol_print_error($db);
 	}
 }
-
+/*
 else if ($action == 'setaddress' && $user->rights->propale->creer)
 {
 	$result=$object->setDeliveryAddress($_POST['fk_address']);
 	if ($result < 0) dol_print_error($db,$object->error);
-}
+}*/
 
 
 /*
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index bc257f3ac05..fe37a630c5d 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -107,13 +107,14 @@ else if ($action == 'deletecontact' && $user->rights->commande->creer)
 		dol_print_error($db);
 	}
 }
-
+/*
 else if ($action == 'setaddress' && $user->rights->commande->creer)
 {
 	$object->fetch($id);
 	$result=$object->setDeliveryAddress($_POST['fk_address']);
 	if ($result < 0) dol_print_error($db,$object->error);
-}
+}*/
+
 
 /*
  * View
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e03db1b4773..2526638cee5 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -238,6 +238,7 @@ abstract class CommonObject
 
 	/**
 	 * @var int Delivery address ID
+	 * @deprecated
 	 * @see setDeliveryAddress()
 	 */
 	public $fk_delivery_address;
@@ -1623,7 +1624,8 @@ abstract class CommonObject
 
     /**
      *	Define delivery address
-     *
+     *  @deprecated
+     *  
      *	@param      int		$id		Address id
      *	@return     int				<0 si ko, >0 si ok
      */
@@ -3223,51 +3225,14 @@ abstract class CommonObject
 
     /**
      *  Return if a country is inside the EEC (European Economic Community)
-     *  TODO Add a field into dictionary
+     *  @deprecated
      *
      *  @return     boolean		true = country inside EEC, false = country outside EEC
      */
     function isInEEC()
     {
-        // List of all country codes that are in europe for european vat rules
-        // List found on http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
-        $country_code_in_EEC=array(
-    			'AT',	// Austria
-    			'BE',	// Belgium
-    			'BG',	// Bulgaria
-    			'CY',	// Cyprus
-    			'CZ',	// Czech republic
-    			'DE',	// Germany
-    			'DK',	// Danemark
-    			'EE',	// Estonia
-    			'ES',	// Spain
-    			'FI',	// Finland
-    			'FR',	// France
-    			'GB',	// United Kingdom
-    			'GR',	// Greece
-    			'HR',   // Croatia
-                'NL',	// Holland
-    			'HU',	// Hungary
-    			'IE',	// Ireland
-    			'IM',	// Isle of Man - Included in UK
-    			'IT',	// Italy
-    			'LT',	// Lithuania
-    			'LU',	// Luxembourg
-    			'LV',	// Latvia
-    			'MC',	// Monaco - Included in France
-    			'MT',	// Malta
-                //'NO',	// Norway
-    			'PL',	// Poland
-    			'PT',	// Portugal
-    			'RO',	// Romania
-    			'SE',	// Sweden
-    			'SK',	// Slovakia
-    			'SI',	// Slovenia
-    			'UK',	// United Kingdom
-        //'CH',	// Switzerland - No. Swizerland in not in EEC
-        );
-        //print "dd".$this->country_code;
-        return in_array($this->country_code,$country_code_in_EEC);
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+        return isInEEC($this);
     }
 
 
@@ -3754,21 +3719,6 @@ abstract class CommonObject
     }
 
 
-	/**
-	 * Show the array with all margin infos
-	 *
-	 * @param 		bool	$force_price	Force price
-	 * @return		void
-	 * @deprecated	3.8 Load FormMargin class and make a direct call to displayMarginInfos
-	 */
-	function displayMarginInfos($force_price=false)
-	{
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
-		$formmargin=new FormMargin($this->db);
-		$formmargin->displayMarginInfos($this, $force_price);
-	}
-
-
 	/**
 	 *	Add resources to the current object : add entry into llx_element_resources
 	 *	Need $this->element & $this->id
@@ -4711,4 +4661,61 @@ abstract class CommonObject
 		}
 		return $buyPrice;
 	}
+	
+	
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function createCommon(User $user, $notrigger = false)
+	{
+	    
+	}
+	
+	
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id  Id object
+	 * @param string $ref Ref
+	 *
+	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetchCommon($id, $ref = null)
+	{
+	    
+	}
+	
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function updateCommon(User $user, $notrigger = false)
+	{
+	    
+	}
+	
+	
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user      User that deletes
+	 * @param bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function deleteCommon(User $user, $notrigger = false)
+	{
+	    
+	}
 }
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 809a045bacf..6847cd7b9c2 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -496,6 +496,55 @@ function getFormeJuridiqueLabel($code)
     }
 }
 
+/**
+ *  Return if a country is inside the EEC (European Economic Community)
+ *  TODO Add a field into country dictionary.
+ *  
+ *  @param      Object      $object    Object
+ *  @return     boolean		           true = country inside EEC, false = country outside EEC
+ */
+function isInEEC($object)
+{
+    // List of all country codes that are in europe for european vat rules
+    // List found on http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
+    $country_code_in_EEC=array(
+        'AT',	// Austria
+        'BE',	// Belgium
+        'BG',	// Bulgaria
+        'CY',	// Cyprus
+        'CZ',	// Czech republic
+        'DE',	// Germany
+        'DK',	// Danemark
+        'EE',	// Estonia
+        'ES',	// Spain
+        'FI',	// Finland
+        'FR',	// France
+        'GB',	// United Kingdom
+        'GR',	// Greece
+        'HR',   // Croatia
+        'NL',	// Holland
+        'HU',	// Hungary
+        'IE',	// Ireland
+        'IM',	// Isle of Man - Included in UK
+        'IT',	// Italy
+        'LT',	// Lithuania
+        'LU',	// Luxembourg
+        'LV',	// Latvia
+        'MC',	// Monaco - Included in France
+        'MT',	// Malta
+        //'NO',	// Norway
+        'PL',	// Poland
+        'PT',	// Portugal
+        'RO',	// Romania
+        'SE',	// Sweden
+        'SK',	// Slovakia
+        'SI',	// Slovenia
+        'UK',	// United Kingdom
+        //'CH',	// Switzerland - No. Swizerland in not in EEC
+    );
+    //print "dd".$this->country_code;
+    return in_array($object->country_code, $country_code_in_EEC);
+}
 
 
 /**
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 1354b3d49f1..7c721d7cf47 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -123,13 +123,13 @@ else if ($action == 'deletecontact' && $user->rights->expedition->creer)
 		dol_print_error($db);
 	}
 }
-
+/*
 else if ($action == 'setaddress' && $user->rights->expedition->creer)
 {
 	$object->fetch($id);
 	$result=$object->setDeliveryAddress($_POST['fk_address']);
 	if ($result < 0) dol_print_error($db,$object->error);
-}
+}*/
 
 
 /*
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 57ad04a8a1a..ede1cc6bec9 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -113,7 +113,7 @@ if (empty($reshook))
     	if ($result < 0)
     		setEventMessages($object->error, $object->errors, 'errors');
     }
-    
+    /*
     if ($action == 'setdeliveryaddress' && $user->rights->commande->creer)
     {
     	$object = new Commande($db);
@@ -122,7 +122,7 @@ if (empty($reshook))
     	if ($result < 0)
     		setEventMessages($object->error, $object->errors, 'errors');
     }
-    
+    */
     if ($action == 'setmode' && $user->rights->commande->creer)
     {
     	$object = new Commande($db);
diff --git a/htdocs/modulebuilder/skeletons/skeleton_class.class.php b/htdocs/modulebuilder/skeletons/skeleton_class.class.php
index 01b48c35f75..6805a697043 100644
--- a/htdocs/modulebuilder/skeletons/skeleton_class.class.php
+++ b/htdocs/modulebuilder/skeletons/skeleton_class.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
@@ -20,10 +20,9 @@
  */
 
 /**
- * \file    dev/skeletons/skeleton_class.class.php
- * \ingroup mymodule othermodule1 othermodule2
- * \brief   This file is an example for a CRUD class file (Create/Read/Update/Delete)
- *          Put some comments here
+ * \file        modulebuilder/skeletons/skeleton_class.class.php
+ * \ingroup     mymodule othermodule1 othermodule2
+ * \brief       This file is an example for a CRUD class file (Create/Read/Update/Delete)
  */
 
 // Put here all includes required by your class file
@@ -34,26 +33,27 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 /**
  * Class Skeleton_Class
  *
- * Put here description of your class
- *
- * @see CommonObject
+ * Put here description of your class.
  */
 class Skeleton_Class extends CommonObject
 {
 	/**
-	 * @var string Id to identify managed objects
+	 * @var string Id to identify managed object
 	 */
 	public $element = 'skeleton';
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'skeleton';
-
-	/**
-	 * @var Skeleton_ClassLine[] Lines
-	 */
-	public $lines = array();
-
+    /**
+     * @var array Array with all fields and their property
+     */
+	public $picto = 'generic';
+    /**
+     * @var array Array with all fields and their property
+     */
+	public $fields;
+	
 	/**
 	 * @var mixed Sample property 1
 	 */
@@ -62,8 +62,21 @@ class Skeleton_Class extends CommonObject
 	 * @var mixed Sample property 2
 	 */
 	public $prop2;
+	
 	//...
-
+	
+	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	
+	public $table_element_line = 'skeletondet';
+    public $class_element_line = 'SkeletonLine';
+    public $fk_element = 'fk_skeleton';
+    /**
+	 * @var Skeleton_ClassLine[] Lines
+	 */
+	public $lines = array();
+	
+	
+	
 	/**
 	 * Constructor
 	 *
@@ -289,10 +302,10 @@ class Skeleton_Class extends CommonObject
 	 */
 	public function update(User $user, $notrigger = false)
 	{
-		$error = 0;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
+		$error = 0;
+		
 		// Clean parameters
 		if (isset($this->prop1)) {
 			$this->prop1 = trim($this->prop1);
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 536bcece10f..71f7cd8e7f6 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1801,60 +1801,61 @@ if (($action == 'clone' && (empty($conf->use_javascript_ajax) || ! empty($conf->
 /* Barre d'action                                                             */
 /*                                                                            */
 /* ************************************************************************** */
-
-print "\n".'<div class="tabsAction">'."\n";
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-if (empty($reshook))
+if ($action != 'create' && $action != 'edit')
 {
-    if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) || 
-       ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))
+    print "\n".'<div class="tabsAction">'."\n";
+    
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    if (empty($reshook))
     {
-        if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
-
-        if (! isset($object->no_button_copy) || $object->no_button_copy <> 1)
+        if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) || 
+           ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))
         {
-            if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+            if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
+    
+            if (! isset($object->no_button_copy) || $object->no_button_copy <> 1)
             {
-                print '<div class="inline-block divButAction"><span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span></div>'."\n";
-            }
-            else
-			{
-                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
+                if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+                {
+                    print '<div class="inline-block divButAction"><span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span></div>'."\n";
+                }
+                else
+    			{
+                    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
+                }
             }
         }
-    }
-    $object_is_used = $object->isObjectUsed($object->id);
-
-    if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer)
-    || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
-    {
-        if (empty($object_is_used) && (! isset($object->no_button_delete) || $object->no_button_delete <> 1))
+        $object_is_used = $object->isObjectUsed($object->id);
+    
+        if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer)
+        || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
         {
-            if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+            if (empty($object_is_used) && (! isset($object->no_button_delete) || $object->no_button_delete <> 1))
             {
-                print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
+                if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+                {
+                    print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
+                }
+                else
+    			{
+                    print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
+                }
             }
             else
-			{
-                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
+    		{
+                print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a></div>';
             }
         }
         else
-		{
-            print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a></div>';
+    	{
+            print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a></div>';
         }
     }
-    else
-	{
-        print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a></div>';
-    }
+    
+    print "\n</div>\n";
 }
 
-print "\n</div>\n";
-
-
 /*
  * All the "Add to" areas
  */
@@ -1974,7 +1975,7 @@ if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action =
  * Documents generes
  */
 
-if ($action != 'edit' && $action != 'delete')
+if ($action != 'create' && $action != 'edit' && $action != 'delete')
 {
     print '<div class="fichecenter"><div class="fichehalfleft">';
     print '<a name="builddoc"></a>'; // ancre
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 74aef09e7a9..0581ed1960e 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3326,18 +3326,6 @@ class Societe extends CommonObject
 		return "Error, mode/status not found";
 	}
 
-	/**
-	 *  Set commnunication level
-	 *
-	 *  @param  User	$user		User making change
-	 *	@return	int					<0 if KO, >0 if OK
-     * @deprecated Use update function instead
-	 */
-	function set_commnucation_level($user)
-	{
-		return $this->update($this->id, $user);
-	}
-
 	/**
 	 *  Set outstanding value
 	 *
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 2bda75867dc..b5ffc87517f 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -107,13 +107,14 @@ else if ($action == 'deletecontact' && $user->rights->societe->creer)
 		dol_print_error($db);
 	}
 }
-
+/*
 else if ($action == 'setaddress' && $user->rights->societe->creer)
 {
 	$object->fetch($id);
 	$result=$object->setDeliveryAddress($_POST['fk_address']);
 	if ($result < 0) dol_print_error($db,$object->error);
-}
+}*/
+
 
 /*
  * View

From 60951cf30743e0fb12a1991aae063b6eeba8c7b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 04:09:50 +0200
Subject: [PATCH 0669/1163] Less data example

---
 htdocs/admin/dict.php                          |  7 ++++---
 htdocs/core/menus/standard/eldy.lib.php        |  2 +-
 .../mysql/data/llx_c_hrm_department.sql        | 18 +++++++-----------
 htdocs/langs/en_US/admin.lang                  |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 125f913eb8d..d4aa0ce6989 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1073,7 +1073,7 @@ if ($id)
         print '</tr>';
 
         // Line to enter new values
-        print '<tr class="oddeven nodrag nodrop nohover">';
+        print '<!-- line to add new entry --><tr class="oddeven nodrag nodrop nohover">';
 
         $obj = new stdClass();
         // If data was already input, we define them in obj to populate input fields.
@@ -1814,13 +1814,14 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			if ($fieldlist[$field]=='affect') $class='maxwidth50';
 			if ($fieldlist[$field]=='delay') $class='maxwidth50';
 			if ($fieldlist[$field]=='position') $class='maxwidth50';
-			if ($fieldlist[$field]=='libelle') $class='quatrevingtpercent';
+			if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $class='quatrevingtpercent';
 			if ($fieldlist[$field]=='tracking') $class='quatrevingtpercent';
 			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $class='maxwidth50';
 			print '<td class="'.$classtd.'">';
 			$transfound=0;
 			if (in_array($fieldlist[$field], array('label','libelle')))
 			{
+			    $transkey='';
 			    // Special case for labels
 			    if ($tabname == MAIN_DB_PREFIX.'c_civility') {
 			        $transkey="Civility".strtoupper($obj->code);
@@ -1829,7 +1830,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			        $langs->load("bills");
 			        $transkey="PaymentCondition".strtoupper($obj->code);
 			    }
-			    if ($langs->trans($transkey) != $transkey)
+			    if ($transkey && $langs->trans($transkey) != $transkey)
 			    {
 			        $transfound=1;
 			        print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 1e88601604f..dffc5f9af1b 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -545,7 +545,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"),1);
 
 				$newmenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"),1);
-				$newmenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"),1, $conf->global->MAIN_FEATURES_LEVEL);
+				$newmenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"),1);
 				$newmenu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"),1);
 				$newmenu->add("/admin/delais.php?mainmenu=home",$langs->trans("MenuWarnings"),1);
 				$newmenu->add("/admin/security_other.php?mainmenu=home", $langs->trans("Security"),1);
diff --git a/htdocs/install/mysql/data/llx_c_hrm_department.sql b/htdocs/install/mysql/data/llx_c_hrm_department.sql
index e6e4921f372..c4865ad9e30 100644
--- a/htdocs/install/mysql/data/llx_c_hrm_department.sql
+++ b/htdocs/install/mysql/data/llx_c_hrm_department.sql
@@ -24,20 +24,16 @@
 --
 
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(1, 5,'MANAGEMENT', 'Management', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(2, 10,'GESTION', 'Gestion', 1);
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(3, 15,'TRAINING', 'Training', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(4, 20,'IT', 'Inform. Technology (IT)', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(5, 25,'MARKETING', 'Marketing', 1);
+INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(4, 20,'IT', 'Inform. Technology (IT)', 0);
+INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(5, 25,'MARKETING', 'Marketing', 0);
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(6, 30,'SALES', 'Sales', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(7, 35,'LEGAL', 'Legal', 1);
+INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(7, 35,'LEGAL', 'Legal', 0);
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(8, 40,'FINANCIAL', 'Financial accounting', 1);
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(9, 45,'HUMANRES', 'Human resources', 1);
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(10, 50,'PURCHASING', 'Purchasing', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(11, 55,'SERVICES', 'Services', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(12, 60,'CUSTOMSERV', 'Customer service', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(13, 65,'CONSULTING', 'Consulting', 1);
+INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(12, 60,'CUSTOMSERV', 'Customer service', 0);
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(14, 70,'LOGISTIC', 'Logistics', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(15, 75,'CONSTRUCT', 'Engineering/design', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(16, 80,'PRODUCTION', 'Manufacturing', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(17, 85,'QUALITY', 'Quality assurance', 1);
-INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(18, 85,'MAINT', 'Plant assurance', 1);
+INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(15, 75,'CONSTRUCT', 'Engineering/design', 0);
+INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(16, 80,'PRODUCTION', 'Production', 1);
+INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(17, 85,'QUALITY', 'Quality assurance', 0);
\ No newline at end of file
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 69c72fc7aad..02ff5740986 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -432,7 +432,7 @@ PageUrlForDefaultValues=You must enter here the relative url of the page. If you
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
-WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order to retreive default behavior. 
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior. 
 Field=Field
 # Modules
 Module0Name=Users & groups

From a9eeb823bd25d81f1979db1a99f92fd16328b522 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 04:32:03 +0200
Subject: [PATCH 0670/1163] Fix browser notif

---
 htdocs/admin/agenda.php                  |  2 +-
 htdocs/admin/agenda_extrafields.php      |  2 +-
 htdocs/admin/agenda_extsites.php         |  2 +-
 htdocs/admin/agenda_other.php            |  2 +-
 htdocs/admin/agenda_xcal.php             |  2 +-
 htdocs/core/ajax/check_notifications.php |  7 ++++++-
 htdocs/core/js/lib_notification.js.php   | 12 +++++++-----
 7 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index d076fcf7e26..c5fc1c55793 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -144,7 +144,7 @@ print '<input type="hidden" name="action" value="save">';
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'autoactions', $langs->trans("Agenda"), 0, 'action');
+dol_fiche_head($head, 'autoactions', $langs->trans("Agenda"), -1, 'action');
 
 print $langs->trans("AgendaAutoActionDesc")."<br>\n";
 print $langs->trans("OnlyActiveElementsAreShown").'<br>';
diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php
index 2cf3a323c21..74ae6cb2d95 100644
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -75,7 +75,7 @@ print "<br>\n";
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Agenda"), 0, 'action');
+dol_fiche_head($head, 'attributes', $langs->trans("Agenda"), -1, 'action');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 1e595b5088e..0b69b947a38 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -137,7 +137,7 @@ print '<input type="hidden" name="action" value="save">';
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'extsites', $langs->trans("Agenda"), 0, 'action');
+dol_fiche_head($head, 'extsites', $langs->trans("Agenda"), -1, 'action');
 
 print $langs->trans("AgendaExtSitesDesc")."<br>\n";
 print "<br>\n";
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 6e0a62610aa..f652829a80c 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -196,7 +196,7 @@ print "<br>\n";
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'other', $langs->trans("Agenda"), 0, 'action');
+dol_fiche_head($head, 'other', $langs->trans("Agenda"), -1, 'action');
 
 
 /*
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index cd2406e6fdc..0e66125ba7c 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -83,7 +83,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
 $head=agenda_prepare_head();
 
-dol_fiche_head($head, 'xcal', $langs->trans("Agenda"), 0, 'action');
+dol_fiche_head($head, 'xcal', $langs->trans("Agenda"), -1, 'action');
 
 print $langs->trans("AgendaSetupOtherDesc")."<br>\n";
 print "<br>\n";
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 4db67aef939..fa3edd7a4be 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -21,7 +21,6 @@ if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 require '../../main.inc.php';
 
@@ -88,9 +87,11 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
         while ($obj = $db->fetch_object($resql)) 
         {
             $langs->load("agenda");
+            $langs->load("commercial");
             
             $actionmod->fetch($obj->id);
 
+            // Message must be formated and translated to be used with javascript directly
             $event = array();
             $event['type'] = 'agenda';
             $event['id'] = $actionmod->id;
@@ -101,6 +102,10 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
             $eventfound[] = $event;
         }
     }
+    else
+    {
+        dol_syslog("Error sql = ".$db->lasterror(), LOG_ERR);
+    }
 
 }
 
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index af4452dfb39..a3b90a35db6 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -65,7 +65,7 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
    	// We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
     var time_first_execution = (time_auto_update - (nowtime - time_js_next_test)) * 1000;	//need milliseconds
     if (login != '') { 
-    	console.log("Launch browser notif check: setTimeout to wait time_first_execution="+time_first_execution+" before first check - nowtime = "+nowtime+" auto_check_events_not_before = "+auto_check_events_not_before+" time_js_next_test = "+time_js_next_test+" time_auto_update="+time_auto_update);
+    	console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" auto_check_events_not_before (val in session)= "+auto_check_events_not_before+" time_js_next_test (max now,auto_check_events_not_before) = "+time_js_next_test+" time_auto_update="+time_auto_update);
     	setTimeout(first_execution, time_first_execution); 
     } //first run auto check
 
@@ -79,17 +79,18 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
     function check_events() {
     	if (Notification.permission === "granted")
     	{
-    		console.log("Call check_events time_js_next_test="+time_js_next_test);
-            $.ajax("<?php print dol_buildpath('/core/ajax/check_notifications.php', 1); ?>", {
-                type: "post",   // Usually post o get
+    		console.log("Call check_events time_js_next_test = date we are looking for event after ="+time_js_next_test);
+            $.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php'; ?>", {
+                type: "post",   // Usually post or get
                 async: true,
                 data: {time: time_js_next_test},
                 success: function (result) {
                     var arr = JSON.parse(result);
                     if (arr.length > 0) {
+                    	var audio = null; 
                         <?php
                         if (! empty($conf->global->AGENDA_NOTIFICATION_SOUND)) {
-                            print 'var audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav'.'\');';
+                            print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav'.'\');';
                         }
                         ?>
     
@@ -136,6 +137,7 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
         }
 
         time_js_next_test += time_auto_update;
+		console.log('Updated time_js_next_test. New value is '+time_js_next_test);
     }
 <?php 
 }

From fed1b152d9aca07b0236b5f18939391ee5c0e485 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 30 Apr 2017 07:41:47 +0200
Subject: [PATCH 0671/1163] Correct multi-journals

---
 htdocs/accountancy/admin/journals_card.php    | 12 +++++++-----
 .../admin/{journals.php => journals_list.php} |  4 ++--
 htdocs/core/menus/standard/eldy.lib.php       | 19 ++++++++++---------
 3 files changed, 19 insertions(+), 16 deletions(-)
 rename htdocs/accountancy/admin/{journals.php => journals_list.php} (97%)

diff --git a/htdocs/accountancy/admin/journals_card.php b/htdocs/accountancy/admin/journals_card.php
index 9e04d75ce9f..aae3f8b2cb1 100644
--- a/htdocs/accountancy/admin/journals_card.php
+++ b/htdocs/accountancy/admin/journals_card.php
@@ -64,7 +64,7 @@ $object = new AccountingJournal($db);
 if ($action == 'confirm_delete' && $confirm == "yes") {
 	$result = $object->delete($id);
 	if ($result >= 0) {
-		header("Location: journals.php");
+		header("Location: journals_list.php");
 		exit();
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -108,7 +108,7 @@ else if ($action == 'add') {
 			$action = 'create';
 		}
 	} else {
-		header("Location: ./journals.php");
+		header("Location: journals_list.php");
 		exit();
 	}
 } 
@@ -227,7 +227,9 @@ if ($action == 'create')
 
 			print '</table>';
 
-			print '<br><div class="center">';
+			dol_fiche_end();
+
+			print '<div class="center">';
 			print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input type="submit" name="cancel" class="button" value="' . $langs->trans("Cancel") . '">';
@@ -248,7 +250,7 @@ if ($action == 'create')
 
 			print '<table class="border" width="100%">';
 
-			$linkback = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/journals.php">' . $langs->trans("BackToList") . '</a>';
+			$linkback = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/journals_list.php">' . $langs->trans("BackToList") . '</a>';
 
 			// Ref
 			print '<tr><td class="titlefield">' . $langs->trans("Code") . '</td><td width="50%">';
@@ -271,7 +273,7 @@ if ($action == 'create')
 
 			dol_fiche_end();
 
-			if (! empty($user->rights->accounting->fiscalyear))
+			if (! empty($user->rights->accounting->chartofaccount))
 			{
     			/*
     			 * Barre d'actions
diff --git a/htdocs/accountancy/admin/journals.php b/htdocs/accountancy/admin/journals_list.php
similarity index 97%
rename from htdocs/accountancy/admin/journals.php
rename to htdocs/accountancy/admin/journals_list.php
index 677f2a743e5..f7ba79457a8 100644
--- a/htdocs/accountancy/admin/journals.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file		htdocs/accountancy/admin/journals.php
+ * \file		htdocs/accountancy/admin/journals_list.php
  * \ingroup		Advanced accountancy
  * \brief		Setup page to configure journals
  */
@@ -154,7 +154,7 @@ dol_fiche_end();
 
 // Buttons
 print '<div class="tabsAction">';
-if (! empty($user->rights->accounting->fiscalyear))
+if (! empty($user->rights->accounting->chartofaccount))
 {
     print '<a class="butAction" href="journals_card.php?action=create">' . $langs->trans("NewAccountingJournal") . '</a>';
 }
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index dffc5f9af1b..f715061d562 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -165,7 +165,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 	if (! empty($conf->loan->enabled)) $menuqualified++;
 	$tmpentry=array(
 	   'enabled'=>$menuqualified,
-	   'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->plancompte->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read) || ! empty($user->rights->fournisseur->facture->lire) || ! empty($user->rights->loan->read)),
+	   'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->mouvements->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read) || ! empty($user->rights->fournisseur->facture->lire) || ! empty($user->rights->loan->read)),
 	   'module'=>'comptabilite|accounting|facture|supplier_invoice|don|tax|salaries|loan');
 	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
@@ -947,26 +947,27 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$langs->load("accountancy");
 
-				$permtoshowmenu=(! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire);
+				$permtoshowmenu=(! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire);
 				$newmenu->add("/accountancy/index.php?leftmenu=accountancy",$langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');
 
 				// Chart of account
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"),1,$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 10);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 20);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 22);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/journals_list.php?id=33&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 10);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 20);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 30);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 31);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 40);
 				if (! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled)) 
 				{
-				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 30);
+				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
 				}
 				if (! empty($conf->tax->enabled)) 
 				{
-				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 30);
+				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
 				}
 				if (! empty($conf->expensereport->enabled)) 
 				{
-				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 30);
+				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
 				}
 				/* not required yet, already supported by default account
 				if (! empty($conf->loan->enabled)) 
@@ -977,7 +978,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				{
 				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/don/admin/donation.php?from=accountancy&mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuDonationAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_donation', 47);
 				}*/
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 50);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 60);
 				
 				// Binding
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy",$langs->trans("CustomersVentilation"),1,$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');

From 7c2b3b8df0cb9b99456ac4010b1d0de913e6176f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 12:55:11 +0200
Subject: [PATCH 0672/1163] NEW When down payment is entered, discount to reuse
 into final invoice is automatically created. This save one click into invoice
 workflow.

---
 htdocs/compta/facture/card.php                | 18 +++---
 htdocs/compta/paiement.php                    | 38 ++++++------
 .../compta/paiement/class/paiement.class.php  | 60 +++++++++++++++++--
 htdocs/langs/en_US/bills.lang                 |  2 +-
 4 files changed, 85 insertions(+), 33 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 70eea532a79..6f5ef85310d 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -611,7 +611,9 @@ if (empty($reshook))
 		{
 			$db->begin();
 
-			// Boucle sur chaque taux de tva
+			$amount_ht = $amount_tva = $amount_ttc = array();
+			
+			// Loop on each vat rate
 			$i = 0;
 			foreach ($object->lines as $line)
 			{
@@ -630,20 +632,19 @@ if (empty($reshook))
 				$discount->description = '(CREDIT_NOTE)';
 			elseif ($object->type == Facture::TYPE_DEPOSIT)
 				$discount->description = '(DEPOSIT)';
-			elseif ($object->type == Facture::TYPE_STANDARD)
+			elseif ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_SITUATION)
 				$discount->description = '(EXCESS RECEIVED)';
 			else {
 				setEventMessages($langs->trans('CantConvertToReducAnInvoiceOfThisType'), null, 'errors');
 			}
-			$discount->tva_tx = abs($object->total_ttc);
 			$discount->fk_soc = $object->socid;
 			$discount->fk_facture_source = $object->id;
 
 			$error = 0;
 			
-			if ($object->type == Facture::TYPE_STANDARD) {
-				
-				// If we're on a standard invoice, we have to get excess received to create it in TTC wuthout VAT
+			if ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_SITUATION) 
+			{
+				// If we're on a standard invoice, we have to get excess received to create a discount in TTC without VAT
 				
 				$sql = 'SELECT SUM(pf.amount) as total_paiements
 						FROM llx_c_paiement as c, llx_paiement_facture as pf, llx_paiement as p
@@ -663,8 +664,9 @@ if (empty($reshook))
 					$error++;
 				}
 				
-			} else {
-			
+			}
+			if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
+			{
 				foreach ($amount_ht as $tva_tx => $xxx)
 				{
 					$discount->amount_ht = abs($amount_ht[$tva_tx]);
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 96f77e85758..8cd924a0df8 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
@@ -221,7 +221,7 @@ if (empty($reshook))
 	    $db->begin();
 
 	    // Clean parameters amount if payment is for a credit note
-	    if (GETPOST('type') == 2)
+	    if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE)
 	    {
 		    foreach ($amounts as $key => $value)	// How payment is dispatch
 		    {
@@ -249,7 +249,7 @@ if (empty($reshook))
 	    // Creation of payment line
 	    $paiement = new Paiement($db);
 	    $paiement->datepaye     = $datepaye;
-	    $paiement->amounts      = $amounts;   // Array with all payments dispatching
+	    $paiement->amounts      = $amounts;   // Array with all payments dispatching with invoice id
 	    $paiement->multicurrency_amounts = $multicurrency_amounts;   // Array with all payments dispatching
 	    $paiement->paiementid   = dol_getIdFromCode($db,GETPOST('paiementcode'),'c_paiement');
 	    $paiement->num_paiement = GETPOST('num_paiement');
@@ -257,7 +257,7 @@ if (empty($reshook))
 
 	    if (! $error)
 	    {
-	    	$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices')=='on'?1:0));
+	    	$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices')=='on'?1:0));    // This include closing invoices
 	    	if ($paiement_id < 0)
 	        {
 	            setEventMessages($paiement->error, $paiement->errors, 'errors');
@@ -268,7 +268,7 @@ if (empty($reshook))
 	    if (! $error)
 	    {
 	    	$label='(CustomerInvoicePayment)';
-	    	if (GETPOST('type') == 2) $label='(CustomerInvoicePaymentBack)';
+	    	if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) $label='(CustomerInvoicePaymentBack)';  // Refund of a credit note
 	        $result=$paiement->addPaymentToBank($user,'payment',$label,GETPOST('accountid'),GETPOST('chqemetteur'),GETPOST('chqbank'));
 	        if ($result < 0)
 	        {
@@ -281,7 +281,7 @@ if (empty($reshook))
 	    {
 	        $db->commit();
 
-	        // If payment dispatching on more than one invoice, we keep on summary page, otherwise go on invoice card
+	        // If payment dispatching on more than one invoice, we keep on summary page, otherwise jump on invoice card
 	        $invoiceid=0;
 	        foreach ($paiement->amounts as $key => $amount)
 	        {
@@ -309,7 +309,7 @@ if (empty($reshook))
  * View
  */
 
-llxHeader();
+llxHeader('', $langs->trans("Payment"));
 
 $form=new Form($db);
 
@@ -324,8 +324,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		$facture->fetch_thirdparty();
 
 		$title='';
-		if ($facture->type != 2) $title.=$langs->trans("EnterPaymentReceivedFromCustomer");
-		if ($facture->type == 2) $title.=$langs->trans("EnterPaymentDueToCustomer");
+		if ($facture->type != Facture::TYPE_CREDIT_NOTE) $title.=$langs->trans("EnterPaymentReceivedFromCustomer");
+		if ($facture->type == Facture::TYPE_CREDIT_NOTE) $title.=$langs->trans("EnterPaymentDueToCustomer");
 		print load_fiche_titre($title);
 
 		// Initialize data for confirmation (this is used because data can be change during confirmation)
@@ -347,7 +347,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		}
 
 		// Add realtime total information
-		if ($conf->use_javascript_ajax)
+		if (! empty($conf->use_javascript_ajax))
 		{
 			print "\n".'<script type="text/javascript" language="javascript">';
 			print '$(document).ready(function () {
@@ -369,7 +369,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			                    }
             					if ($(\'#fieldchqemetteur\').val() == \'\')
             					{
-            						var emetteur = ('.$facture->type.' == 2) ? \''.dol_escape_js(dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM)).'\' : jQuery(\'#thirdpartylabel\').val();
+            						var emetteur = ('.$facture->type.' == '.Facture::TYPE_CREDIT_NOTE.') ? \''.dol_escape_js(dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM)).'\' : jQuery(\'#thirdpartylabel\').val();
             						$(\'#fieldchqemetteur\').val(emetteur);
             					}
             				}
@@ -437,14 +437,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			';
 
 			print '	});'."\n";
-			if (!empty($conf->use_javascript_ajax)){
-				//Add js for AutoFill
-				print ' $(document).ready(function () {';
-				print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
-								$("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value")).trigger("change");
-							});';
-				print '	});'."\n";
-			}
+
+			//Add js for AutoFill
+			print ' $(document).ready(function () {';
+			print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
+							$("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value")).trigger("change");
+						});';
+			print '	});'."\n";
+
 			print '	</script>'."\n";
 		}
 
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 53035dca96f..03a7759e52c 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -255,7 +255,7 @@ class Paiement extends CommonObject
                                 {
                                     if (! empty($conf->prelevement->enabled))
                                     {
-                                        // TODO Check if this payment has a withdraw request
+                                        // FIXME Check if this invoice has a withdraw request
                                         // if not, $mustwait++;      // This will disable automatic close on invoice to allow to process
                                     }
                                 }
@@ -275,11 +275,61 @@ class Paiement extends CommonObject
                             else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
                             else
                             {
-                                $result=$invoice->set_paid($user,'','');
-                                if ($result<0)
+                                // If invoice is a down payment, we also convert down payment to discount
+                                if ($invoice->type == Facture::TYPE_DEPOSIT)
                                 {
-                                    $this->error=$invoice->error;
-                                    $error++;
+			                        $amount_ht = $amount_tva = $amount_ttc = array();
+			                         
+                                    // Loop on each vat rate
+                                    $i = 0;
+                                    foreach ($invoice->lines as $line)
+                                    {
+                                        if ($line->total_ht!=0)
+                                        { 	// no need to create discount if amount is null
+                                            $amount_ht[$line->tva_tx] += $line->total_ht;
+                                            $amount_tva[$line->tva_tx] += $line->total_tva;
+                                            $amount_ttc[$line->tva_tx] += $line->total_ttc;
+                                            $i ++;
+                                        }
+                                    }
+                                    
+                                    // Insert one discount by VAT rate category
+                                    $discount = new DiscountAbsolute($this->db);
+                                    $discount->description = '(DEPOSIT)';
+                                    $discount->fk_soc = $invoice->socid;
+                                    $discount->fk_facture_source = $invoice->id;
+                                
+                                    foreach ($amount_ht as $tva_tx => $xxx)
+                                    {
+                                        $discount->amount_ht = abs($amount_ht[$tva_tx]);
+                                        $discount->amount_tva = abs($amount_tva[$tva_tx]);
+                                        $discount->amount_ttc = abs($amount_ttc[$tva_tx]);
+                                        $discount->tva_tx = abs($tva_tx);
+                            
+                                        $result = $discount->create($user);
+                                        if ($result < 0)
+                                        {
+                                            $error++;
+                                            break;
+                                        }
+                                    }
+                                    
+                                    if ($error)
+                                    {
+                                        setEventMessages($discount->error, $discount->errors, 'errors');
+                                        $error++;
+                                    }                                   
+                                }
+                                
+                                // Set invoice to paid
+                                if (! $error)
+                                {
+                                    $result=$invoice->set_paid($user,'','');
+                                    if ($result<0)
+                                    {
+                                        $this->error=$invoice->error;
+                                        $error++;
+                                    }
                                 }
                             }
 					    }
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 7432f0e2412..189ef5c1fe2 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -447,7 +447,7 @@ CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least
 ExpectedToPay=Expected payment
 CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
 ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".

From 58e2b49b1c2c59392e0453f479a9af43b95d6f5b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 13:49:06 +0200
Subject: [PATCH 0673/1163] Clean code

---
 htdocs/compta/facture/card.php            | 13 -------------
 htdocs/core/class/commoninvoice.class.php |  3 ++-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6f5ef85310d..7e08bdc7fae 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -873,19 +873,6 @@ if (empty($reshook))
 	                    $object->addline($langs->trans('invoiceAvoirLineWithPaymentRestAmount'),$remain_to_pay,1,0,0,0,0,0,'','','TTC');
 	                }
 	            }
-
-				// Add predefined lines
-				/*
-	             TODO delete
-	             for($i = 1; $i <= $NBLINES; $i ++) {
-					if ($_POST['idprod' . $i]) {
-						$product = new Product($db);
-						$product->fetch($_POST['idprod' . $i]);
-						$startday = dol_mktime(12, 0, 0, $_POST['date_start' . $i . 'month'], $_POST['date_start' . $i . 'day'], $_POST['date_start' . $i . 'year']);
-						$endday = dol_mktime(12, 0, 0, $_POST['date_end' . $i . 'month'], $_POST['date_end' . $i . 'day'], $_POST['date_end' . $i . 'year']);
-						$result = $object->addline($product->description, $product->price, $_POST['qty' . $i], $product->tva_tx, $product->localtax1_tx, $product->localtax2_tx, $_POST['idprod' . $i], $_POST['remise_percent' . $i], $startday, $endday, 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
-					}
-				}*/
 			}
 		}
 
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 3e9d56f8f8c..4d9fa7a72af 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -51,7 +51,8 @@ abstract class CommonInvoice extends CommonObject
     const TYPE_DEPOSIT = 3;
 
     /**
-     * Proforma invoice
+     * Proforma invoice. 
+     * @deprectad Remove this. A "proforma invoice" is an order with a look of invoice, not an invoice !
      */
     const TYPE_PROFORMA = 4;
 

From 072eb740c713bef7210a5474409b274a175f6a22 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 13:57:13 +0200
Subject: [PATCH 0674/1163] Fix php compatibility

---
 htdocs/product/inventory/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index f7e4cbecb0a..026bd37e743 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -463,7 +463,8 @@ function card_line(&$inventory, &$lines, $mode)
 		if(!empty($TCacheEntrepot[$Inventorydet->fk_warehouse])) $e = $TCacheEntrepot[$Inventorydet->fk_warehouse];
 		elseif($e->fetch($Inventorydet->fk_warehouse) > 0) $TCacheEntrepot[$e->id] = $e;
 		
-		$qty = (float)GETPOST('qty_to_add')[$k];
+		$qtytoadd = GETPOST('qty_to_add', 'array');
+		$qty = (float) $qtytoadd[$k];
 		
 		$lines[]=array(
 			'produit' => $product->getNomUrl(1).'&nbsp;-&nbsp;'.$product->label,

From 1e3384a842d11f490ca81654e608d629229911bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 14:04:01 +0200
Subject: [PATCH 0675/1163] Fix travis

---
 htdocs/core/class/commonobject.class.php      |  64 +++++++++-
 htdocs/core/db/DoliDB.class.php               | 117 ------------------
 htdocs/product/inventory/card.php             |   2 +-
 htdocs/product/inventory/list.php             |   2 +-
 .../inventory}/listview.class.php             |  80 ++++++------
 5 files changed, 104 insertions(+), 161 deletions(-)
 rename htdocs/{core/class => product/inventory}/listview.class.php (93%)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2526638cee5..5e5c13056e7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4674,7 +4674,26 @@ abstract class CommonObject
 	 */
 	public function createCommon(User $user, $notrigger = false)
 	{
+	    foreach ($this->fields as $k => $v) {
 	    
+	        $keys[] = $k;
+	        $values[] = $this->quote($v);
+	         
+	    }
+	    
+	    $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$table.'
+					( '.implode( ",", $keys ).' )
+					VALUES ( '.implode( ",", $values ).' ) ';
+	    
+	    $res = $this->query($sql);
+	    if($res===false) {
+	    
+	        return false;
+	    }
+	    
+	    // TODO Add triggers
+	    	  
+	    return true;	    
 	}
 	
 	
@@ -4690,7 +4709,6 @@ abstract class CommonObject
 	{
 	    
 	}
-	
 
 	/**
 	 * Update object into database
@@ -4702,10 +4720,36 @@ abstract class CommonObject
 	 */
 	public function updateCommon(User $user, $notrigger = false)
 	{
+	    foreach ($this->fields as $k => $v) {
 	    
+	        if (is_array($key)){
+	            $i=array_search($k, $key);
+	            if ( $i !== false) {
+	                $where[] = $key[$i].'=' . $this->quote( $v ) ;
+	                continue;
+	            }
+	        } else {
+	            if ( $k == $key) {
+	                $where[] = $k.'=' .$this->quote( $v ) ;
+	                continue;
+	            }
+	        }
+	    
+	        $tmp[] = $k.'='.$this->quote($v);
+	    }
+	    $sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET '.implode( ',', $tmp ).' WHERE ' . implode(' AND ',$where) ;
+	    $res = $this->query( $sql );
+	    
+	    if($res===false) {
+	        //error
+	        return false;
+	    }
+	    
+	    // TODO Add triggers
+	    
+	    return true;	    
 	}
 	
-	
 	/**
 	 * Delete object in database
 	 *
@@ -4718,4 +4762,20 @@ abstract class CommonObject
 	{
 	    
 	}
+
+	/**
+	 * Add quote to field value if necessary
+	 *
+	 * @param string|int	$value	value to protect
+	 * @return string|int
+	 */
+	function quote($value) {
+	
+	    if(is_null($value)) return 'NULL';
+	    else if(is_numeric($value)) return $value;
+	    else return "'".$this->escape( $value )."'";
+	
+	}
+	
 }
+
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index fb398270fa6..9fc1739334c 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -295,122 +295,5 @@ abstract class DoliDB implements Database
 	{
 		return $this->lastqueryerror;
 	}
-	/*
-	 * Add quote to field value if necessary
-	 * 
-	 * @param string|int	$value	value to protect
-	 * @return string|int 
-	*/
-	function quote($value) {
-		
-		if(is_null($value)) return 'NULL';
-		else if(is_numeric($value)) return $value;
-		else return "'".$this->escape( $value )."'";
-		
-	}
-	
-	/**
-	 *	Generate and execute Update SQL commande
-	 *
-	 * 	@param	string				$table		table to update
-	 *	@param	array				$values		array of values to update
-	 *	@param  int|string|array	$key		key of value to select row to update
-	 *	@return	bool|result						false or boolean
-	 */
-	function update($table,$fields,$key){
-	
-		foreach ($fields as $k => $v) {
-				
-			if (is_array($key)){
-				$i=array_search($k , $key );
-				if ( $i !== false) {
-					$where[] = $key[$i].'=' . $this->quote( $v ) ;
-					continue;
-				}
-			} else {
-				if ( $k == $key) {
-					$where[] = $k.'=' .$this->quote( $v ) ;
-					continue;
-				}
-			}
-	
-			$tmp[] = $k.'='.$this->quote($v);
-		}
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET '.implode( ',', $tmp ).' WHERE ' . implode(' AND ',$where) ;
-		$res = $this->query( $sql );
-	
-		if($res===false) {
-			//error
-			return false;
-		}
-	
-		return true;
-	}
-	
-	/**
-	 *	Generate and execute Insert SQL commande
-	 *
-	 * 	@param	string				$table		table to update
-	 *	@param	array				$values		array of values to update
-	 *	@return	bool|result						false or boolean
-	 */
-	function insert($table,$fields){
-		 
-		foreach ($fields as $k => $v) {
-	
-			$keys[] = $k;
-			$values[] = $this->quote($v);
-			
-		}
-
-		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$table.' 
-					( '.implode( ",", $keys ).' ) 
-					VALUES ( '.implode( ",", $values ).' ) ';
-
-		$res = $this->query($sql);
-		if($res===false) {
-	
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 *	Generate and execute Delete SQL commande
-	 *
-	 * 	@param	string				$table		table for the delete
-	 *	@param	array				$values		array of values to delete
-	 *	@param  int|string|array	$key		key of value to select row to update
-	 *	@return	bool|result						false or boolean
-	 */
-	function delete($table,$fields,$key){
-		foreach ($fields as $k => $v) {
-			if (is_array($key)){
-				$i=array_search($k , $key );
-				if ( $i !== false) {
-					$where[] = $key[$i].'=' . $this->quote( $v ) ;
-					continue;
-				}
-			} else {
-				if ( $k == $key) {
-					$where[] = $k.'='.$this->quote( $v ) ;
-					continue;
-				}
-			}
-			
-		}
-	
-		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.implode(' AND ',$where);
-	
-		$res = $this->query( $sql );
-		if($res===false) {
-			return false;
-		}
-		
-		return true;
-		
-	}
-	
 }
 
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 026bd37e743..dc279cc0929 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -23,7 +23,7 @@
  
 require_once '../../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/listview.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 36a185d7fd1..57545b07948 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -23,7 +23,7 @@
  
 require_once '../../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT.'/core/class/listview.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/listview.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/core/class/listview.class.php b/htdocs/product/inventory/listview.class.php
similarity index 93%
rename from htdocs/core/class/listview.class.php
rename to htdocs/product/inventory/listview.class.php
index 91dd182fc56..51855629686 100644
--- a/htdocs/core/class/listview.class.php
+++ b/htdocs/product/inventory/listview.class.php
@@ -103,7 +103,7 @@ class Listview
 
     /**
      * @param string    $key    field name
-     * @param array     $TParam array of configuration
+     * @param string     $TParam array of configuration
      * @return array
      */
 	private function getSearchKey($key, &$TParam)
@@ -149,7 +149,7 @@ class Listview
 
 
     /**
-     * @param array     $TSQLMore   contain some additional sql instructions
+     * @param string     $TSQLMore   contain some additional sql instructions
      * @param string    $value      date with read format
      * @param string    $sKey       field name
      */
@@ -181,9 +181,9 @@ class Listview
 
 
     /**
-     * @param array     $TSQLMore   contain some additional sql instructions
+     * @param string     $TSQLMore   contain some additional sql instructions
      * @param string    $value      value to filter
-     * @param array     $TParam     array of configuration
+     * @param string     $TParam     array of configuration
      * @param string    $sKey       field name
      * @param string    $key        reference of sKey to find value into TParam
      * @return bool
@@ -222,7 +222,7 @@ class Listview
 
     /**
      * @param string    $sql    standard select sql
-     * @param array     $TParam array of configuration
+     * @param string     $TParam array of configuration
      * @return string
      */
     private function search($sql, &$TParam)
@@ -289,7 +289,7 @@ class Listview
 
     /**
      * @param string    $sql    standard select sql
-     * @param array     $TParam array of configuration
+     * @param string     $TParam array of configuration
      * @return string
      */
     public function render($sql, $TParam=array())
@@ -321,8 +321,8 @@ class Listview
 	}
 
     /**
-     * @param array     $THeader    the configuration of header
-     * @param array     $TParam     array of configuration
+     * @param string     $THeader    the configuration of header
+     * @param string     $TParam     array of configuration
      * @return array
      */
     private function setSearch(&$THeader, &$TParam)
@@ -427,8 +427,8 @@ class Listview
     /**
      * Function to analyse and calculate the total from a column
      *
-     * @param $TField
-     * @param $TParam
+     * @param string $TField    TField
+     * @param string $TParam    TParam
      * @return array
      */
     private function get_total(&$TField, &$TParam)
@@ -495,9 +495,9 @@ class Listview
     */
 	
     /**
-     * @param $TParam
-     * @param $TField
-     * @param $THeader
+     * @param string $TParam    TParam
+     * @param string $TField    TField
+     * @param string $THeader   THeader
      * @return array
      */
     private function setExport(&$TParam, $TField, $THeader)
@@ -535,8 +535,8 @@ class Listview
 	}
 
     /**
-     * @param $TField
-     * @param $TTotalGroup
+     * @param string $TField        TField
+     * @param string $TTotalGroup   TTotalGroup
      * @return array
      */
     private function addTotalGroup($TField, $TTotalGroup)
@@ -594,11 +594,11 @@ class Listview
 	}
 
     /**
-     * @param $THeader
-     * @param $TField
-     * @param $TTotal
-     * @param $TTotalGroup
-     * @param $TParam
+     * @param string $THeader   THeader
+     * @param string $TField    TField
+     * @param string $TTotal    TTotal
+     * @param string $TTotalGroup   TTotalGroup
+     * @param string $TParam        TParam
      * @return string
      */
     private function renderList(&$THeader, &$TField, &$TTotal, &$TTotalGroup, &$TParam)
@@ -723,9 +723,9 @@ class Listview
 	}
 
     /**
-     * @param $db
-     * @param $TField
-     * @param array $TParam
+     * @param string $db        Db
+     * @param string $TField    TField
+     * @param string $TParam    TParam
      */
     public function renderArray(&$db, $TField, $TParam=array())
     {
@@ -744,9 +744,9 @@ class Listview
 
 
     /**
-     * @param $THeader
-     * @param $TField
-     * @param $TParam
+     * @param string $THeader   THeader
+     * @param string $TField    TField
+     * @param string $TParam    TParam
      * @return bool
      */
     private function parse_array(&$THeader, &$TField, &$TParam)
@@ -853,8 +853,8 @@ class Listview
 	}
 
     /**
-     * @param $TParam
-     * @param $line_number
+     * @param string $TParam        TParam
+     * @param string $line_number   aaa
      * @return bool
      */
     private function in_view(&$TParam, $line_number)
@@ -874,9 +874,9 @@ class Listview
 	}
 
     /**
-     * @param $TField
-     * @param $TParam
-     * @param $currentLine
+     * @param string $TField        TField
+     * @param string $TParam        TParam
+     * @param string $currentLine   aaa
      */
     private function set_line(&$TField, &$TParam, $currentLine)
     {
@@ -910,7 +910,7 @@ class Listview
 
                     if(isset($TParam['eval'][$field]) && in_array($field,array_keys($row)))
                     {
-                        $strToEval = 'return '.strtr( $TParam['eval'][$field] ,  array_merge( $trans, array('@val@'=>$row[$field])  )).';';
+                        $strToEval = 'return '.strtr( $TParam['eval'][$field],  array_merge( $trans, array('@val@'=>$row[$field])  )).';';
                         $row[$field] = eval($strToEval);
                     }
 
@@ -932,7 +932,7 @@ class Listview
                         if($TParam['type'][$field]=='hour') { $row[$field] = date('H:i', strtotime($row[$field])); }
                         if($TParam['type'][$field]=='money') { $row[$field] = '<div align="right">'.price($row[$field],0,'',1,-1,2).'</div>'; }
                         if($TParam['type'][$field]=='number') { $row[$field] = '<div align="right">'.price($row[$field]).'</div>'; }
-                        if($TParam['type'][$field]=='integer') { $row[$field] = '<div align="right">'.(int)$row[$field].'</div>'; }
+                        if($TParam['type'][$field]=='integer') { $row[$field] = '<div align="right">'.((int) $row[$field]).'</div>'; }
                     }
 
                     if(isset($TParam['link'][$field]))
@@ -945,7 +945,7 @@ class Listview
                     {
                         if(isset($TParam['translate'][$field][''])) unset($TParam['translate'][$field]['']);
 
-                        $row[$field] = strtr( $row[$field] , $TParam['translate'][$field]);
+                        $row[$field] = strtr( $row[$field], $TParam['translate'][$field]);
                     }
                 }
             }
@@ -986,8 +986,8 @@ class Listview
 	}
 
     /**
-     * @param $sql
-     * @param $TParam
+     * @param string $sql       sql
+     * @param string $TParam    TParam
      * @return string
      */
     private function limitSQL($sql, &$TParam)
@@ -1001,10 +1001,10 @@ class Listview
 	}
 
     /**
-     * @param $THeader
-     * @param $TField
-     * @param $TParam
-     * @param $sql
+     * @param string $THeader   THeader
+     * @param string $TField    TField
+     * @param string $TParam    TParam
+     * @param string $sql       sql
      */
     private function parse_sql(&$THeader, &$TField, &$TParam, $sql)
     {

From e11254a9bf8cc5f23974db3b91b1065ca2610a65 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 30 Apr 2017 15:04:51 +0200
Subject: [PATCH 0676/1163] Add option on accounting account getNomUrl

---
 .../class/accountingaccount.class.php         | 55 ++++++++++++++-----
 htdocs/langs/en_US/accountancy.lang           |  1 +
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 4174ee7809f..dfb29be6323 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -364,28 +364,55 @@ class AccountingAccount extends CommonObject
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
-	 * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
-	 * @return string Chaine avec URL
+	 * @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+	 * @param	int		$withlabel		0=No label, 1=Include label of account
+	 * @param	string  $moretitle		Add more text to title tooltip
+	 * @param	int  	$notooltip		1=Disable tooltip
+	 * @return	string	String with URL
 	 */
-	function getNomUrl($withpicto = 0) {
-		global $langs;
+	function getNomUrl($withpicto = 0, $withlabel = 0, $moretitle='',$notooltip=0)
+	{
+		global $langs, $conf, $user;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+		
+		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
 
 		$result = '';
 
-		$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id . '">';
-		$linkend = '</a>';
+		$url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id;
 
 		$picto = 'billr';
+		$label='';
 
-		$label = $langs->trans("Show") . ': ' . $this->account_number . ' - ' . $this->label;
+		$label = '<u>' . $langs->trans("ShowAccountingAccount") . '</u>';
+		if (! empty($this->account_number))
+			$label .= '<br><b>'.$langs->trans('AccountAccounting') . ':</b> ' . length_accountg($this->account_number);
+		if (! empty($this->label))
+			$label .= '<br><b>'.$langs->trans('Label') . ':</b> ' . $this->label;
+		if ($moretitle) $label.=' - '.$moretitle;
 
-		if ($withpicto)
-			$result .= ($link . img_object($label, $picto) . $linkend);
-		if ($withpicto && $withpicto != 2)
-			$result .= ' ';
-		if ($withpicto != 2)
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-			$result .= $link . length_accountg($this->account_number) . ' - ' . $this->label . $linkend;
+		$linkclose='';
+		if (empty($notooltip))
+		{
+		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+		    {
+		        $label=$langs->trans("ShowAccoutingAccount");
+		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+		    }
+		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+		    $linkclose.=' class="classfortooltip"';
+		}
+
+        $linkstart='<a href="'.$url.'"';
+        $linkstart.=$linkclose.'>';
+		$linkend='</a>';
+
+		$label_link = length_accountg($this->account_number);
+		if ($withlabel) $label_link .= ' - ' . $this->label;
+
+		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		if ($withpicto && $withpicto != 2) $result .= ' ';
+		if ($withpicto != 2) $result.=$linkstart . $label_link . $linkend;
 		return $result;
 	}
 	
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index bd1e41c5464..f9162c5ca21 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -59,6 +59,7 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+ShowAccoutingAccount=Show accounting account
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts

From 1dd462d94783bc972ba8fc08daf80db5b49dc5dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Apr 2017 23:39:35 +0200
Subject: [PATCH 0677/1163] Fix disable notification on smartphone

---
 htdocs/main.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6a92e0f4eed..ab92df9ca12 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1271,9 +1271,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             {
                 $enablebrowsernotif=false;
                 if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_NOTIFICATION)) $enablebrowsernotif=true;
+                if ($conf->browser->layout == 'phone') $enablebrowsernotif=false;
                 if ($enablebrowsernotif)
                 {
-                    print '<!-- Includes JS of Dolibarr -->'."\n";
+                    print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
                     print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php?version='.urlencode(DOL_VERSION).($ext?'&amp;'.$ext:'').'"></script>'."\n";
                 }
             }

From 6afd0d642a7bc6a70278f93b35273364609e64a3 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 1 May 2017 08:16:09 +0200
Subject: [PATCH 0678/1163] Finish to move accountancy journals list to page
 like dictionnary

---
 htdocs/accountancy/admin/journals_card.php    | 296 -------
 htdocs/accountancy/admin/journals_list.php    | 808 +++++++++++++++---
 .../class/accountingjournal.class.php         | 260 ------
 htdocs/core/menus/init_menu_auguria.sql       |  17 +-
 htdocs/core/menus/standard/eldy.lib.php       |   2 +-
 htdocs/install/mysql/data/llx_accounting.sql  |   8 +-
 .../mysql/tables/llx_accounting_journal.sql   |   2 +-
 htdocs/langs/en_US/accountancy.lang           |  10 +-
 htdocs/langs/en_US/admin.lang                 |   1 +
 9 files changed, 720 insertions(+), 684 deletions(-)
 delete mode 100644 htdocs/accountancy/admin/journals_card.php

diff --git a/htdocs/accountancy/admin/journals_card.php b/htdocs/accountancy/admin/journals_card.php
deleted file mode 100644
index aae3f8b2cb1..00000000000
--- a/htdocs/accountancy/admin/journals_card.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-/* Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file        htdocs/accountancy/admin/journals_card.php
- * \ingroup     Advanced accountancy
- * \brief       Page to show an accounting journal
- */
-require '../../main.inc.php';
-
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-
-$langs->load("admin");
-$langs->load("compta");
-$langs->load("accountancy");
-
-// Security check
-if ($user->societe_id > 0)
-	accessforbidden();
-if (empty($user->rights->accounting->fiscalyear))
-	accessforbidden();
-
-$error = 0;
-
-$action = GETPOST('action', 'alpha');
-$confirm = GETPOST('confirm', 'alpha');
-$id = GETPOST('id', 'int');
-
-// List of status
-static $tmptype2label = array (
-		'0' => 'AccountingJournalTypeVariousOperation',
-		'1' => 'AccountingJournalTypeSale',
-		'2' => 'AccountingJournalTypePurchase',
-		'3' => 'AccountingJournalTypeBank',
-		'9' => 'AccountingJournalTypeHasNew'
-);
-$type2label = array (
-		'' 
-);
-foreach ( $tmptype2label as $key => $val )
-	$type2label[$key] = $langs->trans($val);
-
-$object = new AccountingJournal($db);
-
-/*
- * Actions
- */
-
-if ($action == 'confirm_delete' && $confirm == "yes") {
-	$result = $object->delete($id);
-	if ($result >= 0) {
-		header("Location: journals_list.php");
-		exit();
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-} 
-
-else if ($action == 'add') {
-	if (! GETPOST('cancel', 'alpha')) {
-		$error = 0;
-
-		$object->code = GETPOST('code', 'alpha');
-		$object->label = GETPOST('label', 'alpha');
-		$object->nature = GETPOST('nature', 'int');
-
-		if (empty($object->code)) {
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Code")), null, 'errors');
-			$error ++;
-		}
-		if (empty($object->label)) {
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			$error ++;
-		}
-
-		if (! $error) {
-			$db->begin();
-
-			$id = $object->create($user);
-
-			if ($id > 0) {
-				$db->commit();
-
-				header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-				exit();
-			} else {
-				$db->rollback();
-
-				setEventMessages($object->error, $object->errors, 'errors');
-				$action = 'create';
-			}
-		} else {
-			$action = 'create';
-		}
-	} else {
-		header("Location: journals_list.php");
-		exit();
-	}
-} 
-
-// Update record
-else if ($action == 'update') {
-	if (! GETPOST('cancel', 'alpha')) {
-		$result = $object->fetch($id);
-
-		$object->code = GETPOST('code', 'alpha');
-		$object->label = GETPOST('label', 'alpha');
-		$object->nature = GETPOST('nature', 'int');
-
-		if (empty($object->code)) {
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Code")), null, 'errors');
-			$error ++;
-		}
-		if (empty($object->label)) {
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			$error ++;
-		}
-
-		$result = $object->update($user);
-		
-		if ($result > 0) {
-			header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-			exit();
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	} else {
-		header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-		exit();
-	}
-}
-
-
-
-/*
- * View
- */
-
-$title = $langs->trans("Journal") . " - " . $langs->trans("Card");
-$helpurl = "";
-llxHeader("",$title,$helpurl);
-
-$form = new Form($db);
-
-if ($action == 'create') 
-{
-	print load_fiche_titre($langs->trans("NewAccountingJournal"));
-
-	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-	print '<input type="hidden" name="action" value="add">';
-
-	dol_fiche_head();
-
-	print '<table class="border" width="100%">';
-
-	// Code
-	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans("Code") . '</td><td><input name="code" size="10" value="' . GETPOST("code") . '"></td></tr>';
-
-
-	// Label
-	print '<tr><td class="fieldrequired">' . $langs->trans("Label") . '</td><td><input name="label" size="32" value="' . GETPOST("label") . '"></td></tr>';
-
-	// Nature
-	print '<tr>';
-	print '<td class="fieldrequired">' . $langs->trans("Type") . '</td>';
-	print '<td class="valeur">';
-	print $form->selectarray('nature', $type2label, GETPOST('nature'));
-	print '</td></tr>';
-	
-	print '</table>';
-
-	dol_fiche_end();
-
-	print '<div class="center">';
-	print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
-	print '</div>';
-
-	print '</form>';
-} else if ($id) {
-	$result = $object->fetch($id);
-	if ($result > 0) {
-		$head = accounting_journal_prepare_head($object);
-
-		if ($action == 'edit') {
-			dol_fiche_head($head, 'card', $langs->trans("AccountingJournal"), 0, 'cron');
-
-			print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
-			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-			print '<input type="hidden" name="action" value="update">';
-			print '<input type="hidden" name="id" value="' . $id . '">';
-
-			print '<table class="border" width="100%">';
-
-			// Code
-			print "<tr>";
-			print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("Code") . '</td><td>';
-			print '<input name="code" class="flat" size="8" value="' . $object->code . '">';
-			print '</td></tr>';
-
-			// Label
-			print '<tr><td class="fieldrequired">' . $langs->trans("Label") . '</td><td>';
-			print '<input name="label" class="flat" size="32" value="' . $object->label . '">';
-			print '</td></tr>';
-
-			// Nature
-			print '<tr><td>' . $langs->trans("Type") . '</td><td>';
-			print $form->selectarray('nature', $type2label, $object->nature);
-			print '</td></tr>';
-
-			print '</table>';
-
-			dol_fiche_end();
-
-			print '<div class="center">';
-			print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" name="cancel" class="button" value="' . $langs->trans("Cancel") . '">';
-			print '</div>';
-
-			print '</form>';
-
-			dol_fiche_end();
-		} else {
-			/*
-			 * Confirm delete
-			 */
-			if ($action == 'delete') {
-				print $form->formconfirm($_SERVER["PHP_SELF"] . "?id=" . $id, $langs->trans("DeleteFiscalYear"), $langs->trans("ConfirmDeleteFiscalYear"), "confirm_delete");
-			}
-
-			dol_fiche_head($head, 'card', $langs->trans("AccountingJournal"), 0, 'cron');
-
-			print '<table class="border" width="100%">';
-
-			$linkback = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/journals_list.php">' . $langs->trans("BackToList") . '</a>';
-
-			// Ref
-			print '<tr><td class="titlefield">' . $langs->trans("Code") . '</td><td width="50%">';
-			print $object->code;
-			print '</td><td>';
-			print $linkback;
-			print '</td></tr>';
-
-			// Label
-			print '<tr><td class="tdtop">';
-			print $form->editfieldkey("Label", 'label', $object->label, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'alpha:32');
-			print '</td><td colspan="2">';
-			print $form->editfieldval("Label", 'label', $object->label, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'alpha:32');
-			print "</td></tr>";
-
-			// Nature
-			print '<tr><td>' . $langs->trans("Type") . '</td><td colspan="2">' . $object->getLibType(0) . '</td></tr>';
-
-			print "</table>";
-
-			dol_fiche_end();
-
-			if (! empty($user->rights->accounting->chartofaccount))
-			{
-    			/*
-    			 * Barre d'actions
-    			 */
-    			print '<div class="tabsAction">';
-
-    			print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&id=' . $id . '">' . $langs->trans('Modify') . '</a>';
-
-    			print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
-
-    			print '</div>';
-			}
-		}
-	} else {
-		dol_print_error($db);
-	}
-}
-
-llxFooter();
-$db->close();
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index f7ba79457a8..be532c7c25f 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -22,147 +22,737 @@
  * \brief		Setup page to configure journals
  */
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-
-$action = GETPOST('action');
-
-// Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortfield) $sortfield="j.rowid"; // Set here default search field
-if (! $sortorder) $sortorder="ASC";
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 
 $langs->load("admin");
 $langs->load("compta");
 $langs->load("accountancy");
 
-// Security check
-if ($user->societe_id > 0)
+$action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
+$confirm=GETPOST('confirm','alpha');
+$id=GETPOST('id','int');
+$rowid=GETPOST('rowid','alpha');
+
+// Security access
+if (! empty($user->rights->accountancy->chartofaccount))
+{
 	accessforbidden();
-if (! $user->rights->accounting->fiscalyear)              // If we can read accounting records, we shoul be able to see fiscal year.
-    accessforbidden();
-	
+}
+
+$acts[0] = "activate";
+$acts[1] = "disable";
+$actl[0] = img_picto($langs->trans("Disabled"),'switch_off');
+$actl[1] = img_picto($langs->trans("Activated"),'switch_on');
+
+$listoffset=GETPOST('listoffset');
+$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000;
+$active = 1;
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0 ; }
+$offset = $listlimit * $page ;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
 $error = 0;
 
-// List of status
-/*
-static $tmptype2label = array (
-		'0' => 'AccountingJournalTypeVariousOperation',
-		'1' => 'AccountingJournalTypeSale',
-		'2' => 'AccountingJournalTypePurchase',
-		'3' => 'AccountingJournalTypeBank',
-		'9' => 'AccountingJournalTypeHasNew'
-);
-$type2label = array (
-		'' 
-);
-foreach ( $tmptype2label as $key => $val )
-	$type2label[$key] = $langs->trans($val);
-*/
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('admin'));
 
-$errors = array ();
+// This page is a generic page to edit dictionaries
+// Put here declaration of dictionaries properties
 
-$object = new AccountingJournal($db);
+// Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
+$taborder=array(35);
 
+// Name of SQL tables of dictionaries
+$tabname=array();
+$tabname[35]= MAIN_DB_PREFIX."accounting_journal";
+
+// Dictionary labels
+$tablib=array();
+$tablib[35]= "DictionaryAccountancyJournal";
+
+// Requests to extract data
+$tabsql=array();
+$tabsql[35]= "SELECT a.rowid as rowid, a.code as code, a.label, a.nature, a.active FROM ".MAIN_DB_PREFIX."accounting_journal as a";
+
+// Criteria to sort dictionaries
+$tabsqlsort=array();
+$tabsqlsort[35]="code ASC";
+
+// Nom des champs en resultat de select pour affichage du dictionnaire
+$tabfield=array();
+$tabfield[35]= "code,label,nature";
+
+// Nom des champs d'edition pour modification d'un enregistrement
+$tabfieldvalue=array();
+$tabfieldvalue[35]= "code,label,nature";
+
+// Nom des champs dans la table pour insertion d'un enregistrement
+$tabfieldinsert=array();
+$tabfieldinsert[35]= "code,label,nature";
+
+// Nom du rowid si le champ n'est pas de type autoincrement
+// Example: "" if id field is "rowid" and has autoincrement on
+//          "nameoffield" if id field is not "rowid" or has not autoincrement on
+$tabrowid=array();
+$tabrowid[35]= "";
+
+// Condition to show dictionary in setup page
+$tabcond=array();
+$tabcond[35]= ! empty($conf->accounting->enabled);
+
+// List of help for fields
+$tabhelp=array();
+$tabhelp[35] = array('code'=>$langs->trans("EnterAnyCode"));
+
+// List of check for fields (NOT USED YET)
+$tabfieldcheck=array();
+$tabfieldcheck[35] = array();
+
+// Complete all arrays with entries found into modules
+complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp,$tabfieldcheck);
+
+
+// Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
+$elementList = array();
+	$sourceList = array(
+			'1' => $langs->trans('AccountingJournalType0'),
+			'2' => $langs->trans('AccountingJournalType1'),
+			'3' => $langs->trans('AccountingJournalType2'),
+			'4' => $langs->trans('AccountingJournalType3'),
+			'9' => $langs->trans('AccountingJournalType9')
+	);
 
 /*
  * Actions
  */
 
+if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
+{
+    $search_country_id = '';    
+}
 
+// Actions add or modify an entry into a dictionary
+if (GETPOST('actionadd') || GETPOST('actionmodify'))
+{
+    $listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
+    $listfieldinsert=explode(',',$tabfieldinsert[$id]);
+    $listfieldmodify=explode(',',$tabfieldinsert[$id]);
+    $listfieldvalue=explode(',',$tabfieldvalue[$id]);
+
+    // Check that all fields are filled
+    $ok=1;
+    foreach ($listfield as $f => $value)
+    {
+		if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
+        if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+		if ($fieldnamekey == 'nature') $fieldnamekey = 'Nature';
+    }
+    // Other checks
+    if (isset($_POST["code"]))
+    {
+    	if ($_POST["code"]=='0')
+    	{
+        	$ok=0;
+    		setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
+        }
+        /*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
+    	{
+	    	$ok = 0;
+	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
+	    }*/
+    }
+
+	// Clean some parameters
+    if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"]='';	// If empty, we force to null
+	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"]='';	// If empty, we force to null
+	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"]='';	// If empty, we force to null
+
+    // Si verif ok et action add, on ajoute la ligne
+    if ($ok && GETPOST('actionadd'))
+    {
+        if ($tabrowid[$id])
+        {
+            // Recupere id libre pour insertion
+            $newid=0;
+            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $obj = $db->fetch_object($result);
+                $newid=($obj->newid + 1);
+
+            } else {
+                dol_print_error($db);
+            }
+        }
+
+        // Add new entry
+        $sql = "INSERT INTO ".$tabname[$id]." (";
+        // List of fields
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+        	$sql.= $tabrowid[$id].",";
+        $sql.= $tabfieldinsert[$id];
+        $sql.=",active)";
+        $sql.= " VALUES(";
+
+        // List of values
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+        	$sql.= $newid.",";
+        $i=0;
+        foreach ($listfieldinsert as $f => $value)
+        {
+            if ($value == 'price' || preg_match('/^amount/i',$value) || $value == 'taux') {
+            	$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
+            }
+            else if ($value == 'entity') {
+            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+            }
+            if ($i) $sql.=",";
+            if ($_POST[$listfieldvalue[$i]] == '' && ! ($listfieldvalue[$i] == 'code' && $id == 10)) $sql.="null";  // For vat, we want/accept code = ''
+            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+            $i++;
+        }
+        $sql.=",1)";
+
+        dol_syslog("actionadd", LOG_DEBUG);
+        $result = $db->query($sql);
+        if ($result)	// Add is ok
+        {
+            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+        	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
+        }
+        else
+        {
+            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+            }
+            else {
+                dol_print_error($db);
+            }
+        }
+    }
+
+    // Si verif ok et action modify, on modifie la ligne
+    if ($ok && GETPOST('actionmodify'))
+    {
+        if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+        else { $rowidcol="rowid"; }
+
+        // Modify entry
+        $sql = "UPDATE ".$tabname[$id]." SET ";
+        // Modifie valeur des champs
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldmodify))
+        {
+            $sql.= $tabrowid[$id]."=";
+            $sql.= "'".$db->escape($rowid)."', ";
+        }
+        $i = 0;
+        foreach ($listfieldmodify as $field)
+        {
+            if ($field == 'price' || preg_match('/^amount/i',$field) || $field == 'taux') {
+            	$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
+            }
+            else if ($field == 'entity') {
+            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+            }
+            if ($i) $sql.=",";
+            $sql.= $field."=";
+            if ($_POST[$listfieldvalue[$i]] == '' && ! ($listfieldvalue[$i] == 'code' && $id == 10)) $sql.="null";  // For vat, we want/accept code = ''
+            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+            $i++;
+        }
+        $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
+
+        dol_syslog("actionmodify", LOG_DEBUG);
+        //print $sql;
+        $resql = $db->query($sql);
+        if (! $resql)
+        {
+            setEventMessages($db->error(), null, 'errors');
+        }
+    }
+    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+}
+
+if (GETPOST('actioncancel'))
+{
+    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+}
+
+if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
+
+    dol_syslog("delete", LOG_DEBUG);
+    $result = $db->query($sql);
+    if (! $result)
+    {
+        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+        {
+            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+    }
+}
+
+// activate
+if ($action == $acts[0])
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$_GET["code"]."'";
+    }
+
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
+}
+
+// disable
+if ($action == $acts[1])
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$_GET["code"]."'";
+    }
+
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
+}
 
 /*
  * View
  */
-$title = $langs->trans('AccountingJournals');
-$helpurl = "";
-llxHeader('', $title, $helpurl);
 
-$max = 100;
 $form = new Form($db);
+$formadmin=new FormAdmin($db);
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
-print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
+llxHeader();
 
-$head = admin_accounting_prepare_head(null);
-
-dol_fiche_head($head, 'journal', $langs->trans("Configuration"), -1, 'cron');
-
-$sql = "SELECT j.rowid, j.code, j.label, j.nature, j.active";
-$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_journal as j";
-// $sql .= " WHERE j.entity = " . $conf->entity;
-$sql.=$db->order($sortfield,$sortorder);
-
-// Count total nb of records
-$nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+$titre=$langs->trans("DictionarySetup");
+$linkback='';
+if ($id)
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
+    $titre.=' - '.$langs->trans($tablib[$id]);
+    $titlepicto='title_accountancy';
 }
 
-$sql.= $db->plimit($limit+1, $offset);
+print load_fiche_titre($titre,$linkback,$titlepicto);
 
-$result = $db->query($sql);
-if ($result) {
-	$num = $db->num_rows($result);
-
-	$i = 0;
-
-	// $title = $langs->trans('AccountingJournals');
-	// print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit, 1);
-
-	// Load attribute_label
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	// print '<td>' . $langs->trans("Ref") . '</td>';
-	print '<td>' . $langs->trans("Code") . '</td>';
-	print '<td>' . $langs->trans("Label") . '</td>';
-	print '<td>' . $langs->trans("Nature") . '</td>';
-	print '</tr>';
-
-	if ($num) {
-		$accountingjournalstatic = new AccountingJournal($db);
-
-		while ( $i < $num && $i < $max ) {
-			$obj = $db->fetch_object($result);
-			$accountingjournalstatic->id = $obj->rowid;
-			print '<tr class="oddeven">';
-			print '<td><a href="journals_card.php?id=' . $obj->rowid . '">' . img_object($langs->trans("ShowJournal"), "technic") . ' ' . $obj->code . '</a></td>';
-			print '<td align="left">' . $obj->label . '</td>';
-			print '<td>' . $accountingjournalstatic->LibType($obj->nature, 0) . '</td>';
-			print '</tr>';
-			$i ++;
-		}
-	} else {
-		print '<tr class="oddeven"><td colspan="3" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
-	}
-	print '</table>';
-} else {
-	dol_print_error($db);
-}
-
-dol_fiche_end();
-
-// Buttons
-print '<div class="tabsAction">';
-if (! empty($user->rights->accounting->chartofaccount))
+if (empty($id))
 {
-    print '<a class="butAction" href="journals_card.php?action=create">' . $langs->trans("NewAccountingJournal") . '</a>';
+    print $langs->trans("DictionaryDesc");
+    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
 }
-else
+print "<br>\n";
+
+
+// Confirmation de la suppression de la ligne
+if ($action == 'delete')
 {
-    print '<a class="butActionRefused" href="#">' . $langs->trans("NewAccountingJournal") . '</a>';
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$_GET["code"].'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
 }
-print '</div>';
+//var_dump($elementList);
+
+/*
+ * Show a dictionary
+ */
+if ($id)
+{
+    // Complete requete recherche valeurs avec critere de tri
+    $sql=$tabsql[$id];
+
+    if ($search_country_id > 0)
+    {
+        if (preg_match('/ WHERE /',$sql)) $sql.= " AND ";
+        else $sql.=" WHERE ";
+        $sql.= " c.rowid = ".$search_country_id;
+    }
+    
+    if ($sortfield)
+    {
+        // If sort order is "country", we use country_code instead
+    	if ($sortfield == 'country') $sortfield='country_code';
+        $sql.= " ORDER BY ".$sortfield;
+        if ($sortorder)
+        {
+            $sql.=" ".strtoupper($sortorder);
+        }
+        $sql.=", ";
+        // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
+        $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
+        $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
+    }
+    else {
+        $sql.=" ORDER BY ";
+    }
+    $sql.=$tabsqlsort[$id];
+    $sql.=$db->plimit($listlimit+1,$offset);
+    //print $sql;
+
+    $fieldlist=explode(',',$tabfield[$id]);
+
+    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
+    
+    print '<table class="noborder" width="100%">';
+
+    // Form to add a new line
+    if ($tabname[$id])
+    {
+        $alabelisused=0;
+        $var=false;
+
+        $fieldlist=explode(',',$tabfield[$id]);
+
+        // Line for title
+        print '<tr class="liste_titre">';
+        foreach ($fieldlist as $field => $value)
+        {
+            // Determine le nom du champ par rapport aux noms possibles
+            // dans les dictionnaires de donnees
+            $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
+            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
+            $align="left";
+            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
+            {
+            	$valuetoshow=$langs->trans("Label");
+            }
+            if ($fieldlist[$field]=='nature')          { $valuetoshow=$langs->trans("Nature"); }
+				
+            if ($valuetoshow != '')
+            {
+                print '<td align="'.$align.'">';
+            	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
+            	else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
+            	else print $valuetoshow;
+                print '</td>';
+             }
+             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
+        }
+
+        if ($id == 4) print '<td></td>';
+        print '<td>';
+        print '<input type="hidden" name="id" value="'.$id.'">';
+        print '</td>';
+        print '<td style="min-width: 26px;"></td>';
+        print '<td style="min-width: 26px;"></td>';
+        print '<td style="min-width: 26px;"></td>';
+        print '</tr>';
+
+        // Line to enter new values
+        print "<tr ".$bcnd[$var].">";
+
+        $obj = new stdClass();
+        // If data was already input, we define them in obj to populate input fields.
+        if (GETPOST('actionadd'))
+        {
+            foreach ($fieldlist as $key=>$val)
+            {
+                if (GETPOST($val) != '')
+                	$obj->$val=GETPOST($val);
+            }
+        }
+
+        $tmpaction = 'create';
+        $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+        $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+        $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+        if (empty($reshook))
+        {
+       		fieldList($fieldlist,$obj,$tabname[$id],'add');
+        }
+
+        print '<td colspan="4" align="right">';
+       	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+        print '</td>';
+        print "</tr>";
+
+        $colspan=count($fieldlist)+3;
+
+        if (! empty($alabelisused))  // If there is one label among fields, we show legend of *
+        {
+        	print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
+        }
+        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
+    }
+
+
+
+    // List of available record in database
+    dol_syslog("htdocs/admin/dict", LOG_DEBUG);
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
+        $var=true;
+
+        $param = '&id='.$id;
+        if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
+        $paramwithsearch = $param;
+        if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
+        if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
+        if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
+        
+        // There is several pages
+        if ($num > $listlimit)
+        {
+            print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
+            print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
+            print '</td></tr>';
+        }
+
+        // Title of lines
+        print '<tr class="liste_titre liste_titre_add">';
+        foreach ($fieldlist as $field => $value)
+        {
+            // Determine le nom du champ par rapport aux noms possibles
+            // dans les dictionnaires de donnees
+            $showfield=1;							  	// By defaut
+            $align="left";
+            $sortable=1;
+            $valuetoshow='';
+            /*
+            $tmparray=getLabelOfField($fieldlist[$field]);
+            $showfield=$tmp['showfield'];
+            $valuetoshow=$tmp['valuetoshow'];
+            $align=$tmp['align'];
+            $sortable=$tmp['sortable'];
+			*/
+            $valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
+            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
+            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
+            if ($fieldlist[$field]=='nature')          { $valuetoshow=$langs->trans("Nature"); }
+
+            // Affiche nom du champ
+            if ($showfield)
+            {
+                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
+            }
+        }
+		print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
+        print getTitleFieldOfList('');
+        print getTitleFieldOfList('');
+        print getTitleFieldOfList('');
+        print '</tr>';
+
+        // Title line with search boxes
+        print '<tr class="liste_titre_filter">';
+        print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre" align="center">';
+    	if ($filterfound)
+    	{
+        	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+        	print $searchpitco;
+    	}
+    	print '</td>';
+    	print '</tr>';
+            
+        if ($num)
+        {
+            // Lines with values
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($resql);
+                //print_r($obj);
+                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+                if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
+                {
+                    $tmpaction='edit';
+                    $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                    $reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+                    $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+                    // Show fields
+                    if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
+
+                    print '<td></td>';
+                    print '<td></td>';
+                    print '<td align="center">';
+                    print '<input type="hidden" name="page" value="'.$page.'">';
+                    print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+                    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+                    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
+                    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+                    print '</td>';
+                }
+                else
+                {
+	              	$tmpaction = 'view';
+                    $parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                    $reshook=$hookmanager->executeHooks('viewDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+
+                    $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+                    if (empty($reshook))
+                    {
+                        foreach ($fieldlist as $field => $value)
+                        {
+                            
+                            $showfield=1;
+                        	$align="left";
+                            $valuetoshow=$obj->{$fieldlist[$field]};
+                            if ($valuetoshow=='all') {
+                                $valuetoshow=$langs->trans('All');
+                            }
+                            else if ($fieldlist[$field]=='nature' && $tabname[$id]==MAIN_DB_PREFIX.'accounting_journal') {
+                                $langs->load("accountancy");
+                                $key=$langs->trans("AccountingJournalType".strtoupper($obj->nature));
+                                $valuetoshow=($obj->nature && $key != "AccountingJournalType".strtoupper($obj->nature)?$key:$obj->{$fieldlist[$field]});
+                            }
+
+                            $class='tddict';
+							// Show value for field
+							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
+                        }
+                    }
+
+                    // Can an entry be erased or disabled ?
+                    $iserasable=1;$canbedisabled=1;$canbemodified=1;	// true by default
+                    if (isset($obj->code) && $id != 10)
+                    {
+                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) { $iserasable = 0; $canbedisabled = 0; }
+                    	else if ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; }
+                    	else if ($obj->code == 'EF0')   { $iserasable = 0; $canbedisabled = 0; }
+                    }
+
+                    if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable=0; }
+                    if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled=0; $canbedisabled = 0; }
+                    $canbemodified=$iserasable;
+                    if ($obj->code == 'RECEP') $canbemodified=1;
+
+                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
+                    if ($param) $url .= '&'.$param;
+                    $url.='&';
+
+                    // Active
+                    print '<td align="center" class="nowrap">';
+                    if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+                    else
+                 	{
+                 		if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
+                 		else if (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
+                  		else if (isset($obj->type) && in_array($obj->type, array('system')) && ! empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
+                    	else print $langs->trans("AlwaysActive");
+                    }
+                    print "</td>";
+
+                    // Modify link
+                    if ($canbemodified) print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
+                    else print '<td>&nbsp;</td>';
+
+                    // Delete link
+                    if ($iserasable)
+                    {
+                        print '<td align="center">';
+                        if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
+                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionnary can be edited by other profile than admin
+                        print '</td>';
+                    }
+                    else print '<td>&nbsp;</td>';
+
+                    print '</td>';
+                    print "</tr>\n";
+                }
+                $i++;
+            }
+        }
+    }
+    else {
+        dol_print_error($db);
+    }
+
+    print '</table>';
+
+    print '</form>';
+}
+
+print '<br>';
+
 
 llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();
+
+
+/**
+ *	Show fields in insert/edit mode
+ *
+ * 	@param		array	$fieldlist		Array of fields
+ * 	@param		Object	$obj			If we show a particular record, obj is filled with record fields
+ *  @param		string	$tabname		Name of SQL table
+ *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
+ *	@return		void
+ */
+function fieldList($fieldlist, $obj='', $tabname='', $context='')
+{
+	global $conf,$langs,$db;
+	global $form, $mysoc;
+	global $region_id;
+	global $elementList,$sourceList,$localtax_typeList;
+	global $bc;
+
+	$formadmin = new FormAdmin($db);
+	$formcompany = new FormCompany($db);
+
+	foreach ($fieldlist as $field => $value)
+	{
+		if ($fieldlist[$field] == 'nature')
+		{
+			print '<td>';
+			print $form->selectarray('nature', $sourceList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			print '</td>';
+		}
+		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
+			print '<td><input type="text" class="flat minwidth100" value="'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
+		}
+		else
+		{
+			print '<td>';
+			$size=''; $class='';
+			if ($fieldlist[$field]=='code')  $class='maxwidth100';
+			if ($fieldlist[$field]=='label') $class='quatrevingtpercent';
+			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $size='size="2" ';
+			print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="'.(isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
+			print '</td>';
+		}
+	}
+}
\ No newline at end of file
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index d7cc61d6418..064f56bddd6 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -82,208 +82,6 @@ class AccountingJournal extends CommonObject
 		}
 	}
 	
-	/**
-	 * Insert journal in database
-	 *
-	 * @param	User	$user		Use making action
-	 * @param	int		$notrigger	Disable triggers
-	 * @return 	int 				<0 if KO, >0 if OK
-	 */
-	function create($user, $notrigger = 0)
-	{
-		global $conf;
-		$error = 0;
-		$now = dol_now();
-		
-		// Clean parameters
-		if (isset($this->code))
-			$this->code = trim($this->code);
-		if (isset($this->label))
-			$this->label = trim($this->label);
-
-		// Check parameters
-		if (empty($this->nature) || $this->nature == '-1')
-		{
-		    $this->nature = '0';
-		}
-
-		// Insert request
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_journal(";
-		$sql .= "code";
-		$sql .= ", label";
-		$sql .= ", nature";
-		$sql .= ", active";
-		$sql .= ") VALUES (";
-		$sql .= " " . (empty($this->code) ? 'NULL' : "'" . $this->db->escape($this->code) . "'");
-		$sql .= ", " . (empty($this->label) ? 'NULL' : "'" . $this->db->escape($this->label) . "'");
-		$sql .= ", " . (empty($this->nature) ? '0' : "'" . $this->db->escape($this->nature) . "'");
-		$sql .= ", " . (! isset($this->active) ? 'NULL' : $this->db->escape($this->active));
-		$sql .= ")";
-		
-		$this->db->begin();
-		
-		dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error ++;
-			$this->errors[] = "Error " . $this->db->lasterror();
-		}
-		
-		if (! $error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_journal");
-			
-			// if (! $notrigger) {
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action calls a trigger.
-			
-			// // Call triggers
-			// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			// $interface=new Interfaces($this->db);
-			// $result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-			// if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// // End call triggers
-			// }
-		}
-		
-		// Commit or rollback
-		if ($error) {
-			foreach ( $this->errors as $errmsg ) {
-				dol_syslog(get_class($this) . "::create " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
-			}
-			$this->db->rollback();
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-			return $this->id;
-		}
-	}
-	
-	/**
-	 * Update record
-	 *
-	 * @param  User $user      Use making update
-	 * @return int             <0 if KO, >0 if OK
-	 */
-	function update($user) 
-	{
-	    // Check parameters
-	    if (empty($this->nature) || $this->nature == '-1')
-	    {
-	        $this->nature = '0';
-	    }
-
-	    $this->db->begin();
-		
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_journal ";
-		$sql .= " SET code = " . ($this->code ? "'" . $this->db->escape($this->code) . "'" : "null");
-		$sql .= " , label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "null");
-		$sql .= " , nature = " . ($this->nature ? "'" . $this->db->escape($this->nature) . "'" : "0");
-		$sql .= " , active = '" . $this->active . "'";
-		$sql .= " WHERE rowid = " . $this->id;
-		
-		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result) {
-			$this->db->commit();
-			return 1;
-		} else {
-			$this->error = $this->db->lasterror();
-			$this->db->rollback();
-			return - 1;
-		}
-	}
-	
-	/**
-	 * Check usage of accounting journal
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	function checkUsage() {
-		global $langs;
-		
-		$sql = "(SELECT fk_code_ventilation FROM " . MAIN_DB_PREFIX . "facturedet";
-		$sql .= " WHERE  fk_code_ventilation=" . $this->id . ")";
-		$sql .= "UNION";
-		$sql .= "(SELECT fk_code_ventilation FROM " . MAIN_DB_PREFIX . "facture_fourn_det";
-		$sql .= " WHERE  fk_code_ventilation=" . $this->id . ")";
-		
-		dol_syslog(get_class($this) . "::checkUsage sql=" . $sql, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			if ($num > 0) {
-				$this->error = $langs->trans('ErrorAccountingJournalIsAlreadyUse');
-				return 0;
-			} else {
-				return 1;
-			}
-		} else {
-			$this->error = $this->db->lasterror();
-			return - 1;
-		}
-	}
-	
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user User that deletes
-	 * @param int $notrigger 0=triggers after, 1=disable triggers
-	 * @return int <0 if KO, >0 if OK
-	 */
-	function delete($user, $notrigger = 0) {
-		$error = 0;
-		
-		$result = $this->checkUsage();
-		
-		if ($result > 0) {
-			
-			$this->db->begin();
-			
-			// if (! $error) {
-			// if (! $notrigger) {
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action calls a trigger.
-			
-			// // Call triggers
-			// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			// $interface=new Interfaces($this->db);
-			// $result=$interface->run_triggers('ACCOUNTANCY_ACCOUNT_DELETE',$this,$user,$langs,$conf);
-			// if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// // End call triggers
-			// }
-			// }
-			
-			if (! $error) {
-				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accounting_journal";
-				$sql .= " WHERE rowid=" . $this->id;
-				
-				dol_syslog(get_class($this) . "::delete sql=" . $sql);
-				$resql = $this->db->query($sql);
-				if (! $resql) {
-					$error ++;
-					$this->errors[] = "Error " . $this->db->lasterror();
-				}
-			}
-			
-			// Commit or rollback
-			if ($error) {
-				foreach ( $this->errors as $errmsg ) {
-					dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-					$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
-				}
-				$this->db->rollback();
-				return - 1 * $error;
-			} else {
-				$this->db->commit();
-				return 1;
-			}
-		} else {
-			return - 1;
-		}
-	}
-	
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
@@ -311,64 +109,6 @@ class AccountingJournal extends CommonObject
 		return $result;
 	}
 	
-	/**
-	 * Deactivate journal
-	 *
-	 * @param int $id Id
-	 * @return int <0 if KO, >0 if OK
-	 */
-	function journal_deactivate($id) {
-		$result = $this->checkUsage();
-		
-		if ($result > 0) {
-			$this->db->begin();
-			
-			$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_journal ";
-			$sql .= "SET active = '0'";
-			$sql .= " WHERE rowid = " . $this->db->escape($id);
-			
-			dol_syslog(get_class($this) . "::deactivate sql=" . $sql, LOG_DEBUG);
-			$result = $this->db->query($sql);
-			
-			if ($result) {
-				$this->db->commit();
-				return 1;
-			} else {
-				$this->error = $this->db->lasterror();
-				$this->db->rollback();
-				return - 1;
-			}
-		} else {
-			return - 1;
-		}
-	}
-	
-	/**
-	 * Activate journal
-	 *
-	 * @param int $id Id
-	 * @return int <0 if KO, >0 if OK
-	 */
-	function journal_activate($id) {
-		$this->db->begin();
-		
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_journal ";
-		$sql .= "SET active = '1'";
-		$sql .= " WHERE rowid = " . $this->db->escape($id);
-		
-		dol_syslog(get_class($this) . "::activate sql=" . $sql, LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result) {
-			$this->db->commit();
-			return 1;
-		} else {
-			$this->error = $this->db->lasterror();
-			$this->db->rollback();
-			return - 1;
-		}
-	}
-	
-	
 	/**
 	 *  Retourne le libelle du statut d'un user (actif, inactif)
 	 *
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 54cddfcaa96..9106c345fda 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -211,14 +211,15 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'accounting', 6__+MAX_llx_menu__, '/accountancy/index.php?leftmenu=accountancy', 'MenuAccountancy', 0, 'accountancy', '! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire', '', 0, 7, __ENTITY__);
 	-- Setup
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2451__+MAX_llx_menu__, 'accountancy', 'accountancy_admin',            2400__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Setup', 1, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 1, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2455__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartmodel',    2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Pcg_version', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2456__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart',         2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Chartofaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 20, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group',   2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 22, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2458__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_default',       2451__+MAX_llx_menu__, '/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuDefaultAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 30, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuVatAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 40, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 50, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2462__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_journal',       2451__+MAX_llx_menu__, '/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingJournals', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2455__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartmodel',    2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Pcg_version', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 20, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2456__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart',         2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Chartofaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 30, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group',   2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 40, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2458__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_default',       2451__+MAX_llx_menu__, '/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuDefaultAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 50, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuVatAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 80, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2462__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 90, __ENTITY__);
 	-- Binding
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', 'dispatch_customer', 2400__+MAX_llx_menu__, '/accountancy/customer/index.php?leftmenu=dispatch_customer', 'CustomersVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 2, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="dispatch_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/list.php', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 3, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index f715061d562..aa905b4ef93 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -952,7 +952,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 				// Chart of account
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"),1,$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/journals_list.php?id=33&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 10);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 10);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 20);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 30);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 31);
diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql
index 5f0e8dd5416..c468e4c3968 100644
--- a/htdocs/install/mysql/data/llx_accounting.sql
+++ b/htdocs/install/mysql/data/llx_accounting.sql
@@ -31,10 +31,10 @@ delete from llx_accounting_account;
 delete from llx_accounting_system;
 delete from llx_accounting_journal;
 
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Journal des ventes', 1, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Journal des achats', 2, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Journal de banque', 3, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 0, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Journal des ventes', 2, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Journal des achats', 3, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Journal de banque', 4, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 1, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Journal des à-nouveaux', 9, 1);
 --
 -- Descriptif des plans comptables FR PCG99-ABREGE
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.sql b/htdocs/install/mysql/tables/llx_accounting_journal.sql
index d9c6ea76e3e..bccfb234c3e 100644
--- a/htdocs/install/mysql/tables/llx_accounting_journal.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_journal.sql
@@ -22,6 +22,6 @@ create table llx_accounting_journal
   rowid             integer AUTO_INCREMENT PRIMARY KEY,
   code       		varchar(32) NOT NULL,
   label             varchar(128) NOT NULL,
-  nature			smallint DEFAULT 0 NOT NULL,			-- type of journals (0:various operations / 1:sale / 2:purchase / 3:bank / 9: has-new)
+  nature			smallint DEFAULT 0 NOT NULL,			-- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
   active            smallint DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index bd1e41c5464..84ac021d041 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -204,11 +204,11 @@ NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
 Code=Code
 Nature=Nature
-AccountingJournalTypeVariousOperation=Various operation
-AccountingJournalTypeSale=Sale
-AccountingJournalTypePurchase=Purchase
-AccountingJournalTypeBank=Bank
-AccountingJournalTypeHasNew=Has-new
+AccountingJournalType1=Various operation
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
 
 ## Export
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 02ff5740986..e432a57bb9d 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -856,6 +856,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status

From 5af5c23a987f9d0025653da691120c6e8e3516e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 1 May 2017 12:46:40 +0200
Subject: [PATCH 0679/1163] Look and feel v6

---
 .../core/tpl/admin_extrafields_view.tpl.php   | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index c14927ec048..3242a388a3d 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2010-2016	Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2010-2017	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -49,23 +49,36 @@ if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center"
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
+if (count($extrafields->attribute_type))
 {
+    foreach($extrafields->attribute_type as $key => $value)
+    {
+        
+        print '<tr class="oddeven">';
+        print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
+        print "<td>".$extrafields->attribute_label[$key]."</td>\n";
+        print "<td>".$key."</td>\n";
+        print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
+        print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
+        print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
+        print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
+        print '<td align="center">'.yn($extrafields->attribute_alwayseditable[$key])."</td>\n";
+    	if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center">'.yn($extrafields->attribute_hidden[$key])."</td>\n";	// Add hidden option on not working feature. Why hide if user can't see it.
+        print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
+        print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
+        print "</tr>";
+    }
+}
+else
+{
+    $colspan=9;
+    if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) $colspan++;
     
     print '<tr class="oddeven">';
-    print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_alwayseditable[$key])."</td>\n";
-	if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center">'.yn($extrafields->attribute_hidden[$key])."</td>\n";	// Add hidden option on not working feature. Why hide if user can't see it.
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
+    print '<td class="opacitymedium" colspan="'.$colspan.'">';
+    print $langs->trans("None");
+    print '</td>';
+    print '</tr>';
 }
 
 print "</table>";

From 6e1f82519020ac0a38532438df32a8481eb63f1c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 1 May 2017 13:01:05 +0200
Subject: [PATCH 0680/1163] Look and feel v6

---
 htdocs/admin/clicktodial.php  | 3 ++-
 htdocs/core/lib/ajax.lib.php  | 2 +-
 htdocs/langs/en_US/admin.lang | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 060c910753a..86b94d8ecf0 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -91,7 +91,8 @@ print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("DefaultLink").'</td><td>';
-print '<input style="width: 90%" type="text" name="CLICKTODIAL_URL"'.($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS?' disabled="disabled"':'').' value="'.$conf->global->CLICKTODIAL_URL.'"><br>';
+print '<input class="quatrevingtpercent" type="text" id="CLICKTODIAL_URL" name="CLICKTODIAL_URL"'.($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS?' disabled="disabled"':'').' value="'.$conf->global->CLICKTODIAL_URL.'"><br>';
+print ajax_autoselect('CLICKTODIAL_URL');
 print '<br>';
 print $langs->trans("ClickToDialUrlDesc").'<br>';
 print $langs->trans("Example").':<br>http://myphoneserver/mypage?login=__LOGIN__&password=__PASS__&caller=__PHONEFROM__&called=__PHONETO__';
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 942c17f5df9..49218ddf141 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -349,7 +349,7 @@ function ajax_dialog($title,$message,$w=350,$h=150)
 
 
 /**
- * Make a input box content all selected
+ * Make content of an input box selected when we click into input field.
  * 
  * @param string	$htmlname	Id of html object 
  * @param int		$addlink	Add a link to after
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 02ff5740986..35037387c1f 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1501,7 +1501,7 @@ AGENDA_NOTIFICATION=Enable event notification on user browsers when event date i
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.

From 8730add15f70eab2a1f458f047f4f2df7c797358 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 1 May 2017 16:01:39 +0200
Subject: [PATCH 0681/1163] Better message for api key return

---
 build/debian/README.howto            | 29 +++++++++++++++++++++-------
 htdocs/api/class/api_login.class.php |  2 +-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index 705899d47c4..399c4f07a1f 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -385,13 +385,14 @@ http://packages.qa.debian.org
 * Package will be into release when test will be moved as stable.
 
 
-##### Send an unblock request 
+
+##### Send an unblock request to make a full update of a stable package 
 
 Use this to move from unstable to testing.
 
 reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
 Choose package "release.debian.org"
-Then "unblock"
+Then usertag "unblock"
 Then name of package "dolibarr"
 Fill message, for example:
 "Please unblock package dolibarr
@@ -400,12 +401,11 @@ Note that package 3.5.7 contains not only fixed for bugs reported to debian. It
 so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. 
 After discussion with ..., it appears that security holes are enough to request this unblock request."
 
-
-Use this to request an update of a stable package
+Use this to request an full update of a stable package
 
 reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
 Choose package "release.debian.org"
-Then "unblock"
+Then usertag "unblock"
 Then name of package "dolibarr"
 Fill message, for example:
 "
@@ -417,11 +417,26 @@ Pro are:
 - It fixes also stability bugs
 - Patches were already tested because deployed and used by several thousands of users.
 - It is easier for package maintener to include this official set of fixes than applying one patch after one patch for each debian report or backported each patch into a dedicated version.
-- Debian maintenance version matches with official project maintenance version (better when all fixes are not related to the way the software is packaged)
+- Debian maintenance version is inline with official project maintenance version (better when all fixes are not related to the way the software is packaged)
 Cons are: 
-- The patch include more than the only one security reported fxes
+- The patch include more than the only one security reported fixes
 
 So I just need to know if it's ok to push such a version 3.5.7 (fixes for 3.5.* branch) instead of only one fix for only the few (the only) reported debian bugs,
 since it provides more stability and is for me a more secured process.
 "
 
+##### Send an request to ask a simple fix of a stable package 
+
+Use this to ask to apply patches on a stable version.
+
+reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
+Choose package "release.debian.org"
+Then usertag "jessie-pu"
+Then name of package "dolibarr"
+Fill message, for example:
+"Please unblock package dolibarr
+A security error CVE-2015-3935 was reported and is fixed into package 3.5.7.
+Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security,
+so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. 
+After discussion with ..., it appears that security holes are enough to request this unblock request."
+
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 704ec1b6874..76a9befebc9 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -102,7 +102,7 @@ class Login
 			'success' => array(
 				'code' => 200,
 				'token' => $token,
-				'message' => 'Welcome ' . $login.($reset?' - Token is new':' - This is your token (generated by a previous call)')
+				'message' => 'Welcome ' . $login.($reset?' - Token is new':' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
 			)
 		);
 	}

From 94b69844f2a57a021ac311b78a6285f1724c6081 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 1 May 2017 20:39:46 +0200
Subject: [PATCH 0682/1163] Add option no url

---
 htdocs/accountancy/class/accountingaccount.class.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index dfb29be6323..8bf7dfe0c44 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -366,11 +366,12 @@ class AccountingAccount extends CommonObject
 	 *
 	 * @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 * @param	int		$withlabel		0=No label, 1=Include label of account
+	 * @param	int  	$nourl			1=Disable url
 	 * @param	string  $moretitle		Add more text to title tooltip
 	 * @param	int  	$notooltip		1=Disable tooltip
 	 * @return	string	String with URL
 	 */
-	function getNomUrl($withpicto = 0, $withlabel = 0, $moretitle='',$notooltip=0)
+	function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle='',$notooltip=0)
 	{
 		global $langs, $conf, $user;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
@@ -407,6 +408,13 @@ class AccountingAccount extends CommonObject
         $linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
+		if ($nourl)
+		{
+			$linkstart = '';
+			$linkclose = '';
+			$linkend = '';			
+		}
+
 		$label_link = length_accountg($this->account_number);
 		if ($withlabel) $label_link .= ' - ' . $this->label;
 

From 102deccba74cf8846e4568f9dd0fea8946c8b42e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 1 May 2017 21:06:31 +0200
Subject: [PATCH 0683/1163] Use getnomUrl on bank accountancy number

---
 htdocs/compta/bank/card.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index df6e6b1c8c8..6576b12d494 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2002-2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2003		Jean-Louis Bergamo	<jlb@j1b.org>
- * Copyright (C) 2004-2016	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009	Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2014-2016	Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2015       Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2016       Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2014-2017	Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2016		Marcos García			<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
 $langs->load("banks");
 $langs->load("bills");
@@ -664,7 +665,10 @@ else
 		print '<tr class="liste_titre_add"><td class="titlefield">'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
 		if (! empty($conf->accounting->enabled)) {
-		    print length_accountg($object->account_number).'</td></tr>';
+			$accountingaccount = new AccountingAccount($db);
+			$accountingaccount->fetch('',$object->account_number);
+
+			print $accountingaccount->getNomUrl(1,1,1,'',1);
 		} else {
 		    print $object->account_number;
 		}
@@ -683,13 +687,11 @@ else
 		
 		print '</table>';
 
-		
 		print '</div>';
 		print '<div class="fichehalfright">';
 		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
-
 		print '<table class="border centpercent">';
 		
         // Categories
@@ -703,8 +705,7 @@ else
 		print '<td>'.dol_htmlentitiesbr($object->comment).'</td></tr>';
 
 		print '</table>';
-		
-		
+
 		if ($object->type == Account::TYPE_SAVINGS || $object->type == Account::TYPE_CURRENT)
 		{
 		    print '<br>';

From e1e2481e3791b5bf2b87dc467d52e2369f46b149 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 1 May 2017 21:09:09 +0200
Subject: [PATCH 0684/1163] Remove picto

---
 htdocs/compta/bank/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 6576b12d494..802c37a6946 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -668,7 +668,7 @@ else
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch('',$object->account_number);
 
-			print $accountingaccount->getNomUrl(1,1,1,'',1);
+			print $accountingaccount->getNomUrl(0,1,1,'',1);
 		} else {
 		    print $object->account_number;
 		}

From fa4bb4e80a5e98c1312b0f319261fee07043a696 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 1 May 2017 21:12:52 +0200
Subject: [PATCH 0685/1163] Remove accounting.lib.php

---
 htdocs/compta/bank/card.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 802c37a6946..5b3bb3a58fe 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -35,7 +35,6 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbank.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 

From 9641a240ead9a444c6555b3f807736980315ac5f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 11:27:35 +0200
Subject: [PATCH 0686/1163] Complete vat dictionnary

---
 htdocs/admin/dict.php                   | 19 ++++++++++---------
 htdocs/install/mysql/data/llx_c_tva.sql |  6 ++++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index d4aa0ce6989..c2730e6c034 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -918,10 +918,19 @@ if (empty($id))
 print "<br>\n";
 
 
+$param = '&id='.$id;
+if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
+if ($search_code != '')     $param.= '&search_code='.urlencode($search_country_id);
+$paramwithsearch = $param;
+if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
+if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
+if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
+
+
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.urlencode($_GET["code"]).'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'rowid='.$rowid.'&code='.urlencode($_GET["code"]).$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
 }
 //var_dump($elementList);
 
@@ -1134,14 +1143,6 @@ if ($id)
         $num = $db->num_rows($resql);
         $i = 0;
 
-        $param = '&id='.$id;
-        if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
-        if ($search_code != '')     $param.= '&search_code='.urlencode($search_country_id);
-        $paramwithsearch = $param;
-        if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
-        if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
-        if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
-        
         // There is several pages
         if ($num > $listlimit)
         {
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 81c72eccb8f..34842ed324e 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -96,12 +96,14 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (80
 
 -- FRANCE (id country=1)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 11,  1,  '20','0','VAT standard rate (France hors DOM-TOM)',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 12,  1, '8.5','0','VAT standard rate (DOM sauf Guyane et Saint-Martin)',0);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 13,  1, '8.5','1','VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0);
+insert into llx_c_tva(rowid,fk_pays,taux,code,recuperableonly,note,active) values ( 12,  1, '8.5', '8.5', '0','VAT standard rate (DOM sauf Guyane et Saint-Martin)',0);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 14,  1, '5.5','0','VAT reduced rate (France hors DOM-TOM)',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 15,  1,   '0','0','VAT Rate 0 ou non applicable',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 16,  1, '2.1','0','VAT super-reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 17,  1,  '10','0','VAT reduced rate',1);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active)                                                   values (1, '8.5', '85NPR', '1','VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,note,active)                          values (1, '8.5', '85NPROM', '1', 2, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer',0);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (1, '8.5', '85NPROMOMR', '1', 2, 3, 2.5, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer et Octroi de Mer Regional',0);
 
 -- GERMANY (id country=5)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 51,  5,  '19.0','0','allgemeine Ust.',1);

From 31d99bbfe6c0956c4b9633e2f4127808602366ff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 11:28:40 +0200
Subject: [PATCH 0687/1163] Complete event tracked automatically

---
 ...terface_50_modAgenda_ActionsAuto.class.php |  73 +--
 htdocs/expensereport/card.php                 | 478 ++++++++++--------
 .../mysql/data/llx_c_action_trigger.sql       |   4 +
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  22 +
 htdocs/install/mysql/tables/llx_holiday.sql   |   4 +-
 5 files changed, 304 insertions(+), 277 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 84517e36c08..bce6d69b2fa 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -87,7 +87,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
             $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
             if (! empty($object->prefix)) $object->actionmsg.=" (".$object->prefix.")";
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 			$object->socid=$object->id;
@@ -100,7 +99,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             if (empty($object->actiontypecode)) $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
@@ -114,7 +112,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -127,7 +124,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -142,7 +138,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("ProposalSentByEMail",$object->ref);
-                $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -157,7 +152,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -170,7 +164,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -183,7 +176,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -195,7 +187,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -208,7 +199,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -221,7 +211,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -234,7 +223,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -249,7 +237,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("OrderSentByEMail",$object->ref);
-                $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -264,7 +251,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -277,7 +263,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -292,7 +277,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("InvoiceSentByEMail",$object->ref);
-                $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -308,7 +292,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -321,7 +304,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -334,7 +316,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 			$object->fk_element=0;
@@ -349,7 +330,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 			$object->fk_element=0;
@@ -364,7 +344,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 			$object->fk_element=0;
@@ -379,7 +358,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
         }
@@ -392,7 +371,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actiontypecode='AC_OTH_AUTO';
            	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
            	$object->actionmsg=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
         }
@@ -405,7 +383,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actiontypecode='AC_OTH_AUTO';
            	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
            	$object->actionmsg=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
         }
@@ -418,7 +395,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 			$object->fk_element=0;
@@ -435,7 +411,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
         	if (empty($object->actionmsg))
         	{
         		$object->actionmsg=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
-        		$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
         	}
 
         	// Parameters $object->sendtoid defined by caller
@@ -452,7 +427,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("ShippingSentByEMail",$object->ref);
-                $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -467,7 +441,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -480,7 +453,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -493,7 +465,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
-			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -506,7 +477,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
-			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -519,7 +489,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -532,7 +501,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -548,7 +516,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("SupplierOrderSentByEMail",$object->ref);
-                $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -566,7 +533,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("SupplierOrderClassifiedBilled",$object->ref);
-                $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
             $object->sendtoid=0;
@@ -580,7 +546,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -593,7 +558,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -609,7 +573,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("SupplierInvoiceSentByEMail",$object->ref);
-                $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -624,7 +587,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -637,7 +599,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -654,7 +615,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg=$langs->transnoentities("MemberValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
         }
@@ -669,7 +629,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg=$langs->transnoentities("MemberModifiedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 		}
@@ -686,7 +645,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
             $object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
             $object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
         }
@@ -701,7 +659,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg=$langs->transnoentities("MemberResiliatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
         }
@@ -716,7 +673,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg=$langs->transnoentities("MemberDeletedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
         }
@@ -732,7 +688,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
         	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
         	$object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
         	$object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
-        	$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
         	$object->sendtoid=0;
         }
@@ -746,7 +701,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
         
             $object->sendtoid=0;
         }
@@ -759,7 +713,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectModifiedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("ProjectModifieddInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
-            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
         
             $object->sendtoid=0;
         }
@@ -775,7 +728,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
-			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -789,7 +741,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskModifiedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("TaskModifieddInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
-			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
@@ -803,18 +754,24 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
-			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 		}
-
-		// The trigger was enabled but we are missing the implementation, let the log know
-		else
-		{
-			dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action.", LOG_WARNING);
-			return 0;
+		// TODO Merge all previous cases into this generic one
+		else {
+		    // Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function) 
+		    $langs->load("agenda");
+		    $langs->load("other");
+		    
+		    $object->actiontypecode='AC_OTH_AUTO';
+		    if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities($action."InDolibarr",$object->ref);
+		    $object->actionmsg=$langs->transnoentities($action."InDolibarr",$object->ref);
+		    
+		    $object->sendtoid=0;
 		}
-
+		
+		$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+		
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
         // Add entry in event table
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index db2328cdfb4..9a2433994bd 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -444,14 +444,16 @@ if (empty($reshook))
    			$destinataire->fetch($object->fk_user_validator);
    			$emailTo = $destinataire->email;
     
-   			if ($emailTo)
-   			{
-   				// FROM
-   				$expediteur = new User($db);
-   				$expediteur->fetch($object->fk_user_author);
-   				$emailFrom = $expediteur->email;
+			// FROM
+			$expediteur = new User($db);
+			$expediteur->fetch($object->fk_user_author);
+			$emailFrom = $expediteur->email;
 
-    			// SUBJECT
+   			if ($emailFrom && $emailTo)
+   			{
+    			$filename=array(); $filedir=array(); $mimetype=array();
+   			    
+   			    // SUBJECT
     			$subject = $langs->transnoentities("ExpenseReportWaitingForReApproval");
     
     			// CONTENT
@@ -561,73 +563,83 @@ if (empty($reshook))
 
    			// CC
    			$emailCC = $conf->global->NDF_CC_EMAILS;
+            if (empty($emailTo)) $emailTo=$emailCC;
 
 			// FROM
    			$expediteur = new User($db);
    			$expediteur->fetch($object->fk_user_valid);
    			$emailFrom = $expediteur->email;
 
-			// SUBJECT
-   			$subject = $langs->transnoentities("ExpenseReportApproved");
-
-   			// CONTENT
-   			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
-   			$message = $langs->transnoentities("ExpenseReportApprovedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
-
-   			// Rebuilt pdf
-			/*
-    		$object->setDocModel($user,"");
-    		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-    
-    		if($resultPDF
-			{
-    			// ATTACHMENT
+   			if ($emailFrom && $emailTo)
+   			{
     			$filename=array(); $filedir=array(); $mimetype=array();
-    			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-    			array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
-    			array_push($mimetype,"application/pdf");
-			}
-			*/
+   			    
+   			    // SUBJECT
+       			$subject = $langs->transnoentities("ExpenseReportApproved");
+    
+       			// CONTENT
+       			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+       			$message = $langs->transnoentities("ExpenseReportApprovedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
+    
+       			// Rebuilt pdf
+    			/*
+        		$object->setDocModel($user,"");
+        		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+        
+        		if($resultPDF
+    			{
+        			// ATTACHMENT
+        			$filename=array(); $filedir=array(); $mimetype=array();
+        			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+        			array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+        			array_push($mimetype,"application/pdf");
+    			}
+    			*/
 
-        	// PREPARE SEND
-    		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-
-   			if ($mailfile)
-   			{
-   				// SEND
-   				$result=$mailfile->sendfile();
-   				if ($result)
-   				{
-   					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
-   					setEventMessages($mesg, null, 'mesgs');
-   					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-   					exit;
-   				}
-   				else
-   				{
-   					$langs->load("other");
-   					if ($mailfile->error)
-   					{
-   						$mesg='';
-   						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-   						$mesg.='<br>'.$mailfile->error;
-   						setEventMessages($mesg, null, 'errors');
-   					}
-   					else
-   					{
-   						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-   					}
-   				}
+        		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+    
+       			if ($mailfile)
+       			{
+       				// SEND
+       				$result=$mailfile->sendfile();
+       				if ($result)
+       				{
+       					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+       					setEventMessages($mesg, null, 'mesgs');
+       					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+       					exit;
+       				}
+       				else
+       				{
+       					$langs->load("other");
+       					if ($mailfile->error)
+       					{
+       						$mesg='';
+       						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+       						$mesg.='<br>'.$mailfile->error;
+       						setEventMessages($mesg, null, 'errors');
+       					}
+       					else
+       					{
+       						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+       					}
+       				}
+       			}
+       			else
+       			{
+       				setEventMessages($mailfile->error,$mailfile->errors,'errors');
+       				$action='';
+       			}
    			}
-   			else
-   			{
-   				setEventMessages($mailfile->error,$mailfile->errors,'errors');
-   				$action='';
-   			}
-   		}
+    		else
+    		{
+    			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    			$action='';
+    		}
+    	}
    		else
    		{
-   			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+   			setEventMessages($langs->trans("FailedtoSetToApprove"), null, 'warnings');
    			$action='';
    		}
    	}
@@ -677,68 +689,78 @@ if (empty($reshook))
     		$expediteur->fetch($object->fk_user_refuse);
     		$emailFrom = $expediteur->email;
     
-			// SUBJECT
-   			$subject = $langs->transnoentities("ExpenseReportRefused");
-
-   			// CONTENT
-   			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
-			$message = $langs->transnoentities("ExpenseReportRefusedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_refuse'], $link);
-
-   			// Rebuilt pdf
-			/*
-    		$object->setDocModel($user,"");
-    		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-    
-    		if($resultPDF
-			{
-    			// ATTACHMENT
+    		if ($emailFrom && $emailTo)
+    		{
     			$filename=array(); $filedir=array(); $mimetype=array();
-    			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-    			array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
-    			array_push($mimetype,"application/pdf");
-			}
-			*/
+    		    
+    		    // SUBJECT
+       			$subject = $langs->transnoentities("ExpenseReportRefused");
     
-    		// PREPARE SEND
-    		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+       			// CONTENT
+       			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+    			$message = $langs->transnoentities("ExpenseReportRefusedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_refuse'], $link);
     
-    		if ($mailfile)
-    		{
-    			// SEND
-    			$result=$mailfile->sendfile();
-    			if ($result)
+       			// Rebuilt pdf
+    			/*
+        		$object->setDocModel($user,"");
+        		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+        
+        		if($resultPDF
     			{
-    				$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
-    				setEventMessages($mesg, null, 'mesgs');
-    				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    				exit;
+        			// ATTACHMENT
+        			$filename=array(); $filedir=array(); $mimetype=array();
+        			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+        			array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+        			array_push($mimetype,"application/pdf");
     			}
-    			else
-    			{
-    				$langs->load("other");
-    				if ($mailfile->error)
-    				{
-    					$mesg='';
-    					$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-    					$mesg.='<br>'.$mailfile->error;
-    					setEventMessages($mesg, null, 'errors');
-    				}
-    				else
-    				{
-    					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-    				}
-    			}
-    		}
-    		else
-    		{
-    			setEventMessages($mailfile->error,$mailfile->errors,'errors');
-    			$action='';
-    		}
+    			*/
+        
+        		// PREPARE SEND
+        		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+        
+        		if ($mailfile)
+        		{
+        			// SEND
+        			$result=$mailfile->sendfile();
+        			if ($result)
+        			{
+        				$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+        				setEventMessages($mesg, null, 'mesgs');
+        				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+        				exit;
+        			}
+        			else
+        			{
+        				$langs->load("other");
+        				if ($mailfile->error)
+        				{
+        					$mesg='';
+        					$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+        					$mesg.='<br>'.$mailfile->error;
+        					setEventMessages($mesg, null, 'errors');
+        				}
+        				else
+        				{
+        					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+        				}
+        			}
+        		}
+        		else
+        		{
+        			setEventMessages($mailfile->error,$mailfile->errors,'errors');
+        			$action='';
+        		}
+        	}
+        	else
+        	{
+        		setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+        		$action='';
+        	}
     	}
     	else
     	{
-    		setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
-    		$action='';
+    	    setEventMessages($langs->trans("FailedtoSetToDeny"), null, 'warnings');
+    	    $action='';
     	}
     }
     else
@@ -790,67 +812,77 @@ if (empty($reshook))
     			$expediteur->fetch($object->fk_user_cancel);
     			$emailFrom = $expediteur->email;
     
-				// SUBJECT
-				$subject = $langs->transnoentities("ExpenseReportCanceled");
-
-				// CONTENT
-				$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
-				$message = $langs->transnoentities("ExpenseReportCanceledMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_cancel'], $link);
-
-				// Rebuilt pdf
-				/*
-				$object->setDocModel($user,"");
-				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-		
-				if($resultPDF
-				{
-					// ATTACHMENT
-					$filename=array(); $filedir=array(); $mimetype=array();
-					array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-					array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
-					array_push($mimetype,"application/pdf");
-				}
-				*/
-
-    			// PREPARE SEND
-    			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-    
-    			if ($mailfile)
+    			if ($emailFrom && $emailTo)
     			{
-    				// SEND
-    				$result=$mailfile->sendfile();
-    				if ($result)
+    			    $filename=array(); $filedir=array(); $mimetype=array();
+    			    
+    			    // SUBJECT
+    				$subject = $langs->transnoentities("ExpenseReportCanceled");
+    
+    				// CONTENT
+    				$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+    				$message = $langs->transnoentities("ExpenseReportCanceledMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_cancel'], $link);
+    
+    				// Rebuilt pdf
+    				/*
+    				$object->setDocModel($user,"");
+    				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+    		
+    				if($resultPDF
     				{
-    					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
-    					setEventMessages($mesg, null, 'mesgs');
-    					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    					exit;
-    				}
-    				else
-    				{
-    					$langs->load("other");
-    					if ($mailfile->error)
-    					{
-    						$mesg='';
-    						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-    						$mesg.='<br>'.$mailfile->error;
-    						setEventMessages($mesg, null, 'errors');
-    					}
-    					else
-    					{
-    						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-    					}
+    					// ATTACHMENT
+    					$filename=array(); $filedir=array(); $mimetype=array();
+    					array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+    					array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+    					array_push($mimetype,"application/pdf");
     				}
+    				*/
+    
+        			// PREPARE SEND
+        			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+        
+        			if ($mailfile)
+        			{
+        				// SEND
+        				$result=$mailfile->sendfile();
+        				if ($result)
+        				{
+        					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+        					setEventMessages($mesg, null, 'mesgs');
+        					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+        					exit;
+        				}
+        				else
+        				{
+        					$langs->load("other");
+        					if ($mailfile->error)
+        					{
+        						$mesg='';
+        						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+        						$mesg.='<br>'.$mailfile->error;
+        						setEventMessages($mesg, null, 'errors');
+        					}
+        					else
+        					{
+        						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+        					}
+        				}
+        			}
+        			else
+        			{
+        				setEventMessages($mailfile->error,$mailfile->errors,'errors');
+        				$action='';
+        			}
     			}
     			else
     			{
-    				setEventMessages($mailfile->error,$mailfile->errors,'errors');
-    				$action='';
-    			}
+    			    setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    			    $action='';
+    			}        			
     		}
     		else
     		{
-    			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    			setEventMessages($langs->trans("FailedToSetToCancel"), null, 'warnings');
     			$action='';
     		}
     	}
@@ -945,63 +977,73 @@ if (empty($reshook))
     		$expediteur->fetch($user->id);
     		$emailFrom = $expediteur->email;
     
-			// SUBJECT
-			$subject = $langs->transnoentities("ExpenseReportPaid");
-
-			// CONTENT
-			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
-			$message = $langs->transnoentities("ExpenseReportPaidMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
-    
-    		// CONTENT
-    		$message = "Bonjour {$destinataire->firstname},\n\n";
-    		$message.= "Votre note de frais \"{$object->ref}\" vient d'être payée.\n";
-    		$message.= "- Payeur : {$expediteur->firstname} {$expediteur->lastname}\n";
-    		$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-    		$message.= "Bien cordialement,\n' SI";
-    
-    		// Generate pdf before attachment
-    		$object->setDocModel($user,"");
-    		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-    
-    		// PREPARE SEND
-    		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-    
-    		if ($mailfile)
+    		if ($emailFrom && $emailTo)
     		{
-    			// SEND
-				$result=$mailfile->sendfile();
-    			if ($result)
-    			{
-    				$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
-    				setEventMessages($mesg, null, 'mesgs');
-    				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    				exit;
-    			}
-    			else
-    			{
-					$langs->load("other");
-    				if ($mailfile->error)
-    				{
-    					$mesg='';
-    					$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-    					$mesg.='<br>'.$mailfile->error;
-    					setEventMessages($mesg, null, 'errors');
-    				}
-    				else
-    				{
-    					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-    				}
-    			}
+    			$filename=array(); $filedir=array(); $mimetype=array();
+    		    
+    		    // SUBJECT
+    			$subject = $langs->transnoentities("ExpenseReportPaid");
+    
+    			// CONTENT
+    			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+    			$message = $langs->transnoentities("ExpenseReportPaidMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
+        
+        		// CONTENT
+        		$message = "Bonjour {$destinataire->firstname},\n\n";
+        		$message.= "Votre note de frais \"{$object->ref}\" vient d'être payée.\n";
+        		$message.= "- Payeur : {$expediteur->firstname} {$expediteur->lastname}\n";
+        		$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
+        		$message.= "Bien cordialement,\n' SI";
+        
+        		// Generate pdf before attachment
+        		$object->setDocModel($user,"");
+        		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+        
+        		// PREPARE SEND
+        		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+        
+        		if ($mailfile)
+        		{
+        			// SEND
+    				$result=$mailfile->sendfile();
+        			if ($result)
+        			{
+        				$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+        				setEventMessages($mesg, null, 'mesgs');
+        				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+        				exit;
+        			}
+        			else
+        			{
+    					$langs->load("other");
+        				if ($mailfile->error)
+        				{
+        					$mesg='';
+        					$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+        					$mesg.='<br>'.$mailfile->error;
+        					setEventMessages($mesg, null, 'errors');
+        				}
+        				else
+        				{
+        					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+        				}
+        			}
+        		}
+        		else
+        		{
+        			setEventMessages($mailfile->error,$mailfile->errors,'errors');
+        			$action='';
+        		}
     		}
     		else
     		{
-    			setEventMessages($mailfile->error,$mailfile->errors,'errors');
-    			$action='';
+    		    setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    		    $action='';
     		}
     	}
     	else
     	{
-    		setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    		setEventMessages($langs->trans("FailedToSetPaid"), null, 'warnings');
     		$action='';
     	}
     }
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 9aadb0c083e..d25963e8c3a 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -78,6 +78,10 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',35);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',40);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',42);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_PAYED','Expense report billed','Executed when an expense report is set as billed','expensereport',204);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_VALIDATE','Project validation','Executed when a project is validated','project',141);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',143);
 -- actions not enabled by default (no constant created for that) when we enable module agenda 
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index b20da8b9b89..71f9a17273c 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -42,10 +42,22 @@ ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (filepath, filename, ent
 ALTER TABLE llx_ecm_files ADD INDEX idx_ecm_files_label (label);
 
 
+ALTER TABLE llx_holiday ADD COLUMN import_key				varchar(14);
+ALTER TABLE llx_holiday ADD COLUMN extraparams				varchar(255);	
+
+ALTER TABLE llx_expensereport ADD COLUMN import_key			varchar(14);
+ALTER TABLE llx_expensereport ADD COLUMN extraparams		varchar(255);	
+
+
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30);
 
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expense_report',201);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expense_report',202);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expense_report',203);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_PAYED','Expense report billed','Executed when an expense report is set as billed','expense_report',204);
+
 ALTER TABLE llx_c_email_templates ADD COLUMN content_lines text;
 
 ALTER TABLE llx_loan ADD COLUMN fk_projet integer DEFAULT NULL;
@@ -111,6 +123,16 @@ INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (
 ALTER TABLE llx_paiementfourn ADD COLUMN model_pdf varchar(255);
 
 
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_PAYED','Expense report billed','Executed when an expense report is set as billed','expensereport',204);
+
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_CREATE'  ,'Leave request created','Executed when a leave request is created','holiday',221);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_VALIDATE','Leave request validated','Executed when a leave request is validated','holiday',222);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_APPROVE' ,'Leave request approved','Executed when a leave request is approved','holiday',223);
+
+
 ALTER TABLE llx_societe_remise_except ADD COLUMN fk_invoice_supplier_line	integer;
 ALTER TABLE llx_societe_remise_except ADD COLUMN fk_invoice_supplier		integer;
 ALTER TABLE llx_societe_remise_except ADD COLUMN fk_invoice_supplier_source	integer;
diff --git a/htdocs/install/mysql/tables/llx_holiday.sql b/htdocs/install/mysql/tables/llx_holiday.sql
index 2a981444df3..2091dea9541 100644
--- a/htdocs/install/mysql/tables/llx_holiday.sql
+++ b/htdocs/install/mysql/tables/llx_holiday.sql
@@ -40,6 +40,8 @@ fk_user_cancel integer DEFAULT NULL,
 detail_refuse  varchar( 250 ) DEFAULT NULL,
 note_private   text,
 note_public    text,
-tms            timestamp
+tms            timestamp,
+import_key			varchar(14),
+extraparams			varchar(255)				-- for other parameters with json format
 ) 
 ENGINE=innodb;

From ad095d7fb24752c60085f54c44ce9604545970bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 14:26:51 +0200
Subject: [PATCH 0688/1163] NEW Can set margins of PDFs

---
 htdocs/admin/pdf.php | 45 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index b0c32a344ff..2e650c75696 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -42,15 +42,25 @@ $langs->load("members");
 if (! $user->admin) accessforbidden();
 
 $action = GETPOST('action','alpha');
+$cancel = GETPOST('cancel','alpha');
+
 
 /*
  * Actions
  */
 
+if ($cancel) {
+    $action='';
+}
+
 if ($action == 'update')
 {
 	dolibarr_set_const($db, "MAIN_PDF_FORMAT",    $_POST["MAIN_PDF_FORMAT"],'chaine',0,'',$conf->entity);
-
+	
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_LEFT",    $_POST["MAIN_PDF_MARGIN_LEFT"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_RIGHT",   $_POST["MAIN_PDF_MARGIN_RIGHT"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_TOP",     $_POST["MAIN_PDF_MARGIN_TOP"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_BOTTOM",  $_POST["MAIN_PDF_MARGIN_BOTTOM"],'chaine',0,'',$conf->entity);
 
     dolibarr_set_const($db, "MAIN_PROFID1_IN_ADDRESS",    $_POST["MAIN_PROFID1_IN_ADDRESS"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS",    $_POST["MAIN_PROFID2_IN_ADDRESS"],'chaine',0,'',$conf->entity);
@@ -133,7 +143,20 @@ if ($action == 'edit')	// Edit
     print $formadmin->select_paper_format($selected,'MAIN_PDF_FORMAT');
     print '</td></tr>';
 
-	print '</table>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_LEFT").'</td><td>';
+    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_LEFT" value="'.(empty($conf->global->MAIN_PDF_MARGIN_LEFT)?10:$conf->global->MAIN_PDF_MARGIN_LEFT).'">';
+    print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_RIGHT").'</td><td>';
+    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_RIGHT" value="'.(empty($conf->global->MAIN_PDF_MARGIN_RIGHT)?10:$conf->global->MAIN_PDF_MARGIN_RIGHT).'">';
+    print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_TOP").'</td><td>';
+    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_TOP" value="'.(empty($conf->global->MAIN_PDF_MARGIN_TOP)?10:$conf->global->MAIN_PDF_MARGIN_TOP).'">';
+    print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_BOTTOM").'</td><td>';
+    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_BOTTOM" value="'.(empty($conf->global->MAIN_PDF_MARGIN_BOTTOM)?10:$conf->global->MAIN_PDF_MARGIN_BOTTOM).'">';
+    print '</td></tr>';
+    
+    print '</table>';
 
 	print '<br>';
 
@@ -270,7 +293,9 @@ if ($action == 'edit')	// Edit
 	print '</table>';
 
     print '<br><div class="center">';
-    print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+    print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
+    print ' &nbsp; ';
+    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
     print '</div>';
 
     print '</form>';
@@ -314,6 +339,20 @@ else	// Show
     print $pdfformatlabel;
     print '</td></tr>';
 
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_LEFT").'</td><td>';
+    print empty($conf->global->MAIN_PDF_MARGIN_LEFT)?10:$conf->global->MAIN_PDF_MARGIN_LEFT;
+    print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_RIGHT").'</td><td>';
+    print empty($conf->global->MAIN_PDF_MARGIN_RIGHT)?10:$conf->global->MAIN_PDF_MARGIN_RIGHT;
+    print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_TOP").'</td><td>';
+    print empty($conf->global->MAIN_PDF_MARGIN_TOP)?10:$conf->global->MAIN_PDF_MARGIN_TOP;
+    print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_BOTTOM").'</td><td>';
+    print empty($conf->global->MAIN_PDF_MARGIN_BOTTOM)?10:$conf->global->MAIN_PDF_MARGIN_BOTTOM;
+    print '</td></tr>';
+    
+    
 	print '</table>';
 
 	print '<br>';

From 6138d197e4c7290e0a7a5ca3f5ecef45facff734 Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 2 May 2017 15:19:55 +0200
Subject: [PATCH 0689/1163] FIX major issues for inventory - Move all needed
 declaration from coreobject to commonobject for updateCommon, fetchCommon,
 deleteCommon, createCommon - Just leave method for child object into
 coreobject, check later if is useless - debug inventory card, PHP 7.0
 compatibility - activate rights for inventory into stock module - add
 inventory options into stock admin module

---
 htdocs/admin/inventory.php                    | 152 --------
 htdocs/admin/stock.php                        |  56 +++
 htdocs/core/class/commonobject.class.php      | 330 +++++++++++++++---
 htdocs/core/class/coreobject.class.php        | 255 +-------------
 htdocs/core/modules/modStock.class.php        |  65 +---
 .../product/inventory/ajax/ajax.inventory.php |  10 +-
 htdocs/product/inventory/card.php             |   7 +-
 7 files changed, 370 insertions(+), 505 deletions(-)
 delete mode 100644 htdocs/admin/inventory.php

diff --git a/htdocs/admin/inventory.php b/htdocs/admin/inventory.php
deleted file mode 100644
index 2548494fc79..00000000000
--- a/htdocs/admin/inventory.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) 2015 ATM Consulting <support@atm-consulting.fr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * 	\file		admin/inventory.php
- * 	\ingroup	inventory
- * 	\brief		This file is an example module setup page
- * 				Put some comments here
- */
-// Dolibarr environment
-require '../main.inc.php';
-
-
-// Libraries
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once DOL_DOCUMENT_ROOT .'/inventory/lib/inventory.lib.php';
-
-// Translations
-$langs->load("stock");
-$langs->load("inventory");
-
-// Access control
-if (! $user->admin) {
-    accessforbidden();
-}
-
-// Parameters
-$action = GETPOST('action', 'alpha');
-
-/*
- * Actions
- */
-if (preg_match('/set_(.*)/',$action,$reg))
-{
-	$code=$reg[1];
-	if (dolibarr_set_const($db, $code, GETPOST($code), 'chaine', 0, '', $conf->entity) > 0)
-	{
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
-	
-if (preg_match('/del_(.*)/',$action,$reg))
-{
-	$code=$reg[1];
-	if (dolibarr_del_const($db, $code, 0) > 0)
-	{
-		Header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
-
-/*
- * View
- */
-$page_name = "inventorySetup";
-llxHeader('', $langs->trans($page_name));
-
-// Subheader
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
-    . $langs->trans("BackToModuleList") . '</a>';
-print_fiche_titre($langs->trans($page_name), $linkback);
-
-// Configuration header
-$head = inventoryAdminPrepareHead();
-dol_fiche_head(
-    $head,
-    'settings',
-    $langs->trans("Module104420Name"),
-    0,
-    "inventory@inventory"
-);
-
-// Setup page goes here
-$form=new Form($db);
-$var=false;
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Parameters").'</td>'."\n";
-print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
-
-// Example with a yes / no select
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("INVENTORY_DISABLE_VIRTUAL").'</td>';
-print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="right" width="300">';
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_INVENTORY_DISABLE_VIRTUAL">';
-print $form->selectyesno("INVENTORY_DISABLE_VIRTUAL",$conf->global->INVENTORY_DISABLE_VIRTUAL,1);
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print '</form>';
-print '</td></tr>';
-
-// Example with a yes / no select
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA").'</td>';
-print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="right" width="300">';
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_INVENTORY_USE_MIN_PA_IF_NO_LAST_PA">';
-print $form->selectyesno("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA",$conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA,1);
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print '</form>';
-print '</td></tr>';
-
-// Example with a yes / no select
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT").'</td>';
-print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="right" width="300">';
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT">';
-print $form->selectyesno("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT",$conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT,1);
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print '</form>';
-print '</td></tr>';
-
-print '</table>';
-
-llxFooter();
-
-$db->close();
\ No newline at end of file
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 1c5a92fb0e8..c8204f213c2 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -432,6 +432,61 @@ if ($virtualdiffersfromphysical)
 }
 
 
+print '<br />';
+if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
+{
+	$var=false;
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Inventory").'</td>'."\n";
+	print '<td align="center" width="20">&nbsp;</td>';
+	print '<td align="center" width="100">&nbsp;</td>'."\n";
+	
+	// Example with a yes / no select
+	$var=!$var;
+	print '<tr '.$bc[$var].'>';
+	print '<td>'.$langs->trans("INVENTORY_DISABLE_VIRTUAL").'</td>';
+	print '<td align="center" width="20">&nbsp;</td>';
+	print '<td align="right" width="300">';
+	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="set_INVENTORY_DISABLE_VIRTUAL">';
+	print $form->selectyesno("INVENTORY_DISABLE_VIRTUAL",$conf->global->INVENTORY_DISABLE_VIRTUAL,1);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '</form>';
+	print '</td></tr>';
+	
+	// Example with a yes / no select
+	$var=!$var;
+	print '<tr '.$bc[$var].'>';
+	print '<td>'.$langs->trans("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA").'</td>';
+	print '<td align="center" width="20">&nbsp;</td>';
+	print '<td align="right" width="300">';
+	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="set_INVENTORY_USE_MIN_PA_IF_NO_LAST_PA">';
+	print $form->selectyesno("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA",$conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA,1);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '</form>';
+	print '</td></tr>';
+	
+	// Example with a yes / no select
+	$var=!$var;
+	print '<tr '.$bc[$var].'>';
+	print '<td>'.$langs->trans("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT").'</td>';
+	print '<td align="center" width="20">&nbsp;</td>';
+	print '<td align="right" width="300">';
+	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="set_INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT">';
+	print $form->selectyesno("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT",$conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT,1);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '</form>';
+	print '</td></tr>';
+	
+	print '</table>';
+}
+
 $var=true;
 print '<table class="noborder" width="100%">';
 
@@ -508,6 +563,7 @@ if ($conf->global->PRODUIT_SOUSPRODUITS)
 
 print '</table>';
 
+
 llxFooter();
 
 $db->close();
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5e5c13056e7..582e00d29fa 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2016      Bahfir abbes         <dolipar@dolipar.org>
+ * Copyright (C) 2017      ATM Consulting       <support@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -4662,7 +4663,159 @@ abstract class CommonObject
 		return $buyPrice;
 	}
 	
+	/**
+	 * Function test if type is date
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return                  bool
+	 */
+	protected function is_date($info)
+	{
+		if(isset($info['type']) && $info['type']=='date') return true;
+		else return false;
+	}
 	
+	/**
+	 * Function test if type is array
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return                  bool
+	 */
+	protected function is_array($info)
+	{
+		if(is_array($info))
+		{
+			if(isset($info['type']) && $info['type']=='array') return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	/**
+	 * Function test if type is null
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return                  bool
+	 */
+	protected function is_null($info)
+	{
+		if(is_array($info))
+		{
+			if(isset($info['type']) && $info['type']=='null') return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	/**
+	 * Function test if type is integer
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return                  bool
+	 */
+	protected function is_int($info)
+	{
+		if(is_array($info))
+		{
+			if(isset($info['type']) && ($info['type']=='int' || $info['type']=='integer' )) return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	/**
+	 * Function test if type is float
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return                  bool
+	 */
+	protected function is_float($info)
+	{
+		if(is_array($info))
+		{
+			if(isset($info['type']) && $info['type']=='float') return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	/**
+	 * Function test if type is text
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return                  bool
+	 */
+	protected function is_text($info)
+	{
+		if(is_array($info))
+		{
+			if(isset($info['type']) && $info['type']=='text') return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	/**
+	 * Function test if is indexed
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return                  bool
+	 */
+	protected function is_index($info)
+	{
+		if(is_array($info))
+		{
+			if(isset($info['index']) && $info['index']==true) return true;
+			else return false;
+		}
+		else return false;
+	}
+	
+	/**
+	 * Function to prepare the values to insert
+	 *
+	 * @return array
+	 */
+	private function set_save_query()
+	{
+		$query=array();
+		foreach ($this->fields as $field=>$info)
+		{
+			if($this->is_date($info))
+			{
+				if(empty($this->{$field}))
+				{
+					$query[$field] = NULL;
+				}
+				else
+				{
+					$query[$field] = $this->db->idate($this->{$field});
+				}
+			}
+			else if($this->is_array($info))
+			{
+				$query[$field] = serialize($this->{$field});
+			}
+			else if($this->is_int($info))
+			{
+				$query[$field] = (int) price2num($this->{$field});
+			}
+			else if($this->is_float($info))
+			{
+				$query[$field] = (double) price2num($this->{$field});
+			}
+			elseif($this->is_null($info))
+			{
+				$query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0') ? null : $this->{$field});
+			}
+			else
+			{
+				$query[$field] = $this->{$field};
+			}
+		}
+		
+		return $query;
+	}
 
 	/**
 	 * Create object into database
@@ -4674,28 +4827,82 @@ abstract class CommonObject
 	 */
 	public function createCommon(User $user, $notrigger = false)
 	{
-	    foreach ($this->fields as $k => $v) {
 	    
-	        $keys[] = $k;
-	        $values[] = $this->quote($v);
-	         
+	    $fields = array_merge(array('datec'=>$this->db->idate(dol_now())), $this->set_save_query());
+	    
+	    foreach ($fields as $k => $v) {
+	    	
+	    	$keys[] = $k;
+	    	$values[] = $this->quote($v);
+	    	
 	    }
-	    
-	    $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$table.'
+	    $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'
 					( '.implode( ",", $keys ).' )
 					VALUES ( '.implode( ",", $values ).' ) ';
-	    
-	    $res = $this->query($sql);
+	    $res = $this->db->query( $sql );
 	    if($res===false) {
-	    
-	        return false;
+	    	
+	    	return false;
 	    }
 	    
 	    // TODO Add triggers
-	    	  
-	    return true;	    
+	    
+	    return true;
+	    
 	}
 	
+	/**
+	 * Function to load data into current object this
+	 *
+	 * @param   stdClass    $obj    Contain data of object from database
+	 */
+	private function set_vars_by_db(&$obj)
+	{
+		foreach ($this->fields as $field => $info)
+		{
+			if($this->is_date($info))
+			{
+				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
+				else $this->{$field} = strtotime($obj->{$field});
+			}
+			elseif($this->is_array($info))
+			{
+				$this->{$field} = @unserialize($obj->{$field});
+				// Hack for data not in UTF8
+				if($this->{$field } === FALSE) @unserialize(utf8_decode($obj->{$field}));
+			}
+			elseif($this->is_int($info))
+			{
+				$this->{$field} = (int) $obj->{$field};
+			}
+			elseif($this->is_float($info))
+			{
+				$this->{$field} = (double) $obj->{$field};
+			}
+			elseif($this->is_null($info))
+			{
+				$val = $obj->{$field};
+				// zero is not null
+				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);
+			}
+			else
+			{
+				$this->{$field} = $obj->{$field};
+			}
+			
+		}
+	}
+	
+	/**
+	 * Function to concat keys of fields
+	 *
+	 * @return string
+	 */
+	private function get_field_list()
+	{
+		$keys = array_keys($this->fields);
+		return implode(',', $keys);
+	}
 	
 	/**
 	 * Load object in memory from the database
@@ -4708,6 +4915,32 @@ abstract class CommonObject
 	public function fetchCommon($id, $ref = null)
 	{
 	    
+		if (empty($id) && empty($ref)) return false;
+		
+		$sql = 'SELECT '.$this->get_field_list().', datec, tms';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+		
+		if(!empty($id)) $sql.= ' WHERE rowid = '.$id;
+		else  $sql.= ' WHERE ref = \''.$this->quote($ref).'\'';
+		
+		$res = $this->db->query($sql);
+		if($obj = $this->db->fetch_object($res))
+		{
+			$this->id = $id;
+			$this->set_vars_by_db($obj);
+			
+			$this->datec = $this->db->idate($obj->datec);
+			$this->tms = $this->db->idate($obj->tms);
+			
+			return $this->id;
+		}
+		else
+		{
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->error;
+			return -1;
+		}
+		
 	}
 
 	/**
@@ -4720,34 +4953,36 @@ abstract class CommonObject
 	 */
 	public function updateCommon(User $user, $notrigger = false)
 	{
-	    foreach ($this->fields as $k => $v) {
-	    
-	        if (is_array($key)){
-	            $i=array_search($k, $key);
-	            if ( $i !== false) {
-	                $where[] = $key[$i].'=' . $this->quote( $v ) ;
-	                continue;
-	            }
-	        } else {
-	            if ( $k == $key) {
-	                $where[] = $k.'=' .$this->quote( $v ) ;
-	                continue;
-	            }
-	        }
-	    
-	        $tmp[] = $k.'='.$this->quote($v);
-	    }
-	    $sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET '.implode( ',', $tmp ).' WHERE ' . implode(' AND ',$where) ;
-	    $res = $this->query( $sql );
-	    
-	    if($res===false) {
-	        //error
-	        return false;
-	    }
-	    
-	    // TODO Add triggers
-	    
-	    return true;	    
+		$fields = $this->set_save_query();
+		
+		foreach ($fields as $k => $v) {
+			
+			if (is_array($key)){
+				$i=array_search($k , $key );
+				if ( $i !== false) {
+					$where[] = $key[$i].'=' . $this->quote( $v ) ;
+					continue;
+				}
+			} else {
+				if ( $k == $key) {
+					$where[] = $k.'=' .$this->quote( $v ) ;
+					continue;
+				}
+			}
+			
+			$tmp[] = $k.'='.$this->quote($v);
+		}
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode( ',', $tmp ).' WHERE rowid='.$this->id ;
+		$res = $this->db->query( $sql );
+		
+		if($res===false) {
+			//error
+			return false;
+		}
+		
+		// TODO Add triggers
+		
+		return true;
 	}
 	
 	/**
@@ -4760,7 +4995,16 @@ abstract class CommonObject
 	 */
 	public function deleteCommon(User $user, $notrigger = false)
 	{
-	    
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
+		
+		$res = $this->db->query( $sql );
+		if($res===false) {
+			return false;
+		}
+		
+		// TODO Add triggers
+		
+		return true;
 	}
 
 	/**
@@ -4769,11 +5013,11 @@ abstract class CommonObject
 	 * @param string|int	$value	value to protect
 	 * @return string|int
 	 */
-	function quote($value) {
+	protected function quote($value) {
 	
 	    if(is_null($value)) return 'NULL';
 	    else if(is_numeric($value)) return $value;
-	    else return "'".$this->escape( $value )."'";
+	    else return "'".$this->db->escape( $value )."'";
 	
 	}
 	
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 8aa0cfe2ad6..c86a1083519 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -97,216 +97,6 @@ class CoreObject extends CommonObject
         }
 	}
 
-    /**
-     * Function test if type is date
-     *
-     * @param   array   $info   content informations of field
-     * @return                  bool
-     */
-    private function is_date($info)
-    {
-		if(isset($info['type']) && $info['type']=='date') return true;
-		else return false;
-	}
-
-    /**
-     * Function test if type is array
-     *
-     * @param   array   $info   content informations of field
-     * @return                  bool
-     */
-	private function is_array($info)
-    {
-	  	if(is_array($info))
-	  	{
-			if(isset($info['type']) && $info['type']=='array') return true;
-			else return false;
-		}
-		else return false;
-	}
-
-    /**
-     * Function test if type is null
-     *
-     * @param   array   $info   content informations of field
-     * @return                  bool
-     */
-	private function is_null($info)
-    {
-		if(is_array($info))
-		{
-			if(isset($info['type']) && $info['type']=='null') return true;
-			else return false;
-		}
-		else return false;
-	}
-
-    /**
-     * Function test if type is integer
-     *
-     * @param   array   $info   content informations of field
-     * @return                  bool
-     */
-	private function is_int($info)
-    {
-		if(is_array($info))
-		{
-			if(isset($info['type']) && ($info['type']=='int' || $info['type']=='integer' )) return true;
-			else return false;
-		}
-		else return false;
-	}
-
-    /**
-     * Function test if type is float
-     *
-     * @param   array   $info   content informations of field
-     * @return                  bool
-     */
-	private function is_float($info)
-    {
-		if(is_array($info))
-		{
-			if(isset($info['type']) && $info['type']=='float') return true;
-			else return false;
-		}
-		else return false;
-	}
-
-    /**
-     * Function test if type is text
-     *
-     * @param   array   $info   content informations of field
-     * @return                  bool
-     */
-	private function is_text($info)
-    {
-	  	if(is_array($info))
-	  	{
-			if(isset($info['type']) && $info['type']=='text') return true;
-			else return false;
-		}
-		else return false;
-	}
-
-    /**
-     * Function test if is indexed
-     *
-     * @param   array   $info   content informations of field
-     * @return                  bool
-     */
-	private function is_index($info)
-    {
-	  	if(is_array($info))
-	  	{
-			if(isset($info['index']) && $info['index']==true) return true;
-			else return false;
-		}
-		else return false;
-	}
-
-
-    /**
-     * Function to prepare the values to insert
-     *
-     * @return array
-     */
-    private function set_save_query()
-    {
-		$query=array();
-		foreach ($this->fields as $field=>$info)
-		{
-			if($this->is_date($info))
-			{
-				if(empty($this->{$field}))
-				{
-					$query[$field] = NULL;
-				}
-				else
-                {
-					$query[$field] = $this->db->idate($this->{$field});
-				}
-		  	}
-		  	else if($this->is_array($info))
-		  	{
-                $query[$field] = serialize($this->{$field});
-		  	}
-		  	else if($this->is_int($info))
-		  	{
-		    	$query[$field] = (int) price2num($this->{$field});
-		  	}
-		  	else if($this->is_float($info))
-		  	{
-		    	$query[$field] = (double) price2num($this->{$field});
-		  	}
-		  	elseif($this->is_null($info))
-            {
-		  		$query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0') ? null : $this->{$field});
-		    }
-		    else
-            {
-		       $query[$field] = $this->{$field};
-		    }
-	    }
-	
-		return $query;
-	}
-
-
-    /**
-     * Function to concat keys of fields
-     *
-     * @return string
-     */
-    private function get_field_list()
-    {
-		$keys = array_keys($this->fields);
-	    return implode(',', $keys);
-	}
-
-
-    /**
-     * Function to load data into current object this
-     *
-     * @param   stdClass    $obj    Contain data of object from database
-     */
-    private function set_vars_by_db(&$obj)
-    {
-		foreach ($this->fields as $field => $info)
-		{
-			if($this->is_date($info))
-			{
-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
-				else $this->{$field} = strtotime($obj->{$field});
-			}
-			elseif($this->is_array($info))
-            {
-				$this->{$field} = @unserialize($obj->{$field});
-				// Hack for data not in UTF8
-				if($this->{$field } === FALSE) @unserialize(utf8_decode($obj->{$field}));
-			}
-			elseif($this->is_int($info))
-            {
-				$this->{$field} = (int) $obj->{$field};
-			}
-			elseif($this->is_float($info))
-            {
-				$this->{$field} = (double) $obj->{$field};
-			}
-			elseif($this->is_null($info))
-            {
-				$val = $obj->{$field};
-				// zero is not null 
-				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);
-			}
-			else
-            {
-				$this->{$field} = $obj->{$field};
-			}
-
-		}
-	}
-
     /**
      *	Get object and children from database
      *
@@ -316,31 +106,14 @@ class CoreObject extends CommonObject
      */
 	public function fetch($id, $loadChild = true)
     {
-		if (empty($id)) return false;
-
-		$sql = 'SELECT '.$this->get_field_list().', datec, tms';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-        $sql.= ' WHERE rowid = '.$id;
 		
-		$res = $this->db->query($sql);
-		if($obj = $this->db->fetch_object($res))
-		{
-            $this->id = $id;
-            $this->set_vars_by_db($obj);
-
-            $this->datec = $this->db->idate($obj->datec);
-            $this->tms = $this->db->idate($obj->tms);
-
-            if ($loadChild) $this->fetchChild();
-
-            return $this->id;
-		}
-		else
-        {
-            $this->error = $this->db->lasterror();
-            $this->errors[] = $this->error;
-            return -1;
-		}
+    	$res = $this->fetchCommon($id);
+    	if($res>0) {
+    		if ($loadChild) $this->fetchChild();
+    	}
+    	
+    	return $res;
+		
 	}
 
 
@@ -473,10 +246,7 @@ class CoreObject extends CommonObject
         $error = 0;
         $this->db->begin();
 
-        $query = $this->set_save_query();
-        $query['rowid'] = $this->id;
-
-        $res = $this->db->update($this->table_element, $query, array('rowid'));
+        $res = $this->updateCommon($user);
         if ($res)
         {
             $result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
@@ -516,10 +286,7 @@ class CoreObject extends CommonObject
         $error = 0;
         $this->db->begin();
 
-		$query = $this->set_save_query();
-		$query['datec'] = date("Y-m-d H:i:s", dol_now());
-		
-		$res = $this->db->insert($this->table_element, $query);
+        $res = $this->createCommon($user);
 		if($res)
 		{
 			$this->id = $this->db->last_insert_id($this->table_element);
@@ -565,7 +332,7 @@ class CoreObject extends CommonObject
 
         if (!$error)
         {
-            $this->db->delete($this->table_element, array('rowid' => $this->id), array('rowid'));
+            $this->deleteCommon($user);
             if($this->withChild && !empty($this->childtables))
             {
                 foreach($this->childtables as &$childTable)
@@ -669,5 +436,5 @@ class CoreObject extends CommonObject
 
 		return 1;
 	}
-	
+
 }
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index cfdc6db298c..ea181f72a41 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -117,91 +117,42 @@ class modStock extends DolibarrModules
 		$this->rights[4][4] = 'mouvement';
 		$this->rights[4][5] = 'creer';
 
-		/*
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		
+		$this->rights[$r][0] = 1006;
 		$this->rights[$r][1] = 'inventoryReadPermission';	// Permission label
-		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 		
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][0] = 1007;
 		$this->rights[$r][1] = 'inventoryCreatePermission';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 		
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][0] = 1008;
 		$this->rights[$r][1] = 'inventoryWritePermission';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 		
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][0] = 1009;
 		$this->rights[$r][1] = 'inventoryValidatePermission';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 		
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][0] = 1010;
 		$this->rights[$r][1] = 'inventoryChangePMPPermission';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
-		*/
+		
 		
 		// Main menu entries
 		$this->menu = array();			// List of menus to add
 		$r=0;
 		
-		/*
-		$this->menu[$r]=array(
-		    'fk_menu'=>'fk_mainmenu=products',			                // Put 0 if this is a top menu
-		    'type'=>'left',			                // This is a Top menu entry
-		    'titre'=>'Inventory',
-		    'mainmenu'=>'products',
-		    'leftmenu'=>'inventory_left',
-		    'url'=>'/inventory/list.php',
-		    'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		    'position'=>100+$r,
-		    'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-		    'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-		    'target'=>'',
-		    'user'=>2
-		);				                // 0=Menu for internal users, 1=external users, 2=both
-		$r++;
-		
-		$this->menu[$r]=array(
-		    'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
-		    'type'=>'left',			                // This is a Top menu entry
-		    'titre'=>'NewInventory',
-		    'mainmenu'=>'products',
-		    'leftmenu'=>'inventory_left_create',
-		    'url'=>'/inventory/inventory.php?action=create',
-		    'position'=>100+$r,
-		    'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-		    'perms'=>'$user->rights->inventory->create',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-		    'target'=>'',
-		    'user'=>2
-		);				                // 0=Menu for internal users, 1=external users, 2=both
-		$r++;
-		
-		$this->menu[$r]=array(
-		    'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=inventory_left',			                // Put 0 if this is a top menu
-		    'type'=>'left',			                // This is a Top menu entry
-		    'titre'=>'ListInventory',
-		    'mainmenu'=>'products',
-		    'leftmenu'=>'inventory_left_list',
-		    'url'=>'/inventory/list.php',
-		    'langs'=>'inventory',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		    'position'=>100+$r,
-		    'enabled'=>'$conf->inventory->enabled',	// Define condition to show or hide menu entry. Use '$conf->inventory->enabled' if entry must be visible if module is enabled.
-		    'perms'=>'$user->rights->inventory->read',			                // Use 'perms'=>'$user->rights->inventory->level1->level2' if you want your menu with a permission rules
-		    'target'=>'',
-		    'user'=>2
-		);				                // 0=Menu for internal users, 1=external users, 2=both
-		$r++;
-		*/
-		
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
diff --git a/htdocs/product/inventory/ajax/ajax.inventory.php b/htdocs/product/inventory/ajax/ajax.inventory.php
index c0d8443f433..4884d7ab065 100644
--- a/htdocs/product/inventory/ajax/ajax.inventory.php
+++ b/htdocs/product/inventory/ajax/ajax.inventory.php
@@ -2,14 +2,14 @@
 
     require '../../../main.inc.php';
     require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
-    
+  
     $get = GETPOST('get');
     $put = GETPOST('put');
     
     switch ($put)
     {
         case 'qty':
-            if (empty($user->rights->stock->write)) { echo -1; exit; }
+        	if (empty($user->rights->stock->creer)) { echo -1; exit; }
             
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
@@ -17,7 +17,7 @@
             if( $det->fetch( $fk_det_inventory))
             {
                 $det->qty_view+=GETPOST('qty');
-                $det->update($user);
+                $res = $det->update($user);
                 
                 echo $det->qty_view;
             }
@@ -25,11 +25,11 @@
             {
                 echo -2;
             }            
-            
+           
             break;
 			
         case 'pmp':
-            if (!$user->rights->stock->write || !$user->rights->stock->changePMP) { echo -1; exit; }
+        	if (empty($user->rights->stock->creer) || empty($user->rights->stock->changePMP)) { echo -1; exit; }
             
             $fk_det_inventory = GETPOST('fk_det_inventory');
             
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index dc279cc0929..ad539532901 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -66,7 +66,7 @@ $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('inventory'));
+$hookmanager->initHooks(array('inventorycard'));
 
 
 
@@ -84,7 +84,7 @@ if (empty($reshook))
     {
         if ($action != 'addlink')
         {
-            $urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+            $urltogo=$backtopage?$backtopage:dol_buildpath('/product/inventory/list.php',1);
             header("Location: ".$urltogo);
             exit;
         }
@@ -98,7 +98,7 @@ if (empty($reshook))
 	
 		if ($cancel)
 		{
-		    $urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+		    $urltogo=$backtopage?$backtopage:dol_buildpath('/product/inventory/list.php',1);
 		    header("Location: ".$urltogo);
 		    exit;
 		}
@@ -128,7 +128,6 @@ if (empty($reshook))
         	exit;
         }
         
-		break;
     }
     
     switch($action) {

From 12e91f1c1b9f5c02f0e47f6c33ea0cce7b26fafa Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 2 May 2017 15:25:30 +0200
Subject: [PATCH 0690/1163] fix rights inventory only for MAIN_LEVEL_FEATURES =
 2

---
 htdocs/core/modules/modStock.class.php | 47 ++++++++++++--------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index ea181f72a41..e80966afb81 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -117,37 +117,34 @@ class modStock extends DolibarrModules
 		$this->rights[4][4] = 'mouvement';
 		$this->rights[4][5] = 'creer';
 
+		if ($conf->global->MAIN_LEVEL_FEATURES >= 2) {
 		
-		$this->rights[$r][0] = 1006;
-		$this->rights[$r][1] = 'inventoryReadPermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
+		$this->rights[5][0] = 1006;
+		$this->rights[5][1] = 'inventoryReadPermission';	// Permission label
+		$this->rights[5][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[5][4] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[$r][0] = 1007;
-		$this->rights[$r][1] = 'inventoryCreatePermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
+		$this->rights[6][0] = 1007;
+		$this->rights[6][1] = 'inventoryCreatePermission';	// Permission label
+		$this->rights[6][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[6][4] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[$r][0] = 1008;
-		$this->rights[$r][1] = 'inventoryWritePermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
+		$this->rights[7][0] = 1008;
+		$this->rights[7][1] = 'inventoryWritePermission';	// Permission label
+		$this->rights[7][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[7][4] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[$r][0] = 1009;
-		$this->rights[$r][1] = 'inventoryValidatePermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
+		$this->rights[7][0] = 1009;
+		$this->rights[7][1] = 'inventoryValidatePermission';	// Permission label
+		$this->rights[7][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[7][4] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[$r][0] = 1010;
-		$this->rights[$r][1] = 'inventoryChangePMPPermission';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
+		$this->rights[7][0] = 1010;
+		$this->rights[7][1] = 'inventoryChangePMPPermission';	// Permission label
+		$this->rights[7][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[7][4] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
+		}
 		
 		// Main menu entries
 		$this->menu = array();			// List of menus to add

From c673d283e01e41a6292875dce4b9a8bb07bcf817 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 18:21:50 +0200
Subject: [PATCH 0691/1163] Fix script to send emailings

---
 ...terface_50_modAgenda_ActionsAuto.class.php |  2 +-
 scripts/emailings/mailing-send.php            | 41 ++++++++++++++-----
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index bce6d69b2fa..9da1ada59ad 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -48,7 +48,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 	 *      $object->actionmsg (note, long text)
 	 *      $object->actionmsg2 (label, short text)
 	 *      $object->sendtoid (id of contact or array of ids)
-	 *      $object->socid
+	 *      $object->socid (id of thirdparty)
 	 *      $object->fk_project
 	 *      $object->fk_element
 	 *      $object->elementtype
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 27cc22448e6..6465e765cfe 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -41,11 +41,12 @@ if (! isset($argv[1]) || ! $argv[1]) {
 	exit(-1);
 }
 $id=$argv[1];
-if (! isset($argv[2]) || !empty($argv[2])) $login = $argv[2];
+if (isset($argv[2]) || !empty($argv[2])) $login = $argv[2];
 else $login = '';
 
 require_once ($path."../../htdocs/master.inc.php");
 require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
+require_once (DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php");
 
 
 // Global variables
@@ -70,9 +71,8 @@ $user = new User($db);
 // for signature, we use user send as parameter
 if (! empty($login)) $user->fetch('',$login);
 
-// We get list of emailing to process
-$sql = "SELECT m.rowid, m.titre, m.sujet, m.body,";
-$sql.= " m.email_from, m.email_replyto, m.email_errorsto";
+// We get list of emailing id to process
+$sql = "SELECT m.rowid";
 $sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
 $sql.= " WHERE m.statut IN (1,2)";
 if ($id != 'all')
@@ -96,12 +96,15 @@ if ($resql)
 			dol_syslog("Process mailing with id ".$obj->rowid);
 			print "Process mailing with id ".$obj->rowid."\n";
 
-			$id       = $obj->rowid;
-			$subject  = $obj->sujet;
-			$message  = $obj->body;
-			$from     = $obj->email_from;
-			$replyto  = $obj->email_replyto;
-			$errorsto = $obj->email_errorsto;
+			$emailing = new Mailing($db);
+			$emailing->fetch($obj->rowid);
+			
+			$id       = $emailing->id;
+			$subject  = $emailing->sujet;
+			$message  = $emailing->body;
+			$from     = $emailing->email_from;
+			$replyto  = $emailing->email_replyto;
+			$errorsto = $emailing->email_errorsto;
 			// Le message est-il en html
 			$msgishtml=-1;  // Unknown by default
 			if (preg_match('/[\s\t]*<html>/i',$message)) $msgishtml=1;
@@ -232,6 +235,24 @@ if ($resql)
 
 							dol_syslog("ok for emailing id ".$id." #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
 
+							// Note: If emailing is 100 000 targets, 100 000 entries are added, so we don't enter events for each target here
+							// We must union table llx_mailing_taget for event tab OR enter 1 event with a special table link (id of email in event)
+							// Run trigger
+							/*
+							if ($obj2->source_type == 'contact')
+							{
+							    $emailing->sendtoid = $obj2->source_id;
+							}
+							if ($obj2->source_type == 'thirdparty')
+							{
+							    $emailing->socid = $obj2->source_id;
+							}
+                            // Call trigger
+                            $result=$emailing->call_trigger('EMAILING_SENTBYMAIL',$user);
+                            if ($result < 0) $error++;
+                            // End call triggers
+						    */
+							
 							$sqlok ="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
 							$sqlok.=" SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj2->rowid;
 							$resqlok=$db->query($sqlok);

From 0bc46facd75af8117780da5e4b30af9011645bd1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 21:24:18 +0200
Subject: [PATCH 0692/1163] Add missing vat_src_code on recurring invoices

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql  | 2 ++
 htdocs/install/mysql/tables/llx_facture_rec.sql | 1 +
 2 files changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 71f9a17273c..991381cb432 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -141,6 +141,8 @@ ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_soc_remise_fk_invoice_su
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoice_supplier        FOREIGN KEY (fk_invoice_supplier)      REFERENCES llx_facture_fourn (rowid);
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoice_supplier_source FOREIGN KEY (fk_invoice_supplier)      REFERENCES llx_facture_fourn (rowid);
 
+ALTER TABLE llx_facture_rec ADD COLUMN vat_src_code	varchar(10) DEFAULT '';
+
 UPDATE llx_const set value='moono-lisa' where value = 'moono' AND name = 'FCKEDITOR_SKIN';
 
 ALTER TABLE llx_product_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql
index d0d79ef57dc..0e25100386b 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec.sql
@@ -32,6 +32,7 @@ create table llx_facture_rec
   remise_percent     real     DEFAULT 0,
   remise_absolue     real     DEFAULT 0,
   
+  vat_src_code		 varchar(10)  DEFAULT '',			-- Vat code used as source of vat fields. Not strict foreign key here.
   tva                double(24,8)     DEFAULT 0,
   localtax1			 double(24,8)     DEFAULT 0,           -- amount localtax1
   localtax2          double(24,8)     DEFAULT 0,           -- amount localtax2

From b8f5e93ab0b56157dbfa83d95da42df84ff57487 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 21:40:18 +0200
Subject: [PATCH 0693/1163] Debug inventory data model

---
 htdocs/install/mysql/data/llx_c_tva.sql          |  2 +-
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql   | 13 +++++++++----
 htdocs/install/mysql/tables/llx_inventorydet.sql |  8 ++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 34842ed324e..3b401abd37d 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -96,11 +96,11 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (80
 
 -- FRANCE (id country=1)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 11,  1,  '20','0','VAT standard rate (France hors DOM-TOM)',1);
-insert into llx_c_tva(rowid,fk_pays,taux,code,recuperableonly,note,active) values ( 12,  1, '8.5', '8.5', '0','VAT standard rate (DOM sauf Guyane et Saint-Martin)',0);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 14,  1, '5.5','0','VAT reduced rate (France hors DOM-TOM)',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 15,  1,   '0','0','VAT Rate 0 ou non applicable',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 16,  1, '2.1','0','VAT super-reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 17,  1,  '10','0','VAT reduced rate',1);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active)                                                   values (1, '8.5', '85', '0','VAT standard rate (DOM sauf Guyane et Saint-Martin)',0);
 insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active)                                                   values (1, '8.5', '85NPR', '1','VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0);
 insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,note,active)                          values (1, '8.5', '85NPROM', '1', 2, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer',0);
 insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (1, '8.5', '85NPROMOMR', '1', 2, 3, 2.5, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer et Octroi de Mer Regional',0);
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 991381cb432..1982ef6aff8 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -229,9 +229,9 @@ fk_inventory integer DEFAULT 0,
 fk_warehouse integer DEFAULT 0,
 fk_product integer DEFAULT 0,  
 batch varchar(30) DEFAULT NULL,
-qty_view double DEFAULT 0, 
-qty_stock double DEFAULT 0, 
-qty_regulated double DEFAULT 0, 
+qty_view double DEFAULT NULL,
+qty_stock double DEFAULT NULL,
+qty_regulated double DEFAULT NULL,
 pmp double DEFAULT 0, 
 pa double DEFAULT 0, 
 new_pmp double DEFAULT 0
@@ -242,4 +242,9 @@ ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms);
 ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (datec);
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_tms (tms);
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (datec);
-ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_fk_inventory (fk_inventory);
\ No newline at end of file
+ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_fk_inventory (fk_inventory);
+
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active)                                                   values (1, '8.5', '85', '0','VAT standard rate (DOM sauf Guyane et Saint-Martin)',0);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active)                                                   values (1, '8.5', '85NPR', '1','VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,note,active)                          values (1, '8.5', '85NPROM', '1', 2, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer',0);
+insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (1, '8.5', '85NPROMOMR', '1', 2, 3, 2.5, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer et Octroi de Mer Regional',0);
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.sql b/htdocs/install/mysql/tables/llx_inventorydet.sql
index 2b203e0c58b..ce40d03939c 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet.sql
@@ -25,10 +25,10 @@ tms timestamp,
 fk_inventory integer DEFAULT 0, 
 fk_warehouse integer DEFAULT 0,
 fk_product integer DEFAULT 0,  
-batch varchar(30) DEFAULT NULL,		-- Lot or serial number
-qty_view double DEFAULT 0, 
-qty_stock double DEFAULT 0, 
-qty_regulated double DEFAULT 0, 
+batch varchar(30) DEFAULT NULL,	 -- Lot or serial number
+qty_view double DEFAULT NULL, 	     -- must be filled once regulation is done
+qty_stock double DEFAULT NULL,   -- can be filled during draft edition
+qty_regulated double DEFAULT NULL,  -- must be filled once regulation is done
 pmp double DEFAULT 0, 
 pa double DEFAULT 0, 
 new_pmp double DEFAULT 0

From a115d4877b9903dfb137e9ecb2d0cd2fb03db4c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 May 2017 22:37:23 +0200
Subject: [PATCH 0694/1163] Fix for new property array fields

---
 htdocs/api/class/api.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 7aef2671c8d..9228c71ccbf 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -90,6 +90,8 @@ class DolibarrApi
         // Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses
         unset($object->linkedObjects);
         
+        unset($object->fields);
+        
         unset($object->oldline);
         
         unset($object->error);

From d1a443f0f042c939a491c9d7cdc30632bf9b64c8 Mon Sep 17 00:00:00 2001
From: alexis portable <alexis@atm-consulting.fr>
Date: Tue, 2 May 2017 23:11:05 +0200
Subject: [PATCH 0695/1163] fix camelcase for travis

---
 htdocs/core/class/commonobject.class.php | 34 ++++++++++++------------
 htdocs/core/class/coreobject.class.php   |  8 +++---
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 582e00d29fa..97c8da3f316 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4669,7 +4669,7 @@ abstract class CommonObject
 	 * @param   array   $info   content informations of field
 	 * @return                  bool
 	 */
-	protected function is_date($info)
+	protected function isDate($info)
 	{
 		if(isset($info['type']) && $info['type']=='date') return true;
 		else return false;
@@ -4681,7 +4681,7 @@ abstract class CommonObject
 	 * @param   array   $info   content informations of field
 	 * @return                  bool
 	 */
-	protected function is_array($info)
+	protected function isArray($info)
 	{
 		if(is_array($info))
 		{
@@ -4697,7 +4697,7 @@ abstract class CommonObject
 	 * @param   array   $info   content informations of field
 	 * @return                  bool
 	 */
-	protected function is_null($info)
+	protected function isNull($info)
 	{
 		if(is_array($info))
 		{
@@ -4713,7 +4713,7 @@ abstract class CommonObject
 	 * @param   array   $info   content informations of field
 	 * @return                  bool
 	 */
-	protected function is_int($info)
+	protected function isInt($info)
 	{
 		if(is_array($info))
 		{
@@ -4729,7 +4729,7 @@ abstract class CommonObject
 	 * @param   array   $info   content informations of field
 	 * @return                  bool
 	 */
-	protected function is_float($info)
+	protected function isFloat($info)
 	{
 		if(is_array($info))
 		{
@@ -4745,7 +4745,7 @@ abstract class CommonObject
 	 * @param   array   $info   content informations of field
 	 * @return                  bool
 	 */
-	protected function is_text($info)
+	protected function isText($info)
 	{
 		if(is_array($info))
 		{
@@ -4761,7 +4761,7 @@ abstract class CommonObject
 	 * @param   array   $info   content informations of field
 	 * @return                  bool
 	 */
-	protected function is_index($info)
+	protected function isIndex($info)
 	{
 		if(is_array($info))
 		{
@@ -4781,7 +4781,7 @@ abstract class CommonObject
 		$query=array();
 		foreach ($this->fields as $field=>$info)
 		{
-			if($this->is_date($info))
+			if($this->isDate($info))
 			{
 				if(empty($this->{$field}))
 				{
@@ -4792,19 +4792,19 @@ abstract class CommonObject
 					$query[$field] = $this->db->idate($this->{$field});
 				}
 			}
-			else if($this->is_array($info))
+			else if($this->isArray($info))
 			{
 				$query[$field] = serialize($this->{$field});
 			}
-			else if($this->is_int($info))
+			else if($this->isInt($info))
 			{
 				$query[$field] = (int) price2num($this->{$field});
 			}
-			else if($this->is_float($info))
+			else if($this->isFloat($info))
 			{
 				$query[$field] = (double) price2num($this->{$field});
 			}
-			elseif($this->is_null($info))
+			elseif($this->isNull($info))
 			{
 				$query[$field] = (is_null($this->{$field}) || (empty($this->{$field}) && $this->{$field}!==0 && $this->{$field}!=='0') ? null : $this->{$field});
 			}
@@ -4860,26 +4860,26 @@ abstract class CommonObject
 	{
 		foreach ($this->fields as $field => $info)
 		{
-			if($this->is_date($info))
+			if($this->isDate($info))
 			{
 				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
 				else $this->{$field} = strtotime($obj->{$field});
 			}
-			elseif($this->is_array($info))
+			elseif($this->isArray($info))
 			{
 				$this->{$field} = @unserialize($obj->{$field});
 				// Hack for data not in UTF8
 				if($this->{$field } === FALSE) @unserialize(utf8_decode($obj->{$field}));
 			}
-			elseif($this->is_int($info))
+			elseif($this->isInt($info))
 			{
 				$this->{$field} = (int) $obj->{$field};
 			}
-			elseif($this->is_float($info))
+			elseif($this->isFloat($info))
 			{
 				$this->{$field} = (double) $obj->{$field};
 			}
-			elseif($this->is_null($info))
+			elseif($this->isNull($info))
 			{
 				$val = $obj->{$field};
 				// zero is not null
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index c86a1083519..021213594f7 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -59,10 +59,10 @@ class CoreObject extends CommonObject
 		{
 			foreach ($this->fields as $field=>$info)
 			{
-		        if ($this->is_date($info)) $this->{$field} = time();
-		        elseif ($this->is_array($info)) $this->{$field} = array();
-		        elseif ($this->is_int($info)) $this->{$field} = (int) 0;
-		        elseif ($this->is_float($info)) $this->{$field} = (double) 0;
+		        if ($this->isDate($info)) $this->{$field} = time();
+		        elseif ($this->isArray($info)) $this->{$field} = array();
+		        elseif ($this->isInt($info)) $this->{$field} = (int) 0;
+		        elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
 				else $this->{$field} = '';
 		    }
 

From da4d179d36789551eb31490f107f7abd3c6a0c92 Mon Sep 17 00:00:00 2001
From: alexis portable <alexis@atm-consulting.fr>
Date: Tue, 2 May 2017 23:20:23 +0200
Subject: [PATCH 0696/1163] fix travis

---
 htdocs/core/class/commonobject.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 97c8da3f316..16bff11b5fd 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4958,7 +4958,7 @@ abstract class CommonObject
 		foreach ($fields as $k => $v) {
 			
 			if (is_array($key)){
-				$i=array_search($k , $key );
+				$i=array_search($k, $key);
 				if ( $i !== false) {
 					$where[] = $key[$i].'=' . $this->quote( $v ) ;
 					continue;

From 29bede28f05a3004a55de6ad10b5001cae0cc92e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 4 May 2017 06:49:29 +0200
Subject: [PATCH 0697/1163] New : Accountancy - Add export model towards Agiris

---
 .../class/accountancyexport.class.php         | 51 +++++++++++++++++--
 htdocs/langs/en_US/accountancy.lang           |  1 +
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 524326e320c..b59d8ca51a6 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -47,6 +47,7 @@ class AccountancyExport
 	public static $EXPORT_TYPE_QUADRATUS = 6;
 	public static $EXPORT_TYPE_EBP = 7;
 	public static $EXPORT_TYPE_COGILOG = 8;
+	public static $EXPORT_TYPE_AGIRIS = 9;
 
 	/**
 	 *
@@ -96,6 +97,7 @@ class AccountancyExport
 				self::$EXPORT_TYPE_QUADRATUS => $langs->trans('Modelcsv_quadratus'),
 				self::$EXPORT_TYPE_EBP => $langs->trans('Modelcsv_ebp'),
 				self::$EXPORT_TYPE_COGILOG => $langs->trans('Modelcsv_cogilog'),
+				self::$EXPORT_TYPE_AGIRIS => $langs->trans('Modelcsv_agiris')
 		);
 	}
 
@@ -145,6 +147,9 @@ class AccountancyExport
 			case self::$EXPORT_TYPE_COGILOG :
 				$this->exportCogilog($TData);
 				break;
+			case self::$EXPORT_TYPE_AGIRIS :
+				$this->exportAgiris($TData);
+				break;
 			default:
 				$this->errors[] = $langs->trans('accountancy_error_modelnotfound');
 				break;
@@ -382,7 +387,7 @@ class AccountancyExport
 
 
 	/**
-	 * Export format : Normal
+	 * Export format : EBP
 	 *
 	 * @param array $objectLines data
 	 *
@@ -401,8 +406,7 @@ class AccountancyExport
 			print $line->code_journal . $this->separator;
 			print length_accountg($line->numero_compte) . $this->separator;
 			print substr(length_accountg($line->numero_compte),0,2) . $this->separator;
-			print '"'.dol_trunc($line->label_compte,40,'right','UTF-8',1).'"' . $this->separator;
-			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
+			print substr(length_accounta($line->code_tiers),0,2) . $this->separator;
 			print price2num($line->montant).$this->separator;
 			print $line->sens.$this->separator;
 			print $date . $this->separator;
@@ -412,6 +416,47 @@ class AccountancyExport
 	}
 
 
+	/**
+	 * Export format : Agiris
+	 *
+	 * @param array $objectLines data
+	 *
+	 * @return void
+	 */
+	public function exportAgiris($objectLines) {
+
+		$this->separator = ';';
+
+		foreach ( $objectLines as $line ) {
+
+			$date = dol_print_date($line->doc_date, '%d%m%Y');
+
+			print $line->id . $this->separator;
+			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
+			print $date . $this->separator;
+			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
+			
+			if (empty($line->code_tiers)) {
+				print length_accountg($line->numero_compte) . $this->separator;
+			} else {
+				if (substr($line->numero_compte, 0, 1) == 'C' || substr($line->numero_compte, 0, 1) == '9') {
+					print '411' . substr(str_replace(" ", "", $line->code_tiers), 0, 5) . $this->separator;
+				}
+				if (substr($line->numero_compte, 0, 1) == 'F' || substr($line->numero_compte, 0, 1) == '0') {
+					print '401' . substr(str_replace(" ", "", $line->code_tiers), 0, 5) . $this->separator;
+				}
+			}
+			
+			print length_accounta($line->code_tiers) . $this->separator;
+			print price($line->debit) . $this->separator;
+			print price($line->credit) . $this->separator;
+			print price($line->montant).$this->separator;
+			print $line->sens.$this->separator;
+			print $line->code_journal . $this->separator;
+			print $this->end_line;
+		}
+	}
+
 
 	/**
 	 *
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index bd1e41c5464..e84f85898c8 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -225,6 +225,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_agiris=Export towards Agiris (Test)
 ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service

From 76f2cc3f1e3a3e4bef4831ca9b76d331664ea0e2 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 4 May 2017 06:52:07 +0200
Subject: [PATCH 0698/1163] False operation

---
 htdocs/accountancy/class/accountancyexport.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index b59d8ca51a6..1af9e5d1a6b 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -406,7 +406,8 @@ class AccountancyExport
 			print $line->code_journal . $this->separator;
 			print length_accountg($line->numero_compte) . $this->separator;
 			print substr(length_accountg($line->numero_compte),0,2) . $this->separator;
-			print substr(length_accounta($line->code_tiers),0,2) . $this->separator;
+			print '"'.dol_trunc($line->label_compte,40,'right','UTF-8',1).'"' . $this->separator;
+			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
 			print price2num($line->montant).$this->separator;
 			print $line->sens.$this->separator;
 			print $date . $this->separator;

From 694efca32ac10f666b59b57b7a53d48e20ba0e4c Mon Sep 17 00:00:00 2001
From: "Guillaume T. (Arck Consulting)" <guillaume@arckconsulting.fr>
Date: Thu, 4 May 2017 09:32:06 +0200
Subject: [PATCH 0699/1163] [FIX] Credit Note for fourn doesn't work, missing
 filed in create method & attribut

---
 htdocs/fourn/class/fournisseur.facture.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 42daafe9c2d..1798eb19059 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -128,7 +128,9 @@ class FactureFournisseur extends CommonInvoice
     public $multicurrency_total_ht;
     public $multicurrency_total_tva;
     public $multicurrency_total_ttc;
-
+    //! id of source invoice if replacement invoice or credit note
+    public $fk_facture_source;
+    
     /**
      * Standard invoice
      */
@@ -263,6 +265,7 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ", fk_multicurrency";
         $sql.= ", multicurrency_code";
         $sql.= ", multicurrency_tx";
+        $sql.= ", fk_facture_source";
         $sql.= ")";
         $sql.= " VALUES (";
 		$sql.= "'(PROV)'";
@@ -286,6 +289,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql.= ", ".(int) $this->fk_multicurrency;
 		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql.= ", ".(double) $this->multicurrency_tx;
+        $sql.= ", ".(isset($this->fk_facture_source)?$this->fk_facture_source:"NULL");
         $sql.= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);

From f543461e9b084de70e84ba06a5ed15c4f2943394 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 11:21:28 +0200
Subject: [PATCH 0700/1163] Complete the substitution array with substitution
 array with all possible keys

---
 htdocs/core/class/html.formmail.class.php | 3 +++
 htdocs/core/lib/functions.lib.php         | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index d7ab17e60c4..6c411b60e66 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1133,6 +1133,9 @@ class FormMail extends Form
 				$vars['__SECUREKEYPAYPAL_MEMBER__']='';
 			}
 		}
+		
+		$vars=complete_substitutions_array($vars, $langs, null, null);
+		
 		return $vars;
 	}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 857ddc6eec2..b6cf92aa81d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4953,7 +4953,8 @@ function make_substitutions($text, $substitutionarray, $outputlangs=null)
 }
 
 /**
- *  Complete the $substitutionarray with more entries
+ *  Complete the $substitutionarray with more entries.
+ *  Can also add substitution keys coming from external module that had set the "substitutions=1" into module_part array. In this case, method completesubstitutionarray provided by module is called. 
  *
  *  @param  array		$substitutionarray		Array substitution old value => new value value
  *  @param  Translate	$outputlangs            Output language

From 7ec46b3bd6ace90a7e91e51198d874f484ff1e0b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 12:35:45 +0200
Subject: [PATCH 0701/1163] Finished work to have substitution keys code
 mutualized.

---
 htdocs/accountancy/admin/accountmodel.php |  3 +--
 htdocs/admin/mails_templates.php          | 22 +++++++++++++++-------
 htdocs/core/class/html.formmail.class.php | 18 ++++++++++++------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 0b4aa70e548..55c194cd416 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -757,8 +757,7 @@ if ($id)
         {
         	print '<tr><td colspan="8">* '.$langs->trans("AvailableVariables").": ";
         	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-        	$formmail=new FormMail($db);
-        	$tmp=$formmail->getAvailableSubstitKey('form');
+        	$tmp=FormMail::getAvailableSubstitKey('formemail');
         	print implode(', ', $tmp);
         	print '</td></tr>';
         }
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index f0bf5609adf..08ba76dca99 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -118,17 +118,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 $formmail=new FormMail($db);
 if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
 {
-    $tmp=$formmail->getAvailableSubstitKey('form');
+    $tmp=FormMail::getAvailableSubstitKey('formemail');
     $tmp['__(AnyTransKey)__']='__(AnyTransKey)__';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
     $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
 }
 else
 {
-    $tmp=$formmail->getAvailableSubstitKey('formwithlines');
+    $tmp=FormMail::getAvailableSubstitKey('formemailwithlines');
     $tmp['__(AnyTransKey)__']='__(AnyTransKey)__';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
-    $tmp=$formmail->getAvailableSubstitKey('formforlines');
+    $tmp=FormMail::getAvailableSubstitKey('formemailforlines');
     $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
 }
 
@@ -484,7 +484,11 @@ if ($action != 'edit')
         {
             print '<td align="'.$align.'">';
         	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
-        	else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
+        	else if (! empty($tabhelp[$id][$value])) 
+        	{
+        	    if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value);   // Tooltip on click
+        	    else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);                             // Tooltip on hover
+        	}
         	else print $valuetoshow;
             print '</td>';
          }
@@ -539,8 +543,8 @@ if ($action != 'edit')
     foreach ($fieldsforcontent as $tmpfieldlist)
     {
         print '<tr class="impair nodrag nodrop nohover"><td colspan="5">';
-        if ($tmpfieldlist == 'content') print '<strong>'.$form->textwithpicto($langs->trans("Content"),$tabhelp[$id][$tmpfieldlist]).'</strong><br>';
-        if ($tmpfieldlist == 'content_lines') print '<strong>'.$form->textwithpicto($langs->trans("ContentForLines"),$tabhelp[$id][$tmpfieldlist]).'</strong><br>';
+        if ($tmpfieldlist == 'content') print '<strong>'.$form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong><br>';
+        if ($tmpfieldlist == 'content_lines') print '<strong>'.$form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong><br>';
     
         if ($context != 'hide')
         {
@@ -624,7 +628,11 @@ if ($resql)
         // Affiche nom du champ
         if ($showfield)
         {
-            if (! empty($tabhelp[$id][$value])) $valuetoshow = $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
+            if (! empty($tabhelp[$id][$value])) 
+            {
+                if (in_array($value, array('topic'))) $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);   // Tooltip on hover
+                else $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);                             // Tooltip on hover
+            }
             print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
         }
     }
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 6c411b60e66..6988fb4b992 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1059,18 +1059,18 @@ class FormMail extends Form
 	}
 	
 	/**
-	 * Set substit array from object
+	 * Get list of substition keys available.
 	 * 
-	 * @param	string	$mode		'form', 'formwithlines', 'formforlines' or 'emailing'
+	 * @param	string	$mode		'formemail', 'formemailwithlines', 'formemailforlines', 'emailing', ...
 	 * @return	void
 	 */
-	function getAvailableSubstitKey($mode='form')
+	static function getAvailableSubstitKey($mode='formemail')
 	{
-		global $conf;
+		global $conf, $langs;
 		
 		$vars=array();
 		
-		if ($mode == 'form' || $mode == 'formwithlines' || $mode == 'formforlines')
+		if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines')
 		{
 			$vars=array(
 				'__REF__', 
@@ -1134,7 +1134,13 @@ class FormMail extends Form
 			}
 		}
 		
-		$vars=complete_substitutions_array($vars, $langs, null, null);
+		$tmparray=array();
+		$parameters=array('mode'=>$mode);
+		complete_substitutions_array($tmparray, $langs, null, $parameters);
+		foreach($tmparray as $key => $val)
+		{
+		    $vars[]=$key;
+		}
 		
 		return $vars;
 	}

From 1a6c118a5dfa001a8dd5cda90402d543cd067902 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 12:41:29 +0200
Subject: [PATCH 0702/1163] Fix travis warning

---
 htdocs/product/inventory/card.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index dc279cc0929..827354b864c 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -127,8 +127,6 @@ if (empty($reshook))
         	header('Location: '.dol_buildpath('/product/inventory/card.php?action=create', 1));
         	exit;
         }
-        
-		break;
     }
     
     switch($action) {

From 7d5b5cf86a1da58fad3a006cdee9f2ec079d2eb9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 13:09:42 +0200
Subject: [PATCH 0703/1163] Better behavior for tooltip on click

---
 htdocs/core/class/html.form.class.php | 5 +++--
 htdocs/langs/en_US/main.lang          | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3275ee0f303..cab420fe888 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -492,10 +492,11 @@ class Form
      */
     function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 2, $tooltiptrigger='')
     {
-        global $conf;
+        global $conf, $langs;
 
         $alt = '';
-
+        if ($tooltiptrigger) $alt=$langs->trans("ClickToShowHelp");
+        
         //For backwards compatibility
         if ($type == '0') $type = 'info';
         elseif ($type == '1') $type = 'help';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 1a3eea413df..c567890730a 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -766,6 +766,9 @@ Download=Download
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
 ModuleBuilder=Module Builder
+SetMultiCurrencyCode=Set currency
+BulkActions=Bulk actions
+ClickToShowHelp=Click to show tooltip help
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -822,6 +825,4 @@ SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
-SetMultiCurrencyCode=Set currency
-BulkActions=Bulk actions
\ No newline at end of file
+SearchIntoLeaves=Leaves
\ No newline at end of file

From 0c76db7973ef2f410f08a4551e36bff48720b5dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 13:41:37 +0200
Subject: [PATCH 0704/1163] FIX #6698 #6742

---
 htdocs/comm/mailing/cibles.php               | 51 +++++++++++---------
 htdocs/comm/mailing/class/mailing.class.php  |  2 +-
 htdocs/core/class/html.formmail.class.php    |  2 +-
 htdocs/core/class/html.formmailing.class.php | 14 +++---
 4 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index d3642c50393..118cc336fb7 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -161,6 +161,7 @@ if ($_POST["button_removefilter"])
 	$search_lastname='';
 	$search_firstname='';
 	$search_email='';
+	$search_dest_status='';
 }
 
 
@@ -399,7 +400,7 @@ if ($object->fetch($id) >= 0)
 	if ($search_lastname)    $sql.= " AND mc.lastname    LIKE '%".$db->escape($search_lastname)."%'";
 	if ($search_firstname) $sql.= " AND mc.firstname LIKE '%".$db->escape($search_firstname)."%'";
 	if ($search_email)  $sql.= " AND mc.email  LIKE '%".$db->escape($search_email)."%'";
-	if (!empty($search_dest_status)) $sql.= " AND mc.statut=".$db->escape($search_dest_status)." ";
+	if ($search_dest_status != '' && $search_dest_status >= -1) $sql.= " AND mc.statut=".$db->escape($search_dest_status)." ";
 	$sql .= $db->order($sortfield,$sortorder);
 
 	// Count total nb of records
@@ -411,7 +412,7 @@ if ($object->fetch($id) >= 0)
 	}
 	//$nbtotalofrecords=$object->nbemail;     // nbemail is a denormalized field storing nb of targets
 	$sql .= $db->plimit($limit+1, $offset);
-
+	
 	$resql=$db->query($sql);
 	if ($resql)
 	{
@@ -446,29 +447,12 @@ if ($object->fetch($id) >= 0)
 		print '<input type="hidden" name="limit" value="'.$limit.'">';
 		
 
-		if ($page)			$param.= "&amp;page=".$page;
+		if ($page)	$param.= "&amp;page=".$page;
+		
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"mc.email",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"mc.lastname",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"mc.firstname",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("OtherInformations"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Source"),$_SERVER["PHP_SELF"],"",$param,"",'align="center"',$sortfield,$sortorder);
-		// Date sending
-		if ($object->statut < 2)
-		{
-			print_liste_field_titre('');
-		}
-		else
-		{
-			print_liste_field_titre($langs->trans("DateSending"),$_SERVER["PHP_SELF"],"mc.date_envoi",$param,'','align="center"',$sortfield,$sortorder);
-		}
-		print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"mc.statut",$param,'','align="right"',$sortfield,$sortorder);
-		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-		print '</tr>';
-
+		
 		// Ligne des champs de filtres
-		print '<tr class="liste_titre">';
+		print '<tr class="liste_titre_filter">';
 		// EMail
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth100" type="text" name="search_email" value="'.dol_escape_htmltag($search_email).'">';
@@ -489,7 +473,7 @@ if ($object->fetch($id) >= 0)
 		print '<td class="liste_titre">';
 		print '&nbsp';
 		print '</td>';
-
+		
 		// Date sending
 		print '<td class="liste_titre">';
 		print '&nbsp';
@@ -504,6 +488,25 @@ if ($object->fetch($id) >= 0)
 		print $searchpitco;
 		print '</td>';
 		print '</tr>';
+		
+		print '<tr class="liste_titre">';
+		print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"mc.email",$param,"","",$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"mc.lastname",$param,"","",$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"mc.firstname",$param,"","",$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("OtherInformations"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Source"),$_SERVER["PHP_SELF"],"",$param,"",'align="center"',$sortfield,$sortorder);
+		// Date sending
+		if ($object->statut < 2)
+		{
+			print_liste_field_titre('');
+		}
+		else
+		{
+			print_liste_field_titre($langs->trans("DateSending"),$_SERVER["PHP_SELF"],"mc.date_envoi",$param,'','align="center"',$sortfield,$sortorder);
+		}
+		print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"mc.statut",$param,'','align="right"',$sortfield,$sortorder);
+		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+		print '</tr>';
 
 		$i = 0;
 
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index b0dff81332c..43a3cdcb78d 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -80,8 +80,8 @@ class Mailing extends CommonObject
 		$this->statuts[2] = 'MailingStatusSentPartialy';
 		$this->statuts[3] = 'MailingStatusSentCompletely';
 
-		$this->statut_dest[0] = 'MailingStatusNotSent';
 		$this->statut_dest[-1] = 'MailingStatusError';
+		$this->statut_dest[0] = 'MailingStatusNotSent';
 		$this->statut_dest[1] = 'MailingStatusSent';
 		$this->statut_dest[2] = 'MailingStatusRead';
 		$this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe';    // Read but ask to not be contacted anymore
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 6988fb4b992..ab58854f2c4 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1139,7 +1139,7 @@ class FormMail extends Form
 		complete_substitutions_array($tmparray, $langs, null, $parameters);
 		foreach($tmparray as $key => $val)
 		{
-		    $vars[]=$key;
+		    $vars[$key]=$key;
 		}
 		
 		return $vars;
diff --git a/htdocs/core/class/html.formmailing.class.php b/htdocs/core/class/html.formmailing.class.php
index 0c63049f9d8..9fb4e4eea86 100644
--- a/htdocs/core/class/html.formmailing.class.php
+++ b/htdocs/core/class/html.formmailing.class.php
@@ -32,9 +32,9 @@ class FormMailing  extends Form
 	/**
 	 * Output a select with destinaries status
 	 * 
-	 * @param string $selectedid the selected id
-	 * @param string $htmlname name of controm
-	 * @param integer $show_empty show empty option
+	 * @param string   $selectedid     The selected id
+	 * @param string   $htmlname       Name of controm
+	 * @param integer  $show_empty     Show empty option
 	 * @return string HTML select
 	 */
 	public function selectDestinariesStatus($selectedid='',$htmlname='dest_status', $show_empty=0) {
@@ -46,13 +46,13 @@ class FormMailing  extends Form
 		$mailing = new Mailing($this->db);
 
 		$options = array();
-
+        
 		if ($show_empty) {
-			$options[''] = '';
+			$options[-2] = '';   // Note -1 is used for error
 		}
 
-		$options = array_merge($options, $mailing->statut_dest);
+        $options = $options + $mailing->statut_dest;
 
-		return Form::selectarray($htmlname, $options, $selectedid, 0, 0, 0, '', 1);
+        return Form::selectarray($htmlname, $options, $selectedid, 0, 0, 0, '', 1);
 	}
 }

From 4c2f3aeeac45ffb13ca937bc6d95a07bcc4f7282 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Thu, 4 May 2017 13:46:25 +0200
Subject: [PATCH 0705/1163] Update compta.php

---
 htdocs/admin/compta.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 4c289ee25c7..70bf15d03f3 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -119,7 +119,7 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans('OptionMode').'</td><td>'.$langs->trans('Description').'</td>';
 print "</tr>\n";
-print '<tr class=\"oddeven\"><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
+print '<tr class="oddeven"><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 // Write info on way to count VAT
 //if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
@@ -133,7 +133,7 @@ print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 //	//	print nl2br($langs->trans('OptionModeTrueInfoExpert'));
 //}
 print "</td></tr>\n";
-print '<tr class=\"oddeven\"><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
+print '<tr class="oddeven"><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
 
 print "</table>\n";

From ea58fb0b50b947e623abc439cb0fb93c4f8f4c7f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 15:52:12 +0200
Subject: [PATCH 0706/1163] Fix triggered error

---
 .../class/fournisseur.commande.class.php      | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 04f50e9fbcb..fb43b68de95 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2669,21 +2669,22 @@ class CommandeFournisseur extends CommonOrder
             $sql.= " FROM ".MAIN_DB_PREFIX.'c_input_method';
             $sql.= " WHERE active=1 AND rowid = ".$db->escape($this->methode_commande_id);
 
-            $query = $db->query($sql);
-            if ($query && $db->num_rows($query))
+            $resql = $db->query($sql);
+            if ($resql)
             {
-                $obj = $db->fetch_object($query);
-
-                $string = $langs->trans($obj->code);
-                if ($string == $obj->code)
+                if ($db->num_rows($query))
                 {
-                    $string = $obj->label != '-' ? $obj->label : '';
-                }
-
-                return $string;
+                    $obj = $db->fetch_object($query);
+    
+                    $string = $langs->trans($obj->code);
+                    if ($string == $obj->code)
+                    {
+                        $string = $obj->label != '-' ? $obj->label : '';
+                    }
+                    return $string;
+                }    
             }
-
-            dol_print_error($db);
+            else dol_print_error($db);
         }
 
         return '';

From ce05c74e47859f0ec78d3a3c616d4a0b7784d738 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 17:48:52 +0200
Subject: [PATCH 0707/1163] NEW SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT

---
 .../class/fournisseur.commande.class.php      |  2 +-
 htdocs/fourn/commande/dispatch.php            | 37 ++++++++++++++-----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index fb43b68de95..c326d033de8 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2818,7 +2818,7 @@ class CommandeFournisseur extends CommonOrder
 
     
     /**
-     * Calc status regarding dispatch stock
+     * Calc status regarding to dispatched stock
      *
      * @param 		User 	$user                   User action
      * @param       int     $closeopenorder         Close if received
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index c87b3a62bed..b7e3830ad5c 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -467,16 +467,14 @@ if ($id > 0 || ! empty($ref)) {
 					if ($remaintodispatch || empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED)) {
 						$nbproduct++;
 
-						$var = ! $var;
-
 						// To show detail cref and description value, we must make calculation by cref
 						// print ($objp->cref?' ('.$objp->cref.')':'');
 						// if ($objp->description) print '<br>'.nl2br($objp->description);
 						$suffix = '_0_' . $i;
 
 						print "\n";
-						print '<!-- Line ' . $suffix . ' -->' . "\n";
-						print "<tr " . $bc[$var] . ">";
+						print '<!-- Line to dispatch ' . $suffix . ' -->' . "\n";
+						print '<tr class="oddeven">';
 
 						$linktoprod = '<a href="' . DOL_URL_ROOT . '/product/fournisseurs.php?id=' . $objp->fk_product . '">' . img_object($langs->trans("ShowProduct"), 'product') . ' ' . $objp->ref . '</a>';
 						$linktoprod .= ' - ' . $objp->label . "\n";
@@ -500,7 +498,7 @@ if ($id > 0 || ! empty($ref)) {
 							print "</td>";
 						}
 
-						$var = ! $var;
+						// Define unit price for PMP calculation
 						$up_ht_disc = $objp->subprice;
 						if (! empty($objp->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP))
 							$up_ht_disc = price2num($up_ht_disc * (100 - $objp->remise_percent) / 100, 'MU');
@@ -517,11 +515,21 @@ if ($id > 0 || ! empty($ref)) {
 							print '<td></td>'; // Warehouse column
 							print '</tr>';
 
-							print '<tr ' . $bc[$var] . ' name="' . $type . $suffix . '">';
+							print '<tr class="oddeven" name="' . $type . $suffix . '">';
 							print '<td>';
 							print '<input name="fk_commandefourndet' . $suffix . '" type="hidden" value="' . $objp->rowid . '">';
 							print '<input name="product_batch' . $suffix . '" type="hidden" value="' . $objp->fk_product . '">';
-							print '<input name="pu' . $suffix . '" type="hidden" value="' . $up_ht_disc . '"><!-- This is a up including discount -->';
+							
+							print '<!-- This is a up (may include discount or not depending on STOCK_EXCLUDE_DISCOUNT_FOR_PMP. will be used for PMP calculation) -->';
+							if (! empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) // Not tested !
+							{
+							    print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu' . $suffix . '" type="text" value="' . price2num($up_ht_disc, 'MU') . '">';
+							}
+							else
+							{
+							    print '<input class="maxwidth75" name="pu' . $suffix . '" type="hidden" value="' . price2num($up_ht_disc, 'MU') . '">';
+							}
+
 							// hidden fields for js function
 							print '<input id="qty_ordered' . $suffix . '" type="hidden" value="' . $objp->qty . '">';
 							print '<input id="qty_dispatched' . $suffix . '" type="hidden" value="' . ( float ) $products_dispatched[$objp->rowid] . '">';
@@ -544,11 +552,22 @@ if ($id > 0 || ! empty($ref)) {
 							print '<td align="right">' . img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"') . '</td>'; // Dispatch column
 							print '<td></td>';
 							print '</tr>';
-							print '<tr ' . $bc[$var] . ' name="' . $type . $suffix . '">';
+
+							print '<tr class="oddeven" name="' . $type . $suffix . '">';
 							print '<td colspan="6">';
 							print '<input name="fk_commandefourndet' . $suffix . '" type="hidden" value="' . $objp->rowid . '">';
 							print '<input name="product' . $suffix . '" type="hidden" value="' . $objp->fk_product . '">';
-							print '<input name="pu' . $suffix . '" type="hidden" value="' . $up_ht_disc . '"><!-- This is a up including discount -->';
+							
+							print '<!-- This is a up (may include discount or not depending on STOCK_EXCLUDE_DISCOUNT_FOR_PMP. will be used for PMP calculation) -->';
+							if (! empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) // Not tested !
+							{
+							    print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu' . $suffix . '" type="text" value="' . price2num($up_ht_disc, 'MU') . '">';
+							}
+							else
+							{
+							    print '<input class="maxwidth75" name="pu' . $suffix . '" type="hidden" value="' . price2num($up_ht_disc, 'MU') . '">';
+							}
+							
 							// hidden fields for js function
 							print '<input id="qty_ordered' . $suffix . '" type="hidden" value="' . $objp->qty . '">';
 							print '<input id="qty_dispatched' . $suffix . '" type="hidden" value="' . ( float ) $products_dispatched[$objp->rowid] . '">';

From bf616cbe05437e89e4f9140e600ddd3593e61929 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 19:05:02 +0200
Subject: [PATCH 0708/1163] Fix bad var

---
 htdocs/core/class/conf.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 6bca5b7d5a4..28a287971a8 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -358,8 +358,8 @@ class Conf
     			$this->supplier_order->dir_temp=$rootfordata."/fournisseur/commande/temp";
     			$this->supplier_invoice=new stdClass();
     			$this->supplier_invoice->enabled=1;
-    			$this->supplier_order->dir_output=$rootfordata."/fournisseur/facture";
-    			$this->supplier_order->dir_temp=$rootfordata."/fournisseur/facture/temp";
+    			$this->supplier_invoice->dir_output=$rootfordata."/fournisseur/facture";
+    			$this->supplier_invoice->dir_temp=$rootfordata."/fournisseur/facture/temp";
 			}
 		}
 

From 39d9a0f979c8163608120c7d668f57968a625aac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 19:11:19 +0200
Subject: [PATCH 0709/1163] Support of pdf preview on supplier orders

---
 htdocs/core/lib/files.lib.php     | 10 ++++++++--
 htdocs/core/lib/functions.lib.php | 23 +++++++++++------------
 htdocs/theme/eldy/style.css.php   |  3 +++
 htdocs/theme/md/style.css.php     |  6 ++----
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index cbf4af402ae..18f1e30edc7 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1628,8 +1628,14 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-		if ($fuser->rights->ficheinter->lire) $accessallowed=1;
-		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+	    if ($fuser->rights->ficheinter->lire) $accessallowed=1;
+	    $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+	}
+	// Wrapping pour les apercu commande
+	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
+	{
+	    if ($fuser->rights->fournisseur->commande->lire) $accessallowed=1;
+	    $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->dir_temp))
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b6cf92aa81d..da0a33e7ef1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1065,11 +1065,11 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
 	$modulepart='unknown';
 
-	if ($object->element == 'societe')   $modulepart='societe';
-	if ($object->element == 'contact')   $modulepart='contact';
-	if ($object->element == 'member')    $modulepart='memberphoto';
-	if ($object->element == 'user')      $modulepart='userphoto';
-	if ($object->element == 'product')   $modulepart='product';
+	if ($object->element == 'societe')         $modulepart='societe';
+	if ($object->element == 'contact')         $modulepart='contact';
+	if ($object->element == 'member')          $modulepart='memberphoto';
+	if ($object->element == 'user')            $modulepart='userphoto';
+	if ($object->element == 'product')         $modulepart='product';
 	if (class_exists("Imagick"))
 	{
 		if ($object->element == 'propal')    $modulepart='propal';
@@ -1077,6 +1077,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 		if ($object->element == 'facture')   $modulepart='facture';
 		if ($object->element == 'fichinter') $modulepart='ficheinter';
 		if ($object->element == 'contrat')   $modulepart='contract';
+	    if ($object->element == 'order_supplier')  $modulepart='supplier_order';
 	}
 
 	if ($object->element == 'product')
@@ -1102,12 +1103,11 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	{
 		if ($showimage)
         {
-        	if ($modulepart != 'unknown')
+            if ($modulepart != 'unknown')
             {
                 $phototoshow='';
-                
                 // Check if a preview file is available
-                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract')) && class_exists("Imagick"))
+                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order')) && class_exists("Imagick"))
                 {
                     $objectref = dol_sanitizeFileName($object->ref);
                     $dir_output = $conf->$modulepart->dir_output . "/";
@@ -1137,7 +1137,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                         if (file_exists($fileimage))
                         {
                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
-                            $phototoshow.= '<img height="70" class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
+                            $phototoshow.= '<img height="70" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
                             $phototoshow.= '</div></div>';
                         }
                         // Si fichier png PDF de plus d'1 page trouve
@@ -1145,7 +1145,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                         {
                             $preview = preg_replace('/\.png/','',$relativepathimage) . "-0.png";
                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
-                            $phototoshow.= '<img height="70" class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';
+                            $phototoshow.= '<img height="70" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';
                             $phototoshow.= '</div></div>';
                         }
                     }
@@ -1171,7 +1171,6 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                     $width=80;
                     $cssclass='photorefcenter';
                     $nophoto=img_picto('', 'title_agenda', '', false, 1);
-                    $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').' src="'.$nophoto.'"></div></div>';
                 }
                 else
                 {
@@ -1179,8 +1178,8 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                     $picto = $object->picto;
                     if ($object->element == 'project' && ! $object->public) $picto = 'project'; // instead of projectpub
     				$nophoto=img_picto('', 'object_'.$picto, '', false, 1);
-    				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').' src="'.$nophoto.'"></div></div>';
                 }
+                $morehtmlleft.='<!-- No photo to show --><div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').' src="'.$nophoto.'"></div></div>';
                 $morehtmlleft.='</div>';
             }
         }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 41744ae0037..d0fae6d89a8 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3002,6 +3002,9 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
 	margin-bottom: 2px;
 	margin-top: 10px;
 }
+.photowithborder {
+	border: 1px solid #f0f0f0;
+}
 .photointooltip {
 	margin-top: 6px;
 	margin-bottom: 6px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 53e3ec0154c..48670ffb637 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3115,10 +3115,8 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
 	margin-bottom: 2px;
 	margin-top: 2px;
 }
-.photowithmargin {
-/*	-webkit-box-shadow: 0px 0px 3px #777;
-	-moz-box-shadow: 0px 0px 3px #777;
-	box-shadow: 0px 0px 3px #777;*/
+.photowithborder {
+	border: 1px solid #f0f0f0;
 }
 .photointoolitp {
 	margin-top: 8px;

From 768df56c07072c32daed2f9ae3cd918d01892968 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 20:16:55 +0200
Subject: [PATCH 0710/1163] Uniformize name of standard PDF template

---
 htdocs/admin/fichinter.php                    |  2 +-
 .../expedition/doc/pdf_rouget.modules.php     |  2 +-
 .../fichinter/doc/pdf_soleil.modules.php      |  2 +-
 htdocs/core/modules/modProduct.class.php      | 11 +++++++++--
 htdocs/core/modules/modService.class.php      |  2 +-
 .../product/doc/pdf_standard.modules.php      | 14 ++++----------
 .../fichinter/admin/fichinter_extrafields.php |  2 +-
 .../admin/fichinterdet_extrafields.php        |  2 +-
 htdocs/langs/en_US/main.lang                  |  1 +
 htdocs/langs/en_US/sendings.lang              |  1 -
 htdocs/product/admin/product.php              |  3 ---
 htdocs/product/class/product.class.php        | 19 ++++++++++++++++++-
 12 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 0b01f56857e..2b9dee321a6 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -265,7 +265,7 @@ print load_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setu
 
 $head=fichinter_admin_prepare_head();
 
-dol_fiche_head($head, 'ficheinter', $langs->trans("Interventions"), 0, 'intervention');
+dol_fiche_head($head, 'ficheinter', $langs->trans("Interventions"), -1, 'intervention');
 
 // Interventions numbering model
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index d1697b767bd..3f7a73a650c 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -49,7 +49,7 @@ class pdf_rouget extends ModelePdfExpedition
 
 		$this->db = $db;
 		$this->name = "rouget";
-		$this->description = $langs->trans("DocumentModelSimple");
+		$this->description = $langs->trans("DocumentModelStandardPDF");
 
 		$this->type = 'pdf';
 		$formatarray=pdf_getFormat();
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 83306b95adb..4d889f84902 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -65,7 +65,7 @@ class pdf_soleil extends ModelePDFFicheinter
 
 		$this->db = $db;
 		$this->name = 'soleil';
-		$this->description = $langs->trans("DocumentModelStandard");
+		$this->description = $langs->trans("DocumentModelStandardPDF");
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index b2349ab77a0..30e64b5de2c 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -53,7 +53,7 @@ class modProduct extends DolibarrModules
 		$this->module_position = 20;
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Gestion des produits";
+		$this->description = "Product management";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
@@ -83,7 +83,14 @@ class modProduct extends DolibarrModules
 		$this->const[$r][3] = 'Module to control product codes';
 		$this->const[$r][4] = 0;
 		$r++;
-
+		
+		/*$this->const[$r][0] = "PRODUCT_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "standard";
+		$this->const[$r][3] = 'Default module for document generation';
+		$this->const[$r][4] = 0;
+		$r++;*/
+		
 		// Boxes
 		$this->boxes = array(
 			0=>array('file'=>'box_produits.php','enabledbydefaulton'=>'Home'),
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 7a5db7fcffd..c385ece4b26 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -51,7 +51,7 @@ class modService extends DolibarrModules
 		$this->module_position = 30;
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Gestion des services";
+		$this->description = "Service management";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 5dca2b8378e..29df1127242 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -92,8 +92,8 @@ class pdf_standard extends ModelePDFProduct
 		$langs->load("companies");
 
 		$this->db = $db;
-		$this->name = "PDF template";
-		$this->description = $langs->trans("DocumentModelPdf");
+		$this->name = "standard";
+		$this->description = $langs->trans("DocumentModelStandardPDF");
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
@@ -107,15 +107,9 @@ class pdf_standard extends ModelePDFProduct
 		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
 		
 		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva PRODUCT_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
 		$this->option_codeproduitservice = 0;      // Affiche code produit-service
 		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 1;		   // Support add of a watermark on drafts
+		$this->option_freetext = 0;				   // Support add of a personalised text
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
@@ -262,7 +256,7 @@ class pdf_standard extends ModelePDFProduct
 				}
 				if ($object->weight)
 				{
-				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.$object->length.'x'.$object->width.'x'.$object->height, 0, 1);
+				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != ''?$object->length:'?').' x '.($object->width != ''?$object->width:'?').' x '.($object->height != ''?$object->height:'?'), 0, 1);
 				    $nexY = $pdf->GetY();
 				}
 				if ($object->surface)
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index b7b809d277d..bab7572e60a 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -71,7 +71,7 @@ print load_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setu
 
 $head=fichinter_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Interventions"), 0, 'intervention');
+dol_fiche_head($head, 'attributes', $langs->trans("Interventions"), -1, 'intervention');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php
index 776229a4c29..5fadc3f4c2c 100644
--- a/htdocs/fichinter/admin/fichinterdet_extrafields.php
+++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php
@@ -72,7 +72,7 @@ print load_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setu
 
 $head=fichinter_admin_prepare_head();
 
-dol_fiche_head($head, 'attributesdet', $langs->trans("Interventions"), 0, 'intervention');
+dol_fiche_head($head, 'attributesdet', $langs->trans("Interventions"), -1, 'intervention');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index c567890730a..bc7c864b279 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -647,6 +647,7 @@ FreeLineOfType=Free entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge
+DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index ac180cb5fe6..fcd28cc9f56 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -37,7 +37,6 @@ SendingSheet=Shipment sheet
 ConfirmDeleteSending=Are you sure you want to delete this shipment?
 ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
-DocumentModelSimple=Simple document model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
 StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 3582f8b25b6..5183eeb3382 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -512,10 +512,7 @@ foreach ($dirmodels as $reldir)
 			                    }
 					    		$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 					    		$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
-					    		$htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
-					    		$htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
 					    		$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
-					    		$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
 
 
 	                            print '<td align="center">';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index e25ad186369..76a609e0a44 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4367,14 +4367,31 @@ class Product extends CommonObject
         $this->id=0;
         $this->ref = 'PRODUCT_SPEC';
         $this->label = 'PRODUCT SPECIMEN';
-        $this->description = 'PRODUCT SPECIMEN '.dol_print_date($now,'dayhourlog');
+        $this->description = 'This is description of this product specimen that was created the '.dol_print_date($now,'dayhourlog').'.';
         $this->specimen=1;
         $this->country_id=1;
         $this->tosell=1;
         $this->tobuy=1;
 		$this->tobatch=0;
         $this->note='This is a comment (private)';
+        $this->date_creation = $now;
+        $this->date_modification = $now;
+        
+        $this->weight = 4;
+        $this->weight_unit = 1;
 
+        $this->length = 5;
+        $this->length_unit = 1;
+        $this->width = 6;
+        $this->width_unit = 0;
+        $this->height = null;
+        $this->height_unit = null;
+        
+        $this->surface = 30;
+        $this->surface_unit = 0;
+        $this->volume = 300;
+        $this->volume_unit = 0;
+        
         $this->barcode=-1;	// Create barcode automatically
     }
 

From 626c0d6d5e9308656777a9ff300dba88f0a3a054 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 20:40:13 +0200
Subject: [PATCH 0711/1163] Add more substitution keys for PDFs.

---
 htdocs/admin/expensereport.php             | 2 +-
 htdocs/admin/expensereport_extrafields.php | 2 +-
 htdocs/core/lib/pdf.lib.php                | 9 ++++++++-
 htdocs/langs/en_US/admin.lang              | 3 +++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index dad17585e2e..b8626827595 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -230,7 +230,7 @@ print load_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_set
 
 $head=expensereport_admin_prepare_head();
 
-dol_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), 0, 'trip');
+dol_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), -1, 'trip');
 
 // Interventions numbering model
 /*
diff --git a/htdocs/admin/expensereport_extrafields.php b/htdocs/admin/expensereport_extrafields.php
index 65e1592eff8..d1d3aacc9cc 100644
--- a/htdocs/admin/expensereport_extrafields.php
+++ b/htdocs/admin/expensereport_extrafields.php
@@ -74,7 +74,7 @@ print load_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_set
 
 $head = expensereport_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("ExpenseReports"), 0, 'trip');
+dol_fiche_head($head, 'attributes', $langs->trans("ExpenseReports"), -1, 'trip');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 2fc447daffd..e83faee6c8d 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -599,7 +599,14 @@ function pdf_getSubstitutionArray($outputlangs)
 	$substitutionarray=array(
 		'__MYCOMPANY_NAME__' => $mysoc->name,
 		'__MYCOMPANY_EMAIL__' => $mysoc->email,
-		'__USER_ID__' => $user->id,
+		'__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
+		'__MYCOMPANY_PROFID2__' => $mysoc->idprof2,
+		'__MYCOMPANY_PROFID3__' => $mysoc->idprof3,
+		'__MYCOMPANY_PROFID4__' => $mysoc->idprof4,
+		'__MYCOMPANY_PROFID5__' => $mysoc->idprof5,
+		'__MYCOMPANY_PROFID6__' => $mysoc->idprof6,
+		'__MYCOMPANY_CAPITAL__' => $mysoc->capital,
+	    '__USER_ID__' => $user->id,
 		'__USER_LOGIN__' => $user->login,
 		'__USER_LASTNAME__' => $user->lastname,
 		'__USER_FIRSTNAME__' => $user->firstname,
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 35037387c1f..1356a980164 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -434,6 +434,9 @@ PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
 WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior. 
 Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management

From ffe4e4830454cba55fb558c5168e238b5460d44b Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Thu, 4 May 2017 21:37:27 +0200
Subject: [PATCH 0712/1163] Update agenda_other.php

---
 htdocs/admin/agenda_other.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 17ccd64d000..e70339b47c8 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -264,7 +264,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			require_once $dir.'/'.$file;
             			$module = new $classname($db, new ActionComm($db));           			
             			
-            			print '<tr class="oddeven">\n';
+            			print '<tr class="oddeven">'."\n";
             			print "<td>";
             			print (empty($module->name)?$name:$module->name);
             			print "</td>\n";

From f069ef98445e651a37487ae900730a5b2b550c20 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 May 2017 20:40:13 +0200
Subject: [PATCH 0713/1163] FIX #6767

---
 htdocs/admin/expensereport.php                 | 2 +-
 htdocs/admin/expensereport_extrafields.php     | 2 +-
 htdocs/core/lib/pdf.lib.php                    | 9 ++++++++-
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 3 +++
 htdocs/langs/en_US/admin.lang                  | 3 +++
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index dad17585e2e..b8626827595 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -230,7 +230,7 @@ print load_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_set
 
 $head=expensereport_admin_prepare_head();
 
-dol_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), 0, 'trip');
+dol_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), -1, 'trip');
 
 // Interventions numbering model
 /*
diff --git a/htdocs/admin/expensereport_extrafields.php b/htdocs/admin/expensereport_extrafields.php
index 65e1592eff8..d1d3aacc9cc 100644
--- a/htdocs/admin/expensereport_extrafields.php
+++ b/htdocs/admin/expensereport_extrafields.php
@@ -74,7 +74,7 @@ print load_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_set
 
 $head = expensereport_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("ExpenseReports"), 0, 'trip');
+dol_fiche_head($head, 'attributes', $langs->trans("ExpenseReports"), -1, 'trip');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 2fc447daffd..e83faee6c8d 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -599,7 +599,14 @@ function pdf_getSubstitutionArray($outputlangs)
 	$substitutionarray=array(
 		'__MYCOMPANY_NAME__' => $mysoc->name,
 		'__MYCOMPANY_EMAIL__' => $mysoc->email,
-		'__USER_ID__' => $user->id,
+		'__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
+		'__MYCOMPANY_PROFID2__' => $mysoc->idprof2,
+		'__MYCOMPANY_PROFID3__' => $mysoc->idprof3,
+		'__MYCOMPANY_PROFID4__' => $mysoc->idprof4,
+		'__MYCOMPANY_PROFID5__' => $mysoc->idprof5,
+		'__MYCOMPANY_PROFID6__' => $mysoc->idprof6,
+		'__MYCOMPANY_CAPITAL__' => $mysoc->capital,
+	    '__USER_ID__' => $user->id,
 		'__USER_LOGIN__' => $user->login,
 		'__USER_LASTNAME__' => $user->lastname,
 		'__USER_FIRSTNAME__' => $user->firstname,
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 1982ef6aff8..a6666d37ee0 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -248,3 +248,6 @@ insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active)
 insert into llx_c_tva(fk_pays,taux,code,recuperableonly,note,active)                                                   values (1, '8.5', '85NPR', '1','VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0);
 insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,note,active)                          values (1, '8.5', '85NPROM', '1', 2, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer',0);
 insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (1, '8.5', '85NPROMOMR', '1', 2, 3, 2.5, 3, 'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer et Octroi de Mer Regional',0);
+
+ALTER TABLE llx_events MODIFY COLUMN ip varchar(250);
+
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 35037387c1f..1356a980164 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -434,6 +434,9 @@ PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
 WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior. 
 Field=Field
+ProductDocumentTemplates=Document templates to generate product document
+FreeLegalTextOnExpenseReports=Free legal text on expense reports
+WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management

From ef0d395a1a536fb75f8acdcfdbf8c04ce54086a4 Mon Sep 17 00:00:00 2001
From: "Guillaume T. (Arck Consulting)" <guillaume@arckconsulting.fr>
Date: Thu, 4 May 2017 09:32:06 +0200
Subject: [PATCH 0714/1163] [FIX] Credit Note for fourn doesn't work, missing
 filed in create method & attribut

---
 htdocs/fourn/class/fournisseur.facture.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 42daafe9c2d..1798eb19059 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -128,7 +128,9 @@ class FactureFournisseur extends CommonInvoice
     public $multicurrency_total_ht;
     public $multicurrency_total_tva;
     public $multicurrency_total_ttc;
-
+    //! id of source invoice if replacement invoice or credit note
+    public $fk_facture_source;
+    
     /**
      * Standard invoice
      */
@@ -263,6 +265,7 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ", fk_multicurrency";
         $sql.= ", multicurrency_code";
         $sql.= ", multicurrency_tx";
+        $sql.= ", fk_facture_source";
         $sql.= ")";
         $sql.= " VALUES (";
 		$sql.= "'(PROV)'";
@@ -286,6 +289,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql.= ", ".(int) $this->fk_multicurrency;
 		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql.= ", ".(double) $this->multicurrency_tx;
+        $sql.= ", ".(isset($this->fk_facture_source)?$this->fk_facture_source:"NULL");
         $sql.= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);

From 68b63927e0cdfafd6df75cd92008de89c88eb9c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 12:33:49 +0200
Subject: [PATCH 0715/1163] Maxi miscellaneous debug

---
 htdocs/admin/supplier_invoice.php             |   2 +-
 htdocs/admin/supplier_order.php               |   2 +-
 htdocs/admin/supplier_payment.php             |  24 +-
 htdocs/admin/supplierinvoice_extrafields.php  |   2 +-
 .../admin/supplierinvoicedet_extrafields.php  |   2 +-
 htdocs/admin/supplierorder_extrafields.php    |   2 +-
 htdocs/admin/supplierorderdet_extrafields.php |   2 +-
 htdocs/categories/index.php                   |   8 +-
 htdocs/compta/paiement/cheque/card.php        | 225 +++++++++---------
 htdocs/compta/paiement/cheque/index.php       |  14 +-
 htdocs/core/lib/files.lib.php                 |  14 +-
 htdocs/core/lib/functions.lib.php             |  26 +-
 .../supplier_payment/{pdf => doc}/index.html  |   0
 .../pdf_standard.modules.php}                 |  10 +-
 htdocs/fourn/facture/card.php                 |  55 +----
 htdocs/fourn/facture/contact.php              |   2 +-
 htdocs/fourn/facture/document.php             |   4 +-
 htdocs/fourn/facture/info.php                 |   2 +-
 htdocs/fourn/facture/note.php                 |   9 +-
 htdocs/langs/en_US/admin.lang                 |   1 +
 htdocs/supplier_proposal/card.php             |  11 +-
 .../class/supplier_proposal.class.php         |   6 +-
 22 files changed, 203 insertions(+), 220 deletions(-)
 rename htdocs/core/modules/supplier_payment/{pdf => doc}/index.html (100%)
 rename htdocs/core/modules/supplier_payment/{pdf/pdf_cow.modules.php => doc/pdf_standard.modules.php} (98%)

diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index dd8210611e9..de128184d18 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -205,7 +205,7 @@ print "<br>";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'invoice', $langs->trans("Suppliers"), 0, 'company');
+dol_fiche_head($head, 'invoice', $langs->trans("Suppliers"), -1, 'company');
 
 
 // Supplier invoice numbering module
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index a170f7ccd37..030a507ce20 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -234,7 +234,7 @@ print "<br>";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'order', $langs->trans("Suppliers"), 0, 'company');
+dol_fiche_head($head, 'order', $langs->trans("Suppliers"), -1, 'company');
 
 
 // Supplier order numbering module
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 0f6cbff6179..adaa114b1ca 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -65,7 +65,7 @@ if ($action == 'updateMask')
     }
 }else  if ($action == 'setmod')
 {
-    dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON",$value,'chaine',0,'',$conf->entity);
+    dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
 }
 
 // define constants for models generator that need parameters
@@ -138,7 +138,7 @@ else if ($action == 'specimen')
 	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 	foreach($dirmodels as $reldir)
 	{
-	    $file=dol_buildpath($reldir."core/modules/supplier_payment/pdf/pdf_".$modele.".modules.php",0);
+	    $file=dol_buildpath($reldir."core/modules/supplier_payment/doc/pdf_".$modele.".modules.php",0);
     	if (file_exists($file))
     	{
     		$filefound=1;
@@ -188,7 +188,7 @@ print load_fiche_titre($langs->trans("SupplierPaymentSetup"),$linkback,'title_se
 print "<br>";
 
 $head = supplierorder_admin_prepare_head();
-dol_fiche_head($head, 'supplierpayment', $langs->trans("Suppliers"), 0, 'company');
+dol_fiche_head($head, 'supplierpayment', $langs->trans("Suppliers"), -1, 'company');
 
 /*
  *  Numbering module
@@ -198,12 +198,6 @@ if (empty($conf->global->SUPPLIER_PAYMENT_ADDON)) $conf->global->SUPPLIER_PAYMEN
     
 print load_fiche_titre($langs->trans("PaymentsNumberingModule"), '', '');
 
-/*
- *  Document templates generators
- */
-print '<br>';
-print load_fiche_titre($langs->trans("BillsPDFModules"),'','');
-
 // Load array def with activated templates
 $def = array();
 $sql = "SELECT nom";
@@ -349,6 +343,12 @@ foreach ($dirmodels as $reldir)
 print '</table>';
 
 
+/*
+ *  Document templates generators
+ */
+print '<br>';
+print load_fiche_titre($langs->trans("PaymentsPDFModules"),'','');
+
 print '<table class="noborder" width="100%">'."\n";
 print '<tr class="liste_titre">'."\n";
 print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
@@ -363,7 +363,7 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-	$dir = dol_buildpath($reldir."core/modules/supplier_payment/pdf/");
+	$dir = dol_buildpath($reldir."core/modules/supplier_payment/doc/");
 
     if (is_dir($dir))
     {
@@ -440,8 +440,6 @@ foreach ($dirmodels as $reldir)
                     $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
                     $htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
                     $htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
-                    $htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
-                    $htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
                     print '<td align="center">';
                     print $form->textwithpicto('',$htmltooltip,1,0);
                     print '</td>';
@@ -458,7 +456,7 @@ foreach ($dirmodels as $reldir)
     }
 }
 
-print '</table><br>';
+print '</table>';
 
 dol_fiche_end();
 
diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php
index 701362e38f4..4e0bd1d0dd2 100644
--- a/htdocs/admin/supplierinvoice_extrafields.php
+++ b/htdocs/admin/supplierinvoice_extrafields.php
@@ -79,7 +79,7 @@ print "<br>\n";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'supplierinvoice', $langs->trans("Suppliers"), 0, 'company');
+dol_fiche_head($head, 'supplierinvoice', $langs->trans("Suppliers"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php
index e741eb6cd75..26b3b42e970 100644
--- a/htdocs/admin/supplierinvoicedet_extrafields.php
+++ b/htdocs/admin/supplierinvoicedet_extrafields.php
@@ -79,7 +79,7 @@ print "<br>\n";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'supplierinvoicedet', $langs->trans("Suppliers"), 0, 'company');
+dol_fiche_head($head, 'supplierinvoicedet', $langs->trans("Suppliers"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php
index 00550995d19..bcad8121afc 100644
--- a/htdocs/admin/supplierorder_extrafields.php
+++ b/htdocs/admin/supplierorder_extrafields.php
@@ -75,7 +75,7 @@ print "<br>\n";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'supplierorder', $langs->trans("Suppliers"), 0, 'company');
+dol_fiche_head($head, 'supplierorder', $langs->trans("Suppliers"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php
index f83ad1348fc..97d505144bb 100644
--- a/htdocs/admin/supplierorderdet_extrafields.php
+++ b/htdocs/admin/supplierorderdet_extrafields.php
@@ -76,7 +76,7 @@ print "<br>\n";
 
 $head = supplierorder_admin_prepare_head();
 
-dol_fiche_head($head, 'supplierorderdet', $langs->trans("Suppliers"), 0, 'company');
+dol_fiche_head($head, 'supplierorderdet', $langs->trans("Suppliers"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index d44407324c0..ca2b7b5c76f 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -125,7 +125,7 @@ if ($catname || $id > 0)
 		print '</span>';
 		print "</td>\n";
 		print "\t\t<td>";
-		print $cat->description;
+		print dolGetFirstLineOfText($cat->description);
 		print "</td>\n";
 		print "\t</tr>\n";
 	}
@@ -162,7 +162,7 @@ foreach($fulltree as $key => $val)
 	'rowid'=>$val['rowid'],
 	'fk_menu'=>$val['fk_parent'],
 	'entry'=>'<table class="nobordernopadding centpercent"><tr><td><span class="noborderoncategories" '.($categstatic->color?' style="background: #'.$categstatic->color.';"':' style="background: #aaa"').'>'.$li.'</span></td>'.
-	'<td width="50%">'.dolGetFirstLineOfText($desc).'</td>'.
+	//'<td width="50%">'.dolGetFirstLineOfText($desc).'</td>'.
 	'<td align="right" width="20px;"><a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.'">'.img_view().'</a></td>'.
 	'</tr></table>'
 	);
@@ -181,13 +181,13 @@ $nbofentries=(count($data) - 1);
 
 if ($nbofentries > 0)
 {
-	print '<tr '.$bc[0].'><td colspan="3">';
+	print '<tr class="pair"><td colspan="3">';
 	tree_recur($data,$data[0],0);
 	print '</td></tr>';
 }
 else
 {
-	print '<tr '.$bc[0].'>';
+	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
 	print $langs->trans("NoCategoryYet");
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 625b2be518e..eed3a79335c 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -334,7 +334,7 @@ else
 	//  $head[$h][1] = $langs->trans("Info");
 	//  $h++;
 
-	dol_fiche_head($head, $hselected, $langs->trans("Cheques"),0,'payment');
+	dol_fiche_head($head, $hselected, $langs->trans("Cheques"), -1, 'payment');
 
 	/*
 	 * Confirmation de la suppression du bordereau
@@ -476,8 +476,7 @@ if ($action == 'new')
         print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 		
 		print '<tr class="liste_titre">';
-		print '<td style="min-width: 120px">'.$langs->trans("DateChequeReceived").' ';
-		print "</td>\n";
+		print '<td style="min-width: 120px">'.$langs->trans("DateChequeReceived").'</td>'."\n";
 		print '<td style="min-width: 120px">'.$langs->trans("ChequeNumber")."</td>\n";
 		print '<td style="min-width: 200px">'.$langs->trans("CheckTransmitter")."</td>\n";
 		print '<td style="min-width: 200px">'.$langs->trans("Bank")."</td>\n";
@@ -487,59 +486,57 @@ if ($action == 'new')
 		print '<td align="center" width="100px">'.$langs->trans("Select")."<br>";
 		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall_'.$bid.'">'.$langs->trans("All").'</a> / <a href="#" id="checknone_'.$bid.'">'.$langs->trans("None").'</a>';
 		print '</td>';
-
 		print "</tr>\n";
 
-		$var=true;
-
-		foreach ($lines[$bid] as $lid => $value)
+		if (count($lines[$bid]))
 		{
-			
+    		foreach ($lines[$bid] as $lid => $value)
+    		{
+    			$account_id = $bid;
+    			if (! isset($accounts[$bid]))
+    				$accounts[$bid]=0;
+    			$accounts[$bid] += 1;
 
-			$account_id = $bid;
-			if (! isset($accounts[$bid]))
-				$accounts[$bid]=0;
-			$accounts[$bid] += 1;
+    			print '<tr class="oddeven">';
+    			print '<td>'.dol_print_date($value["date"],'day').'</td>';
+    			print '<td>'.$value["numero"]."</td>\n";
+    			print '<td>'.$value["emetteur"]."</td>\n";
+    			print '<td>'.$value["banque"]."</td>\n";
+    			print '<td align="right">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</td>';
 
-			print '<tr class="oddeven">';
-			print '<td>'.dol_print_date($value["date"],'day').'</td>';
-			print '<td>'.$value["numero"]."</td>\n";
-			print '<td>'.$value["emetteur"]."</td>\n";
-			print '<td>'.$value["banque"]."</td>\n";
-			print '<td align="right">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</td>';
-
-			// Link to payment
-			print '<td align="center">';
-			$paymentstatic->id=$value["paymentid"];
-			$paymentstatic->ref=$value["paymentid"];
-			if ($paymentstatic->id)
-			{
-				print $paymentstatic->getNomUrl(1);
-			}
-			else
-			{
-				print '&nbsp;';
-			}
-			print '</td>';
-			// Link to bank transaction
-			print '<td align="center">';
-			$accountlinestatic->rowid=$value["id"];
-			if ($accountlinestatic->rowid)
-			{
-				print $accountlinestatic->getNomUrl(1);
-			}
-			else
-			{
-				print '&nbsp;';
-			}
-			print '</td>';
-
-			print '<td align="center">';
-			print '<input id="'.$value["id"].'" class="flat checkforremise_'.$bid.'" checked type="checkbox" name="toRemise[]" value="'.$value["id"].'">';
-			print '</td>' ;
-			print '</tr>';
-
-			$i++;
+    			// Link to payment
+    			print '<td align="center">';
+    			$paymentstatic->id=$value["paymentid"];
+    			$paymentstatic->ref=$value["paymentid"];
+    			if ($paymentstatic->id)
+    			{
+    				print $paymentstatic->getNomUrl(1);
+    			}
+    			else
+    			{
+    				print '&nbsp;';
+    			}
+    			print '</td>';
+    			// Link to bank transaction
+    			print '<td align="center">';
+    			$accountlinestatic->rowid=$value["id"];
+    			if ($accountlinestatic->rowid)
+    			{
+    				print $accountlinestatic->getNomUrl(1);
+    			}
+    			else
+    			{
+    				print '&nbsp;';
+    			}
+    			print '</td>';
+    
+    			print '<td align="center">';
+    			print '<input id="'.$value["id"].'" class="flat checkforremise_'.$bid.'" checked type="checkbox" name="toRemise[]" value="'.$value["id"].'">';
+    			print '</td>' ;
+    			print '</tr>';
+    
+    			$i++;
+    		}
 		}
 		print "</table>";
         print '</div>';
@@ -686,65 +683,75 @@ else
 		print_liste_field_titre('');
 		print "</tr>\n";
 		$i=1;
-		$var=false;
-		while ($objp = $db->fetch_object($resql))
-		{
-			$account_id = $objp->bid;
-			if (! isset($accounts[$objp->bid]))
-				$accounts[$objp->bid]=0;
-			$accounts[$objp->bid] += 1;
 
-			print '<tr class="oddeven">';
-			print '<td align="center">'.$i.'</td>';
-			print '<td align="center">'.dol_print_date($db->jdate($objp->date),'day').'</td>';	// Date operation
-			print '<td align="center">'.($objp->num_chq?$objp->num_chq:'&nbsp;').'</td>';
-			print '<td>'.dol_trunc($objp->emetteur,24).'</td>';
-			print '<td>'.dol_trunc($objp->banque,24).'</td>';
-			print '<td align="right">'.price($objp->amount).'</td>';
-			// Link to payment
-			print '<td align="center">';
-			$paymentstatic->id=$objp->pid;
-			$paymentstatic->ref=$objp->pid;
-			if ($paymentstatic->id)
-			{
-				print $paymentstatic->getNomUrl(1);
-			}
-			else
-			{
-				print '&nbsp;';
-			}
-			print '</td>';
-			// Link to bank transaction
-			print '<td align="center">';
-			$accountlinestatic->rowid=$objp->rowid;
-			if ($accountlinestatic->rowid)
-			{
-				print $accountlinestatic->getNomUrl(1);
-			}
-			else
-			{
-				print '&nbsp;';
-			}
-			print '</td>';
-			// Action button
-			print '<td align="right">';
-			if ($object->statut == 0)
-			{
-				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a>';
-			}
-   			if ($object->statut == 1 && $objp->statut != 2)
-   			{
-   				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reject_check&amp;lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"),'disable').'</a>';
-   			}
-			if ($objp->statut == 2) 
-			{
-				print ' &nbsp; '.img_picto($langs->trans('CheckRejected'),'statut8').'</a>';
-			}
-		    print '</td>';
-			print '</tr>';
-			
-			$i++;
-		}
+        if ($num > 0)
+        {
+    		while ($objp = $db->fetch_object($resql))
+    		{
+    			$account_id = $objp->bid;
+    			if (! isset($accounts[$objp->bid]))
+    				$accounts[$objp->bid]=0;
+    			$accounts[$objp->bid] += 1;
+    
+    			print '<tr class="oddeven">';
+    			print '<td align="center">'.$i.'</td>';
+    			print '<td align="center">'.dol_print_date($db->jdate($objp->date),'day').'</td>';	// Date operation
+    			print '<td align="center">'.($objp->num_chq?$objp->num_chq:'&nbsp;').'</td>';
+    			print '<td>'.dol_trunc($objp->emetteur,24).'</td>';
+    			print '<td>'.dol_trunc($objp->banque,24).'</td>';
+    			print '<td align="right">'.price($objp->amount).'</td>';
+    			// Link to payment
+    			print '<td align="center">';
+    			$paymentstatic->id=$objp->pid;
+    			$paymentstatic->ref=$objp->pid;
+    			if ($paymentstatic->id)
+    			{
+    				print $paymentstatic->getNomUrl(1);
+    			}
+    			else
+    			{
+    				print '&nbsp;';
+    			}
+    			print '</td>';
+    			// Link to bank transaction
+    			print '<td align="center">';
+    			$accountlinestatic->rowid=$objp->rowid;
+    			if ($accountlinestatic->rowid)
+    			{
+    				print $accountlinestatic->getNomUrl(1);
+    			}
+    			else
+    			{
+    				print '&nbsp;';
+    			}
+    			print '</td>';
+    			// Action button
+    			print '<td align="right">';
+    			if ($object->statut == 0)
+    			{
+    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a>';
+    			}
+       			if ($object->statut == 1 && $objp->statut != 2)
+       			{
+       				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reject_check&amp;lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"),'disable').'</a>';
+       			}
+    			if ($objp->statut == 2) 
+    			{
+    				print ' &nbsp; '.img_picto($langs->trans('CheckRejected'),'statut8').'</a>';
+    			}
+    		    print '</td>';
+    			print '</tr>';
+    			
+    			$i++;
+    		}
+        }
+        else
+        {
+            print '<td colspan="8" class="opacitymedium">';
+            print $langs->trans("None");
+            print '</td>';
+        }
+                
 		print "</table>";
 		print "</div>";
 	}
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 2d77cb71061..97dc3c1674f 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -50,8 +50,6 @@ llxHeader('',$langs->trans("ChequesArea"));
 
 print load_fiche_titre($langs->trans("ChequesArea"));
 
-//print '<table border="0" width="100%" class="notopnoleftnoright">';
-//print '<tr><td valign="top" width="30%" class="notopnoleft">';
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 $sql = "SELECT count(b.rowid)";
@@ -90,7 +88,6 @@ else
 }
 
 
-//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 $max=10;
@@ -98,15 +95,13 @@ $max=10;
 $sql = "SELECT bc.rowid, bc.date_bordereau as db, bc.amount, bc.ref as ref";
 $sql.= ", bc.statut, bc.nbcheque";
 $sql.= ", ba.label, ba.rowid as bid";
-$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc";
-$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
+$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc, ".MAIN_DB_PREFIX."bank_account as ba";
 $sql.= " WHERE ba.rowid = bc.fk_bank_account";
 $sql.= " AND bc.entity = ".$conf->entity;
 $sql.= " ORDER BY bc.date_bordereau DESC, rowid DESC";
 $sql.= $db->plimit($max);
 
 $resql = $db->query($sql);
-
 if ($resql)
 {
 	print '<table class="noborder" width="100%">';
@@ -128,9 +123,8 @@ if ($resql)
 
 		$accountstatic->id=$objp->bid;
 		$accountstatic->label=$objp->label;
-
 		
-		print "<tr ".$bc[$var].">\n";
+		print '<tr class="oddeven">'."\n";
 
 		print '<td>'.$checkdepositstatic->getNomUrl(1).'</td>';
 		print '<td>'.dol_print_date($db->jdate($objp->db),'day').'</td>';
@@ -142,15 +136,15 @@ if ($resql)
 		print '</tr>';
 	}
 	print "</table>";
+
 	$db->free($resql);
 }
 else
 {
-  dol_print_error($db);
+    dol_print_error($db);
 }
 
 
-//print "</td></tr></table>\n";
 print '</div></div></div>';
 
 llxFooter();
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 18f1e30edc7..8a85212a0ff 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1631,12 +1631,24 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	    if ($fuser->rights->ficheinter->lire) $accessallowed=1;
 	    $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
 	}
-	// Wrapping pour les apercu commande
+	// Wrapping pour les apercu supplier proposal
+	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
+	{
+	    if ($fuser->rights->supplier_proposal->lire) $accessallowed=1;
+	    $original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
+	}
+	// Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
 	    if ($fuser->rights->fournisseur->commande->lire) $accessallowed=1;
 	    $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
+	// Wrapping pour les apercu supplier invoice
+	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
+	{
+	    if ($fuser->rights->fournisseur->facture->lire) $accessallowed=1;
+	    $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
+	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->dir_temp))
 	{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index da0a33e7ef1..275bbae8c36 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1070,6 +1070,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	if ($object->element == 'member')          $modulepart='memberphoto';
 	if ($object->element == 'user')            $modulepart='userphoto';
 	if ($object->element == 'product')         $modulepart='product';
+
 	if (class_exists("Imagick"))
 	{
 		if ($object->element == 'propal')    $modulepart='propal';
@@ -1077,7 +1078,9 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 		if ($object->element == 'facture')   $modulepart='facture';
 		if ($object->element == 'fichinter') $modulepart='ficheinter';
 		if ($object->element == 'contrat')   $modulepart='contract';
-	    if ($object->element == 'order_supplier')  $modulepart='supplier_order';
+	    if ($object->element == 'supplier_proposal') $modulepart='supplier_proposal';
+		if ($object->element == 'order_supplier')    $modulepart='supplier_order';
+	    if ($object->element == 'invoice_supplier')  $modulepart='supplier_invoice';
 	}
 
 	if ($object->element == 'product')
@@ -1107,14 +1110,22 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
             {
                 $phototoshow='';
                 // Check if a preview file is available
-                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order')) && class_exists("Imagick"))
+                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice')) && class_exists("Imagick"))
                 {
                     $objectref = dol_sanitizeFileName($object->ref);
                     $dir_output = $conf->$modulepart->dir_output . "/";
-                    $filepath = $dir_output . $objectref . "/";
+                    if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice')))
+                    {
+                        $subdir = get_exdir($object->id, 2, 0, 0, $object, $modulepart).$objectref;
+                    }
+                    else
+                    {
+                        $subdir = get_exdir($object->id, 0, 0, 0, $object, $modulepart).$objectref;
+                    }
+                    $filepath = $dir_output . $subdir . "/";
                     $file = $filepath . $objectref . ".pdf";
-                    $relativepath = $objectref.'/'.$objectref.'.pdf';
-                    
+                    $relativepath = $subdir.'/'.$objectref.'.pdf';
+
                     // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")
                     $fileimage = $file.'_preview.png';              // If PDF has 1 page
                     $fileimagebis = $file.'_preview-0.png';         // If PDF has more than one page
@@ -4465,7 +4476,8 @@ function yn($yesno, $case=1, $color=0)
 
 /**
  *	Return a path to have a directory according to object.
- *  New usage:       $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'modulepart')
+ *  New usage:       $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'modulepart')
+ *         or:       $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'modulepart')     if multidir_output not defined.
  *  Old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/"
  *
  *	@param	string	$num            Id of object (deprecated, $object will be used in future)
@@ -4486,7 +4498,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
 	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';
 	if (! empty($level) && in_array($modulepart, $arrayforoldpath))
 	{
-		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided
+		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.
 		if (empty($alpha)) $num = preg_replace('/([^0-9])/i','',$num);
 		else $num = preg_replace('/^.*\-/i','',$num);
 		$num = substr("000".$num, -$level);
diff --git a/htdocs/core/modules/supplier_payment/pdf/index.html b/htdocs/core/modules/supplier_payment/doc/index.html
similarity index 100%
rename from htdocs/core/modules/supplier_payment/pdf/index.html
rename to htdocs/core/modules/supplier_payment/doc/index.html
diff --git a/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
similarity index 98%
rename from htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
rename to htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index edb37ddcdde..2b645e4a263 100644
--- a/htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functionsnumtoword.lib.php';
 /**
  *	Class to generate the supplier invoices with the canelle model
  */
-class pdf_cow extends ModelePDFSuppliersPayments
+class pdf_standard extends ModelePDFSuppliersPayments
 {
     var $db;
     var $name;
@@ -70,8 +70,8 @@ class pdf_cow extends ModelePDFSuppliersPayments
 		$langs->load("bills");
 
 		$this->db = $db;
-		$this->name = "cow";
-		$this->description = $langs->trans('SuppliersPaymentModel');
+		$this->name = "standard";
+		$this->description = $langs->trans('DocumentModelStandardPDF');
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
@@ -85,10 +85,6 @@ class pdf_cow extends ModelePDFSuppliersPayments
 		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
 
 		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1;                 // Affiche mode reglement
-		$this->option_condreg = 1;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
 		$this->option_multilang = 1;               // Dispo en plusieurs langues
 
 		$this->franchise=!$mysoc->tva_assuj;
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 04af9470e6d..f930ad87979 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -70,7 +70,7 @@ $projectid	= GETPOST('projectid','int');
 $origin		= GETPOST('origin', 'alpha');
 $originid	= GETPOST('originid', 'int');
 
-//PDF
+// PDF
 $hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
 $hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
 $hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
@@ -1194,32 +1194,11 @@ if (empty($reshook))
 	$trackid='sin'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-
-	// Build document
-	if ($action == 'builddoc')
-	{
-		// Save modele used
-	    $object->fetch($id);
-	    $object->fetch_thirdparty();
-
-		// Save last template used to generate document
-		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-	    $outputlangs = $langs;
-	    $newlang=GETPOST('lang_id','alpha');
-	    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
-	    if (! empty($newlang))
-	    {
-	        $outputlangs = new Translate("",$conf);
-	        $outputlangs->setDefaultLang($newlang);
-	    }
-		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	    if ($result	< 0)
-	    {
-			setEventMessages($object->error, $object->errors, 'errors');
-    	    $action='';
-	    }
-	}
+	// Actions to build doc
+	$upload_dir = $conf->fournisseur->facture->dir_output;
+	$permissioncreate = $user->rights->fournisseur->facture->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+	
 	// Make calculation according to calculationrule
 	if ($action == 'calculate')
 	{
@@ -1234,22 +1213,6 @@ if (empty($reshook))
 	        exit;
 	    }
 	}
-	// Delete file in doc form
-	if ($action == 'remove_file')
-	{
-	    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	    if ($object->fetch($id))
-	    {
-	    	$object->fetch_thirdparty();
-	        $upload_dir =	$conf->fournisseur->facture->dir_output . "/";
-	        $file =	$upload_dir	. '/' .	GETPOST('file');
-	        $ret=dol_delete_file($file,0,0,0,$object);
-	        if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-	        else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-	    }
-	}
-
 	if ($action == 'update_extras')
 	{
 		// Fill array 'array_options' with data from add form
@@ -1924,7 +1887,7 @@ else
         $head = facturefourn_prepare_head($object);
         $titre=$langs->trans('SupplierInvoice');
 
-        dol_fiche_head($head, 'card', $titre, 0, 'bill');
+        dol_fiche_head($head, 'card', $titre, -1, 'bill');
 
         // Clone confirmation
         if ($action == 'clone')
@@ -2792,8 +2755,8 @@ else
 	                 * Documents generes
 	                 */
 	                $ref=dol_sanitizeFileName($object->ref);
-	                $subdir = get_exdir($object->id,2,0,0,$object,'invoice_supplier').$ref;
-	                $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').$ref;
+	                $subdir = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$ref;
+	                $filedir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
 	                $urlsource=$_SERVER['PHP_SELF'].'?id='.$object->id;
 	                $genallowed=$user->rights->fournisseur->facture->creer;
 	                $delallowed=$user->rights->fournisseur->facture->supprimer;
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index cafc6c1a496..0f56c5f7bae 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -138,7 +138,7 @@ if ($id > 0 || ! empty($ref))
 		
 		$head = facturefourn_prepare_head($object);
 
-		dol_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), 0, 'bill');
+		dol_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'bill');
 
 		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 2563a176346..ab56a66d8a7 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -89,7 +89,7 @@ llxHeader('', $title, $helpurl);
 if ($object->id > 0)
 {
 	$head = facturefourn_prepare_head($object);
-	dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), 0, 'bill');
+	dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), -1, 'bill');
     
 	$totalpaye = $object->getSommePaiement();
 
@@ -230,6 +230,8 @@ if ($object->id > 0)
 
 	print '</table><br>';
 
+	print '<div class="underbanner clearboth"></div>';
+	
 	print '<table class="border" width="100%">';
 
 	// Nb of files
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index af98c4f9b66..f5ab9164042 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -59,7 +59,7 @@ $alreadypaid=$object->getSommePaiement();
 
 $head = facturefourn_prepare_head($object);
 $titre=$langs->trans('SupplierInvoice');
-dol_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), 0, 'bill');
+dol_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'bill');
 
 $linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index cd009e394f6..9df425040e1 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -79,11 +79,9 @@ if ($object->id > 0)
 	
 	$head = facturefourn_prepare_head($object);
 	$titre=$langs->trans('SupplierInvoice');
-	dol_fiche_head($head, 'note', $titre, 0, 'bill');
+	dol_fiche_head($head, 'note', $titre, -1, 'bill');
 
 
-	print '<table class="border" width="100%">';
-
 	// Supplier invoice card
     $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
@@ -135,7 +133,9 @@ if ($object->id > 0)
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
 
-	// Type
+	print '<table class="border" width="100%">';
+
+    // Type
 	print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
 	print $object->getLibType();
 	if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
@@ -203,6 +203,7 @@ if ($object->id > 0)
 
 	print '<br>';
 
+    print '<div class="underbanner clearboth"></div>';
 	$cssclass="titlefield";
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1356a980164..7f0596d33cd 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1154,6 +1154,7 @@ WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at follow
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 0bac6dab14f..7e63dad93e9 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
@@ -462,13 +462,9 @@ if (empty($reshook))
 		}
 	}
 
+	// Action for direct print
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-
-	/*
-	 * Send mail
-	 */
-
 	// Actions to send emails
 	$actiontypecode='AC_ASKPRICE';
 	$trigger_name='SUPPLIER_PROPOSAL_SENTBYMAIL';
@@ -1530,6 +1526,7 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
+	/* Not for supplier proposals
 	if ($soc->outstanding_limit)
 	{
 		// Outstanding Bill
@@ -1540,7 +1537,7 @@ if ($action == 'create')
 		print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);
 		print '</td>';
 		print '</tr>';
-	}
+	}*/
 
 	if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && ! empty($conf->banque->enabled))
 	{
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 65efb97f824..58ff9dd3ded 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2855,7 +2855,7 @@ class SupplierProposalLine  extends CommonObjectLine
 		$sql.= ", ".$this->multicurrency_total_ht;
 		$sql.= ", ".$this->multicurrency_total_tva;
 		$sql.= ", ".$this->multicurrency_total_ttc;
-		$sql.= ", ".$this->fk_unit;
+        $sql.= ", fk_unit=".($this->fk_unit?$this->fk_unit:'null');
 		$sql.= ')';
 
         dol_syslog(get_class($this).'::insert', LOG_DEBUG);
@@ -3025,13 +3025,13 @@ class SupplierProposalLine  extends CommonObjectLine
         $sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
         if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
         $sql.= " , ref_fourn=".(! empty($this->ref_fourn)?"'".$this->db->escape($this->ref_fourn)."'":"null");
-		
+        $sql.= " , fk_unit=".($this->fk_unit?$this->fk_unit:'null');
+        
 		// Multicurrency
 		$sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
         $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
         $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
         $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
-        $sql.= " , fk_unit=".$this->fk_unit;
 		
 		$sql.= " WHERE rowid = ".$this->rowid;
 

From de356a318586d8927caabd9d28b336d4a7967536 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 12:41:31 +0200
Subject: [PATCH 0716/1163] =?UTF-8?q?Revert=20"FIX=20:=20close=20supplier?=
 =?UTF-8?q?=20makes=20no=20sense.=20we=20just=20need=20to=20know=20if=20it?=
 =?UTF-8?q?=20is=20ac=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/supplier_proposal/card.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 86813222b6d..7e63dad93e9 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -441,6 +441,14 @@ if (empty($reshook))
 		}
 	}
 
+	// Close proposal
+	else if ($action == 'close' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) {
+		// prevent browser refresh from reopening proposal several times
+		if ($object->statut == 2) {
+			$object->setStatut(4);
+		}
+	}
+
 	// Set accepted/refused
 	else if ($action == 'setstatut' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) {
 		if (! GETPOST('statut')) {
@@ -1768,6 +1776,12 @@ if ($action == 'create')
 					print '>' . $langs->trans('SetAcceptedRefused') . '</a></div>';
 				}
 
+				// Close
+				if ($object->statut == 2 && $user->rights->supplier_proposal->cloturer) {
+				    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=close' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close') . '"';
+				    print '>' . $langs->trans('Close') . '</a></div>';
+				}
+
 				// Clone
 				if ($user->rights->supplier_proposal->creer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=' . $object->element . '">' . $langs->trans("ToClone") . '</a></div>';

From 884b261df518c622470d0ec19ebfe2f40d7652a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 12:51:47 +0200
Subject: [PATCH 0717/1163] Code comment

---
 htdocs/supplier_proposal/class/supplier_proposal.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 58ff9dd3ded..7d5997c849e 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -154,7 +154,7 @@ class SupplierProposal extends CommonObject
 	 */
 	const STATUS_SIGNED = 2;
 	/**
-	 * Not signed quote
+	 * Not signed quote, canceled
 	 */
 	const STATUS_NOTSIGNED = 3;
 	/**

From 90542d119a17ab92048f0e9da7acb03e9e9f04c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 13:25:30 +0200
Subject: [PATCH 0718/1163] FIX trigger name and status set of setStatus for
 commercial proposal

---
 htdocs/core/class/commonobject.class.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 16bff11b5fd..d732e8b9b69 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2790,6 +2790,8 @@ abstract class CommonObject
     {
     	global $user,$langs,$conf;
 
+    	$savElementId=$elementId;  // To be used later to know if we were using the method using the id of this or not.
+    	
         $elementId = (!empty($elementId)?$elementId:$this->id);
         $elementTable = (!empty($elementType)?$elementType:$this->table_element);
 
@@ -2813,11 +2815,13 @@ abstract class CommonObject
             $error = 0;
 
             $trigkey='';
-            if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_CLOSE';
+            if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
+            if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
+            if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
             if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';
             if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
             if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
-
+            
             if ($trigkey)
             {
                 // Appel des triggers
@@ -2833,12 +2837,14 @@ abstract class CommonObject
 			if (! $error)
 			{
 				$this->db->commit();
-        		if (empty($elementId))    // If the element we update was $this (so $elementId is null)
+				
+        		if (empty($savElementId))    // If the element we update was $this (so $elementId is null)
         		{
         		    $this->statut = $status;
         		    $this->status = $status;
         		}
-				return 1;
+
+                return 1;
 			}
 			else
 			{

From 0bffac6dc4c4891f033b3a759ddd82ca5e0244b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 13:43:43 +0200
Subject: [PATCH 0719/1163] Use constant vor status.

---
 htdocs/comm/propal/class/propal.class.php     |  4 +-
 .../mysql/tables/llx_supplier_proposal.sql    | 12 +++---
 htdocs/supplier_proposal/card.php             | 40 +++++++++----------
 .../class/supplier_proposal.class.php         |  7 ++--
 4 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 348ca1938b0..8b594d57631 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -187,7 +187,7 @@ class Propal extends CommonObject
 	/**
 	 * Billed or processed quote
 	 */
-	const STATUS_BILLED = 4;
+	const STATUS_BILLED = 4;   // Todo rename into STATUS_CLOSE ?
 
     /**
      *	Constructor
@@ -1301,7 +1301,7 @@ class Propal extends CommonObject
                 $this->note                 = $obj->note_private; // TODO deprecated
                 $this->note_private         = $obj->note_private;
                 $this->note_public          = $obj->note_public;
-                $this->statut               = $obj->fk_statut;
+                $this->statut               = (int) $obj->fk_statut;
                 $this->statut_libelle       = $obj->statut_label;
 
                 $this->datec                = $this->db->jdate($obj->datec); // TODO deprecated
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal.sql b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
index 43f26ee0459..13d9ba3a59a 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposal.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
@@ -18,7 +18,7 @@
 CREATE TABLE llx_supplier_proposal (
   rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
   ref varchar(30) NOT NULL,
-  entity integer NOT NULL DEFAULT '1',
+  entity integer NOT NULL DEFAULT 1,
   ref_ext varchar(255) DEFAULT NULL,
   ref_int varchar(255) DEFAULT NULL,
   fk_soc integer DEFAULT NULL,
@@ -31,11 +31,11 @@ CREATE TABLE llx_supplier_proposal (
   fk_user_modif integer DEFAULT NULL,
   fk_user_valid integer DEFAULT NULL,
   fk_user_cloture integer DEFAULT NULL,
-  fk_statut smallint NOT NULL DEFAULT '0',		-- 0=draft, 1=validated, 2=accepted, 3=refused, 4=closed
-  price double DEFAULT '0',
-  remise_percent double DEFAULT '0',
-  remise_absolue double DEFAULT '0',
-  remise double DEFAULT '0',
+  fk_statut	smallint DEFAULT 0 NOT NULL,	-- 0=draft, 1=validated, 2=accepted, 3=refused, 4=billed/closed
+  price double DEFAULT 0,
+  remise_percent double DEFAULT 0,
+  remise_absolue double DEFAULT 0,
+  remise double DEFAULT 0,
   total_ht double(24,8) DEFAULT 0,
   tva double(24,8) DEFAULT 0,
   localtax1 double(24,8) DEFAULT 0,
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 7e63dad93e9..b230133d7b8 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -261,7 +261,7 @@ if (empty($reshook))
 					$object->modelpdf = GETPOST('model');
 					$object->author = $user->id; // deprecated
 					$object->note = GETPOST('note');
-					$object->statut = 0;
+					$object->statut = SupplierProposal::STATUS_DRAFT;
 
 					$id = $object->create_from($user);
 				} else {
@@ -436,16 +436,16 @@ if (empty($reshook))
 	// Reopen proposal
 	else if ($action == 'confirm_reopen' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) {
 		// prevent browser refresh from reopening proposal several times
-		if ($object->statut == 2 || $object->statut == 3 || $object->statut == 4) {
-			$object->reopen($user, 1);
+		if ($object->statut == SupplierProposal::STATUS_SIGNED || $object->statut == SupplierProposal::STATUS_NOTSIGNED || $object->statut == SupplierProposal::STATUS_CLOSE) {
+			$object->reopen($user, SupplierProposal::STATUS_VALIDATED);
 		}
 	}
 
 	// Close proposal
 	else if ($action == 'close' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) {
-		// prevent browser refresh from reopening proposal several times
-		if ($object->statut == 2) {
-			$object->setStatut(4);
+	    // prevent browser refresh from reopening proposal several times
+	    if ($object->statut == SupplierProposal::STATUS_SIGNED) {
+			$object->setStatut(SupplierProposal::STATUS_CLOSE);
 		}
 	}
 
@@ -456,7 +456,7 @@ if (empty($reshook))
 			$action = 'statut';
 		} else {
 			// prevent browser refresh from closing proposal several times
-			if ($object->statut == 1) {
+			if ($object->statut == SupplierProposal::STATUS_VALIDATED) {
                 $object->cloture($user, GETPOST('statut'), GETPOST('note'));
 			}
 		}
@@ -1239,7 +1239,7 @@ if ($action == 'create')
 		$sql .= ", " . MAIN_DB_PREFIX . "societe s";
 		$sql .= " WHERE s.rowid = p.fk_soc";
 		$sql .= " AND p.entity = " . $conf->entity;
-		$sql .= " AND p.fk_statut <> 0";
+		$sql .= " AND p.fk_statut <> ".SupplierProposal::STATUS_DRAFT;
 		$sql .= " ORDER BY Id";
 
 		$resql = $db->query($sql);
@@ -1658,7 +1658,7 @@ if ($action == 'create')
 	<input type="hidden" name="id" value="' . $object->id . '">
 	';
 
-	if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
+	if (! empty($conf->use_javascript_ajax) && $object->statut == SupplierProposal::STATUS_DRAFT) {
 		include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 	}
 
@@ -1673,12 +1673,10 @@ if ($action == 'create')
 		$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1);
 
 	// Form to add new line
-	if ($object->statut == 0 && $user->rights->supplier_proposal->creer)
+	if ($object->statut == SupplierProposal::STATUS_DRAFT && $user->rights->supplier_proposal->creer)
 	{
 		if ($action != 'editline')
 		{
-			$var = true;
-
 			// Add products/services form
 			$object->formAddObjectLine(1, $soc, $mysoc);
 
@@ -1735,7 +1733,7 @@ if ($action == 'create')
 			if ($action != 'statut' && $action != 'editline')
 			{
 				// Validate
-				if ($object->statut == 0 && $object->total_ttc >= 0 && count($object->lines) > 0 &&
+				if ($object->statut == SupplierProposal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0 &&
 			        ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->creer))
        				|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->validate_advance)))
 				) {
@@ -1745,18 +1743,18 @@ if ($action == 'create')
 				}
 
 				// Edit
-				if ($object->statut == 1 && $user->rights->supplier_proposal->creer) {
+				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $user->rights->supplier_proposal->creer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=modif">' . $langs->trans('Modify') . '</a></div>';
 				}
 
 				// ReOpen
-				if (($object->statut == 2 || $object->statut == 3 || $object->statut == 4) && $user->rights->supplier_proposal->cloturer) {
+				if (($object->statut == SupplierProposal::STATUS_SIGNED || $object->statut == SupplierProposal::STATUS_NOTSIGNED || $object->statut == SupplierProposal::STATUS_CLOSE) && $user->rights->supplier_proposal->cloturer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=reopen' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen') . '"';
 					print '>' . $langs->trans('ReOpen') . '</a></div>';
 				}
 
 				// Send
-				if ($object->statut == 1 || $object->statut == 2) {
+				if ($object->statut == SupplierProposal::STATUS_VALIDATED || $object->statut == SupplierProposal::STATUS_SIGNED) {
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=presend&amp;mode=init">' . $langs->trans('SendByMail') . '</a></div>';
 					} else
@@ -1764,20 +1762,20 @@ if ($action == 'create')
 				}
 
 				// Create an order
-				if (! empty($conf->commande->enabled) && $object->statut == 2) {
+				if (! empty($conf->commande->enabled) && $object->statut == SupplierProposal::STATUS_SIGNED) {
 					if ($user->rights->fournisseur->commande->creer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/fourn/commande/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddOrder") . '</a></div>';
 					}
 				}
 
 				// Set accepted/refused
-				if ($object->statut == 1 && $user->rights->supplier_proposal->cloturer) {
+				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $user->rights->supplier_proposal->cloturer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=statut' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#acceptedrefused') . '"';
 					print '>' . $langs->trans('SetAcceptedRefused') . '</a></div>';
 				}
 
 				// Close
-				if ($object->statut == 2 && $user->rights->supplier_proposal->cloturer) {
+				if ($object->statut == SupplierProposal::STATUS_SIGNED && $user->rights->supplier_proposal->cloturer) {
 				    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=close' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close') . '"';
 				    print '>' . $langs->trans('Close') . '</a></div>';
 				}
@@ -1788,7 +1786,7 @@ if ($action == 'create')
 				}
 
 				// Delete
-				if (($object->statut == 0 && $user->rights->supplier_proposal->creer) || $user->rights->supplier_proposal->supprimer) {
+				if (($object->statut == SupplierProposal::STATUS_DRAFT && $user->rights->supplier_proposal->creer) || $user->rights->supplier_proposal->supprimer) {
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete"';
 					print '>' . $langs->trans('Delete') . '</a></div>';
 				}
@@ -1811,8 +1809,6 @@ if ($action == 'create')
 		$genallowed = $user->rights->supplier_proposal->creer;
 		$delallowed = $user->rights->supplier_proposal->supprimer;
 
-		$var = true;
-
 		print $formfile->showdocuments('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 
 		
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 7d5997c849e..b140daa280c 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -158,9 +158,9 @@ class SupplierProposal extends CommonObject
 	 */
 	const STATUS_NOTSIGNED = 3;
 	/**
-	 * Billed or processed quote
+	 * Billed or closed/processed quote
 	 */
-	const STATUS_BILLED = 4;	
+	const STATUS_CLOSE = 4;	
 	
 	
 	
@@ -1143,9 +1143,8 @@ class SupplierProposal extends CommonObject
                 $this->note                 = $obj->note_private; // TODO deprecated
                 $this->note_private         = $obj->note_private;
                 $this->note_public          = $obj->note_public;
-                $this->statut               = $obj->fk_statut;
+                $this->statut               = (int) $obj->fk_statut;
                 $this->statut_libelle       = $obj->statut_label;
-
                 $this->datec                = $this->db->jdate($obj->datec); // TODO deprecated
                 $this->datev                = $this->db->jdate($obj->datev); // TODO deprecated
                 $this->date_creation		= $this->db->jdate($obj->datec); //Creation date

From d60e98a7976ff87f4b1984850c33c83aae2c6f66 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 13:48:40 +0200
Subject: [PATCH 0720/1163] No payment information on a supplier proposal by
 default.

---
 .../supplier_proposal/doc/pdf_aurore.modules.php   | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 3b2812c7b90..6efe3ead81c 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -635,16 +635,6 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		$pdf->SetFont('','', $default_font_size - 1);
 
-		// If France, show VAT mention if not applicable
-		if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
-		{
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
-
-			$posy=$pdf->GetY()+4;
-		}
-
 		$posxval=52;
 
         // Show shipping date
@@ -723,7 +713,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$posy=$pdf->GetY()+3;
 		}
 
-		if (empty($conf->global->SUPPLIER_PROPOSAL_PDF_HIDE_PAYMENTTERMCOND))
+		if (! empty($conf->global->SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMCOND))
 		{
 			// Show payment mode
 			if ($object->mode_reglement_code
@@ -1037,7 +1027,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$resteapayer = $object->total_ttc - $deja_regle;
 		if (! empty($object->paye)) $resteapayer=0;
 		*/
-
+        
 		if ($deja_regle > 0)
 		{
 			$index++;

From a1ac3b470bb8a3a93f95c987672a1fa6a13e3b2e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 14:01:20 +0200
Subject: [PATCH 0721/1163] Change menu for setup of predefined emails

---
 htdocs/core/class/html.formmail.class.php | 4 ++--
 htdocs/langs/en_US/main.lang              | 3 ++-
 htdocs/langs/en_US/other.lang             | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index ab58854f2c4..1d5e8714aad 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -327,7 +327,7 @@ class FormMail extends Form
         	{
 	        	$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
         	    $out.= $langs->trans('SelectMailModel').': '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1);
-	        	if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	        	if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
 	        	$out.= ' &nbsp; ';
 	        	$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
 	        	$out.= ' &nbsp; ';
@@ -341,7 +341,7 @@ class FormMail extends Form
         	{
 	        	$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
         	    $out.= $langs->trans('SelectMailModel').': <select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>';    // Do not put disabled on option, it is already on select and it makes chrome crazy.
-        	    if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        	    if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
         	    $out.= ' &nbsp; ';
         	    $out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';
         	    $out.= ' &nbsp; ';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index bc7c864b279..9453c1522e9 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -611,7 +611,8 @@ PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
 YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
 Color=Color
 Documents=Linked files
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index ab937ff3bab..a37927566e3 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__

From 919d5b2ef3b16e59d48c00fbc6f9a5461e4b0a95 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 14:01:32 +0200
Subject: [PATCH 0722/1163] Fix missing translation

---
 htdocs/supplier_proposal/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index b230133d7b8..d36b471a721 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1855,6 +1855,7 @@ if ($action == 'create')
 			$outputlangs = new Translate('', $conf);
 			$outputlangs->setDefaultLang($newlang);
 			$outputlangs->load('commercial');
+			$outputlangs->load('supplier_proposal');
 		}
 
 		// Build document if it not exists

From 91c505c9c970f09029f75b40f4715b2f362c60af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 14:20:59 +0200
Subject: [PATCH 0723/1163] Update llx_accounting.sql

---
 htdocs/install/mysql/data/llx_accounting.sql | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql
index c468e4c3968..e81d13dd2b8 100644
--- a/htdocs/install/mysql/data/llx_accounting.sql
+++ b/htdocs/install/mysql/data/llx_accounting.sql
@@ -27,15 +27,11 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-delete from llx_accounting_account;
-delete from llx_accounting_system;
-delete from llx_accounting_journal;
-
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Journal des ventes', 2, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Journal des achats', 3, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Journal de banque', 4, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 1, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Journal des à-nouveaux', 9, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('VT', 'Journal des ventes', 2, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('AC', 'Journal des achats', 3, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('BQ', 'Journal de banque', 4, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('OD', 'Journal des opérations diverses', 1, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('AN', 'Journal des à-nouveaux', 9, 1);
 --
 -- Descriptif des plans comptables FR PCG99-ABREGE
 --

From 885a63635181150ae3b5bc3c880b1f83cda4bc11 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 16:35:05 +0200
Subject: [PATCH 0724/1163] Debug new journal list page

---
 htdocs/accountancy/admin/journals_list.php    | 41 ++++++++-----------
 htdocs/accountancy/index.php                  | 16 +++++---
 htdocs/core/class/translate.class.php         |  1 +
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  7 ++++
 htdocs/langs/en_US/accountancy.lang           | 28 +++++++------
 5 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index be532c7c25f..065d750ca82 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -126,10 +126,10 @@ complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
 	$sourceList = array(
-			'1' => $langs->trans('AccountingJournalType0'),
-			'2' => $langs->trans('AccountingJournalType1'),
-			'3' => $langs->trans('AccountingJournalType2'),
-			'4' => $langs->trans('AccountingJournalType3'),
+			'1' => $langs->trans('AccountingJournalType1'),
+			'2' => $langs->trans('AccountingJournalType2'),
+			'3' => $langs->trans('AccountingJournalType3'),
+			'4' => $langs->trans('AccountingJournalType4'),
 			'9' => $langs->trans('AccountingJournalType9')
 	);
 
@@ -212,10 +212,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         $i=0;
         foreach ($listfieldinsert as $f => $value)
         {
-            if ($value == 'price' || preg_match('/^amount/i',$value) || $value == 'taux') {
-            	$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
-            }
-            else if ($value == 'entity') {
+            if ($value == 'entity') {
             	$_POST[$listfieldvalue[$i]] = $conf->entity;
             }
             if ($i) $sql.=",";
@@ -465,7 +462,6 @@ if ($id)
              if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
         }
 
-        if ($id == 4) print '<td></td>';
         print '<td>';
         print '<input type="hidden" name="id" value="'.$id.'">';
         print '</td>';
@@ -475,7 +471,7 @@ if ($id)
         print '</tr>';
 
         // Line to enter new values
-        print "<tr ".$bcnd[$var].">";
+        print '<tr class="oddeven nodrag nodrap nohover">';
 
         $obj = new stdClass();
         // If data was already input, we define them in obj to populate input fields.
@@ -503,13 +499,7 @@ if ($id)
         print '</td>';
         print "</tr>";
 
-        $colspan=count($fieldlist)+3;
-
-        if (! empty($alabelisused))  // If there is one label among fields, we show legend of *
-        {
-        	print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
-        }
-        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
+        print '<tr><td colspan="7">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
     }
 
 
@@ -578,6 +568,9 @@ if ($id)
         print '<td class="liste_titre"></td>';
         print '<td class="liste_titre"></td>';
         print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre"></td>';
         print '<td class="liste_titre" align="center">';
     	if ($filterfound)
     	{
@@ -605,14 +598,12 @@ if ($id)
                     // Show fields
                     if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
 
-                    print '<td></td>';
-                    print '<td></td>';
-                    print '<td align="center">';
+                    print '<td align="center" colspan="4">';
                     print '<input type="hidden" name="page" value="'.$page.'">';
                     print '<input type="hidden" name="rowid" value="'.$rowid.'">';
                     print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
                     print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+                    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
                     print '</td>';
                 }
                 else
@@ -655,10 +646,7 @@ if ($id)
                     	else if ($obj->code == 'EF0')   { $iserasable = 0; $canbedisabled = 0; }
                     }
 
-                    if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable=0; }
-                    if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled=0; $canbedisabled = 0; }
                     $canbemodified=$iserasable;
-                    if ($obj->code == 'RECEP') $canbemodified=1;
 
                     $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
                     if ($param) $url .= '&'.$param;
@@ -690,9 +678,12 @@ if ($id)
                     }
                     else print '<td>&nbsp;</td>';
 
+                    print '<td></td>';
+                                         
                     print '</td>';
-                    print "</tr>\n";
                 }
+                
+                print "</tr>\n";
                 $i++;
             }
         }
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index ff9ca6fa1a3..c7caa5daac3 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -71,6 +71,10 @@ print "<br>\n";
 
 // STEPS
 $step++;
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("AccountingJournals").'</strong>');
+print "<br>\n";
+print "<br>\n";
+$step++;
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Pcg_version").'</strong>');
 print "<br>\n";
 print "<br>\n";
@@ -148,24 +152,26 @@ print '<hr>';
 print "<br>\n";
 $step = 0;
 
+$langs->loadLangs(array('bills', 'trips'));
+
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescCustomer", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'</strong>')."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsCustomers"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'</strong>')."<br>\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescSupplier", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong>')."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong>')."<br>\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>')."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("ExpenseReports"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>')."<br>\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", $step)."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64+$step), $langs->transnoentitiesnoconv("Journalization"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."<br>\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", $step)."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", chr(64+$step))."<br>\n";
 print "<br>\n";
 
 llxFooter();
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 30cedf57d51..0f2e6a837ef 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -170,6 +170,7 @@ class Translate
 	 * 	@param	int		$forcelangdir		To force a different lang directory
 	 *  @param  int     $loadfromfileonly   1=Do not load overwritten translation from file or old conf.
 	 *	@return	int							<0 if KO, 0 if already loaded or loading not required, >0 if OK
+	 *  @see loadLangs
 	 */
 	function load($domain,$alt=0,$stopafterdirection=0,$forcelangdir='',$loadfromfileonly=0)
 	{
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index a6666d37ee0..f88ffd05687 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -251,3 +251,10 @@ insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type
 
 ALTER TABLE llx_events MODIFY COLUMN ip varchar(250);
 
+UPDATE llx_accounting_journal SET nature = 1 where code = 'OD' and nature = 0;
+UPDATE llx_accounting_journal SET nature = 2 where code = 'VT' and nature = 1;
+UPDATE llx_accounting_journal SET nature = 3 where code = 'AC' and nature = 2;
+UPDATE llx_accounting_journal SET nature = 4 where (code = 'BK' or code = 'BQ') and nature = 3;
+
+
+
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index a5788736fbd..9eb4135397f 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -32,23 +32,25 @@ ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making thee journalization (writing record in Journals and General ledger)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
 AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
-AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this you can use the menu entry %s.    
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for type of expense report. For this you can use the menu entry %s.
-AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this you can use the menu entry %s.    
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (miscellaneous taxes). For this you can use the menu entry %s.    
-AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this you can use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define default accounting accounts for miscellaneous transactions. For this you can use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this you can use the menu entry %s. 
-AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
-AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products. For this you can use the menu entry %s.
 
-AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this you can use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into each Journal, and click into button "Journalize transactions in General Ledger". 
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.    
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.    
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (miscellaneous taxes). For this, use the menu entry %s.    
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s. 
+AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>. 
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.

From fc5f4007a12e3e1cffb93f928d9d2bc02dbd9aef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 16:54:05 +0200
Subject: [PATCH 0725/1163] Debug accountancy module. Page for bank
 journalization is still KO.

---
 htdocs/accountancy/admin/journals_list.php    |  5 +++-
 htdocs/core/menus/standard/eldy.lib.php       | 29 +++++++++++++------
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 ++
 .../mysql/tables/llx_accounting_journal.sql   |  1 +
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 065d750ca82..0b13bfc7d4d 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -61,6 +61,8 @@ if ($page == -1) { $page = 0 ; }
 $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
+if (empty($sortfield)) $sortfield='code';
+if (empty($sortorder)) $sortorder='ASC';
 
 $error = 0;
 
@@ -125,7 +127,8 @@ complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,
 
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
-	$sourceList = array(
+    // Must match ids defined into eldy.lib.php 
+    $sourceList = array(
 			'1' => $langs->trans('AccountingJournalType1'),
 			'2' => $langs->trans('AccountingJournalType2'),
 			'3' => $langs->trans('AccountingJournalType3'),
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index aa905b4ef93..4c873830948 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1007,8 +1007,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					// Multi journal
 					$sql = "SELECT rowid, code, label, nature";
 					$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
-					// $sql.= " WHERE entity = ".$conf->entity;
-					$sql.= " ORDER BY code";
+					$sql.= " WHERE entity = ".$conf->entity;
+					$sql.= " ORDER BY nature";
 
 					$resql = $db->query($sql);
 					if ($resql)
@@ -1021,14 +1021,25 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
     						while ($i < $numr)
     						{
     							$objp = $db->fetch_object($resql);
-    
-    							if ($objp->nature == 1) $nature="sells";
-    							if ($objp->nature == 2) $nature="purchases";
-    							if ($objp->nature == 3) $nature="bank";
-    							if ($objp->nature == 4) $nature="various";
+
+    							$nature='';
+    							// Must match array $sourceList defined into journals_list.php 
+    							if ($objp->nature == 2) $nature="sells";
+    							if ($objp->nature == 3) $nature="purchases";
+    							if ($objp->nature == 4) $nature="bank";
+    							if ($objp->nature == 1) $nature="various";
     							if ($objp->nature == 9) $nature="hasnew";
-    
-    							if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
+    							
+    							// To enable when page exists
+    							if (empty($conf->global->MAIN_FEATURES_LEVEL))
+    							{
+    							    if ($nature == 'various' || $nature == 'hasnew') $nature='';	
+    							}
+    								
+    							if ($nature)
+    							{
+                                    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
+    							}
     							$i++;
     						}
 						}
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index f88ffd05687..d96210dcbfe 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -120,6 +120,8 @@ INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 0, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Journal des à-nouveaux', 9, 1);
 
+ALTER TABLE llx_accounting_journal ADD COLUMN entity integer DEFAULT 1;
+
 ALTER TABLE llx_paiementfourn ADD COLUMN model_pdf varchar(255);
 
 
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.sql b/htdocs/install/mysql/tables/llx_accounting_journal.sql
index bccfb234c3e..a435de3cd80 100644
--- a/htdocs/install/mysql/tables/llx_accounting_journal.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_journal.sql
@@ -20,6 +20,7 @@
 create table llx_accounting_journal
 (
   rowid             integer AUTO_INCREMENT PRIMARY KEY,
+  entity            integer DEFAULT 1,
   code       		varchar(32) NOT NULL,
   label             varchar(128) NOT NULL,
   nature			smallint DEFAULT 0 NOT NULL,			-- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)

From dc9cbed8664f66d028f68a90c6fb3d46a66bcf95 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 17:04:35 +0200
Subject: [PATCH 0726/1163] Look and feel v6

---
 htdocs/margin/productMargins.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index efcb35b802f..f5e84dd5c04 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -204,6 +204,7 @@ if ($result)
 	print '<br>';
 	print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&amp;id=".$id,$sortfield,$sortorder,'',$num,$num,'');
 
+	//var_dump($conf->global->MARGIN_TYPE);
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice=$langs->trans('BuyingPrice');
 	else   // value is 'costprice' or 'pmp'
@@ -285,7 +286,7 @@ if ($result)
 				}
 				else
 				{
-				    print $langs->trans("NotPredefinedProducts");
+				    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
 				}
 				print "</td>\n";
 				//print "<td>".$product_static->getNomUrl(1)."</td>\n";

From a8292ce990f53be1fd6a298d324d2187dfa03c0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 17:27:16 +0200
Subject: [PATCH 0727/1163] Code comment

---
 htdocs/core/class/commoninvoice.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index a8b248dd38e..2e2a26dd9ae 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -91,8 +91,8 @@ abstract class CommonInvoice extends CommonObject
 
 	
 	/**
-	 * 	Return remain amount to pay.
-	 *  Property ->id and ->total_ttc must be set.
+	 * 	Return remain amount to pay. Property ->id and ->total_ttc must be set.
+	 *  This does not include open direct debit requests.
 	 *
 	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
 	 *	@return		int						Remain of amount to pay

From d7e10085b8782f3261b3c717e8e5b0dd36f84021 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 18:42:11 +0200
Subject: [PATCH 0728/1163] Clean code. Using 2 different key for a param is
 not more allowed.

---
 htdocs/comm/action/card.php                   |   2 +-
 htdocs/comm/action/index.php                  |  19 +--
 htdocs/comm/action/listactions.php            |   4 +-
 htdocs/comm/action/pertype.php                |   8 +-
 htdocs/comm/action/peruser.php                |   9 +-
 htdocs/core/lib/agenda.lib.php                |   2 +-
 htdocs/core/lib/functions.lib.php             | 120 +++++++++---------
 .../demo_wsclient_actioncomm.php-NORUN        |   3 +-
 htdocs/webservices/server_actioncomm.php      |  12 +-
 9 files changed, 80 insertions(+), 99 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index fc4fc218971..73d015d7db9 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -337,7 +337,7 @@ if ($action == 'add')
 				unset($_SESSION['assignedtouser']);
 
 				$moreparam='';
-				if ($user->id != $object->userownerid) $moreparam="usertodo=-1";	// We force to remove filter so created record is visible when going back to per user view.
+				if ($user->id != $object->userownerid) $moreparam="filtert=-1";	// We force to remove filter so created record is visible when going back to per user view.
 
 				$db->commit();
 				if (! empty($backtopage))
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index d365acef38b..47ef8093c1a 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -43,8 +43,8 @@ if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MA
 if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
 $MAXAGENDA=$conf->global->AGENDA_EXT_NB;
 
-$filter=GETPOST("filter",'',3);
-$filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
+$filter = GETPOST("filter",'',3);
+$filtert = GETPOST("filtert","int",3);
 $usergroup = GETPOST("usergroup","int",3);
 $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 
@@ -1155,21 +1155,6 @@ else    // View by day
     echo '</table>';
 }
 
-
-/* TODO Export
- print '
-<a href="" id="actionagenda_ical_link"><img src="'.DOL_URL_ROOT.'/theme/common/ical.gif" border="0"/></a>
-<a href="" id="actionagenda_vcal_link"><img src="'.DOL_URL_ROOT.'/theme/common/vcal.gif" border="0"/></a>
-<a href="" id="actionagenda_rss_link"><img src="'.DOL_URL_ROOT.'/theme/common/rss.gif"  border="0"/></a>
-
-<script>
-$("#actionagenda_rss_link").attr("href","/public/agenda/agendaexport.php?format=rss&type=ActionAgenda&exportkey=dolibarr&token="+getToken()+"&status="+getStatus()+"&userasked="+getUserasked()+"&usertodo="+getUsertodo()+"&userdone="+getUserdone()+"&year="+getYear()+"&month="+getMonth()+"&day="+getDay()+"&showbirthday="+getShowbirthday()+"&action="+getAction()+"&projectid="+getProjectid()+"");
-$("#actionagenda_ical_link").attr("href","/public/agenda/agendaexport.php?format=ical&type=ActionAgenda&exportkey=dolibarr&token="+getToken()+"&status="+getStatus()+"&userasked="+getUserasked()+"&usertodo="+getUsertodo()+"&userdone="+getUserdone()+"&year="+getYear()+"&month="+getMonth()+"&day="+getDay()+"&showbirthday="+getShowbirthday()+"&action="+getAction()+"&projectid="+getProjectid()+"");
-$("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format=vcal&type=ActionAgenda&exportkey=dolibarr&token="+getToken()+"&status="+getStatus()+"&userasked="+getUserasked()+"&usertodo="+getUsertodo()+"&userdone="+getUserdone()+"&year="+getYear()+"&month="+getMonth()+"&day="+getDay()+"&showbirthday="+getShowbirthday()+"&action="+getAction()+"&projectid="+getProjectid()+"");
-</script>
-';
-*/
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 8b1dc424239..3e6224e0c41 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -64,8 +64,8 @@ $dateend=dol_mktime(0, 0, 0, GETPOST('dateendmonth'), GETPOST('dateendday'), GET
 if ($status == ''   && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
 if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
 
-$filter=GETPOST("filter",'',3);
-$filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
+$filter = GETPOST("filter",'',3);
+$filtert = GETPOST("filtert","int",3);
 $usergroup = GETPOST("usergroup","int",3);
 $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 4f4ef6a580c..544da904cdc 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -38,8 +38,8 @@ if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class
 
 if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
 
-$filter=GETPOST("filter",'',3);
-$filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
+$filter = GETPOST("filter",'',3);
+$filtert = GETPOST("filtert","int",3);
 $usergroup = GETPOST("usergroup","int",3);
 //if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
 //$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
@@ -250,7 +250,7 @@ $picto='calendarweek';
 $nav.=' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
 $nav.='<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 $nav.='<input type="hidden" name="action" value="' . $action . '">';
-$nav.='<input type="hidden" name="usertodo" value="' . $filtert . '">';
+$nav.='<input type="hidden" name="filtert" value="' . $filtert . '">';
 $nav.='<input type="hidden" name="usergroup" value="' . $usergroup . '">';
 $nav.='<input type="hidden" name="actioncode" value="' . $actioncode . '">';
 $nav.='<input type="hidden" name="resourceid" value="' . $resourceid . '">';
@@ -714,7 +714,7 @@ jQuery(document).ready(function() {
 		else if (ids.indexOf(",") > -1)	/* There is several events */
 		{
 			/* alert(\'several events\'); */
-			url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?usertodo="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
+			url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
 			window.location.href = url;
 		}
 		else	/* One event */
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 61bf98634c4..2a707cd2d8f 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -38,8 +38,8 @@ if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class
 
 if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
 
-$filter=GETPOST("filter",'',3);
-$filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
+$filter = GETPOST("filter",'',3);
+$filtert = GETPOST("filtert","int",3);
 $usergroup = GETPOST("usergroup","int",3);
 //if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
 //$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
@@ -252,7 +252,7 @@ $picto='calendarweek';
 $nav.=' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
 $nav.='<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 $nav.='<input type="hidden" name="action" value="' . $action . '">';
-$nav.='<input type="hidden" name="usertodo" value="' . $filtert . '">';
+$nav.='<input type="hidden" name="filtert" value="' . $filtert . '">';
 $nav.='<input type="hidden" name="usergroup" value="' . $usergroup . '">';
 $nav.='<input type="hidden" name="actioncode" value="' . $actioncode . '">';
 $nav.='<input type="hidden" name="resourceid" value="' . $resourceid . '">';
@@ -663,7 +663,6 @@ else
 	if ($usergroup > 0)	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
 	$sql.= " WHERE u.statut = 1 AND u.entity IN (".getEntity('user',1).")";
 	if ($usergroup > 0)	$sql.= " AND ug.fk_usergroup = ".$usergroup;
-	//if (GETPOST("usertodo","int",3) > 0) $sql.=" AND u.rowid = ".GETPOST("usertodo","int",3);
 	//print $sql;
 	$resql=$db->query($sql);
 	if ($resql)
@@ -816,7 +815,7 @@ jQuery(document).ready(function() {
 		else if (ids.indexOf(",") > -1)	/* There is several events */
 		{
 			/* alert(\'several events\'); */
-			url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?usertodo="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
+			url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
 			window.location.href = url;
 		}
 		else	/* One event */
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 1f83690b096..4e9b458c3d0 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -76,7 +76,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
 		print $langs->trans("ActionsToDoBy").' &nbsp; ';
 		print '</td><td style="padding-bottom: 2px; padding-right: 4px;">';
-		print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+		print $form->select_dolusers($filtert, 'filtert', 1, '', ! $canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("ToUserOfGroup").' &nbsp; ';
 		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
 		print '</td></tr>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 275bbae8c36..31f29ff611c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -248,70 +248,72 @@ function dol_shutdown()
  */
 function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 {
-	if (empty($method))
-	{
-		$out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
-
-		// Management of default values
-		if (! isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values
-		{
-		    if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
-			{
-				$relativepathstring = $_SERVER["PHP_SELF"];
-				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-				global $user;
-				if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first 
-				{
-					//var_dump($user->default_values[$relativepathstring]['createform']);
-					if (isset($user->default_values[$relativepathstring]['createform'][$paramname])) $out = $user->default_values[$relativepathstring]['createform'][$paramname];
-				}
-			}
-			// Management of default search_filters and sort order
-			elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
-			{
-			    $relativepathstring = $_SERVER["PHP_SELF"];
-				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-				global $user;
-				if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first 
-				{
-				    //var_dump($user->default_values[$relativepathstring]);
-        			if ($paramname == 'sortfield')
-        			{
-        			    if (isset($user->default_values[$relativepathstring]['sortorder'])) 
-        			    {
-        			        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
-        			        {
-        			            if ($out) $out.=', ';
-        			            $out.=$key;
-        			        }
-        			    }
-        			}
-        			elseif ($paramname == 'sortorder')
-        			{
-        			    if (isset($user->default_values[$relativepathstring]['sortorder'])) 
-        			    {
-        			        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
-        			        {
-        			            if ($out) $out.=', ';
-        			            $out.=$val;
-        			        }
-        			    }
-        			}
-				    elseif (isset($user->default_values[$relativepathstring]['filters'][$paramname])) $out = $user->default_values[$relativepathstring]['filters'][$paramname];
-				}
-			}
-		}
-	}
+    if (empty($method)) $out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
 	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
 	elseif ($method==2) $out = isset($_POST[$paramname])?$_POST[$paramname]:'';
 	elseif ($method==3) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:'');
 	elseif ($method==4) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:(isset($_COOKIE[$paramname])?$_COOKIE[$paramname]:''));
 	else return 'BadThirdParameterForGETPOST';
-
+	
+	if (empty($method) || $method == 3 || $method == 4)
+	{
+	    // Management of default values
+	    if (! isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values
+	    {
+	        if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+	        {
+	            $relativepathstring = $_SERVER["PHP_SELF"];
+	            if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+	            $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+	            $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+	            global $user;
+	            if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first
+	            {
+	                //var_dump($user->default_values[$relativepathstring]['createform']);
+	                if (isset($user->default_values[$relativepathstring]['createform'][$paramname])) $out = $user->default_values[$relativepathstring]['createform'][$paramname];
+	            }
+	        }
+	        // Management of default search_filters and sort order
+	        //elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+	        elseif (! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+	        {
+	            $relativepathstring = $_SERVER["PHP_SELF"];
+	            if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+	            $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+	            $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+	            global $user;
+	            if (! empty($user->default_values))		// $user->default_values defined from menu default values
+	            {
+	                //var_dump($user->default_values[$relativepathstring]);
+	                if ($paramname == 'sortfield')
+	                {
+	                    if (isset($user->default_values[$relativepathstring]['sortorder']))
+	                    {
+	                        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
+	                        {
+	                            if ($out) $out.=', ';
+	                            $out.=dol_string_nospecial($key, '');
+	                        }
+	                    }
+	                }
+	                elseif ($paramname == 'sortorder')
+	                {
+	                    if (isset($user->default_values[$relativepathstring]['sortorder']))
+	                    {
+	                        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
+	                        {
+	                            if ($out) $out.=', ';
+	                            $out.=dol_string_nospecial($val, '');
+	                        }
+	                    }
+	                }
+	                elseif (isset($user->default_values[$relativepathstring]['filters'][$paramname]))
+	                $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$paramname], '');
+	            }
+	        }
+	    }
+	}	
+	
 	if (! empty($check))
 	{
 	    // Replace vars like __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__
diff --git a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
index d3044fc9bd8..d8ad49945bd 100755
--- a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
@@ -107,8 +107,7 @@ if ($action=='create')
 	'projectid'=>'',
 	'note'=>'This is note',
 	'contactid'=>'',
-	'usertodo'=>'1',
-	'userdone'=>'1',
+	'userownerod'=>'1',
 	'label'=>'Ceci est les titre de l\'envenement',
 	'percentage'=>'100',
 	'location'=>'Location1'
diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index 99e8ea59e6f..c7e1f769d9a 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -101,8 +101,7 @@ $actioncomm_fields= array(
 	'percentage' => array('name'=>'percentage','type'=>'xsd:string'),
 	'author' => array('name'=>'author','type'=>'xsd:string'),
 	'usermod' => array('name'=>'usermod','type'=>'xsd:string'),
-	'usertodo' => array('name'=>'usertodo','type'=>'xsd:string'),
-	'userdone' => array('name'=>'userdone','type'=>'xsd:string'),
+	'userownerid' => array('name'=>'userownerid','type'=>'xsd:string'),
 	'priority' => array('name'=>'priority','type'=>'xsd:string'),
 	'fulldayevent' => array('name'=>'fulldayevent','type'=>'xsd:string'),
 	'location' => array('name'=>'location','type'=>'xsd:string'),
@@ -291,8 +290,7 @@ function getActionComm($authentication,$id)
 			        	'percentage'=> $actioncomm->percentage,
 			        	'author'=> $actioncomm->authorid,
 			        	'usermod'=> $actioncomm->usermodid,
-			        	'usertodo'=> $actioncomm->userownerid,
-			        	'userdone'=> $actioncomm->userdoneid,
+			        	'userownerid'=> $actioncomm->userownerid,
 			        	'priority'=> $actioncomm->priority,
 			        	'fulldayevent'=> $actioncomm->fulldayevent,
 			        	'location'=> $actioncomm->location,
@@ -437,8 +435,7 @@ function createActionComm($authentication,$actioncomm)
 		$newobject->fk_project=$actioncomm['projectid'];
 		$newobject->note=$actioncomm['note'];
 		$newobject->contactid=$actioncomm['contactid'];
-		$newobject->userownerid=$actioncomm['usertodo'];
-		$newobject->userdoneid=$actioncomm['userdone'];
+		$newobject->userownerid=$actioncomm['userownerid'];
 		$newobject->label=$actioncomm['label'];
 		$newobject->percentage=$actioncomm['percentage'];
 		$newobject->priority=$actioncomm['priority'];
@@ -532,8 +529,7 @@ function updateActionComm($authentication,$actioncomm)
 			$object->contactid=$actioncomm['contactid'];
 			$object->fk_project=$actioncomm['projectid'];
 			$object->note=$actioncomm['note'];
-			$object->userownerid=$actioncomm['usertodo'];
-			$object->userdoneid=$actioncomm['userdone'];
+			$object->userownerid=$actioncomm['userownerid'];
 			$object->label=$actioncomm['label'];
 			$object->percentage=$actioncomm['percentage'];
 			$object->priority=$actioncomm['priority'];

From d93552c8c5311ba7a4853aa0993105d9322894e7 Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Fri, 5 May 2017 17:13:29 +0000
Subject: [PATCH 0729/1163] Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 htdocs/core/class/commoninvoice.class.php                     | 2 +-
 .../modules/supplier_payment/doc/pdf_standard.modules.php     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 2e2a26dd9ae..4b6d70b1366 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -95,7 +95,7 @@ abstract class CommonInvoice extends CommonObject
 	 *  This does not include open direct debit requests.
 	 *
 	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *	@return		int						Remain of amount to pay
+	 *	@return		double						Remain of amount to pay
 	 */
 	function getRemainToPay($multicurrency=0)
 	{
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index 2b645e4a263..6fbfb4b1bf4 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -520,8 +520,8 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	 *   Show table for lines
 	 *
 	 *   @param		PDF			$pdf     		Object PDF
-	 *   @param		string		$tab_top		Top position of table
-	 *   @param		string		$tab_height		Height of table (rectangle)
+	 *   @param		integer		$tab_top		Top position of table
+	 *   @param		integer		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y (not used)
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array

From d53654e64f46ff71aa5f4b87f62557371471b614 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 20:41:44 +0200
Subject: [PATCH 0730/1163] Look and feel v6

---
 htdocs/admin/ihm.php                         |  44 -------------------
 htdocs/admin/pdf.php                         |   9 ++--
 htdocs/comm/action/card.php                  |   8 ++--
 htdocs/core/class/html.formactions.class.php |   5 ++-
 htdocs/core/lib/functions.lib.php            |   4 +-
 htdocs/core/lib/security2.lib.php            |   6 ---
 htdocs/core/lib/usergroups.lib.php           |  13 ++++--
 htdocs/holiday/list.php                      |   1 +
 htdocs/projet/activity/perday.php            |  38 ++++++++--------
 htdocs/projet/activity/perweek.php           |  40 ++++++++---------
 htdocs/theme/doliforge_logo.png              | Bin 16587 -> 0 bytes
 htdocs/theme/eldy/style.css.php              |  22 +++++-----
 htdocs/theme/md/style.css.php                |   7 ++-
 htdocs/user/note.php                         |   1 +
 htdocs/user/passwordforgotten.php            |   9 ----
 15 files changed, 80 insertions(+), 127 deletions(-)
 delete mode 100644 htdocs/theme/doliforge_logo.png

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 193ee35a80f..739a6fa4c88 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -50,18 +50,6 @@ $action = GETPOST('action');
 
 if (! defined("MAIN_MOTD")) define("MAIN_MOTD","");
 
-// List of supported permanent search area
-$searchform=array();
-/* deprecated
-if (empty($conf->use_javascript_ajax))
-{
-    $searchform=array("MAIN_SEARCHFORM_SOCIETE", "MAIN_SEARCHFORM_CONTACT", "MAIN_SEARCHFORM_PRODUITSERVICE", "MAIN_SEARCHFORM_ADHERENT", "MAIN_SEARCHFORM_PROJECT", "MAIN_SEARCHFORM_EMPLOYEE");
-    $searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE,$conf->global->MAIN_SEARCHFORM_ADHERENT,$conf->global->MAIN_SEARCHFORM_PROJECT,$conf->global->MAIN_SEARCHFORM_EMPLOYEE);
-    $searchformtitle=array($langs->trans("Companies"), $langs->trans("Contacts"), $langs->trans("ProductsAndServices"), $langs->trans("Members"), $langs->trans("Projects"), $langs->trans("Users"));
-    $searchformmodule=array('Module1Name','Module1Name','Module50Name','Module310Name','Module400Name');
-}
-*/
-
 
 /*
  * Action
@@ -275,21 +263,6 @@ if ($action == 'edit')	// Edit
     show_theme(null,1);
     print '<br>';
 
-    // List of permanent supported search box
-    if (! empty($searchform))
-    {
-        print '<table summary="search" class="noborder" width="100%">';
-        print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("PermanentLeftSearchForm").'</td><td colspan="2">'.$langs->trans("Activated").'</td></tr>';
-        foreach ($searchform as $key => $value)
-        {
-            print '<tr><td class="titlefield">'.$searchformtitle[$key].'</td><td colspan="2">';
-            print $form->selectyesno($searchform[$key],$searchformconst[$key],1);
-            print '</td></tr>';
-        }
-        print '</table>';
-        print '<br>';
-    }
-    
     // Other
     print '<table summary="edit" class="noborder" width="100%">';
     print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
@@ -476,23 +449,6 @@ else	// Show
     print '<br>';
 
 
-    // List of search forms to show
-    if (! empty($searchform))
-    {
-        print '<table class="noborder" width="100%">';
-        print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("PermanentLeftSearchForm").'</td><td>'.$langs->trans("Activated").'</td><td>&nbsp;</td></tr>';
-        foreach ($searchform as $key => $value)
-        {
-            
-            print '<tr class="oddeven"><td class="titlefield">'.$searchformtitle[$key].'</td><td>'.yn($searchformconst[$key]).'</td>';
-    		print '<td align="left">';
-    		if (! empty($searchformmodule[$key])) print $langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key]));
-            print '</td></tr>';
-        }
-        print '</table>';
-        print '<br>';
-    }
-
     // Other
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameters").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>';
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 2e650c75696..6698be8b01f 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -306,8 +306,9 @@ else	// Show
     $var=true;
 
     // Misc options
-    print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'<br>';
-	$var=true;
+    print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'','');
+	
+    
     print '<table summary="more" class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
@@ -357,7 +358,7 @@ else	// Show
 
 	print '<br>';
 
-	print load_fiche_titre($langs->trans("PDFAddressForging"),'','').'<br>';
+	print load_fiche_titre($langs->trans("PDFAddressForging"),'','');
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
@@ -444,7 +445,7 @@ else	// Show
     print '<br>';
 
     // Other
-    print load_fiche_titre($langs->trans("Other"),'','').'<br>';
+    print load_fiche_titre($langs->trans("Other"),'','');
 	$var=true;
     print '<table summary="more" class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px" colspan="2">'.$langs->trans("Value").'</td></tr>';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 73d015d7db9..30b13bc3007 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -706,7 +706,7 @@ if ($action == 'create')
 		if (GETPOST('complete') == '0' || GETPOST("afaire") == 1) $percent='0';
 		else if (GETPOST('complete') == 100 || GETPOST("afaire") == 2) $percent=100;
 	}
-	$formactions->form_select_status_action('formaction',$percent,1,'complete');
+	$formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200');
 	print '</td></tr>';
 
     // Location
@@ -1428,7 +1428,7 @@ if ($id > 0)
 				} else {
 					$value = $object->array_options["options_" . $key];
 				}
-				print '<tr><td width="30%">'.$label.'</td><td>';
+				print '<tr><td class="titlefield">'.$label.'</td><td>';
 				print $extrafields->showOutputField($key,$value);
 				print "</td></tr>\n";
 			}
@@ -1491,7 +1491,7 @@ if ($id > 0)
 	{
 		if (empty($conf->global->AGENDA_DISABLE_BUILDDOC))
 		{
-			print '<div style="clear:both;">&nbsp;<br><br></div><div class="fichecenter"><div class="fichehalfleft">';
+			print '<div style="clear:both;"></div><div class="fichecenter"><div class="fichehalfleft">';
             print '<a name="builddoc"></a>'; // ancre
 
             /*
@@ -1512,8 +1512,6 @@ if ($id > 0)
 
 
 			print '</div></div></div>';
-
-            print '<div style="clear:both;">&nbsp;</div>';
 	    }
 	}
 }
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index b799e0e2359..452ff89d914 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -54,9 +54,10 @@ class FormActions
      *  @param  string	$htmlname   	Name of html prefix for html fields (selectX and valX)
      *  @param	integer	$showempty		Show an empty line if select is used
      *  @param	integer	$onlyselect		0=Standard, 1=Hide percent of completion and force usage of a select list, 2=Same than 1 and add "Incomplete (Todo+Running)
+     *  @param  string  $morecss        More css on select field
      * 	@return	void
      */
-    function form_select_status_action($formname,$selected,$canedit=1,$htmlname='complete',$showempty=0,$onlyselect=0)
+    function form_select_status_action($formname, $selected, $canedit=1, $htmlname='complete', $showempty=0, $onlyselect=0, $morecss='maxwidth100')
     {
         global $langs,$conf;
 
@@ -120,7 +121,7 @@ class FormActions
         {
         	//var_dump($selected);
         	if ($selected == 'done') $selected='100';
-            print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat maxwidth100">';
+            print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">';
             if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
             foreach($listofstatus as $key => $val)
             {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 31f29ff611c..262204b9f72 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -257,8 +257,10 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	
 	if (empty($method) || $method == 3 || $method == 4)
 	{
+	    global $conf;
+	    
 	    // Management of default values
-	    if (! isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values
+	    if (! isset($_GET['sortfield']) && empty($conf->global->MAIN_DISABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_DISABLE_DEFAULT_VALUES is on
 	    {
 	        if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 5139128a5d8..a14645a3152 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -197,12 +197,6 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	if (! GETPOST("username")) $focus_element='username';
 	else $focus_element='password';
 
-	$login_background=DOL_URL_ROOT.'/theme/login_background.png';
-	if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png'))
-	{
-		$login_background=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_background.png';
-	}
-
 	$demologin='';
 	$demopassword='';
 	if (! empty($dolibarr_main_demo))
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 4350edc3797..8936cf98623 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -426,7 +426,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 
     print '</td></tr>';
 
-	// BackgroundColor
+	// Background color THEME_ELDY_BACKBODY
     if ($foruserprofile)
 	{
 	    /*
@@ -609,7 +609,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    {
 	        print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 	    }
-	    print ' &nbsp; ('.$langs->trans("Default").': <strong>3c3c14</strong>) ';
+	    print ' &nbsp; ('.$langs->trans("Default").': <strong><span style="color: #3c3c14">3c3c14</span></strong>) ';
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    
 	    print '</td>';
@@ -654,9 +654,14 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    {
 	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
 	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	        else print $langs->trans("Default");
+	        else 
+	        {
+	            //print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
+	            //print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
+	            print $langs->trans("Default");
+	        }
 	    }
-	    print ' &nbsp; ('.$langs->trans("Default").': <strong>000078</strong>) ';
+	    print ' &nbsp; ('.$langs->trans("Default").': <strong><span style="color: #000078">000078</span></strong>) ';
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    print '</td>';
 	}
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index d9c5fdf43c0..f91616d0b9a 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -282,6 +282,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
 
 if ($sall)
 {
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index c50cbd014f7..c1aa8aaa469 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -407,25 +407,7 @@ print '<div class="clearboth" style="padding-bottom: 8px;"></div>';
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
 
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("RefTask").'</td>';
-print '<td>'.$langs->trans("LabelTask").'</td>';
-print '<td>'.$langs->trans("ProjectRef").'</td>';
-if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY))
-{
-    print '<td>'.$langs->trans("ThirdParty").'</td>';
-}
-print '<td align="right" class="maxwidth100">'.$langs->trans("PlannedWorkload").'</td>';
-print '<td align="right" class="maxwidth100">'.$langs->trans("ProgressDeclared").'</td>';
-print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'</td>';
-if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>';
-else print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>';
-print '<td align="center">'.$langs->trans("HourStart").'</td>';
-print '<td align="center" colspan="2">'.$langs->trans("Duration").'</td>';
-print '<td align="right">'.$langs->trans("Note").'</td>';
-print "</tr>\n";
-
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
@@ -444,6 +426,24 @@ print $searchpitco;
 print '</td>';
 print "</tr>\n";
 
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("RefTask").'</td>';
+print '<td>'.$langs->trans("LabelTask").'</td>';
+print '<td>'.$langs->trans("ProjectRef").'</td>';
+if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY))
+{
+    print '<td>'.$langs->trans("ThirdParty").'</td>';
+}
+print '<td align="right" class="maxwidth100">'.$langs->trans("PlannedWorkload").'</td>';
+print '<td align="right" class="maxwidth100">'.$langs->trans("ProgressDeclared").'</td>';
+print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'</td>';
+if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>';
+else print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>';
+print '<td align="center">'.$langs->trans("HourStart").'</td>';
+print '<td align="center" colspan="2">'.$langs->trans("Duration").'</td>';
+print '<td align="right">'.$langs->trans("Note").'</td>';
+print "</tr>\n";
+
 
 // By default, we can edit only tasks we are assigned to
 $restrictviewformytask=(empty($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED)?1:0);
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 989424afd67..905b93393dd 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -402,6 +402,26 @@ print '<div class="clearboth" style="padding-bottom: 8px;"></div>';
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
 
+print '<tr class="liste_titre_filter">';
+print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
+print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
+print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
+if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY)) print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+for($i=0;$i<7;$i++)
+{
+    print '<td class="liste_titre"></td>';
+}
+// Action column
+print '<td class="liste_titre nowrap" align="right">';
+$searchpitco=$form->showFilterAndCheckAddButtons(0);
+print $searchpitco;
+print '</td>';
+print "</tr>\n";
+
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("RefTask").'</td>';
 print '<td>'.$langs->trans("LabelTask").'</td>';
@@ -425,26 +445,6 @@ for($i=0;$i<7;$i++)
 print '<td></td>';
 print "</tr>\n";
 
-print '<tr class="liste_titre">';
-print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
-print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
-print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
-if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY)) print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-for($i=0;$i<7;$i++)
-{
-    print '<td class="liste_titre"></td>';
-}
-// Action column
-print '<td class="liste_titre nowrap" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
-print '</td>';
-print "</tr>\n";
-
 // By default, we can edit only tasks we are assigned to
 $restrictviewformytask=(empty($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED)?1:0);
 
diff --git a/htdocs/theme/doliforge_logo.png b/htdocs/theme/doliforge_logo.png
deleted file mode 100644
index c9de1b5012c45670d346b4f699a01ab8d257d415..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16587
zcmV)lK%c*fP)<h;3K|Lk000e1NJLTq008Cy002A)1^@s6a?i%{0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBVdZAnByRCwC#eFuD9<$3;h#+{O`_Lgi*
zmMq)yHnzcL*k&Y<LIPowrcFYUwh1X|)0Sp5ZJPB@nvl{gnnhBw2N^&}Ah9tC1_L%;
z;3-?OEX&rO_v)@Q{?GH>bL6Y5D_aHvCe``*T6diDo$q|-ectzZ$M+q@wrw%9&1^H<
z`L!uCLvY@W`#EXKKp-HNE?p{u!Jx>^%@w9;3RP7_B9Rcft_#C3&Uifc9UL4Knx@IN
z^7Hcrm31^4mB;eEqA2pkeIk*Fh{a-}r>938J9cc!cJuP`#ATOVCfj$FKacfzJi_ny
zi{as6`5pVs&uokB@;uz1{iv<2mHp`M?iPiGg`%LKK%6>tN{o$-iR$WV*|r=o>>rQE
z<@?^=Ub&yo=aX%>wY7<%p&>DE-aI)T+&D%@jvSHK$Md=45DtgM$&)ALXYOBCRwl2R
z*TT)REaCNf<zII^cy6}G^YeIjU!IfKRa8_YIyySU_U+pz-sH0wM0ExuGuzB|{%!gz
zXl4HtIkPg&YgEqgSvkwt%=j8J!2F}qUFA<e=#-c6yOQ?10$Qb#3b`9;6)2IFHYV0I
zfjhJP9|EQ_jrT8Qv(l)vod(kLQ3$hLzcP*M%RG)?R6?PU3jc(EHTX4(>%#$<HhdH_
znM~TFqobDNgV^WsxXf&?FfcQPPx_(I?g|`Vl}>UX5K!pEpUr`#z|m2LpxLfd4+r0N
z0m<L8SO(=hvZh(bf`j1m`4rdrPv6|@gY_H#fn!G?78Dey4j|nZHwELsv9OAZiwR6~
zXlTgj?(Q}diG+DJr8N^(|G#H3`BDKuH7_qu3RX@|4nGrYstYtXs+H9_a(=I<sBk{o
zb~GBbX&oSd*6{E!-&+)BN5HHMD{(#mG;=HnE;TndS0Sj<Eh8_2N(kSZuzs|F{7NY)
zDN&%zIDRmix(7h@D8!}5YnuS24{yzQ9M;n^@mm4_<++k4PMlzLm1AN~MQa&JJ<~my
z+5R+u=?WT!PAe-bQ}grlb=-WF5(NR!Avh|9jUOFhRL*2E9eJhy#J`r`@0Y*>AkCtp
zB3cCk(<FTx85vOs*femyn*QkcSO6p%`YOjF7z}FsOhd>qN>?DXe7HVfEN%e67OqWx
z2kT0pc`#;P4ZyTDuN_d$f`UZfe6N)#j9P)NAz#5^T=|%4By@~ZjA8f6%1XPlvs2RC
zDaJ&m5oWgkI~G%gl~YSgOFcT|$x?L_+8xwQ)d)_Ahe~cLw=?2JAuI*=(RCXRl_i}0
zO~@&*Y8n8&34u2VQu<h+aV7w20<6|~;D1U>iE&V2_2gIx-HWk+!BaJzsVx5Put{4L
zwkfT?$0sZ!$=yMH6$_(8Fne)`uIZX*PWaf{D~H-{4kSgR?hzuH6h_3a?>|;J?`tPK
z<q!Kc%}@6emf4~O#+Z=lPP%sdE^~d%>&<L`y1*Q#Y|#2D{2_>v7m{e@)!O~*^n{%U
zY4kvwYuJmv7U(RbN1V}O+7_&&p?D$*&EGes1qKY&8wNbb0I|5&Yx@XR6D9%sCLm}A
zEE1`l^s#73A#_%nANopJ&hfDzeV1e5@p^okT~KTHU92YTAg-Nbr@=c^-D_2Z0$N}t
zRs8K!g8PR&xvhYvBHc__OT6(d8G8Ox<%4~1nz!Ln(X`<j5zH?ZBi$$T7asZflH6U-
ze<iOt+;AwT{)=F{%uicT3U(wCv77|DnXaIigirVN`Imk>%rvd6S4)L`V>5xHKLLwL
z8^|C9q(W14uT^Oeu3A0P^8Ix4HEq*{oh*};7D5;%+$BYfCNwda^yYMp<P`7d50q~U
zYdLL6-8-a7#;BXgq!GiL1T1M10!cs1WW~s<5uxN*fGVo=4;7EksJ41Gt{QFmhN(<6
z<08YXYk1S?&HK&M`77V0Scabw9#he*xslelRF3q$Y3<+ME-rrS-=Td~SV>dBoQmcv
zZV(TD_5(tB^pW=udJFb+d5Sg(SY4dkz<4NbWlQ=71ty#Tnn)%R4OSrVX571tP;M2V
z&v^p_0}=T2m*YBm&UB440i@ReFzFA$ztQklx5?HFkxQ@d>JNWZR5mpWBaz4o!0f>v
zXl@8pVk|6%yE?r?ohOP%dwPn8Pjxi(9%;Ea(tZ4ns9!zUm0$PEu3+Wni0bdqL_8OA
z9EZTfAYi1_N%&a`t>;Swr*e)~mr-bi7E}7y9&quPm21L2Uj3oZh?3b2u=I&Zr_jJn
ze|PssMaRBF0j)p;aV<L8ye>>%*+|C?br-G%DDMzPECx`SvM0%S6yWrUtM2%y=svJp
zRQI>t)LmTkI1HW*KUJn!pq$Jp08|aD`pM<Xm*2W_<psXF`a0qF2V_v_p09i*vVZ?R
zon>TGZ7e670p@EU_`}E}gFU!e^r0B=@ks4lTPMorEfOY#Xu80ZSa9krWt>Dg4c6Xc
zN5%2oJG7%)H#e8;-rZb1aP)1bitB&akyCqrLh}szw1f_!jzTD9u8%d6jOd<))+%QK
zq&NqoFVjO%P^5!0=%uFUt0<mTFDft=Mj}3`SvZ!$8_W@)@btia(jQk<%Wp<2eQ~p9
z&Z_nB0n`*I(*cr9h+sjHsBB&)Iv#msiN7#W7}N9~79vnVaB~7}GW8^DHcfN++=hnx
zuYc3^^-c5VlP}BhWt}X1Q_@)v(_3y$Y34@Xlx%k<s(XF{Q^}+@%+WDm;rLN{N^p|G
zf*_uY#XJ*zDzBd>s^%{et8RRYIJy6MvF&@`tjXQ-#GPf~lUE%mS@OwYPiU_P))V{6
z3K<F){7$ALgqS+_nGVFW6$98A?<ZXa&kIT~$AZ4Koi-MR9E*6CU{}h=L$_6_)KXG!
z;)6$FBv)tb%$~ACy3fy6;M$wI1su|c%%q#_SAAVw>GG8;AGqzdchtgSiX{5P!tA|!
z_lVZk)?-71gU4WH`$2(YnKU@P7(2cCXl6T)sVoH%^hTybAV3=I-OGOGC}ajK1YfkM
z)eD!1n?Ca;@xta`i_M?^^ito6XTN%&YRN~sJ!M<a!64Htu$(g8!kj0CP)yA2r3Y-}
zi`PK~!(1a@t^m5T0T|_E3I|rh&M1W&M*xKv=aRuN2~GxHr+bZ#yU8fDLb|GX2NJ62
z?`u6!qw1c?$_k3dG7QnzdQgmcy~mTDz_6N3Dp7z+CPUM}$yp?Mq0sHuU3*<EXD<+V
zPdxDl@#rIu`~uA4%ec0uvCkOCiA*CM)b7lU%F4<aOZi#?CVi7}U}~CTCm~mVOcw-=
zC*v^*(8X6>C(7qGi3dOS!D97=y?1Lh%^&XcR{jbeQh=Z=C@8Q9Bnn%Gm6Kp3-DI$a
zMF0+%NCTNeOl5Y&cr}vk<WHH(VE$C5CGaxS+a!f_tqR~JBhk}GC2b}+tfg24XF~A~
z59gOZao~3k-#T~g<)Z1*t3@&v6}Djt0#*0=#MbYAQFQG)D7uRpA2Nj&R~17RV33+R
z6&Uh`eif`*wfb-C>g%E046)<6?c!GtJ@gfP|99*w`#cqWWqx$_?Aa5hO3iGq0br(S
zS4Bz5@hhWNDJbDlQ97ql-1ONmi=X`Sd;RvIeg835<v%r~=kL@t(@!f|TwE-zTUS??
z?UoDCCuWcapwxoFAY(Pm6foziu}X=6bwNc}jcg9ql*JA(Qij2z09X-ocz9T49@X*V
zq>t(PcHC6u9A?QW_C&62TY6jmy!#4zwy${TKmMWV`1RYxyo;|Cf!usC($^*S{q_NI
z;L%@+u3*8IQ^D%rXjamfG>oJ>hcMmhtzEmep|-ZBlD|d9B4W#9TaG{T%rkfLX3-LI
zJ|chPG4A|8zUOx=NZ|XKfX{0Tm=geMJJFk0aAO2FR9Yc!`1IZ4hqu2yw4ncmf8Abj
z(QT&g8C7jN39ztY$RbT66(#=gSpzs_xf_0Gz{5k=)Mma_g{zh-Yj7}T3)nwJWgx|p
z#}kN5NhAPJgT)Tq2u506MyUaA>~AUJMHKPN{3fh2&gF^e{{CI%t3KE?xc`pf@7=e0
z`%mu6_4rf~k6I#Xih-V@+DDG$HGItk)3;NW+IE!01QfxSth@S}YZzdXlbrke`?dj$
zQ79)-RaGVZQYXSLCkwkwfx(^`P`<{2`Jx(wPo_%RH<8xaPC&$RX2hRGl0^a(kCD&I
z-~U1J^AFs)s6Kr3wu3qIzNo5(AK+s>sa;xHO7O4*PIJlyfl2T|bih`1+oM={J}Xg?
zlN_F%8y{@&n8`94JyY1DVP8>e*c&<$(|xBB!ZV->n_%{#nK)B5*ff>~lG5X^^i|JU
zmZdg0U3>v_nO-v<vJ}nOU$o?&oKX1D93wIdmegbAYO$~<@93BoXxA+>7srkniW0F?
zIZFEcahGC~s^Z$K+|>#QOl*5O<KC%b9?xyMlL*}RQ`I(eAGGCzKFSAe_RAQ6k&MCh
z<}w2ulXLb*-878*ntVKceM`f63N6b^Hq?#%l4r}Sx-kOuHH3Y0@tInPx-^W>!?M64
z?Ra-QTu(sS8>bM%U5UVLcRC6yH8uwO8$v$<_`<YoD~k6+_{}`;fXSQJb@+f7?(P+;
zcAB25x+Xk<9FYThm0wvce7SkTfKO?r0ytA{@km(AU;jGM{Q5`5*l#x7dLmHs(3s|J
z)ot5LOG*0b1Zc=xy>RG!rs^?s?AWZzXy;|+!|m65<3_z-5xIdpRrqmUCiIyz90PTX
zCPgCQ6`j5LvwnFhr~0>HZ_W`dnFx5L>}!dn6JcVyLQbhsgmR|3;Hjdlq#Uq-mfubk
zuO8a<RS}C88EDy31#9faQ$H#LMUWHd01@%$?b@Ed^gWg-r-LN`#EYAnnwH6EG~_ZE
z2wbgUkfAwJOMoPkt8|a&-Pl*lxF>O3%MbB3;tEx|AVM(n0L1m6zc-eZm0b$37yA7H
zKYJdF$77LjWU#llXInTNz8`HrhW3WCT_>qCEwifxxZ!gV_P>R$griWp@w(sfZI^{Y
z`F{zf^M-=L!m{C^Ax}$7%PREckgEh-Dt@}JtWZfTf|9(Vy1M%2;*yd&$Uq)TvfyVY
z$D(7SBg4bTW3lK@amb@M?_QV6J2l?7TBa4UQ+-K*(tjUvH0F*6&&TCbrUE0BWGP&W
z4LP~FH<njatj-DM6!`qU0M28^qBwat+}G3Hy$RR$b6mp{R5GtRFyVYjA$<6A9~14n
zTP)2lOxL%9q%h~A!Ip`V`UX+IcD-0|`PHJdu2CeTV^eD>M}w`n;V;CY&6^5q#yYP(
zln1M6nXIG{jt|M3?i0F4(E-4^Xvdpt`dZ#m;1N}oix-JmE7ytAh9*&5J4Xcb3(-$a
zB%%>9*m+!Zw;c3#?0TlI<GH8bU)_KF?H#4{_Z|<{{8*^|Vcnu@r^i{KD)W~N;=Bk-
zFMU&4x(GqDtYTj@+SqvEI#D)vepbcA3ZSFg9upnyZ40!J6*Lqzf>Xyrq0sf$-|*)5
zv(kqXstJI6fFTkY6J@2P;>|bR{3h)8rc6co)RSAy?(Xj2;94T-76Jn4Mc;0lHEY&C
zHO-&jICpM?C@CqCIoOmAg2l5e9{``<-`_u{t+n;mef##cb$56D7ta4p7TKqti=bS-
zeEInLLXP#RUbwLNo<)lmiFhI*p7_Hbc10rLpXs{yQ;Qcb{=kx@%hamsDiMUze&mr~
zTTedu<ha$MPE23V2Yp@~2n6p0EBK3s#zt-S>^btBZVr}K6W0_3RWCo$(Xr~_p@W}3
zc;LW&=+7qs{x*Qq2gUPWmt1;T32ugX_St9H^sg{3V;L^OWI)<BEV}i#vuDqK-@K-#
z%DTFGxsH#=87oJ@1)wyFySloXjvhVo-h&4Y?ubMpcj31mzv>o~bXB(vF`S?G%;B;X
z_i45)R7vPoLiJm*!cbzUDW|o2!O=b6T=DD=z8k#wZ*CWBZhEWC1x^J{R>xE=SRyK#
zn?&EfBOAQAb>9Pz4J#>MPZo!RKPy2yI;**F@4pv@!)qJYUn17N?QcXyQ?u|u8<-{p
z*)S!Q=4rg}!}80jME$CZ#hO3AP4pZ+B%b>2*9rr_-Sp38fvydEN|t?iO!K!ZR-9Tk
z=?I9X%DnD5fKwJ#;3$i=?TU`i8syWQzwtV4+4XM`7JO-uo{?n%a!#%Y5A=%GmbN5o
z;w{^B16YZgni?5Rbqu+*lnIPo5ZBY(+&n2Wiq4DOyLOIRju~SF)`>7Lg)jQ`wd>Zc
zUbJYjjKZ_8QTU(G_+m^dOMngE7eWBJAXRyJxmdbvS>679`@Zyt-#>m^S9kZj(AF;Z
zT#S;_x23?k6qbHKL1BT>&^S+r6%$*Zcw*Er%zOUq+Sk8(#fp{EKTauMx;ZHUaH%(x
z!Fc2tua8`K(M2D*<dRDXE(r*ZL0@mL7#<ms_Z7a3w2ZXe^A{`-1n;t?%ii($mMw2Q
z-f{e$XyXB&&p+DG&``qr`N9h?j4+IlZY{ZBR$pJ=1PYAbFGWATb<x^&bLY>WFBjKx
z<`>Jwwm>Q*3!`t(b3@UITD&f}VATaXcRu%{r?+jp6~pj%Xzs+T>SOW-n~D;SYyLJB
z4ka!-9@BiuQ6=B(@mD;qglunK$;iBh{)6v%^gr)j!<%x^t?v|xvB;DZLiYv4f-9~Q
zM|XX0ZorDyhPB`k+cY$(tyJC0v&UvF>Duw7Le-kH@n8Q{thnxG-e{48(3<1L5U25k
zQ$i@9*_})Qqrf+O{0m~&>Ys?s|MlsWE4p|5&+f7n?;F(vZCVN#)G)d|acPigGkob@
zGL>ql^1-C>R%BGf-D^G_1Q%X>pdX$(3!DH|k>;A@05@73I&?@<Itu@y=0y@XTtN<i
znN%o176bp2{<lI)#*_=1+E`y-|Kr!a{`DoLrDbw_xhmYjg9pU%_Vy06^%%Z8?oi1Z
z0Bz$eNag|vJNE}TMOAh6ip`rh{jRsS_f}Bf-*II)w!^ujwCEFL0Sb|z<mz|uB`>;Y
z?b=J1E?p)qD;34@<Hw~kIB}vQf%93e&^xQ;d2!4)FTL!tzgoHS0tp@}qrH3fh?bVa
zV*u|{xaOVs%Yh8QrCD54Q+sJ$U0oilplWJs#q~GbQ2g89K6?M&y?fsUS&On=%8hAF
zb_Ltp+s8r589RlA1@Bn7a^*djUvZ_6d0+PVz<~qeNJ|U*yJvWK_(@!MFJ%L5)|Z!8
ztOqbF7c5+WaVQmQ*RG?odLxv>0$k^HX!_8r223TDB`~2bql#@YI1`0NOUkICZA&nX
zYI%otm#zHwCF<@EKk?NsT{dU=YEj;>AWIdEqq*RamEm{4M|ks+BlE(Zymn34nx&|Q
z*Gd#D?t1R-vY>CywIBaa(QwfQnQ}RosH3dlNhSd3KNkh?fq(g-_th`%+4b4o6>I)3
zq3Zn%&WKc9ItzBrX;nea)KZ;716si8+S^nbRA^2fmc{7b`qsVoJ_K-)E1C-zE_^R2
z)!T|dKL-Z}#M4i2`!a;|JDGV_SQpOP>Elw7_<iO4`3rt_^)=TN<iffzLc0rKf9|>G
zHUkWw!+D;9B^veneX@L#;0I`PA+Q(j+PU+emMvTU`U_UAg1{Du*T4SiVqMekf99E|
zFMsygXLs;i^v^iifL6sFe<!FUg}SV~+(S#r&-?f97dv<EXz%Xo{uX}Qf@8n}yV`J_
z<GFND)$godzwwquOP0v?+S`wb-#`BQ?$*{LpM&-L8L0O$riN(cTtK(AwbmX!eCQ3k
zcJ2J&rI%hddu~I6xZ=vI^pTN~Z$c3y44hlb2=Y*&;oRf?B|n3HzqzSt{=FMEZWMm>
zg-c>?ec}&BYisK_a1ZW<ce4w(#v+J$J-qIdCp!x|I*za1y?fUOmakZO>53IA#4J$m
z*S-GgdGJ3U#(1xVBI}v1Y)&7TG&SxkD<sF)kTNA8Z99PhWA#ab#Q{!fonO=J95_?q
z!-WgJo^$NU<@+9eFjTc*v9u(oryQT|JPXD1L8Wp+0g)f;Uv@I5<`079ZBWR~1AG6q
zNVOW?^r_E_x>f5$Y;;IupM_?h`76ASjSPu8_@vi<?DOJ*5C6l$g#&v&x~F)>2Vr_l
zRk1m#@^lDKhMF_S!XenF3y4lz*i_m{m4KTtj%m|W+%{cPtBe;k@E#q9U>$NIuoSEg
zN&7f$N09-rRw%vgS^Ogbp%jUDoI?7`E3Uk<fWFxXXxOIBn?{bcwcUYTze8a>y#}o^
z9>vA?VYIucv$Jy(sN0RFPM!RpjhA0hQUq{bwtju6udnwPuvnL%Z^w8HEs~_h84*<e
zUB7;VtfYdm6%gJ}<MKX(-$vZj4$lv3F5iPX{|C-<3w%^g36wzo-ESZL836D;Sm=|v
zGLWZ?`^>3YY?bYI003VFfPRX8eeS{wFS-p@TA(d`|GpP=gKmHmR8rFVNJ~r_>L`Wf
za2xJhzhQ%<&Bt0>#bb|cejdPm7utW8*N_e__uT0J5XS4*7^h!vd+Nz|oI2V0<twke
zDnQ@;y6fIJ*X!~82$uUQBQ?eGWww}-2bz-wT}e%dPQ9ep#J~w7n^6~-q+||2!Lkfb
zR1cmQ&B=TI)V|&8l96FqUSv<63(RP=2<GLAP(_9Cw)It@ksMR;7_%d-*A$NoU%LLz
z_XAL?MQnIrdSTKtu+jL)fM~q%5^>?%-zm0y>8qDj<(#~_BRKmZk1fOFhHy*rEQVE$
z)N4WrR&i{WmG%)DBxPykD9O3hJl@O_w4-rOfm2CgbG%xKs~_-(q~lxb(h?;N;mn`*
zq(@sRC=@CR9RG$wq0d}$>18#!@L@+s!{XszJrp^7`0x$zi#EHK?Q9#`xqtKK%^d*W
z!`Hmw&x%8#e6fDR#u~`kU9bc<x{E=RT903joNG(!Z3&;xD{1JaO`HB5{rd!$n@L}s
zn&}@|YM7h5V)dE}|E;O1NhASE&{kN=E%)QRx8NMsR25Abfv^6;!oqj-^mIqJZ-4go
z<;z!y)oU(-;z><smB30%%Pa#$=QuG<hV$IL?&3>wzz8JGf9RnHcVHZ^_W68$Q(3$8
z@13##)`0{2JMr;>E3bT=ue_{WEMBs716+~62Lt*1%L+^@d`j3cXlxT2O7{s_q2_3Q
zMLO_isyJJbX#mi8Qzq(}cHp8?Ogm7Ul9S`V1olzm{=BZi6URlQuUq6m3&VGu1RmNQ
zmaF9yz<;s2f}FA8vEqeQ{cX3_E@=?UufA3!04Q+=;iB<jewEGA%B1pxN><>;hx^2;
zH{L9cY<*0O9%y?@x4&YWrLa6sTEvu85L6~CyqTD&qa+e1T0^Ovm9!;T2xc>mYn@Ep
zZ3DN%K3xKQrW?rXps$n-R18eG#qZGYs~0vex{1LV3OZ<>318`*pl6#2j_H);QP@a_
zVL6}Kwr$%j1%-tVZrpf9u&SzB%$wKrM)+~-V9B0zteu!pm+UC={{8{6d(W=jjg5_;
z<L|VtJU5jGX((4?aH7p0TDE+-9A{G7-#`BNc38i+;(DyJtty{hNWnnVnl)?gxbMFE
z=Acj4l)&$^<ajCL_l*4@qj>u1r)6JZDQ~|1`Wr4QC@2)5pNwkvpuHOb@;;uMeRVB#
zy0xSgP5+L5cO)|Q=$<`$?kFiK{W@I$P-C%t#flGv^78%{JN3VGV9JgNG5GsW3V&;X
zu(XiSLsi04+#vM)Swi&}2n{dQpYPByXYm_bN+;_)Wj(44(c(Qz;bbL@P%unt*o4+k
zj*SQbs%jfXR;$LaiSD7$Dw+Xol*ap)=GjK&>YM&tCjS!gu_-6Gc>Mv9j73Dhqsa>(
zI39e*B8F_VmT$d*9I^V%w}_J;|HRzVSkJnX!P-r!v2tqi2rPqju8Bz&(^iZr=)TL%
z6T(i8!Tv@ky90)r0<I#&*#b?j|0aQ{oEA!cM}LWb`I<9l&Ijhro5#qmICb(Ah3&`q
z{l}z^3}*0A1816H;tCv739KZ7Kel<#?%iLhudBavPF<a-pF3Aa8y|o$Ugy%wREk4L
z29&Z=LY#mC-o0!0UD!{iT4*I1ETXWppF9@6=CTC~7TlN*Ys}yG?Aeuo#r$gkR}L1V
zp9Jt!3d?<L0hP%2zyEy!P;v!`+n?L9<An_yFK6Kf?20)dKT2Sc#^SxNwzl?PX3v=;
z>2u5BLju(ElVAbuY?DgNt)j|2r(<yBXGVu#c;N*qG5+=q{B~_!ef_mm6wS?xN_)Dy
z--YY=&zH?&5;VqW9|pQlBzjtLr?#ftDw(MC2sKb7%#lHS&Y5J|Ez25TSCy8-u^u?o
z4r)658-`X4+%IO{?a3K>JArd2qVm0}2)%5yV@+X2NX%Z?B#dx|wM;8(_dt^!c>EFZ
z%+G!<`r6v0{1(rt6BpimqnLl;#q_-<__OYoL|^7CY8J&c#iFSH)S6Sln%_&W#0~xs
zR0LNtk;T{69lEb%cg1OCB{0XFi%Y*7)N01G?uW_cLmXf#X?~$Q$C57qsT95?3kO6p
zDQTe%%kzbXhK5Z4D66pZHv)%%<nvM7eE_7df|k9zvZ^{yE*e%<bvbBiBkpSpEp@6m
zKuJ+qr;kty5eVc{t|jNj^auOq`orK?Z>AMy_GD;iSR6Wd@b~zA55edHiGXz?%#->`
ztHu|Vjq5YwnD%4Gj{Ts!yXSAp%gdyqaOIQzApPc;!Rjq(XlPtU@U#AS|NedL0M$2{
z2BAfCYnIPOWw|Y0yjYNmJO1c@gVtWVdi90!dPDj7Zv!~L>=u2zbRSbm*$Wx;*D^ty
z6v^RkA!{9!Jh_glZLx4X$y!qx2Uk*)E$9oSUc&ZzlF_nIWuEXFUBVa%1Gz!8?-Pn+
zm{Pce6^M<BvB5rAYfsE$CGv8|h8EUdbfF0NSiUzpZmH8ZAGFxcM;;Wv{=)x?5x@6n
zcfq_TX>!Y2+t;4_#OLO|?)Gl6;;O4)P2&?m<TT|A_(f%7qiE@TcAhTGyrhuH=v2oD
ztaw<iqBYsqcIfC-_Kp-biDMI4EGEl#t?2<%rcDe6z^w@aLhbD=7s}5YtE;L@QUVwj
zr%s*RT2fN7BQt=(jg&5v7V|r|zBa>Jx1KoB@hF7)#+=+7QCm|Re17lVO90{)#~*b<
z5~+%vWFkp=eFW!iXVliUtn4cV-m$V8KzLnoNr?nk`>{5rV7^IOo~bklOezEyocx`%
zm_Z`$pSk7dhrYIQ<puBJqH63<deoR;;R_1nGFou@!=%u#ct6MWMQQ2ICCcwA8D1A(
z7{kX-c6PQzqhpO6m%@U=IW30|&t)0qA3t5<fYuR4HI>^@7*6(z)O0M%DU0&s6|k8F
zuo5NtiSWW)Jt+ns`!`_-KPWLk9Vo>M)YzK~ON{RVc_I$qYow=7B)vubnq>xISaNIT
z&4oJ`2O*A2@Y>^r_qL!F?r%RL{_ve2iox8_-sdY;-EAlynbAL)Q~TJGuI>N0_4_|u
zJh!<~<iek@Ok-lclT-|(xwN`ccq}Vlw~~2D%^P)hkW@4=Len~VAWY2x*A&R4wdJvi
z*yLl?WGXN;jkF2@$>NF3oE$9xtsFO4n)ytP&}z}|85$aVqOY$%YXF7cxuBsy(FbH8
zC!0|6JJ7}5!$U(i2B5&0Qh=ptloJHf7Qv>)q=jNZ0CfYW?YY%D1Ybt`Ay}FU{!ZX^
z_jHHRhbL&QCk5#MLLSQ^1n$r4BYkE6nL^1zHxB`5o%5QSYN_;Hs?Cl5E!zWV7jote
zthVUy>*Mt_;q!k@Conc;FcIxi_Hhn%cz6iZy@VB3&_{t4uM99VEA%wgqY61e+0s%Q
z!O3&+&gYn#N7RqBy&>05l-5*Jj%{H=*iA0OXmy`vmo^=AA^L}fV4=)tQPB~ND_?5D
z6K~rjdLG*ipFszp^MwK+v+hszg@iw^P;~4*2tkY|+iI8o)D(II;F4>=nu;fKta#qf
z3p$@`?m60`7Oh?(63O_4w2u@P^vUPfg~t{_uNlu9({g)+yIQ9K7Lv$fF{L!>Q(HYr
zWn;|EIKa%HvPwLAw00^gYfKFOu;1=u?f4!RN>;ki3Z!zGdRI2VO+TLdGa5;7lh&QV
z$2~ecGAv3;OC)83HK?XiaNdtwOi3>pa7)eZ84sRJEH0N@E{+Q_%4~spMaQBrenX?_
zh31(7u9lV-NwEoDT0NI3Wa(=p92q?Z>tCDh4{~#TY<yQlw8p@oO3@a4(ra+uYhLoQ
zZ%RthdpurQn#f8m^r7OFt^7%;C#poQO~Mt&RcS5dDjTY1rlw-~8%B@ZI;+3!?G5vU
zs4AB$=!x;Ej%xbS<^U#oI0_uZEX5f07PM;M$PBU?pw43_x`m7vIhh*w{;@8%zYW6c
z)8cW>KLF9B6*p7M;F@Y&^$nYvlI+>D#aFH#k%mvvyn-vKz!4UzCm^hxJYk1VNuL&t
zd+c;)G!9J>ALN{dv^b68{Ns?CQ(8<~c-4vs)r?QtM`aLXnzhev;y!)tAQx0Fom;SA
zK`<2%N>%<~|Hzrr4HQt)xTl_a>a6F74<}8&;fw(Qna>Itw|-O^4^Yvnr*6`C7FY_Z
zhgK>*%FNJaDh*^v3mad!aAEvRk!hZbbemv1Qvi$o0G%GC<xbIfx%7)1Lq=pdHY-=I
z^eOUsQu|~J^t_bKT~?I+%pw1OrGW{Zt5~vV1*SveTtvvaZRY59qA-*gSx`IDenWnA
zcsYIZ3zlV#y=2z1i{qUDrta&GYW}XEF;)(x$_Im}ihjCIF5SxVJ$-erWd(vpxH77h
z_Uh=53_Pj25j3M^9>w;mBOPLBUxx%{dOz46*IFMqC0#~HiRuc7%n0>8{h+W9dLeL5
z=v@A$O6{V<wN4E52vwWBG9CT%aO)n?t99a>q|5qvaRCK|5#+>R54r!eZnUfewk9qc
z;y$$1v3?2WI%!!`5lhvloMEyzk73y#eJwXYG}Q($6u6P$Sc<X@5oiP|!IH`oI>8^q
z5_U$Q*>q;coX)>mCM+zoY;K;>3k&CQa<^GQ$u<~SW}wH-i%xZ2Py``%A{G2O%?=1a
zC$N*?Z;bxKCloD5T84Gb)qNSKBd36GD9L1E^c4lBOf}f?{H24tKIloti+SHb5&~W`
zR;rsui4OoR%on1uS%{_vSHPxjkKv;cSj)a%P?tc_&V-^5_!TwR6j~ydFg;U^8QUx?
zhSMLkwYtG0w}eacPDZsrFU*k=uwte41BY+P1*tABLZ3Am>74*<$-6Kz35Wz2tBz~F
z5hW!oa<^o7M8xgXdbyb^1*uMaM<~859A6P*oyWys^tebE6VJyN*KLpWrmXk$fN7?x
zf6@eyR?B@VG|TZ~oMH!IXHhz6S_OTxY*v%)F$c+Dk6UV%E%4%=r>d%IZVrT60uulm
z92`7JpNjjti%{FPlW%1oGc+(Qhf8^#Hp59H8HL~mDZ(CIF91CaVV|+gN*lMLsI|3K
z_LqJlt(;p6n`O(JJ$p_aTr8OiNsr2Ma)9$>=^-AUqvuHQ?%lKJ9}gZp_<)<rc~N-C
zGRKom<>wcSy`sP*#{6cyBriF9VL=WT#7e0NvI4Gf0eO+s)vKrI>)EU&4NCh7P}zi%
z>@KQ&3?R3Xs;AFTJ%io7X3o62Df)qSa|1%GSOh_TZlrNp*R%iDms_@j>i`r*dRG>S
zv8rVYp!I#Jeq>W^?AtJ1NzFTC2rZ%rr;IBtIz6!h@ASZ*DR?8(OP-W6$ONXUrcwH{
z27gi&H7Or#Vj+MVNrg2yGBy^G(OahiXf3I3W}=>g$I>zP0Ywx>f}8#q+shJ_C5Tth
zZ(`dFEb&}<P7SU*1IChmur+C^PWPPYb1qq)Hx`KuB;tu;_7%dL*Vos#25mi%4mNiU
zCZ<r_G!K7g0R;=`*_ZVFojIA!Wo4yRB31b^0hp|{rR6RvDmu&n4Fg$Z9CdYdYjB=#
z(IUISv~%6q4~`>Q%!G_VmVnkPKxGvrZmF^6MOI*5y>!D;7ReEID$nFJG6H0CLtsRQ
z4}((X6m9MI6z=d?rZ=v5dWQl9+xq&uZi>Ro@p-dbU7llhC4Rq9hyzEXl_MkV*UHcz
z+?oaGS9#&o{ZJ&YNd=uE-rNJGs*kdo&?%ZYFSb<h$8dr_%DB+FrEN}1Wz(rsr-sVP
z$_rTeR9;@O5yHCy`|WgnL0Y-=#JxM2+NF9FA_}`3WO7mg&4q=9m(v2p6LHbo+cO6G
z`g<2NZrd_9X*$85ELxZrIc*MS0>^D092#saE-Dr!pv8v{9enrk<HsLJUxk6xlL{a+
zD8zG;&a$t`w4fZ%3(&nc6v|iR_llTMU_jdLe15#YzfUk-69~!$v#+70g>o9DGCP;&
z!_ayI*z!JLtXAOf2ClZ@tnu52et%C)Tp#(BiORaZA;*(I%u-!@)&@vp_wI+)imTDK
z%7(AwW5Sj*R)o<LtbC%Xr|YH@U7*CUnu#eck-#IREeB<dCQ_a7dsBruXHpJ2ltO!V
zibnUBmOTSeHJqaK^9Go*yv&?jl1CwP9x1{1o&9}%PlQLq*D`HVT2`i3R#x5tK-}h5
z$+$FdDk?_dqSbu<`RB*awQAL>_f%F^b1`dywwb#49R%=5S^>g%y2Q$$+vyv9QWwO|
zaX;wo>3MfSe#%d-tg2c+Ffh=JefDub2BsLOaVIHfTJe;n&6l%542QDf8XGDrt8NGe
zbH*oNyXg|QfP(ZMpLgM$hiYnPHTk?g_^q>Rpw#Zb_5VN8U5*pyou;>)X&q_78TD>#
zY?R~XR5Sf|ef``^SnM)1IEZs~aVC%T(k<pWE_O3%<)|02(e>DSK!{_<gg9O_=NrRX
zXrE>!HG_-rsH!%g7i=GeB|F#>UNE~V1tim+Dteg$BrE!)^M4jCLF*m|3=g*pG3d+P
z*XJwQrdoz#sao=t1Ezh}fj^zcv?ftR247roK#)Iss_Wz%>H_s@C@%zhTJu+3U0n}7
z^UO0p2f)PH9ze`?C}f<*L~9iu9lfHdY5qHN^KzlwlAP{j0JwKi8Svbv6aT462`P(d
zO_>jM{Zc2w`!w2nysD~tJ%L$MQ|mX9$$KHp>)YFp$L7qLBPUT$m0NVJJp0R%IIg0P
zW4=6l_UxeP)E29px1O;^xD$jL>*?vatGlb~8yF)w*A)Q!7xd{jXm=OSJ9q9}Nqq@$
z9>e#vr0f@22j9~rpzljI06@Qc?YfIEp%rG|+FFke@7}%p?&%aPs8eS>WR0vX&UKx2
z`}72;7qd}$A3Q3=o;^Zz<&-?ynp5{}#gNaL<oYa}-x&ishmM8n?im~r_Vb5R5!mVI
zm+9yjwzaPfmU2jlj!@lql8Qd8r0V1hae9&I>7<PuHkaB&N?$3{KYTjDAImAoPw&4z
zUN1_3f`)B9uz&yk!w?i61EJHJnwq}d+}yk&GpBc^AO?W~(5;#^d-e}uP5cBMr=guV
z(eVqkyOp5j>$C+-mE@)JmDznv_fZb+3&PF^NqxMd<G54^exDy!zI=^gnBR6Mdrvnt
z!Epdh{nDH{b*~Eqf)Y%Y<CBZD${#8cPB$ay@cz49U8kN4N5V2nUR_h0k8%9P(W6J3
z+{!4j3m(IYAcB$O!uJksm3^d72}O3rqD70oz?mhCjFS$-;(h`BIF(GEJtda)X<yFG
za3o6D=L9n)TY=nk9Oabd+XtZS+y%cfkoW9?!iArLnoGbka2gp`Ym-kA(9ER2%U`~^
zIMn|`{qV`ZV5GNU7A#%jrP(PjEOl$A5G?>^PpIs{ZeQ7BnrU#BH{-0FS7T0_4mdN5
z#)*WpkjC_>sy)7LZu)&m7rxUz=ETh{FmMlt_WqZamcy6KpTDq@f;4w-V+cR}629T>
zpoibrr=i(!o@;UJy>lBHOSnI+!=Zx*PPMeO-03VxEv*IHcdfOwm`T%_lbKBk>XII2
z1f#aZVzIA5`2V)Buvn1RHa9Q+bFP30;Jyd_=svqrQ$nDW|G9ACqIYxU1%e8I6I?6E
z&bSLMou`GxZ*eG>f55r6G&VNrUXNFxjoF6|9e51m^j4gEv%A8cTLbJyh~0&@`SSU^
zZ!Ib+zGu#ydOmbUwvVxT2JXP8ryJp&bVvAjatyG1e1M`_*16KRb6rY~{Upr{M*+ya
zpsxVMshrY>_ZKvOGHEMN^F{(UZVWd+>G&3$DPie~8aS9Y@AHA=*z9MY8(K$-+B7Fs
zjANhkvs6-jI0{fc_dG!9FL(;)|17K#OtmaV1p|_E+{|;Rnq=j^DHFR)?Q$OFxp7(3
zS+7S<)`4)@6Dele?2-)X$<i`LDcz(y_G!oKjR5EG;P2$8z}XOj@PAL&^tZ(m@h{@{
zEfAWBlR9vL%~jymVZZm4mzQ5#QBgHM&$GS#*btY@IB?)VyDQ*4XSQ6cX-@VZoXRBm
zzOAh-QwHBxR#sLAOL-LpTw0_>ixyws-rl|%=eZZhazU^TSvZhdU)b$0>w<3u7~fk9
zUy+uJzaKx|j=zZ*_V?S)Iz#DwWc&1Y9cHi<vi8?Uj<kFm)>bN-1q+(10PIarWL$yo
zzp>vA2CLj659iz**ULkp&>iq;*O!&0roV;5qs+Co6%`fUuyNzY*i^aJvjUSRqGfUx
zhBMEJzD-CRoEZqTkd&KP41j<yxo@9LPZ;e5v%h{MxBeT@wo%14xf}#1TgM>`1|N?A
z%Ah;X@=$D#*WOdG=+5Osd;fdK&XLuOc`Tln0-0f)9iZ%o^iOexyIVk^kATAZ@}7IX
zaPfzemKbC%fE7bj28_sBd<O5ip(`opO4}09$#Z#nAlDjV)s$%@<<q2@W6PSyv?j0L
zm!48^qpUc7JFL?!IR6i3&6-o>gH@&Qg!1#R9O&=Aa&&a$1pK|-ix)3G!2L1KO`vMa
zgTb6yMlMMQg)<uipd5%q!nb0-9qu_9^dPlMw|=fQnaX1Fdj?9FKXv!#IzY}O`x{zY
zkNnUulGhTPJby!DV|7`1*}o6;5By_19y<sy?OM5VWjD@S2$rxEuLYs}f?}?)Km~$E
z#L3PR0v7N6b#-&!1s}6n)>YdR6$BXuSMzft)39v++t=3{L_fX=fNNYmu(GO}DV&@7
z2l{Tp7#tmoM7CE~SGS_?c{pw{&kc%S&ZSp;exIa{LqmhG#3x!YwtrSuR(g_@c{+1S
zU0|j^|09(!j>T*)tjt-Z=(yoVDjAefrkKrix+G4{^tCl-f46nlj1mN#Z50j+ak2}3
zT!#>SgF=i13%0eD&$+k9Tk@nx!cZB>I7|kgR273SlLXh7<PJB(g3#EhIFO+vG`)Xk
z;nKgKKYIB6$%EZD_x8bZ&K07fL<pb938T1fg}czJv$7To2#)s(aR`c`s~?s!r}V)C
z`SU-U5S~68r^opdPAp4f=)heoRE~w_IOv%L2FmGiz?M*Lu1};GxXDS|i8k}taYL6;
zV4$Y3D<7`{L1Mg%tIm%<R7g*)2xrTxAJQs&vg_(j)}_F?xk4vG`6z_tO8oZ4>YAE$
z`Jn<Sz!ephjM&yB;)xnq)IW2hjLcJN&H~;H(lF0=;>3w3aZCOlZ9kVz2f2V%wg|C3
z-p9#{KBv!Nbo<RIQ?zn;F|>Tc(W6H`F)}jzKJ+ih=Y9elB9xb(i{CE*XfLqE>3Nvr
zOG<)5kBp9pp6;%}BS((hnM|7ZdOZ3+%3=W_^R$wUxaTJo=VDx(s+E@VxCa)p4F=&0
z6_pi@dAT8(<E*Z(B@39FOeE$S4uzHH)}3?XSQcC`SOjqYQq$D;;~pI2*f?d8FUn%_
zVLN=hx(Tk$I}e}A;(Q75{C**hw4K2U*?it2E=U-vrr28NDX!O(`ko1YrYHFO06-WX
zNr5wBsYAoTq8**()j#d=6g`doqMDJgL9Mv5b(}zef0TeQSk4o<NTV!hD%)8q(e~&t
zpdN4E-ca*L`g|o@$A*u+r}x>&g1lTIsw;&kE=Z+FB&&1ssGR9FFf0VqEv&;G(Srxu
zO6$LR(p&xrIt@o5k;I^L&7!1}aMy)LHCW(4nC@#&fj(`H^7yz=_D09J)`!KK;V2H#
zAq*_QOL$aUI|juu5KfIrCcogZ0~|xe@<ME=8E7s|0LgUyO(&u5r{Ba<IB0Hu_GK#q
zAmwz0-aQudaA#*{`=vPk-R0#KcYyBA4+MjP{#5#0NoU1zIX5v?*)wnumf}kt9UcF}
z$IqvOjOhf@Mu%;=(NPuW*9Qjr-9S}tdiyRQT<V+|S#>C)fpdNc$A1@!`J?&y`Pbza
z6#8YMJb>Wy`6pa&EE<zbdP0Fvkw1Xf2cguDqOB^Bo<f!{a;X~Z6K-v7olsFkI?VtM
zXRM@+*Kc6$o{U6B|0yRo@3xYX(poAzIacU{*UcY~&l8PHMgirw9ddgY4BSsxr14@N
zNim7a;siFW6FO;l1F9CWJ*^SVbMWv9E6+;#&Dm;Oq(LNw?DrRMD^3jg4!0)C4<5Ch
zB2u{~J8fJzru&aae4zu8{M?paZ^6@HJ&)YQ1ZgAhNyL&gRc0K5lcYdG^H9N=={FOO
zy6p&^Me7lybvF|J4!!i@o|2*`E91SFm&JNE_8u9&NVm;=U6IejOId6?^-3!0=!if6
z>F&a^&E5X;%}K>Ggf?sg&IkidTonZ`0)h|oHM#Qn2;AC;>S;ODYXxZx<m&9sSSYp=
zB*R~y$`Zo-XCRDG=rymrFhxBP(F5B%MiW)$=y<$7^C{Q17i|uCbDvCD_9(Qn$tP($
z{-y2so80$7RaN?9(TL6Y0T_$NvdzNaSV=)j%TqctJE-XH0UiA|g!qln`0I0WayMYV
zTFwlT%G5HGu#z3HOpoFGkAp5gz^8m?3to`Ia@B<NA_R<C7XbU=SS+fh(kIpl*5Rga
zq_6}-nx(Bl`yV=8$YCcyZ9k5F?60V(xaH{4qs@Up;A$9+jX38DoTDhU$Qef2Fh(#A
zyD?sy@%Ir}sa+{HASZIv;M#KB@<80zL5#~-dIgaC$U>$*GV+rn0NY2S(b(OQaQMyW
z)1|q2p-X*UZ-t_$9)}u5!6I7G?q>9rt6lsiJwN+mHa$Zyq-dcdToS~@g=zh&|G<{K
z6>sopN)ArOJM7`44|ky`dR~G{g``UMO+)pKd91|OG&7M4+U9ZA_<^a>l7{MuBouuJ
z@1xRp#okI%E_iMv;Y?$23@$T>^BV&L0~WN7<@mT(roeS|b&=*#=p^k%chH#OHFSOG
zc%bU1CjylZ2Fz$pz&5HpX1p+9h70Ik#I&4|gz6uN3GGxw^`EeW8rMuywXGP}CyH~8
zB7zeAF!}rvUMB>B;MaT9+-JAsuee566+Xh<D<5QQ+o}^S;l7fx%BTDZZ5VWzosSXR
zV~X1KWN6vV9>va+6UF%mc+1jHAFDzMfbQbhDEwRWBFSZwpz%#AOV_qKwVRJOG&DT!
zmfpDnpA9tGf(>cw*0479N4U-(aS}TyV+F=D==g?X_^u0=&9N9?X&~Fie#GPP2^BSv
zoj&-TpLUDHpMO3gm)uC-+%iDdYU1w*&Ut-BWp$-0(<yN=Ffe%R@ZrN>q9TSbw+~8U
zANqC|#+h|)#hmBs%p4lTcl|Ogk`}Q}QUBbV_$Wr^Q@Lsd#&a)#ZKaPF_jM<RXO5%8
zQijm>y#W5boR1#W^)d#)odgDp(oeZL;pr?GcFt7RrHcTDK~3xRDt6q`MhsPtsxTg$
z$c2F!U%?G>X=@CW%BcaCt%Ci5(1b1F<HNQ%H&c-d7)aB}74m@IgnTZgw1lK9d@;B~
zFhKK~jz4J$F=ZZA0=2idS3a1ltgMXlK26-@q?bZ(#Yp(YnBr|6Q~gJ6HCM4cC9>Q@
zkzrCM*(_U;Rytt<NfJ<O3^&IZ9UZk`t>r^<d7Y%roG#<@`8;vmGh`@QM77nFf=W#c
zr}3oM0tKbw{+j?*(xQ2Dz|Ep;EoSM4>Gj0Wd(Kw{)zwrUiZS70<hUk{JUR&mYtROu
zAIZKxt^;MHKUh~lP+5I5Ue}tw5Y#!BX`Mcnw7ny3+5c&`>(;AguBGD!sIomMh|x}7
z$H9XK(`oF;ym^gZC@-)4j1EiBGD3j+V~~l5ARouv)dU>HGUU9*+jgIOLb+u%57&!@
zVklm@a^>6TFB7b+9p>_u>8q}%gOfq5^d&g6DKzHOajy3C<6iDfpCYPi@xquof$zZd
z2^VW-lrWk8tjTe$Y$&8gwxjuMXOI<Vy;9X#=SN<Hvk(7L%h?1YUQ`4oEj0z%0iJ!9
zNUz)n7KNz<1sa`Coi;&jVKnswZjMHaPbHFi%!#W=Y&)Lvg-nO4(lScFnhF7J(L$x4
zUpaa5q{ZK$WvK+X@-`#2NtQqI`W(w-J4>j@<Jl&!#mT+$clk&^r(g6P<+1Lw0qH|C
z5>91B`bq@_#^8c-f|8;@Z`!m;TyxDeV!Gk?^KD~FhqTemm>mPA@Pq#T-j9@&l;`q}
z6&IHlE?&I&dl>%>09n$_3%bg~wNh?yh0$yJyQIl{>_KB=<Hw6jN=s9bVS{CT?PzBU
zgH_qsg*(~%)!wpMOgE-)p_4L94{b$(mx9FwwM1&U5SM<qK$M}x%=*F1=Y4R0z6eIP
z&xj+bS{fk5G(b5)i8xD3*tBx!r^$!d@@dcjtD5P{r9Bo-MmzabX+BZfq3?Dk2zV^#
z&^hgsvYBj`Pa9K|alDUTKieS4cx_Z{jxLbTF@eDF>DEbi95arW<3hGV3hx}7O-ad(
zwClC}sP^>PAsJf-uI=N2K=8BvKoE3775N2)>oBH2!RuX+yMA{C1j?rSJP}f9j)|M-
z=l5&YtogUn(z4s#xtp<g6xQ<S$6+x?r<%^jHZHp8qE~%v^|Rz6DP*#E7?w#2xJwrx
zoQhNWWl!~N!SppaCxp*a0JbM58>S7&Y`;sZO`%4gWSxUE6G3tEeToy>w;io(I}h5i
z(&=%Qb|;Jl!{B(Oo-m#9+(@VL!*(B#n{m7XYGtM^;;dv&XG&9SnaPw%8z~^CIZd^k
z#`(T63hF*DWO7-i_pXf_H*P3a)vGnlBO|ayMa6HzJzE0z|HBx%2l&LXbeVHy%c0aO
z0nASn6ck>~6bEZW=&y#uqrZc1ejoFRQvq`-8hbtfGu>*A3yB-8cd19V)yU4ZN?T;l
zxZ5waO}DRf<fk!R$2vnll#D)EX$4MG(MY$HPRZ6kw=jx-v-l=cDuv7)sZ?meUyD}L
zUCTAwYJE<r9+l=__VjfBvbeb95`vS@Q_0H<)yHDdAK~|X0NO9XJlf!zpTZ%m3M+vU
zuFcKO+ko${;?ux&09t0hEUv0Bycc8jSMWE_$o*+-xZ2*U{nYKVSxoUVf#z&rdZ}%^
z)V@yDkC)Q+*^aee<na>({I$4InYi;6r-~Xwp$@=Dd;_lWs{q?yFnGi7nY;9Qea(J<
zu-SHs<mnQ+MFw)!eP>)4&tM_O*jQxKjvYJR24m8_b?er%_KgdCWlnBBUx0Zg0a5-4
zAbPpMKHdJ>FLT@HI_>n;7@zZEBWT>z##Am4(-80@--5qC1L!{H_Xienu|>sMCW2N}
zRke)BDw#~uc>;C38}#)q!!SQjmy7<RT#x818y`D(zWSK2Hn{$nKs{gD{yzi4mug)B
z;Gds7dGa@fg@xCEuHFVPu7Fi6myh~ZooCWGtI*-^04(VdSmOWf?CksnXm6MM^y%rI
z?|g6pYXFr05A>N^KeN3SzzGY>$qalH-_HQHBE04Rd`+XHqeY2CLIr3UOlScxTj0BP
zF~~=&oW9`KYwDU`Z6|kTo7rZzEb)VxA(+`_wi#f~Y%|-;HjVB73orm`T~JCU>#6zx
O0000<MNUMnLSTaMow+Ii

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 658b63c1370..4b42a47f1cf 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -935,7 +935,7 @@ div.blockvmenuend, div.blockvmenubookmarks {
 	padding-left: 0 !important;
 }
 div.vmenu, td.vmenu {
-	padding-right: 6px !important;
+	padding-right: 10px !important;
 }
 
 
@@ -989,6 +989,7 @@ div.fiche {
 	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
 }
 div.fichecenter {
+	/* margin-top: 10px; */
 	width: 100%;
 	clear: both;	/* This is to have div fichecenter that are true rectangles */
 }
@@ -1737,7 +1738,7 @@ div.vmenu, td.vmenu {
 
 .vmenu {
     width: 190px;
-	margin-left: 4px;
+	margin-left: 6px;
 	<?php if (GETPOST("optioncss") == 'print') { ?>
     display: none;
 	<?php } ?>
@@ -1953,10 +1954,11 @@ img.toolbarbutton {
 /* ============================================================================== */
 div.tabs {
     text-align: <?php print $left; ?>;
-    margin-left: 6px !important;
-    margin-right: 6px !important;
+    padding-left: 6px !important;
+    padding-right: 6px !important;
 	clear:both;
 	height:100%;
+	/* background-image: linear-gradient(to top,#f6f6f6 0,#fff 8px);  */	
 }
 div.tabsElem {
 	margin-top: 1px;
@@ -2018,7 +2020,7 @@ a.tabTitle {
 
 a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	font-family: <?php print $fontlist ?>;
-	padding: 8px 9px 8px;
+	padding: 12px 9px 12px;
     margin: 0em 0.2em;
     text-decoration: none;
     white-space: nowrap;
@@ -2027,11 +2029,6 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	border-left: 1px solid transparent;
 	border-top: 1px solid transparent;
 	border-bottom: 0px !important;
-	/*
-	-moz-border-radius:4px 4px 0 0;
-    -webkit-border-radius: 4px 4px 0 0;
-	border-radius: 4px 4px 0 0;
-	*/
 
 	background-image: none !important;
 }
@@ -3036,9 +3033,12 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
 
 div.titre {
 	font-family: <?php print $fontlist ?>;
-	font-weight: bold;
+	font-size: 14px;
+	/* font-weight: bold; */
 	color: rgb(<?php print $colortexttitlenotab; ?>);
 	text-decoration: none;
+	padding-top: 5px;
+    padding-bottom: 5px;
 	/* text-shadow: 1px 1px 2px #FFFFFF; */
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 6513210a1a9..52fb9d3ab1a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -241,7 +241,7 @@ body {
 <?php } ?>
 	color: rgb(<?php echo $colortext; ?>);
 	font-size: <?php print $fontsize ?>px;
-	line-height: 130%;
+	line-height: 1.3;
 	font-family: <?php print $fontlist ?>;
     margin-top: 0;
     margin-bottom: 0;
@@ -3146,9 +3146,12 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
 
 div.titre {
 	font-family: <?php print $fontlist ?>;
-	font-weight: bold;
+	font-size: 14px;
+	/* font-weight: bold; */
 	color: rgb(<?php print $colortexttitlenotab; ?>);
 	text-decoration: none;
+	padding-top: 5px;
+    padding-bottom: 5px;
 	/* text-shadow: 1px 1px 2px #FFFFFF; */
 	<?php print (empty($conf->dol_optimize_smallscreen)?'':'margin-top: 4px;'); ?>
 }
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index ae685391299..ca9f821d14c 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -52,6 +52,7 @@ $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('usercard','globalcard'));
 
+
 /******************************************************************************/
 /*                     Actions                                                */
 /******************************************************************************/
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index f7acc3609c7..e59e26efd0b 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -191,15 +191,6 @@ $conf_css = $themepath."?lang=".$langs->defaultlang;
 $jquerytheme = 'smoothness';
 if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
 
-if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png'))
-{
-    $login_background = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_background.png';
-}
-else
-{
-    $login_background = DOL_URL_ROOT.'/theme/login_background.png';
-}
-
 if (! $username) $focus_element = 'username';
 else $focus_element = 'password';
 

From e28dff19eeca36c6245c7924f3ed321d9822c46f Mon Sep 17 00:00:00 2001
From: Benoit <benoit@fixit-cs.com>
Date: Fri, 5 May 2017 22:21:46 +0200
Subject: [PATCH 0731/1163] Fix bug xhen insert new bankline

---
 htdocs/compta/bank/class/account.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 897fd5de496..97dacf34386 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -471,9 +471,9 @@ class Account extends CommonObject
 
 		if ($accline->insert() > 0) {
 
-			if ($categorie) {
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_account (";
-				$sql .= "fk_account, fk_categorie";
+			if ($categorie>0) {
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (";
+				$sql .= "lineid, fk_categ;
 				$sql .= ") VALUES (";
 				$sql .= " ".$accline->id.", ".$categorie;
 				$sql .= ")";

From 0fbf27895ad891ee9889e3e8a80a172dead1e975 Mon Sep 17 00:00:00 2001
From: Benoit <benoit@fixit-cs.com>
Date: Fri, 5 May 2017 22:33:34 +0200
Subject: [PATCH 0732/1163] Add fk_facture_fourn element to fetch lines objects

---
 htdocs/fourn/class/fournisseur.facture.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 1798eb19059..496c4660895 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -640,7 +640,7 @@ class FactureFournisseur extends CommonInvoice
     function fetch_lines()
     {
         $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
-        $sql.= ', f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
+        $sql.= ', f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn ';
         $sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
         $sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
 		$sql.= ', f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
@@ -649,6 +649,7 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ' WHERE fk_facture_fourn='.$this->id;
         $sql.= ' ORDER BY f.rang, f.rowid';
 
+
         dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
         $resql_rows = $this->db->query($sql);
         if ($resql_rows)
@@ -687,6 +688,7 @@ class FactureFournisseur extends CommonInvoice
                     $line->total_tva		= $obj->total_tva;
                     $line->total_localtax1	= $obj->total_localtax1;
                     $line->total_localtax2	= $obj->total_localtax2;
+                    $line->fk_facture_fourn     = $obj->fk_facture_fourn;
                     $line->total_ttc		= $obj->total_ttc;
                     $line->fk_product		= $obj->fk_product;
                     $line->product_type		= $obj->product_type;

From cea835744c61486f2cadafec2e589fe6578fc628 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 23:06:46 +0200
Subject: [PATCH 0733/1163] Look and feel v6

---
 htdocs/theme/md/style.css.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 52fb9d3ab1a..7818422d192 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1137,6 +1137,9 @@ table.noborder tr.liste_titre td {
 .pictoedit, .pictowarning, .pictodelete {
     vertical-align: text-bottom;
 }
+img.hideonsmartphone.pictoactionview {
+    vertical-align: bottom;
+}
 .colorthumb {
 	padding-left: 1px !important;
 	padding-right: 1px;
@@ -4680,7 +4683,7 @@ border-top-right-radius: 6px;
 	}
 	.mainmenuaspan {
     	/*display: none;*/
-  		font-size: 10px;
+  		font-size: 12px;
     }
     .topmenuimage {
     	background-size: 26px auto;

From 56140ae5729df78af81b174631f8156e85c5c94e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 01:09:22 +0200
Subject: [PATCH 0734/1163] Work on default focus

---
 build/debian/README.howto      |  9 ++--
 htdocs/admin/defaultvalues.php | 89 +++++++++++++++++++++-------------
 htdocs/core/lib/admin.lib.php  |  5 ++
 htdocs/langs/en_US/admin.lang  |  7 +--
 4 files changed, 71 insertions(+), 39 deletions(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index 399c4f07a1f..e040cd6dced 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -152,7 +152,7 @@ tag 729538 -moreinfo
 
 
 
-##### Testing a package into unstable env
+##### Testing a package into a chroot environment
 
 Check you have a mysql server available from another interface than "localhost".
 Set line in /etc/mysql/my.cnf if required and restart mysql
@@ -160,9 +160,11 @@ Set line in /etc/mysql/my.cnf if required and restart mysql
 [mysqld]
 bind-address           = *
 
-Create a chroot called "unstable-amd64-sbuild".
+Create a chroot called "jessie" or "unstable".
 Chroot env is stored into /srv/chroot directory.
 > sudo sbuild-createchroot --keyring=unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian
+or
+> sudo sbuild-createchroot jessie /srv/chroot/jessie http://ftp.uk.debian.org/debian
 
 Pour lister les env chroot
 > schroot -l
@@ -170,8 +172,9 @@ or
 > ls /srv/chroot
 
 Puis pour se connecter et préparer l'environnement 
-> schroot -c name_of_chroot
+> schroot -c name_of_chroot  (exemple schroot -c unstable-amd64-sbuild)
 > cat /etc/debian_chroot       to check which debian branch we are into
+> apt-get install vi 
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
 > apt-get update
 > apt-get upgrade
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 8a9bd4f209b..ec4c5fd4605 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -37,7 +37,7 @@ if (!$user->admin) accessforbidden();
 $id=GETPOST('rowid','int');
 $action=GETPOST('action','alpha');
 
-$mode = GETPOST('mode')?GETPOST('mode'):'createform';   // 'createform', 'filters', 'sortorder'
+$mode = GETPOST('mode')?GETPOST('mode'):'createform';   // 'createform', 'filters', 'sortorder', 'focus'
 
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
@@ -210,6 +210,10 @@ if ($mode == 'sortorder')
 {
     print info_admin($langs->trans("WarningSettingSortOrder")).'<br>';
 }
+if ($mode == 'focus')
+{
+    print info_admin($langs->trans("FeatureNotYetAvailable")).'<br>';
+}
 
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" id="action" name="action" value="">';
@@ -217,11 +221,13 @@ print '<input type="hidden" id="mode" name="mode" value="'.dol_escape_htmltag($m
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
+// Page
 $texthelp=$langs->trans("PageUrlForDefaultValues");
 if ($mode == 'createform') $texthelp.=$langs->trans("PageUrlForDefaultValuesCreate", 'societe/card.php');
 else $texthelp.=$langs->trans("PageUrlForDefaultValuesList", 'societe/list.php');
 $texturl=$form->textwithpicto($langs->trans("Url"), $texthelp);
 print_liste_field_titre($texturl,$_SERVER["PHP_SELF"],'page,param','',$param,'',$sortfield,$sortorder);
+// Field
 $texthelp=$langs->trans("TheKeyIsTheNameOfHtmlField");
 if ($mode != 'sortorder') 
 {
@@ -233,26 +239,32 @@ else
     $textkey=$form->textwithpicto($langs->trans("Field"), $texthelp);
 }
 print_liste_field_titre($textkey,$_SERVER["PHP_SELF"],'param','',$param,'',$sortfield,$sortorder);
-if ($mode != 'sortorder')
+// Value
+if ($mode != 'focus')
 {
-    $texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-    // See list into GETPOST
-    $texthelp.='__USERID__<br>';
-    $texthelp.='__SUPERVISORID__<br>';
-    $texthelp.='__MYCOUNTRYID__<br>';
-    $texthelp.='__DAY__<br>';
-    $texthelp.='__MONTH__<br>';
-    $texthelp.='__YEAR__<br>';
-    if (! empty($conf->multicompany->enabled)) $texthelp.='__ENTITYID__<br>';
-    $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');
+    if ($mode != 'sortorder')
+    {
+        $texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+        // See list into GETPOST
+        $texthelp.='__USERID__<br>';
+        $texthelp.='__SUPERVISORID__<br>';
+        $texthelp.='__MYCOUNTRYID__<br>';
+        $texthelp.='__DAY__<br>';
+        $texthelp.='__MONTH__<br>';
+        $texthelp.='__YEAR__<br>';
+        if (! empty($conf->multicompany->enabled)) $texthelp.='__ENTITYID__<br>';
+        $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');
+    }
+    else
+    {
+        $texthelp='ASC or DESC';
+        $textvalue=$form->textwithpicto($langs->trans("SortOrder"), $texthelp);
+    }
+    print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
 }
-else
-{
-    $texthelp='ASC or DESC';
-    $textvalue=$form->textwithpicto($langs->trans("SortOrder"), $texthelp);
-}
-print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
+// Entity
 if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],'entity,page','',$param,'',$sortfield,$sortorder);
+// Actions
 print '<td align="center"></td>';
 print "</tr>\n";
 
@@ -261,15 +273,21 @@ print "</tr>\n";
 print "\n";
 
 print '<tr class="oddeven">';
+// Page
 print '<td>';
 print '<input type="text" class="flat minwidth200 maxwidthonsmartphone" name="defaulturl" value="">';
 print '</td>'."\n";
+// Field
 print '<td>';
 print '<input type="text" class="flat maxwidth100" name="defaultkey" value="">';
 print '</td>';
-print '<td>';
-print '<input type="text" class="flat maxwidthonsmartphone" name="defaultvalue" value="">';
-print '</td>';
+// Value
+if ($mode != 'focus')
+{
+    print '<td>';
+    print '<input type="text" class="flat maxwidthonsmartphone" name="defaultvalue" value="">';
+    print '</td>';
+}
 // Limit to superadmin
 if (! empty($conf->multicompany->enabled) && !$user->entity)
 {
@@ -311,28 +329,33 @@ if ($result)
 
 		print '<tr class="oddeven">';
 		
+		// Page
 		print '<td>';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->page;
 		else print '<input type="text" name="urlpage" value="'.dol_escape_htmltag($obj->page).'">';
 		print '</td>'."\n";
    	    
-		// Key
+		// Field
 		print '<td>';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->param;
 		else print '<input type="text" name="key" value="'.dol_escape_htmltag($obj->param).'">';
 		print '</td>'."\n";
 
 		// Value
-		print '<td>';
-		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
-		print '<input type="hidden" name="const['.$i.'][lang]" value="'.$obj->lang.'">';
-		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
-		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
-		*/
-		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->value;
-		else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
-		print '</td>';
-
+		if ($mode != 'focus')
+		{
+    		print '<td>';
+    		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
+    		print '<input type="hidden" name="const['.$i.'][lang]" value="'.$obj->lang.'">';
+    		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
+    		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
+    		*/
+    		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->value;
+    		else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
+    		print '</td>';
+		}
+		
+		// Actions
 		print '<td align="center">';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid)
 		{
@@ -349,7 +372,7 @@ if ($result)
 		    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 		}
 		print '</td>';
-		
+        
 		print "</tr>\n";
 		print "\n";
 		$i++;
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 2a734b5f161..4beb49107d2 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -624,6 +624,11 @@ function defaultvalues_prepare_head()
     $head[$h][2] = 'sortorder';
     $h++;
 
+    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=focus";
+    $head[$h][1] = $langs->trans("DefaultFocus");
+    $head[$h][2] = 'focus';
+    $h++;
+
     /*$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";
     $head[$h][1] = $langs->trans("TranslationKeySearch");
     $head[$h][2] = 'searchkey';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 4b56ef00ae1..14131bddd2c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1352,9 +1352,10 @@ CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers 
 DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record. 
-DefaultCreateForm=Create forms
-DefaultSearchFilters=Search filters
-DefaultSortOrder=Sort orders
+DefaultCreateForm=Default values for new objects
+DefaultSearchFilters=Default search filters
+DefaultSortOrder=Default sort orders
+DefaultFocus=Default focus fields
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup

From 9b90e7aa095bff665604d541ef14976f3ae605a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 01:41:56 +0200
Subject: [PATCH 0735/1163] Minor fix

---
 build/debian/README.howto          | 5 +++--
 htdocs/bookmarks/bookmarks.lib.php | 2 +-
 htdocs/theme/eldy/style.css.php    | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index e040cd6dced..c94309ec2ef 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -174,7 +174,7 @@ or
 Puis pour se connecter et préparer l'environnement 
 > schroot -c name_of_chroot  (exemple schroot -c unstable-amd64-sbuild)
 > cat /etc/debian_chroot       to check which debian branch we are into
-> apt-get install vi 
+> apt-get install vi dialog
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
 > apt-get update
 > apt-get upgrade
@@ -404,6 +404,7 @@ Note that package 3.5.7 contains not only fixed for bugs reported to debian. It
 so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. 
 After discussion with ..., it appears that security holes are enough to request this unblock request."
 
+
 Use this to request an full update of a stable package
 
 reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
@@ -434,7 +435,7 @@ Use this to ask to apply patches on a stable version.
 
 reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
 Choose package "release.debian.org"
-Then usertag "jessie-pu"
+Then usertag "jessie-pu" (if tags is not available in list, choose another one, and change it later into email content text)
 Then name of package "dolibarr"
 Fill message, for example:
 "Please unblock package dolibarr
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index d84713d1e62..26089c3d07c 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -62,7 +62,7 @@ function printBookmarksList($aDb, $aLangs)
     */
 	$ret.= '<div class="menu_top"></div>'."\n";
 
-	$ret.= '<form id="actionbookmark" name="actionbookmark" method="POST" action="">';
+	$ret.= '<!-- form with GET method --><form id="actionbookmark" name="actionbookmark" method="GET" action="">';
 	$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo">';
 	$ret.= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
     $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_js(DOL_URL_ROOT.'/bookmarks/list.php').'">'.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4b42a47f1cf..f4d5c5c32bd 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1767,10 +1767,10 @@ a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { white-space: nowr
 font.vmenudisabled  { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; }
 a.vmenu:link, a.vmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; }
 
-a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; }
+a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; }
 font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; }
 a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
-font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
+font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }
 

From e8c60642e6564050963ae6740110bdd7bc9c0744 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 03:21:47 +0200
Subject: [PATCH 0736/1163] Translation fix

---
 htdocs/langs/en_US/cron.lang | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 01b69b3b839..76b1a92a365 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -58,11 +58,11 @@ CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From

From a4defb8102db6376afc91d59dbbd9f48b91bc525 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 6 May 2017 07:02:34 +0200
Subject: [PATCH 0737/1163] Add html form for accountancy journals list

---
 .../core/class/html.formaccounting.class.php  | 59 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index e1bf1645de0..cb988a511cd 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -25,12 +25,14 @@
 /**
  *	Class to manage generation of HTML components for accounting management
  */
-class FormAccounting
+class FormAccounting extends Form
 {
+
+    private $options_cache = array();
+
 	var $db;
 	var $error;
 
-
 	/**
 	* Constructor
 	*
@@ -41,6 +43,59 @@ class FormAccounting
 	    $this->db = $db;
 	}
 
+	/**
+	 * Return list of journals with label by nature
+	 *
+	 * @param	string	$selectid	Preselected pcg_type
+	 * @param	string	$htmlname	Name of field in html form
+	 * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
+	 * @param	int		$showempty	Add an empty field
+	 * @param	array	$event		Event options
+	 * @param	string	$morecss	More css non HTML object
+	 * @param	string	$usecache	Key to use to store result into a cache. Next call with same key will reuse the cache.
+	 *
+	 * @return	string				String with HTML select
+	 */
+	function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $event = array(), $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
+	{
+		global $conf;
+
+		$sql = "SELECT rowid, code, label, nature, entity, active";
+		$sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
+		$sql.= " WHERE entity = ".$conf->entity;
+		$sql.= " AND active = 1";
+		if (empty($nature)) $sql.= " AND nature = ".$nature;
+		$sql.= " ORDER BY code";
+
+		dol_syslog(get_class($this) . "::select_journal", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_journal ".$this->error, LOG_ERR);
+			return -1;
+		}
+
+		$options = array();
+		$out = ajax_combobox($htmlname, $event);
+
+    	$selected = 0;
+    	while ($obj = $this->db->fetch_object($resql))
+    	{
+		    $label = $obj->code . ' - ' . $obj->label;
+		}
+    	$this->db->free($resql);
+
+    	if ($usecache)
+    	{
+            $this->options_cache[$usecache] = $options;
+    	}
+		
+		$out .= Form::selectarray($htmlname, $options, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+
+		return $out;
+	}
+
     /**
      *	Return list of accounting category.
      * 	Use mysoc->country_id or mysoc->country_code so they must be defined.

From 68aaef2f66737e5e9e24ea4c897a6e3a369c44cd Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 6 May 2017 08:06:01 +0200
Subject: [PATCH 0738/1163] Add list to select journal in bank

---
 .../class/accountingjournal.class.php         | 20 +++---
 htdocs/compta/bank/card.php                   | 12 +++-
 .../core/class/html.formaccounting.class.php  | 66 ++++++++++-------
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  7 ++
 .../mysql/tables/llx_accounting_journal.sql   |  2 +-
 .../mysql/tables/llx_bank_account.key.sql     |  2 +
 .../install/mysql/tables/llx_bank_account.sql | 70 +++++++++----------
 7 files changed, 103 insertions(+), 76 deletions(-)

diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 064f56bddd6..9bff37560d7 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -136,19 +136,19 @@ class AccountingJournal extends CommonObject
 	    if ($mode == 0)
 	    {
 	        $prefix='';
-			if ($nature == 9) return $langs->trans('AccountingJournalTypeHasNew');
-			if ($nature == 3) return $langs->trans('AccountingJournalTypeBank');
-			if ($nature == 2) return $langs->trans('AccountingJournalTypePurchase');
-	        if ($nature == 1) return $langs->trans('AccountingJournalTypeSale');
-	        if ($nature == 0) return $langs->trans('AccountingJournalTypeVariousOperation');
+			if ($nature == 9) return $langs->trans('AccountingJournalType9');
+			if ($nature == 4) return $langs->trans('AccountingJournalType4');
+			if ($nature == 3) return $langs->trans('AccountingJournalType3');
+	        if ($nature == 2) return $langs->trans('AccountingJournalType2');
+	        if ($nature == 1) return $langs->trans('AccountingJournalType1');
 	    }
 	    if ($mode == 1)
 	    {
-			if ($nature == 9) return $langs->trans('AccountingJournalTypeHasNew');
-			if ($nature == 3) return $langs->trans('AccountingJournalTypeBank');
-			if ($nature == 2) return $langs->trans('AccountingJournalTypePurchase');
-	        if ($nature == 1) return $langs->trans('AccountingJournalTypeSale');
-	        if ($nature == 0) return $langs->trans('AccountingJournalTypeVariousOperation');
+			if ($nature == 9) return $langs->trans('AccountingJournalType9');
+			if ($nature == 4) return $langs->trans('AccountingJournalType4');
+			if ($nature == 3) return $langs->trans('AccountingJournalType3');
+	        if ($nature == 2) return $langs->trans('AccountingJournalType2');
+	        if ($nature == 1) return $langs->trans('AccountingJournalType1');
 	    }
 	}
 }
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 5b3bb3a58fe..75ba80052bc 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -36,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
 $langs->load("banks");
@@ -278,6 +279,7 @@ $form = new Form($db);
 $formbank = new FormBank($db);
 $formcompany = new FormCompany($db);
 if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccountancy2 = New FormAccounting($db);
 
 $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
@@ -534,7 +536,9 @@ if ($action == 'create')
 	if (! empty($conf->accounting->enabled))
 	{
 		print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
-	    print '<td colspan="3"><input type="text" name="accountancy_journal" value="'.(GETPOST("accountancy_journal")?GETPOST('accountancy_journal', 'alpha'):$object->accountancy_journal).'"></td></tr>';
+	    print '<td>';
+		print $formaccountancy2->select_journal($object->accountancy_journal, 'accountancy_journal', 4, 1, '', 1, 1);
+		print '</td></tr>';
 	}
 
 	print '</table>';
@@ -980,8 +984,10 @@ else
 		// Accountancy journal
 		if (! empty($conf->accounting->enabled))
 		{
-		    print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
-		    print '<td><input type="text" name="accountancy_journal" value="'.(isset($_POST["accountancy_journal"])?GETPOST("accountancy_journal"):$object->accountancy_journal).'"></td></tr>';
+			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
+			print '<td>';
+			print $formaccountancy2->select_journal($object->accountancy_journal, 'accountancy_journal', 4, 1, '', 1, 1);
+			print '</td></tr>';
 		}
 		
 		print '</table>';
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index cb988a511cd..1a33f0fce60 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -60,37 +60,49 @@ class FormAccounting extends Form
 	{
 		global $conf;
 
-		$sql = "SELECT rowid, code, label, nature, entity, active";
-		$sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
-		$sql.= " WHERE entity = ".$conf->entity;
-		$sql.= " AND active = 1";
-		if (empty($nature)) $sql.= " AND nature = ".$nature;
-		$sql.= " ORDER BY code";
+		$out = '';
 
-		dol_syslog(get_class($this) . "::select_journal", LOG_DEBUG);
-		$resql = $this->db->query($sql);
+    	$options = array();
+		if ($usecache && ! empty($this->options_cache[$usecache]))
+		{
+		    $options = $this->options_cache[$usecache];
+		    $selected=$selectid;
+		}
+		else
+		{
+			$sql = "SELECT rowid, code, label, nature, entity, active";
+			$sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
+			$sql.= " WHERE active = 1";
+			$sql.= " AND entity = ".$conf->entity;
+			//if ($nature && is_numeric($nature))   $sql .= " AND nature = ".$nature;
+			$sql.= " ORDER BY code";
 
-		if (!$resql) {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_journal ".$this->error, LOG_ERR);
-			return -1;
+			dol_syslog(get_class($this) . "::select_journal", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+
+			if (!$resql) {
+				$this->error = "Error ".$this->db->lasterror();
+				dol_syslog(get_class($this)."::select_journal ".$this->error, LOG_ERR);
+				return -1;
+			}
+
+			$out = ajax_combobox($htmlname, $event);
+
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$label = $obj->code . ' - ' . $obj->label;
+				$select_value_out = $obj->rowid;
+
+				$options[$select_value_out] = $label;
+			}
+			$this->db->free($resql);
+
+			if ($usecache)
+			{
+				$this->options_cache[$usecache] = $options;
+			}
 		}
 
-		$options = array();
-		$out = ajax_combobox($htmlname, $event);
-
-    	$selected = 0;
-    	while ($obj = $this->db->fetch_object($resql))
-    	{
-		    $label = $obj->code . ' - ' . $obj->label;
-		}
-    	$this->db->free($resql);
-
-    	if ($usecache)
-    	{
-            $this->options_cache[$usecache] = $options;
-    	}
-		
 		$out .= Form::selectarray($htmlname, $options, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		return $out;
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index d96210dcbfe..9e4699b2e4b 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -259,4 +259,11 @@ UPDATE llx_accounting_journal SET nature = 3 where code = 'AC' and nature = 2;
 UPDATE llx_accounting_journal SET nature = 4 where (code = 'BK' or code = 'BQ') and nature = 3;
 
 
+ALTER TABLE llx_bank_account CHANGE COLUMN accountancy_journal fk_accountancy_journal integer;
+ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
+
+
+
+
+
 
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.sql b/htdocs/install/mysql/tables/llx_accounting_journal.sql
index a435de3cd80..348654b56dc 100644
--- a/htdocs/install/mysql/tables/llx_accounting_journal.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_journal.sql
@@ -23,6 +23,6 @@ create table llx_accounting_journal
   entity            integer DEFAULT 1,
   code       		varchar(32) NOT NULL,
   label             varchar(128) NOT NULL,
-  nature			smallint DEFAULT 0 NOT NULL,			-- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
+  nature			smallint DEFAULT 1 NOT NULL,			-- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
   active            smallint DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql
index c91762a322e..0a168d63990 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.key.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql
@@ -19,3 +19,5 @@
 
 
 ALTER TABLE llx_bank_account ADD UNIQUE uk_bank_account_label (label,entity);
+
+ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
index 7730ab79ef6..6db2857ddae 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -24,39 +24,39 @@
 
 create table llx_bank_account
 (
-  rowid					integer AUTO_INCREMENT PRIMARY KEY,
-  datec					datetime,
-  tms					timestamp,
-  ref					varchar(12) NOT NULL,
-  label					varchar(30) NOT NULL,
-  entity				integer DEFAULT 1 NOT NULL,	-- multi company id
-  fk_user_author		integer,
-  fk_user_modif			integer,
-  bank					varchar(60),
-  code_banque			varchar(128),
-  code_guichet			varchar(6),
-  number				varchar(255),
-  cle_rib				varchar(5),
-  bic					varchar(11),
-  iban_prefix			varchar(34),				-- full iban. 34 according to ISO 13616
-  country_iban			varchar(2),					-- deprecated
-  cle_iban				varchar(2),
-  domiciliation			varchar(255),
-  state_id				integer        DEFAULT NULL,
-  fk_pays				integer        NOT NULL,
-  proprio				varchar(60),
-  owner_address     	varchar(255),
-  courant				smallint DEFAULT 0 NOT NULL,
-  clos					smallint DEFAULT 0 NOT NULL,
-  rappro				smallint DEFAULT 1,
-  url					varchar(128),
-  account_number		varchar(32),				-- bank accountancy number
-  accountancy_journal	varchar(16) DEFAULT NULL,	-- bank accountancy journal
-  currency_code			varchar(3) NOT NULL,
-  min_allowed			integer DEFAULT 0,
-  min_desired			integer DEFAULT 0,
-  comment				text,						-- TODO rename in note_private
-  note_public     		text,
-  model_pdf       		varchar(255),
-  import_key      		varchar(14)
+  rowid						integer AUTO_INCREMENT PRIMARY KEY,
+  datec						datetime,
+  tms						timestamp,
+  ref						varchar(12) NOT NULL,
+  label						varchar(30) NOT NULL,
+  entity					integer DEFAULT 1 NOT NULL,	-- multi company id
+  fk_user_author			integer,
+  fk_user_modif				integer,
+  bank						varchar(60),
+  code_banque				varchar(128),
+  code_guichet				varchar(6),
+  number					varchar(255),
+  cle_rib					varchar(5),
+  bic						varchar(11),
+  iban_prefix				varchar(34),				-- full iban. 34 according to ISO 13616
+  country_iban				varchar(2),					-- deprecated
+  cle_iban					varchar(2),
+  domiciliation				varchar(255),
+  state_id					integer        DEFAULT NULL,
+  fk_pays					integer        NOT NULL,
+  proprio					varchar(60),
+  owner_address				varchar(255),
+  courant					smallint DEFAULT 0 NOT NULL,
+  clos						smallint DEFAULT 0 NOT NULL,
+  rappro					smallint DEFAULT 1,
+  url						varchar(128),
+  account_number			varchar(32),				-- bank accountancy number
+  fk_accountancy_journal	integer,					-- bank accountancy journal
+  currency_code				varchar(3) NOT NULL,
+  min_allowed				integer DEFAULT 0,
+  min_desired				integer DEFAULT 0,
+  comment					text,						-- TODO rename in note_private
+  note_public				text,
+  model_pdf					varchar(255),
+  import_key				varchar(14)
 )ENGINE=innodb;

From 8113e6c2f21714e81dc1a4132325129fd999f4b7 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 6 May 2017 08:11:07 +0200
Subject: [PATCH 0739/1163] Update Accounting journal getNomUrl

---
 .../class/accountingjournal.class.php         | 61 +++++++++++++++----
 1 file changed, 48 insertions(+), 13 deletions(-)

diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 9bff37560d7..91924f08592 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -85,27 +85,62 @@ class AccountingJournal extends CommonObject
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
-	 * @param	int		$withpicto	0=No picto, 1=Include picto into link, 2=Only picto
-	 * @return	string				Chaine avec URL
+	 * @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+	 * @param	int		$withlabel		0=No label, 1=Include label of account
+	 * @param	int  	$nourl			1=Disable url
+	 * @param	string  $moretitle		Add more text to title tooltip
+	 * @param	int  	$notooltip		1=Disable tooltip
+	 * @return	string	String with URL
 	 */
-	function getNomUrl($withpicto = 0) {
-		global $langs;
+	function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle='',$notooltip=0)
+	{
+		global $langs, $conf, $user;
+
+		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
 
 		$result = '';
 
-		$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/journals_card.php?id=' . $this->id . '">';
-		$linkend = '</a>';
+		$url = DOL_URL_ROOT . '/accountancy/admin/journals_list.php';
 
 		$picto = 'billr';
+		$label='';
 
-		$label = $langs->trans("Show") . ': ' . $this->code . ' - ' . $this->label;
+		$label = '<u>' . $langs->trans("ShowAccountingJournal") . '</u>';
+		if (! empty($this->code))
+			$label .= '<br><b>'.$langs->trans('Code') . ':</b> ' . $this->code;
+		if (! empty($this->label))
+			$label .= '<br><b>'.$langs->trans('Label') . ':</b> ' . $this->label;
+		if ($moretitle) $label.=' - '.$moretitle;
 
-		if ($withpicto)
-			$result .= ($link . img_object($label, $picto) . $linkend);
-		if ($withpicto && $withpicto != 2)
-			$result .= ' ';
-		if ($withpicto != 2)
-			$result .= $link . $this->code . ' - ' . $this->label . $linkend;
+		$linkclose='';
+		if (empty($notooltip))
+		{
+		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+		    {
+		        $label=$langs->trans("ShowAccoutingJournal");
+		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+		    }
+		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+		    $linkclose.=' class="classfortooltip"';
+		}
+
+        $linkstart='<a href="'.$url.'"';
+        $linkstart.=$linkclose.'>';
+		$linkend='</a>';
+
+		if ($nourl)
+		{
+			$linkstart = '';
+			$linkclose = '';
+			$linkend = '';			
+		}
+
+		$label_link = $this->code;
+		if ($withlabel) $label_link .= ' - ' . $this->label;
+
+		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		if ($withpicto && $withpicto != 2) $result .= ' ';
+		if ($withpicto != 2) $result.=$linkstart . $label_link . $linkend;
 		return $result;
 	}
 	

From 7c4b47f20d9e32fe753a433a5cae606c2e897854 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 6 May 2017 08:33:12 +0200
Subject: [PATCH 0740/1163] Update works

---
 htdocs/compta/bank/card.php                   | 18 +++++++++----
 htdocs/compta/bank/class/account.class.php    | 14 +++++-----
 htdocs/compta/bank/index.php                  | 27 ++++++++++++-------
 htdocs/compta/bank/various_payment/index.php  |  4 +--
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 +-
 .../mysql/tables/llx_bank_account.key.sql     |  2 +-
 htdocs/langs/en_US/accountancy.lang           |  3 ++-
 7 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 75ba80052bc..804d2c5511d 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -38,6 +38,7 @@ if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT . '/categ
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
 $langs->load("banks");
 $langs->load("bills");
@@ -100,7 +101,7 @@ if ($action == 'add')
 
 	$account_number 		 = GETPOST('account_number','alpha');
 	if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
-	$object->accountancy_journal  = trim($_POST["accountancy_journal"]);
+	$object->fk_accountancy_journal  = trim($_POST["fk_accountancy_journal"]);
 
     $object->solde           = $_POST["solde"];
     $object->date_solde      = dol_mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
@@ -198,7 +199,7 @@ if ($action == 'update')
 
 	$account_number 		 = GETPOST('account_number', 'int');
 	if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
-	$object->accountancy_journal = trim($_POST["accountancy_journal"]);
+	$object->fk_accountancy_journal = trim($_POST["fk_accountancy_journal"]);
 
     $object->currency_code   = trim($_POST["account_currency_code"]);
 
@@ -537,7 +538,7 @@ if ($action == 'create')
 	{
 		print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 	    print '<td>';
-		print $formaccountancy2->select_journal($object->accountancy_journal, 'accountancy_journal', 4, 1, '', 1, 1);
+		print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 1, 1);
 		print '</td></tr>';
 	}
 
@@ -681,7 +682,14 @@ else
 		if (! empty($conf->accounting->enabled))
 		{
 		    print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
-		    print '<td>'.$object->accountancy_journal.'</td></tr>';
+		    print '<td>';
+			
+			$accountingjournal = new AccountingJournal($db);
+			$accountingjournal->fetch($object->fk_accountancy_journal);
+
+			print $accountingjournal->getNomUrl(0,1,1,'',1);
+			
+			print '</td></tr>';
 		}
 		
 		// Other attributes
@@ -986,7 +994,7 @@ else
 		{
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
-			print $formaccountancy2->select_journal($object->accountancy_journal, 'accountancy_journal', 4, 1, '', 1, 1);
+			print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 1, 1);
 			print '</td></tr>';
 		}
 		
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 897fd5de496..33181f666d7 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -160,7 +160,7 @@ class Account extends CommonObject
      * @var string
      */
     public $account_number;
-	public $accountancy_journal;
+	public $fk_accountancy_journal;
 
     /**
      * Currency code
@@ -545,7 +545,7 @@ class Account extends CommonObject
         $sql.= ", label";
         $sql.= ", entity";
         $sql.= ", account_number";
-		$sql.= ", accountancy_journal";
+		$sql.= ", fk_accountancy_journal";
 		$sql.= ", bank";
         $sql.= ", code_banque";
         $sql.= ", code_guichet";
@@ -569,7 +569,7 @@ class Account extends CommonObject
         $sql.= ", '".$this->db->escape($this->label)."'";
         $sql.= ", ".$conf->entity;
         $sql.= ", '".$this->db->escape($this->account_number)."'";
-		$sql.= ", '".$this->db->escape($this->accountancy_journal)."'";
+		$sql.= ", '".$this->db->escape($this->fk_accountancy_journal)."'";
 		$sql.= ", '".$this->db->escape($this->bank)."'";
         $sql.= ", '".$this->code_banque."'";
         $sql.= ", '".$this->code_guichet."'";
@@ -702,7 +702,7 @@ class Account extends CommonObject
         $sql.= ",rappro = ".$this->rappro;
         $sql.= ",url = ".($this->url?"'".$this->url."'":"null");
         $sql.= ",account_number = '".$this->account_number."'";
-		$sql.= ",accountancy_journal = '".$this->accountancy_journal."'";
+		$sql.= ",fk_accountancy_journal = '".$this->fk_accountancy_journal."'";
 
 		$sql.= ",bank  = '".$this->db->escape($this->bank)."'";
         $sql.= ",code_banque='".$this->code_banque."'";
@@ -847,7 +847,7 @@ class Account extends CommonObject
         $sql = "SELECT ba.rowid, ba.ref, ba.label, ba.bank, ba.number, ba.courant, ba.clos, ba.rappro, ba.url,";
         $sql.= " ba.code_banque, ba.code_guichet, ba.cle_rib, ba.bic, ba.iban_prefix as iban,";
         $sql.= " ba.domiciliation, ba.proprio, ba.owner_address, ba.state_id, ba.fk_pays as country_id,";
-        $sql.= " ba.account_number, ba.accountancy_journal, ba.currency_code,";
+        $sql.= " ba.account_number, ba.fk_accountancy_journal, ba.currency_code,";
         $sql.= " ba.min_allowed, ba.min_desired, ba.comment,";
         $sql.= " ba.datec as date_creation, ba.tms as date_update,";
         $sql.= ' c.code as country_code, c.label as country,';
@@ -897,7 +897,7 @@ class Account extends CommonObject
                 $this->country       = $obj->country;
 
                 $this->account_number = $obj->account_number;
-				$this->accountancy_journal = $obj->accountancy_journal;
+				$this->fk_accountancy_journal = $obj->fk_accountancy_journal;
 
                 $this->currency_code  = $obj->currency_code;
                 $this->account_currency_code  = $obj->currency_code;
@@ -1259,7 +1259,7 @@ class Account extends CommonObject
             include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
             $langs->load("accountancy");
             $label .= '<br><b>' . $langs->trans('AccountAccounting') . ':</b> ' . length_accountg($this->account_number);
-            $label .= '<br><b>' . $langs->trans('AccountancyJournal') . ':</b> ' . $this->accountancy_journal;
+            $label .= '<br><b>' . $langs->trans('AccountancyJournal') . ':</b> ' . $this->fk_accountancy_journal;
         }
         $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index b808fa8f596..19ec335cac5 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -29,6 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
 $langs->load("banks");
 $langs->load("categories");
@@ -88,7 +90,7 @@ $arrayfields=array(
     'b.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
     'b.number'=>array('label'=>$langs->trans("AccountIdShort"), 'checked'=>1),
     'b.account_number'=>array('label'=>$langs->trans("AccountAccounting"), 'checked'=>$conf->accountancy->enabled),
-    'b.accountancy_journal'=>array('label'=>$langs->trans("AccountancyJournal"), 'checked'=>$conf->accountancy->enabled),
+    'b.fk_accountancy_journal'=>array('label'=>$langs->trans("AccountancyJournal"), 'checked'=>$conf->accountancy->enabled),
     'toreconcile'=>array('label'=>$langs->trans("TransactionsToConciliate"), 'checked'=>1),
     'b.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
     'b.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
@@ -141,7 +143,7 @@ $title=$langs->trans('BankAccounts');
 // Load array of financial accounts (opened by default)
 $accounts = array();
 
-$sql  = "SELECT rowid, label, courant, rappro, account_number, accountancy_journal, datec as date_creation, tms as date_update";
+$sql  = "SELECT rowid, label, courant, rappro, account_number, fk_accountancy_journal, datec as date_creation, tms as date_update";
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -323,7 +325,7 @@ if (! empty($arrayfields['b.account_number']['checked']))
     print '</td>';
 }
 // Accountancy journal
-if (! empty($arrayfields['b.accountancy_journal']['checked']))
+if (! empty($arrayfields['b.fk_accountancy_journal']['checked']))
 {
     print '<td class="liste_titre">';
     print '</td>';
@@ -403,7 +405,7 @@ if (! empty($arrayfields['b.label']['checked']))          print_liste_field_titr
 if (! empty($arrayfields['accountype']['checked']))       print_liste_field_titre($arrayfields['accountype']['label'],$_SERVER["PHP_SELF"],'','',$param,'',$sortfield,$sortorder);
 if (! empty($arrayfields['b.number']['checked']))         print_liste_field_titre($arrayfields['b.number']['label'],$_SERVER["PHP_SELF"],'b.number','',$param,'',$sortfield,$sortorder);
 if (! empty($arrayfields['b.account_number']['checked'])) print_liste_field_titre($arrayfields['b.account_number']['label'],$_SERVER["PHP_SELF"],'b.account_number','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['b.accountancy_journal']['checked'])) print_liste_field_titre($arrayfields['b.accountancy_journal']['label'],$_SERVER["PHP_SELF"],'b.accountancy_journal','',$param,'',$sortfield,$sortorder);
+if (! empty($arrayfields['b.fk_accountancy_journal']['checked'])) print_liste_field_titre($arrayfields['b.fk_accountancy_journal']['label'],$_SERVER["PHP_SELF"],'b.fk_accountancy_journal','',$param,'',$sortfield,$sortorder);
 if (! empty($arrayfields['toreconcile']['checked']))      print_liste_field_titre($arrayfields['toreconcile']['label'],$_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder);
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
@@ -488,16 +490,23 @@ foreach ($accounts as $key=>$type)
     if (! empty($arrayfields['b.account_number']['checked']))
     {
         include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-        print '<td>'.length_accountg($acc->account_number).'</td>';
+
+		$accountingaccount = new AccountingAccount($db);
+		$accountingaccount->fetch('',$acc->account_number);
+
+		print '<td>'.length_accountg($accountingaccount->getNomUrl(0,1,1,'',1)).'</td>';
+
 	    if (! $i) $totalarray['nbfield']++;
     }
     
     // Accountancy journal
-    if (! empty($arrayfields['b.accountancy_journal']['checked']))
+    if (! empty($arrayfields['b.fk_accountancy_journal']['checked']))
     {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-        print '<td>'.length_accountg($acc->accountancy_journal).'</td>';
-	    if (! $i) $totalarray['nbfield']++;
+		$accountingjournal = new AccountingJournal($db);
+		$accountingjournal->fetch($acc->fk_accountancy_journal);
+
+		print '<td>'.$accountingjournal->getNomUrl(0,1,1,'',1).'</td>';
+		if (! $i) $totalarray['nbfield']++;
     }
     
     // Transactions to reconcile
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index 6c4b41333f1..abf6d23d22e 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -89,7 +89,7 @@ $variousstatic = new PaymentVarious($db);
 $accountstatic = new Account($db);
 
 $sql = "SELECT v.rowid, v.amount, v.label, v.datep as datep, v.datev as datev, v.fk_typepayment as type, v.num_payment, v.fk_bank,";
-$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.accountancy_journal, ba.label as blabel,";
+$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel,";
 $sql.= " pst.code as payment_code";
 $sql.= " FROM ".MAIN_DB_PREFIX."payment_various as v";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON v.fk_typepayment = pst.id";
@@ -217,7 +217,7 @@ if ($result)
 	            $accountstatic->ref=$obj->bref;
 	            $accountstatic->number=$obj->bnumber;
 	            $accountstatic->accountancy_number=$obj->account_number;
-	            $accountstatic->accountancy_journal=$obj->accountancy_journal;
+	            $accountstatic->fk_accountancy_journal=$obj->fk_accountancy_journal;
 	            $accountstatic->label=$obj->blabel;
 	        	print $accountstatic->getNomUrl(1);
 	        }
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 9e4699b2e4b..a9293ea6915 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -260,7 +260,7 @@ UPDATE llx_accounting_journal SET nature = 4 where (code = 'BK' or code = 'BQ')
 
 
 ALTER TABLE llx_bank_account CHANGE COLUMN accountancy_journal fk_accountancy_journal integer;
-ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
+--ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
 
 
 
diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql
index 0a168d63990..986ca7ea550 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.key.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql
@@ -20,4 +20,4 @@
 
 ALTER TABLE llx_bank_account ADD UNIQUE uk_bank_account_label (label,entity);
 
-ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
+-- ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 9eb4135397f..92fe19676c0 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -61,7 +61,8 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
-ShowAccoutingAccount=Show accounting account
+ShowAccountingAccount=Show accounting account
+ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts

From 55feea5d9816a3a37042fe43ea790df7cfe1f613 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Sat, 6 May 2017 10:54:28 +0200
Subject: [PATCH 0741/1163] Update code using new css class

---
 htdocs/admin/stock.php             | 17 +++---------
 htdocs/categories/index.php        |  3 +--
 htdocs/categories/viewcat.php      | 43 ++++++++++--------------------
 htdocs/comm/card.php               |  3 +--
 htdocs/comm/index.php              | 11 ++------
 htdocs/comm/propal/stats/index.php |  5 ++--
 6 files changed, 24 insertions(+), 58 deletions(-)

diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index c8204f213c2..164e4fd6bc8 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2008-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012-2013 Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2013      Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2017 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -435,7 +435,6 @@ if ($virtualdiffersfromphysical)
 print '<br />';
 if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
 {
-	$var=false;
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Inventory").'</td>'."\n";
@@ -443,8 +442,7 @@ if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
 	print '<td align="center" width="100">&nbsp;</td>'."\n";
 	
 	// Example with a yes / no select
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("INVENTORY_DISABLE_VIRTUAL").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
 	print '<td align="right" width="300">';
@@ -457,8 +455,7 @@ if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
 	print '</td></tr>';
 	
 	// Example with a yes / no select
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
 	print '<td align="right" width="300">';
@@ -471,8 +468,7 @@ if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
 	print '</td></tr>';
 	
 	// Example with a yes / no select
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
 	print '<td align="right" width="300">';
@@ -487,7 +483,6 @@ if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
 	print '</table>';
 }
 
-$var=true;
 print '<table class="noborder" width="100%">';
 
 print '<tr class="liste_titre">';
@@ -509,8 +504,6 @@ if (! empty($conf->fournisseur->enabled) && !empty($conf->global->STOCK_CALCULAT
     print "</td>\n</tr>\n";
 }
 
-
-
 print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("UserWarehouseAutoCreate").'</td>';
 print '<td width="160" align="right">';
@@ -523,8 +516,6 @@ print '</form>';
 print "</td>\n";
 print "</tr>\n";
 
-
-
 print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("AllowAddLimitStockByWarehouse").'</td>';
 
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index ca2b7b5c76f..b68da6fd597 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -112,8 +112,7 @@ if ($catname || $id > 0)
 	$var=true;
 	foreach ($cats as $cat)
 	{
-		$var = ! $var;
-		print "\t<tr ".$bc[$var].">\n";
+		print "\t".'<tr class="oddeven">'."\n";
 		print "\t\t<td>";
 		$categstatic->id=$cat->id;
 		$categstatic->ref=$cat->label;
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index ebd5fa9991c..d04d0baebd2 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -289,11 +289,9 @@ else
 	print "</tr>\n";
 	if (count($cats) > 0)
 	{
-		$var=true;
 		foreach ($cats as $cat)
-		{
-			
-			print "\t<tr ".$bc[$var].">\n";
+		{			
+			print "\t".'<tr class="oddeven">'."\n";
 			print "\t\t".'<td class="nowrap">';
 			print "<a href='viewcat.php?id=".$cat->id."&amp;type=".$type."'>".$cat->label."</a>";
 			print "</td>\n";
@@ -360,11 +358,9 @@ if ($object->type == Categorie::TYPE_PRODUCT)
 
 		if (count($prods) > 0)
 		{
-			$var=true;
 			foreach ($prods as $prod)
-			{
-				
-				print "\t<tr ".$bc[$var].">\n";
+			{				
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $prod->getNomUrl(1);
 				print "</td>\n";
@@ -411,12 +407,9 @@ if ($object->type == Categorie::TYPE_SUPPLIER)
 
 		if (count($socs) > 0)
 		{
-			$var=true;
 			foreach ($socs as $soc)
-			{
-				
-				print "\t<tr ".$bc[$var].">\n";
-
+			{				
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $soc->getNomUrl(1);
 				print "</td>\n";
@@ -464,14 +457,13 @@ if($object->type == Categorie::TYPE_CUSTOMER)
 		if (count($socs) > 0)
 		{
 			$i = 0;
-			$var=true;
 			foreach ($socs as $key => $soc)
 			{
 				if ($user->societe_id > 0 && $soc->id != $user->societe_id)	continue; 	// External user always see only themself
 
 				$i++;
 				
-				print "\t<tr ".$bc[$var].">\n";
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $soc->getNomUrl(1);
 				print "</td>\n";
@@ -520,11 +512,9 @@ if ($object->type == Categorie::TYPE_MEMBER)
 
 		if (count($prods) > 0)
 		{
-			$var=true;
 			foreach ($prods as $key => $member)
-			{
-				
-				print "\t<tr ".$bc[$var].">\n";
+			{				
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				$member->ref=$member->login;
 				print $member->getNomUrl(1,0);
@@ -574,12 +564,11 @@ if($object->type == Categorie::TYPE_CONTACT)
 		if (count($contacts) > 0)
 		{
 			$i = 0;
-			$var=true;
 			foreach ($contacts as $key => $contact)
 			{
 				$i++;
 				
-				print "\t<tr ".$bc[$var].">\n";
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $contact->getNomUrl(1,'category');
 				print "</td>\n";
@@ -629,11 +618,9 @@ if ($object->type == Categorie::TYPE_ACCOUNT)
 
         if (count($accounts) > 0)
         {
-            $var=true;
             foreach ($accounts as $key => $account)
-            {
-                
-                print "\t<tr ".$bc[$var].">\n";
+            {              
+                print "\t".'<tr class="oddeven">'."\n";
                 print '<td class="nowrap" valign="top">';
                 print $account->getNomUrl(1,0);
                 print "</td>\n";
@@ -684,11 +671,9 @@ if ($object->type == Categorie::TYPE_PROJECT)
 
 		if (count($projects) > 0)
 		{
-			$var=true;
 			foreach ($projects as $key => $project)
-			{
-				
-				print "\t<tr ".$bc[$var].">\n";
+			{				
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $project->getNomUrl(1,0);
 				print "</td>\n";
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index aae1398109d..b933289be4f 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -788,8 +788,7 @@ if ($id > 0)
 
             while ($i < $num && $i < $MAXLIST) {
                 $objp = $db->fetch_object($resql);
-                $var = ! $var;
-                print "<tr " . $bc[$var] . ">";
+                print '<tr class="oddeven">';
                 print '<td class="nowrap">';
                 $sendingstatic->id = $objp->id;
                 $sendingstatic->ref = $objp->ref;
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 4bd999b1d5a..24bccbf9c9c 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2015       Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -479,7 +479,6 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-		$var=false;
 		$num = $db->num_rows($resql);
 		$i = 0;
 
@@ -544,7 +543,6 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
 	$result = $db->query($sql);
 	if ($result)
 	{
-		$var=false;
 		$num = $db->num_rows($result);
 		$i = 0;
 
@@ -633,11 +631,10 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO
 
 			$staticcontrat=new Contrat($db);
 
-			$var=false;
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				print "<tr ".$bc[$var]."><td><a href=\"../contrat/card.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"), 'contract')." ".$obj->ref."</a></td>";
+				print '<tr class="oddeven"><td><a href=\"../contrat/card.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"), "contract")." ".$obj->ref."</a></td>';
 				print '<td>';
                 $companystatic->id=$objp->rowid;
                 $companystatic->name=$objp->name;
@@ -686,8 +683,6 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 		$i = 0;
 		if ($num > 0)
 		{
-			$var=true;
-
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
 
@@ -785,8 +780,6 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 		$i = 0;
 		if ($num > 0)
 		{
-			$var=true;
-
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre"><th class="liste_titre" colspan="5">'.$langs->trans("OrdersOpened").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
 
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index abb24b8ffa4..5c74c8374a0 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -293,7 +293,6 @@ print '<td align="right">%</td>';
 print '</tr>';
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
     $year = $val['year'];
@@ -301,7 +300,7 @@ foreach ($data as $val)
     {	// If we have empty year
         $oldyear--;
         
-        print '<tr '.$bc[$var].' height="24">';
+        print '<tr class="oddeven" height="24">';
         print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
         print '<td align="right">0</td>';
         print '<td align="right"></td>';
@@ -311,7 +310,7 @@ foreach ($data as $val)
         print '<td align="right"></td>';
         print '</tr>';
     }
-    print '<tr '.$bc[$var].' height="24">';
+    print '<tr class="oddeven" height="24">';
     print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
     print '<td align="right">'.$val['nb'].'</td>';
 	print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';

From 44bdf91715d9bf065d9e71de9f24f71299f80556 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 12:43:45 +0200
Subject: [PATCH 0742/1163] Add badge with nb of imported calendard on user tab

---
 htdocs/core/lib/usergroups.lib.php | 29 +++++++++++++++++++++++------
 htdocs/holiday/list.php            |  2 +-
 htdocs/user/agenda_extsites.php    | 13 ++++++-------
 htdocs/user/bank.php               |  3 ++-
 htdocs/user/card.php               |  2 +-
 htdocs/user/clicktodial.php        |  3 ++-
 htdocs/user/document.php           |  2 +-
 htdocs/user/info.php               |  2 +-
 htdocs/user/ldap.php               |  2 +-
 htdocs/user/note.php               | 14 +++++++-------
 htdocs/user/notify/card.php        |  3 ++-
 htdocs/user/perms.php              |  2 +-
 12 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 8936cf98623..3b3cde1d66a 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -59,6 +59,11 @@ function user_prepare_head($object)
 	    $h++;
 	}
 
+    $head[$h][0] = DOL_URL_ROOT.'/user/param_ihm.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("UserGUISetup");
+    $head[$h][2] = 'guisetup';
+    $h++;
+
 	if ($canreadperms)
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$object->id;
@@ -67,15 +72,27 @@ function user_prepare_head($object)
 		$h++;
 	}
 
-    $head[$h][0] = DOL_URL_ROOT.'/user/param_ihm.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("UserGUISetup");
-    $head[$h][2] = 'guisetup';
-    $h++;
-
     if (! empty($conf->agenda->enabled))
     {
+        if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
+        $MAXAGENDA=$conf->global->AGENDA_EXT_NB;
+        
+        $i=1;
+        $nbagenda = 0;
+        while ($i <= $MAXAGENDA)
+        {
+            $key=$i;
+            $name='AGENDA_EXT_NAME_'.$object->id.'_'.$key;
+            $src='AGENDA_EXT_SRC_'.$object->id.'_'.$key;
+            $offsettz='AGENDA_EXT_OFFSETTZ_'.$object->id.'_'.$key;
+            $color='AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
+            $i++;
+        
+            if (! empty($object->conf->$name)) $nbagenda++;
+        }
+        
 	    $head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id;
-	    $head[$h][1] = $langs->trans("ExtSites");
+	    $head[$h][1] = $langs->trans("ExtSites").($nbagenda ? ' <span class="badge">'.$nbagenda.'</span>' : '');
 	    $head[$h][2] = 'extsites';
 	    $h++;
     }
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index f91616d0b9a..d35fa9293c3 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -202,7 +202,7 @@ $user_id = $user->id;
 if ($id > 0)
 {
 	// Charge utilisateur edite
-	$fuser->fetch($id);
+	$fuser->fetch($id, '', '', 1);
 	$fuser->getrights();
 	$user_id = $fuser->id;
 }
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index d8aba34a934..e789a8277f3 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -42,7 +42,7 @@ $actiontest=GETPOST('test','alpha');
 $actionsave=GETPOST('save','alpha');
 
 if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
-$MAXAGENDA=empty($conf->global->AGENDA_EXT_NB)?5:$conf->global->AGENDA_EXT_NB;
+$MAXAGENDA=$conf->global->AGENDA_EXT_NB;
 
 // List of available colors
 $colorlist=array('BECEDD','DDBECE','BFDDBE','F598B4','F68654','CBF654','A4A4A5');
@@ -50,7 +50,8 @@ $colorlist=array('BECEDD','DDBECE','BFDDBE','F598B4','F68654','CBF654','A4A4A5')
 // Security check
 $id = GETPOST('id','int');
 $object = new User($db);
-$object->fetch($id);
+$object->fetch($id, '', '', 1);
+$object->getrights();
 
 // Security check
 $socid=0;
@@ -81,12 +82,12 @@ if (empty($reshook)) {
 	if ($actionsave) {
 		$db->begin();
 
-		$i = 1;
 		$errorsaved = 0;
 		$error = 0;
 		$tabparam = array();
 
 		// Save agendas
+		$i = 1;
 		while ($i <= $MAXAGENDA) {
 			$name = trim(GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$i, 'alpha'));
 			$src = trim(GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$i, 'alpha'));
@@ -110,7 +111,7 @@ if (empty($reshook)) {
 			$tabparam['AGENDA_EXT_COLOR_'.$id.'_'.$i]=$color;
 			$tabparam['AGENDA_EXT_ENABLED_'.$id.'_'.$i]=$enabled;
 
-			$i ++;
+			$i++;
 		}
 
 		if (!$error) {
@@ -167,7 +168,6 @@ print "<br>\n";
 $selectedvalue=$conf->global->AGENDA_DISABLE_EXT;
 if ($selectedvalue==1) $selectedvalue=0; else $selectedvalue=1;
 
-$var=true;
 print '<div class="div-table-responsive">';
 print "<table class=\"noborder\" width=\"100%\">";
 
@@ -180,7 +180,6 @@ print '<td align="right">'.$langs->trans("Color").'</td>';
 print "</tr>";
 
 $i=1;
-$var=true;
 while ($i <= $MAXAGENDA)
 {
 	$key=$i;
@@ -189,7 +188,7 @@ while ($i <= $MAXAGENDA)
 	$offsettz='AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key;
 	$color='AGENDA_EXT_COLOR_'.$id.'_'.$key;
 
-	
+
 	print '<tr class="oddeven">';
 	// Nb
 	print '<td class="maxwidth50onsmartphone">'.$langs->trans("AgendaExtNb",$key)."</td>";
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index c9551cdbc23..9f36bc91e31 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -50,7 +50,8 @@ $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 $object = new User($db);
 if ($id > 0 || ! empty($ref))
 {
-	$result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref, '', 1);
+	$object->getrights();
 }
 
 /*
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 3255dc676cf..675f5748842 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1140,7 +1140,7 @@ else
 
     if ($id > 0)
     {
-        $object->fetch($id);
+        $object->fetch($id, '', '', 1);
         if ($res < 0) { dol_print_error($db,$object->error); exit; }
         $res=$object->fetch_optionals($object->id,$extralabels);
 		
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 5299f348431..1500a3be55c 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -83,7 +83,8 @@ llxHeader("","ClickToDial");
 if ($id > 0)
 {
     $object = new User($db);
-    $object->fetch($id);
+    $object->fetch($id, '', '', 1);
+    $object->getrights();
     $object->fetch_clicktodial();
 
 
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index a8d5000e809..8b055979992 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -86,7 +86,7 @@ if (! $sortfield) $sortfield="name";
 $object = new User($db);
 if ($id > 0 || ! empty($ref))
 {
-	$result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref, '', 1);
 	$object->getrights();
 	$entitytouseforuserdir = $object->entity;
 	if (empty($entitytouseforuserdir)) $entitytouseforuserdir=1;
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 86bff7147ff..d20624063f2 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -34,7 +34,7 @@ $id = GETPOST('id','int');
 $object = new User($db);
 if ($id > 0 || ! empty($ref))
 {
-	$result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref, '', 1);
 	$object->getrights();
 }
 
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 0f0cc6b4ed7..252ed9f82b4 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -42,7 +42,7 @@ if ($user->id == $id) $feature2=''; // A user can always read its own card
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
 $object = new User($db);
-$object->fetch($id);
+$object->fetch($id, '', '', 1);
 $object->getrights();
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index ca9f821d14c..2844676a465 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -36,7 +36,7 @@ $langs->load("bills");
 $langs->load("users");
 
 $object = new User($db);
-$object->fetch($id);
+$object->fetch($id, '', '', 1);
 $object->getrights();
 
 // If user is not user read and no permission to read other users, we stop
@@ -53,9 +53,9 @@ $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 
-/******************************************************************************/
-/*                     Actions                                                */
-/******************************************************************************/
+/*
+ * Actions
+ */
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -76,9 +76,9 @@ if (empty($reshook)) {
 }
 
 
-/******************************************************************************/
-/* Affichage fiche                                                            */
-/******************************************************************************/
+/*
+ * View
+ */
 
 llxHeader();
 
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 4f47578f543..2b7c31d75df 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -122,7 +122,8 @@ if ($action == 'delete')
 $form = new Form($db);
 
 $object = new User($db);
-$result=$object->fetch($id);
+$result=$object->fetch($id, '', '', 1);
+$object->getrights();
 
 $title=$langs->trans("ThirdParty").' - '.$langs->trans("Notification");
 if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Notification");
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index e84cfe09ca8..b40c79f783e 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -68,7 +68,7 @@ $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 if ($user->id <> $id && ! $canreaduser) accessforbidden();
 
 $object = new User($db);
-$object->fetch($id);
+$object->fetch($id, '', '', 1);
 $object->getrights();
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array

From d948447600f7d6ab6fd546b6c091bb6bf7b3dd78 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 17:08:38 +0200
Subject: [PATCH 0743/1163] Add button to disable all personalized default
 values in one click.

---
 htdocs/admin/defaultvalues.php    | 22 ++++++++++++++++++++++
 htdocs/admin/modules.php          | 20 ++++++++++++--------
 htdocs/admin/stock.php            |  1 +
 htdocs/core/lib/functions.lib.php |  2 +-
 htdocs/langs/en_US/admin.lang     |  1 +
 htdocs/product/traduction.php     |  7 +++----
 6 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index ec4c5fd4605..dd37e4987e5 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -84,6 +84,11 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
     $search_array_options=array();
 }
 
+if ($action == 'setMAIN_ENABLE_DEFAULT_VALUES')
+{
+    if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 1, 'chaine', 0, '', $conf->entity);
+    else dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 0, 'chaine', 0, '', $conf->entity);
+}
 
 if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('actionmodify'))
 {
@@ -185,6 +190,23 @@ print load_fiche_titre($langs->trans("DefaultValues"),'','title_setup');
 print $langs->trans("DefaultValuesDesc")."<br>\n";
 print "<br>\n";
 
+print $langs->trans("EnableDefaultValues").' ';
+if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
+{
+    // Button off, click to enable
+    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
+    print '</a>';
+}
+else
+{
+    // Button on, click to disable
+    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
+    print '</a>';
+}
+print "<br><br>\n";
+
 $param='&mode='.$mode;
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index c47586b2b2a..88944ee589a 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -640,7 +640,8 @@ if ($mode == 'common')
         {
         	$disableSetup = 0;
 
-        	print '<td class="center valignmiddle" width="80px">';
+        	// Link enable/disabme
+        	print '<td class="center valignmiddle" width="60px">';
         	if (! empty($arrayofwarnings[$modName]))
 	        {
                 print '<!-- This module has a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";
@@ -662,12 +663,12 @@ if ($mode == 'common')
         	}
         	print '</td>'."\n";
 
-        	// Config link
+        	// Link config
         	if (! empty($objMod->config_page_url) && !$disableSetup)
         	{
         		if (is_array($objMod->config_page_url))
         		{
-        			print '<td class="tdsetuppicto right" width="40px"">';
+        			print '<td class="tdsetuppicto right" width="60px">';
         			$i=0;
         			foreach ($objMod->config_page_url as $page)
         			{
@@ -693,22 +694,23 @@ if ($mode == 'common')
         		}
         		else if (preg_match('/^([^@]+)@([^@]+)$/i',$objMod->config_page_url,$regs))
         		{
-        			print '<td class="tdsetuppicto right valignmiddle" width="80px"><a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
+        			print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
         		}
         		else
         		{
-        			print '<td class="tdsetuppicto right valignmiddle" width="80px"><a href="'.$objMod->config_page_url.'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
+        			print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.$objMod->config_page_url.'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
         		}
         	}
         	else
         	{
-        		print '<td class="tdsetuppicto right valignmiddle" width="80px">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
+        		print '<td class="tdsetuppicto right valignmiddle" width="60px">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
         	}
 
         }
         else	// Module not yet activated
 		{
-        	print '<td class="center valignmiddle" width="80px">';
+		    // Link enable/disable
+        	print '<td class="center valignmiddle" width="60px">';
 		    if (! empty($objMod->always_enabled))
         	{
         		// Should never happened
@@ -754,7 +756,9 @@ if ($mode == 'common')
 	        	print "</a>\n";
         	}
         	print "</td>\n";
-        	print '<td class="tdsetuppicto right valignmiddle" width="80px">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
+        	
+        	// Link config
+        	print '<td class="tdsetuppicto right valignmiddle" width="60px">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
         }
 
         print "</tr>\n";
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index c8204f213c2..72ff0f17a1b 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -149,6 +149,7 @@ if (! empty($conf->productbatch->enabled))
 //if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
 //{
 print info_admin($langs->trans("IfYouUsePointOfSaleCheckModule"));
+print '<br>';
 //}
 
 // Title rule for stock decrease
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 262204b9f72..e3c6cb7d5cd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -260,7 +260,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	    global $conf;
 	    
 	    // Management of default values
-	    if (! isset($_GET['sortfield']) && empty($conf->global->MAIN_DISABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_DISABLE_DEFAULT_VALUES is on
+	    if (! isset($_GET['sortfield']) && ! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_DISABLE_DEFAULT_VALUES is on
 	    {
 	        if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 14131bddd2c..8425aa2c4c6 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -431,6 +431,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have
 PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
+EnableDefaultValues=Enable usage of personalized default values
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
 WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior. 
 Field=Field
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index b5f4b8b34ae..03f7e1c54ac 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -277,16 +277,14 @@ if ($action == 'edit')
 }
 else if ($action != 'add')
 {
-    //if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
-    
 	if (! empty($object->multilangs))
 	{
 		foreach ($object->multilangs as $key => $value)
 		{
 			$s=picto_from_langcode($key);
-			//print '<tr><td>';
 			print ($s?$s.' ':'')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>';
-			//print '</td><td></td></tr>';
+			
+			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border" width="100%">';
 			print '<tr><td class="titlefieldcreate">'.$langs->trans('Label').'</td><td>'.$object->multilangs[$key]["label"].'</td></tr>';
@@ -296,6 +294,7 @@ else if ($action != 'add')
                 print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
 			}
 			print '</table>';
+			print '</div>';
 		}
 	}
 	if (! $cnt_trans && $action != 'add') print '<div class="opacitymedium">'. $langs->trans('NoTranslation').'</div>';

From 910a92516711a006ad0f7424b4d3f44ce2de7594 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 20:43:14 +0200
Subject: [PATCH 0744/1163] NEW Add last activation author and ip of modules

---
 htdocs/admin/modulehelp.php                   |  18 ++++++++
 htdocs/admin/modules.php                      |   6 +--
 htdocs/admin/user.php                         |   4 +-
 htdocs/admin/usergroup.php                    |   2 +-
 htdocs/comm/mailing/card.php                  |   2 +-
 htdocs/core/lib/admin.lib.php                 |   2 +-
 htdocs/core/menus/standard/auguria.lib.php    |   2 +-
 htdocs/core/menus/standard/eldy.lib.php       |   2 +-
 htdocs/core/modules/DolibarrModules.class.php |  42 ++++++++++++++++--
 htdocs/core/tpl/login.tpl.php                 |   2 +-
 htdocs/core/tpl/passwordforgotten.tpl.php     |   2 +-
 htdocs/langs/en_US/admin.lang                 |   4 +-
 htdocs/societe/admin/contact_extrafields.php  |   2 +-
 htdocs/societe/admin/societe.php              |   2 +-
 htdocs/societe/admin/societe_extrafields.php  |   2 +-
 htdocs/theme/dolibarr_logo.png                | Bin 14646 -> 10289 bytes
 htdocs/theme/eldy/style.css.php               |  10 ++++-
 htdocs/user/admin/group_extrafields.php       |   2 +-
 htdocs/user/admin/user_extrafields.php        |   2 +-
 19 files changed, 84 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 htdocs/theme/dolibarr_logo.png

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 94bfa8e05bb..d318566ff61 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -330,6 +330,24 @@ if ($mode == 'desc')
     else $text.=$langs->trans("Disabled");
     $text.='<br>';
 
+    $tmp = $objMod->getLastActivationInfo();
+    $authorid = $tmp['authorid'];
+    if ($authorid > 0)
+    {
+        $tmpuser = new User($db);
+        $tmpuser->fetch($authorid);
+        $text.='<strong>'.$langs->trans("LastActivationAuthor").':</strong> ';
+        $text.= $tmpuser->getNomUrl(1);
+        $text.='<br>';
+    }
+    $ip = $tmp['ip'];
+    if ($ip)
+    {
+        $text.='<strong>'.$langs->trans("LastActivationIP").':</strong> ';
+        $text.= $ip;
+        $text.='<br>';
+    }    
+    
     $moduledesclong=$objMod->getDescLong();
     if ($moduledesclong) $text.='<br><hr><div class="moduledesclong">'.$moduledesclong.'<div>';
 }
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 88944ee589a..433508be908 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -402,9 +402,9 @@ if ($nbofactivatedmodules <= 1) $moreinfo .= ' '.img_warning($langs->trans("YouM
 print load_fiche_titre($langs->trans("ModulesSetup"),$moreinfo,'title_setup');
 
 // Start to show page
-if ($mode=='common')      print $langs->trans("ModulesDesc")."<br>\n";
-if ($mode=='marketplace') print $langs->trans("ModulesMarketPlaceDesc")."<br>\n";
-if ($mode=='deploy')      print $langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br>\n";
+if ($mode=='common')      print '<span class="opacitymedium">'.$langs->trans("ModulesDesc")."</span><br>\n";
+if ($mode=='marketplace') print '<span class="opacitymedium">'.$langs->trans("ModulesMarketPlaceDesc")."</span><br>\n";
+if ($mode=='deploy')      print '<span class="opacitymedium">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."</span><br>\n";
 
 
 $h = 0;
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 42feea8f8ec..0c7574b7ec4 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -167,7 +167,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
 
 $head=user_admin_prepare_head();
 
-dol_fiche_head($head,'card', $langs->trans("MenuUsersAndGroups"), 0, 'user');
+dol_fiche_head($head,'card', $langs->trans("MenuUsersAndGroups"), -1, 'user');
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -205,7 +205,7 @@ print '</td></tr>';
 
 print '</table>';
 
-
+print '<br>';
 
 $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index db5ef3cbf59..4642e6d3183 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -151,7 +151,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
 
 $head=user_admin_prepare_head();
 
-dol_fiche_head($head,'usergroupcard', $langs->trans("MenuUsersAndGroups"), 0, 'user');
+dol_fiche_head($head,'usergroupcard', $langs->trans("MenuUsersAndGroups"), -1, 'user');
 
 
 $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index fe582d56656..0b4c3c239f9 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1057,7 +1057,7 @@ else
 			// Print mail content
 			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
 			
-			dol_fiche_head('');
+			dol_fiche_head('', '', '', -1);
 			
 			print '<table class="border" width="100%">';
 
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 4beb49107d2..2016807efe9 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -812,7 +812,7 @@ function activateModule($value,$withdeps=1)
         return $ret;
     }
 
-    $result=$objMod->init();
+    $result=$objMod->init();    // Enable module
     if ($result <= 0) 
     {
         $ret['errors'][]=$objMod->error;
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index e95359e5683..d2d8e36b8ca 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -269,7 +269,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 		print '<div class="menu_titre" id="menu_titre_logo"></div>';
 		print '<div class="menu_top" id="menu_top_logo"></div>';
 		print '<div class="menu_contenu" id="menu_contenu_logo">';
-		print '<div class="center"><img title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 80%"></div>'."\n";
+		print '<div class="center"><img title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 70%"></div>'."\n";
 		print '</div>';
 		print '<div class="menu_end" id="menu_end_logo"></div>';
 		print '</div>'."\n";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 4c873830948..b51292a0bb8 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -478,7 +478,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 		print '<div class="menu_titre" id="menu_titre_logo"></div>';
 		print '<div class="menu_top" id="menu_top_logo"></div>';
 		print '<div class="menu_contenu" id="menu_contenu_logo">';
-		print '<div class="center"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 80%"></div>'."\n";
+		print '<div class="center"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 70%"></div>'."\n";
 		print '</div>';
 		print '<div class="menu_end" id="menu_end_logo"></div>';
 		print '</div>'."\n";
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 48ce35f1532..d0559268c52 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -795,6 +795,37 @@ class DolibarrModules           // Can not be abstract, because we need to insta
     }
     
     
+    /**
+     * Gives the last author of activation
+     *
+     * @return  array       Array array('authorid'=>Id of last activation user, 'lastactivationdate'=>Date of last activation)
+     */
+    function getLastActivationInfo()
+    {
+        global $conf;
+        
+        $sql = "SELECT tms, note FROM ".MAIN_DB_PREFIX."const";
+        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
+        $sql.= " AND entity IN (0, ".$conf->entity.")";
+        
+        dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if (! $resql) $err++;
+        else
+        {
+            $obj=$this->db->fetch_object($resql);
+            $tmp=array();
+            if ($obj->note)
+            {
+                $tmp=json_decode($obj->note, true);
+            }
+            if ($obj) return array('authorid'=>$tmp['authorid'], 'ip'=>$tmp['ip'], 'lastactivationdate'=>$this->db->jdate($obj->tms));
+        }
+        
+        return array();
+    }
+    
+    
     /**
      * Insert constants for module activation
      *
@@ -802,7 +833,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      */
     function _active()
     {
-        global $conf;
+        global $conf, $user;
 
         $err = 0;
 
@@ -817,10 +848,13 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         $resql=$this->db->query($sql);
         if (! $resql) $err++;
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible,entity) VALUES";
+        $note=json_encode(array('authorid'=>$user->id, 'ip'=>$_SERVER['REMOTE_ADDR']));
+        
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, value, visible, entity, note) VALUES";
         $sql.= " (".$this->db->encrypt($this->const_name,1);
-        $sql.= ",".$this->db->encrypt('1',1);
-        $sql.= ",0,".$entity.")";
+        $sql.= ", ".$this->db->encrypt('1',1);
+        $sql.= ", 0, ".$entity;
+        $sql.= ", '".$this->db->escape($note)."')";
 
         dol_syslog(get_class($this)."::_active", LOG_DEBUG);
         $resql=$this->db->query($sql);
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 1245041d98a..81e3936d300 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -258,7 +258,7 @@ if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
 <?php if ($main_home)
 {
 ?>
-	<div class="center login_main_home" style="max-width: 80%">
+	<div class="center login_main_home" style="max-width: 70%">
 	<?php echo $main_home; ?>
 	</div><br>
 <?php
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index bdc38b08873..ad29cbfcd3d 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -151,7 +151,7 @@ if (! empty($hookmanager->resArray['options'])) {
 </form>
 
 
-<div class="center login_main_home" style="max-width: 80%">
+<div class="center login_main_home" style="max-width: 70%">
 <?php if ($mode == 'dolibarr' || ! $disabled) { ?>
 	<font style="font-size: 12px;">
 	<?php echo $langs->trans('SendNewPasswordDesc'); ?>
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 8425aa2c4c6..5fd5cb57c8b 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -302,6 +302,8 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
+LastActivationAuthor=Latest activation author
+LastActivationIP=Latest activation IP
 UpdateServerOffline=Update server offline
 WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
@@ -1099,7 +1101,7 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TotalNumberOfActivatedModules=Activated feature/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index 37db7d02e4c..2a60252f7f8 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
 
 $head = societe_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_contacts', $langs->trans("ThirdParties"), 0, 'company');
+dol_fiche_head($head, 'attributes_contacts', $langs->trans("ThirdParties"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 517672d14ed..63ba12197fd 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -307,7 +307,7 @@ print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
 
 $head = societe_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), 0, 'company');
+dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), -1, 'company');
 
 $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
 
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index 89f44d53aa7..a722ec61b86 100644
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -71,7 +71,7 @@ print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
 
 $head = societe_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("ThirdParties"), 0, 'company');
+dol_fiche_head($head, 'attributes', $langs->trans("ThirdParties"), -1, 'company');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/theme/dolibarr_logo.png b/htdocs/theme/dolibarr_logo.png
old mode 100644
new mode 100755
index 3ee46b5155303f5f03b05594070a6c076e773636..5287d9dcc25bc48dddcc351dd4aa64fd83322463
GIT binary patch
literal 10289
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
DtGo)<

literal 14646
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

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f4d5c5c32bd..b6e1fa0569d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -90,7 +90,7 @@ $colorbacklinepair1='248,248,248';    // line pair
 $colorbacklinepair2='248,248,248';    // line pair
 $colorbacklinepairhover='238,246,252';    // line pair
 $colorbackbody='255,255,255';
-$colortexttitlenotab='60,60,20';
+$colortexttitlenotab='100,60,20';
 $colortexttitle='0,0,0';
 $colortext='0,0,0';
 $colortextlink='0,0,120';
@@ -988,6 +988,9 @@ div.fiche {
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
 	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
 }
+div.fiche>table:first-child {
+	margin-bottom: 15px !important;
+}
 div.fichecenter {
 	/* margin-top: 10px; */
 	width: 100%;
@@ -2018,6 +2021,9 @@ a.tabTitle {
     white-space: nowrap;
 }
 
+a.tabunactive {
+    color: rgb(<?php print $colortextlink; ?>) !important;
+}
 a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	font-family: <?php print $fontlist ?>;
 	padding: 12px 9px 12px;
@@ -3034,7 +3040,7 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
 div.titre {
 	font-family: <?php print $fontlist ?>;
 	font-size: 14px;
-	/* font-weight: bold; */
+	font-weight: bold;
 	color: rgb(<?php print $colortexttitlenotab; ?>);
 	text-decoration: none;
 	padding-top: 5px;
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
index 99eab0e3a88..8dad702935f 100644
--- a/htdocs/user/admin/group_extrafields.php
+++ b/htdocs/user/admin/group_extrafields.php
@@ -71,7 +71,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
 
 $head = user_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_group', $langs->trans("MenuUsersAndGroups"), 0, 'user');
+dol_fiche_head($head, 'attributes_group', $langs->trans("MenuUsersAndGroups"), -1, 'user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index bb035d9f95f..28bf22da654 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
 
 $head = user_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("MenuUsersAndGroups"), 0, 'user');
+dol_fiche_head($head, 'attributes', $langs->trans("MenuUsersAndGroups"), -1, 'user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 

From f4447f9c87dc91386960d997c606c185f67d8cf2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 21:39:00 +0200
Subject: [PATCH 0745/1163] Fix bookmark jump

---
 htdocs/bookmarks/bookmarks.lib.php | 21 ++++++++++++++++-----
 htdocs/theme/eldy/graph-color.php  |  2 +-
 htdocs/theme/eldy/style.css.php    |  8 ++++----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 26089c3d07c..c1882ce4bf9 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -62,14 +62,15 @@ function printBookmarksList($aDb, $aLangs)
     */
 	$ret.= '<div class="menu_top"></div>'."\n";
 
-	$ret.= '<!-- form with GET method --><form id="actionbookmark" name="actionbookmark" method="GET" action="">';
+	$ret.= '<!-- form with POST method by default --><form id="actionbookmark" name="actionbookmark" method="POST" action="">';
 	$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo">';
 	$ret.= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
-    $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_js(DOL_URL_ROOT.'/bookmarks/list.php').'">'.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
+    $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'">'.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
+	// Url to go on create new bookmark page
 	if ($user->rights->bookmark->creer)
 	{
     	$urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url);
-    	$ret.= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_js($urltoadd).'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'...</option>';
+    	$ret.= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_htmltag($urltoadd).'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'...</option>';
 	}
 	// Menu with all bookmarks
 	if (! empty($conf->global->BOOKMARKS_SHOW_IN_MENU))
@@ -84,7 +85,7 @@ function printBookmarksList($aDb, $aLangs)
 			while ($i < $conf->global->BOOKMARKS_SHOW_IN_MENU && $obj = $db->fetch_object($resql))
 			{
 				//$ret.='<div class="menu_contenu">';
-			    $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_js($obj->url).'">'.img_picto('','object_bookmark').' '.$obj->title.'</option>';
+			    $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_htmltag($obj->url).'">'.img_picto('','object_bookmark').' '.$obj->title.'</option>';
 				/*$ret.='<a class="vsmenu" title="'.$obj->title.'" href="'.$obj->url.'"'.($obj->target == 1?' target="_blank"':'').'>';
 				if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $ret.=' '.img_object('','bookmark').' ';
 				$ret.= dol_trunc($obj->title, 20).'</a><br>';*/
@@ -109,9 +110,19 @@ function printBookmarksList($aDb, $aLangs)
 	            var urlselected = jQuery("#boxbookmark option:selected").attr("rel");
 	            var urltarget = jQuery("#boxbookmark option:selected").attr("target");
 	            if (! urltarget) { urltarget=""; }
-	            console.log("We change select bookmark. We choose "+urlselected+" with target "+urltarget);
                 jQuery("form#actionbookmark").attr("target",urltarget);
 	            jQuery("form#actionbookmark").attr("action",urlselected);
+	    
+	            console.log("We change select bookmark. We choose urlselected="+urlselected+" with target="+urltarget);
+	            
+	            // Method is POST for internal link, GET for external
+	            if (urlselected.startsWith(\'http\'))
+	            {
+	                var newmethod=\'GET\';
+	                jQuery("form#actionbookmark").attr("method",newmethod);
+	                console.log("We change method to newmethod="+newmethod);
+	            }
+	    
 	            jQuery("#actionbookmark").submit();
 	       });';
 	$ret.='})</script>';
diff --git a/htdocs/theme/eldy/graph-color.php b/htdocs/theme/eldy/graph-color.php
index 5995303c34a..920fa7833af 100644
--- a/htdocs/theme/eldy/graph-color.php
+++ b/htdocs/theme/eldy/graph-color.php
@@ -28,7 +28,7 @@
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
 $theme_bordercolor = array(235,235,224);
-$theme_datacolor = array(array(136,102,136), array(140,140,220), array(190,120,120), array(0,160,140), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
+$theme_datacolor = array(array(136,102,136), array(0,130,110), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
 $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
 $theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b6e1fa0569d..3278b685c80 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -93,7 +93,7 @@ $colorbackbody='255,255,255';
 $colortexttitlenotab='100,60,20';
 $colortexttitle='0,0,0';
 $colortext='0,0,0';
-$colortextlink='0,0,120';
+$colortextlink='0,0,100';
 $fontsize='13';
 $fontsizesmaller='12';
 $useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
@@ -2948,15 +2948,15 @@ div.error {
 
 /* Info admin */
 div.info {
-  color: #303035;
+  color: #fff;
   padding: 0.4em 0.4em 0.4em 0.4em;
   margin: 0.5em 0em 0.5em 0em;
   border: 1px solid #e0e0e0;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
-  background: #EaE4Ea;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background: #806090;
+  /* text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); */
 }
 
 div.warning a, div.info a, div.error a {

From 46ff62fc871948f00ef1dceea973c9c79bee58bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 May 2017 22:28:07 +0200
Subject: [PATCH 0746/1163] Work on inventory module debug

---
 htdocs/admin/stock.php                        |  2 +-
 htdocs/core/class/commonobject.class.php      | 34 +++++++++++-------
 htdocs/core/class/coreobject.class.php        |  2 --
 htdocs/core/menus/standard/eldy.lib.php       |  2 +-
 htdocs/core/modules/modStock.class.php        | 35 +++++++++++--------
 htdocs/install/mysql/tables/llx_fichinter.sql |  1 -
 htdocs/install/mysql/tables/llx_inventory.sql | 25 +++++++------
 htdocs/product/inventory/card.php             | 27 ++++++++------
 .../inventory/class/inventory.class.php       |  4 ++-
 .../product/inventory/tpl/inventory.tpl.php   |  4 +--
 10 files changed, 79 insertions(+), 57 deletions(-)

diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 72ff0f17a1b..050e00e6278 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -434,7 +434,7 @@ if ($virtualdiffersfromphysical)
 
 
 print '<br />';
-if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
 	$var=false;
 	print '<table class="noborder" width="100%">';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 29dcc413221..947d99af545 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4938,25 +4938,33 @@ abstract class CommonObject
 		
 		if(!empty($id)) $sql.= ' WHERE rowid = '.$id;
 		else  $sql.= ' WHERE ref = \''.$this->quote($ref).'\'';
-		
+
 		$res = $this->db->query($sql);
-		if($obj = $this->db->fetch_object($res))
+		if ($res)
 		{
-			$this->id = $id;
-			$this->set_vars_by_db($obj);
-			
-			$this->datec = $this->db->idate($obj->datec);
-			$this->tms = $this->db->idate($obj->tms);
-			
-			return $this->id;
+    		if ($obj = $this->db->fetch_object($res))
+    		{
+    			$this->id = $id;
+    			$this->set_vars_by_db($obj);
+    			
+    			$this->datec = $this->db->idate($obj->datec);
+    			$this->tms = $this->db->idate($obj->tms);
+    			
+    			return $this->id;
+    		}
+    		else
+    		{
+    			$this->error = $this->db->lasterror();
+    			$this->errors[] = $this->error;
+    			return -1;
+    		}
 		}
 		else
 		{
-			$this->error = $this->db->lasterror();
-			$this->errors[] = $this->error;
-			return -1;
+		    $this->error = $this->db->lasterror();
+		    $this->errors[] = $this->error;
+		    return -1;
 		}
-		
 	}
 
 	/**
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 021213594f7..1456fb991c2 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -106,14 +106,12 @@ class CoreObject extends CommonObject
      */
 	public function fetch($id, $loadChild = true)
     {
-		
     	$res = $this->fetchCommon($id);
     	if($res>0) {
     		if ($loadChild) $this->fetchChild();
     	}
     	
     	return $res;
-		
 	}
 
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index b51292a0bb8..b7a372e50bd 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1265,7 +1265,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			}
 
 			// Inventory
-			if ($conf->global->MAIN_LEVEL_FEATURES >= 2)
+			if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 			{
     			if (! empty($conf->stock->enabled))
     			{
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index e80966afb81..be6817062b6 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -117,32 +117,37 @@ class modStock extends DolibarrModules
 		$this->rights[4][4] = 'mouvement';
 		$this->rights[4][5] = 'creer';
 
-		if ($conf->global->MAIN_LEVEL_FEATURES >= 2) {
+		if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 		
-		$this->rights[5][0] = 1006;
+		$this->rights[5][0] = 1011;
 		$this->rights[5][1] = 'inventoryReadPermission';	// Permission label
 		$this->rights[5][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[5][4] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[5][4] = 'advance_inventory';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[5][5] = 'read';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[6][0] = 1007;
+		$this->rights[6][0] = 1012;
 		$this->rights[6][1] = 'inventoryCreatePermission';	// Permission label
 		$this->rights[6][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[6][4] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[6][4] = 'advance_inventory';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[6][5] = 'create';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[7][0] = 1008;
+		$this->rights[7][0] = 1013;
 		$this->rights[7][1] = 'inventoryWritePermission';	// Permission label
 		$this->rights[7][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[7][4] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[7][4] = 'advance_inventory';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[7][5] = 'write';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[7][0] = 1009;
-		$this->rights[7][1] = 'inventoryValidatePermission';	// Permission label
-		$this->rights[7][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[7][4] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[8][0] = 1014;
+		$this->rights[8][1] = 'inventoryValidatePermission';	// Permission label
+		$this->rights[8][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[8][4] = 'advance_inventory';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[8][5] = 'validate';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
-		$this->rights[7][0] = 1010;
-		$this->rights[7][1] = 'inventoryChangePMPPermission';	// Permission label
-		$this->rights[7][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[7][4] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[9][0] = 1015;
+		$this->rights[9][1] = 'inventoryChangePMPPermission';	// Permission label
+		$this->rights[9][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[9][4] = 'advance_inventory';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[9][5] = 'changePMP';			// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		
 		}
 		
diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql
index b3e2001f9c3..926a05a738e 100644
--- a/htdocs/install/mysql/tables/llx_fichinter.sql
+++ b/htdocs/install/mysql/tables/llx_fichinter.sql
@@ -43,5 +43,4 @@ create table llx_fichinter
   note_public		text,
   model_pdf			varchar(255),
   extraparams		varchar(255)				-- for stock other parameters with json format
-  
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_inventory.sql b/htdocs/install/mysql/tables/llx_inventory.sql
index f906699f5dd..ce1a2c93744 100644
--- a/htdocs/install/mysql/tables/llx_inventory.sql
+++ b/htdocs/install/mysql/tables/llx_inventory.sql
@@ -1,6 +1,6 @@
 -- ===================================================================
--- Copyright (C) 2012      Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2017	ATM Consulting		<support@atm-consulting.fr>
+-- Copyright (C) 2017   Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2017	ATM Consulting		 <support@atm-consulting.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -19,13 +19,18 @@
 
 CREATE TABLE llx_inventory 
 ( 
-rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
-datec datetime DEFAULT NULL,
-tms timestamp, 
-fk_warehouse integer DEFAULT 0, 
-entity integer DEFAULT 0, 
-status integer DEFAULT 0, 
-title varchar(255) NOT NULL, 
-date_inventory datetime DEFAULT NULL
+  rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+  entity integer DEFAULT 0, 
+  ref varchar(48),
+  datec datetime DEFAULT NULL,
+  tms timestamp, 
+  fk_user_author	integer,					-- user making creation
+  fk_user_modif     integer,                   -- user making last change
+  fk_user_valid		integer,                   -- valideur de la fiche
+  fk_warehouse integer DEFAULT 0, 
+  status integer DEFAULT 0, 
+  title varchar(255) NOT NULL, 
+  date_inventory datetime DEFAULT NULL,
+  import_key               varchar(14)       	-- import key
 ) 
 ENGINE=InnoDB;
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 34e79da8a69..e47891a6d08 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -361,9 +361,9 @@ if ($action == 'create')
     dol_fiche_end();
     
     print '<div class="center">';
-    print '<input type="submit" class="button" value="'.$langs->trans('inventoryConfirmCreate').'" />';
+    print '<input type="submit" class="button" name="create" value="'.$langs->trans('inventoryConfirmCreate').'" />';
     print ' &nbsp; &nbsp; ';
-    print '<input type="submit" class="button" value="'.$langs->trans('inventoryConfirmCreate').'" />';
+    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'" />';
     print '</div>';
     
 	echo '</form>';
@@ -373,8 +373,14 @@ if ($action == 'create')
 if ($action == 'view' || $action == 'edit' ||  empty($action))
 {
     $object = new Inventory($db);
-    $object->fetch($id);
-
+    $result = $object->fetch($id);
+    if ($result < 0) dol_print_error($db, $object->error, $object->errors);
+    
+    $warehouse = new Entrepot($db);
+    $warehouse->fetch($object->fk_warehouse);
+    
+    
+    
 	if($action == 'changePMP')
 	{
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ApplyNewPMP'), $langs->trans('ConfirmApplyNewPMP', $object->getTitle()), 'confirm_changePMP', array(),'no',1);
@@ -396,18 +402,17 @@ if ($action == 'view' || $action == 'edit' ||  empty($action))
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('RegulateStock'),$langs->trans('ConfirmRegulateStock',$object->getTitle()),'confirm_regulate',array(),'no',1);
 	}
 	
-	$warehouse = new Entrepot($db);
-	$warehouse->fetch($object->fk_warehouse);
-	
 	print dol_get_fiche_head(inventoryPrepareHead($object, $langs->trans('inventoryOfWarehouse', $warehouse->libelle), empty($action) ? '': '&action='.$action));
 	
 	$lines = array();
 	card_line($object, $lines, $action);
 	
-	print '<b>'.$langs->trans('inventoryOnDate')." ".$object->getDate('date_inventory').'</b><br><br>';
+	print $langs->trans('Ref')." ".$object->ref.'<br>';
+	print $langs->trans('Date')." ".$object->getDate('date_inventory').'<br><br>';
 	
 	$objectTPL = array(
-		'id'=> $object->id
+	    'id'=> $object->id
+	    ,'ref'=> $object->ref
 		,'date_cre' => $object->getDate('date_cre', 'd/m/Y')
 		,'date_maj' => $object->getDate('date_maj', 'd/m/Y H:i')
 		,'fk_warehouse' => $object->fk_warehouse
@@ -608,8 +613,8 @@ function _headerList($view)
 	
 	?>
 			<tr style="background-color:#dedede;">
-				<th align="left" width="20%">&nbsp;&nbsp;Produit</th>
-				<th align="center"><?php echo $langs->trans('Warehouse'); ?></th>
+				<th class="titlefield"><?php echo $langs->trans('Product'); ?></th>
+				<th><?php echo $langs->trans('Warehouse'); ?></th>
 				<?php if (! empty($conf->barcode->enabled)) { ?>
 					<th align="center"><?php echo $langs->trans('Barcode'); ?></th>
 				<?php } ?>
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 93bbb38f6e7..8cb1f56eb9d 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -69,6 +69,7 @@ class Inventory extends CoreObject
      */
 	protected $fields=array(
 		'fk_warehouse'=>array('type'=>'integer','index'=>true)
+	    ,'ref'=>array('type'=>'string','index'=>true)
 		,'entity'=>array('type'=>'integer','index'=>true)
 		,'status'=>array('type'=>'integer','index'=>true)
 		,'date_inventory'=>array('type'=>'date')
@@ -113,7 +114,8 @@ class Inventory extends CoreObject
         if(!$loadChild) $this->withChild = false;
         
 		$res = parent::fetch($id, $loadChild);
-		if($res > 0)
+
+		if ($res > 0)
 		{
 			$this->sortDet();
 			$this->amount = 0;
diff --git a/htdocs/product/inventory/tpl/inventory.tpl.php b/htdocs/product/inventory/tpl/inventory.tpl.php
index 2a1c3bc3ee4..05de0f4c002 100644
--- a/htdocs/product/inventory/tpl/inventory.tpl.php
+++ b/htdocs/product/inventory/tpl/inventory.tpl.php
@@ -80,7 +80,7 @@
 		<?php echo inventorySelectProducts($object); ?>
 		
 			<input class="button" type="submit" value="<?php echo $langs->trans('AddProduct'); ?>" />
-	</form>
+	</form><br>
 <?php } ?>
 
 <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
@@ -92,7 +92,7 @@
 	<input type="hidden" name="action" value="save" />
 	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 	
-	<table width="100%" class="border workstation">
+	<table width="100%" class="noborder workstation">
 		<?php
 		
 		_headerList($view); 

From a3602ff6b48170db1f964031565932e5786969a0 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 8 May 2017 06:20:17 +0200
Subject: [PATCH 0747/1163] Add journal list in new movement card

---
 htdocs/accountancy/bookkeeping/card.php       | 66 +++++++++--------
 htdocs/accountancy/bookkeeping/list.php       |  9 ++-
 .../class/accountingjournal.class.php         | 71 +++++++++++--------
 .../core/class/html.formaccounting.class.php  | 22 +++++-
 4 files changed, 107 insertions(+), 61 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index ce0bd4d3aa2..055451016e9 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy      <jeff@jeffinfo.com>
  * Copyright (C) 2013-2016 Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,9 +18,9 @@
  */
 
 /**
- * \file htdocs/accountancy/bookkeeping/card.php
+ * \file	htdocs/accountancy/bookkeeping/card.php
  * \ingroup Advanced accountancy
- * \brief Page to show book-entry
+ * \brief	Page to show book-entry
  */
 require '../../main.inc.php';
 
@@ -28,9 +28,14 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
 // Langs
 $langs->load("accountancy");
+$langs->load("bank");
+$langs->load("bills");
+$langs->load("trips");
 
 // Security check
 $id = GETPOST('id', 'int');
@@ -211,6 +216,7 @@ llxHeader();
 
 $html = new Form($db);
 $formventilation = new FormVentilation($db);
+$formaccountancy = new FormAccounting($db);
 
 /*
  *  Confirmation to delete the command
@@ -223,26 +229,6 @@ if ($action == 'delete') {
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans("CreateMvts"));
 
-	$code_journal_array = array (
-			$conf->global->ACCOUNTING_SELL_JOURNAL => $conf->global->ACCOUNTING_SELL_JOURNAL,
-			$conf->global->ACCOUNTING_PURCHASE_JOURNAL => $conf->global->ACCOUNTING_PURCHASE_JOURNAL,
-			$conf->global->ACCOUNTING_SOCIAL_JOURNAL => $conf->global->ACCOUNTING_SOCIAL_JOURNAL,
-			$conf->global->ACCOUNTING_MISCELLANEOUS_JOURNAL => $conf->global->ACCOUNTING_MISCELLANEOUS_JOURNAL,
-			$conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL => $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL
-	);
-
-	$sql = 'SELECT DISTINCT accountancy_journal FROM ' . MAIN_DB_PREFIX . 'bank_account WHERE clos=0';
-	$resql = $db->query($sql);
-	if (! $resql) {
-		setEventMessages($db->lasterror, null, 'errors');
-	} else {
-		while ( $obj_bank = $db->fetch_object($resql) ) {
-			if (! empty($obj_bank->accountancy_journal)) {
-				$code_journal_array[$obj_bank->accountancy_journal] = $obj_bank->accountancy_journal;
-			}
-		}
-	}
-
 	$book = new BookKeeping($db);
 	$next_num_mvt = $book->getNextNumMvt();
     if (empty($next_num_mvt))
@@ -270,9 +256,10 @@ if ($action == 'create') {
 	print '</tr>';
 
 	print '<tr>';
-	print '<td class="fieldrequired">' . $langs->trans("Codejournal") . '</td>';
-	print '<td>' . $html->selectarray('code_journal', $code_journal_array) . '</td>';
-	print '</tr>';
+	print '<td class="fieldrequired">'.$langs->trans("AccountancyJournal").'</td>';
+	print '<td>';
+	print $formaccountancy->select_journal('', 'code_journal', '', 0, '', 1, 1, 1, 1);
+	print '</td></tr>';
 
 	print '<tr>';
 	print '<td>' . $langs->trans("Docref") . '</td>';
@@ -308,25 +295,46 @@ if ($action == 'create') {
 		print '<div class="fichecenter">';
 		
 		print '<table class="border" width="100%">';
+
 		print '<tr class="pair">';
 		print '<td class="titlefield">' . $langs->trans("NumMvts") . '</td>';
 		print '<td>' . $book->piece_num . '</td>';
 		print '</tr>';
+
 		print '<tr class="impair">';
 		print '<td>' . $langs->trans("Docdate") . '</td>';
 		print '<td>' . dol_print_date($book->doc_date, 'daytextshort') . '</td>';
 		print '</tr>';
+
 		print '<tr class="pair">';
 		print '<td>' . $langs->trans("Codejournal") . '</td>';
-		print '<td>' . $book->code_journal . '</td>';
-		print '</tr>';
+		print '<td>';	
+		$accountingjournal = new AccountingJournal($db);
+		$accountingjournal->fetch('',$book->code_journal);
+		print $accountingjournal->getNomUrl(0,1,1,'',1);	
+		print '</td></tr>';
+		
 		print '<tr class="impair">';
 		print '<td>' . $langs->trans("Docref") . '</td>';
 		print '<td>' . $book->doc_ref . '</td>';
 		print '</tr>';
+
+		$typelabel = $book->doc_type;
+		if ($typelabel == 'bank') {
+			$typelabel = $langs->trans('Bank');
+		}
+		if ($typelabel == 'customer_invoice') {
+			$typelabel = $langs->trans('CustomerInvoice');
+		}
+		if ($typelabel == 'supplier_invoice') {
+			$typelabel = $langs->trans('SupplierInvoice');
+		}
+		if ($typelabel == 'expense_report') {
+			$typelabel = $langs->trans('ExpenseReport');
+		}
 		print '<tr class="pair">';
 		print '<td>' . $langs->trans("Doctype") . '</td>';
-		print '<td>' . $book->doc_type . '</td>';
+		print '<td>' . $typelabel . '</td>';
 		print '</tr>';
 		print '</table>';
 		
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 75d0a63bf39..b382d855994 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2016	Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2016	Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2016	Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2016	  	Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
 // Langs
 $langs->load("accountancy");
@@ -443,7 +444,11 @@ foreach ($object->lines as $line ) {
 	print '<td>' . $line->label_compte . '</td>';
 	print '<td align="right">' . price($line->debit) . '</td>';
 	print '<td align="right">' . price($line->credit) . '</td>';
-	print '<td align="center">' . $line->code_journal . '</td>';
+
+	$accountingjournal = new AccountingJournal($db);
+	$accountingjournal->fetch('',$line->code_journal);
+	print '<td align="center">' . $accountingjournal->getNomUrl(0,0,0,'',0) . '</td>';
+
 	print '<td align="center">';
 	print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
 	print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $param . '&page=' . $page . '">' . img_delete() . '</a>';
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 91924f08592..168934ee5a5 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -48,45 +48,60 @@ class AccountingJournal extends CommonObject
 	}
 	
 	/**
-	* Load an object from database
-	*
-	* @param	int		$id		Id of record to load
-	* @return	int				<0 if KO, >0 if OK
-	*/
-	function fetch($id)
+	 * Load an object from database
+	 *
+	 * @param	int		$rowid				Id of record to load
+	 * @param 	string 	$journal_code		Journal code
+	 * @return	int							<0 if KO, Id of record if OK and found
+	 */
+	function fetch($rowid = null, $journal_code = null)
 	{
-		$sql = "SELECT rowid, code, label, nature, active";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
-		$sql.= " WHERE rowid = ".$id;
-
-		dol_syslog(get_class($this)."::fetch sql=" . $sql, LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ( $result )
+		if ($rowid || $journal_code)
 		{
-			$obj = $this->db->fetch_object($result);
+			$sql = "SELECT rowid, code, label, nature, active";
+			$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+			$sql .= " WHERE";
+			if ($rowid) {
+				$sql .= " rowid = '" . $rowid . "'";
+			} elseif ($journal_code) {
+				$sql .= " code = '" . $journal_code . "'";
+			}
 
-			$this->id			= $obj->rowid;
+			dol_syslog(get_class($this)."::fetch sql=" . $sql, LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$obj = $this->db->fetch_object($result);
 
-			$this->code			= $obj->code;
-			$this->ref			= $obj->code;
-			$this->label		= $obj->label;
-			$this->nature	    = $obj->nature;
-			$this->active		= $obj->active;
+				if ($obj) {
+					$this->id			= $obj->rowid;
+					$this->rowid		= $obj->rowid;
 
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
+					$this->code			= $obj->code;
+					$this->ref			= $obj->code;
+					$this->label		= $obj->label;
+					$this->nature	    = $obj->nature;
+					$this->active		= $obj->active;
+
+					return $this->id;
+				} else {
+					return 0;
+				}
+			}
+			else
+			{
+				$this->error = "Error " . $this->db->lasterror();
+				$this->errors[] = "Error " . $this->db->lasterror();
+			}
 		}
+		return -1;
 	}
 	
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
 	 * @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-	 * @param	int		$withlabel		0=No label, 1=Include label of account
+	 * @param	int		$withlabel		0=No label, 1=Include label of journal
 	 * @param	int  	$nourl			1=Disable url
 	 * @param	string  $moretitle		Add more text to title tooltip
 	 * @param	int  	$notooltip		1=Disable tooltip
@@ -100,7 +115,7 @@ class AccountingJournal extends CommonObject
 
 		$result = '';
 
-		$url = DOL_URL_ROOT . '/accountancy/admin/journals_list.php';
+		$url = DOL_URL_ROOT . '/accountancy/admin/journals_list.php?id=35';
 
 		$picto = 'billr';
 		$label='';
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 1a33f0fce60..a87b566d0d6 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -51,12 +51,14 @@ class FormAccounting extends Form
 	 * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
 	 * @param	int		$showempty	Add an empty field
 	 * @param	array	$event		Event options
+	 * @param	int		$select_in	0=selectid value is the journal rowid (default) or 1=selectid is journal code
+	 * @param	int		$select_out	Set value returned by select. 0=rowid (default), 1=code
 	 * @param	string	$morecss	More css non HTML object
 	 * @param	string	$usecache	Key to use to store result into a cache. Next call with same key will reuse the cache.
 	 *
 	 * @return	string				String with HTML select
 	 */
-	function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $event = array(), $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
+	function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
 	{
 		global $conf;
 
@@ -88,11 +90,27 @@ class FormAccounting extends Form
 
 			$out = ajax_combobox($htmlname, $event);
 
+    		$selected = 0;
 			while ($obj = $this->db->fetch_object($resql))
 			{
 				$label = $obj->code . ' - ' . $obj->label;
+
+    			$select_value_in = $obj->rowid;
 				$select_value_out = $obj->rowid;
 
+				// Try to guess if we have found default value
+    			if ($select_in == 1) {
+    				$select_value_in = $obj->code;
+    			}
+    			if ($select_out == 1) {
+    				$select_value_out = $obj->code;
+    			}
+    			// Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid
+    			if ($selectid != '' && $selectid == $select_value_in) {
+    			    //var_dump("Found ".$selectid." ".$select_value_in);
+    				$selected = $select_value_out;
+    			}
+
 				$options[$select_value_out] = $label;
 			}
 			$this->db->free($resql);
@@ -103,7 +121,7 @@ class FormAccounting extends Form
 			}
 		}
 
-		$out .= Form::selectarray($htmlname, $options, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+		$out .= Form::selectarray($htmlname, $options, $select, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		return $out;
 	}

From b05d2c50e8b236036ba1e944ec72b92cc33603c9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 8 May 2017 06:52:30 +0200
Subject: [PATCH 0748/1163] Add mode live

---
 htdocs/langs/en_US/stripe.lang  |  3 ++-
 htdocs/public/stripe/config.php | 20 ++++++++++++++++----
 htdocs/stripe/admin/stripe.php  | 33 +++++++++++++++++++++++++++++----
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index f19b4e44a52..3f85dc2d544 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -37,4 +37,5 @@ NewStripePaymentFailed=New Stripe payment tried but failed
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
-STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
\ No newline at end of file
+STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
+StripeLiveEnabled=Stripe live enabled
\ No newline at end of file
diff --git a/htdocs/public/stripe/config.php b/htdocs/public/stripe/config.php
index b94617b4c69..dfd0ea6aa1a 100644
--- a/htdocs/public/stripe/config.php
+++ b/htdocs/public/stripe/config.php
@@ -29,9 +29,21 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
 
 //use \includes\stripe as stripe;
-$stripe = array(
-  "secret_key"      => $conf->global->STRIPE_TEST_SECRET_KEY,
-  "publishable_key" => $conf->global->STRIPE_TEST_PUBLISHABLE_KEY
-);
+$stripe = array();
+
+if(empty($conf->global->SKYPE_LIVE))
+{
+	$stripe = array(
+		"secret_key"      => $conf->global->STRIPE_TEST_SECRET_KEY,
+		"publishable_key" => $conf->global->STRIPE_TEST_PUBLISHABLE_KEY
+	);
+}
+else 
+{
+	$stripe = array(
+		"secret_key"      => $conf->global->STRIPE_LIVE_SECRET_KEY,
+		"publishable_key" => $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY
+	);	
+}
 
 \includes\stripe::setApiKey($stripe['secret_key']);
\ No newline at end of file
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 1882d1065b0..6274197a301 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2017		Olivier Geffroy			<jeff@jeffinfo.com>
  * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -45,7 +46,7 @@ if ($action == 'setvalue' && $user->admin)
 {
 	$db->begin();
 
-    $result=dolibarr_set_const($db, "STRIPE_TEST",GETPOST('STRIPE_TEST','alpha'),'chaine',0,'',$conf->entity);
+    $result=dolibarr_set_const($db, "STRIPE_LIVE",GETPOST('STRIPE_LIVE','alpha'),'chaine',0,'',$conf->entity);
     if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY",GETPOST('STRIPE_TEST_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
@@ -76,6 +77,20 @@ if ($action == 'setvalue' && $user->admin)
     }
 }
 
+if ($action=="setlive")
+{
+	$liveenable = GETPOST('value','int');
+	$res = dolibarr_set_const($db, "STRIPE_LIVE", $liveenable,'yesno',0,'',$conf->entity);
+	if (! $res > 0) $error++;
+	if (! $error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
+	else
+	{
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
 
 /*
  *	View
@@ -119,9 +134,19 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 $var=!$var;
-print '<tr '.$bc[$var].'><td class="fieldrequired">';
-print $langs->trans("STRIPE_TEST").'</td><td>';
-print $form->selectyesno("STRIPE_TEST",$conf->global->STRIPE_TEST,1);
+print '<tr '.$bc[$var].'>';
+print '<td class="titlefield fieldrequired">';
+print $langs->trans("StripeLiveEnabled").'</td><td>';
+if (!empty($conf->global->STRIPE_LIVE))
+{
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
+	print img_picto($langs->trans("Activated"),'switch_on');
+}
+else
+{
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
+	print img_picto($langs->trans("Disabled"),'switch_off');
+}
 print '</td></tr>';
 
 $var=!$var;

From dd71fdc82f26f88c202f86040baf20c753e4cc3d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 May 2017 21:00:23 +0200
Subject: [PATCH 0749/1163] Work on modulebuilder template

---
 htdocs/langs/en_US/modulebuilder.lang         |    4 +-
 htdocs/modulebuilder/index.php                |   62 +-
 htdocs/modulebuilder/template/.editorconfig   |   19 +
 htdocs/modulebuilder/template/.gitattributes  |   23 +
 htdocs/modulebuilder/template/.gitignore      |   16 +
 htdocs/modulebuilder/template/.tx/config      |    9 +
 htdocs/modulebuilder/template/COPYING         |  621 +++++
 htdocs/modulebuilder/template/README.md       |  221 ++
 htdocs/modulebuilder/template/admin/about.php |   94 +
 htdocs/modulebuilder/template/admin/setup.php |   79 +
 .../template/build/doxygen/mymodule.doxyfile  | 2419 +++++++++++++++++
 .../template/build/makepack-dolibarrmodule.pl |  388 +++
 .../template/build/makepack-mymodule.conf     |   26 +
 .../template/class/MyTrigger.php              |   51 +
 .../template/class/ParsedownDolibarr.php      |   48 +
 .../template/class/actions_mymodule.class.php |   85 +
 .../template/class/myclass.class.php          |  361 +++
 .../template/core/boxes/mybox.php             |  195 ++
 .../core/modules/modMyModule.class.php        |  719 +++++
 .../template/core/tpl/mytemplate.tpl.php      |   28 +
 ...terface_99_modMyModule_MyTrigger.class.php |  580 ++++
 .../modulebuilder/template/css/mycss.css.php  |   27 +
 .../template/dev/codesniffer/DolibarrPSR2.xml |   12 +
 .../template/dev/dolistore/README.md          |   87 +
 .../template/dev/dolistore/keywords-de.txt    |    0
 .../template/dev/dolistore/keywords-en.txt    |    0
 .../template/dev/dolistore/keywords-es.txt    |    0
 .../template/dev/dolistore/keywords-fr.txt    |    0
 .../template/dev/dolistore/keywords-it.txt    |    0
 .../template/dev/dolistore/long_desc-de.html  |    0
 .../template/dev/dolistore/long_desc-en.html  |    0
 .../template/dev/dolistore/long_desc-es.html  |    0
 .../template/dev/dolistore/long_desc-fr.html  |    0
 .../template/dev/dolistore/long_desc-it.html  |    0
 .../template/dev/dolistore/name-de.txt        |    1 +
 .../template/dev/dolistore/name-en.txt        |    1 +
 .../template/dev/dolistore/name-es.txt        |    1 +
 .../template/dev/dolistore/name-fr.txt        |    1 +
 .../template/dev/dolistore/name-it.txt        |    1 +
 .../template/dev/dolistore/short_desc-de.html |    0
 .../template/dev/dolistore/short_desc-en.html |    0
 .../template/dev/dolistore/short_desc-es.html |    0
 .../template/dev/dolistore/short_desc-fr.html |    0
 .../template/dev/dolistore/short_desc-it.html |    0
 .../template/dev/git-hooks/post-commit        |    2 +
 .../template/dev/git-hooks/pre-commit         |    2 +
 .../template/dev/git-hooks/pre-push           |    2 +
 .../modulebuilder/template/dev/img/README.md  |   53 +
 .../template/dev/img/gfdl-129x44.png          |  Bin 0 -> 4709 bytes
 .../template/dev/img/gfdl-66x23.png           |  Bin 0 -> 2453 bytes
 .../template/dev/img/gfdl-logo.svg            |  110 +
 .../template/dev/img/gpl-v3-logo.svg          |  389 +++
 .../template/dev/img/gplv3-127x51.png         |  Bin 0 -> 3471 bytes
 .../template/dev/img/gplv3-88x31.png          |  Bin 0 -> 2666 bytes
 .../template/dev/img/mymodule.svg             |   70 +
 .../modulebuilder/template/dev/newmodule.sh   |   68 +
 .../modulebuilder/template/doc/user/Makefile  |  225 ++
 .../modulebuilder/template/doc/user/make.bat  |  281 ++
 .../template/doc/user/source/conf.py          |  428 +++
 .../template/doc/user/source/index.rst        |   22 +
 htdocs/modulebuilder/template/img/gfdl.png    |  Bin 0 -> 4709 bytes
 htdocs/modulebuilder/template/img/gplv3.png   |  Bin 0 -> 2666 bytes
 .../modulebuilder/template/img/mymodule.png   |  Bin 0 -> 683 bytes
 .../template/img/object_mymodule.png          |  Bin 0 -> 360 bytes
 htdocs/modulebuilder/template/js/myjs.js.php  |   27 +
 .../template/langs/en_US/mymodule.lang        |   51 +
 .../template/langs/fr_FR/mymodule.lang        |   51 +
 .../template/lib/mymodule.lib.php             |   61 +
 htdocs/modulebuilder/template/mypage.php      |  135 +
 htdocs/modulebuilder/template/phpdoc.dist.xml |   30 +
 .../template/scripts/myscript.php             |  203 ++
 htdocs/modulebuilder/template/sql/data.sql    |   19 +
 .../template/sql/llx_mytable.key.sql          |   17 +
 .../template/sql/llx_mytable.sql              |   22 +
 .../template/sql/update_x.x.x-y.y.y.sql       |   15 +
 .../functional/MyModuleFunctionalTest.php     |  291 ++
 .../template/test/unit/MyClassTest.php        |  104 +
 htdocs/theme/eldy/style.css.php               |    5 +-
 78 files changed, 8853 insertions(+), 9 deletions(-)
 create mode 100644 htdocs/modulebuilder/template/.editorconfig
 create mode 100644 htdocs/modulebuilder/template/.gitattributes
 create mode 100644 htdocs/modulebuilder/template/.gitignore
 create mode 100644 htdocs/modulebuilder/template/.tx/config
 create mode 100644 htdocs/modulebuilder/template/COPYING
 create mode 100644 htdocs/modulebuilder/template/README.md
 create mode 100644 htdocs/modulebuilder/template/admin/about.php
 create mode 100644 htdocs/modulebuilder/template/admin/setup.php
 create mode 100644 htdocs/modulebuilder/template/build/doxygen/mymodule.doxyfile
 create mode 100644 htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl
 create mode 100644 htdocs/modulebuilder/template/build/makepack-mymodule.conf
 create mode 100644 htdocs/modulebuilder/template/class/MyTrigger.php
 create mode 100644 htdocs/modulebuilder/template/class/ParsedownDolibarr.php
 create mode 100644 htdocs/modulebuilder/template/class/actions_mymodule.class.php
 create mode 100644 htdocs/modulebuilder/template/class/myclass.class.php
 create mode 100644 htdocs/modulebuilder/template/core/boxes/mybox.php
 create mode 100644 htdocs/modulebuilder/template/core/modules/modMyModule.class.php
 create mode 100644 htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php
 create mode 100644 htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyTrigger.class.php
 create mode 100644 htdocs/modulebuilder/template/css/mycss.css.php
 create mode 100644 htdocs/modulebuilder/template/dev/codesniffer/DolibarrPSR2.xml
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/README.md
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-de.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-en.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-es.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-fr.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-it.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-de.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-en.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-es.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-fr.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-it.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-de.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-en.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-es.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-fr.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-it.txt
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-de.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-en.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-es.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-fr.html
 create mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-it.html
 create mode 100644 htdocs/modulebuilder/template/dev/git-hooks/post-commit
 create mode 100644 htdocs/modulebuilder/template/dev/git-hooks/pre-commit
 create mode 100644 htdocs/modulebuilder/template/dev/git-hooks/pre-push
 create mode 100644 htdocs/modulebuilder/template/dev/img/README.md
 create mode 100644 htdocs/modulebuilder/template/dev/img/gfdl-129x44.png
 create mode 100644 htdocs/modulebuilder/template/dev/img/gfdl-66x23.png
 create mode 100644 htdocs/modulebuilder/template/dev/img/gfdl-logo.svg
 create mode 100644 htdocs/modulebuilder/template/dev/img/gpl-v3-logo.svg
 create mode 100644 htdocs/modulebuilder/template/dev/img/gplv3-127x51.png
 create mode 100644 htdocs/modulebuilder/template/dev/img/gplv3-88x31.png
 create mode 100644 htdocs/modulebuilder/template/dev/img/mymodule.svg
 create mode 100644 htdocs/modulebuilder/template/dev/newmodule.sh
 create mode 100644 htdocs/modulebuilder/template/doc/user/Makefile
 create mode 100644 htdocs/modulebuilder/template/doc/user/make.bat
 create mode 100644 htdocs/modulebuilder/template/doc/user/source/conf.py
 create mode 100644 htdocs/modulebuilder/template/doc/user/source/index.rst
 create mode 100644 htdocs/modulebuilder/template/img/gfdl.png
 create mode 100644 htdocs/modulebuilder/template/img/gplv3.png
 create mode 100644 htdocs/modulebuilder/template/img/mymodule.png
 create mode 100644 htdocs/modulebuilder/template/img/object_mymodule.png
 create mode 100644 htdocs/modulebuilder/template/js/myjs.js.php
 create mode 100644 htdocs/modulebuilder/template/langs/en_US/mymodule.lang
 create mode 100644 htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
 create mode 100644 htdocs/modulebuilder/template/lib/mymodule.lib.php
 create mode 100644 htdocs/modulebuilder/template/mypage.php
 create mode 100644 htdocs/modulebuilder/template/phpdoc.dist.xml
 create mode 100644 htdocs/modulebuilder/template/scripts/myscript.php
 create mode 100644 htdocs/modulebuilder/template/sql/data.sql
 create mode 100644 htdocs/modulebuilder/template/sql/llx_mytable.key.sql
 create mode 100644 htdocs/modulebuilder/template/sql/llx_mytable.sql
 create mode 100644 htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql
 create mode 100644 htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
 create mode 100644 htdocs/modulebuilder/template/test/unit/MyClassTest.php

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 9979760bc4f..ef86062bbd0 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tools give you utilites to build your own module. Your modules will be generated into the first alternative directory: <strong>%s</strong>.
+ModuleBuilderDesc=This tools give you utilites to build your own module.
+ModuleBuilderDesc2=Path were modules are generated (first alternative directory defined into %s): <strong>%s</strong>.
+They are detected when the file %s exists in root of module directory.
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 182268a5f06..38339d643c1 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29,9 +29,43 @@ $langs->load("admin");
 $langs->load("modulebuilder");
 $langs->load("other");
 
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
+
 // Security check
 if (! $user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessforbidden('ModuleBuilderNotAllowed');
 
+$modulename=dol_sanitizeFileName(GETPOST('modulename','alpha'));
+
+// Dir for custom dirs
+$tmp=explode(',', $dolibarr_main_document_root_alt);
+$dircustom = $tmp[0];
+
+
+
+/*
+ * Actions
+ */
+
+if ($dircustom && $action == 'initmodule' && $modulename)
+{
+    $srcfile = DOL_DOCUMENT_ROOT.'/modulebuilder/skeletons';
+    $destfile = $dircustom.'/'.$modulename;
+    //$result = dolCopyDir($srcfile, $destfile, 0, 0);
+    
+    dol_mkdir($destfile);
+    
+    fopen($destfile, $mode)
+    
+    if ($result > 0)
+    {
+        setEventMessages('ModuleInitialized', null);
+    }
+    else
+    {
+        setEventMessages($langs->trans("ErrorFailedToCopyDir"), null, 'errors');
+    }
+}
 
 
 /*
@@ -48,14 +82,24 @@ $text=$langs->trans("ModuleBuilder");
 
 print load_fiche_titre($text, '', 'title_setup');
 
-$tmp=explode(',', $dolibarr_main_document_root_alt);
-$dircustom = $tmp[0];
-
 // Show description of content
-print $langs->trans("ModuleBuilderDesc", $dircustom).'<br><br>';
+print $langs->trans("ModuleBuilderDesc").'<br>';
+print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $dircustom).'<br>';
+print '<br>';
 
 
+// New module
+print '<div class="modulebuilderbox">';
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="initmodule">';
+print '<input type="text" name="modulename" value="" placeholder="'.dol_escape_htmltag($langs->trans("ModuleName")).'">';
+print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("CreateNewModule")).'">';
+print '</form>';
+print '<div>';
 
+
+$listofmodules=array();
 /*
 if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// Entry for Module builder
 {
@@ -73,7 +117,7 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
                     $fullname = $dircustom['fullname'];
                     if (dol_is_file($fullname.'/modulebuilder.txt'))
                     {
-                        print '<div class="boxstats">'.$module.'</div>';
+                        $listofmodules[$module]=$fullname;
                     }
                 }
             }
@@ -84,7 +128,11 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
         $newmenu->add('', 'NoGeneratedModuleFound', 0, 0);
     }*/
 
-
+foreach($listofmodules as $modules => $fullname)
+{
+    print '<div class="modulebuilderbox>'.$module.'</div>';
+}
+            
 
 llxFooter();
 
diff --git a/htdocs/modulebuilder/template/.editorconfig b/htdocs/modulebuilder/template/.editorconfig
new file mode 100644
index 00000000000..2df455f0d4f
--- /dev/null
+++ b/htdocs/modulebuilder/template/.editorconfig
@@ -0,0 +1,19 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+[*.php]
+indent_style = tab
+[*.js]
+indent_style = tab
+[*.css]
+indent_style = tab
+[*.xml]
+indent_style = tab
+[*.md]
+trim_trailing_whitespace = false
diff --git a/htdocs/modulebuilder/template/.gitattributes b/htdocs/modulebuilder/template/.gitattributes
new file mode 100644
index 00000000000..58065c729fc
--- /dev/null
+++ b/htdocs/modulebuilder/template/.gitattributes
@@ -0,0 +1,23 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.php text eol=lf
+*.sql text eol=lf
+*.htm text eol=lf
+*.html text eol=lf
+*.js text eol=lf
+*.css text eol=lf
+*.lang text eol=lf
+*.txt text eol=lf
+*.md text eol=lf
+*.bat text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.ico binary
+*.png binary
+*.jpg binary
+*.odt binary
+*.odf binary
diff --git a/htdocs/modulebuilder/template/.gitignore b/htdocs/modulebuilder/template/.gitignore
new file mode 100644
index 00000000000..e950cee245d
--- /dev/null
+++ b/htdocs/modulebuilder/template/.gitignore
@@ -0,0 +1,16 @@
+# Generated binaries
+/build/*.zip
+# Doxygen generated documentation
+/build/doxygen/doxygen_warnings.log
+/doc/code/doxygen
+# Composer managed dependencies
+/vendor
+/dev/bin
+# PHPdocumentor generated files
+/build/phpdoc
+/doc/code/phpdoc
+# Sphinx generated files
+/doc/user/build
+/.settings/
+/.buildpath
+/.project
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/.tx/config b/htdocs/modulebuilder/template/.tx/config
new file mode 100644
index 00000000000..1743c5d00dd
--- /dev/null
+++ b/htdocs/modulebuilder/template/.tx/config
@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.com
+lang_map = uz: uz_UZ
+
+[mymodule.mymodule]
+file_filter = langs/<lang>/mymodule.lang
+source_file = langs/en_US/mymodule.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
diff --git a/htdocs/modulebuilder/template/COPYING b/htdocs/modulebuilder/template/COPYING
new file mode 100644
index 00000000000..94a04532226
--- /dev/null
+++ b/htdocs/modulebuilder/template/COPYING
@@ -0,0 +1,621 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
diff --git a/htdocs/modulebuilder/template/README.md b/htdocs/modulebuilder/template/README.md
new file mode 100644
index 00000000000..5e2af06a430
--- /dev/null
+++ b/htdocs/modulebuilder/template/README.md
@@ -0,0 +1,221 @@
+Dolibarr Module Template (aka My Module)
+========================================
+
+This is a full featured module template for Dolibarr.
+It's a tool for module developers to kickstart their project and give an hands-on sample of which features Dolibarr has to offer for module development.
+
+If you're not a module developer you have no use for this.
+
+Documentation
+-------------
+
+[Module tutorial](http://wiki.dolibarr.org/index.php/Module_development)
+
+[Dolibarr development](http://wiki.dolibarr.org/index.php/Developer_documentation)
+
+### Translations
+
+Dolibarr uses [Transifex](http://transifex.com) to manage it's translations.
+
+This template also contains a sample configuration for Transifex managed translations under the hidden [.tx](.tx) directory.
+
+For more informations, see the [translator's documentation](http://wiki.dolibarr.org/index.php/Translator_documentation).
+
+There is a [Transifex project](http://transifex.com/projects/p/dolibarr-module-template) for this module.
+
+Install
+-------
+
+### Manually
+
+- Make sure Dolibarr (>= 3.3.x) is already installed and configured on your workstation or development server.
+
+- In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file
+
+- Find the following lines:
+    ```php
+    //$dolibarr_main_url_root_alt ...
+    //$dolibarr_main_document_root_alt ...
+    ```
+
+- Uncomment these lines (delete the leading ```//```) and assign a sensible value according to your Dolibarr installation
+
+    For example :
+
+    - UNIX:
+        ```php
+        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
+        $dolibarr_main_document_root = '/var/www/Dolibarr/htdocs';
+        $dolibarr_main_url_root_alt = '/custom';
+        $dolibarr_main_document_root_alt = '/var/www/Dolibarr/htdocs/custom';
+        ```
+
+    - Windows:
+        ```php
+        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
+        $dolibarr_main_document_root = 'C:/My Web Sites/Dolibarr/htdocs';
+        $dolibarr_main_url_root_alt = '/custom';
+        $dolibarr_main_document_root_alt = 'C:/My Web Sites/Dolibarr/htdocs/custom';
+        ```
+
+    For more information about the ```conf.php``` file take a look at the conf.php.example file.
+
+*Note that for Dolibarr versions before 3.5, the ```$dolibarr_main_url_root_alt``` has to be an absolute path*
+
+- Clone the repository in ```$dolibarr_main_document_root_alt/mymodule```
+
+*(You may have to create the ```htdocs/custom``` directory first if it doesn't exist yet.)*
+```sh
+git clone git@github.com:Dolibarr/dolibarr-module-template.git mymodule
+```
+
+- Install [Composer](https://getcomposer.org) dependencies:
+```sh
+composer install
+```
+
+Follow the [final steps](#final_steps).
+
+### Using [Composer](https://getcomposer.org)
+Require this repository from Dolibarr's composer:
+```json
+{
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/dolibarr/dolibarr-module-template"
+    }
+  ],
+  "require": {
+    "dolibarr/mymodule": "dev-master"
+  }
+}
+```
+
+Run
+```sh
+composer update
+```
+
+Follow the [final steps](#final_steps).
+
+### <a name="final_steps"></a>Final steps
+
+From your browser:
+
+  - Log into Dolibarr as a super-administrator
+  - Under "Setup" -> "Other setup", set ```MAIN_FEATURES_LEVEL``` to ```2```
+  - Go to "Setup" -> "Modules"
+  - The module is under one of the tabs
+  - You should now be able to enable the new module and start coding ;)
+
+Provided tools
+--------------
+
+### Starting a new module
+
+A [script](dev/newmodule.sh) allows you to rename most of the code to your own module name.  
+It requires ```find```, ```sed``` and ```rename``` commands on your system.  
+Just make sure you provide a CamelCase name.
+```sh
+./dev/newmodule.sh [NewName]
+```
+
+Some work still has to be done manually:
+- Rename the directory holding the code
+- Maybe rename some other bits (Search for 'my' in filenames and code)
+- Update your module ID in the module descriptor
+- Update your language files
+    - Keywords based on the module ID
+    - String referencing the template
+- Remove the features you don't plan to use
+- Fill the copyright notices at the top of each file
+- Add your logo: see [images README](dev/img/README.md) for specifications
+- Start a new GIT history 
+```
+git checkout --orphan [new_branch_name]
+```
+- Build an awesome module ;)
+
+### Composer scripts
+
+Only the main commands are listed here.  
+See the [composer comments](composer-comments.md) or the [composer.json](composer.json) itself for more informations.
+
+#### Check
+
+Run a linter, a PHP compatibility version checker and checks coding style.
+```sh
+composer check
+```
+
+#### Test
+  
+Run unit and functional tests.
+```sh
+composer test
+```
+
+#### Doc
+Build code and user documentation.
+
+#### Release
+
+Run the checks and tests then build a distribution ZIP.
+```sh
+composer release
+```
+
+#### Git hooks
+
+Optional [GIT hooks](https://git-scm.com/book/it/v2/Customizing-Git-Git-Hooks) are provided.
+These are just wrappers calling composer scripts.  
+They ensure best practices are followed during module development.  
+
+Install:
+```sh
+composer git_hooks_install
+```
+
+Remove:
+```sh
+composer git_hooks_remove
+```
+
+## Publishing the module
+The de-facto standard for publishing and marketing modules for Dolibarr is the [Dolistore](https://www.dolistore.com).  
+Templates for required images and texts are [provided](dev/dolistore).  
+Check the dedicated [README](dev/dolistore/README.md) for more informations.
+
+Contributions
+-------------
+
+Feel free to contribute and report defects on our [issue tracker](http://github.com/Dolibarr/dolibarr-module-template/issues).
+
+Licenses
+--------
+
+### Main code
+
+![GPLv3 logo](img/gplv3.png)
+
+GPLv3 or (at your option) any later version.
+
+See [COPYING](COPYING) for more information.
+
+### Other Licenses
+
+#### [Parsedown](http://parsedown.org/)
+
+Used to display this README in the module's about page.  
+Licensed under MIT.
+
+#### [GNU Licenses logos](https://www.gnu.org/graphics/license-logos.html)
+
+Public domain
+
+#### Documentation
+
+All texts and readmes.
+
+![GFDL logo](img/gfdl.png)
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
new file mode 100644
index 00000000000..6953af2ef38
--- /dev/null
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -0,0 +1,94 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    admin/about.php
+ * \ingroup mymodule
+ * \brief   About page of module MyModule.
+ *
+ * MyModuleDescription.
+ */
+
+// Load Dolibarr environment
+if (false === (@include '../../main.inc.php')) {  // From htdocs directory
+	require '../../../main.inc.php'; // From "custom" directory
+}
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once '../lib/mymodule.lib.php';
+
+// Translations
+$langs->load("errors");
+$langs->load("admin");
+$langs->load("mymodule@mymodule");
+
+// Access control
+if (! $user->admin) {
+	accessforbidden();
+}
+
+// Parameters
+$action = GETPOST('action', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$page_name = "MyModuleAbout";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
+	. $langs->trans("BackToModuleList") . '</a>';
+print load_fiche_titre($langs->trans($page_name), $linkback);
+
+// Configuration header
+$head = mymoduleAdminPrepareHead();
+dol_fiche_head(
+	$head,
+	'about',
+	$langs->trans("MyModuleName"),
+	0,
+	'mymodule@mymodule'
+);
+
+// About page goes here
+echo $langs->trans("MyModuleAboutPage");
+
+echo '<br>';
+
+require_once '../core/modulebuilder/mymodule/core/modules/modMyModule.class.php';
+$tmpmodule = new MyModule($db);
+print $tmpmodule->getDescLong();
+
+// Page end
+dol_fiche_end();
+llxFooter();
+$db->close();
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
new file mode 100644
index 00000000000..8bc2c6d9ded
--- /dev/null
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -0,0 +1,79 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    admin/setup.php
+ * \ingroup mymodule
+ * \brief   Example module setup page.
+ *
+ * Put detailed description here.
+ */
+
+// Load Dolibarr environment
+if (false === (@include '../../main.inc.php')) {  // From htdocs directory
+	require '../../../main.inc.php'; // From "custom" directory
+}
+
+global $langs, $user;
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
+require_once '../lib/mymodule.lib.php';
+//require_once "../class/myclass.class.php";
+// Translations
+$langs->load("mymodule@mymodule");
+
+// Access control
+if (! $user->admin) {
+	accessforbidden();
+}
+
+// Parameters
+$action = GETPOST('action', 'alpha');
+
+/*
+ * Actions
+ */
+
+/*
+ * View
+ */
+$page_name = "MyModuleSetup";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
+	. $langs->trans("BackToModuleList") . '</a>';
+print load_fiche_titre($langs->trans($page_name), $linkback);
+
+// Configuration header
+$head = mymoduleAdminPrepareHead();
+dol_fiche_head(
+	$head,
+	'settings',
+	$langs->trans("Module500000Name"),
+	0,
+	"mymodule@mymodule"
+);
+
+// Setup page goes here
+echo $langs->trans("MyModuleSetupPage");
+
+// Page end
+dol_fiche_end();
+llxFooter();
diff --git a/htdocs/modulebuilder/template/build/doxygen/mymodule.doxyfile b/htdocs/modulebuilder/template/build/doxygen/mymodule.doxyfile
new file mode 100644
index 00000000000..0b4e079a385
--- /dev/null
+++ b/htdocs/modulebuilder/template/build/doxygen/mymodule.doxyfile
@@ -0,0 +1,2419 @@
+# Doxyfile 1.8.12
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = mymodule
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = development
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = My module brief.
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           = ../../img/mymodule.png
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ../../doc/code/doxygen
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = YES
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = YES
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = NO
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = "../.."
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = YES
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = YES
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = YES
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           = doxygen_warnings.log
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = ../..
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+
+FILE_PATTERNS          = *.php \
+                         *.pl
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                = ../../build \
+                         ../../dev \
+                         ../../doc \
+                         ../../vendor
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = YES
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *.php
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             = ../../doc/images
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = ./
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = YES
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.dolibarr.doc
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Dolibarrteam
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = YES
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hostedc by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = NO
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = YES
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = NO
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = NO
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = YES
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = FreeSans.ttf
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = NO
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = svg
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = YES
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 1024
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = YES
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl b/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl
new file mode 100644
index 00000000000..537fead0d40
--- /dev/null
+++ b/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl
@@ -0,0 +1,388 @@
+#!/usr/bin/perl
+#----------------------------------------------------------------------------
+# \file         build/makepack-dolibarrmodule.pl
+# \brief        Package builder (tgz, zip, rpm, deb, exe)
+# \author       (c)2005-2006    Laurent Destailleur <eldy@users.sourceforge.net>
+#               (c)2016         Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+#----------------------------------------------------------------------------
+
+use Cwd;
+
+
+@LISTETARGET=("TGZ");   # Possible packages
+%REQUIREMENTTARGET=(    # Tool requirement for each package
+"TGZ"=>"tar",
+"ZIP"=>"7z"
+);
+%ALTERNATEPATH=(
+);
+
+
+use vars qw/ $REVISION $VERSION /;
+$REVISION='1.20';
+$VERSION="1.0 (build $REVISION)";
+
+
+
+#------------------------------------------------------------------------------
+# MAIN
+#------------------------------------------------------------------------------
+($DIR=$0) =~ s/([^\/\\]+)$//; ($PROG=$1) =~ s/\.([^\.]*)$//; $Extension=$1;
+$DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
+
+# Detect OS type
+# --------------
+if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
+elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
+elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
+if (! $OS) {
+    print "makepack-dolbarrmodule.pl was not able to detect your OS.\n";
+	print "Can't continue.\n";
+	print "makepack-dolibarrmodule.pl aborted.\n";
+    sleep 2;
+	exit 1;
+}
+
+# Define buildroot
+# ----------------
+if ($OS =~ /linux/) {
+    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
+}
+if ($OS =~ /macos/) {
+    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
+}
+if ($OS =~ /windows/) {
+    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp";
+    $PROGPATH=$ENV{"ProgramFiles"};
+}
+if (! $TEMP || ! -d $TEMP) {
+    print "Error: A temporary directory can not be find.\n";
+    print "Check that TEMP or TMP environment variable is set correctly.\n";
+	print "makepack-dolibarrmodule.pl aborted.\n";
+    sleep 2;
+    exit 2;
+} 
+$BUILDROOT="$TEMP/dolibarr-buildroot";
+
+
+my $copyalreadydone=0;
+my $batch=0;
+
+for (0..@ARGV-1) {
+	if ($ARGV[$_] =~ /^-*target=(\w+)/i)   { $target=$1; $batch=1; }
+	if ($ARGV[$_] =~ /^-*desti=(.+)/i)     { $DESTI=$1; }
+    if ($ARGV[$_] =~ /^-*prefix=(.+)/i)    {
+    	$PREFIX=$1; 
+    	$FILENAMESNAPSHOT.="-".$PREFIX; 
+    }
+}
+$SOURCE="$DIR/..";
+$DESTI="$SOURCE/build";
+if ($ENV{"DESTIMODULES"}) { $DESTI = $ENV{"DESTIMODULES"}; }		# Force output dir if env DESTIMODULES is defined
+$NEWDESTI=$DESTI;
+
+
+print "Makepack for modules version $VERSION\n";
+print "Source directory: $SOURCE\n";
+print "Target directory: $NEWDESTI\n";
+
+# Autodetect version and module name
+$mod_dir = "../core/modules/";
+opendir(DIR, $mod_dir);
+@mod_files=grep { /^mod\w*\.class.php$/ } readdir(DIR);
+foreach $file (@mod_files) {
+	$PROJECTINPUT=lc $1 if $file =~ /^mod(\w*)\.class.php$/;
+	$file = $mod_dir . $file;
+	open FILE, $file or die $!;
+	@file_content = <FILE>;
+	close FILE;
+	foreach $line (@file_content) {
+		# Extracts version number
+		$PROJVERSION=$1 if $line =~ /(?<=version\s=\s')(\d+(\.\d+){1,2})/;
+	}
+}
+
+# Ask and set version $MAJOR, $MINOR and $BUILD
+if ($PROJVERSION eq '')
+{
+	print "Enter value for version: ";
+	$PROJVERSION=<STDIN>;
+}
+chomp($PROJVERSION);
+($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
+if ($MINOR eq '')
+{
+    print "Enter value for minor version: ";
+    $MINOR=<STDIN>;
+    chomp($MINOR);
+}
+
+# Ask module
+if ($PROJECTINPUT eq '')
+{
+	print "Enter name for your module (mymodule, mywonderfulmondule, ... or 'all') : ";
+	$PROJECTINPUT=<STDIN>;
+}
+chomp($PROJECTINPUT);
+print "Move to ".$DIR." directory.\n";
+chdir($DIR);
+
+
+my @PROJECTLIST=();
+if ($PROJECTINPUT eq "all")
+{
+    opendir(DIR, $DIR) || return;
+    local @rv = grep { /^makepack\-(.*)\.conf$/ } sort readdir(DIR);
+    closedir(DIR);
+    foreach my $xxx (0..@rv-1) {
+    	if ($rv[$xxx] =~ /^makepack\-(.*)\.conf$/)
+    	{ 
+    	   @PROJECTLIST[$xxx]=$1;
+    	}
+    }
+}
+else
+{
+	@PROJECTLIST=($PROJECTINPUT);
+}
+
+
+# Loop on each projects
+foreach my $PROJECT (@PROJECTLIST) {
+	
+	if (! -f "makepack-".$PROJECT.".conf")
+	{
+	    print "Error: can't open conf file makepack-".$PROJECT.".conf\n";
+		print "\n";
+		print "For help on building a module package, see web page\n";
+		print 
+"http://wiki.dolibarr.org/cindex.php/Module_development#Create_a_package_to_distribute_and_install_your_module\n";
+		print "makepack-dolibarrmodule.pl aborted.\n";
+	    sleep 2;
+	    exit 2;
+	}
+	
+	$FILENAME="$PROJECT";
+	$FILENAMETGZ="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
+	$FILENAMEZIP="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
+	if (-d "/usr/src/redhat") {
+	    # redhat
+	    $RPMDIR="/usr/src/redhat";
+	}
+	if (-d "/usr/src/RPM") {
+	    # mandrake
+	    $RPMDIR="/usr/src/RPM";
+	}
+	
+	
+	# Choose package targets
+	#-----------------------
+	$target="ZIP";    # Dolibarr modules are this format
+	$CHOOSEDTARGET{uc($target)}=1;
+	
+	
+	# Test if requirement is ok
+	#--------------------------
+	foreach my $target (keys %CHOOSEDTARGET) {
+	    foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) {
+	        # Test    
+	        print "Test requirement for target $target: Search '$req'... ";
+	        $ret=`"$req" 2>&1`;
+	        $coderetour=$?; $coderetour2=$coderetour>>8;
+	        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { 
+	            # Not found error, we try in PROGPATH
+	            $ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
+	            $coderetour=$?; $coderetour2=$coderetour>>8;
+	            $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req";
+	        }    
+	
+	        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) {
+	            # Not found error
+	            print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
+	            $CHOOSEDTARGET{$target}=-1;
+	            last;
+	        } else {
+	            # Pas erreur ou erreur autre que programme absent
+	            print " Found ".$REQUIREMENTTARGET{$target}."\n";
+	        }
+	    }
+	}
+	
+	print "\n";
+	
+	# Check if there is at least on target to build
+	#----------------------------------------------
+	$nboftargetok=0;
+	$nboftargetneedbuildroot=0;
+	$nboftargetneedcvs=0;
+	foreach my $target (keys %CHOOSEDTARGET) {
+	    if ($CHOOSEDTARGET{$target} < 0) { next; }
+		if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') 
+		{
+			$nboftargetneedbuildroot++;
+		}
+		if ($target eq 'SNAPSHOT')
+		{
+			$nboftargetneedcvs++;
+		}
+		$nboftargetok++;
+	}
+	
+	if ($nboftargetok) {
+	
+	    # Update CVS if required
+	    #-----------------------
+	    if ($nboftargetneedcvs)
+		{
+	    	print "Go to directory $SOURCE\n";
+	   		$olddir=getcwd();
+	   		chdir("$SOURCE");
+	    	print "Run cvs update -P -d\n";
+	    	$ret=`cvs update -P -d 2>&1`;
+	    	chdir("$olddir");
+		}
+		
+	    # Update buildroot if required
+	    #-----------------------------
+	    if ($nboftargetneedbuildroot)
+		{
+		    if (! $copyalreadydone) {
+		    	print "Delete directory $BUILDROOT\n";
+		    	$ret=`rm -fr "$BUILDROOT"`;
+	
+		    	mkdir "$BUILDROOT";
+		    	mkdir "$BUILDROOT/$PROJECT";
+		    	
+				$result=open(IN,"<makepack-".$PROJECT.".conf");
+				if (! $result) { die "Error: Can't open conf file makepack-".$PROJECT.".conf for reading.\n"; }
+			    while(<IN>)
+			    {
+			    	if ($_ =~ /^#/) { next; }	# Do not process comments
+					
+					$_ =~ s/\n//;
+			    	$_ =~ /^(.*)\/[^\/]+/;
+			    	print "Create directory $BUILDROOT/$PROJECT/$1\n";
+			    	$ret=`mkdir -p "$BUILDROOT/$PROJECT/$1"`;
+			    	if ($_ !~ /version\-/)
+			    	{
+			    	    print "Copy $SOURCE/$_ into $BUILDROOT/$PROJECT/$_\n";
+		    		    $ret=`cp -pr "$SOURCE/$_" "$BUILDROOT/$PROJECT/$_"`;
+			    	}
+				}	
+				close IN;
+				
+				@timearray=localtime(time());
+				$fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1];
+#				open(VF,">$BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt");
+#		
+#				print "Create version file $BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt with date ".$fulldate."\n";
+#				$ret=`mkdir -p "$BUILDROOT/$PROJECT/build"`;
+#				print VF "Version: ".$MAJOR.".".$MINOR.($BUILD ne ''?".$BUILD":"")."\n";
+#				print VF "Build  : ".$fulldate."\n";
+#				close VF;
+		    }
+		    print "Clean $BUILDROOT\n";
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
+	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
+	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
+		}    
+	    
+	    # Build package for each target
+	    #------------------------------
+	    foreach my $target (keys %CHOOSEDTARGET) {
+	        if ($CHOOSEDTARGET{$target} < 0) { next; }
+	    
+	        print "\nBuild package for target $target\n";
+	        
+	    	if ($target eq 'TGZ') {
+	    		$NEWDESTI=$DESTI;
+				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; } 
+
+	    		print "Remove target $FILENAMETGZ.tgz...\n";
+	    		unlink("$NEWDESTI/$FILENAMETGZ.tgz");
+	    		print "Compress $BUILDROOT/* into $FILENAMETGZ.tgz...\n";
+	   		    $cmd="tar --exclude-vcs --exclude *.tgz --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" .";
+	   		    $ret=`$cmd`;
+	            if ($OS =~ /windows/i) {
+	        		print "Move $FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
+	        		$ret=`mv "$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
+	            }
+	            else
+	            {
+	        		$ret=`mv "$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
+	            }
+	            next;
+	    	}
+	
+	    	if ($target eq 'ZIP') {
+	    		$NEWDESTI=$DESTI;
+				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; }
+				 
+	    		print "Remove target $FILENAMEZIP.zip...\n";
+	    		unlink "$NEWDESTI/$FILENAMEZIP.zip";
+	    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
+	
+	            print "Go to directory $BUILDROOT\n";
+	     		$olddir=getcwd();
+	     		chdir("$BUILDROOT");
+	    		$cmd= "7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip *";
+				print $cmd."\n";
+				$ret= `$cmd`;
+	            chdir("$olddir");
+	
+	            print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
+	            $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
+	    		next;
+	    	}
+	    
+	    	if ($target eq 'EXE') {
+	    		$NEWDESTI=$DESTI;
+				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; }
+
+	    		print "Remove target $FILENAMEEXE.exe...\n";
+	    		unlink "$NEWDESTI/$FILENAMEEXE.exe";
+	    		print "Compress into $FILENAMEEXE.exe by $FILENAMEEXE.nsi...\n";
+	    		$command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\build\\exe\\$FILENAME.nsi\"";
+	            print "$command\n";
+	    		$ret=`$command`;
+	    		print "Move $FILENAMEEXE.exe to $NEWDESTI\n";
+	    		rename("$SOURCE\\build\\exe\\$FILENAMEEXE.exe","$NEWDESTI/$FILENAMEEXE.exe");
+	    		next;
+	    	}
+	    
+	    }
+	
+	}
+	
+	print "\n----- Summary -----\n";
+	foreach my $target (keys %CHOOSEDTARGET) {
+	    if ($CHOOSEDTARGET{$target} < 0) {
+	        print "Package $target not built (bad requirement).\n";
+	    } else {
+	        print "Package $target built successfully in $NEWDESTI\n";
+	    }
+	}
+
+
+}
+
+
+if (! $batch) {
+    print "\nPress key to finish...";
+    my $WAITKEY=<STDIN>;
+}
+
+0;
diff --git a/htdocs/modulebuilder/template/build/makepack-mymodule.conf b/htdocs/modulebuilder/template/build/makepack-mymodule.conf
new file mode 100644
index 00000000000..c7a47fbe45e
--- /dev/null
+++ b/htdocs/modulebuilder/template/build/makepack-mymodule.conf
@@ -0,0 +1,26 @@
+# Your module name here
+#
+# Goal:    Goal of module
+# Version: <version>
+# Author:  Copyright <year> - <name of author>
+# License: GPLv3
+# Install: Just unpack content of module package in Dolibarr directory.
+# Setup:   Go on Dolibarr setup - modules to enable module.
+#
+# Files in module
+index.php
+mypage.php
+admin/
+class/
+COPYING
+core/
+css/
+doc/
+img/
+js/
+langs/
+lib/
+scripts/
+sql/
+vendor/
+README.md
diff --git a/htdocs/modulebuilder/template/class/MyTrigger.php b/htdocs/modulebuilder/template/class/MyTrigger.php
new file mode 100644
index 00000000000..61604b7ff72
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/MyTrigger.php
@@ -0,0 +1,51 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    class/MyTrigger.php
+ * \ingroup mymodule
+ * \brief   Compatibility class for triggers in Dolibarr < 3.7.
+ *
+ * Hack for compatibility with Dolibarr versions < 3.7.
+ * Remove this and extend DolibarrTriggers directly from interface_99_modMyModule_MyTrigger.class.php
+ * if you don't intend to support these versions.
+ */
+
+// We ignore the PSR1.Classes.ClassDeclaration.MultipleClasses rule.
+// @codingStandardsIgnoreStart
+$dolibarr_version = versiondolibarrarray();
+if ($dolibarr_version[0] < 3 || ($dolibarr_version[0] == 3 && $dolibarr_version[1] < 7)) { // DOL_VERSION < 3.7
+	/**
+	 * Class MyTrigger
+	 *
+	 * For Dolibarr < 3.7.
+	 */
+	abstract class MyTrigger
+	{
+	}
+} else {
+	/**
+	 * Class MyTrigger
+	 *
+	 * For Dolibarr >= 3.7
+	 */
+	abstract class MyTrigger extends DolibarrTriggers
+	{
+	}
+}
+// @codingStandardsIgnoreEnd
diff --git a/htdocs/modulebuilder/template/class/ParsedownDolibarr.php b/htdocs/modulebuilder/template/class/ParsedownDolibarr.php
new file mode 100644
index 00000000000..45cf82f4b9c
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/ParsedownDolibarr.php
@@ -0,0 +1,48 @@
+<?php
+/*
+ * Copyright (C) 2016  Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    class/ParsedownDolibarr.php
+ * \ingroup mymodule
+ * \brief   Custom Parsedown class to display inline images from the README.md in the about page
+ */
+
+/** Includes */
+require __DIR__ . '/../vendor/autoload.php';
+
+/**
+ * Class ParsedownDolibarr
+ */
+class ParsedownDolibarr extends Parsedown
+{
+    /**
+     * Resolve inline images relative URLs to the module's path
+     *
+     * @param $Excerpt
+     * @return array|void
+     */
+    protected function inlineImage($Excerpt)
+    {
+        $image = parent::inlineImage($Excerpt);
+        $path = new \Enrise\Uri($image['element']['attributes']['src']);
+        if ($path->isRelative()) {
+            $image['element']['attributes']['src'] = dol_buildpath('/mymodule/' . $path, 1);
+        }
+        return $image;
+    }
+}
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
new file mode 100644
index 00000000000..1361a7b4897
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -0,0 +1,85 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    class/actions_mymodule.class.php
+ * \ingroup mymodule
+ * \brief   Example hook overload.
+ *
+ * Put detailed description here.
+ */
+
+/**
+ * Class ActionsMyModule
+ */
+class ActionsMyModule
+{
+	/**
+	 * @var array Hook results. Propagated to $hookmanager->resArray for later reuse
+	 */
+	public $results = array();
+
+	/**
+	 * @var string String displayed by executeHook() immediately after return
+	 */
+	public $resprints;
+
+	/**
+	 * @var array Errors
+	 */
+	public $errors = array();
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+	}
+
+	/**
+	 * Overloading the doActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array()         $parameters     Hook metadatas (context, etc...)
+	 * @param   CommonObject    &$object        The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          &$action        Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function doActions($parameters, &$object, &$action, $hookmanager)
+	{
+		$error = 0; // Error counter
+		$myvalue = 'test'; // A result value
+
+		print_r($parameters);
+		echo "action: " . $action;
+		print_r($object);
+
+		if (in_array('somecontext', explode(':', $parameters['context']))) {
+		  // do something only for the context 'somecontext'
+		}
+
+		if (! $error) {
+			$this->results = array('myreturn' => $myvalue);
+			$this->resprints = 'A text to show';
+			return 0; // or return 1 to replace standard code
+		} else {
+			$this->errors[] = 'Error message';
+			return -1;
+		}
+	}
+}
diff --git a/htdocs/modulebuilder/template/class/myclass.class.php b/htdocs/modulebuilder/template/class/myclass.class.php
new file mode 100644
index 00000000000..336ccf7c98a
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/myclass.class.php
@@ -0,0 +1,361 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    class/myclass.class.php
+ * \ingroup mymodule
+ * \brief   Example CRUD (Create/Read/Update/Delete) class.
+ *
+ * Put detailed description here.
+ */
+
+/** Includes */
+//require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php";
+//require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
+//require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
+
+/**
+ * Put your class' description here
+ */
+class MyClass // extends CommonObject
+{
+
+    /** @var DoliDb Database handler */
+	private $db;
+    /** @var string Error code or message */
+	public $error;
+    /** @var array Several error codes or messages */
+	public $errors = array();
+    /** @var string Id to identify managed object */
+	//public $element='myelement';
+    /** @var string Name of table without prefix where object is stored */
+	//public $table_element='mytable';
+    /** @var int An example ID */
+	public $id;
+    /** @var mixed An example property */
+	public $prop1;
+    /** @var mixed An example property */
+	public $prop2;
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+
+		return 1;
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param User $user User that create
+	 * @param int $notrigger 0=launch triggers after, 1=disable triggers
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		// Clean parameters
+		if (isset($this->prop1)) {
+			$this->prop1 = trim($this->prop1);
+		}
+		if (isset($this->prop2)) {
+			$this->prop2 = trim($this->prop2);
+		}
+
+		// Check parameters
+		// Put here code to add control on parameters values
+		// Insert request
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "mytable(";
+		$sql.= " field1,";
+		$sql.= " field2";
+
+		$sql.= ") VALUES (";
+		$sql.= " '" . $this->prop1 . "',";
+		$sql.= " '" . $this->prop2 . "'";
+
+		$sql.= ")";
+
+		$this->db->begin();
+
+		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error ++;
+			$this->errors[] = "Error " . $this->db->lasterror();
+		}
+
+		if (! $error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "mytable");
+
+			if (! $notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
+				$this->error.=($this->error ? ', ' . $errmsg : $errmsg);
+			}
+			$this->db->rollback();
+
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Load object in memory from database
+	 *
+	 * @param int $id Id object
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
+		global $langs;
+		$sql = "SELECT";
+		$sql.= " t.rowid,";
+		$sql.= " t.field1,";
+		$sql.= " t.field2";
+		//...
+		$sql.= " FROM " . MAIN_DB_PREFIX . "mytable as t";
+		$sql.= " WHERE t.rowid = " . $id;
+
+		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				$this->prop1 = $obj->field1;
+				$this->prop2 = $obj->field2;
+				//...
+			}
+			$this->db->free($resql);
+
+			return 1;
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param User $user User that modify
+	 * @param int $notrigger 0=launch triggers after, 1=disable triggers
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function update($user = 0, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		// Clean parameters
+		if (isset($this->prop1)) {
+			$this->prop1 = trim($this->prop1);
+		}
+		if (isset($this->prop2)) {
+			$this->prop2 = trim($this->prop2);
+		}
+
+		// Check parameters
+		// Put here code to add control on parameters values
+		// Update request
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "mytable SET";
+		$sql.= " field1=" . (isset($this->field1) ? "'" . $this->db->escape($this->field1) . "'" : "null") . ",";
+		$sql.= " field2=" . (isset($this->field2) ? "'" . $this->db->escape($this->field2) . "'" : "null") . "";
+
+		$sql.= " WHERE rowid=" . $this->id;
+
+		$this->db->begin();
+
+		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error ++;
+			$this->errors[] = "Error " . $this->db->lasterror();
+		}
+
+		if (! $error) {
+			if (! $notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
+				$this->error.=($this->error ? ', ' . $errmsg : $errmsg);
+			}
+			$this->db->rollback();
+
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user User that delete
+	 * @param int $notrigger 0=launch triggers after, 1=disable triggers
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function delete($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		$this->db->begin();
+
+		if (! $error) {
+			if (! $notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
+		}
+
+		if (! $error) {
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "mytable";
+			$sql.= " WHERE rowid=" . $this->id;
+
+			dol_syslog(__METHOD__ . " sql=" . $sql);
+			$resql = $this->db->query($sql);
+			if (! $resql) {
+				$error ++;
+				$this->errors[] = "Error " . $this->db->lasterror();
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
+				$this->error.=($this->error ? ', ' . $errmsg : $errmsg);
+			}
+			$this->db->rollback();
+
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Load an object from its id and create a new one in database
+	 *
+	 * @param int $fromid Id of object to clone
+	 * @return int New id of clone
+	 */
+	public function createFromClone($fromid)
+	{
+		global $user, $langs;
+
+		$error = 0;
+
+		$object = new SkeletonClass($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$object->fetch($fromid);
+		$object->id = 0;
+		$object->statut = 0;
+
+		// Clear fields
+		// ...
+		// Create clone
+		$result = $object->create($user);
+
+		// Other options
+		if ($result < 0) {
+			$this->error = $object->error;
+			$error ++;
+		}
+
+		if (! $error) {
+			// Do something
+		}
+
+		// End
+		if (! $error) {
+			$this->db->commit();
+
+			return $object->id;
+		} else {
+			$this->db->rollback();
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		$this->prop1 = 'prop1';
+		$this->prop2 = 'prop2';
+	}
+}
diff --git a/htdocs/modulebuilder/template/core/boxes/mybox.php b/htdocs/modulebuilder/template/core/boxes/mybox.php
new file mode 100644
index 00000000000..4fcdd69ae26
--- /dev/null
+++ b/htdocs/modulebuilder/template/core/boxes/mybox.php
@@ -0,0 +1,195 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    core/boxes/mybox.php
+ * \ingroup mymodule
+ * \brief   Example box definition.
+ *
+ * Put detailed description here.
+ */
+
+/** Includes */
+include_once DOL_DOCUMENT_ROOT . "/core/boxes/modules_boxes.php";
+
+/**
+ * Class to manage the box
+ *
+ * Warning: for the box to be detected correctly by dolibarr,
+ * the filename should be the lowercase classname
+ */
+class MyBox extends ModeleBoxes
+{
+	/**
+	 * @var string Alphanumeric ID. Populated by the constructor.
+	 */
+	public $boxcode = "mybox";
+
+	/**
+	 * @var string Box icon (in configuration page)
+	 * Automatically calls the icon named with the corresponding "object_" prefix
+	 */
+	public $boximg = "mymodule@mymodule";
+
+	/**
+	 * @var string Box label (in configuration page)
+	 */
+	public $boxlabel;
+
+	/**
+	 * @var string[] Module dependencies
+	 */
+	public $depends = array('mymodule');
+
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
+
+	/**
+	 * @var mixed More parameters
+	 */
+	public $param;
+
+	/**
+	 * @var array Header informations. Usually created at runtime by loadBox().
+	 */
+	public $info_box_head = array();
+
+	/**
+	 * @var array Contents informations. Usually created at runtime by loadBox().
+	 */
+	public $info_box_contents = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param string $param More parameters
+	 */
+	public function __construct(DoliDB $db, $param = '')
+	{
+		global $langs;
+		$langs->load("boxes");
+		$langs->load('mymodule@mymodule');
+
+		parent::__construct($db, $param);
+
+		$this->boxlabel = $langs->transnoentitiesnoconv("MyBox");
+
+		$this->param = $param;
+	}
+
+	/**
+	 * Load data into info_box_contents array to show array later. Called by Dolibarr before displaying the box.
+	 *
+	 * @param int $max Maximum number of records to load
+	 * @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $langs;
+
+		// Use configuration value for max lines count
+		$this->max = $max;
+
+		//include_once DOL_DOCUMENT_ROOT . "/mymodule/class/mymodule.class.php";
+
+		// Populate the head at runtime
+		$text = $langs->trans("MyBoxDescription", $max);
+		$this->info_box_head = array(
+			// Title text
+			'text' => $text,
+			// Add a link
+			'sublink' => 'http://example.com',
+			// Sublink icon placed after the text
+			'subpicto' => 'object_mymodule@mymodule',
+			// Sublink icon HTML alt text
+			'subtext' => '',
+			// Sublink HTML target
+			'target' => '',
+			// HTML class attached to the picto and link
+			'subclass' => 'center',
+			// Limit and truncate with "…" the displayed text lenght, 0 = disabled
+			'limit' => 0,
+			// Adds translated " (Graph)" to a hidden form value's input (?)
+			'graph' => false
+		);
+
+		// Populate the contents at runtime
+		$this->info_box_contents = array(
+			0 => array( // First line
+				0 => array( // First Column
+					//  HTML properties of the TR element. Only available on the first column.
+					'tr'           => 'align="left"',
+					// HTML properties of the TD element
+					'td'           => '',
+					// Fist line logo
+					'logo'         => 'mymodule@mymodule',
+					// Main text
+					'text'         => 'My text',
+					// Secondary text
+					'text2'        => '<p><strong>Another text</strong></p>',
+					// Unformatted text, usefull to load javascript elements
+					'textnoformat' => '',
+					// Link on 'text' and 'logo' elements
+					'url'          => 'http://example.com',
+					// Link's target HTML property
+					'target'       => '_blank',
+					// Truncates 'text' element to the specified character length, 0 = disabled
+					'maxlength'    => 0,
+					// Prevents HTML cleaning (and truncation)
+					'asis'         => false,
+					// Same for 'text2'
+					'asis2'        => true
+				),
+				1 => array( // Another column
+					// No TR for n≠0
+					'td'   => '',
+					'text' => 'Another cell',
+				)
+			),
+			1 => array( // Another line
+				0 => array( // TR
+					'tr'   => 'align="left"',
+					'text' => 'Another line'
+				)
+			),
+			2 => array( // Another line
+				0 => array( // TR
+					'tr'   => 'align="left"',
+					'text' => 'Yet another line'
+				)
+			),
+		);
+	}
+
+	/**
+	 * Method to show box. Called by Dolibarr eatch time it wants to display the box.
+	 *
+	 * @param array $head Array with properties of box title
+	 * @param array $contents Array with properties of box lines
+	 * @return void
+	 */
+	public function showBox($head = null, $contents = null)
+	{
+		// You may make your own code here…
+		// … or use the parent's class function using the provided head and contents templates
+		parent::showBox($this->info_box_head, $this->info_box_contents);
+	}
+}
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
new file mode 100644
index 00000000000..152059cd79a
--- /dev/null
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -0,0 +1,719 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \defgroup    mymodule    MyModule module
+ * \brief       MyModule module descriptor.
+ *
+ * Put detailed description here.
+ */
+
+/**
+ * \file        core/modules/modMyModule.class.php
+ * \ingroup     mymodule
+ * \brief       Example module description and activation file.
+ *
+ * Put detailed description here.
+ */
+
+include_once DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php";
+
+// The class name should start with a lower case mod for Dolibarr to pick it up
+// so we ignore the Squiz.Classes.ValidClassName.NotCamelCaps rule.
+// @codingStandardsIgnoreStart
+/**
+ * Description and activation class for module MyModule
+ */
+class modMyModule extends DolibarrModules
+{
+	/** @var DoliDB Database handler */
+	public $db;
+
+	/**
+	 * @var int numero Module unique ID
+	 * @see http://wiki.dolibarr.org/index.php/List_of_modules_id Available ranges
+	 */
+	public $numero = 500000;
+
+	/** @var string Text key to reference module (for permissions, menus, etc.) */
+	public $rights_class = 'mymodule';
+
+	/**
+	 * @var string Module family.
+	 * Used to group modules in module setup page.
+	 * Can be one of 'crm', 'financial', 'hr', 'projects', 'products', 'ecm', 'technic', 'other'
+	 */
+	public $family = 'other';
+
+	/** @var int Module position in the family */
+	public $module_position = 500;
+
+	/** @var array Provide a custom family and options */
+	public $familyinfo = array(
+//        'myownfamily' => array(
+//            'position' => '001',
+//            'label' => 'MyOwnFamily'
+//        )
+	);
+
+	/** @var string Module name */
+	public $name = "My Module";
+
+	/** @var string Module short description */
+	public $description = "Description of module MyModule";
+
+	/** @var string Module long description */
+	public $descriptionlong = "A very long description. Can be a full HTML content";
+
+	/**
+	 * @var string Module editor name
+	 * @since 4.0
+	 */
+	public $editor_name = "My Company";
+
+	/**
+	 * @var string Module editor website
+	 * @since 4.0
+	 */
+	public $editor_url = "http://www.example.com";
+
+	/**
+	 * @var string Module version string
+	 * Special values to hide the module behind MAIN_FEATURES_LEVEL: development, experimental
+	 * @see https://semver.org
+	 */
+	public $version = 'development';
+
+	/** @var string Key used in llx_const table to save module status enabled/disabled */
+	public $const_name = 'MAIN_MODULE_MYMODULE';
+
+	/**
+	 * @var string Module logo
+	 * Should be named object_mymodule.png and store under mymodule/img
+	 */
+	public $picto = 'mymodule@mymodule';
+
+	/** @var array Define module parts */
+	public $module_parts = array(
+		/** @var bool Module ships triggers in mymodule/core/triggers */
+		'triggers' => true,
+		/**
+		 * @var bool Module ships login in mymodule/core/login
+		 * @todo: example
+		 */
+		'login' => false,
+		/**
+		 * @var bool Module ships substitution functions
+		 * @todo example
+		 */
+		'substitutions' => false,
+		/**
+		 * @var bool Module ships menu handlers
+		 * @todo example
+		 */
+		'menus' => false,
+		/**
+		 * @var bool Module ships theme in mymodule/theme
+		 * @todo example
+		 */
+		'theme' => false,
+		/**
+		 * @var bool Module shipped templates in mymodule/core/tpl overload core ones
+		 * @todo example
+		 */
+		'tpl' => false,
+		/**
+		 * @var bool Module ships barcode functions
+		 * @todo example
+		 */
+		'barcode' => false,
+		/**
+		 * @var bool Module ships models
+		 * @todo example
+		 */
+		'models' => false,
+		/** @var string[] List of module shipped custom CSS relative file paths */
+		'css' => array(
+			'mymodule/css/mycss.css.php'
+		),
+		/** @var string[] List of module shipped custom JavaScript relative file paths */
+		'js' => array(
+			'mymodule/js/myjs.js.php'
+		),
+		/**
+		 * @var string[] List of hook contexts managed by the module
+		 * @ todo example
+		 */
+		'hooks' => array(),
+		/**
+		 * @var array List of default directory names to force
+		 * @todo example
+		 */
+		'dir' => array(),
+		/**
+		 * @var array List of workflow contexts managed by the module
+		 */
+		'workflow' => array(),
+	);
+
+	/** @var string Data directories to create when module is enabled */
+	public $dirs = array(
+		'/mymodule/temp'
+	);
+
+	/** @var array Configuration page declaration */
+	public $config_page_url = 'setup.php@mymodule';
+
+	/** @var bool Control module visibility */
+	public $hidden = false;
+
+	/** @var string[] List of class names of modules to enable when this one is enabled */
+	public $depends = array();
+
+	/** @var string[] List of class names of modules to disable when this one is disabled */
+	public $requiredby = array();
+
+	/** @var string List of class names of modules this module conflicts with */
+	public $conflictwith = array();
+
+	/** @var int[] Minimum PHP version required by this module */
+	public $phpmin = array(5, 3);
+
+	/** @var int[] Minimum Dolibarr version required by this module */
+	public $need_dolibarr_version = array(3, 2);
+
+	/** @var string[] List of language files */
+	public $langfiles = array('mymodule@mymodule');
+
+	/** @var array Indexed list of constants options */
+	public $const = array(
+		0 => array(
+			/** @var string Constant name */
+			'MYMODULE_MYNEWCONST1',
+			/**
+			 * @var string Constant type
+			 * @todo Are there other types than 'chaine'?
+			 */
+			'chaine',
+			/** @var string Constant initial value */
+			'myvalue',
+			/** @var string Constant description */
+			'This is a configuration constant',
+			/** @var bool Constant visibility */
+			true,
+			/**
+			 * @var string Multi-company entities
+			 * 'current' or 'allentities'
+			 */
+			'current',
+			/** @var bool Delete constant when module is disabled */
+			true
+		)
+	);
+
+	/**
+	 * @var string List of pages to add as tab in a specific view
+	 * @todo example
+	 */
+	public $tabs = array();
+
+	/**
+	 * @var array Dictionaries declared by the module
+	 *@todo example
+	 */
+	public $dictionaries = array();
+
+	/** @var array Indexed list of boxes options */
+	public $boxes = array(
+		0 => array(
+			'file' => 'mybox@mymodule',
+			'note' => '',
+			'enabledbydefaulton' => 'Home'
+		)
+	);
+
+	/**
+	 * @var array Indexed list of cronjobs options
+	 * @todo: example
+	 */
+	public $cronjobs = array();
+
+	/**
+	 * @var array Indexed list of permissions options
+	 * @todo example
+	 */
+	public $rights = array();
+
+	/**
+	 * @var array Indexed list of menu options
+	 * @todo example
+	 */
+	public $menu = array();
+
+	/**
+	 * @var array Indexed list of export IDs
+	 * @todo example
+	 */
+	public $export_code = array();
+
+	/**
+	 * @var array Indexed list of export names
+	 * @todo example
+	 */
+	public $export_label = array();
+
+	/**
+	 * @var array Indexed list of export enabling conditions
+	 * @todo example
+	 */
+	public $export_enabled = array();
+
+	/**
+	 * @var array Indexed list of export required permissions
+	 * @todo example
+	 */
+	public $export_permission = array();
+
+	/**
+	 * @var array Indexed list of export fields
+	 * @todo example
+	 */
+	public $export_fields_array = array();
+
+	/**
+	 * @var array Indexed list of export entities
+	 * @todo example
+	 */
+	public $export_entities_array = array();
+
+	/**
+	 * @var array Indexed list of export SQL queries start
+	 * @todo example
+	 */
+	public $export_sql_start = array();
+
+	/**
+	 * @var array Indexed list of export SQL queries end
+	 * @todo example
+	 */
+	public $export_sql_end = array();
+
+	/** @var bool Module only enabled / disabled in main company when multi-company is in use */
+	public $core_enabled = false;
+
+	// @codingStandardsIgnoreEnd
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
+
+		// DolibarrModules is abstract in Dolibarr < 3.8
+		if (is_callable('parent::__construct')) {
+			parent::__construct($db);
+		} else {
+			global $db;
+			$this->db = $db;
+		}
+
+		// Declare custom family with translated label
+		//$this->familyinfo = array(
+		//	'myownfamily' => array(
+		//		'position' => '001',
+		//		'label' => $langs->trans("MyOwnFamily")
+		//	)
+		//);
+
+		// Lazy automatic module naming from class names
+		//$this->name = preg_replace('/^mod/i', '', get_class($this));
+
+		// Lazy automatic constant naming from module name
+		//$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+
+		// Examples for complex types
+		//$this->module_parts = array(
+			// Set here all hooks context managed by module
+			// 'hooks' => array('hookcontext1','hookcontext2'),
+			// To force the default directories names
+			// 'dir' => array('output' => 'othermodulename'),
+			// Set here all workflow context managed by module
+			// Don't forget to depend on modWorkflow!
+			// The description translation key will be descWORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2
+			// You will be able to check if it is enabled with the $conf->global->WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2 constant
+			// Implementation is up to you and is usually done in a trigger.
+			// 'workflow' => array(
+			//     'WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2' => array(
+			//         'enabled' => '! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)',
+			//         'picto' => 'yourpicto@mymodule',
+			//         'warning' => 'WarningTextTranslationKey',
+			//      ),
+			// ),
+		//);
+
+
+		// Array to add new pages in new tabs
+		// Example:
+		//$this->tabs = array(
+			//	// To add a new tab identified by code tabname1
+			//	'objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',
+			//	// To add another new tab identified by code tabname2
+			//	'objecttype:+tabname2:Title2:langfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',
+			//	// To remove an existing tab identified by code tabname
+			//	'objecttype:-tabname'
+		//);
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
+
+		// Dictionaries
+		if (! isset($conf->mymodule->enabled)) {
+			$conf->mymodule=new stdClass();
+			$conf->mymodule->enabled = 0;
+		}
+		//$this->dictionaries = array();
+		/* Example:
+		  $this->dictionaries=array(
+			  'langs'=>'mymodule@mymodule',
+			  // List of tables we want to see into dictonary editor
+			  'tabname'=>array(
+				  MAIN_DB_PREFIX."table1",
+				  MAIN_DB_PREFIX."table2",
+				  MAIN_DB_PREFIX."table3"
+			  ),
+			  // Label of tables
+			  'tablib'=>array("Table1","Table2","Table3"),
+			  // Query to select fields
+			  'tabsql'=>array(
+				  'SELECT f.rowid as rowid, f.code, f.label, f.active'
+				  . ' FROM ' . MAIN_DB_PREFIX . 'table1 as f',
+				  'SELECT f.rowid as rowid, f.code, f.label, f.active'
+				  . ' FROM ' . MAIN_DB_PREFIX . 'table2 as f',
+				  'SELECT f.rowid as rowid, f.code, f.label, f.active'
+				  . ' FROM ' . MAIN_DB_PREFIX . 'table3 as f'
+			  ),
+			  // Sort order
+			  'tabsqlsort'=>array("label ASC","label ASC","label ASC"),
+			  // List of fields (result of select to show dictionary)
+			  'tabfield'=>array("code,label","code,label","code,label"),
+			  // List of fields (list of fields to edit a record)
+			  'tabfieldvalue'=>array("code,label","code,label","code,label"),
+			  // List of fields (list of fields for insert)
+			  'tabfieldinsert'=>array("code,label","code,label","code,label"),
+			  // Name of columns with primary key (try to always name it 'rowid')
+			  'tabrowid'=>array("rowid","rowid","rowid"),
+			  // Condition to show each dictionary
+			  'tabcond'=>array(
+				  $conf->mymodule->enabled,
+				  $conf->mymodule->enabled,
+				  $conf->mymodule->enabled
+			  )
+		  );
+		 */
+
+		// Cronjobs
+		// List of cron jobs entries to add
+		//$this->cronjobs = array();
+		// Example:
+		//		$this->cronjobs = array(
+		//			0 => array(
+		//				'label' => 'My label',
+		//				'jobtype' => 'method',
+		//				'class' => '/dir/class/file.class.php',
+		//				'objectname' => 'MyClass',
+		//				'method' => 'myMethod',
+		//				'parameters' => '',
+		//				'comment' => 'Comment',
+		//				'frequency' => 2,
+		//				'unitfrequency' => 3600,
+		//				'test' => true
+		//			),
+		//			1 => array(
+		//				'label' => 'My label',
+		//				'jobtype' => 'command',
+		//				'command' => '',
+		//				'parameters' => '',
+		//				'comment' => 'Comment',
+		//				'frequency' => 1,
+		//				'unitfrequency' => 3600 * 24,
+		//				'test' => true
+		//			)
+		//		);
+
+		// Permissions
+		//$r = 0;
+		// Add here list of permission defined by
+		// an id, a label, a boolean and two constant strings.
+		// Example:
+		//// Permission id (must not be already used)
+		//$this->rights[$r][0] = 2000;
+		//// Permission label
+		//$this->rights[$r][1] = 'Permision label';
+		//// Permission by default for new user (0/1)
+		//$this->rights[$r][3] = 1;
+		//// In php code, permission will be checked by test
+		//// if ($user->rights->permkey->level1->level2)
+		//$this->rights[$r][4] = 'level1';
+		//// In php code, permission will be checked by test
+		//// if ($user->rights->permkey->level1->level2)
+		//$this->rights[$r][5] = 'level2';
+		//$r++;
+		// Main menu entries
+
+		// Menu entries
+		// Example to declare a new Top Menu entry and its Left menu entry:
+		//$this->menu[]=array(
+		//	// Put 0 if this is a top menu
+		//	'fk_menu'=>0,
+		//	// This is a Top menu entry
+		//	'type'=>'top',
+		// Menu's title. FIXME: use a translation key
+		//	'titre'=>'MyModule top menu',
+		// This menu's mainmenu ID
+		//	'mainmenu'=>'mymodule',
+		// This menu's leftmenu ID
+		//	'leftmenu'=>'mymodule',
+		//	'url'=>'/mymodule/pagetop.php',
+		//	// Lang file to use (without .lang) by module.
+		//	// File must be in langs/code_CODE/ directory.
+		//	'langs'=>'mylangfile',
+		//	'position'=>100,
+		//	// Define condition to show or hide menu entry.
+		//	// Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
+		//	'enabled'=>'$conf->mymodule->enabled',
+		//	// Use 'perms'=>'$user->rights->mymodule->level1->level2'
+		//	// if you want your menu with a permission rules
+		//	'perms'=>'1',
+		//	'target'=>'',
+		//	// 0=Menu for internal users, 1=external users, 2=both
+		//	'user'=>2
+		//);
+		//$this->menu[]=array(
+		//	// Use r=value where r is index key used for the parent menu entry
+		//	// (higher parent must be a top menu entry)
+		//	'fk_menu'=>'r=0',
+		//	// This is a Left menu entry
+		//	'type'=>'left',
+		// Menu's title. FIXME: use a translation key
+		//	'titre'=>'MyModule left menu',
+		// This menu's mainmenu ID
+		//	'mainmenu'=>'mymodule',
+		// This menu's leftmenu ID
+		//	'leftmenu'=>'mymodule',
+		//	'url'=>'/mymodule/pagelevel1.php',
+		//	// Lang file to use (without .lang) by module.
+		//	// File must be in langs/code_CODE/ directory.
+		//	'langs'=>'mylangfile',
+		//	'position'=>100,
+		//	// Define condition to show or hide menu entry.
+		//	// Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
+		//	'enabled'=>'$conf->mymodule->enabled',
+		//	// Use 'perms'=>'$user->rights->mymodule->level1->level2'
+		//	// if you want your menu with a permission rules
+		//	'perms'=>'1',
+		//	'target'=>'',
+		//	// 0=Menu for internal users, 1=external users, 2=both
+		//	'user'=>2
+		//);
+		//
+		// Example to declare a Left Menu entry into an existing Top menu entry:
+		//$this->menu[]=array(
+		//	// Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy'
+		//	'fk_menu'=>'fk_mainmenu=mainmenucode',
+		//	// This is a Left menu entry
+		//	'type'=>'left',
+		// Menu's title. FIXME: use a translation key
+		//	'titre'=>'MyModule left menu',
+		// This menu's mainmenu ID
+		//	'mainmenu'=>'mainmenucode',
+		// This menu's leftmenu ID
+		//	'leftmenu'=>'mymodule',
+		//	'url'=>'/mymodule/pagelevel2.php',
+		//	// Lang file to use (without .lang) by module.
+		//	// File must be in langs/code_CODE/ directory.
+		//	'langs'=>'mylangfile',
+		//	'position'=>100,
+		//	// Define condition to show or hide menu entry.
+		//	// Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
+		//	// Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+		//	'enabled'=>'$conf->mymodule->enabled',
+		//	// Use 'perms'=>'$user->rights->mymodule->level1->level2'
+		//	// if you want your menu with a permission rules
+		//	'perms'=>'1',
+		//	'target'=>'',
+		//	// 0=Menu for internal users, 1=external users, 2=both
+		//	'user'=>2
+		//);
+
+		// Exports
+		//$r = 0;
+		// Example:
+		//$this->export_code[$r]=$this->rights_class.'_'.$r;
+		//// Translation key (used only if key ExportDataset_xxx_z not found)
+		//$this->export_label[$r]='CustomersInvoicesAndInvoiceLines';
+		//// Condition to show export in list (ie: '$user->id==3').
+		//// Set to 1 to always show when module is enabled.
+		//$this->export_enabled[$r]='1';
+		//$this->export_permission[$r]=array(array("facture","facture","export"));
+		//$this->export_fields_array[$r]=array(
+		//	's.rowid'=>"IdCompany",
+		//	's.nom'=>'CompanyName',
+		//	's.address'=>'Address',
+		//	's.cp'=>'Zip',
+		//	's.ville'=>'Town',
+		//	's.fk_pays'=>'Country',
+		//	's.tel'=>'Phone',
+		//	's.siren'=>'ProfId1',
+		//	's.siret'=>'ProfId2',
+		//	's.ape'=>'ProfId3',
+		//	's.idprof4'=>'ProfId4',
+		//	's.code_compta'=>'CustomerAccountancyCode',
+		//	's.code_compta_fournisseur'=>'SupplierAccountancyCode',
+		//	'f.rowid'=>"InvoiceId",
+		//	'f.facnumber'=>"InvoiceRef",
+		//	'f.datec'=>"InvoiceDateCreation",
+		//	'f.datef'=>"DateInvoice",
+		//	'f.total'=>"TotalHT",
+		//	'f.total_ttc'=>"TotalTTC",
+		//	'f.tva'=>"TotalVAT",
+		//	'f.paye'=>"InvoicePaid",
+		//	'f.fk_statut'=>'InvoiceStatus',
+		//	'f.note'=>"InvoiceNote",
+		//	'fd.rowid'=>'LineId',
+		//	'fd.description'=>"LineDescription",
+		//	'fd.price'=>"LineUnitPrice",
+		//	'fd.tva_tx'=>"LineVATRate",
+		//	'fd.qty'=>"LineQty",
+		//	'fd.total_ht'=>"LineTotalHT",
+		//	'fd.total_tva'=>"LineTotalTVA",
+		//	'fd.total_ttc'=>"LineTotalTTC",
+		//	'fd.date_start'=>"DateStart",
+		//	'fd.date_end'=>"DateEnd",
+		//	'fd.fk_product'=>'ProductId',
+		//	'p.ref'=>'ProductRef'
+		//);
+		//$this->export_entities_array[$r]=array('s.rowid'=>"company",
+		//	's.nom'=>'company',
+		//	's.address'=>'company',
+		//	's.cp'=>'company',
+		//	's.ville'=>'company',
+		//	's.fk_pays'=>'company',
+		//	's.tel'=>'company',
+		//	's.siren'=>'company',
+		//	's.siret'=>'company',
+		//	's.ape'=>'company',
+		//	's.idprof4'=>'company',
+		//	's.code_compta'=>'company',
+		//	's.code_compta_fournisseur'=>'company',
+		//	'f.rowid'=>"invoice",
+		//	'f.facnumber'=>"invoice",
+		//	'f.datec'=>"invoice",
+		//	'f.datef'=>"invoice",
+		//	'f.total'=>"invoice",
+		//	'f.total_ttc'=>"invoice",
+		//	'f.tva'=>"invoice",
+		//	'f.paye'=>"invoice",
+		//	'f.fk_statut'=>'invoice',
+		//	'f.note'=>"invoice",
+		//	'fd.rowid'=>'invoice_line',
+		//	'fd.description'=>"invoice_line",
+		//	'fd.price'=>"invoice_line",
+		//	'fd.total_ht'=>"invoice_line",
+		//	'fd.total_tva'=>"invoice_line",
+		//	'fd.total_ttc'=>"invoice_line",
+		//	'fd.tva_tx'=>"invoice_line",
+		//	'fd.qty'=>"invoice_line",
+		//	'fd.date_start'=>"invoice_line",
+		//	'fd.date_end'=>"invoice_line",
+		//	'fd.fk_product'=>'product',
+		//	'p.ref'=>'product'
+		//);
+		//$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		//$this->export_sql_end[$r] = ' FROM (' . MAIN_DB_PREFIX . 'facture as f, '
+		//	. MAIN_DB_PREFIX . 'facturedet as fd, ' . MAIN_DB_PREFIX . 'societe as s)';
+		//$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX
+		//	. 'product as p on (fd.fk_product = p.rowid)';
+		//$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid '
+		//	. 'AND f.rowid = fd.fk_facture';
+		//$r++;
+	}
+
+	/**
+	 * Function called when module is enabled.
+	 * The init function add constants, boxes, permissions and menus
+	 * (defined in constructor) into Dolibarr database.
+	 * It also creates data directories
+	 *
+	 * @param string $options Options when enabling module ('', 'noboxes')
+	 * @return int 1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		$sql = array();
+
+		$result = $this->loadTables();
+
+		return $this->_init($sql, $options);
+	}
+
+	/**
+	 * Create tables, keys and data required by module
+	 * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
+	 * and create data commands must be stored in directory /mymodule/sql/
+	 * This function is called by this->init
+	 *
+	 * @return int <=0 if KO, >0 if OK
+	 */
+	private function loadTables()
+	{
+		return $this->_load_tables('/mymodule/sql/');
+	}
+
+	/**
+	 * Function called when module is disabled.
+	 * Remove from database constants, boxes and permissions from Dolibarr database.
+	 * Data directories are not deleted
+	 *
+	 * @param string $options Options when enabling module ('', 'noboxes')
+	 * @return int 1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
+
+		return $this->_remove($sql, $options);
+	}
+}
diff --git a/htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php b/htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php
new file mode 100644
index 00000000000..206494c50f9
--- /dev/null
+++ b/htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php
@@ -0,0 +1,28 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    core/tpl/mytemplate.tpl.php
+ * \ingroup mymodule
+ * \brief   Example template.
+ *
+ * Put detailed description here.
+ */
+
+/** Your code here. */
+echo "Hello world!";
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyTrigger.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyTrigger.class.php
new file mode 100644
index 00000000000..761a717d944
--- /dev/null
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyTrigger.class.php
@@ -0,0 +1,580 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    core/triggers/interface_99_modMyModule_MyTrigger.class.php
+ * \ingroup mymodule
+ * \brief   Example trigger.
+ *
+ * Put detailed description here.
+ *
+ * \remarks You can create other triggers by copying this one.
+ * - File name should be either:
+ *      - interface_99_modMyModule_MyTrigger.class.php
+ *      - interface_99_all_MyTrigger.class.php
+ * - The file must stay in core/triggers
+ * - The class name must be InterfaceMytrigger
+ * - The constructor method must be named InterfaceMytrigger
+ * - The name property name must be Mytrigger
+ */
+
+/** Includes */
+require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT . dol_buildpath('/mymodule/class/MyTrigger.php', 1);
+
+/**
+ * Class InterfaceMytrigger
+ */
+class InterfaceMytrigger extends MyTrigger
+{
+	/**
+	 * @var DoliDB Database handler
+	 */
+	protected $db;
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "demo";
+		$this->description = "Triggers of this module are empty functions."
+			. "They have no effect."
+			. "They are provided for tutorial purpose only.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'development';
+		$this->picto = 'mymodule@mymodule';
+	}
+
+	/**
+	 * Trigger name
+	 *
+	 * @return string Name of trigger file
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Trigger description
+	 *
+	 * @return string Description of trigger file
+	 */
+	public function getDesc()
+	{
+		return $this->description;
+	}
+
+	/**
+	 * Trigger version
+	 *
+	 * @return string Version of trigger file
+	 */
+	public function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($this->version == 'development') {
+			return $langs->trans("Development");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("Experimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("Unknown");
+		}
+	}
+
+    // @codingStandardsIgnoreStart
+	/**
+	 * Compatibility trigger function for Dolibarr < 3.7
+	 *
+	 * @param int $action Trigger action
+	 * @param CommonObject $object Object trigged from
+	 * @param User $user User that trigged
+	 * @param Translate $langs Translations handler
+	 * @param Conf $conf Configuration
+	 * @return int                  <0 if KO, 0 if no triggered ran, >0 if OK
+	 * @deprecated Replaced by DolibarrTriggers::runTrigger()
+	 */
+	public function run_trigger($action, $object, $user, $langs, $conf)
+	{
+		return $this->runTrigger($action, $object, $user, $langs, $conf);
+	}
+	// @codingStandardsIgnoreEnd
+
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file
+	 * is inside directory core/triggers
+	 *
+	 * @param string $action Event action code
+	 * @param CommonObject $object Object
+	 * @param User $user Object user
+	 * @param Translate $langs Object langs
+	 * @param Conf $conf Object conf
+	 * @return int              <0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+	{
+		// Put here code you want to execute when a Dolibarr business events occurs.
+		// Data and type of action are stored into $object and $action
+
+		/** Users */
+		if ($action == 'USER_LOGIN') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_UPDATE_SESSION') {
+			// Warning: To increase performances, this action is triggered only if
+			// constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_CREATE_FROM_CONTACT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_NEW_PASSWORD') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_ENABLEDISABLE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_LOGOUT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_SETINGROUP') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_REMOVEFROMGROUP') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Groups */
+		} elseif ($action == 'GROUP_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'GROUP_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'GROUP_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Companies */
+		} elseif ($action == 'COMPANY_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'COMPANY_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'COMPANY_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Contacts */
+		} elseif ($action == 'CONTACT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTACT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTACT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+			// Products
+		} elseif ($action == 'PRODUCT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PRODUCT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PRODUCT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Customer orders */
+		} elseif ($action == 'ORDER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_CLONE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEORDER_INSERT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEORDER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Supplier orders */
+		} elseif ($action == 'ORDER_SUPPLIER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_SUPPLIER_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SUPPLIER_ORDER_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Proposals */
+		} elseif ($action == 'PROPAL_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_CLONE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_CLOSE_SIGNED') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_CLOSE_REFUSED') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEPROPAL_INSERT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEPROPAL_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEPROPAL_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Contracts */
+		} elseif ($action == 'CONTRACT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_ACTIVATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_CANCEL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_CLOSE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Bills */
+		} elseif ($action == 'BILL_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_CLONE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_CANCEL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEBILL_INSERT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEBILL_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Payments */
+		} elseif ($action == 'PAYMENT_CUSTOMER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PAYMENT_SUPPLIER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PAYMENT_ADD_TO_BANK') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PAYMENT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Interventions */
+		} elseif ($action == 'FICHEINTER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'FICHEINTER_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'FICHEINTER_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'FICHEINTER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Members */
+		} elseif ($action == 'MEMBER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_SUBSCRIPTION') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_NEW_PASSWORD') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_RESILIATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Categories */
+		} elseif ($action == 'CATEGORY_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CATEGORY_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CATEGORY_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Projects */
+		} elseif ($action == 'PROJECT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROJECT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROJECT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+			/** Project tasks */
+		} elseif ($action == 'TASK_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'TASK_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'TASK_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Task time spent */
+		} elseif ($action == 'TASK_TIMESPENT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'TASK_TIMESPENT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'TASK_TIMESPENT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** Shipping */
+		} elseif ($action == 'SHIPPING_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			/** File */
+		} elseif ($action == 'FILE_UPLOAD') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'FILE_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		return 0;
+	}
+}
diff --git a/htdocs/modulebuilder/template/css/mycss.css.php b/htdocs/modulebuilder/template/css/mycss.css.php
new file mode 100644
index 00000000000..eaa248288e8
--- /dev/null
+++ b/htdocs/modulebuilder/template/css/mycss.css.php
@@ -0,0 +1,27 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    css/mycss.css.php
+ * \ingroup mymodule
+ * \brief   Example CSS.
+ *
+ * Put detailed description here.
+ */
+
+header('Content-Type: text/css');
diff --git a/htdocs/modulebuilder/template/dev/codesniffer/DolibarrPSR2.xml b/htdocs/modulebuilder/template/dev/codesniffer/DolibarrPSR2.xml
new file mode 100644
index 00000000000..48d3f5d8d1d
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/codesniffer/DolibarrPSR2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<ruleset name="Dolibarr (PSR2)">
+ <description>The PSR2 standard with Dolibarr quirks.</description>
+
+ <!-- Include the whole PSR2 standard -->
+ <rule ref="PSR2">
+     <!-- Code can be indented with tabs -->
+     <exclude name="Generic.WhiteSpace.DisallowTabIndent" />
+     <!-- Dolibarr don't support namespacing (yet) -->
+     <exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace" />
+ </rule>
+</ruleset>
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/dev/dolistore/README.md b/htdocs/modulebuilder/template/dev/dolistore/README.md
new file mode 100644
index 00000000000..d322d2c98fe
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/dolistore/README.md
@@ -0,0 +1,87 @@
+Dolistore
+=========
+
+[Dolistore](https://dolistore.com) is the marketplace for Dolibarr modules.
+
+This directory contains templates assets that may be useful for publication.
+
+Images
+------
+
+### Logo
+
+See [img folder README](../img/README.md).
+
+### Screenshots
+
+Texts
+-----
+
+All texts needs 5 languages versions for:
+- en (English)
+- fr (Français)
+- es (Español)
+- it (Italiano)
+- de (Deutsch)
+
+### Name
+
+The module's marketed name.
+
+### Price
+
+Expressed in Euro (€).  
+Keep in mind that Dolistore will keep a 20% markup.
+
+### Categories
+
+- [x] Modules/Plugins
+- [ ] Skins and Templates
+- [ ] Tools and documentation
+- [ ] Skins
+- [ ] Document templates
+- [ ] System tools
+- [ ] CRM
+- [ ] ECM
+- [ ] Human Relationship
+- [ ] Products, Services or Stock
+- [ ] Project or collaborative
+- [ ] Interfaces
+- [ ] Other
+- [ ] Reporting or search
+- [ ] User's interface
+- [ ] 2Report sub-modules
+- [ ] Accountancy
+
+*The list may change. Check [Dolistore](https://dolistore.com) for up-to-date information.*
+
+### Short description
+
+A short description of the modules main features.  
+400 characters max.
+
+### Keywords
+
+Comma separated lists.
+eg: ```template,dev,module```
+
+### Long description
+
+The long description of your module.
+
+Suggested technical data:
+
+Version: 1.0.0  
+Publisher: MyCompany  
+Licence: GPLv3+  
+User interface language(s): English  
+Help/Support: None / Forum www.dolibarr.org / Mail at contact@example.com  
+Prerequisites:
+- Dolibarr min version: 3.8
+- Dolibarr max version: 3.9.*
+- PHP: ≥5.3  
+Install:
+- Download the module's archive file (.zip file) from DoliStore.com.
+- Put the file into the custom directory of Dolibarr.
+- Uncompress the zip file, for example with ```unzip modulefile_version.zip``` command.
+- Module is then available and can be activated.  
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-de.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-de.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-en.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-en.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-es.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-es.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-fr.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-fr.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-it.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-it.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-de.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-de.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-en.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-en.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-es.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-es.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-fr.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-fr.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-it.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-it.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-de.txt b/htdocs/modulebuilder/template/dev/dolistore/name-de.txt
new file mode 100644
index 00000000000..d177fbf2ba9
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/dolistore/name-de.txt
@@ -0,0 +1 @@
+Mein modul
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-en.txt b/htdocs/modulebuilder/template/dev/dolistore/name-en.txt
new file mode 100644
index 00000000000..bf608d557d4
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/dolistore/name-en.txt
@@ -0,0 +1 @@
+My module
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-es.txt b/htdocs/modulebuilder/template/dev/dolistore/name-es.txt
new file mode 100644
index 00000000000..a0ec54ad842
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/dolistore/name-es.txt
@@ -0,0 +1 @@
+My módulo
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-fr.txt b/htdocs/modulebuilder/template/dev/dolistore/name-fr.txt
new file mode 100644
index 00000000000..310ebcf10a5
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/dolistore/name-fr.txt
@@ -0,0 +1 @@
+Mon module
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-it.txt b/htdocs/modulebuilder/template/dev/dolistore/name-it.txt
new file mode 100644
index 00000000000..a196c1511a1
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/dolistore/name-it.txt
@@ -0,0 +1 @@
+Il mio modulo
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-de.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-de.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-en.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-en.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-es.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-es.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-fr.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-fr.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-it.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-it.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/template/dev/git-hooks/post-commit b/htdocs/modulebuilder/template/dev/git-hooks/post-commit
new file mode 100644
index 00000000000..d44ff23047c
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/git-hooks/post-commit
@@ -0,0 +1,2 @@
+#!/bin/sh
+composer git_post_commit
diff --git a/htdocs/modulebuilder/template/dev/git-hooks/pre-commit b/htdocs/modulebuilder/template/dev/git-hooks/pre-commit
new file mode 100644
index 00000000000..d8bd735325c
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/git-hooks/pre-commit
@@ -0,0 +1,2 @@
+#!/bin/sh
+composer git_pre_commit
diff --git a/htdocs/modulebuilder/template/dev/git-hooks/pre-push b/htdocs/modulebuilder/template/dev/git-hooks/pre-push
new file mode 100644
index 00000000000..61848c24831
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/git-hooks/pre-push
@@ -0,0 +1,2 @@
+#!/bin/sh
+composer git_pre_push
diff --git a/htdocs/modulebuilder/template/dev/img/README.md b/htdocs/modulebuilder/template/dev/img/README.md
new file mode 100644
index 00000000000..f44c37f30c6
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/img/README.md
@@ -0,0 +1,53 @@
+Source images
+=============
+
+Used to generate icons and publication assets.
+
+Icons
+-----
+
+### Dolibarr
+
+These resides in the [/img](../../img) directory.
+
+#### Small
+
+Required.
+Name must begin by ```object_```.
+
+- Sample:  ![object_mymodule.png](../../img/object_mymodule.png) [object_mymodule.png](../../img/object_mymodule.png)
+- Size: 14×14 pixels
+- Type: PNG
+
+#### Large
+
+Optional.
+
+- Sample: ![mymodule.png](../../img/mymodule.png) [mymodule.png](../../img/mymodule.png)
+- Size: 32×32 pixels
+- Type: PNG
+
+### Dolistore
+
+Designed to fit a 512×512 icon + publisher branding.
+
+- Size: 704×704
+- Type: PNG
+
+Export to 512×512
+
+### Transifex
+
+- Size: 96×96
+- Type: PNG
+
+### Others
+
+To be on the safe side, you may also want to generate all popular sizes:
+- 16×16
+- 32×32
+- 48×48
+- 64×64
+- 128×128
+- 256×256
+- 512×512
diff --git a/htdocs/modulebuilder/template/dev/img/gfdl-129x44.png b/htdocs/modulebuilder/template/dev/img/gfdl-129x44.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2bacfd179a99f051654eaa6ba30089dd8691d7a
GIT binary patch
literal 4709
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

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/dev/img/gfdl-66x23.png b/htdocs/modulebuilder/template/dev/img/gfdl-66x23.png
new file mode 100644
index 0000000000000000000000000000000000000000..b43479bf3c817b3f780eb453ef3c4e770e1ddc35
GIT binary patch
literal 2453
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
TZ)SHf00000NkvXXu0mjfVgHyi

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/dev/img/gfdl-logo.svg b/htdocs/modulebuilder/template/dev/img/gfdl-logo.svg
new file mode 100644
index 00000000000..a0daca0ead8
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/img/gfdl-logo.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="110.72372"
+   height="37.900333"
+   id="svg3330"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="New document 4">
+  <defs
+     id="defs3332" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="51.755214"
+     inkscape:cy="19.316583"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="950"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3335">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-319.64995,-513.41138)">
+    <g
+       id="g5424"
+       transform="matrix(1.1204236,0,0,1.1204236,378.23897,-788.71491)">
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="rect6744"
+         d="m -51.39745,1163.0948 85,0 0,29.5252 -85,0 2,-14.7626 z"
+         style="fill:#f5efbc;fill-opacity:1;stroke:#000000;stroke-width:1.79999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" />
+      <text
+         transform="scale(0.90245956,1.1080829)"
+         sodipodi:linespacing="125%"
+         id="text6752-6"
+         y="1071.2108"
+         x="-15.68348"
+         style="font-size:24.31293869px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:URW Palladio L;-inkscape-font-specification:URW Palladio L Bold"
+           y="1071.2108"
+           x="-15.68348"
+           id="tspan6754-4"
+           sodipodi:role="line">GFDL</tspan></text>
+      <path
+         inkscape:connector-curvature="0"
+         id="path7064-6"
+         d="m 19.61576,1166.8577 0,24 0.1875,0 c -0.12127,0.1989 -0.1875,0.4164 -0.1875,0.625 0,2.002 5.8203,3.625 13,3.625 7.1797,0 13,-1.623 13,-3.625 0,-0.2086 -0.0662,-0.4261 -0.1875,-0.625 l 0.1875,0 0,-24 -26,0 z"
+         style="color:#000000;fill:#f5efbc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.79999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         transform="translate(-321.63424,901.70446)"
+         d="m 367.25,264.98718 c 0,2.00203 -5.8203,3.625 -13,3.625 -7.1797,0 -13,-1.62297 -13,-3.625 0,-2.00203 5.8203,-3.625 13,-3.625 7.1797,0 13,1.62297 13,3.625 z"
+         sodipodi:ry="3.625"
+         sodipodi:rx="13"
+         sodipodi:cy="264.98718"
+         sodipodi:cx="354.25"
+         id="path7064"
+         style="color:#000000;fill:#f5efbc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.79999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="path7104"
+         d="m 45.06778,1167.3815 c -2.44864,5.5993 -9.9067,7.192 -21.52831,5.7955 l 5.7779,9.7599 -6.02275,7.2171 c 7.75095,3.1192 17.18643,1.5723 22.07112,-0.1842 z"
+         style="fill:#2e439b;fill-opacity:1;stroke:#000000;stroke-width:1.39999986;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccscc"
+         inkscape:connector-curvature="0"
+         id="path7106"
+         d="m 34.45935,1165.7653 c -3.4695,-0.1017 -8.01646,0.018 -10.47747,0.7778 1.2102,0.9782 6.11198,1.5627 9.94714,1.2348 3.20297,-0.2738 6.08198,-0.1311 7.93857,-1.1503 -0.70667,-1.1077 -3.93837,-3.3774 -7.91865,-3.2613"
+         style="fill:none;stroke:#000000;stroke-width:1.39999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>
diff --git a/htdocs/modulebuilder/template/dev/img/gpl-v3-logo.svg b/htdocs/modulebuilder/template/dev/img/gpl-v3-logo.svg
new file mode 100644
index 00000000000..6754c994bda
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/img/gpl-v3-logo.svg
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg1341"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/johns/graphics/logos/gplv3"
+   sodipodi:docname="gpl-v3-logo (copy).svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1343">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective79" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.56729519"
+     inkscape:cx="372.04724"
+     inkscape:cy="526.18109"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1439"
+     inkscape:window-height="825"
+     inkscape:window-x="1"
+     inkscape:window-y="49"
+     showgrid="false" />
+  <metadata
+     id="metadata1346">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3413"
+       transform="translate(1.7627461,148.07106)">
+      <g
+         id="g68"
+         style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,352.86817,563.90874)">
+        <path
+           style="fill:#000000;fill-opacity:0.94117647"
+           id="path70"
+           d="M 3.86,0 C 3.86,0 3.85,0 3.85,0 C 2.91,0 2.08,0.31 1.3,0.94 C 0.72,1.4 0.32,2.02 0,2.71 C 0,2.71 0.04,2.71 0.04,2.71 C 0.36,2.02 0.76,1.4 1.33,0.94 C 2.11,0.31 2.94,0.01 3.86,0 z" />
+      </g>
+      <path
+         style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         d="M 92.93948,358.4642 C 92.9395,358.46419 33.62975,617.23158 33.62975,617.23158 C 33.6468,617.23158 33.64894,617.23158 33.68304,617.23158 C 33.68304,617.23158 308.06385,617.23158 308.06385,617.23158 C 308.06386,617.23158 450.76958,617.23158 450.76958,617.23158 C 433.76851,615.74805 420.34631,609.77976 412.34882,598.90046 C 410.86529,596.88827 409.63964,594.72053 408.56535,592.45258 C 407.88328,590.78148 407.24167,589.09543 406.59368,587.39021 C 404.88844,581.9676 404.20851,575.9503 404.51544,569.53867 C 405.36806,551.66793 413.75349,530.41065 428.28198,508.15069 C 443.71423,484.49413 466.08035,459.6998 493.77314,436.69125 C 499.98013,431.53806 506.39817,426.44926 513.11675,421.50411 C 521.42116,415.39432 529.78956,409.7675 538.1622,404.50518 C 569.00965,385.08441 599.78037,371.49508 627.04687,364.59234 C 600.9911,373.09287 571.71882,387.52374 542.79826,407.1696 C 541.7581,407.87215 540.73068,408.59175 539.70754,409.30112 C 523.66141,420.41917 509.1244,432.22698 496.43756,444.15158 C 455.61453,482.53615 434.0371,522.31042 443.84212,545.61227 C 444.54128,547.21517 445.37468,548.74562 446.34667,550.19506 C 456.88492,565.69553 483.00254,568.37485 516.10089,560.05337 C 518.35178,559.49062 520.60267,558.85333 522.92177,558.18829 C 533.49415,555.13592 544.71877,551.01356 556.28017,545.93201 C 559.05966,544.70424 561.86904,543.44238 564.6997,542.09525 C 564.98958,541.95884 565.26243,541.82242 565.55231,541.66895 C 602.04404,523.53733 630.08856,502.67437 636.15915,490.13928 C 637.48923,487.41266 637.80895,485.08798 636.90518,483.26511 C 632.57394,474.48323 602.26573,480.41611 565.55231,496.32071 C 562.60228,497.59961 559.61814,498.91563 556.5999,500.31732 C 559.05542,498.03746 561.61113,495.74904 564.2201,493.49643 C 568.38085,489.91205 572.68866,486.40698 577.2757,482.94539 C 584.4547,477.50912 591.71255,472.59468 598.85743,468.23785 C 632.31386,442.99718 649.22753,419.12063 645.69773,410.26032 C 645.03268,408.59089 643.61736,407.44243 641.43467,406.74329 C 634.46029,404.52482 621.73084,407.17258 606.26448,413.51089 C 593.50944,418.74253 578.85944,426.50169 564.00696,436.15837 C 564.00696,436.15837 561.98201,437.49057 561.98201,437.49057 C 561.98203,437.49057 561.60899,437.70371 561.60899,437.70371 C 561.60901,437.70373 554.46838,442.44636 554.46838,442.44636 C 554.46836,442.44635 558.57157,434.93273 558.57157,434.93273 C 564.65922,423.78909 574.57507,412.16206 586.92087,401.36119 C 595.9756,393.4643 606.3199,386.02357 617.455,379.51303 C 621.66691,377.0473 625.8724,374.75717 630.08429,372.69215 C 634.39851,370.58449 638.71484,368.7113 642.92675,367.0436 C 655.16357,362.20425 666.84456,359.26379 677.03117,358.4642 C 676.1035,358.46419 648.41543,358.4642 648.41543,358.4642 C 648.41544,358.46419 551.96384,358.4642 551.96384,358.4642 C 551.96385,358.46419 126.67089,358.4642 126.67089,358.4642 C 126.67089,358.46419 92.93948,358.4642 92.93948,358.4642 z M 398.92019,358.83722 C 397.2491,384.34222 402.19422,421.69937 413.41458,463.17546 C 415.40967,470.55567 417.5817,478.06631 419.96902,485.66308 C 421.45258,490.35412 422.98301,494.97189 424.5518,499.518 C 423.631,500.87196 422.70376,502.21737 421.8341,503.5679 C 407.83425,525.02298 399.6513,545.29894 397.58799,562.93093 C 391.67085,543.11625 387.21598,521.41263 384.69225,498.39895 C 383.97606,491.80485 383.41546,485.28453 383.04031,478.8422 C 380.27784,432.04581 386.3868,389.625 398.92019,358.83722 z M 119.53029,392.03576 C 119.84963,392.02822 120.16443,392.03576 120.48947,392.03576 C 120.48947,392.03574 183.52938,392.03576 183.52938,392.03576 C 188.91789,392.03574 193.08502,393.04567 196.0521,395.07318 C 199.00212,397.11264 200.10841,399.75061 199.40925,402.95983 C 199.40927,402.95985 191.89562,436.90439 191.89562,436.90439 C 191.89562,436.90442 169.67446,436.90439 169.67446,436.90439 C 169.67448,436.90442 176.97494,403.86573 176.97494,403.86573 C 176.97492,403.86573 121.34209,403.86573 121.34209,403.86573 C 121.34207,403.86573 101.25244,494.66878 101.25244,494.66878 C 101.25246,494.66878 94.00525,527.54759 94.00525,527.54759 C 94.00525,527.54762 149.58482,527.54759 149.58482,527.54759 C 149.58482,527.54762 149.63811,527.33443 149.63811,527.33443 C 149.63811,527.33445 160.77533,477.03039 160.77533,477.03039 C 160.77533,477.03037 134.66413,477.03039 134.66413,477.03039 C 134.66413,477.03037 137.16867,465.68001 137.16867,465.68001 C 137.16866,465.67999 185.50105,465.68001 185.50105,465.68001 C 185.50105,465.67999 171.64612,528.45349 171.64612,528.45349 C 171.45855,529.34701 171.1303,530.15657 170.68693,530.95802 C 169.54444,533.03839 167.55146,534.82036 164.77195,536.28685 C 160.91817,538.31608 156.30552,539.32427 150.91702,539.32427 C 150.91702,539.32429 87.9304,539.32427 87.9304,539.32427 C 82.54188,539.32429 78.37476,538.31606 75.40768,536.28685 C 72.45767,534.25765 71.33433,531.66612 72.05053,528.45349 C 72.05054,528.45347 99.81366,402.95983 99.81366,402.95983 C 100.52984,399.75062 102.76371,397.11262 106.63455,395.07318 C 106.77097,394.99987 106.92444,394.98323 107.06085,394.91332 C 110.59387,393.14362 114.74022,392.14889 119.53029,392.03576 z M 218.32657,392.03576 C 218.32655,392.03574 297.67265,392.03576 297.67265,392.03576 C 302.99296,392.03574 307.175,393.04567 310.14208,395.07318 C 313.12625,397.11264 314.26874,399.75061 313.55253,402.95983 C 313.55255,402.95985 298.73842,469.88978 298.73842,469.88978 C 298.0393,473.07852 295.75215,475.68028 291.86425,477.72314 C 287.97635,479.7728 283.39995,480.81385 278.06261,480.81385 C 278.06259,480.81385 220.40481,480.81385 220.40481,480.81385 C 220.40481,480.81385 209.26758,531.0646 209.26758,531.0646 C 209.26758,531.06462 207.45578,539.32427 207.45578,539.32427 C 207.45579,539.32429 185.7142,539.32427 185.7142,539.32427 C 185.7142,539.32429 187.36613,531.86393 187.36613,531.86393 C 187.36613,531.86395 218.32657,392.03576 218.32657,392.03576 z M 327.94034,392.03576 C 327.94033,392.03574 349.68192,392.03576 349.68192,392.03576 C 349.68194,392.03574 325.06278,503.24817 325.06278,503.24817 C 325.0628,503.24819 319.68068,527.54759 319.68068,527.54759 C 319.68068,527.54762 371.68994,527.54759 371.68994,527.54759 C 372.23562,531.53613 372.87293,535.45341 373.55502,539.32427 C 373.555,539.32429 295.32797,539.32427 295.32797,539.32427 C 295.32799,539.32429 301.5094,511.40126 301.5094,511.40126 C 301.50942,511.40126 327.94034,392.03576 327.94034,392.03576 z M 237.45702,403.86573 C 237.45704,403.86573 223.01592,468.98387 223.01592,468.98387 C 223.01592,468.98385 277.21,468.98387 277.21,468.98387 C 277.20999,468.98385 291.5978,403.86573 291.5978,403.86573 C 291.59782,403.86573 237.45702,403.86573 237.45702,403.86573 z M 191.89562,549.5556 C 192.10829,549.54845 192.32086,549.5556 192.53509,549.5556 C 195.05882,549.55562 197.26281,549.99896 199.03624,550.83451 C 200.92904,551.72122 202.28256,553.03851 203.03286,554.77784 C 203.76611,556.46603 203.95794,558.38225 203.56573,560.47968 C 203.56573,560.47969 203.40588,561.27901 203.40588,561.27901 C 203.40589,561.27898 197.17116,561.27901 197.17116,561.27901 C 197.17114,561.27898 197.22445,560.53296 197.22445,560.53296 C 197.38563,559.06753 197.20396,557.91517 196.63827,557.12253 C 196.56455,557.02312 196.45774,556.8919 196.37183,556.8028 C 196.23115,556.65917 196.01985,556.495 195.83896,556.37649 C 194.96658,555.82699 193.60193,555.52387 191.84234,555.52387 C 189.50619,555.52389 187.76047,555.93099 186.56682,556.74951 C 185.40726,557.55097 184.67402,558.44621 184.43529,559.52049 C 184.19654,560.61183 184.58875,561.18521 184.8616,561.49215 C 184.8701,561.50064 184.90453,561.53592 184.91487,561.54544 C 185.26039,561.83989 186.46023,562.5302 190.1904,563.41052 C 193.56672,564.22903 195.80272,564.96441 197.06458,565.59534 C 198.97445,566.5673 200.30877,567.82704 201.00792,569.3788 C 201.70703,570.91352 201.86052,572.71037 201.43422,574.65433 C 201.00792,576.54712 200.04233,578.29285 198.60994,579.92987 C 197.19462,581.56687 195.39347,582.86284 193.22783,583.7666 C 191.07923,584.65332 188.72179,585.15209 186.30037,585.15209 C 183.23097,585.15208 180.76694,584.68742 178.84003,583.7666 C 176.82786,582.81169 175.37629,581.3047 174.52369,579.34369 C 173.70518,577.43383 173.53039,575.26607 173.9908,572.89583 C 173.9908,572.8958 174.15067,572.14978 174.15067,572.14978 C 174.15067,572.14978 180.27881,572.14978 180.27881,572.14978 C 180.27881,572.14978 180.22552,572.89583 180.22552,572.89583 C 180.07204,574.31115 180.22339,575.45365 180.59854,576.30626 C 180.95663,577.12479 181.63873,577.80259 182.73006,578.33122 C 183.8896,578.89392 185.33904,579.18382 186.99311,579.18382 C 188.47666,579.18381 189.83232,578.93443 191.04302,578.49109 C 192.23667,578.06479 193.1852,577.50205 193.86729,576.78586 C 194.53231,576.06964 194.9224,575.31298 195.09292,574.49446 C 195.26344,573.76122 195.22294,573.14096 194.93305,572.62938 C 194.60906,572.08374 193.96747,571.59985 192.9614,571.1906 C 192.9614,571.19059 187.73914,569.64524 187.73914,569.64524 C 184.82322,568.91201 182.86009,568.21286 181.71759,567.51372 C 180.16582,566.59291 179.04678,565.41203 178.467,563.9967 C 177.88723,562.59839 177.82542,561.04879 178.20057,559.36062 C 178.59277,557.55309 179.46456,555.83295 180.81168,554.29825 C 182.17588,552.74648 183.9365,551.5294 186.03393,550.72794 C 187.88836,550.03254 189.83989,549.62473 191.89562,549.5556 z M 247.84822,549.66218 C 248.18547,549.63591 248.50258,549.66218 248.86069,549.66218 C 248.8607,549.66218 252.69744,550.08848 252.69744,550.08848 C 252.69743,550.08848 253.97635,550.19506 253.97635,550.19506 C 253.97637,550.19507 252.11127,554.9377 252.11127,554.9377 C 252.11126,554.93772 251.73825,555.68374 251.73825,555.68374 C 251.73825,555.68372 248.80741,555.4173 248.80741,555.4173 C 247.942,555.4173 247.30628,555.55082 246.88903,555.8436 C 246.86132,555.86453 246.80803,555.9278 246.78245,555.95018 C 246.72655,555.99922 246.63254,556.08476 246.5693,556.16334 C 246.31271,556.49985 246.00018,557.1012 245.76998,558.18829 C 245.76996,558.18829 245.65914,558.64869 245.55683,559.0409 C 246.90396,559.04091 250.1396,559.0409 250.1396,559.0409 C 250.1396,559.04091 248.96727,564.31642 248.96727,564.31642 C 248.96727,564.31641 245.61651,564.31642 244.49107,564.31642 C 244.15001,565.85111 239.96157,584.61922 239.96157,584.61922 C 239.96155,584.6192 233.78014,584.61922 233.78014,584.61922 C 233.78012,584.6192 237.79807,566.58437 238.30964,564.31642 C 237.26943,564.31641 234.73933,564.31642 234.73933,564.31642 C 234.73933,564.31641 235.91167,559.0409 235.91167,559.0409 C 235.91168,559.04091 238.45671,559.0409 239.42868,559.0409 C 239.5992,558.30766 239.85498,557.38896 239.85498,557.38896 C 240.23014,555.68374 240.62233,554.45811 241.13389,553.6055 C 241.83306,552.42891 242.81995,551.44413 244.06476,550.72794 C 245.09003,550.13219 246.38674,549.776 247.84822,549.66218 z M 262.60904,549.92862 C 262.60902,549.92861 260.99334,557.19926 260.58409,559.0409 C 261.77773,559.04091 264.5807,559.0409 264.5807,559.0409 C 264.5807,559.04091 263.40837,564.31642 263.40837,564.31642 C 263.40835,564.31641 260.46898,564.31642 259.41175,564.31642 C 259.08774,565.78289 256.53419,577.15888 256.53419,577.15888 C 256.53421,577.15886 256.32103,578.52519 256.32103,578.91739 C 256.32131,578.93044 256.31997,578.96107 256.32103,578.97067 C 256.32187,578.9747 256.31983,579.02064 256.32103,579.02396 C 256.32267,579.02665 256.37218,579.02182 256.37431,579.02396 C 256.37431,579.02394 257.01378,579.07725 257.01378,579.07725 C 257.01378,579.07725 259.94463,578.8641 259.94463,578.8641 C 259.94463,578.8641 259.6249,583.60674 259.6249,583.60674 C 259.62492,583.60674 259.6782,584.45935 259.6782,584.45935 C 259.67818,584.45933 255.46842,584.93895 255.46842,584.93895 C 253.79732,584.93893 252.57167,584.66612 251.68496,584.08635 C 250.74711,583.47243 250.20142,582.65821 249.97974,581.63509 C 249.94563,581.4475 249.87316,581.17467 249.87316,580.78248 C 249.87316,580.01512 250.01811,578.71703 250.51262,576.46614 C 250.51264,576.46616 252.75285,566.4309 253.23032,564.31642 C 252.42889,564.31641 250.29947,564.31642 250.29947,564.31642 C 250.29949,564.31641 251.4718,559.0409 251.4718,559.0409 C 251.47178,559.04091 253.55004,559.0409 254.40266,559.0409 C 254.67547,557.81315 255.62828,553.6055 255.62828,553.6055 C 255.62828,553.60552 260.58409,550.99438 260.58409,550.99438 C 260.58408,550.9944 262.60904,549.92862 262.60904,549.92862 z M 66.24211,550.14177 C 66.24213,550.14177 90.22179,550.14177 90.22179,550.14177 C 90.22179,550.14177 88.88959,556.11005 88.88959,556.11005 C 88.88959,556.11007 72.89248,556.11005 71.35778,556.11005 C 71.08496,557.32078 69.99147,562.22327 69.59927,563.9967 C 71.81607,563.9967 84.7864,563.9967 84.7864,563.9967 C 84.7864,563.9967 83.45419,569.96496 83.45419,569.96496 C 83.45418,569.96496 69.80177,569.96496 68.26706,569.96496 C 67.94307,571.44851 65.01648,584.61922 65.01648,584.61922 C 65.0165,584.6192 58.56862,584.61922 58.56862,584.61922 C 58.56863,584.6192 66.24211,550.14177 66.24211,550.14177 z M 98.37487,558.56131 C 98.61554,558.53175 98.87845,558.56131 99.12091,558.56131 C 100.65561,558.56131 102.07308,559.02811 103.43726,560.00008 C 103.43726,560.0001 104.28986,560.58625 104.28986,560.58625 C 104.28986,560.58625 100.986,566.02165 100.986,566.02165 C 100.986,566.02163 100.08011,565.38219 100.08011,565.38219 C 99.41507,564.9559 98.69888,564.74273 97.94858,564.74273 C 97.30059,564.74275 96.69737,564.97293 96.08349,565.38219 C 95.43552,565.80849 94.89409,566.37334 94.48485,567.1407 C 93.76865,568.45374 93.24429,569.92447 92.8862,571.51033 C 92.8862,571.51034 90.00864,584.61922 90.00864,584.61922 C 90.00864,584.6192 83.82721,584.61922 83.82721,584.61922 C 83.82721,584.6192 89.52905,559.0409 89.52905,559.0409 C 89.52907,559.04091 95.28417,559.0409 95.28417,559.0409 C 95.28417,559.04091 95.08593,559.81678 95.01772,560.10666 C 95.29056,559.90205 95.57831,559.62067 95.81705,559.4672 C 96.64302,558.9743 97.51542,558.66685 98.37487,558.56131 z M 116.70601,558.56131 C 117.0782,558.53316 117.4446,558.56131 117.82507,558.56131 C 121.30373,558.56131 123.93615,559.78053 125.65842,562.1849 C 126.7327,563.73664 127.31037,565.65502 127.31037,567.94002 C 127.31037,569.20187 127.15476,570.55967 126.83078,572.04321 C 126.83078,572.04321 126.35117,573.9083 126.35117,573.9083 C 126.35117,573.90828 110.71856,573.9083 108.97923,573.9083 C 108.94512,574.26638 108.92594,574.65007 108.92594,574.97406 C 108.92594,576.30415 109.19877,577.35071 109.77855,578.11807 C 110.05405,578.4932 110.37345,578.83106 110.73774,579.07725 C 111.42452,579.52514 112.31108,579.77 113.34886,579.77 C 114.61074,579.76998 115.71911,579.42255 116.7593,578.75752 C 117.74835,578.12659 118.69474,577.11838 119.53029,575.7201 C 119.53029,575.72007 126.13802,575.7201 126.13802,575.7201 C 126.13802,575.72007 125.55186,576.99901 125.55186,576.99901 C 124.28999,579.55686 122.52935,581.55195 120.32961,582.96729 C 118.12988,584.38262 115.5017,585.15209 112.60282,585.15209 C 108.83428,585.15208 106.02919,583.93287 104.28986,581.52851 C 102.5676,579.17528 102.19671,575.92258 103.11753,571.83005 C 104.03836,567.66932 105.87573,564.34414 108.55292,562.02503 C 110.9525,559.94441 113.67537,558.79035 116.70601,558.56131 z M 144.46916,558.56131 C 144.84134,558.53316 145.20773,558.56131 145.5882,558.56131 C 149.06687,558.56131 151.6993,559.78053 153.42157,562.1849 C 154.49586,563.73664 155.0735,565.65502 155.0735,567.94002 C 155.0735,569.18482 154.9179,570.52343 154.5939,571.98992 C 154.5939,571.98994 154.11432,573.9083 154.11432,573.9083 C 154.11432,573.90828 138.48169,573.9083 136.74237,573.9083 C 136.7253,574.147 136.70613,574.36232 136.68908,574.60105 C 136.67629,574.69057 136.69468,574.82646 136.68908,574.92077 C 136.68858,574.93615 136.68908,574.95914 136.68908,574.97406 C 136.68908,575.22986 136.72532,575.48136 136.74237,575.7201 C 136.8276,576.69206 137.08129,577.50419 137.54169,578.11807 C 137.62936,578.23743 137.71177,578.38477 137.80813,578.49109 C 138.58914,579.32663 139.69453,579.77 141.112,579.77 C 142.37388,579.76998 143.49931,579.42255 144.52245,578.75752 C 145.51149,578.12659 146.45787,577.11838 147.29343,575.7201 C 147.29343,575.72007 153.95445,575.7201 153.95445,575.7201 C 153.95444,575.72007 153.31499,576.99901 153.31499,576.99901 C 152.05313,579.55686 150.29249,581.55195 148.09275,582.96729 C 145.89301,584.38262 143.26484,585.15209 140.36597,585.15209 C 136.59744,585.15208 133.79234,583.93287 132.05301,581.52851 C 130.92756,579.99379 130.40107,578.0392 130.40107,575.7201 C 130.40107,575.36198 130.42025,574.97619 130.45436,574.60105 C 130.52259,573.71434 130.65899,572.81909 130.88067,571.83005 C 131.80151,567.68637 133.58558,564.34414 136.26277,562.02503 C 138.66234,559.94441 141.43852,558.79035 144.46916,558.56131 z M 220.08507,558.56131 C 220.46591,558.53202 220.81619,558.56131 221.20412,558.56131 C 224.75099,558.56131 227.47722,559.76135 229.25064,562.13161 C 231.00704,564.50184 231.43333,567.69915 230.52955,571.72347 C 229.83042,574.8611 228.82008,577.39547 227.43885,579.23712 C 226.05759,581.07877 224.29697,582.58361 222.21659,583.60674 C 220.15331,584.62988 217.96846,585.15209 215.76873,585.15209 C 212.15366,585.15208 209.46154,583.91581 207.72221,581.52851 C 206.59675,580.01087 206.01699,578.05625 206.01699,575.7201 C 206.01701,574.45823 206.15555,573.1175 206.49659,571.61691 C 207.51974,567.0469 209.60861,563.56613 212.67802,561.33229 C 214.93103,559.70595 217.41916,558.76623 220.08507,558.56131 z M 313.7124,558.56131 C 314.162,558.53356 314.57833,558.56131 315.0446,558.56131 C 317.19319,558.56131 318.88135,558.77871 320.16027,559.30733 C 321.52445,559.85302 322.49216,560.62462 323.03783,561.54544 C 323.56647,562.41507 323.83716,563.483 323.83716,564.79601 C 323.83717,564.79603 323.19768,568.68605 323.19768,568.68605 C 323.19771,568.68605 322.02536,573.96159 322.02536,573.96159 C 321.01925,578.46335 320.7976,580.15154 320.74643,580.78248 C 320.69528,581.6351 320.77414,582.46638 321.01288,583.23373 C 321.0129,583.23371 321.43918,584.61922 321.43918,584.61922 C 321.4392,584.6192 315.15118,584.61922 315.15118,584.61922 C 315.15116,584.6192 314.88473,583.81989 314.88473,583.81989 C 314.78242,583.44477 314.81226,582.96729 314.77816,582.54098 C 313.58451,583.27423 312.38872,583.92434 311.31443,584.29949 C 309.72859,584.84518 308.08304,585.15209 306.41192,585.15209 C 303.51306,585.15208 301.3666,584.39755 300.07062,582.91399 C 299.0816,581.82266 298.63185,580.48832 298.63185,578.97067 C 298.63183,578.3909 298.70858,577.7898 298.84499,577.15888 C 299.13487,575.86291 299.66137,574.66285 300.49693,573.58856 C 301.31544,572.5313 302.28316,571.66167 303.37449,571.03074 C 304.43175,570.39982 305.61047,569.95219 306.83823,569.64524 C 306.83821,569.64524 310.62169,569.00578 310.62169,569.00578 C 313.53763,568.66472 315.7139,568.24057 317.28271,567.78016 C 317.31683,567.60964 317.38928,567.40714 317.38928,567.40714 C 317.63654,566.30996 317.6056,565.48526 317.33599,565.06246 C 317.31615,565.03519 317.25181,564.97932 317.22942,564.95588 C 317.17186,564.89453 317.08339,564.79809 317.01626,564.74273 C 316.37491,564.2352 315.2812,563.9967 313.81898,563.9967 C 312.16491,563.9967 310.94142,564.26741 310.0888,564.79601 C 309.25325,565.32464 308.47949,566.29235 307.79741,567.67357 C 307.7974,567.67356 301.34954,567.67357 301.34954,567.67357 C 301.34956,567.67356 301.93571,566.39466 301.93571,566.39466 C 302.70304,564.62121 303.61749,563.15048 304.75999,562.02503 C 305.90249,560.89956 307.44571,560.02779 309.23619,559.41392 C 310.60835,558.96095 312.10669,558.66038 313.7124,558.56131 z M 340.72951,558.56131 C 340.96997,558.53175 341.23307,558.56131 341.47554,558.56131 C 343.02727,558.56131 344.48099,559.02811 345.84517,560.00008 C 345.84519,560.0001 346.64449,560.58625 346.64449,560.58625 C 346.6445,560.58625 343.34063,566.02165 343.34063,566.02165 C 343.34064,566.02163 342.43473,565.38219 342.43473,565.38219 C 341.7697,564.9559 341.08972,564.74273 340.35649,564.74273 C 339.70848,564.74275 339.06905,564.97293 338.4381,565.38219 C 337.79013,565.80849 337.31906,566.37334 336.89276,567.1407 C 336.1936,568.45374 335.6522,569.92447 335.29411,571.51033 C 335.29409,571.51034 332.36326,584.61922 332.36326,584.61922 C 332.36328,584.6192 326.18184,584.61922 326.18184,584.61922 C 326.18184,584.6192 331.88366,559.0409 331.88366,559.0409 C 331.88365,559.04091 337.63878,559.0409 337.63878,559.0409 C 337.63878,559.04091 337.49384,559.81678 337.42564,560.10666 C 337.69846,559.90205 337.96917,559.62067 338.22496,559.4672 C 339.03759,558.9743 339.87067,558.66685 340.72951,558.56131 z M 359.00734,558.56131 C 359.37919,558.53316 359.74593,558.56131 360.1264,558.56131 C 363.60506,558.56131 366.25453,559.78053 367.95977,562.1849 C 369.05112,563.73664 369.6117,565.65502 369.6117,567.94002 C 369.61168,569.20187 369.4028,570.55967 369.07881,572.04321 C 369.07881,572.04321 368.65251,573.9083 368.65251,573.9083 C 368.6525,573.90828 353.00283,573.9083 351.28057,573.9083 C 351.24646,574.26638 351.17398,574.65007 351.17398,574.97406 C 351.17398,576.30415 351.46387,577.35071 352.0266,578.11807 C 352.11426,578.23743 352.2496,578.38477 352.34632,578.49109 C 352.40234,578.55076 352.50044,578.64882 352.55948,578.70423 C 353.32183,579.39725 354.35929,579.77 355.65018,579.77 C 356.91207,579.76998 358.02045,579.42255 359.06063,578.75752 C 360.04968,578.12659 360.97902,577.11838 361.83162,575.7201 C 361.8316,575.72007 368.49264,575.7201 368.49264,575.7201 C 368.49264,575.72007 367.85318,576.99901 367.85318,576.99901 C 366.59131,579.55686 364.81363,581.55195 362.63094,582.96729 C 360.41417,584.38262 357.82009,585.15209 354.90415,585.15209 C 351.13564,585.15208 348.38381,583.93287 346.64449,581.52851 C 344.92219,579.17528 344.51509,575.92258 345.41886,571.83005 C 346.33967,567.66932 348.12377,564.34414 350.80097,562.02503 C 353.21572,559.94441 355.97949,558.79035 359.00734,558.56131 z M 265.69974,559.0409 C 265.69976,559.04091 272.04105,559.0409 272.04105,559.0409 C 272.04107,559.04091 272.82331,574.21951 272.84036,574.44117 C 273.09614,573.89761 273.2946,573.4403 273.31997,573.37542 C 273.31998,573.37543 280.30071,559.0409 280.30071,559.0409 C 280.30073,559.04091 286.10912,559.0409 286.10912,559.0409 C 286.10911,559.04091 286.642,574.03618 286.642,574.12144 C 286.81255,573.81453 294.58194,559.0409 294.58194,559.0409 C 294.58192,559.04091 300.86995,559.0409 300.86995,559.0409 C 300.86994,559.04091 287.01502,584.61922 287.01502,584.61922 C 287.01504,584.6192 281.31319,584.61922 281.31319,584.61922 C 281.31319,584.6192 280.76113,570.74938 280.72702,569.96496 C 278.37379,574.79076 273.58639,584.61922 273.58639,584.61922 C 273.58639,584.6192 267.72471,584.61922 267.72471,584.61922 C 267.72471,584.6192 265.69974,559.0409 265.69974,559.0409 z M 116.81259,563.89012 C 115.34366,563.95214 114.00964,564.48161 112.7627,565.48876 C 111.77368,566.27317 111.10649,567.3496 110.57787,568.52619 C 110.57787,568.52621 121.07564,568.52619 121.07564,568.52619 C 121.09271,568.33863 121.12893,568.11055 121.12893,567.94002 C 121.12891,566.96807 120.95627,566.21349 120.64934,565.70192 C 119.89906,564.47415 118.78639,563.89012 117.13232,563.89012 C 117.03322,563.89012 116.91052,563.886 116.81259,563.89012 z M 144.57572,563.89012 C 143.1068,563.95214 141.77277,564.48161 140.52582,565.48876 C 139.53678,566.27317 138.88669,567.3496 138.34102,568.52619 C 138.34102,568.52621 148.83878,568.52619 148.83878,568.52619 C 148.85582,568.33863 148.89207,568.11055 148.89207,567.94002 C 148.89206,566.96807 148.73647,566.21349 148.41247,565.70192 C 148.26353,565.45253 148.06204,565.20453 147.87959,565.00918 C 147.1676,564.27346 146.18769,563.89012 144.89546,563.89012 C 144.79635,563.89012 144.67366,563.886 144.57572,563.89012 z M 359.32708,563.89012 C 357.81652,563.93665 356.40583,564.44806 355.11731,565.48876 C 354.14533,566.27317 353.47816,567.3496 352.93249,568.52619 C 352.93251,568.52621 363.37698,568.52619 363.37698,568.52619 C 363.39401,568.33863 363.43027,568.11055 363.43027,567.94002 C 363.43026,566.96807 363.27467,566.21349 362.95067,565.70192 C 362.21743,564.4912 361.08771,563.90718 359.43365,563.89012 C 359.38463,563.89065 359.37581,563.88862 359.32708,563.89012 z M 219.71206,563.9967 C 218.30243,564.16409 216.9917,564.80721 215.76873,565.91507 C 214.30225,567.24516 213.23861,569.33404 212.62474,572.0965 C 212.36895,573.25605 212.25171,574.24721 212.25171,575.13392 C 212.25173,576.34462 212.48404,577.29529 212.94446,578.01148 C 213.06703,578.19532 213.22962,578.38959 213.37077,578.54437 C 214.12881,579.34925 215.18736,579.77 216.51477,579.77 C 218.23703,579.76998 219.75469,579.12841 221.20412,577.79833 C 222.67064,576.45119 223.71719,574.34099 224.34812,571.51033 C 224.92792,568.91838 224.8469,566.98297 224.0284,565.75521 C 223.244,564.56155 222.09724,563.9967 220.51139,563.9967 C 220.24228,563.9967 219.97309,563.96569 219.71206,563.9967 z M 316.00379,573.32213 C 314.55438,573.71431 312.93012,574.04471 310.78155,574.33461 C 309.17866,574.57335 308.03614,574.82485 307.3711,575.08064 C 306.79134,575.31936 306.32452,575.64975 305.93232,576.09312 C 305.55716,576.51939 305.30566,576.96704 305.1863,577.47861 C 305.15221,577.68325 305.133,577.89425 305.133,578.06478 C 305.133,578.07862 305.13269,578.10436 305.133,578.11807 C 305.13479,578.15865 305.12855,578.23877 305.133,578.27792 C 305.14368,578.35529 305.16517,578.47232 305.1863,578.54437 C 305.19392,578.5681 305.23081,578.62776 305.23957,578.65094 C 305.25823,578.69678 305.26972,578.76705 305.29286,578.81081 C 305.31713,578.85407 305.37076,578.9293 305.39944,578.97067 C 305.44408,579.03204 305.50494,579.12627 305.55931,579.18382 C 305.98562,579.66128 306.83609,579.87657 308.06385,579.87657 C 309.411,579.87658 310.70695,579.62079 311.9006,579.02396 C 313.07722,578.44419 314.02573,577.57878 314.72487,576.5727 C 315.23646,575.8565 315.6457,574.7545 316.00379,573.32213 z"
+         id="path74" />
+      <g
+         id="g80"
+         style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,359.45027,563.90874)">
+        <path
+           style="fill:#000000;fill-opacity:0.94117647"
+           id="path82"
+           d="M 0.03,0 C 0.02,0 0.01,0 0,0 C 0.97,0.01 1.61,0.34 2.04,1.05 C 2.23,1.35 2.33,1.8 2.33,2.37 C 2.33,2.47 2.31,2.6 2.3,2.71 C 2.3,2.71 2.34,2.71 2.34,2.71 C 2.34,2.6 2.36,2.47 2.36,2.37 C 2.36,1.8 2.27,1.35 2.08,1.05 C 1.65,0.33 1,0 0.03,0 z" />
+      </g>
+      <g
+         style="fill:#000000;fill-opacity:0.94117647"
+         id="g4966"
+         transform="matrix(1.705222,0,0,1.705222,-200.90733,-129.69426)">
+        <g
+           transform="translate(125.1273,453.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g84">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 0,36 C 0,36 7.46,36 7.46,36 C 7.46,36 10.81,22 10.81,22 C 10.81,22 22.93,22 22.93,22 C 22.93,22 24.49,16 24.49,16 C 24.49,16 12.32,16 12.32,16 C 12.32,16 14.34,7 14.34,7 C 14.34,7 27.29,7 27.29,7 C 27.29,7 28.85,0 28.85,0 C 28.85,0 8.4,0 8.4,0 C 8.4,0 0,36 0,36 z"
+             id="path86" />
+        </g>
+        <g
+           transform="translate(151.0773,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g88">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 7.51,26 C 7.51,26 9.75,16.6 9.75,16.6 C 10.93,11.51 13.42,7 18.13,7 C 18.55,7 18.96,7.21 19.27,7.26 C 19.27,7.26 21.09,0.05 21.09,0.05 C 20.67,0.05 20.21,0 19.69,0 C 16.22,0 13.31,2.44 11.37,5.94 C 11.37,5.94 11.17,5.94 11.17,5.94 C 11.46,4.23 11.71,2.61 11.9,1 C 11.9,1 5.47,1 5.47,1 C 5.1,3.08 4.53,7.15 3.66,10.82 C 3.66,10.82 0,26 0,26 C 0,26 7.51,26 7.51,26 z"
+             id="path90" />
+        </g>
+        <g
+           transform="translate(171.7073,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g92">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 20.06,19.25 C 17.99,20.26 15.63,20 12.88,20 C 10.71,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.43,16.81 7.47,16 C 17.6,16.27 23.99,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.73,0 0.73,8.08 0.34,15.86 C 0,22.65 3.52,26 10.78,26 C 13.57,26 17.27,25.68 20.3,24.77 C 20.3,24.77 20.06,19.25 20.06,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.47,10 C 9.1,7.91 11.22,6 14.69,6 C 16.4,6 17.38,6.65 17.32,7.53 z"
+             id="path94" />
+        </g>
+        <g
+           transform="translate(198.2273,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g96">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 20.05,19.25 C 17.98,20.26 15.62,20 12.88,20 C 10.7,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.42,16.81 7.46,16 C 17.6,16.27 23.98,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.72,0 0.72,8.08 0.33,15.86 C 0,22.65 3.52,26 10.77,26 C 13.57,26 17.27,25.68 20.3,24.77 C 20.3,24.77 20.05,19.25 20.05,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.46,10 C 9.1,7.91 11.21,6 14.68,6 C 16.39,6 17.38,6.65 17.32,7.53 z"
+             id="path98" />
+        </g>
+        <g
+           transform="translate(234.1373,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g100">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 22.74,26 C 22.8,22.83 23.56,17.85 24.35,14.58 C 24.35,14.58 27.56,1 27.56,1 C 25.52,0.31 22.34,0 19.28,0 C 6.86,0 0.7,9.2 0.27,17.82 C 0,23.23 2.93,26 7.49,26 C 10.44,26 13.77,24.57 16.36,20.27 C 16.36,20.27 16.47,20.27 16.47,20.27 C 16.27,22.34 16.03,24.35 15.9,26 C 15.9,26 22.74,26 22.74,26 z M 17.61,11.72 C 16.15,18.08 13.17,20 10.95,20 C 8.88,20 7.98,18.53 8.1,16.39 C 8.34,11.56 12.16,6 16.98,6 C 17.76,6 18.37,5.86 18.94,5.72 C 18.94,5.72 17.61,11.72 17.61,11.72 z"
+             id="path102" />
+        </g>
+        <g
+           transform="translate(261.7673,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g104">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 0,24.82 C 1.44,25.94 4.46,25.95 7.61,26 C 14.34,26.05 19.42,23.11 19.72,17.71 C 19.89,14.11 17.1,11.98 14.37,10.55 C 12.4,9.6 11.41,8.69 11.46,7.63 C 11.53,6.2 12.87,6 14.84,6 C 17.06,6 18.84,6.27 19.86,6.47 C 19.86,6.47 21.88,1.05 21.88,1.05 C 20.73,0.36 18.43,0 15.48,0 C 8.95,0 4.17,3.45 3.9,8.69 C 3.74,11.93 6.07,14.11 8.89,15.59 C 11.17,16.76 11.95,17.66 11.89,18.93 C 11.82,20.21 10.68,20 8.61,20 C 6.18,20 3.49,19.68 2.07,19.46 C 2.07,19.46 0,24.82 0,24.82 z"
+             id="path106" />
+        </g>
+        <g
+           transform="translate(294.2173,452.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g108">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 7.45,37 C 7.45,37 13.5,12 13.5,12 C 13.5,12 6.09,12 6.09,12 C 6.09,12 0,37 0,37 C 0,37 7.45,37 7.45,37 z M 10.92,9 C 13.46,9 15.72,6.9 15.86,3.3 C 15.98,0.86 14.4,0 12.07,0 C 9.64,0 7.42,1.58 7.29,3.94 C 7.17,6.32 8.75,9 10.92,9 z"
+             id="path110" />
+        </g>
+        <g
+           transform="translate(308.5073,464.0834)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g112">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 7.46,25.31 C 7.46,25.31 10.1,14.05 10.1,14.05 C 11.47,8.32 14.42,6.31 16.85,6.31 C 18.77,6.31 19.33,7.13 19.24,8.32 C 19.19,9.28 19.04,10.29 18.84,11.19 C 18.84,11.19 15.48,25.31 15.48,25.31 C 15.48,25.31 22.94,25.31 22.94,25.31 C 22.94,25.31 26.48,10.5 26.48,10.5 C 26.75,9.22 27.05,7.31 27.11,6.15 C 27.33,1.64 25.08,0 20.94,0 C 17.62,0 14.39,1.54 11.84,4.88 C 11.84,4.88 11.74,4.88 11.74,4.88 C 11.74,4.88 12.42,0.31 12.42,0.31 C 12.42,0.31 5.84,0.31 5.84,0.31 C 5.41,2.45 4.86,5.04 4.08,8.06 C 4.08,8.06 0,25.31 0,25.31 C 0,25.31 7.46,25.31 7.46,25.31 z"
+             id="path114" />
+        </g>
+        <g
+           transform="translate(348.0673,453.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g116">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 0,36 C 0,36 7.46,36 7.46,36 C 7.46,36 10.82,22 10.82,22 C 10.82,22 22.93,22 22.93,22 C 22.93,22 24.49,16 24.49,16 C 24.49,16 12.32,16 12.32,16 C 12.32,16 14.34,7 14.34,7 C 14.34,7 27.29,7 27.29,7 C 27.29,7 28.85,0 28.85,0 C 28.85,0 8.4,0 8.4,0 C 8.4,0 0,36 0,36 z"
+             id="path118" />
+        </g>
+        <g
+           transform="translate(374.0173,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g120">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 7.51,26 C 7.51,26 9.75,16.6 9.75,16.6 C 10.93,11.51 13.42,7 18.13,7 C 18.55,7 18.96,7.21 19.27,7.26 C 19.27,7.26 21.09,0.05 21.09,0.05 C 20.67,0.05 20.21,0 19.69,0 C 16.22,0 13.31,2.44 11.37,5.94 C 11.37,5.94 11.17,5.94 11.17,5.94 C 11.46,4.23 11.71,2.61 11.9,1 C 11.9,1 5.47,1 5.47,1 C 5.11,3.08 4.53,7.15 3.66,10.82 C 3.66,10.82 0,26 0,26 C 0,26 7.51,26 7.51,26 z"
+             id="path122" />
+        </g>
+        <g
+           transform="translate(394.6473,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g124">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 20.06,19.25 C 17.99,20.26 15.63,20 12.88,20 C 10.71,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.43,16.81 7.47,16 C 17.6,16.27 23.99,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.73,0 0.73,8.08 0.34,15.86 C 0,22.65 3.53,26 10.78,26 C 13.57,26 17.28,25.68 20.3,24.77 C 20.3,24.77 20.06,19.25 20.06,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.47,10 C 9.1,7.91 11.22,6 14.69,6 C 16.4,6 17.38,6.65 17.32,7.53 z"
+             id="path126" />
+        </g>
+        <g
+           transform="translate(421.1673,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g128">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 20.05,19.25 C 17.98,20.26 15.62,20 12.88,20 C 10.7,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.42,16.81 7.46,16 C 17.6,16.27 23.98,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.72,0 0.72,8.08 0.33,15.86 C 0,22.65 3.52,26 10.77,26 C 13.57,26 17.27,25.68 20.3,24.77 C 20.3,24.77 20.05,19.25 20.05,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.46,10 C 9.1,7.91 11.21,6 14.68,6 C 16.39,6 17.38,6.65 17.32,7.53 z"
+             id="path130" />
+        </g>
+        <g
+           transform="translate(447.5473,452.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g132">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 23.31,0 C 23.31,0 20.5,11.36 20.5,11.36 C 19.48,10.94 18.15,11 17.11,11 C 7.53,11 0.75,19.2 0.3,28.08 C 0,34.34 3.34,37 7.64,37 C 10.65,37 13.82,35.67 16.22,32.23 C 16.22,32.23 16.32,32.23 16.32,32.23 C 16.32,32.23 15.75,37 15.75,37 C 15.75,37 22.53,37 22.53,37 C 22.84,34 23.49,30.43 24.22,27.17 C 24.22,27.17 30.71,0 30.71,0 C 30.71,0 23.31,0 23.31,0 z M 17.47,24.42 C 16.3,29.35 13.54,31 11.36,31 C 9.19,31 7.98,29.49 8.13,26.8 C 8.38,21.82 11.8,17 16.25,17 C 17.5,17 18.57,17.19 19.16,17.47 C 19.16,17.47 17.47,24.42 17.47,24.42 z"
+             id="path134" />
+        </g>
+        <g
+           transform="translate(477.2573,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g136">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 10.61,26 C 19.31,26 26.02,19.41 26.49,10.44 C 26.78,4.5 23.08,0 16.25,0 C 7.23,0 0.76,7.3 0.31,16.12 C 0,22.54 4.14,26 10.61,26 z M 11.78,20 C 9.24,20 7.84,18.38 7.99,15.96 C 8.19,11.93 10.68,6 14.97,6 C 17.93,6 18.84,8.27 18.72,10.5 C 18.5,14.9 15.82,20 11.78,20 z"
+             id="path138" />
+        </g>
+        <g
+           transform="translate(505.8173,463.3934)"
+           style="fill:#000000;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+           id="g140">
+          <path
+             style="fill:#000000;fill-opacity:0.94117647"
+             d="M 7.2,26 C 7.2,26 9.9,14.58 9.9,14.58 C 11.03,9.49 13.85,6 16.38,6 C 18.2,6 18.7,7.33 18.61,9.07 C 18.56,9.97 18.36,10.98 18.15,11.98 C 18.15,11.98 14.81,26 14.81,26 C 14.81,26 22.01,26 22.01,26 C 22.01,26 24.71,14.53 24.71,14.53 C 25.95,9.28 28.61,6 31.09,6 C 32.8,6 33.51,7.22 33.43,8.96 C 33.38,9.97 33.17,11.08 32.91,12.09 C 32.91,12.09 29.67,26 29.67,26 C 29.67,26 36.92,26 36.92,26 C 36.92,26 40.41,11.19 40.41,11.19 C 40.68,9.86 40.99,7.79 41.04,6.73 C 41.26,2.33 39.11,0 35.23,0 C 31.91,0 28.68,1.5 26.23,4.66 C 26.14,2.38 24.51,0 20.47,0 C 17.2,0 14.08,1.48 11.58,4.83 C 11.58,4.83 11.48,4.83 11.48,4.83 C 11.48,4.83 12.15,1 12.15,1 C 12.15,1 5.73,1 5.73,1 C 5.31,3.14 4.8,5.73 4.02,8.75 C 4.02,8.75 0,26 0,26 C 0,26 7.2,26 7.2,26 z"
+             id="path142" />
+        </g>
+      </g>
+      <path
+         style="fill:none;fill-opacity:0.94117647;fill-rule:evenodd;stroke:#000000;stroke-width:8.52610779;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path2592"
+         d="M 402.97747,590.4172 C 403.66968,592.19682 404.36192,593.97353 405.08297,595.7113 C 406.19343,598.07207 407.47693,600.3319 409.02001,602.44175 C 417.35558,613.77261 431.31547,619.9767 449.03932,621.52122 C 449.03932,621.52122 468.10438,621.52122 468.10438,621.52122 C 474.13249,621.05108 480.44905,620.17426 486.99636,618.89363 C 498.28829,616.68573 510.25803,613.29383 522.68924,608.76119 C 532.10639,605.32744 541.78314,601.26495 551.60409,596.54341 C 572.99097,586.29126 595.0845,573.06832 616.75984,557.11106 C 623.89841,551.86024 630.74856,546.47243 637.32471,540.99376 C 643.35284,535.978 649.13581,530.88434 654.65917,525.73449 C 670.07562,510.8776 681.71367,495.78852 688.30424,482.53959 C 695.16876,468.74269 696.53885,456.94601 690.91452,449.51466 C 687.46779,444.9532 681.69925,442.50877 674.27224,441.93336 C 707.72977,416.82865 727.22752,386.37503 720.2332,367.17442 C 718.01224,361.04678 713.12339,356.47522 706.11462,353.94714 C 702.99965,352.82662 699.49519,352.11708 695.67352,351.79404 C 695.67352,351.79404 685.37669,351.79404 685.37669,351.79404 C 670.99861,352.83092 650.09005,357.97936 632.35179,366.67256"
+         sodipodi:nodetypes="cccccssccccscccsccc" />
+    </g>
+    <g
+       id="g2486"
+       transform="translate(-10.576504,12.339255)">
+      <path
+         d="M 373.55234,223.69791 C 373.55234,223.69791 373.53528,223.69791 373.53528,223.69791 C 371.93238,223.69791 370.51704,224.22653 369.18697,225.30082 C 368.19794,226.08522 367.51585,227.14246 366.97018,228.31906 C 366.97018,228.31906 367.03839,228.31906 367.03839,228.31906 C 367.58406,227.14246 368.26615,226.08522 369.23813,225.30082 C 370.5682,224.22653 371.98353,223.71496 373.55234,223.69791 z"
+         id="path2577"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter" />
+      <path
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         d="M 107.04146,18.25331 C 107.04148,18.25331 47.731726,277.02073 47.731726,277.02073 C 47.748776,277.02073 47.750916,277.02073 47.785016,277.02073 C 47.785016,277.02073 322.16583,277.02073 322.16583,277.02073 C 322.16584,277.02073 464.87156,277.02073 464.87156,277.02073 C 447.87049,275.5372 434.44829,269.56891 426.4508,258.68961 C 424.96727,256.67742 423.74162,254.50968 422.66733,252.24173 C 421.98526,250.57063 421.34365,248.88458 420.69566,247.17936 C 418.99042,241.75675 418.31049,235.73945 418.61742,229.32782 C 419.47004,211.45708 427.85547,190.1998 442.38396,167.93984 C 457.81621,144.28328 480.18233,119.48895 507.87512,96.4804 C 514.08211,91.32721 520.50015,86.23841 527.21873,81.29326 C 535.52314,75.18347 543.89154,69.55665 552.26418,64.29433 C 583.11163,44.87356 613.88235,31.28421 641.14885,24.38151 C 615.09308,32.88202 585.8208,47.31289 556.90024,66.95875 C 555.86008,67.6613 554.83266,68.3809 553.80952,69.09027 C 537.76339,80.20832 523.22638,92.01613 510.53954,103.94073 C 469.71651,142.3253 448.13908,182.09957 457.9441,205.40142 C 458.64326,207.00432 459.47666,208.53477 460.44865,209.98421 C 470.9869,225.48468 497.10452,228.164 530.20287,219.84252 C 532.45376,219.27977 534.70465,218.64248 537.02375,217.97744 C 547.59613,214.92507 558.82075,210.80271 570.38215,205.72116 C 573.16164,204.49339 575.97102,203.23153 578.80168,201.8844 C 579.09156,201.74799 579.36441,201.61157 579.65429,201.4581 C 616.14602,183.32648 644.19054,162.46352 650.26113,149.92843 C 651.59121,147.20181 651.91093,144.87713 651.00716,143.05426 C 646.67592,134.27238 616.36771,140.20526 579.65429,156.10986 C 576.70426,157.38876 573.72012,158.70478 570.70188,160.10647 C 573.1574,157.82661 575.71311,155.53819 578.32208,153.28558 C 582.48283,149.7012 586.79064,146.19613 591.37768,142.73454 C 598.55668,137.29827 605.81453,132.38383 612.95941,128.027 C 646.41584,102.78633 663.32951,78.90978 659.79971,70.04947 C 659.13466,68.38004 657.71934,67.23158 655.53665,66.53244 C 648.56227,64.31397 635.83282,66.96173 620.36646,73.30004 C 607.61142,78.53168 592.96142,86.29084 578.10894,95.94752 C 578.10894,95.94752 576.08399,97.27972 576.08399,97.27972 C 576.08401,97.27972 575.71097,97.49286 575.71097,97.49286 C 575.71099,97.49288 568.57036,102.23551 568.57036,102.23551 C 568.57034,102.2355 572.67355,94.72188 572.67355,94.72188 C 578.7612,83.57824 588.67705,71.95121 601.02285,61.15034 C 610.07758,53.25345 620.42188,45.81272 631.55698,39.30218 C 635.76889,36.83645 639.97438,34.54632 644.18627,32.4813 C 648.50049,30.37361 652.81682,28.50041 657.02873,26.83271 C 669.26555,21.99341 680.94654,19.05291 691.13315,18.25331 C 690.20548,18.25331 662.51741,18.25331 662.51741,18.25331 C 662.51742,18.25331 566.06582,18.25331 566.06582,18.25331 C 566.06583,18.25331 140.77287,18.25331 140.77287,18.25331 C 140.77287,18.25331 107.04146,18.25331 107.04146,18.25331 z M 413.02217,18.62641 C 411.35108,44.13137 416.2962,81.48852 427.51656,122.96461 C 429.51165,130.34482 431.68368,137.85546 434.071,145.45223 C 435.55456,150.14327 437.08499,154.76104 438.65378,159.30715 C 437.73298,160.66111 436.80574,162.00652 435.93608,163.35705 C 421.93623,184.81213 413.75328,205.08809 411.68997,222.72008 C 405.77283,202.9054 401.31796,181.20178 398.79423,158.1881 C 398.07804,151.594 397.51744,145.07368 397.14229,138.63135 C 394.37982,91.83496 400.48878,49.41415 413.02217,18.62641 z M 133.63227,51.82491 C 133.95161,51.81737 134.26641,51.82491 134.59145,51.82491 C 134.59145,51.82489 197.63136,51.82491 197.63136,51.82491 C 203.01987,51.82489 207.187,52.83482 210.15408,54.86233 C 213.1041,56.90179 214.21039,59.53976 213.51123,62.74898 C 213.51125,62.749 205.9976,96.69354 205.9976,96.69354 C 205.9976,96.69357 183.77644,96.69354 183.77644,96.69354 C 183.77646,96.69357 191.07692,63.65488 191.07692,63.65488 C 191.0769,63.65488 135.44407,63.65488 135.44407,63.65488 C 135.44405,63.65488 115.35442,154.45793 115.35442,154.45793 C 115.35444,154.45793 108.10723,187.33674 108.10723,187.33674 C 108.10723,187.33677 163.6868,187.33674 163.6868,187.33674 C 163.6868,187.33677 163.74009,187.12358 163.74009,187.12358 C 163.74009,187.1236 174.87731,136.81954 174.87731,136.81954 C 174.87731,136.81952 148.76611,136.81954 148.76611,136.81954 C 148.76611,136.81952 151.27065,125.46916 151.27065,125.46916 C 151.27064,125.46914 199.60303,125.46916 199.60303,125.46916 C 199.60303,125.46914 185.7481,188.24264 185.7481,188.24264 C 185.56053,189.13616 185.23228,189.94572 184.78891,190.74717 C 183.64642,192.82754 181.65344,194.60951 178.87393,196.076 C 175.02015,198.10523 170.4075,199.11342 165.019,199.11342 C 165.019,199.11344 102.03238,199.11342 102.03238,199.11342 C 96.643856,199.11344 92.476736,198.10521 89.509656,196.076 C 86.559646,194.0468 85.436306,191.45527 86.152506,188.24264 C 86.152516,188.24262 113.91564,62.74898 113.91564,62.74898 C 114.63182,59.53977 116.86569,56.90177 120.73653,54.86233 C 120.87295,54.78902 121.02642,54.77238 121.16283,54.70247 C 124.69585,52.93277 128.8422,51.93804 133.63227,51.82491 z M 232.42855,51.82491 C 232.42853,51.82489 311.77463,51.82491 311.77463,51.82491 C 317.09494,51.82489 321.27698,52.83482 324.24406,54.86233 C 327.22823,56.90179 328.37072,59.53976 327.65451,62.74898 C 327.65453,62.749 312.8404,129.67893 312.8404,129.67893 C 312.14128,132.86767 309.85413,135.46943 305.96623,137.51229 C 302.07833,139.56195 297.50193,140.603 292.16459,140.603 C 292.16457,140.603 234.50679,140.603 234.50679,140.603 C 234.50679,140.603 223.36956,190.85375 223.36956,190.85375 C 223.36956,190.85377 221.55776,199.11342 221.55776,199.11342 C 221.55777,199.11344 199.81618,199.11342 199.81618,199.11342 C 199.81618,199.11344 201.46811,191.65308 201.46811,191.65308 C 201.46811,191.6531 232.42855,51.82491 232.42855,51.82491 z M 342.04232,51.82491 C 342.04231,51.82489 363.7839,51.82491 363.7839,51.82491 C 363.78392,51.82489 339.16476,163.03732 339.16476,163.03732 C 339.16478,163.03734 333.78266,187.33674 333.78266,187.33674 C 333.78266,187.33677 385.79192,187.33674 385.79192,187.33674 C 386.3376,191.32528 386.97491,195.24256 387.657,199.11342 C 387.65698,199.11344 309.42995,199.11342 309.42995,199.11342 C 309.42997,199.11344 315.61138,171.19041 315.61138,171.19041 C 315.6114,171.19041 342.04232,51.82491 342.04232,51.82491 z M 251.559,63.65488 C 251.55902,63.65488 237.1179,128.77302 237.1179,128.77302 C 237.1179,128.773 291.31198,128.77302 291.31198,128.77302 C 291.31197,128.773 305.69978,63.65488 305.69978,63.65488 C 305.6998,63.65488 251.559,63.65488 251.559,63.65488 z M 205.9976,209.34475 C 206.21027,209.3376 206.42284,209.34475 206.63707,209.34475 C 209.1608,209.34477 211.36479,209.78811 213.13822,210.62366 C 215.03102,211.51037 216.38454,212.82766 217.13484,214.56699 C 217.86809,216.25518 218.05992,218.1714 217.66771,220.26883 C 217.66771,220.26884 217.50786,221.06816 217.50786,221.06816 C 217.50787,221.06813 211.27314,221.06816 211.27314,221.06816 C 211.27312,221.06813 211.32643,220.32211 211.32643,220.32211 C 211.48761,218.85668 211.30594,217.70432 210.74025,216.91168 C 210.66653,216.81227 210.55972,216.68105 210.47381,216.59195 C 210.33313,216.44832 210.12183,216.28415 209.94094,216.16564 C 209.06856,215.61614 207.70391,215.31302 205.94432,215.31302 C 203.60817,215.31304 201.86245,215.72014 200.6688,216.53866 C 199.50924,217.34012 198.776,218.23536 198.53727,219.30964 C 198.29852,220.40098 198.69073,220.97436 198.96358,221.2813 C 198.97208,221.28979 199.00651,221.32507 199.01685,221.33459 C 199.36237,221.62904 200.56221,222.31935 204.29238,223.19967 C 207.6687,224.01818 209.9047,224.75356 211.16656,225.38449 C 213.07643,226.35645 214.41075,227.61619 215.1099,229.16795 C 215.80901,230.70267 215.9625,232.49952 215.5362,234.44348 C 215.1099,236.33627 214.14431,238.082 212.71192,239.71902 C 211.2966,241.35602 209.49545,242.65199 207.32981,243.55575 C 205.18121,244.44247 202.82377,244.94124 200.40235,244.94124 C 197.33295,244.94123 194.86892,244.47657 192.94201,243.55575 C 190.92984,242.60084 189.47827,241.09385 188.62567,239.13284 C 187.80716,237.22298 187.63237,235.05522 188.09278,232.68498 C 188.09278,232.68495 188.25265,231.93893 188.25265,231.93893 C 188.25265,231.93893 194.38079,231.93893 194.38079,231.93893 C 194.38079,231.93893 194.3275,232.68498 194.3275,232.68498 C 194.17402,234.1003 194.32537,235.2428 194.70052,236.09541 C 195.05861,236.91394 195.74071,237.59174 196.83204,238.12037 C 197.99158,238.68307 199.44102,238.97297 201.09509,238.97297 C 202.57864,238.97296 203.9343,238.72358 205.145,238.28024 C 206.33865,237.85394 207.28718,237.2912 207.96927,236.57501 C 208.63429,235.85879 209.02438,235.10213 209.1949,234.28361 C 209.36542,233.55037 209.32492,232.93011 209.03503,232.41853 C 208.71104,231.87289 208.06945,231.389 207.06338,230.97975 C 207.06338,230.97974 201.84112,229.43439 201.84112,229.43439 C 198.9252,228.70116 196.96207,228.00201 195.81957,227.30287 C 194.2678,226.38206 193.14876,225.20118 192.56898,223.78585 C 191.98921,222.38754 191.9274,220.83794 192.30255,219.14977 C 192.69475,217.34224 193.56654,215.6221 194.91366,214.0874 C 196.27786,212.53563 198.03848,211.31855 200.13591,210.51709 C 201.99034,209.82169 203.94187,209.41388 205.9976,209.34475 z M 261.9502,209.45133 C 262.28745,209.42506 262.60456,209.45133 262.96267,209.45133 C 262.96268,209.45133 266.79942,209.87763 266.79942,209.87763 C 266.79941,209.87763 268.07833,209.98421 268.07833,209.98421 C 268.07835,209.98422 266.21325,214.72685 266.21325,214.72685 C 266.21324,214.72687 265.84023,215.47289 265.84023,215.47289 C 265.84023,215.47287 262.90939,215.20645 262.90939,215.20645 C 262.04398,215.20645 261.40826,215.33997 260.99101,215.63275 C 260.9633,215.65368 260.91001,215.71695 260.88443,215.73933 C 260.82853,215.78837 260.73452,215.87391 260.67128,215.95249 C 260.41469,216.289 260.10216,216.89035 259.87196,217.97744 C 259.87194,217.97744 259.76112,218.43784 259.65881,218.83005 C 261.00594,218.83006 264.24158,218.83005 264.24158,218.83005 C 264.24158,218.83006 263.06925,224.10557 263.06925,224.10557 C 263.06925,224.10556 259.71849,224.10557 258.59305,224.10557 C 258.25199,225.64026 254.06355,244.40837 254.06355,244.40837 C 254.06353,244.40835 247.88212,244.40837 247.88212,244.40837 C 247.8821,244.40835 251.90005,226.37352 252.41162,224.10557 C 251.37141,224.10556 248.84131,224.10557 248.84131,224.10557 C 248.84131,224.10556 250.01365,218.83005 250.01365,218.83005 C 250.01366,218.83006 252.55869,218.83005 253.53066,218.83005 C 253.70118,218.09681 253.95696,217.17811 253.95696,217.17811 C 254.33212,215.47289 254.72431,214.24726 255.23587,213.39465 C 255.93504,212.21806 256.92193,211.23328 258.16674,210.51709 C 259.19201,209.92134 260.48872,209.56515 261.9502,209.45133 z M 276.71102,209.71777 C 276.711,209.71776 275.09532,216.98841 274.68607,218.83005 C 275.87971,218.83006 278.68268,218.83005 278.68268,218.83005 C 278.68268,218.83006 277.51035,224.10557 277.51035,224.10557 C 277.51033,224.10556 274.57096,224.10557 273.51373,224.10557 C 273.18972,225.57204 270.63617,236.94803 270.63617,236.94803 C 270.63619,236.94801 270.42301,238.31434 270.42301,238.70654 C 270.42329,238.71959 270.42195,238.75022 270.42301,238.75982 C 270.42385,238.76385 270.42181,238.80979 270.42301,238.81311 C 270.42465,238.8158 270.47416,238.81097 270.47629,238.81311 C 270.47629,238.81309 271.11576,238.8664 271.11576,238.8664 C 271.11576,238.8664 274.04661,238.65325 274.04661,238.65325 C 274.04661,238.65325 273.72688,243.39589 273.72688,243.39589 C 273.7269,243.39589 273.78018,244.2485 273.78018,244.2485 C 273.78016,244.24848 269.5704,244.7281 269.5704,244.7281 C 267.8993,244.72808 266.67365,244.45527 265.78694,243.8755 C 264.84909,243.26158 264.3034,242.44736 264.08172,241.42424 C 264.04761,241.23665 263.97514,240.96382 263.97514,240.57163 C 263.97514,239.80427 264.12009,238.50618 264.6146,236.25529 C 264.61462,236.25531 266.85483,226.22005 267.3323,224.10557 C 266.53087,224.10556 264.40145,224.10557 264.40145,224.10557 C 264.40147,224.10556 265.57378,218.83005 265.57378,218.83005 C 265.57376,218.83006 267.65202,218.83005 268.50464,218.83005 C 268.77745,217.6023 269.73026,213.39465 269.73026,213.39465 C 269.73026,213.39467 274.68607,210.78353 274.68607,210.78353 C 274.68606,210.78355 276.71102,209.71777 276.71102,209.71777 z M 80.344086,209.93092 C 80.344106,209.93092 104.32377,209.93092 104.32377,209.93092 C 104.32377,209.93092 102.99157,215.8992 102.99157,215.8992 C 102.99157,215.89922 86.994456,215.8992 85.459756,215.8992 C 85.186936,217.10993 84.093446,222.01242 83.701246,223.78585 C 85.918046,223.78585 98.888376,223.78585 98.888376,223.78585 C 98.888376,223.78585 97.556166,229.75411 97.556166,229.75411 C 97.556156,229.75411 83.903746,229.75411 82.369036,229.75411 C 82.045046,231.23766 79.118456,244.40837 79.118456,244.40837 C 79.118476,244.40835 72.670596,244.40837 72.670596,244.40837 C 72.670606,244.40835 80.344086,209.93092 80.344086,209.93092 z M 112.47685,218.35046 C 112.71752,218.3209 112.98043,218.35046 113.22289,218.35046 C 114.75759,218.35046 116.17506,218.81726 117.53924,219.78923 C 117.53924,219.78925 118.39184,220.3754 118.39184,220.3754 C 118.39184,220.3754 115.08798,225.8108 115.08798,225.8108 C 115.08798,225.81078 114.18209,225.17134 114.18209,225.17134 C 113.51705,224.74505 112.80086,224.53188 112.05056,224.53188 C 111.40257,224.5319 110.79935,224.76208 110.18547,225.17134 C 109.5375,225.59764 108.99607,226.16249 108.58683,226.92985 C 107.87063,228.24289 107.34627,229.71362 106.98818,231.29948 C 106.98818,231.29949 104.11062,244.40837 104.11062,244.40837 C 104.11062,244.40835 97.929186,244.40837 97.929186,244.40837 C 97.929186,244.40835 103.63103,218.83005 103.63103,218.83005 C 103.63105,218.83006 109.38615,218.83005 109.38615,218.83005 C 109.38615,218.83006 109.18791,219.60593 109.1197,219.89581 C 109.39254,219.6912 109.68029,219.40982 109.91903,219.25635 C 110.745,218.76345 111.6174,218.456 112.47685,218.35046 z M 130.80799,218.35046 C 131.18018,218.32231 131.54658,218.35046 131.92705,218.35046 C 135.40571,218.35046 138.03813,219.56968 139.7604,221.97405 C 140.83468,223.52579 141.41235,225.44417 141.41235,227.72917 C 141.41235,228.99102 141.25674,230.34882 140.93276,231.83236 C 140.93276,231.83236 140.45315,233.69745 140.45315,233.69745 C 140.45315,233.69743 124.82054,233.69745 123.08121,233.69745 C 123.0471,234.05553 123.02792,234.43922 123.02792,234.76321 C 123.02792,236.0933 123.30075,237.13986 123.88053,237.90722 C 124.15603,238.28235 124.47543,238.62021 124.83972,238.8664 C 125.5265,239.31429 126.41306,239.55915 127.45084,239.55915 C 128.71272,239.55913 129.82109,239.2117 130.86128,238.54667 C 131.85033,237.91574 132.79672,236.90753 133.63227,235.50925 C 133.63227,235.50922 140.24,235.50925 140.24,235.50925 C 140.24,235.50922 139.65384,236.78816 139.65384,236.78816 C 138.39197,239.34601 136.63133,241.3411 134.43159,242.75644 C 132.23186,244.17177 129.60368,244.94124 126.7048,244.94124 C 122.93626,244.94123 120.13117,243.72202 118.39184,241.31766 C 116.66958,238.96443 116.29869,235.71173 117.21951,231.6192 C 118.14034,227.45847 119.97771,224.13329 122.6549,221.81418 C 125.05448,219.73356 127.77735,218.5795 130.80799,218.35046 z M 158.57114,218.35046 C 158.94332,218.32231 159.30971,218.35046 159.69018,218.35046 C 163.16885,218.35046 165.80128,219.56968 167.52355,221.97405 C 168.59784,223.52579 169.17548,225.44417 169.17548,227.72917 C 169.17548,228.97397 169.01988,230.31258 168.69588,231.77907 C 168.69588,231.77909 168.2163,233.69745 168.2163,233.69745 C 168.2163,233.69743 152.58367,233.69745 150.84435,233.69745 C 150.82728,233.93615 150.80811,234.15147 150.79106,234.3902 C 150.77827,234.47972 150.79666,234.61561 150.79106,234.70992 C 150.79056,234.7253 150.79106,234.74829 150.79106,234.76321 C 150.79106,235.01901 150.8273,235.27051 150.84435,235.50925 C 150.92958,236.48121 151.18327,237.29334 151.64367,237.90722 C 151.73134,238.02658 151.81375,238.17392 151.91011,238.28024 C 152.69112,239.11578 153.79651,239.55915 155.21398,239.55915 C 156.47586,239.55913 157.60129,239.2117 158.62443,238.54667 C 159.61347,237.91574 160.55985,236.90753 161.39541,235.50925 C 161.39541,235.50922 168.05643,235.50925 168.05643,235.50925 C 168.05642,235.50922 167.41697,236.78816 167.41697,236.78816 C 166.15511,239.34601 164.39447,241.3411 162.19473,242.75644 C 159.99499,244.17177 157.36682,244.94124 154.46795,244.94124 C 150.69942,244.94123 147.89432,243.72202 146.15499,241.31766 C 145.02954,239.78294 144.50305,237.82835 144.50305,235.50925 C 144.50305,235.15113 144.52223,234.76534 144.55634,234.3902 C 144.62457,233.50349 144.76097,232.60824 144.98265,231.6192 C 145.90349,227.47552 147.68756,224.13329 150.36475,221.81418 C 152.76432,219.73356 155.5405,218.5795 158.57114,218.35046 z M 234.18705,218.35046 C 234.56789,218.32117 234.91817,218.35046 235.3061,218.35046 C 238.85297,218.35046 241.5792,219.5505 243.35262,221.92076 C 245.10902,224.29099 245.53531,227.4883 244.63153,231.51262 C 243.9324,234.65025 242.92206,237.18462 241.54083,239.02627 C 240.15957,240.86792 238.39895,242.37276 236.31857,243.39589 C 234.25529,244.41903 232.07044,244.94124 229.87071,244.94124 C 226.25564,244.94123 223.56352,243.70496 221.82419,241.31766 C 220.69873,239.80002 220.11897,237.8454 220.11897,235.50925 C 220.11899,234.24738 220.25753,232.90665 220.59857,231.40606 C 221.62172,226.83605 223.71059,223.35528 226.78,221.12144 C 229.03301,219.4951 231.52114,218.55538 234.18705,218.35046 z M 327.81438,218.35046 C 328.26398,218.32271 328.68031,218.35046 329.14658,218.35046 C 331.29517,218.35046 332.98333,218.56786 334.26225,219.09648 C 335.62643,219.64217 336.59414,220.41377 337.13981,221.33459 C 337.66845,222.20422 337.93914,223.27215 337.93914,224.58516 C 337.93915,224.58518 337.29966,228.4752 337.29966,228.4752 C 337.29969,228.4752 336.12734,233.75074 336.12734,233.75074 C 335.12123,238.2525 334.89958,239.94069 334.84841,240.57163 C 334.79726,241.42425 334.87612,242.25553 335.11486,243.02288 C 335.11488,243.02286 335.54116,244.40837 335.54116,244.40837 C 335.54118,244.40835 329.25316,244.40837 329.25316,244.40837 C 329.25314,244.40835 328.98671,243.60904 328.98671,243.60904 C 328.8844,243.23392 328.91424,242.75644 328.88014,242.33013 C 327.68649,243.06338 326.4907,243.71349 325.41641,244.08864 C 323.83057,244.63433 322.18502,244.94124 320.5139,244.94124 C 317.61504,244.94123 315.46858,244.1867 314.1726,242.70314 C 313.18358,241.61181 312.73383,240.27747 312.73383,238.75982 C 312.73381,238.18005 312.81056,237.57895 312.94697,236.94803 C 313.23685,235.65206 313.76335,234.452 314.59891,233.37771 C 315.41742,232.32045 316.38514,231.45082 317.47647,230.81989 C 318.53373,230.18897 319.71245,229.74134 320.94021,229.43439 C 320.94019,229.43439 324.72367,228.79493 324.72367,228.79493 C 327.63961,228.45387 329.81588,228.02972 331.38469,227.56931 C 331.41881,227.39879 331.49126,227.19629 331.49126,227.19629 C 331.73852,226.09911 331.70758,225.27441 331.43797,224.85161 C 331.41813,224.82434 331.35379,224.76847 331.3314,224.74503 C 331.27384,224.68368 331.18537,224.58724 331.11824,224.53188 C 330.47689,224.02435 329.38318,223.78585 327.92096,223.78585 C 326.26689,223.78585 325.0434,224.05656 324.19078,224.58516 C 323.35523,225.11379 322.58147,226.0815 321.89939,227.46272 C 321.89938,227.46271 315.45152,227.46272 315.45152,227.46272 C 315.45154,227.46271 316.03769,226.18381 316.03769,226.18381 C 316.80502,224.41036 317.71947,222.93963 318.86197,221.81418 C 320.00447,220.68871 321.54769,219.81694 323.33817,219.20307 C 324.71033,218.7501 326.20867,218.44953 327.81438,218.35046 z M 354.83149,218.35046 C 355.07195,218.3209 355.33505,218.35046 355.57752,218.35046 C 357.12925,218.35046 358.58297,218.81726 359.94715,219.78923 C 359.94717,219.78925 360.74647,220.3754 360.74647,220.3754 C 360.74648,220.3754 357.44261,225.8108 357.44261,225.8108 C 357.44262,225.81078 356.53671,225.17134 356.53671,225.17134 C 355.87168,224.74505 355.1917,224.53188 354.45847,224.53188 C 353.81046,224.5319 353.17103,224.76208 352.54008,225.17134 C 351.89211,225.59764 351.42104,226.16249 350.99474,226.92985 C 350.29558,228.24289 349.75418,229.71362 349.39609,231.29948 C 349.39607,231.29949 346.46524,244.40837 346.46524,244.40837 C 346.46526,244.40835 340.28382,244.40837 340.28382,244.40837 C 340.28382,244.40835 345.98564,218.83005 345.98564,218.83005 C 345.98563,218.83006 351.74076,218.83005 351.74076,218.83005 C 351.74076,218.83006 351.59582,219.60593 351.52762,219.89581 C 351.80044,219.6912 352.07115,219.40982 352.32694,219.25635 C 353.13957,218.76345 353.97265,218.456 354.83149,218.35046 z M 373.10932,218.35046 C 373.48117,218.32231 373.84791,218.35046 374.22838,218.35046 C 377.70704,218.35046 380.35651,219.56968 382.06175,221.97405 C 383.1531,223.52579 383.71368,225.44417 383.71368,227.72917 C 383.71366,228.99102 383.50478,230.34882 383.18079,231.83236 C 383.18079,231.83236 382.75449,233.69745 382.75449,233.69745 C 382.75448,233.69743 367.10481,233.69745 365.38255,233.69745 C 365.34844,234.05553 365.27596,234.43922 365.27596,234.76321 C 365.27596,236.0933 365.56585,237.13986 366.12858,237.90722 C 366.21624,238.02658 366.35158,238.17392 366.4483,238.28024 C 366.50432,238.33991 366.60242,238.43797 366.66146,238.49338 C 367.42381,239.1864 368.46127,239.55915 369.75216,239.55915 C 371.01405,239.55913 372.12243,239.2117 373.16261,238.54667 C 374.15166,237.91574 375.081,236.90753 375.9336,235.50925 C 375.93358,235.50922 382.59462,235.50925 382.59462,235.50925 C 382.59462,235.50922 381.95516,236.78816 381.95516,236.78816 C 380.69329,239.34601 378.91561,241.3411 376.73292,242.75644 C 374.51615,244.17177 371.92207,244.94124 369.00613,244.94124 C 365.23762,244.94123 362.48579,243.72202 360.74647,241.31766 C 359.02417,238.96443 358.61707,235.71173 359.52084,231.6192 C 360.44165,227.45847 362.22575,224.13329 364.90295,221.81418 C 367.3177,219.73356 370.08147,218.5795 373.10932,218.35046 z M 279.80172,218.83005 C 279.80174,218.83006 286.14303,218.83005 286.14303,218.83005 C 286.14305,218.83006 286.92529,234.00866 286.94234,234.23032 C 287.19812,233.68676 287.39658,233.22945 287.42195,233.16457 C 287.42196,233.16458 294.40269,218.83005 294.40269,218.83005 C 294.40271,218.83006 300.2111,218.83005 300.2111,218.83005 C 300.21109,218.83006 300.74398,233.82533 300.74398,233.91059 C 300.91453,233.60368 308.68392,218.83005 308.68392,218.83005 C 308.6839,218.83006 314.97193,218.83005 314.97193,218.83005 C 314.97192,218.83006 301.117,244.40837 301.117,244.40837 C 301.11702,244.40835 295.41517,244.40837 295.41517,244.40837 C 295.41517,244.40835 294.86311,230.53853 294.829,229.75411 C 292.47577,234.57991 287.68837,244.40837 287.68837,244.40837 C 287.68837,244.40835 281.82669,244.40837 281.82669,244.40837 C 281.82669,244.40835 279.80172,218.83005 279.80172,218.83005 z M 130.91457,223.67927 C 129.44564,223.74129 128.11162,224.27076 126.86468,225.27791 C 125.87566,226.06232 125.20847,227.13875 124.67985,228.31534 C 124.67985,228.31536 135.17762,228.31534 135.17762,228.31534 C 135.19469,228.12778 135.23091,227.8997 135.23091,227.72917 C 135.23089,226.75722 135.05825,226.00264 134.75132,225.49107 C 134.00104,224.2633 132.88837,223.67927 131.2343,223.67927 C 131.1352,223.67927 131.0125,223.67515 130.91457,223.67927 z M 158.6777,223.67927 C 157.20878,223.74129 155.87475,224.27076 154.6278,225.27791 C 153.63876,226.06232 152.98867,227.13875 152.443,228.31534 C 152.443,228.31536 162.94076,228.31534 162.94076,228.31534 C 162.9578,228.12778 162.99405,227.8997 162.99405,227.72917 C 162.99404,226.75722 162.83845,226.00264 162.51445,225.49107 C 162.36551,225.24168 162.16402,224.99368 161.98157,224.79833 C 161.26958,224.06261 160.28967,223.67927 158.99744,223.67927 C 158.89833,223.67927 158.77564,223.67515 158.6777,223.67927 z M 373.42906,223.67927 C 371.9185,223.7258 370.50781,224.23721 369.21929,225.27791 C 368.24731,226.06232 367.58014,227.13875 367.03447,228.31534 C 367.03449,228.31536 377.47896,228.31534 377.47896,228.31534 C 377.49599,228.12778 377.53225,227.8997 377.53225,227.72917 C 377.53224,226.75722 377.37665,226.00264 377.05265,225.49107 C 376.31941,224.28035 375.18969,223.69633 373.53563,223.67927 C 373.48661,223.6798 373.47779,223.67777 373.42906,223.67927 z M 233.81404,223.78585 C 232.40441,223.95324 231.09368,224.59636 229.87071,225.70422 C 228.40423,227.03431 227.34059,229.12319 226.72672,231.88565 C 226.47093,233.0452 226.35369,234.03636 226.35369,234.92307 C 226.35371,236.13377 226.58602,237.08444 227.04644,237.80063 C 227.16901,237.98447 227.3316,238.17874 227.47275,238.33352 C 228.23079,239.1384 229.28934,239.55915 230.61675,239.55915 C 232.33901,239.55913 233.85667,238.91756 235.3061,237.58748 C 236.77262,236.24034 237.81917,234.13014 238.4501,231.29948 C 239.0299,228.70753 238.94888,226.77212 238.13038,225.54436 C 237.34598,224.3507 236.19922,223.78585 234.61337,223.78585 C 234.34426,223.78585 234.07507,223.75484 233.81404,223.78585 z M 330.10577,233.11128 C 328.65636,233.50346 327.0321,233.83386 324.88353,234.12376 C 323.28064,234.3625 322.13812,234.614 321.47308,234.86979 C 320.89332,235.10851 320.4265,235.4389 320.0343,235.88227 C 319.65914,236.30854 319.40764,236.75619 319.28828,237.26776 C 319.25419,237.4724 319.23498,237.6834 319.23498,237.85393 C 319.23498,237.86777 319.23467,237.89351 319.23498,237.90722 C 319.23677,237.9478 319.23053,238.02792 319.23498,238.06707 C 319.24566,238.14444 319.26715,238.26147 319.28828,238.33352 C 319.2959,238.35725 319.33279,238.41691 319.34155,238.44009 C 319.36021,238.48593 319.3717,238.5562 319.39484,238.59996 C 319.41911,238.64322 319.47274,238.71845 319.50142,238.75982 C 319.54606,238.82119 319.60692,238.91542 319.66129,238.97297 C 320.0876,239.45043 320.93807,239.66572 322.16583,239.66572 C 323.51298,239.66573 324.80893,239.40994 326.00258,238.81311 C 327.1792,238.23334 328.12771,237.36793 328.82685,236.36185 C 329.33844,235.64565 329.74768,234.54365 330.10577,233.11128 z"
+         id="path2579" />
+      <path
+         d="M 373.60344,223.69791 C 373.58638,223.69791 373.56933,223.69791 373.55228,223.69791 C 375.20635,223.71496 376.29769,224.27769 377.03093,225.48839 C 377.35493,225.99996 377.52545,226.76731 377.52545,227.73929 C 377.52545,227.90981 377.49134,228.13149 377.47429,228.31906 C 377.47429,228.31906 377.5425,228.31906 377.5425,228.31906 C 377.5425,228.13149 377.5766,227.90981 377.5766,227.73929 C 377.5766,226.76731 377.42313,225.99996 377.09914,225.48839 C 376.3659,224.26063 375.2575,223.69791 373.60344,223.69791 z"
+         id="path2583"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter" />
+      <g
+         id="g2587"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,26.564476,303.23111)">
+        <path
+           id="path2589"
+           d="M 0,36 C 0,36 7.46,36 7.46,36 C 7.46,36 10.81,22 10.81,22 C 10.81,22 22.93,22 22.93,22 C 22.93,22 24.49,16 24.49,16 C 24.49,16 12.32,16 12.32,16 C 12.32,16 14.34,7 14.34,7 C 14.34,7 27.29,7 27.29,7 C 27.29,7 28.85,0 28.85,0 C 28.85,0 8.4,0 8.4,0 C 8.4,0 0,36 0,36 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2591"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,70.814976,320.28331)">
+        <path
+           id="path2593"
+           d="M 7.51,26 C 7.51,26 9.75,16.6 9.75,16.6 C 10.93,11.51 13.42,7 18.13,7 C 18.55,7 18.96,7.21 19.27,7.26 C 19.27,7.26 21.09,0.05 21.09,0.05 C 20.67,0.05 20.21,0 19.69,0 C 16.22,0 13.31,2.44 11.37,5.94 C 11.37,5.94 11.17,5.94 11.17,5.94 C 11.46,4.23 11.71,2.61 11.9,1 C 11.9,1 5.47,1 5.47,1 C 5.1,3.08 4.53,7.15 3.66,10.82 C 3.66,10.82 0,26 0,26 C 0,26 7.51,26 7.51,26 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2595"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,105.99378,320.28331)">
+        <path
+           id="path2597"
+           d="M 20.06,19.25 C 17.99,20.26 15.63,20 12.88,20 C 10.71,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.43,16.81 7.47,16 C 17.6,16.27 23.99,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.73,0 0.73,8.08 0.34,15.86 C 0,22.65 3.52,26 10.78,26 C 13.57,26 17.27,25.68 20.3,24.77 C 20.3,24.77 20.06,19.25 20.06,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.47,10 C 9.1,7.91 11.22,6 14.69,6 C 16.4,6 17.38,6.65 17.32,7.53 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2599"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,151.21628,320.28331)">
+        <path
+           id="path2601"
+           d="M 20.05,19.25 C 17.98,20.26 15.62,20 12.88,20 C 10.7,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.42,16.81 7.46,16 C 17.6,16.27 23.98,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.72,0 0.72,8.08 0.33,15.86 C 0,22.65 3.52,26 10.77,26 C 13.57,26 17.27,25.68 20.3,24.77 C 20.3,24.77 20.05,19.25 20.05,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.46,10 C 9.1,7.91 11.21,6 14.68,6 C 16.39,6 17.38,6.65 17.32,7.53 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2603"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,212.45078,320.28331)">
+        <path
+           id="path2605"
+           d="M 22.74,26 C 22.8,22.83 23.56,17.85 24.35,14.58 C 24.35,14.58 27.56,1 27.56,1 C 25.52,0.31 22.34,0 19.28,0 C 6.86,0 0.7,9.2 0.27,17.82 C 0,23.23 2.93,26 7.49,26 C 10.44,26 13.77,24.57 16.36,20.27 C 16.36,20.27 16.47,20.27 16.47,20.27 C 16.27,22.34 16.03,24.35 15.9,26 C 15.9,26 22.74,26 22.74,26 z M 17.61,11.72 C 16.15,18.08 13.17,20 10.95,20 C 8.88,20 7.98,18.53 8.1,16.39 C 8.34,11.56 12.16,6 16.98,6 C 17.76,6 18.37,5.86 18.94,5.72 C 18.94,5.72 17.61,11.72 17.61,11.72 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2607"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,259.56608,320.28331)">
+        <path
+           id="path2609"
+           d="M 0,24.82 C 1.44,25.94 4.46,25.95 7.61,26 C 14.34,26.05 19.42,23.11 19.72,17.71 C 19.89,14.11 17.1,11.98 14.37,10.55 C 12.4,9.6 11.41,8.69 11.46,7.63 C 11.53,6.2 12.87,6 14.84,6 C 17.06,6 18.84,6.27 19.86,6.47 C 19.86,6.47 21.88,1.05 21.88,1.05 C 20.73,0.36 18.43,0 15.48,0 C 8.95,0 4.17,3.45 3.9,8.69 C 3.74,11.93 6.07,14.11 8.89,15.59 C 11.17,16.76 11.95,17.66 11.89,18.93 C 11.82,20.21 10.68,20 8.61,20 C 6.18,20 3.49,19.68 2.07,19.46 C 2.07,19.46 0,24.82 0,24.82 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2611"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,314.90048,301.52591)">
+        <path
+           id="path2613"
+           d="M 7.45,37 C 7.45,37 13.5,12 13.5,12 C 13.5,12 6.09,12 6.09,12 C 6.09,12 0,37 0,37 C 0,37 7.45,37 7.45,37 z M 10.92,9 C 13.46,9 15.72,6.9 15.86,3.3 C 15.98,0.86 14.4,0 12.07,0 C 9.64,0 7.42,1.58 7.29,3.94 C 7.17,6.32 8.75,9 10.92,9 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2615"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,339.26808,321.45991)">
+        <path
+           id="path2617"
+           d="M 7.46,25.31 C 7.46,25.31 10.1,14.05 10.1,14.05 C 11.47,8.32 14.42,6.31 16.85,6.31 C 18.77,6.31 19.33,7.13 19.24,8.32 C 19.19,9.28 19.04,10.29 18.84,11.19 C 18.84,11.19 15.48,25.31 15.48,25.31 C 15.48,25.31 22.94,25.31 22.94,25.31 C 22.94,25.31 26.48,10.5 26.48,10.5 C 26.75,9.22 27.05,7.31 27.11,6.15 C 27.33,1.64 25.08,0 20.94,0 C 17.62,0 14.39,1.54 11.84,4.88 C 11.84,4.88 11.74,4.88 11.74,4.88 C 11.74,4.88 12.42,0.31 12.42,0.31 C 12.42,0.31 5.84,0.31 5.84,0.31 C 5.41,2.45 4.86,5.04 4.08,8.06 C 4.08,8.06 0,25.31 0,25.31 C 0,25.31 7.46,25.31 7.46,25.31 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2619"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,406.72668,303.23111)">
+        <path
+           id="path2621"
+           d="M 0,36 C 0,36 7.46,36 7.46,36 C 7.46,36 10.82,22 10.82,22 C 10.82,22 22.93,22 22.93,22 C 22.93,22 24.49,16 24.49,16 C 24.49,16 12.32,16 12.32,16 C 12.32,16 14.34,7 14.34,7 C 14.34,7 27.29,7 27.29,7 C 27.29,7 28.85,0 28.85,0 C 28.85,0 8.4,0 8.4,0 C 8.4,0 0,36 0,36 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2623"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,450.97718,320.28331)">
+        <path
+           id="path2625"
+           d="M 7.51,26 C 7.51,26 9.75,16.6 9.75,16.6 C 10.93,11.51 13.42,7 18.13,7 C 18.55,7 18.96,7.21 19.27,7.26 C 19.27,7.26 21.09,0.05 21.09,0.05 C 20.67,0.05 20.21,0 19.69,0 C 16.22,0 13.31,2.44 11.37,5.94 C 11.37,5.94 11.17,5.94 11.17,5.94 C 11.46,4.23 11.71,2.61 11.9,1 C 11.9,1 5.47,1 5.47,1 C 5.11,3.08 4.53,7.15 3.66,10.82 C 3.66,10.82 0,26 0,26 C 0,26 7.51,26 7.51,26 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2627"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,486.15598,320.28331)">
+        <path
+           id="path2629"
+           d="M 20.06,19.25 C 17.99,20.26 15.63,20 12.88,20 C 10.71,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.43,16.81 7.47,16 C 17.6,16.27 23.99,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.73,0 0.73,8.08 0.34,15.86 C 0,22.65 3.53,26 10.78,26 C 13.57,26 17.28,25.68 20.3,24.77 C 20.3,24.77 20.06,19.25 20.06,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.47,10 C 9.1,7.91 11.22,6 14.69,6 C 16.4,6 17.38,6.65 17.32,7.53 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2631"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,531.37838,320.28331)">
+        <path
+           id="path2633"
+           d="M 20.05,19.25 C 17.98,20.26 15.62,20 12.88,20 C 10.7,20 9.03,19.62 8.11,18.88 C 7.63,18.07 7.42,16.81 7.46,16 C 17.6,16.27 23.98,13.93 24.31,7.53 C 24.55,2.7 21.02,0 15.89,0 C 6.72,0 0.72,8.08 0.33,15.86 C 0,22.65 3.52,26 10.77,26 C 13.57,26 17.27,25.68 20.3,24.77 C 20.3,24.77 20.05,19.25 20.05,19.25 z M 17.32,7.53 C 17.2,9.91 14.26,10.05 8.46,10 C 9.1,7.91 11.21,6 14.68,6 C 16.39,6 17.38,6.65 17.32,7.53 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2635"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,576.36218,301.52591)">
+        <path
+           id="path2637"
+           d="M 23.31,0 C 23.31,0 20.5,11.36 20.5,11.36 C 19.48,10.94 18.15,11 17.11,11 C 7.53,11 0.75,19.2 0.3,28.08 C 0,34.34 3.34,37 7.64,37 C 10.65,37 13.82,35.67 16.22,32.23 C 16.22,32.23 16.32,32.23 16.32,32.23 C 16.32,32.23 15.75,37 15.75,37 C 15.75,37 22.53,37 22.53,37 C 22.84,34 23.49,30.43 24.22,27.17 C 24.22,27.17 30.71,0 30.71,0 C 30.71,0 23.31,0 23.31,0 z M 17.47,24.42 C 16.3,29.35 13.54,31 11.36,31 C 9.19,31 7.98,29.49 8.13,26.8 C 8.38,21.82 11.8,17 16.25,17 C 17.5,17 18.57,17.19 19.16,17.47 C 19.16,17.47 17.47,24.42 17.47,24.42 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2639"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,627.02428,320.28331)">
+        <path
+           id="path2641"
+           d="M 10.61,26 C 19.31,26 26.02,19.41 26.49,10.44 C 26.78,4.5 23.08,0 16.25,0 C 7.23,0 0.76,7.3 0.31,16.12 C 0,22.54 4.14,26 10.61,26 z M 11.78,20 C 9.24,20 7.84,18.38 7.99,15.96 C 8.19,11.93 10.68,6 14.97,6 C 17.93,6 18.84,8.27 18.72,10.5 C 18.5,14.9 15.82,20 11.78,20 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <g
+         id="g2643"
+         style="fill:#bd0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter"
+         transform="matrix(1.705222,0,0,1.705222,675.72548,320.28331)">
+        <path
+           id="path2645"
+           d="M 7.2,26 C 7.2,26 9.9,14.58 9.9,14.58 C 11.03,9.49 13.85,6 16.38,6 C 18.2,6 18.7,7.33 18.61,9.07 C 18.56,9.97 18.36,10.98 18.15,11.98 C 18.15,11.98 14.81,26 14.81,26 C 14.81,26 22.01,26 22.01,26 C 22.01,26 24.71,14.53 24.71,14.53 C 25.95,9.28 28.61,6 31.09,6 C 32.8,6 33.51,7.22 33.43,8.96 C 33.38,9.97 33.17,11.08 32.91,12.09 C 32.91,12.09 29.67,26 29.67,26 C 29.67,26 36.92,26 36.92,26 C 36.92,26 40.41,11.19 40.41,11.19 C 40.68,9.86 40.99,7.79 41.04,6.73 C 41.26,2.33 39.11,0 35.23,0 C 31.91,0 28.68,1.5 26.23,4.66 C 26.14,2.38 24.51,0 20.47,0 C 17.2,0 14.08,1.48 11.58,4.83 C 11.58,4.83 11.48,4.83 11.48,4.83 C 11.48,4.83 12.15,1 12.15,1 C 12.15,1 5.73,1 5.73,1 C 5.31,3.14 4.8,5.73 4.02,8.75 C 4.02,8.75 0,26 0,26 C 0,26 7.2,26 7.2,26 z"
+           style="fill:#bd0000;fill-opacity:1" />
+      </g>
+      <path
+         style="fill:#bd0000;fill-opacity:0;fill-rule:evenodd;stroke:#bd0000;stroke-width:8.52610779;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path2647"
+         d="M 417.07944,250.20635 C 417.77165,251.98597 418.46389,253.76268 419.18494,255.50045 C 420.2954,257.86122 421.5789,260.12105 423.12198,262.2309 C 431.45755,273.56176 445.41744,279.76585 463.14129,281.31037 C 463.14129,281.31037 482.20635,281.31037 482.20635,281.31037 C 488.23446,280.84023 494.55102,279.96341 501.09833,278.68278 C 512.39026,276.47488 524.36,273.08298 536.79121,268.55034 C 546.20836,265.11659 555.88511,261.0541 565.70606,256.33256 C 587.09294,246.08041 609.18647,232.85747 630.86181,216.90021 C 638.00038,211.64939 644.85053,206.26158 651.42668,200.78291 C 657.45481,195.76715 663.23778,190.67349 668.76114,185.52364 C 684.17759,170.66675 695.81564,155.57767 702.40621,142.32874 C 709.27073,128.53184 710.64082,116.73516 705.01649,109.30381 C 701.56976,104.74235 695.80122,102.29792 688.37421,101.72251 C 721.83174,76.6178 741.32949,46.16418 734.33517,26.96361 C 732.11421,20.83591 727.22536,16.26441 720.21659,13.73631 C 717.10162,12.61581 713.59716,11.90621 709.77549,11.58321 C 709.77549,11.58321 699.47866,11.58321 699.47866,11.58321 C 685.10058,12.62011 664.19202,17.76851 646.45376,26.46171"
+         sodipodi:nodetypes="cccccssccccscccsccc" />
+    </g>
+  </g>
+</svg>
diff --git a/htdocs/modulebuilder/template/dev/img/gplv3-127x51.png b/htdocs/modulebuilder/template/dev/img/gplv3-127x51.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e9136e626683ac152b73bc8fffcb15d1806091a
GIT binary patch
literal 3471
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

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/dev/img/gplv3-88x31.png b/htdocs/modulebuilder/template/dev/img/gplv3-88x31.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba78d4c4941dabf2fcac5409a92ac4c57920c69f
GIT binary patch
literal 2666
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
Y19h*OP%`Tk_W%F@07*qoM6N<$g8#_jNdN!<

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/dev/img/mymodule.svg b/htdocs/modulebuilder/template/dev/img/mymodule.svg
new file mode 100644
index 00000000000..f51ead1a94e
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/img/mymodule.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="14"
+   height="14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="object_mymodule.svg"
+   inkscape:export-filename="/home/raph/Travail/src/zenfusion-modules/img/object_mymodule.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="24.310822"
+     inkscape:cy="18.155032"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="1080"
+     inkscape:window-y="867"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1038.3622)">
+    <text
+       xml:space="preserve"
+       style="font-size:12.99629784px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif"
+       x="0.35272363"
+       y="1050.0994"
+       id="text2985"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan2987"
+         x="0.35272363"
+         y="1050.0994">M</tspan></text>
+  </g>
+</svg>
diff --git a/htdocs/modulebuilder/template/dev/newmodule.sh b/htdocs/modulebuilder/template/dev/newmodule.sh
new file mode 100644
index 00000000000..92f4875cbf6
--- /dev/null
+++ b/htdocs/modulebuilder/template/dev/newmodule.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+# Copyright (C) 2014 Raphaël Doursenaud
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+VERSION=0.0.1
+USAGE="Usage: newmodule.sh NewName"
+
+# TODO: check depedencies presence (find, sed and rename)
+# TODO: allow execution from build directory
+# TODO: validate parameter
+# TODO: use multiple word parameter, for example "My module is awesome" which should lead to "MyModuleIsAwesome" and "mymoduleisawesome" so we can also fix language strings
+# TODO: add module ID management (language files…)
+# TODO: add oneliner description management
+# TODO: add copyright management
+
+if [ $# == 0 ] ; then
+    echo ${USAGE}
+    exit 1;
+fi
+
+ToLower () {
+	echo $(echo $1 | tr '[:upper:]' '[:lower:]')
+}
+ToUpper () {
+	echo $(echo $1 | tr '[:lower:]' '[:upper:]')
+}
+
+CAMELORIG="MyModule"
+LOWERORIG=$(ToLower ${CAMELORIG})
+UPPERORIG=$(ToUpper ${CAMELORIG})
+cameltarget=$(echo $1)
+lowertarget=$(ToLower $1)
+uppertarget=$(ToUpper $1)
+thisscript=`basename $0`
+
+# Rewrite occurences
+find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${CAMELORIG}/${cameltarget}/g"
+find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${LOWERORIG}/${lowertarget}/g"
+find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${UPPERORIG}/${uppertarget}/g"
+
+# Rename files
+for file in $(find . -not -iwholename '*.git*' -name "*${CAMELORIG}*" -type f)
+do
+	rename ${CAMELORIG} ${cameltarget} ${file}
+done
+for file in $(find . -not -iwholename '*.git*' -name "*${LOWERORIG}*" -type f)
+do
+	rename ${LOWERORIG} ${lowertarget} ${file}
+done
+for file in $(find . -not -iwholename '*.git*' -name "*${UPPERORIG}*" -type f)
+do
+	rename ${UPPERORIG} ${uppertarget} ${file}
+done
+
+# TODO: add instructions about renaming vars (ack --php -i my)
+# TODO: add instructions about renaming files (ls -R|grep -i my)
diff --git a/htdocs/modulebuilder/template/doc/user/Makefile b/htdocs/modulebuilder/template/doc/user/Makefile
new file mode 100644
index 00000000000..5c33e8bf0a3
--- /dev/null
+++ b/htdocs/modulebuilder/template/doc/user/Makefile
@@ -0,0 +1,225 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+
+.PHONY: help
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  applehelp  to make an Apple Help Book"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  epub3      to make an epub3"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+	@echo "  dummy      to check syntax errors of document sources"
+
+.PHONY: clean
+clean:
+	rm -rf $(BUILDDIR)/*
+
+.PHONY: html
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+.PHONY: dirhtml
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+.PHONY: singlehtml
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+.PHONY: pickle
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+.PHONY: json
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+.PHONY: htmlhelp
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+.PHONY: qthelp
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Mymodule.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Mymodule.qhc"
+
+.PHONY: applehelp
+applehelp:
+	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
+	@echo
+	@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
+	@echo "N.B. You won't be able to view it unless you put it in" \
+	      "~/Library/Documentation/Help or install it in your application" \
+	      "bundle."
+
+.PHONY: devhelp
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/Mymodule"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Mymodule"
+	@echo "# devhelp"
+
+.PHONY: epub
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+.PHONY: epub3
+epub3:
+	$(SPHINXBUILD) -b epub3 $(ALLSPHINXOPTS) $(BUILDDIR)/epub3
+	@echo
+	@echo "Build finished. The epub3 file is in $(BUILDDIR)/epub3."
+
+.PHONY: latex
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+.PHONY: latexpdf
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+.PHONY: latexpdfja
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+.PHONY: text
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+.PHONY: man
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+.PHONY: texinfo
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+.PHONY: info
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+.PHONY: gettext
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+.PHONY: changes
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+.PHONY: linkcheck
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+.PHONY: doctest
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+.PHONY: coverage
+coverage:
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+.PHONY: xml
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+.PHONY: pseudoxml
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
+
+.PHONY: dummy
+dummy:
+	$(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILDDIR)/dummy
+	@echo
+	@echo "Build finished. Dummy builder generates no files."
diff --git a/htdocs/modulebuilder/template/doc/user/make.bat b/htdocs/modulebuilder/template/doc/user/make.bat
new file mode 100644
index 00000000000..35018adf3ba
--- /dev/null
+++ b/htdocs/modulebuilder/template/doc/user/make.bat
@@ -0,0 +1,281 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
+set I18NSPHINXOPTS=%SPHINXOPTS% source
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html       to make standalone HTML files
+	echo.  dirhtml    to make HTML files named index.html in directories
+	echo.  singlehtml to make a single large HTML file
+	echo.  pickle     to make pickle files
+	echo.  json       to make JSON files
+	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  qthelp     to make HTML files and a qthelp project
+	echo.  devhelp    to make HTML files and a Devhelp project
+	echo.  epub       to make an epub
+	echo.  epub3      to make an epub3
+	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text       to make text files
+	echo.  man        to make manual pages
+	echo.  texinfo    to make Texinfo files
+	echo.  gettext    to make PO message catalogs
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  xml        to make Docutils-native XML files
+	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	echo.  coverage   to run coverage check of the documentation if enabled
+	echo.  dummy      to check syntax errors of document sources
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+
+REM Check if sphinx-build is available and fallback to Python version if any
+%SPHINXBUILD% 1>NUL 2>NUL
+if errorlevel 9009 goto sphinx_python
+goto sphinx_ok
+
+:sphinx_python
+
+set SPHINXBUILD=python -m sphinx.__init__
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+:sphinx_ok
+
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "singlehtml" (
+	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\Mymodule.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\Mymodule.ghc
+	goto end
+)
+
+if "%1" == "devhelp" (
+	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished.
+	goto end
+)
+
+if "%1" == "epub" (
+	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub file is in %BUILDDIR%/epub.
+	goto end
+)
+
+if "%1" == "epub3" (
+	%SPHINXBUILD% -b epub3 %ALLSPHINXOPTS% %BUILDDIR%/epub3
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub3 file is in %BUILDDIR%/epub3.
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdf" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdfja" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf-ja
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "text" (
+	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The text files are in %BUILDDIR%/text.
+	goto end
+)
+
+if "%1" == "man" (
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The manual pages are in %BUILDDIR%/man.
+	goto end
+)
+
+if "%1" == "texinfo" (
+	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+	goto end
+)
+
+if "%1" == "gettext" (
+	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+if "%1" == "coverage" (
+	%SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of coverage in the sources finished, look at the ^
+results in %BUILDDIR%/coverage/python.txt.
+	goto end
+)
+
+if "%1" == "xml" (
+	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The XML files are in %BUILDDIR%/xml.
+	goto end
+)
+
+if "%1" == "pseudoxml" (
+	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
+	goto end
+)
+
+if "%1" == "dummy" (
+	%SPHINXBUILD% -b dummy %ALLSPHINXOPTS% %BUILDDIR%/dummy
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. Dummy builder generates no files.
+	goto end
+)
+
+:end
diff --git a/htdocs/modulebuilder/template/doc/user/source/conf.py b/htdocs/modulebuilder/template/doc/user/source/conf.py
new file mode 100644
index 00000000000..130bd5a12e5
--- /dev/null
+++ b/htdocs/modulebuilder/template/doc/user/source/conf.py
@@ -0,0 +1,428 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# My Module documentation build configuration file, created by
+# sphinx-quickstart on Mon Sep 26 17:54:17 2016.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'sphinx.ext.todo',
+    'sphinx.ext.imgmath',
+    'sphinx.ext.githubpages',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#
+# source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'My Module'
+copyright = '2016, Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>'
+author = 'Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = 'development'
+# The full version, including alpha/beta/rc tags.
+release = 'development'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#
+# today = ''
+#
+# Else, today_fmt is used as the format for a strftime call.
+#
+# today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = []
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#
+# default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#
+# add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#
+# add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#
+# show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+# modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+# keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = True
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+# html_theme_path = []
+
+# The name for this set of Sphinx documents.
+# "<project> v<release> documentation" by default.
+#
+# html_title = 'My Module vdevelopment'
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#
+# html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#
+# html_logo = None
+
+# The name of an image file (relative to this directory) to use as a favicon of
+# the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#
+# html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#
+# html_extra_path = []
+
+# If not None, a 'Last updated on:' timestamp is inserted at every page
+# bottom, using the given strftime format.
+# The empty string is equivalent to '%b %d, %Y'.
+#
+# html_last_updated_fmt = None
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#
+# html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#
+# html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#
+# html_additional_pages = {}
+
+# If false, no module index is generated.
+#
+# html_domain_indices = True
+
+# If false, no index is generated.
+#
+# html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#
+# html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#
+# html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#
+# html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#
+# html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#
+# html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+# html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja'
+#   'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr', 'zh'
+#
+# html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# 'ja' uses this config value.
+# 'zh' user can custom change `jieba` dictionary path.
+#
+# html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#
+# html_search_scorer = 'scorer.js'
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'Mymoduledoc'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+     # The paper size ('letterpaper' or 'a4paper').
+     #
+     # 'papersize': 'letterpaper',
+
+     # The font size ('10pt', '11pt' or '12pt').
+     #
+     # 'pointsize': '10pt',
+
+     # Additional stuff for the LaTeX preamble.
+     #
+     # 'preamble': '',
+
+     # Latex figure (float) alignment
+     #
+     # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'Mymodule.tex', 'My Module Documentation',
+     'Raphaël Doursenaud \\textless{}rdoursenaud@gpcsolutions.fr\\textgreater{}', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#
+# latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#
+# latex_use_parts = False
+
+# If true, show page references after internal links.
+#
+# latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#
+# latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#
+# latex_appendices = []
+
+# It false, will not define \strong, \code, 	itleref, \crossref ... but only
+# \sphinxstrong, ..., \sphinxtitleref, ... To help avoid clash with user added
+# packages.
+#
+# latex_keep_old_macro_names = True
+
+# If false, no module index is generated.
+#
+# latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'mymodule', 'My Module Documentation',
+     [author], 1)
+]
+
+# If true, show URL addresses after external links.
+#
+# man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'Mymodule', 'My Module Documentation',
+     author, 'Mymodule', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#
+# texinfo_appendices = []
+
+# If false, no module index is generated.
+#
+# texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#
+# texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#
+# texinfo_no_detailmenu = False
+
+
+# -- Options for Epub output ----------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = project
+epub_author = author
+epub_publisher = author
+epub_copyright = copyright
+
+# The basename for the epub file. It defaults to the project name.
+# epub_basename = project
+
+# The HTML theme for the epub output. Since the default themes are not
+# optimized for small screen space, using the same theme for HTML and epub
+# output is usually not wise. This defaults to 'epub', a theme designed to save
+# visual space.
+#
+# epub_theme = 'epub'
+
+# The language of the text. It defaults to the language option
+# or 'en' if the language is not set.
+#
+# epub_language = ''
+
+# The scheme of the identifier. Typical schemes are ISBN or URL.
+# epub_scheme = ''
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#
+# epub_identifier = ''
+
+# A unique identification for the text.
+#
+# epub_uid = ''
+
+# A tuple containing the cover image and cover page html template filenames.
+#
+# epub_cover = ()
+
+# A sequence of (type, uri, title) tuples for the guide element of content.opf.
+#
+# epub_guide = ()
+
+# HTML files that should be inserted before the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#
+# epub_pre_files = []
+
+# HTML files that should be inserted after the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#
+# epub_post_files = []
+
+# A list of files that should not be packed into the epub file.
+epub_exclude_files = ['search.html']
+
+# The depth of the table of contents in toc.ncx.
+#
+# epub_tocdepth = 3
+
+# Allow duplicate toc entries.
+#
+# epub_tocdup = True
+
+# Choose between 'default' and 'includehidden'.
+#
+# epub_tocscope = 'default'
+
+# Fix unsupported image types using the Pillow.
+#
+# epub_fix_images = False
+
+# Scale large images.
+#
+# epub_max_image_width = 0
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#
+# epub_show_urls = 'inline'
+
+# If false, no index is generated.
+#
+# epub_use_index = True
diff --git a/htdocs/modulebuilder/template/doc/user/source/index.rst b/htdocs/modulebuilder/template/doc/user/source/index.rst
new file mode 100644
index 00000000000..48f2a6e49d8
--- /dev/null
+++ b/htdocs/modulebuilder/template/doc/user/source/index.rst
@@ -0,0 +1,22 @@
+.. My Module documentation master file, created by
+   sphinx-quickstart on Mon Sep 26 17:54:17 2016.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to My Module's documentation!
+=====================================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
diff --git a/htdocs/modulebuilder/template/img/gfdl.png b/htdocs/modulebuilder/template/img/gfdl.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2bacfd179a99f051654eaa6ba30089dd8691d7a
GIT binary patch
literal 4709
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

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/img/gplv3.png b/htdocs/modulebuilder/template/img/gplv3.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba78d4c4941dabf2fcac5409a92ac4c57920c69f
GIT binary patch
literal 2666
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
Y19h*OP%`Tk_W%F@07*qoM6N<$g8#_jNdN!<

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/img/mymodule.png b/htdocs/modulebuilder/template/img/mymodule.png
new file mode 100644
index 0000000000000000000000000000000000000000..2681ccc1d3a7d33593e8502daa447b8c816ddb08
GIT binary patch
literal 683
zcmV;c0#yBpP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm001AO001AO0d^~rqyPW_8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10w_sDK~z|U?U&0-RZ$eif6Gj16oCkZ5<+1}P!UCPF?v7<(OB?*
zXxeiS)Wn8G2q6(fuR#z|P(nEnL85_^ia>&bpol<(u!rW?;H+EQ%enXNbFO(BxM6em
zT6?Xvzwg`ooU^Y<qR7@%=<2Hg{s#cf<$;-<26m*xypnVwPjNFV0moCOrX*biKob5W
z+yy>){|U(ZFQBI!m!$&}L7j!5{;fYTRT7^Ei2`otSo}~$jn`>$_0GV8{|=a0ceV}S
zT##S2)dC>kW)OEac4ad=0PF{D)D5n&1&hE|5*Fn>+!87O7%&6uq>(L<G);0i0oKH*
zU}k;5LEthl+mHf2-bV5y2$%=D>ac(63vU3r8dAUkz5(vJ*$kYi!M+3>2Chh&smne_
z0k^l4oC%S<BQ{sb8wI`sZEiQNfP;Jq+;?*=a4LoUKHvy2Ea^)W`&b3sw<}=t1L&xj
ze+<k4?SXH36mXzZz(Y4%LKVzxFVGKMmGn89eHI1Wzb9by9oXdlN5D5=V@3S(Dd1pV
z08iX(1x}dRZr~_zP146q?6WH1bG-qpIbfWWGx1LpaKMwmGdI@(eZX}|A2PEi|BdK;
zFrEj7a@P5KBg)bwjhopWpa&S0^ln7~IEcZ#xv2om>=;mTvomp7S=zUfMq-Pa*-4U*
z(fYvM9@LwZ^Z;0LC%nYcD^%FWV(tM!t@kx*iR5*SB+L^EYlZ(WSOrixfZrRuvN}?F
RO?LnQ002ovPDHLkV1iP-B{u*7

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/img/object_mymodule.png b/htdocs/modulebuilder/template/img/object_mymodule.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a307bfc62f85df909a3cf024f27ee87d44be275
GIT binary patch
literal 360
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xamSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt)eIT^vI+
zChono-m4{0gyqBiz=Ju)w^;&N<{#X1a0!1><Y%Q{d~D5Uw;i2s5YZwkcu^%vjOU;9
z;kxeEpK=W=9!xuY=FUv(?UR0-KJ&M;m376cVx6Rpy(;rBA6R8|OzYm{5|xWL-acNe
zILqe75o^6;yQR|Ctg@T8v309Tyzut9rW>bC%GsW3bBL=<%|p84;9-@5SwA|2OIEL%
zb=QtBT0T9C&(LA{syqXqqW_DHn`b;(x5}@uA-g2{Ncy)Mhpp~Sy0eY()*3IP6|4C4
z(mDEHWvtPCEP7WZe7{4e?P9&>AE%^j|Mz!&9rL?{G_w^d>;^y&GkCiCxvX<aXaWE|
CJd*hU

literal 0
HcmV?d00001

diff --git a/htdocs/modulebuilder/template/js/myjs.js.php b/htdocs/modulebuilder/template/js/myjs.js.php
new file mode 100644
index 00000000000..b2649676f14
--- /dev/null
+++ b/htdocs/modulebuilder/template/js/myjs.js.php
@@ -0,0 +1,27 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    js/myjs.js.php
+ * \ingroup mymodule
+ * \brief   Example JavaScript.
+ *
+ * Put detailed description here.
+ */
+
+header('Content-Type: application/javascript');
diff --git a/htdocs/modulebuilder/template/langs/en_US/mymodule.lang b/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
new file mode 100644
index 00000000000..53c6205386c
--- /dev/null
+++ b/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
@@ -0,0 +1,51 @@
+# <one line to give the program's name and a brief idea of what it does.>
+# Copyright (C) <year>  <name of author>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleXXXName'
+# (where XXX is value of numeric property 'numero' of module)
+Module500000Name = My module
+# Module description 'ModuleXXXDesc'
+# (where XXX is value of numeric property 'numero' of module)
+Module500000Desc = My module description
+
+#
+# Admin page
+#
+MyModuleSetup = My module setup
+Settings = Settings
+MyModuleSetupPage = My module setup page
+
+#
+# About page
+#
+About = About
+MyModuleAbout = About my module
+MyModuleAboutPage = My module about page
+
+#
+# Sample page
+#
+MyPageName = My page name
+
+#
+# Sample box
+#
+MyBox = My box
+MyBoxDescription = My box description
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang b/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
new file mode 100644
index 00000000000..d15d37f0ebf
--- /dev/null
+++ b/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
@@ -0,0 +1,51 @@
+# <one line to give the program's name and a brief idea of what it does.>
+# Copyright (C) <year>  <name of author>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Générique
+#
+
+# Module label 'ModuleXXXName'
+# (where XXX is value of numeric property 'numero' of module)
+Module500000Name = Mon module
+# Module description 'ModuleXXXDesc'
+# (where XXX is value of numeric property 'numero' of module)
+Module500000Desc = Description de mon module
+
+#
+# Page d'administration
+#
+MyModuleSetup = Configuration du module mon module
+Settings = Réglages
+MyModuleSetupPage = Page de réglage de mon module
+
+#
+# Page À propos
+#
+About = À propos
+MyModuleAbout = À propos de mon module
+MyModuleAboutPage = Page à propos de mon module
+
+#
+# Page d'exemple
+#
+MyPageName = Nom de ma page
+
+#
+# Box d'exemple
+#
+MyBox = Ma boîte
+MyBoxDescription = Description de ma boîte
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/lib/mymodule.lib.php b/htdocs/modulebuilder/template/lib/mymodule.lib.php
new file mode 100644
index 00000000000..ac4e0bf4a66
--- /dev/null
+++ b/htdocs/modulebuilder/template/lib/mymodule.lib.php
@@ -0,0 +1,61 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    lib/mymodule.lib.php
+ * \ingroup mymodule
+ * \brief   Example module library.
+ *
+ * Put detailed description here.
+ */
+
+/**
+ * Prepare admin pages header
+ *
+ * @return array
+ */
+function mymoduleAdminPrepareHead()
+{
+	global $langs, $conf;
+
+	$langs->load("mymodule@mymodule");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/mymodule/admin/setup.php", 1);
+	$head[$h][1] = $langs->trans("Settings");
+	$head[$h][2] = 'settings';
+	$h++;
+	$head[$h][0] = dol_buildpath("/mymodule/admin/about.php", 1);
+	$head[$h][1] = $langs->trans("About");
+	$head[$h][2] = 'about';
+	$h++;
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'mymodule');
+
+	return $head;
+}
diff --git a/htdocs/modulebuilder/template/mypage.php b/htdocs/modulebuilder/template/mypage.php
new file mode 100644
index 00000000000..368fd86c0a4
--- /dev/null
+++ b/htdocs/modulebuilder/template/mypage.php
@@ -0,0 +1,135 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    mypage.php
+ * \ingroup mymodule
+ * \brief   Example PHP page.
+ *
+ * Put detailed description here.
+ */
+
+//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
+// Do not check anti CSRF attack test
+//if (! defined('NOCSRFCHECK'))		define('NOCSRFCHECK','1');
+// Do not check style html tag into posted data
+//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');
+// Do not check anti POST attack test
+//if (! defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL','1');
+// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREMENU'))	define('NOREQUIREMENU','1');
+// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREHTML'))	define('NOREQUIREHTML','1');
+//if (! defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX','1');
+// If this page is public (can be called outside logged session)
+//if (! defined("NOLOGIN"))			define("NOLOGIN",'1');
+// Change the following lines to use the correct relative path
+// (../, ../../, etc)
+
+// Load Dolibarr environment
+if (false === (@include '../../main.inc.php')) {  // From htdocs directory
+	require '../../../main.inc.php'; // From "custom" directory
+}
+
+global $db, $langs, $user;
+
+dol_include_once('/mymodule/class/myclass.class.php');
+
+// Load translation files required by the page
+$langs->load("mymodule@mymodule");
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$action = GETPOST('action', 'alpha');
+$myparam = GETPOST('myparam', 'alpha');
+
+// Access control
+if ($user->socid > 0) {
+	// External user
+	accessforbidden();
+}
+
+// Default action
+if (empty($action) && empty($id) && empty($ref)) {
+	$action='create';
+}
+
+// Load object if id or ref is provided as parameter
+$object = new MyClass($db);
+if (($id > 0 || ! empty($ref)) && $action != 'add') {
+	$result = $object->fetch($id, $ref);
+	if ($result < 0) {
+		dol_print_error($db);
+	}
+}
+
+/*
+ * ACTIONS
+ *
+ * Put here all code to do according to value of "action" parameter
+ */
+
+if ($action == 'add') {
+	$myobject = new MyClass($db);
+	$myobject->prop1 = $_POST["field1"];
+	$myobject->prop2 = $_POST["field2"];
+	$result = $myobject->create($user);
+	if ($result > 0) {
+		// Creation OK
+	} {
+		// Creation KO
+		$mesg = $myobject->error;
+	}
+}
+
+/*
+ * VIEW
+ *
+ * Put here all code to build page
+ */
+
+llxHeader('', $langs->trans('MyPageName'), '');
+
+$form = new Form($db);
+
+// Put here content of your page
+// Example 1: Adding jquery code
+echo '<script type=application/javascript" language="javascript">
+	jQuery(document).ready(function() {
+		function init_myfunc()
+		{
+			jQuery("#myid")
+			.removeAttr(\'disabled\')
+			.attr(\'disabled\',\'disabled\');
+		}
+		init_myfunc();
+		jQuery("#mybutton").click(function() {
+			init_needroot();
+		});
+	});
+</script>';
+
+// Example 2: Adding links to objects
+// The class must extend CommonObject for this method to be available
+$somethingshown = $form->showLinkedObjectBlock($myobject);
+
+// End of page
+llxFooter();
diff --git a/htdocs/modulebuilder/template/phpdoc.dist.xml b/htdocs/modulebuilder/template/phpdoc.dist.xml
new file mode 100644
index 00000000000..7f9b9761bd1
--- /dev/null
+++ b/htdocs/modulebuilder/template/phpdoc.dist.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpdoc>
+    <title>MyModule</title>
+    <parser>
+        <target>build/phpdoc</target>
+        <encoding>utf8</encoding>
+        <markers>
+            <item>TODO</item>
+            <item>FIXME</item>
+        </markers>
+        <extensions>
+            <extension>php</extension>
+            <extension>css</extension>
+            <extension>js</extension>
+        </extensions>
+    </parser>
+    <transformer>
+        <target>doc/code/phpdoc</target>
+    </transformer>
+    <transformations>
+        <template name="responsive"/>
+    </transformations>
+    <files>
+        <directory>.</directory>
+        <ignore>build/*</ignore>
+        <ignore>dev/*</ignore>
+        <ignore>doc/*</ignore>
+        <ignore>vendor/*</ignore>
+    </files>
+</phpdoc>
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/scripts/myscript.php b/htdocs/modulebuilder/template/scripts/myscript.php
new file mode 100644
index 00000000000..468729c59f3
--- /dev/null
+++ b/htdocs/modulebuilder/template/scripts/myscript.php
@@ -0,0 +1,203 @@
+#!/usr/bin/env php
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    scripts/myscript.php
+ * \ingroup mymodule
+ * \brief   Example command line script.
+ *
+ * Put detailed description here.
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path = dirname(__FILE__) . '/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+	echo "Error: You are using PHP for CGI. To execute ";
+	echo $script_file;
+	echo " from command line, you must use PHP for CLI mode.\n";
+	exit;
+}
+
+// Global variables
+$version = '1.0.0';
+$error = 0;
+
+
+/*
+ * -------------------- YOUR CODE STARTS HERE --------------------
+ */
+/* Set this define to 0 if you want to allow execution of your script
+ * even if dolibarr setup is "locked to admin user only". */
+define('EVEN_IF_ONLY_LOGIN_ALLOWED', 0);
+
+/* Include Dolibarr environment
+ * Customize to your needs
+ */
+require_once $path . '../../../master.inc.php';
+/* After this $db, $conf, $langs, $mysoc, $user and other Dolibarr utility variables should be defined.
+ * Warning: this still requires a valid htdocs/conf.php file
+ */
+
+global $conf, $db, $langs, $mysoc, $user;
+
+// No timeout for this script
+@set_time_limit(0);
+
+// Set the default language
+//$langs->setDefaultLang('en_US');
+
+// Load translations for the default language
+$langs->load("main");
+
+/* User and permissions loading
+ * Loads user for login 'admin'.
+ * Comment out to run as anonymous user. */
+$result = $user->fetch('', 'admin');
+if (! $result > 0) {
+	dol_print_error('', $user->error);
+	exit;
+}
+$user->getrights();
+
+// Display banner and help
+echo "***** " . $script_file . " (" . $version . ") pid=" . getmypid() . " *****\n";
+dol_syslog($script_file . " launched with arg " . join(',', $argv));
+if (! isset($argv[1])) {
+	// Check parameters
+	echo "Usage: " . $script_file . " param1 param2 ...\n";
+	exit;
+}
+echo '--- start' . "\n";
+echo 'Argument 1=' . $argv[1] . "\n";
+echo 'Argument 2=' . $argv[2] . "\n";
+
+// Start database transaction
+$db->begin();
+
+// Examples for manipulating a class
+require_once '../class/myclass.class.php';
+$myobject = new MyClass($db);
+
+// Example for inserting creating object in database
+/*
+	dol_syslog($script_file . " CREATE", LOG_DEBUG);
+	$myobject->prop1 = 'value_prop1';
+	$myobject->prop2 = 'value_prop2';
+	$id = $myobject->create($user);
+	if ($id < 0) {
+		$error++;
+		dol_print_error($db, $myobject->error);
+	} else {
+		 echo "Object created with id=" . $id . "\n";
+	}
+ */
+
+// Example for reading object from database
+/*
+	dol_syslog($script_file . " FETCH", LOG_DEBUG);
+	$result = $myobject->fetch($id);
+	if ($result < 0) {
+		$error;
+		dol_print_error($db, $myobject->error);
+	} else {
+		echo "Object with id=" . $id . " loaded\n";
+	}
+ */
+
+// Example for updating object in database
+// ($myobject must have been loaded by a fetch before)
+/*
+	dol_syslog($script_file . " UPDATE", LOG_DEBUG);
+	$myobject->prop1 = 'newvalue_prop1';
+	$myobject->prop2 = 'newvalue_prop2';
+	$result = $myobject->update($user);
+	if ($result < 0) {
+		$error++;
+		dol_print_error($db, $myobject->error);
+	} else {
+		echo "Object with id " . $myobject->id . " updated\n";
+	}
+ */
+
+// Example for deleting object in database
+// ($myobject must have been loaded by a fetch before)
+/*
+	dol_syslog($script_file . " DELETE", LOG_DEBUG);
+	$result = $myobject->delete($user);
+	if ($result < 0) {
+		$error++;
+		dol_print_error($db, $myobject->error);
+	} else {
+		echo "Object with id " . $myobject->id . " deleted\n";
+	}
+ */
+
+// An example of a direct SQL read without using the fetch method
+/*
+	$sql = "SELECT field1, field2";
+	$sql.= " FROM " . MAIN_DB_PREFIX . "c_pays";
+	$sql.= " WHERE field3 = 'xxx'";
+	$sql.= " ORDER BY field1 ASC";
+
+	dol_syslog($script_file . " sql=" . $sql, LOG_DEBUG);
+	$resql=$db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num) {
+			while ($i < $num) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) {
+					// You can use here results
+					echo $obj->field1;
+					echo $obj->field2;
+				}
+				$i++;
+			}
+		}
+	} else {
+		$error++;
+		dol_print_error($db);
+	}
+ */
+
+
+/*
+ * --------------------- YOUR CODE ENDS HERE ----------------------
+ */
+
+// Error management
+if (! $error) {
+	$db->commit();
+	echo '--- end ok' . "\n";
+	$exit_status = 0; // UNIX no errors exit status
+} else {
+	echo '--- end error code=' . $error . "\n";
+	$db->rollback();
+	$exit_status = 1; // UNIX general error exit status
+}
+
+// Close database handler
+$db->close();
+
+// Return exit status code
+return $exit_status;
diff --git a/htdocs/modulebuilder/template/sql/data.sql b/htdocs/modulebuilder/template/sql/data.sql
new file mode 100644
index 00000000000..90e9e0ced2b
--- /dev/null
+++ b/htdocs/modulebuilder/template/sql/data.sql
@@ -0,0 +1,19 @@
+-- <one line to give the program's name and a brief idea of what it does.>
+-- Copyright (C) <year>  <name of author>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+INSERT INTO llx_mytable VALUES (
+	1, 1, 'mydata'
+);
diff --git a/htdocs/modulebuilder/template/sql/llx_mytable.key.sql b/htdocs/modulebuilder/template/sql/llx_mytable.key.sql
new file mode 100644
index 00000000000..56975f55a01
--- /dev/null
+++ b/htdocs/modulebuilder/template/sql/llx_mytable.key.sql
@@ -0,0 +1,17 @@
+-- <one line to give the program's name and a brief idea of what it does.>
+-- Copyright (C) <year>  <name of author>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ALTER TABLE llx_mytable ADD UNIQUE INDEX uk_fk_othertable (fk_othertable);
diff --git a/htdocs/modulebuilder/template/sql/llx_mytable.sql b/htdocs/modulebuilder/template/sql/llx_mytable.sql
new file mode 100644
index 00000000000..2ef08b7fca1
--- /dev/null
+++ b/htdocs/modulebuilder/template/sql/llx_mytable.sql
@@ -0,0 +1,22 @@
+-- <one line to give the program's name and a brief idea of what it does.>
+-- Copyright (C) <year>  <name of author>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+CREATE TABLE llx_mytable(
+	rowid INTEGER AUTO_INCREMENT PRIMARY KEY,
+	entity INTEGER DEFAULT 1 NOT NULL,
+	fk_othertable INTEGER NOT NULL,
+	name VARCHAR(189)
+);
diff --git a/htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql b/htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql
new file mode 100644
index 00000000000..6d5bb8155b1
--- /dev/null
+++ b/htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql
@@ -0,0 +1,15 @@
+-- <one line to give the program's name and a brief idea of what it does.>
+-- Copyright (C) <year>  <name of author>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php b/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
new file mode 100644
index 00000000000..3a310e48f66
--- /dev/null
+++ b/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
@@ -0,0 +1,291 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    test/functional/MyModuleFunctionalTest.php
+ * \ingroup mymodule
+ * \brief   Example Selenium test.
+ *
+ * Put detailed description here.
+ */
+
+namespace test\functional;
+
+use PHPUnit_Extensions_Selenium2TestCase_WebDriverException;
+
+/**
+ * Class MyModuleFunctionalTest
+ *
+ * Requires chromedriver for Google Chrome
+ * Requires geckodriver for Mozilla Firefox
+ *
+ * @fixme Firefox (Geckodriver/Marionette) support
+ * @todo Opera linux support
+ * @todo Windows support (IE, Google Chrome, Mozilla Firefox, Safari)
+ * @todo OSX support (Safari, Google Chrome, Mozilla Firefox)
+ *
+ * @package test\functional
+ */
+class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
+{
+	// TODO: move to a global configuration file?
+	/** @var string Base URL of the webserver under test */
+	protected static $base_url = 'http://dev.zenfusion.fr';
+	/**
+	 * @var string Dolibarr admin username
+	 * @see authenticate
+	 */
+	protected static $dol_admin_user = 'admin';
+	/**
+	 * @var string Dolibarr admin password
+	 * @see authenticate
+	 */
+	protected static $dol_admin_pass = 'admin';
+	/** @var int Dolibarr module ID */
+	private static $module_id = 500000; // TODO: autodetect?
+
+	/** @var array Browsers to test with */
+	public static $browsers = array(
+		array(
+			'browser' => 'Google Chrome on Linux',
+			'browserName' => 'chrome',
+			'sessionStrategy' => 'shared',
+			'desiredCapabilities' => array()
+		),
+		// Geckodriver does not keep the session at the moment?!
+		// XPath selectors also don't seem to work
+//        array(
+//            'browser' => 'Mozilla Firefox on Linux',
+//            'browserName' => 'firefox',
+//            'sessionStrategy' => 'shared',
+//            'desiredCapabilities' => array(
+//                'marionette' => true
+//            )
+//        )
+	);
+
+	/**
+	 * Helper function to select links by href
+	 *
+	 * @param $value
+	 * @return mixed
+	 */
+	protected function byHref($value)
+	{
+		$anchor = null;
+		$anchors = $this->elements($this->using('tag name')->value('a'));
+		foreach ($anchors as $anchor) {
+			if (strstr($anchor->attribute('href'), $value)) {
+				break;
+			}
+		}
+		return $anchor;
+	}
+
+	/**
+	 * Global test setup
+	 */
+	public static function setUpBeforeClass()
+	{
+	}
+
+	/**
+	 * Unit test setup
+	 */
+	public function setUp()
+	{
+		$this->setSeleniumServerRequestsTimeout(3600);
+		$this->setBrowserUrl(self::$base_url);
+	}
+
+	/**
+	 * Verify pre conditions
+	 */
+	protected function assertPreConditions()
+	{
+	}
+
+	/**
+	 * Handle Dolibarr authentication
+	 */
+	private function authenticate()
+	{
+		try {
+			if ($this->byId('login')) {
+				$login = $this->byId('username');
+				$login->clear();
+				$login->value('admin');
+				$password = $this->byId('password');
+				$password->clear();
+				$password->value('admin');
+				$this->byId('login')->submit();
+			}
+		} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
+			// Login does not exist. Assume we are already authenticated
+		}
+	}
+
+	/**
+	 * Test enabling developer mode
+	 */
+	public function testEnableDeveloperMode()
+	{
+		$this->url('/admin/const.php');
+		$this->authenticate();
+		$main_features_level_path='//input[@value="MAIN_FEATURES_LEVEL"]/following::input[@type="text"]';
+		$main_features_level = $this->byXPath($main_features_level_path);
+		$main_features_level->clear();
+		$main_features_level->value('2');
+		$this->byName('update')->click();
+		// Page reloaded, we need a new XPath
+		$main_features_level = $this->byXPath($main_features_level_path);
+		return $this->assertEquals('2', $main_features_level->value(), "MAIN_FEATURES_LEVEL value is 2");
+	}
+
+	/**
+	 * Test enabling the module
+	 *
+	 * @depends testEnableDeveloperMode
+	 */
+	public function testModuleEnabled()
+	{
+		$this->url('/admin/modules.php');
+		$this->authenticate();
+		$module_status_image_path='//a[contains(@href, "' . self::$module_id . '")]/img';
+		$module_status_image = $this->byXPath($module_status_image_path);
+		if (strstr($module_status_image->attribute('src'), 'switch_off.png')) {
+			// Enable the module
+			$this->byHref('modMyModule')->click();
+		} else {
+			// Disable the module
+			$this->byHref('modMyModule')->click();
+			// Reenable the module
+			$this->byHref('modMyModule')->click();
+		}
+		// Page reloaded, we need a new Xpath
+		$module_status_image = $this->byXPath($module_status_image_path);
+		return $this->assertContains('switch_on.png', $module_status_image->attribute('src'), "Module enabled");
+	}
+
+	/**
+	 * Test access to the configuration page
+	 *
+	 * @depends testModuleEnabled
+	 */
+	public function testConfigurationPage()
+	{
+		$this->url('/custom/mymodule/admin/setup.php');
+		$this->authenticate();
+		return $this->assertContains('mymodule/admin/setup.php', $this->url(), 'Configuration page');
+	}
+
+	/**
+	 * Test access to the about page
+	 *
+	 * @depends testConfigurationPage
+	 */
+	public function testAboutPage()
+	{
+		$this->url('/custom/mymodule/admin/about.php');
+		$this->authenticate();
+		return $this->assertContains('mymodule/admin/about.php', $this->url(), 'About page');
+	}
+
+	/**
+	 * Test about page is rendering Markdown
+	 *
+	 * @depends testAboutPage
+	 */
+	public function testAboutPageRendersMarkdownReadme()
+	{
+		$this->url('/custom/mymodule/admin/about.php');
+		$this->authenticate();
+		return $this->assertEquals(
+			'Dolibarr Module Template (aka My Module)',
+			$this->byTag('h1')->text(),
+			"Readme title"
+		);
+	}
+
+	/**
+	 * Test box is properly declared
+	 *
+	 * @depends testModuleEnabled
+	 */
+	public function testBoxDeclared()
+	{
+		$this->url('/admin/boxes.php');
+		$this->authenticate();
+		return $this->assertContains('mybox', $this->source(), "Box enabled");
+	}
+
+	/**
+	 * Test trigger is properly enabled
+	 *
+	 * @depends testModuleEnabled
+	 */
+	public function testTriggerDeclared()
+	{
+		$this->url('/admin/triggers.php');
+		$this->authenticate();
+		return $this->assertContains(
+			'interface_99_modMyModule_MyTrigger.class.php',
+			$this->byTag('body')->text(),
+			"Trigger declared"
+		);
+	}
+
+	/**
+	 * Test trigger is properly declared
+	 *
+	 * @depends testTriggerDeclared
+	 */
+	public function testTriggerEnabled()
+	{
+		$this->url('/admin/triggers.php');
+		$this->authenticate();
+		return $this->assertContains(
+			'tick.png',
+			$this
+				->byXPath('//td[text()="interface_99_modMyModule_MyTrigger.class.php"]/following::img')
+				->attribute('src'),
+			"Trigger enabled"
+		);
+	}
+
+	/**
+	 * Verify post conditions
+	 */
+	protected function assertPostConditions()
+	{
+	}
+
+	/**
+	 * Unit test teardown
+	 */
+	public function tearDown()
+	{
+	}
+
+	/**
+	 * Global test teardown
+	 */
+	public static function tearDownAfterClass()
+	{
+	}
+}
diff --git a/htdocs/modulebuilder/template/test/unit/MyClassTest.php b/htdocs/modulebuilder/template/test/unit/MyClassTest.php
new file mode 100644
index 00000000000..16016baf117
--- /dev/null
+++ b/htdocs/modulebuilder/template/test/unit/MyClassTest.php
@@ -0,0 +1,104 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    test/unit/MyClassTest.php
+ * \ingroup mymodule
+ * \brief   Example PHPUnit test.
+ *
+ * Put detailed description here.
+ */
+
+namespace test\unit;
+
+/**
+ * Class MyClassTest
+ * @package test\unit
+ */
+class MyClassTest extends \PHPUnit_Framework_TestCase
+{
+	/**
+	 * Global test setup
+	 */
+	public static function setUpBeforeClass()
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+	}
+
+	/**
+	 * Unit test setup
+	 */
+	protected function setUp()
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+	}
+
+	/**
+	 * Verify pre conditions
+	 */
+	protected function assertPreConditions()
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+	}
+
+	/**
+	 * A sample test
+	 */
+	public function testSomething()
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+		// TODO: test something
+		$this->assertTrue(true);
+	}
+
+	/**
+	 * Verify post conditions
+	 */
+	protected function assertPostConditions()
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+	}
+
+	/**
+	 * Unit test teardown
+	 */
+	protected function tearDown()
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+	}
+
+	/**
+	 * Global test teardown
+	 */
+	public static function tearDownAfterClass()
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+	}
+
+	/**
+	 * Unsuccessful test
+	 *
+	 * @param \Exception $e
+	 * @throws \Exception
+	 */
+	protected function onNotSuccessfulTest(\Exception $e)
+	{
+		fwrite(STDOUT, __METHOD__ . "\n");
+		throw $e;
+	}
+}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3278b685c80..4672d99b8ec 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2914,7 +2914,10 @@ img.boxhandle, img.boxclose {
     vertical-align: middle;
 }
 
-
+.modulebuilderbox {
+	border: 1px solid #888;
+	padding: 16px;
+}
 
 
 /*

From 1371af5f6682747594ce23b27fd97d3ab1a18666 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 May 2017 21:04:23 +0200
Subject: [PATCH 0750/1163] Work on modulebuilder template

---
 htdocs/modulebuilder/index.php                  | 7 +++----
 htdocs/modulebuilder/template/modulebuilder.txt | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 htdocs/modulebuilder/template/modulebuilder.txt

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 38339d643c1..844d1377b5d 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -49,11 +49,10 @@ $dircustom = $tmp[0];
 
 if ($dircustom && $action == 'initmodule' && $modulename)
 {
-    $srcfile = DOL_DOCUMENT_ROOT.'/modulebuilder/skeletons';
+    $srcfile = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
     $destfile = $dircustom.'/'.$modulename;
-    //$result = dolCopyDir($srcfile, $destfile, 0, 0);
-    
-    dol_mkdir($destfile);
+    $result = dolCopyDir($srcfile, $destfile, 0, 0);
+    //dol_mkdir($destfile);
     
     fopen($destfile, $mode)
     
diff --git a/htdocs/modulebuilder/template/modulebuilder.txt b/htdocs/modulebuilder/template/modulebuilder.txt
new file mode 100644
index 00000000000..4c726c35394
--- /dev/null
+++ b/htdocs/modulebuilder/template/modulebuilder.txt
@@ -0,0 +1,2 @@
+File to flag module build using official module template.
+When this file is present into a module directory, you can edit it with the module builder tool.
\ No newline at end of file

From c26d24e97d798bdc89f07857fbb67cc6ec559f13 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 May 2017 23:55:46 +0200
Subject: [PATCH 0751/1163] Work on module builder

---
 .tx/config                            |  24 +++-
 htdocs/langs/en_US/errors.lang        |   1 +
 htdocs/langs/en_US/modulebuilder.lang |  10 +-
 htdocs/modulebuilder/index.php        | 159 +++++++++++++++++++++-----
 4 files changed, 154 insertions(+), 40 deletions(-)

diff --git a/.tx/config b/.tx/config
index 010227f6e61..02ec4bc8b99 100644
--- a/.tx/config
+++ b/.tx/config
@@ -224,6 +224,18 @@ source_file = htdocs/langs/en_US/members.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.members]
+file_filter = htdocs/langs/<lang>/modulebuilder.lang
+source_file = htdocs/langs/en_US/modulebuilder.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
+[dolibarr.members]
+file_filter = htdocs/langs/<lang>/multicurrency.lang
+source_file = htdocs/langs/en_US/multicurrency.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.oauth]
 file_filter = htdocs/langs/<lang>/oauth.lang
 source_file = htdocs/langs/en_US/oauth.lang
@@ -350,18 +362,18 @@ source_file = htdocs/langs/en_US/users.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.withdrawals]
-file_filter = htdocs/langs/<lang>/withdrawals.lang
-source_file = htdocs/langs/en_US/withdrawals.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.website]
 file_filter = htdocs/langs/<lang>/website.lang
 source_file = htdocs/langs/en_US/website.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.withdrawals]
+file_filter = htdocs/langs/<lang>/withdrawals.lang
+source_file = htdocs/langs/en_US/withdrawals.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.workflow]
 file_filter = htdocs/langs/<lang>/workflow.lang
 source_file = htdocs/langs/en_US/workflow.lang
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 4f700109c33..79984981e87 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -165,6 +165,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
+ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index ef86062bbd0..81a34b66b85 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,4 +1,8 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tools give you utilites to build your own module.
-ModuleBuilderDesc2=Path were modules are generated (first alternative directory defined into %s): <strong>%s</strong>.
-They are detected when the file %s exists in root of module directory.
+ModuleBuilderDesc=This tools give you utilites to build or edit your own module.
+ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>. 
+ModuleBuilderDesc3=Modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
+NewModule=New module
+ModuleKey=Key for new module
+
+
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 844d1377b5d..6ad747a7694 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -31,6 +31,11 @@ $langs->load("other");
 
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
+$module=GETPOST('module');
+$tab=GETPOST('tab');
+if (empty($module)) $module='initmodule';
+if (empty($tab)) $tab='description';
+
 
 // Security check
 if (! $user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessforbidden('ModuleBuilderNotAllowed');
@@ -41,6 +46,7 @@ $modulename=dol_sanitizeFileName(GETPOST('modulename','alpha'));
 $tmp=explode(',', $dolibarr_main_document_root_alt);
 $dircustom = $tmp[0];
 
+$FILEFLAG='modulebuilder.txt';
 
 
 /*
@@ -54,8 +60,6 @@ if ($dircustom && $action == 'initmodule' && $modulename)
     $result = dolCopyDir($srcfile, $destfile, 0, 0);
     //dol_mkdir($destfile);
     
-    fopen($destfile, $mode)
-    
     if ($result > 0)
     {
         setEventMessages('ModuleInitialized', null);
@@ -71,9 +75,6 @@ if ($dircustom && $action == 'initmodule' && $modulename)
  * View
  */
 
-$socstatic=new Societe($db);
-
-
 llxHeader("",$langs->trans("ModuleBuilder"),"");
 
 
@@ -81,23 +82,6 @@ $text=$langs->trans("ModuleBuilder");
 
 print load_fiche_titre($text, '', 'title_setup');
 
-// Show description of content
-print $langs->trans("ModuleBuilderDesc").'<br>';
-print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $dircustom).'<br>';
-print '<br>';
-
-
-// New module
-print '<div class="modulebuilderbox">';
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="initmodule">';
-print '<input type="text" name="modulename" value="" placeholder="'.dol_escape_htmltag($langs->trans("ModuleName")).'">';
-print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("CreateNewModule")).'">';
-print '</form>';
-print '<div>';
-
-
 $listofmodules=array();
 /*
 if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// Entry for Module builder
@@ -107,16 +91,16 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
     {
         foreach ($dolibarr_main_document_root_alt as $diralt)
         {*/
-            $dirsincustom=dol_dir_list($dircustom);
+            $dirsincustom=dol_dir_list($dircustom, 'directories');
             
             if (is_array($dirsincustom) && count($dirsincustom) > 0)
             {
-                foreach ($dirsincustom as $dircustom)
+                foreach ($dirsincustom as $dircustomcursor)
                 {
-                    $fullname = $dircustom['fullname'];
-                    if (dol_is_file($fullname.'/modulebuilder.txt'))
+                    $fullname = $dircustomcursor['fullname'];
+                    if (dol_is_file($fullname.'/'.$FILEFLAG))
                     {
-                        $listofmodules[$module]=$fullname;
+                        $listofmodules[$dircustomcursor['name']]=$fullname;
                     }
                 }
             }
@@ -127,11 +111,124 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
         $newmenu->add('', 'NoGeneratedModuleFound', 0, 0);
     }*/
 
-foreach($listofmodules as $modules => $fullname)
-{
-    print '<div class="modulebuilderbox>'.$module.'</div>';
-}
             
+// Show description of content
+print $langs->trans("ModuleBuilderDesc").'<br>';
+print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $dircustom).'<br>';
+print $langs->trans("ModuleBuilderDesc3", count($listofmodules), $FILEFLAG).'<br>';
+print '<br>';
+            
+            
+print '<br>';            
+
+$head = array();
+$h=0;
+
+$head[$h][0] = $_SERVER["PHP_SELF"].'?module=initmodule';
+$head[$h][1] = $langs->trans("NewModule");
+$head[$h][2] = 'initmodule';
+$h++;
+    
+foreach($listofmodules as $tmpmodule => $fullname)
+{
+    $head[$h][0] = $_SERVER["PHP_SELF"].'?module='.$tmpmodule;
+    $head[$h][1] = $tmpmodule;
+    $head[$h][2] = $tmpmodule;
+    $h++;
+}
+
+
+
+dol_fiche_head($head, $module, $langs->trans("Modules"), -1, 'generic');
+
+if ($module == 'initmodule')
+{
+    // New module
+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="initmodule">';
+    print '<input type="hidden" name="module" value="initmodule">';
+    print '<input type="text" name="modulename" value="" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'">';
+    print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
+    print '</form>';
+}
+elseif (! empty($module))
+{
+    $error=0;
+    
+    // Load module
+    dol_include_once($module.'/core/modules/mod'.ucfirst($module).'.class.php');
+    $class='mod'.ucfirst($module);
+    if (class_exists($class))
+    {
+        try {
+            $moduleobj = new $class($db);
+        }
+        catch(Exception $e)
+        {
+            $error++;
+            print $e->getMessage();
+        }
+    }
+    else
+    {
+        $error++;
+        $langs->load("errors");
+        print img_warning('').' '.$langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module);
+    }
+    
+    // Button to delete module
+    
+    
+    // Tabs for module
+    if (! $error)
+    {
+        $head2 = array();
+        $h=0;
+        
+        foreach($listofmodules as $tmpmodule => $fullname)
+        {
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description';
+            $head2[$h][1] = $langs->trans("Description");
+            $head2[$h][2] = 'description';
+            $h++;
+            
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects';
+            $head2[$h][1] = $langs->trans("Objects");
+            $head2[$h][2] = 'objects';
+            $h++;        
+        
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab='.$tmpmodule;
+            $head2[$h][1] = $langs->trans("Menus");
+            $head2[$h][2] = 'menus';
+            $h++;
+            
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab='.$tmpmodule;
+            $head2[$h][1] = $langs->trans("Permissions");
+            $head2[$h][2] = 'permissions';
+            $h++;        
+    
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab='.$tmpmodule;
+            $head2[$h][1] = $langs->trans("Triggers");
+            $head2[$h][2] = 'triggers';
+            $h++;        
+        }
+        
+        dol_fiche_head($head2, $tab, '', -1, '');
+        
+        print $moduleobj->getDescLong();
+    
+        
+        
+        
+        
+        dol_fiche_end();
+    }
+}
+
+dol_fiche_end();
+
+
 
 llxFooter();
 

From 05d6c2cd75fd968fad33f1407a3972dcc4276dac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 01:36:20 +0200
Subject: [PATCH 0752/1163] Fix no more use of constant

---
 htdocs/admin/tools/purge.php      | 4 ++--
 htdocs/core/class/utils.class.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index 170c37a79bf..e913d59a4a7 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2006-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2006-2017	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2006-2012	Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@ $choice=GETPOST('choice');
 $filelog='';
 if (! empty($conf->syslog->enabled))
 {
-	$filelog=SYSLOG_FILE;
+	$filelog=$conf->global->SYSLOG_FILE;
 	$filelog=preg_replace('/DOL_DATA_ROOT/i',DOL_DATA_ROOT,$filelog);
 }
 
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 4e3cf7a0928..3a35bfb2cc2 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -94,7 +94,7 @@ class Utils
 			$filelog='';
 			if (! empty($conf->syslog->enabled))
 			{
-				$filelog=SYSLOG_FILE;
+				$filelog=$conf->global->SYSLOG_FILE;
 				$filelog=preg_replace('/DOL_DATA_ROOT/i',DOL_DATA_ROOT,$filelog);
 			}
 

From 9fe28c9b2cd770a064f628cc2e298361e3a395c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 10:08:04 +0200
Subject: [PATCH 0753/1163] NEW Can disable all overwrote translations in one
 click.

---
 htdocs/admin/translation.php                  | 24 +++++++++++++++++++
 htdocs/core/class/translate.class.php         |  9 +++++--
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 ++
 htdocs/langs/en_US/admin.lang                 |  1 +
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 75f151d45b9..c51d1c2435d 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -79,6 +79,12 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
     $search_array_options=array();
 }
 
+if ($action == 'setMAIN_ENABLE_OVERWRITE_TRANSLATION')
+{
+    if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 1, 'chaine', 0, '', $conf->entity);
+    else dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 0, 'chaine', 0, '', $conf->entity);
+}
+
 if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 {
 	$error=0;
@@ -169,6 +175,24 @@ print $langs->trans("CurrentUserLanguage").': <strong>'.$s.' '.$current_language
 
 print '<br>';
 
+print $langs->trans("EnableOverwriteTranslation").' ';
+if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
+{
+    // Button off, click to enable
+    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&amp;value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
+    print '</a>';
+}
+else
+{
+    // Button on, click to disable
+    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&amp;value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
+    print '</a>';
+}
+
+print '<br><br>';
+
 $param='&mode='.$mode;
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 0f2e6a837ef..88b001ba093 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -297,7 +297,12 @@ class Translate
 												$tabtranslatedomain[$key] = $value;
 											}
 										}
-									} else {
+									}
+									elseif ($key[0] == '#')
+									{
+									    continue;
+									}
+									else {
 										$this->tab_translate[$key] = $value;
 										//if ($domain == 'orders') print "$tab[0] value $value<br>";
 										if ($usecachekey) {
@@ -459,7 +464,7 @@ class Translate
 			}
 		}
 
-		if (! $found)
+		if (! $found && ! empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
 		{
     		// Overwrite translation with database read
             $sql="SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$this->defaultlang."'";            
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index d96210dcbfe..d2431186ed7 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -158,6 +158,8 @@ INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('CONTRA
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USERGROUP_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/usergroups', 'chaine', 0, '');
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USER_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0, '');
 
+INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('MAIN_ENABLE_OVERWRITE_TRANSLATION', 1, '1', 'chaine', 0, 'Enable overwrote of translation');
+
 ALTER TABLE llx_chargesociales ADD COLUMN ref varchar(16);
 ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 5fd5cb57c8b..71e5b614abb 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -434,6 +434,7 @@ PageUrlForDefaultValues=You must enter here the relative url of the page. If you
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
+EnableOverwriteTranslation=Enable usage of overwrote translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
 WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior. 
 Field=Field

From 63259295c6dff9eacd24a5280b0323f52b336fed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 10:19:39 +0200
Subject: [PATCH 0754/1163] Look and feel v6

---
 htdocs/user/card.php                  |  4 --
 htdocs/user/class/usergroup.class.php | 28 +++++++++++++-
 htdocs/user/group/card.php            | 40 +++++++------------
 htdocs/user/group/ldap.php            | 45 +++++++++++-----------
 htdocs/user/group/perms.php           | 55 ++++++++++++++-------------
 5 files changed, 93 insertions(+), 79 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 675f5748842..3682088b552 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1716,8 +1716,6 @@ else
                  */
                 if (! empty($groupslist))
                 {
-                    $var=true;
-
                     foreach($groupslist as $group)
                     {
                         
@@ -2360,8 +2358,6 @@ else
             $genallowed = $user->rights->user->user->creer;
             $delallowed = $user->rights->user->user->supprimer;
     
-            $var = true;
-    
             $somethingshown = $formfile->show_documents('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
     
     		// Show links to link elements
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 907c0cef40d..cd9a16ea2b9 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -37,8 +37,9 @@ class UserGroup extends CommonObject
 	public $element='usergroup';
 	public $table_element='usergroup';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-
+    public $picto='group';
 	public $entity;		// Entity of group
+	
 	/**
 	 * @deprecated
 	 * @see name
@@ -744,6 +745,31 @@ class UserGroup extends CommonObject
 	}
 
 
+	/**
+	 *  Return label of status of user (active, inactive)
+	 *
+	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return	string 			       Label of status
+	 */
+	function getLibStatut($mode=0)
+	{
+	    return $this->LibStatut(0,$mode);
+	}
+	
+	/**
+	 *  Renvoi le libelle d'un statut donne
+	 *
+	 *  @param	int		$statut        	Id statut
+	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return string 			       	Label of status
+	 */
+	function LibStatut($statut,$mode=0)
+	{
+	    global $langs;
+	    $langs->load('users');
+	    return '';
+	}
+	    
 	/**
 	 *	Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
 	 *
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index eacb954e007..bbcbd38c168 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -314,19 +314,17 @@ else
 
 		if ($action != 'edit')
 		{
-        	dol_fiche_head($head, 'group', $title, 0, 'group');
+        	dol_fiche_head($head, 'group', $title, -1, 'group');
 
-			print '<table class="border" width="100%">';
-
-			// Ref
-			print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td>';
-			print '<td>';
-			print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
-			print '</td>';
-			print '</tr>';
+			dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+			
+			print '<div class="fichecenter">';
+			print '<div class="underbanner clearboth"></div>';
+			
+        	print '<table class="border" width="100%">';
 
 			// Name
-			print '<tr><td>'.$langs->trans("Name").'</td>';
+			print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
 			print '<td class="valeur">'.$object->name;
 			if (empty($object->entity))
 			{
@@ -357,7 +355,8 @@ else
             }
 
 			print "</table>\n";
-
+            print '</div>';
+            
 			dol_fiche_end();
 
 
@@ -377,11 +376,8 @@ else
 			}
 
 			print "</div>\n";
-			print "<br>\n";
 
-            /*
-             * Liste des utilisateurs dans le groupe
-             */
+            // List users in group
 
             print load_fiche_titre($langs->trans("ListOfUsersInGroup"),'','');
 
@@ -450,8 +446,6 @@ else
 
             if (! empty($object->members))
             {
-            	$var=True;
-
             	foreach($object->members as $useringroup)
             	{
             		
@@ -513,17 +507,11 @@ else
 	        $genallowed = $user->rights->user->user->creer;
 	        $delallowed = $user->rights->user->user->supprimer;
 	
-	        $var = true;
-	
 	        $somethingshown = $formfile->show_documents('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 	
-			// Linked object block
-			$somethingshown = $form->showLinkedObjectBlock($object);
-	
-			// Show links to link elements
-			$linktoelem = $form->showLinkToObjectBlock($object);
-			if ($linktoelem) print '<br>'.$linktoelem;
-	
+	        // Show links to link elements
+	        $linktoelem = $form->showLinkToObjectBlock($object, null, null);
+	        $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 	
 	        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 	
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index bf39a128137..2ced8e11d4b 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -45,9 +45,9 @@ $action = GETPOST('action', 'alpha');
 $socid=0;
 if ($user->societe_id > 0) $socid = $user->societe_id;
 
-$fgroup = new Usergroup($db);
-$fgroup->fetch($id);
-$fgroup->getrights();
+$object = new Usergroup($db);
+$object->fetch($id);
+$object->getrights();
 
 
 /*
@@ -61,12 +61,12 @@ if ($action == 'dolibarr2ldap')
 	$ldap=new Ldap();
 	$result=$ldap->connect_bind();
 
-	$info=$fgroup->_load_ldap_info();
+	$info=$object->_load_ldap_info();
 	// Get a gid number for objectclass PosixGroup
 	if(in_array('posixGroup',$info['objectclass']))
 		$info['gidNumber'] = $ldap->getNextGroupGid();
 
-	$dn=$fgroup->_load_ldap_dn($info);
+	$dn=$object->_load_ldap_dn($info);
 	$olddn=$dn;	// We can say that old dn = dn as we force synchro
 
 	$result=$ldap->update($dn,$info,$user,$olddn);
@@ -93,23 +93,21 @@ llxHeader();
 $form = new Form($db);
 
 
-$head = group_prepare_head($fgroup);
+$head = group_prepare_head($object);
 
-dol_fiche_head($head, 'ldap', $langs->trans("Group"), 0, 'group');
+dol_fiche_head($head, 'ldap', $langs->trans("Group"), -1, 'group');
+
+dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+ 
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 
 print '<table class="border" width="100%">';
 
-// Ref
-print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
-print '<td colspan="2">';
-print $form->showrefnav($fgroup,'id','',$canreadperms);
-print '</td>';
-print '</tr>';
-
 // Name
-print '<tr><td width="25%">'.$langs->trans("Name").'</td>';
-print '<td width="75%" class="valeur">'.$fgroup->name;
-if (!$fgroup->entity)
+print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
+print '<td class="valeur">'.$object->name;
+if (!$object->entity)
 {
 	print img_picto($langs->trans("GlobalGroup"),'redstar');
 }
@@ -117,7 +115,7 @@ print "</td></tr>\n";
 
 // Note
 print '<tr><td width="25%" class="tdtop">'.$langs->trans("Note").'</td>';
-print '<td class="valeur">'.nl2br($fgroup->note).'&nbsp;</td>';
+print '<td class="valeur">'.nl2br($object->note).'&nbsp;</td>';
 print "</tr>\n";
 
 $langs->load("admin");
@@ -137,6 +135,9 @@ print "</table>\n";
 
 print '</div>';
 
+dol_fiche_end();
+
+
 /*
  * Barre d'actions
  */
@@ -145,7 +146,7 @@ print '<div class="tabsAction">';
 
 if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
 {
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$fgroup->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
 print "</div>\n";
@@ -169,9 +170,9 @@ $ldap=new Ldap();
 $result=$ldap->connect_bind();
 if ($result > 0)
 {
-	$info=$fgroup->_load_ldap_info();
-	$dn=$fgroup->_load_ldap_dn($info,1);
-	$search = "(".$fgroup->_load_ldap_dn($info,2).")";
+	$info=$object->_load_ldap_info();
+	$dn=$object->_load_ldap_dn($info,1);
+	$search = "(".$object->_load_ldap_dn($info,2).")";
 	$records = $ldap->getAttribute($dn,$search);
 
 	//var_dump($records);
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 50b1bc56c5e..5262857afb2 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -82,16 +82,16 @@ llxHeader('',$langs->trans("Permissions"));
 
 if ($id)
 {
-    $fgroup = new Usergroup($db);
-    $fgroup->fetch($id);
-    $fgroup->getrights();
+    $object = new Usergroup($db);
+    $object->fetch($id);
+    $object->getrights();
 
     /*
      * Affichage onglets
      */
-    $head = group_prepare_head($fgroup);
+    $head = group_prepare_head($object);
     $title = $langs->trans("Group");
-    dol_fiche_head($head, 'rights', $title, 0, 'group');
+    dol_fiche_head($head, 'rights', $title, -1, 'group');
 
     // Charge les modules soumis a permissions
     $modules = array();
@@ -127,7 +127,7 @@ if ($id)
                         // Load all permissions
                         if ($objMod->rights_class)
                         {
-                        	$entity=((! empty($conf->multicompany->enabled) && ! empty($fgroup->entity)) ? $fgroup->entity : null);
+                        	$entity=((! empty($conf->multicompany->enabled) && ! empty($object->entity)) ? $object->entity : null);
                             $ret=$objMod->insert_permissions(0, $entity);
                             $modules[$objMod->rights_class]=$objMod;
                         }
@@ -150,7 +150,7 @@ if ($id)
     {
         if (empty($conf->multicompany->transverse_mode))
         {
-        	$sql.= " AND r.entity = ".$fgroup->entity;
+        	$sql.= " AND r.entity = ".$object->entity;
         }
         else
         {
@@ -162,7 +162,7 @@ if ($id)
     	$sql.= " AND r.entity IN (0,".$conf->entity.")";
     }
 
-    $sql.= " AND ugr.fk_usergroup = ".$fgroup->id;
+    $sql.= " AND ugr.fk_usergroup = ".$object->id;
 
     $result=$db->query($sql);
 
@@ -183,32 +183,31 @@ if ($id)
         dol_print_error($db);
     }
 
-
+    
+    
+    dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+     
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
+     
     /*
      * Ecran ajout/suppression permission
      */
 
     print '<table class="border" width="100%">';
 
-    // Ref
-    print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
-    print '<td colspan="2">';
-    print $form->showrefnav($fgroup,'id','',$user->rights->user->user->lire || $user->admin);
-    print '</td>';
-    print '</tr>';
-
     // Nom
-    print '<tr><td width="25%">'.$langs->trans("Name").'</td>';
-    print '<td colspan="2">'.$fgroup->name.'';
-    if (! $fgroup->entity)
+    print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
+    print '<td colspan="2">'.$object->name.'';
+    if (! $object->entity)
     {
         print img_picto($langs->trans("GlobalGroup"),'redstar');
     }
     print "</td></tr>\n";
 
     // Note
-    print '<tr><td width="25%" class="tdtop">'.$langs->trans("Note").'</td>';
-    print '<td class="valeur">'.dol_htmlentitiesbr($fgroup->note).'</td>';
+    print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
+    print '<td class="valeur">'.dol_htmlentitiesbr($object->note).'</td>';
     print "</tr>\n";
 
     print '</table><br>';
@@ -230,7 +229,7 @@ if ($id)
     {
         if (empty($conf->multicompany->transverse_mode))
         {
-        	$sql.= " AND r.entity = ".$fgroup->entity;
+        	$sql.= " AND r.entity = ".$object->entity;
         }
         else
         {
@@ -280,9 +279,9 @@ if ($id)
                     print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName();
                     print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';
                     print '<td align="center" class="nowrap">';
-                    print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="perms.php?id='.$fgroup->id.'&amp;action=addrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
+                    print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="perms.php?id='.$object->id.'&amp;action=addrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
                     print '/';
-                    print '<a title='.$langs->trans("None").' alt='.$langs->trans("None").' href="perms.php?id='.$fgroup->id.'&amp;action=delrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
+                    print '<a title='.$langs->trans("None").' alt='.$langs->trans("None").' href="perms.php?id='.$object->id.'&amp;action=delrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
                     print '</td>';
                     print '<td colspan="2">&nbsp;</td>';
                     print '</tr>';
@@ -299,7 +298,7 @@ if ($id)
                 // Own permission by group
                 if ($caneditperms)
                 {
-                    print '<td align="center"><a class="reposition" href="perms.php?id='.$fgroup->id.'&amp;action=delrights&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
+                    print '<td align="center"><a class="reposition" href="perms.php?id='.$object->id.'&amp;action=delrights&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
                 }
                 print '<td align="center">';
                 print img_picto($langs->trans("Active"),'tick');
@@ -310,7 +309,7 @@ if ($id)
                 // Do not own permission
                 if ($caneditperms)
                 {
-                    print '<td align="center"><a class="reposition" href="perms.php?id='.$fgroup->id.'&amp;action=addrights&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+                    print '<td align="center"><a class="reposition" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
                 }
                 print '<td>&nbsp</td>';
             }
@@ -324,6 +323,10 @@ if ($id)
         }
     }
     print '</table>';
+    
+    print '</div>';
+    
+    dol_fiche_end();
 }
 
 llxFooter();

From cf04e5a6e0c7bb501d31f970e81bfa88ae357162 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 10:45:49 +0200
Subject: [PATCH 0755/1163] Fix duplicate id

---
 htdocs/core/modules/modCollab.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
index 490caeccea2..506eb99b540 100644
--- a/htdocs/core/modules/modCollab.class.php
+++ b/htdocs/core/modules/modCollab.class.php
@@ -46,7 +46,7 @@ class modCollab extends DolibarrModules
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
         $this->family = "portal";
-        $this->module_position = 50;
+        $this->module_position = 51;
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
         $this->name = preg_replace('/^mod/i','',get_class($this));
         $this->description = "Enable the public collaboration features, like shared pad, shared online sheets, etc...";
@@ -87,7 +87,7 @@ class modCollab extends DolibarrModules
 
 		// Permissions
 		$this->rights = array();		// Permission array used by this module
-		$this->rights_class = 'websites';
+		$this->rights_class = 'collab';
 		$r=0;
 
 		/*$this->rights[$r][0] = 30001;

From 081d0e7ec25a17f89d60cf95504833bb75fafa3b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 11:09:21 +0200
Subject: [PATCH 0756/1163] Debug module RH. Edition of user bank account is
 ok.

---
 htdocs/core/lib/usergroups.lib.php          |  2 +-
 htdocs/user/bank.php                        | 41 +++++++++++++--------
 htdocs/user/class/userbankaccount.class.php | 10 +++--
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 3b3cde1d66a..d983f799c0d 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -145,7 +145,7 @@ function user_prepare_head($object)
     {
 		// Bank
     	$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("Bank");
+    	$head[$h][1] = $langs->trans("BankAccounts");
     	$head[$h][2] = 'bank';
     	$h++;
 	}
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 9f36bc91e31..c86ca27bf34 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -38,7 +38,9 @@ $langs->load("banks");
 $langs->load("bills");
 
 $id = GETPOST('id','int');
-$action = GETPOST("action");
+$bankid = GETPOST('bankid','int');
+$action = GETPOST("action",'alpha');
+$cancel = GETPOST('cancel','alpha');
 
 // Security check
 $socid=0;
@@ -54,16 +56,17 @@ if ($id > 0 || ! empty($ref))
 	$object->getrights();
 }
 
+
 /*
  *	Actions
  */
 
-if ($action == 'update' && ! $_POST["cancel"])
+if ($action == 'update' && ! $cancel)
 {
 	// Modification
 	$account = new UserBankAccount($db);
 
-    $account->fetch($id);
+    $account->fetch($bankid);
 
     $account->userid          = $object->id;
 
@@ -82,54 +85,62 @@ if ($action == 'update' && ! $_POST["cancel"])
 	$account->owner_address   = $_POST["owner_address"];
 
 	$result = $account->update($user);
-	if (! $result)
+
+    if (! $result)
 	{
 		setEventMessages($account->error, $account->errors, 'errors');
-		$_GET["action"]='edit';     // Force chargement page edition
+		$action='edit';     // Force chargement page edition
 	}
 	else
 	{
-		$url=DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
+		$url=DOL_URL_ROOT.'/user/bank.php?id='.$object->id.'&bankid='.$bankid;
         header('Location: '.$url);
         exit;
 	}
 }
 
+
 /*
  *	View
  */
 
 $form = new Form($db);
 
-llxHeader();
+llxHeader(null, $langs->trans("BankAccounts"));
 
 $head = user_prepare_head($object);
 
 $account = new UserBankAccount($db);
-if (! $id)
-    $account->fetch(0,$object->id);
+if (! $bankid)
+{
+    $account->fetch(0, '', $id);
+}
 else
-    $account->fetch($id);
+{
+    $account->fetch($bankid);
+}
 if (empty($account->userid)) $account->userid=$object->id;
 
 
-if ($id && $action == 'edit' && $user->rights->user->user->creer)
+if ($bankid && $action == 'edit' && $user->rights->user->user->creer)
 {
     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="update">';
     print '<input type="hidden" name="id" value="'.GETPOST("id",'int').'">';
+    print '<input type="hidden" name="bankid" value="'.$bankid.'">';
 }
-if ($id && $action == 'create' && $user->rights->user->user->creer)
+if ($bankid && $action == 'create' && $user->rights->user->user->creer)
 {
     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
+    print '<input type="hidden" name="bankid" value="'.$bankid.'">';
 }
 
 
 // View
-if ($id && $action != 'edit')
+if ($account->id && $action != 'edit')
 {
 	$title = $langs->trans("User");
 	dol_fiche_head($head, 'bank', $title, -1, 'user');
@@ -223,7 +234,7 @@ if ($id && $action != 'edit')
 
 	if ($user->rights->user->user->creer)
 	{
-		print '<a class="butAction" href="bank.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Edit").'</a>';
+		print '<a class="butAction" href="bank.php?id='.$object->id.'&bankid='.$account->id.'&action=edit">'.$langs->trans("Edit").'</a>';
 	}
 
 	print '</div>';
@@ -309,8 +320,6 @@ if ($id && $action == 'edit' && $user->rights->user->user->creer)
     print '</div>';
 }
 
-if ($id && $action == 'edit' && $user->rights->user->user->creer) print '</form>';
-
 if ($id && $action == 'edit' && $user->rights->user->user->creer) print '</form>';
     
 llxFooter();
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 514e8d0b28c..a7aba35fc64 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -132,16 +132,20 @@ class UserBankAccount extends Account
      * 	Load record from database
      *
      *	@param	int		$id			Id of record
+     *	@param	string	$ref		Ref of record
+     *  @param  int     $userid     User id
      * 	@return	int					<0 if KO, >0 if OK
      */
-    function fetch($id)
+    function fetch($id, $ref='', $userid=0)
     {
-        if (empty($id)) return -1;
+        if (empty($id) && empty($ref) && empty($userid)) return -1;
 
         $sql = "SELECT rowid, fk_user, entity, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
         $sql.= " owner_address, label, datec, tms as datem";
         $sql.= " FROM ".MAIN_DB_PREFIX."user_rib";
-        $sql.= " WHERE rowid = ".$id;
+        if ($id) $sql.= " WHERE rowid = ".$id;
+        if ($ref) $sql.= " WHERE label = '".$this->db->escape($ref)."'";
+        if ($userid) $sql.= " WHERE fk_user = '".$userid."'";
 
         $resql = $this->db->query($sql);
         if ($resql)

From 651ea926571ecc954c2caa3c5a109d7462e94945 Mon Sep 17 00:00:00 2001
From: alexis portable <alexis@atm-consulting.fr>
Date: Tue, 9 May 2017 14:26:47 +0200
Subject: [PATCH 0757/1163] NEW fix listview class and add a demo for product
 list

---
 htdocs/product/inventory/listview.class.php | 221 +++---
 htdocs/product/list-with-listview.php       | 702 ++++++++++++++++++++
 2 files changed, 834 insertions(+), 89 deletions(-)
 create mode 100644 htdocs/product/list-with-listview.php

diff --git a/htdocs/product/inventory/listview.class.php b/htdocs/product/inventory/listview.class.php
index 51855629686..1c03d0b524f 100644
--- a/htdocs/product/inventory/listview.class.php
+++ b/htdocs/product/inventory/listview.class.php
@@ -39,6 +39,8 @@ class Listview
 		$this->form = null;
 		$this->totalRowToShow=0;
 		$this->totalRow=0;
+		
+		$this->TField=array();
 	}
 
     /**
@@ -70,14 +72,15 @@ class Listview
 			,'head_search'=>''
 			,'export'=>array()
 			,'view_type'=>''
+			,'massactions'=>array()
 		),$TParam['list']);
 		
 		if (empty($TParam['limit'])) $TParam['limit'] = array();
 		
 		$page = GETPOST('page');
-		if (!empty($page)) $TParam['limit']['page'] = $page+1; // TODO dolibarr start page at 0 instead 1
+		if (!empty($page)) $TParam['limit']['page'] = $page;
 		
-		$TParam['limit'] = array_merge(array('page'=>1, 'nbLine' => $conf->liste_limit, 'global'=>0), $TParam['limit']);
+		$TParam['limit'] = array_merge(array('page'=>0, 'nbLine' => $conf->liste_limit, 'global'=>0), $TParam['limit']);
 		
 		if (GETPOST('sortfield'))
 		{
@@ -137,17 +140,6 @@ class Listview
 		
 		return $TKey;
 	}
-
-    /**
-     * @param timestamp    $date   date to convert
-     * @return int|string   Date TMS or ''
-     */
-    private function dateToSQLDate($date)
-    {
-		return $this->db->idate($date);
-	}
-
-
     /**
      * @param string     $TSQLMore   contain some additional sql instructions
      * @param string    $value      date with read format
@@ -160,13 +152,11 @@ class Listview
 			$TSQLDate=array();
 			if(!empty($value['start']))
 			{
-//				$valueDeb = $this->dateToSQLDate($value['start'].' 00:00:00');
 				$TSQLDate[]=$sKey." >= '".$value['start']."'" ;
 			}
 
 			if(!empty($value['end']))
 			{
-//				$valueFin = $this->dateToSQLDate($value['end'].' 23:59:59');
 				$TSQLDate[]=$sKey." <= '".$value['end']."'" ;
 			}
 
@@ -174,7 +164,6 @@ class Listview
 		}
 		else
 		{
-//			$value = $this->dateToSQLDate($value);
 			$TSQLMore[]=$sKey." LIKE '".$value."%'" ;
 		}
 	}
@@ -227,9 +216,7 @@ class Listview
      */
     private function search($sql, &$TParam)
     {
-		$ListPOST = GETPOST('Listview');
-		
-		if (!GETPOST("button_removefilter_x") && !GETPOST("button_removefilter.x") && !GETPOST("button_removefilter"))
+		if (empty($TParam['no-auto-sql-search']) && !GETPOST("button_removefilter_x") && !GETPOST("button_removefilter.x") && !GETPOST("button_removefilter"))
 		{
 			foreach ($TParam['search'] as $field => $info)
 			{
@@ -237,12 +224,14 @@ class Listview
 				$TSQLMore = array();
 				$allow_is_null = $this->getSearchNull($field,$TParam);
 				
+				$fieldname = !empty($info['fieldname']) ? $info['fieldname'] : 'Listview_'.$this->id.'_search_'.$field;
+				
 				foreach ($TsKey as $i => &$sKey)
 				{
-					$value = '';
-					if (isset($ListPOST[$this->id]['search'][$field])) $value = $ListPOST[$this->id]['search'][$field];
+					$value = GETPOST($fieldname);
+					$value_null = GETPOST('Listview_'.$this->id.'_search_on_null_'.$field);
 					
-					if ($allow_is_null && !empty($ListPOST[$this->id]['search_on_null'][$field]))
+					if ($allow_is_null && !empty($value_null))
 					{
 						$TSQLMore[] = $sKey.' IS NULL ';
 						$value = '';
@@ -250,7 +239,7 @@ class Listview
 					
 					if (isset($TParam['type'][$field]) && ($TParam['type'][$field]==='date' || $TParam['type'][$field]==='datetime'))
 					{
-						$k = 'Listview_'.$this->id.'_search_'.$field;
+						$k = $fieldname;
 						if ($info['search_type'] === 'calendars')
 						{
 							$value = array();
@@ -296,25 +285,22 @@ class Listview
     {
         global $conf;
         
-		$TField=array();
+        $TField= & $this->TField;
 		
 		$this->init($TParam);
 
         $THeader = $this->initHeader($TParam);
 		
 		$sql = $this->search($sql,$TParam);
-		$sql.= $this->db->order($TParam['param']['sortfield'], $TParam['param']['sortorder']);
-
-		$nbtotalofrecords = '';
+		$sql.= $this->db->order($TParam['sortfield'], $TParam['sortorder']);
+	
 		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 		{
 		    $result = $this->db->query($sql);
-		    $nbtotalofrecords = $this->db->num_rows($result);
+		    $this->totalRow = $this->db->num_rows($result);
 		}
-		$sql.= $this->db->plimit($TParam['param']['limit'] + 1, $TParam['param']['offset']);
 		
 		$this->parse_sql($THeader, $TField, $TParam, $sql);
-		
 		list($TTotal, $TTotalGroup)=$this->get_total($TField, $TParam);
 		
 		return $this->renderList($THeader, $TField, $TTotal, $TTotalGroup, $TParam);
@@ -335,44 +321,42 @@ class Listview
 		
 		$nb_search_in_bar = 0;
 		
-		if(!empty($TParam['search']))
+		foreach($THeader as $key => $libelle)
 		{
-			foreach($THeader as $key => $libelle)
-			{
-				if(empty($TSearch[$key]))$TSearch[$key]='';
-			}
-		}	
+			if(empty($TSearch[$key]))$TSearch[$key]='';
+		}
 		
-		$ListPOST = GETPOST('Listview');
 		$removeFilter = (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter"));
 		foreach($TParam['search'] as $key => $param_search)
 		{
-			$value = isset($ListPOST[$this->id]['search'][$key]) ? $ListPOST[$this->id]['search'][$key] : '';
 			if ($removeFilter) $value = '';
 			
 			$typeRecherche = (is_array($param_search) && isset($param_search['search_type'])) ? $param_search['search_type'] : $param_search;  
 			
+			$fieldname = !empty($param_search['fieldname']) ? $param_search['fieldname'] : 'Listview_'.$this->id.'_search_'.$key;
+			$value = $removeFilter ? '' : GETPOST($fieldname);
+			
 			if(is_array($typeRecherche))
 			{
-				$fsearch=$form->selectarray('Listview['.$this->id.'][search]['.$key.']', $typeRecherche,$value,1);
+				$fsearch=$form->selectarray($fieldname, $typeRecherche,$value,1);
 			}
 			else if($typeRecherche==='calendar')
 			{
-				if (!$removeFilter) $value = GETPOST('Listview_'.$this->id.'_search_'.$key) ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'month'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'day'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'year') ) : '';
+				if (!$removeFilter) $value = GETPOST($fieldname) ? mktime(0,0,0, (int) GETPOST($fieldname.'month'), (int) GETPOST($fieldname.$key.'day'), (int) GETPOST($fieldname.'year') ) : '';
 				
-				$fsearch = $form->select_date($value, 'Listview_'.$this->id.'_search_'.$key,0, 0, 1, "", 1, 0, 1);
+				$fsearch = $form->select_date($value, $fieldname,0, 0, 1, "", 1, 0, 1);
 			}
 			else if($typeRecherche==='calendars')
 			{
 				$value_start = $value_end = '';
 				if (!$removeFilter)
 				{
-					$value_start = GETPOST('Listview_'.$this->id.'_search_'.$key.'_start') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_startyear') ) : '';
-					$value_end = GETPOST('Listview_'.$this->id.'_search_'.$key.'_end') ? mktime(0,0,0, (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endmonth'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endday'), (int) GETPOST('Listview_'.$this->id.'_search_'.$key.'_endyear') ) : '';
+					$value_start = GETPOST($fieldname.'_start') ? mktime(0,0,0, (int) GETPOST($fieldname.'_startmonth'), (int) GETPOST($fieldname.'_startday'), (int) GETPOST($fieldname.'_startyear') ) : '';
+					$value_end = GETPOST($fieldname.'_end') ? mktime(0,0,0, (int) GETPOST($fieldname.'_endmonth'), (int) GETPOST($fieldname.'_endday'), (int) GETPOST($fieldname.'_endyear') ) : '';
 				}
 			
-				$fsearch = $form->select_date($value_start, 'Listview_'.$this->id.'_search_'.$key.'_start',0, 0, 1, "", 1, 0, 1)
-						 . $form->select_date($value_end, 'Listview_'.$this->id.'_search_'.$key.'_end',0, 0, 1, "", 1, 0, 1);
+				$fsearch = $form->select_date($value_start,$fieldname.'_start',0, 0, 1, "", 1, 0, 1)
+				. $form->select_date($value_end, $fieldname.'_end',0, 0, 1, "", 1, 0, 1);
 				
 			}
 			else if(is_string($typeRecherche))
@@ -381,13 +365,13 @@ class Listview
 			}
 			else
             {
-				$fsearch='<input type="text" name="Listview['.$this->id.'][search]['.$key.']" id="Listview['.$this->id.'][search]['.$key.']" value="'.$value.'" size="15" />';
+            	$fsearch='<input type="text" name="'.$fieldname.'" id="'.$fieldname.'" value="'.$value.'" size="10" />';
 			}
 
 			if(!empty($param_search['allow_is_null']))
 			{
-				$valueNull = isset($ListPOST[$this->id]['search_on_null'][$key]) ? 1 : 0;
-				$fsearch.=' '.$form->checkbox1('', 'Listview['.$this->id.'][search_on_null]['.$key.']',1, $valueNull,' onclick=" if($(this).is(\':checked\')){ $(this).prev().val(\'\'); }" ').img_help(1, $langs->trans('SearchOnNUllValue'));
+				$valueNull = GETPOST($fieldname.'search_on_null_'.$key) ? 1 : 0;
+				$fsearch.=' '.$form->checkbox1('', $fieldname.'search_on_null_'.$key,1, $valueNull,' onclick=" if($(this).is(\':checked\')){ $(this).prev().val(\'\'); }" ').img_help(1, $langs->trans('SearchOnNUllValue'));
 			}
 
 			if(!empty($THeader[$key]))
@@ -395,20 +379,10 @@ class Listview
 				$TSearch[$key] = $fsearch;
 				$nb_search_in_bar++;
 			}
-			else
-            {
-				$label = !empty($TParam['title'][$key]) ? $TParam['title'][$key] : $key ;
-				$TParam['list']['head_search'].= '<th>'.$label.'</th>';
-//				$TParam['list']['head_search'].='<div><span style="min-width:200px;display:inline-block;">'.$label.'</span> '.$fsearch.'</div>';	
-			}
 		}
 		
 		$search_button = ' <a href="#" onclick="Listview_submitSearch(this);" class="list-search-link">'.img_search().'</a>';
-
-		if(!empty($TParam['list']['head_search']))
-		{
-			$TParam['list']['head_search']='<div style="float:right;">'.$search_button.'</div>'.$TParam['list']['head_search'];
-		}
+		$search_button .= ' <a href="#" onclick="Listview_clearSearch(this);" class="list-search-link">'.img_searchclear().'</a>';
 		
 		if($nb_search_in_bar>0)
 		{
@@ -603,7 +577,7 @@ class Listview
      */
     private function renderList(&$THeader, &$TField, &$TTotal, &$TTotalGroup, &$TParam)
     {
-		global $bc;
+		global $bc,$form;
 		
 		$TSearch = $this->setSearch($THeader, $TParam);
 		$TExport = $this->setExport($TParam, $TField, $THeader);
@@ -611,13 +585,24 @@ class Listview
 		
 		//$out = $this->getJS();
 		
+		$massactionbutton= empty($TParam['list']['massactions']) ? '' : $form->selectMassAction('', $TParam['list']['massactions']);
+		
 		$dolibarr_decalage = $this->totalRow > $this->totalRowToShow ? 1 : 0;
 		ob_start();
-		print_barre_liste($TParam['list']['title'], $TParam['limit']['page']-1, $_SERVER["PHP_SELF"], '&'.$TParam['list']['param_url'], $TParam['sortfield'], $TParam['sortorder'], '', $this->totalRowToShow+$dolibarr_decalage, $this->totalRow, $TParam['list']['image'], 0, '', '', $TParam['limit']['nbLine']);
+		print_barre_liste($TParam['list']['title'], $TParam['limit']['page'], $_SERVER["PHP_SELF"], '&'.$TParam['list']['param_url'], $TParam['sortfield'], $TParam['sortorder'], $massactionbutton, $this->totalRowToShow+$dolibarr_decalage, $this->totalRow, $TParam['list']['image'], 0, '', '', $TParam['limit']['nbLine']);
 		$out .= ob_get_clean();
 		
+		$classliste='liste';
+		if(!empty($TParam['head_search'])) {
+			$out.='<div class="liste_titre liste_titre_bydiv centpercent">';
+			$out.=$TParam['head_search'];
+			$out.='</div>';
+			
+			$classliste.=' listwithfilterbefore';
+		}
 	
-		$out.= '<table id="'.$this->id.'" class="liste" width="100%"><thead>';
+		$out.= '<div class="div-table-responsive">';
+		$out.= '<table id="'.$this->id.'" class="'.$classliste.'" width="100%"><thead>';
 			
     	if(count($TSearch)>0)
 		{
@@ -627,12 +612,12 @@ class Listview
 			{
 				if ($field === 'selectedfields')
 				{
-					$out.= '<td class="liste_titre" align="right">'.$this->form->showFilterAndCheckAddButtons(0).'</td>';
+					$out.= '<th class="liste_titre" align="right">'.$this->form->showFilterAndCheckAddButtons(0).'</th>';
 				}
 				else
 				{
 					$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
-					$out .= '<td class="liste_titre" '.$moreattrib.'>'.$TSearch[$field].'</td>';
+					$out .= '<th class="liste_titre" '.$moreattrib.'>'.$TSearch[$field].'</th>';
 				}
 			}
 			
@@ -646,10 +631,17 @@ class Listview
 			$search = '';
 			$prefix = '';
 
+			$label = $head['label'];
+			
 			if ($field === 'selectedfields')
 			{
 				$moreattrib = 'align="right" ';
 				$prefix = 'maxwidthsearch ';
+
+				if(!empty($TParam['list']['massactions'])) {
+					$label.=$form->showCheckAddButtons('checkforselect', 1);
+				}
+				
 			}
 
 			if (empty($head['width'])) $head['width'] = 'auto';
@@ -662,10 +654,10 @@ class Listview
 				else $search = $field;
 			}
 
-			$out .= getTitleFieldOfList($head['label'], 0, $_SERVER["PHP_SELF"], $search, '', $moreparam, $moreattrib, $TParam['sortfield'], $TParam['sortorder'], $prefix);
+			$out .= getTitleFieldOfList($label, 0, $_SERVER["PHP_SELF"], $search, '', $moreparam, $moreattrib, $TParam['sortfield'], $TParam['sortorder'], $prefix);
 			$out .= $head['more'];
 		}
-		
+
 		//$out .= '<th aligne="right" class="maxwidthsearch liste_titre">--</th>';
 		$out .= '</tr>';
 		
@@ -673,23 +665,34 @@ class Listview
 		
 		if(empty($TField))
 		{
-			if (!empty($TParam['list']['messageNothing'])) $out .= '<tr class="oddeven"><td colspan="'.(count($TParam['title'])+1).'"><span class="opacitymedium">'.$TParam['list']['messageNothing'].'</span></td></tr>';
+			if (!empty($TParam['list']['messageNothing'])) $out .= '<tr class="oddeven"><td colspan="'.(count($THeader)+1).'"><span class="opacitymedium">'.$TParam['list']['messageNothing'].'</span></td></tr>';
 		}
 		else
         {
-			$var=true;
 			$line_number = 0;
 			foreach($TField as $fields)
 			{
 				if($this->in_view($TParam, $line_number))
 				{
-					$var=!$var;
-					$out.='<tr '.$bc[$var].'> <!-- '.$field.' -->';
+					$out.='<tr class="oddeven"> <!-- '.$field.' -->';
 
 					foreach ($THeader as $field => $head)
 					{
+						$value_aff =(isset($fields[$field]) ? $fields[$field] : '&nbsp;');
+						
+						if ($field === 'selectedfields')
+						{
+							$head['text-align']='center';
+							if(!empty($TParam['list']['massactions'])) {
+								$arrayofselected=array(); // TODO get in param
+								$selected=0;
+								if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+								$value_aff.='<input id="cb'.$fields['rowid'].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$fields['rowid'].'"'.($selected?' checked="checked"':'').'>';
+							}
+						}
+						
 						$moreattrib = 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
-						$out.='<td class="'.$field.'" '.$moreattrib.'>'.$fields[$field].'</td>';
+						$out.='<td class="'.$field.'" '.$moreattrib.'>'.$value_aff.'</td>';
 					}
 
 					$out.='</tr>';
@@ -718,6 +721,7 @@ class Listview
 		}
 
 		$out .= '</table>';
+		$out .= '</div>';
 		
 		return $out;
 	}
@@ -760,7 +764,7 @@ class Listview
 		
 		foreach($TField as $row)
 		{
-			$this->set_line($TField, $TParam, $row);
+			$this->set_line($THeader, $TField, $TParam, $row);
 		}
 	}
 
@@ -778,7 +782,7 @@ class Listview
 		}
 		
 		$contextpage=md5($_SERVER['PHP_SELF']);
-		if(!empty($TParam['allow-field-select']))
+		if(!empty($TParam['allow-fields-select']))
 		{
 			$selectedfields = GETPOST('Listview'.$this->id.'_selectedfields');
 			
@@ -839,18 +843,25 @@ class Listview
 					'order'=>(in_array($field, $TParam['orderby']['noOrder']) ? 0 : 1),
 					'width'=>(!empty($TParam['size']['width'][$field]) ? $TParam['size']['width'][$field] : 'auto'),
 					'text-align'=>(!empty($TParam['position']['text-align'][$field]) ? $TParam['position']['text-align'][$field] : 'auto'),
+					'rank'=>(!empty($TParam['position']['rank'][$field]) ? $TParam['position']['rank'][$field] : 0),
 					'more'=>''
 				);
 			}
 		}
 		
-		if(!empty($selectedfields))
-		{
-			$THeader['selectedfields']['label']='<div style="float:right">'.$selectedfields.'</div>';
-		}
+		uasort($THeader,array('Listview','sortHeaderRank'));
+		
+		$THeader['selectedfields']['label']=$selectedfields;
 		
 		return $THeader;
 	}
+	
+	public function sortHeaderRank(&$a, &$b) {
+		if($a['rank']>$b['rank']) return 1;
+		else if($a['rank']<$b['rank']) return -1;
+		else return 0;
+		
+	}
 
     /**
      * @param string $TParam        TParam
@@ -874,11 +885,14 @@ class Listview
 	}
 
     /**
-     * @param string $TField        TField
-     * @param string $TParam        TParam
-     * @param string $currentLine   aaa
+     * Apply function to result and set fields array
+     * 
+     * @param string $THeader       array of headers
+     * @param string $TField        array of fields
+     * @param string $TParam        array of parameters
+     * @param string $currentLine   object containing current sql result
      */
-    private function set_line(&$TField, &$TParam, $currentLine)
+    private function set_line(&$THeader, &$TField, &$TParam, $currentLine)
     {
         global $conf;
 
@@ -887,16 +901,21 @@ class Listview
         if($this->in_view($TParam,$line_number))
         {
 			$this->totalRowToShow++;
-            $row=array(); $trans = array();
-            foreach($currentLine as $field=>$value)
+            $row=array(); 
+            $trans = array();
+            foreach($currentLine as $kF=>$vF)$trans['@'.$kF.'@'] = addslashes($vF);
+            
+            foreach($THeader as $field=>$dummy)
             {
+            	$value = isset($currentLine->{$field}) ? $currentLine->{$field}: '';
+            	
                 if(is_object($value))
                 {
                     if(get_class($value)=='stdClass') {$value=print_r($value, true);}
                     else $value=(string) $value;
                 }
 
-                $trans['@'.$field.'@'] = $value;
+                $trans['@'.$field.'@'] = addslashes($value);
 
                 if(!empty($TParam['math'][$field]))
                 {
@@ -910,17 +929,19 @@ class Listview
 
                     if(isset($TParam['eval'][$field]) && in_array($field,array_keys($row)))
                     {
-                        $strToEval = 'return '.strtr( $TParam['eval'][$field],  array_merge( $trans, array('@val@'=>$row[$field])  )).';';
+                        $strToEval = 'return '.strtr( $TParam['eval'][$field],  array_merge( $trans, array('@val@'=>addslashes( $row[$field] ))  )).';';
                         $row[$field] = eval($strToEval);
+                        
                     }
 
                     if(isset($TParam['type'][$field]) && !isset($TParam['eval'][$field]))
                     {
                         if($TParam['type'][$field]=='date' || $TParam['type'][$field]=='datetime' )
                         {
+                        
                             if($row[$field] != '0000-00-00 00:00:00' && $row[$field] != '1000-01-01 00:00:00' && $row[$field] != '0000-00-00' && !empty($row[$field]))
                             {
-                                if($TParam['type'][$field]=='datetime')$row[$field] = dol_print_date(strtotime($row[$field]),'dayhoursec');
+                                if($TParam['type'][$field]=='datetime')$row[$field] = dol_print_date(strtotime($row[$field]),'dayhour');
                                 else $row[$field] = dol_print_date(strtotime($row[$field]),'day');
                             }
                             else
@@ -996,6 +1017,8 @@ class Listview
 		{
 			$sql.=' LIMIT '.(int) $TParam['limit']['global'];
 		}
+		else if(!empty($TParam['limit'])) $sql.= $this->db->plimit($TParam['limit']['nbLine']+1, $TParam['limit']['page'] * $TParam['limit']['nbLine']);
+		
 		
 		return $sql;
 	}
@@ -1008,7 +1031,7 @@ class Listview
      */
     private function parse_sql(&$THeader, &$TField, &$TParam, $sql)
     {
-		$this->sql = $this->limitSQL($sql, $TParam);
+    	$this->sql = $this->limitSQL($sql, $TParam);
 		
 		$this->TTotalTmp=array();
 		$this->THideFlip = array_flip($TParam['hide']);
@@ -1016,12 +1039,13 @@ class Listview
 		$res = $this->db->query($this->sql);
 		if($res!==false)
 		{
-			$this->totalRow = $this->db->num_rows($res);
 			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_DEBUG);
 			
+			if(empty($this->totalRow))$this->totalRow = $this->db->num_rows($res);
+			
 			while($currentLine = $this->db->fetch_object($res))
             {
-				$this->set_line($TField, $TParam, $currentLine);
+				$this->set_line($THeader, $TField, $TParam, $currentLine);
 			}
 		}
 		else
@@ -1029,4 +1053,23 @@ class Listview
 			dol_syslog(get_class($this)."::parse_sql id=".$this->id." sql=".$this->sql, LOG_ERR);
 		}
 	}	
+	
+	static function getCachedOjbect($class_name, $fk_object) {
+		global $db, $TCacheListObject;
+		
+		if(!class_exists($class_name)) return false;
+		
+		if(empty($TCacheListObject)) $TCacheListObject = array();
+		if(empty($TCacheListObject[$class_name])) $TCacheListObject[$class_name]  =array();
+		
+		if(empty($TCacheListObject[$class_name][$fk_object])) {
+			$TCacheListObject[$class_name][$fk_object]= new $class_name($db);
+			if( $TCacheListObject[$class_name][$fk_object]->fetch($fk_object)<0) {
+				return false;
+			}
+		}
+		
+		return $TCacheListObject[$class_name][$fk_object];
+	}
+	
 }
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
new file mode 100644
index 00000000000..8d53496dbcb
--- /dev/null
+++ b/htdocs/product/list-with-listview.php
@@ -0,0 +1,702 @@
+<?php
+/* Copyright (C) 2001-2006  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012-2016  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2013-2016	Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2013-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2013       Jean Heimburger         <jean@tiaris.info>
+ * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2013       Adolfo segura           <adolfo.segura@gmail.com>
+ * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2016       Ferran Marcet		    <fmarcet@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/product/list.php
+ *  \ingroup    produit
+ *  \brief      Page to list products and services
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/listview.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+if (! empty($conf->categorie->enabled))
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+$langs->load("products");
+$langs->load("stocks");
+$langs->load("suppliers");
+$langs->load("companies");
+if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
+
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
+
+$sref=GETPOST("sref");
+$sbarcode=GETPOST("sbarcode");
+$snom=GETPOST("snom");
+$sall=GETPOST("sall");
+$type= (int) GETPOST("type","int");
+$search_sale = GETPOST("search_sale");
+$search_categ = GETPOST("search_categ",'int');
+$tosell = GETPOST("tosell", 'int');
+$tobuy = GETPOST("tobuy", 'int');
+$fourn_id = GETPOST("fourn_id",'int');
+$catid = GETPOST('catid','int');
+$search_tobatch = GETPOST("search_tobatch",'int');
+$search_accountancy_code_sell = GETPOST("search_accountancy_code_sell",'alpha');
+$search_accountancy_code_buy = GETPOST("search_accountancy_code_buy",'alpha');
+$optioncss = GETPOST('optioncss','alpha');
+
+//Show/hide child products. Hidden by default
+if (!$_POST) {
+	$search_hidechildproducts = 'on';
+} else {
+	$search_hidechildproducts = GETPOST('search_hidechildproducts');
+}
+
+$diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
+
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="p.ref";
+if (! $sortorder) $sortorder="ASC";
+
+// Initialize context for list
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'productservicelist';
+if ((string) $type == '1') { $contextpage='servicelist'; if ($search_type=='') $search_type='1'; }
+if ((string) $type == '0') { $contextpage='productlist'; if ($search_type=='') $search_type='0'; }
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array($contextpage));
+$extrafields = new ExtraFields($db);
+$form=new Form($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('product');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+
+if (empty($action)) $action='list';
+
+// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
+$canvas=GETPOST("canvas");
+$objcanvas=null;
+if (! empty($canvas))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+    $objcanvas = new Canvas($db,$action);
+    $objcanvas->getCanvas('product','list',$canvas);
+}
+
+// Security check
+if ($type=='0') $result=restrictedArea($user,'produit','','','','','',$objcanvas);
+else if ($type=='1') $result=restrictedArea($user,'service','','','','','',$objcanvas);
+else $result=restrictedArea($user,'produit|service','','','','','',$objcanvas);
+
+// Define virtualdiffersfromphysical
+$virtualdiffersfromphysical=0;
+if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+{
+    $virtualdiffersfromphysical=1;		// According to increase/decrease stock options, virtual and physical stock may differs.
+}
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'p.ref'=>"Ref",
+    'pfp.ref_fourn'=>"RefSupplier",
+	'p.label'=>"ProductLabel",
+	'p.description'=>"Description",
+    "p.note"=>"Note",
+);
+// multilang
+if (! empty($conf->global->MAIN_MULTILANGS))
+{
+	$fieldstosearchall['pl.label']='ProductLabelTranslated';
+	$fieldstosearchall['pl.description']='ProductDescriptionTranslated';
+	$fieldstosearchall['pl.note']='ProductNoteTranslated';
+}
+if (! empty($conf->barcode->enabled)) {
+	$fieldstosearchall['p.barcode']='Gencod';
+}
+
+if (empty($conf->global->PRODUIT_MULTIPRICES))
+{
+	$titlesellprice=$langs->trans("SellingPrice");
+	if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+	{
+		$titlesellprice=$form->textwithpicto($langs->trans("SellingPrice"), $langs->trans("DefaultPriceRealPriceMayDependOnCustomer"));
+	}
+}
+
+// Definition of fields for lists
+$arrayfields=array(
+    'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+    //'pfp.ref_fourn'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
+    'p.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	'p.barcode'=>array('label'=>$langs->trans("Gencod"), 'checked'=>($contextpage != 'servicelist'), 'enabled'=>(! empty($conf->barcode->enabled))),
+    'p.duration'=>array('label'=>$langs->trans("Duration"), 'checked'=>($contextpage != 'productlist'), 'enabled'=>(! empty($conf->service->enabled))),
+	'p.price'=>array('label'=>$langs->trans("SellingPrice"), 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES)),
+    'p.minbuyprice'=>array('label'=>$langs->trans("BuyingPriceMinShort"), 'checked'=>1, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
+	'p.seuil_stock_alerte'=>array('label'=>$langs->trans("StockLimit"), 'checked'=>0, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')),
+    'p.desiredstock'=>array('label'=>$langs->trans("DesiredStock"), 'checked'=>1, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')),
+    'p.stock'=>array('label'=>$langs->trans("PhysicalStock"), 'checked'=>1, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')),
+    'stock_virtual'=>array('label'=>$langs->trans("VirtualStock"), 'checked'=>1, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service' && $virtualdiffersfromphysical)),
+    'p.tobatch'=>array('label'=>$langs->trans("ManageLotSerial"), 'checked'=>0, 'enabled'=>(! empty($conf->productbatch->enabled))),
+	'p.accountancy_code_sell'=>array('label'=>$langs->trans("ProductAccountancySellCode"), 'checked'=>0),
+	'p.accountancy_code_buy'=>array('label'=>$langs->trans("ProductAccountancyBuyCode"), 'checked'=>0),
+	'p.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+    'p.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+    'p.tosell'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Sell").')', 'checked'=>1, 'position'=>1000),
+    'p.tobuy'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Buy").')', 'checked'=>1, 'position'=>1000)
+);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+   foreach($extrafields->attribute_label as $key => $val) 
+   {
+       $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key]);
+   }
+}
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Purge search criteria
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+    {
+    	$sall="";
+    	$sref="";
+    	$snom="";
+    	$sbarcode="";
+    	$search_categ=0;
+    	$tosell="";
+    	$tobuy="";
+    	$search_tobatch='';
+    	$search_accountancy_code_sell='';
+    	$search_accountancy_code_buy='';
+    	$search_array_options=array();
+    }
+    
+    // Mass actions
+    $objectclass='Product';
+    if ((string) $type == '1') { $objectlabel='Services'; }
+    if ((string) $type == '0') { $objectlabel='Products'; }
+    
+    $permtoread = $user->rights->produit->lire;
+    $permtodelete = $user->rights->produit->supprimer;
+    $uploaddir = $conf->product->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';    
+}
+
+
+/*
+ * View
+ */
+
+$htmlother=new FormOther($db);
+
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
+{
+	$objcanvas->assign_values($action);       // This must contains code to load data (must call LoadListDatas($limit, $offset, $sortfield, $sortorder))
+    $objcanvas->display_canvas($action);  	  // This is code to show template
+}
+else
+{
+	$title=$langs->trans("ProductsAndServices");
+
+	if (isset($type))
+	{
+		if ($type==1)
+		{
+			$texte = $langs->trans("Services");
+		}
+		else
+		{
+			$texte = $langs->trans("Products");
+		}
+	}
+	else
+	{
+		$texte = $langs->trans("ProductsAndServices");
+	}
+
+    $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
+    $sql.= ' p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
+    $sql.= ' p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy,';
+    $sql.= ' p.datec, p.tms,';
+    //$sql.= ' pfp.ref_fourn as ref_supplier, ';
+    $sql.= ' MIN(pfp.unitprice) as minsellprice';
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+		$sql .= ', pac.rowid prod_comb_id';
+	}
+	// Add fields from extrafields
+    foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+	// Add fields from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+	$sql.=$hookmanager->resPrint;
+    $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields as ef on (p.rowid = ef.fk_object)";
+    if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product"; // We'll need this table joined to the select in order to filter by categ
+   	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
+	// multilang
+	if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang = '".$langs->getDefaultLang() ."'";
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
+	}
+
+	$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+	if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+    // if the type is not 1, we show all products (type = 0,2,3)
+    if (dol_strlen($type))
+    {
+    	if ($type == 1) $sql.= " AND p.fk_product_type = '1'";
+    	else $sql.= " AND p.fk_product_type <> '1'";
+    }
+	if ($sref)     $sql .= natural_search('p.ref', $sref);
+	if ($snom)     $sql .= natural_search('p.label', $snom);
+	if ($sbarcode) $sql .= natural_search('p.barcode', $sbarcode);
+    if (isset($tosell) && dol_strlen($tosell) > 0  && $tosell!=-1) $sql.= " AND p.tosell = ".$db->escape($tosell);
+    if (isset($tobuy) && dol_strlen($tobuy) > 0  && $tobuy!=-1)   $sql.= " AND p.tobuy = ".$db->escape($tobuy);
+    if (dol_strlen($canvas) > 0)                    $sql.= " AND p.canvas = '".$db->escape($canvas)."'";
+    if ($catid > 0)    $sql.= " AND cp.fk_categorie = ".$catid;
+    if ($catid == -2)  $sql.= " AND cp.fk_categorie IS NULL";
+    if ($search_categ > 0)   $sql.= " AND cp.fk_categorie = ".$db->escape($search_categ);
+    if ($search_categ == -2) $sql.= " AND cp.fk_categorie IS NULL";
+    if ($fourn_id > 0) $sql.= " AND pfp.fk_soc = ".$fourn_id;
+    if ($search_tobatch != '' && $search_tobatch >= 0)   $sql.= " AND p.tobatch = ".$db->escape($search_tobatch);
+    if ($search_accountancy_code_sell)   $sql.= natural_search('p.accountancy_code_sell', $search_accountancy_code_sell);
+    if ($search_accountancy_code_sell)   $sql.= natural_search('p.accountancy_code_buy', $search_accountancy_code_buy);
+    // Add where from extra fields
+
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+		$sql .= " AND pac.rowid IS NULL";
+	}
+
+	// Add where from extra fields
+	foreach ($search_array_options as $key => $val)
+	{
+	    $crit=$val;
+	    $tmpkey=preg_replace('/search_options_/','',$key);
+	    $typ=$extrafields->attribute_type[$tmpkey];
+	    $mode=0;
+	    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
+	    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+	    {
+	        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+	    }
+	}
+	// Add where from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+	$sql.=$hookmanager->resPrint;
+    $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
+    $sql.= " p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
+    $sql.= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy';
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+		$sql .= ', pac.rowid';
+	}
+	// Add fields from extrafields
+    foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
+	// Add fields from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldSelect',$parameters);    // Note that $action and $object may have been modified by hook
+	$sql.=$hookmanager->resPrint;
+
+	// TODO put these functions into product.lib.php if this go from demo to core
+	/**
+	 * Function return formated sell price
+	 *
+	 * @param   int 	$fk_object rowid of product
+	 * @return string
+	 */
+	function list_get_product_sellprice($fk_object) {
+		global $langs,$conf, $user;
+		
+		$object = Listview::getCachedOjbect('Product', $fk_object);
+		if($object === false) return '';
+		
+		if ($object->status)
+		{
+			if ($object->price_base_type == 'TTC') return price($object->price_ttc).' '.$langs->trans("TTC");
+			else return price($object->price).' '.$langs->trans("HT");
+		}
+		return '';
+	}
+
+	/**
+	 * Function return formated product status sell or buy
+	 *
+	 * @param   int 	$fk_object 	rowid of product
+	 * @param	string	$field		concerned field status|status_buy
+	 * @param	int		$type		for libstatus
+	 * @return string	
+	 */
+	function list_get_product_status($fk_object, $field, $type) {
+		global $conf, $user;
+		
+		$object = Listview::getCachedOjbect('Product', $fk_object);
+		
+		if($object === false) return '';
+		
+		if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+			return ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
+		} else {
+			return $object->LibStatut($object->{$field},5,$type);
+		}
+		
+	}
+	
+	/**
+	 * Function return formated ref
+	 *
+	 * @param   int $fk_object rowid of product
+	 * @return string
+	 */
+	function list_get_product_ref($fk_object) {
+		global $conf, $user;
+		
+		$object = Listview::getCachedOjbect('Product', $fk_object);
+		
+		if($object === false) return '';
+		
+		return $object->getNomUrl(1,'',24);
+	}
+	
+	/**
+	 * Function return formated extrafield
+	 *
+	 * @param   int 	$fk_object 	rowid of product
+	 * @param	string	$key		extrafield to output
+	 * @return string
+	 */
+	function list_get_product_extrafield($fk_object, $key) {
+		global $extrafields;
+		
+		$object = Listview::getCachedOjbect('Product', $fk_object);
+		if($object === false) return '';
+		
+		return $extrafields->showOutputField($key, $object->array_options['options_'.$key], '', 1);
+	}
+
+	/**
+	 * Function return formated virtual stock
+	 *
+	 * @param   int $fk_object 	rowid of product
+	 * @return string
+	 */
+	function list_get_product_virtual_stock($fk_object) {
+		global $langs;
+	
+		$object = Listview::getCachedOjbect('Product', $fk_object);
+		if($object === false) return '';
+		
+		$object->load_stock('nobatch');
+		
+		$out = '';
+		if ($object->type != 1)
+		{
+			if ($object->seuil_stock_alerte != '' && $object->stock_theorique < (float) $object->seuil_stock_alerte) $out.= img_warning($langs->trans("StockTooLow")).' ';
+			$out.= $object->stock_theorique;
+		}
+
+		return $out;
+	}
+	
+	/**
+	 * Function return formated stock
+	 *
+	 * @param   int $fk_object rowid of product
+	 * @return string
+	 */
+	function list_get_product_stock($fk_object) {
+		global $langs;
+		
+		$object = Listview::getCachedOjbect('Product', $fk_object);
+		if($object === false) return '';
+		
+		$out = '';
+		if ($object->type != 1)
+		{
+			if ($object->seuil_stock_alerte != '' && $object->stock_reel< (float) $object->seuil_stock_alerte) $out.= img_warning($langs->trans("StockTooLow")).' ';
+			$out.= (double)$object->stock_reel;
+		}
+		
+		return $out;
+	}
+	/**
+	 * Function return formated min buy price
+	 *
+	 * @param   int $fk_object rowid of product
+	 * @return string
+	 */
+	function list_get_product_minbuyprice($fk_object) {
+		global $conf, $user, $langs,$db,$form;
+		
+		$out = '';
+		
+		$object = Listview::getCachedOjbect('Product', $fk_object);
+		if($object === false || empty($object->status_buy) ) return '';
+		
+		$product_fourn =new ProductFournisseur($db);
+		if ($product_fourn->find_min_price_product_fournisseur($fk_object) > 0)
+		{
+			if ($product_fourn->product_fourn_price_id > 0)
+			{
+				if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
+				{
+					$htmltext=$product_fourn->display_price_product_fournisseur(1, 1, 0, 1);
+					$out.= $form->textwithpicto(price($product_fourn->fourn_unitprice).' '.$langs->trans("HT"),$htmltext);
+				}
+				else $out.= price($product_fourn->fourn_unitprice).' '.$langs->trans("HT");
+			}
+		}
+		return $out;
+	}
+	
+	// array of customized field function
+	$arrayeval = array(
+			'tobuy'=>'list_get_product_status(@rowid@, "status_buy",1)'
+			,'tosell'=>'list_get_product_status(@rowid@, "status",0)'
+			,'ref'=>'list_get_product_ref(@rowid@)'
+			,'label'=>'dol_trunc("@val@",40)'
+			,'price'=>'list_get_product_sellprice(@rowid@)'
+			,'stock_virtual'=>'list_get_product_virtual_stock(@rowid@)'
+			,'stock'=>'list_get_product_stock(@rowid@)'
+			,'minbuyprice'=>'list_get_product_minbuyprice(@rowid@)'
+	);
+	
+	// defined list align for field
+	$arrayalign = array(
+			'price'=>'right'
+			,'tobuy'=>'right'
+			,'tosell'=>'right'
+			,'desiredstock'=>'right'
+			,'stock'=>'right'
+			,'stock_virtual'=>'right'
+			,'minbuyprice'=>'right'
+			,'datec'=>'center'
+			,'tms'=>'center'
+	);
+	
+	$parameters=array('arrayfields'=>$arrayfields);
+	$reshook=$hookmanager->executeHooks('printFieldListMoreFields',$parameters);    // Note that $action and $object may have been modified by hook
+	if($reshook) {
+		$arrayfields = $hookmanager->resArray;
+	}
+	
+	// init title, hidden field (allowed into selected fields), and position
+	$arrayhide = $arraytitle = $arrayposition = array();
+    foreach($arrayfields as $k=>$data) {
+    	if(!isset($data['enabled']) || $data['enabled']) {
+    		list($t,$f) = explode('.',$k);
+    		if(empty($f))$f = $k;
+    		$arraytitle[$f]=$data['label'];
+    		if(empty($data['checked'])) $arrayhide[] = $f;
+    		$arrayposition[$f] = empty($data['position']) ? 0 : $data['position'];
+    	}
+    }
+    
+    // Extra fields
+    if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+    {
+    	foreach($extrafields->attribute_label as $key => $val)
+    	{
+    		$arrayalign[$key]=$extrafields->getAlignFlag($key);
+   			$arrayeval[$key] = 'list_get_product_extrafield(@rowid@, "'.$key.'")';
+    	}
+    }
+    // List of mass actions available
+    $arrayofmassactions =  array(
+    		//'presend'=>$langs->trans("SendByMail"),
+    		//'builddoc'=>$langs->trans("PDFMerge"),
+    );
+    if ($user->rights->produit->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+    if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+    
+    // Filter on categories
+    $moreforfilter='';
+    if (! empty($conf->categorie->enabled))
+    {
+    	$moreforfilter.='<div class="divsearchfield">';
+    	$moreforfilter.=$langs->trans('Categories'). ': ';
+    	$moreforfilter.=$htmlother->select_categories(Categorie::TYPE_PRODUCT,$search_categ,'search_categ',1);
+    	$moreforfilter.='</div>';
+    }
+    
+    //Show/hide child products. Hidden by default
+    if (!empty($conf->variants->enabled) && $type === 0) {
+    	$moreforfilter.='<div class="divsearchfield">';
+    	$moreforfilter.= '<input type="checkbox" id="search_hidechildproducts" name="search_hidechildproducts" value="on"'.($search_hidechildproducts ? 'checked="checked"' : '').'>';
+    	$moreforfilter.= ' <label for="search_hidechildproducts">'.$langs->trans('HideChildProducts').'</label>';
+    	$moreforfilter.='</div>';
+    }
+    
+    if ($moreforfilter)
+    {
+    	$parameters=array();
+    	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    	
+    	if(!empty($hookmanager->resPrint)) {
+    		$moreforfilter.=$hookmanager->resPrint;
+    	}
+    				
+    }
+
+    $param='';
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+    if ($search_categ > 0) $param.="&amp;search_categ=".urlencode($search_categ);
+    if ($sref) $param="&amp;sref=".urlencode($sref);
+    if ($search_ref_supplier) $param="&amp;search_ref_supplier=".urlencode($search_ref_supplier);
+    if ($sbarcode) $param.=($sbarcode?"&amp;sbarcode=".urlencode($sbarcode):"");
+    if ($snom) $param.="&amp;snom=".urlencode($snom);
+    if ($sall) $param.="&amp;sall=".urlencode($sall);
+    if ($tosell != '') $param.="&amp;tosell=".urlencode($tosell);
+    if ($tobuy != '') $param.="&amp;tobuy=".urlencode($tobuy);
+    if ($fourn_id > 0) $param.=($fourn_id?"&amp;fourn_id=".$fourn_id:"");
+    if ($seach_categ) $param.=($search_categ?"&amp;search_categ=".urlencode($search_categ):"");
+    if ($type != '') $param.='&amp;type='.urlencode($type);
+    if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
+    if ($search_tobatch) $param="&amp;search_ref_supplier=".urlencode($search_ref_supplier);
+    if ($search_accountancy_code_sell) $param="&amp;search_accountancy_code_sell=".urlencode($search_accountancy_code_sell);
+    if ($search_accountancy_code_buy) $param="&amp;search_accountancy_code_buy=".urlencode($search_accountancy_code_buy);
+    // Add $param from extra fields
+    foreach ($search_array_options as $key => $val)
+    {
+    	$crit=$val;
+    	$tmpkey=preg_replace('/search_options_/','',$key);
+    	if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+    }
+    
+    //var_dump($arraytitle,$arrayhide);
+    $list=new Listview($db, 'products');
+    $listHTML = $list->render($sql,array(
+    		'list'=>array(
+    				'title'=>$texte
+    				,'image'=>'title_products.png'
+    				,'massactions'=>$arrayofmassactions
+    				,'param_url'=>$param
+    				,'messageNothing'=>''
+    		)
+    		,'limit'=>array(
+    				'nbLine'=>$limit
+    		)
+    		,'sortfield'=>$sortfield
+    		,'sortorder'=>$sortorder
+    		,'title'=>$arraytitle // column definition title (only defined where abble to show)
+    		,'position'=>array(
+    				'text-align'=>$arrayalign
+    				,'rank'=>$arrayposition
+    		)
+    		,'allow-fields-select'=>1 // allow to select hidden fields
+    		,'head_search'=>$moreforfilter //custom search on head
+    		,'no-auto-sql-search'=>1 //disabled auto completion sql for search and pager url, use dolibarr style for migration of product list
+			,'translate'=>array()    		
+    		,'search'=>array(
+    				'ref'=>array('search_type'=>true, 'table'=>'p', 'fieldname'=>'sref')
+    				,'label'=>array('search_type'=>true, 'table'=>'p', 'fieldname'=>'snom')
+    				,'tosell'=>array('search_type'=> array('0'=>$langs->trans('ProductStatusNotOnSellShort'),'1'=>$langs->trans('ProductStatusOnSellShort')), 'fieldname'=>'tosell')
+    				,'tobuy'=>array('search_type'=> array('0'=>$langs->trans('ProductStatusNotOnBuyShort'),'1'=>$langs->trans('ProductStatusOnBuyShort')), 'fieldname'=>'tobuy')
+    				,'barcode'=>array('search_type'=>true, 'table'=>'p', 'fieldname'=>'sbarcode')
+    				,'accountancy_code_sell'=>array('search_type'=>true, 'table'=>'p', 'fieldname'=>'search_accountancy_code_sell')
+    				,'accountancy_code_buy'=>array('search_type'=>true, 'table'=>'p', 'fieldname'=>'search_accountancy_code_buy')
+    		)
+    		,'type'=>array(
+    				'datec'=>'datetime'
+    				,'tms'=>'datetime'
+    		)
+    		,'hide'=>$arrayhide
+    		,'eval'=>$arrayeval
+    ));
+    
+    $num = $list->totalRow;
+    
+    	$arrayofselected=is_array($toselect)?$toselect:array();
+    	
+    	if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
+    	{
+    	    $id = $list->TField[0]->rowid;
+    	    header("Location: ".DOL_URL_ROOT.'/product/card.php?id='.$id);
+    	    exit;
+    	}
+
+    	$helpurl='';
+    	if (isset($type))
+    	{
+    		if ($type == 0)
+    		{
+    			$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+    		}
+    		else if ($type == 1)
+    		{
+    			$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+    		}
+    	}
+
+    	llxHeader('',$title,$helpurl,'');
+
+    	// Displays product removal confirmation
+    	if (GETPOST('delprod'))	{
+		    setEventMessages($langs->trans("ProductDeleted", GETPOST('delprod')), null, 'mesgs');
+	    }
+
+		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
+        if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+		print '<input type="hidden" name="action" value="list">';
+		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+		print '<input type="hidden" name="type" value="'.$type.'">';
+
+		echo $listHTML;
+    
+    	print '</form>';
+    
+}
+
+
+llxFooter();
+$db->close();

From 8272408b6e5a1d4c1d76a7ba54695d8934699ec0 Mon Sep 17 00:00:00 2001
From: alexis portable <alexis@atm-consulting.fr>
Date: Tue, 9 May 2017 14:43:54 +0200
Subject: [PATCH 0758/1163] fix travis case statement

---
 htdocs/product/list-with-listview.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index 8d53496dbcb..e3103d8f426 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -438,7 +438,7 @@ else
 		if ($object->type != 1)
 		{
 			if ($object->seuil_stock_alerte != '' && $object->stock_theorique < (float) $object->seuil_stock_alerte) $out.= img_warning($langs->trans("StockTooLow")).' ';
-			$out.= $object->stock_theorique;
+			$out.= (double) $object->stock_theorique;
 		}
 
 		return $out;
@@ -460,7 +460,7 @@ else
 		if ($object->type != 1)
 		{
 			if ($object->seuil_stock_alerte != '' && $object->stock_reel< (float) $object->seuil_stock_alerte) $out.= img_warning($langs->trans("StockTooLow")).' ';
-			$out.= (double)$object->stock_reel;
+			$out.= (double) $object->stock_reel;
 		}
 		
 		return $out;

From 1748f1d451821a34e58da4f2a1db6d7323e8de68 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 16:52:03 +0200
Subject: [PATCH 0759/1163] Better tooltip for computed field

---
 htdocs/exports/export.php       | 22 ++++++++++++++--------
 htdocs/langs/en_US/exports.lang |  1 +
 htdocs/theme/eldy/style.css.php |  3 +++
 htdocs/theme/md/style.css.php   |  3 +++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index e9f19f49ef4..43453041dfd 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -439,7 +439,7 @@ if ($step == 1 || ! $datatoexport)
     $h++;
     */
 
-    dol_fiche_head($head, $hselected, $langs->trans("NewExport"));
+    dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
 
 
     print '<table class="notopnoleftnoright" width="100%">';
@@ -609,7 +609,14 @@ if ($step == 2 && $datatoexport)
         $text=$langs->trans($label);
         $tablename=getablenamefromfield($code,$sqlmaxforexport);
         $htmltext ='<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
-        $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
+        if (! empty($objexport->array_export_special[0][$code]))
+        {
+            $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+        }
+        else
+        {
+            $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
+        }
 		if (! empty($objexport->array_export_examplevalues[0][$code]))
 		{
 		    $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
@@ -645,9 +652,8 @@ if ($step == 2 && $datatoexport)
     
     /*
      * Barre d'action
-     *
      */
-    print '<div class="tabsAction">';
+    print '<div class="tabsAction tabsActionNoBottom">';
 
     if (count($array_selected))
 	{
@@ -828,7 +834,7 @@ if ($step == 3 && $datatoexport)
 	/*
 	 * Barre d'action
 	 */
-	print '<div class="tabsAction">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 	// il n'est pas obligatoire de filtrer les champs
 	print '<a class="butAction" href="javascript:FilterField.submit();">'.$langs->trans("NextStep").'</a>';
 	print '</div>';
@@ -883,14 +889,14 @@ if ($step == 4 && $datatoexport)
     print '<table width="100%" class="border">';
 
     // Module
-    print '<tr><td width="25%">'.$langs->trans("Module").'</td>';
+    print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
     print '<td>';
     //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
     print $objexport->array_export_module[0]->getName();
     print '</td></tr>';
 
     // Lot de donnees a exporter
-    print '<tr><td width="25%">'.$langs->trans("DatasetToExport").'</td>';
+    print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
 	$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
     print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
@@ -898,7 +904,7 @@ if ($step == 4 && $datatoexport)
     print '</td></tr>';
 
     // List of exported fields
-    print '<tr><td width="25%">'.$langs->trans("ExportedFields").'</td>';
+    print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
     $list='';
     foreach($array_selected as $code=>$value)
     {
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index a2e208673bd..4a1152e6581 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -120,6 +120,7 @@ SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for
 UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
 NoUpdateAttempt=No update attempt was performed, only insert 
 ImportDataset_user_1=Users (employees or not) and properties
+ComputedField=Computed field
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilteredFields=Filtered fields
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4672d99b8ec..9de83c3bd97 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2006,6 +2006,9 @@ div.tabsAction {
     padding: 0em 0em;
     text-align: right;
 }
+div.tabsActionNoBottom {
+    margin-bottom: 0px;
+}
 div.tabsAction > a {
 	margin-bottom: 16px !important;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 7818422d192..e6809a2c574 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2011,6 +2011,9 @@ div.tabsAction {
     padding: 0em 0em;
     text-align: right;
 }
+div.tabsActionNoBottom {
+    margin-bottom: 0px;
+}
 div.tabsAction > a {
 	margin-bottom: 16px !important;
 }

From 0b97ee42cf4f278afa77836b7d12e8b633841367 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 18:15:50 +0200
Subject: [PATCH 0760/1163] NEW Can use a credit note into a "down
 payment/deposit".

---
 htdocs/compta/facture/card.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 5d2ba74c48a..9483e79dba4 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3156,7 +3156,7 @@ else if ($id > 0 || ! empty($ref))
 	$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
 	$addcreditnote = '<a href="' . DOL_URL_ROOT . '/compta/facture/card.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
 
-	print '<tr><td>' . $langs->trans('Discounts');
+	print '<!-- Discounts --><tr><td>' . $langs->trans('Discounts');
 	print '</td><td>';
 	if ($soc->remise_percent)
 		print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
@@ -3164,6 +3164,7 @@ else if ($id > 0 || ! empty($ref))
 		print $langs->trans("CompanyHasNoRelativeDiscount");
 		// print ' ('.$addrelativediscount.')';
 
+	// Is there commercial discount or down payment available ?
 	if ($absolute_discount > 0) {
 		print '. ';
 		if ($object->statut > 0 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
@@ -3195,21 +3196,21 @@ else if ($id > 0 || ! empty($ref))
 		} else
 			print '. ';
 	}
+	// Is there credit notes availables ?
 	if ($absolute_creditnote > 0)
 	{
 		// If validated, we show link "add credit note to payment"
-		if ($object->statut != 1 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
+		if ($object->statut != 1 || $object->type == Facture::TYPE_CREDIT_NOTE) {
 			if ($object->statut == 0 && $object->type != Facture::TYPE_DEPOSIT) {
 				$text = $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency));
 				print $form->textwithpicto($text, $langs->trans("CreditNoteDepositUse"));
 			} else {
 				print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '.';
 			}
-		} else {
-			// Remise dispo de type avoir
-			if (! $absolute_discount)
-				print '<br>';
-			// $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filtercreditnote, $resteapayer
+		} else {  // We can add a credit note on a down payment or standard invoice or situation invoice
+			// There is credit notes discounts available
+			if (! $absolute_discount) print '<br>';
+			// $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filtercreditnote, $resteapayer);
 			$more=' ('.$addcreditnote.')';
 			$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filtercreditnote, 0, $more); // We allow credit note even if amount is higher
 		}

From 39b45498134612f0f6c57d2d64258e74de2c74ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 19:43:50 +0200
Subject: [PATCH 0761/1163] Make option MAIN_SECURITY_CSRF_WITH_TOKEN more
 visible

---
 htdocs/install/mysql/data/llx_const.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index b34e0cac513..bf76d378789 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -35,6 +35,7 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_N
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_FEATURES_LEVEL','0','chaine','Level of features to show: -1=stable+deprecated, 0=stable only (default), 1=stable+experimental, 2=stable+experimental+development',1,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAILING_LIMIT_SENDBYWEB','25','chaine','Number of targets to defined packet size when sending mass email',1,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_ENABLE_LOG_TO_HTML','0','chaine','If this option is set to 1, it is possible to see log output at end of HTML sources by adding paramater logtohtml=1 on URL. Module log must also be enabled.',1,0);
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SECURITY_CSRF_WITH_TOKEN','0','chaine','If this option is set to 1, a CSRF protection using an antiCSRF token is added.',1,0);
 
 -- Hidden and common to all entities
 insert into llx_const (name, value, type, note, visible, entity) values ('SYSLOG_HANDLERS','["mod_syslog_file"]','chaine','Which logger to use',0,0);

From b8b91db0071e8e660bffe0b23b760f77641464ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 May 2017 21:01:37 +0200
Subject: [PATCH 0762/1163] Use function top_httphead to include headers in
 pages.

---
 htdocs/admin/agenda_xcal.php             | 10 +++++-----
 htdocs/cashdesk/affIndex.php             |  3 ---
 htdocs/cashdesk/facturation_dhtml.php    |  3 +--
 htdocs/cashdesk/tpl/ticket.tpl.php       |  3 ++-
 htdocs/core/ajax/check_notifications.php |  7 +++++++
 htdocs/core/antispamimage.php            |  3 ++-
 htdocs/core/js/datepicker.js.php         |  2 +-
 htdocs/core/js/lib_head.js.php           |  2 +-
 htdocs/core/js/lib_notification.js.php   | 11 ++++++-----
 htdocs/core/js/select2_locale.js.php     |  2 +-
 htdocs/core/js/timepicker.js.php         |  2 +-
 htdocs/core/lib/functions.lib.php        |  6 +++---
 htdocs/document.php                      |  2 +-
 htdocs/install/inc.php                   |  3 ++-
 htdocs/main.inc.php                      | 18 ++++++++++++------
 htdocs/paybox/lib/paybox.lib.php         |  6 ++++--
 htdocs/paypal/lib/paypal.lib.php         |  3 ++-
 htdocs/projet/jsgantt_language.js.php    |  4 ++--
 htdocs/support/inc.php                   |  3 ++-
 htdocs/theme/eldy/style.css.php          |  2 +-
 htdocs/theme/md/style.css.php            |  2 +-
 htdocs/viewimage.php                     |  4 ++--
 22 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 0e66125ba7c..1895eb5b15d 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -97,7 +97,7 @@ print "<td>".$langs->trans("Value")."</td>";
 print "<td>&nbsp;</td>";
 print "</tr>";
 
-print "<tr ".$bc[false].">";
+print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("PasswordTogetVCalExport")."</td>";
 print '<td><input required="required" type="text" class="flat" id="MAIN_AGENDA_XCAL_EXPORTKEY" name="MAIN_AGENDA_XCAL_EXPORTKEY" value="' . (GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY','alpha')?GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY','alpha'):$conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) . '" size="40">';
 if (! empty($conf->use_javascript_ajax))
@@ -106,13 +106,13 @@ print '</td>';
 print "<td>&nbsp;</td>";
 print "</tr>";
 
-print "<tr ".$bc[true].">";
+print '<tr class="oddeven">';
 print "<td>".$langs->trans("PastDelayVCalExport")."</td>";
 print "<td><input type=\"text\" class=\"flat\" name=\"MAIN_AGENDA_EXPORT_PAST_DELAY\" value=\"". (GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY','alpha')?GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY','alpha'):$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY) . "\" size=\"10\"> ".$langs->trans("days")."</td>";
 print "<td>&nbsp;</td>";
 print "</tr>";
 
-print "<tr ".$bc[false].">";
+print '<tr class="oddeven">';
 print "<td>".$langs->trans("UseACacheDelay")."</td>";
 print "<td><input type=\"text\" class=\"flat\" name=\"MAIN_AGENDA_EXPORT_CACHE\" value=\"". (GETPOST('MAIN_AGENDA_EXPORT_CACHE','alpha')?GETPOST('MAIN_AGENDA_EXPORT_CACHE','alpha'):$conf->global->MAIN_AGENDA_EXPORT_CACHE) . "\" size=\"10\"></td>";
 print "<td>&nbsp;</td>";
@@ -128,8 +128,8 @@ print '<tr class="liste_titre">';
 print '<td width="25%">'.$langs->trans("Parameter")."</td>";
 print "<td>".$langs->trans("Value")."</td>";
 print "</tr>";
-print "<tr ".$bc[false].">";
-print '<td class="fieldrequired">'.$langs->trans("FixTZ")."</td>";
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("FixTZ")."</td>";
 print "<td>";
 print '<input class="flat" type="text" size="4" name="AGENDA_EXPORT_FIX_TZ" value="'.$conf->global->AGENDA_EXPORT_FIX_TZ.'">';
 print ' &nbsp; '.$langs->trans("FillThisOnlyIfRequired");
diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php
index 6b1d13f719f..b5432b94eec 100644
--- a/htdocs/cashdesk/affIndex.php
+++ b/htdocs/cashdesk/affIndex.php
@@ -45,9 +45,6 @@ $langs->load("cashdesk");
 
 $form = new Form($db);
 
-//header("Content-type: text/html; charset=UTF-8");
-//header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
 $arrayofjs=array();
 $arrayofcss=array('/cashdesk/css/style.css');
 
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
index 8d4ebf8af31..3046644c35e 100644
--- a/htdocs/cashdesk/facturation_dhtml.php
+++ b/htdocs/cashdesk/facturation_dhtml.php
@@ -39,8 +39,7 @@ if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
 
-//header("Content-type: text/html; charset=UTF-8");
-header("Content-type: text/html; charset=".$conf->file->character_set_client);
+top_httphead('text/html');
 
 $search = GETPOST("code", "alpha");
 
diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php
index 40be470c429..82b84ba3b56 100644
--- a/htdocs/cashdesk/tpl/ticket.tpl.php
+++ b/htdocs/cashdesk/tpl/ticket.tpl.php
@@ -20,7 +20,8 @@ include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 $langs->load("main");
 $langs->load('cashdesk');
-header("Content-type: text/html; charset=".$conf->file->character_set_client);
+
+top_httphead('text/html');
 
 $facid=GETPOST('facid','int');
 $object=new Facture($db);
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index fa3edd7a4be..332626fbabd 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -24,6 +24,13 @@ if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 
 require '../../main.inc.php';
 
+
+/*
+ * View
+ */
+
+top_httphead('text/html');  // TODO Use a json mime type
+
 global $user, $db, $langs, $conf;
 
 $time = (int) GETPOST('time');    // Use the time parameter that is always increased by time_update, even if call is late
diff --git a/htdocs/core/antispamimage.php b/htdocs/core/antispamimage.php
index a16844dd715..816763eeaf5 100644
--- a/htdocs/core/antispamimage.php
+++ b/htdocs/core/antispamimage.php
@@ -58,7 +58,8 @@ if (empty($img))
     exit;
 }
 
-header("Content-type: image/png");
+// Define mime type
+top_httphead('image/png');
 
 $background_color = imagecolorallocate($img, 250, 250, 250);
 $ecriture_color = imagecolorallocate($img, 0, 0, 0);
diff --git a/htdocs/core/js/datepicker.js.php b/htdocs/core/js/datepicker.js.php
index 02666409fc3..50c140f6f82 100644
--- a/htdocs/core/js/datepicker.js.php
+++ b/htdocs/core/js/datepicker.js.php
@@ -37,7 +37,7 @@ session_cache_limiter(FALSE);
 require_once '../../main.inc.php';
 
 // Define javascript type
-header('Content-type: text/javascript; charset=UTF-8');
+top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 8909f446812..e604f3281f9 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -39,7 +39,7 @@ session_cache_limiter(FALSE);
 require_once '../../main.inc.php';
 
 // Define javascript type
-header('Content-type: text/javascript; charset=UTF-8');
+top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index a3b90a35db6..b640f4cc81b 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -33,21 +33,22 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
 {
     global $langs, $conf;
 
-    // Define javascript type
-    header('Content-type: text/javascript; charset=UTF-8');
-
+    top_httphead('text/javascript; charset=UTF-8');
+    
     $nowtime = time();
     //$nowtimeprevious = floor($nowtime / 60) * 60;   // auto_check_events_not_before is rounded to previous minute
 
     // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when.
+    /* session already started into main
     session_cache_limiter(FALSE);
     header('Cache-Control: no-cache');
-    session_start();
+    session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
+    session_start();*/
     if (! isset($_SESSION['auto_check_events_not_before'])) 
     {
         print 'console.log("_SESSION[auto_check_events_not_before] is not set");'."\n";
         // Round to eliminate the seconds
-        $_SESSION['auto_check_events_not_before'] = $nowtime;   // auto_check_events_not_before is rounded to previous minute
+        $_SESSION['auto_check_events_not_before'] = $nowtime;
     }
     print 'var nowtime = ' . $nowtime . ';' . "\n";
     print 'var login = \'' . $_SESSION['dol_login'] . '\';' . "\n";
diff --git a/htdocs/core/js/select2_locale.js.php b/htdocs/core/js/select2_locale.js.php
index 31c6a91bc74..aa62b5a0ec1 100644
--- a/htdocs/core/js/select2_locale.js.php
+++ b/htdocs/core/js/select2_locale.js.php
@@ -37,7 +37,7 @@ session_cache_limiter(FALSE);
 require_once '../../main.inc.php';
 
 // Define javascript type
-header('Content-type: text/javascript; charset=UTF-8');
+top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
diff --git a/htdocs/core/js/timepicker.js.php b/htdocs/core/js/timepicker.js.php
index cc33a5a3933..8342ac9e3ac 100644
--- a/htdocs/core/js/timepicker.js.php
+++ b/htdocs/core/js/timepicker.js.php
@@ -37,7 +37,7 @@ session_cache_limiter(FALSE);
 require_once '../../main.inc.php';
 
 // Define javascript type
-header('Content-type: text/javascript; charset=UTF-8');
+top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e3c6cb7d5cd..8dbc705c5b2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -400,11 +400,11 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 
 
 /**
- *  Return a prefix to use for this Dolibarr instance for session or cookie names.
+ *  Return a prefix to use for this Dolibarr instance, for session/cookie names or email id.
  *  This prefix is unique for instance and avoid conflict between multi-instances,
- *  even when having two instances with one root dir or two instances in virtual servers
+ *  even when having two instances with one root dir or two instances in virtual servers.
  *
- *  @param  string  $mode       '' or 'email'              
+ *  @param  string  $mode       '' (prefix for session name) or 'email' (prefix for email id)              
  *  @return	string      		A calculated prefix
  */
 function dol_getprefix($mode='')
diff --git a/htdocs/document.php b/htdocs/document.php
index 02eb7193675..4e4f18826ef 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -170,9 +170,9 @@ if (! file_exists($original_file_osencoded))
 }
 
 // Permissions are ok and file found, so we return it
+top_httphead($type);
 header('Content-Description: File Transfer');
 if ($encoding)   header('Content-Encoding: '.$encoding);
-if ($type)       header('Content-Type: '.$type.(preg_match('/text/',$type)?'; charset="'.$conf->file->character_set_client:''));
 // Add MIME Content-Disposition from RFC 2183 (inline=automatically displayed, atachment=need user action to open)
 if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
 else header('Content-Disposition: inline; filename="'.$filename.'"');
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 840fa709ddf..6da4125a56c 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -384,7 +384,8 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='',$css
 
     // We force the content charset
     header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
+    header("X-Content-Type-Options: nosniff");
+    
     print '<!DOCTYPE HTML>'."\n";
     print '<html>'."\n";
     print '<head>'."\n";
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ab92df9ca12..11dccf47ade 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -197,6 +197,7 @@ $sessionname='DOLSESSID_'.$prefix;
 $sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
 if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
 session_name($sessionname);
+session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
 session_start();
 if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
 {
@@ -528,6 +529,7 @@ if (! defined('NOLOGIN'))
             dol_syslog('User not found, connexion refused');
             session_destroy();
             session_name($sessionname);
+            session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
             session_start();    // Fixing the bug of register_globals here is useless since session is empty
 
             if ($resultFetchUser == 0)
@@ -586,6 +588,7 @@ if (! defined('NOLOGIN'))
             dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
             session_destroy();
             session_name($sessionname);
+            session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
             session_start();    // Fixing the bug of register_globals here is useless since session is empty
 
             if ($resultFetchUser == 0)
@@ -967,19 +970,22 @@ if (! function_exists("llxHeader"))
 /**
  *  Show HTTP header
  *
+ *  @param  string  $contenttype    Content type. For example, 'text/html'
  *  @return	void
  */
-function top_httphead()
+function top_httphead($contenttype='text/html')
 {
     global $conf;
 
-    //header("Content-type: text/html; charset=UTF-8");
-    header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
+    if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
+    else header("Content-Type: ".$contenttype);
+    header("X-Content-Type-Options: nosniff");
+    header("X-Frame-Options: SAMEORIGIN");
+    
     // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
-    if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) {
+    /*if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) {
         ob_start("ob_gzhandler");
-    }
+    }*/
 }
 
 /**
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index 922679bcb86..ca5fd6a71ad 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -36,7 +36,8 @@ function llxHeaderPaybox($title, $head = "")
 	global $user, $conf, $langs;
 
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
+	header("X-Content-Type-Options: nosniff");
+	
 	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
 	//print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd>';
 	print "\n";
@@ -171,7 +172,8 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
     dol_syslog("PBX_TYPEPAIEMENT: $PBX_TYPEPAIEMENT", LOG_DEBUG);
 
     header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
+    header("X-Content-Type-Options: nosniff");
+    
     print '<html>'."\n";
     print '<head>'."\n";
     print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=".$conf->file->character_set_client."\">\n";
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 4c1cb588f1f..b1be8f56647 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -35,7 +35,8 @@ function llxHeaderPaypal($title, $head = "")
 	global $user, $conf, $langs;
 
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
+	header("X-Content-Type-Options: nosniff");
+	
 	$appli='Dolibarr';
 	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
 
diff --git a/htdocs/projet/jsgantt_language.js.php b/htdocs/projet/jsgantt_language.js.php
index f6b5799bda0..7aafd97fb45 100644
--- a/htdocs/projet/jsgantt_language.js.php
+++ b/htdocs/projet/jsgantt_language.js.php
@@ -34,8 +34,8 @@ if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
 require_once __DIR__.'/../main.inc.php';
 
-// Define css type
-header('Content-type: text/javascript');
+// Define mime type
+top_httphead('text/javascript');
 
 global $langs;
 ?>
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index 869dace222d..16aa40b246d 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -207,7 +207,8 @@ function pHeader($soutitre,$next,$action='none')
 
 	// On force contenu dans format sortie
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
+	header("X-Content-Type-Options: nosniff");
+	
 	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">'."\n";
 	print '<html manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
 	print '<head>'."\n";
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9de83c3bd97..f923413da4c 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -45,7 +45,7 @@ if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSI
 
 
 // Define css type
-header('Content-type: text/css');
+top_httphead('text/css');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e6809a2c574..3bd33b07225 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -46,7 +46,7 @@ if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSI
 
 
 // Define css type
-header('Content-type: text/css');
+top_httphead('text/css');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 else header('Cache-Control: no-cache');
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index f69c7e4e4aa..4f1ef007f1f 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -191,13 +191,13 @@ else					// Open and return file
     // Les drois sont ok et fichier trouve
     if ($type)
     {
+        top_httphead($type);
         header('Content-Disposition: inline; filename="'.basename($original_file).'"');
-        header('Content-type: '.$type);
     }
     else
     {
+        top_httphead('image/png');
         header('Content-Disposition: inline; filename="'.basename($original_file).'"');
-        header('Content-type: image/png');
     }
 
     $original_file_osencoded=dol_osencode($original_file);

From ae57395562dd62e7ccc6e664974a4188decc7438 Mon Sep 17 00:00:00 2001
From: alexis portable <alexis@atm-consulting.fr>
Date: Tue, 9 May 2017 22:24:24 +0200
Subject: [PATCH 0763/1163] NEW get amount base on thm for ficheinter

---
 htdocs/fichinter/class/fichinter.class.php | 27 +++++++++++++++++++++-
 htdocs/projet/element.php                  |  7 +++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 2942a8903ab..b52dfdc904b 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -360,6 +360,8 @@ class Fichinter extends CommonObject
 				$this->modelpdf     = $obj->model_pdf;
 				$this->fk_contrat	= $obj->fk_contrat;
 
+				$this->user_creation= $obj->fk_user_author;
+				
 				$this->extraparams	= (array) json_decode($obj->extraparams, true);
 
 				if ($this->statut == 0) $this->brouillon = 1;
@@ -537,7 +539,30 @@ class Fichinter extends CommonObject
 		}
 	}
 
-
+	/**
+	 *	Returns amount based on user thm
+	 *
+	 *	@return     float amount
+	 */
+	function getAmount() {
+		global $db;
+		
+		$amount = 0;
+		
+		$this->author = new User($db);
+		$this->author->fetch($this->user_creation);
+		
+		$thm = $this->author->thm;
+		
+		foreach($this->lines as &$line) {
+			
+			$amount+=$line->qty * $thm;
+			
+		}
+		
+		return $amount;
+	}
+	
 	/**
 	 *	Returns the label status
 	 *
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 09a3fecc4bd..02bf6c5a9ba 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -333,7 +333,8 @@ $listofreferent=array(
 	'class'=>'Fichinter',
 	'table'=>'fichinter',
 	'datefieldname'=>'date_valid',
-	'disableamount'=>1,
+	'disableamount'=>0,
+	'margin'=>'minus',	
     'urlnew'=>DOL_URL_ROOT.'/fichinter/card.php?action=create&origin=project&originid='.$id.'&socid='.$socid,
     'lang'=>'interventions',
     'buttonnew'=>'AddIntervention',
@@ -559,6 +560,7 @@ foreach ($listofreferent as $key => $value)
 				if ($tablename != 'expensereport_det' && method_exists($element, 'fetch_thirdparty')) $element->fetch_thirdparty();
 				if ($tablename == 'don' || $tablename == 'chargesociales') $total_ht_by_line=$element->amount;
 				elseif ($tablename == 'stock_mouvement') $total_ht_by_line=$element->price*abs($element->qty);
+				else if($tablename == 'fichinter') $total_ht_by_line=$element->getAmount();				
 				elseif ($tablename == 'projet_task')
 				{
 					if ($idofelementuser)
@@ -583,6 +585,7 @@ foreach ($listofreferent as $key => $value)
 				if ($qualifiedfortotal) $total_ht = $total_ht + $total_ht_by_line;
 
 				if ($tablename == 'don' || $tablename == 'chargesociales') $total_ttc_by_line=$element->amount;
+				else if($tablename == 'fichinter') $total_ttc_by_line=$element->getAmount();								
 				elseif ($tablename == 'stock_mouvement') $total_ttc_by_line=$element->price*abs($element->qty);
 				elseif ($tablename == 'projet_task')
 				{
@@ -948,6 +951,7 @@ foreach ($listofreferent as $key => $value)
 				    $total_ht_by_line=null;
 				    $othermessage='';
 					if ($tablename == 'don' || $tablename == 'chargesociales') $total_ht_by_line=$element->amount;
+					else if($tablename == 'fichinter') $total_ht_by_line=$element->getAmount();
 					elseif ($tablename == 'stock_mouvement') $total_ht_by_line=$element->price*abs($element->qty);
 					elseif (in_array($tablename, array('projet_task')))
 					{
@@ -988,6 +992,7 @@ foreach ($listofreferent as $key => $value)
 				{
 				    $total_ttc_by_line=null;
 					if ($tablename == 'don' || $tablename == 'chargesociales') $total_ttc_by_line=$element->amount;
+					else if($tablename == 'fichinter') $total_ttc_by_line=$element->getAmount();
 					elseif ($tablename == 'stock_mouvement') $total_ttc_by_line=$element->price*abs($element->qty);
 					elseif ($tablename == 'projet_task')
 					{

From b157398da4f8fa909678ec4a06bcd94d71103da9 Mon Sep 17 00:00:00 2001
From: alexis portable <alexis@atm-consulting.fr>
Date: Tue, 9 May 2017 22:54:33 +0200
Subject: [PATCH 0764/1163] fiche inter fix user author fetch

---
 htdocs/fichinter/class/fichinter.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index b52dfdc904b..d9912edfca1 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -326,7 +326,7 @@ class Fichinter extends CommonObject
 	function fetch($rowid,$ref='')
 	{
 		$sql = "SELECT f.rowid, f.ref, f.description, f.fk_soc, f.fk_statut,";
-		$sql.= " f.datec, f.dateo, f.datee, f.datet,";
+		$sql.= " f.datec, f.dateo, f.datee, f.datet, f.fk_user_author,";
 		$sql.= " f.date_valid as datev,";
 		$sql.= " f.tms as datem,";
 		$sql.= " f.duree, f.fk_projet, f.note_public, f.note_private, f.model_pdf, f.extraparams, fk_contrat";

From 267e66abfa92ed83ee633677092bea20e9ecda4e Mon Sep 17 00:00:00 2001
From: Thomas Raschbacher <lordvan@lordvan.com>
Date: Wed, 10 May 2017 08:48:28 +0200
Subject: [PATCH 0765/1163] Add more fields to projectcontacts substitution

civility added + extrafields for external contacts + isInternal to decide in template wether to list internal or not
---
 .../doc/doc_generic_project_odt.modules.php   | 59 +++++++++++--------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 7d0fe1a41e6..fbe3db84370 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -185,39 +185,50 @@ class doc_generic_project_odt extends ModelePDFProjects
 	function get_substitutionarray_project_contacts($contact,$outputlangs)
 	{
 		global $conf;
+		$pc='projcontacts_'; // prefix to avoid typos
 
-		// adding phone numbers if external
-		$phone_pro = '';
-		$phone_perso = '';
-		$phone_mobile = '';
+		$ret = array(
+			$pc.'id'=>$contact['id'],
+			$pc.'rowid'=>$contact['rowid'],
+			$pc.'role'=>$contact['libelle'],
+			$pc.'lastname'=>$contact['lastname'],
+			$pc.'firstname'=>$contact['firstname'],
+			$pc.'civility'=>$contact['civility'],
+			$pc.'fullcivname'=>$contact['fullname'],
+			$pc.'socname'=>$contact['socname'],
+			$pc.'email'=>$contact['email']
+			);
 
-		$ct = new Contact($this->db);
 		if ($contact['source']=='external') {
+			$ret[$pc.'isInternal'] = ''; // not internal
+			
 			$ct = new Contact($this->db);
 			$ct->fetch($contact['id']);
-			$phone_pro = $ct->phone_pro;
-			$phone_perso = $ct->phone_perso;
-			$phone_mobile = $ct->phone_mobile;
+			$ret[$pc.'phone_pro'] = $ct->phone_pro;
+			$ret[$pc.'phone_perso'] = $ct->phone_perso;
+			$ret[$pc.'phone_mobile'] = $ct->phone_mobile;
+			
+			// fetch external user extrafields
+			require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
+			$extrafields=new ExtraFields($this->db);
+			$extralabels=$extrafields->fetch_name_optionals_label($ct->table_element, true);
+			$extrafields_num = $ct->fetch_optionals($ct->id, $extralabels);
+			//dol_syslog(get_class($this)."::get_substitutionarray_project_contacts: ===== Number of Extrafields found: ".$extrafields_num, LOG_DEBUG);
+			foreach($ct->array_options as $efkey => $efval) {
+				dol_syslog(get_class($this)."::get_substitutionarray_project_contacts: +++++ Extrafield ".$efkey." => ".$efval, LOG_DEBUG);
+				$ret[$pc.$efkey] = $efval; // add nothing else because it already comes as 'options_XX'
+			}
 		} elseif ($contact['source']=='internal') {
+			$ret[$pc.'isInternal'] = '1'; // this is an internal user
+		
 			$ct = new User($this->db);
 			$ct->fetch($contact['id']);
-			$phone_pro = $ct->office_phone;
-			$phone_mobile = $ct->user_mobile;
+			$ret[$pc.'phone_pro'] = $ct->office_phone;
+			$ret[$pc.'phone_perso'] = '';
+			$ret[$pc.'phone_mobile'] = $ct->user_mobile;
+			// do internal users have extrafields ?
 		}
-
-		return array(
-		'projcontacts_id'=>$contact['id'],
-		'projcontacts_rowid'=>$contact['rowid'],
-		'projcontacts_role'=>$contact['libelle'],
-		'projcontacts_lastname'=>$contact['lastname'],
-		'projcontacts_firstname'=>$contact['firstname'],
-		'projcontacts_fullcivname'=>$contact['fullname'],
-		'projcontacts_socname'=>$contact['socname'],
-		'projcontacts_email'=>$contact['email'],
-		'projcontacts_phone_pro'=>$phone_pro,
-		'projcontacts_phone_perso'=>$phone_perso,
-		'projcontacts_phone_mobile'=>$phone_mobile
-		);
+		return $ret;
 	}
 
 	/**

From 0ea69e2e94a6ccf83cfbe02317424546a36a6a6c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 09:58:58 +0200
Subject: [PATCH 0766/1163] Add empty index.html page

---
 htdocs/theme/common/fontawesome/index.html | 0
 htdocs/theme/common/octicons/index.html    | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 htdocs/theme/common/fontawesome/index.html
 create mode 100644 htdocs/theme/common/octicons/index.html

diff --git a/htdocs/theme/common/fontawesome/index.html b/htdocs/theme/common/fontawesome/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/common/octicons/index.html b/htdocs/theme/common/octicons/index.html
new file mode 100644
index 00000000000..e69de29bb2d

From 09f6fe5a528dbe97ea391aaa0ba6b06efa418a35 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 10:06:44 +0200
Subject: [PATCH 0767/1163] Fix lib_notification

---
 htdocs/main.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index fe899012983..333eb25ad89 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1289,7 +1289,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 if ($enablebrowsernotif)
                 {
                     print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
-                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php?version='.urlencode(DOL_VERSION).($ext?'&amp;'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
                 }
             }
             

From 5c33c1773fa8ac97b454c572bd1c80d74d05d5b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 11:47:34 +0200
Subject: [PATCH 0768/1163] FIX XSS

---
 htdocs/core/lib/functions.lib.php |  8 +++++---
 htdocs/index.php                  |  8 ++++----
 htdocs/langs/en_US/agenda.lang    |  1 +
 test/phpunit/SecurityTest.php     | 26 +++++++++++++++++++++++++-
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 89e3a9ea00d..ab75fce37e6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -380,7 +380,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	            break;
 	        case 'aZ09':
 	            $out=trim($out);
-	            if (preg_match('/[^a-z0-9_]+/i',$out)) $out='';
+	            if (preg_match('/[^a-z0-9_\-]+/i',$out)) $out='';
 	            break;
 	        case 'array':
 	            if (! is_array($out) || empty($out)) $out=array();
@@ -3104,7 +3104,7 @@ function dol_print_error($db='',$error='',$errors=null)
 		if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
 		{
 			$out.="<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";
-			$out.="<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror()?$db->lastqueryerror():$langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out.="<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno()?$db->lasterrno():$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror()?$db->lasterror():$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<br>\n";
@@ -3112,7 +3112,9 @@ function dol_print_error($db='',$error='',$errors=null)
 		else                            // Mode CLI
 		{
 			$out.='> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
-			$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?$db->lastqueryerror():$langs->trans("ErrorNoRequestInError"))."\n";
+			$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."\n";
+			// To make detection of xss vulnerabilities or sql injection easier with a scanner, replace line with this one:
+			//$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?$db->lastqueryerror:$langs->trans("ErrorNoRequestInError"))."\n";
 			$out.='> '.$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno()?$db->lasterrno():$langs->trans("ErrorNoRequestInError"))."\n";
 			$out.='> '.$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror()?$db->lasterror():$langs->trans("ErrorNoRequestInError"))."\n";
 
diff --git a/htdocs/index.php b/htdocs/index.php
index 1431f73ca7d..5ab2fa68cd4 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -55,10 +55,10 @@ if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FO
 if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax disabled)
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-	$zone=GETPOST('areacode');
-	$userid=GETPOST('userid');
-	$boxorder=GETPOST('boxorder');
-	$boxorder.=GETPOST('boxcombo');
+	$zone=GETPOST('areacode', 'aZ09');
+	$userid=GETPOST('userid', 'int');
+	$boxorder=GETPOST('boxorder', 'aZ09');
+	$boxorder.=GETPOST('boxcombo', 'aZ09');
 
 	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
 	if ($result > 0) setEventMessages($langs->trans("BoxAdded"), null);
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 2b1b6bafb3a..9e7af7b0d06 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -76,6 +76,7 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 ##### End agenda events #####
+AgendaModelModule=Document templates for event
 DateActionStart=Start date
 DateActionEnd=End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 00714e7bfab..288a15c317e 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -147,7 +147,9 @@ class SecurityTest extends PHPUnit_Framework_TestCase
 		$_GET["param2"]='a/b#e(pr)qq-rr\cc';
         $_GET["param3"]='"a/b#e(pr)qq-rr\cc';    // Same than param2 + "
         $_GET["param4"]='../dir';
-
+        $_GET["param5"]="a_1-b";
+        
+        // Test int
         $result=GETPOST('id','int');              // Must return nothing
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,'');
@@ -160,6 +162,7 @@ class SecurityTest extends PHPUnit_Framework_TestCase
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,333);
 
+        // Test alpha
         $result=GETPOST("param2",'alpha');
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,$_GET["param2"]);
@@ -172,6 +175,27 @@ class SecurityTest extends PHPUnit_Framework_TestCase
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,'');
 
+        // Test aZ09
+        $result=GETPOST("param1",'aZ09');  // Must return '' as there is a forbidden char ../
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,$_GET["param1"]);
+        
+        $result=GETPOST("param2",'aZ09');  // Must return '' as there is a forbidden char ../
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,'');
+        
+        $result=GETPOST("param3",'aZ09');  // Must return '' as there is a forbidden char ../
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,'');
+        
+        $result=GETPOST("param4",'aZ09');  // Must return '' as there is a forbidden char ../
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,'');
+        
+        $result=GETPOST("param5",'aZ09');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result,$_GET["param5"]);
+
         return $result;
     }
 

From 8e25155fc92bf2edc964a0c4ddbfce4dc7f0f7d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 12:02:41 +0200
Subject: [PATCH 0769/1163] Better escaping of error message.

---
 htdocs/core/lib/functions.lib.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ab75fce37e6..78fbca7b0b5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3105,18 +3105,17 @@ function dol_print_error($db='',$error='',$errors=null)
 		{
 			$out.="<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";
 			$out.="<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
-			$out.="<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno()?$db->lasterrno():$langs->trans("ErrorNoRequestInError"))."<br>\n";
-			$out.="<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror()?$db->lasterror():$langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out.="<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno()?dol_escape_htmltag($db->lasterrno()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out.="<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror()?dol_escape_htmltag($db->lasterror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<br>\n";
 		}
 		else                            // Mode CLI
 		{
-			$out.='> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
-			$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."\n";
-			// To make detection of xss vulnerabilities or sql injection easier with a scanner, replace line with this one:
-			//$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?$db->lastqueryerror:$langs->trans("ErrorNoRequestInError"))."\n";
-			$out.='> '.$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno()?$db->lasterrno():$langs->trans("ErrorNoRequestInError"))."\n";
-			$out.='> '.$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror()?$db->lasterror():$langs->trans("ErrorNoRequestInError"))."\n";
+		    // No dol_escape_htmltag for output, we are in CLI mode
+		    $out.='> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
+			$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?$db->lastqueryerror():$langs->transnoentities("ErrorNoRequestInError"))."\n";
+			$out.='> '.$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno()?$db->lasterrno():$langs->transnoentities("ErrorNoRequestInError"))."\n";
+			$out.='> '.$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror()?$db->lasterror():$langs->transnoentities("ErrorNoRequestInError"))."\n";
 
 		}
 		$syslog.=", sql=".$db->lastquery();

From 9b4b096e8679d89d936882eaf8f417a167677302 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 12:35:05 +0200
Subject: [PATCH 0770/1163] Debug variant module

---
 htdocs/variants/card.php       | 20 +++----
 htdocs/variants/create_val.php | 98 +++++++++++++++++++++++++---------
 2 files changed, 82 insertions(+), 36 deletions(-)

diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index a611767cf2f..f5d35019971 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -19,13 +19,13 @@ require '../main.inc.php';
 require 'class/ProductAttribute.class.php';
 require 'class/ProductAttributeValue.class.php';
 
-$id = GETPOST('id');
-$valueid = GETPOST('valueid');
-$action = GETPOST('action');
-$label = GETPOST('label');
-$ref = GETPOST('ref');
-$confirm = GETPOST('confirm');
-$cancel = GETPOST('cancel');
+$id = GETPOST('id','int');
+$valueid = GETPOST('valueid','alpha');
+$action = GETPOST('action','alpha');
+$label = GETPOST('label','alpha');
+$ref = GETPOST('ref','alpha');
+$confirm = GETPOST('confirm','alpha');
+$cancel = GETPOST('cancel','alpha');
 
 $object = new ProductAttribute($db);
 $objectval = new ProductAttributeValue($db);
@@ -92,10 +92,10 @@ if ($confirm == 'yes') {
 			setEventMessage($langs->trans('RecordSaved'));
 			header('Location: '.dol_buildpath('/variants/list.php', 2));
 		}
-
 		exit();
-	} elseif ($action == 'confirm_deletevalue') {
-
+	}
+	elseif ($action == 'confirm_deletevalue') 
+	{
 		if ($objectval->fetch($valueid) > 0) {
 
 			if ($objectval->delete() < 1) {
diff --git a/htdocs/variants/create_val.php b/htdocs/variants/create_val.php
index a5ee085cf40..2f463286787 100644
--- a/htdocs/variants/create_val.php
+++ b/htdocs/variants/create_val.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,83 +19,130 @@ require '../main.inc.php';
 require 'class/ProductAttribute.class.php';
 require 'class/ProductAttributeValue.class.php';
 
-$id = GETPOST('id');
-$ref = GETPOST('ref');
-$value = GETPOST('value');
+$id = GETPOST('id','int');
+$ref = GETPOST('ref','alpha');
+$value = GETPOST('value','alpha');
 
-$prodattr = new ProductAttribute($db);
-$prodattrval = new ProductAttributeValue($db);
+$action=GETPOST('action','alpha');
+$cancel=GETPOST('cancel','alpha');
+$backtopage=GETPOST('backtopage','alpha');
 
-if ($prodattr->fetch($id) < 1) {
+$object = new ProductAttribute($db);
+$objectval = new ProductAttributeValue($db);
+
+if ($object->fetch($id) < 1) {
 	dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
 	exit();
 }
 
-if ($_POST) {
 
+/*
+ * Actions
+ */
+
+if ($cancel)
+{
+    $action='';
+    header('Location: '.DOL_URL_ROOT.'/variants/card.php?id='.$object->id);
+    exit();
+}
+
+// None
+
+
+
+/*
+ * View
+ */
+
+if ($action == 'add')
+{
 	if (empty($ref) || empty($value)) {
 		setEventMessage($langs->trans('ErrorFieldsRequired'), 'errors');
 	} else {
 
-		$prodattrval->fk_product_attribute = $prodattr->id;
-		$prodattrval->ref = $ref;
-		$prodattrval->value = $value;
+		$objectval->fk_product_attribute = $object->id;
+		$objectval->ref = $ref;
+		$objectval->value = $value;
 
-		if ($prodattrval->create() > 0) {
+		if ($objectval->create() > 0) {
 			setEventMessage($langs->trans('RecordSaved'));
-			header('Location: '.dol_buildpath('/variants/card.php?id='.$prodattr->id, 2));
+			header('Location: '.DOL_URL_ROOT.'/variants/card.php?id='.$object->id);
 			exit();
 		} else {
 			setEventMessage($langs->trans('ErrorCreatingProductAttributeValue'), 'errors');
 		}
 	}
-
 }
 
 $langs->load('products');
 
-$title = $langs->trans('ProductAttributeName', dol_htmlentities($prodattr->label));
+$title = $langs->trans('ProductAttributeName', dol_htmlentities($object->label));
 
 llxHeader('', $title);
 
-print_fiche_titre($title);
+$h=0;
+$head[$h][0] = DOL_URL_ROOT.'/variants/card.php?id='.$object->id;
+$head[$h][1] = $langs->trans("Card");
+$head[$h][2] = 'variant';
+$h++;
 
-dol_fiche_head();
+dol_fiche_head($head, 'variant', $langs->trans('ProductAttributeName'), -1, 'generic');
 
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 ?>
 <table class="border" style="width: 100%">
 	<tr>
-		<td style="width: 15%" class="fieldrequired"><?php echo $langs->trans('Ref') ?></td>
-		<td><?php echo dol_htmlentities($prodattr->ref) ?>
+		<td class="titlefield fieldrequired"><?php echo $langs->trans('Ref') ?></td>
+		<td><?php echo dol_htmlentities($object->ref) ?>
 	</tr>
 	<tr>
-		<td style="width: 15%" class="fieldrequired"><?php echo $langs->trans('Label') ?></td>
-		<td><?php echo dol_htmlentities($prodattr->label) ?></td>
+		<td class="fieldrequired"><?php echo $langs->trans('Label') ?></td>
+		<td><?php echo dol_htmlentities($object->label) ?></td>
 	</tr>
 </table>
 
 <?php
+print '</div>';
 
 dol_fiche_end();
 
+print '<br>';
+
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="add">';
+print '<input type="hidden" name="id" value="'.$object->id.'">';
+print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+
 print_fiche_titre($langs->trans('NewProductAttributeValue'));
 
 dol_fiche_head();
+
 ?>
-<form method="post">
 	<table class="border" style="width: 100%">
 		<tr>
-			<td style="width: 15%" class="fieldrequired"><label for="ref"><?php echo $langs->trans('Ref') ?></label></td>
+			<td class="titlefield fieldrequired"><label for="ref"><?php echo $langs->trans('Ref') ?></label></td>
 			<td><input id="ref" type="text" name="ref" value="<?php echo $ref ?>"></td>
 		</tr>
 		<tr>
-			<td style="width: 15%" class="fieldrequired"><label for="value"><?php echo $langs->trans('Value') ?></label></td>
+			<td class="fieldrequired"><label for="value"><?php echo $langs->trans('Value') ?></label></td>
 			<td><input id="value" type="text" name="value" value="<?php echo $value ?>"></td>
 		</tr>
 	</table>
 <?php
+
 dol_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></div></form>';
+print '<div class="center">';
+print '<input type="submit" class="button" name="create" value="'.$langs->trans("Create").'">';
+print ' &nbsp; ';
+print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+print '</div>';
 
-llxFooter();
\ No newline at end of file
+print '</form>';
+
+llxFooter();
+$db->close();

From 578eb98b3332a4c14af91c97546f486ab1d1ba88 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 13:13:33 +0200
Subject: [PATCH 0771/1163] Better user interface

---
 htdocs/adherents/type.php             |  8 ++++++--
 htdocs/admin/defaultvalues.php        |  7 +++----
 htdocs/admin/ihm.php                  | 26 ++++++++++++--------------
 htdocs/admin/translation.php          |  4 +++-
 htdocs/langs/en_US/modulebuilder.lang |  4 ++--
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index ab6bfcc0704..fb147750e0b 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -82,9 +82,11 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter_x") || GETP
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('membertypecard','globalcard'));
 
+
 /*
  *	Actions
  */
+
 if ($action == 'add' && $user->rights->adherent->configurer)
 {
 	if (! $cancel)
@@ -308,12 +310,13 @@ if ($rowid > 0)
 
 		$head = member_type_prepare_head($object);
 
-		dol_fiche_head($head, 'card', $langs->trans("MemberType"), 0, 'group');
+		dol_fiche_head($head, 'card', $langs->trans("MemberType"), -1, 'group');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/type.php">'.$langs->trans("BackToList").'</a>';
 
 		dol_banner_tab($object, 'rowid', $linkback);
 		
+		print '<div class="fichecenter">';
 		print '<div class="underbanner clearboth"></div>';
 		
 		print '<table class="border" width="100%">';
@@ -342,7 +345,8 @@ if ($rowid > 0)
 		}
 
 		print '</table>';
-
+        print '</div>';
+        
 		dol_fiche_end();
 
 
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index dd37e4987e5..013be811b5b 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -172,9 +172,6 @@ if ($action == 'delete')
 
 
 
-
-
-
 /*
  * View
  */
@@ -323,7 +320,9 @@ else
 	print '<td align="center">';
 	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 }
-print '<input type="submit" class="button" value="'.$langs->trans("Add").'" name="add">';
+$disabled='';
+if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) $disabled=' disabled="disabled"';
+print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add">';
 print "</td>\n";
 print '</tr>';
 
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 739a6fa4c88..cfa08f003ea 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -362,13 +362,6 @@ if ($action == 'edit')	// Edit
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
-	// Hide helpcenter link on login page
-	print '<tr><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
-	print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK',isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0,1);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-	
 	// Message of the day on home page
     print '<tr><td class="titlefield">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
 
@@ -393,8 +386,14 @@ if ($action == 'edit')	// Edit
 	$doleditor->Create();
 	print '</td></tr>'."\n";
 	
-	// Background
+	// Hide helpcenter link on login page
+	print '<tr><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
+	print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK',isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0,1);
+	print '</td>';
+	print '<td width="20">&nbsp;</td>';
+	print '</tr>';
 	
+	// Background
 	print '<tr><td><label for="imagebackground">'.$langs->trans("BackgroundImageLogin").' (png,jpg)</label></td><td colspan="2">';
     print '<div class="centpercent inline-block">';
 	print '<input type="file" class="flat class=minwidth200" name="imagebackground" id="imagebackground">';
@@ -531,11 +530,6 @@ else	// Show
     // Link to wiki help
     print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td colspan="2">';
     print yn((isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0),1);
-    print '</td></tr>';
-
-	// Link to help center
-    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td colspan="2">';
-    print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0),1);
     print '</td></tr>';
 
     // Message of the day
@@ -558,8 +552,12 @@ else	// Show
     else print '&nbsp;';
     print '</td></tr>'."\n";
     
+	// Link to help center
+    print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td colspan="2">';
+    print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0),1);
+    print '</td></tr>';
+
     // Background login
-    
     print '<tr class="oddeven"><td>'.$langs->trans("BackgroundImageLogin").'</td><td colspan="2">';
     print '<div class="centpercent inline-block">';
     print $conf->global->MAIN_LOGIN_BACKGROUND;
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index c51d1c2435d..44387bc2041 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -264,7 +264,9 @@ if ($mode == 'overwrite')
     	print '<td align="center">';
     	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
     //}
-    print '<input type="submit" class="button" value="'.$langs->trans("Add").'" name="add">';
+    $disabled='';
+    if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) $disabled=' disabled="disabled"';
+    print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add">';
     print "</td>\n";
     print '</tr>';
     
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 81a34b66b85..da734ea1356 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=This tools give you utilites to build or edit your own module.
-ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>. 
-ModuleBuilderDesc3=Modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
+ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
 NewModule=New module
 ModuleKey=Key for new module
 

From 5a31d2c95a6deba953720f2ceaacbe7ecce51135 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 13:39:00 +0200
Subject: [PATCH 0772/1163] Fix css

---
 .../modulebuilder/template/myobject_card.php  | 346 ++++++++++++++++++
 htdocs/societe/class/societe.class.php        |  44 +--
 2 files changed, 368 insertions(+), 22 deletions(-)
 create mode 100644 htdocs/modulebuilder/template/myobject_card.php

diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
new file mode 100644
index 00000000000..a257149c72a
--- /dev/null
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -0,0 +1,346 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    myobject_list.php
+ * \ingroup mymodule
+ * \brief   Page with list of myobject.
+ *
+ * List of myobject
+ */
+
+//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
+//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
+//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
+//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
+//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
+
+// Change the following lines to use the correct relative path (../, ../../, etc)
+
+// Load Dolibarr environment
+if (false === (@include '../../main.inc.php')) {  // From htdocs directory
+	require '../../../main.inc.php'; // From "custom" directory
+}
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+dol_include_once('/mymodule/class/myclass.class.php');
+
+// Load translation files required by the page
+$langs->load("mymodule@mymodule");
+
+// Get parameters
+$action     = GETPOST('action','alpha');
+$confirm    = GETPOST('confirm','alpha');
+
+$id			= GETPOST('id','int');
+$backtopage = GETPOST('backtopage');
+// TODO Add here list of search params
+$myparam	= GETPOST('myparam','alpha');
+
+if (empty($action) && empty($id) && empty($ref)) $action='view';
+
+// Protection if external user
+if ($user->societe_id > 0)
+{
+	//accessforbidden();
+}
+//$result = restrictedArea($user, 'mymodule', $id);
+
+$object = new Skeleton_Class($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+// Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('skeleton'));
+
+
+/*
+ * ACTIONS
+ *
+ * Put here all code to do according to value of "action" parameter
+ */
+
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	if ($cancel) 
+	{
+		if ($action != 'addlink')
+		{
+			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+			header("Location: ".$urltogo);
+			exit;
+		}		
+		if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
+		$action='';
+	}
+	
+	// Action to add record
+	if ($action == 'add' && ! empty($user->rights->mymodule->create))
+	{
+		if ($cancel)
+		{
+			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+			header("Location: ".$urltogo);
+			exit;
+		}
+
+		$error=0;
+
+		/* object_prop_getpost_prop */
+		$object->prop1=GETPOST("field1");
+		$object->prop2=GETPOST("field2");
+
+		if (empty($object->ref))
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
+		}
+
+		if (! $error)
+		{
+			$result=$object->create($user);
+			if ($result > 0)
+			{
+				// Creation OK
+				$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+				header("Location: ".$urltogo);
+				exit;
+			}
+			{
+				// Creation KO
+				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+				else  setEventMessages($object->error, null, 'errors');
+				$action='create';
+			}
+		}
+		else
+		{
+			$action='create';
+		}
+	}
+
+	// Action to update record
+	if ($action == 'update' && ! empty($user->rights->mymodule->create))
+	{
+		$error=0;
+
+		$object->prop1=GETPOST("field1");
+		$object->prop2=GETPOST("field2");
+
+		if (empty($object->ref))
+		{
+			$error++;
+			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
+		}
+
+		if (! $error)
+		{
+			$result=$object->update($user);
+			if ($result > 0)
+			{
+				$action='view';
+			}
+			else
+			{
+				// Creation KO
+				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+				else setEventMessages($object->error, null, 'errors');
+				$action='edit';
+			}
+		}
+		else
+		{
+			$action='edit';
+		}
+	}
+
+	// Action to delete
+	if ($action == 'confirm_delete' && ! empty($user->rights->mymodule->delete))
+	{
+		$result=$object->delete($user);
+		if ($result > 0)
+		{
+			// Delete OK
+			setEventMessages("RecordDeleted", null, 'mesgs');
+			header("Location: ".dol_buildpath('/mymodule/list.php',1));
+			exit;
+		}
+		else
+		{
+			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+			else setEventMessages($object->error, null, 'errors');
+		}
+	}
+}
+
+
+
+/*
+ * VIEW
+ *
+ * Put here all code to build page
+ */
+
+$form = new Form($db);
+
+llxHeader('', $langs->trans('MyPageName'), '');
+
+
+// Put here content of your page
+
+// Example : Adding jquery code
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	function init_myfunc()
+	{
+		jQuery("#myid").removeAttr(\'disabled\');
+		jQuery("#myid").attr(\'disabled\',\'disabled\');
+	}
+	init_myfunc();
+	jQuery("#mybutton").click(function() {
+		init_myfunc();
+	});
+});
+</script>';
+
+
+// Part to create
+if ($action == 'create')
+{
+	print load_fiche_titre($langs->trans("NewMyModule"));
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+
+	dol_fiche_head();
+
+	print '<table class="border centpercent">'."\n";
+	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
+	// LIST_OF_TD_LABEL_FIELDS_CREATE
+	print '</table>'."\n";
+
+	dol_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+
+	print '</form>';
+}
+
+
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit')
+{
+	print load_fiche_titre($langs->trans("MyModule"));
+    
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
+	
+	dol_fiche_head();
+
+	print '<table class="border centpercent">'."\n";
+	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
+	// LIST_OF_TD_LABEL_FIELDS_EDIT
+	print '</table>';
+	
+	dol_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+
+	print '</form>';
+}
+
+
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
+{
+    $res = $object->fetch_optionals($object->id, $extralabels);
+
+	$head = commande_prepare_head($object);
+	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), 0, 'order');
+		
+	print load_fiche_titre($langs->trans("MyModule"));
+    
+	dol_fiche_head();
+
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
+		print $formconfirm;
+	}
+	
+	print '<table class="border centpercent">'."\n";
+	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
+	// LIST_OF_TD_LABEL_FIELDS_VIEW
+	print '</table>';
+	
+	dol_fiche_end();
+
+
+	// Buttons
+	print '<div class="tabsAction">'."\n";
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+	if (empty($reshook))
+	{
+		if ($user->rights->mymodule->write)
+		{
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+		}
+
+		if ($user->rights->mymodule->delete)
+		{
+			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+		}
+	}
+	print '</div>'."\n";
+
+
+	// Example 2 : Adding links to objects
+	// Show links to link elements
+	//$linktoelem = $form->showLinkToObjectBlock($object, null, array('skeleton'));
+	//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 0581ed1960e..6d3464ccc20 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1838,29 +1838,29 @@ class Societe extends CommonObject
 
         $name=$this->name?$this->name:$this->nom;
 
-	if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
-	{
-		if (($this->client) && (! empty ( $this->code_client ))
-			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
-			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
-			)
-		) 
-			$code = $this->code_client . ' - ';
+    	if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
+    	{
+    		if (($this->client) && (! empty ( $this->code_client ))
+    			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
+    			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
+    			)
+    		) 
+    		$code = $this->code_client . ' - ';
 
-		if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
-			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
-			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
-			)
-		) 
-			$code .= $this->code_fournisseur . ' - ';
+    		if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
+    			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
+    			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
+    			)
+    		) 
+    		$code .= $this->code_fournisseur . ' - ';
+    
+    		if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
+    			$name =$code.' '.$name;
+    		else
+    			$name =$code;
+    	}
 
-		if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
-			$name =$code.' '.$name;
-		else
-			$name =$code;
-	}
-
-	if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
+    	if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
 
         $result=''; $label='';
         $linkstart=''; $linkend='';
@@ -1962,7 +1962,7 @@ class Societe extends CommonObject
             $linkend='';
         }
         
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1).$linkend);
         if ($withpicto && $withpicto != 2) $result.=' ';
         if ($withpicto != 2) $result.=$linkstart.($maxlen?dol_trunc($name,$maxlen):$name).$linkend;
 

From 0156e99894cc25b183af899265b435cc8cd72318 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 13:46:02 +0200
Subject: [PATCH 0773/1163] Code comment

---
 htdocs/core/lib/functions.lib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 78fbca7b0b5..bd3a79e7241 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -242,9 +242,10 @@ function dol_shutdown()
  *  @param	string	$paramname   Name of parameter to found
  *  @param	string	$check	     Type of check (''=no check,  'int'=check it's numeric, 'alpha'=check it's text and sign, 'aZ'=check it's a-z only, 'array'=check it's array, 'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string), 'day', 'month', 'year', 'custom'= custom filter specify $filter and $options)
  *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get, 4 = post then get then cookie)
- *  @param  int     $filter      Filter to apply when $check is set to custom. (See http://php.net/manual/en/filter.filters.php for détails)
- *  @param  mixed   $options     Options to pass to filter_var when $check is set to custom
+ *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
+ *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'.
  *  @return string|string[]      Value found (string or array), or '' if check fails
+ *  @TODO Set default value for check to alpha. Check all WYSIWYG edition (email and description...) is still ok with rich text.
  */
 function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 {

From ec03d1705b109547506685c985d0c342edfa5f94 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 13:56:05 +0200
Subject: [PATCH 0774/1163] Fix travis

---
 .../template/build/makepack-dolibarrmodule.pl | 388 ------------------
 .../template/build/makepack-mymodule.conf     |  17 +-
 .../template/class/ParsedownDolibarr.php      |  48 ---
 .../template/class/actions_mymodule.class.php |   4 +-
 .../js/{myjs.js.php => mymodule.js.php}       |   2 +-
 .../functional/MyModuleFunctionalTest.php     |  10 +-
 .../template/test/unit/MyClassTest.php        |   8 +-
 7 files changed, 12 insertions(+), 465 deletions(-)
 delete mode 100644 htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl
 delete mode 100644 htdocs/modulebuilder/template/class/ParsedownDolibarr.php
 rename htdocs/modulebuilder/template/js/{myjs.js.php => mymodule.js.php} (96%)

diff --git a/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl b/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl
deleted file mode 100644
index 537fead0d40..00000000000
--- a/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl
+++ /dev/null
@@ -1,388 +0,0 @@
-#!/usr/bin/perl
-#----------------------------------------------------------------------------
-# \file         build/makepack-dolibarrmodule.pl
-# \brief        Package builder (tgz, zip, rpm, deb, exe)
-# \author       (c)2005-2006    Laurent Destailleur <eldy@users.sourceforge.net>
-#               (c)2016         Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
-#----------------------------------------------------------------------------
-
-use Cwd;
-
-
-@LISTETARGET=("TGZ");   # Possible packages
-%REQUIREMENTTARGET=(    # Tool requirement for each package
-"TGZ"=>"tar",
-"ZIP"=>"7z"
-);
-%ALTERNATEPATH=(
-);
-
-
-use vars qw/ $REVISION $VERSION /;
-$REVISION='1.20';
-$VERSION="1.0 (build $REVISION)";
-
-
-
-#------------------------------------------------------------------------------
-# MAIN
-#------------------------------------------------------------------------------
-($DIR=$0) =~ s/([^\/\\]+)$//; ($PROG=$1) =~ s/\.([^\.]*)$//; $Extension=$1;
-$DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
-
-# Detect OS type
-# --------------
-if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
-elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
-elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
-if (! $OS) {
-    print "makepack-dolbarrmodule.pl was not able to detect your OS.\n";
-	print "Can't continue.\n";
-	print "makepack-dolibarrmodule.pl aborted.\n";
-    sleep 2;
-	exit 1;
-}
-
-# Define buildroot
-# ----------------
-if ($OS =~ /linux/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
-}
-if ($OS =~ /macos/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
-}
-if ($OS =~ /windows/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp";
-    $PROGPATH=$ENV{"ProgramFiles"};
-}
-if (! $TEMP || ! -d $TEMP) {
-    print "Error: A temporary directory can not be find.\n";
-    print "Check that TEMP or TMP environment variable is set correctly.\n";
-	print "makepack-dolibarrmodule.pl aborted.\n";
-    sleep 2;
-    exit 2;
-} 
-$BUILDROOT="$TEMP/dolibarr-buildroot";
-
-
-my $copyalreadydone=0;
-my $batch=0;
-
-for (0..@ARGV-1) {
-	if ($ARGV[$_] =~ /^-*target=(\w+)/i)   { $target=$1; $batch=1; }
-	if ($ARGV[$_] =~ /^-*desti=(.+)/i)     { $DESTI=$1; }
-    if ($ARGV[$_] =~ /^-*prefix=(.+)/i)    {
-    	$PREFIX=$1; 
-    	$FILENAMESNAPSHOT.="-".$PREFIX; 
-    }
-}
-$SOURCE="$DIR/..";
-$DESTI="$SOURCE/build";
-if ($ENV{"DESTIMODULES"}) { $DESTI = $ENV{"DESTIMODULES"}; }		# Force output dir if env DESTIMODULES is defined
-$NEWDESTI=$DESTI;
-
-
-print "Makepack for modules version $VERSION\n";
-print "Source directory: $SOURCE\n";
-print "Target directory: $NEWDESTI\n";
-
-# Autodetect version and module name
-$mod_dir = "../core/modules/";
-opendir(DIR, $mod_dir);
-@mod_files=grep { /^mod\w*\.class.php$/ } readdir(DIR);
-foreach $file (@mod_files) {
-	$PROJECTINPUT=lc $1 if $file =~ /^mod(\w*)\.class.php$/;
-	$file = $mod_dir . $file;
-	open FILE, $file or die $!;
-	@file_content = <FILE>;
-	close FILE;
-	foreach $line (@file_content) {
-		# Extracts version number
-		$PROJVERSION=$1 if $line =~ /(?<=version\s=\s')(\d+(\.\d+){1,2})/;
-	}
-}
-
-# Ask and set version $MAJOR, $MINOR and $BUILD
-if ($PROJVERSION eq '')
-{
-	print "Enter value for version: ";
-	$PROJVERSION=<STDIN>;
-}
-chomp($PROJVERSION);
-($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
-if ($MINOR eq '')
-{
-    print "Enter value for minor version: ";
-    $MINOR=<STDIN>;
-    chomp($MINOR);
-}
-
-# Ask module
-if ($PROJECTINPUT eq '')
-{
-	print "Enter name for your module (mymodule, mywonderfulmondule, ... or 'all') : ";
-	$PROJECTINPUT=<STDIN>;
-}
-chomp($PROJECTINPUT);
-print "Move to ".$DIR." directory.\n";
-chdir($DIR);
-
-
-my @PROJECTLIST=();
-if ($PROJECTINPUT eq "all")
-{
-    opendir(DIR, $DIR) || return;
-    local @rv = grep { /^makepack\-(.*)\.conf$/ } sort readdir(DIR);
-    closedir(DIR);
-    foreach my $xxx (0..@rv-1) {
-    	if ($rv[$xxx] =~ /^makepack\-(.*)\.conf$/)
-    	{ 
-    	   @PROJECTLIST[$xxx]=$1;
-    	}
-    }
-}
-else
-{
-	@PROJECTLIST=($PROJECTINPUT);
-}
-
-
-# Loop on each projects
-foreach my $PROJECT (@PROJECTLIST) {
-	
-	if (! -f "makepack-".$PROJECT.".conf")
-	{
-	    print "Error: can't open conf file makepack-".$PROJECT.".conf\n";
-		print "\n";
-		print "For help on building a module package, see web page\n";
-		print 
-"http://wiki.dolibarr.org/cindex.php/Module_development#Create_a_package_to_distribute_and_install_your_module\n";
-		print "makepack-dolibarrmodule.pl aborted.\n";
-	    sleep 2;
-	    exit 2;
-	}
-	
-	$FILENAME="$PROJECT";
-	$FILENAMETGZ="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
-	$FILENAMEZIP="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
-	if (-d "/usr/src/redhat") {
-	    # redhat
-	    $RPMDIR="/usr/src/redhat";
-	}
-	if (-d "/usr/src/RPM") {
-	    # mandrake
-	    $RPMDIR="/usr/src/RPM";
-	}
-	
-	
-	# Choose package targets
-	#-----------------------
-	$target="ZIP";    # Dolibarr modules are this format
-	$CHOOSEDTARGET{uc($target)}=1;
-	
-	
-	# Test if requirement is ok
-	#--------------------------
-	foreach my $target (keys %CHOOSEDTARGET) {
-	    foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) {
-	        # Test    
-	        print "Test requirement for target $target: Search '$req'... ";
-	        $ret=`"$req" 2>&1`;
-	        $coderetour=$?; $coderetour2=$coderetour>>8;
-	        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { 
-	            # Not found error, we try in PROGPATH
-	            $ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
-	            $coderetour=$?; $coderetour2=$coderetour>>8;
-	            $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req";
-	        }    
-	
-	        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) {
-	            # Not found error
-	            print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
-	            $CHOOSEDTARGET{$target}=-1;
-	            last;
-	        } else {
-	            # Pas erreur ou erreur autre que programme absent
-	            print " Found ".$REQUIREMENTTARGET{$target}."\n";
-	        }
-	    }
-	}
-	
-	print "\n";
-	
-	# Check if there is at least on target to build
-	#----------------------------------------------
-	$nboftargetok=0;
-	$nboftargetneedbuildroot=0;
-	$nboftargetneedcvs=0;
-	foreach my $target (keys %CHOOSEDTARGET) {
-	    if ($CHOOSEDTARGET{$target} < 0) { next; }
-		if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') 
-		{
-			$nboftargetneedbuildroot++;
-		}
-		if ($target eq 'SNAPSHOT')
-		{
-			$nboftargetneedcvs++;
-		}
-		$nboftargetok++;
-	}
-	
-	if ($nboftargetok) {
-	
-	    # Update CVS if required
-	    #-----------------------
-	    if ($nboftargetneedcvs)
-		{
-	    	print "Go to directory $SOURCE\n";
-	   		$olddir=getcwd();
-	   		chdir("$SOURCE");
-	    	print "Run cvs update -P -d\n";
-	    	$ret=`cvs update -P -d 2>&1`;
-	    	chdir("$olddir");
-		}
-		
-	    # Update buildroot if required
-	    #-----------------------------
-	    if ($nboftargetneedbuildroot)
-		{
-		    if (! $copyalreadydone) {
-		    	print "Delete directory $BUILDROOT\n";
-		    	$ret=`rm -fr "$BUILDROOT"`;
-	
-		    	mkdir "$BUILDROOT";
-		    	mkdir "$BUILDROOT/$PROJECT";
-		    	
-				$result=open(IN,"<makepack-".$PROJECT.".conf");
-				if (! $result) { die "Error: Can't open conf file makepack-".$PROJECT.".conf for reading.\n"; }
-			    while(<IN>)
-			    {
-			    	if ($_ =~ /^#/) { next; }	# Do not process comments
-					
-					$_ =~ s/\n//;
-			    	$_ =~ /^(.*)\/[^\/]+/;
-			    	print "Create directory $BUILDROOT/$PROJECT/$1\n";
-			    	$ret=`mkdir -p "$BUILDROOT/$PROJECT/$1"`;
-			    	if ($_ !~ /version\-/)
-			    	{
-			    	    print "Copy $SOURCE/$_ into $BUILDROOT/$PROJECT/$_\n";
-		    		    $ret=`cp -pr "$SOURCE/$_" "$BUILDROOT/$PROJECT/$_"`;
-			    	}
-				}	
-				close IN;
-				
-				@timearray=localtime(time());
-				$fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1];
-#				open(VF,">$BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt");
-#		
-#				print "Create version file $BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt with date ".$fulldate."\n";
-#				$ret=`mkdir -p "$BUILDROOT/$PROJECT/build"`;
-#				print VF "Version: ".$MAJOR.".".$MINOR.($BUILD ne ''?".$BUILD":"")."\n";
-#				print VF "Build  : ".$fulldate."\n";
-#				close VF;
-		    }
-		    print "Clean $BUILDROOT\n";
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
-	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
-	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
-		}    
-	    
-	    # Build package for each target
-	    #------------------------------
-	    foreach my $target (keys %CHOOSEDTARGET) {
-	        if ($CHOOSEDTARGET{$target} < 0) { next; }
-	    
-	        print "\nBuild package for target $target\n";
-	        
-	    	if ($target eq 'TGZ') {
-	    		$NEWDESTI=$DESTI;
-				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; } 
-
-	    		print "Remove target $FILENAMETGZ.tgz...\n";
-	    		unlink("$NEWDESTI/$FILENAMETGZ.tgz");
-	    		print "Compress $BUILDROOT/* into $FILENAMETGZ.tgz...\n";
-	   		    $cmd="tar --exclude-vcs --exclude *.tgz --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" .";
-	   		    $ret=`$cmd`;
-	            if ($OS =~ /windows/i) {
-	        		print "Move $FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
-	        		$ret=`mv "$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
-	            }
-	            else
-	            {
-	        		$ret=`mv "$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
-	            }
-	            next;
-	    	}
-	
-	    	if ($target eq 'ZIP') {
-	    		$NEWDESTI=$DESTI;
-				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; }
-				 
-	    		print "Remove target $FILENAMEZIP.zip...\n";
-	    		unlink "$NEWDESTI/$FILENAMEZIP.zip";
-	    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
-	
-	            print "Go to directory $BUILDROOT\n";
-	     		$olddir=getcwd();
-	     		chdir("$BUILDROOT");
-	    		$cmd= "7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip *";
-				print $cmd."\n";
-				$ret= `$cmd`;
-	            chdir("$olddir");
-	
-	            print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
-	            $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
-	    		next;
-	    	}
-	    
-	    	if ($target eq 'EXE') {
-	    		$NEWDESTI=$DESTI;
-				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; }
-
-	    		print "Remove target $FILENAMEEXE.exe...\n";
-	    		unlink "$NEWDESTI/$FILENAMEEXE.exe";
-	    		print "Compress into $FILENAMEEXE.exe by $FILENAMEEXE.nsi...\n";
-	    		$command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\build\\exe\\$FILENAME.nsi\"";
-	            print "$command\n";
-	    		$ret=`$command`;
-	    		print "Move $FILENAMEEXE.exe to $NEWDESTI\n";
-	    		rename("$SOURCE\\build\\exe\\$FILENAMEEXE.exe","$NEWDESTI/$FILENAMEEXE.exe");
-	    		next;
-	    	}
-	    
-	    }
-	
-	}
-	
-	print "\n----- Summary -----\n";
-	foreach my $target (keys %CHOOSEDTARGET) {
-	    if ($CHOOSEDTARGET{$target} < 0) {
-	        print "Package $target not built (bad requirement).\n";
-	    } else {
-	        print "Package $target built successfully in $NEWDESTI\n";
-	    }
-	}
-
-
-}
-
-
-if (! $batch) {
-    print "\nPress key to finish...";
-    my $WAITKEY=<STDIN>;
-}
-
-0;
diff --git a/htdocs/modulebuilder/template/build/makepack-mymodule.conf b/htdocs/modulebuilder/template/build/makepack-mymodule.conf
index c7a47fbe45e..16dc1e7b82b 100644
--- a/htdocs/modulebuilder/template/build/makepack-mymodule.conf
+++ b/htdocs/modulebuilder/template/build/makepack-mymodule.conf
@@ -8,19 +8,4 @@
 # Setup:   Go on Dolibarr setup - modules to enable module.
 #
 # Files in module
-index.php
-mypage.php
-admin/
-class/
-COPYING
-core/
-css/
-doc/
-img/
-js/
-langs/
-lib/
-scripts/
-sql/
-vendor/
-README.md
+mymodule/
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/class/ParsedownDolibarr.php b/htdocs/modulebuilder/template/class/ParsedownDolibarr.php
deleted file mode 100644
index 45cf82f4b9c..00000000000
--- a/htdocs/modulebuilder/template/class/ParsedownDolibarr.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/*
- * Copyright (C) 2016  Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    class/ParsedownDolibarr.php
- * \ingroup mymodule
- * \brief   Custom Parsedown class to display inline images from the README.md in the about page
- */
-
-/** Includes */
-require __DIR__ . '/../vendor/autoload.php';
-
-/**
- * Class ParsedownDolibarr
- */
-class ParsedownDolibarr extends Parsedown
-{
-    /**
-     * Resolve inline images relative URLs to the module's path
-     *
-     * @param $Excerpt
-     * @return array|void
-     */
-    protected function inlineImage($Excerpt)
-    {
-        $image = parent::inlineImage($Excerpt);
-        $path = new \Enrise\Uri($image['element']['attributes']['src']);
-        if ($path->isRelative()) {
-            $image['element']['attributes']['src'] = dol_buildpath('/mymodule/' . $path, 1);
-        }
-        return $image;
-    }
-}
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index 1361a7b4897..7047332bbfc 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -55,8 +55,8 @@ class ActionsMyModule
 	 * Overloading the doActions function : replacing the parent's function with the one below
 	 *
 	 * @param   array()         $parameters     Hook metadatas (context, etc...)
-	 * @param   CommonObject    &$object        The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-	 * @param   string          &$action        Current action (if set). Generally create or edit or null
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
 	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
 	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
 	 */
diff --git a/htdocs/modulebuilder/template/js/myjs.js.php b/htdocs/modulebuilder/template/js/mymodule.js.php
similarity index 96%
rename from htdocs/modulebuilder/template/js/myjs.js.php
rename to htdocs/modulebuilder/template/js/mymodule.js.php
index b2649676f14..ae8ce6cbe0d 100644
--- a/htdocs/modulebuilder/template/js/myjs.js.php
+++ b/htdocs/modulebuilder/template/js/mymodule.js.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    js/myjs.js.php
+ * \file    js/mymodule.js.php
  * \ingroup mymodule
  * \brief   Example JavaScript.
  *
diff --git a/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php b/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
index 3a310e48f66..41dc9891af7 100644
--- a/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
+++ b/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
@@ -39,7 +39,7 @@ use PHPUnit_Extensions_Selenium2TestCase_WebDriverException;
  * @todo Windows support (IE, Google Chrome, Mozilla Firefox, Safari)
  * @todo OSX support (Safari, Google Chrome, Mozilla Firefox)
  *
- * @package test\functional
+ * @package Testmymodule
  */
 class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 {
@@ -82,8 +82,8 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 	/**
 	 * Helper function to select links by href
 	 *
-	 * @param $value
-	 * @return mixed
+	 * @param  string  $value      Href
+	 * @return mixed               Helper string    
 	 */
 	protected function byHref($value)
 	{
@@ -261,9 +261,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 		$this->authenticate();
 		return $this->assertContains(
 			'tick.png',
-			$this
-				->byXPath('//td[text()="interface_99_modMyModule_MyTrigger.class.php"]/following::img')
-				->attribute('src'),
+			$this->byXPath('//td[text()="interface_99_modMyModule_MyTrigger.class.php"]/following::img')->attribute('src'),
 			"Trigger enabled"
 		);
 	}
diff --git a/htdocs/modulebuilder/template/test/unit/MyClassTest.php b/htdocs/modulebuilder/template/test/unit/MyClassTest.php
index 16016baf117..94898e9209b 100644
--- a/htdocs/modulebuilder/template/test/unit/MyClassTest.php
+++ b/htdocs/modulebuilder/template/test/unit/MyClassTest.php
@@ -28,7 +28,7 @@ namespace test\unit;
 
 /**
  * Class MyClassTest
- * @package test\unit
+ * @package Testmymodule
  */
 class MyClassTest extends \PHPUnit_Framework_TestCase
 {
@@ -93,10 +93,10 @@ class MyClassTest extends \PHPUnit_Framework_TestCase
 	/**
 	 * Unsuccessful test
 	 *
-	 * @param \Exception $e
-	 * @throws \Exception
+	 * @param  Exception $e    Exception
+	 * @throws Exception
 	 */
-	protected function onNotSuccessfulTest(\Exception $e)
+	protected function onNotSuccessfulTest(Exception $e)
 	{
 		fwrite(STDOUT, __METHOD__ . "\n");
 		throw $e;

From 8781f6bcf2a49677b0b2dc4e071165ffd6a54aaa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 14:53:20 +0200
Subject: [PATCH 0775/1163] Add vat code on predefined invoice

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index d2431186ed7..dbc33e384ef 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -24,6 +24,8 @@
 -- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
+ALTER TABLE llx_facturedet_rec ADD COLUMN vat_src_code varchar(10) DEFAULT '' AFTER tva_tx;
+
 ALTER TABLE llx_extrafields ADD COLUMN langs varchar(24);
 
 ALTER TABLE llx_supplier_proposaldet ADD COLUMN fk_unit integer DEFAULT NULL;

From 984531411d123527f7209eef1e459d74dfe16ae2 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Wed, 10 May 2017 15:01:27 +0200
Subject: [PATCH 0776/1163] NEW: permit multiple file upload in linked
 documents

---
 htdocs/core/class/html.formfile.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 8d90892cfb6..022579b3a7c 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -126,7 +126,9 @@ class FormFile
             {
                 $out .= '<input type="hidden" name="max_file_size" value="'.($max*1024).'">';
             }
-            $out .= '<input class="flat minwidth400" type="file" name="userfile"';
+
+            $out .= '<input class="flat minwidth400" type="file"';
+            $out .= (empty($conf->global->MAIN_USE_MULTIPLE_FILEUPLOAD)?' name="userfile"':' name="userfile[]" multiple');
             $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
             $out .= '>';
             $out .= ' ';

From 70de54e97dfd85fa601ef4af22500824bf890037 Mon Sep 17 00:00:00 2001
From: Thomas Raschbacher <lordvan@lordvan.com>
Date: Wed, 10 May 2017 15:21:53 +0200
Subject: [PATCH 0777/1163] fix project extrafields for ODT

for some raeson the code was checking for already existing extra fields before even fetching it. removed the if condition, now it works fine.
---
 .../doc/doc_generic_project_odt.modules.php     | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index fbe3db84370..e050bf8e3eb 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -131,18 +131,15 @@ class doc_generic_project_odt extends ModelePDFProjects
 		);
 
 		// Retrieve extrafields
-		if (is_array($object->array_options) && count($object->array_options))
-		{
-			$extrafieldkey=$object->element;
+		$extrafieldkey=$object->element;
 
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields = new ExtraFields($this->db);
-			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
-			$object->fetch_optionals($object->id,$extralabels);
-
-			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
-		}
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		$extrafields = new ExtraFields($this->db);
+		$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
+		$object->fetch_optionals($object->id,$extralabels);
 
+		$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
+		
 		return $resarray;
 	}
 

From b7b16dc632daea9f0cbd8c76e98a3d354e8a3876 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Wed, 10 May 2017 16:41:19 +0200
Subject: [PATCH 0778/1163] Update code using new css class

---
 htdocs/commande/stats/index.php            |  5 ++---
 htdocs/compta/bank/bilan.php               |  8 ++++----
 htdocs/compta/facture/card.php             | 12 ++++--------
 htdocs/compta/facture/stats/index.php      |  5 ++---
 htdocs/compta/journal/purchasesjournal.php |  5 +----
 htdocs/compta/journal/sellsjournal.php     |  5 +----
 htdocs/compta/paiement/rapport.php         |  4 ++--
 htdocs/compta/prelevement/bons.php         |  6 ++----
 htdocs/compta/prelevement/fiche-rejet.php  |  3 +--
 htdocs/compta/prelevement/fiche-stat.php   |  4 +---
 htdocs/compta/prelevement/ligne.php        |  5 +----
 htdocs/compta/prelevement/list.php         |  8 ++------
 htdocs/compta/prelevement/rejets.php       |  4 +---
 htdocs/compta/prelevement/stats.php        | 11 ++---------
 14 files changed, 26 insertions(+), 59 deletions(-)

diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index dd79ee54ba1..8967e22a160 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -316,7 +316,6 @@ print '<td align="right">%</td>';
 print '</tr>';
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
 	$year = $val['year'];
@@ -324,7 +323,7 @@ foreach ($data as $val)
 	{ // If we have empty year
 		$oldyear--;
 		
-		print '<tr '.$bc[$var].' height="24">';
+		print '<tr class="oddeven" height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 		print '<td align="right">0</td>';
 		print '<td align="right"></td>';
@@ -336,7 +335,7 @@ foreach ($data as $val)
 	}
 
 	
-	print '<tr '.$bc[$var].' height="24">';
+	print '<tr class="oddeven" height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
 	print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';
diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index eb6aea4f2dc..2b3c897f3ce 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -69,22 +69,22 @@ print "</tr>\n";
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."paiement";
 $paiem = valeur($sql);
-print "<tr ".$bc[$var]."><td>Somme des paiements (associes a une facture)</td><td align=\"right\">".price($paiem)."</td></tr>";
+print '<tr class="oddeven"><td>Somme des paiements (associes a une facture)</td><td align="right">".price($paiem)."</td></tr>';
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount > 0";
 $credits = valeur($sql);
-print "<tr ".$bc[$var]."><td>Somme des credits</td><td align=\"right\">".price($credits)."</td></tr>";
+print '<tr class="oddeven"><td>Somme des credits</td><td align="right">".price($credits)."</td></tr>';
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount < 0";
 $debits = valeur($sql);
-print "<tr ".$bc[$var]."><td>Somme des debits</td><td align=\"right\">".price($debits)."</td></tr>";
+print '<tr class="oddeven"><td>Somme des debits</td><td align="right">".price($debits)."</td></tr>';
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank ";
 $solde = valeur($sql);
-print "<tr ".$bc[$var]."><td>".$langs->trans("BankBalance")."</td><td align=\"right\">".price($solde)."</td></tr>";
+print '<tr class="oddeven"><td>".$langs->trans("BankBalance")."</td><td align="right">".price($solde)."</td></tr>';
 
 
 print "</table>";
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 9483e79dba4..495085bc274 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3599,12 +3599,11 @@ else if ($id > 0 || ! empty($ref))
             print '</tr>';
             
             $total_prev_ht = $total_prev_ttc = 0;
-            $var = true;
             foreach ($object->tab_previous_situation_invoice as $prev_invoice) {
                 $totalpaye = $prev_invoice->getSommePaiement();
                 $total_prev_ht += $prev_invoice->total_ht;
                 $total_prev_ttc += $prev_invoice->total_ttc;
-                print '<tr ' . $bc[$var] . '>';
+                print '<tr class="oddeven">';
                 print '<td>' . $prev_invoice->getNomUrl(1) . '</td>';
                 print '<td></td>';
                 if (! empty($conf->banque->enabled))
@@ -3614,10 +3613,9 @@ else if ($id > 0 || ! empty($ref))
                 print '<td align="right">' . $prev_invoice->getLibStatut(3, $totalpaye) . '</td>';
                 print '</tr>';
                 
-                $var = ! $var;
             }
             
-            print '<tr ' . $bc[$var] . '>';
+            print '<tr class="oddeven">';
             print '<td colspan="2" align="right"></td>';
             print '<td align="right"><b>' . price($total_prev_ht) . '</b></td>';
             print '<td align="right"><b>' . price($total_prev_ttc) . '</b></td>';
@@ -3638,12 +3636,11 @@ else if ($id > 0 || ! empty($ref))
             
             $total_next_ht = $total_next_ttc = 0;
             
-            $var = true;
             foreach ($object->tab_next_situation_invoice as $next_invoice) {
                 $totalpaye = $next_invoice->getSommePaiement();
                 $total_next_ht += $next_invoice->total_ht;
                 $total_next_ttc += $next_invoice->total_ttc;
-                print '<tr ' . $bc[$var] . '>';
+                print '<tr class="oddeven">';
                 print '<td>' . $next_invoice->getNomUrl(1) . '</td>';
                 print '<td></td>';
                 if (! empty($conf->banque->enabled)) print '<td align="right"></td>';
@@ -3652,10 +3649,9 @@ else if ($id > 0 || ! empty($ref))
                 print '<td align="right">' . $next_invoice->getLibStatut(3, $totalpaye) . '</td>';
                 print '</tr>';
                 
-                $var = ! $var;
             }
             
-            print '<tr ' . $bc[$var] . '>';
+            print '<tr class="oddeven">';
             print '<td colspan="2" align="right"></td>';
 		    if (! empty($conf->banque->enabled)) print '<td align="right"></td>';
 
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 77191136338..55ff4dad6e3 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -293,7 +293,6 @@ print '<td align="right">%</td>';
 print '</tr>';
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
 	$year = $val['year'];
@@ -301,7 +300,7 @@ foreach ($data as $val)
 	{	// If we have empty year
 		$oldyear--;
 		
-		print '<tr '.$bc[$var].' height="24">';
+		print '<tr class="oddeven" height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 		print '<td align="right">0</td>';
 		print '<td align="right"></td>';
@@ -312,7 +311,7 @@ foreach ($data as $val)
 		print '</tr>';
 	}
 	
-	print '<tr '.$bc[$var].' height="24">';
+	print '<tr class="oddeven" height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
 	print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index f0b520bb11e..fbd391ffe2a 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -184,7 +184,6 @@ print "<td>".$langs->trans("Account")."</td>";
 print "<td>".$langs->trans("Type")."</td><td align='right'>".$langs->trans("Debit")."</td><td align='right'>".$langs->trans("Credit")."</td>";
 print "</tr>\n";
 
-$var=false;
 
 $invoicestatic=new FactureFournisseur($db);
 $companystatic=new Fournisseur($db);
@@ -229,7 +228,7 @@ foreach ($tabfac as $key => $val)
 		{
 			if (isset($line['nomtcheck']) || $mt)
 			{
-				print "<tr ".$bc[$var]." >";
+				print '<tr class="oddeven">';
 				print "<td>".dol_print_date($db->jdate($val["date"]))."</td>";
 				print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 				print "<td>".$k."</td><td>".$line['label']."</td>";
@@ -249,8 +248,6 @@ foreach ($tabfac as $key => $val)
 			}
 		}
 	}
-
-	$var = !$var;
 }
 
 print "</table>";
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 670d89fd2cb..fd0c45be7cd 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -216,7 +216,6 @@ print '<td>'.$langs->trans('Account').'</td>';
 print '<td>'.$langs->trans('Type').'</td><td align="right">'.$langs->trans('Debit').'</td><td align="right">'.$langs->trans('Credit').'</td>';
 print "</tr>\n";
 
-$var=false;
 
 $invoicestatic=new Facture($db);
 $companystatic=new Client($db);
@@ -262,7 +261,7 @@ foreach ($tabfac as $key => $val)
 		{
 			if (isset($line['nomtcheck']) || $mt)
 			{
-				print "<tr ".$bc[$var]." >";
+				print '<tr class="oddeven">';
 				print "<td>".dol_print_date($db->jdate($val["date"]))."</td>";
 				print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 				print "<td>".$k."</td><td>".$line['label']."</td>";
@@ -282,8 +281,6 @@ foreach ($tabfac as $key => $val)
 			}
 		}
 	}
-
-	$var = !$var;
 }
 
 print "</table>";
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index e9a90667e69..c73f79c60a4 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -145,7 +145,7 @@ if ($year)
         print '<td align="right">'.$langs->trans("Size").'</td>';
         print '<td align="right">'.$langs->trans("Date").'</td>';
         print '</tr>';
-        $var=true;
+
         if (is_resource($handle))
         {
             while (($file = readdir($handle))!==false)
@@ -155,7 +155,7 @@ if ($year)
                     
                     $tfile = $dir . '/'.$year.'/'.$file;
                     $relativepath = $year.'/'.$file;
-                    print "<tr ".$bc[$var].">".'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
+                    print '<tr class="oddeven">'.'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
                     print '<td align="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
                     print '<td align="right">'.dol_print_date(dol_filemtime($tfile),"dayhour").'</td></tr>';
                 }
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index dbbf9d09ac7..973135765dc 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -129,14 +129,12 @@ if ($result)
   print '</td>';
   print '</tr>';
 
-  $var=True;
 
   while ($i < min($num,$limit))
   {
-      $obj = $db->fetch_object($result);
-      
+      $obj = $db->fetch_object($result);     
 
-      print "<tr ".$bc[$var]."><td>";
+      print '<tr class="oddeven"><td>';
 
       print $bon->LibStatut($obj->statut,2);
       print "&nbsp;";
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 064f41e41e8..f2240a070e6 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -138,7 +138,6 @@ if ($resql)
   	print '<td>'.$langs->trans("Line").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td>';
   	print '<td>'.$langs->trans("Reason").'</td><td align="center">'.$langs->trans("ToBill").'</td><td align="center">'.$langs->trans("Invoice").'</td></tr>';
 
-  	$var=True;
 	$total = 0;
 
 	if ($num > 0)
@@ -148,7 +147,7 @@ if ($resql)
         {
     		$obj = $db->fetch_object($resql);
     
-    		print "<tr ".$bc[$var]."><td>";
+    		print '<tr class="oddeven"><td>';
     
     		print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
     		print img_picto('', 'statut'.$obj->statut).' ';
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index c5d441e3260..7e0c4f81e4b 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -127,13 +127,11 @@ if ($prev_id)
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Status").'</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
 
-		$var=false;
-
 		while ($i < $num)
 		{
 			$row = $db->fetch_row($resql);
 
-			print "<tr ".$bc[$var]."><td>";
+			print '<tr class="oddeven"><td>';
 
 			print $ligne->LibStatut($row[1],1);
 
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 64ddb12a7bc..933c23b0e7e 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -298,16 +298,13 @@ if ($id)
 		print '<td>'.$langs->trans("Invoice").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">'.$langs->trans("Status").'</td>';
 		print '</tr>';
 
-		$var=True;
-
 		$total = 0;
 
-		$var=false;
 		while ($i < min($num,$conf->liste_limit))
 		{
 			$obj = $db->fetch_object($result);
 
-			print "<tr ".$bc[$var]."><td>";
+			print '<tr class="oddeven"><td>';
 
 			print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">';
 			print img_object($langs->trans("ShowBill"),"bill");
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index f7fe4b77e7d..2fa8a255407 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -159,15 +159,11 @@ if ($result)
     print '</td>';
     print '</tr>';
 
-    $var=True;
-
     while ($i < min($num,$limit))
     {
-        $obj = $db->fetch_object($result);
+        $obj = $db->fetch_object($result);    
 
-        
-
-        print "<tr ".$bc[$var]."><td>";
+        print '<tr class="oddeven"><td>';
 
         print $ligne->LibStatut($obj->statut_ligne,2);
         print "&nbsp;";
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index ef72ca8f6e5..0f737a50f22 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -94,15 +94,13 @@ if ($result)
 	print_liste_field_titre($langs->trans("Reason"),$_SERVER["PHP_SELF"],"pr.motif","",$urladd);
 	print "</tr>\n";
 
-	$var=True;
-
 	$total = 0;
 
 	while ($i < min($num,$conf->liste_limit))
 	{
 		$obj = $db->fetch_object($result);
 
-		print "<tr ".$bc[$var]."><td>";
+		print '<tr class="oddeven"><td>';
 		print $ligne->LibStatut($obj->statut,2).'&nbsp;';
 		print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
 
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index b666b355e24..406c2303b6a 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -96,13 +96,11 @@ if ($resql)
 	print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td align="right">%</td>';
 	print '<td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
 
-	$var=false;
-
 	while ($i < $num)
 	{
 		$row = $db->fetch_row($resql);
 
-		print "<tr ".$bc[$var]."><td>";
+		print '<tr class="oddeven"><td>';
 
 		print $ligne->LibStatut($row[2],1);
 		//print $st[$row[2]];
@@ -119,7 +117,6 @@ if ($resql)
 		print '</td><td align="right">';
 		print round($row[0]/$total*100,2)." %";
 		print '</td></tr>';
-
 		
 		$i++;
 	}
@@ -192,8 +189,6 @@ if ($resql)
 	print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td>';
 	print '<td align="right">%</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
 
-	$var=True;
-
 	require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 	$Rejet = new RejetPrelevement($db, $user);
 
@@ -201,7 +196,7 @@ if ($resql)
 	{
 		$row = $db->fetch_row($resql);
 
-		print "<tr ".$bc[$var]."><td>";
+		print '<tr class="oddeven"><td>';
 		print $Rejet->motifs[$row[2]];
 
 		print '</td><td align="center">'.$row[1];
@@ -215,9 +210,7 @@ if ($resql)
 		print '</td><td align="right">';
 		print round($row[0]/$total*100,2)." %";
 
-
 		print '</td></tr>';
-
 		
 		$i++;
 	}

From fe8d34c73b8cd741add2c0507ba553dbb89b9fb1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 17:50:10 +0200
Subject: [PATCH 0779/1163] Add field extraparams on llx_bank_account

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index dbc33e384ef..b13bd6e649a 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -50,6 +50,7 @@ ALTER TABLE llx_holiday ADD COLUMN extraparams				varchar(255);
 ALTER TABLE llx_expensereport ADD COLUMN import_key			varchar(14);
 ALTER TABLE llx_expensereport ADD COLUMN extraparams		varchar(255);	
 
+ALTER TABLE llx_bank_account ADD COLUMN extraparams		varchar(255);	
 
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30);

From cf361e1ed2dfe8cabfecc41e25efd53e84a39da0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 23:10:09 +0200
Subject: [PATCH 0780/1163] Fix html syntax

---
 htdocs/accountancy/journal/purchasesjournal.php | 4 +++-
 htdocs/accountancy/journal/sellsjournal.php     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index c5069644cef..232a6d7611c 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -542,7 +542,9 @@ if (empty($action) || $action == 'view') {
 	print "<td>" . $langs->trans("Date") . "</td>";
 	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
 	print "<td>" . $langs->trans("AccountAccounting") . "</td>";
-	print "<t><td>" . $langs->trans("Type") . "</td><td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
+	print "<td>" . $langs->trans("Type") . "</td>";
+	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
+	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
 
 	$r = '';
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index beb0c777e27..9af2bd2d135 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -593,7 +593,7 @@ if (empty($action) || $action == 'view') {
 			// print ' (' . $companystatic->getNomUrl(0, 'customer', 16) . ')';
 			print '</td>';
 			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . "</td>";
-			print "</td><td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
+			print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 		    print "</tr>";
 		}

From 2b64cf0ebeabaf79fbc315994cb0f34cf5de3dbf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 23:24:33 +0200
Subject: [PATCH 0781/1163] Update html.formfile.class.php

---
 htdocs/core/class/html.formfile.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 022579b3a7c..5dada97908b 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -128,7 +128,7 @@ class FormFile
             }
 
             $out .= '<input class="flat minwidth400" type="file"';
-            $out .= (empty($conf->global->MAIN_USE_MULTIPLE_FILEUPLOAD)?' name="userfile"':' name="userfile[]" multiple');
+            $out .= ((empty($conf->global->MAIN_USE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout == 'phone')?' name="userfile"':' name="userfile[]" multiple');
             $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
             $out .= '>';
             $out .= ' ';

From 0734b99d3a2b6d227601b73ad394adfcf211c229 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 23:27:48 +0200
Subject: [PATCH 0782/1163] Fix sql syntax

---
 htdocs/compta/bank/class/account.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 4f28028f34d..b3396e1082c 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -473,9 +473,9 @@ class Account extends CommonObject
 
 			if ($categorie>0) {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (";
-				$sql .= "lineid, fk_categ;
+				$sql .= "lineid, fk_categ";
 				$sql .= ") VALUES (";
-				$sql .= " ".$accline->id.", ".$categorie;
+				$sql .= $accline->id.", ".$categorie;
 				$sql .= ")";
 
 				$result = $this->db->query($sql);

From 2da0a129d103f09e50f91f3515299fcb84c22f89 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 May 2017 23:41:43 +0200
Subject: [PATCH 0783/1163] Multiple file upload on by default on desktop.

---
 htdocs/core/class/html.formfile.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 5dada97908b..ca3bf804750 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -128,7 +128,7 @@ class FormFile
             }
 
             $out .= '<input class="flat minwidth400" type="file"';
-            $out .= ((empty($conf->global->MAIN_USE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout == 'phone')?' name="userfile"':' name="userfile[]" multiple');
+            $out .= ((! empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic')?' name="userfile"':' name="userfile[]" multiple');
             $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
             $out .= '>';
             $out .= ' ';

From 8ae05a965100eb266381cbcad1ac4b65ce8e9254 Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Thu, 11 May 2017 13:38:17 +1100
Subject: [PATCH 0784/1163] Fix: when sending a mail the default template used
 should be the first positionned template

---
 htdocs/core/class/html.formmail.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 231ff16c6af..e59a57d31b0 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -828,7 +828,7 @@ class FormMail extends Form
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
 		if (!empty($id)) $sql.= " AND rowid=".$id;
-		$sql.= $db->order("lang,label","ASC");
+		$sql.= $db->order("position,lang,label","ASC");
 		//print $sql;
 
 		$resql = $db->query($sql);

From f231864b3fc91d684768c0eff92425691f2e310b Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Thu, 11 May 2017 09:13:51 +0200
Subject: [PATCH 0785/1163] Update bilan.php

---
 htdocs/compta/bank/bilan.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index 2b3c897f3ce..f7ab97071f9 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -69,7 +69,7 @@ print "</tr>\n";
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."paiement";
 $paiem = valeur($sql);
-print '<tr class="oddeven"><td>Somme des paiements (associes a une facture)</td><td align="right">".price($paiem)."</td></tr>';
+print "<tr class=\"oddeven\"><td>Somme des paiements (associes a une facture)</td><td align=\"right\">".price($paiem)."</td></tr>";
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount > 0";

From 449869c37b103f15e2fc4eb795bf422cb33f04ac Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Thu, 11 May 2017 09:15:35 +0200
Subject: [PATCH 0786/1163] Update bilan.php

---
 htdocs/compta/bank/bilan.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index f7ab97071f9..73701636557 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -74,7 +74,7 @@ print "<tr class=\"oddeven\"><td>Somme des paiements (associes a une facture)</t
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount > 0";
 $credits = valeur($sql);
-print '<tr class="oddeven"><td>Somme des credits</td><td align="right">".price($credits)."</td></tr>';
+print "<tr class=\"oddeven\"><td>Somme des credits</td><td align=\"right\">".price($credits)."</td></tr>";
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount < 0";

From be6be3e533ae74e33d249a0c87574aed97e7759d Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Thu, 11 May 2017 09:16:44 +0200
Subject: [PATCH 0787/1163] Update bilan.php

---
 htdocs/compta/bank/bilan.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index 73701636557..0baf0dcc3bb 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -79,7 +79,7 @@ print "<tr class=\"oddeven\"><td>Somme des credits</td><td align=\"right\">".pri
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount < 0";
 $debits = valeur($sql);
-print '<tr class="oddeven"><td>Somme des debits</td><td align="right">".price($debits)."</td></tr>';
+print "<tr class=\"oddeven\"><td>Somme des debits</td><td align=\"right\">".price($debits)."</td></tr>";
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank ";

From 26df028efed50c886549fa60e91f1736016895a3 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Thu, 11 May 2017 09:17:43 +0200
Subject: [PATCH 0788/1163] Update bilan.php

---
 htdocs/compta/bank/bilan.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index 0baf0dcc3bb..69370faa34e 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -84,7 +84,7 @@ print "<tr class=\"oddeven\"><td>Somme des debits</td><td align=\"right\">".pric
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank ";
 $solde = valeur($sql);
-print '<tr class="oddeven"><td>".$langs->trans("BankBalance")."</td><td align="right">".price($solde)."</td></tr>';
+print "<tr class=\"oddeven\"><td>".$langs->trans("BankBalance")."</td><td align=\"right\">".price($solde)."</td></tr>";
 
 
 print "</table>";

From 17f37cc9e1d9f879e667991c011aded6bdab45c4 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 11 May 2017 11:41:00 +0200
Subject: [PATCH 0789/1163] Fix wrong calculation

---
 htdocs/compta/facture/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 9483e79dba4..06b64d02da6 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1084,6 +1084,7 @@ if (empty($reshook))
 										}
 
 										if ($totalamount != 0) {
+											$i = $i > 0 ? $i-1 : 0;
 										    $tva_tx = $lines[$i]->tva_tx;
 										    if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
 											$amountdeposit[$tva_tx] = ($totalamount * $valuedeposit) / 100;
@@ -1134,7 +1135,7 @@ if (empty($reshook))
 							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0)
 							{
 								$object->fetch_lines();
-								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx);
+								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx / 100);
 								$object->updateline($object->lines[0]->id, $object->lines[0]->desc, $subprice_diff, $object->lines[0]->qty, $object->lines[0]->remise_percent, $object->lines[0]->date_start, $object->lines[0]->date_end, $object->lines[0]->tva_tx, 0, 0, 'HT', $object->lines[0]->info_bits, $object->lines[0]->product_type, 0, 0, 0, $object->lines[0]->pa_ht, $object->lines[0]->label, 0, array(), 100);
 							}
 							

From d3917b60651b67bcca511682ee822ef234929d3f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 May 2017 12:25:53 +0200
Subject: [PATCH 0790/1163] FIX Bad return code of dolCpyDir

---
 htdocs/core/lib/files.lib.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 3d33fcb71f2..47501a86e8d 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -551,13 +551,23 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
 						$dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
                     	dol_mkdir($destfile."/".$file, '', decoct($dirmaskdec));
                     }
-                    $result=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists);
+                    $tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists);
                 }
                 else
 				{
-                    $result=dol_copy($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists);
+                    $tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists);
+                }
+                // Set result
+                if ($result > 0 && $tmpresult >= 0)
+                {
+                    // Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
+                }
+                else
+                {
+                    $result=$tmpresult;
                 }
                 if ($result < 0) break;
+                
             }
         }
         closedir($dir_handle);

From b09300ab61245bfb9e6efd3734f979bfec794946 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 May 2017 13:01:49 +0200
Subject: [PATCH 0791/1163] NEW Can edit background color for odd and even
 lines in tables

---
 htdocs/admin/ihm.php                  |  64 +++++-------
 htdocs/core/lib/files.lib.php         |  69 +++++++++++-
 htdocs/core/lib/usergroups.lib.php    | 145 ++++++++++++++++++--------
 htdocs/langs/en_US/modulebuilder.lang |   2 +-
 htdocs/modulebuilder/index.php        |  23 +++-
 htdocs/theme/eldy/style.css.php       |  49 ++++-----
 htdocs/theme/md/style.css.php         |  74 +++++--------
 7 files changed, 260 insertions(+), 166 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index cfa08f003ea..6e5c814639b 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -87,32 +87,46 @@ if ($action == 'update')
 
 	dolibarr_set_const($db, "MAIN_THEME",						$_POST["main_theme"],'chaine',0,'',$conf->entity);
 
-	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array()))));
-	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKBODY', $conf->entity);
-	else dolibarr_set_const($db, 'THEME_ELDY_BACKBODY', implode(',',colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array())),'chaine',0,'',$conf->entity);
-	
 	$val=GETPOST('THEME_TOPMENU_DISABLE_IMAGE');
 	if (! $val) dolibarr_del_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', $conf->entity);
     else dolibarr_set_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', GETPOST('THEME_TOPMENU_DISABLE_IMAGE'),'chaine',0,'',$conf->entity);
     
+	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array()))));
+	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKBODY', $conf->entity);
+	else dolibarr_set_const($db, 'THEME_ELDY_BACKBODY', $val,'chaine',0,'',$conf->entity);
+	
     $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TOPMENU_BACK1', $conf->entity);
-    else dolibarr_set_const($db, 'THEME_ELDY_TOPMENU_BACK1', implode(',',colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array())),'chaine',0,'',$conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_TOPMENU_BACK1', $val,'chaine',0,'',$conf->entity);
 
-	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array()))));
+    $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKTITLE1', $conf->entity);
-    else dolibarr_set_const($db, 'THEME_ELDY_BACKTITLE1', implode(',',colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array())),'chaine',0,'',$conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_BACKTITLE1', $val,'chaine',0,'',$conf->entity);
 
-	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'),array()))));
+    $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEIMPAIR1'),array()))));
+    if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEIMPAIR1', $conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_LINEIMPAIR1', $val,'chaine',0,'',$conf->entity);
+    $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEIMPAIR1'),array()))));
+    if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEIMPAIR2', $conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_LINEIMPAIR2', $val,'chaine',0,'',$conf->entity);
+    
+    $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEPAIR1'),array()))));
+    if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR1', $conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR1', $val,'chaine',0,'',$conf->entity);
+    $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEPAIR1'),array()))));
+    if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR2', $conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR2', $val,'chaine',0,'',$conf->entity);
+    
+    $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $conf->entity);
-    else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLENOTAB', implode(',',colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'),array())),'chaine',0,'',$conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $val,'chaine',0,'',$conf->entity);
     
     if (GETPOST('THEME_ELDY_USE_HOVER') == '') dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", '0', 'chaine', 0, '', $conf->entity);    // If empty, we set to '0' ('000000' is for black)
 	else dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $_POST["THEME_ELDY_USE_HOVER"], 'chaine', 0, '', $conf->entity);
 
 	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTLINK', $conf->entity);
-    else dolibarr_set_const($db, 'THEME_ELDY_TEXTLINK', implode(',',colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'),array())),'chaine',0,'',$conf->entity);
+    else dolibarr_set_const($db, 'THEME_ELDY_TEXTLINK', $val,'chaine',0,'',$conf->entity);
 	
     dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT",			$_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
     dolibarr_set_const($db, "MAIN_SIZE_SHORTLIST_LIMIT",		$_POST["main_size_shortliste_limit"],'chaine',0,'',$conf->entity);
@@ -149,34 +163,6 @@ if ($action == 'update')
 	            if ($result > 0)
 	            {
 	                dolibarr_set_const($db, "MAIN_LOGIN_BACKGROUND",$original_file,'chaine',0,'',$conf->entity);
-	
-	                // Create thumbs of logo (Note that PDF use original file and not thumbs)
-	                /*
-	                if ($isimage > 0)
-	                {
-	                    // Create thumbs
-	                    //$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
-	
-	                    // Create small thumb, Used on logon for example
-	                    $imgThumbSmall = vignette($dirforimage.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
-	                    if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbSmall,$reg))
-	                    {
-	                        $imgThumbSmall = $reg[1];    // Save only basename
-	                        dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$imgThumbSmall,'chaine',0,'',$conf->entity);
-	                    }
-	                    else dol_syslog($imgThumbSmall);
-	
-	                    // Create mini thumb, Used on menu or for setup page for example
-	                    $imgThumbMini = vignette($dirforimage.$original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
-	                    if (image_format_supported($imgThumbMini) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbMini,$reg))
-	                    {
-	                        $imgThumbMini = $reg[1];     // Save only basename
-	                        dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$imgThumbMini,'chaine',0,'',$conf->entity);
-	                    }
-	                    else dol_syslog($imgThumbMini);
-	                }
-	                else dol_syslog("ErrorImageFormatNotSupported",LOG_WARNING);
-	                */
 	            }
 	            else if (preg_match('/^ErrorFileIsInfectedWithAVirus/',$result))
 	            {
@@ -574,7 +560,7 @@ else	// Show
     
     print '</table>'."\n";
     
-    print '<div class="tabsAction">';
+    print '<div class="tabsAction tabsActionNoBottom">';
     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
     print '</div>';
 }
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 47501a86e8d..39865905553 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -44,7 +44,8 @@ function dol_basename($pathfile)
  *  @param	string		$path        	Starting path from which to search. This is a full path.
  *  @param	string		$types        	Can be "directories", "files", or "all"
  *  @param	int			$recursive		Determines whether subdirectories are searched
- *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function. Filter is checked into basename only.
+ *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/' by doing preg_quote($var,'/'), since this char is used for preg_match function, 
+ *                                      but must not contains the start and end '/'. Filter is checked into basename only.
  *  @param	array		$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview.*\.png)$','^\.')). Exclude is checked into fullpath.
  *  @param	string		$sortcriteria	Sort criteria ("","fullname","name","date","size")
  *  @param	string		$sortorder		Sort order (SORT_ASC, SORT_DESC)
@@ -440,6 +441,70 @@ function dol_filemtime($pathoffile)
 	return @filemtime($newpathoffile); // @Is to avoid errors if files does not exists
 }
 
+/**
+ * Make replacement of strings into a file.
+ *
+ * @param	string	$srcfile			Source file (can't be a directory)
+ * @param	array	$arrayreplacement	Array with strings to replace
+ * @param	string	$destfile			Destination file (can't be a directory). If empty, will be same than source file.
+ * @param	int		$newmask			Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'
+ * @return	int							<0 if error, 0 if nothing done (dest file already exists), >0 if OK
+ * @see		dolCopyr
+ */
+function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0)
+{
+    global $conf;
+
+    dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask);
+
+    if (empty($srcfile)) return -1;
+    if (empty($destfile)) $destfile=$srcfile;
+    
+    $destexists=dol_is_file($destfile);
+    if (($destfile != $srcfile) && $destexists) return 0;
+    
+    $tmpdestfile=$destfile.'.tmp';
+
+    $newpathofsrcfile=dol_osencode($srcfile);
+    $newpathoftmpdestfile=dol_osencode($tmpdestfile);
+    $newpathofdestfile=dol_osencode($destfile);
+    $newdirdestfile=dirname($newpathofdestfile);
+
+    if ($destexists && ! is_writable($newpathofdestfile))
+    {
+        dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to overwrite target file", LOG_WARNING);
+        return -1;
+    }
+    if (! is_writable($newdirdestfile))
+    {
+        dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
+        return -2;
+    }
+   
+    dol_delete_file($tmpdestfile);
+    
+    
+    
+    
+    // Rename
+    $result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0));
+    if (! $result)
+    {
+        dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
+        return -3;
+    }
+    if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+    if (empty($newmask))	// This should no happen
+    {
+        dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
+        $newmask='0664';
+    }
+
+    @chmod($newpathofdestfile, octdec($newmask));
+
+    return 1;
+}
+
 /**
  * Copy a file to another file.
  *
@@ -940,7 +1005,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 					// If error because of not exists, we must should return true and we should return false if this is a permission problem
 				}
 			}
-			else dol_syslog("No files to delete found", LOG_WARNING);
+			else dol_syslog("No files to delete found", LOG_DEBUG);
 		}
 		else
 		{
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index d983f799c0d..797af488f46 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -443,6 +443,49 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 
     print '</td></tr>';
 
+    // TopMenuDisableImages
+    if ($foruserprofile)
+    {
+        /*
+         print '<tr class="oddeven">';
+         print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
+         print '<td>'.($conf->global->THEME_TOPMENU_DISABLE_IMAGE?$conf->global->THEME_TOPMENU_DISABLE_IMAGE:$langs->trans("Default")).'</td>';
+         print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_THEME_TOPMENU_DISABLE_IMAGE" id="check_THEME_TOPMENU_DISABLE_IMAGE" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
+         print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
+         print '> '.$langs->trans("UsePersonalValue").'</td>';
+         print '<td>';
+         if ($edit)
+         {
+         print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),''),'THEME_TOPMENU_DISABLE_IMAGE','formcolor',1).' ';
+         }
+         else
+         {
+         $color = colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),'');
+         if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+         else print '';
+         }
+         if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+         print '</td>';*/
+    }
+    else
+    {
+        $default=$langs->trans('No');
+        print '<tr class="oddeven">';
+        print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
+        print '<td colspan="'.($colspan-1).'">';
+        if ($edit)
+        {
+            print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
+        }
+        else
+        {
+            print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
+        }
+        print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+        print '</td>';
+    }
+    
 	// Background color THEME_ELDY_BACKBODY
     if ($foruserprofile)
 	{
@@ -535,52 +578,6 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    print '</td>';
 	}
 	
-	// TopMenuBackgroundColor
-	if ($foruserprofile)
-	{
-	    /*
-	     print '<tr class="oddeven">';
-	     print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
-	     print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
-	     print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
-	     print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
-	     print '> '.$langs->trans("UsePersonalValue").'</td>';
-	     print '<td>';
-	     if ($edit)
-	     {
-	     print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
-	     }
-	     else
-	     {
-	     $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
-	     if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	     else print '';
-	     }
-	    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-	    	print '</td>';*/
-	}
-	else
-	{
-	    $default=$langs->trans('No');
-	    print '<tr class="oddeven">';
-	    print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
-	    if ($edit)
-	    {
-	        print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
-	    }
-	    else
-	    {
-	        print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
-	    }
-	    print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
-    	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-	    print '</td>';
-	}
-	
-	
-	
-	
 	// BackgroundTableTitleColor
 	if ($foruserprofile)
 	{
@@ -607,6 +604,62 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    print '</tr>';
 	}
 
+	// BackgroundTableLineOddColor
+	if ($foruserprofile)
+	{
+
+	}
+	else
+	{
+	    $default='ffffff';
+	    if ($conf->theme == 'md') $default='ffffff';
+	
+	    print '<tr class="oddeven">';
+	    print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
+	    print '<td colspan="'.($colspan-1).'">';
+	    if ($edit)
+	    {
+	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),''),'THEME_ELDY_LINEIMPAIR1','formcolor',1).' ';
+	    }
+	    else
+	    {
+	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),'');
+	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+	        else print $langs->trans("Default");
+	    }
+	    print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+	    print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+	    print '</td>';
+	}
+	
+	// BackgroundTableLineEvenColor
+	if ($foruserprofile)
+	{
+	
+	}
+	else
+	{
+	    $default='f8f8f8';
+	    if ($conf->theme == 'md') $default='f8f8f8';
+	
+	    print '<tr class="oddeven">';
+	    print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
+	    print '<td colspan="'.($colspan-1).'">';
+	    if ($edit)
+	    {
+	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),''),'THEME_ELDY_LINEPAIR1','formcolor',1).' ';
+	    }
+	    else
+	    {
+	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),'');
+	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+	        else print $langs->trans("Default");
+	    }
+	    print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+	    print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+	    print '</td>';
+	}
+	
 	// TextTitleColor
 	if ($foruserprofile)
 	{
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index da734ea1356..18b7044b55d 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -4,5 +4,5 @@ ModuleBuilderDesc2=Path were modules are generated/edited (first alternative dir
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
 NewModule=New module
 ModuleKey=Key for new module
-
+ModuleInitialized=Module initialized
 
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 6ad747a7694..bdad41e8556 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -59,15 +59,28 @@ if ($dircustom && $action == 'initmodule' && $modulename)
     $destfile = $dircustom.'/'.$modulename;
     $result = dolCopyDir($srcfile, $destfile, 0, 0);
     //dol_mkdir($destfile);
+    if ($result <= 0)
+    {
+        $error++;
+        setEventMessages($langs->trans("ErrorFailedToCopyDir"), null, 'errors');
+    }
+
+    // Edit PHP files
+    $listofphpfilestoedit = dol_dir_list($destfile, 'files', 1, '\.php$', 'fullname', SORT_ASC, 0, true);
+    foreach($listofphpfilestoedit as $phpfileval)
+    {
+        $arrayreplacement=array(
+            'mymodule'=>$modulename
+        );
+        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
+        var_dump($phpfileval);
+        var_dump($result);
+    }    
     
-    if ($result > 0)
+    if (! $error)
     {
         setEventMessages('ModuleInitialized', null);
     }
-    else
-    {
-        setEventMessages($langs->trans("ErrorFailedToCopyDir"), null, 'errors');
-    }
 }
 
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f923413da4c..f6021be8a9a 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2006		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2007-2017	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
@@ -35,6 +35,28 @@ if (! defined('NOLOGIN'))         define('NOLOGIN',1);          // File must be
 if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
+// Colors
+$colorbackhmenu1='80,90,120';      // topmenu
+$colorbackvmenu1='255,255,255';      // vmenu
+$colortopbordertitle1='120,120,120';    // top border of title
+$colorbacktitle1='230,230,230';      // title of tables,list
+$colorbacktabcard1='255,255,255';  // card
+$colorbacktabactive='234,234,234';
+$colorbacklineimpair1='255,255,255';    // line impair
+$colorbacklineimpair2='255,255,255';    // line impair
+$colorbacklinepair1='248,248,248';    // line pair
+$colorbacklinepair2='248,248,248';    // line pair
+$colorbacklinepairhover='238,246,252';    // line pair
+$colorbackbody='255,255,255';
+$colortexttitlenotab='100,60,20';
+$colortexttitle='0,0,0';
+$colortext='0,0,0';
+$colortextlink='0,0,100';
+$fontsize='13';
+$fontsizesmaller='12';
+
+if (defined('THEME_ONLY_CONSTANT')) return;
+    
 session_cache_limiter(FALSE);
 
 require_once '../../main.inc.php';
@@ -77,25 +99,6 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 //$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //var_dump($user->conf->THEME_ELDY_RGB);
 
-// Colors
-$colorbackhmenu1='80,90,120';      // topmenu
-$colorbackvmenu1='255,255,255';      // vmenu
-$colortopbordertitle1='120,120,120';    // top border of title
-$colorbacktitle1='240,240,240';      // title of tables,list
-$colorbacktabcard1='255,255,255';  // card
-$colorbacktabactive='234,234,234';
-$colorbacklineimpair1='255,255,255';    // line impair
-$colorbacklineimpair2='255,255,255';    // line impair
-$colorbacklinepair1='248,248,248';    // line pair
-$colorbacklinepair2='248,248,248';    // line pair
-$colorbacklinepairhover='238,246,252';    // line pair
-$colorbackbody='255,255,255';
-$colortexttitlenotab='100,60,20';
-$colortexttitle='0,0,0';
-$colortext='0,0,0';
-$colortextlink='0,0,100';
-$fontsize='13';
-$fontsizesmaller='12';
 $useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
 $borderwith=2;
 
@@ -113,17 +116,11 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 	$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255';    // vmenu
     $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';     // card
     $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
-    $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
-    $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
-    $conf->global->THEME_ELDY_LINEPAIR1='248,248,248';
-    $conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
-    $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
     $conf->global->THEME_ELDY_TEXT='0,0,0';
     $conf->global->THEME_ELDY_FONT_SIZE1='13';
     $conf->global->THEME_ELDY_FONT_SIZE2='12';
 }
 
- 
 // Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
 $colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
 $colorbackvmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1)   :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$user->conf->THEME_ELDY_VERMENU_BACK1);
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3bd33b07225..9604da70905 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2006		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2007-2017	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
@@ -36,6 +36,28 @@ if (! defined('NOLOGIN'))         define('NOLOGIN',1);          // File must be
 if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
+// Colors
+$colorbackhmenu1='90,50,120';      // topmenu
+$colorbackvmenu1='255,255,255';      // vmenu
+$colortopbordertitle1='';           // top border of tables-lists title. not defined = default to colorbackhmenu1
+$colorbacktitle1='240,240,240';      // title of tables-lists
+$colorbacktabcard1='255,255,255';  // card
+$colorbacktabactive='234,234,234';
+$colorbacklineimpair1='255,255,255';    // line impair
+$colorbacklineimpair2='255,255,255';    // line impair
+$colorbacklinepair1='250,250,250';    // line pair
+$colorbacklinepair2='248,248,248';    // line pair
+$colorbacklinepairhover='244,244,244';    // line pair
+$colorbackbody='240,240,240';
+$colortexttitlenotab='90,90,90';
+$colortexttitle='20,20,20';
+$colortext='0,0,0';
+$colortextlink='0,0,120';
+$fontsize='13';
+$fontsizesmaller='11';
+
+if (defined('THEME_ONLY_CONSTANT')) return;
+
 session_cache_limiter(FALSE);
 
 require_once '../../main.inc.php';
@@ -78,34 +100,14 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 //$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //var_dump($user->conf->THEME_ELDY_RGB);
 
-// Colors
-$colorbackhmenu1='90,50,120';      // topmenu
-$colorbackvmenu1='255,255,255';      // vmenu
-$colortopbordertitle1='';           // top border of tables-lists title. not defined = default to colorbackhmenu1
-$colorbacktitle1='240,240,240';      // title of tables-lists
-$colorbacktabcard1='255,255,255';  // card
-$colorbacktabactive='234,234,234';
-$colorbacklineimpair1='255,255,255';    // line impair
-$colorbacklineimpair2='255,255,255';    // line impair
-$colorbacklinepair1='250,250,250';    // line pair
-$colorbacklinepair2='248,248,248';    // line pair
-$colorbacklinepairhover='244,244,244';    // line pair
-$colorbackbody='240,240,240';
-$colortexttitlenotab='90,90,90';
-$colortexttitle='20,20,20';
-$colortext='0,0,0';
-$colortextlink='0,0,120';
-$fontsize='13';
-$fontsizesmaller='11';
-$usegradient=0;
 $useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
 $borderwith=2;
 
 // Case of option always editable
 if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody;
-if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='90,50,120';
+if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
 if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1=$colorbacktitle1;
-if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=='238,246,252';
+if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER==$colorbacklinepairhover;
 if (! isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) $conf->global->THEME_ELDY_TEXTTITLENOTAB=$colortexttitlenotab;
 if (! isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK=$colortextlink;
 
@@ -116,12 +118,6 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 	$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255';    // vmenu
     $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';     // card
     $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
-    $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
-    $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
-    $conf->global->THEME_ELDY_LINEPAIR1='250,250,250';
-    $conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
-    $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
-    $conf->global->THEME_ELDY_USE_HOVER='238,246,252';
     $conf->global->THEME_ELDY_TEXT='0,0,0';
     $conf->global->THEME_ELDY_FONT_SIZE1='13';
     $conf->global->THEME_ELDY_FONT_SIZE2='11';
@@ -139,7 +135,6 @@ $colorbacklineimpair1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty(
 $colorbacklineimpair2=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR2)  ?$colorbacklineimpair2:$conf->global->THEME_ELDY_LINEIMPAIR2):(empty($user->conf->THEME_ELDY_LINEIMPAIR2)?$colorbacklineimpair2:$user->conf->THEME_ELDY_LINEIMPAIR2);
 $colorbacklinepair1  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR1)    ?$colorbacklinepair1:$conf->global->THEME_ELDY_LINEPAIR1)    :(empty($user->conf->THEME_ELDY_LINEPAIR1)?$colorbacklinepair1:$user->conf->THEME_ELDY_LINEPAIR1);
 $colorbacklinepair2  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR2)    ?$colorbacklinepair2:$conf->global->THEME_ELDY_LINEPAIR2)    :(empty($user->conf->THEME_ELDY_LINEPAIR2)?$colorbacklinepair2:$user->conf->THEME_ELDY_LINEPAIR2);
-$colorbacklinepairhover  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIRHOVER)    ?$colorbacklinepairhover:$conf->global->THEME_ELDY_LINEPAIRHOVER)    :(empty($user->conf->THEME_ELDY_LINEPAIRHOVER)?$colorbacklinepairhover:$user->conf->THEME_ELDY_LINEPAIRHOVER);
 $colorbackbody       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY)     ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY)          :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY);
 $colortexttitlenotab =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLENOTAB)?$colortexttitlenotab:$conf->global->THEME_ELDY_TEXTTITLENOTAB)             :(empty($user->conf->THEME_ELDY_TEXTTITLENOTAB)?$colortexttitlenotab:$user->conf->THEME_ELDY_TEXTTITLENOTAB);
 $colortexttitle      =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLE)    ?$colortext:$conf->global->THEME_ELDY_TEXTTITLE)             :(empty($user->conf->THEME_ELDY_TEXTTITLE)?$colortexttitle:$user->conf->THEME_ELDY_TEXTTITLE);
@@ -147,6 +142,7 @@ $colortext           =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty(
 $colortextlink       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTLINK)     ?$colortext:$conf->global->THEME_ELDY_TEXTLINK)              :(empty($user->conf->THEME_ELDY_TEXTLINK)?$colortextlink:$user->conf->THEME_ELDY_TEXTLINK);
 $fontsize            =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1)             :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2)             :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2);
+
 // Hover color
 $colorbacklinepairhover=((! isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '0')?'':($conf->global->THEME_ELDY_USE_HOVER === '1'?'edf4fb':$conf->global->THEME_ELDY_USE_HOVER));
 if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
@@ -154,7 +150,7 @@ if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
     $colorbacklinepairhover=((! isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0')?'':($user->conf->THEME_ELDY_USE_HOVER === '1'?'edf4fb':$user->conf->THEME_ELDY_USE_HOVER));
 }
 
-if (empty($colortopbordertitle1)) $colortopbordertitle1=$colorbackhmenu1;
+//if (empty($colortopbordertitle1)) $colortopbordertitle1=$colorbackhmenu1;
 
 
 // Set text color to black or white
@@ -2709,15 +2705,7 @@ tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, tabl
 }
 div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
 {
-	<?php if ($usegradient) { ?>
-	background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	<?php } else { ?>
 	background: rgb(<?php echo $colorbacktitle1; ?>);
-	<?php } ?>
 	font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
 
     color: rgb(<?php echo $colortexttitle; ?>);
@@ -2974,15 +2962,7 @@ tr.box_titre {
 	color: #000 !important; */
 
 	/* TO MATCH ELDY */
-	<?php if ($usegradient) { ?>
-	background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
-	<?php } else { ?>
 	background: rgb(<?php echo $colorbacktitle1; ?>);
-	<?php } ?>
 
     background-repeat: repeat-x;
     color: rgb(<?php echo $colortexttitle; ?>);

From 849fe880cd23ea49afc97dc9b9685cade52cb14b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 May 2017 14:39:13 +0200
Subject: [PATCH 0792/1163] Update resources

---
 doc/images/{README => README.md} |  14 +++++++++++---
 doc/images/dolibarr_logo.jpg     | Bin 17733 -> 23963 bytes
 doc/images/dolibarr_logo.png     | Bin 37626 -> 29999 bytes
 3 files changed, 11 insertions(+), 3 deletions(-)
 rename doc/images/{README => README.md} (66%)
 mode change 100644 => 100755 doc/images/dolibarr_logo.png

diff --git a/doc/images/README b/doc/images/README.md
similarity index 66%
rename from doc/images/README
rename to doc/images/README.md
index 7b6a051aada..798cf599b4c 100644
--- a/doc/images/README
+++ b/doc/images/README.md
@@ -1,8 +1,16 @@
-README (English)
+# README (English)
 --------------------------------
 
-* Most screen captures and icons are Dolibarr contributions, however,
-some icons are from http://led24.de/iconset/. This is original README file for this source:
+
+* Screen captures and icons are Dolibarr contributions
+
+
+* Most logos were created by Dolibarr developers. You may find sources of them on:
+
+https://github.com/Dolibarr/foundation
+
+
+* Few icons are from http://led24.de/iconset/. This is original README file for this source:
 -------------------------------------------------------
 You can do whatever you want with these icons (use on web or in desktop applications) as long as you don’t pass them off as your own and remove this readme file. A credit statement and a link back to
 http://led24.de/iconset/ or http://led24.de/ would be appreciated.
diff --git a/doc/images/dolibarr_logo.jpg b/doc/images/dolibarr_logo.jpg
index 6025ca9d201dc72982a495d45a98c793564e5aad..69de0129523f551ae32ce2e5c8122c8873b36880 100644
GIT binary patch
literal 23963
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

literal 17733
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

diff --git a/doc/images/dolibarr_logo.png b/doc/images/dolibarr_logo.png
old mode 100644
new mode 100755
index f2614471f7e6b5d115d8d28600b766f0e2313842..8edd0660e60d8b2e9551aff18ab83c074667a5c8
GIT binary patch
literal 29999
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

literal 37626
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
WOOBQ$zPw`q0000<MNUMnLSTY1Q_Wuh


From 245ef7a188dc2fbfa3fe1834d9fc210bdf4fd996 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 13:05:03 +0200
Subject: [PATCH 0793/1163] Add screenshot

---
 doc/images/dolibarr_screenshot11_1280x800.png | Bin 0 -> 212848 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 doc/images/dolibarr_screenshot11_1280x800.png

diff --git a/doc/images/dolibarr_screenshot11_1280x800.png b/doc/images/dolibarr_screenshot11_1280x800.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f19a884a3796efd2eca399a1d13e9296e4a0021
GIT binary patch
literal 212848
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
a09c?~)+3=`qeB4zzvN_;q{}6ZgZ>}mYe^XZ

literal 0
HcmV?d00001


From 88e7d54915feac7e61256c9a7f00731393ab8928 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 15:45:00 +0200
Subject: [PATCH 0794/1163] Add phpunit to detect SQL not escaped string.

---
 test/phpunit/CodingPHPTest.php | 177 +++++++++++++++++++++++++++++++++
 1 file changed, 177 insertions(+)
 create mode 100644 test/phpunit/CodingPHPTest.php

diff --git a/test/phpunit/CodingPHPTest.php b/test/phpunit/CodingPHPTest.php
new file mode 100644
index 00000000000..b8d7bc90816
--- /dev/null
+++ b/test/phpunit/CodingPHPTest.php
@@ -0,0 +1,177 @@
+<?php
+/* Copyright (C) 2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/SqlTest.php
+ *      \ingroup    test
+ *      \brief      PHPUnit test
+ *      \remarks    To run this script as CLI:  phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
+
+if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
+
+if (empty($user->id))
+{
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class CodingPhpTest extends PHPUnit_Framework_TestCase
+{
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return SecurityTest
+     */
+    function __construct()
+    {
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
+    public static function tearDownAfterClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->rollback();
+
+        print __METHOD__."\n";
+    }
+
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
+    protected function setUp()
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        print __METHOD__."\n";
+    }
+
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
+    protected function tearDown()
+    {
+        print __METHOD__."\n";
+    }
+
+    /**
+     * testSql
+     *
+     * @return string
+     */
+    public function testPHP()
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        include DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        $filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname');
+
+        foreach($filesarray as $key => $file) 
+        {
+            if (preg_match('/\/htdocs\/includes\//', $file['fullname'])) continue;
+            if (preg_match('/\/htdocs\/custom\//', $file['fullname'])) continue;
+            if (preg_match('/\/htdocs\/nltechno/', $file['fullname'])) continue;
+            if (preg_match('/\/htdocs\/dolimed/', $file['fullname'])) continue;
+            
+            print 'Check php file '.$file['fullname']."\n";
+            $filecontent=file_get_contents($file['fullname']);
+            
+            $ok=true;
+            $matches=array();
+            preg_match_all('/=\'".\$this->(..)/', $filecontent, $matches, PREG_SET_ORDER);
+            foreach($matches as $key => $val)
+            {
+                if ($val[1] != 'db') 
+                {
+                    $ok=false;
+                    break;
+                }
+                //if ($reg[0] != 'db') $ok=false;
+            }
+            //print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+            $this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['fullname'].'. Bad.');
+            //exit;
+        }
+
+        return;
+    }
+
+}

From a534f796687d2ebddb79acca13a3b33c0d16474a Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Fri, 12 May 2017 16:02:01 +0200
Subject: [PATCH 0795/1163] Update code using new css class

---
 htdocs/contrat/card.php  |  8 ++++----
 htdocs/contrat/index.php | 16 +++-------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index e88372c4835..4accbed5636 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1757,7 +1757,7 @@ else
             if ($action == 'deleteline' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid'))
             {
                 print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("DeleteContractLine"),$langs->trans("ConfirmDeleteContractLine"),"confirm_deleteline",'',0,1);
-                if ($ret == 'html') print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[$var].' height="6"><td></td></tr></table>';
+                if ($ret == 'html') print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
             }
 
             /*
@@ -1777,7 +1777,7 @@ else
                 array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid));
 
                 $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion);
-                print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[$var].' height="6"><td></td></tr></table>';
+                print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
             }
 
             /*
@@ -1789,7 +1789,7 @@ else
                 $dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
                 $comment      = GETPOST('comment');
                 $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
-                print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[$var].' height="6"><td></td></tr></table>';
+                print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
             }
 
             /*
@@ -1801,7 +1801,7 @@ else
                 $dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
                 $comment      = GETPOST('comment');
                 $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
-                print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[$var].' height="6"><td></td></tr></table>';
+                print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
             }
 
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index ea9c06d0b2f..924958319a4 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -77,7 +77,6 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     // Search contract
     if (! empty($conf->contrat->enabled))
     {
-    	$var=false;
     	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
     	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     	print '<table class="noborder nohover" width="100%">';
@@ -181,7 +180,6 @@ else
 
 print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Services").'</th></tr>'."\n";
-$var=true;
 $listofstatus=array(0,4,4,5); $bool=false;
 foreach($listofstatus as $status)
 {
@@ -204,13 +202,11 @@ if (! empty($conf->use_javascript_ajax))
     dol_print_graph('stats',300,180,$data,1,'pie',1);
     print '</td></tr>';
 }
-$var=true;
 $listofstatus=array(0,4,4,5); $bool=false;
 foreach($listofstatus as $status)
 {
     if (empty($conf->use_javascript_ajax))
-    {
-        
+    {      
     	print '<tr class="oddeven">';
     	print '<td>'.$staticcontratligne->LibStatut($status,0,($bool?1:0)).'</td>';
     	print '<td align="right"><a href="services.php?mode='.$status.($bool?'&filter=expired':'').'">'.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'</a></td>';
@@ -243,7 +239,6 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 
 	if ( $resql )
 	{
-		$var = false;
 		$num = $db->num_rows($resql);
 
 		print '<table class="noborder" width="100%">';
@@ -277,7 +272,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 		}
 		else
 		{
-			print '<tr '.$bc[$var].' class><td colspan="3" class="opacitymedium">'.$langs->trans("NoContracts").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoContracts").'</td></tr>';
 		}
 		print "</table><br>";
 		$db->free($resql);
@@ -330,11 +325,9 @@ if ($result)
 	print '<th align="center" width="80" colspan="4">'.$langs->trans("Services").'</th>';
 	print "</tr>\n";
 
-	$var=True;
 	while ($i < $num)
 	{
-		$obj = $db->fetch_object($result);
-		
+		$obj = $db->fetch_object($result);		
 
 		print '<tr class="oddeven">';
 		print '<td width="110" class="nowrap">';
@@ -397,7 +390,6 @@ if ($resql)
 	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("LastModifiedServices",$max).'</th>';
 	print "</tr>\n";
 
-	$var=True;
 	while ($i < min($num,$max))
 	{
 		$obj = $db->fetch_object($resql);
@@ -478,7 +470,6 @@ if ($resql)
 	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("NotActivatedServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=0"><span class="badge">'.$num.'</span></a></th>';
 	print "</tr>\n";
 
-	$var=True;
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
@@ -559,7 +550,6 @@ if ($resql)
 	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></th>';
 	print "</tr>\n";
 
-	$var=True;
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);

From fa290c34fad108ec7c0751c0372ae9c4b4f63b06 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 16:55:11 +0200
Subject: [PATCH 0796/1163] Fix against SQL injection. Add phpunit to detect
 missing escapement.

---
 .../class/accountingaccount.class.php         |  8 ++---
 .../accountancy/class/bookkeeping.class.php   | 10 +++---
 htdocs/adherents/class/adherent.class.php     |  4 +--
 .../adherents/class/adherent_type.class.php   |  4 +--
 htdocs/bookmarks/class/bookmark.class.php     |  6 ++--
 htdocs/categories/class/categorie.class.php   | 10 +++---
 htdocs/comm/action/class/actioncomm.class.php | 12 +++----
 htdocs/comm/mailing/class/mailing.class.php   | 10 +++---
 htdocs/comm/propal/class/propal.class.php     |  2 +-
 htdocs/compta/bank/class/account.class.php    |  6 ++--
 .../bank/class/paymentvarious.class.php       | 12 +++----
 .../deplacement/class/deplacement.class.php   |  4 +--
 .../cheque/class/remisecheque.class.php       |  2 +-
 .../class/bonprelevement.class.php            |  8 ++---
 htdocs/contact/class/contact.class.php        |  2 +-
 htdocs/contrat/class/contrat.class.php        | 10 +++---
 htdocs/core/class/commonobject.class.php      | 32 +++++++++----------
 htdocs/core/class/events.class.php            |  2 +-
 htdocs/core/class/fiscalyear.class.php        |  4 +--
 htdocs/core/class/link.class.php              |  4 +--
 htdocs/core/class/menubase.class.php          |  8 ++---
 htdocs/core/modules/DolibarrModules.class.php | 12 +++----
 htdocs/core/modules/modAdherent.class.php     |  4 +--
 htdocs/core/modules/modCommande.class.php     |  4 +--
 htdocs/core/modules/modDon.class.php          |  4 +--
 htdocs/core/modules/modExpedition.class.php   |  8 ++---
 htdocs/core/modules/modFacture.class.php      |  4 +--
 htdocs/core/modules/modFicheinter.class.php   |  4 +--
 htdocs/core/modules/modFournisseur.class.php  |  4 +--
 htdocs/core/modules/modPrelevement.class.php  |  4 +--
 htdocs/core/modules/modProjet.class.php       |  8 ++---
 htdocs/core/modules/modPropale.class.php      |  4 +--
 .../modules/modSupplierProposal.class.php     |  4 +--
 htdocs/don/class/don.class.php                |  8 ++---
 htdocs/ecm/class/ecmdirectory.class.php       |  2 +-
 htdocs/ecm/class/ecmfiles.class.php           |  2 +-
 htdocs/expedition/class/expedition.class.php  | 10 +++---
 .../class/expensereport.class.php             | 16 +++++-----
 htdocs/fichinter/class/fichinter.class.php    |  4 +--
 .../class/fournisseur.commande.class.php      |  8 ++---
 .../fourn/class/fournisseur.facture.class.php |  6 ++--
 htdocs/holiday/class/holiday.class.php        | 12 +++----
 htdocs/hrm/class/establishment.class.php      | 10 +++---
 htdocs/livraison/class/livraison.class.php    |  2 +-
 htdocs/loan/class/loan.class.php              |  4 +--
 .../product/actions_card_product.class.php    |  2 +-
 .../service/actions_card_service.class.php    |  2 +-
 htdocs/product/class/product.class.php        | 18 +++++------
 htdocs/projet/class/project.class.php         |  2 +-
 htdocs/projet/class/projectstats.class.php    |  2 +-
 .../class/companybankaccount.class.php        | 12 +++----
 htdocs/societe/class/societe.class.php        | 16 +++++-----
 .../class/supplier_proposal.class.php         |  8 ++---
 htdocs/user/class/userbankaccount.class.php   | 12 +++----
 test/phpunit/AllTests.php                     |  9 ++++--
 .../{CodingPHPTest.php => CodingPhpTest.php}  |  9 +++---
 .../{SqlTest.php => CodingSqlTest.php}        |  0
 57 files changed, 202 insertions(+), 198 deletions(-)
 rename test/phpunit/{CodingPHPTest.php => CodingPhpTest.php} (94%)
 rename test/phpunit/{SqlTest.php => CodingSqlTest.php} (100%)

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 8bf7dfe0c44..a526f9171a6 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -251,12 +251,12 @@ class AccountingAccount extends CommonObject
 		$sql .= " SET fk_pcg_version = " . ($this->fk_pcg_version ? "'" . $this->db->escape($this->fk_pcg_version) . "'" : "null");
 		$sql .= " , pcg_type = " . ($this->pcg_type ? "'" . $this->db->escape($this->pcg_type) . "'" : "null");
 		$sql .= " , pcg_subtype = " . ($this->pcg_subtype ? "'" . $this->db->escape($this->pcg_subtype) . "'" : "null");
-		$sql .= " , account_number = '" . $this->account_number . "'";
-		$sql .= " , account_parent = '" . $this->account_parent . "'";
+		$sql .= " , account_number = '" . $this->db->escape($this->account_number) . "'";
+		$sql .= " , account_parent = '" . $this->db->escape($this->account_parent) . "'";
 		$sql .= " , label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "null");
-		$sql .= " , fk_accounting_category = '" . $this->account_category . "'";
+		$sql .= " , fk_accounting_category = '" . $this->db->escape($this->account_category) . "'";
 		$sql .= " , fk_user_modif = " . $user->id;
-		$sql .= " , active = '" . $this->active . "'";
+		$sql .= " , active = " . $this->active;
 		$sql .= " WHERE rowid = " . $this->id;
 		
 		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 8f31b40bc54..a59d92eb63a 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -189,10 +189,10 @@ class BookKeeping extends CommonObject
 		// First check if line not yet already in bookkeeping
 		$sql = "SELECT count(*) as nb";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE doc_type = '" . $this->doc_type . "'";
+		$sql .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";
 		$sql .= " AND fk_doc = " . $this->fk_doc;
 		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines 
-		$sql .= " AND numero_compte = '" . $this->numero_compte . "'";
+		$sql .= " AND numero_compte = '" . $this->db->escape($this->numero_compte) . "'";
 	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 		
 		$resql = $this->db->query($sql);
@@ -204,9 +204,9 @@ class BookKeeping extends CommonObject
 				// Determine piece_num
 				$sqlnum = "SELECT piece_num";
 				$sqlnum .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-				$sqlnum .= " WHERE doc_type = '" . $this->doc_type . "'";		// For example doc_type = 'bank' 
-				$sqlnum .= " AND fk_docdet = '" . $this->fk_docdet . "'";		// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
-				$sqlnum .= " AND doc_ref = '" . $this->doc_ref . "'";			// ref of source object
+				$sqlnum .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";		// For example doc_type = 'bank' 
+				$sqlnum .= " AND fk_docdet = " . $this->db->escape($this->fk_docdet);       		// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
+				$sqlnum .= " AND doc_ref = '" . $this->db->escape($this->doc_ref) . "'";			// ref of source object
 			    $sqlnum .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 				
 				dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 17fad129d80..92449005d1f 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -345,7 +345,7 @@ class Adherent extends CommonObject
                 {
                     // Add link to user
                     $sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
-                    $sql.= " fk_member = '".$this->id."'";
+                    $sql.= " fk_member = ".$this->id;
                     $sql.= " WHERE rowid = ".$this->user_id;
                     dol_syslog(get_class($this)."::create", LOG_DEBUG);
                     $resql = $this->db->query($sql);
@@ -1099,7 +1099,7 @@ class Adherent extends CommonObject
         elseif ($ref || $fk_soc) {
         	$sql.= " AND d.entity IN (".getEntity().")";
         	if ($ref) $sql.= " AND d.rowid='".$this->db->escape($ref)."'";
-        	elseif ($fk_soc) $sql.= " AND d.fk_soc='".$fk_soc."'";
+        	elseif ($fk_soc > 0) $sql.= " AND d.fk_soc=".$fk_soc;
         }
         elseif ($ref_ext)
         {
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index c756cc51949..d6ee9958162 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -123,9 +123,9 @@ class AdherentType extends CommonObject
         $sql.= "SET ";
         $sql.= "statut = ".$this->statut.",";
         $sql.= "libelle = '".$this->db->escape($this->libelle) ."',";
-        $sql.= "subscription = '".$this->subscription."',";
+        $sql.= "subscription = '".$this->db->escape($this->subscription)."',";
         $sql.= "note = '".$this->db->escape($this->note)."',";
-        $sql.= "vote = '".$this->vote."',";
+        $sql.= "vote = '".$this->db->escape($this->vote)."',";
         $sql.= "mail_valid = '".$this->db->escape($this->mail_valid)."'";
         $sql .= " WHERE rowid =".$this->id;
 
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index 0e0d6df5f35..26eabc5a5ed 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -173,10 +173,10 @@ class Bookmark extends CommonObject
         $sql.= " SET fk_user = ".($this->fk_user > 0?"'".$this->fk_user."'":"0");
         $sql.= " ,dateb = '".$this->db->idate($this->datec)."'";
         $sql.= " ,url = '".$this->db->escape($this->url)."'";
-        $sql.= " ,target = '".$this->target."'";
+        $sql.= " ,target = '".$this->db->escape($this->target)."'";
         $sql.= " ,title = '".$this->db->escape($this->title)."'";
-        $sql.= " ,favicon = '".$this->favicon."'";
-        $sql.= " ,position = '".$this->position."'";
+        $sql.= " ,favicon = '".$this->db->escape($this->favicon)."'";
+        $sql.= " ,position = '".$this->db->escape($this->position)."'";
         $sql.= " WHERE rowid = ".$this->id;
 
         dol_syslog("Bookmark::update", LOG_DEBUG);
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index b2cd3d3dd31..518c3faa683 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -189,9 +189,9 @@ class Categorie extends CommonObject
 
 		$sql = "SELECT rowid, fk_parent, entity, label, description, color, fk_soc, visible, type";
 		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		if ($id)
+		if ($id > 0)
 		{
-			$sql.= " WHERE rowid = '".$id."'";
+			$sql.= " WHERE rowid = ".$id;
 		}
 		else
 		{
@@ -399,7 +399,7 @@ class Categorie extends CommonObject
 		{
 			$sql .= ", fk_soc = ".($this->socid != -1 ? $this->socid : 'null');
 		}
-		$sql .= ", visible = '".$this->visible."'";
+		$sql .= ", visible = '".$this->db->escape($this->visible)."'";
 		$sql .= ", fk_parent = ".$this->fk_parent;
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -1670,7 +1670,7 @@ class Categorie extends CommonObject
 	                $sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
 	                $sql2.= " SET label='".$this->db->escape($this->label)."',";
 	                $sql2.= " description='".$this->db->escape($this->description)."'";
-	                $sql2.= " WHERE fk_category=".$this->id." AND lang='".$key."'";
+	                $sql2.= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
 	            }
 	            else
 	            {
@@ -1692,7 +1692,7 @@ class Categorie extends CommonObject
 	                $sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
 	                $sql2.= " SET label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
 	                $sql2.= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
-	                $sql2.= " WHERE fk_category=".$this->id." AND lang='".$key."'";
+	                $sql2.= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
 	            }
 	            else
 	            {
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index fc0bbebb901..a9695abcb35 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -753,8 +753,8 @@ class ActionComm extends CommonObject
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
-        $sql.= " SET percent = '".$this->percentage."'";
-        if ($this->fk_action > 0) $sql.= ", fk_action = '".$this->fk_action."'";
+        $sql.= " SET percent = '".$this->db->escape($this->percentage)."'";
+        if ($this->fk_action > 0) $sql.= ", fk_action = '".$this->db->escape($this->fk_action)."'";
         $sql.= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'":"null");
         $sql.= ", datep = ".(strval($this->datep)!='' ? "'".$this->db->idate($this->datep)."'" : 'null');
         $sql.= ", datep2 = ".(strval($this->datef)!='' ? "'".$this->db->idate($this->datef)."'" : 'null');
@@ -763,11 +763,11 @@ class ActionComm extends CommonObject
         $sql.= ", fk_project =". ($this->fk_project > 0 ? "'".$this->fk_project."'":"null");
         $sql.= ", fk_soc =". ($socid > 0 ? "'".$socid."'":"null");
         $sql.= ", fk_contact =". ($contactid > 0 ? "'".$contactid."'":"null");
-        $sql.= ", priority = '".$this->priority."'";
-        $sql.= ", fulldayevent = '".$this->fulldayevent."'";
+        $sql.= ", priority = '".$this->db->escape($this->priority)."'";
+        $sql.= ", fulldayevent = '".$this->db->escape($this->fulldayevent)."'";
         $sql.= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'":"null");
-        $sql.= ", transparency = '".$this->transparency."'";
-        $sql.= ", fk_user_mod = '".$user->id."'";
+        $sql.= ", transparency = '".$this->db->escape($this->transparency)."'";
+        $sql.= ", fk_user_mod = ".$user->id;
         $sql.= ", fk_user_action=".($userownerid > 0 ? "'".$userownerid."'":"null");
         $sql.= ", fk_user_done=".($userdoneid > 0 ? "'".$userdoneid."'":"null");
         if (! empty($this->fk_element)) $sql.= ", fk_element=".($this->fk_element?$this->fk_element:"null");
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 43a3cdcb78d..93c47f8aa51 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -159,11 +159,11 @@ class Mailing extends CommonObject
 		$sql .= " SET titre = '".$this->db->escape($this->titre)."'";
 		$sql .= ", sujet = '".$this->db->escape($this->sujet)."'";
 		$sql .= ", body = '".$this->db->escape($this->body)."'";
-		$sql .= ", email_from = '".$this->email_from."'";
-		$sql .= ", email_replyto = '".$this->email_replyto."'";
-		$sql .= ", email_errorsto = '".$this->email_errorsto."'";
-		$sql .= ", bgcolor = '".($this->bgcolor?$this->bgcolor:null)."'";
-		$sql .= ", bgimage = '".($this->bgimage?$this->bgimage:null)."'";
+		$sql .= ", email_from = '".$this->db->escape($this->email_from)."'";
+		$sql .= ", email_replyto = '".$this->db->escape($this->email_replyto)."'";
+		$sql .= ", email_errorsto = '".$this->db->escape($this->email_errorsto)."'";
+		$sql .= ", bgcolor = '".($this->bgcolor?$this->db->escape($this->bgcolor):null)."'";
+		$sql .= ", bgimage = '".($this->bgimage?$this->db->escape($this->bgimage):null)."'";
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog("Mailing::Update", LOG_DEBUG);
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index dfb53b07621..224cb77eee1 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1021,7 +1021,7 @@ class Propal extends CommonObject
                 {
                     $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
                     $sql.= " SET fk_delivery_address = ".$this->fk_delivery_address;
-                    $sql.= " WHERE ref = '".$this->ref."'";
+                    $sql.= " WHERE ref = '".$this->db->escape($this->ref)."'";
                     $sql.= " AND entity = ".$conf->entity;
 
                     $result=$this->db->query($sql);
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index e2ad8c64bd1..9fdd329fd3d 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -701,8 +701,8 @@ class Account extends CommonObject
         $sql.= ",clos = ".$this->clos;
         $sql.= ",rappro = ".$this->rappro;
         $sql.= ",url = ".($this->url?"'".$this->url."'":"null");
-        $sql.= ",account_number = '".$this->account_number."'";
-		$sql.= ",fk_accountancy_journal = '".$this->fk_accountancy_journal."'";
+        $sql.= ",account_number = '".$this->db->escape($this->account_number)."'";
+		$sql.= ",fk_accountancy_journal = '".$this->db->escape($this->fk_accountancy_journal)."'";
 
 		$sql.= ",bank  = '".$this->db->escape($this->bank)."'";
         $sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
@@ -1858,7 +1858,7 @@ class AccountLine extends CommonObject
         
         $sql = "UPDATE ".MAIN_DB_PREFIX."bank SET";
         $sql.= " rappro = 1";
-        $sql.= ", num_releve = '".$this->num_releve."'";
+        $sql.= ", num_releve = '".$this->db->escape($this->num_releve)."'";
         $sql.= ", fk_user_rappro = ".$user->id;
         $sql.= " WHERE rowid = ".$this->id;
 
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 2cbd75146df..d0c0d61a954 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -88,19 +88,19 @@ class PaymentVarious extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_salary SET";
 
 		$sql.= " tms=".$this->db->idate($this->tms).",";
-		$sql.= " fk_user='".$this->fk_user."',";
+		$sql.= " fk_user=".$this->fk_user.",";
 		$sql.= " datep=".$this->db->idate($this->datep).",";
 		$sql.= " datev=".$this->db->idate($this->datev).",";
 		$sql.= " sens=".$this->sens.",";
-		$sql.= " amount='".$this->amount."',";
+		$sql.= " amount=".price2num($this->amount).",";
 		$sql.= " fk_typepayment=".$this->fk_typepayment."',";
-		$sql.= " num_payment='".$this->num_payment."',";
+		$sql.= " num_payment='".$this->db->escape($this->num_payment)."',";
 		$sql.= " label='".$this->db->escape($this->label)."',";
 		$sql.= " note='".$this->db->escape($this->note)."',";
 		$sql.= " accountancy_code='".$this->db->escape($this->accountancy_code)."',";
-		$sql.= " fk_bank=".($this->fk_bank > 0 ? "'".$this->fk_bank."'":"null").",";
-		$sql.= " fk_user_author='".$this->fk_user_author."',";
-		$sql.= " fk_user_modif='".$this->fk_user_modif."'";
+		$sql.= " fk_bank=".($this->fk_bank > 0 ? $this->fk_bank:"null").",";
+		$sql.= " fk_user_author=".$this->fk_user_author.",";
+		$sql.= " fk_user_modif=".$this->fk_user_modif;
 
 		$sql.= " WHERE rowid=".$this->id;
 
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 4b2dce9f14e..fa8911cecf7 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -187,8 +187,8 @@ class Deplacement extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."deplacement ";
 		$sql .= " SET km = ".$this->km;		// This is a distance or amount
 		$sql .= " , dated = '".$this->db->idate($this->date)."'";
-		$sql .= " , type = '".$this->type."'";
-		$sql .= " , fk_statut = '".$this->statut."'";
+		$sql .= " , type = '".$this->db->escape($this->type)."'";
+		$sql .= " , fk_statut = '".$this->db->escape($this->statut)."'";
 		$sql .= " , fk_user = ".$this->fk_user;
 		$sql .= " , fk_user_modif = ".$user->id;
 		$sql .= " , fk_soc = ".($this->socid > 0?$this->socid:'null');
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 6aa0714d5c9..4889693857b 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -308,7 +308,7 @@ class RemiseCheque extends CommonObject
 			if ( $this->errno === 0) {
 			    $sql = "UPDATE ".MAIN_DB_PREFIX."bank";
 			    $sql.= " SET fk_bordereau = 0";
-			    $sql.= " WHERE fk_bordereau = '".$this->id."'";
+			    $sql.= " WHERE fk_bordereau = ".$this->id;
 
 			    $resql = $this->db->query($sql);
 			    if (!$resql)
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index d7489b8aca0..90ba6a22431 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1082,19 +1082,19 @@ class BonPrelevement extends CommonObject
     {
     	$this->db->begin();
 
-    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_facture WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = '".$this->id."')";
+    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_facture WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id.")";
     	$resql1=$this->db->query($sql);
     	if (! $resql1) dol_print_error($this->db);
 
-    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = '".$this->id."'";
+    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id;
     	$resql2=$this->db->query($sql);
     	if (! $resql2) dol_print_error($this->db);
 
-    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_bons WHERE rowid = '".$this->id."'";
+    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_bons WHERE rowid = ".$this->id;
     	$resql3=$this->db->query($sql);
 		if (! $resql3) dol_print_error($this->db);
 
-    	$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande SET fk_prelevement_bons = NULL, traite = 0 WHERE fk_prelevement_bons = '".$this->id."'";
+    	$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande SET fk_prelevement_bons = NULL, traite = 0 WHERE fk_prelevement_bons = ".$this->id;
     	$resql4=$this->db->query($sql);
 		if (! $resql4) dol_print_error($this->db);
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 216cce41171..b80a300431a 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -317,7 +317,7 @@ class Contact extends CommonObject
 		$sql .= ", phone_perso = ".(isset($this->phone_perso)?"'".$this->db->escape($this->phone_perso)."'":"null");
 		$sql .= ", phone_mobile = ".(isset($this->phone_mobile)?"'".$this->db->escape($this->phone_mobile)."'":"null");
 		$sql .= ", jabberid = ".(isset($this->jabberid)?"'".$this->db->escape($this->jabberid)."'":"null");
-		$sql .= ", priv = '".$this->priv."'";
+		$sql .= ", priv = '".$this->db->escape($this->priv)."'";
 		$sql .= ", statut = ".$this->statut;
 		$sql .= ", fk_user_modif=".($user->id > 0 ? "'".$user->id."'":"NULL");
 		$sql .= ", default_lang=".($this->default_lang?"'".$this->default_lang."'":"NULL");
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 8564edd6ddf..db6464edb6a 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2801,10 +2801,10 @@ class ContratLigne extends CommonObjectLine
 		$sql.= " tva_tx=".price2num($this->tva_tx).",";
 		$sql.= " localtax1_tx=".price2num($this->localtax1_tx).",";
 		$sql.= " localtax2_tx=".price2num($this->localtax2_tx).",";
-		$sql.= " qty='".$this->qty."',";
+		$sql.= " qty=".price2num($this->qty).",";
 		$sql.= " remise_percent=".price2num($this->remise_percent).",";
-		$sql.= " remise=".($this->remise?"'".$this->remise."'":"null").",";
-		$sql.= " fk_remise_except=".($this->fk_remise_except?"'".$this->fk_remise_except."'":"null").",";
+		$sql.= " remise=".($this->remise?price2num($this->remise):"null").",";
+		$sql.= " fk_remise_except=".($this->fk_remise_except > 0?$this->fk_remise_except:"null").",";
 		$sql.= " subprice=".($this->subprice != '' ? $this->subprice : "null").",";
 		$sql.= " price_ht=".($this->price_ht != '' ? $this->price_ht : "null").",";
 		$sql.= " total_ht=".$this->total_ht.",";
@@ -2818,8 +2818,8 @@ class ContratLigne extends CommonObjectLine
 		$sql.= " fk_user_author=".($this->fk_user_author >= 0?$this->fk_user_author:"NULL").",";
 		$sql.= " fk_user_ouverture=".($this->fk_user_ouverture > 0?$this->fk_user_ouverture:"NULL").",";
 		$sql.= " fk_user_cloture=".($this->fk_user_cloture > 0?$this->fk_user_cloture:"NULL").",";
-		$sql.= " commentaire='".$this->db->escape($this->commentaire)."'";
-		$sql.= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		$sql.= " commentaire='".$this->db->escape($this->commentaire)."',";
+		$sql.= " fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
 		$sql.= " WHERE rowid=".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 947d99af545..f3f4e689467 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -579,7 +579,7 @@ abstract class CommonObject
             // On recherche id type_contact
             $sql = "SELECT tc.rowid";
             $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
-            $sql.= " WHERE tc.element='".$this->element."'";
+            $sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
             $sql.= " AND tc.source='".$source."'";
             $sql.= " AND tc.code='".$type_contact."' AND tc.active=1";
 			//print $sql;
@@ -791,7 +791,7 @@ abstract class CommonObject
         if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
         $sql.= " WHERE ec.element_id =".$this->id;
         $sql.= " AND ec.fk_c_type_contact=tc.rowid";
-        $sql.= " AND tc.element='".$this->element."'";
+        $sql.= " AND tc.element='".$this->db->escape($this->element)."'";
         if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";
         if ($source == 'internal') $sql.= " AND tc.source = 'internal'";
         if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
@@ -852,7 +852,7 @@ abstract class CommonObject
         //$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as s ON ec.fk_socpeople=s.rowid";	// Si contact de type external, alors il est lie a une societe
         $sql.= " WHERE ec.rowid =".$rowid;
         $sql.= " AND ec.fk_c_type_contact=tc.rowid";
-        $sql.= " AND tc.element = '".$this->element."'";
+        $sql.= " AND tc.element = '".$this->db->escape($this->element)."'";
 
         dol_syslog(get_class($this)."::swapContactStatus", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -893,10 +893,10 @@ abstract class CommonObject
         $tab = array();
         $sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
-        $sql.= " WHERE tc.element='".$this->element."'";
+        $sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
         if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types
-        if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$source."'";
-        if (! empty($code)) $sql.= " AND tc.code='".$code."'";
+        if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";
+        if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";
         $sql.= $this->db->order($order,'ASC');
 
         //print "sql=".$sql;
@@ -2691,16 +2691,16 @@ abstract class CommonObject
     	if ($updatesource)
     	{
     		$sql.= "fk_source = ".$sourceid;
-    		$sql.= ", sourcetype = '".$sourcetype."'";
+    		$sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";
     		$sql.= " WHERE fk_target = ".$this->id;
-    		$sql.= " AND targettype = '".$this->element."'";
+    		$sql.= " AND targettype = '".$this->db->escape($this->element)."'";
     	}
     	else if ($updatetarget)
     	{
     		$sql.= "fk_target = ".$targetid;
-    		$sql.= ", targettype = '".$targettype."'";
+    		$sql.= ", targettype = '".$this->db->escape($targettype)."'";
     		$sql.= " WHERE fk_source = ".$this->id;
-    		$sql.= " AND sourcetype = '".$this->element."'";
+    		$sql.= " AND sourcetype = '".$this->db->escape($this->element)."'";
     	}
 
     	dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);
@@ -2749,19 +2749,19 @@ abstract class CommonObject
 		{
 			if ($deletesource)
 			{
-				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
-				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->element."'";
+				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
+				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
 			}
 			else if ($deletetarget)
 			{
-				$sql.= " fk_target = ".$targetid." AND targettype = '".$targettype."'";
-				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->element."'";
+				$sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
+				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
 			}
 			else
 			{
-				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->element."')";
+				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
 				$sql.= " OR";
-				$sql.= " (fk_target = ".$this->id." AND targettype = '".$this->element."')";
+				$sql.= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
 			}
 		}
 
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index e091743833c..2cfedfb7d1a 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -171,7 +171,7 @@ class Events // extends CommonObject
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
-		$sql.= " type='".$this->type."',";
+		$sql.= " type='".$this->db->escape($this->type)."',";
 		$sql.= " dateevent=".$this->db->idate($this->dateevent).",";
 		$sql.= " description='".$this->db->escape($this->description)."'";
 		$sql.= " WHERE rowid=".$this->id;
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 912c1e34879..22b26983bcc 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -142,10 +142,10 @@ class Fiscalyear extends CommonObject
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_fiscalyear";
-		$sql .= " SET label = '".$this->label."'";
+		$sql .= " SET label = '".$this->db->escape($this->label)."'";
 		$sql .= ", date_start = '".$this->db->idate($this->date_start)."'";
 		$sql .= ", date_end = ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
-		$sql .= ", statut = '".$this->statut."'";
+		$sql .= ", statut = '".$this->db->escape($this->statut)."'";
 		$sql .= ", datec = " . ($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
 		$sql .= ", fk_user_modif = " . $user->id;
 		$sql .= " WHERE rowid = ".$this->id;
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 62bcf9d22c5..f604e85e11d 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -174,9 +174,9 @@ class Link extends CommonObject
         $sql .= ", datea = '" . $this->db->idate(dol_now()) . "'";
         $sql .= ", url = '" . $this->db->escape($this->url) . "'";
         $sql .= ", label = '" . $this->db->escape($this->label) . "'";
-        $sql .= ", objecttype = '" . $this->objecttype . "'";
+        $sql .= ", objecttype = '" . $this->db->escape($this->objecttype) . "'";
         $sql .= ", objectid = " . $this->objectid;
-        $sql .= " WHERE rowid = '" . $this->id ."'";
+        $sql .= " WHERE rowid = " . $this->id;
 
         dol_syslog(get_class($this)."::update sql = " .$sql);
         $resql = $this->db->query($sql);
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 93037117cb8..ed6b9929a32 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -216,20 +216,20 @@ class Menubase
         $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
         $sql.= " menu_handler='".$this->db->escape($this->menu_handler)."',";
         $sql.= " module='".$this->db->escape($this->module)."',";
-        $sql.= " type='".$this->type."',";
+        $sql.= " type='".$this->db->escape($this->type)."',";
         $sql.= " mainmenu='".$this->db->escape($this->mainmenu)."',";
         $sql.= " leftmenu='".$this->db->escape($this->leftmenu)."',";
-        $sql.= " fk_menu='".$this->fk_menu."',";
+        $sql.= " fk_menu='".$this->db->escape($this->fk_menu)."',";
         $sql.= " fk_mainmenu=".($this->fk_mainmenu?"'".$this->fk_mainmenu."'":"null").",";
         $sql.= " fk_leftmenu=".($this->fk_leftmenu?"'".$this->fk_leftmenu."'":"null").",";
-        $sql.= " position='".$this->position."',";
+        $sql.= " position=".($this->position > 0 ? $this->position : 0).",";
         $sql.= " url='".$this->db->escape($this->url)."',";
         $sql.= " target='".$this->db->escape($this->target)."',";
         $sql.= " titre='".$this->db->escape($this->titre)."',";
         $sql.= " langs='".$this->db->escape($this->langs)."',";
         $sql.= " perms='".$this->db->escape($this->perms)."',";
         $sql.= " enabled='".$this->db->escape($this->enabled)."',";
-        $sql.= " usertype='".$this->user."'";
+        $sql.= " usertype='".$this->db->escape($this->user)."'";
         $sql.= " WHERE rowid=".$this->id;
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index d0559268c52..f501d33c29a 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -779,7 +779,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         global $conf;
         
         $sql = "SELECT tms FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
+        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql.= " AND entity IN (0, ".$conf->entity.")";
         
         dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
@@ -805,7 +805,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         global $conf;
         
         $sql = "SELECT tms, note FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
+        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql.= " AND entity IN (0, ".$conf->entity.")";
         
         dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
@@ -841,7 +841,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         $entity = ((! empty($this->always_enabled) || ! empty($this->core_enabled)) ? 0 : $conf->entity);
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
+        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql.= " AND entity IN (0, ".$entity.")";
 
         dol_syslog(get_class($this)."::_active", LOG_DEBUG);
@@ -879,7 +879,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         $entity = ((! empty($this->always_enabled) || ! empty($this->core_enabled)) ? 0 : $conf->entity);
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
+        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql.= " AND entity IN (0, ".$entity.")";
 
         dol_syslog(get_class($this)."::_unactive", LOG_DEBUG);
@@ -1520,7 +1520,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         // Test if module is activated
         $sql_del = "SELECT ".$this->db->decrypt('value')." as value";
         $sql_del.= " FROM ".MAIN_DB_PREFIX."const";
-        $sql_del.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
+        $sql_del.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql_del.= " AND entity IN (0,".$entity.")";
 
         dol_syslog(get_class($this)."::insert_permissions", LOG_DEBUG);
@@ -1655,7 +1655,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         $err=0;
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."rights_def";
-        $sql.= " WHERE module = '".$this->rights_class."'";
+        $sql.= " WHERE module = '".$this->db->escape($this->rights_class)."'";
         $sql.= " AND entity = ".$conf->entity;
         dol_syslog(get_class($this)."::delete_permissions", LOG_DEBUG);
         if (! $this->db->query($sql))
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 3081cc8c726..4b3d1e5d34f 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -369,8 +369,8 @@ class modAdherent extends DolibarrModules
         }*/
     
         $sql = array(
-            "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type='member' AND entity = ".$conf->entity,
-            "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','member',".$conf->entity.")"
+            "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type='member' AND entity = ".$conf->entity,
+            "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','member',".$conf->entity.")"
         );
     
         return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index f9c10eef6de..1806bfdea71 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -256,8 +256,8 @@ class modCommande extends DolibarrModules
 		}
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'order' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','order',".$conf->entity.")"
+				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'order' AND entity = ".$conf->entity,
+				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','order',".$conf->entity.")"
 		);
 
 		 return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index 26dd397c913..881dd27e414 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -157,8 +157,8 @@ class modDon extends DolibarrModules
 		global $conf;
 
 		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'donation' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','donation',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'donation' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','donation',".$conf->entity.")",
 		);
 
 		return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 63f7b536c1b..7320eba6736 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -318,10 +318,10 @@ class modExpedition extends DolibarrModules
 		$sql = array();
 
 		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'shipping' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','shipping',".$conf->entity.")",
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[3][2]."' AND type = 'delivery' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[3][2]."','delivery',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'shipping' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','shipping',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[3][2])."' AND type = 'delivery' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[3][2])."','delivery',".$conf->entity.")",
 		);
 
 		return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 148dd965abb..7029b7ffd78 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -311,8 +311,8 @@ class modFacture extends DolibarrModules
 		}
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'invoice' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','invoice',".$conf->entity.")"
+				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'invoice' AND entity = ".$conf->entity,
+				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','invoice',".$conf->entity.")"
 		);
 
 		return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 98ac6f9b3f2..55deaf2403f 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -194,8 +194,8 @@ class modFicheinter extends DolibarrModules
         $this->remove($options);
 
         $sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'ficheinter' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','ficheinter',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'ficheinter' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','ficheinter',".$conf->entity.")",
         );
 
         return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 269d4d04a17..fc2572d3669 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -572,8 +572,8 @@ class modFournisseur extends DolibarrModules
 		$this->remove($options);
 
 		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'order_supplier' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','order_supplier',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'order_supplier' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','order_supplier',".$conf->entity.")",
 		);
 
 		return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index 6be4022438c..542a02e7589 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -153,8 +153,8 @@ class modPrelevement extends DolibarrModules
 		$this->remove($options);
 
 		$sql = array(
-		    "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'bankaccount' AND entity = ".$conf->entity,
-		    "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','bankaccount',".$conf->entity.")",
+		    "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'bankaccount' AND entity = ".$conf->entity,
+		    "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','bankaccount',".$conf->entity.")",
 		);		
 
 		return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 4ad3a86771a..96e5a96b384 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -353,13 +353,13 @@ class modProjet extends DolibarrModules
 		}
 
 		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'project' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','project',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'project' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','project',".$conf->entity.")",
 		);
 
 		$sql = array(
-			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[3][2]."' AND type = 'task' AND entity = ".$conf->entity,
-			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[3][2]."','task',".$conf->entity.")"
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[3][2])."' AND type = 'task' AND entity = ".$conf->entity,
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[3][2])."','task',".$conf->entity.")"
 		);
 
 		return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index ce23e996e0a..3dd39b336bc 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -248,8 +248,8 @@ class modPropale extends DolibarrModules
 		}
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'propal' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','propal',".$conf->entity.")",
+				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'propal' AND entity = ".$conf->entity,
+				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','propal',".$conf->entity.")",
 		);
 
 		return $this->_init($sql,$options);
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index 054fdca6c90..8869f0cd343 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -227,8 +227,8 @@ class modSupplierProposal extends DolibarrModules
 		}
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND type = 'supplier_proposal' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','supplier_proposal',".$conf->entity.")",
+				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'supplier_proposal' AND entity = ".$conf->entity,
+				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','supplier_proposal',".$conf->entity.")",
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 74349a16271..bfcbd6b7059 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -464,11 +464,11 @@ class Don extends CommonObject
         $sql .= ",note_public=".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
         $sql .= ",datedon='".$this->db->idate($this->date)."'";
         $sql .= ",date_valid=".($this->date_valid?"'".$this->db->idate($this->date)."'":"null");
-        $sql .= ",email='".$this->email."'";
-        $sql .= ",phone='".$this->phone."'";
-        $sql .= ",phone_mobile='".$this->phone_mobile."'";
+        $sql .= ",email='".$this->db->escape($this->email)."'";
+        $sql .= ",phone='".$this->db->escape($this->phone)."'";
+        $sql .= ",phone_mobile='".$this->db->escape($this->phone_mobile)."'";
         $sql .= ",fk_statut=".$this->statut;
-        $sql .= " WHERE rowid = '".$this->id."'";
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::Update", LOG_DEBUG);
         $resql=$this->db->query($sql);
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 82fd7f49d58..31439fa5ba3 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -202,7 +202,7 @@ class EcmDirectory // extends CommonObject
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET";
 		$sql.= " label='".$this->db->escape($this->label)."',";
-		$sql.= " fk_parent='".$this->fk_parent."',";
+		$sql.= " fk_parent='".$this->db->escape($this->fk_parent)."',";
 		$sql.= " description='".$this->db->escape($this->description)."'";
 		$sql.= " WHERE rowid=".$this->id;
 
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 2089a5b3bb8..a48d3171020 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -140,7 +140,7 @@ class EcmFiles //extends CommonObject
 		if (empty($this->position))   // Get max used
 		{
 		    $sql = "SELECT MAX(position) as maxposition FROM " . MAIN_DB_PREFIX . $this->table_element;
-		    $sql.= " WHERE filepath ='".$this->filepath."'";
+		    $sql.= " WHERE filepath ='".$this->db->escape($this->filepath)."'";
 		    
 		    $resql = $this->db->query($sql);
 		    if ($resql)
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 99d81852734..8d6822fd360 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -487,7 +487,7 @@ class Expedition extends CommonObject
         $sql.= ', e.fk_incoterms, e.location_incoterms';
         $sql.= ', i.libelle as libelle_incoterms';
 		$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->element."'";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
 		$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")";
 		if ($id)   	  $sql.= " AND e.rowid=".$id;
@@ -1753,10 +1753,10 @@ class Expedition extends CommonObject
         else
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
-            $sql.= " code='".$this->update['code']."'";
-            $sql.= ",libelle='".$this->update['libelle']."'";
-            $sql.= ",description='".$this->update['description']."'";
-            $sql.= ",tracking='".$this->update['tracking']."'";
+            $sql.= " code='".$this->db->escape($this->update['code'])."'";
+            $sql.= ",libelle='".$this->db->escape($this->update['libelle'])."'";
+            $sql.= ",description='".$this->db->escape($this->update['description'])."'";
+            $sql.= ",tracking='".$this->db->escape($this->update['tracking'])."'";
             $sql.= " WHERE rowid=".$id;
             $resql = $this->db->query($sql);
         }
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 898b5c4cd1f..eb16583df26 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -183,7 +183,7 @@ class ExpenseReport extends CommonObject
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
             $this->ref='(PROV'.$this->id.')';
 
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET ref='".$this->ref."' WHERE rowid=".$this->id;
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
             $resql=$this->db->query($sql);
             if (!$resql) $error++;
 
@@ -1078,7 +1078,7 @@ class ExpenseReport extends CommonObject
 			$this->db->begin();
 			
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql.= " SET ref = '".$this->ref."', fk_statut = 2, fk_user_valid = ".$fuser->id.", date_valid='".$this->db->idate($now)."'";
+            $sql.= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = 2, fk_user_valid = ".$fuser->id.", date_valid='".$this->db->idate($now)."'";
             if ($update_number_int) {
                 $sql.= ", ref_number_int = ".$ref_number_int;
             }
@@ -1189,8 +1189,8 @@ class ExpenseReport extends CommonObject
 			$this->db->begin();
 			
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql.= " SET ref = '".$this->ref."', fk_statut = 5, fk_user_approve = ".$fuser->id.",";
-            $sql.= " date_approve='".$this->date_approve."'";
+            $sql.= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = 5, fk_user_approve = ".$fuser->id.",";
+            $sql.= " date_approve='".$this->db->idate($this->date_approve)."'";
             $sql.= ' WHERE rowid = '.$this->id;
             if ($this->db->query($sql))
             {
@@ -1248,7 +1248,7 @@ class ExpenseReport extends CommonObject
         if ($this->fk_statut != 99)
         {
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql.= " SET ref = '".$this->ref."', fk_statut = 99, fk_user_refuse = ".$fuser->id.",";
+            $sql.= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = 99, fk_user_refuse = ".$fuser->id.",";
             $sql.= " date_refuse='".$this->db->idate($now)."',";
             $sql.= " detail_refuse='".$this->db->escape($details)."',";
             $sql.= " fk_user_approve = NULL";
@@ -1373,7 +1373,7 @@ class ExpenseReport extends CommonObject
 			
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
             $sql.= " SET fk_statut = 4, fk_user_cancel = ".$fuser->id;
-            $sql.= ", date_cancel='".$this->date_cancel."'";
+            $sql.= ", date_cancel='".$this->db->idate($this->date_cancel)."'";
             $sql.= " ,detail_cancel='".$this->db->escape($detail)."'";
             $sql.= ' WHERE rowid = '.$this->id;
 
@@ -2154,8 +2154,8 @@ class ExpenseReportLine
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX."expensereport_det SET";
         $sql.= " comments='".$this->db->escape($this->comments)."'";
-        $sql.= ",value_unit=".$this->value_unit."";
-        $sql.= ",qty=".$this->qty."";
+        $sql.= ",value_unit=".$this->value_unit;
+        $sql.= ",qty=".$this->qty;
         $sql.= ",date='".$this->db->idate($this->date)."'";
         $sql.= ",total_ht=".$this->total_ht."";
         $sql.= ",total_tva=".$this->total_tva."";
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index d9912edfca1..6142d87de7a 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -212,7 +212,7 @@ class Fichinter extends CommonObject
 			if ($this->id)
 			{
 				$this->ref='(PROV'.$this->id.')';
-				$sql = 'UPDATE '.MAIN_DB_PREFIX."fichinter SET ref='".$this->ref."' WHERE rowid=".$this->id;
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."fichinter SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
 				dol_syslog(get_class($this)."::create", LOG_DEBUG);
 				$resql=$this->db->query($sql);
@@ -1375,7 +1375,7 @@ class FichinterLigne extends CommonObjectLine
 		$sql.= " description='".$this->db->escape($this->desc)."'";
 		$sql.= ",date='".$this->db->idate($this->datei)."'";
 		$sql.= ",duree=".$this->duration;
-		$sql.= ",rang='".$this->rang."'";
+		$sql.= ",rang='".$this->db->escape($this->rang)."'";
 		$sql.= " WHERE rowid = ".$this->rowid;
 
 		dol_syslog("FichinterLigne::update", LOG_DEBUG);
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 6b9ded02160..cb47a2d99df 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3213,12 +3213,12 @@ class CommandeFournisseurLigne extends CommonOrderLine
         $sql.= ", tva_tx='".price2num($this->tva_tx)."'";
         $sql.= ", localtax1_tx='".price2num($this->total_localtax1)."'";
         $sql.= ", localtax2_tx='".price2num($this->total_localtax2)."'";
-        $sql.= ", localtax1_type='".$this->localtax1_type."'";
-        $sql.= ", localtax2_type='".$this->localtax2_type."'";
+        $sql.= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+        $sql.= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
         $sql.= ", qty='".price2num($this->qty)."'";
         $sql.= ", date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
         $sql.= ", date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
-        $sql.= ", info_bits='".$this->info_bits."'";
+        $sql.= ", info_bits='".$this->db->escape($this->info_bits)."'";
         $sql.= ", total_ht='".price2num($this->total_ht)."'";
         $sql.= ", total_tva='".price2num($this->total_tva)."'";
         $sql.= ", total_localtax1='".price2num($this->total_localtax1)."'";
@@ -3295,7 +3295,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 
         $this->db->begin();
 
-        $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande_fournisseurdet WHERE rowid='".$this->rowid."';";
+        $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande_fournisseurdet WHERE rowid=".$this->rowid;
 
         dol_syslog(__METHOD__, LOG_DEBUG);
         $resql=$this->db->query($sql);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 496c4660895..f9df07e96cc 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -300,7 +300,7 @@ class FactureFournisseur extends CommonInvoice
 
             // Update ref with new one
             $this->ref='(PROV'.$this->id.')';
-            $sql = 'UPDATE '.MAIN_DB_PREFIX."facture_fourn SET ref='".$this->ref."' WHERE rowid=".$this->id;
+            $sql = 'UPDATE '.MAIN_DB_PREFIX."facture_fourn SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
             dol_syslog(get_class($this)."::create", LOG_DEBUG);
             $resql=$this->db->query($sql);
@@ -2559,8 +2559,8 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql.= ", tva_tx = ".price2num($this->tva_tx);
 		$sql.= ", localtax1_tx = ".price2num($this->localtax1_tx);
 		$sql.= ", localtax2_tx = ".price2num($this->localtax2_tx);
-		$sql.= ", localtax1_type = '".$this->localtax1_type."'";
-		$sql.= ", localtax2_type = '".$this->localtax2_type."'";
+		$sql.= ", localtax1_type = '".$this->db->escape($this->localtax1_type)."'";
+		$sql.= ", localtax2_type = '".$this->db->escape($this->localtax2_type)."'";
 		$sql.= ", total_ht = ".price2num($this->total_ht);
 		$sql.= ", tva= ".price2num($this->total_tva);
 		$sql.= ", total_localtax1= ".price2num($this->total_localtax1);
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index e69fd312f45..5f244dcb9bf 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -546,12 +546,12 @@ class Holiday extends CommonObject
         }
        	$sql.= " halfday = ".$this->halfday.",";
         if(!empty($this->statut) && is_numeric($this->statut)) {
-            $sql.= " statut = '".$this->statut."',";
+            $sql.= " statut = ".$this->statut.",";
         } else {
             $error++;
         }
         if(!empty($this->fk_validator)) {
-            $sql.= " fk_validator = '".$this->fk_validator."',";
+            $sql.= " fk_validator = '".$this->db->escape($this->fk_validator)."',";
         } else {
             $error++;
         }
@@ -561,7 +561,7 @@ class Holiday extends CommonObject
             $sql.= " date_valid = NULL,";
         }
         if(!empty($this->fk_user_valid)) {
-            $sql.= " fk_user_valid = '".$this->fk_user_valid."',";
+            $sql.= " fk_user_valid = '".$this->db->escape($this->fk_user_valid)."',";
         } else {
             $sql.= " fk_user_valid = NULL,";
         }
@@ -571,7 +571,7 @@ class Holiday extends CommonObject
             $sql.= " date_refuse = NULL,";
         }
         if(!empty($this->fk_user_refuse)) {
-            $sql.= " fk_user_refuse = '".$this->fk_user_refuse."',";
+            $sql.= " fk_user_refuse = '".$this->db->escape($this->fk_user_refuse)."',";
         } else {
             $sql.= " fk_user_refuse = NULL,";
         }
@@ -581,7 +581,7 @@ class Holiday extends CommonObject
             $sql.= " date_cancel = NULL,";
         }
         if(!empty($this->fk_user_cancel)) {
-            $sql.= " fk_user_cancel = '".$this->fk_user_cancel."',";
+            $sql.= " fk_user_cancel = '".$this->db->escape($this->fk_user_cancel)."',";
         } else {
             $sql.= " fk_user_cancel = NULL,";
         }
@@ -591,7 +591,7 @@ class Holiday extends CommonObject
             $sql.= " detail_refuse = NULL";
         }
 
-        $sql.= " WHERE rowid= '".$this->id."'";
+        $sql.= " WHERE rowid= ".$this->id;
 
         $this->db->begin();
 
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 4438f3ea6ad..a171a111889 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -153,12 +153,12 @@ class Establishment extends CommonObject
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."establishment";
-		$sql .= " SET name = '".$this->name."'";
-		$sql .= ", address = '".$this->address."'";
-		$sql .= ", zip = '".$this->zip."'";
-		$sql .= ", town = '".$this->town."'";
+		$sql .= " SET name = '".$this->db->escape($this->name)."'";
+		$sql .= ", address = '".$this->db->escape($this->address)."'";
+		$sql .= ", zip = '".$this->db->escape($this->zip)."'";
+		$sql .= ", town = '".$this->db->escape($this->town)."'";
 		$sql .= ", fk_country = ".($this->country_id > 0 ? $this->country_id : 'null');
-		$sql .= ", status = '".$this->status."'";
+		$sql .= ", status = '".$this->db->escape($this->status)."'";
 		$sql .= ", fk_user_mod = " . $user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 3a18abf2cbb..383b2276d6c 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -263,7 +263,7 @@ class Livraison extends CommonObject
         $sql.= ', l.fk_incoterms, l.location_incoterms';
         $sql.= ", i.libelle as libelle_incoterms";
 		$sql.= " FROM ".MAIN_DB_PREFIX."livraison as l";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = l.rowid AND el.targettype = '".$this->element."'";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = l.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON l.fk_incoterms = i.rowid';
 		$sql.= " WHERE l.rowid = ".$id;
 
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index d9d4da6fb20..734c2356b3a 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -236,7 +236,7 @@ class Loan extends CommonObject
         // Delete payments
         if (! $error)
         {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_loan where fk_loan='".$this->id."'";
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_loan where fk_loan=".$this->id;
             dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if (! $resql)
@@ -248,7 +248,7 @@ class Loan extends CommonObject
 
         if (! $error)
         {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."loan where rowid='".$this->id."'";
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."loan where rowid=".$this->id;
             dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if (! $resql)
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 8db1ae21469..a60694ca7cb 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -269,7 +269,7 @@ class ActionsCardProduct
 
 		$sql = "SELECT rowid, name, alias, title, align, sort, search, enabled, rang";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_field_list";
-		$sql.= " WHERE element = '".$this->fieldListName."'";
+		$sql.= " WHERE element = '".$this->db->escape($this->fieldListName)."'";
 		$sql.= " AND entity = ".$conf->entity;
 		$sql.= " ORDER BY rang ASC";
 
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index af6fbccc320..970ac535273 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -248,7 +248,7 @@ class ActionsCardService
 
 		$sql = "SELECT rowid, name, alias, title, align, sort, search, enabled, rang";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_field_list";
-		$sql.= " WHERE element = '".$this->fieldListName."'";
+		$sql.= " WHERE element = '".$this->db->escape($this->fieldListName)."'";
 		$sql.= " AND entity = ".$conf->entity;
 		$sql.= " ORDER BY rang ASC";
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 4e6c3f49738..4a8c1e9f8fb 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -494,7 +494,7 @@ class Product extends CommonObject
 			$sql = "SELECT count(*) as nb";
 			$sql.= " FROM ".MAIN_DB_PREFIX."product";
 			$sql.= " WHERE entity IN (".getEntity('product', 1).")";
-			$sql.= " AND ref = '" .$this->ref."'";
+			$sql.= " AND ref = '" .$this->db->escape($this->ref)."'";
 
 			$result = $this->db->query($sql);
 			if ($result)
@@ -1212,14 +1212,14 @@ class Product extends CommonObject
 					$sql2.= " label='".$this->db->escape($this->label)."',";
 					$sql2.= " description='".$this->db->escape($this->description)."'";
 					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.= ", note='".$this->db->escape($this->note)."'";
-					$sql2.= " WHERE fk_product=".$this->id." AND lang='".$key."'";
+					$sql2.= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
 				}
 				else
 				{
 					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
 					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.=", note";
 					$sql2.= ")";
-					$sql2.= " VALUES(".$this->id.",'".$key."','". $this->db->escape($this->label)."',";
+					$sql2.= " VALUES(".$this->id.",'".$this->db->escape($key)."','". $this->db->escape($this->label)."',";
 					$sql2.= " '".$this->db->escape($this->description)."'";
 					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.= ", '".$this->db->escape($this->note)."'";
 					$sql2.= ")";
@@ -1247,14 +1247,14 @@ class Product extends CommonObject
 					$sql2.= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
 					$sql2.= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
 					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.= ", note='".$this->db->escape($this->multilangs["$key"]["note"])."'";
-					$sql2.= " WHERE fk_product=".$this->id." AND lang='".$key."'";
+					$sql2.= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
 				}
 				else
 				{
 					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
 					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.=", note";
 					$sql2.= ")";
-					$sql2.= " VALUES(".$this->id.",'".$key."','". $this->db->escape($this->multilangs["$key"]["label"])."',";
+					$sql2.= " VALUES(".$this->id.",'".$this->db->escape($key)."','". $this->db->escape($this->multilangs["$key"]["label"])."',";
 					$sql2.= " '".$this->db->escape($this->multilangs["$key"]["description"])."'";
 					if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) $sql2.= ", '".$this->db->escape($this->note)."'";
 					$sql2.= ")";
@@ -1944,7 +1944,7 @@ class Product extends CommonObject
 						$sql.= " FROM ".MAIN_DB_PREFIX."product_price";
 						$sql.= " WHERE entity IN (".getEntity('productprice', 1).")";
 						$sql.= " AND price_level=".$i;
-						$sql.= " AND fk_product = '".$this->id."'";
+						$sql.= " AND fk_product = ".$this->id;
 						$sql.= " ORDER BY date_price DESC, rowid DESC";
 						$sql.= " LIMIT 1";
 						$resql = $this->db->query($sql);
@@ -1969,7 +1969,7 @@ class Product extends CommonObject
 							{
 								$sql = "SELECT rowid, price, unitprice, quantity, remise_percent, remise";
 								$sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-								$sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[$i]."'";
+								$sql.= " WHERE fk_product_price = ".$this->prices_by_qty_id[$i];
 								$sql.= " ORDER BY quantity ASC";
 								$resultat=array();
 								$resql = $this->db->query($sql);
@@ -2006,7 +2006,7 @@ class Product extends CommonObject
 					$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
 					$sql.= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid";
 					$sql.= " FROM ".MAIN_DB_PREFIX."product_price";
-					$sql.= " WHERE fk_product = '".$this->id."'";
+					$sql.= " WHERE fk_product = ".$this->id;
 					$sql.= " ORDER BY date_price DESC, rowid DESC";
 					$sql.= " LIMIT 1";
 					$resql = $this->db->query($sql);
@@ -2022,7 +2022,7 @@ class Product extends CommonObject
 						{
 							$sql = "SELECT rowid,price, unitprice, quantity, remise_percent, remise";
 							$sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-							$sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[0]."'";
+							$sql.= " WHERE fk_product_price = ".$this->prices_by_qty_id[0];
 							$sql.= " ORDER BY quantity ASC";
 							$resultat=array();
 							$resql = $this->db->query($sql);
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 309107ed233..5efaae1fd78 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1113,7 +1113,7 @@ class Project extends CommonObject
         // Get id of types of contacts for projects (This list never contains a lot of elements)
         $listofprojectcontacttype=array();
         $sql2 = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-        $sql2.= " WHERE ctc.element = '" . $this->element . "'";
+        $sql2.= " WHERE ctc.element = '" . $this->db->escape($this->element) . "'";
         $sql2.= " AND ctc.source = 'internal'";
         $resql = $this->db->query($sql2);
         if ($resql)
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 88eb8ef5ced..4485117fb0f 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -143,7 +143,7 @@ class ProjectStats extends Stats
 		if (! empty($this->socid))
 			$sqlwhere[] = ' t.fk_soc=' . $this->socid;
 		if (! empty($this->year) && empty($this->yearmonth))
-			$sqlwhere[] = " date_format(t.datec,'%Y')='" . $this->year . "'";
+			$sqlwhere[] = " date_format(t.datec,'%Y')='" . $this->db->escape($this->year) . "'";
 		if (! empty($this->yearmonth))
 			$sqlwhere[] = " t.datec BETWEEN '" . $this->db->idate(dol_get_first_day($this->yearmonth)) . "' AND '" . $this->db->idate(dol_get_last_day($this->yearmonth)) . "'";
 
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 652cd8d5d7e..65c3ca37e0a 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -144,12 +144,12 @@ class CompanyBankAccount extends Account
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET";
         $sql.= " bank = '" .$this->db->escape($this->bank)."'";
-        $sql.= ",code_banque='".$this->code_banque."'";
-        $sql.= ",code_guichet='".$this->code_guichet."'";
-        $sql.= ",number='".$this->number."'";
-        $sql.= ",cle_rib='".$this->cle_rib."'";
-        $sql.= ",bic='".$this->bic."'";
-        $sql.= ",iban_prefix = '".$this->iban."'";
+        $sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
+        $sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
+        $sql.= ",number='".$this->db->escape($this->number)."'";
+        $sql.= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
+        $sql.= ",bic='".$this->db->escape($this->bic)."'";
+        $sql.= ",iban_prefix = '".$this->db->escape($this->iban)."'";
         $sql.= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
         $sql.= ",proprio = '".$this->db->escape($this->proprio)."'";
         $sql.= ",owner_address = '".$this->db->escape($this->owner_address)."'";
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6d3464ccc20..fb486629731 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -841,7 +841,7 @@ class Societe extends CommonObject
             $sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
             if (isset($this->stcomm_id))
             {
-                $sql .= ",fk_stcomm='".$this->stcomm_id."'";
+                $sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "null");
             }
             $sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
 
@@ -859,7 +859,7 @@ class Societe extends CommonObject
             $sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->db->escape($this->default_lang)."'":"null");
             $sql .= ",logo = ".(! empty($this->logo)?"'".$this->db->escape($this->logo)."'":"null");
             $sql .= ",outstanding_limit= ".($this->outstanding_limit!=''?$this->outstanding_limit:'null');
-            $sql .= ",fk_prospectlevel='".$this->fk_prospectlevel."'";
+            $sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
 
             $sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
             $sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
@@ -2080,7 +2080,7 @@ class Societe extends CommonObject
 
         $sql = "SELECT rowid, email, statut, phone_mobile, lastname, poste, firstname";
         $sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-        $sql.= " WHERE fk_soc = '".$this->id."'";
+        $sql.= " WHERE fk_soc = ".$this->id;
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -2140,7 +2140,7 @@ class Societe extends CommonObject
     {
         $contacts = array();
 
-        $sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = '".$this->id."'";
+        $sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -2173,7 +2173,7 @@ class Societe extends CommonObject
         require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
         $contacts = array();
 
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = '".$this->id."'";
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -3157,7 +3157,7 @@ class Societe extends CommonObject
     {
     	$sql  = "SELECT t.localtax1, t.localtax2";
     	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->country_code."'";
+    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
     	$sql .= " AND t.active = 1";
     	if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
     	elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
@@ -3181,7 +3181,7 @@ class Societe extends CommonObject
     {
         $sql  = "SELECT t.rowid";
         $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->country_code."'";
+        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
         $sql .= " AND t.active = 1 AND t.recuperableonly = 1";
 
         dol_syslog("useNPR", LOG_DEBUG);
@@ -3202,7 +3202,7 @@ class Societe extends CommonObject
     {
 		$sql  = "SELECT COUNT(*) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r, ".MAIN_DB_PREFIX."c_country as c";
-		$sql .= " WHERE r.fk_pays = c.rowid AND c.code = '".$this->country_code."'";
+		$sql .= " WHERE r.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
 		$sql .= " AND r.active = 1";
 
 		dol_syslog("useRevenueStamp", LOG_DEBUG);
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 00ca20bcd5a..7019933fb9c 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -839,7 +839,7 @@ class SupplierProposal extends CommonObject
             if ($this->id)
             {
                 $this->ref='(PROV'.$this->id.')';
-                $sql = 'UPDATE '.MAIN_DB_PREFIX."supplier_proposal SET ref='".$this->ref."' WHERE rowid=".$this->id;
+                $sql = 'UPDATE '.MAIN_DB_PREFIX."supplier_proposal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
                 dol_syslog(get_class($this)."::create", LOG_DEBUG);
                 $resql=$this->db->query($sql);
@@ -3002,14 +3002,14 @@ class SupplierProposalLine  extends CommonObjectLine
         $sql.= " , tva_tx='".price2num($this->tva_tx)."'";
         $sql.= " , localtax1_tx=".price2num($this->localtax1_tx);
         $sql.= " , localtax2_tx=".price2num($this->localtax2_tx);
-		$sql.= " , localtax1_type='".$this->localtax1_type."'";
-		$sql.= " , localtax2_type='".$this->localtax2_type."'";
+		$sql.= " , localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+		$sql.= " , localtax2_type='".$this->db->escape($this->localtax2_type)."'";
         $sql.= " , qty='".price2num($this->qty)."'";
         $sql.= " , subprice=".price2num($this->subprice)."";
         $sql.= " , remise_percent=".price2num($this->remise_percent)."";
         $sql.= " , price=".price2num($this->price)."";					// TODO A virer
         $sql.= " , remise=".price2num($this->remise)."";				// TODO A virer
-        $sql.= " , info_bits='".$this->info_bits."'";
+        $sql.= " , info_bits='".$this->db->escape($this->info_bits)."'";
         if (empty($this->skip_update_total))
         {
             $sql.= " , total_ht=".price2num($this->total_ht)."";
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index a7aba35fc64..00d350c3b0f 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -100,12 +100,12 @@ class UserBankAccount extends Account
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."user_rib SET";
         $sql.= " bank = '" .$this->db->escape($this->bank)."'";
-        $sql.= ",code_banque='".$this->code_banque."'";
-        $sql.= ",code_guichet='".$this->code_guichet."'";
-        $sql.= ",number='".$this->number."'";
-        $sql.= ",cle_rib='".$this->cle_rib."'";
-        $sql.= ",bic='".$this->bic."'";
-        $sql.= ",iban_prefix = '".$this->iban."'";
+        $sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
+        $sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
+        $sql.= ",number='".$this->db->escape($this->number)."'";
+        $sql.= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
+        $sql.= ",bic='".$this->db->escape($this->bic)."'";
+        $sql.= ",iban_prefix = '".$this->db->escape($this->iban)."'";
         $sql.= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
         $sql.= ",proprio = '".$this->db->escape($this->proprio)."'";
         $sql.= ",owner_address = '".$this->db->escape($this->owner_address)."'";
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 99f9faf260d..812ec85117c 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -100,11 +100,14 @@ class AllTests
         require_once dirname(__FILE__).'/XCalLibTest.php';
         $suite->addTestSuite('XCalLibTest');
 
+        // Rules into source files content
         require_once dirname(__FILE__).'/LangTest.php';
         $suite->addTestSuite('LangTest');
-        require_once dirname(__FILE__).'/SqlTest.php';
-        $suite->addTestSuite('SqlTest');
-
+        require_once dirname(__FILE__).'/CodingSqlTest.php';
+        $suite->addTestSuite('CodingSqlTest');
+        require_once dirname(__FILE__).'/CodingPhpTest.php';
+        $suite->addTestSuite('PhpTest');
+        
         require_once dirname(__FILE__).'/SecurityTest.php';
         $suite->addTestSuite('SecurityTest');
 
diff --git a/test/phpunit/CodingPHPTest.php b/test/phpunit/CodingPhpTest.php
similarity index 94%
rename from test/phpunit/CodingPHPTest.php
rename to test/phpunit/CodingPhpTest.php
index b8d7bc90816..4860e5b5e38 100644
--- a/test/phpunit/CodingPHPTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -148,18 +148,19 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
         {
             if (preg_match('/\/htdocs\/includes\//', $file['fullname'])) continue;
             if (preg_match('/\/htdocs\/custom\//', $file['fullname'])) continue;
-            if (preg_match('/\/htdocs\/nltechno/', $file['fullname'])) continue;
             if (preg_match('/\/htdocs\/dolimed/', $file['fullname'])) continue;
+            if (preg_match('/\/htdocs\/nltechno/', $file['fullname'])) continue;
+            if (preg_match('/\/htdocs\/teclib/', $file['fullname'])) continue;
             
             print 'Check php file '.$file['fullname']."\n";
             $filecontent=file_get_contents($file['fullname']);
             
             $ok=true;
             $matches=array();
-            preg_match_all('/=\'".\$this->(..)/', $filecontent, $matches, PREG_SET_ORDER);
+            preg_match_all('/=\s*\'"\s*\.\s*\$this->(....)/', $filecontent, $matches, PREG_SET_ORDER);
             foreach($matches as $key => $val)
             {
-                if ($val[1] != 'db') 
+                if ($val[1] != 'db->' && $val[1] != 'esca') 
                 {
                     $ok=false;
                     break;
@@ -167,7 +168,7 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
                 //if ($reg[0] != 'db') $ok=false;
             }
             //print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-            $this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['fullname'].'. Bad.');
+            $this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['fullname'].' ('.$val[0].'). Bad.');
             //exit;
         }
 
diff --git a/test/phpunit/SqlTest.php b/test/phpunit/CodingSqlTest.php
similarity index 100%
rename from test/phpunit/SqlTest.php
rename to test/phpunit/CodingSqlTest.php

From f6dcb2860ab2aa500805b54cd6dc3c1af9dc3b05 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 19:14:54 +0200
Subject: [PATCH 0797/1163] More complete help message

---
 htdocs/cron/list.php          | 6 ++++--
 htdocs/langs/en_US/admin.lang | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 630430e8d59..82d5fb04130 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -289,8 +289,10 @@ print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $
 
 
 print $langs->trans('CronInfo').'<br>';
-print $stringcurrentdate.'<br>';
-if (! empty($conf->global->CRON_WARNING_DELAY_HOURS)) print info_admin($langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS));
+
+$text =$langs->trans("HoursOnThisPageAreOnServerTZ").' '.$stringcurrentdate.'<br>';
+if (! empty($conf->global->CRON_WARNING_DELAY_HOURS)) $text.=$langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS);
+print info_admin($text);
 print '<br>';
 
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 71e5b614abb..3662e8aca1c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -123,7 +123,8 @@ PHPTZ=PHP server Time Zone
 DaylingSavingTime=Daylight saving time
 CurrentHour=PHP Time (server)
 CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max number of lines for widgets

From f8403d502050150ad0ba811d07dbd4a544c3f076 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 12 May 2017 20:01:45 +0200
Subject: [PATCH 0798/1163] Fix phpunit test

---
 htdocs/langs/en_US/cron.lang | 4 ++--
 test/phpunit/AllTests.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 76b1a92a365..a1d3c6a9986 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -25,7 +25,7 @@ CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Job
 CronNone=None
 CronDtStart=Not before
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 812ec85117c..de8cc397cf4 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -106,7 +106,7 @@ class AllTests
         require_once dirname(__FILE__).'/CodingSqlTest.php';
         $suite->addTestSuite('CodingSqlTest');
         require_once dirname(__FILE__).'/CodingPhpTest.php';
-        $suite->addTestSuite('PhpTest');
+        $suite->addTestSuite('CodingPhpTest');
         
         require_once dirname(__FILE__).'/SecurityTest.php';
         $suite->addTestSuite('SecurityTest');

From f7e042d7b82a67eabbd973c003fbba6e6f11f838 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 13:02:55 +0200
Subject: [PATCH 0799/1163] Look and feel v6

---
 htdocs/adherents/admin/adherent.php           | 141 +++++++++---------
 .../adherents/admin/adherent_extrafields.php  |   2 +-
 .../admin/adherent_type_extrafields.php       |   2 +-
 htdocs/adherents/admin/public.php             |   7 +-
 htdocs/core/lib/admin.lib.php                 |   8 +-
 5 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 2754c2d3690..8050a0ec019 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -48,6 +48,37 @@ $action = GETPOST('action','alpha');
  * Actions
  */
 
+//
+if ($action == 'updateall')
+{
+    $db->begin();
+    $res1=$res2=$res3=$res4=$res5=$res6=0;
+    $res1=dolibarr_set_const($db, 'ADHERENT_LOGIN_NOT_REQUIRED', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
+    $res2=dolibarr_set_const($db, 'ADHERENT_MAIL_REQUIRED', GETPOST('ADHERENT_MAIL_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
+    $res3=dolibarr_set_const($db, 'ADHERENT_DEFAULT_SENDINFOBYMAIL', GETPOST('ADHERENT_DEFAULT_SENDINFOBYMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
+    $res4=dolibarr_set_const($db, 'ADHERENT_BANK_USE', GETPOST('ADHERENT_BANK_USE', 'alpha'), 'chaine', 0, '', $conf->entity);
+    // Use vat for invoice creation
+    if ($conf->facture->enabled)
+    {
+        $res4=dolibarr_set_const($db, 'ADHERENT_VAT_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_VAT_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
+        $res5=dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
+        if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+        {
+            $res6=dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
+        }
+    }
+    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0)
+    {
+        setEventMessages('ErrorFailedToSaveDate', null, 'errors');
+        $db->rollback();
+    }
+    else
+    {
+        setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
+        $db->commit();
+    }
+}
+
 // Action mise a jour ou ajout d'une constante
 if ($action == 'update' || $action == 'add')
 {
@@ -116,113 +147,81 @@ print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
 
 $head = member_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Members"), 0, 'user');
+dol_fiche_head($head, 'general', $langs->trans("Members"), -1, 'user');
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="updateall">';
 
 print load_fiche_titre($langs->trans("MemberMainOptions"),'','');
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
-print '<td align="center">'.$langs->trans("Action").'</td>';
 print "</tr>\n";
 
 // Login/Pass required for members
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="update">';
-print '<input type="hidden" name="constname" value="ADHERENT_LOGIN_NOT_REQUIRED">';
 print '<tr class="oddeven"><td>'.$langs->trans("AdherentLoginRequired").'</td><td>';
-print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1);
-print '</td><td align="center" width="80">';
-print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+print $form->selectyesno('ADHERENT_LOGIN_NOT_REQUIRED',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1);
 print "</td></tr>\n";
-print '</form>';
 
 // Mail required for members
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="update">';
-print '<input type="hidden" name="constname" value="ADHERENT_MAIL_REQUIRED">';
 print '<tr class="oddeven"><td>'.$langs->trans("AdherentMailRequired").'</td><td>';
-print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_MAIL_REQUIRED)?$conf->global->ADHERENT_MAIL_REQUIRED:0),1);
-print '</td><td align="center" width="80">';
-print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+print $form->selectyesno('ADHERENT_MAIL_REQUIRED',(! empty($conf->global->ADHERENT_MAIL_REQUIRED)?$conf->global->ADHERENT_MAIL_REQUIRED:0),1);
 print "</td></tr>\n";
-print '</form>';
 
 // Send mail information is on by default
-print '<form action="adherent.php" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="update">';
-print '<input type="hidden" name="constname" value="ADHERENT_DEFAULT_SENDINFOBYMAIL">';
 print '<tr class="oddeven"><td>'.$langs->trans("MemberSendInformationByMailByDefault").'</td><td>';
-print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?$conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL:0),1);
-print '</td><td align="center" width="80">';
-print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+print $form->selectyesno('ADHERENT_DEFAULT_SENDINFOBYMAIL',(! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?$conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL:0),1);
 print "</td></tr>\n";
-print '</form>';
 
 // Insert subscription into bank account
-print '<form action="adherent.php" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="update">';
-print '<input type="hidden" name="constname" value="ADHERENT_BANK_USE">';
 print '<tr class="oddeven"><td>'.$langs->trans("MoreActionsOnSubscription").'</td>';
 $arraychoices=array('0'=>$langs->trans("None"));
 if (! empty($conf->banque->enabled)) $arraychoices['bankdirect']=$langs->trans("MoreActionBankDirect");
 if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $arraychoices['invoiceonly']=$langs->trans("MoreActionInvoiceOnly");
 if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $arraychoices['bankviainvoice']=$langs->trans("MoreActionBankViaInvoice");
 print '<td>';
-print $form->selectarray('constvalue',$arraychoices,$conf->global->ADHERENT_BANK_USE,0);
-print '</td><td align="center" width="80">';
-print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+print $form->selectarray('ADHERENT_BANK_USE',$arraychoices,$conf->global->ADHERENT_BANK_USE,0);
 print '</td>';
 print "</tr>\n";
-print '</form>';
 
 // Use vat for invoice creation
 if ($conf->facture->enabled)
 {
-	print '<form action="adherent.php" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="constname" value="ADHERENT_VAT_FOR_SUBSCRIPTIONS">';
 	print '<tr class="oddeven"><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
 	if (! empty($conf->banque->enabled))
 	{
 		print '<td>';
-		print $form->selectarray('constvalue', array('0'=>$langs->trans("NoVatOnSubscription"),'defaultforfoundationcountry'=>$langs->trans("Default")), (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS)?'0':$conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS), 0);
-		print '</td><td align="center" width="80">';
-		print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+		print $form->selectarray('ADHERENT_VAT_FOR_SUBSCRIPTIONS', array('0'=>$langs->trans("NoVatOnSubscription"),'defaultforfoundationcountry'=>$langs->trans("Default")), (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS)?'0':$conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS), 0);
 		print '</td>';
 	}
 	else
 	{
-		print '<td align="right" colspan="2">';
+		print '<td align="right">';
 		print $langs->trans("WarningModuleNotActive",$langs->transnoentities("Module85Name"));
 		print '</td>';
 	}
 	print "</tr>\n";
-	print '</form>';
-
+	
 	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 	{
-		print '<form action="adherent.php" method="POST">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="update">';
-		print '<input type="hidden" name="constname" value="ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS">';
 		print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
 		print '<td>';
-		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
-		print '</td><td align="center" width="80">';
-		print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
 		print '</td>';
 	}
 	print "</tr>\n";
-	print '</form>';
 }
 
 print '</table>';
+
+print '<center>';
+print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+print '</center>';
+
+print '</form>';
+
 print '<br>';
 
 
@@ -240,13 +239,12 @@ $constantes=array(
 
 print load_fiche_titre($langs->trans("MembersCards"),'','');
 
-form_constantes($constantes);
+$helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+$helptext.='%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+$helptext.='%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+$helptext.='%YEAR%, %MONTH%, %DAY%';
 
-print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-print '%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
-print '%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
-print '%YEAR%, %MONTH%, %DAY%';
-print '<br>';
+form_constantes($constantes, 0, $helptext);
 
 print '<br>';
 
@@ -258,13 +256,12 @@ $constantes=array('ADHERENT_ETIQUETTE_TYPE','ADHERENT_ETIQUETTE_TEXT');
 
 print load_fiche_titre($langs->trans("MembersTickets"),'','');
 
-form_constantes($constantes);
+$helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+$helptext.='%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+$helptext.='%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+$helptext.='%YEAR%, %MONTH%, %DAY%';
 
-print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-print '%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
-print '%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
-print '%YEAR%, %MONTH%, %DAY%';
-print '<br>';
+form_constantes($constantes, 0, $helptext);
 
 print '<br>';
 
@@ -288,13 +285,17 @@ $constantes=array(
 
 print load_fiche_titre($langs->trans("Other"),'','');
 
-form_constantes($constantes);
+$helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+$helptext.='%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+$helptext.='%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+$helptext.='%YEAR%, %MONTH%, %DAY%';
 
-print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-print '%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
-print '%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
-//print '%YEAR%, %MONTH%, %DAY%';	// Not supported
-print '<br>';
+$helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+$helptext.='%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+$helptext.='%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+//$helptext.='%YEAR%, %MONTH%, %DAY%';	// Not supported
+
+form_constantes($constantes, 0, $helptext);
 
 dol_fiche_end();
 
diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index 32bf1c87b11..542b4f29a57 100644
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
 
 $head = member_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Members"), 0, 'user');
+dol_fiche_head($head, 'attributes', $langs->trans("Members"), -1, 'user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php
index 835bd05ea5f..8e0d5f9eaa8 100644
--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@@ -73,7 +73,7 @@ print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
 
 $head = member_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_type', $langs->trans("Members"), 0, 'user');
+dol_fiche_head($head, 'attributes_type', $langs->trans("Members"), -1, 'user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 5c16a34793c..9c982884dd9 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -92,8 +92,9 @@ $head = member_admin_prepare_head();
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-dol_fiche_head($head, 'public', $langs->trans("Members"), 0, 'user');
+dol_fiche_head($head, 'public', $langs->trans("Members"), -1, 'user');
 
 if ($conf->use_javascript_ajax)
 {
@@ -147,7 +148,6 @@ print '<td align="right">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 // Allow public form
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr class="oddeven"><td>';
 print $langs->trans("EnablePublicSubscriptionForm");
 print '</td><td align="right">';
@@ -156,7 +156,6 @@ print "</td></tr>\n";
 
 // Force Type
 $adht = new AdherentType($db);
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr class="oddeven drag"><td>';
 print $langs->trans("ForceMemberType");
 print '</td><td width="60" align="center">';
@@ -167,7 +166,6 @@ print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, cou
 print "</td></tr>\n";
 
 // Amount
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr class="oddeven" id="tramount"><td>';
 print $langs->trans("DefaultAmount");
 print '</td><td align="right">';
@@ -175,7 +173,6 @@ print '<input type="text" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT
 print "</td></tr>\n";
 
 // Can edit
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr class="oddeven" id="tredit"><td>';
 print $langs->trans("CanEditAmount");
 print '</td><td align="right">';
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 2016807efe9..6a0336aab38 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1180,9 +1180,10 @@ function complete_elementList_with_modules(&$elementList)
  *
  *	@param	array	$tableau		Array of constants
  *	@param	int		$strictw3c		0=Include form into table (deprecated), 1=Form is outside table to respect W3C (no form into table), 2=No form nor button at all
+ *  @param  string  $helptext       Help
  *	@return	void
  */
-function form_constantes($tableau,$strictw3c=0)
+function form_constantes($tableau, $strictw3c=0, $helptext='')
 {
     global $db,$bc,$langs,$conf,$_Avery_Labels;
 
@@ -1193,7 +1194,10 @@ function form_constantes($tableau,$strictw3c=0)
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
     print '<td>'.$langs->trans("Description").'</td>';
-    print '<td>'.$langs->trans("Value").'*</td>';
+    print '<td>';
+    $text = $langs->trans("Value");
+    print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');
+    print '</td>';
     if (empty($strictw3c)) print '<td align="center" width="80">'.$langs->trans("Action").'</td>';
     print "</tr>\n";
     $var=true;

From 6f9e67b1fb2eabe886f2431b20780031d4062430 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 13:08:25 +0200
Subject: [PATCH 0800/1163] Remove no more used constant

---
 htdocs/core/modules/modAdherent.class.php      | 7 -------
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 2 ++
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 4b3d1e5d34f..b75d674b41f 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -160,13 +160,6 @@ class modAdherent extends DolibarrModules
         $this->const[$r][4] = 0;
         $r++;
         
-        $this->const[$r][0] = "ADHERENT_BANK_USE_AUTO";
-        $this->const[$r][1] = "yesno";
-        $this->const[$r][2] = "";
-        $this->const[$r][3] = "Insertion automatique des cotisations dans le compte bancaire";
-        $this->const[$r][4] = 0;
-        $r++;
-        
         $this->const[$r][0] = "ADHERENT_BANK_ACCOUNT";
         $this->const[$r][1] = "chaine";
         $this->const[$r][2] = "";
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 58ad642266e..9a3ab73d133 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -148,6 +148,8 @@ ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoic
 
 ALTER TABLE llx_facture_rec ADD COLUMN vat_src_code	varchar(10) DEFAULT '';
 
+DELETE FROM llx_const where name = 'ADHERENT_BANK_USE_AUTO';
+
 UPDATE llx_const set value='moono-lisa' where value = 'moono' AND name = 'FCKEDITOR_SKIN';
 
 ALTER TABLE llx_product_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;

From 54088f38fbad784c9678fdc495af524b3609c2fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 14:03:09 +0200
Subject: [PATCH 0801/1163] Code standardization on online payment code

---
 htdocs/core/lib/payments.lib.php    |  71 +++++++-
 htdocs/paybox/lib/paybox.lib.php    | 116 ------------
 htdocs/paypal/lib/paypal.lib.php    | 138 ---------------
 htdocs/public/paybox/paymentko.php  |  11 +-
 htdocs/public/paybox/paymentok.php  |  12 +-
 htdocs/public/payment/paymentko.php |   4 +-
 htdocs/public/payment/paymentok.php | 265 ++++++++++++++++------------
 htdocs/public/paypal/paymentko.php  |  11 +-
 htdocs/public/paypal/paymentok.php  |  11 +-
 9 files changed, 254 insertions(+), 385 deletions(-)

diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 591956bbffc..3a4d6b684f5 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -86,4 +86,73 @@ function payment_supplier_prepare_head(Paiement $object) {
 	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_supplier', 'remove');
 
 	return $head;
-}
\ No newline at end of file
+}
+
+
+
+/**
+ * Show footer of company in HTML pages
+ *
+ * @param   Societe		$fromcompany	Third party
+ * @param   Translate	$langs			Output language
+ * @return	void
+ */
+function htmlPrintOnlinePaymentFooter($fromcompany,$langs)
+{
+    global $conf;
+
+    // Juridical status
+    $line1="";
+    if ($fromcompany->forme_juridique_code)
+    {
+        $line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
+    }
+    // Capital
+    if ($fromcompany->capital)
+    {
+        $line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
+    }
+    // Prof Id 1
+    if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
+    {
+        $field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
+    }
+    // Prof Id 2
+    if ($fromcompany->idprof2)
+    {
+        $field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
+    }
+
+    // Second line of company infos
+    $line2="";
+    // Prof Id 3
+    if ($fromcompany->idprof3)
+    {
+        $field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
+    }
+    // Prof Id 4
+    if ($fromcompany->idprof4)
+    {
+        $field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
+    }
+    // IntraCommunautary VAT
+    if ($fromcompany->tva_intra != '')
+    {
+        $line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
+    }
+
+    print '<br><br><hr>'."\n";
+    print '<div class="center"><font style="font-size: 10px;">'."\n";
+    print $fromcompany->name.'<br>';
+    print $line1.'<br>';
+    print $line2;
+    print '</font></div>'."\n";
+}
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index ca5fd6a71ad..09848ed905e 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -24,54 +24,6 @@
 
 
 
-/**
- * Show header
- *
- * @param 	string	$title		Title of page
- * @param 	string	$head		Head string to add int head section
- * @return	void
- */
-function llxHeaderPaybox($title, $head = "")
-{
-	global $user, $conf, $langs;
-
-	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-	header("X-Content-Type-Options: nosniff");
-	
-	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-	//print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd>';
-	print "\n";
-	print "<html>\n";
-	print "<head>\n";
-	print '<meta name="robots" content="noindex,nofollow">'."\n";
-	print '<meta name="keywords" content="dolibarr,payment,online">'."\n";
-	print '<meta name="description" content="Welcome on Dolibarr online payment form">'."\n";
-	print "<title>".$title."</title>\n";
-	if ($head) print $head."\n";
-	if (! empty($conf->global->PAYBOX_CSS_URL)) print '<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-	else
-	{
-		print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.$conf->css.'?lang='.$langs->defaultlang.'">'."\n";
-		print '<style type="text/css">';
-		print '.CTableRow1      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #e6E6eE; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
-		print '.CTableRow2      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #FFFFFF; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
-		print '</style>';
-	}
-	print "</head>\n";
-	print '<body style="margin: 20px;">'."\n";
-}
-
-/**
- * Show footer
- *
- * @return	void
- */
-function llxFooterPayBox()
-{
-	print "</body>\n";
-	print "</html>\n";
-}
-
 
 /**
  * Create a redirect form to paybox form
@@ -220,71 +172,3 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
 	return;
 }
 
-
-/**
- * Show footer of company in HTML pages
- *
- * @param   Societe		$fromcompany	Third party
- * @param   Translate	$langs			Output language
- * @return	void
- */
-function html_print_paybox_footer($fromcompany,$langs)
-{
-	global $conf;
-
-	// Juridical status
-	$line1="";
-	if ($fromcompany->forme_juridique_code)
-	{
-		$line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
-	}
-	// Capital
-	if ($fromcompany->capital)
-	{
-		$line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
-	}
-	// Prof Id 1
-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
-	{
-		$field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
-	}
-	// Prof Id 2
-	if ($fromcompany->idprof2)
-	{
-		$field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
-	}
-
-	// Second line of company infos
-	$line2="";
-	// Prof Id 3
-	if ($fromcompany->idprof3)
-	{
-		$field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
-	}
-	// Prof Id 4
-	if ($fromcompany->idprof4)
-	{
-		$field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
-	}
-	// IntraCommunautary VAT
-	if ($fromcompany->tva_intra != '')
-	{
-		$line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
-	}
-
-	print '<br><br><hr>'."\n";
-	print '<div class="center"><font style="font-size: 10px;">'."\n";
-	print $fromcompany->name.'<br>';
-	print $line1.'<br>';
-	print $line2;
-	print '</font></div>'."\n";
-}
-
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index b1be8f56647..9f08ffcb924 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -23,144 +23,6 @@
  */
 
 
-/**
- * Show header
- *
- * @param 	string	$title		Title
- * @param 	string	$head		More header to add
- * @return	void
- */
-function llxHeaderPaypal($title, $head = "")
-{
-	global $user, $conf, $langs;
-
-	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-	header("X-Content-Type-Options: nosniff");
-	
-	$appli='Dolibarr';
-	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
-
-	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-	//print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd>';
-	print "\n";
-	print "<html>\n";
-	print "<head>\n";
-	print '<meta name="robots" content="noindex,nofollow">'."\n";
-	print '<meta name="keywords" content="dolibarr,payment,online">'."\n";
-	print '<meta name="description" content="Welcome on '.$appli.' online payment form">'."\n";
-	print "<title>".$title."</title>\n";
-	if ($head) print $head."\n";
-	if (! empty($conf->global->PAYPAL_CSS_URL)) print '<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYPAL_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-	else
-	{
-		print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.$conf->css.'?lang='.$langs->defaultlang.'">'."\n";
-		print '<style type="text/css">';
-		print '.CTableRow1      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #e6E6eE; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
-		print '.CTableRow2      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #FFFFFF; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
-		print '</style>';
-	}
-
-	if ($conf->use_javascript_ajax)
-	{
-		print '<!-- Includes for JQuery (Ajax library) -->'."\n";
-		print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css" />'."\n";          // JNotify
-
-		// Output standard javascript links
-		$ext='.js';
-
-		// JQuery. Must be before other includes
-		print '<!-- Includes JS for JQuery -->'."\n";
-		print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min'.$ext.'"></script>'."\n";
-		// jQuery jnotify
-		if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY))
-		{
-			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min'.$ext.'"></script>'."\n";
-			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/jnotify'.$ext.'"></script>'."\n";
-		}
-	}
-	print "</head>\n";
-	print '<body style="margin: 20px;">'."\n";
-}
-
-/**
- * Show footer
- *
- * @return	void
- */
-function llxFooterPaypal()
-{
-	print "</body>\n";
-	print "</html>\n";
-}
-
-
-/**
- * Show footer of company in HTML pages
- *
- * @param   Societe		$fromcompany	Third party
- * @param   Translate	$langs			Output language
- * @return	void
- */
-function html_print_paypal_footer($fromcompany,$langs)
-{
-	global $conf;
-
-	// Juridical status
-	$line1="";
-	if ($fromcompany->forme_juridique_code)
-	{
-		$line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
-	}
-	// Capital
-	if ($fromcompany->capital)
-	{
-		$line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
-	}
-	// Prof Id 1
-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
-	{
-		$field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
-	}
-	// Prof Id 2
-	if ($fromcompany->idprof2)
-	{
-		$field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
-	}
-
-	// Second line of company infos
-	$line2="";
-	// Prof Id 3
-	if ($fromcompany->idprof3)
-	{
-		$field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
-	}
-	// Prof Id 4
-	if ($fromcompany->idprof4)
-	{
-		$field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
-	}
-	// IntraCommunautary VAT
-	if ($fromcompany->tva_intra != '')
-	{
-		$line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
-	}
-
-	print '<br><br><hr>'."\n";
-	print '<div class="center"><font style="font-size: 10px;">'."\n";
-	print $fromcompany->name.'<br>';
-	print $line1.'<br>';
-	print $line2;
-	print '</font></div>'."\n";
-}
-
 /**
  *  Define head array for tabs of paypal tools setup pages
  *
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index 09de4525b39..0b6b0955bb2 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -35,6 +35,7 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Security check
 if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
@@ -93,7 +94,11 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 }
 
 
-llxHeaderPayBox($langs->trans("PaymentForm"));
+$head='';
+if (! empty($conf->global->PAYBOX_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+
+llxHeader($head, $langs->trans("PaymentForm"));
 
 
 // Show message
@@ -107,9 +112,9 @@ if (! empty($conf->global->PAYBOX_MESSAGE_KO)) print $conf->global->PAYBOX_MESSA
 print "\n</div>\n";
 
 
-html_print_paybox_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooterPayBox();
+llxFooter();
 
 $db->close();
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 9c3030a86ba..482f58ed909 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -35,6 +35,7 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Security check
 if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
@@ -76,7 +77,12 @@ $tracepost = "";
 foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
 
-llxHeaderPayBox($langs->trans("PaymentForm"));
+
+$head='';
+if (! empty($conf->global->PAYBOX_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+
+llxHeader($head, $langs->trans("PaymentForm"));
 
 
 // Show message
@@ -164,9 +170,9 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 
 print "\n</div>\n";
 
-html_print_paybox_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooterPayBox();
+llxFooter();
 
 $db->close();
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 70dac3c960b..5bd09f845da 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -37,6 +37,8 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
 if (! empty($conf->paypal->enabled))
 {
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
@@ -138,7 +140,7 @@ if (! empty($conf->global->PAYPAL_MESSAGE_KO)) print $conf->global->PAYPAL_MESSA
 print "\n</div>\n";
 
 
-html_print_paypal_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
 llxFooter();
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index ce3fcd8bb29..221abec032f 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -37,15 +37,14 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
 if (! empty($conf->paypal->enabled))
 {
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 }
 
-// Security check
-//if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
-
 $langs->load("main");
 $langs->load("other");
 $langs->load("dict");
@@ -84,16 +83,17 @@ if (! empty($conf->paypal->enabled))
 	    dol_print_error('',"Paypal setup param PAYPAL_API_SIGNATURE not defined");
 	    return -1;
 	}
+
+    $PAYPALTOKEN=GETPOST('TOKEN');
+    if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
+    $PAYPALPAYERID=GETPOST('PAYERID');
+    if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
+    $PAYPALFULLTAG=GETPOST('FULLTAG');
+    if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
 }
 
 $source=GETPOST('source');
 $ref=GETPOST('ref');
-$PAYPALTOKEN=GETPOST('TOKEN');
-if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
-$PAYPALPAYERID=GETPOST('PAYERID');
-if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-$PAYPALFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
 
 $paymentmethod=array();
 if (! empty($conf->paypal->enabled)) $paymentmethod['paypal']='paypal';
@@ -104,6 +104,14 @@ if (! empty($conf->paybox->enabled)) $paymentmethod['paybox']='paybox';
 if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
 
 
+// If payment is ok
+$PAYMENTSTATUS=$TRANSACTIONID=$TAXAMT=$NOTE='';
+// If payment is ko
+$ErrorCode=$ErrorShortMsg=$ErrorLongMsg=$ErrorSeverityCode='';
+
+$ispaymentok = false;
+
+
 /*
  * Actions
  */
@@ -123,13 +131,16 @@ dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
 $head='';
 if (! empty($conf->global->PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
+
 llxHeader($head, $langs->trans("PaymentForm"));
 
 
+
 // Show message
 print '<span id="dolpaymentspan"></span>'."\n";
 print '<div id="dolpaymentdiv" align="center">'."\n";
 
+
 if (! empty($conf->paypal->enabled))
 {
 	if ($PAYPALTOKEN)
@@ -147,7 +158,6 @@ if (! empty($conf->paypal->enabled))
 	
 		dol_syslog("Call paymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
 	
-	
 		// Validate record
 	    if (! empty($paymentType))
 	    {
@@ -159,7 +169,7 @@ if (! empty($conf->paypal->enabled))
 	        $resArray=confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
 	
 	        $ack = strtoupper($resArray["ACK"]);
-	        if($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
+	        if ($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
 	        {
 	        	$object = new stdClass();
 	
@@ -175,132 +185,153 @@ if (! empty($conf->paypal->enabled))
 	            $TRANSACTIONID=urldecode($resArray["TRANSACTIONID"]);
 	            $TAXAMT=urldecode($resArray["TAXAMT"]);
 	            $NOTE=urldecode($resArray["NOTE"]);
-	
-	            print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
-	            print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
-	            if (! empty($conf->global->PAYPAL_MESSAGE_OK)) print $conf->global->PAYPAL_MESSAGE_OK;
-	
-	            // Appel des triggers
-	            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            $interface=new Interfaces($db);
-	            $result=$interface->run_triggers('PAYPAL_PAYMENT_OK',$object,$user,$langs,$conf);
-	            if ($result < 0) { $error++; $errors=$interface->errors; }
-	            // Fin appel triggers
-	
-	        	// Send an email
-				if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
-				{
-					$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
-					$from=$conf->global->MAILING_EMAIL_FROM;
-					// Define $urlwithroot
-					$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-					$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-					//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-	
-					$urlback=$_SERVER["REQUEST_URI"];
-					$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentReceived");
-					$tmptag=dolExplodeIntoArray($fulltag,'.','=');
-					$content="";
-					if (! empty($tmptag['MEM']))
-					{
-						$langs->load("members");
-						$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
-						$content.=$langs->trans("PaymentSubscription")."<br>\n";
-						$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
-						$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-					}
-					else
-					{
-						$content.=$langs->transnoentitiesnoconv("NewPaypalPaymentReceived")."<br>\n";
-					}
-					$content.="<br>\n";
-					$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-					$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-					$content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-	
-					$ishtml=dol_textishtml($content);	// May contain urls
-	
-					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-					$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
-	
-					$result=$mailfile->sendfile();
-					if ($result)
-					{
-						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-					}
-					else
-					{
-						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
-					}
-				}
+
+	            $ispaymentok=True;
 	        }
 	        else
-			{
+	        {
 	            //Display a user friendly Error on the page using any of the following error information returned by PayPal
 	            $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
 	            $ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
 	            $ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);
 	            $ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
-	
-	            echo $langs->trans('DoExpressCheckoutPaymentAPICallFailed') . "<br>\n";
-	            echo $langs->trans('DetailedErrorMessage') . ": " . $ErrorLongMsg."<br>\n";
-	            echo $langs->trans('ShortErrorMessage') . ": " . $ErrorShortMsg."<br>\n";
-	            echo $langs->trans('ErrorCode') . ": " . $ErrorCode."<br>\n";
-	            echo $langs->trans('ErrorSeverityCode') . ": " . $ErrorSeverityCode."<br>\n";
-	
-	            if ($mysoc->email) echo "\nPlease, send a screenshot of this page to ".$mysoc->email."<br>\n";
-	
-	           	// Send an email
-				if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
-				{
-					$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
-					$from=$conf->global->MAILING_EMAIL_FROM;
-					// Define $urlwithroot
-					$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-					$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-					//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-	
-					$urlback=$_SERVER["REQUEST_URI"];
-					$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("ValidationOfPaypalPaymentFailed");
-					$content="";
-					$content.=$langs->transnoentitiesnoconv("PaypalConfirmPaymentPageWasCalledButFailed")."\n";
-					$content.="\n";
-					$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
-					$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-					$content.="tag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-	
-					$ishtml=dol_textishtml($content);	// May contain urls
-	
-					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-					$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
-	
-					$result=$mailfile->sendfile();
-					if ($result)
-					{
-						dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-					}
-					else
-					{
-						dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
-					}
-				}
 	        }
 	    }
 	    else
 	    {
 	        dol_print_error('','Session expired');
-	    }
+	    }	    
+	}
+	else
+	{
+	    dol_print_error('','$PAYPALTOKEN not defined');
+	}	
+}
+
+
+
+if ($ispaymentok)
+{
+    // Appel des triggers
+    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    $interface=new Interfaces($db);
+    $result=$interface->run_triggers('PAYMENTONLINE_PAYMENT_OK',$object,$user,$langs,$conf);
+    if ($result < 0) { $error++; $errors=$interface->errors; }
+    // Fin appel triggers
+
+    
+    print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
+    print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
+    if (! empty($conf->global->PAYMENT_MESSAGE_OK)) print $conf->global->PAYMENT_MESSAGE_OK;
+    
+    
+	// Send an email
+	if (! empty($conf->global->PAYMENTONLINE_SENDEMAIL))
+	{
+		$sendto=$conf->global->PAYMENTONLINE_SENDEMAIL;
+		$from=$conf->global->MAILING_EMAIL_FROM;
+		// Define $urlwithroot
+		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+		$urlback=$_SERVER["REQUEST_URI"];
+		$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentReceived");
+		$tmptag=dolExplodeIntoArray($fulltag,'.','=');
+		$content="";
+		if (! empty($tmptag['MEM']))
+		{
+			$langs->load("members");
+			$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
+			$content.=$langs->trans("PaymentSubscription")."<br>\n";
+			$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
+			$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
+		}
+		else
+		{
+			$content.=$langs->transnoentitiesnoconv("NewPaypalPaymentReceived")."<br>\n";
+		}
+		$content.="<br>\n";
+		$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+		$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
+		$content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+
+		$ishtml=dol_textishtml($content);	// May contain urls
+
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+
+		$result=$mailfile->sendfile();
+		if ($result)
+		{
+			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+		}
+		else
+		{
+			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+		}
 	}
 }
 else
 {
-    // No TOKEN parameter in URL
-    dol_print_error('','No TOKEN parameter in URL');
+    // Appel des triggers
+    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    $interface=new Interfaces($db);
+    $result=$interface->run_triggers('PAYMENTONLINE_PAYMENT_KO',$object,$user,$langs,$conf);
+    if ($result < 0) { $error++; $errors=$interface->errors; }
+    // Fin appel triggers
+    
+
+    print $langs->trans('DoExpressCheckoutPaymentAPICallFailed') . "<br>\n";
+    print $langs->trans('DetailedErrorMessage') . ": " . $ErrorLongMsg."<br>\n";
+    print $langs->trans('ShortErrorMessage') . ": " . $ErrorShortMsg."<br>\n";
+    print $langs->trans('ErrorCode') . ": " . $ErrorCode."<br>\n";
+    print $langs->trans('ErrorSeverityCode') . ": " . $ErrorSeverityCode."<br>\n";
+     
+    if ($mysoc->email) print "\nPlease, send a screenshot of this page to ".$mysoc->email."<br>\n";
+    
+    
+    // Send an email
+    if (! empty($conf->global->PAYMENTONLINE_SENDEMAIL))
+    {
+        $sendto=$conf->global->PAYMENTONLINE_SENDEMAIL;
+        $from=$conf->global->MAILING_EMAIL_FROM;
+        // Define $urlwithroot
+        $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+        $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+        //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+         
+        $urlback=$_SERVER["REQUEST_URI"];
+        $topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("ValidationOfPaypalPaymentFailed");
+        $content="";
+        $content.=$langs->transnoentitiesnoconv("PaypalConfirmPaymentPageWasCalledButFailed")."\n";
+        $content.="\n";
+        $content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+        $content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
+        $content.="tag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+         
+        $ishtml=dol_textishtml($content);	// May contain urls
+         
+        require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+        $mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+         
+        $result=$mailfile->sendfile();
+        if ($result)
+        {
+            dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+        }
+        else
+        {
+            dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+        }
+    }
 }
 
+
 print "\n</div>\n";
 
-html_print_paypal_footer($mysoc,$langs);
+
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
 llxFooter();
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index 4bad572ed8b..7436693a1c1 100644
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -39,6 +39,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Security check
 if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
@@ -113,7 +114,11 @@ if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
 }
 
 
-llxHeaderPaypal($langs->trans("PaymentForm"));
+$head='';
+if (! empty($conf->global->PAYPAL_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYPAL_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+
+llxHeader($head, $langs->trans("PaymentForm"));
 
 
 // Show ko message
@@ -125,9 +130,9 @@ if (! empty($conf->global->PAYPAL_MESSAGE_KO)) print $conf->global->PAYPAL_MESSA
 print "\n</div>\n";
 
 
-html_print_paypal_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooterPaypal();
+llxFooter();
 
 $db->close();
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index 90f13aa6f17..984c282d161 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -39,6 +39,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Security check
 if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
@@ -107,7 +108,11 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
 
 
-llxHeaderPaypal($langs->trans("PaymentForm"));
+$head='';
+if (! empty($conf->global->PAYPAL_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYPAL_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+
+llxHeader($head, $langs->trans("PaymentForm"));
 
 
 // Show message
@@ -281,9 +286,9 @@ else
 
 print "\n</div>\n";
 
-html_print_paypal_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooterPaypal();
+llxFooter();
 
 $db->close();

From b5b97816c897e9875d5bdb7a926b3735484b8da8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 14:06:14 +0200
Subject: [PATCH 0802/1163] FIX #6803

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 9a3ab73d133..bf28e6a3db6 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -212,7 +212,9 @@ ALTER TABLE llx_default_values ADD UNIQUE INDEX uk_default_values(type, entity,
 ALTER TABLE llx_supplier_proposaldet ADD INDEX idx_supplier_proposaldet_fk_supplier_proposal (fk_supplier_proposal);
 ALTER TABLE llx_supplier_proposaldet ADD INDEX idx_supplier_proposaldet_fk_product (fk_product);
 
+UPDATE llx_supplier_proposaldet SET fk_unit = NULL where fk_unit not in (SELECT rowid from llx_c_units);
 ALTER TABLE llx_supplier_proposaldet ADD CONSTRAINT fk_supplier_proposaldet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
+
 ALTER TABLE llx_supplier_proposaldet ADD CONSTRAINT fk_supplier_proposaldet_fk_supplier_proposal FOREIGN KEY (fk_supplier_proposal) REFERENCES llx_supplier_proposal (rowid);
 
 -- NEW inventory module

From 71833f598776928ce6eb93ee9cb24a45b6730683 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 15:19:35 +0200
Subject: [PATCH 0803/1163] Standardize code

---
 htdocs/externalsite/frametop.php          |   4 +
 htdocs/main.inc.php                       |  31 ++---
 htdocs/paybox/lib/paybox.lib.php          |   2 +-
 htdocs/paypal/admin/paypal.php            |   5 +-
 htdocs/paypal/lib/paypal.lib.php          |   6 +-
 htdocs/public/members/new.php             |   1 +
 htdocs/public/paybox/newpayment.php       |  27 ++--
 htdocs/public/paybox/paymentko.php        |   6 +-
 htdocs/public/paybox/paymentok.php        |  12 +-
 htdocs/public/payment/newpayment.php      | 143 +++++++++++++++++-----
 htdocs/public/payment/paymentko.php       |  21 ++--
 htdocs/public/payment/paymentok.php       |  40 ++++--
 htdocs/public/paypal/newpayment.php       |  19 ++-
 htdocs/public/paypal/paymentko.php        |  12 +-
 htdocs/public/paypal/paymentok.php        |  12 +-
 htdocs/societe/checkvat/checkVatPopup.php |   8 +-
 htdocs/theme/eldy/style.css.php           |   3 +
 htdocs/websites/frametop.php              |   5 +-
 htdocs/websites/index.php                 |   4 +-
 19 files changed, 251 insertions(+), 110 deletions(-)

diff --git a/htdocs/externalsite/frametop.php b/htdocs/externalsite/frametop.php
index f33c8ae61a2..3fb50ec6745 100644
--- a/htdocs/externalsite/frametop.php
+++ b/htdocs/externalsite/frametop.php
@@ -27,5 +27,9 @@ require ("../main.inc.php");
 $langs->load("externalsite");
 
 top_htmlhead("","");
+
+print '<body id="mainbody">' . "\n";
+
 top_menu("","","_top");
 
+print '</body>';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 333eb25ad89..c6bf910a8af 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -950,20 +950,24 @@ if (! function_exists("llxHeader"))
      * @param 	array  	$arrayofjs			Array of complementary js files
      * @param 	array  	$arrayofcss			Array of complementary css files
      * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
+     * @param   string  $morecssonbody      More CSS on body tag.
      * @return	void
      */
-	function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='')
+	function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $morecssonbody='')
 	{
 	    global $conf;
 
 	    // html header
 		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
+        print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n";
+
 		// top menu and left menu area
 		if (empty($conf->dol_hide_topmenu))
 		{
 			top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
 		}
+		
 		if (empty($conf->dol_hide_leftmenu))
 		{
 			left_menu('', $help_url, '', '', 1, $title, 1);
@@ -1219,19 +1223,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
-            // jQuery File Upload
-            /*
-            if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) || (defined('REQUIRE_JQUERY_FILEUPLOAD') && constant('REQUIRE_JQUERY_FILEUPLOAD')))
-            {
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/template/tmpl.min'.$ext.'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/jquery.iframe-transport'.$ext.'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/jquery.fileupload'.$ext.'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp'.$ext.'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui'.$ext.'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui'.$ext.'"></script>'."\n";
-                print '<!-- The XDomainRequest Transport is included for cross-domain file deletion for IE8+ -->'."\n";
-                print '<!--[if gte IE 8]><script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport'.$ext.'"></script><![endif]-->'."\n";
-            }*/
             // jQuery DataTables
             /* Removed a old hidden problematic feature never used in Dolibarr. If an external module need datatable, the module must provide all lib it needs and manage version problems with other dolibarr components
             if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES) || (defined('REQUIRE_JQUERY_DATATABLES') && constant('REQUIRE_JQUERY_DATATABLES')))
@@ -1377,9 +1368,11 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
     $toprightmenu='';
 
     // For backward compatibility with old modules
-    if (empty($conf->headerdone)) top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
-
-    print '<body id="mainbody">' . "\n";
+    if (empty($conf->headerdone)) 
+    {
+        top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+        print '<body id="mainbody">';
+    }
 
     /*
      * Top menu
@@ -1762,6 +1755,7 @@ function main_area($title='')
     print "\n";
 
     print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
+    
     if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
 }
 
@@ -1899,7 +1893,8 @@ if (! function_exists("llxFooter"))
         }
 
         print "\n\n";
-        print '</div> <!-- End div class="fiche" -->'."\n";
+        
+        print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
 		if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'; // End div id-right
 
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index 09848ed905e..a4106488f53 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -33,7 +33,7 @@
  * @param   string	$EMAIL		EMail
  * @param   string	$urlok		Url to go back if payment is OK
  * @param   string	$urlko		Url to go back if payment is KO
- * @param   string	$TAG		Tag
+ * @param   string	$TAG		Full tag
  * @return  int              	1 if OK, -1 if ERROR
  */
 function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 4942d15a9ce..ef0c40f2813 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -96,7 +96,6 @@ llxHeader('',$langs->trans("PaypalSetup"));
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("ModuleSetup").' PayPal',$linkback);
-print '<br>';
 
 $head=paypaladmin_prepare_head();
 
@@ -105,7 +104,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
 
-dol_fiche_head($head, 'paypalaccount', '');
+dol_fiche_head($head, 'paypalaccount', '', -1);
 
 print $langs->trans("PaypalDesc")."<br>\n";
 
@@ -138,7 +137,7 @@ print '</td></tr>';
 print '<tr class="oddeven"><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_USER").'</td><td>';
 print '<input size="32" type="text" name="PAYPAL_API_USER" value="'.$conf->global->PAYPAL_API_USER.'">';
-print ' &nbsp; '.$langs->trans("Example").': paypal_api1.mywebsite.com';
+print ' &nbsp; '.$langs->trans("Example").': admin-facilitator_api1.example.com, paypal_api1.mywebsite.com';
 print '</td></tr>';
 
 
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 9f08ffcb924..944afd34b1a 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -191,7 +191,7 @@ function getPaypalPaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
  * @param	string	$paymentType		Payment type
  * @param  	string	$returnURL			Url to use if payment is OK
  * @param   string	$cancelURL			Url to use if payment is KO
- * @param   string	$tag				Tag
+ * @param   string	$tag				Full tag
  * @return	void
  */
 function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$returnURL,$cancelURL,$tag)
@@ -306,7 +306,7 @@ function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$re
  * @param 	string 			$paymentType		Payment type
  * @param 	string 			$returnURL			Return Url
  * @param 	string 			$cancelURL			Cancel Url
- * @param 	string 			$tag				Tag
+ * @param 	string 			$tag				Full tag
  * @param 	string 			$solutionType		Type
  * @param 	string 			$landingPage		Landing page
  * @param	string			$shipToName			Ship to name
@@ -429,7 +429,7 @@ function getDetails($token)
  *	@param	string	$payerID			Payer ID
  *	@param	string	$ipaddress			IP Address
  *	@param	string	$FinalPaymentAmt	Amount
- *	@param	string	$tag				Tag
+ *	@param	string	$tag				Full tag
  *	@return	void
  */
 function confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $tag)
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index c307512e257..4130b616a0e 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -91,6 +91,7 @@ $extrafields = new ExtraFields($db);
 function llxHeaderVierge($title, $head="", $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
 {
     global $user, $conf, $langs, $mysoc;
+    
     top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
     print '<body id="mainbody" class="publicnewmemberform" style="margin-top: 10px;">';
 
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index b4b978009b7..a52358dab24 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -36,6 +36,7 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -95,6 +96,7 @@ $ref=$REF=GETPOST('ref','alpha');
 $TAG=GETPOST("tag",'alpha');
 $FULLTAG=GETPOST("fulltag",'alpha');  // fulltag is tag with more informations
 $SECUREKEY=GETPOST("securekey");	        // Secure key
+$FULLTAG.=($FULLTAG?'.':'').'PM=paybox';
 
 if (! empty($SOURCE))
 {
@@ -126,19 +128,22 @@ $valid=true;
 /*
  * Actions
  */
+
 if (GETPOST("action") == 'dopayment')
 {
     $PRICE=price2num(GETPOST("newamount"),'MT');
     $email=GETPOST("email");
 
+    $origfulltag=GETPOST("fulltag",'alpha');
+    
 	$mesg='';
 	if (empty($PRICE) || ! is_numeric($PRICE)) $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
-	elseif (empty($email))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
-	elseif (! isValidEMail($email)) $mesg=$langs->trans("ErrorBadEMail",$email);
-	elseif (empty($FULLTAG))        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
-    elseif (dol_strlen($urlok) > 150) $mesg='Error urlok too long '.$urlok;
+	elseif (empty($email))            $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
+	elseif (! isValidEMail($email))   $mesg=$langs->trans("ErrorBadEMail",$email);
+    elseif (! $origfulltag)           $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
+	elseif (dol_strlen($urlok) > 150) $mesg='Error urlok too long '.$urlok;
     elseif (dol_strlen($urlko) > 150) $mesg='Error urlko too long '.$urlko;
-
+    
 	if (empty($mesg))
 	{
 		dol_syslog("newpayment.php call paybox api and do redirect", LOG_DEBUG);
@@ -156,7 +161,13 @@ if (GETPOST("action") == 'dopayment')
  * View
  */
 
-llxHeaderPayBox($langs->trans("PaymentForm"));
+$head='';
+if (! empty($conf->global->PAYBOX_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
 // Common variables
@@ -782,9 +793,9 @@ print '</div>'."\n";
 print '<br>';
 
 
-html_print_paybox_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooterPayBox();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index 0b6b0955bb2..f5f42c8a529 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -97,8 +97,10 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 $head='';
 if (! empty($conf->global->PAYBOX_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
 
-llxHeader($head, $langs->trans("PaymentForm"));
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
 // Show message
@@ -115,6 +117,6 @@ print "\n</div>\n";
 htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooter();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 482f58ed909..92bd484cde5 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -55,8 +55,8 @@ if (empty($PAYBOXTOKEN)) $PAYBOXTOKEN=GETPOST('token');
 $PAYBOXPAYERID=GETPOST('PAYERID');
 if (empty($PAYBOXPAYERID)) $PAYBOXPAYERID=GETPOST('PayerID');
 */
-$PAYBOXFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYBOXFULLTAG)) $PAYBOXFULLTAG=GETPOST('fulltag');
+$FULLTAG=GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 
 /*
@@ -81,8 +81,10 @@ dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
 $head='';
 if (! empty($conf->global->PAYBOX_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
 
-llxHeader($head, $langs->trans("PaymentForm"));
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
 // Show message
@@ -93,7 +95,7 @@ print '<div id="dolpaymentdiv" align="center">'."\n";
 /*
 $token              = $PAYBOXTOKEN;
 */
-$fulltag            = $PAYBOXFULLTAG;
+$fulltag            = $FULLTAG;
 /*$payerID            = $PAYBOXPAYERID;
 // Set by newpayment.php
 $paymentType        = $_SESSION['PaymentType'];
@@ -173,6 +175,6 @@ print "\n</div>\n";
 htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooter();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 4c4b6863aaa..1ea8e7385ea 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -16,7 +16,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * For test: https://developer.paypal.com/
+ * For paypal test: https://developer.paypal.com/
+ * For paybox test: ???
  */
 
 /**
@@ -37,6 +38,7 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -49,6 +51,9 @@ $langs->load("dict");
 $langs->load("bills");
 $langs->load("companies");
 $langs->load("errors");
+$langs->load("paybox");     // File with generic data
+
+$action=GETPOST('action','alpha');
 
 // Input are:
 // type ('invoice','order','contractline'),
@@ -62,7 +67,7 @@ $amount=price2num(GETPOST("amount"));
 if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
 else $currency=GETPOST("currency",'alpha');
 
-if (! GETPOST("action"))
+if (! $action)
 {
     if (! GETPOST("amount") && ! GETPOST("source"))
     {
@@ -81,10 +86,25 @@ if (! GETPOST("action"))
     }
 }
 
+
+$paymentmethod='';
+$validpaymentmethod=array();
+
+// Detect $paymentmethod
+foreach($_POST as $key => $val)
+{
+    if (preg_match('/^dopayment_(.*)$/', $key, $reg))
+    {
+        $paymentmethod=$reg[1];
+        break;
+    }
+}
+
+
 // Define $urlwithroot
 //$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 //$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
+$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
 
 $urlok=$urlwithroot.'/public/payment/paymentok.php?';
 $urlko=$urlwithroot.'/public/payment/paymentko.php?';
@@ -95,6 +115,7 @@ $ref=$REF=GETPOST('ref','alpha');
 $TAG=GETPOST("tag",'alpha');
 $FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
 $SECUREKEY=GETPOST("securekey");	        // Secure key
+if ($paymentmethod) $FULLTAG.=($FULLTAG?'.':'').'PM='.$paymentmethod;
 
 if (! empty($SOURCE))
 {
@@ -129,9 +150,10 @@ if (! empty($entity))
 $urlok=preg_replace('/&$/','',$urlok);  // Remove last &
 $urlko=preg_replace('/&$/','',$urlko);  // Remove last &
 
-$paymentmethod=array();
 
-// Check parameters
+
+// Find valid payment methods
+
 if (! empty($conf->paypal->enabled))
 {
 	$langs->load("paypal");
@@ -158,7 +180,7 @@ if (! empty($conf->paypal->enabled))
 	    dol_print_error('',"Paypal setup param PAYPAL_API_SIGNATURE not defined");
 	    return -1;
 	}
-	
+
 	// Check security token
 	$valid=true;
 	if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
@@ -173,28 +195,57 @@ if (! empty($conf->paypal->enabled))
 	        $token = $conf->global->PAYPAL_SECURITY_TOKEN;
 	    }
 		if ($SECUREKEY != $token) $valid=false;
-	
+		
 		if (! $valid)
 		{
 	    	print '<div class="error">Bad value for key.</div>';
 		    //print 'SECUREKEY='.$SECUREKEY.' token='.$token.' valid='.$valid;
 	    	exit;
 		}
-		else
-		{
-			$paymentmethod[]='paypal';
-		}
 	}
+	
+    $validpaymentmethod['paypal']='valid';
 }
+
 if (! empty($conf->paybox->enabled))
 {
 	$langs->load("paybox");
 	
+	// TODO
+	
+    $validpaymentmethod['paybox']='valid';
 }
+
 // TODO Add check of other payment mode
 
 
-if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
+// Check security token
+$valid=true;
+if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+{
+    if (! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+    {
+        if ($SOURCE && $REF) $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $SOURCE . $REF, 2);    // Use the source in the hash to avoid duplicates if the references are identical
+        else $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+    }
+    else
+    {
+        $token = $conf->global->PAYMENT_SECURITY_TOKEN;
+    }
+    if ($SECUREKEY != $token) $valid=false;
+
+    if (! $valid)
+    {
+        print '<div class="error">Bad value for key.</div>';
+        //print 'SECUREKEY='.$SECUREKEY.' token='.$token.' valid='.$valid;
+        exit;
+    }
+}
+
+
+
+
+if (empty($validpaymentmethod)) accessforbidden('', 0, 0, 1);
 
 
 
@@ -202,13 +253,15 @@ if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
  * Actions
  */
 
-if (GETPOST("action") == 'dopayment')
+
+if ($action == 'dopayment')
 {
-	if (GETPOST('paymentmethod') == 'paypal')
+	if ($paymentmethod == 'paypal')
 	{ 
 		$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
 	    $PAYPAL_PAYMENT_TYPE='Sale';
 	
+	    $origfulltag=GETPOST("fulltag",'alpha');
 	    $shipToName=GETPOST("shipToName");
 	    $shipToStreet=GETPOST("shipToStreet");
 	    $shipToCity=GETPOST("shipToCity");
@@ -224,7 +277,7 @@ if (GETPOST("action") == 'dopayment')
 		if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))   $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
 		//elseif (empty($EMAIL))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
 		//elseif (! isValidEMail($EMAIL)) $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
-		elseif (empty($FULLTAG))        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
+		elseif (! $origfulltag)        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
 	
 	    //var_dump($_POST);
 		if (empty($mesg))
@@ -275,7 +328,14 @@ if (GETPOST("action") == 'dopayment')
  * View
  */
 
-llxHeaderPaypal($langs->trans("PaymentForm"));
+$head='';
+if (! empty($conf->global->PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
+
 
 if (! empty($conf->paypal->enabled))
 {
@@ -302,12 +362,18 @@ print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print "\n";
 print '<!-- Form to send a payment -->'."\n";
+// Additionnal information for each payment system
 if (! empty($conf->paypal->enabled))
 {
 	print '<!-- PAYPAL_API_SANDBOX = '.$conf->global->PAYPAL_API_SANDBOX.' -->'."\n";
 	print '<!-- PAYPAL_API_INTEGRAL_OR_PAYPALONLY = '.$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY.' -->'."\n";
 	print '<!-- creditor = '.$creditor.' -->'."\n";
 }
+if (! empty($conf->paybox->enabled))
+{
+
+}
+// TODO Add others
 print '<!-- urlok = '.$urlok.' -->'."\n";
 print '<!-- urlko = '.$urlko.' -->'."\n";
 print "\n";
@@ -370,7 +436,7 @@ $error=0;
 $var=false;
 
 // Free payment
-if (! GETPOST("source") && $valid)
+if (! GETPOST("source"))
 {
 	$found=true;
 	$tag=GETPOST("tag");
@@ -417,7 +483,7 @@ if (! GETPOST("source") && $valid)
 
 
 // Payment on customer order
-if (GETPOST("source") == 'order' && $valid)
+if (GETPOST("source") == 'order')
 {
 	$found=true;
 	$langs->load("orders");
@@ -524,7 +590,7 @@ if (GETPOST("source") == 'order' && $valid)
 
 
 // Payment on customer invoice
-if (GETPOST("source") == 'invoice' && $valid)
+if (GETPOST("source") == 'invoice')
 {
 	$found=true;
 	$langs->load("bills");
@@ -630,7 +696,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 }
 
 // Payment on contract line
-if (GETPOST("source") == 'contractline' && $valid)
+if (GETPOST("source") == 'contractline')
 {
 	$found=true;
 	$langs->load("contracts");
@@ -825,7 +891,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 }
 
 // Payment on member subscription
-if (GETPOST("source") == 'membersubscription' && $valid)
+if (GETPOST("source") == 'membersubscription')
 {
 	$found=true;
 	$langs->load("members");
@@ -971,16 +1037,29 @@ print "\n";
 
 if ($found && ! $error)	// We are in a management option and no error
 {
-	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+    // Buttons for all payments registration methods
+    
+    if (! empty($conf->paypal->enabled))
+    {
+    	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+    
+    	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
+    	{
+    		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
+    	}
+    	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
+    	{
+    		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalDoPayment").'">';
+    	}
+    }
 
-	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
-	{
-		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
-	}
-	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
-	{
-		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("PaypalDoPayment").'">';
-	}
+    if (! empty($conf->paypal->enabled))
+    {
+    
+        
+    }
+    
+    // TODO Other methods
 }
 else
 {
@@ -995,8 +1074,8 @@ print '</div>'."\n";
 print '<br>';
 
 
-html_print_paypal_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
-llxFooterPaypal();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 5bd09f845da..ceface2a9c0 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -57,16 +57,16 @@ $PAYPALTOKEN=GETPOST('TOKEN');
 if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
 $PAYPALPAYERID=GETPOST('PAYERID');
 if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-$PAYPALFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
+$FULLTAG=GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
-$paymentmethod=array();
-if (! empty($conf->paypal->enabled)) $paymentmethod['paypal']='paypal';
-if (! empty($conf->paybox->enabled)) $paymentmethod['paybox']='paybox';
+$validpaymentmethod=array();
+if (! empty($conf->paypal->enabled)) $validpaymentmethod['paypal']='paypal';
+if (! empty($conf->paybox->enabled)) $validpaymentmethod['paybox']='paybox';
 
 
 // Security check
-if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
+if (empty($validpaymentmethod)) accessforbidden('', 0, 0, 1);
 
 
 /*
@@ -94,7 +94,7 @@ if (! empty($conf->paypal->enabled))
 	{
 	    // Get on url call
 	    $token              = $PAYPALTOKEN;
-	    $fulltag            = $PAYPALFULLTAG;
+	    $fulltag            = $FULLTAG;
 	    $payerID            = $PAYPALPAYERID;
 	    // Set by newpayment.php
 	    $paymentType        = $_SESSION['PaymentType'];
@@ -128,7 +128,10 @@ if (! empty($conf->paypal->enabled))
 $head='';
 if (! empty($conf->global->PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
-llxHeader($head, $langs->trans("PaymentForm"));
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
 // Show ko message
@@ -143,6 +146,6 @@ print "\n</div>\n";
 htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooter();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 221abec032f..c138cc29267 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -88,28 +88,46 @@ if (! empty($conf->paypal->enabled))
     if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
     $PAYPALPAYERID=GETPOST('PAYERID');
     if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-    $PAYPALFULLTAG=GETPOST('FULLTAG');
-    if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
+    $FULLTAG=GETPOST('FULLTAG');
+    if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 }
 
 $source=GETPOST('source');
 $ref=GETPOST('ref');
 
-$paymentmethod=array();
-if (! empty($conf->paypal->enabled)) $paymentmethod['paypal']='paypal';
-if (! empty($conf->paybox->enabled)) $paymentmethod['paybox']='paybox';
 
+// Detect $paymentmethod
+$paymentmethod='';
+if (preg_match('/PM=([^\.]+)/', $FULLTAG, $reg))
+{
+    $paymentmethod=$reg[1];
+}
+if (empty($paymentmethod))
+{
+    dol_print_error(null, 'The back url does not contains a parameter fulltag that should help us to find the payment method used');
+    exit;
+}
+else
+{
+    dol_syslog("paymentmethod=".$paymentmethod);
+}
+
+
+$validpaymentmethod=array();
+if (! empty($conf->paypal->enabled)) $validpaymentmethod['paypal']='paypal';
+if (! empty($conf->paybox->enabled)) $validpaymentmethod['paybox']='paybox';
 
 // Security check
-if (empty($paymentmethod)) accessforbidden('', 0, 0, 1);
+if (empty($validpaymentmethod)) accessforbidden('', 0, 0, 1);
 
 
+$ispaymentok = false;
 // If payment is ok
 $PAYMENTSTATUS=$TRANSACTIONID=$TAXAMT=$NOTE='';
 // If payment is ko
 $ErrorCode=$ErrorShortMsg=$ErrorLongMsg=$ErrorSeverityCode='';
 
-$ispaymentok = false;
+
 
 
 /*
@@ -131,8 +149,10 @@ dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
 $head='';
 if (! empty($conf->global->PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
 
-llxHeader($head, $langs->trans("PaymentForm"));
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
 
@@ -147,7 +167,7 @@ if (! empty($conf->paypal->enabled))
 	{
 	    // Get on url call
 	    $token              = $PAYPALTOKEN;
-	    $fulltag            = $PAYPALFULLTAG;
+	    $fulltag            = $FULLTAG;
 	    $payerID            = $PAYPALPAYERID;
 	    // Set by newpayment.php
 	    $paymentType        = $_SESSION['PaymentType'];
@@ -334,6 +354,6 @@ print "\n</div>\n";
 htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooter();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 4acce4ac803..9698f42afa7 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -39,6 +39,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -51,7 +52,7 @@ $langs->load("dict");
 $langs->load("bills");
 $langs->load("companies");
 $langs->load("errors");
-$langs->load("paybox");
+$langs->load("paybox");     // File with generic data
 $langs->load("paypal");
 
 // Input are:
@@ -99,6 +100,7 @@ $ref=$REF=GETPOST('ref','alpha');
 $TAG=GETPOST("tag",'alpha');
 $FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
 $SECUREKEY=GETPOST("securekey");	        // Secure key
+$FULLTAG.=($FULLTAG?'.':'').'PM=paypal';
 
 if (! empty($SOURCE))
 {
@@ -188,6 +190,7 @@ if (GETPOST("action") == 'dopayment')
 	$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
     $PAYPAL_PAYMENT_TYPE='Sale';
 
+	$origfulltag=GETPOST("fulltag",'alpha');
     $shipToName=GETPOST("shipToName");
     $shipToStreet=GETPOST("shipToStreet");
     $shipToCity=GETPOST("shipToCity");
@@ -203,7 +206,7 @@ if (GETPOST("action") == 'dopayment')
 	if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))   $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
 	//elseif (empty($EMAIL))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
 	//elseif (! isValidEMail($EMAIL)) $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
-	elseif (empty($FULLTAG))        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
+	elseif (! $origfulltag)        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
 
     //var_dump($_POST);
 	if (empty($mesg))
@@ -254,7 +257,13 @@ if (GETPOST("action") == 'dopayment')
  * View
  */
 
-llxHeaderPaypal($langs->trans("PaymentForm"));
+$head='';
+if (! empty($conf->global->PAYPAL_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYPAL_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 if (! empty($PAYPAL_API_SANDBOX))
 {
@@ -968,8 +977,8 @@ print '</div>'."\n";
 print '<br>';
 
 
-html_print_paypal_footer($mysoc,$langs);
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
-llxFooterPaypal();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index 7436693a1c1..a3ff8b5b7a3 100644
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -56,8 +56,8 @@ $PAYPALTOKEN=GETPOST('TOKEN');
 if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
 $PAYPALPAYERID=GETPOST('PAYERID');
 if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-$PAYPALFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
+$FULLTAG=GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 
 /*
@@ -83,7 +83,7 @@ if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
 {
     // Get on url call
     $token              = $PAYPALTOKEN;
-    $fulltag            = $PAYPALFULLTAG;
+    $fulltag            = $FULLTAG;
     $payerID            = $PAYPALPAYERID;
     // Set by newpayment.php
     $paymentType        = $_SESSION['PaymentType'];
@@ -117,8 +117,10 @@ if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
 $head='';
 if (! empty($conf->global->PAYPAL_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYPAL_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
 
-llxHeader($head, $langs->trans("PaymentForm"));
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
 // Show ko message
@@ -133,6 +135,6 @@ print "\n</div>\n";
 htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooter();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index 984c282d161..c38612c8ac8 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -87,8 +87,8 @@ $PAYPALTOKEN=GETPOST('TOKEN');
 if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
 $PAYPALPAYERID=GETPOST('PAYERID');
 if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-$PAYPALFULLTAG=GETPOST('FULLTAG');
-if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
+$FULLTAG=GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 
 /*
@@ -111,8 +111,10 @@ dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
 $head='';
 if (! empty($conf->global->PAYPAL_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYPAL_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
 
-llxHeader($head, $langs->trans("PaymentForm"));
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
 
 // Show message
@@ -123,7 +125,7 @@ if ($PAYPALTOKEN)
 {
     // Get on url call
     $token              = $PAYPALTOKEN;
-    $fulltag            = $PAYPALFULLTAG;
+    $fulltag            = $FULLTAG;
     $payerID            = $PAYPALPAYERID;
     // Set by newpayment.php
     $paymentType        = $_SESSION['PaymentType'];
@@ -289,6 +291,6 @@ print "\n</div>\n";
 htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 
-llxFooter();
+llxFooter('', 'public');
 
 $db->close();
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index dd1cd7df740..f1e56d4a359 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -34,8 +34,12 @@ $WS_DOL_URL_WSDL='http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl
 $WS_METHOD ='checkVat';
 
 
-top_htmlhead("", $langs->trans("VATIntraCheckableOnEUSite"));
-print '<body style="margin: 10px">';
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader('', $langs->trans("VATIntraCheckableOnEUSite"));
+
 print '<div>';
 print '<div>';
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f1d17801072..39f17317076 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -988,6 +988,9 @@ div.fiche {
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
 	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
 }
+body.onlinepaymentbody div.fiche {	/* For online payment page */
+	margin: 40px !important;
+}
 div.fiche>table:first-child {
 	margin-bottom: 15px !important;
 }
diff --git a/htdocs/websites/frametop.php b/htdocs/websites/frametop.php
index 9001691b72c..7cebf239e28 100644
--- a/htdocs/websites/frametop.php
+++ b/htdocs/websites/frametop.php
@@ -28,11 +28,14 @@ require ("../main.inc.php");
 $langs->load("externalsite");
 
 top_htmlhead("","");
+
+print '<body id="mainbody">' . "\n";
+
 top_menu("","","_top");
 
+print '</body>';
 
 /*
 $website = new Website($db);
 $listofwebsites = $website->fetchAll();
 */
-print 'rrr';
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index b78a172e01f..e7dbb898145 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -38,7 +38,7 @@ define('NOSTYLECHECK',1);
  * @param 	int    	$disablehead		More content into html header
  * @param 	array  	$arrayofjs			Array of complementary js files
  * @param 	array  	$arrayofcss			Array of complementary css files
- * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
+ * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (set this only if autodetect fails)
  * @return	void
  */
 function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='')
@@ -48,6 +48,8 @@ function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0,
     // html header
     top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
+    print '<body id="mainbody">';
+    
     // top menu and left menu area
     if (empty($conf->dol_hide_topmenu))
     {

From 1e825e9f1e657d153fe8919715f72056f02c08c2 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Sat, 13 May 2017 17:25:35 +0200
Subject: [PATCH 0804/1163] Update code using new css class

---
 htdocs/don/admin/donation.php | 16 ++++------------
 htdocs/don/card.php           |  5 +----
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 98000ad6e98..2888b911700 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005-2010  Laurent Destailleur  	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2015	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2013-2016  Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2017  Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015  		Benoit Bruchard			<benoitb21@gmail.com>
  *
@@ -250,14 +250,12 @@ clearstatcache();
 
 $handle=opendir($dir);
 
-$var=True;
 if (is_resource($handle))
 {
 	while (($file = readdir($handle))!==false)
 	{
 		if (preg_match('/\.modules\.php$/i',$file))
 		{
-			$var = !$var;
 			$name = substr($file, 0, dol_strlen($file) -12);
 			$classname = substr($file, 0, dol_strlen($file) -12);
 
@@ -353,13 +351,11 @@ print '<td>'.$langs->trans("Parameters").'</td>';
 print '<td width="60" align="center">'.$langs->trans("Value")."</td>\n";
 print '<td></td>';
 print "</tr>\n";
-$var=true;
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_DONATION_ACCOUNTINGACCOUNT" />';
 
-$var=! $var;
 print '<tr class="oddeven">';
 
 print '<td>';
@@ -383,7 +379,6 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_DONATION_MESSAGE" />';
 
-$var=! $var;
 print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeTextOnDonations").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 print '<textarea name="DONATION_MESSAGE" class="flat" cols="80">'.$conf->global->DONATION_MESSAGE.'</textarea>';
@@ -406,9 +401,8 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 	print '<tr class="liste_titre">';
 	print '<td colspan="3">' . $langs->trans('Parameters') . '</td>';
 	print "</tr>\n";
-
 	
-	print "<tr " . $bc[$var] . ">";
+	print '<tr class="oddeven">';
 	print '<td width="80%">' . $langs->trans("DONATION_ART200") . '</td>';
 	if (! empty($conf->global->DONATION_ART200)) {
 		print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setart200&value=0">';
@@ -420,9 +414,8 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 		print '</a></td>';
 	}
 	print '</tr>';
-
 	
-	print "<tr " . $bc[$var] . ">";
+	print '<tr class="oddeven">';
 	print '<td width="80%">' . $langs->trans("DONATION_ART238") . '</td>';
 	if (! empty($conf->global->DONATION_ART238)) {
 		print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setart238&value=0">';
@@ -434,9 +427,8 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 		print '</a></td>';
 	}
 	print '</tr>';
-
 	
-	print "<tr " . $bc[$var] . ">";
+	print '<tr class="oddeven">';
 	print '<td width="80%">' . $langs->trans("DONATION_ART885") . '</td>';
 	if (! empty($conf->global->DONATION_ART885)) {
 		print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setart885&value=0">';
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index f6584628d25..882b80ec339 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -699,12 +699,11 @@ if (! empty($id) && $action != 'edit')
    		print '<td align="right">'.$langs->trans("Amount").'</td>';
    		print '</tr>';
 
-		$var=True;
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
 			
-			print "<tr ".$bc[$var]."><td>";
+			print '<tr class="oddeven"><td>';
 			print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
 			print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
 		    $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
@@ -809,8 +808,6 @@ if (! empty($id) && $action != 'edit')
 	$genallowed	=	($object->statut == 2 && ($object->paid == 0 || $user->admin) && $user->rights->don->creer);
 	$delallowed	=	$user->rights->don->supprimer;
 
-	$var=true;
-
 	print $formfile->showdocuments('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
 
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';

From 70b73c73f7d3004dae99686b0b7d0213ae338128 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 18:34:57 +0200
Subject: [PATCH 0805/1163] Fix coding style

---
 htdocs/cashdesk/validation_verif.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index 3328fa52886..0722b3fb92e 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -39,15 +39,11 @@ $bankaccountid=GETPOST('cashdeskbank');
 
 switch ($action)
 {
-
 	default:
-
-		$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=validation';
+	    $redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=validation';
 		break;
 
-
 	case 'valide_achat':
-        
 	    $thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
 	    
 		$company=new Societe($db);
@@ -115,13 +111,11 @@ switch ($action)
 
 
 	case 'retour':
-
 		$redirection = 'affIndex.php?menutpl=facturation';
 		break;
 
 
 	case 'valide_facture':
-
 		$now=dol_now();
 
 		// Recuperation de la date et de l'heure
@@ -363,3 +357,4 @@ switch ($action)
 $_SESSION['serObjFacturation'] = serialize($obj_facturation);
 
 header('Location: '.$redirection);
+exit;

From 553f5b990c910bc181af2d4e44fdbaf7e31b12c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 18:50:55 +0200
Subject: [PATCH 0806/1163] Fix scrutinizer errors

---
 htdocs/accountancy/admin/categories_list.php |  6 +++---
 htdocs/admin/dict.php                        | 13 +++++++------
 htdocs/comm/mailing/class/mailing.class.php  |  2 +-
 htdocs/commande/class/commande.class.php     |  5 -----
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 0580a9688ed..14475119461 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -669,7 +669,7 @@ if ($id)
 
         if (empty($reshook))
         {
-       		fieldList($fieldlist,$obj,$tabname[$id],'add');
+       		fieldListAccountingCategories($fieldlist,$obj,$tabname[$id],'add');
         }
 
         print '<td colspan="4" align="right">';
@@ -858,7 +858,7 @@ if ($id)
                     $error=$hookmanager->error; $errors=$hookmanager->errors;
 
                     // Show fields
-                    if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
+                    if (empty($reshook)) fieldListAccountingCategories($fieldlist,$obj,$tabname[$id],'edit');
 
                     print '<td></td>';
                     print '<td></td>';
@@ -1147,7 +1147,7 @@ $db->close();
  *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *	@return		void
  */
-function fieldList($fieldlist, $obj='', $tabname='', $context='')
+function fieldListAccountingCategories($fieldlist, $obj='', $tabname='', $context='')
 {
 	global $conf,$langs,$db;
 	global $form, $mysoc;
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index c2730e6c034..28e99d02606 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1753,15 +1753,16 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 		    print '<td>';
 		    $transfound=0;
 	        // Special case for labels
-	        if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
+	        if ($tabname == MAIN_DB_PREFIX.'c_payment_term') 
+	        {
 	            $langs->load("bills");
 	            $transkey="PaymentCondition".strtoupper($obj->code);
+    	        if ($langs->trans($transkey) != $transkey)
+                {
+                    $transfound=1;
+                    print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
+                }
 	        }
-	        if ($langs->trans($transkey) != $transkey)
-            {
-                $transfound=1;
-                print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
-            }
 		    if (! $transfound)
 		    {
 		        print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 93c47f8aa51..72c2b6d4690 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -585,7 +585,7 @@ class Mailing extends CommonObject
 	 *  @param	strin	$desc			Desc error
 	 *  @return string        			Label
 	 */
-	static public function libStatutDest($statut,$mode=0,$desc='')
+	public static function libStatutDest($statut,$mode=0,$desc='')
 	{
 		global $langs;
 		$langs->load('mails');
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 4c8870c5cb0..a12a563e58c 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2875,11 +2875,6 @@ class Commande extends CommonOrder
                     $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
                     dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR);
                     $this->db->rollback();
-                    unset($_POST['productid']);
-                    unset($_POST['tva_tx']);
-                    unset($_POST['price_ht']);
-                    unset($_POST['qty']);
-                    unset($_POST['buying_price']);
                     return self::STOCK_NOT_ENOUGH_FOR_ORDER;
                 }
             }

From 4343f93c00b90c294c21f714a0e581ccf6247868 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 19:36:28 +0200
Subject: [PATCH 0807/1163] Remove a lot of useless code

---
 htdocs/accountancy/admin/categories_list.php | 291 ++++---------------
 1 file changed, 58 insertions(+), 233 deletions(-)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 14475119461..7b1eb44545a 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -168,9 +168,6 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     {
         if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryVAT','DictionaryRegion','DictionaryCompanyType','DictionaryHolidayTypes','DictionaryRevenueStamp','DictionaryAccountancysystem','DictionaryAccountancyCategory'))) continue;		// For some pages, country is not mandatory
     	if ($value == 'country' && in_array($tablib[$id],array('DictionaryCanton','DictionaryCompanyType','DictionaryRevenueStamp'))) continue;		// For some pages, country is not mandatory
-        if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue;
-        if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
-        if ($value == 'color' && empty($_POST['color'])) continue;
 		if ($value == 'formula' && empty($_POST['formula'])) continue;
         if ((! isset($_POST[$value]) || $_POST[$value]=='')
         	&& (! in_array($listfield[$f], array('decalage','module','accountancy_code','accountancy_code_sell','accountancy_code_buy'))  // Fields that are not mandatory
@@ -183,17 +180,12 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             // We take translate key of field
             if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
             if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
-            if ($fieldnamekey == 'nbjour')   $fieldnamekey='NbOfDays';
-            if ($fieldnamekey == 'decalage') $fieldnamekey='Offset';
             if ($fieldnamekey == 'module')   $fieldnamekey='Module';
             if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
             if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
             if ($fieldnamekey == 'taux') $fieldnamekey = 'Rate';
             if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
             if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
-            if ($fieldnamekey == 'unicode') $fieldnamekey = 'Unicode';
-            if ($fieldnamekey == 'deductible') $fieldnamekey = 'Deductible';
-            if ($fieldnamekey == 'sortorder') $fieldnamekey = 'SortOrder';
 			if ($fieldnamekey == 'category_type') $fieldnamekey = 'Calculated';
 
             setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
@@ -217,7 +209,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
 	    }*/
     }
-    if (isset($_POST["country"]) && ($_POST["country"]=='0') && ($id != 2))
+    if (isset($_POST["country"]) && ($_POST["country"]=='0'))
     {
     	if (in_array($tablib[$id],array('DictionaryCompanyType','DictionaryHolidayTypes')))	// Field country is no mandatory for such dictionaries
     	{
@@ -229,15 +221,8 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         	setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")), null, 'errors');
     	}
     }
-    if ($id == 3 && ! is_numeric($_POST["code"]))
-    {
-       	$ok=0;
-       	setEventMessages($langs->transnoentities("ErrorFieldMustBeANumeric",$langs->transnoentities("Code")), null, 'errors');
-    }
 
 	// Clean some parameters
-    if ((! empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"])) $_POST["localtax1"]='0';	// If empty, we force to 0
-    if ((! empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"])) $_POST["localtax2"]='0';	// If empty, we force to 0
 	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"]='';	// If empty, we force to null
 	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"]='';	// If empty, we force to null
 	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"]='';	// If empty, we force to null
@@ -474,26 +459,9 @@ if ($id)
     $linkback='<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
 }
 $titlepicto='title_setup';
-if ($id == 10 && GETPOST('from') == 'accountancy')
-{
-    $titre=$langs->trans("MenuVatAccounts");
-    $titlepicto='title_accountancy';
-}
-if ($id == 7 && GETPOST('from') == 'accountancy')
-{
-    $titre=$langs->trans("MenuTaxAccounts");
-    $titlepicto='title_accountancy';
-}
 
 print load_fiche_titre($titre,$linkback,$titlepicto);
 
-if (empty($id))
-{
-    print $langs->trans("DictionaryDesc");
-    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
-}
-print "<br>\n";
-
 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
@@ -563,19 +531,6 @@ if ($id)
             $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
             $valuetoshow=$langs->trans($valuetoshow);   // try to translate
             $align="left";
-            if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
-            if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
-            if ($fieldlist[$field]=='taux')            {
-				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
-				else $valuetoshow=$langs->trans("Amount");
-				$align='center';
-            }
-            if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 2"; $align="center"; $sortable=0; }
-            if ($fieldlist[$field]=='localtax1')       { $valuetoshow=$langs->trans("Rate")." 2"; $align="center"; }
-            if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 3"; $align="center"; $sortable=0; }
-            if ($fieldlist[$field]=='localtax2')       { $valuetoshow=$langs->trans("Rate")." 3"; $align="center"; }
-            if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
-            if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
             if ($fieldlist[$field]=='type')            {
 				if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") $valuetoshow=$form->textwithtooltip($langs->trans("Type"),$langs->trans("TypePaymentDesc"),2,1,img_help(1,''));
 				else $valuetoshow=$langs->trans("Type");
@@ -584,49 +539,20 @@ if ($id)
             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
             {
             	$valuetoshow=$langs->trans("Label");
-            	if ($id != 25) $valuetoshow.="*";
             }
             if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
             if ($fieldlist[$field]=='country')         {
                 if (in_array('region_id',$fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
                 $valuetoshow=$langs->trans("Country");
             }
-            if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=$langs->trans("NPR"); $align="center"; }
-            if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
-            if ($fieldlist[$field]=='type_cdr')        { $valuetoshow=$langs->trans("AtEndOfMonth"); $align="center"; }
-            if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
-            if ($fieldlist[$field]=='width' || $fieldlist[$field]=='nx') { $valuetoshow=$langs->trans("Width"); }
-            if ($fieldlist[$field]=='height' || $fieldlist[$field]=='ny') { $valuetoshow=$langs->trans("Height"); }
-            if ($fieldlist[$field]=='unit' || $fieldlist[$field]=='metric') { $valuetoshow=$langs->trans("MeasuringUnit"); }
             if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $valuetoshow=''; }
             if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
             if ($fieldlist[$field]=='accountancy_code_sell'){ $valuetoshow=$langs->trans("AccountancyCodeSell"); }
             if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); }
             if ($fieldlist[$field]=='pcg_version' || $fieldlist[$field]=='fk_pcg_version') { $valuetoshow=$langs->trans("Pcg_version"); }
-            if ($fieldlist[$field]=='account_parent')  { $valuetoshow=$langs->trans("Accountparent"); }
-            if ($fieldlist[$field]=='pcg_type')        { $valuetoshow=$langs->trans("Pcg_type"); }
-            if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
-            if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
-	        if ($fieldlist[$field]=='short_label')     { $valuetoshow=$langs->trans("ShortLabel"); }
-            if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
-			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
+            if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
 			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
-			if ($fieldlist[$field]=='formula')         { $valuetoshow=$langs->trans("Formula"); }
-			if ($fieldlist[$field]=='paper_size')      { $valuetoshow=$langs->trans("PaperSize"); }
-			if ($fieldlist[$field]=='orientation')     { $valuetoshow=$langs->trans("Orientation"); }
-			if ($fieldlist[$field]=='leftmargin')      { $valuetoshow=$langs->trans("LeftMargin"); }
-			if ($fieldlist[$field]=='topmargin')       { $valuetoshow=$langs->trans("TopMargin"); }
-			if ($fieldlist[$field]=='spacex')          { $valuetoshow=$langs->trans("SpaceX"); }
-			if ($fieldlist[$field]=='spacey')          { $valuetoshow=$langs->trans("SpaceY"); }
-			if ($fieldlist[$field]=='font_size')       { $valuetoshow=$langs->trans("FontSize"); }
-			if ($fieldlist[$field]=='custom_x')        { $valuetoshow=$langs->trans("CustomX"); }
-			if ($fieldlist[$field]=='custom_y')        { $valuetoshow=$langs->trans("CustomY"); }
-			if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); }
-			if ($fieldlist[$field]=='percent')         { $valuetoshow=$langs->trans("Percentage"); }
-			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("Info"); }
-			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
-			if ($fieldlist[$field]=='newbymonth')      { $valuetoshow=$langs->trans("NewByMonth"); }
 				
             if ($valuetoshow != '')
             {
@@ -639,7 +565,6 @@ if ($id)
              if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
         }
 
-        if ($id == 4) print '<td></td>';
         print '<td>';
         print '<input type="hidden" name="id" value="'.$id.'">';
         print '</td>';
@@ -649,7 +574,7 @@ if ($id)
         print '</tr>';
 
         // Line to enter new values
-        print "<tr ".$bcnd[$var].">";
+        print '<tr class="oddeven nodrag nodrop nohover">';
 
         $obj = new stdClass();
         // If data was already input, we define them in obj to populate input fields.
@@ -679,15 +604,9 @@ if ($id)
 
         $colspan=count($fieldlist)+3;
 
-        if (! empty($alabelisused))  // If there is one label among fields, we show legend of *
-        {
-        	print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
-        }
         print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
     }
 
-
-
     // List of available record in database
     dol_syslog("htdocs/admin/dict", LOG_DEBUG);
     $resql=$db->query($sql);
@@ -712,101 +631,8 @@ if ($id)
             print '</td></tr>';
         }
 
-        // Title of lines
-        print '<tr class="liste_titre liste_titre_add">';
-        foreach ($fieldlist as $field => $value)
-        {
-            // Determine le nom du champ par rapport aux noms possibles
-            // dans les dictionnaires de donnees
-            $showfield=1;							  	// By defaut
-            $align="left";
-            $sortable=1;
-            $valuetoshow='';
-            /*
-            $tmparray=getLabelOfField($fieldlist[$field]);
-            $showfield=$tmp['showfield'];
-            $valuetoshow=$tmp['valuetoshow'];
-            $align=$tmp['align'];
-            $sortable=$tmp['sortable'];
-			*/
-            $valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
-            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
-            if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
-            if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
-            if ($fieldlist[$field]=='taux')            {
-				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
-				else $valuetoshow=$langs->trans("Amount");
-				$align='center';
-            }
-            if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 2"; $align="center"; $sortable=0; }
-            if ($fieldlist[$field]=='localtax1')       { $valuetoshow=$langs->trans("Rate")." 2"; $align="center"; $sortable=0; }
-            if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 3"; $align="center"; $sortable=0; }
-            if ($fieldlist[$field]=='localtax2')       { $valuetoshow=$langs->trans("Rate")." 3"; $align="center"; $sortable=0; }
-            if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
-            if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
-            if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
-            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
-            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
-            {
-            	$valuetoshow=$langs->trans("Label");
-               	if ($id != 25) $valuetoshow.="*";
-            }
-            if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
-            if ($fieldlist[$field]=='country')         { $valuetoshow=$langs->trans("Country"); }
-            if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=$langs->trans("NPR"); $align="center"; }
-            if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
-            if ($fieldlist[$field]=='type_cdr')        { $valuetoshow=$langs->trans("AtEndOfMonth"); $align="center"; }
-            if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
-            if ($fieldlist[$field]=='width' || $fieldlist[$field]=='nx') { $valuetoshow=$langs->trans("Width"); }
-            if ($fieldlist[$field]=='height' || $fieldlist[$field]=='ny') { $valuetoshow=$langs->trans("Height"); }
-            if ($fieldlist[$field]=='unit' || $fieldlist[$field]=='metric') { $valuetoshow=$langs->trans("MeasuringUnit"); }
-            if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
-            if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
-            if ($fieldlist[$field]=='accountancy_code_sell'){ $valuetoshow=$langs->trans("AccountancyCodeSell"); $sortable=0; }
-            if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); $sortable=0; }
-			if ($fieldlist[$field]=='fk_pcg_version')  { $valuetoshow=$langs->trans("Pcg_version"); }
-            if ($fieldlist[$field]=='account_parent')  { $valuetoshow=$langs->trans("Accountsparent"); }
-            if ($fieldlist[$field]=='pcg_type')        { $valuetoshow=$langs->trans("Pcg_type"); }
-            if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
-            if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
-            if ($fieldlist[$field]=='short_label')     { $valuetoshow=$langs->trans("ShortLabel"); }
-        	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
-			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
-			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
-			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
-			if ($fieldlist[$field]=='formula')         { $valuetoshow=$langs->trans("Formula"); }
-			if ($fieldlist[$field]=='paper_size')      { $valuetoshow=$langs->trans("PaperSize"); }
-			if ($fieldlist[$field]=='orientation')     { $valuetoshow=$langs->trans("Orientation"); }
-			if ($fieldlist[$field]=='leftmargin')      { $valuetoshow=$langs->trans("LeftMargin"); }
-			if ($fieldlist[$field]=='topmargin')       { $valuetoshow=$langs->trans("TopMargin"); }
-			if ($fieldlist[$field]=='spacex')          { $valuetoshow=$langs->trans("SpaceX"); }
-			if ($fieldlist[$field]=='spacey')          { $valuetoshow=$langs->trans("SpaceY"); }
-			if ($fieldlist[$field]=='font_size')       { $valuetoshow=$langs->trans("FontSize"); }
-			if ($fieldlist[$field]=='custom_x')        { $valuetoshow=$langs->trans("CustomX"); }
-			if ($fieldlist[$field]=='custom_y')        { $valuetoshow=$langs->trans("CustomY"); }
-			if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); }
-			if ($fieldlist[$field]=='percent')         { $valuetoshow=$langs->trans("Percentage"); }
-			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("Info"); }
-			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
-			if ($fieldlist[$field]=='newbymonth')      { $valuetoshow=$langs->trans("NewByMonth"); }
-
-            // Affiche nom du champ
-            if ($showfield)
-            {
-                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
-            }
-        }
-		// Favorite - Only activated on country dictionary
-        if ($id == 4) print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
-
-		print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
-        print getTitleFieldOfList('');
-        print getTitleFieldOfList('');
-        print getTitleFieldOfList('');
-        print '</tr>';
-
         // Title line with search boxes
-        print '<tr class="liste_titre_filter">';
+        print '<tr class="liste_titre liste_titre_add liste_titre_filter">';
         $filterfound=0;
         foreach ($fieldlist as $field => $value)
         {
@@ -829,7 +655,6 @@ if ($id)
                 }
             }
         }
-        if ($id == 4) print '<td></td>';
         print '<td class="liste_titre"></td>';
         print '<td class="liste_titre"></td>';
         print '<td class="liste_titre"></td>';
@@ -841,7 +666,59 @@ if ($id)
     	}
     	print '</td>';
     	print '</tr>';
-            
+    	
+    	// Title of lines
+        print '<tr class="liste_titre">';
+        foreach ($fieldlist as $field => $value)
+        {
+            // Determine le nom du champ par rapport aux noms possibles
+            // dans les dictionnaires de donnees
+            $showfield=1;							  	// By defaut
+            $align="left";
+            $sortable=1;
+            $valuetoshow='';
+
+            $valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
+            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
+            if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
+            if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
+            if ($fieldlist[$field]=='taux')            {
+				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
+				else $valuetoshow=$langs->trans("Amount");
+				$align='center';
+            }
+            if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
+            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
+            {
+            	$valuetoshow=$langs->trans("Label");
+               	if ($id != 25) $valuetoshow.="*";
+            }
+            if ($fieldlist[$field]=='country')         { $valuetoshow=$langs->trans("Country"); }
+            if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
+            if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
+            if ($fieldlist[$field]=='accountancy_code_sell'){ $valuetoshow=$langs->trans("AccountancyCodeSell"); $sortable=0; }
+            if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); $sortable=0; }
+			if ($fieldlist[$field]=='fk_pcg_version')  { $valuetoshow=$langs->trans("Pcg_version"); }
+            if ($fieldlist[$field]=='account_parent')  { $valuetoshow=$langs->trans("Accountsparent"); }
+            if ($fieldlist[$field]=='pcg_type')        { $valuetoshow=$langs->trans("Pcg_type"); }
+            if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
+        	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
+			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
+			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
+			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
+            // Affiche nom du champ
+            if ($showfield)
+            {
+                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
+            }
+        }
+		print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
+        print getTitleFieldOfList('');
+        print getTitleFieldOfList('');
+        print getTitleFieldOfList('');
+        print '</tr>';
+
         if ($num)
         {
             // Lines with values
@@ -912,19 +789,6 @@ if ($id)
                                     $valuetoshow=($key != "Country".strtoupper($obj->country_code)?$obj->country_code." - ".$key:$obj->country);
                                 }
                             }
-                            else if ($fieldlist[$field]=='recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
-                                $valuetoshow=yn($valuetoshow);
-                                $align="center";
-                            }
-                            else if ($fieldlist[$field]=='type_cdr') {
-                				if(empty($valuetoshow)) $valuetoshow = $langs->trans('None');
-                				elseif($valuetoshow == 1) $valuetoshow = $langs->trans('AtEndOfMonth');
-                				elseif($valuetoshow == 2) $valuetoshow = $langs->trans('CurrentNext');
-                                $align="center";
-                            }
-                            else if ($fieldlist[$field]=='price' || preg_match('/^amount/i',$fieldlist[$field])) {
-                                $valuetoshow=price($valuetoshow);
-                            }
                             else if ($fieldlist[$field]=='libelle_facture') {
                                 $langs->load("bills");
                                 $key=$langs->trans("PaymentCondition".strtoupper($obj->code));
@@ -1003,9 +867,6 @@ if ($id)
                             else if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') {
                                 $showfield=0;
                             }
-                            else if ($fieldlist[$field]=='unicode') {
-                            	$valuetoshow = $langs->getCurrencySymbol($obj->code,1);
-                            }
                             else if ($fieldlist[$field]=='label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') {
 	                            $langs->load("products");
 	                            $valuetoshow=$langs->trans($obj->{$fieldlist[$field]});
@@ -1014,32 +875,6 @@ if ($id)
 	                            $langs->load("products");
 	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
                             }
-                            else if (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
-                            {
-                            	$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
-                                $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
-                            }
-							else if ($fieldlist[$field]=='localtax1' || $fieldlist[$field]=='localtax2') {
-							    $align="center";
-							}
-							else if ($fieldlist[$field]=='localtax1_type') {
-                              if ($obj->localtax1 != 0)
-							    $valuetoshow=$localtax_typeList[$valuetoshow];
-							  else
-							    $valuetoshow = '';
-							  $align="center";
-							}
-							else if ($fieldlist[$field]=='localtax2_type') {
-							 if ($obj->localtax2 != 0)
-							    $valuetoshow=$localtax_typeList[$valuetoshow];
-							  else
-							    $valuetoshow = '';
-							  $align="center";
-							}
-							else if ($fieldlist[$field]=='taux') {
-                                $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
-							    $align="center";
-							}
 							else if (in_array($fieldlist[$field],array('recuperableonly')))
 							{
 								$align="center";
@@ -1057,7 +892,7 @@ if ($id)
 
                     // Can an entry be erased or disabled ?
                     $iserasable=1;$canbedisabled=1;$canbemodified=1;	// true by default
-                    if (isset($obj->code) && $id != 10)
+                    if (isset($obj->code))
                     {
                     	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) { $iserasable = 0; $canbedisabled = 0; }
                     	else if ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; }
@@ -1073,16 +908,6 @@ if ($id)
                     if ($param) $url .= '&'.$param;
                     $url.='&';
 
-					// Favorite
-					// Only activated on country dictionary
-                    if ($id == 4)
-					{
-						print '<td align="center" class="nowrap">';
-						if ($iserasable) print '<a href="'.$url.'action='.$acts[$obj->favorite].'_favorite">'.$actl[$obj->favorite].'</a>';
-						else print $langs->trans("AlwaysActive");
-						print '</td>';
-					}
-
                     // Active
                     print '<td align="center" class="nowrap">';
                     if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';

From 5729bdb2c92a04e8521a0490e2f4b19ea55ae363 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 19:51:31 +0200
Subject: [PATCH 0808/1163] Fix phpunit

---
 test/phpunit/CodingSqlTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index 0a9acc50220..c6123df3e77 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -57,7 +57,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class SqlTest extends PHPUnit_Framework_TestCase
+class CodingSqlTest extends PHPUnit_Framework_TestCase
 {
     protected $savconf;
     protected $savuser;

From 955c9f4217b4dd7a943f9c07b505833397b8defd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 21:10:56 +0200
Subject: [PATCH 0809/1163] Standardize the way online payments are working.
 Removed the trigger file of PAYPAL module that stored data that was not used
 by Dolibarr. The trigger event still exists, but if an external module need
 action on it, it must provides itself its trigger file.

---
 ChangeLog                                     |   2 +
 ...face_20_modPaypal_PaypalWorkflow.class.php | 112 -----------------
 ...face_20_modStripe_StripeWorkflow.class.php | 113 ------------------
 htdocs/paybox/admin/paybox.php                |  15 ++-
 htdocs/paypal/admin/paypal.php                |   3 -
 htdocs/public/paybox/paymentko.php            |   9 ++
 htdocs/public/paybox/paymentok.php            |   4 +
 htdocs/public/payment/paymentko.php           |  11 ++
 htdocs/public/payment/paymentok.php           |  27 +++--
 htdocs/public/paypal/paymentko.php            |  11 ++
 htdocs/public/paypal/paymentok.php            |  14 ++-
 11 files changed, 78 insertions(+), 243 deletions(-)
 delete mode 100644 htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
 delete mode 100644 htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php

diff --git a/ChangeLog b/ChangeLog
index f48de97d970..68e9674d0da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@ Following changes may create regression for some external modules, but were nece
 * Removed CommonObject::displayMarginInfos (was deprecated in 3.8). Use same method into
   html.formmargin.class.php
 * Removed Societe::set_commnucation_level (was deprecated in 4.0). Was not used.
+* Removed the trigger file of PAYPAL module that stored data that was not used by Dolibarr. The trigger event still
+  exists, but if an external module need action on it, it must provides itself its trigger file.
 
 ***** ChangeLog for 5.0.2 compared to 5.0.1 *****
 FIX: #6468 + Fix missing translation
diff --git a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
deleted file mode 100644
index 1d57f598d57..00000000000
--- a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/* Copyright (C) 2011-2012  Regis Houssin  <regis.houssin@capnetworks.com>
- * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       /htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
- *      \ingroup    paypal
- *      \brief      Trigger file for paypal workflow
- */
-
-require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
-
-
-/**
- *  Class of triggers for paypal module
- */
-class InterfacePaypalWorkflow extends DolibarrTriggers
-{
-	public $picto = 'paypal@paypal';
-	public $family = 'paypal';
-	public $description = "Triggers of this module allows to manage paypal workflow";
-	public $version = self::VERSION_DOLIBARR;
-
-	/**
-	 * Function called when a Dolibarrr business event is done.
-	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
-	 *
-	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
-	 * @param User			$user       Object user
-	 * @param Translate		$langs      Object langs
-	 * @param conf			$conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
-	 */
-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-    {
-        // Mettre ici le code a executer en reaction de l'action
-        // Les donnees de l'action sont stockees dans $object
-
-        if ($action == 'PAYPAL_PAYMENT_OK')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". source=".$object->source." ref=".$object->ref);
-
-        	if (! empty($object->source))
-        	{
-        		if ($object->source == 'membersubscription')
-        		{
-        			//require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherents.class.php';
-
-        			// TODO add subscription treatment
-        		}
-        		else
-        		{
-        			require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-
-        			$soc = new Societe($this->db);
-
-        			// Parse element/subelement (ex: project_task)
-        			$element = $path = $filename = $object->source;
-        			if (preg_match('/^([^_]+)_([^_]+)/i',$object->source,$regs))
-        			{
-        				$element = $path = $regs[1];
-        				$filename = $regs[2];
-        			}
-        			// For compatibility
-        			if ($element == 'order') {
-        				$path = $filename = 'commande';
-        			}
-        			if ($element == 'invoice') {
-        				$path = 'compta/facture'; $filename = 'facture';
-        			}
-
-        			dol_include_once('/'.$path.'/class/'.$filename.'.class.php');
-
-        			$classname = ucfirst($filename);
-        			$obj = new $classname($this->db);
-
-        			$ret = $obj->fetch('',$object->ref);
-        			if ($ret < 0) return -1;
-
-        			// Add payer id
-        			$soc->setValueFrom('ref_int', $object->payerID, 'societe', $obj->socid);
-
-        			// Add transaction id
-        			$obj->setValueFrom('ref_int',$object->resArray["TRANSACTIONID"]);
-        		}
-        	}
-        	else
-        	{
-        		// TODO add free tag treatment
-        	}
-
-        }
-
-		return 0;
-    }
-
-}
diff --git a/htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php b/htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php
deleted file mode 100644
index 4fbf29c7b07..00000000000
--- a/htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/* Copyright (C) 2011-2012	Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
- * Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       /htdocs/core/triggers/interface_20_modStripe_StripeWorkflow.class.php
- *      \ingroup    stripe
- *      \brief      Trigger file for stripe workflow
- */
-
-require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
-
-
-/**
- *  Class of triggers for stripe module
- */
-class InterfaceStripeWorkflow extends DolibarrTriggers
-{
-	public $picto = 'stripe@stripe';
-	public $family = 'stripe';
-	public $description = "Triggers of this module allows to manage stripe workflow";
-	public $version = self::VERSION_DOLIBARR;
-
-	/**
-	 * Function called when a Dolibarrr business event is done.
-	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
-	 *
-	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
-	 * @param User			$user       Object user
-	 * @param Translate		$langs      Object langs
-	 * @param conf			$conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
-	 */
-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-    {
-        // Mettre ici le code a executer en reaction de l'action
-        // Les donnees de l'action sont stockees dans $object
-
-        if ($action == 'STRIPE_PAYMENT_OK')
-        {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". source=".$object->source." ref=".$object->ref);
-
-        	if (! empty($object->source))
-        	{
-        		if ($object->source == 'membersubscription')
-        		{
-        			//require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherents.class.php';
-
-        			// TODO add subscription treatment
-        		}
-        		else
-        		{
-        			require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-
-        			$soc = new Societe($this->db);
-
-        			// Parse element/subelement (ex: project_task)
-        			$element = $path = $filename = $object->source;
-        			if (preg_match('/^([^_]+)_([^_]+)/i',$object->source,$regs))
-        			{
-        				$element = $path = $regs[1];
-        				$filename = $regs[2];
-        			}
-        			// For compatibility
-        			if ($element == 'order') {
-        				$path = $filename = 'commande';
-        			}
-        			if ($element == 'invoice') {
-        				$path = 'compta/facture'; $filename = 'facture';
-        			}
-
-        			dol_include_once('/'.$path.'/class/'.$filename.'.class.php');
-
-        			$classname = ucfirst($filename);
-        			$obj = new $classname($this->db);
-
-        			$ret = $obj->fetch('',$object->ref);
-        			if ($ret < 0) return -1;
-
-        			// Add payer id
-        			$soc->setValueFrom('ref_int', $object->payerID, 'societe', $obj->socid);
-
-        			// Add transaction id
-        			$obj->setValueFrom('ref_int',$object->resArray["TRANSACTIONID"]);
-        		}
-        	}
-        	else
-        	{
-        		// TODO add free tag treatment
-        	}
-
-        }
-
-		return 0;
-    }
-
-}
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 1a020ab86bf..ffbc2e41e0c 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -93,16 +93,22 @@ llxHeader();
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("PayBoxSetup"),$linkback,'title_setup');
 
-print $langs->trans("PayBoxDesc")."<br>\n";
+$h = 0;
+$head = array();
+
+$head[$h][0] = DOL_URL_ROOT."/paybox/admin/paybox.php";
+$head[$h][1] = $langs->trans("PayBox");
+$head[$h][2] = 'payboxaccount';
+$h++;
 
-print '<br>';
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
-dol_fiche_head(null, 'payboxaccount', '');
+dol_fiche_head($head, 'payboxaccount', '', -1);
 
-$var=true;
+print $langs->trans("PayBoxDesc")."<br>\n";
+print '<br>';
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -131,7 +137,6 @@ print '<input size="32" type="text" name="PAYBOX_PBX_IDENTIFIANT" value="'.$conf
 print '<br>'.$langs->trans("Example").': 2 ('.$langs->trans("Test").')';
 print '</td></tr>';
 
-$var=true;
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("UsageParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index ef0c40f2813..6d52fea8d99 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -121,7 +121,6 @@ print '<br>';
 print '<table class="noborder" width="100%">';
 
 // Account Parameters
-$var=true;
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("AccountParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
@@ -160,7 +159,6 @@ print $form->selectarray("PAYPAL_SSLVERSION",array('1'=> $langs->trans('TLSv1'),
 print '</td></tr>';
 
 // Usage Parameters
-$var=true;
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("UsageParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
@@ -220,7 +218,6 @@ print '<input size="32" type="email" name="PAYPAL_PAYONLINE_SENDEMAIL" value="'.
 print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com';
 print '</td></tr>';
 
-$var=true;
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("UrlGenerationParameters").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index 1d450a91af2..e417aad12c7 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -50,6 +50,7 @@ $langs->load("paypal");
 $langs->load("stripe");
 
 
+$object = new stdClass();   // For triggers
 
 
 /*
@@ -71,6 +72,14 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
 
 
+// Appel des triggers
+include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+$interface=new Interfaces($db);
+$result=$interface->run_triggers('PAYBOX_PAYMENT_OK',$object,$user,$langs,$conf);
+if ($result < 0) { $error++; $errors=$interface->errors; }
+// Fin appel triggers
+
+
 // Send an email
 if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 {
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 93d93a88cbe..5b88dcb65d7 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -60,6 +60,9 @@ $FULLTAG=GETPOST('FULLTAG');
 if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 
+$object = new stdClass();   // For triggers
+
+
 /*
  * Actions
  */
@@ -113,6 +116,7 @@ print $langs->trans("YourPaymentHasBeenRecorded")."<br><br>\n";
 
 if (! empty($conf->global->PAYBOX_MESSAGE_OK)) print $conf->global->PAYBOX_MESSAGE_OK;
 
+
 // Appel des triggers
 include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
 $interface=new Interfaces($db);
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index ceface2a9c0..6ce1c3badfa 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -69,6 +69,9 @@ if (! empty($conf->paybox->enabled)) $validpaymentmethod['paybox']='paybox';
 if (empty($validpaymentmethod)) accessforbidden('', 0, 0, 1);
 
 
+$object = new stdClass();   // For triggers
+
+
 /*
  * Actions
  */
@@ -87,6 +90,14 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
 
 
+// Appel des triggers
+include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+$interface=new Interfaces($db);
+$result=$interface->run_triggers('PAYMENTONLINE_PAYMENT_KO',$object,$user,$langs,$conf);
+if ($result < 0) { $error++; $errors=$interface->errors; }
+// Fin appel triggers
+
+
 // Send an email
 if (! empty($conf->paypal->enabled))
 {
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index c138cc29267..c1b4329c7be 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -128,6 +128,9 @@ $PAYMENTSTATUS=$TRANSACTIONID=$TAXAMT=$NOTE='';
 $ErrorCode=$ErrorShortMsg=$ErrorLongMsg=$ErrorSeverityCode='';
 
 
+$object = new stdClass();   // For triggers
+
+
 
 
 /*
@@ -191,8 +194,6 @@ if (! empty($conf->paypal->enabled))
 	        $ack = strtoupper($resArray["ACK"]);
 	        if ($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
 	        {
-	        	$object = new stdClass();
-	
 	        	$object->source		= $source;
 	        	$object->ref		= $ref;
 	        	$object->payerID	= $payerID;
@@ -244,11 +245,16 @@ if ($ispaymentok)
     print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
     if (! empty($conf->global->PAYMENT_MESSAGE_OK)) print $conf->global->PAYMENT_MESSAGE_OK;
     
+    $sendemail = '';
+    if (! empty($conf->global->PAYMENTONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYMENTONLINE_SENDEMAIL;
+    // TODO Remove local option to keep only the generic one ?
+    if ($paymentmethod == 'paypal' && ! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+    if ($paymentmethod == 'paybox' && ! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
     
 	// Send an email
-	if (! empty($conf->global->PAYMENTONLINE_SENDEMAIL))
+    if ($sendemail)
 	{
-		$sendto=$conf->global->PAYMENTONLINE_SENDEMAIL;
+		$sendto=$sendemail;
 		$from=$conf->global->MAILING_EMAIL_FROM;
 		// Define $urlwithroot
 		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
@@ -269,10 +275,11 @@ if ($ispaymentok)
 		}
 		else
 		{
-			$content.=$langs->transnoentitiesnoconv("NewPaypalPaymentReceived")."<br>\n";
+			$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
 		}
 		$content.="<br>\n";
 		$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+		$content.=$langs->transnoentitiesnoconv("PaymentSystem").': '.$paymentmethod."<br>\n";
 		$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
 		$content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
 
@@ -310,11 +317,16 @@ else
      
     if ($mysoc->email) print "\nPlease, send a screenshot of this page to ".$mysoc->email."<br>\n";
     
+    $sendemail = '';
+    if (! empty($conf->global->PAYMENTONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYMENTONLINE_SENDEMAIL;
+    // TODO Remove local option to keep only the generic one ?
+    if ($paymentmethod == 'paypal' && ! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+    if ($paymentmethod == 'paybox' && ! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
     
     // Send an email
-    if (! empty($conf->global->PAYMENTONLINE_SENDEMAIL))
+    if ($sendemail)
     {
-        $sendto=$conf->global->PAYMENTONLINE_SENDEMAIL;
+        $sendto=$sendemail;
         $from=$conf->global->MAILING_EMAIL_FROM;
         // Define $urlwithroot
         $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
@@ -327,6 +339,7 @@ else
         $content.=$langs->transnoentitiesnoconv("PaypalConfirmPaymentPageWasCalledButFailed")."\n";
         $content.="\n";
         $content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+		$content.=$langs->transnoentitiesnoconv("PaymentSystem").': '.$paymentmethod."<br>\n";
         $content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
         $content.="tag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
          
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index 0bc3c9ca9e6..2d3c67beecb 100644
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -61,6 +61,9 @@ $FULLTAG=GETPOST('FULLTAG');
 if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 
+$object = new stdClass();   // For triggers
+
+
 /*
  * Actions
  */
@@ -79,6 +82,14 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
 
 
+// Appel des triggers
+include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+$interface=new Interfaces($db);
+$result=$interface->run_triggers('PAYPAL_PAYMENT_KO',$object,$user,$langs,$conf);
+if ($result < 0) { $error++; $errors=$interface->errors; }
+// Fin appel triggers
+
+
 // Send an email
 if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
 {
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index ca6a376e60d..ddb779d621e 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -92,6 +92,9 @@ $FULLTAG=GETPOST('FULLTAG');
 if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 
+$object = new stdClass();   // For triggers
+
+
 /*
  * Actions
  */
@@ -151,8 +154,6 @@ if ($PAYPALTOKEN)
         $ack = strtoupper($resArray["ACK"]);
         if($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
         {
-        	$object = new stdClass();
-
         	$object->source		= $source;
         	$object->ref		= $ref;
         	$object->payerID	= $payerID;
@@ -226,7 +227,14 @@ if ($PAYPALTOKEN)
         }
         else
 		{
-            //Display a user friendly Error on the page using any of the following error information returned by PayPal
+            // Appel des triggers
+            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+            $interface=new Interfaces($db);
+            $result=$interface->run_triggers('PAYPAL_PAYMENT_KO',$object,$user,$langs,$conf);
+            if ($result < 0) { $error++; $errors=$interface->errors; }
+            // Fin appel triggers
+            
+		    //Display a user friendly Error on the page using any of the following error information returned by PayPal
             $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
             $ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
             $ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);

From 8dcec30d8938b302382b652dfabd494b99eb8db1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 21:17:08 +0200
Subject: [PATCH 0810/1163] Start debug of module stripe

---
 htdocs/stripe/lib/stripe.lib.php | 45 --------------------------------
 1 file changed, 45 deletions(-)

diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
index c454296a304..5f0b1bd0404 100644
--- a/htdocs/stripe/lib/stripe.lib.php
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -51,52 +51,7 @@ function stripeadmin_prepare_head()
     return $head;
 }
 
-/**
- * Show header
- *
- * @param 	string	$title		Title of page
- * @param 	string	$head		Head string to add int head section
- * @return	void
- */
-function llxHeaderStripe($title, $head = "")
-{
-	global $user, $conf, $langs;
 
-	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
-	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-	//print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd>';
-	print "\n";
-	print "<html>\n";
-	print "<head>\n";
-	print '<meta name="robots" content="noindex,nofollow">'."\n";
-	print '<meta name="keywords" content="dolibarr,payment,online">'."\n";
-	print '<meta name="description" content="Welcome on Dolibarr online payment form">'."\n";
-	print "<title>".$title."</title>\n";
-	if ($head) print $head."\n";
-	if (! empty($conf->global->STRIPE_CSS_URL)) print '<link rel="stylesheet" type="text/css" href="'.$conf->global->STRIPE_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-	else
-	{
-		print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.$conf->css.'?lang='.$langs->defaultlang.'">'."\n";
-		print '<style type="text/css">';
-		print '.CTableRow1      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #e6E6eE; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
-		print '.CTableRow2      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #FFFFFF; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
-		print '</style>';
-	}
-	print "</head>\n";
-	print '<body style="margin: 20px;">'."\n";
-}
-
-/**
- * Show footer
- *
- * @return	void
- */
-function llxFooterStripe()
-{
-	print "</body>\n";
-	print "</html>\n";
-}
 
 /**
  * Return string with full Url

From 0ed4b607b21d198f86ad2b6041411fc434590c9d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 22:05:58 +0200
Subject: [PATCH 0811/1163] Standardize code for payment

---
 htdocs/paypal/admin/paypal.php      |   1 +
 htdocs/public/paybox/paymentko.php  |  15 ++-
 htdocs/public/paybox/paymentok.php  |  15 ++-
 htdocs/public/paypal/newpayment.php |  17 ++--
 htdocs/public/paypal/paymentko.php  |  15 ++-
 htdocs/public/paypal/paymentok.php  |  30 +++++-
 htdocs/public/stripe/newpayment.php |   2 +
 htdocs/stripe/admin/stripe.php      | 147 +++++++++++++++++++++-------
 8 files changed, 195 insertions(+), 47 deletions(-)

diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 6d52fea8d99..36c8df9d0d6 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -43,6 +43,7 @@ $action = GETPOST('action','alpha');
 if ($action == 'setvalue' && $user->admin)
 {
 	$db->begin();
+	
     $result=dolibarr_set_const($db, "PAYPAL_API_SANDBOX",GETPOST('PAYPAL_API_SANDBOX','alpha'),'chaine',0,'',$conf->entity);
     if (! $result > 0) $error++;
     $result=dolibarr_set_const($db, "PAYPAL_API_USER",GETPOST('PAYPAL_API_USER','alpha'),'chaine',0,'',$conf->entity);
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index e417aad12c7..be5b388f6ed 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -86,8 +86,21 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 	$sendto=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
 	$from=$conf->global->MAILING_EMAIL_FROM;
 
+	// Define link to login card
+	$appli=constant('DOL_APPLICATION_TITLE');
+	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+	{
+	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+	    if (preg_match('/\d\.\d/', $appli))
+	    {
+	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+	    }
+	    else $appli.=" ".DOL_VERSION;
+	}
+	else $appli.=" ".DOL_VERSION;
+	
 	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentFailed");
+	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentFailed");
 	$content=$langs->transnoentitiesnoconv("NewPayboxPaymentFailed")."\n".$fulltag;
 	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 	$mailfile = new CMailFile($topic, $sendto, $from, $content);
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 5b88dcb65d7..0e91189e242 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -135,8 +135,21 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
+	// Define link to login card
+	$appli=constant('DOL_APPLICATION_TITLE');
+	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+	{
+	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+	    if (preg_match('/\d\.\d/', $appli))
+	    {
+	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+	    }
+	    else $appli.=" ".DOL_VERSION;
+	}
+	else $appli.=" ".DOL_VERSION;
+	
 	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentReceived");
+	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentReceived");
 	$tmptag=dolExplodeIntoArray($fulltag,'.','=');
 	$content="";
 	if (! empty($tmptag['MEM']))
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index e118d769476..cd963eec798 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,7 +23,6 @@
  *     	\file       htdocs/public/paypal/newpayment.php
  *		\ingroup    paypal
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -353,7 +352,7 @@ $error=0;
 $var=false;
 
 // Free payment
-if (! GETPOST("source") && $valid)
+if (! GETPOST("source"))
 {
 	$found=true;
 	$tag=GETPOST("tag");
@@ -400,7 +399,7 @@ if (! GETPOST("source") && $valid)
 
 
 // Payment on customer order
-if (GETPOST("source") == 'order' && $valid)
+if (GETPOST("source") == 'order')
 {
 	$found=true;
 	$langs->load("orders");
@@ -507,7 +506,7 @@ if (GETPOST("source") == 'order' && $valid)
 
 
 // Payment on customer invoice
-if (GETPOST("source") == 'invoice' && $valid)
+if (GETPOST("source") == 'invoice')
 {
 	$found=true;
 	$langs->load("bills");
@@ -613,7 +612,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 }
 
 // Payment on contract line
-if (GETPOST("source") == 'contractline' && $valid)
+if (GETPOST("source") == 'contractline')
 {
 	$found=true;
 	$langs->load("contracts");
@@ -808,7 +807,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 }
 
 // Payment on member subscription
-if (GETPOST("source") == 'membersubscription' && $valid)
+if (GETPOST("source") == 'membersubscription')
 {
 	$found=true;
 	$langs->load("members");
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index 2d3c67beecb..e432db2e317 100644
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -108,8 +108,21 @@ if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
 	$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
 	$from=$conf->global->MAILING_EMAIL_FROM;
 
+	// Define link to login card
+	$appli=constant('DOL_APPLICATION_TITLE');
+	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+	{
+	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+	    if (preg_match('/\d\.\d/', $appli))
+	    {
+	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+	    }
+	    else $appli.=" ".DOL_VERSION;
+	}
+	else $appli.=" ".DOL_VERSION;
+	
 	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentFailed");
+	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentFailed");
 	$content=$langs->transnoentitiesnoconv("NewPaypalPaymentFailed")."\ntag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
 	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 	$mailfile = new CMailFile($topic, $sendto, $from, $content);
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index ddb779d621e..e3f2ed201e5 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -188,8 +188,21 @@ if ($PAYPALTOKEN)
 				$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 				//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
+				// Define link to login card
+				$appli=constant('DOL_APPLICATION_TITLE');
+				if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+				{
+				    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+				    if (preg_match('/\d\.\d/', $appli))
+				    {
+				        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+				    }
+				    else $appli.=" ".DOL_VERSION;
+				}
+				else $appli.=" ".DOL_VERSION;
+				
 				$urlback=$_SERVER["REQUEST_URI"];
-				$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentReceived");
+				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentReceived");
 				$tmptag=dolExplodeIntoArray($fulltag,'.','=');
 				$content="";
 				if (! empty($tmptag['MEM']))
@@ -258,8 +271,21 @@ if ($PAYPALTOKEN)
 				$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 				//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
+				// Define link to login card
+				$appli=constant('DOL_APPLICATION_TITLE');
+				if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+				{
+				    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+				    if (preg_match('/\d\.\d/', $appli))
+				    {
+				        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+				    }
+				    else $appli.=" ".DOL_VERSION;
+				}
+				else $appli.=" ".DOL_VERSION;
+				
 				$urlback=$_SERVER["REQUEST_URI"];
-				$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("ValidationOfPaypalPaymentFailed");
+				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("ValidationOfPaypalPaymentFailed");
 				$content="";
 				$content.=$langs->transnoentitiesnoconv("PaypalConfirmPaymentPageWasCalledButFailed")."\n";
 				$content.="\n";
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 71f581000b2..0d6cefd357a 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@zendsi.com>
  * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
+ * Copyright (C) 2017       Laurent Destailleur		<eldy@users.sourceforge.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +36,7 @@ if (empty($conf->stripe->enabled)) accessforbidden('',0,0,1);
 
 $langs->load("main");
 $langs->load("other");
+$langs->load("paybox");     // File with generic data
 $langs->load("stripe");
 
 $source=GETPOST("source",'alpha');
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 6274197a301..3dd238b2f1d 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -36,8 +36,7 @@ $langs->load("paypal");
 $langs->load("paybox");
 $langs->load("stripe");
 
-if (!$user->admin)
-  accessforbidden();
+if (! $user->admin) accessforbidden();
   
 $action = GETPOST('action','alpha');
 
@@ -96,6 +95,8 @@ if ($action=="setlive")
  *	View
  */
 
+$form=new Form($db);
+
 $SECRET_TEST_KEY="sk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test secret key
 if (empty($conf->global->STRIPE_TEST_SECRET_KEY)) $conf->global->STRIPE_TEST_SECRET_KEY = $SECRET_TEST_KEY;
 $PUBLISHABLE_TEST_KEY="pk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test publishable key
@@ -108,10 +109,8 @@ if (empty($conf->global->STRIPE_LIVE_PUBLISHABLE_KEY)) $conf->global->STRIPE_LIV
 
 llxHeader('',$langs->trans("StripeSetup"));
 
-
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("ModuleSetup").' Stripe',$linkback);
-print '<br>';
 
 $head=stripeadmin_prepare_head();
 
@@ -119,22 +118,19 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
-dol_fiche_head($head, 'stripeaccount', '');
+dol_fiche_head($head, 'stripeaccount', '', -1);
 
 print $langs->trans("StripeDesc")."<br>\n";
 
 print '<br>';
 
-$var=true;
-
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("AccountParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
+print '<tr class="oddeven">';
 print '<td class="titlefield fieldrequired">';
 print $langs->trans("StripeLiveEnabled").'</td><td>';
 if (!empty($conf->global->STRIPE_LIVE))
@@ -149,29 +145,25 @@ else
 }
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
 print '<input size="32" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
 print '<br>'.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
 print '<input size="32" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
 print '<br>'.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
 print '<input size="32" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
 print '<br>'.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
 print '<input size="32" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
 print '<br>'.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
@@ -187,29 +179,25 @@ print '<td>'.$langs->trans("UsageParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("VendorName").'</td><td>';
 print '<input size="64" type="text" name="STRIPE_CREDITOR" value="'.$conf->global->STRIPE_CREDITOR.'">';
 print '<br>'.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="STRIPE_CSS_URL" value="'.$conf->global->STRIPE_CSS_URL.'">';
 print '<br>'.$langs->trans("Example").': http://mysite/mycss.css';
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("MessageOK").'</td><td>';
 $doleditor=new DolEditor('STRIPE_MESSAGE_OK',$conf->global->STRIPE_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
 $doleditor->Create();
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
+print '<tr class="oddeven"><td>';
 print $langs->trans("MessageKO").'</td><td>';
 $doleditor=new DolEditor('STRIPE_MESSAGE_KO',$conf->global->STRIPE_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
 $doleditor->Create();
@@ -225,35 +213,128 @@ print '</form>';
 
 print '<br><br>';
 
-/*
+
+$token='';
+
+
+// Url list
 print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
 print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
-print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount=<i>9.99</i>&tag=<i>your_free_tag</i></b>'."<br>\n";
+print '<strong>'.getStripePaymentUrl(1,'free')."</strong><br><br>\n";
 if (! empty($conf->commande->enabled))
 {
 	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder",$servicename).':<br>';
-	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref=<i>order_ref</i></b>'."<br>\n";
+	print '<strong>'.getStripePaymentUrl(1,'order')."</strong><br>\n";
+	if (! empty($conf->global->STRIPE_SECURITY_TOKEN) && ! empty($conf->global->STRIPE_SECURITY_TOKEN_UNIQUE))
+	{
+	    $langs->load("orders");
+	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Order")).': ';
+        print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref','alpha').'" size="10">';
+        print '<input type="submit" class="none" value="'.$langs->trans("GetSecuredUrl").'">';
+        if (GETPOST('generate_order_ref','alpha'))
+        {
+            print '<br> -> <strong>';
+            $url=getStripePaymentUrl(0,'order',GETPOST('generate_order_ref','alpha'));
+            print $url;
+            print "</strong><br>\n";
+        }
+        print '</form>';
+	}
+	print '<br>';
 }
 if (! empty($conf->facture->enabled))
 {
 	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice",$servicename).':<br>';
-	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref=<i>invoice_ref</i></b>'."<br>\n";
+	print '<strong>'.getStripePaymentUrl(1,'invoice')."</strong><br>\n";
+	if (! empty($conf->global->STRIPE_SECURITY_TOKEN) && ! empty($conf->global->STRIPE_SECURITY_TOKEN_UNIQUE))
+	{
+	    $langs->load("bills");
+	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Invoice")).': ';
+        print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref','alpha').'" size="10">';
+        print '<input type="submit" class="none" value="'.$langs->trans("GetSecuredUrl").'">';
+        if (GETPOST('generate_invoice_ref','alpha'))
+        {
+            print '<br> -> <strong>';
+            $url=getPaypalPaymentUrl(0,'invoice',GETPOST('generate_invoice_ref','alpha'));
+            print $url;
+            print "</strong><br>\n";
+        }
+        print '</form>';
+	}
+	print '<br>';
 }
 if (! empty($conf->contrat->enabled))
 {
 	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine",$servicename).':<br>';
-	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref=<i>contractline_ref</i></b>'."<br>\n";
+	print '<strong>'.getStripePaymentUrl(1,'contractline')."</strong><br>\n";
+	if (! empty($conf->global->STRIPE_SECURITY_TOKEN) && ! empty($conf->global->STRIPE_SECURITY_TOKEN_UNIQUE))
+	{
+	    $langs->load("contract");
+	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Contract")).': ';
+        print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref','alpha').'" size="10">';
+        print '<input type="submit" class="none" value="'.$langs->trans("GetSecuredUrl").'">';
+        if (GETPOST('generate_contract_ref'))
+        {
+            print '<br> -> <strong>';
+            $url=getPaypalPaymentUrl(0,'contractline',GETPOST('generate_contract_ref','alpha'));
+            print $url;
+            print "</strong><br>\n";
+        }
+        print '</form>';
+	}
+	print '<br>';
 }
 if (! empty($conf->adherent->enabled))
 {
 	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription",$servicename).':<br>';
-	print '<b>'.DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref=<i>member_ref</i></b>'."<br>\n";
+	print '<strong>'.getStripePaymentUrl(1,'membersubscription')."</strong><br>\n";
+	if (! empty($conf->global->STRIPE_SECURITY_TOKEN) && ! empty($conf->global->STRIPE_SECURITY_TOKEN_UNIQUE))
+	{
+	    $langs->load("members");
+	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Member")).': ';
+        print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref','alpha').'" size="10">';
+        print '<input type="submit" class="none" value="'.$langs->trans("GetSecuredUrl").'">';
+        if (GETPOST('generate_member_ref'))
+        {
+            print '<br> -> <strong>';
+            $url=getPaypalPaymentUrl(0,'membersubscription',GETPOST('generate_member_ref','alpha'));
+            print $url;
+            print "</strong><br>\n";
+        }
+        print '</form>';
+	}
 }
 
 print "<br>";
 print info_admin($langs->trans("YouCanAddTagOnUrl"));
-*/
+
+if (! empty($conf->use_javascript_ajax))
+{
+	print "\n".'<script type="text/javascript">';
+	print '$(document).ready(function () {
+            $("#apidoca").hide();
+            $("#apidoca").click(function() {
+                $("#apidoc").show();
+            	$("#apidoca").hide();
+            });
+
+            $("#generate_token").click(function() {
+            	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
+            		action: \'getrandompassword\',
+            		generic: true
+				},
+				function(token) {
+					$("#STRIPE_SECURITY_TOKEN").val(token);
+				});
+            });
+    });';
+	print '</script>';
+}
+
 
 llxFooter();
-
 $db->close();

From 169e63d49a5108737f5d951a477e82f54badbb1f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 May 2017 22:23:03 +0200
Subject: [PATCH 0812/1163] Fix set of background for left menu

---
 htdocs/theme/eldy/style.css.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 92424afbb55..a8e7729f31b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -918,6 +918,7 @@ td.showDragHandle {
 	display: table-cell;
 	border-right: 1px solid #d0d0d0;
 	box-shadow: 3px 0 6px -2px #eee;
+	background: rgb(<?php echo $colorbackvmenu1; ?>);
 }
 div.blockvmenulogo
 {

From 9e4e72baee649d03ca33e5eefaf0f8fde66379b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 May 2017 05:26:19 +0200
Subject: [PATCH 0813/1163] Enhance module stripe

---
 htdocs/langs/en_US/paybox.lang        |    1 +
 htdocs/public/payment/newpayment.php  |  150 +--
 htdocs/public/paypal/newpayment.php   |   94 +-
 htdocs/public/stripe/index.php        |    2 +-
 htdocs/public/stripe/newpayment.php   | 1278 +++++++++++++++++++++----
 htdocs/stripe/admin/stripe.php        |   46 +-
 htdocs/{public => }/stripe/config.php |   14 +-
 7 files changed, 1276 insertions(+), 309 deletions(-)
 rename htdocs/{public => }/stripe/config.php (82%)

diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang
index c0a55888e7c..91fe071627c 100644
--- a/htdocs/langs/en_US/paybox.lang
+++ b/htdocs/langs/en_US/paybox.lang
@@ -11,6 +11,7 @@ YourEMail=Email to receive payment confirmation
 Creditor=Creditor
 PaymentCode=Payment code
 PayBoxDoPayment=Go on payment
+ToPay=Do payment
 YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
 Continue=Next
 ToOfferALinkForOnlinePayment=URL for %s payment
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 1ea8e7385ea..744f477782e 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,7 +24,6 @@
  *     	\file       htdocs/public/payment/newpayment.php
  *		\ingroup    core
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -43,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 // Security check
-//if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1);
+// No check on module enabled. Done later according to $validpaymentmethod
 
 $langs->load("main");
 $langs->load("other");
@@ -502,10 +501,13 @@ if (GETPOST("source") == 'order')
 		$result=$order->fetch_thirdparty($order->socid);
 	}
 
-	$amount=$order->total_ttc;
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=$order->total_ttc;
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
 	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
@@ -609,10 +611,13 @@ if (GETPOST("source") == 'invoice')
 		$result=$invoice->fetch_thirdparty($invoice->socid);
 	}
 
-	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
 	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
@@ -733,35 +738,38 @@ if (GETPOST("source") == 'contractline')
 		}
 	}
 
-	$amount=$contractline->total_ttc;
-	if ($contractline->fk_product)
-	{
-		$product=new Product($db);
-		$result=$product->fetch($contractline->fk_product);
-
-		// We define price for product (TODO Put this in a method in product class)
-		if (! empty($conf->global->PRODUIT_MULTIPRICES))
-		{
-			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
-			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
-			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
-		}
-		else
-		{
-			$pu_ht = $product->price;
-			$pu_ttc = $product->price_ttc;
-			$price_base_type = $product->price_base_type;
-		}
-
-		$amount=$pu_ttc;
-		if (empty($amount))
-		{
-			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
-			exit;
-		}
-	}
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=$contractline->total_ttc;
+    	if ($contractline->fk_product)
+    	{
+    		$product=new Product($db);
+    		$result=$product->fetch($contractline->fk_product);
+    
+    		// We define price for product (TODO Put this in a method in product class)
+    		if (! empty($conf->global->PRODUIT_MULTIPRICES))
+    		{
+    			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
+    			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
+    			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
+    		}
+    		else
+    		{
+    			$pu_ht = $product->price;
+    			$pu_ttc = $product->price_ttc;
+    			$price_base_type = $product->price_base_type;
+    		}
+    
+    		$amount=$pu_ttc;
+    		if (empty($amount))
+    		{
+    			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+    			exit;
+    		}
+    	}
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
 
 	$fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
 	//$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
@@ -911,10 +919,13 @@ if (GETPOST("source") == 'membersubscription')
 		$subscription=new Subscription($db);
 	}
 
-	$amount=$subscription->total_ttc;
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=$subscription->total_ttc;
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
 	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
@@ -1035,35 +1046,42 @@ if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.
 print '</table>'."\n";
 print "\n";
 
-if ($found && ! $error)	// We are in a management option and no error
+if ($action != 'dopayment')
 {
-    // Buttons for all payments registration methods
-    
-    if (! empty($conf->paypal->enabled))
+    if ($found && ! $error)	// We are in a management option and no error
     {
-    	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
-    
-    	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
-    	{
-    		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
-    	}
-    	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
-    	{
-    		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalDoPayment").'">';
-    	}
-    }
-
-    if (! empty($conf->paypal->enabled))
-    {
-    
+        // Buttons for all payments registration methods
         
-    }
+        if (! empty($conf->paypal->enabled))
+        {
+        	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+        
+        	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
+        	{
+        		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
+        	}
+        	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
+        	{
+        		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalDoPayment").'">';
+        	}
+        }
     
-    // TODO Other methods
+        if (! empty($conf->paybox->enabled))
+        {
+        
+            
+        }
+        
+        // TODO Other methods
+    }
+    else
+    {
+    	dol_print_error_email('ERRORNEWPAYMENTPAYPAL');
+    }
 }
 else
 {
-	dol_print_error_email('ERRORNEWPAYMENTPAYPAL');
+    // Print
 }
 
 print '</td></tr>'."\n";
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index cd963eec798..c9cedcfd32d 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -418,10 +418,13 @@ if (GETPOST("source") == 'order')
 		$result=$order->fetch_thirdparty($order->socid);
 	}
 
-	$amount=$order->total_ttc;
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=$order->total_ttc;
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
 	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
@@ -525,10 +528,13 @@ if (GETPOST("source") == 'invoice')
 		$result=$invoice->fetch_thirdparty($invoice->socid);
 	}
 
-	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
 	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
@@ -649,35 +655,38 @@ if (GETPOST("source") == 'contractline')
 		}
 	}
 
-	$amount=$contractline->total_ttc;
-	if ($contractline->fk_product)
-	{
-		$product=new Product($db);
-		$result=$product->fetch($contractline->fk_product);
-
-		// We define price for product (TODO Put this in a method in product class)
-		if (! empty($conf->global->PRODUIT_MULTIPRICES))
-		{
-			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
-			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
-			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
-		}
-		else
-		{
-			$pu_ht = $product->price;
-			$pu_ttc = $product->price_ttc;
-			$price_base_type = $product->price_base_type;
-		}
-
-		$amount=$pu_ttc;
-		if (empty($amount))
-		{
-			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
-			exit;
-		}
-	}
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=$contractline->total_ttc;
+    	if ($contractline->fk_product)
+    	{
+    		$product=new Product($db);
+    		$result=$product->fetch($contractline->fk_product);
+    
+    		// We define price for product (TODO Put this in a method in product class)
+    		if (! empty($conf->global->PRODUIT_MULTIPRICES))
+    		{
+    			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
+    			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
+    			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
+    		}
+    		else
+    		{
+    			$pu_ht = $product->price;
+    			$pu_ttc = $product->price_ttc;
+    			$price_base_type = $product->price_base_type;
+    		}
+    
+    		$amount=$pu_ttc;
+    		if (empty($amount))
+    		{
+    			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+    			exit;
+    		}
+    	}
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
 
 	$fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
 	//$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
@@ -827,10 +836,13 @@ if (GETPOST("source") == 'membersubscription')
 		$subscription=new Subscription($db);
 	}
 
-	$amount=$subscription->total_ttc;
-    if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-    $amount=price2num($amount);
-
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+    	$amount=$subscription->total_ttc;
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
 	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
diff --git a/htdocs/public/stripe/index.php b/htdocs/public/stripe/index.php
index 0b7ad1c82e4..6a86f3ed88e 100644
--- a/htdocs/public/stripe/index.php
+++ b/htdocs/public/stripe/index.php
@@ -16,7 +16,7 @@
  */
 
 /**
- *     	\file       htdocs/public/paybox/index.php
+ *     	\file       htdocs/public/stripe/index.php
  *		\ingroup    core
  *		\brief      A redirect page to an error
  *		\author	    Laurent Destailleur
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 0d6cefd357a..95f0f9f2134 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -23,213 +23,1145 @@
 *  \brief      Page to do payment with Stripe
 */
 
-define("NOLOGIN",1);
-define("NOCSRFCHECK",1);
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/stripe/config.php';
+/* included into config.php
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/public/stripe/config.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
+*/
 
 // Security check
 if (empty($conf->stripe->enabled)) accessforbidden('',0,0,1);
 
 $langs->load("main");
+$langs->load("companies");
 $langs->load("other");
 $langs->load("paybox");     // File with generic data
 $langs->load("stripe");
 
-$source=GETPOST("source",'alpha');
-$ref=GETPOST('ref','alpha');
+$action=GETPOST('action','alpha');
 
-$form = new Form($db);
+// Input are:
+// type ('invoice','order','contractline'),
+// id (object id),
+// amount (required if id is empty),
+// tag (a free text, required if type is empty)
+// currency (iso code)
+
+$suffix=GETPOST("suffix",'alpha');
+$amount=price2num(GETPOST("amount"));
+if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
+else $currency=GETPOST("currency",'alpha');
+
+if (! $action)
+{
+    if (! GETPOST("amount") && ! GETPOST("source"))
+    {
+        dol_print_error('',$langs->trans('ErrorBadParameters')." - amount or source");
+        exit;
+    }
+    if (is_numeric($amount) && ! GETPOST("tag") && ! GETPOST("source"))
+    {
+        dol_print_error('',$langs->trans('ErrorBadParameters')." - tag or source");
+        exit;
+    }
+    if (GETPOST("source") && ! GETPOST("ref"))
+    {
+        dol_print_error('',$langs->trans('ErrorBadParameters')." - ref");
+        exit;
+    }
+}
+
+// Define $urlwithroot
+//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
+
+$urlok=$urlwithroot.'/public/paypal/paymentok.php?';
+$urlko=$urlwithroot.'/public/paypal/paymentko.php?';
+
+// Complete urls for post treatment
+$SOURCE=GETPOST("source",'alpha');
+$ref=$REF=GETPOST('ref','alpha');
+$TAG=GETPOST("tag",'alpha');
+$FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
+$SECUREKEY=GETPOST("securekey");	        // Secure key
+$FULLTAG.=($FULLTAG?'.':'').'PM=stripe';
+
+if (! empty($SOURCE))
+{
+    $urlok.='source='.urlencode($SOURCE).'&';
+    $urlko.='source='.urlencode($SOURCE).'&';
+}
+if (! empty($REF))
+{
+    $urlok.='ref='.urlencode($REF).'&';
+    $urlko.='ref='.urlencode($REF).'&';
+}
+if (! empty($TAG))
+{
+    $urlok.='tag='.urlencode($TAG).'&';
+    $urlko.='tag='.urlencode($TAG).'&';
+}
+if (! empty($FULLTAG))
+{
+    $urlok.='fulltag='.urlencode($FULLTAG).'&';
+    $urlko.='fulltag='.urlencode($FULLTAG).'&';
+}
+if (! empty($SECUREKEY))
+{
+    $urlok.='securekey='.urlencode($SECUREKEY).'&';
+    $urlko.='securekey='.urlencode($SECUREKEY).'&';
+}
+if (! empty($entity))
+{
+    $urlok.='entity='.urlencode($entity).'&';
+    $urlko.='entity='.urlencode($entity).'&';
+}
+$urlok=preg_replace('/&$/','',$urlok);  // Remove last &
+$urlko=preg_replace('/&$/','',$urlko);  // Remove last &
+
+// Check parameters
+/*
+$STRIPE_API_OK="";
+if ($urlok) $STRIPE_API_OK=$urlok;
+$STRIPE_API_KO="";
+if ($urlko) $STRIPE_API_KO=$urlko;
+if (empty($STRIPE_API_USER))
+{
+    dol_print_error('',"Paypal setup param STRIPE_API_USER not defined");
+    return -1;
+}
+if (empty($STRIPE_API_PASSWORD))
+{
+    dol_print_error('',"Paypal setup param STRIPE_API_PASSWORD not defined");
+    return -1;
+}
+if (empty($STRIPE_API_SIGNATURE))
+{
+    dol_print_error('',"Paypal setup param STRIPE_API_SIGNATURE not defined");
+    return -1;
+}
+*/
+
+
+// Check security token
+$valid=true;
+if (! empty($conf->global->STRIPE_SECURITY_TOKEN))
+{
+    if (! empty($conf->global->STRIPE_SECURITY_TOKEN_UNIQUE))
+    {
+        if ($SOURCE && $REF) $token = dol_hash($conf->global->STRIPE_SECURITY_TOKEN . $SOURCE . $REF, 2);    // Use the source in the hash to avoid duplicates if the references are identical
+        else $token = dol_hash($conf->global->STRIPE_SECURITY_TOKEN, 2);
+    }
+    else
+    {
+        $token = $conf->global->STRIPE_SECURITY_TOKEN;
+    }
+    if ($SECUREKEY != $token) $valid=false;
+
+    if (! $valid)
+    {
+        print '<div class="error">Bad value for key.</div>';
+        //print 'SECUREKEY='.$SECUREKEY.' token='.$token.' valid='.$valid;
+        exit;
+    }
+}
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'dopayment')    // We click on button Create payment that lead on this page
+{
+    if (GETPOST('newamount')) $amount = GETPOST('newamount');
+    else 
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
+        $action = '';
+    }
+}
+
+if ($action == 'charge')
+{
+    dol_syslog("POST keys  : ".join(',', array_keys($_POST)));
+    dol_syslog("POST values: ".join(',', $_POST));
+    
+    $token = GETPOST("stripeToken");
+    $email = GETPOST("stripeEmail");
+
+    try {
+        $customer = \Stripe\Customer::create(array(
+            'email' => $email,
+            'card'  => $token
+            // TODO
+        ));
+         
+        $charge = \Stripe\Charge::create(array(
+            'customer' => $customer->id,
+            'amount'   => price2num($amount, 'MU'),
+            'currency' => $conf->currency,
+            // TODO
+            'description' => 'Invoice payment N: '.$ref
+        ));
+    } catch(\Stripe\Error\Card $e) {
+        // Since it's a decline, \Stripe\Error\Card will be caught
+        $body = $e->getJsonBody();
+        $err  = $body['error'];
+    
+        print('Status is:' . $e->getHttpStatus() . "\n");
+        print('Type is:' . $err['type'] . "\n");
+        print('Code is:' . $err['code'] . "\n");
+        // param is '' in this case
+        print('Param is:' . $err['param'] . "\n");
+        print('Message is:' . $err['message'] . "\n");
+    
+        setEventMessages($e->getMessage(), null, 'errors');
+        $action='';
+    } catch (\Stripe\Error\RateLimit $e) {
+        // Too many requests made to the API too quickly
+        setEventMessages($e->getMessage(), null, 'errors');
+        $action='';
+    } catch (\Stripe\Error\InvalidRequest $e) {
+        // Invalid parameters were supplied to Stripe's API
+        setEventMessages($e->getMessage(), null, 'errors');
+        $action='';
+    } catch (\Stripe\Error\Authentication $e) {
+        // Authentication with Stripe's API failed
+        // (maybe you changed API keys recently)
+        setEventMessages($e->getMessage(), null, 'errors');
+        $action='';
+    } catch (\Stripe\Error\ApiConnection $e) {
+        // Network communication with Stripe failed
+        setEventMessages($e->getMessage(), null, 'errors');
+        $action='';
+    } catch (\Stripe\Error\Base $e) {
+        // Display a very generic error to the user, and maybe send
+        // yourself an email
+        setEventMessages($e->getMessage(), null, 'errors');
+        $action='';
+    } catch (Exception $e) {
+        // Something else happened, completely unrelated to Stripe
+        setEventMessages($e->getMessage(), null, 'errors');
+        $action='';
+    }
+        
+    // TODO
+    dol_syslog("Action  Pay.");
+    
+    
+}
+
+
+/*
+ * View
+ */
+
+$head='';
+if (! empty($conf->global->STRIPE_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->STRIPE_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
+
+if (! empty($STRIPE_API_SANDBOX))
+{
+    dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
+}
+
+// Common variables
+$creditor=$mysoc->name;
+$paramcreditor='STRIPE_CREDITOR_'.$suffix;
+if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
+else if (! empty($conf->global->STRIPE_CREDITOR)) $creditor=$conf->global->STRIPE_CREDITOR;
+
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+print '<input type="hidden" name="action" value="dopayment">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
+print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print "\n";
+print '<!-- Form to send a Stripe payment -->'."\n";
+print '<!-- STRIPE_API_SANDBOX = '.$conf->global->STRIPE_API_SANDBOX.' -->'."\n";
+print '<!-- creditor = '.$creditor.' -->'."\n";
+print '<!-- urlok = '.$urlok.' -->'."\n";
+print '<!-- urlko = '.$urlko.' -->'."\n";
+print "\n";
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
+// Show logo (search order: logo defined by PAYBOX_LOGO_suffix, then PAYBOX_LOGO, then small company logo, large company logo, theme logo, common logo)
+$width=0;
+// Define logo and logosmall
+$logosmall=$mysoc->logo_small;
+$logo=$mysoc->logo;
+$paramlogo='STRIPE_LOGO_'.$suffix;
+if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
+else if (! empty($conf->global->STRIPE_LOGO)) $logosmall=$conf->global->STRIPE_LOGO;
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo='';
+if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
+{
+    $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
+}
+elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+{
+    $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
+    $width=96;
+}
+// Output html code for logo
+if ($urllogo)
+{
+    print '<tr>';
+    print '<td align="center"><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
+    if ($width) print ' width="'.$width.'"';
+    print '></td>';
+    print '</tr>'."\n";
+}
+
+// Output introduction text
+$text='';
+if (! empty($conf->global->STRIPE_NEWFORM_TEXT))
+{
+    $langs->load("members");
+    if (preg_match('/^\((.*)\)$/',$conf->global->STRIPE_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->STRIPE_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+}
+if (empty($text))
+{
+    $text.='<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnPaymentPage").'</strong><br></td></tr>'."\n";
+    $text.='<tr><td class="textpublicpayment"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+}
+print $text;
+
+// Output payment summary form
+print '<tr><td align="center">';
+print '<table with="100%" id="tablepublicpayment">';
+print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
+
+$found=false;
+$error=0;
+$var=false;
+
+// Free payment
+if (! GETPOST("source"))
+{
+    $found=true;
+    $tag=GETPOST("tag");
+    $fulltag=$tag;
+    
+    // Creditor
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+    // Amount
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+    if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+    print '</td><td class="CTableRow'.($var?'1':'2').'">';
+    if (empty($amount) || ! is_numeric($amount))
+    {
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+        print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+    }
+    else {
+        print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+        print '<input type="hidden" name="newamount" value="'.$amount.'">';
+    }
+    // Currency
+    print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+    print '<input type="hidden" name="currency" value="'.$currency.'">';
+    print '</td></tr>'."\n";
+
+    // Tag
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '<input type="hidden" name="tag" value="'.$tag.'">';
+    print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+    print '</td></tr>'."\n";
+
+    // We do not add fields shipToName, shipToStreet, shipToCity, shipToState, shipToCountryCode, shipToZip, shipToStreet2, phoneNum
+    // as they don't exists (buyer is unknown, tag is free).
+}
+
+
+// Payment on customer order
+if (GETPOST("source") == 'order')
+{
+    $found=true;
+    $langs->load("orders");
+
+    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
+    $order=new Commande($db);
+    $result=$order->fetch('',$ref);
+    if ($result < 0)
+    {
+        $mesg=$order->error;
+        $error++;
+    }
+    else
+    {
+        $result=$order->fetch_thirdparty($order->socid);
+    }
+
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+        $amount=$order->total_ttc;
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
+    $fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
+    //$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
+    if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+    $fulltag=dol_string_unaccent($fulltag);
+
+    // Creditor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+    // Debitor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
+
+    // Object
+
+    $text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+    print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+    print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+    print '<input type="hidden" name="ref" value="'.$order->ref.'">';
+    print '</td></tr>'."\n";
+
+    // Amount
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+    if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+    print '</td><td class="CTableRow'.($var?'1':'2').'">';
+    if (empty($amount) || ! is_numeric($amount))
+    {
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+        print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+    }
+    else {
+        print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+        print '<input type="hidden" name="newamount" value="'.$amount.'">';
+    }
+    // Currency
+    print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+    print '<input type="hidden" name="currency" value="'.$currency.'">';
+    print '</td></tr>'."\n";
+
+    // Tag
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '<input type="hidden" name="tag" value="'.$tag.'">';
+    print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+    print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$order->thirdparty->name;
+    $shipToStreet=$order->thirdparty->address;
+    $shipToCity=$order->thirdparty->town;
+    $shipToState=$order->thirdparty->state_code;
+    $shipToCountryCode=$order->thirdparty->country_code;
+    $shipToZip=$order->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$order->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$order->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Order").' '.$order->ref.'">'."\n";
+}
 
-$invoice = null;
 
 // Payment on customer invoice
-if ($source == 'invoice')
+if (GETPOST("source") == 'invoice')
 {
-	$found=true;
-	$langs->load("bills");
+    $found=true;
+    $langs->load("bills");
 
-	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
-	$invoice=new Facture($db);
-	$result=$invoice->fetch('',$ref);
-	if ($result < 0)
-	{
-		$mesg=$invoice->error;
-		$error++;
-	}
-	else
-	{
-		$result=$invoice->fetch_thirdparty($invoice->socid);
-	}
+    $invoice=new Facture($db);
+    $result=$invoice->fetch('',$ref);
+    if ($result < 0)
+    {
+        $mesg=$invoice->error;
+        $error++;
+    }
+    else
+    {
+        $result=$invoice->fetch_thirdparty($invoice->socid);
+    }
+    
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+        $amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
+    $fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
+    //$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
+    if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+    $fulltag=dol_string_unaccent($fulltag);
+    
+    // Creditor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+    // Debitor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
+
+    // Object
+
+    $text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+    print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+    print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+    print '<input type="hidden" name="ref" value="'.$invoice->ref.'">';
+    print '</td></tr>'."\n";
+
+    // Amount
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+    if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+    print '</td><td class="CTableRow'.($var?'1':'2').'">';
+    if (empty($amount) || ! is_numeric($amount))
+    {
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+        print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+    }
+    else {
+        print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+        print '<input type="hidden" name="newamount" value="'.$amount.'">';
+    }
+    // Currency
+    print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+    print '<input type="hidden" name="currency" value="'.$currency.'">';
+    print '</td></tr>'."\n";
+
+    // Tag
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '<input type="hidden" name="tag" value="'.$tag.'">';
+    print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+    print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$invoice->thirdparty->name;
+    $shipToStreet=$invoice->thirdparty->address;
+    $shipToCity=$invoice->thirdparty->town;
+    $shipToState=$invoice->thirdparty->state_code;
+    $shipToCountryCode=$invoice->thirdparty->country_code;
+    $shipToZip=$invoice->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$invoice->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$invoice->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Invoice").' '.$invoice->ref.'">'."\n";
 }
 
-$pay = false;
-$ttc = $invoice->total_ttc ;
-$ttc = $ttc * 100;
-if (GETPOST("action") == 'charge')
+// Payment on contract line
+if (GETPOST("source") == 'contractline')
 {
-  $token = GETPOST("stripeToken");
-  $email = GETPOST("stripeEmail");
+    $found=true;
+    $langs->load("contracts");
 
-  $customer = \stripe\Customer::create(array(
-      'email' => $email,
-      'card'  => $token
-  ));
-	
-	$ttc = round($ttc, 2);
-  $charge = \stripe\Charge::create(array(
-      'customer' => $customer->id,
-      'amount'   => $ttc,
-      'currency' => $conf->currency,
-      'description' => 'Invoice payment N: '.$ref
-  ));
+    require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
-	$pay = true;
-	
+    $contractline=new ContratLigne($db);
+    $result=$contractline->fetch('',$ref);
+    if ($result < 0)
+    {
+        $mesg=$contractline->error;
+        $error++;
+    }
+    else
+    {
+        if ($contractline->fk_contrat > 0)
+        {
+            $contract=new Contrat($db);
+            $result=$contract->fetch($contractline->fk_contrat);
+            if ($result > 0)
+            {
+                $result=$contract->fetch_thirdparty($contract->socid);
+            }
+            else
+            {
+                $mesg=$contract->error;
+                $error++;
+            }
+        }
+        else
+        {
+            $mesg='ErrorRecordNotFound';
+            $error++;
+        }
+    }
+
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+        $amount=$contractline->total_ttc;
+        if ($contractline->fk_product)
+        {
+            $product=new Product($db);
+            $result=$product->fetch($contractline->fk_product);
+    
+            // We define price for product (TODO Put this in a method in product class)
+            if (! empty($conf->global->PRODUIT_MULTIPRICES))
+            {
+                $pu_ht = $product->multiprices[$contract->thirdparty->price_level];
+                $pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
+                $price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
+            }
+            else
+            {
+                $pu_ht = $product->price;
+                $pu_ttc = $product->price_ttc;
+                $price_base_type = $product->price_base_type;
+            }
+    
+            $amount=$pu_ttc;
+            if (empty($amount))
+            {
+                dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+                exit;
+            }
+        }
+
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
+    $fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+    //$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
+    if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+    $fulltag=dol_string_unaccent($fulltag);
+
+    $qty=1;
+    if (GETPOST('qty')) $qty=GETPOST('qty');
+
+    // Creditor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+    // Debitor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
+
+    // Object
+
+    $text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
+    if ($contractline->fk_product)
+    {
+        $text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
+    }
+    if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
+    //if ($contractline->date_fin_validite) {
+    //	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
+    //	$text.=dol_print_date($contractline->date_fin_validite);
+    //}
+    if ($contractline->date_fin_validite)
+    {
+        $text.='<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
+    }
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+    print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+    print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+    print '<input type="hidden" name="ref" value="'.$contractline->ref.'">';
+    print '</td></tr>'."\n";
+
+    // Quantity
+
+    $label=$langs->trans("Quantity");
+    $qty=1;
+    $duration='';
+    if ($contractline->fk_product)
+    {
+        if ($product->isService() && $product->duration_value > 0)
+        {
+            $label=$langs->trans("Duration");
+
+            // TODO Put this in a global method
+            if ($product->duration_value > 1)
+            {
+                $dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
+            }
+            else
+            {
+                $dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
+            }
+            $duration=$product->duration_value.' '.$dur[$product->duration_unit];
+        }
+    }
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$label.'</td>';
+    print '<td class="CTableRow'.($var?'1':'2').'"><b>'.($duration?$duration:$qty).'</b>';
+    print '<input type="hidden" name="newqty" value="'.dol_escape_htmltag($qty).'">';
+    print '</b></td></tr>'."\n";
+
+    // Amount
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+    if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+    print '</td><td class="CTableRow'.($var?'1':'2').'">';
+    if (empty($amount) || ! is_numeric($amount))
+    {
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+        print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+    }
+    else {
+        print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+        print '<input type="hidden" name="newamount" value="'.$amount.'">';
+    }
+    // Currency
+    print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+    print '<input type="hidden" name="currency" value="'.$currency.'">';
+    print '</td></tr>'."\n";
+
+    // Tag
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '<input type="hidden" name="tag" value="'.$tag.'">';
+    print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+    print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$contract->thirdparty->name;
+    $shipToStreet=$contract->thirdparty->address;
+    $shipToCity=$contract->thirdparty->town;
+    $shipToState=$contract->thirdparty->state_code;
+    $shipToCountryCode=$contract->thirdparty->country_code;
+    $shipToZip=$contract->thirdparty->zip;
+    $shipToStreet2='';
+    $phoneNum=$contract->thirdparty->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$contract->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("Contract").' '.$contract->ref.'">'."\n";
+}
+
+// Payment on member subscription
+if (GETPOST("source") == 'membersubscription')
+{
+    $found=true;
+    $langs->load("members");
+
+    require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
+
+    $member=new Adherent($db);
+    $result=$member->fetch('',$ref);
+    if ($result < 0)
+    {
+        $mesg=$member->error;
+        $error++;
+    }
+    else
+    {
+        $subscription=new Subscription($db);
+    }
+
+    if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+    {
+        $amount=$subscription->total_ttc;
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+    
+    $fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+    if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+    $fulltag=dol_string_unaccent($fulltag);
+
+    // Creditor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+    // Debitor
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
+    if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
+    else print $member->getFullName($langs);
+    print '</b>';
+
+    // Object
+
+    $text='<b>'.$langs->trans("PaymentSubscription").'</b>';
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+    print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+    print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+    print '<input type="hidden" name="ref" value="'.$member->ref.'">';
+    print '</td></tr>'."\n";
+
+    if ($member->last_subscription_date || $member->last_subscription_amount)
+    {
+        // Last subscription date
+
+        print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
+        print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
+        print '</td></tr>'."\n";
+
+        // Last subscription amount
+
+        print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
+        print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
+        print '</td></tr>'."\n";
+
+        if (empty($amount) && ! GETPOST('newamount')) $_GET['newamount']=$member->last_subscription_amount;
+    }
+
+    // Amount
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+    if (empty($amount))
+    {
+        print ' ('.$langs->trans("ToComplete");
+        if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+        print ')';
+    }
+    print '</td><td class="CTableRow'.($var?'1':'2').'">';
+    if (empty($amount) || ! is_numeric($amount))
+    {
+        $valtoshow=GETPOST("newamount",'int');
+        if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+        print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
+    }
+    else {
+        $valtoshow=$amount;
+        if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+        print '<b>'.price($valtoshow).'</b>';
+        print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
+        print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
+    }
+    // Currency
+    print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+    print '<input type="hidden" name="currency" value="'.$currency.'">';
+    print '</td></tr>'."\n";
+
+    // Tag
+
+    print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
+    print '<input type="hidden" name="tag" value="'.$tag.'">';
+    print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+    print '</td></tr>'."\n";
+
+    // Shipping address
+    $shipToName=$member->getFullName($langs);
+    $shipToStreet=$member->address;
+    $shipToCity=$member->town;
+    $shipToState=$member->state_code;
+    $shipToCountryCode=$member->country_code;
+    $shipToZip=$member->zip;
+    $shipToStreet2='';
+    $phoneNum=$member->phone;
+    if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
+    {
+        print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+        print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+        print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+        print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+        print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+        print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+        print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+        print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+    }
+    else
+    {
+        print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+    }
+    print '<input type="hidden" name="email" value="'.$member->email.'">'."\n";
+    print '<input type="hidden" name="desc" value="'.$langs->trans("PaymentSubscription").'">'."\n";
 }
 
 
 
-?>
+if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
 
-<!doctype html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title><?php echo $langs->trans('PaymentForm'); ?></title>
-    <link rel='stylesheet' type='text/css' href='css/style.css' />
-</head>
+if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
 
-<body>
-    <div class="invoice-box">		
-        <table cellpadding="0" cellspacing="0">
-            <tr class="top">
-                <td colspan="2">
-                    <table>
-                        <tr>
-                            <td class="title">                                
-								<?php 
-									if(empty($pay)):
-									print '<form  action="' . $_SERVER['REQUEST_URI'] . '" method="POST">';
-									print '<input type="hidden" name="action" value="charge" />';
-									
-								?>
-								  <script src="https://checkout.stripe.com/checkout.js" 
-										class="stripe-button"
-										data-key="<?php echo $stripe['publishable_key']; ?>"
-										data-amount="<?php echo $ttc; ?>"
-										data-currency="<?php echo $conf->currency; ?>"
-										data-description="<?php echo 'Invoice payment N: '.$ref; ?>">
-									</script>
-								</form>
-								<?php endif; ?>
-                            </td>
-                            
-                            <td>
-                                <?php echo $langs->trans("Invoice") . ' : ' . $invoice->ref; ?><br>
-                                <?php echo $langs->trans('Date') . ' : ' . dol_print_date($invoice->date, 'day'); ?><br>
-                                <?php echo $langs->trans('DateMaxPayment') . ' : ' . dol_print_date($invoice->date_validation, 'day'); ?>
-                            </td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-            
-            <tr class="information">
-                <td colspan="2">
-                    <table>
-                        <tr>
-                            <td>
-                                <?php echo $invoice->thirdparty->name; ?><br>
-                                <?php echo $invoice->thirdparty->address; ?><br>
-								<?php echo $invoice->thirdparty->zip . ', ' . $invoice->thirdparty->town .' '. $invoice->thirdparty->country_code ; ?>
-                            </td>
-                            
-                            <td>
-                               
-                            </td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-            
-            <tr class="heading">
-                <td>
-                    <?php echo $langs->trans('PaymentConditionsShort'); ?>
-                </td>
-                
-                <td>
-                    <?php echo $form->form_conditions_reglement('', $invoice->cond_reglement_id, 'none'); ?>
-                </td>
-            </tr>
-            
-            
-            <tr class="heading">
-                <td>
-                    TOTAL
-                </td>
-                
-                <td>
-                </td>
-            </tr>
-            
-            <tr class="item">
-                <td>
-                   <?php echo $langs->trans('AmountHT'); ?>
-                </td>
-                
-                <td>
-                    <?php echo price($invoice->total_ht, 1, '', 1, - 1, - 1, $conf->currency); ?>
-                </td>
-            </tr>
-            
-            <tr class="item">
-                <td>
-                    <?php echo $langs->trans('AmountVAT'); ?>
-                </td>
-                
-                <td>
-                    <?php echo price($invoice->total_tva, 1, '', 1, - 1, - 1, $conf->currency); ?>
-                </td>
-            </tr>
-            
-            <tr class="item last">
-                <td>
-                    <?php echo $langs->trans('AmountTTC'); ?>
-                </td>
-                
-                <td>
-                   <?php echo price($invoice->total_ttc, 1, '', 1, - 1, - 1, $conf->currency); ?>
-                </td>
-            </tr>
-            
-            <tr class="total">
-                <td></td>
-                
-                <td>
-                   Total: <?php echo price($invoice->total_ttc, 1, '', 1, - 1, - 1, $conf->currency); ?>
-                </td>
-            </tr>
-			
-			
-        </table>
-		<?php //var_dump($mysoc); ?>
-		
-		<span class="center">
-			<?php html_print_stripe_footer($mysoc,$langs); ?>
-		</span>
-		
-		<?php //echo var_dump($mysoc); ?>
-		
+print '</table>'."\n";
+print "\n";
+
+
+if ($action != 'dopayment')
+{
+    if ($found && ! $error)	// We are in a management option and no error
+    {
+        print '<br><input class="button" type="submit" name="dopayment_stripe" value="'.$langs->trans("StripeDoPayment").'">';
+    }
+    else
+    {
+        dol_print_error_email('ERRORNEWPAYMENTSTRIPE');
+    }
+}
+
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
+
+
+// Add more content on page for some services
+if (preg_match('/^dopayment/',$action))
+{
+    // Simple checkout
+    /*
+     print '<script src="https://checkout.stripe.com/checkout.js"
+     class="stripe-button"
+     data-key="'.$stripe['publishable_key'].'"
+     data-amount="'.$ttc.'"
+     data-currency="'.$conf->currency.'"
+     data-description="'.$ref.'">
+     </script>';
+     */
+    
+    // Personalized checkout
+    print '<style>
+    /**
+     * The CSS shown here will not be introduced in the Quickstart guide, but shows
+     * how you can use CSS to style your Element s container.
+     */
+    .StripeElement {
+        background-color: white;
+        padding: 8px 12px;
+        border-radius: 4px;
+        border: 1px solid transparent;
+        box-shadow: 0 1px 3px 0 #e6ebf1;
+        -webkit-transition: box-shadow 150ms ease;
+        transition: box-shadow 150ms ease;
+    }
+    
+    .StripeElement--focus {
+        box-shadow: 0 1px 3px 0 #cfd7df;
+    }
+    
+    .StripeElement--invalid {
+        border-color: #fa755a;
+    }
+    
+    .StripeElement--webkit-autofill {
+        background-color: #fefde5 !important;
+    }
+    </style>';
+    
+    print '
+    
+    <br>
+    <form action="'.$_SERVER['REQUEST_URI'].'" method="POST" id="payment-form">';
+
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+    print '<input type="hidden" name="dopayment_stripe" value="1">'."\n";
+    print '<input type="hidden" name="action" value="charge">'."\n";
+    print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
+    print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
+    print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
+    print '<input type="hidden" name="entity" value="'.$entity.'" />';
+        
+    print '
+    <table id="dolpaymenttable" summary="Payment form" class="center">
+    <tbody><tr><td class="textpublicpayment">
+                    
+    <div class="form-row left">
+    <label for="card-element">
+    Credit or debit card
+    </label>
+    <div id="card-element">
+    <!-- a Stripe Element will be inserted here. -->
     </div>
+    
+    <!-- Used to display form errors -->
+    <div id="card-errors" role="alert"></div>
+    </div>
+    <br>
+    <button>'.$langs->trans("ToPay").'</button>
+    
+    </td></tr></tbody></table>
+        
+    </form>
 
-</body>
-</html>
+        
+    <script src="https://js.stripe.com/v2/"></script>
+    <script src="https://js.stripe.com/v3/"></script>
+    
+    <script type="text/javascript" language="javascript">';
+    ?>
+    
+        // Create a Stripe client
+        var stripe = Stripe('<?php echo $stripe['publishable_key']; ?>');
+        
+        // Create an instance of Elements
+        var elements = stripe.elements();
+        
+        // Custom styling can be passed to options when creating an Element.
+        // (Note that this demo uses a wider set of styles than the guide below.)
+        var style = {
+          base: {
+            color: '#32325d',
+            lineHeight: '24px',
+            fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
+            fontSmoothing: 'antialiased',
+            fontSize: '16px',
+            '::placeholder': {
+              color: '#aab7c4'
+            }
+          },
+          invalid: {
+            color: '#fa755a',
+            iconColor: '#fa755a'
+          }
+        };
+        
+        // Create an instance of the card Element
+        var card = elements.create('card', {style: style});
+        
+        // Add an instance of the card Element into the `card-element` <div>
+        card.mount('#card-element');
+        
+        // Handle real-time validation errors from the card Element.
+        card.addEventListener('change', function(event) {
+          var displayError = document.getElementById('card-errors');
+          if (event.error) {
+            displayError.textContent = event.error.message;
+          } else {
+            displayError.textContent = '';
+          }
+        });
+        
+        // Handle form submission
+        var form = document.getElementById('payment-form');
+        console.log(form);
+        form.addEventListener('submit', function(event) {
+          event.preventDefault();
+        
+          stripe.createToken(card).then(function(result) {
+            if (result.error) {
+              // Inform the user if there was an error
+              var errorElement = document.getElementById('card-errors');
+              errorElement.textContent = result.error.message;
+            } else {
+              // Send the token to your server
+              stripeTokenHandler(result.token);
+            }
+          });
+        });
+        
+        function stripeTokenHandler(token) {
+          // Insert the token ID into the form so it gets submitted to the server
+          var form = document.getElementById('payment-form');
+          var hiddenInput = document.createElement('input');
+          hiddenInput.setAttribute('type', 'hidden');
+          hiddenInput.setAttribute('name', 'stripeToken');
+          hiddenInput.setAttribute('value', token.id);
+          form.appendChild(hiddenInput);
+        
+          // Submit the form
+          console.log("submit");
+          form.submit();
+        }        
+    
+    <?php
+        print '</script>';    
+}
 
 
 
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
+
+llxFooter('', 'public');
+
+$db->close();
 
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 3dd238b2f1d..484b7537755 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -47,15 +47,15 @@ if ($action == 'setvalue' && $user->admin)
 
     $result=dolibarr_set_const($db, "STRIPE_LIVE",GETPOST('STRIPE_LIVE','alpha'),'chaine',0,'',$conf->entity);
     if (! $result > 0) $error++;
-	$result=dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY",GETPOST('STRIPE_TEST_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_TEST_PUBLISHABLE_KEY",GETPOST('STRIPE_TEST_PUBLISHABLE_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
-	$result=dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY",GETPOST('STRIPE_LIVE_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
+	$result=dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY",GETPOST('STRIPE_TEST_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_LIVE_PUBLISHABLE_KEY",GETPOST('STRIPE_LIVE_PUBLISHABLE_KEY','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "STRIPE_CREDITOR",GETPOST('STRIPE_CREDITOR','alpha'),'chaine',0,'',$conf->entity);
+	$result=dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY",GETPOST('STRIPE_LIVE_SECRET_KEY','alpha'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_CREDITOR",GETPOST('STRIPE_CREDITOR','alpha'),'chaine',0,'',$conf->entity);
     if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "STRIPE_CSS_URL",GETPOST('STRIPE_CSS_URL','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
@@ -97,15 +97,15 @@ if ($action=="setlive")
 
 $form=new Form($db);
 
-$SECRET_TEST_KEY="sk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test secret key
-if (empty($conf->global->STRIPE_TEST_SECRET_KEY)) $conf->global->STRIPE_TEST_SECRET_KEY = $SECRET_TEST_KEY;
-$PUBLISHABLE_TEST_KEY="pk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test publishable key
-if (empty($conf->global->STRIPE_TEST_PUBLISHABLE_KEY)) $conf->global->STRIPE_TEST_PUBLISHABLE_KEY = $PUBLISHABLE_TEST_KEY;
+//$SECRET_TEST_KEY="sk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test secret key
+//if (empty($conf->global->STRIPE_TEST_SECRET_KEY)) $conf->global->STRIPE_TEST_SECRET_KEY = $SECRET_TEST_KEY;
+//$PUBLISHABLE_TEST_KEY="pk_test_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe test publishable key
+//if (empty($conf->global->STRIPE_TEST_PUBLISHABLE_KEY)) $conf->global->STRIPE_TEST_PUBLISHABLE_KEY = $PUBLISHABLE_TEST_KEY;
 
-$SECRET_LIVE_KEY="sk_live_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe live secret key
-if (empty($conf->global->STRIPE_LIVE_SECRET_KEY)) $conf->global->STRIPE_LIVE_SECRET_KEY = $SECRET_LIVE_KEY;
-$PUBLISHABLE_LIVE_KEY="pk_live_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe live publishable key
-if (empty($conf->global->STRIPE_LIVE_PUBLISHABLE_KEY)) $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY = $PUBLISHABLE_LIVE_KEY;
+//$SECRET_LIVE_KEY="sk_live_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe live secret key
+//if (empty($conf->global->STRIPE_LIVE_SECRET_KEY)) $conf->global->STRIPE_LIVE_SECRET_KEY = $SECRET_LIVE_KEY;
+//$PUBLISHABLE_LIVE_KEY="pk_live_xxxxxxxxxxxxxxxxxxxxxxxx"; // Stripe live publishable key
+//if (empty($conf->global->STRIPE_LIVE_PUBLISHABLE_KEY)) $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY = $PUBLISHABLE_LIVE_KEY;
 
 llxHeader('',$langs->trans("StripeSetup"));
 
@@ -145,30 +145,30 @@ else
 }
 print '</td></tr>';
 
-print '<tr class="oddeven"><td>';
-print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
-print '<input size="32" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
-print '<br>'.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
-print '</td></tr>';
-
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
-print '<input size="32" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
+print '<input class="minwidth300" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
 print '<br>'.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
-print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
-print '<input size="32" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
-print '<br>'.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
+print '<input class="minwidth300" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
+print '<br>'.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
-print '<input size="32" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
+print '<input class="minwidth300" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
 print '<br>'.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
+print '<tr class="oddeven"><td>';
+print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
+print '<input class="minwidth300" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
+print '<br>'.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+print '</td></tr>';
+
 print '</table>';
 
 print '<br>';
diff --git a/htdocs/public/stripe/config.php b/htdocs/stripe/config.php
similarity index 82%
rename from htdocs/public/stripe/config.php
rename to htdocs/stripe/config.php
index dfd0ea6aa1a..0cc15c7fb60 100644
--- a/htdocs/public/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -17,21 +17,22 @@
  */
 
 /**
-*  \file       stripe/config.php
+*  \file       htdocs/public/stripe/config.php
 *  \ingroup    Stripe
 *  \brief      Page to move config in api
 */
 
-require '../../main.inc.php';
-
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
 
+global $stripe;
+global $conf;
+
 //use \includes\stripe as stripe;
 $stripe = array();
 
-if(empty($conf->global->SKYPE_LIVE))
+if (empty($conf->global->SKYPE_LIVE))
 {
 	$stripe = array(
 		"secret_key"      => $conf->global->STRIPE_TEST_SECRET_KEY,
@@ -46,4 +47,7 @@ else
 	);	
 }
 
-\includes\stripe::setApiKey($stripe['secret_key']);
\ No newline at end of file
+require_once DOL_DOCUMENT_ROOT."/includes/stripe/lib/Stripe.php";
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
+\Stripe\Stripe::setApiKey($stripe['secret_key']);

From 143c019905e571321feb4fa7a385cc82aa9d6e85 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 14 May 2017 08:07:34 +0200
Subject: [PATCH 0814/1163] Fix : Sql error on salaries index for accountancy
 multijournal + debug

---
 htdocs/compta/bank/card.php                   | 51 +++++++------------
 htdocs/compta/bank/class/account.class.php    |  2 +-
 htdocs/compta/salaries/index.php              | 15 ++++--
 .../core/class/html.formaccounting.class.php  |  4 +-
 4 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 804d2c5511d..5c9fcf7802a 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -101,7 +101,8 @@ if ($action == 'add')
 
 	$account_number 		 = GETPOST('account_number','alpha');
 	if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
-	$object->fk_accountancy_journal  = trim($_POST["fk_accountancy_journal"]);
+	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal','int');
+	if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
 
     $object->solde           = $_POST["solde"];
     $object->date_solde      = dol_mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
@@ -199,7 +200,8 @@ if ($action == 'update')
 
 	$account_number 		 = GETPOST('account_number', 'int');
 	if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
-	$object->fk_accountancy_journal = trim($_POST["fk_accountancy_journal"]);
+	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal','int');
+	if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
 
     $object->currency_code   = trim($_POST["account_currency_code"]);
 
@@ -502,35 +504,20 @@ if ($action == 'create')
 
 	print '<table class="border" width="100%">';
 	// Accountancy code
-    if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED))
-    {
-		if (! empty($conf->accounting->enabled))
-		{
-			print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
-			print '<td>';
-			print $formaccountancy->select_account($object->account_number, 'account_number', 1, '', 1, 1);
-			print '</td></tr>';
-		}
-		else
-		{
-			print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
-			print '<td colspan="3"><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number', 'alpha'):$object->account_number).'"></td></tr>';
-		}
+	$fieldrequired='';
+    if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired='fieldrequired '; 
+    
+	if (! empty($conf->accounting->enabled))
+	{
+		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
+		print '<td>';
+		print $formaccountancy->select_account($object->account_number, 'account_number', 1, '', 1, 1);
+		print '</td></tr>';
 	}
-    else
-    {
-		if (! empty($conf->accounting->enabled))
-		{
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
-			print '<td>';
-			print $formaccountancy->select_account($object->account_number, 'account_number', 1, '', 1, 1);
-			print '</td></tr>';
-		}
-		else
-		{
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
-			print '<td colspan="3"><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number', 'alpha'):$object->account_number).'"></td></tr>';
-		}
+	else
+	{
+		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
+		print '<td colspan="3"><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number', 'alpha'):$object->account_number).'"></td></tr>';
 	}
 
 	// Accountancy journal
@@ -538,7 +525,7 @@ if ($action == 'create')
 	{
 		print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 	    print '<td>';
-		print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 1, 1);
+		print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
 		print '</td></tr>';
 	}
 
@@ -994,7 +981,7 @@ else
 		{
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
-			print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 1, 1);
+			print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
 			print '</td></tr>';
 		}
 		
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 9fdd329fd3d..2a615ad4b69 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1259,7 +1259,7 @@ class Account extends CommonObject
             include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
             $langs->load("accountancy");
             $label .= '<br><b>' . $langs->trans('AccountAccounting') . ':</b> ' . length_accountg($this->account_number);
-            $label .= '<br><b>' . $langs->trans('AccountancyJournal') . ':</b> ' . $this->fk_accountancy_journal;
+            $label .= '<br><b>' . $langs->trans('AccountancyJournal') . ':</b> ' . $this->accountancy_journal;
         }
         $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 597b8aabad0..5e78a070796 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -26,6 +26,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
 $langs->load("compta");
 $langs->load("salaries");
@@ -94,7 +95,7 @@ $accountstatic = new Account($db);
 
 $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.salary as current_salary, u.fk_soc as fk_soc,";
 $sql.= " s.rowid, s.fk_user, s.amount, s.salary, s.label, s.datep as datep, s.datev as datev, s.fk_typepayment as type, s.num_payment, s.fk_bank,";
-$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.accountancy_journal, ba.label as blabel,";
+$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel,";
 $sql.= " pst.code as payment_code";
 $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON s.fk_typepayment = pst.id";
@@ -236,8 +237,16 @@ if ($result)
 	            $accountstatic->id=$obj->bid;
 	            $accountstatic->ref=$obj->bref;
 	            $accountstatic->number=$obj->bnumber;
-	            $accountstatic->accountancy_number=$obj->account_number;
-	            $accountstatic->accountancy_journal=$obj->accountancy_journal;
+				
+				if (! empty($conf->accounting->enabled))
+				{
+					$accountstatic->account_number=$obj->account_number;
+					
+					$accountingjournal = new AccountingJournal($db);
+					$accountingjournal->fetch($obj->fk_accountancy_journal);
+
+					$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+				}
 	            $accountstatic->label=$obj->blabel;
 	        	print $accountstatic->getNomUrl(1);
 	        }
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index a87b566d0d6..97f31f05e99 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2016 		Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2016-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -121,7 +121,7 @@ class FormAccounting extends Form
 			}
 		}
 
-		$out .= Form::selectarray($htmlname, $options, $select, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		return $out;
 	}

From 9b550ae178a57901884cf1a72f898cf6e9717f8f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 May 2017 12:54:26 +0200
Subject: [PATCH 0815/1163] Fix migration of accountancy_journal from char to
 num.

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   | 38 +++++++++++--------
 .../mysql/tables/llx_bank_account.key.sql     |  3 +-
 htdocs/public/stripe/newpayment.php           |  4 +-
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index bf28e6a3db6..7572e0d2030 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -117,17 +117,33 @@ CREATE TABLE llx_product_attribute_combination
   entity INT DEFAULT 1 NOT NULL
 );
 
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Journal des ventes', 1, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Journal des achats', 2, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Journal de banque', 3, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Journal des opérations diverses', 0, 1);
-INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Journal des à-nouveaux', 9, 1);
 
-ALTER TABLE llx_accounting_journal ADD COLUMN entity integer DEFAULT 1;
+ALTER TABLE llx_bank_account drop foreign key bank_fk_accountancy_journal;
+
+-- Add journal entries
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Sale journal', 2, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Purchase journal', 3, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Bank journal', 4, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Other journal', 1, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Has new journal', 9, 1);
+-- Fix old entries
+UPDATE llx_accounting_journal SET nature = 1 where code = 'OD' and nature = 0;
+UPDATE llx_accounting_journal SET nature = 2 where code = 'VT' and nature = 1;
+UPDATE llx_accounting_journal SET nature = 3 where code = 'AC' and nature = 2;
+UPDATE llx_accounting_journal SET nature = 4 where (code = 'BK' or code = 'BQ') and nature = 3;
+
+UPDATE llx_bank_account as ba set accountancy_journal = 'BQ' where accountancy_journal = 'BK';
+UPDATE llx_bank_account as ba set accountancy_journal = 'OD' where accountancy_journal IS NULL;
+
+ALTER TABLE llx_bank_account ADD COLUMN fk_accountancy_journal integer;
+ALTER TABLE llx_bank_account ADD INDEX idx_fk_accountancy_journal (fk_accountancy_journal);
+
+UPDATE llx_bank_account as ba set fk_accountancy_journal = (SELECT rowid FROM llx_accounting_journal as aj where ba.accountancy_journal = aj.code) where accountancy_journal not in ('1', '2', '3', '4', '5', '6', '5', '8', '9', '10', '11', '12', '13', '14', '15');
+ALTER TABLE llx_bank_account ADD CONSTRAINT fk_bank_account_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
+
 
 ALTER TABLE llx_paiementfourn ADD COLUMN model_pdf varchar(255);
 
-
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203);
@@ -262,14 +278,6 @@ insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type
 
 ALTER TABLE llx_events MODIFY COLUMN ip varchar(250);
 
-UPDATE llx_accounting_journal SET nature = 1 where code = 'OD' and nature = 0;
-UPDATE llx_accounting_journal SET nature = 2 where code = 'VT' and nature = 1;
-UPDATE llx_accounting_journal SET nature = 3 where code = 'AC' and nature = 2;
-UPDATE llx_accounting_journal SET nature = 4 where (code = 'BK' or code = 'BQ') and nature = 3;
-
-
-ALTER TABLE llx_bank_account CHANGE COLUMN accountancy_journal fk_accountancy_journal integer;
---ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
 
 
 
diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql
index 986ca7ea550..c5f2786fd24 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.key.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql
@@ -19,5 +19,6 @@
 
 
 ALTER TABLE llx_bank_account ADD UNIQUE uk_bank_account_label (label,entity);
+ALTER TABLE llx_bank_account ADD INDEX idx_fk_accountancy_journal (fk_accountancy_journal);
 
--- ALTER TABLE llx_bank_account ADD CONSTRAINT bank_fk_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
+ALTER TABLE llx_bank_account ADD CONSTRAINT fk_bank_account_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 95f0f9f2134..7578be73745 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -537,14 +537,14 @@ if (GETPOST("source") == 'invoice')
     {
         $result=$invoice->fetch_thirdparty($invoice->socid);
     }
-    
+
     if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
     {
         $amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
     $fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
     //$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
     if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }

From 8e68aa86acd2297ed4f1bff6487dde4f9be83c1e Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Sun, 14 May 2017 15:17:40 +0200
Subject: [PATCH 0816/1163] problems with additionnal template type

If i active my new xml templater, and keep odt, the odt folder is added on folder to scan on my xml path
ex :
odt folder defined : c:\toto
xml folder defined : c:\tata

folder scanned with odt :  c:\toto
folder scanned with odt :  c:\toto,c:\tata
---
 htdocs/core/lib/functions2.lib.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index b36da631635..2f46ad49b80 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1530,8 +1530,10 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
                 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
                 $const=$obj->description;
-                $dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
-                $listoffiles=array();
+                //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
+                $dirtoscan= preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
+
+		$listoffiles=array();
 
                 // Now we add models found in directories scanned
                 $listofdir=explode(',',$dirtoscan);
@@ -2111,4 +2113,4 @@ function cartesianArray(array $input) {
     }
 
     return $result;
-}
\ No newline at end of file
+}

From 998254d9c6426bd22980b6ccb332012650f43f8f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 May 2017 16:17:00 +0200
Subject: [PATCH 0817/1163] Finish rewrite and debug of module Stripe.

---
 htdocs/core/modules/modStripe.class.php |   2 +-
 htdocs/langs/en_US/paypal.lang          |   9 +-
 htdocs/langs/en_US/stripe.lang          |   1 +
 htdocs/public/paybox/paymentko.php      | 110 ++++++++-----
 htdocs/public/paybox/paymentok.php      |  12 +-
 htdocs/public/payment/newpayment.php    |   2 +-
 htdocs/public/payment/paymentko.php     | 165 ++++++++++++++------
 htdocs/public/payment/paymentok.php     |  80 ++++++++--
 htdocs/public/paypal/paymentko.php      | 103 ++++++------
 htdocs/public/paypal/paymentok.php      |  27 ++--
 htdocs/public/stripe/newpayment.php     |  81 ++++++++--
 htdocs/public/stripe/paymentko.php      | 165 ++++++++++++++++++++
 htdocs/public/stripe/paymentok.php      | 199 ++++++++++++++++++++++++
 htdocs/stripe/admin/stripe.php          |  20 ++-
 htdocs/stripe/lib/stripe.lib.php        |   1 +
 15 files changed, 781 insertions(+), 196 deletions(-)
 create mode 100644 htdocs/public/stripe/paymentko.php
 create mode 100644 htdocs/public/stripe/paymentok.php

diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 4f4b15fa0a4..e7e20be5b83 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -65,7 +65,7 @@ class modStripe extends DolibarrModules
         $this->picto='stripe@stripe';
 
         // Data directories to create when module is enabled.
-        $this->dirs = array('/stripe/temp');
+        $this->dirs = array();
 
         // Config pages. Put here list of php page names stored in admmin directory used to setup module.
         $this->config_page_url = array("stripe.php@stripe");
diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang
index 3c699527018..63999f31234 100644
--- a/htdocs/langs/en_US/paypal.lang
+++ b/htdocs/langs/en_US/paypal.lang
@@ -16,15 +16,16 @@ ThisIsTransactionId=This is id of transaction: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
 PredefinedMailContentLink=You can click on the secure link below to make your payment (PayPal) if it is not already done.\n\n%s\n\n
 YouAreCurrentlyInSandboxMode=You are currently in the "sandbox" mode
-NewPaypalPaymentReceived=New Paypal payment received
-NewPaypalPaymentFailed=New Paypal payment tried but failed
+NewOnlinePaymentReceived=New online payment received
+NewOnlinePaymentFailed=New online payment tried but failed
 PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
 ReturnURLAfterPayment=Return URL after payment
-ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed 
-PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed
+ValidationOfOnlinePaymentFailed=Validation of online payment failed 
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
 SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
 DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
 DetailedErrorMessage=Detailed Error Message
 ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
+OnlinePaymentSystem=Online payment system
\ No newline at end of file
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 3f85dc2d544..68b853ac25b 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -9,6 +9,7 @@ ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=This is information on payment to do
 ToComplete=To complete
 YourEMail=Email to receive payment confirmation
+STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
 Creditor=Creditor
 PaymentCode=Payment code
 StripeDoPayment=Go on payment
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index be5b388f6ed..9cc8a07ea70 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -20,7 +20,6 @@
  *     	\file       htdocs/public/paybox/paymentko.php
  *		\ingroup    paybox
  *		\brief      File to show page after a failed payment
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -52,6 +51,8 @@ $langs->load("stripe");
 
 $object = new stdClass();   // For triggers
 
+$paymentmethod='paybox';
+
 
 /*
  * Actions
@@ -72,51 +73,74 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
 
 
-// Appel des triggers
-include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-$interface=new Interfaces($db);
-$result=$interface->run_triggers('PAYBOX_PAYMENT_OK',$object,$user,$langs,$conf);
-if ($result < 0) { $error++; $errors=$interface->errors; }
-// Fin appel triggers
-
-
-// Send an email
-if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
+if (! empty($_SESSION['ipaddress']))      // To avoid to make action twice
 {
-	$sendto=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
-	$from=$conf->global->MAILING_EMAIL_FROM;
-
-	// Define link to login card
-	$appli=constant('DOL_APPLICATION_TITLE');
-	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-	{
-	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-	    if (preg_match('/\d\.\d/', $appli))
-	    {
-	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-	    }
-	    else $appli.=" ".DOL_VERSION;
-	}
-	else $appli.=" ".DOL_VERSION;
-	
-	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentFailed");
-	$content=$langs->transnoentitiesnoconv("NewPayboxPaymentFailed")."\n".$fulltag;
-	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	$mailfile = new CMailFile($topic, $sendto, $from, $content);
-
-	$result=$mailfile->sendfile();
-	if ($result)
-	{
-		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
-	}
-	else
-	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
-	}
+    // Get on url call
+    $fulltag            = $FULLTAG;
+    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
+    // Set by newpayment.php
+    $paymentType        = $_SESSION['PaymentType'];
+    $currencyCodeType   = $_SESSION['currencyCodeType'];
+    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+    // From env
+    $ipaddress          = $_SESSION['ipaddress'];
+    
+    // Appel des triggers
+    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    $interface=new Interfaces($db);
+    $result=$interface->run_triggers('PAYBOX_PAYMENT_OK',$object,$user,$langs,$conf);
+    if ($result < 0) { $error++; $errors=$interface->errors; }
+    // Fin appel triggers
+    
+    // Send an email
+    $sendemail = '';
+    if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))  $sendemail=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
+    
+    if ($sendemail)
+    {
+    	$sendto=$sendemail;
+    	$from=$conf->global->MAILING_EMAIL_FROM;
+    
+    	// Define link to login card
+    	$appli=constant('DOL_APPLICATION_TITLE');
+    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+    	{
+    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+    	    if (preg_match('/\d\.\d/', $appli))
+    	    {
+    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    	    }
+    	    else $appli.=" ".DOL_VERSION;
+    	}
+    	else $appli.=" ".DOL_VERSION;
+    	
+    	$urlback=$_SERVER["REQUEST_URI"];
+    	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentFailed");
+    	$content="";
+    	$content.=$langs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."\n";
+    	$content.="\n";
+    	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+    	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
+    	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
+    	$content.="tag=".$fulltag."\npaymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+    	$mailfile = new CMailFile($topic, $sendto, $from, $content);
+    	
+    	$result=$mailfile->sendfile();
+    	if ($result)
+    	{
+    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
+    	}
+    	else
+    	{
+    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
+    	}
+    }
+    
+    unset($_SESSION['ipaddress']);
 }
 
-
 $head='';
 if (! empty($conf->global->PAYBOX_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->PAYBOX_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 0e91189e242..b59034b774e 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -20,7 +20,6 @@
  *     	\file       htdocs/public/paybox/paymentok.php
  *		\ingroup    paybox
  *		\brief      File to show page after a successful payment
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -62,6 +61,8 @@ if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 $object = new stdClass();   // For triggers
 
+$paymentmethod='paybox';
+
 
 /*
  * Actions
@@ -97,7 +98,7 @@ print '<div id="dolpaymentdiv" align="center">'."\n";
 
 // Get on url call
 /*
-$token              = $PAYBOXTOKEN;
+$onlinetoken              = $PAYBOXTOKEN;
 */
 $fulltag            = $FULLTAG;
 /*$payerID            = $PAYBOXPAYERID;
@@ -108,7 +109,7 @@ $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
 // From env
 $ipaddress          = $_SESSION['ipaddress'];
 
-dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
+dol_syslog("Call newpaymentok with token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
 */
 
 
@@ -149,7 +150,7 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 	else $appli.=" ".DOL_VERSION;
 	
 	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentReceived");
+	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
 	$tmptag=dolExplodeIntoArray($fulltag,'.','=');
 	$content="";
 	if (! empty($tmptag['MEM']))
@@ -162,10 +163,11 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 	}
 	else
 	{
-		$content.=$langs->transnoentitiesnoconv("NewPayboxPaymentReceived")."<br>\n";
+		$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
 	}
 	$content.="<br>\n";
 	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+    $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
 	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
 	$content.="tag=".$fulltag."<br>\n";
 
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 744f477782e..788321b6212 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -114,7 +114,7 @@ $ref=$REF=GETPOST('ref','alpha');
 $TAG=GETPOST("tag",'alpha');
 $FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
 $SECUREKEY=GETPOST("securekey");	        // Secure key
-if ($paymentmethod) $FULLTAG.=($FULLTAG?'.':'').'PM='.$paymentmethod;
+if ($paymentmethod && ! preg_match('/'.preg_quote('PM='.$paymentmethod,'/').'/', $FULLTAG)) $FULLTAG.=($FULLTAG?'.':'').'PM='.$paymentmethod;
 
 if (! empty($SOURCE))
 {
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 6ce1c3badfa..9abcfcf2c58 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -23,7 +23,6 @@
  *		\brief      File to show page after a failed payment.
  *                  This page is called by payment system with url provided to it competed with parameter TOKEN=xxx
  *                  This token can be used to get more informations.
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -53,16 +52,40 @@ $langs->load("companies");
 $langs->load("paybox");
 $langs->load("paypal");
 
-$PAYPALTOKEN=GETPOST('TOKEN');
-if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
-$PAYPALPAYERID=GETPOST('PAYERID');
-if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
+if (! empty($conf->paypal->enabled))
+{
+    $PAYPALTOKEN=GETPOST('TOKEN');
+    if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
+    $PAYPALPAYERID=GETPOST('PAYERID');
+    if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
+}
+// TODO Other payment method
+
 $FULLTAG=GETPOST('FULLTAG');
 if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
+
+// Detect $paymentmethod
+$paymentmethod='';
+if (preg_match('/PM=([^\.]+)/', $FULLTAG, $reg))
+{
+    $paymentmethod=$reg[1];
+}
+if (empty($paymentmethod))
+{
+    dol_print_error(null, 'The back url does not contains a parameter fulltag that should help us to find the payment method used');
+    exit;
+}
+else
+{
+    dol_syslog("paymentmethod=".$paymentmethod);
+}
+
+
 $validpaymentmethod=array();
 if (! empty($conf->paypal->enabled)) $validpaymentmethod['paypal']='paypal';
 if (! empty($conf->paybox->enabled)) $validpaymentmethod['paybox']='paybox';
+if (! empty($conf->stripe->enabled)) $validpaymentmethod['stripe']='stripe';
 
 
 // Security check
@@ -90,50 +113,94 @@ foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
 
 
-// Appel des triggers
-include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-$interface=new Interfaces($db);
-$result=$interface->run_triggers('PAYMENTONLINE_PAYMENT_KO',$object,$user,$langs,$conf);
-if ($result < 0) { $error++; $errors=$interface->errors; }
-// Fin appel triggers
-
-
-// Send an email
-if (! empty($conf->paypal->enabled))
+if (! empty($_SESSION['ipaddress']))      // To avoid to make action twice
 {
-	if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
-	{
-	    // Get on url call
-	    $token              = $PAYPALTOKEN;
-	    $fulltag            = $FULLTAG;
-	    $payerID            = $PAYPALPAYERID;
-	    // Set by newpayment.php
-	    $paymentType        = $_SESSION['PaymentType'];
-	    $currencyCodeType   = $_SESSION['currencyCodeType'];
-	    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
-	    // From env
-	    $ipaddress          = $_SESSION['ipaddress'];
-	    
-	    
-		$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
-		$from=$conf->global->MAILING_EMAIL_FROM;
-	
-		$urlback=$_SERVER["REQUEST_URI"];
-		$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentFailed");
-		$content=$langs->transnoentitiesnoconv("NewPaypalPaymentFailed")."\ntag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-		$mailfile = new CMailFile($topic, $sendto, $from, $content);
-	
-		$result=$mailfile->sendfile();
-		if ($result)
-		{
-			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-		}
-		else
-		{
-			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
-		}
-	}
+    // Get on url call
+    $fulltag            = $FULLTAG;
+    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
+    // Set by newpayment.php
+    $paymentType        = $_SESSION['PaymentType'];
+    $currencyCodeType   = $_SESSION['currencyCodeType'];
+    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+    // From env
+    $ipaddress          = $_SESSION['ipaddress'];
+        
+    // Appel des triggers
+    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    $interface=new Interfaces($db);
+    $result=$interface->run_triggers('PAYMENTONLINE_PAYMENT_KO',$object,$user,$langs,$conf);
+    if ($result < 0) { $error++; $errors=$interface->errors; }
+    // Fin appel triggers
+    
+    // Send an email
+    $sendemail = '';
+    if (! empty($conf->paypal->enabled))
+    {
+    	if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
+    	{
+            $sendemail = $conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+    	}
+    }
+    // Send an email
+    if (! empty($conf->paybox->enabled))
+    {
+        if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
+        {
+            $sendemail = $conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
+        }
+    }
+    // Send an email
+    if (! empty($conf->stripe->enabled))
+    {
+        if (! empty($conf->global->STRIPE_PAYONLINE_SENDEMAIL))
+        {
+            $sendemail = $conf->global->STRIPE_PAYONLINE_SENDEMAIL;
+        }
+    }
+    
+    if ($sendemail)
+    {
+        $from=$conf->global->MAILING_EMAIL_FROM;
+        $sendto=$sendemail;
+        
+    	// Define link to login card
+    	$appli=constant('DOL_APPLICATION_TITLE');
+    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+    	{
+    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+    	    if (preg_match('/\d\.\d/', $appli))
+    	    {
+    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    	    }
+    	    else $appli.=" ".DOL_VERSION;
+    	}
+    	else $appli.=" ".DOL_VERSION;
+    	
+    	$urlback=$_SERVER["REQUEST_URI"];
+    	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentFailed");
+    	$content="";
+    	$content.=$langs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."\n";
+    	$content.="\n";
+    	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+    	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
+    	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
+    	$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+    	$mailfile = new CMailFile($topic, $sendto, $from, $content);
+    
+    	$result=$mailfile->sendfile();
+    	if ($result)
+    	{
+    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+    	}
+    	else
+    	{
+    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+    	}
+    }
+    
+    unset($_SESSION['ipaddress']);
 }
 
 $head='';
@@ -150,7 +217,7 @@ print '<span id="dolpaymentspan"></span>'."\n";
 print '<div id="dolpaymentdiv" align="center">'."\n";
 print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
 
-if (! empty($conf->global->PAYPAL_MESSAGE_KO)) print $conf->global->PAYPAL_MESSAGE_KO;
+if (! empty($conf->global->PAYMENT_MESSAGE_KO)) print $conf->global->PAYMENT_MESSAGE_KO;
 print "\n</div>\n";
 
 
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index c1b4329c7be..26022dcd4f8 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -23,7 +23,6 @@
  *		\brief      File to show page after a successful payment
  *                  This page is called by payment system with url provided to it completed with parameter TOKEN=xxx
  *                  This token can be used to get more informations.
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -88,10 +87,10 @@ if (! empty($conf->paypal->enabled))
     if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
     $PAYPALPAYERID=GETPOST('PAYERID');
     if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-    $FULLTAG=GETPOST('FULLTAG');
-    if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 }
 
+$FULLTAG=GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 $source=GETPOST('source');
 $ref=GETPOST('ref');
 
@@ -116,6 +115,7 @@ else
 $validpaymentmethod=array();
 if (! empty($conf->paypal->enabled)) $validpaymentmethod['paypal']='paypal';
 if (! empty($conf->paybox->enabled)) $validpaymentmethod['paybox']='paybox';
+if (! empty($conf->stripe->enabled)) $validpaymentmethod['stripe']='stripe';
 
 // Security check
 if (empty($validpaymentmethod)) accessforbidden('', 0, 0, 1);
@@ -169,7 +169,7 @@ if (! empty($conf->paypal->enabled))
 	if ($PAYPALTOKEN)
 	{
 	    // Get on url call
-	    $token              = $PAYPALTOKEN;
+	    $onlinetoken              = $PAYPALTOKEN;
 	    $fulltag            = $FULLTAG;
 	    $payerID            = $PAYPALPAYERID;
 	    // Set by newpayment.php
@@ -179,17 +179,17 @@ if (! empty($conf->paypal->enabled))
 	    // From env
 	    $ipaddress          = $_SESSION['ipaddress'];
 	
-		dol_syslog("Call paymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
+		dol_syslog("Call paymentok with token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
 	
 		// Validate record
 	    if (! empty($paymentType))
 	    {
 	        dol_syslog("We call GetExpressCheckoutDetails", LOG_DEBUG, 0, '_payment');
-	        $resArray=getDetails($token);
+	        $resArray=getDetails($onlinetoken);
 	        //var_dump($resarray);
 	
-	        dol_syslog("We call DoExpressCheckoutPayment token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_payment');
-	        $resArray=confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
+	        dol_syslog("We call DoExpressCheckoutPayment token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_payment');
+	        $resArray=confirmPayment($onlinetoken, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
 	
 	        $ack = strtoupper($resArray["ACK"]);
 	        if ($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
@@ -233,6 +233,17 @@ if (! empty($conf->paypal->enabled))
 
 if ($ispaymentok)
 {
+    // Get on url call
+    $fulltag            = $FULLTAG;
+    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
+    // Set by newpayment.php
+    $paymentType        = $_SESSION['PaymentType'];
+    $currencyCodeType   = $_SESSION['currencyCodeType'];
+    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+    // From env
+    $ipaddress          = $_SESSION['ipaddress'];
+    
     // Appel des triggers
     include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
     $interface=new Interfaces($db);
@@ -250,6 +261,7 @@ if ($ispaymentok)
     // TODO Remove local option to keep only the generic one ?
     if ($paymentmethod == 'paypal' && ! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
     if ($paymentmethod == 'paybox' && ! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
+    if ($paymentmethod == 'stripe' && ! empty($conf->global->STRIPE_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->STRIPE_PAYONLINE_SENDEMAIL;
     
 	// Send an email
     if ($sendemail)
@@ -261,8 +273,21 @@ if ($ispaymentok)
 		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
+		// Define link to login card
+		$appli=constant('DOL_APPLICATION_TITLE');
+		if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+		{
+		    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+		    if (preg_match('/\d\.\d/', $appli))
+		    {
+		        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+		    }
+		    else $appli.=" ".DOL_VERSION;
+		}
+		else $appli.=" ".DOL_VERSION;
+		
 		$urlback=$_SERVER["REQUEST_URI"];
-		$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentReceived");
+		$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
 		$tmptag=dolExplodeIntoArray($fulltag,'.','=');
 		$content="";
 		if (! empty($tmptag['MEM']))
@@ -279,9 +304,9 @@ if ($ispaymentok)
 		}
 		$content.="<br>\n";
 		$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-		$content.=$langs->transnoentitiesnoconv("PaymentSystem").': '.$paymentmethod."<br>\n";
+		$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
 		$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-		$content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+		$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
 
 		$ishtml=dol_textishtml($content);	// May contain urls
 
@@ -301,6 +326,17 @@ if ($ispaymentok)
 }
 else
 {
+    // Get on url call
+    $fulltag            = $FULLTAG;
+    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
+    // Set by newpayment.php
+    $paymentType        = $_SESSION['PaymentType'];
+    $currencyCodeType   = $_SESSION['currencyCodeType'];
+    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+    // From env
+    $ipaddress          = $_SESSION['ipaddress'];
+    
     // Appel des triggers
     include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
     $interface=new Interfaces($db);
@@ -322,6 +358,7 @@ else
     // TODO Remove local option to keep only the generic one ?
     if ($paymentmethod == 'paypal' && ! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
     if ($paymentmethod == 'paybox' && ! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
+    if ($paymentmethod == 'stripe' && ! empty($conf->global->STRIPE_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->STRIPE_PAYONLINE_SENDEMAIL;
     
     // Send an email
     if ($sendemail)
@@ -333,15 +370,28 @@ else
         $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
         //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
          
+        // Define link to login card
+        $appli=constant('DOL_APPLICATION_TITLE');
+        if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+        {
+            $appli=$conf->global->MAIN_APPLICATION_TITLE;
+            if (preg_match('/\d\.\d/', $appli))
+            {
+                if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+            }
+            else $appli.=" ".DOL_VERSION;
+        }
+        else $appli.=" ".DOL_VERSION;
+        
         $urlback=$_SERVER["REQUEST_URI"];
-        $topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("ValidationOfPaypalPaymentFailed");
+        $topic='['.$appli.'] '.$langs->transnoentitiesnoconv("ValidationOfPaymentFailed");
         $content="";
-        $content.=$langs->transnoentitiesnoconv("PaypalConfirmPaymentPageWasCalledButFailed")."\n";
+        $content.=$langs->transnoentitiesnoconv("PaymentSystemConfirmPaymentPageWasCalledButFailed")."\n";
         $content.="\n";
         $content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
-		$content.=$langs->transnoentitiesnoconv("PaymentSystem").': '.$paymentmethod."<br>\n";
+		$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."\n";
         $content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-        $content.="tag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+        $content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
          
         $ishtml=dol_textishtml($content);	// May contain urls
          
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index e432db2e317..a4e3c0a83ca 100644
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -23,7 +23,6 @@
  *		\brief      File to show page after a failed payment.
  *                  This page is called by paypal with url provided to payal competed with parameter TOKEN=xxx
  *                  This token can be used to get more informations.
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -63,6 +62,8 @@ if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 $object = new stdClass();   // For triggers
 
+$paymentmethod='paypal';
+
 
 /*
  * Actions
@@ -81,61 +82,73 @@ $tracepost = "";
 foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
 
-
-// Appel des triggers
-include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-$interface=new Interfaces($db);
-$result=$interface->run_triggers('PAYPAL_PAYMENT_KO',$object,$user,$langs,$conf);
-if ($result < 0) { $error++; $errors=$interface->errors; }
-// Fin appel triggers
-
-
-// Send an email
-if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
+if (! empty($_SESSION['ipaddress']))      // To avoid to make action twice
 {
     // Get on url call
-    $token              = $PAYPALTOKEN;
     $fulltag            = $FULLTAG;
-    $payerID            = $PAYPALPAYERID;
+    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
     // Set by newpayment.php
     $paymentType        = $_SESSION['PaymentType'];
     $currencyCodeType   = $_SESSION['currencyCodeType'];
     $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
     // From env
     $ipaddress          = $_SESSION['ipaddress'];
+        
+    // Appel des triggers
+    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    $interface=new Interfaces($db);
+    $result=$interface->run_triggers('PAYPAL_PAYMENT_KO',$object,$user,$langs,$conf);
+    if ($result < 0) { $error++; $errors=$interface->errors; }
+    // Fin appel triggers
     
+    // Send an email
+    $sendemail = '';
+    if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))  $sendemail=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
     
-	$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
-	$from=$conf->global->MAILING_EMAIL_FROM;
-
-	// Define link to login card
-	$appli=constant('DOL_APPLICATION_TITLE');
-	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-	{
-	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-	    if (preg_match('/\d\.\d/', $appli))
-	    {
-	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-	    }
-	    else $appli.=" ".DOL_VERSION;
-	}
-	else $appli.=" ".DOL_VERSION;
-	
-	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentFailed");
-	$content=$langs->transnoentitiesnoconv("NewPaypalPaymentFailed")."\ntag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	$mailfile = new CMailFile($topic, $sendto, $from, $content);
-
-	$result=$mailfile->sendfile();
-	if ($result)
-	{
-		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paypal');
-	}
-	else
-	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paypal');
-	}
+    if ($sendemail)
+    {
+    	$sendto=$sendemail;
+    	$from=$conf->global->MAILING_EMAIL_FROM;
+    
+    	// Define link to login card
+    	$appli=constant('DOL_APPLICATION_TITLE');
+    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+    	{
+    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+    	    if (preg_match('/\d\.\d/', $appli))
+    	    {
+    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    	    }
+    	    else $appli.=" ".DOL_VERSION;
+    	}
+    	else $appli.=" ".DOL_VERSION;
+    	
+    	$urlback=$_SERVER["REQUEST_URI"];
+    	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentFailed");
+    	$content="";
+    	$content.=$langs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."\n";
+    	$content.="\n";
+    	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+    	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
+    	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
+    	$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+    
+    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+    	$mailfile = new CMailFile($topic, $sendto, $from, $content);
+    
+    	$result=$mailfile->sendfile();
+    	if ($result)
+    	{
+    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paypal');
+    	}
+    	else
+    	{
+    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paypal');
+    	}
+    }
+    
+    unset($_SESSION['ipaddress']);
 }
 
 
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index e3f2ed201e5..d98a6085e3e 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -23,7 +23,6 @@
  *		\brief      File to show page after a successful payment
  *                  This page is called by paypal with url provided to payal completed with parameter TOKEN=xxx
  *                  This token can be used to get more informations.
- *		\author	    Laurent Destailleur
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -94,6 +93,8 @@ if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
 
 $object = new stdClass();   // For triggers
 
+$paymentmethod='paypal';
+
 
 /*
  * Actions
@@ -128,7 +129,7 @@ print '<div id="dolpaymentdiv" align="center">'."\n";
 if ($PAYPALTOKEN)
 {
     // Get on url call
-    $token              = $PAYPALTOKEN;
+    $onlinetoken        = $PAYPALTOKEN;
     $fulltag            = $FULLTAG;
     $payerID            = $PAYPALPAYERID;
     // Set by newpayment.php
@@ -138,18 +139,18 @@ if ($PAYPALTOKEN)
     // From env
     $ipaddress          = $_SESSION['ipaddress'];
 
-	dol_syslog("Call paymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
+	dol_syslog("Call paymentok with token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
 
 
 	// Validate record
     if (! empty($paymentType))
     {
         dol_syslog("We call GetExpressCheckoutDetails", LOG_DEBUG, 0, '_paypal');
-        $resArray=getDetails($token);
+        $resArray=getDetails($onlinetoken);
         //var_dump($resarray);
 
-        dol_syslog("We call DoExpressCheckoutPayment token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
-        $resArray=confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
+        dol_syslog("We call DoExpressCheckoutPayment token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
+        $resArray=confirmPayment($onlinetoken, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
 
         $ack = strtoupper($resArray["ACK"]);
         if($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
@@ -202,7 +203,7 @@ if ($PAYPALTOKEN)
 				else $appli.=" ".DOL_VERSION;
 				
 				$urlback=$_SERVER["REQUEST_URI"];
-				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewPaypalPaymentReceived");
+				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
 				$tmptag=dolExplodeIntoArray($fulltag,'.','=');
 				$content="";
 				if (! empty($tmptag['MEM']))
@@ -215,12 +216,13 @@ if ($PAYPALTOKEN)
 				}
 				else
 				{
-					$content.=$langs->transnoentitiesnoconv("NewPaypalPaymentReceived")."<br>\n";
+					$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
 				}
 				$content.="<br>\n";
 				$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+                $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
 				$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-				$content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+				$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
 
 				$ishtml=dol_textishtml($content);	// May contain urls
 
@@ -285,13 +287,14 @@ if ($PAYPALTOKEN)
 				else $appli.=" ".DOL_VERSION;
 				
 				$urlback=$_SERVER["REQUEST_URI"];
-				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("ValidationOfPaypalPaymentFailed");
+				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("ValidationOfPaymentFailed");
 				$content="";
-				$content.=$langs->transnoentitiesnoconv("PaypalConfirmPaymentPageWasCalledButFailed")."\n";
+				$content.=$langs->transnoentitiesnoconv("PaymentSystemConfirmPaymentPageWasCalledButFailed")."\n";
 				$content.="\n";
 				$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+                $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."\n";
 				$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-				$content.="tag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+				$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
 
 				$ishtml=dol_textishtml($content);	// May contain urls
 
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 7578be73745..5975d349fe4 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -98,7 +98,7 @@ $ref=$REF=GETPOST('ref','alpha');
 $TAG=GETPOST("tag",'alpha');
 $FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
 $SECUREKEY=GETPOST("securekey");	        // Secure key
-$FULLTAG.=($FULLTAG?'.':'').'PM=stripe';
+if (! preg_match('/'.preg_quote('PM=stripe','/').'/', $FULLTAG)) $FULLTAG.=($FULLTAG?'.':'').'PM=stripe';
 
 if (! empty($SOURCE))
 {
@@ -185,7 +185,7 @@ if (! empty($conf->global->STRIPE_SECURITY_TOKEN))
  * Actions
  */
 
-if ($action == 'dopayment')    // We click on button Create payment that lead on this page
+if ($action == 'dopayment')    // We click on button Create payment
 {
     if (GETPOST('newamount')) $amount = GETPOST('newamount');
     else 
@@ -197,25 +197,37 @@ if ($action == 'dopayment')    // We click on button Create payment that lead on
 
 if ($action == 'charge')
 {
-    dol_syslog("POST keys  : ".join(',', array_keys($_POST)));
-    dol_syslog("POST values: ".join(',', $_POST));
+    // Correct the amount according to unit of currency
+    // See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
+    $arrayzerounitcurrency=array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
+    if (! in_array($currency, $arrayzerounitcurrency)) $amount=$amount * 100;
     
-    $token = GETPOST("stripeToken");
-    $email = GETPOST("stripeEmail");
+    dol_syslog("POST keys  : ".join(',', array_keys($_POST)), LOG_DEBUG, 0, '_stripe');
+    dol_syslog("POST values: ".join(',', $_POST), LOG_DEBUG, 0, '_stripe');
+    
+    $stripeToken = GETPOST("stripeToken",'alpha');
+    $email = GETPOST("stripeEmail",'alpha');
 
+    dol_syslog("stripeToken = ".$stripeToken, LOG_DEBUG, 0, '_stripe');
+    dol_syslog("stripeEmail = ".$stripeEmail, LOG_DEBUG, 0, '_stripe');
+    
+    $error = 0;
+    
     try {
+        dol_syslog("Create customer", LOG_DEBUG, 0, '_stripe');
         $customer = \Stripe\Customer::create(array(
             'email' => $email,
-            'card'  => $token
+            'card'  => $stripeToken
             // TODO
         ));
          
+        dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
         $charge = \Stripe\Charge::create(array(
             'customer' => $customer->id,
             'amount'   => price2num($amount, 'MU'),
-            'currency' => $conf->currency,
-            // TODO
-            'description' => 'Invoice payment N: '.$ref
+            'currency' => $currency,
+            'description' => 'Stripe payment: '.$FULLTAG,
+            'statement_descriptor' => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 6, 'right', 'UTF-8', 1).' '.$FULLTAG, 22, 'right', 'UTF-8', 1)     // 22 chars
         ));
     } catch(\Stripe\Error\Card $e) {
         // Since it's a decline, \Stripe\Error\Card will be caught
@@ -229,39 +241,73 @@ if ($action == 'charge')
         print('Param is:' . $err['param'] . "\n");
         print('Message is:' . $err['message'] . "\n");
     
+        $error++;
         setEventMessages($e->getMessage(), null, 'errors');
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
         $action='';
     } catch (\Stripe\Error\RateLimit $e) {
         // Too many requests made to the API too quickly
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
         setEventMessages($e->getMessage(), null, 'errors');
         $action='';
     } catch (\Stripe\Error\InvalidRequest $e) {
         // Invalid parameters were supplied to Stripe's API
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
         setEventMessages($e->getMessage(), null, 'errors');
         $action='';
     } catch (\Stripe\Error\Authentication $e) {
         // Authentication with Stripe's API failed
         // (maybe you changed API keys recently)
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
         setEventMessages($e->getMessage(), null, 'errors');
         $action='';
     } catch (\Stripe\Error\ApiConnection $e) {
         // Network communication with Stripe failed
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
         setEventMessages($e->getMessage(), null, 'errors');
         $action='';
     } catch (\Stripe\Error\Base $e) {
         // Display a very generic error to the user, and maybe send
         // yourself an email
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
         setEventMessages($e->getMessage(), null, 'errors');
         $action='';
     } catch (Exception $e) {
         // Something else happened, completely unrelated to Stripe
+        $error++;
+        dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
         setEventMessages($e->getMessage(), null, 'errors');
         $action='';
     }
         
-    // TODO
-    dol_syslog("Action  Pay.");
+	$_SESSION["onlinetoken"] = $stripeToken;
+    $_SESSION["FinalPaymentAmt"] = $amount;
+    $_SESSION["currencyCodeType"] = $currency;
+    $_SESSION["paymentType"] = '';
+    $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR'];  // Payer ip
+    $_SESSION['payerID'] = is_object($customer)?$customer->id:'';
+    $_SESSION['TRANSACTIONID'] = is_object($charge)?$charge->id:'';
     
+    dol_syslog("Action charge stripe result=".$error." ip=".$_SESSION['ipaddress'], LOG_DEBUG, 0, '_stripe');
+    dol_syslog("onlinetoken=".$_SESSION["onlinetoken"]." FinalPaymentAmt=".$_SESSION["FinalPaymentAmt"]." currencyCodeType=".$_SESSION["currencyCodeType"]." payerID=".$_SESSION['payerID']." TRANSACTIONID=".$_SESSION['TRANSACTIONID'], LOG_DEBUG, 0, '_stripe');
+    dol_syslog("FULLTAG=".$FULLTAG, LOG_DEBUG, 0, '_stripe');
+    dol_syslog("Now call the redirect to paymentok or paymentko", LOG_DEBUG, 0, '_stripe');
+    
+    if ($error)
+    {
+        header("Location: ".DOL_URL_ROOT.'/public/stripe/paymentko.php?FULLTAG='.urlencode($FULLTAG));
+        exit;
+    }
+    else
+    {
+        header("Location: ".DOL_URL_ROOT.'/public/stripe/paymentok.php?FULLTAG='.urlencode($FULLTAG));
+        exit;
+    }
     
 }
 
@@ -1046,11 +1092,16 @@ if (preg_match('/^dopayment/',$action))
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
     print '<input type="hidden" name="dopayment_stripe" value="1">'."\n";
     print '<input type="hidden" name="action" value="charge">'."\n";
-    print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
-    print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
+    print '<input type="hidden" name="tag" value="'.$TAG.'">'."\n";
+    print '<input type="hidden" name="source" value="'.$SOURCE.'">'."\n";
+    print '<input type="hidden" name="ref" value="'.$REF.'">'."\n";
+    print '<input type="hidden" name="fulltag" value="'.$FULLTAG.'">'."\n";
+    print '<input type="hidden" name="suffix" value="'.$suffix.'">'."\n";
     print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
     print '<input type="hidden" name="entity" value="'.$entity.'" />';
-        
+    print '<input type="hidden" name="amount" value="'.$amount.'">'."\n";
+    print '<input type="hidden" name="currency" value="'.$currency.'">'."\n";
+    
     print '
     <table id="dolpaymenttable" summary="Payment form" class="center">
     <tbody><tr><td class="textpublicpayment">
diff --git a/htdocs/public/stripe/paymentko.php b/htdocs/public/stripe/paymentko.php
new file mode 100644
index 00000000000..01000939b37
--- /dev/null
+++ b/htdocs/public/stripe/paymentko.php
@@ -0,0 +1,165 @@
+<?php
+/* Copyright (C) 2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/stripe/paymentko.php
+ *		\ingroup    core
+ *		\brief      File to show page after a failed payment.
+ *                  This page is called by payment system with url provided to it competed with parameter FULLTAG=xxx
+ *                  More data like token are saved into session. This token can be used to get more informations.
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("paybox");
+$langs->load("paypal");
+$langs->load("stripe");
+
+$FULLTAG=GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
+
+// Security check
+if (empty($conf->stripe->enabled)) accessforbidden('',0,0,1);
+
+$object = new stdClass();   // For triggers
+
+$paymentmethod='stripe';
+
+
+/*
+ * Actions
+ */
+
+
+
+
+/*
+ * View
+ */
+
+dol_syslog("Callback url when a PayPal payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_stripe');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_stripe');
+
+if (! empty($_SESSION['ipaddress']))      // To avoid to make action twice
+{
+    $fulltag            = $FULLTAG;
+    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
+    $currencyCodeType   = $_SESSION['currencyCodeType'];
+    $paymentType        = $_SESSION['paymentType'];
+    $FinalPaymentAmt    = $_SESSION['FinalPaymentAmt'];
+    $ipaddress          = $_SESSION['ipaddress'];
+    
+    // Appel des triggers
+    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    $interface=new Interfaces($db);
+    $result=$interface->run_triggers('STRIPE_PAYMENT_KO',$object,$user,$langs,$conf);
+    if ($result < 0) { $error++; $errors=$interface->errors; }
+    // Fin appel triggers
+    
+    // Send an email
+    $sendemail = '';
+    if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))  $sendemail=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+    
+    if ($sendemail)
+    {
+        // Get on url call
+    	$sendto=$sendemail;
+    	$from=$conf->global->MAILING_EMAIL_FROM;
+    
+    	// Define link to login card
+    	$appli=constant('DOL_APPLICATION_TITLE');
+    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+    	{
+    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+    	    if (preg_match('/\d\.\d/', $appli))
+    	    {
+    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    	    }
+    	    else $appli.=" ".DOL_VERSION;
+    	}
+    	else $appli.=" ".DOL_VERSION;
+    	
+    	$urlback=$_SERVER["REQUEST_URI"];
+    	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentFailed");
+    	$content="";
+    	$content.=$langs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."\n";
+    	$content.="\n";
+    	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
+    	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."\n";
+    	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
+    	$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+    	$mailfile = new CMailFile($topic, $sendto, $from, $content);
+    
+    	$result=$mailfile->sendfile();
+    	if ($result)
+    	{
+    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_stripe');
+    	}
+    	else
+    	{
+    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_stripe');
+    	}
+    }
+
+    unset($_SESSION['ipaddress']);
+}
+
+$head='';
+if (! empty($conf->global->STRIPE_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->STRIPE_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
+
+
+// Show ko message
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div id="dolpaymentdiv" align="center">'."\n";
+print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
+
+if (! empty($conf->global->STRIPE_MESSAGE_KO)) print $conf->global->STRIPE_MESSAGE_KO;
+print "\n</div>\n";
+
+
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
+
+
+llxFooter('', 'public');
+
+$db->close();
diff --git a/htdocs/public/stripe/paymentok.php b/htdocs/public/stripe/paymentok.php
new file mode 100644
index 00000000000..4eede2e9544
--- /dev/null
+++ b/htdocs/public/stripe/paymentok.php
@@ -0,0 +1,199 @@
+<?php
+/* Copyright (C) 2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/stripe/paymentok.php
+ *		\ingroup    core
+ *		\brief      File to show page after a successful payment
+ *                  This page is called by payment system with url provided to it completed with parameter FULLTAG=xxx
+ *                  More data like token are saved into session. This token can be used to get more informations.
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("paybox");
+$langs->load("paypal");
+
+$FULLTAG=GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
+$source=GETPOST('source');
+$ref=GETPOST('ref');
+
+// Security check
+if (empty($conf->stripe->enabled)) accessforbidden('', 0, 0, 1);
+
+
+$ispaymentok = false;
+// If payment is ok
+$PAYMENTSTATUS=$TRANSACTIONID=$TAXAMT=$NOTE='';
+// If payment is ko
+$ErrorCode=$ErrorShortMsg=$ErrorLongMsg=$ErrorSeverityCode='';
+
+
+$object = new stdClass();   // For triggers
+
+$paymentmethod='stripe';
+
+
+/*
+ * Actions
+ */
+
+
+
+/*
+ * View
+ */
+
+dol_syslog("Callback url when a payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_stripe');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_stripe');
+
+$head='';
+if (! empty($conf->global->STRIPE_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->STRIPE_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
+
+
+
+// Show message
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div id="dolpaymentdiv" align="center">'."\n";
+
+$ispaymentok = true;    // We call this page if payment is ok
+if ($ispaymentok)
+{
+    // Get on url call
+    $fulltag            = $FULLTAG;
+    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
+    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
+    // Set by newpayment.php
+    $paymentType        = $_SESSION['PaymentType'];
+    $currencyCodeType   = $_SESSION['currencyCodeType'];
+    $FinalPaymentAmt    = $_SESSION["Payment_Amount"];
+    // From env
+    $ipaddress          = $_SESSION['ipaddress'];
+    $TRANSACTIONID      = $_SESSION['TRANSACTIONID'];
+
+    // Appel des triggers
+    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    $interface=new Interfaces($db);
+    $result=$interface->run_triggers('STRIPE_PAYMENT_OK',$object,$user,$langs,$conf);
+    if ($result < 0) { $error++; $errors=$interface->errors; }
+    // Fin appel triggers
+
+    
+    print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
+    print $langs->trans("ThisIsTransactionId",$TRANSACTIONID)."<br><br>\n";
+    if (! empty($conf->global->STRIPE_MESSAGE_OK)) print $conf->global->STRIPE_MESSAGE_OK;
+    
+    $sendemail = '';
+    if (! empty($conf->global->STRIPE_PAYONLINE_SENDEMAIL)) $sendemail=$conf->global->STRIPE_PAYONLINE_SENDEMAIL;
+    
+	// Send an email
+    if ($sendemail)
+	{
+		$sendto=$sendemail;
+		$from=$conf->global->MAILING_EMAIL_FROM;
+		// Define $urlwithroot
+		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+    	// Define link to login card
+    	$appli=constant('DOL_APPLICATION_TITLE');
+    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+    	{
+    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+    	    if (preg_match('/\d\.\d/', $appli))
+    	    {
+    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    	    }
+    	    else $appli.=" ".DOL_VERSION;
+    	}
+    	else $appli.=" ".DOL_VERSION;
+    	
+    	$urlback=$_SERVER["REQUEST_URI"];
+		$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
+		$tmptag=dolExplodeIntoArray($fulltag,'.','=');
+		$content="";
+		if (! empty($tmptag['MEM']))
+		{
+			$langs->load("members");
+			$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
+			$content.=$langs->trans("PaymentSubscription")."<br>\n";
+			$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
+			$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
+		}
+		else
+		{
+			$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
+		}
+		$content.="<br>\n";
+		$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+		$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
+		$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
+		$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+
+		$ishtml=dol_textishtml($content);	// May contain urls
+
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+
+		$result=$mailfile->sendfile();
+		if ($result)
+		{
+			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_stripe');
+		}
+		else
+		{
+			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_stripe');
+		}
+	}
+}
+
+
+print "\n</div>\n";
+
+
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
+
+
+llxFooter('', 'public');
+
+$db->close();
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 484b7537755..6ca9073a9df 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -63,6 +63,8 @@ if ($action == 'setvalue' && $user->admin)
     if (! $result > 0) $error++;
     $result=dolibarr_set_const($db, "STRIPE_MESSAGE_KO",GETPOST('STRIPE_MESSAGE_KO','alpha'),'chaine',0,'',$conf->entity);
 	if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "STRIPE_PAYONLINE_SENDEMAIL",GETPOST('STRIPE_PAYONLINE_SENDEMAIL'),'chaine',0,'',$conf->entity);
+	if (! $result > 0) $error++;
 	
     if (! $error)
   	{
@@ -148,25 +150,25 @@ print '</td></tr>';
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
-print '<br>'.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
+print ' &nbsp; '.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
-print '<br>'.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
+print ' &nbsp; '.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
-print '<br>'.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+print ' &nbsp; '.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
 print '<input class="minwidth300" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
-print '<br>'.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+print ' &nbsp; '.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
 print '</td></tr>';
 
 print '</table>';
@@ -182,13 +184,13 @@ print "</tr>\n";
 print '<tr class="oddeven"><td>';
 print $langs->trans("VendorName").'</td><td>';
 print '<input size="64" type="text" name="STRIPE_CREDITOR" value="'.$conf->global->STRIPE_CREDITOR.'">';
-print '<br>'.$langs->trans("Example").': '.$mysoc->name;
+print ' &nbsp; '.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="STRIPE_CSS_URL" value="'.$conf->global->STRIPE_CSS_URL.'">';
-print '<br>'.$langs->trans("Example").': http://mysite/mycss.css';
+print ' &nbsp; '.$langs->trans("Example").': http://mysite/mycss.css';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
@@ -203,6 +205,12 @@ $doleditor=new DolEditor('STRIPE_MESSAGE_KO',$conf->global->STRIPE_MESSAGE_KO,''
 $doleditor->Create();
 print '</td></tr>';
 
+print '<tr class="oddeven"><td>';
+print $langs->trans("STRIPE_PAYONLINE_SENDEMAIL").'</td><td>';
+print '<input size="32" type="email" name="STRIPE_PAYONLINE_SENDEMAIL" value="'.$conf->global->STRIPE_PAYONLINE_SENDEMAIL.'">';
+print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com';
+print '</td></tr>';
+
 print '</table>';
 
 dol_fiche_end();
diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
index 5f0b1bd0404..fbafd47c3ab 100644
--- a/htdocs/stripe/lib/stripe.lib.php
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -73,6 +73,7 @@ function showStripePaymentUrl($type,$ref)
     $out.=img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
     $url=getStripePaymentUrl(0,$type,$ref);
     $out.='<input type="text" id="stripeurl" class="quatrevingtpercent" value="'.$url.'"><br>';
+    $out.=ajax_autoselect("stripeurl", 0);
     return $out;
 }
 

From caae7e41718a23491ea6b78f8100b52e6a0dcf9f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 May 2017 17:05:13 +0200
Subject: [PATCH 0818/1163] NEW It's easier to switch between sandbox and live
 for paypal

---
 htdocs/langs/en_US/paypal.lang      |  3 ++-
 htdocs/langs/en_US/stripe.lang      |  2 +-
 htdocs/paypal/admin/paypal.php      | 35 +++++++++++++++++++++++------
 htdocs/public/paypal/newpayment.php |  2 +-
 htdocs/public/stripe/newpayment.php |  7 +++---
 htdocs/stripe/admin/stripe.php      |  1 +
 6 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang
index 63999f31234..a0cadc88096 100644
--- a/htdocs/langs/en_US/paypal.lang
+++ b/htdocs/langs/en_US/paypal.lang
@@ -28,4 +28,5 @@ DetailedErrorMessage=Detailed Error Message
 ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
 ErrorSeverityCode=Error Severity Code
-OnlinePaymentSystem=Online payment system
\ No newline at end of file
+OnlinePaymentSystem=Online payment system
+PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
\ No newline at end of file
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 68b853ac25b..c115a76603c 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -39,4 +39,4 @@ STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_LIVE_SECRET_KEY=Secret live key
 STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-StripeLiveEnabled=Stripe live enabled
\ No newline at end of file
+StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
\ No newline at end of file
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 36c8df9d0d6..2d0be83c80d 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -44,8 +44,6 @@ if ($action == 'setvalue' && $user->admin)
 {
 	$db->begin();
 	
-    $result=dolibarr_set_const($db, "PAYPAL_API_SANDBOX",GETPOST('PAYPAL_API_SANDBOX','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
     $result=dolibarr_set_const($db, "PAYPAL_API_USER",GETPOST('PAYPAL_API_USER','alpha'),'chaine',0,'',$conf->entity);
     if (! $result > 0) $error++;
     $result=dolibarr_set_const($db, "PAYPAL_API_PASSWORD",GETPOST('PAYPAL_API_PASSWORD','alpha'),'chaine',0,'',$conf->entity);
@@ -85,6 +83,21 @@ if ($action == 'setvalue' && $user->admin)
     }
 }
 
+if ($action=="setlive")
+{
+    $liveenable = GETPOST('value','int')?0:1;
+    $res = dolibarr_set_const($db, "PAYPAL_API_SANDBOX", $liveenable,'yesno',0,'',$conf->entity);
+    if (! $res > 0) $error++;
+    if (! $error)
+    {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
+    }
+}
+
 
 /*
  *	View
@@ -127,13 +140,21 @@ print '<td>'.$langs->trans("AccountParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-
-print '<tr class="oddeven"><td class="fieldrequired">';
-print $langs->trans("PAYPAL_API_SANDBOX").'</td><td>';
-print $form->selectyesno("PAYPAL_API_SANDBOX",$conf->global->PAYPAL_API_SANDBOX,1);
+print '<tr class="oddeven">';
+print '<td class="titlefield fieldrequired">';
+print $langs->trans("PaypalLiveEnabled").'</td><td>';
+if (empty($conf->global->PAYPAL_API_SANDBOX))
+{
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
+}
+else
+{
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
+}
 print '</td></tr>';
 
-
 print '<tr class="oddeven"><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_USER").'</td><td>';
 print '<input size="32" type="text" name="PAYPAL_API_USER" value="'.$conf->global->PAYPAL_API_USER.'">';
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index c9cedcfd32d..08bf0c4faed 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -265,7 +265,7 @@ $conf->dol_hide_leftmenu=1;
 
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
-if (! empty($PAYPAL_API_SANDBOX))
+if (! empty($conf->global->PAYPAL_API_SANDBOX))
 {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
 }
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 5975d349fe4..64ea70cfbeb 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -49,6 +49,7 @@ $langs->load("main");
 $langs->load("companies");
 $langs->load("other");
 $langs->load("paybox");     // File with generic data
+$langs->load("paypal");
 $langs->load("stripe");
 
 $action=GETPOST('action','alpha');
@@ -300,12 +301,12 @@ if ($action == 'charge')
     
     if ($error)
     {
-        header("Location: ".DOL_URL_ROOT.'/public/stripe/paymentko.php?FULLTAG='.urlencode($FULLTAG));
+        header("Location: ".$urlko);
         exit;
     }
     else
     {
-        header("Location: ".DOL_URL_ROOT.'/public/stripe/paymentok.php?FULLTAG='.urlencode($FULLTAG));
+        header("Location: ".$urlok);
         exit;
     }
     
@@ -324,7 +325,7 @@ $conf->dol_hide_leftmenu=1;
 
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
-if (! empty($STRIPE_API_SANDBOX))
+if (empty($conf->global->STRIPE_LIVE))
 {
     dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
 }
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 6ca9073a9df..056e43690b2 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -93,6 +93,7 @@ if ($action=="setlive")
 	}
 }
 
+
 /*
  *	View
  */

From 93554b7e30d4b6d4830292a054cdf7154885f132 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 14 May 2017 21:06:33 +0200
Subject: [PATCH 0819/1163] Typo searchpicto

---
 htdocs/accountancy/admin/categories_list.php     | 4 ++--
 htdocs/accountancy/admin/journals_list.php       | 4 ++--
 htdocs/accountancy/admin/productaccount.php      | 4 ++--
 htdocs/accountancy/bookkeeping/balance.php       | 4 ++--
 htdocs/accountancy/bookkeeping/listbyaccount.php | 4 ++--
 htdocs/adherents/list.php                        | 4 ++--
 htdocs/adherents/subscription/list.php           | 4 ++--
 htdocs/admin/dict.php                            | 4 ++--
 htdocs/admin/tools/listevents.php                | 4 ++--
 htdocs/admin/translation.php                     | 4 ++--
 htdocs/comm/action/listactions.php               | 4 ++--
 htdocs/comm/mailing/cibles.php                   | 4 ++--
 htdocs/comm/mailing/list.php                     | 4 ++--
 htdocs/comm/propal/list.php                      | 4 ++--
 htdocs/commande/list.php                         | 4 ++--
 htdocs/compta/bank/bankentries.php               | 4 ++--
 htdocs/compta/bank/index.php                     | 4 ++--
 htdocs/compta/deplacement/list.php               | 4 ++--
 htdocs/compta/facture/fiche-rec.php              | 4 ++--
 htdocs/compta/facture/list.php                   | 4 ++--
 htdocs/compta/paiement/cheque/list.php           | 4 ++--
 htdocs/compta/paiement/list.php                  | 4 ++--
 htdocs/compta/prelevement/bons.php               | 4 ++--
 htdocs/compta/prelevement/demandes.php           | 4 ++--
 htdocs/compta/prelevement/list.php               | 4 ++--
 htdocs/compta/salaries/index.php                 | 4 ++--
 htdocs/compta/sociales/index.php                 | 4 ++--
 htdocs/compta/tva/reglement.php                  | 4 ++--
 htdocs/contrat/list.php                          | 4 ++--
 htdocs/contrat/services.php                      | 4 ++--
 htdocs/core/lib/company.lib.php                  | 4 ++--
 htdocs/don/list.php                              | 4 ++--
 htdocs/expedition/list.php                       | 4 ++--
 htdocs/expensereport/list.php                    | 4 ++--
 htdocs/fichinter/list.php                        | 4 ++--
 htdocs/fourn/commande/list.php                   | 4 ++--
 htdocs/fourn/facture/impayees.php                | 4 ++--
 htdocs/fourn/facture/list.php                    | 4 ++--
 htdocs/fourn/facture/paiement.php                | 4 ++--
 htdocs/holiday/list.php                          | 4 ++--
 htdocs/opensurvey/list.php                       | 4 ++--
 htdocs/product/list.php                          | 4 ++--
 htdocs/product/price.php                         | 4 ++--
 htdocs/product/reassort.php                      | 4 ++--
 htdocs/product/reassortlot.php                   | 4 ++--
 htdocs/projet/list.php                           | 4 ++--
 htdocs/projet/tasks.php                          | 4 ++--
 htdocs/resource/list.php                         | 4 ++--
 htdocs/societe/consumption.php                   | 4 ++--
 htdocs/societe/list.php                          | 4 ++--
 htdocs/societe/price.php                         | 4 ++--
 htdocs/supplier_proposal/list.php                | 4 ++--
 52 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 7b1eb44545a..86be6aa52ab 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -661,8 +661,8 @@ if ($id)
         print '<td class="liste_titre" align="center">';
     	if ($filterfound)
     	{
-        	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-        	print $searchpitco;
+        	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+        	print $searchpicto;
     	}
     	print '</td>';
     	print '</tr>';
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 0b13bfc7d4d..facb507c530 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -577,8 +577,8 @@ if ($id)
         print '<td class="liste_titre" align="center">';
     	if ($filterfound)
     	{
-        	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-        	print $searchpitco;
+        	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+        	print $searchpicto;
     	}
     	print '</td>';
     	print '</tr>';
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index dda7d545043..4f82db33e94 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -329,8 +329,8 @@ if ($result)
 	print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td align="center" class="liste_titre">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 	print '</tr>';
 	
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 5f4801da32c..9e5be25eb73 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -192,8 +192,8 @@ else {
     print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
     print '</td>';
     print '<td align="right" class="liste_titre">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-	print $searchpitco;
+	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
     print '</td>';
     
     print '</tr>';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 2323f3afcb8..eb8a53561d2 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -239,8 +239,8 @@ print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre" align="right"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
 print '<td class="liste_titre" align="right" colspan="2">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 
 print '<tr class="liste_titre">';
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 7a6013b9b78..37237b29073 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -560,8 +560,8 @@ if (! empty($arrayfields['d.statut']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="middle">';
-$searchpitco=$form->showFilterButtons();
-print $searchpitco;
+$searchpicto=$form->showFilterButtons();
+print $searchpicto;
 print '</td>';
 
 print "</tr>\n";
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 750ad483461..206f5ebf8c9 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -239,8 +239,8 @@ if ($result)
 	
     // Action column
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterButtons();
-    print $searchpitco;
+    $searchpicto=$form->showFilterButtons();
+    print $searchpicto;
     print '</td>';  
 
 	print "</tr>\n";
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 28e99d02606..46a8001b02a 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1188,8 +1188,8 @@ if ($id)
     	print '<td class="liste_titre" colspan="2" align="right">';
     	if ($filterfound)
     	{
-        	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-        	print $searchpitco;
+        	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+        	print $searchpicto;
     	}
     	print '</td>';
         print '</tr>';
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index f5e6afd36b1..47f4af17dcf 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -249,8 +249,8 @@ if ($result)
 	print '</td>';
 
 	print '<td align="right" class="liste_titre">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-	print $searchpitco;
+	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
 	print '</td>';
 
 	print "</tr>\n";
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 44387bc2041..c9488f919fe 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -421,8 +421,8 @@ if ($mode == 'searchkey')
     print '</td>';    
     // Action column
     print '<td class="liste_titre nowrap" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+    print $searchpicto;
     print '</td>';
     print '</tr>';
     
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 3e6224e0c41..232eb0fc9b1 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -361,8 +361,8 @@ if ($resql)
     print '</td>';
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 	print "</tr>\n";
 	
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 118cc336fb7..01924526c66 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -484,8 +484,8 @@ if ($object->fetch($id) >= 0)
 		print '</td>';
 		// Action column
 		print '<td class="liste_titre" align="right">';
-		$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-		print $searchpitco;
+		$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+		print $searchpicto;
 		print '</td>';
 		print '</tr>';
 		
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 8a9c01787d1..f5efbf54383 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -135,8 +135,8 @@ if ($result)
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre" align="right">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-	print $searchpitco;
+	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
 	print '</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 3595d871c72..ac5cee3bebc 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -696,8 +696,8 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 	
 	print "</tr>\n";
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 8cab07c9780..c73258cff89 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -989,8 +989,8 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 	
     print "</tr>\n";
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index 286836b0103..ed8241de427 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -797,8 +797,8 @@ if ($resql)
 	print '<td class="liste_titre" align="middle">';
 	print '</td>';
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-	print $searchpitco;
+	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	print $searchpicto;
     print '</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index f5d4fee1fc0..37883c29c0f 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -393,8 +393,8 @@ if (! empty($arrayfields['balance']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="middle">';
-$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+print $searchpicto;
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 95f4082e082..1cf976325ec 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -165,8 +165,8 @@ if ($resql)
     // print '<input class="flat" size="10" type="text" name="search_amount" value="'.$search_amount.'">';
     print '</td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
     print "</tr>\n";
 
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index acf97a3893a..bfede218eb8 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1769,8 +1769,8 @@ else
 			}
 			// Action column
 			print '<td class="liste_titre" align="middle">';
-			$searchpitco=$form->showFilterAndCheckAddButtons(0, 'checkforselect', 1);
-			print $searchpitco;
+			$searchpicto=$form->showFilterAndCheckAddButtons(0, 'checkforselect', 1);
+			print $searchpicto;
 			print '</td>';
 			print "</tr>\n";
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 5b01c445960..638ca033e1a 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -936,8 +936,8 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
     print '</td>';
     print "</tr>\n";
 
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index f1a9a839792..9798e2d28b4 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -175,8 +175,8 @@ if ($resql)
 	print '</td>';
 	print '<td class="liste_titre"></td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
     print "</tr>\n";
 
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index d0ba0373457..ab4189d5338 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -254,8 +254,8 @@ if ($resql)
     print '<input class="flat" type="text" size="4" name="search_amount" value="'.$search_amount.'">';
 	print '</td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
     if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
     {
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 973135765dc..7319de4a7bd 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -124,8 +124,8 @@ if ($result)
   print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_ref" value="'. $db->escape($search_ref).'"></td>';
   print '<td class="liste_titre">&nbsp;</td>';
   print '<td class="liste_titre" align="right">';
-  $searchpitco=$form->showFilterAndCheckAddButtons(0);
-  print $searchpitco;
+  $searchpicto=$form->showFilterAndCheckAddButtons(0);
+  print $searchpicto;
   print '</td>';
   print '</tr>';
 
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index c1c8bd7e929..e619b28e994 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -124,8 +124,8 @@ if ($resql)
 	print '<td class="liste_titre"></td>';
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-	print $searchpitco;
+	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	print $searchpicto;
 	print '</td>';
 	print '</tr>';
 
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 2fa8a255407..9b1f1ff461e 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -154,8 +154,8 @@ if ($result)
     print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
     print '</tr>';
 
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 5e78a070796..e193374a552 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -184,8 +184,8 @@ if ($result)
 	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
 
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
     
     print '<tr class="liste_titre">';
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index e76a6edc49a..50e14823a5f 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -202,8 +202,8 @@ if ($resql)
 		print '</td>';
 
         print '<td class="liste_titre" align="right">';
-        $searchpitco=$form->showFilterAndCheckAddButtons(0);
-        print $searchpitco;
+        $searchpicto=$form->showFilterAndCheckAddButtons(0);
+        print $searchpicto;
         print '</td>';
 		print "</tr>\n";
 
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 15a6df0a717..94895062bc3 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -182,8 +182,8 @@ if ($result)
     }
 	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 3bf4a45bb10..318a24931be 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -509,8 +509,8 @@ if ($resql)
         print '<td class="liste_titre" colspan="4" align="right"></td>';
     }
     print '<td class="liste_titre" align="middle">';
-    $searchpitco=$form->showFilterButtons();
-    print $searchpitco;
+    $searchpicto=$form->showFilterButtons();
+    print $searchpicto;
     print '</td>';
     print "</tr>\n";
     
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index d92bcd16679..f283502bc3e 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -503,8 +503,8 @@ if (! empty($arrayfields['status']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 print "</tr>\n";
 
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 6847cd7b9c2..3fef1265f9d 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1264,8 +1264,8 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         $out.='<td class="liste_titre"></td>';
         // Action column
         $out.='<td class="liste_titre" align="middle">';
-        $searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-        $out.=$searchpitco;
+        $searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+        $out.=$searchpicto;
         $out.='</td>';
         $out.='</tr>';
         
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index d271ea3e894..b0cd414ed28 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -183,8 +183,8 @@ if ($resql)
     print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
     print '<td class="liste_titre" align="right"></td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index bff7991fdeb..50454e3f253 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -421,8 +421,8 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-	print $searchpitco;
+	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
     print '</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 204115d8112..06998059aa5 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -461,8 +461,8 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 
 	print "</tr>\n";
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index b5a6bcb0e94..9963794fd9f 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -402,8 +402,8 @@ if ($resql)
 		print '</td>';
     }
 	print '<td class="liste_titre" align="right">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 	
     print "</tr>\n";
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 80a98cc5886..8ca86a1e6c5 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1019,8 +1019,8 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 
 	print "</tr>\n";
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 4538351b6ad..4ade0a6dbb0 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -216,8 +216,8 @@ if ($user->rights->fournisseur->facture->lire)
 		print '<input class="flat" type="text" size="8" name="search_amount_all_tax" value="'.$search_amount_all_tax.'">';
 		print '</td>';
         print '<td class="liste_titre" align="right">';
-        $searchpitco=$form->showFilterAndCheckAddButtons(0);
-        print $searchpitco;
+        $searchpicto=$form->showFilterAndCheckAddButtons(0);
+        print $searchpicto;
         print '</td>';
 		print "</tr>\n";
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 2924a40001a..9ad1bf63ce2 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -818,8 +818,8 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons('checkforselect', 0);
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons('checkforselect', 0);
+	print $searchpicto;
 	print '</td>';
 
 	print "</tr>\n";
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 5f1d8cd2d99..b6825e93d82 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -722,8 +722,8 @@ if (empty($action))
         print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
         print '</td>';
         print '<td class="liste_titre" align="right">';
-        $searchpitco=$form->showFilterAndCheckAddButtons(0);
-        print $searchpitco;
+        $searchpicto=$form->showFilterAndCheckAddButtons(0);
+        print $searchpicto;
         print '</td>';
         print "</tr>\n";
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index ab8a89670ae..063c3042e3b 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -373,8 +373,8 @@ print '</td>';
 
 // ACTION
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 
 print "</tr>\n";
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 203602bde6e..3f9411c9879 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -105,8 +105,8 @@ $arraystatus=array(''=>'&nbsp;','expired'=>$langs->trans("Expired"),'opened'=>$l
 print '<td class="liste_titre" align="center">'. $form->selectarray('status', $arraystatus, $status).'</td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 print '</tr>'."\n";
 
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index b779d4b7bfa..9d256f33831 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -611,8 +611,8 @@ else
 	            print '</td>';
     		}
             print '<td class="liste_titre" align="middle">';
-	        $searchpitco=$form->showFilterButtons();
-            print $searchpitco;
+	        $searchpicto=$form->showFilterButtons();
+            print $searchpicto;
             print '</td>';
 
     		print '</tr>';
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index d765411ed8c..407fe18bc61 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1797,8 +1797,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
     		print '<td colspan="8">&nbsp;</td>';
     		// Print the search button
             print '<td class="liste_titre" align="right">';
-            $searchpitco=$form->showFilterAndCheckAddButtons(0);
-            print $searchpitco;
+            $searchpicto=$form->showFilterAndCheckAddButtons(0);
+            print $searchpicto;
             print '</td>';
     		print '</tr>';
 		}
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index ca335558899..a87fecd36b7 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -276,8 +276,8 @@ if ($resql)
 	print '<td class="liste_titre" colspan="'.$colspan_warehouse.'">&nbsp;</td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre" align="right">';
-   	$searchpitco=$form->showFilterAndCheckAddButtons(0);
-   	print $searchpitco;
+   	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+   	print $searchpicto;
 	print '</td>';
 	print '</tr>';
 
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 183242c3c52..660d0e78bd3 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -280,8 +280,8 @@ if ($resql)
 	print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
 	print '</tr>';
 
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index a7285e1f410..6e1bd638d29 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -605,8 +605,8 @@ if (! empty($arrayfields['p.fk_statut']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterButtons();
-print $searchpitco;
+$searchpicto=$form->showFilterButtons();
+print $searchpicto;
 print '</td>';
 
 print '</tr>'."\n";
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 35a7812d4fa..72736531356 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -501,8 +501,8 @@ else if ($id > 0 || ! empty($ref))
 
         // Action column
         print '<td class="liste_titre" align="right">';
-        $searchpitco=$form->showFilterButtons();
-        print $searchpitco;
+        $searchpicto=$form->showFilterButtons();
+        print $searchpicto;
         print '</td>';
 	}
 	
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 559dbce4b06..c0b58523994 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -232,8 +232,8 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 print "</tr>\n";
 
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index d0f92bb9c14..17018091951 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -388,8 +388,8 @@ if ($sql_select)
     print '<td class="liste_titre" align="center">';
     print '</td>';
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
     print '</tr>';
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 7693da9d818..37134fbd313 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -863,8 +863,8 @@ if (! empty($arrayfields['s.status']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterButtons();
-print $searchpitco;
+$searchpicto=$form->showFilterButtons();
+print $searchpicto;
 print '</td>';
 
 print "</tr>\n";
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index e8dc595c6c3..952a34a9a59 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -510,8 +510,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
             print '<td colspan="8">&nbsp;</td>';
             // Print the search button
             print '<td class="liste_titre" align="right">';
-            $searchpitco=$form->showFilterAndCheckAddButtons(0);
-            print $searchpitco;
+            $searchpicto=$form->showFilterAndCheckAddButtons(0);
+            print $searchpicto;
             print '</td>';
             print '</tr>';
         }
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index efd0ae16647..56f8df0f825 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -553,8 +553,8 @@ if ($result)
 	print '</td>';
 	// Check boxes
 	print '<td class="liste_titre" align="middle">';
-	$searchpitco=$form->showFilterButtons();
-	print $searchpitco;
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 
 	print "</tr>\n";

From 4dc7d5cd8d2ee6d1320ae634a77005a878b32a83 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 14 May 2017 21:20:35 +0200
Subject: [PATCH 0820/1163] Fix : tooltip on bank in customer invoice card

---
 htdocs/compta/facture/card.php                   | 14 ++++++++++++--
 htdocs/modulebuilder/skeletons/skeleton_list.php |  4 ++--
 htdocs/product/canvas/product/tpl/list.tpl.php   |  4 ++--
 htdocs/product/canvas/service/tpl/list.tpl.php   |  4 ++--
 htdocs/product/stock/list.php                    |  4 ++--
 htdocs/product/stock/mouvement.php               |  4 ++--
 htdocs/product/stock/productlot_list.php         |  4 ++--
 htdocs/product/stock/replenish.php               |  4 ++--
 htdocs/product/stock/replenishorders.php         |  4 ++--
 htdocs/projet/activity/perday.php                |  4 ++--
 htdocs/projet/activity/perweek.php               |  4 ++--
 htdocs/projet/tasks/list.php                     |  4 ++--
 htdocs/projet/tasks/time.php                     |  4 ++--
 htdocs/user/hierarchy.php                        |  4 ++--
 htdocs/user/index.php                            |  4 ++--
 htdocs/variants/combinations.php                 |  4 ++--
 16 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6f7f4d84879..9525f63b722 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -59,6 +59,9 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 if (!empty($conf->variants->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
+if (! empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+}
 
 $langs->load('bills');
 $langs->load('companies');
@@ -3685,7 +3688,7 @@ else if ($id > 0 || ! empty($ref))
     $sql = 'SELECT p.datep as dp, p.ref, p.num_paiement, p.rowid, p.fk_bank,';
     $sql .= ' c.code as payment_code, c.libelle as payment_label,';
     $sql .= ' pf.amount,';
-    $sql .= ' ba.rowid as baid, ba.ref as baref, ba.label';
+    $sql .= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal';
     $sql .= ' FROM ' . MAIN_DB_PREFIX . 'c_paiement as c, ' . MAIN_DB_PREFIX . 'paiement_facture as pf, ' . MAIN_DB_PREFIX . 'paiement as p';
     $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
     $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
@@ -3717,7 +3720,14 @@ else if ($id > 0 || ! empty($ref))
                     $bankaccountstatic->id = $objp->baid;
                     $bankaccountstatic->ref = $objp->baref;
                     $bankaccountstatic->label = $objp->baref;
-                    print '<td align="right">';
+					$bankaccountstatic->number = $objp->banumber;
+					$bankaccountstatic->account_number = $objp->account_number;
+
+					$accountingjournal = new AccountingJournal($db);
+					$accountingjournal->fetch($objp->fk_accountancy_journal);
+					$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+
+					print '<td align="right">';
                     if ($bankaccountstatic->id)
                         print $bankaccountstatic->getNomUrl(1, 'transactions');
                     print '</td>';
diff --git a/htdocs/modulebuilder/skeletons/skeleton_list.php b/htdocs/modulebuilder/skeletons/skeleton_list.php
index 51158664889..205fcf4be8c 100644
--- a/htdocs/modulebuilder/skeletons/skeleton_list.php
+++ b/htdocs/modulebuilder/skeletons/skeleton_list.php
@@ -420,8 +420,8 @@ if (! empty($arrayfields['t.tms']['checked']))
 }*/
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+print $searchpicto;
 print '</td>';
 print '</tr>'."\n";
     
diff --git a/htdocs/product/canvas/product/tpl/list.tpl.php b/htdocs/product/canvas/product/tpl/list.tpl.php
index ad00d75259e..db7cac7e51c 100644
--- a/htdocs/product/canvas/product/tpl/list.tpl.php
+++ b/htdocs/product/canvas/product/tpl/list.tpl.php
@@ -71,8 +71,8 @@
   				<td class="liste_titre" align="<?php echo $searchfield['align']; ?>"><input class="flat" type="text" name="s<?php echo $searchfield['alias']; ?>" value=""></td>
 	<?php } else if ($key == $num) { 
         print '<td class="liste_titre" align="right">';
-        $searchpitco=$form->showFilterAndCheckAddButtons(0);
-        print $searchpitco;
+        $searchpicto=$form->showFilterAndCheckAddButtons(0);
+        print $searchpicto;
         print '</td>';
 	} else { ?>
   			<td class="liste_titre">&nbsp;</td>
diff --git a/htdocs/product/canvas/service/tpl/list.tpl.php b/htdocs/product/canvas/service/tpl/list.tpl.php
index a7efe4f86ba..ee2a894de98 100644
--- a/htdocs/product/canvas/service/tpl/list.tpl.php
+++ b/htdocs/product/canvas/service/tpl/list.tpl.php
@@ -71,8 +71,8 @@
   				<td class="liste_titre" align="<?php echo $searchfield['align']; ?>"><input class="flat" type="text" name="s<?php echo $searchfield['alias']; ?>" value=""></td>
 	<?php } else if ($key == $num) { 	
         print '<td class="liste_titre" align="right">';
-        $searchpitco=$form->showFilterAndCheckAddButtons(0);
-        print $searchpitco;
+        $searchpicto=$form->showFilterAndCheckAddButtons(0);
+        print $searchpicto;
         print '</td>';
  			} else { ?>
   			<td class="liste_titre">&nbsp;</td>
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 78b5b612da1..b3361f0b328 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -168,8 +168,8 @@ if ($result)
 	print '</td>';
 
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
 
 	print '</tr>';
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index bc4099f66ec..82a85ae83b0 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -861,8 +861,8 @@ if ($resql)
 	}
     // Actions    
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
     print '</td>';
     print "</tr>\n";
 
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index d8879d1fa28..df97621c07b 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -399,8 +399,8 @@ if ($resql)
      }*/
     // Action column
     print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-    print $searchpitco;
+    $searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+    print $searchpicto;
     print '</td>';
     print '</tr>'."\n";
     
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index fabfe736683..1a3d7c9edb2 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -513,8 +513,8 @@ print '<td class="liste_titre" align="right">' . $langs->trans('AlertOnly') . '&
 print '<td class="liste_titre" align="right">' . $langs->trans('Draft') . '&nbsp;<input type="checkbox" id="draftorder" name="draftorder" ' . (!empty($draftchecked)?$draftchecked:'') . '></td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 8967fd672d6..d190c4d704d 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -179,8 +179,8 @@ if ($resql)
          $form->select_date('', 'search_date', 0, 0, 1, '', 1, 0, 1, 0, '').
          '</td>'.
          '<td class="liste_titre" align="right">';
-         $searchpitco=$form->showFilterAndCheckAddButtons(0);
-         print $searchpitco;
+         $searchpicto=$form->showFilterAndCheckAddButtons(0);
+         print $searchpicto;
          '</td>'.
          '</tr>';
 
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index c1aa8aaa469..4c57b45ed50 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -421,8 +421,8 @@ print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 // Action column
 print '<td class="liste_titre nowrap" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 print "</tr>\n";
 
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 905b93393dd..5720c71b88c 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -417,8 +417,8 @@ for($i=0;$i<7;$i++)
 }
 // Action column
 print '<td class="liste_titre nowrap" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 print "</tr>\n";
 
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 8579d436d71..d739324716a 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -579,8 +579,8 @@ if (! empty($arrayfields['t.tms']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterButtons();
-print $searchpitco;
+$searchpicto=$form->showFilterButtons();
+print $searchpicto;
 print '</td>';
 print "</tr>\n";
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index eed7bae2734..dab06bbda74 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -776,8 +776,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		print $hookmanager->resPrint;
 		// Action column
 		print '<td class="liste_titre center">';
-		$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-		print $searchpitco;
+		$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+		print $searchpicto;
 		print '</td>';
 		print '</tr>'."\n";	
 		
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index ef5380e9678..9e7f6583f6e 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -153,8 +153,8 @@ print '<td class="liste_titre" align="right">';
 print $form->selectarray('search_statut', array('-1'=>'','1'=>$langs->trans('Enabled')),$search_statut);
 print '</td>';
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 9592eed863f..04acb9b56f7 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -419,8 +419,8 @@ if (! empty($arrayfields['u.statut']['checked']))
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+$searchpicto=$form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
 print '</td>';
 
 print "</tr>\n";
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 4342b352478..76a091ad8a2 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -638,8 +638,8 @@ if (! empty($id) || ! empty($ref))
 				<td class="liste_titre"></td>
         		<?php 
         		print '<td class="liste_titre" align="middle">';
-        		$searchpitco=$form->showCheckAddButtons('checkforselect', 1);
-        		print $searchpitco;
+        		$searchpicto=$form->showCheckAddButtons('checkforselect', 1);
+        		print $searchpicto;
         		print '</td>';
                 ?>
 			</tr>

From b29d0385e68a5a89ac164610ad7687025acb500a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 May 2017 00:15:56 +0200
Subject: [PATCH 0821/1163] NEW Can send an email to a user from its card.

---
 htdocs/core/actions_sendmails.inc.php     |    5 +-
 htdocs/core/class/CMailFile.class.php     |    5 +
 htdocs/core/class/html.formmail.class.php |    4 +-
 htdocs/user/card.php                      | 1034 ++++++++++++---------
 4 files changed, 592 insertions(+), 456 deletions(-)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index d031f318eb9..cf50d05d6bf 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -116,6 +116,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 		if (method_exists($object,"fetch_thirdparty") && $object->element != 'societe')
 		{
 			$result=$object->fetch_thirdparty();
+			if ($object->element == 'user' && $result == 0) $result=1;    // Even if not found, we consider ok
 			$thirdparty=$object->thirdparty;
 			$sendtosocid=$thirdparty->id;
 		}
@@ -187,7 +188,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				{
 					$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
 				}
-				else	// Id du contact
+				elseif ($val)	// Id du contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
 					$sendtoid[] = $val;
@@ -217,7 +218,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				{
 					$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
 				}
-				else	// Id du contact
+				elseif ($val)	// Id du contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
 					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 3da7f3abcf3..3b3efe96fb0 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -153,6 +153,11 @@ class CMailFile
 			$this->error='ErrorSubjectIsRequired';
 			return;
 		}
+		if (empty($msg))
+		{
+		    dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");
+		    $msg='.';     // Avoid empty message (with empty message conten show a multipart structure)
+		}		
 
 		// Detect if message is HTML (use fast method)
 		if ($msgishtml == -1)
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 00262b99bb5..020382095a3 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -634,11 +634,11 @@ class FormMail extends Form
         		if ($this->withtopicreadonly)
         		{
         			$out.= $defaulttopic;
-        			$out.= '<input type="hidden" size="60" id="subject" name="subject" value="'.$defaulttopic.'" />';
+        			$out.= '<input type="hidden" class="quatrevingtpercent" id="subject" name="subject" value="'.$defaulttopic.'" />';
         		}
         		else
         		{
-        			$out.= '<input type="text" size="60" id="subject" name="subject" value="'. ((isset($_POST["subject"]) && ! $_POST['modelselected'])?$_POST["subject"]:($defaulttopic?$defaulttopic:'')) .'" />';
+        			$out.= '<input type="text" class="quatrevingtpercent" id="subject" name="subject" value="'. ((isset($_POST["subject"]) && ! $_POST['modelselected'])?$_POST["subject"]:($defaulttopic?$defaulttopic:'')) .'" />';
         		}
         		$out.= "</td></tr>\n";
         	}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 3682088b552..cf6a1096a7b 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -592,6 +592,14 @@ if (empty($reshook)) {
         }
     }
 		
+    // Actions to send emails
+    $actiontypecode='AC_OTH_AUTO';
+    $trigger_name='USER_SENTBYMAIL';
+    $paramname='id';    // Name of param key to open the card
+    $mode='emailfromuser';
+    $trackid='use'.$object->id;
+    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+    
     // Actions to build doc
     $upload_dir = $conf->user->dir_output;
     $permissioncreate=$user->rights->user->user->creer;
@@ -1575,6 +1583,17 @@ else
 
             print '<div class="tabsAction">';
 
+            if (! empty($object->email))
+            {
+                $langs->load("mails");
+                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=presend&amp;mode=init#presend">'.$langs->trans('SendMail').'</a></div>';
+            }
+            else
+            {
+                $langs->load("mails");
+                print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
+            }
+            
             if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
@@ -1647,6 +1666,116 @@ else
 
 
 
+            //Select mail models is same action as presend
+            if (GETPOST('modelselected')) {
+                $action = 'presend';
+            }
+            if ($action == 'presend')
+            {
+                /*
+                 * Affiche formulaire mail
+                 */
+            
+                // By default if $action=='presend'
+                $titreform='SendMail';
+                $topicmail='';
+                $action='send';
+                $modelmail='user';
+            
+                print '<div id="presend"></div>';
+                print load_fiche_titre($langs->trans($titreform));
+            
+                dol_fiche_head();
+            
+                // Define output language
+                $outputlangs = $langs;
+                $newlang = '';
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+                    $newlang = $_REQUEST['lang_id'];
+                
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+                    $newlang = $object->default_lang;
+            
+                // Cree l'objet formulaire mail
+                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+                $formmail = new FormMail($db);
+                $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+                $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+    
+                if($formmail->fromtype === 'user'){
+                    $formmail->fromid = $user->id;
+    
+                }
+                $formmail->trackid='thi'.$object->id;
+                if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+                {
+                    include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+                    $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'thi'.$object->id);
+                }
+                $formmail->withfrom=1;
+                $formmail->withtopic=1;
+                $formmail->withto=GETPOST('sendto')?GETPOST('sendto'):$object->email;
+                $formmail->withtofree=1;
+                $formmail->withtocc=1;
+                $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
+                $formmail->withfile=2;
+                $formmail->withbody=1;
+                $formmail->withdeliveryreceipt=1;
+                $formmail->withcancel=1;
+                // Tableau des substitutions
+                //$formmail->setSubstitFromObject($object);
+                $formmail->substit['__LASTNAME__']=$object->lastname;
+                $formmail->substit['__FIRSTNAME__']=$object->firstname;
+                $formmail->substit['__SIGNATURE__']=$user->signature;
+                $formmail->substit['__PERSONALIZED__']='';
+    
+                //Find the good contact adress
+                /*
+                $custcontact='';
+                $contactarr=array();
+                $contactarr=$object->liste_contact(-1,'external');
+    
+                if (is_array($contactarr) && count($contactarr)>0)
+                {
+                foreach($contactarr as $contact)
+                {
+                if ($contact['libelle']==$langs->trans('TypeContact_facture_external_BILLING')) {
+    
+                require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+    
+                $contactstatic=new Contact($db);
+                $contactstatic->fetch($contact['id']);
+                $custcontact=$contactstatic->getFullName($langs,1);
+                }
+                }
+    
+                if (!empty($custcontact)) {
+                $formmail->substit['__CONTACTCIVNAME__']=$custcontact;
+                }
+                }*/
+    
+    
+                // Tableau des parametres complementaires du post
+                $formmail->param['action']=$action;
+                $formmail->param['models']=$modelmail;
+                $formmail->param['models_id']=GETPOST('modelmailselected','int');
+                $formmail->param['socid']=$object->id;
+                $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+    
+                // Init list of files
+                if (GETPOST("mode")=='init')
+                {
+                    $formmail->clear_attached_files();
+                    $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+                }
+                print $formmail->get_form();
+    
+                dol_fiche_end();
+            }
+        }
+
+        if (GETPOST('action') != 'presend' && GETPOST('action') != 'send')
+        {
             /*
              * List of groups of user
              */
@@ -1775,486 +1904,485 @@ else
                 }
                 print "<br>";
             }
-        }
-
-        /*
-         * Fiche en mode edition
-         */
-        if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id)))
-        {
-        	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="entity" value="'.$object->entity.'">';
-
-            dol_fiche_head($head, 'user', $title, 0, 'user');
-
-            print '<table width="100%" class="border">';
-
-            // Ref/ID
-			if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-			{
-	            print '<tr><td>'.$langs->trans("Ref").'</td>';
-	            print '<td>';
-	            print $object->id;
-	            print '</td>';
-	            print '</tr>';
-			}
-
-            // Lastname
-            print "<tr>";
-            print '<td class="fieldrequired">'.$langs->trans("Lastname").'</td>';
-            print '<td>';
-            if ($caneditfield && !$object->ldap_sid)
+    
+            /*
+             * Fiche en mode edition
+             */
+            if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id)))
             {
-                print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
-                print $object->lastname;
-            }
-            print '</td>';
-            print '</tr>';
-
-            // Firstname
-            print "<tr>".'<td>'.$langs->trans("Firstname").'</td>';
-            print '<td>';
-            if ($caneditfield && !$object->ldap_sid)
-            {
-                print '<input class="minwidth100" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
-                print $object->firstname;
-            }
-            print '</td></tr>';
-
-            // Employee
-            print '<tr>';
-            print '<td>'.fieldLabel('Employee','employee',0).'</td><td>';
-            print $form->selectyesno("employee",$object->employee,1);
-            print '</td></tr>';
-
-            // Position/Job
-            print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
-            print '<td>';
-            if ($caneditfield)
-            {
-            	print '<input size="30" type="text" name="job" value="'.$object->job.'">';
-            }
-            else
-			{
-                print '<input type="hidden" name="job" value="'.$object->job.'">';
-          		print $object->job;
-            }
-            print '</td></tr>';
-
-		    // Gender
-    		print '<tr><td>'.$langs->trans("Gender").'</td>';
-    		print '<td>';
-    		$arraygender=array('man'=>$langs->trans("Genderman"),'woman'=>$langs->trans("Genderwoman"));
-    		print $form->selectarray('gender', $arraygender, GETPOST('gender')?GETPOST('gender'):$object->gender, 1);
-    		print '</td></tr>';
-
-            // Login
-            print "<tr>".'<td><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
-            print '<td>';
-            if ($user->admin  && !$object->ldap_sid)
-            {
-                print '<input size="12" maxlength="24" type="text" class="flat" name="login" value="'.$object->login.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="login" value="'.$object->login.'">';
-                print $object->login;
-            }
-            print '</td>';
-            print '</tr>';
-
-            // Pass
-            print '<tr><td>'.$langs->trans("Password").'</td>';
-            print '<td>';
-            if ($object->ldap_sid)
-            {
-                $text=$langs->trans("DomainPassword");
-            }
-            else if ($caneditpassword)
-            {
-                $text='<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="off">';
-                if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
+            	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                print '<input type="hidden" name="action" value="update">';
+                print '<input type="hidden" name="entity" value="'.$object->entity.'">';
+    
+                dol_fiche_head($head, 'user', $title, 0, 'user');
+    
+                print '<table width="100%" class="border">';
+    
+                // Ref/ID
+    			if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
+    			{
+    	            print '<tr><td>'.$langs->trans("Ref").'</td>';
+    	            print '<td>';
+    	            print $object->id;
+    	            print '</td>';
+    	            print '</tr>';
+    			}
+    
+                // Lastname
+                print "<tr>";
+                print '<td class="fieldrequired">'.$langs->trans("Lastname").'</td>';
+                print '<td>';
+                if ($caneditfield && !$object->ldap_sid)
                 {
-                    $text=$form->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
+                    print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
                 }
-            }
-            else
-            {
-                $text=preg_replace('/./i','*',$object->pass);
-            }
-            print $text;
-            print "</td></tr>\n";
-
-            // API key
-            if(! empty($conf->api->enabled) && $user->admin) {
-                print '<tr><td>'.$langs->trans("ApiKey").'</td>';
-                print '<td>';
-                print '<input class="minwidth100" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
-                if (! empty($conf->use_javascript_ajax))
-                    print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
-                print '</td></tr>';
-            }
-
-            // Administrator
-            print '<tr><td>'.$langs->trans("Administrator").'</td>';
-            if ($object->societe_id > 0)
-            {
-            	$langs->load("admin");
-                print '<td>';
-                print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
-                print ' ('.$langs->trans("ExternalUser").')';
-                print '</td></tr>';
-            }
-            else
-            {
-                print '<td>';
-                $nbAdmin = $user->getNbOfUsers('active','',1);
-                $nbSuperAdmin = $user->getNbOfUsers('active','superadmin',1);
-                //var_dump($nbAdmin);
-                //var_dump($nbSuperAdmin);
-                if ($user->admin								// Need to be admin to allow downgrade of an admin
-                && ($user->id != $object->id)                   // Don't downgrade ourself
-                && (
-                	(empty($conf->multicompany->enabled) && $nbAdmin >= 1)
-                	|| (! empty($conf->multicompany->enabled) && ($object->entity > 0 || $nbSuperAdmin > 1))    // Don't downgrade a superadmin if alone
-                	)
-                )
+                else
                 {
-                    print $form->selectyesno('admin',$object->admin,1);
-
-                    if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
+                    print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
+                    print $object->lastname;
+                }
+                print '</td>';
+                print '</tr>';
+    
+                // Firstname
+                print "<tr>".'<td>'.$langs->trans("Firstname").'</td>';
+                print '<td>';
+                if ($caneditfield && !$object->ldap_sid)
+                {
+                    print '<input class="minwidth100" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
+                }
+                else
+                {
+                    print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
+                    print $object->firstname;
+                }
+                print '</td></tr>';
+    
+                // Employee
+                print '<tr>';
+                print '<td>'.fieldLabel('Employee','employee',0).'</td><td>';
+                print $form->selectyesno("employee",$object->employee,1);
+                print '</td></tr>';
+    
+                // Position/Job
+                print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
+                print '<td>';
+                if ($caneditfield)
+                {
+                	print '<input size="30" type="text" name="job" value="'.$object->job.'">';
+                }
+                else
+    			{
+                    print '<input type="hidden" name="job" value="'.$object->job.'">';
+              		print $object->job;
+                }
+                print '</td></tr>';
+    
+    		    // Gender
+        		print '<tr><td>'.$langs->trans("Gender").'</td>';
+        		print '<td>';
+        		$arraygender=array('man'=>$langs->trans("Genderman"),'woman'=>$langs->trans("Genderwoman"));
+        		print $form->selectarray('gender', $arraygender, GETPOST('gender')?GETPOST('gender'):$object->gender, 1);
+        		print '</td></tr>';
+    
+                // Login
+                print "<tr>".'<td><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
+                print '<td>';
+                if ($user->admin  && !$object->ldap_sid)
+                {
+                    print '<input size="12" maxlength="24" type="text" class="flat" name="login" value="'.$object->login.'">';
+                }
+                else
+                {
+                    print '<input type="hidden" name="login" value="'.$object->login.'">';
+                    print $object->login;
+                }
+                print '</td>';
+                print '</tr>';
+    
+                // Pass
+                print '<tr><td>'.$langs->trans("Password").'</td>';
+                print '<td>';
+                if ($object->ldap_sid)
+                {
+                    $text=$langs->trans("DomainPassword");
+                }
+                else if ($caneditpassword)
+                {
+                    $text='<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="off">';
+                    if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
                     {
-                        if ($conf->use_javascript_ajax)
-                        {
-                            print '<script type="text/javascript">
-									$(function() {
-										var admin = $("select[name=admin]").val();
-										if (admin == 0) {
-											$("input[name=superadmin]")
-													.prop("disabled", true)
-													.prop("checked", false);
-										}
-										if ($("input[name=superadmin]").is(":checked")) {
-											$("select[name=entity]")
-													.prop("disabled", true);
-										}
-										$("select[name=admin]").change(function() {
-											 if ( $(this).val() == 0 ) {
-											 	$("input[name=superadmin]")
-													.prop("disabled", true)
-													.prop("checked", false);
-											 	$("select[name=entity]")
-													.prop("disabled", false);
-											 } else {
-											 	$("input[name=superadmin]")
-													.prop("disabled", false);
-											 }
-										});
-										$("input[name=superadmin]").change(function() {
-											if ( $(this).is(":checked")) {
-												$("select[name=entity]")
-													.prop("disabled", true);
-											} else {
-												$("select[name=entity]")
-													.prop("disabled", false);
-											}
-										});
-									});
-								</script>';
-                        }
-
-                        $checked=(($object->admin && ! $object->entity) ? ' checked' : '');
-                        print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
+                        $text=$form->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
                     }
                 }
                 else
                 {
-                    $yn = yn($object->admin);
-                    print '<input type="hidden" name="admin" value="'.$object->admin.'">';
-                    print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
-                    if (! empty($conf->multicompany->enabled) && empty($object->entity)) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
-                    else print $yn;
+                    $text=preg_replace('/./i','*',$object->pass);
                 }
+                print $text;
+                print "</td></tr>\n";
+    
+                // API key
+                if(! empty($conf->api->enabled) && $user->admin) {
+                    print '<tr><td>'.$langs->trans("ApiKey").'</td>';
+                    print '<td>';
+                    print '<input class="minwidth100" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
+                    if (! empty($conf->use_javascript_ajax))
+                        print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
+                    print '</td></tr>';
+                }
+    
+                // Administrator
+                print '<tr><td>'.$langs->trans("Administrator").'</td>';
+                if ($object->societe_id > 0)
+                {
+                	$langs->load("admin");
+                    print '<td>';
+                    print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
+                    print ' ('.$langs->trans("ExternalUser").')';
+                    print '</td></tr>';
+                }
+                else
+                {
+                    print '<td>';
+                    $nbAdmin = $user->getNbOfUsers('active','',1);
+                    $nbSuperAdmin = $user->getNbOfUsers('active','superadmin',1);
+                    //var_dump($nbAdmin);
+                    //var_dump($nbSuperAdmin);
+                    if ($user->admin								// Need to be admin to allow downgrade of an admin
+                    && ($user->id != $object->id)                   // Don't downgrade ourself
+                    && (
+                    	(empty($conf->multicompany->enabled) && $nbAdmin >= 1)
+                    	|| (! empty($conf->multicompany->enabled) && ($object->entity > 0 || $nbSuperAdmin > 1))    // Don't downgrade a superadmin if alone
+                    	)
+                    )
+                    {
+                        print $form->selectyesno('admin',$object->admin,1);
+    
+                        if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
+                        {
+                            if ($conf->use_javascript_ajax)
+                            {
+                                print '<script type="text/javascript">
+    									$(function() {
+    										var admin = $("select[name=admin]").val();
+    										if (admin == 0) {
+    											$("input[name=superadmin]")
+    													.prop("disabled", true)
+    													.prop("checked", false);
+    										}
+    										if ($("input[name=superadmin]").is(":checked")) {
+    											$("select[name=entity]")
+    													.prop("disabled", true);
+    										}
+    										$("select[name=admin]").change(function() {
+    											 if ( $(this).val() == 0 ) {
+    											 	$("input[name=superadmin]")
+    													.prop("disabled", true)
+    													.prop("checked", false);
+    											 	$("select[name=entity]")
+    													.prop("disabled", false);
+    											 } else {
+    											 	$("input[name=superadmin]")
+    													.prop("disabled", false);
+    											 }
+    										});
+    										$("input[name=superadmin]").change(function() {
+    											if ( $(this).is(":checked")) {
+    												$("select[name=entity]")
+    													.prop("disabled", true);
+    											} else {
+    												$("select[name=entity]")
+    													.prop("disabled", false);
+    											}
+    										});
+    									});
+    								</script>';
+                            }
+    
+                            $checked=(($object->admin && ! $object->entity) ? ' checked' : '');
+                            print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
+                        }
+                    }
+                    else
+                    {
+                        $yn = yn($object->admin);
+                        print '<input type="hidden" name="admin" value="'.$object->admin.'">';
+                        print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
+                        if (! empty($conf->multicompany->enabled) && empty($object->entity)) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
+                        else print $yn;
+                    }
+                    print '</td></tr>';
+                }
+    
+               	// Type
+               	print '<tr><td>'.$langs->trans("Type").'</td>';
+               	print '<td>';
+               	if ($user->id == $object->id || ! $user->admin)
+               	{
+    	           	$type=$langs->trans("Internal");
+        	       	if ($object->societe_id) $type=$langs->trans("External");
+            	   	print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
+    	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+               	}
+               	else
+    			{
+    				$type=0;
+    	            if ($object->contact_id) $type=$object->contact_id;
+    	            print $form->selectcontacts(0,$type,'contactid',2,'','',1,'',false,1);
+    	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+                }
+               	print '</td></tr>';
+    
+    			// Address
+                print '<tr><td class="tdtop">'.fieldLabel('Address','address').'</td>';
+    	        print '<td><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
+                print $object->address;
+                print '</textarea></td></tr>';
+    
+                // Zip
+                print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
+                print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
                 print '</td></tr>';
-            }
-
-           	// Type
-           	print '<tr><td>'.$langs->trans("Type").'</td>';
-           	print '<td>';
-           	if ($user->id == $object->id || ! $user->admin)
-           	{
-	           	$type=$langs->trans("Internal");
-    	       	if ($object->societe_id) $type=$langs->trans("External");
-        	   	print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
-	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-           	}
-           	else
-			{
-				$type=0;
-	            if ($object->contact_id) $type=$object->contact_id;
-	            print $form->selectcontacts(0,$type,'contactid',2,'','',1,'',false,1);
-	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-            }
-           	print '</td></tr>';
-
-			// Address
-            print '<tr><td class="tdtop">'.fieldLabel('Address','address').'</td>';
-	        print '<td><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
-            print $object->address;
-            print '</textarea></td></tr>';
-
-            // Zip
-            print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
-            print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
-            print '</td></tr>';
-
-			// Town
-			print '<tr><td>'.fieldLabel('Town','town').'</td><td>';
-            print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
-            print '</td></tr>';
-
-            // Country
-            print '<tr><td>'.fieldLabel('Country','selectcounty_id').'</td><td>';
-            print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            print '</td></tr>';
-
-            // State
-            if (empty($conf->global->USER_DISABLE_STATE))
-            {
-                print '<tr><td class="tdoverflow">'.fieldLabel('State','state_id').'</td><td>';
-                print $formcompany->select_state($object->state_id,$object->country_code, 'state_id');
+    
+    			// Town
+    			print '<tr><td>'.fieldLabel('Town','town').'</td><td>';
+                print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
                 print '</td></tr>';
-            }
-
-            // Tel pro
-            print "<tr>".'<td>'.$langs->trans("PhonePro").'</td>';
-            print '<td>';
-            if ($caneditfield  && empty($object->ldap_sid))
-            {
-                print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
-                print $object->office_phone;
-            }
-            print '</td></tr>';
-
-            // Tel mobile
-            print "<tr>".'<td>'.$langs->trans("PhoneMobile").'</td>';
-            print '<td>';
-            if ($caneditfield && empty($object->ldap_sid))
-            {
-                print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
-                print $object->user_mobile;
-            }
-            print '</td></tr>';
-
-            // Fax
-            print "<tr>".'<td>'.$langs->trans("Fax").'</td>';
-            print '<td>';
-            if ($caneditfield  && empty($object->ldap_sid))
-            {
-                print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
-                print $object->office_fax;
-            }
-            print '</td></tr>';
-
-            // Skype
-            if (! empty($conf->skype->enabled))
-            {
-                print '<tr><td>'.$langs->trans("Skype").'</td>';
+    
+                // Country
+                print '<tr><td>'.fieldLabel('Country','selectcounty_id').'</td><td>';
+                print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
+                if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+                print '</td></tr>';
+    
+                // State
+                if (empty($conf->global->USER_DISABLE_STATE))
+                {
+                    print '<tr><td class="tdoverflow">'.fieldLabel('State','state_id').'</td><td>';
+                    print $formcompany->select_state($object->state_id,$object->country_code, 'state_id');
+                    print '</td></tr>';
+                }
+    
+                // Tel pro
+                print "<tr>".'<td>'.$langs->trans("PhonePro").'</td>';
                 print '<td>';
                 if ($caneditfield  && empty($object->ldap_sid))
                 {
-                    print '<input size="40" type="text" name="skype" class="flat" value="'.$object->skype.'">';
+                    print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
                 }
                 else
                 {
-                    print '<input type="hidden" name="skype" value="'.$object->skype.'">';
-                    print $object->skype;
+                    print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
+                    print $object->office_phone;
                 }
                 print '</td></tr>';
-            }
-
-            // EMail
-            print "<tr>".'<td'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
-            print '<td>';
-            if ($caneditfield  && empty($object->ldap_sid))
-            {
-                print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="email" value="'.$object->email.'">';
-                print $object->email;
-            }
-            print '</td></tr>';
-
-            // Signature
-            print "<tr>".'<td class="tdtop">'.$langs->trans("Signature").'</td>';
-            print '<td>';
-            if ($caneditfield)
-            {
-	            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	            $doleditor=new DolEditor('signature',$object->signature,'',138,'dolibarr_mailings','In',false,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
-	            print $doleditor->Create(1);
-            }
-            else
-			{
-          		print dol_htmlentitiesbr($object->signature);
-            }
-            print '</td></tr>';
-
-            // OpenID url
-            if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
-            {
-                print "<tr>".'<td>'.$langs->trans("OpenIDURL").'</td>';
+    
+                // Tel mobile
+                print "<tr>".'<td>'.$langs->trans("PhoneMobile").'</td>';
+                print '<td>';
+                if ($caneditfield && empty($object->ldap_sid))
+                {
+                    print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
+                }
+                else
+                {
+                    print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
+                    print $object->user_mobile;
+                }
+                print '</td></tr>';
+    
+                // Fax
+                print "<tr>".'<td>'.$langs->trans("Fax").'</td>';
+                print '<td>';
+                if ($caneditfield  && empty($object->ldap_sid))
+                {
+                    print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
+                }
+                else
+                {
+                    print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
+                    print $object->office_fax;
+                }
+                print '</td></tr>';
+    
+                // Skype
+                if (! empty($conf->skype->enabled))
+                {
+                    print '<tr><td>'.$langs->trans("Skype").'</td>';
+                    print '<td>';
+                    if ($caneditfield  && empty($object->ldap_sid))
+                    {
+                        print '<input size="40" type="text" name="skype" class="flat" value="'.$object->skype.'">';
+                    }
+                    else
+                    {
+                        print '<input type="hidden" name="skype" value="'.$object->skype.'">';
+                        print $object->skype;
+                    }
+                    print '</td></tr>';
+                }
+    
+                // EMail
+                print "<tr>".'<td'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
+                print '<td>';
+                if ($caneditfield  && empty($object->ldap_sid))
+                {
+                    print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
+                }
+                else
+                {
+                    print '<input type="hidden" name="email" value="'.$object->email.'">';
+                    print $object->email;
+                }
+                print '</td></tr>';
+    
+                // Signature
+                print "<tr>".'<td class="tdtop">'.$langs->trans("Signature").'</td>';
                 print '<td>';
                 if ($caneditfield)
                 {
-                    print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
+    	            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    	            $doleditor=new DolEditor('signature',$object->signature,'',138,'dolibarr_mailings','In',false,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
+    	            print $doleditor->Create(1);
                 }
                 else
-              {
-                    print '<input type="hidden" name="openid" value="'.$object->openid.'">';
-                    print $object->openid;
+    			{
+              		print dol_htmlentitiesbr($object->signature);
                 }
                 print '</td></tr>';
-            }
-
-            // Hierarchy
-            print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
-            print '<td>';
-            if ($caneditfield)
-            {
-            	print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
-            }
-            else
-            {
-          		print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
-            	$huser=new User($db);
-            	$huser->fetch($object->fk_user);
-            	print $huser->getNomUrl(1);
-            }
-            print '</td>';
-            print "</tr>\n";
-
-            if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
-            {
-            	$langs->load("salaries");
-
-            	// THM
-			    print '<tr><td>';
-			    $text=$langs->trans("THM");
-			    print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
-			    print '</td>';
-			    print '<td>';
-			    print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm')?GETPOST('thm'):$object->thm).'">';
-			    print '</td>';
-			    print "</tr>\n";
-
-			    // TJM
-			    print '<tr><td>';
-			    $text=$langs->trans("TJM");
-			    print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classthm');
-			    print '</td>';
-			    print '<td>';
-			    print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm')?GETPOST('tjm'):$object->tjm).'">';
-			    print '</td>';
-			    print "</tr>\n";
-
-			    // Salary
-			    print '<tr><td>'.$langs->trans("Salary").'</td>';
-			    print '<td>';
-			    print '<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary')?GETPOST('salary'):$object->salary).'">';
-			    print '</td>';
-			    print "</tr>\n";
-            }
-
-		    // Weeklyhours
-		    print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
-		    print '<td>';
-		    print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours')?GETPOST('weeklyhours'):$object->weeklyhours).'">';
-		    print '</td>';
-		    print "</tr>\n";
-
-		    // Date employment
-		    print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
-		    print '<td>';
-			echo $form->select_date(GETPOST('dateemployment')?GETPOST('dateemployment'):$object->dateemployment,'dateemployment',0,0,1,'form'.'dateemployment',1,0,1);
-			print '</td>';
-		    print "</tr>\n";
-
-		    // Accountancy code
-			if ($conf->accounting->enabled)
+    
+                // OpenID url
+                if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
+                {
+                    print "<tr>".'<td>'.$langs->trans("OpenIDURL").'</td>';
+                    print '<td>';
+                    if ($caneditfield)
+                    {
+                        print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
+                    }
+                    else
+                  {
+                        print '<input type="hidden" name="openid" value="'.$object->openid.'">';
+                        print $object->openid;
+                    }
+                    print '</td></tr>';
+                }
+    
+                // Hierarchy
+                print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
+                print '<td>';
+                if ($caneditfield)
+                {
+                	print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
+                }
+                else
+                {
+              		print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
+                	$huser=new User($db);
+                	$huser->fetch($object->fk_user);
+                	print $huser->getNomUrl(1);
+                }
+                print '</td>';
+                print "</tr>\n";
+    
+                if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+                {
+                	$langs->load("salaries");
+    
+                	// THM
+    			    print '<tr><td>';
+    			    $text=$langs->trans("THM");
+    			    print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
+    			    print '</td>';
+    			    print '<td>';
+    			    print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm')?GETPOST('thm'):$object->thm).'">';
+    			    print '</td>';
+    			    print "</tr>\n";
+    
+    			    // TJM
+    			    print '<tr><td>';
+    			    $text=$langs->trans("TJM");
+    			    print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classthm');
+    			    print '</td>';
+    			    print '<td>';
+    			    print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm')?GETPOST('tjm'):$object->tjm).'">';
+    			    print '</td>';
+    			    print "</tr>\n";
+    
+    			    // Salary
+    			    print '<tr><td>'.$langs->trans("Salary").'</td>';
+    			    print '<td>';
+    			    print '<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary')?GETPOST('salary'):$object->salary).'">';
+    			    print '</td>';
+    			    print "</tr>\n";
+                }
+    
+    		    // Weeklyhours
+    		    print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
+    		    print '<td>';
+    		    print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours')?GETPOST('weeklyhours'):$object->weeklyhours).'">';
+    		    print '</td>';
+    		    print "</tr>\n";
+    
+    		    // Date employment
+    		    print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
+    		    print '<td>';
+    			echo $form->select_date(GETPOST('dateemployment')?GETPOST('dateemployment'):$object->dateemployment,'dateemployment',0,0,1,'form'.'dateemployment',1,0,1);
+    			print '</td>';
+    		    print "</tr>\n";
+    
+    		    // Accountancy code
+    			if ($conf->accounting->enabled)
+        		{
+    			print "<tr>";
+    			print '<td>'.$langs->trans("AccountancyCode").'</td>';
+    			print '<td>';
+    			if ($caneditfield)
+    			{
+    				print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
+    			}
+    			else
+    			{
+    				print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
+    				print $object->accountancy_code;
+    			}
+    			print '</td>';
+    			print "</tr>";
+    		}
+    
+    		// User color
+    		if (! empty($conf->agenda->enabled))
+    	    {
+    			print '<tr><td>'.$langs->trans("ColorUser").'</td>';
+    			print '<td>';
+    			print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
+    			print '</td></tr>';
+    		}
+    
+    		// Photo
+    		print '<tr>';
+    		print '<td>'.$langs->trans("Photo").'</td>';
+    		print '<td>';
+    		print $form->showphoto('userphoto',$object,60,0,$caneditfield,'photowithmargin','small');
+    		print '</td>';
+    		print '</tr>';
+    		
+    		// Categories
+    		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire )) 
     		{
-			print "<tr>";
-			print '<td>'.$langs->trans("AccountancyCode").'</td>';
-			print '<td>';
-			if ($caneditfield)
-			{
-				print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
-			}
-			else
-			{
-				print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
-				print $object->accountancy_code;
-			}
-			print '</td>';
-			print "</tr>";
-		}
-
-		// User color
-		if (! empty($conf->agenda->enabled))
-	    {
-			print '<tr><td>'.$langs->trans("ColorUser").'</td>';
-			print '<td>';
-			print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
-			print '</td></tr>';
-		}
-
-		// Photo
-		print '<tr>';
-		print '<td>'.$langs->trans("Photo").'</td>';
-		print '<td>';
-		print $form->showphoto('userphoto',$object,60,0,$caneditfield,'photowithmargin','small');
-		print '</td>';
-		print '</tr>';
-		
-		// Categories
-		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire )) 
-		{
-			print '<tr><td>' . fieldLabel( 'Categories', 'usercats' ) . '</td>';
-			print '<td>';
-			$cate_arbo = $form->select_all_categories( Categorie::TYPE_CONTACT, null, null, null, null, 1 );
-			$c = new Categorie( $db );
-			$cats = $c->containing($object->id, Categorie::TYPE_USER);
-			foreach ($cats as $cat) {
-				$arrayselected[] = $cat->id;
-			}
-			print $form->multiselectarray( 'usercats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%' );
-			print "</td></tr>";
-		}
+    			print '<tr><td>' . fieldLabel( 'Categories', 'usercats' ) . '</td>';
+    			print '<td>';
+    			$cate_arbo = $form->select_all_categories( Categorie::TYPE_CONTACT, null, null, null, null, 1 );
+    			$c = new Categorie( $db );
+    			$cats = $c->containing($object->id, Categorie::TYPE_USER);
+    			foreach ($cats as $cat) {
+    				$arrayselected[] = $cat->id;
+    			}
+    			print $form->multiselectarray( 'usercats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%' );
+    			print "</td></tr>";
+    		}
 
             // Status
             print '<tr><td>'.$langs->trans("Status").'</td>';
@@ -2373,6 +2501,8 @@ else
             
             
             print '</div></div></div>';
+        }
+        
         }
         
 		if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close();

From becd023032f78b43c2818339c90f8ccd469ebdba Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 15 May 2017 05:11:00 +0200
Subject: [PATCH 0822/1163] Fix : tooltip on supplier invoice payment

---
 htdocs/compta/facture/card.php | 11 +++++++----
 htdocs/fourn/facture/card.php  | 15 +++++++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 9525f63b722..023b2049ee9 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3721,11 +3721,14 @@ else if ($id > 0 || ! empty($ref))
                     $bankaccountstatic->ref = $objp->baref;
                     $bankaccountstatic->label = $objp->baref;
 					$bankaccountstatic->number = $objp->banumber;
-					$bankaccountstatic->account_number = $objp->account_number;
 
-					$accountingjournal = new AccountingJournal($db);
-					$accountingjournal->fetch($objp->fk_accountancy_journal);
-					$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+					if (! empty($conf->accounting->enabled)) {
+						$bankaccountstatic->account_number = $objp->account_number;
+
+						$accountingjournal = new AccountingJournal($db);
+						$accountingjournal->fetch($objp->fk_accountancy_journal);
+						$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+					}
 
 					print '<td align="right">';
                     if ($bankaccountstatic->id)
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index f930ad87979..838e5cf25c0 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2013-2015	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2016  Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2016		Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2016-2017	Alexandre Spangaro		<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,6 +49,7 @@ if (!empty($conf->projet->enabled)) {
 if (!empty($conf->variants->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 
 
 $langs->load('bills');
@@ -2317,7 +2318,7 @@ else
     	$sql = 'SELECT p.datep as dp, p.ref, p.num_paiement, p.rowid, p.fk_bank,';
     	$sql.= ' c.id as paiement_type,';
     	$sql.= ' pf.amount,';
-    	$sql.= ' ba.rowid as baid, ba.ref as baref, ba.label';
+    	$sql.= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal';
     	$sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p';
     	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
     	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
@@ -2365,6 +2366,16 @@ else
     	                $bankaccountstatic->id=$objp->baid;
     	                $bankaccountstatic->ref=$objp->baref;
     	                $bankaccountstatic->label=$objp->baref;
+						$bankaccountstatic->number = $objp->banumber;
+
+						if (! empty($conf->accounting->enabled)) {
+							$bankaccountstatic->account_number = $objp->account_number;
+
+							$accountingjournal = new AccountingJournal($db);
+							$accountingjournal->fetch($objp->fk_accountancy_journal);
+							$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+						}
+
     	                print '<td align="right">';
     	                if ($objp->baid > 0) print $bankaccountstatic->getNomUrl(1,'transactions');
     	                print '</td>';

From 4d9016c49f9bc0738c4254888a12f945dd29c7b9 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 11 May 2017 09:53:23 +0200
Subject: [PATCH 0823/1163] Fix create propal form from propal with project id,
 fk_project is not used to init select project

---
 htdocs/commande/card.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 8459a4a5e9e..93b4e8ec02b 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1589,9 +1589,6 @@ if ($action == 'create' && $user->rights->commande->creer)
 	// Project
 	if (! empty($conf->projet->enabled) && $socid > 0)
 	{
-		$projectid = GETPOST('projectid')?GETPOST('projectid'):0;
-		if ($origin == 'project') $projectid = ($originid ? $originid : 0);
-
 		$langs->load("projects");
 		print '<tr>';
 		print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';

From d120a391f9ac4f6b617e7d95883647d1657021dd Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Mon, 15 May 2017 10:26:40 +0200
Subject: [PATCH 0824/1163] Fix use $numlines instead $i

---
 htdocs/compta/facture/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 06b64d02da6..91f64dc8693 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1084,9 +1084,9 @@ if (empty($reshook))
 										}
 
 										if ($totalamount != 0) {
-											$i = $i > 0 ? $i-1 : 0;
-										    $tva_tx = $lines[$i]->tva_tx;
-										    if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
+											if ($numlines > 0) $numlines = $numlines-1;
+										    $tva_tx = $lines[$numlines]->tva_tx;
+										    if (! empty($lines[$numlines]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$numlines]->vat_src_code.')';
 											$amountdeposit[$tva_tx] = ($totalamount * $valuedeposit) / 100;
 										} else {
 											$amountdeposit[0] = 0;

From b3245fb4557d1e7da0b851f4293ead067eb6ef9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 May 2017 10:27:21 +0200
Subject: [PATCH 0825/1163] NEW Include an hourglass icon when we click on
 online payment button

---
 htdocs/paypal/admin/paypal.php       |   2 +-
 htdocs/public/paypal/newpayment.php  |  20 +++-
 htdocs/public/stripe/newpayment.php  | 156 ++++++++++++++-------------
 htdocs/stripe/admin/stripe.php       |   7 +-
 htdocs/theme/common/dolibarr_box.png | Bin 31433 -> 34121 bytes
 htdocs/theme/eldy/style.css.php      |   6 +-
 htdocs/theme/md/style.css.php        |   6 +-
 7 files changed, 101 insertions(+), 96 deletions(-)

diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 2d0be83c80d..4c3dd2d961e 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -141,7 +141,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 print '<tr class="oddeven">';
-print '<td class="titlefield fieldrequired">';
+print '<td class="titlefield">';
 print $langs->trans("PaypalLiveEnabled").'</td><td>';
 if (empty($conf->global->PAYPAL_API_SANDBOX))
 {
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 08bf0c4faed..5be4e49f232 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -276,7 +276,7 @@ $paramcreditor='PAYPAL_CREDITOR_'.$suffix;
 if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
 else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR;
 
-print '<span id="dolpaymentspan"></span>'."\n";
+print '<span id="dopaymentspan"></span>'."\n";
 print '<div class="center">'."\n";
 print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
@@ -969,12 +969,13 @@ if ($found && ! $error)	// We are in a management option and no error
 
 	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
 	{
-		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
+		print '<br><input class="button" type="submit" id="dopayment" name="dopayment" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
 	}
 	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
 	{
-		print '<br><input class="button" type="submit" name="dopayment" value="'.$langs->trans("PaypalDoPayment").'">';
+		print '<br><input class="button" type="submit" id="dopayment" name="dopayment" value="'.$langs->trans("PaypalDoPayment").'">';
 	}
+	print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">';
 }
 else
 {
@@ -986,9 +987,22 @@ print '</td></tr>'."\n";
 print '</table>'."\n";
 print '</form>'."\n";
 print '</div>'."\n";
+
+
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	jQuery("#dopayment").click(function() {
+		jQuery("#dopayment").hide();
+        jQuery("#hourglasstopay").show();
+	});
+});
+</script>';
+
+
 print '<br>';
 
 
+
 htmlPrintOnlinePaymentFooter($mysoc,$langs);
 
 llxFooter('', 'public');
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 64ea70cfbeb..a430baafb59 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -90,8 +90,8 @@ if (! $action)
 //$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 $urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
 
-$urlok=$urlwithroot.'/public/paypal/paymentok.php?';
-$urlko=$urlwithroot.'/public/paypal/paymentko.php?';
+$urlok=$urlwithroot.'/public/stripe/paymentok.php?';
+$urlko=$urlwithroot.'/public/stripe/paymentko.php?';
 
 // Complete urls for post treatment
 $SOURCE=GETPOST("source",'alpha');
@@ -1119,8 +1119,8 @@ if (preg_match('/^dopayment/',$action))
     <div id="card-errors" role="alert"></div>
     </div>
     <br>
-    <button>'.$langs->trans("ToPay").'</button>
-    
+    <button class="button" id="buttontopay">'.$langs->trans("ToPay").'</button>
+    <img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">
     </td></tr></tbody></table>
         
     </form>
@@ -1131,82 +1131,84 @@ if (preg_match('/^dopayment/',$action))
     
     <script type="text/javascript" language="javascript">';
     ?>
+
+    // Create a Stripe client
+    var stripe = Stripe('<?php echo $stripe['publishable_key']; ?>');
     
-        // Create a Stripe client
-        var stripe = Stripe('<?php echo $stripe['publishable_key']; ?>');
-        
-        // Create an instance of Elements
-        var elements = stripe.elements();
-        
-        // Custom styling can be passed to options when creating an Element.
-        // (Note that this demo uses a wider set of styles than the guide below.)
-        var style = {
-          base: {
-            color: '#32325d',
-            lineHeight: '24px',
-            fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
-            fontSmoothing: 'antialiased',
-            fontSize: '16px',
-            '::placeholder': {
-              color: '#aab7c4'
-            }
-          },
-          invalid: {
-            color: '#fa755a',
-            iconColor: '#fa755a'
-          }
-        };
-        
-        // Create an instance of the card Element
-        var card = elements.create('card', {style: style});
-        
-        // Add an instance of the card Element into the `card-element` <div>
-        card.mount('#card-element');
-        
-        // Handle real-time validation errors from the card Element.
-        card.addEventListener('change', function(event) {
-          var displayError = document.getElementById('card-errors');
-          if (event.error) {
-            displayError.textContent = event.error.message;
-          } else {
-            displayError.textContent = '';
-          }
-        });
-        
-        // Handle form submission
-        var form = document.getElementById('payment-form');
-        console.log(form);
-        form.addEventListener('submit', function(event) {
-          event.preventDefault();
-        
-          stripe.createToken(card).then(function(result) {
-            if (result.error) {
-              // Inform the user if there was an error
-              var errorElement = document.getElementById('card-errors');
-              errorElement.textContent = result.error.message;
-            } else {
-              // Send the token to your server
-              stripeTokenHandler(result.token);
-            }
-          });
-        });
-        
-        function stripeTokenHandler(token) {
-          // Insert the token ID into the form so it gets submitted to the server
-          var form = document.getElementById('payment-form');
-          var hiddenInput = document.createElement('input');
-          hiddenInput.setAttribute('type', 'hidden');
-          hiddenInput.setAttribute('name', 'stripeToken');
-          hiddenInput.setAttribute('value', token.id);
-          form.appendChild(hiddenInput);
-        
-          // Submit the form
-          console.log("submit");
-          form.submit();
-        }        
+    // Create an instance of Elements
+    var elements = stripe.elements();
+    
+    // Custom styling can be passed to options when creating an Element.
+    // (Note that this demo uses a wider set of styles than the guide below.)
+    var style = {
+      base: {
+        color: '#32325d',
+        lineHeight: '24px',
+        fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
+        fontSmoothing: 'antialiased',
+        fontSize: '16px',
+        '::placeholder': {
+          color: '#aab7c4'
+        }
+      },
+      invalid: {
+        color: '#fa755a',
+        iconColor: '#fa755a'
+      }
+    };
+    
+    // Create an instance of the card Element
+    var card = elements.create('card', {style: style});
+    
+    // Add an instance of the card Element into the `card-element` <div>
+    card.mount('#card-element');
+    
+    // Handle real-time validation errors from the card Element.
+    card.addEventListener('change', function(event) {
+      var displayError = document.getElementById('card-errors');
+      if (event.error) {
+        displayError.textContent = event.error.message;
+      } else {
+        displayError.textContent = '';
+      }
+    });
+    
+    // Handle form submission
+    var form = document.getElementById('payment-form');
+    console.log(form);
+    form.addEventListener('submit', function(event) {
+      event.preventDefault();
+    
+      stripe.createToken(card).then(function(result) {
+        if (result.error) {
+          // Inform the user if there was an error
+          var errorElement = document.getElementById('card-errors');
+          errorElement.textContent = result.error.message;
+        } else {
+          // Send the token to your server
+          stripeTokenHandler(result.token);
+        }
+      });
+    });
+    
+    function stripeTokenHandler(token) {
+      // Insert the token ID into the form so it gets submitted to the server
+      var form = document.getElementById('payment-form');
+      var hiddenInput = document.createElement('input');
+      hiddenInput.setAttribute('type', 'hidden');
+      hiddenInput.setAttribute('name', 'stripeToken');
+      hiddenInput.setAttribute('value', token.id);
+      form.appendChild(hiddenInput);
+    
+      // Submit the form
+      jQuery('#buttontopay').hide();
+      jQuery('#hourglasstopay').show();
+      console.log("submit");
+      form.submit();
+    }        
     
     <?php
-        print '</script>';    
+    print '</script>';    
 }
 
 
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 056e43690b2..f135927b28a 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -134,7 +134,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 print '<tr class="oddeven">';
-print '<td class="titlefield fieldrequired">';
+print '<td class="titlefield">';
 print $langs->trans("StripeLiveEnabled").'</td><td>';
 if (!empty($conf->global->STRIPE_LIVE))
 {
@@ -229,7 +229,7 @@ $token='';
 // Url list
 print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
 print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
-print '<strong>'.getStripePaymentUrl(1,'free')."</strong><br><br>\n";
+print '<strong>'.getStripePaymentUrl(1,'free')."</strong><br>\n";
 if (! empty($conf->commande->enabled))
 {
 	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder",$servicename).':<br>';
@@ -250,7 +250,6 @@ if (! empty($conf->commande->enabled))
         }
         print '</form>';
 	}
-	print '<br>';
 }
 if (! empty($conf->facture->enabled))
 {
@@ -272,7 +271,6 @@ if (! empty($conf->facture->enabled))
         }
         print '</form>';
 	}
-	print '<br>';
 }
 if (! empty($conf->contrat->enabled))
 {
@@ -294,7 +292,6 @@ if (! empty($conf->contrat->enabled))
         }
         print '</form>';
 	}
-	print '<br>';
 }
 if (! empty($conf->adherent->enabled))
 {
diff --git a/htdocs/theme/common/dolibarr_box.png b/htdocs/theme/common/dolibarr_box.png
index 074b41951badb0f25e1f06b8c0c3d6b43a21f8df..69595524187aecf0831e12606a8a43d7c0fce971 100644
GIT binary patch
literal 34121
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
Hu0mjf6-o*L

literal 31433
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

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a8e7729f31b..80edfc6fea9 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3264,7 +3264,7 @@ div.visible {
     display: block;
 }
 
-div.hidden {
+div.hidden, td.hidden, img.hidden {
     display: none;
 }
 
@@ -3272,10 +3272,6 @@ tr.visible {
     display: block;
 }
 
-td.hidden {
-    display: none;
-}
-
 
 /* ============================================================================== */
 /*  Module website                                                                */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5c96fa501ae..36e2dc4e6f3 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3362,7 +3362,7 @@ div.visible {
     display: block;
 }
 
-div.hidden {
+div.hidden, td.hidden, img.hidden {
     display: none;
 }
 
@@ -3370,10 +3370,6 @@ tr.visible {
     display: block;
 }
 
-td.hidden {
-    display: none;
-}
-
 
 /* ============================================================================== */
 /*  Module website                                                                */

From f2aa0ea48837fb9517d03f6ff99d42d86a105f31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 May 2017 10:39:14 +0200
Subject: [PATCH 0826/1163] Look and feel v6

---
 htdocs/paybox/admin/paybox.php | 3 +--
 htdocs/paypal/admin/paypal.php | 8 ++++----
 htdocs/stripe/admin/stripe.php | 9 ++++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index ffbc2e41e0c..56a8482fcfc 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -212,7 +212,7 @@ print '</form>';
 
 print '<br><br>';
 
-print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
+print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br><br>';
 print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
 print '<b>'.DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?amount=<i>9.99</i>&tag=<i>your_free_tag</i></b>'."<br>\n";
 if (! empty($conf->commande->enabled))
@@ -237,7 +237,6 @@ if (! empty($conf->adherent->enabled))
 	print '<b>'.DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?source=membersubscription&ref=<i>member_ref</i></b>'."<br>\n";
 }
 
-print "<br>";
 print info_admin($langs->trans("YouCanAddTagOnUrl"));
 
 llxFooter();
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 4c3dd2d961e..cc83dc10fab 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -175,7 +175,7 @@ print '<br>'.$langs->trans("Example").': ASsqXEmw4KzmX-CPChWSVDNCNfd.A3YNR7uz-Vn
 print '</td></tr>';
 
 
-print '<tr class="oddeven"><td class="fieldrequired">';
+print '<tr class="oddeven"><td>';
 print $langs->trans("PAYPAL_SSLVERSION").'</td><td>';
 print $form->selectarray("PAYPAL_SSLVERSION",array('1'=> $langs->trans('TLSv1'),'6'=> $langs->trans('TLSv1.2')),$conf->global->PAYPAL_SSLVERSION);
 print '</td></tr>';
@@ -187,7 +187,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 
-print '<tr class="oddeven"><td class="fieldrequired">';
+print '<tr class="oddeven"><td>';
 print $langs->trans("PAYPAL_API_INTEGRAL_OR_PAYPALONLY").'</td><td>';
 print $form->selectarray("PAYPAL_API_INTEGRAL_OR_PAYPALONLY",array('integral'=> $langs->trans('PaypalModeIntegral'),'paypalonly'=> $langs->trans('PaypalModeOnlyPaypal')),$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY);
 print '</td></tr>';
@@ -296,7 +296,7 @@ $token='';
 
 
 // Url list
-print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
+print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br><br>';
 print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
 print '<strong>'.getPaypalPaymentUrl(1,'free')."</strong><br><br>\n";
 if (! empty($conf->commande->enabled))
@@ -385,9 +385,9 @@ if (! empty($conf->adherent->enabled))
         }
         print '</form>';
 	}
+	print '<br>';
 }
 
-print "<br>";
 print info_admin($langs->trans("YouCanAddTagOnUrl"));
 
 if (! empty($conf->use_javascript_ajax))
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index f135927b28a..c2c33edc189 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -227,9 +227,9 @@ $token='';
 
 
 // Url list
-print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br>';
+print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br><br>';
 print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
-print '<strong>'.getStripePaymentUrl(1,'free')."</strong><br>\n";
+print '<strong>'.getStripePaymentUrl(1,'free')."</strong><br><br>\n";
 if (! empty($conf->commande->enabled))
 {
 	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder",$servicename).':<br>';
@@ -250,6 +250,7 @@ if (! empty($conf->commande->enabled))
         }
         print '</form>';
 	}
+	print '<br>';
 }
 if (! empty($conf->facture->enabled))
 {
@@ -271,6 +272,7 @@ if (! empty($conf->facture->enabled))
         }
         print '</form>';
 	}
+	print '<br>';
 }
 if (! empty($conf->contrat->enabled))
 {
@@ -292,6 +294,7 @@ if (! empty($conf->contrat->enabled))
         }
         print '</form>';
 	}
+	print '<br>';
 }
 if (! empty($conf->adherent->enabled))
 {
@@ -313,9 +316,9 @@ if (! empty($conf->adherent->enabled))
         }
         print '</form>';
 	}
+	print '<br>';
 }
 
-print "<br>";
 print info_admin($langs->trans("YouCanAddTagOnUrl"));
 
 if (! empty($conf->use_javascript_ajax))

From 789fbb6dc3ea6a16133288a6faa163dc45b31b0c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 May 2017 12:57:08 +0200
Subject: [PATCH 0827/1163] Enhance tooltips

---
 htdocs/admin/system/perf.php  | 9 ++++++---
 htdocs/langs/en_US/admin.lang | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 3e6a9df4a25..9b23dc74089 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -112,7 +112,7 @@ $test=function_exists('opcache_get_status');
 if (! $foundcache && $test)
 {
 	$foundcache++;
-	print img_picto('','tick.png').' '.$langs->trans("ZendOPCacheInstalled");  // Should be by defautl starting with PHP 5.5
+	print img_picto('','tick.png').' '.$langs->trans("ZendOPCacheInstalled");  // Should be by default starting with PHP 5.5
 	//$tmp=opcache_get_status();
 	//var_dump($tmp);
 }
@@ -376,7 +376,8 @@ jQuery(document).ready(function() {
 
 print '<br>';
 print '<strong>'.$langs->trans("HTTPCacheStaticResources").' - ';
-print $langs->trans("CacheByServer").':</strong><br>';
+print $form->textwithpicto($langs->trans("CacheByServer"), $langs->trans("CacheByServerDesc"));
+print ':</strong><br>';
 // No cahce on PHP
 //print '<div id="httpcachephpok">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'php (.php)').'</div>';
 //print '<div id="httpcachephpko">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeNotCached",'php (.php)').'</div>';
@@ -399,7 +400,9 @@ print $langs->trans("TestNotPossibleWithCurrentBrowsers").'<br>';
 
 // Compressions
 print '<br>';
-print '<strong>'.$langs->trans("CompressionOfResources").'</strong>: ';
+print '<strong>';
+print $form->textwithpicto($langs->trans("CompressionOfResources"), $langs->trans("CompressionOfResourcesDesc"));
+print '</strong>: ';
 //$tmp=getURLContent(DOL_URL_ROOT.'/index.php','GET');var_dump($tmp);
 print '<br>';
 // on PHP
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 3662e8aca1c..1c9ac65e4b8 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1353,8 +1353,10 @@ FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
 FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
 CacheByServer=Cache by server
+CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
+CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers 
 DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record. 
 DefaultCreateForm=Default values for new objects

From bdb2f851032c9f4a8a6253cd45bde4470eb6374e Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Mon, 15 May 2017 16:25:51 +0200
Subject: [PATCH 0828/1163] Update code using new css class

---
 htdocs/expedition/card.php        |  2 +-
 htdocs/expedition/index.php       | 22 +++++++---------------
 htdocs/expedition/stats/index.php |  6 ++----
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index cbe602f7313..a0280ce9e39 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1013,7 +1013,7 @@ if ($action == 'create')
 									{
 										$img=img_warning($langs->trans("StockTooLow"));
 									}
-									print "<tr ".$bc[$var]."><td>&nbsp; &nbsp; &nbsp; ->
+									print "<tr class=\"oddeven\"><td>&nbsp; &nbsp; &nbsp; ->
 										<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
 										</a> (".$value['nb'].")</td><td align=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
 										<td align=\"center\">".$value['stock']." ".$img."</td></tr>";
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index c3e277ad7b0..039a038f18a 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -90,17 +90,15 @@ if ($resql)
 		print '<tr class="liste_titre">';
 		print '<th colspan="3">'.$langs->trans("SendingsToValidate").'</th></tr>';
 		$i = 0;
-		$var = True;
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
 			
 			$shipment->id=$obj->rowid;
 			$shipment->ref=$obj->ref;
-			$shipment->ref_customer=$obj->ref_customer;
-				
+			$shipment->ref_customer=$obj->ref_customer;				
 			
-			print "<tr ".$bc[$var].'><td class="nowrap">';
+			print '<tr class="oddeven"><td class="nowrap">';
 			print $shipment->getNomUrl(1);
 			print "</td>";
 			print '<td>';
@@ -142,7 +140,6 @@ if ($resql)
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="3">'.$langs->trans("OrdersToProcess").'</th></tr>';
-		$var = True;
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
@@ -154,8 +151,7 @@ if ($resql)
 			$orderstatic->facturee=0;
 			
 			$companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
-			
+			$companystatic->id=$obj->socid;			
 			
 			print '<tr class="oddeven">';
 			print '<td class="nowrap">';
@@ -204,7 +200,6 @@ if ( $resql )
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="3">'.$langs->trans("OrdersInProcess").'</th></tr>';
-		$var = True;
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
@@ -216,10 +211,9 @@ if ( $resql )
             $orderstatic->facturee=$obj->billed;
 			
             $companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
-				
+			$companystatic->id=$obj->socid;				
 			
-			print "<tr ".$bc[$var]."><td>";
+			print '<tr class="oddeven"><td>';
 			print $orderstatic->getNomUrl(1);
 			print '</td>';
 			print '<td>';
@@ -264,16 +258,14 @@ if ($resql)
 		$i = 0;
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("LastSendings",$num).'</th></tr>';
-		$var = True;
+		print '<th colspan="3">'.$langs->trans("LastSendings", $num).'</th></tr>';
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
 		    
 			$shipment->id=$obj->rowid;
 			$shipment->ref=$obj->ref;
-			$shipment->ref_customer=$obj->ref_customer;
-				
+			$shipment->ref_customer=$obj->ref_customer;				
 			
 			print '<tr class="oddeven"><td>';
 			print $shipment->getNomUrl(1);
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index cccfc0d90a0..53837c76fd1 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -269,7 +269,6 @@ print '<td align="center">'.$langs->trans("AmountAverage").'</td>';*/
 print '</tr>';
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
 	$year = $val['year'];
@@ -278,7 +277,7 @@ foreach ($data as $val)
 		$oldyear--;
 		
 		
-		print '<tr '.$bc[$var].' height="24">';
+		print '<tr class="oddeven" height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
 	
 		print '<td align="right">0</td>';
@@ -286,9 +285,8 @@ foreach ($data as $val)
 		print '<td align="right">0</td>';*/
 		print '</tr>';
 	}
-
 	
-	print '<tr '.$bc[$var].' height="24">';
+	print '<tr class="oddeven" height="24">';
 	print '<td align="center">';
 	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a>';
 	else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");

From ce84990414d00d4e5a74f73bf68bdb456f84628a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 02:43:05 +0200
Subject: [PATCH 0829/1163] NEW On invoices generated by template, we save if
 of source template.

---
 htdocs/compta/facture/class/facture-rec.class.php |  4 +++-
 htdocs/compta/facture/class/facture.class.php     |  5 ++++-
 htdocs/compta/facture/fiche-rec.php               |  5 +++--
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql    |  2 +-
 htdocs/install/mysql/tables/llx_facture.sql       |  3 ++-
 htdocs/langs/en_US/other.lang                     | 12 ++++++++++++
 6 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index ef23a30b878..927be3fa25e 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -446,7 +446,7 @@ class FactureRec extends CommonInvoice
 		}
 		else
 		{
-			$this->error=$this->db-lasterror();
+			$this->error=$this->db->lasterror();
 			return -3;
 		}
 	}
@@ -849,6 +849,8 @@ class FactureRec extends CommonInvoice
 
 			    $facture = new Facture($db);
 				$facture->fac_rec = $facturerec->id;    // We will create $facture from this recurring invoice
+				$facture->fk_fac_rec_source = $facturerec->id;    // We will create $facture from this recurring invoice
+				
 			    $facture->type = self::TYPE_STANDARD;
 			    $facture->brouillon = 1;
 			    $facture->date = $facturerec->date_when;	// We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 844e217cccb..e46b5718d22 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -279,6 +279,8 @@ class Facture extends CommonInvoice
 		// Create invoice from a template invoice
 		if ($this->fac_rec > 0)
 		{
+		    $this->fk_fac_rec_source = $this->fac_rec;
+		    
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 			$_facrec = new FactureRec($this->db);
 			$result=$_facrec->fetch($this->fac_rec);
@@ -386,7 +388,7 @@ class Facture extends CommonInvoice
 		$sql.= ", note_public";
 		$sql.= ", ref_client, ref_int";
         $sql.= ", fk_account";
-		$sql.= ", fk_facture_source, fk_user_author, fk_projet";
+		$sql.= ", fk_fac_rec_source, fk_facture_source, fk_user_author, fk_projet";
 		$sql.= ", fk_cond_reglement, fk_mode_reglement, date_lim_reglement, model_pdf";
 		$sql.= ", situation_cycle_ref, situation_counter, situation_final";
 		$sql.= ", fk_incoterms, location_incoterms";
@@ -410,6 +412,7 @@ class Facture extends CommonInvoice
 		$sql.= ", ".($this->ref_client?"'".$this->db->escape($this->ref_client)."'":"null");
 		$sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
 		$sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
+		$sql.= ", ".($this->fk_fac_rec_source?"'".$this->db->escape($this->fk_fac_rec_source)."'":"null");
 		$sql.= ", ".($this->fk_facture_source?"'".$this->db->escape($this->fk_facture_source)."'":"null");
 		$sql.= ", ".($user->id > 0 ? "'".$user->id."'":"null");
 		$sql.= ", ".($this->fk_project?$this->fk_project:"null");
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index acf97a3893a..773f04d2ca0 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -44,6 +44,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php';
 $langs->load('bills');
 $langs->load('compta');
 $langs->load('admin');
+$langs->load('other');
 
 // Security check
 $id=(GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int'));
@@ -940,7 +941,7 @@ if ($action == 'create')
 		    '__INVOICE_YEAR__' =>  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date,'%Y').')',
 		    '__INVOICE_NEXT_YEAR__' => $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'y'),'%Y').')'
 		);
-		$substitutionarray['__(TRANSKEY)__']=$langs->trans("TransKey");
+		$substitutionarray['__(TransKey)__']=$langs->trans("TransKey");
 		
 		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
 		foreach($substitutionarray as $key => $val)
@@ -1258,7 +1259,7 @@ else
 		    '__INVOICE_YEAR__' =>  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample,'%Y').')',
 		    '__INVOICE_NEXT_YEAR__' => $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'),'%Y').')'
 		);
-		$substitutionarray['__(TRANSKEY)__']=$langs->trans("TransKey");
+		$substitutionarray['__(TransKey)__']=$langs->trans("TransKey");
 		
 		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
 		foreach($substitutionarray as $key => $val)
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 7572e0d2030..88260498f28 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -278,7 +278,7 @@ insert into llx_c_tva(fk_pays,taux,code,recuperableonly,localtax1,localtax1_type
 
 ALTER TABLE llx_events MODIFY COLUMN ip varchar(250);
 
-
+ALTER TABLE llx_facture ADD COLUMN fk_fac_rec_source integer;
 
 
 
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index aaf467a06b0..014572cd7e6 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -63,7 +63,8 @@ create table llx_facture
   fk_user_modif         integer,                                -- user making last change
   fk_user_valid			integer,								-- user validating
 
-  fk_facture_source		integer,								-- facture origine si facture avoir
+  fk_fac_rec_source		integer,								-- facture rec source
+  fk_facture_source		integer,								-- facture origin if credit notes or replacement invoice
   fk_projet				integer DEFAULT NULL,					-- projet auquel est associee la facture
 
   fk_account			integer,								-- bank account
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index a37927566e3..11a09af3373 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -9,6 +9,18 @@ BirthdayDate=Birthday date
 DateToBirth=Date of birth
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
+TransKey=Translation of the key TransKey
+MonthOfInvoice=Month (number 1-12) of invoice date
+TextMonthOfInvoice=Month (tex) of invoice date
+PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
+TextPreviousMonthOfInvoice=Previous month (text) of invoice date
+NextMonthOfInvoice=Following month (number 1-12) of invoice date
+TextNextMonthOfInvoice=Following month (text) of invoice date
+
+YearOfInvoice=Year of invoice date
+PreviousYearOfInvoice=Previous year of invoice date
+NextYearOfInvoice=Following year of invoice date
+
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail

From ab444ce73049adaf09625d0ab33b5f657e51d243 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 03:02:00 +0200
Subject: [PATCH 0830/1163] Prepare for module collab/pad

---
 build/rpm/dolibarr_fedora.spec   |   5 +-
 build/rpm/dolibarr_generic.spec  |  11 +-
 build/rpm/dolibarr_mandriva.spec |   4 +-
 build/rpm/dolibarr_opensuse.spec |   5 +-
 htdocs/collab/index.php          | 507 +++++++++++++++++++++++++++++++
 5 files changed, 521 insertions(+), 11 deletions(-)
 create mode 100644 htdocs/collab/index.php

diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index fb818e285fb..a0f981b8c11 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -18,8 +18,8 @@ License: GPLv3+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team
 
-URL: http://www.dolibarr.org
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
+URL: https://www.dolibarr.org
+Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
 Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -165,6 +165,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
+%_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
 %_datadir/dolibarr/htdocs/commande
 %_datadir/dolibarr/htdocs/compta
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 7b12a20eebb..446e0e0d5f7 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -26,17 +26,17 @@ License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team
 
-URL: http://www.dolibarr.org
+URL: https://www.dolibarr.org
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
+Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
 %else
 %if 0%{?mdkversion}
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
+Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
 %else
 %if 0%{?suse_version}
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
+Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
 %else
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_generic/%{name}-%{version}.tgz
+Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_generic/%{name}-%{version}.tgz
 %endif
 %endif
 %endif
@@ -245,6 +245,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
+%_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
 %_datadir/dolibarr/htdocs/commande
 %_datadir/dolibarr/htdocs/compta
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index fd35227a242..1fb1b7fcc75 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -18,8 +18,8 @@ License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team
 
-URL: http://www.dolibarr.org
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
+URL: https://www.dolibarr.org
+Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
 Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 02a5f8a1819..1bb7ef061e6 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -18,8 +18,8 @@ License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team
 
-URL: http://www.dolibarr.org
-Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
+URL: https://www.dolibarr.org
+Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
 Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -173,6 +173,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
+%_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
 %_datadir/dolibarr/htdocs/commande
 %_datadir/dolibarr/htdocs/compta
diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php
new file mode 100644
index 00000000000..0c892c4e776
--- /dev/null
+++ b/htdocs/collab/index.php
@@ -0,0 +1,507 @@
+<?php
+/* Copyright (C) 2016-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       htdocs/collab/index.php
+ *		\ingroup    collab
+ *		\brief      Page to work on a shared document (PAD)
+ */
+
+define('NOSCANPOSTFORINJECTION',1);
+define('NOSTYLECHECK',1);
+
+
+/**
+ *	Show HTML header HTML + BODY + Top menu + left menu + DIV
+ *
+ * @param 	string 	$head				Optionnal head lines
+ * @param 	string 	$title				HTML title
+ * @param	string	$help_url			Url links to help page
+ * 		                            	Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
+ *                                  	For other external page: http://server/url
+ * @param	string	$target				Target to use on links
+ * @param 	int    	$disablejs			More content into html header
+ * @param 	int    	$disablehead		More content into html header
+ * @param 	array  	$arrayofjs			Array of complementary js files
+ * @param 	array  	$arrayofcss			Array of complementary css files
+ * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (set this only if autodetect fails)
+ * @return	void
+ */
+function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='')
+{
+    global $conf;
+
+    // html header
+    top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+
+    print '<body id="mainbody">';
+    
+    // top menu and left menu area
+    if (empty($conf->dol_hide_topmenu))
+    {
+        top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
+    }
+    if (empty($conf->dol_hide_leftmenu))
+    {
+        left_menu('', $help_url, '', '', 1, $title, 1);
+    }
+
+    // main area
+    //main_area($title);
+    print '<!-- Begin div class="fiche" -->'."\n".'<div class="fichebutwithotherclass">'."\n";
+}
+
+
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+$langs->load("admin");
+$langs->load("other");
+$langs->load("website");
+
+if (! $user->admin) accessforbidden();
+
+if (! ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)))
+{
+    $conf->dol_hide_leftmenu = 1;   // Force hide of left menu.
+}
+
+$error=0;
+$website=GETPOST('website', 'alpha');
+$page=GETPOST('page', 'alpha');
+$pageid=GETPOST('pageid', 'int');
+$action=GETPOST('action','alpha');
+
+if (GETPOST('delete')) { $action='delete'; }
+if (GETPOST('preview')) $action='preview';
+if (GETPOST('create')) { $action='create'; }
+if (GETPOST('editmedia')) { $action='editmedia'; }
+if (GETPOST('editcss')) { $action='editcss'; }
+if (GETPOST('editmenu')) { $action='editmenu'; }
+if (GETPOST('setashome')) { $action='setashome'; }
+if (GETPOST('editmeta')) { $action='editmeta'; }
+if (GETPOST('editcontent')) { $action='editcontent'; }
+
+if (empty($action)) $action='preview';
+
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('refreshsite')) $pageid=0;      // If we change the site, we reset the pageid.
+if (GETPOST('refreshpage')) $action='preview'; 
+
+
+// Add a collab page
+if ($action == 'add')
+{
+    $db->begin();
+
+    $objectpage->title = GETPOST('WEBSITE_TITLE');
+    $objectpage->pageurl = GETPOST('WEBSITE_PAGENAME');
+    $objectpage->description = GETPOST('WEBSITE_DESCRIPTION');
+    $objectpage->keywords = GETPOST('WEBSITE_KEYWORD');
+
+    if (empty($objectpage->title))
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WEBSITE_PAGENAME")), null, 'errors');
+        $error++;
+    }
+
+    if (! $error)
+    {
+        $res = $objectpage->create($user);
+        if ($res <= 0)
+        {
+            $error++;
+            setEventMessages($objectpage->error, $objectpage->errors, 'errors');
+        }
+    }
+	if (! $error)
+	{
+		$db->commit();
+	    setEventMessages($langs->trans("PageAdded", $objectpage->pageurl), null, 'mesgs');
+	    $action='';
+	}
+	else
+	{
+		$db->rollback();
+	}
+	
+	$action = 'preview';
+	$id = $objectpage->id;
+}
+
+// Update page
+if ($action == 'delete')
+{
+    $db->begin();
+
+    $res = $object->fetch(0, $website);
+
+    $res = $objectpage->fetch($pageid, $object->fk_website);
+
+    if ($res > 0)
+    {
+        $res = $objectpage->delete($user);
+        if (! $res > 0)
+        {
+            $error++;
+            setEventMessages($objectpage->error, $objectpage->errors, 'errors');
+        }
+
+        if (! $error)
+        {
+            $db->commit();
+            setEventMessages($langs->trans("PageDeleted", $objectpage->pageurl, $website), null, 'mesgs');
+            
+            header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website);
+            exit;
+        }
+        else
+        {
+            $db->rollback();
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url='';
+
+llxHeader('', $langs->trans("WebsiteSetup"), $help_url);
+
+print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST"><div>';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+if ($action == 'create')
+{
+    print '<input type="hidden" name="action" value="add">';
+}
+
+
+// Add a margin under toolbar ?
+$style='';
+if ($action != 'preview' && $action != 'editcontent') $style=' margin-bottom: 5px;';
+
+//var_dump($objectpage);exit;
+print '<div class="centpercent websitebar">';
+
+if (count($object->records) > 0)
+{
+    // ***** Part for web sites
+    
+    print '<div class="websiteselection hideonsmartphoneimp">';
+    print $langs->trans("Website").': ';
+    print '</div>';
+
+    // List of websites
+    print '<div class="websiteselection">';
+    $out='';
+    $out.='<select name="website" class="minwidth100" id="website">';
+    if (empty($object->records)) $out.='<option value="-1">&nbsp;</option>';
+    // Loop on each sites
+    $i=0;
+    foreach($object->records as $key => $valwebsite)
+    {
+        if (empty($website)) $website=$valwebsite->ref;
+
+        $out.='<option value="'.$valwebsite->ref.'"';
+        if ($website == $valwebsite->ref) $out.=' selected';		// To preselect a value
+        $out.='>';
+        $out.=$valwebsite->ref;
+        $out.='</option>';
+        $i++;
+    }
+    $out.='</select>';
+    $out.=ajax_combobox('website');
+    print $out;
+    print '<input type="submit" class="button" name="refreshsite" value="'.$langs->trans("Load").'">';
+
+    if ($website)
+    {
+        $virtualurl='';
+        $dataroot=DOL_DATA_ROOT.'/websites/'.$website;
+        if (! empty($object->virtualhost)) $virtualurl=$object->virtualhost;
+    }
+    
+    if ($website && $action == 'preview')
+    {
+        $disabled='';
+        if (empty($user->rights->websites->write)) $disabled=' disabled="disabled"';
+    
+        print ' &nbsp; ';
+        
+        //print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="editmedia">';
+        print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
+        print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditMenu")).'" name="editmenu">';
+        print '<input type="submit"'.$disabled.' class="button" value="'.dol_escape_htmltag($langs->trans("AddPage")).'" name="create">';
+    }
+    
+    print '</div>';
+
+    // Button for websites
+    print '<div class="websitetools">';
+
+    if ($action == 'preview')
+    {
+        print '<div class="websiteinputurl">';
+        print '<input type="text" id="previewsiteurl" class="minwidth200imp" name="previewsite" placeholder="'.$langs->trans("http://myvirtualhost").'" value="'.$virtualurl.'">';
+        //print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
+        $htmltext=$langs->trans("SetHereVirtualHost", $dataroot);
+        print $form->textwithpicto('', $htmltext);
+        print '</div>';
+        
+        $urlext=$virtualurl;
+        $urlint=$urlwithroot.'/public/websites/index.php?website='.$website;
+        //if (! empty($object->virtualhost))
+        //{
+            print '<a class="websitebuttonsitepreview" id="previewsiteext" href="'.$urlext.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext)).'">';
+            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
+            print '</a>';
+        //}
+        
+        print '<a class="websitebuttonsitepreview" id="previewsite" href="'.$urlwithroot.'/public/websites/index.php?website='.$website.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint)).'">';
+        print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint, $dataroot), 1, 'preview');
+        print '</a>';
+    }
+
+    if (in_array($action, array('editcss','editmenu','create')))
+    {
+        if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">';
+        if (preg_match('/^create/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+        if (preg_match('/^edit/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+    }
+    
+    print '</div>';
+
+
+    // ***** Part for pages
+    
+    if ($website)
+    {
+        print '</div>';
+
+        $array=$objectpage->fetchAll($object->id);
+        if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+        $atleastonepage=(is_array($array) && count($array) > 0);
+        
+        print '<div class="centpercent websitebar"'.($style?' style="'.$style.'"':'').'">';
+        print '<div class="websiteselection hideonsmartphoneimp">';
+        print $langs->trans("Page").': ';
+        print '</div>';
+        print '<div class="websiteselection">';
+        
+        if ($action != 'add')
+        {
+            $out='';
+            $out.='<select name="pageid" id="pageid" class="minwidth200">';
+            if ($atleastonepage)
+            {
+                if (empty($pageid) && $action != 'create')      // Page id is not defined, we try to take one
+                {
+                    $firstpageid=0;$homepageid=0;
+                    foreach($array as $key => $valpage)
+                    {
+                        if (empty($firstpageid)) $firstpageid=$valpage->id;
+                        if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid=$valpage->id;
+                    }
+                    $pageid=$homepageid?$homepageid:$firstpageid;   // We choose home page and if not defined yet, we take first page
+                }
+    
+                foreach($array as $key => $valpage)
+                {
+                    $out.='<option value="'.$key.'"';
+                    if ($pageid > 0 && $pageid == $key) $out.=' selected';		// To preselect a value
+                    $out.='>';
+                    $out.=$valpage->title;
+                    if ($object->fk_default_home && $key == $object->fk_default_home) $out.=' ('.$langs->trans("HomePage").')';
+                    $out.='</option>';
+                }
+            }
+            else $out.='<option value="-1">&nbsp;</option>';
+            $out.='</select>';
+            $out.=ajax_combobox('pageid');
+            print $out;
+        }
+        else
+        {
+            print $langs->trans("New");
+        }
+
+        print '<input type="submit" class="button" name="refreshpage" value="'.$langs->trans("Load").'"'.($atleastonepage?'':' disabled="disabled"').'>';
+        //print $form->selectarray('page', $array);
+        
+        if ($action == 'preview')
+        {
+            $disabled='';
+            if (empty($user->rights->websites->write)) $disabled=' disabled="disabled"';
+        
+            if ($pageid > 0)
+            {
+                print ' &nbsp; ';
+                
+                if ($object->fk_default_home > 0 && $pageid == $object->fk_default_home) print '<input type="submit" class="button" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
+                else print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
+                print '<input type="submit" class="button"'.$disabled.'  value="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'" name="editmeta">';
+                print '<input type="submit" class="button"'.$disabled.'  value="'.dol_escape_htmltag($langs->trans("EditPageContent")).'" name="editcontent">';
+                //print '<a href="'.$_SERVER["PHP_SELF"].'?action=editmeta&website='.urlencode($website).'&pageid='.urlencode($pageid).'" class="button">'.dol_escape_htmltag($langs->trans("EditPageMeta")).'</a>';
+                //print '<a href="'.$_SERVER["PHP_SELF"].'?action=editcontent&website='.urlencode($website).'&pageid='.urlencode($pageid).'" class="button">'.dol_escape_htmltag($langs->trans("EditPageContent")).'</a>';
+                print '<input type="submit" class="buttonDelete" name="delete" value="'.$langs->trans("Delete").'"'.($atleastonepage?'':' disabled="disabled"').'>';
+            }
+        }
+        
+        print '</div>';
+        print '<div class="websiteselection">';
+        print '</div>';
+
+        print '<div class="websitetools">';
+
+        if ($website && $pageid > 0 && $action == 'preview')
+        {
+            $websitepage = new WebSitePage($db);
+            $websitepage->fetch($pageid);
+            
+            $realpage=$urlwithroot.'/public/websites/index.php?website='.$website.'&page='.$pageid;
+            $pagealias = $websitepage->pageurl;
+            
+            print '<div class="websiteinputurl">';
+            print '<input type="text" id="previewpageurl" class="minwidth200imp" name="previewsite" value="'.$pagealias.'" disabled="disabled">';
+            //print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
+            $htmltext=$langs->trans("WEBSITE_PAGENAME", $pagealias);
+            print $form->textwithpicto('', $htmltext);
+            print '</div>';
+            
+            if (! empty($object->virtualhost))
+            {
+                $urlext=$virtualurl.'/'.$pagealias.'.php';
+                print '<a class="websitebuttonsitepreview" id="previewpageext" href="'.$urlext.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext)).'">';
+                print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
+                print '</a>';
+            }
+            else
+            {
+                print '<a class="websitebuttonsitepreview" id="previewpageextnoclick" href="#">';
+                print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
+                print '</a>';
+            }
+            
+            print '<a class="websitebuttonsitepreview" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage)).'">';
+            print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot), 1, 'preview'); 
+            print '</a>';       // View page in new Tab
+            //print '<input type="submit" class="button" name="previewpage" target="tab'.$website.'"value="'.$langs->trans("ViewPageInNewTab").'">';
+            
+            // TODO Add js to save alias like we save virtual host name and use dynamic virtual host for url of id=previewpageext
+        }
+        if (! in_array($action, array('editcss','editmenu','create')))
+        {
+            if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">';
+            if (preg_match('/^create/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+            if (preg_match('/^edit/',$action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+        }
+        
+        print '</div>';
+
+        if ($action == 'preview')
+        {
+            // Adding jquery code to change on the fly url of preview ext
+            if (! empty($conf->use_javascript_ajax))
+            {
+                print '<script type="text/javascript" language="javascript">
+                    jQuery(document).ready(function() {
+                    	jQuery("#previewsiteext,#previewpageext").click(function() {
+                            newurl=jQuery("#previewsiteurl").val();
+                            newpage=jQuery("#previewsiteurl").val() + "/" + jQuery("#previewpageurl").val() + ".php";
+                            console.log("Open url "+newurl);
+                            /* Save url */
+                            jQuery.ajax({
+                                method: "POST",
+                                url: "'.DOL_URL_ROOT.'/core/ajax/saveinplace.php",
+                                data: {
+                                    field: \'editval_virtualhost\',
+                                    element: \'websites\',
+                                    table_element: \'website\',
+                                    fk_element: '.$object->id.',
+                                    value: newurl,
+                                },
+                                context: document.body
+                            });
+                    
+                            jQuery("#previewsiteext").attr("href",newurl);
+                            jQuery("#previewpageext").attr("href",newpage);
+                        });
+                    });
+                    </script>';
+            }
+        }
+    }
+}
+else
+{
+    print '<div class="websiteselection">';
+    $langs->load("errors");
+    print $langs->trans("ErrorModuleSetupNotComplete");
+    print '<div>';
+    $action='';
+}
+
+
+print '</div>';
+
+$head = array();
+
+if ($action == 'editcontent')
+{
+    /*
+     * Editing global variables not related to a specific theme
+     */
+    
+    $csscontent = @file_get_contents($filecss);
+    
+    $contentforedit = '';
+    /*$contentforedit.='<style scoped>'."\n";        // "scoped" means "apply to parent element only". Not yet supported by browsers
+    $contentforedit.=$csscontent;
+    $contentforedit.='</style>'."\n";*/
+    $contentforedit .= $objectpage->content;
+    
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor('PAGE_CONTENT',$contentforedit,'',500,'Full','',true,true,true,ROWS_5,'90%');
+    $doleditor->Create(0, '', false);
+}
+
+print "</div>\n</form>\n";
+
+
+
+
+llxFooter();
+
+$db->close();

From cc95e046e52ae44e35ff6e64e38e56351fe6191f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 03:34:49 +0200
Subject: [PATCH 0831/1163] NEW Can sort customer balance summary on date

---
 htdocs/compta/recap-compta.php | 50 ++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 2a1234fccc1..a383f841a47 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,6 +39,30 @@ $result = restrictedArea($user, 'societe', $id, '&societe');
 $object = new Societe($db);
 if ($id > 0) $object->fetch($id);
 
+// Load variable for pagination
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="f.datef"; // Set here default search field
+if (! $sortorder) $sortorder="DESC";
+
+
+$arrayfields=array(
+    'f.datef'=>array('label'=>"Date", 'checked'=>1),
+    //...    
+);
+
+/*
+ * Actions
+ */
+
+// None
+
 
 /*
  *	View
@@ -55,10 +79,10 @@ llxHeader('',$title,$help_url);
 
 if ($id > 0)
 {
-	/*
-	 * Affichage onglets
-	 */
-	$head = societe_prepare_head($object);
+    $param='';
+    if ($id > 0) $param.='&socid='.$id;
+
+    $head = societe_prepare_head($object);
 
 	dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
 	dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom', '', '', 0, '', '', 1);
@@ -71,7 +95,7 @@ if ($id > 0)
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td width="100" align="center">'.$langs->trans("Date").'</td>';
+        if (! empty($arrayfields['f.datef']['checked']))  print_liste_field_titre($arrayfields['f.datef']['label'],$_SERVER["PHP_SELF"],"f.datef","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 		print '<td>'.$langs->trans("Element").'</td>';
 		print '<td>'.$langs->trans("Status").'</td>';
 		print '<td align="right">'.$langs->trans("Debit").'</td>';
@@ -90,7 +114,7 @@ if ($id > 0)
 		$sql.= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$object->id;
 		$sql.= " AND f.entity = ".$conf->entity;
 		$sql.= " AND f.fk_user_valid = u.rowid";
-		$sql.= " ORDER BY f.datef ASC";
+		$sql.= $db->order($sortfield, $sortorder);
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -177,13 +201,13 @@ if ($id > 0)
 		}
 		
 		if(empty($TData)) {
-			print '<tr '.$bc[false].'><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
 		} else {
-		
+			
 			// Sort array by date
 			asort($TDataSort);
 			array_multisort($TData,$TDataSort);
-			
+
 			// Balance calculation
 			foreach($TData as &$data1) {
 				$balance += $data1['amount'];
@@ -191,7 +215,8 @@ if ($id > 0)
 			}
 			
 			// Reverse array to have last elements on top
-			$TData = array_reverse($TData);
+			$TData = dol_sort_array($TData, 'date', $sortorder);
+				
 			
 			$totalDebit = 0;
 			$totalCredit = 0;
@@ -223,7 +248,8 @@ if ($id > 0)
 			print '<td colspan="3">&nbsp;</td>';
 			print '<td align="right">'.price($totalDebit).'</td>';
 			print '<td align="right">'.price($totalCredit).'</td>';
-			print '<td colspan="2">&nbsp;</td>';
+			print '<td align="right">'.price(price2num($totalDebit - $totalCredit, 'MT')).'</td>';
+			print '<td></td>';
 			print "</tr>\n";
 		}
 		

From cc16bb0befc906751b4dc29d22ac0497d17c20b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 12:22:55 +0200
Subject: [PATCH 0832/1163] Debug default value feature.

---
 htdocs/admin/defaultvalues.php    |  6 +++
 htdocs/core/lib/functions.lib.php | 74 +++++++++++++++----------------
 htdocs/projet/card.php            | 12 ++---
 3 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 013be811b5b..7ebc67472d1 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -271,6 +271,12 @@ if ($mode != 'focus')
         $texthelp.='__DAY__<br>';
         $texthelp.='__MONTH__<br>';
         $texthelp.='__YEAR__<br>';
+        $texthelp.='__PREVIOUS_DAY__<br>';
+        $texthelp.='__PREVIOUS_MONTH__<br>';
+        $texthelp.='__PREVIOUS_YEAR__<br>';
+        $texthelp.='__NEXT_DAY__<br>';
+        $texthelp.='__NEXT_MONTH__<br>';
+        $texthelp.='__NEXT_YEAR__<br>';
         if (! empty($conf->multicompany->enabled)) $texthelp.='__ENTITYID__<br>';
         $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');
     }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d2638898a33..63990112be5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -240,7 +240,7 @@ function dol_shutdown()
  *  Return value of a param into GET or POST supervariable
  *
  *  @param	string	$paramname   Name of parameter to found
- *  @param	string	$check	     Type of check (''=no check,  'int'=check it's numeric, 'alpha'=check it's text and sign, 'aZ'=check it's a-z only, 'array'=check it's array, 'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string), 'day', 'month', 'year', 'custom'= custom filter specify $filter and $options)
+ *  @param	string	$check	     Type of check (''=no check, 'none'=no check, 'int'=check it's numeric, 'alpha'=check it's text and sign, 'aZ'=check it's a-z only, 'array'=check it's array, 'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string), 'day', 'month', 'year', 'custom'= custom filter specify $filter and $options)
  *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get, 4 = post then get then cookie)
  *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
  *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'.
@@ -249,6 +249,8 @@ function dol_shutdown()
  */
 function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 {
+    global $mysoc,$user,$conf;
+    
     if (empty($method)) $out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
 	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
 	elseif ($method==2) $out = isset($_POST[$paramname])?$_POST[$paramname]:'';
@@ -258,8 +260,6 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	
 	if (empty($method) || $method == 3 || $method == 4)
 	{
-	    global $conf;
-	    
 	    // Management of default values
 	    if (! isset($_GET['sortfield']) && ! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_DISABLE_DEFAULT_VALUES is on
 	    {
@@ -320,43 +320,41 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	if (! empty($check))
 	{
 	    // Replace vars like __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__
-	    // TODO Add more var like __PREVIOUSDAY__, __PREVIOUSMONTH__, __PREVIOUSYEAR__
-	    if (! is_array($out) && preg_match('/^__([a-z0-9]+)__$/i', $out, $reg))
+	    if (! is_array($out))
 	    {
-	        if ($reg[1] == 'DAY')
+	        $maxloop=20; $loopnb=0;    // Protection against infinite loop
+	        while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'
 	        {
-    	        $tmp=dol_getdate(dol_now(), true);
-    	        $out = $tmp['mday'];
-	        }
-	        elseif ($reg[1] == 'MONTH')
-	        {
-    	        $tmp=dol_getdate(dol_now(), true);
-    	        $out = $tmp['mon'];
-	        }
-	        elseif ($reg[1] == 'YEAR')
-	        {
-	            $tmp=dol_getdate(dol_now(), true);
-	            $out = $tmp['year'];
-	        }
-	        elseif ($reg[1] == 'MYCOUNTRYID')
-	        {
-	            global $mysoc;
-	            $out = $mysoc->country_id;
-	        }
-	        elseif ($reg[1] == 'USERID')
-	        {
-	            global $user;
-	            $out = $user->id;
-	        }
-	    	elseif ($reg[1] == 'SUPERVISORID')
-	        {
-	            global $user;
-	            $out = $user->fk_user;
-	        }
-	        elseif ($reg[1] == 'ENTITYID')
-	        {
-	            global $conf;
-	            $out = $conf->entity;
+	            $loopnb++; $newout = '';
+
+    	        if ($reg[1] == 'DAY')       { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
+    	        elseif ($reg[1] == 'MONTH') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon'];  }
+    	        elseif ($reg[1] == 'YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; }
+    	    	elseif ($reg[1] == 'PREVIOUS_DAY')   { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
+    	        elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
+    	        elseif ($reg[1] == 'PREVIOUS_YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); }
+    	    	elseif ($reg[1] == 'NEXT_DAY')   { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
+    	        elseif ($reg[1] == 'NEXT_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
+    	        elseif ($reg[1] == 'NEXT_YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
+    	        elseif ($reg[1] == 'MYCOUNTRYID')
+    	        {
+    	            $newout = $mysoc->country_id;
+    	        }
+    	        elseif ($reg[1] == 'USERID')
+    	        {
+    	            $newout = $user->id;
+    	        }
+    	    	elseif ($reg[1] == 'SUPERVISORID')
+    	        {
+    	            $newout = $user->fk_user;
+    	        }
+    	        elseif ($reg[1] == 'ENTITYID')
+    	        {
+    	            $newout = $conf->entity;
+    	        }
+    	        else $newout = '';     // Key not found, we replace with empty string
+    	        //var_dump('__'.$reg[1].'__ -> '.$newout);
+    	        $out = preg_replace('/__'.preg_quote($reg[1],'/').'__/', $newout, $out);
 	        }
 	    }
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 791cd6855f0..1ee81f7b917 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -142,9 +142,9 @@ if (empty($reshook))
 	        $db->begin();
 
 	        $object->ref             = GETPOST('ref','alpha');
-	        $object->title           = GETPOST('title'); // Do not use 'alpha' here, we want field as it is
+	        $object->title           = GETPOST('title','none'); // Do not use 'alpha' here, we want field as it is
 	        $object->socid           = GETPOST('socid','int');
-	        $object->description     = GETPOST('description'); // Do not use 'alpha' here, we want field as it is
+	        $object->description     = GETPOST('description','none'); // Do not use 'alpha' here, we want field as it is
 	        $object->public          = GETPOST('public','alpha');
 	        $object->opp_amount      = price2num(GETPOST('opp_amount'));
 	        $object->budget_amount   = price2num(GETPOST('budget_amount'));
@@ -243,9 +243,9 @@ if (empty($reshook))
 			$old_start_date = $object->date_start;
 
 	        $object->ref          = GETPOST('ref','alpha');
-	        $object->title        = GETPOST('title'); // Do not use 'alpha' here, we want field as it is
+	        $object->title        = GETPOST('title','none'); // Do not use 'alpha' here, we want field as it is
 	        $object->socid        = GETPOST('socid','int');
-	        $object->description  = GETPOST('description');	// Do not use 'alpha' here, we want field as it is
+	        $object->description  = GETPOST('description','none');	// Do not use 'alpha' here, we want field as it is
 	        $object->public       = GETPOST('public','alpha');
 	        $object->date_start   = empty($_POST["projectstart"])?'':$date_start;
 	        $object->date_end     = empty($_POST["projectend"])?'':$date_end;
@@ -509,7 +509,7 @@ if ($action == 'create' && $user->rights->projet->creer)
     print '</td></tr>';
 
     // Label
-    print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td><td><input size="80" type="text" name="title" value="'.GETPOST("title").'"></td></tr>';
+    print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td><td><input size="80" type="text" name="title" value="'.GETPOST("title",'none').'"></td></tr>';
 
     // Thirdparty
     if ($conf->societe->enabled)
@@ -588,7 +588,7 @@ if ($action == 'create' && $user->rights->projet->creer)
     // Description
     print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
     print '<td>';
-    print '<textarea name="description" wrap="soft" class="centpercent" rows="'.ROWS_3.'">'.GETPOST("description").'</textarea>';
+    print '<textarea name="description" wrap="soft" class="centpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST("description",'none')).'</textarea>';
     print '</td></tr>';
 
     if ($conf->categorie->enabled) {

From 99cc67d12312d0a7952883d053443eecd5a8a56a Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Tue, 16 May 2017 12:43:16 +0200
Subject: [PATCH 0833/1163] Update code using new css class

---
 htdocs/compta/resultat/clientfourn.php | 67 ++++++++------------------
 1 file changed, 21 insertions(+), 46 deletions(-)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 5c77bbba21d..1b5a232b812 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -231,13 +231,11 @@ $result = $db->query($sql);
 if ($result) {
     $num = $db->num_rows($result);
     $i = 0;
-    $var=true;
     while ($i < $num)
     {
         $objp = $db->fetch_object($result);
         
-
-        print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+        print '<tr class="oddeven"><td>&nbsp;</td>';
         print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
 
         if ($modecompta == 'CREANCES-DETTES')
@@ -282,7 +280,7 @@ if ($modecompta != 'CREANCES-DETTES')
                 $objp = $db->fetch_object($result);
                 
 
-                print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+                print '<tr class="oddeven"><td>&nbsp;</td>';
                 print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
 
                 if ($modecompta == 'CREANCES-DETTES')
@@ -303,9 +301,8 @@ if ($modecompta != 'CREANCES-DETTES')
 }
 
 if ($total_ttc == 0)
-{
-    
-    print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+{    
+    print '<tr class="oddeven"><td>&nbsp;</td>';
     print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
     print '</tr>';
 }
@@ -361,15 +358,13 @@ $result = $db->query($sql);
 if ($result) {
     $num = $db->num_rows($result);
     $i = 0;
-    $var=true;
     if ($num > 0)
     {
         while ($i < $num)
         {
             $objp = $db->fetch_object($result);
             
-
-            print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+            print '<tr class="oddeven"><td>&nbsp;</td>';
             print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
 
             if ($modecompta == 'CREANCES-DETTES')
@@ -386,9 +381,8 @@ if ($result) {
         }
     }
     else
-    {
-        
-        print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+    {        
+        print '<tr class="oddeven"><td>&nbsp;</td>';
         print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
         print '</tr>';
     }
@@ -447,7 +441,6 @@ $subtotal_ht = 0;
 $subtotal_ttc = 0;
 if ($result) {
     $num = $db->num_rows($result);
-    $var=true;
     $i = 0;
     if ($num) {
         while ($i < $num) {
@@ -458,8 +451,7 @@ if ($result) {
             $subtotal_ht += $obj->amount;
             $subtotal_ttc += $obj->amount;
 
-            $var = !$var;
-            print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+            print '<tr class="oddeven"><td>&nbsp;</td>';
             print '<td>'.$obj->label.'</td>';
             if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
             print '<td align="right">'.price(-$obj->amount).'</td>';
@@ -468,8 +460,7 @@ if ($result) {
         }
     }
     else {
-        $var = !$var;
-        print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+        print '<tr class="oddeven"><td>&nbsp;</td>';
         print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
         print '</tr>';
     }
@@ -526,7 +517,6 @@ $subtotal_ht = 0;
 $subtotal_ttc = 0;
 if ($result) {
     $num = $db->num_rows($result);
-    $var=true;
     $i = 0;
     if ($num) {
         while ($i < $num) {
@@ -537,8 +527,7 @@ if ($result) {
             $subtotal_ht += $obj->amount;
             $subtotal_ttc += $obj->amount;
 
-            $var = !$var;
-            print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+            print '<tr class="oddeven"><td>&nbsp;</td>';
             print '<td>'.$obj->label.'</td>';
             if ($modecompta == 'CREANCES-DETTES')
             	print '<td align="right">'.price(-$obj->amount).'</td>';
@@ -548,8 +537,7 @@ if ($result) {
         }
     }
     else {
-        $var = !$var;
-        print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+        print '<tr class="oddeven"><td>&nbsp;</td>';
         print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
         print '</tr>';
     }
@@ -615,7 +603,6 @@ if (! empty($conf->salaries->enabled))
 	if ($result)
 	{
 	    $num = $db->num_rows($result);
-	    $var=true;
 	    $i = 0;
 	    if ($num)
 	    {
@@ -628,8 +615,7 @@ if (! empty($conf->salaries->enabled))
 	            $subtotal_ht += $obj->amount;
 	            $subtotal_ttc += $obj->amount;
 
-	            $var = !$var;
-	            print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+	            print '<tr class="oddeven"><td>&nbsp;</td>';
 
 	            print "<td>".$langs->trans("Salary")." <a href=\"".DOL_URL_ROOT."/compta/salaries/index.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
@@ -641,8 +627,7 @@ if (! empty($conf->salaries->enabled))
 	    }
 	    else
 	    {
-	        $var = !$var;
-	        print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+	        print '<tr class="oddeven"><td>&nbsp;</td>';
 	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 	        print '</tr>';
 	    }
@@ -704,7 +689,6 @@ if (! empty($conf->expensereport->enabled))
 	if ($result)
 	{
 		$num = $db->num_rows($result);
-		$var=true;
 		if ($num)
 		{
 			while ($obj = $db->fetch_object($result))
@@ -714,8 +698,7 @@ if (! empty($conf->expensereport->enabled))
 				$subtotal_ht += $obj->amount_ht;
 				$subtotal_ttc += $obj->amount_ttc;
 
-				$var = !$var;
-				print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+				print '<tr class="oddeven"><td>&nbsp;</td>';
 
 				print "<td>".$langs->trans("ExpenseReport")." <a href=\"".DOL_URL_ROOT."/expensereport/list.php?search_user=".$obj->userid."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
@@ -726,8 +709,7 @@ if (! empty($conf->expensereport->enabled))
 		}
 		else
 		{
-			$var = !$var;
-			print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 			print '</tr>';
 		}
@@ -782,7 +764,6 @@ if (! empty($conf->don->enabled))
 	if ($result)
 	{
 		$num = $db->num_rows($result);
-		$var=true;
 		$i = 0;
 		if ($num)
 		{
@@ -795,8 +776,7 @@ if (! empty($conf->don->enabled))
 				$subtotal_ht += $obj->amount;
 				$subtotal_ttc += $obj->amount;
 
-				$var = !$var;
-				print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+				print '<tr class="oddeven"><td>&nbsp;</td>';
 
 				print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/don/list.php?search_company=".$obj->name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
@@ -808,8 +788,7 @@ if (! empty($conf->don->enabled))
 		}
 		else
 		{
-			$var = !$var;
-			print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 			print '</tr>';
 		}
@@ -859,7 +838,6 @@ if ($modecompta == 'CREANCES-DETTES')
     if ($result)
     {
         $num = $db->num_rows($result);
-        $var=false;
         $i = 0;
         if ($num)
         {
@@ -878,7 +856,7 @@ if ($modecompta == 'CREANCES-DETTES')
     } else {
         dol_print_error($db);
     }
-    print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+    print '<tr class="oddeven"><td>&nbsp;</td>';
     print "<td>".$langs->trans("VATToPay")."</td>\n";
     print "<td align=\"right\">&nbsp;</td>\n";
     print "<td align=\"right\">".price($amount)."</td>\n";
@@ -908,7 +886,6 @@ if ($modecompta == 'CREANCES-DETTES')
     if ($result)
     {
         $num = $db->num_rows($result);
-        $var=true;
         $i = 0;
         if ($num)
         {
@@ -928,7 +905,7 @@ if ($modecompta == 'CREANCES-DETTES')
     } else {
         dol_print_error($db);
     }
-    print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+    print '<tr class="oddeven"><td>&nbsp;</td>';
     print "<td>".$langs->trans("VATToCollect")."</td>\n";
     print "<td align=\"right\">&nbsp;</td>\n";
     print "<td align=\"right\">".price($amount)."</td>\n";
@@ -955,7 +932,6 @@ else
     $result=$db->query($sql);
     if ($result) {
         $num = $db->num_rows($result);
-        $var=false;
         $i = 0;
         if ($num) {
             while ($i < $num) {
@@ -974,7 +950,7 @@ else
     } else {
         dol_print_error($db);
     }
-    print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+    print '<tr class="oddeven"><td>&nbsp;</td>';
     print "<td>".$langs->trans("VATPaid")."</td>\n";
     if ($modecompta == 'CREANCES-DETTES')
     	print "<td align=\"right\">".price($amount)."</td>\n";
@@ -1000,7 +976,6 @@ else
     $result=$db->query($sql);
     if ($result) {
         $num = $db->num_rows($result);
-        $var=true;
         $i = 0;
         if ($num) {
             while ($i < $num) {
@@ -1021,7 +996,7 @@ else
     {
         dol_print_error($db);
     }
-    print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+    print '<tr class="oddeven"><td>&nbsp;</td>';
     print "<td>".$langs->trans("VATCollected")."</td>\n";
     if ($modecompta == 'CREANCES-DETTES')
     	print "<td align=\"right\">".price($amount)."</td>\n";

From 68e333879fee345e90523e6b424d944fa85f4143 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 13:27:32 +0200
Subject: [PATCH 0834/1163] Fix var not sanitized

---
 htdocs/accountancy/admin/account.php          |  2 +-
 htdocs/accountancy/admin/card.php             |  2 +-
 htdocs/accountancy/admin/categories.php       |  2 +-
 htdocs/accountancy/admin/fiscalyear.php       |  2 +-
 htdocs/accountancy/bookkeeping/card.php       |  2 +-
 htdocs/accountancy/expensereport/index.php    |  2 +-
 htdocs/accountancy/journal/bankjournal.php    |  2 +-
 .../journal/expensereportsjournal.php         |  2 +-
 .../accountancy/journal/purchasesjournal.php  |  2 +-
 htdocs/accountancy/journal/sellsjournal.php   |  2 +-
 htdocs/accountancy/report/result.php          |  2 +-
 htdocs/adherents/ldap.php                     |  2 +-
 htdocs/adherents/list.php                     |  2 +-
 htdocs/admin/clicktodial.php                  |  2 +-
 htdocs/admin/company.php                      |  2 +-
 htdocs/admin/events.php                       |  2 +-
 htdocs/admin/external_rss.php                 |  2 +-
 htdocs/admin/geoipmaxmind.php                 |  2 +-
 htdocs/admin/ihm.php                          |  2 +-
 htdocs/admin/ldap.php                         |  2 +-
 htdocs/admin/ldap_contacts.php                |  2 +-
 htdocs/admin/ldap_groups.php                  |  2 +-
 htdocs/admin/ldap_members.php                 |  2 +-
 htdocs/admin/ldap_users.php                   |  2 +-
 htdocs/admin/mailman.php                      |  2 +-
 htdocs/admin/menus.php                        |  2 +-
 htdocs/admin/menus/edit.php                   |  2 +-
 htdocs/admin/notification.php                 |  2 +-
 htdocs/admin/perms.php                        |  2 +-
 htdocs/admin/proxy.php                        |  2 +-
 htdocs/admin/security.php                     |  2 +-
 htdocs/admin/sms.php                          |  2 +-
 htdocs/admin/spip.php                         |  2 +-
 htdocs/admin/syslog.php                       |  2 +-
 htdocs/admin/system/perf.php                  |  2 +-
 htdocs/admin/system/xcache.php                |  2 +-
 htdocs/api/admin/index.php                    |  2 +-
 htdocs/barcode/codeinit.php                   |  2 +-
 htdocs/barcode/printsheet.php                 |  2 +-
 htdocs/cashdesk/validation_verif.php          |  2 +-
 htdocs/categories/admin/categorie.php         |  2 +-
 htdocs/categories/edit.php                    |  2 +-
 htdocs/categories/photos.php                  |  2 +-
 htdocs/categories/viewcat.php                 |  2 +-
 htdocs/collab/index.php                       |  2 +-
 htdocs/comm/card.php                          |  2 +-
 htdocs/comm/mailing/advtargetemailing.php     |  2 +-
 htdocs/comm/mailing/cibles.php                |  2 +-
 htdocs/comm/remise.php                        |  2 +-
 htdocs/comm/remx.php                          |  2 +-
 htdocs/commande/customer.php                  |  2 +-
 htdocs/commande/document.php                  |  2 +-
 htdocs/compta/bank/card.php                   |  2 +-
 htdocs/compta/bank/categ.php                  |  4 +-
 htdocs/compta/bank/various_payment/info.php   |  2 +-
 htdocs/compta/clients.php                     |  2 +-
 htdocs/compta/paiement.php                    |  2 +-
 htdocs/compta/paiement/rapport.php            |  2 +-
 htdocs/compta/payment_sc/card.php             |  2 +-
 htdocs/compta/salaries/card.php               |  2 +-
 htdocs/compta/salaries/info.php               |  2 +-
 htdocs/compta/sociales/card.php               |  2 +-
 htdocs/compta/sociales/document.php           |  2 +-
 htdocs/compta/sociales/info.php               |  2 +-
 htdocs/compta/tva/info.php                    |  2 +-
 htdocs/contact/document.php                   |  2 +-
 htdocs/contact/ldap.php                       |  2 +-
 htdocs/contact/note.php                       |  2 +-
 htdocs/core/ajax/ajaxdirpreview.php           |  2 +-
 htdocs/core/ajax/bankconciliate.php           |  2 +-
 .../boxes/box_graph_invoices_permonth.php     |  4 +-
 .../box_graph_invoices_supplier_permonth.php  |  4 +-
 .../core/boxes/box_graph_orders_permonth.php  |  4 +-
 .../box_graph_orders_supplier_permonth.php    |  4 +-
 .../boxes/box_graph_product_distribution.php  |  6 +-
 .../boxes/box_graph_propales_permonth.php     |  4 +-
 htdocs/core/class/html.form.class.php         | 14 ++--
 htdocs/core/class/html.formfile.class.php     |  6 +-
 htdocs/core/datepicker.php                    |  1 -
 htdocs/core/get_menudiv.php                   |  1 -
 htdocs/core/lib/functions.lib.php             | 22 ++++++-
 htdocs/core/lib/security.lib.php              |  8 +--
 htdocs/core/lib/security2.lib.php             |  2 +-
 htdocs/core/lib/usergroups.lib.php            |  2 +-
 htdocs/core/menus/standard/auguria.lib.php    |  4 +-
 htdocs/core/menus/standard/eldy.lib.php       |  4 +-
 htdocs/core/menus/standard/empty.php          |  2 +-
 htdocs/core/search_page.php                   |  1 -
 htdocs/core/tpl/ajaxrow.tpl.php               |  2 +-
 htdocs/core/tpl/notes.tpl.php                 |  4 +-
 htdocs/document.php                           |  4 +-
 htdocs/don/payment/card.php                   |  2 +-
 htdocs/don/payment/payment.php                |  4 +-
 htdocs/ecm/docfile.php                        |  4 +-
 htdocs/ecm/index.php                          |  2 +-
 htdocs/ecm/index_auto.php                     |  2 +-
 htdocs/expensereport/card.php                 |  2 +-
 htdocs/expensereport/payment/card.php         |  2 +-
 htdocs/expensereport/payment/payment.php      |  4 +-
 htdocs/externalsite/frames.php                |  2 +-
 htdocs/fourn/card.php                         |  2 +-
 htdocs/fourn/commande/dispatch.php            |  2 +-
 htdocs/fourn/commande/note.php                |  2 +-
 htdocs/fourn/facture/card.php                 |  2 +-
 htdocs/fourn/facture/rapport.php              |  2 +-
 htdocs/ftp/index.php                          |  2 +-
 htdocs/holiday/define_holiday.php             |  2 +-
 htdocs/index.php                              |  2 +-
 htdocs/install/repair.php                     |  2 +-
 htdocs/install/step2.php                      |  2 +-
 htdocs/install/upgrade.php                    |  4 +-
 htdocs/install/upgrade2.php                   |  4 +-
 htdocs/loan/card.php                          |  2 +-
 htdocs/loan/document.php                      |  2 +-
 htdocs/loan/info.php                          |  2 +-
 htdocs/loan/note.php                          |  2 +-
 htdocs/loan/payment/card.php                  |  2 +-
 htdocs/loan/payment/payment.php               |  2 +-
 htdocs/main.inc.php                           | 66 +++++++++----------
 htdocs/master.inc.php                         |  2 +-
 htdocs/opensurvey/card.php                    |  2 +-
 htdocs/opensurvey/exportcsv.php               |  2 +-
 htdocs/opensurvey/list.php                    |  2 +-
 htdocs/opensurvey/results.php                 |  2 +-
 htdocs/product/note.php                       |  2 +-
 htdocs/product/stock/card.php                 |  2 +-
 htdocs/product/stock/mouvement.php            |  2 +-
 htdocs/product/stock/product.php              |  2 +-
 htdocs/projet/activity/perday.php             |  2 +-
 htdocs/projet/activity/perweek.php            |  2 +-
 htdocs/projet/note.php                        |  2 +-
 htdocs/public/demo/index.php                  |  2 +-
 htdocs/public/opensurvey/studs.php            |  2 +-
 htdocs/public/paybox/newpayment.php           |  4 +-
 htdocs/public/paypal/newpayment.php           |  4 +-
 htdocs/societe/card.php                       |  2 +-
 htdocs/societe/document.php                   |  2 +-
 htdocs/societe/note.php                       |  2 +-
 htdocs/societe/notify/card.php                |  2 +-
 htdocs/theme/eldy/style.css.php               | 31 +++++----
 htdocs/theme/md/style.css.php                 | 31 +++++----
 htdocs/user/card.php                          |  2 +-
 htdocs/user/document.php                      |  2 +-
 htdocs/user/note.php                          |  2 +-
 htdocs/user/notify/card.php                   |  2 +-
 htdocs/user/passwordforgotten.php             |  2 +-
 htdocs/variants/list.php                      |  2 +-
 htdocs/viewimage.php                          | 12 ++--
 htdocs/websites/index.php                     |  2 +-
 .../accountancy/export-thirdpartyaccount.php  |  2 +-
 150 files changed, 261 insertions(+), 248 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 7f909cd2f13..d3556135972 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -37,7 +37,7 @@ $langs->load("accountancy");
 $langs->load("salaries");
 
 $mesg = '';
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $cancel = GETPOST('cancel');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 8e77c4a5dab..3522460e07b 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -37,7 +37,7 @@ $langs->load("bills");
 $langs->load("accountancy");
 
 $mesg = '';
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $backtopage = GETPOST('backtopage');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 19c33d848c8..fd8c67246f4 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -36,7 +36,7 @@ $mesg = '';
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
 $cancel = GETPOST('cancel');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $cat_id = GETPOST('account_category');
 $selectcpt = GETPOST('cpt_bk', 'array');
 $cpt_id = GETPOST('cptid');
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 507a68a3c01..16e11225d49 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -25,7 +25,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 // Load variable for pagination
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 055451016e9..7ee3e6bb4fe 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -43,7 +43,7 @@ if ($user->societe_id > 0) {
 	accessforbidden();
 }
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $piece_num = GETPOST("piece_num");
 
 $mesg = '';
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 4bfeb630b02..a38194356bd 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -55,7 +55,7 @@ if ($year == 0) {
 }
 
 // Validate History
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index a68798869a2..d1602bedf00 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -71,7 +71,7 @@ $date_startyear = GETPOST('date_startyear');
 $date_endmonth = GETPOST('date_endmonth');
 $date_endday = GETPOST('date_endday');
 $date_endyear = GETPOST('date_endyear');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 $now = dol_now();
 
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 8e343bcbb08..f67224e3996 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -58,7 +58,7 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 232a6d7611c..f9cd162b6a0 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -57,7 +57,7 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 9af2bd2d135..85ce7361394 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -60,7 +60,7 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/accountancy/report/result.php b/htdocs/accountancy/report/result.php
index a487cb641ff..aa31185604a 100644
--- a/htdocs/accountancy/report/result.php
+++ b/htdocs/accountancy/report/result.php
@@ -35,7 +35,7 @@ $langs->load("accountancy");
 $langs->load("compta");
 
 $mesg = '';
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $cat_id = GETPOST('account_category');
 $selectcpt = GETPOST('cpt_bk');
 $id = GETPOST('id', 'int');
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index a5f61a45642..38e90663c0f 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -35,7 +35,7 @@ $langs->load("ldap");
 $langs->load("admin");
 
 $rowid = GETPOST('id','int');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 // Protection
 $socid=0;
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 7a6013b9b78..33d175e6350 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -37,7 +37,7 @@ $langs->load("companies");
 // Security check
 $result=restrictedArea($user,'adherent');
 
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $filter=GETPOST("filter");
 $statut=GETPOST("statut");
 $search=GETPOST("search");
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 86b94d8ecf0..df3c54f758c 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -30,7 +30,7 @@ $langs->load("admin");
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index ef22d8ecb4a..4487f81c2fe 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $langs->load("admin");
 $langs->load("companies");
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 74525a6855b..7a8c71c0130 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -35,7 +35,7 @@ $langs->load("users");
 $langs->load("admin");
 $langs->load("other");
 
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 
 $securityevent=new Events($db);
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 30646b749fa..1d9621ad378 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -38,7 +38,7 @@ if (!$user->admin) accessforbidden();
 
 $def = array();
 $lastexternalrss=0;
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 5a69a356777..5ae1a04e2ea 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -33,7 +33,7 @@ accessforbidden();
 $langs->load("admin");
 $langs->load("errors");
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 /*
  * Actions
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 6e5c814639b..7c23b62f230 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -45,7 +45,7 @@ $langs->load("agenda");
 
 if (! $user->admin) accessforbidden();
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 
 if (! defined("MAIN_MOTD")) define("MAIN_MOTD","");
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 770d91d1d11..4d8dab035ca 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -36,7 +36,7 @@ $langs->load("admin");
 if (!$user->admin)
   accessforbidden();
 
-  $action = GETPOST("action");
+  $action = GETPOST('action','aZ09');
 
 /*
  * Actions
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 27e32f8cd7c..d5ca994c258 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -38,7 +38,7 @@ $langs->load("errors");
 if (!$user->admin)
   accessforbidden();
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
   
 /*
  * Actions
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 192b11bfd8d..3f8869de70f 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -39,7 +39,7 @@ $langs->load("errors");
 if (!$user->admin)
   accessforbidden();
   
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index 8c7291c3dc4..afbf8da375a 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -39,7 +39,7 @@ $langs->load("errors");
 if (!$user->admin)
   accessforbidden();
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 /*
  * Actions
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 79f34001a63..43a6720a448 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -39,7 +39,7 @@ $langs->load("errors");
 if (!$user->admin)
   accessforbidden();
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 /*
  * Actions
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 27d7b59553a..3048f519a86 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -41,7 +41,7 @@ if (! $user->admin) accessforbidden();
 
 $type=array('yesno','texte','chaine');
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 $testsubscribeemail = GETPOST("testsubscribeemail");
 $testunsubscribeemail = GETPOST("testunsubscribeemail");
 
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index ddfb4d0cd62..888045f3297 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -27,7 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $langs->load("companies");
 $langs->load("products");
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 0a2669e960d..db03407fed1 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -43,7 +43,7 @@ foreach($dirmenus as $dirmenu)
     $dirsmartphone[]=$dirmenu.'smartphone';
 }
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $menu_handler_top=$conf->global->MAIN_MENU_STANDARD;
 $menu_handler_smartphone=$conf->global->MAIN_MENU_SMARTPHONE;
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index c82e64d48ea..73fb3d91587 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -41,7 +41,7 @@ $langs->load("mails");
 if (!$user->admin)
   accessforbidden();
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 5acbeb2e627..0c7ed656d9f 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -32,7 +32,7 @@ $langs->load("admin");
 $langs->load("users");
 $langs->load("other");
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 if (!$user->admin) accessforbidden();
 
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 224fac14ce7..ee22f377200 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -40,7 +40,7 @@ $upload_dir=$conf->admin->dir_temp;
  * Actions
  */
 
-if (GETPOST("action") == 'set_proxy')
+if (GETPOST('action','aZ09') == 'set_proxy')
 {
     if (GETPOST("MAIN_USE_CONNECT_TIMEOUT") && ! is_numeric(GETPOST("MAIN_USE_CONNECT_TIMEOUT")))
     {
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 4d0415dbd01..9627164f534 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -27,7 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $langs->load("users");
 $langs->load("admin");
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index faf05b7fb0f..0027f2e834d 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -43,7 +43,7 @@ $substitutionarrayfortest=array(
 '__FIRSTNAME__' => 'TESTFirstname'
 );
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index 241062732a4..12fc15823bd 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -41,7 +41,7 @@ if (! $user->admin) accessforbidden();
 
 $type=array('yesno','texte','chaine');
 
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 03a1872c90c..65933c25639 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -35,7 +35,7 @@ $langs->load("admin");
 $langs->load("other");
 
 $error=0;
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 
 $syslogModules = array();
 $activeModules = array();
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 9b23dc74089..25079d8f185 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -33,7 +33,7 @@ $langs->load("other");
 if (! $user->admin)
 	accessforbidden();
 
-if (GETPOST('action') == 'donothing')
+if (GETPOST('action','aZ09') == 'donothing')
 {
 	exit;
 }
diff --git a/htdocs/admin/system/xcache.php b/htdocs/admin/system/xcache.php
index 361be2b461a..53eaeec085f 100644
--- a/htdocs/admin/system/xcache.php
+++ b/htdocs/admin/system/xcache.php
@@ -26,7 +26,7 @@ $langs->load("admin");
 
 if (!$user->admin) accessforbidden();
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index 8142b564c1e..d7f002d02aa 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -34,7 +34,7 @@ $langs->load("admin");
 if (! $user->admin)
 	accessforbidden();
 
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 //Activate ProfId
 if ($action == 'setproductionmode')
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index ebe121301b7..1ebd512e772 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -38,7 +38,7 @@ $forbarcode=GETPOST('forbarcode');
 $fk_barcode_type=GETPOST('fk_barcode_type');
 $eraseallbarcode=GETPOST('eraseallbarcode');
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $producttmp=new Product($db);
 $thirdpartytmp=new Societe($db);
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index a60ac19d0af..a4857c94e87 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -45,7 +45,7 @@ $numberofsticker=GETPOST('numberofsticker','int');
 
 $mesg='';
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $producttmp=new Product($db);
 $thirdpartytmp=new Societe($db);
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index 0722b3fb92e..5e4ed9b028e 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $obj_facturation = unserialize($_SESSION['serObjFacturation']);
 unset ($_SESSION['serObjFacturation']);
 
-$action =GETPOST('action');
+$action =GETPOST('action','aZ09');
 $bankaccountid=GETPOST('cashdeskbank');
 
 switch ($action)
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index bc27be9bb12..d16b081e6ae 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -32,7 +32,7 @@ accessforbidden();
 
 $langs->load("categories");
 
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 /*
  *	Actions
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index b96042d7a8e..9981d09cda0 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -34,7 +34,7 @@ $langs->load("categories");
 $id=GETPOST('id','int');
 $ref=GETPOST('ref');
 $type=GETPOST('type');
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 $cancel=GETPOST('cancel');
 
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 100d2d0d48e..e99e081e015 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -39,7 +39,7 @@ $langs->load("bills");
 $id=GETPOST('id','int');
 $ref=GETPOST('ref');
 $type=GETPOST('type');
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 
 if ($id == "")
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index d04d0baebd2..665b033936e 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -37,7 +37,7 @@ $langs->load("categories");
 $id=GETPOST('id','int');
 $ref=GETPOST('ref');
 $type=GETPOST('type');
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 $removeelem = GETPOST('removeelem','int');
 $elemid=GETPOST('elemid');
diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php
index 0c892c4e776..ea7abde4151 100644
--- a/htdocs/collab/index.php
+++ b/htdocs/collab/index.php
@@ -77,7 +77,7 @@ $langs->load("website");
 
 if (! $user->admin) accessforbidden();
 
-if (! ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)))
+if (! ((GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)))
 {
     $conf->dol_hide_leftmenu = 1;   // Force hide of left menu.
 }
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index b933289be4f..b26ce4fa7ac 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -60,7 +60,7 @@ $id = (GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
 if ($user->societe_id > 0) $id=$user->societe_id;
 $result = restrictedArea($user,'societe',$id,'&societe');
 
-$action		= GETPOST('action');
+$action		= GETPOST('action','aZ09');
 $mode		= GETPOST("mode");
 
 $sortfield = GETPOST("sortfield",'alpha');
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 362bec914b6..0a9cdca7abc 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -59,7 +59,7 @@ if (! $sortfield)
 
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 $search_nom = GETPOST("search_nom");
 $search_prenom = GETPOST("search_prenom");
 $search_email = GETPOST("search_email");
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 118cc336fb7..0020a8fd771 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -52,7 +52,7 @@ if (! $sortorder) $sortorder="ASC";
 
 $id=GETPOST('id','int');
 $rowid=GETPOST('rowid','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $search_lastname=GETPOST("search_lastname");
 $search_firstname=GETPOST("search_firstname");
 $search_email=GETPOST("search_email");
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 2be1981c5ae..bca371977a7 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -52,7 +52,7 @@ if (GETPOST('cancel') && ! empty($backtopage))
      exit;
 }
 
-if (GETPOST("action") == 'setremise')
+if (GETPOST('action','aZ09') == 'setremise')
 {
 	$object = new Societe($db);
 	$object->fetch($id);
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 375b4d0ecb8..9964db9ecde 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -185,7 +185,7 @@ if ($action == 'setremise' && $user->rights->societe->creer)
 	}
 }
 
-if (GETPOST("action") == 'confirm_remove' && GETPOST("confirm")=='yes')
+if (GETPOST('action','aZ09') == 'confirm_remove' && GETPOST("confirm")=='yes')
 {
 	//if ($user->rights->societe->creer)
 	//if ($user->rights->facture->creer)
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index b5672f276e7..431a54b9f76 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -30,7 +30,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 // Secrutiy check
 if ($user->societe_id > 0)
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index ef4f220f3e4..0b6cb908ef3 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php';
 $langs->load('companies');
 $langs->load('other');
 
-$action		= GETPOST('action');
+$action		= GETPOST('action','aZ09');
 $confirm	= GETPOST('confirm');
 $id			= GETPOST('id','int');
 $ref		= GETPOST('ref');
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 804d2c5511d..be16e1f8bd6 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -46,7 +46,7 @@ $langs->load("categories");
 $langs->load("companies");
 $langs->load("compta");
 
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 
 // Security check
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 0cf88224e63..83e1f15ef36 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
 $langs->load("banks");
 $langs->load("categories");
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 if (!$user->rights->banque->configurer)
   accessforbidden();
@@ -108,7 +108,7 @@ if ($result)
 		
 		print '<tr class="oddeven">';
 		print '<td><a href="'.DOL_URL_ROOT.'/compta/bank/budget.php?bid='.$objp->rowid.'">'.$objp->rowid.'</a></td>';
-		if (GETPOST("action") == 'edit' && GETPOST("categid")== $objp->rowid)
+		if (GETPOST('action','aZ09') == 'edit' && GETPOST("categid")== $objp->rowid)
 		{
 			print "<td colspan=2>";
 			print '<input type="hidden" name="categid" value="'.$objp->rowid.'">';
diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
index 73c1baa5c02..cda6b4ce137 100644
--- a/htdocs/compta/bank/various_payment/info.php
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -31,7 +31,7 @@ $langs->load("bills");
 $langs->load("salaries");
 
 $id=GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 // Security check
 $socid = GETPOST('socid','int');
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 28eaa0a7c9b..59fb3af2f00 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -27,7 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 // Secrutiy check
 if ($user->societe_id > 0)
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 8cd924a0df8..0881ce061dc 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -817,7 +817,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 /**
  *  Show list of payments
  */
-if (! GETPOST('action'))
+if (! GETPOST('action','aZ09'))
 {
     if ($page == -1) $page = 0 ;
     $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index c73f79c60a4..a185f0aba6e 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Security check
 if (! $user->rights->facture->lire) accessforbidden();
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $socid=0;
 if ($user->societe_id > 0)
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 2d653f2ba05..45762ed95bb 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -38,7 +38,7 @@ $langs->load('companies');
 
 // Security check
 $id=GETPOST("id",'int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 if ($user->societe_id) $socid=$user->societe_id;
 // TODO ajouter regle pour restreindre acces paiement
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 569aa81629e..0ea91dc2857 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -39,7 +39,7 @@ $langs->load("salaries");
 $langs->load('hrm');
 
 $id=GETPOST("id",'int');
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 // Security check
 $socid = GETPOST("socid","int");
diff --git a/htdocs/compta/salaries/info.php b/htdocs/compta/salaries/info.php
index 429efc27a33..f15aac021ec 100644
--- a/htdocs/compta/salaries/info.php
+++ b/htdocs/compta/salaries/info.php
@@ -32,7 +32,7 @@ $langs->load("bills");
 $langs->load("salaries");
 
 $id=GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 // Security check
 $socid = GETPOST('socid','int');
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index aa479ec4369..f34ff9b1a31 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -38,7 +38,7 @@ $langs->load("compta");
 $langs->load("bills");
 
 $id=GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index cf42a11b515..95c72cbedb2 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -40,7 +40,7 @@ $langs->load("compta");
 $langs->load("bills");
 
 $id = GETPOST('id','int');
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index 7caa212be9e..bbacfafd430 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -30,7 +30,7 @@ $langs->load("compta");
 $langs->load("bills");
 
 $id=GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 // Security check
 $socid = GETPOST('socid','int');
diff --git a/htdocs/compta/tva/info.php b/htdocs/compta/tva/info.php
index f85ab9fc2b0..0c6ce29475a 100644
--- a/htdocs/compta/tva/info.php
+++ b/htdocs/compta/tva/info.php
@@ -30,7 +30,7 @@ $langs->load("compta");
 $langs->load("bills");
 
 $id=GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 // Security check
 $socid = GETPOST('socid','int');
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index b0067d81ec1..5d70ba7b4e1 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -34,7 +34,7 @@ $langs->load("companies");
 $langs->load("contact");
 
 $id = GETPOST('id','int');
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 $object = new Contact($db);
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index af8fccfd7b9..3e998b43ec5 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -32,7 +32,7 @@ $langs->load("companies");
 $langs->load("ldap");
 $langs->load("admin");
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 // Security check
 $id = GETPOST('id', 'int');
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index eed044cdadf..c49dbc9f787 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -29,7 +29,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 $langs->load("companies");
 
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 3fec57091cb..8d8f48ec141 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -40,7 +40,7 @@ if (! isset($mode) || $mode != 'noajax')    // For ajax call
     require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
     require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
-	$action=GETPOST("action");
+	$action=GETPOST('action','aZ09');
     $file=urldecode(GETPOST('file'));
     $section=GETPOST("section");
     $module=GETPOST("module");
diff --git a/htdocs/core/ajax/bankconciliate.php b/htdocs/core/ajax/bankconciliate.php
index 3a8a3e30687..24318be6cf8 100644
--- a/htdocs/core/ajax/bankconciliate.php
+++ b/htdocs/core/ajax/bankconciliate.php
@@ -31,7 +31,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 
 /*
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index d313d10b310..8d8fea71411 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -122,7 +122,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."invoicesnbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$endyear.'.png';
@@ -162,7 +162,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."invoicesamountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$endyear.'.png';
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 7c3d6ab4e7f..e7ece7a2a53 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -121,7 +121,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$year.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
@@ -161,7 +161,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."invoicessupplieramountinyear-".$year.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$year.'.png';
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 0d3077a82ce..ec45cc3dde7 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -124,7 +124,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."ordersnbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
@@ -162,7 +162,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."ordersamountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index d16bfbc0f90..28335c79b62 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -123,7 +123,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."orderssuppliernbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
@@ -161,7 +161,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."orderssupplieramountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 2b3c69a9e15..44d5d0b0c15 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -139,7 +139,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				$showpointvalue = 1; $nocolor = 0;
 				$mode='customer';
 				$stats_invoice = new FactureStats($this->db, $socid, $mode, ($userid>0?$userid:0));
-				$data1 = $stats_invoice->getAllByProductEntry($year,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data1 = $stats_invoice->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 				if (empty($data1))
 				{
 					$showpointvalue=0;
@@ -197,7 +197,7 @@ class box_graph_product_distribution extends ModeleBoxes
 
 				$showpointvalue = 1; $nocolor = 0;
 				$stats_proposal = new PropaleStats($this->db, $socid, ($userid>0?$userid:0));
-				$data2 = $stats_proposal->getAllByProductEntry($year,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data2 = $stats_proposal->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 				if (empty($data2))
 				{
 					$showpointvalue = 0;
@@ -259,7 +259,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				$showpointvalue = 1; $nocolor = 0;
 				$mode='customer';
 				$stats_order = new CommandeStats($this->db, $socid, $mode, ($userid>0?$userid:0));
-				$data3 = $stats_order->getAllByProductEntry($year,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data3 = $stats_order->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 				if (empty($data3))
 				{
 					$showpointvalue = 0;
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 2a29cf27314..ccce8372d1f 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -121,7 +121,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 				$datatype1 = array_pad(array(), ($endyear-$startyear+1), 'bars');
 
 				$filenamenb = $dir."/".$prefix."propalsnbinyear-".$endyear.".png";
@@ -160,7 +160,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 				$datatype2 = array_pad(array(), ($endyear-$startyear+1), 'bars');
 				//$datatype2 = array('lines','bars');
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b12e58fe8f7..afa2006864f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -110,18 +110,18 @@ class Form
         }
         else
 		{
-            if (empty($notabletag) && GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
 	        if ($fieldrequired) $ret.='<span class="fieldrequired">';
             $ret.=$langs->trans($text);
 	        if ($fieldrequired) $ret.='</span>';
 	        if (! empty($notabletag)) $ret.=' ';
-            if (empty($notabletag) && GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='</td>';
-            if (empty($notabletag) && GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='<td align="right">';
-            if ($htmlname && GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='<a href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&amp;id='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='</td>';
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='<td align="right">';
+            if ($htmlname && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='<a href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&amp;id='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
 	        if (! empty($notabletag) && $notabletag == 1) $ret.=' : ';
 	        if (! empty($notabletag) && $notabletag == 3) $ret.=' ';
-            if (empty($notabletag) && GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='</td>';
-            if (empty($notabletag) && GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='</tr></table>';
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='</td>';
+            if (empty($notabletag) && GETPOST('action','aZ09') != 'edit'.$htmlname && $perm) $ret.='</tr></table>';
         }
 
         return $ret;
@@ -159,7 +159,7 @@ class Form
         }
         else
         {
-            if (GETPOST('action') == 'edit'.$htmlname)
+            if (GETPOST('action','aZ09') == 'edit'.$htmlname)
             {
                 $ret.="\n";
                 $ret.='<form method="post" action="'.$_SERVER["PHP_SELF"].($moreparam?'?'.$moreparam:'').'">';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index adacddb2163..225825d6699 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -994,7 +994,7 @@ class FormFile
 			if (empty($url)) $url=$_SERVER["PHP_SELF"];
 			
 			print '<!-- html.formfile::list_of_documents -->'."\n";
-			if (GETPOST('action') == 'editfile' && $permtoeditline)
+			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
 			{
 			    print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param.'" method="POST">';
 			    print '<input type="hidden" name="action" value="renamefile">';
@@ -1131,7 +1131,7 @@ class FormFile
 					print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
 					if ($showrelpart == 1) print $relativepath;
 					//print dol_trunc($file['name'],$maxlength,'middle');
-					if (GETPOST('action') == 'editfile' && $file['name'] == basename(GETPOST('urlfile')))
+					if (GETPOST('action','aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile')))
 					{
 					    print '</a>';
 					    print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
@@ -1268,7 +1268,7 @@ class FormFile
 				}
 			}				
 			
-			if (GETPOST('action') == 'editfile' && $permtoeditline)
+			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
 			{
 			    print '</form>';
 			}
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index eeb20ee265c..d2441487231 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -39,7 +39,6 @@ if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 require_once '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL by the main.inc.php
 $langs->load("main");
 $langs->load("agenda");
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index fd80124e7df..0e2f0bcb7c3 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -47,7 +47,6 @@ if (! defined('DISABLE_SELECT2'))           define('DISABLE_SELECT2',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL by the main.inc.php
 $langs->load("main");
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 63990112be5..06ed76c5008 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -240,7 +240,17 @@ function dol_shutdown()
  *  Return value of a param into GET or POST supervariable
  *
  *  @param	string	$paramname   Name of parameter to found
- *  @param	string	$check	     Type of check (''=no check, 'none'=no check, 'int'=check it's numeric, 'alpha'=check it's text and sign, 'aZ'=check it's a-z only, 'array'=check it's array, 'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string), 'day', 'month', 'year', 'custom'= custom filter specify $filter and $options)
+ *  @param	string	$check	     Type of check
+ *                                  ''=no check (deprecated)
+ *                                  'none'=no check (only for param that should have very rich content)
+ *                                  'int'=check it's numeric
+ *                                  'alpha'=check it's text and sign
+ *                                  'aZ'=check it's a-z only
+ *                                  'aZ09'=check it's simple alpha string (recommended for keys)
+ *                                  'array'=check it's array
+ *                                  'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string)
+ *                                  'nohtml', 'alphanohtml'=check there is no html content
+ *                                  'custom'= custom filter specify $filter and $options)
  *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get, 4 = post then get then cookie)
  *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
  *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'.
@@ -317,9 +327,14 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	    }
 	}	
 	
+	if (empty($check) && $conf->global->MAIN_FEATURES_LEVEL > 0)
+	{
+	   dol_syslog("A GETPOST is called with 1st param = ".$paramname." and 2nd param not defined, when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);    
+	}
+	
 	if (! empty($check))
 	{
-	    // Replace vars like __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__
+	    // Replace vars like __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__, ...
 	    if (! is_array($out))
 	    {
 	        $maxloop=20; $loopnb=0;    // Protection against infinite loop
@@ -358,8 +373,11 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	        }
 	    }
 
+	    // Check is done after replacement
 	    switch ($check)
 	    {
+	        case 'none':
+	            break;
 	        case 'int':
 	            if (! is_numeric($out)) { $out=''; }
 	            break;
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 7870824285a..ccc8a68a5d9 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -98,7 +98,7 @@ function dol_hash($chain,$type=0)
 
 /**
  *	Check permissions of a user to show a page and an object. Check read permission.
- * 	If GETPOST('action') defined, we also check write and delete permission.
+ * 	If GETPOST('action','aZ09') defined, we also check write and delete permission.
  *
  *	@param	User	$user      	  	User to check
  *	@param  string	$features	    Features to check (it must be module name. Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...)
@@ -207,7 +207,7 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
 
     // Check write permission from module
     $createok=1; $nbko=0;
-    if (GETPOST("action")  == 'create')
+    if (GETPOST('action','aZ09')  == 'create')
     {
         foreach ($featuresarray as $feature)
         {
@@ -262,7 +262,7 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
 
     // Check create user permission
     $createuserok=1;
-    if (GETPOST("action") == 'confirm_create_user' && GETPOST("confirm") == 'yes')
+    if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm") == 'yes')
     {
         if (! $user->rights->user->user->creer) $createuserok=0;
 
@@ -272,7 +272,7 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
 
     // Check delete permission from module
     $deleteok=1; $nbko=0;
-    if ((GETPOST("action")  == 'confirm_delete' && GETPOST("confirm") == 'yes') || GETPOST("action")  == 'delete')
+    if ((GETPOST('action','aZ09')  == 'confirm_delete' && GETPOST("confirm") == 'yes') || GETPOST('action','aZ09')  == 'delete')
     {
         foreach ($featuresarray as $feature)
         {
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index a14645a3152..b6b8d4ddd72 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -155,7 +155,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	$titletruedolibarrversion=constant('DOL_VERSION');	// $title used by login template after the @ to inform of true Dolibarr version
 
 	// Note: $conf->css looks like '/theme/eldy/style.css.php'
-	$conf->css = "/theme/".(GETPOST('theme')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
+	$conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
 	//$themepath=dol_buildpath((empty($conf->global->MAIN_FORCETHEMEDIR)?'':$conf->global->MAIN_FORCETHEMEDIR).$conf->css,1);
 	$themepath=dol_buildpath($conf->css,1);
 	if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 797af488f46..2cea718dcc0 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -417,7 +417,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     					$file=$dirtheme."/".$subdir."/thumb.png";
     					$url=$urltheme."/".$subdir."/thumb.png";
     					if (! file_exists($file)) $url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
-    					print '<a href="'.$_SERVER["PHP_SELF"].($edit?'?action=edit&theme=':'?theme=').$subdir.(GETPOST("optioncss")?'&optioncss='.GETPOST("optioncss",'alpha',1):'').($fuser?'&id='.$fuser->id:'').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
+    					print '<a href="'.$_SERVER["PHP_SELF"].($edit?'?action=edit&theme=':'?theme=').$subdir.(GETPOST('optioncss','alpha',1)?'&optioncss='.GETPOST('optioncss','alpha',1):'').($fuser?'&id='.$fuser->id:'').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
     					if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");
     					else $title=$langs->trans("ShowPreview");
     					print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index d2d8e36b8ca..7272eb000d4 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -53,7 +53,7 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
 
 	if (empty($noout)) print_start_menu_array_auguria();
 
-	$usemenuhider = (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
 	
 	// Show/Hide vertical menu
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
@@ -248,7 +248,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 	$mainmenu=($forcemainmenu?$forcemainmenu:$_SESSION["mainmenu"]);
 	$leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"]));
 
-	$usemenuhider = (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
 	global $usemenuhider;
 	
 	// Show logo company
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index b7a372e50bd..4aa5064977d 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -51,7 +51,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 
 	if (empty($noout)) print_start_menu_array();
 
-	$usemenuhider = (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
 	
 	// Show/Hide vertical menu
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
@@ -458,7 +458,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 	$mainmenu=($forcemainmenu?$forcemainmenu:$_SESSION["mainmenu"]);
 	$leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"]));
 
-	$usemenuhider = (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
 	
 	// Show logo company
 	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 9a98fa4ffa4..501216ec860 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -93,7 +93,7 @@ class MenuManager
 			$classname='class="tmenusel"';
 
 			// Show/Hide vertical menu
-			if ($mode != 'jmobile' && $mode != 'topnb' && (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			if ($mode != 'jmobile' && $mode != 'topnb' && (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
 			    $showmode=1;
 			    $classname = 'class="tmenu menuhider"';
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index ffbad81a30f..36f1e29e558 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -35,7 +35,6 @@ if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL by the main.inc.php
 $langs->load("main");
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index 0708ae07a51..96be9b49196 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -31,7 +31,7 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 $tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
 $filepath=(empty($filepath)?'':$filepath);
 
-if (GETPOST('action') != 'editline' && $nboflines > 1) { ?>
+if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1) { ?>
 <script type="text/javascript">
 $(document).ready(function(){
 	$(".imgupforline").hide();
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 01d0ba7b33c..2538e052ae4 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -31,7 +31,7 @@ $value_private=$object->note_private;
 if (! empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES))
 {
 	$stringtoadd=dol_print_date(dol_now(), 'dayhour').' '.$user->getFullName($langs).' --';
-	if (GETPOST('action') == 'edit'.$note_public)
+	if (GETPOST('action','aZ09') == 'edit'.$note_public)
 	{
 		$value_public=dol_concatdesc($value_public, ($value_public?"\n":"")."-- ".$stringtoadd);
 		if (dol_textishtml($value_public)) $value_public.="<br>\n";
@@ -41,7 +41,7 @@ if (! empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES))
 if (! empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES))
 {
 	$stringtoadd=dol_print_date(dol_now(), 'dayhour').' '.$user->getFullName($langs).' --';
-	if (GETPOST('action') == 'edit'.$note_private)
+	if (GETPOST('action','aZ09') == 'edit'.$note_private)
 	{
 		$value_private=dol_concatdesc($value_private, ($value_private?"\n":"")."-- ".$stringtoadd);
 		if (dol_textishtml($value_private)) $value_private.="<br>\n";
diff --git a/htdocs/document.php b/htdocs/document.php
index 4e4f18826ef..46e27d57a67 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -61,7 +61,7 @@ $action=GETPOST('action','alpha');
 $original_file=GETPOST('file','alpha');	// Do not use urldecode here ($_GET are already decoded by PHP).
 $modulepart=GETPOST('modulepart','alpha');
 $urlsource=GETPOST('urlsource','alpha');
-$entity=GETPOST('entity')?GETPOST('entity','int'):$conf->entity;
+$entity=GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity;
 
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
@@ -95,7 +95,7 @@ else $type=dol_mimetype($original_file);
 // Define attachment (attachment=true to force choice popup 'open'/'save as')
 $attachment = true;
 if (preg_match('/\.(html|htm)$/i',$original_file)) $attachment = false;
-if (isset($_GET["attachment"])) $attachment = GETPOST("attachment")?true:false;
+if (isset($_GET["attachment"])) $attachment = GETPOST("attachment",'alpha')?true:false;
 if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
 
 // Security: Delete string ../ into $original_file
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 2e7d2a001fd..436b449b446 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -34,7 +34,7 @@ $langs->load('companies');
 
 // Security check
 $id=GETPOST('rowid')?GETPOST('rowid','int'):GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 if ($user->societe_id) $socid=$user->societe_id;
 // TODO Add rule to restrict access payment
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index 23526fd926d..fe4197dbc15 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->load("bills");
 
 $chid=GETPOST("rowid");
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $amounts = array();
 
 // Security check
@@ -154,7 +154,7 @@ $form=new Form($db);
 
 
 // Form to create donation payment
-if (GETPOST("action") == 'create')
+if (GETPOST('action','aZ09') == 'create')
 {
 
 	$don = new Don($db);
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index 3b6455fe4a9..5f40d1bb6f3 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -62,7 +62,7 @@ if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="label";
 
 $cancel=GETPOST('cancel');
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $section=GETPOST("section");
 if (! $section)
 {
@@ -221,7 +221,7 @@ while ($tmpecmdir && $result > 0)
 print img_picto('','object_dir').' <a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$langs->trans("ECMRoot").'</a> -> ';
 print $s;
 print ' -> ';
-if (GETPOST('action') == 'edit') print '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfile.'">';
+if (GETPOST('action','aZ09') == 'edit') print '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfile.'">';
 else print $urlfile;
 print '</td></tr>';
 /*print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index be0520e9298..edbe7538dfa 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -49,7 +49,7 @@ $result = restrictedArea($user, 'ecm', 0);
 
 // Get parameters
 $socid=GETPOST('socid','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $section=GETPOST("section")?GETPOST("section","int"):GETPOST("section_id","int");
 $module=GETPOST("module");
 if (! $section) $section=0;
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 065d14b4593..a605440ff61 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -49,7 +49,7 @@ $result = restrictedArea($user, 'ecm', 0);
 
 // Get parameters
 $socid=GETPOST('socid','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $section=GETPOST("section")?GETPOST("section","int"):GETPOST("section_id","int");
 $module=GETPOST("module");
 if (! $section) $section=0;
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 9a2433994bd..fe546cd1064 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -45,7 +45,7 @@ $langs->load("trips");
 $langs->load("bills");
 $langs->load("mails");
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $cancel=GETPOST('cancel');
 $confirm = GETPOST('confirm', 'alpha');
 
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 4450f1644bf..bc956955258 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -34,7 +34,7 @@ $langs->load('companies');
 
 // Security check
 $id=GETPOST('rowid')?GETPOST('rowid','int'):GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 if ($user->societe_id) $socid=$user->societe_id;
 // TODO Add rule to restrict access payment
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 82c3fc16e30..40c4fad2513 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -31,7 +31,7 @@ $langs->load("bills");
 $langs->load("banks");
 
 $chid=GETPOST("id");
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $amounts = array();
 $accountid=GETPOST('accountid','int');
 
@@ -174,7 +174,7 @@ $form=new Form($db);
 
 
 // Form to create expense report payment
-if (GETPOST("action") == 'create')
+if (GETPOST('action','aZ09') == 'create')
 {
 	$expensereport = new ExpenseReport($db);
 	$expensereport->fetch($chid);
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index c0b5cf92e7e..adf9d547073 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -38,7 +38,7 @@ $mainmenu=GETPOST('mainmenu', 'alpha');
 $leftmenu=GETPOST('leftmenu', 'alpha');
 $idmenu=GETPOST('idmenu', 'int');
 $theme=GETPOST('theme', 'alpha');
-$codelang=GETPOST('lang', 'alpha');
+$codelang=GETPOST('lang', 'aZ09');
 
 print "
 <html>
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 4c2716e311a..6243a9e3a16 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -44,7 +44,7 @@ $langs->load('bills');
 $langs->load('orders');
 $langs->load('commercial');
 
-$action	= GETPOST('action');
+$action	= GETPOST('action','aZ09');
 $cancelbutton = GETPOST('cancel');
 
 // Security check
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index b7e3830ad5c..e89555a5d50 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -52,7 +52,7 @@ if (! empty($conf->productbatch->enabled))
 $id = GETPOST("id", 'int');
 $ref = GETPOST('ref');
 $lineid = GETPOST('lineid', 'int');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 if ($user->societe_id)
 	$socid = $user->societe_id;
 $result = restrictedArea($user, 'fournisseur', $id, '', 'commande');
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 35384db0ee5..a3334baa5d9 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -35,7 +35,7 @@ $langs->load('stocks');
 
 $id = GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int');
 $ref = GETPOST('ref');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index f930ad87979..c0851a44b6f 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -61,7 +61,7 @@ if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
 
 $id			= (GETPOST('facid','int') ? GETPOST('facid','int') : GETPOST('id','int'));
 $socid		= GETPOST('socid', 'int');
-$action		= GETPOST("action");
+$action		= GETPOST('action','aZ09');
 $confirm	= GETPOST("confirm");
 $ref		= GETPOST('ref','alpha');
 $cancel		= GETPOST('cancel','alpha');
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index a7241a1ecf4..f2bb499d652 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -31,7 +31,7 @@ $socid='';
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $socid=0;
 if ($user->societe_id > 0)
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index c8ba7c6b786..5b9dc94172b 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -37,7 +37,7 @@ if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'ftp','');
 
 // Get parameters
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $section=GETPOST('section');
 if (! $section) $section='/';
 $numero_ftp = GETPOST("numero_ftp");
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 804ad55e10a..e1b8b21a7bd 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -36,7 +36,7 @@ if ($user->societe_id > 0) accessforbidden();
 // If the user does not have perm to read the page
 if(!$user->rights->holiday->read) accessforbidden();
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $holiday = new Holiday($db);
 
diff --git a/htdocs/index.php b/htdocs/index.php
index 5ab2fa68cd4..d2da24471d8 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // If not defined, we select menu "home"
 $_GET['mainmenu']=GETPOST('mainmenu', 'aZ09')?GETPOST('mainmenu', 'aZ09'):'home';
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 
 $hookmanager->initHooks(array('index'));
 
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 93597451f21..a70553cbfb0 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -63,7 +63,7 @@ if (! is_object($conf)) dolibarr_install_syslog("repair: conf file not initializ
  * View
 */
 
-pHeader('',"upgrade2",GETPOST('action'));
+pHeader('',"upgrade2",GETPOST('action','aZ09'));
 
 $actiondone=0;
 
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index d5fb1bbfd05..baceee5f7eb 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -42,7 +42,7 @@ error_reporting(0);		// Disable all errors
 @set_time_limit(900);	// Need 900 on some OS like Windows 7/64
 error_reporting($err);
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $setuplang=(GETPOST('selectlang','',3)?GETPOST('selectlang','',3):'auto');
 $langs->setDefaultLang($setuplang);
 
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index ec363646708..96853887f81 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -97,12 +97,12 @@ if (! $versionfrom && ! $versionto)
 }
 
 
-pHeader('',"upgrade2",GETPOST('action'),'versionfrom='.$versionfrom.'&versionto='.$versionto);
+pHeader('',"upgrade2",GETPOST('action','aZ09'),'versionfrom='.$versionfrom.'&versionto='.$versionto);
 
 $actiondone=0;
 
 // Action to launch the migrate script
-if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
+if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09')))
 {
     $actiondone=1;
 
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index f535bf27ebd..4646c3b6eb9 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -101,10 +101,10 @@ if ((! $versionfrom || preg_match('/version/', $versionfrom)) && (! $versionto |
 	exit;
 }
 
-pHeader('','step5',GETPOST("action")?GETPOST("action"):'upgrade','versionfrom='.$versionfrom.'&versionto='.$versionto);
+pHeader('','step5',GETPOST('action','aZ09')?GETPOST('action','aZ09'):'upgrade','versionfrom='.$versionfrom.'&versionto='.$versionto);
 
 
-if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
+if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09')))
 {
     print '<h3>'.$langs->trans('DataMigration').'</h3>';
 
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 92961b9a7d1..b58bfb929d9 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -36,7 +36,7 @@ $langs->load("bills");
 $langs->load("loan");
 
 $id=GETPOST('id','int');
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 $cancel=GETPOST('cancel','alpha');
 
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index e6446e366fa..f4f490a146a 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -35,7 +35,7 @@ $langs->load("bills");
 $langs->load("loan");
 
 $id = GETPOST('id','int');
-$action = GETPOST("action");
+$action = GETPOST('action','aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index f61b9312432..73bb1c1f984 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -31,7 +31,7 @@ $langs->load("bills");
 $langs->load("loan");
 
 $id=GETPOST('id','int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 
 // Security check
 $socid = GETPOST('socid','int');
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index e28320470a2..4b76cad1d6d 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -30,7 +30,7 @@ require '../main.inc.php';
 require_once(DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 $langs->load('loan');
 
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 5a9558222dc..206e3e64de7 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -33,7 +33,7 @@ $langs->load('loan');
 
 // Security check
 $id=GETPOST("id",'int');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 if ($user->societe_id) $socid=$user->societe_id;
 // TODO ajouter regle pour restreindre acces paiement
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 8c7a0af6cef..dc927035954 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -31,7 +31,7 @@ $langs->load("bills");
 $langs->load("loan");
 
 $chid=GETPOST('id','int');
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $cancel=GETPOST('cancel','alpha');
 
 // Security check
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c6bf910a8af..c2b99f22c1f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -307,7 +307,7 @@ if (! defined('NOTOKENRENEWAL'))
 }
 if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))	// Check validity of token, only if option enabled (this option breaks some features sometimes)
 {
-    if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token')) // Note, offender can still send request by GET
+    if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token','alpha')) // Note, offender can still send request by GET
     {
         print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
         print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
@@ -317,7 +317,7 @@ if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->g
     {
         if (GETPOST('token', 'alpha') != $_SESSION['token'])
         {
-            dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action').", _POST['token']=".GETPOST('token').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
+            dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action','aZ09').", _POST['token']=".GETPOST('token','alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
             //print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
             unset($_POST);
         }
@@ -325,7 +325,7 @@ if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->g
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
-if (GETPOST('disablemodules'))  $_SESSION["disablemodules"]=GETPOST('disablemodules');
+if (GETPOST('disablemodules','alpha'))  $_SESSION["disablemodules"]=GETPOST('disablemodules','alpha');
 if (! empty($_SESSION["disablemodules"]))
 {
     $disabled_modules=explode(',',$_SESSION["disablemodules"]);
@@ -448,7 +448,7 @@ if (! defined('NOLOGIN'))
         }
 
         $usertotest		= (! empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username","alpha",2));
-        $passwordtotest	= GETPOST('password','',2);
+        $passwordtotest	= GETPOST('password','none',2);
         $entitytotest	= (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
 
         // Validation of login/pass/entity
@@ -463,7 +463,7 @@ if (! defined('NOLOGIN'))
         {
             include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
             $langs=new Translate("",$conf);
-    		$langcode=(GETPOST('lang')?GETPOST('lang','alpha',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+    		$langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
         	$langs->setDefaultLang($langcode);
         }
 
@@ -575,9 +575,9 @@ if (! defined('NOLOGIN'))
 	        if ($reshook < 0) $error++;
 
 	        $paramsurl=array();
-	        if (GETPOST('textbrowser')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-	        if (GETPOST('nojs')) $paramsurl[]='nojs='.GETPOST('nojs','int');
-	        if (GETPOST('lang')) $paramsurl[]='lang='.GETPOST('lang','alpha');
+	        if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+	        if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
+	        if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
             header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
             exit;
         }
@@ -635,9 +635,9 @@ if (! defined('NOLOGIN'))
 	        if ($reshook < 0) $error++;
 
 	        $paramsurl=array();
-	        if (GETPOST('textbrowser')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-	        if (GETPOST('nojs')) $paramsurl[]='nojs='.GETPOST('nojs','int');
-	        if (GETPOST('lang')) $paramsurl[]='lang='.GETPOST('lang','alpha');
+	        if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+	        if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
+	        if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
             header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
             exit;
         }
@@ -761,7 +761,7 @@ if (! defined('NOLOGIN'))
 }
 
 // Case forcing style from url
-if (GETPOST('theme'))
+if (GETPOST('theme','alpha'))
 {
 	$conf->theme=GETPOST('theme','alpha',1);
 	$conf->css  = "/theme/".$conf->theme."/style.css.php";
@@ -769,7 +769,7 @@ if (GETPOST('theme'))
 
 
 // Set javascript option
-if (! GETPOST('nojs'))   // If javascript was not disabled on URL
+if (! GETPOST('nojs','int'))   // If javascript was not disabled on URL
 {
 	if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
 	{
@@ -778,17 +778,17 @@ if (! GETPOST('nojs'))   // If javascript was not disabled on URL
 }
 else $conf->use_javascript_ajax=0;
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
-if (GETPOST('textbrowser') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
+if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
 {
     $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
 }
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_hide_topmenu') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
-if (GETPOST('dol_optimize_smallscreen') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover') || ! empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
+if (GETPOST('dol_hide_leftmenu','int') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
+if (GETPOST('dol_hide_topmenu','int') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
+if (GETPOST('dol_optimize_smallscreen','int') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1;
+if (GETPOST('dol_no_mouse_hover','int') || ! empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover=1;
+if (GETPOST('dol_use_jmobile','int') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
 if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover=1;
 if ((! empty($conf->browser->layout) && $conf->browser->layout == 'phone')
 	|| (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
@@ -809,7 +809,7 @@ if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea'
 
 if (! defined('NOREQUIRETRAN'))
 {
-    if (! GETPOST('lang'))	// If language was not forced on URL
+    if (! GETPOST('lang','aZ09'))	// If language was not forced on URL
     {
         // If user has chosen its own language
         if (! empty($user->conf->MAIN_LANG_DEFAULT))
@@ -909,7 +909,7 @@ if (! defined('NOREQUIREMENU'))
 
 	// Load the menu manager (only if not already done)
 	$file_menu=$conf->standard_menu;
-	if (GETPOST('menu')) $file_menu=GETPOST('menu');     // example: menu=eldy_menu.php
+	if (GETPOST('menu','alpha')) $file_menu=GETPOST('menu','alpha');     // example: menu=eldy_menu.php
 	if (! class_exists('MenuManager'))
 	{
 		$menufound=0;
@@ -1034,7 +1034,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
     if (empty($disablehead))
     {
         print "<head>\n";
-		if (GETPOST('dol_basehref')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref')).'">'."\n";
+		if (GETPOST('dol_basehref','alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
         // Displays meta
         print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";      				// Do not index
         print '<meta name="viewport" content="width=device-width, initial-scale=1.0">';	// Scale for mobile device
@@ -1043,9 +1043,9 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
         if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
         print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";
-        //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser')) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
-        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser')) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
-        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser')) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
+        //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
+        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
+        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && ! GETPOST('textbrowser','int')) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
 
         // Displays title
         $appli=constant('DOL_APPLICATION_TITLE');
@@ -1059,17 +1059,17 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         //$ext='';
         //if (! empty($conf->dol_use_jmobile)) $ext='version='.urlencode(DOL_VERSION);
         $ext='version='.urlencode(DOL_VERSION);
-        if (GETPOST('version')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
-        if (GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
+        if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
+        if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
         
-        $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss')?'&amp;optioncss='.GETPOST('optioncss','alpha',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
+        $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
         $themeparam.=($ext?'&amp;'.$ext:'');
         if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
-        if (GETPOST('dol_hide_topmenu'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
-        if (GETPOST('dol_hide_leftmenu'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
-        if (GETPOST('dol_optimize_smallscreen'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
-        if (GETPOST('dol_no_mouse_hover'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
-        if (GETPOST('dol_use_jmobile'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
+        if (GETPOST('dol_hide_topmenu','int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
+        if (GETPOST('dol_hide_leftmenu','int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
+        if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
+        if (GETPOST('dol_no_mouse_hover','int'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
+        if (GETPOST('dol_use_jmobile','int'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
         
         if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
         {
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 61e51999479..90a4cb70611 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -246,7 +246,7 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
 // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
 if (! defined('NOREQUIRETRAN'))
 {
-    $langcode=(GETPOST('lang')?GETPOST('lang','alpha',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+    $langcode=(GETPOST('lang','aZ09')?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
 	$langs->setDefaultLang($langcode);
 }
 
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index bb4d4650344..d7a466a5217 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
 if (!$user->rights->opensurvey->read) accessforbidden();
 
 // Initialisation des variables
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $cancel=GETPOST('cancel');
 
 $numsondage = '';
diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
index 7096ae7ad99..90fd56cd4d1 100644
--- a/htdocs/opensurvey/exportcsv.php
+++ b/htdocs/opensurvey/exportcsv.php
@@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php");
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $numsondage = '';
 if (GETPOST('id'))
 {
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 203602bde6e..6f5beaf1277 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php");
 // Security check
 if (!$user->rights->opensurvey->read) accessforbidden();
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $id=GETPOST('id','alpha');
 $numsondage= $id;
 $search_ref = GETPOST('search_ref', 'alpha');
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 806609ad7cd..f10e21effe1 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -35,7 +35,7 @@ if (!$user->rights->opensurvey->read) accessforbidden();
 
 
 // Init vars
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $numsondage= GETPOST("id");
 
 $object=new Opensurveysondage($db);
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index 0178635ed10..74e8f9e4f8f 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -34,7 +34,7 @@ $langs->load("companies");
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 // Security check
 $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 95f74352305..665d340f6f9 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -38,7 +38,7 @@ $langs->load("stocks");
 $langs->load("companies");
 $langs->load("categories");
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $cancel=GETPOST('cancel');
 $confirm=GETPOST('confirm');
 
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index bc4099f66ec..8f512409f03 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -50,7 +50,7 @@ $result=restrictedArea($user,'stock');
 $id=GETPOST('id','int');
 $msid=GETPOST('msid','int');
 $product_id=GETPOST("product_id");
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $cancel=GETPOST('cancel');
 $idproduct = GETPOST('idproduct','int');
 $year = GETPOST("year");
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 7c524a167b9..385c4d51ccd 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -51,7 +51,7 @@ $langs->load("sendings");
 if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
 
 $backtopage=GETPOST('backtopage');
-$action=GETPOST("action");
+$action=GETPOST('action','aZ09');
 $cancel=GETPOST('cancel');
 
 $id=GETPOST('id', 'int');
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index c1aa8aaa469..8a3494213cc 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 $langs->load('projects');
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $mode=GETPOST("mode");
 $id=GETPOST('id','int');
 $taskid=GETPOST('taskid');
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 905b93393dd..c6949598ade 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 $langs->load('projects');
 $langs->load('users');
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $mode=GETPOST("mode");
 $id=GETPOST('id','int');
 $taskid=GETPOST('taskid');
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index a6b6e3c93e2..9a73e481666 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 
 $langs->load('projects');
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $id = GETPOST('id','int');
 $ref= GETPOST('ref');
 
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 3c3353e5eb6..d5db9866c1f 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -202,7 +202,7 @@ asort($orders);
  * Actions
  */
 
-if (GETPOST("action") == 'gotodemo')
+if (GETPOST('action','aZ09') == 'gotodemo')
 {
 	//print 'ee'.GETPOST("demochoice");
 	$disablestring='';
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 070c739e85c..98d267fdd72 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php");
 
 
 // Init vars
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $numsondage = '';
 if (GETPOST('sondage'))
 {
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index a52358dab24..c3aff6341cc 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -63,7 +63,7 @@ $amount=price2num(GETPOST("amount"));
 if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
 else $currency=GETPOST("currency",'alpha');
 
-if (! GETPOST("action"))
+if (! GETPOST('action','aZ09'))
 {
     if (! GETPOST("amount") && ! GETPOST("source"))
     {
@@ -129,7 +129,7 @@ $valid=true;
  * Actions
  */
 
-if (GETPOST("action") == 'dopayment')
+if (GETPOST('action','aZ09') == 'dopayment')
 {
     $PRICE=price2num(GETPOST("newamount"),'MT');
     $email=GETPOST("email");
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 5be4e49f232..6de2cb8a441 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -67,7 +67,7 @@ $amount=price2num(GETPOST("amount"));
 if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
 else $currency=GETPOST("currency",'alpha');
 
-if (! GETPOST("action"))
+if (! GETPOST('action','aZ09'))
 {
     if (! GETPOST("amount") && ! GETPOST("source"))
     {
@@ -185,7 +185,7 @@ if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
  * Actions
  */
 
-if (GETPOST("action") == 'dopayment')
+if (GETPOST('action','aZ09') == 'dopayment')
 {
 	$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
     $PAYPAL_PAYMENT_TYPE='Sale';
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index ca09825f62a..5a53a2c6ed2 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -55,7 +55,7 @@ if (! empty($conf->notification->enabled)) $langs->load("mails");
 
 $mesg=''; $error=0; $errors=array();
 
-$action		= (GETPOST('action') ? GETPOST('action') : 'view');
+$action		= (GETPOST('action','aZ09') ? GETPOST('action','aZ09') : 'view');
 $cancel     = GETPOST('cancel');
 $backtopage = GETPOST('backtopage','alpha');
 $confirm	= GETPOST('confirm');
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index a43db2da318..3802397509b 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -36,7 +36,7 @@ $langs->load("companies");
 $langs->load('other');
 
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 $id=(GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
 $ref = GETPOST('ref', 'alpha');
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index c713250a0e2..bdba82f440e 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -29,7 +29,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 $langs->load("companies");
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index d547d9e57dc..b17ea678853 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -36,7 +36,7 @@ $langs->load("admin");
 $langs->load("other");
 
 $socid = GETPOST("socid",'int');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $contactid=GETPOST('contactid');    // May be an int or 'thirdparty'
 $actionid=GETPOST('actionid');
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 80edfc6fea9..2aa33543913 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -75,8 +75,7 @@ else header('Cache-Control: no-cache');
 // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
 if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang', 'alpha'));	// If language was forced on URL
-if (GETPOST('theme')) $conf->theme=GETPOST('theme', 'alpha');  // If theme was forced on URL
+if (GETPOST('theme','alpha')) $conf->theme=GETPOST('theme','alpha');  // If theme was forced on URL
 $langs->load("main",0,1);
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
@@ -231,7 +230,7 @@ print '*/'."\n";
 
 
 body {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	background-color: #FFFFFF;
 <?php } else { ?>
 	background: rgb(<?php print $colorbackbody; ?>);
@@ -867,7 +866,7 @@ div.fiche>form>div.div-table-responsive {
    	}
 }
 .linkobject { cursor: pointer; }
-<?php if (GETPOST("optioncss") == 'print') { ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
 .hideonprint { display: none; }
 <?php } ?>
 
@@ -942,7 +941,7 @@ div.vmenu, td.vmenu {
 
 
 /* For smartphone (testmenuhider is on) */
-<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 #id-container {
 	width: 100%;
 }
@@ -984,8 +983,8 @@ div.fiche {
 
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:($dol_hide_leftmenu?'6':'26')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'6')); ?>px;
+	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'6':'26')); ?>px;
+	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'6')); ?>px;
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
 	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
 }
@@ -1029,8 +1028,8 @@ div.ficheaddleft {
 @media only screen and (max-width: 1000px)
 {
     div.fiche {
-    	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:($dol_hide_leftmenu?'6':'20')); ?>px;
-    	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:6); ?>px;
+    	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'6':'20')); ?>px;
+    	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:6); ?>px;
     	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
     }
     div.fichecenter {
@@ -1183,7 +1182,7 @@ if (! empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $
 ?>
 
 div#id-top {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
@@ -1206,7 +1205,7 @@ div#id-top {
 }
 
 div#tmenu_tooltip {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
 	padding-<?php echo $right; ?>: <?php echo ($maxwidthloginblock - 10); ?>px;
@@ -1220,7 +1219,7 @@ div.tmenusep {
 }
 
 div.tmenudiv {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
     position: relative;
@@ -1632,7 +1631,7 @@ div.login_block {
 	top: 4px;
 	font-weight: bold;
 	max-width: <?php echo $maxwidthloginblock; ?>px;
-	<?php if (GETPOST("optioncss") == 'print') { ?>
+	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
 	display: none;
 	<?php } ?>
 }
@@ -1746,7 +1745,7 @@ div.vmenu, td.vmenu {
 .vmenu {
     width: 190px;
 	margin-left: 6px;
-	<?php if (GETPOST("optioncss") == 'print') { ?>
+	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
     display: none;
 	<?php } ?>
 }
@@ -4600,7 +4599,7 @@ div.tabsElem a.tab {
 	<?php } ?>
 	}
 	div#tmenu_tooltip {
-	<?php if (GETPOST("optioncss") == 'print') {  ?>
+	<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 		display:none;
 	<?php } else { ?>
 		padding-<?php echo $right; ?>: 0;
@@ -4611,7 +4610,7 @@ div.tabsElem a.tab {
 		width: 100%;
 	}
 	div.login_block {
-		<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+		<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 		display: none;
 		padding-top: 20px;
 		padding-left: 20px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 36e2dc4e6f3..dde2c8c42ad 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -76,8 +76,7 @@ else header('Cache-Control: no-cache');
 // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
 if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
 
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL
-if (GETPOST('theme')) $conf->theme=GETPOST('theme');  // If theme was forced on URL
+if (GETPOST('theme','alpha')) $conf->theme=GETPOST('theme','alpha');  // If theme was forced on URL
 $langs->load("main",0,1);
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
@@ -234,7 +233,7 @@ print '*/'."\n";
 
 
 body {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	background-color: #FFFFFF;
 <?php } else { ?>
 	background: rgb(<?php print $colorbackbody; ?>);
@@ -874,7 +873,7 @@ div.fiche>form>div.div-table-responsive {
    	}    
 }
 .linkobject { cursor: pointer; }
-<?php if (GETPOST("optioncss") == 'print') { ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
 .hideonprint { display: none; }
 <?php } ?>
 
@@ -921,14 +920,14 @@ td.showDragHandle {
 #id-right {	/* This must stay id-right and not be replaced with echo $right */
 	width: 100%;
 	padding-bottom: 10px;
-<?php if (GETPOST("optioncss") != 'print') { ?>
+<?php if (GETPOST('optioncss','aZ09') != 'print') { ?>
 	padding-left: 229px;
 	padding-top: 12px;
 <?php } ?>
 }
 
 .side-nav {
-<?php if (GETPOST("optioncss") == 'print') { ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
 	display: none;
 <?php } else { ?>
 	background: #FFF;
@@ -1027,8 +1026,8 @@ div.fiche {
 <?php } ?>
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:($dol_hide_leftmenu?'4':'20')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'4')); ?>px;
+	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'4':'20')); ?>px;
+	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'4')); ?>px;
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
 	margin-bottom: 15px;
 }
@@ -1065,8 +1064,8 @@ div.ficheaddleft {
 @media only screen and (max-width: 900px)
 {
     div.fiche {
-    	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:($dol_hide_leftmenu?'4':'20')); ?>px;
-    	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:16); ?>px;
+    	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'4':'20')); ?>px;
+    	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:16); ?>px;
     	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
     	margin-bottom: 15px;
     }
@@ -1227,7 +1226,7 @@ if (! empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $heightmenu = 30; $di
 ?>
 
 div#tmenu_tooltip {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
@@ -1243,7 +1242,7 @@ div#tmenu_tooltip {
 }
 
 div#tmenu_tooltip {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
 	/* padding-<?php echo $right; ?>: <?php echo ($maxwidthloginblock - 10); ?>px; */
@@ -1257,7 +1256,7 @@ div.tmenusep {
 }
 
 div.tmenudiv {
-<?php if (GETPOST("optioncss") == 'print') {  ?>
+<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
     position: relative;
@@ -1673,7 +1672,7 @@ div.login_block {
 	background: #FFF;
 	width: 228px;
 	height: 42px;
-	<?php if (GETPOST("optioncss") == 'print') { ?>
+	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
 	display: none;
 	<?php } ?>
 }
@@ -1777,7 +1776,7 @@ div.vmenu, td.vmenu {
 
 .vmenu {
 	margin-left: 4px;
-	<?php if (GETPOST("optioncss") == 'print') { ?>
+	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
     display: none;
 	<?php } ?>
 }
@@ -4702,7 +4701,7 @@ border-top-right-radius: 6px;
 @media only screen and (max-width: 570px)
 {
 	div#tmenu_tooltip {
-	<?php if (GETPOST("optioncss") == 'print') {  ?>
+	<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
 		display:none;
 	<?php } else { ?>
 		/* padding-<?php echo $right; ?>: 78px; */
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index cf6a1096a7b..d98ef682e90 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1774,7 +1774,7 @@ else
             }
         }
 
-        if (GETPOST('action') != 'presend' && GETPOST('action') != 'send')
+        if (GETPOST('action','aZ09') != 'presend' && GETPOST('action','aZ09') != 'send')
         {
             /*
              * List of groups of user
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 8b055979992..b15af46bcd8 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -35,7 +35,7 @@ $langs->load("users");
 $langs->load('other');
 
 
-$action=GETPOST('action');
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
 $id=(GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('id','int'));
 $ref = GETPOST('ref', 'alpha');
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 2844676a465..b9e8cb69869 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 $id = GETPOST('id','int');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 
 $langs->load("companies");
 $langs->load("members");
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 2b7c31d75df..3c186ac3cae 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -37,7 +37,7 @@ $langs->load("admin");
 $langs->load("other");
 
 $id = GETPOST("id",'int');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $actionid=GETPOST('actionid');
 
 // Security check
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index e59e26efd0b..6530a4f8536 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -172,7 +172,7 @@ else
 }
 
 // Note: $conf->css looks like '/theme/eldy/style.css.php'
-$conf->css = "/theme/".(GETPOST('theme')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
+$conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
 //$themepath=dol_buildpath((empty($conf->global->MAIN_FORCETHEMEDIR)?'':$conf->global->MAIN_FORCETHEMEDIR).$conf->css,1);
 $themepath=dol_buildpath($conf->css,1);
 if (! empty($conf->modules_parts['theme']))	// This slow down
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 7b8855c1c4e..9a141b88200 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -19,7 +19,7 @@ require '../main.inc.php';
 require DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 
 $id = GETPOST('id');
-$action = GETPOST('action');
+$action = GETPOST('action','aZ09');
 $object = new ProductAttribute($db);
 
 
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 4f1ef007f1f..bd73f0c0b43 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -62,10 +62,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 
 $action=GETPOST('action','alpha');
-$original_file=GETPOST("file");
+$original_file=GETPOST("file",'alpha');
 $modulepart=GETPOST('modulepart','alpha');
-$urlsource=GETPOST("urlsource");
-$entity=GETPOST('entity')?GETPOST('entity','int'):$conf->entity;
+$urlsource=GETPOST("urlsource",'alpha');
+$entity=GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity;
 
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
@@ -84,7 +84,7 @@ if ($modulepart == 'fckeditor') $modulepart='medias';   // For backward compatib
  * View
  */
 
-if (GETPOST("cache"))
+if (GETPOST("cache",'alpha'))
 {
     // Important: Following code is to avoid page request by browser and PHP CPU at
     // each Dolibarr page access.
@@ -137,9 +137,9 @@ if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
 if ($modulepart == 'barcode')
 {
     $generator=GETPOST("generator","alpha");
-    $code=GETPOST("code");
+    $code=GETPOST("code",'alpha');
     $encoding=GETPOST("encoding","alpha");
-    $readable=GETPOST("readable")?GETPOST("readable","alpha"):"Y";
+    $readable=GETPOST("readable",'alpha')?GETPOST("readable","alpha"):"Y";
 
     if (empty($generator) || empty($encoding))
     {
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index e7dbb898145..8138100ab77 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -79,7 +79,7 @@ $langs->load("website");
 
 if (! $user->admin) accessforbidden();
 
-if (! ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)))
+if (! ((GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)))
 {
     $conf->dol_hide_leftmenu = 1;   // Force hide of left menu.
 }
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index c84ffdabc0f..cfc43113eda 100755
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -159,7 +159,7 @@ if ($resql) {
 	$i = 0;
 
 	// export csv
-	if (GETPOST('action') == 'export_csv') {
+	if (GETPOST('action','aZ09') == 'export_csv') {
 
 		header('Content-Type: text/csv');
 		header('Content-Disposition: attachment;filename=export_csv.csv');

From 194ed505f4d18ae8d037b7a875e1620538ebf4fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 14:05:46 +0200
Subject: [PATCH 0835/1163] Look and feel v6

---
 htdocs/margin/checkMargins.php | 96 +++++++++++++++++++++++++++-------
 1 file changed, 78 insertions(+), 18 deletions(-)

diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index b3c663ad886..9656fa99fd9 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -47,7 +47,7 @@ $sortorder = GETPOST("sortorder", 'alpha');
 if (! $sortorder)
 	$sortorder = "DESC";
 if (! $sortfield) {
-	$sortfield = 'f.rowid';
+	$sortfield = 'f.facnumber';
 }
 $page = GETPOST("page", 'int');
 if ($page == - 1) {
@@ -98,6 +98,46 @@ if (! empty($enddate)) {
 	$options .= '&amp;enddatemonth=' . GETPOST('enddatemonth', 'int') . '&amp;enddateday=' . GETPOST('enddateday', 'int') . '&amp;enddateyear=' . GETPOST('enddateyear', 'int');
 }
 
+$search_ref = GETPOST('search_ref','alpha');
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Purge search criteria
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+    {
+        $search_ref='';
+        $search_array_options=array();
+    }
+
+    // Mass actions
+    /*
+    $objectclass='Product';
+    if ((string) $type == '1') { $objectlabel='Services'; }
+    if ((string) $type == '0') { $objectlabel='Products'; }
+
+    $permtoread = $user->rights->produit->lire;
+    $permtodelete = $user->rights->produit->supprimer;
+    $uploaddir = $conf->product->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+    */
+}
+
+
 /*
  * View
  */
@@ -125,8 +165,7 @@ dol_fiche_head($head, $langs->trans('checkMargins'), $title, 0, $picto);
 
 print '<table class="border" width="100%">';
 
-// Start date
-print '<td class="titlefield">' . $langs->trans('DateStart') . ' (' . $langs->trans("DateValidation") . ')</td>';
+print '<tr><td class="titlefield">' . $langs->trans('DateStart') . ' (' . $langs->trans("DateValidation") . ')</td>';
 print '<td>';
 $form->select_date($startdate, 'startdate', '', '', 1, "sel", 1, 1);
 print '</td>';
@@ -136,12 +175,17 @@ $form->select_date($enddate, 'enddate', '', '', 1, "sel", 1, 1);
 print '</td>';
 print '<td style="text-align: center;">';
 print '<input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans('Refresh')) . '" name="button_search" />';
-print '</td></tr>';
+print '</td>';
+print '</tr>';
 print "</table>";
 
 dol_fiche_end();
 
 
+$arrayfields=array();
+$massactionbutton='';
+
+
 $sql = "SELECT";
 $sql .= " f.facnumber, f.rowid as invoiceid, d.rowid as invoicedetid, d.buy_price_ht, d.total_ht, d.subprice, d.label, d.description , d.qty";
 $sql .= " ,d.fk_product";
@@ -150,10 +194,9 @@ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as d  ON d.fk_facture = f.
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON d.fk_product = p.rowid";
 $sql .= " WHERE f.fk_statut > 0";
 $sql .= " AND f.entity = " . getEntity('facture', 1);
-if (! empty($startdate))
-	$sql .= " AND f.datef >= '" . $db->idate($startdate) . "'";
-if (! empty($enddate))
-	$sql .= " AND f.datef <= '" . $db->idate($enddate) . "'";
+if (! empty($startdate)) $sql .= " AND f.datef >= '" . $db->idate($startdate) . "'";
+if (! empty($enddate))   $sql .= " AND f.datef <= '" . $db->idate($enddate) . "'";
+if ($search_ref) $sql.=natural_search('f.facnumber', $search_ref);
 $sql .= " AND d.buy_price_ht IS NOT NULL";
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -186,27 +229,43 @@ if ($result) {
 	
 	$moreforfilter='';
 	
+	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+	//$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+	//if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+	$selectedfields='';
+	
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 	
+	print '<tr class="liste_titre liste_titre_search">';
+	print '<td><input type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+    print '<td class="liste_titre" align="middle">';
+    $searchpitco=$form->showFilterButtons();
+    print $searchpitco;
+    print '</td>';
+	print "</tr>\n";
+    
 	print '<tr class="liste_titre">';
-	
-	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "f.ref", "", $options, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "f.facnumber", "", $options, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "", "", $options, 'width=20%', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("UnitPriceHT"), $_SERVER["PHP_SELF"], "d.subprice", "", $options, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "d.buy_price_ht", "", $options, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Qty"), $_SERVER["PHP_SELF"], "d.qty", "", $options, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("AmountTTC"), $_SERVER["PHP_SELF"], "d.total_ht", "", $options, 'align="right"', $sortfield, $sortorder);
-	
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 	
 	if ($num > 0) {
-		$var = true;
-		
-		while ( $objp = $db->fetch_object($result) ) {
+		while ($objp = $db->fetch_object($result)) 
+		{
 			$var = ! $var;
 			
-			print "<tr " . $bc[$var] . ">";
+			print '<tr class="oddeven">';
 			print '<td>';
 			$result_inner = $invoicestatic->fetch($objp->invoiceid);
 			if ($result_inner < 0) {
@@ -241,7 +300,8 @@ if ($result) {
 			print '<td align="right">';
 			print price($objp->total_ht);
 			print '</td>';
-			
+			print '<td></td>';
+				
 			print "</tr>\n";
 			
 			$i ++;
@@ -255,8 +315,8 @@ if ($result) {
 }
 
 
-print '<div class="tabsAction">' . "\n";
-print '<div class="inline-block divButAction"><input type="submit"  name="button_updatemagins" id="button_updatemagins" class="butAction" value="' . $langs->trans("Update") . '" /></div>';
+print '<div class="center">' . "\n";
+print '<input type="submit" class="button" name="button_updatemagins" id="button_updatemagins" value="' . $langs->trans("Update") . '">';
 print '</div>';
 
 print '</form>';

From 9870cafea38eeea8750110953f45936c37aa3eb7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 16:40:03 +0200
Subject: [PATCH 0836/1163] Better translation

---
 htdocs/langs/en_US/margins.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang
index 64e1a87864d..8633d910657 100644
--- a/htdocs/langs/en_US/margins.lang
+++ b/htdocs/langs/en_US/margins.lang
@@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each salerepresentaive. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).

From d110292a1b1892c9d83ead7e2628a9f12ba89da3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 17:49:38 +0200
Subject: [PATCH 0837/1163] Uniformize code

---
 htdocs/projet/list.php          | 80 ++++++++++++++++-----------------
 htdocs/projet/tasks/list.php    | 80 ++++++++++++++++-----------------
 htdocs/theme/eldy/style.css.php |  4 +-
 htdocs/theme/md/style.css.php   |  2 +-
 4 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index a7285e1f410..be43315cb85 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -86,12 +86,12 @@ $optioncss = GETPOST('optioncss','alpha');
 $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
 if ($mine) { $search_project_user = $user->id; $mine=0; }
 
-$sday	= GETPOST('sday','int');
-$smonth	= GETPOST('smonth','int');
-$syear	= GETPOST('syear','int');
-$day	= GETPOST('day','int');
-$month	= GETPOST('month','int');
-$year	= GETPOST('year','int');
+$search_sday	= GETPOST('search_sday','int');
+$search_smonth	= GETPOST('search_smonth','int');
+$search_syear	= GETPOST('search_syear','int');
+$search_eday	= GETPOST('search_eday','int');
+$search_emonth	= GETPOST('search_emonth','int');
+$search_eyear	= GETPOST('search_eyear','int');
 
 if ($search_status == '') $search_status=-1;	// -1 or 1
 
@@ -175,12 +175,12 @@ if (empty($reshook))
     	$search_public="";
     	$search_sale="";
     	$search_project_user='';
-    	$sday="";
-    	$smonth="";
-    	$syear="";
-    	$day="";
-    	$month="";
-    	$year="";
+    	$search_sday="";
+    	$search_smonth="";
+    	$search_syear="";
+    	$search_eday="";
+    	$search_emonth="";
+    	$search_eyear="";
     	$toselect='';
     	$search_array_options=array();
     }
@@ -269,31 +269,31 @@ if ($search_label) $sql .= natural_search('p.title', $search_label);
 if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
 if ($search_opp_amount) $sql .= natural_search('p.opp_amount', $search_opp_amount, 1);
 if ($search_opp_percent) $sql .= natural_search('p.opp_percent', $search_opp_percent, 1);
-if ($smonth > 0)
+if ($search_smonth > 0)
 {
-    if ($syear > 0 && empty($sday))
-    	$sql.= " AND p.dateo BETWEEN '".$db->idate(dol_get_first_day($syear,$smonth,false))."' AND '".$db->idate(dol_get_last_day($syear,$smonth,false))."'";
-    else if ($syear > 0 && ! empty($sday))
-    	$sql.= " AND p.dateo BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'";
+    if ($search_syear > 0 && empty($search_sday))
+    	$sql.= " AND p.dateo BETWEEN '".$db->idate(dol_get_first_day($search_syear,$search_smonth,false))."' AND '".$db->idate(dol_get_last_day($search_syear,$search_smonth,false))."'";
+    else if ($search_syear > 0 && ! empty($search_sday))
+    	$sql.= " AND p.dateo BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_smonth, $search_sday, $search_syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_smonth, $search_sday, $search_syear))."'";
     else
-    	$sql.= " AND date_format(p.dateo, '%m') = '".$smonth."'";
+    	$sql.= " AND date_format(p.dateo, '%m') = '".$search_smonth."'";
 }
-else if ($syear > 0)
+else if ($search_syear > 0)
 {
-    $sql.= " AND p.dateo BETWEEN '".$db->idate(dol_get_first_day($syear,1,false))."' AND '".$db->idate(dol_get_last_day($syear,12,false))."'";
+    $sql.= " AND p.dateo BETWEEN '".$db->idate(dol_get_first_day($search_syear,1,false))."' AND '".$db->idate(dol_get_last_day($search_syear,12,false))."'";
 }
-if ($month > 0)
+if ($search_emonth > 0)
 {
-    if ($year > 0 && empty($day))
-    	$sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
-    else if ($year > 0 && ! empty($day))
-    	$sql.= " AND p.datee BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+    if ($search_eyear > 0 && empty($search_eday))
+    	$sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($search_eyear,$search_emonth,false))."' AND '".$db->idate(dol_get_last_day($search_eyear,$search_emonth,false))."'";
+    else if ($search_eyear > 0 && ! empty($search_eday))
+    	$sql.= " AND p.datee BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_emonth, $search_eday, $search_eyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_emonth, $search_eday, $search_eyear))."'";
     else
-    	$sql.= " AND date_format(p.datee, '%m') = '".$month."'";
+    	$sql.= " AND date_format(p.datee, '%m') = '".$search_emonth."'";
 }
-else if ($year > 0)
+else if ($search_eyear > 0)
 {
-    $sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+    $sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($search_eyear,1,false))."' AND '".$db->idate(dol_get_last_day($search_eyear,12,false))."'";
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 if ($search_status >= 0) 
@@ -371,12 +371,12 @@ llxHeader("", $title, $help_url);
 $param='';
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($sday)              		$param.='&sday='.$day;
-if ($smonth)              		$param.='&smonth='.$smonth;
-if ($syear)               		$param.='&syear=' .$syear;
-if ($day)               		$param.='&day='.$day;
-if ($month)              		$param.='&month='.$month;
-if ($year)               		$param.='&year=' .$year;
+if ($search_sday)              		    $param.='&search_sday='.$search_sday;
+if ($search_smonth)              		$param.='&search_smonth='.$search_smonth;
+if ($search_syear)               		$param.='&search_syear=' .$search_syear;
+if ($search_eday)               		$param.='&search_eday='.$search_eday;
+if ($search_emonth)              		$param.='&search_emonth='.$search_emonth;
+if ($search_eyear)               		$param.='&search_eyear=' .$search_eyear;
 if ($socid)				        $param.='&socid='.$socid;
 if ($search_all != '') 			$param.='&search_all='.$search_all;
 if ($search_ref != '') 			$param.='&search_ref='.$search_ref;
@@ -510,18 +510,18 @@ if (! empty($arrayfields['commercial']['checked']))
 if (! empty($arrayfields['p.dateo']['checked']))
 {
 	print '<td class="liste_titre center">';
-	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="sday" value="'.$sday.'">';
-	print '<input class="flat" type="text" size="1" maxlength="2" name="smonth" value="'.$smonth.'">';
-	$formother->select_year($syear?$syear:-1,'syear',1, 20, 5);
+	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_sday" value="'.$search_sday.'">';
+	print '<input class="flat" type="text" size="1" maxlength="2" name="search_smonth" value="'.$search_smonth.'">';
+	$formother->select_year($search_syear?$search_syear:-1,'search_syear',1, 20, 5);
 	print '</td>';
 }
 // End date
 if (! empty($arrayfields['p.datee']['checked']))
 {
 	print '<td class="liste_titre center">';
-	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-	$formother->select_year($year?$year:-1,'year',1, 20, 5);
+	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_eday" value="'.$search_eday.'">';
+	print '<input class="flat" type="text" size="1" maxlength="2" name="search_emonth" value="'.$search_emonth.'">';
+	$formother->select_year($search_eyear?$search_eyear:-1,'search_eyear',1, 20, 5);
 	print '</td>';
 }
 if (! empty($arrayfields['p.public']['checked']))
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 8579d436d71..285aa182206 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -60,12 +60,12 @@ $search_task_user=GETPOST('search_task_user');
 $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
 if ($mine) { $search_task_user = $user->id; $mine = 0; }
 
-$sday	= GETPOST('sday','int');
-$smonth	= GETPOST('smonth','int');
-$syear	= GETPOST('syear','int');
-$day	= GETPOST('day','int');
-$month	= GETPOST('month','int');
-$year	= GETPOST('year','int');
+$search_sday	= GETPOST('search_sday','int');
+$search_smonth	= GETPOST('search_smonth','int');
+$search_syear	= GETPOST('search_syear','int');
+$search_eday	= GETPOST('search_eday','int');
+$search_emonth	= GETPOST('search_emonth','int');
+$search_eyear	= GETPOST('search_eyear','int');
 
 // Initialize context for list
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'tasklist';
@@ -162,12 +162,12 @@ if (empty($reshook))
         $search_task_description="";
         $search_task_user=-1;
         $search_project_user=-1;
-        $sday='';
-        $smonth='';
-        $syear='';
-        $day='';
-        $month='';
-        $year='';
+        $search_sday='';
+        $search_smonth='';
+        $search_syear='';
+        $search_eday='';
+        $search_emonth='';
+        $search_eyear='';
         $toselect='';
         $search_array_options=array();
     }
@@ -277,31 +277,31 @@ if ($search_project_title) $sql .= natural_search('p.title', $search_project_tit
 if ($search_task_ref)      $sql .= natural_search('t.ref', $search_task_ref);
 if ($search_task_label)    $sql .= natural_search('t.label', $search_task_label);
 if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
-if ($smonth > 0)
+if ($search_smonth > 0)
 {
-    if ($syear > 0 && empty($sday))
-        $sql.= " AND t.dateo BETWEEN '".$db->idate(dol_get_first_day($syear,$smonth,false))."' AND '".$db->idate(dol_get_last_day($syear,$smonth,false))."'";
-        else if ($syear > 0 && ! empty($sday))
-            $sql.= " AND t.dateo BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'";
+    if ($search_syear > 0 && empty($search_sday))
+        $sql.= " AND t.dateo BETWEEN '".$db->idate(dol_get_first_day($search_syear,$search_smonth,false))."' AND '".$db->idate(dol_get_last_day($search_syear,$search_smonth,false))."'";
+        else if ($search_syear > 0 && ! empty($search_sday))
+            $sql.= " AND t.dateo BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_smonth, $search_sday, $search_syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_smonth, $search_sday, $search_syear))."'";
             else
-                $sql.= " AND date_format(t.dateo, '%m') = '".$smonth."'";
+                $sql.= " AND date_format(t.dateo, '%m') = '".$search_smonth."'";
 }
-else if ($syear > 0)
+else if ($search_syear > 0)
 {
-    $sql.= " AND t.dateo BETWEEN '".$db->idate(dol_get_first_day($syear,1,false))."' AND '".$db->idate(dol_get_last_day($syear,12,false))."'";
+    $sql.= " AND t.dateo BETWEEN '".$db->idate(dol_get_first_day($search_syear,1,false))."' AND '".$db->idate(dol_get_last_day($search_syear,12,false))."'";
 }
-if ($month > 0)
+if ($search_emonth > 0)
 {
-    if ($year > 0 && empty($day))
-        $sql.= " AND t.datee BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
-        else if ($year > 0 && ! empty($day))
-            $sql.= " AND t.datee BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+    if ($search_eyear > 0 && empty($search_eday))
+        $sql.= " AND t.datee BETWEEN '".$db->idate(dol_get_first_day($search_eyear,$search_emonth,false))."' AND '".$db->idate(dol_get_last_day($search_eyear,$search_emonth,false))."'";
+        else if ($search_eyear > 0 && ! empty($search_eday))
+            $sql.= " AND t.datee BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_emonth, $search_eday, $search_eyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_emonth, $search_eday, $search_eyear))."'";
             else
-                $sql.= " AND date_format(t.datee, '%m') = '".$month."'";
+                $sql.= " AND date_format(t.datee, '%m') = '".$search_emonth."'";
 }
-else if ($year > 0)
+else if ($search_eyear > 0)
 {
-    $sql.= " AND t.datee BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+    $sql.= " AND t.datee BETWEEN '".$db->idate(dol_get_first_day($search_eyear,1,false))."' AND '".$db->idate(dol_get_last_day($search_eyear,12,false))."'";
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 if ($search_projectstatus >= 0)
@@ -368,12 +368,12 @@ llxHeader("", $title, $help_url);
 $param='';
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($sday)              		$param.='&sday='.$day;
-if ($smonth)              		$param.='&smonth='.$smonth;
-if ($syear)               		$param.='&syear=' .$syear;
-if ($day)               		$param.='&day='.$day;
-if ($month)              		$param.='&month='.$month;
-if ($year)               		$param.='&year=' .$year;
+if ($search_sday)                 		$param.='&search_sday='.$search_sday;
+if ($search_smonth)              		$param.='&search_smonth='.$search_smonth;
+if ($search_syear)               		$param.='&search_syear=' .$search_syear;
+if ($search_eday)               		$param.='&search_eday='.$search_eday;
+if ($search_emonth)              		$param.='&search_emonth='.$search_emonth;
+if ($search_eyear)               		$param.='&search_eyear=' .$search_eyear;
 if ($socid)				        $param.='&socid='.$socid;
 if ($search_all != '') 			$param.='&search_all='.$search_all;
 if ($search_project_ref != '') 			$param.='&search_project_ref='.$search_project_ref;
@@ -493,18 +493,18 @@ if (! empty($arrayfields['t.label']['checked']))
 if (! empty($arrayfields['t.dateo']['checked']))
 {
     print '<td class="liste_titre center">';
-    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="sday" value="'.$sday.'">';
-    print '<input class="flat" type="text" size="1" maxlength="2" name="smonth" value="'.$smonth.'">';
-    $formother->select_year($syear?$syear:-1,'syear',1, 20, 5);
+    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_sday" value="'.$search_sday.'">';
+    print '<input class="flat" type="text" size="1" maxlength="2" name="search_smonth" value="'.$search_smonth.'">';
+    $formother->select_year($search_syear?$search_syear:-1,'search_syear',1, 20, 5);
     print '</td>';
 }
 // End date
 if (! empty($arrayfields['t.datee']['checked']))
 {
     print '<td class="liste_titre center">';
-    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-    $formother->select_year($year?$year:-1,'year',1, 20, 5);
+    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_eday" value="'.$search_eday.'">';
+    print '<input class="flat" type="text" size="1" maxlength="2" name="search_emonth" value="'.$search_emonth.'">';
+    $formother->select_year($search_eyear?$search_eyear:-1,'search_eyear',1, 20, 5);
     print '</td>';
 }
 if (! empty($arrayfields['p.ref']['checked']))
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 2aa33543913..66f880da786 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -265,7 +265,7 @@ input.select2-input {
 	border-bottom:  solid 1px rgba(0,0,0,.2) !important;	/* required to avoid to lose bottom line when focus is lost on select2. */
 }
 
-.liste_titre input[name=monthvalid], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
+.liste_titre input[name=monthvalid], .liste_titre input[name=search_smonth], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
 input[type=submit] {
@@ -1765,7 +1765,7 @@ input.vmenusearchselectcombo[type=text] {
     text-overflow: ellipsis;
     width: 188px;				/* required to have overflow working. must be same than .menu_titre */
 }
-#menu_contenu_logo { padding-top: 0; }
+#menu_contenu_logo { /* padding-top: 0; */ }
 .companylogo { }
 .searchform { padding-top: 10px; }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index dde2c8c42ad..04732ef0305 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -280,7 +280,7 @@ textarea.cke_source:focus
 	box-shadow: none;
 }
 
-.liste_titre input[name=monthvalid], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
+.liste_titre input[name=monthvalid], .liste_titre input[name=search_smonth], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {

From b0f02851375c30a51c125e049e57cf49bef7af2a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 18:12:10 +0200
Subject: [PATCH 0838/1163] Standardize code

---
 htdocs/commande/class/api_orders.class.php | 15 +++++++++++++++
 htdocs/commande/class/commande.class.php   |  1 -
 htdocs/user/class/api_users.class.php      | 17 +++++++++++++++++
 htdocs/user/class/user.class.php           |  2 ++
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index e0ab753c64c..81a2ad79d69 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -494,6 +494,21 @@ class Orders extends DolibarrApi
         );
     }
 
+    /**
+     * Clean sensible object datas
+     *
+     * @param   object  $object    Object to clean
+     * @return    array    Array of cleaned object properties
+     */
+    function _cleanObjectDatas($object) {
+    
+        $object = parent::_cleanObjectDatas($object);
+    
+        unset($object->address);
+    
+        return $object;
+    }
+    
     /**
      * Validate fields before create or update object
      *
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index a12a563e58c..fea30eda589 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -116,7 +116,6 @@ class Commande extends CommonOrder
 
     public $demand_reason_id;   // Source reason. Why we receive order (after a phone campaign, ...)
     public $demand_reason_code;
-    public $address;
     public $date;				// Date commande
 	/**
 	 * @deprecated
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index a759f1dfe08..80065f8d8d2 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -272,6 +272,23 @@ class Users extends DolibarrApi
 		return $this->useraccount->delete($id);
 	}
 
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   object  $object    Object to clean
+	 * @return    array    Array of cleaned object properties
+	 */
+	function _cleanObjectDatas($object) {
+	
+	    $object = parent::_cleanObjectDatas($object);
+	
+	    unset($object->default_values);
+	    unset($object->lastsearch_values);
+	    unset($object->lastsearch_values_tmp);
+	     
+	    return $object;
+	}	
+	
 	/**
 	 * Validate fields before create or update object
      * 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index f23c8aca0b6..e09e52c1882 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -110,6 +110,8 @@ class User extends CommonObject
 	
 	public $conf;           		// To store personal config
 	public $default_values;         // To store default values for user
+	public $lastsearch_values_tmp;  // To store current search criterias for user
+	public $lastsearch_values;      // To store last saved search criterias for user
 	
 	public $users;					// To store all tree of users hierarchy
 	public $parentof;				// To store an array of all parents for all ids.

From b29f325fcf6993861c5979fe361b407b8e82ad66 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 23:38:23 +0200
Subject: [PATCH 0839/1163] Work on search criteria persistence

---
 htdocs/core/lib/functions.lib.php      | 78 ++++++++++++++++----------
 htdocs/main.inc.php                    | 39 +++++++++++--
 htdocs/projet/class/project.class.php  | 27 +++++----
 htdocs/societe/class/societe.class.php | 20 ++++---
 4 files changed, 111 insertions(+), 53 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 06ed76c5008..141811e382b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -237,8 +237,10 @@ function dol_shutdown()
 
 
 /**
- *  Return value of a param into GET or POST supervariable
- *
+ *  Return value of a param into GET or POST supervariable.
+ *  Use the property $user->default_values[path]['creatform'] and/or $user->default_values[path]['filters'] and/or $user->default_values[path]['sortorder']
+ *  Note: The property $user->default_values is loaded by the main when loading the user.
+ *  
  *  @param	string	$paramname   Name of parameter to found
  *  @param	string	$check	     Type of check
  *                                  ''=no check (deprecated)
@@ -255,6 +257,7 @@ function dol_shutdown()
  *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
  *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'.
  *  @return string|string[]      Value found (string or array), or '' if check fails
+ *  
  *  @TODO Set default value for check to alpha. Check all WYSIWYG edition (email and description...) is still ok with rich text.
  */
 function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
@@ -270,16 +273,16 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	
 	if (empty($method) || $method == 3 || $method == 4)
 	{
+    	$relativepathstring = $_SERVER["PHP_SELF"];
+    	if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+    	$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+    	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+	
 	    // Management of default values
 	    if (! isset($_GET['sortfield']) && ! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_DISABLE_DEFAULT_VALUES is on
 	    {
 	        if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
-	            $relativepathstring = $_SERVER["PHP_SELF"];
-	            if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-	            $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-	            $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-	            global $user;
 	            if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first
 	            {
 	                //var_dump($user->default_values[$relativepathstring]['createform']);
@@ -290,46 +293,46 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	        //elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        elseif (! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
-	            $relativepathstring = $_SERVER["PHP_SELF"];
-	            if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-	            $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-	            $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-	            global $user;
 	            if (! empty($user->default_values))		// $user->default_values defined from menu default values
 	            {
 	                //var_dump($user->default_values[$relativepathstring]);
 	                if ($paramname == 'sortfield')
 	                {
-	                    if (isset($user->default_values[$relativepathstring]['sortorder']))
+	                    if (isset($user->default_values[$relativepathstring]['sortorder']))    // We will use the key of $user->default_values[path][sortorder]
 	                    {
+	                        $forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
 	                        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
 	                        {
 	                            if ($out) $out.=', ';
-	                            $out.=dol_string_nospecial($key, '');
+	                            $out.=dol_string_nospecial($key, '', $forbidden_chars_to_replace);
 	                        }
 	                    }
 	                }
 	                elseif ($paramname == 'sortorder')
 	                {
-	                    if (isset($user->default_values[$relativepathstring]['sortorder']))
+	                    if (isset($user->default_values[$relativepathstring]['sortorder']))    // We will use the val of $user->default_values[path][sortorder]
 	                    {
+	                        $forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
 	                        foreach($user->default_values[$relativepathstring]['sortorder'] as $key => $val)
 	                        {
 	                            if ($out) $out.=', ';
-	                            $out.=dol_string_nospecial($val, '');
+	                            $out.=dol_string_nospecial($val, '', $forbidden_chars_to_replace);
 	                        }
 	                    }
 	                }
 	                elseif (isset($user->default_values[$relativepathstring]['filters'][$paramname]))
-	                $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$paramname], '');
+	                {
+	                    $forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
+	                    $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$paramname], '', $forbidden_chars_to_replace);
+	                }
 	            }
 	        }
 	    }
 	}	
 	
-	if (empty($check) && $conf->global->MAIN_FEATURES_LEVEL > 0)
+	if (empty($check) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
-	   dol_syslog("A GETPOST is called with 1st param = ".$paramname." and 2nd param not defined, when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);    
+	   dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param not defined, when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);    
 	}
 	
 	if (! empty($check))
@@ -338,7 +341,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	    if (! is_array($out))
 	    {
 	        $maxloop=20; $loopnb=0;    // Protection against infinite loop
-	        while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'
+	        while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
 	        {
 	            $loopnb++; $newout = '';
 
@@ -420,6 +423,17 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	    }
 	}
 
+	// Save data into session if key start with 'search_' or is 'smonth', 'syear', 'month', 'year'
+	if (empty($method) || $method == 3 || $method == 4)
+	{
+	    //if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder', 'sortfield", 'smonth', 'syear', 'month', 'year')))
+	    if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder','sortfield')))
+	    {
+	        //if ($paramname == 'sortorder') var_dump($paramname.' - '.$out);
+	        $user->lastsearch_values_tmp[$relativepathstring][$paramname]=$out;
+	    }
+	}
+	
 	return $out;
 }
 
@@ -3223,8 +3237,8 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar
  *	@param	string	$begin       ("" by defaut)
  *	@param	string	$moreparam   Add more parameters on sort url links ("" by default)
  *	@param  string	$moreattrib  Add more attributes on th ("" by defaut). To add more css class, use param $prefix.
- *	@param  string	$sortfield   Current field used to sort
- *	@param  string	$sortorder   Current sort order
+ *	@param  string	$sortfield   Current field used to sort (Ex: 'd.datep,d.id')
+ *	@param  string	$sortorder   Current sort order (Ex: 'asc,desc')
  *  @param	string	$prefix		 Prefix for css. Use space after prefix to add your own CSS tag.
  *	@return	string
  */
@@ -3241,11 +3255,15 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 	if ($thead==2) $tag='div';
 
 	$tmpsortfield=explode(',',$sortfield);
-	$sortfield=trim($tmpsortfield[0]);
+	$sortfield1=trim($tmpsortfield[0]);    // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'
+	$tmpfield=explode(',',$field);
+	$field1=trim($tmpfield[0]);            // If $field is 'd.datep,d.id', it becomes 'd.datep'
+
+	//var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);
 	
-	// If field is used as sort criteria we use a specific class
+	// If field is used as sort criteria we use a specific css class liste_titre_sel
 	// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
-	if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field))) $out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
+	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./","",$field1))) $out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
 	else $out.= '<'.$tag.' class="'.$prefix.'liste_titre" '. $moreattrib.'>';
 
 	if (empty($thead) && $field)    // If this is a sort field
@@ -3255,15 +3273,15 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 		$options=preg_replace('/&+/i','&',$options);
 		if (! preg_match('/^&/',$options)) $options='&'.$options;
 
-		if ($field != $sortfield)
+		if ($field1 != $sortfield1) // We are on another field
 		{
             if (preg_match('/^DESC/', $sortorder)) $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
             else $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
 		}
-		else
+		else                      // We are of first sorting criteria
 		{
-            if (preg_match('/^ASC/', $sortorder)) $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
-		    else $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
+            if (preg_match('/^ASC/', $sortorder)) $out.= '<a href="'.$file.'?sortfield='.$sortfield.'&sortorder=desc&begin='.$begin.$options.'">';
+		    else $out.= '<a href="'.$file.'?sortfield='.$sortfield.'&sortorder=asc&begin='.$begin.$options.'">';
 		}
 	}
 
@@ -3285,7 +3303,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 		//$sortimg.= '<img width="2" src="'.DOL_URL_ROOT.'/theme/common/transparent.png" alt="">';
 		//$sortimg.= '<span class="nowrap">';
 
-		if (! $sortorder || $field != $sortfield)
+		if (! $sortorder || $field1 != $sortfield1)
 		{
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c2b99f22c1f..d632e91d537 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -646,6 +646,19 @@ if (! defined('NOLOGIN'))
 	       // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 	       $hookmanager->initHooks(array('main'));
 
+	       if (! empty($_GET['save_lastsearch_values']))    // Keep $_GET here
+	       {
+               $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
+	           if (constant('DOL_MAIN_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_MAIN_URL_ROOT'),'/').'/', '', $relativepathstring);
+	           $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+               $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+               if (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
+               {
+                   $_SESSION['lastsearch_values_'.$relativepathstring]=$_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+                   unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
+               }
+	       }
+	       
 	       $action = '';
 	       $reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);
 	       if ($reshook < 0) {
@@ -653,7 +666,7 @@ if (! defined('NOLOGIN'))
 	       }
         }
     }
-
+    
     // Is it a new session that has started ?
     // If we are here, this means authentication was successfull.
     if (! isset($_SESSION["dol_login"]))
@@ -1858,7 +1871,7 @@ if (! function_exists("llxFooter"))
 {
     /**
      * Show HTML footer
-     * Close div /DIV data-role=page + /DIV class=fiche + /DIV /DIV main layout + /BODY + /HTML.
+     * Close div /DIV class=fiche + /DIV id-right + /DIV id-container + /BODY + /HTML.
      * If global var $delayedhtmlcontent was filled, we output it just before closing the body.
      *
      * @param	string	$comment    A text to add as HTML comment into HTML generated page
@@ -1867,12 +1880,30 @@ if (! function_exists("llxFooter"))
      */
     function llxFooter($comment='',$zone='private')
     {
-        global $conf, $langs;
+        global $conf, $langs, $user;
         global $delayedhtmlcontent;
 
         // Global html output events ($mesgs, $errors, $warnings)
         dol_htmloutput_events();
 
+        // Save $user->lastsearch_values if defined (define on list pages when a form field search_xxx exists)
+        if (is_object($user) && ! empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
+        {
+            // Clean data
+            foreach($user->lastsearch_values_tmp as $key => $val)
+            {
+                unset($_SESSION['lastsearch_values_tmp_'.$key]);
+                if (count($val))
+                {
+                    if (empty($val['sortfield'])) unset($val['sortfield']);
+                    if (empty($val['sortorder'])) unset($val['sortorder']);
+                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0, 1));
+                    $_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
+                    unset($_SESSION['lastsearch_values_'.$key]);
+                }
+            }
+        }
+
         // Core error message
         if (! empty($conf->global->MAIN_CORE_ERROR))
         {
@@ -1943,7 +1974,7 @@ if (! function_exists("llxFooter"))
         			});
         		});
             </script>' . "\n";
-        }         
+        }
         
         // Wrapper to manage dropdown
         if ($conf->use_javascript_ajax)
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 5efaae1fd78..6a7b130ac0d 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -922,15 +922,16 @@ class Project extends CommonObject
     /**
      * 	Return clicable name (with picto eventually)
      *
-     * 	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-     * 	@param	string	$option			Variant ('', 'nolink')
-     * 	@param	int		$addlabel		0=Default, 1=Add label into string, >1=Add first chars into string
-     *  @param	string	$moreinpopup	Text to add into popup
-     *  @param	string	$sep			Separator between ref and label if option addlabel is set
-     *  @param	int   	$notooltip		1=Disable tooltip
-     * 	@return	string					Chaine avec URL
+     * 	@param	int		$withpicto		          0=No picto, 1=Include picto into link, 2=Only picto
+     * 	@param	string	$option			          Variant ('', 'nolink')
+     * 	@param	int		$addlabel		          0=Default, 1=Add label into string, >1=Add first chars into string
+     *  @param	string	$moreinpopup	          Text to add into popup
+     *  @param	string	$sep			          Separator between ref and label if option addlabel is set
+     *  @param	int   	$notooltip		          1=Disable tooltip
+     *  @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     * 	@return	string					          String with URL
      */
-    function getNomUrl($withpicto=0, $option='', $addlabel=0, $moreinpopup='', $sep=' - ', $notooltip=0)
+    function getNomUrl($withpicto=0, $option='', $addlabel=0, $moreinpopup='', $sep=' - ', $notooltip=0, $save_lastsearch_value=-1)
     {
         global $conf, $langs, $user;
 
@@ -940,10 +941,8 @@ class Project extends CommonObject
         
         $label='';
         if ($option != 'nolink') $label = '<u>' . $langs->trans("ShowProject") . '</u>';
-        if (! empty($this->ref))
-            $label .= ($label?'<br>':'').'<b>' . $langs->trans('Ref') . ': </b>' . $this->ref;	// The space must be after the : to not being explode when showing the title in img_picto
-        if (! empty($this->title))
-            $label .= ($label?'<br>':'').'<b>' . $langs->trans('Label') . ': </b>' . $this->title;	// The space must be after the : to not being explode when showing the title in img_picto
+        $label .= ($label?'<br>':'').'<b>' . $langs->trans('Ref') . ': </b>' . $this->ref;	// The space must be after the : to not being explode when showing the title in img_picto
+        $label .= ($label?'<br>':'').'<b>' . $langs->trans('Label') . ': </b>' . $this->title;	// The space must be after the : to not being explode when showing the title in img_picto
         if (! empty($this->thirdparty_name))
             $label .= ($label?'<br>':'').'<b>' . $langs->trans('ThirdParty') . ': </b>' . $this->thirdparty_name;	// The space must be after the : to not being explode when showing the title in img_picto
         if (! empty($this->dateo))
@@ -965,6 +964,10 @@ class Project extends CommonObject
             {
                 $url = DOL_URL_ROOT . '/projet/card.php?id=' . $this->id;
             }
+            // Add param to save lastsearch_values or not
+            $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0); 
+            if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+            if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
         }
         
         $linkclose='';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index fb486629731..6aebf0e8786 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1824,13 +1824,14 @@ class Societe extends CommonObject
     /**
      *    	Return a link on thirdparty (with picto)
      *
-     *		@param	int		$withpicto		Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
-     *		@param	string	$option			Target of link ('', 'customer', 'prospect', 'supplier', 'project')
-     *		@param	int		$maxlen			Max length of name
-     *      @param	int  	$notooltip		1=Disable tooltip
-     *		@return	string					String with URL
+     *		@param	int		$withpicto		          Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
+     *		@param	string	$option			          Target of link ('', 'customer', 'prospect', 'supplier', 'project')
+     *		@param	int		$maxlen			          Max length of name
+     *      @param	int  	$notooltip		          1=Disable tooltip
+     *      @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *		@return	string					          String with URL
      */
-    function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0)
+    function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0, $save_lastsearch_value=-1)
     {
         global $conf, $langs, $hookmanager;
 
@@ -1929,7 +1930,12 @@ class Societe extends CommonObject
         $label.= '</div>';
 
         // Add type of canvas
-        $linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'"';
+        $linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
+        // Add param to save lastsearch_values or not
+        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0); 
+        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+        if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
+        $linkstart.='"';
 
         $linkclose='';
         if (empty($notooltip))

From 7931c548c78650ab31843f8be27bea665395ec47 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 May 2017 23:57:41 +0200
Subject: [PATCH 0840/1163] Better translation

---
 htdocs/install/mysql/data/llx_c_shipment_mode.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
index 7bc3f8f590d..189bd3ea94b 100644
--- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
@@ -1,6 +1,6 @@
 -- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
--- Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
 -- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
 -- Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
@@ -29,8 +29,8 @@
 --
 -- Sending method
 --
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (1,'CATCH','Catch','Catch by client','',1);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (2,'TRANS','Transporter','Generic transporter','',1);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (1,'CATCH','At-Store Reclamation','At-Store Reclamation by the customer','',1);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (2,'TRANS','Generic transporter','Generic transporter','',1);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi','http://www.colissimo.fr/portail_colissimo/suivre.do?colispart={TRACKID}',0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max','',0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (5,'UPS','UPS','United Parcel Service','http://wwwapps.ups.com/etracking/tracking.cgi?InquiryNumber2=&InquiryNumber3=&tracknums_displayed=3&loc=fr_FR&TypeOfInquiryNumber=T&HTMLVersion=4.0&InquiryNumber22=&InquiryNumber32=&track=Track&Suivi.x=64&Suivi.y=7&Suivi=Valider&InquiryNumber1={TRACKID}',0);

From e2a7b0943f8e63034a5e46bf7ae332c495999834 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 May 2017 14:52:27 +0200
Subject: [PATCH 0841/1163] Clean dead code

---
 htdocs/fourn/ajax/getSupplierPrices.php          | 6 ------
 htdocs/fourn/class/fournisseur.product.class.php | 4 ++--
 htdocs/margin/lib/margins.lib.php                | 2 --
 htdocs/product/fournisseurs.php                  | 3 ++-
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index af3d728dc78..817f83f7ab6 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -78,12 +78,6 @@ if ($idprod > 0)
 				$title.= price($unitprice,0,$langs,0,0,-1,$conf->currency)."/".$langs->trans("Unit");
 				$price = $unitprice;
 			}
-			if ($productSupplier->fourn_unitcharges > 0 && ($conf->global->MARGIN_TYPE == "2"))
-			{
-				$title.=" + ";
-				$title.= price($productSupplier->fourn_unitcharges,0,$langs,0,0,-1,$conf->currency);
-				$price += $productSupplier->fourn_unitcharges;
-			}
 			
 			$label = price($price,0,$langs,0,0,-1,$conf->currency)."/".$langs->trans("Unit");
 			if ($productSupplier->fourn_ref) $label.=' ('.$productSupplier->fourn_ref.')';
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index eaff46ddc2c..4f576148099 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -229,12 +229,12 @@ class ProductFournisseur extends Product
 			$sql.= " remise_percent = ".$remise_percent.",";
 			$sql.= " remise = ".$remise.",";
 			$sql.= " unitprice = ".$unitBuyPrice.",";
-			$sql.= " unitcharges = ".$unitCharges.",";
+			$sql.= " unitcharges = ".$unitCharges.",";   // deprecated
 			$sql.= " tva_tx = ".$tva_tx.",";
 			$sql.= " fk_availability = ".$availability.",";
 			$sql.= " entity = ".$conf->entity.",";
 			$sql.= " info_bits = ".$newnpr.",";
-			$sql.= " charges = ".$charges.",";
+			$sql.= " charges = ".$charges.",";           // deprecated
 			$sql.= " delivery_time_days = ".($delivery_time_days != '' ? $delivery_time_days : 'null').",";
 			$sql.= " supplier_reputation = ".(empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'");			
 			$sql.= " WHERE rowid = ".$this->product_fourn_price_id;
diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php
index d7dbd5d81eb..e1c2d59b7b8 100644
--- a/htdocs/margin/lib/margins.lib.php
+++ b/htdocs/margin/lib/margins.lib.php
@@ -124,8 +124,6 @@ function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localta
 		if ($product->fetch_product_fournisseur_price($fk_pa))
 		{
 			$paht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
-			if ($conf->global->MARGIN_TYPE == "2" && $product->fourn_unitcharges > 0)
-				$paht_ret += $product->fourn_unitcharges;
 		}
 		else
 		{
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 546d94773a3..2c0a5cd15d7 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -678,6 +678,7 @@ if ($id > 0 || $ref)
 						print'</td>';
 
 						// Charges ????
+						/*
 						if ($conf->global->PRODUCT_CHARGES)
 						{
 							if (! empty($conf->margin->enabled))
@@ -686,7 +687,7 @@ if ($id > 0 || $ref)
 								print $productfourn->fourn_unitcharges?price($productfourn->fourn_unitcharges) : ($productfourn->fourn_qty?price($productfourn->fourn_charges/$productfourn->fourn_qty):"&nbsp;");
 								print '</td>';
 							}
-						}
+						}*/
 
 						if (is_object($hookmanager))
 						{

From 56989ae5aff33d76a79d365374e16b6e1bfba6da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 May 2017 15:10:45 +0200
Subject: [PATCH 0842/1163] Add missing fields making not possible to enter
 reference price of products into another currency

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql   | 16 ++++++++++++++++
 .../tables/llx_product_fournisseur_price.sql     |  8 +++++++-
 .../tables/llx_product_fournisseur_price_log.sql |  7 ++++++-
 .../install/mysql/tables/llx_product_price.sql   |  5 ++++-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 88260498f28..6ba7707b249 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -189,6 +189,22 @@ ALTER TABLE llx_cronjob ADD COLUMN processing integer NOT NULL DEFAULT 0;
 ALTER TABLE llx_website ADD COLUMN fk_user_create integer;
 ALTER TABLE llx_website ADD COLUMN fk_user_modif integer;
 
+-- Add missing fields making not possible to enter reference price of products into another currency
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN multicurrency_tx			double(24,8) DEFAULT 1;
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN multicurrency_price_ttc	double(24,8) DEFAULT NULL;
+
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN fk_multicurrency		 integer;
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN multicurrency_code		 varchar(255);
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN multicurrency_tx	     double(24,8) DEFAULT 1;
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN multicurrency_price	 double(24,8) DEFAULT NULL;
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN multicurrency_price_ttc double(24,8) DEFAULT NULL;
+
+ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN fk_multicurrency		 integer;
+ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_code		 varchar(255);
+ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_tx	     double(24,8) DEFAULT 1;
+ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_price	 double(24,8) DEFAULT NULL;
+ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_price_ttc double(24,8) DEFAULT NULL;
+
 
 create table llx_payment_various
 (
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
index 94032b784f4..f341b103edb 100755
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -43,5 +43,11 @@ create table llx_product_fournisseur_price
   fk_supplier_price_expression	integer,            -- Link to the rule for dynamic price calculation
   import_key			varchar(14),                -- Import key
   delivery_time_days    integer,
-  supplier_reputation varchar(10)
+  supplier_reputation varchar(10),
+  
+  fk_multicurrency		integer,
+  multicurrency_code	varchar(255),
+  multicurrency_tx			double(24,8) DEFAULT 1,
+  multicurrency_price	double(24,8) DEFAULT NULL,
+  multicurrency_price_ttc	double(24,8) DEFAULT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql
index 3d54f9ef341..e9b78922413 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql
@@ -24,6 +24,11 @@ create table llx_product_fournisseur_price_log
   fk_product_fournisseur      integer      NOT NULL,
   price                       double(24,8) DEFAULT 0,
   quantity                    double,
-  fk_user                     integer
+  fk_user                     integer,
 
+  fk_multicurrency		integer,
+  multicurrency_code	varchar(255),
+  multicurrency_tx			double(24,8) DEFAULT 1,
+  multicurrency_price	double(24,8) DEFAULT NULL,
+  multicurrency_price_ttc	double(24,8) DEFAULT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql
index ee2ee953c49..a7f9ba38751 100755
--- a/htdocs/install/mysql/tables/llx_product_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_price.sql
@@ -46,6 +46,9 @@ create table llx_product_price
   
   fk_multicurrency		integer,
   multicurrency_code	varchar(255),
-  multicurrency_price	double(24,8) DEFAULT NULL
+  multicurrency_tx			double(24,8) DEFAULT 1,
+  multicurrency_price	double(24,8) DEFAULT NULL,
+  multicurrency_price_ttc	double(24,8) DEFAULT NULL
+  
 )ENGINE=innodb;
 

From 1d6b4cb28ace17c701a6e647288610358002fade Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 May 2017 15:25:09 +0200
Subject: [PATCH 0843/1163] Look and feel v6

---
 htdocs/product/price.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index cce87bfae5a..d3e144b91ca 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1080,6 +1080,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 	if (empty($conf->global->PRODUIT_MULTIPRICES))
 	{
+	    print '<!-- Edit price -->'."\n";
 		print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 		print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 		print '<input type="hidden" name="action" value="update_price">';
@@ -1184,7 +1185,8 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 	}
 	else
 	{
-		?>
+	    print '<!-- Edit price per level -->'."\n";
+	    ?>
 		<script>
 
 			var showHidePriceRules = function () {
@@ -1213,7 +1215,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		print '<input type="hidden" name="action" value="update_price">';
 		print '<input type="hidden" name="id" value="' . $object->id . '">';
 
-		dol_fiche_head('');
+		//dol_fiche_head('', '', '', -1);
 		
 		if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) {
 			print $langs->trans('UseMultipriceRules'). ' <input type="checkbox" id="usePriceRules" name="usePriceRules" '.($object->price_autogen ? 'checked' : '').'><br><br>';
@@ -1295,7 +1297,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		
 		print '</table>';
 		
-		dol_fiche_end();
+		//dol_fiche_end();
 		
 		print '<div style="text-align: center">';
 		print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';

From c224e2b4f607d41c392e34fada46556711322472 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 May 2017 16:05:26 +0200
Subject: [PATCH 0844/1163] Remove table that does not exists

---
 htdocs/product/class/product.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 4a8c1e9f8fb..1225eb82696 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1076,7 +1076,7 @@ class Product extends CommonObject
    			// Delete all child tables
 			if (! $error)
 			{
-				$elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price','product_lot','product_warehouse_properties');  // product_batch is done before
+				$elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price','product_lot');  // product_batch is done before
     			foreach($elements as $table)
     			{
     				if (! $error)

From 169859b7086704b4362d7964be64a5f2dd4d11ef Mon Sep 17 00:00:00 2001
From: KHELIFA <kkhelifa@open-dsi.fr>
Date: Wed, 17 May 2017 17:00:45 +0200
Subject: [PATCH 0845/1163] Module Agenda: Add option - Show linked object into
 agenda view

---
 htdocs/admin/agenda_other.php      | 24 ++++++++++++++++++++++++
 htdocs/comm/action/index.php       | 10 ++++++++++
 htdocs/comm/action/listactions.php | 18 +++++++++++++++++-
 htdocs/langs/en_US/admin.lang      |  1 +
 htdocs/langs/fr_FR/admin.lang      |  1 +
 5 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 1d785e882fc..55b61145b6a 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2011-2017  Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2015		Jean-François Ferry	    <jfefe@aternatik.fr>
  * Copyright (C) 2016		Charlie Benke		    <charlie@patas-monkey.com>
+ * Copyright (C) 2017       Open-DSI                <support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -431,6 +432,29 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0)
     }
 }
 
+// AGENDA_SHOW_LINKED_OBJECT
+$var=!$var;
+print '<tr '.$bc[$var].'>'."\n";
+print '<td>'.$langs->trans("AGENDA_SHOW_LINKED_OBJECT").'</td>'."\n";
+print '<td align="center">&nbsp;</td>'."\n";
+print '<td align="right">'."\n";
+if (! empty($conf->use_javascript_ajax))
+{
+    print ajax_constantonoff('AGENDA_SHOW_LINKED_OBJECT');
+}
+else
+{
+    if (empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))
+    {
+        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_SHOW_LINKED_OBJECT">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+    }
+    else
+    {
+        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_SHOW_LINKED_OBJECT">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+    }
+}
+print '</td></tr>'."\n";
+
 print '</table>';
 
 dol_fiche_end();
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 47ef8093c1a..0a8ab49ea38 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2017      Open-DSI             <support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -446,6 +447,7 @@ $sql.= ' a.percent,';
 $sql.= ' a.fk_user_author,a.fk_user_action,';
 $sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,';
 $sql.= ' a.fk_soc, a.fk_contact,';
+$sql.= ' a.fk_element, a.elementtype,';
 $sql.= ' ca.code as type_code, ca.libelle as type_label, ca.color as type_color';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
@@ -570,6 +572,8 @@ if ($resql)
         $event->fulldayevent=$obj->fulldayevent;
         $event->location=$obj->location;
         $event->transparency=$obj->transparency;
+        $event->fk_element=$obj->fk_element;
+        $event->elementtype=$obj->elementtype;
 
         $event->societe->id=$obj->fk_soc;
         $event->contact->id=$obj->fk_contact;
@@ -1478,6 +1482,12 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                             if ($linerelatedto) $linerelatedto.=' / ';
                             if (! empty($contact->id)) $linerelatedto.=$contact->getNomUrl(1,'',0);
                         }
+                        if (! empty($event->fk_element) && $event->fk_element > 0 && ! empty($event->elementtype) && ! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))
+                        {
+                            include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+                            if ($linerelatedto) $linerelatedto.=' / ';
+                            $linerelatedto.=dolGetElementUrl($event->fk_element,$event->elementtype,1);
+                        }
                         if ($linerelatedto) print '<br>'.$linerelatedto;
                     }
 
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 3e6224e0c41..4de2fce68dd 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2017      Open-DSI             <support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -183,6 +184,7 @@ $sql.= " s.nom as societe, s.rowid as socid, s.client,";
 $sql.= " a.id, a.label, a.datep as dp, a.datep2 as dp2,";
 $sql.= ' a.fk_user_author,a.fk_user_action,';
 $sql.= " a.fk_contact, a.note, a.percent as percent,";
+$sql.= " a.fk_element, a.elementtype,";
 $sql.= " c.code as type_code, c.libelle as type_label,";
 $sql.= " sp.lastname, sp.firstname";
 $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."actioncomm as a";
@@ -355,6 +357,7 @@ if ($resql)
 	print '</td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
+    if (! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT)) print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
     print '<td class="liste_titre center">';
     print $formactions->form_select_status_action('formaction',$status,1,'status',1,2);
@@ -375,7 +378,8 @@ if ($resql)
 	print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"a.fk_contact",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("ActionsOwnedByShort"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
+    if (! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT)) print_liste_field_titre($langs->trans("LinkedObject"),$_SERVER["PHP_SELF"],"a.fk_element",$param,"","",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("ActionsOwnedByShort"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre("");
 	print "</tr>\n";
@@ -482,6 +486,18 @@ if ($resql)
 		}
 		print '</td>';
 
+        // Linked object
+        if (! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT)) {
+            print '<td>';
+            if ($obj->fk_element > 0 && ! empty($obj->elementtype)) {
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+                print dolGetElementUrl($obj->fk_element,$obj->elementtype,1);
+            } else {
+                print "&nbsp;";
+            }
+            print '</td>';
+        }
+
 		// User to do
 		print '<td align="left">';
 		if ($obj->fk_user_action > 0)
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1c9ac65e4b8..19e296bd951 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1512,6 +1512,7 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
+AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index bd3d6405843..65ab2f84184 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1479,6 +1479,7 @@ AGENDA_DEFAULT_FILTER_STATUS=Régler automatiquement le statut d'événement dan
 AGENDA_DEFAULT_VIEW=Quel onglet voulez-vous voir ouvrir par défaut quand on choisit le menu Agenda
 AGENDA_NOTIFICATION=Activer les notifications d'événements dans le navigateur utilisateur quand la date de l'événement est atteinte (Chaque utilisateur peut refuser ceci au moment de la question de confirmation posée par le navigateur).
 AGENDA_NOTIFICATION_SOUND=Activer les notifications sonores.
+AGENDA_SHOW_LINKED_OBJECT=Afficher l'objet lié dans la vue agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuration du module Click To Dial
 ClickToDialUrlDesc=URL appelée lors d'un clic sur le pictogramme téléphone. Dans l'URL, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacée par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacée par le téléphone de l'appelant (le votre, défini sur votre fiche utilisateur)<br><b>__LOGIN__</b> qui sera remplacée par votre identifiant clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacée par votre mot de passe clicktodial (défini sur votre fiche utilisateur).

From f3838ee8f21f7f827a3f4519485b9326ab4aa11c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 May 2017 18:52:01 +0200
Subject: [PATCH 0846/1163] Fix limit into message

---
 htdocs/core/boxes/box_produits_alerte_stock.php | 2 +-
 htdocs/langs/en_US/stocks.lang                  | 2 +-
 htdocs/product/list.php                         | 4 ++--
 htdocs/product/stock/product.php                | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 0097d3d48e0..55e70f62f96 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -159,7 +159,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array('td' => 'align="center"',
                     'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte,
-					'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit")));
+					'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)));
 
 					$this->info_box_contents[$line][] = array('td' => 'align="right" width="18"',
                     'text' => $productstatic->LibStatut($objp->tosell,3,0));
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 9c9f82f6efb..0d2f10a2165 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -42,7 +42,7 @@ LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
-StockLowerThanLimit=Stock lower than alert limit
+StockLowerThanLimit=Stock lower than alert limit (%s)
 EnhancedValue=Value
 PMPValue=Weighted average price
 PMPValueShort=WAP
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index b779d4b7bfa..d9e603c6706 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -803,7 +803,7 @@ else
    					print '<td align="right">';
     				if ($obj->fk_product_type != 1)
     				{
-   						if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockTooLow")).' ';
+   						if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
       					print $product_static->stock_reel;
     				}
     				print '</td>';
@@ -814,7 +814,7 @@ else
    					print '<td align="right">';
     				if ($obj->fk_product_type != 1)
     				{
-   						if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockTooLow")).' ';
+   						if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
       					print $product_static->stock_theorique;
     				}
     				print '</td>';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 385c4d51ccd..e894368beaf 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -638,7 +638,7 @@ if ($id > 0 || $ref)
         print $form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1);
         print '</td>';
 		print '<td>'.price2num($object->stock_reel, 'MS');
-		if ($object->seuil_stock_alerte != '' && ($object->stock_reel < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit"));
+		if ($object->seuil_stock_alerte != '' && ($object->stock_reel < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit", $object->seuil_stock_alerte));
 		print '</td>';
 		print '</tr>';
 
@@ -689,7 +689,7 @@ if ($id > 0 || $ref)
         print "<td>";
         //print (empty($stocktheo)?0:$stocktheo);
         print $form->textwithpicto((empty($stocktheo)?0:$stocktheo), $helpondiff);
-        if ($object->seuil_stock_alerte != '' && ($object->stock_theorique < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit"));
+        if ($object->seuil_stock_alerte != '' && ($object->stock_theorique < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit", $object->seuil_stock_alerte));
         print '</td>';
         print '</tr>';
 

From 58f789659d7e8b9a7854115eeeea852e7e1654f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 02:53:49 +0200
Subject: [PATCH 0847/1163] Remove one picto loading

---
 htdocs/core/lib/functions.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 141811e382b..dd856c151b6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3062,8 +3062,8 @@ function info_admin($text, $infoonimgalt = 0, $nodiv=0, $admin='1')
 	{
 		return img_picto($text, 'info', 'class="hideonsmartphone"');
 	}
-
-	return ($nodiv?'':'<div class="'.(empty($admin)?'':($admin=='1'?'info':$admin)).' hideonsmartphone">').img_picto($admin?$langs->trans('InfoAdmin'):$langs->trans('Note'), ($nodiv?'info':'info_black'), 'class="hideonsmartphone"').' '.$text.($nodiv?'':'</div>');
+	
+	return ($nodiv?'':'<div class="'.(empty($admin)?'':($admin=='1'?'info':$admin)).' hideonsmartphone">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin?$langs->trans('InfoAdmin'):$langs->trans('Note')).'"></span> '.$text.($nodiv?'':'</div>');
 }
 
 

From ff5d682d49b6c64b346a116922a2a245b1f8af03 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 03:12:29 +0200
Subject: [PATCH 0848/1163] Fix css

---
 htdocs/commande/card.php | 8 ++++----
 htdocs/contrat/card.php  | 9 ++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 8459a4a5e9e..07f25b40ed8 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1646,8 +1646,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 	// Note public
 	print '<tr>';
-	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
-	print '<td valign="top" colspan="2">';
+	print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
+	print '<td colspan="2">';
 
 	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
@@ -1657,8 +1657,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 	// Note private
 	if (empty($user->societe_id)) {
 		print '<tr>';
-		print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
-		print '<td valign="top" colspan="2">';
+		print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
+		print '<td colspan="2">';
 
 		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 		print $doleditor->Create(1);
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 4accbed5636..0e0f8c84090 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1056,12 +1056,7 @@ if ($result > 0)
 	$modCodeContract = new $module();
 }
 
-
-/*********************************************************************
- *
- * Mode creation
- *
- *********************************************************************/
+// Create
 if ($action == 'create')
 {
 	print load_fiche_titre($langs->trans('AddContract'),'','title_commercial.png');
@@ -1158,7 +1153,7 @@ if ($action == 'create')
 	else
 	{
 		print '<td>';
-		print $form->select_company('','socid','','SelectThirdParty',1);
+		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
 		print '</td>';
 	}
 	print '</tr>'."\n";

From 2bf1f848d660ec8b403820b67c1dd83ae0e1ad7a Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Thu, 18 May 2017 10:18:45 +0200
Subject: [PATCH 0849/1163] Provide payment SOAP webservices

* Backport from https://github.com/nikkow/dolibarr-payment-webservice
---
 htdocs/webservices/server_payment.php | 218 ++++++++++++++++++++++++++
 1 file changed, 218 insertions(+)
 create mode 100644 htdocs/webservices/server_payment.php

diff --git a/htdocs/webservices/server_payment.php b/htdocs/webservices/server_payment.php
new file mode 100644
index 00000000000..e8e4f5e1cb0
--- /dev/null
+++ b/htdocs/webservices/server_payment.php
@@ -0,0 +1,218 @@
+<?php
+/* Copyright (C) 2006-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * The payment webservice was initially created by Nicolas Nunge <me@nikkow.eu>
+ */
+
+/**
+ *       \file       htdocs/webservices/server_payment.php
+ *       \brief      File that is entry point to call Dolibarr WebServices
+ */
+
+// This is to make Dolibarr working with Plesk
+set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
+
+require_once '../master.inc.php';
+require_once NUSOAP_PATH.'/nusoap.php';                // Include SOAP
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+
+
+dol_syslog("Call Dolibarr webservices interfaces");
+
+$langs->load("main");
+
+// Enable and test if module web services is enabled
+if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
+{
+       $langs->load("admin");
+       dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+       print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+       print $langs->trans("ToActivateModule");
+       exit;
+}
+
+// Create the soap Object
+$server                              = new nusoap_server();
+$server->soap_defencoding            = 'UTF-8';
+$server->decode_utf8                 = false;
+$ns                                  = 'http://www.dolibarr.org/ns/';
+$server->configureWSDL('WebServicesDolibarrPayment',$ns);
+$server->wsdl->schemaTargetNamespace = $ns;
+
+
+// Define WSDL Authentication object
+$server->wsdl->addComplexType(
+    'authentication',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'dolibarrkey'       => array('name'=>'dolibarrkey','type'=>'xsd:string'),
+       'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
+       'login'             => array('name'=>'login','type'=>'xsd:string'),
+        'password'          => array('name'=>'password','type'=>'xsd:string'),
+        'entity'            => array('name'=>'entity','type'=>'xsd:string')
+    )
+);
+// Define WSDL Return object
+$server->wsdl->addComplexType(
+    'result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'result_code'  => array('name'=>'result_code','type'=>'xsd:string'),
+        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+    )
+);
+
+// Define WSDL for Payment object
+$server->wsdl->addComplexType(
+    'payment',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'amount'          => array('name'=>'amount','type'=>'xsd:double'),
+        'num_paiement'    => array('name'=>'num_paiement','type'=>'xsd:string'),
+        'thirdparty_id'   => array('name'=>'thirdparty_id','type'=>'xsd:int'),
+               'bank_account'    => array('name'=>'bank_account','type'=>'xsd:int'),
+               'payment_mode_id' => array('name'=>'payment_mode_id','type'=>'xsd:int'),
+               'invoice_id'      => array('name'=>'invoice_id','type'=>'xsd:int'),
+               'int_label'       => array('name'=>'int_label','type'=>'xsd:string'),
+               'emitter'         => array('name'=>'emitter','type'=>'xsd:string'),
+               'bank_source'     => array('name'=>'bank_source','type'=>'xsd:string'),
+    )
+);
+
+// 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
+// Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
+// http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
+$styledoc = 'rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
+$styleuse = 'encoded';   // encoded/literal/literal wrapped
+// Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
+
+// Register WSDL
+$server->register(
+    'createPayment',
+    // Entry values
+    array('authentication'=>'tns:authentication','payment'=>'tns:payment'),
+    // Exit values
+    array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+    $ns,
+    $ns.'#createPayment',
+    $styledoc,
+    $styleuse,
+    'WS to create a new payment'
+);
+
+/**
+ * Create a payment
+ *
+ * @param      array           $authentication         Array of authentication information
+ * @param      Facture         $invoice                        Invoice
+ * @return     array                                                   Array result
+ */
+function createPayment($authentication, $payment)
+{
+    global $db,$conf,$langs;
+
+    $now = dol_now();
+
+    dol_syslog("Function: createPayment login=".$authentication['login']." id=".$payment->id.
+               ", ref=".$payment->ref.", ref_ext=".$payment->ref_ext);
+
+    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+    // Init and check authentication
+    $objectresp = array();
+    $errorcode  = '';
+       $errorlabel = '';
+    $error      = 0;
+    $fuser      = check_authentication($authentication,$error,$errorcode,$errorlabel);
+
+    // Check parameters
+    if (empty($payment['amount']) && empty($payment['thirdparty_id'])) {
+       $error++;
+               $errorcode  ='KO';
+               $errorlabel ="You must specify the amount and the third party's ID.";
+    }
+
+    if (! $error)
+    {
+               $soc = new Societe($db);
+        $res = $soc->fetch($payment['thirdparty_id']);
+
+               $new_payment               = new Paiement($db);
+               $new_payment->amount       = doubleval($payment['amount']);
+               $new_payment->num_paiement = $payment['num_paiement'];
+               $new_payment->bank_account = intval($payment['bank_account']);
+               $new_payment->paiementid   = !empty($payment['payment_mode_id']) ? intval($payment['payment_mode_id']) : $soc->mode_reglement_id;
+               $new_payment->datepaye     = $now;
+               $new_payment->author       = $payment['thirdparty_id'];
+               $new_payment->amounts      = array();
+
+               if(intval($payment['invoice_id']) > 0) {
+                       $new_payment->amounts[ $payment['invoice_id'] ] = $new_payment->amount;
+               }
+
+        $db->begin();
+               $result = $new_payment->create($fuser, true);
+
+               if($payment['bank_account']) {
+                       $new_payment->addPaymentToBank($fuser, 'payment', $payment['int_label'], $payment['bank_account'], $payment['emitter'], $payment['bank_source']);
+               }
+
+        if ($result < 0)
+        {
+            $error++;
+        }
+
+        if (! $error)
+        {
+            $db->commit();
+            $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$new_payment->id);
+        }
+        else
+        {
+            $db->rollback();
+            $error++;
+            $errorcode='KO';
+            $errorlabel=$new_payment->error;
+            dol_syslog("Function: createInvoice error while creating".$errorlabel);
+        }
+    }
+
+    if ($error)
+    {
+        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+    }
+
+    return $objectresp;
+}
+
+// Return the results.
+$server->service(file_get_contents("php://input"));

From 368fb314fe70e4e970a8ceff1d115c0415fa62ee Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Thu, 18 May 2017 10:22:01 +0200
Subject: [PATCH 0850/1163] FIX : missing object on createInvoiceFromOrder

* To create an invoice from order, we must have an order first
Load class as requirment
---
 htdocs/webservices/server_invoice.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 54f5e3c564c..9318328a060 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
 
 dol_syslog("Call Dolibarr webservices interfaces");

From 94ca52886049357a30c9b3a23f69d6d0e8c87679 Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Thu, 18 May 2017 10:26:51 +0200
Subject: [PATCH 0851/1163] FIX : CreateInvoiceFromOrder prototype

* SOAP declaration must follow function argument list
---
 htdocs/webservices/server_invoice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 9318328a060..a085d38e74d 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -254,7 +254,7 @@ $server->register(
 $server->register(
 		'createInvoiceFromOrder',
 		// Entry values
-		array('authentication'=>'tns:authentication','invoice'=>'tns:invoice'),
+		array('authentication'=>'tns:authentication','id_order'=>'xsd:string','ref_order'=>'xsd:string','ref_ext_order'=>'xsd:string','id_invoice'=>'xsd:string','ref_invoice'=>'xsd:string','ref_ext_invoice'=>'xsd:string'),
 		// Exit values
 		array('result'=>'tns:result','invoice'=>'tns:invoice'),
 		$ns,

From 545e41b85872c839fa7a0ef14e417a2576b1a118 Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Thu, 18 May 2017 10:28:48 +0200
Subject: [PATCH 0852/1163] Fix : CreateInvoiceFromOrder result

* We should be return same informations as other CreateInvoice function
* Also invoice data can't be converted correctly by NuSoap, we can have some PHP error with invoice object
---
 htdocs/webservices/server_invoice.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index a085d38e74d..99202cd72e4 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -256,7 +256,7 @@ $server->register(
 		// Entry values
 		array('authentication'=>'tns:authentication','id_order'=>'xsd:string','ref_order'=>'xsd:string','ref_ext_order'=>'xsd:string','id_invoice'=>'xsd:string','ref_invoice'=>'xsd:string','ref_ext_invoice'=>'xsd:string'),
 		// Exit values
-		array('result'=>'tns:result','invoice'=>'tns:invoice'),
+		array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
 		$ns,
 		$ns.'#createInvoiceFromOrder',
 		$styledoc,
@@ -735,8 +735,7 @@ function createInvoiceFromOrder($authentication,$id_order='', $ref_order='', $re
 	}
 	else
 	{
-		$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''),'invoice'=>$newobject);
-		
+		$objectresp= array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref,'ref_ext'=>$newobject->ref_ext);
 	}
 	
 	return $objectresp;

From 682f6f838e713c89108e5965a41a3974a96f3d5c Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Thu, 18 May 2017 10:36:37 +0200
Subject: [PATCH 0853/1163] Change argument list CreateInvoiceFromOrder

* invoice data are not mandatory
Only order information are required
---
 htdocs/webservices/server_invoice.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 99202cd72e4..8f14be1a8b9 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -254,7 +254,7 @@ $server->register(
 $server->register(
 		'createInvoiceFromOrder',
 		// Entry values
-		array('authentication'=>'tns:authentication','id_order'=>'xsd:string','ref_order'=>'xsd:string','ref_ext_order'=>'xsd:string','id_invoice'=>'xsd:string','ref_invoice'=>'xsd:string','ref_ext_invoice'=>'xsd:string'),
+		array('authentication'=>'tns:authentication','id_order'=>'xsd:string','ref_order'=>'xsd:string','ref_ext_order'=>'xsd:string'),
 		// Exit values
 		array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
 		$ns,
@@ -653,13 +653,9 @@ function createInvoice($authentication,$invoice)
  * @param	string      $id_order			id of order to copy invoice from
  * @param	string      $ref_order			ref of order to copy invoice from
  * @param	string      $ref_ext_order		ref_ext of order to copy invoice from
- * @param	string      $id_invoice			invoice id
- * @param	string      $ref_invoice		invoice ref
- * @param	string      $ref_ext_invoice	invoice ref_ext
  * @return	array							Array result
  */
-function createInvoiceFromOrder($authentication,$id_order='', $ref_order='', $ref_ext_order='', 
-		$id_invoice='', $ref_invoice='', $ref_ext_invoice='')
+function createInvoiceFromOrder($authentication,$id_order='', $ref_order='', $ref_ext_order='')
 {
 	global $db,$conf;
 
@@ -680,8 +676,6 @@ function createInvoiceFromOrder($authentication,$id_order='', $ref_order='', $re
 	// Check parameters
 	if (empty($id_order) && empty($ref_order) && empty($ref_ext_order))	{
 		$error++; $errorcode='KO'; $errorlabel="order id or ref or ref_ext is mandatory.";
-	} else if (empty($id_invoice) && empty($ref_invoice) && empty($ref_ext_invoice))	{
-		$error++; $errorcode='KO'; $errorlabel="invoice id or ref or ref_ext is mandatory.";
 	}
 	
 	//////////////////////

From fbb3406c5d1bde83d5bebcb85612c33ba21ec242 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 10:46:55 +0200
Subject: [PATCH 0854/1163] Fix missing filters

---
 htdocs/societe/list.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 7693da9d818..421e9bc3095 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -493,6 +493,9 @@ if ($search_sale > 0)	$param.='&amp;search_sale='.urlencode($search_sale);
 if ($search_nom != '') $param.= "&amp;search_nom=".urlencode($search_nom);
 if ($search_town != '') $param.= "&amp;search_town=".urlencode($search_town);
 if ($search_zip != '') $param.= "&amp;search_zip=".urlencode($search_zip);
+if ($search_phone != '') $param.= "&amp;search_phone=".urlencode($search_phone);
+if ($search_email != '') $param.= "&amp;search_email=".urlencode($search_email);
+if ($search_url != '') $param.= "&amp;search_url=".urlencode($search_url);
 if ($search_state != '') $param.= "&amp;search_state=".urlencode($search_state);
 if ($search_country != '') $param.= "&amp;search_country=".urlencode($search_country);
 if ($search_customer_code != '') $param.= "&amp;search_customer_code=".urlencode($search_customer_code);

From ec25869ec614c13fe693adf6b93b420822f98d8b Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Thu, 18 May 2017 10:37:36 +0200
Subject: [PATCH 0855/1163] FIX : UpdateInvoice create object

* To update data, function must work on invoice object
---
 htdocs/webservices/server_invoice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 8f14be1a8b9..2150017577b 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -789,7 +789,7 @@ function updateInvoice($authentication,$invoice)
 					{
 						// Define output language
 						$outputlangs = $langs;
-						$order->generateDocument($invoice->modelpdf, $outputlangs);		
+						$object->generateDocument($object->modelpdf, $outputlangs);
 					}
 				}
 				if ($invoice['status'] == Facture::STATUS_CLOSED)

From 240371b59d5d41bd484d7a1cfe13bbf8216e4aab Mon Sep 17 00:00:00 2001
From: "cam.lafit" <cam.lafit@azerttyu.net>
Date: Thu, 18 May 2017 10:40:10 +0200
Subject: [PATCH 0856/1163] UPDATE : add warehouse information on order
 creation

* If stock management is enabled we must done information about warehouse source
If any warehouse is provided, client must send 0.
---
 htdocs/webservices/server_order.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index f477ccfed9c..b0f794dd55f 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -325,7 +325,7 @@ $server->register(
 
 $server->register(
 		'validOrder',
-		array('authentication'=>'tns:authentication','id'=>'xsd:string'),	// Entry values
+		array('authentication'=>'tns:authentication','id'=>'xsd:string','id_warehouse'=>'xsd:string'),  // Entry values
 		array('result'=>'tns:result'),	// Exit values
 		$ns,
 		$ns.'#validOrder',
@@ -795,7 +795,7 @@ function createOrder($authentication,$order)
  * @param	int			$id					Id of order to validate
  * @return	array							Array result
  */
-function validOrder($authentication,$id='')
+function validOrder($authentication,$id='',$id_warehouse=0)
 {
 	global $db,$conf,$langs;
 
@@ -821,7 +821,8 @@ function validOrder($authentication,$id='')
 			$db->begin();
 			if ($result > 0)
 			{
-				$result=$order->valid($fuser);
+
+				$result=$order->valid($fuser,$id_warehouse);
 
 				if ($result	>= 0)
 				{

From 1a1b27d68cfa78d63df7316e76dc1d5808bc185e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 11:13:18 +0200
Subject: [PATCH 0857/1163] Fix input of duration

---
 htdocs/core/class/html.form.class.php | 4 ++--
 htdocs/projet/tasks/task.php          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index afa2006864f..26001e8e1f1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4962,7 +4962,7 @@ class Form
         }
         elseif ($typehour=='text' || $typehour=='textselect')
         {
-        	$retstring.='<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat maxwidth50" value="'.($hourSelected?((int) $hourSelected):'').'">';
+        	$retstring.='<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat maxwidth50" value="'.(($hourSelected != '')?((int) $hourSelected):'').'">';
         }
         else return 'BadValueForParameterTypeHour';
 
@@ -4986,7 +4986,7 @@ class Form
         }
         elseif ($typehour=='text' )
         {
-        	$retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat maxwidth50" value="'.($minSelected?((int) $minSelected):'').'">';
+        	$retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat maxwidth50" value="'.(($minSelected != '')?((int) $minSelected):'').'">';
         }
         
         if ($typehour!='text') $retstring.=' '.$langs->trans('MinuteShort');
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 243881821e0..f0a55517881 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -43,7 +43,7 @@ $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
 $withproject=GETPOST('withproject','int');
 $project_ref=GETPOST('project_ref','alpha');
-$planned_workload=((GETPOST('planned_workloadhour')!='' && GETPOST('planned_workloadmin')!='')?GETPOST('planned_workloadhour')*3600+GETPOST('planned_workloadmin')*60:'');
+$planned_workload=((GETPOST('planned_workloadhour','int')!='' || GETPOST('planned_workloadmin','int')!='') ? (GETPOST('planned_workloadhour','int')>0?GETPOST('planned_workloadhour','int')*3600:0) + (GETPOST('planned_workloadmin','int')>0?GETPOST('planned_workloadmin','int')*60:0) : '');
 
 // Security check
 $socid=0;

From 0b52c43e05de3e366198779c775f920b36335763 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 11:35:12 +0200
Subject: [PATCH 0858/1163] Fix bad selection of progress when not known

---
 htdocs/core/class/html.formother.class.php | 6 ++++--
 htdocs/projet/class/task.class.php         | 6 +++---
 htdocs/projet/tasks.php                    | 4 ++--
 htdocs/projet/tasks/task.php               | 6 +++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 66e624e96b9..2ee6b18a44f 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -274,15 +274,17 @@ class FormOther
      *    @param    int		$increment     	increment value
      *    @param    int		$start         	start value
      *    @param    int		$end           	end value
+     *    @param    int     $showempty      Add also an empty line
      *    @return   string					HTML select string
      */
-    function select_percent($selected=0,$htmlname='percent',$disabled=0,$increment=5,$start=0,$end=100)
+    function select_percent($selected=0,$htmlname='percent',$disabled=0,$increment=5,$start=0,$end=100,$showempty=0)
     {
         $return = '<select class="flat" name="'.$htmlname.'" '.($disabled?'disabled':'').'>';
+        if ($showempty) $return.='<option value="-1"'.(($selected == -1 || $selected == '')?' selected':'').'>&nbsp;</option>';
 
         for ($i = $start ; $i <= $end ; $i += $increment)
         {
-            if ($selected == $i)
+            if ($selected != '' && (int) $selected == $i)
             {
                 $return.= '<option value="'.$i.'" selected>';
             }
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 9a1819fc46c..dad46c96989 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -100,7 +100,7 @@ class Task extends CommonObject
         // Clean parameters
         $this->label = trim($this->label);
         $this->description = trim($this->description);
-
+        
         // Check parameters
         // Put here code to add control on parameters values
 
@@ -128,7 +128,7 @@ class Task extends CommonObject
         $sql.= ", ".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null');
         $sql.= ", ".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null');
         $sql.= ", ".($this->planned_workload!=''?$this->planned_workload:0);
-        $sql.= ", ".($this->progress!=''?$this->progress:0);
+        $sql.= ", ".(($this->progress!='' && $this->progress >= 0)?$this->progress:'null');
         $sql.= ")";
 
         $this->db->begin();
@@ -300,7 +300,7 @@ class Task extends CommonObject
         $sql.= " planned_workload=".((isset($this->planned_workload) && $this->planned_workload != '')?$this->planned_workload:"null").",";
         $sql.= " dateo=".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null').",";
         $sql.= " datee=".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null').",";
-        $sql.= " progress=".$this->progress.",";
+        $sql.= " progress=".(($this->progress!='' && $this->progress >= 0)?$this->progress:'null').",";
         $sql.= " rang=".((!empty($this->rang))?$this->rang:"0");
         $sql.= " WHERE rowid=".$this->id;
 
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 35a7812d4fa..06bd2c9c730 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -391,14 +391,14 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print $form->select_date(($date_end?$date_end:-1),'datee',1,1,0,'',1,1,1);
 	print '</td></tr>';
 
-	// planned workload
+	// Planned workload
 	print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
 	print $form->select_duration('planned_workload', $planned_workload?$planned_workload : $object->planned_workload,0,'text');
 	print '</td></tr>';
 
 	// Progress
 	print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
-	print $formother->select_percent($progress,'progress');
+	print $formother->select_percent($progress,'progress',0,5,0,100,1);
 	print '</td></tr>';
 
 	// Description
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index f0a55517881..603a69a07b0 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -391,12 +391,12 @@ if ($id > 0 || ! empty($ref))
 
 			// Planned workload
 			print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
-			print $form->select_duration('planned_workload',$object->planned_workload,0,'text');
+			print $form->select_duration('planned_workload', $object->planned_workload, 0, 'text');
 			print '</td></tr>';
 
 			// Progress declared
-			print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
-			print $formother->select_percent($object->progress,'progress');
+			print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td>';
+			print $formother->select_percent($object->progress,'progress',0,5,0,100,1);
 			print '</td></tr>';
 
 			// Description

From a36a9fab2fbaa9e91c884d82fdba7ca85b486f1c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 12:12:36 +0200
Subject: [PATCH 0859/1163] Look and feel v6

---
 htdocs/core/lib/project.lib.php    |  2 +-
 htdocs/projet/card.php             |  2 +-
 htdocs/projet/class/task.class.php |  2 +-
 htdocs/projet/element.php          |  3 +-
 htdocs/projet/tasks.php            | 11 +++--
 htdocs/projet/tasks/contact.php    | 34 ++++++---------
 htdocs/projet/tasks/document.php   | 48 +++++++--------------
 htdocs/projet/tasks/note.php       | 47 +++++++--------------
 htdocs/projet/tasks/task.php       | 48 +++++++--------------
 htdocs/projet/tasks/time.php       | 67 ++++++++++++++++--------------
 10 files changed, 104 insertions(+), 160 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 96bcbaa00c4..38f78dd8333 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -479,7 +479,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				if ($lines[$i]->planned_workload || $lines[$i]->duration)
 				{
 					if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
-					else print $langs->trans('WorkloadNotDefined');
+					else print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
 				}
 				print '</td>';
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 1ee81f7b917..47d0f1c3148 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -711,7 +711,7 @@ elseif ($object->id > 0)
     print '<input type="hidden" name="comefromclone" value="'.$comefromclone.'">';
 
     $head=project_prepare_head($object);
-    dol_fiche_head($head, 'project', $langs->trans("Project"),0,($object->public?'projectpub':'project'));
+    dol_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
     if ($action == 'edit' && $userWrite > 0)
     {
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index dad46c96989..e1025241115 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -127,7 +127,7 @@ class Task extends CommonObject
         $sql.= ", ".$user->id;
         $sql.= ", ".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null');
         $sql.= ", ".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null');
-        $sql.= ", ".($this->planned_workload!=''?$this->planned_workload:0);
+        $sql.= ", ".(($this->planned_workload!='' && $this->planned_workload >= 0)?$this->planned_workload:'null');
         $sql.= ", ".(($this->progress!='' && $this->progress >= 0)?$this->progress:'null');
         $sql.= ")";
 
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 02bf6c5a9ba..8aebe756d70 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -123,7 +123,7 @@ $userstatic=new User($db);
 $userAccess = $object->restrictedProjectArea($user);
 
 $head=project_prepare_head($object);
-dol_fiche_head($head, 'element', $langs->trans("Project"),0,($object->public?'projectpub':'project'));
+dol_fiche_head($head, 'element', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
 
 // Project card
@@ -231,6 +231,7 @@ print '<div class="clearboth"></div>';
 
 dol_fiche_end();
 
+print '<br>';
 
 /*
  * Referers types
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 06bd2c9c730..fdeebd0ca69 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -92,9 +92,12 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 {
 	$error=0;
 
-	$date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear'],'user');
-	$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user');
-
+    // If we use user timezone, we must change also view/list to use user timezone everywhere
+    //$date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear'],'user');
+	//$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user');
+	$date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']);
+	$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']);
+	
 	if (! $cancel)
 	{
 		if (empty($taskref))
@@ -215,7 +218,7 @@ if ($id > 0 || ! empty($ref))
 	$tab=GETPOST('tab')?GETPOST('tab'):'tasks';
 
 	$head=project_prepare_head($object);
-	dol_fiche_head($head, $tab, $langs->trans("Project"), 0, ($object->public?'projectpub':'project'));
+	dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
 	$param='';
     if ($search_user_id > 0) $param.='&search_user_id='.dol_escape_htmltag($search_user_id);
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index e2f94406558..9160f2b3795 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -293,33 +293,23 @@ if ($id > 0 || ! empty($ref))
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
 		
 		$morehtmlref='';
-		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param, 0, '', '', 1);
 		
-		if (empty($withproject)) 
+		// Project
+		if (empty($withproject))
 		{
-		    print '<div class="fichecenter">';
+		    $morehtmlref.='<div class="refidno">';
+		    $morehtmlref.=$langs->trans("Project").': ';
+		    $morehtmlref.=$projectstatic->getNomUrl(1);
+		    $morehtmlref.='<br>';
 		
-		    print '<div class="underbanner clearboth"></div>';
-		    print '<table class="border" width="100%">';
-
-		    // Project
-		    print '<tr><td class="titlefield">'.$langs->trans("Project").'</td><td>';
-    		print $projectstatic->getNomUrl(1);
-    		print '</td></tr>';
-
-    		// Customer
-    		print "<tr><td>".$langs->trans("ThirdParty")."</td>";
-    		print '<td colspan="3">';
-    		if ($projectstatic->thirdparty->id > 0) print $projectstatic->thirdparty->getNomUrl(1);
-    		else print '&nbsp;';
-    		print '</td></tr>';
-		
-    		print "</table>";
-		
-    		print '</div>';
+		    // Third party
+		    $morehtmlref.=$langs->trans("ThirdParty").': ';
+		    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
+		    $morehtmlref.='</div>';
 		}
-
 		
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param, 0, '', '', 1);
+
 		dol_fiche_end();
 
 		/*
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 684b7648ab8..241ba0162e5 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -239,6 +239,21 @@ if ($object->id > 0)
 	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
 	
 	$morehtmlref='';
+	
+	// Project
+	if (empty($withproject))
+	{
+	    $morehtmlref.='<div class="refidno">';
+	    $morehtmlref.=$langs->trans("Project").': ';
+	    $morehtmlref.=$projectstatic->getNomUrl(1);
+	    $morehtmlref.='<br>';
+	
+	    // Third party
+	    $morehtmlref.=$langs->trans("ThirdParty").': ';
+	    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
+	    $morehtmlref.='</div>';
+	}
+	
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
 	
 	print '<div class="fichecenter">';
@@ -246,39 +261,6 @@ if ($object->id > 0)
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 
-	// Ref
-	/*
-	print '<tr><td class="titlefield">';
-	print $langs->trans("Ref");
-	print '</td><td colspan="3">';
-	if (empty($withproject) || empty($projectstatic->id))
-	{
-		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
-		$object->next_prev_filter=" fk_projet in (".$projectsListId.")";
-	}
-	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
-	print '</td>';
-	print '</tr>';
-
-	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
-    */
-	
-	// Project
-	if (empty($withproject))
-	{
-		print '<tr><td class="titlefield">'.$langs->trans("Project").'</td><td colspan="3">';
-		print $projectstatic->getNomUrl(1);
-		print '</td></tr>';
-
-		// Third party
-		print '<td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
-		if ($projectstatic->thirdparty->id) print $projectstatic->thirdparty->getNomUrl(1);
-		else print '&nbsp;';
-		print '</td></tr>';
-	}
-
 	// Files infos
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index ebdd3d0c5a3..0d6df7d85fd 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -211,43 +211,26 @@ if ($object->id > 0)
 	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
 	
 	$morehtmlref='';
+	
+	// Project
+	if (empty($withproject))
+	{
+	    $morehtmlref.='<div class="refidno">';
+	    $morehtmlref.=$langs->trans("Project").': ';
+	    $morehtmlref.=$projectstatic->getNomUrl(1);
+	    $morehtmlref.='<br>';
+	
+	    // Third party
+	    $morehtmlref.=$langs->trans("ThirdParty").': ';
+	    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
+	    $morehtmlref.='</div>';
+	}
+	
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
 	
 	print '<div class="fichecenter">';
 	
     print '<div class="underbanner clearboth"></div>';
-	print '<table class="border" width="100%">';
-    /*
-	// Ref
-	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
-	if (empty($withproject) || empty($projectstatic->id))
-	{
-	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
-	    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
-	}
-	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
-	print '</td></tr>';
-
-	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
-    */
-	
-	// Project
-	if (empty($withproject))
-	{
-		print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
-		print $projectstatic->getNomUrl(1);
-		print '</td></tr>';
-
-		// Third party
-		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-		if ($projectstatic->thirdparty->id > 0) print $projectstatic->thirdparty->getNomUrl(1);
-		else print'&nbsp;';
-		print '</td></tr>';
-	}
-
-	print "</table>";
 
 	$cssclass='titlefield';
     $moreparam=$param;
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 603a69a07b0..5f493167fd8 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -447,6 +447,21 @@ if ($id > 0 || ! empty($ref))
 			else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
 			
 			$morehtmlref='';
+			
+			// Project
+			if (empty($withproject))
+			{
+			    $morehtmlref.='<div class="refidno">';
+			    $morehtmlref.=$langs->trans("Project").': ';
+			    $morehtmlref.=$projectstatic->getNomUrl(1);
+			    $morehtmlref.='<br>';
+			
+			    // Third party
+			    $morehtmlref.=$langs->trans("ThirdParty").': ';
+			    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
+			    $morehtmlref.='</div>';
+			}
+			
 			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
 			
 			print '<div class="fichecenter">';
@@ -454,39 +469,6 @@ if ($id > 0 || ! empty($ref))
 			print '<div class="underbanner clearboth"></div>';			
 			print '<table class="border" width="100%">';
 
-			/*
-			// Ref
-			print '<tr><td class="titlefield">';
-			print $langs->trans("Ref");
-			print '</td><td colspan="3">';
-			if (! GETPOST('withproject') || empty($projectstatic->id))
-			{
-				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
-				$object->next_prev_filter=" fk_projet in (".$projectsListId.")";
-			}
-			else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-			print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
-			print '</td>';
-			print '</tr>';
-
-			// Label
-			print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
-            */
-			
-			// Project
-			if (empty($withproject))
-			{
-				print '<tr><td class="titlefield">'.$langs->trans("Project").'</td><td colspan="3">';
-				print $projectstatic->getNomUrl(1);
-				print '</td></tr>';
-
-				// Third party
-				print '<td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
-				if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
-				else print '&nbsp;';
-				print '</td></tr>';
-			}
-
 			// Date start - Date end
 			print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td colspan="3">';
 			$start = dol_print_date($object->date_start,'dayhour');
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index eed7bae2734..0cbe660dd9e 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
  *
@@ -442,27 +442,31 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
 		
 		$morehtmlref='';
+		
+		// Project
+		if (empty($withproject))
+		{
+		    $morehtmlref.='<div class="refidno">';
+		    $morehtmlref.=$langs->trans("Project").': ';
+		    $morehtmlref.=$projectstatic->getNomUrl(1);
+		    $morehtmlref.='<br>';
+		
+		    // Third party
+		    $morehtmlref.=$langs->trans("ThirdParty").': ';
+		    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
+		    $morehtmlref.='</div>';
+		}
+		
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
 		
 		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
 		
         print '<div class="underbanner clearboth"></div>';
 		print '<table class="border" width="100%">';
 
-		// Ref
-		/*
-		print '<tr><td class="titlefield">';
-		print $langs->trans("Ref");
-		print '</td><td colspan="3">';
-		print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
-		print '</td></tr>';
-
-		// Label
-		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
-        */
-		
 		// Date start - Date end
-		print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td colspan="3">';
+		print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
 		$start = dol_print_date($object->date_start,'dayhour');
 		print ($start?$start:'?');
 		$end = dol_print_date($object->date_end,'dayhour');
@@ -472,17 +476,25 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		print '</td></tr>';
 
 		// Planned workload
-		print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
 		print convertSecondToTime($object->planned_workload,'allhourmin');
 		print '</td></tr>';
 
+		print '</table>';
+		print '</div>';
+		
+		print '<div class="fichehalfright"><div class="ficheaddleft">';
+		
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border" width="100%">';
+		
 		// Progress declared
-		print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td>';
 		print $object->progress.' %';
 		print '</td></tr>';
 
 		// Progress calculated
-		print '<tr><td>'.$langs->trans("ProgressCalculated").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("ProgressCalculated").'</td><td>';
 		if ($object->planned_workload)
 		{
 			$tmparray=$object->getSummaryOfTimeSpent();
@@ -492,23 +504,14 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		else print '';
 		print '</td></tr>';
 
-		// Project
-		if (empty($withproject))
-		{
-			print '<tr><td>'.$langs->trans("Project").'</td><td>';
-			print $projectstatic->getNomUrl(1);
-			print '</td></tr>';
-
-			// Third party
-			print '<td>'.$langs->trans("ThirdParty").'</td><td>';
-			if ($projectstatic->thirdparty->id) print $projectstatic->thirdparty->getNomUrl(1);
-			else print '&nbsp;';
-			print '</td></tr>';
-		}
-
 		print '</table>';
-        print '</div>';
+
+		print '</div>';
+		print '</div>';
         
+		print '</div>';
+		print '<div class="clearboth"></div>';
+		    
 		dol_fiche_end();
 
 

From 4a46480ef54c0867de4de77da5bffe62066d5f46 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 12:40:20 +0200
Subject: [PATCH 0860/1163] Fix preview of PDF contract

---
 htdocs/admin/salaries.php                |  4 +-
 htdocs/core/lib/files.lib.php            |  6 +++
 htdocs/core/modules/modContrat.class.php | 54 ++++++++++++++++++++----
 htdocs/core/modules/modFacture.class.php | 18 ++++----
 4 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php
index 52470be4106..8f115d3963b 100644
--- a/htdocs/admin/salaries.php
+++ b/htdocs/admin/salaries.php
@@ -85,7 +85,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head();
+//dol_fiche_head(null, '', '', -1);
 
 /*
  *  Params
@@ -122,7 +122,7 @@ print '</tr>';
 
 print "</table>\n";
 
-dol_fiche_end();
+//dol_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 39865905553..4c3be3cc4d1 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1706,6 +1706,12 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	    if ($fuser->rights->ficheinter->lire) $accessallowed=1;
 	    $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
 	}
+	// Wrapping pour les apercu conat
+	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
+	{
+	    if ($fuser->rights->contrat->lire) $accessallowed=1;
+	    $original_file=$conf->contrat->dir_output.'/'.$original_file;
+	}
 	// Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index c4c8cd500fb..52127c4e6f4 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -70,12 +70,29 @@ class modContrat extends DolibarrModules
 
 		// Constants
 		$this->const = array();
-		$this->const[0][0] = "CONTRACT_ADDON";
-		$this->const[0][1] = "chaine";
-		$this->const[0][2] = "mod_contract_serpis";
-		$this->const[0][3] = 'Nom du gestionnaire de numerotation des contrats';
-		$this->const[0][4] = 0;
-
+		$r=0;
+		
+		$this->const[$r][0] = "CONTRACT_ADDON";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "mod_contract_serpis";
+		$this->const[$r][3] = 'Nom du gestionnaire de numerotation des contrats';
+		$this->const[$r][4] = 0;
+		$r++;
+		
+		$this->const[$r][0] = "CONTRACT_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "strato";
+		$this->const[$r][3] = 'Name of PDF model of contract';
+		$this->const[$r][4] = 0;
+		$r++;
+		
+		$this->const[$r][0] = "CONTRACT_ADDON_PDF_ODT_PATH";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/contracts";
+		$this->const[$r][3] = "";
+		$this->const[$r][4] = 0;
+		$r++;
+		
 		// Boxes
 		$this->boxes = array(
 			0=>array('file'=>'box_contracts.php','enabledbydefaulton'=>'Home'),
@@ -202,8 +219,29 @@ class modContrat extends DolibarrModules
 		// Nettoyage avant activation
 		$this->remove($options);
 
-		$sql = array();
-
+		//ODT template
+		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/contracts/template_contract.odt';
+		$dirodt=DOL_DATA_ROOT.'/doctemplates/contracts';
+		$dest=$dirodt.'/template_contract.odt';
+		
+		if (file_exists($src) && ! file_exists($dest))
+		{
+		    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		    dol_mkdir($dirodt);
+		    $result=dol_copy($src,$dest,0,0);
+		    if ($result < 0)
+		    {
+		        $langs->load("errors");
+		        $this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
+		        return 0;
+		    }
+		}
+		
+		$sql = array(
+		    "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'contract' AND entity = ".$conf->entity,
+		    "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','contract',".$conf->entity.")"
+		);
+		
 		return $this->_init($sql,$options);
 	}
 }
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 7029b7ffd78..b16c7749e40 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -79,13 +79,6 @@ class modFacture extends DolibarrModules
 		$this->const = array();
 		$r=0;
 
-		$this->const[$r][0] = "FACTURE_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "crabe";
-		$this->const[$r][3] = 'Name of PDF model of invoice';
-		$this->const[$r][4] = 0;
-		$r++;
-
 		$this->const[$r][0] = "FACTURE_ADDON";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "mod_facture_terre";
@@ -93,6 +86,13 @@ class modFacture extends DolibarrModules
 		$this->const[$r][4] = 0;
 		$r++;
 
+		$this->const[$r][0] = "FACTURE_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "crabe";
+		$this->const[$r][3] = 'Name of PDF model of invoice';
+		$this->const[$r][4] = 0;
+		$r++;
+
 		$this->const[$r][0] = "FACTURE_ADDON_PDF_ODT_PATH";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/invoices";
@@ -311,8 +311,8 @@ class modFacture extends DolibarrModules
 		}
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'invoice' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','invoice',".$conf->entity.")"
+				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'invoice' AND entity = ".$conf->entity,
+				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','invoice',".$conf->entity.")"
 		);
 
 		return $this->_init($sql,$options);

From eaa4b650f88aff2e6f48bfffb697825f32596375 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 13:01:48 +0200
Subject: [PATCH 0861/1163] Code comment

---
 htdocs/core/js/lib_head.js.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index e604f3281f9..478d66f2c2a 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -982,7 +982,7 @@ function newpopup(url,title) {
 function document_preview(file, type, title)
 {
 	var ValidImageTypes = ["image/gif", "image/jpeg", "image/png"];
-	console.log("document_preview A click was done. file="+file+", type="+type);
+	console.log("document_preview A click was done. file="+file+", type="+type+", title="+title);
 	
 	if ($.inArray(type, ValidImageTypes) < 0) {
 		var width='85%';
@@ -1018,8 +1018,8 @@ function document_preview(file, type, title)
 
 	}
 	function show_preview(){
-
-		var newElem = '<object data="'+file+'" type="'+type+'" width="'+object_width+'" height="'+object_height+'"></object>';
+		/* console.log("file="+file+" type="+type+" width="+width+" height="+height); */
+		var newElem = '<object name="objectpreview" data="'+file+'" type="'+type+'" width="'+object_width+'" height="'+object_height+'" param="noparam"></object>';
 
 		$("#dialogforpopup").html(newElem);
 		$("#dialogforpopup").dialog({

From dff7d00d2bd5c49bae6c33274b1d2d35c8456144 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 13:13:18 +0200
Subject: [PATCH 0862/1163] Look and feel v6

---
 htdocs/admin/contract.php                        | 11 ++++++-----
 htdocs/contrat/admin/contract_extrafields.php    |  3 +--
 htdocs/contrat/admin/contractdet_extrafields.php |  3 +--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index ddd8c6f1c00..37c0b9bccde 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -216,11 +216,9 @@ $form=new Form($db);
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
 
-print "<br>";
-
 $head=contract_admin_prepare_head();
 
-dol_fiche_head($head, 'contract', $langs->trans("Contracts"), 0, 'contract');
+dol_fiche_head($head, 'contract', $langs->trans("Contracts"), -1, 'contract');
 
 /*
  * Contracts Numbering model
@@ -510,7 +508,9 @@ $htmltext.='</i>';
 
 $var=! $var;
 print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+//print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'tooltiphelp');
+print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2);
+print '<br>';
 $variablename='CONTRACT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -527,7 +527,8 @@ print '</td></tr>'."\n";
 //Use draft Watermark
 
 print '<tr class="oddeven"><td>';
-print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext);
+//print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext, 1, 'help', '', 0, 2, 'tooltiphelp');
+print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext, 1, 'help', '', 0, 2);
 print '</td><td>';
 print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index a5a86efaad9..509c5307ef8 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -69,10 +69,9 @@ llxHeader();
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
 
-print '<br>';
 $head=contract_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Contracts"), 0, 'contract');
+dol_fiche_head($head, 'attributes', $langs->trans("Contracts"), -1, 'contract');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php
index 8014334c008..39c691e7ddc 100644
--- a/htdocs/contrat/admin/contractdet_extrafields.php
+++ b/htdocs/contrat/admin/contractdet_extrafields.php
@@ -69,10 +69,9 @@ llxHeader();
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
 
-print '<br>';
 $head=contract_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("Contracts"), 0, 'contract');
+dol_fiche_head($head, 'attributeslines', $langs->trans("Contracts"), -1, 'contract');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 

From 5a79d11389e16c1261bfe4243beb09f18af1c949 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 13:14:56 +0200
Subject: [PATCH 0863/1163] Avoid warning

---
 htdocs/core/lib/functions.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index dd856c151b6..c9ec77c76de 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -330,7 +330,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	    }
 	}	
 	
-	if (empty($check) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
+	if (empty($check) && ! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
 	   dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param not defined, when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);    
 	}

From 0b0dbd9649462722a7856e5a5b2ab25032a618d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 17:57:20 +0200
Subject: [PATCH 0864/1163] Code comment

---
 htdocs/install/mysql/tables/llx_actioncomm.sql | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index e022b46a859..46017d1e739 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -40,14 +40,14 @@ create table llx_actioncomm
   fk_soc			integer,
   fk_contact		integer,
   fk_parent			integer NOT NULL default 0,
-  fk_user_action	integer,						-- user id of owner of action (note that assigned users to event are store into another table)
+  fk_user_action	integer,						-- user id of owner of action (note that users assigned to event are stored into another table)
   fk_user_done		integer,						-- user id of user that has made action (deprecated)
 
-  transparency      integer,						-- transparency (ical standard). used to say if user assigned to event are busy or not by event. This field may be deprecated if we want to store transparency for each assigned user, so into table llx_actioncomm_resources.
+  transparency      integer,						-- transparency (ical standard). used to say if user assigned to event are busy or not by event. This field may be deprecated if we want to store transparency for each assigned user, moved into table llx_actioncomm_resources.
 
   priority			smallint,						-- priority (ical standard)
-  fulldayevent		smallint NOT NULL default 0, -- priority (ical standard)
-  punctual			smallint NOT NULL default 1, -- deprecated. milestone is event with date start (datep) = date end (datep2)
+  fulldayevent		smallint NOT NULL default 0,    -- priority (ical standard)
+  punctual			smallint NOT NULL default 1,    -- deprecated. milestone is event with date start (datep) = date end (datep2)
   percent			smallint NOT NULL default 0,
   location			varchar(128),
   durationp			real,							-- planed duration
@@ -64,9 +64,9 @@ create table llx_actioncomm
   email_tobcc		varchar(256),					-- when event was an email, we store here the email_tobcc
   errors_to			varchar(256),					-- when event was an email, we store here the erros_to
   
-  recurid           varchar(128),                  -- used to store event id to link all recurring event records each other  
+  recurid           varchar(128),                   -- used to store event id to link each other all the repeating event records  
   recurrule         varchar(128),					-- contains string with ical format recurring rule like "FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=19" or "FREQ=WEEKLY;BYDAY=MO"
-  recurdateend      datetime,
+  recurdateend      datetime,						-- no more recurring event after this date
      
   fk_element		integer DEFAULT NULL,			-- For link to an element (proposal, invoice, order, ...)
   elementtype		varchar(255) DEFAULT NULL		-- For link to an element (proposal, invoice, order, ...)

From ef575166c0195b74affa042e117dc30338ad542b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 19:10:05 +0200
Subject: [PATCH 0865/1163] FIX #6651

---
 htdocs/comm/propal/list.php       |  10 +-
 htdocs/supplier_proposal/list.php | 586 +++++++++++++++++++++++-------
 2 files changed, 456 insertions(+), 140 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index ac5cee3bebc..af9ffa6d778 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -84,7 +84,7 @@ $day=GETPOST("day","int");
 $month=GETPOST("month","int");
 $year=GETPOST("year","int");
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -242,6 +242,7 @@ $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= ' p.rowid, p.note_private, p.total_ht, p.tva as total_vat, p.total as total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,';
 $sql.= ' p.datec as date_creation, p.tms as date_update,';
+$sql.= " pr.rowid as project_id, pr.ref as project_ref,";
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,";
 $sql.= ' u.login';
 // Add fields from extrafields
@@ -259,6 +260,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 if ($sall || $search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet as pd ON p.rowid=pd.fk_propal';
 if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
 $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid';
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr ON pr.rowid = p.fk_projet";
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 if ($search_user > 0)
@@ -377,6 +379,7 @@ if ($resql)
 	if ($search_montant_ht)  $param.='&search_montant_ht='.$search_montant_ht;
 	if ($search_login)  	 $param.='&search_login='.$search_login;
 	if ($search_town)		 $param.='&search_town='.$search_town;
+	if ($search_zip)		 $param.='&search_zip='.$search_zip;
 	if ($socid > 0)          $param.='&socid='.$socid;
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
 	// Add $param from extra fields
@@ -532,7 +535,7 @@ if ($resql)
 	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	    $moreforfilter.='</div>';
 	}
-	// If the user can view prospects other than his'
+	// If the user can view products
 	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
@@ -566,7 +569,7 @@ if ($resql)
 	{
 	    print '<td class="liste_titre">';
     	print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
-	   print '</td>';
+ 	    print '</td>';
 	}
 	if (! empty($arrayfields['p.ref_client']['checked']))
 	{
@@ -1001,7 +1004,6 @@ if ($resql)
 		   else print '<td></td>';
 		}
 		print '</tr>';
-		
 	}
 
 	$db->free($resql);
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 56f8df0f825..c5f994f8a10 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -61,8 +61,15 @@ $search_user=GETPOST('search_user','int');
 $search_sale=GETPOST('search_sale','int');
 $search_ref=GETPOST('sf_ref')?GETPOST('sf_ref','alpha'):GETPOST('search_ref','alpha');
 $search_societe=GETPOST('search_societe','alpha');
-$search_montant_ht=GETPOST('search_montant_ht','alpha');
 $search_author=GETPOST('search_author','alpha');
+$search_town=GETPOST('search_town','alpha');
+$search_zip=GETPOST('search_zip','alpha');
+$search_state=trim(GETPOST("search_state"));
+$search_country=GETPOST("search_country",'int');
+$search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
+$search_montant_ht=GETPOST('search_montant_ht','alpha');
+$search_montant_vat=GETPOST('search_montant_vat','alpha');
+$search_montant_ttc=GETPOST('search_montant_ttc','alpha');
 $search_status=GETPOST('viewstatut','alpha')?GETPOST('viewstatut','alpha'):GETPOST('search_status','int');
 $object_statut=$db->escape(GETPOST('supplier_proposal_statut'));
 
@@ -121,28 +128,28 @@ $fieldstosearchall = array(
     'p.ref'=>'Ref',
     's.nom'=>'Supplier',
     'pd.description'=>'Description',
-    'p.note_private'=>"NotePrivate",
     'p.note_public'=>'NotePublic',
 );
+if (empty($user->socid)) $fieldstosearchall["p.note_private"]="NotePrivate";
 
-// TODO Use field of supplier proposal
+$checkedtypetiers=0;
 $arrayfields=array(
-    'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+    'sp.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
     's.nom'=>array('label'=>$langs->trans("Supplier"), 'checked'=>1),
     's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
     's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
     'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
     'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
     'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
-    'p.date'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
-    'p.fin_validite'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1),
-    'p.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
-    'p.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
-    'p.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
+    'sp.date_valid'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
+    'sp.date_livraison'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1),
+    'sp.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
+    'sp.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
+    'sp.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
     'u.login'=>array('label'=>$langs->trans("Author"), 'checked'=>1, 'position'=>10),
-    'p.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-    'p.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-    'p.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+    'sp.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+    'sp.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+    'sp.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
@@ -169,6 +176,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
+// Do we click on purge search criteria ?
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
     $search_categ='';
@@ -177,6 +185,16 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPO
     $search_ref='';
     $search_societe='';
     $search_montant_ht='';
+    $search_montant_vat='';
+    $search_montant_ttc='';
+    $search_login='';
+    $search_product_category='';
+    $search_town='';
+    $search_zip="";
+    $search_state="";
+    $search_type='';
+    $search_country='';
+    $search_type_thirdparty='';
     $search_author='';
     $yearvalid='';
     $monthvalid='';
@@ -186,10 +204,6 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPO
     $object_statut='';
 }
 
-$parameters=array('socid'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
 if (empty($reshook))
 {
     $objectclass='SupplierProposal';
@@ -215,15 +229,18 @@ $formpropal = new FormPropal($db);
 $companystatic=new Societe($db);
 $formcompany=new FormCompany($db);
 
-llxHeader('',$langs->trans('CommRequest'),'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur');
+$help_url='EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
+llxHeader('',$langs->trans('CommRequest'),$help_url);
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql.= ' s.rowid as socid, s.nom as name, s.town, s.client, s.code_client,';
+$sql.= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
 $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
-$sql.= ' sp.rowid, sp.note_private, sp.total_ht, sp.ref, sp.fk_statut, sp.fk_user_author, sp.date_valid, sp.date_livraison as dp,';
+$sql.= ' sp.rowid, sp.note_private, sp.total_ht, sp.tva as total_vat, sp.total as total_ttc, sp.localtax1, sp.localtax2, sp.ref, sp.fk_statut, sp.fk_user_author, sp.date_valid, sp.date_livraison as dp,';
+$sql.= ' sp.datec as date_creation, sp.tms as date_update,';
 $sql.= " p.rowid as project_id, p.ref as project_ref,";
+if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,";
 $sql.= " u.firstname, u.lastname, u.photo, u.login";
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
@@ -231,7 +248,7 @@ foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->att
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
@@ -254,10 +271,17 @@ if (! $user->rights->societe->client->voir && ! $socid) //restriction
 {
 	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 }
+if ($search_town)  $sql.= natural_search('s.town', $search_town);
+if ($search_zip)   $sql.= natural_search("s.zip",$search_zip);
+if ($search_state) $sql.= natural_search("state.nom",$search_state);
+if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
+if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
 if ($search_ref)     $sql .= natural_search('sp.ref', $search_ref);
 if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
 if ($search_author)  $sql .= natural_search('u.login', $search_author);
-if ($search_montant_ht) $sql.= " AND sp.total_ht='".$db->escape(price2num(trim($search_montant_ht)))."'";
+if ($search_montant_ht) $sql.= natural_search('sp.total_ht=', $search_montant_ht, 1);
+if ($search_montant_vat != '') $sql.= natural_search("sp.tva", $search_montant_vat, 1);
+if ($search_montant_ttc != '') $sql.= natural_search("sp.total", $search_montant_ttc, 1);
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 if ($socid) $sql.= ' AND s.rowid = '.$socid;
 if ($search_status >= 0 && $search_status != '') $sql.= ' AND sp.fk_statut IN ('.$search_status.')';
@@ -292,6 +316,23 @@ if ($search_user > 0)
 {
     $sql.= " AND c.fk_c_type_contact = tc.rowid AND tc.element='supplier_proposal' AND tc.source='internal' AND c.element_id = sp.rowid AND c.fk_socpeople = ".$search_user;
 }
+// Add where from extra fields
+foreach ($search_array_options as $key => $val)
+{
+    $crit=$val;
+    $tmpkey=preg_replace('/search_options_/','',$key);
+    $typ=$extrafields->attribute_type[$tmpkey];
+    $mode=0;
+    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
+    {
+        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+    }
+}
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 
 $sql.= $db->order($sortfield,$sortorder);
 $sql.=', sp.ref DESC';
@@ -300,14 +341,14 @@ $sql.=', sp.ref DESC';
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
 }
 
 $sql.= $db->plimit($limit + 1,$offset);
 
-$result=$db->query($sql);
-if ($result)
+$resql=$db->query($sql);
+if ($resql)
 {
 	$objectstatic=new SupplierProposal($db);
 	$userstatic=new User($db);
@@ -323,7 +364,7 @@ if ($result)
 	    $title = $langs->trans('ListOfSupplierProposals');
 	}
 	
-	$num = $db->num_rows($result);
+	$num = $db->num_rows($resql);
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
 	
@@ -339,6 +380,8 @@ if ($result)
 	if ($search_sale > 0)    $param.='&search_sale='.$search_sale;
 	if ($search_montant_ht)  $param.='&search_montant_ht='.$search_montant_ht;
 	if ($search_author)  	 $param.='&search_author='.$search_author;
+	if ($search_town)		 $param.='&search_town='.$search_town;
+	if ($search_zip)		 $param.='&search_zip='.$search_zip;
 	if ($socid > 0)          $param.='&socid='.$socid;
 	if ($search_status != '') $param.='&search_status='.$search_status;
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
@@ -495,6 +538,16 @@ if ($result)
 	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	    $moreforfilter.='</div>';
 	}
+	// If the user can view products
+	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	{
+	    include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+	    $moreforfilter.='<div class="divsearchfield">';
+	    $moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
+	    $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
+	    $moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+	    $moreforfilter.='</div>';
+	}
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
@@ -512,46 +565,142 @@ if ($result)
     if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
     
     print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
+    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
     
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre">';
-	print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
-	print '</td>';
-	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" size="12" name="search_societe" value="'.$search_societe.'">';
-	print '</td>';
-
-	// Date valid
-	print '<td class="liste_titre" colspan="1" align="center">';
-	//print $langs->trans('Month').': ';
-	print '<input class="flat" type="text" size="1" maxlength="2" name="monthvalid" value="'.$monthvalid.'">';
-	//print '&nbsp;'.$langs->trans('Year').': ';
-	$syearvalid = $yearvalid;
-	$formother->select_year($syearvalid,'yearvalid',1, 20, 5);
-	print '</td>';
-	
+	if (! empty($arrayfields['sp.ref']['checked']))            
+	{
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
+		print '</td>';
+	}
+	if (! empty($arrayfields['s.nom']['checked']))
+	{	
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" type="text" size="12" name="search_societe" value="'.$search_societe.'">';
+		print '</td>';
+	}
+	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';
+	// State
+    if (! empty($arrayfields['state.nom']['checked']))
+    {
+        print '<td class="liste_titre">';
+    	print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+    	print '</td>';
+    }
+    // Country
+    if (! empty($arrayfields['country.code_iso']['checked']))
+    {
+        print '<td class="liste_titre" align="center">';
+    	print $form->select_country($search_country,'search_country','',0,'maxwidth100');
+    	print '</td>';
+    }
+	// Company type
+    if (! empty($arrayfields['typent.code']['checked']))
+    {
+        print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+    	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
+    	print '</td>';
+    }
 	// Date
-	print '<td class="liste_titre" colspan="1" align="center">';
-	//print $langs->trans('Month').': ';
-	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-	//print '&nbsp;'.$langs->trans('Year').': ';
-	$syear = $year;
-	$formother->select_year($syear,'year',1, 20, 5);
-	print '</td>';
+	if (! empty($arrayfields['sp.date_valid']['checked'])) 
+	{
+		print '<td class="liste_titre" colspan="1" align="center">';
+		//print $langs->trans('Month').': ';
+		print '<input class="flat" type="text" size="1" maxlength="2" name="monthvalid" value="'.$monthvalid.'">';
+		//print '&nbsp;'.$langs->trans('Year').': ';
+		$syearvalid = $yearvalid;
+		$formother->select_year($syearvalid,'yearvalid',1, 20, 5);
+		print '</td>';	
+	}
+	// Date
+	if (! empty($arrayfields['sp.date_livraison']['checked'])) 
+	{
+		print '<td class="liste_titre" colspan="1" align="center">';
+		//print $langs->trans('Month').': ';
+		print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+		//print '&nbsp;'.$langs->trans('Year').': ';
+		$syear = $year;
+		$formother->select_year($syear,'year',1, 20, 5);
+		print '</td>';
+	}
 
-	// Amount
-	print '<td class="liste_titre" align="right">';
-	print '<input class="flat" type="text" size="10" name="search_montant_ht" value="'.$search_montant_ht.'">';
-	print '</td>';
-	// Author
-	print '<td class="liste_titre" align="center">';
-	print '<input class="flat" size="10" type="text" name="search_author" value="'.$search_author.'">';
-	print '</td>';
-	print '<td class="liste_titre" align="right">';
-	$formpropal->selectProposalStatus($search_status,1,0,1,'supplier','search_status');
-	print '</td>';
-	// Check boxes
+	if (! empty($arrayfields['sp.total_ht']['checked']))
+	{
+	    // Amount
+	    print '<td class="liste_titre" align="right">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.$search_montant_ht.'">';
+	    print '</td>';
+	}
+	if (! empty($arrayfields['sp.total_vat']['checked']))
+	{
+	    // Amount
+	    print '<td class="liste_titre" align="right">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.$search_montant_vat.'">';
+	    print '</td>';
+	}
+	if (! empty($arrayfields['sp.total_ttc']['checked']))
+	{
+	    // Amount
+	    print '<td class="liste_titre" align="right">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.$search_montant_ttc.'">';
+	    print '</td>';
+	}
+	if (! empty($arrayfields['u.login']['checked']))
+	{
+	    // Author
+	    print '<td class="liste_titre" align="center">';
+	    print '<input class="flat" size="4" type="text" name="search_login" value="'.$search_author.'">';
+	    print '</td>';
+	}	
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	    foreach($extrafields->attribute_label as $key => $val)
+	    {
+	        if (! empty($arrayfields["ef.".$key]['checked']))
+	        {
+	            $align=$extrafields->getAlignFlag($key);
+	            $typeofextrafield=$extrafields->attribute_type[$key];
+	            print '<td class="liste_titre'.($align?' '.$align:'').'">';
+	            if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+	            {
+	                $crit=$val;
+	                $tmpkey=preg_replace('/search_options_/','',$key);
+	                $searchclass='';
+	                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+	                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+	                print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+	            }
+	            print '</td>';
+	        }
+	    }
+	}
+	// Fields from hook
+	$parameters=array('arrayfields'=>$arrayfields);
+	$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Date creation
+	if (! empty($arrayfields['sp.datec']['checked']))
+	{
+	    print '<td class="liste_titre">';
+	    print '</td>';
+	}
+	// Date modification
+	if (! empty($arrayfields['sp.tms']['checked']))
+	{
+	    print '<td class="liste_titre">';
+	    print '</td>';
+	}	
+	// Status
+	if (! empty($arrayfields['sp.fk_statut']['checked']))
+	{
+		print '<td class="liste_titre maxwidthonsmartphone" align="right">';
+		$formpropal->selectProposalStatus($search_status,1,0,1,'supplier','search_status');
+		print '</td>';
+	}
+	// Action column
 	print '<td class="liste_titre" align="middle">';
 	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
@@ -561,63 +710,92 @@ if ($result)
 
 	// Fields title
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'sp.ref','',$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Supplier'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'sp.date_valid','',$param, 'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('SupplierProposalDate'),$_SERVER["PHP_SELF"],'sp.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('AmountHT'),$_SERVER["PHP_SELF"],'sp.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'sp.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.ref']['checked']))           print_liste_field_titre($arrayfields['sp.ref']['label'],$_SERVER["PHP_SELF"],'sp.ref','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.date_valid']['checked']))      print_liste_field_titre($arrayfields['sp.date_valid']['label'],$_SERVER["PHP_SELF"],'sp.date_valid','',$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.date_livraison']['checked']))  print_liste_field_titre($arrayfields['sp.date_livraison']['label'],$_SERVER["PHP_SELF"],'sp.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.total_ht']['checked']))        print_liste_field_titre($arrayfields['sp.total_ht']['label'],$_SERVER["PHP_SELF"],'sp.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.total_vat']['checked']))       print_liste_field_titre($arrayfields['sp.total_vat']['label'],$_SERVER["PHP_SELF"],'sp.total_vat','',$param, 'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.total_ttc']['checked']))       print_liste_field_titre($arrayfields['sp.total_ttc']['label'],$_SERVER["PHP_SELF"],'sp.total_ttc','',$param, 'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['u.login']['checked']))            print_liste_field_titre($arrayfields['u.login']['label'],$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder);
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	   foreach($extrafields->attribute_label as $key => $val) 
+	   {
+           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           {
+				$align=$extrafields->getAlignFlag($key);
+				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+           }
+	   }
+	}
+	// Hook fields
+	$parameters=array('arrayfields'=>$arrayfields);
+    $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+	if (! empty($arrayfields['sp.datec']['checked']))     print_liste_field_titre($arrayfields['sp.datec']['label'],$_SERVER["PHP_SELF"],"sp.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.tms']['checked']))       print_liste_field_titre($arrayfields['sp.tms']['label'],$_SERVER["PHP_SELF"],"sp.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['sp.fk_statut']['checked'])) print_liste_field_titre($arrayfields['sp.fk_statut']['label'],$_SERVER["PHP_SELF"],"sp.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
+	print '</tr>'."\n";
 	
 	$now = dol_now();
-	$var=true;
+	$i=0;
 	$total=0;
 	$subtotal=0;
 	$totalarray=array();
 	while ($i < min($num,$limit))
 	{
-		$obj = $db->fetch_object($result);
+		$obj = $db->fetch_object($resql);
 		
-
 		$objectstatic->id=$obj->rowid;
 		$objectstatic->ref=$obj->ref;
 
 		print '<tr class="oddeven">';
-		print '<td class="nowrap">';
+		
+		if (! empty($arrayfields['sp.ref']['checked']))
+		{
+			print '<td class="nowrap">';
 
-		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-		// Picto + Ref
-		print '<td class="nobordernopadding nowrap">';
-		print $objectstatic->getNomUrl(1);
-		print '</td>';
-		// Warning
-		$warnornote='';
-		if ($obj->fk_statut == 1 && $db->jdate($obj->date_valid) < ($now - $conf->supplier_proposal->warning_delay)) $warnornote.=img_warning($langs->trans("Late"));
-		if (! empty($obj->note_private))
-		{
-			$warnornote.=($warnornote?' ':'');
-			$warnornote.= '<span class="note">';
-			$warnornote.= '<a href="note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
-			$warnornote.= '</span>';
-		}
-		if ($warnornote)
-		{
-			print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
-			print $warnornote;
+			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+			// Picto + Ref
+			print '<td class="nobordernopadding nowrap">';
+			print $objectstatic->getNomUrl(1);
 			print '</td>';
+			// Warning
+			$warnornote='';
+			if ($obj->fk_statut == 1 && $db->jdate($obj->date_valid) < ($now - $conf->supplier_proposal->warning_delay)) $warnornote.=img_warning($langs->trans("Late"));
+			if (! empty($obj->note_private))
+			{
+				$warnornote.=($warnornote?' ':'');
+				$warnornote.= '<span class="note">';
+				$warnornote.= '<a href="note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
+				$warnornote.= '</span>';
+			}
+			if ($warnornote)
+			{
+				print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
+				print $warnornote;
+				print '</td>';
+			}
+			// Other picto tool
+			print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
+			$filename=dol_sanitizeFileName($obj->ref);
+			$filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+			$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+			print '</td></tr></table>';
+	
+			print "</td>\n";
+			if (! $i) $totalarray['nbfield']++;
 		}
-		// Other picto tool
-		print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
-		$filename=dol_sanitizeFileName($obj->ref);
-		$filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
-		$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-		print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		print '</td></tr></table>';
-
-		print "</td>\n";
-
+		
 		$url = DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid;
 
 		// Company
@@ -625,30 +803,157 @@ if ($result)
 		$companystatic->name=$obj->name;
 		$companystatic->client=$obj->client;
 		$companystatic->code_client=$obj->code_client;
-		print '<td>';
-		print $companystatic->getNomUrl(1,'customer');
-		print '</td>';
 
-		// Date
-		print '<td align="center">';
-		print dol_print_date($db->jdate($obj->date_valid), 'day');
-		print "</td>\n";
+		// Thirdparty
+		if (! empty($arrayfields['s.nom']['checked']))
+		{
+    		print '<td class="tdoverflowmax200">';
+			print $companystatic->getNomUrl(1,'customer');
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Town
+        if (! empty($arrayfields['s.town']['checked']))
+        {
+            print '<td class="nocellnopadd">';
+		    print $obj->town;
+    		print '</td>';
+    		if (! $i) $totalarray['nbfield']++;
+        }
+        // Zip
+        if (! empty($arrayfields['s.zip']['checked']))
+        {
+            print '<td class="nocellnopadd">';
+            print $obj->zip;
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // State
+        if (! empty($arrayfields['state.nom']['checked']))
+        {
+            print "<td>".$obj->state_name."</td>\n";
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // Country
+        if (! empty($arrayfields['country.code_iso']['checked']))
+        {
+            print '<td align="center">';
+            $tmparray=getCountry($obj->fk_pays,'all');
+            print $tmparray['label'];
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // Type ent
+        if (! empty($arrayfields['typent.code']['checked']))
+        {
+            print '<td align="center">';
+            if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+            print $typenArray[$obj->typent_code];
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        
+		// Date proposal
+        if (! empty($arrayfields['sp.date_valid']['checked']))
+        {
+            print '<td align="center">';
+			print dol_print_date($db->jdate($obj->date_valid), 'day');
+			print "</td>\n";
+			if (! $i) $totalarray['nbfield']++;
+        }
 		
 		// Date delivery
-		print '<td align="center">';
-		print dol_print_date($db->jdate($obj->dp), 'day');
-		print "</td>\n";
-
-		print '<td align="right">'.price($obj->total_ht)."</td>\n";
+        if (! empty($arrayfields['sp.date_livraison']['checked']))
+        {
+        	print '<td align="center">';
+			print dol_print_date($db->jdate($obj->dp), 'day');
+			print "</td>\n";
+			if (! $i) $totalarray['nbfield']++;
+        }
 
+        // Amount HT
+        if (! empty($arrayfields['sp.total_ht']['checked']))
+        {
+		      print '<td align="right">'.price($obj->total_ht)."</td>\n";
+		      if (! $i) $totalarray['nbfield']++;
+		      if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
+		      $totalarray['totalht'] += $obj->total_ht;
+        }
+        // Amount VAT
+        if (! empty($arrayfields['sp.total_vat']['checked']))
+        {
+            print '<td align="right">'.price($obj->total_vat)."</td>\n";
+            if (! $i) $totalarray['nbfield']++;
+		    if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
+		    $totalarray['totalvat'] += $obj->total_vat;
+        }
+        // Amount TTC
+        if (! empty($arrayfields['sp.total_ttc']['checked']))
+        {
+            print '<td align="right">'.price($obj->total_ttc)."</td>\n";
+            if (! $i) $totalarray['nbfield']++;
+		    if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
+		    $totalarray['totalttc'] += $obj->total_ttc;
+        }
+        
 		$userstatic->id=$obj->fk_user_author;
 		$userstatic->login=$obj->login;
-		print '<td align="center">';
-		if ($userstatic->id) print $userstatic->getLoginUrl(1);
-		else print '&nbsp;';
-		print "</td>\n";
 
-		print '<td align="right">'.$objectstatic->LibStatut($obj->fk_statut,5)."</td>\n";
+        // Author
+        if (! empty($arrayfields['u.login']['checked']))
+        {
+			print '<td align="center">';
+			if ($userstatic->id) print $userstatic->getLoginUrl(1);
+			else print '&nbsp;';
+			print "</td>\n";
+    		if (! $i) $totalarray['nbfield']++;
+        }
+        
+        // Extra fields
+        if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+        {
+            foreach($extrafields->attribute_label as $key => $val)
+            {
+                if (! empty($arrayfields["ef.".$key]['checked']))
+                {
+                    print '<td';
+                    $align=$extrafields->getAlignFlag($key);
+                    if ($align) print ' align="'.$align.'"';
+                    print '>';
+                    $tmpkey='options_'.$key;
+                    print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
+                    print '</td>';
+                    if (! $i) $totalarray['nbfield']++;
+                }
+            }
+        }
+        // Fields from hook
+        $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+        $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+        // Date creation
+        if (! empty($arrayfields['sp.datec']['checked']))
+        {
+            print '<td align="center" class="nowrap">';
+            print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // Date modification
+        if (! empty($arrayfields['sp.tms']['checked']))
+        {
+            print '<td align="center" class="nowrap">';
+            print dol_print_date($db->jdate($obj->date_update), 'dayhour');
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // Status
+        if (! empty($arrayfields['sp.fk_statut']['checked']))
+        {	
+            print '<td align="right">'.$objectstatic->LibStatut($obj->fk_statut,5)."</td>\n";
+            if (! $i) $totalarray['nbfield']++;
+        }
 
         // Action column
         print '<td class="nowrap" align="center">';
@@ -659,7 +964,8 @@ if ($result)
     		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
         }
         print '</td>';
-
+        if (! $i) $totalarray['nbfield']++;
+        
 		print "</tr>\n";
 
 		$total += $obj->total_ht;
@@ -668,22 +974,30 @@ if ($result)
 		$i++;
 	}
 
-	if ($total>0)
+	// Show total line
+	if (isset($totalarray['totalhtfield'])
+	    || isset($totalarray['totalvatfield'])
+	    || isset($totalarray['totalttcfield'])
+	    || isset($totalarray['totalamfield'])
+	    || isset($totalarray['totalrtpfield'])
+	    )
 	{
-		if($num<$limit){
-			
-			print '<tr class="liste_total"><td align="left">'.$langs->trans("TotalHT").'</td>';
-			print '<td colspan="4" align="right">'.price($total).'</td><td colspan="3"></td>';
-			print '</tr>';
-		}
-		else
-		{
-			
-			print '<tr class="liste_total"><td align="left">'.$langs->trans("TotalHTforthispage").'</td>';
-			print '<td colspan="4" align="right">'.price($total).'</td><td colspan="3"></td>';
-			print '</tr>';
-		}
-
+	    print '<tr class="liste_total">';
+	    $i=0;
+	    while ($i < $totalarray['nbfield'])
+	    {
+	        $i++;
+	        if ($i == 1)
+	        {
+	            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
+	            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+	        }
+	        elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
+	        elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
+	        elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
+	        else print '<td></td>';
+	    }
+	    print '</tr>';
 	}
 
 	$db->free($resql);

From 88fc7dbc3e7596a19b38fa93d0630665fae18b4c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 19:19:55 +0200
Subject: [PATCH 0866/1163] Fix remove warning

---
 htdocs/core/modules/DolibarrModules.class.php | 2 +-
 test/phpunit/CodingPhpTest.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index f501d33c29a..cdb4ea33f73 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -848,7 +848,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         $resql=$this->db->query($sql);
         if (! $resql) $err++;
 
-        $note=json_encode(array('authorid'=>$user->id, 'ip'=>$_SERVER['REMOTE_ADDR']));
+        $note=json_encode(array('authorid'=>$user->id, 'ip'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])));
         
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, value, visible, entity, note) VALUES";
         $sql.= " (".$this->db->encrypt($this->const_name,1);
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 4860e5b5e38..159323a9e83 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -141,7 +141,7 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-        include DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         $filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname');
 
         foreach($filesarray as $key => $file) 

From a28f8c84e42b2dfb2b636c803465c17f0e85bdd8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 22:23:59 +0200
Subject: [PATCH 0867/1163] Fix travis error

---
 htdocs/webservices/server_order.php   | 1 +
 htdocs/webservices/server_payment.php | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index b0f794dd55f..c84eefa3480 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -793,6 +793,7 @@ function createOrder($authentication,$order)
  *
  * @param	array		$authentication		Array of authentication information
  * @param	int			$id					Id of order to validate
+ * @param	int			$id_warehouse		Id of warehouse to use for stock decrease
  * @return	array							Array result
  */
 function validOrder($authentication,$id='',$id_warehouse=0)
diff --git a/htdocs/webservices/server_payment.php b/htdocs/webservices/server_payment.php
index e8e4f5e1cb0..d6cd261a686 100644
--- a/htdocs/webservices/server_payment.php
+++ b/htdocs/webservices/server_payment.php
@@ -129,12 +129,13 @@ $server->register(
     'WS to create a new payment'
 );
 
+
 /**
  * Create a payment
  *
  * @param      array           $authentication         Array of authentication information
- * @param      Facture         $invoice                        Invoice
- * @return     array                                                   Array result
+ * @param      Object          $payment                Payment
+ * @return     array                                   Array result
  */
 function createPayment($authentication, $payment)
 {

From ff2a268831c157ec261f7425e423aeb8e556b40a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 00:52:13 +0200
Subject: [PATCH 0868/1163] NEW Architecture to manage search criteria
 persistance (using save_lastsearch_values=1 on exit links and
 restore_lastsearch_values=1 in entry links)

---
 htdocs/core/lib/functions.lib.php          | 42 +++++++++++++++++++---
 htdocs/core/menus/standard/auguria.lib.php |  8 +++++
 htdocs/core/menus/standard/eldy.lib.php    | 16 +++++----
 htdocs/main.inc.php                        |  4 ++-
 htdocs/projet/card.php                     |  2 +-
 htdocs/projet/contact.php                  |  2 +-
 htdocs/projet/document.php                 |  2 +-
 htdocs/projet/element.php                  |  2 +-
 htdocs/projet/ganttview.php                |  2 +-
 htdocs/projet/index.php                    |  2 +-
 htdocs/projet/info.php                     |  2 +-
 htdocs/projet/note.php                     |  4 +--
 htdocs/projet/tasks.php                    |  2 +-
 13 files changed, 68 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c9ec77c76de..4e17c62d3f5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -264,6 +264,8 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 {
     global $mysoc,$user,$conf;
     
+    if (empty($paramname)) return 'BadFirstParameterForGETPOST';
+        
     if (empty($method)) $out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
 	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
 	elseif ($method==2) $out = isset($_POST[$paramname])?$_POST[$paramname]:'';
@@ -279,11 +281,11 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
     	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 	
 	    // Management of default values
-	    if (! isset($_GET['sortfield']) && ! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_DISABLE_DEFAULT_VALUES is on
+	    if (! isset($_GET['sortfield']) && ! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
 	    {
-	        if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+	        if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
-	            if (! empty($user->default_values))		// $user->default_values defined from menu default values, and values loaded not at first
+	            if (! empty($user->default_values))		// $user->default_values defined from menu default values
 	            {
 	                //var_dump($user->default_values[$relativepathstring]['createform']);
 	                if (isset($user->default_values[$relativepathstring]['createform'][$paramname])) $out = $user->default_values[$relativepathstring]['createform'][$paramname];
@@ -328,11 +330,34 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	            }
 	        }
 	    }
+	    
+	    // Retrieve values into restore_lastsearch_values
+	    if ($_GET['restore_lastsearch_values'])        // Keep $_GET here
+	    {
+	        if (! empty($_SESSION['lastsearch_values_'.$relativepathstring]))
+	        {
+	            $tmp=json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
+	            if (is_array($tmp))
+	            {
+    	            foreach($tmp as $key => $val)
+    	            {
+        	           if ($key == $paramname)
+        	           {
+    	                   $out=$val;
+    	                   break;
+        	           }
+    	            }
+	            }
+	        }
+	    }
+	    
 	}	
 	
 	if (empty($check) && ! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
 	   dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param not defined, when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);    
+	   // Enable this line to know who call the GETPOST with empty $check parameter.
+	   //var_dump(debug_backtrace()[0]);
 	}
 	
 	if (! empty($check))
@@ -423,14 +448,23 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	    }
 	}
 
+    // Code for search criteria persistence.
 	// Save data into session if key start with 'search_' or is 'smonth', 'syear', 'month', 'year'
 	if (empty($method) || $method == 3 || $method == 4)
 	{
 	    //if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder', 'sortfield", 'smonth', 'syear', 'month', 'year')))
 	    if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder','sortfield')))
 	    {
+	        //var_dump($user->default_values[$relativepathstring]);exit;
 	        //if ($paramname == 'sortorder') var_dump($paramname.' - '.$out);
-	        $user->lastsearch_values_tmp[$relativepathstring][$paramname]=$out;
+	        
+	        // We save search key only if:
+	        // - not empty, or
+	        // - if value is empty and a default value exists that is not empty (it means we did a filter to an empty value when default was not).
+	        if (! empty($out) || ! empty($user->default_values[$relativepathstring][$paramname]))
+	        {
+                $user->lastsearch_values_tmp[$relativepathstring][$paramname]=$out;
+	        }
 	    }
 	}
 	
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 7272eb000d4..3cc9c569120 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -103,6 +103,14 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
 			$url=preg_replace('/__USERID__/',$user->id,$url);
 			$shorturl=preg_replace('/__USERID__/',$user->id,$shorturl);
 
+			// TODO Find a generic solution
+			if (preg_match('/search_project_user=__search_project_user__/', $shorturl))
+			{
+			    $search_project_user = GETPOST('search_project_user','int');
+			    if ($search_project_user) $shorturl=preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
+			    else $shorturl=preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);
+			}
+			
 			// Define the class (top menu selected or not)
 			if (! empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"';
 			else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"';
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 4aa5064977d..521fd6831f2 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1299,11 +1299,13 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->projet->enabled))
 			{
 				$langs->load("projects");
-
+				
+				$search_project_user = GETPOST('search_project_user','int');
+				
 				// Project affected to user
-				$newmenu->add("/projet/index.php?leftmenu=projects&search_project_user=".GETPOST('search_project_user'), $langs->trans("Projects"), 0, $user->rights->projet->lire, '', $mainmenu, 'projects');
-				$newmenu->add("/projet/card.php?leftmenu=projects&action=create&search_project_user=".GETPOST('search_project_user'), $langs->trans("NewProject"), 1, $user->rights->projet->creer);
-				$newmenu->add("/projet/list.php?leftmenu=projects&search_project_user=".GETPOST('search_project_user')."&search_status=99", $langs->trans("List"), 1, $user->rights->projet->lire);
+				$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("Projects"), 0, $user->rights->projet->lire, '', $mainmenu, 'projects');
+				$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewProject"), 1, $user->rights->projet->creer);
+				$newmenu->add("/projet/list.php?leftmenu=projects".($search_project_user?'&search_project_user='.$search_project_user:'')."&search_status=99", $langs->trans("List"), 1, $user->rights->projet->lire);
 
 				// All project i have permission on
 				/*
@@ -1316,10 +1318,10 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if (empty($conf->global->PROJECT_HIDE_TASKS))
 				{
 					// Project affected to user
-					$newmenu->add("/projet/activity/index.php?leftmenu=tasks&search_project_user=".GETPOST('search_project_user'), $langs->trans("Activities"), 0, $user->rights->projet->lire);
+					$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("Activities"), 0, $user->rights->projet->lire);
 					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
-					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks&search_project_user=".GETPOST('search_project_user'), $langs->trans("List"), 1, $user->rights->projet->lire);
-					$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks&search_project_user=".GETPOST('search_project_user'), $langs->trans("NewTimeSpent"), 1, $user->rights->projet->lire);
+					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("List"), 1, $user->rights->projet->lire);
+					$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewTimeSpent"), 1, $user->rights->projet->lire);
 
 					// All project i have permission on
 					/*$newmenu->add("/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire && $user->rights->projet->lire);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d632e91d537..73f0a815413 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -646,6 +646,7 @@ if (! defined('NOLOGIN'))
 	       // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 	       $hookmanager->initHooks(array('main'));
 
+	       // Code for search criteria persistence.
 	       if (! empty($_GET['save_lastsearch_values']))    // Keep $_GET here
 	       {
                $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
@@ -1886,6 +1887,7 @@ if (! function_exists("llxFooter"))
         // Global html output events ($mesgs, $errors, $warnings)
         dol_htmloutput_events();
 
+        // Code for search criteria persistence.
         // Save $user->lastsearch_values if defined (define on list pages when a form field search_xxx exists)
         if (is_object($user) && ! empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
         {
@@ -1897,7 +1899,7 @@ if (! function_exists("llxFooter"))
                 {
                     if (empty($val['sortfield'])) unset($val['sortfield']);
                     if (empty($val['sortorder'])) unset($val['sortorder']);
-                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0, 1));
+                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0, 1)." (systematic recording of last search criteria)");
                     $_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
                     unset($_SESSION['lastsearch_values_'.$key]);
                 }
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 47d0f1c3148..f6355ec5566 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -837,7 +837,7 @@ elseif ($object->id > 0)
     {
         // Project card
         
-        $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+        $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
         
         $morehtmlref='<div class="refidno">';
         // Title
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index e843d4951e4..72b82ac2bb0 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -151,7 +151,7 @@ if ($id > 0 || ! empty($ref))
 
     // Project card
     
-    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
     
     $morehtmlref='<div class="refidno">';
     // Title
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 2d5a6cd71d0..21dd30f560c 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -109,7 +109,7 @@ if ($object->id > 0)
 	
 	// Project card
 	
-	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	
 	$morehtmlref='<div class="refidno">';
 	// Title
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 8aebe756d70..f745c71d761 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -128,7 +128,7 @@ dol_fiche_head($head, 'element', $langs->trans("Project"), -1, ($object->public?
 
 // Project card
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 $morehtmlref='<div class="refidno">';
 // Title
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 36fbfccca77..7ec9dcf1a4b 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -102,7 +102,7 @@ if ($id > 0 || ! empty($ref))
 
     // Project card
     
-    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
     
     $morehtmlref='<div class="refidno">';
     // Title
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 8295e106be9..c7f0181dbf5 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->load("projects");
 $langs->load("companies");
 
-$mine = GETPOST('mode')=='mine' ? 1 : 0;
+$mine = GETPOST('mode','aZ09')=='mine' ? 1 : 0;
 $search_project_user = GETPOST('search_project_user','int');
 
 // Security check
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 3206fd51244..74015626b9e 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -112,7 +112,7 @@ dol_fiche_head($head, 'agenda', $langs->trans("Project"), -1, ($object->public?'
 
 // Project card
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 $morehtmlref='<div class="refidno">';
 // Title
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 9a73e481666..88217fbfb1c 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -30,7 +30,7 @@ $langs->load('projects');
 
 $action=GETPOST('action','aZ09');
 $id = GETPOST('id','int');
-$ref= GETPOST('ref');
+$ref= GETPOST('ref','alpha');
 
 $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
@@ -82,7 +82,7 @@ if ($id > 0 || ! empty($ref))
 	
 	// Project card
 	
-	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	
 	$morehtmlref='<div class="refidno">';
 	// Title
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index e8a949f3191..85fa0f640e9 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -225,7 +225,7 @@ if ($id > 0 || ! empty($ref))
 
     // Project card
     
-    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
     
     $morehtmlref='<div class="refidno">';
     // Title

From 7b784a1dcbc5e3af7c83e3dda89252871845c4ee Mon Sep 17 00:00:00 2001
From: absnc <frederick.nguyenxuan@gmail.com>
Date: Fri, 19 May 2017 17:50:10 +1100
Subject: [PATCH 0869/1163] Enable shipments for project overview tab

---
 htdocs/expedition/card.php                    |  16 ++
 htdocs/expedition/class/expedition.class.php  |   2 +
 htdocs/expedition/shipment.php                |   1 +
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   2 +
 .../install/mysql/tables/llx_expedition.sql   |   1 +
 htdocs/langs/en_US/projects.lang              |   1 +
 htdocs/langs/fr_FR/projects.lang              |   1 +
 htdocs/langs/fr_NC/projects.lang              | 197 ++++++++++++++++++
 htdocs/langs/fr_NC/sendings.lang              |  71 +++++++
 htdocs/projet/element.php                     |  12 ++
 10 files changed, 304 insertions(+)
 create mode 100644 htdocs/langs/fr_NC/projects.lang
 create mode 100644 htdocs/langs/fr_NC/sendings.lang

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index a0280ce9e39..8924577009f 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -191,6 +191,7 @@ if (empty($reshook))
 	    $object->note				= GETPOST('note','alpha');
 	    $object->origin				= $origin;
 	    $object->origin_id			= $origin_id;
+        $object->fk_project         = GETPOST('projectid');
 	    $object->weight				= GETPOST('weight','int')==''?"NULL":GETPOST('weight','int');
 	    $object->sizeH				= GETPOST('sizeH','int')==''?"NULL":GETPOST('sizeH','int');
 	    $object->sizeW				= GETPOST('sizeW','int')==''?"NULL":GETPOST('sizeW','int');
@@ -696,6 +697,21 @@ if ($action == 'create')
             print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
             print '</tr>';
 
+            // Project
+            if (! empty($conf->projet->enabled))
+            {
+                $projectid = GETPOST('projectid')?GETPOST('projectid'):0;
+                if ($origin == 'project') $projectid = ($originid ? $originid : 0);
+
+                $langs->load("projects");
+                print '<tr>';
+                print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';
+                $numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
+                print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
+                print '</td>';
+                print '</tr>';
+            }
+
             // Date delivery planned
             print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
             print '<td colspan="3">';
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 8d6822fd360..2b7ada7a0c2 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -211,6 +211,7 @@ class Expedition extends CommonObject
 		$sql.= ", date_expedition";
 		$sql.= ", date_delivery";
 		$sql.= ", fk_soc";
+		$sql.= ", fk_projet";
 		$sql.= ", fk_address";
 		$sql.= ", fk_shipping_method";
 		$sql.= ", tracking_number";
@@ -234,6 +235,7 @@ class Expedition extends CommonObject
 		$sql.= ", ".($this->date_expedition>0?"'".$this->db->idate($this->date_expedition)."'":"null");
 		$sql.= ", ".($this->date_delivery>0?"'".$this->db->idate($this->date_delivery)."'":"null");
 		$sql.= ", ".$this->socid;
+		$sql.= ", ".$this->fk_project;
 		$sql.= ", ".($this->fk_delivery_address>0?$this->fk_delivery_address:"null");
 		$sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:"null");
 		$sql.= ", '".$this->db->escape($this->tracking_number)."'";
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index ede1cc6bec9..849053c610c 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -880,6 +880,7 @@ if ($id > 0 || ! empty($ref))
                 print '<input type="hidden" name="shipping_method_id" value="'.$object->shipping_method_id.'">';
 				print '<input type="hidden" name="origin" value="commande">';
 				print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
+				print '<input type="hidden" name="projectid" value="'.$object->fk_project.'">';
 				//print '<table class="border" width="100%">';
 
 				$langs->load("stocks");
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 6ba7707b249..72ef855f96b 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -47,6 +47,8 @@ ALTER TABLE llx_ecm_files ADD INDEX idx_ecm_files_label (label);
 ALTER TABLE llx_holiday ADD COLUMN import_key				varchar(14);
 ALTER TABLE llx_holiday ADD COLUMN extraparams				varchar(255);	
 
+ALTER TABLE llx_expedition ADD COLUMN fk_projet integer DEFAULT NULL after fk_soc;
+
 ALTER TABLE llx_expensereport ADD COLUMN import_key			varchar(14);
 ALTER TABLE llx_expensereport ADD COLUMN extraparams		varchar(255);	
 
diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql
index aa71e62c0a2..088e4893c06 100644
--- a/htdocs/install/mysql/tables/llx_expedition.sql
+++ b/htdocs/install/mysql/tables/llx_expedition.sql
@@ -26,6 +26,7 @@ create table llx_expedition
   ref                   varchar(30)        NOT NULL,
   entity                integer  DEFAULT 1 NOT NULL,	-- multi company id
   fk_soc                integer            NOT NULL,
+  fk_projet  		integer  DEFAULT NULL,
   
   ref_ext               varchar(30),					-- reference into an external system (not used by dolibarr)
   ref_int				varchar(30),					-- reference into an internal system (used by dolibarr to store extern id like paypal info)
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 97d47589d53..c98c2120e21 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -82,6 +82,7 @@ ListPredefinedInvoicesAssociatedProject=List of customer template invoices assoc
 ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
+ListShippingAssociatedProject=List of shippings associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
 ListDonationsAssociatedProject=List of donations associated with the project
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index fed1df8c59f..34553656359 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -79,6 +79,7 @@ ListSupplierOrdersAssociatedProject=Liste des commandes fournisseurs associées
 ListSupplierInvoicesAssociatedProject=Liste des factures fournisseurs associées au projet
 ListContractAssociatedProject=Liste des contrats associés au projet
 ListFichinterAssociatedProject=Liste des interventions associées au projet
+ListShippingAssociatedProject=Liste des expéditions associées au projet
 ListExpenseReportsAssociatedProject=Liste des notes de frais associées avec ce projet
 ListDonationsAssociatedProject=Liste des dons associés au projet
 ListActionsAssociatedProject=Liste des événements associés au projet
diff --git a/htdocs/langs/fr_NC/projects.lang b/htdocs/langs/fr_NC/projects.lang
new file mode 100644
index 00000000000..34553656359
--- /dev/null
+++ b/htdocs/langs/fr_NC/projects.lang
@@ -0,0 +1,197 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Réf. projet
+ProjectRef=Ref projet
+ProjectId=Id projet
+ProjectLabel=Libellé projet
+Project=Projet
+Projects=Projets
+ProjectsArea=Espace projets
+ProjectStatus=Statut projet
+SharedProject=Tout le monde
+PrivateProject=Contacts projet
+MyProjectsDesc=Cette vue projet est restreinte aux projets pour lesquels vous êtes un contact affecté (quel qu'en soit le type).
+ProjectsPublicDesc=Cette vue présente tous les projets pour lesquels vous êtes habilité à avoir une visibilité.
+TasksOnProjectsPublicDesc=Cette vue affiche toutes les tâches de projets selon vos permissions utilisateur
+ProjectsPublicTaskDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
+ProjectsDesc=Cette vue présente tous les projets (vos habilitations vous offrant une vue exhaustive).
+TasksOnProjectsDesc=Cette vue présente toutes les tâches sur tous les projets (vos permissions d'utilisateur vous accordent la permission de voir tout).
+MyTasksDesc=Cette vue est restreinte aux projets et tâches pour lesquels vous êtes un contact affecté à au moins une tâche (quel qu'en soit le type).
+OnlyOpenedProject=Seuls les projets ouverts sont visibles (les projets à l'état brouillon ou fermé ne sont pas visibles).
+ClosedProjectsAreHidden=Les projets fermés ne sont pas visible.
+TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
+TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vous offrant une vue exhaustive).
+AllTaskVisibleButEditIfYouAreAssigned=Toutes les tâches d'un tel projet sont visibles mais il n'est possible de saisir du temps passé que sur celles qui vous sont assignées.\nAssignez vous la tache pour pouvoir saisir un temps passé.
+OnlyYourTaskAreVisible=Seules les tâches qui vous sont assignées sont visibles. Assignez vous une tâche pour la voir et saisir du temps passé
+ImportDatasetTasks=Tâches des projets
+NewProject=Nouveau projet
+AddProject=Créer projet
+DeleteAProject=Supprimer un projet
+DeleteATask=Supprimer une tâche
+ConfirmDeleteAProject=Êtes-vous sûr de vouloir supprimer ce projet ?
+ConfirmDeleteATask=Êtes-vous sûr de vouloir supprimer cette tâche ?
+OpenedProjects=Projets ouverts
+OpenedTasks=Tâches ouvertes
+OpportunitiesStatusForOpenedProjects=Montant des opportunités des projets ouverts par statut
+OpportunitiesStatusForProjects=Montant des opportunités des projets par statut
+ShowProject=Afficher projet
+SetProject=Définir projet
+NoProject=Aucun projet défini ou responsable
+NbOfProjects=Nombre de projets
+TimeSpent=Temps consommé
+TimeSpentByYou=Temps consommé par vous
+TimeSpentByUser=Temps consommé par utilisateur
+TimesSpent=Temps consommés
+RefTask=Ref. tâche
+LabelTask=Libellé tâche
+TaskTimeSpent=Temps consommé sur les tâches
+TaskTimeUser=Utilisateur
+TaskTimeNote=Note
+TaskTimeDate=Date
+TasksOnOpenedProject=Tâches sur projets ouverts
+WorkloadNotDefined=Charge de travail non définie
+NewTimeSpent=Nouveau consommé
+MyTimeSpent=Mon consommé
+Tasks=Tâches
+Task=Tâche
+TaskDateStart=Date de début de tâche
+TaskDateEnd=Date de fin de tâche
+TaskDescription=Description de la tâche
+NewTask=Nouvelle tâche
+AddTask=Créer tâche
+AddTimeSpent=Saisir temps consommé
+Activity=Activité
+Activities=Tâches/activités
+MyActivities=Mes tâches/activités
+MyProjects=Mes projets
+MyProjectsArea=Espace Mes projets
+DurationEffective=Durée effective
+ProgressDeclared=Progression déclarée
+ProgressCalculated=Progression calculée
+Time=Temps
+ListOfTasks=Liste de tâches
+GoToListOfTimeConsumed=Aller à la liste des temps consommés
+GoToListOfTasks=Aller à la liste des tâches
+ListProposalsAssociatedProject=Liste des propositions commerciales associées au projet
+ListOrdersAssociatedProject=Liste des commandes clients associées au projet
+ListInvoicesAssociatedProject=Liste des factures clients associées au projet
+ListPredefinedInvoicesAssociatedProject=Liste des modèles de facture client associées au projet
+ListSupplierOrdersAssociatedProject=Liste des commandes fournisseurs associées au projet
+ListSupplierInvoicesAssociatedProject=Liste des factures fournisseurs associées au projet
+ListContractAssociatedProject=Liste des contrats associés au projet
+ListFichinterAssociatedProject=Liste des interventions associées au projet
+ListShippingAssociatedProject=Liste des expéditions associées au projet
+ListExpenseReportsAssociatedProject=Liste des notes de frais associées avec ce projet
+ListDonationsAssociatedProject=Liste des dons associés au projet
+ListActionsAssociatedProject=Liste des événements associés au projet
+ListTaskTimeUserProject=Liste du temps consommé sur les tâches d'un projet
+ActivityOnProjectToday=Activité projet aujourd'hui
+ActivityOnProjectYesterday=Activité projet hier
+ActivityOnProjectThisWeek=Activité sur les projets cette semaine
+ActivityOnProjectThisMonth=Activité sur les projets ce mois
+ActivityOnProjectThisYear=Activité sur les projets cette année
+ChildOfTask=Fille du projet/tâche
+NotOwnerOfProject=Non responsable de ce projet privé
+AffectedTo=Affecté à
+CantRemoveProject=Ce projet ne peut être supprimé car il est référencé par de nombreux objets (factures, commandes ou autre). voir la liste sur l'onglet Reférents.
+ValidateProject=Valider projet
+ConfirmValidateProject=Êtes-vous sûr de vouloir valider ce projet ?
+CloseAProject=Clore projet
+ConfirmCloseAProject=Êtes-vous sûr de vouloir clore ce projet ?
+AlsoCloseAProject=Fermer également le projet (laissez-le ouvert si vous devez suivre la production de tâches dessus)
+ReOpenAProject=Réouvrir projet
+ConfirmReOpenAProject=Êtes-vous sûr de vouloir rouvrir ce projet ?
+ProjectContact=Contacts projet
+ActionsOnProject=Événements sur le projet
+YouAreNotContactOfProject=Vous n'êtes pas contact de ce projet privé
+DeleteATimeSpent=Suppression du temps consommé
+ConfirmDeleteATimeSpent=Êtes-vous sûr de vouloir supprimer ce temps consommé ?
+DoNotShowMyTasksOnly=Voir aussi les tâches qui ne me sont pas affectées
+ShowMyTasksOnly=Ne voir que les tâches qui me sont affectées
+TaskRessourceLinks=Ressources
+ProjectsDedicatedToThisThirdParty=Projets dédiés à ce tiers
+NoTasks=Aucune tâche pour ce projet
+LinkedToAnotherCompany=Liés à autre société
+TaskIsNotAffectedToYou=Tâche qui ne vous sont pas affectées
+ErrorTimeSpentIsEmpty=Le temps consommé n'est pas renseigné
+ThisWillAlsoRemoveTasks=Cette opération détruira également les tâches du projet (<b>%s</b> tâches actuellement) et le suivi des consommés.
+IfNeedToUseOhterObjectKeepEmpty=Si des objets (facture, commande, ...), appartenant à un autre tiers que celui choisi, doivent être liés au projet à créer, laisser vide afin de laisser le projet multi-tiers.
+CloneProject=Cloner le projet
+CloneTasks=Cloner les tâches
+CloneContacts=Cloner les contacts
+CloneNotes=Cloner les notes
+CloneProjectFiles=Cloner les pièces jointes du projet
+CloneTaskFiles=Cloner les pièces jointes des tâche(s) (si tâche(s) cloner)
+CloneMoveDate=Mettre à jour les dates projet/tâches à partir de maintenant
+ConfirmCloneProject=Êtes-vous sûr de vouloir cloner ce projet ?
+ProjectReportDate=Reporter les dates des tâches en fonction de la date de départ.
+ErrorShiftTaskDate=Une erreur s'est produite dans le report des dates des tâches.
+ProjectsAndTasksLines=Projets et tâches
+ProjectCreatedInDolibarr=Projet %s créé
+ProjectModifiedInDolibarr=Projet %s modifié
+TaskCreatedInDolibarr=Tâche %s créée
+TaskModifiedInDolibarr=Tâche %s modifiée
+TaskDeletedInDolibarr=Tâche %s supprimée
+OpportunityStatus=Statut opportunité
+OpportunityStatusShort=Status opp.
+OpportunityProbability=Probabilité d'opportunité
+OpportunityProbabilityShort=Prob. opp.
+OpportunityAmount=Montant opportunité
+OpportunityAmountShort=Montant Opp.
+OpportunityAmountAverageShort=montant moyen des opportunités
+OpportunityAmountWeigthedShort=Montant pondéré des opportunités
+WonLostExcluded=hors opportunités remportées/perdues
+##### Types de contacts #####
+TypeContact_project_internal_PROJECTLEADER=Chef de projet
+TypeContact_project_external_PROJECTLEADER=Chef de projet
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributeur
+TypeContact_project_external_PROJECTCONTRIBUTOR=Contributeur
+TypeContact_project_task_internal_TASKEXECUTIVE=Responsable
+TypeContact_project_task_external_TASKEXECUTIVE=Responsable
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributeur
+TypeContact_project_task_external_TASKCONTRIBUTOR=Contributeur
+SelectElement=Séléctionnez l'élément
+AddElement=Associer l'élément
+# Documents models
+DocumentModelBeluga=Modèle de document de rapport pour l'aperçu projet
+DocumentModelBaleine=Modèles de document de rapport de tâches de projets
+PlannedWorkload=Charge de travail prévue
+PlannedWorkloadShort=Charge de travail
+ProjectReferers=Objets associés
+ProjectMustBeValidatedFirst=Le projet doit être validé d'abord
+FirstAddRessourceToAllocateTime=Affecter un utilisateur pour saisir des temps
+InputPerDay=Saisie par jour
+InputPerWeek=Saisie par semaine
+InputPerAction=Saisie par action
+TimeAlreadyRecorded=Temps consommé déjà enregistré pour cette tâche/jour et utilisateur %s
+ProjectsWithThisUserAsContact=Projets avec cet utilisateur comme contact
+TasksWithThisUserAsContact=Tâches assignées à cet utilisateur
+ResourceNotAssignedToProject=Non assigné à un projet
+ResourceNotAssignedToTheTask=Non assigné à la tache
+AssignTaskToMe=M'assigner la tâche
+AssignTask=Assigner
+ProjectOverview=Vue d'ensemble
+ManageTasks=Utiliser les projets pour suivre les tâches
+ManageOpportunitiesStatus=Utiliser les projets pour suivre les affaires / opportunités
+ProjectNbProjectByMonth=Nb de projets créés par mois
+ProjectOppAmountOfProjectsByMonth=Montant des opportunités par mois
+ProjectWeightedOppAmountOfProjectsByMonth=Montant pondéré des opportunités par mois
+ProjectOpenedProjectByOppStatus=Opportunités/affaires ouvertes par statut
+ProjectsStatistics=Statistics sur les projets
+TaskAssignedToEnterTime=Tâche assignée. La saisie de temps sur cette tâche devrait être possible.
+IdTaskTime=Id ligne de temps
+YouCanCompleteRef=SI vous souhaitez compléter la référence avec d'autres informations filtrables, il est recommandé d'ajouter le caractère - entre les données. La numérotation automatique sera alors fonctionnelle pour le prochain compteur. Par exemple %s-ABC. Il est également possible d'ajouter des mots-clés dans le libellé. Il est cependant recommandé d'utiliser un attribut supplémentaire ou extrafield.
+OpenedProjectsByThirdparties=Projets ouverts par tiers
+OnlyOpportunitiesShort=Opportunités uniquement
+OpenedOpportunitiesShort=Opportunités ouvertes
+NotAnOpportunityShort=Non une opportunité
+OpportunityTotalAmount=Montant total des opportunités
+OpportunityPonderatedAmount=Montant pondéré des opportunités
+OpportunityPonderatedAmountDesc=Montant des opportunités pondéré par la probabilité
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposition
+OppStatusNEGO=Négociation
+OppStatusPENDING=En attente
+OppStatusWON=Gagné
+OppStatusLOST=Perdu
+Budget=Budget
diff --git a/htdocs/langs/fr_NC/sendings.lang b/htdocs/langs/fr_NC/sendings.lang
new file mode 100644
index 00000000000..5c3974dc11c
--- /dev/null
+++ b/htdocs/langs/fr_NC/sendings.lang
@@ -0,0 +1,71 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Réf. expédition
+Sending=Expédition
+Sendings=Expéditions
+AllSendings=Toutes les expéditions
+Shipment=Expédition
+Shipments=Expéditions
+ShowSending=Afficher Expéditions
+Receivings=Bons de réceptions
+SendingsArea=Espace expéditions
+ListOfSendings=Liste des expéditions
+SendingMethod=Méthode d'expédition
+LastSendings=Les %s dernières expéditions
+StatisticsOfSendings=Statistiques des expéditions
+NbOfSendings=Nombre d'expéditions
+NumberOfShipmentsByMonth=Nombre d'expéditions par mois
+SendingCard=Fiche expédition
+NewSending=Nouvelle expédition
+CreateShipment=Créer expédition
+QtyShipped=Qté. expédiée
+QtyPreparedOrShipped=Quantité préparée ou envoyée
+QtyToShip=Qté. à expédier
+QtyReceived=Qté. reçue
+QtyInOtherShipments=Qté dans les autres expéditions
+KeepToShip=Reste à expédier
+OtherSendingsForSameOrder=Autres expéditions pour cette commande
+SendingsAndReceivingForSameOrder=Expéditions et réceptions pour cette commande
+SendingsToValidate=Expéditions à valider
+StatusSendingCanceled=Annulée
+StatusSendingDraft=Brouillon
+StatusSendingValidated=Validée (produits à envoyer ou envoyés)
+StatusSendingProcessed=Traitée
+StatusSendingDraftShort=Brouillon
+StatusSendingValidatedShort=Validée
+StatusSendingProcessedShort=Traitée
+SendingSheet=Fiche expédition
+ConfirmDeleteSending=Êtes-vous sûr de vouloir supprimer cette expédition ?
+ConfirmValidateSending=Êtes-vous sûr de vouloir valider cette expédition sous la référence <b>%s</b>?
+ConfirmCancelSending=Êtes-vous sûr de vouloir annuler cette expédition ?
+DocumentModelSimple=Modèle simple
+DocumentModelMerou=Modèle Merou A5
+WarningNoQtyLeftToSend=Alerte, aucun produit en attente d'expédition.
+StatsOnShipmentsOnlyValidated=Statistiques effectuées sur les expéditions validées uniquement. La date prise en compte est la date de validation (la date de prévision de livraison n'étant pas toujours renseignée).
+DateDeliveryPlanned=Date prévue de livraison
+RefDeliveryReceipt=Ref bon de réception
+StatusReceipt=Status du bon de réception
+DateReceived=Date de réception réelle
+SendShippingByEMail=Envoyer bon d'expédition par email
+SendShippingRef=Envoi du bordereau d'expédition %s
+ActionsOnShipping=Événements sur l'expédition
+LinkToTrackYourPackage=Lien pour le suivi de votre colis
+ShipmentCreationIsDoneFromOrder=Pour le moment, la création d'une nouvelle expédition se fait depuis la fiche commande.
+ShipmentLine=Ligne d'expédition
+ProductQtyInCustomersOrdersRunning=Quantité de produit en commandes client ouvertes
+ProductQtyInSuppliersOrdersRunning=Quantité de produit en commandes fournisseur ouvertes
+ProductQtyInShipmentAlreadySent=Quantité du produit parmi les commandes clients déjà envoyées
+ProductQtyInSuppliersShipmentAlreadyRecevied=Quantité de produit déjà reçu en commandes fournisseur ouvertes
+NoProductToShipFoundIntoStock=Aucun produit à expédier n'a été trouver dans l'entrepôt <b>%s</b>. Corrigez l'inventaire ou retourner choisir un autre entrepôt.
+WeightVolShort=Poids/vol.
+ValidateOrderFirstBeforeShipment=Vous devez d'abord valider la commande pour pouvoir créer une expédition.
+
+# Sending methods
+# ModelDocument
+DocumentModelTyphon=Modèle de bon de réception/livraison complet (logo…)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER non définie
+SumOfProductVolumes=Somme des volumes des produits
+SumOfProductWeights=Somme des poids des produits
+
+# warehouse details
+DetailWarehouseNumber= Détail de l'entrepôt
+DetailWarehouseFormat= W:%s (Qté : %d)
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index f745c71d761..93e15f2fe77 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -43,6 +43,7 @@ if (! empty($conf->fournisseur->enabled))	require_once DOL_DOCUMENT_ROOT.'/fourn
 if (! empty($conf->fournisseur->enabled))	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 if (! empty($conf->contrat->enabled))		require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 if (! empty($conf->ficheinter->enabled))	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+if (! empty($conf->expedition->enabled))    require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 if (! empty($conf->deplacement->enabled))	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 if (! empty($conf->expensereport->enabled))	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 if (! empty($conf->agenda->enabled))		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
@@ -341,6 +342,17 @@ $listofreferent=array(
     'buttonnew'=>'AddIntervention',
     'testnew'=>$user->rights->ficheinter->creer,
     'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire),
+'shipping'=>array(
+    'name'=>"Shippings",
+	'title'=>"ListShippingAssociatedProject",
+	'class'=>'Expedition',
+	'table'=>'expedition',
+	'datefieldname'=>'date_valid',
+	'urlnew'=>DOL_URL_ROOT.'/expedition/card.php?action=create&origin=project&originid='.$id.'&socid='.$socid,
+	'lang'=>'sendings',
+	'buttonnew'=>'CreateShipment',
+	'testnew'=>0,
+	'test'=>$conf->expedition->enabled && $user->rights->expedition->lire),
 'trip'=>array(
 	'name'=>"TripsAndExpenses",
 	'title'=>"ListExpenseReportsAssociatedProject",

From a2764bc4c2e6dc5de914dd1fb78082dde3b8d380 Mon Sep 17 00:00:00 2001
From: absys <frederick.nguyenxuan@gmail.com>
Date: Fri, 19 May 2017 18:14:42 +1100
Subject: [PATCH 0870/1163] Fix indent.

---
 htdocs/expedition/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 8924577009f..2bf63907d68 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -191,7 +191,7 @@ if (empty($reshook))
 	    $object->note				= GETPOST('note','alpha');
 	    $object->origin				= $origin;
 	    $object->origin_id			= $origin_id;
-        $object->fk_project         = GETPOST('projectid');
+            $object->fk_project         = GETPOST('projectid');
 	    $object->weight				= GETPOST('weight','int')==''?"NULL":GETPOST('weight','int');
 	    $object->sizeH				= GETPOST('sizeH','int')==''?"NULL":GETPOST('sizeH','int');
 	    $object->sizeW				= GETPOST('sizeW','int')==''?"NULL":GETPOST('sizeW','int');

From 2382a0a4ee32b12bf4721a144d34ceddd2761e57 Mon Sep 17 00:00:00 2001
From: KHELIFA <kkhelifa@open-dsi.fr>
Date: Fri, 19 May 2017 10:46:29 +0200
Subject: [PATCH 0871/1163] Core dictionaries: Adds the ability to change the
 color and position of the dictionary 'Types of agenda events'

---
 htdocs/admin/dict.php         | 42 ++++++++++++++++++++++++++---------
 htdocs/langs/en_US/admin.lang |  1 +
 htdocs/langs/fr_FR/admin.lang |  1 +
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 46a8001b02a..2b422074f1b 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -431,7 +431,7 @@ $tabhelp[2]  = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[3]  = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[4]  = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[5]  = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[6]  = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
+$tabhelp[6]  = array('code'=>$langs->trans("EnterAnyCode"), 'color'=>$langs->trans("ColorFormat"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[7]  = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[8]  = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[9]  = array('code'=>$langs->trans("EnterAnyCode"), 'unicode'=>$langs->trans("UnicodeCurrency"));
@@ -581,6 +581,12 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     $listfieldmodify=explode(',',$tabfieldinsert[$id]);
     $listfieldvalue=explode(',',$tabfieldvalue[$id]);
 
+    if (GETPOST('actionmodify') && $tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"],array('system','systemauto'))) {
+        $listfield=explode(',','color,position');
+        $listfieldmodify=explode(',','color,position');
+        $listfieldvalue=explode(',','color,position');
+    }
+
     // Check that all fields are filled
     $ok=1;
     foreach ($listfield as $f => $value)
@@ -619,7 +625,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         }
     }
     // Other checks
-    if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"],array('system','systemauto'))) {
+    if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"],array('system','systemauto'))) {
         $ok=0;
         setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
     }
@@ -1104,7 +1110,7 @@ if ($id)
 
         if (empty($reshook))
         {
-       		fieldList($fieldlist,$obj,$tabname[$id],'add');
+       		fieldList($fieldlist,$langs,$obj,$tabname[$id],'add');
         }
 
         if ($id == 4) print '<td></td>';
@@ -1304,7 +1310,13 @@ if ($id)
                     $error=$hookmanager->error; $errors=$hookmanager->errors;
 
                     // Show fields
-                    if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
+                    if (empty($reshook)) {
+                        $fieldl = $fieldlist;
+                        if ($tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm" && in_array($obj->type, array('system', 'systemauto'))) {
+                            $fieldl=array(array('code'),array('libelle'),array('type'),'color','position');
+                        }
+                        fieldList($fieldl, $langs, $obj, $tabname[$id], 'edit');
+                    }
 
                     print '<td colspan="3" align="center">';
                     print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
@@ -1512,6 +1524,7 @@ if ($id)
                     if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled=0; $canbedisabled = 0; }
                     $canbemodified=$iserasable;
                     if ($obj->code == 'RECEP') $canbemodified=1;
+                    if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm") $canbemodified=1;
 
                     // Url 
                     $rowidcol=$tabrowid[$id];
@@ -1643,15 +1656,16 @@ $db->close();
 /**
  *	Show fields in insert/edit mode
  *
- * 	@param		array	$fieldlist		Array of fields
- * 	@param		Object	$obj			If we show a particular record, obj is filled with record fields
- *  @param		string	$tabname		Name of SQL table
- *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
+ * 	@param		array		$fieldlist		Array of fields
+ * 	@param		Translate	$langs			Translate class
+ * 	@param		Object		$obj			If we show a particular record, obj is filled with record fields
+ *  @param		string		$tabname		Name of SQL table
+ *  @param		string		$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *	@return		void
  */
-function fieldList($fieldlist, $obj='', $tabname='', $context='')
+function fieldList($fieldlist, $langs, $obj='', $tabname='', $context='')
 {
-	global $conf,$langs,$db;
+	global $conf,$db;
 	global $form;
 	global $region_id;
 	global $elementList,$sourceList,$localtax_typeList;
@@ -1809,6 +1823,14 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			}
 			print '</td>';
 		}
+        elseif (is_array($fieldlist[$field]))
+        {
+            $hidden = (! empty($obj->{$fieldlist[$field][0]})?$obj->{$fieldlist[$field][0]}:'');
+            print '<td>';
+            print '<input type="hidden" name="'.$fieldlist[$field][0].'" value="'.$hidden.'">';
+            print $langs->trans($hidden);
+            print '</td>';
+        }
 		else
 		{
 			$classtd=''; $class='';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1c9ac65e4b8..070b58d40c2 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1632,6 +1632,7 @@ MinimumNoticePeriod=Minimum notice period (Your leave request must be done befor
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+ColorFormat=The RGB color is in HEX format, eg: FF0000
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index bd3d6405843..4eac426571d 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1600,6 +1600,7 @@ MinimumNoticePeriod=Période de préavis minimum (Votre demande de congé doit 
 NbAddedAutomatically=Nombre de jours ajoutés aux compteurs des utilisateurs (automatiquement) chaque mois
 EnterAnyCode=Ce champ contient une référence pour identifier le champ. Entrez une valeur de votre choix, mais sans caractères spéciaux.
 UnicodeCurrency=Saisissez ici entre accolades, la liste du numéro des octets qui représentent le symbole de la monnaie. Pour exemple: pour $, entrez [36] - pour le Real Brésilien R$ [82,36] - pour l'euro €, entrez [8364]
+ColorFormat=La couleur RVB est au format HEX, ex: FF0000
 PositionIntoComboList=Position de la ligne dans des listes déroulantes
 SellTaxRate=Taux de TVA
 RecuperableOnly=Oui pour une TVA "Perçue Non Récupérable" dédiée à certains pays comme la France. Gardez la valeur à "Non" dans tous les autres cas.

From aec4cef5de4f8e4cc3b63d4f112bed5f66f8f42e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 12:58:38 +0200
Subject: [PATCH 0872/1163] Clean some code for type of event deprecated since
 3.3

---
 htdocs/admin/mails.php                        |    4 +-
 htdocs/comm/propal/card.php                   |    2 +-
 htdocs/commande/card.php                      |    1 -
 htdocs/compta/facture/card.php                |    1 -
 htdocs/contrat/card.php                       |    1 -
 htdocs/core/actions_massactions.inc.php       |    8 +-
 htdocs/core/actions_sendmails.inc.php         |   43 +-
 htdocs/core/class/html.formmail.class.php     |    2 +-
 htdocs/core/lib/usergroups.lib.php            |    2 +-
 ...terface_50_modAgenda_ActionsAuto.class.php |   58 +-
 htdocs/expedition/card.php                    |    1 -
 htdocs/fichinter/card.php                     |    2 -
 htdocs/fourn/commande/card.php                |    1 -
 htdocs/fourn/facture/card.php                 |    1 -
 .../install/mysql/data/llx_c_actioncomm.sql   |   12 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |    3 +-
 htdocs/langs/en_US/main.lang                  |    1 +
 htdocs/societe/card.php                       |    1 -
 htdocs/supplier_proposal/card.php             |    1 -
 htdocs/theme/eldy/style.css.php               |    1 +
 htdocs/theme/md/style.css.php                 |    3 +-
 htdocs/user/card.php                          | 1174 +++++++++--------
 22 files changed, 638 insertions(+), 685 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 219cd85c2fe..03cce1dff09 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -86,8 +86,8 @@ if ($action == 'update' && empty($_POST["cancel"]))
 
 // Actions to send emails
 $id=0;
-$actiontypecode='';
-$trigger_name='';
+$actiontypecode='';     // Not an event for agenda
+$trigger_name='';       // Disable triggers
 $paramname='id';
 $mode='emailfortest';
 $trackid=(($action == 'testhtml')?"testhtml":"test");
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 0ee995e4784..df86464281a 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -644,7 +644,7 @@ if (empty($reshook))
 	 */
 
 	// Actions to send emails
-	$actiontypecode='AC_PROP';
+    $actiontypecode='AC_OTH_AUTO';
 	$trigger_name='PROPAL_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromproposal';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 07f25b40ed8..fe91f0b6ff8 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1259,7 +1259,6 @@ if (empty($reshook))
 
 
 	// Actions to send emails
-	$actiontypecode='AC_COM';
 	$trigger_name='ORDER_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromorder';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 02b67c814ef..4835b53b277 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1911,7 +1911,6 @@ if (empty($reshook))
 
 	// Actions to send emails
 	if (empty($id)) $id=$facid;
-	$actiontypecode='AC_FAC';
 	$trigger_name='BILL_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfrominvoice';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 0e0f8c84090..f00816e9d4b 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -953,7 +953,6 @@ if (empty($reshook))
 	 */
 
 	// Actions to send emails
-	$actiontypecode='AC_CONT';
 	$trigger_name='CONTRACT_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromcontract';
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 58e47a29ec8..92d1011b923 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -274,12 +274,12 @@ if (! $error && $massaction == 'confirm_presend')
                         // Insert logs into agenda
                         foreach($listofqualifiedinvoice as $invid => $object)
                         {
-                            if ($objectclass == 'Propale') $actiontypecode='AC_PROP';
+                            /*if ($objectclass == 'Propale') $actiontypecode='AC_PROP';
                             if ($objectclass == 'Commande') $actiontypecode='AC_COM';
                             if ($objectclass == 'Facture') $actiontypecode='AC_FAC';
                             if ($objectclass == 'Supplier_Proposal') $actiontypecode='AC_SUP_PRO';
                             if ($objectclass == 'CommandeFournisseur') $actiontypecode='AC_SUP_ORD';
-                            if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';
+                            if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';*/
                             
                             $actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
                             if ($message)
@@ -289,10 +289,10 @@ if (! $error && $massaction == 'confirm_presend')
                                 $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
                                 $actionmsg = dol_concatdesc($actionmsg, $message);
                             }
-
+                            $actionmsg2='';
+                            
                             // Initialisation donnees
                             $object->sendtoid		= 0;
-                            $object->actiontypecode	= $actiontypecode;
                             $object->actionmsg		= $actionmsg;  // Long text
                             $object->actionmsg2		= $actionmsg2; // Short text
                             $object->fk_element		= $invid;
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index cf50d05d6bf..dded23e6cbf 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -23,11 +23,11 @@
 
 // $mysoc must be defined
 // $id must be defined
-// $actiontypecode must be defined
 // $paramname must be defined
 // $mode must be defined
-// $object and $uobject may be defined.
-
+// $trigger_name must be set (can be '')
+// $actiontypecode can be set
+// $object and $uobject may be defined
 
 /*
  * Add file in email form
@@ -155,7 +155,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				}
 			}
 		}
-		else dol_print_error('','Use actions_sendmails.in.php for a type that is not supported');
+		else dol_print_error('','Use actions_sendmails.in.php for an element/object that is not supported');
 	}
 	else $thirdparty = $mysoc;
 
@@ -347,7 +347,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				{
 					$error=0;
 
-					// FIXME This must be moved into a trigger for action $trigger_name
+					// FIXME This must be moved into the trigger for action $trigger_name
 					if (! empty($conf->dolimail->enabled))
 					{
 						$mid = (GETPOST('mid','int') ? GETPOST('mid','int') : 0);	// Original mail id is set ?
@@ -370,21 +370,26 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					// Initialisation of datas
 					if (is_object($object))
 					{
-						$object->socid			= $sendtosocid;	// To link to a company
-						$object->sendtoid		= $sendtoid;	// To link to contacts/addresses. This is an array.
-						$object->actiontypecode	= $actiontypecode;
-						$object->actionmsg		= $actionmsg;  // Long text
-						$object->actionmsg2		= $actionmsg2; // Short text
+					    if (empty($actiontypecode)) $actiontypecode='AC_OTH_AUTO'; // Event insert into agenda automatically
+					    
+						$object->socid			= $sendtosocid;	   // To link to a company
+						$object->sendtoid		= $sendtoid;	   // To link to contacts/addresses. This is an array.
+						$object->actiontypecode	= $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+						$object->actionmsg		= $actionmsg;      // Long text
+						$object->actionmsg2		= $actionmsg2;     // Short text
 						$object->trackid        = $trackid;
 						$object->fk_element		= $object->id;
 						$object->elementtype	= $object->element;
 
 						// Call of triggers
-						include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-						$interface=new Interfaces($db);
-						$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
-						if ($result < 0) {
-							$error++; $errors=$interface->errors;
+						if (! empty($trigger_name))
+						{
+    						include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    						$interface=new Interfaces($db);
+    						$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
+    						if ($result < 0) {
+    							$error++; $errors=$interface->errors;
+    						}
 						}
 					}
 						
@@ -398,8 +403,12 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 						// This avoid sending mail twice if going out and then back to page
 						$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
 						setEventMessages($mesg, null, 'mesgs');
-						if ($conf->dolimail->enabled) header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.$object->id.'&'.($paramname2?$paramname2:'mid').'='.$parm2val);
-						else header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.$object->id);
+						if ($conf->dolimail->enabled) 
+						{
+						    header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').'&'.($paramname2?$paramname2:'mid').'='.$parm2val);
+						    exit;
+						}
+						header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:''));
 						exit;
 					}
 				}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 020382095a3..3641ac87cef 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -297,7 +297,7 @@ class FormMail extends Form
         	$arraydefaultmessage=$this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id);
 			//var_dump($arraydefaultmessage);
 
-        	$out.= "\n<!-- Begin form mail -->\n";
+        	$out.= "\n".'<!-- Begin form mail --><div id="mailformdiv"></div>'."\n";
         	if ($this->withform == 1)
         	{
         		$out.= '<form method="POST" name="mailform" id="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'#formmail">'."\n";
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 2cea718dcc0..f48974acb02 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -145,7 +145,7 @@ function user_prepare_head($object)
     {
 		// Bank
     	$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("BankAccounts");
+    	$head[$h][1] = $langs->trans("HR");
     	$head[$h][2] = 'bank';
     	$h++;
 	}
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 9da1ada59ad..1160fb2625d 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -76,6 +76,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 		$langs->load("agenda");
 
+		if (empty($object->actiontypecode)) $object->actiontypecode='AC_OTH_AUTO';
+
 		// Actions
 		if ($action == 'COMPANY_CREATE')
         {
@@ -83,7 +85,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("companies");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
             $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
             if (! empty($object->prefix)) $object->actionmsg.=" (".$object->prefix.")";
@@ -97,7 +98,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-            if (empty($object->actiontypecode)) $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
 
             // Parameters $object->sendtoid defined by caller
@@ -109,7 +109,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("contracts");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -121,7 +120,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("propal");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -133,7 +131,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("propal");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -149,7 +146,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("propal");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
 
@@ -161,7 +157,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("propal");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
 
@@ -173,7 +168,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("propal");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
 
@@ -184,7 +178,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("agenda");
             $langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -196,7 +189,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
 
@@ -208,7 +200,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
 
@@ -220,7 +211,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
 
@@ -232,7 +222,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -248,7 +237,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -260,7 +248,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
 
@@ -272,7 +259,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -289,7 +275,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("bills");
 
             // Values for this action can't be defined by caller.
-			$object->actiontypecode='AC_OTH_AUTO';
             $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
 
@@ -301,7 +286,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
 
@@ -313,7 +297,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("interventions");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
 
@@ -327,7 +310,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("interventions");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -341,7 +323,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("interventions");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
 
@@ -355,7 +336,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("interventions");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
 
@@ -368,7 +348,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("interventions");
 
-            $object->actiontypecode='AC_OTH_AUTO';
            	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
            	$object->actionmsg=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
 
@@ -380,7 +359,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("interventions");
 
-            $object->actiontypecode='AC_OTH_AUTO';
            	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
            	$object->actionmsg=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
 
@@ -392,7 +370,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("interventions");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
 
@@ -406,7 +383,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("sendings");
 
-        	$object->actiontypecode='AC_OTH_AUTO';
         	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
         	if (empty($object->actionmsg))
         	{
@@ -422,7 +398,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("sendings");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -438,7 +413,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -450,7 +424,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -462,7 +435,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		    $langs->load("other");
 			$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
 
@@ -474,7 +446,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		    $langs->load("other");
 			$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
 
@@ -486,7 +457,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -498,7 +468,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("orders");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -511,7 +480,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("bills");
             $langs->load("orders");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -528,7 +496,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("bills");
             $langs->load("orders");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderClassifiedBilled",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -543,7 +510,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
@@ -555,7 +521,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
 
@@ -568,7 +533,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("bills");
             $langs->load("orders");
 
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierInvoiceSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -584,7 +548,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
 
@@ -596,7 +559,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("bills");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
 
@@ -610,7 +572,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("members");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("MemberValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
@@ -624,7 +585,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("members");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberModifiedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("MemberModifiedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
@@ -638,7 +598,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("members");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
@@ -654,7 +613,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("members");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberResiliatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("MemberResiliatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
@@ -668,7 +626,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("members");
 
-			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberDeletedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("MemberDeletedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
@@ -684,7 +641,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
         	$langs->load("projects");
 
-        	$object->actiontypecode='AC_OTH_AUTO';
         	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
         	$object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
         	$object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
@@ -696,8 +652,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("projects");
         
-            $object->actiontypecode='AC_OTH_AUTO';
-        
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
@@ -709,7 +663,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("other");
             $langs->load("projects");
         
-            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectModifiedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("ProjectModifieddInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
@@ -723,8 +676,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		    $langs->load("other");
 			$langs->load("projects");
 
-			$object->actiontypecode='AC_OTH_AUTO';
-
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
@@ -737,7 +688,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		    $langs->load("other");
 			$langs->load("projects");
 
-			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskModifiedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("TaskModifieddInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
@@ -750,7 +700,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		    $langs->load("other");
 			$langs->load("projects");
 
-			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
 			$object->actionmsg=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
@@ -763,7 +712,6 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		    $langs->load("agenda");
 		    $langs->load("other");
 		    
-		    $object->actiontypecode='AC_OTH_AUTO';
 		    if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities($action."InDolibarr",$object->ref);
 		    $object->actionmsg=$langs->transnoentities($action."InDolibarr",$object->ref);
 		    
@@ -805,7 +753,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		// Insertion action
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 		$actioncomm = new ActionComm($this->db);
-		$actioncomm->type_code   = $object->actiontypecode;		// code of parent table llx_c_actioncomm (will be deprecated)
+		$actioncomm->type_code   = $object->actiontypecode;		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
 		$actioncomm->code        = 'AC_'.$action;
 		$actioncomm->label       = $object->actionmsg2;
 		$actioncomm->note        = $object->actionmsg;          // TODO Replace with $actioncomm->email_msgid ? $object->email_content : $object->actionmsg
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index a0280ce9e39..fdd477cc63d 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -595,7 +595,6 @@ if (empty($reshook))
 
 	// Actions to send emails
 	if (empty($id)) $id=$facid;
-	$actiontypecode='AC_SHIP';
 	$trigger_name='SHIPPING_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromshipment';
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 91e094c1a50..51cd5a62d3f 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -719,8 +719,6 @@ if (empty($reshook))
 	 */
 
 	// Actions to send emails
-	$actiontypecode='AC_OTH_AUTO';
-	$trigger_name='FICHINTER_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromintervention';
 	$trackid='int'.$object->id;
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 378fab9f50c..a6f0cc248f1 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1154,7 +1154,6 @@ if (empty($reshook))
 	 */
 
 	// Actions to send emails
-	$actiontypecode='AC_SUP_ORD';
 	$trigger_name='ORDER_SUPPLIER_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromsupplierorder';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index bda155efe88..04e6ea98481 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1188,7 +1188,6 @@ if (empty($reshook))
 	 */
 
 	// Actions to send emails
-	$actiontypecode='AC_SUP_INV';
 	$trigger_name='BILL_SUPPLIER_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromsupplierinvoice';
diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql
index 2b84ee6ff82..6b89ed74dd2 100644
--- a/htdocs/install/mysql/data/llx_c_actioncomm.sql
+++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql
@@ -38,12 +38,12 @@ insert into llx_c_actioncomm (id, code, type, libelle, module, active, position)
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 5,'AC_RDV','system','Rendez-vous',NULL, 1, 1);
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values (11,'AC_INT','system','Intervention on site',NULL, 1, 4);
 -- Code kept for backward compatibility < 3.3 
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 3,'AC_PROP','systemauto', 'Send commercial proposal by email','propal',0,10);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 8,'AC_COM','systemauto','Send customer order by email','order', 0,8);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 9,'AC_FAC','systemauto', 'Send customer invoice by email','invoice',0,6);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 10,'AC_SHIP','systemauto', 'Send shipping by email','shipping',0,11);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 30,'AC_SUP_ORD','systemauto','Send supplier order by email','order_supplier',0,9);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 31,'AC_SUP_INV','systemauto','Send supplier invoice by email','invoice_supplier',0,7);
+--insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 3,'AC_PROP','systemauto', 'Send commercial proposal by email','propal',0,10);
+--insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 8,'AC_COM','systemauto','Send customer order by email','order', 0,8);
+--insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 9,'AC_FAC','systemauto', 'Send customer invoice by email','invoice',0,6);
+--insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 10,'AC_SHIP','systemauto', 'Send shipping by email','shipping',0,11);
+--insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 30,'AC_SUP_ORD','systemauto','Send supplier order by email','order_supplier',0,9);
+--insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 31,'AC_SUP_INV','systemauto','Send supplier invoice by email','invoice_supplier',0,7);
 -- Code used from 3.3+ when type of event is not used
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 40,'AC_OTH_AUTO','systemauto','Other (automatically inserted events)',NULL, 1, 20);
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 50,'AC_OTH','system','Other (manually inserted events)',NULL, 1, 5);
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 6ba7707b249..725eca55daa 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -296,7 +296,6 @@ ALTER TABLE llx_events MODIFY COLUMN ip varchar(250);
 
 ALTER TABLE llx_facture ADD COLUMN fk_fac_rec_source integer;
 
-
-
+DELETE from llx_c_actioncomm where code in ('AC_PROP','AC_COM','AC_FAC','AC_SHIP','AC_SUP_ORD','AC_SUP_INV') AND id NOT IN (SELECT DISTINCT fk_action FROM llx_actioncomm);
 
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 79927cc888c..a5f2ddf1e7e 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -771,6 +771,7 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+HR=HR
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 5a53a2c6ed2..14e8e4b4679 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -750,7 +750,6 @@ if (empty($reshook))
 
     // Actions to send emails
     $id=$socid;
-    $actiontypecode='AC_OTH_AUTO';
     $trigger_name='COMPANY_SENTBYMAIL';
     $paramname='socid';
     $mode='emailfromthirdparty';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index d36b471a721..86c350ecc22 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -466,7 +466,6 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
-	$actiontypecode='AC_ASKPRICE';
 	$trigger_name='SUPPLIER_PROPOSAL_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromsupplierproposal';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 66f880da786..4ae7d400a09 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1101,6 +1101,7 @@ div.nopadding {
 	padding-top: 1px;
 	padding-bottom: 1px;
 	width: 44px;
+	text-align:center;
 }
 div.attacharea {
 	padding-top: 18px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 04732ef0305..2beef147c02 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1145,6 +1145,7 @@ img.hideonsmartphone.pictoactionview {
 	padding-top: 1px;
 	padding-bottom: 1px;
 	width: 44px;
+	text-align:center;
 }
 div.attacharea {
 	padding-top: 18px;
@@ -3054,7 +3055,7 @@ div.info {
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
-  background: #EaE4Ea;
+  background: #868;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
 
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index d98ef682e90..9249e8f295e 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -593,7 +593,6 @@ if (empty($reshook)) {
     }
 		
     // Actions to send emails
-    $actiontypecode='AC_OTH_AUTO';
     $trigger_name='USER_SENTBYMAIL';
     $paramname='id';    // Name of param key to open the card
     $mode='emailfromuser';
@@ -1005,14 +1004,6 @@ if (($action == 'create') || ($action == 'adduserldap'))
     }
     print '</td></tr>';
 
-    // Signature
-    print '<tr><td class="tdtop">'.$langs->trans("Signature").'</td>';
-    print '<td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor('signature',GETPOST('signature'),'',138,'dolibarr_mailings','In',true,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
-    print $doleditor->Create(1);
-    print '</td></tr>';
-
     // Multicompany
     if (! empty($conf->multicompany->enabled))
     {
@@ -1028,6 +1019,15 @@ if (($action == 'create') || ($action == 'adduserldap'))
         }
     }
 
+    // Accountancy code
+    if ($conf->accounting->enabled)
+    {
+        print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
+        print '<td>';
+        print '<input size="30" type="text" name="accountancy_code" value="'.GETPOST('accountancy_code').'">';
+        print '</td></tr>';
+    }
+    
     // Hierarchy
     print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
     print '<td>';
@@ -1035,7 +1035,8 @@ if (($action == 'create') || ($action == 'adduserldap'))
     print '</td>';
     print "</tr>\n";
 
-	if ($conf->salaries->enabled && ! empty($user->rights->salaries->read))
+    if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+       || (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read)))
 	{
 		$langs->load("salaries");
 
@@ -1081,15 +1082,6 @@ if (($action == 'create') || ($action == 'adduserldap'))
 	print '</td>';
     print "</tr>\n";
 
-	// Accountancy code
-	if ($conf->accounting->enabled)
-	{
-		print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
-		print '<td>';
-		print '<input size="30" type="text" name="accountancy_code" value="'.GETPOST('accountancy_code').'">';
-		print '</td></tr>';
-	}
-
 	// User color
 	if (! empty($conf->agenda->enabled))
 	{
@@ -1108,6 +1100,14 @@ if (($action == 'create') || ($action == 'adduserldap'))
 			null, '90%' );
 		print "</td></tr>";
 	}
+
+    // Other attributes
+    $parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    if (empty($reshook) && ! empty($extrafields->attribute_label))
+    {
+    	print $object->showOptionals($extrafields,'edit');
+    }
 	
     // Note
     print '<tr><td class="tdtop">';
@@ -1118,15 +1118,15 @@ if (($action == 'create') || ($action == 'adduserldap'))
     $doleditor->Create();
     print "</td></tr>\n";
 
-    // Other attributes
-    $parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-    if (empty($reshook) && ! empty($extrafields->attribute_label))
-    {
-    	print $object->showOptionals($extrafields,'edit');
-    }
-
- 	print "</table>\n";
+    // Signature
+    print '<tr><td class="tdtop">'.$langs->trans("Signature").'</td>';
+    print '<td>';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor('signature',GETPOST('signature'),'',138,'dolibarr_mailings','In',true,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
+    print $doleditor->Create(1);
+    print '</td></tr>';
+    
+    print "</table>\n";
 
  	dol_fiche_end();
 
@@ -1379,11 +1379,15 @@ else
             	print '</td></tr>'."\n";
             }
 
-            // Signature
-            print '<tr><td class="tdtop">'.$langs->trans('Signature').'</td><td>';
-            print dol_htmlentitiesbr($object->signature);
-            print "</td></tr>\n";
-
+            // Accountancy code
+            if ($conf->accounting->enabled)
+            {
+                print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
+                print '<td>'.$object->accountancy_code.'</td></tr>';
+            }
+            
+            // TODO Move this into RH Tab (visible if RH module on)
+            
             // Hierarchy
             print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
             print '<td>';
@@ -1396,7 +1400,8 @@ else
             print '</td>';
             print "</tr>\n";
 
-            if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+            if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+                || (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read)))
             {
             	$langs->load("salaries");
 
@@ -1435,13 +1440,6 @@ else
 		    print '</td>';
 		    print "</tr>\n";
 
-			// Accountancy code
-			if ($conf->accounting->enabled)
-			{
-				print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
-				print '<td>'.$object->accountancy_code.'</td>';
-			}
-
 		    // Date employment
 		    print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
 		    print '<td>';
@@ -1449,7 +1447,7 @@ else
 		    print '</td>';
 		    print "</tr>\n";
 
-			print '</table>';
+		    print '</table>';
 
 	        print '</div>';
 	        print '<div class="fichehalfright"><div class="ficheaddleft">';
@@ -1567,7 +1565,12 @@ else
                 print '</tr>'."\n";
             }
 
-			print "</table>\n";
+            // Signature
+            print '<tr><td class="tdtop">'.$langs->trans('Signature').'</td><td>';
+            print dol_htmlentitiesbr($object->signature);
+            print "</td></tr>\n";
+
+            print "</table>\n";
 			print '</div>';
 
         	print '</div></div>';
@@ -1772,586 +1775,574 @@ else
     
                 dol_fiche_end();
             }
-        }
 
-        if (GETPOST('action','aZ09') != 'presend' && GETPOST('action','aZ09') != 'send')
-        {
-            /*
-             * List of groups of user
-             */
-
-            if ($canreadgroup)
+            if (GETPOST('action','aZ09') != 'presend' && GETPOST('action','aZ09') != 'send')
             {
-                print load_fiche_titre($langs->trans("ListOfGroupsForUser"),'','');
-
-                // On selectionne les groupes auquel fait parti le user
-                $exclude = array();
-
-                $usergroup=new UserGroup($db);
-                $groupslist = $usergroup->listGroupsForUser($object->id);
-
-                if (! empty($groupslist))
-                {
-                    if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
-                    {
-                        foreach($groupslist as $groupforuser)
-                        {
-                            $exclude[]=$groupforuser->id;
-                        }
-                    }
-                }
-
-                if ($caneditgroup)
-                {
-                    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
-                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
-                    print '<input type="hidden" name="action" value="addgroup" />';
-                }
-                
-                print '<table class="noborder" width="100%">'."\n";
-                print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("Groups").'</th>'."\n";
-                if(! empty($conf->multicompany->enabled) && !empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-                {
-                    print '<td class="liste_titre" width="25%">'.$langs->trans("Entity").'</td>';
-                }
-                print '<th align="right">';
-                if ($caneditgroup)
-                {
-                    print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
-                    print ' &nbsp; ';
-                    // Multicompany
-                    if (! empty($conf->multicompany->enabled))
-                    {
-                        if ($conf->entity == 1 && $conf->multicompany->transverse_mode)
-                        {
-                            print '</td><td>'.$langs->trans("Entity").'</td>';
-                            print "<td>".$mc->select_entities($conf->entity);
-                        }
-                        else
-                        {
-                            print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-                        }
-                    }
-                    else
-                    {
-                    	print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-                    }
-                    print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
-                }
-                print '</th></tr>'."\n";
-
                 /*
-                 * Groups assigned to user
+                 * List of groups of user
                  */
-                if (! empty($groupslist))
+    
+                if ($canreadgroup)
                 {
-                    foreach($groupslist as $group)
+                    print load_fiche_titre($langs->trans("ListOfGroupsForUser"),'','');
+    
+                    // On selectionne les groupes auquel fait parti le user
+                    $exclude = array();
+    
+                    $usergroup=new UserGroup($db);
+                    $groupslist = $usergroup->listGroupsForUser($object->id);
+    
+                    if (! empty($groupslist))
                     {
-                        
-
-                        print '<tr class="oddeven">';
-                        print '<td>';
-                        if ($caneditgroup)
+                        if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
                         {
-                            print '<a href="'.DOL_URL_ROOT.'/user/group/card.php?id='.$group->id.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$group->name.'</a>';
-                        }
-                        else
-                        {
-                            print img_object($langs->trans("ShowGroup"),"group").' '.$group->name;
-                        }
-                        print '</td>';
-                        if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-                        {
-                        	print '<td class="valeur">';
-                        	if (! empty($group->usergroup_entity))
-                        	{
-                        		$nb=0;
-                        		foreach($group->usergroup_entity as $group_entity)
-                        		{
-                        			$mc->getInfo($group_entity);
-                        			print ($nb > 0 ? ', ' : '').$mc->label;
-                        			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'&amp;entity='.$group_entity.'">';
-                        			print img_delete($langs->trans("RemoveFromGroup"));
-                        			print '</a>';
-                        			$nb++;
-                        		}
-                        	}
-                        }
-                        print '<td align="right">';
-                        if ($caneditgroup && empty($conf->multicompany->transverse_mode))
-                        {
-                            print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
-                            print img_delete($langs->trans("RemoveFromGroup"));
-                            print '</a>';
-                        }
-                        else
-                        {
-                            print "&nbsp;";
-                        }
-                        print "</td></tr>\n";
-                    }
-                }
-                else
-                {
-                    print '<tr '.$bc[false].'><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-                }
-
-                print "</table>";
-                
-                if ($caneditgroup)
-                {
-                    print '</form>';
-                }
-                print "<br>";
-            }
-    
-            /*
-             * Fiche en mode edition
-             */
-            if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id)))
-            {
-            	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
-                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                print '<input type="hidden" name="action" value="update">';
-                print '<input type="hidden" name="entity" value="'.$object->entity.'">';
-    
-                dol_fiche_head($head, 'user', $title, 0, 'user');
-    
-                print '<table width="100%" class="border">';
-    
-                // Ref/ID
-    			if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-    			{
-    	            print '<tr><td>'.$langs->trans("Ref").'</td>';
-    	            print '<td>';
-    	            print $object->id;
-    	            print '</td>';
-    	            print '</tr>';
-    			}
-    
-                // Lastname
-                print "<tr>";
-                print '<td class="fieldrequired">'.$langs->trans("Lastname").'</td>';
-                print '<td>';
-                if ($caneditfield && !$object->ldap_sid)
-                {
-                    print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
-                }
-                else
-                {
-                    print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
-                    print $object->lastname;
-                }
-                print '</td>';
-                print '</tr>';
-    
-                // Firstname
-                print "<tr>".'<td>'.$langs->trans("Firstname").'</td>';
-                print '<td>';
-                if ($caneditfield && !$object->ldap_sid)
-                {
-                    print '<input class="minwidth100" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
-                }
-                else
-                {
-                    print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
-                    print $object->firstname;
-                }
-                print '</td></tr>';
-    
-                // Employee
-                print '<tr>';
-                print '<td>'.fieldLabel('Employee','employee',0).'</td><td>';
-                print $form->selectyesno("employee",$object->employee,1);
-                print '</td></tr>';
-    
-                // Position/Job
-                print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
-                print '<td>';
-                if ($caneditfield)
-                {
-                	print '<input size="30" type="text" name="job" value="'.$object->job.'">';
-                }
-                else
-    			{
-                    print '<input type="hidden" name="job" value="'.$object->job.'">';
-              		print $object->job;
-                }
-                print '</td></tr>';
-    
-    		    // Gender
-        		print '<tr><td>'.$langs->trans("Gender").'</td>';
-        		print '<td>';
-        		$arraygender=array('man'=>$langs->trans("Genderman"),'woman'=>$langs->trans("Genderwoman"));
-        		print $form->selectarray('gender', $arraygender, GETPOST('gender')?GETPOST('gender'):$object->gender, 1);
-        		print '</td></tr>';
-    
-                // Login
-                print "<tr>".'<td><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
-                print '<td>';
-                if ($user->admin  && !$object->ldap_sid)
-                {
-                    print '<input size="12" maxlength="24" type="text" class="flat" name="login" value="'.$object->login.'">';
-                }
-                else
-                {
-                    print '<input type="hidden" name="login" value="'.$object->login.'">';
-                    print $object->login;
-                }
-                print '</td>';
-                print '</tr>';
-    
-                // Pass
-                print '<tr><td>'.$langs->trans("Password").'</td>';
-                print '<td>';
-                if ($object->ldap_sid)
-                {
-                    $text=$langs->trans("DomainPassword");
-                }
-                else if ($caneditpassword)
-                {
-                    $text='<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="off">';
-                    if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
-                    {
-                        $text=$form->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
-                    }
-                }
-                else
-                {
-                    $text=preg_replace('/./i','*',$object->pass);
-                }
-                print $text;
-                print "</td></tr>\n";
-    
-                // API key
-                if(! empty($conf->api->enabled) && $user->admin) {
-                    print '<tr><td>'.$langs->trans("ApiKey").'</td>';
-                    print '<td>';
-                    print '<input class="minwidth100" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
-                    if (! empty($conf->use_javascript_ajax))
-                        print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
-                    print '</td></tr>';
-                }
-    
-                // Administrator
-                print '<tr><td>'.$langs->trans("Administrator").'</td>';
-                if ($object->societe_id > 0)
-                {
-                	$langs->load("admin");
-                    print '<td>';
-                    print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
-                    print ' ('.$langs->trans("ExternalUser").')';
-                    print '</td></tr>';
-                }
-                else
-                {
-                    print '<td>';
-                    $nbAdmin = $user->getNbOfUsers('active','',1);
-                    $nbSuperAdmin = $user->getNbOfUsers('active','superadmin',1);
-                    //var_dump($nbAdmin);
-                    //var_dump($nbSuperAdmin);
-                    if ($user->admin								// Need to be admin to allow downgrade of an admin
-                    && ($user->id != $object->id)                   // Don't downgrade ourself
-                    && (
-                    	(empty($conf->multicompany->enabled) && $nbAdmin >= 1)
-                    	|| (! empty($conf->multicompany->enabled) && ($object->entity > 0 || $nbSuperAdmin > 1))    // Don't downgrade a superadmin if alone
-                    	)
-                    )
-                    {
-                        print $form->selectyesno('admin',$object->admin,1);
-    
-                        if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
-                        {
-                            if ($conf->use_javascript_ajax)
+                            foreach($groupslist as $groupforuser)
                             {
-                                print '<script type="text/javascript">
-    									$(function() {
-    										var admin = $("select[name=admin]").val();
-    										if (admin == 0) {
-    											$("input[name=superadmin]")
-    													.prop("disabled", true)
-    													.prop("checked", false);
-    										}
-    										if ($("input[name=superadmin]").is(":checked")) {
-    											$("select[name=entity]")
-    													.prop("disabled", true);
-    										}
-    										$("select[name=admin]").change(function() {
-    											 if ( $(this).val() == 0 ) {
-    											 	$("input[name=superadmin]")
-    													.prop("disabled", true)
-    													.prop("checked", false);
-    											 	$("select[name=entity]")
-    													.prop("disabled", false);
-    											 } else {
-    											 	$("input[name=superadmin]")
-    													.prop("disabled", false);
-    											 }
-    										});
-    										$("input[name=superadmin]").change(function() {
-    											if ( $(this).is(":checked")) {
-    												$("select[name=entity]")
-    													.prop("disabled", true);
-    											} else {
-    												$("select[name=entity]")
-    													.prop("disabled", false);
-    											}
-    										});
-    									});
-    								</script>';
+                                $exclude[]=$groupforuser->id;
                             }
+                        }
+                    }
     
-                            $checked=(($object->admin && ! $object->entity) ? ' checked' : '');
-                            print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
+                    if ($caneditgroup)
+                    {
+                        print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
+                        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+                        print '<input type="hidden" name="action" value="addgroup" />';
+                    }
+                    
+                    print '<table class="noborder" width="100%">'."\n";
+                    print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("Groups").'</th>'."\n";
+                    if(! empty($conf->multicompany->enabled) && !empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                    {
+                        print '<td class="liste_titre" width="25%">'.$langs->trans("Entity").'</td>';
+                    }
+                    print '<th align="right">';
+                    if ($caneditgroup)
+                    {
+                        print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
+                        print ' &nbsp; ';
+                        // Multicompany
+                        if (! empty($conf->multicompany->enabled))
+                        {
+                            if ($conf->entity == 1 && $conf->multicompany->transverse_mode)
+                            {
+                                print '</td><td>'.$langs->trans("Entity").'</td>';
+                                print "<td>".$mc->select_entities($conf->entity);
+                            }
+                            else
+                            {
+                                print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+                            }
+                        }
+                        else
+                        {
+                        	print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+                        }
+                        print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
+                    }
+                    print '</th></tr>'."\n";
+    
+                    /*
+                     * Groups assigned to user
+                     */
+                    if (! empty($groupslist))
+                    {
+                        foreach($groupslist as $group)
+                        {
+                            
+    
+                            print '<tr class="oddeven">';
+                            print '<td>';
+                            if ($caneditgroup)
+                            {
+                                print '<a href="'.DOL_URL_ROOT.'/user/group/card.php?id='.$group->id.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$group->name.'</a>';
+                            }
+                            else
+                            {
+                                print img_object($langs->trans("ShowGroup"),"group").' '.$group->name;
+                            }
+                            print '</td>';
+                            if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                            {
+                            	print '<td class="valeur">';
+                            	if (! empty($group->usergroup_entity))
+                            	{
+                            		$nb=0;
+                            		foreach($group->usergroup_entity as $group_entity)
+                            		{
+                            			$mc->getInfo($group_entity);
+                            			print ($nb > 0 ? ', ' : '').$mc->label;
+                            			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'&amp;entity='.$group_entity.'">';
+                            			print img_delete($langs->trans("RemoveFromGroup"));
+                            			print '</a>';
+                            			$nb++;
+                            		}
+                            	}
+                            }
+                            print '<td align="right">';
+                            if ($caneditgroup && empty($conf->multicompany->transverse_mode))
+                            {
+                                print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
+                                print img_delete($langs->trans("RemoveFromGroup"));
+                                print '</a>';
+                            }
+                            else
+                            {
+                                print "&nbsp;";
+                            }
+                            print "</td></tr>\n";
                         }
                     }
                     else
                     {
-                        $yn = yn($object->admin);
-                        print '<input type="hidden" name="admin" value="'.$object->admin.'">';
-                        print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
-                        if (! empty($conf->multicompany->enabled) && empty($object->entity)) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
-                        else print $yn;
+                        print '<tr '.$bc[false].'><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
                     }
-                    print '</td></tr>';
-                }
     
-               	// Type
-               	print '<tr><td>'.$langs->trans("Type").'</td>';
-               	print '<td>';
-               	if ($user->id == $object->id || ! $user->admin)
-               	{
-    	           	$type=$langs->trans("Internal");
-        	       	if ($object->societe_id) $type=$langs->trans("External");
-            	   	print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
-    	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-               	}
-               	else
-    			{
-    				$type=0;
-    	            if ($object->contact_id) $type=$object->contact_id;
-    	            print $form->selectcontacts(0,$type,'contactid',2,'','',1,'',false,1);
-    	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-                }
-               	print '</td></tr>';
-    
-    			// Address
-                print '<tr><td class="tdtop">'.fieldLabel('Address','address').'</td>';
-    	        print '<td><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
-                print $object->address;
-                print '</textarea></td></tr>';
-    
-                // Zip
-                print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
-                print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
-                print '</td></tr>';
-    
-    			// Town
-    			print '<tr><td>'.fieldLabel('Town','town').'</td><td>';
-                print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
-                print '</td></tr>';
-    
-                // Country
-                print '<tr><td>'.fieldLabel('Country','selectcounty_id').'</td><td>';
-                print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
-                if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-                print '</td></tr>';
-    
-                // State
-                if (empty($conf->global->USER_DISABLE_STATE))
-                {
-                    print '<tr><td class="tdoverflow">'.fieldLabel('State','state_id').'</td><td>';
-                    print $formcompany->select_state($object->state_id,$object->country_code, 'state_id');
-                    print '</td></tr>';
-                }
-    
-                // Tel pro
-                print "<tr>".'<td>'.$langs->trans("PhonePro").'</td>';
-                print '<td>';
-                if ($caneditfield  && empty($object->ldap_sid))
-                {
-                    print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
-                }
-                else
-                {
-                    print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
-                    print $object->office_phone;
-                }
-                print '</td></tr>';
-    
-                // Tel mobile
-                print "<tr>".'<td>'.$langs->trans("PhoneMobile").'</td>';
-                print '<td>';
-                if ($caneditfield && empty($object->ldap_sid))
-                {
-                    print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
-                }
-                else
-                {
-                    print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
-                    print $object->user_mobile;
-                }
-                print '</td></tr>';
-    
-                // Fax
-                print "<tr>".'<td>'.$langs->trans("Fax").'</td>';
-                print '<td>';
-                if ($caneditfield  && empty($object->ldap_sid))
-                {
-                    print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
-                }
-                else
-                {
-                    print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
-                    print $object->office_fax;
-                }
-                print '</td></tr>';
-    
-                // Skype
-                if (! empty($conf->skype->enabled))
-                {
-                    print '<tr><td>'.$langs->trans("Skype").'</td>';
-                    print '<td>';
-                    if ($caneditfield  && empty($object->ldap_sid))
+                    print "</table>";
+                    
+                    if ($caneditgroup)
                     {
-                        print '<input size="40" type="text" name="skype" class="flat" value="'.$object->skype.'">';
+                        print '</form>';
                     }
-                    else
-                    {
-                        print '<input type="hidden" name="skype" value="'.$object->skype.'">';
-                        print $object->skype;
-                    }
-                    print '</td></tr>';
+                    print "<br>";
                 }
-    
-                // EMail
-                print "<tr>".'<td'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
-                print '<td>';
-                if ($caneditfield  && empty($object->ldap_sid))
+            }
+        }
+        
+        /*
+         * Fiche en mode edition
+         */
+        if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id)))
+        {
+        	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="update">';
+            print '<input type="hidden" name="entity" value="'.$object->entity.'">';
+
+            dol_fiche_head($head, 'user', $title, 0, 'user');
+
+            print '<table width="100%" class="border">';
+
+            // Ref/ID
+			if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
+			{
+	            print '<tr><td>'.$langs->trans("Ref").'</td>';
+	            print '<td>';
+	            print $object->id;
+	            print '</td>';
+	            print '</tr>';
+			}
+
+            // Lastname
+            print "<tr>";
+            print '<td class="fieldrequired">'.$langs->trans("Lastname").'</td>';
+            print '<td>';
+            if ($caneditfield && !$object->ldap_sid)
+            {
+                print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
+                print $object->lastname;
+            }
+            print '</td>';
+            print '</tr>';
+
+            // Firstname
+            print "<tr>".'<td>'.$langs->trans("Firstname").'</td>';
+            print '<td>';
+            if ($caneditfield && !$object->ldap_sid)
+            {
+                print '<input class="minwidth100" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
+                print $object->firstname;
+            }
+            print '</td></tr>';
+
+            // Employee
+            print '<tr>';
+            print '<td>'.fieldLabel('Employee','employee',0).'</td><td>';
+            print $form->selectyesno("employee",$object->employee,1);
+            print '</td></tr>';
+
+            // Position/Job
+            print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
+            print '<td>';
+            if ($caneditfield)
+            {
+            	print '<input size="30" type="text" name="job" value="'.$object->job.'">';
+            }
+            else
+			{
+                print '<input type="hidden" name="job" value="'.$object->job.'">';
+          		print $object->job;
+            }
+            print '</td></tr>';
+
+		    // Gender
+    		print '<tr><td>'.$langs->trans("Gender").'</td>';
+    		print '<td>';
+    		$arraygender=array('man'=>$langs->trans("Genderman"),'woman'=>$langs->trans("Genderwoman"));
+    		print $form->selectarray('gender', $arraygender, GETPOST('gender')?GETPOST('gender'):$object->gender, 1);
+    		print '</td></tr>';
+
+            // Login
+            print "<tr>".'<td><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
+            print '<td>';
+            if ($user->admin  && !$object->ldap_sid)
+            {
+                print '<input size="12" maxlength="24" type="text" class="flat" name="login" value="'.$object->login.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="login" value="'.$object->login.'">';
+                print $object->login;
+            }
+            print '</td>';
+            print '</tr>';
+
+            // Pass
+            print '<tr><td>'.$langs->trans("Password").'</td>';
+            print '<td>';
+            if ($object->ldap_sid)
+            {
+                $text=$langs->trans("DomainPassword");
+            }
+            else if ($caneditpassword)
+            {
+                $text='<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="off">';
+                if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
                 {
-                    print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
+                    $text=$form->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
+                }
+            }
+            else
+            {
+                $text=preg_replace('/./i','*',$object->pass);
+            }
+            print $text;
+            print "</td></tr>\n";
+
+            // API key
+            if(! empty($conf->api->enabled) && $user->admin) 
+            {
+                print '<tr><td>'.$langs->trans("ApiKey").'</td>';
+                print '<td>';
+                print '<input class="minwidth300" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
+                if (! empty($conf->use_javascript_ajax))
+                    print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
+                print '</td></tr>';
+            }
+
+            // Administrator
+            print '<tr><td>'.$langs->trans("Administrator").'</td>';
+            if ($object->societe_id > 0)
+            {
+            	$langs->load("admin");
+                print '<td>';
+                print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
+                print ' ('.$langs->trans("ExternalUser").')';
+                print '</td></tr>';
+            }
+            else
+            {
+                print '<td>';
+                $nbAdmin = $user->getNbOfUsers('active','',1);
+                $nbSuperAdmin = $user->getNbOfUsers('active','superadmin',1);
+                //var_dump($nbAdmin);
+                //var_dump($nbSuperAdmin);
+                if ($user->admin								// Need to be admin to allow downgrade of an admin
+                && ($user->id != $object->id)                   // Don't downgrade ourself
+                && (
+                	(empty($conf->multicompany->enabled) && $nbAdmin >= 1)
+                	|| (! empty($conf->multicompany->enabled) && ($object->entity > 0 || $nbSuperAdmin > 1))    // Don't downgrade a superadmin if alone
+                	)
+                )
+                {
+                    print $form->selectyesno('admin',$object->admin,1);
+
+                    if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
+                    {
+                        if ($conf->use_javascript_ajax)
+                        {
+                            print '<script type="text/javascript">
+									$(function() {
+										var admin = $("select[name=admin]").val();
+										if (admin == 0) {
+											$("input[name=superadmin]")
+													.prop("disabled", true)
+													.prop("checked", false);
+										}
+										if ($("input[name=superadmin]").is(":checked")) {
+											$("select[name=entity]")
+													.prop("disabled", true);
+										}
+										$("select[name=admin]").change(function() {
+											 if ( $(this).val() == 0 ) {
+											 	$("input[name=superadmin]")
+													.prop("disabled", true)
+													.prop("checked", false);
+											 	$("select[name=entity]")
+													.prop("disabled", false);
+											 } else {
+											 	$("input[name=superadmin]")
+													.prop("disabled", false);
+											 }
+										});
+										$("input[name=superadmin]").change(function() {
+											if ( $(this).is(":checked")) {
+												$("select[name=entity]")
+													.prop("disabled", true);
+											} else {
+												$("select[name=entity]")
+													.prop("disabled", false);
+											}
+										});
+									});
+								</script>';
+                        }
+
+                        $checked=(($object->admin && ! $object->entity) ? ' checked' : '');
+                        print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
+                    }
                 }
                 else
                 {
-                    print '<input type="hidden" name="email" value="'.$object->email.'">';
-                    print $object->email;
+                    $yn = yn($object->admin);
+                    print '<input type="hidden" name="admin" value="'.$object->admin.'">';
+                    print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
+                    if (! empty($conf->multicompany->enabled) && empty($object->entity)) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
+                    else print $yn;
                 }
                 print '</td></tr>';
-    
-                // Signature
-                print "<tr>".'<td class="tdtop">'.$langs->trans("Signature").'</td>';
+            }
+
+           	// Type
+           	print '<tr><td>'.$langs->trans("Type").'</td>';
+           	print '<td>';
+           	if ($user->id == $object->id || ! $user->admin)
+           	{
+	           	$type=$langs->trans("Internal");
+    	       	if ($object->societe_id) $type=$langs->trans("External");
+        	   	print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
+	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+           	}
+           	else
+			{
+				$type=0;
+	            if ($object->contact_id) $type=$object->contact_id;
+	            print $form->selectcontacts(0,$type,'contactid',2,'','',1,'',false,1);
+	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+            }
+           	print '</td></tr>';
+
+			// Address
+            print '<tr><td class="tdtop">'.fieldLabel('Address','address').'</td>';
+	        print '<td><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
+            print $object->address;
+            print '</textarea></td></tr>';
+
+            // Zip
+            print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
+            print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+            print '</td></tr>';
+
+			// Town
+			print '<tr><td>'.fieldLabel('Town','town').'</td><td>';
+            print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+            print '</td></tr>';
+
+            // Country
+            print '<tr><td>'.fieldLabel('Country','selectcounty_id').'</td><td>';
+            print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
+            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            print '</td></tr>';
+
+            // State
+            if (empty($conf->global->USER_DISABLE_STATE))
+            {
+                print '<tr><td class="tdoverflow">'.fieldLabel('State','state_id').'</td><td>';
+                print $formcompany->select_state($object->state_id,$object->country_code, 'state_id');
+                print '</td></tr>';
+            }
+
+            // Tel pro
+            print "<tr>".'<td>'.$langs->trans("PhonePro").'</td>';
+            print '<td>';
+            if ($caneditfield  && empty($object->ldap_sid))
+            {
+                print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
+                print $object->office_phone;
+            }
+            print '</td></tr>';
+
+            // Tel mobile
+            print "<tr>".'<td>'.$langs->trans("PhoneMobile").'</td>';
+            print '<td>';
+            if ($caneditfield && empty($object->ldap_sid))
+            {
+                print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
+                print $object->user_mobile;
+            }
+            print '</td></tr>';
+
+            // Fax
+            print "<tr>".'<td>'.$langs->trans("Fax").'</td>';
+            print '<td>';
+            if ($caneditfield  && empty($object->ldap_sid))
+            {
+                print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
+                print $object->office_fax;
+            }
+            print '</td></tr>';
+
+            // Skype
+            if (! empty($conf->skype->enabled))
+            {
+                print '<tr><td>'.$langs->trans("Skype").'</td>';
+                print '<td>';
+                if ($caneditfield  && empty($object->ldap_sid))
+                {
+                    print '<input size="40" type="text" name="skype" class="flat" value="'.$object->skype.'">';
+                }
+                else
+                {
+                    print '<input type="hidden" name="skype" value="'.$object->skype.'">';
+                    print $object->skype;
+                }
+                print '</td></tr>';
+            }
+
+            // EMail
+            print "<tr>".'<td'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
+            print '<td>';
+            if ($caneditfield  && empty($object->ldap_sid))
+            {
+                print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="email" value="'.$object->email.'">';
+                print $object->email;
+            }
+            print '</td></tr>';
+
+            // OpenID url
+            if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
+            {
+                print "<tr>".'<td>'.$langs->trans("OpenIDURL").'</td>';
                 print '<td>';
                 if ($caneditfield)
                 {
-    	            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    	            $doleditor=new DolEditor('signature',$object->signature,'',138,'dolibarr_mailings','In',false,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
-    	            print $doleditor->Create(1);
+                    print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
                 }
                 else
-    			{
-              		print dol_htmlentitiesbr($object->signature);
+                {
+                    print '<input type="hidden" name="openid" value="'.$object->openid.'">';
+                    print $object->openid;
                 }
                 print '</td></tr>';
-    
-                // OpenID url
-                if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
-                {
-                    print "<tr>".'<td>'.$langs->trans("OpenIDURL").'</td>';
-                    print '<td>';
-                    if ($caneditfield)
-                    {
-                        print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
-                    }
-                    else
-                  {
-                        print '<input type="hidden" name="openid" value="'.$object->openid.'">';
-                        print $object->openid;
-                    }
-                    print '</td></tr>';
-                }
-    
-                // Hierarchy
-                print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
+            }
+
+            // Accountancy code
+            if ($conf->accounting->enabled)
+            {
+                print "<tr>";
+                print '<td>'.$langs->trans("AccountancyCode").'</td>';
                 print '<td>';
                 if ($caneditfield)
                 {
-                	print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
+                				print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
                 }
                 else
                 {
-              		print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
-                	$huser=new User($db);
-                	$huser->fetch($object->fk_user);
-                	print $huser->getNomUrl(1);
+                				print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
+                				print $object->accountancy_code;
                 }
                 print '</td>';
-                print "</tr>\n";
-    
-                if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
-                {
-                	$langs->load("salaries");
-    
-                	// THM
-    			    print '<tr><td>';
-    			    $text=$langs->trans("THM");
-    			    print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
-    			    print '</td>';
-    			    print '<td>';
-    			    print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm')?GETPOST('thm'):$object->thm).'">';
-    			    print '</td>';
-    			    print "</tr>\n";
-    
-    			    // TJM
-    			    print '<tr><td>';
-    			    $text=$langs->trans("TJM");
-    			    print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classthm');
-    			    print '</td>';
-    			    print '<td>';
-    			    print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm')?GETPOST('tjm'):$object->tjm).'">';
-    			    print '</td>';
-    			    print "</tr>\n";
-    
-    			    // Salary
-    			    print '<tr><td>'.$langs->trans("Salary").'</td>';
-    			    print '<td>';
-    			    print '<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary')?GETPOST('salary'):$object->salary).'">';
-    			    print '</td>';
-    			    print "</tr>\n";
-                }
-    
-    		    // Weeklyhours
-    		    print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
-    		    print '<td>';
-    		    print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours')?GETPOST('weeklyhours'):$object->weeklyhours).'">';
-    		    print '</td>';
-    		    print "</tr>\n";
-    
-    		    // Date employment
-    		    print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
-    		    print '<td>';
-    			echo $form->select_date(GETPOST('dateemployment')?GETPOST('dateemployment'):$object->dateemployment,'dateemployment',0,0,1,'form'.'dateemployment',1,0,1);
-    			print '</td>';
-    		    print "</tr>\n";
-    
-    		    // Accountancy code
-    			if ($conf->accounting->enabled)
-        		{
-    			print "<tr>";
-    			print '<td>'.$langs->trans("AccountancyCode").'</td>';
-    			print '<td>';
-    			if ($caneditfield)
-    			{
-    				print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
-    			}
-    			else
-    			{
-    				print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
-    				print $object->accountancy_code;
-    			}
-    			print '</td>';
-    			print "</tr>";
-    		}
-    
+                print "</tr>";
+            }
+            
+            // Hierarchy
+            print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
+            print '<td>';
+            if ($caneditfield)
+            {
+            	print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
+            }
+            else
+            {
+          		print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
+            	$huser=new User($db);
+            	$huser->fetch($object->fk_user);
+            	print $huser->getNomUrl(1);
+            }
+            print '</td>';
+            print "</tr>\n";
+
+            if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+               || (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read)))
+            {
+            	$langs->load("salaries");
+
+            	// THM
+			    print '<tr><td>';
+			    $text=$langs->trans("THM");
+			    print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
+			    print '</td>';
+			    print '<td>';
+			    print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm')?GETPOST('thm'):$object->thm).'">';
+			    print '</td>';
+			    print "</tr>\n";
+
+			    // TJM
+			    print '<tr><td>';
+			    $text=$langs->trans("TJM");
+			    print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classthm');
+			    print '</td>';
+			    print '<td>';
+			    print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm')?GETPOST('tjm'):$object->tjm).'">';
+			    print '</td>';
+			    print "</tr>\n";
+
+			    // Salary
+			    print '<tr><td>'.$langs->trans("Salary").'</td>';
+			    print '<td>';
+			    print '<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary')?GETPOST('salary'):$object->salary).'">';
+			    print '</td>';
+			    print "</tr>\n";
+            }
+
+		    // Weeklyhours
+		    print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
+		    print '<td>';
+		    print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours')?GETPOST('weeklyhours'):$object->weeklyhours).'">';
+		    print '</td>';
+		    print "</tr>\n";
+
+		    // Date employment
+		    print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
+		    print '<td>';
+			echo $form->select_date(GETPOST('dateemployment')?GETPOST('dateemployment'):$object->dateemployment,'dateemployment',0,0,1,'form'.'dateemployment',1,0,1);
+			print '</td>';
+		    print "</tr>\n";
+
     		// User color
     		if (! empty($conf->agenda->enabled))
     	    {
@@ -2461,6 +2452,21 @@ else
             	print $object->showOptionals($extrafields,'edit');
             }
 
+            // Signature
+            print "<tr>".'<td class="tdtop">'.$langs->trans("Signature").'</td>';
+            print '<td>';
+            if ($caneditfield)
+            {
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor=new DolEditor('signature',$object->signature,'',138,'dolibarr_mailings','In',false,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
+                print $doleditor->Create(1);
+            }
+            else
+            {
+                print dol_htmlentitiesbr($object->signature);
+            }
+            print '</td></tr>';
+            
             print '</table>';
 
             dol_fiche_end();
@@ -2501,8 +2507,6 @@ else
             
             
             print '</div></div></div>';
-        }
-        
         }
         
 		if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close();

From 4e7353f8a0525448aff1884580b0171f83bdcef0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 13:39:00 +0200
Subject: [PATCH 0873/1163] Clean code

---
 htdocs/core/lib/usergroups.lib.php        |  7 ++---
 htdocs/core/modules/modHRM.class.php      |  2 +-
 htdocs/core/modules/modSalaries.class.php |  2 +-
 htdocs/hrm/admin/admin_establishment.php  |  2 +-
 htdocs/hrm/admin/admin_hrm.php            |  2 +-
 htdocs/hrm/class/establishment.class.php  |  2 ++
 htdocs/hrm/establishment/info.php         |  2 +-
 htdocs/langs/en_US/admin.lang             |  6 ++---
 htdocs/langs/en_US/main.lang              |  1 +
 htdocs/user/bank.php                      | 31 ++++++++++++++++-------
 htdocs/user/card.php                      | 10 +++++---
 11 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index f48974acb02..3086e7d264a 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -141,16 +141,17 @@ function user_prepare_head($object)
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'user');
 
-	if (! empty($conf->hrm->enabled) && $user->rights->hrm->employee->read)
+    if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+       || (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read)))
     {
 		// Bank
     	$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("HR");
+    	$head[$h][1] = $langs->trans("HRAndBank");
     	$head[$h][2] = 'bank';
     	$h++;
 	}
 
-    //Info on users is visible only by internal user
+    // Such info on users is visible only by internal user
     if (empty($user->societe_id))
     {
 		// Notes
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 74a0107aedb..3d1ea43f63c 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -45,7 +45,7 @@ class modHRM extends DolibarrModules
 		$this->family = "hr";
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace( '/^mod/i', '', get_class($this));
-		$this->description = "Management of employees carrier and feelings";
+		$this->description = "Management of employees carrier and feelings (department, employment contract)";
 		
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'development';
diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index a1f4753b12d..d5e982bcccc 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -54,7 +54,7 @@ class modSalaries extends DolibarrModules
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i','',get_class($this));
 		// Module description used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Employees contracts and salaries management";
+		$this->description = "Payment of salaries";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 291169aa30d..1f1e9e53f73 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -74,7 +74,7 @@ print load_fiche_titre($langs->trans("HRMSetup"), $linkback);
 
 // Configuration header
 $head = hrm_admin_prepare_head();
-dol_fiche_head($head, 'establishments', $langs->trans("HRM"), 0, "user");
+dol_fiche_head($head, 'establishments', $langs->trans("HRM"), -1, "user");
 
 $sql = "SELECT e.rowid, e.name, e.address, e.zip, e.town, e.status";
 $sql.= " FROM ".MAIN_DB_PREFIX."establishment as e";
diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
index 7f9ed583b98..f488eb562e5 100644
--- a/htdocs/hrm/admin/admin_hrm.php
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -78,7 +78,7 @@ print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head($head, 'parameters', $langs->trans("HRM"), 0, "user");
+dol_fiche_head($head, 'parameters', $langs->trans("HRM"), -1, "user");
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index a171a111889..d449af14972 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -96,6 +96,7 @@ class Establishment extends CommonObject
 		$sql.= ", entity";
 		$sql.= ", datec";
 		$sql.= ", fk_user_author";
+		$sql.= ", fk_user_mod";
 		$sql.= ") VALUES (";
 		$sql.= " '".$this->db->escape($this->name)."'";
 		$sql.= ", '".$this->db->escape($this->address)."'";
@@ -106,6 +107,7 @@ class Establishment extends CommonObject
 		$sql.= ", ".$conf->entity;
 		$sql.= ", '".$this->db->idate($now)."'";
 		$sql.= ", ". $user->id;
+		$sql.= ", ". $user->id;
 		$sql.= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index 1ef523fa607..29b571e58ce 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -44,7 +44,7 @@ if ($id)
 
 	$head = establishment_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $langs->trans("Establishment"), 0, 'building');
+	dol_fiche_head($head, 'info', $langs->trans("Establishment"), -1, 'building');
 
     print '<table width="100%"><tr><td>';
     dol_print_object_info($object);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1c9ac65e4b8..be7451caffa 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -519,8 +519,8 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Employee contracts and salaries
-Module510Desc=Management of employees contracts, salaries and payments
+Module510Name=Payment of employee wages
+Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
@@ -563,7 +563,7 @@ Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index a5f2ddf1e7e..01aa5537c13 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -772,6 +772,7 @@ SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
 HR=HR
+HRAndBank=HR and Bank
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index c86ca27bf34..939f7c35aa7 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -24,7 +24,7 @@
 /**
  *	    \file       htdocs/user/bank.php
  *      \ingroup    HRM
- *		\brief      BAN tab for users
+ *		\brief      Tab for HRM
  */
 
 require '../main.inc.php';
@@ -47,7 +47,7 @@ $socid=0;
 if ($user->societe_id > 0) $socid = $user->societe_id;
 $feature2 = (($socid && $user->rights->user->self->creer)?'':'user');
 if ($user->id == $id) $feature2=''; // A user can always read its own card
-$result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
+$result = restrictedArea($user, 'salaries|hrm', $id, 'user&user', $feature2);
 
 $object = new User($db);
 if ($id > 0 || ! empty($ref))
@@ -155,14 +155,27 @@ if ($account->id && $action != 'edit')
         
     print '<div class="fichecenter">';
 
+    print '<div class="underbanner clearboth"></div>';
+    
+    print '<table class="border centpercent">';
+    
+    print '<tr><td class="titlefield">'.$langs->trans("xxx").'</td>';
+    print '<td></td></tr>';
+    
+    print '</table>';
+    
+    print '</br>';
+    
+    print load_fiche_titre($langs->trans("BAN"));
+    
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border centpercent">';
 
     print '<tr><td class="titlefield">'.$langs->trans("LabelRIB").'</td>';
-    print '<td colspan="4">'.$account->label.'</td></tr>';
+    print '<td>'.$account->label.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("BankName").'</td>';
-	print '<td colspan="4">'.$account->bank.'</td></tr>';
+	print '<td>'.$account->bank.'</td></tr>';
 
 	// Show fields of bank account
 	foreach ($account->getFieldsToShow() as $val) {
@@ -182,7 +195,7 @@ if ($account->id && $action != 'edit')
 	}
 
 	print '<tr><td class="tdtop">'.$langs->trans("IBAN").'</td>';
-	print '<td colspan="4">'.$account->iban . '&nbsp;';
+	print '<td>'.$account->iban . '&nbsp;';
     if (! empty($account->iban)) {
         if (! checkIbanForAccount($account)) {
             print img_picto($langs->trans("IbanNotValid"),'warning');
@@ -193,7 +206,7 @@ if ($account->id && $action != 'edit')
     print '</td></tr>';
 
 	print '<tr><td class="tdtop">'.$langs->trans("BIC").'</td>';
-	print '<td colspan="4">'.$account->bic.'&nbsp;';
+	print '<td>'.$account->bic.'&nbsp;';
     if (! empty($account->bic)) {
         if (! checkSwiftForAccount($account)) {
             print img_picto($langs->trans("SwiftNotValid"),'warning');
@@ -203,15 +216,15 @@ if ($account->id && $action != 'edit')
     }
     print '</td></tr>';
 
-	print '<tr><td class="tdtop">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
+	print '<tr><td class="tdtop">'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 	print $account->domiciliation;
 	print "</td></tr>\n";
 
-	print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwner").'</td><td colspan="4">';
+	print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwner").'</td><td>';
 	print $account->proprio;
 	print "</td></tr>\n";
 
-	print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
+	print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
 	print $account->owner_address;
 	print "</td></tr>\n";
 
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 9249e8f295e..92951de98e8 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1028,6 +1028,8 @@ if (($action == 'create') || ($action == 'adduserldap'))
         print '</td></tr>';
     }
     
+    // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
+    
     // Hierarchy
     print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
     print '<td>';
@@ -1264,7 +1266,7 @@ else
          */
         if ($action != 'edit')
         {
-			dol_fiche_head($head, 'user', $title, 0, 'user');
+			dol_fiche_head($head, 'user', $title, -1, 'user');
 
             dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
 
@@ -1386,8 +1388,8 @@ else
                 print '<td>'.$object->accountancy_code.'</td></tr>';
             }
             
-            // TODO Move this into RH Tab (visible if RH module on)
-            
+            // TODO Move this into tab RH, visible when salarie or RH is visible (HierarchicalResponsible must be on both tab)
+
             // Hierarchy
             print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
             print '<td>';
@@ -2279,6 +2281,8 @@ else
                 print "</tr>";
             }
             
+            // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
+            
             // Hierarchy
             print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
             print '<td>';

From 30cedd154ef5737e717ff13bdd9b7c18ef22a324 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 15:34:38 +0200
Subject: [PATCH 0874/1163] Fix default value must apply only if
 restore_lastsearch_values is on

---
 htdocs/core/lib/functions.lib.php | 49 +++++++++++++++----------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4e17c62d3f5..09856131da7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -280,8 +280,24 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
     	$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
     	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 	
-	    // Management of default values
-	    if (! isset($_GET['sortfield']) && ! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
+    	// Retrieve values if restore_lastsearch_values is set and there is saved values
+    	if ($_GET['restore_lastsearch_values'] && ! empty($_SESSION['lastsearch_values_'.$relativepathstring]))        // Keep $_GET here
+    	{
+	        $tmp=json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
+	        if (is_array($tmp))
+	        {
+	            foreach($tmp as $key => $val)
+	            {
+	                if ($key == $paramname)
+	                {
+	                    $out=$val;
+	                    break;
+	                }
+	            }
+	        }
+    	}
+	    // Else, retreive default values if we are not doing a sort
+	    elseif (! isset($_GET['sortfield']) && ! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
 	    {
 	        if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 	        {
@@ -331,26 +347,6 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	        }
 	    }
 	    
-	    // Retrieve values into restore_lastsearch_values
-	    if ($_GET['restore_lastsearch_values'])        // Keep $_GET here
-	    {
-	        if (! empty($_SESSION['lastsearch_values_'.$relativepathstring]))
-	        {
-	            $tmp=json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
-	            if (is_array($tmp))
-	            {
-    	            foreach($tmp as $key => $val)
-    	            {
-        	           if ($key == $paramname)
-        	           {
-    	                   $out=$val;
-    	                   break;
-        	           }
-    	            }
-	            }
-	        }
-	    }
-	    
 	}	
 	
 	if (empty($check) && ! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
@@ -455,13 +451,14 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	    //if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder', 'sortfield", 'smonth', 'syear', 'month', 'year')))
 	    if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder','sortfield')))
 	    {
-	        //var_dump($user->default_values[$relativepathstring]);exit;
-	        //if ($paramname == 'sortorder') var_dump($paramname.' - '.$out);
-	        
+	        //var_dump($paramname.' - '.$out.' '.$user->default_values[$relativepathstring]['filters'][$paramname]);
+
 	        // We save search key only if:
 	        // - not empty, or
 	        // - if value is empty and a default value exists that is not empty (it means we did a filter to an empty value when default was not).
-	        if (! empty($out) || ! empty($user->default_values[$relativepathstring][$paramname]))
+	        
+	        //if (! empty($out) || ! empty($user->default_values[$relativepathstring]['filters'][$paramname]))
+	        if (! empty($out))
 	        {
                 $user->lastsearch_values_tmp[$relativepathstring][$paramname]=$out;
 	        }

From 470165615f49805053a46a3c79fcb1ea1c5ee0b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 16:32:23 +0200
Subject: [PATCH 0875/1163] Fix look and feel v6

---
 htdocs/commande/card.php                      |  22 +-
 htdocs/hrm/admin/admin_establishment.php      |   2 +-
 htdocs/hrm/class/establishment.class.php      |  27 +-
 htdocs/hrm/establishment/card.php             | 184 +++++-----
 .../modulebuilder/skeletons/skeleton_card.php | 313 ++++++++++++++++--
 5 files changed, 405 insertions(+), 143 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index fe91f0b6ff8..d06e03a48e7 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1327,13 +1327,7 @@ $formorder = new FormOrder($db);
 $formmargin = new FormMargin($db);
 if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 
-/**
- * *******************************************************************
- *
- * Mode creation
- *
- * *******************************************************************
- */
+// Mode creation
 if ($action == 'create' && $user->rights->commande->creer)
 {
 	print load_fiche_titre($langs->trans('CreateOrder'),'','title_commercial.png');
@@ -1501,9 +1495,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	}
 	print '</tr>' . "\n";
 
-	/*
-	 * Contact de la commande
-	 */
+	// Contact of order
 	if ($socid > 0) {
 		print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td colspan="2">';
 		$form->select_contacts($soc->id, $setcontact, 'contactid', 1, $srccontactslist);
@@ -1748,11 +1740,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		print '</table>';
 	}
 } else {
-	/* *************************************************************************** */
-	/*                                                                             */
-	/* Mode vue et edition                                                         */
-	/*                                                                             */
-	/* *************************************************************************** */
+	// Mode view
 	$now = dol_now();
 
 	if ($object->id > 0) {
@@ -2447,8 +2435,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 		dol_fiche_end();
 
 		/*
-		 * Boutons actions
-		*/
+		 * Buttons for actions
+		 */
 		if ($action != 'presend' && $action != 'editline') {
 			print '<div class="tabsAction">';
 
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 1f1e9e53f73..091a2a15f06 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -120,7 +120,7 @@ if ($result)
 			print '<td align="left">'.$obj->town.'</td>';
 
             print '<td align="right">';
-			print $establishmentstatic->getLibStatus(5);
+			print $establishmentstatic->getLibStatut(5);
 			print '</td>';
             print "</tr>\n";
 
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index d449af14972..413cb0cb584 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -33,8 +33,10 @@ class Establishment extends CommonObject
 	public $table_element_line = '';
 	public $fk_element = 'fk_establishment';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-
-	public $id;
+    public $picto='building';
+    
+    public $id;
+    public $ref;
 	public $rowid;
 
 	public $name;
@@ -160,7 +162,7 @@ class Establishment extends CommonObject
 		$sql .= ", zip = '".$this->db->escape($this->zip)."'";
 		$sql .= ", town = '".$this->db->escape($this->town)."'";
 		$sql .= ", fk_country = ".($this->country_id > 0 ? $this->country_id : 'null');
-		$sql .= ", status = '".$this->db->escape($this->status)."'";
+		$sql .= ", status = ".$this->db->escape($this->status);
 		$sql .= ", fk_user_mod = " . $user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -197,6 +199,7 @@ class Establishment extends CommonObject
 			$obj = $this->db->fetch_object($result);
 
 			$this->id			= $obj->rowid;
+			$this->ref			= $obj->rowid;
 			$this->name			= $obj->name;
 			$this->address		= $obj->address;
 			$this->zip			= $obj->zip;
@@ -249,9 +252,9 @@ class Establishment extends CommonObject
 	 * @param	int		$mode   	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 * @return  string   		   	Label
 	 */
-	function getLibStatus($mode=0)
+	function getLibStatut($mode=0)
 	{
-		return $this->LibStatus($this->status,$mode);
+		return $this->LibStatut($this->status,$mode);
 	}
 
 	/**
@@ -261,7 +264,7 @@ class Establishment extends CommonObject
 	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 *  @return string      		Label
 	 */
-	function LibStatus($status,$mode=0)
+	function LibStatut($status,$mode=0)
 	{
 		global $langs;
 
@@ -383,4 +386,16 @@ class Establishment extends CommonObject
 
         return '';
     }
+    
+    /**
+     * Initialise object with example values
+     * Id must be 0 if object instance is a specimen
+     *
+     * @return void
+     */
+    public function initAsSpecimen()
+    {
+        $this->id = 0;
+        $this->ref = 'DEAAA';
+    }    
 }
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index eafa302886f..3a08ae197a2 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -140,7 +140,8 @@ else if ($action == 'update')
 			$object->town			= GETPOST('town', 'alpha');
 			$object->country_id     = GETPOST('country_id', 'int');
 			$object->fk_user_mod	= $user->id;
-
+			$object->status         = GETPOST('status','int');
+			
 			$result = $object->update($user);
 
             if ($result > 0)
@@ -184,13 +185,13 @@ if ($action == 'create')
     print '<table class="border" width="100%">';
 
 	// Name
-    print '<tr><td>'. fieldLabel('Name','name',1).'</td><td><input name="name" id="name" size="32" value="' . GETPOST("name") . '"></td></tr>';
+    print '<tr><td>'. fieldLabel('Name','name',1).'</td><td><input name="name" id="name" size="32" value="' . GETPOST("name", "alpha") . '"></td></tr>';
 
 	// Address
 	print '<tr>';
 	print '<td>'.fieldLabel('Address','address',0).'</td>';
 	print '<td>';
-	print '<input name="address" id="address" size="32" value="' . $object->address . '">';
+	print '<input name="address" id="address" class="qutrevingtpercent" value="' . GETPOST('address','alpha') . '">';
 	print '</td>';
 	print '</tr>';
 
@@ -220,7 +221,7 @@ if ($action == 'create')
 	print '<tr>';
 	print '<td>'.fieldLabel('Country','selectcountry_id',0).'</td>';
 	print '<td class="maxwidthonsmartphone">';
-	print $form->select_country($mysoc->country_id,'country_id');
+	print $form->select_country(GETPOST('country_id','int')>0?GETPOST('country_id','int'):$mysoc->country_id,'country_id');
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 	print '</td>';
 	print '</tr>';
@@ -229,7 +230,7 @@ if ($action == 'create')
     print '<tr>';
     print '<td>'.fieldLabel('Status','status',1).'</td>';
 	print '<td>';
-	print $form->selectarray('status',$status2label,GETPOST('status'));
+	print $form->selectarray('status',$status2label,GETPOST('status','alpha'));
     print '</td></tr>';
 
     print '</table>';
@@ -244,7 +245,9 @@ if ($action == 'create')
 
     print '</form>';
 }
-else if ($id)
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit')
 {
     $result = $object->fetch($id);
     if ($result > 0)
@@ -316,91 +319,94 @@ else if ($id)
 
             print '</form>';
         }
-        else
-        {
-            /*
-             * Confirm delete
-             */
-            if ($action == 'delete')
-            {
-                print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteEstablishment"),$langs->trans("ConfirmDeleteEstablishment"),"confirm_delete");
-
-            }
-
-        	dol_fiche_head($head, 'card', $langs->trans("Establishment"), 0, 'building');
-
-        	print '<table class="border" width="100%">';
-
-            $linkback = '<a href="../admin/admin_establishment.php">'.$langs->trans("BackToList").'</a>';
-
-            // Ref
-            print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td width="50%">';
-            print $object->id;
-			print '</td><td width="25%">';
-			print $linkback;
-            print '</td></tr>';
-
-			// Name
-			print '<tr>';
-			print '<td>'.$langs->trans("Name").'</td>';
-			print '<td colspan="2">'.$object->name.'</td>';
-			print '</tr>';
-
-			// Address
-			print '<tr>';
-			print '<td>'.$langs->trans("Address").'</td>';
-			print '<td colspan="2">'.$object->address.'</td>';
-			print '</tr>';
-
-			// Zipcode
-			print '<tr>';
-			print '<td>'.$langs->trans("Zipcode").'</td>';
-			print '<td colspan="2">'.$object->zip.'</td>';
-			print '</tr>';
-
-			// Town
-			print '<tr>';
-			print '<td>'.$langs->trans("Town").'</td>';
-			print '<td colspan="2">'.$object->town.'</td>';
-			print '</tr>';
-
-			// Country
-			print '<tr>';
-			print '<td>'.$langs->trans("Country").'</td>';
-			print '<td colspan="2">';
-			if ($object->country_id > 0)
-			{
-				$img=picto_from_langcode($object->country_code);
-				print $img?$img.' ':'';
-				print getCountry($object->getCountryCode(),0,$db);
-			}
-			print '</td>';
-			print '</tr>';
-
-            // Status
-            print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">';
-            print $object->getLibStatus(4).'</td></tr>';
-
-            print "</table>";
-
-            dol_fiche_end();
-
-            /*
-             * Barre d'actions
-            */
-
-            print '<div class="tabsAction">';
-            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
-			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
-            print '</div>';
-        }
-    }
-    else
-    {
-        dol_print_error($db);
     }
+    else dol_print_error($db);
 }
 
-llxFooter();
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
+{
+    $res = $object->fetch_optionals($object->id, $extralabels);
+    
+    $head = establishment_prepare_head($object);
+    dol_fiche_head($head, 'card', $langs->trans("Establishment"), -1, 'building');
+    
+    // Confirmation to delete
+    if ($action == 'delete')
+    {
+        print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteEstablishment"),$langs->trans("ConfirmDeleteEstablishment"),"confirm_delete");
 
+    }
+
+	
+	// Object card
+	// ------------------------------------------------------------
+	
+	$linkback = '<a href="' . DOL_URL_ROOT . '/hrm/admin/admin_establishment.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	
+	$morehtmlref='<div class="refidno">';
+    $morehtmlref.='</div>';
+	
+    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'id', $morehtmlref);
+    
+    
+    print '<div class="fichecenter">';
+    //print '<div class="fichehalfleft">';
+    print '<div class="underbanner clearboth"></div>';
+    print '<table class="border centpercent">'."\n"; 
+
+	// Name
+	print '<tr>';
+	print '<td class="titlefield">'.$langs->trans("Name").'</td>';
+	print '<td>'.$object->name.'</td>';
+	print '</tr>';
+
+	// Address
+	print '<tr>';
+	print '<td>'.$langs->trans("Address").'</td>';
+	print '<td>'.$object->address.'</td>';
+	print '</tr>';
+
+	// Zipcode
+	print '<tr>';
+	print '<td>'.$langs->trans("Zipcode").'</td>';
+	print '<td>'.$object->zip.'</td>';
+	print '</tr>';
+
+	// Town
+	print '<tr>';
+	print '<td>'.$langs->trans("Town").'</td>';
+	print '<td>'.$object->town.'</td>';
+	print '</tr>';
+
+	// Country
+	print '<tr>';
+	print '<td>'.$langs->trans("Country").'</td>';
+	print '<td>';
+	if ($object->country_id > 0)
+	{
+		$img=picto_from_langcode($object->country_code);
+		print $img?$img.' ':'';
+		print getCountry($object->getCountryCode(),0,$db);
+	}
+	print '</td>';
+	print '</tr>';
+
+    print '</table>';
+    print '</div>';
+    
+    print '<div class="clearboth"></div><br>';
+    
+    dol_fiche_end();
+
+    /*
+     * Barre d'actions
+    */
+
+    print '<div class="tabsAction">';
+    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
+	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
+    print '</div>';
+}
+ 
+llxFooter();
 $db->close();
diff --git a/htdocs/modulebuilder/skeletons/skeleton_card.php b/htdocs/modulebuilder/skeletons/skeleton_card.php
index 84cbcbb2160..49683af79c8 100644
--- a/htdocs/modulebuilder/skeletons/skeleton_card.php
+++ b/htdocs/modulebuilder/skeletons/skeleton_card.php
@@ -297,52 +297,305 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 {
     $res = $object->fetch_optionals($object->id, $extralabels);
 
-	$head = commande_prepare_head($object);
-	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), 0, 'order');
+	$head = mymodule_prepare_head($object);
+	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
 		
-	print load_fiche_titre($langs->trans("MyModule"));
-    
-	dol_fiche_head();
-
+	$formconfirm = '';
+	
+	// Confirmation to delete
 	if ($action == 'delete') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
-		print $formconfirm;
+	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
 	}
 	
+	// Confirmation of action xxxx
+	if ($action == 'xxx')
+	{
+	    $formquestion=array();
+	    /*
+	        $formquestion = array(
+	            // 'text' => $langs->trans("ConfirmClone"),
+	            // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+	            // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+	            // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
+	    }*/	
+	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+	}
+	
+	if (! $formconfirm) {
+	    $parameters = array('lineid' => $lineid);
+	    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
+	    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+	}
+	
+	// Print form confirm
+	print $formconfirm;
+	
+	
+	
+	// Object card
+	// ------------------------------------------------------------
+	
+	$linkback = '<a href="' . DOL_URL_ROOT . '/mymodule/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	
+	
+	$morehtmlref='<div class="refidno">';
+	/*
+	// Ref bis
+	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+	    $langs->load("projects");
+	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	    if ($user->rights->mymodule->creer)
+	    {
+	        if ($action != 'classify')
+	        {
+	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	            if ($action == 'classify') {
+	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	                $morehtmlref.='</form>';
+	            } else {
+	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	            }
+	        }
+	    } else {
+	        if (! empty($object->fk_project)) {
+	            $proj = new Project($db);
+	            $proj->fetch($object->fk_project);
+	            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+	            $morehtmlref.=$proj->ref;
+	            $morehtmlref.='</a>';
+	        } else {
+	            $morehtmlref.='';
+	        }
+	    }
+	}
+	*/
+	$morehtmlref.='</div>';
+	
+	
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	
+	
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">'."\n";
 	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
 	// LIST_OF_TD_LABEL_FIELDS_VIEW
+
+
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
 	print '</table>';
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="ficheaddleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent">';
+	
+	
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+	print '</div>';
+	
+	print '<div class="clearboth"></div><br>';
 	
 	dol_fiche_end();
 
 
-	// Buttons
-	print '<div class="tabsAction">'."\n";
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-	if (empty($reshook))
-	{
-		if ($user->rights->mymodule->write)
-		{
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-		}
-
-		if ($user->rights->mymodule->delete)
-		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-		}
+	// Buttons for actions
+	if ($action != 'presend' && $action != 'editline') {
+    	print '<div class="tabsAction">'."\n";
+    	$parameters=array();
+    	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+    
+    	if (empty($reshook))
+    	{
+    		if ($user->rights->mymodule->write)
+    		{
+    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+    		}
+    
+    		if ($user->rights->mymodule->delete)
+    		{
+    			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+    		}
+    	}
+    	print '</div>'."\n";
 	}
-	print '</div>'."\n";
 
+	
+	// Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+	    $action = 'presend';
+	}
+	
+	if ($action != 'presend')
+	{
+	    print '<div class="fichecenter"><div class="fichehalfleft">';
+	    print '<a name="builddoc"></a>'; // ancre
+	    // Documents
+	    $comref = dol_sanitizeFileName($object->ref);
+	    $relativepath = $comref . '/' . $comref . '.pdf';
+	    $filedir = $conf->mymodule->dir_output . '/' . $comref;
+	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+	    $genallowed = $user->rights->mymodule->creer;
+	    $delallowed = $user->rights->mymodule->supprimer;
+	    print $formfile->showdocuments('mymodule', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+	
+	
+	    // Show links to link elements
+	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
+	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+	
+	
+	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	
+	    // List of actions on element
+	    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+	    $formactions = new FormActions($db);
+	    $somethingshown = $formactions->showactions($object, 'order', $socid);
+	
+	    print '</div></div></div>';
+	}
+	
 
-	// Example 2 : Adding links to objects
-	// Show links to link elements
-	//$linktoelem = $form->showLinkToObjectBlock($object, null, array('skeleton'));
-	//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+	/*
+	 * Action presend
+	 */
+    /*
+	if ($action == 'presend')
+	{
+		$object->fetch_projet();
 
+		$ref = dol_sanitizeFileName($object->ref);
+		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+		$file = $fileparams['fullname'];
+
+		// Define output language
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+			$newlang = $_REQUEST['lang_id'];
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+			$newlang = $object->thirdparty->default_lang;
+
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang($newlang);
+			$outputlangs->load('commercial');
+		}
+
+		// Build document if it not exists
+		if (! $file || ! is_readable($file)) {
+			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			if ($result <= 0) {
+				dol_print_error($db, $object->error, $object->errors);
+				exit();
+			}
+			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+			$file = $fileparams['fullname'];
+		}
+
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+		print '<div class="clearboth"></div>';
+		print '<br>';
+		print load_fiche_titre($langs->trans('SendOrderByMail'));
+
+		dol_fiche_head('');
+
+		// Cree l'objet formulaire mail
+		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+        if($formmail->fromtype === 'user'){
+            $formmail->fromid = $user->id;
+
+        }
+		$formmail->trackid='ord'.$object->id;
+		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+		{
+			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
+		}
+		$formmail->withfrom = 1;
+		$liste = array();
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
+			$liste [$key] = $value;
+		$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
+		$formmail->withtocc = $liste;
+		$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+		if (empty($object->ref_client)) {
+			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
+		} else if (! empty($object->ref_client)) {
+			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
+		}
+		$formmail->withfile = 2;
+		$formmail->withbody = 1;
+		$formmail->withdeliveryreceipt = 1;
+		$formmail->withcancel = 1;
+		// Tableau des substitutions
+		$formmail->setSubstitFromObject($object);
+		$formmail->substit ['__ORDERREF__'] = $object->ref;
+
+		$custcontact = '';
+		$contactarr = array();
+		$contactarr = $object->liste_contact(- 1, 'external');
+
+		if (is_array($contactarr) && count($contactarr) > 0)
+		{
+			foreach ($contactarr as $contact)
+			{
+				if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
+					$contactstatic = new Contact($db);
+					$contactstatic->fetch($contact ['id']);
+					$custcontact = $contactstatic->getFullName($langs, 1);
+				}
+			}
+
+			if (! empty($custcontact)) {
+				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
+			}
+		}
+
+		// Tableau des parametres complementaires
+		$formmail->param['action'] = 'send';
+		$formmail->param['models'] = 'order_send';
+		$formmail->param['models_id']=GETPOST('modelmailselected','int');
+		$formmail->param['orderid'] = $object->id;
+		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+
+		// Init list of files
+		if (GETPOST("mode") == 'init') {
+			$formmail->clear_attached_files();
+			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
+		}
+
+		// Show form
+		print $formmail->get_form();
+
+		dol_fiche_end();
+	}*/
 }
 
 

From f65b29c1351e1fc3172eb58df494c9bddbd9cc73 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 16:57:38 +0200
Subject: [PATCH 0876/1163] FIX #6867 - Rewrite code to solve regression (not
 mixing array/string type and solve php warnings). Also restore $langs as a
 global var.

---
 htdocs/admin/dict.php | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 2b422074f1b..ee21a8ccfbe 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -581,12 +581,6 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     $listfieldmodify=explode(',',$tabfieldinsert[$id]);
     $listfieldvalue=explode(',',$tabfieldvalue[$id]);
 
-    if (GETPOST('actionmodify') && $tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"],array('system','systemauto'))) {
-        $listfield=explode(',','color,position');
-        $listfieldmodify=explode(',','color,position');
-        $listfieldvalue=explode(',','color,position');
-    }
-
     // Check that all fields are filled
     $ok=1;
     foreach ($listfield as $f => $value)
@@ -1110,7 +1104,7 @@ if ($id)
 
         if (empty($reshook))
         {
-       		fieldList($fieldlist,$langs,$obj,$tabname[$id],'add');
+       		fieldList($fieldlist, $obj, $tabname[$id], 'add');
         }
 
         if ($id == 4) print '<td></td>';
@@ -1310,13 +1304,7 @@ if ($id)
                     $error=$hookmanager->error; $errors=$hookmanager->errors;
 
                     // Show fields
-                    if (empty($reshook)) {
-                        $fieldl = $fieldlist;
-                        if ($tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm" && in_array($obj->type, array('system', 'systemauto'))) {
-                            $fieldl=array(array('code'),array('libelle'),array('type'),'color','position');
-                        }
-                        fieldList($fieldl, $langs, $obj, $tabname[$id], 'edit');
-                    }
+                    if (empty($reshook)) fieldList($fieldlist, $obj, $tabname[$id], 'edit');
 
                     print '<td colspan="3" align="center">';
                     print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
@@ -1657,15 +1645,14 @@ $db->close();
  *	Show fields in insert/edit mode
  *
  * 	@param		array		$fieldlist		Array of fields
- * 	@param		Translate	$langs			Translate class
  * 	@param		Object		$obj			If we show a particular record, obj is filled with record fields
  *  @param		string		$tabname		Name of SQL table
  *  @param		string		$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *	@return		void
  */
-function fieldList($fieldlist, $langs, $obj='', $tabname='', $context='')
+function fieldList($fieldlist, $obj='', $tabname='', $context='')
 {
-	global $conf,$db;
+	global $conf,$langs,$db;
 	global $form;
 	global $region_id;
 	global $elementList,$sourceList,$localtax_typeList;
@@ -1677,7 +1664,15 @@ function fieldList($fieldlist, $langs, $obj='', $tabname='', $context='')
 
 	foreach ($fieldlist as $field => $value)
 	{
-		if ($fieldlist[$field] == 'country')
+	    if (in_array($fieldlist[$field], array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX."c_actioncomm" && in_array($obj->type, array('system','systemauto')))
+        {
+            $hidden = (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'');
+            print '<td>';
+            print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$hidden.'">';
+            print $langs->trans($hidden);
+            print '</td>';
+        }
+	    elseif ($fieldlist[$field] == 'country')
 		{
 			if (in_array('region_id',$fieldlist))
 			{
@@ -1823,14 +1818,6 @@ function fieldList($fieldlist, $langs, $obj='', $tabname='', $context='')
 			}
 			print '</td>';
 		}
-        elseif (is_array($fieldlist[$field]))
-        {
-            $hidden = (! empty($obj->{$fieldlist[$field][0]})?$obj->{$fieldlist[$field][0]}:'');
-            print '<td>';
-            print '<input type="hidden" name="'.$fieldlist[$field][0].'" value="'.$hidden.'">';
-            print $langs->trans($hidden);
-            print '</td>';
-        }
 		else
 		{
 			$classtd=''; $class='';

From b35b40e2bf21cb827fd2c8ee3bfd00ae005db61e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 17:08:42 +0200
Subject: [PATCH 0877/1163] Align position of right

---
 htdocs/admin/dict.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index ee21a8ccfbe..8319ccd0450 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1228,6 +1228,7 @@ if ($id)
             if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
             if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
             if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='position')        { $align='right'; }
             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
             {
                 //if ($id != 25) $valuetoshow=$form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
@@ -1494,6 +1495,7 @@ if ($id)
                             $class='tddict';
                             if ($fieldlist[$field] == 'tracking') $class.=' tdoverflowauto';
                             if ($fieldlist[$field] == 'code') $class.=' width100';
+                            if ($fieldlist[$field] == 'position') $class.=' right';
                             // Show value for field
 							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
                         }

From c30dcf78cb329dae0711f734ecc0c061390d95f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 17:24:15 +0200
Subject: [PATCH 0878/1163] Show info when link has been deleted

---
 htdocs/comm/action/card.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 30b13bc3007..2b10f0c2f26 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
@@ -1396,7 +1396,11 @@ if ($id > 0)
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 			print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
-			print '<td colspan="3">'.dolGetElementUrl($object->fk_element,$object->elementtype,1).'</td></tr>';
+			$link=dolGetElementUrl($object->fk_element,$object->elementtype,1);
+			print '<td colspan="3">';
+			if (empty($link)) print '<span class="opacitymedium">'.$langs->trans("ObjectDeleted").'</span>';
+			else print $link;
+			print '</td></tr>';
 		}
 
 		// Description

From 807c77f754f922133e78c9c93c392a0b8eeded89 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 18:03:49 +0200
Subject: [PATCH 0879/1163] Fix inconsistent options

---
 htdocs/admin/agenda_other.php    | 23 -----------------------
 htdocs/comm/action/card.php      |  2 +-
 htdocs/comm/action/index.php     |  1 -
 htdocs/core/class/conf.class.php |  6 ++++++
 htdocs/societe/ajax/company.php  |  6 +++---
 5 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 55b61145b6a..bd9587a4440 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -432,29 +432,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0)
     }
 }
 
-// AGENDA_SHOW_LINKED_OBJECT
-$var=!$var;
-print '<tr '.$bc[$var].'>'."\n";
-print '<td>'.$langs->trans("AGENDA_SHOW_LINKED_OBJECT").'</td>'."\n";
-print '<td align="center">&nbsp;</td>'."\n";
-print '<td align="right">'."\n";
-if (! empty($conf->use_javascript_ajax))
-{
-    print ajax_constantonoff('AGENDA_SHOW_LINKED_OBJECT');
-}
-else
-{
-    if (empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))
-    {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_SHOW_LINKED_OBJECT">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-    }
-    else
-    {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_SHOW_LINKED_OBJECT">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
-    }
-}
-print '</td></tr>'."\n";
-
 print '</table>';
 
 dol_fiche_end();
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 2b10f0c2f26..02ee84dc2de 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1114,7 +1114,7 @@ if ($id > 0)
 			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php?showempty=1',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 			// TODO Refresh also list of project if $conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY not defined with list linked to socid ?
 			// FIXME If we change company, we may get a project that does not match
-			print $form->select_company($object->socid, 'socid', '', 'SelectThirdParty', 1, 0, $events, 0);
+			print $form->select_company($object->socid, 'socid', '', 'SelectThirdParty', 1, 0, $events, 0, 'minwidth200');
 			print '</div>';
 			print '</td></tr>';
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 0a8ab49ea38..307d6417285 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -160,7 +160,6 @@ if ($action =='delete_action')
 }
 
 
-
 /*
  * View
  */
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 28a287971a8..578ed17049e 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -580,6 +580,12 @@ class Conf
 
 		if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) $this->global->MAIN_SIZE_SHORTLIST_LIMIT=3;
 
+		// Save inconsistent option
+		if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && $conf->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')
+		{
+		    $conf->global->AGENDA_DEFAULT_FILTER_TYPE='0';    // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
+		}
+		    
 		// For backward compatibility
 		if (isset($this->product))   $this->produit=$this->product;
 		if (isset($this->facture))   $this->invoice=$this->facture;
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index 32f57f73c25..d57a6f3fca6 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -83,11 +83,11 @@ else
 	sort($match);
 	$id = (! empty($match[0]) ? $match[0] : '');
 
-	if (! GETPOST($htmlname) && ! GETPOST($id)) return;
-
 	// When used from jQuery, the search term is added as GET param "term".
-	$searchkey=(GETPOST($id)?GETPOST($id):(GETPOST($htmlname)?GETPOST($htmlname):''));
+	$searchkey=(($id && GETPOST($id, 'alpha'))?GETPOST($id, 'alpha'):(($htmlname && GETPOST($htmlname, 'alpha'))?GETPOST($htmlname, 'alpha'):''));
 
+	if (! $searchkey) return;
+	
 	$form = new Form($db);
 	$arrayresult=$form->select_thirdparty_list(0,$htmlname,$filter,1,0,0,null,$searchkey,$outjson);
 

From ba5fb700baae1931aba39baa32e5e1bd238a4dba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 18:35:52 +0200
Subject: [PATCH 0880/1163] Missing translation

---
 htdocs/langs/en_US/contracts.lang | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index 880f00a9331..f742ca4cecd 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -83,6 +83,8 @@ NoteListOfYourExpiredServices=This list contains only services of contracts for
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
 OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+CloneContract=Clone contract
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract

From 06b37d0e8285112ed10553ca636619b6bfdbd0c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 May 2017 20:17:33 +0200
Subject: [PATCH 0881/1163] Work on dol_check_secure_access_document to support
 write question

---
 htdocs/core/lib/files.lib.php    | 20 ++++++++++++++------
 htdocs/core/lib/security.lib.php |  1 +
 test/phpunit/FilesLibTest.php    | 21 +++++++++++++++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 4c3be3cc4d1..f9f6efea8d5 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1642,9 +1642,11 @@ function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta
  * @param	string	$entity				Restrict onto entity
  * @param  	User	$fuser				User object (forced)
  * @param	string	$refname			Ref of object to check permission for external users (autodetect if not provided)
+ * @param   string  $more               Check permission for 'read' or 'write'               
  * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
+ * @see restrictedArea
  */
-function dol_check_secure_access_document($modulepart,$original_file,$entity,$fuser='',$refname='')
+function dol_check_secure_access_document($modulepart,$original_file,$entity,$fuser='',$refname='',$mode='read')
 {
 	global $user, $conf, $db;
 	global $dolibarr_main_data_root;
@@ -2246,6 +2248,12 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
     // If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
     else
 	{
+	    $lire='lire'; $read='read'; $download='download';
+	    if ($mode == 'write')
+	    {
+	        $lire='creer'; $read='write'; $download='upload';
+	    }
+	    
 	    if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path. 
 	    if ($fuser->admin) $accessallowed=1;    // If user is admin
 
@@ -2257,7 +2265,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->lire || $fuser->rights->{$reg[1]}->read || ($fuser->rights->{$reg[1]}->download)) $accessallowed=1;
+		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
 		}
 		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
@@ -2267,7 +2275,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->lire || $fuser->rights->{$reg[1]}->read || ($fuser->rights->{$reg[1]}->download)) $accessallowed=1;
+		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
 		}
 		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
@@ -2277,7 +2285,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->lire || $fuser->rights->{$reg[1]}->read || ($fuser->rights->{$reg[1]}->download)) $accessallowed=1;
+		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
 			$original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
 		}
 		else
@@ -2297,7 +2305,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 			}
 			else
 			{
-				if ($fuser->rights->$modulepart->lire || $fuser->rights->$modulepart->read) $accessallowed=1;
+				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed=1;
 				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
 			}
 		}
@@ -2307,7 +2315,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 		if (! empty($conf->global->$subPermCategoryConstName))
 		{
 			$subPermCategory = $conf->global->$subPermCategoryConstName;
-			if (! empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->lire) || ($fuser->rights->$modulepart->$subPermCategory->read) || ($fuser->rights->$modulepart->$subPermCategory->download)))
+			if (! empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download})))
 			{
 				$accessallowed=1;
 			}
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index ccc8a68a5d9..6993ad496ea 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -109,6 +109,7 @@ function dol_hash($chain,$type=0)
  *  @param  string	$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)
  *  @param	Canvas	$objcanvas		Object canvas
  * 	@return	int						Always 1, die process if not allowed
+ *  @see dol_check_secure_access_document
  */
 function restrictedArea($user, $features, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid', $objcanvas=null)
 {
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index f9000006b46..ddfcb8ed217 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -418,4 +418,25 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(1,count($founddirs));
     }
 
+
+    /**
+     * testDolCheckSecureAccessDocument
+     *
+     * @return void
+     */
+    public function testDolCheckSecureAccessDocument()
+    {
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+    
+        //$dummyuser=new User($db);
+        //$result=restrictedArea($dummyuser,'societe');
+    
+        //$result=dol_check_secure_access_document($user,'societe');
+        //$this->assertEquals(1,$result);
+    }    
+    
 }

From 4ff9607011e5cd83a9cbd0a82b47474afbbd963d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 20 May 2017 07:56:33 +0200
Subject: [PATCH 0882/1163] Update table accounting_bookeeping to prepare FEC
 format and harmonization

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   | 12 +++++
 .../tables/llx_accounting_bookkeeping.sql     | 54 +++++++++++--------
 2 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 6ba7707b249..00f616ca56f 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -141,6 +141,18 @@ ALTER TABLE llx_bank_account ADD INDEX idx_fk_accountancy_journal (fk_accountanc
 UPDATE llx_bank_account as ba set fk_accountancy_journal = (SELECT rowid FROM llx_accounting_journal as aj where ba.accountancy_journal = aj.code) where accountancy_journal not in ('1', '2', '3', '4', '5', '6', '5', '8', '9', '10', '11', '12', '13', '14', '15');
 ALTER TABLE llx_bank_account ADD CONSTRAINT fk_bank_account_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
 
+--Update general ledger for FEC format & harmonization
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN code_tiers varchar(32);
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN label_compte varchar(255);
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN code_journal varchar(32);
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN thirdparty_label varchar(255) AFTER code_tiers;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN label_operation varchar(255) AFTER label_compte;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN multicurrency_amount double AFTER sens;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN multicurrency_code varchar(255) AFTER multicurrency_amount;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN lettering_code varchar(255) AFTER multicurrency_code;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN date_lettering datetime AFTER lettering_code;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN journal_label varchar(255) AFTER code_journal;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN date_validated datetime AFTER validated;
 
 ALTER TABLE llx_paiementfourn ADD COLUMN model_pdf varchar(255);
 
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index c72186c6910..651fee6c339 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -1,6 +1,6 @@
 -- ============================================================================
 -- Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
--- Copyright (C) 2013-2014 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+-- Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -19,26 +19,34 @@
 
 CREATE TABLE llx_accounting_bookkeeping 
 (
-  rowid				integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  entity			integer DEFAULT 1 NOT NULL,	  -- multi company id
-  doc_date			date NOT NULL,
-  doc_type			varchar(30) NOT NULL,	-- facture_client/reglement_client/facture_fournisseur/reglement_fournisseur
-  doc_ref			varchar(300) NOT NULL,	-- facture_client/reglement_client/... reference number
-  fk_doc			integer NOT NULL,		-- facture_client/reglement_client/... rowid
-  fk_docdet			integer NOT NULL,		-- facture_client/reglement_client/... line rowid
-  code_tiers		varchar(24),			-- code tiers
-  numero_compte		varchar(32) NOT NULL,
-  label_compte		varchar(128) NOT NULL,
-  debit				double NOT NULL,
-  credit			double NOT NULL,
-  montant			double NOT NULL,
-  sens				varchar(1) DEFAULT NULL,
-  fk_user_author	integer NOT NULL,						-- user creating
-  fk_user_modif     integer,                                -- user making last change
-  date_creation		datetime,								-- date de creation
-  tms               timestamp,								-- date last modification 
-  import_key		varchar(14),
-  code_journal		varchar(10) NOT NULL,
-  piece_num			integer NOT NULL,
-  validated         tinyint DEFAULT 0 NOT NULL -- 0 line not validated / 1 line validated (No deleting / No modification) 
+  rowid                 integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  entity                integer DEFAULT 1 NOT NULL,	-- 					| multi company id
+  doc_date              date NOT NULL,				-- FEC:PieceDate
+  doc_type              varchar(30) NOT NULL,		-- FEC:PieceRef		| facture_client/reglement_client/facture_fournisseur/reglement_fournisseur
+  doc_ref               varchar(300) NOT NULL,		-- 					| facture_client/reglement_client/... reference number
+  fk_doc                integer NOT NULL,			-- 					| facture_client/reglement_client/... rowid
+  fk_docdet             integer NOT NULL,			-- 					| facture_client/reglement_client/... line rowid
+  code_tiers            varchar(32),				-- FEC:CompAuxNum	| account number of auxiliary account
+  thirdparty_label      varchar(255),				-- FEC:CompAuxLib	| label of auxiliary account
+  numero_compte         varchar(32) NOT NULL,		-- FEC:CompteNum	| account number
+  label_compte          varchar(255) NOT NULL,		-- FEC:CompteLib	| label of account
+  label_operation       varchar(255),				-- FEC:EcritureLib	| label of the operation
+  debit                 double NOT NULL,			-- FEC:Debit
+  credit                double NOT NULL,			-- FEC:Credit
+  montant               double NOT NULL,			-- FEC:Montant (Not necessary)
+  sens                  varchar(1) DEFAULT NULL,	-- FEC:Sens (Not necessary)
+  multicurrency_amount  double,						-- FEC:Montantdevise
+  multicurrency_code    varchar(255),				-- FEC:Idevise
+  lettering_code        varchar(255),				-- FEC:EcritureLet
+  date_lettering        datetime,					-- FEC:DateLet
+  fk_user_author        integer NOT NULL,			-- 					| user creating
+  fk_user_modif         integer,					-- 					| user making last change
+  date_creation         datetime,					-- FEC:EcritureDate	| creation date
+  tms                   timestamp,					--					| date last modification 
+  import_key            varchar(14),
+  code_journal          varchar(32) NOT NULL,		-- FEC:JournalCode
+  journal_label         varchar(255),				-- FEC:JournalLib
+  piece_num             integer NOT NULL,			-- FEC:EcritureNum
+  validated             tinyint DEFAULT 0 NOT NULL,	-- 					| 0 line not validated / 1 line validated (No deleting / No modification) 
+  date_validated        datetime					-- FEC:ValidDate
 ) ENGINE=innodb;

From df05980c3a7d9f011000a7f7a5b20fdd0daab450 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 10:42:45 +0200
Subject: [PATCH 0883/1163] Prepare table of notification per object (exemple
 agenda events)

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   | 13 ++++++++
 .../install/mysql/tables/llx_actioncomm.sql   |  2 +-
 htdocs/install/mysql/tables/llx_notify.sql    |  1 +
 .../install/mysql/tables/llx_notify_def.sql   |  5 ++--
 .../mysql/tables/llx_notify_def_object.sql    | 30 +++++++++++++++++++
 5 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_notify_def_object.sql

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 99a00b033c6..fc4bdceb149 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -24,6 +24,19 @@
 -- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
+
+create table llx_notify_def_object
+(
+  id				integer AUTO_INCREMENT PRIMARY KEY,
+  entity			integer DEFAULT 1 NOT NULL,		-- multi company id
+  objet_type		varchar(16),					-- 'actioncomm'
+  objet_id			integer NOT NULL,				-- id of parent key
+  type_notif		varchar(16) DEFAULT 'browser',	-- 'browser', 'email', 'sms', 'webservice', ...
+  date_notif		datetime,						-- date notification
+  user_id			integer,						-- notification is for this user
+  moreparam			varchar(255)
+)ENGINE=innodb;
+
 ALTER TABLE llx_facturedet_rec ADD COLUMN vat_src_code varchar(10) DEFAULT '' AFTER tva_tx;
 
 ALTER TABLE llx_extrafields ADD COLUMN langs varchar(24);
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index 46017d1e739..4849aacb690 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -64,7 +64,7 @@ create table llx_actioncomm
   email_tobcc		varchar(256),					-- when event was an email, we store here the email_tobcc
   errors_to			varchar(256),					-- when event was an email, we store here the erros_to
   
-  recurid           varchar(128),                   -- used to store event id to link each other all the repeating event records  
+  recurid           varchar(128),                   -- used to store event id to link each other all the repeating event record
   recurrule         varchar(128),					-- contains string with ical format recurring rule like "FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=19" or "FREQ=WEEKLY;BYDAY=MO"
   recurdateend      datetime,						-- no more recurring event after this date
      
diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql
index f595dc7c126..b0fa333dbb9 100644
--- a/htdocs/install/mysql/tables/llx_notify.sql
+++ b/htdocs/install/mysql/tables/llx_notify.sql
@@ -16,6 +16,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
+-- Table of notification done
 -- ===================================================================
 
 create table llx_notify
diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql
index a3fc123c8dd..3641e8cd2e7 100644
--- a/htdocs/install/mysql/tables/llx_notify_def.sql
+++ b/htdocs/install/mysql/tables/llx_notify_def.sql
@@ -15,16 +15,17 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
+-- Table to declare permanent notifications (per workflow event)
 -- ===================================================================
 
 create table llx_notify_def
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   tms             timestamp,
-  datec           date,             -- date de creation
+  datec           date,             			-- date de creation
   fk_action       integer NOT NULL,
   fk_soc          integer,
   fk_contact      integer,
   fk_user		  integer,
-  type            varchar(16) DEFAULT 'email'
+  type            varchar(16) DEFAULT 'email'	-- 'browser', 'email', 'sms', 'webservice', ...
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_notify_def_object.sql b/htdocs/install/mysql/tables/llx_notify_def_object.sql
new file mode 100644
index 00000000000..d1ddd2d1b99
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_notify_def_object.sql
@@ -0,0 +1,30 @@
+-- ========================================================================
+-- Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Table to declare notifications (per object)
+-- ========================================================================
+
+create table llx_notify_def_object
+(
+  id				integer AUTO_INCREMENT PRIMARY KEY,
+  entity			integer DEFAULT 1 NOT NULL,		-- multi company id
+  objet_type		varchar(16),					-- 'actioncomm'
+  objet_id			integer NOT NULL,				-- id of parent key
+  type_notif		varchar(16) DEFAULT 'browser',	-- 'browser', 'email', 'sms', 'webservice', ...
+  date_notif		datetime,						-- date notification
+  user_id			integer,						-- notification is for this user
+  moreparam			varchar(255)
+)ENGINE=innodb;

From 601f3ea75e585eff80142a1929ee5ea09d0ba4d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 11:31:03 +0200
Subject: [PATCH 0884/1163] Fix dol_check_secure_access_document in write mode,
 add phpunit tests

---
 htdocs/core/lib/files.lib.php | 123 +++++++++++++++++-----------------
 test/phpunit/FilesLibTest.php |  45 ++++++++++++-
 2 files changed, 104 insertions(+), 64 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index f9f6efea8d5..437811d8e98 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1639,14 +1639,14 @@ function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta
  *
  * @param	string	$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp')
  * @param	string	$original_file		Relative path with filename, relative to modulepart.
- * @param	string	$entity				Restrict onto entity
+ * @param	string	$entity				Restrict onto entity (0=no restriction)
  * @param  	User	$fuser				User object (forced)
  * @param	string	$refname			Ref of object to check permission for external users (autodetect if not provided)
  * @param   string  $more               Check permission for 'read' or 'write'               
  * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
  * @see restrictedArea
  */
-function dol_check_secure_access_document($modulepart,$original_file,$entity,$fuser='',$refname='',$mode='read')
+function dol_check_secure_access_document($modulepart, $original_file, $entity, $fuser='', $refname='', $mode='read')
 {
 	global $user, $conf, $db;
 	global $dolibarr_main_data_root;
@@ -1666,6 +1666,13 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 
 	$relative_original_file = $original_file;
 
+	// Define possible keys to use for permission check
+	$lire='lire'; $read='read'; $download='download';
+	if ($mode == 'write')
+	{
+	    $lire='creer'; $read='write'; $download='upload';
+	}
+	 
 	// Wrapping for some images
 	if (($modulepart == 'mycompany' || $modulepart == 'companylogo') && !empty($conf->mycompany->dir_output))
 	{
@@ -1687,125 +1694,125 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les apercu factures
 	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->lire) $accessallowed=1;
+		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
 		$original_file=$conf->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu propal
 	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->dir_output))
 	{
-		if ($fuser->rights->propale->lire) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
 		$original_file=$conf->propal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu commande
 	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->lire) $accessallowed=1;
+		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
 		$original_file=$conf->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-	    if ($fuser->rights->ficheinter->lire) $accessallowed=1;
+	    if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
 	    $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu conat
 	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
 	{
-	    if ($fuser->rights->contrat->lire) $accessallowed=1;
+	    if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
 	    $original_file=$conf->contrat->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
-	    if ($fuser->rights->supplier_proposal->lire) $accessallowed=1;
+	    if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
 	    $original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
-	    if ($fuser->rights->fournisseur->commande->lire) $accessallowed=1;
+	    if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
 	    $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
 	{
-	    if ($fuser->rights->fournisseur->facture->lire) $accessallowed=1;
+	    if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
 	    $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->dir_temp))
 	{
-		if ($fuser->rights->propale->lire) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
 		$original_file=$conf->propal->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats commandes
 	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
 	{
-		if ($fuser->rights->commande->lire) $accessallowed=1;
+		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
 		$original_file=$conf->commande->dir_temp.'/'.$original_file;
 	}
 	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->lire) $accessallowed=1;
+		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
 		$original_file=$conf->fournisseur->dir_output.'/commande/temp/'.$original_file;
 	}
 	// Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
 	{
-		if ($fuser->rights->facture->lire) $accessallowed=1;
+		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
 		$original_file=$conf->facture->dir_temp.'/'.$original_file;
 	}
 	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->lire) $accessallowed=1;
+		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
 		$original_file=$conf->fournisseur->dir_output.'/facture/temp/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
 	{
-		if ($fuser->rights->expedition->lire) $accessallowed=1;
+		if ($fuser->rights->expedition->{$lire}) $accessallowed=1;
 		$original_file=$conf->expedition->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
 	{
-		if ($fuser->rights->deplacement->lire) $accessallowed=1;
+		if ($fuser->rights->deplacement->{$lire}) $accessallowed=1;
 		$original_file=$conf->deplacement->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
 	{
-		if ($fuser->rights->adherent->lire) $accessallowed=1;
+		if ($fuser->rights->adherent->{$lire}) $accessallowed=1;
 		$original_file=$conf->adherent->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats produits
 	elseif (preg_match('/^productstats_/i',$modulepart) && !empty($conf->product->dir_temp))
 	{
-		if ($fuser->rights->produit->lire || $fuser->rights->service->lire) $accessallowed=1;
+		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed=1;
 		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
 	}
 	// Wrapping for taxes
 	elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
 	{
-		if ($fuser->rights->tax->charges->lire) $accessallowed=1;
+		if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
 		$original_file=$conf->tax->dir_output.'/'.$original_file;
 	}
 	// Wrapping for events
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->read) $accessallowed=1;
+		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed=1;
 		$original_file=$conf->agenda->dir_output.'/'.$original_file;
 	}
 	// Wrapping for categories
 	elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output))
 	{
-		if ($fuser->rights->categorie->lire) $accessallowed=1;
+		if ($fuser->rights->categorie->{$lire}) $accessallowed=1;
 		$original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les prelevements
 	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
 	{
-		if ($fuser->rights->prelevement->bons->lire || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
+		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
 		$original_file=$conf->prelevement->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les graph energie
@@ -1856,7 +1863,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping for users
 	else if ($modulepart == 'user' && !empty($conf->user->dir_output))
 	{
-        $canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->lire);
+        $canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->{$lire});
         if ($fuser->id == (int) $refname) { $canreaduser=1; } // A user can always read its own card
         if ($canreaduser || preg_match('/^specimen/i',$original_file))
 	    {
@@ -1868,7 +1875,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping for third parties
 	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
 	{
-		if ($fuser->rights->societe->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -1879,7 +1886,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping for contact
 	else if ($modulepart == 'contact' && !empty($conf->societe->dir_output))
 	{
-		if ($fuser->rights->societe->lire)
+		if ($fuser->rights->societe->{$lire})
 		{
 			$accessallowed=1;
 		}
@@ -1889,7 +1896,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping for invoices
 	else if (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -1899,7 +1906,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping for mass actions
 	else if ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->dir_output))
 	{
-	    if ($fuser->rights->propal->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1907,7 +1914,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'massfilesarea_orders')
 	{
-	    if ($fuser->rights->commande->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1915,7 +1922,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'massfilesarea_invoices')
 	{
-	    if ($fuser->rights->facture->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1923,7 +1930,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'massfilesarea_expensereport')
 	{
-	    if ($fuser->rights->facture->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1931,7 +1938,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'massfilesarea_interventions')
 	{
-	    if ($fuser->rights->ficheinter->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1939,7 +1946,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->propal->dir_output))
 	{
-	    if ($fuser->rights->supplier_proposal->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1947,7 +1954,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'massfilesarea_supplier_order')
 	{
-	    if ($fuser->rights->fournisseur->commande->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1955,7 +1962,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'massfilesarea_supplier_invoice')
 	{
-	    if ($fuser->rights->fournisseur->facture->lire || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
@@ -1965,7 +1972,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping for interventions
 	else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-		if ($fuser->rights->ficheinter->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -1976,7 +1983,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les deplacements et notes de frais
 	else if ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output))
 	{
-		if ($fuser->rights->deplacement->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -1986,7 +1993,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les propales
 	else if ($modulepart == 'propal' && !empty($conf->propal->dir_output))
 	{
-		if ($fuser->rights->propale->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -1998,7 +2005,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les commandes
 	else if (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2009,7 +2016,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les projets
 	else if ($modulepart == 'project' && !empty($conf->projet->dir_output))
 	{
-		if ($fuser->rights->projet->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2018,7 +2025,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	}
 	else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
-		if ($fuser->rights->projet->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2029,7 +2036,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les commandes fournisseurs
 	else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output)) 
 	{
-		if ($fuser->rights->fournisseur->commande->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2040,7 +2047,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les factures fournisseurs
 	else if (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2050,7 +2057,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les rapport de paiements
 	else if ($modulepart == 'supplier_payment')
 	{
-		if ($fuser->rights->fournisseur->facture->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2061,7 +2068,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les rapport de paiements
 	else if ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2082,7 +2089,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les expedition
 	else if ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))
 	{
-		if ($fuser->rights->expedition->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2091,7 +2098,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les bons de livraison
 	else if ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
 	{
-		if ($fuser->rights->expedition->livraison->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2101,7 +2108,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les actions
 	else if ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->read || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2111,7 +2118,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les actions
 	else if ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp))
 	{
-		if ($fuser->rights->agenda->allactions->read || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2121,7 +2128,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les produits et services
 	else if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
 	{
-		if (($fuser->rights->produit->lire || $fuser->rights->service->lire) || preg_match('/^specimen/i',$original_file))
+		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2132,7 +2139,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les contrats
 	else if ($modulepart == 'contract' && !empty($conf->contrat->dir_output))
 	{
-		if ($fuser->rights->contrat->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2143,7 +2150,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les dons
 	else if ($modulepart == 'donation' && !empty($conf->don->dir_output))
 	{
-		if ($fuser->rights->don->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2153,7 +2160,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour les remises de cheques
 	else if ($modulepart == 'remisecheque' && !empty($conf->banque->dir_output))
 	{
-		if ($fuser->rights->banque->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2164,7 +2171,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping for bank
 	else if ($modulepart == 'bank' && !empty($conf->bank->dir_output))
 	{
-		if ($fuser->rights->banque->lire)
+		if ($fuser->rights->banque->{$lire})
 		{
 			$accessallowed=1;
 		}
@@ -2227,7 +2234,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 	// Wrapping pour Foundation module
 	else if ($modulepart == 'member' && !empty($conf->adherent->dir_output))
 	{
-		if ($fuser->rights->adherent->lire || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
@@ -2248,12 +2255,6 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
     // If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
     else
 	{
-	    $lire='lire'; $read='read'; $download='download';
-	    if ($mode == 'write')
-	    {
-	        $lire='creer'; $read='write'; $download='upload';
-	    }
-	    
 	    if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path. 
 	    if ($fuser->admin) $accessallowed=1;    // If user is admin
 
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index ddfcb8ed217..819c44216fe 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -434,9 +434,48 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
     
         //$dummyuser=new User($db);
         //$result=restrictedArea($dummyuser,'societe');
+
+        $user->rights->facture->lire = 0;
+        $user->rights->facture->creer = 0;
+        $filename='SPECIMEN.pdf';             // Filename relative to module part
+        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+        $this->assertEquals(1,$result['accessallowed']);
+        
+        
+        // Check read permission
+        $user->rights->facture->lire = 1;
+        $user->rights->facture->creer = 1;
+        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
+        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+        $this->assertEquals(1,$result['accessallowed']);
+        
+        $user->rights->facture->lire = 0;
+        $user->rights->facture->creer = 0;
+        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
+        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+        $this->assertEquals(0,$result['accessallowed']);
+        
+        // Check write permission
+        $user->rights->facture->lire = 0;
+        $user->rights->facture->creer = 0;
+        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
+        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+        var_dump($result);
+        $this->assertEquals(0,$result['accessallowed']);
+        
+        $user->rights->facture->lire = 1;
+        $user->rights->facture->creer = 1;
+        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
+        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+        var_dump($result);
+        $this->assertEquals(1,$result['accessallowed']);
     
-        //$result=dol_check_secure_access_document($user,'societe');
-        //$this->assertEquals(1,$result);
+        $user->rights->facture->lire = 1;
+        $user->rights->facture->creer = 0;
+        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
+        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+        var_dump($result);
+        $this->assertEquals(0,$result['accessallowed']);
     }    
-    
+
 }

From 864dc0d9897dc2f84599b58fa5dc258e97ff89cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 11:59:32 +0200
Subject: [PATCH 0885/1163] Remove var_dump

---
 test/phpunit/FilesLibTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index 819c44216fe..d1a5f48ae8d 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -460,21 +460,18 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
         $user->rights->facture->creer = 0;
         $filename='FA010101/FA010101.pdf';    // Filename relative to module part
         $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
-        var_dump($result);
         $this->assertEquals(0,$result['accessallowed']);
         
         $user->rights->facture->lire = 1;
         $user->rights->facture->creer = 1;
         $filename='FA010101/FA010101.pdf';    // Filename relative to module part
         $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
-        var_dump($result);
         $this->assertEquals(1,$result['accessallowed']);
     
         $user->rights->facture->lire = 1;
         $user->rights->facture->creer = 0;
         $filename='FA010101/FA010101.pdf';    // Filename relative to module part
         $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
-        var_dump($result);
         $this->assertEquals(0,$result['accessallowed']);
     }    
 

From 80cbc2838585997c50731d647059e8a78be3a10b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 15:52:36 +0200
Subject: [PATCH 0886/1163] NEW Add REST API to push a file.

---
 htdocs/accountancy/admin/categories_list.php  |   2 +-
 htdocs/accountancy/admin/journals_list.php    |   2 +-
 htdocs/admin/dict.php                         |   4 +-
 htdocs/admin/mails_templates.php              |   2 +-
 htdocs/api/admin/explorer.php                 |   2 +
 ....php => api_dictionarycountries.class.php} |   5 +-
 ...lass.php => api_dictionarytowns.class.php} |   5 +-
 htdocs/api/class/api_documents.class.php      | 127 +++++++++++++-----
 htdocs/api/class/api_login.class.php          |   2 +-
 htdocs/core/class/html.form.class.php         |   2 +-
 htdocs/core/lib/functions.lib.php             |   4 +-
 htdocs/core/modules/modResource.class.php     |   2 +-
 .../install/mysql/migration/4.0.0-5.0.0.sql   |   2 +-
 .../mysql/tables/llx_user_employment.sql      |   2 +-
 htdocs/variants/generator.php                 |  14 +-
 test/phpunit/RestAPIDocumentTest.php          |  21 ++-
 16 files changed, 126 insertions(+), 72 deletions(-)
 rename htdocs/api/class/{api_dictionnarycountries.class.php => api_dictionarycountries.class.php} (97%)
 rename htdocs/api/class/{api_dictionnarytowns.class.php => api_dictionarytowns.class.php} (95%)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 86be6aa52ab..c0fa895ae4c 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -929,7 +929,7 @@ if ($id)
                     {
                         print '<td align="center">';
                         if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
-                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionnary can be edited by other profile than admin
+                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
                     }
                     else print '<td>&nbsp;</td>';
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index facb507c530..1421d71be97 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -676,7 +676,7 @@ if ($id)
                     {
                         print '<td align="center">';
                         if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
-                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionnary can be edited by other profile than admin
+                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
                     }
                     else print '<td>&nbsp;</td>';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 8319ccd0450..28db9ef8b49 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1100,7 +1100,7 @@ if ($id)
         $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
         $error=$hookmanager->error; $errors=$hookmanager->errors;
 
-        if ($id == 3) unset($fieldlist[2]); // Remove field ??? if dictionnary Regions
+        if ($id == 3) unset($fieldlist[2]); // Remove field ??? if dictionary Regions
 
         if (empty($reshook))
         {
@@ -1555,7 +1555,7 @@ if ($id)
                     {
                         print '<td align="center">';
                         if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
-                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionnary can be edited by other profile than admin
+                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
                     }
                     else print '<td>&nbsp;</td>';
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index a403cf1f493..b9e5df738ad 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -767,7 +767,7 @@ if ($resql)
                 {
                     print '<td align="center">';
                     if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
-                    //else print '<a href="#">'.img_delete().'</a>';    // Some dictionnary can be edited by other profile than admin
+                    //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                     print '</td>';
                 }
                 else print '<td>&nbsp;</td>';
diff --git a/htdocs/api/admin/explorer.php b/htdocs/api/admin/explorer.php
index c83d759dcd6..b09acb6772a 100644
--- a/htdocs/api/admin/explorer.php
+++ b/htdocs/api/admin/explorer.php
@@ -14,6 +14,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * @deprecated      Old explorer. Not using Swagger. See instead explorer in htdocs/api/index.php.
  */
 
 /**
diff --git a/htdocs/api/class/api_dictionnarycountries.class.php b/htdocs/api/class/api_dictionarycountries.class.php
similarity index 97%
rename from htdocs/api/class/api_dictionnarycountries.class.php
rename to htdocs/api/class/api_dictionarycountries.class.php
index ddb3e2474a9..070be509a8a 100644
--- a/htdocs/api/class/api_dictionnarycountries.class.php
+++ b/htdocs/api/class/api_dictionarycountries.class.php
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
  * @access protected
  * @class DolibarrApiAccess {@requires user,external}
  */
-class DictionnaryCountries extends DolibarrApi
+class DictionaryCountries extends DolibarrApi
 {
     private $translations = null;
 
@@ -93,7 +93,8 @@ class DictionnaryCountries extends DolibarrApi
 
         if ($result) {
             $num = $this->db->num_rows($result);
-            for ($i = 0; $i < min($num, ($limit <= 0 ? $num : $limit)); $i++) {
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
                 $obj = $this->db->fetch_object($result);
                 $country = new Ccountry($this->db);
                 if ($country->fetch($obj->rowid) > 0) {
diff --git a/htdocs/api/class/api_dictionnarytowns.class.php b/htdocs/api/class/api_dictionarytowns.class.php
similarity index 95%
rename from htdocs/api/class/api_dictionnarytowns.class.php
rename to htdocs/api/class/api_dictionarytowns.class.php
index da58c9109eb..0ebcfbe0b17 100644
--- a/htdocs/api/class/api_dictionnarytowns.class.php
+++ b/htdocs/api/class/api_dictionarytowns.class.php
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
  * @access protected
  * @class DolibarrApiAccess {@requires user,external}
  */
-class DictionnaryTowns extends DolibarrApi
+class DictionaryTowns extends DolibarrApi
 {
     /**
      * Constructor
@@ -88,7 +88,8 @@ class DictionnaryTowns extends DolibarrApi
 
         if ($result) {
             $num = $this->db->num_rows($result);
-            for ($i = 0; $i < min($num, ($limit <= 0 ? $num : $limit)); $i++) {
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
                 $list[] = $this->db->fetch_object($result);
             }
         } else {
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index ca10b2befce..6650fc45401 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -58,23 +58,33 @@ class Documents extends DolibarrApi
      *
      * @return array
      * @throws RestException
-     *
      */
+     /*
      public function get($module_part, $filename) {
 
-     }
+     }*/
 
 
     /**
-     * Receive file
+     * Push a file. 
+     * Test sample: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "" }
      *
-     * @param   array   $request_data   Request datas
-     *
-     * @return  bool     State of copy
+     * @param   string  $filename           Name of file to create ('FA1705-0123')
+     * @param   string  $modulepart         Module part ('facture', ...)
+     * @param   string  $ref                Reference of object (This will define subdir automatically and store submited file into it)
+     * @param   string  $subdir             Subdirectory (Only if refname not provided)
+     * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
+     * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64)
+     * @return  bool     				    State of copy
      * @throws RestException
      */
-    public function post($request_data) {
-        global $conf;
+    public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='') {
+        global $db, $conf;
+        
+        /*var_dump($modulepart);
+        var_dump($filename);
+        var_dump($filecontent);
+        exit;*/
         
         require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
@@ -82,46 +92,89 @@ class Documents extends DolibarrApi
             throw new RestException(401);
         }
 
-        // Suppression de la chaine de caractere ../ dans $original_file
-		$original_file = str_replace("../","/", $request_data['name']);
-        $refname = str_replace("../","/", $request_data['refname']);
+        $newfilecontent = '';
+        if (empty($fileencoding)) $newfilecontent = $filecontent;
+        if ($fileencoding == 'base64') $newfilecontent = base64_decode($filecontent);
 
-		// find the subdirectory name as the reference
-		if (empty($request_data['refname'])) $refname=basename(dirname($original_file)."/");
+		$original_file = dol_sanitizeFileName($filename);
 
+		// Define $uploadir
+		$object = null;
+		$entity = $user->entity;
+		if ($ref)
+		{
+    		if ($modulepart == 'facture' || $modulepart == 'invoice')
+    		{
+    		    $modulepart='facture';
+    		    $object=new Facture($db);
+    		    $result = $object->fetch('', $ref);
+    		    if (! ($result > 0))
+    		    {
+    		        throw new RestException(500, 'The object '.$modulepart." with ref '".$ref."' was not found.");
+    		    }
+    		    if (! empty($entity))
+    		    {
+    		        $tmpreldir = get_exdir(0, 0, 0, 0, $object, $modulepart);
+                    $upload_dir = $conf->{$modulepart}->multidir_output[$entity].'/'.$tmpreldir.$object->ref;
+    		    }
+    		    else
+    		    {
+    		        $tmpreldir = get_exdir(0, 0, 0, 0, $object, $modulepart);
+    		        $upload_dir = $conf->{$modulepart}->dir_output.'/'.$tmpreldir.$object->ref;
+    		    }
+    		}
+    		
+    		if (empty($upload_dir) || $upload_dir == '/')
+    		{
+    		    throw new RestException(500, 'This value of modulepart does not support yet usage of refname. Check modulepart parameter or try to use subdir parameter instead of ref.');
+    		}
+		}
+		else
+		{
+		    if ($modulepart == 'invoice') $modulepart ='facture';
+		    if (empty($conf->{$modulepart}->dir_output))
+		    {
+		        throw new RestException(500, 'This value of modulepart is not supported with refname not defined.');
+		    }
+		    $upload_dir = $conf->{$modulepart}->multidir_output[$entity];
+
+		    if (empty($upload_dir) || $upload_dir == '/')
+		    {
+		        throw new RestException(500, 'This value of modulepart is not yet supported.');
+		    }
+		}
+		$upload_dir = dol_sanitizePathName($upload_dir);
+		
         // Security:
-		// On interdit les remontees de repertoire ainsi que les pipe dans
-		// les noms de fichiers.
-		if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
-		{
-            throw new RestException(401,'Refused to deliver file '.$original_file);
-		}
-        if (preg_match('/\.\./',$refname) || preg_match('/[<>|]/',$refname))
-		{
-            throw new RestException(401,'Refused to deliver file '.$refname);
-		}
-
-        $modulepart = $request_data['modulepart'];
+        // TODO Use dol_check_secure_access_document
 
         // Check mandatory fields
-        $result = $this->_validate_file($request_data);
+        //$result = $this->_validate_file($request_data);
 
-        $upload_dir = DOL_DATA_ROOT . '/' .$modulepart.'/'.dol_sanitizeFileName($refname);
-        $destfile = $upload_dir . $original_file;
+        $destfile = $upload_dir . '/' . $original_file;
 
-        if (!is_dir($upload_dir)) {
+        if (!dol_is_dir($upload_dir)) {
             throw new RestException(401,'Directory not exists : '.$upload_dir);
         }
 
-        $file = $_FILES['file'];
-        $srcfile = $file['tmp_name'];
-        $res = dol_move($srcfile, $destfile, 0, 1);
-
-        if (!$res) {
-            throw new RestException(500);
+        if (dol_is_file($destfile))
+        {
+            throw new RestException(500, "File with name '".$original_file."' already exists.");
         }
-
-        return $res;
+        
+        $fhandle = fopen($destfile, 'w');
+        if ($fhandle)
+        {
+            $nbofbyteswrote = fwrite($fhandle, $newfilecontent);
+            fclose($fhandle);
+            @chmod($destfile, octdec($conf->global->MAIN_UMASK));
+        }
+        else
+        {
+            throw new RestException(500, 'Failed to open file for write');
+        }
+        
+        return true;
     }
 
     /**
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 76a9befebc9..9b965e24c33 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -36,7 +36,7 @@ class Login
 	 *
 	 * Request the API token for a couple username / password. 
 	 * Using method POST is recommanded for security reasons (method GET is often logged by default by web servers with parameters so with login and pass into server log file).
-	 * Both method are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "api_key" into field at the top right of page (Note: "api_key" can be found/set on the user page). 
+	 * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "api_key" into field at the top right of page (Note: "api_key" can be found/set on the user page). 
 	 * 
 	 * @param   string  $login			User login
 	 * @param   string  $password		User password
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 26001e8e1f1..f58e96087b8 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2502,7 +2502,7 @@ class Form
                     }
                     if ($objp->supplier_reputation)
                     {
-            			//TODO dictionnary
+            			//TODO dictionary
             			$reputations=array(''=>$langs->trans('Standard'),'FAVORITE'=>$langs->trans('Favorite'),'NOTTHGOOD'=>$langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER'=>$langs->trans('DoNotOrderThisProductToThisSupplier'));
 
                         $opt .= " - ".$reputations[$objp->supplier_reputation];
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 09856131da7..2d3b1420e81 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4555,8 +4555,8 @@ function yn($yesno, $case=1, $color=0)
 
 /**
  *	Return a path to have a directory according to object.
- *  New usage:       $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'modulepart')
- *         or:       $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'modulepart')     if multidir_output not defined.
+ *  New usage:       $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, $modulepart)
+ *         or:       $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, $modulepart)     if multidir_output not defined.
  *  Old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/"
  *
  *	@param	string	$num            Id of object (deprecated, $object will be used in future)
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index f6674bdcfd7..020fa92e9f3 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -305,7 +305,7 @@ class modResource extends DolibarrModules
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
 		$this->import_regex_array[$r]=array('s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
-		$this->import_examplevalues_array[$r]=array('r.ref'=>"REF1",'r.fk_code_type_resource'=>"Code from dictionnary resource type",'r.datec'=>"2017-01-01 or 2017-01-01 12:30:00");
+		$this->import_examplevalues_array[$r]=array('r.ref'=>"REF1",'r.fk_code_type_resource'=>"Code from dictionary resource type",'r.datec'=>"2017-01-01 or 2017-01-01 12:30:00");
 		$this->import_updatekeys_array[$r]=array('r.rf'=>'ResourceFormLabel_ref');
 		
 	}
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index 7eb08612611..a750581ae49 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -218,7 +218,7 @@ create table llx_user_employment
   tms               timestamp,
   fk_user_creat     integer,
   fk_user_modif     integer,
-  job				varchar(128),				-- job position. may be a dictionnary
+  job				varchar(128),				-- job position. may be a dictionary
   status            integer NOT NULL,			-- draft, active, closed
   salary			double(24,8),				-- last and current value stored into llx_user
   salaryextra		double(24,8),				-- last and current value stored into llx_user
diff --git a/htdocs/install/mysql/tables/llx_user_employment.sql b/htdocs/install/mysql/tables/llx_user_employment.sql
index 4dfa2548c2f..80520ce3dd8 100644
--- a/htdocs/install/mysql/tables/llx_user_employment.sql
+++ b/htdocs/install/mysql/tables/llx_user_employment.sql
@@ -28,7 +28,7 @@ create table llx_user_employment
   tms               timestamp,
   fk_user_creat     integer,
   fk_user_modif     integer,
-  job				varchar(128),				-- job position. may be a dictionnary
+  job				varchar(128),				-- job position. may be a dictionary
   status            integer NOT NULL,			-- draft, active, closed
   salary			double(24,8),				-- last and current value stored into llx_user
   salaryextra		double(24,8),				-- last and current value stored into llx_user
diff --git a/htdocs/variants/generator.php b/htdocs/variants/generator.php
index 7b0358fd176..d4162899874 100644
--- a/htdocs/variants/generator.php
+++ b/htdocs/variants/generator.php
@@ -162,19 +162,19 @@ if (! empty($id) || ! empty($ref)) {
 
 	print_fiche_titre($langs->trans('ProductCombinationGenerator'));
 
-	$dictionnary_attr = array();
+	$dictionary_attr = array();
 
 	foreach ($prodattr->fetchAll() as $attr) {
-		$dictionnary_attr[$attr->id] = $attr;
+		$dictionary_attr[$attr->id] = $attr;
 		foreach ($prodattrval->fetchAllByProductAttribute($attr->id) as $attrval) {
-			$dictionnary_attr[$attr->id]->values[$attrval->id] = $attrval;
+			$dictionary_attr[$attr->id]->values[$attrval->id] = $attrval;
 		}
 	}
 	?>
 
 	<script>
 
-		dictionnary_attr = <?php echo json_encode($dictionnary_attr) ?>;
+		dictionary_attr = <?php echo json_encode($dictionary_attr) ?>;
 		weight_units = '<?php echo measuring_units_string($object->weight_units, 'weight') ?>';
 		attr_selected = {};
 		percentage_variation = jQuery('input#price_var_percent').prop('checked');
@@ -191,7 +191,7 @@ if (! empty($id) || ! empty($ref)) {
 
 			if (!attr_selected.hasOwnProperty(attr)) {
 
-				var label = dictionnary_attr[attr].label;
+				var label = dictionary_attr[attr].label;
 
 				var table = jQuery(document.createElement('table'))
 					.attr('id', 'combinations_'+attr)
@@ -239,7 +239,7 @@ if (! empty($id) || ! empty($ref)) {
 			}
 
 			html.append(
-				jQuery(document.createElement('td')).text(dictionnary_attr[attr].values[val].value),
+				jQuery(document.createElement('td')).text(dictionary_attr[attr].values[val].value),
 				jQuery(document.createElement('td')).css('text-align', 'center').append(
 					jQuery(document.createElement('input')).attr('type', 'text').css('width', '50px').attr('name', 'combinations[' + attr + '][' + val + '][price]').val(price),
 					percent_symbol_html
@@ -350,7 +350,7 @@ if (! empty($id) || ! empty($ref)) {
 		<div style="float:left; width: 20%">
 
 			<select id="features" multiple style="width: 100%; height: 300px; overflow: auto">
-				<?php foreach ($dictionnary_attr as $attr): ?>
+				<?php foreach ($dictionary_attr as $attr): ?>
 				<optgroup label="<?php echo $attr->label ?>">
 					<?php foreach ($attr->values as $attrval): ?>
 						<option value="<?php echo $attr->id.':'.$attrval->id ?>"<?php
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index ea0c218027f..0ff33bc36c5 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -131,11 +131,11 @@ class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * testRestReceiveDocument.
+     * testPushDocument.
      *
      * @return int
      */
-    public function testRestReceiveDocument()
+    public function testPushDocument()
     {
         global $conf,$user,$langs,$db;
 
@@ -143,20 +143,17 @@ class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
 
         $fileName = 'img250x20.png';
         $filePath = dirname(__FILE__).'/'.$fileName;
-        $mimetype = mime_content_type($filePath);
-      // Init Curl file object
-      // See https://wiki.php.net/rfc/curl-file-upload
-      $cfile = curl_file_create($filePath, $mimetype);
+        $mimetype = dol_mimetype($filePath);
 
         echo __METHOD__.' Request POST url='.$url."\n";
 
-      // Send to existant directory
-      $data = array(
+        // Send to existant directory
+        $data = array(
           'modulepart' => 'facture',
-          'file' => $cfile,
+          'file' => 'eeeeeee',
           'refname' => 'AV1303-0003',
           'name' => $fileName, // Name for destination
-          'type' => $mimetype, );
+          'mime' => $mimetype );
 
         $result = getURLContent($url, 'POST', $data, 1);
 
@@ -165,8 +162,8 @@ class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($result['curl_error_no'], '');
         $this->assertEquals($result['content'], 'true');
 
-      // Send to unexistant directory
-      $data = array(
+        // Send to unexistant directory
+        $data = array(
           'modulepart' => 'facture',
           'file' => $cfile,
           'name' => 'AV1303-0003STSEIUDEISRESIJLEU/'.$fileName, // Name for destination

From eb5bab36ca662ceaea25779df2ca0cb94f9077c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 16:15:06 +0200
Subject: [PATCH 0887/1163] Use dolibarr security checks before uploading a
 file.

---
 htdocs/api/class/api_documents.class.php | 62 ++++++++++--------------
 1 file changed, 25 insertions(+), 37 deletions(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 6650fc45401..85fa777aa21 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -56,23 +56,23 @@ class Documents extends DolibarrApi
      * @param   string  $module_part    Module part for file
      * @param   string  $filename       File name
      *
-     * @return array
+     * @return  array                   Array with data of file
      * @throws RestException
      */
-     /*
-     public function get($module_part, $filename) {
-
-     }*/
+     public function index($module_part, $filename) {
+            return array('note'=>'FeatureNotYetAvailable');
+     }
 
 
     /**
      * Push a file. 
-     * Test sample: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "" }
+     * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "" }.
+     * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "" }.
      *
      * @param   string  $filename           Name of file to create ('FA1705-0123')
-     * @param   string  $modulepart         Module part ('facture', ...)
+     * @param   string  $modulepart         Name of module or area concerned by file upload ('facture', ...)
      * @param   string  $ref                Reference of object (This will define subdir automatically and store submited file into it)
-     * @param   string  $subdir             Subdirectory (Only if refname not provided)
+     * @param   string  $subdir             Subdirectory (Only if ref not provided)
      * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
      * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64)
      * @return  bool     				    State of copy
@@ -108,49 +108,37 @@ class Documents extends DolibarrApi
     		    $modulepart='facture';
     		    $object=new Facture($db);
     		    $result = $object->fetch('', $ref);
-    		    if (! ($result > 0))
-    		    {
-    		        throw new RestException(500, 'The object '.$modulepart." with ref '".$ref."' was not found.");
-    		    }
-    		    if (! empty($entity))
-    		    {
-    		        $tmpreldir = get_exdir(0, 0, 0, 0, $object, $modulepart);
-                    $upload_dir = $conf->{$modulepart}->multidir_output[$entity].'/'.$tmpreldir.$object->ref;
-    		    }
-    		    else
-    		    {
-    		        $tmpreldir = get_exdir(0, 0, 0, 0, $object, $modulepart);
-    		        $upload_dir = $conf->{$modulepart}->dir_output.'/'.$tmpreldir.$object->ref;
-    		    }
     		}
     		
+    		if (! ($object->id > 0))
+    		{
+   		        throw new RestException(500, 'The object '.$modulepart." with ref '".$ref."' was not found.");
+    		}
+
+    		$tmp = dol_check_secure_access_document($modulepart, $tmpreldir.$object->ref, $entity, DolibarrApiAccess::$user, $ref, 'write');
+    		$upload_dir = $tmp['original_file'];
+    		
     		if (empty($upload_dir) || $upload_dir == '/')
     		{
-    		    throw new RestException(500, 'This value of modulepart does not support yet usage of refname. Check modulepart parameter or try to use subdir parameter instead of ref.');
+    		    throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
     		}
 		}
 		else
 		{
 		    if ($modulepart == 'invoice') $modulepart ='facture';
-		    if (empty($conf->{$modulepart}->dir_output))
-		    {
-		        throw new RestException(500, 'This value of modulepart is not supported with refname not defined.');
-		    }
-		    $upload_dir = $conf->{$modulepart}->multidir_output[$entity];
+		    
+		    $tmp = dol_check_secure_access_document($modulepart, $subdir, $entity, DolibarrApiAccess::$user, '', 'write');
+    		$upload_dir = $tmp['original_file'];
 
 		    if (empty($upload_dir) || $upload_dir == '/')
-		    {
-		        throw new RestException(500, 'This value of modulepart is not yet supported.');
-		    }
+    		{
+    		    throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
+    		}
 		}
+		
+		
 		$upload_dir = dol_sanitizePathName($upload_dir);
 		
-        // Security:
-        // TODO Use dol_check_secure_access_document
-
-        // Check mandatory fields
-        //$result = $this->_validate_file($request_data);
-
         $destfile = $upload_dir . '/' . $original_file;
 
         if (!dol_is_dir($upload_dir)) {

From 7e25cc04755bada0cb281aa5581910a2e15bab9d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 17:09:15 +0200
Subject: [PATCH 0888/1163] FIX Phpunit on file submit with REST API

---
 htdocs/api/class/api_documents.class.php |  3 +-
 htdocs/core/lib/geturl.lib.php           |  1 +
 test/phpunit/RestAPIDocumentTest.php     | 59 ++++++++++++++----------
 3 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 85fa777aa21..18ccee58b07 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -36,9 +36,8 @@ class Documents extends DolibarrApi
      * @var array   $DOCUMENT_FIELDS     Mandatory fields, checked when create and update object
      */
     static $DOCUMENT_FIELDS = array(
-        'name',
         'modulepart',
-        'file'
+        'filename'
     );
 
     /**
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 808e4f0ef09..6f268fda3a7 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -71,6 +71,7 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)?5:$conf->global->MAIN_USE_CONNECT_TIMEOUT);
     curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT)?30:$conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
+    //curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);	// PHP 5.5
     curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);		// We want response
     if ($postorget == 'POST')
     {
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index 0ff33bc36c5..b180586aa91 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -28,6 +28,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/geturl.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/files.lib.php';
 
 if (empty($user->id)) {
     echo "Load permissions for admin user nb 1\n";
@@ -141,40 +142,50 @@ class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
 
         $url = $this->api_url.'/documents/?api_key='.$this->api_key;
 
-        $fileName = 'img250x20.png';
-        $filePath = dirname(__FILE__).'/'.$fileName;
-        $mimetype = dol_mimetype($filePath);
-
         echo __METHOD__.' Request POST url='.$url."\n";
 
-        // Send to existant directory
+        
+        // Send to non existant directory
+        
+        dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit');
+        
+        //$data = '{ "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "" }';
         $data = array(
-          'modulepart' => 'facture',
-          'file' => 'eeeeeee',
-          'refname' => 'AV1303-0003',
-          'name' => $fileName, // Name for destination
-          'mime' => $mimetype );
-
+            'filename'=>"mynewfile.txt",
+            'modulepart'=>"medias",
+            'ref'=>"",
+            'subdir'=>"tmpphpunit/tmpphpunit2",
+            'filecontent'=>"content text",
+            'fileencoding'=>""
+        );
+        
         $result = getURLContent($url, 'POST', $data, 1);
-
         echo __METHOD__.' Result for sending document: '.var_export($result, true)."\n";
         echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
-        $this->assertEquals($result['curl_error_no'], '');
-        $this->assertEquals($result['content'], 'true');
+        $object = json_decode($result['content'], true);
+        $this->assertNotNull($object, 'Parsing of json result must no be null');
+        $this->assertEquals('401', $object['error']['code']);
 
-        // Send to unexistant directory
+        
+        // Send to existant directory
+        
+        dol_mkdir(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit2');
+        
         $data = array(
-          'modulepart' => 'facture',
-          'file' => $cfile,
-          'name' => 'AV1303-0003STSEIUDEISRESIJLEU/'.$fileName, // Name for destination
-          'type' => $mimetype, );
+            'filename'=>"mynewfilethatwillfails.txt",
+            'modulepart'=>"medias",
+            'ref'=>"",
+            'subdir'=>"tmpphpunit/tmpphpunit2",
+            'filecontent'=>"content text",
+            'fileencoding'=>""
+        );
 
         $result2 = getURLContent($url, 'POST', $data, 1);
         echo __METHOD__.' Result for sending document: '.var_export($result2, true)."\n";
-        echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
-
-        $object = json_decode($result2['content'], true);
-        $this->assertNotNull($object, 'Parsing of json result must no be null');
-        $this->assertEquals('401', $object['error']['code']);
+        echo __METHOD__.' curl_error_no: '.$result2['curl_error_no']."\n";
+        $object2 = json_decode($result2['content'], true);
+        $this->assertNotNull($object2, 'Parsing of json result must no be null');
+        $this->assertEquals($result2['curl_error_no'], '');
+        $this->assertEquals($result2['content'], 'true');
     }
 }

From a53fb25cfa8c7de492219d6ae406100b2fceb4ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 18:46:15 +0200
Subject: [PATCH 0889/1163] Look and feel v6

---
 htdocs/admin/tools/dolibarr_export.php |  5 ++++-
 htdocs/admin/tools/dolibarr_import.php | 21 +++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index df5dafa43af..6b0bf70bf64 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -113,7 +113,10 @@ jQuery(document).ready(function() {
 print load_fiche_titre($langs->trans("Backup"),'','title_setup');
 //print_barre_liste($langs->trans("Backup"), '', '', '', '', '', $langs->trans("BackupDesc",DOL_DATA_ROOT), 0, 0, 'title_setup');
 
-print '<div class="center">'.$langs->trans("BackupDesc",DOL_DATA_ROOT).'</div><br><br>';
+print '<div class="center">';
+print $langs->trans("BackupDesc",DOL_DATA_ROOT);
+print '</div>';
+print '<br><br>';
 
 ?>
 
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index 9f8af14f2b9..fec00bd490c 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -67,7 +67,11 @@ jQuery(document).ready(function() {
 
 print load_fiche_titre($langs->trans("Restore"),'','title_setup');
 
-print $langs->trans("RestoreDesc",DOL_DATA_ROOT).'<br><br>';
+print '<div class="center">';
+print $langs->trans("RestoreDesc",DOL_DATA_ROOT);
+print '</div>';
+print '<br><br>';
+
 ?>
 <fieldset>
 <legend style="font-size: 3em">1</legend>
@@ -86,7 +90,7 @@ print $langs->trans("RestoreDesc3",$dolibarr_main_db_name).'<br><br>';
 
 <?php print $langs->trans("DatabaseName").' : <b>'.$dolibarr_main_db_name.'</b>'; ?><br><br>
 
-<table><tr><td class="tdtop">
+<table class="centpercent"><tr><td class="tdtop">
 
 <?php if ($conf->use_javascript_ajax) { ?>
 <div id="div_container_exportoptions">
@@ -123,14 +127,14 @@ print $langs->trans("RestoreDesc3",$dolibarr_main_db_name).'<br><br>';
 </td><td class="tdtop">
 
 
-<div id="div_container_sub_exportoptions">
+<div id="div_container_sub_exportoptions" >
 <?php
 if (in_array($type, array('mysql', 'mysqli')))
 {
 ?>
 	<fieldset id="mysql_options">
     <legend><?php echo $langs->trans('RestoreMySQL') ?></legend>
-	<div class="formelementrow">
+	<div class="formelementrow centpercent">
 	<?php
 	// Parameteres execution
 	$command=$db->getPathOfRestore();
@@ -150,8 +154,9 @@ if (in_array($type, array('mysql', 'mysqli')))
 
 	echo $langs->trans("ImportMySqlDesc");
 	print '<br>';
-	print '<textarea rows="1" cols="120">'.$langs->trans("ImportMySqlCommand",$command,($showpass?$paramclear:$paramcrypted)).'</textarea><br>';
-
+	print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportMySqlCommand",$command,($showpass?$paramclear:$paramcrypted)).'</textarea><br>';
+	print ajax_autoselect('restorecommand');
+	
 	if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=mysql_options">'.$langs->trans("UnHidePassword").'</a>';
 	//else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
 	?>
@@ -189,8 +194,8 @@ else if (in_array($type, array('pgsql')))
 
     echo $langs->trans("ImportPostgreSqlDesc");
     print '<br>';
-    print '<textarea rows="1" cols="120">'.$langs->trans("ImportPostgreSqlCommand",$command,($showpass?$paramclear:$paramcrypted)).'</textarea><br>';
-
+    print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportPostgreSqlCommand",$command,($showpass?$paramclear:$paramcrypted)).'</textarea><br>';
+    print ajax_autoselect('restorecommand');
     //if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=postgresql_options">'.$langs->trans("UnHidePassword").'</a>';
     //else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
     ?>

From 2dd2ab1003e5ff182aec85c964a48934fe8a110c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 May 2017 20:59:54 +0200
Subject: [PATCH 0890/1163] Look and feel v6

---
 htdocs/core/class/doleditor.class.php       |  2 +-
 htdocs/core/class/html.formfile.class.php   |  2 +-
 htdocs/core/class/html.formmargin.class.php |  5 +++--
 htdocs/core/lib/functions.lib.php           |  2 +-
 htdocs/core/lib/functions2.lib.php          | 15 +++++++++++++++
 htdocs/theme/eldy/style.css.php             | 14 +++++++-------
 htdocs/theme/md/style.css.php               |  3 ---
 7 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 5d30ab3b839..a7e404383ea 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -167,7 +167,7 @@ class DolEditor
         {
             $found=1;
             //$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'" cols="'.$this->cols.'"'.($this->readonly?' disabled':'').' class="flat">';
-            $out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 2px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
+            $out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
             $out.= $this->content;
             $out.= '</textarea>';
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 225825d6699..e263efeaa57 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1685,7 +1685,7 @@ class FormFile
         global $langs, $conf;
 
         $out='';
-        if ($conf->browser->layout != 'phone')
+        if ($conf->browser->layout != 'phone' && ! empty($conf->use_javascript_ajax))
         {
             $urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param);      // Return if a file is qualified for preview.
             if (count($urladvancedpreview))
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 2cf82424a4e..5f78fa0e283 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -214,6 +214,7 @@ class FormMargin
     	    if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
 		}
 
+		print '<!-- Margin table -->'."\n";
 		print '<table class="noborder margintable centpercent">';
 		print '<tr class="liste_titre">';
 		print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';
@@ -232,7 +233,7 @@ class FormMargin
 		if (! empty($conf->product->enabled))
 		{
 			//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
-			print '<tr class="impair">';
+			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans('MarginOnProducts').'</td>';
 			print '<td align="right">'.price($marginInfo['pv_products'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_products'], null, null, null, null, $rounding).'</td>';
@@ -246,7 +247,7 @@ class FormMargin
 
 		if (! empty($conf->service->enabled))
 		{
-			print '<tr class="pair">';
+			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans('MarginOnServices').'</td>';
 			print '<td align="right">'.price($marginInfo['pv_services'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_services'], null, null, null, null, $rounding).'</td>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2d3b1420e81..b6365a23b9a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2734,7 +2734,7 @@ function img_edit($titlealt = 'default', $float = 0, $other = 'class="pictoedit"
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Modify');
 
-	return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.($langs->tab_translate["DIRECTION"] == 'rtl'?'left':'right').'"' : $other));
+	return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.($langs->tab_translate["DIRECTION"] == 'rtl'?'left':'right').'"' : "") . ($other?' '.$other:''));
 }
 
 /**
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 2f46ad49b80..c8d617ec99d 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -780,11 +780,26 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     	$masktype_value='';
     }
 
+    // Personalized field {XXX-1} à {XXX-9}
+    $maskperso=array();
+    $maskpersonew=array();
+    $tmpmask=$mask;
+    while (preg_match('/\{([A-Z]+)\-([1-9])\}/i',$tmpmask,$regKey))
+    {
+        $maskperso[$regKey[1]]='\{'.$regKey[1]+'\-'.$regKey[2].'\}';
+        $maskpersonew[$regKey[1]]=str_pad('', '_', $regKey[2], STR_PAD_RIGHT);
+        $tmpmask=preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew, $tmpmask);
+    }
+    
     $maskwithonlyymcode=$mask;
     $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{(t+)\}/i',$masktype_value,$maskwithonlyymcode);
+    foreach($maskperso as $key => $val)
+    {
+        $maskwithonlyymcode=preg_replace('/'.$val.'/i', $maskpersonew[$key], $maskwithonlyymcode);
+    }
     $maskwithnocode=$maskwithonlyymcode;
     $maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);
     $maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4ae7d400a09..b8f31b4e224 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -273,7 +273,7 @@ input[type=submit] {
 }
 input, input.flat, form.flat select, select, select.flat, .dataTables_length label select {
 	<?php if (empty($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)) 
-		print "border: none;" 
+	print "border: none;" 
 	?>
 }
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
@@ -281,7 +281,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     font-family: <?php print $fontlist ?>;
     outline: none;
     margin: 0px 0px 0px 0px;
-    border-bottom: solid 1px rgba(0,0,0,.2);
+    border-bottom: solid 1px rgba(0,0,0,.4);
 }
 
 input {
@@ -460,6 +460,9 @@ form {
     padding:0px;
     margin:0px;
 }
+form#addproduct {
+    padding-top: 6px;
+}
 div.float
 {
     float:<?php print $left; ?>;
@@ -2238,12 +2241,12 @@ div .tdtop {
 }
 
 table.border td, div.border div div.tagtd {
-	padding: 3px 2px 3px 2px;
+	padding: 5px 2px 5px 2px;
 	border-collapse: collapse;
 }
 div.tabBar .fichecenter table.border>tbody>tr>td, div.tabBar .fichecenter div.border div div.tagtd, div.tabBar div.border div div.tagtd
 {
-	padding-top: 4px;
+	padding-top: 5px;
 	border-bottom: 1px solid #E0E0E0;
 }
 
@@ -2709,9 +2712,6 @@ tr.liste_sub_total, tr.liste_sub_total td {
 {
 	padding-left: 2px;
 }
-.margintable td {
-	border: 0px !important;
-}
 
 /* Disable shadows */
 .noshadow {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 2beef147c02..91a4c0922d9 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2801,9 +2801,6 @@ tr.liste_sub_total, tr.liste_sub_total td {
 {
 	padding-left: 2px;
 }
-.margintable td {
-	border: 0px !important;
-}
 
 /* Disable shadows */
 .noshadow {

From b3dc73e61161634de13f7c3664f6e2d8d89078ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 02:43:51 +0200
Subject: [PATCH 0891/1163] Look and feel v6

---
 htdocs/accountancy/admin/productaccount.php   |  1 +
 htdocs/accountancy/bookkeeping/list.php       |  1 +
 htdocs/accountancy/customer/lines.php         |  1 +
 htdocs/accountancy/customer/list.php          |  3 +-
 htdocs/accountancy/expensereport/lines.php    |  3 +-
 htdocs/accountancy/expensereport/list.php     |  5 +-
 htdocs/accountancy/supplier/lines.php         |  3 +-
 htdocs/accountancy/supplier/list.php          |  3 +-
 htdocs/adherents/list.php                     |  1 +
 htdocs/adherents/subscription/list.php        |  1 +
 htdocs/adherents/type.php                     |  1 +
 htdocs/admin/defaultvalues.php                |  1 +
 htdocs/admin/modules.php                      |  3 +-
 htdocs/admin/translation.php                  |  1 +
 htdocs/comm/action/listactions.php            |  1 +
 htdocs/comm/action/rapport/index.php          |  1 +
 htdocs/comm/mailing/cibles.php                |  2 +
 htdocs/comm/mailing/list.php                  |  1 +
 htdocs/comm/propal/list.php                   |  3 +-
 htdocs/commande/list.php                      |  3 +-
 htdocs/compta/bank/bankentries.php            |  1 +
 htdocs/compta/bank/index.php                  |  1 +
 htdocs/compta/bank/various_payment/index.php  |  3 +-
 htdocs/compta/charges/index.php               |  1 +
 htdocs/compta/facture/contact.php             |  2 +-
 htdocs/compta/facture/fiche-rec.php           |  1 +
 htdocs/compta/facture/list.php                |  5 +-
 htdocs/compta/facture/prelevement.php         |  2 +-
 htdocs/compta/paiement/cheque/list.php        |  1 +
 htdocs/compta/paiement/list.php               |  1 +
 htdocs/compta/prelevement/bons.php            |  1 +
 htdocs/compta/prelevement/factures.php        |  3 +-
 htdocs/compta/salaries/index.php              |  3 +-
 htdocs/compta/sociales/card.php               | 81 ++++++++++---------
 htdocs/compta/sociales/document.php           | 23 +++++-
 htdocs/compta/sociales/index.php              |  1 +
 htdocs/compta/sociales/info.php               | 27 ++++++-
 htdocs/compta/sociales/payments.php           |  1 +
 htdocs/compta/tva/reglement.php               |  1 +
 htdocs/contact/list.php                       |  1 +
 htdocs/contrat/list.php                       |  1 +
 htdocs/contrat/services.php                   |  1 +
 htdocs/core/lib/company.lib.php               |  4 +-
 htdocs/cron/list.php                          |  1 +
 htdocs/don/list.php                           |  1 +
 htdocs/expedition/list.php                    |  1 +
 htdocs/expensereport/list.php                 |  1 +
 htdocs/fichinter/list.php                     |  1 +
 htdocs/fourn/commande/list.php                |  1 +
 htdocs/fourn/facture/list.php                 |  1 +
 htdocs/fourn/facture/paiement.php             |  3 +-
 htdocs/fourn/product/list.php                 |  1 +
 htdocs/holiday/list.php                       |  1 +
 htdocs/loan/index.php                         |  1 +
 .../modulebuilder/skeletons/skeleton_list.php |  1 +
 htdocs/opensurvey/list.php                    |  1 +
 htdocs/product/list-with-listview.php         |  1 +
 htdocs/product/list.php                       |  1 +
 htdocs/product/reassort.php                   |  1 +
 htdocs/product/reassortlot.php                |  1 +
 htdocs/product/stock/list.php                 |  3 +-
 htdocs/product/stock/mouvement.php            |  1 +
 htdocs/product/stock/productlot_list.php      |  1 +
 htdocs/projet/list.php                        |  1 +
 htdocs/projet/tasks.php                       |  1 +
 htdocs/projet/tasks/list.php                  |  1 +
 htdocs/projet/tasks/time.php                  |  3 +-
 htdocs/resource/list.php                      |  1 +
 htdocs/societe/list.php                       |  1 +
 htdocs/societe/notify/card.php                |  1 +
 htdocs/supplier_proposal/list.php             |  1 +
 htdocs/user/group/index.php                   |  1 +
 htdocs/user/index.php                         |  1 +
 htdocs/user/notify/card.php                   |  1 +
 74 files changed, 178 insertions(+), 64 deletions(-)

diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 4f82db33e94..359a8b40c12 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -279,6 +279,7 @@ if ($result)
     print '<input type="hidden" name="action" value="update">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     
     print load_fiche_titre($langs->trans("ProductsBinding"), '', 'title_accountancy');
 	print '<br>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index b382d855994..0c49ac0e1ba 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -355,6 +355,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 $button = '<a class="butAction" name="button_export_csv" href="'.$_SERVER["PHP_SELF"].'?action=export_csv'.($param?'&'.$param:'').'">';
 if (count($filter)) $button.= $langs->trans("ExportFilteredList");
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 428e490aff7..52b3a31d6f0 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -248,6 +248,7 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 	print $langs->trans("DescVentilDoneCustomer") . '<br>';
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 46cb19c2ae1..bbd875e0dbf 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -263,8 +263,7 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	
-	//$center='<div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil"></div>';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 4205a497c1a..6d0ffbd4476 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -219,7 +219,8 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	
 	print_barre_liste($langs->trans("ExpenseReportLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	print $langs->trans("DescVentilDoneExpenseReport") . '<br>';
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 114fd2c99ea..72316e4c4d6 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -246,9 +246,8 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
-	//$center='<div class="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil"></div>';
-
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	
 	print_barre_liste($langs->trans("ExpenseReportLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	print $langs->trans("DescVentilTodoExpenseReport") . '</br><br>';
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 09cf552c7bb..1a95262f861 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -230,7 +230,8 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-		
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 	
 	print $langs->trans("DescVentilDoneSupplier") . '<br>';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index e702aa8add8..061e465b1e7 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -260,8 +260,7 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	
-	//$center='<div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil"></div>';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 9e0de6f1d75..1b059d8616d 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -353,6 +353,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 206f5ebf8c9..55b832e327c 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -189,6 +189,7 @@ if ($result)
     print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
     
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index fb147750e0b..083ab4bda3b 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -191,6 +191,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 		print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 		print '<input type="hidden" name="action" value="list">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+        print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 		
 	    print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 7ebc67472d1..40e63de8aea 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -220,6 +220,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 $head=defaultvalues_prepare_head();
     
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 433508be908..5c4291ff3f3 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -436,7 +436,8 @@ if ($mode == 'common')
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+    print '<input type="hidden" name="page" value="'.$page.'">';
+    
     dol_fiche_head($head, $mode, '', -1);
 
     $moreforfilter = '';
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index c9488f919fe..72aaa7fe355 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -209,6 +209,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 $head=translation_prepare_head();
 
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 301cf63620e..6ed846c0ebe 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -324,6 +324,7 @@ if ($resql)
     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="type" value="'.$type.'">';
     $nav='';
     if ($optioncss != '') $nav.= '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 760d82f0246..125355a3386 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -111,6 +111,7 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
 	print_barre_liste($langs->trans("Actions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_agenda', 0, '', '', $limit);
 
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index c302dea1e43..719dba1a622 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -428,6 +428,7 @@ if ($object->fetch($id) >= 0)
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+        print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 		$cleartext='';
@@ -443,6 +444,7 @@ if ($object->fetch($id) >= 0)
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+        print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 		print '<input type="hidden" name="limit" value="'.$limit.'">';
 		
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index f5efbf54383..e7775a6485e 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -116,6 +116,7 @@ if ($result)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
     $moreforfilter = '';
     
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index af9ffa6d778..d2a6c6e926f 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -407,7 +407,8 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 	
 	if ($massaction == 'presend')
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index c73258cff89..b9102e78ddc 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -648,7 +648,8 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index ed8241de427..fd3c1ec9825 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -578,6 +578,7 @@ if ($resql)
 	print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="id" value="'.$id.'">';
 	print '<input type="hidden" name="ref" value="'.$ref.'">';
 	if (GETPOST('bid')) print '<input type="hidden" name="bid" value="'.GETPOST("bid").'">';
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 37883c29c0f..8ff5f1964fc 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -256,6 +256,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 print_barre_liste($title,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_bank.png',0,$newcardbutton,'',$limit, 1);
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index abf6d23d22e..f189eeef306 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -141,7 +141,8 @@ if ($result)
     print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+    print '<input type="hidden" name="page" value="'.$page.'">';
+    
 	print_barre_liste($langs->trans("VariousPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
 	
     print '<div class="div-table-responsive">';
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index ee71290be2d..a690478a53e 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -89,6 +89,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 if ($mode != 'sconly') 
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index cdca425d5f6..93b23834e9f 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -140,7 +140,7 @@ if ($id > 0 || ! empty($ref))
 
 		$totalpaye = $object->getSommePaiement();
 		
-		dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), 0, 'bill');
+		dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
 		// Invoice content
 		
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 3c22b96a1d4..b09bd7f60f3 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1652,6 +1652,7 @@ else
         	print '<input type="hidden" name="action" value="list">';
         	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
         	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+            print '<input type="hidden" name="page" value="'.$page.'">';
         	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 	        print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png',0,'','',$limit);
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 638ca033e1a..10b11812b1a 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -433,7 +433,7 @@ if ($search_status != '' && $search_status >= 0)
     if ($search_status == '2') $sql.=" AND f.fk_statut = 2";  // payed     Not that some corrupted data may contains f.fk_statut = 1 AND f.paye = 1 (it means payed too but should not happend. If yes, reopen and reclassify billed)
     if ($search_status == '3') $sql.=" AND f.fk_statut = 3";  // abandonned
 }
-if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode."";
+if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode;
 if ($month > 0)
 {
     if ($year > 0 && empty($day))
@@ -454,7 +454,7 @@ if ($month_lim > 0)
 	else if ($year_lim > 0 && ! empty($day_lim))
 		$sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_lim, $day_lim, $year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_lim, $day_lim, $year_lim))."'";
 	else
-		$sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$month_lim."'";
+		$sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$db->escape($month_lim)."'";
 }
 else if ($year_lim > 0)
 {
@@ -600,6 +600,7 @@ if ($resql)
     print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 	print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit);
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index f3d83278885..e9b1694808b 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -147,7 +147,7 @@ if ($object->id > 0)
 
 	$head = facture_prepare_head($object);
 
-	dol_fiche_head($head, 'standingorders', $langs->trans('InvoiceCustomer'),0,'bill');
+	dol_fiche_head($head, 'standingorders', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
 	// Invoice content
 
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 9798e2d28b4..a4fac965e7a 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -138,6 +138,7 @@ if ($resql)
 	print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
 	print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_bank.png', '', '', $limit);
 	
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index ab4189d5338..daf70556213 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -218,6 +218,7 @@ if ($resql)
     print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
     
     print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $nbtotalofrecords,'title_accountancy.png', 0, '', '', $limit);
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 7319de4a7bd..302e1e9e59c 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -105,6 +105,7 @@ if ($result)
   print '<input type="hidden" name="action" value="list">';
   print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
   print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+  print '<input type="hidden" name="page" value="'.$page.'">';
   print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
   
   print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit);
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 72d775a49c3..6136ee48499 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -166,7 +166,8 @@ if ($result)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 	$massactionbutton='';
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index e193374a552..dc95b06bc52 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -150,7 +150,8 @@ if ($result)
     print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+    print '<input type="hidden" name="page" value="'.$page.'">';
+    
 	print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
 	
     print '<div class="div-table-responsive">';
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index f34ff9b1a31..630197cfc78 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -77,6 +77,13 @@ if ($action == 'reopen' && $user->rights->tax->charges->creer) {
     }
 }
 
+// Link to a project
+if ($action == 'classin' && $user->rights->tax->charges->creer)
+{
+    $object->fetch($id);
+    $object->setProject(GETPOST('projectid'));
+}
+
 if ($action == 'setlib' && $user->rights->tax->charges->creer)
 {
     $object->fetch($id);
@@ -203,11 +210,9 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->cr
 	{
         $result=$object->fetch($id);
 
-        $object->lib		= GETPOST('label');
         $object->date_ech	= $dateech;
         $object->periode	= $dateperiod;
         $object->amount		= price2num($amount);
-		$object->fk_project	= GETPOST("fk_project");
 
         $result=$object->update($user);
         if ($result <= 0)
@@ -276,6 +281,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 
 $form = new Form($db);
 $formsocialcontrib = new FormSocialContrib($db);
+if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 
 $title = $langs->trans("SocialContribution") . ' - ' . $langs->trans("Card");
 $help_url='EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
@@ -430,15 +436,47 @@ if ($id > 0)
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		}
 
-		dol_fiche_head($head, 'card', $langs->trans("SocialContribution"),0,'bill');
+		dol_fiche_head($head, 'card', $langs->trans("SocialContribution"), -1, 'bill');
 
 		$morehtmlref='<div class="refidno">';
 		// Ref customer
 		$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 		$morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+		// Project
+		if (! empty($conf->projet->enabled))
+		{
+		    $langs->load("projects");
+		    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+		    if ($user->rights->tax->charges->creer)
+		    {
+		        if ($action != 'classify')
+		            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		            if ($action == 'classify') {
+		                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+		                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+		                $morehtmlref.='<input type="hidden" name="action" value="classin">';
+		                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		                $morehtmlref.=$formproject->select_projects(0, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+		                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+		                $morehtmlref.='</form>';
+		            } else {
+		                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+		            }
+		    } else {
+		        if (! empty($object->fk_project)) {
+		            $proj = new Project($db);
+		            $proj->fetch($object->fk_project);
+		            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+		            $morehtmlref.=$proj->ref;
+		            $morehtmlref.='</a>';
+		        } else {
+		            $morehtmlref.='';
+		        }
+		    }
+		}		
 		$morehtmlref.='</div>';
 		
-		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
 		
 		$object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
 		
@@ -449,25 +487,6 @@ if ($id > 0)
 		print '<div class="underbanner clearboth"></div>';
 		
 		print '<table class="border" width="100%">';
-
-        /*
-		// Ref
-		print '<tr><td>'.$langs->trans("Ref").'</td><td>';
-		print $form->showrefnav($object,'id',$linkback);
-		print "</td></tr>";
-        */
-
-		// Label
-		/*if ($action == 'edit')
-		{
-			print '<tr><td>'.$langs->trans("Label").'</td><td>';
-			print '<input type="text" name="label" size="40" value="'.$object->lib.'">';
-			print '</td></tr>';
-		}
-		else
-		{
-			print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$object->lib.'</td></tr>';
-		}*/
 		
 		// Type
 		print '<tr><td class="titlefield">'.$langs->trans("Type")."</td><td>".$object->type_libelle."</td>";
@@ -508,22 +527,6 @@ if ($id > 0)
             print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
         }
 
-		// Project
-		if (! empty($conf->projet->enabled)){
-			print '<tr><td class="nowrap">';
-			print $langs->trans("Project");
-			print '</td><td>';
-			if ($action == 'edit') {
-				$formproject=new FormProjets($db);
-				$numproject=$formproject->select_projects(-1,$object->fk_project,'fk_project',16,0,1,1);
-			} else {
-				$project=new Project($db);
-				$project->fetch($object->fk_project);
-				print $project->getNomUrl(1,'',1);;
-			}
-			print '</td></tr>';
-		}
-
         // Mode of payment
         print '<tr><td>';
         print '<table class="nobordernopadding" width="100%"><tr><td>';
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 95c72cbedb2..ce2f853c935 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -33,6 +33,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+if (! empty($conf->projet->enabled))
+{
+    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
 
 $langs->load("other");
 $langs->load("companies");
@@ -88,6 +93,7 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer)
  */
 
 $form = new Form($db);
+if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 
 $title = $langs->trans("SocialContribution") . ' - ' . $langs->trans("Documents");
 $help_url='EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
@@ -105,9 +111,24 @@ if ($object->id)
 	// Label of social contribution
 	$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 	$morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+    // Project
+	if (! empty($conf->projet->enabled))
+	{
+	    $langs->load("projects");
+	    $morehtmlref.='<br>'.$langs->trans('Project') . ' : ';
+        if (! empty($object->fk_project)) {
+            $proj = new Project($db);
+            $proj->fetch($object->fk_project);
+            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+            $morehtmlref.=$proj->ref;
+            $morehtmlref.='</a>';
+        } else {
+            $morehtmlref.='';
+        }
+	}		
 	$morehtmlref.='</div>';
 
-	$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
 
 	$object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 50e14823a5f..194c3f38d99 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -152,6 +152,7 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 	
 	if ($year)
diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index bbacfafd430..91334134a2c 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -25,6 +25,11 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+if (! empty($conf->projet->enabled))
+{
+    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
 
 $langs->load("compta");
 $langs->load("bills");
@@ -37,6 +42,7 @@ $socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', $id, 'chargesociales','charges');
 
+
 /*
  * Actions
  */
@@ -49,9 +55,13 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer)
         setEventMessages($object->error, $object->errors, 'errors');
 }
 
+
 /*
  * View
  */
+
+if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+
 $title = $langs->trans("SocialContribution") . ' - ' . $langs->trans("Info");
 $help_url = 'EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
 llxHeader("",$title,$help_url);
@@ -68,9 +78,24 @@ $morehtmlref='<div class="refidno">';
 // Label of social contribution
 $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 $morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+// Project
+if (! empty($conf->projet->enabled))
+{
+    $langs->load("projects");
+    $morehtmlref.='<br>'.$langs->trans('Project') . ' : ';
+    if (! empty($object->fk_project)) {
+        $proj = new Project($db);
+        $proj->fetch($object->fk_project);
+        $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+        $morehtmlref.=$proj->ref;
+        $morehtmlref.='</a>';
+    } else {
+        $morehtmlref.='';
+    }
+}
 $morehtmlref.='</div>';
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php">' . $langs->trans("BackToList") . '</a>';
+$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
 
 $object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index eda1633480a..ae7240c204a 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -85,6 +85,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 if ($mode != 'sconly') 
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 94895062bc3..076978a86fb 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -154,6 +154,7 @@ if ($result)
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
 	print_barre_liste($langs->trans("VATPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines, 'title_accountancy', 0, '', '', $limit);
 	
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 929dbdc91e8..fc601cf8a53 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -433,6 +433,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit);
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 318a24931be..43cce90bd1c 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -340,6 +340,7 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
     print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'title_commercial.png', 0, '', '', $limit);
 
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index f283502bc3e..adac837f3e0 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -308,6 +308,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 $title=$langs->trans("ListOfServices");
 if ($mode == "0") $title=$langs->trans("ListOfInactiveServices");	// Must use == "0"
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 3fef1265f9d..2fa2599e4d3 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -698,6 +698,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 
     $sortfield = GETPOST("sortfield",'alpha');
     $sortorder = GETPOST("sortorder",'alpha');
+    $page = GETPOST('page','int');
     $search_status		= GETPOST("search_status",'int');
     if ($search_status=='') $search_status=1; // always display activ customer first
     $search_name = GETPOST("search_name",'alpha');
@@ -733,7 +734,8 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     print '<input type="hidden" name="socid" value="'.$object->id.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-
+    print '<input type="hidden" name="page" value="'.$page.'">';
+    
     print "\n".'<table class="noborder" width="100%">'."\n";
 
     $param="socid=".$object->id;
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 2eff05868d4..95338247eca 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -273,6 +273,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 // Line with explanation and button new job
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index b0cd414ed28..daa6f7aa1f2 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -149,6 +149,7 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
     if ($search_all)
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 50454e3f253..c838c002cc9 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -280,6 +280,7 @@ if ($resql)
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 06998059aa5..f95952db482 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -314,6 +314,7 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 9963794fd9f..9271a348558 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -288,6 +288,7 @@ if ($resql)
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 8ca86a1e6c5..544d882cda3 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -677,6 +677,7 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 9ad1bf63ce2..e449ed83371 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -453,6 +453,7 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index b6825e93d82..10851e629e3 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -679,7 +679,8 @@ if (empty($action))
         print '<input type="hidden" name="action" value="list">';
         print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
         print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+        print '<input type="hidden" name="page" value="'.$page.'">';
+        
         $moreforfilter='';
         
         $parameters=array();
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 94302eca4be..ca874511c94 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -170,6 +170,7 @@ if ($resql)
 	if ($fourn_id > 0) print '<input type="hidden" name="fourn_id" value="'.$fourn_id.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	print '<table class="liste" width="100%">';
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 063c3042e3b..30d3dc14f69 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -282,6 +282,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
 
 if ($sall)
diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index fdc8cf67073..b04d3bd90b3 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -117,6 +117,7 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
     
     print_barre_liste($langs->trans("Loans"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit);
diff --git a/htdocs/modulebuilder/skeletons/skeleton_list.php b/htdocs/modulebuilder/skeletons/skeleton_list.php
index 205fcf4be8c..9c258162759 100644
--- a/htdocs/modulebuilder/skeletons/skeleton_list.php
+++ b/htdocs/modulebuilder/skeletons/skeleton_list.php
@@ -307,6 +307,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 636611f91f0..510a0545372 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -89,6 +89,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 $moreforfilter = '';
 
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index e3103d8f426..1ebbf256c9c 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -689,6 +689,7 @@ else
 		print '<input type="hidden" name="action" value="list">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+        print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="type" value="'.$type.'">';
 
 		echo $listHTML;
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index c957606b66a..7e6ae9b47f4 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -429,6 +429,7 @@ else
 		print '<input type="hidden" name="action" value="list">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+        print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="type" value="'.$type.'">';
 
 	    print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, '', '', $limit);
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index a87fecd36b7..e460bbec7c5 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -189,6 +189,7 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	if ($sref || $snom || $sall || GETPOST('search'))
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 660d0e78bd3..6ab18ac87cb 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -200,6 +200,7 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	if ($sref || $snom || $sall || GETPOST('search'))
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index b3361f0b328..eefbe3deee9 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -135,7 +135,8 @@ if ($result)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	
 	print_barre_liste($langs->trans("ListOfWarehouses"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_generic.png', 0, '', '', $limit);
 	
 	if ($sall)
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 506ee68e42b..5f0f9c213dc 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -695,6 +695,7 @@ if ($resql)
     print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="type" value="'.$type.'">';
     print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
     if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index df97621c07b..78d3c470cb1 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -309,6 +309,7 @@ if ($resql)
     print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
 	
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index cbf036ef7e3..6230626a320 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -416,6 +416,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 85fa0f640e9..064281633c8 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -468,6 +468,7 @@ else if ($id > 0 || ! empty($ref))
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	
 	$title=$langs->trans("ListOfTasks");
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 8c9f56f1d94..1f2459e85db 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -412,6 +412,7 @@ print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index ddbd59ed11f..cbdfece9d45 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -707,7 +707,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		else print '<input type="hidden" name="action" value="list">';
 	    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-		
+	    print '<input type="hidden" name="page" value="'.$page.'">';
+	     
 		print '<input type="hidden" name="id" value="'.$id.'">';
 		print '<input type="hidden" name="projectid" value="'.$projectidforalltimes.'">';
 		print '<input type="hidden" name="withproject" value="'.$withproject.'">';
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index c0b58523994..f8a1fb6be61 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -187,6 +187,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $moreforfilter = '';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 4670036d70b..40ca07783c4 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -547,6 +547,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index b17ea678853..7e7648db712 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -454,6 +454,7 @@ if ($result > 0)
     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="socid" value="'.$object->id.'">';
     
     // List of active notifications
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index c5f994f8a10..2c10e2451a6 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -410,6 +410,7 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 6956a1ad5eb..38fdf68b2ba 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -131,6 +131,7 @@ if ($resql)
     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="mode" value="'.$mode.'">';
     print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 04acb9b56f7..4cec562ce44 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -296,6 +296,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 3c186ac3cae..e39d8153cac 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -435,6 +435,7 @@ if ($result > 0)
     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="id" value="'.$object->id.'">';
     
     // List of notifications done

From 5992175b687e7a7b226951269eb24cc4bbe10ea1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 03:23:44 +0200
Subject: [PATCH 0892/1163] Standardize code between customer and supplier
 invoice list.

---
 htdocs/compta/facture/list.php    |  33 ++++++--
 htdocs/core/lib/functions.lib.php |   2 +-
 htdocs/fourn/facture/list.php     | 124 ++++++++++++++++++++++--------
 3 files changed, 119 insertions(+), 40 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 10b11812b1a..1ab17765d8f 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -536,7 +536,7 @@ if ($resql)
     $param='&socid='.$socid;
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
     if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($sall)				 $param.='&sall='.$sall;
+	if ($sall)				 $param.='&sall='.urlencode($sall);
     if ($day)                $param.='&day='.urlencode($day);
     if ($month)              $param.='&month='.urlencode($month);
     if ($year)               $param.='&year=' .urlencode($year);
@@ -760,14 +760,14 @@ if ($resql)
     // Filters lines
     print '<tr class="liste_titre_filter">';
 	// Ref
-	if (! empty($arrayfields['f.facnumber']['checked'])) 
+	if (! empty($arrayfields['f.facnumber']['checked']))
 	{
         print '<td class="liste_titre" align="left">';
         print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
         print '</td>';
 	}
 	// Ref customer
-	if (! empty($arrayfields['f.ref_client']['checked'])) 
+	if (! empty($arrayfields['f.ref_client']['checked']))
 	{
     	print '<td class="liste_titre">';
     	print '<input class="flat" size="6" type="text" name="search_refcustomer" value="'.dol_escape_htmltag($search_refcustomer).'">';
@@ -806,6 +806,11 @@ if ($resql)
     	print '<br><input type="checkbox" name="option" value="late"'.($option == 'late'?' checked':'').'> '.$langs->trans("Late");
         print '</td>';
 	}
+	// Project
+	if (! empty($arrayfields['p.ref']['checked']))
+	{
+	    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_project" value="'.$search_project.'"></td>';
+	}
 	// Thirpdarty
 	if (! empty($arrayfields['s.nom']['checked'])) 
 	{
@@ -1016,7 +1021,7 @@ if ($resql)
     
                 print '<td class="nobordernopadding nowrap">';
                 print $facturestatic->getNomUrl(1,'',200,0,'',0,1);
-                print $obj->increment;
+                print empty($obj->increment)?'':' ('.$obj->increment.')';
                 print '</td>';
     
                 print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
@@ -1071,6 +1076,20 @@ if ($resql)
     		    if (! $i) $totalarray['nbfield']++;
     		}
 
+            // Project
+    		if (! empty($arrayfields['p.ref']['checked']))
+    		{
+    		    print '<td class="nowrap">';
+    		    if ($obj->project_id > 0)
+    		    {
+	    		    $projectstatic->id=$obj->project_id;
+    			    $projectstatic->ref=$obj->project_ref;
+    			    print $projectstatic->getNomUrl(1);
+    		    }
+    		    print '</td>';
+    		    if (! $i) $totalarray['nbfield']++;
+    		}
+    		
     		// Third party
     		if (! empty($arrayfields['s.nom']['checked']))
     		{
@@ -1295,15 +1314,13 @@ if ($resql)
 	print $hookmanager->resPrint;
     
 	print "</table>\n";
-    print "</div>";
+    print '</div>';
     
     print "</form>\n";
     
     if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
     {
-        /*
-         * Show list of available documents
-         */
+        // Show list of available documents
         $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
         $urlsource.=str_replace('&amp;','&',$param);
         
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b6365a23b9a..14f61d99590 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -105,7 +105,7 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
  * 	@param	string	$element	Current element 
  *                              'societe', 'socpeople', 'actioncomm', 'agenda', 'resource', 
  *                              'product', 'productprice', 'stock',
- *                              'propal', 'facture', 'facture_fourn',
+ *                              'propal', 'supplier_proposal', 'facture', 'facture_fourn',
  *                              'categorie', 'bank_account', 'bank_account', 'adherent', 'user',  
  *                              'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
  *                              'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index e449ed83371..0918423908e 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -163,6 +163,8 @@ $arrayfields=array(
     'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj=="1"),
     'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax2_assuj=="1"),
     'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
+    'dynamount_payed'=>array('label'=>$langs->trans("Payed"), 'checked'=>0),
+    'rtp'=>array('label'=>$langs->trans("Rest"), 'checked'=>0),
     'f.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
     'f.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
     'f.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
@@ -263,7 +265,9 @@ $sql.= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.
 $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= " p.rowid as project_id, p.ref as project_ref";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+// We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
+// TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
+if (! $search_all) $sql.= ', SUM(pf.amount) as dynamount_payed';   
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -276,6 +280,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typ
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 $sql.= ', '.MAIN_DB_PREFIX.'facture_fourn as f';
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn_extrafields as ef on (f.rowid = ef.fk_object)";
+if (! $search_all) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
 if ($search_all || $search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_det as pd ON f.rowid=pd.fk_facture_fourn';
 if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = f.fk_projet";
@@ -287,14 +292,10 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE f.fk_soc = s.rowid';
-$sql.= " AND f.entity = ".$conf->entity;
+$sql.= ' AND f.entity IN ('.getEntity('facture_fourn', 1).')';
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
 if ($socid > 0) $sql .= ' AND s.rowid = '.$socid;
-if ($search_all)
-{
-    $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
-}
 if ($search_ref)
 {
 	if (is_numeric($search_ref)) $sql .= natural_search(array('f.ref'), $search_ref);
@@ -337,7 +338,7 @@ if ($month_lim > 0)
 	else if ($year_lim > 0 && ! empty($day_lim))
 		$sql.= " AND f.date_lim_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_lim, $day_lim, $year_lim))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_lim, $day_lim, $year_lim))."'";
 	else
-		$sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$month_lim."'";
+		$sql.= " AND date_format(f.date_lim_reglement, '%m') = '".$db->escape($month_lim)."'";
 }
 else if ($year_lim > 0)
 {
@@ -382,6 +383,26 @@ $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 
+if (! $search_all)
+{
+    $sql.= " GROUP BY f.rowid, f.ref, f.ref_supplier, f.datef, f.date_lim_reglement, f.fk_mode_reglement,";
+    $sql.= " f.total_ht, f.total_ttc, f.total_tva, f.paye, f.fk_statut, f.libelle, f.datec, f.tms,";
+    $sql.= " f.localtax1, f.localtax2,";
+    $sql.= " s.rowid, s.nom, s.town, s.zip, s.fk_pays, s.client, s.code_client,";
+    $sql.= " typent.code,";
+    $sql.= " state.code_departement, state.nom,";
+    $sql.= " p.rowid, p.ref";
+
+    foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by
+    {
+        $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
+    }   
+}
+else
+{
+    $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
+}
+
 $sql.= $db->order($sortfield,$sortorder);
 
 $nbtotalofrecords = '';
@@ -410,7 +431,8 @@ if ($resql)
 	$param='&socid='.$socid;
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
     if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($day) 					$param.='&day='.urlencode($day);
+	if ($search_all)			$param.='&search_all='.urlencode($search_all);
+    if ($day) 					$param.='&day='.urlencode($day);
 	if ($month) 				$param.='&month='.urlencode($month);
 	if ($year)  				$param.='&year=' .urlencode($year);
 	if ($day_lim) 				$param.='&day_lim='.urlencode($day_lim);
@@ -428,6 +450,8 @@ if ($resql)
 	if ($search_amount_no_tax)	$param.='&search_amount_no_tax='.urlencode($search_amount_no_tax);
 	if ($search_amount_all_tax)	$param.='&search_amount_all_tax='.urlencode($search_amount_all_tax);
 	if ($search_status >= 0)  	$param.="&search_status=".urlencode($search_status);
+    if ($show_files)            $param.='&show_files=' .$show_files;
+	if ($option)                $param.="&option=".$option;
 	if ($optioncss != '')       $param.='&optioncss='.$optioncss;
 	// Add $param from extra fields
 	foreach ($search_array_options as $key => $val)
@@ -453,13 +477,13 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 	print '<input type="hidden" name="socid" value="'.$socid.'">';
 
-	print_barre_liste($langs->trans("BillsSuppliers").($socid?" - $soc->name":""), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
+	print_barre_liste($langs->trans("BillsSuppliers").($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 	
 	if ($massaction == 'presend')
 	{
@@ -467,7 +491,7 @@ if ($resql)
 	
 	    if (! GETPOST('cancel'))
 	    {
-	        $objecttmp=new Commande($db);
+	        $objecttmp=new FactureFourn($db);
 	        $listofselectedid=array();
 	        $listofselectedthirdparties=array();
 	        $listofselectedref=array();
@@ -491,8 +515,8 @@ if ($resql)
 	
 	    dol_fiche_head(null, '', '');
 	
-	    $topicmail="SendOrderRef";
-	    $modelmail="order_send";
+	    $topicmail="SendBillRef";
+	    $modelmail="supplier_invoice_send";
 	
 	    // Cree l'objet formulaire mail
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -506,12 +530,12 @@ if ($resql)
 	    }
 	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
 	    {
-	        $formmail->trackid='ord'.$object->id;
+	        $formmail->trackid='sinv'.$object->id;
 	    }
 	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
 	    {
 	        include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-	        $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
+	        $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'sinv'.$object->id);
 	    }
 	    $formmail->withfrom=1;
 	    $liste=$langs->trans("AllRecipientSelected");
@@ -678,7 +702,7 @@ if ($resql)
 	if (! empty($arrayfields['f.datef']['checked']))
 	{
 	    print '<td class="liste_titre" align="center">';
-	    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+	    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
 	    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
 	    $formother->select_year($year?$year:-1,'year',1, 20, 5);
 	    print '</td>';
@@ -687,7 +711,7 @@ if ($resql)
 	if (! empty($arrayfields['f.date_lim_reglement']['checked']))
 	{
 	    print '<td class="liste_titre" align="center">';
-	    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_lim" value="'.$day_lim.'">';
+	    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
 	    print '<input class="flat" type="text" size="1" maxlength="2" name="month_lim" value="'.$month_lim.'">';
 	    $formother->select_year($year_lim?$year_lim:-1,'year_lim',1, 20, 5);
 	    print '<br><input type="checkbox" name="option" value="late"'.($option == 'late'?' checked':'').'> '.$langs->trans("Late");
@@ -704,9 +728,9 @@ if ($resql)
 	    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_societe" value="'.$search_societe.'"></td>';
 	}
 	// Town
-	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
 	// Zip
-	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';
+	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
 	// State
 	if (! empty($arrayfields['state.nom']['checked']))
 	{
@@ -739,14 +763,14 @@ if ($resql)
 	{
 	    // Amount
 	    print '<td class="liste_titre" align="right">';
-	    print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.$search_montant_ht.'">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
 	    print '</td>';
 	}
 	if (! empty($arrayfields['f.total_vat']['checked']))
 	{
 	    // Amount
 	    print '<td class="liste_titre" align="right">';
-	    print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.$search_montant_vat.'">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
 	    print '</td>';
 	}
 	if (! empty($arrayfields['f.total_localtax1']['checked']))
@@ -767,9 +791,19 @@ if ($resql)
 	{
 	    // Amount
 	    print '<td class="liste_titre" align="right">';
-	    print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.$search_montant_ttc.'">';
+	    print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 	    print '</td>';
 	}
+    if (! empty($arrayfields['dynamount_payed']['checked']))
+    {
+        print '<td class="liste_titre" align="right">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['rtp']['checked']))
+    {
+        print '<td class="liste_titre" align="right">';
+        print '</td>';
+    }
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
@@ -819,7 +853,7 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpicto=$form->showFilterButtons('checkforselect', 0);
+	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
 
@@ -844,6 +878,8 @@ if ($resql)
 	if (! empty($arrayfields['f.total_localtax1']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax1']['label'],$_SERVER['PHP_SELF'],'f.localtax1','',$param,'align="right"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.total_localtax2']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax2']['label'],$_SERVER['PHP_SELF'],'f.localtax2','',$param,'align="right"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.total_ttc']['checked']))          print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],'f.total_ttc','',$param,'align="right"',$sortfield,$sortorder);
+    if (! empty($arrayfields['dynamount_payed']['checked']))      print_liste_field_titre($arrayfields['dynamount_payed']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+    if (! empty($arrayfields['rtp']['checked']))                  print_liste_field_titre($arrayfields['rtp']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
@@ -880,14 +916,20 @@ if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			
-		
 			$datelimit=$db->jdate($obj->datelimite);
 			$facturestatic->id=$obj->facid;
 			$facturestatic->ref=$obj->ref;
+            $facturestatic->type=$obj->type;
 			$facturestatic->ref_supplier=$obj->ref_supplier;
 			$facturestatic->date_echeance = $db->jdate($obj->datelimite);
 			$facturestatic->statut = $obj->fk_statut;
-	
+
+			$paiement = $facturestatic->getSommePaiement();
+			$totalcreditnotes = $facturestatic->getSumCreditNotesUsed();
+			$totaldeposits = $facturestatic->getSumDepositsUsed();
+			$totalpay = $paiement + $totalcreditnotes + $totaldeposits;
+			$remaintopay = $obj->total_ttc - $totalpay;
+				
             print '<tr class="oddeven">';
     		if (! empty($arrayfields['f.ref']['checked']))
     		{
@@ -969,7 +1011,7 @@ if ($resql)
     		// Third party
     		if (! empty($arrayfields['s.nom']['checked']))
     		{
-                print '<td>';
+                print '<td class="tdoverflowmax200">';
                 $thirdparty=new Societe($db);
                 $thirdparty->id=$obj->socid;
                 $thirdparty->name=$obj->name;
@@ -1070,22 +1112,23 @@ if ($resql)
     		    $totalarray['totalttc'] += $obj->total_ttc;
             }
 
-            if (! empty($arrayfields['am']['checked']))
+		    if (! empty($arrayfields['dynamount_payed']['checked']))
             {
-                print '<td align="right">'.(! empty($paiement)?price($paiement,0,$langs):'&nbsp;').'</td>';
+                print '<td align="right">'.(! empty($totalpay)?price($totalpay,0,$langs):'&nbsp;').'</td>'; // TODO Use a denormalized field
                 if (! $i) $totalarray['nbfield']++;
     		    if (! $i) $totalarray['totalamfield']=$totalarray['nbfield'];
-    		    $totalarray['totalam'] += $paiement;
+    		    $totalarray['totalam'] += $totalpay;
             }
 
             if (! empty($arrayfields['rtp']['checked']))
             {
-                print '<td align="right">'.(! empty($remaintopay)?price($remaintopay,0,$langs):'&nbsp;').'</td>';
+                print '<td align="right">'.(! empty($remaintopay)?price($remaintopay,0,$langs):'&nbsp;').'</td>'; // TODO Use a denormalized field
                 if (! $i) $totalarray['nbfield']++;
     		    if (! $i) $totalarray['totalrtpfield']=$totalarray['nbfield'];
     		    $totalarray['totalrtp'] += $remaintopay;
             }
             
+            
             // Extra fields
             if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
             {
@@ -1135,7 +1178,6 @@ if ($resql)
             }
             
     		// Action column
-            // Action column
             print '<td class="nowrap" align="center">';
             if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
             {
@@ -1193,7 +1235,27 @@ if ($resql)
 	
 	print "</table>\n";
     print '</div>';
+    
 	print "</form>\n";
+    
+    /*
+    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
+    {
+        // Show list of available documents
+        $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+        $urlsource.=str_replace('&amp;','&',$param);
+        
+        $filedir=$diroutputmassaction;
+        $genallowed=$user->rights->facture->lire;
+        $delallowed=$user->rights->facture->lire;
+    
+        print $formfile->showdocuments('massfilesarea_invoices','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+    }
+    else
+    {
+        print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
+    }
+    */
 }
 else
 {

From 52b5a8ece787e4d0c6d5ae893819777fdfe4368a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 14:06:43 +0200
Subject: [PATCH 0893/1163] More powerfull dol_move function.

---
 htdocs/api/class/api_documents.class.php |  26 +--
 htdocs/core/class/antivir.class.php      |   7 +
 htdocs/core/lib/files.lib.php            | 216 ++++++++++++++---------
 test/phpunit/RestAPIDocumentTest.php     |   2 +-
 4 files changed, 160 insertions(+), 91 deletions(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 18ccee58b07..9794dad4a12 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -65,8 +65,8 @@ class Documents extends DolibarrApi
 
     /**
      * Push a file. 
-     * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "" }.
-     * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "" }.
+     * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
+     * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
      *
      * @param   string  $filename           Name of file to create ('FA1705-0123')
      * @param   string  $modulepart         Name of module or area concerned by file upload ('facture', ...)
@@ -74,10 +74,12 @@ class Documents extends DolibarrApi
      * @param   string  $subdir             Subdirectory (Only if ref not provided)
      * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
      * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64)
+     * @param   int 	$overwriteifexists  Overwrite file if exists (1 by default)
      * @return  bool     				    State of copy
      * @throws RestException
      */
-    public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='') {
+    public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='', $overwriteifexists=0)
+    {
         global $db, $conf;
         
         /*var_dump($modulepart);
@@ -138,30 +140,34 @@ class Documents extends DolibarrApi
 		
 		$upload_dir = dol_sanitizePathName($upload_dir);
 		
-        $destfile = $upload_dir . '/' . $original_file;
-
+		$destfile = $upload_dir . '/' . $original_file;
+		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/' . $original_file;
+		dol_delete_file($destfiletmp);
+		
         if (!dol_is_dir($upload_dir)) {
             throw new RestException(401,'Directory not exists : '.$upload_dir);
         }
 
-        if (dol_is_file($destfile))
+        if (! $overwriteifexists && dol_is_file($destfile))
         {
             throw new RestException(500, "File with name '".$original_file."' already exists.");
         }
         
-        $fhandle = fopen($destfile, 'w');
+        $fhandle = @fopen($destfiletmp, 'w');
         if ($fhandle)
         {
             $nbofbyteswrote = fwrite($fhandle, $newfilecontent);
             fclose($fhandle);
-            @chmod($destfile, octdec($conf->global->MAIN_UMASK));
+            @chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
         }
         else
         {
-            throw new RestException(500, 'Failed to open file for write');
+            throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
         }
         
-        return true;
+        $result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1);
+        
+        return $result;
     }
 
     /**
diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php
index d7f765fa510..357f184eea8 100644
--- a/htdocs/core/class/antivir.class.php
+++ b/htdocs/core/class/antivir.class.php
@@ -49,6 +49,7 @@ class AntiVir
 	/**
 	 *	Scan a file with antivirus.
 	 *  This function runs the command defined in setup. This antivirus command must return 0 if OK.
+	 *  Return also true (virus found) if file end with '.virus' (so we can make test safely).
 	 *
 	 *	@param	string	$file		File to scan
 	 *	@return	int					<0 if KO (-98 if error, -99 if virus), 0 if OK
@@ -59,6 +60,12 @@ class AntiVir
 
 		$return = 0;
 
+		if (preg_match('/\.virus$/i', $file))
+		{
+		    $this->errors='File has an extension saying file is a virus';
+		    return -97;		    
+		}
+		
 		$fullcommand=$this->getCliCommand($file);
 		//$fullcommand='"c:\Program Files (x86)\ClamWin\bin\clamscan.exe" --database="C:\Program Files (x86)\ClamWin\lib" "c:\temp\aaa.txt"';
         $fullcommand.=' 2>&1';      // This is to get error output
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 437811d8e98..008f4c15e3c 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -648,15 +648,19 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
 
 /**
  * Move a file into another name.
- * This function differs from dol_move_uploaded_file, because it can be called in any context.
+ * Note: 
+ *  - This function differs from dol_move_uploaded_file, because it can be called in any context.
+ *  - Database of files is updated.
+ *  - Test on antivirus is done only if param testvirus is provided and an antivirus was set. 
  *
  * @param	string  $srcfile            Source file (can't be a directory. use native php @rename() to move a directory)
  * @param   string	$destfile           Destination file (can't be a directory. use native php @rename() to move a directory)
  * @param   integer	$newmask            Mask in octal string for new file (0 by default means $conf->global->MAIN_UMASK)
  * @param   int		$overwriteifexists  Overwrite file if exists (1 by default)
  * @return  boolean 		            True if OK, false if KO
+ * @see dol_move_uploaded_file
  */
-function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
+function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvirus=0)
 {
     global $user, $db, $conf;
     $result=false;
@@ -676,6 +680,18 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
         $newpathofsrcfile=dol_osencode($srcfile);
         $newpathofdestfile=dol_osencode($destfile);
 
+        // Check virus
+        $testvirusarray=array();
+        if ($testvirus)
+        {
+            $testvirusarray=dolCheckVirus($newpathofsrcfile);
+            if (count($testvirusarray)) 
+            {
+                dol_syslog("files.lib.php::dol_move canceled because a virus was found into source file. we ignore the move request.", LOG_WARNING);
+                return false;
+            }
+        }
+
         $result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
         if (! $result)
         {
@@ -703,9 +719,17 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
 
                 dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
                 include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+                
+                $ecmfiletarget=new EcmFiles($db);
+                $resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
+                if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
+                {
+                    $ecmfiletarget->delete($user);
+                }
+                
                 $ecmfile=new EcmFiles($db);
-                $result = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
-                if ($result > 0)   // If found
+                $resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
+                if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
                 {
                     $filename = basename($rel_filetorenameafter);
                     $rel_dir = dirname($rel_filetorenameafter);
@@ -714,9 +738,9 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
                     
                     $ecmfile->filepath = $rel_dir;
                     $ecmfile->filename = $filename;
-                    $result = $ecmfile->update($user);
+                    $resultecm = $ecmfile->update($user);
                 }
-                elseif ($result == 0)   // If not found
+                elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
                 {
                     $filename = basename($rel_filetorenameafter);
                     $rel_dir = dirname($rel_filetorenameafter);
@@ -730,16 +754,19 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
                     $ecmfile->gen_or_uploaded = 'unknown';
                     $ecmfile->description = '';    // indexed content
                     $ecmfile->keyword = '';        // keyword content
-                    $result = $ecmfile->create($user);
-                    if ($result < 0)
+                    $resultecm = $ecmfile->create($user);
+                    if ($resultecm < 0)
                     {
                         setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-                    }                    
+                    }
                 }
-                elseif ($result < 0)
+                elseif ($resultecm < 0)
                 {
                     setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
                 }
+                
+                if ($resultecm > 0) $result=true;
+                else $result = false;
             }        
         }
         
@@ -769,10 +796,41 @@ function dol_unescapefile($filename)
 	return trim(basename($filename), ".\x00..\x20");
 }
 
+
+/**
+ * Check virus into a file
+ * 
+ * @param   string      $src_file       Source file to check
+ * @return  array                       Array of errors or empty array if not virus found
+ */
+function dolCheckVirus($src_file)
+{
+    global $conf;
+    
+    if (! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
+    {
+        if (! class_exists('AntiVir')) {
+            require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
+        }
+        $antivir=new AntiVir($db);
+        $result = $antivir->dol_avscan_file($src_file);
+        if ($result < 0)	// If virus or error, we stop here
+        {
+            $reterrors=$antivir->errors;
+            return $reterrors;
+        }
+    }
+    return array();
+}
+
+
 /**
  *	Make control on an uploaded file from an GUI page and move it to final destination.
  * 	If there is errors (virus found, antivir in error, bad filename), file is not moved.
- *  Note: This function can be used only into a HTML page context. Use dol_move if you are outside.
+ *  Note: 
+ *  - This function can be used only into a HTML page context. Use dol_move if you are outside.
+ *  - Database of files is not updated.
+ *  - Test on antivirus is always done (if antivirus set).
  *
  *	@param	string	$src_file			Source full path filename ($_FILES['field']['tmp_name'])
  *	@param	string	$dest_file			Target full path filename  ($_FILES['field']['name'])
@@ -794,80 +852,78 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 
 	if (empty($nohook))
 	{
-		// If an upload error has been reported
-		if ($uploaderrorcode)
-		{
-			switch($uploaderrorcode)
-			{
-				case UPLOAD_ERR_INI_SIZE:	// 1
-					return 'ErrorFileSizeTooLarge';
-					break;
-				case UPLOAD_ERR_FORM_SIZE:	// 2
-					return 'ErrorFileSizeTooLarge';
-					break;
-				case UPLOAD_ERR_PARTIAL:	// 3
-					return 'ErrorPartialFile';
-					break;
-				case UPLOAD_ERR_NO_TMP_DIR:	//
-					return 'ErrorNoTmpDir';
-					break;
-				case UPLOAD_ERR_CANT_WRITE:
-					return 'ErrorFailedToWriteInDir';
-					break;
-				case UPLOAD_ERR_EXTENSION:
-					return 'ErrorUploadBlockedByAddon';
-					break;
-				default:
-					break;
-			}
-		}
-
-		// If we need to make a virus scan
-		if (empty($disablevirusscan) && file_exists($src_file) && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
-		{
-			if (! class_exists('AntiVir')) {
-				require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
-			}
-			$antivir=new AntiVir($db);
-			$result = $antivir->dol_avscan_file($src_file);
-			if ($result < 0)	// If virus or error, we stop here
-			{
-				$reterrors=$antivir->errors;
-				dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',',$antivir->errors), LOG_WARNING);
-				return 'ErrorFileIsInfectedWithAVirus: '.join(',',$reterrors);
-			}
-		}
-
-		// Security:
-		// Disallow file with some extensions. We renamed them.
-		// Car si on a mis le rep documents dans un rep de la racine web (pas bien), cela permet d'executer du code a la demande.
-		if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
-		{
-			$file_name.= '.noexe';
-		}
-
-		// Security:
-		// We refuse cache files/dirs, upload using .. and pipes into filenames.
-		if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
-		{
-			dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
-			return -1;
-		}
-
-		// Security:
-		// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
-		if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
-		{
-			dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
-			return -2;
-		}
-
 		$reshook=$hookmanager->initHooks(array('fileslib'));
 
 		$parameters=array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
 		$reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
 	}
-
+    
+	if (empty($reshook))
+	{
+    	// If an upload error has been reported
+    	if ($uploaderrorcode)
+    	{
+    	    switch($uploaderrorcode)
+    	    {
+    	        case UPLOAD_ERR_INI_SIZE:	// 1
+    	            return 'ErrorFileSizeTooLarge';
+    	            break;
+    	        case UPLOAD_ERR_FORM_SIZE:	// 2
+    	            return 'ErrorFileSizeTooLarge';
+    	            break;
+    	        case UPLOAD_ERR_PARTIAL:	// 3
+    	            return 'ErrorPartialFile';
+    	            break;
+    	        case UPLOAD_ERR_NO_TMP_DIR:	//
+    	            return 'ErrorNoTmpDir';
+    	            break;
+    	        case UPLOAD_ERR_CANT_WRITE:
+    	            return 'ErrorFailedToWriteInDir';
+    	            break;
+    	        case UPLOAD_ERR_EXTENSION:
+    	            return 'ErrorUploadBlockedByAddon';
+    	            break;
+    	        default:
+    	            break;
+    	    }
+    	}
+    	
+    	// If we need to make a virus scan
+    	if (empty($disablevirusscan) && file_exists($src_file))
+    	{
+    	    $checkvirusarray=dolCheckVirus($src_file);
+    	    if (count($checkvirusarray))
+    	    {
+    	       dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',',$checkvirusarray), LOG_WARNING);
+    	       return 'ErrorFileIsInfectedWithAVirus: '.join(',',$checkvirusarray);
+    	    }
+    	}
+    	
+    	// Security:
+    	// Disallow file with some extensions. We renamed them.
+    	// Car si on a mis le rep documents dans un rep de la racine web (pas bien), cela permet d'executer du code a la demande.
+    	if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+    	{
+    	    $file_name.= '.noexe';
+    	}
+    	
+    	// Security:
+    	// We refuse cache files/dirs, upload using .. and pipes into filenames.
+    	if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
+    	{
+    	    dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
+    	    return -1;
+    	}
+    	
+    	// Security:
+    	// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
+    	if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
+    	{
+    	    dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
+    	    return -2;
+    	}
+	}
+	
 	if ($reshook < 0)	// At least one blocking error returned by one hook
 	{
 		$errmsg = join(',', $hookmanager->errors);
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index b180586aa91..b60a7e9e833 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -172,7 +172,7 @@ class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
         dol_mkdir(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit2');
         
         $data = array(
-            'filename'=>"mynewfilethatwillfails.txt",
+            'filename'=>"mynewfile.txt",
             'modulepart'=>"medias",
             'ref'=>"",
             'subdir'=>"tmpphpunit/tmpphpunit2",

From d834cbf7baeb2fef8698c84ff634726160d3e437 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 21 May 2017 15:24:16 +0200
Subject: [PATCH 0894/1163] Use getNomUrl for accounting account in product
 card

---
 htdocs/product/card.php | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 71f7cd8e7f6..5885775a1f1 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1,20 +1,20 @@
 <?php
-/* Copyright (C) 2001-2007	Rodolphe Quiedeville		<rodolphe@quiedeville.org>
+/* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2004-2016	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005		Eric Seigne			<eric.seigne@ryxeo.com>
+ * Copyright (C) 2005		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2015	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2006		Auguria SARL			<info@auguria.org>
  * Copyright (C) 2010-2015	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013-2016	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012-2013	Cédric Salvador			<csalvador@gpcsolutions.fr>
- * Copyright (C) 2011-2016	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2011-2017	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014		Cédric Gross			<c.gross@kreiz-it.fr>
  * Copyright (C) 2014-2015	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016		Charlie Benke			<charlie@patas-monkey.com>
- * Copyright (C) 2016		Meziane Sof			<virtualsof@yahoo.fr>
+ * Copyright (C) 2016		Meziane Sof				<virtualsof@yahoo.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,8 +51,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.php';
 if (! empty($conf->propal->enabled))     require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (! empty($conf->facture->enabled))    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 if (! empty($conf->commande->enabled))   require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 
 $langs->load("products");
 $langs->load("other");
@@ -272,7 +272,7 @@ if (empty($reshook))
             $object->volume_units       	 = GETPOST('volume_units');
             $object->finished           	 = GETPOST('finished');
 	        $object->fk_unit                 = GETPOST('units');
-			
+
 			$accountancy_code_sell 			 = GETPOST('accountancy_code_sell');
 			$accountancy_code_buy 			 = GETPOST('accountancy_code_buy');
 
@@ -399,7 +399,7 @@ if (empty($reshook))
 
 				$accountancy_code_sell 			 = GETPOST('accountancy_code_sell');
 				$accountancy_code_buy 			 = GETPOST('accountancy_code_buy');
-				
+
 				if ($accountancy_code_sell <= 0) { $object->accountancy_code_sell = ''; } else { $object->accountancy_code_sell = $accountancy_code_sell; }
 				if ($accountancy_code_buy <= 0) { $object->accountancy_code_buy = ''; } else { $object->accountancy_code_buy = $accountancy_code_buy; }
 
@@ -1107,7 +1107,7 @@ else
 
         // Accountancy codes
         print '<table class="border" width="100%">';
-		
+
 		if (! empty($conf->accounting->enabled))
 		{
             // Accountancy_code_sell
@@ -1121,7 +1121,7 @@ else
             print '<td>';
 			print $formaccountancy->select_account(GETPOST('accountancy_code_buy'), 'accountancy_code_buy', 1, null, 1, 1, '');
             print '</td></tr>';
-		}			
+		}
 		else // For external software 
 		{
             // Accountancy_code_sell
@@ -1414,7 +1414,7 @@ else
                 print '<td>';
 				print $formaccountancy->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
                 print '</td></tr>';
-			}			
+			}
 			else // For external software 
 			{
                 // Accountancy_code_sell
@@ -1530,8 +1530,12 @@ else
 			print '<tr><td class="nowrap">';
             print $langs->trans("ProductAccountancySellCode");
             print '</td><td colspan="2">';
-			if (! empty($conf->accounting->enabled)) {
-				print length_accountg($object->accountancy_code_sell);
+			if (! empty($conf->accounting->enabled))
+			{
+				$accountingaccount = new AccountingAccount($db);
+				$accountingaccount->fetch('',$object->accountancy_code_sell);
+
+				print $accountingaccount->getNomUrl(0,1,1,'',1);
             } else {
 				print $object->accountancy_code_sell;
 			}
@@ -1541,8 +1545,12 @@ else
 			print '<tr><td class="nowrap">';
             print $langs->trans("ProductAccountancyBuyCode");
             print '</td><td colspan="2">';
-			if (! empty($conf->accounting->enabled)) {
-				print length_accountg($object->accountancy_code_buy);
+			if (! empty($conf->accounting->enabled))
+			{
+				$accountingaccount2 = new AccountingAccount($db);
+				$accountingaccount2->fetch('',$object->accountancy_code_buy);
+
+				print $accountingaccount2->getNomUrl(0,1,1,'',1);
             } else {
 				print $object->accountancy_code_buy;
 			}

From 6aa6ef1f9f1a13db8853935b6030db5ff13584ac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 18:30:43 +0200
Subject: [PATCH 0895/1163] Fix travis error

---
 htdocs/core/lib/files.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 008f4c15e3c..0920158b720 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -657,6 +657,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
  * @param   string	$destfile           Destination file (can't be a directory. use native php @rename() to move a directory)
  * @param   integer	$newmask            Mask in octal string for new file (0 by default means $conf->global->MAIN_UMASK)
  * @param   int		$overwriteifexists  Overwrite file if exists (1 by default)
+ * @param   int     $testvirus          Do an antivirus test. Move is canceled if a virus is found.
  * @return  boolean 		            True if OK, false if KO
  * @see dol_move_uploaded_file
  */
@@ -1698,7 +1699,7 @@ function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta
  * @param	string	$entity				Restrict onto entity (0=no restriction)
  * @param  	User	$fuser				User object (forced)
  * @param	string	$refname			Ref of object to check permission for external users (autodetect if not provided)
- * @param   string  $more               Check permission for 'read' or 'write'               
+ * @param   string  $mode               Check permission for 'read' or 'write'               
  * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
  * @see restrictedArea
  */

From 5cb38ece19b6922a2646ca45a01fbde90b874ae4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 19:37:15 +0200
Subject: [PATCH 0896/1163] Fix travis errors

---
 htdocs/core/lib/functions.lib.php             | 2 +-
 htdocs/core/modules/DolibarrModules.class.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 14f61d99590..8462cdc76ff 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -281,7 +281,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
     	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 	
     	// Retrieve values if restore_lastsearch_values is set and there is saved values
-    	if ($_GET['restore_lastsearch_values'] && ! empty($_SESSION['lastsearch_values_'.$relativepathstring]))        // Keep $_GET here
+    	if (! empty($_GET['restore_lastsearch_values']) && ! empty($_SESSION['lastsearch_values_'.$relativepathstring]))        // Keep $_GET here
     	{
 	        $tmp=json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
 	        if (is_array($tmp))
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index cdb4ea33f73..71de341a769 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -848,8 +848,8 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         $resql=$this->db->query($sql);
         if (! $resql) $err++;
 
-        $note=json_encode(array('authorid'=>$user->id, 'ip'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])));
-        
+        $note=json_encode(array('authorid'=>(is_object($user)?$user->id:0), 'ip'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])));
+
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, value, visible, entity, note) VALUES";
         $sql.= " (".$this->db->encrypt($this->const_name,1);
         $sql.= ", ".$this->db->encrypt('1',1);

From 965e23b71190a8d77e2042e4f568d5233d9b664a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 19:45:47 +0200
Subject: [PATCH 0897/1163] Test to fix a regression

---
 htdocs/core/lib/functions2.lib.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index c8d617ec99d..8934447fdfe 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -781,7 +781,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     }
 
     // Personalized field {XXX-1} à {XXX-9}
-    $maskperso=array();
+    /*$maskperso=array();
     $maskpersonew=array();
     $tmpmask=$mask;
     while (preg_match('/\{([A-Z]+)\-([1-9])\}/i',$tmpmask,$regKey))
@@ -789,17 +789,17 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
         $maskperso[$regKey[1]]='\{'.$regKey[1]+'\-'.$regKey[2].'\}';
         $maskpersonew[$regKey[1]]=str_pad('', '_', $regKey[2], STR_PAD_RIGHT);
         $tmpmask=preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew, $tmpmask);
-    }
+    }*/
     
     $maskwithonlyymcode=$mask;
     $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{(t+)\}/i',$masktype_value,$maskwithonlyymcode);
-    foreach($maskperso as $key => $val)
+    /*foreach($maskperso as $key => $val)
     {
         $maskwithonlyymcode=preg_replace('/'.$val.'/i', $maskpersonew[$key], $maskwithonlyymcode);
-    }
+    }*/
     $maskwithnocode=$maskwithonlyymcode;
     $maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);
     $maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);

From 6e31de731b8cd376a0b185b30cf8a78e7d7e8b57 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 20:24:56 +0200
Subject: [PATCH 0898/1163] Fix phpunit

---
 htdocs/societe/class/societe.class.php | 2 +-
 test/phpunit/SocieteTest.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6aebf0e8786..995c16719cb 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -841,7 +841,7 @@ class Societe extends CommonObject
             $sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
             if (isset($this->stcomm_id))
             {
-                $sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "null");
+                $sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "0");
             }
             $sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
 
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 24b868b743e..31aa98fd082 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -79,7 +79,7 @@ class SocieteTest extends PHPUnit_Framework_TestCase
 
         if ($conf->global->SOCIETE_CODECLIENT_ADDON != 'mod_codeclient_monkey') { print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '".$conf->global->SOCIETE_CODECLIENT_ADDON."'.\n"; die(); }
 
-        if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) { print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULE must be empty (if a module set it, disable module).\n"; die(); }
+        if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) { print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULES must be empty (if a module set it, disable module).\n"; die(); }
 
         $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 

From ff35229be58e84c049540c47f0a2c12fb0b874b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 20:46:11 +0200
Subject: [PATCH 0899/1163] Fix phpunit

---
 test/phpunit/UserTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 4e0c0ba58ca..e0802ff17a2 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -75,6 +75,9 @@ class UserTest extends PHPUnit_Framework_TestCase
     public static function setUpBeforeClass()
     {
         global $conf,$user,$langs,$db;
+
+        if (! empty($conf->global->MAIN_LDAP_ENABLED)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
+        
         $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
         print __METHOD__."\n";
@@ -187,7 +190,7 @@ class UserTest extends PHPUnit_Framework_TestCase
         $newlocalobject=new User($this->savdb);
         $newlocalobject->initAsSpecimen();
         $this->changeProperties($newlocalobject);
-        $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','socid','societe_id','ref','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array());    // Actual, Expected
+        $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','socid','societe_id','ref','pass','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array());    // Actual, Expected
 
         return $localobject;
     }

From 3e381aa5a29345136f1468e731948187d5b7fcfb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 21:04:20 +0200
Subject: [PATCH 0900/1163] Fix phpunit

---
 test/phpunit/AdherentTest.php | 6 ++++--
 test/phpunit/UserTest.php     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index 42b4ff7cf7f..b998c346b7b 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -83,7 +83,9 @@ class AdherentTest extends PHPUnit_Framework_TestCase
             print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
             die();
         }
-
+        if (! empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
+        if (! empty($conf->global->MAIN_MODULE_MAILMANSPIP)) { print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die(); }
+        
         print __METHOD__."\n";
     }
 
@@ -322,7 +324,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase
 
         $expected = DOL_MAIN_URL_ROOT.','.$localobject->id.',,New firstname,New name,New firstname New name,'.
                     'New company,New address,New zip,New town,Belgium,newemail@newemail.com,'.dol_print_date($localobject->birth,'day').',,'.
-                    'newlogin,dolibspec,New firstname,New name,New company,New address,New zip,New town,Belgium';
+                    'newlogin,,New firstname,New name,New company,New address,New zip,New town,Belgium';
 
         $result = $localobject->makeSubstitution($template);
         print __METHOD__." result=".$result."\n";
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index e0802ff17a2..b932d2e2221 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -76,7 +76,7 @@ class UserTest extends PHPUnit_Framework_TestCase
     {
         global $conf,$user,$langs,$db;
 
-        if (! empty($conf->global->MAIN_LDAP_ENABLED)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
+        if (! empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
         
         $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 

From 4a085a8cc0ebf22036b97b9f1b5c1532fd77cbec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 21:21:44 +0200
Subject: [PATCH 0901/1163] Fix phpunit

---
 htdocs/compta/bank/class/account.class.php | 5 ++---
 test/phpunit/WebservicesInvoicesTest.php   | 2 ++
 test/phpunit/WebservicesOrdersTest.php     | 2 ++
 test/phpunit/WebservicesOtherTest.php      | 2 ++
 test/phpunit/WebservicesProductsTest.php   | 2 ++
 test/phpunit/WebservicesThirdpartyTest.php | 2 ++
 test/phpunit/WebservicesUserTest.php       | 2 ++
 7 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 2a615ad4b69..b77ed4db1a5 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -569,7 +569,7 @@ class Account extends CommonObject
         $sql.= ", '".$this->db->escape($this->label)."'";
         $sql.= ", ".$conf->entity;
         $sql.= ", '".$this->db->escape($this->account_number)."'";
-		$sql.= ", '".$this->db->escape($this->fk_accountancy_journal)."'";
+		$sql.= ", ".($this->fk_accountancy_journal > 0 ? $this->db->escape($this->fk_accountancy_journal) : "null");
 		$sql.= ", '".$this->db->escape($this->bank)."'";
         $sql.= ", '".$this->code_banque."'";
         $sql.= ", '".$this->code_guichet."'";
@@ -702,8 +702,7 @@ class Account extends CommonObject
         $sql.= ",rappro = ".$this->rappro;
         $sql.= ",url = ".($this->url?"'".$this->url."'":"null");
         $sql.= ",account_number = '".$this->db->escape($this->account_number)."'";
-		$sql.= ",fk_accountancy_journal = '".$this->db->escape($this->fk_accountancy_journal)."'";
-
+		$sql.= ",fk_accountancy_journal = ".($this->fk_accountancy_journal > 0 ? $this->db->escape($this->fk_accountancy_journal) : "null");
 		$sql.= ",bank  = '".$this->db->escape($this->bank)."'";
         $sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
         $sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 470bcbf4900..07bd95e01f2 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -39,6 +39,8 @@ if (empty($user->id))
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
+$conf->global->MAIN_UMASK='0666';
+
 
 /**
  * Class for PHPUnit tests
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index 06ead4f4873..e81ee2d3604 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -38,6 +38,8 @@ if (empty($user->id)) {
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
+$conf->global->MAIN_UMASK='0666';
+
 
 /**
  * Class for PHPUnit tests
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index d04fc6b9b9c..e3725c8609c 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -38,6 +38,8 @@ if (empty($user->id)) {
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
+$conf->global->MAIN_UMASK='0666';
+
 
 /**
  * Class for PHPUnit tests
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index fecc58a65e1..796ee700221 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -40,6 +40,8 @@ if (empty($user->id)) {
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
+$conf->global->MAIN_UMASK='0666';
+
 if (empty($conf->service->enabled))
 {
 	print "Error: Module service must be enabled.\n";
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index 2888c432e73..59907b36194 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -38,6 +38,8 @@ if (empty($user->id)) {
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
+$conf->global->MAIN_UMASK='0666';
+
 
 /**
  * Class for PHPUnit tests
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index 78d3d311fe0..5098da22e6e 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -38,6 +38,8 @@ if (empty($user->id)) {
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
+$conf->global->MAIN_UMASK='0666';
+
 
 /**
  * Class for PHPUnit tests

From e85f31f456068c1ed8998a4ab3dca38811dcf546 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 21:33:24 +0200
Subject: [PATCH 0902/1163] Fix phpunit

---
 test/phpunit/WebservicesProductsTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index 796ee700221..e3500a68f5b 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -169,7 +169,9 @@ class WebservicesProductsTest extends PHPUnit_Framework_TestCase
                 'ref'=>'NewProductFromWS'.$datestring,
                 'label'=>'New Product From WS '.$datestring,
                 'type'=>1,
-                'description'=>'This is a new product created from WS PHPUnit test case'
+                'description'=>'This is a new product created from WS PHPUnit test case',
+                'barcode'=>'123456789012',
+                'barcode_type'=>2
             )
         );
         print __METHOD__." call method ".$WS_METHOD."\n";

From 6052d2d8ed3dbfa965469838a2aa2c8b4d660f96 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 21:37:33 +0200
Subject: [PATCH 0903/1163] Try to output log after error

---
 test/phpunit/NumberingModulesTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index b29cd03b2c9..e0d175b75d5 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -158,6 +158,10 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$numbering=new mod_facture_mercure();
 		$result=$numbering->getNextValue($mysoc, $localobject2, 'last');
 		print __METHOD__." result=".$result."\n";
+
+		$out=file_get_contents(DOL_DATA_ROOT.'/dolibarr.log');
+		print $out;
+		
 		$this->assertEquals('1915-0001', $result, "Test to get last value with param 'last'");
 		$result=$numbering->getNextValue($mysoc, $localobject2);
 		$result2=$localobject2->create($user,1);

From 246fa9748b708ed2cbc9f86eda4aa713e7b307de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 23:06:45 +0200
Subject: [PATCH 0904/1163] Debug travis error

---
 test/phpunit/ModulesTest.php          |  5 +++++
 test/phpunit/NumberingModulesTest.php | 23 ++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index e769ce9dd51..a4ff51333e0 100755
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -143,6 +143,11 @@ class ModulesTest extends PHPUnit_Framework_TestCase
             $result=$mod->init();
         	$this->assertLessThan($result, 0, $modlabel);
         	print __METHOD__." test remove/init for module ".$modlabel.", result=".$result."\n";
+        	
+        	if (in_array($modlabel, array('Ldap', 'MailmanSpip')))
+        	{
+        	    $result=$mod->remove();
+        	}
 		}
 
         return 0;
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index e0d175b75d5..d7f3eaf611c 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -144,30 +144,35 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915);	// we use year 1915 to be sure to not have existing invoice for this year
 		$numbering=new mod_facture_mercure();
 		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user,1);
-		$result3=$localobject->validate($user, $result);		// create invoice by forcing ref
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1915-0001', $result, 'Test for {yyyy}-{0000}, 1st invoice');				// counter must start to 1
+		$result2=$localobject->create($user,1);
+		print __METHOD__." result2=".$result."\n";
+		$result3=$localobject->validate($user, $result);		// create invoice by forcing ref
+		print __METHOD__." result3=".$result."\n";
+		$this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok');	// counter must start to 1
 		$result=$localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertEquals(1, $result, 'Test for is_erasable, 1st invoice');						   // Can be deleted
+		$this->assertEquals(1, $result, 'Test for is_erasable, 1st invoice');						    // Can be deleted
 
+		$out=file_get_contents(DOL_DATA_ROOT.'/dolibarr.log');
+		print $out;
+		
 		$localobject2=new Facture($this->savdb);
 		$localobject2->initAsSpecimen();
 		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1916);	// we use following year for second invoice (there is no reset into mask)
 		$numbering=new mod_facture_mercure();
 		$result=$numbering->getNextValue($mysoc, $localobject2, 'last');
 		print __METHOD__." result=".$result."\n";
-
-		$out=file_get_contents(DOL_DATA_ROOT.'/dolibarr.log');
-		print $out;
-		
 		$this->assertEquals('1915-0001', $result, "Test to get last value with param 'last'");
 		$result=$numbering->getNextValue($mysoc, $localobject2);
-		$result2=$localobject2->create($user,1);
-		$result3=$localobject2->validate($user, $result);		// create invoice by forcing ref
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1916-0002', $result);				// counter must be now 2 (not reseted)
+		$result2=$localobject2->create($user,1);
+		print __METHOD__." result2=".$result."\n";
+		$result3=$localobject2->validate($user, $result);		// create invoice by forcing ref
+		print __METHOD__." result3=".$result."\n";
+		$this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok');	// counter must start to 1
 		$result=$localobject2->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
 		$this->assertEquals(1, $result);						// Can be deleted

From 090a7028d77d9c702d21dbe3169b6d690bf1a9ff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 23:41:04 +0200
Subject: [PATCH 0905/1163] Fix constant usage

---
 htdocs/core/lib/files.lib.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 0920158b720..9d04cb82a1e 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1572,6 +1572,8 @@ function dol_convert_file($fileinput,$ext='png',$fileoutput='')
  */
 function dol_compress_file($inputfile, $outputfile, $mode="gz")
 {
+    global $conf;
+    
     $foundhandler=0;
 
     try
@@ -1627,10 +1629,10 @@ function dol_uncompress($inputfile,$outputdir)
 {
     global $conf, $langs;
 
-    if (! empty($conf->global->ODTPHP_PATHTOPCLZIP))
+    if (defined('ODTPHP_PATHTOPCLZIP'))
     {
-    	dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".$conf->global->ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
-        include_once $conf->global->ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
+    	dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
+        include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
         $archive = new PclZip($inputfile);
         $result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
         //var_dump($result);

From ef9cf6ef5235ef37ecfbb03dea295809bcc7d17c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 23:54:37 +0200
Subject: [PATCH 0906/1163] Add test on phpunit

---
 test/phpunit/FunctionsLibTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 28e55fd793b..8c57e8a178a 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -81,6 +81,8 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
         global $conf,$user,$langs,$db;
         //$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
+        if (! function_exists('mb_substr')) { print "\n".__METHOD__." function mb_substr must be enabled.\n"; die(); }
+        
         print __METHOD__."\n";
     }
 

From ecce1c20374ed1ab51cea9211b8a07751351b7f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 May 2017 23:58:19 +0200
Subject: [PATCH 0907/1163] Remove conf

---
 htdocs/core/lib/files.lib.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 9d04cb82a1e..c60464ed0fd 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1572,8 +1572,6 @@ function dol_convert_file($fileinput,$ext='png',$fileoutput='')
  */
 function dol_compress_file($inputfile, $outputfile, $mode="gz")
 {
-    global $conf;
-    
     $foundhandler=0;
 
     try
@@ -1627,7 +1625,7 @@ function dol_compress_file($inputfile, $outputfile, $mode="gz")
  */
 function dol_uncompress($inputfile,$outputdir)
 {
-    global $conf, $langs;
+    global $langs;
 
     if (defined('ODTPHP_PATHTOPCLZIP'))
     {

From a3eef35ce647dbc17d1e5f5e1b3ea36815a95f40 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 01:19:16 +0200
Subject: [PATCH 0908/1163] Fix travis error

---
 htdocs/adherents/card.php.bak         | 1787 -------------------------
 htdocs/core/lib/functions.lib.php     |   13 +-
 test/phpunit/AllTests.php             |    2 +-
 test/phpunit/FilesLibTest.php         |   14 +-
 test/phpunit/NumberingModulesTest.php |   10 +-
 5 files changed, 24 insertions(+), 1802 deletions(-)
 delete mode 100644 htdocs/adherents/card.php.bak

diff --git a/htdocs/adherents/card.php.bak b/htdocs/adherents/card.php.bak
deleted file mode 100644
index 48461c64b02..00000000000
--- a/htdocs/adherents/card.php.bak
+++ /dev/null
@@ -1,1787 +0,0 @@
-<?php
-/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2012-2016 Philippe Grand       <philippe.grand@atoo-net.com>
- * Copyright (C) 2015-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/adherents/card.php
- *       \ingroup    member
- *       \brief      Page of member
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-
-$langs->load("companies");
-$langs->load("bills");
-$langs->load("members");
-$langs->load("users");
-$langs->load('other');
-
-$action=GETPOST('action','alpha');
-$cancel=GETPOST('cancel','alpha');
-$backtopage=GETPOST('backtopage','alpha');
-$confirm=GETPOST('confirm','alpha');
-$rowid=GETPOST('rowid','int');
-$id=GETPOST('id')?GETPOST('id','int'):$rowid;
-$typeid=GETPOST('typeid','int');
-$userid=GETPOST('userid','int');
-$socid=GETPOST('socid','int');
-
-if (! empty($conf->mailmanspip->enabled))
-{
-	include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
-
-	$langs->load('mailmanspip');
-
-	$mailmanspip = new MailmanSpip($db);
-}
-
-$object = new Adherent($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-
-// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
-$object->getCanvas($id);
-$canvas = $object->canvas?$object->canvas:GETPOST("canvas");
-$objcanvas=null;
-if (! empty($canvas))
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-	$objcanvas = new Canvas($db, $action);
-	$objcanvas->getCanvas('adherent', 'membercard', $canvas);
-}
-
-// Security check
-$result=restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid', $objcanvas);
-
-if ($id > 0)
-{
-	// Load member
-	$result = $object->fetch($id);
-
-	// Define variables to know what current user can do on users
-	$canadduser=($user->admin || $user->rights->user->user->creer);
-	// Define variables to know what current user can do on properties of user linked to edited member
-	if ($object->user_id)
-	{
-		// $ User is the user who edits, $ object->user_id is the id of the related user in the edited member  
-		$caneditfielduser=((($user->id == $object->user_id) && $user->rights->user->self->creer)
-				|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
-		$caneditpassworduser=((($user->id == $object->user_id) && $user->rights->user->self->password)
-				|| (($user->id != $object->user_id) && $user->rights->user->user->password));
-	}
-}
-
-// Define variables to determine what the current user can do on the members
-$canaddmember=$user->rights->adherent->creer;
-// Define variables to determine what the current user can do on the properties of a member
-if ($id)
-{
-	$caneditfieldmember=$user->rights->adherent->creer;
-}
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('membercard','globalcard'));
-
-
-
-/*
- * 	Actions
- */
-
-if ($cancel) $action='';
-
-$parameters=array('id'=>$id, 'rowid'=>$id, 'objcanvas'=>$objcanvas);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
-	if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
-	{
-		$error=0;
-		if (empty($user->rights->user->user->creer))	// If can edit only itself user, we can link to itself only
-		{
-			if ($userid != $user->id && $userid != $object->user_id)
-			{
-				$error++;
-				setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
-			}
-		}
-
-		if (! $error)
-		{
-			if ($userid != $object->user_id)	// If link differs from currently in database
-			{
-				$result=$object->setUserId($userid);
-				if ($result < 0) dol_print_error($object->db,$object->error);
-				$action='';
-			}
-		}
-	}
-
-	if ($action == 'setsocid')
-	{
-		$error=0;
-		if (! $error)
-		{
-			if ($socid != $object->fk_soc)	// If link differs from currently in database
-			{
-				$sql ="SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
-				$sql.=" WHERE fk_soc = '".$socid."'";
-				$sql.=" AND entity = ".$conf->entity;
-				$resql = $db->query($sql);
-				if ($resql)
-				{
-					$obj = $db->fetch_object($resql);
-					if ($obj && $obj->rowid > 0)
-					{
-						$othermember=new Adherent($db);
-						$othermember->fetch($obj->rowid);
-						$thirdparty=new Societe($db);
-						$thirdparty->fetch($socid);
-						$error++;
-						setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), null, 'errors');
-					}
-				}
-
-				if (! $error)
-				{
-					$result=$object->setThirdPartyId($socid);
-					if ($result < 0) dol_print_error($object->db,$object->error);
-					$action='';
-				}
-			}
-		}
-	}
-
-	// Create user from a member
-	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
-	{
-		if ($result > 0)
-		{
-			// Creation user
-			$nuser = new User($db);
-			$result=$nuser->create_from_member($object,GETPOST('login'));
-
-			if ($result < 0)
-			{
-				$langs->load("errors");
-				setEventMessages($langs->trans($nuser->error), null, 'errors');
-			}
-		}
-		else
-		{
-			setEventMessages($object->errors, $object->error, 'errors');
-		}
-	}
-
-	// Create third party from a member
-	if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
-	{
-		if ($result > 0)
-		{
-			// User creation 
-			$company = new Societe($db);
-			$result=$company->create_from_member($object,GETPOST('companyname'));
-
-			if ($result < 0)
-			{
-				$langs->load("errors");
-				setEventMessages($langs->trans($company->error), null, 'errors');
-				setEventMessages($company->error, $company->errors, 'errors');
-			}
-		}
-		else
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
-
-	if ($action == 'confirm_sendinfo' && $confirm == 'yes')
-	{
-		if ($object->email)
-		{
-			$from=$conf->email_from;
-			if (! empty($conf->global->ADHERENT_MAIL_FROM)) $from=$conf->global->ADHERENT_MAIL_FROM;
-
-			$result=$object->send_an_email($langs->transnoentitiesnoconv("ThisIsContentOfYourCard")."\n\n%INFOS%\n\n",$langs->transnoentitiesnoconv("CardContent"));
-
-			$langs->load("mails");
-			setEventMessages($langs->trans("MailSuccessfulySent", $from, $object->email), null, 'mesgs');
-		}
-	}
-
-	if ($action == 'update' && ! $cancel && $user->rights->adherent->creer)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$birthdate='';
-		if (isset($_POST["birthday"]) && $_POST["birthday"]
-				&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
-				&& isset($_POST["birthyear"]) && $_POST["birthyear"])
-		{
-			$birthdate=dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
-		}
-		$lastname=$_POST["lastname"];
-		$firstname=$_POST["firstname"];
-		$societe=$_POST["societe"];
-		$morphy=$_POST["morphy"];
-		$login=$_POST["login"];
-		if ($morphy != 'mor' && empty($lastname)) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Lastname")), null, 'errors');
-		}
-		if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Firstname")), null, 'errors');
-		}
-		if ($morphy == 'mor' && empty($societe)) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors');
-		}
-		// Test si le login existe deja
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			if (empty($login)) {
-				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Login")), null, 'errors');
-			}
-		}
-		// Create new object
-		if ($result > 0 && ! $error)
-		{
-			$object->oldcopy = clone $object;
-
-			// Change values
-			$object->civility_id = trim($_POST["civility_id"]);
-			$object->firstname   = trim($_POST["firstname"]);
-			$object->lastname    = trim($_POST["lastname"]);
-			$object->login       = trim($_POST["login"]);
-			$object->pass        = trim($_POST["pass"]);
-
-			$object->societe     = trim($_POST["societe"]);
-			$object->company     = trim($_POST["societe"]);
-
-			$object->address     = trim($_POST["address"]);
-			$object->zip         = trim($_POST["zipcode"]);
-			$object->town        = trim($_POST["town"]);
-			$object->state_id    = $_POST["state_id"];
-			$object->country_id  = $_POST["country_id"];
-
-			$object->phone       = trim($_POST["phone"]);
-			$object->phone_perso = trim($_POST["phone_perso"]);
-			$object->phone_mobile= trim($_POST["phone_mobile"]);
-			$object->email       = trim($_POST["email"]);
-			$object->skype       = trim($_POST["skype"]);
-			$object->birth       = $birthdate;
-
-			$object->typeid      = $_POST["typeid"];
-			//$object->note        = trim($_POST["comment"]);
-			$object->morphy      = $_POST["morphy"];
-
-			if (GETPOST('deletephoto')) $object->photo='';
-			elseif (! empty($_FILES['photo']['name'])) $object->photo  = dol_sanitizeFileName($_FILES['photo']['name']);
-
-			// Get status and public property
-			$object->statut      = $_POST["statut"];
-			$object->public      = $_POST["public"];
-
-			// Fill array 'array_options' with data from add form
-			$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-			if ($ret < 0) $error++;
-
-			// Check if we need to also synchronize user information
-			$nosyncuser=0;
-			if ($object->user_id)	// If linked to a user
-			{
-				if ($user->id != $object->user_id && empty($user->rights->user->user->creer)) $nosyncuser=1;		// Disable synchronizing
-			}
-
-			// Check if we need to also synchronize password information
-			$nosyncuserpass=0;
-			if ($object->user_id)	// If linked to a user
-			{
-				if ($user->id != $object->user_id && empty($user->rights->user->user->password)) $nosyncuserpass=1;	// Disable synchronizing
-			}
-
-			$result=$object->update($user,0,$nosyncuser,$nosyncuserpass);
-
-			if ($result >= 0 && ! count($object->errors))
-			{
-				$categories = GETPOST('memcats', 'array');
-				$object->setCategories($categories);
-
-				// Logo/Photo save
-				$dir= $conf->adherent->dir_output . '/' . get_exdir(0,0,0,1,$object,'member').'/photos';
-				$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-				if ($file_OK)
-				{
-					if (GETPOST('deletephoto'))
-					{
-						require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-						$fileimg=$conf->adherent->dir_output.'/'.get_exdir(0,0,0,1,$object,'member').'/photos/'.$object->photo;
-						$dirthumbs=$conf->adherent->dir_output.'/'.get_exdir(0,0,0,1,$object,'member').'/photos/thumbs';
-						dol_delete_file($fileimg);
-						dol_delete_dir_recursive($dirthumbs);
-					}
-
-					if (image_format_supported($_FILES['photo']['name']) > 0)
-					{
-						dol_mkdir($dir);
-
-						if (@is_dir($dir))
-						{
-							$newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-							if (! dol_move_uploaded_file($_FILES['photo']['tmp_name'],$newfile,1,0,$_FILES['photo']['error']) > 0)
-							{
-								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
-							}
-							else
-							{
-							    // Create thumbs
-							    $object->addThumbs($newfile);
-							}
-						}
-					}
-					else
-					{
-						setEventMessages("ErrorBadImageFormat", null, 'errors');
-					}
-				}
-				else
-				{
-					switch($_FILES['photo']['error'])
-					{
-						case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
-						case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-							$errors[] = "ErrorFileSizeTooLarge";
-							break;
-						case 3: //uploaded file was only partially uploaded
-							$errors[] = "ErrorFilePartiallyUploaded";
-							break;
-					}
-				}
-
-	            $rowid=$object->id;
-	            $id=$object->id;
-				$action='';
-
-				if (! empty($backtopage))
-				{
-					header("Location: ".$backtopage);
-					exit;
-				}
-			}
-			else
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-				$action='';
-			}
-		}
-		else
-		{
-			$action='edit';
-		}
-	}
-
-	if ($action == 'add' && $user->rights->adherent->creer)
-	{
-		if ($canvas) $object->canvas=$canvas;
-		$birthdate='';
-		if (isset($_POST["birthday"]) && $_POST["birthday"]
-				&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
-				&& isset($_POST["birthyear"]) && $_POST["birthyear"])
-		{
-			$birthdate=dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
-		}
-		$datesubscription='';
-		if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"]))
-		{
-			$datesubscription=dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
-		}
-
-		$typeid=$_POST["typeid"];
-		$civility_id=$_POST["civility_id"];
-		$lastname=$_POST["lastname"];
-		$firstname=$_POST["firstname"];
-		$societe=$_POST["societe"];
-		$address=$_POST["address"];
-		$zip=$_POST["zipcode"];
-		$town=$_POST["town"];
-		$state_id=$_POST["state_id"];
-		$country_id=$_POST["country_id"];
-
-		$phone=$_POST["phone"];
-		$phone_perso=$_POST["phone_perso"];
-		$phone_mobile=$_POST["phone_mobile"];
-		$skype=$_POST["member_skype"];
-		$email=$_POST["member_email"];
-		$login=$_POST["member_login"];
-		$pass=$_POST["password"];
-		$photo=$_POST["photo"];
-		//$comment=$_POST["comment"];
-		$morphy=$_POST["morphy"];
-		$subscription=$_POST["subscription"];
-		$public=$_POST["public"];
-
-		$userid=$_POST["userid"];
-		$socid=$_POST["socid"];
-
-		$object->civility_id = $civility_id;
-		$object->firstname   = $firstname;
-		$object->lastname    = $lastname;
-		$object->societe     = $societe;
-		$object->address     = $address;
-		$object->zip         = $zip;
-		$object->town        = $town;
-		$object->state_id    = $state_id;
-		$object->country_id  = $country_id;
-		$object->phone       = $phone;
-		$object->phone_perso = $phone_perso;
-		$object->phone_mobile= $phone_mobile;
-		$object->skype       = $skype;
-		$object->email       = $email;
-		$object->login       = $login;
-		$object->pass        = $pass;
-		$object->birth       = $birthdate;
-		$object->photo       = $photo;
-		$object->typeid      = $typeid;
-		//$object->note        = $comment;
-		$object->morphy      = $morphy;
-		$object->user_id     = $userid;
-		$object->fk_soc      = $socid;
-		$object->public      = $public;
-
-		// Fill array 'array_options' with data from add form
-		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0) $error++;
-
-		// Check parameters
-		if (empty($morphy) || $morphy == "-1") {
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Nature")), null, 'errors');
-		}
-		// Tests if the login already exists
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			if (empty($login)) {
-				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Login")), null, 'errors');
-			}
-			else {
-				$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape($login)."'";
-				$result = $db->query($sql);
-				if ($result) {
-					$num = $db->num_rows($result);
-				}
-				if ($num) {
-					$error++;
-					$langs->load("errors");
-					setEventMessages($langs->trans("ErrorLoginAlreadyExists",$login), null, 'errors');
-				}
-			}
-			if (empty($pass)) {
-				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Password")), null, 'errors');
-			}
-		}
-		if ($morphy == 'mor' && empty($societe)) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors');
-		}
-		if ($morphy != 'mor' && empty($lastname)) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Lastname")), null, 'errors');
-		}
-		if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Firstname")), null, 'errors');
-		}
-		if (! ($typeid > 0)) {	// Keep () before !
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-		}
-		if ($conf->global->ADHERENT_MAIL_REQUIRED && ! isValidEMail($email)) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorBadEMail",$email), null, 'errors');
-		}
-		$public=0;
-		if (isset($public)) $public=1;
-
-		if (! $error)
-		{
-			$db->begin();
-
-			// Email about right and login does not exist
-			$result=$object->create($user);
-			if ($result > 0)
-			{
-				// Foundation categories
-				$memcats = GETPOST('memcats', 'array');
-				$object->setCategories($memcats);
-
-				$db->commit();
-				$rowid=$object->id;
-				$id=$object->id;
-				$action='';
-			}
-			else
-			{
-				$db->rollback();
-
-				if ($object->error) {
-					setEventMessages($object->error, $object->errors, 'errors');
-				} else {
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-
-				$action = 'create';
-			}
-		}
-		else {
-			$action = 'create';
-		}
-	}
-
-	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
-	{
-		$result=$object->delete($id);
-		if ($result > 0)
-		{
-			if (! empty($backtopage))
-			{
-				header("Location: ".$backtopage);
-				exit;
-			}
-			else
-			{
-				header("Location: list.php");
-				exit;
-			}
-		}
-		else
-		{
-			$errmesg=$object->error;
-		}
-	}
-
-	if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes')
-	{
-		$error=0;
-
-		$db->begin();
-
-		$adht = new AdherentType($db);
-		$adht->fetch($object->typeid);
-
-		$result=$object->validate($user);
-
-		if ($result >= 0 && ! count($object->errors))
-		{
-			// Send confirmation email (according to parameters of member type. Otherwise generic)
-			if ($object->email && GETPOST("send_mail"))
-			{
-				$result=$object->send_an_email($adht->getMailOnValid(),$conf->global->ADHERENT_MAIL_VALID_SUBJECT,array(),array(),array(),"","",0,2);
-				if ($result < 0)
-				{
-					$error++;
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-		}
-		else
-		{
-			$error++;
-			if ($object->error) {
-				setEventMessages($object->error, $object->errors, 'errors');
-			} else {
-				setEventMessages($object->error, $object->errors, 'errors');
-			}
-		}
-
-		if (! $error)
-		{
-			$db->commit();
-		}
-		else
-		{
-			$db->rollback();
-		}
-		$action='';
-	}
-
-	if ($user->rights->adherent->supprimer && $action == 'confirm_resign')
-	{
-		$error = 0;
-
-		if ($confirm == 'yes')
-		{
-			$adht = new AdherentType($db);
-			$adht->fetch($object->typeid);
-
-			$result=$object->resiliate($user);
-
-			if ($result >= 0 && ! count($object->errors))
-			{
-				if ($object->email && GETPOST("send_mail"))
-				{
-					$result=$object->send_an_email($adht->getMailOnResiliate(),$conf->global->ADHERENT_MAIL_RESIL_SUBJECT,array(),array(),array(),"","",0,-1);
-				}
-				if ($result < 0)
-				{
-					$error++;
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-			}
-			else
-			{
-				$error++;
-
-				if ($object->error) {
-					setEventMessages($object->error, $object->errors, 'errors');
-				} else {
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-				$action='';
-			}
-		}
-		if (! empty($backtopage) && ! $error)
-		{
-			header("Location: ".$backtopage);
-			exit;
-		}
-	}
-
-	// SPIP Management
-	if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $confirm == 'yes')
-	{
-		if (! count($object->errors))
-		{
-			if (!$mailmanspip->del_to_spip($object))
-			{
-				setEventMessages($langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error, null, 'errors');
-			}
-		}
-	}
-
-	if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes')
-	{
-		if (! count($object->errors))
-		{
-			if (!$mailmanspip->add_to_spip($object))
-			{
-				setEventMessages($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, null, 'errors');
-			}
-		}
-	}
-	
-	// Actions to build doc
-	$upload_dir = $conf->adherent->dir_output;
-	$permissioncreate=$user->rights->adherent->creer;
-	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-}
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-$formcompany = new FormCompany($db);
-
-$title=$langs->trans("Member") . " - " . $langs->trans("Card");
-$help_url='EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
-llxHeader('',$title,$help_url);
-
-$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
-
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
-	// -----------------------------------------
-	// When used with CANVAS
-	// -----------------------------------------
-	if (empty($object->error) && $id)
-	{
-		$object = new Adherent($db);
-		$result=$object->fetch($id);
-		if ($result <= 0) dol_print_error('',$object->error);
-	}
-   	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
-    $objcanvas->display_canvas($action);							// Show template
-}
-else
-{
-	// -----------------------------------------
-	// When used in standard mode
-	// -----------------------------------------
-
-	if ($action == 'create')
-	{
-		/* ************************************************************************** */
-		/*                                                                            */
-		/* Creation mode                                                              */
-		/*                                                                            */
-		/* ************************************************************************** */
-		$object->canvas=$canvas;
-		$object->state_id = GETPOST('state_id', 'int');
-
-		// We set country_id, country_code and country for the selected country
-		$object->country_id=GETPOST('country_id','int')?GETPOST('country_id','int'):$mysoc->country_id;
-		if ($object->country_id)
-		{
-			$tmparray=getCountry($object->country_id,'all');
-			$object->country_code=$tmparray['code'];
-			$object->country=$tmparray['label'];
-		}
-
-		$adht = new AdherentType($db);
-
-		print load_fiche_titre($langs->trans("NewMember"));
-
-		if ($conf->use_javascript_ajax)
-		{
-			print "\n".'<script type="text/javascript" language="javascript">';
-			print 'jQuery(document).ready(function () {
-						jQuery("#selectcountry_id").change(function() {
-							document.formsoc.action.value="create";
-							document.formsoc.submit();
-						});
-						function initfieldrequired()
-						{
-							jQuery("#tdcompany").removeClass("fieldrequired");
-							jQuery("#tdlastname").removeClass("fieldrequired");
-							jQuery("#tdfirstname").removeClass("fieldrequired");
-							if (jQuery("#morphy").val() == \'mor\')
-							{
-								jQuery("#tdcompany").addClass("fieldrequired");
-							}
-							if (jQuery("#morphy").val() == \'phy\')
-							{
-								jQuery("#tdlastname").addClass("fieldrequired");
-								jQuery("#tdfirstname").addClass("fieldrequired");
-							}
-						}
-						jQuery("#morphy").change(function() {
-							initfieldrequired();
-						});
-						initfieldrequired();
-					})';
-			print '</script>'."\n";
-		}
-
-		print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="add">';
-
-        dol_fiche_head('');
-
-		print '<table class="border" width="100%">';
-		print '<tbody>';
-
-		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="member_login" class="maxwidth200" value="'.(isset($_POST["member_login"])?GETPOST("member_login", 'alpha', 2):$object->login).'"></td></tr>';
-		}
-
-		// Type
-		print '<tr><td class="fieldrequired">'.$langs->trans("MemberType").'</td><td>';
-		$listetype=$adht->liste_array();
-		if (count($listetype))
-		{
-			print $form->selectarray("typeid", $listetype, GETPOST('typeid','int')?GETPOST('typeid','int'):$typeid, count($listetype)>1?1:0);
-		} else {
-			print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
-		}
-		print "</td>\n";
-
-		// Morphy
-		$morphys["phy"] = $langs->trans("Physical");
-		$morphys["mor"] = $langs->trans("Moral");
-		print '<tr><td class="fieldrequired">'.$langs->trans("Nature")."</td><td>\n";
-		print $form->selectarray("morphy", $morphys, GETPOST('morphy','alpha')?GETPOST('morphy','alpha'):$object->morphy, 1);
-		print "</td>\n";
-
-		// Company
-		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(GETPOST('societe','alpha')?GETPOST('societe','alpha'):$object->societe).'"></td></tr>';
-
-		// Civility
-		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
-		print $formcompany->select_civility(GETPOST('civility_id','int')?GETPOST('civility_id','int'):$object->civility_id,'civility_id').'</td>';
-		print '</tr>';
-
-		// Lastname
-		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.(GETPOST('lastname','alpha')?GETPOST('lastname','alpha'):$object->lastname).'" size="40"></td>';
-		print '</tr>';
-
-		// Firstname
-		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(GETPOST('firstname','alpha')?GETPOST('firstname','alpha'):$object->firstname).'"></td>';
-		print '</tr>';
-
-		// EMail
-		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(GETPOST('member_email','alpha')?GETPOST('member_email','alpha'):$object->email).'"></td></tr>';
-
-		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-			$generated_password=getRandomPassword(false);
-			print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
-			print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">';
-			print '</td></tr>';
-		}
-
-		// Address
-		print '<tr><td class="tdtop">'.$langs->trans("Address").'</td><td>';
-		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(GETPOST('address','alpha')?GETPOST('address','alpha'):$object->address).'</textarea>';
-		print '</td></tr>';
-
-		// Zip / Town
-		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-		print $formcompany->select_ziptown((GETPOST('zipcode','alpha')?GETPOST('zipcode','alpha'):$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
-		print ' ';
-		print $formcompany->select_ziptown((GETPOST('town','alpha')?GETPOST('town','alpha'):$object->town),'town',array('zipcode','selectcountry_id','state_id'));
-		print '</td></tr>';
-
-		// Country
-		$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;
-		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
-		print $form->select_country(GETPOST('country_id','alpha')?GETPOST('country_id','alpha'):$object->country_id,'country_id');
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		print '</td></tr>';
-
-		// State
-		if (empty($conf->global->MEMBER_DISABLE_STATE))
-		{
-			print '<tr><td>'.$langs->trans('State').'</td><td>';
-			if ($object->country_id)
-			{
-				print $formcompany->select_state(GETPOST('state_id','int')?GETPOST('state_id','int'):$object->state_id,$object->country_code);
-			}
-			else
-			{
-				print $countrynotdefined;
-			}
-			print '</td></tr>';
-		}
-
-		// Pro phone
-		print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.(GETPOST('phone','alpha')?GETPOST('phone','alpha'):$object->phone).'"></td></tr>';
-
-		// Personal phone
-		print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.(GETPOST('phone_perso','alpha')?GETPOST('phone_perso','alpha'):$object->phone_perso).'"></td></tr>';
-
-		// Mobile phone
-		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(GETPOST('phone_mobile','alpha')?GETPOST('phone_mobile','alpha'):$object->phone_mobile).'"></td></tr>';
-
-	    // Skype
-	    if (! empty($conf->skype->enabled))
-	    {
-			print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="member_skype" size="40" value="'.(GETPOST('member_skype','alpha')?GETPOST('member_skype','alpha'):$object->skype).'"></td></tr>';
-	    }
-
-		// Birthday
-		print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
-		$form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
-		print "</td></tr>\n";
-
-		// Public profil
-		print "<tr><td>".$langs->trans("Public")."</td><td>\n";
-		print $form->selectyesno("public",$object->public,1);
-		print "</td></tr>\n";
-
-		// Categories
-		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
-		{
-			print '<tr><td>' . fieldLabel('Categories', 'memcars') . '</td><td>';
-			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, 'parent', null, null, 1);
-			print $form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, null, null, '100%');
-			print "</td></tr>";
-		}
-
-		// Other attributes
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields,'edit');
-		}
-
-		/*
-		 // Third party Dolibarr
-		if (! empty($conf->societe->enabled))
-		{
-		print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td class="valeur">';
-		print $form->select_company($object->fk_soc,'socid','',1);
-		print '</td></tr>';
-		}
-
-		// Login Dolibarr
-		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td class="valeur">';
-		print $form->select_dolusers($object->user_id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-		print '</td></tr>';
-		*/
-        print '<tbody>';
-		print "</table>\n";
-
-        dol_fiche_end();
-
-	    print '<div class="center">';
-	    print '<input type="submit" name="button" class="button" value="'.$langs->trans("AddMember").'">';
-	    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
-	    print '</div>';
-
-		print "</form>\n";
-	}
-
-	if ($action == 'edit')
-	{
-		/********************************************
-		*
-		* Edition mode
-		*
-		********************************************/
-
-		$res=$object->fetch($id);
-		if ($res < 0) {
-			dol_print_error($db,$object->error); exit;
-		}
-		$res=$object->fetch_optionals($object->id,$extralabels);
-		if ($res < 0) {
-			dol_print_error($db); exit;
-		}
-
-		$adht = new AdherentType($db);
-		$adht->fetch($object->typeid);
-
-		// We set country_id, and country_code, country of the chosen country
-		$country=GETPOST('country','int');
-		if (!empty($country) || $object->country_id)
-		{
-			$sql = "SELECT rowid, code, label from ".MAIN_DB_PREFIX."c_country where rowid = ".(!empty($country)?$country:$object->country_id);
-			$resql=$db->query($sql);
-			if ($resql)
-			{
-				$obj = $db->fetch_object($resql);
-			}
-			else
-			{
-				dol_print_error($db);
-			}
-			$object->country_id=$obj->rowid;
-			$object->country_code=$obj->code;
-			$object->country=$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label;
-		}
-
-		$head = member_prepare_head($object);
-
-
-		if ($conf->use_javascript_ajax)
-		{
-			print "\n".'<script type="text/javascript" language="javascript">';
-			print 'jQuery(document).ready(function () {
-				jQuery("#selectcountry_id").change(function() {
-					document.formsoc.action.value="edit";
-					document.formsoc.submit();
-				});
-				function initfieldrequired()
-				{
-					jQuery("#tdcompany").removeClass("fieldrequired");
-					jQuery("#tdlastname").removeClass("fieldrequired");
-					jQuery("#tdfirstname").removeClass("fieldrequired");
-					if (jQuery("#morphy").val() == \'mor\')
-					{
-						jQuery("#tdcompany").addClass("fieldrequired");
-					}
-					if (jQuery("#morphy").val() == \'phy\')
-					{
-						jQuery("#tdlastname").addClass("fieldrequired");
-						jQuery("#tdfirstname").addClass("fieldrequired");
-					}
-				}
-				jQuery("#morphy").change(function() {
-					initfieldrequired();
-				});
-				initfieldrequired();
-			})';
-			print '</script>'."\n";
-		}
-
-		print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
-		print '<input type="hidden" name="action" value="update" />';
-		print '<input type="hidden" name="rowid" value="'.$id.'" />';
-		print '<input type="hidden" name="statut" value="'.$object->statut.'" />';
-		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
-
-		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
-
-		print '<table class="border" width="100%">';
-
-		// Ref
-		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur" colspan="2">'.$object->id.'</td></tr>';
-
-		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td colspan="2"><input type="text" name="login" class="maxwidth200" value="'.(isset($_POST["login"])?GETPOST("login",'alpha',2):$object->login).'"></td></tr>';
-		}
-
-		// Morphy
-		$morphys["phy"] = $langs->trans("Physical");
-		$morphys["mor"] = $langs->trans("Morale");
-		print '<tr><td><span class="fieldrequired">'.$langs->trans("Nature").'</span></td><td>';
-		print $form->selectarray("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$object->morphy);
-		print "</td></tr>";
-
-		// Type
-		print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-		if ($user->rights->adherent->creer)
-		{
-			print $form->selectarray("typeid", $adht->liste_array(), (isset($_POST["typeid"])?$_POST["typeid"]:$object->typeid));
-		}
-		else
-		{
-			print $adht->getNomUrl(1);
-			print '<input type="hidden" name="typeid" value="'.$object->typeid.'">';
-		}
-		print "</td></tr>";
-
-		// Company
-		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(isset($_POST["societe"])?GETPOST("societe",'',2):$object->societe).'"></td></tr>';
-
-		// Civility
-		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
-		print $formcompany->select_civility(isset($_POST["civility_id"])?$_POST["civility_id"]:$object->civility_id)."\n";
-		print '</td>';
-		print '</tr>';
-
-		// Lastname
-		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" size="40" value="'.(isset($_POST["lastname"])?GETPOST("lastname",'',2):$object->lastname).'"></td>';
-		print '</tr>';
-
-		// Firstname
-		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(isset($_POST["firstname"])?GETPOST("firstname",'',3):$object->firstname).'"></td>';
-		print '</tr>';
-
-		// Photo
-		print '<tr><td>'.$langs->trans("Photo").'</td>';
-		print '<td class="hideonsmartphone" valign="middle">';
-		print $form->showphoto('memberphoto',$object)."\n";
-		if ($caneditfieldmember)
-		{
-			if ($object->photo) print "<br>\n";
-			print '<table class="nobordernopadding">';
-			if ($object->photo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
-			print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
-			print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
-			print '</table>';
-		}
-		print '</td></tr>';
-
-		// EMail
-		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.(isset($_POST["email"])?GETPOST("email",'',2):$object->email).'"></td></tr>';
-
-		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="maxwdith200" value="'.(isset($_POST["pass"])?GETPOST("pass",'',2):$object->pass).'"></td></tr>';
-		}
-
-		// Address
-		print '<tr><td>'.$langs->trans("Address").'</td><td>';
-		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(isset($_POST["address"])?GETPOST("address",'',2):$object->address).'</textarea>';
-		print '</td></tr>';
-
-		// Zip / Town
-		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-		print $formcompany->select_ziptown((isset($_POST["zipcode"])?GETPOST("zipcode",'',2):$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
-		print ' ';
-		print $formcompany->select_ziptown((isset($_POST["town"])?GETPOST("town",'',2):$object->town),'town',array('zipcode','selectcountry_id','state_id'));
-		print '</td></tr>';
-
-		// Country
-		//$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;    // In edit mode we don't force to company country if not defined
-		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
-		print $form->select_country(isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'country_id');
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		print '</td></tr>';
-
-		// State
-		if (empty($conf->global->MEMBER_DISABLE_STATE))
-		{
-			print '<tr><td>'.$langs->trans('State').'</td><td>';
-			print $formcompany->select_state($object->state_id,isset($_POST["country_id"])?GETPOST("country_id"):$object->country_id);
-			print '</td></tr>';
-		}
-
-		// Pro phone
-		print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.(isset($_POST["phone"])?GETPOST("phone"):$object->phone).'"></td></tr>';
-
-		// Personal phone
-		print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.(isset($_POST["phone_perso"])?GETPOST("phone_perso"):$object->phone_perso).'"></td></tr>';
-
-		// Mobile phone
-		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(isset($_POST["phone_mobile"])?GETPOST("phone_mobile"):$object->phone_mobile).'"></td></tr>';
-
-	    // Skype
-	    if (! empty($conf->skype->enabled))
-	    {
-			    print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="skype" size="40" value="'.(isset($_POST["skype"])?GETPOST("skype"):$object->skype).'"></td></tr>';
-	    }
-
-		// Birthday
-		print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
-		$form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
-		print "</td></tr>\n";
-
-		// Public profil
-		print "<tr><td>".$langs->trans("Public")."</td><td>\n";
-		print $form->selectyesno("public",(isset($_POST["public"])?GETPOST("public",'',2):$object->public),1);
-		print "</td></tr>\n";
-
-		// Categories
-		if (! empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire ))
-		{
-			print '<tr><td>' . fieldLabel('Categories', 'memcats') . '</td>';
-			print '<td colspan="2">';
-			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
-			$c = new Categorie($db);
-			$cats = $c->containing($object->id, Categorie::TYPE_MEMBER);
-			foreach ($cats as $cat) {
-				$arrayselected[] = $cat->id;
-			}
-			print $form->multiselectarray('memcats', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
-			print "</td></tr>";
-		}
-
-		// Other attributes
-		$parameters=array("colspan"=>2);
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields,'edit',$parameters);
-		}
-
-		// Third party Dolibarr
-		if (! empty($conf->societe->enabled))
-		{
-			print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2" class="valeur">';
-			if ($object->fk_soc)
-			{
-				$company=new Societe($db);
-				$result=$company->fetch($object->fk_soc);
-				print $company->getNomUrl(1);
-			}
-			else
-			{
-				print $langs->trans("NoThirdPartyAssociatedToMember");
-			}
-			print '</td></tr>';
-		}
-
-		// Login Dolibarr
-		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td colspan="2" class="valeur">';
-		if ($object->user_id)
-		{
-			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
-		}
-		else print $langs->trans("NoDolibarrAccess");
-		print '</td></tr>';
-
-		print '</table>';
-
-		dol_fiche_end();
-
-		print '<div class="center">';
-		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
-		print '</div>';
-
-		print '</form>';
-
-	}
-
-	if ($id > 0 && $action != 'edit')
-	{
-		/* ************************************************************************** */
-		/*                                                                            */
-		/* View mode                                                                  */
-		/*                                                                            */
-		/* ************************************************************************** */
-
-		$res=$object->fetch($id);
-		if ($res < 0) {
-			dol_print_error($db,$object->error); exit;
-		}
-		$res=$object->fetch_optionals($object->id,$extralabels);
-		if ($res < 0) {
-			dol_print_error($db); exit;
-		}
-
-		$adht = new AdherentType($db);
-		$res=$adht->fetch($object->typeid);
-		if ($res < 0) {
-			dol_print_error($db); exit;
-		}
-
-
-		/*
-		 * Show tabs
-		 */
-		$head = member_prepare_head($object);
-
-		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
-
-		// Confirm create user
-		if ($action == 'create_user')
-		{
-			$login=$object->login;
-			if (empty($login))
-			{
-				// Full firstname and name separated with a dot : firstname.name
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-				$login=dol_buildlogin($object->lastname,$object->firstname);
-			}
-			if (empty($login)) $login=strtolower(substr($object->firstname, 0, 4)) . strtolower(substr($object->lastname, 0, 4));
-
-			// Create a form array
-			$formquestion=array(
-					array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
-			);
-			$text=$langs->trans("ConfirmCreateLogin").'<br>';
-			if (! empty($conf->societe->enabled))
-			{
-				if ($object->fk_soc > 0) $text.=$langs->trans("UserWillBeExternalUser");
-				else $text.=$langs->trans("UserWillBeInternalUser");
-			}
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrLogin"),$text,"confirm_create_user",$formquestion,'yes');
-		}
-
-		// Confirm create third party
-		if ($action == 'create_thirdparty')
-		{
-			$name = $object->getFullName($langs);
-			if (! empty($name))
-			{
-				if ($object->societe) $name.=' ('.$object->societe.')';
-			}
-			else
-			{
-				$name=$object->societe;
-			}
-
-			// Create a form array
-			$formquestion=array(		array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
-
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
-		}
-
-		// Confirm validate member
-		if ($action == 'valid')
-		{
-			$langs->load("mails");
-
-			$adht = new AdherentType($db);
-			$adht->fetch($object->typeid);
-
-			$subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_VALID_SUBJECT);
-			$texttosend=$object->makeSubstitution($adht->getMailOnValid());
-
-			$tmp=$langs->trans("SendAnEMailToMember");
-			$tmp.='<br>('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
-			$tmp.=$langs->trans("MailRecipient").': <b>'.$object->email.'</b>)';
-			$helpcontent='';
-			$helpcontent.='<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
-			$helpcontent.='<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
-			$helpcontent.='<b>'.$langs->trans("Subject").'</b>:<br>'."\n";
-			$helpcontent.=$subjecttosend."\n";
-			$helpcontent.="<br>";
-			$helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
-			$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
-			$label=$form->textwithpicto($tmp,$helpcontent,1,'help');
-
-			// Create form popup
-			$formquestion=array();
-			if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label,  'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?true:false));
-			if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_MAILMAN)) {
-				$formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroMailManEnabled"),'value'=>'');
-			}
-			if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))    {
-				$formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroSpipEnabled"),'value'=>'');
-			}
-			print $form->formconfirm("card.php?rowid=".$id,$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion,1,1);
-		}
-
-		// Confirm send card by mail
-		if ($action == 'sendinfo')
-		{
-			print $form->formconfirm("card.php?rowid=".$id,$langs->trans("SendCardByMail"),$langs->trans("ConfirmSendCardByMail",$object->email),"confirm_sendinfo",'',0,1);
-		}
-
-		// Confirm terminate
-		if ($action == 'resign')
-		{
-			$langs->load("mails");
-
-			$adht = new AdherentType($db);
-			$adht->fetch($object->typeid);
-
-			$subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_RESIL_SUBJECT);
-			$texttosend=$object->makeSubstitution($adht->getMailOnResiliate());
-
-			$tmp=$langs->trans("SendAnEMailToMember");
-			$tmp.='<br>('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
-			$tmp.=$langs->trans("MailRecipient").': <b>'.$object->email.'</b>)';
-			$helpcontent='';
-			$helpcontent.='<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
-			$helpcontent.='<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
-			$helpcontent.='<b>'.$langs->trans("Subject").'</b>:<br>'."\n";
-			$helpcontent.=$subjecttosend."\n";
-			$helpcontent.="<br>";
-			$helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
-			$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
-			$label=$form->textwithpicto($tmp,$helpcontent,1,'help');
-
-			// Create an array
-			$formquestion=array();
-			if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?'true':'false'));
-			if ($backtopage)    $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
-			print $form->formconfirm("card.php?rowid=".$id,$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion,'no',1);
-		}
-
-		// Confirm remove member
-		if ($action == 'delete')
-		{
-			$formquestion=array();
-			if ($backtopage) $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
-			print $form->formconfirm("card.php?rowid=".$id,$langs->trans("DeleteMember"),$langs->trans("ConfirmDeleteMember"),"confirm_delete",$formquestion,0,1);
-		}
-
-		// Confirm add in spip
-		if ($action == 'add_spip')
-		{
-			print $form->formconfirm("card.php?rowid=".$id, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip');
-		}
-		// Confirm removed from spip
-		if ($action == 'del_spip')
-		{
-			print $form->formconfirm("card.php?rowid=$id", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip');
-		}
-
-		$rowspan=17;
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
-		if (! empty($conf->societe->enabled)) $rowspan++;
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
-		
-		dol_banner_tab($object, 'rowid', $linkback);
-        
-        print '<div class="fichecenter">';
-        print '<div class="fichehalfleft">';
-        
-        print '<div class="underbanner clearboth"></div>';
-		print '<table class="border centpercent">';
-
-		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
-		}
-
-		// Type
-		print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
-
-		// Morphy
-		print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
-		print '</tr>';
-
-		// Company
-		print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->societe.'</td></tr>';
-
-		// Civility
-		print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
-		print '</tr>';
-
-		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i','*',$object->pass);
-			if ($object->pass) print preg_replace('/./i','*',$object->pass);
-			else
-			{
-			    if ($user->admin) print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
-			    else print $langs->trans("Hidden");
-			}
-			if ((! empty($object->pass) || ! empty($object->pass_crypted)) && empty($object->user_id))
-			{
-			    $langs->load("errors");
-			    $htmltext=$langs->trans("WarningPasswordSetWithNoAccount");
-			    print ' '.$form->textwithpicto('', $htmltext,1,'warning');
-			}
-			print '</td></tr>';
-		}
-		
-        print '</table>';
-        
-        print '</div>';
-        print '<div class="fichehalfright"><div class="ficheaddleft">';
-       
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
-		
-		// Birthday
-		print '<tr><td class="titlefield">'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';
-
-		// Public
-		print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
-
-		// Categories
-		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
-		{
-			print '<tr><td>' . $langs->trans("Categories") . '</td>';
-			print '<td colspan="2">';
-			print $form->showCategories($object->id, 'member', 1);
-			print '</td></tr>';
-		}
-
-		// Other attributes
-		$parameters=array('colspan'=>2);
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields, 'view', $parameters);
-		}
-
-        // Date end subscription
-        print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
-        if ($object->datefin)
-        {
-            print dol_print_date($object->datefin,'day');
-            if ($object->hasDelay()) {
-                print " ".img_warning($langs->trans("Late"));
-            }
-        }
-        else
-        {
-	        if (! $adht->subscription)
-	        {
-	        	print $langs->trans("SubscriptionNotRecorded");
-		        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
-	        }
-	        else
-	        {
-	            print $langs->trans("SubscriptionNotReceived");
-	            if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
-	        }
-        }
-        print '</td></tr>';
-		
-		// Third party Dolibarr
-		if (! empty($conf->societe->enabled))
-		{
-			print '<tr><td>';
-			print '<table class="nobordernopadding" width="100%"><tr><td>';
-			print $langs->trans("LinkedToDolibarrThirdParty");
-			print '</td>';
-			if ($action != 'editthirdparty' && $user->rights->adherent->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'),1).'</a></td>';
-			print '</tr></table>';
-			print '</td><td colspan="2" class="valeur">';
-			if ($action == 'editthirdparty')
-			{
-				$htmlname='socid';
-				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
-				print '<input type="hidden" name="rowid" value="'.$object->id.'">';
-				print '<input type="hidden" name="action" value="set'.$htmlname.'">';
-				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-				print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
-				print '<tr><td>';
-				print $form->select_company($object->fk_soc,'socid','',1);
-				print '</td>';
-				print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-				print '</tr></table></form>';
-			}
-			else
-			{
-				if ($object->fk_soc)
-				{
-					$company=new Societe($db);
-					$result=$company->fetch($object->fk_soc);
-					print $company->getNomUrl(1);
-				}
-				else
-				{
-					print $langs->trans("NoThirdPartyAssociatedToMember");
-				}
-			}
-			print '</td></tr>';
-		}
-
-		// Login Dolibarr
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans("LinkedToDolibarrUser");
-		print '</td>';
-		if ($action != 'editlogin' && $user->rights->adherent->creer)
-		{
-			print '<td align="right">';
-			if ($user->rights->user->user->creer)
-			{
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=editlogin&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'),1).'</a>';
-			}
-			print '</td>';
-		}
-		print '</tr></table>';
-		print '</td><td colspan="2" class="valeur">';
-		if ($action == 'editlogin')
-		{
-			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'userid','');
-		}
-		else
-		{
-			if ($object->user_id)
-			{
-				$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
-			}
-			else print $langs->trans("NoDolibarrAccess");
-		}
-		print '</td></tr>';
-
-		print "</table>\n";
-
-		print "</div></div></div>\n";
-        print '<div style="clear:both"></div>';
-
-        dol_fiche_end();
-        
-        
-		/*
-		 * Hotbar
-		 */
-        
-		print '<div class="tabsAction">';
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-		if (empty($reshook)) {
-			if ($action != 'valid' && $action != 'editlogin' && $action != 'editthirdparty')
-			{
-				// Modify
-				if ($user->rights->adherent->creer)
-				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=edit">'.$langs->trans("Modify")."</a></div>";
-				}
-				else
-				{
-					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>';
-				}
-	
-				// Validate
-				if ($object->statut == -1)
-				{
-					if ($user->rights->adherent->creer)
-					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Validate")."</a></div>\n";
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>';
-					}
-				}
-	
-				// Reactivate
-				if ($object->statut == 0)
-				{
-					if ($user->rights->adherent->creer)
-					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Reenable")."</a></div>\n";
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable")."</font></div>";
-					}
-				}
-	
-				// Send card by email
-				if ($user->rights->adherent->creer)
-				{
-					if ($object->statut >= 1)
-					{
-						if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=sendinfo">'.$langs->trans("SendCardByMail")."</a></div>\n";
-						else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendCardByMail")."</a></div>\n";
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("SendCardByMail")."</font></div>";
-					}
-				}
-				else
-				{
-					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</font></div>";
-				}
-	
-				// Terminate
-				if ($object->statut >= 1)
-				{
-					if ($user->rights->adherent->supprimer)
-					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=resign">'.$langs->trans("Resiliate")."</a></div>\n";
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate")."</font></div>";
-					}
-				}
-	
-				// Create third party
-				if (! empty($conf->societe->enabled) && ! $object->fk_soc)
-				{
-					if ($user->rights->societe->creer)
-					{
-						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
-						else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrThirdParty")."</font></div>";
-					}
-				}
-	
-				// Create user
-				if (! $user->societe_id && ! $object->user_id)
-				{
-					if ($user->rights->user->user->creer)
-					{
-						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
-						else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
-					}
-				}
-	
-				// Delete
-				if ($user->rights->adherent->supprimer)
-				{
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>\n";
-				}
-				else
-				{
-					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
-				}
-	
-				// Action SPIP
-				if (! empty($conf->mailmanspip->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))
-				{
-					$isinspip = $mailmanspip->is_in_spip($object);
-	
-					if ($isinspip == 1)
-					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip")."</a></div>\n";
-					}
-					if ($isinspip == 0)
-					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
-					}
-				}
-	
-			}
-		}
-		print '</div>';
-
-		if ($isinspip == -1)
-		{
-			print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
-		}
-
-		
-		
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-		print '<a name="builddoc"></a>'; // ancre
-		
-		// Documents generes
-		$filename = dol_sanitizeFileName($object->ref);
-		//$filename =  'tmp_cards.php';
-		//$filedir = $conf->adherent->dir_output . '/' . get_exdir($object->id, 2, 0, 0, $object, 'member') . dol_sanitizeFileName($object->ref);
-		$filedir = $conf->adherent->dir_output . '/' . get_exdir(0, 0, 0, 0, $object, 'member');
-		$urlsource = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
-		$genallowed = $user->rights->adherent->creer;
-		$delallowed = $user->rights->adherent->supprimer;
-
-		print $formfile->showdocuments('member', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $object->default_lang, '', $object);
-		$somethingshown = $formfile->numoffiles;
-		
-		// Show links to link elements
-		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription'));
-		//$somethingshown = $form->showLinkedObjectBlock($object, '');
-		
-		// Show links to link elements
-		/*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
-		 if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
-		
-		 // Link for paypal payment
-		 /*
-		 if (! empty($conf->paypal->enabled) && $object->statut != 0) {
-		 include_once DOL_DOCUMENT_ROOT . '/paypal/lib/paypal.lib.php';
-		 print showPaypalPaymentUrl('invoice', $object->ref);
-		 }
-		 */
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-		
-		// List of actions on element
-        /* Already in tab Agenda/Events
-        include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'member', $socid);
-		*/
-		print '</div></div></div>';		
-		
-	}
-}
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8462cdc76ff..30e1579c33e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -615,19 +615,20 @@ function dol_buildpath($path, $type=0)
 }
 
 /**
- *	Create a clone of instance of object (new instance with same properties)
- * 	This function works for both PHP4 and PHP5
+ *	Create a clone of instance of object (new instance with same value for properties)
+ *  Property that are reference are also new object (true clone)
  *
  * 	@param	object	$object		Object to clone
  *	@return object				Object clone
- *  @deprecated Dolibarr no longer supports PHP4, use PHP5 native clone construct
  *  @see https://php.net/manual/language.oop5.cloning.php
  */
 function dol_clone($object)
 {
-	dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
+	//dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
 
-	$myclone = clone $object;
+	//$myclone = clone $object;                    // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable
+	$myclone=unserialize(serialize($object));
+	    
 	return $myclone;
 }
 
@@ -2469,7 +2470,7 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
 	if ($trunc == 'right')
 	{
 		$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
-		if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:1)))
+        if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:1)))
 		return dol_substr($newstring,0,$size,$stringencoding).($nodot?'':'...');
 		else
 		return $string;
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index de8cc397cf4..a417824867b 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -121,7 +121,7 @@ class AllTests
         $suite->addTestSuite('BuildDocTest');
         require_once dirname(__FILE__).'/CMailFileTest.php';
         $suite->addTestSuite('CMailFileTest');
-
+        
         require_once dirname(__FILE__).'/CommonObjectTest.php';
         $suite->addTestSuite('CommonObjectTest');
 
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index d1a5f48ae8d..c0a4ce845a9 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -431,10 +431,17 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
         $user=$this->savuser;
         $langs=$this->savlangs;
         $db=$this->savdb;
-    
+        
+        
         //$dummyuser=new User($db);
         //$result=restrictedArea($dummyuser,'societe');
 
+        // We save user properties
+        $savpermlire = $user->rights->facture->lire;
+        $savpermcreer = $user->rights->facture->creer;
+        
+        
+		// Check access to SPECIMEN
         $user->rights->facture->lire = 0;
         $user->rights->facture->creer = 0;
         $filename='SPECIMEN.pdf';             // Filename relative to module part
@@ -473,6 +480,11 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
         $filename='FA010101/FA010101.pdf';    // Filename relative to module part
         $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
         $this->assertEquals(0,$result['accessallowed']);
+        
+        
+        // We restore user properties
+        $user->rights->facture->lire = $savpermlire;
+        $user->rights->facture->creer = $savpermcreer;
     }    
 
 }
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index d7f3eaf611c..401b7ce0058 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -128,7 +128,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
-
+		
 		require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/mod_facture_mercure.php';
 
@@ -138,8 +138,8 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
 		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000}';
         $conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED=0;
-        
-		$localobject=new Facture($this->savdb);
+
+        $localobject=new Facture($this->savdb);
 		$localobject->initAsSpecimen();
 		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915);	// we use year 1915 to be sure to not have existing invoice for this year
 		$numbering=new mod_facture_mercure();
@@ -154,10 +154,6 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$result=$localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
 		$this->assertEquals(1, $result, 'Test for is_erasable, 1st invoice');						    // Can be deleted
-
-		$out=file_get_contents(DOL_DATA_ROOT.'/dolibarr.log');
-		print $out;
-		
 		$localobject2=new Facture($this->savdb);
 		$localobject2->initAsSpecimen();
 		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1916);	// we use following year for second invoice (there is no reset into mask)

From dd5976066a6fe052f13d80238347a0d8ee7c0756 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 02:04:43 +0200
Subject: [PATCH 0909/1163] Fix travis

---
 test/phpunit/AdherentTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index b998c346b7b..5db9808c9ab 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -322,9 +322,10 @@ class AdherentTest extends PHPUnit_Framework_TestCase
                     '%ADDRESS%,%ZIP%,%TOWN%,%COUNTRY%,%EMAIL%,%BIRTH%,%PHOTO%,%LOGIN%,%PASSWORD%,%PRENOM%,'.
                     '%NOM%,%SOCIETE%,%ADDRESS%,%ZIP%,%TOWN%,%COUNTRY%';
 
+        // If option to store clear password has been set, we get 'dolibspec' into PASSWORD field.
         $expected = DOL_MAIN_URL_ROOT.','.$localobject->id.',,New firstname,New name,New firstname New name,'.
                     'New company,New address,New zip,New town,Belgium,newemail@newemail.com,'.dol_print_date($localobject->birth,'day').',,'.
-                    'newlogin,,New firstname,New name,New company,New address,New zip,New town,Belgium';
+                    'newlogin,dolibspec,New firstname,New name,New company,New address,New zip,New town,Belgium';
 
         $result = $localobject->makeSubstitution($template);
         print __METHOD__." result=".$result."\n";

From 9bc60b8aa5d738d99ebcec0e25ff72d97aba8e20 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Mon, 22 May 2017 09:26:10 +0200
Subject: [PATCH 0910/1163] Fix missing column ref on migration for inventory

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 0bd68ddfcfb..67ad5017999 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -326,3 +326,4 @@ ALTER TABLE llx_facture ADD COLUMN fk_fac_rec_source integer;
 DELETE from llx_c_actioncomm where code in ('AC_PROP','AC_COM','AC_FAC','AC_SHIP','AC_SUP_ORD','AC_SUP_INV') AND id NOT IN (SELECT DISTINCT fk_action FROM llx_actioncomm);
 
 
+ALTER TABLE llx_inventory ADD COLUMN ref varchar(48);
\ No newline at end of file

From f72ac3cf456d11b66c99bb38100ee3ab89e94fa0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 10:07:29 +0200
Subject: [PATCH 0911/1163] Fix php7 compatibility

---
 htdocs/api/class/api_documents.class.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 9794dad4a12..eb6380a19e4 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -49,20 +49,23 @@ class Documents extends DolibarrApi
         $this->db = $db;
     }
 
+
     /**
      * Return a document
      *
      * @param   string  $module_part    Module part for file
      * @param   string  $filename       File name
-     *
+     * 
+     * @url	GET {module_part}/{filename}
+     * 
      * @return  array                   Array with data of file
      * @throws RestException
      */
-     public function index($module_part, $filename) {
-            return array('note'=>'FeatureNotYetAvailable');
-     }
-
-
+    public function get($module_part, $filename) {
+        return array('note'=>'FeatureNotYetAvailable');
+    }
+     
+     
     /**
      * Push a file. 
      * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.

From 8301e24261a5c5660ed2d018dbe93c6f2028c7f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 10:40:24 +0200
Subject: [PATCH 0912/1163] PHP7 compatibility

---
 htdocs/api/class/api.class.php                |  3 +-
 htdocs/api/class/api_documents.class.php      | 38 ++++++++++++-------
 .../bank/class/api_bankaccounts.class.php     |  3 +-
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 082e6188379..190e24d326c 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -66,6 +66,7 @@ class DolibarrApi
      *
      * @return array
      */
+    /* Disabled, most APIs does not share same signature for method index 
     function index()
     {
         return array(
@@ -74,7 +75,7 @@ class DolibarrApi
                 'message' => __class__.' is up and running!'
             )
         );
-    }
+    }*/
 
 
     /**
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index eb6380a19e4..e26486981fa 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -36,8 +36,7 @@ class Documents extends DolibarrApi
      * @var array   $DOCUMENT_FIELDS     Mandatory fields, checked when create and update object
      */
     static $DOCUMENT_FIELDS = array(
-        'modulepart',
-        'filename'
+        'modulepart'
     );
 
     /**
@@ -49,23 +48,36 @@ class Documents extends DolibarrApi
         $this->db = $db;
     }
 
-
+    
     /**
-     * Return a document
+     * Return list of documents.
+     *
+     * @param   string  $module_part    Name of module or area concerned by file download ('facture', ...)
+     * @param   string  $ref            Reference of object (This will define subdir automatically)
+     * @param   string  $subdir         Subdirectory (Only if ref not provided)
+     * @return  array                   List of documents
      *
-     * @param   string  $module_part    Module part for file
-     * @param   string  $filename       File name
-     * 
-     * @url	GET {module_part}/{filename}
-     * 
-     * @return  array                   Array with data of file
      * @throws RestException
      */
-    public function get($module_part, $filename) {
+    public function index($module_part, $ref='', $subdir='') {
         return array('note'=>'FeatureNotYetAvailable');
     }
-     
-     
+    
+    
+    /**
+     * Return a document.
+     *
+     * @param   int         $id          ID of document
+     * @return  array                    Array with data of file
+     *
+     * @throws RestException
+     */
+    /*
+    public function get($id) {
+        return array('note'=>'xxx');
+    }*/
+    
+    
     /**
      * Push a file. 
      * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 7eaf673c2e7..10994d7d525 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -98,7 +98,8 @@ class BankAccounts extends DolibarrApi
 
         if ($result) {
             $num = $this->db->num_rows($result);
-            for ($i = 0; $i < min($num, ($limit <= 0 ? $num : $limit)); $i++) {
+            $minnum = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $minnum; $i++) {
                 $obj = $this->db->fetch_object($result);
                 $account = new Account($this->db);
                 if ($account->fetch($obj->rowid) > 0) {

From f5e29d6c86ad885301fa96528baa4c853269e3d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 10:45:02 +0200
Subject: [PATCH 0913/1163] Fix phpcs warning

---
 htdocs/categories/class/api_categories.class.php            | 6 ++++--
 htdocs/categories/class/api_deprecated_category.class.php   | 6 ++++--
 htdocs/comm/action/class/api_agendaevents.class.php         | 3 ++-
 htdocs/comm/propal/class/api_proposals.class.php            | 3 ++-
 htdocs/commande/class/api_deprecated_commande.class.php     | 3 ++-
 htdocs/commande/class/api_orders.class.php                  | 3 ++-
 htdocs/compta/bank/class/api_bankaccounts.class.php         | 4 ++--
 .../compta/facture/class/api_deprecated_invoice.class.php   | 3 ++-
 htdocs/compta/facture/class/api_invoices.class.php          | 3 ++-
 htdocs/expensereport/class/api_expensereports.class.php     | 3 ++-
 htdocs/fourn/class/api_supplier_invoices.class.php          | 3 ++-
 htdocs/product/class/api_deprecated_product.class.php       | 6 ++++--
 htdocs/product/class/api_products.class.php                 | 3 ++-
 htdocs/product/stock/class/api_stockmovements.class.php     | 3 ++-
 htdocs/product/stock/class/api_warehouses.class.php         | 3 ++-
 htdocs/projet/class/api_projects.class.php                  | 3 ++-
 htdocs/projet/class/api_tasks.class.php                     | 3 ++-
 htdocs/societe/class/api_contacts.class.php                 | 3 ++-
 htdocs/societe/class/api_deprecated_contact.class.php       | 3 ++-
 htdocs/societe/class/api_deprecated_thirdparty.class.php    | 3 ++-
 htdocs/societe/class/api_thirdparties.class.php             | 3 ++-
 htdocs/user/class/api_users.class.php                       | 3 ++-
 22 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index a08abdfc545..fc7aca368f4 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -146,7 +146,8 @@ class Categories extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $category_static = new Categorie($db);
@@ -232,7 +233,8 @@ class Categories extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $category_static = new Categorie($db);
diff --git a/htdocs/categories/class/api_deprecated_category.class.php b/htdocs/categories/class/api_deprecated_category.class.php
index 271f2900502..efbcac82124 100644
--- a/htdocs/categories/class/api_deprecated_category.class.php
+++ b/htdocs/categories/class/api_deprecated_category.class.php
@@ -147,7 +147,8 @@ class CategoryApi extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $category_static = new Categorie($db);
@@ -228,7 +229,8 @@ class CategoryApi extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $category_static = new Categorie($db);
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 5eeca63a4aa..376df238a95 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -147,7 +147,8 @@ class AgendaEvents extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $actioncomm_static = new ActionComm($db);
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index fd508b03256..190f6cdca87 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -148,7 +148,8 @@ class Proposals extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $propal_static = new Propal($db);
diff --git a/htdocs/commande/class/api_deprecated_commande.class.php b/htdocs/commande/class/api_deprecated_commande.class.php
index aa1584c4fed..c0b3a634825 100644
--- a/htdocs/commande/class/api_deprecated_commande.class.php
+++ b/htdocs/commande/class/api_deprecated_commande.class.php
@@ -163,7 +163,8 @@ class CommandeApi extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $commande_static = new Commande($db);
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 81a2ad79d69..1bd4e44a877 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -152,7 +152,8 @@ class Orders extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $commande_static = new Commande($db);
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 10994d7d525..98ee2672d3b 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -98,8 +98,8 @@ class BankAccounts extends DolibarrApi
 
         if ($result) {
             $num = $this->db->num_rows($result);
-            $minnum = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $minnum; $i++) {
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
                 $obj = $this->db->fetch_object($result);
                 $account = new Account($this->db);
                 if ($account->fetch($obj->rowid) > 0) {
diff --git a/htdocs/compta/facture/class/api_deprecated_invoice.class.php b/htdocs/compta/facture/class/api_deprecated_invoice.class.php
index b638a46b920..36aa232de9e 100644
--- a/htdocs/compta/facture/class/api_deprecated_invoice.class.php
+++ b/htdocs/compta/facture/class/api_deprecated_invoice.class.php
@@ -161,7 +161,8 @@ class InvoiceApi extends DolibarrApi
         {
             $i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $invoice_static = new Facture($db);
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 4efc997cc42..e2842df0530 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -155,7 +155,8 @@ class Invoices extends DolibarrApi
         {
             $i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $invoice_static = new Facture($db);
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 03ecb51de79..763b550d34e 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -134,7 +134,8 @@ class ExpenseReports extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $expensereport_static = new ExpenseReport($db);
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 3bf5c3f5934..1eb1872126c 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -155,7 +155,8 @@ class SupplierInvoices extends DolibarrApi
         {
             $i = 0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $invoice_static = new FactureFournisseur($db);
diff --git a/htdocs/product/class/api_deprecated_product.class.php b/htdocs/product/class/api_deprecated_product.class.php
index e2ee97e0100..e33c7dd3e32 100644
--- a/htdocs/product/class/api_deprecated_product.class.php
+++ b/htdocs/product/class/api_deprecated_product.class.php
@@ -149,7 +149,8 @@ class ProductApi extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $product_static = new Product($db);
@@ -235,7 +236,8 @@ class ProductApi extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $product_static = new Product($db);
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 14885532952..a733a554fd5 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -146,7 +146,8 @@ class Products extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $product_static = new Product($db);
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 677d34d9fcb..79e17749991 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -133,7 +133,8 @@ class StockMovements extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $stockmovement_static = new MouvementStock($db);
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index d09c7bc527f..d50f590c30c 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -131,7 +131,8 @@ class Warehouses extends DolibarrApi
         {
         	$i=0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $warehouse_static = new Entrepot($db);
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 5bb7e8dfc7e..0f4f85c05af 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -153,7 +153,8 @@ class Projects extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $project_static = new Project($db);
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index ad72a36fa45..d2d7b81d865 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -160,7 +160,8 @@ class Tasks extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $task_static = new Task($db);
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index de50799e430..02c1410fcbf 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -153,7 +153,8 @@ class Contacts extends DolibarrApi
 		if ($result)
 		{
 			$num = $db->num_rows($result);
-			while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
 			{
 				$obj = $db->fetch_object($result);
 				$contact_static = new Contact($db);
diff --git a/htdocs/societe/class/api_deprecated_contact.class.php b/htdocs/societe/class/api_deprecated_contact.class.php
index 196a1386b5d..8cb61fa3eb0 100644
--- a/htdocs/societe/class/api_deprecated_contact.class.php
+++ b/htdocs/societe/class/api_deprecated_contact.class.php
@@ -167,7 +167,8 @@ class ContactApi extends DolibarrApi
 		{
 			$i = 0;
 		    $num = $db->num_rows($result);
-			while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+		    $min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
 			{
 				$obj = $db->fetch_object($result);
 				$contact_static = new Contact($db);
diff --git a/htdocs/societe/class/api_deprecated_thirdparty.class.php b/htdocs/societe/class/api_deprecated_thirdparty.class.php
index 96a2ebac321..a8146f4cca6 100644
--- a/htdocs/societe/class/api_deprecated_thirdparty.class.php
+++ b/htdocs/societe/class/api_deprecated_thirdparty.class.php
@@ -214,7 +214,8 @@ class ThirdpartyApi extends DolibarrApi
         {
 			$i = 0;
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $soc_static = new Societe($db);
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index f8e96d82e47..df7965d6d8c 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -156,7 +156,8 @@ class Thirdparties extends DolibarrApi
         if ($result)
         {
             $num = $db->num_rows($result);
-            while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $soc_static = new Societe($db);
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 80065f8d8d2..aa2569fb3ca 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -106,7 +106,8 @@ class Users extends DolibarrApi
 	    if ($result)
 	    {
 	        $num = $db->num_rows($result);
-	        while ($i < min($num, ($limit <= 0 ? $num : $limit)))
+	        $min = min($num, ($limit <= 0 ? $num : $limit));
+	        while ($i < $min)
 	        {
 	            $obj = $db->fetch_object($result);
 	            $user_static = new User($db);

From 82560b912614a139b60ab0e6d9168d123d213478 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 10:58:20 +0200
Subject: [PATCH 0914/1163] Look and feel v6

---
 htdocs/adherents/card.php         | 2 +-
 htdocs/adherents/subscription.php | 2 +-
 htdocs/langs/en_US/main.lang      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 270430c899f..1234f75e059 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1273,7 +1273,7 @@ else
 		 */
 		$head = member_prepare_head($object);
 
-		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
+		dol_fiche_head($head, 'general', $langs->trans("Member"), -1, 'user');
 
 		// Confirm create user
 		if ($action == 'create_user')
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 658cdfee323..1874a0b37a7 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -578,7 +578,7 @@ if ($rowid > 0)
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 
-    dol_fiche_head($head, 'subscription', $langs->trans("Member"), 0, 'user');
+    dol_fiche_head($head, 'subscription', $langs->trans("Member"), -1, 'user');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
     
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 01aa5537c13..77b5af78f81 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -762,7 +762,7 @@ Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>. 
+SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>. 
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate

From 1a8884bbbee037f128875d5d138a98571b0be2f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 15:20:52 +0200
Subject: [PATCH 0915/1163] NEW Can filter on year and product tags on the
 product statistic page

---
 htdocs/categories/class/categorie.class.php   |  26 +-
 htdocs/core/class/html.form.class.php         |   2 +-
 htdocs/langs/en_US/other.lang                 |  24 +-
 htdocs/product/ajax/products.php              |   4 +-
 htdocs/product/card.php                       |   3 +-
 htdocs/product/class/product.class.php        |  57 +-
 htdocs/product/composition/card.php           |  81 ++-
 htdocs/product/list.php                       |  68 +-
 htdocs/product/stats/card.php                 | 631 +++++++++---------
 htdocs/product/stats/commande.php             |   2 +-
 htdocs/product/stats/commande_fournisseur.php |   2 +-
 htdocs/product/stats/contrat.php              |   2 +-
 htdocs/product/stats/facture.php              |   2 +-
 htdocs/product/stats/facture_fournisseur.php  |   2 +-
 htdocs/product/stats/propal.php               |   2 +-
 15 files changed, 500 insertions(+), 408 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 518c3faa683..142cc22fe75 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -792,11 +792,12 @@ class Categorie extends CommonObject
 	/**
 	 * Return list of fetched instance of elements having this category
 	 *
-	 * @param   string $type Type of category ('customer', 'supplier', 'contact', 'product', 'member')
-	 *
-	 * @return  mixed        -1 if KO, array of instance of object if OK
+	 * @param   string     $type       Type of category ('customer', 'supplier', 'contact', 'product', 'member')
+	 * @param   int        $onlyids    Return only ids of objects (consume less memory)
+	 * @return  mixed                  -1 if KO, array of instance of object if OK
+	 * @see containsObject
 	 */
-	function getObjectsInCateg($type)
+	function getObjectsInCateg($type, $onlyids=0)
 	{
 		$objs = array();
 
@@ -813,10 +814,18 @@ class Categorie extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($rec = $this->db->fetch_array($resql)) {
-				$obj = new $this->MAP_OBJ_CLASS[$type]( $this->db );
-				$obj->fetch( $rec['fk_' . $this->MAP_CAT_FK[$type]]);
-				$objs[] = $obj;
+			while ($rec = $this->db->fetch_array($resql)) 
+			{
+			    if ($onlyids)
+			    {
+			        $objs[] = $rec['fk_' . $this->MAP_CAT_FK[$type]];
+			    }
+			    else
+			    {
+				    $obj = new $this->MAP_OBJ_CLASS[$type]( $this->db );
+				    $obj->fetch( $rec['fk_' . $this->MAP_CAT_FK[$type]]);
+				    $objs[] = $obj;
+			    }
 			}
 			return $objs;
 		}
@@ -834,6 +843,7 @@ class Categorie extends CommonObject
 	 * @param   int    $object_id id of the object to search
 	 *
 	 * @return  int                        number of occurrences
+	 * @see getObjectsInCateg
 	 */
 	function containsObject($type, $object_id )
 	{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f58e96087b8..561504f7845 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4783,7 +4783,7 @@ class Form
                 {
                     $retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';
 
-                    for ($year = $syear - 5; $year < $syear + 10 ; $year++)
+                    for ($year = $syear - 10; $year < $syear + 10 ; $year++)
                     {
                         $retstring.='<option value="'.$year.'"'.($year == $syear ? ' selected':'').'>'.$year.'</option>';
                     }
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 11a09af3373..02fa209c340 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -160,18 +160,18 @@ ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party cou
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics in number of products/services units
 StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
+NumberOfProposals=Number of proposals
+NumberOfCustomerOrders=Number of customer orders
+NumberOfCustomerInvoices=Number of customer invoices
+NumberOfSupplierProposals=Number of supplier proposals
+NumberOfSupplierOrders=Number of supplier orders
+NumberOfSupplierInvoices=Number of supplier invoices
+NumberOfUnitsProposals=Number of units on proposals
+NumberOfUnitsCustomerOrders=Number of units on customer orders
+NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsSupplierProposals=Number of units on supplier proposals
+NumberOfUnitsSupplierOrders=Number of units on supplier orders
+NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 0510299fbd7..8867011101b 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -178,11 +178,11 @@ else
 
 	$idprod = (! empty($match[0]) ? $match[0] : '');
 	
-	if (! GETPOST($htmlname) && ! GETPOST($idprod))
+	if (! $htmlname && (! $idprod || ! GETPOST($idprod,'alpha')))
 		return;
 
 		// When used from jQuery, the search term is added as GET param "term".
-	$searchkey = (GETPOST($idprod) ? GETPOST($idprod) : (GETPOST($htmlname) ? GETPOST($htmlname) : ''));
+	$searchkey = (($idprod && GETPOST($idprod,'alpha')) ? GETPOST($idprod,'alpha') :  (GETPOST($htmlname, 'alpha') ? GETPOST($htmlname, 'alpha') : ''));
 
 	$form = new Form($db);
 	if (empty($mode) || $mode == 1) {  // mode=1: customer
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 71f7cd8e7f6..7cd86404afa 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1448,7 +1448,8 @@ else
 		    $head=product_prepare_head($object);
             $titre=$langs->trans("CardProduct".$object->type);
             $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-            dol_fiche_head($head, 'card', $titre, 0, $picto);
+            
+            dol_fiche_head($head, 'card', $titre, -1, $picto);
 
             $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
             $object->next_prev_filter=" fk_product_type = ".$object->type;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 1225eb82696..d866e3ec2ae 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2459,9 +2459,10 @@ class Product extends CommonObject
 	 *
 	 *  @param		string	$sql        Request to execute
 	 *  @param		string	$mode		'byunit'=number of unit, 'bynumber'=nb of entities
+	 *  @param      int     $year       Year (0=current year)
 	 *  @return   	array       		<0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function _get_stats($sql,$mode)
+	function _get_stats($sql, $mode, $year=0)
 	{
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -2482,8 +2483,15 @@ class Product extends CommonObject
 			return -1;
 		}
 
-		$year = strftime('%Y',time());
-		$month = strftime('%m',time());
+		if (empty($year)) 
+		{
+		    $year = strftime('%Y',time());
+		    $month = strftime('%m',time());
+		}
+		else
+		{
+		    $month=12;    // We imagine we are at end of year, so we get last 12 month before, so all correct year.
+		}
 		$result = array();
 
 		for ($j = 0 ; $j < 12 ; $j++)
@@ -2516,9 +2524,11 @@ class Product extends CommonObject
 	 *  @param  	int		$socid                   Limit count on a particular third party id
 	 *  @param		string	$mode		             'byunit'=number of unit, 'bynumber'=nb of entities
 	 *  @param      int     $filteronproducttype     0=To filter on product only, 1=To filter on services only
+	 *  @param      int     $year                    Year (0=last 12 month)
+	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_vente($socid, $mode, $filteronproducttype=-1)
+	function get_nb_vente($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
 	{
 		global $conf;
 		global $user;
@@ -2536,10 +2546,11 @@ class Product extends CommonObject
 		$sql.= " AND f.entity IN (".getEntity('facture', 1).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND f.fk_soc = $socid";
+		$sql.=$morefilter;
 		$sql.= " GROUP BY date_format(f.datef,'%Y%m')";
 		$sql.= " ORDER BY date_format(f.datef,'%Y%m') DESC";
 
-		return $this->_get_stats($sql,$mode);
+		return $this->_get_stats($sql,$mode, $year);
 	}
 
 
@@ -2549,9 +2560,11 @@ class Product extends CommonObject
 	 *  @param  	int		$socid                   Limit count on a particular third party id
 	 * 	@param		string	$mode		             'byunit'=number of unit, 'bynumber'=nb of entities
 	 *  @param      int     $filteronproducttype     0=To filter on product only, 1=To filter on services only
+	 *  @param      int     $year                    Year (0=last 12 month)
+	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_achat($socid, $mode, $filteronproducttype=-1)
+	function get_nb_achat($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
 	{
 		global $conf;
 		global $user;
@@ -2569,11 +2582,11 @@ class Product extends CommonObject
 		$sql.= " AND f.entity IN (".getEntity('facture_fourn', 1).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND f.fk_soc = $socid";
+		$sql.=$morefilter;
 		$sql.= " GROUP BY date_format(f.datef,'%Y%m')";
 		$sql.= " ORDER BY date_format(f.datef,'%Y%m') DESC";
 
-		$resarray=$this->_get_stats($sql,$mode);
-		return $resarray;
+		return $this->_get_stats($sql,$mode, $year);
 	}
 
 	/**
@@ -2582,9 +2595,11 @@ class Product extends CommonObject
 	 *  @param  	int		$socid                   Limit count on a particular third party id
 	 * 	@param		string	$mode		             'byunit'=number of unit, 'bynumber'=nb of entities
 	 *  @param      int     $filteronproducttype     0=To filter on product only, 1=To filter on services only
+	 *  @param      int     $year                    Year (0=last 12 month)
+	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_propal($socid, $mode, $filteronproducttype=-1)
+	function get_nb_propal($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
 	{
 		global $conf;
 		global $user;
@@ -2602,10 +2617,11 @@ class Product extends CommonObject
 		$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
+		$sql.=$morefilter;
 		$sql.= " GROUP BY date_format(p.datep,'%Y%m')";
 		$sql.= " ORDER BY date_format(p.datep,'%Y%m') DESC";
 
-		return $this->_get_stats($sql,$mode);
+		return $this->_get_stats($sql,$mode, $year);
 	}
 
 	/**
@@ -2614,9 +2630,11 @@ class Product extends CommonObject
 	 *  @param  	int		$socid                   Limit count on a particular third party id
 	 * 	@param		string	$mode		             'byunit'=number of unit, 'bynumber'=nb of entities
 	 *  @param      int     $filteronproducttype     0=To filter on product only, 1=To filter on services only
+	 *  @param      int     $year                    Year (0=last 12 month)
+	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_propalsupplier($socid, $mode, $filteronproducttype=-1)
+	function get_nb_propalsupplier($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
 	{
 		global $conf;
 		global $user;
@@ -2634,10 +2652,11 @@ class Product extends CommonObject
 		$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
+		$sql.=$morefilter;
 		$sql.= " GROUP BY date_format(p.date_valid,'%Y%m')";
 		$sql.= " ORDER BY date_format(p.date_valid,'%Y%m') DESC";
 
-		return $this->_get_stats($sql,$mode);
+		return $this->_get_stats($sql,$mode, $year);
 	}
 	
 	/**
@@ -2646,9 +2665,11 @@ class Product extends CommonObject
 	 *  @param  	int		$socid                   Limit count on a particular third party id
 	 *  @param		string	$mode		             'byunit'=number of unit, 'bynumber'=nb of entities
 	 *  @param      int     $filteronproducttype     0=To filter on product only, 1=To filter on services only
+	 *  @param      int     $year                    Year (0=last 12 month)
+	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_order($socid, $mode, $filteronproducttype=-1)
+	function get_nb_order($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
 	{
 		global $conf, $user;
 
@@ -2665,10 +2686,11 @@ class Product extends CommonObject
 		$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
+		$sql.=$morefilter;
 		$sql.= " GROUP BY date_format(c.date_commande,'%Y%m')";
 		$sql.= " ORDER BY date_format(c.date_commande,'%Y%m') DESC";
 
-		return $this->_get_stats($sql,$mode);
+		return $this->_get_stats($sql,$mode, $year);
 	}
 
 	/**
@@ -2677,9 +2699,11 @@ class Product extends CommonObject
 	 *  @param  	int		$socid                   Limit count on a particular third party id
 	 *  @param		string	$mode		             'byunit'=number of unit, 'bynumber'=nb of entities
 	 *  @param      int     $filteronproducttype     0=To filter on product only, 1=To filter on services only
+	 *  @param      int     $year                    Year (0=last 12 month)
+	 *  @param      string  $morefilter              More sql filters
 	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_ordersupplier($socid, $mode, $filteronproducttype=-1)
+	function get_nb_ordersupplier($socid, $mode, $filteronproducttype=-1, $year=0, $morefilter='')
 	{
 		global $conf, $user;
 
@@ -2696,10 +2720,11 @@ class Product extends CommonObject
 		$sql.= " AND c.entity IN (".getEntity('supplier_order', 1).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
+		$sql.=$morefilter;
 		$sql.= " GROUP BY date_format(c.date_commande,'%Y%m')";
 		$sql.= " ORDER BY date_format(c.date_commande,'%Y%m') DESC";
 
-		return $this->_get_stats($sql,$mode);
+		return $this->_get_stats($sql,$mode, $year);
 	}
 
 	/**
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 37068a1daca..aa1cf4137e9 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -193,7 +193,7 @@ llxHeader('', $title, $helpurl);
 $head=product_prepare_head($object);
 $titre=$langs->trans("CardProduct".$object->type);
 $picto=($object->type==Product::TYPE_SERVICE?'service':'product');
-dol_fiche_head($head, 'subproduct', $titre, 0, $picto);
+dol_fiche_head($head, 'subproduct', $titre, -1, $picto);
 
 
 if ($id > 0 || ! empty($ref))
@@ -209,48 +209,47 @@ if ($id > 0 || ! empty($ref))
 		
         if ($object->type!=Product::TYPE_SERVICE || empty($conf->global->PRODUIT_MULTIPRICES))
         {
+            print '<div class="fichecenter">';
     	    print '<div class="underbanner clearboth"></div>';	
             print '<table class="border tableforfield" width="100%">';
-        }
         
-		// Nature
-		if ($object->type!=Product::TYPE_SERVICE)
-		{
-			print '<tr><td>'.$langs->trans("Nature").'</td><td>';
-			print $object->getLibFinished();
-			print '</td></tr>';
-		}
+    		// Nature
+    		if ($object->type!=Product::TYPE_SERVICE)
+    		{
+    			print '<tr><td>'.$langs->trans("Nature").'</td><td>';
+    			print $object->getLibFinished();
+    			print '</td></tr>';
+    		}
+    
+    		if (empty($conf->global->PRODUIT_MULTIPRICES))
+    		{
+    		    // Price
+    			print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
+    			if ($object->price_base_type == 'TTC')
+    			{
+    				print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
+    			}
+    			else
+    			{
+    				print price($object->price).' '.$langs->trans($object->price_base_type?$object->price_base_type:'HT');
+    			}
+    			print '</td></tr>';
+    
+    			// Price minimum
+    			print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
+    			if ($object->price_base_type == 'TTC')
+    			{
+    				print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
+    			}
+    			else
+    			{
+    				print price($object->price_min).' '.$langs->trans($object->price_base_type?$object->price_base_type:'HT');
+    			}
+    			print '</td></tr>';
+    		}
 
-		if (empty($conf->global->PRODUIT_MULTIPRICES))
-		{
-		    // Price
-			print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
-			if ($object->price_base_type == 'TTC')
-			{
-				print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
-			}
-			else
-			{
-				print price($object->price).' '.$langs->trans($object->price_base_type?$object->price_base_type:'HT');
-			}
-			print '</td></tr>';
-
-			// Price minimum
-			print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
-			if ($object->price_base_type == 'TTC')
-			{
-				print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
-			}
-			else
-			{
-				print price($object->price_min).' '.$langs->trans($object->price_base_type?$object->price_base_type:'HT');
-			}
-			print '</td></tr>';
-		}
-
-        if ($object->type!=Product::TYPE_SERVICE || empty($conf->global->PRODUIT_MULTIPRICES))
-        {
-		  print '</table>';
+            print '</table>';
+            print '</div>';
         }
 
 		dol_fiche_end();
@@ -271,7 +270,7 @@ if ($id > 0 || ! empty($ref))
 
 		//if (count($prodsfather) > 0)
 		//{
-			print load_fiche_titre($langs->trans("ProductParentList"),'','').'<br>';
+			print load_fiche_titre($langs->trans("ProductParentList"),'','');
 			print '<table class="centpercent noborder">';
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans('ParentProducts').'</td>';
@@ -320,7 +319,7 @@ if ($id > 0 || ! empty($ref))
 		//if (count($prods_arbo) > 0)
 		//{
 			$atleastonenotdefined=0;
-			print load_fiche_titre($langs->trans("ProductAssociationList"),'','').'<br>';
+			print load_fiche_titre($langs->trans("ProductAssociationList"),'','');
 
 			print '<form name="formComposedProduct" action="'.$_SERVER['PHP_SELF'].'" method="post">';
 			print '<input type="hidden" name="action" value="save_composed_product" />';
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 7e6ae9b47f4..74f9c59cff3 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -55,6 +55,7 @@ $sall=GETPOST('sall', 'alphanohtml');
 $sref=GETPOST("sref");
 $sbarcode=GETPOST("sbarcode");
 $snom=GETPOST("snom");
+$search_type = GETPOST("search_type",'int');
 $search_sale = GETPOST("search_sale");
 $search_categ = GETPOST("search_categ",'int');
 $tosell = GETPOST("tosell", 'int');
@@ -65,7 +66,7 @@ $search_tobatch = GETPOST("search_tobatch",'int');
 $search_accountancy_code_sell = GETPOST("search_accountancy_code_sell",'alpha');
 $search_accountancy_code_buy = GETPOST("search_accountancy_code_buy",'alpha');
 $optioncss = GETPOST('optioncss','alpha');
-$type= (int) GETPOST("type","int");
+$type=(int) GETPOST("type","int");
 
 //Show/hide child products. Hidden by default
 if (!$_POST) {
@@ -114,8 +115,8 @@ if (! empty($canvas))
 }
 
 // Security check
-if ($type=='0') $result=restrictedArea($user,'produit','','','','','',$objcanvas);
-else if ($type=='1') $result=restrictedArea($user,'service','','','','','',$objcanvas);
+if ($search_type=='0') $result=restrictedArea($user,'produit','','','','','',$objcanvas);
+else if ($search_type=='1') $result=restrictedArea($user,'service','','','','','',$objcanvas);
 else $result=restrictedArea($user,'produit|service','','','','','',$objcanvas);
 
 // Define virtualdiffersfromphysical
@@ -158,7 +159,8 @@ $arrayfields=array(
     'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
     //'pfp.ref_fourn'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
     'p.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
-	'p.barcode'=>array('label'=>$langs->trans("Gencod"), 'checked'=>($contextpage != 'servicelist'), 'enabled'=>(! empty($conf->barcode->enabled))),
+    'p.fk_product_type'=>array('label'=>$langs->trans("Type"), 'checked'=>0, 'enabled'=>(! empty($conf->produit->enabled) && ! empty($conf->service->enabled))),
+    'p.barcode'=>array('label'=>$langs->trans("Gencod"), 'checked'=>($contextpage != 'servicelist'), 'enabled'=>(! empty($conf->barcode->enabled))),
     'p.duration'=>array('label'=>$langs->trans("Duration"), 'checked'=>($contextpage != 'productlist'), 'enabled'=>(! empty($conf->service->enabled))),
 	'p.sellprice'=>array('label'=>$langs->trans("SellingPrice"), 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES)),
     'p.minbuyprice'=>array('label'=>$langs->trans("BuyingPriceMinShort"), 'checked'=>1, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
@@ -212,6 +214,7 @@ if (empty($reshook))
     	$tosell="";
     	$tobuy="";
     	$search_tobatch='';
+    	$search_type='';
     	$search_accountancy_code_sell='';
     	$search_accountancy_code_buy='';
     	$search_array_options=array();
@@ -219,8 +222,8 @@ if (empty($reshook))
     
     // Mass actions
     $objectclass='Product';
-    if ((string) $type == '1') { $objectlabel='Services'; }
-    if ((string) $type == '0') { $objectlabel='Products'; }
+    if ((string) $search_type == '1') { $objectlabel='Services'; }
+    if ((string) $search_type == '0') { $objectlabel='Products'; }
     
     $permtoread = $user->rights->produit->lire;
     $permtodelete = $user->rights->produit->supprimer;
@@ -244,9 +247,9 @@ else
 {
 	$title=$langs->trans("ProductsAndServices");
 
-	if (isset($type))
+	if ($search_type != '' && $search_type != '-1')
 	{
-		if ($type==1)
+		if ($search_type==1)
 		{
 			$texte = $langs->trans("Services");
 		}
@@ -260,13 +263,13 @@ else
 		$texte = $langs->trans("ProductsAndServices");
 	}
 
-    $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
+    $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
     $sql.= ' p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
     $sql.= ' p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy,';
     $sql.= ' p.datec as date_creation, p.tms as date_update,';
     //$sql.= ' pfp.ref_fourn as ref_supplier, ';
     $sql.= ' MIN(pfp.unitprice) as minsellprice';
-	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
 		$sql .= ', pac.rowid prod_comb_id';
 	}
 	// Add fields from extrafields
@@ -281,17 +284,17 @@ else
    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
 	// multilang
 	if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang = '".$langs->getDefaultLang() ."'";
-	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
 	}
 
 	$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
 	if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
     // if the type is not 1, we show all products (type = 0,2,3)
-    if (dol_strlen($type))
+    if (dol_strlen($search_type) && $search_type != '-1')
     {
-    	if ($type == 1) $sql.= " AND p.fk_product_type = '1'";
-    	else $sql.= " AND p.fk_product_type <> '1'";
+    	if ($search_type == 1) $sql.= " AND p.fk_product_type = 1";
+    	else $sql.= " AND p.fk_product_type <> 1";
     }
 	if ($sref)     $sql .= natural_search('p.ref', $sref);
 	if ($snom)     $sql .= natural_search('p.label', $snom);
@@ -309,7 +312,7 @@ else
     if ($search_accountancy_code_sell)   $sql.= natural_search('p.accountancy_code_buy', $search_accountancy_code_buy);
     // Add where from extra fields
 
-	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
 		$sql .= " AND pac.rowid IS NULL";
 	}
 
@@ -333,7 +336,7 @@ else
     $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
     $sql.= " p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
     $sql.= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy';
-	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($type === 0)) {
+	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
 		$sql .= ', pac.rowid';
 	}
 	// Add fields from extrafields
@@ -368,13 +371,13 @@ else
     	}
 
     	$helpurl='';
-    	if (isset($type))
+    	if ($search_type != '')
     	{
-    		if ($type == 0)
+    		if ($search_type == 0)
     		{
     			$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
     		}
-    		else if ($type == 1)
+    		else if ($search_type == 1)
     		{
     			$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
     		}
@@ -401,7 +404,8 @@ else
     	if ($fourn_id > 0) $param.=($fourn_id?"&amp;fourn_id=".$fourn_id:"");
     	if ($seach_categ) $param.=($search_categ?"&amp;search_categ=".urlencode($search_categ):"");
     	if ($type != '') $param.='&amp;type='.urlencode($type);
-		if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
+    	if ($search_type != '') $param.='&amp;search_type='.urlencode($search_type);
+    	if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
     	if ($search_tobatch) $param="&amp;search_ref_supplier=".urlencode($search_ref_supplier);
     	if ($search_accountancy_code_sell) $param="&amp;search_accountancy_code_sell=".urlencode($search_accountancy_code_sell);
     	if ($search_accountancy_code_buy) $param="&amp;search_accountancy_code_buy=".urlencode($search_accountancy_code_buy);
@@ -430,7 +434,8 @@ else
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
         print '<input type="hidden" name="page" value="'.$page.'">';
-		print '<input type="hidden" name="type" value="'.$type.'">';
+        print '<input type="hidden" name="type" value="'.$type.'">';
+        if (empty($arrayfields['p.fk_product_type']['checked'])) print '<input type="hidden" name="search_type" value="'.dol_escape_htmltag($search_type).'">';
 
 	    print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, '', '', $limit);
 
@@ -480,7 +485,7 @@ else
     		}
 
 			//Show/hide child products. Hidden by default
-			if (!empty($conf->variants->enabled) && $type === 0) {
+			if (!empty($conf->variants->enabled) && $search_type === 0) {
 				$moreforfilter.='<div class="divsearchfield">';
 				$moreforfilter.= '<input type="checkbox" id="search_hidechildproducts" name="search_hidechildproducts" value="on"'.($search_hidechildproducts ? 'checked="checked"' : '').'>';
 				$moreforfilter.= ' <label for="search_hidechildproducts">'.$langs->trans('HideChildProducts').'</label>';
@@ -524,6 +529,14 @@ else
 		   		print '<input class="flat" type="text" name="snom" size="12" value="'.dol_escape_htmltag($snom).'">';
     			print '</td>';
     		}
+    		// Type
+    	    if (! empty($arrayfields['p.fk_product_type']['checked']))
+    		{
+    			print '<td class="liste_titre" align="left">';
+		   		$array=array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
+    			print $form->selectarray('search_type', $array, $search_type);
+    			print '</td>';
+    		}
     		// Barcode
     		if (! empty($arrayfields['p.barcode']['checked']))
     		{
@@ -622,6 +635,7 @@ else
     		if (! empty($arrayfields['p.ref']['checked']))  print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder);
     		if (! empty($arrayfields['pfp.ref_fourn']['checked']))  print_liste_field_titre($arrayfields['pfp.ref_fourn']['label'], $_SERVER["PHP_SELF"],"pfp.ref_fourn","",$param,"",$sortfield,$sortorder);
     		if (! empty($arrayfields['p.label']['checked']))  print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"],"p.label","",$param,"",$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.fk_product_type']['checked']))  print_liste_field_titre($arrayfields['p.fk_product_type']['label'], $_SERVER["PHP_SELF"],"p.fk_product_type","",$param,"",$sortfield,$sortorder);
     		if (! empty($arrayfields['p.barcode']['checked']))  print_liste_field_titre($arrayfields['p.barcode']['label'], $_SERVER["PHP_SELF"],"p.barcode","",$param,"",$sortfield,$sortorder);
     		if (! empty($arrayfields['p.duration']['checked']))  print_liste_field_titre($arrayfields['p.duration']['label'], $_SERVER["PHP_SELF"],"p.duration","",$param,'align="center"',$sortfield,$sortorder);
     		if (! empty($arrayfields['p.sellprice']['checked']))  print_liste_field_titre($arrayfields['p.sellprice']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
@@ -690,7 +704,7 @@ else
                 $product_static->status     = $obj->tosell;
 				$product_static->entity = $obj->entity;
 
-				if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1)	// To optimize call of load_stock
+				if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $search_type != 1)	// To optimize call of load_stock
 				{
 				    if ($obj->fk_product_type != 1)    // Not a service
 				    {
@@ -721,7 +735,13 @@ else
 			    	print '<td>'.dol_trunc($obj->label,40).'</td>';
 			    }
 			    
-    			// Barcode
+    		    // Type
+			    if (! empty($arrayfields['p.fk_product_type']['checked']))
+			    {
+			    	print '<td>'.$obj->fk_product_type.'</td>';
+			    }
+			    
+			    // Barcode
 			    if (! empty($arrayfields['p.barcode']['checked']))
 			    {
     				print '<td>'.$obj->barcode.'</td>';
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index d0a85756c04..0477491518c 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (c) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (c) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2005		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2013		Juanjo Menent			<jmenent@2byte.es>
@@ -30,6 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 $WIDTH=DolGraph::getDefaultGraphSizeForStats('width',380);
 $HEIGHT=DolGraph::getDefaultGraphSizeForStats('height',160);
@@ -43,6 +45,9 @@ $langs->load("other");
 $id		= GETPOST('id','int');         // For this page, id can also be 'all'
 $ref	= GETPOST('ref');
 $mode	= (GETPOST('mode') ? GETPOST('mode') : 'byunit');
+$search_year   = GETPOST('search_year','int');
+$search_categ  = GETPOST('search_categ','int');
+
 $error	= 0;
 $mesg	= '';
 $graphfiles=array();
@@ -55,348 +60,380 @@ $fieldvalue = (! empty($id) ? $id : $ref);
 $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
+$tmp=dol_getdate(dol_now());
+$currentyear=$tmp['year'];
+if (empty($search_year)) $search_year=$currentyear;
+
+
+/*
+ * Actions
+ */
+
+// None
+
 
 /*
  *	View
  */
 
 $form = new Form($db);
+$htmlother = new FormOther($db);
 
-if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
+$object = new Product($db);
+if (! $id)
 {
-	$object = new Product($db);
-    if (GETPOST('id') == 'all')
+    llxHeader("",$langs->trans("ProductStatistics"));
+
+    $type = GETPOST('type','int');
+
+   	$helpurl='';
+    if ($type == '0')
     {
-        llxHeader("",$langs->trans("ProductStatistics"));
-
-   	    $type = GETPOST('type');
-
-       	$helpurl='';
-        if ($type == '0')
-        {
-            $helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-            //$title=$langs->trans("StatisticsOfProducts");
-            $title=$langs->trans("Statistics");
-        }
-        else if ($type == '1')
-        {
-            $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-            //$title=$langs->trans("StatisticsOfServices");
-            $title=$langs->trans("Statistics");
-        }
-        else
-        {
-            $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-            //$title=$langs->trans("StatisticsOfProductsOrServices");
-            $title=$langs->trans("Statistics");
-        }
-
-        print load_fiche_titre($title, $mesg,'title_products.png');
+        $helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+        //$title=$langs->trans("StatisticsOfProducts");
+        $title=$langs->trans("Statistics");
+    }
+    else if ($type == '1')
+    {
+        $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+        //$title=$langs->trans("StatisticsOfServices");
+        $title=$langs->trans("Statistics");
     }
     else
     {
-        $result = $object->fetch($id,$ref);
-
-		$title = $langs->trans('ProductServiceCard');
-		$helpurl = '';
-		$shortlabel = dol_trunc($object->label,16);
-		if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT))
-		{
-			$title = $langs->trans('Product')." ". $shortlabel ." - ".$langs->trans('Statistics');
-			$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-		}
-		if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE))
-		{
-			$title = $langs->trans('Service')." ". $shortlabel ." - ".$langs->trans('Statistics');
-			$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-		}
-
-		llxHeader('', $title, $helpurl);
+        $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+        //$title=$langs->trans("StatisticsOfProductsOrServices");
+        $title=$langs->trans("Statistics");
     }
 
+    print load_fiche_titre($title, $mesg,'title_products.png');
+}
+else
+{
+    $result = $object->fetch($id,$ref);
 
-	if ($result && (! empty($id) || ! empty($ref)))
+	$title = $langs->trans('ProductServiceCard');
+	$helpurl = '';
+	$shortlabel = dol_trunc($object->label,16);
+	if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT))
 	{
-		$head=product_prepare_head($object);
-		$titre=$langs->trans("CardProduct".$object->type);
-		$picto=($object->type==Product::TYPE_SERVICE?'service':'product');
+		$title = $langs->trans('Product')." ". $shortlabel ." - ".$langs->trans('Statistics');
+		$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+	}
+	if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE))
+	{
+		$title = $langs->trans('Service')." ". $shortlabel ." - ".$langs->trans('Statistics');
+		$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+	}
 
-		dol_fiche_head($head, 'stats', $titre, 0, $picto);
+	llxHeader('', $title, $helpurl);
+}
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
+
+if ($result && (! empty($id) || ! empty($ref)))
+{
+	$head=product_prepare_head($object);
+	$titre=$langs->trans("CardProduct".$object->type);
+	$picto=($object->type==Product::TYPE_SERVICE?'service':'product');
+
+	dol_fiche_head($head, 'stats', $titre, -1, $picto);
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
+	
+    dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1);
+
+    dol_fiche_end();
+}
+if (empty($id) & empty($ref))
+{
+    $h=0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/product/stats/card.php'.($type != ''?'?type='.$type:'');
+    $head[$h][1] = $langs->trans("Chart");
+    $head[$h][2] = 'chart';
+    $h++;
+
+	$title = $langs->trans("ListProductServiceByPopularity");
+    if ((string) $type == '1') {
+    	$title = $langs->trans("ListServiceByPopularity");
+    }
+    if ((string) $type == '0') {
+    	$title = $langs->trans("ListProductByPopularity");
+    }
+
+    $head[$h][0] = DOL_URL_ROOT.'/product/popuprop.php'.($type != ''?'?type='.$type:'');
+    $head[$h][1] = $title;
+    $head[$h][2] = 'popularityprop';
+    $h++;
+
+    dol_fiche_head($head, 'chart', $langs->trans("Statistics"), -1);
+}
+
+
+if ($result || empty($id))
+{
+        print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+        print '<input type="hidden" name="id" value="'.$id.'">';
+        
+    	print '<table class="noborder" width="100%">';
+    	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+
+    	if (empty($id))
+    	{
+        	// Type
+    		print '<tr><td class="titlefield">'.$langs->trans("ProductsAndServices").'</td><td>';
+    		$array=array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
+    		print $form->selectarray('type', $array, $type);
+    		print '</td></tr>';
 		
-        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1);
-
-        dol_fiche_end();
-	}
-	if (GETPOST('id') == 'all')
-	{
-        $h=0;
-        $head = array();
-
-        $head[$h][0] = DOL_URL_ROOT.'/product/stats/card.php?id=all';
-        $head[$h][1] = $langs->trans("Chart");
-        $head[$h][2] = 'chart';
-        $h++;
-
-    	$title = $langs->trans("ListProductServiceByPopularity");
-        if ((string) $type == '1') {
-        	$title = $langs->trans("ListServiceByPopularity");
-        }
-        if ((string) $type == '0') {
-        	$title = $langs->trans("ListProductByPopularity");
-        }
-
-        $head[$h][0] = DOL_URL_ROOT.'/product/popuprop.php'.($type != ''?'?type='.$type:'');
-        $head[$h][1] = $title;
-        $head[$h][2] = 'popularityprop';
-        $h++;
-
-        dol_fiche_head($head,'chart',$langs->trans("Statistics"));
-	}
-
-
-	if ($result || GETPOST('id') == 'all')
-	{
-	    if (GETPOST('id') == 'all')
-	    {
-    		// Choice of type of product
-    		if (! empty($conf->dol_use_jmobile)) print "\n".'<div class="fichecenter"><div class="nowrap">'."\n";
-
-    		if ((string) $type != '0') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).'&type=0'.($mode?'&mode='.$mode:'').'">';
-    		else print img_picto('','tick').' ';
-    		print $langs->trans("Products");
-    		if ((string) $type != '0') print '</a>';
-
-    		if (! empty($conf->dol_use_jmobile)) print '</div>'."\n".'<div class="nowrap">'."\n";
-    		else print ' &nbsp; / &nbsp; ';
-
-    		if ((string) $type != '1') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).'&type=1'.($mode?'&mode='.$mode:'').'">';
-    		else print img_picto('','tick').' ';
-    		print $langs->trans("Services");
-    		if ((string) $type != '1') print '</a>';
-
-    		if (! empty($conf->dol_use_jmobile)) print '</div>'."\n".'<div class="nowrap">'."\n";
-    		else print ' &nbsp; / &nbsp; ';
-
-    		if ((string) $type == '0' || (string) $type == '1') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).($mode?'&mode='.$mode:'').'">';
-    		else print img_picto('','tick').' ';
-    		print $langs->trans("ProductsAndServices");
-    		if ((string) $type == '0' || (string) $type == '1') print '</a>';
-
-    		if (! empty($conf->dol_use_jmobile)) print '</div></div>';
-    		else print '<br>';
-    		print '<br>';
-	    }
-
-		// Choice of stats mode (byunit or bynumber)
-		if (! empty($conf->dol_use_jmobile)) print "\n".'<div class="fichecenter"><div class="nowrap">'."\n";
-
-		if ($mode == 'bynumber') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).($type != '' ? '&type='.$type:'').'&mode=byunit">';
-		else print img_picto('','tick').' ';
-		print $langs->trans("StatsByNumberOfUnits");
-		if ($mode == 'bynumber') print '</a>';
-
-		if (! empty($conf->dol_use_jmobile)) print '</div>'."\n".'<div class="nowrap">'."\n";
-		else print ' &nbsp; / &nbsp; ';
-
-		if ($mode == 'byunit') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).($type != '' ? '&type='.$type:'').'&mode=bynumber">';
-		else print img_picto('','tick').' ';
-		print $langs->trans("StatsByNumberOfEntities");
-		if ($mode == 'byunit') print '</a>';
-
-		if (! empty($conf->dol_use_jmobile)) print '</div></div>';
-		else print '<br>';
-		print '<br>';
-
-		//print '<table width="100%">';
-
-		// Generation des graphs
-    	$dir = (! empty($conf->product->multidir_temp[$object->entity])?$conf->product->multidir_temp[$object->entity]:$conf->service->multidir_temp[$object->entity]);
-		if ($object->id > 0)  // We are on statistics for a dedicated product
-		{
-    		if (! file_exists($dir.'/'.$object->id))
+    		// Tag
+    		if ($conf->categorie->enabled)
     		{
-    			if (dol_mkdir($dir.'/'.$object->id) < 0)
-    			{
-    				$mesg = $langs->trans("ErrorCanNotCreateDir",$dir);
-    				$error++;
-    			}
+        		print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
+        		//$moreforfilter.='<div class="divsearchfield">';
+        		$moreforfilter.=$htmlother->select_categories(Categorie::TYPE_PRODUCT,$search_categ,'search_categ',1);
+        		//$moreforfilter.='</div>';
+        		print $moreforfilter;
+        		print '</td></tr>';
     		}
-		}
-
-		if($conf->propal->enabled) {
-			$graphfiles['propal']=array('modulepart'=>'productstats_proposals',
-			'file' => $object->id.'/propal12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
-			'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsProposals"):$langs->transnoentitiesnoconv("NumberOfProposals")));
-		}
-
-		if($conf->supplier_proposal->enabled) {
-			$graphfiles['proposalssuppliers']=array('modulepart'=>'productstats_proposalssuppliers',
-			'file' => $object->id.'/proposalssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
-			'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierProposals"):$langs->transnoentitiesnoconv("NumberOfSupplierProposals")));
-		}
-
-		if($conf->order->enabled) {
-			$graphfiles['orders']=array('modulepart'=>'productstats_orders',
-			'file' => $object->id.'/orders12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
-			'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerOrders"):$langs->transnoentitiesnoconv("NumberOfCustomerOrders")));
-		}
-
-		if($conf->fournisseur->enabled) {
-			$graphfiles['orderssuppliers']=array('modulepart'=>'productstats_orderssuppliers',
-			'file' => $object->id.'/orderssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
-			'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierOrders"):$langs->transnoentitiesnoconv("NumberOfSupplierOrders")));
-		}
-
-		if($conf->facture->enabled) {
-			$graphfiles['invoices']=array('modulepart'=>'productstats_invoices',
-			'file' => $object->id.'/invoices12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
-			'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerInvoices"):$langs->transnoentitiesnoconv("NumberOfCustomerInvoices")));
-
-			$graphfiles['invoicessuppliers']=array('modulepart'=>'productstats_invoicessuppliers',
-			'file' => $object->id.'/invoicessuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
-			'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierInvoices"):$langs->transnoentitiesnoconv("NumberOfSupplierInvoices")));
-		}
-
-		$px = new DolGraph();
-
-		if (! $error && count($graphfiles)>0)
+    	}
+		
+		// Year
+		print '<tr><td class="titlefield">'.$langs->trans("Year").'</td><td>';
+		$arrayyears=array();
+		for ($year = $currentyear - 10; $year < $currentyear + 10 ; $year++)
 		{
-			$mesg = $px->isGraphKo();
-			if (! $mesg)
-			{
-				foreach($graphfiles as $key => $val)
-				{
-					if (! $graphfiles[$key]['file']) continue;
-
-					$graph_data = array();
-
-					if (dol_is_file($dir . '/' . $graphfiles[$key]['file']))
-					{
-    					// TODO Load cachefile $graphfiles[$key]['file']
-					}
-					else
-					{
-    					if ($key == 'propal')             $graph_data = $object->get_nb_propal($socid,$mode,((string) $type != '' ? $type : -1));
-    					if ($key == 'orders')             $graph_data = $object->get_nb_order($socid,$mode,((string) $type != '' ? $type : -1));
-    					if ($key == 'invoices')           $graph_data = $object->get_nb_vente($socid,$mode,((string) $type != '' ? $type : -1));
-    					if ($key == 'proposalssuppliers') $graph_data = $object->get_nb_propalsupplier($socid,$mode,((string) $type != '' ? $type : -1));
-    					if ($key == 'invoicessuppliers')  $graph_data = $object->get_nb_achat($socid,$mode,((string) $type != '' ? $type : -1));
-    					if ($key == 'orderssuppliers')    $graph_data = $object->get_nb_ordersupplier($socid,$mode,((string) $type != '' ? $type : -1));
-
-    					// TODO Save cachefile $graphfiles[$key]['file']
-					}
-
-					if (is_array($graph_data))
-					{
-						$px->SetData($graph_data);
-						$px->SetYLabel($graphfiles[$key]['label']);
-						$px->SetMaxValue($px->GetCeilMaxValue()<0?0:$px->GetCeilMaxValue());
-						$px->SetMinValue($px->GetFloorMinValue()>0?0:$px->GetFloorMinValue());
-						$px->SetWidth($WIDTH);
-						$px->SetHeight($HEIGHT);
-						$px->SetHorizTickIncrement(1);
-						$px->SetPrecisionY(0);
-						$px->SetShading(3);
-						//print 'x '.$key.' '.$graphfiles[$key]['file'];
-
-						$url=DOL_URL_ROOT.'/viewimage.php?modulepart='.$graphfiles[$key]['modulepart'].'&entity='.$object->entity.'&file='.urlencode($graphfiles[$key]['file']);
-						$px->draw($dir."/".$graphfiles[$key]['file'],$url);
-
-						$graphfiles[$key]['output']=$px->show();
-					}
-					else
-					{
-						dol_print_error($db,'Error for calculating graph on key='.$key.' - '.$object->error);
-					}
-				}
-			}
-
-			$mesg = $langs->trans("ChartGenerated");
+		    $arrayyears[$year]=$year;
 		}
+		if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
+		if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+		arsort($arrayyears);
+		print $form->selectarray('search_year',$arrayyears,$search_year,0);
+		print '</td></tr>';
+		print '</table>';
+		print '<div class="center"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></div>';
+		print '</form>';
+		
+		print '<br>';
+    
 
-		// Show graphs
-		$i=0;
-		if ( count($graphfiles)>0)
+	// Choice of stats mode (byunit or bynumber)
+	if (! empty($conf->dol_use_jmobile)) print "\n".'<div class="fichecenter"><div class="nowrap">'."\n";
+
+	if ($mode == 'bynumber') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).($type != '' ? '&type='.$type:'').'&mode=byunit&search_year='.$search_year.'">';
+	else print img_picto('','tick').' ';
+	print $langs->trans("StatsByNumberOfUnits");
+	if ($mode == 'bynumber') print '</a>';
+
+	if (! empty($conf->dol_use_jmobile)) print '</div>'."\n".'<div class="nowrap">'."\n";
+	else print ' &nbsp; / &nbsp; ';
+
+	if ($mode == 'byunit') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).($type != '' ? '&type='.$type:'').'&mode=bynumber&search_year='.$search_year.'">';
+	else print img_picto('','tick').' ';
+	print $langs->trans("StatsByNumberOfEntities");
+	if ($mode == 'byunit') print '</a>';
+
+	if (! empty($conf->dol_use_jmobile)) print '</div></div>';
+	else print '<br>';
+	print '<br>';
+
+	//print '<table width="100%">';
+
+	// Generation des graphs
+	$dir = (! empty($conf->product->multidir_temp[$object->entity])?$conf->product->multidir_temp[$object->entity]:$conf->service->multidir_temp[$object->entity]);
+	if ($object->id > 0)  // We are on statistics for a dedicated product
+	{
+		if (! file_exists($dir.'/'.$object->id))
+		{
+			if (dol_mkdir($dir.'/'.$object->id) < 0)
+			{
+				$mesg = $langs->trans("ErrorCanNotCreateDir",$dir);
+				$error++;
+			}
+		}
+	}
+
+	if($conf->propal->enabled) {
+		$graphfiles['propal']=array('modulepart'=>'productstats_proposals',
+		'file' => $object->id.'/propal12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year?'_year'.$search_year:'').'.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsProposals"):$langs->transnoentitiesnoconv("NumberOfProposals")));
+	}
+
+	if($conf->supplier_proposal->enabled) {
+		$graphfiles['proposalssuppliers']=array('modulepart'=>'productstats_proposalssuppliers',
+		'file' => $object->id.'/proposalssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year?'_year'.$search_year:'').'.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierProposals"):$langs->transnoentitiesnoconv("NumberOfSupplierProposals")));
+	}
+
+	if($conf->order->enabled) {
+		$graphfiles['orders']=array('modulepart'=>'productstats_orders',
+		'file' => $object->id.'/orders12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year?'_year'.$search_year:'').'.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerOrders"):$langs->transnoentitiesnoconv("NumberOfCustomerOrders")));
+	}
+
+	if($conf->fournisseur->enabled) {
+		$graphfiles['orderssuppliers']=array('modulepart'=>'productstats_orderssuppliers',
+		'file' => $object->id.'/orderssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year?'_year'.$search_year:'').'.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierOrders"):$langs->transnoentitiesnoconv("NumberOfSupplierOrders")));
+	}
+
+	if($conf->facture->enabled) {
+		$graphfiles['invoices']=array('modulepart'=>'productstats_invoices',
+		'file' => $object->id.'/invoices12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year?'_year'.$search_year:'').'.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerInvoices"):$langs->transnoentitiesnoconv("NumberOfCustomerInvoices")));
+
+		$graphfiles['invoicessuppliers']=array('modulepart'=>'productstats_invoicessuppliers',
+		'file' => $object->id.'/invoicessuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year?'_year'.$search_year:'').'.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierInvoices"):$langs->transnoentitiesnoconv("NumberOfSupplierInvoices")));
+	}
+
+	$px = new DolGraph();
+
+	if (! $error && count($graphfiles)>0)
+	{
+		$mesg = $px->isGraphKo();
+		if (! $mesg)
 		{
 			foreach($graphfiles as $key => $val)
 			{
 				if (! $graphfiles[$key]['file']) continue;
-	
-				if ($graphfiles == 'propal' && ! $user->rights->propale->lire) continue;
-				if ($graphfiles == 'order' && ! $user->rights->commande->lire) continue;
-				if ($graphfiles == 'invoices' && ! $user->rights->facture->lire) continue;
-				if ($graphfiles == 'proposals_suppliers' && ! $user->rights->supplier_proposal->lire) continue;
-				if ($graphfiles == 'invoices_suppliers' && ! $user->rights->fournisseur->facture->lire) continue;
-				if ($graphfiles == 'orders_suppliers' && ! $user->rights->fournisseur->commande->lire) continue;
-	
-	
-				if ($i % 2 == 0)
+
+				$graph_data = array();
+
+				if (dol_is_file($dir . '/' . $graphfiles[$key]['file']))
 				{
-					print "\n".'<div class="fichecenter"><div class="fichehalfleft">'."\n";
+					// TODO Load cachefile $graphfiles[$key]['file']
 				}
 				else
 				{
-					print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
+				    $morefilters='';
+				    if ($search_categ > 0) 
+				    {
+				        $categ=new Categorie($db);
+				        $categ->fetch($search_categ);
+				        $listofprodids = $categ->getObjectsInCateg('product', 1);
+				        $morefilters=' AND d.fk_product IN ('.((is_array($listofprodids) && count($listofprodids)) ? join(',',$listofprodids):'0').')';
+				    }
+				    if ($search_categ == -2)
+				    {
+				        $morefilters=' AND d.fk_product NOT IN (SELECT cp.fk_product from '.MAIN_DB_PREFIX.'categorie_product as cp)';
+				    }
+				    
+					if ($key == 'propal')             $graph_data = $object->get_nb_propal($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
+					if ($key == 'orders')             $graph_data = $object->get_nb_order($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
+					if ($key == 'invoices')           $graph_data = $object->get_nb_vente($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
+					if ($key == 'proposalssuppliers') $graph_data = $object->get_nb_propalsupplier($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
+					if ($key == 'invoicessuppliers')  $graph_data = $object->get_nb_achat($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
+					if ($key == 'orderssuppliers')    $graph_data = $object->get_nb_ordersupplier($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
+
+					// TODO Save cachefile $graphfiles[$key]['file']
 				}
-	
-				// Date generation
-				if ($graphfiles[$key]['output'] && ! $px->isGraphKo())
+
+				if (is_array($graph_data))
 				{
-				    if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) $dategenerated=$langs->trans("GeneratedOn",dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"dayhour"));
-				    else $dategenerated=$langs->trans("GeneratedOn",dol_print_date(dol_now(),"dayhour"));
+					$px->SetData($graph_data);
+					$px->SetYLabel($graphfiles[$key]['label']);
+					$px->SetMaxValue($px->GetCeilMaxValue()<0?0:$px->GetCeilMaxValue());
+					$px->SetMinValue($px->GetFloorMinValue()>0?0:$px->GetFloorMinValue());
+					$px->SetWidth($WIDTH);
+					$px->SetHeight($HEIGHT);
+					$px->SetHorizTickIncrement(1);
+					$px->SetPrecisionY(0);
+					$px->SetShading(3);
+					//print 'x '.$key.' '.$graphfiles[$key]['file'];
+
+					$url=DOL_URL_ROOT.'/viewimage.php?modulepart='.$graphfiles[$key]['modulepart'].'&entity='.$object->entity.'&file='.urlencode($graphfiles[$key]['file']);
+					$px->draw($dir."/".$graphfiles[$key]['file'],$url);
+
+					$graphfiles[$key]['output']=$px->show();
 				}
 				else
 				{
-				    print $dategenerated=($mesg?'<font class="error">'.$mesg.'</font>':$langs->trans("ChartNotGenerated"));
+					dol_print_error($db,'Error for calculating graph on key='.$key.' - '.$object->error);
 				}
-				$linktoregenerate='<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).((string) $type != ''?'&amp;type='.$type:'').'&amp;action=recalcul&amp;mode='.$mode.'">'.img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')','refresh').'</a>';
-				
-				// Show graph
-				print '<table class="noborder" width="100%">';
-				// Label
-				print '<tr class="liste_titre"><td>';
-				print $graphfiles[$key]['label'];
-				print '</td>';
-				print '<td align="right">'.$linktoregenerate.'</td>';
-				print '</tr>';
-				// Image
-				print '<tr class="impair"><td colspan="2" class="nohover" align="center">';
-				print $graphfiles[$key]['output'];
-				print '</td></tr>';
-				print '</table>';
-	
-				if ($i % 2 == 0)
-				{
-					print "\n".'</div>'."\n";
-				}
-				else
-				{
-					print "\n".'</div></div></div>';
-					print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
-				}
-	
-				$i++;
 			}
 		}
-		// div not closed
-		if ($i % 2 == 1)
-		{
-			print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
-			print "\n".'</div></div></div>';
-			print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
-		}
+
+		$mesg = $langs->trans("ChartGenerated");
 	}
 
-	if (GETPOST('id') == 'all')
+	// Show graphs
+	$i=0;
+	if ( count($graphfiles)>0)
 	{
-	    dol_fiche_end();
+		foreach($graphfiles as $key => $val)
+		{
+			if (! $graphfiles[$key]['file']) continue;
+
+			if ($graphfiles == 'propal' && ! $user->rights->propale->lire) continue;
+			if ($graphfiles == 'order' && ! $user->rights->commande->lire) continue;
+			if ($graphfiles == 'invoices' && ! $user->rights->facture->lire) continue;
+			if ($graphfiles == 'proposals_suppliers' && ! $user->rights->supplier_proposal->lire) continue;
+			if ($graphfiles == 'invoices_suppliers' && ! $user->rights->fournisseur->facture->lire) continue;
+			if ($graphfiles == 'orders_suppliers' && ! $user->rights->fournisseur->commande->lire) continue;
+
+
+			if ($i % 2 == 0)
+			{
+				print "\n".'<div class="fichecenter"><div class="fichehalfleft">'."\n";
+			}
+			else
+			{
+				print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
+			}
+
+			// Date generation
+			if ($graphfiles[$key]['output'] && ! $px->isGraphKo())
+			{
+			    if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) $dategenerated=$langs->trans("GeneratedOn",dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"dayhour"));
+			    else $dategenerated=$langs->trans("GeneratedOn",dol_print_date(dol_now(),"dayhour"));
+			}
+			else
+			{
+			    print $dategenerated=($mesg?'<font class="error">'.$mesg.'</font>':$langs->trans("ChartNotGenerated"));
+			}
+			$linktoregenerate='<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).((string) $type != ''?'&type='.$type:'').'&action=recalcul&mode='.$mode.'&search_year='.$search_year.'&search_categ='.$search_categ.'">'.img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')','refresh').'</a>';
+			
+			// Show graph
+			print '<table class="noborder" width="100%">';
+			// Label
+			print '<tr class="liste_titre"><td>';
+			print $graphfiles[$key]['label'];
+			print '</td>';
+			print '<td align="right">'.$linktoregenerate.'</td>';
+			print '</tr>';
+			// Image
+			print '<tr class="impair"><td colspan="2" class="nohover" align="center">';
+			print $graphfiles[$key]['output'];
+			print '</td></tr>';
+			print '</table>';
+
+			if ($i % 2 == 0)
+			{
+				print "\n".'</div>'."\n";
+			}
+			else
+			{
+				print "\n".'</div></div></div>';
+				print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
+			}
+
+			$i++;
+		}
+	}
+	// div not closed
+	if ($i % 2 == 1)
+	{
+		print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
+		print "\n".'</div></div></div>';
+		print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
 	}
 }
-else
+
+if (! $id)
 {
-	dol_print_error();
+    dol_fiche_end();
 }
 
 llxFooter();
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 341d002a1af..1c72d5f6615 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -94,7 +94,7 @@ if ($id > 0 || ! empty($ref))
 		$head=product_prepare_head($product);
 		$titre=$langs->trans("CardProduct".$product->type);
 		$picto=($product->type==Product::TYPE_SERVICE?'service':'product');
-		dol_fiche_head($head, 'referers', $titre, 0, $picto);
+		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index bed3be1892f..3201e7ed2e8 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -101,7 +101,7 @@ if ($id > 0 || ! empty($ref)) {
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct" . $product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, 0, $picto);
+		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0)
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 6a8183ca7de..e2f5bccc430 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -84,7 +84,7 @@ if ($id > 0 || ! empty($ref))
 		$head=product_prepare_head($product);
 		$titre=$langs->trans("CardProduct".$product->type);
 		$picto=($product->type==Product::TYPE_SERVICE?'service':'product');
-		dol_fiche_head($head, 'referers', $titre, 0, $picto);
+		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index f0e5b0f13c4..506689a6001 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -111,7 +111,7 @@ if ($id > 0 || ! empty($ref))
 		$head=product_prepare_head($product);
 		$titre=$langs->trans("CardProduct".$product->type);
 		$picto=($product->type==Product::TYPE_SERVICE?'service':'product');
-		dol_fiche_head($head, 'referers', $titre, 0, $picto);
+		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 6fe189c7700..ac2849fefcf 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -96,7 +96,7 @@ if ($id > 0 || ! empty($ref))
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct" . $product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, 0, $picto);
+		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 289cf3d3578..06d43838bce 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -94,7 +94,7 @@ if ($id > 0 || ! empty($ref))
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct" . $product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, 0, $picto);
+		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

From 2b9f654b8cb4837a0c499ce6203c3d65b6e6c6d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 May 2017 15:31:05 +0200
Subject: [PATCH 0916/1163] Fix translation

---
 htdocs/langs/en_US/other.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 02fa209c340..280a1666b02 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -158,8 +158,8 @@ AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br /
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
 ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
+StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of customer orders
 NumberOfCustomerInvoices=Number of customer invoices

From 0cd030d856357497860b1f64dd86399738afc65b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 00:13:07 +0200
Subject: [PATCH 0917/1163] NEW Introduce mass actions on contacts

---
 htdocs/contact/list.php | 105 +++++++++++++++++++++++++++-------------
 htdocs/main.inc.php     |   2 +-
 htdocs/societe/list.php |  10 ++--
 3 files changed, 79 insertions(+), 38 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index fc601cf8a53..39557a6e455 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -32,8 +32,13 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
-$langs->load("companies");
-$langs->load("suppliers");
+$langs->loadLangs(array("companies", "suppliers"));
+
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
 
 // Security check
 $id = GETPOST('id','int');
@@ -177,7 +182,7 @@ if (empty($reshook))
     // Selection of new fields
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
+    // Did we click on purge search criteria ?
     if (GETPOST('button_removefilter_x') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter'))	// All tests are required to be compatible with all browsers
     {
         $sall="";
@@ -198,6 +203,7 @@ if (empty($reshook))
         $search_categ='';
         $search_categ_thirdparty='';
         $search_categ_supplier='';
+        $toselect='';
         $search_array_options=array();
     }
 
@@ -205,7 +211,7 @@ if (empty($reshook))
     $objectclass='Contact';
     $objectlabel='Contact';
     $permtoread = $user->rights->societe->lire;
-    $permtodelete = $user->rights->societe->delete;
+    $permtodelete = $user->rights->societe->supprimer;
     $uploaddir = $conf->societe->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -224,7 +230,7 @@ $contactstatic=new Contact($db);
 $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 
 $sql = "SELECT s.rowid as socid, s.nom as name,";
-$sql.= " p.rowid as cidp, p.lastname as lastname, p.statut, p.firstname, p.zip, p.town, p.poste, p.email, p.skype,";
+$sql.= " p.rowid, p.lastname as lastname, p.statut, p.firstname, p.zip, p.town, p.poste, p.email, p.skype,";
 $sql.= " p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.fk_pays, p.priv, p.datec as date_creation, p.tms as date_update,";
 $sql.= " co.code as country_code";
 // Add fields from extrafields
@@ -374,8 +380,6 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 
 $sql.= $db->plimit($limit+1, $offset);
 
-//print $sql;
-dol_syslog("contact/list.php", LOG_DEBUG);
 $result = $db->query($sql);
 if (! $result)
 {
@@ -385,15 +389,18 @@ if (! $result)
 
 $num = $db->num_rows($result);
 
+$arrayofselected=is_array($toselect)?$toselect:array();
+
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
 {
     $obj = $db->fetch_object($resql);
-    $id = $obj->cidp;
+    $id = $obj->rowid;
     header("Location: ".DOL_URL_ROOT.'/contact/card.php?id='.$id);
     exit;
 }
 
-llxHeader('',$title,'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas');
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas';
+llxHeader('',$title,$help_url);
 
 $param='';
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
@@ -426,16 +433,26 @@ foreach ($search_array_options as $key => $val)
     if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 }
 
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+// List of mass actions available
+$arrayofmassactions =  array(
+//    'presend'=>$langs->trans("SendByMail"),
+//    'builddoc'=>$langs->trans("PDFMerge"),
+);
+//if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
+if ($user->rights->societe->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+if ($massaction == 'presend') $arrayofmassactions=array();
+$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 
-print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit);
+print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit);
 
 if ($sall)
 {
@@ -447,6 +464,7 @@ if ($search_firstlast_only)
     print $langs->trans("FilterOnInto", $search_firstlast_only) . $langs->trans("Lastname").", ".$langs->trans("Firstname");
 }
 
+$moreforfilter='';
 if (! empty($conf->categorie->enabled))
 {
 	require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
@@ -483,6 +501,7 @@ if ($moreforfilter)
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -575,7 +594,18 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
    {
 		if (! empty($arrayfields["ef.".$key]['checked']))
 		{
-			print '<td class="liste_titre">';
+            $align=$extrafields->getAlignFlag($key);
+            $typeofextrafield=$extrafields->attribute_type[$key];
+            print '<td class="liste_titre'.($align?' '.$align:'').'">';
+		    if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+			{
+			    $crit=$val;
+				$tmpkey=preg_replace('/search_options_/','',$key);
+				$searchclass='';
+				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+			}
 			print '</td>';
 		}
    }
@@ -596,15 +626,17 @@ if (! empty($arrayfields['p.tms']['checked']))
     print '<td class="liste_titre">';
     print '</td>';
 }
+// Status
 if (! empty($arrayfields['p.statut']['checked']))
 {
     print '<td class="liste_titre" align="center">';
     print $form->selectarray('search_status', array('-1'=>'', '0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
     print '</td>';
 }
+// Action column
 print '<td class="liste_titre" align="right">';
-print '<input type="image" name="button_search" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-print '<input type="image" name="button_removefilter" class="liste_titre" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+$searchpicto=$form->showFilterButtons();
+print $searchpicto;
 print '</td>';
 
 print '</tr>';
@@ -656,7 +688,7 @@ while ($i < min($num,$limit))
 
 	$contactstatic->lastname=$obj->lastname;
 	$contactstatic->firstname='';
-	$contactstatic->id=$obj->cidp;
+	$contactstatic->id=$obj->rowid;
 	$contactstatic->statut=$obj->statut;
 	$contactstatic->poste=$obj->poste;
 	$contactstatic->email=$obj->email;
@@ -696,32 +728,32 @@ while ($i < min($num,$limit))
     // Phone
     if (! empty($arrayfields['p.phone']['checked']))
     {
-        print '<td>'.dol_print_phone($obj->phone_pro,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
+        print '<td>'.dol_print_phone($obj->phone_pro,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
     }
     // Phone perso
     if (! empty($arrayfields['p.phone_perso']['checked']))
     {
-        print '<td>'.dol_print_phone($obj->phone_perso,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
+        print '<td>'.dol_print_phone($obj->phone_perso,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
     }
     // Phone mobile
     if (! empty($arrayfields['p.phone_mobile']['checked']))
     {
-        print '<td>'.dol_print_phone($obj->phone_mobile,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
+        print '<td>'.dol_print_phone($obj->phone_mobile,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
     }
     // Fax
     if (! empty($arrayfields['p.fax']['checked']))
     {
-        print '<td>'.dol_print_phone($obj->fax,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
+        print '<td>'.dol_print_phone($obj->fax,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
     }
     // EMail
     if (! empty($arrayfields['p.email']['checked']))
     {
-        print '<td>'.dol_print_email($obj->email,$obj->cidp,$obj->socid,'AC_EMAIL',18).'</td>';
+        print '<td>'.dol_print_email($obj->email,$obj->rowid,$obj->socid,'AC_EMAIL',18).'</td>';
     }
     // Skype
     if (! empty($arrayfields['p.skype']['checked']))
     {
-        if (! empty($conf->skype->enabled)) { print '<td>'.dol_print_skype($obj->skype,$obj->cidp,$obj->socid,'AC_SKYPE',18).'</td>'; }
+        if (! empty($conf->skype->enabled)) { print '<td>'.dol_print_skype($obj->skype,$obj->rowid,$obj->socid,'AC_SKYPE',18).'</td>'; }
     }
     // Company
     if (! empty($arrayfields['p.thirdparty']['checked']))
@@ -784,28 +816,35 @@ while ($i < min($num,$limit))
     {
         print '<td align="center">'.$contactstatic->getLibStatut(3).'</td>';
     }
-    // Action column - Links Add action and Export vcard
-    print '<td class="center">';
-    /*print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;contactid='.$obj->cidp.'&amp;socid='.$obj->socid.'">'.img_object($langs->trans("AddAction"),"action").'</a>';
-    print ' &nbsp; ';
-    print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$obj->cidp.'">';
-    print img_picto($langs->trans("VCard"),'vcard.png').' ';
-    print '</a>'; */
-    print '</td>';
 
+   // Action column
+    print '<td class="nowrap" align="center">';
+    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+    {
+        $selected=0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    }
+    print '</td>';
+    if (! $i) $totalarray['nbfield']++;
+    
     print "</tr>\n";
     $i++;
 }
 
+$db->free($result);
+
+$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
 print "</table>";
 print "</div>";
 
-if ($num > $limit || $page) print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit, 1);
+//if ($num > $limit || $page) print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit, 1);
 
 print '</form>';
 
-$db->free($result);
-
 
 llxFooter();
 $db->close();
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 73f0a815413..e674aea6d5c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -859,7 +859,7 @@ if (! defined('NOLOGIN'))
 }
 
 
-dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]);
+dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.GETPOST('action','az09').', massaction='.GETPOST('massaction','az09'));
 //Another call for easy debugg
 //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 40ca07783c4..48e1b67a69c 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -187,6 +187,8 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
    }
 }
 
+$object = new Societe($db);
+
 
 /*
  * Actions
@@ -196,7 +198,7 @@ if (GETPOST('cancel')) { $action='list'; $massaction=''; }
 if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
 
 $parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters);    // Note that $action and $object may have been modified by some hooks
+$reshook=$hookmanager->executeHooks('doActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
@@ -204,7 +206,7 @@ if (empty($reshook))
     // Selection of new fields
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Do we click on purge search criteria ?
+    // Did we click on purge search criteria ?
     if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
         $search_nom='';
@@ -603,7 +605,7 @@ if ($user->rights->societe->client->voir || $socid)
 	$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user, 0, 1, 'maxwidth300');
 	$moreforfilter.='</div>';
 }
-if (! empty($moreforfilter))
+if ($moreforfilter)
 {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
@@ -905,7 +907,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }

From 2da50f1eca2aa36fb56f540e93c8e0068e6b7417 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 01:32:19 +0200
Subject: [PATCH 0918/1163] Look and feel v6

---
 htdocs/comm/card.php        |  2 +-
 htdocs/contact/agenda.php   |  2 +-
 htdocs/contact/card.php     |  2 +-
 htdocs/contact/document.php |  2 +-
 htdocs/contact/info.php     |  2 +-
 htdocs/contact/ldap.php     |  2 +-
 htdocs/contact/note.php     | 50 +------------------------------------
 htdocs/contact/perso.php    |  2 +-
 htdocs/fourn/card.php       |  2 +-
 htdocs/societe/card.php     |  8 +++---
 10 files changed, 14 insertions(+), 60 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index b26ce4fa7ac..7599cce4cfd 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -204,7 +204,7 @@ if ($id > 0)
 {
 	$head = societe_prepare_head($object);
 
-	dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), -1, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
 	
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index e97263ebf00..f57e088e00e 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -208,7 +208,7 @@ else
 
         dol_htmloutput_errors($error,$errors);
 
-        dol_fiche_head($head, 'agenda', $title, 0, 'contact');
+        dol_fiche_head($head, 'agenda', $title, -1, 'contact');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
         
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index dfa6eec515c..fde2e428169 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1021,7 +1021,7 @@ else
 
         dol_htmloutput_errors($error,$errors);
 
-        dol_fiche_head($head, 'card', $title, 0, 'contact');
+        dol_fiche_head($head, 'card', $title, -1, 'contact');
 
         if ($action == 'create_user')
         {
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 5d70ba7b4e1..da8ef616a4f 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -96,7 +96,7 @@ if ($object->id)
     $head = contact_prepare_head($object);
 	$title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 
-    dol_fiche_head($head, 'documents', $title, 0, 'contact');
+    dol_fiche_head($head, 'documents', $title, -1, 'contact');
 
 
     // Construit liste des fichiers
diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php
index 0250691e88d..20d379b50d0 100644
--- a/htdocs/contact/info.php
+++ b/htdocs/contact/info.php
@@ -59,7 +59,7 @@ if ($id > 0)
 
 	$head = contact_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $title, 0, 'contact');
+	dol_fiche_head($head, 'info', $title, -1, 'contact');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 3e998b43ec5..16c00bf92cb 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -88,7 +88,7 @@ $form = new Form($db);
 
 $head = contact_prepare_head($object);
 
-dol_fiche_head($head, 'ldap', $title, 0, 'contact');
+dol_fiche_head($head, 'ldap', $title, -1, 'contact');
 
 dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '');
     
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index c49dbc9f787..b52f9bf8727 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -73,7 +73,7 @@ if ($id > 0)
 
     $head = contact_prepare_head($object);
 
-    dol_fiche_head($head, 'note', $title,0,'contact');
+    dol_fiche_head($head, 'note', $title, -1, 'contact');
     
     $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
 
@@ -100,61 +100,13 @@ if ($id > 0)
 
 	print '<table class="border centpercent">';
 
-    // Company
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-    {
-    	if ($object->socid > 0)
-    	{
-    		$objsoc = new Societe($db);
-    		$objsoc->fetch($object->socid);
-
-    		print '<tr><td class="'.$cssclass.'">'.$langs->trans("ThirdParty").'</td><td>'.$objsoc->getNomUrl(1).'</td></tr>';
-    	}
-
-    	else
-    	{
-    		print '<tr><td class="'.$cssclass.'">'.$langs->trans("ThirdParty").'</td><td>';
-    		print $langs->trans("ContactNotLinkedToCompany");
-    		print '</td></tr>';
-    	}
-    }
-
     // Civility
     print '<tr><td class="'.$cssclass.'">'.$langs->trans("UserTitle").'</td><td>';
     print $object->getCivilityLabel();
     print '</td></tr>';
 
-    // Date To Birth
-    print '<tr>';
-    if (! empty($object->birthday))
-    {
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-
-    	print '<td>'.$langs->trans("DateToBirth").'</td><td>'.dol_print_date($object->birthday,"day");
-
-    	print ' &nbsp; ';
-    	//var_dump($birthdatearray);
-    	$ageyear=convertSecondToTime($now-$object->birthday,'year')-1970;
-    	$agemonth=convertSecondToTime($now-$object->birthday,'month')-1;
-    	if ($ageyear >= 2) print '('.$ageyear.' '.$langs->trans("DurationYears").')';
-    	else if ($agemonth >= 2) print '('.$agemonth.' '.$langs->trans("DurationMonths").')';
-    	else print '('.$agemonth.' '.$langs->trans("DurationMonth").')';
-
-
-    	print ' &nbsp; - &nbsp; ';
-    	if ($object->birthday_alert) print $langs->trans("BirthdayAlertOn");
-    	else print $langs->trans("BirthdayAlertOff");
-    	print '</td>';
-    }
-    else
-    {
-    	print '<td>'.$langs->trans("DateToBirth").'</td><td>'.$langs->trans("Unknown")."</td>";
-    }
-    print "</tr>";
-
     print "</table>";
 
-    print '<br>';
     
 	$cssclass="titlefield";
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index bc4443dd8bf..30fa10b5ddc 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -229,7 +229,7 @@ else
 {
     // View mode
     
-    dol_fiche_head($head, 'perso', $title, 0, 'contact');
+    dol_fiche_head($head, 'perso', $title, -1, 'contact');
     
     $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
     
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 6243a9e3a16..cfa88b187f0 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -130,7 +130,7 @@ if ($object->id > 0)
 	 */
 	$head = societe_prepare_head($object);
 
-	dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), -1, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
 	
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 14e8e4b4679..346f4ea38dc 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1544,7 +1544,7 @@ else
 
             dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
-
+            print '<div class="fichecenter2">'; 
             print '<table class="border" width="100%">';
 
             // Ref/ID
@@ -1934,7 +1934,8 @@ else
             print '</tr>';
 
             print '</table>';
-
+            print '</div>';
+            
 	        dol_fiche_end();
 
             print '<div align="center">';
@@ -1951,13 +1952,14 @@ else
         /*
          * View
          */
+        
         if (!empty($object->id)) $res=$object->fetch_optionals($object->id,$extralabels);
         //if ($res < 0) { dol_print_error($db); exit; }
 
 
         $head = societe_prepare_head($object);
 
-        dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
+        dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), -1, 'company');
 
         // Confirm delete third party
         if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)))

From 71bd69a8048c2d16d10d31d9cb5c996e730e1864 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 13:25:12 +0200
Subject: [PATCH 0919/1163] Better link to show part to edit

---
 htdocs/api/admin/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index d7f002d02aa..c22a12fee61 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -111,7 +111,7 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain
 
 // Show message
 $message='';
-$url='<a href="'.$urlwithroot.'/api/index.php/login?login='.urlencode($user->login).'&password=yourpassword" target="_blank">'.$urlwithroot.'/api/index.php/login?login='.urlencode($user->login).'&password=yourpassword[&reset=1]</a>';
+$url=$urlwithroot.'/api/index.php/login?login=<strong>auserlogin</strong>&userpassword=<strong>thepassword</strong>[&reset=1]';
 $message.=$langs->trans("UrlToGetKeyToUseAPIs").':<br>';
 $message.=img_picto('','object_globe.png').' '.$url;
 print $message;

From 5ebe71166567ac84835d9b87b0a8f8eb93fefa28 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 13:38:48 +0200
Subject: [PATCH 0920/1163] Look and feel v6

---
 htdocs/resource/card.php                    | 39 +++++++++++-----
 htdocs/resource/class/dolresource.class.php | 51 ++++++++++++++++-----
 htdocs/resource/contact.php                 | 31 ++++++++-----
 htdocs/resource/document.php                | 28 +++++++----
 htdocs/resource/note.php                    | 29 ++++++++----
 5 files changed, 125 insertions(+), 53 deletions(-)

diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index d2ec14efd71..7f0a96a7ab4 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -221,29 +221,41 @@ if ( $object->fetch($id) > 0 )
 	}
 	else
 	{
-		dol_fiche_head($head, 'resource', $langs->trans("ResourceSingular"),0,'resource');
+		dol_fiche_head($head, 'resource', $langs->trans("ResourceSingular"), -1, 'resource');
 
+		$formconfirm = '';
+		
 		// Confirm deleting resource line
 	    if ($action == 'delete')
 	    {
-	        print $form->formconfirm("card.php?&id=".$id,$langs->trans("DeleteResource"),$langs->trans("ConfirmDeleteResource"),"confirm_delete_resource",'','',1);
+	        $formconfirm = $form->formconfirm("card.php?&id=".$id,$langs->trans("DeleteResource"),$langs->trans("ConfirmDeleteResource"),"confirm_delete_resource",'','',1);
 	    }
 
-
+	    // Print form confirm
+	    print $formconfirm;
+	    
+	    
+	    $linkback = '<a href="' . DOL_URL_ROOT . '/resource/list.php' . (! empty($socid) ? '?id=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	    
+	    
+	    $morehtmlref='<div class="refidno">';
+	    $morehtmlref.='</div>';
+	    
+	    
+	    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	    
+	    
+	    print '<div class="fichecenter">';
+	    print '<div class="underbanner clearboth"></div>';
+	    
 		/*---------------------------------------
 		 * View object
 		 */
 		print '<table width="100%" class="border">';
 
-		print '<tr><td class="titlefield">'.$langs->trans("ResourceFormLabel_ref").'</td><td>';
-		$linkback = $objet->ref.' <a href="list.php">'.$langs->trans("BackToList").'</a>';
-		print $form->showrefnav($object, 'id', $linkback,1,"rowid");
-		print '</td>';
-		print '</tr>';
-
 		// Resource type
 		print '<tr>';
-		print '<td>' . $langs->trans("ResourceType") . '</td>';
+		print '<td class="titlefield">' . $langs->trans("ResourceType") . '</td>';
 		print '<td>';
 		print $object->type_label;
 		print '</td>';
@@ -267,9 +279,14 @@ if ( $object->fetch($id) > 0 )
 		print '</tr>';
 
 		print '</table>';
+		
+		print '</div>';
+		
+		print '<div class="clearboth"></div><br>';
+		
+		dol_fiche_end();
 	}
 
-	print '</div>';
 
 	/*
 	 * Boutons actions
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 6e418e2e649..51024cfe7ee 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -30,18 +30,19 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php";
  */
 class Dolresource extends CommonObject
 {
-	var $element='dolresource';			//!< Id that identify managed objects
-	var $table_element='resource';	//!< Name of table without prefix where object is stored
-
-	var $resource_id;
-	var $resource_type;
-	var $element_id;
-	var $element_type;
-	var $busy;
-	var $mandatory;
-	var $fk_user_create;
-	var $type_label;
-	var $tms='';
+	public $element='dolresource';			//!< Id that identify managed objects
+	public $table_element='resource';	//!< Name of table without prefix where object is stored
+    public $picto = 'resource';
+    
+	public $resource_id;
+	public $resource_type;
+	public $element_id;
+	public $element_type;
+	public $busy;
+	public $mandatory;
+	public $fk_user_create;
+	public $type_label;
+	public $tms='';
 
     /**
      *  Constructor
@@ -974,4 +975,30 @@ class Dolresource extends CommonObject
         $result.=$link.$this->ref.$linkend;
         return $result;
     }
+    
+    
+    /**
+     *  Retourne le libelle du status d'un user (actif, inactif)
+     *
+     *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *  @return	string 			       Label of status
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->status,$mode);
+    }
+    
+    /**
+     *  Return the status
+     *
+     *  @param	int		$status        	Id status
+     *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
+     *  @return string 			       	Label of status
+     */
+    static function LibStatut($status,$mode=0)
+    {
+        global $langs;
+    
+        return '';
+    }    
 }
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index 97dbb0de1be..007ecd8025d 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -119,23 +119,30 @@ if ($id > 0 || ! empty($ref))
 
 
 	$head = resource_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("ResourceSingular"), 0, 'resource');
+	dol_fiche_head($head, 'contact', $langs->trans("ResourceSingular"), -1, 'resource');
 
 
-	/*
-	*   Resource synthese pour rappel
-	*/
+	$linkback = '<a href="' . DOL_URL_ROOT . '/resource/list.php' . (! empty($socid) ? '?id=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	 
+	 
+	$morehtmlref='<div class="refidno">';
+	$morehtmlref.='</div>';
+	 
+	 
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	 
+	 
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+	 
+	
+	// Object
+
 	print '<table width="100%" class="border">';
 
-	print '<tr><td class="titlefield">'.$langs->trans("ResourceFormLabel_ref").'</td><td>';
-	$linkback = $objet->ref.' <a href="list.php">'.$langs->trans("BackToList").'</a>';
-	print $form->showrefnav($object, 'id', $linkback,1,"rowid");
-	print '</td>';
-	print '</tr>';
-
 	// Resource type
 	print '<tr>';
-	print '<td>' . $langs->trans("ResourceType") . '</td>';
+	print '<td class="titlefield">' . $langs->trans("ResourceType") . '</td>';
 	print '<td>';
 	print $object->type_label;
 	print '</td>';
@@ -144,6 +151,8 @@ if ($id > 0 || ! empty($ref))
 	print '</table>';
 	print '</div>';
 
+	dol_fiche_end();
+	
 	print '<br>';
 
 	if (! empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER))     $hideaddcontactforuser=1;
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 1078e8bb94a..2d8e260d85a 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -89,7 +89,7 @@ if ($object->id)
 
 	$head=resource_prepare_head($object);
 
-	dol_fiche_head($head, 'documents',  $langs->trans("ResourceSingular"), 0, 'resource');
+	dol_fiche_head($head, 'documents',  $langs->trans("ResourceSingular"), -1, 'resource');
 
 
 	// Construit liste des fichiers
@@ -100,19 +100,25 @@ if ($object->id)
 		$totalsize+=$file['size'];
 	}
 
-
+	
+	$linkback = '<a href="' . DOL_URL_ROOT . '/resource/list.php' . (! empty($socid) ? '?id=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	 
+	 
+	$morehtmlref='<div class="refidno">';
+	$morehtmlref.='</div>';
+	 
+	 
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	 
+	 
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+	 
     print '<table class="border" width="100%">';
 
-
-	print '<tr><td class="titlefield">'.$langs->trans("ResourceFormLabel_ref").'</td><td>';
-	$linkback = $objet->ref.' <a href="list.php">'.$langs->trans("BackToList").'</a>';
-	print $form->showrefnav($object, 'id', $linkback,1,"rowid");
-	print '</td>';
-	print '</tr>';
-
 	// Resource type
 	print '<tr>';
-	print '<td>' . $langs->trans("ResourceType") . '</td>';
+	print '<td class="titlefield">' . $langs->trans("ResourceType") . '</td>';
 	print '<td>';
 	print $object->type_label;
 	print '</td>';
@@ -124,6 +130,8 @@ if ($object->id)
 
     print '</div>';
 
+    dol_fiche_end();
+    
     $modulepart = 'dolresource';
     $permission = $user->rights->resource->write;
     $param = '&id=' . $object->id;
diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index 30e37eba77f..20d96591c7b 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -64,24 +64,35 @@ $form = new Form($db);
 if ($id > 0 || ! empty($ref))
 {
 	$head = resource_prepare_head($object);
-	dol_fiche_head($head, 'note', $langs->trans('ResourceSingular'), 0, 'resource');
+	dol_fiche_head($head, 'note', $langs->trans('ResourceSingular'), -1, 'resource');
 
+	$linkback = '<a href="' . DOL_URL_ROOT . '/resource/list.php' . (! empty($socid) ? '?id=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	 
+	 
+	$morehtmlref='<div class="refidno">';
+	$morehtmlref.='</div>';
+	 
+	 
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	 
+	 
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+	 
 	print '<table class="border" width="100%">';
-	print '<tr><td class="titlefield">'.$langs->trans("ResourceFormLabel_ref").'</td><td>';
-	$linkback = $objet->ref.' <a href="list.php">'.$langs->trans("BackToList").'</a>';
-	print $form->showrefnav($object, 'id', $linkback,1,"rowid");
-	print '</td>';
-	print '</tr>';
 
 	// Resource type
 	print '<tr>';
-	print '<td>' . $langs->trans("ResourceType") . '</td>';
+	print '<td class="titlefield">' . $langs->trans("ResourceType") . '</td>';
 	print '<td>';
 	print $object->type_label;
 	print '</td>';
-	print '</tr>';		print "</table>";
+	print '</tr>';
+	
+	print "</table>";
 
-	print '<br>';
+	print '</div>';
+	
 	$permission=$user->rights->resource->write;
 	$cssclass='titlefield';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';

From 3e37185b74de67d4f6cf5e77fdd5e2cb5ed06e28 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 13:44:18 +0200
Subject: [PATCH 0921/1163] FIX download attached file on resource

---
 htdocs/core/lib/files.lib.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index c60464ed0fd..4c492d1693e 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2214,6 +2214,16 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file=$conf->don->dir_output.'/'.$original_file;
 	}
 
+	// Wrapping pour les dons
+	else if ($modulepart == 'dolresource' && !empty($conf->resource->dir_output))
+	{
+		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->resource->dir_output.'/'.$original_file;
+	}
+	
 	// Wrapping pour les remises de cheques
 	else if ($modulepart == 'remisecheque' && !empty($conf->banque->dir_output))
 	{

From 80ce8da7a388f157beb81e46ed465b952004a857 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 15:13:52 +0200
Subject: [PATCH 0922/1163] Fix migration errors and responsive design

---
 htdocs/contrat/card.php                       | 67 ++++++++++---------
 htdocs/core/class/html.formactions.class.php  |  5 +-
 htdocs/install/default.css                    |  6 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   | 17 +++++
 .../mysql/tables/llx_opensurvey_sondage.sql   |  2 +-
 htdocs/install/step5.php                      |  8 +--
 htdocs/theme/eldy/style.css.php               |  2 +-
 htdocs/theme/md/style.css.php                 | 17 +++--
 8 files changed, 72 insertions(+), 52 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index f00816e9d4b..31e5d6f3094 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2083,44 +2083,45 @@ else
 
             print "</div>";
         }
-	// Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
-
-	if ($action != 'presend')
-	{
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-
-		/*
-		 * Documents generes
-		*/
-		$filename = dol_sanitizeFileName($object->ref);
-		$filedir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
-		$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-		$genallowed = $user->rights->contrat->creer;
-		$delallowed = $user->rights->contrat->supprimer;
-
-		$var = true;
-
-		print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
-
-
-			// Show links to link elements
-			$linktoelem = $form->showLinkToObjectBlock($object, null, array('contrat'));
-			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-
-
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
+        
+    	// Select mail models is same action as presend
+    	if (GETPOST('modelselected')) {
+    		$action = 'presend';
+    	}
+    
+    	if ($action != 'presend')
+    	{
+    		print '<div class="fichecenter"><div class="fichehalfleft">';
+    
+    		/*
+    		 * Documents generes
+    		*/
+    		$filename = dol_sanitizeFileName($object->ref);
+    		$filedir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    		$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+    		$genallowed = $user->rights->contrat->creer;
+    		$delallowed = $user->rights->contrat->supprimer;
+    
+    		$var = true;
+    
+    		print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+    
+    
+    			// Show links to link elements
+    			$linktoelem = $form->showLinkToObjectBlock($object, null, array('contrat'));
+    			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+    
+    
+    		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+    
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'contract', $socid);
 
-
-		print '</div></div></div>';
-	}
+    
+    		print '</div></div></div>';
+    	}
 
 		/*
 		 * Action presend
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 452ff89d914..456faa7931e 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -189,7 +189,9 @@ class FormActions
 
         	$page=0; $param=''; $sortfield='a.datep';
         	
-        	$total = 0;	$var=true; 
+        	$total = 0; 
+        	
+        	print '<div class="div-table-responsive">';
         	print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
         	print '<tr class="liste_titre">';
         	print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], '', $page, $param, '');
@@ -243,6 +245,7 @@ class FormActions
         		print '</tr>';
         	}
         	print '</table>';
+        	print '</div>';
         }
 
         return $num;
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 9725b06b8bc..b3905e63a49 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -54,9 +54,9 @@ span.titre {
 	font-weight: bold;
 	background: #FFFFFF;
 	color: #444;
-	border: 1px solid #999;
-	padding: 5px 5px 5px 5px;
-	margin: 0 0 0 15px;
+	border: 1px solid #bbb;
+	padding: 10px 10px 10px 10px;
+	margin: 0 0 10px 10px;
 }
 
 div.soustitre {
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 0bd68ddfcfb..a21c340b556 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -25,6 +25,23 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
+-- Clean corrupted values for tms
+-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
+-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
+-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- Remove default not null on date_fin
+-- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
+
+ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
+
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEFAULT 0;
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN status integer DEFAULT 1 after date_fin;
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN entity integer DEFAULT 1 NOT NULL;
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN allow_comments tinyint NOT NULL DEFAULT 1;
+
+
 create table llx_notify_def_object
 (
   id				integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
index 5ea2183758a..e9b2481757d 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
@@ -23,7 +23,7 @@ CREATE TABLE llx_opensurvey_sondage (
 	nom_admin VARCHAR(64),
 	fk_user_creat integer NOT NULL,
 	titre TEXT NOT NULL,
-	date_fin DATETIME NOT NULL,
+	date_fin DATETIME NULL,
     status integer DEFAULT 1,
 	format VARCHAR(2) NOT NULL,                 -- 'A' = Text choice (choices are saved into sujet field), 'D' = Date choice (choices are saved into sujet field), 'F' = Form survey
 	mailsonde tinyint NOT NULL DEFAULT 0,
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 96cc1c4fdcf..875fd9378f2 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2004       Sebastien DiCintio      <sdicintio@ressource-toi.org>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
@@ -395,11 +395,11 @@ elseif (empty($action) || preg_match('/upgrade/i',$action))
             print '<br><div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
         }
 
-        print "<br>";
+        print "<br><br>";
 
         print '<div class="center"><a href="../index.php?mainmenu=home' . (isset($login) ? '&username=' . urlencode($login) : '') . '">';
-        print $langs->trans("GoToDolibarr");
-        print '</a></div>';
+        print $langs->trans("GoToDolibarr").'...';
+        print '</a></div><br>';
     }
     else
     {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b8f31b4e224..a8eddcd825f 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -698,7 +698,7 @@ div.fiche>form>div.div-table-responsive {
     justify-content: flex-start;
 }
 .thumbstat {
-	flex: 1 1 114px;
+	flex: 1 1 116px;
 }
 .thumbstat150 {
 	flex: 1 1 170px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 91a4c0922d9..943540fa02f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -544,7 +544,7 @@ textarea.centpercent {
 .cursorpointer {
 	cursor: pointer;
 }
-.cusormove {
+.cursormove {
 	cursor: move;
 }
 .badge {
@@ -701,7 +701,7 @@ div.fiche>form>div.div-table-responsive {
     justify-content: flex-start;
 }
 .thumbstat {
-	flex: 1 1 114px;
+	flex: 1 1 116px;
 }
 .thumbstat150 {
 	flex: 1 1 150px;
@@ -1979,9 +1979,10 @@ div.tabsElem { margin-top: 6px; }		/* To avoid overlap of tabs when not browser
 
 div.tabBar {
     color: #<?php echo $colortextbacktab; ?>;
-    padding-top: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
-    padding-left: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
-    padding-right: <?php echo ($dol_optimize_smallscreen?'4':'16'); ?>px;
+    padding-top: 16px;
+    padding-left: 16px;
+    padding-right: 16px;
+	padding-bottom: 16px;
     margin: 0px 0px 16px 0px;
     -moz-border-radius:3px;
     -webkit-border-radius: 3px;
@@ -1991,8 +1992,6 @@ div.tabBar {
     border-top: 1px solid #CCC;
 	width: auto;
 	background: rgb(<?php echo $colorbacktabcard1; ?>);
-
-	padding-bottom: 12px;
 	border-bottom: 1px solid #aaa; 
 }
 div.tabBar div.titre {
@@ -4627,8 +4626,8 @@ border-top-right-radius: 6px;
 	}
 
     div.tabBar {
-        padding-left: 0px;
-        padding-right: 0px;
+        padding-left: 8px;
+        padding-right: 8px;
         -moz-border-radius: 0;
         -webkit-border-radius: 0;
     	border-radius: 0px;

From cea98ce5cbfe4baaee079cbab4923e862650c461 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 15:30:56 +0200
Subject: [PATCH 0923/1163] Look and feel v6

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 ++
 htdocs/opensurvey/card.php                    | 31 ++++++++--------
 .../class/opensurveysondage.class.php         | 25 ++++++-------
 htdocs/opensurvey/results.php                 | 35 ++++++++++---------
 4 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index a21c340b556..6c71f279867 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -40,6 +40,8 @@ ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEF
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN status integer DEFAULT 1 after date_fin;
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN entity integer DEFAULT 1 NOT NULL;
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN allow_comments tinyint NOT NULL DEFAULT 1;
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN allow_spy tinyint NOT NULL DEFAULT 1 AFTER allow_comments;
+ALTER TABLE llx_opensurvey_sondage ADD COLUMN sujet TEXT;
 
 
 create table llx_notify_def_object
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index d7a466a5217..707af9f7115 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -212,22 +212,23 @@ print '<input type="hidden" name="action" value="update">';
 $head = opensurvey_prepare_head($object);
 
 
-dol_fiche_head($head,'general',$langs->trans("Survey"),0,dol_buildpath('/opensurvey/img/object_opensurvey.png',1),1);
+dol_fiche_head($head,'general',$langs->trans("Survey"), -1, DOL_URL_ROOT.'/opensurvey/img/object_opensurvey.png', 1);
+
+$morehtmlref = '';
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/opensurvey/list.php">'.$langs->trans("BackToList").'</a>';
+
+dol_banner_tab($object, 'id', $linkback, 1, 'id_sondage', 'id_sondage', $morehtmlref);
+
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 
 print '<table class="border" width="100%">';
 
-$linkback = '<a href="'.dol_buildpath('/opensurvey/list.php',1).'">'.$langs->trans("BackToList").'</a>';
-
-// Ref
-print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td>';
-print '<td colspan="3">';
-print $form->showrefnav($object, 'id', $linkback, 1, 'id_sondage', 'id_sondage');
-print '</td>';
-print '</tr>';
-
 // Type
 $type=($object->format=="A")?'classic':'date';
-print '<tr><td>'.$langs->trans("Type").'</td><td colspan="2">';
+print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td colspan="2">';
 print img_picto('',dol_buildpath('/opensurvey/img/'.($type == 'classic'?'chart-32.png':'calendar-32.png'),1),'width="16"',1);
 print ' '.$langs->trans($type=='classic'?"TypeClassic":"TypeDate").'</td></tr>';
 
@@ -242,12 +243,6 @@ if ($action == 'edit')
 else print dol_htmlentities($object->titre);
 print '</td></tr>';
 
-// Status
-print '<tr><td>';
-print $langs->trans("Status") .'</td><td colspan="2">';
-print $object->getLibStatut(4);
-print '</td></tr>';
-
 // Description
 print '<tr><td class="tdtop">'.$langs->trans("Description") .'</td><td colspan="2">';
 if ($action == 'edit')
@@ -345,6 +340,8 @@ print '</td></tr>';
 
 print '</table>';
 
+print '</div>';
+
 dol_fiche_end();
 
 if ($action == 'edit')
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 5ad27731d88..95af2b130d5 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -34,19 +34,20 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
  */
 class Opensurveysondage extends CommonObject
 {
-	var $element='opensurvey_sondage';			//!< Id that identify managed objects
-	var $table_element='opensurvey_sondage';	//!< Name of table without prefix where object is stored
-
-	var $id_sondage;
+	public $element='opensurvey_sondage';			//!< Id that identify managed objects
+	public $table_element='opensurvey_sondage';	//!< Name of table without prefix where object is stored
+    public $picto = 'opensurvey';
+    
+	public $id_sondage;
 	/**
 	 * @deprecated
 	 * @see description
 	 */
-	var $commentaires;
+	public $commentaires;
 	public $description;
 
-	var $mail_admin;
-	var $nom_admin;
+	public $mail_admin;
+	public $nom_admin;
 
 	/**
 	 * Id of user author of the poll
@@ -54,11 +55,11 @@ class Opensurveysondage extends CommonObject
 	 */
 	public $fk_user_creat;
 
-	var $titre;
-	var $date_fin='';
-	var $status=1;
-	var $format;
-	var $mailsonde;
+	public $titre;
+	public $date_fin='';
+	public $status=1;
+	public $format;
+	public $mailsonde;
 
 	public $sujet;
 
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index f10e21effe1..9bfb15b2c24 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -426,23 +426,23 @@ print '<form name="formulaire4" action="#" method="POST">'."\n";
 
 $head = opensurvey_prepare_head($object);
 
-print dol_get_fiche_head($head,'preview',$langs->trans("Survey"),0,dol_buildpath('/opensurvey/img/object_opensurvey.png',1),1);
+dol_fiche_head($head,'preview',$langs->trans("Survey"), -1, DOL_URL_ROOT.'/opensurvey/img/object_opensurvey.png', 1);
 
+$morehtmlref = '';
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/opensurvey/list.php">'.$langs->trans("BackToList").'</a>';
+
+dol_banner_tab($object, 'id', $linkback, 1, 'id_sondage', 'id_sondage', $morehtmlref);
+
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 
 print '<table class="border" width="100%">';
 
-$linkback = '<a href="'.dol_buildpath('/opensurvey/list.php',1).(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-
-// Ref
-print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td>';
-print '<td colspan="3">';
-print $form->showrefnav($object, 'id', $linkback, 1, 'id_sondage', 'id_sondage');
-print '</td>';
-print '</tr>';
-
 // Type
 $type=($object->format=="A")?'classic':'date';
-print '<tr><td>'.$langs->trans("Type").'</td><td colspan="2">';
+print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td colspan="2">';
 print img_picto('',dol_buildpath('/opensurvey/img/'.($type == 'classic'?'chart-32.png':'calendar-32.png'),1),'width="16"',1);
 print ' '.$langs->trans($type=='classic'?"TypeClassic":"TypeDate").'</td></tr>';
 
@@ -499,6 +499,8 @@ print '</td></tr>';
 
 print '</table>';
 
+print '</div>';
+
 dol_fiche_end();
 
 print '</form>'."\n";
@@ -1045,7 +1047,7 @@ print '</table>'."\n";
 print '</div>'."\n";
 
 
-$toutsujet = explode(",", $object->sujet);
+$toutsujet = explode(",", $object->sujet);  // With old versions, this field was not set
 
 $compteursujet = 0;
 $meilleursujet = '';
@@ -1056,7 +1058,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) {
 		if ($object->format == "D") {
 			$meilleursujetexport = $toutsujet[$i];
 
-			if (strpos($toutsujet[$i], '@') !== false) {
+            if (strpos($toutsujet[$i], '@') !== false) {
 				$toutsujetdate = explode("@", $toutsujet[$i]);
 				$meilleursujet .= dol_print_date($toutsujetdate[0],'daytext'). ' ('.dol_print_date($toutsujetdate[0],'%A').')' . ' - ' . $toutsujetdate[1];
 			} else {
@@ -1072,8 +1074,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) {
 		$compteursujet++;
 	}
 }
-
-$meilleursujet = substr("$meilleursujet", 1);
+$meilleursujet = substr($meilleursujet, 1);
 $meilleursujet = str_replace("°", "'", $meilleursujet);
 
 // Show best choice
@@ -1083,9 +1084,9 @@ if ($nbofcheckbox >= 2)
 	print '<p class="affichageresultats">'."\n";
 
 	if (isset($meilleurecolonne) && $compteursujet == "1") {
-		print "<img src=\"".dol_buildpath('/opensurvey/img/medaille.png',1)."\"> " . $langs->trans('TheBestChoice') . ": <b>".$meilleursujet." </b>" . $langs->trans("with") . " <b>$meilleurecolonne </b>" . $vote_str . ".\n";
+		print "<img src=\"".DOL_URL_ROOT.'/opensurvey/img/medaille.png'."\"> " . $langs->trans('TheBestChoice') . ": <b>".$meilleursujet." </b>" . $langs->trans("with") . " <b>".$meilleurecolonne."</b>" . $vote_str . ".\n";
 	} elseif (isset($meilleurecolonne)) {
-		print "<img src=\"".dol_buildpath('/opensurvey/img/medaille.png',1)."\"> " . $langs->trans('TheBestChoices') . ": <b>".$meilleursujet." </b>" . $langs->trans("with") . " <b>$meilleurecolonne </b>" . $vote_str . ".\n";
+		print "<img src=\"".DOL_URL_ROOT.'/opensurvey/img/medaille.png'."\"> " . $langs->trans('TheBestChoices') . ": <b>".$meilleursujet." </b>" . $langs->trans("with") . " <b>".$meilleurecolonne."</b>" . $vote_str . ".\n";
 	}
 	print '<br></p><br>'."\n";
 }

From 67b3e3da99cbcbcc974f08bb240b31dee3d7d2b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 15:51:39 +0200
Subject: [PATCH 0924/1163] FIX #6784

---
 htdocs/core/lib/ajax.lib.php       | 6 +++---
 htdocs/opensurvey/card.php         | 4 ++--
 htdocs/public/opensurvey/studs.php | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 9ba57abf302..d278f29b897 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -354,9 +354,9 @@ function ajax_dialog($title,$message,$w=350,$h=150)
  * Make content of an input box selected when we click into input field.
  * 
  * @param string	$htmlname	Id of html object 
- * @param int		$addlink	Add a link to after
+ * @param string	$addlink	Add a 'link to' after
  */
-function ajax_autoselect($htmlname, $addlink=0)
+function ajax_autoselect($htmlname, $addlink='')
 {
 	global $langs;
 	$out = '<script type="text/javascript">
@@ -364,7 +364,7 @@ function ajax_autoselect($htmlname, $addlink=0)
 				    jQuery("#'.$htmlname.'").click(function() { jQuery(this).select(); } );
 				});
 		    </script>';
-	if ($addlink) $out.=' <a href="'.$url.'" target="_blank">'.$langs->trans("Link").'</a>';
+	if ($addlink) $out.=' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
 	return $out;
 }
 
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 707af9f7115..18326321a4b 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -332,9 +332,9 @@ $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($
 $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-$url=$urlwithouturlroot.dol_buildpath('/public/opensurvey/studs.php',1).'?sondage='.$object->id_sondage;
+$url=$urlwithroot.'/public/opensurvey/studs.php?sondage='.$object->id_sondage;
 print '<input type="text" style="width: 60%" '.($action == 'edit' ? 'disabled' : '').' id="opensurveyurl" name="opensurveyurl" value="'.$url.'">';
-if ($action != 'edit') print ajax_autoselect("opensurveyurl", 1);
+if ($action != 'edit') print ajax_autoselect("opensurveyurl", $url);
 
 print '</td></tr>';
 
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 98d267fdd72..8e769452ec1 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -47,6 +47,9 @@ $nblignes=$object->fetch_lines();
 //If the survey has not yet finished, then it can be modified
 $canbemodified = ((empty($object->date_fin) || $object->date_fin > dol_now()) && $object->status != Opensurveysondage::STATUS_CLOSED);
 
+// Security check
+if (empty($conf->opensurvey->enabled)) accessforbidden('',0,0,1);
+
 
 /*
  * Actions

From c98f0ba45713c6f66750c4328b3e76323ef6bfe6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 May 2017 15:57:18 +0200
Subject: [PATCH 0925/1163] Fix typo

---
 htdocs/langs/en_US/stocks.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 0d2f10a2165..97ddedc3231 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -119,7 +119,7 @@ NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
 SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
-RecordMovement=Record transfert
+RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements

From 3898cfe02f4acf744595eee9fdd51fac5a562a57 Mon Sep 17 00:00:00 2001
From: David <dvasseur@users.noreply.github.com>
Date: Tue, 23 May 2017 18:27:41 +0200
Subject: [PATCH 0926/1163] FIX: REST API not possible to add agendaevents

---
 htdocs/comm/action/class/api_agendaevents.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 5eeca63a4aa..b1014b9171a 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -289,7 +289,7 @@ class AgendaEvents extends DolibarrApi
     function _validate($data)
     {
         $event = array();
-        foreach (Events::$FIELDS as $field) {
+        foreach (AgendaEvents::$FIELDS as $field) {
             if (!isset($data[$field]))
                 throw new RestException(400, "$field field missing");
             $event[$field] = $data[$field];

From 6d4c5e4b4afe56d1247f7a02bb35db26b746b5f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 May 2017 11:20:56 +0200
Subject: [PATCH 0927/1163] Code comment

---
 htdocs/core/lib/functions.lib.php | 1 +
 htdocs/main.inc.php               | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 30e1579c33e..e8ead0ed829 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -280,6 +280,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
     	$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
     	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 	
+        // Code for search criteria persistence.
     	// Retrieve values if restore_lastsearch_values is set and there is saved values
     	if (! empty($_GET['restore_lastsearch_values']) && ! empty($_SESSION['lastsearch_values_'.$relativepathstring]))        // Keep $_GET here
     	{
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index e674aea6d5c..da9e65f47ce 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1935,7 +1935,6 @@ if (! function_exists("llxFooter"))
         if ($comment) print '<!-- '.$comment.' -->'."\n";
 
         printCommonFooter($zone);
-        //var_dump($langs);		// Uncommment to see the property _tab_loaded to see which language file were loaded
 
         if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n";	// End div container
 

From f011197e0017cb7e49f51dfbbf6897dc7514c207 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 May 2017 15:12:45 +0200
Subject: [PATCH 0928/1163] Update swagger to 2.0.24

---
 COPYRIGHT                                     | 137 +-----
 .../Luracast/Restler/explorer/css/screen.css  |  43 +-
 .../Restler/explorer/images/logo_small.png    | Bin 1620 -> 770 bytes
 .../Restler/explorer/images/pet_store_api.png | Bin 0 -> 824 bytes
 .../Restler/explorer/images/wordnik_api.png   | Bin 0 -> 980 bytes
 .../Luracast/Restler/explorer/index.html      |  34 +-
 .../Restler/explorer/lib/swagger-oauth.js     | 103 ++---
 .../Luracast/Restler/explorer/lib/swagger.js  | 425 +++++++++++-------
 .../Luracast/Restler/explorer/swagger-ui.js   | 331 ++++++++------
 .../Restler/explorer/swagger-ui.min.js        |   2 +-
 10 files changed, 552 insertions(+), 523 deletions(-)
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/images/pet_store_api.png
 create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/explorer/images/wordnik_api.png

diff --git a/COPYRIGHT b/COPYRIGHT
index 61a0f2de6bd..04f0358a655 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -21,13 +21,13 @@ GeoIP                  1.4           LGPL-2.1+                   Yes
 Mobiledetect           2.8.17        MIT License                 Yes             Detect mobile devices browsers
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
-odtPHP                 1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
+odtPHP                 1.0.1         GPL-2+                      Yes             Library to build/edit ODT files
 ParseDown              1.6           MIT License                 Yes             Markdown parser
 PHPExcel               1.8.1         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
-Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services
+Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
 TCPDF                  6.2.12        LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
@@ -52,138 +52,13 @@ jQuery Timepicker      1.1.0         GPL and MIT License         Yes
 jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips
 jsGanttImproved        1.7.5.2       BSD License                 Yes             JS library (to build Gantt reports)
 JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
+SwaggerUI			   2.0.24		 GPL-2+                      Yes             JS library to offer the REST API explorer
 
 For licenses compatibility informations:
 http://www.gnu.org/licenses/licenses.en.html
 
 
-Copyright
----------
-
-Copyright (C) 2016
-
-Copyright (C) 2015
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Marcos García <marcosgdf@gmail.com>
-- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
-- Frederic France <frederic.france@free.fr>
-- Regis Houssin <regis.houssin@capnetworks.com>
-
-Copyright (C) 2014
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
-- Jean-François Ferry <jfefe@aternatik.fr>
-- Marcos García <marcosgdf@gmail.com>
-- Philippe Grand <philippe.grand@atoo-net.com>
-- Florian Henry <florian.henry@open-concept.pro>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Maxime Kohlhaas <mko@atm-consulting.fr>
-- Juanjo Menent <jmenent@2byte.es>
-- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
-- Frederic France <frederic.france@free.fr>
-
-Copyright (C) 2013
-- Christophe Battarel <christophe.battarel@altairis.fr>
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Jean-François Ferry <jfefe@aternatik.fr>
-- Marcos García <marcosgdf@gmail.com>
-- Philippe Grand <philippe.grand@atoo-net.com>
-- Florian Henry <florian.henry@open-concept.pro>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Maxime Kohlhaas <mko@atm-consulting.fr>
-- Juanjo Menent <jmenent@2byte.es>
-- Adolfo Segura <adolfo.segura@gmail.com>
-- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
-
-Copyright (C) 2012
-- Christophe Battarel <christophe.battarel@altairis.fr>
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Jean-François Ferry <jfefe@aternatik.fr>
-- Marcos García <marcosgdf@gmail.com>
-- Philippe Grand <philippe.grand@atoo-net.com>
-- Jean Heimburger <jean@tiaris.info>
-- Florian Henry <florian.henry@open-concept.pro>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Maxime Kohlhaas <mko@atm-consulting.fr>
-- Juanjo Menent <jmenent@2byte.es>
-- Nicolas Péré <nicolas@amarok2.net>
-- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
-
-Copyright (C) 2011
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Juanjo Menent <jmenent@2byte.es>
-- Philippe Grand <philippe.grand@atoo-net.com>
-- Jean Heimburger <jean@tiaris.info>
-
-Copyright (C) 2010
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Juanjo Menent <jmenent@2byte.es>
-- r2gnl
-- meos
-
-Copyright (C) 2009
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Juanjo Menent <jmenent@2byte.es>
-
-Copyright (C) 2008
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Jeremie Ollivier <jeremie.o@laposte.net>
-
-Copyright (C) 2007
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Auguria SARL <info@auguria.org>
-- Jean Heimburger <jean@tiaris.info>
-- Jeremie Ollivier <jeremie.o@laposte.net>
-
-Copyright (C) 2006
-- Auguria SARL <info@auguria.org>
-- Marc Barilley/Ocebo <marc@ocebo.com>
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Regis Houssin <regis.houssin@capnetworks.com>
-- Andre Cianfarani <acianfa@free.fr>
-- Yannick Warnier <ywarnier@beeznest.org>
-- Jean Heimburger <jean@tiaris.info>
-
-Copyright (C) 2005
-- Brice Davoleau <brice.davoleau@gmail.com>
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Benoit Mortier <benoit.mortier@opensides.be>
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Eric Seigne <erics@rycks.com>
-- Matthieu Valleton <mv@seeschloss.org>
-- Regis Houssin <regis.houssin@capnetworks.com>
-
-Copyright (C) 2004
-- Laurent Destailleur <eldy@users.sourceforge.net>
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Eric Seigne <erics@rycks.com>
-- Benoit Mortier <benoit.mortier@opensides.be>
-- Christophe Combelles <ccomb@free.fr>
-- Sebastien Di Cintio <sdicintio@ressource-toi.org>
-
-Copyright (C) 2003
-- Jean-Louis Bergamo <jlb@j1b.org>
-- Xavier Dutoit <doli@sydesy.com>
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Emmanuel Raviart <eraviart@entrouvert.com>
-- Eric Seigne <erics@rycks.com>
-
-Copyright (C) 2002
-- Jean-Louis Bergamo <jlb@j1b.org>
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-
-Copyright (C) 2001
-- Rodolphe Quiedeville <rodolphe@quiedeville.org>
-
-
-
-
+Copyright / Authors
+-------------------
 
+See page https://github.com/Dolibarr/dolibarr/graphs/contributors
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
index 2ac5625af06..478b99837d7 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/css/screen.css
@@ -350,7 +350,7 @@
   font-size: .85em;
   line-height: 1.2em;
   overflow: auto;
-  max-height: 400px;
+  max-height: 200px;
   cursor: pointer;
 }
 .swagger-section .swagger-ui-wrap .model-signature ul.signature-nav {
@@ -743,17 +743,20 @@
   display: inline-block;
   font-size: 0.9em;
 }
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header img {
-  display: block;
-  clear: none;
-  float: right;
-}
 .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header input.submit {
   display: block;
   clear: none;
   float: left;
   padding: 6px 8px;
 }
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header span.response_throbber {
+  background-image: url('../images/throbber.gif');
+  width: 128px;
+  height: 16px;
+  display: block;
+  clear: none;
+  float: right;
+}
 .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form input[type='text'].error {
   outline: 2px solid black;
   outline-color: #cc0000;
@@ -1158,7 +1161,7 @@
   cursor: pointer;
 }
 .swagger-section #header {
-  background-color: #646257;
+  background-color: #89bf04;
   padding: 14px;
 }
 .swagger-section #header a#logo {
@@ -1193,7 +1196,7 @@
   padding: 6px 8px;
   font-size: 0.9em;
   color: white;
-  background-color: #000000;
+  background-color: #547f00;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   -o-border-radius: 4px;
@@ -1202,35 +1205,13 @@
   border-radius: 4px;
 }
 .swagger-section #header form#api_selector .input a#explore:hover {
-  background-color: #a41e22;
+  background-color: #547f00;
 }
 .swagger-section #header form#api_selector .input input {
   font-size: 0.9em;
   padding: 3px;
   margin: 0;
 }
-.swagger-section #footer-nav {
-  margin-top: 50px;
-  color: #bbb;
-  float: left;
-  list-style: none;
-  font-size: 0.8em;
-}
-.swagger-section #footer-nav li {
-  display: block;
-  float: left;
-}
-.swagger-section #footer-nav a {
-  margin-right: 4px;
-  text-decoration: none;
-  font-weight: none;
-  padding: 4px 2px;
-  font-size: 0.9em;
-  color: #999;
-}
-.swagger-section #footer-nav a:hover {
-  color: #555;
-}
 .swagger-section #content_message {
   margin: 10px 15px;
   font-style: italic;
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/logo_small.png
index 2ed3cf64be72132f93719f8014a6f440b06d818a..5496a65579ae903d4008f9d268fac422ef9d3679 100644
GIT binary patch
delta 757
zcmV<R0t)@q41xxb8Gi-<0028MuA%?{02y>eSaefwW^{L9a%BKPWN%_+AW3auXJt}l
zVPtu6$z?nM00N{*L_t(|+Qe5qY|}s#esPzIE@o)O=n+8&R{|*#L(PIfT{3hiQ=F}c
zp~=FUc0*!FJHWzFGqE6%NL1<;XChLEdTG@Sk5yS*2~bDg=YQT+mVIX@wF56YoppY>
z@BMu5<%Q@!N$oaYTJMs{o1Hj{zU)vi6JQ2&cx&>)ZfVp2{)tzg4GBvD3&5@boJKre
zJ30eu1)x3N+9gsM@#-+RHxaPN;V_lQG6K)HlLvDutp^T$uMiaC@ST^ZBO1#CLla(m
z1{Ks3e94Adynh&~zGdCBX<^=^@I0X3SCR7OMbn}sUKdeFKO-flaJa%@kJ27@Rod?J
z9=+Q<rfqi^8=#Y?wj1kwX#b$c_Zv$4C0UJ>x5|=PtG8n>y~9rIu}+48M}FW5Bbqw3
zt#po?c?kmG!FX32W(dOjzTb+U@64MzHItoeB!M0JcYm^KB<j}E5#~0sp!XPJOOLgT
zS*yn>q0?}5!|tR}5&*k=hqU1Np`{I?Gbb7b+;Y=z!O$nm8}UUSzrCVok2dMe##j1t
zbxF~$^O(JOe=y#o&iZF&|1KS!4Pqm~YUtPaa}xR)WTS{s(z8WTpAfl&Oi~ADARd;i
zc|2dJ>wo#Wf#fv~himh7V?Smz%4rfoBw(of_O7l9t{Vt<5?^=8(OEx}+adud!kbfi
zfsy(V&q!X~mXJ{r*stQof-;iQPXh1hwBR*L1G&ztYv`a7B=K~d#e8-HEJhShIm0li
z01l!p6##<^07Z%Eh62^kB5plKKb=vl4A{YyOl}<uuRAjW1xs7n(TB&AKy<RIr;r!y
z*f@9QV(<ZjBi!|hJblTahtrI=7$f#e<Q%=BrTUjK$v|(4ab;@?141#<dR6>|0VpD{
nD)OJ^fG<28<h5Wae+3u-njrty3Hmng00000NkvXXu0mjfWrbey

literal 1620
zcmbu8c~BEq7{J#C1BpOmK+ed-7%-9;0wG}uAtalG+)D@{k_bw;BwWEHRcI>}?}J(t
ztryN<J0exF8LK!Roe`yK5S13if~DXf2$IrDJ^s)ReFVqx-%fwCyKm=v@9p<{-@dm)
zi^}})VR#6F{1kGD4zv+7w+{w9eJ5Aeg9c+q6nY;YpGS|=h9Kx8u~w~@PESvJd3k|O
z5XWM%;GIY$5(or;e}7+JUpyX<!{L3reLy^Lh5*p@J{}cC4Gjqi3JRK?@<DtFnM{s|
zhyY!)<Bdkca)Vx<q1EZqbUHL$i)yv%G*peEDvesHQ7cqRxl);`RLJFWiCiv~r6Q@|
zk|Gj`P>cu>M1Y8rg+jhiC`b|TlKDJ7A5P}ONxTFekIUo1iHR@_b6}X8z-4neaq(;x
zi?xi&WX3QVOeUSdpfMQH0DAP2=x7>kN#s&mB#jmY{Hatjl}cGej_~+~FC>MBg@u4M
z0d3%>RmwaX5>H-%K)?s75kAbHVKzGqCvdr3jwf$CNX=%mLH4*fR$MF-IIvhTK*Qs}
zc&`B*fC&(oHSuTw6Ut%=DBEo1B7g~r6y_lW6xmbe1>gsOQm@i#bTX-0z>}vWNxAVL
zBUl<3X_89~QW2V*l+K3{4m(dFH7le!GO-B}7)AW76n>_Fmn{)xBZ4BCxG)vTmk0|a
zh#3*&A%a{{a<N2M1R`Q#J|d{DE?H~M`=l(_Vac%<nrwMlYgT1iSLiCTwB?zavUF7`
zDlbt<Eiy5f#p%881{<i|p+hsE`SU3h3Q+PO@sRnBA`k2S2iyNUhu(2=hRd^bbq&li
z2>=J+L!d<qmxIOND&<By1kEGP+;e^zsCf&5B!@K1kzp-ztTWpRAyI)fuaKN-u@$bf
z+Dh$YaRztn%Go+FZo$krv8~YTuvja|dP{jB1jod3Vq)VS(nqd=lebqP5$S1r@^d#}
zqRd-DTU(E=N7TMqkkwsxkUQ8}-`2~l2*epIIK|v?T)@Uh*X)f`>z{q}EO5*5<5lFX
ztT~aF-W=wwXlAasy!KA#{!_vCc8`r){wOYAfK|}Zg9PJbxS`Drk;)p~zY|Tt-88>*
zwriWWb1zVDZt<?aifzb#J=Jt2Yh}~u*r$K$2jZKCb}!3y=1<pRp7-wvx_E5vly5*k
zCcN=MKv4wj{45~QEvU@>TG?paYc|7T*|z0vmc|>Drcq6j5NpMz|2?cHb`i@?uwOi^
zq83NCbnz;42Pc0dj34#(XLPH(clD@>^Tx(273Y3H^+xZ#{TS}&gSD83m-~j}1AOfv
zMVs~g)RU1HH|1RUc<k(*Bd<s>D`si?r4G*GZO0OveK+}{)fDYSTMi+hjRZR>cge1S
zR@On$u^Zq1me^ji^p@q(E2tf<f1%t|HB3E1tj6{>BTvg3>Jq*E-5aaR-qd1lcM;WU
z`vf>j9jA6B>rS5l-}&OHq0;I0;+3!cMzi&fqek1LqNjZyefrl8q?U<>9#!evrstg<
z9UZRNU`5UKvUD!GPtvYGoKo%T9HASStIj)gc|l1glldggnPy|@c4zEtP{iK5USC1K
ziz=MEGQLy=x@c#Hg$F8HUC&hyzUtY|{)^#UHYzzVSzcQ3^7e(a`*rm1RIaV^#o0IS
z_w{vkWbY|374IK1=xA3vqFX{vwfG#EEU9>G9xCaaa>Z+G%+t}diAF+FEzVq};smoa
zbi)HvbN`b!s}nDrr&Ia{2953Bcl~x&Cvp!-BYU1?)gSHc36Gp-R=&RcbjO;eQEGE&
ta!w9m(NDOMo}d5m!&kLnqYQAv9LOHZ7#!&yyal!|q>!SLGf3{ne*t=UPFDZ`

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/pet_store_api.png b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/pet_store_api.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9f9cd4aeb35a108c4b2f1dddb59977d56c595d8
GIT binary patch
literal 824
zcmV-81IPS{P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gHF34$HUIzuvPnciR7i=fl}Tt6K@>n=Rd;8mVwQ<w7Vu!yh)%}+A_y4|
z-UNe}fD5=LMo};*QSmG;(NPF0A}$9}@FM6z1efSh#09bl12MQ@5|hbdlCI2Ty1bZM
z2B)3;YyJP;ug@<^05qRC<;3Ih6RztX_B>NY4k4xJQ%YT}s;WA7;r!W@XgqjG_4og}
z8w>{OB9REiMa8-B85td+y}bji^~2KA`Md4j-u{zw=H%Da@83%_8qEnl9k1WK;pWX-
zb-lg)pQYAreK@>)*5Clqni{IZVYGG+NY67Bp-^bn;L{Nbh44I6CIK+n7p8#U?;fCA
zYMFcy%UEjup4fgnli%NyzSe*@419QuU9lJ|T$?f9w?HIQ$RwEJGK7^!y7LhxIgVJp
z9c!kB{0aydM1epU1NJ=h(<e-{>}2X?Y{qn70yEN$dwm~favs=VbQ+T?!AvSl{P~PE
zS&zsJbTQttne>kdM4$jBhLMFy@I1)3u-4cAzrY*l!o9eK^w%+jqY!oi(Ri8sMauvK
zwnCP#%3hEH#FtNqq{iT(?=_JA_8XC>5Y8Y@!wmxKb|A87ZbpHA`+%v~0pt{5Nko1L
zLKR^25YExt1lH7L1<xo5e7uJ-X(+4!X+Qw(Fk<f&f<EAoVT;7lP2gydL*Q621)^}0
zf)y)$!86{#+1P{#mE*;qp`Sg$Py%CM#x#`r6J&e`_Udg|)my<$z<3`7B_hx9N9P}F
zYK3c24KdPPZP*+3AQ!CtKY<XLC+kF;aH37V!P87BrTCdh4EhHAD~1vYq?CP9Db?E1
z*~P0@ZL<b%YkN(5M<+_DR&nfjv(wYlb0-iC>{t<rP*hZu6MS@Zbo$f3zhue6T>{|P
z@n)yHyZf~3>LZ@#&CNw1rA#OlY^|)UJQKUrlKKO&x%wPhH}6&e0000<MNUMnLSTZR
CaCsR3

literal 0
HcmV?d00001

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/wordnik_api.png b/htdocs/includes/restler/framework/Luracast/Restler/explorer/images/wordnik_api.png
new file mode 100644
index 0000000000000000000000000000000000000000..dca4f1455ac45e9cdc3659d77d6a47370048eb1c
GIT binary patch
literal 980
zcmV;_11tQAP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gHF34$HUIzvPDw;TR7i=Xl}%_|RTRg6XC{pqCo`k81cgjzl5UhNtQ+m3
zt*8-2j9OY3)<lrHC`CuamA2RkRj?pvrT9T=!KPmeE2XVSKmvXtEehhoZtP6biP(r$
zCzI(*oO|DKk(tST^8o|?;qdPLzjOZQ+>dvj&>@zN_HP5m0E=+A=efDBI*IG*Gy%%<
zz@yc%2XvGm)QQv5k^Z&#4C6!9MwX8BCmQ{3eAX|GTwn#>(PS6PoB=$Pw<CKBKLBV&
zb_3mx>n*?wz?%Tx2gwJ4apoy`A15D=>?%}hj`fV*p=6XW=YR(sp))`dxTnqHE&{&;
zPdeO}SVkf*6_$c45W3Z}u|Z&a8{r!6ZNY62S>5{jAd)Hkjg@h%@c)c#BvZK2lmGw|
z`Vh+%ECkF{t=)XpF3Z1bj=Pe9LpHbnQwjeTU#=4hB76#52DU2P2Ouj~^lRWwRd%eN
zBw_z%FL0CUlk!`s2!<DdgRAm78r^sGWZmbD^^*Y6eOJdEZYRibN9$EW9FD#=y9glV
zY-%$wg76eD;3WSxx_@?yTTMBeP5?x+GsOTup85vZ>`>QG&H__i_)I9=AuA=jn4<xW
z!ZoN3`U>0z>;@hRsg)>J(58cx;l;h_zE*-R7Wbz6Ff#1Mss*)zTImU4`2@?a7y;v4
zH=lJ_PM5Rkw*AU`Cmq6aa>chASJ&Z3Ebj`y;w$MM!fa6`13VU7Kc|T5Xl#7ecj?mp
zREV-nBJ6C)`?&}QDe_(KM>BrlN|iF{7-90j+J>N0^vY=LK;8!^9Y_m*aRPX{!S6ag
zgRw(13pJvt`;{^S-vgUk?8pV_Vh4a4P7~}uHT)ENFMqd71QIOl8Q6+24TM_+158z)
z54U-*C{M)S&!2Bfu&`?&#2Ti6;WojY;%6+I;uCof+*T2iUMz!7Eg<{}#DJSx)C$5f
zP(oSf>_s1t06cJ-U3?<9poS4O{Go>H>hro^ks;r3mm1Ehfq?m(_YE8UiVUgG%W9ZY
z!@O^}KR%JW*0e=66rUYj5BP~=x%$^x92-m_<lKT#h7yyxUmTxX5xNt{a`UcUQ-XFV
zKC|Hq;F0R|QsTswRzI62boA2)P|LK|+W^y@#{CEF=vbZ23tjU70000<MNUMnLSTXw
CR=u(S

literal 0
HcmV?d00001

diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
index 5ff93006cf4..c9b9fbff77b 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
@@ -2,8 +2,7 @@
 <html>
 <head>
   <title>Api Explorer</title>
-  <!-- DOL_CHANGE LDR Remove external links <link href='https://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
-  <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">-->
+  <!-- DOL_CHANGE LDR Remove external links <link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>-->
   <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
@@ -27,10 +26,11 @@
     $(function () {
       window.swaggerUi = new SwaggerUi({
       url: "resources.json",
+      validatorUrl: null,
       dom_id: "swagger-ui-container",
-      supportedSubmitMethods: ['get', 'post', 'put', 'patch', 'delete'],
+      supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
       onComplete: function(swaggerApi, swaggerUi){
-        log("Loaded Api Explorer");
+        log("Loaded API Explorer");
 
         if(typeof initOAuth == "function") {
           /*
@@ -45,15 +45,19 @@
           hljs.highlightBlock(e)
         });
       },
+      defaultModelRendering: 'model',
       onFailure: function(data) {
-        log("Unable to Load Api Explorer");
+        log("Unable to Load API Explorer");
       },
-      docExpansion: "none"
+      docExpansion: "none",
+      /*showRequestHeaders: true,
+      jsonEditor: true */
+      /*, sorter : "alpha"*/
     });
 
     $('#input_apiKey').change(function() {
       var key = $('#input_apiKey')[0].value;
-
+      log("key: " + key);
       if(key && key.trim() != "") {
         /* DOL_CHANGE LDR We set DOLAPIKEY into header */
         log("added key " + key);
@@ -67,11 +71,15 @@
         console.log("header DOLAPIKEY added with value "+key);
       }
     })
-    
     window.swaggerUi.load();
   });
-    
   </script>
+  
+  <style>
+	.info_title, .info_description, .info_contact, .info_license {
+		display: none;
+	}
+  </style>
 </head>
 
 <body class="swagger-section">
@@ -79,6 +87,14 @@
   <div class="swagger-ui-wrap">
     <a id="logo" href="#">API Explorer</a>
     <form id='api_selector'>
+      <!-- DOL_CHANGE LDR
+      <div class='input icon-btn'>
+        <img id="show-pet-store-icon" src="images/pet_store_api.png" title="Show Swagger Petstore Example Apis">
+      </div>
+      <div class='input icon-btn'>
+        <img id="show-wordnik-dev-icon" src="images/wordnik_api.png" title="Show Wordnik Developer Apis">
+      </div>
+      -->
       <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="hidden" value="resources.json"/></div>
       <div class='input'><input placeholder="DOLAPIKEY" id="input_apiKey" name="apiKey" type="text"/></div>
       <div class='input'><a id="explore" href="#">Explore</a></div>
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
index 19777eb90f0..8bb17fb076a 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger-oauth.js
@@ -48,72 +48,65 @@ function handleLogin() {
       str += '</label></li>';
       popup.append(str);
     }
-  
+  }
 
-    var $win = $(window),
-      dw = $win.width(),
-      dh = $win.height(),
-      st = $win.scrollTop(),
-      dlgWd = popupDialog.outerWidth(),
-      dlgHt = popupDialog.outerHeight(),
-      top = (dh -dlgHt)/2 + st,
-      left = (dw - dlgWd)/2;
+  var $win = $(window),
+    dw = $win.width(),
+    dh = $win.height(),
+    st = $win.scrollTop(),
+    dlgWd = popupDialog.outerWidth(),
+    dlgHt = popupDialog.outerHeight(),
+    top = (dh -dlgHt)/2 + st,
+    left = (dw - dlgWd)/2;
 
-    popupDialog.css({
-      top: (top < 0? 0 : top) + 'px',
-      left: (left < 0? 0 : left) + 'px'
-    });
+  popupDialog.css({
+    top: (top < 0? 0 : top) + 'px',
+    left: (left < 0? 0 : left) + 'px'
+  });
 
-    popupDialog.find('button.api-popup-cancel').click(function() {
-      popupMask.hide();
-      popupDialog.hide();
-    });
-    popupDialog.find('button.api-popup-authbtn').click(function() {
-      popupMask.hide();
-      popupDialog.hide();
+  popupDialog.find('button.api-popup-cancel').click(function() {
+    popupMask.hide();
+    popupDialog.hide();
+  });
+  popupDialog.find('button.api-popup-authbtn').click(function() {
+    popupMask.hide();
+    popupDialog.hide();
 
-      var authSchemes = window.swaggerUi.api.authSchemes;
-      var location = window.location;
-      var locationUrl = location.protocol + '//' + location.host + location.pathname;
-      var redirectUrl = locationUrl.replace("index.html","").concat("/o2c.html").replace("//o2c.html","/o2c.html");
-      var url = null;
+    var authSchemes = window.swaggerUi.api.authSchemes;
+    var host = window.location;
+    var pathname = location.pathname.substring(0, location.pathname.lastIndexOf("/"));
+    var redirectUrl = host.protocol + '//' + host.host + pathname + "/o2c.html";
+    var url = null;
 
-      var p = window.swaggerUi.api.authSchemes;
-      for (var key in p) {
-        if (p.hasOwnProperty(key)) {
-          var o = p[key].grantTypes;
-          for(var t in o) {
-            if(o.hasOwnProperty(t) && t === 'implicit') {
-              var dets = o[t];
-              url = dets.loginEndpoint.url + "?response_type=token";
-              window.swaggerUi.tokenName = dets.tokenName;
-            }
+    for (var key in authSchemes) {
+      if (authSchemes.hasOwnProperty(key)) {
+        var o = authSchemes[key].grantTypes;
+        for(var t in o) {
+          if(o.hasOwnProperty(t) && t === 'implicit') {
+            var dets = o[t];
+            url = dets.loginEndpoint.url + "?response_type=token";
+            window.swaggerUi.tokenName = dets.tokenName;
           }
         }
       }
-      var scopes = [];
-      var scopeForUrl='';
-      var o = $('.api-popup-scopes').find('input:checked');
+    }
+    var scopes = []
+    var o = $('.api-popup-scopes').find('input:checked');
 
-      for(var k =0; k < o.length; k++) {
-        scopes.push($(o[k]).attr("scope"));
-        if(k > 0){
-      	  scopeForUrl+=' ';
-        }
-        scopeForUrl+=$(o[k]).attr("scope");
-      }
+    for(k =0; k < o.length; k++) {
+      scopes.push($(o[k]).attr("scope"));
+    }
 
-      window.enabledScopes=scopes;
-    
+    window.enabledScopes=scopes;
 
-      url += '&redirect_uri=' + encodeURIComponent(redirectUrl);
-      url += '&realm=' + encodeURIComponent(realm);
-      url += '&client_id=' + encodeURIComponent(clientId);
-      url += '&scope=' + encodeURIComponent(scopeForUrl);
+    url += '&redirect_uri=' + encodeURIComponent(redirectUrl);
+    url += '&realm=' + encodeURIComponent(realm);
+    url += '&client_id=' + encodeURIComponent(clientId);
+    url += '&scope=' + encodeURIComponent(scopes);
+
+    window.open(url);
+  });
 
-      window.open(url);
-    });
-  }
   popupMask.show();
   popupDialog.show();
   return;
@@ -211,7 +204,7 @@ function onOAuthComplete(token) {
           }
         });
 
-        window.authorizations.add("key", new ApiKeyAuthorization("Authorization", "Bearer " + b, "header"));
+        window.authorizations.add("oauth2", new ApiKeyAuthorization("Authorization", "Bearer " + b, "header"));
       }
     }
   }
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
index 2100bb81e83..9e73a9b33e2 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/swagger.js
@@ -1,5 +1,5 @@
 // swagger.js
-// version 2.0.30
+// version 2.0.39
 
 var __bind = function(fn, me){
   return function(){
@@ -11,10 +11,20 @@ log = function(){
   log.history = log.history || [];
   log.history.push(arguments);
   if(this.console){
-    console.log( Array.prototype.slice.call(arguments) );
+    console.log( Array.prototype.slice.call(arguments)[0] );
   }
 };
 
+// if you want to apply conditional formatting of parameter values
+parameterMacro = function(value) {
+  return value;
+}
+
+// if you want to apply conditional formatting of model property values
+modelPropertyMacro = function(value) {
+  return value;
+}
+
 if (!Array.prototype.indexOf) {
   Array.prototype.indexOf = function(obj, start) {
     for (var i = (start || 0), j = this.length; i < j; i++) {
@@ -45,48 +55,50 @@ if (!('map' in Array.prototype)) {
 }
 
 Object.keys = Object.keys || (function () {
-    var hasOwnProperty = Object.prototype.hasOwnProperty,
-        hasDontEnumBug = !{toString:null}.propertyIsEnumerable("toString"),
-        DontEnums = [
-            'toString',
-            'toLocaleString',
-            'valueOf',
-            'hasOwnProperty',
-            'isPrototypeOf',
-            'propertyIsEnumerable',
-            'constructor'
-        ],
-        DontEnumsLength = DontEnums.length;
-  
-    return function (o) {
-        if (typeof o != "object" && typeof o != "function" || o === null)
-            throw new TypeError("Object.keys called on a non-object");
-     
-        var result = [];
-        for (var name in o) {
-            if (hasOwnProperty.call(o, name))
-                result.push(name);
-        }
-     
-        if (hasDontEnumBug) {
-            for (var i = 0; i < DontEnumsLength; i++) {
-                if (hasOwnProperty.call(o, DontEnums[i]))
-                    result.push(DontEnums[i]);
-            }   
-        }
-     
-        return result;
-    };
+  var hasOwnProperty = Object.prototype.hasOwnProperty,
+    hasDontEnumBug = !{toString:null}.propertyIsEnumerable("toString"),
+    DontEnums = [
+      'toString',
+      'toLocaleString',
+      'valueOf',
+      'hasOwnProperty',
+      'isPrototypeOf',
+      'propertyIsEnumerable',
+      'constructor'
+    ],
+  DontEnumsLength = DontEnums.length;
+
+  return function (o) {
+    if (typeof o != "object" && typeof o != "function" || o === null)
+      throw new TypeError("Object.keys called on a non-object");
+
+    var result = [];
+    for (var name in o) {
+      if (hasOwnProperty.call(o, name))
+        result.push(name);
+    }
+
+    if (hasDontEnumBug) {
+      for (var i = 0; i < DontEnumsLength; i++) {
+        if (hasOwnProperty.call(o, DontEnums[i]))
+          result.push(DontEnums[i]);
+      }
+    }
+
+    return result;
+  };
 })();
 
-
 var SwaggerApi = function(url, options) {
+  this.isBuilt = false;
   this.url = null;
   this.debug = false;
   this.basePath = null;
   this.authorizations = null;
   this.authorizationScheme = null;
   this.info = null;
+  this.useJQuery = false;
+  this.modelsArray = [];
 
   options = (options||{});
   if (url)
@@ -103,13 +115,20 @@ var SwaggerApi = function(url, options) {
   if (options.success != null)
     this.success = options.success;
 
+  if (typeof options.useJQuery === 'boolean')
+    this.useJQuery = options.useJQuery;
+
   this.failure = options.failure != null ? options.failure : function() {};
   this.progress = options.progress != null ? options.progress : function() {};
-  if (options.success != null)
+  if (options.success != null) {
     this.build();
+    this.isBuilt = true;
+  }
 }
 
 SwaggerApi.prototype.build = function() {
+  if(this.isBuilt)
+    return this;
   var _this = this;
   this.progress('fetching resource list: ' + this.url);
   var obj = {
@@ -117,7 +136,7 @@ SwaggerApi.prototype.build = function() {
     url: this.url,
     method: "get",
     headers: {
-      accept: "application/json"
+      accept: "application/json,application/json;charset=\"utf-8\",*/*"
     },
     on: {
       error: function(response) {
@@ -154,6 +173,7 @@ SwaggerApi.prototype.buildFromSpec = function(response) {
   }
   this.apis = {};
   this.apisArray = [];
+  this.consumes = response.consumes;
   this.produces = response.produces;
   this.authSchemes = response.authorizations;
   if (response.info != null) {
@@ -171,13 +191,13 @@ SwaggerApi.prototype.buildFromSpec = function(response) {
       }
     }
   }
-  if (response.basePath) {
+  if (response.basePath)
     this.basePath = response.basePath;
-  } else if (this.url.indexOf('?') > 0) {
+  else if (this.url.indexOf('?') > 0)
     this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
-  } else {
+  else
     this.basePath = this.url;
-  }
+
   if (isApi) {
     var newName = response.resourcePath.replace(/\//g, '');
     this.resourcePath = response.resourcePath;
@@ -272,7 +292,6 @@ SwaggerApi.prototype.fail = function(message) {
 
 SwaggerApi.prototype.setConsolidatedModels = function() {
   var model, modelName, resource, resource_name, _i, _len, _ref, _ref1, _results;
-  this.modelsArray = [];
   this.models = {};
   _ref = this.apis;
   for (resource_name in _ref) {
@@ -317,8 +336,8 @@ var SwaggerResource = function(resourceObj, api) {
   var _this = this;
   this.api = api;
   this.api = this.api;
-  produces = [];
-  consumes = [];
+  consumes = (this.consumes | []);
+  produces = (this.produces | []);
   this.path = this.api.resourcePath != null ? this.api.resourcePath : resourceObj.path;
   this.description = resourceObj.description;
 
@@ -349,7 +368,7 @@ var SwaggerResource = function(resourceObj, api) {
       method: "get",
       useJQuery: this.useJQuery,
       headers: {
-        accept: "application/json"
+        accept: "application/json,application/json;charset=\"utf-8\",*/*"
       },
       on: {
         response: function(resp) {
@@ -368,22 +387,28 @@ var SwaggerResource = function(resourceObj, api) {
   }
 }
 
-SwaggerResource.prototype.getAbsoluteBasePath = function(relativeBasePath) {
-  var parts, pos, url;
+SwaggerResource.prototype.getAbsoluteBasePath = function (relativeBasePath) {
+  var pos, url;
   url = this.api.basePath;
   pos = url.lastIndexOf(relativeBasePath);
-  if (pos === -1) {
-    parts = url.split("/");
-    url = parts[0] + "//" + parts[2];
-    if (relativeBasePath.indexOf("/") === 0) {
-      return url + relativeBasePath;
-    } else {
-      return url + "/" + relativeBasePath;
-    }
-  } else if (relativeBasePath === "/") {
-    return url.substring(0, pos);
-  } else {
-    return url.substring(0, pos) + relativeBasePath;
+  var parts = url.split("/");
+  var rootUrl = parts[0] + "//" + parts[2];
+
+  if(relativeBasePath.indexOf("http") === 0)
+    return relativeBasePath;
+  if(relativeBasePath === "/")
+    return rootUrl;
+  if(relativeBasePath.substring(0, 1) == "/") {
+    // use root + relative
+    return rootUrl + relativeBasePath;
+  }
+  else {
+    var pos = this.basePath.lastIndexOf("/");
+    var base = this.basePath.substring(0, pos);
+    if(base.substring(base.length - 1) == "/")
+      return base + relativeBasePath;
+    else
+      return base + "/" + relativeBasePath;
   }
 };
 
@@ -478,8 +503,7 @@ SwaggerResource.prototype.addOperations = function(resource_path, ops, consumes,
 
 SwaggerResource.prototype.sanitize = function(nickname) {
   var op;
-  op = nickname.replace(/[\s!@#$%^&*()_+=\[{\]};:<>|./?,\\'""-]/g, '_');
-  //'
+  op = nickname.replace(/[\s!@#$%^&*()_+=\[{\]};:<>|.\/?,\\'""-]/g, '_');
   op = op.replace(/((_){2,})/g, '_');
   op = op.replace(/^(_)*/g, '');
   op = op.replace(/([_])*$/g, '');
@@ -584,6 +608,7 @@ var SwaggerModelProperty = function(name, obj) {
   this.isCollection = this.dataType && (this.dataType.toLowerCase() === 'array' || this.dataType.toLowerCase() === 'list' || this.dataType.toLowerCase() === 'set');
   this.descr = obj.description;
   this.required = obj.required;
+  this.defaultValue = modelPropertyMacro(obj.defaultValue);
   if (obj.items != null) {
     if (obj.items.type != null) {
       this.refDataType = obj.items.type;
@@ -629,7 +654,9 @@ SwaggerModelProperty.prototype.getSampleValue = function(modelsToIgnore) {
 
 SwaggerModelProperty.prototype.toSampleValue = function(value) {
   var result;
-  if (value === "integer") {
+  if ((typeof this.defaultValue !== 'undefined') && this.defaultValue !== null) {
+    result = this.defaultValue;
+  } else if (value === "integer") {
     result = 0;
   } else if (value === "boolean") {
     result = false;
@@ -759,6 +786,7 @@ var SwaggerOperation = function(nickname, path, method, parameters, summary, not
         }
       }
     }
+    param.defaultValue = parameterMacro(param.defaultValue);
   }
   this.resource[this.nickname] = function(args, callback, error) {
     return _this["do"](args, callback, error);
@@ -812,7 +840,7 @@ SwaggerOperation.prototype.getSampleJSON = function(type, models) {
       else
         return JSON.stringify(val, null, 2);
     }
-    else 
+    else
       return val;
   }
 };
@@ -1073,7 +1101,7 @@ SwaggerOperation.prototype.formatXml = function(xml) {
 var SwaggerRequest = function(type, url, params, opts, successCallback, errorCallback, operation, execution) {
   var _this = this;
   var errors = [];
-  this.useJQuery = (typeof operation.useJQuery !== 'undefined' ? operation.useJQuery : null);
+  this.useJQuery = (typeof operation.resource.useJQuery !== 'undefined' ? operation.resource.useJQuery : null);
   this.type = (type||errors.push("SwaggerRequest type is required (get/post/put/delete/patch/options)."));
   this.url = (url||errors.push("SwaggerRequest url is required."));
   this.params = params;
@@ -1090,96 +1118,59 @@ var SwaggerRequest = function(type, url, params, opts, successCallback, errorCal
 
   this.type = this.type.toUpperCase();
 
-  var myHeaders = {};
+  // set request, response content type headers
+  var headers = this.setHeaders(params, this.operation);
   var body = params.body;
-  var parent = params["parent"];
-  var requestContentType = "application/json";
 
-  var formParams = [];
-  var fileParams = [];
-  var params = this.operation.parameters;
-
-
-  for(var i = 0; i < params.length; i++) {
-    var param = params[i];
-    if(param.paramType === "form")
-      formParams.push(param);
-    else if(param.paramType === "file")
-      fileParams.push(param);
-  }
-
-
-  if (body && (this.type === "POST" || this.type === "PUT" || this.type === "PATCH")) {
-    if (this.opts.requestContentType) {
-      requestContentType = this.opts.requestContentType;
-    }
-  } else {
-    // if any form params, content type must be set
-    if(formParams.length > 0) {
-      if(fileParams.length > 0)
-        requestContentType = "multipart/form-data";
-      else
-        requestContentType = "application/x-www-form-urlencoded";
-    }
-    else if (this.type != "DELETE")
-      requestContentType = null;
-  }
-
-  if (requestContentType && this.operation.consumes) {
-    if (this.operation.consumes[requestContentType] === 'undefined') {
-      log("server doesn't consume " + requestContentType + ", try " + JSON.stringify(this.operation.consumes));
-      if (this.requestContentType === null) {
-        requestContentType = this.operation.consumes[0];
-      }
-    }
-  }
-
-  var responseContentType = null;
-  if (this.opts.responseContentType) {
-    responseContentType = this.opts.responseContentType;
-  } else {
-    responseContentType = "application/json";
-  }
-  if (responseContentType && this.operation.produces) {
-    if (this.operation.produces[responseContentType] === 'undefined') {
-      log("server can't produce " + responseContentType);
-    }
-  }
-  if (requestContentType && requestContentType.indexOf("application/x-www-form-urlencoded") === 0) {
-    var fields = {};
-    var possibleParams = {};
+  // encode the body for form submits
+  if (headers["Content-Type"]) {
     var values = {};
-    var key;
-    for(key in formParams){
-      var param = formParams[key];
-      values[param.name] = param;
+    var i;
+    var operationParams = this.operation.parameters;
+    for(i = 0; i < operationParams.length; i++) {
+      var param = operationParams[i];
+      if(param.paramType === "form")
+        values[param.name] = param;
     }
 
-    var encoded = "";
-    var key;
-    for(key in values) {
-      value = this.params[key];
-      if(typeof value !== 'undefined'){
-        if(encoded !== "")
-          encoded += "&";
-        encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
+    if(headers["Content-Type"].indexOf("application/x-www-form-urlencoded") === 0) {
+      var encoded = "";
+      var key;
+      for(key in values) {
+        value = this.params[key];
+        if(typeof value !== 'undefined'){
+          if(encoded !== "")
+            encoded += "&";
+          encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
+        }
       }
+      body = encoded;
+    }
+    else if (headers["Content-Type"].indexOf("multipart/form-data") === 0) {
+      // encode the body for form submits
+      var data = "";
+      var boundary = "----SwaggerFormBoundary" + Date.now();
+      var key;
+      for(key in values) {
+        value = this.params[key];
+        if(typeof value !== 'undefined') {
+          data += '--' + boundary + '\n';
+          data += 'Content-Disposition: form-data; name="' + key + '"';
+          data += '\n\n';
+          data += value + "\n";
+        }
+      }
+      data += "--" + boundary + "--\n";
+      headers["Content-Type"] = "multipart/form-data; boundary=" + boundary;
+      body = data;
     }
-    body = encoded;
   }
-  var name;
-  for (name in this.headers)
-    myHeaders[name] = this.headers[name];
-  if ((requestContentType && body !== "") || (requestContentType === "application/x-www-form-urlencoded"))
-    myHeaders["Content-Type"] = requestContentType;
-  if (responseContentType)
-    myHeaders["Accept"] = responseContentType;
 
   if (!((this.headers != null) && (this.headers.mock != null))) {
     obj = {
       url: this.url,
       method: this.type,
-      headers: myHeaders,
+      headers: headers,
       body: body,
       useJQuery: this.useJQuery,
       on: {
@@ -1216,6 +1207,77 @@ var SwaggerRequest = function(type, url, params, opts, successCallback, errorCal
   }
 };
 
+SwaggerRequest.prototype.setHeaders = function(params, operation) {
+  // default type
+  var accepts = "application/json";
+  var consumes = "application/json";
+
+  var allDefinedParams = this.operation.parameters;
+  var definedFormParams = [];
+  var definedFileParams = [];
+  var body = params.body;
+  var headers = {};
+
+  // get params from the operation and set them in definedFileParams, definedFormParams, headers
+  var i;
+  for(i = 0; i < allDefinedParams.length; i++) {
+    var param = allDefinedParams[i];
+    if(param.paramType === "form")
+      definedFormParams.push(param);
+    else if(param.paramType === "file")
+      definedFileParams.push(param);
+    else if(param.paramType === "header" && this.params.headers) {
+      var key = param.name;
+      var headerValue = this.params.headers[param.name];
+      if(typeof this.params.headers[param.name] !== 'undefined')
+        headers[key] = headerValue;
+    }
+  }
+
+  // if there's a body, need to set the accepts header via requestContentType
+  if (body && (this.type === "POST" || this.type === "PUT" || this.type === "PATCH" || this.type === "DELETE")) {
+    if (this.opts.requestContentType)
+      consumes = this.opts.requestContentType;
+  } else {
+    // if any form params, content type must be set
+    if(definedFormParams.length > 0) {
+      if(definedFileParams.length > 0)
+        consumes = "multipart/form-data";
+      else
+        consumes = "application/x-www-form-urlencoded";
+    }
+    else if (this.type === "DELETE")
+      body = "{}";
+    else if (this.type != "DELETE")
+      accepts = null;
+  }
+
+  if (consumes && this.operation.consumes) {
+    if (this.operation.consumes.indexOf(consumes) === -1) {
+      log("server doesn't consume " + consumes + ", try " + JSON.stringify(this.operation.consumes));
+      consumes = this.operation.consumes[0];
+    }
+  }
+
+  if (this.opts.responseContentType) {
+    accepts = this.opts.responseContentType;
+  } else {
+    accepts = "application/json";
+  }
+  if (accepts && this.operation.produces) {
+    if (this.operation.produces.indexOf(accepts) === -1) {
+      log("server can't produce " + accepts);
+      accepts = this.operation.produces[0];
+    }
+  }
+
+  if ((consumes && body !== "") || (consumes === "application/x-www-form-urlencoded"))
+    headers["Content-Type"] = consumes;
+  if (accepts)
+    headers["Accept"] = accepts;
+  return headers;
+}
+
 SwaggerRequest.prototype.asCurl = function() {
   var results = [];
   if(this.headers) {
@@ -1259,9 +1321,16 @@ SwaggerHttp.prototype.isIE8 = function() {
 };
 
 /*
- * JQueryHttpClient lets a browser take advantage of JQuery's cross-browser magic
+ * JQueryHttpClient lets a browser take advantage of JQuery's cross-browser magic.
+ * NOTE: when jQuery is available it will export both '$' and 'jQuery' to the global space.
+ *       Since we are using closures here we need to alias it for internal use.
  */
-var JQueryHttpClient = function(options) {}
+var JQueryHttpClient = function(options) {
+  "use strict";
+  if(!jQuery){
+    var jQuery = window.jQuery;
+  }
+}
 
 JQueryHttpClient.prototype.execute = function(obj) {
   var cb = obj.on;
@@ -1335,8 +1404,8 @@ JQueryHttpClient.prototype.execute = function(obj) {
       return cb.response(out);
   };
 
-  $.support.cors = true;
-  return $.ajax(obj);
+  jQuery.support.cors = true;
+  return jQuery.ajax(obj);
 }
 
 /*
@@ -1411,11 +1480,36 @@ ShredHttpClient.prototype.execute = function(obj) {
     return out;
   };
 
+  // Transform an error into a usable response-like object
+  var transformError = function(error) {
+    var out = {
+      // Default to a status of 0 - The client will treat this as a generic permissions sort of error
+      status: 0,
+      data: error.message || error
+    };
+
+    if(error.code) {
+      out.obj = error;
+
+      if(error.code === 'ENOTFOUND' || error.code === 'ECONNREFUSED' ) {
+        // We can tell the client that this should be treated as a missing resource and not as a permissions thing
+        out.status = 404;
+      }
+    }
+
+    return out;
+  };
+
   res = {
     error: function(response) {
       if (obj)
         return cb.error(transform(response));
     },
+    // Catch the Shred error raised when the request errors as it is made (i.e. No Response is coming)
+    request_error: function(err) {
+      if(obj)
+        return cb.error(transformError(err));
+    },
     redirect: function(response) {
       if (obj)
         return cb.redirect(transform(response));
@@ -1452,26 +1546,42 @@ SwaggerAuthorizations.prototype.remove = function(name) {
 };
 
 SwaggerAuthorizations.prototype.apply = function(obj, authorizations) {
-  status = null;
+  var status = null;
   var key;
-  for (key in this.authz) {
-    value = this.authz[key];
-    result = value.apply(obj, authorizations);
-    if (result === false)
-      status = false;
-    if (result === true)
-      status = true;
+
+  // if the "authorizations" key is undefined, or has an empty array, add all keys
+  if(typeof authorizations === 'undefined' || Object.keys(authorizations).length == 0) {
+    for (key in this.authz) {
+      value = this.authz[key];
+      result = value.apply(obj, authorizations);
+      if (result === true)
+        status = true;
+    }
   }
+  else {
+    for(name in authorizations) {
+      for (key in this.authz) {
+        if(key == name) {
+          value = this.authz[key];
+          result = value.apply(obj, authorizations);
+          if (result === true)
+            status = true;
+        }
+      }      
+    }
+  }
+
   return status;
 };
 
 /**
  * ApiKeyAuthorization allows a query param or header to be injected
  */
-var ApiKeyAuthorization = function(name, value, type) {
+var ApiKeyAuthorization = function(name, value, type, delimiter) {
   this.name = name;
   this.value = value;
   this.type = type;
+  this.delimiter = delimiter;
 };
 
 ApiKeyAuthorization.prototype.apply = function(obj, authorizations) {
@@ -1482,7 +1592,12 @@ ApiKeyAuthorization.prototype.apply = function(obj, authorizations) {
       obj.url = obj.url + "?" + this.name + "=" + this.value;
     return true;
   } else if (this.type === "header") {
-    obj.headers[this.name] = this.value;
+    if(typeof obj.headers[this.name] !== 'undefined') {
+      if(typeof this.delimiter !== 'undefined')
+        obj.headers[this.name] = obj.headers[this.name] + this.delimiter +  this.value;
+    }
+    else
+      obj.headers[this.name] = this.value;
     return true;
   }
 };
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
index 5c6aad20be6..c28bf145ab6 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
@@ -1,5 +1,5 @@
 // swagger-ui.js
-// version 2.0.17
+// version 2.0.23
 $(function() {
 
 	// Helper function for vertically aligning DOM elements
@@ -68,7 +68,7 @@ log = function(){
   log.history = log.history || [];
   log.history.push(arguments);
   if(this.console){
-    console.log( Array.prototype.slice.call(arguments) );
+    console.log( Array.prototype.slice.call(arguments)[0] );
   }
 };
 
@@ -240,67 +240,74 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
 function program1(depth0,data) {
   
   var buffer = "", stack1, stack2;
-  buffer += "\n                ";
+  buffer += "\n    <div class=\"info_title\">"
+    + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.title)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
+    + "</div>\n    <div class=\"info_description\">";
+  stack2 = ((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.description)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "</div>\n    ";
   stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.termsOfServiceUrl), {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
   if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n                ";
+  buffer += "\n    ";
   stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.contact), {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
   if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n                ";
+  buffer += "\n    ";
   stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.license), {hash:{},inverse:self.noop,fn:self.program(6, program6, data),data:data});
   if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n            ";
+  buffer += "\n  ";
   return buffer;
   }
 function program2(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += "<li><a href=\""
+  buffer += "<div class=\"info_tos\"><a href=\""
     + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.termsOfServiceUrl)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\" title=\"Terms of Service\"><i class=\"fa fa-lg fa-bullhorn\"></i> Terms</a></li>";
+    + "\">Terms of service</a></div>";
   return buffer;
   }
 
 function program4(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += "<li><a href=\"mailto:"
+  buffer += "<div class='info_contact'><a href=\"mailto:"
     + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.contact)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\"><i class=\"fa fa-lg fa-send\"></i> Contact</a></li>";
+    + "\">Contact the developer</a></div>";
   return buffer;
   }
 
 function program6(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += "<li><a href=\""
+  buffer += "<div class='info_license'><a href='"
     + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.licenseUrl)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\" title=\""
+    + "'>"
     + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.license)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\"><i class=\"fa fa-lg fa-certificate\"></i> License</a></li>";
+    + "</a></div>";
   return buffer;
   }
 
 function program8(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += " v";
+  buffer += "\n        , <span style=\"font-variant: small-caps\">api version</span>: ";
   if (stack1 = helpers.apiVersion) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.apiVersion; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1);
+  buffer += escapeExpression(stack1)
+    + "\n        ";
   return buffer;
   }
 
-  buffer += "<div class='info' id='api_info'>\n</div>\n<div class='container' id='resources_container'>\n    <ul id='resources'>\n    </ul>\n\n    <div class=\"footer\">\n        <ul id=\"footer-nav\">\n            ";
+  buffer += "<div class='info' id='api_info'>\n  ";
   stack1 = helpers['if'].call(depth0, depth0.info, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n            <li>\n                ";
+  buffer += "\n</div>\n<div class='container' id='resources_container'>\n    <ul id='resources'>\n    </ul>\n\n    <div class=\"footer\">\n        <br>\n        <br>\n        <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: ";
   if (stack1 = helpers.basePath) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.basePath; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1);
+  buffer += escapeExpression(stack1)
+    + "\n        ";
   stack1 = helpers['if'].call(depth0, depth0.apiVersion, {hash:{},inverse:self.noop,fn:self.program(8, program8, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += " Powered by Restler & Swagger\n            </li>\n        </ul>\n    </div>\n</div>\n";
+  buffer += "]</h4>\n    </div>\n</div>\n";
   return buffer;
   });
 })();
@@ -389,7 +396,7 @@ function program18(depth0,data) {
 function program20(depth0,data) {
   
   
-  return "\n          <div class='sandbox_header'>\n            <input class='submit' name='commit' type='button' value='Try it out!' />\n            <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n            <img alt='Throbber' class='response_throbber' src='images/throbber.gif' style='display:none' />\n          </div>\n          ";
+  return "\n          <div class='sandbox_header'>\n            <input class='submit' name='commit' type='button' value='Try it out!' />\n            <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n            <span class='response_throbber' style='display:none'></span>\n          </div>\n          ";
   }
 
   buffer += "\n  <ul class='operations' >\n    <li class='";
@@ -555,7 +562,7 @@ function program9(depth0,data) {
   
   var buffer = "", stack1;
   buffer += "\n		";
-  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(12, program12, data),fn:self.program(10, program10, data),data:data});
+  stack1 = helpers['if'].call(depth0, depth0.isFile, {hash:{},inverse:self.program(10, program10, data),fn:self.program(2, program2, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n	";
   return buffer;
@@ -563,7 +570,16 @@ function program9(depth0,data) {
 function program10(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += "\n			<input class='parameter' minlength='0' name='";
+  buffer += "\n			";
+  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(13, program13, data),fn:self.program(11, program11, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n		";
+  return buffer;
+  }
+function program11(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "\n				<input class='parameter' minlength='0' name='";
   if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
@@ -571,18 +587,18 @@ function program10(depth0,data) {
   if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "'/>\n		";
+    + "'/>\n			";
   return buffer;
   }
 
-function program12(depth0,data) {
+function program13(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += "\n			<input class='parameter' minlength='0' name='";
+  buffer += "\n				<input class='parameter' minlength='0' name='";
   if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "' placeholder='' type='text' value=''/>\n		";
+    + "' placeholder='' type='text' value=''/>\n			";
   return buffer;
   }
 
@@ -1057,23 +1073,19 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
 
 function program1(depth0,data) {
   
-  var buffer = "", stack1;
-  buffer += " : ";
-  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  return buffer;
+  
+  return " : ";
   }
 
   buffer += "<div class='heading'>\n  <h2>\n    <a href='#!/";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "' onclick=\"Docs.toggleEndpointListForResource('";
+    + "' class=\"toggleEndpointList\" data-id=\"";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "');\">";
+    + "\">";
   if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
@@ -1083,6 +1095,9 @@ function program1(depth0,data) {
   else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   if (!helpers.description) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
   if(stack1 || stack1 === 0) { buffer += stack1; }
+  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
@@ -1091,19 +1106,19 @@ function program1(depth0,data) {
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "'\n         onclick=\"Docs.toggleEndpointListForResource('";
+    + "' class=\"toggleEndpointList\" data-id=\"";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "');\">Show/Hide</a>\n    </li>\n    <li>\n      <a href='#' onclick=\"Docs.collapseOperationsForResource('";
+    + "\">Show/Hide</a>\n    </li>\n    <li>\n      <a href='#' class=\"collapseResource\" data-id=\"";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "'); return false;\">\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href='#' onclick=\"Docs.expandOperationsForResource('";
+    + "\">\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href='#' class=\"expandResource\" data-id=";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "'); return false;\">\n        Expand Operations\n      </a>\n    </li>\n    <li>\n      <a href='";
+    + ">\n        Expand Operations\n      </a>\n    </li>\n    <li>\n      <a href='";
   if (stack1 = helpers.url) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.url; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
@@ -1203,18 +1218,18 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
 
 
 
-// Generated by CoffeeScript 1.5.0
+// Generated by CoffeeScript 1.6.3
 (function() {
-  var ContentTypeView, HeaderView, MainView, OperationView, ParameterContentTypeView, ParameterView, ResourceView, ResponseContentTypeView, SignatureView, StatusCodeView, SwaggerUi,
+  var ContentTypeView, HeaderView, MainView, OperationView, ParameterContentTypeView, ParameterView, ResourceView, ResponseContentTypeView, SignatureView, StatusCodeView, SwaggerUi, _ref, _ref1, _ref10, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9,
     __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
   SwaggerUi = (function(_super) {
-
     __extends(SwaggerUi, _super);
 
     function SwaggerUi() {
-      SwaggerUi.__super__.constructor.apply(this, arguments);
+      _ref = SwaggerUi.__super__.constructor.apply(this, arguments);
+      return _ref;
     }
 
     SwaggerUi.prototype.dom_id = "swagger_ui";
@@ -1263,9 +1278,9 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     };
 
     SwaggerUi.prototype.load = function() {
-      var url, _ref;
-      if ((_ref = this.mainView) != null) {
-        _ref.clear();
+      var url, _ref1;
+      if ((_ref1 = this.mainView) != null) {
+        _ref1.clear();
       }
       url = this.options.url;
       if (url.indexOf("http") !== 0) {
@@ -1281,10 +1296,10 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     SwaggerUi.prototype.render = function() {
       var _this = this;
       this.showMessage('Finished Loading Resource Information. Rendering Swagger UI...');
-      this.headerView.updateInfo(this.api.info);
       this.mainView = new MainView({
         model: this.api,
-        el: $('#' + this.dom_id)
+        el: $('#' + this.dom_id),
+        swaggerOptions: this.options
       }).render();
       this.showMessage();
       switch (this.options.docExpansion) {
@@ -1355,11 +1370,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   window.SwaggerUi = SwaggerUi;
 
   HeaderView = (function(_super) {
-
     __extends(HeaderView, _super);
 
     function HeaderView() {
-      HeaderView.__super__.constructor.apply(this, arguments);
+      _ref1 = HeaderView.__super__.constructor.apply(this, arguments);
+      return _ref1;
     }
 
     HeaderView.prototype.events = {
@@ -1412,40 +1427,56 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
       }
     };
 
-    HeaderView.prototype.updateInfo = function(info) {
-      if (info.title != null) {
-        $('#logo').text(info.title);
-      }
-      if (info.description != null) {
-        $('#logo').attr('title', info.description);
-      }
-      if (info.termsOfServiceUrl != null) {
-        return $('#logo').attr('href', info.termsOfServiceUrl);
-      }
-    };
-
     return HeaderView;
 
   })(Backbone.View);
 
   MainView = (function(_super) {
+    var sorters;
 
     __extends(MainView, _super);
 
     function MainView() {
-      MainView.__super__.constructor.apply(this, arguments);
+      _ref2 = MainView.__super__.constructor.apply(this, arguments);
+      return _ref2;
     }
 
-    MainView.prototype.initialize = function() {};
+    sorters = {
+      'alpha': function(a, b) {
+        return a.path.localeCompare(b.path);
+      },
+      'method': function(a, b) {
+        return a.method.localeCompare(b.method);
+      }
+    };
+
+    MainView.prototype.initialize = function(opts) {
+      var route, sorter, sorterName, _i, _len, _ref3;
+      if (opts == null) {
+        opts = {};
+      }
+      if (opts.swaggerOptions.sorter) {
+        sorterName = opts.swaggerOptions.sorter;
+        sorter = sorters[sorterName];
+        _ref3 = this.model.apisArray;
+        for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
+          route = _ref3[_i];
+          route.operationsArray.sort(sorter);
+        }
+        if (sorterName === "alpha") {
+          return this.model.apisArray.sort(sorter);
+        }
+      }
+    };
 
     MainView.prototype.render = function() {
-      var counter, id, resource, resources, _i, _len, _ref;
+      var counter, id, resource, resources, _i, _len, _ref3;
       $(this.el).html(Handlebars.templates.main(this.model));
       resources = {};
       counter = 0;
-      _ref = this.model.apisArray;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        resource = _ref[_i];
+      _ref3 = this.model.apisArray;
+      for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
+        resource = _ref3[_i];
         id = resource.name;
         while (typeof resources[id] !== 'undefined') {
           id = id + "_" + counter;
@@ -1464,7 +1495,8 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
         model: resource,
         tagName: 'li',
         id: 'resource_' + resource.id,
-        className: 'resource'
+        className: 'resource',
+        swaggerOptions: this.options.swaggerOptions
       });
       return $('#resources').append(resourceView.render().el);
     };
@@ -1478,22 +1510,22 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   })(Backbone.View);
 
   ResourceView = (function(_super) {
-
     __extends(ResourceView, _super);
 
     function ResourceView() {
-      ResourceView.__super__.constructor.apply(this, arguments);
+      _ref3 = ResourceView.__super__.constructor.apply(this, arguments);
+      return _ref3;
     }
 
     ResourceView.prototype.initialize = function() {};
 
     ResourceView.prototype.render = function() {
-      var counter, id, methods, operation, _i, _len, _ref;
+      var counter, id, methods, operation, _i, _len, _ref4;
       $(this.el).html(Handlebars.templates.resource(this.model));
       methods = {};
-      _ref = this.model.operationsArray;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        operation = _ref[_i];
+      _ref4 = this.model.operationsArray;
+      for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
+        operation = _ref4[_i];
         counter = 0;
         id = operation.nickname;
         while (typeof methods[id] !== 'undefined') {
@@ -1505,6 +1537,10 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
         operation.parentId = this.model.id;
         this.addOperation(operation);
       }
+      $('.toggleEndpointList', this.el).click(this.callDocs.bind(this, 'toggleEndpointListForResource'));
+      $('.collapseResource', this.el).click(this.callDocs.bind(this, 'collapseOperationsForResource'));
+      /* DOL_CHANGE LDR Fix typo error that break expand */
+      $('.expandResource', this.el).click(this.callDocs.bind(this, 'expandOperationsForResource'));
       return this;
     };
 
@@ -1514,22 +1550,28 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
       operationView = new OperationView({
         model: operation,
         tagName: 'li',
-        className: 'endpoint'
+        className: 'endpoint',
+        swaggerOptions: this.options.swaggerOptions
       });
       $('.endpoints', $(this.el)).append(operationView.render().el);
       return this.number++;
     };
 
+    ResourceView.prototype.callDocs = function(fnName, e) {
+      e.preventDefault();
+      return Docs[fnName](e.currentTarget.getAttribute('data-id'));
+    };
+
     return ResourceView;
 
   })(Backbone.View);
 
   OperationView = (function(_super) {
-
     __extends(OperationView, _super);
 
     function OperationView() {
-      OperationView.__super__.constructor.apply(this, arguments);
+      _ref4 = OperationView.__super__.constructor.apply(this, arguments);
+      return _ref4;
     }
 
     OperationView.prototype.invocationUrl = null;
@@ -1548,8 +1590,8 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     OperationView.prototype.mouseEnter = function(e) {
       var elem, hgh, pos, scMaxX, scMaxY, scX, scY, wd, x, y;
       elem = $(e.currentTarget.parentNode).find('#api_information_panel');
-      x = event.pageX;
-      y = event.pageY;
+      x = e.pageX;
+      y = e.pageY;
       scX = $(window).scrollLeft();
       scY = $(window).scrollTop();
       scMaxX = scX + $(window).width();
@@ -1580,16 +1622,16 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     };
 
     OperationView.prototype.render = function() {
-      var contentTypeModel, isMethodSubmissionSupported, k, o, param, responseContentTypeView, responseSignatureView, signatureModel, statusCode, type, v, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref, _ref1, _ref2, _ref3;
+      var contentTypeModel, isMethodSubmissionSupported, k, o, param, responseContentTypeView, responseSignatureView, signatureModel, statusCode, type, v, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref5, _ref6, _ref7, _ref8;
       isMethodSubmissionSupported = true;
       if (!isMethodSubmissionSupported) {
         this.model.isReadOnly = true;
       }
       this.model.oauth = null;
       if (this.model.authorizations) {
-        _ref = this.model.authorizations;
-        for (k in _ref) {
-          v = _ref[k];
+        _ref5 = this.model.authorizations;
+        for (k in _ref5) {
+          v = _ref5[k];
           if (k === "oauth2") {
             if (this.model.oauth === null) {
               this.model.oauth = {};
@@ -1624,9 +1666,9 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
       };
       contentTypeModel.consumes = this.model.consumes;
       contentTypeModel.produces = this.model.produces;
-      _ref1 = this.model.parameters;
-      for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-        param = _ref1[_j];
+      _ref6 = this.model.parameters;
+      for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
+        param = _ref6[_j];
         type = param.type || param.dataType;
         if (type.toLowerCase() === 'file') {
           if (!contentTypeModel.consumes) {
@@ -1639,14 +1681,14 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
         model: contentTypeModel
       });
       $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);
-      _ref2 = this.model.parameters;
-      for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
-        param = _ref2[_k];
+      _ref7 = this.model.parameters;
+      for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
+        param = _ref7[_k];
         this.addParameter(param, contentTypeModel.consumes);
       }
-      _ref3 = this.model.responseMessages;
-      for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) {
-        statusCode = _ref3[_l];
+      _ref8 = this.model.responseMessages;
+      for (_l = 0, _len3 = _ref8.length; _l < _len3; _l++) {
+        statusCode = _ref8[_l];
         this.addStatusCode(statusCode);
       }
       return this;
@@ -1673,7 +1715,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     };
 
     OperationView.prototype.submitOperation = function(e) {
-      var error_free, form, isFileUpload, map, o, opts, val, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2;
+      var error_free, form, isFileUpload, map, o, opts, val, _i, _j, _k, _len, _len1, _len2, _ref5, _ref6, _ref7;
       if (e != null) {
         e.preventDefault();
       }
@@ -1698,9 +1740,9 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
           parent: this
         };
         isFileUpload = false;
-        _ref = form.find("input");
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          o = _ref[_i];
+        _ref5 = form.find("input");
+        for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
+          o = _ref5[_i];
           if ((o.value != null) && jQuery.trim(o.value).length > 0) {
             map[o.name] = o.value;
           }
@@ -1708,16 +1750,16 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
             isFileUpload = true;
           }
         }
-        _ref1 = form.find("textarea");
-        for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-          o = _ref1[_j];
+        _ref6 = form.find("textarea");
+        for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
+          o = _ref6[_j];
           if ((o.value != null) && jQuery.trim(o.value).length > 0) {
             map["body"] = o.value;
           }
         }
-        _ref2 = form.find("select");
-        for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
-          o = _ref2[_k];
+        _ref7 = form.find("select");
+        for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
+          o = _ref7[_k];
           val = this.getSelectedValue(o);
           if ((val != null) && jQuery.trim(val).length > 0) {
             map[o.name] = val;
@@ -1739,46 +1781,46 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     };
 
     OperationView.prototype.handleFileUpload = function(map, form) {
-      var bodyParam, el, headerParams, o, obj, param, params, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref, _ref1, _ref2, _ref3,
+      var bodyParam, el, headerParams, o, obj, param, params, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref5, _ref6, _ref7, _ref8,
         _this = this;
-      _ref = form.serializeArray();
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        o = _ref[_i];
+      _ref5 = form.serializeArray();
+      for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
+        o = _ref5[_i];
         if ((o.value != null) && jQuery.trim(o.value).length > 0) {
           map[o.name] = o.value;
         }
       }
       bodyParam = new FormData();
       params = 0;
-      _ref1 = this.model.parameters;
-      for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-        param = _ref1[_j];
+      _ref6 = this.model.parameters;
+      for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
+        param = _ref6[_j];
         if (param.paramType === 'form') {
-          if (map[param.name] !== void 0) {
+          if (param.type.toLowerCase() !== 'file' && map[param.name] !== void 0) {
             bodyParam.append(param.name, map[param.name]);
           }
         }
       }
       headerParams = {};
-      _ref2 = this.model.parameters;
-      for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
-        param = _ref2[_k];
+      _ref7 = this.model.parameters;
+      for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
+        param = _ref7[_k];
         if (param.paramType === 'header') {
           headerParams[param.name] = map[param.name];
         }
       }
       log(headerParams);
-      _ref3 = form.find('input[type~="file"]');
-      for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) {
-        el = _ref3[_l];
+      _ref8 = form.find('input[type~="file"]');
+      for (_l = 0, _len3 = _ref8.length; _l < _len3; _l++) {
+        el = _ref8[_l];
         if (typeof el.files[0] !== 'undefined') {
           bodyParam.append($(el).attr('name'), el.files[0]);
           params += 1;
         }
       }
-      log(bodyParam);
       this.invocationUrl = this.model.supportHeaderParams() ? (headerParams = this.model.getHeaderParams(map), this.model.urlify(map, false)) : this.model.urlify(map, true);
-      $(".request_url", $(this.el)).html("<pre>" + this.invocationUrl + "</pre>");
+      $(".request_url", $(this.el)).html("<pre></pre>");
+      $(".request_url pre", $(this.el)).text(this.invocationUrl);
       obj = {
         type: this.model.method,
         url: this.invocationUrl,
@@ -1829,14 +1871,14 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     };
 
     OperationView.prototype.getSelectedValue = function(select) {
-      var opt, options, _i, _len, _ref;
+      var opt, options, _i, _len, _ref5;
       if (!select.multiple) {
         return select.value;
       } else {
         options = [];
-        _ref = select.options;
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          opt = _ref[_i];
+        _ref5 = select.options;
+        for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
+          opt = _ref5[_i];
           if (opt.selected) {
             options.push(opt.value);
           }
@@ -1924,9 +1966,9 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
         padding = '';
         indent += transitions[fromTo];
         padding = ((function() {
-          var _j, _ref, _results;
+          var _j, _ref5, _results;
           _results = [];
-          for (j = _j = 0, _ref = indent; 0 <= _ref ? _j < _ref : _j > _ref; j = 0 <= _ref ? ++_j : --_j) {
+          for (j = _j = 0, _ref5 = indent; 0 <= _ref5 ? _j < _ref5 : _j > _ref5; j = 0 <= _ref5 ? ++_j : --_j) {
             _results.push('  ');
           }
           return _results;
@@ -1945,7 +1987,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
     };
 
     OperationView.prototype.showStatus = function(response) {
-      var code, content, contentType, headers, pre, response_body, url;
+      var code, content, contentType, headers, opts, pre, response_body, response_body_el, url;
       if (response.content === void 0) {
         content = response.data;
         url = response.url;
@@ -1974,14 +2016,21 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
         pre = $('<pre class="json" />').append(code);
       }
       response_body = pre;
-      $(".request_url", $(this.el)).html("<pre>" + url + "</pre>");
+      $(".request_url", $(this.el)).html("<pre></pre>");
+      $(".request_url pre", $(this.el)).text(url);
       $(".response_code", $(this.el)).html("<pre>" + response.status + "</pre>");
       $(".response_body", $(this.el)).html(response_body);
-      $(".response_headers", $(this.el)).html("<pre>" + JSON.stringify(response.headers, null, "  ").replace(/\n/g, "<br>") + "</pre>");
+      $(".response_headers", $(this.el)).html("<pre>" + _.escape(JSON.stringify(response.headers, null, "  ")).replace(/\n/g, "<br>") + "</pre>");
       $(".response", $(this.el)).slideDown();
       $(".response_hider", $(this.el)).show();
       $(".response_throbber", $(this.el)).hide();
-      return hljs.highlightBlock($('.response_body', $(this.el))[0]);
+      response_body_el = $('.response_body', $(this.el))[0];
+      opts = this.options.swaggerOptions;
+      if (opts.highlightSizeThreshold && response.data.length > opts.highlightSizeThreshold) {
+        return response_body_el;
+      } else {
+        return hljs.highlightBlock(response_body_el);
+      }
     };
 
     OperationView.prototype.toggleOperationContent = function() {
@@ -1999,11 +2048,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   })(Backbone.View);
 
   StatusCodeView = (function(_super) {
-
     __extends(StatusCodeView, _super);
 
     function StatusCodeView() {
-      StatusCodeView.__super__.constructor.apply(this, arguments);
+      _ref5 = StatusCodeView.__super__.constructor.apply(this, arguments);
+      return _ref5;
     }
 
     StatusCodeView.prototype.initialize = function() {};
@@ -2038,11 +2087,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   })(Backbone.View);
 
   ParameterView = (function(_super) {
-
     __extends(ParameterView, _super);
 
     function ParameterView() {
-      ParameterView.__super__.constructor.apply(this, arguments);
+      _ref6 = ParameterView.__super__.constructor.apply(this, arguments);
+      return _ref6;
     }
 
     ParameterView.prototype.initialize = function() {
@@ -2127,11 +2176,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   })(Backbone.View);
 
   SignatureView = (function(_super) {
-
     __extends(SignatureView, _super);
 
     function SignatureView() {
-      SignatureView.__super__.constructor.apply(this, arguments);
+      _ref7 = SignatureView.__super__.constructor.apply(this, arguments);
+      return _ref7;
     }
 
     SignatureView.prototype.events = {
@@ -2146,7 +2195,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
       var template;
       template = this.template();
       $(this.el).html(template(this.model));
-      this.switchToDescription();
+      this.switchToSnippet();
       this.isParam = this.model.isParam;
       if (this.isParam) {
         $('.notice', $(this.el)).text('Click to set as parameter value');
@@ -2196,11 +2245,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   })(Backbone.View);
 
   ContentTypeView = (function(_super) {
-
     __extends(ContentTypeView, _super);
 
     function ContentTypeView() {
-      ContentTypeView.__super__.constructor.apply(this, arguments);
+      _ref8 = ContentTypeView.__super__.constructor.apply(this, arguments);
+      return _ref8;
     }
 
     ContentTypeView.prototype.initialize = function() {};
@@ -2222,11 +2271,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   })(Backbone.View);
 
   ResponseContentTypeView = (function(_super) {
-
     __extends(ResponseContentTypeView, _super);
 
     function ResponseContentTypeView() {
-      ResponseContentTypeView.__super__.constructor.apply(this, arguments);
+      _ref9 = ResponseContentTypeView.__super__.constructor.apply(this, arguments);
+      return _ref9;
     }
 
     ResponseContentTypeView.prototype.initialize = function() {};
@@ -2248,11 +2297,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
   })(Backbone.View);
 
   ParameterContentTypeView = (function(_super) {
-
     __extends(ParameterContentTypeView, _super);
 
     function ParameterContentTypeView() {
-      ParameterContentTypeView.__super__.constructor.apply(this, arguments);
+      _ref10 = ParameterContentTypeView.__super__.constructor.apply(this, arguments);
+      return _ref10;
     }
 
     ParameterContentTypeView.prototype.initialize = function() {};
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
index a1e827a1029..2956b613b0f 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.min.js
@@ -1 +1 @@
-$(function(){$.fn.vAlign=function(){return this.each(function(c){var a=$(this).height();var d=$(this).parent().height();var b=(d-a)/2;$(this).css("margin-top",b)})};$.fn.stretchFormtasticInputWidthToParent=function(){return this.each(function(b){var d=$(this).closest("form").innerWidth();var c=parseInt($(this).closest("form").css("padding-left"),10)+parseInt($(this).closest("form").css("padding-right"),10);var a=parseInt($(this).css("padding-left"),10)+parseInt($(this).css("padding-right"),10);$(this).css("width",d-c-a)})};$("form.formtastic li.string input, form.formtastic textarea").stretchFormtasticInputWidthToParent();$("ul.downplayed li div.content p").vAlign();$("form.sandbox").submit(function(){var a=true;$(this).find("input.required").each(function(){$(this).removeClass("error");if($(this).val()==""){$(this).addClass("error");$(this).wiggle();a=false}});return a})});function clippyCopiedCallback(b){$("#api_key_copied").fadeIn().delay(1000).fadeOut()}log=function(){log.history=log.history||[];log.history.push(arguments);if(this.console){console.log(Array.prototype.slice.call(arguments))}};if(Function.prototype.bind&&console&&typeof console.log=="object"){["log","info","warn","error","assert","dir","clear","profile","profileEnd"].forEach(function(a){console[a]=this.bind(console[a],console)},Function.prototype.call)}var Docs={shebang:function(){var b=$.param.fragment().split("/");b.shift();switch(b.length){case 1:log("shebang resource:"+b[0]);var d="resource_"+b[0];Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});break;case 2:log("shebang endpoint: "+b.join("_"));Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});var c=b.join("_");var a=c+"_content";log("li_dom_id "+c);log("li_content_dom_id "+a);Docs.expandOperation($("#"+a));$("#"+c).slideto({highlight:false});break}},toggleEndpointListForResource:function(b){var a=$("li#resource_"+Docs.escapeResourceName(b)+" ul.endpoints");if(a.is(":visible")){Docs.collapseEndpointListForResource(b)}else{Docs.expandEndpointListForResource(b)}},expandEndpointListForResource:function(b){var b=Docs.escapeResourceName(b);if(b==""){$(".resource ul.endpoints").slideDown();return}$("li#resource_"+b).addClass("active");var a=$("li#resource_"+b+" ul.endpoints");a.slideDown()},collapseEndpointListForResource:function(b){var b=Docs.escapeResourceName(b);$("li#resource_"+b).removeClass("active");var a=$("li#resource_"+b+" ul.endpoints");a.slideUp()},expandOperationsForResource:function(a){Docs.expandEndpointListForResource(a);if(a==""){$(".resource ul.endpoints li.operation div.content").slideDown();return}$("li#resource_"+Docs.escapeResourceName(a)+" li.operation div.content").each(function(){Docs.expandOperation($(this))})},collapseOperationsForResource:function(a){Docs.expandEndpointListForResource(a);$("li#resource_"+Docs.escapeResourceName(a)+" li.operation div.content").each(function(){Docs.collapseOperation($(this))})},escapeResourceName:function(a){return a.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g,"\\$&")},expandOperation:function(a){a.slideDown()},collapseOperation:function(a){a.slideUp()}};(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n	<option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n	";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="contentType"></label>\n<select name="contentType">\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.main=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",c,h="function",j=this.escapeExpression,p=this;function e(v,u){var r="",t,s;r+="\n                ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.termsOfServiceUrl),{hash:{},inverse:p.noop,fn:p.program(2,d,u),data:u});if(s||s===0){r+=s}r+="\n                ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.contact),{hash:{},inverse:p.noop,fn:p.program(4,q,u),data:u});if(s||s===0){r+=s}r+="\n                ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.license),{hash:{},inverse:p.noop,fn:p.program(6,o,u),data:u});if(s||s===0){r+=s}r+="\n            ";return r}function d(u,t){var r="",s;r+='<li><a href="'+j(((s=((s=u.info),s==null||s===false?s:s.termsOfServiceUrl)),typeof s===h?s.apply(u):s))+'" title="Terms of Service"><i class="fa fa-lg fa-bullhorn"></i> Terms</a></li>';return r}function q(u,t){var r="",s;r+='<li><a href="mailto:'+j(((s=((s=u.info),s==null||s===false?s:s.contact)),typeof s===h?s.apply(u):s))+'"><i class="fa fa-lg fa-send"></i> Contact</a></li>';return r}function o(u,t){var r="",s;r+='<li><a href="'+j(((s=((s=u.info),s==null||s===false?s:s.licenseUrl)),typeof s===h?s.apply(u):s))+'" title="'+j(((s=((s=u.info),s==null||s===false?s:s.license)),typeof s===h?s.apply(u):s))+'"><i class="fa fa-lg fa-certificate"></i> License</a></li>';return r}function n(u,t){var r="",s;r+=" v";if(s=f.apiVersion){s=s.call(u,{hash:{},data:t})}else{s=u.apiVersion;s=typeof s===h?s.apply(u):s}r+=j(s);return r}i+="<div class='info' id='api_info'>\n</div>\n<div class='container' id='resources_container'>\n    <ul id='resources'>\n    </ul>\n\n    <div class=\"footer\">\n        <ul id=\"footer-nav\">\n            ";c=f["if"].call(m,m.info,{hash:{},inverse:p.noop,fn:p.program(1,e,k),data:k});if(c||c===0){i+=c}i+="\n            <li>\n                ";if(c=f.basePath){c=c.call(m,{hash:{},data:k})}else{c=m.basePath;c=typeof c===h?c.apply(m):c}i+=j(c);c=f["if"].call(m,m.apiVersion,{hash:{},inverse:p.noop,fn:p.program(8,n,k),data:k});if(c||c===0){i+=c}i+=" Powered by Restler & Swagger\n            </li>\n        </ul>\n    </div>\n</div>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.operation=b(function(g,s,q,m,y){this.compilerInfo=[4,">= 1.0.0"];q=this.merge(q,g.helpers);y=y||{};var r="",i,f,e="function",d=this.escapeExpression,p=this,c=q.blockHelperMissing;function o(C,B){var z="",A;z+="\n        <h4>Implementation Notes</h4>\n        <p>";if(A=q.notes){A=A.call(C,{hash:{},data:B})}else{A=C.notes;A=typeof A===e?A.apply(C):A}if(A||A===0){z+=A}z+="</p>\n        ";return z}function n(A,z){return'\n        <div class="auth">\n        <span class="api-ic ic-error"></span>'}function l(C,B){var z="",A;z+='\n          <div id="api_information_panel" style="top: 526px; left: 776px; display: none;">\n          ';A=q.each.call(C,C,{hash:{},inverse:p.noop,fn:p.program(6,k,B),data:B});if(A||A===0){z+=A}z+="\n          </div>\n        ";return z}function k(D,C){var z="",B,A;z+="\n            <div title='";A=((B=D.description),typeof B===e?B.apply(D):B);if(A||A===0){z+=A}z+="'>"+d(((B=D.scope),typeof B===e?B.apply(D):B))+"</div>\n          ";return z}function h(A,z){return"</div>"}function x(A,z){return'\n        <div class=\'access\'>\n          <span class="api-ic ic-off" title="click to authenticate"></span>\n        </div>\n        '}function w(A,z){return'\n          <h4>Response Class</h4>\n          <p><span class="model-signature" /></p>\n          <br/>\n          <div class="response-content-type" />\n        '}function v(A,z){return'\n          <h4>Parameters</h4>\n          <table class=\'fullwidth\'>\n          <thead>\n            <tr>\n            <th style="width: 100px; max-width: 100px">Parameter</th>\n            <th style="width: 310px; max-width: 310px">Value</th>\n            <th style="width: 200px; max-width: 200px">Description</th>\n            <th style="width: 100px; max-width: 100px">Parameter Type</th>\n            <th style="width: 220px; max-width: 230px">Data Type</th>\n            </tr>\n          </thead>\n          <tbody class="operation-params">\n\n          </tbody>\n          </table>\n          '}function u(A,z){return"\n          <div style='margin:0;padding:0;display:inline'></div>\n          <h4>Response Messages</h4>\n          <table class='fullwidth'>\n            <thead>\n            <tr>\n              <th>HTTP Status Code</th>\n              <th>Reason</th>\n              <th>Response Model</th>\n            </tr>\n            </thead>\n            <tbody class=\"operation-status\">\n            \n            </tbody>\n          </table>\n          "}function t(A,z){return"\n          "}function j(A,z){return"\n          <div class='sandbox_header'>\n            <input class='submit' name='commit' type='button' value='Try it out!' />\n            <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n            <img alt='Throbber' class='response_throbber' src='images/throbber.gif' style='display:none' />\n          </div>\n          "}r+="\n  <ul class='operations' >\n    <li class='";if(i=q.method){i=i.call(s,{hash:{},data:y})}else{i=s.method;i=typeof i===e?i.apply(s):i}r+=d(i)+" operation' id='";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"_";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+"'>\n      <div class='heading'>\n        <h3>\n          <span class='http_method'>\n          <a href='#!/";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.method){i=i.call(s,{hash:{},data:y})}else{i=s.method;i=typeof i===e?i.apply(s):i}r+=d(i)+"</a>\n          </span>\n          <span class='path'>\n          <a href='#!/";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.path){i=i.call(s,{hash:{},data:y})}else{i=s.path;i=typeof i===e?i.apply(s):i}r+=d(i)+"</a>\n          </span>\n        </h3>\n        <ul class='options'>\n          <li>\n          <a href='#!/";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.summary){i=i.call(s,{hash:{},data:y})}else{i=s.summary;i=typeof i===e?i.apply(s):i}if(i||i===0){r+=i}r+="</a>\n          </li>\n        </ul>\n      </div>\n      <div class='content' id='";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"_";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+"_content' style='display:none'>\n        ";i=q["if"].call(s,s.notes,{hash:{},inverse:p.noop,fn:p.program(1,o,y),data:y});if(i||i===0){r+=i}r+="\n        ";f={hash:{},inverse:p.noop,fn:p.program(3,n,y),data:y};if(i=q.oauth){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n        ";i=q.each.call(s,s.oauth,{hash:{},inverse:p.noop,fn:p.program(5,l,y),data:y});if(i||i===0){r+=i}r+="\n        ";f={hash:{},inverse:p.noop,fn:p.program(8,h,y),data:y};if(i=q.oauth){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n        ";f={hash:{},inverse:p.noop,fn:p.program(10,x,y),data:y};if(i=q.oauth){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n        ";i=q["if"].call(s,s.type,{hash:{},inverse:p.noop,fn:p.program(12,w,y),data:y});if(i||i===0){r+=i}r+="\n        <form accept-charset='UTF-8' class='sandbox'>\n          <div style='margin:0;padding:0;display:inline'></div>\n          ";i=q["if"].call(s,s.parameters,{hash:{},inverse:p.noop,fn:p.program(14,v,y),data:y});if(i||i===0){r+=i}r+="\n          ";i=q["if"].call(s,s.responseMessages,{hash:{},inverse:p.noop,fn:p.program(16,u,y),data:y});if(i||i===0){r+=i}r+="\n          ";i=q["if"].call(s,s.isReadOnly,{hash:{},inverse:p.program(20,j,y),fn:p.program(18,t,y),data:y});if(i||i===0){r+=i}r+="\n        </form>\n        <div class='response' style='display:none'>\n          <h4>Request URL</h4>\n          <div class='block request_url'></div>\n          <h4>Response Body</h4>\n          <div class='block response_body'></div>\n          <h4>Response Code</h4>\n          <div class='block response_code'></div>\n          <h4>Response Headers</h4>\n          <div class='block response_headers'></div>\n        </div>\n      </div>\n    </li>\n  </ul>\n";return r})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param=b(function(f,q,o,j,s){this.compilerInfo=[4,">= 1.0.0"];o=this.merge(o,f.helpers);s=s||{};var p="",g,d="function",c=this.escapeExpression,n=this;function m(x,w){var u="",v;u+="\n		";v=o["if"].call(x,x.isFile,{hash:{},inverse:n.program(4,k,w),fn:n.program(2,l,w),data:w});if(v||v===0){u+=v}u+="\n	";return u}function l(x,w){var u="",v;u+='\n			<input type="file" name=\'';if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+'\'/>\n			<div class="parameter-content-type" />\n		';return u}function k(x,w){var u="",v;u+="\n			";v=o["if"].call(x,x.defaultValue,{hash:{},inverse:n.program(7,h,w),fn:n.program(5,i,w),data:w});if(v||v===0){u+=v}u+="\n		";return u}function i(x,w){var u="",v;u+="\n				<textarea class='body-textarea' name='";if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+"'>";if(v=o.defaultValue){v=v.call(x,{hash:{},data:w})}else{v=x.defaultValue;v=typeof v===d?v.apply(x):v}u+=c(v)+"</textarea>\n			";return u}function h(x,w){var u="",v;u+="\n				<textarea class='body-textarea' name='";if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+'\'></textarea>\n				<br />\n				<div class="parameter-content-type" />\n			';return u}function e(x,w){var u="",v;u+="\n		";v=o["if"].call(x,x.defaultValue,{hash:{},inverse:n.program(12,r,w),fn:n.program(10,t,w),data:w});if(v||v===0){u+=v}u+="\n	";return u}function t(x,w){var u="",v;u+="\n			<input class='parameter' minlength='0' name='";if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+"' placeholder='' type='text' value='";if(v=o.defaultValue){v=v.call(x,{hash:{},data:w})}else{v=x.defaultValue;v=typeof v===d?v.apply(x):v}u+=c(v)+"'/>\n		";return u}function r(x,w){var u="",v;u+="\n			<input class='parameter' minlength='0' name='";if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+"' placeholder='' type='text' value=''/>\n		";return u}p+="<td class='code'>";if(g=o.name){g=g.call(q,{hash:{},data:s})}else{g=q.name;g=typeof g===d?g.apply(q):g}p+=c(g)+"</td>\n<td>\n\n	";g=o["if"].call(q,q.isBody,{hash:{},inverse:n.program(9,e,s),fn:n.program(1,m,s),data:s});if(g||g===0){p+=g}p+="\n\n</td>\n<td>";if(g=o.description){g=g.call(q,{hash:{},data:s})}else{g=q.description;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+="</td>\n<td>";if(g=o.paramType){g=g.call(q,{hash:{},data:s})}else{g=q.paramType;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+='</td>\n<td>\n	<span class="model-signature"></span>\n</td>\n';return p})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_list=b(function(h,t,r,m,y){this.compilerInfo=[4,">= 1.0.0"];r=this.merge(r,h.helpers);y=y||{};var s="",j,g,e,p=this,q=r.helperMissing,d="function",c=this.escapeExpression;function o(A,z){return" multiple='multiple'"}function n(A,z){return"\n    "}function l(C,B){var z="",A;z+="\n      ";A=r["if"].call(C,C.defaultValue,{hash:{},inverse:p.program(8,i,B),fn:p.program(6,k,B),data:B});if(A||A===0){z+=A}z+="\n    ";return z}function k(A,z){return"\n      "}function i(E,D){var z="",C,B,A;z+="\n        ";A={hash:{},inverse:p.program(11,x,D),fn:p.program(9,f,D),data:D};B=((C=r.isArray||E.isArray),C?C.call(E,E,A):q.call(E,"isArray",E,A));if(B||B===0){z+=B}z+="\n      ";return z}function f(A,z){return"\n        "}function x(A,z){return"\n          <option selected=\"\" value=''></option>\n        "}function w(C,B){var z="",A;z+="\n      ";A=r["if"].call(C,C.isDefault,{hash:{},inverse:p.program(16,u,B),fn:p.program(14,v,B),data:B});if(A||A===0){z+=A}z+="\n    ";return z}function v(C,B){var z="",A;z+='\n        <option selected="" value=\'';if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"'>";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+" (default)</option>\n      ";return z}function u(C,B){var z="",A;z+="\n        <option value='";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"'>";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"</option>\n      ";return z}s+="<td class='code'>";if(j=r.name){j=j.call(t,{hash:{},data:y})}else{j=t.name;j=typeof j===d?j.apply(t):j}s+=c(j)+"</td>\n<td>\n  <select ";e={hash:{},inverse:p.noop,fn:p.program(1,o,y),data:y};g=((j=r.isArray||t.isArray),j?j.call(t,t,e):q.call(t,"isArray",t,e));if(g||g===0){s+=g}s+=" class='parameter' name='";if(g=r.name){g=g.call(t,{hash:{},data:y})}else{g=t.name;g=typeof g===d?g.apply(t):g}s+=c(g)+"'>\n    ";g=r["if"].call(t,t.required,{hash:{},inverse:p.program(5,l,y),fn:p.program(3,n,y),data:y});if(g||g===0){s+=g}s+="\n    ";g=r.each.call(t,((j=t.allowableValues),j==null||j===false?j:j.descriptiveValues),{hash:{},inverse:p.noop,fn:p.program(13,w,y),data:y});if(g||g===0){s+=g}s+="\n  </select>\n</td>\n<td>";if(g=r.description){g=g.call(t,{hash:{},data:y})}else{g=t.description;g=typeof g===d?g.apply(t):g}if(g||g===0){s+=g}s+="</td>\n<td>";if(g=r.paramType){g=g.call(t,{hash:{},data:y})}else{g=t.paramType;g=typeof g===d?g.apply(t):g}if(g||g===0){s+=g}s+='</td>\n<td><span class="model-signature"></span></td>';return s})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_readonly=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",d,h="function",j=this.escapeExpression,o=this;function e(t,s){var q="",r;q+="\n        <textarea class='body-textarea' readonly='readonly' name='";if(r=f.name){r=r.call(t,{hash:{},data:s})}else{r=t.name;r=typeof r===h?r.apply(t):r}q+=j(r)+"'>";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"</textarea>\n    ";return q}function c(t,s){var q="",r;q+="\n        ";r=f["if"].call(t,t.defaultValue,{hash:{},inverse:o.program(6,n,s),fn:o.program(4,p,s),data:s});if(r||r===0){q+=r}q+="\n    ";return q}function p(t,s){var q="",r;q+="\n            ";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"\n        ";return q}function n(r,q){return"\n            (empty)\n        "}i+="<td class='code'>";if(d=f.name){d=d.call(m,{hash:{},data:k})}else{d=m.name;d=typeof d===h?d.apply(m):d}i+=j(d)+"</td>\n<td>\n    ";d=f["if"].call(m,m.isBody,{hash:{},inverse:o.program(3,c,k),fn:o.program(1,e,k),data:k});if(d||d===0){i+=d}i+="\n</td>\n<td>";if(d=f.description){d=d.call(m,{hash:{},data:k})}else{d=m.description;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+="</td>\n<td>";if(d=f.paramType){d=d.call(m,{hash:{},data:k})}else{d=m.paramType;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+='</td>\n<td><span class="model-signature"></span></td>\n';return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_readonly_required=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",d,h="function",j=this.escapeExpression,o=this;function e(t,s){var q="",r;q+="\n        <textarea class='body-textarea'  readonly='readonly' placeholder='(required)' name='";if(r=f.name){r=r.call(t,{hash:{},data:s})}else{r=t.name;r=typeof r===h?r.apply(t):r}q+=j(r)+"'>";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"</textarea>\n    ";return q}function c(t,s){var q="",r;q+="\n        ";r=f["if"].call(t,t.defaultValue,{hash:{},inverse:o.program(6,n,s),fn:o.program(4,p,s),data:s});if(r||r===0){q+=r}q+="\n    ";return q}function p(t,s){var q="",r;q+="\n            ";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"\n        ";return q}function n(r,q){return"\n            (empty)\n        "}i+="<td class='code required'>";if(d=f.name){d=d.call(m,{hash:{},data:k})}else{d=m.name;d=typeof d===h?d.apply(m):d}i+=j(d)+"</td>\n<td>\n    ";d=f["if"].call(m,m.isBody,{hash:{},inverse:o.program(3,c,k),fn:o.program(1,e,k),data:k});if(d||d===0){i+=d}i+="\n</td>\n<td>";if(d=f.description){d=d.call(m,{hash:{},data:k})}else{d=m.description;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+="</td>\n<td>";if(d=f.paramType){d=d.call(m,{hash:{},data:k})}else{d=m.paramType;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+='</td>\n<td><span class="model-signature"></span></td>\n';return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_required=b(function(f,q,o,j,u){this.compilerInfo=[4,">= 1.0.0"];o=this.merge(o,f.helpers);u=u||{};var p="",g,d="function",c=this.escapeExpression,n=this;function m(z,y){var w="",x;w+="\n		";x=o["if"].call(z,z.isFile,{hash:{},inverse:n.program(4,k,y),fn:n.program(2,l,y),data:y});if(x||x===0){w+=x}w+="\n	";return w}function l(z,y){var w="",x;w+='\n			<input type="file" name=\'';if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n		";return w}function k(z,y){var w="",x;w+="\n			";x=o["if"].call(z,z.defaultValue,{hash:{},inverse:n.program(7,h,y),fn:n.program(5,i,y),data:y});if(x||x===0){w+=x}w+="\n		";return w}function i(z,y){var w="",x;w+="\n				<textarea class='body-textarea' placeholder='(required)' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'>";if(x=o.defaultValue){x=x.call(z,{hash:{},data:y})}else{x=z.defaultValue;x=typeof x===d?x.apply(z):x}w+=c(x)+"</textarea>\n			";return w}function h(z,y){var w="",x;w+="\n				<textarea class='body-textarea' placeholder='(required)' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+'\'></textarea>\n				<br />\n				<div class="parameter-content-type" />\n			';return w}function e(z,y){var w="",x;w+="\n		";x=o["if"].call(z,z.isFile,{hash:{},inverse:n.program(12,t,y),fn:n.program(10,v,y),data:y});if(x||x===0){w+=x}w+="\n	";return w}function v(z,y){var w="",x;w+="\n			<input class='parameter' class='required' type='file' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n		";return w}function t(z,y){var w="",x;w+="\n			";x=o["if"].call(z,z.defaultValue,{hash:{},inverse:n.program(15,r,y),fn:n.program(13,s,y),data:y});if(x||x===0){w+=x}w+="\n		";return w}function s(z,y){var w="",x;w+="\n				<input class='parameter required' minlength='1' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"' placeholder='(required)' type='text' value='";if(x=o.defaultValue){x=x.call(z,{hash:{},data:y})}else{x=z.defaultValue;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n			";return w}function r(z,y){var w="",x;w+="\n				<input class='parameter required' minlength='1' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"' placeholder='(required)' type='text' value=''/>\n			";return w}p+="<td class='code required'>";if(g=o.name){g=g.call(q,{hash:{},data:u})}else{g=q.name;g=typeof g===d?g.apply(q):g}p+=c(g)+"</td>\n<td>\n	";g=o["if"].call(q,q.isBody,{hash:{},inverse:n.program(9,e,u),fn:n.program(1,m,u),data:u});if(g||g===0){p+=g}p+="\n</td>\n<td>\n	<strong>";if(g=o.description){g=g.call(q,{hash:{},data:u})}else{g=q.description;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+="</strong>\n</td>\n<td>";if(g=o.paramType){g=g.call(q,{hash:{},data:u})}else{g=q.paramType;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+='</td>\n<td><span class="model-signature"></span></td>\n';return p})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.parameter_content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.consumes,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n  <option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n  ";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="parameterContentType"></label>\n<select name="parameterContentType">\n';c=f["if"].call(l,l.consumes,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.resource=b(function(f,l,e,k,j){this.compilerInfo=[4,">= 1.0.0"];e=this.merge(e,f.helpers);j=j||{};var h="",c,o,g="function",i=this.escapeExpression,n=this,m=e.blockHelperMissing;function d(s,r){var p="",q;p+=" : ";if(q=e.description){q=q.call(s,{hash:{},data:r})}else{q=s.description;q=typeof q===g?q.apply(s):q}if(q||q===0){p+=q}return p}h+="<div class='heading'>\n  <h2>\n    <a href='#!/";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"' onclick=\"Docs.toggleEndpointListForResource('";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"');\">";if(c=e.name){c=c.call(l,{hash:{},data:j})}else{c=l.name;c=typeof c===g?c.apply(l):c}h+=i(c)+"</a> ";o={hash:{},inverse:n.noop,fn:n.program(1,d,j),data:j};if(c=e.description){c=c.call(l,o)}else{c=l.description;c=typeof c===g?c.apply(l):c}if(!e.description){c=m.call(l,c,o)}if(c||c===0){h+=c}h+="\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"' id='endpointListTogger_";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"'\n         onclick=\"Docs.toggleEndpointListForResource('";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"');\">Show/Hide</a>\n    </li>\n    <li>\n      <a href='#' onclick=\"Docs.collapseOperationsForResource('";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"'); return false;\">\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href='#' onclick=\"Docs.expandOperationsForResource('";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"'); return false;\">\n        Expand Operations\n      </a>\n    </li>\n    <li>\n      <a href='";if(c=e.url){c=c.call(l,{hash:{},data:j})}else{c=l.url;c=typeof c===g?c.apply(l):c}h+=i(c)+"'>Raw</a>\n    </li>\n  </ul>\n</div>\n<ul class='endpoints' id='";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"_endpoint_list' style='display:none'>\n\n</ul>\n";return h})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.response_content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n  <option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n  ";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="responseContentType"></label>\n<select name="responseContentType">\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.signature=b(function(e,k,d,j,i){this.compilerInfo=[4,">= 1.0.0"];d=this.merge(d,e.helpers);i=i||{};var g="",c,f="function",h=this.escapeExpression;g+='<div>\n<ul class="signature-nav">\n    <li><a class="description-link" href="#">Model</a></li>\n    <li><a class="snippet-link" href="#">Model Schema</a></li>\n</ul>\n<div>\n\n<div class="signature-container">\n    <div class="description">\n        ';if(c=d.signature){c=c.call(k,{hash:{},data:i})}else{c=k.signature;c=typeof c===f?c.apply(k):c}if(c||c===0){g+=c}g+='\n    </div>\n\n    <div class="snippet">\n        <pre><code>';if(c=d.sampleJSON){c=c.call(k,{hash:{},data:i})}else{c=k.sampleJSON;c=typeof c===f?c.apply(k):c}g+=h(c)+'</code></pre>\n        <small class="notice"></small>\n    </div>\n</div>\n\n';return g})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.status_code=b(function(e,k,d,j,i){this.compilerInfo=[4,">= 1.0.0"];d=this.merge(d,e.helpers);i=i||{};var g="",c,f="function",h=this.escapeExpression;g+="<td width='15%' class='code'>";if(c=d.code){c=c.call(k,{hash:{},data:i})}else{c=k.code;c=typeof c===f?c.apply(k):c}g+=h(c)+"</td>\n<td>";if(c=d.message){c=c.call(k,{hash:{},data:i})}else{c=k.message;c=typeof c===f?c.apply(k):c}if(c||c===0){g+=c}g+="</td>\n<td width='50%'><span class=\"model-signature\" /></td>";return g})})();(function(){var g,c,i,d,m,f,k,a,l,j,b,h={}.hasOwnProperty,e=function(q,o){for(var n in o){if(h.call(o,n)){q[n]=o[n]}}function p(){this.constructor=q}p.prototype=o.prototype;q.prototype=new p();q.__super__=o.prototype;return q};b=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.dom_id="swagger_ui";n.prototype.options=null;n.prototype.api=null;n.prototype.headerView=null;n.prototype.mainView=null;n.prototype.initialize=function(p){var q=this;if(p==null){p={}}if(p.dom_id!=null){this.dom_id=p.dom_id;delete p.dom_id}if($("#"+this.dom_id)==null){$("body").append('<div id="'+this.dom_id+'"></div>')}this.options=p;this.options.success=function(){return q.render()};this.options.progress=function(r){return q.showMessage(r)};this.options.failure=function(r){return q.onLoadFailure(r)};this.headerView=new c({el:$("#header")});return this.headerView.on("update-swagger-ui",function(r){return q.updateSwaggerUi(r)})};n.prototype.updateSwaggerUi=function(p){this.options.url=p.url;return this.load()};n.prototype.load=function(){var p,q;if((q=this.mainView)!=null){q.clear()}p=this.options.url;if(p.indexOf("http")!==0){p=this.buildUrl(window.location.href.toString(),p)}this.options.url=p;this.headerView.update(p);this.api=new SwaggerApi(this.options);this.api.build();return this.api};n.prototype.render=function(){var p=this;this.showMessage("Finished Loading Resource Information. Rendering Swagger UI...");this.headerView.updateInfo(this.api.info);this.mainView=new i({model:this.api,el:$("#"+this.dom_id)}).render();this.showMessage();switch(this.options.docExpansion){case"full":Docs.expandOperationsForResource("");break;case"list":Docs.collapseOperationsForResource("")}if(this.options.onComplete){this.options.onComplete(this.api,this)}return setTimeout(function(){return Docs.shebang()},400)};n.prototype.buildUrl=function(r,p){var q,s;log("base is "+r);if(p.indexOf("/")===0){s=r.split("/");r=s[0]+"//"+s[2];return r+p}else{q=r.length;if(r.indexOf("?")>-1){q=Math.min(q,r.indexOf("?"))}if(r.indexOf("#")>-1){q=Math.min(q,r.indexOf("#"))}r=r.substring(0,q);if(r.indexOf("/",r.length-1)!==-1){return r+p}return r+"/"+p}};n.prototype.showMessage=function(p){if(p==null){p=""}$("#message-bar").removeClass("message-fail");$("#message-bar").addClass("message-success");return $("#message-bar").html(p)};n.prototype.onLoadFailure=function(p){var q;if(p==null){p=""}$("#message-bar").removeClass("message-success");$("#message-bar").addClass("message-fail");q=$("#message-bar").html(p);if(this.options.onFailure!=null){this.options.onFailure(p)}return q};return n})(Backbone.Router);window.SwaggerUi=b;c=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.events={"click #show-pet-store-icon":"showPetStore","click #show-wordnik-dev-icon":"showWordnikDev","click #explore":"showCustom","keyup #input_baseUrl":"showCustomOnKeyup","keyup #input_apiKey":"showCustomOnKeyup"};n.prototype.initialize=function(){};n.prototype.showPetStore=function(p){return this.trigger("update-swagger-ui",{url:"http://petstore.swagger.wordnik.com/api/api-docs"})};n.prototype.showWordnikDev=function(p){return this.trigger("update-swagger-ui",{url:"http://api.wordnik.com/v4/resources.json"})};n.prototype.showCustomOnKeyup=function(p){if(p.keyCode===13){return this.showCustom()}};n.prototype.showCustom=function(p){if(p!=null){p.preventDefault()}return this.trigger("update-swagger-ui",{url:$("#input_baseUrl").val(),apiKey:$("#input_apiKey").val()})};n.prototype.update=function(q,r,p){if(p==null){p=false}$("#input_baseUrl").val(q);if(p){return this.trigger("update-swagger-ui",{url:q})}};n.prototype.updateInfo=function(p){if(p.title!=null){$("#logo").text(p.title)}if(p.description!=null){$("#logo").attr("title",p.description)}if(p.termsOfServiceUrl!=null){return $("#logo").attr("href",p.termsOfServiceUrl)}};return n})(Backbone.View);i=(function(n){e(o,n);function o(){o.__super__.constructor.apply(this,arguments)}o.prototype.initialize=function(){};o.prototype.render=function(){var q,v,t,u,s,p,r;$(this.el).html(Handlebars.templates.main(this.model));u={};q=0;r=this.model.apisArray;for(s=0,p=r.length;s<p;s++){t=r[s];v=t.name;while(typeof u[v]!=="undefined"){v=v+"_"+q;q+=1}t.id=v;u[v]=t;this.addResource(t)}return this};o.prototype.addResource=function(q){var p;p=new k({model:q,tagName:"li",id:"resource_"+q.id,className:"resource"});return $("#resources").append(p.render().el)};o.prototype.clear=function(){return $(this.el).html("")};return o})(Backbone.View);k=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.initialize=function(){};n.prototype.render=function(){var q,v,s,r,u,p,t;$(this.el).html(Handlebars.templates.resource(this.model));s={};t=this.model.operationsArray;for(u=0,p=t.length;u<p;u++){r=t[u];q=0;v=r.nickname;while(typeof s[v]!=="undefined"){v=v+"_"+q;q+=1}s[v]=r;r.nickname=v;r.parentId=this.model.id;this.addOperation(r)}return this};n.prototype.addOperation=function(p){var q;p.number=this.number;q=new d({model:p,tagName:"li",className:"endpoint"});$(".endpoints",$(this.el)).append(q.render().el);return this.number++};return n})(Backbone.View);d=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.invocationUrl=null;n.prototype.events={"submit .sandbox":"submitOperation","click .submit":"submitOperation","click .response_hider":"hideResponse","click .toggleOperation":"toggleOperationContent","mouseenter .api-ic":"mouseEnter","mouseout .api-ic":"mouseExit"};n.prototype.initialize=function(){};n.prototype.mouseEnter=function(u){var s,t,z,q,p,A,v,r,B,w;s=$(u.currentTarget.parentNode).find("#api_information_panel");B=event.pageX;w=event.pageY;A=$(window).scrollLeft();v=$(window).scrollTop();q=A+$(window).width();p=v+$(window).height();r=s.width();t=s.height();if(B+r>q){B=q-r}if(B<A){B=A}if(w+t>p){w=p-t}if(w<v){w=v}z={};z.top=w;z.left=B;s.css(z);return $(u.currentTarget.parentNode).find("#api_information_panel").show()};n.prototype.mouseExit=function(p){return $(p.currentTarget.parentNode).find("#api_information_panel").hide()};n.prototype.render=function(){var H,I,G,F,y,E,z,D,A,x,C,t,r,q,p,K,M,L,J,B,w,u,s;I=true;if(!I){this.model.isReadOnly=true}this.model.oauth=null;if(this.model.authorizations){B=this.model.authorizations;for(G in B){C=B[G];if(G==="oauth2"){if(this.model.oauth===null){this.model.oauth={}}if(this.model.oauth.scopes===void 0){this.model.oauth.scopes=[]}for(t=0,K=C.length;t<K;t++){F=C[t];this.model.oauth.scopes.push(F)}}}}$(this.el).html(Handlebars.templates.operation(this.model));if(this.model.responseClassSignature&&this.model.responseClassSignature!=="string"){D={sampleJSON:this.model.responseSampleJSON,isParam:false,signature:this.model.responseClassSignature};z=new l({model:D,tagName:"div"});$(".model-signature",$(this.el)).append(z.render().el)}else{$(".model-signature",$(this.el)).html(this.model.type)}H={isParam:false};H.consumes=this.model.consumes;H.produces=this.model.produces;w=this.model.parameters;for(r=0,M=w.length;r<M;r++){y=w[r];x=y.type||y.dataType;if(x.toLowerCase()==="file"){if(!H.consumes){log("set content type ");H.consumes="multipart/form-data"}}}E=new a({model:H});$(".response-content-type",$(this.el)).append(E.render().el);u=this.model.parameters;for(q=0,L=u.length;q<L;q++){y=u[q];this.addParameter(y,H.consumes)}s=this.model.responseMessages;for(p=0,J=s.length;p<J;p++){A=s[p];this.addStatusCode(A)}return this};n.prototype.addParameter=function(r,p){var q;r.consumes=p;q=new f({model:r,tagName:"tr",readOnly:this.model.isReadOnly});return $(".operation-params",$(this.el)).append(q.render().el)};n.prototype.addStatusCode=function(q){var p;p=new j({model:q,tagName:"tr"});return $(".operation-status",$(this.el)).append(p.render().el)};n.prototype.submitOperation=function(D){var F,t,C,r,u,p,v,A,z,x,E,s,q,B,y,w;if(D!=null){D.preventDefault()}t=$(".sandbox",$(this.el));F=true;t.find("input.required").each(function(){var G=this;$(this).removeClass("error");if(jQuery.trim($(this).val())===""){$(this).addClass("error");$(this).wiggle({callback:function(){return $(G).focus()}});return F=false}});if(F){r={};p={parent:this};C=false;B=t.find("input");for(A=0,E=B.length;A<E;A++){u=B[A];if((u.value!=null)&&jQuery.trim(u.value).length>0){r[u.name]=u.value}if(u.type==="file"){C=true}}y=t.find("textarea");for(z=0,s=y.length;z<s;z++){u=y[z];if((u.value!=null)&&jQuery.trim(u.value).length>0){r.body=u.value}}w=t.find("select");for(x=0,q=w.length;x<q;x++){u=w[x];v=this.getSelectedValue(u);if((v!=null)&&jQuery.trim(v).length>0){r[u.name]=v}}p.responseContentType=$("div select[name=responseContentType]",$(this.el)).val();p.requestContentType=$("div select[name=parameterContentType]",$(this.el)).val();$(".response_throbber",$(this.el)).show();if(C){return this.handleFileUpload(r,t)}else{return this.model["do"](r,p,this.showCompleteStatus,this.showErrorStatus,this)}}};n.prototype.success=function(p,q){return q.showCompleteStatus(p)};n.prototype.handleFileUpload=function(H,u){var C,t,p,D,B,z,F,w,s,r,q,G,K,J,I,A,y,x,v,E=this;A=u.serializeArray();for(w=0,G=A.length;w<G;w++){D=A[w];if((D.value!=null)&&jQuery.trim(D.value).length>0){H[D.name]=D.value}}C=new FormData();F=0;y=this.model.parameters;for(s=0,K=y.length;s<K;s++){z=y[s];if(z.paramType==="form"){if(H[z.name]!==void 0){C.append(z.name,H[z.name])}}}p={};x=this.model.parameters;for(r=0,J=x.length;r<J;r++){z=x[r];if(z.paramType==="header"){p[z.name]=H[z.name]}}log(p);v=u.find('input[type~="file"]');for(q=0,I=v.length;q<I;q++){t=v[q];if(typeof t.files[0]!=="undefined"){C.append($(t).attr("name"),t.files[0]);F+=1}}log(C);this.invocationUrl=this.model.supportHeaderParams()?(p=this.model.getHeaderParams(H),this.model.urlify(H,false)):this.model.urlify(H,true);$(".request_url",$(this.el)).html("<pre>"+this.invocationUrl+"</pre>");B={type:this.model.method,url:this.invocationUrl,headers:p,data:C,dataType:"json",contentType:false,processData:false,error:function(M,N,L){return E.showErrorStatus(E.wrap(M),E)},success:function(L){return E.showResponse(L,E)},complete:function(L){return E.showCompleteStatus(E.wrap(L),E)}};if(window.authorizations){window.authorizations.apply(B)}if(F===0){B.data.append("fake","true")}jQuery.ajax(B);return false};n.prototype.wrap=function(t){var r,u,w,q,v,s,p;w={};u=t.getAllResponseHeaders().split("\r");for(s=0,p=u.length;s<p;s++){q=u[s];r=q.split(":");if(r[0]!==void 0&&r[1]!==void 0){w[r[0].trim()]=r[1].trim()}}v={};v.content={};v.content.data=t.responseText;v.headers=w;v.request={};v.request.url=this.invocationUrl;v.status=t.status;return v};n.prototype.getSelectedValue=function(p){var s,r,u,q,t;if(!p.multiple){return p.value}else{r=[];t=p.options;for(u=0,q=t.length;u<q;u++){s=t[u];if(s.selected){r.push(s.value)}}if(r.length>0){return r.join(",")}else{return null}}};n.prototype.hideResponse=function(p){if(p!=null){p.preventDefault()}$(".response",$(this.el)).slideUp();return $(".response_hider",$(this.el)).fadeOut()};n.prototype.showResponse=function(p){var q;q=JSON.stringify(p,null,"\t").replace(/\n/g,"<br>");return $(".response_body",$(this.el)).html(escape(q))};n.prototype.showErrorStatus=function(q,p){return p.showStatus(q)};n.prototype.showCompleteStatus=function(q,p){return p.showStatus(q)};n.prototype.formatXml=function(w){var s,v,q,x,C,y,r,p,A,B,u,t,z;p=/(>)(<)(\/*)/g;B=/[ ]*(.*)[ ]+\n/g;s=/(<.+>)(.+\n)/g;w=w.replace(p,"$1\n$2$3").replace(B,"$1\n").replace(s,"$1\n$2");r=0;v="";C=w.split("\n");q=0;x="other";A={"single->single":0,"single->closing":-1,"single->opening":0,"single->other":0,"closing->single":0,"closing->closing":-1,"closing->opening":0,"closing->other":0,"opening->single":1,"opening->closing":0,"opening->opening":1,"opening->other":1,"other->single":0,"other->closing":-1,"other->opening":0,"other->other":0};u=function(I){var E,D,G,K,H,F,J;F={single:Boolean(I.match(/<.+\/>/)),closing:Boolean(I.match(/<\/.+>/)),opening:Boolean(I.match(/<[^!?].*>/))};H=((function(){var L;L=[];for(G in F){J=F[G];if(J){L.push(G)}}return L})())[0];H=H===void 0?"other":H;E=x+"->"+H;x=H;K="";q+=A[E];K=((function(){var M,N,L;L=[];for(D=M=0,N=q;0<=N?M<N:M>N;D=0<=N?++M:--M){L.push("  ")}return L})()).join("");if(E==="opening->closing"){return v=v.substr(0,v.length-1)+I+"\n"}else{return v+=K+I+"\n"}};for(t=0,z=C.length;t<z;t++){y=C[t];u(y)}return v};n.prototype.showStatus=function(p){var t,s,w,v,u,r,q;if(p.content===void 0){s=p.data;q=p.url}else{s=p.content.data;q=p.request.url}v=p.headers;w=v&&v["Content-Type"]?v["Content-Type"].split(";")[0].trim():null;if(!s){t=$("<code />").text("no content");u=$('<pre class="json" />').append(t)}else{if(w==="application/json"||/\+json$/.test(w)){t=$("<code />").text(JSON.stringify(JSON.parse(s),null,"  "));u=$('<pre class="json" />').append(t)}else{if(w==="application/xml"||/\+xml$/.test(w)){t=$("<code />").text(this.formatXml(s));u=$('<pre class="xml" />').append(t)}else{if(w==="text/html"){t=$("<code />").html(s);u=$('<pre class="xml" />').append(t)}else{if(/^image\//.test(w)){u=$("<img>").attr("src",q)}else{t=$("<code />").text(s);u=$('<pre class="json" />').append(t)}}}}}r=u;$(".request_url",$(this.el)).html("<pre>"+q+"</pre>");$(".response_code",$(this.el)).html("<pre>"+p.status+"</pre>");$(".response_body",$(this.el)).html(r);$(".response_headers",$(this.el)).html("<pre>"+JSON.stringify(p.headers,null,"  ").replace(/\n/g,"<br>")+"</pre>");$(".response",$(this.el)).slideDown();$(".response_hider",$(this.el)).show();$(".response_throbber",$(this.el)).hide();return hljs.highlightBlock($(".response_body",$(this.el))[0])};n.prototype.toggleOperationContent=function(){var p;p=$("#"+Docs.escapeResourceName(this.model.parentId)+"_"+this.model.nickname+"_content");if(p.is(":visible")){return Docs.collapseOperation(p)}else{return Docs.expandOperation(p)}};return n})(Backbone.View);j=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.initialize=function(){};n.prototype.render=function(){var q,p,r;r=this.template();$(this.el).html(r(this.model));if(swaggerUi.api.models.hasOwnProperty(this.model.responseModel)){q={sampleJSON:JSON.stringify(swaggerUi.api.models[this.model.responseModel].createJSONSample(),null,2),isParam:false,signature:swaggerUi.api.models[this.model.responseModel].getMockSignature()};p=new l({model:q,tagName:"div"});$(".model-signature",this.$el).append(p.render().el)}else{$(".model-signature",this.$el).html("")}return this};n.prototype.template=function(){return Handlebars.templates.status_code};return n})(Backbone.View);f=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.initialize=function(){return Handlebars.registerHelper("isArray",function(q,p){if(q.type.toLowerCase()==="array"||q.allowMultiple){return p.fn(this)}else{return p.inverse(this)}})};n.prototype.render=function(){var v,p,r,u,q,w,t,s;s=this.model.type||this.model.dataType;if(this.model.paramType==="body"){this.model.isBody=true}if(s.toLowerCase()==="file"){this.model.isFile=true}t=this.template();$(this.el).html(t(this.model));q={sampleJSON:this.model.sampleJSON,isParam:true,signature:this.model.signature};if(this.model.sampleJSON){w=new l({model:q,tagName:"div"});$(".model-signature",$(this.el)).append(w.render().el)}else{$(".model-signature",$(this.el)).html(this.model.signature)}p=false;if(this.model.isBody){p=true}v={isParam:p};v.consumes=this.model.consumes;if(p){r=new m({model:v});$(".parameter-content-type",$(this.el)).append(r.render().el)}else{u=new a({model:v});$(".response-content-type",$(this.el)).append(u.render().el)}return this};n.prototype.template=function(){if(this.model.isList){return Handlebars.templates.param_list}else{if(this.options.readOnly){if(this.model.required){return Handlebars.templates.param_readonly_required}else{return Handlebars.templates.param_readonly}}else{if(this.model.required){return Handlebars.templates.param_required}else{return Handlebars.templates.param}}}};return n})(Backbone.View);l=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.events={"click a.description-link":"switchToDescription","click a.snippet-link":"switchToSnippet","mousedown .snippet":"snippetToTextArea"};n.prototype.initialize=function(){};n.prototype.render=function(){var p;p=this.template();$(this.el).html(p(this.model));this.switchToDescription();this.isParam=this.model.isParam;if(this.isParam){$(".notice",$(this.el)).text("Click to set as parameter value")}return this};n.prototype.template=function(){return Handlebars.templates.signature};n.prototype.switchToDescription=function(p){if(p!=null){p.preventDefault()}$(".snippet",$(this.el)).hide();$(".description",$(this.el)).show();$(".description-link",$(this.el)).addClass("selected");return $(".snippet-link",$(this.el)).removeClass("selected")};n.prototype.switchToSnippet=function(p){if(p!=null){p.preventDefault()}$(".description",$(this.el)).hide();$(".snippet",$(this.el)).show();$(".snippet-link",$(this.el)).addClass("selected");return $(".description-link",$(this.el)).removeClass("selected")};n.prototype.snippetToTextArea=function(p){var q;if(this.isParam){if(p!=null){p.preventDefault()}q=$("textarea",$(this.el.parentNode.parentNode.parentNode));if($.trim(q.val())===""){return q.val(this.model.sampleJSON)}}};return n})(Backbone.View);g=(function(n){e(o,n);function o(){o.__super__.constructor.apply(this,arguments)}o.prototype.initialize=function(){};o.prototype.render=function(){var p;p=this.template();$(this.el).html(p(this.model));$("label[for=contentType]",$(this.el)).text("Response Content Type");return this};o.prototype.template=function(){return Handlebars.templates.content_type};return o})(Backbone.View);a=(function(n){e(o,n);function o(){o.__super__.constructor.apply(this,arguments)}o.prototype.initialize=function(){};o.prototype.render=function(){var p;p=this.template();$(this.el).html(p(this.model));$("label[for=responseContentType]",$(this.el)).text("Response Content Type");return this};o.prototype.template=function(){return Handlebars.templates.response_content_type};return o})(Backbone.View);m=(function(o){e(n,o);function n(){n.__super__.constructor.apply(this,arguments)}n.prototype.initialize=function(){};n.prototype.render=function(){var p;p=this.template();$(this.el).html(p(this.model));$("label[for=parameterContentType]",$(this.el)).text("Parameter content type:");return this};n.prototype.template=function(){return Handlebars.templates.parameter_content_type};return n})(Backbone.View)}).call(this);
\ No newline at end of file
+$(function(){$.fn.vAlign=function(){return this.each(function(c){var a=$(this).height();var d=$(this).parent().height();var b=(d-a)/2;$(this).css("margin-top",b)})};$.fn.stretchFormtasticInputWidthToParent=function(){return this.each(function(b){var d=$(this).closest("form").innerWidth();var c=parseInt($(this).closest("form").css("padding-left"),10)+parseInt($(this).closest("form").css("padding-right"),10);var a=parseInt($(this).css("padding-left"),10)+parseInt($(this).css("padding-right"),10);$(this).css("width",d-c-a)})};$("form.formtastic li.string input, form.formtastic textarea").stretchFormtasticInputWidthToParent();$("ul.downplayed li div.content p").vAlign();$("form.sandbox").submit(function(){var a=true;$(this).find("input.required").each(function(){$(this).removeClass("error");if($(this).val()==""){$(this).addClass("error");$(this).wiggle();a=false}});return a})});function clippyCopiedCallback(b){$("#api_key_copied").fadeIn().delay(1000).fadeOut()}log=function(){log.history=log.history||[];log.history.push(arguments);if(this.console){console.log(Array.prototype.slice.call(arguments)[0])}};if(Function.prototype.bind&&console&&typeof console.log=="object"){["log","info","warn","error","assert","dir","clear","profile","profileEnd"].forEach(function(a){console[a]=this.bind(console[a],console)},Function.prototype.call)}var Docs={shebang:function(){var b=$.param.fragment().split("/");b.shift();switch(b.length){case 1:log("shebang resource:"+b[0]);var d="resource_"+b[0];Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});break;case 2:log("shebang endpoint: "+b.join("_"));Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});var c=b.join("_");var a=c+"_content";log("li_dom_id "+c);log("li_content_dom_id "+a);Docs.expandOperation($("#"+a));$("#"+c).slideto({highlight:false});break}},toggleEndpointListForResource:function(b){var a=$("li#resource_"+Docs.escapeResourceName(b)+" ul.endpoints");if(a.is(":visible")){Docs.collapseEndpointListForResource(b)}else{Docs.expandEndpointListForResource(b)}},expandEndpointListForResource:function(b){var b=Docs.escapeResourceName(b);if(b==""){$(".resource ul.endpoints").slideDown();return}$("li#resource_"+b).addClass("active");var a=$("li#resource_"+b+" ul.endpoints");a.slideDown()},collapseEndpointListForResource:function(b){var b=Docs.escapeResourceName(b);$("li#resource_"+b).removeClass("active");var a=$("li#resource_"+b+" ul.endpoints");a.slideUp()},expandOperationsForResource:function(a){Docs.expandEndpointListForResource(a);if(a==""){$(".resource ul.endpoints li.operation div.content").slideDown();return}$("li#resource_"+Docs.escapeResourceName(a)+" li.operation div.content").each(function(){Docs.expandOperation($(this))})},collapseOperationsForResource:function(a){Docs.expandEndpointListForResource(a);$("li#resource_"+Docs.escapeResourceName(a)+" li.operation div.content").each(function(){Docs.collapseOperation($(this))})},escapeResourceName:function(a){return a.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g,"\\$&")},expandOperation:function(a){a.slideDown()},collapseOperation:function(a){a.slideUp()}};(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n	<option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n	";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="contentType"></label>\n<select name="contentType">\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.main=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",c,h="function",j=this.escapeExpression,p=this;function e(v,u){var r="",t,s;r+='\n    <div class="info_title">'+j(((t=((t=v.info),t==null||t===false?t:t.title)),typeof t===h?t.apply(v):t))+'</div>\n    <div class="info_description">';s=((t=((t=v.info),t==null||t===false?t:t.description)),typeof t===h?t.apply(v):t);if(s||s===0){r+=s}r+="</div>\n    ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.termsOfServiceUrl),{hash:{},inverse:p.noop,fn:p.program(2,d,u),data:u});if(s||s===0){r+=s}r+="\n    ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.contact),{hash:{},inverse:p.noop,fn:p.program(4,q,u),data:u});if(s||s===0){r+=s}r+="\n    ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.license),{hash:{},inverse:p.noop,fn:p.program(6,o,u),data:u});if(s||s===0){r+=s}r+="\n  ";return r}function d(u,t){var r="",s;r+='<div class="info_tos"><a href="'+j(((s=((s=u.info),s==null||s===false?s:s.termsOfServiceUrl)),typeof s===h?s.apply(u):s))+'">Terms of service</a></div>';return r}function q(u,t){var r="",s;r+="<div class='info_contact'><a href=\"mailto:"+j(((s=((s=u.info),s==null||s===false?s:s.contact)),typeof s===h?s.apply(u):s))+'">Contact the developer</a></div>';return r}function o(u,t){var r="",s;r+="<div class='info_license'><a href='"+j(((s=((s=u.info),s==null||s===false?s:s.licenseUrl)),typeof s===h?s.apply(u):s))+"'>"+j(((s=((s=u.info),s==null||s===false?s:s.license)),typeof s===h?s.apply(u):s))+"</a></div>";return r}function n(u,t){var r="",s;r+='\n        , <span style="font-variant: small-caps">api version</span>: ';if(s=f.apiVersion){s=s.call(u,{hash:{},data:t})}else{s=u.apiVersion;s=typeof s===h?s.apply(u):s}r+=j(s)+"\n        ";return r}i+="<div class='info' id='api_info'>\n  ";c=f["if"].call(m,m.info,{hash:{},inverse:p.noop,fn:p.program(1,e,k),data:k});if(c||c===0){i+=c}i+="\n</div>\n<div class='container' id='resources_container'>\n    <ul id='resources'>\n    </ul>\n\n    <div class=\"footer\">\n        <br>\n        <br>\n        <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: ";if(c=f.basePath){c=c.call(m,{hash:{},data:k})}else{c=m.basePath;c=typeof c===h?c.apply(m):c}i+=j(c)+"\n        ";c=f["if"].call(m,m.apiVersion,{hash:{},inverse:p.noop,fn:p.program(8,n,k),data:k});if(c||c===0){i+=c}i+="]</h4>\n    </div>\n</div>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.operation=b(function(g,s,q,m,y){this.compilerInfo=[4,">= 1.0.0"];q=this.merge(q,g.helpers);y=y||{};var r="",i,f,e="function",d=this.escapeExpression,p=this,c=q.blockHelperMissing;function o(C,B){var z="",A;z+="\n        <h4>Implementation Notes</h4>\n        <p>";if(A=q.notes){A=A.call(C,{hash:{},data:B})}else{A=C.notes;A=typeof A===e?A.apply(C):A}if(A||A===0){z+=A}z+="</p>\n        ";return z}function n(A,z){return'\n        <div class="auth">\n        <span class="api-ic ic-error"></span>'}function l(C,B){var z="",A;z+='\n          <div id="api_information_panel" style="top: 526px; left: 776px; display: none;">\n          ';A=q.each.call(C,C,{hash:{},inverse:p.noop,fn:p.program(6,k,B),data:B});if(A||A===0){z+=A}z+="\n          </div>\n        ";return z}function k(D,C){var z="",B,A;z+="\n            <div title='";A=((B=D.description),typeof B===e?B.apply(D):B);if(A||A===0){z+=A}z+="'>"+d(((B=D.scope),typeof B===e?B.apply(D):B))+"</div>\n          ";return z}function h(A,z){return"</div>"}function x(A,z){return'\n        <div class=\'access\'>\n          <span class="api-ic ic-off" title="click to authenticate"></span>\n        </div>\n        '}function w(A,z){return'\n          <h4>Response Class</h4>\n          <p><span class="model-signature" /></p>\n          <br/>\n          <div class="response-content-type" />\n        '}function v(A,z){return'\n          <h4>Parameters</h4>\n          <table class=\'fullwidth\'>\n          <thead>\n            <tr>\n            <th style="width: 100px; max-width: 100px">Parameter</th>\n            <th style="width: 310px; max-width: 310px">Value</th>\n            <th style="width: 200px; max-width: 200px">Description</th>\n            <th style="width: 100px; max-width: 100px">Parameter Type</th>\n            <th style="width: 220px; max-width: 230px">Data Type</th>\n            </tr>\n          </thead>\n          <tbody class="operation-params">\n\n          </tbody>\n          </table>\n          '}function u(A,z){return"\n          <div style='margin:0;padding:0;display:inline'></div>\n          <h4>Response Messages</h4>\n          <table class='fullwidth'>\n            <thead>\n            <tr>\n              <th>HTTP Status Code</th>\n              <th>Reason</th>\n              <th>Response Model</th>\n            </tr>\n            </thead>\n            <tbody class=\"operation-status\">\n            \n            </tbody>\n          </table>\n          "}function t(A,z){return"\n          "}function j(A,z){return"\n          <div class='sandbox_header'>\n            <input class='submit' name='commit' type='button' value='Try it out!' />\n            <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n            <span class='response_throbber' style='display:none'></span>\n          </div>\n          "}r+="\n  <ul class='operations' >\n    <li class='";if(i=q.method){i=i.call(s,{hash:{},data:y})}else{i=s.method;i=typeof i===e?i.apply(s):i}r+=d(i)+" operation' id='";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"_";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+"'>\n      <div class='heading'>\n        <h3>\n          <span class='http_method'>\n          <a href='#!/";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.method){i=i.call(s,{hash:{},data:y})}else{i=s.method;i=typeof i===e?i.apply(s):i}r+=d(i)+"</a>\n          </span>\n          <span class='path'>\n          <a href='#!/";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.path){i=i.call(s,{hash:{},data:y})}else{i=s.path;i=typeof i===e?i.apply(s):i}r+=d(i)+"</a>\n          </span>\n        </h3>\n        <ul class='options'>\n          <li>\n          <a href='#!/";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.summary){i=i.call(s,{hash:{},data:y})}else{i=s.summary;i=typeof i===e?i.apply(s):i}if(i||i===0){r+=i}r+="</a>\n          </li>\n        </ul>\n      </div>\n      <div class='content' id='";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"_";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+"_content' style='display:none'>\n        ";i=q["if"].call(s,s.notes,{hash:{},inverse:p.noop,fn:p.program(1,o,y),data:y});if(i||i===0){r+=i}r+="\n        ";f={hash:{},inverse:p.noop,fn:p.program(3,n,y),data:y};if(i=q.oauth){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n        ";i=q.each.call(s,s.oauth,{hash:{},inverse:p.noop,fn:p.program(5,l,y),data:y});if(i||i===0){r+=i}r+="\n        ";f={hash:{},inverse:p.noop,fn:p.program(8,h,y),data:y};if(i=q.oauth){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n        ";f={hash:{},inverse:p.noop,fn:p.program(10,x,y),data:y};if(i=q.oauth){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n        ";i=q["if"].call(s,s.type,{hash:{},inverse:p.noop,fn:p.program(12,w,y),data:y});if(i||i===0){r+=i}r+="\n        <form accept-charset='UTF-8' class='sandbox'>\n          <div style='margin:0;padding:0;display:inline'></div>\n          ";i=q["if"].call(s,s.parameters,{hash:{},inverse:p.noop,fn:p.program(14,v,y),data:y});if(i||i===0){r+=i}r+="\n          ";i=q["if"].call(s,s.responseMessages,{hash:{},inverse:p.noop,fn:p.program(16,u,y),data:y});if(i||i===0){r+=i}r+="\n          ";i=q["if"].call(s,s.isReadOnly,{hash:{},inverse:p.program(20,j,y),fn:p.program(18,t,y),data:y});if(i||i===0){r+=i}r+="\n        </form>\n        <div class='response' style='display:none'>\n          <h4>Request URL</h4>\n          <div class='block request_url'></div>\n          <h4>Response Body</h4>\n          <div class='block response_body'></div>\n          <h4>Response Code</h4>\n          <div class='block response_code'></div>\n          <h4>Response Headers</h4>\n          <div class='block response_headers'></div>\n        </div>\n      </div>\n    </li>\n  </ul>\n";return r})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param=b(function(f,q,o,j,t){this.compilerInfo=[4,">= 1.0.0"];o=this.merge(o,f.helpers);t=t||{};var p="",g,d="function",c=this.escapeExpression,n=this;function m(y,x){var v="",w;v+="\n		";w=o["if"].call(y,y.isFile,{hash:{},inverse:n.program(4,k,x),fn:n.program(2,l,x),data:x});if(w||w===0){v+=w}v+="\n	";return v}function l(y,x){var v="",w;v+='\n			<input type="file" name=\'';if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+'\'/>\n			<div class="parameter-content-type" />\n		';return v}function k(y,x){var v="",w;v+="\n			";w=o["if"].call(y,y.defaultValue,{hash:{},inverse:n.program(7,h,x),fn:n.program(5,i,x),data:x});if(w||w===0){v+=w}v+="\n		";return v}function i(y,x){var v="",w;v+="\n				<textarea class='body-textarea' name='";if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+"'>";if(w=o.defaultValue){w=w.call(y,{hash:{},data:x})}else{w=y.defaultValue;w=typeof w===d?w.apply(y):w}v+=c(w)+"</textarea>\n			";return v}function h(y,x){var v="",w;v+="\n				<textarea class='body-textarea' name='";if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+'\'></textarea>\n				<br />\n				<div class="parameter-content-type" />\n			';return v}function e(y,x){var v="",w;v+="\n		";w=o["if"].call(y,y.isFile,{hash:{},inverse:n.program(10,u,x),fn:n.program(2,l,x),data:x});if(w||w===0){v+=w}v+="\n	";return v}function u(y,x){var v="",w;v+="\n			";w=o["if"].call(y,y.defaultValue,{hash:{},inverse:n.program(13,r,x),fn:n.program(11,s,x),data:x});if(w||w===0){v+=w}v+="\n		";return v}function s(y,x){var v="",w;v+="\n				<input class='parameter' minlength='0' name='";if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+"' placeholder='' type='text' value='";if(w=o.defaultValue){w=w.call(y,{hash:{},data:x})}else{w=y.defaultValue;w=typeof w===d?w.apply(y):w}v+=c(w)+"'/>\n			";return v}function r(y,x){var v="",w;v+="\n				<input class='parameter' minlength='0' name='";if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+"' placeholder='' type='text' value=''/>\n			";return v}p+="<td class='code'>";if(g=o.name){g=g.call(q,{hash:{},data:t})}else{g=q.name;g=typeof g===d?g.apply(q):g}p+=c(g)+"</td>\n<td>\n\n	";g=o["if"].call(q,q.isBody,{hash:{},inverse:n.program(9,e,t),fn:n.program(1,m,t),data:t});if(g||g===0){p+=g}p+="\n\n</td>\n<td>";if(g=o.description){g=g.call(q,{hash:{},data:t})}else{g=q.description;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+="</td>\n<td>";if(g=o.paramType){g=g.call(q,{hash:{},data:t})}else{g=q.paramType;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+='</td>\n<td>\n	<span class="model-signature"></span>\n</td>\n';return p})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_list=b(function(h,t,r,m,y){this.compilerInfo=[4,">= 1.0.0"];r=this.merge(r,h.helpers);y=y||{};var s="",j,g,e,p=this,q=r.helperMissing,d="function",c=this.escapeExpression;function o(A,z){return" multiple='multiple'"}function n(A,z){return"\n    "}function l(C,B){var z="",A;z+="\n      ";A=r["if"].call(C,C.defaultValue,{hash:{},inverse:p.program(8,i,B),fn:p.program(6,k,B),data:B});if(A||A===0){z+=A}z+="\n    ";return z}function k(A,z){return"\n      "}function i(E,D){var z="",C,B,A;z+="\n        ";A={hash:{},inverse:p.program(11,x,D),fn:p.program(9,f,D),data:D};B=((C=r.isArray||E.isArray),C?C.call(E,E,A):q.call(E,"isArray",E,A));if(B||B===0){z+=B}z+="\n      ";return z}function f(A,z){return"\n        "}function x(A,z){return"\n          <option selected=\"\" value=''></option>\n        "}function w(C,B){var z="",A;z+="\n      ";A=r["if"].call(C,C.isDefault,{hash:{},inverse:p.program(16,u,B),fn:p.program(14,v,B),data:B});if(A||A===0){z+=A}z+="\n    ";return z}function v(C,B){var z="",A;z+='\n        <option selected="" value=\'';if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"'>";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+" (default)</option>\n      ";return z}function u(C,B){var z="",A;z+="\n        <option value='";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"'>";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"</option>\n      ";return z}s+="<td class='code'>";if(j=r.name){j=j.call(t,{hash:{},data:y})}else{j=t.name;j=typeof j===d?j.apply(t):j}s+=c(j)+"</td>\n<td>\n  <select ";e={hash:{},inverse:p.noop,fn:p.program(1,o,y),data:y};g=((j=r.isArray||t.isArray),j?j.call(t,t,e):q.call(t,"isArray",t,e));if(g||g===0){s+=g}s+=" class='parameter' name='";if(g=r.name){g=g.call(t,{hash:{},data:y})}else{g=t.name;g=typeof g===d?g.apply(t):g}s+=c(g)+"'>\n    ";g=r["if"].call(t,t.required,{hash:{},inverse:p.program(5,l,y),fn:p.program(3,n,y),data:y});if(g||g===0){s+=g}s+="\n    ";g=r.each.call(t,((j=t.allowableValues),j==null||j===false?j:j.descriptiveValues),{hash:{},inverse:p.noop,fn:p.program(13,w,y),data:y});if(g||g===0){s+=g}s+="\n  </select>\n</td>\n<td>";if(g=r.description){g=g.call(t,{hash:{},data:y})}else{g=t.description;g=typeof g===d?g.apply(t):g}if(g||g===0){s+=g}s+="</td>\n<td>";if(g=r.paramType){g=g.call(t,{hash:{},data:y})}else{g=t.paramType;g=typeof g===d?g.apply(t):g}if(g||g===0){s+=g}s+='</td>\n<td><span class="model-signature"></span></td>';return s})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_readonly=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",d,h="function",j=this.escapeExpression,o=this;function e(t,s){var q="",r;q+="\n        <textarea class='body-textarea' readonly='readonly' name='";if(r=f.name){r=r.call(t,{hash:{},data:s})}else{r=t.name;r=typeof r===h?r.apply(t):r}q+=j(r)+"'>";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"</textarea>\n    ";return q}function c(t,s){var q="",r;q+="\n        ";r=f["if"].call(t,t.defaultValue,{hash:{},inverse:o.program(6,n,s),fn:o.program(4,p,s),data:s});if(r||r===0){q+=r}q+="\n    ";return q}function p(t,s){var q="",r;q+="\n            ";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"\n        ";return q}function n(r,q){return"\n            (empty)\n        "}i+="<td class='code'>";if(d=f.name){d=d.call(m,{hash:{},data:k})}else{d=m.name;d=typeof d===h?d.apply(m):d}i+=j(d)+"</td>\n<td>\n    ";d=f["if"].call(m,m.isBody,{hash:{},inverse:o.program(3,c,k),fn:o.program(1,e,k),data:k});if(d||d===0){i+=d}i+="\n</td>\n<td>";if(d=f.description){d=d.call(m,{hash:{},data:k})}else{d=m.description;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+="</td>\n<td>";if(d=f.paramType){d=d.call(m,{hash:{},data:k})}else{d=m.paramType;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+='</td>\n<td><span class="model-signature"></span></td>\n';return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_readonly_required=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",d,h="function",j=this.escapeExpression,o=this;function e(t,s){var q="",r;q+="\n        <textarea class='body-textarea'  readonly='readonly' placeholder='(required)' name='";if(r=f.name){r=r.call(t,{hash:{},data:s})}else{r=t.name;r=typeof r===h?r.apply(t):r}q+=j(r)+"'>";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"</textarea>\n    ";return q}function c(t,s){var q="",r;q+="\n        ";r=f["if"].call(t,t.defaultValue,{hash:{},inverse:o.program(6,n,s),fn:o.program(4,p,s),data:s});if(r||r===0){q+=r}q+="\n    ";return q}function p(t,s){var q="",r;q+="\n            ";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"\n        ";return q}function n(r,q){return"\n            (empty)\n        "}i+="<td class='code required'>";if(d=f.name){d=d.call(m,{hash:{},data:k})}else{d=m.name;d=typeof d===h?d.apply(m):d}i+=j(d)+"</td>\n<td>\n    ";d=f["if"].call(m,m.isBody,{hash:{},inverse:o.program(3,c,k),fn:o.program(1,e,k),data:k});if(d||d===0){i+=d}i+="\n</td>\n<td>";if(d=f.description){d=d.call(m,{hash:{},data:k})}else{d=m.description;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+="</td>\n<td>";if(d=f.paramType){d=d.call(m,{hash:{},data:k})}else{d=m.paramType;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+='</td>\n<td><span class="model-signature"></span></td>\n';return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_required=b(function(f,q,o,j,u){this.compilerInfo=[4,">= 1.0.0"];o=this.merge(o,f.helpers);u=u||{};var p="",g,d="function",c=this.escapeExpression,n=this;function m(z,y){var w="",x;w+="\n		";x=o["if"].call(z,z.isFile,{hash:{},inverse:n.program(4,k,y),fn:n.program(2,l,y),data:y});if(x||x===0){w+=x}w+="\n	";return w}function l(z,y){var w="",x;w+='\n			<input type="file" name=\'';if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n		";return w}function k(z,y){var w="",x;w+="\n			";x=o["if"].call(z,z.defaultValue,{hash:{},inverse:n.program(7,h,y),fn:n.program(5,i,y),data:y});if(x||x===0){w+=x}w+="\n		";return w}function i(z,y){var w="",x;w+="\n				<textarea class='body-textarea' placeholder='(required)' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'>";if(x=o.defaultValue){x=x.call(z,{hash:{},data:y})}else{x=z.defaultValue;x=typeof x===d?x.apply(z):x}w+=c(x)+"</textarea>\n			";return w}function h(z,y){var w="",x;w+="\n				<textarea class='body-textarea' placeholder='(required)' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+'\'></textarea>\n				<br />\n				<div class="parameter-content-type" />\n			';return w}function e(z,y){var w="",x;w+="\n		";x=o["if"].call(z,z.isFile,{hash:{},inverse:n.program(12,t,y),fn:n.program(10,v,y),data:y});if(x||x===0){w+=x}w+="\n	";return w}function v(z,y){var w="",x;w+="\n			<input class='parameter' class='required' type='file' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n		";return w}function t(z,y){var w="",x;w+="\n			";x=o["if"].call(z,z.defaultValue,{hash:{},inverse:n.program(15,r,y),fn:n.program(13,s,y),data:y});if(x||x===0){w+=x}w+="\n		";return w}function s(z,y){var w="",x;w+="\n				<input class='parameter required' minlength='1' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"' placeholder='(required)' type='text' value='";if(x=o.defaultValue){x=x.call(z,{hash:{},data:y})}else{x=z.defaultValue;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n			";return w}function r(z,y){var w="",x;w+="\n				<input class='parameter required' minlength='1' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"' placeholder='(required)' type='text' value=''/>\n			";return w}p+="<td class='code required'>";if(g=o.name){g=g.call(q,{hash:{},data:u})}else{g=q.name;g=typeof g===d?g.apply(q):g}p+=c(g)+"</td>\n<td>\n	";g=o["if"].call(q,q.isBody,{hash:{},inverse:n.program(9,e,u),fn:n.program(1,m,u),data:u});if(g||g===0){p+=g}p+="\n</td>\n<td>\n	<strong>";if(g=o.description){g=g.call(q,{hash:{},data:u})}else{g=q.description;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+="</strong>\n</td>\n<td>";if(g=o.paramType){g=g.call(q,{hash:{},data:u})}else{g=q.paramType;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+='</td>\n<td><span class="model-signature"></span></td>\n';return p})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.parameter_content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.consumes,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n  <option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n  ";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="parameterContentType"></label>\n<select name="parameterContentType">\n';c=f["if"].call(l,l.consumes,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.resource=b(function(f,l,e,k,j){this.compilerInfo=[4,">= 1.0.0"];e=this.merge(e,f.helpers);j=j||{};var h="",c,o,g="function",i=this.escapeExpression,n=this,m=e.blockHelperMissing;function d(q,p){return" : "}h+="<div class='heading'>\n  <h2>\n    <a href='#!/";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+'\' class="toggleEndpointList" data-id="';if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+'">';if(c=e.name){c=c.call(l,{hash:{},data:j})}else{c=l.name;c=typeof c===g?c.apply(l):c}h+=i(c)+"</a> ";o={hash:{},inverse:n.noop,fn:n.program(1,d,j),data:j};if(c=e.description){c=c.call(l,o)}else{c=l.description;c=typeof c===g?c.apply(l):c}if(!e.description){c=m.call(l,c,o)}if(c||c===0){h+=c}if(c=e.description){c=c.call(l,{hash:{},data:j})}else{c=l.description;c=typeof c===g?c.apply(l):c}if(c||c===0){h+=c}h+="\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"' id='endpointListTogger_";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+'\' class="toggleEndpointList" data-id="';if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+'">Show/Hide</a>\n    </li>\n    <li>\n      <a href=\'#\' class="collapseResource" data-id="';if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+'">\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href=\'#\' class="expandResource" data-id=';if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+">\n        Expand Operations\n      </a>\n    </li>\n    <li>\n      <a href='";if(c=e.url){c=c.call(l,{hash:{},data:j})}else{c=l.url;c=typeof c===g?c.apply(l):c}h+=i(c)+"'>Raw</a>\n    </li>\n  </ul>\n</div>\n<ul class='endpoints' id='";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"_endpoint_list' style='display:none'>\n\n</ul>\n";return h})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.response_content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n  <option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n  ";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="responseContentType"></label>\n<select name="responseContentType">\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.signature=b(function(e,k,d,j,i){this.compilerInfo=[4,">= 1.0.0"];d=this.merge(d,e.helpers);i=i||{};var g="",c,f="function",h=this.escapeExpression;g+='<div>\n<ul class="signature-nav">\n    <li><a class="description-link" href="#">Model</a></li>\n    <li><a class="snippet-link" href="#">Model Schema</a></li>\n</ul>\n<div>\n\n<div class="signature-container">\n    <div class="description">\n        ';if(c=d.signature){c=c.call(k,{hash:{},data:i})}else{c=k.signature;c=typeof c===f?c.apply(k):c}if(c||c===0){g+=c}g+='\n    </div>\n\n    <div class="snippet">\n        <pre><code>';if(c=d.sampleJSON){c=c.call(k,{hash:{},data:i})}else{c=k.sampleJSON;c=typeof c===f?c.apply(k):c}g+=h(c)+'</code></pre>\n        <small class="notice"></small>\n    </div>\n</div>\n\n';return g})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.status_code=b(function(e,k,d,j,i){this.compilerInfo=[4,">= 1.0.0"];d=this.merge(d,e.helpers);i=i||{};var g="",c,f="function",h=this.escapeExpression;g+="<td width='15%' class='code'>";if(c=d.code){c=c.call(k,{hash:{},data:i})}else{c=k.code;c=typeof c===f?c.apply(k):c}g+=h(c)+"</td>\n<td>";if(c=d.message){c=c.call(k,{hash:{},data:i})}else{c=k.message;c=typeof c===f?c.apply(k):c}if(c||c===0){g+=c}g+="</td>\n<td width='50%'><span class=\"model-signature\" /></td>";return g})})();(function(){var j,r,u,o,l,k,n,m,i,p,s,q,h,c,g,f,e,d,b,a,x,w,t={}.hasOwnProperty,v=function(B,z){for(var y in z){if(t.call(z,y)){B[y]=z[y]}}function A(){this.constructor=B}A.prototype=z.prototype;B.prototype=new A();B.__super__=z.prototype;return B};s=(function(z){v(y,z);function y(){q=y.__super__.constructor.apply(this,arguments);return q}y.prototype.dom_id="swagger_ui";y.prototype.options=null;y.prototype.api=null;y.prototype.headerView=null;y.prototype.mainView=null;y.prototype.initialize=function(A){var B=this;if(A==null){A={}}if(A.dom_id!=null){this.dom_id=A.dom_id;delete A.dom_id}if($("#"+this.dom_id)==null){$("body").append('<div id="'+this.dom_id+'"></div>')}this.options=A;this.options.success=function(){return B.render()};this.options.progress=function(C){return B.showMessage(C)};this.options.failure=function(C){return B.onLoadFailure(C)};this.headerView=new r({el:$("#header")});return this.headerView.on("update-swagger-ui",function(C){return B.updateSwaggerUi(C)})};y.prototype.updateSwaggerUi=function(A){this.options.url=A.url;return this.load()};y.prototype.load=function(){var B,A;if((A=this.mainView)!=null){A.clear()}B=this.options.url;if(B.indexOf("http")!==0){B=this.buildUrl(window.location.href.toString(),B)}this.options.url=B;this.headerView.update(B);this.api=new SwaggerApi(this.options);this.api.build();return this.api};y.prototype.render=function(){var A=this;this.showMessage("Finished Loading Resource Information. Rendering Swagger UI...");this.mainView=new u({model:this.api,el:$("#"+this.dom_id),swaggerOptions:this.options}).render();this.showMessage();switch(this.options.docExpansion){case"full":Docs.expandOperationsForResource("");break;case"list":Docs.collapseOperationsForResource("")}if(this.options.onComplete){this.options.onComplete(this.api,this)}return setTimeout(function(){return Docs.shebang()},400)};y.prototype.buildUrl=function(C,A){var B,D;log("base is "+C);if(A.indexOf("/")===0){D=C.split("/");C=D[0]+"//"+D[2];return C+A}else{B=C.length;if(C.indexOf("?")>-1){B=Math.min(B,C.indexOf("?"))}if(C.indexOf("#")>-1){B=Math.min(B,C.indexOf("#"))}C=C.substring(0,B);if(C.indexOf("/",C.length-1)!==-1){return C+A}return C+"/"+A}};y.prototype.showMessage=function(A){if(A==null){A=""}$("#message-bar").removeClass("message-fail");$("#message-bar").addClass("message-success");return $("#message-bar").html(A)};y.prototype.onLoadFailure=function(A){var B;if(A==null){A=""}$("#message-bar").removeClass("message-success");$("#message-bar").addClass("message-fail");B=$("#message-bar").html(A);if(this.options.onFailure!=null){this.options.onFailure(A)}return B};return y})(Backbone.Router);window.SwaggerUi=s;r=(function(z){v(y,z);function y(){h=y.__super__.constructor.apply(this,arguments);return h}y.prototype.events={"click #show-pet-store-icon":"showPetStore","click #show-wordnik-dev-icon":"showWordnikDev","click #explore":"showCustom","keyup #input_baseUrl":"showCustomOnKeyup","keyup #input_apiKey":"showCustomOnKeyup"};y.prototype.initialize=function(){};y.prototype.showPetStore=function(A){return this.trigger("update-swagger-ui",{url:"http://petstore.swagger.wordnik.com/api/api-docs"})};y.prototype.showWordnikDev=function(A){return this.trigger("update-swagger-ui",{url:"http://api.wordnik.com/v4/resources.json"})};y.prototype.showCustomOnKeyup=function(A){if(A.keyCode===13){return this.showCustom()}};y.prototype.showCustom=function(A){if(A!=null){A.preventDefault()}return this.trigger("update-swagger-ui",{url:$("#input_baseUrl").val(),apiKey:$("#input_apiKey").val()})};y.prototype.update=function(B,C,A){if(A==null){A=false}$("#input_baseUrl").val(B);if(A){return this.trigger("update-swagger-ui",{url:B})}};return y})(Backbone.View);u=(function(y){var z;v(A,y);function A(){g=A.__super__.constructor.apply(this,arguments);return g}z={alpha:function(C,B){return C.path.localeCompare(B.path)},method:function(C,B){return C.method.localeCompare(B.method)}};A.prototype.initialize=function(D){var C,H,F,E,B,G;if(D==null){D={}}if(D.swaggerOptions.sorter){F=D.swaggerOptions.sorter;H=z[F];G=this.model.apisArray;for(E=0,B=G.length;E<B;E++){C=G[E];C.operationsArray.sort(H)}if(F==="alpha"){return this.model.apisArray.sort(H)}}};A.prototype.render=function(){var C,H,E,F,D,B,G;$(this.el).html(Handlebars.templates.main(this.model));F={};C=0;G=this.model.apisArray;for(D=0,B=G.length;D<B;D++){E=G[D];H=E.name;while(typeof F[H]!=="undefined"){H=H+"_"+C;C+=1}E.id=H;F[H]=E;this.addResource(E)}return this};A.prototype.addResource=function(C){var B;B=new n({model:C,tagName:"li",id:"resource_"+C.id,className:"resource",swaggerOptions:this.options.swaggerOptions});return $("#resources").append(B.render().el)};A.prototype.clear=function(){return $(this.el).html("")};return A})(Backbone.View);n=(function(z){v(y,z);function y(){f=y.__super__.constructor.apply(this,arguments);return f}y.prototype.initialize=function(){};y.prototype.render=function(){var B,G,D,C,E,A,F;$(this.el).html(Handlebars.templates.resource(this.model));D={};F=this.model.operationsArray;for(E=0,A=F.length;E<A;E++){C=F[E];B=0;G=C.nickname;while(typeof D[G]!=="undefined"){G=G+"_"+B;B+=1}D[G]=C;C.nickname=G;C.parentId=this.model.id;this.addOperation(C)}$(".toggleEndpointList",this.el).click(this.callDocs.bind(this,"toggleEndpointListForResource"));$(".collapseResource",this.el).click(this.callDocs.bind(this,"collapseOperationsForResource"));$(".expandResource",this.el).click(this.callDocs.bind(this,"expandOperationsForResource"));return this};y.prototype.addOperation=function(A){var B;A.number=this.number;B=new o({model:A,tagName:"li",className:"endpoint",swaggerOptions:this.options.swaggerOptions});$(".endpoints",$(this.el)).append(B.render().el);return this.number++};y.prototype.callDocs=function(B,A){A.preventDefault();return Docs[B](A.currentTarget.getAttribute("data-id"))};return y})(Backbone.View);o=(function(z){v(y,z);function y(){e=y.__super__.constructor.apply(this,arguments);return e}y.prototype.invocationUrl=null;y.prototype.events={"submit .sandbox":"submitOperation","click .submit":"submitOperation","click .response_hider":"hideResponse","click .toggleOperation":"toggleOperationContent","mouseenter .api-ic":"mouseEnter","mouseout .api-ic":"mouseExit"};y.prototype.initialize=function(){};y.prototype.mouseEnter=function(F){var D,E,I,B,A,J,G,C,K,H;D=$(F.currentTarget.parentNode).find("#api_information_panel");K=F.pageX;H=F.pageY;J=$(window).scrollLeft();G=$(window).scrollTop();B=J+$(window).width();A=G+$(window).height();C=D.width();E=D.height();if(K+C>B){K=B-C}if(K<J){K=J}if(H+E>A){H=A-E}if(H<G){H=G}I={};I.top=H;I.left=K;D.css(I);return $(F.currentTarget.parentNode).find("#api_information_panel").show()};y.prototype.mouseExit=function(A){return $(A.currentTarget.parentNode).find("#api_information_panel").hide()};y.prototype.render=function(){var Q,R,P,O,I,N,J,M,K,H,L,G,F,E,C,T,V,U,S,D,B,A,W;R=true;if(!R){this.model.isReadOnly=true}this.model.oauth=null;if(this.model.authorizations){D=this.model.authorizations;for(P in D){L=D[P];if(P==="oauth2"){if(this.model.oauth===null){this.model.oauth={}}if(this.model.oauth.scopes===void 0){this.model.oauth.scopes=[]}for(G=0,T=L.length;G<T;G++){O=L[G];this.model.oauth.scopes.push(O)}}}}$(this.el).html(Handlebars.templates.operation(this.model));if(this.model.responseClassSignature&&this.model.responseClassSignature!=="string"){M={sampleJSON:this.model.responseSampleJSON,isParam:false,signature:this.model.responseClassSignature};J=new i({model:M,tagName:"div"});$(".model-signature",$(this.el)).append(J.render().el)}else{$(".model-signature",$(this.el)).html(this.model.type)}Q={isParam:false};Q.consumes=this.model.consumes;Q.produces=this.model.produces;B=this.model.parameters;for(F=0,V=B.length;F<V;F++){I=B[F];H=I.type||I.dataType;if(H.toLowerCase()==="file"){if(!Q.consumes){log("set content type ");Q.consumes="multipart/form-data"}}}N=new m({model:Q});$(".response-content-type",$(this.el)).append(N.render().el);A=this.model.parameters;for(E=0,U=A.length;E<U;E++){I=A[E];this.addParameter(I,Q.consumes)}W=this.model.responseMessages;for(C=0,S=W.length;C<S;C++){K=W[C];this.addStatusCode(K)}return this};y.prototype.addParameter=function(C,A){var B;C.consumes=A;B=new k({model:C,tagName:"tr",readOnly:this.model.isReadOnly});return $(".operation-params",$(this.el)).append(B.render().el)};y.prototype.addStatusCode=function(B){var A;A=new p({model:B,tagName:"tr"});return $(".operation-status",$(this.el)).append(A.render().el)};y.prototype.submitOperation=function(O){var Q,G,N,D,I,A,J,M,L,K,P,F,C,H,E,B;if(O!=null){O.preventDefault()}G=$(".sandbox",$(this.el));Q=true;G.find("input.required").each(function(){var R=this;$(this).removeClass("error");if(jQuery.trim($(this).val())===""){$(this).addClass("error");$(this).wiggle({callback:function(){return $(R).focus()}});return Q=false}});if(Q){D={};A={parent:this};N=false;H=G.find("input");for(M=0,P=H.length;M<P;M++){I=H[M];if((I.value!=null)&&jQuery.trim(I.value).length>0){D[I.name]=I.value}if(I.type==="file"){N=true}}E=G.find("textarea");for(L=0,F=E.length;L<F;L++){I=E[L];if((I.value!=null)&&jQuery.trim(I.value).length>0){D.body=I.value}}B=G.find("select");for(K=0,C=B.length;K<C;K++){I=B[K];J=this.getSelectedValue(I);if((J!=null)&&jQuery.trim(J).length>0){D[I.name]=J}}A.responseContentType=$("div select[name=responseContentType]",$(this.el)).val();A.requestContentType=$("div select[name=parameterContentType]",$(this.el)).val();$(".response_throbber",$(this.el)).show();if(N){return this.handleFileUpload(D,G)}else{return this.model["do"](D,A,this.showCompleteStatus,this.showErrorStatus,this)}}};y.prototype.success=function(A,B){return B.showCompleteStatus(A)};y.prototype.handleFileUpload=function(R,I){var M,H,C,N,L,K,P,J,G,F,D,Q,U,T,S,E,B,A,V,O=this;E=I.serializeArray();for(J=0,Q=E.length;J<Q;J++){N=E[J];if((N.value!=null)&&jQuery.trim(N.value).length>0){R[N.name]=N.value}}M=new FormData();P=0;B=this.model.parameters;for(G=0,U=B.length;G<U;G++){K=B[G];if(K.paramType==="form"){if(K.type.toLowerCase()!=="file"&&R[K.name]!==void 0){M.append(K.name,R[K.name])}}}C={};A=this.model.parameters;for(F=0,T=A.length;F<T;F++){K=A[F];if(K.paramType==="header"){C[K.name]=R[K.name]}}log(C);V=I.find('input[type~="file"]');for(D=0,S=V.length;D<S;D++){H=V[D];if(typeof H.files[0]!=="undefined"){M.append($(H).attr("name"),H.files[0]);P+=1}}this.invocationUrl=this.model.supportHeaderParams()?(C=this.model.getHeaderParams(R),this.model.urlify(R,false)):this.model.urlify(R,true);$(".request_url",$(this.el)).html("<pre></pre>");$(".request_url pre",$(this.el)).text(this.invocationUrl);L={type:this.model.method,url:this.invocationUrl,headers:C,data:M,dataType:"json",contentType:false,processData:false,error:function(X,Y,W){return O.showErrorStatus(O.wrap(X),O)},success:function(W){return O.showResponse(W,O)},complete:function(W){return O.showCompleteStatus(O.wrap(W),O)}};if(window.authorizations){window.authorizations.apply(L)}if(P===0){L.data.append("fake","true")}jQuery.ajax(L);return false};y.prototype.wrap=function(E){var C,F,H,B,G,D,A;H={};F=E.getAllResponseHeaders().split("\r");for(D=0,A=F.length;D<A;D++){B=F[D];C=B.split(":");if(C[0]!==void 0&&C[1]!==void 0){H[C[0].trim()]=C[1].trim()}}G={};G.content={};G.content.data=E.responseText;G.headers=H;G.request={};G.request.url=this.invocationUrl;G.status=E.status;return G};y.prototype.getSelectedValue=function(A){var D,C,F,B,E;if(!A.multiple){return A.value}else{C=[];E=A.options;for(F=0,B=E.length;F<B;F++){D=E[F];if(D.selected){C.push(D.value)}}if(C.length>0){return C.join(",")}else{return null}}};y.prototype.hideResponse=function(A){if(A!=null){A.preventDefault()}$(".response",$(this.el)).slideUp();return $(".response_hider",$(this.el)).fadeOut()};y.prototype.showResponse=function(A){var B;B=JSON.stringify(A,null,"\t").replace(/\n/g,"<br>");return $(".response_body",$(this.el)).html(escape(B))};y.prototype.showErrorStatus=function(B,A){return A.showStatus(B)};y.prototype.showCompleteStatus=function(B,A){return A.showStatus(B)};y.prototype.formatXml=function(H){var D,G,B,I,N,J,C,A,L,M,F,E,K;A=/(>)(<)(\/*)/g;M=/[ ]*(.*)[ ]+\n/g;D=/(<.+>)(.+\n)/g;H=H.replace(A,"$1\n$2$3").replace(M,"$1\n").replace(D,"$1\n$2");C=0;G="";N=H.split("\n");B=0;I="other";L={"single->single":0,"single->closing":-1,"single->opening":0,"single->other":0,"closing->single":0,"closing->closing":-1,"closing->opening":0,"closing->other":0,"opening->single":1,"opening->closing":0,"opening->opening":1,"opening->other":1,"other->single":0,"other->closing":-1,"other->opening":0,"other->other":0};F=function(T){var P,O,R,V,S,Q,U;Q={single:Boolean(T.match(/<.+\/>/)),closing:Boolean(T.match(/<\/.+>/)),opening:Boolean(T.match(/<[^!?].*>/))};S=((function(){var W;W=[];for(R in Q){U=Q[R];if(U){W.push(R)}}return W})())[0];S=S===void 0?"other":S;P=I+"->"+S;I=S;V="";B+=L[P];V=((function(){var X,Y,W;W=[];for(O=X=0,Y=B;0<=Y?X<Y:X>Y;O=0<=Y?++X:--X){W.push("  ")}return W})()).join("");if(P==="opening->closing"){return G=G.substr(0,G.length-1)+T+"\n"}else{return G+=V+T+"\n"}};for(E=0,K=N.length;E<K;E++){J=N[E];F(J)}return G};y.prototype.showStatus=function(F){var C,H,J,D,A,E,I,G,B;if(F.content===void 0){H=F.data;B=F.url}else{H=F.content.data;B=F.request.url}D=F.headers;J=D&&D["Content-Type"]?D["Content-Type"].split(";")[0].trim():null;if(!H){C=$("<code />").text("no content");E=$('<pre class="json" />').append(C)}else{if(J==="application/json"||/\+json$/.test(J)){C=$("<code />").text(JSON.stringify(JSON.parse(H),null,"  "));E=$('<pre class="json" />').append(C)}else{if(J==="application/xml"||/\+xml$/.test(J)){C=$("<code />").text(this.formatXml(H));E=$('<pre class="xml" />').append(C)}else{if(J==="text/html"){C=$("<code />").html(H);E=$('<pre class="xml" />').append(C)}else{if(/^image\//.test(J)){E=$("<img>").attr("src",B)}else{C=$("<code />").text(H);E=$('<pre class="json" />').append(C)}}}}}I=E;$(".request_url",$(this.el)).html("<pre></pre>");$(".request_url pre",$(this.el)).text(B);$(".response_code",$(this.el)).html("<pre>"+F.status+"</pre>");$(".response_body",$(this.el)).html(I);$(".response_headers",$(this.el)).html("<pre>"+_.escape(JSON.stringify(F.headers,null,"  ")).replace(/\n/g,"<br>")+"</pre>");$(".response",$(this.el)).slideDown();$(".response_hider",$(this.el)).show();$(".response_throbber",$(this.el)).hide();G=$(".response_body",$(this.el))[0];A=this.options.swaggerOptions;if(A.highlightSizeThreshold&&F.data.length>A.highlightSizeThreshold){return G}else{return hljs.highlightBlock(G)}};y.prototype.toggleOperationContent=function(){var A;A=$("#"+Docs.escapeResourceName(this.model.parentId)+"_"+this.model.nickname+"_content");if(A.is(":visible")){return Docs.collapseOperation(A)}else{return Docs.expandOperation(A)}};return y})(Backbone.View);p=(function(z){v(y,z);function y(){d=y.__super__.constructor.apply(this,arguments);return d}y.prototype.initialize=function(){};y.prototype.render=function(){var B,A,C;C=this.template();$(this.el).html(C(this.model));if(swaggerUi.api.models.hasOwnProperty(this.model.responseModel)){B={sampleJSON:JSON.stringify(swaggerUi.api.models[this.model.responseModel].createJSONSample(),null,2),isParam:false,signature:swaggerUi.api.models[this.model.responseModel].getMockSignature()};A=new i({model:B,tagName:"div"});$(".model-signature",this.$el).append(A.render().el)}else{$(".model-signature",this.$el).html("")}return this};y.prototype.template=function(){return Handlebars.templates.status_code};return y})(Backbone.View);k=(function(z){v(y,z);function y(){b=y.__super__.constructor.apply(this,arguments);return b}y.prototype.initialize=function(){return Handlebars.registerHelper("isArray",function(B,A){if(B.type.toLowerCase()==="array"||B.allowMultiple){return A.fn(this)}else{return A.inverse(this)}})};y.prototype.render=function(){var G,A,C,F,B,H,E,D;D=this.model.type||this.model.dataType;if(this.model.paramType==="body"){this.model.isBody=true}if(D.toLowerCase()==="file"){this.model.isFile=true}E=this.template();$(this.el).html(E(this.model));B={sampleJSON:this.model.sampleJSON,isParam:true,signature:this.model.signature};if(this.model.sampleJSON){H=new i({model:B,tagName:"div"});$(".model-signature",$(this.el)).append(H.render().el)}else{$(".model-signature",$(this.el)).html(this.model.signature)}A=false;if(this.model.isBody){A=true}G={isParam:A};G.consumes=this.model.consumes;if(A){C=new l({model:G});$(".parameter-content-type",$(this.el)).append(C.render().el)}else{F=new m({model:G});$(".response-content-type",$(this.el)).append(F.render().el)}return this};y.prototype.template=function(){if(this.model.isList){return Handlebars.templates.param_list}else{if(this.options.readOnly){if(this.model.required){return Handlebars.templates.param_readonly_required}else{return Handlebars.templates.param_readonly}}else{if(this.model.required){return Handlebars.templates.param_required}else{return Handlebars.templates.param}}}};return y})(Backbone.View);i=(function(z){v(y,z);function y(){a=y.__super__.constructor.apply(this,arguments);return a}y.prototype.events={"click a.description-link":"switchToDescription","click a.snippet-link":"switchToSnippet","mousedown .snippet":"snippetToTextArea"};y.prototype.initialize=function(){};y.prototype.render=function(){var A;A=this.template();$(this.el).html(A(this.model));this.switchToSnippet();this.isParam=this.model.isParam;if(this.isParam){$(".notice",$(this.el)).text("Click to set as parameter value")}return this};y.prototype.template=function(){return Handlebars.templates.signature};y.prototype.switchToDescription=function(A){if(A!=null){A.preventDefault()}$(".snippet",$(this.el)).hide();$(".description",$(this.el)).show();$(".description-link",$(this.el)).addClass("selected");return $(".snippet-link",$(this.el)).removeClass("selected")};y.prototype.switchToSnippet=function(A){if(A!=null){A.preventDefault()}$(".description",$(this.el)).hide();$(".snippet",$(this.el)).show();$(".snippet-link",$(this.el)).addClass("selected");return $(".description-link",$(this.el)).removeClass("selected")};y.prototype.snippetToTextArea=function(A){var B;if(this.isParam){if(A!=null){A.preventDefault()}B=$("textarea",$(this.el.parentNode.parentNode.parentNode));if($.trim(B.val())===""){return B.val(this.model.sampleJSON)}}};return y})(Backbone.View);j=(function(y){v(z,y);function z(){x=z.__super__.constructor.apply(this,arguments);return x}z.prototype.initialize=function(){};z.prototype.render=function(){var A;A=this.template();$(this.el).html(A(this.model));$("label[for=contentType]",$(this.el)).text("Response Content Type");return this};z.prototype.template=function(){return Handlebars.templates.content_type};return z})(Backbone.View);m=(function(y){v(z,y);function z(){w=z.__super__.constructor.apply(this,arguments);return w}z.prototype.initialize=function(){};z.prototype.render=function(){var A;A=this.template();$(this.el).html(A(this.model));$("label[for=responseContentType]",$(this.el)).text("Response Content Type");return this};z.prototype.template=function(){return Handlebars.templates.response_content_type};return z})(Backbone.View);l=(function(z){v(y,z);function y(){c=y.__super__.constructor.apply(this,arguments);return c}y.prototype.initialize=function(){};y.prototype.render=function(){var A;A=this.template();$(this.el).html(A(this.model));$("label[for=parameterContentType]",$(this.el)).text("Parameter content type:");return this};y.prototype.template=function(){return Handlebars.templates.parameter_content_type};return y})(Backbone.View)}).call(this);
\ No newline at end of file

From 160eb194ea28e33f12953aa2b5bf5d64b1033537 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 May 2017 15:24:35 +0200
Subject: [PATCH 0929/1163] Clean REST response for user and third parties

---
 .../societe/class/api_thirdparties.class.php  | 21 ++++++++++++++++++-
 htdocs/user/class/api_users.class.php         | 20 ++++++++++++++----
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index df7965d6d8c..507fd62ec48 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -311,7 +311,26 @@ class Thirdparties extends DolibarrApi
       return $this->company;
     }
 
-    /**
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   object  $object    Object to clean
+	 * @return    array    Array of cleaned object properties
+	 */
+	function _cleanObjectDatas($object) {
+	
+	    $object = parent::_cleanObjectDatas($object);
+	
+	    unset($object->total_ht);
+	    unset($object->total_tva);
+	    unset($object->total_localtax1);
+	    unset($object->total_localtax2);
+	    unset($object->total_ttc);
+	    
+	    return $object;
+	}	
+	
+	/**
      * Validate fields before create or update object
      * 
      * @param array $data   Datas to validate
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index aa2569fb3ca..af1b8441293 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -225,9 +225,9 @@ class Users extends DolibarrApi
     /**
 	 * add user to group
 	 *
-	 * @param   int     $id User ID
-	 * @param   int     $group Group ID
-	 * @return  int
+	 * @param   int     $id        User ID
+	 * @param   int     $group     Group ID
+	 * @return  int                1 if success
      * 
 	 * @url	GET {id}/setGroup/{group}
 	 */
@@ -246,7 +246,13 @@ class Users extends DolibarrApi
           throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
         }
     
-        return $this->useraccount->SetInGroup($group,1);
+        $result = $this->useraccount->SetInGroup($group,1);
+        if (! ($result > 0))
+        {
+            throw new RestException(500, $this->useraccount->error);
+        }
+                
+        return 1;
     }
 
 	/**
@@ -287,6 +293,12 @@ class Users extends DolibarrApi
 	    unset($object->lastsearch_values);
 	    unset($object->lastsearch_values_tmp);
 	     
+	    unset($object->total_ht);
+	    unset($object->total_tva);
+	    unset($object->total_localtax1);
+	    unset($object->total_localtax2);
+	    unset($object->total_ttc);
+	    
 	    return $object;
 	}	
 	

From 55121c5e05cfee1fcd84e818f46fcb449972c245 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 24 May 2017 16:35:02 +0200
Subject: [PATCH 0930/1163] Fix: use encrypt for llx_const data

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 6c71f279867..8ae10636373 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -210,22 +210,22 @@ ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoic
 
 ALTER TABLE llx_facture_rec ADD COLUMN vat_src_code	varchar(10) DEFAULT '';
 
-DELETE FROM llx_const where name = 'ADHERENT_BANK_USE_AUTO';
+DELETE FROM llx_const WHERE name = __ENCRYPT('ADHERENT_BANK_USE_AUTO')__;
 
-UPDATE llx_const set value='moono-lisa' where value = 'moono' AND name = 'FCKEDITOR_SKIN';
+UPDATE llx_const SET value = __ENCRYPT('moono-lisa')__ WHERE value = __ENCRYPT('moono')__ AND name = __ENCRYPT('FCKEDITOR_SKIN')__;
 
-ALTER TABLE llx_product_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
-ALTER TABLE llx_product_fournisseur_price ADD COLUMN default_vat_code	varchar(10) after tva_tx;
+ALTER TABLE llx_product_price ADD COLUMN default_vat_code	varchar(10) AFTER tva_tx;
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN default_vat_code	varchar(10) AFTER tva_tx;
 
 ALTER TABLE llx_user ADD COLUMN model_pdf varchar(255);
 ALTER TABLE llx_usergroup ADD COLUMN model_pdf varchar(255);
 
-INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('PRODUCT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/products', 'chaine', 0, '');
-INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('CONTRACT_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/contracts', 'chaine', 0, '');
-INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USERGROUP_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/usergroups', 'chaine', 0, '');
-INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('USER_ADDON_PDF_ODT_PATH', 1, 'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0, '');
+INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES (__ENCRYPT('PRODUCT_ADDON_PDF_ODT_PATH')__, 1, __ENCRYPT('DOL_DATA_ROOT/doctemplates/products')__, 'chaine', 0, '');
+INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES (__ENCRYPT('CONTRACT_ADDON_PDF_ODT_PATH')__, 1, __ENCRYPT('DOL_DATA_ROOT/doctemplates/contracts')__, 'chaine', 0, '');
+INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES (__ENCRYPT('USERGROUP_ADDON_PDF_ODT_PATH')__, 1, __ENCRYPT('DOL_DATA_ROOT/doctemplates/usergroups')__, 'chaine', 0, '');
+INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES (__ENCRYPT('USER_ADDON_PDF_ODT_PATH')__, 1, __ENCRYPT('DOL_DATA_ROOT/doctemplates/users')__, 'chaine', 0, '');
 
-INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('MAIN_ENABLE_OVERWRITE_TRANSLATION', 1, '1', 'chaine', 0, 'Enable overwrote of translation');
+INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES (__ENCRYPT('MAIN_ENABLE_OVERWRITE_TRANSLATION')__, 1, __ENCRYPT('1')__, 'chaine', 0, 'Enable overwrote of translation');
 
 ALTER TABLE llx_chargesociales ADD COLUMN ref varchar(16);
 ALTER TABLE llx_chargesociales ADD COLUMN fk_projet integer DEFAULT NULL;

From 339d9dbfdf6a800b12387ba2226a95d2172d6865 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 24 May 2017 18:44:03 +0200
Subject: [PATCH 0931/1163] New: add REST api "dictionaryevents" for to use
 with "agendaevents"

---
 .../api/class/api_dictionaryevents.class.php  | 100 ++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 htdocs/api/class/api_dictionaryevents.class.php

diff --git a/htdocs/api/class/api_dictionaryevents.class.php b/htdocs/api/class/api_dictionaryevents.class.php
new file mode 100644
index 00000000000..23d7e8e5dba
--- /dev/null
+++ b/htdocs/api/class/api_dictionaryevents.class.php
@@ -0,0 +1,100 @@
+<?php
+/* Copyright (C) 2017	Regis Houssin	<regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+use Luracast\Restler\RestException;
+
+require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
+
+/**
+ * API class for events type (content of the actioncomm dictionary)
+ *
+ * @access protected
+ * @class DolibarrApiAccess {@requires user,external}
+ */
+class DictionaryEvents extends DolibarrApi
+{
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        global $db;
+        $this->db = $db;
+    }
+
+    /**
+     * Get the list of events types.
+     *
+     * @param string    $sortfield  Sort field
+     * @param string    $sortorder  Sort order
+     * @param int       $limit      Number of items per page
+     * @param int       $page       Page number (starting from zero)
+     * @param string    $type       To filter on type of event
+     * @param string    $module     To filter on module events
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+     * @return List of events types
+     *
+     * @throws RestException
+     */
+    function index($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $module = '', $sqlfilters = '')
+    {
+        $list = array();
+
+        $sql = "SELECT id, code, type, libelle as label, module";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
+        $sql.= " WHERE t.active = 1";
+        if ($type) $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
+        if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+
+        $sql.= $this->db->order($sortfield, $sortorder);
+
+        if ($limit) {
+            if ($page < 0) {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql .= $this->db->plimit($limit, $offset);
+        }
+
+        $result = $this->db->query($sql);
+
+        if ($result) {
+            $num = $this->db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
+                $list[] = $this->db->fetch_object($result);
+            }
+        } else {
+            throw new RestException(503, 'Error when retrieving list of events types : '.$this->db->lasterror());
+        }
+
+        return $list;
+    }
+
+}

From 659436f1ed0d62085aa0edfc56299fa3e4965d70 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 24 May 2017 19:33:44 +0200
Subject: [PATCH 0932/1163] Fix: wrong min value

---
 htdocs/adherents/class/api_members.class.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 9ea36bf579a..3b1bda41250 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -106,7 +106,7 @@ class Members extends DolibarrApi
             $sql.= ' AND t.fk_adherent_type='.$typeid;
         }
         // Add sql filters
-        if ($sqlfilters) 
+        if ($sqlfilters)
         {
             if (! DolibarrApi::_checkFilters($sqlfilters))
             {
@@ -115,7 +115,7 @@ class Members extends DolibarrApi
 	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
-        
+
         $sql.= $db->order($sortfield, $sortorder);
         if ($limit)    {
             if ($page < 0)
@@ -132,9 +132,10 @@ class Members extends DolibarrApi
         {
             $i=0;
             $num = $db->num_rows($result);
-            while ($i < min($limit, $num))
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
             {
-                $obj = $db->fetch_object($result);
+            	$obj = $db->fetch_object($result);
                 $member = new Adherent($this->db);
                 if($member->fetch($obj->rowid)) {
                     $obj_ret[] = $this->_cleanObjectDatas($member);

From 3782bc445888981404e16b246dd8729e182ed637 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 May 2017 18:00:26 +0200
Subject: [PATCH 0933/1163] Look and feel v6

---
 htdocs/projet/admin/project.php                  | 2 +-
 htdocs/projet/admin/project_extrafields.php      | 2 +-
 htdocs/projet/admin/project_task_extrafields.php | 2 +-
 htdocs/projet/tasks/time.php                     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 42cacc19272..fbcecf032cf 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -318,7 +318,7 @@ print load_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup');
 
 $head=project_admin_prepare_head();
 
-dol_fiche_head($head, 'project', $langs->trans("Projects"), 0, 'project');
+dol_fiche_head($head, 'project', $langs->trans("Projects"), -1, 'project');
 
 
 
diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php
index e3e070a3473..26a6286f034 100644
--- a/htdocs/projet/admin/project_extrafields.php
+++ b/htdocs/projet/admin/project_extrafields.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup');
 
 $head = project_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Projects"), 0, 'project');
+dol_fiche_head($head, 'attributes', $langs->trans("Projects"), -1, 'project');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php
index 3d6e1d78fe8..58f91e863fc 100644
--- a/htdocs/projet/admin/project_task_extrafields.php
+++ b/htdocs/projet/admin/project_task_extrafields.php
@@ -69,7 +69,7 @@ print load_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup');
 
 $head = project_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_task', $langs->trans("Projects"), 0, 'project');
+dol_fiche_head($head, 'attributes_task', $langs->trans("Projects"), -1, 'project');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index cbdfece9d45..b35cc4d707d 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -96,7 +96,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Purge search criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
     $search_date='';
     $search_datehour='';
@@ -305,7 +305,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			// Tabs for project
 			$tab='tasks';
 			$head=project_prepare_head($projectstatic);
-			dol_fiche_head($head, $tab, $langs->trans("Project"), 0, ($projectstatic->public?'projectpub':'project'));
+			dol_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public?'projectpub':'project'));
 
 			$param=($mode=='mine'?'&mode=mine':'');
 

From e5fe629a0e761063f74b6787ea61735d71880981 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 24 May 2017 22:48:44 +0200
Subject: [PATCH 0934/1163] NEW Extrafields support formulas to be computed
 using PHP expressions

---
 htdocs/contact/list.php                       |   6 +-
 htdocs/core/actions_extrafields.inc.php       | 108 ++++++++++--------
 htdocs/core/class/extrafields.class.php       |  97 +++++++++++-----
 htdocs/core/lib/functions.lib.php             |  24 +++-
 htdocs/core/tpl/admin_extrafields_add.tpl.php |  67 ++++++++---
 .../core/tpl/admin_extrafields_edit.tpl.php   |  59 ++++++++--
 .../core/tpl/admin_extrafields_view.tpl.php   |   6 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   5 +-
 .../install/mysql/tables/llx_extrafields.sql  |   6 +-
 htdocs/langs/en_US/admin.lang                 |  12 +-
 htdocs/langs/en_US/main.lang                  |   1 +
 .../modulebuilder/skeletons/skeleton_list.php |  20 ++--
 htdocs/projet/list.php                        |  50 ++++----
 htdocs/projet/tasks/list.php                  |  37 +++---
 htdocs/societe/class/societe.class.php        |   2 -
 htdocs/societe/list.php                       |   6 +-
 16 files changed, 335 insertions(+), 171 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 39557a6e455..9bcfee7ccae 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -597,7 +597,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
             $align=$extrafields->getAlignFlag($key);
             $typeofextrafield=$extrafields->attribute_type[$key];
             print '<td class="liste_titre'.($align?' '.$align:'').'">';
-		    if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+		    if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
 			{
 			    $crit=$val;
 				$tmpkey=preg_replace('/search_options_/','',$key);
@@ -664,7 +664,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
        if (! empty($arrayfields["ef.".$key]['checked']))
        {
 			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+			$sortonfield = "ef.".$key;
+			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
        }
    }
 }
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index afcf929589b..b34cbe886ab 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -14,6 +14,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
+ * 
+ * $elementype must be defined.
  */
 
 /**
@@ -24,11 +26,14 @@
 $maxsizestring=255;
 $maxsizeint=10;
 
-$extrasize=GETPOST('size');
-if (GETPOST('type')=='double' && strpos($extrasize,',')===false) $extrasize='24,8';
-if (GETPOST('type')=='date')     $extrasize='';
-if (GETPOST('type')=='datetime') $extrasize='';
-if (GETPOST('type')=='select')   $extrasize='';
+$extrasize=GETPOST('size','int');
+$type=GETPOST('type','alpha');
+$param=GETPOST('param','alpha');;
+
+if ($type=='double' && strpos($extrasize,',')===false) $extrasize='24,8';
+if ($type=='date')     $extrasize='';
+if ($type=='datetime') $extrasize='';
+if ($type=='select')   $extrasize='';
 
 
 // Add attribute
@@ -37,73 +42,73 @@ if ($action == 'add')
 	if ($_POST["button"] != $langs->trans("Cancel"))
 	{
 	    // Check values
-		if (! GETPOST('type'))
+		if (! $type)
 		{
 			$error++;
 			$langs->load("errors");
 			$mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
 			$action = 'create';
 		}
-		if (GETPOST('type')=='varchar' && $extrasize <= 0)
+		if ($type=='varchar' && $extrasize <= 0)
 		{
 		    $error++;
 		    $langs->load("errors");
 		    $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
 		    $action = 'edit';
 		}
-        if (GETPOST('type')=='varchar' && $extrasize > $maxsizestring)
+        if ($type=='varchar' && $extrasize > $maxsizestring)
         {
             $error++;
             $langs->load("errors");
             $mesg[]=$langs->trans("ErrorSizeTooLongForVarcharType",$maxsizestring);
             $action = 'create';
         }
-        if (GETPOST('type')=='int' && $extrasize > $maxsizeint)
+        if ($type=='int' && $extrasize > $maxsizeint)
         {
             $error++;
             $langs->load("errors");
             $mesg[]=$langs->trans("ErrorSizeTooLongForIntType",$maxsizeint);
             $action = 'create';
         }
-        if (GETPOST('type')=='select' && !GETPOST('param'))
+        if ($type=='select' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForSelectType");
         	$action = 'create';
         }
-        if (GETPOST('type')=='sellist' && !GETPOST('param'))
+        if ($type=='sellist' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForSelectListType");
         	$action = 'create';
         }
-        if (GETPOST('type')=='checkbox' && !GETPOST('param'))
+        if ($type=='checkbox' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
         	$action = 'create';
         }
-        if (GETPOST('type')=='link' && !GETPOST('param'))
+        if ($type=='link' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForLinkType");
         	$action = 'create';
         }
-        if (GETPOST('type')=='radio' && !GETPOST('param'))
+        if ($type=='radio' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
         	$action = 'create';
         }
-        if  (((GETPOST('type')=='radio') || (GETPOST('type')=='checkbox')) && GETPOST('param'))
+        if  ((($type=='radio') || ($type=='checkbox')) && $param)
         {
         	// Construct array for parameter (value of select list)
-    		$parameters = GETPOST('param');
+    		$parameters = $param;
     		$parameters_array = explode("\r\n",$parameters);
     		foreach($parameters_array as $param_ligne)
     		{
@@ -134,11 +139,11 @@ if ($action == 'add')
     		if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/",$_POST['attrname']) && !is_numeric($_POST["attrname"]))
     		{
     			// Construct array for parameter (value of select list)
-        		$default_value = GETPOST('default_value');
-    			$parameters = GETPOST('param');
+        		$default_value = GETPOST('default_value','alpha');
+    			$parameters = $param;
     			$parameters_array = explode("\r\n",$parameters);
     			//In sellist we have only one line and it can have come to do SQL expression
-    			if (GETPOST('type')=='sellist') {
+    			if ($type=='sellist') {
     				foreach($parameters_array as $param_ligne)
     				{
     					$params['options'] = array($parameters=>null);
@@ -155,20 +160,21 @@ if ($action == 'add')
     			}
 
                 $result=$extrafields->addExtraField(
-                	GETPOST('attrname'),
-                	GETPOST('label'),
-                	GETPOST('type'),
-                	GETPOST('pos'),
+                	GETPOST('attrname', 'alpha'),
+                	GETPOST('label', 'alpha'),
+                	$type,
+                	GETPOST('pos', 'alpha'),
                 	$extrasize,
                 	$elementtype,
-                	(GETPOST('unique')?1:0),
-                	(GETPOST('required')?1:0),
+                	(GETPOST('unique', 'alpha')?1:0),
+                	(GETPOST('required', 'alpha')?1:0),
                 	$default_value,
                 	$params,
-                	(GETPOST('alwayseditable')?1:0),
-                	(GETPOST('perms')?GETPOST('perms'):''),
-                	(GETPOST('list')?1:0),
-					(GETPOST('ishidden')?1:0)
+                	(GETPOST('alwayseditable', 'alpha')?1:0),
+                	(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
+                	(GETPOST('list', 'alpha')?1:0),
+					(GETPOST('ishidden', 'alpha')?1:0),
+                    GETPOST('computed_value','alpha')
                 );
     			if ($result > 0)
     			{
@@ -205,66 +211,66 @@ if ($action == 'update')
 	if ($_POST["button"] != $langs->trans("Cancel"))
 	{
         // Check values
-		if (! GETPOST('type'))
+		if (! $type)
 		{
 			$error++;
 			$langs->load("errors");
 			$mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
 			$action = 'edit';
 		}
-		if (GETPOST('type')=='varchar' && $extrasize <= 0)
+		if ($type=='varchar' && $extrasize <= 0)
 		{
 		    $error++;
 		    $langs->load("errors");
 		    $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
 		    $action = 'edit';
 		}
-		if (GETPOST('type')=='varchar' && $extrasize > $maxsizestring)
+		if ($type=='varchar' && $extrasize > $maxsizestring)
         {
             $error++;
             $langs->load("errors");
             $mesg[]=$langs->trans("ErrorSizeTooLongForVarcharType",$maxsizestring);
             $action = 'edit';
         }
-        if (GETPOST('type')=='int' && $extrasize > $maxsizeint)
+        if ($type=='int' && $extrasize > $maxsizeint)
         {
             $error++;
             $langs->load("errors");
             $mesg[]=$langs->trans("ErrorSizeTooLongForIntType",$maxsizeint);
             $action = 'edit';
         }
-        if (GETPOST('type')=='select' && !GETPOST('param'))
+        if ($type=='select' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForSelectType");
         	$action = 'edit';
         }
-        if (GETPOST('type')=='sellist' && !GETPOST('param'))
+        if ($type=='sellist' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForSelectListType");
         	$action = 'edit';
         }
-        if (GETPOST('type')=='checkbox' && !GETPOST('param'))
+        if ($type=='checkbox' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
         	$action = 'edit';
         }
-        if (GETPOST('type')=='radio' && !GETPOST('param'))
+        if ($type=='radio' && !$param)
         {
         	$error++;
         	$langs->load("errors");
         	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
         	$action = 'edit';
         }
-        if  (((GETPOST('type')=='radio') || (GETPOST('type')=='checkbox')) && GETPOST('param'))
+        if  ((($type=='radio') || ($type=='checkbox')) && $param)
         {
         	// Construct array for parameter (value of select list)
-        	$parameters = GETPOST('param');
+        	$parameters = $param;
         	$parameters_array = explode("\r\n",$parameters);
         	foreach($parameters_array as $param_ligne)
         	{
@@ -295,10 +301,10 @@ if ($action == 'update')
     		{
     			$pos = GETPOST('pos','int');
     			// Construct array for parameter (value of select list)
-    			$parameters = GETPOST('param');
+    			$parameters = $param;
     			$parameters_array = explode("\r\n",$parameters);
     			//In sellist we have only one line and it can have come to do SQL expression
-    			if (GETPOST('type')=='sellist') {
+    			if ($type=='sellist') {
     				foreach($parameters_array as $param_ligne)
     				{
     					$params['options'] = array($parameters=>null);
@@ -315,19 +321,21 @@ if ($action == 'update')
     			}
 
     			$result=$extrafields->update(
-    				GETPOST('attrname'),
-    				GETPOST('label'),
-    				GETPOST('type'),
+    				GETPOST('attrname', 'alpha'),
+    				GETPOST('label', 'alpha'),
+    				$type,
     				$extrasize,
     				$elementtype,
-    				(GETPOST('unique')?1:0),
-    				(GETPOST('required')?1:0),
+    				(GETPOST('unique', 'alpha')?1:0),
+    				(GETPOST('required', 'alpha')?1:0),
     				$pos,
     				$params,
-    				(GETPOST('alwayseditable')?1:0),
-    				(GETPOST('perms')?GETPOST('perms'):''),
-                	(GETPOST('list')?1:0),
-					(GETPOST('ishidden')?1:0)
+    				(GETPOST('alwayseditable', 'alpha')?1:0),
+    				(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
+                	(GETPOST('list', 'alpha')?1:0),
+					(GETPOST('ishidden', 'alpha')?1:0),
+    			    GETPOST('default_value','alpha'),
+    			    GETPOST('computed_value','alpha')
     			);
     			if ($result > 0)
     			{
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index f86f786e0fb..c89fc593745 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -36,14 +36,22 @@
 class ExtraFields
 {
 	var $db;
-	// Tableau contenant le nom des champs en clef et la definition de ces champs
+
+	// type of element (for what object is the extrafield)
+	var $attribute_elementtype;
+	
+	// Array with type of the extra field
 	var $attribute_type;
-	// Tableau contenant le nom des champs en clef et le label de ces champs en value
+	// Array with label of extra field
 	var $attribute_label;
-	// Tableau contenant le nom des champs en clef et la taille/longueur max de ces champs en value
+	// Array with size of extra field
 	var $attribute_size;
-	// Tableau contenant le nom des choix en clef et la valeur de ces choix en value
+	// array with list of possible values for some types of extra fields
 	var $attribute_choice;
+	// Array to store compute formula for computed fields
+	var $attribute_computed;
+	// Array to store default value
+	var $attribute_default;
 	// Array to store if attribute is unique or not
 	var $attribute_unique;
 	// Array to store if attribute is required or not
@@ -77,16 +85,17 @@ class ExtraFields
 	'phone'=>'ExtrafieldPhone',
 	'mail'=>'ExtrafieldMail',
 	'url'=>'ExtrafieldUrl',
+	'password' => 'ExtrafieldPassword',
 	'select' => 'ExtrafieldSelect',
 	'sellist' => 'ExtrafieldSelectList',
 	'radio' => 'ExtrafieldRadio',
 	'checkbox' => 'ExtrafieldCheckBox',
 	'chkbxlst' => 'ExtrafieldCheckBoxFromList',
 	'link' => 'ExtrafieldLink',
-	'password' => 'ExtrafieldPassword',
 	'separate' => 'ExtrafieldSeparator',
 	);
 
+	
 	/**
 	 *	Constructor
 	 *
@@ -96,10 +105,12 @@ class ExtraFields
 	{
 		$this->db = $db;
 		$this->error = array();
+		$this->attribute_elementtype = array();
 		$this->attribute_type = array();
 		$this->attribute_label = array();
 		$this->attribute_size = array();
-		$this->attribute_elementtype = array();
+		$this->attribute_computed = array();
+		$this->attribute_default = array();
 		$this->attribute_unique = array();
 		$this->attribute_required = array();
 		$this->attribute_perms = array();
@@ -118,15 +129,16 @@ class ExtraFields
 	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', ...)
 	 *  @param	int		$unique				Is field unique or not
 	 *  @param	int		$required			Is field required or not
-	 *  @param	string	$default_value		Defaulted value (Example: '', '0', 'null', 'avalue')
+	 *  @param	string	$default_value		Defaulted value (In database. use the default_value feature for default value on screen. Example: '', '0', 'null', 'avalue')
 	 *  @param  array	$param				Params for field
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string	$perms				Permission to check
 	 *  @param	int		$list				Into list view by default
 	 *  @param	int		$ishidden			Is hidden extrafield (warning, do not rely on this. If your module need a hidden data, it must use its own table)
+	 *  @param  string  $computed           Computed value
 	 *  @return int      					<=0 if KO, >0 if OK
 	 */
-	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param=0, $alwayseditable=0, $perms='', $list=0, $ishidden=0)
+	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param=0, $alwayseditable=0, $perms='', $list=0, $ishidden=0, $computed='')
 	{
 		if (empty($attrname)) return -1;
 		if (empty($label)) return -1;
@@ -137,13 +149,13 @@ class ExtraFields
 		// Create field into database except for separator type which is not stored in database
 		if ($type != 'separate')
 		{
-			$result=$this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list);
+			$result=$this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $copmputed);
 		}
 		$err1=$this->errno;
 		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
 		{
 			// Add declaration of field into table
-			$result2=$this->create_label($attrname,$label,$type,$pos,$size,$elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $ishidden);
+			$result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $ishidden, $default, $computed);
 			$err2=$this->errno;
 			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
 			{
@@ -169,13 +181,14 @@ class ExtraFields
 	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', 'contact', ...)
 	 *  @param	int		$unique				Is field unique or not
 	 *  @param	int		$required			Is field required or not
-	 *  @param  string  $default_value		Default value for field
+	 *  @param  string  $default_value		Default value for field (in database)
 	 *  @param  array	$param				Params for field  (ex for select list : array('options'=>array('value'=>'label of option'))
 	 *  @param	string	$perms				Permission
 	 *	@param	int		$list				Into list view by default
+	 *  @param  string  $computed           Computed value
 	 *  @return int      	           		<=0 if KO, >0 if OK
 	 */
-	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list=0)
+	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list=0, $computed='')
 	{
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 		if ($elementtype == 'contact') $elementtype='socpeople';
@@ -258,9 +271,11 @@ class ExtraFields
 	 *  @param	string			$perms			Permission to check
 	 *  @param	int				$list			Into list view by default
 	 *  @param	int				$ishidden		Is hidden extrafield (warning, do not rely on this. If your module need a hidden data, it must use its own table)
+	 *  @param  string          $default        Default value (in database. use the default_value feature for default value on screen).
+	 *  @param  string          $computed       Computed value
 	 *  @return	int								<=0 if KO, >0 if OK
 	 */
-	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list=0, $ishidden=0)
+	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list=0, $ishidden=0, $default='', $computed='')
 	{
 		global $conf;
 
@@ -286,7 +301,7 @@ class ExtraFields
 				$params='';
 			}
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param, alwayseditable, perms, list, ishidden)";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param, alwayseditable, perms, list, ishidden, fielddefault, fieldcomputed)";
 			$sql.= " VALUES('".$attrname."',";
 			$sql.= " '".$this->db->escape($label)."',";
 			$sql.= " '".$type."',";
@@ -299,8 +314,10 @@ class ExtraFields
 			$sql.= " '".$params."',";
 			$sql.= " '".$alwayseditable."',";
 			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
-			$sql.= " ".$list;
-			$sql.= ", ".$ishidden;
+			$sql.= " ".$list.",";
+			$sql.= " ".$ishidden.",";
+			$sql.= " ".($default?"'".$this->db->escape($default)."'":"null").",";
+			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null");
 			$sql.=')';
 
 			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
@@ -430,9 +447,11 @@ class ExtraFields
 	 *  @param	string	$perms				Permission to check
 	 *  @param	int		$list				Into list view by default
 	 *  @param	int		$ishidden			Is hidden extrafield (warning, do not rely on this. If your module need a hidden data, it must use its own table)
+	 *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
+	 *  @param  string  $computed           Computed value
 	 * 	@return	int							>0 if OK, <=0 if KO
 	 */
-	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0, $perms='',$list='',$ishidden=0)
+	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0, $perms='',$list='',$ishidden=0,$default='',$computed='')
 	{
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 		if ($elementtype == 'contact') $elementtype='socpeople';
@@ -479,7 +498,7 @@ class ExtraFields
 			{
 				if ($label)
 				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$ishidden);
+					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$ishidden,$default,$computed);
 				}
 				if ($result > 0)
 				{
@@ -531,12 +550,14 @@ class ExtraFields
 	 *  @param	string	$perms				Permission to check
 	 *  @param	int		$list				Into list view by default
 	 *  @param	int		$ishidden			Is hidden extrafield (warning, do not rely on this. If your module need a hidden data, it must use its own table)
+	 *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
+	 *  @param  string  $computed           Computed value
 	 *  @return	int							<=0 if KO, >0 if OK
 	 */
-	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list=0,$ishidden=0)
+	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list=0,$ishidden=0,$default='',$computed='')
 	{
 		global $conf;
-		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$ishidden);
+		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$ishidden.", ".$default.", ".$computed);
 
 		// Clean parameters
 		if ($elementtype == 'thirdparty') $elementtype='societe';
@@ -557,7 +578,7 @@ class ExtraFields
 			$sql_del.= " WHERE name = '".$attrname."'";
 			$sql_del.= " AND entity = ".$conf->entity;
 			$sql_del.= " AND elementtype = '".$elementtype."'";
-			dol_syslog(get_class($this)."::update_label", LOG_DEBUG);
+
 			$resql1=$this->db->query($sql_del);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
@@ -573,8 +594,10 @@ class ExtraFields
 			$sql.= " pos,";
 			$sql.= " alwayseditable,";
 			$sql.= " param,";
-			$sql.= " list";
-			$sql.= ", ishidden";
+			$sql.= " list,";
+			$sql.= " ishidden,";
+			$sql.= " fielddefault,";
+			$sql.= " fieldcomputed";
 			$sql.= ") VALUES (";
 			$sql.= "'".$attrname."',";
 			$sql.= " ".$conf->entity.",";
@@ -588,10 +611,12 @@ class ExtraFields
 			$sql.= " '".$pos."',";
 			$sql.= " '".$alwayseditable."',";
 			$sql.= " '".$param."',";
-			$sql.= " ".$list;
-			$sql.= ", ".$ishidden;
+			$sql.= " ".$list.", ";
+			$sql.= " ".$ishidden.", ";
+			$sql.= " ".($default?"'".$this->db->escape($default)."'":"null").",";
+			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null");
 			$sql.= ")";
-			dol_syslog(get_class($this)."::update_label", LOG_DEBUG);
+
 			$resql2=$this->db->query($sql);
 
 			if ($resql1 && $resql2)
@@ -635,7 +660,7 @@ class ExtraFields
 		// For avoid conflicts with external modules
 		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
 
-		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,list,ishidden";
+		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,list,ishidden,fielddefault,fieldcomputed";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity IN (0,".$conf->entity.")";
 		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";
@@ -658,6 +683,8 @@ class ExtraFields
 					$this->attribute_label[$tab->name]=$tab->label;
 					$this->attribute_size[$tab->name]=$tab->size;
 					$this->attribute_elementtype[$tab->name]=$tab->elementtype;
+					$this->attribute_default[$tab->name]=$tab->fielddefault;
+					$this->attribute_computed[$tab->name]=$tab->fieldcomputed;
 					$this->attribute_unique[$tab->name]=$tab->fieldunique;
 					$this->attribute_required[$tab->name]=$tab->fieldrequired;
 					$this->attribute_param[$tab->name]=($tab->param ? unserialize($tab->param) : '');
@@ -699,6 +726,8 @@ class ExtraFields
 		$type =$this->attribute_type[$key];
 		$size =$this->attribute_size[$key];
 		$elementtype=$this->attribute_elementtype[$key];
+		$default=$this->attribute_default[$key];
+		$computed=$this->attribute_computed[$key];
 		$unique=$this->attribute_unique[$key];
 		$required=$this->attribute_required[$key];
 		$param=$this->attribute_param[$key];
@@ -706,6 +735,8 @@ class ExtraFields
 		$list=$this->attribute_list[$key];
 		$hidden=$this->attribute_hidden[$key];
 
+		if ($computed) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+		
 		if (empty($showsize))
 		{
     		if ($type == 'date')
@@ -1218,10 +1249,12 @@ class ExtraFields
 	{
 		global $conf,$langs;
 
+		$elementtype=$this->attribute_elementtype[$key];
 		$label=$this->attribute_label[$key];
 		$type=$this->attribute_type[$key];
 		$size=$this->attribute_size[$key];
-		$elementtype=$this->attribute_elementtype[$key];
+		$default=$this->attribute_default[$key];
+		$computed=$this->attribute_computed[$key];
 		$unique=$this->attribute_unique[$key];
 		$required=$this->attribute_required[$key];
 		$params=$this->attribute_param[$key];
@@ -1229,6 +1262,14 @@ class ExtraFields
 		$list=$this->attribute_list[$key];
 		$hidden=$this->attribute_hidden[$key];	// warning, do not rely on this. If your module need a hidden data, it must use its own table.
 
+		// If field is a computed field, value must become result of compute
+		if ($computed)
+		{
+		    // Make the eval of compute string
+		    //var_dump($computed);
+		    $value = dol_eval($computed, 1, 0);
+		}
+		
 		$showsize=0;
 		if ($type == 'date')
 		{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e8ead0ed829..9ecfdc037f3 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5604,20 +5604,32 @@ function verifCond($strRights)
  *
  * @param 	string	$s				String to evaluate
  * @param	int		$returnvalue	0=No return (used to execute eval($a=something)). 1=Value of eval is returned (used to eval($something)).
+ * @param   int     $hideerrors     1=Hide errors
  * @return	mixed					Nothing or return of eval
  */
-function dol_eval($s,$returnvalue=0)
+function dol_eval($s, $returnvalue=0, $hideerrors=1)
 {
 	// Only global variables can be changed by eval function and returned to caller
-	global $langs, $user, $conf;
-	global $leftmenu;
+	global $db, $langs, $user, $conf;
+	global $mainmenu, $leftmenu;
 	global $rights;
 	global $object;
-    global $soc;
+	global $mysoc;
+	
+	global $obj;       // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object      
+	global $soc;       // For backward compatibility
 
 	//print $s."<br>\n";
-	if ($returnvalue) return @eval('return '.$s.';');
-	else @eval($s);
+	if ($returnvalue)
+	{
+	    if ($hideerrors) return @eval('return '.$s.';');
+	    else return eval('return '.$s.';');
+	}
+	else
+	{
+	    if ($hideerrors) @eval($s);
+	    else eval($s);
+	}
 }
 
 /**
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 9e4fd464ee6..62821372e56 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -18,10 +18,12 @@
  */
 
 /**
- * The following vars must be defined
+ * The following vars must be defined:
  * $type2label
  * $form
  * $conf, $lang,
+ * The following vars may also be defined:
+ * $elementtype
  */
 
 ?>
@@ -31,15 +33,16 @@
     jQuery(document).ready(function() {
     	function init_typeoffields(type)
     	{
-        	console.log("select new type "+type);
+        	console.log("selected type is "+type);
     		var size = jQuery("#size");
+    		var computed_value = jQuery("#computed_value");
+    		var default_value = jQuery("#default_value");
     		var unique = jQuery("#unique");
     		var required = jQuery("#required");
-    		var default_value = jQuery("#default_value");
     		var alwayseditable = jQuery("#alwayseditable");
     		var list = jQuery("#list");
     		<?php
-    		if((GETPOST('type') != "select") && (GETPOST('type') != "sellist"))
+    		if ((GETPOST('type') != "select") && (GETPOST('type') != "sellist"))
     		{
     			print 'jQuery("#value_choice").hide();';
     		}
@@ -51,6 +54,28 @@
     		}
     		?>
 
+    		// Case of computed field
+    		console.log(type);
+    		if (type == '' || type == 'varchar' || type == 'int' || type == 'double' || type == 'price') { 
+    			jQuery("tr.extra_computed_value").show(); 
+    		} else {
+    			computed_value.val(''); jQuery("tr.extra_computed_value").hide();
+    		} 
+    		if (computed_value.val())
+    		{
+        		console.log("We enter a computed formula");
+        		jQuery("#default_value").val('');
+        		/* jQuery("#unique, #required, #alwayseditable, #ishidden, #list").removeAttr('checked'); */
+        		jQuery("#default_value, #unique, #required, #alwayseditable, #ishidden, #list").attr('disabled', true);
+        		jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_ishidden, tr.extra_list").hide();
+    		}
+    		else
+    		{
+        		console.log("No computed formula");
+        		jQuery("#default_value, #unique, #required, #alwayseditable, #ishidden, #list").attr('disabled', false);
+        		jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_ishidden, tr.extra_list").show();
+    		}
+    		
 			if (type == 'date')          { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
 			else if (type == 'datetime') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
     		else if (type == 'double')   { size.val('24,8').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
@@ -65,7 +90,10 @@
 			else if (type == 'checkbox') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
 			else if (type == 'chkbxlst') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();}
 			else if (type == 'link')     { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();}
-			else if (type == 'separate') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
+			else if (type == 'separate') { 
+				size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); 
+				jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();
+			}
 			else {	// type = string
 				size.val('').prop('disabled', true);
 				unique.removeAttr('disabled');
@@ -73,10 +101,12 @@
 
 			if (type == 'separate')
 			{
-				unique.removeAttr('checked').prop('disabled', true); required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.val('').prop('disabled', true); 
+				required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.val('').prop('disabled', true);
+				jQuery('#size, #default_value').val('').prop('disabled', true); 
 			}
 			else
 			{
+				default_value.removeAttr('disabled');
 				required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.val('').removeAttr('disabled'); 
 			}
     	}
@@ -84,6 +114,11 @@
     	jQuery("#type").change(function() {
     		init_typeoffields($(this).val());
     	});
+
+    	// If we enter a formula, we disable other fields
+    	jQuery("#computed_value").keyup(function() {
+    		init_typeoffields(jQuery('#type').val());
+    	});
     });
 </script>
 
@@ -103,9 +138,7 @@
 <?php print $form->selectarray('type',$type2label,GETPOST('type')); ?>
 </td></tr>
 <!-- Size -->
-<tr><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td class="valeur"><input id="size" type="text" name="size" size="5" value="<?php echo (GETPOST('size')?GETPOST('size'):''); ?>"></td></tr>
-<!-- Position -->
-<tr><td><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOST('pos'); ?>"></td></tr>
+<tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td class="valeur"><input id="size" type="text" name="size" size="5" value="<?php echo (GETPOST('size')?GETPOST('size'):''); ?>"></td></tr>
 <!-- Default Value (for select list / radio/ checkbox) -->
 <tr id="value_choice">
 <td>
@@ -124,17 +157,21 @@
     </table>
 </td>
 </tr>
-<!-- Default Value -->
-<tr><td><?php echo $langs->trans("DefaultValue"); ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo (GETPOST('"default_value"')?GETPOST('"default_value"'):''); ?>"></td></tr>
+<!-- Position -->
+<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOST('pos'); ?>"></td></tr>
+<!-- Computed Value -->
+<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" type="text" name="computed_value" class="quatrevingtpercent" value="<?php echo (GETPOST('"computed_value"')?GETPOST('"computed_value"'):''); ?>"></td></tr>
+<!-- Default Value (at sql setup level) -->
+<tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo (GETPOST('"default_value"')?GETPOST('"default_value"'):''); ?>"></td></tr>
 <!-- Unique -->
-<tr><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo (GETPOST('unique')?' checked':''); ?>></td></tr>
+<tr class="extra_unique"><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo (GETPOST('unique')?' checked':''); ?>></td></tr>
 <!-- Required -->
-<tr><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo (GETPOST('required')?' checked':''); ?>></td></tr>
+<tr class="extra_required"><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo (GETPOST('required')?' checked':''); ?>></td></tr>
 <!-- Always editable -->
-<tr><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ((GETPOST('alwayseditable') || ! GETPOST('button'))?' checked':''); ?>></td></tr>
+<tr class="extra_alwayseditable"><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ((GETPOST('alwayseditable') || ! GETPOST('button'))?' checked':''); ?>></td></tr>
 <!-- Is visible or not -->
 <?php if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) { ?>
-<tr><td><?php echo $langs->trans("Hidden"); ?></td><td class="valeur"><input id="ishidden" type="checkbox" name="ishidden"<?php echo (GETPOST('ishidden') ?' checked' : ''); ?>></td></tr>
+<tr class="extra_ishidden"><td><?php echo $langs->trans("Hidden"); ?></td><td class="valeur"><input id="ishidden" type="checkbox" name="ishidden"<?php echo (GETPOST('ishidden') ?' checked' : ''); ?>></td></tr>
 <?php } ?>
 <?php if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { ?>
 <!-- By default visible into list -->
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index b6c43b10ce9..6f049c506a3 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -15,6 +15,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
+/**
+ * The following vars must be defined:
+ * $type2label
+ * $form
+ * $conf, $lang,
+ * The following vars may also be defined:
+ * $elementtype
+ */
+
 ?>
 
 <!-- BEGIN PHP TEMPLATE admin_extrafields_edit.tpl.php -->
@@ -24,9 +34,10 @@
     	{
         	console.log("select new type "+type);
     		var size = jQuery("#size");
+    		var computed_value = jQuery("#computed_value");
+    		var default_value = jQuery("#default_value");
     		var unique = jQuery("#unique");
     		var required = jQuery("#required");
-    		var default_value = jQuery("#default_value");
     		var alwayseditable = jQuery("#alwayseditable");
     		var list = jQuery("#list");
     		<?php
@@ -42,6 +53,27 @@
     		}
     		?>
 
+    		// Case of computed field
+    		if (type == 'varchar' || type == 'int' || type == 'double' || type == 'price') { 
+    			jQuery("tr.extra_computed_value").show(); 
+    		} else {
+    			computed_value.val(''); jQuery("tr.extra_computed_value").hide();
+    		} 
+    		if (computed_value.val())
+    		{
+        		console.log("We enter a computed formula");
+        		jQuery("#default_value").val('');
+        		/* jQuery("#unique, #required, #alwayseditable, #ishidden, #list").removeAttr('checked'); */
+        		jQuery("#default_value, #unique, #required, #alwayseditable, #ishidden, #list").attr('disabled', true);
+        		jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_ishidden, tr.extra_list").hide();
+    		}
+    		else
+    		{
+        		console.log("No computed formula");
+        		jQuery("#default_value, #unique, #required, #alwayseditable, #ishidden, #list").attr('disabled', false);
+        		jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_ishidden, tr.extra_list").show();
+    		}
+    		
 			if (type == 'date') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
 			else if (type == 'datetime') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
     		else if (type == 'double')   { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
@@ -65,9 +97,11 @@
 			if (type == 'separate')
 			{
 				required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.val('').prop('disabled', true); 
+				jQuery('#size, #default_value').val('').prop('disabled', true); 
 			}
 			else
 			{
+				default_value.removeAttr('disabled');
 				required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.val('').removeAttr('disabled'); 
 			}			
     	}
@@ -75,6 +109,11 @@
     	jQuery("#type").change(function() {
     		init_typeoffields($(this).val());
     	});
+
+    	// If we enter a formula, we disable other fields
+    	jQuery("#computed_value").keyup(function() {
+    		init_typeoffields(jQuery('#type').val());
+    	});    	
     });
 </script>
 
@@ -92,6 +131,8 @@
 <?php
 $type=$extrafields->attribute_type[$attrname];
 $size=$extrafields->attribute_size[$attrname];
+$computed=$extrafields->attribute_computed[$attrname];
+$default=$extrafields->attribute_default[$attrname];
 $unique=$extrafields->attribute_unique[$attrname];
 $required=$extrafields->attribute_required[$attrname];
 $pos=$extrafields->attribute_pos[$attrname];
@@ -156,9 +197,7 @@ else
 ?>
 </td></tr>
 <!-- Size -->
-<tr><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td><input id="size" type="text" name="size" size="5" value="<?php echo $size; ?>"></td></tr>
-<!-- Position -->
-<tr><td><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php  echo $extrafields->attribute_pos[$attrname];  ?>"></td></tr>
+<tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td><input id="size" type="text" name="size" size="5" value="<?php echo $size; ?>"></td></tr>
 <!--  Value (for select list / radio) -->
 <tr id="value_choice">
 <td>
@@ -177,12 +216,18 @@ else
     </table>
 </td>
 </tr>
+<!-- Position -->
+<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo dol_escape_htmltag($extrafields->attribute_pos[$attrname]);  ?>"></td></tr>
+<!-- Computed value -->
+<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>
+<!-- Default value -->
+<!-- Edit of default into sql structure not yet supported -->
 <!-- Unique -->
-<tr><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo ($unique?' checked':''); ?>></td></tr>
+<tr class="extra_unique"><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo ($unique?' checked':''); ?>></td></tr>
 <!-- Required -->
-<tr><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo ($required?' checked':''); ?>></td></tr>
+<tr class="extra_required"><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo ($required?' checked':''); ?>></td></tr>
 <!-- Always editable -->
-<tr><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ($alwayseditable?' checked':''); ?>></td></tr>
+<tr class="extra_alwayseditable"><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ($alwayseditable?' checked':''); ?>></td></tr>
 <!-- Is visible or not -->
 <?php if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) { ?>
     <tr><td><?php echo $langs->trans("Hidden"); ?></td><td class="valeur"><input id="ishidden" type="checkbox" name="ishidden"<?php echo ($ishidden ?' checked':''); ?>></td></tr>
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 3242a388a3d..a6d7e735735 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -37,12 +37,15 @@ print '<div class="div-table-responsive">';
 print '<table summary="listofattributes" class="noborder" width="100%">';
 
 print '<tr class="liste_titre">';
-print '<td align="left">'.$langs->trans("Position").'</td>';
+print '<td align="left">'.$langs->trans("Position");
+print '<span class="nowrap"><img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/1downarrow.png" alt="" title="A-Z" class="imgdown"></span>';
+print '</td>';
 print '<td>'.$langs->trans("Label").'</td>';
 print '<td>'.$langs->trans("AttributeCode").'</td>';
 print '<td>'.$langs->trans("Type").'</td>';
 print '<td align="right">'.$langs->trans("Size").'</td>';
 print '<td align="center">'.$langs->trans("Unique").'</td>';
+print '<td>'.$langs->trans("ComputedFormula").'</td>';
 print '<td align="center">'.$langs->trans("Required").'</td>';
 print '<td align="center">'.$langs->trans("AlwaysEditable").'</td>';
 if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center">'.$langs->trans("Hidden").'</td>';
@@ -61,6 +64,7 @@ if (count($extrafields->attribute_type))
         print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
         print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
         print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
+        print '<td>'.dol_trunc($extrafields->attribute_computed[$key], 20)."</td>\n";
         print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
         print '<td align="center">'.yn($extrafields->attribute_alwayseditable[$key])."</td>\n";
     	if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) print '<td align="center">'.yn($extrafields->attribute_hidden[$key])."</td>\n";	// Add hidden option on not working feature. Why hide if user can't see it.
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 6c71f279867..f7ed5b7575b 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -34,6 +34,10 @@
 -- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
 
+
+ALTER TABLE llx_extrafields ADD COLUMN fieldcomputed text;
+ALTER TABLE llx_extrafields ADD COLUMN fielddefault varchar(255);
+
 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEFAULT 0;
@@ -251,7 +255,6 @@ ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_tx	     d
 ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_price	 double(24,8) DEFAULT NULL;
 ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_price_ttc double(24,8) DEFAULT NULL;
 
-
 create table llx_payment_various
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index 2cc144db092..aee51524e6f 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -21,12 +21,14 @@ create table llx_extrafields
 (
 	rowid           integer AUTO_INCREMENT PRIMARY KEY,
 	name            varchar(64) NOT NULL,         				-- name of field into extrafields tables
-	entity          integer DEFAULT 1 NOT NULL,				-- multi company id
-    elementtype     varchar(64) NOT NULL DEFAULT 'member',	-- for which element this extra fields is for
+	entity          integer DEFAULT 1 NOT NULL,					-- multi company id
+    elementtype     varchar(64) NOT NULL DEFAULT 'member',		-- for which element this extra fields is for
 	tms             timestamp,									-- date of last update
 	label           varchar(255) NOT NULL,        				-- label to show for attribute
 	type            varchar(8),
 	size            varchar(8) DEFAULT NULL,
+	fieldcomputed   text,
+	fielddefault    varchar(255),
 	fieldunique     integer DEFAULT 0,
 	fieldrequired   integer DEFAULT 0,
 	perms			varchar(255),								-- not used yet
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d25a97c28e5..fe547931908 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -375,19 +375,21 @@ Int=Integer
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (Checkbox)
+Boolean=Boolean (one checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldCheckBox=Checkboxes
+ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
+ComputedFormula=Computed field
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 5 ? round($object->id / 2, 2) : ($object->id + 2*$user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'<br><br>Other example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? round($reloadedobj->capital / 5) : '-1'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 77b5af78f81..a170bc3f6e1 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -773,6 +773,7 @@ BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
 HR=HR
 HRAndBank=HR and Bank
+AutomaticallyCalculated=Automatically calculated
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/modulebuilder/skeletons/skeleton_list.php b/htdocs/modulebuilder/skeletons/skeleton_list.php
index 9c258162759..47aeda79fdc 100644
--- a/htdocs/modulebuilder/skeletons/skeleton_list.php
+++ b/htdocs/modulebuilder/skeletons/skeleton_list.php
@@ -126,13 +126,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 }
 
 
-// Load object if id or ref is provided as parameter
 $object=new Skeleton_Class($db);
-if (($id > 0 || ! empty($ref)) && $action != 'add')
-{
-	$result=$object->fetch($id,$ref);
-	if ($result < 0) dol_print_error($db);
-}
 
 
 
@@ -354,7 +348,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
        if (! empty($arrayfields["ef.".$key]['checked'])) 
        {
 			$align=$extrafields->getAlignFlag($key);
-			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+			$sortonfield = "ef.".$key;
+			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
        }
    }
 }
@@ -383,7 +379,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
             $align=$extrafields->getAlignFlag($key);
             $typeofextrafield=$extrafields->attribute_type[$key];
             print '<td class="liste_titre'.($align?' '.$align:'').'">';
-        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
 			{
 			    $crit=$val;
 				$tmpkey=preg_replace('/search_options_/','',$key);
@@ -427,6 +423,14 @@ print '</td>';
 print '</tr>'."\n";
     
 
+// Detect if we need a fetch on each output line
+$needToFetchEachLine=0;
+foreach ($extrafields->attribute_computed as $key => $val)
+{
+    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+}
+
+
 $i=0;
 $totalarray=array();
 while ($i < min($num, $limit))
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 6230626a320..b327573e3db 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -141,6 +141,8 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
    }
 }
 
+$object = new Project($db);
+
 
 /*
  * Actions
@@ -200,7 +202,6 @@ if (empty($reshook))
  * View
  */
 
-$projectstatic = new Project($db);
 $socstatic = new Societe($db);
 $form = new Form($db);
 $formother = new FormOther($db);
@@ -212,12 +213,12 @@ $title=$langs->trans("Projects");
 
 // Get list of project id allowed to user (in a string list separated by coma)
 $projectsListId='';
-if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
+if (! $user->rights->projet->all->lire) $projectsListId = $object->getProjectsAuthorizedForUser($user,0,1,$socid);
 
 // Get id of types of contacts for projects (This list never contains a lot of elements)
 $listofprojectcontacttype=array();
 $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-$sql.= " WHERE ctc.element = '" . $projectstatic->element . "'";
+$sql.= " WHERE ctc.element = '" . $object->element . "'";
 $sql.= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
 if ($resql)
@@ -232,7 +233,7 @@ if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';
 
 
 $distinct='DISTINCT';   // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
-$sql = "SELECT ".$distinct." p.rowid as projectid, p.ref, p.title, p.fk_statut, p.fk_opp_status, p.public, p.fk_user_creat";
+$sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut, p.fk_opp_status, p.public, p.fk_user_creat";
 $sql.= ", p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount";
 $sql.= ", s.nom as name, s.rowid as socid";
 $sql.= ", cls.code as opp_status_code";
@@ -360,8 +361,7 @@ $arrayofselected=is_array($toselect)?$toselect:array();
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
 {
     $obj = $db->fetch_object($resql);
-    $id = $obj->projectid;
-    header("Location: ".DOL_URL_ROOT.'/projet/card.php?id='.$id);
+    header("Location: ".DOL_URL_ROOT.'/projet/card.php?id='.$obj->id);
     exit;
 }
 
@@ -566,7 +566,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
             $align=$extrafields->getAlignFlag($key);
             $typeofextrafield=$extrafields->attribute_type[$key];
             print '<td class="liste_titre'.($align?' '.$align:'').'">';
-        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
 			{
 			    $crit=$val;
 				$tmpkey=preg_replace('/search_options_/','',$key);
@@ -599,7 +599,7 @@ if (! empty($arrayfields['p.fk_statut']['checked']))
 {
 	print '<td class="liste_titre nowrap" align="right">';
     $arrayofstatus = array();
-    foreach($projectstatic->statuts_short as $key => $val) $arrayofstatus[$key]=$langs->trans($val);
+    foreach($object->statuts_short as $key => $val) $arrayofstatus[$key]=$langs->trans($val);
     $arrayofstatus['99']=$langs->trans("NotClosed").' ('.$langs->trans('Draft').'+'.$langs->trans('Opened').')';
 	print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
     print '</td>';
@@ -632,7 +632,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            $sortonfield = "ef.".$key;
+            if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }
@@ -652,15 +654,15 @@ while ($i < min($num,$limit))
 {
 	$obj = $db->fetch_object($resql);
 
-	$projectstatic->id = $obj->projectid;
-	$projectstatic->user_author_id = $obj->fk_user_creat;
-	$projectstatic->public = $obj->public;
-	$projectstatic->ref = $obj->ref;
-	$projectstatic->datee = $db->jdate($obj->date_end);
-	$projectstatic->statut = $obj->fk_statut;
-	$projectstatic->opp_status = $obj->fk_opp_status;
-	 
-	$userAccess = $projectstatic->restrictedProjectArea($user);    // why this ?
+	$object->id = $obj->id;
+	$object->user_author_id = $obj->fk_user_creat;
+	$object->public = $obj->public;
+	$object->ref = $obj->ref;
+	$object->datee = $db->jdate($obj->date_end);
+	$object->statut = $obj->fk_statut;
+	$object->opp_status = $obj->fk_opp_status;
+	
+	$userAccess = $object->restrictedProjectArea($user);    // why this ?
 	if ($userAccess >= 0)
 	{
 		print '<tr class="oddeven">';
@@ -669,8 +671,8 @@ while ($i < min($num,$limit))
     	if (! empty($arrayfields['p.ref']['checked']))
     	{
     		print '<td class="nowrap">';
-    		print $projectstatic->getNomUrl(1);
-    		if ($projectstatic->hasDelay()) print img_warning($langs->trans('Late'));
+    		print $object->getNomUrl(1);
+    		if ($object->hasDelay()) print img_warning($langs->trans('Late'));
     		print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}
@@ -851,8 +853,7 @@ while ($i < min($num,$limit))
 		// Status
 		if (! empty($arrayfields['p.fk_statut']['checked']))
 		{
-    		$projectstatic->statut = $obj->fk_statut;
-    		print '<td align="right">'.$projectstatic->getLibStatut(5).'</td>';
+    		print '<td align="right">'.$object->getLibStatut(5).'</td>';
 			if (! $i) $totalarray['nbfield']++;
 		}
         // Action column
@@ -860,8 +861,8 @@ while ($i < min($num,$limit))
         if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
         {
             $selected=0;
-    		if (in_array($obj->projectid, $arrayofselected)) $selected=1;
-    		print '<input id="cb'.$obj->projectid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->projectid.'"'.($selected?' checked="checked"':'').'>';
+    		if (in_array($obj->id, $arrayofselected)) $selected=1;
+    		print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected?' checked="checked"':'').'>';
         }
         print '</td>';
 		if (! $i) $totalarray['nbfield']++;
@@ -871,7 +872,6 @@ while ($i < min($num,$limit))
 	}
 
 	$i++;
-
 }
 
 // Show total line
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 1f2459e85db..4e31434dbc4 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -131,6 +131,8 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
     }
 }
 
+$object = new Task($db);
+
 
 /*
  * Actions
@@ -190,11 +192,11 @@ if (empty($search_projectstatus) && $search_projectstatus == '') $search_project
  * View
  */
 
+$now = dol_now();
 $form=new Form($db);
 $formother=new FormOther($db);
 $socstatic=new Societe($db);
 $projectstatic = new Project($db);
-$taskstatic = new Task($db);
 $puser=new User($db);
 $tuser=new User($db);
 if ($search_project_user > 0) $puser->fetch($search_project_user);
@@ -231,7 +233,7 @@ if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';
 // Get id of types of contacts for tasks (This list never contains a lot of elements)
 $listoftaskcontacttype=array();
 $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-$sql.= " WHERE ctc.element = '" . $taskstatic->element . "'";
+$sql.= " WHERE ctc.element = '" . $object->element . "'";
 $sql.= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
 if ($resql)
@@ -549,7 +551,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
             $align=$extrafields->getAlignFlag($key);
             $typeofextrafield=$extrafields->attribute_type[$key];
             print '<td class="liste_titre'.($align?' '.$align:'').'">';
-        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
 			{
 			    $crit=$val;
 				$tmpkey=preg_replace('/search_options_/','',$key);
@@ -606,7 +608,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            $sortonfield = "ef.".$key;
+            if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }
@@ -624,14 +628,21 @@ $plannedworkloadoutputformat='allhourmin';
 $timespentoutputformat='allhourmin';
 if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
 if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
- 
-$now = dol_now();
+
 $i=0;
 $totalarray=array();
 while ($i < min($num,$limit))
 {
 	$obj = $db->fetch_object($resql);
 
+	$object->id = $obj->id;
+	$object->ref = $obj->ref;
+	$object->label = $obj->label;
+	$object->fk_statut = $obj->fk_statut;
+	$object->progress = $obj->progress;
+	$object->datee = $db->jdate($obj->date_end);	// deprecated
+	$object->date_end = $db->jdate($obj->date_end);
+
 	$projectstatic->id = $obj->projectid;
 	$projectstatic->ref = $obj->projectref;
 	$projectstatic->title = $obj->projecttitle;
@@ -639,14 +650,6 @@ while ($i < min($num,$limit))
 	$projectstatic->statut = $obj->projectstatus;
 	$projectstatic->datee = $db->jdate($obj->projectdatee);
 	
-	$taskstatic->id = $obj->id;
-	$taskstatic->ref = $obj->ref;
-	$taskstatic->label = $obj->label;
-	$taskstatic->fk_statut = $obj->fk_statut;
-	$taskstatic->progress = $obj->progress;
-	$taskstatic->datee = $db->jdate($obj->date_end);	// deprecated
-	$taskstatic->date_end = $db->jdate($obj->date_end);
-	
 	$userAccess = $projectstatic->restrictedProjectArea($user);    // why this ?
 	if ($userAccess >= 0)
 	{
@@ -656,8 +659,8 @@ while ($i < min($num,$limit))
     	if (! empty($arrayfields['t.ref']['checked']))
     	{
     	    print '<td>';
-    	    print $taskstatic->getNomUrl(1,'withproject');
-    		if ($taskstatic->hasDelay()) print img_warning("Late");
+    	    print $object->getNomUrl(1,'withproject');
+    		if ($object->hasDelay()) print img_warning("Late");
     	    print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}        	 
@@ -665,7 +668,7 @@ while ($i < min($num,$limit))
     	if (! empty($arrayfields['t.label']['checked']))
     	{
     	    print '<td>';
-    	    print $taskstatic->label;
+    	    print $object->label;
     	    print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 995c16719cb..ebd06dbd5c4 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -389,8 +389,6 @@ class Societe extends CommonObject
         $this->forme_juridique_code  = 0;
         $this->tva_assuj = 1;
         $this->status = 1;
-
-        return 1;
     }
 
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 48e1b67a69c..51d4b41e6bb 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -831,7 +831,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
             $align=$extrafields->getAlignFlag($key);
             $typeofextrafield=$extrafields->attribute_type[$key];
             print '<td class="liste_titre'.($align?' '.$align:'').'">';
-		    if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+		    if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
 			{
 			    $crit=$val;
 				$tmpkey=preg_replace('/search_options_/','',$key);
@@ -907,7 +907,9 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
-            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            $sortonfield = "ef.".$key;
+            if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+            print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
         }
     }
 }

From ba7e75417409e7103fbc5c7cfb5c5f76c11d9b81 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 25 May 2017 05:32:13 +0200
Subject: [PATCH 0935/1163] Remove old code (journal)

---
 htdocs/accountancy/admin/journal.php    | 207 ------------------------
 htdocs/accountancy/bookkeeping/list.php |   1 -
 htdocs/core/lib/accounting.lib.php      |  48 +-----
 3 files changed, 7 insertions(+), 249 deletions(-)
 delete mode 100644 htdocs/accountancy/admin/journal.php

diff --git a/htdocs/accountancy/admin/journal.php b/htdocs/accountancy/admin/journal.php
deleted file mode 100644
index 8e19a3e3e87..00000000000
--- a/htdocs/accountancy/admin/journal.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2014 	   Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
- * Copyright (C) 2016      Laurent Destailleur 	<eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * \file		htdocs/accountancy/admin/journal.php
-* \ingroup		Advanced accountancy
-* \brief		Setup page to configure accounting expert module
-*/
-require '../../main.inc.php';
-
-// Class
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
-
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("admin");
-$langs->load("accountancy");
-$langs->load("salaries");
-
-// Security check
-if (empty($user->admin) || ! empty($user->rights->accountancy->chartofaccount))
-{
-    accessforbidden();
-}
-
-$action = GETPOST('action', 'alpha');
-
-// Other parameters ACCOUNTING_*
-$list = array (
-		'ACCOUNTING_SELL_JOURNAL',
-		'ACCOUNTING_PURCHASE_JOURNAL',
-		'ACCOUNTING_SOCIAL_JOURNAL',
-		'ACCOUNTING_MISCELLANEOUS_JOURNAL',
-		'ACCOUNTING_EXPENSEREPORT_JOURNAL'
-);
-
-/*
- * Actions
-*/
-
-if ($action == 'update') {
-	$error = 0;
-
-	// Save vars
-	foreach ($list as $constname)
-	{
-		$constvalue = GETPOST($constname, 'alpha');
-
-		if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-			$error ++;
-		}
-	}
-
-	// Save bank account journals
-	$arrayofbankaccount = GETPOST('bank_account', 'array');
-	foreach($arrayofbankaccount as $key => $code)
-	{
-		$bankaccount = new Account($db);
-		$res = $bankaccount->fetch($key);
-		if ($res > 0)
-		{
-			$bankaccount->accountancy_journal = $code;
-			$bankaccount->update($user);
-		}
-		else
-		{
-			$error++;
-			break;
-		}
-	}
-
-	if (! $error) {
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	} else {
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
-/*
- * View
-*/
-
-llxHeader();
-
-$form = new Form($db);
-
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
-print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
-
-$head = admin_accounting_prepare_head(null);
-
-print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
-print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-print '<input type="hidden" name="action" value="update">';
-
-dol_fiche_head($head, 'journal', $langs->trans("Configuration"), 0, 'cron');
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td colspan="2">' . $langs->trans('Journaux') . '</td>';
-print "</tr>\n";
-
-foreach ( $list as $key ) {
-
-	print '<tr class="oddeven value">';
-
-	// Param
-	$label = $langs->trans($key);
-	print '<td width="50%"><label for="' . $key . '">' . $label . '</label></td>';
-
-	// Value
-	print '<td>';
-	print '<input type="text" size="20" id="' . $key . '" name="' . $key . '" value="' . $conf->global->$key . '">';
-	print '</td></tr>';
-}
-
-print "</table>\n";
-
-print '<br>';
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td colspan="2">' . $langs->trans('JournalFinancial') . ' ('.$langs->trans('Opened').')</td>';
-print "</tr>\n";
-
-// Bank account
-$sql = "SELECT rowid, ref, label, number, account_number, accountancy_journal";
-$sql .= " FROM " . MAIN_DB_PREFIX . "bank_account";
-$sql .= " WHERE entity = " . $conf->entity;
-$sql .= " AND clos = 0";
-$sql .= " ORDER BY label";
-
-$resql = $db->query($sql);
-if ($resql) {
-	$numr = $db->num_rows($resql);
-	$i = 0;
-
-	if ($numr > 0)
-
-		$bankaccountstatic = new Account($db);
-
-	while ( $i < $numr ) {
-		$objp = $db->fetch_object($resql);
-
-		$bankaccountstatic->rowid = $objp->rowid;
-		$bankaccountstatic->id = $objp->rowid;
-		$bankaccountstatic->ref = $objp->ref;
-		$bankaccountstatic->label = $objp->label;
-		$bankaccountstatic->number = $objp->number;
-		$bankaccountstatic->account_number = $objp->account_number;
-		$bankaccountstatic->accountancy_journal = $objp->accountancy_journal;
-
-		print '<tr class="oddeven value">';
-
-		// Param
-		print '<td width="50%"><label for="' . $objp->rowid . '">' . $langs->trans("Journal");
-		print ' - '.$bankaccountstatic->getNomUrl(1);
-		print '</label></td>';
-
-		// Value
-		print '<td>';
-		print '<input type="text" size="20" id="' . $objp->rowid . '" name="bank_account['.$objp->rowid.']" value="' . $objp->accountancy_journal . '">';
-		print '</td></tr>';
-
-		$i ++;
-	}
-	$db->free($resql);
-}
-else
-{
-	dol_print_error($db);
-}
-
-print "</table>\n";
-
-dol_fiche_end();
-
-print '<div class="center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';
-
-print '</form>';
-
-llxFooter();
-$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 0c49ac0e1ba..72385bab746 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -292,7 +292,6 @@ $title_page = $langs->trans("Bookkeeping");
 llxHeader('', $title_page);
 
 // List
-
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$nbtotalofrecords = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter);
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index c8863ce8f61..7952c0eda7d 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
  * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2014 	   Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
  *	Prepare array with list of admin tabs
  *
  *	@param	AccountingAccount	$object		Object instance we show card
- *	@return	array				Array of tabs to show
+ *	@return	array							Array of tabs to show
  */
 function admin_accounting_prepare_head(AccountingAccount $object=null)
 {
@@ -41,11 +41,6 @@ function admin_accounting_prepare_head(AccountingAccount $object=null)
 	$head[$h][2] = 'general';
 	$h ++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/journals.php';
-	$head[$h][1] = $langs->trans("Journaux");
-	$head[$h][2] = 'journal';
-	$h ++;
-
 	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/export.php';
 	$head[$h][1] = $langs->trans("ExportOptions");
 	$head[$h][2] = 'export';
@@ -91,35 +86,6 @@ function accounting_prepare_head(AccountingAccount $object)
 	return $head;
 }
 
-/**
- *	Prepare array with list of tabs
- *
- *	@param	AccountingAccount	$object		Accounting account
- *	@return	array				Array of tabs to show
- */
-function accounting_journal_prepare_head(AccountingJournal $object)
-{
-	global $langs, $conf;
-
-	$h = 0;
-	$head = array ();
-
-	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/journals_card.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h ++;
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
-	// $this->tabs = array('entity:-tabname); to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_journal');
-
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_journal', 'remove');
-
-	return $head;
-}
-
 /**
  * Return accounting account without zero on the right
  *
@@ -129,7 +95,7 @@ function accounting_journal_prepare_head(AccountingJournal $object)
 function clean_account($account)
 {
 	$account = rtrim($account,"0");
-	
+
 	return $account;
 }
 
@@ -144,9 +110,9 @@ function length_accountg($account)
 	global $conf;
 
 	if ($account < 0 || empty($account)) return '';
-	
+
 	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
-	
+
 	$g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;
 	if (! empty($g)) {
 		// Clean parameters
@@ -179,9 +145,9 @@ function length_accounta($accounta)
 	global $conf, $langs;
 
 	if ($accounta < 0 || empty($accounta)) return '';
-	
+
 	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
-	
+
 	$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
 	if (! empty($a)) {
 		// Clean parameters

From a086b82f84b477ec01ce4f67884808fc911104e6 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 25 May 2017 05:40:41 +0200
Subject: [PATCH 0936/1163] Removed old code (Function select_pcgtype/subtype)

---
 htdocs/accountancy/admin/card.php             | 93 +++++++++----------
 htdocs/accountancy/admin/importaccounts.php   | 21 ++---
 .../class/html.formventilation.class.php      | 91 ------------------
 3 files changed, 53 insertions(+), 152 deletions(-)

diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 3522460e07b..b23f5cb5421 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 /**
  * \file 		htdocs/accountancy/admin/card.php
- * \ingroup     Advanced accountancy
+ * \ingroup		Advanced accountancy
  * \brief 		Card of accounting account
  */
 
@@ -59,7 +59,7 @@ if (GETPOST('cancel'))
 	header("Location: ".$urltogo);
 	exit;
 }
-		
+
 if ($action == 'add' && $user->rights->accounting->chartofaccount)
 {
 	if (! $cancel) {
@@ -86,7 +86,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		} else {
 			$account_parent = GETPOST('account_parent','int');
 		}
-		
+
 		$object->fk_pcg_version = $obj->pcg_version;
 		$object->pcg_type = GETPOST('pcg_type');
 		$object->pcg_subtype = GETPOST('pcg_subtype');
@@ -95,7 +95,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		$object->account_category = GETPOST('account_category');
 		$object->label = GETPOST('label', 'alpha');
 		$object->active = 1;
-		
+
 		$res = $object->create($user);
 		if ($res == - 3) {
 			$error = 1;
@@ -124,9 +124,9 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 } else if ($action == 'edit' && $user->rights->accounting->chartofaccount) {
 	if (! $cancel) {
 		$result = $object->fetch($id);
-		
+
 		$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
-		
+
 		dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
 		$result2 = $db->query($sql);
 		$obj = $db->fetch_object($result2);
@@ -156,9 +156,9 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		$object->account_parent = $account_parent;
 		$object->account_category = GETPOST('account_category');
 		$object->label = GETPOST('label', 'alpha');
-		
+
 		$result = $object->update($user);
-		
+
 		if ($result > 0) {
 		    $urltogo=$backtopage?$backtopage:($_SERVER["PHP_SELF"]."?id=".$id);
 		    header("Location: " . $urltogo);
@@ -205,13 +205,13 @@ $accountsystem->fetch($conf->global->CHARTOFACCOUNTS);
 // Create mode
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans('NewAccountingAccount'));
-	
+
 	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 	print '<input type="hidden" name="action" value="add">';
-	
+
 	dol_fiche_head();
-	
+
 	print '<table class="border" width="100%">';
 
 	// Chart of account
@@ -219,8 +219,7 @@ if ($action == 'create') {
 	print '<td>';
 	print $accountsystem->ref;
 	print '</td></tr>';
-	
-	
+
 	// Account number
 	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">' . $langs->trans("AccountNumber") . '</span></td>';
 	print '<td><input name="account_number" size="30" value="' . $object->account_number . '"></td></tr>';
@@ -245,56 +244,54 @@ if ($action == 'create') {
 	print '<tr><td>' . $langs->trans("Pcgtype") . '</td>';
 	print '<td>';
 	print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(isset($_POST['pcg_type'])?GETPOST('pcg_type','alpha'):$object->pcg_type).'">';
-	//print $htmlacc->select_pcgtype($object->pcg_type, 'pcg_type', 1);
 	print '</td></tr>';
 
 	// Chart of acounts subtype
 	print '<tr><td>' . $langs->trans("Pcgsubtype") . '</td>';
 	print '<td>';
 	print '<input type="text" name="pcg_subtype" value="'.dol_escape_htmltag(isset($_POST['pcg_subtype'])?GETPOST('pcg_subtype','alpha'):$object->pcg_subtype).'">';
-	//print $htmlacc->select_pcgsubtype($object->pcg_subtype, 'pcg_subtype', 1);
 	print '</td></tr>';
-	
+
 	print '</table>';
-	
+
 	dol_fiche_end();
-	
+
 	print '<div class="center">';
 	print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 	print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
 	print '</div>';
-	
+
 	print '</form>';
 } else if ($id) {
 	$result = $object->fetch($id);
-	
+
 	if ($result > 0) {
 		dol_htmloutput_mesg($mesg);
-		
+
 		$head = accounting_prepare_head($object);
-		
+
 		// Edit mode
 		if ($action == 'update') 
 		{
 			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
-			
+
 			print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="edit">';
 			print '<input type="hidden" name="id" value="' . $id . '">';
 			print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
-				
+
 			print '<table class="border" width="100%">';
-			
+
 			// Account number
 			print '<tr><td class="titlefieldcreate"><span class="fieldrequired">' . $langs->trans("AccountNumber") . '</span></td>';
 			print '<td><input name="account_number" size="30" value="' . $object->account_number . '"</td></tr>';
-			
+
 			// Label
 			print '<tr><td><span class="fieldrequired">' . $langs->trans("Label") . '</span></td>';
 			print '<td><input name="label" size="70" value="' . $object->label . '"</td></tr>';
-			
+
 			// Account parent
 			print '<tr><td>' . $langs->trans("Accountparent") . '</td>';
 			print '<td>';
@@ -302,15 +299,14 @@ if ($action == 'create') {
 			print '</td></tr>';
 
 			// Category
-            print '<tr><td>'.$langs->trans("AccountingCategory").'</td>';
+			print '<tr><td>'.$langs->trans("AccountingCategory").'</td>';
 			print '<td>';
-            $formaccounting->select_accounting_category($object->account_category, 'account_category', 1);
-            print '</td></tr>';
+			$formaccounting->select_accounting_category($object->account_category, 'account_category', 1);
+			print '</td></tr>';
 
 			// Chart of accounts type
 			print '<tr><td>' . $langs->trans("Pcgtype") . '</td>';
 			print '<td>';
-			//print $htmlacc->select_pcgtype($object->pcg_type, 'pcg_type', 1);
 			print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(isset($_POST['pcg_type'])?GETPOST('pcg_type','alpha'):$object->pcg_type).'">';
 			print '</td></tr>';
 
@@ -318,29 +314,27 @@ if ($action == 'create') {
 			print '<tr><td>' . $langs->trans("Pcgsubtype") . '</td>';
 			print '<td>';
 			print '<input type="text" name="pcg_subtype" value="'.dol_escape_htmltag(isset($_POST['pcg_subtype'])?GETPOST('pcg_subtype','alpha'):$object->pcg_subtype).'">';
-			//print $htmlacc->select_pcgsubtype($object->pcg_subtype, 'pcg_subtype', 1);
 			print '</td></tr>';
-			
+
 			print '</table>';
-			
+
 			dol_fiche_end();
-			
+
 			print '<div class="center">';
 			print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input type="submit" name="cancel" class="button" value="' . $langs->trans("Cancel") . '">';
 			print '</div>';
-			
+
 			print '</form>';
 		} else {
-			
 			// View mode
 			$linkback = '<a href="../admin/account.php">' . $langs->trans("BackToChartofaccounts") . '</a>';
-			
+
 			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
-			
+
 			print '<table class="border" width="100%">';
-			
+
 			// Account number
 			print '<tr><td class="titlefield">' . $langs->trans("AccountNumber") . '</td>';
 			print '<td>' . $object->account_number . '</td>';
@@ -378,31 +372,30 @@ if ($action == 'create') {
 			} else {
 				print img_picto($langs->trans("Activated"), 'switch_on');
 			}*/
-			
+
 			print '</td></tr>';
-			
+
 			print '</table>';
-			
+
 			dol_fiche_end();
-			
+
 			/*
 			 * Actions buttons
 			 */
-			
 			print '<div class="tabsAction">';
-			
+
 			if (! empty($user->rights->accounting->chartofaccount)) {
 				print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $id . '">' . $langs->trans('Modify') . '</a>';
 			} else {
 				print '<a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('Modify') . '</a>';
 			}
-			
+
 			if (! empty($user->rights->accounting->chartofaccount)) {
 				print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
 			} else {
 				print '<a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('Delete') . '</a>';
 			}
-			
+
 			print '</div>';
 		}
 	} else {
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 4a6c82cb581..f4f155c0b59 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -146,36 +146,35 @@ if ($result) {
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
 		print '<tr class="oddeven">';
-		
+
 		print '<td align="left">';
 		print $objp->accounting;
 		print '</td>';
-		
+
 		print '<td align="left">';
 		print '<input name="label" size="30" value="">';
 		print '</td>';
-		
+
 		// Colonne choix du compte
 		print '<td>';
 		print $htmlacc->select_account($accounting->account_parent, 'AccountParent');
 		print '</td>';
-		
+
 		print '<td>';
-		print $htmlacc->select_pcgtype($accounting->pcg_type, 'pcgType');
+		print '<input type="text" name="pcgType" value="'.dol_escape_htmltag(isset($_POST['pcg_subtype'])?GETPOST('pcg_subtype','alpha'):$accounting->pcg_type).'">';
 		print '</td>';
-		
+
 		print '<td>';
-		print $htmlacc->select_pcgsubtype($accounting->pcg_subtype, 'pcgSubType');
+		print '<input type="text" name="pcgSubType" value="'.dol_escape_htmltag(isset($_POST['pcg_subtype'])?GETPOST('pcg_subtype','alpha'):$accounting->pcg_subtype).'">';
 		print '</td>';
-		
+
 		// Colonne choix ligne a ventiler
-		
 		$checked = ('label' == 'O') ? ' checked' : '';
-		
+
 		print '<td align="center">';
 		print '<input type="checkbox" name="mesCasesCochees[]" ' . $checked . ' value="' . $objp->accounting . '"/>';
 		print '</td>';
-		
+
 		print '</tr>';
 		$i ++;
 	}
diff --git a/htdocs/accountancy/class/html.formventilation.class.php b/htdocs/accountancy/class/html.formventilation.class.php
index 112bde76038..d7a827f2480 100644
--- a/htdocs/accountancy/class/html.formventilation.class.php
+++ b/htdocs/accountancy/class/html.formventilation.class.php
@@ -151,97 +151,6 @@ class FormVentilation extends Form
 		return $out;
 	}
 
-	/**
-	 * Return list of accounts with label by class of accounts
-	 *
-	 * @param string $selectid Preselected pcg_type
-	 * @param string $htmlname Name of field in html form
-	 * @param int $showempty Add an empty field
-	 * @param array $event Event options
-	 *
-	 * @return string String with HTML select
-	 */
-	function select_pcgtype($selectid, $htmlname = 'pcg_type', $showempty = 0, $event = array()) {
-		global $conf;
-
-		$sql = "SELECT DISTINCT pcg_type ";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
-		$sql .= " ORDER BY pcg_type";
-
-		dol_syslog(get_class($this) . "::select_pcgtype", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-
-		if (!$resql) {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_pcgtype ".$this->error, LOG_ERR);
-			return -1;
-		}
-
-		$options = array();
-		$out = ajax_combobox($htmlname, $event);
-
-		while ($obj = $this->db->fetch_object($resql)) 
-		{
-		    if ($obj->pcg_type != '-1')
-		    {
-                $options[$obj->pcg_type] = $obj->pcg_type;
-		    }
-		}
-
-		$out .= Form::selectarray($htmlname, $options, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth200');
-
-		$this->db->free($resql);
-		return $out;
-	}
-
-	/**
-	 * Return list of accounts with label by sub_class of accounts
-	 *
-	 * @param string $selectid Preselected pcg_type
-	 * @param string $htmlname Name of field in html form
-	 * @param int $showempty Add an empty field
-	 * @param array $event Event options
-	 *
-	 * @return string String with HTML select
-	 */
-	function select_pcgsubtype($selectid, $htmlname = 'pcg_subtype', $showempty = 0, $event = array()) 
-	{
-		global $conf;
-
-		$sql = "SELECT DISTINCT pcg_subtype ";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
-		$sql .= " ORDER BY pcg_subtype";
-
-		dol_syslog(get_class($this) . "::select_pcgsubtype", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-
-		if (!$resql) {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
-			return -1;
-		}
-
-		$options = array();
-		$out = ajax_combobox($htmlname, $event);
-
-		while ($obj = $this->db->fetch_object($resql)) 
-		{
-		    if ($obj->pcg_type != '-1')
-		    {
-                $options[$obj->pcg_subtype] = $obj->pcg_subtype;
-		    }
-		}
-
-		$out .= Form::selectarray($htmlname, $options, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth200');
-
-		$this->db->free($resql);
-		return $out;
-	}
-
 	/**
 	 * Return list of auxilary thirdparty accounts
 	 *

From 1f079fac9d92bd8baabad8a947f849c6acc36c4e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 25 May 2017 06:57:28 +0200
Subject: [PATCH 0937/1163] Move html.formventilation.class.php to
 html.formaccounting.class.php

---
 htdocs/accountancy/admin/account.php          |   1 -
 htdocs/accountancy/admin/accountmodel.php     |   8 +-
 htdocs/accountancy/admin/card.php             |   6 +-
 htdocs/accountancy/admin/categories_list.php  |   6 +-
 htdocs/accountancy/admin/defaultaccounts.php  |   6 +-
 htdocs/accountancy/admin/importaccounts.php   |  33 +-
 htdocs/accountancy/admin/index.php            |  15 +-
 htdocs/accountancy/admin/productaccount.php   |   4 +-
 htdocs/accountancy/bookkeeping/balance.php    |   8 +-
 htdocs/accountancy/bookkeeping/card.php       |  12 +-
 htdocs/accountancy/bookkeeping/list.php       |  18 +-
 .../accountancy/bookkeeping/listbyaccount.php |   6 +-
 htdocs/accountancy/bookkeeping/listbyyear.php |  12 +-
 .../class/html.formventilation.class.php      | 292 ------------------
 htdocs/accountancy/customer/card.php          |  38 ++-
 htdocs/accountancy/customer/lines.php         |  34 +-
 htdocs/accountancy/customer/list.php          |  43 ++-
 htdocs/accountancy/expensereport/card.php     |   6 +-
 htdocs/accountancy/expensereport/lines.php    |   6 +-
 htdocs/accountancy/expensereport/list.php     |   6 +-
 htdocs/accountancy/supplier/card.php          |  36 +--
 htdocs/accountancy/supplier/lines.php         |  10 +-
 htdocs/accountancy/supplier/list.php          |  39 ++-
 htdocs/admin/dict.php                         |   6 +-
 htdocs/admin/loan.php                         |   8 +-
 htdocs/admin/mails_templates.php              |   4 +-
 htdocs/admin/salaries.php                     |   6 +-
 htdocs/admin/taxes.php                        |   6 +-
 htdocs/compta/bank/card.php                   |  31 +-
 htdocs/compta/bank/various_payment/card.php   |   8 +-
 .../core/class/html.formaccounting.class.php  | 264 +++++++++++++++-
 htdocs/don/admin/donation.php                 |  18 +-
 htdocs/loan/card.php                          |  18 +-
 htdocs/product/card.php                       |  14 +-
 34 files changed, 490 insertions(+), 538 deletions(-)
 delete mode 100644 htdocs/accountancy/class/html.formventilation.class.php

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index d3556135972..62e35fa0f57 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -27,7 +27,6 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 
 // Langs
 $langs->load("compta");
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 55c194cd416..ca26c35c442 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load("errors");
 $langs->load("admin");
@@ -1258,8 +1258,8 @@ function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='')
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
-	$formaccountancy = new FormVentilation($db);
-	
+	$formaccounting = new FormAccounting($db);
+
 	foreach ($fieldlist as $field => $value)
 	{
 		if ($fieldlist[$field] == 'country')
@@ -1400,7 +1400,7 @@ function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='')
 			if (! empty($conf->accounting->enabled))
 			{
 				$accountancy_account = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0);
-				print $formaccountancy->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+				print $formaccounting->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			}
 			else
 			{
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index b23f5cb5421..73e3fdf6dd9 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -27,7 +27,6 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancysystem.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $error = 0;
@@ -196,7 +195,6 @@ $helpurl = '';
 llxheader('', $title, $helpurl);
 
 $form = new Form($db);
-$htmlacc = new FormVentilation($db);
 $formaccounting = new FormAccounting($db);
 
 $accountsystem = new AccountancySystem($db);
@@ -231,7 +229,7 @@ if ($action == 'create') {
 	// Account parent
 	print '<tr><td>' . $langs->trans("Accountparent") . '</td>';
 	print '<td>';
-	print $htmlacc->select_account($object->account_parent, 'account_parent', 1, null, 0, 0, 'minwidth200');
+	print $formaccounting->select_account($object->account_parent, 'account_parent', 1, null, 0, 0, 'minwidth200');
 	print '</td></tr>';
 
 	// Category
@@ -295,7 +293,7 @@ if ($action == 'create') {
 			// Account parent
 			print '<tr><td>' . $langs->trans("Accountparent") . '</td>';
 			print '<td>';
-			print $htmlacc->select_account($object->account_parent, 'account_parent', 1);
+			print $formaccounting->select_account($object->account_parent, 'account_parent', 1);
 			print '</td></tr>';
 
 			// Category
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index c0fa895ae4c..f3a35350084 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 
 $langs->load("errors");
 $langs->load("admin");
@@ -982,7 +982,7 @@ function fieldListAccountingCategories($fieldlist, $obj='', $tabname='', $contex
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
-	if (! empty($conf->accounting->enabled)) $formaccountancy = new FormVentilation($db);
+	if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
 	foreach ($fieldlist as $field => $value)
 	{
@@ -1125,7 +1125,7 @@ function fieldListAccountingCategories($fieldlist, $obj='', $tabname='', $contex
 			{
 			    $fieldname = $fieldlist[$field];
 				$accountancy_account = (! empty($obj->$fieldname) ? $obj->$fieldname : 0);
-				print $formaccountancy->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+				print $formaccounting->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			}
 			else
 			{
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 4b733bee5a6..c2a6453ffee 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -32,7 +32,7 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load("compta");
 $langs->load("bills");
@@ -117,7 +117,7 @@ if ($action == 'update') {
 llxHeader();
 
 $form = new Form($db);
-$formaccountancy = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 $linkback = '';
 print load_fiche_titre($langs->trans('MenuDefaultAccounts'), $linkback, 'title_accountancy');
@@ -142,7 +142,7 @@ foreach ( $list_account as $key ) {
 	print '<td>' . $label . '</td>';
 	// Value
 	print '<td>';  // Do not force align=right, or it align also the content of the select box 
-	print $formaccountancy->select_account($conf->global->$key, $key, 1, '', 1, 1);
+	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
 	print '</td>';
 	print '</tr>';
 }
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index f4f155c0b59..1bb1bf178b3 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -1,8 +1,7 @@
 <?php
-/* 
- * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com> 
- * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com> 
+ * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +27,7 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 // langs
 $langs->load("compta");
@@ -65,22 +64,22 @@ if ($_POST["action"] == 'import') {
 	if (is_array($to_import) && count($to_import) > 0) {
 		print '<div><font color="red">' . count($to_import) . ' ' . $langs->trans("SelectedLines") . '</font></div>';
 		$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
-		
+
 		$result = $db->query($sql);
 		if ($result && ($db->num_rows($result) > 0)) {
-			
+
 			$obj = $db->fetch_object($result);
-			
+
 			$cpt = 0;
 			foreach ( $to_import as $maLigneCochee ) {
-				
+
 				$accounting = new AccountingAccount($db);
-				
+
 				$monLabel = GETPOST('label' . $maLigneCochee);
 				$monParentAccount = GETPOST('AccountParent' . $maLigneCochee);
 				$monType = GETPOST('pcgType' . $maLigneCochee);
 				$monSubType = GETPOST('pcgSubType' . $maLigneCochee);
-				
+
 				$accounting->fk_pcg_version = $obj->pcg_version;
 				$accounting->account_number = $maLigneCochee;
 				$accounting->label = $monLabel;
@@ -126,10 +125,10 @@ if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
 	print_barre_liste($langs->trans("ImportAccount"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
-	
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 	print '<input type="hidden" name="action" value="import">';
-	
+
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>' . $langs->trans("AccountAccouting") . '</td>';
 	print '<td>' . $langs->trans("label") . '</td>';
@@ -138,10 +137,10 @@ if ($result) {
 	print '<td>' . $langs->trans("Pcgsubtype") . '</td>';
 	print '<td align="center">' . $langs->trans("Import") . '</td>';
 	print '</tr>';
-	
+
 	$form = new Form($db);
-	$htmlacc = new FormVentilation($db);
-	
+	$formaccounting = new FormAccounting($db);
+
 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
@@ -157,7 +156,7 @@ if ($result) {
 
 		// Colonne choix du compte
 		print '<td>';
-		print $htmlacc->select_account($accounting->account_parent, 'AccountParent');
+		print $formaccounting->select_account($accounting->account_parent, 'AccountParent');
 		print '</td>';
 
 		print '<td>';
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 899aaa1a3d2..0e1f67a0e61 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -1,11 +1,11 @@
 <?php
-/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
+ * Copyright (C) 2014-2015 Ari Elbaz (elarifr)  <github@accedinfo.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2014      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,8 +31,6 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 
 $langs->load("compta");
 $langs->load("bills");
@@ -160,7 +158,6 @@ if ($action == 'setdisabledirectinput') {
 llxHeader();
 
 $form = new Form($db);
-$formaccountancy = new FormVentilation($db);
 
 $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
 print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 359a8b40c12..fcb44c6f858 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
@@ -184,7 +184,7 @@ if ($action == 'update') {
  * View
  */
 
-$form = new FormVentilation($db);
+$form = new FormAccounting($db);
 
 // Defaut AccountingAccount RowId Product / Service
 // at this time ACCOUNTING_SERVICE_SOLD_ACCOUNT & ACCOUNTING_PRODUCT_SOLD_ACCOUNT are account number not accountingacount rowid
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 9e5be25eb73..3111707cff6 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -28,8 +28,8 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 
 // Langs
@@ -61,7 +61,7 @@ $offset = $limit * $page;
 
 $object = new BookKeeping($db);
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 $formother = new FormOther($db);
 $form = new Form($db);
 
@@ -186,10 +186,10 @@ else {
     print '<tr class="liste_titre_filter">';
     print '<td class="liste_titre" colspan="5">';
     print $langs->trans('From');
-    print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
+    print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
     print ' ';
     print $langs->trans('to');
-    print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
+    print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
     print '</td>';
     print '<td align="right" class="liste_titre">';
 	$searchpicto=$form->showFilterAndCheckAddButtons(0);
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 7ee3e6bb4fe..4443fb959b2 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -27,9 +27,8 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 // Langs
 $langs->load("accountancy");
@@ -215,7 +214,6 @@ else if ($action == "confirm_create") {
 llxHeader();
 
 $html = new Form($db);
-$formventilation = new FormVentilation($db);
 $formaccountancy = new FormAccounting($db);
 
 /*
@@ -389,10 +387,10 @@ if ($action == 'create') {
 					if ($action == 'update' && $line->id == $id) {
 
 						print '<td>';
-						print $formventilation->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
+						print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
 						print '</td>';
 						print '<td>';
-						print $formventilation->select_auxaccount($line->code_tiers, 'code_tiers', 1);
+						print $formaccounting->select_auxaccount($line->code_tiers, 'code_tiers', 1);
 						print '</td>';
 						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
 						print '<td align="right"><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
@@ -433,10 +431,10 @@ if ($action == 'create') {
 				if ($action == "" || $action == 'add') {
 					print '<tr class="oddeven">';
 					print '<td>';
-					print $formventilation->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
+					print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
 					print '</td>';
 					print '<td>';
-					print $formventilation->select_auxaccount($code_tiers, 'code_tiers', 1);
+					print $formaccounting->select_auxaccount($code_tiers, 'code_tiers', 1);
 					print '</td>';
 					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
 					print '<td align="right"><input type="text" class="right maxwidth50" name="debit" value="' . price($debit) . '"/></td>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 72385bab746..a955d671475 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -28,10 +28,10 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 // Langs
 $langs->load("accountancy");
@@ -94,7 +94,7 @@ if ($sortfield == "") $sortfield = "t.rowid";
 
 $object = new BookKeeping($db);
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 $formother = new FormOther($db);
 $form = new Form($db);
 
@@ -321,8 +321,8 @@ if ($action == 'delbookkeepingyear') {
 	if (empty($delyear)) {
 		$delyear = dol_print_date(dol_now(), '%Y');
 	}
-	$year_array = $formventilation->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
-	$journal_array = $formventilation->selectjournal_accountancy_bookkepping($deljournal, 'deljournal', 0, 'array');
+	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
+	$journal_array = $formaccounting->selectjournal_accountancy_bookkepping($deljournal, 'deljournal', 0, 'array');
 
 	$form_question['delyear'] = array (
 			'name' => 'delyear',
@@ -385,17 +385,17 @@ print '</td>';
 print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8" value="' . dol_escape_htmltag($search_doc_ref) . '"></td>';
 print '<td class="liste_titre">';
 print $langs->trans('From');
-print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
+print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
 print '<br>';
 print $langs->trans('to');
-print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
+print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
 print '</td>';
 print '<td class="liste_titre">';
 print $langs->trans('From');
-print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
+print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
 print '<br>';
 print $langs->trans('to');
-print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
 print '</td>';
 print '<td class="liste_titre">';
 print '<input type="text" size="7" class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index eb8a53561d2..6b329e421ad 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -29,8 +29,8 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 
 // Langs
@@ -75,7 +75,7 @@ if (empty($search_date_end)) $search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_
 
 $object = new BookKeeping($db);
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 $formother = new FormOther($db);
 $form = new Form($db);
 
@@ -188,7 +188,7 @@ if ($action == 'delbookkeepingyear') {
 	if (empty($delyear)) {
 		$delyear = dol_print_date(dol_now(), '%Y');
 	}
-	$year_array = $formventilation->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
+	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
 
 	$form_question['delyear'] = array (
 			'name' => 'delyear',
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index 263f293043a..5fba55f2eba 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -29,7 +29,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 // Langs
 $langs->load("accountancy");
@@ -67,7 +67,7 @@ $search_code_journal = GETPOST('search_code_journal', 'alpha');
 
 $object = new BookKeeping($db);
 $form = new Form($db);
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 // Filter
 if (empty($search_date_start)) {
@@ -182,15 +182,15 @@ print $form->select_date($search_date_end, 'date_end');
 print '</div>';
 print '<div class="liste_titre">';
 print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
-print $formventilation->select_account($search_numero_compte_start, 'search_numero_compte_start', 1, array (), 1, 1, '');
+print $formaccounting->select_account($search_numero_compte_start, 'search_numero_compte_start', 1, array (), 1, 1, '');
 print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
-print $formventilation->select_account($search_numero_compte_end, 'search_numero_compte_end', 1, array (), 1, 1, '');
+print $formaccounting->select_account($search_numero_compte_end, 'search_numero_compte_end', 1, array (), 1, 1, '');
 print '</div>';
 print '<div class="liste_titre">';
 print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-print $formventilation->select_auxaccount($search_code_tiers_start, 'search_code_tiers_start', 1);
+print $formaccounting->select_auxaccount($search_code_tiers_start, 'search_code_tiers_start', 1);
 print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-print $formventilation->select_auxaccount($search_code_tiers_end, 'searchcode_tiers_end', 1);
+print $formaccounting->select_auxaccount($search_code_tiers_end, 'searchcode_tiers_end', 1);
 print '</div>';
 print "<table class=\"noborder\" width=\"100%\">";
 
diff --git a/htdocs/accountancy/class/html.formventilation.class.php b/htdocs/accountancy/class/html.formventilation.class.php
deleted file mode 100644
index d7a827f2480..00000000000
--- a/htdocs/accountancy/class/html.formventilation.class.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?php
-/* Copyright (C) 2013-2016 Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
- * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file		htdocs/accountancy/class/html.formventilation.class.php
- * \ingroup		Advanced accountancy
- * \brief		File of class with all html predefined components
- */
-
-/**
- * Class to manage generation of HTML components for bank module
- */
-class FormVentilation extends Form
-{
-
-    private $options_cache = array();
-
-
-	/**
-	 * Return select filter with date of transaction
-	 *
-	 * @param string $htmlname Name of select field
-	 * @param string $selectedkey Value
-	 * @return string HTML edit field
-	 */
-	function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '') {
-		$options = array();
-
-		$sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-		$sql .= ' ORDER BY import_key DESC';
-
-		dol_syslog(get_class($this) . "::select_bookkeeping_importkey", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-
-		if (!$resql) {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::select_bookkeeping_importkey " . $this->error, LOG_ERR);
-			return - 1;
-		}
-
-		while ($obj = $this->db->fetch_object($resql)) {
-			$options[$obj->import_key] = dol_print_date($obj->import_key, 'dayhourtext');
-		}
-
-		return Form::selectarray($htmlname, $options, $selectedkey);
-	}
-
-	/**
-	 * Return list of accounts with label by chart of accounts
-	 *
-	 * @param string   $selectid           Preselected id or code of accounting accounts (depends on $select_in)
-	 * @param string   $htmlname           Name of field in html form
-	 * @param int      $showempty          Add an empty field
-	 * @param array    $event              Event options
-	 * @param int      $select_in          0=selectid value is a aa.rowid (default) or 1=selectid is aa.account_number
-	 * @param int      $select_out         Set value returned by select. 0=rowid (default), 1=account_number
-	 * @param string   $morecss            More css non HTML object
-	 * @param string   $usecache           Key to use to store result into a cache. Next call with same key will reuse the cache.
-	 * @return string                      String with HTML select
-	 */
-	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
-	{
-		global $conf;
-
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-
-		$out = '';
-		
-    	$options = array();
-		if ($usecache && ! empty($this->options_cache[$usecache]))
-		{
-		    $options = $this->options_cache[$usecache];
-		    $selected=$selectid;
-		}
-		else
-		{
-    		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
-
-    		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
-    		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-    		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-    		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
-    		$sql .= " AND aa.active = 1";
-    		$sql .= " ORDER BY aa.account_number";
-
-    		dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
-    		$resql = $this->db->query($sql);
-
-    		if (!$resql) {
-    			$this->error = "Error " . $this->db->lasterror();
-    			dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
-    			return -1;
-    		}
-
-    		$out .= ajax_combobox($htmlname, $event);
-
-    		$selected = 0;
-    		while ($obj = $this->db->fetch_object($resql))
-    		{
-    			$label = length_accountg($obj->account_number) . ' - ' . $obj->label;
-    			$label = dol_trunc($label, $trunclength);
-
-    			$select_value_in = $obj->rowid;
-    			$select_value_out = $obj->rowid;
-
-    			// Try to guess if we have found default value
-    			if ($select_in == 1) {
-    				$select_value_in = $obj->account_number;
-    			}
-    			if ($select_out == 1) {
-    				$select_value_out = $obj->account_number;
-    			}
-    			// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
-    			// Because same account_number can be share between different accounting_system and do have the same meaning
-    			if ($selectid != '' && $selectid == $select_value_in) {
-    			    //var_dump("Found ".$selectid." ".$select_value_in);
-    				$selected = $select_value_out;
-    			}
-
-    			$options[$select_value_out] = $label;
-    		}
-    		$this->db->free($resql);
-
-    		if ($usecache)
-    		{
-                $this->options_cache[$usecache] = $options;
-    		}
-		}
-
-		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
-
-		return $out;
-	}
-
-	/**
-	 * Return list of auxilary thirdparty accounts
-	 *
-	 * @param string $selectid Preselected pcg_type
-	 * @param string $htmlname Name of field in html form
-	 * @param int $showempty Add an empty field
-	 * @param array $event Event options
-	 *
-	 * @return string String with HTML select
-	 */
-	function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $event = array()) {
-
-		$aux_account = array();
-
-		// Auxiliary customer account
-		$sql = "SELECT DISTINCT code_compta, nom ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-	    $sql .= " WHERE entity IN (" . getEntity("societe", 1) . ")";
-		$sql .= " ORDER BY code_compta";
-		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				if (!empty($obj->code_compta)) {
-					$aux_account[$obj->code_compta] = $obj->code_compta.' ('.$obj->nom.')';
-				}
-			}
-		} else {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
-			return -1;
-		}
-		$this->db->free($resql);
-
-		// Auxiliary supplier account
-		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-	    $sql .= " WHERE entity IN (" . getEntity("societe", 1) . ")";
-		$sql .= " ORDER BY code_compta_fournisseur";
-		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				if (!empty($obj->code_compta_fournisseur)) {
-					$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' ('.$obj->nom.')';
-				}
-			}
-		} else {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
-			return -1;
-		}
-		$this->db->free($resql);
-
-		// Build select
-		$out = ajax_combobox($htmlname, $event);
-		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
-
-		return $out;
-	}
-
-	/**
-	 * Return HTML combo list of years existing into book keepping
-	 *
-	 * @param string $selected Preselected value
-	 * @param string $htmlname Name of HTML select object
-	 * @param int $useempty Affiche valeur vide dans liste
-	 * @param string $output_format (html/opton (for option html only)/array (to return options arrays
-	 * @return string/array
-	 */
-	function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
-	{
-	    global $conf;
-
-		$out_array = array();
-
-		$sql = "SELECT DISTINCT date_format(doc_date,'%Y') as dtyear";
-		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-		$sql .= " ORDER BY date_format(doc_date,'%Y')";
-		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-
-		if (!$resql) {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
-			return -1;
-		}
-		while ($obj = $this->db->fetch_object($resql)) {
-			$out_array[$obj->dtyear] = $obj->dtyear;
-		}
-		$this->db->free($resql);
-
-		if ($output_format == 'html') {
-			return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
-		} else {
-			return $out_array;
-		}
-	}
-
-	/**
-	 * Return HTML combo list of years existing into book keepping
-	 *
-	 * @param  string          $selected       Preselected value
-	 * @param  string          $htmlname       Name of HTML select object
-	 * @param  int             $useempty       Affiche valeur vide dans liste
-	 * @param  string          $output_format  Html/option (for option html only)/array (to return options arrays
-	 * @return string/array
-	 */
-	function selectjournal_accountancy_bookkepping($selected = '', $htmlname = 'journalid', $useempty = 0, $output_format = 'html')
-	{
-	    global $conf,$langs;
-
-		$out_array = array();
-
-		$sql = "SELECT DISTINCT code_journal";
-		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-		$sql .= " ORDER BY code_journal";
-		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-
-		if (!$resql) {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
-			return -1;
-		}
-		while ($obj = $this->db->fetch_object($resql)) {
-			$out_array[$obj->code_journal] = $obj->code_journal?$obj->code_journal:$langs->trans("NotDefined");  // TODO Not defined is accepted ? We should avoid this, shouldn't we ?
-		}
-		$this->db->free($resql);
-
-		if ($output_format == 'html') {
-			return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
-		} else {
-			return $out_array;
-		}
-	}
-}
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index baa70bf51e8..eca3be1d477 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 // Langs
 $langs->load("bills");
@@ -39,9 +39,7 @@ $id = GETPOST('id');
 // Security check
 if ($user->societe_id > 0)
 	accessforbidden();
-	
-	
-	
+
 /*
  * Actions
  */
@@ -84,7 +82,7 @@ if ($cancel == $langs->trans("Cancel")) {
  */
 $form = new Form($db);
 $facture_static = new Facture($db);
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 if (! empty($id)) {
 	$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.price,";
@@ -96,50 +94,50 @@ if (! empty($id)) {
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = l.fk_facture";
 	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id;
 	$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")"; // We don't share object for accountancy
-	
+
 	dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
-	
+
 	if ($result) {
 		$num_lines = $db->num_rows($result);
 		$i = 0;
-		
+
 		if ($num_lines) {
-			
+
 			$objp = $db->fetch_object($result);
-			
+
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $id . '" method="post">' . "\n";
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="ventil">';
-			
+
 			print load_fiche_titre($langs->trans('CustomersVentilation'), '', 'title_setup');
-			
+
 			dol_fiche_head();
-			
+
 			print '<table class="border" width="100%">';
-			
+
 			// Ref facture
 			print '<tr><td>' . $langs->trans("Invoice") . '</td>';
 			$facture_static->ref = $objp->facnumber;
 			$facture_static->id = $objp->facid;
 			print '<td>' . $facture_static->getNomUrl(1) . '</td>';
 			print '</tr>';
-			
+
 			print '<tr><td width="20%">' . $langs->trans("Line") . '</td>';
 			print '<td>' . nl2br($objp->description) . '</td></tr>';
 			print '<tr><td width="20%">' . $langs->trans("Account") . '</td><td>';
-			print $formventilation->select_account($objp->fk_code_ventilation, 'codeventil', 1);
+			print $formaccounting->select_account($objp->fk_code_ventilation, 'codeventil', 1);
 			print '</td></tr>';
 			print '</table>';
-			
+
 			dol_fiche_end();
-			
+
 			print '<div class="center">';
 			print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
 			print '</div>';
-			
+
 			print '</form>';
 		} else {
 			print "Error";
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 52b3a31d6f0..f3763dd9ca0 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -28,7 +28,7 @@
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
@@ -77,7 +77,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 
 /*
@@ -254,14 +254,14 @@ if ($result) {
 	print $langs->trans("DescVentilDoneCustomer") . '<br>';
 
 	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
-	print $formventilation->select_account($account_parent, 'account_parent', 1);
+	print $formaccounting->select_account($account_parent, 'account_parent', 1);
 	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '"/></div>';
 
 	$moreforfilter = '';
-	
-    print '<div class="div-table-responsive">';
+
+	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	
+
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
@@ -278,7 +278,7 @@ if ($result) {
 	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
 	print "</td></tr>\n";
-	
+
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "fd.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.facnumber", "", $param, '', $sortfield, $sortorder);
@@ -303,16 +303,16 @@ if ($result) {
 
 		$facture_static->ref = $objp->facnumber;
 		$facture_static->id = $objp->rowid;
-		
+
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
 		$product_static->type = $objp->product_type;
 		$product_static->label = $objp->product_label;
-		
+
 		print '<tr class="oddeven">';
 
 		print '<td>' . $objp->rowid . '</td>';
-		
+
 		// Ref Invoice
 		print '<td>' . $facture_static->getNomUrl(1) . '</td>';
 
@@ -324,13 +324,13 @@ if ($result) {
 			print $product_static->getNomUrl(1);
 		if ($objp->product_label) print '<br>'.$objp->product_label;
 		print '</td>';
-		
+
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
 		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
 		print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->description);
 		print '</td>';
-		
+
 		print '<td align="right">' . price($objp->total_ht) . '</td>';
 		print '<td align="center">' . price($objp->tva_tx) . '</td>';
 		print '<td>';
@@ -338,20 +338,20 @@ if ($result) {
 		print img_edit();
 		print '</a>';
 		print '</td>';
-		
+
 		print '<td>' . $objp->country .'</td>';
-		
+
 		print '<td>' . $objp->tva_intra . '</td>';
-		
+
 		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
 
 		print "</tr>";
 		$i ++;
 	}
-	
+
 	print "</table>";
 	print "</div>";
-	
+
     if ($nbtotalofrecords > $limit) {
         print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
     }
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index bbd875e0dbf..8af289f2c99 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -30,7 +30,7 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
@@ -85,7 +85,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 $accounting = new AccountingAccount($db);
 $aarowid_s = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT, 1);
 $aarowid_p = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT, 1);
@@ -101,7 +101,7 @@ if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction !=
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
 {
-    $search_lineid = '';
+	$search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -241,7 +241,7 @@ if ($result) {
 	$i = 0;
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	$param='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -254,8 +254,7 @@ if ($result) {
 	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	//if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('ventil', $arrayofmassactions, 1);
-	
-	
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -264,16 +263,16 @@ if ($result) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	print $langs->trans("DescVentilTodoCustomer") . '</br><br>';
 
 	if ($msg) print $msg.'<br>';
-	
+
 	$moreforfilter = '';
-	
-    print '<div class="div-table-responsive">';
+
+	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	// We add search filter
@@ -309,7 +308,7 @@ if ($result) {
 	if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
 	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
 	print "</tr>\n";
-	
+
 	$facture_static = new Facture($db);
 	$product_static = new Product($db);
 	$form = new Form($db);
@@ -330,7 +329,7 @@ if ($result) {
 		$facture_static->ref = $objp->facnumber;
 		$facture_static->id = $objp->facid;
 		$facture_static->type = $objp->ftype;
-		
+
 		$code_sell_p_notset = '';
 		$objp->aarowid_suggest = $objp->aarowid;
 
@@ -350,30 +349,30 @@ if ($result) {
 		if (! empty($objp->code_sell)) {
 			$objp->code_sell_p = $objp->code_sell;       // Code on product
 		} else {
-    	    $code_sell_p_notset = 'color:orange';
+			$code_sell_p_notset = 'color:orange';
 		}
 		if (empty($objp->code_sell_l) && empty($objp->code_sell_p)) $code_sell_p_notset = 'color:red';
-		
+
 		// $objp->code_sell_p is now code of product/service
 		// $objp->code_sell_l is now default code of product/service
-					
+
 		print '<tr class="oddeven">';
 
 		// Line id
 		print '<td>' . $objp->rowid . '</td>';
-		
+
 		// Ref Invoice
 		print '<td>' . $facture_static->getNomUrl(1) . '</td>';
 
 		print '<td align="center">' . dol_print_date($db->jdate($objp->datef), 'day') . '</td>';
-		
+
 		// Ref Product
 		print '<td>';
 		if ($product_static->id)
 			print $product_static->getNomUrl(1);
 		if ($objp->product_label) print '<br>'.$objp->product_label;
 		print '</td>';
-		
+
 		print '<td class="tdoverflowonsmartphone">';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
 		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
@@ -383,14 +382,14 @@ if ($result) {
 		print '<td align="right">';
 		print price($objp->total_ht);
 		print '</td>';
-		
+
 		// Vat rate
 		if ($objp->vat_tx_l != $objp->vat_tx_p)
 			$code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red';
 		print '<td style="' . $code_vat_differ . '" align="right">';
 		print price($objp->tva_tx_line);
 		print '</td>';
-		
+
 		// Current account
 		print '<td align="center" style="' . $code_sell_p_notset . '">';
 	    print (($objp->type_l == 1)?$langs->trans("DefaultForService"):$langs->trans("DefaultForProduct")) . ' = ' . ($objp->code_sell_l > 0 ? length_accountg($objp->code_sell_l) : $langs->trans("Unknown"));
@@ -403,7 +402,7 @@ if ($result) {
 
 		// Suggested accounting account
 		print '<td align="center">';
-		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
 		
 		print '<td align="center">';
@@ -414,7 +413,7 @@ if ($result) {
 	}
 	print '</table>';
 	print "</div>";
-	
+
 	print '</form>';
 } else {
 	print $db->error();
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index 52440385e50..e37b35f1003 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -30,7 +30,7 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 // Langs
 $langs->load("bills");
@@ -85,7 +85,7 @@ if ($cancel == $langs->trans("Cancel")) {
 // Create
 $form = new Form($db);
 $expensereport_static = new ExpenseReport($db);
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 if (! empty($id)) {
 	$sql = "SELECT er.ref, er.rowid as facid, erd.fk_c_type_fees, erd.comments, erd.rowid, erd.fk_code_ventilation,";
@@ -135,7 +135,7 @@ if (! empty($id)) {
 			print '<td>' . ($langs->trans($objp->type_fees_code) == $objp->type_fees_code ? $objp->type_fees_label : $langs->trans(($objp->type_fees_code))) . '</td>';
 
 			print '<tr><td>' . $langs->trans("Account") . '</td><td>';
-			print $formventilation->select_account($objp->fk_code_ventilation, 'codeventil', 1);
+			print $formaccounting->select_account($objp->fk_code_ventilation, 'codeventil', 1);
 			print '</td></tr>';
 			print '</table>';
 
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 6d0ffbd4476..b3936bbf1a6 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -27,7 +27,7 @@
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
@@ -74,7 +74,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 
 /*
@@ -226,7 +226,7 @@ if ($result) {
 	print $langs->trans("DescVentilDoneExpenseReport") . '<br>';
 
 	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
-	print $formventilation->select_account(GETPOST('account_parent'), 'account_parent', 1);
+	print $formaccounting->select_account(GETPOST('account_parent'), 'account_parent', 1);
 	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>';
 
 	$moreforfilter = '';
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 72316e4c4d6..b1a86c96838 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -29,7 +29,7 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
@@ -83,7 +83,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 $accounting = new AccountingAccount($db);
 
 
@@ -343,7 +343,7 @@ if ($result) {
 
 		// Suggested accounting account
 		print '<td align="center">';
-		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
 
 		print '<td align="center">';
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index b7c5979aa7a..47a99c88496 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2004       Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2005       Simon TOSSER          <simon@kornog-computing.com>
- * Copyright (C) 2013-2015  Alexandre Spangaro    <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017  Alexandre Spangaro    <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2013-2014  Olivier Geffroy       <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014	Florian Henry	      <florian.henry@open-concept.pro>
- * Copyright (C) 2014	    Juanjo Menent		  <jmenent@2byte.es>
- * Copyright (C) 2015       Jean-François Ferry	  <jfefe@aternatik.fr>
+ * Copyright (C) 2013-2014  Florian Henry         <florian.henry@open-concept.pro>
+ * Copyright (C) 2014       Juanjo Menent         <jmenent@2byte.es>
+ * Copyright (C) 2015       Jean-François Ferry   <jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 // Langs
 $langs->load("bills");
@@ -52,11 +52,11 @@ if ($user->societe_id > 0)
 if ($action == 'ventil' && $user->rights->accounting->bind->write) {
 	if (! GETPOST('cancel', 'alpha')) {
 	    if ($codeventil < 0) $codeventil = 0;
-	    
+
 		$sql = " UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
 		$sql .= " SET fk_code_ventilation = " . $codeventil;
 		$sql .= " WHERE rowid = " . $id;
-		
+
 		$resql = $db->query($sql);
 		if (! $resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
@@ -85,7 +85,7 @@ if ($cancel == $langs->trans("Cancel")) {
 // Create
 $form = new Form($db);
 $facturefournisseur_static = new FactureFournisseur($db);
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 if (! empty($id)) {
 	$sql = "SELECT f.ref as facnumber, f.rowid as facid, l.fk_product, l.description, l.rowid, l.fk_code_ventilation, ";
@@ -107,41 +107,41 @@ if (! empty($id)) {
 		
 		if ($num_lines) {
 			$objp = $db->fetch_object($result);
-			
+
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $id . '" method="post">' . "\n";
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="ventil">';
-			
+
 			print load_fiche_titre($langs->trans('SuppliersVentilation'), '', 'title_setup');
-			
+
 			dol_fiche_head();
-			
+
 			print '<table class="border" width="100%">';
-			
+
 			// ref invoice
 			print '<tr><td>' . $langs->trans("BillsSuppliers") . '</td>';
 			$facturefournisseur_static->ref = $objp->facnumber;
 			$facturefournisseur_static->id = $objp->facid;
 			print '<td>' . $facturefournisseur_static->getNomUrl(1) . '</td>';
 			print '</tr>';
-			
+
 			print '<tr><td width="20%">' . $langs->trans("Line") . '</td>';
 			print '<td>' . stripslashes(nl2br($objp->description)) . '</td></tr>';
 			print '<tr><td width="20%">' . $langs->trans("ProductLabel") . '</td>';
 			print '<td>' . dol_trunc($objp->product_label, 24) . '</td>';
 			print '<tr><td width="20%">' . $langs->trans("Account") . '</td><td>';
-			print $formventilation->select_account($objp->fk_code_ventilation, 'codeventil', 1);
+			print $formaccounting->select_account($objp->fk_code_ventilation, 'codeventil', 1);
 			print '</td></tr>';
 			print '</table>';
-			
+
 			dol_fiche_end();
-			
+
 			print '<div class="center">';
 			print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
 			print '</div>';
-			
+
 			print '</form>';
 		} else {
 			print "Error";
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 1a95262f861..2757b6d8aec 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -1,9 +1,9 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>  
  * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2014      Juanjo Menent		<jmenent@2byte.es>
  *   
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
@@ -76,7 +76,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 
 
 /*
@@ -237,7 +237,7 @@ if ($result) {
 	print $langs->trans("DescVentilDoneSupplier") . '<br>';
 	
 	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
-	print $formventilation->select_account(GETPOST('account_parent'), 'account_parent', 1);
+	print $formaccounting->select_account(GETPOST('account_parent'), 'account_parent', 1);
 	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>';
 	
 	$moreforfilter = '';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 061e465b1e7..9c822425a1c 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2013-2014	Olivier Geffroy			<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2017	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014-2015	Ari Elbaz (elarifr)		<github@accedinfo.com>
  * Copyright (C) 2013-2014	Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014		Juanjo Menent			<jmenent@2byte.es>s
- * Copyright (C) 2016	  	Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2016		Laurent Destailleur		<eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
@@ -85,7 +85,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();
 
-$formventilation = new FormVentilation($db);
+$formaccounting = new FormAccounting($db);
 $accounting = new AccountingAccount($db);
 // TODO: we should need to check if result is a really exist accountaccount rowid.....
 $aarowid_s = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT, 1);
@@ -238,11 +238,11 @@ if ($result) {
 	$i = 0;
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	$param='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	
+
 	$arrayofmassactions =  array(
 	    'ventil'=>$langs->trans("Ventilate")
 	    //'presend'=>$langs->trans("SendByMail"),
@@ -251,8 +251,7 @@ if ($result) {
 	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	//if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('ventil', $arrayofmassactions, 1);
-	
-	
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -261,15 +260,15 @@ if ($result) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	print $langs->trans("DescVentilTodoCustomer") . '</br><br>';
 
 	if ($msg) print $msg.'<br>';
-	
+
 	$moreforfilter = '';
-	
+
     print '<div class="div-table-responsive">';
 
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -329,7 +328,7 @@ if ($result) {
 		$productfourn_static->id = $objp->product_id;
 		$productfourn_static->type = $objp->type;
 		$productfourn_static->label = $objp->product_label;
-		
+
 		$facturefourn_static->ref = $objp->ref;
 		$facturefourn_static->id = $objp->facid;
 		$facturefourn_static->type = $objp->type;
@@ -347,14 +346,14 @@ if ($result) {
 				$objp->aarowid_suggest = $aarowid_p;
 		}
 		if ($objp->code_buy_l == -1) $objp->code_buy_l='';
-		
+
 		if (! empty($objp->code_buy)) {
 			$objp->code_buy_p = $objp->code_buy;       // Code on product
 		} else {
 			$code_buy_p_notset = 'color:orange';
 		}
 		if (empty($objp->code_buy_l) && empty($objp->code_buy_p)) $code_buy_p_notset = 'color:red';
-		
+
 		// $objp->code_buy_p is now code of product/service
 		// $objp->code_buy_l is now default code of product/service
 					
@@ -362,23 +361,23 @@ if ($result) {
 
 		// Line id
 		print '<td>' . $objp->rowid . '</td>';
-		
+
 		// Ref Invoice
 		print '<td>' . $facturefourn_static->getNomUrl(1) . '</td>';
 
 		print '<td class="tdoverflowonsmartphone">';
 		print $objp->invoice_label;
 		print '</td>';
-		
+
 		print '<td align="center">' . dol_print_date($db->jdate($objp->datef), 'day') . '</td>';
-		
+
 		// Ref product
 		print '<td>';
 		if ($productfourn_static->id)
 			print $productfourn_static->getNomUrl(1);
 		if ($objp->product_label) print '<br>'.$objp->product_label;
         print '</td>';
-        
+
         // Description
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
@@ -409,9 +408,9 @@ if ($result) {
 
 		// Suggested accounting account
 		print '<td align="center">';
-		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
-		
+
 		// Colonne choix ligne a ventiler
 		print '<td align="center">';
 		print '<input type="checkbox" class="flat checkforselect" name="toselect[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 28db9ef8b49..913fcf75de6 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load("errors");
 $langs->load("admin");
@@ -1662,7 +1662,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
-	if (! empty($conf->accounting->enabled)) $formaccountancy = new FormVentilation($db);
+	if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
 	foreach ($fieldlist as $field => $value)
 	{
@@ -1811,7 +1811,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			{
 			    $fieldname = $fieldlist[$field];
 				$accountancy_account = (! empty($obj->$fieldname) ? $obj->$fieldname : 0);
-				print $formaccountancy->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+				print $formaccounting->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			}
 			else
 			{
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index 86d963ed54f..c3e8bad9f6d 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2014-2016	Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2014-2017  Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ require '../main.inc.php';
 	
 // Class
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load("admin");
 $langs->load("loan");
@@ -77,7 +77,7 @@ if ($action == 'update')
 llxHeader();
 
 $form = new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans('ConfigLoan'),$linkback,'title_setup');
@@ -106,7 +106,7 @@ foreach ($list as $key)
 	print '<td>';
 	if (! empty($conf->accounting->enabled))
 	{
-		print $formaccountancy->select_account($conf->global->$key, $key, 1, '', 1, 1);
+		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
 	}
 	else
 	{
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index b9e5df738ad..caea3bef9f7 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load("errors");
 $langs->load("admin");
@@ -841,7 +841,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
-	if (! empty($conf->accounting->enabled)) $formaccountancy = new FormVentilation($db);
+	if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
 	foreach ($fieldlist as $field => $value)
 	{
diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php
index 8f115d3963b..85603de2ae5 100644
--- a/htdocs/admin/salaries.php
+++ b/htdocs/admin/salaries.php
@@ -26,7 +26,7 @@ require '../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load("admin");
 $langs->load("salaries");
@@ -76,7 +76,7 @@ if ($action == 'update')
 llxHeader('',$langs->trans('SalariesSetup'));
 
 $form = new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans('SalariesSetup'),$linkback,'title_setup');
@@ -109,7 +109,7 @@ foreach ($list as $key)
 	print '<td>';
 	if (! empty($conf->accounting->enabled))
 	{
-		print $formaccountancy->select_account($conf->global->$key, $key, 1, '', 1, 1);
+		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
 	}
 	else
 	{
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index dbdce59c3c5..59796919a8b 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -27,7 +27,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load('admin');
 
@@ -113,7 +113,7 @@ if ($action == 'update') {
 
 llxHeader();
 $form=new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans('TaxSetup'),$linkback,'title_setup');
@@ -216,7 +216,7 @@ foreach ($list as $key)
 	print '<td>';
 	if (! empty($conf->accounting->enabled))
 	{
-		print $formaccountancy->select_account($conf->global->$key, $key, 1, '', 1, 1);
+		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
 	}
 	else
 	{
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index a8263a74916..2cb90b6a44a 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -35,7 +35,6 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbank.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
@@ -281,8 +280,7 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->
 $form = new Form($db);
 $formbank = new FormBank($db);
 $formcompany = new FormCompany($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy2 = New FormAccounting($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
@@ -511,7 +509,7 @@ if ($action == 'create')
 	{
 		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
-		print $formaccountancy->select_account($object->account_number, 'account_number', 1, '', 1, 1);
+		print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
 		print '</td></tr>';
 	}
 	else
@@ -525,7 +523,7 @@ if ($action == 'create')
 	{
 		print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 	    print '<td>';
-		print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
+		print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
 		print '</td></tr>';
 	}
 
@@ -957,43 +955,42 @@ else
 
 
 		//print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border" width="100%">';
-		
+
 		// Accountancy code
 		$tdextra = ' class="titlefieldcreate"';
-		
+
 		if (!empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) {
 		    $tdextra = ' class="fieldrequired titlefieldcreate"';
 		}
-		
+
 		print '<tr class="liste_titre_add"><td'.$tdextra.'>'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
 		if (!empty($conf->accounting->enabled)) {
-		    print $formaccountancy->select_account($object->account_number, 'account_number', 1, '', 1, 1);
+		    print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
 		} else {
 		    print '<input type="text" name="account_number" value="'.(GETPOST("account_number") ? GETPOST("account_number") : $object->account_number).'">';
 		}
 		print '</td></tr>';
-		
+
 		// Accountancy journal
 		if (! empty($conf->accounting->enabled))
 		{
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
-			print $formaccountancy2->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
+			print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
 			print '</td></tr>';
 		}
-		
+
 		print '</table>';
-		
-		
+
 		if ($_POST["type"] == Account::TYPE_SAVINGS || $_POST["type"] == Account::TYPE_CURRENT)
 		{
 		    print '<br>';
-		    
+
 		    //print '<div class="underbanner clearboth"></div>';
-		    
+
 			print '<table class="border" width="100%">';
 
 			// If bank account
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 4875ac593c6..20c49c71468 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 
 $langs->load("compta");
@@ -180,7 +180,7 @@ if ($action == 'delete')
 llxHeader("",$langs->trans("VariousPayment"));
 
 $form = new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 if ($id)
 {
@@ -271,9 +271,9 @@ if ($action == 'create')
 	{
 		print '<tr><td>'.$langs->trans("AccountAccounting").'</td>';
         print '<td>';
-		print $formaccountancy->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1, '');
+		print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1, '');
         print '</td></tr>';
-	}			
+	}
 	else // For external software 
 	{
 		print '<tr><td>'.$langs->trans("AccountAccounting").'</td>';
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 97f31f05e99..3ad3721c9d4 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -1,5 +1,9 @@
 <?php
-/* Copyright (C) 2016-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
+/* Copyright (C) 2013-2016 Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
+ * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2016-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +32,7 @@
 class FormAccounting extends Form
 {
 
-    private $options_cache = array();
+	private $options_cache = array();
 
 	var $db;
 	var $error;
@@ -205,5 +209,261 @@ class FormAccounting extends Form
         
         print $out;
     }
+
+	/**
+	 * Return select filter with date of transaction
+	 *
+	 * @param string $htmlname Name of select field
+	 * @param string $selectedkey Value
+	 * @return string HTML edit field
+	 */
+	function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '') {
+		$options = array();
+
+		$sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
+	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= ' ORDER BY import_key DESC';
+
+		dol_syslog(get_class($this) . "::select_bookkeeping_importkey", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::select_bookkeeping_importkey " . $this->error, LOG_ERR);
+			return - 1;
+		}
+
+		while ($obj = $this->db->fetch_object($resql)) {
+			$options[$obj->import_key] = dol_print_date($obj->import_key, 'dayhourtext');
+		}
+
+		return Form::selectarray($htmlname, $options, $selectedkey);
+	}
+
+	/**
+	 * Return list of accounts with label by chart of accounts
+	 *
+	 * @param string   $selectid           Preselected id or code of accounting accounts (depends on $select_in)
+	 * @param string   $htmlname           Name of field in html form
+	 * @param int      $showempty          Add an empty field
+	 * @param array    $event              Event options
+	 * @param int      $select_in          0=selectid value is a aa.rowid (default) or 1=selectid is aa.account_number
+	 * @param int      $select_out         Set value returned by select. 0=rowid (default), 1=account_number
+	 * @param string   $morecss            More css non HTML object
+	 * @param string   $usecache           Key to use to store result into a cache. Next call with same key will reuse the cache.
+	 * @return string                      String with HTML select
+	 */
+	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
+	{
+		global $conf;
+
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+
+		$out = '';
+		
+    	$options = array();
+		if ($usecache && ! empty($this->options_cache[$usecache]))
+		{
+		    $options = $this->options_cache[$usecache];
+		    $selected=$selectid;
+		}
+		else
+		{
+    		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
+
+    		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
+    		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
+    		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+    		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+    		$sql .= " AND aa.active = 1";
+    		$sql .= " ORDER BY aa.account_number";
+
+    		dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
+    		$resql = $this->db->query($sql);
+
+    		if (!$resql) {
+    			$this->error = "Error " . $this->db->lasterror();
+    			dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
+    			return -1;
+    		}
+
+    		$out .= ajax_combobox($htmlname, $event);
+
+    		$selected = 0;
+    		while ($obj = $this->db->fetch_object($resql))
+    		{
+    			$label = length_accountg($obj->account_number) . ' - ' . $obj->label;
+    			$label = dol_trunc($label, $trunclength);
+
+    			$select_value_in = $obj->rowid;
+    			$select_value_out = $obj->rowid;
+
+    			// Try to guess if we have found default value
+    			if ($select_in == 1) {
+    				$select_value_in = $obj->account_number;
+    			}
+    			if ($select_out == 1) {
+    				$select_value_out = $obj->account_number;
+    			}
+    			// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
+    			// Because same account_number can be share between different accounting_system and do have the same meaning
+    			if ($selectid != '' && $selectid == $select_value_in) {
+    			    //var_dump("Found ".$selectid." ".$select_value_in);
+    				$selected = $select_value_out;
+    			}
+
+    			$options[$select_value_out] = $label;
+    		}
+    		$this->db->free($resql);
+
+    		if ($usecache)
+    		{
+                $this->options_cache[$usecache] = $options;
+    		}
+		}
+
+		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+
+		return $out;
+	}
+
+	/**
+	 * Return list of auxilary thirdparty accounts
+	 *
+	 * @param string $selectid Preselected pcg_type
+	 * @param string $htmlname Name of field in html form
+	 * @param int $showempty Add an empty field
+	 * @param array $event Event options
+	 *
+	 * @return string String with HTML select
+	 */
+	function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $event = array()) {
+
+		$aux_account = array();
+
+		// Auxiliary customer account
+		$sql = "SELECT DISTINCT code_compta, nom ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+	    $sql .= " WHERE entity IN (" . getEntity("societe", 1) . ")";
+		$sql .= " ORDER BY code_compta";
+		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!empty($obj->code_compta)) {
+					$aux_account[$obj->code_compta] = $obj->code_compta.' ('.$obj->nom.')';
+				}
+			}
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
+			return -1;
+		}
+		$this->db->free($resql);
+
+		// Auxiliary supplier account
+		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+		$sql .= " WHERE entity IN (" . getEntity("societe", 1) . ")";
+		$sql .= " ORDER BY code_compta_fournisseur";
+		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!empty($obj->code_compta_fournisseur)) {
+					$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' ('.$obj->nom.')';
+				}
+			}
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
+			return -1;
+		}
+		$this->db->free($resql);
+
+		// Build select
+		$out = ajax_combobox($htmlname, $event);
+		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
+
+		return $out;
+	}
+
+	/**
+	 * Return HTML combo list of years existing into book keepping
+	 *
+	 * @param string $selected Preselected value
+	 * @param string $htmlname Name of HTML select object
+	 * @param int $useempty Affiche valeur vide dans liste
+	 * @param string $output_format (html/opton (for option html only)/array (to return options arrays
+	 * @return string/array
+	 */
+	function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
+	{
+	    global $conf;
+
+		$out_array = array();
+
+		$sql = "SELECT DISTINCT date_format(doc_date,'%Y') as dtyear";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
+	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " ORDER BY date_format(doc_date,'%Y')";
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
+			return -1;
+		}
+		while ($obj = $this->db->fetch_object($resql)) {
+			$out_array[$obj->dtyear] = $obj->dtyear;
+		}
+		$this->db->free($resql);
+
+		if ($output_format == 'html') {
+			return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
+		} else {
+			return $out_array;
+		}
+	}
+
+	/**
+	 * Return HTML combo list of years existing into book keepping
+	 *
+	 * @param  string          $selected       Preselected value
+	 * @param  string          $htmlname       Name of HTML select object
+	 * @param  int             $useempty       Affiche valeur vide dans liste
+	 * @param  string          $output_format  Html/option (for option html only)/array (to return options arrays
+	 * @return string/array
+	 */
+	function selectjournal_accountancy_bookkepping($selected = '', $htmlname = 'journalid', $useempty = 0, $output_format = 'html')
+	{
+	    global $conf,$langs;
+
+		$out_array = array();
+
+		$sql = "SELECT DISTINCT code_journal";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
+	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " ORDER BY code_journal";
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
+			return -1;
+		}
+		while ($obj = $this->db->fetch_object($resql)) {
+			$out_array[$obj->code_journal] = $obj->code_journal?$obj->code_journal:$langs->trans("NotDefined");  // TODO Not defined is accepted ? We should avoid this, shouldn't we ?
+		}
+		$this->db->free($resql);
+
+		if ($output_format == 'html') {
+			return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
+		} else {
+			return $out_array;
+		}
+	}
 }
 
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 2888b911700..c8d8be2461d 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -1,9 +1,9 @@
 <?php
 /* Copyright (C) 2005-2010  Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2012-2015	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2012-2015  Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013-2017  Philippe Grand			<philippe.grand@atoo-net.com>
- * Copyright (C) 2015       Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2015  		Benoit Bruchard			<benoitb21@gmail.com>
+ * Copyright (C) 2015-2017  Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015       Benoit Bruchard			<benoitb21@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 
 $langs->load("admin");
 $langs->load("donations");
@@ -199,7 +199,7 @@ else if ($action == 'setart885') {
 
 $dir = "../../core/modules/dons/";
 $form=new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@@ -364,7 +364,7 @@ print '<label for="DONATION_ACCOUNTINGACCOUNT">' . $label . '</label></td>';
 print '<td>';
 if (! empty($conf->accounting->enabled))
 {
-	print $formaccountancy->select_account($conf->global->DONATION_ACCOUNTINGACCOUNT, 'DONATION_ACCOUNTINGACCOUNT', 1, '', 1, 1);
+	print $formaccounting->select_account($conf->global->DONATION_ACCOUNTINGACCOUNT, 'DONATION_ACCOUNTINGACCOUNT', 1, '', 1, 1);
 }
 else
 {
@@ -401,7 +401,7 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 	print '<tr class="liste_titre">';
 	print '<td colspan="3">' . $langs->trans('Parameters') . '</td>';
 	print "</tr>\n";
-	
+
 	print '<tr class="oddeven">';
 	print '<td width="80%">' . $langs->trans("DONATION_ART200") . '</td>';
 	if (! empty($conf->global->DONATION_ART200)) {
@@ -414,7 +414,7 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 		print '</a></td>';
 	}
 	print '</tr>';
-	
+
 	print '<tr class="oddeven">';
 	print '<td width="80%">' . $langs->trans("DONATION_ART238") . '</td>';
 	if (! empty($conf->global->DONATION_ART238)) {
@@ -427,7 +427,7 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 		print '</a></td>';
 	}
 	print '</tr>';
-	
+
 	print '<tr class="oddeven">';
 	print '<td width="80%">' . $langs->trans("DONATION_ART885") . '</td>';
 	if (! empty($conf->global->DONATION_ART885)) {
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index b58bfb929d9..81d43e46ab0 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2014-2016	Alexandre Spangaro   <aspangaro@zendsi.com>
+/* Copyright (C) 2014-2017	Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
@@ -235,7 +235,7 @@ if (empty($reshook))
 
 $form = new Form($db);
 $formproject = new FormProjets($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 $title = $langs->trans("Loan") . ' - ' . $langs->trans("Card");
 $help_url = 'EN:Module_Loan|FR:Module_Emprunt';
@@ -337,19 +337,19 @@ if ($action == 'create')
 		// Accountancy_account_capital
         print '<tr><td class="titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
         print '<td>';
-		print $formaccountancy->select_account($object->accountancy_account_capital, 'accountancy_account_capital', 1, '', 0, 1);
+		print $formaccounting->select_account($object->accountancy_account_capital, 'accountancy_account_capital', 1, '', 0, 1);
         print '</td></tr>';
 
 		// Accountancy_account_insurance
         print '<tr><td>'.$langs->trans("LoanAccountancyInsuranceCode").'</td>';
         print '<td>';
-		print $formaccountancy->select_account($object->accountancy_account_insurance, 'accountancy_account_insurance', 1, '', 0, 1);
+		print $formaccounting->select_account($object->accountancy_account_insurance, 'accountancy_account_insurance', 1, '', 0, 1);
         print '</td></tr>';
 
 		// Accountancy_account_interest
         print '<tr><td>'.$langs->trans("LoanAccountancyInterestCode").'</td>';
         print '<td>';
-		print $formaccountancy->select_account($object->accountancy_account_interest, 'accountancy_account_interest', 1, '', 0, 1);
+		print $formaccounting->select_account($object->accountancy_account_interest, 'accountancy_account_interest', 1, '', 0, 1);
         print '</td></tr>';
 	}
 	else // For external software 
@@ -541,7 +541,7 @@ if ($id > 0)
 		{
 			if (! empty($conf->accounting->enabled))
 			{
-				print $formaccountancy->select_account($object->account_capital, 'accountancy_account_capital', 1, '', 0, 1);
+				print $formaccounting->select_account($object->account_capital, 'accountancy_account_capital', 1, '', 0, 1);
 			}
 			else
 			{
@@ -566,7 +566,7 @@ if ($id > 0)
 		{
 			if (! empty($conf->accounting->enabled))
 			{
-				print $formaccountancy->select_account($object->account_insurance, 'accountancy_account_insurance', 1, '', 0, 1);
+				print $formaccounting->select_account($object->account_insurance, 'accountancy_account_insurance', 1, '', 0, 1);
 			}
 			else
 			{
@@ -591,7 +591,7 @@ if ($id > 0)
 		{
 			if (! empty($conf->accounting->enabled))
 			{
-				print $formaccountancy->select_account($object->account_interest, 'accountancy_account_interest', 1, '', 0, 1);
+				print $formaccounting->select_account($object->account_interest, 'accountancy_account_interest', 1, '', 0, 1);
 			}
 			else
 			{
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 7cd86404afa..2869e0f557c 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -52,7 +52,7 @@ if (! empty($conf->propal->enabled))     require_once DOL_DOCUMENT_ROOT.'/comm/p
 if (! empty($conf->facture->enabled))    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 if (! empty($conf->commande->enabled))   require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 
 $langs->load("products");
 $langs->load("other");
@@ -808,7 +808,7 @@ llxHeader('', $title, $helpurl);
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
 // Load object modBarCodeProduct
 $res=0;
@@ -1113,13 +1113,13 @@ else
             // Accountancy_code_sell
             print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
             print '<td>';
-		    print $formaccountancy->select_account(GETPOST('accountancy_code_sell'), 'accountancy_code_sell', 1, null, 1, 1, '');
+		    print $formaccounting->select_account(GETPOST('accountancy_code_sell'), 'accountancy_code_sell', 1, null, 1, 1, '');
             print '</td></tr>';
 
             // Accountancy_code_buy
             print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
             print '<td>';
-			print $formaccountancy->select_account(GETPOST('accountancy_code_buy'), 'accountancy_code_buy', 1, null, 1, 1, '');
+			print $formaccounting->select_account(GETPOST('accountancy_code_buy'), 'accountancy_code_buy', 1, null, 1, 1, '');
             print '</td></tr>';
 		}			
 		else // For external software 
@@ -1406,15 +1406,15 @@ else
                 // Accountancy_code_sell
                 print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
                 print '<td>';
-				print $formaccountancy->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1);
+				print $formaccounting->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1);
                 print '</td></tr>';
 
                 // Accountancy_code_buy
                 print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
                 print '<td>';
-				print $formaccountancy->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
+				print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
                 print '</td></tr>';
-			}			
+			}
 			else // For external software 
 			{
                 // Accountancy_code_sell

From e4f5d45c4593dad2b2b39834844fec8369548715 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 25 May 2017 07:10:09 +0200
Subject: [PATCH 0938/1163] Remove old code
 (selectjournal_accountancy_bookkepping)

---
 htdocs/accountancy/bookkeeping/list.php       |  2 +-
 .../core/class/html.formaccounting.class.php  | 39 -------------------
 2 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index a955d671475..369dd7afcec 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -322,7 +322,7 @@ if ($action == 'delbookkeepingyear') {
 		$delyear = dol_print_date(dol_now(), '%Y');
 	}
 	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
-	$journal_array = $formaccounting->selectjournal_accountancy_bookkepping($deljournal, 'deljournal', 0, 'array');
+	$journal_array = $formaccounting->selectjournal($deljournal, 'deljournal', '', 1, 'array', 1, 1);
 
 	$form_question['delyear'] = array (
 			'name' => 'delyear',
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 3ad3721c9d4..f3db5777783 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -426,44 +426,5 @@ class FormAccounting extends Form
 			return $out_array;
 		}
 	}
-
-	/**
-	 * Return HTML combo list of years existing into book keepping
-	 *
-	 * @param  string          $selected       Preselected value
-	 * @param  string          $htmlname       Name of HTML select object
-	 * @param  int             $useempty       Affiche valeur vide dans liste
-	 * @param  string          $output_format  Html/option (for option html only)/array (to return options arrays
-	 * @return string/array
-	 */
-	function selectjournal_accountancy_bookkepping($selected = '', $htmlname = 'journalid', $useempty = 0, $output_format = 'html')
-	{
-	    global $conf,$langs;
-
-		$out_array = array();
-
-		$sql = "SELECT DISTINCT code_journal";
-		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-		$sql .= " ORDER BY code_journal";
-		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-
-		if (!$resql) {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
-			return -1;
-		}
-		while ($obj = $this->db->fetch_object($resql)) {
-			$out_array[$obj->code_journal] = $obj->code_journal?$obj->code_journal:$langs->trans("NotDefined");  // TODO Not defined is accepted ? We should avoid this, shouldn't we ?
-		}
-		$this->db->free($resql);
-
-		if ($output_format == 'html') {
-			return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
-		} else {
-			return $out_array;
-		}
-	}
 }
 

From db6d7d9e21c63669241dfdcf3989fbce594460fa Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 25 May 2017 07:15:36 +0200
Subject: [PATCH 0939/1163] Spaces

---
 .../accountancy/class/bookkeeping.class.php   | 114 +++++++++---------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index a59d92eb63a..c885d6228cb 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1053,23 +1053,23 @@ class BookKeeping extends CommonObject
 	 */
 	function deleteByYearAndJournal($delyear='', $journal='') {
 	    global $conf;
-	    
+
 	    if (empty($delyear) && empty($journal)) 
 	    {
 	        return -1;
 	    }
-	    
+
 		$this->db->begin();
-		
+
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
 		$sql.= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql.= " WHERE 1 = 1";
 		if (! empty($delyear)) $sql.= " AND YEAR(doc_date) = " . $delyear;         // FIXME Must use between
 		if (! empty($journal)) $sql.= " AND code_journal = '".$journal."'";
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 		$resql = $this->db->query($sql);
-		
+
 		if (! $resql) {
 			$this->errors[] = "Error " . $this->db->lasterror();
 			foreach ( $this->errors as $errmsg ) {
@@ -1083,7 +1083,7 @@ class BookKeeping extends CommonObject
 		$this->db->commit();
 		return 1;
 	}
-	
+
 	/**
 	 * Delete bookkepping by piece number
 	 *
@@ -1092,17 +1092,17 @@ class BookKeeping extends CommonObject
 	 */
 	function deleteMvtNum($piecenum) {
 	    global $conf;
-	    
+
 		$this->db->begin();
 		
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-		
+		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+
 		$resql = $this->db->query($sql);
-		
+
 		if (! $resql) {
 			$this->errors[] = "Error " . $this->db->lasterror();
 			foreach ( $this->errors as $errmsg ) {
@@ -1116,7 +1116,7 @@ class BookKeeping extends CommonObject
 		$this->db->commit();
 		return 1;
 	}
-	
+
 	/**
 	 * Load an object from its id and create a new one in database
 	 *
@@ -1130,27 +1130,27 @@ class BookKeeping extends CommonObject
 		global $user;
 		$error = 0;
 		$object = new Accountingbookkeeping($this->db);
-		
+
 		$this->db->begin();
-		
+
 		// Load source object
 		$object->fetch($fromid);
 		// Reset object
 		$object->id = 0;
-		
+
 		// Clear fields
 		// ...
-		
+
 		// Create clone
 		$result = $object->create($user);
-		
+
 		// Other options
 		if ($result < 0) {
 			$error ++;
 			$this->errors = $object->errors;
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
-		
+
 		// End
 		if (! $error) {
 			$this->db->commit();
@@ -1158,11 +1158,11 @@ class BookKeeping extends CommonObject
 			return $object->id;
 		} else {
 			$this->db->rollback();
-			
+
 			return - 1;
 		}
 	}
-	
+
 	/**
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
@@ -1171,9 +1171,9 @@ class BookKeeping extends CommonObject
 	 */
 	public function initAsSpecimen() {
 		global $user;
-		
+
 		$now=dol_now();
-		
+
 		$this->id = 0;
 		$this->doc_date = $now;
 		$this->doc_type = '';
@@ -1192,7 +1192,7 @@ class BookKeeping extends CommonObject
 		$this->code_journal = '';
 		$this->piece_num = '';
 	}
-	
+
 	/**
 	 * Load an accounting document into memory from database
 	 *
@@ -1201,17 +1201,17 @@ class BookKeeping extends CommonObject
 	 */
 	public function fetchPerMvt($piecenum) {
 		global $conf;
-		
-	    $sql = "SELECT piece_num,doc_date,code_journal,doc_ref,doc_type";
+
+		$sql = "SELECT piece_num,doc_date,code_journal,doc_ref,doc_type";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-		
+		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+
 		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
-			
+
 			$this->piece_num = $obj->piece_num;
 			$this->code_journal = $obj->code_journal;
 			$this->doc_date = $this->db->jdate($obj->doc_date);
@@ -1222,10 +1222,10 @@ class BookKeeping extends CommonObject
 			dol_syslog(get_class($this) . "::" . __METHOD__ . $this->error, LOG_ERR);
 			return - 1;
 		}
-		
+
 		return 1;
 	}
-	
+
 	/**
 	 * Return next number movement
 	 *
@@ -1233,8 +1233,8 @@ class BookKeeping extends CommonObject
 	 */
 	public function getNextNumMvt() 
 	{
-	    global $conf;
-	    
+		global $conf;
+
 		$sql = "SELECT MAX(piece_num)+1 as max FROM " . MAIN_DB_PREFIX . $this->table_element;
 	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
 		
@@ -1243,16 +1243,16 @@ class BookKeeping extends CommonObject
 
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
-	        if ($obj) $result = $obj->max;
-	        if (empty($result)) $result = 1;
-	        return $result;
+			if ($obj) $result = $obj->max;
+			if (empty($result)) $result = 1;
+			return $result;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
 			dol_syslog(get_class($this) . "::getNextNumMvt " . $this->error, LOG_ERR);
 			return - 1;
 		}
 	}
-	
+
 	/**
 	 * Load all informations of accountancy document
 	 *
@@ -1260,26 +1260,26 @@ class BookKeeping extends CommonObject
 	 * @return int <0 if KO, >0 if OK
 	 */
 	function fetch_all_per_mvt($piecenum) {
-	    global $conf;
-	    
+		global $conf;
+
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-		
+		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+
 		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
-			
+
 			while ( $obj = $this->db->fetch_object($result) ) {
-				
+
 				$line = new BookKeepingLine();
-				
+
 				$line->id = $obj->rowid;
-				
+
 				$line->doc_date = $this->db->jdate($obj->doc_date);
 				$line->doc_type = $obj->doc_type;
 				$line->doc_ref = $obj->doc_ref;
@@ -1294,7 +1294,7 @@ class BookKeeping extends CommonObject
 				$line->sens = $obj->sens;
 				$line->code_journal = $obj->code_journal;
 				$line->piece_num = $obj->piece_num;
-				
+
 				$this->linesmvt[] = $line;
 			}
 		} else {
@@ -1302,10 +1302,10 @@ class BookKeeping extends CommonObject
 			dol_syslog(get_class($this) . "::" . __METHOD__ . $this->error, LOG_ERR);
 			return - 1;
 		}
-		
+
 		return 1;
 	}
-	
+
 	/**
 	 * Export bookkeping
 	 *
@@ -1313,28 +1313,28 @@ class BookKeeping extends CommonObject
 	 * @return int Result
 	 */
 	function export_bookkeping($model = 'ebp') {
-	    global $conf;
-	    
+		global $conf;
+
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-		
+		$sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+
 		dol_syslog(get_class($this) . "::export_bookkeping", LOG_DEBUG);
-		
+
 		$resql = $this->db->query($sql);
-		
+
 		if ($resql) {
 			$this->linesexport = array ();
-			
+
 			$num = $this->db->num_rows($resql);
 			while ( $obj = $this->db->fetch_object($resql) ) {
 				$line = new BookKeepingLine();
-				
+
 				$line->id = $obj->rowid;
-				
+
 				$line->doc_date = $this->db->jdate($obj->doc_date);
 				$line->doc_type = $obj->doc_type;
 				$line->doc_ref = $obj->doc_ref;
@@ -1349,11 +1349,11 @@ class BookKeeping extends CommonObject
 				$line->sens = $obj->sens;
 				$line->code_journal = $obj->code_journal;
 				$line->piece_num = $obj->piece_num;
-				
+
 				$this->linesexport[] = $line;
 			}
 			$this->db->free($resql);
-			
+
 			return $num;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();

From b0bac770e555864c01539a7b760321920ac93504 Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Thu, 25 May 2017 08:07:11 +0200
Subject: [PATCH 0940/1163] menu descriptor must be only present in main

If we add the same menu descriptor
the additionnal menu are added on the second, not the main
I propose to suppress it OR change "customers_bills" as "customers_bills_list" who allow to add some menu as sub-menu
---
 htdocs/core/menus/standard/eldy.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 521fd6831f2..25ab9e9c154 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -802,7 +802,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$langs->load("bills");
 				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("BillsCustomers"),0,$user->rights->facture->lire, '', $mainmenu, 'customers_bills');
 				$newmenu->add("/compta/facture/card.php?action=create",$langs->trans("NewBill"),1,$user->rights->facture->creer);
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("List"),1,$user->rights->facture->lire, '', $mainmenu, 'customers_bills');
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("List"),1,$user->rights->facture->lire);
 
 				if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills/', $leftmenu))
 				{
@@ -830,7 +830,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$langs->load("bills");
 				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"),0,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');
 				$newmenu->add("/fourn/facture/card.php?action=create",$langs->trans("NewBill"),1,$user->rights->fournisseur->facture->creer);
-				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"),1,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');
+				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"),1,$user->rights->fournisseur->facture->lire);
 
 				if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {
 					$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"),2,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_draft');

From 18886849eb87d7f63c9bf5df2de060b4587a6247 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 25 May 2017 08:48:59 +0200
Subject: [PATCH 0941/1163] New: add REST api "memberstypes"

---
 .../adherents/class/adherent_type.class.php   |  25 +-
 .../class/api_memberstypes.class.php          | 322 ++++++++++++++++++
 htdocs/adherents/type.php                     |  68 ++--
 htdocs/core/class/html.form.class.php         |  54 +--
 htdocs/core/lib/functions.lib.php             | 108 +++---
 5 files changed, 455 insertions(+), 122 deletions(-)
 create mode 100644 htdocs/adherents/class/api_memberstypes.class.php

diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index d6ee9958162..a7775332812 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2002      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2009      Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2016      Charlie Benke        <charlie@patas-monkey.com>
+/* Copyright (C) 2002		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2008	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2017	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2016		Charlie Benke			<charlie@patas-monkey.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +36,13 @@ class AdherentType extends CommonObject
 	public $table_element = 'adherent_type';
 	public $element = 'adherent_type';
 	public $picto = 'group';
-	
+
+	/**
+	 * @var string
+	 * @deprecated Use label
+	 * @see label
+	 */
+	public $libelle;
 	/** @var string Label */
 	public $label;
 	/**
@@ -81,12 +87,13 @@ class AdherentType extends CommonObject
         global $conf;
 
         $this->statut=(int) $this->statut;
+        $this->label=(!empty($this->libelle)?trim($this->libelle):trim($this->label));
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type (";
         $sql.= "libelle";
         $sql.= ", entity";
         $sql.= ") VALUES (";
-        $sql.= "'".$this->db->escape($this->libelle)."'";
+        $sql.= "'".$this->db->escape($this->label)."'";
         $sql.= ", ".$conf->entity;
         $sql.= ")";
 
@@ -117,12 +124,12 @@ class AdherentType extends CommonObject
 
     	$error=0;
 
-        $this->libelle=trim($this->libelle);
+    	$this->label=(!empty($this->libelle)?trim($this->libelle):trim($this->label));
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."adherent_type ";
         $sql.= "SET ";
         $sql.= "statut = ".$this->statut.",";
-        $sql.= "libelle = '".$this->db->escape($this->libelle) ."',";
+        $sql.= "libelle = '".$this->db->escape($this->label) ."',";
         $sql.= "subscription = '".$this->db->escape($this->subscription)."',";
         $sql.= "note = '".$this->db->escape($this->note)."',";
         $sql.= "vote = '".$this->db->escape($this->vote)."',";
@@ -307,7 +314,7 @@ class AdherentType extends CommonObject
     {
     	return '';
     }
-    
+
     /**
      *     getMailOnValid
      *
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
new file mode 100644
index 00000000000..18c828eb9e5
--- /dev/null
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -0,0 +1,322 @@
+<?php
+/* Copyright (C) 2017	Regis Houssin	<regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+use Luracast\Restler\RestException;
+
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+
+/**
+ * API class for members types
+ *
+ * @access protected
+ * @class  DolibarrApiAccess {@requires user,external}
+ */
+class MembersTypes extends DolibarrApi
+{
+    /**
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object
+     */
+    static $FIELDS = array(
+        'label'
+    );
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        global $db, $conf;
+        $this->db = $db;
+    }
+
+    /**
+     * Get properties of a member type object
+     *
+     * Return an array with member type informations
+     *
+     * @param     int     $id ID of member type
+     * @return    array|mixed data without useless information
+     *
+     * @throws    RestException
+     */
+    function get($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->adherent->lire) {
+            throw new RestException(401);
+        }
+
+        $membertype = new AdherentType($this->db);
+        $result = $membertype->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'member type not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        return $this->_cleanObjectDatas($membertype);
+    }
+
+    /**
+     * List members types
+     *
+     * Get a list of members types
+     *
+     * @param string    $sortfield  Sort field
+     * @param string    $sortorder  Sort order
+     * @param int       $limit      Limit for list
+     * @param int       $page       Page number
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
+     * @return array                Array of member type objects
+     *
+     * @throws RestException
+     */
+    function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '') {
+        global $db, $conf;
+
+        $obj_ret = array();
+
+        if(! DolibarrApiAccess::$user->rights->adherent->lire) {
+            throw new RestException(401);
+        }
+
+        $sql = "SELECT t.rowid";
+        $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
+        $sql.= ' WHERE t.entity IN ('.getEntity('adherent', 1).')';
+
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+        $sql.= $db->order($sortfield, $sortorder);
+        if ($limit)    {
+            if ($page < 0)
+            {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql.= $db->plimit($limit + 1, $offset);
+        }
+
+        $result = $db->query($sql);
+        if ($result)
+        {
+            $i=0;
+            $num = $db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
+            {
+            	$obj = $db->fetch_object($result);
+                $membertype = new AdherentType($this->db);
+                if ($membertype->fetch($obj->rowid)) {
+                    $obj_ret[] = $this->_cleanObjectDatas($membertype);
+                }
+                $i++;
+            }
+        }
+        else {
+            throw new RestException(503, 'Error when retrieve member type list : '.$db->lasterror());
+        }
+        if ( ! count($obj_ret)) {
+            throw new RestException(404, 'No member type found');
+        }
+
+        return $obj_ret;
+    }
+
+    /**
+     * Create member type object
+     *
+     * @param array $request_data   Request data
+     * @return int  ID of member type
+     */
+    function post($request_data = null)
+    {
+        if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
+            throw new RestException(401);
+        }
+        // Check mandatory fields
+        $result = $this->_validate($request_data);
+
+        $membertype = new AdherentType($this->db);
+        foreach($request_data as $field => $value) {
+            $membertype->$field = $value;
+        }
+        if ($membertype->create(DolibarrApiAccess::$user) < 0) {
+            throw new RestException(500, 'Error creating member type', array_merge(array($membertype->error), $membertype->errors));
+        }
+        return $membertype->id;
+    }
+
+    /**
+     * Update member type
+     *
+     * @param int   $id             ID of member type to update
+     * @param array $request_data   Datas
+     * @return int
+     */
+    function put($id, $request_data = null)
+    {
+        if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
+            throw new RestException(401);
+        }
+
+        $membertype = new AdherentType($this->db);
+        $result = $membertype->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'member type not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        foreach($request_data as $field => $value) {
+            if ($field == 'id') continue;
+            // Process the status separately because it must be updated using
+            // the validate() and resiliate() methods of the class AdherentType.
+            $membertype->$field = $value;
+        }
+
+        // If there is no error, update() returns the number of affected rows
+        // so if the update is a no op, the return value is zero.
+        if ($membertype->update(DolibarrApiAccess::$user) >= 0)
+            return $this->get($id);
+
+        return false;
+    }
+
+    /**
+     * Delete member type
+     *
+     * @param int $id   member type ID
+     * @return array
+     */
+    function delete($id)
+    {
+        if (! DolibarrApiAccess::$user->rights->adherent->configurer) {
+            throw new RestException(401);
+        }
+        $membertype = new AdherentType($this->db);
+        $result = $membertype->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'member type not found');
+        }
+
+        if ( ! DolibarrApi::_checkAccessToResource('member',$membertype->id,'adherent_type')) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        if (! $membertype->delete($membertype->id)) {
+            throw new RestException(401,'error when deleting member type');
+        }
+
+        return array(
+            'success' => array(
+                'code' => 200,
+                'message' => 'member type deleted'
+            )
+        );
+    }
+
+    /**
+     * Validate fields before creating an object
+     *
+     * @param array|null    $data   Data to validate
+     * @return array
+     *
+     * @throws RestException
+     */
+    function _validate($data)
+    {
+        $membertype = array();
+        foreach (MembersTypes::$FIELDS as $field) {
+            if (!isset($data[$field]))
+                throw new RestException(400, "$field field missing");
+            $membertype[$field] = $data[$field];
+        }
+        return $membertype;
+    }
+
+    /**
+     * Clean sensible object datas
+     *
+     * @param   object  $object    Object to clean
+     * @return    array    Array of cleaned object properties
+     */
+    function _cleanObjectDatas($object) {
+
+        $object = parent::_cleanObjectDatas($object);
+
+        unset($object->cotisation);
+        unset($object->libelle);
+
+        unset($object->import_key);
+        unset($object->array_options);
+        unset($object->linkedObjectsIds);
+        unset($object->context);
+        unset($object->canvas);
+        unset($object->fk_project);
+        unset($object->contact);
+        unset($object->contact_id);
+        unset($object->thirdparty);
+        unset($object->user);
+        unset($object->origin);
+        unset($object->origin_id);
+        unset($object->ref_ext);
+        unset($object->country);
+        unset($object->country_id);
+        unset($object->country_code);
+        unset($object->barcode_type);
+        unset($object->barcode_type_code);
+        unset($object->barcode_type_label);
+        unset($object->barcode_type_coder);
+        unset($object->mode_reglement_id);
+        unset($object->cond_reglement_id);
+        unset($object->cond_reglement);
+        unset($object->fk_delivery_address);
+        unset($object->shipping_method_id);
+        unset($object->modelpdf);
+        unset($object->fk_account);
+        unset($object->note_public);
+        unset($object->note_private);
+        unset($object->fk_incoterms);
+        unset($object->libelle_incoterms);
+        unset($object->location_incoterms);
+        unset($object->name);
+        unset($object->lastname);
+        unset($object->firstname);
+        unset($object->civility_id);
+        unset($object->total_ht);
+        unset($object->total_tva);
+        unset($object->total_localtax1);
+        unset($object->total_localtax2);
+        unset($object->total_ttc);
+
+        return $object;
+    }
+
+}
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 083ab4bda3b..31a40e96669 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2015      Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2015		Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -55,7 +55,7 @@ $pagenext = $page + 1;
 if (! $sortorder) {  $sortorder="DESC"; }
 if (! $sortfield) {  $sortfield="d.lastname"; }
 
-$label=GETPOST("libelle","alpha");
+$label=GETPOST("label","alpha");
 $subscription=GETPOST("subscription","int");
 $vote=GETPOST("vote","int");
 $comment=GETPOST("comment");
@@ -93,17 +93,17 @@ if ($action == 'add' && $user->rights->adherent->configurer)
 	{
 		$object = new AdherentType($db);
 
-		$object->libelle        = trim($label);
-		$object->subscription   = (int) trim($subscription);
-		$object->note           = trim($comment);
-		$object->mail_valid     = (boolean) trim($mail_valid);
-		$object->vote           = (boolean) trim($vote);
+		$object->label			= trim($label);
+		$object->subscription	= (int) trim($subscription);
+		$object->note			= trim($comment);
+		$object->mail_valid		= (boolean) trim($mail_valid);
+		$object->vote			= (boolean) trim($vote);
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 		if ($ret < 0) $error++;
 
-		if ($object->libelle)
+		if ($object->label)
 		{
 			$id=$object->create($user);
 			if ($id > 0)
@@ -131,7 +131,7 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 	{
 		$object = new AdherentType($db);
 		$object->id             = $rowid;
-		$object->libelle        = trim($label);
+		$object->label        = trim($label);
 		$object->subscription   = (int) trim($subscription);
 		$object->note           = trim($comment);
 		$object->mail_valid     = (boolean) trim($mail_valid);
@@ -171,7 +171,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 {
 	//dol_fiche_head('');
 
-	$sql = "SELECT d.rowid, d.libelle, d.subscription, d.vote";
+	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.vote";
 	$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
 	$sql.= " WHERE d.entity IN (".getEntity().")";
 
@@ -180,11 +180,11 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 	{
 		$num = $db->num_rows($result);
 		$nbtotalofrecords = $num;
-		
+
 		$i = 0;
 
 		$param = '';
-		
+
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 		if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -193,14 +193,14 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
         print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-		
+
 	    print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
-	   
+
 		$moreforfilter = '';
-		
+
 		print '<div class="div-table-responsive">';
 		print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-		
+
 		print '<tr class="liste_titre">';
 		print '<th>'.$langs->trans("Ref").'</th>';
 		print '<th>'.$langs->trans("Label").'</th>';
@@ -214,7 +214,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 			$objp = $db->fetch_object($result);
 			print '<tr class="oddeven">';
 			print '<td><a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a></td>';
-			print '<td>'.dol_escape_htmltag($objp->libelle).'</td>';
+			print '<td>'.dol_escape_htmltag($objp->label).'</td>';
 			print '<td align="center">'.yn($objp->subscription).'</td>';
 			print '<td align="center">'.yn($objp->vote).'</td>';
 			if ($user->rights->adherent->configurer)
@@ -226,7 +226,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 		}
 		print "</table>";
 		print '</div>';
-		
+
 		print '</form>';
 	}
 	else
@@ -256,7 +256,7 @@ if ($action == 'create')
 	print '<table class="border" width="100%">';
 	print '<tbody>';
 
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="libelle" size="40"></td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
 	print $form->selectyesno("subscription",1,1);
@@ -316,10 +316,10 @@ if ($rowid > 0)
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/type.php">'.$langs->trans("BackToList").'</a>';
 
 		dol_banner_tab($object, 'rowid', $linkback);
-		
+
 		print '<div class="fichecenter">';
 		print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border" width="100%">';
 
 		print '<tr><td class="titlefield">'.$langs->trans("SubscriptionRequired").'</td><td>';
@@ -347,7 +347,7 @@ if ($rowid > 0)
 
 		print '</table>';
         print '</div>';
-        
+
 		dol_fiche_end();
 
 
@@ -460,7 +460,7 @@ if ($rowid > 0)
 		    {
 				$membertype=new AdherentType($db);
 		        $result=$membertype->fetch($type);
-				$titre.=" (".$membertype->libelle.")";
+				$titre.=" (".$membertype->label.")";
 		    }
 
 		    $param="&rowid=".$rowid;
@@ -478,12 +478,12 @@ if ($rowid > 0)
 
 			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input class="flat" type="hidden" name="rowid" value="'.$rowid.'" size="12"></td>';
-				
+
 			print '<br>';
             print_barre_liste('',$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
-		    
+
             $moreforfilter = '';
-            
+
             print '<div class="div-table-responsive">';
             print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -548,7 +548,7 @@ if ($rowid > 0)
 		        // Type
 		        /*print '<td class="nowrap">';
 		        $membertypestatic->id=$objp->type_id;
-		        $membertypestatic->libelle=$objp->type;
+		        $membertypestatic->label=$objp->type;
 		        print $membertypestatic->getNomUrl(1,12);
 		        print '</td>';
 				*/
@@ -613,7 +613,7 @@ if ($rowid > 0)
 		    print "</table>\n";
             print '</div>';
             print '</form>';
-            
+
 			if ($num > $conf->liste_limit)
 			{
 			    print_barre_liste('',$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'');
@@ -652,7 +652,7 @@ if ($rowid > 0)
 
 		print '<tr><td width="15%">'.$langs->trans("Ref").'</td><td>'.$object->id.'</td></tr>';
 
-		print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="libelle" size="40" value="'.dol_escape_htmltag($object->libelle).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
 
 		print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
 		print $form->selectyesno("subscription",$object->subscription,1);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 561504f7845..46eed944460 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -429,23 +429,23 @@ class Form
         if ($direction > 0) { $extracss=($extracss?$extracss.' ':'').'inline-block'; $extrastyle='padding: 0px; padding-right: 3px !important;'; }
 
         $classfortooltip='classfortooltip';
-        
+
         $s='';$textfordialog='';
-        
+
         $htmltext=str_replace('"',"&quot;",$htmltext);
-        if ($tooltiptrigger != '') 
+        if ($tooltiptrigger != '')
         {
             $classfortooltip='classfortooltiponclick';
             $textfordialog.='<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';
         }
-        if ($tooltipon == 2 || $tooltipon == 3) 
+        if ($tooltipon == 2 || $tooltipon == 3)
         {
             $paramfortooltipimg=' class="'.$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'"';
             if ($tooltiptrigger == '') $paramfortooltipimg.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on img tag to store tooltip
             else $paramfortooltipimg.=' dolid="'.$tooltiptrigger.'"';
         }
         else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
-        if ($tooltipon == 1 || $tooltipon == 3) 
+        if ($tooltipon == 1 || $tooltipon == 3)
         {
             $paramfortooltiptd=' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" ';
             if ($tooltiptrigger == '') $paramfortooltiptd.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
@@ -496,7 +496,7 @@ class Form
 
         $alt = '';
         if ($tooltiptrigger) $alt=$langs->trans("ClickToShowHelp");
-        
+
         //For backwards compatibility
         if ($type == '0') $type = 'info';
         elseif ($type == '1') $type = 'help';
@@ -577,16 +577,16 @@ class Form
     	  				jQuery(".massaction").hide();
     	            }
         		}
-    
+
         	jQuery(document).ready(function () {
         		initCheckForSelect();
         		jQuery(".checkforselect").click(function() {
         			initCheckForSelect();
     	  		});
     	  		jQuery(".massactionselect").change(function() {
-        			var massaction = $( this ).val();  
+        			var massaction = $( this ).val();
         			var urlform = $( this ).closest("form").attr("action").replace("#show_files","");
-        			if (massaction == "builddoc") 
+        			if (massaction == "builddoc")
                     {
                         urlform = urlform + "#show_files";
     	            }
@@ -1034,7 +1034,7 @@ class Form
     {
         global $conf,$user,$langs;
 
-        $out=''; 
+        $out='';
         $num=0;
         $outarray=array();
 
@@ -1077,7 +1077,7 @@ class Form
         if ($resql)
         {
 			$events = null;
-			
+
            	if ($conf->use_javascript_ajax && ! $forcecombo)
             {
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
@@ -3450,7 +3450,7 @@ class Form
             $cat = new Categorie($this->db);
             $cate_arbo = $cat->get_full_arbo($type,$excludeafterid);
 		}
-		
+
         $output = '<select class="flat" name="'.$htmlname.'">';
 		$outarray=array();
         if (is_array($cate_arbo))
@@ -4178,7 +4178,7 @@ class Form
                 }
                 print '</div>';
             }
-            if ($more) 
+            if ($more)
             {
                 print '<div class="inline-block">';
                 print $more;
@@ -4923,7 +4923,7 @@ class Form
      *	@param  int	$iSecond  		    Default preselected duration (number of seconds or '')
      * 	@param	int	$disabled           Disable the combo box
      * 	@param	string	$typehour		If 'select' then input hour and input min is a combo,
-     *						            if 'text' input hour is in text and input min is a text, 
+     *						            if 'text' input hour is in text and input min is a text,
      *						            if 'textselect' input hour is in text and input min is a combo
      *  @param	integer	$minunderhours	If 1, show minutes selection under the hours
      * 	@param	int	$nooutput		    Do not output html string but return it
@@ -4968,7 +4968,7 @@ class Form
 
         if ($typehour!='text') $retstring.=' '.$langs->trans('HourShort');
         else $retstring.=':';
-        
+
         // Minutes
         if ($minunderhours) $retstring.='<br>';
         else $retstring.="&nbsp;";
@@ -4988,7 +4988,7 @@ class Form
         {
         	$retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat maxwidth50" value="'.(($minSelected != '')?((int) $minSelected):'').'">';
         }
-        
+
         if ($typehour!='text') $retstring.=' '.$langs->trans('MinuteShort');
 
         //$retstring.="&nbsp;";
@@ -5594,7 +5594,7 @@ class Form
 		{
     		$listofidcompanytoscan=$object->thirdparty->id;
     		if (($object->thirdparty->parent > 0) && ! empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) $listofidcompanytoscan.=','.$object->thirdparty->parent;
-    		
+
     		$possiblelinks=array(
     		    'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('propal',1).')'),
     		    'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande',1).')'),
@@ -5606,7 +5606,7 @@ class Form
     		    'invoice_supplier'=>array('enabled'=>$conf->fournisseur->facture->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture_fourn',1).')')
     		);
 		}
-		
+
 		global $action;
 
 		// Can complete the possiblelink array
@@ -5845,7 +5845,7 @@ class Form
 
         //print "paramid=$paramid,morehtml=$morehtml,shownav=$shownav,$fieldid,$fieldref,$morehtmlref,$moreparam";
         $object->load_previous_next_ref((isset($object->next_prev_filter)?$object->next_prev_filter:''),$fieldid,$nodbprefix);
-        
+
         $navurl = $_SERVER["PHP_SELF"];
         // Special case for project/task page
         if ($paramid == 'project_ref')
@@ -5902,11 +5902,15 @@ class Form
 		}
 		else if (in_array($object->element, array('action', 'agenda')))
 		{
-		    $ret.=$object->ref.'<br>'.$object->label;    
+		    $ret.=$object->ref.'<br>'.$object->label;
+		}
+		else if (in_array($object->element, array('adherent_type')))
+		{
+			$ret.=$object->label;
 		}
 		else if ($fieldref != 'none') $ret.=dol_htmlentities($object->$fieldref);
-		
-		
+
+
 		if ($morehtmlref)
 		{
 		    $ret.=' '.$morehtmlref;
@@ -6207,7 +6211,7 @@ class Form
         return $out;
     }
 
-    
+
     /**
      *	Return HTML to show the search and clear seach button
      *
@@ -6216,7 +6220,7 @@ class Form
     function showFilterButtons()
     {
         global $conf, $langs;
-    
+
         $out='<div class="nowrap">';
         $out.='<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
         $out.='<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
@@ -6235,7 +6239,7 @@ class Form
     function showCheckAddButtons($cssclass='checkforaction', $calljsfunction=0)
     {
         global $conf, $langs;
-    
+
         $out='';
         if (! empty($conf->use_javascript_ajax)) $out.='<div class="inline-block checkallactions"><input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions"></div>';
         $out.='<script type="text/javascript">
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9ecfdc037f3..992827006da 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -102,14 +102,14 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
 /**
  * 	Get list of entity id to use
  *
- * 	@param	string	$element	Current element 
- *                              'societe', 'socpeople', 'actioncomm', 'agenda', 'resource', 
+ * 	@param	string	$element	Current element
+ *                              'societe', 'socpeople', 'actioncomm', 'agenda', 'resource',
  *                              'product', 'productprice', 'stock',
  *                              'propal', 'supplier_proposal', 'facture', 'facture_fourn',
- *                              'categorie', 'bank_account', 'bank_account', 'adherent', 'user',  
+ *                              'categorie', 'bank_account', 'bank_account', 'adherent', 'user',
  *                              'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
  *                              'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
- *                              'email_template', 'event',  
+ *                              'email_template', 'event',
  * 	@param	int		$shared		0=Return id of entity, 1=Return id entity + shared entities
  * 	@return	mixed				Entity id(s) to use
  */
@@ -121,7 +121,7 @@ function getEntity($element=false, $shared=0)
 	if ($element == 'actioncomm') $element='agenda';
 	if ($element == 'fichinter')  $element='intervention';
 	if ($element == 'categorie')  $element='category';
-	
+
 	if (is_object($mc))
 	{
 		return $mc->getEntity($element, $shared);
@@ -240,7 +240,7 @@ function dol_shutdown()
  *  Return value of a param into GET or POST supervariable.
  *  Use the property $user->default_values[path]['creatform'] and/or $user->default_values[path]['filters'] and/or $user->default_values[path]['sortorder']
  *  Note: The property $user->default_values is loaded by the main when loading the user.
- *  
+ *
  *  @param	string	$paramname   Name of parameter to found
  *  @param	string	$check	     Type of check
  *                                  ''=no check (deprecated)
@@ -257,29 +257,29 @@ function dol_shutdown()
  *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
  *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'.
  *  @return string|string[]      Value found (string or array), or '' if check fails
- *  
+ *
  *  @TODO Set default value for check to alpha. Check all WYSIWYG edition (email and description...) is still ok with rich text.
  */
 function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 {
     global $mysoc,$user,$conf;
-    
+
     if (empty($paramname)) return 'BadFirstParameterForGETPOST';
-        
+
     if (empty($method)) $out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
 	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
 	elseif ($method==2) $out = isset($_POST[$paramname])?$_POST[$paramname]:'';
 	elseif ($method==3) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:'');
 	elseif ($method==4) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:(isset($_COOKIE[$paramname])?$_COOKIE[$paramname]:''));
 	else return 'BadThirdParameterForGETPOST';
-	
+
 	if (empty($method) || $method == 3 || $method == 4)
 	{
     	$relativepathstring = $_SERVER["PHP_SELF"];
     	if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
     	$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
     	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-	
+
         // Code for search criteria persistence.
     	// Retrieve values if restore_lastsearch_values is set and there is saved values
     	if (! empty($_GET['restore_lastsearch_values']) && ! empty($_SESSION['lastsearch_values_'.$relativepathstring]))        // Keep $_GET here
@@ -347,16 +347,16 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	            }
 	        }
 	    }
-	    
-	}	
-	
+
+	}
+
 	if (empty($check) && ! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
-	   dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param not defined, when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);    
+	   dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param not defined, when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);
 	   // Enable this line to know who call the GETPOST with empty $check parameter.
 	   //var_dump(debug_backtrace()[0]);
 	}
-	
+
 	if (! empty($check))
 	{
 	    // Replace vars like __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__, ...
@@ -457,7 +457,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	        // We save search key only if:
 	        // - not empty, or
 	        // - if value is empty and a default value exists that is not empty (it means we did a filter to an empty value when default was not).
-	        
+
 	        //if (! empty($out) || ! empty($user->default_values[$relativepathstring]['filters'][$paramname]))
 	        if (! empty($out))
 	        {
@@ -465,7 +465,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 	        }
 	    }
 	}
-	
+
 	return $out;
 }
 
@@ -475,13 +475,13 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
  *  This prefix is unique for instance and avoid conflict between multi-instances,
  *  even when having two instances with one root dir or two instances in virtual servers.
  *
- *  @param  string  $mode       '' (prefix for session name) or 'email' (prefix for email id)              
+ *  @param  string  $mode       '' (prefix for session name) or 'email' (prefix for email id)
  *  @return	string      		A calculated prefix
  */
 function dol_getprefix($mode='')
 {
     global $conf;
-    
+
     // If MAIL_PREFIX_FOR_EMAIL_ID is set and prefix is for email
     if ($mode == 'email' && ! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
     {
@@ -629,7 +629,7 @@ function dol_clone($object)
 
 	//$myclone = clone $object;                    // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable
 	$myclone=unserialize(serialize($object));
-	    
+
 	return $myclone;
 }
 
@@ -1134,7 +1134,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	global $conf, $form, $user, $langs;
 
 	$error = 0;
-	
+
 	$maxvisiblephotos=1;
 	$showimage=1;
 	$showbarcode=empty($conf->barcode->enabled)?0:($object->barcode?1:0);
@@ -1206,7 +1206,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                     $fileimage = $file.'_preview.png';              // If PDF has 1 page
                     $fileimagebis = $file.'_preview-0.png';         // If PDF has more than one page
                     $relativepathimage = $relativepath.'_preview.png';
-                    
+
                     // Si fichier PDF existe
                     if (file_exists($file))
                     {
@@ -1249,7 +1249,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                     $morehtmlleft.='</div>';
                 }
             }
-            
+
             if (! $phototoshow && $conf->browser->layout != 'phone')      // Show No photo link (picto of pbject)
             {
                 $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">';
@@ -1271,12 +1271,12 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
             }
         }
 	}
-	
+
 	if ($showbarcode) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
-	
+
 	if ($object->element == 'societe')
 	{
-	    if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) 
+	    if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE))
     	{
 	       	$morehtmlstatus.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
     	}
@@ -1303,7 +1303,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	    if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye);
 		$morehtmlstatus.=$tmptxt;
 	}
-	elseif ($object->element == 'contrat' || $object->element == 'contract') 
+	elseif ($object->element == 'contrat' || $object->element == 'contract')
 	{
         if ($object->statut==0) $morehtmlstatus.=$object->getLibStatut(2);
         else $morehtmlstatus.=$object->getLibStatut(4);
@@ -1314,14 +1314,14 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 		$morehtmlstatus.=$tmptxt;
 	}
 	if (! empty($object->name_alias)) $morehtmlref.='<div class="refidno">'.$object->name_alias.'</div>';      // For thirdparty
-	
+
 	// Add label
 	if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task')
 	{
 		if (! empty($object->label)) $morehtmlref.='<div class="refidno">'.$object->label.'</div>';
 	}
-	
-	if ($object->element != 'product' && $object->element != 'bookmark') 
+
+	if ($object->element != 'product' && $object->element != 'bookmark')
 	{
     	$morehtmlref.='<div class="refidno">';
     	$morehtmlref.=$object->getBannerAddress('refaddress',$object);
@@ -1333,7 +1333,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 		$morehtmlref.=$langs->trans("TechnicalID").': '.$object->id;
 		$morehtmlref.='</div>';
 	}
-	
+
 	print '<div class="'.($onlybanner?'arearefnobottom ':'arearef ').'heightref valignmiddle" width="100%">';
 	print $form->showrefnav($object, $paramid, $morehtml, $shownav, $fieldid, $fieldref, $morehtmlref, $moreparam, $nodbprefix, $morehtmlleft, $morehtmlstatus, $morehtmlright);
 	print '</div>';
@@ -3095,7 +3095,7 @@ function info_admin($text, $infoonimgalt = 0, $nodiv=0, $admin='1')
 	{
 		return img_picto($text, 'info', 'class="hideonsmartphone"');
 	}
-	
+
 	return ($nodiv?'':'<div class="'.(empty($admin)?'':($admin=='1'?'info':$admin)).' hideonsmartphone">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin?$langs->trans('InfoAdmin'):$langs->trans('Note')).'"></span> '.$text.($nodiv?'':'</div>');
 }
 
@@ -3293,7 +3293,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 	$field1=trim($tmpfield[0]);            // If $field is 'd.datep,d.id', it becomes 'd.datep'
 
 	//var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);
-	
+
 	// If field is used as sort criteria we use a specific css class liste_titre_sel
 	// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
 	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./","",$field1))) $out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
@@ -3441,7 +3441,7 @@ function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png',
  *	@param	string	    $options         	More parameters for links ('' by default, does not include sortfield neither sortorder)
  *	@param	string    	$sortfield       	Field to sort on ('' by default)
  *	@param	string	    $sortorder       	Order to sort ('' by default)
- *	@param	string	    $center          	String in the middle ('' by default). We often find here string $massaction comming from $form->selectMassAction() 
+ *	@param	string	    $center          	String in the middle ('' by default). We often find here string $massaction comming from $form->selectMassAction()
  *	@param	int		    $num				Number of records found by select with limit+1
  *	@param	int|string  $totalnboflines		Total number of records/lines for all pages (if known). Use a negative value of number to not show number. Use '' if unknown.
  *	@param	string	    $picto				Icon to use before title (should be a 32x32 transparent png file)
@@ -3965,7 +3965,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller
 	{
 	    $conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY = 1;
 	}
-	    
+
 	// Search local taxes
 	if (! empty($conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY))
 	{
@@ -4210,7 +4210,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 /**
  *	Return vat rate of a product in a particular selling country or default country vat if product is unknown
  *  Function called by get_default_tva
- *  
+ *
  *  @param	int			$idprod          	Id of product or 0 if not a predefined product
  *  @param  Societe		$thirdparty_seller  Thirdparty with a ->country_code defined (FR, US, IT, ...)
  *	@param	int			$idprodfournprice	Id product_fournisseur_price (for "supplier" order/invoice)
@@ -4248,7 +4248,7 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 		}
 		else
 		{
-			// TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet. 
+			// TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.
 			// May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on
 		}
 	}
@@ -5020,9 +5020,9 @@ function make_substitutions($text, $substitutionarray, $outputlangs=null)
 	global $conf, $langs;
 
 	if (! is_array($substitutionarray)) return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
-	
+
 	if (empty($outputlangs)) $outputlangs=$langs;
-	
+
 	// Make substitution for language keys
 	if (is_object($outputlangs))
 	{
@@ -5030,10 +5030,10 @@ function make_substitutions($text, $substitutionarray, $outputlangs=null)
 		{
 			$msgishtml = 0;
 			if (dol_textishtml($text,1)) $msgishtml = 1;
-			$text = preg_replace('/__\('.preg_quote($reg[1]).'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text);	
+			$text = preg_replace('/__\('.preg_quote($reg[1]).'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text);
 		}
 	}
-		
+
 	// Make substitition for array $substitutionarray
 	foreach ($substitutionarray as $key => $value)
 	{
@@ -5046,7 +5046,7 @@ function make_substitutions($text, $substitutionarray, $outputlangs=null)
 
 /**
  *  Complete the $substitutionarray with more entries.
- *  Can also add substitution keys coming from external module that had set the "substitutions=1" into module_part array. In this case, method completesubstitutionarray provided by module is called. 
+ *  Can also add substitution keys coming from external module that had set the "substitutions=1" into module_part array. In this case, method completesubstitutionarray provided by module is called.
  *
  *  @param  array		$substitutionarray		Array substitution old value => new value value
  *  @param  Translate	$outputlangs            Output language
@@ -5067,7 +5067,7 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
 	{
 		// TODO
 	}
-	
+
 	// Add a substitution key for each extrafields, using key __EXTRA_XXX__
 	if (is_object($object) && is_array($object->array_options))
 	{
@@ -5079,7 +5079,7 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
 			$substitutionarray['%EXTRA_'.$keyshort.'%']=$val;
 		}
 	}
-	
+
 	// Check if there is external substitution to do, requested by plugins
 	$dirsubstitutions=array_merge(array(),(array) $conf->modules_parts['substitutions']);
 
@@ -5615,8 +5615,8 @@ function dol_eval($s, $returnvalue=0, $hideerrors=1)
 	global $rights;
 	global $object;
 	global $mysoc;
-	
-	global $obj;       // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object      
+
+	global $obj;       // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object
 	global $soc;       // For backward compatibility
 
 	//print $s."<br>\n";
@@ -5827,7 +5827,7 @@ function printCommonFooter($zone='private')
     	           this.href=this.href+\'&page_y=\'+page_y;
     	           });'."\n";
     	print '});'."\n";
-    	
+
     	if (empty($conf->dol_use_jmobile))
     	{
         	print '<!-- Set handler to switch left menu page (menuhider) -->'."\n";
@@ -5837,7 +5837,7 @@ function printCommonFooter($zone='private')
         	print "  $('.login_block').toggle();";
         	print '});'."\n";
     	}
-    	
+
     	print '</script>'."\n";
 	}
 
@@ -6000,9 +6000,9 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
     {
     	$value=preg_replace('/([<>=]+)\s+([0-9'.preg_quote($langs->trans("DecimalSeparator"),'/').'\-])/','\1\2',$value);	// Clean string '< 10' into '<10' so we can the explode on space to get all tests to do
     }
-    
+
     $value = preg_replace('/\s*\|\s*/','|', $value);
-    
+
     $crits = explode(' ', $value);
     $res = '';
     if (! is_array($fields)) $fields = array($fields);
@@ -6125,7 +6125,7 @@ function getImageFileNameForSize($file, $extName, $extImgTarget='')
  *
  * @param   string    $modulepart     propal, facture, facture_fourn, ...
  * @param   string    $relativepath   Relative path of docs.
- * @param	int		  $alldata		  Return array with all components (1 is recommended, then use a simple a href link with the class, target and mime attribute added. 'documentpreview' css class is handled by jquery code into main.inc.php)  
+ * @param	int		  $alldata		  Return array with all components (1 is recommended, then use a simple a href link with the class, target and mime attribute added. 'documentpreview' css class is handled by jquery code into main.inc.php)
  * @param	string	  $param		  More param on http links
  * @return  string|array              Output string with href link or array with all components of link
  */
@@ -6139,8 +6139,8 @@ function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata=0, $param=''
     //$mime_preview[]='vnd.oasis.opendocument.presentation';
     //$mime_preview[]='archive';
     $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);
- 
-    if ($alldata == 1) 
+
+    if ($alldata == 1)
     {
     	if ($num_mime !== false) return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath), 'mime'=>dol_mimetype($relativepath), );
     	else return array();

From 954670731d69009b4c3ed7589fc52d6831ff838a Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 25 May 2017 09:05:19 +0200
Subject: [PATCH 0942/1163] Fix: changelog

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 68e9674d0da..c76617b2f8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 6.0.0 compared to 5.0.* *****
 
+For developers:
+NEW: Add a lot of API REST: dictionaryevents, memberstypes, ...
+
 WARNING: 
 
 Following changes may create regression for some external modules, but were necessary to make Dolibarr better:

From 74e9b9bf0a6a5015e5995d9cac8e9006b7c99ade Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 25 May 2017 13:48:30 +0200
Subject: [PATCH 0943/1163] Fix: Wrong path for external module API REST

---
 htdocs/api/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index fa96da6b139..1e04590da14 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
+/* Copyright (C) 2015	Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2017	Regis Houssin			<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -143,10 +144,9 @@ foreach ($modulesdir as $dir)
                      *
                      * Search files named api_<object>.class.php into /htdocs/<module>/class directory
                      *
-                     * @todo : take care of externals module!
                      * @todo : use getElementProperties() function ?
                      */
-                    $dir_part = DOL_DOCUMENT_ROOT.'/'.$moduledirforclass.'/class/';
+                    $dir_part = dol_buildpath('/'.$moduledirforclass.'/class/');
 
                     $handle_part=@opendir(dol_osencode($dir_part));
                     if (is_resource($handle_part))

From 9dfc8a9dc8e735a637fa0f4f53c24d4d04644619 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Thu, 25 May 2017 19:13:13 +0200
Subject: [PATCH 0944/1163] fix : bad link

---
 htdocs/core/lib/accounting.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index c8863ce8f61..ab28cb997ed 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -41,7 +41,7 @@ function admin_accounting_prepare_head(AccountingAccount $object=null)
 	$head[$h][2] = 'general';
 	$h ++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/journals.php';
+	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/journal.php';
 	$head[$h][1] = $langs->trans("Journaux");
 	$head[$h][2] = 'journal';
 	$h ++;

From ca08f814c1ded69a054fab469c7dc7615f2e71b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 May 2017 19:38:42 +0200
Subject: [PATCH 0945/1163] Remove deprecated files

---
 htdocs/install/fileconf.php         |  40 ++++++++++++++--------------
 htdocs/theme/common/ical.gif        | Bin 460 -> 0 bytes
 htdocs/theme/common/information.png | Bin 4180 -> 0 bytes
 htdocs/theme/common/rss.gif         | Bin 476 -> 0 bytes
 htdocs/theme/common/vcal.gif        | Bin 1079 -> 0 bytes
 htdocs/theme/login_background.png   | Bin 79 -> 0 bytes
 6 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 htdocs/theme/common/ical.gif
 delete mode 100644 htdocs/theme/common/information.png
 delete mode 100644 htdocs/theme/common/rss.gif
 delete mode 100644 htdocs/theme/common/vcal.gif
 delete mode 100644 htdocs/theme/login_background.png

diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index cdd639ad50b..424126b63b6 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -86,7 +86,7 @@ if (! is_writable($conffile))
 
 if (! empty($force_install_message))
 {
-    print '<div><table><tr><td valign="middle"><img src="../theme/common/information.png" style="height:40px;"></td><td valign="middle">'.$langs->trans($force_install_message).'</td></tr></table>';
+    print '<div><br>'.$langs->trans($force_install_message).'</div>';
 
     /*print '<script type="text/javascript">';
     print '	jQuery(document).ready(function() {
@@ -125,7 +125,7 @@ if (! empty($force_install_message))
 		$dolibarr_main_document_root = detect_dolibarr_main_document_root();
 	}
 	?>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="text"
 			       class="minwidth300"
 			       value="<?php print $dolibarr_main_document_root ?>"
@@ -156,7 +156,7 @@ if (! empty($force_install_message))
 			$dolibarr_main_data_root = detect_dolibarr_main_data_root($dolibarr_main_document_root);
 		}
 		?>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="text"
 			       class="minwidth300"
 			       value="<?php print $dolibarr_main_data_root ?>"
@@ -210,7 +210,7 @@ if (! empty($force_install_message))
 	    ?>
 	<tr>
 		<td class="tdtop label"><?php echo $langs->trans("ForceHttps"); ?></td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="checkbox"
 			       name="main_force_https"
 				<?php if (!empty($force_install_mainforcehttps)) {
@@ -238,9 +238,9 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr>
-		<td class="label" valign="top"><b> <?php echo $langs->trans("DatabaseName"); ?>
+		<td class="label tdtop"><b> <?php echo $langs->trans("DatabaseName"); ?>
 		</b></td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="text" id="db_name"
 			       name="db_name"
 			       value="<?php echo (!empty($dolibarr_main_db_name)) ? $dolibarr_main_db_name : ($force_install_database ? $force_install_database : 'dolibarr'); ?>"
@@ -371,9 +371,9 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr class="hidesqlite">
-		<td class="label" valign="top"><?php echo $langs->trans("DatabasePrefix"); ?>
+		<td class="label tdtop"><?php echo $langs->trans("DatabasePrefix"); ?>
 		</td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="text" id="db_prefix"
 			       name="db_prefix"
 			       value="<?php echo(!empty($force_install_prefix) ? $force_install_prefix : (!empty($dolibarr_main_db_prefix) ? $dolibarr_main_db_prefix : 'llx_')); ?>"
@@ -386,9 +386,9 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr class="hidesqlite">
-		<td class="label" valign="top"><?php echo $langs->trans("CreateDatabase"); ?>
+		<td class="label tdtop"><?php echo $langs->trans("CreateDatabase"); ?>
 		</td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="checkbox"
 			       id="db_create_database"
 			       name="db_create_database"
@@ -405,9 +405,9 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr class="hidesqlite">
-		<td class="label" valign="top"><b><?php echo $langs->trans("Login"); ?></b>
+		<td class="label tdtop"><b><?php echo $langs->trans("Login"); ?></b>
 		</td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="text" id="db_user"
 			       name="db_user"
 			       value="<?php print (!empty($force_install_databaselogin)) ? $force_install_databaselogin : $dolibarr_main_db_user; ?>"
@@ -420,9 +420,9 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr class="hidesqlite">
-		<td class="label" valign="top"><b><?php echo $langs->trans("Password"); ?></b>
+		<td class="label tdtop"><b><?php echo $langs->trans("Password"); ?></b>
 		</td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="password" id="db_pass" autocomplete="off"
 			       name="db_pass"
 			       value="<?php
@@ -442,9 +442,9 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr class="hidesqlite">
-		<td class="label" valign="top"><?php echo $langs->trans("CreateUser"); ?>
+		<td class="label tdtop"><?php echo $langs->trans("CreateUser"); ?>
 		</td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="checkbox"
 			       id="db_create_user" name="db_create_user"
 				<?php if (!empty($force_install_createuser)) {
@@ -472,8 +472,8 @@ if (! empty($force_install_message))
 	</tr>
 
 	<tr class="hidesqlite hideroot">
-		<td class="label" valign="top"><b><?php echo $langs->trans("Login"); ?></b></td>
-		<td class="label" valign="top">
+		<td class="label tdtop"><b><?php echo $langs->trans("Login"); ?></b></td>
+		<td class="label tdtop">
 			<input type="text"
 			       id="db_user_root"
 			       name="db_user_root"
@@ -496,9 +496,9 @@ if (! empty($force_install_message))
 
 	</tr>
 	<tr class="hidesqlite hideroot">
-		<td class="label" valign="top"><b><?php echo $langs->trans("Password"); ?></b>
+		<td class="label tdtop"><b><?php echo $langs->trans("Password"); ?></b>
 		</td>
-		<td class="label" valign="top">
+		<td class="label tdtop">
 			<input type="password"
 			       autocomplete="off"
 			       id="db_pass_root"
diff --git a/htdocs/theme/common/ical.gif b/htdocs/theme/common/ical.gif
deleted file mode 100644
index 01cc8cde5643d5bde115b93b1df9b4ab09bd6c0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 460
zcmV;-0W<zbNk%v~VI%+!0Hpu`03QPYnHYiAodDDqLDpHq?9VW`VPVOJ0JAfJ>Wu*R
zA|To{;`rtuyi9T0hycGS0MQzu;I={CRLA_q((&4%@T!sIqX5nvQNwz1(vT3cMPcM`
z5XLhAcnbigJ(1h00Lvc$JOh~eoe<Y0QO|Gk{qqalGjZU9LA`Bp&XSSsn=su&vF5{3
z-DI)yxB$B=0L3E^x;_A`I8oGWFuYv=!Y0!9)^XL1ap!%)^2y@*<&oT}QQ=?!$RX18
z*Z=?kEC2ui03-ko000K@z=>!`EE<o<qe(GnI-k&}G}>WKn=8rc${kdjxRSVpwT*S#
z0Z+_xx=IqNRbnYoQl5pbltCRRC?EqBVi7P+Z-G!>O#~$@G7kwQ0v-<_92y`aB{~cx
zF^DCKPmBW+j|c;aFHR5;8zmn*B?l0zqk^SYr>VH4ZY3Bbk2Sx#PNt|Vs*?h`BO?oA
zV-3fPb1HT>19~M65*s!WVJs;rEF~!yZyzT(ILTIFV-Eu@6k|R#Il>4JGfEVA@P?W_
zFT5UjSm>b%3>qj5c#r`Cfrmo_V0chvkzqrGT?T*{8B$7z03lMUT*<Pf%a#Cw0027_
C5x2kq

diff --git a/htdocs/theme/common/information.png b/htdocs/theme/common/information.png
deleted file mode 100644
index 231d39426c5bfba6b3e7f9a4f955be2888251285..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4180
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

diff --git a/htdocs/theme/common/rss.gif b/htdocs/theme/common/rss.gif
deleted file mode 100644
index 16c96dd33756b3d48c6dadcf33eba9382e22316a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 476
zcmZ?wbhEHbRAJy_xXQqw$jA6$UDJnT)~gXLzrMVm@5p?AUeW(nlUie@w<kAVC^CN9
z;(RE8<>QqD|I-+rZ=U#nR`}C6mhTTP{4WxHu)OI%5Ueh~k|^^3;-=?&7k+>F;OC~M
z4>=<LYgGP!`|#o5LZCbYErH@s7FH1k1qL0EB_KaBu>Ex4PxH``>i0-?W-PRre_=(5
zmaED9_Fl1~2M*TLdR;%<owP9Q#j-<r`X{EDRXZFzVaojF>dtc-dc2~%B{^I?Qle~v
ze68ZG-F}(=*=!s<TurQkIs804+~SovBGb8fDkoO+WwY=K<*>~X$dy~t&A5e)X9C}(
znj%py))GNx$y||cLGj}o_Uv2T$<ZM+OIV7Nhm~8Dg@;{=k(HILi6{L+wg_uqXZHp!
z`I#~~++2<PtS?r*+Wk~iT<O6iWgRD`1lDs)n~EMZDl#%@1Ox~uHZgW?Y_r_ZQFzCg
lJCNl<r4hr_=1HpOEgUUBaW*kAB%PY$xp|rIY)1wLYXD|1m*oHe

diff --git a/htdocs/theme/common/vcal.gif b/htdocs/theme/common/vcal.gif
deleted file mode 100644
index 6ff53f5b7bc36a59f411b127bd521c735ba316d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1079
zcmW+#YfR2z6hAhXhUE5v-ZXieT)MEMXz7!=Wuy7xL$YCx+uH~W$*`ypo5pzN11;v#
za;drGlC@;UgA&>+w^Gxjx2q!Y_&xvU+u1qicRT<8!o>^b#I6pd5!6d$?9;|5W5gIX
zhHRy^(aLBsnvEvgRN5$Ilo-WEk)0K7L>UnyY=rD8Ys1R07-qu+BtzPeG9-rB5DH)e
z8dzAyG+7?|l-8m(YfY9Gl~P)XR;(3S6=;gmB3f7rSy7l}rCBtyW`ahnYEqg+6Keu1
zR09m6p%Svt12M1x4J<5^HDqf%QHqr!>kqW3M3k@+vUZ^YO%}zhnBX3wFsn!uu_D+*
z9*~J`!~y>h0f$fxFo=dqj6w&9femP2kxkCFQRA@)*&yK$w5XVc3Aw^9RG=xuLdX$G
zBLL{aID&>-M2S2g6WfRbnqU|Xp&DQijZMgc4iEzy&}2_!r_n}@N4OY*gg?-tVzM8H
z&DFWLZ8|5kF*{eWvrf=9btgN!>cnA>;5f8Mj%a%mM~4M=pz%52N(c|0Kot>E($)F*
zPI1T83%=;Es_7F81IMiMAIdRPYNNwyqQk0ZhE_}sE^r6tM!D}rPP!Ela$|DPsgQB|
zhYT7&FZzArybmiAKW|8`Pg&cLvAyYNW^?Yr=CdbTt`zvLU2ZFX&{bL9_4ajdV?$p@
zdw+Ur)1`c0^~)Z7`XRpu4uDY#hX%6$1o;{Io8nq@<9vChU%>INSw;C3*(2Qvxy{Gw
zA7}k|fAjv+QAzXDs3G>v?Eu&P4Da&qbvZAR6Lz{wZWTODJohN;D|HXM6y=(`)z^QZ
zC97yvLV9E1rspwZ*Ua~HQclI-0E*k~Z8+twZ4IhT^>+UZJ(9AqCVN@sq42`%;WZch
ztMfBYr+j+g@l}<^x3o`<+4pbTky%S(<cX&zZ*<zGo73X2B$nh&m>s$D*>kUMjrdTt
zWhwm%?CkcASXGwRG4j!#^-*<kJC=OwI2u-5Qdvx2Vuz>4&M5Qzczt5?>DJ)Vi)ZTl
zDkoq2csIN8$pP1j$mBaal3aO($Nl$|wl#Tnj(z;DsDIbtPjB`ny()Y7r?>s{^<jP#
F_aB}U9@GE;

diff --git a/htdocs/theme/login_background.png b/htdocs/theme/login_background.png
deleted file mode 100644
index facc2c6f4423ed902fc2c478068417b0a08bd823..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 79
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i0VEib+*$VkDKSqM#}JO|$v@5?VQ3MU)R^(@
c!9~Va2KP>Z?f!}q6F@3GUHx3vIVCg!0He_qmjD0&


From 1f3a8b507e604492a7c98f0a2e1d7da4c38afb1d Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Thu, 25 May 2017 22:02:57 +0200
Subject: [PATCH 0946/1163] missing translation

---
 htdocs/langs/en_US/accountancy.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 92fe19676c0..33434f03394 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -257,7 +257,7 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
-
+NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 

From 7a1480d362d1fc247f1d0234ec4d254a6a8858ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 May 2017 00:02:41 +0200
Subject: [PATCH 0947/1163] Look and feel v6

---
 htdocs/bookmarks/bookmarks.lib.php | 33 ++++++++----------------------
 htdocs/install/default.css         | 29 +++++++++++++++++---------
 htdocs/install/fileconf.php        | 12 +++++------
 htdocs/theme/eldy/style.css.php    |  3 ++-
 htdocs/theme/md/style.css.php      |  2 +-
 5 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index c1882ce4bf9..4df9b56979d 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -41,29 +41,15 @@ function printBookmarksList($aDb, $aLangs)
 	$langs->load("bookmarks");
 
 	$url= $_SERVER["PHP_SELF"].(! empty($_SERVER["QUERY_STRING"])?'?'.$_SERVER["QUERY_STRING"]:'');
-    // TODO Add post param to $url
     
 	$ret = '';
 	
 	// Menu bookmark
-	/*
-	$ret.= '<div class="menu_titre">';
-	$ret.= '<table class="nobordernopadding" width="100%" summary="bookmarkstable"><tr><td>';
-	$ret.= '<a class="vmenu" href="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</a>';
-	$ret.= '</td><td align="right">';
-	if ($user->rights->bookmark->creer)
-	{
-		$ret.= '<a class="vsmenu addbookmarkpicto" href="'.DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url).'">';
-		$ret.=img_object($langs->trans('AddThisPageToBookmarks'),'bookmark');
-		$ret.= '</a>';
-	}
-	$ret.= '</td></tr></table>';
-	$ret.= '</div>';
-    */
 	$ret.= '<div class="menu_top"></div>'."\n";
 
-	$ret.= '<!-- form with POST method by default --><form id="actionbookmark" name="actionbookmark" method="POST" action="">';
-	$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo">';
+	$ret.= '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";
+	$ret.= '<form id="actionbookmark" name="actionbookmark" method="POST" action="">';
+	$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo" alt="Bookmarks">';
 	$ret.= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
     $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'">'.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
 	// Url to go on create new bookmark page
@@ -77,19 +63,18 @@ function printBookmarksList($aDb, $aLangs)
 	{
 		$sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
 		$sql.= " WHERE (fk_user = ".$user->id." OR fk_user is NULL OR fk_user = 0)";
-        $sql.= " AND entity = ".$conf->entity;
+        $sql.= " AND entity IN (".getEntity('bookmarks',1).")";
 		$sql.= " ORDER BY position";
 		if ($resql = $db->query($sql) )
 		{
 			$i=0;
 			while ($i < $conf->global->BOOKMARKS_SHOW_IN_MENU && $obj = $db->fetch_object($resql))
 			{
-				//$ret.='<div class="menu_contenu">';
-			    $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_htmltag($obj->url).'">'.img_picto('','object_bookmark').' '.$obj->title.'</option>';
-				/*$ret.='<a class="vsmenu" title="'.$obj->title.'" href="'.$obj->url.'"'.($obj->target == 1?' target="_blank"':'').'>';
-				if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $ret.=' '.img_object('','bookmark').' ';
-				$ret.= dol_trunc($obj->title, 20).'</a><br>';*/
-				//$ret.='</div>';
+			    $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_htmltag($obj->url).'">';
+			    //$ret.='<span class="fa fa-print">aa</span>';
+			    $ret.=img_picto('','object_bookmark').' ';
+			    $ret.=$obj->title;
+			    $ret.='</option>';
 				$i++;
 			}
 		}
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index b3905e63a49..e23a36ddd21 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -289,11 +289,11 @@ div.comment {
 }
 
 h3 {
-	margin-top: 10px;
+	margin-top: 20px;
 	font-size:16px;
 	font-weight: normal;
-	color: #4965B3;
-	text-shadow: 1px 1px 1px #c0c0c0;
+	color: rgb(100,60,20);
+	/* text-shadow: 1px 1px 1px #c0c0c0; */
 }
 
 tr.bg1 {
@@ -345,15 +345,15 @@ ul {
 
 .button {
     background: #fcfcfc;
-    border: 1px solid #d0d0d0;
+    border: 1px solid #e0e0e0;
     padding: 0.3em 0.7em;
     margin: 0 0.5em;
-    -moz-border-radius:0 5px 0 5px;
-    -webkit-border-radius:0 5px 0 5px;
-    border-radius:0 5px 0 5px;
-    -moz-box-shadow: 2px 2px 3px #CCC;
-    -webkit-box-shadow: 2px 2px 3px #CCC;
-    box-shadow: 2px 2px 3px #CCC;
+    -moz-border-radius: 5px 5px 5px 5px;
+    -webkit-border-radius: 5px 5px 5px 5px;
+    border-radius: 5px 5px 5px 5px;
+    -moz-box-shadow: 2px 2px 3px #ddd;
+    -webkit-box-shadow: 2px 2px 3px #ddd;
+    box-shadow: 2px 2px 3px #ddd;
 }
 a.button:hover {
     text-decoration:none;
@@ -368,3 +368,12 @@ a.button:hover {
 .center {
     text-align: center;
 }
+
+.valignmiddle {
+	vertical-align: middle;
+}
+
+.valigntextbottom {
+	vertical-align: text-bottom;
+}
+
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 424126b63b6..c0a3aaf65fd 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -109,8 +109,8 @@ if (! empty($force_install_message))
 <table class="nobordernopadding<?php if ($force_install_noedit) print ' hidewhennoedit'; ?>">
 
 	<tr>
-		<td colspan="3" class="label" align="center">
-		<h3><?php echo $langs->trans("WebServer"); ?></h3>
+		<td colspan="3" class="label">
+		<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/globe.svg" width="20" alt="webserver"> <?php echo $langs->trans("WebServer"); ?></h3>
 		</td>
 	</tr>
 
@@ -232,8 +232,8 @@ if (! empty($force_install_message))
 	<!-- Dolibarr database -->
 
 	<tr>
-		<td colspan="3" class="label" align="center"><br>
-		<h3><?php echo $langs->trans("DolibarrDatabase"); ?></h3>
+		<td colspan="3" class="label"><br>
+		<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/database.svg" width="20" alt="webserver"> <?php echo $langs->trans("DolibarrDatabase"); ?></h3>
 		</td>
 	</tr>
 
@@ -466,8 +466,8 @@ if (! empty($force_install_message))
 	$force_install_databaserootpass = parse_database_pass($force_install_databaserootpass);
 	?>
 	<tr class="hidesqlite hideroot">
-		<td colspan="3" class="label" align="center"><br>
-		<h3><?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3>
+		<td colspan="3" class="label"><br>
+		<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/shield.svg" width="20" alt="webserver"> <?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3>
 		</td>
 	</tr>
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a8eddcd825f..3e995d83c83 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1782,7 +1782,7 @@ font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php p
 a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
 font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
 
-a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }
+a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; text-decoration: none; }
 
 .vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone, .vmenu div.blockvmenubookmarks
 {
@@ -1815,6 +1815,7 @@ div.blockvmenusearchphone
 }
 div.blockvmenubookmarks
 {
+	padding-top: 10px !important;
 	padding-bottom: 16px !important;
 }
 div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 943540fa02f..4fd3d736f04 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1805,7 +1805,7 @@ font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php p
 a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
 font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
 
-a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }
+a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #999; text-decoration: none; }
 
 div.blockvmenulogo
 {

From 95b2b1bd173c04ec427e48b0bd120aa92de86222 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 26 May 2017 10:28:10 +0200
Subject: [PATCH 0948/1163] Fix: for view special values

---
 htdocs/admin/modulehelp.php | 97 ++++++++++++++++++++++---------------
 1 file changed, 58 insertions(+), 39 deletions(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index d318566ff61..21e3afb3921 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2017  Laurent Destailleur     <eldy@users.sourceforge.net>
+/* Copyright (C) 2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2017	Regis Houssin			<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -68,7 +69,7 @@ llxHeader('',$langs->trans("Setup"),$help_url);
 print '<!-- Force style container -->'."\n".'<style>
 .id-container {
     width: 100%;
-} 
+}
 </style>';
 
 $arrayofnatures=array('core'=>$langs->transnoentitiesnoconv("Core"), 'external'=>$langs->transnoentitiesnoconv("External").' - '.$langs->trans("AllPublishers"));
@@ -165,6 +166,7 @@ foreach ($modulesdir as $dir)
 
 		    			            // Gives the possibility to the module, to provide his own family info and position of this family
 		    			            if (is_array($objMod->familyinfo) && !empty($objMod->familyinfo)) {
+		    			            	if (!is_array($familyinfo)) $familyinfo=array();
 		    			            	$familyinfo = array_merge($familyinfo, $objMod->familyinfo);
 		    			            	$familykey = key($objMod->familyinfo);
 		    			            } else {
@@ -305,13 +307,13 @@ if ($objMod->isCoreOrExternalModule() == 'external')
 
 // Define text of description of module
 $text='';
-   
+
 if ($mode == 'desc')
 {
     if ($moduledesc) $text.=$moduledesc.'<br><br>';
-    
+
     $text.='<strong>'.$langs->trans("Version").':</strong> '.$version;
-    
+
     $textexternal='';
     if ($objMod->isCoreOrExternalModule() == 'external')
     {
@@ -346,8 +348,8 @@ if ($mode == 'desc')
         $text.='<strong>'.$langs->trans("LastActivationIP").':</strong> ';
         $text.= $ip;
         $text.='<br>';
-    }    
-    
+    }
+
     $moduledesclong=$objMod->getDescLong();
     if ($moduledesclong) $text.='<br><hr><div class="moduledesclong">'.$moduledesclong.'<div>';
 }
@@ -360,9 +362,9 @@ if ($mode == 'feature')
     $text.='<br><strong>'.$langs->trans("RequiredBy").':</strong> ';
 	if (count($objMod->requiredby)) $text.=join(',', $objMod->requiredby);
 	else $text.=$langs->trans("None");
-	
+
     $text.='<br><br><br>';
-    
+
     $text.='<strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
     if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
     {
@@ -375,9 +377,9 @@ if ($mode == 'feature')
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
     if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
     {
@@ -389,9 +391,9 @@ if ($mode == 'feature')
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
     if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
     {
@@ -403,27 +405,27 @@ if ($mode == 'feature')
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddModels").':</strong> ';
     if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
     {
         $text.=$langs->trans("Yes");
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
     if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
     {
         $text.=$langs->trans("Yes");
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
     if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
     {
@@ -435,55 +437,72 @@ if ($mode == 'feature')
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
     if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
     {
         $text.=$langs->trans("Yes");
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddHooks").':</strong> ';
     if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
     {
-        $i=0;
-        foreach($objMod->module_parts['hooks'] as $val)
+    	$i=0;
+        foreach($objMod->module_parts['hooks'] as $key => $val)
         {
-            $text.=($i?', ':'').($val);
-            $i++;
+        	if ($key == 'entity') continue;
+
+        	// For special values
+        	if ($key == 'data')
+        	{
+        		if (is_array($val))
+        		{
+        			foreach($val as $value)
+        			{
+        				$text.=($i?', ':'').($value);
+        				$i++;
+        			}
+
+        			continue;
+        		}
+        	}
+
+        	$text.=($i?', ':'').($val);
+        	$i++;
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
     if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
     {
         $i=0;
         foreach($objMod->rights as $val)
         {
-            $text.=($i?', ':'').($val[1]);
-            $i++;
+        	$text.=($i?', ':'').($val[1]);
+        	$i++;
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddMenus").':</strong> ';
     if (isset($objMod->menu) && ! empty($objMod->menu)) // objMod can be an array or just an int 1
     {
         $text.=$langs->trans("Yes");
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
     if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
     {
@@ -495,9 +514,9 @@ if ($mode == 'feature')
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
     if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
     {
@@ -509,9 +528,9 @@ if ($mode == 'feature')
         }
     }
     else $text.=$langs->trans("No");
-    
+
     $text.='<br>';
-    
+
     $text.='<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
     $text.=$langs->trans("DetectionNotPossible");
 }

From ee2019ae37c307872781d2ab8350fb2cf49f93f8 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 26 May 2017 16:52:27 +0200
Subject: [PATCH 0949/1163] Fix: limit to 100 by default to avoid freeze

---
 .../action/class/api_agendaevents.class.php   | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 376df238a95..a056dccb865 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016   Laurent Destailleur     <eldy@users.sourceforge.net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -23,14 +23,14 @@
 /**
  * API class for Agenda Events
  *
- * @access protected 
+ * @access protected
  * @class  DolibarrApiAccess {@requires user,external}
  */
 class AgendaEvents extends DolibarrApi
 {
 
     /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object
      */
     static $FIELDS = array(
     );
@@ -40,7 +40,7 @@ class AgendaEvents extends DolibarrApi
      */
     public $actioncomm;
 
-    
+
     /**
      * Constructor
      */
@@ -55,61 +55,61 @@ class AgendaEvents extends DolibarrApi
      * Get properties of a Agenda Events object
      *
      * Return an array with Agenda Events informations
-     * 
+     *
      * @param       int         $id         ID of Agenda Events
      * @return 	    array|mixed             Data without useless information
 	 *
      * @throws 	RestException
      */
     function get($id)
-    {		
+    {
         if(! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
             throw new RestException(401, "Insuffisant rights to read an event");
         }
-        
+
         $result = $this->actioncomm->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'Agenda Events not found');
         }
-		
+
         if(! DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
             throw new RestException(401, "Insuffisant rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
         }
-        
+
 		if( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        
+
         $this->actioncomm->fetchObjectLinked();
 		return $this->_cleanObjectDatas($this->actioncomm);
     }
 
     /**
      * List Agenda Events
-     * 
+     *
      * Get a list of Agenda Events
-     * 
+     *
      * @param string	$sortfield	Sort field
      * @param string	$sortorder	Sort order
      * @param int		$limit		Limit for list
      * @param int		$page		Page number
      * @param string   	$user_ids   User ids filter field (owners of event). Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'%dol%') and (t.date_creation:<:'20160101')"
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'%dol%') and (t.datec:<:'20160101')"
      * @return  array               Array of Agenda Events objects
      */
-    function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 0, $page = 0, $user_ids = 0, $sqlfilters = '') {
+    function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '') {
         global $db, $conf;
-        
+
         $obj_ret = array();
 
         // case of external user
         $socid = 0;
-        if (! empty(DolibarrApiAccess::$user->societe_id)) $socid = DolibarrApiAccess::$user->societe_id;
-        
+        if (! empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
+
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
         if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-        
+
         $sql = "SELECT t.id as rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
         $sql.= ' WHERE t.entity IN ('.getEntity('agenda', 1).')';
@@ -121,7 +121,7 @@ class AgendaEvents extends DolibarrApi
             $sql .= " AND sc.fk_user = ".$search_sale;
         }
         // Add sql filters
-        if ($sqlfilters) 
+        if ($sqlfilters)
         {
             if (! DolibarrApi::_checkFilters($sqlfilters))
             {
@@ -130,7 +130,7 @@ class AgendaEvents extends DolibarrApi
 	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
-        
+
         $sql.= $db->order($sortfield, $sortorder);
         if ($limit)	{
             if ($page < 0)
@@ -143,7 +143,7 @@ class AgendaEvents extends DolibarrApi
         }
 
         $result = $db->query($sql);
-        
+
         if ($result)
         {
             $num = $db->num_rows($result);
@@ -181,7 +181,7 @@ class AgendaEvents extends DolibarrApi
       if(! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
 		      throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		  }
-		  
+
         // Check mandatory fields
         $result = $this->_validate($request_data);
 
@@ -198,18 +198,18 @@ class AgendaEvents extends DolibarrApi
         if ($this->actioncomm->create(DolibarrApiAccess::$user) < 0) {
             throw new RestException(500, "Error creating event", array_merge(array($this->actioncomm->error), $this->actioncomm->errors));
         }
-        
+
         return $this->actioncomm->id;
     }
 
-    
+
     /**
      * Update Agenda Event general fields (won't touch lines of expensereport)
      *
      * @param int   $id             Id of Agenda Event to update
-     * @param array $request_data   Datas   
-     * 
-     * @return int 
+     * @param array $request_data   Datas
+     *
+     * @return int
      */
     /*
     function put($id, $request_data = NULL) {
@@ -219,12 +219,12 @@ class AgendaEvents extends DolibarrApi
       if(! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
 		      throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		  }
-        
+
         $result = $this->expensereport->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'expensereport not found');
         }
-		
+
 		if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
@@ -232,19 +232,19 @@ class AgendaEvents extends DolibarrApi
             if ($field == 'id') continue;
             $this->expensereport->$field = $value;
         }
-        
+
         if($this->expensereport->update($id, DolibarrApiAccess::$user,1,'','','update'))
             return $this->get($id);
-        
+
         return false;
     }
     */
-        
+
     /**
      * Delete Agenda Event
      *
      * @param   int     $id         Agenda Event ID
-     * 
+     *
      * @return  array
      */
     function delete($id)
@@ -252,39 +252,39 @@ class AgendaEvents extends DolibarrApi
         if(! DolibarrApiAccess::$user->rights->agenda->myactions->delete) {
 			  throw new RestException(401, "Insuffisant rights to delete your Agenda Event");
 		}
-        
+
 		$result = $this->actioncomm->fetch($id);
-		  
+
         if(! DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
 		      throw new RestException(401, "Insuffisant rights to delete an Agenda Event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		}
-		
+
 		if( ! $result ) {
             throw new RestException(404, 'Agenda Event not found');
         }
-		
+
 		if( ! DolibarrApi::_checkAccessToResource('actioncomm',$this->actioncomm->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        
+
         if( ! $this->actioncomm->delete(DolibarrApiAccess::$user)) {
             throw new RestException(500, 'Error when delete Agenda Event : '.$this->actioncomm->error);
         }
-        
+
         return array(
             'success' => array(
                 'code' => 200,
                 'message' => 'Agenda Event deleted'
             )
         );
-        
+
     }
-    
+
     /**
      * Validate fields before create or update object
-     * 
+     *
      * @param   array           $data   Array with data to verify
-     * @return  array           
+     * @return  array
      * @throws  RestException
      */
     function _validate($data)
@@ -294,7 +294,7 @@ class AgendaEvents extends DolibarrApi
             if (!isset($data[$field]))
                 throw new RestException(400, "$field field missing");
             $event[$field] = $data[$field];
-            
+
         }
         return $event;
     }

From db9e068500f9242043d6a54c9285dfd1aa270748 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 26 May 2017 17:38:57 +0200
Subject: [PATCH 0950/1163] Fix: [Restler] Delete the cache file otherwise it
 does not update

---
 htdocs/api/admin/index.php | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index c22a12fee61..218ab58467e 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -43,12 +43,29 @@ if ($action == 'setproductionmode')
 
 	if (dolibarr_set_const($db, 'API_PRODUCTION_MODE', $status, 'chaine', 0, '', $conf->entity) > 0)
 	{
-	    $result = dol_mkdir($conf->api->dir_temp);
-	    if ($result < 0)
-	    {
-	        setEventMessages($langs->trans("ErrorFaildToCreateDir", $conf->api->dir_temp), null, 'errors');
-	    }
-	    else
+		$error=0;
+
+		if ($status == 1)
+		{
+			$result = dol_mkdir($conf->api->dir_temp);
+			if ($result < 0)
+			{
+				setEventMessages($langs->trans("ErrorFailedToCreateDir", $conf->api->dir_temp), null, 'errors');
+				$error++;
+			}
+		}
+		else
+		{
+			// Delete the cache file otherwise it does not update
+			$result = dol_delete_file($conf->api->dir_temp.'/routes.php');
+			if ($result < 0)
+			{
+				setEventMessages($langs->trans("ErrorFailedToDeleteFile", $conf->api->dir_temp.'/routes.php'), null, 'errors');
+				$error++;
+			}
+		}
+
+	    if (!$error)
 	    {
     		header("Location: ".$_SERVER["PHP_SELF"]);
 	   	    exit;

From 1711107420dcaeea69c75e6a19ebac3ad457826d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 27 May 2017 07:11:17 +0200
Subject: [PATCH 0951/1163] FIX : colspan in bank entries

---
 htdocs/compta/bank/bankentries.php | 86 ++++++++++++++----------------
 1 file changed, 39 insertions(+), 47 deletions(-)

diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index fd3c1ec9825..2598d1659d0 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -3,8 +3,8 @@
  * Copyright (C) 2004-2016  Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010  Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012       Vinícius Nogueira    <viniciusvgn@gmail.com>
- * Copyright (C) 2014       Florian Henry    	 <florian.henry@open-cooncept.pro>
- * Copyright (C) 2015       Jean-François Ferry	 <jfefe@aternatik.fr>
+ * Copyright (C) 2014       Florian Henry        <florian.henry@open-cooncept.pro>
+ * Copyright (C) 2015       Jean-François Ferry  <jfefe@aternatik.fr>
  * Copyright (C) 2016       Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2017       Alexandre Spangaro   <aspangaro@zendsi.com>
  *
@@ -195,7 +195,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 	$search_num_releve='';
 	$search_conciliated='';
 	$thirdparty='';
-	
+
 	$account="";
 	if ($id > 0 || ! empty($ref)) $account=$object->id;
 }
@@ -436,7 +436,6 @@ if ($id > 0 || ! empty($ref))
                 print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
             }
         }
-    
         print '</div>';
     }
 }
@@ -548,9 +547,9 @@ if ($resql)
 {
 	$var=True;
 	$num = $db->num_rows($resql);
-	
+
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
     // List of mass actions available
     $arrayofmassactions =  array(
         //'presend'=>$langs->trans("SendByMail"),
@@ -559,16 +558,14 @@ if ($resql)
     //if ($user->rights->bank->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
     if ($massaction == 'presend') $arrayofmassactions=array();
     $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-    
-    
+
     // Confirmation delete
     if ($action == 'delete')
     {
         $text=$langs->trans('ConfirmDeleteTransaction');
         print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&rowid='.GETPOST("rowid"), $langs->trans('DeleteTransaction'), $text, 'confirm_delete', null, '', 1);
     }
-    
-    
+
     // Lines of title fields
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="search_form">'."\n";
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -582,7 +579,7 @@ if ($resql)
 	print '<input type="hidden" name="id" value="'.$id.'">';
 	print '<input type="hidden" name="ref" value="'.$ref.'">';
 	if (GETPOST('bid')) print '<input type="hidden" name="bid" value="'.GETPOST("bid").'">';
-	
+
 	// Form to reconcile
 	if ($user->rights->banque->consolidate && $action == 'reconcile')
 	{
@@ -657,11 +654,10 @@ if ($resql)
     	});
     });
     </script>
-    	
-    ';	
-	
+    ';
+
 	$i = 0;
-	
+
 	// Title
 	$bankcateg=new BankCateg($db);
 	$morehtml='<div data-role="fieldcontain">';
@@ -669,7 +665,7 @@ if ($resql)
 	$morehtml.='<input type="text" name="pageplusone" id="pageplusone" size="1" class="flat" value="'.($page+1).'">';
 	$morehtml.='/'.$nbtotalofpages.' ';
 	$morehtml.='</div>';
-	
+
 	$picto='title_bank';
 	if ($id > 0 || ! empty($ref)) $picto='';
 	if (GETPOST("bid"))
@@ -681,13 +677,12 @@ if ($resql)
 	{
 		print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit);
 	}
-	
+
 	// We can add page now to param
 	if ($page != '') $param.='&page='.urlencode($page);
-	
-	
+
 	$moreforfilter = '';
-	
+
 	$moreforfilter.='<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('DateOperationShort').' : ';
 	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout=='phone'?' centpercent':'').' inline-block">'.$langs->trans('From') . ' ';
@@ -695,7 +690,7 @@ if ($resql)
 	//$moreforfilter .= ' - ';
 	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout=='phone'?' centpercent':'').' inline-block">'.$langs->trans('to') . ' ' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0, 1).'</div>';
 	$moreforfilter .= '</div>';
-	
+
 	$moreforfilter.='<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('DateValueShort').' : ';
 	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout=='phone'?' centpercent':'').' inline-block">'.$langs->trans('From') . ' ';
@@ -703,7 +698,7 @@ if ($resql)
 	//$moreforfilter .= ' - ';
 	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout=='phone'?' centpercent':'').' inline-block">'.$langs->trans('to') . ' ' . $form->select_date($search_dv_end, 'search_end_dv', 0, 0, 1, "search_form", 1, 0, 1).'</div>';
 	$moreforfilter .= '</div>';
-	
+
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
@@ -715,10 +710,10 @@ if ($resql)
 		print $moreforfilter;
 		print '</div>'."\n";
 	}
-	
+
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -803,7 +798,6 @@ if ($resql)
     print '</td>';
 	print "</tr>\n";
 
-
 	// Fields title
 	print '<tr class="liste_titre">';
 	if (! empty($arrayfields['b.rowid']['checked']))            print_liste_field_titre($arrayfields['b.rowid']['label'],$_SERVER['PHP_SELF'],'b.rowid','',$param,'',$sortfield,$sortorder);
@@ -838,14 +832,13 @@ if ($resql)
 	print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
-	
-	
+
     $balance = 0;    // For balance
 	$balancecalculated = false;
-	
+
 	// Loop on each record
 	$sign = 1;
-	
+
     $totalarray=array();
     while ($i < min($num,$limit)) 
     {
@@ -885,9 +878,9 @@ if ($resql)
             
             $balancecalculated=true;
         }
-        
+
         $balance = price2num($balance + ($sign * $objp->amount),'MT');
-        
+
         if (empty($cachebankaccount[$objp->bankid]))
         {
             $bankaccounttmp = new Account($db);
@@ -899,8 +892,6 @@ if ($resql)
         {
             $bankaccount = $cachebankaccount[$objp->bankid];
         }
-         
-        
 
         print '<tr class="oddeven">';
 
@@ -1012,19 +1003,19 @@ if ($resql)
     	        }
     	        elseif ($links[$key]['type']=='company')
     	        {
-    	            	
+
     	        }
     	        elseif ($links[$key]['type']=='user')
     	        {
-    	            	
+
     	        }
     	        elseif ($links[$key]['type']=='member')
     	        {
-    	            	
+
     	        }
     	        elseif ($links[$key]['type']=='sc')
     	        {
-    	            	
+
     	        }
     	        else
     	        {
@@ -1044,11 +1035,10 @@ if ($resql)
     	            print '</a>';
     	        }
     	    }
-    	    	
     	    print '</td>';
     	    if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
         // Date ope
     	if (! empty($arrayfields['b.dateo']['checked']))            
     	{
@@ -1089,7 +1079,7 @@ if ($resql)
     	    print '<td class="nowrap" align="center">'.($objp->num_chq?$objp->num_chq:"")."</td>\n";
     	    if (! $i) $totalarray['nbfield']++;
     	}
-    	 
+
 		// Third party
     	if (! empty($arrayfields['bu.label']['checked']))            
     	{
@@ -1114,7 +1104,7 @@ if ($resql)
 			print '</td>';
             if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
     	// Bank account
     	if (! empty($arrayfields['ba.ref']['checked']))            
     	{
@@ -1123,7 +1113,7 @@ if ($resql)
 			print "</td>\n";
             if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
     	// Debit
     	if (! empty($arrayfields['b.debit']['checked']))
     	{
@@ -1137,6 +1127,7 @@ if ($resql)
     	    if (! $i) $totalarray['nbfield']++;
     	    if (! $i) $totalarray['totaldebfield']=$totalarray['nbfield'];
     	}
+
     	// Credit
     	if (! empty($arrayfields['b.credit']['checked']))
     	{
@@ -1150,7 +1141,7 @@ if ($resql)
     	    if (! $i) $totalarray['nbfield']++;
     	    if (! $i) $totalarray['totalcredfield']=$totalarray['nbfield'];
     	}
-    	 
+
     	// Balance
     	if (! empty($arrayfields['balance']['checked']))
     	{
@@ -1169,8 +1160,9 @@ if ($resql)
         	{
         	    print '<td align="right">-</td>';
         	}
+			if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
     	if (! empty($arrayfields['b.num_releve']['checked']))
     	{
             print '<td class="nowrap" align="center">';
@@ -1197,7 +1189,7 @@ if ($resql)
         	print '</td>';
             if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
     	// Action edit/delete
     	print '<td class="nowrap" align="center">';
     	// Transaction reconciliated or edit link
@@ -1254,7 +1246,7 @@ if ($resql)
 
 		$i++;
 	}
-	
+
 	// Show total line
 	if (isset($totalarray['totaldebfield']) || isset($totalarray['totalcredfield']))
 	{
@@ -1277,7 +1269,7 @@ if ($resql)
 
 	print "</table>";
 	print "</div>";
-	
+
     print '</form>';
 	$db->free($resql);
 }

From 783cec0d6d0eaf8910a8ec7abe7cac3ac54ee55f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 27 May 2017 07:21:59 +0200
Subject: [PATCH 0952/1163] Move to getNomUrl for expense report in bank
 entries

---
 htdocs/compta/bank/bankentries.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index 2598d1659d0..f98c48b1aba 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 
@@ -345,7 +345,7 @@ $paymentsupplierstatic=new PaiementFourn($db);
 $paymentvatstatic=new TVA($db);
 $paymentsalstatic=new PaymentSalary($db);
 $donstatic=new Don($db);
-$expensereportstatic=new ExpenseReport($db);
+$paymentexpensereportstatic=new PaymentExpenseReport($db);
 $bankstatic=new Account($db);
 $banklinestatic=new AccountLine($db);
 
@@ -966,9 +966,9 @@ if ($resql)
     	        }
     	        elseif ($links[$key]['type']=='payment_expensereport')
     	        {
-    	            print '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$links[$key]['url_id'].'">';
-    	            print ' '.img_object($langs->trans('ShowPayment'),'payment').' ';
-    	            print '</a>';
+    	            $paymentexpensereportstatic->id=$links[$key]['url_id'];
+    	            $paymentexpensereportstatic->ref=$links[$key]['url_id'];
+    	            print ' '.$paymentexpensereportstatic->getNomUrl(2);
     	        }
     	        elseif ($links[$key]['type']=='banktransfert')
     	        {

From 570f9aaa9e104fe4b85cea1901a68796bb0d9413 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 27 May 2017 08:18:53 +0200
Subject: [PATCH 0953/1163] Review old payment page for expense report

---
 htdocs/core/lib/expensereport.lib.php         |  33 ++++
 .../class/paymentexpensereport.class.php      |  73 +++++++-
 htdocs/expensereport/payment/card.php         | 159 ++++++++++--------
 htdocs/expensereport/payment/info.php         |  81 +++++++++
 4 files changed, 273 insertions(+), 73 deletions(-)
 create mode 100644 htdocs/expensereport/payment/info.php

diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index f253f077243..a5f19174a84 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -78,7 +78,40 @@ function expensereport_prepare_head($object)
 	return $head;
 }
 
+/**
+ * Returns an array with the tabs for the "Expense report payment" section
+ * It loads tabs from modules looking for the entity payment
+ * 
+ * @param	Paiement	$object		Current payment object
+ * @return	array					Tabs for the payment section
+ */
+function payment_expensereport_prepare_head(PaymentExpenseReport $object) {
 
+	global $langs, $conf;
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'payment';
+	$h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport');
+
+	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/info.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport', 'remove');
+
+	return $head;
+}
 
 /**
  *  Return array head with list of tabs to view object informations.
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 9fc8c7627dd..edd80a0bff5 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2015       Alexandre Spangaro	  	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2015-2017  Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,6 +31,7 @@ class PaymentExpenseReport extends CommonObject
 {
 	public $element='payment_expensereport';			//!< Id that identify managed objects
 	public $table_element='payment_expensereport';	//!< Name of table without prefix where object is stored
+    public $picto = 'payment';
 
 	var $rowid;
 
@@ -425,6 +426,32 @@ class PaymentExpenseReport extends CommonObject
 	}
 
 
+	/**
+	 * 	Retourne le libelle du statut d'un don (brouillon, validee, abandonnee, payee)
+	 *
+	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
+	 *  @return string        		Libelle
+	 */
+	function getLibStatut($mode=0)
+	{
+	    return '';
+	}
+
+	/**
+	 *  Renvoi le libelle d'un statut donne
+	 *
+	 *  @param	int		$statut        	Id statut
+	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return string 			       	Libelle du statut
+	 */
+	function LibStatut($statut,$mode=0)
+	{
+	    global $langs;
+	
+	    return '';
+	}
+
+
 	/**
      *  Initialise an instance with random values.
      *  Used to build previews or test instances.
@@ -613,4 +640,48 @@ class PaymentExpenseReport extends CommonObject
 
 		return $result;
 	}
+
+	/**
+	 *    Tab information on object
+	 *
+	 *    @param   int     $id      Payment id
+	 *    @return  void
+	 */
+	function info($id)
+	{
+		$sql = 'SELECT e.rowid, e.datec, e.fk_user_creat, e.fk_user_modif, e.tms';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'payment_expensereport as e';
+		$sql.= ' WHERE e.rowid = '.$id;
+
+		dol_syslog(get_class($this).'::info', LOG_DEBUG);
+		$result = $this->db->query($sql);
+
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_creat)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_creat);
+					$this->user_creation     = $cuser;
+				}
+				if ($obj->fk_user_modif)
+				{
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->tms);
+			}
+			$this->db->free($result);
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
 }
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index bc956955258..de01f01a5df 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2015       Alexandre Spangaro	  	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2015-2017  Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,29 +24,25 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
 if (! empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load('bills');
 $langs->load('banks');
 $langs->load('companies');
+$langs->load('trips');
 
-// Security check
 $id=GETPOST('rowid')?GETPOST('rowid','int'):GETPOST('id','int');
 $action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm');
+
+// Security check
 if ($user->societe_id) $socid=$user->societe_id;
 // TODO Add rule to restrict access payment
 //$result = restrictedArea($user, 'facture', $id,'');
 
-$payment = new PaymentExpenseReport($db);
-if ($id > 0) 
-{
-	$result=$payment->fetch($id);
-	if (! $result) dol_print_error($db,'Failed to get payment id '.$id);
-}
-
+$object = new PaymentExpenseReport($db);
 
 /*
  * Actions
@@ -57,7 +53,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expensere
 {
 	$db->begin();
 
-	$result = $payment->delete($user);
+	$result = $object->delete($user);
 	if ($result > 0)
 	{
         $db->commit();
@@ -66,7 +62,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expensere
 	}
 	else
 	{
-		setEventMessages($payment->error, $payment->errors, 'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
 	}
 }
@@ -76,7 +72,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->expensere
 {
 	$db->begin();
 
-	$result=$payment->valide();
+	$result=$object->valide();
 	
 	if ($result > 0)
 	{
@@ -99,12 +95,12 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->expensere
 			}
 		}
 
-		header('Location: card.php?id='.$payment->id);
+		header('Location: card.php?id='.$object->id);
 		exit;
 	}
 	else
 	{
-		setEventMessages($payment->error, $payment->errors, 'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
 }
@@ -114,27 +110,27 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->expensere
  * View
  */
 
-llxHeader();
+llxHeader('', $langs->trans("ExpenseReportPayment"));
+
+if ($id > 0) 
+{
+	$result=$object->fetch($id);
+	if (! $result) dol_print_error($db,'Failed to get payment id '.$id);
+}
 
-$expensereport = new ExpenseReport($db);
 $form = new Form($db);
 
-$h=0;
+$head = payment_expensereport_prepare_head($object);
 
-$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$id;
-$head[$h][1] = $langs->trans("Card");
-$hselected = $h;
-$h++;
-
-dol_fiche_head($head, $hselected, $langs->trans("ExpenseReportPayment"), 0, 'payment');
+dol_fiche_head($head, 'payment', $langs->trans("ExpenseReportPayment"), -1, 'payment');
 
 /*
  * Confirm deleting of the payment
  */
 if ($action == 'delete')
 {
-	print $form->formconfirm('card.php?id='.$payment->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
-	
+	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
+
 }
 
 /*
@@ -143,46 +139,61 @@ if ($action == 'delete')
 if ($action == 'valide')
 {
 	$facid = $_GET['facid'];
-	print $form->formconfirm('card.php?id='.$payment->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
-	
+	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
+
 }
 
+// $linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
 
-print '<table class="border" width="100%">';
+dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '');
 
-// Ref
-print '<tr><td valign="top" width="20%">'.$langs->trans('Ref').'</td>';
-print '<td colspan="3">';
-print $form->showrefnav($payment,'id','',1,'rowid','id');
-print '</td></tr>';
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 
-// Date
-print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">'.dol_print_date($payment->datep,'day').'</td></tr>';
+print '<table class="border centpercent">'."\n";
+
+// Date payment
+print '<tr><td class="titlefield">'.$langs->trans('Date').'</td><td colspan="3">'.dol_print_date($object->datep,'day').'</td></tr>';
 
 // Mode
-print '<tr><td>'.$langs->trans('Mode').'</td><td colspan="3">'.$langs->trans("PaymentType".$payment->type_code).'</td></tr>';
+print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="3">'.$langs->trans("PaymentType".$object->type_code).'</td></tr>';
 
 // Number
-print '<tr><td>'.$langs->trans('Numero').'</td><td colspan="3">'.$payment->num_payment.'</td></tr>';
+print '<tr><td>'.$langs->trans('Numero').'</td><td colspan="3">'.$object->num_payment.'</td></tr>';
 
 // Amount
-print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($payment->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 
 // Note
-print '<tr><td class="tdtop">'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($payment->note).'</td></tr>';
+print '<tr><td class="tdtop">'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($object->note).'</td></tr>';
 
+$disable_delete = 0;
 // Bank account
 if (! empty($conf->banque->enabled))
 {
-    if ($payment->bank_account)
+    if ($object->bank_account)
     {
     	$bankline=new AccountLine($db);
-    	$bankline->fetch($payment->bank_line);
+    	$bankline->fetch($object->bank_line);
+        if ($bankline->rappro)
+        {
+            $disable_delete = 1;
+            $title_button = dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemoveConciliatedPayment"));
+        }
 
     	print '<tr>';
     	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 		print '<td colspan="3">';
-		print $bankline->getNomUrl(1,0,'showall');
+		print $bankline->getNomUrl(1,0,'showconciliated');
+    	print '</td>';
+    	print '</tr>';
+
+    	print '<tr>';
+    	print '<td>'.$langs->trans('BankAccount').'</td>';
+		print '<td colspan="3">';
+		$accountstatic=new Account($db);
+		$accountstatic->fetch($bankline->fk_account);
+        print $accountstatic->getNomUrl(1);
     	print '</td>';
     	print '</tr>';
     }
@@ -190,13 +201,16 @@ if (! empty($conf->banque->enabled))
 
 print '</table>';
 
+print '</div>';
+
+dol_fiche_end();
+
 
 /*
- * List of donations paid
+ * List of expense report paid
  */
 
-$disable_delete = 0;
-$sql = 'SELECT er.rowid as did, er.paid, er.total_ttc, per.amount';
+$sql = 'SELECT er.rowid as eid, er.paid, er.total_ttc, per.amount';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'payment_expensereport as per,'.MAIN_DB_PREFIX.'expensereport as er';
 $sql.= ' WHERE per.fk_expensereport = er.rowid';
 $sql.= ' AND er.entity IN ('.getEntity('expensereport', 1).')';
@@ -210,12 +224,17 @@ if ($resql)
 
 	$i = 0;
 	$total = 0;
-	print '<br><table class="noborder" width="100%">';
+	print '<br>';
+
+	print '<div class="div-table-responsive">';
+	print '<table class="noborder" width="100%">';
+
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('ExpenseReport').'</td>';
-    print '<td align="right">'.$langs->trans('ExpectedToPay').'</td>';
-	print '<td align="center">'.$langs->trans('Status').'</td>';
+	print '<td align="right">'.$langs->trans('ExpectedToPay').'</td>';
 	print '<td align="right">'.$langs->trans('PayedByThisPayment').'</td>';
+	print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
+	print '<td align="center">'.$langs->trans('Status').'</td>';
 	print "</tr>\n";
 
 	if ($num > 0)
@@ -226,19 +245,28 @@ if ($resql)
 		{
 			$objp = $db->fetch_object($resql);
 
-			
 			print '<tr class="oddeven">';
-			// Ref
+
+			$expensereport=new ExpenseReport($db);
+			$expensereport->fetch($objp->eid);
+
+			// Expense report
 			print '<td>';
-			$expensereport->fetch($objp->did);
 			print $expensereport->getNomUrl(1);
 			print "</td>\n";
+
 			// Expected to pay
 			print '<td align="right">'.price($objp->total_ttc).'</td>';
-			// Status
-			print '<td align="center">'.$expensereport->getLibStatut(4,$objp->amount).'</td>';
+
 			// Amount paid
 			print '<td align="right">'.price($objp->amount).'</td>';
+
+			// Remain to pay
+            print '<td align="right">'.price($remaintopay).'</td>';
+
+			// Status
+			print '<td align="center">'.$expensereport->getLibStatut(4,$objp->amount).'</td>';
+
 			print "</tr>\n";
 			if ($objp->paid == 1)	// If at least one invoice is paid, disable delete
 			{
@@ -251,6 +279,8 @@ if ($resql)
 	
 
 	print "</table>\n";
+	print '</div>';
+
 	$db->free($resql);
 }
 else
@@ -266,26 +296,13 @@ print '</div>';
  */
 print '<div class="tabsAction">';
 
-/*
-if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-{
-	if ($user->societe_id == 0 && $payment->statut == 0 && $_GET['action'] == '')
-	{
-		if ($user->rights->facture->paiement)
-		{
-			print '<a class="butAction" href="card.php?id='.$_GET['id'].'&amp;facid='.$objp->facid.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
-		}
-	}
-}
-*/
-
-if ($_GET['action'] == '')
+if ($action == '')
 {
 	if ($user->rights->expensereport->supprimer)
 	{
 		if (! $disable_delete)
 		{
-			print '<a class="butActionDelete" href="card.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
+			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
 		}
 		else
 		{
@@ -296,8 +313,6 @@ if ($_GET['action'] == '')
 
 print '</div>';
 
-
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/expensereport/payment/info.php b/htdocs/expensereport/payment/info.php
new file mode 100644
index 00000000000..bcecc54276b
--- /dev/null
+++ b/htdocs/expensereport/payment/info.php
@@ -0,0 +1,81 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2013      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2015       Alexandre Spangaro  <aspangaro@zendsi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *		\file       htdocs/expensereport/payment/info.php
+ *		\ingroup    Expense report
+ *		\brief      Tab payment info
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
+
+$langs->load("bills");
+$langs->load("trips");
+
+$id=GETPOST('id');
+$ref=GETPOST('ref', 'alpha');
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans("Payment"));
+
+$object = new PaymentExpenseReport($db);
+$object->fetch($id, $ref);
+$object->info($object->id);
+
+$head = payment_expensereport_prepare_head($object);
+
+dol_fiche_head($head, 'info', $langs->trans("ExpenseReportPayment"), -1, 'payment');
+
+
+//$linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
+
+dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '');
+
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
+
+print '<br>';
+
+print '<table width="100%"><tr><td>';
+dol_print_object_info($object);
+print '</td></tr></table>';
+
+print '</div>';
+
+dol_fiche_end();
+
+llxFooter();
+$db->close();

From c651f1da4561101e1430951eb531988bff8211f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 May 2017 13:46:34 +0200
Subject: [PATCH 0954/1163] Work on modulebuilder tool

---
 htdocs/core/ajax/check_notifications.php      |   2 +-
 htdocs/core/lib/files.lib.php                 |   4 +-
 htdocs/langs/en_US/errors.lang                |   1 +
 htdocs/langs/en_US/modulebuilder.lang         |   1 +
 htdocs/modulebuilder/README.md                | 221 +++++
 htdocs/modulebuilder/index.php                |  64 +-
 htdocs/modulebuilder/template/README.md       | 223 +----
 htdocs/modulebuilder/template/admin/about.php |   2 +-
 htdocs/modulebuilder/template/admin/setup.php |   6 +-
 .../template/class/MyTrigger.php              |  51 --
 .../template/class/actions_mymodule.class.php |   2 +-
 .../template/class/myclass.class.php          | 361 --------
 .../template/class/myobject.class.php         | 607 +++++++++++++
 .../class/myobject_api_class.class.php        | 292 +++++++
 .../core/modules/modMyModule.class.php        | 817 +++++-------------
 ...terface_99_modMyModule_Triggers.class.php} |  69 +-
 ...ect_mymodule.png => myobject_mymodule.png} | Bin
 .../modulebuilder/template/js/mymodule.js.php |   2 +-
 .../modulebuilder/template/myobject_card.php  | 386 +++++++--
 .../modulebuilder/template/myobject_list.php  | 490 ++++++++++-
 .../template/scripts/myobject.php             | 165 ++++
 .../template/scripts/myscript.php             | 203 -----
 htdocs/modulebuilder/template/sql/data.sql    |   2 +-
 ...x_mytable.key.sql => llx_myobject.key.sql} |   2 +-
 .../sql/{llx_mytable.sql => llx_myobject.sql} |   2 +-
 .../MyModuleFunctionalTest.php                |   0
 .../MyObjectTest.php}                         |  10 +-
 27 files changed, 2327 insertions(+), 1658 deletions(-)
 create mode 100644 htdocs/modulebuilder/README.md
 delete mode 100644 htdocs/modulebuilder/template/class/MyTrigger.php
 delete mode 100644 htdocs/modulebuilder/template/class/myclass.class.php
 create mode 100644 htdocs/modulebuilder/template/class/myobject.class.php
 create mode 100644 htdocs/modulebuilder/template/class/myobject_api_class.class.php
 rename htdocs/modulebuilder/template/core/triggers/{interface_99_modMyModule_MyTrigger.class.php => interface_99_modMyModule_Triggers.class.php} (91%)
 rename htdocs/modulebuilder/template/img/{object_mymodule.png => myobject_mymodule.png} (100%)
 create mode 100644 htdocs/modulebuilder/template/scripts/myobject.php
 delete mode 100644 htdocs/modulebuilder/template/scripts/myscript.php
 rename htdocs/modulebuilder/template/sql/{llx_mytable.key.sql => llx_myobject.key.sql} (90%)
 rename htdocs/modulebuilder/template/sql/{llx_mytable.sql => llx_myobject.sql} (97%)
 rename htdocs/modulebuilder/template/test/{functional => phpunit}/MyModuleFunctionalTest.php (100%)
 rename htdocs/modulebuilder/template/test/{unit/MyClassTest.php => phpunit/MyObjectTest.php} (91%)

diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 332626fbabd..6984bbff5b4 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -33,7 +33,7 @@ top_httphead('text/html');  // TODO Use a json mime type
 
 global $user, $db, $langs, $conf;
 
-$time = (int) GETPOST('time');    // Use the time parameter that is always increased by time_update, even if call is late
+$time = (int) GETPOST('time','int');    // Use the time parameter that is always increased by time_update, even if call is late
 //$time=dol_now();
 
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 4c492d1693e..2d5b8d2f6db 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -54,7 +54,7 @@ function dol_basename($pathfile)
  *  @return	array						Array of array('name'=>'xxx','fullname'=>'/abc/xxx','date'=>'yyy','size'=>99,'type'=>'dir|file',...)
  *  @see dol_dir_list_indatabase
  */
-function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefilter="", $sortcriteria="name", $sortorder=SORT_ASC, $mode=0, $nohook=false)
+function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefilter="", $sortcriteria="name", $sortorder=SORT_ASC, $mode=0, $nohook=0)
 {
 	global $db, $hookmanager;
 	global $object;
@@ -483,6 +483,8 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0)
    
     dol_delete_file($tmpdestfile);
     
+    // Create $newpathoftmpdestfile from $newpathofsrcfile
+    
     
     
     
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 79984981e87..aea5ad68113 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -18,6 +18,7 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 18b7044b55d..de0c2fc216a 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=This tools give you utilites to build or edit your own module.
+EnterNameOfModuleDesc=Enter name of the module to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
 NewModule=New module
diff --git a/htdocs/modulebuilder/README.md b/htdocs/modulebuilder/README.md
new file mode 100644
index 00000000000..5e2af06a430
--- /dev/null
+++ b/htdocs/modulebuilder/README.md
@@ -0,0 +1,221 @@
+Dolibarr Module Template (aka My Module)
+========================================
+
+This is a full featured module template for Dolibarr.
+It's a tool for module developers to kickstart their project and give an hands-on sample of which features Dolibarr has to offer for module development.
+
+If you're not a module developer you have no use for this.
+
+Documentation
+-------------
+
+[Module tutorial](http://wiki.dolibarr.org/index.php/Module_development)
+
+[Dolibarr development](http://wiki.dolibarr.org/index.php/Developer_documentation)
+
+### Translations
+
+Dolibarr uses [Transifex](http://transifex.com) to manage it's translations.
+
+This template also contains a sample configuration for Transifex managed translations under the hidden [.tx](.tx) directory.
+
+For more informations, see the [translator's documentation](http://wiki.dolibarr.org/index.php/Translator_documentation).
+
+There is a [Transifex project](http://transifex.com/projects/p/dolibarr-module-template) for this module.
+
+Install
+-------
+
+### Manually
+
+- Make sure Dolibarr (>= 3.3.x) is already installed and configured on your workstation or development server.
+
+- In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file
+
+- Find the following lines:
+    ```php
+    //$dolibarr_main_url_root_alt ...
+    //$dolibarr_main_document_root_alt ...
+    ```
+
+- Uncomment these lines (delete the leading ```//```) and assign a sensible value according to your Dolibarr installation
+
+    For example :
+
+    - UNIX:
+        ```php
+        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
+        $dolibarr_main_document_root = '/var/www/Dolibarr/htdocs';
+        $dolibarr_main_url_root_alt = '/custom';
+        $dolibarr_main_document_root_alt = '/var/www/Dolibarr/htdocs/custom';
+        ```
+
+    - Windows:
+        ```php
+        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
+        $dolibarr_main_document_root = 'C:/My Web Sites/Dolibarr/htdocs';
+        $dolibarr_main_url_root_alt = '/custom';
+        $dolibarr_main_document_root_alt = 'C:/My Web Sites/Dolibarr/htdocs/custom';
+        ```
+
+    For more information about the ```conf.php``` file take a look at the conf.php.example file.
+
+*Note that for Dolibarr versions before 3.5, the ```$dolibarr_main_url_root_alt``` has to be an absolute path*
+
+- Clone the repository in ```$dolibarr_main_document_root_alt/mymodule```
+
+*(You may have to create the ```htdocs/custom``` directory first if it doesn't exist yet.)*
+```sh
+git clone git@github.com:Dolibarr/dolibarr-module-template.git mymodule
+```
+
+- Install [Composer](https://getcomposer.org) dependencies:
+```sh
+composer install
+```
+
+Follow the [final steps](#final_steps).
+
+### Using [Composer](https://getcomposer.org)
+Require this repository from Dolibarr's composer:
+```json
+{
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/dolibarr/dolibarr-module-template"
+    }
+  ],
+  "require": {
+    "dolibarr/mymodule": "dev-master"
+  }
+}
+```
+
+Run
+```sh
+composer update
+```
+
+Follow the [final steps](#final_steps).
+
+### <a name="final_steps"></a>Final steps
+
+From your browser:
+
+  - Log into Dolibarr as a super-administrator
+  - Under "Setup" -> "Other setup", set ```MAIN_FEATURES_LEVEL``` to ```2```
+  - Go to "Setup" -> "Modules"
+  - The module is under one of the tabs
+  - You should now be able to enable the new module and start coding ;)
+
+Provided tools
+--------------
+
+### Starting a new module
+
+A [script](dev/newmodule.sh) allows you to rename most of the code to your own module name.  
+It requires ```find```, ```sed``` and ```rename``` commands on your system.  
+Just make sure you provide a CamelCase name.
+```sh
+./dev/newmodule.sh [NewName]
+```
+
+Some work still has to be done manually:
+- Rename the directory holding the code
+- Maybe rename some other bits (Search for 'my' in filenames and code)
+- Update your module ID in the module descriptor
+- Update your language files
+    - Keywords based on the module ID
+    - String referencing the template
+- Remove the features you don't plan to use
+- Fill the copyright notices at the top of each file
+- Add your logo: see [images README](dev/img/README.md) for specifications
+- Start a new GIT history 
+```
+git checkout --orphan [new_branch_name]
+```
+- Build an awesome module ;)
+
+### Composer scripts
+
+Only the main commands are listed here.  
+See the [composer comments](composer-comments.md) or the [composer.json](composer.json) itself for more informations.
+
+#### Check
+
+Run a linter, a PHP compatibility version checker and checks coding style.
+```sh
+composer check
+```
+
+#### Test
+  
+Run unit and functional tests.
+```sh
+composer test
+```
+
+#### Doc
+Build code and user documentation.
+
+#### Release
+
+Run the checks and tests then build a distribution ZIP.
+```sh
+composer release
+```
+
+#### Git hooks
+
+Optional [GIT hooks](https://git-scm.com/book/it/v2/Customizing-Git-Git-Hooks) are provided.
+These are just wrappers calling composer scripts.  
+They ensure best practices are followed during module development.  
+
+Install:
+```sh
+composer git_hooks_install
+```
+
+Remove:
+```sh
+composer git_hooks_remove
+```
+
+## Publishing the module
+The de-facto standard for publishing and marketing modules for Dolibarr is the [Dolistore](https://www.dolistore.com).  
+Templates for required images and texts are [provided](dev/dolistore).  
+Check the dedicated [README](dev/dolistore/README.md) for more informations.
+
+Contributions
+-------------
+
+Feel free to contribute and report defects on our [issue tracker](http://github.com/Dolibarr/dolibarr-module-template/issues).
+
+Licenses
+--------
+
+### Main code
+
+![GPLv3 logo](img/gplv3.png)
+
+GPLv3 or (at your option) any later version.
+
+See [COPYING](COPYING) for more information.
+
+### Other Licenses
+
+#### [Parsedown](http://parsedown.org/)
+
+Used to display this README in the module's about page.  
+Licensed under MIT.
+
+#### [GNU Licenses logos](https://www.gnu.org/graphics/license-logos.html)
+
+Public domain
+
+#### Documentation
+
+All texts and readmes.
+
+![GFDL logo](img/gfdl.png)
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index bdad41e8556..a033bd1be23 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -32,15 +32,15 @@ $langs->load("other");
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
 $module=GETPOST('module');
-$tab=GETPOST('tab');
 if (empty($module)) $module='initmodule';
 if (empty($tab)) $tab='description';
 
+$modulename=dol_sanitizeFileName(GETPOST('modulename','alpha'));
+
 
 // Security check
 if (! $user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessforbidden('ModuleBuilderNotAllowed');
 
-$modulename=dol_sanitizeFileName(GETPOST('modulename','alpha'));
 
 // Dir for custom dirs
 $tmp=explode(',', $dolibarr_main_document_root_alt);
@@ -55,35 +55,59 @@ $FILEFLAG='modulebuilder.txt';
 
 if ($dircustom && $action == 'initmodule' && $modulename)
 {
-    $srcfile = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
-    $destfile = $dircustom.'/'.$modulename;
-    $result = dolCopyDir($srcfile, $destfile, 0, 0);
+    $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+    $destdir = $dircustom.'/'.$modulename;
+
+    $arrayreplacement=array(
+        'mymodule'=>strtolower($modulename),
+     	'MyModule'=>$modulename
+    );
+    
+    $result = dolCopyDir($srcdir, $destdir, 0, 0);
     //dol_mkdir($destfile);
     if ($result <= 0)
     {
         $error++;
-        setEventMessages($langs->trans("ErrorFailedToCopyDir"), null, 'errors');
+        $langs->load("errors");
+        setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors');
     }
 
     // Edit PHP files
-    $listofphpfilestoedit = dol_dir_list($destfile, 'files', 1, '\.php$', 'fullname', SORT_ASC, 0, true);
-    foreach($listofphpfilestoedit as $phpfileval)
+    if (! $error)
     {
-        $arrayreplacement=array(
-            'mymodule'=>$modulename
-        );
-        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
-        var_dump($phpfileval);
-        var_dump($result);
-    }    
-    
+	    $listofphpfilestoedit = dol_dir_list($destdir, 'files', 1, '\.php$', '', 'fullname', SORT_ASC, 0, 1);
+	    foreach($listofphpfilestoedit as $phpfileval)
+	    {
+	        var_dump($phpfileval['fullname']);
+	    	
+	    	$arrayreplacement=array(
+	            'mymodule'=>strtolower($modulename),
+	        	'MyModule'=>$modulename,
+	        	'MYMODULE'=>strtoupper($modulename),
+	        	'My module'=>$modulename,
+	        	'htdocs/modulebuilder/template/'=>'',
+	        );
+	        
+	        
+	        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
+	        //var_dump($result);
+	        if ($result < 0)
+	        {
+	        	setEventMessages($langs->trans("ErrorFailToMakeReplacementInto", $phpfileval['fullname']), null, 'errors');
+	        }
+	    }    
+    }
+        
     if (! $error)
     {
         setEventMessages('ModuleInitialized', null);
+        $module=$modulename;
+        $modulename = '';
     }
 }
 
 
+
 /*
  * View
  */
@@ -96,6 +120,7 @@ $text=$langs->trans("ModuleBuilder");
 print load_fiche_titre($text, '', 'title_setup');
 
 $listofmodules=array();
+
 /*
 if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// Entry for Module builder
 {
@@ -124,7 +149,7 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
         $newmenu->add('', 'NoGeneratedModuleFound', 0, 0);
     }*/
 
-            
+
 // Show description of content
 print $langs->trans("ModuleBuilderDesc").'<br>';
 print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $dircustom).'<br>';
@@ -161,7 +186,10 @@ if ($module == 'initmodule')
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="initmodule">';
     print '<input type="hidden" name="module" value="initmodule">';
-    print '<input type="text" name="modulename" value="" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'">';
+    
+    print $langs->trans("EnterNameOfModuleDesc").'<br><br>';
+    
+    print '<input type="text" name="modulename" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'">';
     print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
     print '</form>';
 }
diff --git a/htdocs/modulebuilder/template/README.md b/htdocs/modulebuilder/template/README.md
index 5e2af06a430..ba723bf5195 100644
--- a/htdocs/modulebuilder/template/README.md
+++ b/htdocs/modulebuilder/template/README.md
@@ -1,221 +1,6 @@
-Dolibarr Module Template (aka My Module)
-========================================
+# MYMODULE FOR DOLIBARR ERP CRM
 
-This is a full featured module template for Dolibarr.
-It's a tool for module developers to kickstart their project and give an hands-on sample of which features Dolibarr has to offer for module development.
+## Features
+MyModuleDescription
 
-If you're not a module developer you have no use for this.
-
-Documentation
--------------
-
-[Module tutorial](http://wiki.dolibarr.org/index.php/Module_development)
-
-[Dolibarr development](http://wiki.dolibarr.org/index.php/Developer_documentation)
-
-### Translations
-
-Dolibarr uses [Transifex](http://transifex.com) to manage it's translations.
-
-This template also contains a sample configuration for Transifex managed translations under the hidden [.tx](.tx) directory.
-
-For more informations, see the [translator's documentation](http://wiki.dolibarr.org/index.php/Translator_documentation).
-
-There is a [Transifex project](http://transifex.com/projects/p/dolibarr-module-template) for this module.
-
-Install
--------
-
-### Manually
-
-- Make sure Dolibarr (>= 3.3.x) is already installed and configured on your workstation or development server.
-
-- In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file
-
-- Find the following lines:
-    ```php
-    //$dolibarr_main_url_root_alt ...
-    //$dolibarr_main_document_root_alt ...
-    ```
-
-- Uncomment these lines (delete the leading ```//```) and assign a sensible value according to your Dolibarr installation
-
-    For example :
-
-    - UNIX:
-        ```php
-        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
-        $dolibarr_main_document_root = '/var/www/Dolibarr/htdocs';
-        $dolibarr_main_url_root_alt = '/custom';
-        $dolibarr_main_document_root_alt = '/var/www/Dolibarr/htdocs/custom';
-        ```
-
-    - Windows:
-        ```php
-        $dolibarr_main_url_root = 'http://localhost/Dolibarr/htdocs';
-        $dolibarr_main_document_root = 'C:/My Web Sites/Dolibarr/htdocs';
-        $dolibarr_main_url_root_alt = '/custom';
-        $dolibarr_main_document_root_alt = 'C:/My Web Sites/Dolibarr/htdocs/custom';
-        ```
-
-    For more information about the ```conf.php``` file take a look at the conf.php.example file.
-
-*Note that for Dolibarr versions before 3.5, the ```$dolibarr_main_url_root_alt``` has to be an absolute path*
-
-- Clone the repository in ```$dolibarr_main_document_root_alt/mymodule```
-
-*(You may have to create the ```htdocs/custom``` directory first if it doesn't exist yet.)*
-```sh
-git clone git@github.com:Dolibarr/dolibarr-module-template.git mymodule
-```
-
-- Install [Composer](https://getcomposer.org) dependencies:
-```sh
-composer install
-```
-
-Follow the [final steps](#final_steps).
-
-### Using [Composer](https://getcomposer.org)
-Require this repository from Dolibarr's composer:
-```json
-{
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/dolibarr/dolibarr-module-template"
-    }
-  ],
-  "require": {
-    "dolibarr/mymodule": "dev-master"
-  }
-}
-```
-
-Run
-```sh
-composer update
-```
-
-Follow the [final steps](#final_steps).
-
-### <a name="final_steps"></a>Final steps
-
-From your browser:
-
-  - Log into Dolibarr as a super-administrator
-  - Under "Setup" -> "Other setup", set ```MAIN_FEATURES_LEVEL``` to ```2```
-  - Go to "Setup" -> "Modules"
-  - The module is under one of the tabs
-  - You should now be able to enable the new module and start coding ;)
-
-Provided tools
---------------
-
-### Starting a new module
-
-A [script](dev/newmodule.sh) allows you to rename most of the code to your own module name.  
-It requires ```find```, ```sed``` and ```rename``` commands on your system.  
-Just make sure you provide a CamelCase name.
-```sh
-./dev/newmodule.sh [NewName]
-```
-
-Some work still has to be done manually:
-- Rename the directory holding the code
-- Maybe rename some other bits (Search for 'my' in filenames and code)
-- Update your module ID in the module descriptor
-- Update your language files
-    - Keywords based on the module ID
-    - String referencing the template
-- Remove the features you don't plan to use
-- Fill the copyright notices at the top of each file
-- Add your logo: see [images README](dev/img/README.md) for specifications
-- Start a new GIT history 
-```
-git checkout --orphan [new_branch_name]
-```
-- Build an awesome module ;)
-
-### Composer scripts
-
-Only the main commands are listed here.  
-See the [composer comments](composer-comments.md) or the [composer.json](composer.json) itself for more informations.
-
-#### Check
-
-Run a linter, a PHP compatibility version checker and checks coding style.
-```sh
-composer check
-```
-
-#### Test
-  
-Run unit and functional tests.
-```sh
-composer test
-```
-
-#### Doc
-Build code and user documentation.
-
-#### Release
-
-Run the checks and tests then build a distribution ZIP.
-```sh
-composer release
-```
-
-#### Git hooks
-
-Optional [GIT hooks](https://git-scm.com/book/it/v2/Customizing-Git-Git-Hooks) are provided.
-These are just wrappers calling composer scripts.  
-They ensure best practices are followed during module development.  
-
-Install:
-```sh
-composer git_hooks_install
-```
-
-Remove:
-```sh
-composer git_hooks_remove
-```
-
-## Publishing the module
-The de-facto standard for publishing and marketing modules for Dolibarr is the [Dolistore](https://www.dolistore.com).  
-Templates for required images and texts are [provided](dev/dolistore).  
-Check the dedicated [README](dev/dolistore/README.md) for more informations.
-
-Contributions
--------------
-
-Feel free to contribute and report defects on our [issue tracker](http://github.com/Dolibarr/dolibarr-module-template/issues).
-
-Licenses
---------
-
-### Main code
-
-![GPLv3 logo](img/gplv3.png)
-
-GPLv3 or (at your option) any later version.
-
-See [COPYING](COPYING) for more information.
-
-### Other Licenses
-
-#### [Parsedown](http://parsedown.org/)
-
-Used to display this README in the module's about page.  
-Licensed under MIT.
-
-#### [GNU Licenses logos](https://www.gnu.org/graphics/license-logos.html)
-
-Public domain
-
-#### Documentation
-
-All texts and readmes.
-
-![GFDL logo](img/gfdl.png)
+Other modules are available on <a href="https://www.dolistore.com target="_new">Dolistore.com</a>.
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index 6953af2ef38..844c444bad2 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    admin/about.php
+ * \file    htdocs/modulebuilder/template/admin/about.php
  * \ingroup mymodule
  * \brief   About page of module MyModule.
  *
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 8bc2c6d9ded..63b92bc6468 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    admin/setup.php
+ * \file    htdocs/modulebuilder/template/admin/setup.php
  * \ingroup mymodule
  * \brief   Example module setup page.
  *
@@ -57,8 +57,8 @@ $page_name = "MyModuleSetup";
 llxHeader('', $langs->trans($page_name));
 
 // Subheader
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
-	. $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
+
 print load_fiche_titre($langs->trans($page_name), $linkback);
 
 // Configuration header
diff --git a/htdocs/modulebuilder/template/class/MyTrigger.php b/htdocs/modulebuilder/template/class/MyTrigger.php
deleted file mode 100644
index 61604b7ff72..00000000000
--- a/htdocs/modulebuilder/template/class/MyTrigger.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    class/MyTrigger.php
- * \ingroup mymodule
- * \brief   Compatibility class for triggers in Dolibarr < 3.7.
- *
- * Hack for compatibility with Dolibarr versions < 3.7.
- * Remove this and extend DolibarrTriggers directly from interface_99_modMyModule_MyTrigger.class.php
- * if you don't intend to support these versions.
- */
-
-// We ignore the PSR1.Classes.ClassDeclaration.MultipleClasses rule.
-// @codingStandardsIgnoreStart
-$dolibarr_version = versiondolibarrarray();
-if ($dolibarr_version[0] < 3 || ($dolibarr_version[0] == 3 && $dolibarr_version[1] < 7)) { // DOL_VERSION < 3.7
-	/**
-	 * Class MyTrigger
-	 *
-	 * For Dolibarr < 3.7.
-	 */
-	abstract class MyTrigger
-	{
-	}
-} else {
-	/**
-	 * Class MyTrigger
-	 *
-	 * For Dolibarr >= 3.7
-	 */
-	abstract class MyTrigger extends DolibarrTriggers
-	{
-	}
-}
-// @codingStandardsIgnoreEnd
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index 7047332bbfc..f3ce5963aa6 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    class/actions_mymodule.class.php
+ * \file    htdocs/modulebuilder/template/class/actions_mymodule.class.php
  * \ingroup mymodule
  * \brief   Example hook overload.
  *
diff --git a/htdocs/modulebuilder/template/class/myclass.class.php b/htdocs/modulebuilder/template/class/myclass.class.php
deleted file mode 100644
index 336ccf7c98a..00000000000
--- a/htdocs/modulebuilder/template/class/myclass.class.php
+++ /dev/null
@@ -1,361 +0,0 @@
-<?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    class/myclass.class.php
- * \ingroup mymodule
- * \brief   Example CRUD (Create/Read/Update/Delete) class.
- *
- * Put detailed description here.
- */
-
-/** Includes */
-//require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php";
-//require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
-//require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
-
-/**
- * Put your class' description here
- */
-class MyClass // extends CommonObject
-{
-
-    /** @var DoliDb Database handler */
-	private $db;
-    /** @var string Error code or message */
-	public $error;
-    /** @var array Several error codes or messages */
-	public $errors = array();
-    /** @var string Id to identify managed object */
-	//public $element='myelement';
-    /** @var string Name of table without prefix where object is stored */
-	//public $table_element='mytable';
-    /** @var int An example ID */
-	public $id;
-    /** @var mixed An example property */
-	public $prop1;
-    /** @var mixed An example property */
-	public $prop2;
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-
-		return 1;
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param User $user User that create
-	 * @param int $notrigger 0=launch triggers after, 1=disable triggers
-	 * @return int <0 if KO, Id of created object if OK
-	 */
-	public function create($user, $notrigger = 0)
-	{
-		global $conf, $langs;
-		$error = 0;
-
-		// Clean parameters
-		if (isset($this->prop1)) {
-			$this->prop1 = trim($this->prop1);
-		}
-		if (isset($this->prop2)) {
-			$this->prop2 = trim($this->prop2);
-		}
-
-		// Check parameters
-		// Put here code to add control on parameters values
-		// Insert request
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "mytable(";
-		$sql.= " field1,";
-		$sql.= " field2";
-
-		$sql.= ") VALUES (";
-		$sql.= " '" . $this->prop1 . "',";
-		$sql.= " '" . $this->prop2 . "'";
-
-		$sql.= ")";
-
-		$this->db->begin();
-
-		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error ++;
-			$this->errors[] = "Error " . $this->db->lasterror();
-		}
-
-		if (! $error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "mytable");
-
-			if (! $notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action call a trigger.
-				//// Call triggers
-				//include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
-				//$interface=new Interfaces($this->db);
-				//$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				//// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			foreach ($this->errors as $errmsg) {
-				dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
-				$this->error.=($this->error ? ', ' . $errmsg : $errmsg);
-			}
-			$this->db->rollback();
-
-			return -1 * $error;
-		} else {
-			$this->db->commit();
-
-			return $this->id;
-		}
-	}
-
-	/**
-	 * Load object in memory from database
-	 *
-	 * @param int $id Id object
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetch($id)
-	{
-		global $langs;
-		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.field1,";
-		$sql.= " t.field2";
-		//...
-		$sql.= " FROM " . MAIN_DB_PREFIX . "mytable as t";
-		$sql.= " WHERE t.rowid = " . $id;
-
-		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			if ($this->db->num_rows($resql)) {
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id = $obj->rowid;
-				$this->prop1 = $obj->field1;
-				$this->prop2 = $obj->field2;
-				//...
-			}
-			$this->db->free($resql);
-
-			return 1;
-		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
-
-			return -1;
-		}
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param User $user User that modify
-	 * @param int $notrigger 0=launch triggers after, 1=disable triggers
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function update($user = 0, $notrigger = 0)
-	{
-		global $conf, $langs;
-		$error = 0;
-
-		// Clean parameters
-		if (isset($this->prop1)) {
-			$this->prop1 = trim($this->prop1);
-		}
-		if (isset($this->prop2)) {
-			$this->prop2 = trim($this->prop2);
-		}
-
-		// Check parameters
-		// Put here code to add control on parameters values
-		// Update request
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "mytable SET";
-		$sql.= " field1=" . (isset($this->field1) ? "'" . $this->db->escape($this->field1) . "'" : "null") . ",";
-		$sql.= " field2=" . (isset($this->field2) ? "'" . $this->db->escape($this->field2) . "'" : "null") . "";
-
-		$sql.= " WHERE rowid=" . $this->id;
-
-		$this->db->begin();
-
-		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql) {
-			$error ++;
-			$this->errors[] = "Error " . $this->db->lasterror();
-		}
-
-		if (! $error) {
-			if (! $notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action call a trigger.
-				//// Call triggers
-				//include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
-				//$interface=new Interfaces($this->db);
-				//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				//// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			foreach ($this->errors as $errmsg) {
-				dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
-				$this->error.=($this->error ? ', ' . $errmsg : $errmsg);
-			}
-			$this->db->rollback();
-
-			return -1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user User that delete
-	 * @param int $notrigger 0=launch triggers after, 1=disable triggers
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function delete($user, $notrigger = 0)
-	{
-		global $conf, $langs;
-		$error = 0;
-
-		$this->db->begin();
-
-		if (! $error) {
-			if (! $notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action call a trigger.
-				//// Call triggers
-				//include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php";
-				//$interface=new Interfaces($this->db);
-				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				//// End call triggers
-			}
-		}
-
-		if (! $error) {
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "mytable";
-			$sql.= " WHERE rowid=" . $this->id;
-
-			dol_syslog(__METHOD__ . " sql=" . $sql);
-			$resql = $this->db->query($sql);
-			if (! $resql) {
-				$error ++;
-				$this->errors[] = "Error " . $this->db->lasterror();
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			foreach ($this->errors as $errmsg) {
-				dol_syslog(__METHOD__ . " " . $errmsg, LOG_ERR);
-				$this->error.=($this->error ? ', ' . $errmsg : $errmsg);
-			}
-			$this->db->rollback();
-
-			return -1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Load an object from its id and create a new one in database
-	 *
-	 * @param int $fromid Id of object to clone
-	 * @return int New id of clone
-	 */
-	public function createFromClone($fromid)
-	{
-		global $user, $langs;
-
-		$error = 0;
-
-		$object = new SkeletonClass($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetch($fromid);
-		$object->id = 0;
-		$object->statut = 0;
-
-		// Clear fields
-		// ...
-		// Create clone
-		$result = $object->create($user);
-
-		// Other options
-		if ($result < 0) {
-			$this->error = $object->error;
-			$error ++;
-		}
-
-		if (! $error) {
-			// Do something
-		}
-
-		// End
-		if (! $error) {
-			$this->db->commit();
-
-			return $object->id;
-		} else {
-			$this->db->rollback();
-
-			return -1;
-		}
-	}
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->id = 0;
-		$this->prop1 = 'prop1';
-		$this->prop2 = 'prop2';
-	}
-}
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
new file mode 100644
index 00000000000..292c6a139a4
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -0,0 +1,607 @@
+<?php
+/* Copyright (C) 2007-2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file        htdocs/modulebuilder/template/class/myobject.class.php
+ * \ingroup     mymodule othermodule1 othermodule2
+ * \brief       This file is an example for a CRUD class file (Create/Read/Update/Delete)
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class MyModuleObject
+ *
+ * Put here description of your class.
+ */
+class MyModuleObject extends CommonObject
+{
+	/**
+	 * @var string Id to identify managed object
+	 */
+	public $element = 'mymoduleobject';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'mymoduleobject';
+    /**
+     * @var array Array with all fields and their property
+     */
+	public $picto = 'generic';
+    /**
+     * @var array Array with all fields and their property
+     */
+	public $fields;
+	
+	/**
+	 * @var mixed Sample property 1
+	 */
+	public $prop1;
+	/**
+	 * @var mixed Sample property 2
+	 */
+	public $prop2;
+	
+	//...
+	
+	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	
+	public $table_element_line = 'mymoduleobjectdet';
+    public $class_element_line = 'MyModuleObjectline';
+    public $fk_element = 'fk_mymoduleobject';
+
+    /**
+	 * @var MyModuleObjectLine[] Lines
+	 */
+	public $lines = array();
+	
+	
+	
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+
+		// Clean parameters
+		if (isset($this->prop1)) {
+			$this->prop1 = trim($this->prop1);
+		}
+		if (isset($this->prop2)) {
+			$this->prop2 = trim($this->prop2);
+		}
+		//...
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Insert request
+		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		$sql .= ' field1,';
+		$sql .= ' field2';
+		//...
+		$sql .= ') VALUES (';
+		$sql .= ' \'' . $this->prop1 . '\',';
+		$sql .= ' \'' . $this->prop2 . '\'';
+		//...
+		$sql .= ')';
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+
+			if (!$notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action to call a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) $error++;
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id  Id object
+	 * @param string $ref Ref
+	 *
+	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		$sql .= ' t.field1,';
+		$sql .= ' t.field2';
+		//...
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		$sql.= ' WHERE 1 = 1';
+		if (! empty($conf->multicompany->enabled)) {
+		    $sql .= " AND entity IN (" . getEntity("mymoduleobject", 1) . ")";
+		}
+		if (null !== $ref) {
+			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
+		} else {
+			$sql .= ' AND t.rowid = ' . $id;
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$numrows = $this->db->num_rows($resql);
+			if ($numrows) {
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				$this->prop1 = $obj->field1;
+				$this->prop2 = $obj->field2;
+				//...
+			}
+			
+			// Retrieve all extrafields for invoice
+			// fetch optionals attributes and labels
+			/*
+			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+			$extrafields=new ExtraFields($this->db);
+			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+			$this->fetch_optionals($this->id,$extralabels);
+            */
+			
+			// $this->fetch_lines();
+			
+			$this->db->free($resql);
+
+			if ($numrows) {
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param string $sortorder Sort Order
+	 * @param string $sortfield Sort field
+	 * @param int    $limit     offset limit
+	 * @param int    $offset    offset limit
+	 * @param array  $filter    filter array
+	 * @param string $filtermode filter mode (AND or OR)
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		$sql .= ' t.field1,';
+		$sql .= ' t.field2';
+		//...
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+			}
+		}
+		$sql.= ' WHERE 1 = 1';
+		if (! empty($conf->multicompany->enabled)) {
+		    $sql .= " AND entity IN (" . getEntity("mymoduleobject", 1) . ")";
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
+		}
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield,$sortorder);
+		}
+		if (!empty($limit)) {
+		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+
+			while ($obj = $this->db->fetch_object($resql)) {
+				$line = new self($this->db);
+
+				$line->id = $obj->rowid;
+				$line->prop1 = $obj->field1;
+				$line->prop2 = $obj->field2;
+				//...
+			}
+			$this->db->free($resql);
+
+			return $num;
+		} else {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+		
+		// Clean parameters
+		if (isset($this->prop1)) {
+			$this->prop1 = trim($this->prop1);
+		}
+		if (isset($this->prop2)) {
+			$this->prop2 = trim($this->prop2);
+		}
+		//...
+
+		// Check parameters
+		// Put here code to add a control on parameters values
+
+		// Update request
+		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		$sql .= " field1=".(isset($this->field1)?"'".$this->db->escape($this->field1)."'":"null").",";
+        $sql .= " field2=".(isset($this->field2)?"'".$this->db->escape($this->field2)."'":"null")."";
+		//...
+		$sql .= ' WHERE rowid=' . $this->id;
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error ++;
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error && !$notrigger) {
+			// Uncomment this and change MYOBJECT to your own tag if you
+			// want this action calls a trigger.
+
+			//// Call triggers
+			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+			//// End call triggers
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user      User that deletes
+	 * @param bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+
+		$this->db->begin();
+
+		if (!$error) {
+			if (!$notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
+
+		// If you need to delete child tables to, you can insert them here
+		
+		if (!$error) {
+			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+			$sql .= ' WHERE rowid=' . $this->id;
+
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error ++;
+				$this->errors[] = 'Error ' . $this->db->lasterror();
+				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Load an object from its id and create a new one in database
+	 *
+	 * @param int $fromid Id of object to clone
+	 *
+	 * @return int New id of clone
+	 */
+	public function createFromClone($fromid)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		global $user;
+		$error = 0;
+		$object = new MyModuleObject($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$object->fetch($fromid);
+		// Reset object
+		$object->id = 0;
+
+		// Clear fields
+		// ...
+
+		// Create clone
+		$result = $object->create($user);
+
+		// Other options
+		if ($result < 0) {
+			$error ++;
+			$this->errors = $object->errors;
+			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+		}
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+
+			return $object->id;
+		} else {
+			$this->db->rollback();
+
+			return - 1;
+		}
+	}
+
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *	@param	string	$option				On what the link point to
+     *  @param	int  	$notooltip			1=Disable tooltip
+     *  @param	int		$maxlen				Max length of visible user name
+     *  @param  string  $morecss            Add more css on link
+	 *	@return	string						String with URL
+	 */
+	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
+	{
+		global $db, $conf, $langs;
+        global $dolibarr_main_authentication, $dolibarr_main_demo;
+        global $menumanager;
+
+        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        
+        $result = '';
+        $companylink = '';
+
+        $label = '<u>' . $langs->trans("MyModule") . '</u>';
+        $label.= '<br>';
+        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+
+        $url = DOL_URL_ROOT.'/mymodule/'.$this->table_name.'_card.php?id='.$this->id;
+        
+        $linkclose='';
+        if (empty($notooltip))
+        {
+            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            {
+                $label=$langs->trans("ShowProject");
+                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+            }
+            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+        }
+        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+        
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart.=$linkclose.'>';
+		$linkend='</a>';
+
+        if ($withpicto)
+        {
+            $result.=($linkstart.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
+            if ($withpicto != 2) $result.=' ';
+		}
+		$result.= $linkstart . $this->ref . $linkend;
+		return $result;
+	}
+
+	/**
+	 *  Retourne le libelle du status d'un user (actif, inactif)
+	 *
+	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return	string 			       Label of status
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->status,$mode);
+	}
+
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        	Id status
+	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
+	 *  @return string 			       	Label of status
+	 */
+	static function LibStatut($status,$mode=0)
+	{
+		global $langs;
+
+		if ($mode == 0)
+		{
+			$prefix='';
+			if ($status == 1) return $langs->trans('Enabled');
+			if ($status == 0) return $langs->trans('Disabled');
+		}
+		if ($mode == 1)
+		{
+			if ($status == 1) return $langs->trans('Enabled');
+			if ($status == 0) return $langs->trans('Disabled');
+		}
+		if ($mode == 2)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+		}
+		if ($mode == 3)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+		}
+		if ($mode == 4)
+		{
+			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+		}
+		if ($mode == 5)
+		{
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+		}
+		if ($mode == 6)
+		{
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+		}
+	}
+
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		$this->prop1 = 'prop1';
+		$this->prop2 = 'prop2';
+	}
+
+}
+
+/**
+ * Class MyModuleObjectLine
+ */
+class MyModuleObjectLine
+{
+	/**
+	 * @var int ID
+	 */
+	public $id;
+	/**
+	 * @var mixed Sample line property 1
+	 */
+	public $prop1;
+	/**
+	 * @var mixed Sample line property 2
+	 */
+	public $prop2;
+}
diff --git a/htdocs/modulebuilder/template/class/myobject_api_class.class.php b/htdocs/modulebuilder/template/class/myobject_api_class.class.php
new file mode 100644
index 00000000000..8f0dbee2e38
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/myobject_api_class.class.php
@@ -0,0 +1,292 @@
+<?php
+/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+use Luracast\Restler\RestException;
+
+/**
+ * \file    htdocs/modulebuilder/template/class/myobject_api_class.class.php
+ * \ingroup mymodule
+ * \brief   File for API management of myobject.
+ */
+ 
+/**
+ * API class for mymodule myobject
+ *
+ * @smart-auto-routing false
+ * @access protected 
+ * @class  DolibarrApiAccess {@requires user,external}
+ */
+class MyObjectApi extends DolibarrApi
+{
+    /**
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
+     */
+    static $FIELDS = array(
+        'name'
+    );
+
+    /**
+     * @var MyObject $myobject {@type MyObject}
+     */
+    public $myobject;
+
+    /**
+     * Constructor
+     *
+     * @url     GET myobject/
+     * 
+     */
+    function __construct()
+    {
+		global $db, $conf;
+		$this->db = $db;
+        $this->myobject = new MyObject($this->db);
+    }
+
+    /**
+     * Get properties of a myobject object
+     *
+     * Return an array with myobject informations
+     *
+     * @param 	int 	$id ID of myobject
+     * @return 	array|mixed data without useless information
+	 * 
+     * @url	GET myobject/{id}
+     * @throws 	RestException
+     */
+    function get($id)
+    {		
+		if(! DolibarrApiAccess::$user->rights->myobject->read) {
+			throw new RestException(401);
+		}
+			
+        $result = $this->myobject->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'MyObject not found');
+        }
+		
+		if( ! DolibarrApi::_checkAccessToResource('myobject',$this->myobject->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		return $this->_cleanObjectDatas($this->myobject);
+    }
+
+    /**
+     * List myobjects
+     * 
+     * Get a list of myobjects
+     * 
+     * @param int		$mode		Use this param to filter list
+     * @param string	$sortfield	Sort field
+     * @param string	$sortorder	Sort order
+     * @param int		$limit		Limit for list
+     * @param int		$page		Page number
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') or (t.import_key:=:'20160101')"
+     * @return array Array of myobject objects
+     *
+     * @url	GET /myobjects/
+     */
+    function index($mode, $sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '') {
+        global $db, $conf;
+        
+        $obj_ret = array();
+        
+        $socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
+            
+        // If the internal user must only see his customers, force searching by him
+        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+
+        $sql = "SELECT s.rowid";
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+        $sql.= " FROM ".MAIN_DB_PREFIX."myobject as s";
+        
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
+        $sql.= " WHERE s.fk_stcomm = st.id";
+        
+		// Example of use $mode
+        //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
+        //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
+
+        $sql.= ' AND s.entity IN ('.getEntity('myobject', 1).')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
+        if ($socid) $sql.= " AND s.fk_soc = ".$socid;
+        if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        // Insert sale filter
+        if ($search_sale > 0)
+        {
+            $sql .= " AND sc.fk_user = ".$search_sale;
+        }
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+        $sql.= $db->order($sortfield, $sortorder);
+        if ($limit)	{
+            if ($page < 0)
+            {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql.= $db->plimit($limit + 1, $offset);
+        }
+
+        $result = $db->query($sql);
+        if ($result)
+        {
+            $num = $db->num_rows($result);
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($result);
+                $myobject_static = new MyObject($db);
+                if($myobject_static->fetch($obj->rowid)) {
+                    $obj_ret[] = parent::_cleanObjectDatas($myobject_static);
+                }
+                $i++;
+            }
+        }
+        else {
+            throw new RestException(503, 'Error when retrieve myobject list');
+        }
+        if( ! count($obj_ret)) {
+            throw new RestException(404, 'No myobject found');
+        }
+		return $obj_ret;
+    }
+    
+    /**
+     * Create myobject object
+     *
+     * @param array $request_data   Request datas
+     * @return int  ID of myobject
+     * 
+     * @url	POST myobject/
+     */
+    function post($request_data = NULL)
+    {
+        if(! DolibarrApiAccess::$user->rights->myobject->create) {
+			throw new RestException(401);
+		}
+        // Check mandatory fields
+        $result = $this->_validate($request_data);
+        
+        foreach($request_data as $field => $value) {
+            $this->myobject->$field = $value;
+        }
+        if( ! $this->myobject->create(DolibarrApiAccess::$user)) {
+            throw new RestException(500);
+        }
+        return $this->myobject->id;
+    }
+
+    /**
+     * Update myobject
+     *
+     * @param int   $id             Id of myobject to update
+     * @param array $request_data   Datas   
+     * @return int 
+     * 
+     * @url	PUT myobject/{id}
+     */
+    function put($id, $request_data = NULL)
+    {
+        if(! DolibarrApiAccess::$user->rights->myobject->create) {
+			throw new RestException(401);
+		}
+        
+        $result = $this->myobject->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'MyObject not found');
+        }
+		
+		if( ! DolibarrApi::_checkAccessToResource('myobject',$this->myobject->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+        foreach($request_data as $field => $value) {
+            $this->myobject->$field = $value;
+        }
+        
+        if($this->myobject->update($id, DolibarrApiAccess::$user))
+            return $this->get ($id);
+        
+        return false;
+    }
+    
+    /**
+     * Delete myobject
+     *
+     * @param   int     $id   MyObject ID
+     * @return  array
+     * 
+     * @url	DELETE myobject/{id}
+     */
+    function delete($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->myobject->supprimer) {
+			throw new RestException(401);
+		}
+        $result = $this->myobject->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'MyObject not found');
+        }
+		
+		if( ! DolibarrApi::_checkAccessToResource('myobject',$this->myobject->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+        
+        if( !$this->myobject->delete($id))
+        {
+            throw new RestException(500);
+        }
+        
+         return array(
+            'success' => array(
+                'code' => 200,
+                'message' => 'MyObject deleted'
+            )
+        );
+        
+    }
+    
+    /**
+     * Validate fields before create or update object
+     * 
+     * @param array $data   Data to validate
+     * @return array
+     * 
+     * @throws RestException
+     */
+    function _validate($data)
+    {
+        $myobject = array();
+        foreach (MyObjectApi::$FIELDS as $field) {
+            if (!isset($data[$field]))
+                throw new RestException(400, "$field field missing");
+            $myobject[$field] = $data[$field];
+        }
+        return $myobject;
+    }
+}
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 152059cd79a..71948b0e1be 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -1,10 +1,11 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.com>
  *
- * This program is free software: you can redistribute it and/or modify
+ * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,309 +14,28 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
- * \defgroup    mymodule    MyModule module
- * \brief       MyModule module descriptor.
+ * 	\defgroup   mymodule     Module MyModule
+ *  \brief      MyModule module descriptor.
  *
- * Put detailed description here.
+ *  \file       htdocs/mymodule/core/modules/modMyModule.class.php
+ *  \ingroup    mymodule
+ *  \brief      Description and activation file for module MyModule
  */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
-/**
- * \file        core/modules/modMyModule.class.php
- * \ingroup     mymodule
- * \brief       Example module description and activation file.
- *
- * Put detailed description here.
- */
-
-include_once DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php";
 
 // The class name should start with a lower case mod for Dolibarr to pick it up
 // so we ignore the Squiz.Classes.ValidClassName.NotCamelCaps rule.
 // @codingStandardsIgnoreStart
 /**
- * Description and activation class for module MyModule
+ *  Description and activation class for module MyModule
  */
 class modMyModule extends DolibarrModules
 {
-	/** @var DoliDB Database handler */
-	public $db;
-
-	/**
-	 * @var int numero Module unique ID
-	 * @see http://wiki.dolibarr.org/index.php/List_of_modules_id Available ranges
-	 */
-	public $numero = 500000;
-
-	/** @var string Text key to reference module (for permissions, menus, etc.) */
-	public $rights_class = 'mymodule';
-
-	/**
-	 * @var string Module family.
-	 * Used to group modules in module setup page.
-	 * Can be one of 'crm', 'financial', 'hr', 'projects', 'products', 'ecm', 'technic', 'other'
-	 */
-	public $family = 'other';
-
-	/** @var int Module position in the family */
-	public $module_position = 500;
-
-	/** @var array Provide a custom family and options */
-	public $familyinfo = array(
-//        'myownfamily' => array(
-//            'position' => '001',
-//            'label' => 'MyOwnFamily'
-//        )
-	);
-
-	/** @var string Module name */
-	public $name = "My Module";
-
-	/** @var string Module short description */
-	public $description = "Description of module MyModule";
-
-	/** @var string Module long description */
-	public $descriptionlong = "A very long description. Can be a full HTML content";
-
-	/**
-	 * @var string Module editor name
-	 * @since 4.0
-	 */
-	public $editor_name = "My Company";
-
-	/**
-	 * @var string Module editor website
-	 * @since 4.0
-	 */
-	public $editor_url = "http://www.example.com";
-
-	/**
-	 * @var string Module version string
-	 * Special values to hide the module behind MAIN_FEATURES_LEVEL: development, experimental
-	 * @see https://semver.org
-	 */
-	public $version = 'development';
-
-	/** @var string Key used in llx_const table to save module status enabled/disabled */
-	public $const_name = 'MAIN_MODULE_MYMODULE';
-
-	/**
-	 * @var string Module logo
-	 * Should be named object_mymodule.png and store under mymodule/img
-	 */
-	public $picto = 'mymodule@mymodule';
-
-	/** @var array Define module parts */
-	public $module_parts = array(
-		/** @var bool Module ships triggers in mymodule/core/triggers */
-		'triggers' => true,
-		/**
-		 * @var bool Module ships login in mymodule/core/login
-		 * @todo: example
-		 */
-		'login' => false,
-		/**
-		 * @var bool Module ships substitution functions
-		 * @todo example
-		 */
-		'substitutions' => false,
-		/**
-		 * @var bool Module ships menu handlers
-		 * @todo example
-		 */
-		'menus' => false,
-		/**
-		 * @var bool Module ships theme in mymodule/theme
-		 * @todo example
-		 */
-		'theme' => false,
-		/**
-		 * @var bool Module shipped templates in mymodule/core/tpl overload core ones
-		 * @todo example
-		 */
-		'tpl' => false,
-		/**
-		 * @var bool Module ships barcode functions
-		 * @todo example
-		 */
-		'barcode' => false,
-		/**
-		 * @var bool Module ships models
-		 * @todo example
-		 */
-		'models' => false,
-		/** @var string[] List of module shipped custom CSS relative file paths */
-		'css' => array(
-			'mymodule/css/mycss.css.php'
-		),
-		/** @var string[] List of module shipped custom JavaScript relative file paths */
-		'js' => array(
-			'mymodule/js/myjs.js.php'
-		),
-		/**
-		 * @var string[] List of hook contexts managed by the module
-		 * @ todo example
-		 */
-		'hooks' => array(),
-		/**
-		 * @var array List of default directory names to force
-		 * @todo example
-		 */
-		'dir' => array(),
-		/**
-		 * @var array List of workflow contexts managed by the module
-		 */
-		'workflow' => array(),
-	);
-
-	/** @var string Data directories to create when module is enabled */
-	public $dirs = array(
-		'/mymodule/temp'
-	);
-
-	/** @var array Configuration page declaration */
-	public $config_page_url = 'setup.php@mymodule';
-
-	/** @var bool Control module visibility */
-	public $hidden = false;
-
-	/** @var string[] List of class names of modules to enable when this one is enabled */
-	public $depends = array();
-
-	/** @var string[] List of class names of modules to disable when this one is disabled */
-	public $requiredby = array();
-
-	/** @var string List of class names of modules this module conflicts with */
-	public $conflictwith = array();
-
-	/** @var int[] Minimum PHP version required by this module */
-	public $phpmin = array(5, 3);
-
-	/** @var int[] Minimum Dolibarr version required by this module */
-	public $need_dolibarr_version = array(3, 2);
-
-	/** @var string[] List of language files */
-	public $langfiles = array('mymodule@mymodule');
-
-	/** @var array Indexed list of constants options */
-	public $const = array(
-		0 => array(
-			/** @var string Constant name */
-			'MYMODULE_MYNEWCONST1',
-			/**
-			 * @var string Constant type
-			 * @todo Are there other types than 'chaine'?
-			 */
-			'chaine',
-			/** @var string Constant initial value */
-			'myvalue',
-			/** @var string Constant description */
-			'This is a configuration constant',
-			/** @var bool Constant visibility */
-			true,
-			/**
-			 * @var string Multi-company entities
-			 * 'current' or 'allentities'
-			 */
-			'current',
-			/** @var bool Delete constant when module is disabled */
-			true
-		)
-	);
-
-	/**
-	 * @var string List of pages to add as tab in a specific view
-	 * @todo example
-	 */
-	public $tabs = array();
-
-	/**
-	 * @var array Dictionaries declared by the module
-	 *@todo example
-	 */
-	public $dictionaries = array();
-
-	/** @var array Indexed list of boxes options */
-	public $boxes = array(
-		0 => array(
-			'file' => 'mybox@mymodule',
-			'note' => '',
-			'enabledbydefaulton' => 'Home'
-		)
-	);
-
-	/**
-	 * @var array Indexed list of cronjobs options
-	 * @todo: example
-	 */
-	public $cronjobs = array();
-
-	/**
-	 * @var array Indexed list of permissions options
-	 * @todo example
-	 */
-	public $rights = array();
-
-	/**
-	 * @var array Indexed list of menu options
-	 * @todo example
-	 */
-	public $menu = array();
-
-	/**
-	 * @var array Indexed list of export IDs
-	 * @todo example
-	 */
-	public $export_code = array();
-
-	/**
-	 * @var array Indexed list of export names
-	 * @todo example
-	 */
-	public $export_label = array();
-
-	/**
-	 * @var array Indexed list of export enabling conditions
-	 * @todo example
-	 */
-	public $export_enabled = array();
-
-	/**
-	 * @var array Indexed list of export required permissions
-	 * @todo example
-	 */
-	public $export_permission = array();
-
-	/**
-	 * @var array Indexed list of export fields
-	 * @todo example
-	 */
-	public $export_fields_array = array();
-
-	/**
-	 * @var array Indexed list of export entities
-	 * @todo example
-	 */
-	public $export_entities_array = array();
-
-	/**
-	 * @var array Indexed list of export SQL queries start
-	 * @todo example
-	 */
-	public $export_sql_start = array();
-
-	/**
-	 * @var array Indexed list of export SQL queries end
-	 * @todo example
-	 */
-	public $export_sql_end = array();
-
-	/** @var bool Module only enabled / disabled in main company when multi-company is in use */
-	public $core_enabled = false;
-
 	// @codingStandardsIgnoreEnd
 	/**
 	 * Constructor. Define names, constants, directories, boxes, permissions
@@ -324,61 +44,90 @@ class modMyModule extends DolibarrModules
 	 */
 	public function __construct($db)
 	{
-		global $langs, $conf;
+        global $langs,$conf;
 
-		// DolibarrModules is abstract in Dolibarr < 3.8
-		if (is_callable('parent::__construct')) {
-			parent::__construct($db);
-		} else {
-			global $db;
-			$this->db = $db;
-		}
+        $this->db = $db;
 
-		// Declare custom family with translated label
-		//$this->familyinfo = array(
-		//	'myownfamily' => array(
-		//		'position' => '001',
-		//		'label' => $langs->trans("MyOwnFamily")
-		//	)
-		//);
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 500000;		// TODO Go on page http://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'mymodule';
 
-		// Lazy automatic module naming from class names
-		//$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','interface','other'
+		// It is used to group modules by family in module setup page
+		$this->family = "other";
+		// Module position in the family
+		$this->module_position = 500;
+		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		//$this->familyinfo = array('myownfamily' => array('position' => '001', 'label' => $langs->trans("MyOwnFamily")));
 
-		// Lazy automatic constant naming from module name
-		//$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i','',get_class($this));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "MyModuleDescription";
+		$this->descriptionlong = "MyModuleDescription (Long)";
+		$this->editor_name = 'Editor name';
+		$this->editor_url = 'https://www.example.com';
+		
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = '1.0';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto='generic';
 
-		// Examples for complex types
+		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+		// for default path (eg: /mymodule/core/xxxxx) (0=disable, 1=enable)
+		// for specific path of parts (eg: /mymodule/core/modules/barcode)
+		// for specific css file (eg: /mymodule/css/mymodule.css.php)
 		//$this->module_parts = array(
-			// Set here all hooks context managed by module
-			// 'hooks' => array('hookcontext1','hookcontext2'),
-			// To force the default directories names
-			// 'dir' => array('output' => 'othermodulename'),
-			// Set here all workflow context managed by module
-			// Don't forget to depend on modWorkflow!
-			// The description translation key will be descWORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2
-			// You will be able to check if it is enabled with the $conf->global->WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2 constant
-			// Implementation is up to you and is usually done in a trigger.
-			// 'workflow' => array(
-			//     'WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2' => array(
-			//         'enabled' => '! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)',
-			//         'picto' => 'yourpicto@mymodule',
-			//         'warning' => 'WarningTextTranslationKey',
-			//      ),
-			// ),
-		//);
+		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
+		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
+		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
+		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
+		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
+		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
+		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
+		//							'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
+	 	//							'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
+		//							'hooks' => array('hookcontext1','hookcontext2',...) // Set here all hooks context managed by module. You can also set hook context 'all'
+		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
+		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@mymodule')) // Set here all workflow context managed by module
+		//                        );
+		$this->module_parts = array();
 
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/mymodule/temp");
+		$this->dirs = array();
+
+		// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
+		$this->config_page_url = array("setup.php@mymodule");
+
+		// Dependencies
+		$this->hidden = false;			// A condition to hide module
+		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array();	// List of module ids to disable if this one is disabled
+		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
+		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+		$this->langfiles = array("mymodule@mymodule");
+
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+		// );
+		$this->const = array();
 
 		// Array to add new pages in new tabs
-		// Example:
-		//$this->tabs = array(
-			//	// To add a new tab identified by code tabname1
-			//	'objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',
-			//	// To add another new tab identified by code tabname2
-			//	'objecttype:+tabname2:Title2:langfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',
-			//	// To remove an existing tab identified by code tabname
-			//	'objecttype:-tabname'
-		//);
+		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
+        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		// where objecttype can be
 		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
 		// 'contact'          to add a tab in contact view
 		// 'contract'         to add a tab in contract view
@@ -398,317 +147,142 @@ class modMyModule extends DolibarrModules
 		// 'stock'            to add a tab in stock view
 		// 'thirdparty'       to add a tab in third party view
 		// 'user'             to add a tab in user view
+        $this->tabs = array();
 
-		// Dictionaries
-		if (! isset($conf->mymodule->enabled)) {
-			$conf->mymodule=new stdClass();
-			$conf->mymodule->enabled = 0;
-		}
-		//$this->dictionaries = array();
-		/* Example:
-		  $this->dictionaries=array(
-			  'langs'=>'mymodule@mymodule',
-			  // List of tables we want to see into dictonary editor
-			  'tabname'=>array(
-				  MAIN_DB_PREFIX."table1",
-				  MAIN_DB_PREFIX."table2",
-				  MAIN_DB_PREFIX."table3"
-			  ),
-			  // Label of tables
-			  'tablib'=>array("Table1","Table2","Table3"),
-			  // Query to select fields
-			  'tabsql'=>array(
-				  'SELECT f.rowid as rowid, f.code, f.label, f.active'
-				  . ' FROM ' . MAIN_DB_PREFIX . 'table1 as f',
-				  'SELECT f.rowid as rowid, f.code, f.label, f.active'
-				  . ' FROM ' . MAIN_DB_PREFIX . 'table2 as f',
-				  'SELECT f.rowid as rowid, f.code, f.label, f.active'
-				  . ' FROM ' . MAIN_DB_PREFIX . 'table3 as f'
-			  ),
-			  // Sort order
-			  'tabsqlsort'=>array("label ASC","label ASC","label ASC"),
-			  // List of fields (result of select to show dictionary)
-			  'tabfield'=>array("code,label","code,label","code,label"),
-			  // List of fields (list of fields to edit a record)
-			  'tabfieldvalue'=>array("code,label","code,label","code,label"),
-			  // List of fields (list of fields for insert)
-			  'tabfieldinsert'=>array("code,label","code,label","code,label"),
-			  // Name of columns with primary key (try to always name it 'rowid')
-			  'tabrowid'=>array("rowid","rowid","rowid"),
-			  // Condition to show each dictionary
-			  'tabcond'=>array(
-				  $conf->mymodule->enabled,
-				  $conf->mymodule->enabled,
-				  $conf->mymodule->enabled
-			  )
-		  );
-		 */
+		if (! isset($conf->mymodule) || ! isset($conf->mymodule->enabled))
+        {
+        	$conf->mymodule=new stdClass();
+        	$conf->mymodule->enabled=0;
+        }
+        
+        // Dictionaries
+		$this->dictionaries=array();
+        /* Example:
+        $this->dictionaries=array(
+            'langs'=>'mylangfile@mymodule',
+            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
+            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
+            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
+            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
+            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
+            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
+            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
+            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
+            'tabcond'=>array($conf->mymodule->enabled,$conf->mymodule->enabled,$conf->mymodule->enabled)												// Condition to show each dictionary
+        );
+        */
+
+        // Boxes
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+        $this->boxes = array();			// List of boxes
+		// Example:
+		//$this->boxes=array(
+		//    0=>array('file'=>'myboxa.php@mymodule','note'=>'','enabledbydefaulton'=>'Home'),
+		//    1=>array('file'=>'myboxb.php@mymodule','note'=>''),
+		//    2=>array('file'=>'myboxc.php@mymodule','note'=>'')
+		//);
 
 		// Cronjobs
-		// List of cron jobs entries to add
-		//$this->cronjobs = array();
-		// Example:
-		//		$this->cronjobs = array(
-		//			0 => array(
-		//				'label' => 'My label',
-		//				'jobtype' => 'method',
-		//				'class' => '/dir/class/file.class.php',
-		//				'objectname' => 'MyClass',
-		//				'method' => 'myMethod',
-		//				'parameters' => '',
-		//				'comment' => 'Comment',
-		//				'frequency' => 2,
-		//				'unitfrequency' => 3600,
-		//				'test' => true
-		//			),
-		//			1 => array(
-		//				'label' => 'My label',
-		//				'jobtype' => 'command',
-		//				'command' => '',
-		//				'parameters' => '',
-		//				'comment' => 'Comment',
-		//				'frequency' => 1,
-		//				'unitfrequency' => 3600 * 24,
-		//				'test' => true
-		//			)
-		//		);
+		$this->cronjobs = array();			// List of cron jobs entries to add
+		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true),
+		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true)
+		// );
 
 		// Permissions
-		//$r = 0;
-		// Add here list of permission defined by
-		// an id, a label, a boolean and two constant strings.
-		// Example:
-		//// Permission id (must not be already used)
-		//$this->rights[$r][0] = 2000;
-		//// Permission label
-		//$this->rights[$r][1] = 'Permision label';
-		//// Permission by default for new user (0/1)
-		//$this->rights[$r][3] = 1;
-		//// In php code, permission will be checked by test
-		//// if ($user->rights->permkey->level1->level2)
-		//$this->rights[$r][4] = 'level1';
-		//// In php code, permission will be checked by test
-		//// if ($user->rights->permkey->level1->level2)
-		//$this->rights[$r][5] = 'level2';
-		//$r++;
-		// Main menu entries
+		$this->rights = array();		// Permission array used by this module
+		$r=0;
 
-		// Menu entries
+		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
+		// Example:
+		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		// $this->rights[$r][1] = 'Permision label';	// Permission label
+		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $r++;
+
+		// Main menu entries
+		$this->menu = array();			// List of menus to add
+		$r=0;
+
+		// Add here entries to declare new menus
+		//
 		// Example to declare a new Top Menu entry and its Left menu entry:
-		//$this->menu[]=array(
-		//	// Put 0 if this is a top menu
-		//	'fk_menu'=>0,
-		//	// This is a Top menu entry
-		//	'type'=>'top',
-		// Menu's title. FIXME: use a translation key
-		//	'titre'=>'MyModule top menu',
-		// This menu's mainmenu ID
-		//	'mainmenu'=>'mymodule',
-		// This menu's leftmenu ID
-		//	'leftmenu'=>'mymodule',
-		//	'url'=>'/mymodule/pagetop.php',
-		//	// Lang file to use (without .lang) by module.
-		//	// File must be in langs/code_CODE/ directory.
-		//	'langs'=>'mylangfile',
-		//	'position'=>100,
-		//	// Define condition to show or hide menu entry.
-		//	// Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//	'enabled'=>'$conf->mymodule->enabled',
-		//	// Use 'perms'=>'$user->rights->mymodule->level1->level2'
-		//	// if you want your menu with a permission rules
-		//	'perms'=>'1',
-		//	'target'=>'',
-		//	// 0=Menu for internal users, 1=external users, 2=both
-		//	'user'=>2
-		//);
-		//$this->menu[]=array(
-		//	// Use r=value where r is index key used for the parent menu entry
-		//	// (higher parent must be a top menu entry)
-		//	'fk_menu'=>'r=0',
-		//	// This is a Left menu entry
-		//	'type'=>'left',
-		// Menu's title. FIXME: use a translation key
-		//	'titre'=>'MyModule left menu',
-		// This menu's mainmenu ID
-		//	'mainmenu'=>'mymodule',
-		// This menu's leftmenu ID
-		//	'leftmenu'=>'mymodule',
-		//	'url'=>'/mymodule/pagelevel1.php',
-		//	// Lang file to use (without .lang) by module.
-		//	// File must be in langs/code_CODE/ directory.
-		//	'langs'=>'mylangfile',
-		//	'position'=>100,
-		//	// Define condition to show or hide menu entry.
-		//	// Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//	'enabled'=>'$conf->mymodule->enabled',
-		//	// Use 'perms'=>'$user->rights->mymodule->level1->level2'
-		//	// if you want your menu with a permission rules
-		//	'perms'=>'1',
-		//	'target'=>'',
-		//	// 0=Menu for internal users, 1=external users, 2=both
-		//	'user'=>2
-		//);
+		// $this->menu[$r]=array(	'fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		//							'type'=>'top',			                // This is a Top menu entry
+		//							'titre'=>'MyModule top menu',
+		//							'mainmenu'=>'mymodule',
+		//							'leftmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagetop.php',
+		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'enabled'=>'$conf->mymodule->enabled',	// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
+		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
 		//
 		// Example to declare a Left Menu entry into an existing Top menu entry:
-		//$this->menu[]=array(
-		//	// Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy'
-		//	'fk_menu'=>'fk_mainmenu=mainmenucode',
-		//	// This is a Left menu entry
-		//	'type'=>'left',
-		// Menu's title. FIXME: use a translation key
-		//	'titre'=>'MyModule left menu',
-		// This menu's mainmenu ID
-		//	'mainmenu'=>'mainmenucode',
-		// This menu's leftmenu ID
-		//	'leftmenu'=>'mymodule',
-		//	'url'=>'/mymodule/pagelevel2.php',
-		//	// Lang file to use (without .lang) by module.
-		//	// File must be in langs/code_CODE/ directory.
-		//	'langs'=>'mylangfile',
-		//	'position'=>100,
-		//	// Define condition to show or hide menu entry.
-		//	// Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//	// Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-		//	'enabled'=>'$conf->mymodule->enabled',
-		//	// Use 'perms'=>'$user->rights->mymodule->level1->level2'
-		//	// if you want your menu with a permission rules
-		//	'perms'=>'1',
-		//	'target'=>'',
-		//	// 0=Menu for internal users, 1=external users, 2=both
-		//	'user'=>2
-		//);
+		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		//							'type'=>'left',			                // This is a Left menu entry
+		//							'titre'=>'MyModule left menu',
+		//							'mainmenu'=>'xxx',
+		//							'leftmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagelevel2.php',
+		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'enabled'=>'$conf->mymodule->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'target'=>'',
+		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		// $r++;
+
 
 		// Exports
-		//$r = 0;
+		$r=1;
+
 		// Example:
-		//$this->export_code[$r]=$this->rights_class.'_'.$r;
-		//// Translation key (used only if key ExportDataset_xxx_z not found)
-		//$this->export_label[$r]='CustomersInvoicesAndInvoiceLines';
-		//// Condition to show export in list (ie: '$user->id==3').
-		//// Set to 1 to always show when module is enabled.
-		//$this->export_enabled[$r]='1';
-		//$this->export_permission[$r]=array(array("facture","facture","export"));
-		//$this->export_fields_array[$r]=array(
-		//	's.rowid'=>"IdCompany",
-		//	's.nom'=>'CompanyName',
-		//	's.address'=>'Address',
-		//	's.cp'=>'Zip',
-		//	's.ville'=>'Town',
-		//	's.fk_pays'=>'Country',
-		//	's.tel'=>'Phone',
-		//	's.siren'=>'ProfId1',
-		//	's.siret'=>'ProfId2',
-		//	's.ape'=>'ProfId3',
-		//	's.idprof4'=>'ProfId4',
-		//	's.code_compta'=>'CustomerAccountancyCode',
-		//	's.code_compta_fournisseur'=>'SupplierAccountancyCode',
-		//	'f.rowid'=>"InvoiceId",
-		//	'f.facnumber'=>"InvoiceRef",
-		//	'f.datec'=>"InvoiceDateCreation",
-		//	'f.datef'=>"DateInvoice",
-		//	'f.total'=>"TotalHT",
-		//	'f.total_ttc'=>"TotalTTC",
-		//	'f.tva'=>"TotalVAT",
-		//	'f.paye'=>"InvoicePaid",
-		//	'f.fk_statut'=>'InvoiceStatus',
-		//	'f.note'=>"InvoiceNote",
-		//	'fd.rowid'=>'LineId',
-		//	'fd.description'=>"LineDescription",
-		//	'fd.price'=>"LineUnitPrice",
-		//	'fd.tva_tx'=>"LineVATRate",
-		//	'fd.qty'=>"LineQty",
-		//	'fd.total_ht'=>"LineTotalHT",
-		//	'fd.total_tva'=>"LineTotalTVA",
-		//	'fd.total_ttc'=>"LineTotalTTC",
-		//	'fd.date_start'=>"DateStart",
-		//	'fd.date_end'=>"DateEnd",
-		//	'fd.fk_product'=>'ProductId',
-		//	'p.ref'=>'ProductRef'
-		//);
-		//$this->export_entities_array[$r]=array('s.rowid'=>"company",
-		//	's.nom'=>'company',
-		//	's.address'=>'company',
-		//	's.cp'=>'company',
-		//	's.ville'=>'company',
-		//	's.fk_pays'=>'company',
-		//	's.tel'=>'company',
-		//	's.siren'=>'company',
-		//	's.siret'=>'company',
-		//	's.ape'=>'company',
-		//	's.idprof4'=>'company',
-		//	's.code_compta'=>'company',
-		//	's.code_compta_fournisseur'=>'company',
-		//	'f.rowid'=>"invoice",
-		//	'f.facnumber'=>"invoice",
-		//	'f.datec'=>"invoice",
-		//	'f.datef'=>"invoice",
-		//	'f.total'=>"invoice",
-		//	'f.total_ttc'=>"invoice",
-		//	'f.tva'=>"invoice",
-		//	'f.paye'=>"invoice",
-		//	'f.fk_statut'=>'invoice',
-		//	'f.note'=>"invoice",
-		//	'fd.rowid'=>'invoice_line',
-		//	'fd.description'=>"invoice_line",
-		//	'fd.price'=>"invoice_line",
-		//	'fd.total_ht'=>"invoice_line",
-		//	'fd.total_tva'=>"invoice_line",
-		//	'fd.total_ttc'=>"invoice_line",
-		//	'fd.tva_tx'=>"invoice_line",
-		//	'fd.qty'=>"invoice_line",
-		//	'fd.date_start'=>"invoice_line",
-		//	'fd.date_end'=>"invoice_line",
-		//	'fd.fk_product'=>'product',
-		//	'p.ref'=>'product'
-		//);
-		//$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-		//$this->export_sql_end[$r] = ' FROM (' . MAIN_DB_PREFIX . 'facture as f, '
-		//	. MAIN_DB_PREFIX . 'facturedet as fd, ' . MAIN_DB_PREFIX . 'societe as s)';
-		//$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX
-		//	. 'product as p on (fd.fk_product = p.rowid)';
-		//$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid '
-		//	. 'AND f.rowid = fd.fk_facture';
-		//$r++;
+		// $this->export_code[$r]=$this->rights_class.'_'.$r;
+		// $this->export_label[$r]='MyModule';	// Translation key (used only if key ExportDataset_xxx_z not found)
+        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
+        // $this->export_icon[$r]='generic:MyModule';					// Put here code of icon then string for translation key of module name
+		// $this->export_permission[$r]=array(array("mymodule","level1","level2"));
+		// $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef');
+		// $this->export_TypeFields_array[$r]=array('t.date'=>'Date', 't.qte'=>'Numeric', 't.poids'=>'Numeric', 't.fad'=>'Numeric', 't.paq'=>'Numeric', 't.stockage'=>'Numeric', 't.fadparliv'=>'Numeric', 't.livau100'=>'Numeric', 't.forfait'=>'Numeric', 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text');
+		// $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product');
+		// $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		// $this->export_sql_start[$r]='SELECT DISTINCT ';
+		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
+		// $r++;
 	}
 
 	/**
-	 * Function called when module is enabled.
-	 * The init function add constants, boxes, permissions and menus
-	 * (defined in constructor) into Dolibarr database.
-	 * It also creates data directories
+	 *		Function called when module is enabled.
+	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *		It also creates data directories
 	 *
-	 * @param string $options Options when enabling module ('', 'noboxes')
-	 * @return int 1 if OK, 0 if KO
+     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	public function init($options = '')
+	public function init($options='')
 	{
 		$sql = array();
 
-		$result = $this->loadTables();
+		$this->_load_tables('/mymodule/sql/');
 
 		return $this->_init($sql, $options);
 	}
 
-	/**
-	 * Create tables, keys and data required by module
-	 * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
-	 * and create data commands must be stored in directory /mymodule/sql/
-	 * This function is called by this->init
-	 *
-	 * @return int <=0 if KO, >0 if OK
-	 */
-	private function loadTables()
-	{
-		return $this->_load_tables('/mymodule/sql/');
-	}
-
 	/**
 	 * Function called when module is disabled.
 	 * Remove from database constants, boxes and permissions from Dolibarr database.
 	 * Data directories are not deleted
 	 *
-	 * @param string $options Options when enabling module ('', 'noboxes')
-	 * @return int 1 if OK, 0 if KO
+	 * @param      string	$options    Options when enabling module ('', 'noboxes')
+	 * @return     int             	1 if OK, 0 if KO
 	 */
 	public function remove($options = '')
 	{
@@ -716,4 +290,5 @@ class modMyModule extends DolibarrModules
 
 		return $this->_remove($sql, $options);
 	}
+
 }
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyTrigger.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_Triggers.class.php
similarity index 91%
rename from htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyTrigger.class.php
rename to htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_Triggers.class.php
index 761a717d944..56f00ab8b02 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyTrigger.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_Triggers.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    core/triggers/interface_99_modMyModule_MyTrigger.class.php
+ * \file    core/triggers/interface_99_modMyModule_Triggers.class.php
  * \ingroup mymodule
  * \brief   Example trigger.
  *
@@ -30,17 +30,16 @@
  * - The file must stay in core/triggers
  * - The class name must be InterfaceMytrigger
  * - The constructor method must be named InterfaceMytrigger
- * - The name property name must be Mytrigger
+ * - The name property name must be MyTrigger
  */
 
-/** Includes */
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . dol_buildpath('/mymodule/class/MyTrigger.php', 1);
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+
 
 /**
- * Class InterfaceMytrigger
+ *  Class of triggers for MyModule module
  */
-class InterfaceMytrigger extends MyTrigger
+class InterfaceMyModuleTrigger extends DolibarrTriggers
 {
 	/**
 	 * @var DoliDB Database handler
@@ -58,9 +57,7 @@ class InterfaceMytrigger extends MyTrigger
 
 		$this->name = preg_replace('/^Interface/i', '', get_class($this));
 		$this->family = "demo";
-		$this->description = "Triggers of this module are empty functions."
-			. "They have no effect."
-			. "They are provided for tutorial purpose only.";
+		$this->description = "MyModule triggers.";
 		// 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'development';
 		$this->picto = 'mymodule@mymodule';
@@ -86,58 +83,18 @@ class InterfaceMytrigger extends MyTrigger
 		return $this->description;
 	}
 
-	/**
-	 * Trigger version
-	 *
-	 * @return string Version of trigger file
-	 */
-	public function getVersion()
-	{
-		global $langs;
-		$langs->load("admin");
-
-		if ($this->version == 'development') {
-			return $langs->trans("Development");
-		} elseif ($this->version == 'experimental') {
-			return $langs->trans("Experimental");
-		} elseif ($this->version == 'dolibarr') {
-			return DOL_VERSION;
-		} elseif ($this->version) {
-			return $this->version;
-		} else {
-			return $langs->trans("Unknown");
-		}
-	}
-
-    // @codingStandardsIgnoreStart
-	/**
-	 * Compatibility trigger function for Dolibarr < 3.7
-	 *
-	 * @param int $action Trigger action
-	 * @param CommonObject $object Object trigged from
-	 * @param User $user User that trigged
-	 * @param Translate $langs Translations handler
-	 * @param Conf $conf Configuration
-	 * @return int                  <0 if KO, 0 if no triggered ran, >0 if OK
-	 * @deprecated Replaced by DolibarrTriggers::runTrigger()
-	 */
-	public function run_trigger($action, $object, $user, $langs, $conf)
-	{
-		return $this->runTrigger($action, $object, $user, $langs, $conf);
-	}
-	// @codingStandardsIgnoreEnd
 
 	/**
 	 * Function called when a Dolibarrr business event is done.
 	 * All functions "runTrigger" are triggered if file
 	 * is inside directory core/triggers
 	 *
-	 * @param string $action Event action code
-	 * @param CommonObject $object Object
-	 * @param User $user Object user
-	 * @param Translate $langs Object langs
-	 * @param Conf $conf Object conf
-	 * @return int              <0 if KO, 0 if no triggered ran, >0 if OK
+	 * @param string 		$action 	Event action code
+	 * @param CommonObject 	$object 	Object
+	 * @param User 			$user 		Object user
+	 * @param Translate 	$langs 		Object langs
+	 * @param Conf 			$conf 		Object conf
+	 * @return int              		<0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
diff --git a/htdocs/modulebuilder/template/img/object_mymodule.png b/htdocs/modulebuilder/template/img/myobject_mymodule.png
similarity index 100%
rename from htdocs/modulebuilder/template/img/object_mymodule.png
rename to htdocs/modulebuilder/template/img/myobject_mymodule.png
diff --git a/htdocs/modulebuilder/template/js/mymodule.js.php b/htdocs/modulebuilder/template/js/mymodule.js.php
index ae8ce6cbe0d..a08ae02c2fc 100644
--- a/htdocs/modulebuilder/template/js/mymodule.js.php
+++ b/htdocs/modulebuilder/template/js/mymodule.js.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    js/mymodule.js.php
+ * \file    htdocs/modulebuilder/template/js/mymodule.js.php
  * \ingroup mymodule
  * \brief   Example JavaScript.
  *
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index a257149c72a..6db376ff9b1 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -1,10 +1,10 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
+/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
  *
- * This program is free software: you can redistribute it and/or modify
+ * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,21 +13,20 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
- * \file    myobject_list.php
- * \ingroup mymodule
- * \brief   Page with list of myobject.
- *
- * List of myobject
+ *   	\file       htdocs/modulebuilder/template/myobject_card.php
+ *		\ingroup    mymodule othermodule1 othermodule2
+ *		\brief      This file is an example of a php page
+ *					Put here some comments
  */
 
-//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
+//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 //if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
 //if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
 //if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
@@ -36,28 +35,31 @@
 //if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 //if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
 
-// Change the following lines to use the correct relative path (../, ../../, etc)
+// Change this following line to use the correct relative path (../, ../../, etc)
+$res=0;
+if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
+if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
+if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
+if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
+if (! $res) die("Include of main fails");
+// Change this following line to use the correct relative path from htdocs
+include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
+dol_include_once('/mymodule/class/myobject_class.class.php');
 
-// Load Dolibarr environment
-if (false === (@include '../../main.inc.php')) {  // From htdocs directory
-	require '../../../main.inc.php'; // From "custom" directory
-}
-
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-dol_include_once('/mymodule/class/myclass.class.php');
-
-// Load translation files required by the page
-$langs->load("mymodule@mymodule");
+// Load traductions files requiredby by page
+$langs->load("mymodule");
+$langs->load("other");
 
 // Get parameters
-$action     = GETPOST('action','alpha');
-$confirm    = GETPOST('confirm','alpha');
-
 $id			= GETPOST('id','int');
+$action		= GETPOST('action','alpha');
+$cancel     = GETPOST('cancel');
 $backtopage = GETPOST('backtopage');
-// TODO Add here list of search params
 $myparam	= GETPOST('myparam','alpha');
 
+$search_field1=GETPOST("search_field1");
+$search_field2=GETPOST("search_field2");
+
 if (empty($action) && empty($id) && empty($ref)) $action='view';
 
 // Protection if external user
@@ -67,7 +69,8 @@ if ($user->societe_id > 0)
 }
 //$result = restrictedArea($user, 'mymodule', $id);
 
-$object = new Skeleton_Class($db);
+
+$object = new MyObject_Class($db);
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
@@ -77,7 +80,8 @@ $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('skeleton'));
+$hookmanager->initHooks(array('mymodule'));
+
 
 
 /*
@@ -86,7 +90,6 @@ $hookmanager->initHooks(array('skeleton'));
  * Put here all code to do according to value of "action" parameter
  */
 
-
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -206,15 +209,16 @@ if (empty($reshook))
 
 
 
+
 /*
  * VIEW
  *
  * Put here all code to build page
  */
 
-$form = new Form($db);
+$form=new Form($db);
 
-llxHeader('', $langs->trans('MyPageName'), '');
+llxHeader('','MyPageName','');
 
 
 // Put here content of your page
@@ -293,54 +297,308 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 {
     $res = $object->fetch_optionals($object->id, $extralabels);
 
-	$head = commande_prepare_head($object);
-	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), 0, 'order');
+	$head = mymodule_prepare_head($object);
+	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
 		
-	print load_fiche_titre($langs->trans("MyModule"));
-    
-	dol_fiche_head();
-
+	$formconfirm = '';
+	
+	// Confirmation to delete
 	if ($action == 'delete') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
-		print $formconfirm;
+	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
 	}
 	
+	// Confirmation of action xxxx
+	if ($action == 'xxx')
+	{
+	    $formquestion=array();
+	    /*
+	        $formquestion = array(
+	            // 'text' => $langs->trans("ConfirmClone"),
+	            // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+	            // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+	            // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
+	    }*/	
+	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+	}
+	
+	if (! $formconfirm) {
+	    $parameters = array('lineid' => $lineid);
+	    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
+	    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+	}
+	
+	// Print form confirm
+	print $formconfirm;
+	
+	
+	
+	// Object card
+	// ------------------------------------------------------------
+	
+	$linkback = '<a href="' . DOL_URL_ROOT . '/mymodule/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	
+	
+	$morehtmlref='<div class="refidno">';
+	/*
+	// Ref bis
+	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+	    $langs->load("projects");
+	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	    if ($user->rights->mymodule->creer)
+	    {
+	        if ($action != 'classify')
+	        {
+	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	            if ($action == 'classify') {
+	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	                $morehtmlref.='</form>';
+	            } else {
+	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	            }
+	        }
+	    } else {
+	        if (! empty($object->fk_project)) {
+	            $proj = new Project($db);
+	            $proj->fetch($object->fk_project);
+	            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+	            $morehtmlref.=$proj->ref;
+	            $morehtmlref.='</a>';
+	        } else {
+	            $morehtmlref.='';
+	        }
+	    }
+	}
+	*/
+	$morehtmlref.='</div>';
+	
+	
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	
+	
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">'."\n";
 	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
 	// LIST_OF_TD_LABEL_FIELDS_VIEW
+
+
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
 	print '</table>';
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="ficheaddleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent">';
+	
+	
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+	print '</div>';
+	
+	print '<div class="clearboth"></div><br>';
 	
 	dol_fiche_end();
 
 
-	// Buttons
-	print '<div class="tabsAction">'."\n";
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-	if (empty($reshook))
-	{
-		if ($user->rights->mymodule->write)
-		{
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-		}
-
-		if ($user->rights->mymodule->delete)
-		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-		}
+	// Buttons for actions
+	if ($action != 'presend' && $action != 'editline') {
+    	print '<div class="tabsAction">'."\n";
+    	$parameters=array();
+    	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+    
+    	if (empty($reshook))
+    	{
+    		if ($user->rights->mymodule->write)
+    		{
+    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+    		}
+    
+    		if ($user->rights->mymodule->delete)
+    		{
+    			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+    		}
+    	}
+    	print '</div>'."\n";
 	}
-	print '</div>'."\n";
 
+	
+	// Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+	    $action = 'presend';
+	}
+	
+	if ($action != 'presend')
+	{
+	    print '<div class="fichecenter"><div class="fichehalfleft">';
+	    print '<a name="builddoc"></a>'; // ancre
+	    // Documents
+	    $comref = dol_sanitizeFileName($object->ref);
+	    $relativepath = $comref . '/' . $comref . '.pdf';
+	    $filedir = $conf->mymodule->dir_output . '/' . $comref;
+	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+	    $genallowed = $user->rights->mymodule->creer;
+	    $delallowed = $user->rights->mymodule->supprimer;
+	    print $formfile->showdocuments('mymodule', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+	
+	
+	    // Show links to link elements
+	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
+	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+	
+	
+	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	
+	    // List of actions on element
+	    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+	    $formactions = new FormActions($db);
+	    $somethingshown = $formactions->showactions($object, 'order', $socid);
+	
+	    print '</div></div></div>';
+	}
+	
 
-	// Example 2 : Adding links to objects
-	// Show links to link elements
-	//$linktoelem = $form->showLinkToObjectBlock($object, null, array('skeleton'));
-	//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+	/*
+	 * Action presend
+	 */
+    /*
+	if ($action == 'presend')
+	{
+		$object->fetch_projet();
 
+		$ref = dol_sanitizeFileName($object->ref);
+		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+		$file = $fileparams['fullname'];
+
+		// Define output language
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+			$newlang = $_REQUEST['lang_id'];
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+			$newlang = $object->thirdparty->default_lang;
+
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang($newlang);
+			$outputlangs->load('commercial');
+		}
+
+		// Build document if it not exists
+		if (! $file || ! is_readable($file)) {
+			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			if ($result <= 0) {
+				dol_print_error($db, $object->error, $object->errors);
+				exit();
+			}
+			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+			$file = $fileparams['fullname'];
+		}
+
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+		print '<div class="clearboth"></div>';
+		print '<br>';
+		print load_fiche_titre($langs->trans('SendOrderByMail'));
+
+		dol_fiche_head('');
+
+		// Cree l'objet formulaire mail
+		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+        if($formmail->fromtype === 'user'){
+            $formmail->fromid = $user->id;
+
+        }
+		$formmail->trackid='ord'.$object->id;
+		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+		{
+			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
+		}
+		$formmail->withfrom = 1;
+		$liste = array();
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
+			$liste [$key] = $value;
+		$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
+		$formmail->withtocc = $liste;
+		$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+		if (empty($object->ref_client)) {
+			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
+		} else if (! empty($object->ref_client)) {
+			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
+		}
+		$formmail->withfile = 2;
+		$formmail->withbody = 1;
+		$formmail->withdeliveryreceipt = 1;
+		$formmail->withcancel = 1;
+		// Tableau des substitutions
+		$formmail->setSubstitFromObject($object);
+		$formmail->substit ['__ORDERREF__'] = $object->ref;
+
+		$custcontact = '';
+		$contactarr = array();
+		$contactarr = $object->liste_contact(- 1, 'external');
+
+		if (is_array($contactarr) && count($contactarr) > 0)
+		{
+			foreach ($contactarr as $contact)
+			{
+				if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
+					$contactstatic = new Contact($db);
+					$contactstatic->fetch($contact ['id']);
+					$custcontact = $contactstatic->getFullName($langs, 1);
+				}
+			}
+
+			if (! empty($custcontact)) {
+				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
+			}
+		}
+
+		// Tableau des parametres complementaires
+		$formmail->param['action'] = 'send';
+		$formmail->param['models'] = 'order_send';
+		$formmail->param['models_id']=GETPOST('modelmailselected','int');
+		$formmail->param['orderid'] = $object->id;
+		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+
+		// Init list of files
+		if (GETPOST("mode") == 'init') {
+			$formmail->clear_attached_files();
+			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
+		}
+
+		// Show form
+		print $formmail->get_form();
+
+		dol_fiche_end();
+	}*/
 }
 
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index c249f165242..ad105480901 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -1,10 +1,10 @@
 <?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
+/* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
  *
- * This program is free software: you can redistribute it and/or modify
+ * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,21 +13,20 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
- * \file    myobject_list.php
- * \ingroup mymodule
- * \brief   Page with list of myobject.
- *
- * List of myobject
+ *   	\file       htdocs/modulebuilder/template/myobject_list.php
+ *		\ingroup    mymodule othermodule1 othermodule2
+ *		\brief      This file is an example of a php page
+ *					Put here some comments
  */
 
-//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
+//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 //if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
 //if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
 //if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
@@ -36,31 +35,39 @@
 //if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 //if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
 
-// Change the following lines to use the correct relative path (../, ../../, etc)
-
-// Load Dolibarr environment
-if (false === (@include '../../main.inc.php')) {  // From htdocs directory
-	require '../../../main.inc.php'; // From "custom" directory
-}
-
+// Change this following line to use the correct relative path (../, ../../, etc)
+$res=0;
+if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
+if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
+if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
+if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
+if (! $res) die("Include of main fails");
+// Change this following line to use the correct relative path from htdocs
+require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-dol_include_once('/mymodule/class/myclass.class.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+dol_include_once('/mymodule/class/skeleton_class.class.php');
 
-// Load translation files required by the page
-$langs->load("mymodule@mymodule");
+// Load traductions files requiredby by page
+$langs->load("mymodule");
+$langs->load("other");
 
-// Get parameters
-$action     = GETPOST('action','alpha');
-$massaction = GETPOST('massaction','alpha');
-$show_files = GETPOST('show_files','int');
-$confirm    = GETPOST('confirm','alpha');
-$toselect   = GETPOST('toselect', 'array');
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
 
 $id			= GETPOST('id','int');
 $backtopage = GETPOST('backtopage');
-// TODO Add here list of search params
 $myparam	= GETPOST('myparam','alpha');
 
+$search_all=trim(GETPOST("sall"));
+$search_field1=GETPOST("search_field1");
+$search_field2=GETPOST("search_field2");
+$search_myfield=GETPOST('search_myfield');
+$optioncss = GETPOST('optioncss','alpha');
+
 // Load variable for pagination
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
@@ -74,11 +81,12 @@ if (! $sortfield) $sortfield="t.rowid"; // Set here default search field
 if (! $sortorder) $sortorder="ASC";
 
 // Protection if external user
+$socid=0;
 if ($user->societe_id > 0)
 {
+    $socid = $user->societe_id;
 	//accessforbidden();
 }
-//$result = restrictedArea($user, 'mymodule', $id);
 
 // Initialize technical object to manage context to save list fields
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'mymodulelist';
@@ -87,14 +95,41 @@ $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'mymoduleli
 $hookmanager->initHooks(array('mymodulelist'));
 $extrafields = new ExtraFields($db);
 
-// Load object if id or ref is provided as parameter
-$object = new MyClass($db);
-if (($id > 0 || ! empty($ref)) && $action != 'add') {
-	$result = $object->fetch($id, $ref);
-	if ($result < 0) dol_print_error($db);
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('mymodule');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+    't.ref'=>'Ref',
+    't.note_public'=>'NotePublic',
+);
+if (empty($user->socid)) $fieldstosearchall["t.note_private"]="NotePrivate";
+
+// Definition of fields for list
+$arrayfields=array(
+    't.field1'=>array('label'=>"Field1", 'checked'=>1),
+    't.field2'=>array('label'=>"Field2", 'checked'=>1),
+    //'t.entity'=>array('label'=>"Entity", 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+    't.datec'=>array('label'=>"DateCreationShort", 'checked'=>0, 'position'=>500),
+    't.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+    //'t.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
+);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+    }
 }
 
 
+$object=new Skeleton_Class($db);
+
+
+
+
 /*
  * ACTIONS
  *
@@ -116,10 +151,10 @@ if (empty($reshook))
     // Purge search criteria
     if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
-        $search_field1='';
-        $search_field2='';
-        $search_date_creation='';
-        $search_date_update='';
+    	$search_field1='';
+    	$search_field2='';
+    	$search_date_creation='';
+    	$search_date_update='';
         $toselect='';
         $search_array_options=array();
     }
@@ -134,18 +169,24 @@ if (empty($reshook))
 }
 
 
+
 /*
  * VIEW
  *
  * Put here all code to build page
  */
 
-llxHeader('', $langs->trans('MyPageName'), '');
+$now=dol_now();
 
-$form = new Form($db);
+$form=new Form($db);
+
+//$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
+$help_url='';
+$title = $langs->trans('MyModuleListTitle');
 
 // Put here content of your page
-// Example 1: Adding jquery code
+
+// Example : Adding jquery code
 print '<script type="text/javascript" language="javascript">
 jQuery(document).ready(function() {
 	function init_myfunc()
@@ -161,15 +202,368 @@ jQuery(document).ready(function() {
 </script>';
 
 
+$sql = "SELECT";
+$sql.= " t.rowid,";
+$sql.= " t.field1,";
+$sql.= " t.field2";
+// Add fields from extrafields
+foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+$sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mytable_extrafields as ef on (t.rowid = ef.fk_object)";
+$sql.= " WHERE 1 = 1";
+//$sql.= " WHERE u.entity IN (".getEntity('mytable',1).")";
+if ($search_field1) $sql.= natural_search("field1",$search_field1);
+if ($search_field2) $sql.= natural_search("field2",$search_field2);
+if ($sall)          $sql.= natural_search(array_keys($fieldstosearchall), $sall);
+// Add where from extra fields
+foreach ($search_array_options as $key => $val)
+{
+    $crit=$val;
+    $tmpkey=preg_replace('/search_options_/','',$key);
+    $typ=$extrafields->attribute_type[$tmpkey];
+    $mode=0;
+    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+    {
+        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+    }
+}
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+$sql.=$db->order($sortfield,$sortorder);
 
-// TODO
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}	
+
+$sql.= $db->plimit($limit+1, $offset);
+
+dol_syslog($script_file, LOG_DEBUG);
+$resql=$db->query($sql);
+if (! $resql)
+{
+    dol_print_error($db);
+    exit;
+}
+
+$num = $db->num_rows($resql);
+
+// Direct jump if only one record found
+if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
+{
+    $obj = $db->fetch_object($resql);
+    $id = $obj->rowid;
+    header("Location: ".DOL_URL_ROOT.'/skeleton/card.php?id='.$id);
+    exit;
+}
+
+llxHeader('', $title, $help_url);
+
+$arrayofselected=is_array($toselect)?$toselect:array();
+
+$param='';
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+if ($search_field1 != '') $param.= '&amp;search_field1='.urlencode($search_field1);
+if ($search_field2 != '') $param.= '&amp;search_field2='.urlencode($search_field2);
+if ($optioncss != '') $param.='&optioncss='.$optioncss;
+// Add $param from extra fields
+foreach ($search_array_options as $key => $val)
+{
+    $crit=$val;
+    $tmpkey=preg_replace('/search_options_/','',$key);
+    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+} 
+
+$arrayofmassactions =  array(
+    'presend'=>$langs->trans("SendByMail"),
+    'builddoc'=>$langs->trans("PDFMerge"),
+);
+if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+if ($massaction == 'presend') $arrayofmassactions=array();
+$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
+
+if ($sall)
+{
+    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+    print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
+}
+
+$moreforfilter = '';
+$moreforfilter.='<div class="divsearchfield">';
+$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+$moreforfilter.= '</div>';
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+else $moreforfilter = $hookmanager->resPrint;
+
+if (! empty($moreforfilter))
+{
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+    print '</div>';
+}
+
+$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
+// Fields title
+print '<tr class="liste_titre">';
+// LIST_OF_TD_TITLE_FIELDS
+//if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($arrayfields['t.field1']['label'],$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
+//if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($arrayfields['t.field2']['label'],$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+   foreach($extrafields->attribute_label as $key => $val) 
+   {
+       if (! empty($arrayfields["ef.".$key]['checked'])) 
+       {
+			$align=$extrafields->getAlignFlag($key);
+			$sortonfield = "ef.".$key;
+			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+       }
+   }
+}
+// Hook fields
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+print '</tr>'."\n";
+
+// Fields title search
+print '<tr class="liste_titre">';
+// LIST_OF_TD_TITLE_SEARCH
+//if (! empty($arrayfields['t.field1']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field1" value="'.$search_field1.'" size="10"></td>';
+//if (! empty($arrayfields['t.field2']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field2" value="'.$search_field2.'" size="10"></td>';
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val) 
+    {
+        if (! empty($arrayfields["ef.".$key]['checked']))
+        {
+            $align=$extrafields->getAlignFlag($key);
+            $typeofextrafield=$extrafields->attribute_type[$key];
+            print '<td class="liste_titre'.($align?' '.$align:'').'">';
+        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
+			{
+			    $crit=$val;
+				$tmpkey=preg_replace('/search_options_/','',$key);
+				$searchclass='';
+				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+			}
+            print '</td>';
+        }
+    }
+}
+// Fields from hook
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['t.datec']['checked']))
+{
+    // Date creation
+    print '<td class="liste_titre">';
+    print '</td>';
+}
+if (! empty($arrayfields['t.tms']['checked']))
+{
+    // Date modification
+    print '<td class="liste_titre">';
+    print '</td>';
+}
+/*if (! empty($arrayfields['u.statut']['checked']))
+{
+    // Status
+    print '<td class="liste_titre" align="center">';
+    print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
+    print '</td>';
+}*/
+// Action column
+print '<td class="liste_titre" align="right">';
+$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+print $searchpicto;
+print '</td>';
+print '</tr>'."\n";
+    
+
+// Detect if we need a fetch on each output line
+$needToFetchEachLine=0;
+foreach ($extrafields->attribute_computed as $key => $val)
+{
+    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+}
 
 
+$i=0;
+$totalarray=array();
+while ($i < min($num, $limit))
+{
+    $obj = $db->fetch_object($resql);
+    if ($obj)
+    {
+        // Show here line of result
+        print '<tr class="oddeven">';
+        // LIST_OF_TD_FIELDS_LIST
+        /*
+        if (! empty($arrayfields['t.field1']['checked'])) 
+        {
+            print '<td>'.$obj->field1.'</td>';
+		    if (! $i) $totalarray['nbfield']++;
+        }
+        if (! empty($arrayfields['t.field2']['checked'])) 
+        {
+            print '<td>'.$obj->field2.'</td>';
+		    if (! $i) $totalarray['nbfield']++;
+        }*/
+    	// Extra fields
+		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+		{
+		   foreach($extrafields->attribute_label as $key => $val) 
+		   {
+				if (! empty($arrayfields["ef.".$key]['checked'])) 
+				{
+					print '<td';
+					$align=$extrafields->getAlignFlag($key);
+					if ($align) print ' align="'.$align.'"';
+					print '>';
+					$tmpkey='options_'.$key;
+					print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
+					print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
+				}
+		   }
+		}
+        // Fields from hook
+	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+    	// Date creation
+        if (! empty($arrayfields['t.datec']['checked']))
+        {
+            print '<td align="center">';
+            print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
+            print '</td>';
+		    if (! $i) $totalarray['nbfield']++;
+        }
+        // Date modification
+        if (! empty($arrayfields['t.tms']['checked']))
+        {
+            print '<td align="center">';
+            print dol_print_date($db->jdate($obj->date_update), 'dayhour');
+            print '</td>';
+		    if (! $i) $totalarray['nbfield']++;
+        }
+        // Status
+        /*
+        if (! empty($arrayfields['u.statut']['checked']))
+        {
+		  $userstatic->statut=$obj->statut;
+          print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
+        }*/
+
+        // Action column
+        print '<td class="nowrap" align="center">';
+	    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+        {
+	        $selected=0;
+			if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+        }
+	    print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+
+        print '</tr>';
+    }
+    $i++;
+}
+
+// Show total line
+if (isset($totalarray['totalhtfield']))
+{
+    print '<tr class="liste_total">';
+    $i=0;
+    while ($i < $totalarray['nbfield'])
+    {
+        $i++;
+        if ($i == 1)
+        {
+            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+        }
+        elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
+        elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
+        elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
+        else print '<td></td>';
+    }
+    print '</tr>';
+}
+
+$db->free($resql);
+
+$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
 
 
-// Example 2: Adding links to objects
-// The class must extend CommonObject for this method to be available
-$somethingshown = $form->showLinkedObjectBlock($myobject);
+if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
+{
+    // Show list of available documents
+    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+    $urlsource.=str_replace('&amp;','&',$param);
+
+    $filedir=$diroutputmassaction;
+    $genallowed=$user->rights->facture->lire;
+    $delallowed=$user->rights->facture->lire;
+
+    print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+}
+else
+{
+    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
+}
+
 
 // End of page
 llxFooter();
+$db->close();
diff --git a/htdocs/modulebuilder/template/scripts/myobject.php b/htdocs/modulebuilder/template/scripts/myobject.php
new file mode 100644
index 00000000000..af381b0bfae
--- /dev/null
+++ b/htdocs/modulebuilder/template/scripts/myobject.php
@@ -0,0 +1,165 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2007-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/modulebuilder/template/scripts/myobject.php
+ *		\ingroup    mymodule
+ *      \brief      This file is an example for a command line script to work on MyObject
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+	exit(-1);
+}
+
+// Global variables
+$version='1.0';
+$error=0;
+
+
+// -------------------- START OF YOUR CODE HERE --------------------
+@set_time_limit(0);							// No timeout for this script
+define('EVEN_IF_ONLY_LOGIN_ALLOWED',1);		// Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
+
+// Include and load Dolibarr environment variables
+require_once($path."../../htdocs/master.inc.php");
+// After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file).
+// $user is created but empty.
+
+//$langs->setDefaultLang('en_US'); 	// To change default language of $langs
+$langs->load("main");				// To load language file for default language
+
+// Load user and its permissions
+$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$user->getrights();
+
+
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+if (! isset($argv[1])) {	// Check parameters
+    print "Usage: ".$script_file." param1 param2 ...\n";
+	exit(-1);
+}
+print '--- start'."\n";
+print 'Argument 1='.$argv[1]."\n";
+print 'Argument 2='.$argv[2]."\n";
+
+
+// Start of transaction
+$db->begin();
+
+
+// Examples for manipulating class MyObject
+dol_include_once("/mymodule/class/myobject.class.php");
+$myobject=new MyObject($db);
+
+// Example for inserting creating object in database
+/*
+dol_syslog($script_file." CREATE", LOG_DEBUG);
+$myobject->prop1='value_prop1';
+$myobject->prop2='value_prop2';
+$id=$myobject->create($user);
+if ($id < 0) { $error++; dol_print_error($db,$myobject->error); }
+else print "Object created with id=".$id."\n";
+*/
+
+// Example for reading object from database
+/*
+dol_syslog($script_file." FETCH", LOG_DEBUG);
+$result=$myobject->fetch($id);
+if ($result < 0) { $error; dol_print_error($db,$myobject->error); }
+else print "Object with id=".$id." loaded\n";
+*/
+
+// Example for updating object in database ($myobject must have been loaded by a fetch before)
+/*
+dol_syslog($script_file." UPDATE", LOG_DEBUG);
+$myobject->prop1='newvalue_prop1';
+$myobject->prop2='newvalue_prop2';
+$result=$myobject->update($user);
+if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
+else print "Object with id ".$myobject->id." updated\n";
+*/
+
+// Example for deleting object in database ($myobject must have been loaded by a fetch before)
+/*
+dol_syslog($script_file." DELETE", LOG_DEBUG);
+$result=$myobject->delete($user);
+if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
+else print "Object with id ".$myobject->id." deleted\n";
+*/
+
+
+// An example of a direct SQL read without using the fetch method
+/*
+$sql = "SELECT field1, field2";
+$sql.= " FROM ".MAIN_DB_PREFIX."myobject";
+$sql.= " WHERE field3 = 'xxx'";
+$sql.= " ORDER BY field1 ASC";
+
+dol_syslog($script_file, LOG_DEBUG);
+$resql=$db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+	$i = 0;
+	if ($num)
+	{
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj)
+			{
+				// You can use here results
+				print $obj->field1;
+				print $obj->field2;
+			}
+			$i++;
+		}
+	}
+}
+else
+{
+	$error++;
+	dol_print_error($db);
+}
+*/
+
+
+// -------------------- END OF YOUR CODE --------------------
+
+if (! $error)
+{
+	$db->commit();
+	print '--- end ok'."\n";
+}
+else
+{
+	print '--- end error code='.$error."\n";
+	$db->rollback();
+}
+
+$db->close();	// Close $db database opened handler
+
+exit($error);
diff --git a/htdocs/modulebuilder/template/scripts/myscript.php b/htdocs/modulebuilder/template/scripts/myscript.php
deleted file mode 100644
index 468729c59f3..00000000000
--- a/htdocs/modulebuilder/template/scripts/myscript.php
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    scripts/myscript.php
- * \ingroup mymodule
- * \brief   Example command line script.
- *
- * Put detailed description here.
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path = dirname(__FILE__) . '/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Error: You are using PHP for CGI. To execute ";
-	echo $script_file;
-	echo " from command line, you must use PHP for CLI mode.\n";
-	exit;
-}
-
-// Global variables
-$version = '1.0.0';
-$error = 0;
-
-
-/*
- * -------------------- YOUR CODE STARTS HERE --------------------
- */
-/* Set this define to 0 if you want to allow execution of your script
- * even if dolibarr setup is "locked to admin user only". */
-define('EVEN_IF_ONLY_LOGIN_ALLOWED', 0);
-
-/* Include Dolibarr environment
- * Customize to your needs
- */
-require_once $path . '../../../master.inc.php';
-/* After this $db, $conf, $langs, $mysoc, $user and other Dolibarr utility variables should be defined.
- * Warning: this still requires a valid htdocs/conf.php file
- */
-
-global $conf, $db, $langs, $mysoc, $user;
-
-// No timeout for this script
-@set_time_limit(0);
-
-// Set the default language
-//$langs->setDefaultLang('en_US');
-
-// Load translations for the default language
-$langs->load("main");
-
-/* User and permissions loading
- * Loads user for login 'admin'.
- * Comment out to run as anonymous user. */
-$result = $user->fetch('', 'admin');
-if (! $result > 0) {
-	dol_print_error('', $user->error);
-	exit;
-}
-$user->getrights();
-
-// Display banner and help
-echo "***** " . $script_file . " (" . $version . ") pid=" . getmypid() . " *****\n";
-dol_syslog($script_file . " launched with arg " . join(',', $argv));
-if (! isset($argv[1])) {
-	// Check parameters
-	echo "Usage: " . $script_file . " param1 param2 ...\n";
-	exit;
-}
-echo '--- start' . "\n";
-echo 'Argument 1=' . $argv[1] . "\n";
-echo 'Argument 2=' . $argv[2] . "\n";
-
-// Start database transaction
-$db->begin();
-
-// Examples for manipulating a class
-require_once '../class/myclass.class.php';
-$myobject = new MyClass($db);
-
-// Example for inserting creating object in database
-/*
-	dol_syslog($script_file . " CREATE", LOG_DEBUG);
-	$myobject->prop1 = 'value_prop1';
-	$myobject->prop2 = 'value_prop2';
-	$id = $myobject->create($user);
-	if ($id < 0) {
-		$error++;
-		dol_print_error($db, $myobject->error);
-	} else {
-		 echo "Object created with id=" . $id . "\n";
-	}
- */
-
-// Example for reading object from database
-/*
-	dol_syslog($script_file . " FETCH", LOG_DEBUG);
-	$result = $myobject->fetch($id);
-	if ($result < 0) {
-		$error;
-		dol_print_error($db, $myobject->error);
-	} else {
-		echo "Object with id=" . $id . " loaded\n";
-	}
- */
-
-// Example for updating object in database
-// ($myobject must have been loaded by a fetch before)
-/*
-	dol_syslog($script_file . " UPDATE", LOG_DEBUG);
-	$myobject->prop1 = 'newvalue_prop1';
-	$myobject->prop2 = 'newvalue_prop2';
-	$result = $myobject->update($user);
-	if ($result < 0) {
-		$error++;
-		dol_print_error($db, $myobject->error);
-	} else {
-		echo "Object with id " . $myobject->id . " updated\n";
-	}
- */
-
-// Example for deleting object in database
-// ($myobject must have been loaded by a fetch before)
-/*
-	dol_syslog($script_file . " DELETE", LOG_DEBUG);
-	$result = $myobject->delete($user);
-	if ($result < 0) {
-		$error++;
-		dol_print_error($db, $myobject->error);
-	} else {
-		echo "Object with id " . $myobject->id . " deleted\n";
-	}
- */
-
-// An example of a direct SQL read without using the fetch method
-/*
-	$sql = "SELECT field1, field2";
-	$sql.= " FROM " . MAIN_DB_PREFIX . "c_pays";
-	$sql.= " WHERE field3 = 'xxx'";
-	$sql.= " ORDER BY field1 ASC";
-
-	dol_syslog($script_file . " sql=" . $sql, LOG_DEBUG);
-	$resql=$db->query($sql);
-	if ($resql) {
-		$num = $db->num_rows($resql);
-		$i = 0;
-		if ($num) {
-			while ($i < $num) {
-				$obj = $db->fetch_object($resql);
-				if ($obj) {
-					// You can use here results
-					echo $obj->field1;
-					echo $obj->field2;
-				}
-				$i++;
-			}
-		}
-	} else {
-		$error++;
-		dol_print_error($db);
-	}
- */
-
-
-/*
- * --------------------- YOUR CODE ENDS HERE ----------------------
- */
-
-// Error management
-if (! $error) {
-	$db->commit();
-	echo '--- end ok' . "\n";
-	$exit_status = 0; // UNIX no errors exit status
-} else {
-	echo '--- end error code=' . $error . "\n";
-	$db->rollback();
-	$exit_status = 1; // UNIX general error exit status
-}
-
-// Close database handler
-$db->close();
-
-// Return exit status code
-return $exit_status;
diff --git a/htdocs/modulebuilder/template/sql/data.sql b/htdocs/modulebuilder/template/sql/data.sql
index 90e9e0ced2b..82266dc08b3 100644
--- a/htdocs/modulebuilder/template/sql/data.sql
+++ b/htdocs/modulebuilder/template/sql/data.sql
@@ -14,6 +14,6 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-INSERT INTO llx_mytable VALUES (
+INSERT INTO llx_myobject VALUES (
 	1, 1, 'mydata'
 );
diff --git a/htdocs/modulebuilder/template/sql/llx_mytable.key.sql b/htdocs/modulebuilder/template/sql/llx_myobject.key.sql
similarity index 90%
rename from htdocs/modulebuilder/template/sql/llx_mytable.key.sql
rename to htdocs/modulebuilder/template/sql/llx_myobject.key.sql
index 56975f55a01..6fd4bb4cda6 100644
--- a/htdocs/modulebuilder/template/sql/llx_mytable.key.sql
+++ b/htdocs/modulebuilder/template/sql/llx_myobject.key.sql
@@ -14,4 +14,4 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-ALTER TABLE llx_mytable ADD UNIQUE INDEX uk_fk_othertable (fk_othertable);
+ALTER TABLE llx_myobject ADD UNIQUE INDEX uk_fk_othertable (fk_othertable);
diff --git a/htdocs/modulebuilder/template/sql/llx_mytable.sql b/htdocs/modulebuilder/template/sql/llx_myobject.sql
similarity index 97%
rename from htdocs/modulebuilder/template/sql/llx_mytable.sql
rename to htdocs/modulebuilder/template/sql/llx_myobject.sql
index 2ef08b7fca1..edcd7a7c26d 100644
--- a/htdocs/modulebuilder/template/sql/llx_mytable.sql
+++ b/htdocs/modulebuilder/template/sql/llx_myobject.sql
@@ -14,7 +14,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-CREATE TABLE llx_mytable(
+CREATE TABLE llx_myobject(
 	rowid INTEGER AUTO_INCREMENT PRIMARY KEY,
 	entity INTEGER DEFAULT 1 NOT NULL,
 	fk_othertable INTEGER NOT NULL,
diff --git a/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php b/htdocs/modulebuilder/template/test/phpunit/MyModuleFunctionalTest.php
similarity index 100%
rename from htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
rename to htdocs/modulebuilder/template/test/phpunit/MyModuleFunctionalTest.php
diff --git a/htdocs/modulebuilder/template/test/unit/MyClassTest.php b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
similarity index 91%
rename from htdocs/modulebuilder/template/test/unit/MyClassTest.php
rename to htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
index 94898e9209b..37a65323fda 100644
--- a/htdocs/modulebuilder/template/test/unit/MyClassTest.php
+++ b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
@@ -17,20 +17,18 @@
  */
 
 /**
- * \file    test/unit/MyClassTest.php
+ * \file    test/unit/MyObjectTest.php
  * \ingroup mymodule
- * \brief   Example PHPUnit test.
- *
- * Put detailed description here.
+ * \brief   PHPUnit test for MyObject class.
  */
 
 namespace test\unit;
 
 /**
- * Class MyClassTest
+ * Class MyObjectTest
  * @package Testmymodule
  */
-class MyClassTest extends \PHPUnit_Framework_TestCase
+class MyObjectTest extends \PHPUnit_Framework_TestCase
 {
 	/**
 	 * Global test setup

From 48477e00fd6d4fe6a249ae6af92cfedaba109b76 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 28 May 2017 06:49:17 +0200
Subject: [PATCH 0955/1163] Review payment part on expense report card

---
 htdocs/expensereport/card.php | 330 +++++++++++++++++++---------------
 1 file changed, 183 insertions(+), 147 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index fe546cd1064..1dbcbfc1335 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2015-2016 Alexandre Spangaro   <aspangaro@zendsi.com>
+ * Copyright (C) 2015-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2017      Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -37,9 +37,12 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/expensereport.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/modules/expensereport/modules_expensereport.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT . '/expensereport/class/paymentexpensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+if (! empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+}
 
 $langs->load("trips");
 $langs->load("bills");
@@ -647,14 +650,14 @@ if (empty($reshook))
    	{
    		setEventMessages($object->error, $object->errors, 'errors');
    	}
-    
+
     if ($action == "confirm_refuse" && GETPOST('confirm')=="yes" && $id > 0 && $user->rights->expensereport->approve)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
-    
+
     	$result = $object->setDeny($user,GETPOST('detail_refuse'));
-    
+
     	if ($result > 0)
     	{
     		// Define output language
@@ -674,11 +677,11 @@ if (empty($reshook))
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
-    
+
     	if ($result > 0)
     	{
     		// Send mail
-    
+
     		// TO
     		$destinataire = new User($db);
     		$destinataire->fetch($object->fk_user_author);
@@ -714,10 +717,10 @@ if (empty($reshook))
         			array_push($mimetype,"application/pdf");
     			}
     			*/
-        
+
         		// PREPARE SEND
         		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-        
+
         		if ($mailfile)
         		{
         			// SEND
@@ -767,17 +770,17 @@ if (empty($reshook))
     {
     	setEventMessages($object->error, $object->errors, 'errors');
     }
-    
+
     //var_dump($user->id == $object->fk_user_validator);exit;
     if ($action == "confirm_cancel" && GETPOST('confirm')=="yes" && GETPOST('detail_cancel') && $id > 0 && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
-    
+
     	if ($user->id == $object->fk_user_valid || $user->id == $object->fk_user_author)
     	{
     		$result = $object->set_cancel($user,GETPOST('detail_cancel'));
-    
+
     		if ($result > 0)
     		{
     			// Define output language
@@ -797,16 +800,16 @@ if (empty($reshook))
     				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			}
     		}
-    
+
     		if ($result > 0)
     		{
     			// Send mail
-    
+
     			// TO
     			$destinataire = new User($db);
     			$destinataire->fetch($object->fk_user_author);
     			$emailTo = $destinataire->email;
-    
+
     			// FROM
     			$expediteur = new User($db);
     			$expediteur->fetch($object->fk_user_cancel);
@@ -891,7 +894,7 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
-    
+
     if ($action == "confirm_brouillonner" && GETPOST('confirm')=="yes" && $id > 0 && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
@@ -899,7 +902,7 @@ if (empty($reshook))
     	if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
     	{
     		$result = $object->setStatut(0);
-    
+
     		if ($result > 0)
     		{
     			// Define output language
@@ -919,7 +922,7 @@ if (empty($reshook))
     				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			}
     		}
-    
+
     		if ($result > 0)
     		{
     			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
@@ -935,14 +938,14 @@ if (empty($reshook))
     		setEventMessages("NOT_AUTHOR", '', 'errors');
     	}
     }
-    
+
     if ($action == 'set_paid' && $id > 0 && $user->rights->expensereport->to_paid)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
-    
+
     	$result = $object->set_paid($id, $user);
-    
+
     	if ($result > 0)
     	{
     		// Define output language
@@ -962,46 +965,46 @@ if (empty($reshook))
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
-    
+
     	if ($result > 0)
     	{
     		// Send mail
-    
+
     		// TO
     		$destinataire = new User($db);
     		$destinataire->fetch($object->fk_user_author);
     		$emailTo = $destinataire->email;
-    
+
     		// FROM
     		$expediteur = new User($db);
     		$expediteur->fetch($user->id);
     		$emailFrom = $expediteur->email;
-    
+
     		if ($emailFrom && $emailTo)
     		{
     			$filename=array(); $filedir=array(); $mimetype=array();
     		    
     		    // SUBJECT
     			$subject = $langs->transnoentities("ExpenseReportPaid");
-    
+
     			// CONTENT
     			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
     			$message = $langs->transnoentities("ExpenseReportPaidMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
-        
+
         		// CONTENT
         		$message = "Bonjour {$destinataire->firstname},\n\n";
         		$message.= "Votre note de frais \"{$object->ref}\" vient d'être payée.\n";
         		$message.= "- Payeur : {$expediteur->firstname} {$expediteur->lastname}\n";
         		$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
         		$message.= "Bien cordialement,\n' SI";
-        
+
         		// Generate pdf before attachment
         		$object->setDocModel($user,"");
         		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-        
+
         		// PREPARE SEND
         		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-        
+
         		if ($mailfile)
         		{
         			// SEND
@@ -1055,45 +1058,44 @@ if (empty($reshook))
     if ($action == "addline" && $user->rights->expensereport->creer)
     {
     	$error = 0;
-    
+
     	$db->begin();
-    
+
     	$object_ligne = new ExpenseReportLine($db);
-    
+
     	$vatrate = GETPOST('vatrate');
     	$object_ligne->comments = GETPOST('comments');
     	$qty  = GETPOST('qty','int');
     	if (empty($qty)) $qty=1;
     	$object_ligne->qty = $qty;
-    
+
     	$up=price2num(GETPOST('value_unit'),'MU');
     	$object_ligne->value_unit = $up;
-    
+
     	$object_ligne->date = $date;
-    
+
     	$object_ligne->fk_c_type_fees = GETPOST('fk_c_type_fees');
-    
+
     	// if VAT is not used in Dolibarr, set VAT rate to 0 because VAT rate is necessary.
     	if (empty($vatrate)) $vatrate = "0.000";
     	$object_ligne->vatrate = price2num($vatrate);
-    
+
     	$object_ligne->fk_projet = $fk_projet;
-    	
-    
+
     	if (! GETPOST('fk_c_type_fees') > 0)
     	{
     		$error++;
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
     		$action='';
     	}
-    
+
     	if ($vatrate < 0 || $vatrate == '')
     	{
     		$error++;
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("VAT")), null, 'errors');
     		$action='';
     	}
-    
+
         /* Projects are never required. To force them, check module forceproject
     	if ($conf->projet->enabled)
     	{
@@ -1103,7 +1105,7 @@ if (empty($reshook))
     			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Project")), null, 'errors');
     		}
     	}*/
-    
+
     	// Si aucune date n'est rentrée
     	if (empty($object_ligne->date) || $object_ligne->date=="--")
     	{
@@ -1116,21 +1118,21 @@ if (empty($reshook))
     		$error++;
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PriceUTTC")), null, 'errors');
     	}
-    
+
     	// S'il y'a eu au moins une erreur
     	if (! $error)
     	{
     		$object_ligne->fk_expensereport = $_POST['fk_expensereport'];
-    
+
     		$type = 0;	// TODO What if service ?
     		$seller = '';  // seller is unknown
     		$tmp = calcul_price_total($qty, $up, 0, $vatrate, 0, 0, 0, 'TTC', 0, $type, $seller);
-    
+
     		$object_ligne->vatrate = price2num($vatrate);
     		$object_ligne->total_ttc = $tmp[2];
     		$object_ligne->total_ht = $tmp[0];
     		$object_ligne->total_tva = $tmp[1];
-    
+
     		$result = $object_ligne->insert();
     		if ($result > 0)
     		{
@@ -1144,10 +1146,10 @@ if (empty($reshook))
     			$db->rollback();
     		}
     	}
-    
+
     	$action='';
     }
-    
+
     if ($action == 'confirm_delete_line' && GETPOST("confirm") == "yes" && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
@@ -1157,7 +1159,7 @@ if (empty($reshook))
     	$object_ligne->fetch(GETPOST("rowid"));
     	$total_ht = $object_ligne->total_ht;
     	$total_tva = $object_ligne->total_tva;
-    
+
     	$result=$object->deleteline(GETPOST("rowid"), $user);
     	if ($result >= 0)
     	{
@@ -1190,12 +1192,12 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
-    
+
     if ($action == "updateligne" && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
-    
+
     	$rowid = $_POST['rowid'];
     	$type_fees_id = GETPOST('fk_c_type_fees');
     	$projet_id = $fk_projet;
@@ -1207,7 +1209,7 @@ if (empty($reshook))
         // if VAT is not used in Dolibarr, set VAT rate to 0 because VAT rate is necessary.
         if (empty($vatrate)) $vatrate = "0.000";
         $vatrate = price2num($vatrate);
-    
+
     	if (! GETPOST('fk_c_type_fees') > 0)
     	{
     		$error++;
@@ -1220,7 +1222,7 @@ if (empty($reshook))
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Vat")), null, 'errors');
     		$action='';
     	}
-    
+
     	if (! $error)
     	{
     	    // TODO Use update method of ExpenseReportLine
@@ -1258,7 +1260,7 @@ if (empty($reshook))
     		}
     	}
     }
-    
+
     // Actions to build doc
     $upload_dir = $conf->expensereport->dir_output;
     $permissioncreate = $user->rights->expensereport->creer;
@@ -1278,6 +1280,8 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formproject = new FormProjets($db);
 $projecttmp = new Project($db);
+$paymentexpensereportstatic=new PaymentExpenseReport($db);
+$bankaccountstatic = new Account($db);
 
 // Create
 if ($action == 'create')
@@ -1320,7 +1324,7 @@ if ($action == 'create')
 	print $s;
 	print '</td>';
 	print '</tr>';
-	
+
 	print '<tr>';
 	print '<td>'.$langs->trans("VALIDATOR").'</td>';
 	print '<td>';
@@ -1376,7 +1380,7 @@ if ($action == 'create')
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 	    print $object->showOptionals($extrafields, 'edit');
 	}
-	
+
 	print '<tbody>';
 	print '</table>';
 
@@ -1447,7 +1451,7 @@ else
 				$userfee->fetch($object->fk_user_author);
 				print $userfee->getNomUrl(-1);
 				print '</td></tr>';
-				
+
             	// Ref
             	print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td>';
             	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
@@ -1542,7 +1546,7 @@ else
 				    // Paiement incomplet. On demande si motif = escompte ou autre
 				    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CloneExpenseReport'), $langs->trans('ConfirmCloneExpenseReport', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 				}
-				
+
 				if ($action == 'save')
 				{
 					$formconfirm=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("SaveTrip"),$langs->trans("ConfirmSaveTrip"),"confirm_validate","","",1);
@@ -1592,13 +1596,10 @@ else
 
 				// Print form confirm
 				print $formconfirm;
-				
-				
+
 				// Expense report card
-				
 				$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-				
-				
+
 				$morehtmlref='<div class="refidno">';
 				/*
 				// Ref customer
@@ -1639,15 +1640,13 @@ else
 				    }
 				}*/
 				$morehtmlref.='</div>';
-				
-				
+
 				dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-				
-				
+
 				print '<div class="fichecenter">';
 				print '<div class="fichehalfleft">';
 				print '<div class="underbanner clearboth"></div>';
-				
+
 				print '<table class="border centpercent">';
 
 				// Author
@@ -1662,7 +1661,7 @@ else
 				    print $userauthor->getNomUrl(-1);
 				}
 				print '</td></tr>';
-				
+
 				print '<tr>';
 				print '<td class="titlefield">'.$langs->trans("Period").'</td>';
 				print '<td>';
@@ -1677,29 +1676,6 @@ else
 					print '</tr>';
 				}
 
-				// Amount
-				print '<tr>';
-				print '<td>'.$langs->trans("AmountHT").'</td>';
-				print '<td>'.price($object->total_ht).'</td>';
-				$rowspan = 5;
-				if ($object->fk_statut < 3) $rowspan++;
-				elseif($object->fk_statut == 4) $rowspan+=2;
-				else $rowspan+=2;
-				if ($object->fk_statut==99 || !empty($object->detail_refuse)) $rowspan+=2;
-				if($object->fk_statut==6) $rowspan+=2;
-				print "</td>";
-				print '</tr>';
-				
-				print '<tr>';
-				print '<td>'.$langs->trans("AmountVAT").'</td>';
-				print '<td>'.price($object->total_tva).'</td>';
-				print '</tr>';
-				
-				print '<tr>';
-				print '<td>'.$langs->trans("AmountTTC").'</td>';
-				print '<td>'.price($object->total_ttc).'</td>';
-				print '</tr>';
-
 				// Validation date
 				print '<tr>';
 				print '<td>'.$langs->trans("DATE_SAVE").'</td>';
@@ -1740,7 +1716,7 @@ else
 						print $userfee->getNomUrl(-1);
 					}
 					print '</td></tr>';
-					
+
 					print '<tr>';
 					print '<td>'.$langs->trans("MOTIF_CANCEL").'</td>';
 					print '<td>'.$object->detail_cancel.'</td></tr>';
@@ -1762,7 +1738,7 @@ else
 						print $userapp->getNomUrl(-1);
 					}
 					print '</td></tr>';
-					
+
 					print '<tr>';
 					print '<td>'.$langs->trans("DateApprove").'</td>';
 					print '<td>'.dol_print_date($object->date_approve,'dayhour').'</td></tr>';
@@ -1778,7 +1754,7 @@ else
 					$userfee->fetch($object->fk_user_refuse);
 					print $userfee->getNomUrl(-1);
 					print '</td></tr>';
-					
+
 					print '<tr>';
 					print '<td>'.$langs->trans("DATE_REFUS").'</td>';
 					print '<td>'.dol_print_date($object->date_refuse,'dayhour');
@@ -1805,67 +1781,130 @@ else
 				}
 
 				// Other attributes
-				$cols = 3;
+				$cols = 2;
 				include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-				
+
 				print '</table>';
 
 				print '</div>';
 				print '<div class="fichehalfright">';
 				print '<div class="ficheaddleft">';
-				//print '<div class="underbanner clearboth"></div>';
-				
-				// List of payments
-				$sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount,";
-				$sql.= "c.code as type_code,c.libelle as payment_type";
-				$sql.= " FROM ".MAIN_DB_PREFIX."payment_expensereport as p";
+				print '<div class="underbanner clearboth"></div>';
+
+				print '<table class="border centpercent">';
+
+				// Amount
+				print '<tr>';
+				print '<td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
+				print '<td class="nowrap amountcard">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+				$rowspan = 5;
+				if ($object->fk_statut < 3) $rowspan++;
+				elseif($object->fk_statut == 4) $rowspan+=2;
+				else $rowspan+=2;
+				if ($object->fk_statut==99 || !empty($object->detail_refuse)) $rowspan+=2;
+				if($object->fk_statut==6) $rowspan+=2;
+				print "</td>";
+				print '</tr>';
+
+				print '<tr>';
+				print '<td>'.$langs->trans("AmountVAT").'</td>';
+				print '<td class="nowrap amountcard">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+				print '</tr>';
+
+				print '<tr>';
+				print '<td>'.$langs->trans("AmountTTC").'</td>';
+				print '<td class="nowrap amountcard">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+				print '</tr>';
+
+				// List of payments already done
+				$nbcols = 3;
+				if (! empty($conf->banque->enabled)) {
+					$nbrows ++;
+					$nbcols ++;
+				}
+
+				print '<table class="noborder paymenttable" width="100%">';
+
+				print '<tr class="liste_titre">';
+				print '<td class="liste_titre">' . $langs->trans('Payments') . '</td>';
+				print '<td class="liste_titre">' . $langs->trans('Date') . '</td>';
+				print '<td class="liste_titre">' . $langs->trans('Type') . '</td>';
+				if (! empty($conf->banque->enabled)) {
+					print '<td class="liste_titre" align="right">' . $langs->trans('BankAccount') . '</td>';
+				}
+				print '<td class="liste_titre" align="right">' . $langs->trans('Amount') . '</td>';
+				print '<td class="liste_titre" width="18">&nbsp;</td>';
+				print '</tr>';
+
+				// Payments already done (from payment on this expensereport)
+				$sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount, p.fk_bank,";
+				$sql.= "c.code as p_code, c.libelle as payment_type,";
+				$sql.= "ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal";
+				$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e";
 				$sql.= ", ".MAIN_DB_PREFIX."c_paiement as c ";
-				$sql.= ", ".MAIN_DB_PREFIX."expensereport as e";
+				$sql.= ", ".MAIN_DB_PREFIX."payment_expensereport as p";
+				$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
+				$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
 				$sql.= " WHERE e.rowid = '".$id."'";
 				$sql.= " AND p.fk_expensereport = e.rowid";
 				$sql.= " AND e.entity = ".$conf->entity;
 				$sql.= " AND p.fk_typepayment = c.id";
 				$sql.= " ORDER BY dp";
-				
+
 				$resql = $db->query($sql);
 				if ($resql)
 				{
 				    $num = $db->num_rows($resql);
 				    $i = 0; $total = 0;
-				    print '<table class="noborder paymenttable" width="100%">';
-				    print '<tr class="liste_titre">';
-				    print '<td>'.$langs->trans("RefPayment").'</td>';
-				    print '<td>'.$langs->trans("Date").'</td>';
-				    print '<td>'.$langs->trans("Type").'</td>';
-				    print '<td align="right">'.$langs->trans("Amount").'</td>';
-				    print '<td>&nbsp;</td>';
-				    print '</tr>';
-				
-				    $var=True;
 				    while ($i < $num)
 				    {
 				        $objp = $db->fetch_object($resql);
-				        
-				        print "<tr ".$bc[$var]."><td>";
-				        print '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
+
+				        print '<tr class="oddseven"><td>';
+						$paymentexpensereportstatic->id = $objp->rowid;
+						$paymentexpensereportstatic->datepaye = $db->jdate($objp->dp);
+						$paymentexpensereportstatic->ref = $objp->rowid;
+						$paymentexpensereportstatic->num_paiement = $objp->num_paiement;
+						$paymentexpensereportstatic->payment_code = $objp->payment_code;
+						print $paymentexpensereportstatic->getNomUrl(1);
+						print '</td>';
 				        print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
-				        $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->fk_typepayment;
+				        $labeltype=$langs->trans("PaymentType".$objp->p_code)!=("PaymentType".$objp->p_code)?$langs->trans("PaymentType".$objp->p_code):$objp->fk_typepayment;
 				        print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
-				        print '<td align="right">'.price($objp->amount)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td>\n";
+						if (! empty($conf->banque->enabled)) {
+							$bankaccountstatic->id = $objp->baid;
+							$bankaccountstatic->ref = $objp->baref;
+							$bankaccountstatic->label = $objp->baref;
+							$bankaccountstatic->number = $objp->banumber;
+
+							if (! empty($conf->accounting->enabled)) {
+								$bankaccountstatic->account_number = $objp->account_number;
+
+								$accountingjournal = new AccountingJournal($db);
+								$accountingjournal->fetch($objp->fk_accountancy_journal);
+								$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+							}
+
+							print '<td align="right">';
+							if ($bankaccountstatic->id)
+								print $bankaccountstatic->getNomUrl(1, 'transactions');
+							print '</td>';
+						}
+				        print '<td align="right">'.price($objp->amount)."</td>";
 				        print "</tr>";
 				        $totalpaid += $objp->amount;
 				        $i++;
 				    }
-				
+
 				    if ($object->paid == 0)
 				    {
-				        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\">".price($totalpaid)."</td></tr>\n";
-				        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\">".price($object->total_ttc)."</td></tr>\n";
+				        print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("AlreadyPaid").':</td><td align="right">'.price($totalpaid).'</td></tr>';
+				        print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("AmountExpected").':</td><td align="right">'.price($object->total_ttc).'</td></tr>';
 				
 				        $remaintopay = $object->total_ttc - $totalpaid;
 				
-				        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
-				        print '<td align="right"'.($remaintopay?' class="amountremaintopay"':'').'>'.price($remaintopay)."</td></tr>\n";
+				        print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("RemainderToPay").':</td>';
+				        print '<td align="right"'.($remaintopay?' class="amountremaintopay"':'').'>'.price($remaintopay).'</td></tr>';
 				    }
 				    print "</table>";
 				    $db->free($resql);
@@ -1873,15 +1912,13 @@ else
 				else
 				{
 				    dol_print_error($db);
-				}				
-				
+				}
+
 				print '</div>';
 				print '</div>';
 				print '</div>';
-				
+
 				print '<div class="clearboth"></div><br>';
-				
-				print '<br>';
 
 				// Fetch Lines of current expense report
 				$sql = 'SELECT fde.rowid, fde.fk_expensereport, fde.fk_c_type_fees, fde.fk_projet, fde.date,';
@@ -1898,18 +1935,17 @@ else
 
 				$actiontouse='updateligne';
 				if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline') $actiontouse='addline';
-				
+
 				print '<form name="expensereport" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 				print '<input type="hidden" name="action" value="'.$actiontouse.'">';
 				print '<input type="hidden" name="id" value="'.$object->id.'">';
 				print '<input type="hidden" name="fk_expensereport" value="'.$object->id.'" />';
-				
-				
+
 				print '<div class="div-table-responsive">';
 				print '<table id="tablelines" class="noborder" width="100%">';
-				
-		        $resql = $db->query($sql);
+
+				$resql = $db->query($sql);
 				if ($resql)
 				{
 					$num_lignes = $db->num_rows($resql);
@@ -1989,7 +2025,7 @@ else
 
 									print '</td>';
 								}
-								
+
 								print '</tr>';
 							}
 
@@ -2042,7 +2078,7 @@ else
 									    print '<td style="text-align:right;">'.$langs->trans('AmountHT').'</td>';
 									    print '<td style="text-align:right;">'.$langs->trans('AmountTTC').'</td>';
 									}
-									
+
 									print '<td style="text-align:center;">';
 									print '<input type="hidden" name="rowid" value="'.$objp->rowid.'">';
 									print '<input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
@@ -2078,11 +2114,11 @@ else
 						print '<td colspan="3"></td>';
 						print '</tr>';
 
-						
+
 						print '<tr '.$bc[true].'>';
 
 						print '<td></td>';
-						
+
 						// Select date
 						print '<td align="center">';
 						$form->select_date($date?$date:-1,'date');
@@ -2091,11 +2127,11 @@ else
 						// Select project
 						if (! empty($conf->projet->enabled))
 						{
-    						print '<td>';
-    						$formproject->select_projects(-1, $fk_projet, 'fk_projet', 0, 0, 1, 1);
-    						print '</td>';
+							print '<td>';
+							$formproject->select_projects(-1, $fk_projet, 'fk_projet', 0, 0, 1, 1);
+							print '</td>';
 						}
-						
+
 						// Select type
 						print '<td align="center">';
 						select_type_fees_id($fk_c_type_fees,'fk_c_type_fees',1);
@@ -2249,7 +2285,7 @@ if ($action != 'create' && $action != 'edit')
 		}
 	}
 
-	
+
 	// If status is Appoved
 	// --------------------
 	
@@ -2257,7 +2293,7 @@ if ($action != 'create' && $action != 'edit')
 	{
 	    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=refuse&id='.$object->id.'">'.$langs->trans('Deny').'</a></div>';
 	}
-	
+
 	// If bank module is used
 	if ($user->rights->expensereport->to_paid && ! empty($conf->banque->enabled) && $object->fk_statut == 5)
 	{
@@ -2272,7 +2308,7 @@ if ($action != 'create' && $action != 'edit')
 		}
 	}
 	
-	// If bank module is not used	
+	// If bank module is not used
 	if (($user->rights->expensereport->to_paid || empty($conf->banque->enabled)) && $object->fk_statut == 5)
 	{
 		//if ((round($remaintopay) == 0 || empty($conf->banque->enabled)) && $object->paid == 0)

From c4f09b889414a59cb8b116bc1d59d1aaed6c9721 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 May 2017 14:43:17 +0200
Subject: [PATCH 0956/1163] Work on modulebuilder

---
 dev/translation/sanity_check_en_langfiles.php |   2 +
 htdocs/admin/triggers.php                     |   1 -
 htdocs/core/class/interfaces.class.php        |  11 +-
 htdocs/core/lib/files.lib.php                 |  65 ++--
 htdocs/langs/en_US/modulebuilder.lang         |  10 +-
 htdocs/modulebuilder/index.php                | 287 ++++++++++++++----
 .../{skeletons => oldskeletons}/.gitignore    |   0
 .../{skeletons => oldskeletons}/README        |   0
 .../build_api_class.php                       |   0
 .../build_class_from_table.php                |   0
 .../build_webservice_from_class.php           |   0
 .../modMyModule.class.php                     |   0
 .../skeleton_api_class.class.php              |   0
 .../skeleton_card.php                         |   0
 .../skeleton_class.class.php                  |   0
 .../skeleton_list.php                         |   0
 .../skeleton_script.php                       |   0
 .../skeleton_webservice_server.php            |   0
 .../core/modules/modMyModule.class.php        |  29 +-
 ...99_modMyModule_MyModuleTriggers.class.php} |   4 +-
 .../modulebuilder/template/modulebuilder.txt  |   2 +-
 .../modulebuilder/template/myobject_card.php  |   2 +-
 .../modulebuilder/template/myobject_list.php  |   2 +-
 23 files changed, 306 insertions(+), 109 deletions(-)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/.gitignore (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/README (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/build_api_class.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/build_class_from_table.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/build_webservice_from_class.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/modMyModule.class.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/skeleton_api_class.class.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/skeleton_card.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/skeleton_class.class.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/skeleton_list.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/skeleton_script.php (100%)
 rename htdocs/modulebuilder/{skeletons => oldskeletons}/skeleton_webservice_server.php (100%)
 rename htdocs/modulebuilder/template/core/triggers/{interface_99_modMyModule_Triggers.class.php => interface_99_modMyModule_MyModuleTriggers.class.php} (99%)

diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php
index bb3430eb22c..9136c192739 100755
--- a/dev/translation/sanity_check_en_langfiles.php
+++ b/dev/translation/sanity_check_en_langfiles.php
@@ -310,6 +310,8 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a
 	    if (preg_match('/^.*Bytes$/', $value)) $qualifiedforclean=0;
 	    if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) $qualifiedforclean=0;
 	    if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) $qualifiedforclean=0;
+		// modulebuilder
+		if (preg_match('/^ModuleBuilderDesc/', $value)) $qualifiedforclean=0;
 	    // orders
 	    if (preg_match('/^OrderSource/', $value)) $qualifiedforclean=0;
 	    if (preg_match('/^TypeContact_/', $value)) $qualifiedforclean=0;
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index 0aae9c6915e..0dddfb3c4af 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -47,7 +47,6 @@ print load_fiche_titre($langs->trans("TriggersAvailable"),'','title_setup');
 print $langs->trans("TriggersDesc")."<br>";
 print "<br>\n";
 
-$template_dir = DOL_DOCUMENT_ROOT.'/core/tpl/';
 
 $interfaces = new Interfaces($db);
 $triggers = $interfaces->getTriggersList();
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 87ae81db856..cd4a56f4174 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -226,9 +226,10 @@ class Interfaces
      *  Return list of triggers. Function used by admin page htdoc/admin/triggers.
      *  List is sorted by trigger filename so by priority to run.
      *
-     * 	@return	array					Array list of triggers
+     *	@param	array		$forcedirtriggers		null=All default directories. This parameter is used by modulebuilder module only.
+     * 	@return	array								Array list of triggers
      */
-    function getTriggersList()
+    function getTriggersList($forcedirtriggers=null)
     {
         global $conf, $langs;
 
@@ -241,11 +242,15 @@ class Interfaces
         $i = 0;
 
         $dirtriggers=array_merge(array('/core/triggers/'),$conf->modules_parts['triggers']);
+        if (is_array($forcedirtriggers))
+        {
+        	$dirtriggers=$forcedirtriggers;
+        }
+        	
         foreach($dirtriggers as $reldir)
         {
             $dir=dol_buildpath($reldir,0);
             $newdir=dol_osencode($dir);
-            //print "xx".$dir;exit;
 
             // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
             if (! is_dir($newdir)) continue;
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 2d5b8d2f6db..ad800708522 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -448,14 +448,15 @@ function dol_filemtime($pathoffile)
  * @param	array	$arrayreplacement	Array with strings to replace
  * @param	string	$destfile			Destination file (can't be a directory). If empty, will be same than source file.
  * @param	int		$newmask			Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'
+ * @param	int		$indexdatabase		Index new file into database.
  * @return	int							<0 if error, 0 if nothing done (dest file already exists), >0 if OK
  * @see		dolCopyr
  */
-function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0)
+function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0)
 {
     global $conf;
 
-    dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask);
+    dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
 
     if (empty($srcfile)) return -1;
     if (empty($destfile)) $destfile=$srcfile;
@@ -484,12 +485,15 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0)
     dol_delete_file($tmpdestfile);
     
     // Create $newpathoftmpdestfile from $newpathofsrcfile
+    $content=file_get_contents($newpathofsrcfile, 'r');
     
+    $content = make_substitutions($content, $arrayreplacement, null);
     
-    
+    file_put_contents($newpathoftmpdestfile, $content);
+    @chmod($newpathoftmpdestfile, octdec($newmask));
     
     // Rename
-    $result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0));
+    $result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0), 0, $indexdatabase);
     if (! $result)
     {
         dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
@@ -569,10 +573,11 @@ function dol_copy($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
  * @param	string	$destfile			Destination file (a directory)
  * @param	int		$newmask			Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'
  * @param 	int		$overwriteifexists	Overwrite file if exists (1 by default)
- * @return	int							<0 if error, 0 if nothing done (dest dir already exists and overwriteifexists=0), >0 if OK
+ * @param	array	$arrayreplacement	Array to use to replace filenames with another one during the copy (works only on file names, not on directory names).
+ * @return	int							<0 if error, 0 if nothing done (all files already exists and overwriteifexists=0), >0 if OK
  * @see		dol_copy
  */
-function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
+function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement=null)
 {
 	global $conf;
 
@@ -583,7 +588,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
 	if (empty($srcfile) || empty($destfile)) return -1;
 
 	$destexists=dol_is_dir($destfile);
-	if (! $overwriteifexists && $destexists) return 0;
+	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propaated to dol_copy only.
     
     if (! $destexists)
     {
@@ -592,37 +597,37 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
         $dirmaskdec=octdec($newmask);
         if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
         $dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
-        dol_mkdir($destfile."/".$file, '', decoct($dirmaskdec));
+        dol_mkdir($destfile, '', decoct($dirmaskdec));
     }
     
-	$srcfile=dol_osencode($srcfile);
-	$destfile=dol_osencode($destfile);
+	$ossrcfile=dol_osencode($srcfile);
+	$osdestfile=dol_osencode($destfile);
 
-    // recursive function to copy
-    // all subdirectories and contents:
-	if (is_dir($srcfile))
+    // Recursive function to copy all subdirectories and contents:
+	if (is_dir($ossrcfile))
 	{
-        $dir_handle=opendir($srcfile);
+        $dir_handle=opendir($ossrcfile);
         while ($file=readdir($dir_handle))
         {
             if ($file!="." && $file!="..")
             {
-                if (is_dir($srcfile."/".$file))
+                if (is_dir($ossrcfile."/".$file))
                 {
-                    if (!is_dir($destfile."/".$file))
-                    {
-                        // We must set mask just before creating dir, becaause it can be set differently by dol_copy
-                    	umask(0);
-						$dirmaskdec=octdec($newmask);
-						if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
-						$dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
-                    	dol_mkdir($destfile."/".$file, '', decoct($dirmaskdec));
-                    }
-                    $tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists);
+                    //var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
+                    $tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
                 }
                 else
 				{
-                    $tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists);
+					$newfile = $file;
+					// Replace destination filename with a new one
+					if (is_array($arrayreplacement))
+					{
+						foreach($arrayreplacement as $key => $val)
+						{
+							$newfile = str_replace($key, $val, $newfile);
+						}
+					}
+                    $tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
                 }
                 // Set result
                 if ($result > 0 && $tmpresult >= 0)
@@ -641,7 +646,8 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
     }
     else
 	{
-        $result=dol_copy($srcfile, $destfile, $newmask, $overwriteifexists);
+		// Source directory does not exists
+        $result = -2;
     }
 
     return $result;
@@ -660,10 +666,11 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
  * @param   integer	$newmask            Mask in octal string for new file (0 by default means $conf->global->MAIN_UMASK)
  * @param   int		$overwriteifexists  Overwrite file if exists (1 by default)
  * @param   int     $testvirus          Do an antivirus test. Move is canceled if a virus is found.
+ * @param	int		$indexdatabase		Index new file into database.
  * @return  boolean 		            True if OK, false if KO
  * @see dol_move_uploaded_file
  */
-function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvirus=0)
+function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvirus=0, $indexdatabase=1)
 {
     global $user, $db, $conf;
     $result=false;
@@ -709,7 +716,7 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvi
         }
 
         // Move ok
-        if ($result)
+        if ($result && $indexdatabase)
         {
             // Rename entry into ecm database
             $rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index de0c2fc216a..7336a020fa6 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -6,4 +6,12 @@ ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they a
 NewModule=New module
 ModuleKey=Key for new module
 ModuleInitialized=Module initialized
-
+ModuleBuilderDescdescription=Enter here all general information that describe your module
+ModuleBuilderDescobjects=Define here the new objects you want to manage with our module. A page to list them and a page to create/edit/view a card will be generated.
+ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with our module.
+ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file with your IDE.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to get your module package file.
+BuildPackage=Build package
+ModuleIsNotActive=This module was not activated yet (go into Home-Setup-Module to make it live)
+ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index a033bd1be23..e11ff31a303 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -29,9 +29,10 @@ $langs->load("admin");
 $langs->load("modulebuilder");
 $langs->load("other");
 
-$action=GETPOST('action','alpha');
+$action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm','alpha');
-$module=GETPOST('module');
+$module=GETPOST('module','alpha');
+$tab=GETPOST('tab','aZ09');
 if (empty($module)) $module='initmodule';
 if (empty($tab)) $tab='description';
 
@@ -56,30 +57,36 @@ $FILEFLAG='modulebuilder.txt';
 if ($dircustom && $action == 'initmodule' && $modulename)
 {
     $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
-    $destdir = $dircustom.'/'.$modulename;
+    $destdir = $dircustom.'/'.strtolower($modulename);
 
     $arrayreplacement=array(
         'mymodule'=>strtolower($modulename),
      	'MyModule'=>$modulename
     );
     
-    $result = dolCopyDir($srcdir, $destdir, 0, 0);
+    $result = dolCopyDir($srcdir, $destdir, 0, 0, $arrayreplacement);
     //dol_mkdir($destfile);
     if ($result <= 0)
     {
-        $error++;
-        $langs->load("errors");
-        setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors');
+    	if ($result < 0)
+    	{
+        	$error++;
+        	$langs->load("errors");
+        	setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors');
+    	}
+    	else	// $result == 0
+    	{
+        	setEventMessages($langs->trans("AllFilesDidAlreadyExist", $srcdir, $destdir), null, 'warnings');
+    	}
     }
 
     // Edit PHP files
     if (! $error)
     {
-	    $listofphpfilestoedit = dol_dir_list($destdir, 'files', 1, '\.php$', '', 'fullname', SORT_ASC, 0, 1);
+	    $listofphpfilestoedit = dol_dir_list($destdir, 'files', 1, '\.(php|MD|js)$', '', 'fullname', SORT_ASC, 0, 1);
 	    foreach($listofphpfilestoedit as $phpfileval)
 	    {
-	        var_dump($phpfileval['fullname']);
-	    	
+	        //var_dump($phpfileval['fullname']);
 	    	$arrayreplacement=array(
 	            'mymodule'=>strtolower($modulename),
 	        	'MyModule'=>$modulename,
@@ -106,6 +113,12 @@ if ($dircustom && $action == 'initmodule' && $modulename)
     }
 }
 
+if ($dircustom && $action == 'generatepackage')
+{
+    $dir = $dircustom.'/'.$modulename;
+	
+
+}
 
 
 /*
@@ -138,7 +151,16 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
                     $fullname = $dircustomcursor['fullname'];
                     if (dol_is_file($fullname.'/'.$FILEFLAG))
                     {
-                        $listofmodules[$dircustomcursor['name']]=$fullname;
+                    	// Get real name of module (MyModule instead of mymodule)
+                    	$descriptorfiles = dol_dir_list($fullname.'/core/modules/', 'files', 0, 'mod.*\.class\.php');
+                    	$modulenamewithcase='';
+                    	foreach($descriptorfiles as $descriptorcursor)
+                    	{
+                    		$modulenamewithcase=preg_replace('/^mod/', '', $descriptorcursor['name']);
+                    		$modulenamewithcase=preg_replace('/\.class\.php$/', '', $modulenamewithcase);
+                    	}
+                    	if ($modulenamewithcase) $listofmodules[$dircustomcursor['name']]=$modulenamewithcase;
+                    	//var_dump($listofmodules);
                     }
                 }
             }
@@ -154,11 +176,44 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
 print $langs->trans("ModuleBuilderDesc").'<br>';
 print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $dircustom).'<br>';
 print $langs->trans("ModuleBuilderDesc3", count($listofmodules), $FILEFLAG).'<br>';
-print '<br>';
-            
-            
+//print '<br>';
+
+
+// Load module descriptor
+$error=0;
+$moduleobj = null;
+
+if (! empty($module) && $module != 'initmodule')
+{
+	$modulelowercase=strtolower($module);
+	
+    // Load module
+    dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
+    $class='mod'.$module;
+
+    if (class_exists($class))
+    {
+        try {
+            $moduleobj = new $class($db);
+        }
+        catch(Exception $e)
+        {
+            $error++;
+            print $e->getMessage();
+        }
+    }
+    else
+    {
+        $error++;
+        $langs->load("errors");
+        print img_warning('').' '.$langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module);
+    }
+}
+
 print '<br>';            
 
+
+// Tabs for all modules
 $head = array();
 $h=0;
 
@@ -167,11 +222,11 @@ $head[$h][1] = $langs->trans("NewModule");
 $head[$h][2] = 'initmodule';
 $h++;
     
-foreach($listofmodules as $tmpmodule => $fullname)
+foreach($listofmodules as $tmpmodule => $tmpmodulewithcase)
 {
-    $head[$h][0] = $_SERVER["PHP_SELF"].'?module='.$tmpmodule;
-    $head[$h][1] = $tmpmodule;
-    $head[$h][2] = $tmpmodule;
+    $head[$h][0] = $_SERVER["PHP_SELF"].'?module='.$tmpmodulewithcase;
+    $head[$h][1] = $tmpmodulewithcase;
+    $head[$h][2] = $tmpmodulewithcase;
     $h++;
 }
 
@@ -195,73 +250,197 @@ if ($module == 'initmodule')
 }
 elseif (! empty($module))
 {
-    $error=0;
-    
-    // Load module
-    dol_include_once($module.'/core/modules/mod'.ucfirst($module).'.class.php');
-    $class='mod'.ucfirst($module);
-    if (class_exists($class))
-    {
-        try {
-            $moduleobj = new $class($db);
-        }
-        catch(Exception $e)
-        {
-            $error++;
-            print $e->getMessage();
-        }
-    }
-    else
-    {
-        $error++;
-        $langs->load("errors");
-        print img_warning('').' '.$langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module);
-    }
-    
-    // Button to delete module
-    
-    
     // Tabs for module
     if (! $error)
     {
         $head2 = array();
         $h=0;
-        
-        foreach($listofmodules as $tmpmodule => $fullname)
+
+       	$modulestatusinfo=img_info('').' '.$langs->trans("ModuleIsNotActive");
+        if (! empty($conf->$module->enabled))
         {
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description';
+        	$modulestatusinfo=img_warning().' '.$langs->trans("ModuleIsLive");	
+        }
+        
+        foreach($listofmodules as $tmpmodule => $tmpmodulewithcase)
+        {
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Description");
             $head2[$h][2] = 'description';
             $h++;
             
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects';
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Objects");
             $head2[$h][2] = 'objects';
             $h++;        
         
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab='.$tmpmodule;
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=menus&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Menus");
             $head2[$h][2] = 'menus';
             $h++;
             
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab='.$tmpmodule;
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=permissions&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Permissions");
             $head2[$h][2] = 'permissions';
             $h++;        
     
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab='.$tmpmodule;
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=triggers&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Triggers");
             $head2[$h][2] = 'triggers';
             $h++;        
+
+            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=buildpackage&module='.$tmpmodulewithcase;
+            $head2[$h][1] = $langs->trans("BuildPackage");
+            $head2[$h][2] = 'buildpackage';
+            $h++;        
+        }
+
+        print $modulestatusinfo.'<br><br>';
+       
+        dol_fiche_head($head2, $tab, '', -1, '');
+
+        print $langs->trans("ModuleBuilderDesc".$tab).'<br><br>';
+        
+        if ($tab == 'description')
+        {
+        	print '<div class="underbanner clearboth"></div>';
+        	print '<div class="fichecenter">';
+        	
+        	print '<table class="border centpercent">';
+        	print '<tr class="liste_titre"><td class="titlefield">';
+        	print $langs->trans("Parameter");
+        	print '</td><td>';
+        	print $langs->trans("Value");
+        	print '</td></tr>';
+
+        	print '<tr><td>';
+        	print $langs->trans("Numero");
+        	print '</td><td>';
+        	print $moduleobj->numero;
+        	print '</td></tr>';
+        	
+        	print '<tr><td>';
+        	print $langs->trans("Name");
+        	print '</td><td>';
+        	print $moduleobj->getName();
+        	print '</td></tr>';
+        	
+        	print '<tr><td>';
+        	print $langs->trans("Version");
+        	print '</td><td>';
+        	print $moduleobj->getVersion();
+        	print '</td></tr>';
+        	
+        	print '<tr><td>';
+        	print $langs->trans("Family");
+        	print "<br>'crm','financial','hr','projects','products','ecm','technic','interface','other'";
+        	print '</td><td>';
+        	print $moduleobj->family;
+        	print '</td></tr>';
+        	
+        	print '<tr><td>';
+        	print $langs->trans("EditorName");
+        	print '</td><td>';
+        	print $moduleobj->editor_name;
+        	print '</td></tr>';
+        	
+        	print '<tr><td>';
+        	print $langs->trans("EditorUrl");
+        	print '</td><td>';
+        	print $moduleobj->editor_url;
+        	print '</td></tr>';
+        	
+        	print '<tr><td>';
+        	print $langs->trans("Description");
+        	print '</td><td>';
+        	print $moduleobj->getDesc();
+        	print '</td></tr>';
+        	
+        	print '<tr><td>';
+        	print $langs->trans("LongDescription");
+        	print '</td><td>';
+        	print $moduleobj->getDescLong();
+        	print '</td></tr>';
+        	
+        	print '</table>';
+    		
+        	print '</div>';
+    		
+        	print '<br><br>';
+        	print '<form name="delete">';
+        	print '<input type="hidden" name="action" value="confirm_delete">';
+        	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
+        	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+        	print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'">';		
+        	print '</form>';
         }
         
-        dol_fiche_head($head2, $tab, '', -1, '');
+        if ($tab == 'objects')
+        {
+    		print $langs->trans("FeatureNotYetAvailable");
+        	
         
-        print $moduleobj->getDescLong();
-    
+        }
         
+        if ($tab == 'menus')
+        {
+    		print $langs->trans("FeatureNotYetAvailable");
+        	
         
+        }
         
+        if ($tab == 'permissions')
+        {
+    		print $langs->trans("FeatureNotYetAvailable");
+        
+        }
+        
+        if ($tab == 'triggers')
+        {
+        	require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+        	
+			$interfaces = new Interfaces($db);
+			$triggers = $interfaces->getTriggersList(array('/'.strtolower($module).'/core/triggers'));
+			
+			print '<div class="div-table-responsive-no-min">';
+			print '<table class="noborder">
+			<tr class="liste_titre">
+			<td colspan="2">'.$langs->trans("File").'</td>
+			<td align="center">'.$langs->trans("Active").'</td>
+			<td align="center">&nbsp;</td>
+			</tr>
+			';
+			
+			$var=True;
+			foreach ($triggers as $trigger)
+			{
+				
+				print '<tr class="oddeven">';
+				print '<td valign="top" width="14" align="center">'.$trigger['picto'].'</td>';
+				print '<td class="tdtop">'.$trigger['file'].'</td>';
+				print '<td valign="top" align="center">'.$trigger['status'].'</td>';
+				print '<td class="tdtop">';
+				$text=$trigger['info'];
+				$text.="<br>\n<strong>".$langs->trans("File")."</strong>:<br>\n".$trigger['relpath'];
+				//$text.="\n".$langs->trans("ExternalModule",$trigger['isocreorexternal']);
+				print $form->textwithpicto('', $text);
+				print '</td>';
+				print '</tr>';
+			}
+			
+			print '</table>';
+			print '</div>';
+        }
+
+        if ($tab == 'buildpackage')
+        {
+        	print '<form name="generatepackage">';
+        	print '<input type="hidden" name="action" value="generatepackage">';
+        	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
+        	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+        	print '<input type="submit" class="button" value="'.$langs->trans("Generate").'">';		
+        	print '</form>';
+        }
         
         dol_fiche_end();
     }
diff --git a/htdocs/modulebuilder/skeletons/.gitignore b/htdocs/modulebuilder/oldskeletons/.gitignore
similarity index 100%
rename from htdocs/modulebuilder/skeletons/.gitignore
rename to htdocs/modulebuilder/oldskeletons/.gitignore
diff --git a/htdocs/modulebuilder/skeletons/README b/htdocs/modulebuilder/oldskeletons/README
similarity index 100%
rename from htdocs/modulebuilder/skeletons/README
rename to htdocs/modulebuilder/oldskeletons/README
diff --git a/htdocs/modulebuilder/skeletons/build_api_class.php b/htdocs/modulebuilder/oldskeletons/build_api_class.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/build_api_class.php
rename to htdocs/modulebuilder/oldskeletons/build_api_class.php
diff --git a/htdocs/modulebuilder/skeletons/build_class_from_table.php b/htdocs/modulebuilder/oldskeletons/build_class_from_table.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/build_class_from_table.php
rename to htdocs/modulebuilder/oldskeletons/build_class_from_table.php
diff --git a/htdocs/modulebuilder/skeletons/build_webservice_from_class.php b/htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/build_webservice_from_class.php
rename to htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
diff --git a/htdocs/modulebuilder/skeletons/modMyModule.class.php b/htdocs/modulebuilder/oldskeletons/modMyModule.class.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/modMyModule.class.php
rename to htdocs/modulebuilder/oldskeletons/modMyModule.class.php
diff --git a/htdocs/modulebuilder/skeletons/skeleton_api_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/skeleton_api_class.class.php
rename to htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
diff --git a/htdocs/modulebuilder/skeletons/skeleton_card.php b/htdocs/modulebuilder/oldskeletons/skeleton_card.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/skeleton_card.php
rename to htdocs/modulebuilder/oldskeletons/skeleton_card.php
diff --git a/htdocs/modulebuilder/skeletons/skeleton_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/skeleton_class.class.php
rename to htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
diff --git a/htdocs/modulebuilder/skeletons/skeleton_list.php b/htdocs/modulebuilder/oldskeletons/skeleton_list.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/skeleton_list.php
rename to htdocs/modulebuilder/oldskeletons/skeleton_list.php
diff --git a/htdocs/modulebuilder/skeletons/skeleton_script.php b/htdocs/modulebuilder/oldskeletons/skeleton_script.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/skeleton_script.php
rename to htdocs/modulebuilder/oldskeletons/skeleton_script.php
diff --git a/htdocs/modulebuilder/skeletons/skeleton_webservice_server.php b/htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php
similarity index 100%
rename from htdocs/modulebuilder/skeletons/skeleton_webservice_server.php
rename to htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 71948b0e1be..5799d5bbab7 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -83,22 +83,19 @@ class modMyModule extends DolibarrModules
 		// for default path (eg: /mymodule/core/xxxxx) (0=disable, 1=enable)
 		// for specific path of parts (eg: /mymodule/core/modules/barcode)
 		// for specific css file (eg: /mymodule/css/mymodule.css.php)
-		//$this->module_parts = array(
-		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
-		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
-		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
-		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
-		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
-		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
-		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
-		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
-		//							'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
-	 	//							'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
-		//							'hooks' => array('hookcontext1','hookcontext2',...) // Set here all hooks context managed by module. You can also set hook context 'all'
-		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
-		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@mymodule')) // Set here all workflow context managed by module
-		//                        );
-		$this->module_parts = array();
+		$this->module_parts = array(
+		                        	'triggers' => 1,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
+									'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
+									'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
+									'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
+									'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
+		                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
+									'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+									'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
+									'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
+	 								'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
+									'hooks' => array('hookcontext1','hookcontext2') 	// Set here all hooks context managed by module. You can also set hook context 'all'
+		                        );
 
 		// Data directories to create when module is enabled.
 		// Example: this->dirs = array("/mymodule/temp");
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_Triggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
similarity index 99%
rename from htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_Triggers.class.php
rename to htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index 56f00ab8b02..0140e1cc2b9 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_Triggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    core/triggers/interface_99_modMyModule_Triggers.class.php
+ * \file    core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
  * \ingroup mymodule
  * \brief   Example trigger.
  *
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
 /**
  *  Class of triggers for MyModule module
  */
-class InterfaceMyModuleTrigger extends DolibarrTriggers
+class InterfaceMyModuleTriggers extends DolibarrTriggers
 {
 	/**
 	 * @var DoliDB Database handler
diff --git a/htdocs/modulebuilder/template/modulebuilder.txt b/htdocs/modulebuilder/template/modulebuilder.txt
index 4c726c35394..5cdb6c6e6e8 100644
--- a/htdocs/modulebuilder/template/modulebuilder.txt
+++ b/htdocs/modulebuilder/template/modulebuilder.txt
@@ -1,2 +1,2 @@
-File to flag module build using official module template.
+File to flag module built using official module template.
 When this file is present into a module directory, you can edit it with the module builder tool.
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 6db376ff9b1..1d22c464212 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -44,7 +44,7 @@ if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@inc
 if (! $res) die("Include of main fails");
 // Change this following line to use the correct relative path from htdocs
 include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
-dol_include_once('/mymodule/class/myobject_class.class.php');
+dol_include_once('/mymodule/class/myobject.class.php');
 
 // Load traductions files requiredby by page
 $langs->load("mymodule");
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index ad105480901..a935b87bd58 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -46,7 +46,7 @@ if (! $res) die("Include of main fails");
 require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-dol_include_once('/mymodule/class/skeleton_class.class.php');
+dol_include_once('/mymodule/class/myobject.class.php');
 
 // Load traductions files requiredby by page
 $langs->load("mymodule");

From 095545e8d95eda034cc1629931603fc2611569c9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 28 May 2017 21:56:18 +0200
Subject: [PATCH 0957/1163] Fix : Correct bank transfert when we write
 operation on general ledger

---
 .../accountancy/class/bookkeeping.class.php   | 328 +++++++++---------
 htdocs/accountancy/journal/bankjournal.php    |  46 ++-
 2 files changed, 192 insertions(+), 182 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index a59d92eb63a..1da95f26ce3 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -54,18 +54,15 @@ class BookKeeping extends CommonObject
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'accounting_bookkeeping';  
-	
-	
+
 	public $entity = 1;
-	
-	
+
 	/**
 	 *
 	 * @var BookKeepingLine[] Lines
 	 */
 	public $lines = array ();
-	
-	
+
 	/**
 	 *
 	 * @var int ID
@@ -89,10 +86,10 @@ class BookKeeping extends CommonObject
 	public $import_key;
 	public $code_journal;
 	public $piece_num;
-	
+
 	/**
 	 */
-	
+
 	/**
 	 * Constructor
 	 *
@@ -101,7 +98,7 @@ class BookKeeping extends CommonObject
 	public function __construct(DoliDB $db) {
 		$this->db = $db;
 	}
-	
+
 	/**
 	 * Create object into database
 	 *
@@ -110,12 +107,12 @@ class BookKeeping extends CommonObject
 	 * @return int                 <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false) {
-	    global $conf, $langs;
-	    
+		global $conf, $langs;
+
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
 		$error = 0;
-		
+
 		// Clean parameters
 		if (isset($this->doc_type)) {
 			$this->doc_type = trim($this->doc_type);
@@ -177,15 +174,14 @@ class BookKeeping extends CommonObject
             {
                 $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->fk_doc,  $this->doc_type);		    
             }
-		    
+
 		    return -1;
 		}
-		
-		
+
 		$this->db->begin();
-		
+
 		$this->piece_num = 0;
-		
+
 		// First check if line not yet already in bookkeeping
 		$sql = "SELECT count(*) as nb";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
@@ -193,10 +189,10 @@ class BookKeeping extends CommonObject
 		$sql .= " AND fk_doc = " . $this->fk_doc;
 		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines 
 		$sql .= " AND numero_compte = '" . $this->db->escape($this->numero_compte) . "'";
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-		
+		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+
 		$resql = $this->db->query($sql);
-		
+
 		if ($resql) {
 			$row = $this->db->fetch_object($resql);
 			if ($row->nb == 0) 
@@ -207,8 +203,8 @@ class BookKeeping extends CommonObject
 				$sqlnum .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";		// For example doc_type = 'bank' 
 				$sqlnum .= " AND fk_docdet = " . $this->db->escape($this->fk_docdet);       		// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
 				$sqlnum .= " AND doc_ref = '" . $this->db->escape($this->doc_ref) . "'";			// ref of source object
-			    $sqlnum .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-				
+				$sqlnum .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+
 				dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
 				$resqlnum = $this->db->query($sqlnum);
 				if ($resqlnum) {
@@ -219,8 +215,8 @@ class BookKeeping extends CommonObject
 				if (empty($this->piece_num)) {
 					$sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum";
 					$sqlnum .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-				    $sqlnum .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-						
+					$sqlnum .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+
 					dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
 					$resqlnum = $this->db->query($sqlnum);
 					if ($resqlnum) {
@@ -232,12 +228,12 @@ class BookKeeping extends CommonObject
 				if (empty($this->piece_num)) {
 					$this->piece_num = 1;
 				}
-				
+
 				$now = dol_now();
 				if (empty($this->date_create)) {
 					$this->date_create = $now;
 				}
-				
+
 				$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " (";
 				$sql .= "doc_date";
 				$sql .= ", doc_type";
@@ -275,7 +271,7 @@ class BookKeeping extends CommonObject
 				$sql .= "," . $this->piece_num;
 				$sql .= ", " . (! isset($this->entity) ? '1' : $this->entity);
 				$sql .= ")";
-				
+
 				dol_syslog(get_class($this) . ":: create sql=" . $sql, LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql) {
@@ -308,7 +304,7 @@ class BookKeeping extends CommonObject
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
-		
+
 		if (! $error) {
 			
 			if (! $notrigger) {
@@ -321,7 +317,7 @@ class BookKeeping extends CommonObject
 				// // End call triggers
 			}
 		}
-		
+
 		// Commit or rollback
 		if ($error) {
 			$this->db->rollback();
@@ -331,7 +327,7 @@ class BookKeeping extends CommonObject
 			return $result;
 		}
 	}
-	
+
 	/**
 	 * Create object into database
 	 *
@@ -341,11 +337,11 @@ class BookKeeping extends CommonObject
 	 */
 	public function createStd(User $user, $notrigger = false) {
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
 		$error = 0;
-		
+
 		// Clean parameters
-		
+
 		if (isset($this->doc_type)) {
 			$this->doc_type = trim($this->doc_type);
 		}
@@ -393,10 +389,10 @@ class BookKeeping extends CommonObject
 		}
 		if (empty($this->debit)) $this->debit = 0;
 		if (empty($this->credit)) $this->credit = 0;
-		
+
 		// Check parameters
 		// Put here code to add control on parameters values
-		
+
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
 		$sql .= 'doc_date,';
@@ -435,19 +431,19 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->piece_num).',';
 		$sql .= ' ' . (! isset($this->entity) ? '1' : $this->entity);
 		$sql .= ')';
-		
+
 		$this->db->begin();
-		
+
 		$resql = $this->db->query($sql);
 		if (! $resql) {
 			$error ++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
-		
+
 		if (! $error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-			
+
 			if (! $notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.
@@ -458,7 +454,7 @@ class BookKeeping extends CommonObject
 				// // End call triggers
 			}
 		}
-		
+
 		// Commit or rollback
 		if ($error) {
 			$this->db->rollback();
@@ -470,7 +466,7 @@ class BookKeeping extends CommonObject
 			return $this->id;
 		}
 	}
-	
+
 	/**
 	 * Load object in memory from the database
 	 *
@@ -481,9 +477,9 @@ class BookKeeping extends CommonObject
 	 */
 	public function fetch($id, $ref = null) {
 		global $conf;
-		
+
 	    dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
 		$sql .= " t.doc_date,";
@@ -510,15 +506,15 @@ class BookKeeping extends CommonObject
 		} else {
 			$sql .= ' AND t.rowid = ' . $id;
 		}
-		
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$numrows = $this->db->num_rows($resql);
 			if ($numrows) {
 				$obj = $this->db->fetch_object($resql);
-				
+
 				$this->id = $obj->rowid;
-				
+
 				$this->doc_date = $this->db->jdate($obj->doc_date);
 				$this->doc_type = $obj->doc_type;
 				$this->doc_ref = $obj->doc_ref;
@@ -537,7 +533,7 @@ class BookKeeping extends CommonObject
 				$this->piece_num = $obj->piece_num;
 			}
 			$this->db->free($resql);
-			
+
 			if ($numrows) {
 				return 1;
 			} else {
@@ -565,9 +561,9 @@ class BookKeeping extends CommonObject
 	 */
 	public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
 		global $conf;
-		
-	    dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
 		$sql .= " t.doc_date,";
@@ -622,16 +618,16 @@ class BookKeeping extends CommonObject
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
 		} 
 		$this->lines = array ();
-		
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			
+
 			while ( $obj = $this->db->fetch_object($resql) ) {
 				$line = new BookKeepingLine();
-				
+
 				$line->id = $obj->rowid;
-				
+
 				$line->doc_date = $this->db->jdate($obj->doc_date);
 				$line->doc_type = $obj->doc_type;
 				$line->doc_ref = $obj->doc_ref;
@@ -648,16 +644,16 @@ class BookKeeping extends CommonObject
 				$line->import_key = $obj->import_key;
 				$line->code_journal = $obj->code_journal;
 				$line->piece_num = $obj->piece_num;
-				
+
 				$this->lines[] = $line;
 			}
 			$this->db->free($resql);
-			
+
 			return $num;
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-			
+
 			return - 1;
 		}
 	}
@@ -677,9 +673,9 @@ class BookKeeping extends CommonObject
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
 		global $conf;
-		
+
 	    dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
 		$sql .= " t.doc_date,";
@@ -723,7 +719,7 @@ class BookKeeping extends CommonObject
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
-		
+
 		if (! empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
@@ -731,16 +727,16 @@ class BookKeeping extends CommonObject
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
 		}
 		$this->lines = array ();
-		
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			
+
 			while ( $obj = $this->db->fetch_object($resql) ) {
 				$line = new BookKeepingLine();
-				
+
 				$line->id = $obj->rowid;
-				
+
 				$line->doc_date = $this->db->jdate($obj->doc_date);
 				$line->doc_type = $obj->doc_type;
 				$line->doc_ref = $obj->doc_ref;
@@ -757,20 +753,20 @@ class BookKeeping extends CommonObject
 				$line->import_key = $obj->import_key;
 				$line->code_journal = $obj->code_journal;
 				$line->piece_num = $obj->piece_num;
-				
+
 				$this->lines[] = $line;
 			}
 			$this->db->free($resql);
-			
+
 			return $num;
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-			
+
 			return - 1;
 		}
 	}
-	
+
 	/**
 	 * Load object in memory from the database
 	 *
@@ -785,9 +781,9 @@ class BookKeeping extends CommonObject
 	 */
 	public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
 		global $conf;
-		
+
 	    dol_syslog(__METHOD__, LOG_DEBUG);
-	
+
 		$sql = 'SELECT';
 		$sql .= " t.numero_compte,";
 		$sql .= " SUM(t.debit) as debit,";
@@ -817,9 +813,9 @@ class BookKeeping extends CommonObject
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
-		
+
 		$sql .= ' GROUP BY t.numero_compte';
-	
+
 		if (! empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder); 
 		}
@@ -827,30 +823,30 @@ class BookKeeping extends CommonObject
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
 		}
 		$this->lines = array ();
-	
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
-	
+
 			while ( $obj = $this->db->fetch_object($resql) ) {
 				$line = new BookKeepingLine();
-				
+
 				$line->numero_compte = $obj->numero_compte;
 				$line->debit = $obj->debit;
 				$line->credit = $obj->credit;
 				$this->lines[] = $line;
 			}
 			$this->db->free($resql);
-	
+
 			return $num;
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-	
+
 			return - 1;
 		}
 	}
-	
+
 	/**
 	 * Update object into database
 	 *
@@ -861,11 +857,10 @@ class BookKeeping extends CommonObject
 	 */
 	public function update(User $user, $notrigger = false) {
 		$error = 0;
-		
+
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
 		// Clean parameters
-		
 		if (isset($this->doc_type)) {
 			$this->doc_type = trim($this->doc_type);
 		}
@@ -911,10 +906,10 @@ class BookKeeping extends CommonObject
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
-		
+
 		// Check parameters
 		// Put here code to add a control on parameters values
-		
+
 		// Update request
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
 		$sql .= ' doc_date = ' . (! isset($this->doc_date) || dol_strlen($this->doc_date) != 0 ? "'" . $this->db->idate($this->doc_date) . "'" : 'null') . ',';
@@ -934,16 +929,16 @@ class BookKeeping extends CommonObject
 		$sql .= ' code_journal = ' . (isset($this->code_journal) ? "'" . $this->db->escape($this->code_journal) . "'" : "null") . ',';
 		$sql .= ' piece_num = ' . (isset($this->piece_num) ? $this->piece_num : "null");
 		$sql .= ' WHERE rowid=' . $this->id;
-		
+
 		$this->db->begin();
-		
+
 		$resql = $this->db->query($sql);
 		if (! $resql) {
 			$error ++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
-		
+
 		if (! $error && ! $notrigger) {
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action calls a trigger.
@@ -953,19 +948,19 @@ class BookKeeping extends CommonObject
 			// if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
 			// // End call triggers
 		}
-		
+
 		// Commit or rollback
 		if ($error) {
 			$this->db->rollback();
-			
+
 			return - 1 * $error;
 		} else {
 			$this->db->commit();
-			
+
 			return 1;
 		}
 	}
-	
+
 	/**
 	 * Delete object in database
 	 *
@@ -976,27 +971,27 @@ class BookKeeping extends CommonObject
 	 */
 	public function delete(User $user, $notrigger = false) {
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
 		$error = 0;
-		
+
 		$this->db->begin();
-		
+
 		if (! $error) {
 			if (! $notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action calls a trigger.
-				
+
 				// // Call triggers
 				// $result=$this->call_trigger('MYOBJECT_DELETE',$user);
 				// if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
 				// // End call triggers
 			}
 		}
-		
+
 		if (! $error) {
 			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
 			$sql .= ' WHERE rowid=' . $this->id;
-			
+
 			$resql = $this->db->query($sql);
 			if (! $resql) {
 				$error ++;
@@ -1004,19 +999,19 @@ class BookKeeping extends CommonObject
 				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 			}
 		}
-		
+
 		// Commit or rollback
 		if ($error) {
 			$this->db->rollback();
-			
+
 			return - 1 * $error;
 		} else {
 			$this->db->commit();
-			
+
 			return 1;
 		}
 	}
-	
+
 	/**
 	 * Delete bookkepping by importkey
 	 *
@@ -1025,25 +1020,25 @@ class BookKeeping extends CommonObject
 	 */
 	function deleteByImportkey($importkey) {
 		$this->db->begin();
-		
+
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE import_key = '" . $importkey . "'";
-		
+
 		$resql = $this->db->query($sql);
-		
+
 		if (! $resql) {
 			$this->errors[] = "Error " . $this->db->lasterror();
 			dol_syslog(get_class($this)."::delete Error " . $this->db->lasterror(), LOG_ERR);
 			$this->db->rollback();
 			return - 1;
 		}
-		
+
 		$this->db->commit();
 		return 1;
 	}
-	
+
 	/**
 	 * Delete bookkepping by year
 	 *
@@ -1053,14 +1048,14 @@ class BookKeeping extends CommonObject
 	 */
 	function deleteByYearAndJournal($delyear='', $journal='') {
 	    global $conf;
-	    
+
 	    if (empty($delyear) && empty($journal)) 
 	    {
 	        return -1;
 	    }
-	    
+
 		$this->db->begin();
-		
+
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
 		$sql.= " FROM " . MAIN_DB_PREFIX . $this->table_element;
@@ -1069,7 +1064,7 @@ class BookKeeping extends CommonObject
 		if (! empty($journal)) $sql.= " AND code_journal = '".$journal."'";
 	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 		$resql = $this->db->query($sql);
-		
+
 		if (! $resql) {
 			$this->errors[] = "Error " . $this->db->lasterror();
 			foreach ( $this->errors as $errmsg ) {
@@ -1079,11 +1074,11 @@ class BookKeeping extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-		
+
 		$this->db->commit();
 		return 1;
 	}
-	
+
 	/**
 	 * Delete bookkepping by piece number
 	 *
@@ -1092,17 +1087,17 @@ class BookKeeping extends CommonObject
 	 */
 	function deleteMvtNum($piecenum) {
 	    global $conf;
-	    
+
 		$this->db->begin();
-		
+
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
 	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-		
+
 		$resql = $this->db->query($sql);
-		
+
 		if (! $resql) {
 			$this->errors[] = "Error " . $this->db->lasterror();
 			foreach ( $this->errors as $errmsg ) {
@@ -1112,11 +1107,11 @@ class BookKeeping extends CommonObject
 			$this->db->rollback();
 			return - 1;
 		}
-		
+
 		$this->db->commit();
 		return 1;
 	}
-	
+
 	/**
 	 * Load an object from its id and create a new one in database
 	 *
@@ -1126,43 +1121,43 @@ class BookKeeping extends CommonObject
 	 */
 	public function createFromClone($fromid) {
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		
+
 		global $user;
 		$error = 0;
 		$object = new Accountingbookkeeping($this->db);
-		
+
 		$this->db->begin();
-		
+
 		// Load source object
 		$object->fetch($fromid);
 		// Reset object
 		$object->id = 0;
-		
+
 		// Clear fields
 		// ...
-		
+
 		// Create clone
 		$result = $object->create($user);
-		
+
 		// Other options
 		if ($result < 0) {
 			$error ++;
 			$this->errors = $object->errors;
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
-		
+
 		// End
 		if (! $error) {
 			$this->db->commit();
-			
+
 			return $object->id;
 		} else {
 			$this->db->rollback();
-			
+
 			return - 1;
 		}
 	}
-	
+
 	/**
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
@@ -1171,9 +1166,9 @@ class BookKeeping extends CommonObject
 	 */
 	public function initAsSpecimen() {
 		global $user;
-		
+
 		$now=dol_now();
-		
+
 		$this->id = 0;
 		$this->doc_date = $now;
 		$this->doc_type = '';
@@ -1192,7 +1187,7 @@ class BookKeeping extends CommonObject
 		$this->code_journal = '';
 		$this->piece_num = '';
 	}
-	
+
 	/**
 	 * Load an accounting document into memory from database
 	 *
@@ -1201,17 +1196,17 @@ class BookKeeping extends CommonObject
 	 */
 	public function fetchPerMvt($piecenum) {
 		global $conf;
-		
+
 	    $sql = "SELECT piece_num,doc_date,code_journal,doc_ref,doc_type";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
 	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-		
+
 		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
-			
+
 			$this->piece_num = $obj->piece_num;
 			$this->code_journal = $obj->code_journal;
 			$this->doc_date = $this->db->jdate($obj->doc_date);
@@ -1225,7 +1220,7 @@ class BookKeeping extends CommonObject
 		
 		return 1;
 	}
-	
+
 	/**
 	 * Return next number movement
 	 *
@@ -1234,10 +1229,10 @@ class BookKeeping extends CommonObject
 	public function getNextNumMvt() 
 	{
 	    global $conf;
-	    
+
 		$sql = "SELECT MAX(piece_num)+1 as max FROM " . MAIN_DB_PREFIX . $this->table_element;
 	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-		
+
 		dol_syslog(get_class($this) . "getNextNumMvt sql=" . $sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
 
@@ -1252,7 +1247,7 @@ class BookKeeping extends CommonObject
 			return - 1;
 		}
 	}
-	
+
 	/**
 	 * Load all informations of accountancy document
 	 *
@@ -1261,7 +1256,7 @@ class BookKeeping extends CommonObject
 	 */
 	function fetch_all_per_mvt($piecenum) {
 	    global $conf;
-	    
+
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
@@ -1269,17 +1264,17 @@ class BookKeeping extends CommonObject
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
 	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-		
+
 		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
-			
+
 			while ( $obj = $this->db->fetch_object($result) ) {
-				
+
 				$line = new BookKeepingLine();
-				
+
 				$line->id = $obj->rowid;
-				
+
 				$line->doc_date = $this->db->jdate($obj->doc_date);
 				$line->doc_type = $obj->doc_type;
 				$line->doc_ref = $obj->doc_ref;
@@ -1294,7 +1289,7 @@ class BookKeeping extends CommonObject
 				$line->sens = $obj->sens;
 				$line->code_journal = $obj->code_journal;
 				$line->piece_num = $obj->piece_num;
-				
+
 				$this->linesmvt[] = $line;
 			}
 		} else {
@@ -1305,7 +1300,7 @@ class BookKeeping extends CommonObject
 		
 		return 1;
 	}
-	
+
 	/**
 	 * Export bookkeping
 	 *
@@ -1314,27 +1309,27 @@ class BookKeeping extends CommonObject
 	 */
 	function export_bookkeping($model = 'ebp') {
 	    global $conf;
-	    
+
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-		
+
 		dol_syslog(get_class($this) . "::export_bookkeping", LOG_DEBUG);
-		
+
 		$resql = $this->db->query($sql);
-		
+
 		if ($resql) {
 			$this->linesexport = array ();
-			
+
 			$num = $this->db->num_rows($resql);
 			while ( $obj = $this->db->fetch_object($resql) ) {
 				$line = new BookKeepingLine();
-				
+
 				$line->id = $obj->rowid;
-				
+
 				$line->doc_date = $this->db->jdate($obj->doc_date);
 				$line->doc_type = $obj->doc_type;
 				$line->doc_ref = $obj->doc_ref;
@@ -1349,11 +1344,11 @@ class BookKeeping extends CommonObject
 				$line->sens = $obj->sens;
 				$line->code_journal = $obj->code_journal;
 				$line->piece_num = $obj->piece_num;
-				
+
 				$this->linesexport[] = $line;
 			}
 			$this->db->free($resql);
-			
+
 			return $num;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
@@ -1433,8 +1428,7 @@ class BookKeeping extends CommonObject
         return $out;
     }
 
-  
-	
+
 	/**
 	* Description of a root accounting account 
 	*
@@ -1442,10 +1436,10 @@ class BookKeeping extends CommonObject
 	* @return 	string 	            Root account
 	*/
 	function get_compte_racine($account = null)
-	{	
+	{
 		global $conf;
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
-        
+
         $sql  = "SELECT root.account_number, root.label as label";
         $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
         $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
@@ -1456,7 +1450,7 @@ class BookKeeping extends CommonObject
         $sql .= " AND parent.active = 1";
         $sql .= " AND root.active = 1";
         $sql .= " AND aa.entity IN (" . getEntity("accountancy", 1) . ")";
-        
+
 		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1464,9 +1458,9 @@ class BookKeeping extends CommonObject
 			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);	
 			}
-							
+
 			return $obj->label;
-			
+
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
 			dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
@@ -1483,9 +1477,9 @@ class BookKeeping extends CommonObject
 	* @return 	string 	            Account desc
 	*/
 	function get_compte_desc($account = null)
-	{	
+	{
 		global $conf;
-		
+
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
 		$sql  = "SELECT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version, cat.label as category";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa ";
@@ -1495,7 +1489,7 @@ class BookKeeping extends CommonObject
 		$sql .= " AND aa.active = 1";
 		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_accounting_category as cat ON aa.fk_accounting_category = cat.rowid";
 	    $sql .= " WHERE aa.entity IN (" . getEntity("accountancy", 1) . ")";
-		
+
 		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1503,12 +1497,10 @@ class BookKeeping extends CommonObject
 			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);	
 			}
-			
-			if(empty($obj->category)){				
+			if(empty($obj->category)){
 				return $obj->label;
 			}else{
 				return $obj->label.' ('.$obj->category.')';
-				
 			}
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index d1602bedf00..0b19697ef2b 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
@@ -63,7 +64,10 @@ $langs->load("accountancy");
 $langs->load("trips");
 $langs->load("hrm");
 
+// Old system menu
 $id_bank_account = GETPOST('id_account', 'int');
+// Multi journal
+$code_journal = GETPOST('code_journal', 'alpha');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -83,9 +87,9 @@ if ($user->societe_id > 0 && empty($id_bank_account))
 /*
  * Actions
  */
-	
+
 $error = 0;
-	
+
 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
 $pastmonthyear = $year_current;
@@ -134,9 +138,20 @@ $paymentsalstatic = new PaymentSalary($db);
 $paymentexpensereportstatic = new PaymentExpenseReport($db);
 
 // Get code of finance journal
-$bank_code_journal = new Account($db);
-$result = $bank_code_journal->fetch($id_bank_account);
-$journal = $bank_code_journal->accountancy_journal;
+$journal = '';
+$bankstatic = new Account($db);
+$bankstatic->fetch($id_bank_account);
+$bankstatic->rowid;
+$bankstatic->label;
+$bankstatic->fk_accountancy_journal;
+
+$accountingjournalstatic = new AccountingJournal($db);
+if(! empty($id_bank_account) {
+	$accountingjournalstatic->fetch($bankstatic->fk_accountancy_journal);
+} else {
+	$accountingjournalstatic->fetch('',$code_journal);
+}
+$journal = $accountingjournalstatic->code;
 
 dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG);
 $result = $db->query($sql);
@@ -179,7 +194,7 @@ if ($result) {
 				'name' => $obj->name,
 		        'code_compta' => $compta_soc,
 		);
-		
+
 		$compta_user = (! empty($obj->accountancy_code) ? $obj->accountancy_code : $account_employee);
 
 		$tabuser[$obj->rowid] = array (
@@ -205,8 +220,8 @@ if ($result) {
 		if (is_array($links)) {
 		    // Now loop on each link of record in bank.
 			foreach ( $links as $key => $val ) {
-			    
-			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport')))     // So we excluded 'company' here
+
+			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert')))     // So we excluded 'company' here
 			    {
 			        // We save tabtype for a future use, to remember what kind of payment it is 
 			        $tabtype[$obj->rowid] = $links[$key]['type'];
@@ -330,11 +345,11 @@ if (! $error && $action == 'writebookkeeping') {
 
 	$error = 0;
 	foreach ( $tabpay as $key => $val ) {      // $key is rowid into llx_bank
-		
+
 	    $errorforline = 0;
-	    
+
 	    $db->begin();
-	    
+
 		// Bank
 		if (! $errorforline)
 		{
@@ -473,6 +488,9 @@ if (! $error && $action == 'writebookkeeping') {
         				}
                         $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
         				$bookkeeping->numero_compte = $k;
+        			} else if ($tabtype[$key] == 'banktransfert') {
+						$bookkeeping->code_tiers = '';
+        				$bookkeeping->numero_compte = $k;
         			} else {
         			    // FIXME Should be a temporary account ???
         				$bookkeeping->doc_ref = $k;
@@ -705,17 +723,17 @@ if (empty($action) || $action == 'view') {
 	$invoicestatic = new Facture($db);
 	$invoicesupplierstatic = new FactureFournisseur($db);
 	$expensereportstatic = new ExpenseReport($db);
-	
+
 	llxHeader('', $langs->trans("FinanceJournal"));
 
-	$nom = $langs->trans("FinanceJournal") . ' - ' . $bank_code_journal->getNomUrl(1);
+	$nom = $langs->trans("FinanceJournal") . ' - ' . $bankstatic->getNomUrl(1);
 	$builddate = time();
 	//$description = $langs->trans("DescFinanceJournal") . '<br>';
 	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
 
 	$varlink = 'id_account=' . $id_bank_account;
-	
+
 	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
 	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {

From b0f2e95c7b678ea7cd1911b7b18b6e8160218380 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 28 May 2017 22:11:57 +0200
Subject: [PATCH 0958/1163] Debug

---
 htdocs/accountancy/journal/bankjournal.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 0b19697ef2b..ea98d678671 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -142,11 +142,12 @@ $journal = '';
 $bankstatic = new Account($db);
 $bankstatic->fetch($id_bank_account);
 $bankstatic->rowid;
+$bankstatic->number;
 $bankstatic->label;
 $bankstatic->fk_accountancy_journal;
 
 $accountingjournalstatic = new AccountingJournal($db);
-if(! empty($id_bank_account) {
+if(! empty($id_bank_account)) {
 	$accountingjournalstatic->fetch($bankstatic->fk_accountancy_journal);
 } else {
 	$accountingjournalstatic->fetch('',$code_journal);
@@ -870,9 +871,9 @@ if (empty($action) || $action == 'view') {
 			else print $accountoshow;
 			print "</td>";
 			if ($val['soclib'] == '') {
-				print "<td>" . $bank_code_journal->label . " - " . $val["ref"] . "</td>";
+				print "<td>" . $bankstatic->label . " - " . $val["ref"] . "</td>";
 			} else {
-				print "<td>" . $bank_code_journal->label . " - " . $val['soclib'] . "</td>";
+				print "<td>" . $bankstatic->label . " - " . $val['soclib'] . "</td>";
 			}
 			print "<td>" . $val["type_payment"] . "</td>";
 			print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";

From d0f01085d882f497f25ed039a0e93b167b179952 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 02:44:14 +0200
Subject: [PATCH 0959/1163] Add more information on stripe payment

---
 htdocs/public/stripe/newpayment.php | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index a430baafb59..01ae19c7032 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -181,6 +181,13 @@ if (! empty($conf->global->STRIPE_SECURITY_TOKEN))
     }
 }
 
+// Common variables
+$creditor=$mysoc->name;
+$paramcreditor='STRIPE_CREDITOR_'.$suffix;
+if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
+else if (! empty($conf->global->STRIPE_CREDITOR)) $creditor=$conf->global->STRIPE_CREDITOR;
+
+
 
 /*
  * Actions
@@ -218,17 +225,20 @@ if ($action == 'charge')
         dol_syslog("Create customer", LOG_DEBUG, 0, '_stripe');
         $customer = \Stripe\Customer::create(array(
             'email' => $email,
-            'card'  => $stripeToken
-            // TODO
+            'description' => ($email?'Customer for '.$email:null),
+            'metadata' => array('ipaddress'=>$_SERVER['REMOTE_ADDR']),
+            'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
         ));
-         
+        // TODO Add 'business_vat_id' ?
+        
         dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
         $charge = \Stripe\Charge::create(array(
             'customer' => $customer->id,
             'amount'   => price2num($amount, 'MU'),
             'currency' => $currency,
             'description' => 'Stripe payment: '.$FULLTAG,
-            'statement_descriptor' => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 6, 'right', 'UTF-8', 1).' '.$FULLTAG, 22, 'right', 'UTF-8', 1)     // 22 chars
+            'metadata' => array("FULLTAG" => $FULLTAG, 'Recipient' => $mysoc->name),
+            'statement_descriptor' => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 6, 'right', 'UTF-8', 1).' '.$FULLTAG, 22, 'right', 'UTF-8', 1)     // 22 chars that appears on bank receipt
         ));
     } catch(\Stripe\Error\Card $e) {
         // Since it's a decline, \Stripe\Error\Card will be caught
@@ -330,12 +340,6 @@ if (empty($conf->global->STRIPE_LIVE))
     dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
 }
 
-// Common variables
-$creditor=$mysoc->name;
-$paramcreditor='STRIPE_CREDITOR_'.$suffix;
-if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
-else if (! empty($conf->global->STRIPE_CREDITOR)) $creditor=$conf->global->STRIPE_CREDITOR;
-
 print '<span id="dolpaymentspan"></span>'."\n";
 print '<div class="center">'."\n";
 print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";

From dad1abd55b4805bce9ab9fe7bf41ad57efba8b7d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 29 May 2017 06:22:21 +0200
Subject: [PATCH 0960/1163] NEW : Move employee in dol_banner in salaries

---
 htdocs/compta/salaries/card.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 0ea91dc2857..63b5139ce29 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2011-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2011-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014      Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2015      Charlie BENKE		<charlie@patas-monkey.com> 
@@ -331,23 +331,24 @@ if ($id)
 	dol_fiche_head($head, 'card', $langs->trans("SalaryPayment"), -1, 'payment');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
-    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '');
-    
+
+	$morehtmlref='<div class="refidno">';
+
+	$userstatic=new User($db);
+	$userstatic->fetch($object->fk_user);
+
+	$morehtmlref.=$langs->trans('Employee') . ' : ' . $userstatic->getNomUrl(1);
+	$morehtmlref.='</div>';
+
+    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
+
     print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
     print '<table class="border" width="100%">';
 
-	// Employee
-	print '<tr><td class="titlefield">'.$langs->trans("Employee").'</td><td>';
-	$usersal=new User($db);
-	$usersal->fetch($object->fk_user);
-	print $usersal->getNomUrl(1);
-	print '</td></tr>';
-
 	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
 
 	print "<tr>";
 	print '<td>'.$langs->trans("DateStartPeriod").'</td><td colspan="3">';

From 0d3c5bcfa8638436c8b8b78d7344f7d3aa39dd9e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 29 May 2017 06:35:53 +0200
Subject: [PATCH 0961/1163] Update documents & info page - better look & feel
 v6

---
 htdocs/compta/salaries/card.php     |  4 +--
 htdocs/compta/salaries/document.php | 43 ++++++++++++++++-------------
 htdocs/compta/salaries/info.php     | 31 +++++++++++++++++----
 3 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 63b5139ce29..68f59d03cfa 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -391,9 +391,9 @@ if ($id)
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
 	print '</table>';
-	
+
 	print '</div>';
-    
+
 	dol_fiche_end();
 
 	
diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php
index 7b24a0762f3..03a69a764cf 100644
--- a/htdocs/compta/salaries/document.php
+++ b/htdocs/compta/salaries/document.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005      Simon TOSSER          <simon@kornog-computing.com>
  * Copyright (C) 2011-2012 Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015-2016 Alexandre Spangaro    <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015-2017 Alexandre Spangaro    <aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +36,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
 
 $langs->load("other");
+$langs->load("users");
 $langs->load("salaries");
+$langs->load('hrm');
 $langs->load("companies");
 
 $id = GETPOST('id','int');
@@ -83,7 +85,6 @@ $form = new Form($db);
 
 llxHeader("",$langs->trans("SalaryPayment"));
 
-
 if ($object->id)
 {
 	$object->fetch_thirdparty();
@@ -92,7 +93,6 @@ if ($object->id)
 
 	dol_fiche_head($head, 'documents',  $langs->trans("SalaryPayment"), 0, 'payment');
 
-
 	// Construit liste des fichiers
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
@@ -101,29 +101,34 @@ if ($object->id)
 		$totalsize+=$file['size'];
 	}
 
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
-    print '<table class="border" width="100%">';
+	$morehtmlref='<div class="refidno">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+	$userstatic=new User($db);
+	$userstatic->fetch($object->fk_user);
 
-	// Ref
-	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
-	print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
-	print '</td></tr>';
+	$morehtmlref.=$langs->trans('Employee') . ' : ' . $userstatic->getNomUrl(1);
+	$morehtmlref.='</div>';
 
-	// Societe
-	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
 
-    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
-    print '</table>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '</div>';
+	print '<table class="border" width="100%">';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+	print '</table>';
 
-    $modulepart = 'salaries';
-    $permission = $user->rights->salaries->write;
-    $param = '&id=' . $object->id;
-    include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+	print '</div>';
+
+	dol_fiche_end();
+
+	$modulepart = 'salaries';
+	$permission = $user->rights->salaries->write;
+	$param = '&id=' . $object->id;
+	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 
 }
 else
diff --git a/htdocs/compta/salaries/info.php b/htdocs/compta/salaries/info.php
index f15aac021ec..05dc7835b68 100644
--- a/htdocs/compta/salaries/info.php
+++ b/htdocs/compta/salaries/info.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2015  Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2015		Charlie BENKE		 <charlie@patas-monkey.com>
+ * Copyright (C) 2015       Charlie BENKE        <charlie@patas-monkey.com>
+ * Copyright (C) 2017       Alexandre Spangaro   <aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,7 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 $langs->load("compta");
 $langs->load("bills");
+$langs->load("users");
 $langs->load("salaries");
+$langs->load('hrm');
 
 $id=GETPOST('id','int');
 $action=GETPOST('action','aZ09');
@@ -46,21 +49,37 @@ $result = restrictedArea($user, 'salaries', '', '', '');
 
 llxHeader("",$langs->trans("SalaryPayment"));
 
-$salpayment = new PaymentSalary($db);
-$result = $salpayment->fetch($id);
-$salpayment->info($id);
+$object = new PaymentSalary($db);
+$object->fetch($id);
+$object->info($id);
 
-$head = salaries_prepare_head($salpayment);
+$head = salaries_prepare_head($object);
 
 dol_fiche_head($head, 'info', $langs->trans("SalaryPayment"), 0, 'payment');
 
+$linkback = '<a href="'.DOL_URL_ROOT.'/compta/salaries/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+$morehtmlref='<div class="refidno">';
+
+$userstatic=new User($db);
+$userstatic->fetch($object->fk_user);
+
+$morehtmlref.=$langs->trans('Employee') . ' : ' . $userstatic->getNomUrl(1);
+$morehtmlref.='</div>';
+
+dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 
 print '<table width="100%"><tr><td>';
-dol_print_object_info($salpayment);
+dol_print_object_info($object);
 print '</td></tr></table>';
 
 print '</div>';
 
+dol_fiche_end();
+
 llxFooter();
 
 $db->close();

From 4c382f94e1698b4a7abecfd3b5ae5c092742894a Mon Sep 17 00:00:00 2001
From: BENKE Charlie <charles.fr@benke.fr>
Date: Mon, 29 May 2017 10:39:02 +0200
Subject: [PATCH 0962/1163] Changes done

---
 htdocs/core/menus/standard/eldy.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 25ab9e9c154..54fdae3aba0 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -802,7 +802,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$langs->load("bills");
 				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("BillsCustomers"),0,$user->rights->facture->lire, '', $mainmenu, 'customers_bills');
 				$newmenu->add("/compta/facture/card.php?action=create",$langs->trans("NewBill"),1,$user->rights->facture->creer);
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("List"),1,$user->rights->facture->lire);
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("List"),1,$user->rights->facture->lire'customers_bills_list');
 
 				if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills/', $leftmenu))
 				{
@@ -830,7 +830,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$langs->load("bills");
 				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"),0,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');
 				$newmenu->add("/fourn/facture/card.php?action=create",$langs->trans("NewBill"),1,$user->rights->fournisseur->facture->creer);
-				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"),1,$user->rights->fournisseur->facture->lire);
+				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"),1,$user->rights->fournisseur->facture->lire, 'suppliers_bills_list');
 
 				if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {
 					$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"),2,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_draft');

From 85c3880479740994dad8dfc82d74fdfb588cc62f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 10:58:41 +0200
Subject: [PATCH 0963/1163] Look and feel v6

---
 htdocs/compta/deplacement/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 6bc4f628ba9..aa315e5c854 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -276,7 +276,7 @@ if ($action == 'create')
 
     // Public note
     print '<tr>';
-    print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
+    print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
     print '<td valign="top" colspan="2">';
 
     $doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8,'90%');
@@ -288,7 +288,7 @@ if ($action == 'create')
     if (empty($user->societe_id))
     {
         print '<tr>';
-        print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
+        print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
         print '<td valign="top" colspan="2">';
 
         $doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');

From 30bc8b9a322cd4b88bef58bf58d0c18b9776d70b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 11:00:36 +0200
Subject: [PATCH 0964/1163] Fix typo

---
 htdocs/langs/en_US/main.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index a170bc3f6e1..96973ad1b46 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -741,8 +741,8 @@ Hello=Hello
 Sincerely=Sincerely
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=No record selected
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions

From 395d361d663420e1338f9ad6ce362c9dc098d12c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 11:17:33 +0200
Subject: [PATCH 0965/1163] Look and feel v6

---
 htdocs/accountancy/admin/account.php         | 39 ++++++++-------
 htdocs/accountancy/admin/accountmodel.php    | 50 +------------------
 htdocs/accountancy/admin/categories_list.php |  7 +--
 htdocs/accountancy/admin/defaultaccounts.php |  1 -
 htdocs/compta/paiement.php                   |  9 +++-
 htdocs/expensereport/payment/card.php        |  1 +
 htdocs/expensereport/payment/payment.php     | 52 ++++++++++++--------
 htdocs/langs/en_US/accountancy.lang          |  2 +-
 8 files changed, 65 insertions(+), 96 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 62e35fa0f57..c2b6997d96e 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -55,7 +55,6 @@ if (! $user->rights->accounting->chartofaccount) accessforbidden();
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'sortorder');
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOST("page", 'int');
 if ($page == - 1) {
 	$page = 0;
@@ -63,10 +62,8 @@ if ($page == - 1) {
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield)
-	$sortfield = "aa.account_number";
-if (! $sortorder)
-	$sortorder = "ASC";
+if (! $sortfield) $sortfield = "aa.account_number";
+if (! $sortorder) $sortorder = "ASC";
 
 $arrayfields=array(
     'aa.account_number'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
@@ -79,6 +76,9 @@ $arrayfields=array(
 
 $accounting = new AccountingAccount($db);
 
+// Initialize technical object to manage context to save list fields
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'accountingaccountlist';
+
 
 /*
  * Actions
@@ -145,6 +145,7 @@ if (empty($reshook))
 /*
  * View
  */
+
 $form=new Form($db);
 
 llxHeader('', $langs->trans("ListAccounts"));
@@ -170,7 +171,6 @@ if (strlen(trim($search_label)))			$sql .= natural_search("aa.label", $search_la
 if (strlen(trim($search_accountparent)))	$sql .= natural_search("aa.account_parent", $search_accountparent);
 if (strlen(trim($search_pcgtype)))			$sql .= natural_search("aa.pcg_type", $search_pcgtype);
 if (strlen(trim($search_pcgsubtype)))		$sql .= natural_search("aa.pcg_subtype", $search_pcgsubtype);
-
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
@@ -192,22 +192,29 @@ if ($resql)
 
     $params='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($search_account) $params.= '&amp;search_account='.urlencode($search_account);
-	if ($search_label) $params.= '&amp;search_label='.urlencode($search_label);
-	if ($search_accountparent) $params.= '&amp;search_accountparent='.urlencode($search_accountparent);
-	if ($search_pcgtype) $params.= '&amp;search_pcgtype='.urlencode($search_pcgtype);
-	if ($search_pcgsubtype) $params.= '&amp;search_pcgsubtype='.urlencode($search_pcgsubtype);
+	if ($search_account) $params.= '&search_account='.urlencode($search_account);
+	if ($search_label) $params.= '&search_label='.urlencode($search_label);
+	if ($search_accountparent) $params.= '&search_accountparent='.urlencode($search_accountparent);
+	if ($search_pcgtype) $params.= '&search_pcgtype='.urlencode($search_pcgtype);
+	if ($search_pcgsubtype) $params.= '&search_pcgsubtype='.urlencode($search_pcgsubtype);
     if ($optioncss != '') $param.='&optioncss='.$optioncss;
 
 
-	print '<form method="GET" action="' . $_SERVER["PHP_SELF"] . '">';
+	print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	
 	$htmlbuttonadd = '<a class="butAction" href="./card.php?action=create">' . $langs->trans("Addanaccount") . '</a>';
 	
     print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $htmlbuttonadd);
 	
 	// Box to select active chart of account
-    $var = ! $var;
     print $langs->trans("Selectchartofaccounts") . " : ";
     print '<select class="flat" name="chartofaccounts" id="chartofaccounts">';
     $sql = "SELECT rowid, pcg_version, label, active";
@@ -215,12 +222,10 @@ if ($resql)
     $sql .= " WHERE active = 1";
     dol_syslog('accountancy/admin/account.php:: $sql=' . $sql);
     $resqlchart = $db->query($sql);
-    $var = true;
     if ($resqlchart) {
         $numbis = $db->num_rows($resqlchart);
         $i = 0;
         while ( $i < $numbis ) {
-            $var = ! $var;
             $row = $db->fetch_row($resqlchart);
     
             print '<option value="' . $row[0] . '"';
@@ -268,7 +273,8 @@ if ($resql)
 	$accountstatic = new AccountingAccount($db);
 	$accountparent = new AccountingAccount($db);
 
-	while ( $i < min($num, $limit) ) 
+	$i=0;
+	while ($i < min($num, $limit)) 
 	{
 		$obj = $db->fetch_object($resql);
 
@@ -367,7 +373,6 @@ if ($resql)
 		if (! $i) $totalarray['nbfield']++;
 		
 		print "</tr>\n";
-		$var = ! $var;
 		$i++;
 	}
 	
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index ca26c35c442..e63e44b4f80 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -217,21 +217,6 @@ if ($id == 25)
 	}
 }
 
-// Define localtax_typeList (used for dictionary "llx_c_tva")
-$localtax_typeList = array();
-if ($id == 10)
-{
-	$localtax_typeList = array(
-			"0" => $langs->trans("No"),
-			"1" => $langs->trans("Yes").' ('.$langs->trans("Type")." 1)",	//$langs->trans("%ageOnAllWithoutVAT"),
-			"2" => $langs->trans("Yes").' ('.$langs->trans("Type")." 2)",	//$langs->trans("%ageOnAllBeforeVAT"),
-			"3" => $langs->trans("Yes").' ('.$langs->trans("Type")." 3)",	//$langs->trans("%ageOnProductsWithoutVAT"),
-			"4" => $langs->trans("Yes").' ('.$langs->trans("Type")." 4)",	//$langs->trans("%ageOnProductsBeforeVAT"),
-			"5" => $langs->trans("Yes").' ('.$langs->trans("Type")." 5)",	//$langs->trans("%ageOnServiceWithoutVAT"),
-			"6" => $langs->trans("Yes").' ('.$langs->trans("Type")." 6)"	//$langs->trans("%ageOnServiceBeforeVAT"),
-	);
-}
-
 
 
 /*
@@ -1075,21 +1060,6 @@ if ($id)
                             	$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
                                 $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
                             }
-
-							else if ($fieldlist[$field]=='localtax1_type') {
-							  if ($obj->localtax1 != 0)
-							    $valuetoshow=$localtax_typeList[$valuetoshow];
-							  else
-							    $valuetoshow = '';
-							  $align="right";
-							}
-							else if ($fieldlist[$field]=='localtax2_type') {
-							 if ($obj->localtax2 != 0)
-							    $valuetoshow=$localtax_typeList[$valuetoshow];
-							  else
-							    $valuetoshow = '';
-							  $align="right";
-							}
 							else if ($fieldlist[$field]=='taux') {
                                 $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
 							    $align="right";
@@ -1253,7 +1223,7 @@ function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='')
 	global $conf,$langs,$db;
 	global $form;
 	global $region_id;
-	global $elementList,$sourceList,$localtax_typeList;
+	global $elementList,$sourceList;
 	global $bc;
 
 	$formadmin = new FormAdmin($db);
@@ -1376,24 +1346,6 @@ function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='')
 		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat" value="'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" size="10" name="'.$fieldlist[$field].'"></td>';
 		}
-		elseif ($fieldlist[$field]=='unit') {
-			print '<td>';
-			$units = array(
-					'mm' => $langs->trans('SizeUnitmm'),
-					'cm' => $langs->trans('SizeUnitcm'),
-					'point' => $langs->trans('SizeUnitpoint'),
-					'inch' => $langs->trans('SizeUnitinch')
-			);
-			print $form->selectarray('unit', $units, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), 0, 0, 0);
-			print '</td>';
-		}
-		// Le type de taxe locale
-		elseif ($fieldlist[$field] == 'localtax1_type' || $fieldlist[$field] == 'localtax2_type')
-		{
-			print '<td align="center">';
-			print $form->selectarray($fieldlist[$field], $localtax_typeList, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
-			print '</td>';
-		}
 		elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy')
 		{
 			print '<td>';
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index f3a35350084..e78737c3fb9 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -451,13 +451,8 @@ $formadmin=new FormAdmin($db);
 
 llxHeader();
 
-$titre=$langs->trans("DictionarySetup");
+$titre=$langs->trans($tablib[$id]);
 $linkback='';
-if ($id)
-{
-    $titre.=' - '.$langs->trans($tablib[$id]);
-    $linkback='<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
-}
 $titlepicto='title_setup';
 
 print load_fiche_titre($titre,$linkback,$titlepicto);
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index c2a6453ffee..aaf98a0fa8b 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -122,7 +122,6 @@ $formaccounting = new FormAccounting($db);
 $linkback = '';
 print load_fiche_titre($langs->trans('MenuDefaultAccounts'), $linkback, 'title_accountancy');
 
-print '<br>';
 print $langs->trans("DefaultBindingDesc").'<br>';
 print '<br>';
 
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 0881ce061dc..cdc5eb2e545 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -309,9 +309,11 @@ if (empty($reshook))
  * View
  */
 
+$form=new Form($db);
+
+
 llxHeader('', $langs->trans("Payment"));
 
-$form=new Form($db);
 
 
 if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paiement')
@@ -575,6 +577,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 //print '<tr><td colspan="3">';
                 print '<br>';
                 print '<table class="noborder" width="100%">';
+                
                 print '<tr class="liste_titre">';
                 print '<td>'.$arraytitle.'</td>';
                 print '<td align="center">'.$langs->trans('Date').'</td>';
@@ -741,11 +744,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                     $totalrecudeposits+=$deposits;
                     $i++;
                 }
+                
                 if ($i > 1)
                 {
                     // Print total
                     print '<tr class="liste_total">';
-                    print '<td colspan="3" align="left">'.$langs->trans('TotalTTC').'</td>';
+                    print '<td colspan="2" align="left">'.$langs->trans('TotalTTC').'</td>';
+					if (!empty($conf->multicurrency->enabled)) print '<td></td>';
 					if (!empty($conf->multicurrency->enabled)) print '<td></td>';
 					if (!empty($conf->multicurrency->enabled)) print '<td></td>';
 					if (!empty($conf->multicurrency->enabled)) print '<td></td>';
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index de01f01a5df..ce6e0da8c5a 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -143,6 +143,7 @@ if ($action == 'valide')
 
 }
 
+$linkback = '';
 // $linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '');
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 40c4fad2513..cb81598fc83 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -30,7 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->load("bills");
 $langs->load("banks");
 
-$chid=GETPOST("id");
+$chid=GETPOST("id",'int');
+$ref=GETPOST('ref','alpha');
 $action=GETPOST('action','aZ09');
 $amounts = array();
 $accountid=GETPOST('accountid','int');
@@ -59,7 +60,7 @@ if ($action == 'add_payment')
 	}
 
 	$expensereport = new ExpenseReport($db);
-	$expensereport->fetch($chid);
+	$expensereport->fetch($chid, $ref);
 
 	$datepaid = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 
@@ -160,7 +161,7 @@ if ($action == 'add_payment')
         }
 	}
 
-	$_GET["action"]='create';
+	$action='create';
 }
 
 
@@ -174,10 +175,10 @@ $form=new Form($db);
 
 
 // Form to create expense report payment
-if (GETPOST('action','aZ09') == 'create')
+if ($action == 'create' || empty($action))
 {
 	$expensereport = new ExpenseReport($db);
-	$expensereport->fetch($chid);
+	$expensereport->fetch($chid, $ref);
 
 	$total = $expensereport->total_ttc;
 
@@ -189,15 +190,20 @@ if (GETPOST('action','aZ09') == 'create')
 	print '<input type="hidden" name="chid" value="'.$chid.'">';
 	print '<input type="hidden" name="action" value="add_payment">';
 	
-    dol_fiche_head();
+    dol_fiche_head(null, '0', '', -1);
 
-	print '<table cellspacing="0" class="border" width="100%" cellpadding="2">';
-
-	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("ExpenseReport").'</td>';
-
-	print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/expensereport/card.php?id='.$chid.'">'.$expensereport->ref.'</a></td></tr>';
-	print '<tr><td>'.$langs->trans("Period").'</td><td colspan="2">'.get_date_range($expensereport->date_debut,$expensereport->date_fin,"",$langs,0).'</td></tr>';
-	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="2">'.price($expensereport->total_ttc,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+    $linkback = '';
+    // $linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
+    
+    dol_banner_tab($expensereport, 'ref', $linkback, 1, 'ref', 'ref', '');
+    
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
+    
+    print '<table class="border centpercent">'."\n";
+    
+	print '<tr><td class="titlefield">'.$langs->trans("Period").'</td><td>'.get_date_range($expensereport->date_debut,$expensereport->date_fin,"",$langs,0).'</td></tr>';
+	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($expensereport->total_ttc,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
 
 	$sql = "SELECT sum(p.amount) as total";
 	$sql.= " FROM ".MAIN_DB_PREFIX."payment_expensereport as p, ".MAIN_DB_PREFIX."expensereport as e";
@@ -210,14 +216,18 @@ if (GETPOST('action','aZ09') == 'create')
 		$sumpaid = $obj->total;
 		$db->free();
 	}
-	print '<tr><td>'.$langs->trans("AlreadyPaid").'</td><td colspan="2">'.price($sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
-	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td colspan="2">'.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+	print '<tr><td>'.$langs->trans("AlreadyPaid").'</td><td>'.price($sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td>'.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
 
-	print '<tr class="liste_titre">';
-	print "<td colspan=\"3\">".$langs->trans("Payment").'</td>';
-	print '</tr>';
-
-	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
+    print '</table>';
+    
+    print '<br>';
+    
+    print '<div class="underbanner clearboth"></div>';
+    
+    print '<table class="border centpercent">'."\n";
+	
+    print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
 	$datepaid = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 	$datepayment=empty($conf->global->MAIN_AUTOFILL_DATE)?(empty($_POST["remonth"])?-1:$datepaid):0;
 	$form->select_date($datepayment,'','','','',"add_payment",1,1);
@@ -251,6 +261,8 @@ if (GETPOST('action','aZ09') == 'create')
 
 	print '</table>';
 
+	print '</div>';
+	
     dol_fiche_end();
 
 	// List of expenses ereport not already paid completely
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 33434f03394..5f3d4eef2da 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -168,7 +168,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
-Pcgsubtype=Under class of account
+Pcgsubtype=Subclass of account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin

From 3402718425cc8ba7cff570c8201cc2cdb9685a81 Mon Sep 17 00:00:00 2001
From: KHELIFA <kkhelifa@open-dsi.fr>
Date: Mon, 29 May 2017 11:58:16 +0200
Subject: [PATCH 0966/1163] Core Holiday: Add triggers for create, update and
 delete a holiday Fix the user parameter in the call of the create, update and
 delete functions of the class Holiday

---
 htdocs/holiday/card.php                | 12 ++++++------
 htdocs/holiday/class/holiday.class.php | 24 ++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index ba4f210793e..e4c09546e6e 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -248,7 +248,7 @@ if ($action == 'update')
 			$object->halfday = $halfday;
 
 			// Update
-			$verif = $object->update($user->id);
+			$verif = $object->update($user);
             if ($verif > 0)
             {
                 header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
@@ -285,7 +285,7 @@ if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes' && $user->rights-
 		// Si l'utilisateur à le droit de lire cette demande, il peut la supprimer
 		if ($canedit)
 		{
-			$result=$object->delete($object->id);
+			$result=$object->delete($user);
 		}
 		else
 		{
@@ -318,7 +318,7 @@ if ($action == 'confirm_send')
     {
         $object->statut = 2;
 
-        $verif = $object->update($user->id);
+        $verif = $object->update($user);
 
         // Si pas d'erreur SQL on redirige vers la fiche de la demande
         if ($verif > 0)
@@ -419,7 +419,7 @@ if ($action == 'confirm_valid')
         $object->fk_user_valid = $user->id;
         $object->statut = 3;
 
-        $verif = $object->update($user->id);
+        $verif = $object->update($user);
 
         // Si pas d'erreur SQL on redirige vers la fiche de la demande
         if ($verif > 0)
@@ -506,7 +506,7 @@ if ($action == 'confirm_refuse')
             $object->statut = 5;
             $object->detail_refuse = $_POST['detail_refuse'];
 
-            $verif = $object->update($user->id);
+            $verif = $object->update($user);
 
             // Si pas d'erreur SQL on redirige vers la fiche de la demande
             if ($verif > 0)
@@ -586,7 +586,7 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
         $object->fk_user_cancel = $user->id;
         $object->statut = 4;
 
-        $result = $object->update($user->id);
+        $result = $object->update($user);
 
         if ($result >= 0 && $oldstatus == 3)	// holiday was already validated, status 3, so we must increase back sold
         {
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 5f244dcb9bf..ba36d911971 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -167,6 +167,14 @@ class Holiday extends CommonObject
         if (! $error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."holiday");
+
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('HOLIDAY_CREATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
         }
 
         // Commit or rollback
@@ -603,7 +611,13 @@ class Holiday extends CommonObject
 
         if (! $error)
         {
-
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('HOLIDAY_MODIFY',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
         }
 
         // Commit or rollback
@@ -650,7 +664,13 @@ class Holiday extends CommonObject
 
         if (! $error)
         {
-
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('HOLIDAY_DELETE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
         }
 
         // Commit or rollback

From b74a0dd5fd448ea00985693a75f650d45a4e3771 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 12:06:26 +0200
Subject: [PATCH 0967/1163] Look and feel v6

---
 htdocs/accountancy/bookkeeping/balance.php | 6 +++---
 htdocs/accountancy/expensereport/index.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 3111707cff6..34db60f7a0f 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -98,7 +98,7 @@ if (! empty($search_accountancy_code_end)) {
  * Action
  */
 
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
     $search_accountancy_code_start = '';
     $search_accountancy_code_end = '';
@@ -137,7 +137,7 @@ if ($action == 'export_csv') {
 }
 
 else {
-    $title_page = $langs->trans("AccountBalance") . ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end);
+    $title_page = $langs->trans("AccountBalance") . (($search_date_start || $search_date_end) ? ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end) : '');
     
     llxHeader('', $title_page);
     
@@ -160,7 +160,7 @@ else {
     print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     
     $button = '<input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . '" />';
-    print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, 0, 'title_accountancy', 0, $button);
+    print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $result, 'title_accountancy', 0, $button);
     
     
     $moreforfilter = '';
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index a38194356bd..c062d4e09c2 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -167,7 +167,7 @@ print '<br>';
 
 //print '<div class="inline-block divButAction">';
 // TODO Remove this. Should be done always.
-if ($conf->global->MAIN_FEATURES_LEVEL > 0) print '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=fixaccountancycode">' . $langs->trans("CleanFixHistory", $year_current) . '</a>';
+if ($conf->global->MAIN_FEATURES_LEVEL > 1) print '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=fixaccountancycode">' . $langs->trans("CleanFixHistory", $year_current) . '</a>';
 //print '</div>';
 
 

From 6f723490c25291435ebb50495925139d7ff48214 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 12:58:23 +0200
Subject: [PATCH 0968/1163] Fix syntax error

---
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 54fdae3aba0..6248f294476 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -802,7 +802,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$langs->load("bills");
 				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("BillsCustomers"),0,$user->rights->facture->lire, '', $mainmenu, 'customers_bills');
 				$newmenu->add("/compta/facture/card.php?action=create",$langs->trans("NewBill"),1,$user->rights->facture->creer);
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("List"),1,$user->rights->facture->lire'customers_bills_list');
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("List"),1,$user->rights->facture->lire, '', $mainmenu, 'customers_bills_list');
 
 				if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills/', $leftmenu))
 				{

From 7066ec7dabeb311880b18afd755dc7d52628afda Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 13:19:45 +0200
Subject: [PATCH 0969/1163] NEW Can clone expense report on another user

---
 htdocs/expensereport/card.php                 | 38 ++++++++++---------
 .../class/expensereport.class.php             | 12 +++---
 htdocs/expensereport/payment/payment.php      |  9 ++---
 htdocs/langs/en_US/main.lang                  |  1 +
 htdocs/langs/en_US/trips.lang                 |  2 +-
 5 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 1dbcbfc1335..dff27139581 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -156,10 +156,10 @@ if (empty($reshook))
         {
             if ($object->id > 0)
             {
-                // Because createFromClone modifies the object, we must clone it so that we can restore it later
+                // Because createFromClone modifies the object, we must clone it so that we can restore it later if it fails
                 $orig = clone $object;
     
-                $result=$object->createFromClone($socid);
+                $result=$object->createFromClone(GETPOST('fk_user_author','int'));
                 if ($result > 0)
                 {
                     header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
@@ -1448,8 +1448,11 @@ else
 				print '<td>'.$langs->trans("User").'</td>';
 				print '<td>';
 				$userfee=new User($db);
-				$userfee->fetch($object->fk_user_author);
-				print $userfee->getNomUrl(-1);
+				if ($object->fk_user_author > 0)
+				{
+				    $userfee->fetch($object->fk_user_author);
+				    print $userfee->getNomUrl(-1);
+				}
 				print '</td></tr>';
 
             	// Ref
@@ -1536,12 +1539,11 @@ else
 				// Clone confirmation
 				if ($action == 'clone') {
 				    // Create an array for form
+				    $criteriaforfilter='hierarchyme';
+				    if (! empty($user->rights->expensereport->readall)) $criteriaforfilter='';
 				    $formquestion = array(
-				        // 'text' => $langs->trans("ConfirmClone"),
-				        // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' =>
-				        // 1),
-				        // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value'
-				        // => 1),
+				        'text' => '',
+				        array('type' => 'other','name' => 'fk_user_author','label' => $langs->trans("SelectTargetUser"),'value' => $form->select_dolusers((GETPOST('fk_user_author', 'int')> 0 ? GETPOST('fk_user_author', 'int') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter))
                     );
 				    // Paiement incomplet. On demande si motif = escompte ou autre
 				    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CloneExpenseReport'), $langs->trans('ConfirmCloneExpenseReport', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
@@ -1658,7 +1660,7 @@ else
 				    $userauthor=new User($db);
 				    $result=$userauthor->fetch($object->fk_user_author);
 				    if ($result < 0) dol_print_error('',$userauthor->error);
-				    print $userauthor->getNomUrl(-1);
+				    elseif ($result > 0) print $userauthor->getNomUrl(-1);
 				}
 				print '</td></tr>';
 
@@ -1694,8 +1696,8 @@ else
 					if ($object->fk_user_validator > 0)
 					{
 						$userfee=new User($db);
-						$userfee->fetch($object->fk_user_validator);
-						print $userfee->getNomUrl(-1);
+						$result = $userfee->fetch($object->fk_user_validator);
+						if ($result > 0) print $userfee->getNomUrl(-1);
 						if (empty($userfee->email) || ! isValidEmail($userfee->email)) 
 						{
 						    $langs->load("errors");
@@ -1712,8 +1714,8 @@ else
 					if ($object->fk_user_cancel > 0)
 					{
 						$userfee=new User($db);
-						$userfee->fetch($object->fk_user_cancel);
-						print $userfee->getNomUrl(-1);
+						$result = $userfee->fetch($object->fk_user_cancel);
+						if ($result > 0) print $userfee->getNomUrl(-1);
 					}
 					print '</td></tr>';
 
@@ -1734,8 +1736,8 @@ else
 					if ($object->fk_user_approve > 0)
 					{
 						$userapp=new User($db);
-						$userapp->fetch($object->fk_user_approve);
-						print $userapp->getNomUrl(-1);
+						$result = $userapp->fetch($object->fk_user_approve);
+						if ($result > 0) print $userapp->getNomUrl(-1);
 					}
 					print '</td></tr>';
 
@@ -1751,8 +1753,8 @@ else
 					print '<td>'.$langs->trans("REFUSEUR").'</td>';
 					print '<td>';
 					$userfee=new User($db);
-					$userfee->fetch($object->fk_user_refuse);
-					print $userfee->getNomUrl(-1);
+					$result = $userfee->fetch($object->fk_user_refuse);
+					if ($result > 0) print $userfee->getNomUrl(-1);
 					print '</td></tr>';
 
 					print '<tr>';
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index eb16583df26..d62de0596e1 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -256,17 +256,19 @@ class ExpenseReport extends CommonObject
     /**
      *	Load an object from its id and create a new one in database
      *
-     *	@param		int			$socid			Id of thirdparty
-     *	@return		int							New id of clone
+     *	@param		int			$fk_user_author		  Id of new user
+     *	@return		int							      New id of clone
      */
-    function createFromClone($socid=0)
+    function createFromClone($fk_user_author)
     {
         global $user,$hookmanager;
     
         $error=0;
     
+        if (empty($fk_user_author)) $fk_user_author = $user->id;
+        
         $this->context['createfromclone'] = 'createfromclone';
-    
+        
         $this->db->begin();
     
         // get extrafields so they will be clone
@@ -282,7 +284,7 @@ class ExpenseReport extends CommonObject
         $this->fk_statut=0;
 
         // Clear fields
-        $this->fk_user_author     = $user->id;     // Note fk_user_author is not the 'author' but the guy the expense report is for.
+        $this->fk_user_author     = $fk_user_author;     // Note fk_user_author is not the 'author' but the guy the expense report is for.
         $this->fk_user_valid      = '';
         $this->date_create  	  = '';
         $this->date_creation      = '';
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index cb81598fc83..fdac304ffcb 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load("bills");
 $langs->load("banks");
+$langs->load("trips");
 
 $chid=GETPOST("id",'int');
 $ref=GETPOST('ref','alpha');
@@ -285,16 +286,11 @@ if ($action == 'create' || empty($action))
 	{
 		$objp = $expensereport;
 
-		
-
 		print '<tr class="oddeven">';
 
 		print '<td align="right">'.price($objp->total_ttc)."</td>";
-
 		print '<td align="right">'.price($sumpaid)."</td>";
-
 		print '<td align="right">'.price($objp->total_ttc - $sumpaid)."</td>";
-
 		print '<td align="center">';
 		if ($sumpaid < $objp->total_ttc)
 		{
@@ -308,6 +304,7 @@ if ($action == 'create' || empty($action))
 		print "</td>";
 
 		print "</tr>\n";
+		
 		$total+=$objp->total;
 		$total_ttc+=$objp->total_ttc;
 		$totalrecu+=$objp->am;
@@ -316,7 +313,7 @@ if ($action == 'create' || empty($action))
 	if ($i > 1)
 	{
 		// Print total
-		print "<tr ".$bc[!$var].">";
+		print '<tr class="oddeven">';
 		print '<td colspan="2" align="left">'.$langs->trans("Total").':</td>';
 		print "<td align=\"right\"><b>".price($total_ttc)."</b></td>";
 		print "<td align=\"right\"><b>".price($totalrecu)."</b></td>";
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 96973ad1b46..1ff0b9a9aa4 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -715,6 +715,7 @@ from=from
 toward=toward
 Access=Access
 SelectAction=Select action
+SelectTargetUser=Select target user/employee
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index 9c6902d3279..a51a392499b 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -88,5 +88,5 @@ NoTripsToExportCSV=No expense report to export for this period.
 ExpenseReportPayment=Expense report payment
 ExpenseReportsToApprove=Expense reports to approve
 ExpenseReportsToPay=Expense reports to pay
-CloneExpenseReport=Clone expese report
+CloneExpenseReport=Clone expense report
 ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
\ No newline at end of file

From c26e072694190a73800268c25b178a4c541a3f6a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 13:29:27 +0200
Subject: [PATCH 0970/1163] Code comment

---
 test/phpunit/CodingPhpTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 159323a9e83..dbd02ffdfc9 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -157,6 +157,7 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
             
             $ok=true;
             $matches=array();
+            // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/=\s*\'"\s*\.\s*\$this->(....)/', $filecontent, $matches, PREG_SET_ORDER);
             foreach($matches as $key => $val)
             {

From 85e0ded5736742b376352536db6d88047afe26fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 13:35:51 +0200
Subject: [PATCH 0971/1163] FIX #6881

---
 htdocs/install/upgrade2.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 4646c3b6eb9..264a45bca91 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -468,11 +468,11 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         $db->close();
 
 
-        // Actions for all version (not in database)
+        // Actions for all versions (not in database)
         migrate_delete_old_files($db, $langs, $conf);
-
         migrate_delete_old_dir($db, $langs, $conf);
         
+        
         dol_mkdir(DOL_DATA_ROOT.'/bank');
         migrate_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
     }
@@ -3941,7 +3941,11 @@ function migrate_delete_old_files($db,$langs,$conf)
     DOL_DOCUMENT_ROOT.'/core/modules/mailings/poire.modules.php',
     DOL_DOCUMENT_ROOT.'/core/modules/mailings/kiwi.modules.php',
     DOL_DOCUMENT_ROOT.'/core/modules/facture/pdf_crabe.modules.php',
-    DOL_DOCUMENT_ROOT.'/core/modules/facture/pdf_oursin.modules.php'
+    DOL_DOCUMENT_ROOT.'/core/modules/facture/pdf_oursin.modules.php',
+    
+    DOL_DOCUMENT_ROOT.'/compta/facture/class/api_invoice.class.php',
+    DOL_DOCUMENT_ROOT.'/commande/class/api_commande.class.php',
+    DOL_DOCUMENT_ROOT.'/user/class/api_user.class.php'
     );
 
     foreach ($filetodeletearray as $filetodelete)

From 482494236971b600f7776761161a2cb484eff179 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 13:39:07 +0200
Subject: [PATCH 0972/1163] FIX #6877

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 1 +
 htdocs/install/mysql/tables/llx_projet.sql     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 85c1ff61017..f8b638b079a 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -104,6 +104,7 @@ ALTER TABLE llx_c_email_templates ADD COLUMN content_lines text;
 ALTER TABLE llx_loan ADD COLUMN fk_projet integer DEFAULT NULL;
 
 ALTER TABLE llx_holiday ADD COLUMN fk_user_modif integer;
+ALTER TABLE llx_projet ADD COLUMN fk_user_modif integer;
 
 ALTER TABLE llx_projet_task_time ADD COLUMN datec date;
 ALTER TABLE llx_projet_task_time ADD COLUMN tms timestamp;
diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql
index d50547b711b..8ca404d3a0e 100644
--- a/htdocs/install/mysql/tables/llx_projet.sql
+++ b/htdocs/install/mysql/tables/llx_projet.sql
@@ -30,6 +30,7 @@ create table llx_projet
   title            varchar(255) NOT NULL,
   description      text,
   fk_user_creat    integer NOT NULL,			-- createur du projet
+  fk_user_modif    integer,
   public           integer,						-- project is public or not
   fk_statut        integer DEFAULT 0 NOT NULL,	-- open or close
   fk_opp_status    integer DEFAULT NULL,	        -- if project is used to manage opportunities

From ae6c58fb579c25e13580728d5162f758fcd0ab4c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 14:16:09 +0200
Subject: [PATCH 0973/1163] FIX #6808

---
 htdocs/compta/facture/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index e6278d1fc6a..b739e551b9d 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4186,7 +4186,7 @@ else if ($id > 0 || ! empty($ref))
 			{
 				if (! $objectidnext && count($object->lines) > 0)
 				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="facture/fiche-rec.php?facid=' . $object->id . '&amp;action=create">' . $langs->trans("ChangeIntoRepeatableInvoice") . '</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/fiche-rec.php.php?facid=' . $object->id . '&amp;action=create">' . $langs->trans("ChangeIntoRepeatableInvoice") . '</a></div>';
 				}
 			}
 

From c71488e58bb3beddd2b3c161a6f770e85ce8111e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 15:09:13 +0200
Subject: [PATCH 0974/1163] Removed deprecated code

---
 htdocs/core/lib/security2.lib.php  | 1 -
 htdocs/core/lib/usergroups.lib.php | 1 -
 htdocs/main.inc.php                | 7 ++++---
 htdocs/user/passwordforgotten.php  | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index b6b8d4ddd72..3f41e74b7f6 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -156,7 +156,6 @@ function dol_loginfunction($langs,$conf,$mysoc)
 
 	// Note: $conf->css looks like '/theme/eldy/style.css.php'
 	$conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
-	//$themepath=dol_buildpath((empty($conf->global->MAIN_FORCETHEMEDIR)?'':$conf->global->MAIN_FORCETHEMEDIR).$conf->css,1);
 	$themepath=dol_buildpath($conf->css,1);
 	if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
 	{
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 3086e7d264a..1c919237f44 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -326,7 +326,6 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 
     $formother = new FormOther($db);
 
-    //$dirthemes=array(empty($conf->global->MAIN_FORCETHEMEDIR)?'/theme':$conf->global->MAIN_FORCETHEMEDIR.'/theme');
     $dirthemes=array('/theme');
     if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
     {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index da9e65f47ce..730c2caba4a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1005,8 +1005,10 @@ function top_httphead($contenttype='text/html')
 
     if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
     else header("Content-Type: ".$contenttype);
-    header("X-Content-Type-Options: nosniff");
-    header("X-Frame-Options: SAMEORIGIN");
+    // Security options
+    header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+    header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
+    // TODO Content-Security-Policy
     
     // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
     /*if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) {
@@ -1121,7 +1123,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             
         print '<!-- Includes CSS for Dolibarr theme -->'."\n";
         // Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-        //$themepath=dol_buildpath((empty($conf->global->MAIN_FORCETHEMEDIR)?'':$conf->global->MAIN_FORCETHEMEDIR).$conf->css,1);
         $themepath=dol_buildpath($conf->css,1);
         $themesubdir='';
         if (! empty($conf->modules_parts['theme']))	// This slow down
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 6530a4f8536..0e906fe0738 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -173,7 +173,6 @@ else
 
 // Note: $conf->css looks like '/theme/eldy/style.css.php'
 $conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
-//$themepath=dol_buildpath((empty($conf->global->MAIN_FORCETHEMEDIR)?'':$conf->global->MAIN_FORCETHEMEDIR).$conf->css,1);
 $themepath=dol_buildpath($conf->css,1);
 if (! empty($conf->modules_parts['theme']))	// This slow down
 {

From 400b3320aa60ecd2255278fe66555febaeeb8cad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 15:20:50 +0200
Subject: [PATCH 0975/1163] NEW Introduction option
 MAIN_HTTP_CONTENT_SECURITY_POLICY

---
 htdocs/main.inc.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 730c2caba4a..26f455131cd 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1008,7 +1008,15 @@ function top_httphead($contenttype='text/html')
     // Security options
     header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
     header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
-    // TODO Content-Security-Policy
+    if (! empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
+    {
+        // For example, to restrict script, object, frames or img to some domains
+        // script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; child-src https://youtube.com; img-src: https://static.example.com  
+        // For example, to restrict everything to one domain, except object, ...
+        // default-src https://cdn.example.net; object-src 'none'
+        header("Content-Security-Policy: ".$conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY);
+    }
+      
     
     // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
     /*if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) {

From 59ab9a442199d1907543c833c76f9c57fc4b8171 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 15:25:37 +0200
Subject: [PATCH 0976/1163] FIX #6850

---
 htdocs/admin/bank.php              | 2 +-
 htdocs/admin/bank_extrafields.php  | 2 +-
 htdocs/admin/chequereceipts.php    | 5 +++--
 htdocs/admin/commande.php          | 1 +
 htdocs/admin/contract.php          | 1 +
 htdocs/admin/expedition.php        | 1 +
 htdocs/admin/expensereport.php     | 1 +
 htdocs/admin/facture.php           | 1 +
 htdocs/admin/fichinter.php         | 1 +
 htdocs/admin/livraison.php         | 1 +
 htdocs/admin/propal.php            | 1 +
 htdocs/admin/supplier_invoice.php  | 1 +
 htdocs/admin/supplier_order.php    | 1 +
 htdocs/admin/supplier_proposal.php | 1 +
 14 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 8ed1e3cd9ac..afe60acff2e 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -166,7 +166,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print load_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup');
 
 $head = bank_admin_prepare_head(null);
-dol_fiche_head($head, 'general', $langs->trans("BankSetupModule"), 0, 'account');
+dol_fiche_head($head, 'general', $langs->trans("BankSetupModule"), -1, 'account');
 
 $var=true;
 
diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php
index 2d03c51e34d..794483350f1 100644
--- a/htdocs/admin/bank_extrafields.php
+++ b/htdocs/admin/bank_extrafields.php
@@ -71,7 +71,7 @@ print load_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup')
 
 $head = bank_admin_prepare_head(null);
 
-dol_fiche_head($head, 'attributes', $langs->trans("BankSetupModule"), 0, 'account');
+dol_fiche_head($head, 'attributes', $langs->trans("BankSetupModule"), -1, 'account');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index fd1da0c328b..bc55eb4b9f6 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -27,6 +27,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 
@@ -71,7 +72,7 @@ if ($action == 'updateMask')
 
 if ($action == 'setmod')
 {
-	dolibarr_set_const($db, "CHEQUERECEIPTS_ADDON",$value,'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "CHEQUERECEIPTS_ADDON",$value, 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')
@@ -105,7 +106,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print load_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup');
 
 $head = bank_admin_prepare_head(null);
-dol_fiche_head($head, 'checkreceipts', $langs->trans("BankSetupModule"), 0, 'account');
+dol_fiche_head($head, 'checkreceipts', $langs->trans("BankSetupModule"), -1, 'account');
 
 /*
  *  Numbering module
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index a4680f4d16e..d60144a3492 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -32,6 +32,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 37c0b9bccde..4c0a9572761 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -24,6 +24,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index d31b788a1ab..3c89960ede6 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -30,6 +30,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index b8626827595..eefe5747abd 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -30,6 +30,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index d89c9711e3f..77230dc3f68 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -29,6 +29,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index d99fd9456d9..3ce82ce59cb 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -30,6 +30,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 143c54ec24d..74081266f43 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -30,6 +30,7 @@
  */
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
 
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 6a9884e263c..7c8413a28a6 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -30,6 +30,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 $langs->load("admin");
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index de128184d18..d408657ac8c 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -29,6 +29,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 030a507ce20..acce3a38c7c 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -29,6 +29,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 8fc0c4877c8..8a8d2a181a4 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -25,6 +25,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
 $langs->load("admin");

From ad656e6d35a20daa658b966c9a526acdd7aeaced Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 15:34:00 +0200
Subject: [PATCH 0977/1163] Look and feel v6

---
 htdocs/margin/admin/margin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index 8f39f695952..1918a9aa137 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -119,7 +119,7 @@ print load_fiche_titre($langs->trans("margesSetup"),$linkback,'title_setup');
 
 $head = marges_admin_prepare_head();
 
-dol_fiche_head($head, 'parameters', $langs->trans("Margins"), 0, 'margin');
+dol_fiche_head($head, 'parameters', $langs->trans("Margins"), -1, 'margin');
 
 print load_fiche_titre($langs->trans("MemberMainOptions"),'','');
 print '<table class="noborder" width="100%">';

From f5637463105ecc51c0c7b4dbf1de1d1e80c0ed43 Mon Sep 17 00:00:00 2001
From: Quentin Vial-Gouteyron <quentin@mail.atm-consulting.fr>
Date: Mon, 29 May 2017 15:38:40 +0200
Subject: [PATCH 0978/1163] NEW_extrafield_in_project_mask

---
 htdocs/core/lib/functions2.lib.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 htdocs/core/lib/functions2.lib.php

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
old mode 100644
new mode 100755
index 8934447fdfe..69ee228504d
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -711,7 +711,7 @@ function array2table($data,$tableMarkup=1,$tableoptions='',$troptions='',$tdopti
  */
 function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$mode='next', $bentityon=true)
 {
-    global $conf;
+    global $conf,$user;
 
     if (! is_object($objsoc)) $valueforccc=$objsoc;
     else if($table == "commande_fournisseur" || $table == "facture_fourn" ) $valueforccc=$objsoc->code_fournisseur;
@@ -790,7 +790,16 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
         $maskpersonew[$regKey[1]]=str_pad('', '_', $regKey[2], STR_PAD_RIGHT);
         $tmpmask=preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew, $tmpmask);
     }*/
-    
+	
+    if(strstr($mask,'extra_')){
+
+			$start = "{extra_";
+			$end = "\}";
+			$extra= get_string_between($mask, "extra_", "}");
+			if(!empty($user->array_options['options_'.$extra])){
+				$mask =  preg_replace('#('.($start).')(.*?)('.($end).')#si', $user->array_options['options_'.$extra], $mask);	
+			}
+	} 
     $maskwithonlyymcode=$mask;
     $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);
@@ -1110,7 +1119,14 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     dol_syslog("functions2::get_next_value return ".$numFinal,LOG_DEBUG);
     return $numFinal;
 }
-
+function get_string_between($string, $start, $end){
+    $string = " ".$string;
+     $ini = strpos($string,$start);
+     if ($ini == 0) return "";
+     $ini += strlen($start);     
+     $len = strpos($string,$end,$ini) - $ini;
+     return substr($string,$ini,$len);
+}
 /**
  * Check value
  *

From df729d8889196cb7c30fd5efea1755342438e348 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 May 2017 19:28:43 +0200
Subject: [PATCH 0979/1163] Fix travis

---
 htdocs/core/class/html.form.class.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 640c784436a..cf6ae18f568 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5017,16 +5017,10 @@ class Form
      *  @param	string			$sort			'ASC' or 'DESC' = Sort on label, '' or 'NONE' or 'POS' = Do not sort, we keep original order
      *  @param	string			$morecss		Add more class to css styles
      *  @param	int				$addjscombo		    Add js combo
-<<<<<<< HEAD
      *  @param  string          $moreparamonempty   Add more param on the empty option line. Not used if show_empty not set
      *  @param  int             $disablebademail    Check if an email is found into value and if not disable and colorize entry
      *  @param  int             $nohtmlescape       No html escaping.
-     * 	@return	string							    HTML select string
-=======
-     *  @param  string          $moreparamonempty   Add more param on the empty option line. Not used if show_empty not set.
-     *  @param  int             $disablebademail    Check if an email is found into value and if not disable and colorize entry.
      * 	@return	string							    HTML select string.
->>>>>>> branch '5.0' of git@github.com:Dolibarr/dolibarr.git
      *  @see multiselectarray
      */
     static function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $moreparam='', $translate=0, $maxlen=0, $disabled=0, $sort='', $morecss='', $addjscombo=0, $moreparamonempty='',$disablebademail=0, $nohtmlescape=0)

From fa6bc037656281e5293ee26bcce82f9f8a96c73f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 30 May 2017 01:32:36 +0200
Subject: [PATCH 0980/1163] Fix typo

---
 htdocs/admin/modules.php              | 17 ++++++++++-------
 htdocs/core/lib/files.lib.php         |  2 +-
 htdocs/langs/en_US/modulebuilder.lang |  4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 5c4291ff3f3..fe735cb2499 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -430,7 +430,6 @@ print "<br>\n";
 
 if ($mode == 'common')
 {
-    
     print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -763,13 +762,20 @@ if ($mode == 'common')
         }
 
         print "</tr>\n";
-
     }
     
-    print "</table>\n";
-    print '</div>';
+    if ($oldfamily)
+    {
+        print "</table>\n";
+        print '</div>';
+    }
     
     dol_fiche_end();
+    
+    // Show warning about external users
+    print info_admin(showModulesExludedForExternal($modules))."\n";
+    
+    print '</form>';
 }
 
 if ($mode == 'marketplace')
@@ -909,9 +915,6 @@ if ($mode == 'deploy')
 }
 
 
-// Show warning about external users
-if ($mode == 'common') print info_admin(showModulesExludedForExternal($modules))."\n";
-
 
 llxFooter();
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index ad800708522..e52f8bf98ec 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -588,7 +588,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 	if (empty($srcfile) || empty($destfile)) return -1;
 
 	$destexists=dol_is_dir($destfile);
-	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propaated to dol_copy only.
+	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
     
     if (! $destexists)
     {
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 7336a020fa6..b717bafc57c 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -7,9 +7,9 @@ NewModule=New module
 ModuleKey=Key for new module
 ModuleInitialized=Module initialized
 ModuleBuilderDescdescription=Enter here all general information that describe your module
-ModuleBuilderDescobjects=Define here the new objects you want to manage with our module. A page to list them and a page to create/edit/view a card will be generated.
+ModuleBuilderDescobjects=Define here the new objects you want to manage with your module. A page to list them and a page to create/edit/view a card will be generated.
 ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
-ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with our module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
 ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file with your IDE.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to get your module package file.
 BuildPackage=Build package

From a0de94ae0963d672145d3273e2552dc99c77d169 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Tue, 30 May 2017 06:28:19 +0200
Subject: [PATCH 0981/1163] Fix : Correct donation when we write operation in
 general ledger

---
 htdocs/accountancy/journal/bankjournal.php | 37 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index ea98d678671..6aa900f3a89 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT . '/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT . '/don/class/paymentdonation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/salaries/class/paymentsalary.class.php';
@@ -222,7 +223,7 @@ if ($result) {
 		    // Now loop on each link of record in bank.
 			foreach ( $links as $key => $val ) {
 
-			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert')))     // So we excluded 'company' here
+			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation')))     // So we excluded 'company' here
 			    {
 			        // We save tabtype for a future use, to remember what kind of payment it is 
 			        $tabtype[$obj->rowid] = $links[$key]['type'];
@@ -278,7 +279,8 @@ if ($result) {
 				} else if ($links[$key]['type'] == 'payment_donation') {
 					$paymentdonstatic->id = $links[$key]['url_id'];
 					$paymentdonstatic->fk_donation = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("PaymentDonation");
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentdonstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["paymentdonationid"] = $paymentdonstatic->id;
 					$tabtp[$obj->rowid][$account_pay_donation] += $obj->amount;
 				} else if ($links[$key]['type'] == 'payment_vat') {
 					$paymentvatstatic->id = $links[$key]['url_id'];
@@ -415,6 +417,9 @@ if (! $error && $action == 'writebookkeeping') {
         					$objmid = $db->fetch_object($resultmid);
         					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
         				}
+        			} else if ($tabtype[$key] == 'payment_donation') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
         			}
         
         			$result = $bookkeeping->create($user);
@@ -435,7 +440,7 @@ if (! $error && $action == 'writebookkeeping') {
     			}
     		}
 		}
-		
+
 		// Third party
 		if (! $errorforline)
 		{
@@ -475,7 +480,6 @@ if (! $error && $action == 'writebookkeeping') {
         				$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
         				$bookkeeping->numero_compte = $k;
         			} else if ($tabtype[$key] == 'payment_supplier') {           // If payment is payment of supplier invoice, we get ref of invoice
-        
         				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
         				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
         				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
@@ -489,6 +493,10 @@ if (! $error && $action == 'writebookkeeping') {
         				}
                         $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
         				$bookkeeping->numero_compte = $k;
+        			} else if ($tabtype[$key] == 'payment_donation') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
         			} else if ($tabtype[$key] == 'banktransfert') {
 						$bookkeeping->code_tiers = '';
         				$bookkeeping->numero_compte = $k;
@@ -724,6 +732,7 @@ if (empty($action) || $action == 'view') {
 	$invoicestatic = new Facture($db);
 	$invoicesupplierstatic = new FactureFournisseur($db);
 	$expensereportstatic = new ExpenseReport($db);
+	$donationstatic = new Don($db);
 
 	llxHeader('', $langs->trans("FinanceJournal"));
 
@@ -793,7 +802,7 @@ if (empty($action) || $action == 'view') {
 		}
 		if ($reflabel == '(CustomerInvoicePayment)') {
 			$reflabel = $langs->trans('Customer');
-		}		
+		}
 		if ($reflabel == '(SocialContributionPayment)') {
 			$reflabel = $langs->trans('SocialContribution');
 		}
@@ -806,7 +815,7 @@ if (empty($action) || $action == 'view') {
 		if ($reflabel == '(ExpenseReportPayment)') {
 			$reflabel = $langs->trans('Employee');
 		}
-		
+
 		$ref=$reflabel;
 		if ($tabtype[$key] == 'payment')
 		{
@@ -850,6 +859,20 @@ if (empty($action) || $action == 'view') {
 		    }
 		    else dol_print_error($db);
 		}
+		elseif ($tabtype[$key] == 'payment_donation')
+		{
+		    $sqlmid = 'SELECT payd.fk_donation as id';
+		    $sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_donation as payd";
+		    $sqlmid .= " WHERE payd.fk_donation=" . $val["paymentdonationid"];
+		    dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+		    $resultmid = $db->query($sqlmid);
+		    if ($resultmid) {
+		        $objmid = $db->fetch_object($resultmid);
+		        $donationstatic->fetch($objmid->id);
+		        $ref=$langs->trans("Donation").' '.$donationstatic->getNomUrl(1);
+		    }
+		    else dol_print_error($db);
+		}
 
 
 		/*$invoicestatic->id = $key;
@@ -871,7 +894,7 @@ if (empty($action) || $action == 'view') {
 			else print $accountoshow;
 			print "</td>";
 			if ($val['soclib'] == '') {
-				print "<td>" . $bankstatic->label . " - " . $val["ref"] . "</td>";
+				print "<td>" . $bankstatic->label . " - " . $reflabel . "</td>";
 			} else {
 				print "<td>" . $bankstatic->label . " - " . $val['soclib'] . "</td>";
 			}

From 5c5663c5ae9a9b02f9a994d10cfaa310ed2bbdfb Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 30 May 2017 18:50:54 +0200
Subject: [PATCH 0982/1163] New: getEntity function use true $shared value by
 default

---
 ChangeLog                                     |  2 +
 htdocs/accountancy/admin/productaccount.php   |  2 +-
 .../accountancy/class/bookkeeping.class.php   | 32 ++++++++--------
 htdocs/accountancy/customer/card.php          |  2 +-
 htdocs/accountancy/customer/index.php         | 12 +++---
 htdocs/accountancy/customer/lines.php         |  4 +-
 htdocs/accountancy/customer/list.php          |  2 +-
 htdocs/accountancy/expensereport/card.php     |  2 +-
 htdocs/accountancy/expensereport/index.php    |  8 ++--
 htdocs/accountancy/expensereport/lines.php    |  2 +-
 htdocs/accountancy/expensereport/list.php     |  2 +-
 .../journal/expensereportsjournal.php         |  2 +-
 .../accountancy/journal/purchasesjournal.php  |  2 +-
 htdocs/accountancy/supplier/card.php          |  2 +-
 htdocs/accountancy/supplier/index.php         |  8 ++--
 htdocs/accountancy/supplier/lines.php         |  2 +-
 htdocs/accountancy/supplier/list.php          |  2 +-
 htdocs/adherents/class/adherent.class.php     |  4 +-
 .../adherents/class/adherentstats.class.php   |  2 +-
 htdocs/adherents/class/api_members.class.php  |  2 +-
 .../class/api_memberstypes.class.php          |  2 +-
 htdocs/adherents/list.php                     |  2 +-
 htdocs/adherents/subscription/list.php        |  2 +-
 htdocs/admin/dict.php                         |  2 +-
 htdocs/admin/facture.php                      |  4 +-
 htdocs/admin/mails_templates.php              |  2 +-
 htdocs/admin/tools/listevents.php             |  2 +-
 htdocs/asterisk/cidlookup.php                 |  2 +-
 htdocs/asterisk/wrapper.php                   |  2 +-
 htdocs/bookmarks/bookmarks.lib.php            |  2 +-
 htdocs/cashdesk/facturation.php               |  4 +-
 htdocs/cashdesk/facturation_dhtml.php         |  2 +-
 htdocs/cashdesk/facturation_verif.php         |  2 +-
 .../categories/class/api_categories.class.php |  4 +-
 .../class/api_deprecated_category.class.php   |  4 +-
 htdocs/categories/class/categorie.class.php   | 10 ++---
 htdocs/comm/action/class/actioncomm.class.php |  6 +--
 .../action/class/api_agendaevents.class.php   |  2 +-
 htdocs/comm/action/index.php                  |  4 +-
 htdocs/comm/action/listactions.php            |  2 +-
 htdocs/comm/action/pertype.php                |  2 +-
 htdocs/comm/action/peruser.php                |  4 +-
 htdocs/comm/action/rapport/index.php          |  2 +-
 htdocs/comm/card.php                          |  2 +-
 htdocs/comm/contact.php                       |  2 +-
 htdocs/comm/index.php                         | 14 +++----
 .../mailing/class/advtargetemailing.class.php |  4 +-
 htdocs/comm/propal/card.php                   |  2 +-
 .../comm/propal/class/api_proposals.class.php |  2 +-
 htdocs/comm/propal/class/propal.class.php     | 10 ++---
 .../comm/propal/class/propalestats.class.php  |  2 +-
 htdocs/comm/propal/index.php                  |  8 ++--
 htdocs/comm/propal/list.php                   |  2 +-
 htdocs/comm/prospect/index.php                |  4 +-
 .../class/api_deprecated_commande.class.php   |  2 +-
 htdocs/commande/class/api_orders.class.php    |  2 +-
 htdocs/commande/class/commande.class.php      | 10 ++---
 htdocs/commande/class/commandestats.class.php |  2 +-
 htdocs/commande/customer.php                  |  2 +-
 htdocs/commande/index.php                     | 10 ++---
 htdocs/commande/list.php                      |  2 +-
 htdocs/commande/orderstoinvoice.php           |  2 +-
 htdocs/compta/bank/annuel.php                 | 12 +++---
 htdocs/compta/bank/bankentries.php            |  4 +-
 htdocs/compta/bank/class/account.class.php    |  6 +--
 .../bank/class/api_bankaccounts.class.php     |  2 +-
 htdocs/compta/bank/graph.php                  | 20 +++++-----
 htdocs/compta/bank/index.php                  |  2 +-
 htdocs/compta/charges/index.php               |  2 +-
 htdocs/compta/clients.php                     |  2 +-
 .../deplacement/class/deplacement.class.php   |  2 +-
 .../class/api_deprecated_invoice.class.php    |  2 +-
 .../facture/class/api_invoices.class.php      |  2 +-
 .../facture/class/facture-rec.class.php       |  2 +-
 htdocs/compta/facture/class/facture.class.php |  4 +-
 htdocs/compta/facture/list.php                |  2 +-
 htdocs/compta/paiement/cheque/card.php        |  4 +-
 .../cheque/class/remisecheque.class.php       |  2 +-
 htdocs/compta/paiement/cheque/index.php       |  2 +-
 htdocs/compta/resultat/clientfourn.php        |  8 ++--
 htdocs/compta/resultat/index.php              |  8 ++--
 htdocs/compta/sociales/payments.php           |  2 +-
 htdocs/compta/stats/cabyuser.php              |  2 +-
 htdocs/compta/stats/casoc.php                 |  2 +-
 htdocs/compta/stats/index.php                 |  2 +-
 htdocs/contact/list.php                       |  2 +-
 htdocs/contrat/class/contrat.class.php        |  4 +-
 htdocs/contrat/index.php                      | 14 +++----
 htdocs/contrat/list.php                       |  2 +-
 htdocs/core/boxes/box_clients.php             |  2 +-
 htdocs/core/boxes/box_contacts.php            |  2 +-
 htdocs/core/boxes/box_fournisseurs.php        |  2 +-
 htdocs/core/boxes/box_goodcustomers.php       |  2 +-
 htdocs/core/boxes/box_project.php             |  4 +-
 htdocs/core/boxes/box_prospect.php            |  2 +-
 htdocs/core/class/commonobject.class.php      |  2 +-
 htdocs/core/class/html.form.class.php         | 32 ++++++++--------
 .../core/class/html.formaccounting.class.php  |  8 ++--
 htdocs/core/class/html.formcompany.class.php  |  2 +-
 htdocs/core/class/html.formmail.class.php     |  6 +--
 htdocs/core/class/html.formprojet.class.php   |  4 +-
 htdocs/core/class/notify.class.php            |  4 +-
 htdocs/core/lib/company.lib.php               |  4 +-
 htdocs/core/lib/files.lib.php                 |  8 ++--
 htdocs/core/lib/functions.lib.php             |  4 +-
 htdocs/core/lib/sendings.lib.php              |  2 +-
 .../core/modules/facture/mod_facture_mars.php |  4 +-
 .../modules/facture/mod_facture_terre.php     |  4 +-
 .../mailings/advthirdparties.modules.php      |  6 +--
 .../modules/mailings/contacts1.modules.php    |  6 +--
 .../modules/mailings/contacts2.modules.php    |  8 ++--
 .../modules/mailings/contacts3.modules.php    | 10 ++---
 .../modules/mailings/contacts4.modules.php    | 10 ++---
 .../modules/mailings/thirdparties.modules.php |  8 ++--
 .../thirdparties_services_expired.modules.php |  6 +--
 htdocs/core/modules/modAccounting.class.php   |  2 +-
 htdocs/core/modules/modAdherent.class.php     |  2 +-
 htdocs/core/modules/modAgenda.class.php       |  2 +-
 htdocs/core/modules/modBanque.class.php       |  4 +-
 htdocs/core/modules/modCategorie.class.php    | 10 ++---
 htdocs/core/modules/modCommande.class.php     |  2 +-
 htdocs/core/modules/modContrat.class.php      |  2 +-
 htdocs/core/modules/modDeplacement.class.php  |  2 +-
 htdocs/core/modules/modExpedition.class.php   |  2 +-
 .../core/modules/modExpenseReport.class.php   |  2 +-
 htdocs/core/modules/modFacture.class.php      |  4 +-
 htdocs/core/modules/modFicheinter.class.php   |  2 +-
 htdocs/core/modules/modFournisseur.class.php  |  6 +--
 htdocs/core/modules/modProduct.class.php      |  6 +--
 htdocs/core/modules/modProjet.class.php       |  2 +-
 htdocs/core/modules/modPropale.class.php      |  2 +-
 htdocs/core/modules/modResource.class.php     |  2 +-
 htdocs/core/modules/modSalaries.class.php     |  2 +-
 htdocs/core/modules/modService.class.php      |  4 +-
 htdocs/core/modules/modSociete.class.php      |  6 +--
 htdocs/core/modules/modStock.class.php        |  4 +-
 htdocs/core/modules/modTax.class.php          |  2 +-
 htdocs/core/modules/modUser.class.php         |  2 +-
 .../modules/societe/mod_codeclient_monkey.php |  4 +-
 htdocs/don/class/don.class.php                |  2 +-
 htdocs/ecm/class/ecmfiles.class.php           |  4 +-
 htdocs/expedition/card.php                    |  2 +-
 htdocs/expedition/class/expedition.class.php  |  4 +-
 htdocs/expedition/index.php                   |  4 +-
 htdocs/expedition/list.php                    |  2 +-
 .../class/api_expensereports.class.php        |  2 +-
 .../class/expensereport.class.php             |  4 +-
 .../class/expensereportstats.class.php        |  2 +-
 htdocs/expensereport/export_csv.php           |  2 +-
 htdocs/expensereport/index.php                |  4 +-
 htdocs/expensereport/list.php                 |  2 +-
 htdocs/expensereport/payment/card.php         |  2 +-
 htdocs/expensereport/payment/payment.php      |  2 +-
 htdocs/fichinter/index.php                    |  8 ++--
 htdocs/fourn/card.php                         |  2 +-
 .../class/api_supplier_invoices.class.php     |  2 +-
 htdocs/fourn/class/fournisseur.class.php      |  4 +-
 .../class/fournisseur.commande.class.php      |  2 +-
 .../fourn/class/fournisseur.facture.class.php |  2 +-
 .../fourn/class/fournisseur.product.class.php |  4 +-
 htdocs/fourn/commande/list.php                |  2 +-
 htdocs/fourn/contact.php                      |  2 +-
 htdocs/fourn/facture/list.php                 |  2 +-
 htdocs/fourn/index.php                        |  2 +-
 htdocs/fourn/product/list.php                 |  2 +-
 htdocs/holiday/class/holiday.class.php        |  4 +-
 htdocs/livraison/class/livraison.class.php    |  2 +-
 htdocs/margin/agentMargins.php                |  4 +-
 htdocs/margin/checkMargins.php                |  2 +-
 htdocs/margin/customerMargins.php             |  2 +-
 htdocs/margin/productMargins.php              |  2 +-
 .../oldskeletons/skeleton_api_class.class.php |  2 +-
 .../oldskeletons/skeleton_class.class.php     |  4 +-
 .../oldskeletons/skeleton_list.php            |  2 +-
 .../template/class/myobject.class.php         |  4 +-
 .../class/myobject_api_class.class.php        |  2 +-
 .../modulebuilder/template/myobject_list.php  |  2 +-
 .../class/multicurrency.class.php             |  2 +-
 htdocs/opensurvey/list.php                    |  2 +-
 htdocs/product/admin/product_tools.php        |  4 +-
 htdocs/product/ajax/products.php              |  2 +-
 .../product/actions_card_product.class.php    |  2 +-
 .../service/actions_card_service.class.php    |  2 +-
 .../class/api_deprecated_product.class.php    |  4 +-
 htdocs/product/class/api_products.class.php   |  2 +-
 .../product/class/html.formproduct.class.php  |  2 +-
 htdocs/product/class/product.class.php        | 38 +++++++++----------
 .../class/productcustomerprice.class.php      |  6 +--
 htdocs/product/composition/card.php           |  2 +-
 htdocs/product/index.php                      |  2 +-
 .../inventory/class/inventory.class.php       |  2 +-
 htdocs/product/list-with-listview.php         |  2 +-
 htdocs/product/list.php                       |  2 +-
 htdocs/product/popuprop.php                   |  2 +-
 htdocs/product/price.php                      |  2 +-
 htdocs/product/reassort.php                   |  2 +-
 htdocs/product/reassortlot.php                |  2 +-
 htdocs/product/stats/commande.php             |  2 +-
 htdocs/product/stats/contrat.php              |  2 +-
 htdocs/product/stats/facture.php              |  2 +-
 htdocs/product/stats/facture_fournisseur.php  |  2 +-
 htdocs/product/stats/propal.php               |  2 +-
 .../stock/class/api_stockmovements.class.php  |  2 +-
 .../stock/class/api_warehouses.class.php      |  2 +-
 htdocs/product/stock/class/entrepot.class.php |  2 +-
 htdocs/product/stock/index.php                |  4 +-
 htdocs/product/stock/list.php                 |  2 +-
 htdocs/product/stock/mouvement.php            |  2 +-
 htdocs/product/stock/product.php              |  2 +-
 htdocs/product/stock/productlot_list.php      |  2 +-
 htdocs/product/stock/replenish.php            | 10 ++---
 htdocs/product/stock/valo.php                 |  2 +-
 htdocs/projet/class/api_projects.class.php    |  2 +-
 htdocs/projet/class/api_tasks.class.php       |  2 +-
 htdocs/projet/class/project.class.php         |  8 ++--
 htdocs/projet/class/task.class.php            |  6 +--
 htdocs/projet/list.php                        |  2 +-
 htdocs/projet/tasks/list.php                  |  2 +-
 htdocs/resource/class/dolresource.class.php   |  6 +--
 htdocs/societe/ajaxcompanies.php              |  2 +-
 htdocs/societe/class/api_contacts.class.php   |  2 +-
 .../class/api_deprecated_contact.class.php    |  2 +-
 .../class/api_deprecated_thirdparty.class.php |  2 +-
 .../societe/class/api_thirdparties.class.php  |  2 +-
 htdocs/societe/class/societe.class.php        |  4 +-
 htdocs/societe/index.php                      |  6 +--
 htdocs/societe/list.php                       |  2 +-
 htdocs/societe/notify/index.php               |  2 +-
 .../class/supplier_proposal.class.php         |  2 +-
 htdocs/supplier_proposal/list.php             |  2 +-
 htdocs/user/class/api_users.class.php         |  2 +-
 htdocs/user/class/user.class.php              |  6 +--
 htdocs/user/index.php                         |  2 +-
 .../variants/class/ProductAttribute.class.php |  6 +--
 .../class/ProductAttributeValue.class.php     |  2 +-
 .../class/ProductCombination.class.php        |  8 ++--
 htdocs/websites/class/websitepage.class.php   |  2 +-
 237 files changed, 456 insertions(+), 454 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c76617b2f8a..a0470fee04a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ English Dolibarr ChangeLog
 
 For developers:
 NEW: Add a lot of API REST: dictionaryevents, memberstypes, ...
+NEW: getEntity function use true $shared value by default
 
 WARNING: 
 
@@ -21,6 +22,7 @@ Following changes may create regression for some external modules, but were nece
 * Removed Societe::set_commnucation_level (was deprecated in 4.0). Was not used.
 * Removed the trigger file of PAYPAL module that stored data that was not used by Dolibarr. The trigger event still
   exists, but if an external module need action on it, it must provides itself its trigger file.
+* Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', false) instead getEntity('xxx') or getEntity('xxx', 0)
 
 ***** ChangeLog for 5.0.2 compared to 5.0.1 *****
 FIX: #6468 + Fix missing translation
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index fcb44c6f858..504d91a8f91 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -218,7 +218,7 @@ else
 {
     $sql.=" p.accountancy_code_sell = aa.account_number AND aa.fk_pcg_version = '" . $pcgvercode . "'";
 }
-$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
     if (strlen(trim($search_current_account))) {
         $sql .= natural_search("p.accountancy_code_buy",$search_current_account);
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 5d9e7a9910a..8ba8d185ede 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -189,7 +189,7 @@ class BookKeeping extends CommonObject
 		$sql .= " AND fk_doc = " . $this->fk_doc;
 		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines 
 		$sql .= " AND numero_compte = '" . $this->db->escape($this->numero_compte) . "'";
-		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 
 		$resql = $this->db->query($sql);
 
@@ -203,7 +203,7 @@ class BookKeeping extends CommonObject
 				$sqlnum .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";		// For example doc_type = 'bank' 
 				$sqlnum .= " AND fk_docdet = " . $this->db->escape($this->fk_docdet);       		// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
 				$sqlnum .= " AND doc_ref = '" . $this->db->escape($this->doc_ref) . "'";			// ref of source object
-				$sqlnum .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+				$sqlnum .= " AND entity IN (" . getEntity('accountancy') . ")";
 
 				dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
 				$resqlnum = $this->db->query($sqlnum);
@@ -215,7 +215,7 @@ class BookKeeping extends CommonObject
 				if (empty($this->piece_num)) {
 					$sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum";
 					$sqlnum .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-					$sqlnum .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+					$sqlnum .= " WHERE entity IN (" . getEntity('accountancy') . ")";
 
 					dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
 					$resqlnum = $this->db->query($sqlnum);
@@ -500,7 +500,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.piece_num";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql .= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		if (null !== $ref) {
 			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
 		} else {
@@ -605,7 +605,7 @@ class BookKeeping extends CommonObject
 		}
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql .= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
@@ -715,7 +715,7 @@ class BookKeeping extends CommonObject
 			}
 		}
 		$sql.= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
@@ -809,7 +809,7 @@ class BookKeeping extends CommonObject
 			}
 		}
 		$sql.= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
@@ -1062,7 +1062,7 @@ class BookKeeping extends CommonObject
 		$sql.= " WHERE 1 = 1";
 		if (! empty($delyear)) $sql.= " AND YEAR(doc_date) = " . $delyear;         // FIXME Must use between
 		if (! empty($journal)) $sql.= " AND code_journal = '".$journal."'";
-		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		$resql = $this->db->query($sql);
 
 		if (! $resql) {
@@ -1094,7 +1094,7 @@ class BookKeeping extends CommonObject
 		$sql = "DELETE";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 
 		$resql = $this->db->query($sql);
 
@@ -1200,7 +1200,7 @@ class BookKeeping extends CommonObject
 		$sql = "SELECT piece_num,doc_date,code_journal,doc_ref,doc_type";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1231,7 +1231,7 @@ class BookKeeping extends CommonObject
 		global $conf;
 
 		$sql = "SELECT MAX(piece_num)+1 as max FROM " . MAIN_DB_PREFIX . $this->table_element;
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "getNextNumMvt sql=" . $sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1263,7 +1263,7 @@ class BookKeeping extends CommonObject
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1315,7 +1315,7 @@ class BookKeeping extends CommonObject
 		$sql .= " numero_compte, label_compte, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "::export_bookkeping", LOG_DEBUG);
 
@@ -1384,7 +1384,7 @@ class BookKeeping extends CommonObject
         $sql .= " AND aa.active = 1";
         $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
         $sql .= " AND asy.rowid = " . $pcgver;
-	    $sql .= " AND ab.entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " AND ab.entity IN (" . getEntity('accountancy') . ")";
         $sql .= " ORDER BY account_number ASC";
         
         dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
@@ -1449,7 +1449,7 @@ class BookKeeping extends CommonObject
         $sql .= " WHERE aa.account_number = '" . $account . "'";  
         $sql .= " AND parent.active = 1";
         $sql .= " AND root.active = 1";
-        $sql .= " AND aa.entity IN (" . getEntity("accountancy", 1) . ")";
+        $sql .= " AND aa.entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1488,7 +1488,7 @@ class BookKeeping extends CommonObject
 		$sql .= " AND asy.rowid = " . $pcgver;
 		$sql .= " AND aa.active = 1";
 		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_accounting_category as cat ON aa.fk_accounting_category = cat.rowid";
-	    $sql .= " WHERE aa.entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " WHERE aa.entity IN (" . getEntity('accountancy') . ")";
 
 		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index eca3be1d477..b32486038af 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -93,7 +93,7 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON l.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = l.fk_facture";
 	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id;
-	$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")"; // We don't share object for accountancy
+	$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")"; // We don't share object for accountancy
 
 	dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 82a406d4a0b..ab10efde376 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -141,7 +141,7 @@ if ($action == 'validatehistory') {
 	$sql1.= " WHERE fd.fk_facture IN ( SELECT f.rowid FROM " . MAIN_DB_PREFIX . "facture as f";
 	$sql1.= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
 	$sql1.= " AND f.datef <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
-	$sql1.= " AND f.entity IN (" . getEntity("accountancy", 1) . ")";
+	$sql1.= " AND f.entity IN (" . getEntity('accountancy') . ")";
 	$sql1.=")";
 	
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
@@ -187,7 +187,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 } else {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
-$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";    // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";    // We don't share object for accountancy
 
 dol_syslog("htdocs/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
 $result = $db->query($sql);
@@ -228,7 +228,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";   // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
@@ -284,7 +284,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";   // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
@@ -341,7 +341,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
     $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-    $sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")"; // We don't share object for accountancy
+    $sql .= " AND f.entity IN (" . getEntity('facture', false) . ")"; // We don't share object for accountancy
     if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
         $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
     } else {
@@ -387,7 +387,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     	$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
     	$sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     	$sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-    	$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";   // We don't share object for accountancy
+    	$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
     	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
     	    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
     	} else {
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index f3763dd9ca0..f5e8881e51b 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -164,7 +164,7 @@ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " WHERE fd.fk_code_ventilation > 0 ";
-$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";   // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
 $sql .= " AND f.fk_statut > 0";
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
@@ -201,7 +201,7 @@ if (strlen(trim($search_country))) {
 if (strlen(trim($search_tvaintra))) {
 	$sql .= natural_search("s.tva_intra", $search_tva_intra);
 }
-$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";    // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";    // We don't share object for accountancy
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 8af289f2c99..cc2495a0f9e 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -220,7 +220,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 } else {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
-$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";    // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";    // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index e37b35f1003..201e61e97ab 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -96,7 +96,7 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON erd.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
 	$sql .= " WHERE er.fk_statut > 0 AND erd.rowid = " . $id;
-	$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";     // We don't share object for accountancy
+	$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
 
 	dol_syslog("/accounting/expensereport/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index c062d4e09c2..933cd6c3303 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -134,7 +134,7 @@ if ($action == 'validatehistory') {
 	$sql1.= " WHERE erd.fk_expensereport IN ( SELECT er.rowid FROM " . MAIN_DB_PREFIX . "expensereport as er";
 	$sql1.= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
 	$sql1.= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
-	$sql1.= " AND er.entity IN (" . getEntity("accountancy", 1) . ")";
+	$sql1.= " AND er.entity IN (" . getEntity('accountancy') . ")";
 	$sql1.=")";
 	
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
@@ -206,7 +206,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid =
 $sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= " AND er.fk_statut > 0 ";
-$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";     // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -259,7 +259,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid =
 $sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= " AND er.fk_statut > 0 ";
-$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";     // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -313,7 +313,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     $sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
     $sql .= " AND er.fk_statut > 0 ";
-    $sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";     // We don't share object for accountancy
+    $sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
     
     dol_syslog('/accountancy/expensereport/index.php:: sql=' . $sql);
     $resql = $db->query($sql);
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index b3936bbf1a6..c678795bf2d 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -173,7 +173,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= " AND (erd.tva_tx like '" . $search_vat . "%')";
 }
-$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index b1a86c96838..4b0a379faf3 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -203,7 +203,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
     $sql .= natural_search("erd.tva_tx",$search_vat,1);
 }
-$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index f67224e3996..f1f0ac4b0de 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -97,7 +97,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_ex
 $sql .= " JOIN " . MAIN_DB_PREFIX . "user as u ON u.rowid = er.fk_user_author";
 $sql .= " WHERE er.fk_statut > 0 ";
 $sql .= " AND erd.fk_code_ventilation > 0 ";
-$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";  // We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND er.date_debut >= '" . $db->idate($date_start) . "' AND er.date_debut <= '" . $db->idate($date_end) . "'";
 $sql .= " ORDER BY er.date_debut";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index f9cd162b6a0..e7f887547d3 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -96,7 +96,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = fd.fk_factu
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " WHERE f.fk_statut > 0 ";
 $sql .= " AND fd.fk_code_ventilation > 0 ";
-$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 0) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";  // We don't share object for accountancy
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 	$sql .= " AND f.type IN (0,1,2)";
 else
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 47a99c88496..863c68c5746 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -96,7 +96,7 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON l.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = l.fk_facture_fourn ";
 	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id;
-	$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 0) . ")";     // We don't share object for accountancy
+	$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
 	
 	dol_syslog("/accounting/supplier/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 2d36399c9b5..fdaa70e22ca 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -134,7 +134,7 @@ if ($action == 'validatehistory') {
 	$sql1.= " WHERE fd.fk_facture_fourn IN ( SELECT f.rowid FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
 	$sql1.= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
 	$sql1.= " AND f.datef <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
-	$sql1.= " AND f.entity IN (" . getEntity("accountancy", 1) . ")";
+	$sql1.= " AND f.entity IN (" . getEntity('accountancy') . ")";
 	$sql1.= ")";
 	
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
@@ -204,7 +204,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid
 $sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= "  AND ff.fk_statut > 0 ";
-$sql .= " AND ff.entity IN (" . getEntity("facture_fourn", 0) . ")";     // We don't share object for accountancy
+$sql .= " AND ff.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -258,7 +258,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid
 $sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= "  AND ff.fk_statut > 0 ";
-$sql .= " AND ff.entity IN (" . getEntity("facture_fourn", 0) . ")";     // We don't share object for accountancy
+$sql .= " AND ff.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -312,7 +312,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     $sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
     $sql .= "  AND ff.fk_statut > 0 ";
-    $sql .= " AND ff.entity IN (" . getEntity("facture_fourn", 0) . ")";     // We don't share object for accountancy
+    $sql .= " AND ff.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
     
     dol_syslog('/accountancy/supplier/index.php:: sql=' . $sql);
     $resql = $db->query($sql);
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 2757b6d8aec..22982a6f087 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -182,7 +182,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("l.tva_tx", $search_vat, 1);
 }
-$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 0) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 9c822425a1c..30a42410d8b 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -217,7 +217,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
     $sql .= natural_search("l.tva_tx",$search_vat,1);
 }
-$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 0) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 92449005d1f..20f5fa671c9 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1780,7 +1780,7 @@ class Adherent extends CommonObject
         $sql = "SELECT count(a.rowid) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
         $sql.= " WHERE a.statut > 0";
-        $sql.= " AND a.entity IN (".getEntity('adherent', 1).")";
+        $sql.= " AND a.entity IN (".getEntity('adherent').")";
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -1818,7 +1818,7 @@ class Adherent extends CommonObject
         $sql = "SELECT a.rowid, a.datefin, a.statut";
         $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
         $sql.= " WHERE a.statut = 1";
-        $sql.= " AND a.entity IN (".getEntity('adherent', 1).")";
+        $sql.= " AND a.entity IN (".getEntity('adherent').")";
         $sql.= " AND (a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."')";
 
         $resql=$this->db->query($sql);
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index 97a4c8201a7..7fabd2c0ddf 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -65,7 +65,7 @@ class AdherentStats extends Stats
 		$this->field='subscription';
 
 		$this->where.= " m.statut != 0";
-		$this->where.= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent', 1).")";
+		$this->where.= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent').")";
 		//if (!$user->rights->societe->client->voir && !$user->societe_id) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if($this->memberid)
 		{
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 3b1bda41250..3defcabd059 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -100,7 +100,7 @@ class Members extends DolibarrApi
 
         $sql = "SELECT t.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."adherent as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('adherent', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('adherent').')';
         if (!empty($typeid))
         {
             $sql.= ' AND t.fk_adherent_type='.$typeid;
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 18c828eb9e5..9457b910c5d 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -97,7 +97,7 @@ class MembersTypes extends DolibarrApi
 
         $sql = "SELECT t.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('adherent', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('adherent').')';
 
         // Add sql filters
         if ($sqlfilters)
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 1b059d8616d..0f2cd40d076 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -210,7 +210,7 @@ if ($catid > 0)    $sql.= " AND cm.fk_categorie = ".$db->escape($catid);
 if ($catid == -2)  $sql.= " AND cm.fk_categorie IS NULL";
 if ($search_categ > 0)   $sql.= " AND cm.fk_categorie = ".$db->escape($search_categ);
 if ($search_categ == -2) $sql.= " AND cm.fk_categorie IS NULL";
-$sql.= " AND d.entity IN (".getEntity('adherent', 1).")";
+$sql.= " AND d.entity IN (".getEntity('adherent').")";
 if ($sall) $sql.=natural_search(array_keys($fieldstosearchall), $sall);
 if ($type > 0) $sql.=" AND t.rowid=".$db->escape($type);
 if ($statut != '') $sql.=" AND d.statut in (".$db->escape($statut).")";     // Peut valoir un nombre ou liste de nombre separes par virgules
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 55b832e327c..633c872e607 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -123,7 +123,7 @@ $sql.= " b.fk_account";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank=b.rowid";
 $sql.= " WHERE d.rowid = c.fk_adherent";
-$sql.= " AND d.entity IN (".getEntity('adherent', 1).")";
+$sql.= " AND d.entity IN (".getEntity('adherent').")";
 if (isset($date_select) && $date_select != '')
 {
     $sql.= " AND c.dateadh LIKE '".$date_select."%'";
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 913fcf75de6..85694a5c88b 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -189,7 +189,7 @@ $tabsql[21]= "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX
 $tabsql[22]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
 $tabsql[23]= "SELECT t.rowid as rowid, t.taux, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
 $tabsql[24]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
-//$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template',1).")";
+//$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template').")";
 $tabsql[26]= "SELECT rowid   as rowid, code, label, short_label, active FROM ".MAIN_DB_PREFIX."c_units";
 $tabsql[27]= "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_stcomm";
 $tabsql[28]= "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newbymonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 77230dc3f68..8a57a62b144 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -639,7 +639,7 @@ if (! empty($conf->banque->enabled))
     $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
     $sql.= " WHERE clos = 0";
     $sql.= " AND courant = 1";
-    $sql.= " AND entity IN (".getEntity('bank_account', 1).")";
+    $sql.= " AND entity IN (".getEntity('bank_account').")";
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -684,7 +684,7 @@ $sql = "SELECT rowid, label";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
 $sql.= " WHERE clos = 0";
 $sql.= " AND courant = 1";
-$sql.= " AND entity IN (".getEntity('bank_account', 1).")";
+$sql.= " AND entity IN (".getEntity('bank_account').")";
 $var=True;
 $resql=$db->query($sql);
 if ($resql)
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index caea3bef9f7..6f060ca136f 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -80,7 +80,7 @@ $tabname[25]= MAIN_DB_PREFIX."c_email_templates";
 
 // Requests to extract data
 $tabsql=array();
-$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template',1).")";
+$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content_lines, content, active FROM ".MAIN_DB_PREFIX."c_email_templates WHERE entity IN (".getEntity('email_template').")";
 
 // Criteria to sort dictionaries
 $tabsqlsort=array();
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 47f4af17dcf..40ebcd69dc6 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -165,7 +165,7 @@ $sql.= " e.fk_user, e.description,";
 $sql.= " u.login";
 $sql.= " FROM ".MAIN_DB_PREFIX."events as e";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user";
-$sql.= " WHERE e.entity IN (".getEntity('event', 1).")";
+$sql.= " WHERE e.entity IN (".getEntity('event').")";
 if ($date_start > 0) $sql.= " AND e.dateevent >= '".$db->idate($date_start)."'";
 if ($date_end > 0)   $sql.= " AND e.dateevent <= '".$db->idate($date_end)."'";
 if ($search_code) { $usefilter++; $sql.=natural_search("e.type", $search_code, 0); }
diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php
index e50a1a74a1b..e6b4985f6b8 100644
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/asterisk/cidlookup.php
@@ -48,7 +48,7 @@ if (empty($phone))
 
 $sql = "SELECT s.nom as name FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON sp.fk_soc = s.rowid";
-$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+$sql.= " WHERE s.entity IN (".getEntity('societe').")";
 $sql.= " AND (s.phone='".$db->escape($phone)."'";
 $sql.= " OR sp.phone='".$db->escape($phone)."'";
 $sql.= " OR sp.phone_perso='".$db->escape($phone)."'";
diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index 381750546ce..69a9a96f032 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -117,7 +117,7 @@ llxHeader();
 
 $sql = "SELECT s.nom as name FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON sp.fk_soc = s.rowid";
-$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+$sql.= " WHERE s.entity IN (".getEntity('societe').")";
 $sql.= " AND (s.phone='".$db->escape($called)."'";
 $sql.= " OR sp.phone='".$db->escape($called)."'";
 $sql.= " OR sp.phone_perso='".$db->escape($called)."'";
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 4df9b56979d..05bd454eeea 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -63,7 +63,7 @@ function printBookmarksList($aDb, $aLangs)
 	{
 		$sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
 		$sql.= " WHERE (fk_user = ".$user->id." OR fk_user is NULL OR fk_user = 0)";
-        $sql.= " AND entity IN (".getEntity('bookmarks',1).")";
+        $sql.= " AND entity IN (".getEntity('bookmarks').")";
 		$sql.= " ORDER BY position";
 		if ($resql = $db->query($sql) )
 		{
diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
index dd722805eb6..5a7a56e333e 100644
--- a/htdocs/cashdesk/facturation.php
+++ b/htdocs/cashdesk/facturation.php
@@ -44,7 +44,7 @@ if ( GETPOST('filtre') ) {
 	if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= ", ps.reel";
 	$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 	if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$conf_fkentrepot."'";
-	$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+	$sql.= " WHERE p.entity IN (".getEntity('product').")";
 	$sql.= " AND p.tosell = 1";
 	if(!$conf->global->CASHDESK_SERVICES) $sql.= " AND p.fk_product_type = 0";
 	$sql.= " AND (p.ref LIKE '%".$db->escape(GETPOST('filtre'))."%' OR p.label LIKE '%".$db->escape(GETPOST('filtre'))."%'";
@@ -96,7 +96,7 @@ if ( GETPOST('filtre') ) {
 	if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= ", ps.reel";
 	$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 	if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$conf_fkentrepot."'";
-	$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+	$sql.= " WHERE p.entity IN (".getEntity('product').")";
 	$sql.= " AND p.tosell = 1";
 	if(!$conf->global->CASHDESK_SERVICES) $sql.= " AND p.fk_product_type = 0";
 	$sql.= " ORDER BY p.label";
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
index 3046644c35e..72fbd509535 100644
--- a/htdocs/cashdesk/facturation_dhtml.php
+++ b/htdocs/cashdesk/facturation_dhtml.php
@@ -50,7 +50,7 @@ if (dol_strlen($search) >= 0)	// If search criteria is on char length at least
 	if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= ", ps.reel";
 	$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 	if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$conf_fkentrepot."'";
-	$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+	$sql.= " WHERE p.entity IN (".getEntity('product').")";
 	$sql.= " AND p.tosell = 1";
 	$sql.= " AND p.fk_product_type = 0";
 	// Add criteria on ref/label
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index d4bf53e01c5..96742ddfebf 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -43,7 +43,7 @@ switch($action)
 			if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= ", ps.reel";
 			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 			if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = ".$conf_fkentrepot;
-			$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+			$sql.= " WHERE p.entity IN (".getEntity('product').")";
 
 			// Recuperation des donnees en fonction de la source (liste deroulante ou champ texte) ...
 			if ( $_POST['hdnSource'] == 'LISTE' )
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index fc7aca368f4..ed10e337f7b 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -114,7 +114,7 @@ class Categories extends DolibarrApi
         
         $sql = "SELECT t.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."categorie as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('category', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('category').')';
         if (!empty($type))
         {
             $sql.= ' AND t.type='.array_search($type,Categories::$TYPES);
@@ -205,7 +205,7 @@ class Categories extends DolibarrApi
         $sql = "SELECT s.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."categorie as s";
         $sql.= " , ".MAIN_DB_PREFIX."categorie_".$sub_type." as sub ";
-        $sql.= ' WHERE s.entity IN ('.getEntity('category', 1).')';
+        $sql.= ' WHERE s.entity IN ('.getEntity('category').')';
         $sql.= ' AND s.type='.array_search($type,Categories::$TYPES);
         $sql.= ' AND s.rowid = sub.fk_categorie';
         $sql.= ' AND sub.'.$subcol_name.' = '.$item;
diff --git a/htdocs/categories/class/api_deprecated_category.class.php b/htdocs/categories/class/api_deprecated_category.class.php
index efbcac82124..392005b71fe 100644
--- a/htdocs/categories/class/api_deprecated_category.class.php
+++ b/htdocs/categories/class/api_deprecated_category.class.php
@@ -121,7 +121,7 @@ class CategoryApi extends DolibarrApi
         
         $sql = "SELECT s.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."categorie as s";
-        $sql.= ' WHERE s.entity IN ('.getEntity('category', 1).')';
+        $sql.= ' WHERE s.entity IN ('.getEntity('category').')';
         $sql.= ' AND s.type='.array_search($type,CategoryApi::$TYPES);
 
         $nbtotalofrecords = '';
@@ -201,7 +201,7 @@ class CategoryApi extends DolibarrApi
         $sql = "SELECT s.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."categorie as s";
         $sql.= " , ".MAIN_DB_PREFIX."categorie_".$sub_type." as sub ";
-        $sql.= ' WHERE s.entity IN ('.getEntity('category', 1).')';
+        $sql.= ' WHERE s.entity IN ('.getEntity('category').')';
         $sql.= ' AND s.type='.array_search($type,CategoryApi::$TYPES);
         $sql.= ' AND s.rowid = sub.fk_categorie';
         $sql.= ' AND sub.'.$subcol_name.' = '.$item;
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 142cc22fe75..cfe4f3ad169 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -195,7 +195,7 @@ class Categorie extends CommonObject
 		}
 		else
 		{
-			$sql.= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category',1).")";
+			$sql.= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category').")";
 			if ($type) $sql.= " AND type = '".$this->db->escape($type)."'";
 		}
 
@@ -903,7 +903,7 @@ class Categorie extends CommonObject
 		$sql = "SELECT fk_parent as id_parent, rowid as id_son";
 		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
 		$sql.= " WHERE fk_parent != 0";
-		$sql.= " AND entity IN (".getEntity('category',1).")";
+		$sql.= " AND entity IN (".getEntity('category').")";
 
 		dol_syslog(get_class($this)."::load_motherof", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1094,7 +1094,7 @@ class Categorie extends CommonObject
 	function get_all_categories($type=null, $parent=false)
 	{
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE entity IN (".getEntity('category',1).")";
+		$sql.= " WHERE entity IN (".getEntity('category').")";
 		if (! is_null($type))
 			$sql.= " AND type = ".$type;
 		if ($parent)
@@ -1129,7 +1129,7 @@ class Categorie extends CommonObject
 	{
 		$sql = "SELECT count(rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE entity IN (".getEntity('category',1).")";
+		$sql.= " WHERE entity IN (".getEntity('category').")";
 		$res = $this->db->query($sql);
 		if ($res)
 		{
@@ -1155,7 +1155,7 @@ class Categorie extends CommonObject
 		 */
 		$sql = "SELECT c.rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."categorie as c ";
-		$sql.= " WHERE c.entity IN (".getEntity('category',1).")";
+		$sql.= " WHERE c.entity IN (".getEntity('category').")";
 		$sql.= " AND c.type = ".$this->type;
 		$sql.= " AND c.fk_parent = ".$this->fk_parent;
 		$sql.= " AND c.label = '".$this->db->escape($this->label)."'";
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index a9695abcb35..8243268574c 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -870,7 +870,7 @@ class ActionComm extends CommonObject
 
         $sql = "SELECT a.id";
         $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
-        $sql.= " WHERE a.entity IN (".getEntity('agenda', 1).")";
+        $sql.= " WHERE a.entity IN (".getEntity('agenda').")";
         if (! empty($socid)) $sql.= " AND a.fk_soc = ".$socid;
         if (! empty($elementtype))
         {
@@ -921,7 +921,7 @@ class ActionComm extends CommonObject
         if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
         $sql.= " WHERE a.percent >= 0 AND a.percent < 100";
-        $sql.= " AND a.entity IN (".getEntity('agenda', 1).")";
+        $sql.= " AND a.entity IN (".getEntity('agenda').")";
         if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
         if ($user->societe_id) $sql.=" AND a.fk_soc = ".$user->societe_id;
         if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
@@ -1281,7 +1281,7 @@ class ActionComm extends CommonObject
 			// We must filter on assignement table
 			if ($filters['logint'] || $filters['login']) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 			$sql.= " WHERE a.fk_action=c.id";
-            $sql.= " AND a.entity IN (".getEntity('agenda', 1).")";
+            $sql.= " AND a.entity IN (".getEntity('agenda').")";
             foreach ($filters as $key => $value)
             {
                 if ($key == 'notolderthan' && $value != '') $sql.=" AND a.datep >= '".$this->db->idate($now-($value*24*60*60))."'";
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index dccd98ebe96..f32c721a826 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -112,7 +112,7 @@ class AgendaEvents extends DolibarrApi
 
         $sql = "SELECT t.id as rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('agenda', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('agenda').')';
         if ($user_ids) $sql.=" AND t.fk_user_action IN (".$user_ids.")";
         if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
         // Insert sale filter
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 307d6417285..7c256e95837 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -456,7 +456,7 @@ if ($resourceid > 0) $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
 if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
 $sql.= ' WHERE a.fk_action = ca.id';
-$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
+$sql.= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (! empty($actioncode))
 {
@@ -648,7 +648,7 @@ if ($showbirthday)
     $sql = 'SELECT sp.rowid, sp.lastname, sp.firstname, sp.birthday';
     $sql.= ' FROM '.MAIN_DB_PREFIX.'socpeople as sp';
     $sql.= ' WHERE (priv=0 OR (priv=1 AND fk_user_creat='.$user->id.'))';
-    $sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
+    $sql.= " AND sp.entity IN (".getEntity('societe').")";
     if ($action == 'show_day')
     {
         $sql.= ' AND MONTH(birthday) = '.$month;
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 6ed846c0ebe..400b882d143 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -197,7 +197,7 @@ if ($resourceid > 0) $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
 if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
 $sql.= " WHERE c.id = a.fk_action";
-$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
+$sql.= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (! empty($actioncode))
 {
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 544da904cdc..01cc4db5303 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -364,7 +364,7 @@ if ($resourceid > 0) $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
 if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
 $sql.= ' WHERE a.fk_action = ca.id';
-$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
+$sql.= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (! empty($actioncode))
 {
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 2a707cd2d8f..e6444f26ad3 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -371,7 +371,7 @@ if ($resourceid > 0) $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
 if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
 $sql.= ' WHERE a.fk_action = ca.id';
-$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
+$sql.= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (! empty($actioncode))
 {
@@ -661,7 +661,7 @@ else
 	$sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
 	$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 	if ($usergroup > 0)	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
-	$sql.= " WHERE u.statut = 1 AND u.entity IN (".getEntity('user',1).")";
+	$sql.= " WHERE u.statut = 1 AND u.entity IN (".getEntity('user').")";
 	if ($usergroup > 0)	$sql.= " AND ug.fk_usergroup = ".$usergroup;
 	//print $sql;
 	$resql=$db->query($sql);
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 125355a3386..f6d01b18ca1 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -80,7 +80,7 @@ $sql.= " date_format(a.datep, '%Y') as year";
 $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a,";
 $sql.= " ".MAIN_DB_PREFIX."user as u";
 $sql.= " WHERE a.fk_user_author = u.rowid";
-$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
+$sql.= ' AND a.entity IN ('.getEntity('agenda').')';
 //$sql.= " AND percent = 100";
 $sql.= " GROUP BY year, month, df";
 $sql.= " ORDER BY year DESC, month DESC, df DESC";
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 7599cce4cfd..921b9eddb2f 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -762,7 +762,7 @@ if ($id > 0)
         $sql.= ', s.rowid as socid';
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."expedition as e";
         $sql.= " WHERE e.fk_soc = s.rowid AND s.rowid = ".$object->id;
-        $sql.= " AND e.entity IN (".getEntity('expedition', 1).")";
+        $sql.= " AND e.entity IN (".getEntity('expedition').")";
         $sql.= ' GROUP BY e.rowid';
         $sql.= ', e.ref';
         $sql.= ', e.date_creation';
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index fe66e3ac243..a13ffe61c76 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -78,7 +78,7 @@ if (! $user->rights->societe->client->voir && ! $socid) $sql .= " ".MAIN_DB_PREF
 $sql.= " ".MAIN_DB_PREFIX."socpeople as p";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 $sql.= " WHERE s.fk_stcomm = st.id";
-$sql.= " AND p.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND p.entity IN (".getEntity('societe').")";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($type == "c") $sql.= " AND s.client IN (1, 3)";
 if ($type == "p") $sql.= " AND s.client IN (2, 3)";
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 24bccbf9c9c..885be0dd37c 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -146,7 +146,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE p.fk_statut = 0";
 	$sql.= " AND p.fk_soc = s.rowid";
-	$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+	$sql.= " AND p.entity IN (".getEntity('propal').")";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid)	$sql.= " AND s.rowid = ".$socid;
 
@@ -227,7 +227,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
     if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     $sql.= " WHERE p.fk_statut = 0";
     $sql.= " AND p.fk_soc = s.rowid";
-    $sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+    $sql.= " AND p.entity IN (".getEntity('propal').")";
     if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
     if ($socid)	$sql.= " AND s.rowid = ".$socid;
 
@@ -306,7 +306,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
 	$sql.= " AND c.fk_statut = 0";
-	$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+	$sql.= " AND c.entity IN (".getEntity('commande').")";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid)	$sql.= " AND c.fk_soc = ".$socid;
 
@@ -387,7 +387,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
     if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     $sql.= " WHERE cf.fk_soc = s.rowid";
     $sql.= " AND cf.fk_statut = 0";
-    $sql.= " AND cf.entity IN (".getEntity('supplier_order', 1).")";
+    $sql.= " AND cf.entity IN (".getEntity('supplier_order').")";
     if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
     if ($socid)	$sql.= " AND cf.fk_soc = ".$socid;
 
@@ -611,7 +611,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO
 	$sql.= ", ".MAIN_DB_PREFIX."product as p";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('contract', 1).")";
+	$sql.= " AND c.entity IN (".getEntity('contract').")";
 	$sql.= " AND c.fk_product = p.rowid";
 	if (! $user->rights->societe->client->voir && ! $socid)	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND s.rowid = ".$socid;
@@ -669,7 +669,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE p.fk_soc = s.rowid";
-	$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+	$sql.= " AND p.entity IN (".getEntity('propal').")";
 	$sql.= " AND p.fk_statut = 1";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND s.rowid = ".$socid;
@@ -766,7 +766,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 	$sql.= ", ".MAIN_DB_PREFIX."commande as c";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+	$sql.= " AND c.entity IN (".getEntity('commande').")";
 	$sql.= " AND c.fk_statut = 1";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND s.rowid = ".$socid;
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index 453d1f75319..a36077f94db 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -466,7 +466,7 @@ class AdvanceTargetingMailing extends CommonObject
 
 		$sqlwhere=array();
 
-		$sqlwhere[]= 't.entity IN ('.getEntity('societe',1).')';
+		$sqlwhere[]= 't.entity IN ('.getEntity('societe').')';
 
 		if (count($arrayquery)>0) {
 
@@ -625,7 +625,7 @@ class AdvanceTargetingMailing extends CommonObject
 
 		$sqlwhere=array();
 
-		$sqlwhere[]= 't.entity IN ('.getEntity('socpeople',1).')';
+		$sqlwhere[]= 't.entity IN ('.getEntity('socpeople').')';
 
 		if (count($arrayquery)>0) {
 
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index df86464281a..61fa4ee5789 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1618,7 +1618,7 @@ if ($action == 'create')
 		$sql .= " FROM " . MAIN_DB_PREFIX . "propal p";
 		$sql .= ", " . MAIN_DB_PREFIX . "societe s";
 		$sql .= " WHERE s.rowid = p.fk_soc";
-		$sql .= " AND p.entity IN (".getEntity('propal', 1).")";
+		$sql .= " AND p.entity IN (".getEntity('propal').")";
 		$sql .= " AND p.fk_statut <> 0";
 		$sql .= " ORDER BY Id";
 
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 190f6cdca87..2f067f46b18 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -112,7 +112,7 @@ class Proposals extends DolibarrApi
         
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('propal', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('propal').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
         if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 224cb77eee1..fb1ac46cd91 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1276,7 +1276,7 @@ class Propal extends CommonObject
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid';
         $sql.= " WHERE p.fk_statut = c.id";
-        $sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+        $sql.= " AND p.entity IN (".getEntity('propal').")";
         if ($ref) $sql.= " AND p.ref='".$ref."'";
         else $sql.= " AND p.rowid=".$rowid;
 
@@ -2499,7 +2499,7 @@ class Propal extends CommonObject
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
 		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= " WHERE p.entity IN (".getEntity('propal', 1).")";
+        $sql.= " WHERE p.entity IN (".getEntity('propal').")";
         $sql.= " AND p.fk_soc = s.rowid";
         $sql.= " AND p.fk_statut = c.id";
         if (! $user->rights->societe->client->voir && ! $socid) //restriction
@@ -3025,7 +3025,7 @@ class Propal extends CommonObject
             $sql.= " WHERE sc.fk_user = " .$user->id;
             $clause = " AND";
         }
-        $sql.= $clause." p.entity IN (".getEntity('propal', 1).")";
+        $sql.= $clause." p.entity IN (".getEntity('propal').")";
         if ($mode == 'opened') $sql.= " AND p.fk_statut = ".self::STATUS_VALIDATED;
         if ($mode == 'signed') $sql.= " AND p.fk_statut = ".self::STATUS_SIGNED;
         if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
@@ -3096,7 +3096,7 @@ class Propal extends CommonObject
         $prodids = array();
         $sql = "SELECT rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product', 1).")";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -3194,7 +3194,7 @@ class Propal extends CommonObject
             $sql.= " WHERE sc.fk_user = " .$user->id;
             $clause = "AND";
         }
-        $sql.= " ".$clause." p.entity IN (".getEntity('propal', 1).")";
+        $sql.= " ".$clause." p.entity IN (".getEntity('propal').")";
 
         $resql=$this->db->query($sql);
         if ($resql)
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index e38297a3377..39ef49991b6 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -86,7 +86,7 @@ class PropaleStats extends Stats
     		$this->where.= " p.fk_statut > 0";    // Validated, accepted, refused and closed
         }        
 		//$this->where.= " AND p.fk_soc = s.rowid AND p.entity = ".$conf->entity;
-		$this->where.= " AND p.entity IN (".getEntity('propal', 1).")";
+		$this->where.= " AND p.entity IN (".getEntity('propal').")";
 		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if($this->socid)
 		{
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 145d1891be3..a54ceb32f0b 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -81,7 +81,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."propal as p";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE p.fk_soc = s.rowid";
-$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+$sql.= " AND p.entity IN (".getEntity('propal').")";
 if ($user->societe_id) $sql.=' AND p.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " AND p.fk_statut IN (0,1,2,3,4)";
@@ -157,7 +157,7 @@ if (! empty($conf->propal->enabled))
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('propal', 1).")";
+	$sql.= " AND c.entity IN (".getEntity('propal').")";
 	$sql.= " AND c.fk_statut = 0";
 	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -215,7 +215,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."propal as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity IN (".getEntity('propal', 1).")";
+$sql.= " AND c.entity IN (".getEntity('propal').")";
 //$sql.= " AND c.fk_statut > 2";
 if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -294,7 +294,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE p.fk_soc = s.rowid";
-	$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+	$sql.= " AND p.entity IN (".getEntity('propal').")";
 	$sql.= " AND p.fk_statut = 1";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND s.rowid = ".$socid;
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index d2a6c6e926f..6f14d918f4f 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -269,7 +269,7 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE p.fk_soc = s.rowid';
-$sql.= ' AND p.entity IN ('.getEntity('propal', 1).')';
+$sql.= ' AND p.entity IN ('.getEntity('propal').')';
 if (! $user->rights->societe->client->voir && ! $socid) //restriction
 {
 	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index 2364672ccf9..0ec6f20ae46 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -120,7 +120,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE p.fk_statut = 0";
 	$sql.= " AND p.fk_soc = s.rowid";
-	$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+	$sql.= " AND p.entity IN (".getEntity('propal').")";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 
 	$resql=$db->query($sql);
@@ -183,7 +183,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 	$sql.= " WHERE p.fk_soc = s.rowid";
 	$sql.= " AND p.fk_statut = c.id";
 	$sql.= " AND p.fk_statut = 1";
-	$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+	$sql.= " AND p.entity IN (".getEntity('propal').")";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND s.rowid = ".$socid;
 	$sql.= " ORDER BY p.rowid DESC";
diff --git a/htdocs/commande/class/api_deprecated_commande.class.php b/htdocs/commande/class/api_deprecated_commande.class.php
index c0b3a634825..11d3fe7260a 100644
--- a/htdocs/commande/class/api_deprecated_commande.class.php
+++ b/htdocs/commande/class/api_deprecated_commande.class.php
@@ -128,7 +128,7 @@ class CommandeApi extends DolibarrApi
         //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
         //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
-        $sql.= ' WHERE s.entity IN ('.getEntity('commande', 1).')';
+        $sql.= ' WHERE s.entity IN ('.getEntity('commande').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
         if ($socid) $sql.= " AND s.fk_soc = ".$socid;
         if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 1bd4e44a877..a1330a7be04 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -115,7 +115,7 @@ class Orders extends DolibarrApi
 
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('commande', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('commande').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
         if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index fea30eda589..93df2f1aa0b 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1564,7 +1564,7 @@ class Commande extends CommonOrder
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON (c.fk_availability = ca.rowid)';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON (c.fk_input_reason = ca.rowid)';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
-        $sql.= " WHERE c.entity IN (".getEntity('commande', 1).")";
+        $sql.= " WHERE c.entity IN (".getEntity('commande').")";
         if ($id)   	  $sql.= " AND c.rowid=".$id;
         if ($ref)     $sql.= " AND c.ref='".$this->db->escape($ref)."'";
         if ($ref_ext) $sql.= " AND c.ref_ext='".$this->db->escape($ref_ext)."'";
@@ -2369,7 +2369,7 @@ class Commande extends CommonOrder
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
 		if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= " WHERE c.entity IN (".getEntity('commande', 1).")";
+        $sql.= " WHERE c.entity IN (".getEntity('commande').")";
         $sql.= " AND c.fk_soc = s.rowid";
         if (! $user->rights->societe->client->voir && ! $socid) //restriction
         {
@@ -3222,7 +3222,7 @@ class Commande extends CommonOrder
             $sql.= " WHERE sc.fk_user = " .$user->id;
             $clause = " AND";
         }
-        $sql.= $clause." c.entity IN (".getEntity('commande', 1).")";
+        $sql.= $clause." c.entity IN (".getEntity('commande').")";
         //$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
         $sql.= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_ACCEPTED.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))";    // If status is 2 and facture=1, it must be selected
         if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
@@ -3506,7 +3506,7 @@ class Commande extends CommonOrder
         $prodids = array();
         $sql = "SELECT rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product', 1).")";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -3598,7 +3598,7 @@ class Commande extends CommonOrder
             $sql.= " WHERE sc.fk_user = " .$user->id;
             $clause = "AND";
         }
-        $sql.= " ".$clause." co.entity IN (".getEntity('commande', 1).")";
+        $sql.= " ".$clause." co.entity IN (".getEntity('commande').")";
 
         $resql=$this->db->query($sql);
         if ($resql)
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index 81488bdb1d6..b0c63625bb9 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -81,7 +81,7 @@ class CommandeStats extends Stats
 			$this->where.= " c.fk_statut > 2";    // Only approved & ordered
 		}
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
-		$this->where.= ' AND c.entity IN ('.getEntity('commande', 1).')';
+		$this->where.= ' AND c.entity IN ('.getEntity('commande').')';
 		
 		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($this->socid)
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 431a54b9f76..65d92f2a12c 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -75,7 +75,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."commande as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE s.fk_stcomm = st.id AND c.fk_soc = s.rowid";
-$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND s.entity IN (".getEntity('societe').")";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if (dol_strlen($stcomm))
 {
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 9f7f36f78ca..fee8e5314d1 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -85,7 +85,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."commande as c";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND c.entity IN (".getEntity('societe').")";
 if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY c.fk_statut, c.facture";
@@ -177,7 +177,7 @@ if (! empty($conf->commande->enabled))
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+	$sql.= " AND c.entity IN (".getEntity('commande').")";
 	$sql.= " AND c.fk_statut = 0";
 	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -247,7 +247,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."commande as c,";
 $sql.= " ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+$sql.= " AND c.entity IN (".getEntity('commande').")";
 //$sql.= " AND c.fk_statut > 2";
 if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -328,7 +328,7 @@ if (! empty($conf->commande->enabled))
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+	$sql.= " AND c.entity IN (".getEntity('commande').")";
 	$sql.= " AND c.fk_statut = 1";
 	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -410,7 +410,7 @@ if (! empty($conf->commande->enabled))
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+	$sql.= " AND c.entity IN (".getEntity('commande').")";
 	$sql.= " AND c.fk_statut = 2 ";
 	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index b9102e78ddc..daabf6357af 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -468,7 +468,7 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE c.fk_soc = s.rowid';
-$sql.= ' AND c.entity IN ('.getEntity('commande', 1).')';
+$sql.= ' AND c.entity IN ('.getEntity('commande').')';
 if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
 if ($socid > 0) $sql.= ' AND s.rowid = '.$socid;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index b05b6658ca7..9c79b030456 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -549,7 +549,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 	$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 	$sql.= ', '.MAIN_DB_PREFIX.'commande as c';
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= ' WHERE c.entity IN ('.getEntity('commande', 1).')';
+	$sql.= ' WHERE c.entity IN ('.getEntity('commande').')';
 	$sql.= ' AND c.fk_soc = s.rowid';
 
 	// Show orders with status validated, shipping started and delivered (well any order we can bill)
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index cb10fd8c3c7..eb14db2d3ac 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -90,7 +90,7 @@ $sql.= ", date_format(b.dateo,'%Y-%m') as dm";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 $sql.= " WHERE b.fk_account = ba.rowid";
-$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 $sql.= " AND b.amount >= 0";
 if (! empty($id))
 	$sql .= " AND b.fk_account IN (".$db->escape($id).")";
@@ -118,7 +118,7 @@ $sql.= ", date_format(b.dateo,'%Y-%m') as dm";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 $sql.= " WHERE b.fk_account = ba.rowid";
-$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 $sql.= " AND b.amount <= 0";
 if (! empty($id))
 	$sql .= " AND b.fk_account IN (".$db->escape($id).")";
@@ -250,7 +250,7 @@ $sql = "SELECT SUM(b.amount) as total";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 $sql.= " WHERE b.fk_account = ba.rowid";
-$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 if (! empty($id))
 	$sql.= " AND b.fk_account IN (".$db->escape($id).")";
 
@@ -290,7 +290,7 @@ else
 	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 	$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 	$sql.= " WHERE b.fk_account = ba.rowid";
-	$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 	if ($id && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$id.")";
 
 	$resql = $db->query($sql);
@@ -321,7 +321,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".($year-$annee)."-01-01 00:00:00'";
 		$sql.= " AND b.datev <= '".($year-$annee)."-12-31 23:59:59'";
 		$sql.= " AND b.amount > 0";
@@ -410,7 +410,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".($year-$annee)."-01-01 00:00:00'";
 		$sql.= " AND b.datev <= '".($year-$annee)."-12-31 23:59:59'";
 		$sql.= " AND b.amount < 0";
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index f98c48b1aba..da89c662438 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -463,7 +463,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu ON bu.fk_bank = b.rowid AND type = 'company'";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON bu.url_id = s.rowid";
 $sql.= " WHERE b.fk_account = ba.rowid";
-$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 if ($account > 0) $sql.=" AND b.fk_account = ".$account;
 // Search period criteria
 if (dol_strlen($search_dt_start)>0) $sql .= " AND b.dateo >= '" . $db->idate($search_dt_start) . "'";
@@ -861,7 +861,7 @@ if ($resql)
             $sqlforbalance.= " ".MAIN_DB_PREFIX."bank_account as ba,";
             $sqlforbalance.= " ".MAIN_DB_PREFIX."bank as b";
             $sqlforbalance.= " WHERE b.fk_account = ba.rowid";
-            $sqlforbalance.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+            $sqlforbalance.= " AND ba.entity IN (".getEntity('bank_account').")";
             $sqlforbalance.= " AND b.fk_account = ".$account;
             $sqlforbalance.= " AND b.datev < '" . $db->idate($db->jdate($objp->dv)) . "'";
             $resqlforbalance = $db->query($sqlforbalance);
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index b77ed4db1a5..b544c99dd4c 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1167,7 +1167,7 @@ class Account extends CommonObject
         $sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
         $sql.= " WHERE b.rappro=0";
         $sql.= " AND b.fk_account = ba.rowid";
-        $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+        $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
         $sql.= " AND (ba.rappro = 1 AND ba.courant != 2)";	// Compte rapprochable
         $sql.= " AND clos = 0";
         if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid;
@@ -1224,7 +1224,7 @@ class Account extends CommonObject
         $sql = "SELECT COUNT(ba.rowid) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
         $sql.= " WHERE ba.rappro > 0 and ba.clos = 0";
-        $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+        $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
         if (empty($conf->global->BANK_CAN_RECONCILIATE_CASHACCOUNT)) $sql.= " AND ba.courant != 2";
         $resql=$db->query($sql);
         if ($resql)
@@ -1615,7 +1615,7 @@ class AccountLine extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
         $sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
         $sql.= " WHERE b.fk_account = ba.rowid";
-        $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+        $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
         if ($num) $sql.= " AND b.num_chq='".$this->db->escape($num)."'";
         else if ($ref) $sql.= " AND b.rowid='".$this->db->escape($ref)."'";
         else $sql.= " AND b.rowid=".$rowid;
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 98ee2672d3b..869b86238ff 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -70,7 +70,7 @@ class BankAccounts extends DolibarrApi
         }
 
         $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."bank_account as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('bank_account', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('bank_account').')';
         // Add sql filters
         if ($sqlfilters) 
         {
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 91b6cb38ec2..12cfeda7b15 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -92,7 +92,7 @@ else
 	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 	$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 	$sql.= " WHERE b.fk_account = ba.rowid";
-	$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 	if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
 
 	$resql = $db->query($sql);
@@ -133,7 +133,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
 		$sql.= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
 		if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
@@ -164,7 +164,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev < '".$year."-".sprintf("%02s",$month)."-01'";
 		if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
 
@@ -276,7 +276,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".$year."-01-01 00:00:00'";
 		$sql.= " AND b.datev <= '".$year."-12-31 23:59:59'";
 		if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
@@ -307,7 +307,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev < '".$year."-01-01'";
 		if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
 
@@ -415,7 +415,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
 		$sql.= " GROUP BY date_format(b.datev,'%Y%m%d')";
 
@@ -538,7 +538,7 @@ else
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
 		$sql.= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
 		$sql.= " AND b.amount > 0";
@@ -576,7 +576,7 @@ else
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
 		$sql.= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
 		$sql.= " AND b.amount < 0";
@@ -656,7 +656,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".$year."-01-01 00:00:00'";
 		$sql.= " AND b.datev <= '".$year."-12-31 23:59:59'";
 		$sql.= " AND b.amount > 0";
@@ -685,7 +685,7 @@ else
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.datev >= '".$year."-01-01 00:00:00'";
 		$sql.= " AND b.datev <= '".$year."-12-31 23:59:59'";
 		$sql.= " AND b.amount < 0";
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 8ff5f1964fc..b3e07d81b36 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -152,7 +152,7 @@ $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // N
 $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as b";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bankcacount_extrafields as ef on (c.rowid = ef.fk_object)";
-$sql.= " WHERE entity IN (".getEntity('bank_account', 1).")";
+$sql.= " WHERE entity IN (".getEntity('bank_account').")";
 if ($statut == 'opened')  $sql.= " AND clos = 0";
 if ($statut == 'closed')  $sql.= " AND clos = 1";
 if ($search_ref != '')    $sql.=natural_search('b.ref', $search_ref);
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index a690478a53e..52864e52627 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -476,7 +476,7 @@ if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON s.fk_typepayment = pct.id";
 		$sql.= " , ".MAIN_DB_PREFIX."user as u";
-        $sql.= " WHERE s.entity IN (".getEntity('user',1).")";
+        $sql.= " WHERE s.entity IN (".getEntity('user').")";
         $sql.= " AND u.rowid = s.fk_user";
         if ($year > 0)
         {
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 59fb3af2f00..c305603c82c 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -93,7 +93,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE s.fk_stcomm = st.id AND s.client in (1, 3)";
-$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND s.entity IN (".getEntity('societe').")";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if (dol_strlen($stcomm))
 {
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index fa8911cecf7..2cfed45c9d4 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -223,7 +223,7 @@ class Deplacement extends CommonObject
 	{
 		$sql = "SELECT rowid, fk_user, type, fk_statut, km, fk_soc, dated, note_private, note_public, fk_projet, extraparams";
 		$sql.= " FROM ".MAIN_DB_PREFIX."deplacement";
-		$sql.= " WHERE entity IN (".getEntity('deplacement').")";
+		$sql.= " WHERE entity IN (".getEntity('deplacement', false)")";
 		if ($ref) $sql.= " AND ref ='".$this->db->escape($ref)."'";
 		else $sql.= " AND rowid = ".$id;
 
diff --git a/htdocs/compta/facture/class/api_deprecated_invoice.class.php b/htdocs/compta/facture/class/api_deprecated_invoice.class.php
index 36aa232de9e..360c065a5f2 100644
--- a/htdocs/compta/facture/class/api_deprecated_invoice.class.php
+++ b/htdocs/compta/facture/class/api_deprecated_invoice.class.php
@@ -120,7 +120,7 @@ class InvoiceApi extends DolibarrApi
         
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE s.entity IN ('.getEntity('facture', 1).')';
+        $sql.= ' WHERE s.entity IN ('.getEntity('facture').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
         if ($socid) $sql.= " AND s.fk_soc = ".$socid;
         if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index e2842df0530..55304136ed6 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -112,7 +112,7 @@ class Invoices extends DolibarrApi
         
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('facture', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('facture').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
 
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 927be3fa25e..6bc88e47490 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -955,7 +955,7 @@ class FactureRec extends CommonInvoice
 		
 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product', 1).")";
+		$sql.= " WHERE entity IN (".getEntity('product').")";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index e46b5718d22..36d59c36c9a 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3756,7 +3756,7 @@ class Facture extends CommonInvoice
 		$prodids = array();
 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product', 1).")";
+		$sql.= " WHERE entity IN (".getEntity('product').")";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -3964,7 +3964,7 @@ class Facture extends CommonInvoice
 	function newCycle()
 	{
 		$sql = 'SELECT max(situation_cycle_ref) FROM ' . MAIN_DB_PREFIX . 'facture as f';
-		$sql.= " WHERE f.entity in (".getEntity('facture').")";
+		$sql.= " WHERE f.entity in (".getEntity('facture', false)")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($resql->num_rows > 0)
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 1ab17765d8f..d772d53aba7 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -384,7 +384,7 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE f.fk_soc = s.rowid';
-$sql.= ' AND f.entity IN ('.getEntity('facture', 1).')';
+$sql.= ' AND f.entity IN ('.getEntity('facture').')';
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
 if ($socid > 0) $sql.= ' AND s.rowid = '.$socid;
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index eed3a79335c..b5767a6f0bc 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -416,7 +416,7 @@ if ($action == 'new')
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.fk_bank = b.rowid";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON (b.fk_account = ba.rowid)";
 	$sql.= " WHERE b.fk_type = 'CHQ'";
-	$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 	$sql.= " AND b.fk_bordereau = 0";
 	$sql.= " AND b.amount > 0";
 	if ($filterdate)          $sql.=" AND b.dateo = '".$db->idate($filterdate)."'";
@@ -656,7 +656,7 @@ else
 	$sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON (b.fk_account = ba.rowid)";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.fk_bank = b.rowid";
-	$sql.= " WHERE ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " WHERE ba.entity IN (".getEntity('bank_account').")";
 	$sql.= " AND b.fk_type= 'CHQ'";
 	$sql.= " AND b.fk_bordereau = ".$object->id;
 	$sql.= $db->order($sortfield, $sortorder);
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 4889693857b..20afa14e0ca 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -496,7 +496,7 @@ class RemiseCheque extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql.= " WHERE b.fk_account = ba.rowid";
-		$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+		$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql.= " AND b.fk_type = 'CHQ'";
 		$sql.= " AND b.fk_bordereau = 0";
 		$sql.= " AND b.amount > 0";
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 97dc3c1674f..e9f887e37f4 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -56,7 +56,7 @@ $sql = "SELECT count(b.rowid)";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
 $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 $sql.= " WHERE ba.rowid = b.fk_account";
-$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 $sql.= " AND b.fk_type = 'CHQ'";
 $sql.= " AND b.fk_bordereau = 0";
 $sql.= " AND b.amount > 0";
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 1b5a232b812..4fa13f3e842 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -263,7 +263,7 @@ if ($modecompta != 'CREANCES-DETTES')
     $sql.= " WHERE pf.rowid IS NULL";
     $sql.= " AND p.fk_bank = b.rowid";
     $sql.= " AND b.fk_account = ba.rowid";
-    $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+    $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
     if (! empty($date_start) && ! empty($date_end))
     	$sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
     $sql.= " GROUP BY name, idp";
@@ -654,7 +654,7 @@ if (! empty($conf->expensereport->enabled))
 		$sql = "SELECT p.rowid, p.ref, u.rowid as userid, u.firstname, u.lastname, date_format(date_valid,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
 		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
-		$sql.= " WHERE p.entity = ".getEntity('expensereport',1);
+		$sql.= " WHERE p.entity = ".getEntity('expensereport');
 		$sql.= " AND p.fk_statut>=5";
 
 		$column='p.date_valid';
@@ -664,7 +664,7 @@ if (! empty($conf->expensereport->enabled))
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
-		$sql.= " WHERE p.entity = ".getEntity('expensereport',1);
+		$sql.= " WHERE p.entity = ".getEntity('expensereport');
 		$sql.= " AND p.fk_statut>=5";
 
 		$column='pe.datep';
@@ -745,7 +745,7 @@ if (! empty($conf->don->enabled))
 	    $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
 	    $sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
 	    $sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
-	    $sql.= " WHERE p.entity = ".getEntity('donation',1);
+	    $sql.= " WHERE p.entity = ".getEntity('donation');
 	    $sql.= " AND fk_statut >= 2";	 
 	}
 	if (! empty($date_start) && ! empty($date_end))
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index fe64bb7b999..45cbbfe3a46 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -164,7 +164,7 @@ if ($modecompta != 'CREANCES-DETTES')
 	$sql.= " WHERE pf.rowid IS NULL";
 	$sql.= " AND p.fk_bank = b.rowid";
 	$sql.= " AND b.fk_account = ba.rowid";
-	$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 	$sql.= " GROUP BY dm";
 	$sql.= " ORDER BY dm";
 
@@ -536,7 +536,7 @@ if (! empty($conf->expensereport->enabled))
 		$sql = "SELECT date_format(date_valid,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
 		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
-		$sql.= " WHERE p.entity = ".getEntity('expensereport',1);
+		$sql.= " WHERE p.entity = ".getEntity('expensereport');
 		$sql.= " AND p.fk_statut>=5";
 
 		$column='p.date_valid';
@@ -547,7 +547,7 @@ if (! empty($conf->expensereport->enabled))
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
-		$sql.= " WHERE p.entity = ".getEntity('expensereport',1);
+		$sql.= " WHERE p.entity = ".getEntity('expensereport');
 		$sql.= " AND p.fk_statut>=5";
 
 		$column='pe.datep';
@@ -600,7 +600,7 @@ if (! empty($conf->don->enabled))
         $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
-		$sql.= " WHERE p.entity = ".getEntity('donation',1);
+		$sql.= " WHERE p.entity = ".getEntity('donation');
    	    $sql.= " AND fk_statut >= 2";
     }
     $sql.= " GROUP BY p.societe, p.firstname, p.lastname, dm";
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index ae7240c204a..824185c52aa 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -413,7 +413,7 @@ if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
 
         $sql = "SELECT s.rowid, s.amount, s.label, s.datep as datep, s.datev as datev, s.datesp, s.dateep, s.salary, u.salary as current_salary";
         $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s, ".MAIN_DB_PREFIX."user as u";
-        $sql.= " WHERE s.entity IN (".getEntity('user',1).")";
+        $sql.= " WHERE s.entity IN (".getEntity('user').")";
         $sql.= " AND u.rowid = s.fk_user";
         if ($year > 0)
         {
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index fff94c898c2..ad9a8fbd346 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -237,7 +237,7 @@ if ($modecompta != 'CREANCES-DETTES') {
     $sql.= " WHERE pf.rowid IS NULL";
     $sql.= " AND p.fk_bank = b.rowid";
     $sql.= " AND b.fk_account = ba.rowid";
-    $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+    $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 	if ($date_start && $date_end) {
 	    $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 548809f4317..b9fcf6b7aa3 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -306,7 +306,7 @@ if ($modecompta != 'CREANCES-DETTES') {
 	$sql.= " WHERE pf.rowid IS NULL";
 	$sql.= " AND p.fk_bank = b.rowid";
 	$sql.= " AND b.fk_account = ba.rowid";
-	$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 	if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	$sql.= " GROUP BY socid, name";
 	$sql.= " ORDER BY name";
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 2bb9a7d50a0..19c106a44dc 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -151,7 +151,7 @@ if ($modecompta != 'CREANCES-DETTES')
 	$sql.= " WHERE pf.rowid IS NULL";
 	$sql.= " AND p.fk_bank = b.rowid";
 	$sql.= " AND b.fk_account = ba.rowid";
-	$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")";
+	$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
 	$sql.= " GROUP BY dm";
 	$sql.= " ORDER BY dm";
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 9bcfee7ccae..2d46b91f922 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -247,7 +247,7 @@ if (! empty($search_categ)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_conta
 if (! empty($search_categ_thirdparty)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";       // We need this table joined to the select in order to filter by categ
 if (! empty($search_categ_supplier)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs2 ON s.rowid = cs2.fk_soc";       // We need this table joined to the select in order to filter by categ
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-$sql.= ' WHERE p.entity IN ('.getEntity('societe', 1).')';
+$sql.= ' WHERE p.entity IN ('.getEntity('societe').')';
 if (!$user->rights->societe->client->voir && !$socid) //restriction
 {
 	$sql .= " AND (sc.fk_user = " .$user->id." OR p.fk_soc IS NULL)";
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index db6464edb6a..762a22889c6 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -504,7 +504,7 @@ class Contrat extends CommonObject
 		if ($ref)
 		{
 			$sql.= " WHERE ref='".$this->db->escape($ref)."'";
-			$sql.= " AND entity IN (".getEntity('contract').")";
+			$sql.= " AND entity IN (".getEntity('contract', false)")";
 		}
 		else $sql.= " WHERE rowid=".$id;
 
@@ -2180,7 +2180,7 @@ class Contrat extends CommonObject
 		$prodids = array();
 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product', 1).")";
+		$sql.= " WHERE entity IN (".getEntity('product').")";
 		$sql.= " AND tosell = 1";
 		$resql = $this->db->query($sql);
 		if ($resql)
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 924958319a4..3cff590bc4b 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -107,7 +107,7 @@ $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql.= " AND (cd.statut != 4 OR (cd.statut = 4 AND (cd.date_fin_validite is null or cd.date_fin_validite >= '".$db->idate($now)."')))";
-$sql.= " AND c.entity IN (".getEntity('contract').")";
+$sql.= " AND c.entity IN (".getEntity('contract', false)")";
 if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY cd.statut";
@@ -144,7 +144,7 @@ $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql.= " AND (cd.statut = 4 AND cd.date_fin_validite < '".$db->idate($now)."')";
-$sql.= " AND c.entity IN (".getEntity('contract').")";
+$sql.= " AND c.entity IN (".getEntity('contract', false)")";
 if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY cd.statut";
@@ -230,7 +230,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE s.rowid = c.fk_soc";
-	$sql.= " AND c.entity IN (".getEntity('contract').")";
+	$sql.= " AND c.entity IN (".getEntity('contract', false)")";
 	$sql.= " AND c.statut = 0";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
@@ -302,7 +302,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= " ".MAIN_DB_PREFIX.
 $sql.= " ".MAIN_DB_PREFIX."contrat as c";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
 $sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity IN (".getEntity('contract').")";
+$sql.= " AND c.entity IN (".getEntity('contract', false)")";
 $sql.= " AND c.statut > 0";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND s.rowid = ".$socid;
@@ -372,7 +372,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= ") LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract').")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', false)")";
 $sql.= " AND cd.fk_contrat = c.rowid";
 $sql.= " AND c.fk_soc = s.rowid";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -450,7 +450,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract').")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', false)")";
 $sql.= " AND c.statut = 1";
 $sql.= " AND cd.statut = 0";
 $sql.= " AND cd.fk_contrat = c.rowid";
@@ -529,7 +529,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract').")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', false)")";
 $sql.= " AND c.statut = 1";
 $sql.= " AND cd.statut = 4";
 $sql.= " AND cd.date_fin_validite < '".$db->idate($now)."'";
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 43cce90bd1c..e0711f63704 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -222,7 +222,7 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= " WHERE c.fk_soc = s.rowid ";
-$sql.= ' AND c.entity IN ('.getEntity('contract', 1).')';
+$sql.= ' AND c.entity IN ('.getEntity('contract').')';
 if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
 if ($socid) $sql.= " AND s.rowid = ".$db->escape($socid);
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 0649d43a049..51e4a22d756 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -90,7 +90,7 @@ class box_clients extends ModeleBoxes
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql.= " WHERE s.client IN (1, 3)";
-			$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+			$sql.= " AND s.entity IN (".getEntity('societe').")";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if ($user->societe_id) $sql.= " AND s.rowid = $user->societe_id";
 			$sql.= " ORDER BY s.tms DESC";
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index d6c38a9fce8..c6aaf1ec24a 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -69,7 +69,7 @@ class box_contacts extends ModeleBoxes
 			$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
 			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")";
+			$sql.= " WHERE sp.entity IN (".getEntity('societe').")";
 			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND sp.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if ($user->societe_id) $sql.= " AND sp.fk_soc = ".$user->societe_id;
 			$sql.= " ORDER BY sp.tms DESC";
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 432d34897d0..530a99c8224 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -71,7 +71,7 @@ class box_fournisseurs extends ModeleBoxes
             $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
             if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
             $sql.= " WHERE s.fournisseur = 1";
-            $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+            $sql.= " AND s.entity IN (".getEntity('societe').")";
             if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
             if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
             $sql.= " ORDER BY s.tms DESC ";
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 73208b1423a..6c19b46e468 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -86,7 +86,7 @@ class box_goodcustomers extends ModeleBoxes
 			$sql = "SELECT s.rowid, s.nom as name, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms as datem, s.status as status,";
 			$sql.= " count(*) as nbfact, sum(". $db->ifsql('f.paye=1','1','0').") as nbfactpaye";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
-			$sql.= ' WHERE s.entity IN ('.getEntity('societe', 1).')';
+			$sql.= ' WHERE s.entity IN ('.getEntity('societe').')';
 			$sql.= ' AND s.rowid = f.fk_soc';
 			$sql.= " GROUP BY s.rowid, s.nom, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms, s.status";
 			$sql.= $db->order("nbfact","DESC");
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 4c4e8085592..80c7b24249b 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -90,7 +90,7 @@ class box_project extends ModeleBoxes
 		    $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
 			$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
             if($user->socid) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=p.fk_soc";
-			$sql.= " WHERE p.entity IN (".getEntity('project',1).')';
+			$sql.= " WHERE p.entity IN (".getEntity('project').')';
             if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";     // public and assigned to, or restricted to company for external users
 			if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
             $sql.= " AND p.fk_statut = 1"; // Seulement les projets ouverts
@@ -130,7 +130,7 @@ class box_project extends ModeleBoxes
 
 					$sql ="SELECT count(*) as nb, sum(progress) as totprogress";
 					$sql.=" FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
-	           		$sql.= " WHERE p.entity IN (".getEntity('project',1).')';
+	           		$sql.= " WHERE p.entity IN (".getEntity('project').')';
     				$sql.=" AND p.rowid = ".$objp->rowid;
 					$resultTask = $db->query($sql);
 					if ($resultTask) {
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 1acd77addfc..abc99246c4a 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -90,7 +90,7 @@ class box_prospect extends ModeleBoxes
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql.= " WHERE s.client IN (2, 3)";
-			$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+			$sql.= " AND s.entity IN (".getEntity('societe').")";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
 			$sql.= " ORDER BY s.tms DESC";
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index fe93387cadb..01ffb706586 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -959,7 +959,7 @@ abstract class CommonObject
         $sql.= " WHERE ec.element_id = ".$id;
         $sql.= " AND ec.fk_socpeople = c.rowid";
         if ($source == 'internal') $sql.= " AND c.entity IN (0,".$conf->entity.")";
-        if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe', 1).")";
+        if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";
         $sql.= " AND ec.fk_c_type_contact = tc.rowid";
         $sql.= " AND tc.element = '".$element."'";
         $sql.= " AND tc.source = '".$source."'";
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cf6ae18f568..b72a451a41c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1042,7 +1042,7 @@ class Form
         $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
         $sql.= " FROM ".MAIN_DB_PREFIX ."societe as s";
         if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE s.entity IN (".getEntity('societe').")";
         if (! empty($user->societe_id)) $sql.= " AND s.rowid = ".$user->societe_id;
         if ($filter) $sql.= " AND (".$filter.")";
         if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -1282,7 +1282,7 @@ class Form
         if ($showsoc > 0) $sql.= " , s.nom as company";
         $sql.= " FROM ".MAIN_DB_PREFIX ."socpeople as sp";
         if ($showsoc > 0) $sql.= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX ."societe as s ON s.rowid=sp.fk_soc";
-        $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE sp.entity IN (".getEntity('societe').")";
         if ($socid > 0) $sql.= " AND sp.fk_soc=".$socid;
         if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut <> 0";
         $sql.= " ORDER BY sp.lastname ASC";
@@ -1905,7 +1905,7 @@ class Form
             $sql .= " LEFT JOIN llx_product_attribute_combination pac ON pac.fk_product_child = p.rowid";
         }
 
-        $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+        $sql.= ' WHERE p.entity IN ('.getEntity('product').')';
         if (count($warehouseStatusArray))
         {
             $sql.= ' AND (p.fk_product_type = 1 OR e.statut IN ('.implode(',',$warehouseStatusArray).'))';
@@ -2140,7 +2140,7 @@ class Form
             $sql = "SELECT price, price_ttc, price_base_type, tva_tx";
             $sql.= " FROM ".MAIN_DB_PREFIX."product_price";
             $sql.= " WHERE fk_product='".$objp->rowid."'";
-            $sql.= " AND entity IN (".getEntity('productprice', 1).")";
+            $sql.= " AND entity IN (".getEntity('productprice').")";
             $sql.= " AND price_level=".$price_level;
             $sql.= " ORDER BY date_price DESC, rowid DESC"; // Warning DESC must be both on date_price and rowid.
             $sql.= " LIMIT 1";
@@ -2364,7 +2364,7 @@ class Form
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
         if ($socid) $sql.= " AND pfp.fk_soc = ".$socid;
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
-        $sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+        $sql.= " WHERE p.entity IN (".getEntity('product').")";
         $sql.= " AND p.tobuy = 1";
         if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$this->db->escape($filtertype);
         if (! empty($filtre)) $sql.=" ".$filtre;
@@ -2574,7 +2574,7 @@ class Form
         $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
-        $sql.= " WHERE p.entity IN (".getEntity('productprice', 1).")";
+        $sql.= " WHERE p.entity IN (".getEntity('productprice').")";
         $sql.= " AND p.tobuy = 1";
         $sql.= " AND s.fournisseur = 1";
         $sql.= " AND p.rowid = ".$productid;
@@ -3316,7 +3316,7 @@ class Form
 
         $sql = "SELECT rowid, label, bank, clos as status";
         $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-        $sql.= " WHERE entity IN (".getEntity('bank_account', 1).")";
+        $sql.= " WHERE entity IN (".getEntity('bank_account').")";
         if ($statut != 2) $sql.= " AND clos = '".$statut."'";
         if ($filtre) $sql.=" AND ".$filtre;
         $sql.= " ORDER BY label";
@@ -4352,7 +4352,7 @@ class Form
 		$TCurrency = array();
 
 		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
-		$sql.= " WHERE entity IN ('".getEntity('mutlicurrency')."')";
+		$sql.= " WHERE entity IN ('".getEntity('mutlicurrency', false)"')";
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -5596,14 +5596,14 @@ class Form
     		if (($object->thirdparty->parent > 0) && ! empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) $listofidcompanytoscan.=','.$object->thirdparty->parent;
 
     		$possiblelinks=array(
-    		    'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('propal',1).')'),
-    		    'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande',1).')'),
-    		    'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.facnumber as ref, t.ref_client, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture',1).')'),
-    		    'contrat'=>array('enabled'=>$conf->contrat->enabled , 'perms'=>1, 'label'=>'LinkToContract', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('contract',1).')'),
-    		    'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('intervention',1).')'),
-    		    'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled , 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('supplier_proposal',1).')'),
-    		    'order_supplier'=>array('enabled'=>$conf->fournisseur->commande->enabled , 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande_fournisseur',1).')'),
-    		    'invoice_supplier'=>array('enabled'=>$conf->fournisseur->facture->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture_fourn',1).')')
+    		    'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('propal').')'),
+    		    'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande').')'),
+    		    'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.facnumber as ref, t.ref_client, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture').')'),
+    		    'contrat'=>array('enabled'=>$conf->contrat->enabled , 'perms'=>1, 'label'=>'LinkToContract', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('contract').')'),
+    		    'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('intervention').')'),
+    		    'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled , 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('supplier_proposal').')'),
+    		    'order_supplier'=>array('enabled'=>$conf->fournisseur->commande->enabled , 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande_fournisseur').')'),
+    		    'invoice_supplier'=>array('enabled'=>$conf->fournisseur->facture->enabled , 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture_fourn').')')
     		);
 		}
 
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index f3db5777783..2d444c1aefe 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -221,7 +221,7 @@ class FormAccounting extends Form
 		$options = array();
 
 		$sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
 		$sql .= ' ORDER BY import_key DESC';
 
 		dol_syslog(get_class($this) . "::select_bookkeeping_importkey", LOG_DEBUG);
@@ -344,7 +344,7 @@ class FormAccounting extends Form
 		// Auxiliary customer account
 		$sql = "SELECT DISTINCT code_compta, nom ";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-	    $sql .= " WHERE entity IN (" . getEntity("societe", 1) . ")";
+	    $sql .= " WHERE entity IN (" . getEntity('societe') . ")";
 		$sql .= " ORDER BY code_compta";
 		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -364,7 +364,7 @@ class FormAccounting extends Form
 		// Auxiliary supplier account
 		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql .= " WHERE entity IN (" . getEntity("societe", 1) . ")";
+		$sql .= " WHERE entity IN (" . getEntity('societe') . ")";
 		$sql .= " ORDER BY code_compta_fournisseur";
 		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -405,7 +405,7 @@ class FormAccounting extends Form
 
 		$sql = "SELECT DISTINCT date_format(doc_date,'%Y') as dtyear";
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+	    $sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
 		$sql .= " ORDER BY date_format(doc_date,'%Y')";
 		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index bcff0981a70..3ab47e1994b 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -629,7 +629,7 @@ class FormCompany
 			// Search to list thirdparties
 			$sql = "SELECT s.rowid, s.nom as name FROM";
 			$sql.= " ".MAIN_DB_PREFIX."societe as s";
-			$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+			$sql.= " WHERE s.entity IN (".getEntity('societe').")";
 			// For ajax search we limit here. For combo list, we limit later
 			if (is_array($limitto) && count($limitto))
 			{
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 3641ac87cef..feac8b20cec 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -843,7 +843,7 @@ class FormMail extends Form
 		$sql = "SELECT label, topic, content, content_lines, lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity("c_email_templates").")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', false)")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
@@ -910,7 +910,7 @@ class FormMail extends Form
 		$sql = "SELECT label, topic, content, lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity("c_email_templates").")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', false)")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
 		$sql.= $this->db->order("lang,label","ASC");
@@ -947,7 +947,7 @@ class FormMail extends Form
 		$sql = "SELECT rowid, label, topic, content, content_lines, lang, position";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity("c_email_templates").")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', false)")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 30481497163..119787874ea 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -153,7 +153,7 @@ class FormProjets
 		// Search all projects
 		$sql = 'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias';
 		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p LEFT JOIN '.MAIN_DB_PREFIX .'societe as s ON s.rowid = p.fk_soc';
-		$sql.= " WHERE p.entity IN (".getEntity('project', 1).")";
+		$sql.= " WHERE p.entity IN (".getEntity('project').")";
 		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
 		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
 		if ($socid > 0)
@@ -526,7 +526,7 @@ class FormProjets
 		    if (is_numeric($socid)) $sql.= " AND t.fk_soc=".$socid;
 		    else $sql.= " AND t.fk_soc IN (".$socid.")";
 		}
-		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) $sql.= ' AND t.entity IN ('.getEntity('project',1).')';
+		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) $sql.= ' AND t.entity IN ('.getEntity('project').')';
 		if ($linkedtothirdparty) $sql.=" AND s.rowid = t.fk_soc";
 		if ($sqlfilter) $sql.= " AND ".$sqlfilter;
 		$sql.= " ORDER BY ref DESC";
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 1205f0c5c63..6f2f9e56d61 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -147,7 +147,7 @@ class Notify
     		        if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
     		        else $sql.= " AND a.code = '".$notifcode."'";			// New usage
     	        }
-    	        $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+    	        $sql.= " AND s.entity IN (".getEntity('societe').")";
     	        if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
     
     			dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
@@ -192,7 +192,7 @@ class Notify
     			    if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
     			    else $sql.= " AND a.code = '".$notifcode."'";			// New usage
     			}
-    			$sql.= " AND c.entity IN (".getEntity('user', 1).")";
+    			$sql.= " AND c.entity IN (".getEntity('user').")";
     			if ($userid > 0) $sql.= " AND c.rowid = ".$userid;
     			
     			dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 3c37a18ab27..0a41969afd3 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1065,7 +1065,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         if (get_class($filterobj) == 'Adherent') $sql.= ", ".MAIN_DB_PREFIX."adherent as m";
         if (get_class($filterobj) == 'CommandeFournisseur') $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
         $sql.= " WHERE u.rowid = a.fk_user_action";
-        $sql.= " AND a.entity IN (".getEntity('agenda', 1).")";
+        $sql.= " AND a.entity IN (".getEntity('agenda').")";
         if (get_class($filterobj) == 'Societe'  && $filterobj->id) $sql.= " AND a.fk_soc = ".$filterobj->id;
         if (get_class($filterobj) == 'Project' && $filterobj->id) $sql.= " AND a.fk_project = ".$filterobj->id;
         if (get_class($filterobj) == 'Adherent') 
@@ -1478,7 +1478,7 @@ function show_subsidiaries($conf,$langs,$db,$object)
 	$sql = "SELECT s.rowid, s.nom as name, s.address, s.zip, s.town, s.code_client, s.canvas";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql.= " WHERE s.parent = ".$object->id;
-	$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+	$sql.= " AND s.entity IN (".getEntity('societe').")";
 	$sql.= " ORDER BY s.nom";
 
 	$result = $db->query($sql);
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index ad800708522..82f399417ba 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1946,7 +1946,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed=1;
 		}
 		$original_file=$conf->societe->multidir_output[$entity].'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe', 1).")";
+		$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe').")";
 	}
 
 	// Wrapping for contact
@@ -2087,7 +2087,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed=1;
 		}
 		$original_file=$conf->projet->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project', 1).")";
+		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
 	}
 	else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
@@ -2096,7 +2096,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed=1;
 		}
 		$original_file=$conf->projet->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project', 1).")";
+		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
 	}
 
 	// Wrapping pour les commandes fournisseurs
@@ -2210,7 +2210,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed=1;
 		}
 		$original_file=$conf->contrat->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract', 1).")";
+		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
 	}
 
 	// Wrapping pour les dons
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 041235f40f6..97070483aaf 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -110,10 +110,10 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
  *                              'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
  *                              'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
  *                              'email_template', 'event',
- * 	@param	int		$shared		0=Return id of entity, 1=Return id entity + shared entities
+ * 	@param	int		$shared		true=Return id entity + shared entities (by default), false=Return id of current entity or referent entity if current element is "societe"
  * 	@return	mixed				Entity id(s) to use
  */
-function getEntity($element=false, $shared=0)
+function getEntity($element=false, $shared=true)
 {
 	global $conf, $mc;
 
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 3455979afbe..78de61a729f 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -184,7 +184,7 @@ function show_list_sending_receive($origin,$origin_id,$filter='')
 	//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
 	//TODO Add link to expeditiondet_batch
-	$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")";
+	$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
 	$sql.= " AND obj.fk_".$origin." = ".$origin_id;
 	$sql.= " AND obj.rowid = ed.fk_origin_line";
 	$sql.= " AND ed.fk_expedition = e.rowid";
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index 578ed1a16ff..15d3ce53fa8 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -153,7 +153,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 		$sql = "SELECT MAX(CAST(SUBSTRING(facnumber FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
 		$sql.= " WHERE facnumber LIKE '".$prefix."____-%'";
-		$sql.= " AND entity IN (".getEntity('facture', 1).")";
+		$sql.= " AND entity IN (".getEntity('facture').")";
 
 		$resql=$db->query($sql);
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
@@ -177,7 +177,7 @@ class mod_facture_mars extends ModeleNumRefFactures
             $sql = "SELECT facnumber as ref";
             $sql.= " FROM ".MAIN_DB_PREFIX."facture";
             $sql.= " WHERE facnumber LIKE '".$prefix."____-".$num."'";
-            $sql.= " AND entity IN (".getEntity('facture', 1).")";
+            $sql.= " AND entity IN (".getEntity('facture').")";
 
             dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
             $resql=$db->query($sql);
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index c0497f5fb5c..b2a2f22cd12 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -169,7 +169,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 		$sql = "SELECT MAX(CAST(SUBSTRING(facnumber FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
 		$sql.= " WHERE facnumber LIKE '".$prefix."____-%'";
-		$sql.= " AND entity IN (".getEntity('facture', 1).")";
+		$sql.= " AND entity IN (".getEntity('facture').")";
 
 		$resql=$db->query($sql);
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
@@ -193,7 +193,7 @@ class mod_facture_terre extends ModeleNumRefFactures
             $sql = "SELECT facnumber as ref";
             $sql.= " FROM ".MAIN_DB_PREFIX."facture";
             $sql.= " WHERE facnumber LIKE '".$prefix."____-".$num."'";
-            $sql.= " AND entity IN (".getEntity('facture', 1).")";
+            $sql.= " AND entity IN (".getEntity('facture').")";
 
             dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
             $resql=$db->query($sql);
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 737b239498f..497d3c54f54 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -71,7 +71,7 @@ class mailing_advthirdparties extends MailingTargets
 			{
 				$sql= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact";
 				$sql.= " FROM ".MAIN_DB_PREFIX."societe as s LEFT OUTER JOIN ".MAIN_DB_PREFIX."societe_extrafields se ON se.fk_object=s.rowid";
-				$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+				$sql.= " WHERE s.entity IN (".getEntity('societe').")";
 				$sql.= " AND s.rowid IN (".implode(',',$socid).")";
 				$sql.= " ORDER BY email";
 
@@ -122,7 +122,7 @@ class mailing_advthirdparties extends MailingTargets
 			{
 				$sql= "SELECT socp.rowid as id, socp.email as email, socp.lastname as lastname, socp.firstname as firstname";
 				$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as socp";
-				$sql.= " WHERE socp.entity IN (".getEntity('societe', 1).")";
+				$sql.= " WHERE socp.entity IN (".getEntity('societe').")";
 				if (count($contactid)>0) {
 					$sql.= " AND socp.rowid IN (".implode(',',$contactid).")";
 				}
@@ -211,7 +211,7 @@ class mailing_advthirdparties extends MailingTargets
 		$sql = "SELECT count(distinct(s.email)) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql.= " WHERE s.email != ''";
-		$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+		$sql.= " AND s.entity IN (".getEntity('societe').")";
 
 		// La requete doit retourner un champ "nb" pour etre comprise
 		// par parent::getNbOfRecipients
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 02bcc17ec30..0e4966a5ada 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -72,7 +72,7 @@ class mailing_contacts1 extends MailingTargets
 		$statssql[0] = "SELECT '".$langs->trans("NbOfCompaniesContacts")."' as label,";
 		$statssql[0].= " count(distinct(c.email)) as nb";
 		$statssql[0].= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-		$statssql[0].= " WHERE c.entity IN (".getEntity('societe', 1).")";
+		$statssql[0].= " WHERE c.entity IN (".getEntity('societe').")";
 		$statssql[0].= " AND c.email != ''";      // Note that null != '' is false
 		$statssql[0].= " AND c.no_email = 0";
 		$statssql[0].= " AND c.statut = 1";
@@ -96,7 +96,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql  = "SELECT count(distinct(c.email)) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
-		$sql.= " WHERE c.entity IN (".getEntity('societe', 1).")";
+		$sql.= " WHERE c.entity IN (".getEntity('societe').")";
 		$sql.= " AND c.email != ''"; // Note that null != '' is false
 		$sql.= " AND c.no_email = 0";
 		$sql.= " AND c.statut = 1";
@@ -203,7 +203,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql.= " s.nom as companyname";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
-		$sql.= " WHERE c.entity IN (".getEntity('societe', 1).")";
+		$sql.= " WHERE c.entity IN (".getEntity('societe').")";
 		$sql.= " AND c.email <> ''";
 		$sql.= " AND c.no_email = 0";
 		$sql.= " AND c.statut = 1";
diff --git a/htdocs/core/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php
index 778b2182e1a..a9c05434cd3 100644
--- a/htdocs/core/modules/mailings/contacts2.modules.php
+++ b/htdocs/core/modules/mailings/contacts2.modules.php
@@ -83,7 +83,7 @@ class mailing_contacts2 extends MailingTargets
         $sql.= " s.nom as companyname";
     	$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
-        $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE sp.entity IN (".getEntity('societe').")";
     	$sql.= " AND sp.email <> ''";  // Note that null != '' is false
     	$sql.= " AND sp.no_email = 0";
     	$sql.= " AND sp.statut = 1";
@@ -140,7 +140,7 @@ class mailing_contacts2 extends MailingTargets
             $statssql[$i].= " WHERE s.rowid = sp.fk_soc";
             $statssql[$i].= " AND sp.email != ''";  // Note that null != '' is false
             $statssql[$i].= " AND (sp.poste IS NOT NULL AND sp.poste != '')";
-            $statssql[$i].= " AND sp.entity IN (".getEntity('societe', 1).")";
+            $statssql[$i].= " AND sp.entity IN (".getEntity('societe').")";
             $statssql[$i].= " GROUP BY label";
             $statssql[$i].= " ORDER BY nb DESC";
             $statssql[$i].= " LIMIT $i,1";
@@ -166,7 +166,7 @@ class mailing_contacts2 extends MailingTargets
     	$sql = "SELECT count(distinct(sp.email)) as nb";
     	$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
-        $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE sp.entity IN (".getEntity('societe').")";
     	$sql.= " AND sp.email != ''";  // Note that null != '' is false
     	$sql.= " AND sp.no_email = 0";
     	$sql.= " AND sp.statut = 1";
@@ -190,7 +190,7 @@ class mailing_contacts2 extends MailingTargets
 
         $sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-        $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE sp.entity IN (".getEntity('societe').")";
         $sql.= " AND sp.email != ''";    // Note that null != '' is false
         $sql.= " AND sp.no_email = 0";
         $sql.= " AND sp.statut = 1";
diff --git a/htdocs/core/modules/mailings/contacts3.modules.php b/htdocs/core/modules/mailings/contacts3.modules.php
index 2c142541023..c16f6869668 100644
--- a/htdocs/core/modules/mailings/contacts3.modules.php
+++ b/htdocs/core/modules/mailings/contacts3.modules.php
@@ -86,7 +86,7 @@ class mailing_contacts3 extends MailingTargets
     	$sql.= " WHERE sp.email <> ''";     // Note that null != '' is false
     	$sql.= " AND sp.no_email = 0";
     	$sql.= " AND sp.statut = 1";
-    	$sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
+    	$sql.= " AND sp.entity IN (".getEntity('societe').")";
     	$sql.= " AND sp.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
     	if ($filtersarray[0] <> 'all') $sql.= " AND cs.fk_categorie = c.rowid";
     	if ($filtersarray[0] <> 'all') $sql.= " AND cs.fk_soc = sp.fk_soc";
@@ -143,7 +143,7 @@ class mailing_contacts3 extends MailingTargets
             $statssql[$i].= " ".MAIN_DB_PREFIX."categorie_societe as cs";
             $statssql[$i].= " WHERE s.rowid = sp.fk_soc";
             $statssql[$i].= " AND sp.email != ''";    // Note that null != '' is false
-            $statssql[$i].= " AND sp.entity IN (".getEntity('societe', 1).")";
+            $statssql[$i].= " AND sp.entity IN (".getEntity('societe').")";
             $statssql[$i].= " AND cs.fk_categorie = c.rowid";
             $statssql[$i].= " AND cs.fk_soc = sp.fk_soc";
             $statssql[$i].= " GROUP BY c.label";
@@ -171,7 +171,7 @@ class mailing_contacts3 extends MailingTargets
     	$sql = "SELECT count(distinct(c.email)) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
-        $sql.= " WHERE c.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE c.entity IN (".getEntity('societe').")";
         $sql.= " AND c.email != ''"; // Note that null != '' is false
         $sql.= " AND c.no_email = 0";
         $sql.= " AND c.statut = 1";
@@ -182,7 +182,7 @@ class mailing_contacts3 extends MailingTargets
         $sql.= " ".MAIN_DB_PREFIX."categorie as c,";
         $sql.= " ".MAIN_DB_PREFIX."categorie_societe as cs";
         $sql.= " WHERE s.rowid = sp.fk_soc";
-        $sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " AND sp.entity IN (".getEntity('societe').")";
         $sql.= " AND sp.email != ''"; // Note that null != '' is false
         $sql.= " AND cs.fk_categorie = c.rowid";
         $sql.= " AND cs.fk_soc = sp.fk_soc";
@@ -211,7 +211,7 @@ class mailing_contacts3 extends MailingTargets
         $sql.= " WHERE sp.email != ''";     // Note that null != '' is false
         $sql.= " AND sp.no_email = 0";
         $sql.= " AND sp.statut = 1";
-        $sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " AND sp.entity IN (".getEntity('societe').")";
         $sql.= " AND cs.fk_categorie = c.rowid";
         $sql.= " AND cs.fk_soc = sp.fk_soc";
         $sql.= " GROUP BY c.label";
diff --git a/htdocs/core/modules/mailings/contacts4.modules.php b/htdocs/core/modules/mailings/contacts4.modules.php
index a79d48a03e4..f4c67874bfb 100644
--- a/htdocs/core/modules/mailings/contacts4.modules.php
+++ b/htdocs/core/modules/mailings/contacts4.modules.php
@@ -86,7 +86,7 @@ class mailing_contacts4 extends MailingTargets
     	$sql.= " WHERE sp.email != ''";     // Note that null != '' is false
     	$sql.= " AND sp.no_email = 0";
     	$sql.= " AND sp.statut = 1";
-    	$sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
+    	$sql.= " AND sp.entity IN (".getEntity('societe').")";
     	if ($filtersarray[0] <> 'all') $sql.= " AND c.label = '".$this->db->escape($filtersarray[0])."'";
     	$sql.= " ORDER BY sp.lastname, sp.firstname";
 
@@ -144,7 +144,7 @@ class mailing_contacts4 extends MailingTargets
             $statssql[$i].= " ".MAIN_DB_PREFIX."categorie_societe as cs";
             $statssql[$i].= " WHERE s.rowid = sp.fk_soc";
             $statssql[$i].= " AND sp.email != ''";    // Note that null != '' is false
-            $statssql[$i].= " AND sp.entity IN (".getEntity('societe', 1).")";
+            $statssql[$i].= " AND sp.entity IN (".getEntity('societe').")";
             $statssql[$i].= " AND cs.fk_categorie = c.rowid";
             $statssql[$i].= " AND cs.fk_soc = sp.fk_soc";
             $statssql[$i].= " GROUP BY c.label";
@@ -171,7 +171,7 @@ class mailing_contacts4 extends MailingTargets
         // If we want a filter "is inside at least one category", we must add it into formFilter
     	$sql = "SELECT count(distinct(c.email)) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-        $sql.= " WHERE c.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE c.entity IN (".getEntity('societe').")";
         $sql.= " AND c.email != ''"; // Note that null != '' is false
         $sql.= " AND c.no_email = 0";
         $sql.= " AND c.statut = 1";
@@ -182,7 +182,7 @@ class mailing_contacts4 extends MailingTargets
         $sql.= " ".MAIN_DB_PREFIX."categorie as c,";
         $sql.= " ".MAIN_DB_PREFIX."categorie_societe as cs";
         $sql.= " WHERE s.rowid = sp.fk_soc";
-        $sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " AND sp.entity IN (".getEntity('societe').")";
         $sql.= " AND sp.email != ''"; // Note that null != '' is false
         $sql.= " AND cs.fk_categorie = c.rowid";
         $sql.= " AND cs.fk_soc = sp.fk_soc";
@@ -211,7 +211,7 @@ class mailing_contacts4 extends MailingTargets
         $sql.= " WHERE sp.email != ''";     // Note that null != '' is false
         $sql.= " AND sp.no_email = 0";
         $sql.= " AND sp.statut = 1";
-        $sql.= " AND sp.entity IN (".getEntity('societe', 1).")";
+        $sql.= " AND sp.entity IN (".getEntity('societe').")";
         $sql.= " GROUP BY c.label";
         $sql.= " ORDER BY c.label";
 
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 2f9be84aab4..e1d3cd5861c 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -65,7 +65,7 @@ class mailing_thirdparties extends MailingTargets
 		    $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, null as label";
 		    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		    $sql.= " WHERE s.email <> ''";
-		    $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+		    $sql.= " AND s.entity IN (".getEntity('societe').")";
 		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		}
 		else
@@ -73,7 +73,7 @@ class mailing_thirdparties extends MailingTargets
 		    $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
 		    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
 		    $sql.= " WHERE s.email <> ''";
-		    $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+		    $sql.= " AND s.entity IN (".getEntity('societe').")";
 		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		    $sql.= " AND cs.fk_soc = s.rowid";
 		    $sql.= " AND c.rowid = cs.fk_categorie";
@@ -82,7 +82,7 @@ class mailing_thirdparties extends MailingTargets
 		    $sql.= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
 		    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_fournisseur as cs, ".MAIN_DB_PREFIX."categorie as c";
 		    $sql.= " WHERE s.email <> ''";
-		    $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+		    $sql.= " AND s.entity IN (".getEntity('societe').")";
 		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		    $sql.= " AND cs.fk_soc = s.rowid";
 		    $sql.= " AND c.rowid = cs.fk_categorie";
@@ -167,7 +167,7 @@ class mailing_thirdparties extends MailingTargets
 		$sql = "SELECT count(distinct(s.email)) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql.= " WHERE s.email != ''";
-		$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+		$sql.= " AND s.entity IN (".getEntity('societe').")";
 
 		// La requete doit retourner un champ "nb" pour etre comprise
 		// par parent::getNbOfRecipients
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 21a37301e38..786cfa1f756 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -48,7 +48,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
 
         // List of services
         $sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product', 1).")";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
         if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $sql.= " AND fk_product_type = 1";	// By default, only services
         $sql.= " ORDER BY ref";
         $result=$this->db->query($sql);
@@ -102,7 +102,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
         $sql = "SELECT s.rowid as id, s.email, s.nom as name, cd.rowid as cdid, cd.date_ouverture, cd.date_fin_validite, cd.fk_contrat";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
         $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
-        $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE s.entity IN (".getEntity('societe').")";
         $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
         $sql.= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
         $sql.= " AND cd.statut= 4 AND cd.fk_product=p.rowid AND p.ref = '".$product."'";
@@ -192,7 +192,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
         $sql = "SELECT count(*) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
         $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
-        $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE s.entity IN (".getEntity('societe').")";
         $sql.= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
         $sql.= " AND cd.statut= 4 AND cd.fk_product=p.rowid";
         $sql.= " AND p.ref IN ('".join("','",$this->arrayofproducts)."')";
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 9204cd02aa0..1780da06456 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -295,7 +295,7 @@ class modAccounting extends DolibarrModules
 
         $this->export_sql_start[$r]='SELECT DISTINCT ';
         $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'accounting_account as aa, '.MAIN_DB_PREFIX.'accounting_system as ac';
-        $this->export_sql_end[$r] .=' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting', 1).') ';
+        $this->export_sql_end[$r] .=' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting').') ';
 
 	}
 }
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index b75d674b41f..041892c35ee 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -290,7 +290,7 @@ class modAdherent extends DolibarrModules
         $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'subscription as c ON c.fk_adherent = a.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON a.state_id = d.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON a.country = co.rowid';
-        $this->export_sql_end[$r] .=' WHERE a.fk_adherent_type = ta.rowid AND ta.entity IN ('.getEntity('adherent', 1).') ';
+        $this->export_sql_end[$r] .=' WHERE a.fk_adherent_type = ta.rowid AND ta.entity IN ('.getEntity('adherent').') ';
         $this->export_dependencies_array[$r]=array('subscription'=>'c.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
         // Imports
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 339a208fc31..7513b489195 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -401,7 +401,7 @@ class modAgenda extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s on ac.fk_soc = s.rowid';
 		if (! empty($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co on s.fk_pays = co.rowid';
-		$this->export_sql_end[$r] .=' WHERE ac.entity IN ('.getEntity('agenda',1).')';
+		$this->export_sql_end[$r] .=' WHERE ac.entity IN ('.getEntity('agenda').')';
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR ac.fk_soc IS NULL)';
 		if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' AND acr.fk_element = '.(empty($user)?0:$user->id);
 		$this->export_sql_end[$r] .=' ORDER BY ac.datep';
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index a868bfd2f08..c9fde5f0087 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -162,7 +162,7 @@ class modBanque extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."bank_url as bu ON (bu.fk_bank = b.rowid AND bu.type = 'company')";
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON bu.url_id = s.rowid';
 		$this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account';
-		$this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account',1).')';
+		$this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account').')';
 		$this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve';
 
 		$r++;
@@ -189,7 +189,7 @@ class modBanque extends DolibarrModules
 		$this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account AND bch.rowid = b.fk_bordereau and bch.fk_bank_account=ba.rowid';
 		$this->export_sql_end[$r] .=" AND b.fk_type = 'CHQ'";
 		$this->export_sql_end[$r] .=' AND p.fk_paiement = 7';
-		$this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account',1).')';
+		$this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account').')';
 		$this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve';
 
 	}
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index edda1043d71..b56d405c354 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -129,7 +129,7 @@ class modCategorie extends DolibarrModules
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_fournisseur as cf, '.MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
 		$this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category',1).')';
+		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .=' AND u.type = 1';	// Supplier categories
 
 		$r++;
@@ -144,7 +144,7 @@ class modCategorie extends DolibarrModules
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_societe as cf, '.MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object ';
 		$this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category',1).')';
+		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .=' AND u.type = 2';	// Customer/Prospect categories
 
         // Add extra fields
@@ -201,7 +201,7 @@ class modCategorie extends DolibarrModules
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_product as cp, '.MAIN_DB_PREFIX.'product as p';
 		$this->export_sql_end[$r] .=' WHERE u.rowid = cp.fk_categorie AND cp.fk_product = p.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category',1).')';
+		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .=' AND u.type = 0';	// Supplier categories
 
 		$r++;
@@ -216,7 +216,7 @@ class modCategorie extends DolibarrModules
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_member as cp, '.MAIN_DB_PREFIX.'adherent as p';
 		$this->export_sql_end[$r] .=' WHERE u.rowid = cp.fk_categorie AND cp.fk_member = p.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category',1).')';
+		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .=' AND u.type = 3';	// Member categories
 
 		$r++;
@@ -352,7 +352,7 @@ class modCategorie extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_country as country ON p.fk_pays = country.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe as s ON s.rowid = p.fk_soc';
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'socpeople_extrafields as extra ON extra.fk_object = p.rowid';
-		$this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_socpeople = p.rowid AND u.entity IN ('.getEntity('category',1).')';
+		$this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_socpeople = p.rowid AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .= ' AND u.type = 4'; // contact categories
 
 		// Imports
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 1806bfdea71..e80833ae7c4 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -217,7 +217,7 @@ class modCommande extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('commande',1).')';
+		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('commande').')';
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.(empty($user)?0:$user->id);
 	}
 
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index 52127c4e6f4..1b17b773c77 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -200,7 +200,7 @@ class modContrat extends DolibarrModules
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'contratdet as cod';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cod.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .=' WHERE co.fk_soc = s.rowid and co.rowid = cod.fk_contrat';
-		$this->export_sql_end[$r] .=' AND co.entity IN ('.getEntity('contract',1).')';
+		$this->export_sql_end[$r] .=' AND co.entity IN ('.getEntity('contract').')';
 	}
 
 
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index 9563e11aaa2..ec8d665b1e0 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -132,7 +132,7 @@ class modDeplacement extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON d.fk_soc = s.rowid';
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' WHERE d.fk_user = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('deplacement',1).')';
+		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('deplacement').')';
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR d.fk_soc IS NULL)';
 		
 		if (! empty($user))   // Not defined during migration process
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 7320eba6736..94c86e6e3b1 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -277,7 +277,7 @@ class modExpedition extends DolibarrModules
 		  $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
 		}
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('expedition',1).')';
+		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('expedition').')';
 		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 	}
 
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index 0d9b808fb6a..cbaf141809f 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -186,7 +186,7 @@ class modExpenseReport extends DolibarrModules
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expensereport_det as ed LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as tf ON ed.fk_c_type_fees = tf.id';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON ed.fk_projet = p.rowid';
 		$this->export_sql_end[$r] .=' WHERE ed.fk_expensereport = d.rowid AND d.fk_user_author = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('expensereport',1).')';
+		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('expensereport').')';
 	}
 
 	/**
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index b16c7749e40..3af85a1944d 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -241,7 +241,7 @@ class modFacture extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('facture',1).')';
+		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('facture').')';
 		if(isset($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 		$r++;
 
@@ -271,7 +271,7 @@ class modFacture extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON b.rowid = p.fk_bank';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON ba.rowid = b.fk_account';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('facture',1).')';
+		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('facture').')';
 		if (isset($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 		$r++;
 	}
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 55deaf2403f..0d9f73b76e4 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -172,7 +172,7 @@ class modFicheinter extends DolibarrModules
         $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'fichinterdet as fd ON f.rowid = fd.fk_fichinter,';
         $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'societe as s';
         $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
-        $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('intervention',1).')';
+        $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('intervention').')';
         $r++;
 
     }
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index fc2572d3669..233b1601842 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -380,7 +380,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_det_extrafields as extraline ON fd.rowid = extraline.fk_object';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture_fourn';
-		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_invoice',1).')';
+		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_invoice').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 
 		$r++;
@@ -443,7 +443,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn as p ON pf.fk_paiementfourn = p.rowid';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
-        $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_invoice',1).')';
+        $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_invoice').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 
 		// Order
@@ -552,7 +552,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseurdet_extrafields as extraline ON fd.rowid = extraline.fk_object';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
-		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_order',1).')';
+		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_order').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 	}
 
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 30e64b5de2c..dae39fc00d4 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -187,7 +187,7 @@ class modProduct extends DolibarrModules
 		if (! empty($conf->global->MAIN_MULTILANGS)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_lang as l ON l.fk_product = p.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object';
 		if (! empty($conf->fournisseur->enabled)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
-		$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity("product", 1).')';
+		$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity('product').')';
 		if (! empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_sql_order[$r] =' GROUP BY p.rowid'; 	// FIXME The group by used a generic value to say "all fields in select except function fields"
 		    
 		if (! empty($conf->global->PRODUIT_MULTIPRICES))
@@ -215,7 +215,7 @@ class modProduct extends DolibarrModules
 			$this->export_sql_start[$r]='SELECT DISTINCT ';
 			$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p';
 			$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_price as pr ON p.rowid = pr.fk_product';
-			$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity("product", 1).')';
+			$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity('product').')';
 		}
 
 		if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
@@ -244,7 +244,7 @@ class modProduct extends DolibarrModules
     		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p';
     		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object,';
     		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'product_association as pa, '.MAIN_DB_PREFIX.'product as p2';
-    		$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity("product", 1).')';
+    		$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity('product').')';
     		$this->export_sql_end[$r] .=' AND p.rowid = pa.fk_product_pere AND p2.rowid = pa.fk_product_fils';
 		}		
 
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 96e5a96b384..071912e1c00 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -231,7 +231,7 @@ class modProjet extends DolibarrModules
 	    // Add multicompany field
         if (! empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED))
         {
-            $nbofallowedentities=count(explode(',',getEntity('project',1)));    // If project are shared, nb will be > 1
+            $nbofallowedentities=count(explode(',',getEntity('project')));    // If project are shared, nb will be > 1
             if (! empty($conf->multicompany->enabled) && $nbofallowedentities > 1) $this->export_fields_array[$r]+=array('p.entity'=>'Entity');
         }
 		if (empty($conf->global->PROJECT_USE_OPPORTUNITIES))
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 3dd39b336bc..43ba37aa26e 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -209,7 +209,7 @@ class modPropale extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('propal',1).')';
+		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('propal').')';
 		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
 	}
 
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index 020fa92e9f3..7ab7afc1e4b 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -271,7 +271,7 @@ class modResource extends DolibarrModules
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'resource as r ';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_resource as c ON c.rowid=r.fk_code_type_resource';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'resource_extrafields as extra ON extra.fk_object = c.rowid';
-		$this->export_sql_end[$r] .=' AND r.entity IN ('.getEntity('resource',1).')';
+		$this->export_sql_end[$r] .=' AND r.entity IN ('.getEntity('resource').')';
 		
 
 		// Imports
diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index d5e982bcccc..bf37a7e73d8 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -158,7 +158,7 @@ class modSalaries extends DolibarrModules
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'user as u';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'payment_salary as p ON p.fk_user = u.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_typepayment = cp.id';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('user',1).')';
+		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('user').')';
 	}
 
 
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index c385ece4b26..f9c6a608085 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -194,7 +194,7 @@ class modService extends DolibarrModules
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p';
         $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object';
 		if (! empty($conf->fournisseur->enabled)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
-        $this->export_sql_end[$r] .=' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity("product", 1).')';
+        $this->export_sql_end[$r] .=' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity('product').')';
 
 
 		if (empty($conf->product->enabled))	// We enable next import templates only if module product not already enabled (to avoid duplicate entries)
@@ -222,7 +222,7 @@ class modService extends DolibarrModules
 				$this->export_sql_start[$r]='SELECT DISTINCT ';
 				$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p';
 				$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_price as pr ON p.rowid = pr.fk_product';
-				$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity("product", 1).')';
+				$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity('product').')';
 			}
 		}
 
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index a2239514898..c4c93537444 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -263,7 +263,7 @@ class modSociete extends DolibarrModules
 		// Add multicompany field
 		if (! empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED))
 		{
-		    $nbofallowedentities=count(explode(',',getEntity('societe',1)));    // If project are shared, nb will be > 1
+		    $nbofallowedentities=count(explode(',',getEntity('societe')));    // If project are shared, nb will be > 1
 		    if (! empty($conf->multicompany->enabled) && $nbofallowedentities > 1) $this->export_fields_array[$r]+=array('s.entity'=>'Entity');
 		}
 		$keyforselect='societe'; $keyforelement='company'; $keyforaliasextra='extra';
@@ -286,7 +286,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON sc.fk_user = u.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as payterm ON s.cond_reglement = payterm.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as paymode ON s.mode_reglement = paymode.id';
-		$this->export_sql_end[$r] .=' WHERE s.entity IN ('.getEntity('societe', 1).')';
+		$this->export_sql_end[$r] .=' WHERE s.entity IN ('.getEntity('societe').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' ';
 			if (! empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) {
@@ -323,7 +323,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON c.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON c.fk_pays = co.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = c.rowid';
-		$this->export_sql_end[$r] .=' WHERE c.entity IN ('.getEntity("societe", 1).')';
+		$this->export_sql_end[$r] .=' WHERE c.entity IN ('.getEntity('societe').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .=' AND (sc.fk_user = '.$user->id.' ';
 			if (! empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) {
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index be6817062b6..8362343f8cb 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -176,7 +176,7 @@ class modStock extends DolibarrModules
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'entrepot as e';
 		$this->export_sql_end[$r] .=' WHERE p.rowid = ps.fk_product AND ps.fk_entrepot = e.rowid';
-		$this->export_sql_end[$r] .=' AND e.entity IN ('.getEntity('stock',1).')';
+		$this->export_sql_end[$r] .=' AND e.entity IN ('.getEntity('stock').')';
 
 		if ($conf->productbatch->enabled)
 		{
@@ -196,7 +196,7 @@ class modStock extends DolibarrModules
 			$this->export_sql_start[$r]='SELECT DISTINCT ';
 			$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'entrepot as e, '.MAIN_DB_PREFIX.'product_batch as pb';
 			$this->export_sql_end[$r] .=' WHERE p.rowid = ps.fk_product AND ps.fk_entrepot = e.rowid AND ps.rowid = pb.fk_product_stock';
-			$this->export_sql_end[$r] .=' AND e.entity IN ('.getEntity('stock',1).')';
+			$this->export_sql_end[$r] .=' AND e.entity IN ('.getEntity('stock').')';
 		}
 
 		// Imports
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index bb8f31e466d..8dfc7283b90 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -139,7 +139,7 @@ class modTax extends DolibarrModules
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'c_chargesociales as cc, '.MAIN_DB_PREFIX.'chargesociales as c';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementcharge as p ON p.fk_charge = c.rowid';
 		$this->export_sql_end[$r] .=' WHERE c.fk_type = cc.id';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('tax',1).')';
+		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('tax').')';
 		
 		// Import social contributions
 		$r++;
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 55d4d45d28e..1bd4281b507 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -229,7 +229,7 @@ class modUser extends DolibarrModules
         }
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'user as u';
-		$this->export_sql_end[$r] .=' WHERE u.entity IN ('.getEntity('user',1).')';
+		$this->export_sql_end[$r] .=' WHERE u.entity IN ('.getEntity('user').')';
 		
 		// Imports
 		//--------
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 88ec1a6e8db..e942e747794 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -123,7 +123,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
         $sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max";   // This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
 		$sql.= " WHERE ".$field." LIKE '".$prefix."____-%'";
-		$sql.= " AND entity IN (".getEntity('societe', 1).")";
+		$sql.= " AND entity IN (".getEntity('societe').")";
 
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 
@@ -224,7 +224,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 
 		$sql = "SELECT code_client FROM ".MAIN_DB_PREFIX."societe";
 		$sql.= " WHERE code_client = '".$code."'";
-		$sql.= " AND entity IN (".getEntity('societe', 1).")";
+		$sql.= " AND entity IN (".getEntity('societe').")";
 		if ($soc->id > 0) $sql.= " AND rowid <> ".$soc->id;
 
 		dol_syslog(get_class($this)."::verif_dispo", LOG_DEBUG);
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index bfcbd6b7059..695314bb526 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -818,7 +818,7 @@ class Don extends CommonObject
         $sql = "SELECT count(d.rowid) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."don as d";
         $sql.= " WHERE d.fk_statut > 0";
-        $sql.= " AND d.entity IN (".getEntity('don', 1).")";
+        $sql.= " AND d.entity IN (".getEntity('don').")";
 
         $resql=$this->db->query($sql);
         if ($resql)
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index a48d3171020..9a8c503ac2e 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -263,7 +263,7 @@ class EcmFiles //extends CommonObject
 		$sql.= ' WHERE 1 = 1';
 		/* Fetching this table depends on filepath+filename, it must not depends on entity
 		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("ecmfiles", 1) . ")";
+		    $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
 		}*/
 		if ($fullpath) {
 			$sql .= " AND t.filepath = '" . $this->db->escape(dirname($fullpath)) . "' AND t.filename = '".$this->db->escape(basename($fullpath))."'";
@@ -371,7 +371,7 @@ class EcmFiles //extends CommonObject
 		$sql.= ' WHERE 1 = 1';
 		/* Fetching this table depends on filepath+filename, it must not depends on entity
 		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("ecmfiles", 1) . ")";
+		    $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
 		}*/
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 8a5811a790a..b4345c72878 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1780,7 +1780,7 @@ else if ($id || $ref)
     		$sql.= ", ".MAIN_DB_PREFIX.$origin."det as obj";
     		//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
     		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
-    		$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")";
+    		$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
     		$sql.= " AND obj.fk_".$origin." = ".$origin_id;
     		$sql.= " AND obj.rowid = ed.fk_origin_line";
     		$sql.= " AND ed.fk_expedition = e.rowid";
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 2b7ada7a0c2..06cddeace91 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -491,7 +491,7 @@ class Expedition extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
-		$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")";
+		$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
 		if ($id)   	  $sql.= " AND e.rowid=".$id;
         if ($ref)     $sql.= " AND e.ref='".$this->db->escape($ref)."'";
         if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
@@ -1583,7 +1583,7 @@ class Expedition extends CommonObject
 		$prodids = array();
 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product', 1).")";
+		$sql.= " WHERE entity IN (".getEntity('product').")";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 039a038f18a..7eaba0b29ad 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -77,7 +77,7 @@ if (!$user->rights->societe->client->voir && !$socid)
 	$clause = " AND ";
 }
 $sql.= $clause." e.fk_statut = 0";
-$sql.= " AND e.entity IN (".getEntity('expedition', 1).")";
+$sql.= " AND e.entity IN (".getEntity('expedition').")";
 if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 
 $resql=$db->query($sql);
@@ -242,7 +242,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_ta
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
-$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")";
+$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND sc.fk_user = " .$user->id;
 $sql.= " AND e.fk_statut = 1";
 if ($socid) $sql.= " AND c.fk_soc = ".$socid;
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index c838c002cc9..c46a8b6bcde 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -197,7 +197,7 @@ if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no p
 {
 	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
-$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")";
+$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
 if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
 {
 	$sql.= " AND e.fk_soc = sc.fk_soc";
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 763b550d34e..58783ba69b3 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -104,7 +104,7 @@ class ExpenseReports extends DolibarrApi
         
         $sql = "SELECT t.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('expensereport', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('expensereport').')';
         if ($user_ids) $sql.=" AND t.fk_user_author IN (".$user_ids.")";
         
         // Add sql filters
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index d62de0596e1..ffef31cad8b 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1859,7 +1859,7 @@ class ExpenseReport extends CommonObject
         $sql = "SELECT count(ex.rowid) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
         $sql.= " WHERE ex.fk_statut > 0";
-        $sql.= " AND ex.entity IN (".getEntity('expensereport', 1).")";
+        $sql.= " AND ex.entity IN (".getEntity('expensereport').")";
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -1900,7 +1900,7 @@ class ExpenseReport extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
         if ($option == 'toapprove') $sql.= " WHERE ex.fk_statut = 2";
         else $sql.= " WHERE ex.fk_statut = 5";
-        $sql.= " AND ex.entity IN (".getEntity('expensereport', 1).")";
+        $sql.= " AND ex.entity IN (".getEntity('expensereport').")";
         $sql.= " AND (ex.fk_user_author IN (".join(',',$userchildids).")";
         $sql.= " OR ex.fk_user_validator IN (".join(',',$userchildids)."))";
 
diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
index d68483cb32b..d29e1202bf4 100644
--- a/htdocs/expensereport/class/expensereportstats.class.php
+++ b/htdocs/expensereport/class/expensereportstats.class.php
@@ -61,7 +61,7 @@ class ExpenseReportStats extends Stats
 
 		//$this->where = " e.fk_statut > 0";
 		//$this->where.= " AND e.date_valid > '2000-01-01'";    // To filter only correct "valid date". If date is invalid, the group by on it will fails. Launch a repair.php if you have. 
-		$this->where.= ' e.entity IN ('.getEntity('expensereport', 1).')';
+		$this->where.= ' e.entity IN ('.getEntity('expensereport').')';
 		
 		//$this->where.= " AND entity = ".$conf->entity;
 		if ($this->socid)
diff --git a/htdocs/expensereport/export_csv.php b/htdocs/expensereport/export_csv.php
index d55e262e2e4..26df07cbcfb 100644
--- a/htdocs/expensereport/export_csv.php
+++ b/htdocs/expensereport/export_csv.php
@@ -128,7 +128,7 @@ if (isset($_POST['action']))
 
 		$sql = "SELECT d.rowid, d.ref, d.total_ht, d.total_tva, d.total_ttc";
 		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
-        $sql.= ' AND d.entity IN ('.getEntity('expensereport', 1).')';
+        $sql.= ' AND d.entity IN ('.getEntity('expensereport').')';
 		$sql.= " ORDER BY d.rowid";
 
 		$result = $db->query($sql);
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 724fb234798..e08c5563de4 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -70,7 +70,7 @@ $label=$somme=$nb=array();
 $totalnb=$totalsum=0;
 $sql = "SELECT tf.code, tf.label, count(de.rowid) as nb, sum(de.total_ht) as km";
 $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."expensereport_det as de, ".MAIN_DB_PREFIX."c_type_fees as tf";
-$sql.= " WHERE de.fk_expensereport = d.rowid AND d.entity IN (".getEntity('expensereport', 1).") AND de.fk_c_type_fees = tf.id";
+$sql.= " WHERE de.fk_expensereport = d.rowid AND d.entity IN (".getEntity('expensereport').") AND de.fk_c_type_fees = tf.id";
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
     && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
@@ -158,7 +158,7 @@ if (empty($user->rights->expensereport->readall) && empty($user->rights->expense
     $childids[]=$user->id;
     $sql.= " AND d.fk_user_author IN (".join(',',$childids).")\n";
 }
-$sql.= ' AND d.entity IN ('.getEntity('expensereport', 1).')';
+$sql.= ' AND d.entity IN ('.getEntity('expensereport').')';
 if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_user_author = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND d.fk_user_author = ".$socid;
 $sql.= $db->order($sortfield,$sortorder);
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index f95952db482..e1039ca304d 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -194,7 +194,7 @@ $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_extrafields as ef on (d.rowid = ef.fk_object)";
 $sql.= ", ".MAIN_DB_PREFIX."user as u";
-$sql.= " WHERE d.fk_user_author = u.rowid AND d.entity IN (".getEntity('expensereport', 1).")";
+$sql.= " WHERE d.fk_user_author = u.rowid AND d.entity IN (".getEntity('expensereport').")";
 // Search all
 if (!empty($sall)) $sql.= natural_search(array_keys($fieldstosearchall), $sall);
 // Ref
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index ce6e0da8c5a..d2f3a4c3567 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -214,7 +214,7 @@ dol_fiche_end();
 $sql = 'SELECT er.rowid as eid, er.paid, er.total_ttc, per.amount';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'payment_expensereport as per,'.MAIN_DB_PREFIX.'expensereport as er';
 $sql.= ' WHERE per.fk_expensereport = er.rowid';
-$sql.= ' AND er.entity IN ('.getEntity('expensereport', 1).')';
+$sql.= ' AND er.entity IN ('.getEntity('expensereport').')';
 $sql.= ' AND per.rowid = '.$id;
 
 dol_syslog("expensereport/payment/card.php", LOG_DEBUG);
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index fdac304ffcb..29e6b2174e3 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -209,7 +209,7 @@ if ($action == 'create' || empty($action))
 	$sql = "SELECT sum(p.amount) as total";
 	$sql.= " FROM ".MAIN_DB_PREFIX."payment_expensereport as p, ".MAIN_DB_PREFIX."expensereport as e";
 	$sql.= " WHERE p.fk_expensereport = e.rowid AND p.fk_expensereport = ".$chid;
-    $sql.= ' AND e.entity IN ('.getEntity('expensereport', 1).')';
+    $sql.= ' AND e.entity IN ('.getEntity('expensereport').')';
 	$resql = $db->query($sql);
 	if ($resql)
 	{
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index fe00c046117..53116dae843 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -82,7 +82,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."fichinter as f";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE f.fk_soc = s.rowid";
-$sql.= " AND f.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND f.entity IN (".getEntity('societe').")";
 if ($user->societe_id) $sql.=' AND f.fk_soc = '.$user->societe_id;
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY f.fk_statut";
@@ -171,7 +171,7 @@ if (! empty($conf->ficheinter->enabled))
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE f.fk_soc = s.rowid";
-	$sql.= " AND f.entity IN (".getEntity('intervention', 1).")";
+	$sql.= " AND f.entity IN (".getEntity('intervention').")";
 	$sql.= " AND f.fk_statut = 0";
 	if ($socid) $sql.= " AND f.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -219,7 +219,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."fichinter as f,";
 $sql.= " ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE f.fk_soc = s.rowid";
-$sql.= " AND f.entity IN (".getEntity('commande', 1).")";
+$sql.= " AND f.entity IN (".getEntity('commande').")";
 //$sql.= " AND c.fk_statut > 2";
 if ($socid) $sql .= " AND f.fk_soc = ".$socid;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -290,7 +290,7 @@ if (! empty($conf->ficheinter->enabled))
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE f.fk_soc = s.rowid";
-	$sql.= " AND f.entity IN (".getEntity('intervention', 1).")";
+	$sql.= " AND f.entity IN (".getEntity('intervention').")";
 	$sql.= " AND f.fk_statut = 1";
 	if ($socid) $sql.= " AND f.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index cfa88b187f0..0c1f3e56c5b 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -391,7 +391,7 @@ if ($object->id > 0)
 		$sql.= ' pfp.tms, pfp.ref_fourn as supplier_ref, pfp.price, pfp.quantity, pfp.unitprice';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp';
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = pfp.fk_product";
-		$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+		$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 		$sql.= ' AND pfp.fk_soc = '.$object->id;
 		$sql .= $db->order('pfp.tms', 'desc');
 		$sql.= $db->plimit($MAXLIST);
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 1eb1872126c..6f3291518ca 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -113,7 +113,7 @@ class SupplierInvoices extends DolibarrApi
         
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('supplier_invoice', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('supplier_invoice').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
         if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index c8d1ccb846a..7364199fca5 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -124,7 +124,7 @@ class Fournisseur extends Societe
 			$clause = "AND";
 		}
 		$sql.= " ".$clause." s.fournisseur = 1";
-		$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+		$sql.= " AND s.entity IN (".getEntity('societe').")";
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -189,7 +189,7 @@ class Fournisseur extends Societe
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE s.fournisseur = 1";
-		$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+		$sql.= " AND s.entity IN (".getEntity('societe').")";
 		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 
 		$resql=$this->db->query($sql);
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index cb47a2d99df..159f76249df 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2455,7 +2455,7 @@ class CommandeFournisseur extends CommonOrder
         $product=new ProductFournisseur($this->db);
         $sql = "SELECT rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product', 1).")";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
         $sql.=$this->db->order("rowid","ASC");
         $sql.=$this->db->plimit(1);
         $resql = $this->db->query($sql);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index f9df07e96cc..5c8a41a0466 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1966,7 +1966,7 @@ class FactureFournisseur extends CommonInvoice
 
         $sql = "SELECT rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product', 1).")";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
 
         $resql = $this->db->query($sql);
         if ($resql)
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 4f576148099..ae34f543c22 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -448,7 +448,7 @@ class ProductFournisseur extends Product
         $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.unitcharges, pfp.info_bits, pfp.delivery_time_days, pfp.supplier_reputation";
         $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= ", ".MAIN_DB_PREFIX."societe as s";
-        $sql.= " WHERE pfp.entity IN (".getEntity('productprice', 1).")";
+        $sql.= " WHERE pfp.entity IN (".getEntity('productprice').")";
         $sql.= " AND pfp.fk_soc = s.rowid";
         $sql.= " AND s.status=1"; // only enabled company selected
         $sql.= " AND pfp.fk_product = ".$prodid;
@@ -557,7 +557,7 @@ class ProductFournisseur extends Product
         $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges, pfp.unitcharges, ";
         $sql.= " pfp.remise, pfp.remise_percent, pfp.fk_supplier_price_expression, pfp.delivery_time_days";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
-        $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+        $sql.= " WHERE s.entity IN (".getEntity('societe').")";
         $sql.= " AND pfp.fk_product = ".$prodid;
         $sql.= " AND pfp.fk_soc = s.rowid";
         $sql.= " AND s.status = 1"; // only enabled society
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 544d882cda3..2375168fca3 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -524,7 +524,7 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE cf.fk_soc = s.rowid';
-$sql.= ' AND cf.entity IN ('.getEntity('supplier_order', 1).')';
+$sql.= ' AND cf.entity IN ('.getEntity('supplier_order').')';
 if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($search_ref) $sql .= natural_search('cf.ref', $search_ref);
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index b1db17f3754..1c345478ef7 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -64,7 +64,7 @@ if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PRE
 $sql.= " WHERE s.fk_stcomm = st.id";
 $sql.= " AND s.fournisseur = 1";
 $sql.= " AND s.rowid = p.fk_soc";
-$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND s.entity IN (".getEntity('societe').")";
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 
 if (dol_strlen($stcomm)) {
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 0918423908e..782a78981ed 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -292,7 +292,7 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE f.fk_soc = s.rowid';
-$sql.= ' AND f.entity IN ('.getEntity('facture_fourn', 1).')';
+$sql.= ' AND f.entity IN ('.getEntity('facture_fourn').')';
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
 if ($socid > 0) $sql .= ' AND s.rowid = '.$socid;
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 32f785460ba..690835a5e99 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -240,7 +240,7 @@ $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE s.fk_stcomm = st.id";
 $sql.= " AND s.fournisseur = 1";
-$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND s.entity IN (".getEntity('societe').")";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql .= " AND s.rowid = ".$socid;
 $sql.= " ORDER BY s.tms DESC";
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index ca874511c94..9d62747a1cb 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -94,7 +94,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 if ($catid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as ppf ON p.rowid = ppf.fk_product";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON ppf.fk_soc = s.rowid";
-$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+$sql.= " WHERE p.entity IN (".getEntity('product').")";
 if ($sRefSupplier)
 {
 	$sql .= natural_search('ppf.ref_fourn', $sRefSupplier);
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index ba36d911971..03d3c23f5cc 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -320,7 +320,7 @@ class Holiday extends CommonObject
         $sql.= " ua.photo as validator_photo";
         
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
-        $sql.= " WHERE cp.entity IN (".getEntity('holiday', 1).")";
+        $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
 		$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
         $sql.= " AND cp.fk_user = '".$user_id."'";
 
@@ -445,7 +445,7 @@ class Holiday extends CommonObject
         $sql.= " ua.photo as validator_photo";
         
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
-        $sql.= " WHERE cp.entity IN (".getEntity('holiday', 1).")";
+        $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
         $sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
 
         // Filtrage de séléction
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 383b2276d6c..56ffa78f429 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -844,7 +844,7 @@ class Livraison extends CommonObject
 		$prodids = array();
 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product', 1).")";
+		$sql.= " WHERE entity IN (".getEntity('product').")";
 		$sql.= " AND tosell = 1";
 		$resql = $this->db->query($sql);
 		if ($resql)
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 846daad7806..ee0a068251b 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -130,7 +130,7 @@ $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
 $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."user as u";
 $sql.= " WHERE f.fk_soc = s.rowid";
-$sql.= ' AND f.entity IN ('.getEntity('facture', 1).')';
+$sql.= ' AND f.entity IN ('.getEntity('facture').')';
 $sql.= " AND sc.fk_soc = f.fk_soc";
 $sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
 if (! empty($conf->global->AGENT_CONTACT_TYPE))
@@ -138,7 +138,7 @@ if (! empty($conf->global->AGENT_CONTACT_TYPE))
 else
 	$sql .= " AND sc.fk_user = u.rowid";
 $sql.= " AND f.fk_statut > 0";
-$sql.= ' AND s.entity IN ('.getEntity('societe', 1).')';
+$sql.= ' AND s.entity IN ('.getEntity('societe').')';
 $sql.= " AND d.fk_facture = f.rowid";
 if ($agentid > 0) {
 	if (! empty($conf->global->AGENT_CONTACT_TYPE))
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 9656fa99fd9..c576b3ce4a6 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -193,7 +193,7 @@ $sql .= " FROM " . MAIN_DB_PREFIX . "facture as f ";
 $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as d  ON d.fk_facture = f.rowid";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON d.fk_product = p.rowid";
 $sql .= " WHERE f.fk_statut > 0";
-$sql .= " AND f.entity = " . getEntity('facture', 1);
+$sql .= " AND f.entity = " . getEntity('facture');
 if (! empty($startdate)) $sql .= " AND f.datef >= '" . $db->idate($startdate) . "'";
 if (! empty($enddate))   $sql .= " AND f.datef <= '" . $db->idate($enddate) . "'";
 if ($search_ref) $sql.=natural_search('f.facnumber', $search_ref);
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index bcb3cc65699..f7ccf637676 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -181,7 +181,7 @@ $sql.= ", ".MAIN_DB_PREFIX."facture as f";
 $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
 $sql.= " WHERE f.fk_soc = s.rowid";
 $sql.= " AND f.fk_statut > 0";
-$sql.= ' AND s.entity IN ('.getEntity('societe', 1).')';
+$sql.= ' AND s.entity IN ('.getEntity('societe').')';
 $sql.= " AND d.fk_facture = f.rowid";
 $sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
 if ($client)
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index f5e84dd5c04..d52bcf1b3b0 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -177,7 +177,7 @@ $sql.= ", ".MAIN_DB_PREFIX."facture as f";
 $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = d.fk_product";
 $sql.= " WHERE f.fk_soc = s.rowid";
-$sql.= ' AND f.entity IN ('.getEntity('facture', 1).')';
+$sql.= ' AND f.entity IN ('.getEntity('facture').')';
 $sql.= " AND f.fk_statut > 0";
 $sql.= " AND d.fk_facture = f.rowid";
 if ($id > 0)
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
index a40b00af72c..97224b64da9 100644
--- a/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
+++ b/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
@@ -120,7 +120,7 @@ class SkeletonApi extends DolibarrApi
         //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
         //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
-        $sql.= ' AND s.entity IN ('.getEntity('skeleton', 1).')';
+        $sql.= ' AND s.entity IN ('.getEntity('skeleton').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
         if ($socid) $sql.= " AND s.fk_soc = ".$socid;
         if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
index 6805a697043..ea552ad85f9 100644
--- a/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
+++ b/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
@@ -179,7 +179,7 @@ class Skeleton_Class extends CommonObject
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql.= ' WHERE 1 = 1';
 		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("skeleton", 1) . ")";
+		    $sql .= " AND entity IN (" . getEntity('skeleton') . ")";
 		}
 		if (null !== $ref) {
 			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
@@ -257,7 +257,7 @@ class Skeleton_Class extends CommonObject
 		}
 		$sql.= ' WHERE 1 = 1';
 		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("skeleton", 1) . ")";
+		    $sql .= " AND entity IN (" . getEntity('skeleton') . ")";
 		}
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_list.php b/htdocs/modulebuilder/oldskeletons/skeleton_list.php
index 47aeda79fdc..842fdf32457 100644
--- a/htdocs/modulebuilder/oldskeletons/skeleton_list.php
+++ b/htdocs/modulebuilder/oldskeletons/skeleton_list.php
@@ -216,7 +216,7 @@ $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mytable_extrafields as ef on (t.rowid = ef.fk_object)";
 $sql.= " WHERE 1 = 1";
-//$sql.= " WHERE u.entity IN (".getEntity('mytable',1).")";
+//$sql.= " WHERE u.entity IN (".getEntity('mytable').")";
 if ($search_field1) $sql.= natural_search("field1",$search_field1);
 if ($search_field2) $sql.= natural_search("field2",$search_field2);
 if ($sall)          $sql.= natural_search(array_keys($fieldstosearchall), $sall);
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 292c6a139a4..b35519826d3 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -180,7 +180,7 @@ class MyModuleObject extends CommonObject
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql.= ' WHERE 1 = 1';
 		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("mymoduleobject", 1) . ")";
+		    $sql .= " AND entity IN (" . getEntity('mymoduleobject') . ")";
 		}
 		if (null !== $ref) {
 			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
@@ -258,7 +258,7 @@ class MyModuleObject extends CommonObject
 		}
 		$sql.= ' WHERE 1 = 1';
 		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("mymoduleobject", 1) . ")";
+		    $sql .= " AND entity IN (" . getEntity('mymoduleobject') . ")";
 		}
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
diff --git a/htdocs/modulebuilder/template/class/myobject_api_class.class.php b/htdocs/modulebuilder/template/class/myobject_api_class.class.php
index 8f0dbee2e38..7f5ee413892 100644
--- a/htdocs/modulebuilder/template/class/myobject_api_class.class.php
+++ b/htdocs/modulebuilder/template/class/myobject_api_class.class.php
@@ -123,7 +123,7 @@ class MyObjectApi extends DolibarrApi
         //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
         //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
-        $sql.= ' AND s.entity IN ('.getEntity('myobject', 1).')';
+        $sql.= ' AND s.entity IN ('.getEntity('myobject').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
         if ($socid) $sql.= " AND s.fk_soc = ".$socid;
         if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index a935b87bd58..fc8bdcc9200 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -215,7 +215,7 @@ $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mytable_extrafields as ef on (t.rowid = ef.fk_object)";
 $sql.= " WHERE 1 = 1";
-//$sql.= " WHERE u.entity IN (".getEntity('mytable',1).")";
+//$sql.= " WHERE u.entity IN (".getEntity('mytable').")";
 if ($search_field1) $sql.= natural_search("field1",$search_field1);
 if ($search_field2) $sql.= natural_search("field2",$search_field2);
 if ($sall)          $sql.= natural_search(array_keys($fieldstosearchall), $sall);
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index b8ce1995b5a..67725bad586 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -520,7 +520,7 @@ class MultiCurrency extends CommonObject
 	 	$sql1 = 'SELECT m.rowid, mc.rate FROM '.MAIN_DB_PREFIX.'multicurrency m';
 		$sql1.= ' LEFT JOIN '.MAIN_DB_PREFIX.'multicurrency_rate mc ON (m.rowid = mc.fk_multicurrency)';
 		$sql1.= ' WHERE m.code = \''.$db->escape($code).'\'';
-		$sql1.= " AND m.entity IN (".getEntity('multicurrency', 1).")";
+		$sql1.= " AND m.entity IN (".getEntity('multicurrency').")";
 		$sql2= '';
 		if (!empty($conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE) && !empty($date_document)) $sql2.= ' AND DATE_FORMAT(mc.date_sync, "%Y-%m-%d") = "'.date('Y-m-d', $date_document).'"';
 		$sql3.= ' ORDER BY mc.date_sync DESC LIMIT 1';
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 510a0545372..861d9fa3300 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -133,7 +133,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
 }
-$sql.= " WHERE p.entity = ".getEntity('survey',1);
+$sql.= " WHERE p.entity = ".getEntity('survey');
 if ($status == 'expired') $sql.=" AND date_fin < '".$db->idate($now)."'";
 if ($status == 'opened') $sql.=" AND date_fin >= '".$db->idate($now)."'";
 if ($search_ref) $sql.=natural_search("p.id_sondage", $search_ref);
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index 58d66f3a2c5..85351a0fb2a 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -72,7 +72,7 @@ if ($action == 'convert')
 		{
 			$sql = 'SELECT rowid';
 			$sql.= ' FROM '.MAIN_DB_PREFIX.'product';
-			$sql.= ' WHERE entity IN ('.getEntity('product',1).')';
+			$sql.= ' WHERE entity IN ('.getEntity('product').')';
 			$sql.= " AND tva_tx = '".$db->escape($oldvatrate)."'";
 
 			$resql=$db->query($sql);
@@ -162,7 +162,7 @@ if ($action == 'convert')
 		// Change supplier prices
 		$sql = 'SELECT pfp.rowid, pfp.fk_soc, pfp.price as price, pfp.quantity as qty, pfp.fk_availability, pfp.ref_fourn';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp, '.MAIN_DB_PREFIX.'societe as s';
-		$sql.= ' WHERE pfp.fk_soc = s.rowid AND pfp.entity IN ('.getEntity('product',1).')';
+		$sql.= ' WHERE pfp.fk_soc = s.rowid AND pfp.entity IN ('.getEntity('product').')';
 		$sql.= " AND tva_tx = '".$db->escape($oldvatrate)."'";
 		$sql.= " AND s.fk_pays = '".$country_id."'";
 		//print $sql;
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 8867011101b..8e4892678e5 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -110,7 +110,7 @@ if (! empty($action) && $action == 'fetch' && ! empty($id))
 			$sql = "SELECT price, price_ttc, price_base_type, tva_tx";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "product_price ";
 			$sql .= " WHERE fk_product='" . $id . "'";
-			$sql .= " AND entity IN (" . getEntity('productprice', 1) . ")";
+			$sql .= " AND entity IN (" . getEntity('productprice') . ")";
 			$sql .= " AND price_level=" . $price_level;
 			$sql .= " ORDER BY date_price";
 			$sql .= " DESC LIMIT 1";
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index a60694ca7cb..53442d94d39 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -352,7 +352,7 @@ class ActionsCardProduct
 		}
 
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
-		$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+		$sql.= " WHERE p.entity IN (".getEntity('product').")";
 
 		if ($sall)
 		{
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index 970ac535273..f053e6f8d0b 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -313,7 +313,7 @@ class ActionsCardService
 			$fourn_id = GETPOST("fourn_id",'int');
 			$sql.= ", ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
 		}
-		$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+		$sql.= " WHERE p.entity IN (".getEntity('product').")";
 		if ($search_categ) $sql.= " AND p.rowid = cp.fk_product";	// Join for the needed table to filter by categ
 		if ($sall)
 		{
diff --git a/htdocs/product/class/api_deprecated_product.class.php b/htdocs/product/class/api_deprecated_product.class.php
index e33c7dd3e32..a1d475f53ab 100644
--- a/htdocs/product/class/api_deprecated_product.class.php
+++ b/htdocs/product/class/api_deprecated_product.class.php
@@ -115,7 +115,7 @@ class ProductApi extends DolibarrApi
 
         $sql ="SELECT rowid, ref, ref_ext";
         $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-        $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+        $sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 		
         // Show products
         if ($mode == 1) $sql.= " AND p.fk_product_type = 0";
@@ -198,7 +198,7 @@ class ProductApi extends DolibarrApi
         $sql = "SELECT rowid, ref, ref_ext";
         $sql.= " FROM ".MAIN_DB_PREFIX."product as p, ";
         $sql.= MAIN_DB_PREFIX."categorie_product as c";
-        $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+        $sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 
         // Select products of given category
         $sql.= " AND c.fk_categorie = ".$db->escape($category);
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index a733a554fd5..0d6694ac569 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -109,7 +109,7 @@ class Products extends DolibarrApi
         {
             $sql.= ", ".MAIN_DB_PREFIX."categorie_product as c";
         }
-        $sql.= ' WHERE t.entity IN ('.getEntity('product', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('product').')';
         // Select products of given category
         if ($category > 0)
         {
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index dda92ea0c0f..01064c8ffa3 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -112,7 +112,7 @@ class FormProduct
                 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_batch as pb on pb.fk_product_stock = ps.rowid AND pb.batch = '".$batch."'";
             }
 		}
-		$sql.= " WHERE e.entity IN (".getEntity('stock', 1).")";
+		$sql.= " WHERE e.entity IN (".getEntity('stock').")";
 		if (count($warehouseStatus))
 		{
 			$sql.= " AND e.statut IN (".implode(',',$warehouseStatus).")";
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d866e3ec2ae..606274cd30e 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -493,7 +493,7 @@ class Product extends CommonObject
         {
 			$sql = "SELECT count(*) as nb";
 			$sql.= " FROM ".MAIN_DB_PREFIX."product";
-			$sql.= " WHERE entity IN (".getEntity('product', 1).")";
+			$sql.= " WHERE entity IN (".getEntity('product').")";
 			$sql.= " AND ref = '" .$this->db->escape($this->ref)."'";
 
 			$result = $this->db->query($sql);
@@ -1942,7 +1942,7 @@ class Product extends CommonObject
 						$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
 						$sql.= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
 						$sql.= " FROM ".MAIN_DB_PREFIX."product_price";
-						$sql.= " WHERE entity IN (".getEntity('productprice', 1).")";
+						$sql.= " WHERE entity IN (".getEntity('productprice').")";
 						$sql.= " AND price_level=".$i;
 						$sql.= " AND fk_product = ".$this->id;
 						$sql.= " ORDER BY date_price DESC, rowid DESC";
@@ -2108,7 +2108,7 @@ class Product extends CommonObject
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE p.rowid = pd.fk_propal";
 		$sql.= " AND p.fk_soc = s.rowid";
-		$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+		$sql.= " AND p.entity IN (".getEntity('propal').")";
 		$sql.= " AND pd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		//$sql.= " AND pr.fk_statut != 0";
@@ -2151,7 +2151,7 @@ class Product extends CommonObject
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE c.rowid = cd.fk_commande";
 		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+		$sql.= " AND c.entity IN (".getEntity('commande').")";
 		$sql.= " AND cd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
@@ -2217,7 +2217,7 @@ class Product extends CommonObject
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE c.rowid = cd.fk_commande";
 		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('supplier_order', 1).")";
+		$sql.= " AND c.entity IN (".getEntity('supplier_order').")";
 		$sql.= " AND cd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0) $sql.= " AND c.fk_soc = ".$socid;
@@ -2262,7 +2262,7 @@ class Product extends CommonObject
 		$sql.= " WHERE e.rowid = ed.fk_expedition";
 		$sql.= " AND c.rowid = cd.fk_commande";
 		$sql.= " AND e.fk_soc = s.rowid";
-		$sql.= " AND e.entity IN (".getEntity('expedition', 1).")";
+		$sql.= " AND e.entity IN (".getEntity('expedition').")";
 		$sql.= " AND ed.fk_origin_line = cd.rowid";
 		$sql.= " AND cd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -2305,7 +2305,7 @@ class Product extends CommonObject
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE cf.rowid = fd.fk_commande";
 		$sql.= " AND cf.fk_soc = s.rowid";
-		$sql.= " AND cf.entity IN (".getEntity('supplier_order', 1).")";
+		$sql.= " AND cf.entity IN (".getEntity('supplier_order').")";
 		$sql.= " AND fd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND cf.fk_soc = ".$socid;
@@ -2347,7 +2347,7 @@ class Product extends CommonObject
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE c.rowid = cd.fk_contrat";
 		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('contract', 1).")";
+		$sql.= " AND c.entity IN (".getEntity('contract').")";
 		$sql.= " AND cd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		//$sql.= " AND c.statut != 0";
@@ -2389,7 +2389,7 @@ class Product extends CommonObject
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE f.rowid = fd.fk_facture";
 		$sql.= " AND f.fk_soc = s.rowid";
-		$sql.= " AND f.entity IN (".getEntity('facture', 1).")";
+		$sql.= " AND f.entity IN (".getEntity('facture').")";
 		$sql.= " AND fd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		//$sql.= " AND f.fk_statut != 0";
@@ -2431,7 +2431,7 @@ class Product extends CommonObject
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE f.rowid = fd.fk_facture_fourn";
 		$sql.= " AND f.fk_soc = s.rowid";
-		$sql.= " AND f.entity IN (".getEntity('facture_fourn', 1).")";
+		$sql.= " AND f.entity IN (".getEntity('facture_fourn').")";
 		$sql.= " AND fd.fk_product = ".$this->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		//$sql.= " AND f.fk_statut != 0";
@@ -2543,7 +2543,7 @@ class Product extends CommonObject
 		else $sql.=" AND d.fk_product > 0";
 		if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
 		$sql.= " AND f.fk_soc = s.rowid";
-		$sql.= " AND f.entity IN (".getEntity('facture', 1).")";
+		$sql.= " AND f.entity IN (".getEntity('facture').")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND f.fk_soc = $socid";
 		$sql.=$morefilter;
@@ -2579,7 +2579,7 @@ class Product extends CommonObject
 		else $sql.=" AND d.fk_product > 0";
 		if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
 		$sql.= " AND f.fk_soc = s.rowid";
-		$sql.= " AND f.entity IN (".getEntity('facture_fourn', 1).")";
+		$sql.= " AND f.entity IN (".getEntity('facture_fourn').")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND f.fk_soc = $socid";
 		$sql.=$morefilter;
@@ -2614,7 +2614,7 @@ class Product extends CommonObject
 		else $sql.=" AND d.fk_product > 0";
 		if ($filteronproducttype >= 0) $sql.= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
 		$sql.= " AND p.fk_soc = s.rowid";
-		$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+		$sql.= " AND p.entity IN (".getEntity('propal').")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
 		$sql.=$morefilter;
@@ -2649,7 +2649,7 @@ class Product extends CommonObject
 		else $sql.=" AND d.fk_product > 0";
 		if ($filteronproducttype >= 0) $sql.= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
 		$sql.= " AND p.fk_soc = s.rowid";
-		$sql.= " AND p.entity IN (".getEntity('propal', 1).")";
+		$sql.= " AND p.entity IN (".getEntity('propal').")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND p.fk_soc = ".$socid;
 		$sql.=$morefilter;
@@ -2683,7 +2683,7 @@ class Product extends CommonObject
 		else $sql.=" AND d.fk_product > 0";
 		if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
 		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+		$sql.= " AND c.entity IN (".getEntity('commande').")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
 		$sql.=$morefilter;
@@ -2717,7 +2717,7 @@ class Product extends CommonObject
 		else $sql.=" AND d.fk_product > 0";
 		if ($filteronproducttype >= 0) $sql.= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
 		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('supplier_order', 1).")";
+		$sql.= " AND c.entity IN (".getEntity('supplier_order').")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
 		$sql.=$morefilter;
@@ -2908,7 +2908,7 @@ class Product extends CommonObject
     		$sql.= " WHERE fk_soc = ".$id_fourn;
     		$sql.= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
     		$sql.= " AND fk_product != ".$this->id;
-    		$sql.= " AND entity IN (".getEntity('productprice', 1).")";
+    		$sql.= " AND entity IN (".getEntity('productprice').")";
 
     		$resql=$this->db->query($sql);
     		if ($resql)
@@ -2931,7 +2931,7 @@ class Product extends CommonObject
 		else $sql.= " AND (ref_fourn = '' OR ref_fourn IS NULL)";
 		$sql.= " AND quantity = '".$quantity."'";
 		$sql.= " AND fk_product = ".$this->id;
-		$sql.= " AND entity IN (".getEntity('productprice', 1).")";
+		$sql.= " AND entity IN (".getEntity('productprice').")";
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -3742,7 +3742,7 @@ class Product extends CommonObject
 		$sql = "SELECT ps.rowid, ps.reel, ps.fk_entrepot";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
 		$sql.= ", ".MAIN_DB_PREFIX."entrepot as w";
-		$sql.= " WHERE w.entity IN (".getEntity('stock', 1).")";
+		$sql.= " WHERE w.entity IN (".getEntity('stock').")";
 		$sql.= " AND w.rowid = ps.fk_entrepot";
 		$sql.= " AND ps.fk_product = ".$this->id;
 		if ($conf->global->ENTREPOT_EXTRA_STATUS && count($warehouseStatus)) $sql.= " AND w.statut IN (".implode(',',$warehouseStatus).")";
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 5b9050077c9..6a488c87e2b 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -338,7 +338,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " ," . MAIN_DB_PREFIX . "societe as soc ";
 		$sql .= " WHERE soc.rowid=t.fk_soc ";
 		$sql .= " AND prod.rowid=t.fk_product ";
-		$sql .= " AND prod.entity IN (" . getEntity('product', 1) . ")";
+		$sql .= " AND prod.entity IN (" . getEntity('product') . ")";
 
 		// Manage filter
 		if (count($filter) > 0) {
@@ -445,7 +445,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " ," . MAIN_DB_PREFIX . "societe as soc ";
 		$sql .= " WHERE soc.rowid=t.fk_soc ";
 		$sql .= " AND prod.rowid=t.fk_product ";
-		$sql .= " AND prod.entity IN (" . getEntity('product', 1) . ")";
+		$sql .= " AND prod.entity IN (" . getEntity('product') . ")";
 
 		// Manage filter
 		if (count($filter) > 0) {
@@ -724,7 +724,7 @@ class Productcustomerprice extends CommonObject
 		$sql = "SELECT s.rowid";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
 		$sql .= " WHERE s.parent = " . $this->fk_soc;
-		$sql .= " AND s.entity IN (" . getEntity('societe', 1) . ")";
+		$sql .= " AND s.entity IN (" . getEntity('societe') . ")";
 
 		dol_syslog(get_class($this) . "::setPriceOnAffiliateThirdparty", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index aa1cf4137e9..07d83fc8d3a 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -148,7 +148,7 @@ if ($action == 'search')
 	$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
 	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON p.rowid = cp.fk_product';
 	if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND lang='".($current_lang)."'";
-	$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+	$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 	if ($key != "")
 	{
 		// For natural search
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 34da4f857b9..49a80859bd9 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -186,7 +186,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
 	$sql.= " FROM ".MAIN_DB_PREFIX."categorie_product as cs";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
 	$sql.= " WHERE c.type = 0";
-	$sql.= " AND c.entity IN (".getEntity('category',1).")";
+	$sql.= " AND c.entity IN (".getEntity('category').")";
 	$sql.= " GROUP BY c.label";
 	$total=0;
 	$result = $db->query($sql);
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 8cb1f56eb9d..dc79dac28e5 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -519,7 +519,7 @@ class Inventory extends CoreObject
 			$sql = 'SELECT i.rowid,i.title, e.label, i.date_inventory, i.fk_warehouse, i.datec, i.tms, i.status';
             $sql.= ' FROM '.MAIN_DB_PREFIX.'inventory i';
             $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot e ON (e.rowid = i.fk_warehouse)';
-            $sql.= ' WHERE i.entity IN ('.getEntity('inventory', 1).')';
+            $sql.= ' WHERE i.entity IN ('.getEntity('inventory').')';
 		}
 	
 		return $sql;	
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index 1ebbf256c9c..0a40858cab9 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -286,7 +286,7 @@ else
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
 	}
 
-	$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+	$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 	if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
     // if the type is not 1, we show all products (type = 0,2,3)
     if (dol_strlen($type))
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 74f9c59cff3..e84aeb53681 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -288,7 +288,7 @@ else
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
 	}
 
-	$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+	$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 	if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
     // if the type is not 1, we show all products (type = 0,2,3)
     if (dol_strlen($search_type) && $search_type != '-1')
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 5320e637316..07a19c4af5e 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -114,7 +114,7 @@ $infoprod=array();
 $sql  = "SELECT p.rowid, p.label, p.ref, p.fk_product_type as type, SUM(pd.qty) as c";
 $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
 $sql.= ", ".MAIN_DB_PREFIX."product as p";
-$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
+$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
 $sql.= " AND p.rowid = pd.fk_product";
 if ($type !== '') {
 	$sql.= " AND fk_product_type = ".$type;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 99184b89e72..41f5cda1eb7 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1319,7 +1319,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
     $sql .= " FROM " . MAIN_DB_PREFIX . "product_price as p,";
     $sql .= " " . MAIN_DB_PREFIX . "user as u";
     $sql .= " WHERE fk_product = " . $object->id;
-    $sql .= " AND p.entity IN (" . getEntity('productprice', 1) . ")";
+    $sql .= " AND p.entity IN (" . getEntity('productprice') . ")";
     $sql .= " AND p.fk_user_author = u.rowid";
     if (! empty($socid) && ! empty($conf->global->PRODUIT_MULTIPRICES)) $sql .= " AND p.price_level = " . $soc->price_level;
     $sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index e460bbec7c5..ffa0544976b 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -119,7 +119,7 @@ $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
 $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s on p.rowid = s.fk_product';
 // We'll need this table joined to the select in order to filter by categ
 if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_product as cp";
-$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+$sql.= " WHERE p.entity IN (".getEntity('product').")";
 if ($search_categ) $sql.= " AND p.rowid = cp.fk_product";	// Join for the needed table to filter by categ
 if ($sall) $sql.=natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $all);
 // if the type is not 1, we show all products (type = 0,2,3)
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 6ab18ac87cb..1d45e93590c 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -124,7 +124,7 @@ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_batch as pb on pb.fk_product_stock
 $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lot as pl on pl.fk_product = p.rowid AND pl.batch = pb.batch'; // Link on unique key
 // We'll need this table joined to the select in order to filter by categ
 if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_product as cp";
-$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+$sql.= " WHERE p.entity IN (".getEntity('product').")";
 if ($search_categ) $sql.= " AND p.rowid = cp.fk_product";	// Join for the needed table to filter by categ
 if ($sall) $sql.=natural_search(array('p.ref','p.label','p.description','p.note'), $sall);
 // if the type is not 1, we show all products (type = 0,2,3)
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 1c72d5f6615..221e76d7ac9 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -129,7 +129,7 @@ if ($id > 0 || ! empty($ref))
 			$sql.= ", ".MAIN_DB_PREFIX."commandedet as d";
 			if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql.= " WHERE c.fk_soc = s.rowid";
-			$sql.= " AND c.entity IN (".getEntity('commande', 1).")";
+			$sql.= " AND c.entity IN (".getEntity('commande').")";
 			$sql.= " AND d.fk_commande = c.rowid";
 			$sql.= " AND d.fk_product =".$product->id;
 	            if (! empty($search_month))
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index e2f5bccc430..eec53697a91 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -123,7 +123,7 @@ if ($id > 0 || ! empty($ref))
 		$sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 		$sql.= " WHERE c.rowid = cd.fk_contrat";
 		$sql.= " AND c.fk_soc = s.rowid";
-		$sql.= " AND c.entity IN (".getEntity('contract', 1).")";
+		$sql.= " AND c.entity IN (".getEntity('contract').")";
 		$sql.= " AND cd.fk_product =".$product->id;
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid) $sql.= " AND s.rowid = ".$socid;
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 506689a6001..0aa1ca90c98 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -149,7 +149,7 @@ if ($id > 0 || ! empty($ref))
             $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
             if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
             $sql.= " WHERE f.fk_soc = s.rowid";
-            $sql.= " AND f.entity IN (".getEntity('facture', 1).")";
+            $sql.= " AND f.entity IN (".getEntity('facture').")";
             $sql.= " AND d.fk_facture = f.rowid";
             $sql.= " AND d.fk_product =".$product->id;
             if (! empty($search_month))
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index ac2849fefcf..db957ae6532 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -131,7 +131,7 @@ if ($id > 0 || ! empty($ref))
 			$sql .= ", " . MAIN_DB_PREFIX . "facture_fourn_det as d";
 			if (! $user->rights->societe->client->voir && ! $socid)	$sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
 			$sql .= " WHERE f.fk_soc = s.rowid";
-			$sql .= " AND f.entity IN (".getEntity('facture_fourn', 1).")";
+			$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
 			$sql .= " AND d.fk_facture_fourn = f.rowid";
 			$sql .= " AND d.fk_product =" . $product->id;
 			if (! empty($search_month))
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 06d43838bce..ec796422f0b 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -131,7 +131,7 @@ if ($id > 0 || ! empty($ref))
 			if (! $user->rights->societe->client->voir && ! $socid)
 				$sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
 			$sql .= " WHERE p.fk_soc = s.rowid";
-			$sql .= " AND p.entity IN (".getEntity('propal', 1).")";
+			$sql .= " AND p.entity IN (".getEntity('propal').")";
 			$sql .= " AND d.fk_propal = p.rowid";
 			$sql .= " AND d.fk_product =" . $product->id;
 			if (! empty($search_month))
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 79e17749991..5465c04d9a9 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -104,7 +104,7 @@ class StockMovements extends DolibarrApi
         
         $sql = "SELECT t.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."stock_mouvement as t";
-        //$sql.= ' WHERE t.entity IN ('.getEntity('stock', 1).')';
+        //$sql.= ' WHERE t.entity IN ('.getEntity('stock').')';
         $sql.= ' WHERE 1 = 1';
         // Add sql filters
         if ($sqlfilters) 
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index d50f590c30c..6eccf805b41 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -103,7 +103,7 @@ class Warehouses extends DolibarrApi
         
         $sql = "SELECT t.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('stock', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('stock').')';
         // Add sql filters
         if ($sqlfilters) 
         {
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 1b650a4e7bb..9263fe4ba10 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -411,7 +411,7 @@ class Entrepot extends CommonObject
 
 		$sql = "SELECT rowid, label";
 		$sql.= " FROM ".MAIN_DB_PREFIX."entrepot";
-		$sql.= " WHERE entity IN (".getEntity('stock', 1).")";
+		$sql.= " WHERE entity IN (".getEntity('stock').")";
 		$sql.= " AND statut = ".$status;
 
 		$result = $this->db->query($sql);
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index a6e20aabcab..22a9e95410c 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -64,7 +64,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
 $sql = "SELECT e.label, e.rowid, e.statut";
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 $sql.= " WHERE e.statut in (0,1)";
-$sql.= " AND e.entity IN (".getEntity('stock', 1).")";
+$sql.= " AND e.entity IN (".getEntity('stock').")";
 $sql.= $db->order('e.statut','DESC');
 $sql.= $db->plimit(15, 0);
 
@@ -119,7 +119,7 @@ $sql.= ", ".MAIN_DB_PREFIX."stock_mouvement as m";
 $sql.= ", ".MAIN_DB_PREFIX."product as p";
 $sql.= " WHERE m.fk_product = p.rowid";
 $sql.= " AND m.fk_entrepot = e.rowid";
-$sql.= " AND e.entity IN (".getEntity('stock', 1).")";
+$sql.= " AND e.entity IN (".getEntity('stock').")";
 if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql.= " AND p.fk_product_type = 0";
 $sql.= $db->order("datem","DESC");
 $sql.= $db->plimit($max,0);
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index eefbe3deee9..d3de2b6b6e5 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -87,7 +87,7 @@ $sql.= " SUM(p.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellv
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON e.rowid = ps.fk_entrepot";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
-$sql.= " WHERE e.entity IN (".getEntity('stock', 1).")";
+$sql.= " WHERE e.entity IN (".getEntity('stock').")";
 if ($search_ref) $sql.= natural_search("e.label", $search_ref);			// ref
 if ($search_label) $sql.= natural_search("e.lieu", $search_label);		// label
 if ($search_status != '' && $search_status >= 0) $sql.= " AND e.statut = ".$search_status;
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 5f0f9c213dc..7a8010117a2 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -434,7 +434,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON m.batch = pl.batch AND
 $sql.= " WHERE m.fk_product = p.rowid";
 if ($msid > 0) $sql .= " AND m.rowid = ".$msid;
 $sql.= " AND m.fk_entrepot = e.rowid";
-$sql.= " AND e.entity IN (".getEntity('stock', 1).")";
+$sql.= " AND e.entity IN (".getEntity('stock').")";
 if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql.= " AND p.fk_product_type = 0";
 if ($id > 0) $sql.= " AND e.rowid ='".$id."'";
 if ($month > 0)
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index e894368beaf..3ad426eda8c 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -810,7 +810,7 @@ $sql.= " ".MAIN_DB_PREFIX."product_stock as ps";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = ps.fk_product";
 $sql.= " WHERE ps.reel != 0";
 $sql.= " AND ps.fk_entrepot = e.rowid";
-$sql.= " AND e.entity IN (".getEntity('stock', 1).")";
+$sql.= " AND e.entity IN (".getEntity('stock').")";
 $sql.= " AND ps.fk_product = ".$object->id;
 $sql.= " ORDER BY e.label";
 
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 78d3c470cb1..6233d8a3583 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -227,7 +227,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."product_lot as t";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot_extrafields as ef on (t.rowid = ef.fk_object)";
 $sql.= ", ".MAIN_DB_PREFIX."product as p";
 $sql.= " WHERE p.rowid = t.fk_product";
-//$sql.= " WHERE u.entity IN (".getEntity('productlot',1).")";
+//$sql.= " WHERE u.entity IN (".getEntity('productlot').")";
 
 if ($search_entity) $sql.= natural_search("entity",$search_entity);
 if ($search_product) $sql.= natural_search("p.ref",$search_product);
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 1a3d7c9edb2..405fe098bb2 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -292,7 +292,7 @@ if($fk_supplier > 0) {
 if(!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
 	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_warehouse_properties AS pse ON (p.rowid = pse.fk_product AND pse.fk_entrepot = '.$fk_entrepot.')';
 }
-$sql.= ' WHERE p.entity IN (' . getEntity("product", 1) . ')';
+$sql.= ' WHERE p.entity IN (' . getEntity('product') . ')';
 if ($sall) $sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $sall);
 // if the type is not 1, we show all products (type = 0,2,3)
 if (dol_strlen($type)) {
@@ -322,7 +322,7 @@ if ($usevirtualstock)
 	$sqlCommandesCli = "(SELECT ".$db->ifsql("SUM(cd.qty) IS NULL", "0", "SUM(cd.qty)")." as qty";
 	$sqlCommandesCli.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
 	$sqlCommandesCli.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON (c.rowid = cd.fk_commande)";
-	$sqlCommandesCli.= " WHERE c.entity IN (".getEntity('commande', 1).")";
+	$sqlCommandesCli.= " WHERE c.entity IN (".getEntity('commande').")";
 	$sqlCommandesCli.= " AND cd.fk_product = p.rowid";
 	$sqlCommandesCli.= " AND c.fk_statut IN (1,2))";
 
@@ -331,7 +331,7 @@ if ($usevirtualstock)
 	$sqlExpeditionsCli.= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet as ed ON (ed.fk_expedition = e.rowid)";
 	$sqlExpeditionsCli.= " LEFT JOIN ".MAIN_DB_PREFIX."commandedet as cd ON (cd.rowid = ed.fk_origin_line)";
 	$sqlExpeditionsCli.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON (c.rowid = cd.fk_commande)";
-	$sqlExpeditionsCli.= " WHERE e.entity IN (".getEntity('expedition', 1).")";
+	$sqlExpeditionsCli.= " WHERE e.entity IN (".getEntity('expedition').")";
 	$sqlExpeditionsCli.= " AND cd.fk_product = p.rowid";
 	$sqlExpeditionsCli.= " AND c.fk_statut IN (1,2))";
 
@@ -339,14 +339,14 @@ if ($usevirtualstock)
 	$sqlCommandesFourn.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd";
 	$sqlCommandesFourn.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
 	$sqlCommandesFourn.= " WHERE c.rowid = cd.fk_commande";
-	$sqlCommandesFourn.= " AND c.entity IN (".getEntity('supplier_order', 1).")";
+	$sqlCommandesFourn.= " AND c.entity IN (".getEntity('supplier_order').")";
 	$sqlCommandesFourn.= " AND cd.fk_product = p.rowid";
 	$sqlCommandesFourn.= " AND c.fk_statut IN (3,4))";
 
 	$sqlReceptionFourn = "(SELECT ".$db->ifsql("SUM(fd.qty) IS NULL", "0", "SUM(fd.qty)")." as qty";
 	$sqlReceptionFourn.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
 	$sqlReceptionFourn.= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd ON (fd.fk_commande = cf.rowid)";
-	$sqlReceptionFourn.= " WHERE cf.entity IN (".getEntity('supplier_order', 1).")";
+	$sqlReceptionFourn.= " WHERE cf.entity IN (".getEntity('supplier_order').")";
 	$sqlReceptionFourn.= " AND fd.fk_product = p.rowid";
 	$sqlReceptionFourn.= " AND cf.fk_statut IN (3,4))";
 
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 0c71eb6ad18..40e3060cfee 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -56,7 +56,7 @@ $sql.= " SUM(ps.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sell
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON e.rowid = ps.fk_entrepot";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
-$sql.= " WHERE e.entity IN (".getEntity('stock', 1).")";
+$sql.= " WHERE e.entity IN (".getEntity('stock').")";
 if ($sref)
 {
     $sql.= " AND e.label LIKE '%".$db->escape($sref)."%'";
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 0f4f85c05af..e2a60578e9e 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -116,7 +116,7 @@ class Projects extends DolibarrApi
 
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('project', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('project').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
         if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index d2d7b81d865..d6303c18a16 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -123,7 +123,7 @@ class Tasks extends DolibarrApi
 
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('project', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('project').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
         if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 6a7b130ac0d..7cb6c29de1a 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -385,7 +385,7 @@ class Project extends CommonObject
         else if (! empty($ref))
         {
         	$sql.= " WHERE ref='".$this->db->escape($ref)."'";
-        	$sql.= " AND entity IN (".getEntity('project',1).")";
+        	$sql.= " AND entity IN (".getEntity('project').")";
         }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -1108,7 +1108,7 @@ class Project extends CommonObject
         {
             $sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec";
         }
-        $sql.= " WHERE p.entity IN (".getEntity('project',1).")";
+        $sql.= " WHERE p.entity IN (".getEntity('project').")";
         // Internal users must see project he is contact to even if project linked to a third party he can't see.
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
         if ($socid > 0) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
@@ -1681,7 +1681,7 @@ class Project extends CommonObject
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
         $sql.= " WHERE p.fk_statut = 1";
-        $sql.= " AND p.entity IN (".getEntity('project').')';
+        $sql.= " AND p.entity IN (".getEntity('project', false)')';
         if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
@@ -1756,7 +1756,7 @@ class Project extends CommonObject
 	    $sql = "SELECT count(p.rowid) as nb";
 	    $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 	    $sql.= " WHERE";
-	    $sql.= " p.entity IN (".getEntity('projet', 1).")";
+	    $sql.= " p.entity IN (".getEntity('projet').")";
 		if (! $user->rights->projet->all->lire) 
 		{
 			$projectsListId = $this->getProjectsAuthorizedForUser($user,0,1);
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index e1025241115..c21669daf3b 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -690,7 +690,7 @@ class Task extends CommonObject
                 $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2";
                 $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
             }
-            $sql.= " WHERE p.entity IN (".getEntity('project',1).")";
+            $sql.= " WHERE p.entity IN (".getEntity('project').")";
             $sql.= " AND t.fk_projet = p.rowid";
         }
         elseif ($mode == 1)
@@ -710,7 +710,7 @@ class Task extends CommonObject
             {
                 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
             }
-            $sql.= " WHERE p.entity IN (".getEntity('project',1).")";
+            $sql.= " WHERE p.entity IN (".getEntity('project').")";
         }
         else return 'BadValueForParameterMode';
 
@@ -1704,7 +1704,7 @@ class Task extends CommonObject
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
         $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-        $sql.= " WHERE p.entity IN (".getEntity('project').')';
+        $sql.= " WHERE p.entity IN (".getEntity('project', false)')';
         $sql.= " AND p.fk_statut = 1";
         $sql.= " AND t.fk_projet = p.rowid";
         $sql.= " AND t.progress < 100";         // tasks to do
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index b327573e3db..851956f816b 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -259,7 +259,7 @@ if ($search_project_user > 0)
 {
 	$sql.=", ".MAIN_DB_PREFIX."element_contact as ecp";
 }
-$sql.= " WHERE p.entity IN (".getEntity('project',1).')';
+$sql.= " WHERE p.entity IN (".getEntity('project').')';
 if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";     // public and assigned to, or restricted to company for external users
 // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 4e31434dbc4..19e64826110 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -268,7 +268,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 if ($search_project_user > 0)  $sql.=", ".MAIN_DB_PREFIX."element_contact as ecp";
 if ($search_task_user > 0)     $sql.=", ".MAIN_DB_PREFIX."element_contact as ect";
 $sql.= " WHERE t.fk_projet = p.rowid";
-$sql.= " AND p.entity IN (".getEntity('project',1).')';
+$sql.= " AND p.entity IN (".getEntity('project').')';
 if (! $user->rights->projet->all->lire) $sql.=" AND p.rowid IN (".($projectsListId?$projectsListId:'0').")";    // public and assigned to projects, or restricted to company for external users
 // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 51024cfe7ee..4fbb8dde70d 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -470,7 +470,7 @@ class Dolresource extends CommonObject
     	$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX.$this->table_element."_extrafields as ef ON ef.fk_object=t.rowid";
-    	$sql.= " WHERE t.entity IN (".getEntity('resource',1).")";
+    	$sql.= " WHERE t.entity IN (".getEntity('resource').")";
 
     	//Manage filter
     	if (!empty($filter)){
@@ -555,7 +555,7 @@ class Dolresource extends CommonObject
 		$sql.= " t.fk_user_create,";
 		$sql.= " t.tms";
    		$sql.= ' FROM '.MAIN_DB_PREFIX .'element_resources as t ';
-   		$sql.= " WHERE t.entity IN (".getEntity('resource',1).")";
+   		$sql.= " WHERE t.entity IN (".getEntity('resource').")";
 
    		//Manage filter
    		if (!empty($filter)){
@@ -637,7 +637,7 @@ class Dolresource extends CommonObject
     	$sql.= " t.fk_user_create,";
     	$sql.= " t.tms";
     	$sql.= ' FROM '.MAIN_DB_PREFIX .'element_resources as t ';
-    	$sql.= " WHERE t.entity IN (".getEntity('resource',1).")";
+    	$sql.= " WHERE t.entity IN (".getEntity('resource').")";
 
     	//Manage filter
     	if (!empty($filter)){
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index b3565a2ca26..f81d9092fd2 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -61,7 +61,7 @@ if (GETPOST('newcompany') || GETPOST('socid','int') || GETPOST('id_fourn'))
 
 	$sql = "SELECT rowid, nom";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
+	$sql.= " WHERE s.entity IN (".getEntity('societe').")";
 	if ($socid)
 	{
         $sql.=" AND (";
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 02c1410fcbf..ad82db3e008 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -114,7 +114,7 @@ class Contacts extends DolibarrApi
 			$sql.= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc"; 
 		}
 		$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON t.fk_soc = s.rowid";
-		$sql.= ' WHERE t.entity IN (' . getEntity('socpeople', 1) . ')';
+		$sql.= ' WHERE t.entity IN (' . getEntity('socpeople') . ')';
 		if ($socids) $sql.= " AND t.fk_soc IN (" . $socids . ")";
 
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0)
diff --git a/htdocs/societe/class/api_deprecated_contact.class.php b/htdocs/societe/class/api_deprecated_contact.class.php
index 8cb61fa3eb0..bfa032f13c4 100644
--- a/htdocs/societe/class/api_deprecated_contact.class.php
+++ b/htdocs/societe/class/api_deprecated_contact.class.php
@@ -126,7 +126,7 @@ class ContactApi extends DolibarrApi
 			$sql.= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc"; 
 		}
 		$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON c.fk_soc = s.rowid";
-		$sql.= ' WHERE  c.entity IN (' . getEntity('socpeople', 1) . ')';
+		$sql.= ' WHERE  c.entity IN (' . getEntity('socpeople') . ')';
 		if ($socid)
 			$sql.= " AND c.fk_soc = " . $socid;
 
diff --git a/htdocs/societe/class/api_deprecated_thirdparty.class.php b/htdocs/societe/class/api_deprecated_thirdparty.class.php
index a8146f4cca6..bca74ba8ae2 100644
--- a/htdocs/societe/class/api_deprecated_thirdparty.class.php
+++ b/htdocs/societe/class/api_deprecated_thirdparty.class.php
@@ -178,7 +178,7 @@ class ThirdpartyApi extends DolibarrApi
         if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
         if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
         if ($mode == 3) $sql.= " AND s.client IN (0)";
-        $sql.= ' AND s.entity IN ('.getEntity('societe', 1).')';
+        $sql.= ' AND s.entity IN ('.getEntity('societe').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";
         if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
         if ($socid) $sql.= " AND s.rowid = ".$socid;
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 507fd62ec48..24cf991da52 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -119,7 +119,7 @@ class Thirdparties extends DolibarrApi
         if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
         if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
         if ($mode == 3) $sql.= " AND t.client IN (0)";
-        $sql.= ' AND t.entity IN ('.getEntity('societe', 1).')';
+        $sql.= ' AND t.entity IN ('.getEntity('societe').')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
         //if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
         if ($socid) $sql.= " AND t.rowid IN (".$socids.")";
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ebd06dbd5c4..2610ea7071f 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1248,7 +1248,7 @@ class Societe extends CommonObject
 
     	// Generation requete recherche
     	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
-    	$sql.= " WHERE entity IN (".getEntity('category',1).")";
+    	$sql.= " WHERE entity IN (".getEntity('category').")";
     	if (! empty($type))
     	{
     		if ($type == 1 || $type == 2)
@@ -2640,7 +2640,7 @@ class Societe extends CommonObject
         }
 
          //Verify duplicate entries
-        $sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe',1).")";
+        $sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
         if($socid) $sql .= " AND rowid <> ".$socid;
         $resql = $this->db->query($sql);
         if ($resql)
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index c3508bd0cef..0973de848b5 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -107,7 +107,7 @@ $total=0;
 $sql = "SELECT s.rowid, s.client, s.fournisseur";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= ' WHERE s.entity IN ('.getEntity('societe', 1).')';
+$sql.= ' WHERE s.entity IN ('.getEntity('societe').')';
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid)	$sql.= " AND s.rowid = ".$socid;
 if (! $user->rights->fournisseur->lire) $sql.=" AND (s.fournisseur <> 1 OR s.client <> 0)";    // client=0, fournisseur=0 must be visible
@@ -184,7 +184,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
 	$sql.= " WHERE c.type = 2";
 	if (! is_numeric($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) $sql.= " AND c.label like '".$db->escape($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)."'";
-	$sql.= " AND c.entity IN (".getEntity('category',1).")";
+	$sql.= " AND c.entity IN (".getEntity('category').")";
 	$sql.= " GROUP BY c.label";
 	$total=0;
 	$result = $db->query($sql);
@@ -248,7 +248,7 @@ $sql.= ", s.logo";
 $sql.= ", s.canvas, s.tms as datem, s.status as status";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= ' WHERE s.entity IN ('.getEntity('societe', 1).')';
+$sql.= ' WHERE s.entity IN ('.getEntity('societe').')';
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid)	$sql.= " AND s.rowid = ".$socid;
 if (! $user->rights->fournisseur->lire) $sql.=" AND (s.fournisseur != 1 OR s.client != 0)";
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 51d4b41e6bb..3ab173e958b 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -396,7 +396,7 @@ $sql.= " ,".MAIN_DB_PREFIX."c_stcomm as st";
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale || (!$user->rights->societe->client->voir && !$socid)) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE s.fk_stcomm = st.id";
-$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND s.entity IN (".getEntity('societe').")";
 if (! $user->rights->societe->client->voir && ! $socid)	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid)           $sql.= " AND s.rowid = ".$socid;
 if ($search_sale)     $sql.= " AND s.rowid = sc.fk_soc";        // Join for the needed table to filter by sale
diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php
index 02125e8fad8..ebebb23494c 100644
--- a/htdocs/societe/notify/index.php
+++ b/htdocs/societe/notify/index.php
@@ -64,7 +64,7 @@ $sql.= " ".MAIN_DB_PREFIX."societe as s";
 $sql.= " WHERE n.fk_contact = c.rowid";
 $sql.= " AND a.rowid = n.fk_action";
 $sql.= " AND n.fk_soc = s.rowid";
-$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+$sql.= " AND s.entity IN (".getEntity('societe').")";
 if ($socid > 0)	$sql.= " AND s.rowid = " . $user->societe_id;
 
 $sql.= $db->order($sortfield,$sortorder);
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 7019933fb9c..35914750ddc 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2185,7 +2185,7 @@ class SupplierProposal extends CommonObject
         $prodids = array();
         $sql = "SELECT rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product', 1).")";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
         $resql = $this->db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 2c10e2451a6..a5d1d6cdc0f 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -266,7 +266,7 @@ if ($search_user > 0)
     $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= ' WHERE sp.fk_soc = s.rowid';
-$sql.= ' AND sp.entity IN ('.getEntity('supplier_proposal', 1).')';
+$sql.= ' AND sp.entity IN ('.getEntity('supplier_proposal').')';
 if (! $user->rights->societe->client->voir && ! $socid) //restriction
 {
 	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index af1b8441293..f119fa36ffa 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -77,7 +77,7 @@ class Users extends DolibarrApi
 	
 	    $sql = "SELECT t.rowid";
 	    $sql.= " FROM ".MAIN_DB_PREFIX."user as t";
-	    $sql.= ' WHERE t.entity IN ('.getEntity('user', 1).')';
+	    $sql.= ' WHERE t.entity IN ('.getEntity('user').')';
 	    if ($user_ids) $sql.=" AND t.rowid IN (".$user_ids.")";
 	    // Add sql filters
         if ($sqlfilters) 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index e09e52c1882..869059d359b 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2529,7 +2529,7 @@ class User extends CommonObject
 		$sql = "SELECT fk_user as id_parent, rowid as id_son";
 		$sql.= " FROM ".MAIN_DB_PREFIX."user";
 		$sql.= " WHERE fk_user <> 0";
-		$sql.= " AND entity IN (".getEntity('user',1).")";
+		$sql.= " AND entity IN (".getEntity('user').")";
 
 		dol_syslog(get_class($this)."::load_parentof", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2579,7 +2579,7 @@ class User extends CommonObject
 		}
 		else
 		{
-			$sql.= " WHERE u.entity IN (".getEntity('user',1).")";
+			$sql.= " WHERE u.entity IN (".getEntity('user').")";
 		}
 		if ($filter) $sql.=" AND ".$filter;
 
@@ -2764,7 +2764,7 @@ class User extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
         $sql.= " WHERE u.statut > 0";
         //$sql.= " AND employee != 0";
-        $sql.= " AND u.entity IN (".getEntity('user', 1).")";
+        $sql.= " AND u.entity IN (".getEntity('user').")";
 
         $resql=$this->db->query($sql);
         if ($resql)
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 8333acbbb79..898851d2108 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -200,7 +200,7 @@ if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf
 }
 else
 {
-	$sql.= " WHERE u.entity IN (".getEntity('user',1).")";
+	$sql.= " WHERE u.entity IN (".getEntity('user').")";
 }
 if ($socid > 0) $sql.= " AND u.fk_soc = ".$socid;
 //if ($search_user != '')       $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user);
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index bbfc655a0bd..792a0f67e93 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -73,7 +73,7 @@ class ProductAttribute
 			return -1;
 		}
 
-		$sql = "SELECT rowid, ref, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product', 1).")";
+		$sql = "SELECT rowid, ref, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -100,7 +100,7 @@ class ProductAttribute
 	{
 		$return = array();
 
-		$sql = 'SELECT rowid, ref, label, rang FROM '.MAIN_DB_PREFIX."product_attribute WHERE entity IN (".getEntity('product', 1).')';
+		$sql = 'SELECT rowid, ref, label, rang FROM '.MAIN_DB_PREFIX."product_attribute WHERE entity IN (".getEntity('product').')';
 		$sql .= $this->db->order('rang', 'asc');
 		$query = $this->db->query($sql);
 		if ($query)
@@ -202,7 +202,7 @@ class ProductAttribute
 	public function countChildProducts()
 	{
 		$sql = "SELECT COUNT(*) count FROM ".MAIN_DB_PREFIX."product_attribute_combination2val pac2v
-		LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac2v.fk_prod_combination = pac.rowid WHERE pac2v.fk_prod_attr = ".(int) $this->id." AND pac.entity IN (".getEntity('product', 1).")";
+		LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac2v.fk_prod_combination = pac.rowid WHERE pac2v.fk_prod_attr = ".(int) $this->id." AND pac.entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index 399137dca18..02ef86a9222 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -68,7 +68,7 @@ class ProductAttributeValue
 	 */
 	public function fetch($valueid)
 	{
-		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $valueid." AND entity IN (".getEntity('product', 1).")";
+		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $valueid." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 155d92af532..f6eb4c58935 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -86,7 +86,7 @@ class ProductCombination
 	 */
 	public function fetch($rowid)
 	{
-		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE rowid = ".(int) $rowid." AND entity IN (".getEntity('product', 1).")";
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE rowid = ".(int) $rowid." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -118,7 +118,7 @@ class ProductCombination
 	 */
 	public function fetchByFkProductChild($fk_child)
 	{
-		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".(int) $fk_child." AND entity IN (".getEntity('product', 1).")";
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".(int) $fk_child." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -150,7 +150,7 @@ class ProductCombination
 	 */
 	public function fetchAllByFkProductParent($fk_product_parent)
 	{
-		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product', 1).")";
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -185,7 +185,7 @@ class ProductCombination
 	public function countNbOfCombinationForFkProductParent($fk_product_parent)
 	{
 	    $nb = 0;
-	    $sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product', 1).")";
+	    $sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product').")";
 	
 	    $resql = $this->db->query($sql);
 	    if ($resql) {
diff --git a/htdocs/websites/class/websitepage.class.php b/htdocs/websites/class/websitepage.class.php
index c80d20fe44b..c454a7d3502 100644
--- a/htdocs/websites/class/websitepage.class.php
+++ b/htdocs/websites/class/websitepage.class.php
@@ -205,7 +205,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.tms as date_modification";
 
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		//$sql .= ' WHERE entity IN ('.getEntity('website', 1).')';       // entity is on website level
+		//$sql .= ' WHERE entity IN ('.getEntity('website').')';       // entity is on website level
 		$sql .= ' WHERE 1 = 1';
 		if (null !== $website_id) {
 		    $sql .= " AND t.fk_website = '" . $this->db->escape($website_id) . "'";

From aa780ea33b3164656c71aa3231e53f76ef14bcba Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 30 May 2017 19:15:37 +0200
Subject: [PATCH 0983/1163] Fix: missing dot

---
 .../compta/deplacement/class/deplacement.class.php |  2 +-
 htdocs/compta/facture/class/facture.class.php      |  2 +-
 htdocs/contrat/class/contrat.class.php             |  2 +-
 htdocs/contrat/index.php                           | 14 +++++++-------
 htdocs/core/class/html.form.class.php              |  2 +-
 htdocs/core/class/html.formmail.class.php          |  6 +++---
 htdocs/projet/class/project.class.php              |  2 +-
 htdocs/projet/class/task.class.php                 |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 2cfed45c9d4..6fb146c205b 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -223,7 +223,7 @@ class Deplacement extends CommonObject
 	{
 		$sql = "SELECT rowid, fk_user, type, fk_statut, km, fk_soc, dated, note_private, note_public, fk_projet, extraparams";
 		$sql.= " FROM ".MAIN_DB_PREFIX."deplacement";
-		$sql.= " WHERE entity IN (".getEntity('deplacement', false)")";
+		$sql.= " WHERE entity IN (".getEntity('deplacement', false).")";
 		if ($ref) $sql.= " AND ref ='".$this->db->escape($ref)."'";
 		else $sql.= " AND rowid = ".$id;
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 36d59c36c9a..50ccf788bf5 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3964,7 +3964,7 @@ class Facture extends CommonInvoice
 	function newCycle()
 	{
 		$sql = 'SELECT max(situation_cycle_ref) FROM ' . MAIN_DB_PREFIX . 'facture as f';
-		$sql.= " WHERE f.entity in (".getEntity('facture', false)")";
+		$sql.= " WHERE f.entity in (".getEntity('facture', false).")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($resql->num_rows > 0)
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 762a22889c6..9632d1766e6 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -504,7 +504,7 @@ class Contrat extends CommonObject
 		if ($ref)
 		{
 			$sql.= " WHERE ref='".$this->db->escape($ref)."'";
-			$sql.= " AND entity IN (".getEntity('contract', false)")";
+			$sql.= " AND entity IN (".getEntity('contract', false).")";
 		}
 		else $sql.= " WHERE rowid=".$id;
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 3cff590bc4b..608a1167fba 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -107,7 +107,7 @@ $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql.= " AND (cd.statut != 4 OR (cd.statut = 4 AND (cd.date_fin_validite is null or cd.date_fin_validite >= '".$db->idate($now)."')))";
-$sql.= " AND c.entity IN (".getEntity('contract', false)")";
+$sql.= " AND c.entity IN (".getEntity('contract', false).")";
 if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY cd.statut";
@@ -144,7 +144,7 @@ $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql.= " AND (cd.statut = 4 AND cd.date_fin_validite < '".$db->idate($now)."')";
-$sql.= " AND c.entity IN (".getEntity('contract', false)")";
+$sql.= " AND c.entity IN (".getEntity('contract', false).")";
 if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY cd.statut";
@@ -230,7 +230,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE s.rowid = c.fk_soc";
-	$sql.= " AND c.entity IN (".getEntity('contract', false)")";
+	$sql.= " AND c.entity IN (".getEntity('contract', false).")";
 	$sql.= " AND c.statut = 0";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
@@ -302,7 +302,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= " ".MAIN_DB_PREFIX.
 $sql.= " ".MAIN_DB_PREFIX."contrat as c";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
 $sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity IN (".getEntity('contract', false)")";
+$sql.= " AND c.entity IN (".getEntity('contract', false).")";
 $sql.= " AND c.statut > 0";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND s.rowid = ".$socid;
@@ -372,7 +372,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= ") LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', false)")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', false).")";
 $sql.= " AND cd.fk_contrat = c.rowid";
 $sql.= " AND c.fk_soc = s.rowid";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -450,7 +450,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', false)")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', false).")";
 $sql.= " AND c.statut = 1";
 $sql.= " AND cd.statut = 0";
 $sql.= " AND cd.fk_contrat = c.rowid";
@@ -529,7 +529,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', false)")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', false).")";
 $sql.= " AND c.statut = 1";
 $sql.= " AND cd.statut = 4";
 $sql.= " AND cd.date_fin_validite < '".$db->idate($now)."'";
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b72a451a41c..1244001da57 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4352,7 +4352,7 @@ class Form
 		$TCurrency = array();
 
 		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
-		$sql.= " WHERE entity IN ('".getEntity('mutlicurrency', false)"')";
+		$sql.= " WHERE entity IN ('".getEntity('mutlicurrency', false)."')";
 		$resql = $db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index feac8b20cec..fce080bdcf4 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -843,7 +843,7 @@ class FormMail extends Form
 		$sql = "SELECT label, topic, content, content_lines, lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity('c_email_templates', false)")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', false).")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
@@ -910,7 +910,7 @@ class FormMail extends Form
 		$sql = "SELECT label, topic, content, lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity('c_email_templates', false)")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', false).")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
 		$sql.= $this->db->order("lang,label","ASC");
@@ -947,7 +947,7 @@ class FormMail extends Form
 		$sql = "SELECT rowid, label, topic, content, content_lines, lang, position";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity('c_email_templates', false)")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', false).")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 7cb6c29de1a..ba394f1b8e6 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1681,7 +1681,7 @@ class Project extends CommonObject
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
         $sql.= " WHERE p.fk_statut = 1";
-        $sql.= " AND p.entity IN (".getEntity('project', false)')';
+        $sql.= " AND p.entity IN (".getEntity('project', false).')';
         if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index c21669daf3b..b751f8f0478 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1704,7 +1704,7 @@ class Task extends CommonObject
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
         $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-        $sql.= " WHERE p.entity IN (".getEntity('project', false)')';
+        $sql.= " WHERE p.entity IN (".getEntity('project', false).')';
         $sql.= " AND p.fk_statut = 1";
         $sql.= " AND t.fk_projet = p.rowid";
         $sql.= " AND t.progress < 100";         // tasks to do

From 48a6e9e03808cbc2a8c9b43f69392aede20c0e92 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 30 May 2017 22:31:57 +0200
Subject: [PATCH 0984/1163] Removed not used files

---
 htdocs/modulebuilder/index.html               |   0
 htdocs/modulebuilder/oldskeletons/.gitignore  |   2 -
 htdocs/modulebuilder/oldskeletons/README      |  34 -
 .../oldskeletons/build_api_class.php          | 123 ----
 .../oldskeletons/build_class_from_table.php   | 677 ------------------
 .../build_webservice_from_class.php           | 179 -----
 .../oldskeletons/modMyModule.class.php        | 291 --------
 .../oldskeletons/skeleton_api_class.class.php | 289 --------
 .../oldskeletons/skeleton_card.php            | 604 ----------------
 .../oldskeletons/skeleton_class.class.php     | 606 ----------------
 .../oldskeletons/skeleton_list.php            | 570 ---------------
 .../oldskeletons/skeleton_script.php          | 166 -----
 .../skeleton_webservice_server.php            | 272 -------
 .../stock/class/api_stockmovements.class.php  |   1 +
 14 files changed, 1 insertion(+), 3813 deletions(-)
 create mode 100644 htdocs/modulebuilder/index.html
 delete mode 100644 htdocs/modulebuilder/oldskeletons/.gitignore
 delete mode 100644 htdocs/modulebuilder/oldskeletons/README
 delete mode 100755 htdocs/modulebuilder/oldskeletons/build_api_class.php
 delete mode 100755 htdocs/modulebuilder/oldskeletons/build_class_from_table.php
 delete mode 100755 htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/modMyModule.class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_card.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_list.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_script.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php

diff --git a/htdocs/modulebuilder/index.html b/htdocs/modulebuilder/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/modulebuilder/oldskeletons/.gitignore b/htdocs/modulebuilder/oldskeletons/.gitignore
deleted file mode 100644
index 2dda6229d24..00000000000
--- a/htdocs/modulebuilder/oldskeletons/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-out.*
-socpeople*
diff --git a/htdocs/modulebuilder/oldskeletons/README b/htdocs/modulebuilder/oldskeletons/README
deleted file mode 100644
index 5b5b992d91e..00000000000
--- a/htdocs/modulebuilder/oldskeletons/README
+++ /dev/null
@@ -1,34 +0,0 @@
-README (English)
---------------------------------
-This directory contains PHP script samples that can be used to start a development on Dolibarr.
-
-
-*** build_class_from_table.php:
-
-This is the script to use to generate PHP code of a PHP POJO class
-object, a PHP script that use this POJO. This script use the files
-skeleton_*.php to build its generated code. 
-
-
-*** modMyModule.class.php:
-
-Is a sample of module descriptor that you can use if you want to build a new module/plugin for
-Dolibarr.
-
-
-*** skeleton_script.php:
-
-Is a sample you can use as an example if you need to build a script to run on command line
-
-
-*** skeleton_page.php:
-
-Is a sample you can use as an example if you need to build an HTML page to include in Dolibarr GUI.
-
-
-*** skeleton_class.class.php:
-
-Is a sample you can use as an example if you need to build a class file to access a new table required by a Dolibarr development.
-However it is better to run the build_class_from_table.php script that accepts a table name as a parameter and will uses the description table within database and the skeleton_class.class.php file to generate full code for your class file.
-After running this script, the class to access your table (insert a record, update, delete and select) is directly finished and can be used by your module's code. 
-No more coding is needed to get access to table with this script because the file is completely generated once.
diff --git a/htdocs/modulebuilder/oldskeletons/build_api_class.php b/htdocs/modulebuilder/oldskeletons/build_api_class.php
deleted file mode 100755
index 6263eabcd6e..00000000000
--- a/htdocs/modulebuilder/oldskeletons/build_api_class.php
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2015   Jean-François Ferry <jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_api_class.php
- *  \ingroup    core
- *  \brief      Create a complete API class file from existant class file
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='1';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_API_FROM_CLASS --------------------
-
-// Check parameters
-if (! isset($argv[1]) && ! isset($argv[2]))
-{
-    print "Usage: $script_file phpClassFile phpClassName\n";
-    exit;
-}
-// Show parameters
-print 'Classfile='.$argv[1]."\n";
-print 'Classname='.$argv[2]."\n";
-
-$classfile=$argv[1];
-$classname=$argv[2];
-$classmin=strtolower($classname);
-$classnameApi = $classname.'Api';
-$property=array();
-$targetcontent='';
-
-// Load the class and read properties
-require_once($classfile);
-
-$property=array();
-$class = new $classname($db);
-$values=get_class_vars($classname);
-
-unset($values['db']);
-unset($values['error']);
-unset($values['errors']);
-unset($values['element']);
-unset($values['table_element']);
-unset($values['table_element_line']);
-unset($values['fk_element']);
-unset($values['ismultientitymanaged']);
-
-// Read skeleton_api_class.class.php file
-$skeletonfile=$path.'skeleton_api_class.class.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile='out.api_'.$classmin.'.class.php';
-$targetcontent=$sourcecontent;
-
-// Substitute class name
-$targetcontent=preg_replace('/skeleton_api_class\.class\.php/', 'api_'.$classmin.'.class.php', $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-//$targetcontent=preg_replace('/\$table_element=\'skeleton\'/', '\$table_element=\''.$tablenoprefix.'\'', $targetcontent);
-$targetcontent=preg_replace('/SkeletonApi/', $classnameApi, $targetcontent);
-$targetcontent=preg_replace('/Skeleton/', $classname, $targetcontent);
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "\n";
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You can now rename generated files by removing the 'out.' prefix in their name and store them into directory /module/class.\n";
-return $error;
diff --git a/htdocs/modulebuilder/oldskeletons/build_class_from_table.php b/htdocs/modulebuilder/oldskeletons/build_class_from_table.php
deleted file mode 100755
index 0e5a6d82a82..00000000000
--- a/htdocs/modulebuilder/oldskeletons/build_class_from_table.php
+++ /dev/null
@@ -1,677 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2008-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_class_from_table.php
- *  \ingroup    core
- *  \brief      Create a complete class file from a table in database
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='3.2';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-// Check parameters
-if (! isset($argv[1]) || ! isset($argv[2]) || (isset($argv[3]) && ! isset($argv[7])))
-{
-    print "Usage: $script_file tablename modulename [server port databasename user pass]\n";
-    exit;
-}
-
-if (isset($argv[3]) && isset($argv[4]) && isset($argv[5]) && isset($argv[6]) && isset($argv[7]))
-{
-	print 'Use specific database ids'."\n";
-	$db=getDoliDBInstance('mysqli',$argv[3],$argv[6],$argv[7],$argv[5],$argv[4]);
-}
-
-if ($db->type != 'mysql' && $db->type != 'mysqli')
-{
-	print "Error: This script works with mysql or mysqli driver only\n";
-	exit;
-}
-
-$table=$argv[1];
-$module=$argv[2];
-
-// Show parameters
-print 'Tablename: '.$table."\n";
-print 'Modulename: '.$module."\n";
-print "Current dir: ".getcwd()."\n";
-print "Database name: ".$db->database_name."\n";
-
-
-// Define array with list of properties
-$property=array();
-$foundprimary=0;
-$resql=$db->DDLDescTable($table);
-if ($resql)
-{
-	$i=0;
-	while($obj=$db->fetch_object($resql))
-	{
-		//var_dump($obj);
-		$i++;
-		$property[$i]['field']=$obj->Field;
-		if ($obj->Key == 'PRI')
-		{
-			$property[$i]['primary']=1;
-			$foundprimary=1;
-		}
-		else
-		{
-			$property[$i]['primary']=1;
-		}
-		$property[$i]['type'] =$obj->Type;
-		$property[$i]['null'] =$obj->Null;
-		$property[$i]['extra']=$obj->Extra;
-		if ($property[$i]['type'] == 'date'
-			|| $property[$i]['type'] == 'datetime'
-			|| $property[$i]['type'] == 'timestamp')
-		{
-			$property[$i]['istime']=true;
-		}
-		else
-		{
-			$property[$i]['istime']=false;
-		}
-		if (preg_match('/varchar/i',$property[$i]['type'])
-			|| preg_match('/text/i',$property[$i]['type']))
-		{
-			$property[$i]['ischar']=true;
-		}
-		else
-		{
-			$property[$i]['ischar']=false;
-		}
-		if (preg_match('/int/i',$property[$i]['type']))
-		{
-			$property[$i]['isint']=true;
-		}
-		else
-		{
-			$property[$i]['isint']=false;
-		}
-	}
-}
-else
-{
-	print "Error: Failed to get description for table '".$table."'.\n";
-	return false;
-}
-//var_dump($property);
-
-// Define substitute fetch/select parameters
-$varpropselect="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-    $i++;
-    if ($prop['field'] != 'rowid')
-    {
-        $varpropselect.="\t\t\$sql .= \" ";
-        $varpropselect.="t.".$prop['field'];
-        if ($i < count($property)) $varpropselect.=",";
-        $varpropselect.="\";";
-        $varpropselect.="\n";
-    }
-}
-
-
-
-//--------------------------------
-// Build skeleton_class.class.php
-//--------------------------------
-
-// Define working variables
-$table=strtolower($table);
-$tablenoprefix=preg_replace('/'.preg_quote(MAIN_DB_PREFIX,'/').'/i','',$table);
-$classname=preg_replace('/_/','',ucfirst($tablenoprefix));
-$classmin=preg_replace('/_/','',strtolower($classname));
-
-
-// Read skeleton_class.class.php file
-$skeletonfile=$path.'skeleton_class.class.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile=$classmin.'.class.php';
-$targetcontent=$sourcecontent;
-
-// Substitute module name
-$targetcontent=preg_replace('/dev\/skeletons/', $module, $targetcontent);
-$targetcontent=preg_replace('/mymodule othermodule1 othermodule2/', $module, $targetcontent);
-$targetcontent=preg_replace('/mymodule/', $module, $targetcontent);
-
-// Substitute class name
-$targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
-$targetcontent=preg_replace('/\$element = \'skeleton\'/', '\$element = \''.$classmin.'\'', $targetcontent);
-$targetcontent=preg_replace('/\$table_element = \'skeleton\'/', '\$table_element = \''.$tablenoprefix.'\'', $targetcontent);
-$targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
-$targetcontent=preg_replace('/skeletons/', $classmin, $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-
-// Substitute comments
-$targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
-$targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
-$targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
-
-// Substitute table name
-$targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
-
-// Substitute declaration parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\tpublic \$".$prop['field'];
-		if ($prop['istime']) $varprop.=" = ''";
-		$varprop.=";";
-		if ($prop['comment']) $varprop.="\t// ".$prop['extra'];
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/'.preg_quote('public $prop1;','/').'/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/'.preg_quote('public $prop2;','/').'/', '', $targetcontent);
-
-$targetcontent=preg_replace('/\*((\s|\n|\r|\t)*)\@var mixed Sample property 1((\s|\n|\r|\t)*)/', '', $targetcontent);
-$targetcontent=preg_replace('/\*((\s|\n|\r|\t)*)\@var mixed Sample property 2((\s|\n|\r|\t)*)/', '', $targetcontent);
-
-// Substitute clean parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-	{
-		$varprop.="\t\tif (isset(\$this->".$prop['field'].")) {\n\t\t\t \$this->".$prop['field']." = trim(\$this->".$prop['field'].");\n\t\t}";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/if \(isset\(\$this->prop1\)\) {((\n|\r|\t)*)\$this->prop1 = trim\(\$this->prop1\);((\n|\r|\t)*)}/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/if \(isset\(\$this->prop2\)\) {((\n|\r|\t)*)\$this->prop2 = trim\(\$this->prop2\);((\n|\r|\t)*)}/', '', $targetcontent);
-
-
-$no_output_field=0;
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] == 'tms') $no_output_field++;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $no_output_field++;
-}
-// Substitute insert into parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	$i++;
-	$addfield=1;
-	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-
-	if ($addfield)
-	{
-		$varprop.="\t\t\$sql.= '".$prop['field'];
-		if ($i < (count($property)-$no_output_field)) $varprop.=",";
-		$varprop.="';";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$sql \.= \' field1,\';/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= \' field2\';/', '', $targetcontent);
-
-// Substitute insert values parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-//Count nb field to output to manage commat at end SQL instruction
-
-
-foreach($property as $key => $prop)
-{
-	
-	$addfield=1;
-	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-	
-	if ($addfield)
-	{
-		$i++;
-		
-		$varprop.="\t\t\$sql .= ' ";
-		if ($prop['field']=='datec')
-		{
-			$varprop.='\'."\'".$this->db->idate(dol_now())."\'"';
-		}
-		elseif ($prop['istime'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].')==0?\'NULL\':"\'".$this->db->idate(';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.=").\"'\")";
-		}
-		elseif ($prop['ischar'])
-		{
-			$varprop.="'.(! isset(\$this->".$prop['field'].")?'NULL':\"'\".";
-			$varprop.="\$this->db->escape(\$this->".$prop['field'].")";
-			$varprop.=".\"'\")";
-		}
-		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_m' ||  $prop['field']=='fk_user_author')
-		{
-			$varprop.="'.\$user->id";
-		}
-		elseif ($prop['isint'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.=')';
-		}
-		else
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':"\'".';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.='."\'")';
-		}
-		
-		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
-		$varprop.=';';
-		$varprop.="\n";
-	}
-}
-
-$patern1='/\$sql \.= \' (.*)\' \. \$this->prop1 \. \'(.*),\';/';
-$patern2='/\$sql \.= \' (.*)\' \. \$this->prop2 \. \'(.*)\';/';
-$targetcontent=preg_replace($patern1, $varprop, $targetcontent);
-$targetcontent=preg_replace($patern2, '', $targetcontent);
-
-// Substitute update values parameters
-
-//Count nb field to output to manage commat at end SQL instruction
-$no_output_field=0;
-foreach($property as $key => $prop)
-{
-	if ($prop['extra'] == 'auto_increment') $no_output_field++;
-}
-
-$varprop="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	
-	$addfield=1;
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-	
-	if ($addfield)
-	{
-		$i++;
-		
-		$varprop.="\t\t\$sql .= ' ";
-		$varprop.=$prop['field'].' = ';
-		if ($prop['field']=='tms') {
-			$varprop.='\'.(dol_strlen($this->'.$prop['field'].') != 0 ? "\'".$this->db->idate(';
-			$varprop.='$this->'.$prop['field'];
-			$varprop.=')."\'" : "\'".$this->db->idate(dol_now())."\'")';
-		}
-		elseif ($prop['istime'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].') != 0 ? "\'".$this->db->idate(';
-			$varprop.='$this->'.$prop['field'];
-			$varprop.=')."\'" : \'null\')';
-		}
-		
-		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_m') {
-			$varprop.="'.\$user->id";
-		}
-		else
-		{
-			$varprop.="'.";
-			if ($prop['ischar']) $varprop.='(isset($this->'.$prop['field'].')?"\'".$this->db->escape($this->'.$prop['field'].')."\'":"null")';
-			elseif ($prop['isint']) $varprop.='(isset($this->'.$prop['field'].')?$this->'.$prop['field'].':"null")';
-			else $varprop.='(isset($this->'.$prop['field'].')?$this->'.$prop['field'].':"null")';
-		}
-
-		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
-		$varprop.=';';
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$sql \.= " field1=".\(isset\(\$this->field1\)\?"\'".\$this->db->escape\(\$this->field1\)."\'":"null"\).",";/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= " field2=".\(isset\(\$this->field2\)\?"\'".\$this->db->escape\(\$this->field2\)."\'":"null"\)."";/', '', $targetcontent);
-
-// Substitute fetch/select parameters
-$targetcontent=preg_replace('/\$sql \.= \' t\.field1,\';/', $varpropselect, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= \' t\.field2\';/', '', $targetcontent);
-
-// Substitute select set parameters
-$varprop="\n";
-$varpropline="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	$i++;
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\t\t\t\t\$this->".$prop['field']." = ";
-		if ($prop['istime']) $varprop.='$this->db->jdate(';
-		$varprop.='$obj->'.$prop['field'];
-		if ($prop['istime']) $varprop.=')';
-		$varprop.=";";
-		$varprop.="\n";
-		
-		$varpropline.="\t\t\t\t\$line->".$prop['field']." = ";
-		if ($prop['istime']) $varpropline.='$this->db->jdate(';
-		$varpropline.='$obj->'.$prop['field'];
-		if ($prop['istime']) $varpropline.=')';
-		$varpropline.=";";
-		$varpropline.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$this->prop1 = \$obj->field1;/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$this->prop2 = \$obj->field2;/', '', $targetcontent);
-
-//Substirute fetchAll
-$targetcontent=preg_replace('/\$line->prop1 = \$obj->field1;/', $varpropline, $targetcontent);
-$targetcontent=preg_replace('/\$line->prop2 = \$obj->field2;/', '', $targetcontent);
-
-
-// Substitute initasspecimen parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\t\t\$this->".$prop['field']." = '';";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$this->prop1 = \'prop1\';/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$this->prop2 = \'prop2\';/', '', $targetcontent);
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "\n";
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-
-
-//--------------------------------------------------------------------
-// Build skeleton_script.php, skeleton_list.php and skeleton_card.php
-//--------------------------------------------------------------------
-
-$skeletonfiles=array(
-    $path.'skeleton_script.php' => $classmin.'_script.php', 
-    $path.'skeleton_list.php' => $classmin.'_list.php', 
-    $path.'skeleton_card.php' => $classmin.'_card.php'
-    );
-    
-foreach ($skeletonfiles as $skeletonfile => $outfile)
-{
-    $sourcecontent=file_get_contents($skeletonfile);
-    if (! $sourcecontent)
-    {
-    	print "\n";
-    	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-    	print "Try to run script from skeletons directory.\n";
-    	exit;
-    }
-    
-    // Define output variables
-    $targetcontent=$sourcecontent;
-    
-    // Substitute module name
-    $targetcontent=preg_replace('/dev\/skeletons/', $module, $targetcontent);
-    $targetcontent=preg_replace('/mymodule othermodule1 othermodule2/', $module, $targetcontent);
-    $targetcontent=preg_replace('/mymodule/', $module, $targetcontent);
-    
-    // Substitute class name
-    $targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
-    $targetcontent=preg_replace('/skeleton_script\.php/', $classmin.'_script.php', $targetcontent);
-    $targetcontent=preg_replace('/\$element = \'skeleton\'/', '\$element=\''.$classmin.'\'', $targetcontent);
-    $targetcontent=preg_replace('/\$table_element = \'skeleton\'/', '\$table_element=\''.$classmin.'\'', $targetcontent);
-    $targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
-    $targetcontent=preg_replace('/skeletons/', $classmin, $targetcontent);
-    $targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-    
-    // Substitute comments
-    $targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
-    $targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
-    $targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
-    
-    // Substitute table name
-    $targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
-        
-    // Substitute GETPOST search_fieldx
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    if ($prop['isint']) $varprop.='$search_'.$prop['field']."=GETPOST('search_".$prop['field']."','int');\n";
-    	    else $varprop.='$search_'.$prop['field']."=GETPOST('search_".$prop['field']."','alpha');\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$search_field1=GETPOST("search_field1");','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$search_field2=GETPOST("search_field2");','/').'/', '', $targetcontent);
-    
-    // Substitute GETPOST fieldx
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    if ($prop['isint']) $varprop.="\t\$object->".$prop['field']."=GETPOST('".$prop['field']."','int');\n";
-    	    else $varprop.="\t\$object->".$prop['field']."=GETPOST('".$prop['field']."','alpha');\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$object->prop1=GETPOST("field1");','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$object->prop2=GETPOST("field2");','/').'/', '', $targetcontent);
-    
-    // Substitute reset search_field = '';
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.='$search_'.$prop['field']."='';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$search_field1=\'\';','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$search_field2=\'\';','/').'/', '', $targetcontent);
-    
-    // Substitute fetch/select parameters
-    $targetcontent=preg_replace('/\$sql\s*\.= " t\.field1,";/', $varpropselect, $targetcontent);
-    $targetcontent=preg_replace('/\$sql\s*\.= " t\.field2";/', '', $targetcontent);
-    
-    // Substitute where for search
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.='if ($search_'.$prop['field'].') $sql.= natural_search("'.$prop['field'].'",$search_'.$prop['field'].');'."\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('if ($search_field1) $sql.= natural_search("field1",$search_field1);','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('if ($search_field2) $sql.= natural_search("field2",$search_field2);','/').'/', '', $targetcontent);
-    
-    // substitute $params.=
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (\$search_".$prop['field']." != '') \$params.= '&amp;search_".$prop['field']."='.urlencode(\$search_".$prop['field'].");\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("if (\$search_field1 != '') \$params.= '&amp;search_field1='.urlencode(\$search_field1);",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("if (\$search_field2 != '') \$params.= '&amp;search_field2='.urlencode(\$search_field2);",'/').'/', '', $targetcontent);
-    
-    // Substitute arrayfields
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="'t.".$prop['field']."'=>array('label'=>\$langs->trans(\"Field".$prop['field']."\"), 'checked'=>1),\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("'t.field1'=>array('label'=>\$langs->trans(\"Field1\"), 'checked'=>1),",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("'t.field2'=>array('label'=>\$langs->trans(\"Field2\"), 'checked'=>1),",'/').'/', '', $targetcontent);
-    
-    // Substitute print_liste_field_titre
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print_liste_field_titre(\$arrayfields['t.".$prop['field']."']['label'],\$_SERVER['PHP_SELF'],'t.".$prop['field']."','',\$params,'',\$sortfield,\$sortorder);\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_TITLE_FIELDS/', $varprop, $targetcontent);
-    
-    // Substitute fields title search
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td class=\"liste_titre\"><input type=\"text\" class=\"flat\" name=\"search_".$prop['field']."\" value=\"'.\$search_".$prop['field'].".'\" size=\"10\"></td>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_TITLE_SEARCH/', $varprop, $targetcontent);
-    
-    // Substitute where for <td>.fieldx.</td>
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td>'.\$obj->".$prop['field'].".'</td>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field1']['checked'])) print '<td>'.\$obj->field1.'</td>';",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field2']['checked'])) print '<td>'.\$obj->field2.'</td>';",'/').'/', '', $targetcontent);
-
-    // LIST_OF_TD_LABEL_FIELDS_CREATE - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td><input class=\"flat\" type=\"text\" name=\"".$prop['field']."\" value=\"'.GETPOST('".$prop['field']."').'\"></td></tr>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_CREATE/', $varprop, $targetcontent);
-
-    // LIST_OF_TD_LABEL_FIELDS_EDIT - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-            $baseString = 'print "<tr><td class=\"fieldrequired\">".\$langs->trans("Field%s")."</td><td><input class=\"flat\" type=\"text\" name=\"%s\" value=\"".$object->%s."\"></td></tr>";';
-            $varprop.= sprintf("\t ".$baseString." \n", $prop['field'], $prop['field'], $prop['field']);
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_EDIT/', $varprop, $targetcontent);
-    
-    // LIST_OF_TD_LABEL_FIELDS_VIEW - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.=sprintf("\t print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field%s\").'</td><td>'.\$object->%s.'</td></tr>';\n",$prop['field'],$prop['field']);
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_VIEW/', $varprop, $targetcontent);
-    
-    
-    // LIST_OF_TD_FIELDS_LIST
-    
-    
-    
-    // Build file
-    $fp=fopen($outfile,"w");
-    if ($fp)
-    {
-    	fputs($fp, $targetcontent);
-    	fclose($fp);
-    	print "File '".$outfile."' has been built in current directory.\n";
-    }
-    else $error++;
-}
-
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You can now move generated files to store them into directory /yourmodule/class (for .class.php file) or /yourmodule.\n";
-return $error;
diff --git a/htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php b/htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
deleted file mode 100755
index c91347a424d..00000000000
--- a/htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_webservice_from_class.php
- *  \ingroup    core
- *  \brief      Create a complete webservice file from CRUD functions of a PHP class
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='1.8';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-// Check parameters
-if (! isset($argv[1]) && ! isset($argv[2]))
-{
-    print "Usage: $script_file phpClassFile phpClassName\n";
-    exit;
-}
-
-// Show parameters
-print 'Classfile='.$argv[1]."\n";
-print 'Classname='.$argv[2]."\n";
-
-$classfile=$argv[1];
-$classname=$argv[2];
-$classmin=strtolower($classname);
-$property=array();
-$targetcontent='';
-
-// Load the class and read properties
-require_once($classfile);
-
-$property=array();
-$class = new $classname($db);
-$values=get_class_vars($classname);
-
-unset($values['db']);
-unset($values['error']);
-unset($values['errors']);
-unset($values['element']);
-unset($values['table_element']);
-unset($values['table_element_line']);
-unset($values['fk_element']);
-unset($values['ismultientitymanaged']);
-
-$properties=array_keys($values);
-
-// Read skeleton_class.class.php file
-$skeletonfile='skeleton_webservice_server.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile='out.server_'.$classmin.'.php';
-$targetcontent=$sourcecontent;
-
-
-
-// Substitute class name
-$targetcontent=preg_replace('/Skeleton/', $classname, $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-
-// Substitute declaration parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-		$varprop.="'".$properties[$i]."' => array('name'=>'".$properties[$i]."','type'=>'xsd:string')";
-		$i++;
-
-		if ($i == count($properties))
-			$varprop.="\n";
-		else
-			$varprop.=",\n";
-}
-
-$targetcontent=preg_replace('/\'prop1\'=>\'xxx\',/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\'prop2\'=>\'xxx\',/', '', $targetcontent);
-// Substitute get method parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-		$varprop.="'".$properties[$i]."' => $".$classmin."->".$properties[$i];
-
-		$i++;
-		if ($i == count($properties))
-			$varprop.="\n";
-		else
-			$varprop.=",\n";
-}
-
-$targetcontent=preg_replace('/\'prop1\'=>\$'.$classmin.'->prop1,/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\'prop2\'=>\$'.$classmin.'->prop2,/', '', $targetcontent);
-
-// Substitute get method parameters
-$varprop="\n\t\t";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-
-	$varprop.='$newobject->'.$properties[$i].'=$'.$classmin.'->'.$properties[$i].';';
-
-	$i++;
-	if ($i == count($properties))
-		$varprop.="\n";
-	else
-		$varprop.="\n\t\t";
-}
-$targetcontent=preg_replace('/\$newobject->prop1=\$'.$classmin.'->prop1;/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$newobject->prop2=\$'.$classmin.'->prop2;/', '', $targetcontent);
-
-
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You must rename files by removing the 'out.' prefix in their name.\n";
-return $error;
diff --git a/htdocs/modulebuilder/oldskeletons/modMyModule.class.php b/htdocs/modulebuilder/oldskeletons/modMyModule.class.php
deleted file mode 100644
index 4f994c7c654..00000000000
--- a/htdocs/modulebuilder/oldskeletons/modMyModule.class.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * 	\defgroup   mymodule     Module MyModule
- *  \brief      Example of a module descriptor.
- *				Such a file must be copied into htdocs/mymodule/core/modules directory.
- *  \file       htdocs/mymodule/core/modules/modMyModule.class.php
- *  \ingroup    mymodule
- *  \brief      Description and activation file for module MyModule
- */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
-
-
-/**
- *  Description and activation class for module MyModule
- */
-class modMyModule extends DolibarrModules
-{
-	/**
-	 * Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 * @param DoliDB $db Database handler
-	 */
-	public function __construct($db)
-	{
-        global $langs,$conf;
-
-        $this->db = $db;
-
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 500000;		// TODO Go on page http://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'mymodule';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','interface','other'
-		// It is used to group modules by family in module setup page
-		$this->family = "other";
-		// Module position in the family
-		$this->module_position = 500;
-		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
-		//$this->familyinfo = array('myownfamily' => array('position' => '001', 'label' => $langs->trans("MyOwnFamily")));
-
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Description of module MyModule";
-		$this->descriptionlong = "A very long description. Can be a full HTML content";
-		$this->editor_name = 'Editor name';
-		$this->editor_url = 'https://www.dolibarr.org';
-		
-		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = '1.0';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Name of image file used for this module.
-		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='generic';
-
-		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-		// for default path (eg: /mymodule/core/xxxxx) (0=disable, 1=enable)
-		// for specific path of parts (eg: /mymodule/core/modules/barcode)
-		// for specific css file (eg: /mymodule/css/mymodule.css.php)
-		//$this->module_parts = array(
-		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
-		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
-		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
-		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
-		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
-		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
-		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
-		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
-		//							'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
-	 	//							'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
-		//							'hooks' => array('hookcontext1','hookcontext2',...) // Set here all hooks context managed by module. You can also set hook context 'all'
-		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
-		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@mymodule')) // Set here all workflow context managed by module
-		//                        );
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/mymodule/temp");
-		$this->dirs = array();
-
-		// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
-		$this->config_page_url = array("mysetuppage.php@mymodule");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("mylangfile@mymodule");
-
-		// Constants
-		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array();
-
-		// Array to add new pages in new tabs
-		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-		// where objecttype can be
-		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-		// 'contact'          to add a tab in contact view
-		// 'contract'         to add a tab in contract view
-		// 'group'            to add a tab in group view
-		// 'intervention'     to add a tab in intervention view
-		// 'invoice'          to add a tab in customer invoice view
-		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
-		// 'opensurveypoll'	  to add a tab in opensurvey poll view
-		// 'order'            to add a tab in customer order view
-		// 'order_supplier'   to add a tab in supplier order view
-		// 'payment'		  to add a tab in payment view
-		// 'payment_supplier' to add a tab in supplier payment view
-		// 'product'          to add a tab in product view
-		// 'propal'           to add a tab in propal view
-		// 'project'          to add a tab in project view
-		// 'stock'            to add a tab in stock view
-		// 'thirdparty'       to add a tab in third party view
-		// 'user'             to add a tab in user view
-        $this->tabs = array();
-
-		if (! isset($conf->mymodule) || ! isset($conf->mymodule->enabled))
-        {
-        	$conf->mymodule=new stdClass();
-        	$conf->mymodule->enabled=0;
-        }
-        
-        // Dictionaries
-		$this->dictionaries=array();
-        /* Example:
-        $this->dictionaries=array(
-            'langs'=>'mylangfile@mymodule',
-            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->mymodule->enabled,$conf->mymodule->enabled,$conf->mymodule->enabled)												// Condition to show each dictionary
-        );
-        */
-
-        // Boxes
-		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array();			// List of boxes
-		// Example:
-		//$this->boxes=array(
-		//    0=>array('file'=>'myboxa.php@mymodule','note'=>'','enabledbydefaulton'=>'Home'),
-		//    1=>array('file'=>'myboxb.php@mymodule','note'=>''),
-		//    2=>array('file'=>'myboxc.php@mymodule','note'=>'')
-		//);
-
-		// Cronjobs
-		$this->cronjobs = array();			// List of cron jobs entries to add
-		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true),
-		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true)
-		// );
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		// $this->rights[$r][1] = 'Permision label';	// Permission label
-		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $r++;
-
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
-
-		// Add here entries to declare new menus
-		//
-		// Example to declare a new Top Menu entry and its Left menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'top',			                // This is a Top menu entry
-		//							'titre'=>'MyModule top menu',
-		//							'mainmenu'=>'mymodule',
-		//							'leftmenu'=>'mymodule',
-		//							'url'=>'/mymodule/pagetop.php',
-		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->mymodule->enabled',	// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-		//
-		// Example to declare a Left Menu entry into an existing Top menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'left',			                // This is a Left menu entry
-		//							'titre'=>'MyModule left menu',
-		//							'mainmenu'=>'xxx',
-		//							'leftmenu'=>'mymodule',
-		//							'url'=>'/mymodule/pagelevel2.php',
-		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->mymodule->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-
-
-		// Exports
-		$r=1;
-
-		// Example:
-		// $this->export_code[$r]=$this->rights_class.'_'.$r;
-		// $this->export_label[$r]='MyModule';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
-        // $this->export_icon[$r]='generic:MyModule';					// Put here code of icon then string for translation key of module name
-		// $this->export_permission[$r]=array(array("mymodule","level1","level2"));
-		// $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef');
-		// $this->export_TypeFields_array[$r]=array('t.date'=>'Date', 't.qte'=>'Numeric', 't.poids'=>'Numeric', 't.fad'=>'Numeric', 't.paq'=>'Numeric', 't.stockage'=>'Numeric', 't.fadparliv'=>'Numeric', 't.livau100'=>'Numeric', 't.forfait'=>'Numeric', 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text');
-		// $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product');
-		// $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		// $this->export_sql_start[$r]='SELECT DISTINCT ';
-		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
-		// $r++;
-	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	public function init($options='')
-	{
-		$sql = array();
-
-		//$this->_load_tables('/mymodule/sql/');
-
-		return $this->_init($sql, $options);
-	}
-
-	/**
-	 * Function called when module is disabled.
-	 * Remove from database constants, boxes and permissions from Dolibarr database.
-	 * Data directories are not deleted
-	 *
-	 * @param      string	$options    Options when enabling module ('', 'noboxes')
-	 * @return     int             	1 if OK, 0 if KO
-	 */
-	public function remove($options = '')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
-
-}
-
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
deleted file mode 100644
index a40b00af72c..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
- use Luracast\Restler\RestException;
-
-
-/**
- * API class for skeleton object
- *
- * @smart-auto-routing false
- * @access protected 
- * @class  DolibarrApiAccess {@requires user,external}
- * 
- *
- */
-class SkeletonApi extends DolibarrApi
-{
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
-     */
-    static $FIELDS = array(
-        'name'
-    );
-
-    /**
-     * @var Skeleton $skeleton {@type Skeleton}
-     */
-    public $skeleton;
-
-    /**
-     * Constructor
-     *
-     * @url     GET skeleton/
-     * 
-     */
-    function __construct()
-    {
-		global $db, $conf;
-		$this->db = $db;
-        $this->skeleton = new Skeleton($this->db);
-    }
-
-    /**
-     * Get properties of a skeleton object
-     *
-     * Return an array with skeleton informations
-     *
-     * @param 	int 	$id ID of skeleton
-     * @return 	array|mixed data without useless information
-	 * 
-     * @url	GET skeleton/{id}
-     * @throws 	RestException
-     */
-    function get($id)
-    {		
-		if(! DolibarrApiAccess::$user->rights->skeleton->read) {
-			throw new RestException(401);
-		}
-			
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		return $this->_cleanObjectDatas($this->skeleton);
-    }
-
-    /**
-     * List skeletons
-     * 
-     * Get a list of skeletons
-     * 
-     * @param int		$mode		Use this param to filter list
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') or (t.import_key:=:'20160101')"
-     * @return array Array of skeleton objects
-     *
-     * @url	GET /skeletons/
-     */
-    function index($mode, $sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '') {
-        global $db, $conf;
-        
-        $obj_ret = array();
-        
-        $socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
-            
-        // If the internal user must only see his customers, force searching by him
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-
-        $sql = "SELECT s.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."skeleton as s";
-        
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-        $sql.= " WHERE s.fk_stcomm = st.id";
-        
-		// Example of use $mode
-        //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
-        //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
-
-        $sql.= ' AND s.entity IN ('.getEntity('skeleton', 1).')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
-        if ($socid) $sql.= " AND s.fk_soc = ".$socid;
-        if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        if ($sqlfilters)
-        {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql.= $db->plimit($limit + 1, $offset);
-        }
-
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($result);
-                $skeleton_static = new Skeleton($db);
-                if($skeleton_static->fetch($obj->rowid)) {
-                    $obj_ret[] = parent::_cleanObjectDatas($skeleton_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve skeleton list');
-        }
-        if( ! count($obj_ret)) {
-            throw new RestException(404, 'No skeleton found');
-        }
-		return $obj_ret;
-    }
-    
-    /**
-     * Create skeleton object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of skeleton
-     * 
-     * @url	POST skeleton/
-     */
-    function post($request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->create) {
-			throw new RestException(401);
-		}
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-        
-        foreach($request_data as $field => $value) {
-            $this->skeleton->$field = $value;
-        }
-        if( ! $this->skeleton->create(DolibarrApiAccess::$user)) {
-            throw new RestException(500);
-        }
-        return $this->skeleton->id;
-    }
-
-    /**
-     * Update skeleton
-     *
-     * @param int   $id             Id of skeleton to update
-     * @param array $request_data   Datas   
-     * @return int 
-     * 
-     * @url	PUT skeleton/{id}
-     */
-    function put($id, $request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->create) {
-			throw new RestException(401);
-		}
-        
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-        foreach($request_data as $field => $value) {
-            $this->skeleton->$field = $value;
-        }
-        
-        if($this->skeleton->update($id, DolibarrApiAccess::$user))
-            return $this->get ($id);
-        
-        return false;
-    }
-    
-    /**
-     * Delete skeleton
-     *
-     * @param   int     $id   Skeleton ID
-     * @return  array
-     * 
-     * @url	DELETE skeleton/{id}
-     */
-    function delete($id)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->supprimer) {
-			throw new RestException(401);
-		}
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-        
-        if( !$this->skeleton->delete($id))
-        {
-            throw new RestException(500);
-        }
-        
-         return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Skeleton deleted'
-            )
-        );
-        
-    }
-    
-    /**
-     * Validate fields before create or update object
-     * 
-     * @param array $data   Data to validate
-     * @return array
-     * 
-     * @throws RestException
-     */
-    function _validate($data)
-    {
-        $skeleton = array();
-        foreach (SkeletonApi::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $skeleton[$field] = $data[$field];
-        }
-        return $skeleton;
-    }
-}
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_card.php b/htdocs/modulebuilder/oldskeletons/skeleton_card.php
deleted file mode 100644
index 49683af79c8..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_card.php
+++ /dev/null
@@ -1,604 +0,0 @@
-<?php
-/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *   	\file       dev/skeletons/skeleton_card.php
- *		\ingroup    mymodule othermodule1 othermodule2
- *		\brief      This file is an example of a php page
- *					Put here some comments
- */
-
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-
-// Change this following line to use the correct relative path (../, ../../, etc)
-$res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
-if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
-if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
-if (! $res) die("Include of main fails");
-// Change this following line to use the correct relative path from htdocs
-include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
-dol_include_once('/mymodule/class/skeleton_class.class.php');
-
-// Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
-
-// Get parameters
-$id			= GETPOST('id','int');
-$action		= GETPOST('action','alpha');
-$cancel     = GETPOST('cancel');
-$backtopage = GETPOST('backtopage');
-$myparam	= GETPOST('myparam','alpha');
-
-$search_field1=GETPOST("search_field1");
-$search_field2=GETPOST("search_field2");
-
-if (empty($action) && empty($id) && empty($ref)) $action='view';
-
-// Protection if external user
-if ($user->societe_id > 0)
-{
-	//accessforbidden();
-}
-//$result = restrictedArea($user, 'mymodule', $id);
-
-
-$object = new Skeleton_Class($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-
-// Load object
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-
-// Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('skeleton'));
-
-
-
-/*
- * ACTIONS
- *
- * Put here all code to do according to value of "action" parameter
- */
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
-	if ($cancel) 
-	{
-		if ($action != 'addlink')
-		{
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-			header("Location: ".$urltogo);
-			exit;
-		}		
-		if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
-		$action='';
-	}
-	
-	// Action to add record
-	if ($action == 'add' && ! empty($user->rights->mymodule->create))
-	{
-		if ($cancel)
-		{
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-			header("Location: ".$urltogo);
-			exit;
-		}
-
-		$error=0;
-
-		/* object_prop_getpost_prop */
-		$object->prop1=GETPOST("field1");
-		$object->prop2=GETPOST("field2");
-
-		if (empty($object->ref))
-		{
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
-		}
-
-		if (! $error)
-		{
-			$result=$object->create($user);
-			if ($result > 0)
-			{
-				// Creation OK
-				$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-				header("Location: ".$urltogo);
-				exit;
-			}
-			{
-				// Creation KO
-				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-				else  setEventMessages($object->error, null, 'errors');
-				$action='create';
-			}
-		}
-		else
-		{
-			$action='create';
-		}
-	}
-
-	// Action to update record
-	if ($action == 'update' && ! empty($user->rights->mymodule->create))
-	{
-		$error=0;
-
-		$object->prop1=GETPOST("field1");
-		$object->prop2=GETPOST("field2");
-
-		if (empty($object->ref))
-		{
-			$error++;
-			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
-		}
-
-		if (! $error)
-		{
-			$result=$object->update($user);
-			if ($result > 0)
-			{
-				$action='view';
-			}
-			else
-			{
-				// Creation KO
-				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-				else setEventMessages($object->error, null, 'errors');
-				$action='edit';
-			}
-		}
-		else
-		{
-			$action='edit';
-		}
-	}
-
-	// Action to delete
-	if ($action == 'confirm_delete' && ! empty($user->rights->mymodule->delete))
-	{
-		$result=$object->delete($user);
-		if ($result > 0)
-		{
-			// Delete OK
-			setEventMessages("RecordDeleted", null, 'mesgs');
-			header("Location: ".dol_buildpath('/mymodule/list.php',1));
-			exit;
-		}
-		else
-		{
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else setEventMessages($object->error, null, 'errors');
-		}
-	}
-}
-
-
-
-
-/*
- * VIEW
- *
- * Put here all code to build page
- */
-
-$form=new Form($db);
-
-llxHeader('','MyPageName','');
-
-
-// Put here content of your page
-
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
-
-// Part to create
-if ($action == 'create')
-{
-	print load_fiche_titre($langs->trans("NewMyModule"));
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-
-	dol_fiche_head();
-
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_CREATE
-	print '</table>'."\n";
-
-	dol_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
-
-	print '</form>';
-}
-
-
-
-// Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
-	print load_fiche_titre($langs->trans("MyModule"));
-    
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	
-	dol_fiche_head();
-
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_EDIT
-	print '</table>';
-	
-	dol_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
-
-	print '</form>';
-}
-
-
-
-// Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
-    $res = $object->fetch_optionals($object->id, $extralabels);
-
-	$head = mymodule_prepare_head($object);
-	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
-		
-	$formconfirm = '';
-	
-	// Confirmation to delete
-	if ($action == 'delete') {
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
-	}
-	
-	// Confirmation of action xxxx
-	if ($action == 'xxx')
-	{
-	    $formquestion=array();
-	    /*
-	        $formquestion = array(
-	            // 'text' => $langs->trans("ConfirmClone"),
-	            // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
-	            // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
-	            // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
-	    }*/	
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
-	}
-	
-	if (! $formconfirm) {
-	    $parameters = array('lineid' => $lineid);
-	    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-	    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
-	}
-	
-	// Print form confirm
-	print $formconfirm;
-	
-	
-	
-	// Object card
-	// ------------------------------------------------------------
-	
-	$linkback = '<a href="' . DOL_URL_ROOT . '/mymodule/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
-	
-	$morehtmlref='<div class="refidno">';
-	/*
-	// Ref bis
-	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	    if ($user->rights->mymodule->creer)
-	    {
-	        if ($action != 'classify')
-	        {
-	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
-	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	        }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
-	}
-	*/
-	$morehtmlref.='</div>';
-	
-	
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	
-	
-	print '<div class="fichecenter">';
-	print '<div class="fichehalfleft">';
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_VIEW
-
-
-	// Other attributes
-	$cols = 2;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-
-	print '</table>';
-	print '</div>';
-	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
-	
-	
-
-	print '</table>';
-	print '</div>';
-	print '</div>';
-	print '</div>';
-	
-	print '<div class="clearboth"></div><br>';
-	
-	dol_fiche_end();
-
-
-	// Buttons for actions
-	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters=array();
-    	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-    
-    	if (empty($reshook))
-    	{
-    		if ($user->rights->mymodule->write)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-    		}
-    
-    		if ($user->rights->mymodule->delete)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
-	}
-
-	
-	// Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-	    $action = 'presend';
-	}
-	
-	if ($action != 'presend')
-	{
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
-	    // Documents
-	    $comref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $comref . '/' . $comref . '.pdf';
-	    $filedir = $conf->mymodule->dir_output . '/' . $comref;
-	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-	    $genallowed = $user->rights->mymodule->creer;
-	    $delallowed = $user->rights->mymodule->supprimer;
-	    print $formfile->showdocuments('mymodule', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
-	
-	
-	    // Show links to link elements
-	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
-	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-	
-	
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-	
-	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-	    $formactions = new FormActions($db);
-	    $somethingshown = $formactions->showactions($object, 'order', $socid);
-	
-	    print '</div></div></div>';
-	}
-	
-
-	/*
-	 * Action presend
-	 */
-    /*
-	if ($action == 'presend')
-	{
-		$object->fetch_projet();
-
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file = $fileparams['fullname'];
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('commercial');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file)) {
-			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0) {
-				dol_print_error($db, $object->error, $object->errors);
-				exit();
-			}
-			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendOrderByMail'));
-
-		dol_fiche_head('');
-
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='ord'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
-		}
-		$formmail->withfrom = 1;
-		$liste = array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
-			$liste [$key] = $value;
-		$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
-		$formmail->withtocc = $liste;
-		$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-		if (empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
-		} else if (! empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
-		}
-		$formmail->withfile = 2;
-		$formmail->withbody = 1;
-		$formmail->withdeliveryreceipt = 1;
-		$formmail->withcancel = 1;
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object);
-		$formmail->substit ['__ORDERREF__'] = $object->ref;
-
-		$custcontact = '';
-		$contactarr = array();
-		$contactarr = $object->liste_contact(- 1, 'external');
-
-		if (is_array($contactarr) && count($contactarr) > 0)
-		{
-			foreach ($contactarr as $contact)
-			{
-				if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
-					$contactstatic = new Contact($db);
-					$contactstatic->fetch($contact ['id']);
-					$custcontact = $contactstatic->getFullName($langs, 1);
-				}
-			}
-
-			if (! empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action'] = 'send';
-		$formmail->param['models'] = 'order_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['orderid'] = $object->id;
-		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-
-		// Init list of files
-		if (GETPOST("mode") == 'init') {
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-		}
-
-		// Show form
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}*/
-}
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
deleted file mode 100644
index 6805a697043..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
+++ /dev/null
@@ -1,606 +0,0 @@
-<?php
-/* Copyright (C) 2007-2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
- * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file        modulebuilder/skeletons/skeleton_class.class.php
- * \ingroup     mymodule othermodule1 othermodule2
- * \brief       This file is an example for a CRUD class file (Create/Read/Update/Delete)
- */
-
-// Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-
-/**
- * Class Skeleton_Class
- *
- * Put here description of your class.
- */
-class Skeleton_Class extends CommonObject
-{
-	/**
-	 * @var string Id to identify managed object
-	 */
-	public $element = 'skeleton';
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'skeleton';
-    /**
-     * @var array Array with all fields and their property
-     */
-	public $picto = 'generic';
-    /**
-     * @var array Array with all fields and their property
-     */
-	public $fields;
-	
-	/**
-	 * @var mixed Sample property 1
-	 */
-	public $prop1;
-	/**
-	 * @var mixed Sample property 2
-	 */
-	public $prop2;
-	
-	//...
-	
-	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	
-	public $table_element_line = 'skeletondet';
-    public $class_element_line = 'SkeletonLine';
-    public $fk_element = 'fk_skeleton';
-    /**
-	 * @var Skeleton_ClassLine[] Lines
-	 */
-	public $lines = array();
-	
-	
-	
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		// Clean parameters
-		if (isset($this->prop1)) {
-			$this->prop1 = trim($this->prop1);
-		}
-		if (isset($this->prop2)) {
-			$this->prop2 = trim($this->prop2);
-		}
-		//...
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
-		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
-		$sql .= ' field1,';
-		$sql .= ' field2';
-		//...
-		$sql .= ') VALUES (';
-		$sql .= ' \'' . $this->prop1 . '\',';
-		$sql .= ' \'' . $this->prop2 . '\'';
-		//...
-		$sql .= ')';
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action to call a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-				//if ($result < 0) $error++;
-				//// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return $this->id;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id  Id object
-	 * @param string $ref Ref
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id, $ref = null)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-		$sql .= ' t.field1,';
-		$sql .= ' t.field2';
-		//...
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		$sql.= ' WHERE 1 = 1';
-		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("skeleton", 1) . ")";
-		}
-		if (null !== $ref) {
-			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
-		} else {
-			$sql .= ' AND t.rowid = ' . $id;
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$numrows = $this->db->num_rows($resql);
-			if ($numrows) {
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id = $obj->rowid;
-				$this->prop1 = $obj->field1;
-				$this->prop2 = $obj->field2;
-				//...
-			}
-			
-			// Retrieve all extrafields for invoice
-			// fetch optionals attributes and labels
-			/*
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields=new ExtraFields($this->db);
-			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-			$this->fetch_optionals($this->id,$extralabels);
-            */
-			
-			// $this->fetch_lines();
-			
-			$this->db->free($resql);
-
-			if ($numrows) {
-				return 1;
-			} else {
-				return 0;
-			}
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-		$sql .= ' t.field1,';
-		$sql .= ' t.field2';
-		//...
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
-			}
-		}
-		$sql.= ' WHERE 1 = 1';
-		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity("skeleton", 1) . ")";
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
-		}
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
-		}
-		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new self($this->db);
-
-				$line->id = $obj->rowid;
-				$line->prop1 = $obj->field1;
-				$line->prop2 = $obj->field2;
-				//...
-			}
-			$this->db->free($resql);
-
-			return $num;
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-		
-		// Clean parameters
-		if (isset($this->prop1)) {
-			$this->prop1 = trim($this->prop1);
-		}
-		if (isset($this->prop2)) {
-			$this->prop2 = trim($this->prop2);
-		}
-		//...
-
-		// Check parameters
-		// Put here code to add a control on parameters values
-
-		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-		$sql .= " field1=".(isset($this->field1)?"'".$this->db->escape($this->field1)."'":"null").",";
-        $sql .= " field2=".(isset($this->field2)?"'".$this->db->escape($this->field2)."'":"null")."";
-		//...
-		$sql .= ' WHERE rowid=' . $this->id;
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error && !$notrigger) {
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action calls a trigger.
-
-			//// Call triggers
-			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-			//// End call triggers
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		$this->db->begin();
-
-		if (!$error) {
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action calls a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-				//// End call triggers
-			}
-		}
-
-		// If you need to delete child tables to, you can insert them here
-		
-		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE rowid=' . $this->id;
-
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Load an object from its id and create a new one in database
-	 *
-	 * @param int $fromid Id of object to clone
-	 *
-	 * @return int New id of clone
-	 */
-	public function createFromClone($fromid)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		global $user;
-		$error = 0;
-		$object = new Skeleton_Class($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetch($fromid);
-		// Reset object
-		$object->id = 0;
-
-		// Clear fields
-		// ...
-
-		// Create clone
-		$result = $object->create($user);
-
-		// Other options
-		if ($result < 0) {
-			$error ++;
-			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		// End
-		if (!$error) {
-			$this->db->commit();
-
-			return $object->id;
-		} else {
-			$this->db->rollback();
-
-			return - 1;
-		}
-	}
-
-	/**
-	 *  Return a link to the object card (with optionaly the picto)
-	 *
-	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *	@param	string	$option				On what the link point to
-     *  @param	int  	$notooltip			1=Disable tooltip
-     *  @param	int		$maxlen				Max length of visible user name
-     *  @param  string  $morecss            Add more css on link
-	 *	@return	string						String with URL
-	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
-	{
-		global $db, $conf, $langs;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
-
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
-        $result = '';
-        $companylink = '';
-
-        $label = '<u>' . $langs->trans("MyModule") . '</u>';
-        $label.= '<br>';
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-
-        $url = DOL_URL_ROOT.'/mymodule/'.$this->table_name.'_card.php?id='.$this->id;
-        
-        $linkclose='';
-        if (empty($notooltip))
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label=$langs->trans("ShowProject");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
-        }
-        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
-        
-		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
-
-        if ($withpicto)
-        {
-            $result.=($linkstart.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result.=' ';
-		}
-		$result.= $linkstart . $this->ref . $linkend;
-		return $result;
-	}
-
-	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
-	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return	string 			       Label of status
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
-
-	/**
-	 *  Return the status
-	 *
-	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
-	 *  @return string 			       	Label of status
-	 */
-	static function LibStatut($status,$mode=0)
-	{
-		global $langs;
-
-		if ($mode == 0)
-		{
-			$prefix='';
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		if ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-		if ($mode == 6)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-	}
-
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->id = 0;
-		$this->prop1 = 'prop1';
-		$this->prop2 = 'prop2';
-	}
-
-}
-
-/**
- * Class Skeleton_ClassLine
- */
-class Skeleton_ClassLine
-{
-	/**
-	 * @var int ID
-	 */
-	public $id;
-	/**
-	 * @var mixed Sample line property 1
-	 */
-	public $prop1;
-	/**
-	 * @var mixed Sample line property 2
-	 */
-	public $prop2;
-}
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_list.php b/htdocs/modulebuilder/oldskeletons/skeleton_list.php
deleted file mode 100644
index 47aeda79fdc..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_list.php
+++ /dev/null
@@ -1,570 +0,0 @@
-<?php
-/* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2016 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2016      Jean-François Ferry	<jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *   	\file       dev/skeletons/skeleton_list.php
- *		\ingroup    mymodule othermodule1 othermodule2
- *		\brief      This file is an example of a php page
- *					Put here some comments
- */
-
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-
-// Change this following line to use the correct relative path (../, ../../, etc)
-$res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
-if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
-if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
-if (! $res) die("Include of main fails");
-// Change this following line to use the correct relative path from htdocs
-require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-dol_include_once('/mymodule/class/skeleton_class.class.php');
-
-// Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
-
-$action=GETPOST('action','alpha');
-$massaction=GETPOST('massaction','alpha');
-$show_files=GETPOST('show_files','int');
-$confirm=GETPOST('confirm','alpha');
-$toselect = GETPOST('toselect', 'array');
-
-$id			= GETPOST('id','int');
-$backtopage = GETPOST('backtopage');
-$myparam	= GETPOST('myparam','alpha');
-
-$search_all=trim(GETPOST("sall"));
-$search_field1=GETPOST("search_field1");
-$search_field2=GETPOST("search_field2");
-$search_myfield=GETPOST('search_myfield');
-$optioncss = GETPOST('optioncss','alpha');
-
-// Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortfield) $sortfield="t.rowid"; // Set here default search field
-if (! $sortorder) $sortorder="ASC";
-
-// Protection if external user
-$socid=0;
-if ($user->societe_id > 0)
-{
-    $socid = $user->societe_id;
-	//accessforbidden();
-}
-
-// Initialize technical object to manage context to save list fields
-$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'mymodulelist';
-
-// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
-$hookmanager->initHooks(array('mymodulelist'));
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('mymodule');
-$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
-
-// List of fields to search into when doing a "search in all"
-$fieldstosearchall = array(
-    't.ref'=>'Ref',
-    't.note_public'=>'NotePublic',
-);
-if (empty($user->socid)) $fieldstosearchall["t.note_private"]="NotePrivate";
-
-// Definition of fields for list
-$arrayfields=array(
-    't.field1'=>array('label'=>"Field1", 'checked'=>1),
-    't.field2'=>array('label'=>"Field2", 'checked'=>1),
-    //'t.entity'=>array('label'=>"Entity", 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
-    't.datec'=>array('label'=>"DateCreationShort", 'checked'=>0, 'position'=>500),
-    't.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-    //'t.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
-);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-    foreach($extrafields->attribute_label as $key => $val)
-    {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
-    }
-}
-
-
-$object=new Skeleton_Class($db);
-
-
-
-
-/*
- * ACTIONS
- *
- * Put here all code to do according to value of "action" parameter
- */
-
-if (GETPOST('cancel')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-    // Purge search criteria
-    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
-    {
-    	$search_field1='';
-    	$search_field2='';
-    	$search_date_creation='';
-    	$search_date_update='';
-        $toselect='';
-        $search_array_options=array();
-    }
-
-    // Mass actions
-    $objectclass='Skeleton';
-    $objectlabel='Skeleton';
-    $permtoread = $user->rights->skeleton->read;
-    $permtodelete = $user->rights->skeleton->delete;
-    $uploaddir = $conf->skeleton->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-}
-
-
-
-/*
- * VIEW
- *
- * Put here all code to build page
- */
-
-$now=dol_now();
-
-$form=new Form($db);
-
-//$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
-$help_url='';
-$title = $langs->trans('MyModuleListTitle');
-
-// Put here content of your page
-
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
-
-$sql = "SELECT";
-$sql.= " t.rowid,";
-$sql.= " t.field1,";
-$sql.= " t.field2";
-// Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
-// Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mytable_extrafields as ef on (t.rowid = ef.fk_object)";
-$sql.= " WHERE 1 = 1";
-//$sql.= " WHERE u.entity IN (".getEntity('mytable',1).")";
-if ($search_field1) $sql.= natural_search("field1",$search_field1);
-if ($search_field2) $sql.= natural_search("field2",$search_field2);
-if ($sall)          $sql.= natural_search(array_keys($fieldstosearchall), $sall);
-// Add where from extra fields
-foreach ($search_array_options as $key => $val)
-{
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    $typ=$extrafields->attribute_type[$tmpkey];
-    $mode=0;
-    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
-    {
-        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
-    }
-}
-// Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.=$db->order($sortfield,$sortorder);
-
-// Count total nb of records
-$nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-}	
-
-$sql.= $db->plimit($limit+1, $offset);
-
-dol_syslog($script_file, LOG_DEBUG);
-$resql=$db->query($sql);
-if (! $resql)
-{
-    dol_print_error($db);
-    exit;
-}
-
-$num = $db->num_rows($resql);
-
-// Direct jump if only one record found
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
-{
-    $obj = $db->fetch_object($resql);
-    $id = $obj->rowid;
-    header("Location: ".DOL_URL_ROOT.'/skeleton/card.php?id='.$id);
-    exit;
-}
-
-llxHeader('', $title, $help_url);
-
-$arrayofselected=is_array($toselect)?$toselect:array();
-
-$param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($search_field1 != '') $param.= '&amp;search_field1='.urlencode($search_field1);
-if ($search_field2 != '') $param.= '&amp;search_field2='.urlencode($search_field2);
-if ($optioncss != '') $param.='&optioncss='.$optioncss;
-// Add $param from extra fields
-foreach ($search_array_options as $key => $val)
-{
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-} 
-
-$arrayofmassactions =  array(
-    'presend'=>$langs->trans("SendByMail"),
-    'builddoc'=>$langs->trans("PDFMerge"),
-);
-if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-if ($massaction == 'presend') $arrayofmassactions=array();
-$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-print '<input type="hidden" name="action" value="list">';
-print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
-print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
-
-if ($sall)
-{
-    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-    print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
-}
-
-$moreforfilter = '';
-$moreforfilter.='<div class="divsearchfield">';
-$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
-$moreforfilter.= '</div>';
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
-
-if (! empty($moreforfilter))
-{
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-    print '</div>';
-}
-
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-
-print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-
-// Fields title
-print '<tr class="liste_titre">';
-// LIST_OF_TD_TITLE_FIELDS
-//if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($arrayfields['t.field1']['label'],$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($arrayfields['t.field2']['label'],$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val) 
-   {
-       if (! empty($arrayfields["ef.".$key]['checked'])) 
-       {
-			$align=$extrafields->getAlignFlag($key);
-			$sortonfield = "ef.".$key;
-			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
-			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-print '</tr>'."\n";
-
-// Fields title search
-print '<tr class="liste_titre">';
-// LIST_OF_TD_TITLE_SEARCH
-//if (! empty($arrayfields['t.field1']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field1" value="'.$search_field1.'" size="10"></td>';
-//if (! empty($arrayfields['t.field2']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field2" value="'.$search_field2.'" size="10"></td>';
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-    foreach($extrafields->attribute_label as $key => $val) 
-    {
-        if (! empty($arrayfields["ef.".$key]['checked']))
-        {
-            $align=$extrafields->getAlignFlag($key);
-            $typeofextrafield=$extrafields->attribute_type[$key];
-            print '<td class="liste_titre'.($align?' '.$align:'').'">';
-        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
-			{
-			    $crit=$val;
-				$tmpkey=preg_replace('/search_options_/','',$key);
-				$searchclass='';
-				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
-			}
-            print '</td>';
-        }
-    }
-}
-// Fields from hook
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))
-{
-    // Date creation
-    print '<td class="liste_titre">';
-    print '</td>';
-}
-if (! empty($arrayfields['t.tms']['checked']))
-{
-    // Date modification
-    print '<td class="liste_titre">';
-    print '</td>';
-}
-/*if (! empty($arrayfields['u.statut']['checked']))
-{
-    // Status
-    print '<td class="liste_titre" align="center">';
-    print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
-    print '</td>';
-}*/
-// Action column
-print '<td class="liste_titre" align="right">';
-$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-print $searchpicto;
-print '</td>';
-print '</tr>'."\n";
-    
-
-// Detect if we need a fetch on each output line
-$needToFetchEachLine=0;
-foreach ($extrafields->attribute_computed as $key => $val)
-{
-    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
-}
-
-
-$i=0;
-$totalarray=array();
-while ($i < min($num, $limit))
-{
-    $obj = $db->fetch_object($resql);
-    if ($obj)
-    {
-        // Show here line of result
-        print '<tr class="oddeven">';
-        // LIST_OF_TD_FIELDS_LIST
-        /*
-        if (! empty($arrayfields['t.field1']['checked'])) 
-        {
-            print '<td>'.$obj->field1.'</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        if (! empty($arrayfields['t.field2']['checked'])) 
-        {
-            print '<td>'.$obj->field2.'</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }*/
-    	// Extra fields
-		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-		{
-		   foreach($extrafields->attribute_label as $key => $val) 
-		   {
-				if (! empty($arrayfields["ef.".$key]['checked'])) 
-				{
-					print '<td';
-					$align=$extrafields->getAlignFlag($key);
-					if ($align) print ' align="'.$align.'"';
-					print '>';
-					$tmpkey='options_'.$key;
-					print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
-					print '</td>';
-		            if (! $i) $totalarray['nbfield']++;
-				}
-		   }
-		}
-        // Fields from hook
-	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-    	// Date creation
-        if (! empty($arrayfields['t.datec']['checked']))
-        {
-            print '<td align="center">';
-            print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
-            print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        // Date modification
-        if (! empty($arrayfields['t.tms']['checked']))
-        {
-            print '<td align="center">';
-            print dol_print_date($db->jdate($obj->date_update), 'dayhour');
-            print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        // Status
-        /*
-        if (! empty($arrayfields['u.statut']['checked']))
-        {
-		  $userstatic->statut=$obj->statut;
-          print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
-        }*/
-
-        // Action column
-        print '<td class="nowrap" align="center">';
-	    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-        {
-	        $selected=0;
-			if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-        }
-	    print '</td>';
-        if (! $i) $totalarray['nbfield']++;
-
-        print '</tr>';
-    }
-    $i++;
-}
-
-// Show total line
-if (isset($totalarray['totalhtfield']))
-{
-    print '<tr class="liste_total">';
-    $i=0;
-    while ($i < $totalarray['nbfield'])
-    {
-        $i++;
-        if ($i == 1)
-        {
-            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-        }
-        elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
-        elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
-        elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
-        else print '<td></td>';
-    }
-    print '</tr>';
-}
-
-$db->free($resql);
-
-$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-
-print '</table>'."\n";
-print '</div>'."\n";
-
-print '</form>'."\n";
-
-
-if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-{
-    // Show list of available documents
-    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-    $urlsource.=str_replace('&amp;','&',$param);
-
-    $filedir=$diroutputmassaction;
-    $genallowed=$user->rights->facture->lire;
-    $delallowed=$user->rights->facture->lire;
-
-    print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-}
-else
-{
-    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-}
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_script.php b/htdocs/modulebuilder/oldskeletons/skeleton_script.php
deleted file mode 100644
index 5eb1565d4a3..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_script.php
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2007-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       dev/skeletons/skeleton_script.php
- *		\ingroup    mymodule
- *      \brief      This file is an example for a command line script
- *					Put here some comments
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
-}
-
-// Global variables
-$version='1.0';
-$error=0;
-
-
-// -------------------- START OF YOUR CODE HERE --------------------
-@set_time_limit(0);							// No timeout for this script
-define('EVEN_IF_ONLY_LOGIN_ALLOWED',1);		// Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
-
-// Include and load Dolibarr environment variables
-require_once($path."../../htdocs/master.inc.php");
-// After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file).
-// $user is created but empty.
-
-//$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
-
-// Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
-$user->getrights();
-
-
-print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-if (! isset($argv[1])) {	// Check parameters
-    print "Usage: ".$script_file." param1 param2 ...\n";
-	exit(-1);
-}
-print '--- start'."\n";
-print 'Argument 1='.$argv[1]."\n";
-print 'Argument 2='.$argv[2]."\n";
-
-
-// Start of transaction
-$db->begin();
-
-
-// Examples for manipulating class skeleton_class
-require_once(DOL_DOCUMENT_ROOT."/../dev/skeletons/skeleton_class.class.php");
-$myobject=new Skeleton_Class($db);
-
-// Example for inserting creating object in database
-/*
-dol_syslog($script_file." CREATE", LOG_DEBUG);
-$myobject->prop1='value_prop1';
-$myobject->prop2='value_prop2';
-$id=$myobject->create($user);
-if ($id < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object created with id=".$id."\n";
-*/
-
-// Example for reading object from database
-/*
-dol_syslog($script_file." FETCH", LOG_DEBUG);
-$result=$myobject->fetch($id);
-if ($result < 0) { $error; dol_print_error($db,$myobject->error); }
-else print "Object with id=".$id." loaded\n";
-*/
-
-// Example for updating object in database ($myobject must have been loaded by a fetch before)
-/*
-dol_syslog($script_file." UPDATE", LOG_DEBUG);
-$myobject->prop1='newvalue_prop1';
-$myobject->prop2='newvalue_prop2';
-$result=$myobject->update($user);
-if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object with id ".$myobject->id." updated\n";
-*/
-
-// Example for deleting object in database ($myobject must have been loaded by a fetch before)
-/*
-dol_syslog($script_file." DELETE", LOG_DEBUG);
-$result=$myobject->delete($user);
-if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object with id ".$myobject->id." deleted\n";
-*/
-
-
-// An example of a direct SQL read without using the fetch method
-/*
-$sql = "SELECT field1, field2";
-$sql.= " FROM ".MAIN_DB_PREFIX."skeleton";
-$sql.= " WHERE field3 = 'xxx'";
-$sql.= " ORDER BY field1 ASC";
-
-dol_syslog($script_file, LOG_DEBUG);
-$resql=$db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	$i = 0;
-	if ($num)
-	{
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
-				// You can use here results
-				print $obj->field1;
-				print $obj->field2;
-			}
-			$i++;
-		}
-	}
-}
-else
-{
-	$error++;
-	dol_print_error($db);
-}
-*/
-
-
-// -------------------- END OF YOUR CODE --------------------
-
-if (! $error)
-{
-	$db->commit();
-	print '--- end ok'."\n";
-}
-else
-{
-	print '--- end error code='.$error."\n";
-	$db->rollback();
-}
-
-$db->close();	// Close $db database opened handler
-
-exit($error);
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php b/htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php
deleted file mode 100644
index 54a050ff9da..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/* Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/webservices/server_skeleton.php
- *       \brief      File that is entry point to call Dolibarr WebServices
- *       \version    $Id: server_skeleton.php,v 1.7 2010/12/19 11:49:37 eldy Exp $
- */
-
-// This is to make Dolibarr working with Plesk
-set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
-
-require_once("../master.inc.php");
-require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
-require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/skeleton/class/skeleton.class.php");
-
-
-dol_syslog("Call Skeleton webservices interfaces");
-
-// Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
-{
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
-}
-
-// Create the soap Object
-$server = new nusoap_server();
-$server->soap_defencoding='UTF-8';
-$server->decode_utf8=false;
-$ns='http://www.dolibarr.org/ns/';
-$server->configureWSDL('WebServicesDolibarrSkeleton',$ns);
-$server->wsdl->schemaTargetNamespace=$ns;
-
-
-// Define WSDL Authentication object
-$server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-    	'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
-    )
-);
-
-// Define WSDL Return object
-$server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
-    )
-);
-
-// Define other specific objects
-$server->wsdl->addComplexType(
-    'skeleton',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-	    'prop1'=>'xxx',
-		'prop2'=>'xxx',
-    //...
-    )
-);
-
-
-
-// 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
-// Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
-// http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
-$styledoc='rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
-$styleuse='encoded';   // encoded/literal/literal wrapped
-// Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
-
-
-// Register WSDL
-$server->register(
-    'getSkeleton',
-    // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','skeleton'=>'tns:skeleton'),
-    $ns,
-    $ns.'#getSkeleton',
-    $styledoc,
-    $styleuse,
-    'WS to get skeleton'
-);
-
-// Register WSDL
-$server->register(
-	'createSkeleton',
-	// Entry values
-	array('authentication'=>'tns:authentication','skeleton'=>'tns:skeleton'),
-	// Exit values
-	array('result'=>'tns:result','id'=>'xsd:string'),
-	$ns,
-	$ns.'#createSkeleton',
-	$styledoc,
-	$styleuse,
-	'WS to create a skeleton'
-);
-
-
-
-
-/**
- * Get Skeleton
- *
- * @param	array		$authentication		Array of authentication information
- * @param	int			$id					Id of object
- * @param	string		$ref				Ref of object
- * @param	string		$ref_ext			Ref external of object
- * @return	mixed
- */
-function getSkeleton($authentication,$id,$ref='',$ref_ext='')
-{
-    global $db,$conf,$langs;
-
-    dol_syslog("Function: getSkeleton login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
-
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
-    if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
-    {
-        $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
-
-    if (! $error)
-    {
-        $fuser->getrights();
-
-        if ($fuser->rights->skeleton->read)
-        {
-            $skeleton=new Skeleton($db);
-            $result=$skeleton->fetch($id,$ref,$ref_ext);
-            if ($result > 0)
-            {
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'skeleton'=>array(
-				    'prop1'=>$skeleton->prop1,
-				    'prop2'=>$skeleton->prop2,
-                    //...
-                    )
-                );
-            }
-            else
-            {
-                $error++;
-                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
-            }
-        }
-        else
-        {
-            $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
-        }
-    }
-
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
-
-    return $objectresp;
-}
-
-
-/**
- * Create Skeleton
- *
- * @param	array		$authentication		Array of authentication information
- * @param	Skeleton	$skeleton		    $skeleton
- * @return	array							Array result
- */
-function createSkeleton($authentication,$skeleton)
-{
-	global $db,$conf,$langs;
-
-	$now=dol_now();
-
-	dol_syslog("Function: createSkeleton login=".$authentication['login']);
-
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-	// Init and check authentication
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-	// Check parameters
-
-
-	if (! $error)
-	{
-		$newobject=new Skeleton($db);
-		$newobject->prop1=$skeleton->prop1;
-		$newobject->prop2=$skeleton->prop2;
-		//...
-
-		$db->begin();
-
-		$result=$newobject->create($fuser);
-		if ($result <= 0)
-		{
-			$error++;
-		}
-
-		if (! $error)
-		{
-			$db->commit();
-			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-		}
-		else
-		{
-			$db->rollback();
-			$error++;
-			$errorcode='KO';
-			$errorlabel=$newobject->error;
-		}
-	}
-
-	if ($error)
-	{
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-	}
-
-	return $objectresp;
-}
-
-// Return the results.
-$server->service(file_get_contents("php://input"));
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 79e17749991..3cc9147a001 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -320,6 +320,7 @@ class StockMovements extends DolibarrApi
         unset($object->user);
         unset($object->fk_project);
         unset($object->project);
+        unset($object->canvas);
         
         //unset($object->eatby);        Filled correctly in read mode
         //unset($object->sellby);       Filled correctly in read mode

From c39ca4cff8824a7181b9354a40f5ff3c02135c6c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 00:20:35 +0200
Subject: [PATCH 0985/1163] NEW Introduce function dol_compress_dir

---
 htdocs/core/lib/files.lib.php  | 85 ++++++++++++++++++++++++++++++++++
 htdocs/langs/en_US/errors.lang |  3 +-
 htdocs/langs/en_US/other.lang  |  1 +
 htdocs/modulebuilder/index.php | 59 ++++++++++++++++++++++-
 4 files changed, 146 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index e52f8bf98ec..95fca68aa5d 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1685,6 +1685,91 @@ function dol_uncompress($inputfile,$outputdir)
 }
 
 
+/**
+ * Compress a directory and subdirectories into a package file.
+ *
+ * @param 	string	$inputdir		Source dir name
+ * @param 	string	$outputfile		Target file name
+ * @param 	string	$mode			'zip'
+ * @return	int						<0 if KO, >0 if OK
+ */
+function dol_compress_dir($inputdir, $outputfile, $mode="zip")
+{
+    $foundhandler=0;
+
+    dol_syslog("Try to zip dir ".$inputdir." into ".$outputdir." mode=".$mode);
+    try
+    {
+        if ($mode == 'gz')     { $foundhandler=0; }
+        elseif ($mode == 'bz') { $foundhandler=0; }
+        elseif ($mode == 'zip')
+        {
+            /*if (defined('ODTPHP_PATHTOPCLZIP'))
+            {
+                $foundhandler=0;        // TODO implement this
+
+                include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
+                $archive = new PclZip($outputfile);
+                $archive->add($inputfile, PCLZIP_OPT_REMOVE_PATH, dirname($inputfile));
+                //$archive->add($inputfile);
+                return 1;
+            }
+            else*/
+            if (class_exists('ZipArchive'))
+            {
+                $foundhandler=1;
+                
+                // Initialize archive object
+                $zip = new ZipArchive();
+                $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE);
+                
+                // Create recursive directory iterator
+                /** @var SplFileInfo[] $files */
+                $files = new RecursiveIteratorIterator(
+                    new RecursiveDirectoryIterator($inputdir),
+                    RecursiveIteratorIterator::LEAVES_ONLY
+                    );
+
+                foreach ($files as $name => $file)
+                {
+                    // Skip directories (they would be added automatically)
+                    if (!$file->isDir())
+                    {
+                        // Get real and relative path for current file
+                        $filePath = $file->getRealPath();
+                        $relativePath = substr($filePath, strlen($inputdir) + 1);
+                
+                        // Add current file to archive
+                        $zip->addFile($filePath, $relativePath);
+                    }
+                }
+                
+                // Zip archive will be created only after closing object
+                $zip->close();                
+    
+                return 1;
+            }
+        }
+
+        if (! $foundhandler)
+        {
+            dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
+            return -2;
+        }
+    }
+    catch (Exception $e)
+    {
+        global $langs, $errormsg;
+        $langs->load("errors");
+        dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
+        dol_syslog($e->getMessage(), LOG_ERR);
+        $errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
+        return -1;
+    }
+}
+
+
+
 /**
  * Return file(s) into a directory (by default most recent)
  *
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index aea5ad68113..740397a5044 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -19,6 +19,7 @@ ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
 ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -115,7 +116,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
+ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 280a1666b02..a14bfffffb6 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -16,6 +16,7 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index e11ff31a303..b3b2c8dac77 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -115,9 +115,60 @@ if ($dircustom && $action == 'initmodule' && $modulename)
 
 if ($dircustom && $action == 'generatepackage')
 {
-    $dir = $dircustom.'/'.$modulename;
+    $modulelowercase=strtolower($module);
 	
+    // Dir for module
+    $dir = $dircustom.'/'.$modulelowercase;
+    // Zip file to build
+    $FILENAMEZIP='';
+    
+    // Load module
+    dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
+    $class='mod'.$module;
 
+    if (class_exists($class))
+    {
+        try {
+            $moduleobj = new $class($db);
+        }
+        catch(Exception $e)
+        {
+            $error++;
+            dol_print_error($e->getMessage());
+        }
+    }
+    else
+    {
+        $error++;
+        $langs->load("errors");
+        dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
+        exit;
+    }
+    
+    $arrayversion=explode('.',$moduleobj->version,3);
+    if (count($arrayversion))
+    {
+        $FILENAMEZIP="module_".$modulelowercase.'-'.$arrayversion[0].'.'.$arrayversion[1].($arrayversion[2]?".".$arrayversion[2]:"").".zip";
+        $outputfile = $conf->admin->dir_temp.'/'.$FILENAMEZIP;
+    
+        $result = dol_compress_dir($dir, $outputfile, 'zip');
+        if ($result > 0)
+        {
+            setEventMessages($langs->trans("ZipFileGeneratedInto", $outputfile), null);
+        }
+        else
+        {
+            $error++;
+            $langs->load("errors");
+            setEventMessages($langs->trans("ErrorFailToGenerateFile", $outputfile), null, 'errors');
+        }
+    }
+    else
+    {
+        $error++;
+        $langs->load("errors");
+        setEventMessages($langs->trans("ErrorCheckVersionIsDefined"), null, 'errors');
+    }
 }
 
 
@@ -434,6 +485,12 @@ elseif (! empty($module))
 
         if ($tab == 'buildpackage')
         {
+            if (! class_exists('ZipArchive') && ! defined('ODTPHP_PATHTOPCLZIP'))
+            {
+                print img_warning().' '.$langs->trans("ErrNoZipEngine");
+                print '<br>';
+            }
+            
         	print '<form name="generatepackage">';
         	print '<input type="hidden" name="action" value="generatepackage">';
         	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';

From 21183f91a3f0c9eb2613ad74a3b5e1e6929e2a8e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 31 May 2017 05:27:39 +0200
Subject: [PATCH 0986/1163] FIX : Vat payment - Sql error / Add information in
 tooltip / Correct writting in general ledger

---
 htdocs/accountancy/journal/bankjournal.php | 30 +++++++++++++++---
 htdocs/compta/tva/reglement.php            | 36 ++++++++++++----------
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index ea98d678671..7bb1ef20923 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -284,7 +284,8 @@ if ($result) {
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $links[$key]['url_id'];
 					$paymentvatstatic->label = $links[$key]['label'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("PaymentVat");
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["paymentvatid"] = $paymentvatstatic->id;
 					$tabtp[$obj->rowid][$account_pay_vat] += $obj->amount;
 				} else if ($links[$key]['type'] == 'payment_salary') {
 					$paymentsalstatic->id = $links[$key]['url_id'];
@@ -415,8 +416,11 @@ if (! $error && $action == 'writebookkeeping') {
         					$objmid = $db->fetch_object($resultmid);
         					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
         				}
-        			}
-        
+        			} else if ($tabtype[$key] == 'payment_vat') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat payment
+					}
+
         			$result = $bookkeeping->create($user);
         			if ($result < 0) {
         				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
@@ -489,6 +493,10 @@ if (! $error && $action == 'writebookkeeping') {
         				}
                         $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
         				$bookkeeping->numero_compte = $k;
+					} else if ($tabtype[$key] == 'payment_vat') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat
         			} else if ($tabtype[$key] == 'banktransfert') {
 						$bookkeeping->code_tiers = '';
         				$bookkeeping->numero_compte = $k;
@@ -724,6 +732,7 @@ if (empty($action) || $action == 'view') {
 	$invoicestatic = new Facture($db);
 	$invoicesupplierstatic = new FactureFournisseur($db);
 	$expensereportstatic = new ExpenseReport($db);
+	$vatstatic = new Tva($db);
 
 	llxHeader('', $langs->trans("FinanceJournal"));
 
@@ -850,7 +859,20 @@ if (empty($action) || $action == 'view') {
 		    }
 		    else dol_print_error($db);
 		}
-
+		elseif ($tabtype[$key] == 'payment_vat')
+		{
+			$sqlmid = 'SELECT v.rowid as id';
+			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "tva as v";
+			$sqlmid .= " WHERE v.rowid=" . $val["paymentvatid"];
+			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$vatstatic->fetch($objmid->id);
+				$ref=$langs->trans("PaymentVat").' '.$vatstatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
+		}
 
 		/*$invoicestatic->id = $key;
 		$invoicestatic->ref = $val["ref"];
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 076978a86fb..8b4d3299f9c 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2014 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2011-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 
 $langs->load("compta");
 $langs->load("bills");
@@ -94,10 +95,10 @@ llxHeader('', $langs->trans("VATPayments"));
 $form = new Form($db);
 $formother=new FormOther($db);
 $tva_static = new Tva($db);
-$accountstatic = new Account($db);
+$bankstatic = new Account($db);
 
 $sql = "SELECT t.rowid, t.amount, t.label, t.datev as dv, t.datep as dp, t.fk_typepayment as type, t.num_payment, t.fk_bank, pst.code as payment_code,";
-$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.accountancy_journal, ba.label as blabel";
+$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
 $sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON t.fk_typepayment = pst.id";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
@@ -227,19 +228,22 @@ if ($result)
 	    {
 	        print '<td>';
 	        if ($obj->fk_bank > 0)
-	        {
-	        	//$accountstatic->fetch($obj->fk_bank);
-	            $accountstatic->id=$obj->bid;
-	            $accountstatic->ref=$obj->bref;
-	            $accountstatic->number=$obj->bnumber;
-	            $accountstatic->accountancy_number=$obj->account_number;
-	            $accountstatic->accountancy_journal=$obj->accountancy_journal;
-	            $accountstatic->label=$obj->blabel;
-	            print $accountstatic->getNomUrl(1);
-	        }
-	        else print '&nbsp;';
-	        print '</td>';
-	    }
+			{
+				$bankstatic->id=$obj->bid;
+				$bankstatic->ref=$obj->bref;
+				$bankstatic->number=$obj->bnumber;
+				$bankstatic->account_number=$obj->account_number;
+
+				$accountingjournal = new AccountingJournal($db);
+				$accountingjournal->fetch($obj->fk_accountancy_journal);
+				$bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0,1,1,'',1);
+
+				$bankstatic->label=$obj->blabel;
+				print $bankstatic->getNomUrl(1);
+			}
+			else print '&nbsp;';
+			print '</td>';
+		}
 		// Amount
         $total = $total + $obj->amount;
 		print "<td align=\"right\">".price($obj->amount)."</td>";

From 292571688b54b4d327dc7ad7bac9e1e3fae0b445 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 10:43:01 +0200
Subject: [PATCH 0987/1163] Fix error message not reported

---
 htdocs/core/class/dolgraph.class.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 4fb973160d4..691cb8b986d 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -24,7 +24,12 @@
 
 
 /**
- * Parent class of graph classes
+ * Class to build graphs.
+ * Usage is: 
+ *    $dolgraph=new DolGraph();
+ *    $dolgraph->SetData($data);
+ *    $dolgraph->draw('idofgraph');
+ *    print $dolgraph->show();
  */
 class DolGraph
 {
@@ -780,9 +785,9 @@ class DolGraph
 
 	/**
 	 * Build a graph using JFlot library. Input when calling this method should be:
-	 *	$this->data  = array(array(      0=>'labelxA',     1=>yA),  array('labelxB',yB)); or
+	 *	$this->data  = array(array(0=>'labelxA',1=>yA),  array('labelxB',yB));
+	 *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // or when there is n series to show for each x
 	 *  $this->data  = array(array('label'=>'labelxA','data'=>yA),  array('labelxB',yB));			// TODO Syntax not supported. Removed when dol_print_graph_removed
-	 *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // when there is n series to show for each x
 	 *  $this->legend= array("Val1",...,"Valn");													// list of n series name
 	 *  $this->type  = array('bars',...'lines'); or array('pie')
 	 *  $this->mode = 'depth' ???
@@ -808,7 +813,7 @@ class DolGraph
 
 		$legends=array();
 		$nblot=count($this->data[0])-1;    // -1 to remove legend
-		if ($nblot < 0) dol_print_error('Bad value for property ->data. Must be set by mydolgraph->SetData before callinf mydolgrapgh->draw');
+		if ($nblot < 0) dol_print_error('', 'Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw');
 		$firstlot=0;
 		// Works with line but not with bars
 		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x

From 145cb628cd12d51d6b98e8e88a05d11ce408249f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 11:11:25 +0200
Subject: [PATCH 0988/1163] FIX dol_string_nohtmltag make 2 passes to clean
 html into html attributes.

---
 htdocs/core/lib/functions.lib.php | 7 ++++++-
 test/phpunit/FunctionsLibTest.php | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 041235f40f6..4a9d25aefde 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4704,8 +4704,13 @@ function dol_string_nohtmltag($StringHtml,$removelinefeed=1,$pagecodeto='UTF-8')
 	$pattern = "/<[^<>]+>/";
 	$StringHtml = preg_replace('/<br[^>]*>/', "\n", $StringHtml);
 	$temp = dol_html_entity_decode($StringHtml,ENT_COMPAT,$pagecodeto);
-	$temp = preg_replace($pattern,"",$temp);
 
+    // Exemple of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>
+    $temp = preg_replace($pattern,"",$temp);    // pass 1
+    // $temp after pass 1: <a href="/myurl" title="A title">0000-021
+    $temp = preg_replace($pattern,"",$temp);    // pass 2
+    // $temp after pass 2: 0000-021
+    
 	// Supprime aussi les retours
 	if ($removelinefeed) $temp=str_replace(array("\r\n","\r","\n")," ",$temp);
 
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 8c57e8a178a..4e98ce0b3bc 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -377,6 +377,14 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
         $after=dol_string_nohtmltag($text,1);
         $this->assertEquals("A string Another string",$after,"test5");
 
+        $text='<a href="/myurl" title="<u>Afficher projet</u>">ABC</a>';
+        $after=dol_string_nohtmltag($text,1);
+        $this->assertEquals("ABC",$after,"test6");
+        
+        $text='<a href="/myurl" title="&lt;u&gt;Afficher projet&lt;/u&gt;">DEF</a>';
+        $after=dol_string_nohtmltag($text,1);
+        $this->assertEquals("DEF",$after,"test7");
+        
         return true;
     }
 

From 10ac53077e24241e9919d21c2e98650a6eb343ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 11:51:38 +0200
Subject: [PATCH 0989/1163] Code comment

---
 htdocs/core/class/dolgraph.class.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 691cb8b986d..4fad0149a5b 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -27,7 +27,13 @@
  * Class to build graphs.
  * Usage is: 
  *    $dolgraph=new DolGraph();
+ *    $dolgraph->SetTitle($langs->transnoentities('Tracking_Projects_Pourcent').'<br>'.$langs->transnoentities('Tracking_IndicatorDefGraph').'%');
+ *    $dolgraph->SetMaxValue(50);
  *    $dolgraph->SetData($data);
+ *    $dolgraph->setShowLegend(1);
+ *    $dolgraph->setShowPercent(1);
+ *    $dolgraph->SetType(array('pie'));
+ *    $dolgraph->setWidth('100%');
  *    $dolgraph->draw('idofgraph');
  *    print $dolgraph->show();
  */
@@ -803,7 +809,7 @@ class DolGraph
 	{
 		global $artichow_defaultfont;
 
-		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',',$this->type));
+		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',',$this->type)." this->MaxValue=".$this->MaxValue);
 
 		if (empty($this->width) && empty($this->height))
 		{

From d5f83d6bbe9159347192a9dc95bf6285c47a1b4e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 19:13:06 +0200
Subject: [PATCH 0990/1163] NEW #6915 Simplest change.

---
 htdocs/core/lib/functions.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4a9d25aefde..f1a7b5b57a9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -110,10 +110,10 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
  *                              'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
  *                              'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
  *                              'email_template', 'event',
- * 	@param	int		$shared		0=Return id of entity, 1=Return id entity + shared entities
+ * 	@param	int	     $shared	1=Return id of current entity + shared entities (default), 0=Return id of current entity only 
  * 	@return	mixed				Entity id(s) to use
  */
-function getEntity($element=false, $shared=0)
+function getEntity($element=false, $shared=1)
 {
 	global $conf, $mc;
 

From 6c7179d28190a0490aee936f74fb670986dd453c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 19:20:33 +0200
Subject: [PATCH 0991/1163] Test of commit with autoremove trail space

---
 htdocs/core/lib/functions.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f1a7b5b57a9..bd2944fa2f4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -100,7 +100,7 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
 }
 
 /**
- * 	Get list of entity id to use
+ * 	Get list of entity id to use.
  *
  * 	@param	string	$element	Current element
  *                              'societe', 'socpeople', 'actioncomm', 'agenda', 'resource',
@@ -110,7 +110,7 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
  *                              'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
  *                              'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
  *                              'email_template', 'event',
- * 	@param	int	     $shared	1=Return id of current entity + shared entities (default), 0=Return id of current entity only 
+ * 	@param	int	     $shared	1=Return id of current entity + shared entities (default), 0=Return id of current entity only
  * 	@return	mixed				Entity id(s) to use
  */
 function getEntity($element=false, $shared=1)
@@ -4710,7 +4710,7 @@ function dol_string_nohtmltag($StringHtml,$removelinefeed=1,$pagecodeto='UTF-8')
     // $temp after pass 1: <a href="/myurl" title="A title">0000-021
     $temp = preg_replace($pattern,"",$temp);    // pass 2
     // $temp after pass 2: 0000-021
-    
+
 	// Supprime aussi les retours
 	if ($removelinefeed) $temp=str_replace(array("\r\n","\r","\n")," ",$temp);
 

From a49174313f6bf6c6fa05b812c5a78258a65a1f66 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 May 2017 19:45:54 +0200
Subject: [PATCH 0992/1163] Replace {extra_ with {user_extra_

---
 htdocs/core/lib/functions2.lib.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 69ee228504d..c3d8714ab89 100755
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -790,16 +790,16 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
         $maskpersonew[$regKey[1]]=str_pad('', '_', $regKey[2], STR_PAD_RIGHT);
         $tmpmask=preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew, $tmpmask);
     }*/
-	
-    if(strstr($mask,'extra_')){
 
-			$start = "{extra_";
+    if (strstr($mask,'user_extra_'))
+    {
+			$start = "{user_extra_";
 			$end = "\}";
-			$extra= get_string_between($mask, "extra_", "}");
+			$extra= get_string_between($mask, "user_extra_", "}");
 			if(!empty($user->array_options['options_'.$extra])){
-				$mask =  preg_replace('#('.($start).')(.*?)('.($end).')#si', $user->array_options['options_'.$extra], $mask);	
+				$mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
 			}
-	} 
+    } 
     $maskwithonlyymcode=$mask;
     $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);

From dc9d9b47b4c61362138778b7896e28ceefbe3388 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 31 May 2017 21:35:26 +0200
Subject: [PATCH 0993/1163] Fix : Missing language key

---
 htdocs/langs/en_US/banks.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index d98d2b465d0..3c7f8b338c0 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -66,6 +66,7 @@ RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry
 ListBankTransactions=List of bank entries
 IdTransaction=Transaction ID
 BankTransactions=Bank entries
+BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile

From c70beaa56b3afce61c4e0f1def585eeffe566487 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 01:53:55 +0200
Subject: [PATCH 0994/1163] Complete work for mutualizing generic substitution
 system.

---
 htdocs/admin/commande.php                 |  14 +--
 htdocs/admin/contract.php                 |   2 +-
 htdocs/admin/defaultvalues.php            |  44 ++++-----
 htdocs/admin/expedition.php               |   2 +-
 htdocs/admin/expensereport.php            |  12 +--
 htdocs/admin/facture.php                  |   2 +-
 htdocs/admin/fichinter.php                |   4 +-
 htdocs/admin/ihm.php                      |  88 +++++++++++-------
 htdocs/admin/livraison.php                |   4 +-
 htdocs/admin/mails_templates.php          |  68 +++++++-------
 htdocs/admin/propal.php                   |   6 +-
 htdocs/admin/supplier_invoice.php         |   6 +-
 htdocs/admin/supplier_order.php           |  10 +--
 htdocs/admin/supplier_proposal.php        |   6 +-
 htdocs/core/class/html.formmail.class.php |  75 ++++++++--------
 htdocs/core/lib/functions.lib.php         | 103 +++++++++++++++++++++-
 htdocs/core/lib/pdf.lib.php               |  50 ++++-------
 htdocs/core/lib/security2.lib.php         |  16 ++--
 htdocs/index.php                          |  31 +++----
 19 files changed, 315 insertions(+), 228 deletions(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index d60144a3492..6d92ad21999 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -182,7 +182,7 @@ else if ($action == 'setdoc')
 
 else if ($action == 'setmod')
 {
-	// TODO Check if numbering module chosen can be activated 
+	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
 
 	dolibarr_set_const($db, "COMMANDE_ADDON",$value,'chaine',0,'',$conf->entity);
@@ -331,7 +331,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						
+
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -609,7 +609,7 @@ print "</td></tr>\n";
 print '</form>';
 
 // Shippable Icon in List
-/* Kept as hidden feature for the moment, result seems bugged. 
+/* Kept as hidden feature for the moment, result seems bugged.
 Whet is definition of "shippable" according to all different STOCK_CALCULATE_... options ?
 
 print '<tr class="oddeven">';
@@ -631,7 +631,7 @@ print '</tr>';
 // Ask for payment bank during order
 if ($conf->banque->enabled)
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp</td><td align="center">';
     if (! empty($conf->use_javascript_ajax))
@@ -653,7 +653,7 @@ if ($conf->banque->enabled)
 }
 else
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
@@ -661,7 +661,7 @@ else
 // Ask for warehouse during order
 if ($conf->stock->enabled)
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").'</td><td>&nbsp</td><td align="center">';
     if (! empty($conf->use_javascript_ajax))
@@ -683,7 +683,7 @@ if ($conf->stock->enabled)
 }
 else
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 4c0a9572761..47e53a05048 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -265,7 +265,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						
+
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 40e63de8aea..10d9ec5c282 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -120,11 +120,11 @@ if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('ac
 	        $error++;
 	    }
 	}
-	
+
 	if (! $error)
 	{
 	    $db->begin();
-	    
+
 	    if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 	    {
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."default_values(type, user_id, page, param, value, entity) VALUES ('".$db->escape($mode)."', 0, '".$db->escape($defaulturl)."','".$db->escape($defaultkey)."','".$db->escape($defaultvalue)."', ".$db->escape($conf->entity).")";
@@ -134,7 +134,7 @@ if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('ac
 		    $sql = "UPDATE ".MAIN_DB_PREFIX."default_values SET page = '".$db->escape($urlpage)."', param = '".$db->escape($key)."', value = '".$db->escape($value)."'";
 		    $sql.= " WHERE rowid = ".$id;
 	    }
-		
+
 		$result = $db->query($sql);
 		if ($result > 0)
 		{
@@ -223,7 +223,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 
 $head=defaultvalues_prepare_head();
-    
+
 dol_fiche_head($head, $mode, '', -1, '');
 
 if ($mode == 'sortorder')
@@ -249,11 +249,11 @@ $texturl=$form->textwithpicto($langs->trans("Url"), $texthelp);
 print_liste_field_titre($texturl,$_SERVER["PHP_SELF"],'page,param','',$param,'',$sortfield,$sortorder);
 // Field
 $texthelp=$langs->trans("TheKeyIsTheNameOfHtmlField");
-if ($mode != 'sortorder') 
+if ($mode != 'sortorder')
 {
     $textkey=$form->textwithpicto($langs->trans("Field"), $texthelp);
 }
-else 
+else
 {
     $texthelp='field or alias.field';
     $textkey=$form->textwithpicto($langs->trans("Field"), $texthelp);
@@ -264,22 +264,14 @@ if ($mode != 'focus')
 {
     if ($mode != 'sortorder')
     {
+        $substitutionarray=getCommonSubstitutionArray($langs, 0, array('object')); // Must match list into GETPOST
+        $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
         $texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-        // See list into GETPOST
-        $texthelp.='__USERID__<br>';
-        $texthelp.='__SUPERVISORID__<br>';
-        $texthelp.='__MYCOUNTRYID__<br>';
-        $texthelp.='__DAY__<br>';
-        $texthelp.='__MONTH__<br>';
-        $texthelp.='__YEAR__<br>';
-        $texthelp.='__PREVIOUS_DAY__<br>';
-        $texthelp.='__PREVIOUS_MONTH__<br>';
-        $texthelp.='__PREVIOUS_YEAR__<br>';
-        $texthelp.='__NEXT_DAY__<br>';
-        $texthelp.='__NEXT_MONTH__<br>';
-        $texthelp.='__NEXT_YEAR__<br>';
-        if (! empty($conf->multicompany->enabled)) $texthelp.='__ENTITYID__<br>';
-        $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');
+        foreach($substitutionarray as $key => $val)
+        {
+            $texthelp.=$key.'<br>';
+        }
+        $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');    // No tooltip on click, this also triggers the sort click
     }
     else
     {
@@ -351,18 +343,18 @@ if ($result)
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($result);
-		
+
 
 		print "\n";
 
 		print '<tr class="oddeven">';
-		
+
 		// Page
 		print '<td>';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->page;
 		else print '<input type="text" name="urlpage" value="'.dol_escape_htmltag($obj->page).'">';
 		print '</td>'."\n";
-   	    
+
 		// Field
 		print '<td>';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->param;
@@ -382,7 +374,7 @@ if ($result)
     		else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
     		print '</td>';
 		}
-		
+
 		// Actions
 		print '<td align="center">';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid)
@@ -400,7 +392,7 @@ if ($result)
 		    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 		}
 		print '</td>';
-        
+
 		print "</tr>\n";
 		print "\n";
 		$i++;
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 3c89960ede6..e9a9aaedb18 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -82,7 +82,7 @@ else if ($action == 'set_param')
 		$error++;
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-	
+
 	$draft=GETPOST('SHIPPING_DRAFT_WATERMARK','alpha');
 	$res = dolibarr_set_const($db, "SHIPPING_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
 	if ($res <= 0)
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index eefe5747abd..92ba9375927 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -77,7 +77,7 @@ else if ($action == 'specimen') // For fiche inter
 	$inter->initAsSpecimen();
 	$inter->status = 0;     // Force statut draft to show watermark
 	$inter->fk_statut = 0;     // Force statut draft to show watermark
-	
+
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
 	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
@@ -193,13 +193,13 @@ else if ($action == 'setmod')
 else if ($action == 'setoptions')
 {
     $db->begin();
-    
+
 	$freetext= GETPOST('EXPENSEREPORT_FREE_TEXT');	// No alpha here, we want exact string
 	$res1 = dolibarr_set_const($db, "EXPENSEREPORT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
-	
+
 	$draft= GETPOST('EXPENSEREPORT_DRAFT_WATERMARK','alpha');
 	$res2 = dolibarr_set_const($db, "EXPENSEREPORT_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
-	
+
 	if (! $res1 > 0 || ! $res2 > 0) $error++;
 
  	if (! $error)
@@ -276,7 +276,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-						
+
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -399,7 +399,7 @@ foreach ($dirmodels as $reldir)
 
 		    		if (file_exists($dir.'/'.$file))
 		    		{
-		    			
+
 
 		    			$name = substr($file, 4, dol_strlen($file) -16);
 		    			$classname = substr($file, 0, dol_strlen($file) -12);
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 77230dc3f68..64ae1abdde6 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -693,7 +693,7 @@ if ($resql)
     $i = 0;
     while ($i < $num)
     {
-        
+
         $row = $db->fetch_row($resql);
 
         print '<option value="'.$row[0].'"';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 3ce82ce59cb..e3000231c38 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -310,7 +310,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-						
+
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -432,7 +432,7 @@ foreach ($dirmodels as $reldir)
 		    	{
 		    		if (file_exists($dir.'/'.$file))
 		    		{
-		    			
+
 
 		    			$name = substr($file, 4, dol_strlen($file) -16);
 		    			$classname = substr($file, 0, dol_strlen($file) -12);
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 7c23b62f230..f764f40c054 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -90,11 +90,11 @@ if ($action == 'update')
 	$val=GETPOST('THEME_TOPMENU_DISABLE_IMAGE');
 	if (! $val) dolibarr_del_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', $conf->entity);
     else dolibarr_set_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', GETPOST('THEME_TOPMENU_DISABLE_IMAGE'),'chaine',0,'',$conf->entity);
-    
+
 	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKBODY', $conf->entity);
 	else dolibarr_set_const($db, 'THEME_ELDY_BACKBODY', $val,'chaine',0,'',$conf->entity);
-	
+
     $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TOPMENU_BACK1', $conf->entity);
     else dolibarr_set_const($db, 'THEME_ELDY_TOPMENU_BACK1', $val,'chaine',0,'',$conf->entity);
@@ -109,25 +109,25 @@ if ($action == 'update')
     $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEIMPAIR1'),array()))));
     if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEIMPAIR2', $conf->entity);
     else dolibarr_set_const($db, 'THEME_ELDY_LINEIMPAIR2', $val,'chaine',0,'',$conf->entity);
-    
+
     $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEPAIR1'),array()))));
     if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR1', $conf->entity);
     else dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR1', $val,'chaine',0,'',$conf->entity);
     $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEPAIR1'),array()))));
     if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR2', $conf->entity);
     else dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR2', $val,'chaine',0,'',$conf->entity);
-    
+
     $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $conf->entity);
     else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $val,'chaine',0,'',$conf->entity);
-    
+
     if (GETPOST('THEME_ELDY_USE_HOVER') == '') dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", '0', 'chaine', 0, '', $conf->entity);    // If empty, we set to '0' ('000000' is for black)
 	else dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $_POST["THEME_ELDY_USE_HOVER"], 'chaine', 0, '', $conf->entity);
 
 	$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'),array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTLINK', $conf->entity);
     else dolibarr_set_const($db, 'THEME_ELDY_TEXTLINK', $val,'chaine',0,'',$conf->entity);
-	
+
     dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT",			$_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
     dolibarr_set_const($db, "MAIN_SIZE_SHORTLIST_LIMIT",		$_POST["main_size_shortliste_limit"],'chaine',0,'',$conf->entity);
     dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT",			$_POST["main_disable_javascript"],'chaine',0,'',$conf->entity);
@@ -137,7 +137,7 @@ if ($action == 'update')
     dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS",		$_POST["MAIN_DEFAULT_WORKING_HOURS"],'chaine',0,'',$conf->entity);
     dolibarr_set_const($db, "MAIN_SHOW_LOGO",					$_POST["MAIN_SHOW_LOGO"],'chaine',0,'',$conf->entity);
     dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION",		$_POST["MAIN_FIRSTNAME_NAME_POSITION"],'chaine',0,'',$conf->entity);
-    
+
 	dolibarr_set_const($db, "MAIN_HELPCENTER_DISABLELINK",		$_POST["MAIN_HELPCENTER_DISABLELINK"],'chaine',0,'',0);	// Param for all entities
 	dolibarr_set_const($db, "MAIN_MOTD",						dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_HOME",						dol_htmlcleanlastbr($_POST["main_home"]),'chaine',0,'',$conf->entity);
@@ -150,7 +150,7 @@ if ($action == 'update')
 	    if (preg_match('/([^\\/:]+)$/i',$_FILES[$varforimage]["name"],$reg))
 	    {
 	        $original_file=$reg[1];
-	
+
 	        $isimage=image_format_supported($original_file);
 	        if ($isimage >= 0)
 	        {
@@ -185,9 +185,9 @@ if ($action == 'update')
 	        }
 	    }
 	}
-	
-	
-	
+
+
+
 	$_SESSION["mainmenu"]="";   // Le gestionnaire de menu a pu changer
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
@@ -222,7 +222,7 @@ if ($action == 'edit')	// Edit
     print '<input type="hidden" name="action" value="update">';
 
     clearstatcache();
-    
+
     print '<br>';
     print '<table summary="edit" class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Language").'</td><td></td>';
@@ -264,7 +264,7 @@ if ($action == 'edit')	// Edit
     print '<tr><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td><input class="flat" name="main_size_shortliste_limit" size="4" value="' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '"></td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
-	
+
     // show input border
     /*
     print '<tr><td>'.$langs->trans("showInputBorder").'</td><td>';
@@ -273,7 +273,7 @@ if ($action == 'edit')	// Edit
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
     */
-	
+
 	// Disable javascript and ajax
     print '<tr><td>'.$langs->trans("DisableJavascript").'</td><td>';
     print $form->selectyesno('main_disable_javascript',isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0,1);
@@ -323,17 +323,17 @@ if ($action == 'edit')	// Edit
 	print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
-	
+
 	// Hide version link
 	/*
-	
+
 	print '<tr><td class="titlefield">'.$langs->trans("HideVersionLink").'</td><td>';
 	print $form->selectyesno('MAIN_HIDE_VERSION',$conf->global->MAIN_HIDE_VERSION,1);
 	print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
     */
-	
+
 	// Show bugtrack link
 	print '<tr><td class="titlefield">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
 	print $form->selectyesno('MAIN_BUGTRACK_ENABLELINK',$conf->global->MAIN_BUGTRACK_ENABLELINK,1);
@@ -349,7 +349,19 @@ if ($action == 'edit')	// Edit
 	print '</tr>';
 
 	// Message of the day on home page
-    print '<tr><td class="titlefield">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
+    $substitutionarray=getCommonSubstitutionArray($langs, 0, array('object'));
+    complete_substitutions_array($substitutionarray, $langs);
+    $substitutionarray['__(AnyTranslationKey)__']=$langs->trans('TranslationKey');
+
+    print '<tr><td class="titlefield">';
+    $texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+    foreach($substitutionarray as $key => $val)
+    {
+        $texthelp.=$key.'<br>';
+    }
+    print $form->textwithpicto($langs->trans("MessageOfDay"), $texthelp, 1, 'help', '', 0, 2, '');
+
+    print '</td><td colspan="2">';
 
     $doleditor = new DolEditor('main_motd', (isset($conf->global->MAIN_MOTD)?$conf->global->MAIN_MOTD:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
 	$doleditor->Create();
@@ -359,26 +371,36 @@ if ($action == 'edit')	// Edit
 	print '</table>'."\n";
 
 	print '<br>';
-	
+
 	// Other
 	print '<table summary="edit" class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("LoginPage").'</td><td></td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
-	
+
 	// Message on login page
-	print '<tr><td>'.$langs->trans("MessageLogin").'</td><td colspan="2">';
+	$substitutionarray=getCommonSubstitutionArray($langs, 0, array('object','user'));
+    complete_substitutions_array($substitutionarray, $langs);
+    $substitutionarray['__(AnyTranslationKey)__']=$langs->trans('TranslationKey');
+    print '<tr><td>';
+	$texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+	foreach($substitutionarray as $key => $val)
+	{
+	    $texthelp.=$key.'<br>';
+	}
+	print $form->textwithpicto($langs->trans("MessageLogin"), $texthelp, 1, 'help', '', 0, 2, '');
+	print '</td><td colspan="2">';
 	$doleditor = new DolEditor('main_home', (isset($conf->global->MAIN_HOME)?$conf->global->MAIN_HOME:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
 	$doleditor->Create();
 	print '</td></tr>'."\n";
-	
+
 	// Hide helpcenter link on login page
 	print '<tr><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
 	print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK',isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0,1);
 	print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
-	
+
 	// Background
 	print '<tr><td><label for="imagebackground">'.$langs->trans("BackgroundImageLogin").' (png,jpg)</label></td><td colspan="2">';
     print '<div class="centpercent inline-block">';
@@ -394,9 +416,9 @@ if ($action == 'edit')	// Edit
 	}
 	print '</div>';
 	print '</td></tr>';
-	
+
 	print '</table>'."\n";
-	
+
 
     print '<br><div class="center">';
     print '<input class="button" type="submit" name="submit" value="'.$langs->trans("Save").'">';
@@ -421,7 +443,7 @@ else	// Show
     if ($user->admin && $conf->global->MAIN_LANG_DEFAULT!='auto') print info_admin($langs->trans("SubmitTranslation".($conf->global->MAIN_LANG_DEFAULT=='en_US'?'ENUS':''),$conf->global->MAIN_LANG_DEFAULT),1);
 	print '</td>';
 	print "</tr>";
-    
+
     print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableMultilangInterface").'</td><td>' . yn($conf->global->MAIN_MULTILANGS) . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
@@ -441,7 +463,7 @@ else	// Show
     print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
-	
+
     print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td>' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
@@ -452,7 +474,7 @@ else	// Show
     print '<td width="20">&nbsp;</td>';
     print "</tr>";
 	*/
-	
+
     // Disable javascript/ajax
     print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableJavascript").'</td><td>';
     print yn($conf->global->MAIN_DISABLE_JAVASCRIPT)."</td>";
@@ -506,7 +528,7 @@ else	// Show
 	 print '<td width="20">&nbsp;</td>';
 	 print '</tr>';
 	 */
-	
+
     // Show bugtrack link
 	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
 	print yn($conf->global->MAIN_BUGTRACK_ENABLELINK)."</td>";
@@ -527,7 +549,7 @@ else	// Show
     print '</table>'."\n";
 
     print '<br>';
-    
+
     // Login page
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("LoginPage").'</td><td></td><td>&nbsp;</td></tr>';
@@ -537,7 +559,7 @@ else	// Show
     if (isset($conf->global->MAIN_HOME)) print dol_htmlcleanlastbr($conf->global->MAIN_HOME);
     else print '&nbsp;';
     print '</td></tr>'."\n";
-    
+
 	// Link to help center
     print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td colspan="2">';
     print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0),1);
@@ -557,9 +579,9 @@ else	// Show
     }
     print '</div>';
     print '</td></tr>';
-    
+
     print '</table>'."\n";
-    
+
     print '<div class="tabsAction tabsActionNoBottom">';
     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
     print '</div>';
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 74081266f43..cf97b397e44 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -259,7 +259,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-                        
+
                         print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
                         print $module->info();
                         print '</td>';
@@ -386,7 +386,7 @@ foreach ($dirmodels as $reldir)
                 {
                 	if (file_exists($dir.'/'.$file))
                 	{
-                		
+
 
 		    			$name = substr($file, 4, dol_strlen($file) -16);
 		    			$classname = substr($file, 0, dol_strlen($file) -12);
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index caea3bef9f7..3711b346585 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -59,8 +59,8 @@ $acts[1] = "disable";
 $actl[0] = img_picto($langs->trans("Disabled"),'switch_off');
 $actl[1] = img_picto($langs->trans("Activated"),'switch_on');
 
-$listoffset=GETPOST('listoffset');
-$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000;
+$listoffset=GETPOST('listoffset','alpha');
+$listlimit=GETPOST('listlimit','alpha')>0?GETPOST('listlimit','alpha'):1000;
 $active = 1;
 
 $sortfield = GETPOST("sortfield",'alpha');
@@ -119,14 +119,14 @@ $formmail=new FormMail($db);
 if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
 {
     $tmp=FormMail::getAvailableSubstitKey('formemail');
-    $tmp['__(AnyTransKey)__']='__(AnyTransKey)__';
+    $tmp['__(AnyTranslationKey)__']='__(AnyTranslationKey)__';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
     $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
 }
 else
 {
     $tmp=FormMail::getAvailableSubstitKey('formemailwithlines');
-    $tmp['__(AnyTransKey)__']='__(AnyTransKey)__';
+    $tmp['__(AnyTranslationKey)__']='__(AnyTranslationKey)__';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
     $tmp=FormMail::getAvailableSubstitKey('formemailforlines');
     $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>'.implode('<br>', $tmp);
@@ -175,7 +175,7 @@ $id = 25;
 
 if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
 {
-    //$search_country_id = '';    
+    //$search_country_id = '';
 }
 
 // Actions add or modify an entry into a dictionary
@@ -479,12 +479,12 @@ if ($action != 'edit')
         if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
     	if ($fieldlist[$field]=='content')         { $valuetoshow=''; }
     	if ($fieldlist[$field]=='content_lines')   { $valuetoshow=''; }
-    		
+
         if ($valuetoshow != '')
         {
             print '<td align="'.$align.'">';
         	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
-        	else if (! empty($tabhelp[$id][$value])) 
+        	else if (! empty($tabhelp[$id][$value]))
         	{
         	    if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value);   // Tooltip on click
         	    else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);                             // Tooltip on hover
@@ -494,15 +494,15 @@ if ($action != 'edit')
          }
          if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
     }
-    
+
     print '<td colspan="3">';
     print '<input type="hidden" name="id" value="'.$id.'">';
     print '</td>';
     print '</tr>';
-    
+
     // Line to enter new values
     print "<tr ".$bcnd[$var].">";
-    
+
     $obj = new stdClass();
     // If data was already input, we define them in obj to populate input fields.
     if (GETPOST('actionadd'))
@@ -513,12 +513,12 @@ if ($action != 'edit')
             	$obj->$val=GETPOST($val);
         }
     }
-    
+
     $tmpaction = 'create';
     $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
     $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
     $error=$hookmanager->error; $errors=$hookmanager->errors;
-    
+
     if (empty($reshook))
     {
     	if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates' && $action == 'edit')
@@ -530,11 +530,11 @@ if ($action != 'edit')
     		fieldList($fieldlist,$obj,$tabname[$id],'add');
     	}
     }
-    
+
     print '<td align="right" colspan="3">';
     print '</td>';
     print "</tr>";
-    
+
     $fieldsforcontent = array('content');
     if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
     {
@@ -545,7 +545,7 @@ if ($action != 'edit')
         print '<tr class="impair nodrag nodrop nohover"><td colspan="5">';
         if ($tmpfieldlist == 'content') print '<strong>'.$form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong><br>';
         if ($tmpfieldlist == 'content_lines') print '<strong>'.$form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong><br>';
-    
+
         if ($context != 'hide')
         {
             //print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
@@ -556,7 +556,7 @@ if ($action != 'edit')
         }
         else print '&nbsp;';
         print '</td>';
-        if ($tmpfieldlist == 'content') 
+        if ($tmpfieldlist == 'content')
         {
             print '<td align="center" colspan="3" rowspan="'.(count($fieldsforcontent)).'">';
             if ($action != 'edit')
@@ -568,12 +568,12 @@ if ($action != 'edit')
         //else print '<td></td>';
         print '</tr>';
     }
-    
-    
-    
+
+
+
     $colspan=count($fieldlist)+1;
     print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
-}    
+}
 
 
 // List of available record in database
@@ -590,7 +590,7 @@ if ($resql)
     if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
     if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
     if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
-    
+
     // There is several pages
     if ($num > $listlimit)
     {
@@ -628,7 +628,7 @@ if ($resql)
         // Affiche nom du champ
         if ($showfield)
         {
-            if (! empty($tabhelp[$id][$value])) 
+            if (! empty($tabhelp[$id][$value]))
             {
                 if (in_array($value, array('topic'))) $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);   // Tooltip on hover
                 else $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);                             // Tooltip on hover
@@ -653,7 +653,7 @@ if ($resql)
     print '<td class="liste_titre"></td>';
     print '<td class="liste_titre"></td>';
     print '</tr>';
-        
+
     if ($num)
     {
         // Lines with values
@@ -680,7 +680,7 @@ if ($resql)
                 print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
                 print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                 print '</td>';
-                
+
                 $fieldsforcontent = array('content');
                 if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
                 {
@@ -691,11 +691,11 @@ if ($resql)
                     $showfield = 1;
                     $align = "left";
                     $valuetoshow = $obj->{$tmpfieldlist};
-                
+
                     $class = 'tddict';
                     // Show value for field
                     if ($showfield) {
-                
+
                         print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$rowid.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
                         $okforextended = true;
                         if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
@@ -704,9 +704,9 @@ if ($resql)
                             print $doleditor->Create(1);
                             print '</td>';
                             print '<td></td><td></td><td></td>';
-                
+
                     }
-                }                
+                }
             }
             else
             {
@@ -778,16 +778,16 @@ if ($resql)
                 {
                     $fieldsforcontent = array('content', 'content_lines');
                 }
-                foreach ($fieldsforcontent as $tmpfieldlist) 
+                foreach ($fieldsforcontent as $tmpfieldlist)
                 {
                     $showfield = 1;
                     $align = "left";
                     $valuetoshow = $obj->{$tmpfieldlist};
-                    
+
                     $class = 'tddict';
                     // Show value for field
                     if ($showfield) {
-                        
+
                         print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$i.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
                         $okforextended = true;
                         if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
@@ -796,13 +796,13 @@ if ($resql)
                         print $doleditor->Create(1);
                         print '</td>';
                         print '<td></td><td></td><td></td>';
-                        
+
                     }
                 }*/
             }
             print "</tr>\n";
-            
-            
+
+
             $i++;
         }
     }
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 7c8413a28a6..e0dc1d3b5b4 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -310,7 +310,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						
+
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -614,7 +614,7 @@ print '</form>';
 /* Seems to be not so used. So kept hidden for the moment to avoid dangerous options inflation.
 if ($conf->banque->enabled)
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td>&nbsp</td><td align="right">';
     if (! empty($conf->use_javascript_ajax))
@@ -636,7 +636,7 @@ if ($conf->banque->enabled)
 }
 else
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index d408657ac8c..549bb93809b 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -251,7 +251,7 @@ foreach ($dirmodels as $reldir)
                         if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
                         if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-                        
+
                         print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
                         print $module->info();
                         print '</td>';
@@ -370,7 +370,7 @@ foreach ($dirmodels as $reldir)
         {
             while (($file = readdir($handle))!==false)
             {
-                if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))            	
+                if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
                 {
                     $name = substr($file, 4, dol_strlen($file) -16);
                     $classname = substr($file, 0, dol_strlen($file) -12);
@@ -378,7 +378,7 @@ foreach ($dirmodels as $reldir)
 	                require_once $dir.'/'.$file;
 	                $module = new $classname($db, new FactureFournisseur($db));
 
-                    
+
                     print "<tr class=\"oddeven\">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index acce3a38c7c..55e4e4b3d07 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -280,7 +280,7 @@ foreach ($dirmodels as $reldir)
                         if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
                         if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-                        
+
                         print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
                         print $module->info();
                         print '</td>';
@@ -402,7 +402,7 @@ foreach ($dirmodels as $reldir)
 	                require_once $dir.'/'.$file;
 	                $module = new $classname($db, new CommandeFournisseur($db));
 
-                    
+
                     print "<tr class=\"oddeven\">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
@@ -502,14 +502,14 @@ $var=false;
 	print '</td><td align="right">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 	print "</td></tr>\n";
-	
+
 //}
 
 // Ask for payment bank during supplier order
 /* Kept as hidden for the moment
 if ($conf->banque->enabled)
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp</td><td align="center">';
     if (! empty($conf->use_javascript_ajax))
@@ -531,7 +531,7 @@ if ($conf->banque->enabled)
 }
 else
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 8a8d2a181a4..82eeddd594c 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -289,7 +289,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						
+
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -567,7 +567,7 @@ print '</form>';
 
 if ($conf->banque->enabled)
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp</td><td align="right">';
     if (! empty($conf->use_javascript_ajax))
@@ -589,7 +589,7 @@ if ($conf->banque->enabled)
 }
 else
 {
-    
+
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 3641ac87cef..a8d6d64c45c 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -155,7 +155,7 @@ class FormMail extends Form
         $listofpaths=array();
         $listofnames=array();
         $listofmimes=array();
-        
+
         $keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
         if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
         if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
@@ -182,7 +182,7 @@ class FormMail extends Form
         $listofpaths=array();
         $listofnames=array();
         $listofmimes=array();
-        
+
         $keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
         if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
         if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
@@ -209,7 +209,7 @@ class FormMail extends Form
         $listofpaths=array();
         $listofnames=array();
         $listofmimes=array();
-        
+
         $keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
         if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
         if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
@@ -266,13 +266,13 @@ class FormMail extends Form
         	$out='';
 
         	$disablebademails=1;
-        	
+
         	// Define list of attached files
         	$listofpaths=array();
         	$listofnames=array();
         	$listofmimes=array();
             $keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-            
+
         	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
         	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
         	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
@@ -415,7 +415,7 @@ class FormMail extends Form
                             {
                                 $posalias++;
                                 $listaliasval=trim($listaliasval);
-                                if ($listaliasval) 
+                                if ($listaliasval)
                                 {
                                     $listaliasval=preg_replace('/</', '&lt;', $listaliasval);
                                     $listaliasval=preg_replace('/>/', '&gt;', $listaliasval);
@@ -720,7 +720,7 @@ class FormMail extends Form
         				$this->substit['__PERSONALIZED__']=str_replace('\n',"\n",$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url));
         			}
         		}
-                
+
                 //Add lines substitution key from each line
                 $lines = '';
                 $defaultlines = $arraydefaultmessage['content_lines'];
@@ -979,14 +979,14 @@ class FormMail extends Form
 			return -1;
 		}
 	}
-	
-	
-	
+
+
+
 	/**
 	 * Set substit array from object
-	 * 
+	 *
 	 * @param	CommonObject	   $object		  Object to use
-	 * @param   Translate  $outputlangs   Object lang 
+	 * @param   Translate  $outputlangs   Object lang
 	 * @return	void
 	 */
 	function setSubstitFromObject($object, $outputlangs=null)
@@ -1001,14 +1001,14 @@ class FormMail extends Form
 		$this->substit['__AMOUNT__'] = price($object->total_ttc);
 		$this->substit['__AMOUNT_WO_TAX__'] = price($object->total_ht);
 		$this->substit['__AMOUNT_VAT__'] = price($object->total_tva);
-		
+
 		$this->substit['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
 		$this->substit['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty)?$object->thirdparty->name:'');
-		
+
 		$this->substit['__PROJECT_ID__'] = (is_object($object->projet)?$object->projet->id:'');
 		$this->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
 		$this->substit['__PROJECT_NAME__'] = (is_object($object->projet)?$object->projet->title:'');
-		
+
 		$this->substit['__SIGNATURE__'] = $user->signature;
 		$this->substit['__PERSONALIZED__'] = '';
 		$this->substit['__CONTACTCIVNAME__'] = '';	// Will be replace just before sending
@@ -1020,7 +1020,7 @@ class FormMail extends Form
         foreach ($extrafields->attribute_label as $key => $label) {
             $this->substit['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
         }
-		
+
         //Fill substit_lines with each object lines content
         if (is_array($object->lines))
         {
@@ -1057,36 +1057,37 @@ class FormMail extends Form
             }
         }
 	}
-	
+
 	/**
-	 * Get list of substition keys available.
-	 * 
+	 * Get list of substition keys available for emails.
+	 * This include the complete_substitutions_array. TODO Include the getCommonSubstitutionArray().
+	 *
 	 * @param	string	$mode		'formemail', 'formemailwithlines', 'formemailforlines', 'emailing', ...
-	 * @return	void
+	 * @return	array               Array of substitution values for emails.
 	 */
 	static function getAvailableSubstitKey($mode='formemail')
 	{
 		global $conf, $langs;
-		
+
 		$vars=array();
-		
+
 		if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines')
 		{
 			$vars=array(
-				'__REF__', 
-				'__REFCLIENT__', 
-				'__REFSUPPLIER__', 
-			    '__THIRDPARTY_ID__', 
-			    '__THIRDPARTY_NAME__', 
-			    '__PROJECT_ID__', 
-			    '__PROJECT_REF__', 
+				'__REF__',
+				'__REFCLIENT__',
+				'__REFSUPPLIER__',
+			    '__THIRDPARTY_ID__',
+			    '__THIRDPARTY_NAME__',
+			    '__PROJECT_ID__',
+			    '__PROJECT_REF__',
 			    '__PROJECT_NAME__',
 				'__CONTACTCIVNAME__',
-				'__AMOUNT__', 
-				'__AMOUNT_WO_TAX__', 
-				'__AMOUNT_VAT__', 
+				'__AMOUNT__',
+				'__AMOUNT_WO_TAX__',
+				'__AMOUNT_VAT__',
 			    '__PERSONALIZED__',			// Paypal link will be added here in form mode
-				'__SIGNATURE__', 
+				'__SIGNATURE__',
 			);
 			if ($mode == 'formwithlines')
 			{
@@ -1127,21 +1128,21 @@ class FormMail extends Form
 					if ($conf->contrat->enabled) $vars['__SECUREKEYPAYPAL_CONTRACTLINE__']='SecureKeyPaypalUniquePerContractLine';
 				}
 			}
-			else 
+			else
 			{
 				$vars['__SECUREKEYPAYPAL__']='';
 				$vars['__SECUREKEYPAYPAL_MEMBER__']='';
 			}
 		}
-		
-		$tmparray=array();
+
 		$parameters=array('mode'=>$mode);
+		$tmparray=getCommonSubstitutionArray($langs);
 		complete_substitutions_array($tmparray, $langs, null, $parameters);
 		foreach($tmparray as $key => $val)
 		{
 		    $vars[$key]=$key;
 		}
-		
+
 		return $vars;
 	}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bd2944fa2f4..a18b9e14110 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5014,8 +5014,100 @@ function dol_concatdesc($text1,$text2,$forxml=false)
 	return $ret;
 }
 
+
 /**
- *  Make substition into a string replacing key with vals from $substitutionarray (oldval=>newval)
+ * Return array of possible common substitutions.
+ *
+ * @param	Translate	$outputlangs	Output language
+ * @param   int         $onlykey        Do not calculate heavy values of keys (performance enhancement when we need only the keys)
+ * @param   array       $exclude        Array of family keys we want to exclude. For example array('mycompany', 'object', 'date', 'user', ...)
+ * @param   Object      $object         Object for keys on object
+ * @return	array						Array of substitutions
+ */
+function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $object=null)
+{
+    global $conf, $mysoc, $user;
+
+    $substitutionarray=array();
+
+    if (empty($exclude) || ! in_array('mycompany', $exclude))
+    {
+        $substitutionarray=array_merge($substitutionarray, array(
+            '__MYCOMPANY_NAME__' => $mysoc->name,
+            '__MYCOMPANY_EMAIL__' => $mysoc->email,
+            '__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
+            '__MYCOMPANY_PROFID2__' => $mysoc->idprof2,
+            '__MYCOMPANY_PROFID3__' => $mysoc->idprof3,
+            '__MYCOMPANY_PROFID4__' => $mysoc->idprof4,
+            '__MYCOMPANY_PROFID5__' => $mysoc->idprof5,
+            '__MYCOMPANY_PROFID6__' => $mysoc->idprof6,
+            '__MYCOMPANY_CAPITAL__' => $mysoc->capital,
+            '__MYCOMPANY_COUNTRY_ID__' => $mysoc->country_id
+        ));
+    }
+    if (empty($exclude) || ! in_array('object', $exclude))
+    {
+        if (is_object($object))       // For backward compatibility
+        {
+            $substitutionarray['__TOTAL_TTC__']    =is_object($object)?$object->total_ttc:'';
+            $substitutionarray['__TOTAL_HT__']     =is_object($object)?$object->total_ht:'';
+            $substitutionarray['__TOTAL_VAT__']    =is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
+        }
+        $substitutionarray['__AMOUNT__']       =is_object($object)?$object->total_ttc:'';
+        $substitutionarray['__AMOUNT_WO_TAX__']=is_object($object)?$object->total_ht:'';
+        $substitutionarray['__AMOUNT_VAT__']   =is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
+    }
+
+    if (empty($exclude) || ! in_array('date', $exclude))
+    {
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+        if (! empty($onlykey))
+        {
+            $tmp=$tmp2=$tmp3=$tmp4=$tmp5=array();
+        }
+        else
+        {
+            $tmp=dol_getdate(dol_now(), true);
+            $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);
+            $tmp3=dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']);
+            $tmp4=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']);
+            $tmp5=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']);
+        }
+        $substitutionarray=array_merge($substitutionarray, array(
+            '__DAY__' => $tmp['mday'],
+            '__MONTH__' => $tmp['mon'],
+            '__YEAR__' => $tmp['year'],
+            '__PREVIOUS_DAY__' => $tmp2['day'],
+            '__PREVIOUS_MONTH__' => $tmp3['month'],
+            '__PREVIOUS_YEAR__' => ($tmp['year'] - 1),
+            '__NEXT_DAY__' => $tmp4['day'],
+            '__NEXT_MONTH__' => $tmp5['month'],
+            '__NEXT_YEAR__' => ($tmp['year'] + 1),
+        ));
+    }
+
+    if (empty($exclude) || ! in_array('user', $exclude))
+    {
+        $substitutionarray=array_merge($substitutionarray, array(
+            '__USER_ID__' => $user->id,
+            '__USER_LOGIN__' => $user->login,
+            '__USER_LASTNAME__' => $user->lastname,
+            '__USER_FIRSTNAME__' => $user->firstname,
+            '__USER_FULLNAME__' => $user->getFullName($outputlangs),
+            '__USER_SUPERVISOR_ID__' => $user->fk_user
+        ));
+    }
+    if (! empty($conf->multicompany->enabled))
+    {
+        $substitutionarray=array_merge($substitutionarray, array('__ENTITY_ID__' => $conf->entity));
+    }
+
+    return $substitutionarray;
+}
+
+/**
+ *  Make substition into a text string, replacing keys with vals from $substitutionarray (oldval=>newval).
  *
  *  @param	string		$text	      			Source string in which we must do substitution
  *  @param  array		$substitutionarray		Array with key->val to substitute
@@ -5034,11 +5126,16 @@ function make_substitutions($text, $substitutionarray, $outputlangs=null)
 	// Make substitution for language keys
 	if (is_object($outputlangs))
 	{
-		while (preg_match('/__\((.*)\)__/', $text, $reg))
+		while (preg_match('/__\(([^\)]*)\)__/', $text, $reg))
 		{
+		    // If key is __(TranslationKey|langfile)__, then force load of langfile.lang
+			$tmp=explode('|',$reg[1]);
+			if (! empty($tmp[1])) $outputlangs->load($tmp[1]);
+
 			$msgishtml = 0;
 			if (dol_textishtml($text,1)) $msgishtml = 1;
-			$text = preg_replace('/__\('.preg_quote($reg[1]).'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text);
+
+			$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text);
 		}
 	}
 
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index e83faee6c8d..8c48e2301e3 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -588,38 +588,25 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height)
 
 
 /**
- *   	Return array of possible substitutions
+ *   	Return array of possible substitutions for PDF content (without external module substitutions).
  *
  *		@param	Translate	$outputlangs	Output language
+ *      @param  Object      $object         Object
  *      @return	array						Array of substitutions
  */
-function pdf_getSubstitutionArray($outputlangs)
+function pdf_getSubstitutionArray($outputlangs, $object=null)
 {
-	global $conf, $mysoc, $user;
-	$substitutionarray=array(
-		'__MYCOMPANY_NAME__' => $mysoc->name,
-		'__MYCOMPANY_EMAIL__' => $mysoc->email,
-		'__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
-		'__MYCOMPANY_PROFID2__' => $mysoc->idprof2,
-		'__MYCOMPANY_PROFID3__' => $mysoc->idprof3,
-		'__MYCOMPANY_PROFID4__' => $mysoc->idprof4,
-		'__MYCOMPANY_PROFID5__' => $mysoc->idprof5,
-		'__MYCOMPANY_PROFID6__' => $mysoc->idprof6,
-		'__MYCOMPANY_CAPITAL__' => $mysoc->capital,
-	    '__USER_ID__' => $user->id,
-		'__USER_LOGIN__' => $user->login,
-		'__USER_LASTNAME__' => $user->lastname,
-		'__USER_FIRSTNAME__' => $user->firstname,
-		'__USER_FULLNAME__' => $user->getFullName($outputlangs)
-	);
-	return $substitutionarray;
+    $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+    $substitutionarray['__FROM_NAME__']='__FROM_NAME__';
+    $substitutionarray['__FROM_EMAIL__']='__FROM_EMAIL__';
+    return $substitutionarray;
 }
 
 
 /**
  *      Add a draft watermark on PDF files
  *
- *      @param	TCPDF      	$pdf           Object PDF
+ *      @param	TCPDF      	$pdf            Object PDF
  *      @param  Translate	$outputlangs	Object lang
  *      @param  int		    $h		        Height of PDF
  *      @param  int		    $w		        Width of PDF
@@ -630,7 +617,7 @@ function pdf_getSubstitutionArray($outputlangs)
 function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 {
 	global $langs, $mysoc, $user;
-	
+
 	// Print Draft Watermark
 	if ($unit=='pt') $k=1;
 	elseif ($unit=='mm') $k=72/25.4;
@@ -638,11 +625,11 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 	elseif ($unit=='in') $k=72;
 
 	// Make substitution
-	$substitutionarray=pdf_getSubstitutionArray($outputlangs);
-	complete_substitutions_array($substitutionarray,$outputlangs,$object);
+	$substitutionarray=pdf_getSubstitutionArray($outputlangs,null);
+	complete_substitutions_array($substitutionarray,$outputlangs,null);
 	$text=make_substitutions($text,$substitutionarray,$outputlangs);
 	$text=$outputlangs->convToOutputCharset($text);
-	
+
 	$savx=$pdf->getX(); $savy=$pdf->getY();
 
 	$watermark_angle=atan($h/$w)/2;
@@ -867,13 +854,10 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	// Line of free text
 	if (empty($hidefreetext) && ! empty($conf->global->$paramfreetext))
 	{
-		$substitutionarray=pdf_getSubstitutionArray($outputlangs);
+		$substitutionarray=pdf_getSubstitutionArray($outputlangs, $object);
 		// More substitution keys
 		$substitutionarray['__FROM_NAME__']=$fromcompany->name;
 		$substitutionarray['__FROM_EMAIL__']=$fromcompany->email;
-		$substitutionarray['__TOTAL_TTC__']=$object->total_ttc;
-		$substitutionarray['__TOTAL_HT__']=$object->total_ht;
-		$substitutionarray['__TOTAL_VAT__']=$object->total_vat;
 		complete_substitutions_array($substitutionarray,$outputlangs,$object);
 		$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray,$outputlangs);
 		$line.=$outputlangs->convToOutputCharset($newfreetext);
@@ -1289,16 +1273,16 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
 
 			if (empty($hideref))
 			{
-				if ($issupplierline) 
+				if ($issupplierline)
 				{
 					if ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1)
 						$ref_prodserv = $ref_supplier;
 					elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)
-						$ref_prodserv = $ref_supplier. ' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';  
-					else 
+						$ref_prodserv = $ref_supplier. ' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
+					else
 						$ref_prodserv = $prodser->ref.' ('.$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.')';
 				}
-				else 
+				else
 					$ref_prodserv = $prodser->ref; // Show local ref only
 
 				if (! empty($libelleproduitservice)) $ref_prodserv .= " - ";
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 3f41e74b7f6..d20b9612b5f 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -265,15 +265,11 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	$main_home='';
 	if (! empty($conf->global->MAIN_HOME))
 	{
-		$i=0;
-		while (preg_match('/__\(([a-zA-Z|@]+)\)__/i',$conf->global->MAIN_HOME,$reg) && $i < 100)
-		{
-			$tmp=explode('|',$reg[1]);
-			if (! empty($tmp[1])) $langs->load($tmp[1]);
-			$conf->global->MAIN_HOME=preg_replace('/__\('.preg_quote($reg[1]).'\)__/i',$langs->trans($tmp[0]),$conf->global->MAIN_HOME);
-			$i++;
-		}
-		$main_home=dol_htmlcleanlastbr($conf->global->MAIN_HOME);
+	    $substitutionarray=getCommonSubstitutionArray($langs);
+	    complete_substitutions_array($substitutionarray, $langs);
+	    $texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
+
+		$main_home=dol_htmlcleanlastbr($texttoshow);
 	}
 
 	// Google AD
@@ -415,7 +411,7 @@ function encodedecode_dbpassconf($level=0)
 			fflush($fp);
 			fclose($fp);
 			clearstatcache();
-			
+
 			// It's config file, so we set read permission for creator only.
 			// Should set permission to web user and groups for users used by batch
 			//@chmod($file, octdec('0600'));
diff --git a/htdocs/index.php b/htdocs/index.php
index d2da24471d8..5303587150e 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -77,7 +77,7 @@ if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$langs->trans("HomeAr
 
 llxHeader('',$title);
 
-    
+
 $resultboxes=FormOther::getBoxesArea($user,"0");    // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
 
 
@@ -88,18 +88,13 @@ if (! empty($conf->global->MAIN_MOTD))
     $conf->global->MAIN_MOTD=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i','<br>',$conf->global->MAIN_MOTD);
     if (! empty($conf->global->MAIN_MOTD))
     {
-    	$i=0;
-    	while (preg_match('/__\(([a-zA-Z|@]+)\)__/i',$conf->global->MAIN_MOTD,$reg) && $i < 100)
-    	{
-    		$tmp=explode('|',$reg[1]);
-    		if (! empty($tmp[1])) $langs->load($tmp[1]);
-    		$conf->global->MAIN_MOTD=preg_replace('/__\('.preg_quote($reg[1]).'\)__/i',$langs->trans($tmp[0]),$conf->global->MAIN_MOTD);
-    		$i++;
-    	}
+        $substitutionarray=getCommonSubstitutionArray($langs);
+        complete_substitutions_array($substitutionarray, $langs);
+        $texttoshow = make_substitutions($conf->global->MAIN_MOTD, $substitutionarray, $langs);
 
         print "\n<!-- Start of welcome text -->\n";
         print '<table width="100%" class="notopnoleftnoright"><tr><td>';
-        print dol_htmlentitiesbr($conf->global->MAIN_MOTD);
+        print dol_htmlentitiesbr($texttoshow);
         print '</td></tr></table><br>';
         print "\n<!-- End of welcome text -->\n";
     }
@@ -136,7 +131,7 @@ if (empty($user->societe_id))
     $action='';
     $reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
     $boxstat.=$hookmanager->resPrint;
-    
+
     if (empty($reshook))
     {
 	    // Condition to be checked for each display line dashboard
@@ -179,7 +174,7 @@ if (empty($user->societe_id))
     	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
     	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
     	    DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
-            DOL_DOCUMENT_ROOT."/projet/class/project.class.php", 
+            DOL_DOCUMENT_ROOT."/projet/class/project.class.php",
 	        DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
 			DOL_DOCUMENT_ROOT."/don/class/don.class.php"
 	    );
@@ -327,12 +322,12 @@ if (empty($user->societe_id))
 	                $board->load_state_board($user);
 	                $boardloaded[$classe]=$board;
 	            }
-	            else 
+	            else
 	            {
 	                $board=$boardloaded[$classe];
 	            }
 
-	            
+
 	            if (!empty($langfile[$key])) $langs->load($langfile[$key]);
 	            $text=$langs->trans($titres[$key]);
 	            $boxstat.='<a href="'.$links[$key].'" class="boxstatsindicator thumbstat nobold nounderline">';
@@ -353,7 +348,7 @@ if (empty($user->societe_id))
     $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
     $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
     $boxstat.='<a class="boxstatsindicator thumbstat nobold nounderline"></a>';
-    
+
     $boxstat.='</td></tr>';
     $boxstat.='</table>';
     $boxstat.='</div>';
@@ -558,7 +553,7 @@ if (! empty($valid_dashboardlines))
 
         $textlate = $langs->trans("NActionsLate",$board->nbtodolate);
         $textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
-        
+
         $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
         $boxwork .= '<div class="boxstatscontent">';
         $boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' '.$board->label.'</span><br>';
@@ -579,7 +574,7 @@ if (! empty($valid_dashboardlines))
         $boxwork.='</div></div>';
         $boxwork .="\n";
     }
-    
+
     $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
     $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
     $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"></div>';
@@ -693,7 +688,7 @@ function showWeather($totallate,$text,$options)
     $out='';
     $offset=0;
     $factor=10; // By default
-    
+
     $level0=$offset;           if (! empty($conf->global->MAIN_METEO_LEVEL0)) $level0=$conf->global->MAIN_METEO_LEVEL0;
     $level1=$offset+1*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL1)) $level1=$conf->global->MAIN_METEO_LEVEL1;
     $level2=$offset+2*$factor; if (! empty($conf->global->MAIN_METEO_LEVEL2)) $level2=$conf->global->MAIN_METEO_LEVEL2;

From 9d8374693509f237538c490a29dfb15164430f2c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 1 Jun 2017 04:44:05 +0200
Subject: [PATCH 0995/1163] Fix : Book entry in general ledger for salaries

---
 htdocs/accountancy/journal/bankjournal.php | 70 ++++++++++++++--------
 1 file changed, 46 insertions(+), 24 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index b42ef34d663..35d4112ebc9 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -223,7 +223,7 @@ if ($result) {
 		    // Now loop on each link of record in bank.
 			foreach ( $links as $key => $val ) {
 
-			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation')))     // So we excluded 'company' here
+			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'payment_salary')))     // So we excluded 'company' here
 			    {
 			        // We save tabtype for a future use, to remember what kind of payment it is 
 			        $tabtype[$obj->rowid] = $links[$key]['type'];
@@ -294,7 +294,7 @@ if ($result) {
 					$paymentsalstatic->ref = $links[$key]['url_id'];
 					$paymentsalstatic->label = $links[$key]['label'];
 					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2);
-					// $tabtp[$obj->rowid][$account_employee] += $obj->amount;
+					$tabpay[$obj->rowid]["paymentsalid"] = $paymentsalstatic->id;
 				} else if ($links[$key]['type'] == 'payment_expensereport') {
 					$paymentexpensereportstatic->id = $links[$key]['url_id'];
 					$paymentexpensereportstatic->fk_expensereport = $links[$key]['url_id'];
@@ -418,14 +418,17 @@ if (! $error && $action == 'writebookkeeping') {
         					$objmid = $db->fetch_object($resultmid);
         					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
         				}
-        			} else if ($tabtype[$key] == 'payment_vat') {
-  			  			$bookkeeping->code_tiers = '';
-	  			  		$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat payment
-        			} else if ($tabtype[$key] == 'payment_donation') {
-		  			  	$bookkeeping->code_tiers = '';
-			  			  $bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
-        			}
-        
+					} else if ($tabtype[$key] == 'payment_vat') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat payment
+					} else if ($tabtype[$key] == 'payment_donation') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
+					} else if ($tabtype[$key] == 'payment_salary') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->doc_ref = $langs->trans("PaymentSalary") . ' (' . $val["paymentsalid"] . ')'; // Ref of salary payment
+					}
+
         			$result = $bookkeeping->create($user);
         			if ($result < 0) {
         				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
@@ -495,19 +498,23 @@ if (! $error && $action == 'writebookkeeping') {
         					$objmid = $db->fetch_object($resultmid);
         					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
         				}
-                $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-        				$bookkeeping->numero_compte = $k;
-    					} else if ($tabtype[$key] == 'payment_vat') {
-	  		  			$bookkeeping->code_tiers = '';
-		  		  		$bookkeeping->numero_compte = $k;
-			  		  	$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat
-            	} else if ($tabtype[$key] == 'payment_donation') {
-					  	  $bookkeeping->code_tiers = '';
-						    $bookkeeping->numero_compte = $k;
-						    $bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
-         			} else if ($tabtype[$key] == 'banktransfert') {
-  						  $bookkeeping->code_tiers = '';
-        				$bookkeeping->numero_compte = $k;
+						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->numero_compte = $k;
+					} else if ($tabtype[$key] == 'payment_vat') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat
+					} else if ($tabtype[$key] == 'payment_donation') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
+					} else if ($tabtype[$key] == 'payment_salary') {
+						$bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->doc_ref = $langs->trans("PaymentSalary") . ' (' . $val["paymentsalid"] . ')'; // Rowid of salary payment
+					} else if ($tabtype[$key] == 'banktransfert') {
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->numero_compte = $k;
         			} else {
         			    // FIXME Should be a temporary account ???
         				$bookkeeping->doc_ref = $k;
@@ -740,8 +747,9 @@ if (empty($action) || $action == 'view') {
 	$invoicestatic = new Facture($db);
 	$invoicesupplierstatic = new FactureFournisseur($db);
 	$expensereportstatic = new ExpenseReport($db);
-  $vatstatic = new Tva($db);
+	$vatstatic = new Tva($db);
 	$donationstatic = new Don($db);
+	$salarystatic = new PaymentSalary($db);
 
 	llxHeader('', $langs->trans("FinanceJournal"));
 
@@ -896,6 +904,20 @@ if (empty($action) || $action == 'view') {
 		    }
 		    else dol_print_error($db);
 		}
+		elseif ($tabtype[$key] == 'payment_salary')
+		{
+			$sqlmid = 'SELECT s.rowid as id';
+			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_salary as s";
+			$sqlmid .= " WHERE s.rowid=" . $val["paymentsalid"];
+			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$salarystatic->fetch($objmid->id);
+				$ref=$langs->trans("SalaryPayment").' '.$salarystatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
+		}
 
 
 		/*$invoicestatic->id = $key;

From 77df19009db350893462e42caaad9bad2c50924e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 12:11:45 +0200
Subject: [PATCH 0996/1163] Removed duplicated code

---
 htdocs/admin/agenda_other.php                 |  57 +++----
 htdocs/admin/barcode.php                      |  36 +---
 htdocs/admin/commande.php                     |  31 +---
 htdocs/admin/contract.php                     |  31 +---
 htdocs/admin/expedition.php                   |  32 +---
 htdocs/admin/expensereport.php                |  32 +---
 htdocs/admin/facture.php                      |  27 +--
 htdocs/admin/fichinter.php                    |  32 +---
 htdocs/admin/livraison.php                    |  32 +---
 htdocs/admin/propal.php                       |  32 +---
 htdocs/admin/supplier_payment.php             |  35 +---
 htdocs/admin/supplier_proposal.php            |  36 +---
 htdocs/admin/user.php                         |  32 +---
 htdocs/admin/usergroup.php                    |  32 +---
 htdocs/core/actions_setmoduleoptions.inc.php  |  86 ++++++++++
 htdocs/core/lib/files.lib.php                 | 160 +++++++++---------
 .../doc/doc_generic_contract_odt.modules.php  |  41 +----
 htdocs/langs/en_US/admin.lang                 |   2 +
 htdocs/modulebuilder/template/admin/setup.php |   9 +-
 htdocs/product/admin/product.php              |  45 +----
 htdocs/projet/admin/project.php               |  39 +----
 htdocs/societe/admin/societe.php              |  32 +---
 22 files changed, 265 insertions(+), 626 deletions(-)
 create mode 100644 htdocs/core/actions_setmoduleoptions.inc.php

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index bd9587a4440..44ec3ade889 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -49,6 +49,8 @@ $type = 'action';
  *	Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if (preg_match('/set_(.*)/',$action,$reg))
 {
 	$code=$reg[1];
@@ -77,21 +79,6 @@ if (preg_match('/del_(.*)/',$action,$reg))
 		dol_print_error($db);
 	}
 }
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-
-	if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-	if (! $res > 0) $error++;
-	if (! $error)
-	{
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-        setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
 if ($action == 'set')
 {
 	dolibarr_set_const($db, 'AGENDA_USE_EVENT_TYPE_DEFAULT', GETPOST('AGENDA_USE_EVENT_TYPE_DEFAULT'), 'chaine', 0, '', $conf->entity);
@@ -233,7 +220,7 @@ else
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
     print load_fiche_titre($langs->trans("AgendaModelModule"),'','');
-    
+
     print '<table class="noborder" width="100%">'."\n";
     print '<tr class="liste_titre">'."\n";
     print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
@@ -243,13 +230,13 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     print '<td align="center" width="40">'.$langs->trans("ShortInfo").'</td>';
     print '<td align="center" width="40">'.$langs->trans("Preview").'</td>';
     print '</tr>'."\n";
-    
+
     clearstatcache();
-    
+
     foreach ($dirmodels as $reldir)
     {
     	$dir = dol_buildpath($reldir."core/modules/action/doc/");
-    
+
         if (is_dir($dir))
         {
             $handle=opendir($dir);
@@ -261,10 +248,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
                     {
             			$name = substr($file, 4, dol_strlen($file) -16);
             			$classname = substr($file, 0, dol_strlen($file) -12);
-            			
+
             			require_once $dir.'/'.$file;
-            			$module = new $classname($db, new ActionComm($db));           			
-            			
+            			$module = new $classname($db, new ActionComm($db));
+
             			print '<tr class="oddeven">'."\n";
             			print "<td>";
             			print (empty($module->name)?$name:$module->name);
@@ -272,16 +259,16 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			print "<td>\n";
             			require_once $dir.$file;
             			$module = new $classname($db,$specimenthirdparty);
-            			if (method_exists($module,'info')) 
+            			if (method_exists($module,'info'))
             				print $module->info($langs);
-            			else 
+            			else
             				print $module->description;
             			print "</td>\n";
-            			
+
             			// Active
             			if (in_array($name, $def))
             			{
-            			    
+
             			print '<td align="center">'."\n";
             			if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name")
             			{
@@ -301,7 +288,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
             				print "</td>";
             			}
-            			
+
             			// Default
             			print '<td align="center">';
             			if ($conf->global->ACTION_EVENT_ADDON_PDF == "$name")
@@ -313,7 +300,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
             			}
             			print '</td>';
-            			
+
             			// Info
             			$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
             			$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
@@ -326,7 +313,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			print '<td align="center">';
             			print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"),'order').'</a>';
             			print '</td>';
-            			
+
             			print "</tr>\n";
                     }
                 }
@@ -366,7 +353,7 @@ print '</td></tr>'."\n";
 
 if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
-    
+
     print '<!-- AGENDA_USE_EVENT_TYPE_DEFAULT -->';
     print '<tr class="oddeven">'."\n";
     print '<td>'.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").'</td>'."\n";
@@ -404,30 +391,30 @@ print '</td></tr>'."\n";
 // AGENDA NOTIFICATION
 if ($conf->global->MAIN_FEATURES_LEVEL > 0)
 {
-    
+
     print '<tr class="oddeven">'."\n";
     print '<td>'.$langs->trans('AGENDA_NOTIFICATION').'</td>'."\n";
     print '<td align="center">&nbsp;</td>'."\n";
     print '<td align="right">'."\n";
-    
+
     if (empty($conf->global->AGENDA_NOTIFICATION)) {
         print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_NOTIFICATION">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
         print '</td></tr>'."\n";
     } else {
         print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_NOTIFICATION">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
         print '</td></tr>'."\n";
-    	
+
         print '<tr class="oddeven">'."\n";
         print '<td>'.$langs->trans('AGENDA_NOTIFICATION_SOUND').'</td>'."\n";
         print '<td align="center">&nbsp;</td>'."\n";
         print '<td align="right">'."\n";
-    
+
         if (empty($conf->global->AGENDA_NOTIFICATION_SOUND)) {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_NOTIFICATION_SOUND">'.img_picto($langs->trans('Disabled'),'switch_off').'</a>';
         } else {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_NOTIFICATION_SOUND">'.img_picto($langs->trans('Enabled'),'switch_on').'</a>';
         }
-    
+
         print '</td></tr>'."\n";
     }
 }
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index db81c9a325f..ba649fe9223 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -39,6 +39,8 @@ $action = GETPOST('action','alpha');
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'setbarcodeproducton')
 {
 	$res=dolibarr_set_const($db, "BARCODE_PRODUCT_ADDON_NUM", GETPOST('value'), 'chaine', 0, '', $conf->entity);
@@ -72,33 +74,7 @@ else if ($action == 'update')
 else if ($action == 'updateengine')
 {
     // TODO Update engines.
-    
-}
 
-// define constants for models generator that need parameters
-if ($action == 'setModuleOptions')
-{
-    $post_size=count($_POST);
-
-    for($i=0;$i < $post_size;$i++)
-    {
-        if (array_key_exists('param'.$i,$_POST))
-        {
-            $param=GETPOST("param".$i,'alpha');
-            $value=GETPOST("value".$i,'alpha');
-            if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-        }
-    }
-	if (! $res > 0) $error++;
-
- 	if (! $error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
 }
 
 if ($action && $action != 'setcoder' && $action != 'setModuleOptions')
@@ -276,7 +252,7 @@ if ($resql)
 		print '<td align="center">';
 		print $formbarcode->setBarcodeEncoder($obj->coder,$barcodelist,$obj->rowid,'form'.$i);
 		print "</td></tr>\n";
-		
+
 		$i++;
 	}
 }
@@ -312,7 +288,7 @@ print '</tr>';
 // Chemin du binaire genbarcode sous linux
 if (! isset($_SERVER['WINDIR']))
 {
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("GenbarcodeLocation").'</td>';
 	print '<td width="60" align="center">';
@@ -328,7 +304,7 @@ if (! isset($_SERVER['WINDIR']))
 // Module products
 if (! empty($conf->product->enabled))
 {
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("SetDefaultBarcodeTypeProducts").'</td>';
 	print '<td width="60" align="right">';
@@ -339,7 +315,7 @@ if (! empty($conf->product->enabled))
 // Module thirdparty
 if (! empty($conf->societe->enabled))
 {
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("SetDefaultBarcodeTypeThirdParties").'</td>';
 	print '<td width="60" align="right">';
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 6d92ad21999..3f3c997b0d8 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -54,6 +54,8 @@ $type = 'order';
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
 	$maskconstorder=GETPOST('maskconstorder','alpha');
@@ -118,35 +120,6 @@ else if ($action == 'specimen')
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 else if ($action == 'set')
 {
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 47e53a05048..206d9020022 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -50,6 +50,8 @@ if (empty($conf->global->CONTRACT_ADDON))
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
     $maskconst = GETPOST('maskconstcontract','alpha');
@@ -113,35 +115,6 @@ else if ($action == 'specimen') // For contract
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-        setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 else if ($action == 'set')
 {
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index e9a9aaedb18..6182538f820 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -57,6 +57,9 @@ if (empty($conf->global->EXPEDITION_ADDON_NUMBER))
 /*
  * Actions
  */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
 	$maskconst=GETPOST('maskconstexpedition','alpha');
@@ -142,35 +145,6 @@ else if ($action == 'specimen')
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-else if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 else if ($action == 'set')
 {
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 92ba9375927..6c659181c4c 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -51,6 +51,9 @@ $type='expensereport';
 /*
  * Actions
  */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
 	$maskconst=GETPOST('maskconst','alpha');
@@ -116,35 +119,6 @@ else if ($action == 'specimen') // For fiche inter
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 else if ($action == 'set')
 {
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 64ae1abdde6..115a685a3f2 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -51,6 +51,8 @@ $type='invoice';
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
     $maskconstinvoice=GETPOST('maskconstinvoice','alpha');
@@ -123,31 +125,6 @@ if ($action == 'specimen')
     }
 }
 
-// define constants for models generator that need parameters
-if ($action == 'setModuleOptions')
-{
-    $post_size=count($_POST);
-    for($i=0;$i < $post_size;$i++)
-    {
-        if (array_key_exists('param'.$i,$_POST))
-        {
-            $param=GETPOST("param".$i,'alpha');
-            $value=GETPOST("value".$i,'alpha');
-            if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-        }
-    }
-	if (! $res > 0) $error++;
-
- 	if (! $error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-
 // Activate a model
 else if ($action == 'set')
 {
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index e3000231c38..25c46164783 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -51,6 +51,9 @@ $type='ficheinter';
 /*
  * Actions
  */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
 	$maskconst=GETPOST('maskconst','alpha');
@@ -114,35 +117,6 @@ else if ($action == 'specimen') // For fiche inter
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 else if ($action == 'set')
 {
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index cf97b397e44..ef73ec7a757 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -47,10 +47,13 @@ $label   = GETPOST('label','alpha');
 $scandir = GETPOST('scandir','alpha');
 $type='delivery';
 
+
 /*
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
     $maskconstdelivery=GETPOST('maskconstdelivery','alpha');
@@ -131,35 +134,6 @@ if ($action == 'specimen')
     }
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 if ($action == 'set')
 {
     $ret = addDocumentModel($value, $type, $label, $scandir);
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index e0dc1d3b5b4..9fa8dad0c0c 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -49,6 +49,9 @@ $type='propal';
 /*
  * Actions
  */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 $error=0;
 if ($action == 'updateMask')
 {
@@ -180,35 +183,6 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL')
     }
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 if ($action == 'set')
 {
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index adaa114b1ca..4227f4d4221 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -47,6 +47,8 @@ $type='supplier_payment';
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
     $maskconstsupplierpayment=GETPOST('maskconstsupplierpayment','alpha');
@@ -68,31 +70,6 @@ if ($action == 'updateMask')
     dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
 }
 
-// define constants for models generator that need parameters
-else if ($action == 'setModuleOptions')
-{
-    $post_size=count($_POST);
-    for($i=0;$i < $post_size;$i++)
-    {
-        if (array_key_exists('param'.$i,$_POST))
-        {
-            $param=GETPOST("param".$i,'alpha');
-            $value=GETPOST("value".$i,'alpha');
-            if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-        }
-    }
-	if (! $res > 0) $error++;
-
- 	if (! $error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-
 // Activate a model
 else if ($action == 'set')
 {
@@ -195,7 +172,7 @@ dol_fiche_head($head, 'supplierpayment', $langs->trans("Suppliers"), -1, 'compan
  */
 
 if (empty($conf->global->SUPPLIER_PAYMENT_ADDON)) $conf->global->SUPPLIER_PAYMENT_ADDON = 'mod_supplier_payment_bronan';
-    
+
 print load_fiche_titre($langs->trans("PaymentsNumberingModule"), '', '');
 
 // Load array def with activated templates
@@ -265,7 +242,7 @@ foreach ($dirmodels as $reldir)
                         require_once $dir.$filebis;
 
                         $module = new $classname($db);
-						
+
                         // Show modules according to features level
                         if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
                         if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
@@ -375,7 +352,7 @@ foreach ($dirmodels as $reldir)
         {
             while (($file = readdir($handle))!==false)
             {
-                if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))            	
+                if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
                 {
                     $name = substr($file, 4, dol_strlen($file) -16);
                     $classname = substr($file, 0, dol_strlen($file) -12);
@@ -383,7 +360,7 @@ foreach ($dirmodels as $reldir)
 	                require_once $dir.'/'.$file;
 	                $module = new $classname($db, new PaiementFourn($db));
 
-                    
+
                     print "<tr class=\"oddeven\">\n";
                     print "<td>";
 	                print (empty($module->name)?$name:$module->name);
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 82eeddd594c..210d601c33c 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -41,10 +41,15 @@ $label = GETPOST('label','alpha');
 $scandir = GETPOST('scandir','alpha');
 $type='supplier_proposal';
 
+$error=0;
+
+
 /*
  * Actions
  */
-$error=0;
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'updateMask')
 {
 	$maskconstsupplier_proposal=GETPOST('maskconstsupplier_proposal','alpha');
@@ -159,35 +164,6 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL')
     }
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 if ($action == 'set')
 {
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 0c7574b7ec4..31efcb22474 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -47,37 +47,9 @@ $type='user';
  * Action
  */
 
-// Activate a model
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-    {
-    	if (array_key_exists('param'.$i,$_POST))
-    	{
-    		$param=GETPOST("param".$i,'alpha');
-    		$value=GETPOST("value".$i,'alpha');
-    		if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-	    	if (! $res > 0) $error++;
-    	}
-    }
-	if (! $error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-elseif ($action == 'set_default')
+if ($action == 'set_default')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 	$res = true;
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 4642e6d3183..8d098ee6923 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -47,37 +47,9 @@ $type='group';
  * Action
  */
 
-// Activate a model
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-    {
-    	if (array_key_exists('param'.$i,$_POST))
-    	{
-    		$param=GETPOST("param".$i,'alpha');
-    		$value=GETPOST("value".$i,'alpha');
-    		if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-	    	if (! $res > 0) $error++;
-    	}
-    }
-	if (! $error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-elseif ($action == 'set_default')
+if ($action == 'set_default')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 	$res = true;
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
new file mode 100644
index 00000000000..03b33b19eb1
--- /dev/null
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -0,0 +1,86 @@
+<?php
+/* Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *	\file			htdocs/core/actions_setnotes.inc.php
+ *  \brief			Code for actions on setting notes of object page
+ */
+
+
+// $action must be defined
+// $_FILES may be defined
+// $nomessageinsetmoduleoptions can be set to 1
+
+// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
+if ($action == 'setModuleOptions')
+{
+    $db->begin();
+
+    // Process common param fields
+    foreach($_POST as $key => $val)
+    {
+        if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
+        {
+            $param=GETPOST("param".$reg[1],'alpha');
+            $value=GETPOST("value".$reg[1],'alpha');
+            if ($param)
+            {
+                $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+                if (! $res > 0) $error++;
+            }
+        }
+    }
+
+    // Process upload fields
+    if (GETPOST('upload','alpha') && GETPOST('keyforuploaddir','aZ09'))
+    {
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        $keyforuploaddir=GETPOST('keyforuploaddir','aZ09');
+        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->$keyforuploaddir)));
+        foreach($listofdir as $key=>$tmpdir)
+        {
+            $tmpdir=trim($tmpdir);
+            $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+            if (! $tmpdir) {
+                unset($listofdir[$key]); continue;
+            }
+            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+            else
+            {
+                $upload_dir=$tmpdir;
+            }
+        }
+        if ($upload_dir)
+        {
+            $result = dol_add_file_process($upload_dir, 0, 1, 'uploadfile', '');
+            if ($result <= 0) $error++;
+        }
+    }
+
+    if (! $error)
+    {
+        $db->commit();
+        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        $db->rollback();
+        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+    }
+}
+
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 95fca68aa5d..85aace9db0b 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -44,7 +44,7 @@ function dol_basename($pathfile)
  *  @param	string		$path        	Starting path from which to search. This is a full path.
  *  @param	string		$types        	Can be "directories", "files", or "all"
  *  @param	int			$recursive		Determines whether subdirectories are searched
- *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/' by doing preg_quote($var,'/'), since this char is used for preg_match function, 
+ *  @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/' by doing preg_quote($var,'/'), since this char is used for preg_match function,
  *                                      but must not contains the start and end '/'. Filter is checked into basename only.
  *  @param	array		$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview.*\.png)$','^\.')). Exclude is checked into fullpath.
  *  @param	string		$sortcriteria	Sort criteria ("","fullname","name","date","size")
@@ -71,9 +71,9 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 
 	$reshook = 0;
 	$file_list = array();
-	
+
 	$hookmanager->resArray=array();
-	
+
 	if (! $nohook)
 	{
 		$hookmanager->initHooks(array('fileslib'));
@@ -196,9 +196,9 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 			}
 		}
 	}
-	
+
 	$file_list = array_merge($file_list, $hookmanager->resArray);
-	
+
 	return $file_list;
 }
 
@@ -219,7 +219,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0)
 {
     global $conf, $db;
-    
+
     $sql=" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m, acl, position";
     if ($mode) $sql.=", description";
     $sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
@@ -234,7 +234,7 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
         $i = 0;
         while ($i < $num)
         {
-            $obj = $db->fetch_object($resql);            
+            $obj = $db->fetch_object($resql);
             if ($obj)
             {
                 preg_match('/([^\/]+)\/[^\/]+$/',DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,$reg);
@@ -258,7 +258,7 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
             }
             $i++;
         }
-        
+
         // Obtain a list of columns
         if (! empty($sortcriteria))
         {
@@ -270,7 +270,7 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
             // Sort the data
             if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
         }
-        
+
         return $file_list;
     }
     else
@@ -279,7 +279,7 @@ function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortc
         return array();
     }
 }
-    
+
 
 /**
  * Fast compare of 2 files identified by their properties ->name, ->date and ->size
@@ -460,10 +460,10 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0,
 
     if (empty($srcfile)) return -1;
     if (empty($destfile)) $destfile=$srcfile;
-    
+
     $destexists=dol_is_file($destfile);
     if (($destfile != $srcfile) && $destexists) return 0;
-    
+
     $tmpdestfile=$destfile.'.tmp';
 
     $newpathofsrcfile=dol_osencode($srcfile);
@@ -481,17 +481,17 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0,
         dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
         return -2;
     }
-   
+
     dol_delete_file($tmpdestfile);
-    
+
     // Create $newpathoftmpdestfile from $newpathofsrcfile
     $content=file_get_contents($newpathofsrcfile, 'r');
-    
+
     $content = make_substitutions($content, $arrayreplacement, null);
-    
+
     file_put_contents($newpathoftmpdestfile, $content);
     @chmod($newpathoftmpdestfile, octdec($newmask));
-    
+
     // Rename
     $result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0), 0, $indexdatabase);
     if (! $result)
@@ -589,7 +589,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 
 	$destexists=dol_is_dir($destfile);
 	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
-    
+
     if (! $destexists)
     {
         // We must set mask just before creating dir, becaause it can be set differently by dol_copy
@@ -599,7 +599,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
         $dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
         dol_mkdir($destfile, '', decoct($dirmaskdec));
     }
-    
+
 	$ossrcfile=dol_osencode($srcfile);
 	$osdestfile=dol_osencode($destfile);
 
@@ -639,7 +639,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
                     $result=$tmpresult;
                 }
                 if ($result < 0) break;
-                
+
             }
         }
         closedir($dir_handle);
@@ -656,10 +656,10 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 
 /**
  * Move a file into another name.
- * Note: 
+ * Note:
  *  - This function differs from dol_move_uploaded_file, because it can be called in any context.
  *  - Database of files is updated.
- *  - Test on antivirus is done only if param testvirus is provided and an antivirus was set. 
+ *  - Test on antivirus is done only if param testvirus is provided and an antivirus was set.
  *
  * @param	string  $srcfile            Source file (can't be a directory. use native php @rename() to move a directory)
  * @param   string	$destfile           Destination file (can't be a directory. use native php @rename() to move a directory)
@@ -679,12 +679,12 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvi
     $srcexists=dol_is_file($srcfile);
     $destexists=dol_is_file($destfile);
 
-    if (! $srcexists) 
+    if (! $srcexists)
     {
         dol_syslog("files.lib.php::dol_move srcfile does not exists. we ignore the move request.");
         return false;
     }
-    
+
     if ($overwriteifexists || ! $destexists)
     {
         $newpathofsrcfile=dol_osencode($srcfile);
@@ -695,7 +695,7 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvi
         if ($testvirus)
         {
             $testvirusarray=dolCheckVirus($newpathofsrcfile);
-            if (count($testvirusarray)) 
+            if (count($testvirusarray))
             {
                 dol_syslog("files.lib.php::dol_move canceled because a virus was found into source file. we ignore the move request.", LOG_WARNING);
                 return false;
@@ -729,14 +729,14 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvi
 
                 dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
                 include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-                
+
                 $ecmfiletarget=new EcmFiles($db);
                 $resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
                 if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
                 {
                     $ecmfiletarget->delete($user);
                 }
-                
+
                 $ecmfile=new EcmFiles($db);
                 $resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
                 if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
@@ -745,7 +745,7 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvi
                     $rel_dir = dirname($rel_filetorenameafter);
                     $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
                     $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-                    
+
                     $ecmfile->filepath = $rel_dir;
                     $ecmfile->filename = $filename;
                     $resultecm = $ecmfile->update($user);
@@ -756,7 +756,7 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvi
                     $rel_dir = dirname($rel_filetorenameafter);
                     $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
                     $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-                    	
+
                     $ecmfile->filepath = $rel_dir;
                     $ecmfile->filename = $filename;
                     $ecmfile->label = md5_file(dol_osencode($destfile));        // $destfile is a full path to file
@@ -774,12 +774,12 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvi
                 {
                     setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
                 }
-                
+
                 if ($resultecm > 0) $result=true;
                 else $result = false;
-            }        
+            }
         }
-        
+
         if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
         $newmaskdec=octdec($newmask);
         // Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
@@ -809,14 +809,14 @@ function dol_unescapefile($filename)
 
 /**
  * Check virus into a file
- * 
+ *
  * @param   string      $src_file       Source file to check
  * @return  array                       Array of errors or empty array if not virus found
  */
 function dolCheckVirus($src_file)
 {
     global $conf;
-    
+
     if (! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
     {
         if (! class_exists('AntiVir')) {
@@ -837,10 +837,10 @@ function dolCheckVirus($src_file)
 /**
  *	Make control on an uploaded file from an GUI page and move it to final destination.
  * 	If there is errors (virus found, antivir in error, bad filename), file is not moved.
- *  Note: 
+ *  Note:
  *  - This function can be used only into a HTML page context. Use dol_move if you are outside.
- *  - Database of files is not updated.
  *  - Test on antivirus is always done (if antivirus set).
+ *  - Database of files is NOT updated.
  *
  *	@param	string	$src_file			Source full path filename ($_FILES['field']['tmp_name'])
  *	@param	string	$dest_file			Target full path filename  ($_FILES['field']['name'])
@@ -867,7 +867,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		$parameters=array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
 		$reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
 	}
-    
+
 	if (empty($reshook))
 	{
     	// If an upload error has been reported
@@ -897,7 +897,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
     	            break;
     	    }
     	}
-    	
+
     	// If we need to make a virus scan
     	if (empty($disablevirusscan) && file_exists($src_file))
     	{
@@ -908,7 +908,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
     	       return 'ErrorFileIsInfectedWithAVirus: '.join(',',$checkvirusarray);
     	    }
     	}
-    	
+
     	// Security:
     	// Disallow file with some extensions. We renamed them.
     	// Car si on a mis le rep documents dans un rep de la racine web (pas bien), cela permet d'executer du code a la demande.
@@ -916,7 +916,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
     	{
     	    $file_name.= '.noexe';
     	}
-    	
+
     	// Security:
     	// We refuse cache files/dirs, upload using .. and pipes into filenames.
     	if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
@@ -924,7 +924,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
     	    dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
     	    return -1;
     	}
-    	
+
     	// Security:
     	// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
     	if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
@@ -933,7 +933,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
     	    return -2;
     	}
 	}
-	
+
 	if ($reshook < 0)	// At least one blocking error returned by one hook
 	{
 		$errmsg = join(',', $hookmanager->errors);
@@ -1005,7 +1005,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
         dol_syslog("Refused to delete file ".$file, LOG_WARNING);
 	    return False;
 	}
-	
+
 	if (empty($nohook))
 	{
 		$hookmanager->initHooks(array('fileslib'));
@@ -1042,16 +1042,16 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 				{
 					if ($nophperrors) $ok=@unlink($filename);
 					else $ok=unlink($filename);
-					if ($ok) 
+					if ($ok)
 					{
 					    dol_syslog("Removed file ".$filename, LOG_DEBUG);
-					    
+
 	                    // Delete entry into ecm database
     				    $rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
     				    if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
     				    {
     				        $rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
-    				        
+
     				        dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
         				    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
         				    $ecmfile=new EcmFiles($db);
@@ -1079,7 +1079,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 			if ($nophperrors) $ok=@unlink($file_osencoded);
 			else $ok=unlink($file_osencoded);
 			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
-			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);      
+			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
 		}
 
 		return $ok;
@@ -1104,7 +1104,7 @@ function dol_delete_dir($dir,$nophperrors=0)
         dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
 	    return False;
 	}
-	
+
     $dir_osencoded=dol_osencode($dir);
     return ($nophperrors?@rmdir($dir_osencoded):rmdir($dir_osencoded));
 }
@@ -1340,7 +1340,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 	global $db,$user,$conf,$langs;
 
 	$res = 0;
-	
+
 	if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
 	{
 		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
@@ -1354,17 +1354,17 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 					$val = array($val);
 				}
 			}
-			
+
 			$nbfile = count($TFile['name']);
-			
+
 			for ($i = 0; $i < $nbfile; $i++)
 			{
 				// Define $destfull (path to file including filename) and $destfile (only filename)
 				$destfull=$upload_dir . "/" . $TFile['name'][$i];
 				$destfile=$TFile['name'][$i];
-	
+
 				$savingdocmask = dol_sanitizeFileName($savingdocmask);
-	
+
 				if ($savingdocmask)
 				{
 					$destfull=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
@@ -1378,26 +1378,26 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 				$destfile = $info['filename'].'.'.strtolower($info['extension']);
 
 				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
-				
+
 				if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'
 				{
 					global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
-				
+
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-					
+
 					// Generate thumbs.
 					if (image_format_supported($destfull) == 1)
 					{
 					    // Create thumbs
 					    // We can't use $object->addThumbs here because there is no $object known
-					
+
 					    // Used on logon for example
 					    $imgThumbSmall = vignette($destfull, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
 					    // Create mini thumbs for image (Ratio is near 16/9)
 					    // Used on menu or for setup page for example
 					    $imgThumbMini = vignette($destfull, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
 					}
-					
+
 					// Update session
 					if (empty($donotupdatesession))
 					{
@@ -1406,18 +1406,18 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 						$formmail->trackid = $trackid;
 						$formmail->add_attached_files($destfull, $destfile, $TFile['type'][$i]);
 					}
-					
+
 					// Update table of files
-					if ($donotupdatesession) 
+					if ($donotupdatesession)
 					{
 					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
-				    
+
 					    if (! preg_match('/[\\/]temp[\\/]/', $rel_dir))     // If not a tmp dir
 					    {
 					        $filename = basename($destfile);
 					        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 					        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-    					    
+
     					    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
     					    $ecmfile=new EcmFiles($db);
     					    $ecmfile->filepath = $rel_dir;
@@ -1455,7 +1455,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 					}
 				}
 			}
-			
+
 		}
 	} elseif ($link) {
 		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
@@ -1478,7 +1478,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
 	}
-	
+
 	return $res;
 }
 
@@ -1718,11 +1718,11 @@ function dol_compress_dir($inputdir, $outputfile, $mode="zip")
             if (class_exists('ZipArchive'))
             {
                 $foundhandler=1;
-                
+
                 // Initialize archive object
                 $zip = new ZipArchive();
                 $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE);
-                
+
                 // Create recursive directory iterator
                 /** @var SplFileInfo[] $files */
                 $files = new RecursiveIteratorIterator(
@@ -1738,15 +1738,15 @@ function dol_compress_dir($inputdir, $outputfile, $mode="zip")
                         // Get real and relative path for current file
                         $filePath = $file->getRealPath();
                         $relativePath = substr($filePath, strlen($inputdir) + 1);
-                
+
                         // Add current file to archive
                         $zip->addFile($filePath, $relativePath);
                     }
                 }
-                
+
                 // Zip archive will be created only after closing object
-                $zip->close();                
-    
+                $zip->close();
+
                 return 1;
             }
         }
@@ -1793,7 +1793,7 @@ function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta
  * @param	string	$entity				Restrict onto entity (0=no restriction)
  * @param  	User	$fuser				User object (forced)
  * @param	string	$refname			Ref of object to check permission for external users (autodetect if not provided)
- * @param   string  $mode               Check permission for 'read' or 'write'               
+ * @param   string  $mode               Check permission for 'read' or 'write'
  * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
  * @see restrictedArea
  */
@@ -1801,7 +1801,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 {
 	global $user, $conf, $db;
 	global $dolibarr_main_data_root;
-	
+
 	if (! is_object($fuser)) $fuser=$user;
 
 	if (empty($modulepart)) return 'ErrorBadParameter';
@@ -1823,7 +1823,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	{
 	    $lire='creer'; $read='write'; $download='upload';
 	}
-	 
+
 	// Wrapping for some images
 	if (($modulepart == 'mycompany' || $modulepart == 'companylogo') && !empty($conf->mycompany->dir_output))
 	{
@@ -2022,7 +2022,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	    }
 	    $original_file=$conf->user->dir_output.'/'.$original_file;
 	}
-	
+
 	// Wrapping for third parties
 	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
 	{
@@ -2119,7 +2119,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	    }
 	    $original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
-	
+
 	// Wrapping for interventions
 	else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
 	{
@@ -2185,7 +2185,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	}
 
 	// Wrapping pour les commandes fournisseurs
-	else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output)) 
+	else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
@@ -2317,7 +2317,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file=$conf->resource->dir_output.'/'.$original_file;
 	}
-	
+
 	// Wrapping pour les remises de cheques
 	else if ($modulepart == 'remisecheque' && !empty($conf->banque->dir_output))
 	{
@@ -2361,14 +2361,14 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$accessallowed=1;
 		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
 	}
-	
+
 	// Wrapping for miscellaneous medias files
 	elseif ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
 	{
 	    $accessallowed=1;
 	    $original_file=$dolibarr_main_data_root.'/medias/'.$original_file;
 	}
-	
+
 	// Wrapping for backups
 	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
@@ -2416,7 +2416,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
     // If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
     else
 	{
-	    if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path. 
+	    if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
 	    if ($fuser->admin) $accessallowed=1;    // If user is admin
 
 		// Define $accessallowed
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index a58d00455e8..64d0da9b5fd 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -102,16 +102,10 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
 		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte.= '<input type="hidden" name="param1" value="CONTRACT_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-		{
-			$texte.= '<input type="hidden" name="param2" value="CONTRACT_ADDON_PDF_ODT_DEFAULT">';
-			$texte.= '<input type="hidden" name="param3" value="CONTRACT_ADDON_PDF_ODT_TOBILL">';
-			$texte.= '<input type="hidden" name="param4" value="CONTRACT_ADDON_PDF_ODT_CLOSED">';
-		}
 		$texte.= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
@@ -144,40 +138,21 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$texte.=$conf->global->CONTRACT_ADDON_PDF_ODT_PATH;
 		$texte.= '</textarea>';
 		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte.= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'" name="Button">';
 		$texte.= '<br></div></div>';
 
 		// Scan directories
 		if (count($listofdir))
 		{
 			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
-
-			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-			{
-				// Model for creation
-				$liste=ModelePDFContract::liste_modeles($this->db);
-				$texte.= '<table width="50%;">';
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value2',$liste,$conf->global->CONTRACT_ADDON_PDF_ODT_DEFAULT);
-				$texte.= "</td></tr>";
-
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value3',$liste,$conf->global->CONTRACT_ADDON_PDF_ODT_TOBILL);
-				$texte.= "</td></tr>";
-				$texte.= '<tr>';
-
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value4',$liste,$conf->global->CONTRACT_ADDON_PDF_ODT_CLOSED);
-				$texte.= "</td></tr>";
-				$texte.= '</table>';
-			}
 		}
 
+		// Add select to upload a new template file. TODO Copy this feature on other admin pages.
+		$texte.= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte.= '<input type="hidden" value="CONTRACT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte.= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+        $texte.= '</div>';
+
 		$texte.= '</td>';
 
 		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index fe547931908..5b213135878 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -48,6 +48,7 @@ InternalUsers=Internal users
 ExternalUsers=External users
 GUISetup=Display
 SetupArea=Setup area
+UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
@@ -873,6 +874,7 @@ DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
 SetupSaved=Setup saved
+SetupNotSaved=Setup not saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
 VATManagement=VAT Management
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 63b92bc6468..b3f2cc87d73 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -39,20 +39,23 @@ require_once '../lib/mymodule.lib.php';
 $langs->load("mymodule@mymodule");
 
 // Access control
-if (! $user->admin) {
-	accessforbidden();
-}
+if (! $user->admin) accessforbidden();
 
 // Parameters
 $action = GETPOST('action', 'alpha');
 
+
 /*
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
+
 /*
  * View
  */
+
 $page_name = "MyModuleSetup";
 llxHeader('', $langs->trans($page_name));
 
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 5183eeb3382..172bdd9354c 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -74,6 +74,9 @@ $error = 0;
  * Actions
  */
 
+$nomessageinsetmoduleoptions=1;
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'setcodeproduct')
 {
 	if (dolibarr_set_const($db, "PRODUCT_CODEPRODUCT_ADDON",$value,'chaine',0,'',$conf->entity) > 0)
@@ -87,36 +90,6 @@ if ($action == 'setcodeproduct')
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-    {
-    	if (array_key_exists('param'.$i,$_POST))
-    	{
-    		$param=GETPOST("param".$i,'alpha');
-    		$value=GETPOST("value".$i,'alpha');
-    		if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-	    	if (! $res > 0) $error++;
-    	}
-    }
-	if (! $error)
-    {
-        $db->commit();
-	//setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-	// message yet present at the bottom if($action)
-	//setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 if ($action == 'other' && GETPOST('value_PRODUIT_LIMIT_SIZE') >= 0)
 {
 	$res = dolibarr_set_const($db, "PRODUIT_LIMIT_SIZE", GETPOST('value_PRODUIT_LIMIT_SIZE'),'chaine',0,'',$conf->entity);
@@ -278,7 +251,7 @@ if ($action)
     }
     else
     {
-	    setEventMessages($langs->trans("Error"), null, 'errors');
+	    setEventMessages($langs->trans("SetupNotError"), null, 'errors');
     }
 }
 
@@ -543,7 +516,7 @@ foreach ($dirmodels as $reldir)
 
 print '</table>';
 print "<br>";
-    
+
 /*
  * Other conf
  */
@@ -598,7 +571,7 @@ print '</tr>';
 // multiprix nombre de prix a proposer
 if (! empty($conf->global->PRODUIT_MULTIPRICES))
 {
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("MultiPricesNumPrices").'</td>';
 	print '<td align="right"><input size="3" type="text" class="flat" name="value_PRODUIT_MULTIPRICES_LIMIT" value="'.$conf->global->PRODUIT_MULTIPRICES_LIMIT.'"></td>';
@@ -640,7 +613,7 @@ print '</tr>';
 
 if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
 {
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("NumberOfProductShowInSelect").'</td>';
 	print '<td align="right"><input size="3" type="text" class="flat" name="value_PRODUIT_LIMIT_SIZE" value="'.$conf->global->PRODUIT_LIMIT_SIZE.'"></td>';
@@ -681,7 +654,7 @@ print '</tr>';
 // View product description in thirdparty language
 if (! empty($conf->global->MAIN_MULTILANGS))
 {
-	
+
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("ViewProductDescInThirdpartyLanguageAbility").'</td>';
 	print '<td width="60" align="right">';
@@ -723,7 +696,7 @@ if (! empty($conf->global->PRODUCT_CANVAS_ABILITY))
 
     				if ($conf->$module->enabled)
     				{
-    					
+
     					print "<tr ".$bc[$var]."><td>";
 
     					print $object->description;
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index fbcecf032cf..9e35ea77e0b 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -51,6 +51,8 @@ $type='project';
  * Actions
  */
 
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'setmainoptions')
 {
 	if (GETPOST('PROJECT_USE_OPPORTUNITIES')) dolibarr_set_const($db, "PROJECT_USE_OPPORTUNITIES",GETPOST('PROJECT_USE_OPPORTUNITIES'),'chaine',0,'',$conf->entity);
@@ -104,7 +106,7 @@ else if ($action == 'specimen')
 
 	$project = new Project($db);
 	$project->initAsSpecimen();
-    
+
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
 	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
@@ -188,35 +190,6 @@ else if ($action == 'specimentask')
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-	{
-		if (array_key_exists('param'.$i,$_POST))
-		{
-			$param=GETPOST("param".$i,'alpha');
-			$value=GETPOST("value".$i,'alpha');
-			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-			if (! $res > 0) $error++;
-		}
-	}
-	if (! $error)
-	{
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-        setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a model
 else if ($action == 'set')
 {
@@ -414,7 +387,7 @@ foreach ($dirmodels as $reldir)
 
 					if ($module->isEnabled())
 					{
-						
+
 						print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -518,7 +491,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 
 						if ($module->isEnabled())
 						{
-							
+
 							print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
 							print $module->info();
 							print '</td>';
@@ -660,7 +633,7 @@ foreach ($dirmodels as $reldir)
 
 							if ($modulequalified)
 							{
-								
+
 								print '<tr class="oddeven"><td width="100">';
 								print (empty($module->name)?$name:$module->name);
 								print "</td><td>\n";
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 63ba12197fd..5c84be25521 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -42,6 +42,9 @@ if (!$user->admin) accessforbidden();
 /*
  * Actions
  */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
 if ($action == 'setcodeclient')
 {
 	if (dolibarr_set_const($db, "SOCIETE_CODECLIENT_ADDON",$value,'chaine',0,'',$conf->entity) > 0)
@@ -101,35 +104,6 @@ if ($action == 'updateoptions')
 	}
 }
 
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-	$post_size=count($_POST);
-
-	$db->begin();
-
-	for($i=0;$i < $post_size;$i++)
-    {
-    	if (array_key_exists('param'.$i,$_POST))
-    	{
-    		$param=GETPOST("param".$i,'alpha');
-    		$value=GETPOST("value".$i,'alpha');
-    		if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-	    	if (! $res > 0) $error++;
-    	}
-    }
-	if (! $error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
 // Activate a document generator module
 if ($action == 'set')
 {

From 733d1caac6578da19a998b7a206e799c3ebdea9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 12:37:16 +0200
Subject: [PATCH 0997/1163] Correct usage of parameter 'none' in GETPOST

---
 htdocs/admin/chequereceipts.php           |  2 +-
 htdocs/admin/commande.php                 |  2 +-
 htdocs/admin/contract.php                 |  2 +-
 htdocs/admin/expedition.php               |  2 +-
 htdocs/admin/expensereport.php            |  2 +-
 htdocs/admin/facture.php                  |  2 +-
 htdocs/admin/fichinter.php                |  2 +-
 htdocs/admin/livraison.php                |  2 +-
 htdocs/admin/payment.php                  | 17 ++---------------
 htdocs/admin/propal.php                   |  2 +-
 htdocs/admin/supplier_invoice.php         |  2 +-
 htdocs/admin/supplier_order.php           |  2 +-
 htdocs/admin/supplier_proposal.php        |  2 +-
 htdocs/don/admin/donation.php             |  4 ++--
 htdocs/install/mysql/migration/repair.sql |  2 +-
 15 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index bc55eb4b9f6..f88dfc6f5a6 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -77,7 +77,7 @@ if ($action == 'setmod')
 
 if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')
 {
-	$freetext = GETPOST('BANK_CHEQUERECEIPT_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext = GETPOST('BANK_CHEQUERECEIPT_FREE_TEXT','none');	// No alpha here, we want exact string
 
     $res = dolibarr_set_const($db, "BANK_CHEQUERECEIPT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 3f3c997b0d8..f4104e2007f 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -180,7 +180,7 @@ else if ($action == 'set_COMMANDE_DRAFT_WATERMARK')
 
 else if ($action == 'set_ORDER_FREE_TEXT')
 {
-	$freetext = GETPOST("ORDER_FREE_TEXT");	// No alpha here, we want exact string
+	$freetext = GETPOST("ORDER_FREE_TEXT",'none');	// No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "ORDER_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 206d9020022..7f9465b6f65 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -158,7 +158,7 @@ else if ($action == 'setmod')
 
 else if ($action == 'set_other')
 {
-	$freetext= GETPOST('CONTRACT_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext= GETPOST('CONTRACT_FREE_TEXT','none');	// No alpha here, we want exact string
 	$res1 = dolibarr_set_const($db, "CONTRACT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
 	$draft= GETPOST('CONTRACT_DRAFT_WATERMARK','alpha');
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 6182538f820..12d0b7951d5 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -78,7 +78,7 @@ if ($action == 'updateMask')
 
 else if ($action == 'set_param')
 {
-	$freetext=GETPOST('SHIPPING_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext=GETPOST('SHIPPING_FREE_TEXT','none');	// No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "SHIPPING_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 	if ($res <= 0)
 	{
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 6c659181c4c..24aaeede5b4 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -168,7 +168,7 @@ else if ($action == 'setoptions')
 {
     $db->begin();
 
-	$freetext= GETPOST('EXPENSEREPORT_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext= GETPOST('EXPENSEREPORT_FREE_TEXT','none');	// No alpha here, we want exact string
 	$res1 = dolibarr_set_const($db, "EXPENSEREPORT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
 	$draft= GETPOST('EXPENSEREPORT_DRAFT_WATERMARK','alpha');
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 115a685a3f2..df371639cde 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -206,7 +206,7 @@ if ($action == 'set_FACTURE_DRAFT_WATERMARK')
 
 if ($action == 'set_INVOICE_FREE_TEXT')
 {
-	$freetext = GETPOST('INVOICE_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext = GETPOST('INVOICE_FREE_TEXT','none');	// No alpha here, we want exact string
 
     $res = dolibarr_set_const($db, "INVOICE_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 25c46164783..43ad7ad8178 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -160,7 +160,7 @@ else if ($action == 'setmod')
 
 else if ($action == 'set_FICHINTER_FREE_TEXT')
 {
-	$freetext= GETPOST('FICHINTER_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext= GETPOST('FICHINTER_FREE_TEXT','none');	// No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "FICHINTER_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
 	if (! $res > 0) $error++;
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index ef73ec7a757..0136f6cc9d9 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -74,7 +74,7 @@ if ($action == 'updateMask')
 
 if ($action == 'set_DELIVERY_FREE_TEXT')
 {
-    $free=GETPOST('DELIVERY_FREE_TEXT');	// No alpha here, we want exact string
+    $free=GETPOST('DELIVERY_FREE_TEXT','none');	// No alpha here, we want exact string
     $res=dolibarr_set_const($db, "DELIVERY_FREE_TEXT",$free,'chaine',0,'',$conf->entity);
 
     if (! $res > 0) $error++;
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 88f2d8cd1c1..061b9d50f6a 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -71,7 +71,7 @@ if ($action == 'setmod')
 
 if ($action == 'setparams')
 {
-	$freetext = GETPOST('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS');	// No alpha here, we want exact string
+	$freetext = GETPOST('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS','none');	// No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS",$freetext,'chaine',0,'',$conf->entity);
 
@@ -81,24 +81,11 @@ if ($action == 'setparams')
 	{
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-	
-	/*
-	$freetext = GETPOST('INVOICE_AUTO_FILLJS');	// No alpha here, we want exact string
-	
-	$res = dolibarr_set_const($db, "INVOICE_AUTO_FILLJS",$freetext,'chaine',0,'',$conf->entity);
-	
-	if (! $res > 0) $error++;
-	
-	if ($error)
-	{
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-	}*/
-
 	if (! $error)
 	{
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-	
+
 }
 
 
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 9fa8dad0c0c..8acbf19f939 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -135,7 +135,7 @@ if ($action == 'set_PROPALE_DRAFT_WATERMARK')
 
 if ($action == 'set_PROPOSAL_FREE_TEXT')
 {
-	$freetext = GETPOST('PROPOSAL_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext = GETPOST('PROPOSAL_FREE_TEXT','none');	// No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "PROPOSAL_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 549bb93809b..17501cdb4f9 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -172,7 +172,7 @@ if ($action == 'addcat')
 
 if ($action == 'set_SUPPLIER_INVOICE_FREE_TEXT')
 {
-    $freetext = GETPOST('SUPPLIER_INVOICE_FREE_TEXT');	// No alpha here, we want exact string
+    $freetext = GETPOST('SUPPLIER_INVOICE_FREE_TEXT','none');	// No alpha here, we want exact string
 
     $res = dolibarr_set_const($db, "SUPPLIER_INVOICE_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 55e4e4b3d07..13499af551a 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -169,7 +169,7 @@ else if ($action == 'addcat')
 
 else if ($action == 'set_SUPPLIER_ORDER_OTHER')
 {
-    $freetext = GETPOST('SUPPLIER_ORDER_FREE_TEXT');	// No alpha here, we want exact string
+    $freetext = GETPOST('SUPPLIER_ORDER_FREE_TEXT','none');	// No alpha here, we want exact string
 	$doubleapproval = GETPOST('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED','alpha');
 	$doubleapproval = price2num($doubleapproval );
 
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 210d601c33c..8c52ee83dda 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -132,7 +132,7 @@ if ($action == 'set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK')
 
 if ($action == 'set_SUPPLIER_PROPOSAL_FREE_TEXT')
 {
-	$freetext = GETPOST('SUPPLIER_PROPOSAL_FREE_TEXT');	// No alpha here, we want exact string
+	$freetext = GETPOST('SUPPLIER_PROPOSAL_FREE_TEXT','none');	// No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "SUPPLIER_PROPOSAL_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index c8d8be2461d..2ca1cba1083 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -121,7 +121,7 @@ else if ($action == 'del')
 // Options
 if ($action == 'set_DONATION_ACCOUNTINGACCOUNT')
 {
-	$account = GETPOST('DONATION_ACCOUNTINGACCOUNT');	// No alpha here, we want exact string
+	$account = GETPOST('DONATION_ACCOUNTINGACCOUNT','alpha');
 
     $res = dolibarr_set_const($db, "DONATION_ACCOUNTINGACCOUNT",$account,'chaine',0,'',$conf->entity);
 
@@ -139,7 +139,7 @@ if ($action == 'set_DONATION_ACCOUNTINGACCOUNT')
 
 if ($action == 'set_DONATION_MESSAGE')
 {
-	$freemessage = GETPOST('DONATION_MESSAGE');	// No alpha here, we want exact string
+	$freemessage = GETPOST('DONATION_MESSAGE','none');	// No alpha here, we want exact string
 
     $res = dolibarr_set_const($db, "DONATION_MESSAGE",$freemessage,'chaine',0,'',$conf->entity);
 
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 6ff7356847f..0277f7e996b 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -28,7 +28,7 @@
 
 
 
--- Requests to clean corrupted database
+-- Requests to clean corrupted data
 
 
 UPDATE llx_user set api_key = null where api_key = '';

From 7ad92c3a4d52c7dc0f456d92bed4756ba0efb079 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 13:32:20 +0200
Subject: [PATCH 0998/1163] Fix new generic substitution system

---
 htdocs/admin/contract.php                     |  2 +-
 htdocs/contrat/class/contrat.class.php        | 23 +++++++-------
 htdocs/core/lib/functions.lib.php             | 30 ++++++++++---------
 htdocs/core/lib/pdf.lib.php                   | 17 ++++++-----
 .../contract/doc/pdf_strato.modules.php       | 17 ++++++-----
 5 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 7f9465b6f65..e2f865f61f6 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -474,7 +474,7 @@ print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 $var=true;
 
-$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray=pdf_getSubstitutionArray($langs, array('objectamount'));
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index db6464edb6a..b11e19d114b 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -46,7 +46,7 @@ class Contrat extends CommonObject
 	public $fk_element='fk_contrat';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto='contract';
-    
+
 	/**
 	 * {@inheritdoc}
 	 */
@@ -530,7 +530,7 @@ class Contrat extends CommonObject
 				$this->fin_validite				= $this->db->jdate($result["fin_validite"]);
 				$this->date_cloture				= $this->db->jdate($result["date_cloture"]);
 
-				
+
 				$this->user_author_id			= $result["fk_user_author"];
 
 				$this->commercial_signature_id	= $result["fk_commercial_signature"];
@@ -613,7 +613,7 @@ class Contrat extends CommonObject
 
 		$this->lines=array();
         $pos = 0;
-		
+
 		// Selectionne les lignes contrats liees a un produit
 		$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,";
 		$sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
@@ -1858,7 +1858,7 @@ class Contrat extends CommonObject
 		$url = DOL_URL_ROOT.'/contrat/card.php?id='.$this->id;
         $picto = 'contract';
         $label = '';
-        
+
         if ($user->rights->contrat->lire) {
             $label = '<u>'.$langs->trans("ShowContract").'</u>';
             $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
@@ -1874,7 +1874,7 @@ class Contrat extends CommonObject
                 $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
             }
         }
-        
+
         $linkclose='';
         if (empty($notooltip) && $user->rights->contrat->lire)
         {
@@ -1890,7 +1890,7 @@ class Contrat extends CommonObject
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
-		
+
 		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		$result.=$linkstart.$this->ref.$linkend;
@@ -2225,7 +2225,11 @@ class Contrat extends CommonObject
 			$line->total_ht=90;
 			$line->total_ttc=107.64;	// 90 * 1.196
 			$line->total_tva=17.64;
-            if ($num_prods > 0)
+			$line->date_ouverture = dol_now() - 200000;
+			$line->date_ouverture_prevue = dol_now() - 500000;
+			$line->date_fin_validite = dol_now() + 500000;
+			$line->date_cloture = dol_now() - 100000;
+			if ($num_prods > 0)
             {
 				$prodid = mt_rand(1, $num_prods);
 				$line->fk_product=$prodids[$prodid];
@@ -2233,11 +2237,6 @@ class Contrat extends CommonObject
 			$this->lines[$xnbp]=$line;
 			$xnbp++;
 		}
-
-		$this->amount_ht      = $xnbp*100;
-		$this->total_ht       = $xnbp*100;
-		$this->total_tva      = $xnbp*19.6;
-		$this->total_ttc      = $xnbp*119.6;
 	}
 
 	/**
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a18b9e14110..dd4f720b378 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -239,7 +239,7 @@ function dol_shutdown()
 /**
  *  Return value of a param into GET or POST supervariable.
  *  Use the property $user->default_values[path]['creatform'] and/or $user->default_values[path]['filters'] and/or $user->default_values[path]['sortorder']
- *  Note: The property $user->default_values is loaded by the main when loading the user.
+ *  Note: The property $user->default_values is loaded by main.php when loading the user.
  *
  *  @param	string	$paramname   Name of parameter to found
  *  @param	string	$check	     Type of check
@@ -359,32 +359,34 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
 
 	if (! empty($check))
 	{
-	    // Replace vars like __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__, ...
-	    if (! is_array($out))
+	    // Substitution variables for GETPOST (used to get final url with variable parameters or final default value with variable paramaters)
+	    // Example of variables: __DAY__, __MONTH__, __YEAR__, __MYCOUNTRYID__, __USERID__, __ENTITYID__, ...
+	    // We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.
+	    if (! is_array($out) && empty($_POST[$paramname]))
 	    {
 	        $maxloop=20; $loopnb=0;    // Protection against infinite loop
 	        while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
 	        {
 	            $loopnb++; $newout = '';
 
-    	        if ($reg[1] == 'DAY')       { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
-    	        elseif ($reg[1] == 'MONTH') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon'];  }
-    	        elseif ($reg[1] == 'YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; }
+    	        if ($reg[1] == 'DAY')                { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
+    	        elseif ($reg[1] == 'MONTH')          { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon'];  }
+    	        elseif ($reg[1] == 'YEAR')           { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; }
     	    	elseif ($reg[1] == 'PREVIOUS_DAY')   { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
     	        elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
     	        elseif ($reg[1] == 'PREVIOUS_YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); }
-    	    	elseif ($reg[1] == 'NEXT_DAY')   { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
-    	        elseif ($reg[1] == 'NEXT_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
-    	        elseif ($reg[1] == 'NEXT_YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
-    	        elseif ($reg[1] == 'MYCOUNTRYID')
+    	    	elseif ($reg[1] == 'NEXT_DAY')       { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
+    	        elseif ($reg[1] == 'NEXT_MONTH')     { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
+    	        elseif ($reg[1] == 'NEXT_YEAR')      { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
+    	        elseif ($reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')
     	        {
     	            $newout = $mysoc->country_id;
     	        }
-    	        elseif ($reg[1] == 'USERID')
+    	        elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID')
     	        {
     	            $newout = $user->id;
     	        }
-    	    	elseif ($reg[1] == 'SUPERVISORID')
+    	    	elseif ($reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID')
     	        {
     	            $newout = $user->fk_user;
     	        }
@@ -5020,7 +5022,7 @@ function dol_concatdesc($text1,$text2,$forxml=false)
  *
  * @param	Translate	$outputlangs	Output language
  * @param   int         $onlykey        Do not calculate heavy values of keys (performance enhancement when we need only the keys)
- * @param   array       $exclude        Array of family keys we want to exclude. For example array('mycompany', 'object', 'date', 'user', ...)
+ * @param   array       $exclude        Array of family keys we want to exclude. For example array('mycompany', 'objectamount', 'date', 'user', ...)
  * @param   Object      $object         Object for keys on object
  * @return	array						Array of substitutions
  */
@@ -5045,7 +5047,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
             '__MYCOMPANY_COUNTRY_ID__' => $mysoc->country_id
         ));
     }
-    if (empty($exclude) || ! in_array('object', $exclude))
+    if (empty($exclude) || ! in_array('objectamount', $exclude))
     {
         if (is_object($object))       // For backward compatibility
         {
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 8c48e2301e3..9220725dc8e 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -591,12 +591,13 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height)
  *   	Return array of possible substitutions for PDF content (without external module substitutions).
  *
  *		@param	Translate	$outputlangs	Output language
+ *      @param  array       $exclude        Array of family keys we want to exclude. For example array('mycompany', 'object', 'date', 'user', ...)
  *      @param  Object      $object         Object
  *      @return	array						Array of substitutions
  */
-function pdf_getSubstitutionArray($outputlangs, $object=null)
+function pdf_getSubstitutionArray($outputlangs, $exclude=null, $object=null)
 {
-    $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+    $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $exclude, $object);
     $substitutionarray['__FROM_NAME__']='__FROM_NAME__';
     $substitutionarray['__FROM_EMAIL__']='__FROM_EMAIL__';
     return $substitutionarray;
@@ -625,9 +626,9 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 	elseif ($unit=='in') $k=72;
 
 	// Make substitution
-	$substitutionarray=pdf_getSubstitutionArray($outputlangs,null);
-	complete_substitutions_array($substitutionarray,$outputlangs,null);
-	$text=make_substitutions($text,$substitutionarray,$outputlangs);
+	$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, null);
+	complete_substitutions_array($substitutionarray, $outputlangs, null);
+	$text=make_substitutions($text, $substitutionarray, $outputlangs);
 	$text=$outputlangs->convToOutputCharset($text);
 
 	$savx=$pdf->getX(); $savy=$pdf->getY();
@@ -854,12 +855,12 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	// Line of free text
 	if (empty($hidefreetext) && ! empty($conf->global->$paramfreetext))
 	{
-		$substitutionarray=pdf_getSubstitutionArray($outputlangs, $object);
+		$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
 		// More substitution keys
 		$substitutionarray['__FROM_NAME__']=$fromcompany->name;
 		$substitutionarray['__FROM_EMAIL__']=$fromcompany->email;
-		complete_substitutions_array($substitutionarray,$outputlangs,$object);
-		$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray,$outputlangs);
+		complete_substitutions_array($substitutionarray, $outputlangs, $object);
+		$newfreetext=make_substitutions($conf->global->$paramfreetext, $substitutionarray, $outputlangs);
 		$line.=$outputlangs->convToOutputCharset($newfreetext);
 	}
 
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 411b3deadf3..c06882fa121 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -294,22 +294,25 @@ class pdf_strato extends ModelePDFContract
 						} else {
 							$datere = $langs->trans("Unknown");
 						}
-						
+
 						$txtpredefinedservice='';
-                        $txtpredefinedservice = $objectligne->product_ref;
+                        $txtpredefinedservice = $objectligne->product_label;
                         if ($objectligne->product_label)
                         {
                         	$txtpredefinedservice .= ' - ';
                         	$txtpredefinedservice .= $objectligne->product_label;
                         }
 
-						$txt='<strong>'.dol_htmlentitiesbr($outputlangs->transnoentities("DateStartPlannedShort")." : ".$datei." - ".$outputlangs->transnoentities("DateEndPlanned")." : ".$datee,1,$outputlangs->charset_output).'</strong>';
+						$desc=dol_htmlentitiesbr($objectligne->desc,1);   // Desc (not empty for free lines)
+						$txt='';
+						$txt.=$outputlangs->transnoentities("Quantity").' : <strong>'.$objectligne->qty.'</strong> - '.$outputlangs->transnoentities("UnitPrice").' : <strong>'.price($objectligne->subprice).'</strong>';   // Desc (not empty for free lines)
 						$txt.='<br>';
-						$txt.='<strong>'.dol_htmlentitiesbr($outputlangs->transnoentities("DateStartRealShort")." : ".$daters,1,$outputlangs->charset_output);
-						if ($objectligne->date_cloture) $txt.=dol_htmlentitiesbr(" - ".$outputlangs->transnoentities("DateEndRealShort")." : ".$datere,1,$outputlangs->charset_output).'</strong>';
-						$desc=dol_htmlentitiesbr($objectligne->desc,1);
+						$txt.=$outputlangs->transnoentities("DateStartPlannedShort")." : <strong>".$datei."</strong> - ".$outputlangs->transnoentities("DateEndPlanned")." : <strong>".$datee.'</strong>';
+						$txt.='<br>';
+                        $txt.=$outputlangs->transnoentities("DateStartRealShort")." : <strong>".$daters.'</strong>';
+						if ($objectligne->date_cloture) $txt.=" - ".$outputlangs->transnoentities("DateEndRealShort")." : '<strong>'".$datere.'</strong>';
 
-						$pdf->writeHTMLCell(0, 0, $curX, $curY, dol_concatdesc($txt,dol_concatdesc($txtpredefinedservice,$desc)), 0, 1, 0);
+						$pdf->writeHTMLCell(0, 0, $curX, $curY, dol_concatdesc($txtpredefinedservice, dol_concatdesc($txt, $desc)), 0, 1, 0);
 
 						$nexY = $pdf->GetY() + 2;
 						$pageposafter=$pdf->getPage();

From 9b4c929d79e45ba26ede698805a92841bf986b84 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 16:09:09 +0200
Subject: [PATCH 0999/1163] NEW Add phpunit to check the engine is defined into
 sql create files.

---
 htdocs/install/mysql/migration/repair.sql     |  5 +++++
 .../mysql/tables/llx_advtargetemailing.sql    |  2 +-
 .../mysql/tables/llx_product_attribute.sql    |  2 +-
 .../llx_product_attribute_combination.sql     |  2 +-
 .../llx_product_attribute_combination2val.sql |  2 +-
 .../tables/llx_product_attribute_value.sql    |  2 +-
 .../mysql/tables/llx_product_pricerules.sql   |  2 +-
 test/phpunit/CodingSqlTest.php                | 22 +++++++++++--------
 8 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 0277f7e996b..4d3658d20bb 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -337,3 +337,8 @@ drop table tmp_c_shipment_mode;
 -- VMYSQL4.1 update llx_expensereport_det as ed set date = (select date_debut from llx_expensereport as e where ed.fk_expensereport = e.rowid) where DATE(STR_TO_DATE(date, '%Y-%m-%d')) < '1000-00-00';
 -- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
 
+
+-- Backport a change of value into the hourly rate. 
+-- update llx_projet_task_time as ptt set ptt.thm = (SELECT thm from llx_user as u where ptt.fk_user = u.rowid) where (ptt.thm is null)
+
+  
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_advtargetemailing.sql b/htdocs/install/mysql/tables/llx_advtargetemailing.sql
index d22503bb548..7e95f6b8097 100644
--- a/htdocs/install/mysql/tables/llx_advtargetemailing.sql
+++ b/htdocs/install/mysql/tables/llx_advtargetemailing.sql
@@ -28,4 +28,4 @@ CREATE TABLE llx_advtargetemailing
   datec datetime NOT NULL,
   fk_user_mod integer NOT NULL,
   tms timestamp NOT NULL
-)ENGINE=InnoDB;
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_attribute.sql b/htdocs/install/mysql/tables/llx_product_attribute.sql
index 77c045327b8..cb655508e89 100644
--- a/htdocs/install/mysql/tables/llx_product_attribute.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute.sql
@@ -23,4 +23,4 @@ CREATE TABLE llx_product_attribute
   label VARCHAR(255) NOT NULL,
   rang INT DEFAULT 0 NOT NULL,
   entity INT DEFAULT 1 NOT NULL
-);
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_combination.sql b/htdocs/install/mysql/tables/llx_product_attribute_combination.sql
index fae38f8403d..85c46706014 100644
--- a/htdocs/install/mysql/tables/llx_product_attribute_combination.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute_combination.sql
@@ -25,4 +25,4 @@ CREATE TABLE llx_product_attribute_combination
   variation_price_percentage INT NULL,
   variation_weight FLOAT NOT NULL,
   entity INT DEFAULT 1 NOT NULL
-);
\ No newline at end of file
+)ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql b/htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
index a64230923e6..af0da7f710d 100644
--- a/htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
@@ -22,4 +22,4 @@ CREATE TABLE llx_product_attribute_combination2val
   fk_prod_combination INT NOT NULL,
   fk_prod_attr INT NOT NULL,
   fk_prod_attr_val INT NOT NULL
-);
\ No newline at end of file
+)ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_value.sql b/htdocs/install/mysql/tables/llx_product_attribute_value.sql
index ebd2cf8bb49..8ca6888d91b 100644
--- a/htdocs/install/mysql/tables/llx_product_attribute_value.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute_value.sql
@@ -23,4 +23,4 @@ CREATE TABLE llx_product_attribute_value
   ref VARCHAR(255) DEFAULT NULL,
   value VARCHAR(255) DEFAULT NULL,
   entity INT DEFAULT 1 NOT NULL
-);
\ No newline at end of file
+)ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product_pricerules.sql b/htdocs/install/mysql/tables/llx_product_pricerules.sql
index 3e3dfc02ed1..3cf58c9585f 100644
--- a/htdocs/install/mysql/tables/llx_product_pricerules.sql
+++ b/htdocs/install/mysql/tables/llx_product_pricerules.sql
@@ -23,4 +23,4 @@ CREATE TABLE llx_product_pricerules
     fk_level INT NOT NULL, -- Price variations are made over price of X
     var_percent FLOAT NOT NULL, -- Price variation over based price
     var_min_percent FLOAT NOT NULL -- Min price discount over general price
-);
\ No newline at end of file
+)ENGINE=innodb;
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index c6123df3e77..c56f76af246 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -143,16 +143,16 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase
 
         $listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration');
 
-        foreach ($listofsqldir as $dir) 
+        foreach ($listofsqldir as $dir)
         {
             print 'Process dir '.$dir."\n";
             $filesarray = scandir($dir);
-        
-            foreach($filesarray as $key => $file) 
+
+            foreach($filesarray as $key => $file)
             {
                 if (! preg_match('/\.sql$/',$file))
                     continue;
-                    
+
                 print 'Check sql file '.$file."\n";
                 $filecontent=file_get_contents($dir.'/'.$file);
 
@@ -167,7 +167,7 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase
                 $result=strpos($filecontent,'ON DELETE CASCADE');
                 print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found ON DELETE CASCADE into '.$file.'. Bad.');
-                
+
                 if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration')
                 {
                     // Test for migration files only
@@ -176,16 +176,20 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase
                 else
                 {
                     if (preg_match('/\.key\.sql$/',$file))
-                    {                
-                        // Test for files key files only
-                    
+                    {
+                        // Test for key files only
+
                     }
                     else
                     {
-                        // Test for files non key files only
+                        // Test for non key files only
                         $result=(strpos($filecontent,'KEY ') && strpos($filecontent,'PRIMARY KEY ') == 0);
                         print __METHOD__." Result for checking we don't have ' KEY ' instead of a sql file to create index = ".$result."\n";
                         $this->assertTrue($result===false, 'Found KEY into '.$file.'. Bad.');
+
+                        $result=stripos($filecontent,'ENGINE=innodb');
+                        print __METHOD__." Result for checking we have the ENGINE=innodb string = ".$result."\n";
+                        $this->assertGreaterThan(0, $result, 'The ENGINE=innodb was not found into '.$file.'. Add it or just fix syntax to match case.');
                     }
                 }
             }

From b4f1df03de0db99afb82ebd480d60f17eea6f6a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Jun 2017 19:07:51 +0200
Subject: [PATCH 1000/1163] Update doc

---
 build/debian/README.howto       |  1 +
 htdocs/theme/eldy/style.css.php | 58 ++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index c94309ec2ef..1632e954237 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -444,3 +444,4 @@ Note that package 3.5.7 contains not only fixed for bugs reported to debian. It
 so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. 
 After discussion with ..., it appears that security holes are enough to request this unblock request."
 
+Note: If there is a response to ask more information, don't forget to remove the tag during answer.
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 33bba8f1404..c66fa33dfaa 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -39,7 +39,7 @@ if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 $colorbackhmenu1='80,90,120';      // topmenu
 $colorbackvmenu1='255,255,255';      // vmenu
 $colortopbordertitle1='120,120,120';    // top border of title
-$colorbacktitle1='230,230,230';      // title of tables,list
+$colorbacktitle1='230,230,233';      // title of tables,list
 $colorbacktabcard1='255,255,255';  // card
 $colorbacktabactive='234,234,234';
 $colorbacklineimpair1='255,255,255';    // line impair
@@ -56,7 +56,7 @@ $fontsize='13';
 $fontsizesmaller='12';
 
 if (defined('THEME_ONLY_CONSTANT')) return;
-    
+
 session_cache_limiter(FALSE);
 
 require_once '../../main.inc.php';
@@ -272,8 +272,8 @@ input[type=submit] {
 	margin-left: 5px;
 }
 input, input.flat, form.flat select, select, select.flat, .dataTables_length label select {
-	<?php if (empty($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)) 
-	print "border: none;" 
+	<?php if (empty($conf->global->THEME_ELDY_SHOW_BORDER_INPUT))
+	print "border: none;"
 	?>
 }
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
@@ -901,7 +901,7 @@ td.showDragHandle {
 #id-right, #id-left {
 	padding-top: 16px;
 	padding-bottom: 16px;
-	
+
 	display: table-cell;			/* DOL_XXX Empeche fonctionnement correct du scroll horizontal sur tableau, avec datatable ou CSS */
 	float: none;
 	vertical-align: top;
@@ -1529,7 +1529,7 @@ foreach($mainmenuusedarray as $val)
 	display: table;
     position: absolute;
     height: 100%;
-    width: 100%;	
+    width: 100%;
 }
 .login_center {
 	display: table-cell;
@@ -1754,12 +1754,12 @@ div.vmenu, td.vmenu {
 	<?php } ?>
 }
 
-/* Force vmenusearchselectcombo with type=text differently than without because beautify with select2 affect vmenusearchselectcombo differently */ 
+/* Force vmenusearchselectcombo with type=text differently than without because beautify with select2 affect vmenusearchselectcombo differently */
 input.vmenusearchselectcombo[type=text] {
 	width: 180px !important;
 }
 .vmenusearchselectcombo {
-	width: 188px; 
+	width: 188px;
 }
 
 .menu_contenu {
@@ -1926,7 +1926,7 @@ td.ecmroot {
     background-image: -webkit-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
     background-image: -ms-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
     background-image: linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important;
-	
+
     background: #FFF;
     background-repeat: repeat-x !important;
     */
@@ -1939,7 +1939,7 @@ td.ecmroot {
     -webkit-box-shadow: 2px 2px 4px #DDD;
     box-shadow: 2px 2px 4px #DDD;
 	*/
-	
+
     padding: 10px 4px 14px 4px !important;
     min-height: 32px;
 }
@@ -1969,7 +1969,7 @@ div.tabs {
     padding-right: 6px !important;
 	clear:both;
 	height:100%;
-	/* background-image: linear-gradient(to top,#f6f6f6 0,#fff 8px);  */	
+	/* background-image: linear-gradient(to top,#f6f6f6 0,#fff 8px);  */
 }
 div.tabsElem {
 	margin-top: 1px;
@@ -1987,12 +1987,12 @@ div.tabBar {
 	background: rgb(<?php echo $colorbacktabcard1; ?>);
 }
 div.tabBar div.titre {
-	padding-top: 10px;    
+	padding-top: 10px;
 }
 
 div.tabBarWithBottom {
 	padding-bottom: 18px;
-	border-bottom: 1px solid #aaa; 
+	border-bottom: 1px solid #aaa;
 }
 div.tabBar table.tableforservicepart2:last-child {
     border-bottom: 1px solid #aaa;
@@ -2623,7 +2623,7 @@ div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_se
 	background: rgb(<?php echo $colorbacktitle1; ?>);
 	font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
     border-bottom: 1px solid #ddd;
-	
+
     color: rgb(<?php echo $colortexttitle; ?>);
     font-family: <?php print $fontlist ?>;
     text-align: <?php echo $left; ?>;
@@ -2734,7 +2734,7 @@ div.tabBar .noborder {
 
 /* Prepare to remove class pair - impair */
 
-.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) { 
+.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) {
 	background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
 	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
 	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
@@ -2761,7 +2761,7 @@ div.tabBar .noborder {
 /*
  *  Boxes
  */
- 
+
 .ficheaddleft div.boxstats {
     border: none;
 }
@@ -2775,19 +2775,19 @@ div.tabBar .noborder {
     text-align: center;
     border-radius: 2px;
 }
-.boxstats, .boxstats130, .boxstatscontent {    
+.boxstats, .boxstats130, .boxstatscontent {
 	white-space: nowrap;
 	overflow: hidden;
     text-overflow: ellipsis;
 }
 .boxstats {
     padding: 3px;
-    width: 105px;    
+    width: 105px;
 }
 .boxstats130 {
-    width: 160px; 
+    width: 160px;
     height: 48px;
-    padding: 3px  
+    padding: 3px
 }
 .boxstatscontent {
 	padding: 3px;
@@ -2799,9 +2799,9 @@ div.tabBar .noborder {
 		flex: 1 1 110px;
 	}
 	.boxstats, .boxstats130 {
-        width: 90px;    
+        width: 90px;
     }
-    .dashboardlineindicator { 
+    .dashboardlineindicator {
         float: left;
     	padding-left: 5px;
     }
@@ -2833,7 +2833,7 @@ span.dashboardlineko {
 	color: #FFF;
 	/*color: #8c4446 ! important;
 	padding-left: 1px;*/
-	
+
 	font-size: 80%;
 }
 .dashboardlinelatecoin {
@@ -2842,7 +2842,7 @@ span.dashboardlineko {
     text-align: right;
     top: -24px;
     padding: 1px 2px 1px 2px;
-    border-radius: .25em;    
+    border-radius: .25em;
 
     background-color: #af4705;
     padding: 0px 5px 0px 5px;
@@ -2854,7 +2854,7 @@ span.dashboardlineko {
     margin-right: 2px;
     background-color: #8c4446;
     color: #FFFFFF ! important;
-    border-radius: .25em;    
+    border-radius: .25em;
 	display: inline-block;
 	vertical-align: middle;
 }
@@ -3955,7 +3955,7 @@ div.dataTables_length select {
 	border-top: 1px solid #ccc;
 	border-bottom: solid 1px rgba(0,0,0,.2);
 }
-.select2-container-active .select2-choice, .select2-container-active .select2-choices 
+.select2-container-active .select2-choice, .select2-container-active .select2-choices
 {
 	outline: none;
 	border-top: none;
@@ -4039,7 +4039,7 @@ a span.select2-chosen
 	border-right: none;
 	border-top: none;
 	border-left: none;
-	
+
 }
 
 
@@ -4593,7 +4593,7 @@ div.tabsElem a.tab {
     	z-index: 201;
         background: #FFF;
 	}
-	    
+
 	/* Reduce login top right info */
 	.help {
 	<?php if ($disableimages) {  ?>
@@ -4628,7 +4628,7 @@ div.tabsElem a.tab {
         vertical-align: middle;
         background: #FFF;
         height: 42px;
-        
+
     	z-index: 202;
     	min-width: 190px;
     	max-width: 190px;

From 5c58ed8ca78bc1aafdee3f817afcf14e03c83650 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 09:13:04 +0200
Subject: [PATCH 1001/1163] Add a better error message when payment link is not
 valid.

---
 htdocs/core/lib/functions.lib.php    |   8 +-
 htdocs/langs/en_US/errors.lang       |   1 +
 htdocs/langs/en_US/projects.lang     |   2 +-
 htdocs/public/paybox/newpayment.php  |  77 +++++++++--------
 htdocs/public/payment/newpayment.php | 123 ++++++++++++++-------------
 htdocs/public/paypal/newpayment.php  |  83 ++++++++++--------
 htdocs/public/stripe/newpayment.php  |  96 +++++++++++----------
 7 files changed, 217 insertions(+), 173 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index dd4f720b378..ef03b0c00cc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3235,15 +3235,19 @@ function dol_print_error($db='',$error='',$errors=null)
  * Show a public email and error code to contact if technical error
  *
  * @param	string	$prefixcode		Prefix of public error code
+ * @param   string  $errormessage   Complete error message
  * @return	void
  */
-function dol_print_error_email($prefixcode)
+function dol_print_error_email($prefixcode, $errormessage='')
 {
 	global $langs,$conf;
 
 	$langs->load("errors");
 	$now=dol_now();
-	print '<br><div class="error">'.$langs->trans("ErrorContactEMail", $conf->global->MAIN_INFO_SOCIETE_MAIL, $prefixcode.dol_print_date($now,'%Y%m%d')).'</div>';
+	print '<br><div class="center login_main_message"><div class="error">';
+	print $langs->trans("ErrorContactEMail", $conf->global->MAIN_INFO_SOCIETE_MAIL, $prefixcode.dol_print_date($now,'%Y%m%d'));
+	if ($errormessage) print '<br><br>'.$errormessage;
+	print '</div></div>';
 }
 
 /**
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 740397a5044..0f49bd832d6 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -190,6 +190,7 @@ ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
 ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
 ErrorNoWarehouseDefined=Error, no warehouses defined.
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid. 
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.  
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index c98c2120e21..27db2976b2a 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -185,7 +185,7 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index c3aff6341cc..97a4c5452ff 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -135,7 +135,7 @@ if (GETPOST('action','aZ09') == 'dopayment')
     $email=GETPOST("email");
 
     $origfulltag=GETPOST("fulltag",'alpha');
-    
+
 	$mesg='';
 	if (empty($PRICE) || ! is_numeric($PRICE)) $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
 	elseif (empty($email))            $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
@@ -143,7 +143,7 @@ if (GETPOST('action','aZ09') == 'dopayment')
     elseif (! $origfulltag)           $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
 	elseif (dol_strlen($urlok) > 150) $mesg='Error urlok too long '.$urlok;
     elseif (dol_strlen($urlko) > 150) $mesg='Error urlko too long '.$urlko;
-    
+
 	if (empty($mesg))
 	{
 		dol_syslog("newpayment.php call paybox api and do redirect", LOG_DEBUG);
@@ -169,13 +169,22 @@ $conf->dol_hide_leftmenu=1;
 
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
-
 // Common variables
 $creditor=$mysoc->name;
 $paramcreditor='PAYBOX_CREDITOR_'.$suffix;
 if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
 else if (! empty($conf->global->PAYBOX_CREDITOR)) $creditor=$conf->global->PAYBOX_CREDITOR;
 
+// Check link validity
+if (! empty($SOURCE) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
+{
+    $langs->load("errors");
+    dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $SOURCE, $ref));
+    llxFooter();
+    $db->close();
+    exit;
+}
+
 print '<span id="dolpaymentspan"></span>'."\n";
 print '<div class="center">';
 print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -258,14 +267,14 @@ if (! GETPOST("source") && $valid)
     $fulltag=$tag;
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -286,7 +295,7 @@ if (! GETPOST("source") && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -294,7 +303,7 @@ if (! GETPOST("source") && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
 	print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><input class="flat" type="text" name="email" size="48" value="'.GETPOST("email").'"></td></tr>'."\n";
@@ -331,19 +340,19 @@ if (GETPOST("source") == 'order' && $valid)
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -352,7 +361,7 @@ if (GETPOST("source") == 'order' && $valid)
 	print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -372,7 +381,7 @@ if (GETPOST("source") == 'order' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -380,7 +389,7 @@ if (GETPOST("source") == 'order' && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
 	print ' ('.$langs->trans("ToComplete").')';
 	$email=$order->thirdparty->email;
@@ -419,19 +428,19 @@ if (GETPOST("source") == 'invoice' && $valid)
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -440,7 +449,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 	print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -460,7 +469,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -468,7 +477,7 @@ if (GETPOST("source") == 'invoice' && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
 	print ' ('.$langs->trans("ToComplete").')';
     $email=$invoice->thirdparty->email;
@@ -553,19 +562,19 @@ if (GETPOST("source") == 'contractline' && $valid)
 	if (GETPOST('qty')) $qty=GETPOST('qty');
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
 	if ($contractline->fk_product)
 	{
@@ -588,7 +597,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</td></tr>'."\n";
 
 	// Quantity
-	
+
 	$label=$langs->trans("Quantity");
 	$qty=1;
 	$duration='';
@@ -616,7 +625,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</b></td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -636,7 +645,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -644,7 +653,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
 	print ' ('.$langs->trans("ToComplete").')';
     $email=$contract->thirdparty->email;
@@ -684,14 +693,14 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
 	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
@@ -699,7 +708,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	print '</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -710,13 +719,13 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	if ($member->last_subscription_date || $member->last_subscription_amount)
 	{
 		// Last subscription date
-		
+
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
 		print '</td></tr>'."\n";
 
 		// Last subscription amount
-		
+
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
@@ -725,7 +734,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	}
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -749,7 +758,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -757,7 +766,7 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	print '</td></tr>'."\n";
 
 	// EMail
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
     $email=$member->email;
     $email=(GETPOST("email")?GETPOST("email"):(isValidEmail($email)?$email:''));
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 788321b6212..cdfaaa2afc6 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -156,10 +156,10 @@ $urlko=preg_replace('/&$/','',$urlko);  // Remove last &
 if (! empty($conf->paypal->enabled))
 {
 	$langs->load("paypal");
-	
+
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
-	
+
 	$PAYPAL_API_OK="";
 	if ($urlok) $PAYPAL_API_OK=$urlok;
 	$PAYPAL_API_KO="";
@@ -194,7 +194,7 @@ if (! empty($conf->paypal->enabled))
 	        $token = $conf->global->PAYPAL_SECURITY_TOKEN;
 	    }
 		if ($SECUREKEY != $token) $valid=false;
-		
+
 		if (! $valid)
 		{
 	    	print '<div class="error">Bad value for key.</div>';
@@ -202,16 +202,16 @@ if (! empty($conf->paypal->enabled))
 	    	exit;
 		}
 	}
-	
+
     $validpaymentmethod['paypal']='valid';
 }
 
 if (! empty($conf->paybox->enabled))
 {
 	$langs->load("paybox");
-	
+
 	// TODO
-	
+
     $validpaymentmethod['paybox']='valid';
 }
 
@@ -256,10 +256,10 @@ if (empty($validpaymentmethod)) accessforbidden('', 0, 0, 1);
 if ($action == 'dopayment')
 {
 	if ($paymentmethod == 'paypal')
-	{ 
+	{
 		$PAYPAL_API_PRICE=price2num(GETPOST("newamount"),'MT');
 	    $PAYPAL_PAYMENT_TYPE='Sale';
-	
+
 	    $origfulltag=GETPOST("fulltag",'alpha');
 	    $shipToName=GETPOST("shipToName");
 	    $shipToStreet=GETPOST("shipToStreet");
@@ -271,24 +271,24 @@ if ($action == 'dopayment')
 	    $phoneNum=GETPOST("phoneNum");
 	    $email=GETPOST("email");
 	    $desc=GETPOST("desc");
-	
+
 		$mesg='';
 		if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))   $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
 		//elseif (empty($EMAIL))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
 		//elseif (! isValidEMail($EMAIL)) $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
 		elseif (! $origfulltag)        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
-	
+
 	    //var_dump($_POST);
 		if (empty($mesg))
 		{
 			dol_syslog("newpayment.php call paypal api and do redirect", LOG_DEBUG);
-	
+
 			// Other
 			$PAYPAL_API_DEVISE="USD";
 			//if ($currency == 'EUR') $PAYPAL_API_DEVISE="EUR";
 			//if ($currency == 'USD') $PAYPAL_API_DEVISE="USD";
 	        if (! empty($currency)) $PAYPAL_API_DEVISE=$currency;
-	
+
 		    dol_syslog("Submit Paypal form", LOG_DEBUG);
 		    dol_syslog("PAYPAL_API_USER: $PAYPAL_API_USER", LOG_DEBUG);
 		    //dol_syslog("PAYPAL_API_PASSWORD: $PAYPAL_API_PASSWORD", LOG_DEBUG);  // No password into log files
@@ -308,15 +308,15 @@ if ($action == 'dopayment')
 	        dol_syslog("phoneNum: $phoneNum", LOG_DEBUG);
 	        dol_syslog("email: $email", LOG_DEBUG);
 	        dol_syslog("desc: $desc", LOG_DEBUG);
-	
+
 	        dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG);	// If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO
 		    //$_SESSION["PaymentType"]=$PAYPAL_PAYMENT_TYPE;
 		    //$_SESSION["currencyCodeType"]=$PAYPAL_API_DEVISE;
 		    //$_SESSION["Payment_Amount"]=$PAYPAL_API_PRICE;
-	
+
 		    // A redirect is added if API call successfull
 	        print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
-	
+
 			exit;
 		}
 	}
@@ -335,19 +335,28 @@ $conf->dol_hide_leftmenu=1;
 
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
+// Check link validity
+if (! empty($SOURCE) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
+{
+    $langs->load("errors");
+    dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $SOURCE, $ref));
+    llxFooter();
+    $db->close();
+    exit;
+}
 
 if (! empty($conf->paypal->enabled))
 {
-	if (! empty($PAYPAL_API_SANDBOX))
-	{
-		dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
-	}
-
 	// Common variables
 	$creditor=$mysoc->name;
 	$paramcreditor='PAYPAL_CREDITOR_'.$suffix;
 	if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
 	else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR;
+
+	if (! empty($PAYPAL_API_SANDBOX))
+	{
+		dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
+	}
 }
 
 print '<span id="dolpaymentspan"></span>'."\n";
@@ -442,14 +451,14 @@ if (! GETPOST("source"))
 	$fulltag=$tag;
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -469,7 +478,7 @@ if (! GETPOST("source"))
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -507,26 +516,26 @@ if (GETPOST("source") == 'order')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
 	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -535,7 +544,7 @@ if (GETPOST("source") == 'order')
 	print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -555,7 +564,7 @@ if (GETPOST("source") == 'order')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -617,26 +626,26 @@ if (GETPOST("source") == 'invoice')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
 	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -645,7 +654,7 @@ if (GETPOST("source") == 'invoice')
 	print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -665,7 +674,7 @@ if (GETPOST("source") == 'invoice')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -745,7 +754,7 @@ if (GETPOST("source") == 'contractline')
     	{
     		$product=new Product($db);
     		$result=$product->fetch($contractline->fk_product);
-    
+
     		// We define price for product (TODO Put this in a method in product class)
     		if (! empty($conf->global->PRODUIT_MULTIPRICES))
     		{
@@ -759,7 +768,7 @@ if (GETPOST("source") == 'contractline')
     			$pu_ttc = $product->price_ttc;
     			$price_base_type = $product->price_base_type;
     		}
-    
+
     		$amount=$pu_ttc;
     		if (empty($amount))
     		{
@@ -780,19 +789,19 @@ if (GETPOST("source") == 'contractline')
 	if (GETPOST('qty')) $qty=GETPOST('qty');
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
 	if ($contractline->fk_product)
 	{
@@ -815,7 +824,7 @@ if (GETPOST("source") == 'contractline')
 	print '</td></tr>'."\n";
 
 	// Quantity
-	
+
 	$label=$langs->trans("Quantity");
 	$qty=1;
 	$duration='';
@@ -843,7 +852,7 @@ if (GETPOST("source") == 'contractline')
 	print '</b></td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -863,7 +872,7 @@ if (GETPOST("source") == 'contractline')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -925,20 +934,20 @@ if (GETPOST("source") == 'membersubscription')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
 	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
 	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
@@ -946,7 +955,7 @@ if (GETPOST("source") == 'membersubscription')
 	print '</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -957,13 +966,13 @@ if (GETPOST("source") == 'membersubscription')
 	if ($member->last_subscription_date || $member->last_subscription_amount)
 	{
 		// Last subscription date
-		
+
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
 		print '</td></tr>'."\n";
 
 		// Last subscription amount
-		
+
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
@@ -972,7 +981,7 @@ if (GETPOST("source") == 'membersubscription')
 	}
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount))
 	{
@@ -1001,7 +1010,7 @@ if (GETPOST("source") == 'membersubscription')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -1051,11 +1060,11 @@ if ($action != 'dopayment')
     if ($found && ! $error)	// We are in a management option and no error
     {
         // Buttons for all payments registration methods
-        
+
         if (! empty($conf->paypal->enabled))
         {
         	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
-        
+
         	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
         	{
         		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalOrCBDoPayment").'">';
@@ -1065,13 +1074,13 @@ if ($action != 'dopayment')
         		print '<br><input class="button" type="submit" name="dopayment_paypal" value="'.$langs->trans("PaypalDoPayment").'">';
         	}
         }
-    
+
         if (! empty($conf->paybox->enabled))
         {
-        
-            
+
+
         }
-        
+
         // TODO Other methods
     }
     else
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 6de2cb8a441..65fbfbd38a7 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -265,17 +265,27 @@ $conf->dol_hide_leftmenu=1;
 
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
-if (! empty($conf->global->PAYPAL_API_SANDBOX))
-{
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
-}
-
 // Common variables
 $creditor=$mysoc->name;
 $paramcreditor='PAYPAL_CREDITOR_'.$suffix;
 if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
 else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR;
 
+// Check link validity
+if (! empty($SOURCE) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
+{
+    $langs->load("errors");
+    dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $SOURCE, $ref));
+    llxFooter();
+    $db->close();
+    exit;
+}
+
+if (! empty($conf->global->PAYPAL_API_SANDBOX))
+{
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
+}
+
 print '<span id="dopaymentspan"></span>'."\n";
 print '<div class="center">'."\n";
 print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
@@ -359,14 +369,14 @@ if (! GETPOST("source"))
 	$fulltag=$tag;
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -386,7 +396,7 @@ if (! GETPOST("source"))
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -424,26 +434,26 @@ if (GETPOST("source") == 'order')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
 	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -452,7 +462,7 @@ if (GETPOST("source") == 'order')
 	print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -472,7 +482,7 @@ if (GETPOST("source") == 'order')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -534,26 +544,26 @@ if (GETPOST("source") == 'invoice')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
 	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -562,7 +572,7 @@ if (GETPOST("source") == 'invoice')
 	print '</td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -582,7 +592,7 @@ if (GETPOST("source") == 'invoice')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -662,7 +672,7 @@ if (GETPOST("source") == 'contractline')
     	{
     		$product=new Product($db);
     		$result=$product->fetch($contractline->fk_product);
-    
+
     		// We define price for product (TODO Put this in a method in product class)
     		if (! empty($conf->global->PRODUIT_MULTIPRICES))
     		{
@@ -676,7 +686,7 @@ if (GETPOST("source") == 'contractline')
     			$pu_ttc = $product->price_ttc;
     			$price_base_type = $product->price_base_type;
     		}
-    
+
     		$amount=$pu_ttc;
     		if (empty($amount))
     		{
@@ -697,19 +707,19 @@ if (GETPOST("source") == 'contractline')
 	if (GETPOST('qty')) $qty=GETPOST('qty');
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
 	if ($contractline->fk_product)
 	{
@@ -732,7 +742,7 @@ if (GETPOST("source") == 'contractline')
 	print '</td></tr>'."\n";
 
 	// Quantity
-	
+
 	$label=$langs->trans("Quantity");
 	$qty=1;
 	$duration='';
@@ -760,7 +770,7 @@ if (GETPOST("source") == 'contractline')
 	print '</b></td></tr>'."\n";
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -780,7 +790,7 @@ if (GETPOST("source") == 'contractline')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -824,6 +834,7 @@ if (GETPOST("source") == 'membersubscription')
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
+
 	$member=new Adherent($db);
 	$result=$member->fetch('',$ref);
 	if ($result < 0)
@@ -842,20 +853,20 @@ if (GETPOST("source") == 'membersubscription')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
 	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
 	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
     print '<input type="hidden" name="creditor" value="'.$creditor.'">';
     print '</td></tr>'."\n";
 
 	// Debitor
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
 	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
@@ -863,7 +874,7 @@ if (GETPOST("source") == 'membersubscription')
 	print '</b>';
 
 	// Object
-	
+
 	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
@@ -874,13 +885,13 @@ if (GETPOST("source") == 'membersubscription')
 	if ($member->last_subscription_date || $member->last_subscription_amount)
 	{
 		// Last subscription date
-		
+
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
 		print '</td></tr>'."\n";
 
 		// Last subscription amount
-		
+
 		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
@@ -889,7 +900,7 @@ if (GETPOST("source") == 'membersubscription')
 	}
 
 	// Amount
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount))
 	{
@@ -918,7 +929,7 @@ if (GETPOST("source") == 'membersubscription')
 	print '</td></tr>'."\n";
 
 	// Tag
-	
+
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 01ae19c7032..af0c880d3c8 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -196,7 +196,7 @@ else if (! empty($conf->global->STRIPE_CREDITOR)) $creditor=$conf->global->STRIP
 if ($action == 'dopayment')    // We click on button Create payment
 {
     if (GETPOST('newamount')) $amount = GETPOST('newamount');
-    else 
+    else
     {
         setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
         $action = '';
@@ -209,18 +209,18 @@ if ($action == 'charge')
     // See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
     $arrayzerounitcurrency=array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
     if (! in_array($currency, $arrayzerounitcurrency)) $amount=$amount * 100;
-    
+
     dol_syslog("POST keys  : ".join(',', array_keys($_POST)), LOG_DEBUG, 0, '_stripe');
     dol_syslog("POST values: ".join(',', $_POST), LOG_DEBUG, 0, '_stripe');
-    
+
     $stripeToken = GETPOST("stripeToken",'alpha');
     $email = GETPOST("stripeEmail",'alpha');
 
     dol_syslog("stripeToken = ".$stripeToken, LOG_DEBUG, 0, '_stripe');
     dol_syslog("stripeEmail = ".$stripeEmail, LOG_DEBUG, 0, '_stripe');
-    
+
     $error = 0;
-    
+
     try {
         dol_syslog("Create customer", LOG_DEBUG, 0, '_stripe');
         $customer = \Stripe\Customer::create(array(
@@ -230,7 +230,7 @@ if ($action == 'charge')
             'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
         ));
         // TODO Add 'business_vat_id' ?
-        
+
         dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
         $charge = \Stripe\Charge::create(array(
             'customer' => $customer->id,
@@ -244,14 +244,14 @@ if ($action == 'charge')
         // Since it's a decline, \Stripe\Error\Card will be caught
         $body = $e->getJsonBody();
         $err  = $body['error'];
-    
+
         print('Status is:' . $e->getHttpStatus() . "\n");
         print('Type is:' . $err['type'] . "\n");
         print('Code is:' . $err['code'] . "\n");
         // param is '' in this case
         print('Param is:' . $err['param'] . "\n");
         print('Message is:' . $err['message'] . "\n");
-    
+
         $error++;
         setEventMessages($e->getMessage(), null, 'errors');
         dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
@@ -295,7 +295,7 @@ if ($action == 'charge')
         setEventMessages($e->getMessage(), null, 'errors');
         $action='';
     }
-        
+
 	$_SESSION["onlinetoken"] = $stripeToken;
     $_SESSION["FinalPaymentAmt"] = $amount;
     $_SESSION["currencyCodeType"] = $currency;
@@ -303,12 +303,12 @@ if ($action == 'charge')
     $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR'];  // Payer ip
     $_SESSION['payerID'] = is_object($customer)?$customer->id:'';
     $_SESSION['TRANSACTIONID'] = is_object($charge)?$charge->id:'';
-    
+
     dol_syslog("Action charge stripe result=".$error." ip=".$_SESSION['ipaddress'], LOG_DEBUG, 0, '_stripe');
     dol_syslog("onlinetoken=".$_SESSION["onlinetoken"]." FinalPaymentAmt=".$_SESSION["FinalPaymentAmt"]." currencyCodeType=".$_SESSION["currencyCodeType"]." payerID=".$_SESSION['payerID']." TRANSACTIONID=".$_SESSION['TRANSACTIONID'], LOG_DEBUG, 0, '_stripe');
     dol_syslog("FULLTAG=".$FULLTAG, LOG_DEBUG, 0, '_stripe');
     dol_syslog("Now call the redirect to paymentok or paymentko", LOG_DEBUG, 0, '_stripe');
-    
+
     if ($error)
     {
         header("Location: ".$urlko);
@@ -319,7 +319,7 @@ if ($action == 'charge')
         header("Location: ".$urlok);
         exit;
     }
-    
+
 }
 
 
@@ -335,6 +335,16 @@ $conf->dol_hide_leftmenu=1;
 
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
+// Check link validity
+if (! empty($SOURCE) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
+{
+    $langs->load("errors");
+    dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $SOURCE, $ref));
+    llxFooter();
+    $db->close();
+    exit;
+}
+
 if (empty($conf->global->STRIPE_LIVE))
 {
     dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode'),'','warning');
@@ -420,7 +430,7 @@ if (! GETPOST("source"))
     $found=true;
     $tag=GETPOST("tag");
     $fulltag=$tag;
-    
+
     // Creditor
     print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
     print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
@@ -485,7 +495,7 @@ if (GETPOST("source") == 'order')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
     $fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
     //$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
     if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
@@ -600,7 +610,7 @@ if (GETPOST("source") == 'invoice')
     //$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
     if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
     $fulltag=dol_string_unaccent($fulltag);
-    
+
     // Creditor
 
     print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
@@ -723,7 +733,7 @@ if (GETPOST("source") == 'contractline')
         {
             $product=new Product($db);
             $result=$product->fetch($contractline->fk_product);
-    
+
             // We define price for product (TODO Put this in a method in product class)
             if (! empty($conf->global->PRODUIT_MULTIPRICES))
             {
@@ -737,7 +747,7 @@ if (GETPOST("source") == 'contractline')
                 $pu_ttc = $product->price_ttc;
                 $price_base_type = $product->price_base_type;
             }
-    
+
             $amount=$pu_ttc;
             if (empty($amount))
             {
@@ -749,7 +759,7 @@ if (GETPOST("source") == 'contractline')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
     $fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
     //$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
     if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
@@ -904,7 +914,7 @@ if (GETPOST("source") == 'membersubscription')
         if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
         $amount=price2num($amount);
     }
-    
+
     $fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
     if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
     $fulltag=dol_string_unaccent($fulltag);
@@ -1059,7 +1069,7 @@ if (preg_match('/^dopayment/',$action))
      data-description="'.$ref.'">
      </script>';
      */
-    
+
     // Personalized checkout
     print '<style>
     /**
@@ -1075,22 +1085,22 @@ if (preg_match('/^dopayment/',$action))
         -webkit-transition: box-shadow 150ms ease;
         transition: box-shadow 150ms ease;
     }
-    
+
     .StripeElement--focus {
         box-shadow: 0 1px 3px 0 #cfd7df;
     }
-    
+
     .StripeElement--invalid {
         border-color: #fa755a;
     }
-    
+
     .StripeElement--webkit-autofill {
         background-color: #fefde5 !important;
     }
     </style>';
-    
+
     print '
-    
+
     <br>
     <form action="'.$_SERVER['REQUEST_URI'].'" method="POST" id="payment-form">';
 
@@ -1106,11 +1116,11 @@ if (preg_match('/^dopayment/',$action))
     print '<input type="hidden" name="entity" value="'.$entity.'" />';
     print '<input type="hidden" name="amount" value="'.$amount.'">'."\n";
     print '<input type="hidden" name="currency" value="'.$currency.'">'."\n";
-    
+
     print '
     <table id="dolpaymenttable" summary="Payment form" class="center">
     <tbody><tr><td class="textpublicpayment">
-                    
+
     <div class="form-row left">
     <label for="card-element">
     Credit or debit card
@@ -1118,7 +1128,7 @@ if (preg_match('/^dopayment/',$action))
     <div id="card-element">
     <!-- a Stripe Element will be inserted here. -->
     </div>
-    
+
     <!-- Used to display form errors -->
     <div id="card-errors" role="alert"></div>
     </div>
@@ -1126,22 +1136,22 @@ if (preg_match('/^dopayment/',$action))
     <button class="button" id="buttontopay">'.$langs->trans("ToPay").'</button>
     <img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">
     </td></tr></tbody></table>
-        
+
     </form>
 
-        
+
     <script src="https://js.stripe.com/v2/"></script>
     <script src="https://js.stripe.com/v3/"></script>
-    
+
     <script type="text/javascript" language="javascript">';
     ?>
 
     // Create a Stripe client
     var stripe = Stripe('<?php echo $stripe['publishable_key']; ?>');
-    
+
     // Create an instance of Elements
     var elements = stripe.elements();
-    
+
     // Custom styling can be passed to options when creating an Element.
     // (Note that this demo uses a wider set of styles than the guide below.)
     var style = {
@@ -1160,13 +1170,13 @@ if (preg_match('/^dopayment/',$action))
         iconColor: '#fa755a'
       }
     };
-    
+
     // Create an instance of the card Element
     var card = elements.create('card', {style: style});
-    
+
     // Add an instance of the card Element into the `card-element` <div>
     card.mount('#card-element');
-    
+
     // Handle real-time validation errors from the card Element.
     card.addEventListener('change', function(event) {
       var displayError = document.getElementById('card-errors');
@@ -1176,13 +1186,13 @@ if (preg_match('/^dopayment/',$action))
         displayError.textContent = '';
       }
     });
-    
+
     // Handle form submission
     var form = document.getElementById('payment-form');
     console.log(form);
     form.addEventListener('submit', function(event) {
       event.preventDefault();
-    
+
       stripe.createToken(card).then(function(result) {
         if (result.error) {
           // Inform the user if there was an error
@@ -1194,7 +1204,7 @@ if (preg_match('/^dopayment/',$action))
         }
       });
     });
-    
+
     function stripeTokenHandler(token) {
       // Insert the token ID into the form so it gets submitted to the server
       var form = document.getElementById('payment-form');
@@ -1203,16 +1213,16 @@ if (preg_match('/^dopayment/',$action))
       hiddenInput.setAttribute('name', 'stripeToken');
       hiddenInput.setAttribute('value', token.id);
       form.appendChild(hiddenInput);
-    
+
       // Submit the form
       jQuery('#buttontopay').hide();
       jQuery('#hourglasstopay').show();
       console.log("submit");
       form.submit();
-    }        
-    
+    }
+
     <?php
-    print '</script>';    
+    print '</script>';
 }
 
 

From bebf2b33eaa3f4439543d012d7f9e97cb7f457cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 09:25:35 +0200
Subject: [PATCH 1002/1163] CSS enhancement for mobile

---
 htdocs/theme/eldy/style.css.php |  9 ++++++++
 htdocs/theme/md/style.css.php   | 41 ++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c66fa33dfaa..4227b86ca51 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -712,6 +712,7 @@ div.fiche>form>div.div-table-responsive {
     align-self: flex-start;
 }
 
+
 /* ============================================================================== */
 /* Styles to hide objects                                                         */
 /* ============================================================================== */
@@ -2795,6 +2796,9 @@ div.tabBar .noborder {
 
 @media only screen and (max-width: 767px)
 {
+	.thumbstat {
+		flex: 1 1 110px;
+	}
 	.thumbstat150 {
 		flex: 1 1 110px;
 	}
@@ -4594,6 +4598,11 @@ div.tabsElem a.tab {
         background: #FFF;
 	}
 
+    .login_vertical_align {
+    	padding-left: 20px;
+    	padding-right: 20px;
+    }
+
 	/* Reduce login top right info */
 	.help {
 	<?php if ($disableimages) {  ?>
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index a1851dc4a76..6e31fc3ed11 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -317,7 +317,7 @@ textarea {
 	border-left:solid 1px rgba(0,0,0,.1);
 	border-right:solid 1px rgba(0,0,0,.1);
 	border-bottom:solid 1px rgba(0,0,0,.2);
-		
+
 	background-color: #FFF;
 	padding:4px;
 	margin-left:1px;
@@ -867,10 +867,10 @@ div.fiche>form>div.div-table-responsive {
     	width: 20px;
         object-fit: contain;
     }
-    
+
 	div.statusref {
     	padding-right: 10px;
-   	}    
+   	}
 }
 .linkobject { cursor: pointer; }
 <?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
@@ -1557,12 +1557,12 @@ foreach($mainmenuusedarray as $val)
 	display: table;
     position: absolute;
     height: 100%;
-    width: 100%;	
+    width: 100%;
 }
 .login_center {
 	display: table-cell;
     vertical-align: middle;
-}	
+}
 .login_vertical_align {
 	padding: 10px;
 	padding-bottom: 80px;
@@ -1992,14 +1992,14 @@ div.tabBar {
     border-top: 1px solid #CCC;
 	width: auto;
 	background: rgb(<?php echo $colorbacktabcard1; ?>);
-	border-bottom: 1px solid #aaa; 
+	border-bottom: 1px solid #aaa;
 }
 div.tabBar div.titre {
-	padding-top: 10px;    
+	padding-top: 10px;
 }
 div.tabBarWithBottom {
 	padding-bottom: 18px;
-	border-bottom: 1px solid #aaa; 
+	border-bottom: 1px solid #aaa;
 }
 div.tabBar table.tableforservicepart2:last-child {
     border-bottom: 1px solid #aaa;
@@ -2720,7 +2720,7 @@ tr.liste_titre th, tr.liste_titre td, th.liste_titre, form.liste_titre div, div.
 {
 	border-bottom: 1px solid #<?php echo ($colorbacktitle1 == '255,255,255'?'BBBBBB':'FDFFFF'); ?>;
 }
-/* TODO Once title line is moved under title search, make border bottom of all th black and force to whit when it's first tr */ 
+/* TODO Once title line is moved under title search, make border bottom of all th black and force to whit when it's first tr */
 tr:first-child th.liste_titre {
     border-bottom: 1px solid #FFF ! important;
 }
@@ -2826,7 +2826,7 @@ div .tdtop {
 
 /* Prepare to remove class pair - impair */
 
-.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) { 
+.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) {
 	background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
 	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
 	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
@@ -2852,7 +2852,7 @@ div .tdtop {
 /*
  *  Boxes
  */
- 
+
 .ficheaddleft div.boxstats {
     border: none;
 }
@@ -2866,29 +2866,32 @@ div .tdtop {
     text-align: center;
     border-radius: 2px;
 }
-.boxstats, .boxstats130, .boxstatscontent {    
+.boxstats, .boxstats130, .boxstatscontent {
 	white-space: nowrap;
 	overflow: hidden;
     text-overflow: ellipsis;
 }
 .boxstats {
     padding: 3px;
-    width: 105px;    
+    width: 105px;
 }
 .boxstats130 {
-    width: 135px; 
+    width: 135px;
     height: 48px;
-    padding: 3px  
+    padding: 3px
 }
 @media only screen and (max-width: 767px)
 {
+	.thumbstat {
+		flex: 1 1 110px;
+	}
 	.thumbstat150 {
 		flex: 1 1 110px;
 	}
 	.boxstats, .boxstats130 {
-        width: 90px;    
+        width: 90px;
     }
-    .dashboardlineindicator { 
+    .dashboardlineindicator {
         float: left;
     	padding-left: 5px;
     }
@@ -2927,7 +2930,7 @@ span.dashboardlineko {
     padding: 1px 6px 1px 6px;
     background-color: #8c4446;
     color: #FFFFFF ! important;
-    border-radius: .25em;    
+    border-radius: .25em;
 }
 .boxtable {
     margin-bottom: 8px !important;
@@ -4047,7 +4050,7 @@ div.dataTables_length select {
 	border-top: 1px solid #ccc;
 	border-bottom: 1px solid #ccc;
 }
-.select2-container-active .select2-choice, .select2-container-active .select2-choices 
+.select2-container-active .select2-choice, .select2-container-active .select2-choices
 {
 	outline: none;
 	border-top: none;

From 64cd1e0923755d4fddcf2c8788e2fe323f953d8d Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 2 Jun 2017 12:31:03 +0200
Subject: [PATCH 1003/1163] Fix get extrafields value from getOptionalsFromPost
 give an error with chkbxlst type on propaldet for exemple

---
 htdocs/core/class/extrafields.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index c89fc593745..bd1daca8886 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1681,7 +1681,7 @@ class ExtraFields
 					// Clean parameters
 					$value_key=dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
 				}
-				else if (in_array($key_type,array('checkbox')))
+				else if (in_array($key_type,array('checkbox', 'chkbxlst')))
 				{
 					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
 					// Make sure we get an array even if there's only one checkbox

From c59d216cf5f82572f7b3a24de978dda8037845ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 12:27:46 +0200
Subject: [PATCH 1004/1163] NEW Can read time spent of others (hierarchy only
 or all if granted)

---
 htdocs/core/actions_setmoduleoptions.inc.php |  86 ------------
 htdocs/core/class/html.form.class.php        |   8 +-
 htdocs/core/class/html.formcompany.class.php |  19 +--
 htdocs/core/class/html.formprojet.class.php  |  52 ++++----
 htdocs/core/js/timesheet.js                  |   4 +-
 htdocs/core/lib/project.lib.php              | 130 +++++++++++--------
 htdocs/langs/en_US/admin.lang                |   2 +-
 htdocs/langs/en_US/projects.lang             |   9 +-
 htdocs/projet/activity/perday.php            | 100 +++++++-------
 htdocs/projet/activity/perweek.php           | 114 ++++++++--------
 htdocs/projet/card.php                       |  60 +++++----
 htdocs/theme/eldy/style.css.php              |  14 +-
 htdocs/theme/md/style.css.php                |   9 +-
 13 files changed, 269 insertions(+), 338 deletions(-)
 delete mode 100644 htdocs/core/actions_setmoduleoptions.inc.php

diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
deleted file mode 100644
index 03b33b19eb1..00000000000
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/* Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
- */
-
-/**
- *	\file			htdocs/core/actions_setnotes.inc.php
- *  \brief			Code for actions on setting notes of object page
- */
-
-
-// $action must be defined
-// $_FILES may be defined
-// $nomessageinsetmoduleoptions can be set to 1
-
-// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
-    $db->begin();
-
-    // Process common param fields
-    foreach($_POST as $key => $val)
-    {
-        if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
-        {
-            $param=GETPOST("param".$reg[1],'alpha');
-            $value=GETPOST("value".$reg[1],'alpha');
-            if ($param)
-            {
-                $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-                if (! $res > 0) $error++;
-            }
-        }
-    }
-
-    // Process upload fields
-    if (GETPOST('upload','alpha') && GETPOST('keyforuploaddir','aZ09'))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        $keyforuploaddir=GETPOST('keyforuploaddir','aZ09');
-        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->$keyforuploaddir)));
-        foreach($listofdir as $key=>$tmpdir)
-        {
-            $tmpdir=trim($tmpdir);
-            $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-            if (! $tmpdir) {
-                unset($listofdir[$key]); continue;
-            }
-            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-            else
-            {
-                $upload_dir=$tmpdir;
-            }
-        }
-        if ($upload_dir)
-        {
-            $result = dol_add_file_process($upload_dir, 0, 1, 'uploadfile', '');
-            if ($result <= 0) $error++;
-        }
-    }
-
-    if (! $error)
-    {
-        $db->commit();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
-    }
-}
-
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cf6ae18f568..34693cba67a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1391,7 +1391,7 @@ class Form
      *  @deprecated
      *  @see select_dolusers()
      */
-    function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude='',$disabled=0,$include='',$enableonly='',$force_entity=0)
+    function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude=null,$disabled=0,$include='',$enableonly='',$force_entity=0)
     {
         print $this->select_dolusers($selected,$htmlname,$show_empty,$exclude,$disabled,$include,$enableonly,$force_entity);
     }
@@ -1411,13 +1411,13 @@ class Form
      *  @param	int		$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
      *  @param	string	$morefilter		Add more filters into sql request
      *  @param	integer	$show_every		0=default list, 1=add also a value "Everybody" at beginning of list
-     *  @param	string	$enableonlytext	If option $enableonly is set, we use this text to explain into label why record is disabled. Not used if enableonly is empty.
+     *  @param	string	$enableonlytext	If option $enableonlytext is set, we use this text to explain into label why record is disabled. Not used if enableonly is empty.
      *  @param	string	$morecss		More css
      *  @param  int     $noactive       Show only active users (this will also happened whatever is this option if USER_HIDE_INACTIVE_IN_COMBOBOX is on).
      * 	@return	string					HTML select string
      *  @see select_dolgroups
      */
-    function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='', $show_every=0, $enableonlytext='', $morecss='', $noactive=0)
+    function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude=null, $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='', $show_every=0, $enableonlytext='', $morecss='', $noactive=0)
     {
         global $conf,$user,$langs;
 
@@ -1613,7 +1613,7 @@ class Form
      * 	@return	string					HTML select string
      *  @see select_dolgroups
      */
-    function select_dolusers_forevent($action='', $htmlname='userid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='')
+    function select_dolusers_forevent($action='', $htmlname='userid', $show_empty=0, $exclude=null, $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='')
     {
         global $conf,$user,$langs;
 
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index bcff0981a70..88ebb816a31 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -358,7 +358,7 @@ class FormCompany
 	 *
 	 *  @param  string	$selected   	Title preselected
 	 * 	@param	string	$htmlname		Name of HTML select combo field
-	 *  @param  string  $morecss        Add more css on SELECT element      
+	 *  @param  string  $morecss        Add more css on SELECT element
 	 *  @return	string					String with HTML select
 	 */
 	function select_civility($selected='',$htmlname='civility_id',$morecss='maxwidth100')
@@ -563,11 +563,11 @@ class FormCompany
 			$events=array();
 			// Add an entry 'method' to say 'yes, we must execute url with param action = method';
 			// Add an entry 'url' to say which url to execute
-			// Add an entry htmlname to say which element we must change once url is called 
-			// Add entry params => array('cssid' => 'attr') to say to remov or add attribute attr if answer of url return  0 or >0 lines 
+			// Add an entry htmlname to say which element we must change once url is called
+			// Add entry params => array('cssid' => 'attr') to say to remov or add attribute attr if answer of url return  0 or >0 lines
 			// To refresh contacts list on thirdparty list change
 			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
-			
+
 			if (count($events))	// If there is some ajax events to run once selection is done, we add code here to run events
 			{
 				print '<script type="text/javascript">
@@ -583,7 +583,7 @@ class FormCompany
 						/* Clean contact */
 						$("div#s2id_contactid>a>span").html(\'\');
 					});
-								    
+
 					// Function used to execute events when search_htmlname change
 					function runJsCodeForEvent'.$htmlname.'(obj) {
 						var id = $("#'.$htmlname.'").val();
@@ -693,16 +693,17 @@ class FormCompany
      *  @param  string		$source			Source ('internal' or 'external')
      *  @param  string		$sortorder		Sort criteria ('position', 'code', ...)
      *  @param  int			$showempty      1=Add en empty line
+     *  @param  string      $morecss        Add more css to select component
      *  @return	void
      */
-	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0)
+	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0, $morecss='')
 	{
 	    global $user, $langs;
-	    
+
 		if (is_object($object) && method_exists($object, 'liste_type_contact'))
 		{
 			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
-			print '<select class="flat valignmiddle" name="'.$htmlname.'" id="'.$htmlname.'">';
+			print '<select class="flat valignmiddle'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 			if ($showempty) print '<option value="0"></option>';
 			foreach($lesTypes as $key=>$value)
 			{
@@ -791,7 +792,7 @@ class FormCompany
 
         $maxlength=$formlength;
         if (empty($formlength)) { $formlength=24; $maxlength=128; }
-        
+
         $out = '<input type="text" '.($morecss?'class="'.$morecss.'" ':'').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
 
         return $out;
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 30481497163..93ebbf71ddd 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -68,7 +68,7 @@ class FormProjets
 		global $langs,$conf,$form;
 
 		$out='';
-		
+
 		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT))
 		{
 			$placeholder='';
@@ -92,7 +92,7 @@ class FormProjets
 		else
 		{
 			$out.=$this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid);
-			if ($discard_closed) 
+			if ($discard_closed)
 			{
 			    if (class_exists('Form'))
 			    {
@@ -101,8 +101,8 @@ class FormProjets
 			    }
 			}
 		}
-		
-		if (empty($nooutput)) 
+
+		if (empty($nooutput))
 		{
 		    print $out;
 		    return '';
@@ -136,10 +136,10 @@ class FormProjets
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 		if (empty($htmlid)) $htmlid = $htmlname;
-		
+
 		$out='';
         $outarray=array();
-        
+
 		$hideunselectables = false;
 		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
@@ -170,21 +170,19 @@ class FormProjets
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
-			$minmax='maxwidth500';
+			$morecss='maxwidth500';
 
 			// Use select2 selector
-			$nodatarole='';
 			if (! empty($conf->use_javascript_ajax))
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 	           	$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
             	$out.=$comboenhancement;
-            	$nodatarole=($comboenhancement?' data-role="none"':'');
-            	$minmax='minwidth100 maxwidth300';
+            	$morecss='minwidth100 maxwidth300';
 			}
 
 			if (empty($option_only)) {
-				$out.= '<select class="flat'.($minmax?' '.$minmax:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlid.'" name="'.$htmlname.'"'.$nodatarole.'>';
+				$out.= '<select class="flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlid.'" name="'.$htmlname.'">';
 			}
 			if (!empty($show_empty)) {
 				$out.= '<option value="0">&nbsp;</option>';
@@ -213,12 +211,12 @@ class FormProjets
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
 						$labeltoshow.=', '.dol_trunc($obj->title, $maxlength);
-						if ($obj->name) 
+						if ($obj->name)
 						{
 						    $labeltoshow.=' - '.$obj->name;
 						    if ($obj->name_alias) $labeltoshow.=' ('.$obj->name_alias.')';
 						}
-						
+
 						$disabled=0;
 						if ($obj->fk_statut == 0)
 						{
@@ -277,7 +275,7 @@ class FormProjets
 
 			if (!$mode) {
 				if (empty($option_only)) $out.= '</select>';
-				if (empty($nooutput)) 
+				if (empty($nooutput))
 				{
 				    print $out;
 				    return '';
@@ -302,13 +300,14 @@ class FormProjets
 	 *	@param  string	$htmlname   	Name of HTML select
 	 *	@param	int		$maxlength		Maximum length of label
 	 *	@param	int		$option_only	Return only html options lines without the select tag
-	 *	@param	int		$show_empty		Add an empty line
+	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)
 	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
      *  @param	int		$forcefocus		Force focus on field (works with javascript only)
      *  @param	int		$disabled		Disabled
+	 *  @param	string	$morecss        More css added to the select component
 	 *	@return int         			Nbr of project if OK, <0 if KO
 	 */
-	function selectTasks($socid=-1, $selected='', $htmlname='taskid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0)
+	function selectTasks($socid=-1, $selected='', $htmlname='taskid', $maxlength=24, $option_only=0, $show_empty='1', $discard_closed=0, $forcefocus=0, $disabled=0, $morecss='maxwidth500')
 	{
 		global $user,$conf,$langs;
 
@@ -339,28 +338,26 @@ class FormProjets
 		if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
 		$sql.= " ORDER BY p.ref, t.ref ASC";
 
-		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
-			$minmax='maxwidth500';
-
 			// Use select2 selector
-			$nodatarole='';
 			if (! empty($conf->use_javascript_ajax))
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
             	$out.=$comboenhancement;
-            	$nodatarole=($comboenhancement?' data-role="none"':'');
-            	$minmax='minwidth200 maxwidth500';
+            	$morecss='minwidth200 maxwidth500';
 			}
 
 			if (empty($option_only)) {
-				$out.= '<select class="valignmiddle flat'.($minmax?' '.$minmax:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
+				$out.= '<select class="valignmiddle flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'">';
 			}
-			if (!empty($show_empty)) {
-				$out.= '<option value="0">&nbsp;</option>';
+			if (! empty($show_empty)) {
+				$out.= '<option value="0" class="optiongrey">';
+				if (! is_numeric($show_empty)) $out.=$show_empty;
+				else $out.='&nbsp;';
+				$out.= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -370,7 +367,7 @@ class FormProjets
 				{
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($user->rights->societe->lire))
 					{
 						// Do nothing
 					}
@@ -382,7 +379,7 @@ class FormProjets
 							continue;
 						}
 
-						$labeltoshow=dol_trunc($obj->ref,18);
+						$labeltoshow=dol_trunc($obj->ref,18);     // Project ref
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
 						$labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
@@ -532,7 +529,6 @@ class FormProjets
 		$sql.= " ORDER BY ref DESC";
 
 		dol_syslog(get_class($this).'::select_element', LOG_DEBUG);
-
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/core/js/timesheet.js b/htdocs/core/js/timesheet.js
index ea0e0782767..5541f348c9f 100644
--- a/htdocs/core/js/timesheet.js
+++ b/htdocs/core/js/timesheet.js
@@ -1,5 +1,5 @@
-/* Copyright (C) 2014 delcroip <delcroip@gmail.com>
- * Laurent Destailleur 2015 <eldy@users.sourceforge.net>
+/* Copyright (C) 2014      delcroip            <delcroip@gmail.com>
+ * Copyright (C) 2015-2017 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 38f78dd8333..c3583e72ac8 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 function project_prepare_head($object)
 {
 	global $db, $langs, $conf, $user;
-	
+
 	$h = 0;
 	$head = array();
 
@@ -119,7 +119,7 @@ function project_prepare_head($object)
     }
 	$head[$h][2] = 'agenda';
 	$h++;
-	
+
 	complete_head_from_modules($conf,$langs,$object,$head,$h,'project','remove');
 
 	return $head;
@@ -163,7 +163,7 @@ function task_prepare_head($object)
 	    if ($obj) $nbTimeSpent=1;
 	}
 	else dol_print_error($db);
-	
+
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 	$head[$h][1] = $langs->trans("TimeSpent");
 	if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
@@ -208,9 +208,10 @@ function task_prepare_head($object)
  * Prepare array with list of tabs
  *
  * @param	string	$mode		Mode
+ * @param   string  $fuser      Filter on user
  * @return  array				Array of tabs to show
  */
-function project_timesheet_prepare_head($mode)
+function project_timesheet_prepare_head($mode, $fuser=null)
 {
 	global $langs, $conf, $user;
 	$h = 0;
@@ -218,9 +219,13 @@ function project_timesheet_prepare_head($mode)
 
 	$h = 0;
 
+	$param='';
+	$param.=($mode?'&mode='.$mode:'');
+	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param.='&search_usertoprocessid='.$fuser->id;
+
 	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK))
 	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($mode?'?mode='.$mode:'');
+		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($param?'?'.$param:'');
 		$head[$h][1] = $langs->trans("InputPerWeek");
 		$head[$h][2] = 'inputperweek';
 		$h++;
@@ -228,7 +233,7 @@ function project_timesheet_prepare_head($mode)
 
 	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME))
 	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($mode?'?mode='.$mode:'');
+		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($param?'?'.$param:'');
 		$head[$h][1] = $langs->trans("InputPerDay");
 		$head[$h][2] = 'inputperday';
 		$h++;
@@ -507,7 +512,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
     				if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
     				$level--;
 				}
-				
+
 				$total_projectlinesa_spent += $lines[$i]->duration;
 				$total_projectlinesa_planned += $lines[$i]->planned_workload;
 				if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
@@ -571,9 +576,9 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 	$lastprojectid=0;
 	$workloadforid=array();
 	$lineswithoutlevel0=array();
-	
+
 	$numlines=count($lines);
-	
+
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
@@ -581,7 +586,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 	    {
 	        if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
 	    }
-	}	
+	}
 
     //dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 	for ($i = 0 ; $i < $numlines ; $i++)
@@ -594,7 +599,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
 			{
                 //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
-                
+
 				// Break on a new project
         		if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
         		{
@@ -604,7 +609,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
         				$projectstatic->id = $lines[$i]->fk_project;
         			}
         		}
-			    
+
 			    if (empty($workloadforid[$projectstatic->id]))
 			    {
     				if ($preselectedday)
@@ -613,7 +618,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 	       		        $workloadforid[$projectstatic->id]=1;
     				}
 			    }
-			     
+
 				$projectstatic->id=$lines[$i]->fk_project;
 				$projectstatic->ref=$lines[$i]->projectref;
 				$projectstatic->title=$lines[$i]->projectlabel;
@@ -621,7 +626,12 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 
 				$taskstatic->id=$lines[$i]->id;
 
-				print "<tr ".$bc[$var].">\n";
+				print '<tr class="oddeven">'."\n";
+
+				// User
+				print '<td class="nowrap">';
+				print $fuser->getNomUrl(1, 'withproject', 'time');
+				print '</td>';
 
 				// Ref
 				print '<td>';
@@ -656,7 +666,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				    print $thirdpartystatic->getNomUrl(1, 'project', 10);
 				    print '</td>';
 				}
-				
+
 				// Planned Workload
 				print '<td align="right">';
 				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
@@ -707,7 +717,10 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				print '<td class="nowrap" align="center">';
 				$tableCell=$form->select_date($preselectedday,$lines[$i]->id,1,1,2,"addtime",0,0,1,$disabledtask);
 				print $tableCell;
-				print '</td><td align="right">';
+				print '</td>';
+
+				// Duration
+				print '<td align="right">';
 
 				$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
 		        $alreadyspent='';
@@ -723,24 +736,25 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				print '</td>';
 
 				print '<td align="right">';
-				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject"));
-				else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAffectedToYou"));
-				print '</td>';
-
-				print '<td align="right">';
-				print '<textarea name="'.$lines[$i]->id.'note" rows="2" id="note">';
+				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
 				print '</textarea>';
 				print '</td>';
-				
+
+				// Warning
+				print '<td align="right">';
+   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $langs->transnoentitiesnoconv("AssignTaskToUser", '...')));
+				print '</td>';
+
 				print "</tr>\n";
 			}
 
 			$inc++;
 			$level++;
-			if ($lines[$i]->id > 0) 
+			if ($lines[$i]->id > 0)
 			{
 			    if ($parent == 0) projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lineswithoutlevel0, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $var);
-			    else projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $var); 
+			    else projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $var);
 			}
 			$level--;
 		}
@@ -781,7 +795,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 	$lastprojectid=0;
 	$workloadforid=array();
 	$lineswithoutlevel0=array();
-	
+
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
@@ -792,18 +806,18 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 	}
 
     //dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-	
+
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
 		if ($parent == 0) $level = 0;
-		
+
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
 			// If we want all or we have a role on task, we show it
 			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
 			{
 			    //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
-			    
+
 			    // Break on a new project
     			if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
     			{
@@ -811,14 +825,19 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
     				$lastprojectid=$lines[$i]->fk_project;
     				$projectstatic->id = $lines[$i]->fk_project;
     			}
-			    
+
 			    if (empty($workloadforid[$projectstatic->id]))
 			    {
 				    $projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
                     $workloadforid[$projectstatic->id]=1;
 			    }
-			    
-				print "<tr ".$bc[$var].">\n";
+
+				print '<tr class="oddeven">'."\n";
+
+				// User
+				print '<td class="nowrap">';
+				print $fuser->getNomUrl(1, 'withproject', 'time');
+				print '</td>';
 
 				// Ref
 				print '<td class="nowrap">';
@@ -842,7 +861,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				print "</td>\n";
 
 				// Project
-				print '<td class="nowrap">'.$var;
+				print '<td class="nowrap">';
 				$projectstatic->id=$lines[$i]->fk_project;
 				$projectstatic->ref=$lines[$i]->projectref;
 				$projectstatic->title=$lines[$i]->projectlabel;
@@ -860,7 +879,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				    print $thirdpartystatic->getNomUrl(1, 'project');
 				    print '</td>';
 				}
-				
+
 				// Planned Workload
 				print '<td align="right">';
 				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
@@ -908,7 +927,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				}
 
 				//var_dump($projectstatic->weekWorkLoadPerTask);
-				
+
 				// Fields to show current time
 				$tableCell=''; $modeinput='hours';
 				for ($idw = 0; $idw < 7; $idw++)
@@ -919,7 +938,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 		        	$alreadyspent='';
 		        	if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
                     $alttitle=$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']);
-		        	
+
                     $tableCell ='<td align="center" class="hide'.$idw.'">';
                     if ($alreadyspent)
                     {
@@ -934,10 +953,11 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
                     $tableCell.='</td>';
                     print $tableCell;
 		        }
-		        
+
+		        // Warning
 				print '<td align="right">';
-				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject"));
-				else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAffectedToYou"));
+   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $langs->transnoentitiesnoconv("AssignTaskToUser", '...')));
 				print '</td>';
 
 		        print "</tr>\n";
@@ -946,7 +966,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 			// Call to show task with a lower level (task under the current task)
 			$inc++;
 			$level++;
-			if ($lines[$i]->id > 0) 
+			if ($lines[$i]->id > 0)
 			{
 			    if ($parent == 0) projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lineswithoutlevel0, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $var);
 			    else projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $var);
@@ -1020,7 +1040,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 
 	$projectstatic=new Project($db);
     $thirdpartystatic=new Societe($db);
-    
+
 	$sortfield='';
 	$sortorder='';
 	$project_year_filter=0;
@@ -1029,7 +1049,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 	if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
 
 	$arrayidtypeofcontact=array();
-	
+
 	print '<table class="noborder" width="100%">';
 
 	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
@@ -1072,11 +1092,11 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 			$sql.= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter,1,false)).")";
 		}
 	}
-	
+
 	// Get id of project we must show tasks
 	$arrayidofprojects=array();
 	$sql1 = "SELECT p.rowid as projectid";
-	$sql1.= $sql; 
+	$sql1.= $sql;
 	$resql = $db->query($sql1);
 	if ($resql)
 	{
@@ -1091,7 +1111,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 	}
 	else dol_print_error($db);
 	if (empty($arrayidofprojects)) $arrayidofprojects[0]=-1;
-	
+
 	// Get list of project with calculation on tasks
 	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_amount,";
 	$sql2.= " p.dateo, p.datee,";
@@ -1122,7 +1142,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
     		print_liste_field_titre($langs->trans("OpportunityAmount"),"","","","",'align="right"',$sortfield,$sortorder);
     		print_liste_field_titre($langs->trans("OpportunityStatus"),"","","","",'align="right"',$sortfield,$sortorder);
     	}
-    	if (empty($conf->global->PROJECT_HIDE_TASKS)) 
+    	if (empty($conf->global->PROJECT_HIDE_TASKS))
     	{
             print_liste_field_titre($langs->trans("Tasks"),"","","","",'align="right"',$sortfield,$sortorder);
             if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre($langs->trans("PlannedWorkload"),"","","","",'align="right"',$sortfield,$sortorder);
@@ -1130,7 +1150,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
     	}
     	print_liste_field_titre($langs->trans("Status"),"","","","",'align="right"',$sortfield,$sortorder);
     	print "</tr>\n";
-		
+
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
@@ -1148,8 +1168,8 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 			    $projectstatic->title = $objp->title;
 			    $projectstatic->datee = $db->jdate($objp->datee);
 			    $projectstatic->dateo = $db->jdate($objp->dateo);
-			     
-				
+
+
 				print '<tr class="oddeven">';
 				print '<td>';
 				print $projectstatic->getNomUrl(1);
@@ -1174,17 +1194,17 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
         			if ($code) print $langs->trans("OppStatus".$code);
 					print '</td>';
 				}
-				if (empty($conf->global->PROJECT_HIDE_TASKS)) 
+				if (empty($conf->global->PROJECT_HIDE_TASKS))
 				{
 				    print '<td align="right">'.$objp->nb.'</td>';
-    	       
+
     				$plannedworkload=$objp->planned_workload;
     				$total_plannedworkload+=$plannedworkload;
     				if (! in_array('plannedworkload', $hiddenfields))
     				{
     				    print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
     				}
-    				if (! in_array('declaredprogress', $hiddenfields)) 
+    				if (! in_array('declaredprogress', $hiddenfields))
     				{
     				    $declaredprogressworkload=$objp->declared_progess_workload;
         				$total_declaredprogressworkload+=$declaredprogressworkload;
@@ -1194,7 +1214,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
         				print '</td>';
     				}
 				}
-				
+
 				print '<td align="right">'.$projectstatic->getLibStatut(3).'</td>';
 				print "</tr>\n";
 
@@ -1213,7 +1233,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 			print '<td class="liste_total" align="right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>';
 			print '<td class="liste_total" align="right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).'</td>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) 
+		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
             print '<td class="liste_total" align="right">'.$total_task.'</td>';
             if (! in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
@@ -1221,7 +1241,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 		}
 		print '<td class="liste_total"></td>';
         print '</tr>';
-        
+
 		$db->free($resql);
 	}
 	else
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 5b213135878..fe292db145d 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -614,7 +614,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects i'm contact for)
 Permission45=Export projects
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 27db2976b2a..3b4e4f4d14f 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -53,7 +53,7 @@ TaskTimeNote=Note
 TaskTimeDate=Date
 TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
+NewTimeSpent=Time spent
 MyTimeSpent=My time spent
 Tasks=Tasks
 Task=Task
@@ -107,6 +107,7 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
+UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
@@ -115,7 +116,7 @@ TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now. 
 ErrorTimeSpentIsEmpty=Time spent is empty
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
@@ -166,13 +167,15 @@ FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
 TasksAssignedTo=Tasks assigned to
 AssignTaskToMe=Assign task to me
+AssignTaskToUser=Assign task to %s
+SelectTaskToAssign=Select task to assign...
 AssignTask=Assign
 ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index a2b3f1cc667..9cda69560d5 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 $langs->load('projects');
+$langs->load('users');
 
 $action=GETPOST('action','aZ09');
 $mode=GETPOST("mode");
@@ -62,6 +63,8 @@ $month=GETPOST('remonth')?GETPOST('remonth'):(GETPOST("month","int")?GETPOST("mo
 $day=GETPOST('reday')?GETPOST('reday'):(GETPOST("day","int")?GETPOST("day","int"):date("d"));
 $day = (int) $day;
 $week=GETPOST("week","int")?GETPOST("week","int"):date("W");
+
+$search_usertoprocessid=GETPOST('search_usertoprocessid', 'int');
 $search_task_ref=GETPOST('search_task_ref', 'alpha');
 $search_task_label=GETPOST('search_task_label', 'alpha');
 $search_project_ref=GETPOST('search_project_ref', 'alpha');
@@ -75,6 +78,17 @@ $daytoparse = $now;
 if ($yearofday && $monthofday && $dayofday) $daytoparse=dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday);	// xxxofday is value of day after submit action 'addtime'
 else if ($year && $month && $day) $daytoparse=dol_mktime(0, 0, 0, $month, $day, $year);							// this are value submited after submit of action 'submitdateselect'
 
+if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
+{
+    $usertoprocess=$user;
+}
+else
+{
+    $usertoprocess=new User($db);
+    $usertoprocess->fetch($search_usertoprocessid);
+}
+$search_usertoprocessid=$usertoprocess->id;
+
 $object=new Task($db);
 
 
@@ -83,9 +97,10 @@ $object=new Task($db);
  */
 
 // Purge criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
     $action = '';
+    $search_usertoprocessid = '';
     $search_task_ref = '';
     $search_task_label = '';
     $search_project_ref = '';
@@ -125,7 +140,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
     }
     if (! $error)
     {
-    	$idfortaskuser=$user->id;
+    	$idfortaskuser=$usertoprocess->id;
 		$result = $object->add_contact($idfortaskuser, GETPOST("type"), 'internal');
 
     	if ($result >= 0 || $result == -2)	// Contact add ok or already contact of task
@@ -143,7 +158,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
     				$project->fetch($object->fk_project);
     				// Get type
     				$listofprojcontact=$project->liste_type_contact('internal');
-    				
+
     				if (count($listofprojcontact))
     				{
     					$typeforprojectcontact=reset(array_keys($listofprojcontact));
@@ -151,7 +166,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
     				}
     			}
     		}
-    		else 
+    		else
     		{
     			dol_print_error($db);
     		}
@@ -175,6 +190,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	if (! $error)
 	{
 		setEventMessages("TaskAssignedToEnterTime", null);
+		$taskid=0;
 	}
 
 	$action='';
@@ -247,12 +263,12 @@ if ($action == 'addtime' && $user->rights->projet->lire)
 	    	setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 
     	    // Redirect to avoid submit twice on back
-        	header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday);
+        	header('Location: '.$_SERVER["PHP_SELF"].'?'.($projectid?'id='.$projectid:'').($search_usertoprocessid?'&search_usertoprocessid='.$search_usertoprocessid:'').($mode?'&mode='.$mode:'').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday);
         	exit;
     	}
     }
-    else    
-    {   
+    else
+    {
    	    setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
     }
 }
@@ -286,8 +302,6 @@ $next_day   = $next['mday'];
 $title=$langs->trans("TimeSpent");
 if ($mine) $title=$langs->trans("MyTimeSpent");
 
-$usertoprocess = $user;
-
 $projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertoprocess,0,1);  // Return all project i have permission on. I want my tasks and some of my task may be on a public projet that is not my project
 
 if ($id)
@@ -314,8 +328,9 @@ llxHeader("",$title,"");
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'title_project');
 
 $param='';
-$param.=($mode?'&amp;mode='.$mode:'');
-$param.=($search_project_ref?'&amp;search_project_ref='.$search_project_ref:'');
+$param.=($mode?'&mode='.$mode:'');
+$param.=($search_project_ref?'&search_project_ref='.$search_project_ref:'');
+$param.=($search_userassignedid > 0?'&search_userassignedid='.$search_usertoprocessid:'');
 
 // Show navigation bar
 $nav ='<a class="inline-block valignmiddle" href="?year='.$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param.'">'.img_previous($langs->trans("Previous"))."</a>\n";
@@ -337,7 +352,7 @@ print '<input type="hidden" name="addtimeyear" value="'.$tmp['year'].'">';
 print '<input type="hidden" name="addtimemonth" value="'.$tmp['mon'].'">';
 print '<input type="hidden" name="addtimeday" value="'.$tmp['mday'].'">';
 
-$head=project_timesheet_prepare_head($mode);
+$head=project_timesheet_prepare_head($mode, $usertoprocess);
 dol_fiche_head($head, 'inputperday', '', -1, 'task');
 
 // Show description of content
@@ -360,45 +375,17 @@ print '</div>';
 
 dol_fiche_end();
 
-
-// Filter on user
-/*	dol_fiche_head('');
-	print '<table class="border" width="100%"><tr><td width="25%">'.$langs->trans("User").'</td>';
-	print '<td>';
-	if ($mine) print $user->getLoginUrl(1);
-	print '</td>';
-	print '</tr></table>';
-	dol_fiche_end();
-*/
-
-// Filter on user
-/*	dol_fiche_head('');
-	print '<table class="border" width="100%"><tr><td width="25%">'.$langs->trans("User").'</td>';
-	print '<td>';
-	if ($mine) print $user->getLoginUrl(1);
-	print '</td>';
-	print '</tr></table>';
-	dol_fiche_end();
-*/
-
-
-// Add a new project/task
-//print '<br>';
-//print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-//print '<input type="hidden" name="action" value="assigntask">';
-//print '<input type="hidden" name="mode" value="'.$mode.'">';
-//print '<input type="hidden" name="year" value="'.$year.'">';
-//print '<input type="hidden" name="month" value="'.$month.'">';
-//print '<input type="hidden" name="day" value="'.$day.'">';
-
-print '<div class="floatright right">'.$nav.'</div>';     // We move this before the assign to components so, the default submit button is not the assign to.
+print '<div class="floatright right'.($conf->dol_optimize_smallscreen?' centpercent':'').'">'.$nav.'</div>';     // We move this before the assign to components so, the default submit button is not the assign to.
 
 print '<div class="float valignmiddle">';
-print $langs->trans("AssignTaskToMe").'<br>';
+$titleassigntask = $langs->trans("AssignTaskToMe");
+if ($usertoprocess->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", $usertoprocess->getFullName($langs));
+print '<div class="taskiddiv inline-block">';
 $formproject->selectTasks($socid?$socid:-1, $taskid, 'taskid', 32, 0, 1, 1);
-print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0);
-print '<input type="submit" class="button valignmiddle" name="assigntask" value="'.$langs->trans("AssignTask").'">';
-//print '</form>';
+print '</div>';
+print ' ';
+print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0, 'maxwidth200');
+print '<input type="submit" class="button valignmiddle" name="assigntask" value="'.dol_escape_htmltag($titleassigntask).'">';
 print '</div>';
 
 print '<div class="clearboth" style="padding-bottom: 8px;"></div>';
@@ -408,6 +395,11 @@ print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
 
 print '<tr class="liste_titre_filter">';
+print '<td class="liste_titre">';
+$usersettoshow='hierarchyme';
+if ($user->rights->projet->all->lire) $usersettoshow='';
+print $form->select_dolusers($usertoprocess->id, 'search_usertoprocessid', 0, null, 0, $usersettoshow, 0, 0, 0, 1, '', 0, '', 'maxwidth150');
+print '</td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
@@ -427,6 +419,7 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("User").'</td>';
 print '<td>'.$langs->trans("RefTask").'</td>';
 print '<td>'.$langs->trans("LabelTask").'</td>';
 print '<td>'.$langs->trans("ProjectRef").'</td>';
@@ -436,12 +429,15 @@ if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY))
 }
 print '<td align="right" class="maxwidth100">'.$langs->trans("PlannedWorkload").'</td>';
 print '<td align="right" class="maxwidth100">'.$langs->trans("ProgressDeclared").'</td>';
-print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'</td>';
+/*print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'</td>';
 if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>';
-else print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>';
+else print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>';*/
+print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'<br>('.$langs->trans("Everybody").')</td>';
+print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'</td>';
 print '<td align="center">'.$langs->trans("HourStart").'</td>';
-print '<td align="center" colspan="2">'.$langs->trans("Duration").'</td>';
+print '<td align="center">'.$langs->trans("Duration").'</td>';
 print '<td align="right">'.$langs->trans("Note").'</td>';
+print '<td align="center"></td>';
 print "</tr>\n";
 
 
@@ -455,7 +451,7 @@ if (count($tasksarray) > 0)
 }
 else
 {
-	print '<tr><td colspan="10">'.$langs->trans("NoTasks").'</td></tr>';
+	print '<tr><td colspan="14">'.$langs->trans("NoTasks").'</td></tr>';
 }
 print "</table>";
 print '</div>';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index da5303511ad..4a2156430af 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -58,11 +58,14 @@ $nowtmp=dol_getdate($now);
 $nowday=$nowtmp['mday'];
 $nowmonth=$nowtmp['mon'];
 $nowyear=$nowtmp['year'];
+
 $year=GETPOST('reyear')?GETPOST('reyear','int'):(GETPOST("year")?GETPOST("year","int"):date("Y"));
 $month=GETPOST('remonth')?GETPOST('remonth','int'):(GETPOST("month")?GETPOST("month","int"):date("m"));
 $day=GETPOST('reday')?GETPOST('reday','int'):(GETPOST("day")?GETPOST("day","int"):date("d"));
 $day = (int) $day;
 $week=GETPOST("week","int")?GETPOST("week","int"):date("W");
+
+$search_usertoprocessid=GETPOST('search_usertoprocessid', 'int');
 $search_task_ref=GETPOST('search_task_ref', 'alpha');
 $search_task_label=GETPOST('search_task_label', 'alpha');
 $search_project_ref=GETPOST('search_project_ref', 'alpha');
@@ -88,7 +91,16 @@ $next_day   = $next['day'];
 $firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year);
 $lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 7, 'd');
 
-$usertoprocess=$user;
+if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
+{
+    $usertoprocess=$user;
+}
+else
+{
+    $usertoprocess=new User($db);
+    $usertoprocess->fetch($search_usertoprocessid);
+}
+$search_usertoprocessid=$usertoprocess->id;
 
 $object=new Task($db);
 
@@ -98,9 +110,10 @@ $object=new Task($db);
  */
 
 // Purge criteria
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
     $action = '';
+    $search_usertoprocessid = '';
     $search_task_ref = '';
     $search_task_label = '';
     $search_project_ref = '';
@@ -137,13 +150,13 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
     	setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), '', 'errors');
     	$error++;
     }
-    
+
     if (! $error)
     {
-    	$idfortaskuser=$user->id;
+    	$idfortaskuser=$usertoprocess->id;
     	$result = $object->add_contact($idfortaskuser, GETPOST("type"), 'internal');
 
-    	if (! $result || $result == -2)	// Contact add ok or already contact of task
+    	if ($result >= 0 || $result == -2)	// Contact add ok or already contact of task
     	{
     		// Test if we are already contact of the project (should be rare but sometimes we can add as task contact without being contact of project, like when admin user has been removed from contact of project)
     		$sql='SELECT ec.rowid FROM '.MAIN_DB_PREFIX.'element_contact as ec, '.MAIN_DB_PREFIX.'c_type_contact as tc WHERE tc.rowid = ec.fk_c_type_contact';
@@ -158,7 +171,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
     				$project->fetch($object->fk_project);
     				// Get type
     				$listofprojcontact=$project->liste_type_contact('internal');
-    				
+
     				if (count($listofprojcontact))
     				{
     					$typeforprojectcontact=reset(array_keys($listofprojcontact));
@@ -166,7 +179,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
     				}
     			}
     		}
-    		else 
+    		else
     		{
     			dol_print_error($db);
     		}
@@ -190,6 +203,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	if (! $error)
 	{
 		setEventMessages("TaskAssignedToEnterTime", null);
+		$taskid=0;
 	}
 
 	$action='';
@@ -233,16 +247,16 @@ if ($action == 'addtime' && $user->rights->projet->lire)
 							$error++;
 							break;
 						}
-						
+
 						$updateoftaskdone++;
 		        	}
 		        }
 			}
-			
+
 			if (! $updateoftaskdone)  // Check to update progress if no update were done on task.
 			{
 			    $object->fetch($taskid);
-                //var_dump($object->progress);var_dump(GETPOST($taskid . 'progress', 'int')); exit;			    
+                //var_dump($object->progress);var_dump(GETPOST($taskid . 'progress', 'int')); exit;
 			    if ($object->progress != GETPOST($taskid . 'progress', 'int'))
 			    {
 			        $object->progress = GETPOST($taskid . 'progress', 'int');
@@ -262,7 +276,7 @@ if ($action == 'addtime' && $user->rights->projet->lire)
 	    	setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 
 	   	    // Redirect to avoid submit twice on back
-	       	header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'').($day?'&day='.$day:'').($month?'&month='.$month:'').($year?'&year='.$year:''));
+	       	header('Location: '.$_SERVER["PHP_SELF"].'?'.($projectid?'id='.$projectid:'').($search_usertoprocessid?'&search_usertoprocessid='.$search_usertoprocessid:'').($mode?'&mode='.$mode:'').($day?'&day='.$day:'').($month?'&month='.$month:'').($year?'&year='.$year:''));
 	       	exit;
 	   	}
 	}
@@ -312,14 +326,15 @@ llxHeader("",$title,"",'','','',array('/core/js/timesheet.js'));
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'title_project');
 
 $param='';
-$param.=($mode?'&amp;mode='.$mode:'');
-$param.=($search_project_ref?'&amp;search_project_ref='.$search_project_ref:'');
+$param.=($mode?'&mode='.$mode:'');
+$param.=($search_project_ref?'&search_project_ref='.$search_project_ref:'');
+$param.=($search_usertoprocessid > 0?'&search_usertoprocessid='.$search_usertoprocessid:'');
 
 // Show navigation bar
-$nav ='<a class="inline-block valignmiddle" href="?year='.$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param.'">'.img_previous($langs->trans("Previous"))."</a>\n";
+$nav ='<a class="inline-block valignmiddle" href="?year='.$prev_year."&month=".$prev_month."&day=".$prev_day.$param.'">'.img_previous($langs->trans("Previous"))."</a>\n";
 $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("WeekShort")." ".$week." </span>\n";
-$nav.='<a class="inline-block valignmiddle" href="?year='.$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param.'">'.img_next($langs->trans("Next"))."</a>\n";
-$nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
+$nav.='<a class="inline-block valignmiddle" href="?year='.$next_year."&month=".$next_month."&day=".$next_day.$param.'">'.img_next($langs->trans("Next"))."</a>\n";
+$nav.=" &nbsp; (<a href=\"?year=".$nowyear."&month=".$nowmonth."&day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
 $nav.='<br>'.$form->select_date(-1,'',0,0,2,"addtime",1,0,1).' ';
 $nav.=' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
 
@@ -333,7 +348,7 @@ print '<input type="hidden" name="day" value="'.$day.'">';
 print '<input type="hidden" name="month" value="'.$month.'">';
 print '<input type="hidden" name="year" value="'.$year.'">';
 
-$head=project_timesheet_prepare_head($mode);
+$head=project_timesheet_prepare_head($mode, $usertoprocess);
 dol_fiche_head($head, 'inputperweek', '', -1, 'task');
 
 // Show description of content
@@ -356,44 +371,17 @@ print '</div>';
 
 dol_fiche_end();
 
-// Filter on user
-/*	dol_fiche_head('');
-	print '<table class="border" width="100%"><tr><td width="25%">'.$langs->trans("User").'</td>';
-	print '<td>';
-	if ($mine) print $user->getLoginUrl(1);
-	print '</td>';
-	print '</tr></table>';
-	dol_fiche_end();
-*/
-
-// Filter on user
-/*	dol_fiche_head('');
-	print '<table class="border" width="100%"><tr><td width="25%">'.$langs->trans("User").'</td>';
-	print '<td>';
-	if ($mine) print $user->getLoginUrl(1);
-	print '</td>';
-	print '</tr></table>';
-	dol_fiche_end();
-*/
-
-
-// Add a new project/task
-//print '<br>';
-//print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-//print '<input type="hidden" name="action" value="assigntask">';
-//print '<input type="hidden" name="mode" value="'.$mode.'">';
-//print '<input type="hidden" name="year" value="'.$year.'">';
-//print '<input type="hidden" name="month" value="'.$month.'">';
-//print '<input type="hidden" name="day" value="'.$day.'">';
-
-print '<div class="floatright right">'.$nav.'</div>';     // We move this before the assign to components so, the default submit button is not the assign to.
+print '<div class="floatright right'.($conf->dol_optimize_smallscreen?' centpercent':'').'">'.$nav.'</div>';     // We move this before the assign to components so, the default submit button is not the assign to.
 
 print '<div class="float valignmiddle">';
-print $langs->trans("AssignTaskToMe").'<br>';
+$titleassigntask = $langs->trans("AssignTaskToMe");
+if ($usertoprocess->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", $usertoprocess->getFullName($langs));
+print '<div class="taskiddiv inline-block">';
 $formproject->selectTasks($socid?$socid:-1, $taskid, 'taskid', 32, 0, 1, 1);
-print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0);
-print '<input type="submit" class="button valignmiddle" name="assigntask" value="'.$langs->trans("AssignTask").'">';
-//print '</form>';
+print '</div>';
+print ' ';
+print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0, 'maxwidth200');
+print '<input type="submit" class="button valignmiddle" name="assigntask" value="'.dol_escape_htmltag($titleassigntask).'">';
 print '</div>';
 
 print '<div class="clearboth" style="padding-bottom: 8px;"></div>';
@@ -403,6 +391,11 @@ print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
 
 print '<tr class="liste_titre_filter">';
+print '<td class="liste_titre">';
+$usersettoshow='hierarchyme';
+if ($user->rights->projet->all->lire) $usersettoshow='';
+print $form->select_dolusers($usertoprocess->id, 'search_usertoprocessid', 0, null, 0, $usersettoshow, 0, 0, 0, 1, '', 0, '', 'maxwidth150');
+print '</td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
 print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
@@ -423,6 +416,7 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("User").'</td>';
 print '<td>'.$langs->trans("RefTask").'</td>';
 print '<td>'.$langs->trans("LabelTask").'</td>';
 print '<td>'.$langs->trans("ProjectRef").'</td>';
@@ -432,9 +426,11 @@ if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY))
 }
 print '<td align="right" class="maxwidth75">'.$langs->trans("PlannedWorkload").'</td>';
 print '<td align="right" class="maxwidth75">'.$langs->trans("ProgressDeclared").'</td>';
+/*print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'</td>';
+ if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByYou").'</td>';
+ else print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByUser").'</td>';*/
+print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'<br>('.$langs->trans("Everybody").')</td>';
 print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'</td>';
-if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByYou").'</td>';
-else print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByUser").'</td>';
 
 $startday=dol_mktime(12, 0, 0, $startdayarray['first_month'], $startdayarray['first_day'], $startdayarray['first_year']);
 
@@ -452,16 +448,16 @@ if (count($tasksarray) > 0)
 {
     //var_dump($tasksarray);
     //var_dump($tasksrole);
-    
+
 	$j=0;
 	$level=0;
 	projectLinesPerWeek($j, $firstdaytoshow, $usertoprocess, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restrictviewformytask);
 
-	$colspan=7;
+	$colspan=8;
 	if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY)) $colspan++;
-	
+
 	print '<tr class="liste_total">
-                <td class="liste_total" colspan="'.$colspan.'" align="right">'.$langs->trans("Total").'</td>
+                <td class="liste_total" colspan="'.$colspan.'">'.$langs->trans("Total").'</td>
                 <td class="liste_total hide0" align="center"><div id="totalDay[0]">&nbsp;</div></td>
                 <td class="liste_total hide1" align="center"><div id="totalDay[1]">&nbsp;</div></td>
                 <td class="liste_total hide2" align="center"><div id="totalDay[2]">&nbsp;</div></td>
@@ -474,7 +470,7 @@ if (count($tasksarray) > 0)
 }
 else
 {
-	print '<tr><td colspan="11">'.$langs->trans("NoTasks").'</td></tr>';
+	print '<tr><td colspan="16">'.$langs->trans("NoTasks").'</td></tr>';
 }
 print "</table>";
 print '</div>';
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index f6355ec5566..7c60ac49092 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -134,7 +134,7 @@ if (empty($reshook))
 	        $error++;
 	        setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
 	    }
-	    
+
 	    if (! $error)
 	    {
 	        $error=0;
@@ -308,8 +308,8 @@ if (empty($reshook))
 			    setEventMessages($langs->trans("FailedToCloseProject").':'.$object->error, $object->errors, 'errors');
 	        }
 	    }
-	    
-	    
+
+
 	    if ($error)
 	    {
 			$db->rollback();
@@ -322,7 +322,7 @@ if (empty($reshook))
 			if (GETPOST('socid','int') > 0) $object->fetch_thirdparty(GETPOST('socid','int'));
 			else unset($object->thirdparty);
 	    }
-	    
+
 	}
 
 	// Build doc
@@ -623,7 +623,7 @@ if ($action == 'create' && $user->rights->projet->creer)
     {
         print ' &nbsp; &nbsp; ';
         print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
-    }    
+    }
     print '</div>';
 
     print '</form>';
@@ -645,12 +645,12 @@ if ($action == 'create' && $user->rights->projet->creer)
         });
         </script>';
 }
-elseif ($object->id > 0) 
+elseif ($object->id > 0)
 {
     /*
      * Show or edit
      */
-    
+
     $res=$object->fetch_optionals($object->id,$extralabels);
 
     // To verify role of users
@@ -711,10 +711,11 @@ elseif ($object->id > 0)
     print '<input type="hidden" name="comefromclone" value="'.$comefromclone.'">';
 
     $head=project_prepare_head($object);
-    dol_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
 
     if ($action == 'edit' && $userWrite > 0)
     {
+        dol_fiche_head($head, 'project', $langs->trans("Project"), 0, ($object->public?'projectpub':'project'));
+
         print '<table class="border" width="100%">';
 
         // Ref
@@ -835,27 +836,30 @@ elseif ($object->id > 0)
     }
     else
     {
+        dol_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
+
         // Project card
-        
+
         $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-        
+
         $morehtmlref='<div class="refidno">';
         // Title
         $morehtmlref.=$object->title;
         // Thirdparty
-        if ($object->thirdparty->id > 0) 
+        $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ';
+        if ($object->thirdparty->id > 0)
         {
-            $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'project');
+            $morehtmlref .= $object->thirdparty->getNomUrl(1, 'project');
         }
         $morehtmlref.='</div>';
-        
+
         // Define a complementary filter for search of next/prev ref.
         if (! $user->rights->projet->all->lire)
         {
             $objectsListId = $object->getProjectsAuthorizedForUser($user,0,0);
             $object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
         }
-        
+
 	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
@@ -889,7 +893,7 @@ elseif ($object->id > 0)
 	        if (strcmp($object->opp_amount,'')) print price($object->opp_amount,0,$langs,1,0,0,$conf->currency);
 	        print '</td></tr>';
 	    }
-    
+
         // Date start - end
         print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
 		$start = dol_print_date($object->date_start,'dayhour');
@@ -899,7 +903,7 @@ elseif ($object->id > 0)
 		print ($end?$end:'?');
 		if ($object->hasDelay()) print img_warning("Late");
         print '</td></tr>';
-    	     
+
         // Budget
         print '<tr><td>'.$langs->trans("Budget").'</td><td>';
         if (strcmp($object->budget_amount, '')) print price($object->budget_amount,0,$langs,1,0,0,$conf->currency);
@@ -908,16 +912,16 @@ elseif ($object->id > 0)
         // Other attributes
         $cols = 2;
         include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-        
+
         print '</table>';
-        
+
         print '</div>';
         print '<div class="fichehalfright">';
         print '<div class="ficheaddleft">';
         print '<div class="underbanner clearboth"></div>';
-        
+
         print '<table class="border" width="100%">';
-        
+
         // Description
         print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
         print nl2br($object->description);
@@ -929,13 +933,13 @@ elseif ($object->id > 0)
             print $form->showCategories($object->id,'project',1);
             print "</td></tr>";
         }
-        
+
         print '</table>';
-        
+
         print '</div>';
         print '</div>';
         print '</div>';
-        
+
         print '<div class="clearboth"></div>';
     }
 
@@ -956,7 +960,7 @@ elseif ($object->id > 0)
     {
         $defaultcheckedwhenoppclose=1;
         if (empty($conf->global->PROJECT_HIDE_TASKS)) $defaultcheckedwhenoppclose=0;
-        
+
         print '<!-- Javascript to manage opportunity status change -->';
         print '<script type="text/javascript" language="javascript">
             jQuery(document).ready(function() {
@@ -973,9 +977,9 @@ elseif ($object->id > 0)
                     jQuery("#divtocloseproject").show();
                     if (defaultcloseproject) jQuery("#inputcloseproject").prop("checked", true);
                     else jQuery("#inputcloseproject").prop("checked", false);
-                        
+
                     /* Make close project visible or not */
-                    if (elemcode == \'WON\' || elemcode == \'LOST\') 
+                    if (elemcode == \'WON\' || elemcode == \'LOST\')
                     {
                         jQuery("#divtocloseproject").show();
                     }
@@ -983,7 +987,7 @@ elseif ($object->id > 0)
                     {
                         jQuery("#divtocloseproject").hide();
                     }
-                        
+
                     /* Change percent of default percent of new status is higher */
                     if (parseFloat(jQuery("#opp_percent").val()) != parseFloat(defaultpercent))
                     {
@@ -1010,7 +1014,7 @@ elseif ($object->id > 0)
     {
 	    if ($action != "edit" )
 	    {
-	        
+
         	// Create event
         	if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 				// Add hidden condition because this is not a
             	// "workflow" action so should appears somewhere else on
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4227b86ca51..1240f091cc0 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -340,9 +340,9 @@ input.buttongen {
 	vertical-align: middle;
 }
 span.timesheetalreadyrecorded input {
-    /*font-size: smaller;*/
     border: none;
-    /*background:	transparent;*/
+    border-bottom: solid 1px rgba(0,0,0,0.4);
+    margin-right: 1px !important;
 }
 
 select.flat, form.flat select {
@@ -363,8 +363,10 @@ select.flat, form.flat select {
 .opacitytransp {
 	opacity: 0;
 }
-select:invalid { color: gray; }
-	input:disabled {
+select:invalid {
+	color: gray;
+}
+input:disabled {
 	background:#ddd;
 }
 
@@ -988,7 +990,7 @@ div.fiche {
 
 div.fiche {
 	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'6':'26')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'6')); ?>px;
+	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'12')); ?>px;
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
 	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
 }
@@ -2683,7 +2685,7 @@ input.liste_titre {
 }
 
 .noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total {
-	/* background: #F0F0F0; */
+	height: 32px;
 }
 .noborder tr.liste_total td, tr.liste_total td, form.liste_total div {
     color: #552266;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 6e31fc3ed11..d3f822bcca2 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -337,9 +337,9 @@ input.buttongen {
 	vertical-align: middle;
 }
 span.timesheetalreadyrecorded input {
-    /*font-size: smaller;*/
     border: none;
-    /*background:	transparent;*/
+    border-bottom: solid 1px rgba(0,0,0,0.1);
+    margin-right: 1px !important;
 }
 
 select.flat, form.flat select {
@@ -1027,7 +1027,7 @@ div.fiche {
 
 div.fiche {
 	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'4':'20')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'4')); ?>px;
+	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'12')); ?>px;
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
 	margin-bottom: 15px;
 }
@@ -2769,7 +2769,7 @@ input.liste_titre {
 }
 
 .noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total {
-	/* background: #F0F0F0; */
+	height: 32px;
 }
 .noborder tr.liste_total td, tr.liste_total td, form.liste_total div {
     /* border-top: 1px solid #f4f4f4; */
@@ -2777,7 +2777,6 @@ input.liste_titre {
     font-weight: normal;
     white-space: nowrap;
     padding: 4px;
-    height: 20px;
 }
 tr.liste_sub_total, tr.liste_sub_total td {
 	border-bottom: 2px solid #aaa;

From 447db1b3245a56e98ea53c9448ebe7a685d180fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 13:46:30 +0200
Subject: [PATCH 1005/1163] Fix orphelins for categories tables

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  6 ++++
 htdocs/install/mysql/migration/repair.sql     |  1 +
 htdocs/projet/tasks/list.php                  | 28 +++++++++----------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index f8b638b079a..11a86724cf0 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -348,5 +348,11 @@ ALTER TABLE llx_facture ADD COLUMN fk_fac_rec_source integer;
 
 DELETE from llx_c_actioncomm where code in ('AC_PROP','AC_COM','AC_FAC','AC_SHIP','AC_SUP_ORD','AC_SUP_INV') AND id NOT IN (SELECT DISTINCT fk_action FROM llx_actioncomm);
 
+-- Fix: delete orphelin category.
+delete from llx_categorie_product where fk_categorie not in (select rowid from llx_categorie where type = 0);
+delete from llx_categorie_societe where fk_categorie not in (select rowid from llx_categorie where type in (1, 2));
+delete from llx_categorie_member where fk_categorie not in (select rowid from llx_categorie where type = 3);
+delete from llx_categorie_contact where fk_categorie not in (select rowid from llx_categorie where type = 4);
+delete from llx_categorie_project where fk_categorie not in (select rowid from llx_categorie where type = 5);
 
 ALTER TABLE llx_inventory ADD COLUMN ref varchar(48);
\ No newline at end of file
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 4d3658d20bb..c748f38acb3 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -124,6 +124,7 @@ delete from llx_categorie_product where fk_categorie not in (select rowid from l
 delete from llx_categorie_societe where fk_categorie not in (select rowid from llx_categorie where type in (1, 2));
 delete from llx_categorie_member where fk_categorie not in (select rowid from llx_categorie where type = 3);
 delete from llx_categorie_contact where fk_categorie not in (select rowid from llx_categorie where type = 4);
+delete from llx_categorie_project where fk_categorie not in (select rowid from llx_categorie where type = 5);
 
 
 -- Fix: delete orphelin deliveries. Note: deliveries are linked to shipment by llx_element_element only. No other links.
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 4e31434dbc4..4af874ce21e 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -43,7 +43,7 @@ $id=GETPOST('id','int');
 $search_all=GETPOST('search_all', 'alphanohtml');
 $search_categ=GETPOST("search_categ",'alpha');
 $search_project=GETPOST('search_project');
-if (! isset($_GET['search_projectstatus']) && ! isset($_POST['search_projectstatus'])) 
+if (! isset($_GET['search_projectstatus']) && ! isset($_POST['search_projectstatus']))
 {
     if ($search_all != '') $search_projectstatus=-1;
     else $search_projectstatus=1;
@@ -173,14 +173,14 @@ if (empty($reshook))
         $toselect='';
         $search_array_options=array();
     }
-    
+
     // Mass actions
     $objectclass='Task';
     $objectlabel='Tasks';
     $permtoread = $user->rights->projet->lire;
     $permtodelete = $user->rights->projet->supprimer;
     $uploaddir = $conf->projet->dir_output.'/tasks';
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';    
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 if (empty($search_projectstatus) && $search_projectstatus == '') $search_projectstatus=1;
@@ -322,7 +322,7 @@ foreach ($search_array_options as $key => $val)
     $typ=$extrafields->attribute_type[$tmpkey];
     $mode=0;
     if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
     {
         $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
     }
@@ -396,7 +396,7 @@ foreach ($search_array_options as $key => $val)
     $tmpkey=preg_replace('/search_options_/','',$key);
     if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 }
-    
+
 // List of mass actions available
 $arrayofmassactions =  array(
 //    'presend'=>$langs->trans("SendByMail"),
@@ -544,7 +544,7 @@ if (! empty($arrayfields['t.progress']['checked'])) print '<td class="liste_titr
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-    foreach($extrafields->attribute_label as $key => $val) 
+    foreach($extrafields->attribute_label as $key => $val)
     {
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
@@ -649,7 +649,7 @@ while ($i < min($num,$limit))
 	$projectstatic->public = $obj->public;
 	$projectstatic->statut = $obj->projectstatus;
 	$projectstatic->datee = $db->jdate($obj->projectdatee);
-	
+
 	$userAccess = $projectstatic->restrictedProjectArea($user);    // why this ?
 	if ($userAccess >= 0)
 	{
@@ -663,7 +663,7 @@ while ($i < min($num,$limit))
     		if ($object->hasDelay()) print img_warning("Late");
     	    print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
-    	}        	 
+    	}
 	    // Label
     	if (! empty($arrayfields['t.label']['checked']))
     	{
@@ -730,7 +730,7 @@ while ($i < min($num,$limit))
     	    print '</td>';
     	    if (! $i) $totalarray['nbfield']++;
     	}
-    	
+
     	// Planned workload
     	if (! empty($arrayfields['t.planned_workload']['checked']))
     	{
@@ -764,7 +764,7 @@ while ($i < min($num,$limit))
             if (! $i) $totalarray['nbfield']++;
 		    if (! $i) $totalarray['totaldurationeffectivefield']=$totalarray['nbfield'];
 		    $totalarray['totaldurationeffective'] += $obj->duration_effective;
-    	}    		
+    	}
 	    // Calculated progress
     	if (! empty($arrayfields['t.progress_calculated']['checked']))
     	{
@@ -777,7 +777,7 @@ while ($i < min($num,$limit))
     		print '</td>';
             if (! $i) $totalarray['nbfield']++;
             if (! $i) $totalarray['totalprogress_calculated']=$totalarray['nbfield'];
-    	}    		
+    	}
 	    // Declared progress
     	if (! empty($arrayfields['t.progress']['checked']))
     	{
@@ -843,13 +843,13 @@ while ($i < min($num,$limit))
         }
         print '</td>';
         if (! $i) $totalarray['nbfield']++;
-		
+
 		print "</tr>\n";
-    
+
 		//print projectLinesa();
 	}
 
-	$i++;    
+	$i++;
 }
 
 // Show total line

From b0f2db7aaadd7250c88f1495dce77fe1eb97060f Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Fri, 2 Jun 2017 17:48:29 +0200
Subject: [PATCH 1006/1163] NEW : Add calculation function for Loan schedule

---
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  21 +-
 .../mysql/tables/llx_loan_schedule.sql        |  37 ++
 htdocs/langs/en_US/loan.lang                  |   1 +
 htdocs/loan/calcmens.php                      |  72 +++
 htdocs/loan/card.php                          |  66 ++-
 htdocs/loan/class/loanschedule.class.php      | 526 ++++++++++++++++++
 htdocs/loan/createschedule.php                | 208 +++++++
 7 files changed, 904 insertions(+), 27 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_loan_schedule.sql
 create mode 100644 htdocs/loan/calcmens.php
 create mode 100644 htdocs/loan/class/loanschedule.class.php
 create mode 100644 htdocs/loan/createschedule.php

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index f8b638b079a..a574e6f84dd 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -349,4 +349,23 @@ ALTER TABLE llx_facture ADD COLUMN fk_fac_rec_source integer;
 DELETE from llx_c_actioncomm where code in ('AC_PROP','AC_COM','AC_FAC','AC_SHIP','AC_SUP_ORD','AC_SUP_INV') AND id NOT IN (SELECT DISTINCT fk_action FROM llx_actioncomm);
 
 
-ALTER TABLE llx_inventory ADD COLUMN ref varchar(48);
\ No newline at end of file
+ALTER TABLE llx_inventory ADD COLUMN ref varchar(48);
+
+create table llx_loan_schedule
+(
+  rowid				integer AUTO_INCREMENT PRIMARY KEY,
+  fk_loan			integer,
+  datec				datetime,         
+  tms				timestamp,
+  datep				datetime,         
+  amount_capital	real DEFAULT 0,
+  amount_insurance	real DEFAULT 0,
+  amount_interest	real DEFAULT 0,
+  fk_typepayment	integer NOT NULL,
+  num_payment		varchar(50),
+  note_private      text,
+  note_public       text,
+  fk_bank			integer NOT NULL,
+  fk_user_creat		integer,          
+  fk_user_modif		integer           
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_loan_schedule.sql b/htdocs/install/mysql/tables/llx_loan_schedule.sql
new file mode 100644
index 00000000000..c682b22f276
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_loan_schedule.sql
@@ -0,0 +1,37 @@
+-- ===================================================================
+-- Copyright (C) 2014		Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+-- Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+create table llx_loan_schedule
+(
+  rowid				integer AUTO_INCREMENT PRIMARY KEY,
+  fk_loan			integer,
+  datec				datetime,         -- creation date
+  tms				timestamp,
+  datep				datetime,         -- payment date
+  amount_capital	real DEFAULT 0,
+  amount_insurance	real DEFAULT 0,
+  amount_interest	real DEFAULT 0,
+  fk_typepayment	integer NOT NULL,
+  num_payment		varchar(50),
+  note_private      text,
+  note_public       text,
+  fk_bank			integer NOT NULL,
+  fk_user_creat		integer,          -- creation user
+  fk_user_modif		integer           -- last modification user
+)ENGINE=innodb;
diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang
index 927aab2abf4..d00b11738be 100644
--- a/htdocs/langs/en_US/loan.lang
+++ b/htdocs/langs/en_US/loan.lang
@@ -50,3 +50,4 @@ ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
+CreateCalcSchedule=Créer / Modifier échéancier de pret
diff --git a/htdocs/loan/calcmens.php b/htdocs/loan/calcmens.php
new file mode 100644
index 00000000000..3778f455b04
--- /dev/null
+++ b/htdocs/loan/calcmens.php
@@ -0,0 +1,72 @@
+<?php
+/* TVI
+ * Copyright (C) 2015	Florian HENRY 		<florian.henry@open-concept.pro>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * \file tvi/ajax/list.php
+ * \brief File to return datables output
+ */
+if (! defined('NOTOKENRENEWAL'))
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (! defined('NOREQUIREMENU'))
+	define('NOREQUIREMENU', '1');
+	// if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
+if (! defined('NOREQUIREAJAX'))
+	define('NOREQUIREAJAX', '1');
+	// if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
+	// if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+
+
+require '../main.inc.php';
+require DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
+
+$mens=GETPOST('mens');
+$capital=GETPOST('capital');
+$rate=GETPOST('rate');
+$echance=GETPOST('echeance');
+$nbterm=GETPOST('nbterm');
+
+top_httphead();
+
+$output=array();
+
+$object = new LoanSchedule($db);
+
+$int = ($capital*($rate/12));
+$int = round($int ,2,PHP_ROUND_HALF_UP);
+$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
+$output[$echance]=array('cap_rest'=>$cap_rest,'cap_rest_str'=>price($cap_rest),'interet'=>$int,'interet_str'=>price($int,0,'',1),'mens'=>$mens);
+
+$echance++;
+$capital=$cap_rest;
+while ($echance<=$nbterm) {
+
+	$mens = round($object->calc_mens($capital,$rate,$nbterm-$echance+1),2,PHP_ROUND_HALF_UP);
+
+	$int = ($capital*($rate/12));
+	$int = round($int ,2,PHP_ROUND_HALF_UP);
+	$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
+
+	$output[$echance]=array('cap_rest'=>$cap_rest,'cap_rest_str'=>price($cap_rest),'interet'=>$int,'interet_str'=>price($int,0,'',1),'mens'=>$mens);
+
+	$capital=$cap_rest;
+	$echance++;
+}
+
+echo json_encode($output);
+
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 81d43e46ab0..557d48be680 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -72,7 +72,7 @@ if (empty($reshook))
             setEventMessages($loan->error, null, 'errors');
         }
     }
-    
+
     // Delete loan
     if ($action == 'confirm_delete' && $confirm == 'yes')
     {
@@ -89,7 +89,7 @@ if (empty($reshook))
     		setEventMessages($loan->error, null, 'errors');
     	}
     }
-    
+
     // Add loan
     if ($action == 'add' && $user->rights->loan->write)
     {
@@ -99,7 +99,7 @@ if (empty($reshook))
     		$dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int'));
     		$capital 	= price2num(GETPOST('capital'));
             $rate       = GETPOST('rate');
-            
+
     		if (! $capital)
     		{
     		    $error++; $action = 'create';
@@ -120,7 +120,7 @@ if (empty($reshook))
     		    $error++; $action = 'create';
     		    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Rate")), null, 'errors');
     		}
-    		
+
     		if (! $error)
     		{
     			$object->label					= GETPOST('label');
@@ -133,15 +133,15 @@ if (empty($reshook))
     			$object->note_private 			= GETPOST('note_private');
     			$object->note_public 			= GETPOST('note_public');
     			$object->fk_project 			= GETPOST('fk_project');
-    			
+
     			$accountancy_account_capital	= GETPOST('accountancy_account_capital');
     			$accountancy_account_insurance	= GETPOST('accountancy_account_insurance');
     			$accountancy_account_interest	= GETPOST('accountancy_account_interest');
-    
+
     			if ($accountancy_account_capital <= 0) { $object->account_capital = ''; } else { $object->account_capital = $accountancy_account_capital; }
     			if ($accountancy_account_insurance <= 0) { $object->account_insurance = ''; } else { $object->account_insurance = $accountancy_account_insurance; }
     			if ($accountancy_account_interest <= 0) { $object->account_interest = ''; } else { $object->account_interest = $accountancy_account_interest; }
-    
+
     			$id=$object->create($user);
     			if ($id <= 0)
     			{
@@ -157,7 +157,7 @@ if (empty($reshook))
     		exit();
     	}
     }
-    
+
     // Update record
     else if ($action == 'update' && $user->rights->loan->write)
     {
@@ -168,7 +168,7 @@ if (empty($reshook))
     		$datestart	= dol_mktime(12, 0, 0, GETPOST('startmonth','int'), GETPOST('startday','int'), GETPOST('startyear','int'));
     		$dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int'));
     		$capital 	= price2num(GETPOST('capital'));
-    
+
     		if (! $capital)
     		{
     			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
@@ -185,14 +185,14 @@ if (empty($reshook))
 				$accountancy_account_capital	= GETPOST('accountancy_account_capital');
 				$accountancy_account_insurance	= GETPOST('accountancy_account_insurance');
 				$accountancy_account_interest	= GETPOST('accountancy_account_interest');
-	
+
 				if ($accountancy_account_capital <= 0) { $object->account_capital = ''; } else { $object->account_capital = $accountancy_account_capital; }
 				if ($accountancy_account_insurance <= 0) { $object->account_insurance = ''; } else { $object->account_insurance = $accountancy_account_insurance; }
 				if ($accountancy_account_interest <= 0) { $object->account_interest = ''; } else { $object->account_interest = $accountancy_account_interest; }
     		}
-    
+
             $result = $object->update($user);
-    
+
             if ($result > 0)
             {
                 header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
@@ -209,7 +209,7 @@ if (empty($reshook))
             exit;
         }
     }
-    
+
 	// Link to a project
 	if ($action == 'classin' && $user->rights->loan->write)
 	{
@@ -307,12 +307,12 @@ if ($action == 'create')
 		$langs->load("projects");
 
     	print '<tr><td>'.$langs->trans("Project").'</td><td>';
-        
+
         $numproject=$formproject->select_projects(-1,GETPOST("fk_project"),'fk_project',16,0,1,1);
-        
+
         print '</td></tr>';
     }
-    
+
     // Note Private
     print '<tr>';
     print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
@@ -352,7 +352,7 @@ if ($action == 'create')
 		print $formaccounting->select_account($object->accountancy_account_interest, 'accountancy_account_interest', 1, '', 0, 1);
         print '</td></tr>';
 	}
-	else // For external software 
+	else // For external software
 	{
         // Accountancy_account_capital
         print '<tr><td class="titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
@@ -417,10 +417,22 @@ if ($id > 0)
 
 		dol_fiche_head($head, 'card', $langs->trans("Loan"), 0, 'bill');
 
+		print '<script type="text/javascript">' . "\n";
+		print '  	function popEcheancier() {' . "\n";
+		print '  		$div = $(\'<div id="popCalendar"><iframe width="100%" height="100%" frameborder="0" src="createschedule.php?loanid=' . $object->id . '"></iframe></div>\');' . "\n";
+		print '  		$div.dialog({' . "\n";
+		print '  			modal:true' . "\n";
+		print '  			,width:"90%"' . "\n";
+		print '  			,height:$(window).height() - 150' . "\n";
+		print '  		});' . "\n";
+		print '  	}' . "\n";
+		print '</script>';
+
+
 		// Loan card
-		
+
 		$linkback = '<a href="' . DOL_URL_ROOT . '/loan/index.php">' . $langs->trans("BackToList") . '</a>';
-		
+
 		$morehtmlref='<div class="refidno">';
 		// Ref loan
 		$morehtmlref.=$form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->loan->write, 'string', '', 0, 1);
@@ -458,7 +470,7 @@ if ($id > 0)
 	        }
 	    }
 	    $morehtmlref.='</div>';
-		
+
 		$object->totalpaid = $totalpaid;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
@@ -652,7 +664,7 @@ if ($id > 0)
 			while ($i < $num)
 			{
 				$objp = $db->fetch_object($resql);
-				
+
 				print '<tr class="oddeven">';
 				print '<td><a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
 				print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
@@ -713,31 +725,33 @@ if ($id > 0)
  			if (empty($reshook))
             {
                 print '<div class="tabsAction">';
-    
+
     			// Edit
     			if ($user->rights->loan->write)
     			{
+    				print '<a href="javascript:popEcheancier()" class="butAction">'.$langs->trans('CreateCalcSchedule').'</a>';
+
     				print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
     			}
-    
+
     			// Emit payment
     			if ($object->paid == 0 && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->rights->loan->write)
     			{
     				print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans("DoPayment").'</a>';
     			}
-    
+
     			// Classify 'paid'
     			if ($object->paid == 0 && round($staytopay) <=0 && $user->rights->loan->write)
     			{
     				print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=paid">'.$langs->trans("ClassifyPaid").'</a>';
     			}
-    
+
     			// Delete
     			if ($user->rights->loan->delete)
     			{
     				print '<a class="butActionDelete" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
     			}
-    
+
     			print "</div>";
             }
 		}
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
new file mode 100644
index 00000000000..1e519e6a2af
--- /dev/null
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -0,0 +1,526 @@
+<?php
+/* Copyright (C) 2017	Florian HENRY <florian.henry@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/loan/class/loanschedule.class.php
+ *		\ingroup    facture
+ *		\brief      File of class to manage schedule of loans
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+
+
+/**     \class      LoanSchedule
+ *		\brief      Class to manage Schedule of loans
+ */
+class LoanSchedule extends CommonObject
+{
+	public $element='loan_schedule';			//!< Id that identify managed objects
+	public $table_element='loan_schedule';	//!< Name of table without prefix where object is stored
+
+	var $fk_loan;
+	var $datec='';
+	var $tms='';
+	var $datep='';
+    var $amounts=array();   // Array of amounts
+    var $amount_capital;    // Total amount of payment
+	var $amount_insurance;
+	var $amount_interest;
+	var $fk_typepayment;
+	var $num_payment;
+	var $fk_bank;
+	var $fk_user_creat;
+	var $fk_user_modif;
+	var $lines=array();
+
+	/**
+	 * @deprecated
+	 * @see amount, amounts
+	 */
+	var $total;
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 *  Create payment of loan into database.
+     *  Use this->amounts to have list of lines for the payment
+     *
+	 *  @param      User		$user   User making payment
+	 *  @return     int     			<0 if KO, id of payment if OK
+	 */
+	function create($user)
+	{
+		global $conf, $langs;
+
+		$error=0;
+
+        $now=dol_now();
+
+        // Validate parameters
+		if (! $this->datepaid)
+		{
+			$this->error='ErrorBadValueForParameter';
+			return -1;
+		}
+
+		// Clean parameters
+		if (isset($this->fk_loan)) 			$this->fk_loan = trim($this->fk_loan);
+		if (isset($this->amount_capital))	$this->amount_capital = trim($this->amount_capital?$this->amount_capital:0);
+		if (isset($this->amount_insurance))	$this->amount_insurance = trim($this->amount_insurance?$this->amount_insurance:0);
+		if (isset($this->amount_interest))	$this->amount_interest = trim($this->amount_interest?$this->amount_interest:0);
+		if (isset($this->fk_typepayment))	$this->fk_typepayment = trim($this->fk_typepayment);
+		if (isset($this->fk_bank))			$this->fk_bank = trim($this->fk_bank);
+		if (isset($this->fk_user_creat))	$this->fk_user_creat = trim($this->fk_user_creat);
+		if (isset($this->fk_user_modif))	$this->fk_user_modif = trim($this->fk_user_modif);
+
+        $totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
+        $totalamount = price2num($totalamount);
+
+        // Check parameters
+        if ($totalamount == 0) {
+        	$this->errors[]='step1';
+        	return -1; // Negative amounts are accepted for reject prelevement but not null
+        }
+
+
+		$this->db->begin();
+
+		if ($totalamount != 0)
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (fk_loan, datec, datep, amount_capital, amount_insurance, amount_interest,";
+			$sql.= " fk_typepayment, fk_user_creat, fk_bank)";
+			$sql.= " VALUES (".$this->fk_loan.", '".$this->db->idate($now)."',";
+			$sql.= " '".$this->db->idate($this->datepaid)."',";
+			$sql.= " ".$this->amount_capital.",";
+			$sql.= " ".$this->amount_insurance.",";
+			$sql.= " ".$this->amount_interest.",";
+			$sql.= " ".$this->fk_typepayment.", ";
+			$sql.= " ".$user->id.",";
+			$sql.= " ".$this->fk_bank . ")";
+
+			dol_syslog(get_class($this)."::create", LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
+			}
+			else
+			{
+                $this->error=$this->db->lasterror();
+				$error++;
+			}
+
+		}
+
+		if ($totalamount != 0 && ! $error)
+		{
+		    $this->amount_capital=$totalamount;
+            $this->total=$totalamount;    // deprecated
+		    $this->db->commit();
+			return $this->id;
+		}
+		else
+		{
+			$this->errors[]=$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param	int		$id         Id object
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	function fetch($id)
+	{
+		global $langs;
+		$sql = "SELECT";
+		$sql.= " t.rowid,";
+		$sql.= " t.fk_loan,";
+		$sql.= " t.datec,";
+		$sql.= " t.tms,";
+		$sql.= " t.datep,";
+		$sql.= " t.amount_capital,";
+		$sql.= " t.amount_insurance,";
+		$sql.= " t.amount_interest,";
+		$sql.= " t.fk_typepayment,";
+		$sql.= " t.num_payment,";
+        $sql.= " t.note_private,";
+        $sql.= " t.note_public,";
+		$sql.= " t.fk_bank,";
+		$sql.= " t.fk_user_creat,";
+		$sql.= " t.fk_user_modif,";
+		$sql.= " pt.code as type_code, pt.libelle as type_libelle,";
+		$sql.= ' b.fk_account';
+		$sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as pt, ".MAIN_DB_PREFIX.$this->table_element." as t)";
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
+		$sql.= " WHERE t.rowid = ".$id." AND t.fk_typepayment = pt.id";
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+	{
+		if ($this->db->num_rows($resql))
+		{
+			$obj = $this->db->fetch_object($resql);
+
+			$this->id = $obj->rowid;
+			$this->ref = $obj->rowid;
+
+			$this->fk_loan = $obj->fk_loan;
+			$this->datec = $this->db->jdate($obj->datec);
+			$this->tms = $this->db->jdate($obj->tms);
+			$this->datep = $this->db->jdate($obj->datep);
+			$this->amount_capital = $obj->amount_capital;
+			$this->amount_insurance = $obj->amount_insurance;
+			$this->amount_interest = $obj->amount_interest;
+			$this->fk_typepayment = $obj->fk_typepayment;
+			$this->num_payment = $obj->num_payment;
+			$this->note_private = $obj->note_private;
+			$this->note_public = $obj->note_public;
+			$this->fk_bank = $obj->fk_bank;
+			$this->fk_user_creat = $obj->fk_user_creat;
+			$this->fk_user_modif = $obj->fk_user_modif;
+
+			$this->type_code = $obj->type_code;
+			$this->type_libelle = $obj->type_libelle;
+
+			$this->bank_account   = $obj->fk_account;
+			$this->bank_line      = $obj->fk_bank;
+		}
+		$this->db->free($resql);
+
+			return 1;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Update database
+	 *
+	 *  @param	User	$user        	User that modify
+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return int         			<0 if KO, >0 if OK
+	 */
+	function update($user=0, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		// Clean parameters
+		if (isset($this->fk_loan)) $this->fk_loan=trim($this->fk_loan);
+		if (isset($this->amount_capital)) $this->amount_capital=trim($this->amount_capital);
+		if (isset($this->amount_insurance)) $this->amount_insurance=trim($this->amount_insurance);
+		if (isset($this->amount_interest)) $this->amount_interest=trim($this->amount_interest);
+		if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment);
+		if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment);
+		if (isset($this->note_private)) $this->note_private=trim($this->note_private);
+		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
+		if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
+		if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat);
+		if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif);
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+
+		$sql.= " fk_loan=".(isset($this->fk_loan)?$this->fk_loan:"null").",";
+		$sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+		$sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		$sql.= " datep=".(dol_strlen($this->datep)!=0 ? "'".$this->db->idate($this->datep)."'" : 'null').",";
+		$sql.= " amount_capital=".(isset($this->amount_capital)?$this->amount_capital:"null").",";
+		$sql.= " amount_insurance=".(isset($this->amount_insurance)?$this->amount_insurance:"null").",";
+		$sql.= " amount_interest=".(isset($this->amount_interest)?$this->amount_interest:"null").",";
+		$sql.= " fk_typepayment=".(isset($this->fk_typepayment)?$this->fk_typepayment:"null").",";
+		$sql.= " num_payment=".(isset($this->num_payment)?"'".$this->db->escape($this->num_payment)."'":"null").",";
+		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
+		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
+		$sql.= " fk_bank=".(isset($this->fk_bank)?$this->fk_bank:"null").",";
+		$sql.= " fk_user_creat=".(isset($this->fk_user_creat)?$this->fk_user_creat:"null").",";
+		$sql.= " fk_user_modif=".(isset($this->fk_user_modif)?$this->fk_user_modif:"null")."";
+
+		$sql.= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+
+	/**
+	 *  Delete object in database
+	 *
+	 *  @param	User	$user        	User that delete
+	 *  @param  int		$notrigger		0=launch triggers after, 1=disable triggers
+	 *  @return int						<0 if KO, >0 if OK
+	 */
+	function delete($user, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		$this->db->begin();
+
+	    if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql.= " WHERE rowid=".$this->id;
+
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		}
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	function calc_mens($capital,$rate,$nbterm)
+	{
+		$result='';
+
+		if (!empty($capital)&&!empty($rate)&&!empty($nbterm))
+		{
+			$result=($capital*($rate/12))/(1-pow((1+($rate/12)),($nbterm*-1)));
+		}
+
+		return $result;
+	}
+
+
+	/**
+	 *  Load all object in memory from database
+	 *
+	 *  @param	int		$id         Id object
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	function fetchall($loan)
+	{
+		global $langs;
+
+		$sql = "SELECT";
+		$sql.= " t.rowid,";
+		$sql.= " t.fk_loan,";
+		$sql.= " t.datec,";
+		$sql.= " t.tms,";
+		$sql.= " t.datep,";
+		$sql.= " t.amount_capital,";
+		$sql.= " t.amount_insurance,";
+		$sql.= " t.amount_interest,";
+		$sql.= " t.fk_typepayment,";
+		$sql.= " t.num_payment,";
+		$sql.= " t.note_private,";
+		$sql.= " t.note_public,";
+		$sql.= " t.fk_bank,";
+		$sql.= " t.fk_user_creat,";
+		$sql.= " t.fk_user_modif";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql.= " WHERE t.fk_loan = ".$loan;
+
+		dol_syslog(get_class($this)."::fetchall", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+
+		if ($resql)
+		{
+			while($obj = $this->db->fetch_object($resql))
+			{
+				$line = New LoanSchedule($this->db);
+				$line->id = $obj->rowid;
+				$line->ref = $obj->rowid;
+
+				$line->fk_loan = $obj->fk_loan;
+				$line->datec = $this->db->jdate($obj->datec);
+				$line->tms = $this->db->jdate($obj->tms);
+				$line->datep = $this->db->jdate($obj->datep);
+				$line->amount_capital = $obj->amount_capital;
+				$line->amount_insurance = $obj->amount_insurance;
+				$line->amount_interest = $obj->amount_interest;
+				$line->fk_typepayment = $obj->fk_typepayment;
+				$line->num_payment = $obj->num_payment;
+				$line->note_private = $obj->note_private;
+				$line->note_public = $obj->note_public;
+				$line->fk_bank = $obj->fk_bank;
+				$line->fk_user_creat = $obj->fk_user_creat;
+				$line->fk_user_modif = $obj->fk_user_modif;
+
+				$this->lines[] = $line;
+			}
+			$this->db->free($resql);
+			return 1;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+	function trans_paiment()
+	{
+		require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+		$toinsert = array();
+
+		$sql = "SELECT l.rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."loan as l ";
+		$sql.= " WHERE l.paid = 0";
+		$resql=$this->db->query($sql);
+
+		if($resql){
+			while($obj = $this->db->fetch_object($resql)){
+				$lastrecorded = $this->lastpaiment($obj->rowid);
+				$toinsert = $this->paimenttorecord($obj->rowid, $lastrecorded);
+				if(count($toinsert)>0){
+					foreach ($toinsert as $echid){
+						$this->db->begin();
+						$sql = "INSERT INTO " .MAIN_DB_PREFIX . "payment_loan ";
+						$sql.= "(fk_loan,datec,tms,datep,amount_capital,amount_insurance,amount_interest,fk_typepayment,num_payment,note_private,note_public,fk_bank,fk_user_creat,fk_user_modif) ";
+						$sql.= "SELECT fk_loan,datec,tms,datep,amount_capital,amount_insurance,amount_interest,fk_typepayment,num_payment,note_private,note_public,fk_bank,fk_user_creat,fk_user_modif FROM " . MAIN_DB_PREFIX . "loan_schedule WHERE rowid =" .$echid;
+						$res=$this->db->query($sql);
+						if($res){
+							$this->db->commit();
+						}else {
+							$this->db->rollback();
+						}
+					}
+				}
+			}
+		}
+	}
+
+
+	function lastpaiment($loan)
+	{
+		$sql = "SELECT p.datep";
+		$sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as p ";
+		$sql.= " WHERE p.fk_loan = " . $loan;
+		$sql.= " ORDER BY p.datep DESC ";
+		$sql.= " LIMIT 1 ";
+
+		$resql=$this->db->query($sql);
+
+		if($resql){
+			$obj = $this->db->fetch_object($resql);
+			return $this->db->jdate($obj->datep);
+		}else{
+			return -1;
+		}
+	}
+
+	function paimenttorecord($loan,$datemax)
+	{
+		$sql = "SELECT p.rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p ";
+		$sql.= " WHERE p.fk_loan = " . $loan;
+		if(!empty($datemax)){ $sql.= " AND p.datep > '" . $this->db->idate($datemax) ."'";}
+		$sql.= " AND p.datep <= '" . $this->db->idate(dol_now()). "'";
+
+
+		$resql=$this->db->query($sql);
+
+		if($resql){
+			while($obj = $this->db->fetch_object($resql))
+			{
+				$result[] = $obj->rowid;
+
+			}
+
+		}
+
+		return $result;
+	}
+}
+
diff --git a/htdocs/loan/createschedule.php b/htdocs/loan/createschedule.php
new file mode 100644
index 00000000000..0d15d1b2de6
--- /dev/null
+++ b/htdocs/loan/createschedule.php
@@ -0,0 +1,208 @@
+<?php
+/* Copyright (C) 2017	Franck Moreau   <franck.moreau@theobald.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/loan/createecheancier.php
+ *		\ingroup    loan
+ *		\brief      Schedule card
+ */
+
+require '../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
+
+global $user;
+
+$loanid = GETPOST('loanid', 'int');
+$action = GETPOST('action');
+
+$object = new Loan($db);
+$object->fetch($loanid);
+
+$langs->load('loan');
+
+if ($action == 'createecheancier') {
+
+	$i=1;
+	while($i <$object->nbterm+1){
+
+		$date =  GETPOST('hi_date'.$i,'int');
+		$mens = GETPOST('mens'.$i);
+		$int = GETPOST('hi_interets'.$i);
+
+		$echeance = new LoanSchedule($db);
+
+		$echeance->fk_loan = $object->id;
+		$echeance->datec = dol_now();
+		$echeance->tms = dol_now();
+		$echeance->datepaid = $date;
+		$echeance->amount_capital = $mens-$int;
+		$echeance->amount_insurance = 0;
+		$echeance->amount_interest = $int;
+		$echeance->fk_typepayment = 3;
+		$echeance->fk_bank = 1;
+		$echeance->fk_user_creat = $user->id;
+		$echeance->fk_user_modif = $user->id;
+		$result=$echeance->create($user);
+		if ($result<0) {
+			setEventMessages(null, $echeance->errors,'errors');
+		}
+		$i++;
+	}
+}
+
+if ($action == 'updateecheancier') {
+
+	$i=1;
+	while($i <$object->nbterm+1){
+
+		$mens = GETPOST('mens'.$i);
+		$int = GETPOST('hi_interets'.$i);
+		$id = GETPOST('hi_rowid'.$i);
+		$echeance = new LoanSchedule($db);
+		$echeance->fetch($id);
+		$echeance->tms = dol_now();
+		$echeance->amount_capital = $mens-$int;
+		$echeance->amount_insurance = 0;
+		$echeance->amount_interest = $int;
+		$echeance->fk_user_modif = $user->id;
+		$result= $echeance->update($user,0);
+		if ($result<0) {
+			setEventMessages(null, $echeance->errors,'errors');
+		}
+		$i++;
+	}
+}
+
+$echeance = new LoanSchedule($db);
+$echeance->fetchall($object->id);
+
+top_htmlhead('', '');
+$var = ! $var;
+
+
+?>
+<script type="text/javascript" language="javascript">
+$(document).ready(function() {
+	$('[name^="mens"]').focusout(function() {
+		var echeance=$(this).attr('ech');
+		var mens=$(this).val();
+		var idcap=echeance-1;
+		idcap = '#hi_capital'+idcap;
+		var capital=$(idcap).val();
+		$.ajax({
+			  dataType: 'json',
+			  url: 'calcmens.php',
+			  data: { echeance: echeance, mens: mens, capital:capital, rate:<?php echo $object->rate/100;?> , nbterm : <?php echo $object->nbterm;?>},
+			  success: function(data) {
+				$.each(data, function(index, element) {
+					var idcap_res='#hi_capital'+index;
+					var idcap_res_srt='#capital'+index;
+					var interet_res='#hi_interets'+index;
+					var interet_res_str='#interets'+index;
+					var men_res='#mens'+index;
+					$(idcap_res).val(element.cap_rest);
+					$(idcap_res_srt).text(element.cap_rest_str+' €');
+					$(interet_res).val(element.interet);
+					$(interet_res_str).text(element.interet_str+' €');
+					$(men_res).val(element.mens);
+				});
+			}
+		});
+	});
+});
+</script>
+<?php
+
+
+print '<form name="createecheancier" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+print '<input type="hidden" name="loanid" value="' . $loanid . '">';
+if(count($echeance->lines)>0){
+	print '<input type="hidden" name="action" value="updateecheancier">';
+}else{
+	print '<input type="hidden" name="action" value="createecheancier">';
+}
+print '<table class="border" width="100%">';
+print '<tr class="liste_titre">';
+print '<th align="center" colspan="5">' . "Création d'échéancier</th>";
+print '</tr>';
+
+print '<tr class="liste_titre">';
+Print '<th width="10%" align="center"> Echéance </th>';
+Print '<th width="10%" align="center"> Date </th>';
+Print '<th width="10%" align="center"> Montant </th>';
+Print '<th width="20%" align="center"> Intérêts </th>';
+Print '<th width="40%" align="center"> Capital restant du </th>';
+print '</tr>';
+
+if ($object->nbterm > 0 && count($echeance->lines)==0)
+{
+	$i=1;
+	$capital = $object->capital;
+	while($i <$object->nbterm+1){
+		$mens = round($echeance->calc_mens($capital, $object->rate/100, $object->nbterm-$i+1),2,PHP_ROUND_HALF_UP);
+		$int = ($capital*($object->rate/12))/100;
+		$int = round($int ,2,PHP_ROUND_HALF_UP);
+		$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
+		print '<tr>';
+		print '<td align="center" id="n'.$i.'">' . $i .'</td>';
+		print '<td align="center" id ="date' .$i .'"><input type="hidden" name="hi_date' .$i .'" id ="hi_date' .$i .'" value="' . dol_time_plus_duree($object->datestart, $i-1, 'm') . '">' . dol_print_date(dol_time_plus_duree($object->datestart, $i-1, 'm'),'day') . '</td>';
+		print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
+		print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
+		print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
+		print '</tr>';
+		$i++;
+		$capital = $cap_rest;
+	}
+}elseif(count($echeance->lines)>0){
+	$i=1;
+	$capital = $object->capital;
+	foreach ($echeance->lines as $line){
+		$mens = $line->amount_capital+$line->amount_insurance+$line->amount_interest;
+		$int = $line->amount_interest;
+		$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
+		print '<tr>';
+		print '<td align="center" id="n'.$i.'"><input type="hidden" name="hi_rowid' .$i .'" id ="hi_rowid' .$i .'" value="' . $line->id . '">' . $i .'</td>';
+		print '<td align="center" id ="date' .$i .'"><input type="hidden" name="hi_date' .$i .'" id ="hi_date' .$i .'" value="' . $line->datep . '">' . dol_print_date($line->datep,'day') . '</td>';
+		if($line->datep > dol_now()){
+			print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
+		}else{
+			print '<td align="center">' . price($mens) . ' €</td><input type="hidden" name="mens' .$i .'" id ="mens' .$i .'" value="' . $mens . '">';
+		}
+		print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
+		print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
+		print '</tr>';
+		$i++;
+		$capital = $cap_rest;
+	}
+}
+
+print '</table>';
+print '</br>';
+print '</br>';
+print '<div align="center"><input class="button" type="submit" value="'.$langs->trans("Save").'"></div>';
+print '</form>';
+
+llxFooter();
+$db->close();
+
+
+

From 1761df2bc243ec9f333f38195ece72c533f83553 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 19:28:22 +0200
Subject: [PATCH 1007/1163] NEW Add page statistics for project tasks

---
 htdocs/core/menus/init_menu_auguria.sql |   1 +
 htdocs/core/menus/standard/eldy.lib.php |  45 +--
 htdocs/langs/en_US/projects.lang        |   3 +
 htdocs/projet/class/taskstats.class.php | 471 ++++++++++++++++++++++++
 htdocs/projet/tasks/stats/index.php     | 218 +++++++++++
 5 files changed, 716 insertions(+), 22 deletions(-)
 create mode 100644 htdocs/projet/class/taskstats.class.php
 create mode 100644 htdocs/projet/tasks/stats/index.php

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 9106c345fda..7a60f330727 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -288,6 +288,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3701__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&amp;action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3702__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3703__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/activity/perweek.php?leftmenu=projects', 'NewTimeSpent', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3704__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/tasks/stats/index.php?leftmenu=projects', 'Statistics', 1, 'projects', '$user->rights->projet->lire', '', 2, 4, __ENTITY__);
 
 -- Project - Categories
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3804__+MAX_llx_menu__, 'project', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=6', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 6248f294476..38a9a66a137 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -52,7 +52,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 	if (empty($noout)) print_start_menu_array();
 
 	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
-	
+
 	// Show/Hide vertical menu
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
@@ -437,7 +437,7 @@ function print_end_menu_array()
 /**
  * Core function to output left menu eldy
  * Fill &$menu (example with $forcemainmenu='home' $forceleftmenu='all', return left menu tree of Home)
- * 
+ *
  * @param	DoliDB		$db                 Database handler
  * @param 	array		$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
  * @param   array		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
@@ -445,7 +445,7 @@ function print_end_menu_array()
  * @param	Menu		$menu				Object Menu to return back list of menu entries
  * @param	int			$noout				Disable output (Initialise &$menu only).
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
- * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not efined in session. 
+ * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not efined in session.
  * @param	array		$moredata			An array with more data to output
  * @return	int								nb of menu entries
  */
@@ -459,7 +459,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 	$leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"]));
 
 	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
-	
+
 	// Show logo company
 	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
@@ -503,7 +503,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 	    print '</div>'."\n";
 	    print "<!-- End Bookmarks -->\n";
 	}
-	
+
 	/**
 	 * We update newmenu with entries found into database
 	 * --------------------------------------------------
@@ -605,7 +605,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$newmenu->add("/user/group/index.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin);
 				}
 			}
-			
+
 		}
 
 
@@ -839,7 +839,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				}
 
 				$newmenu->add("/fourn/facture/paiement.php", $langs->trans("Payments"),1,$user->rights->fournisseur->facture->lire);
-				
+
 				$newmenu->add("/fourn/facture/rapport.php",$langs->trans("Reportings"),2,$user->rights->fournisseur->facture->lire);
 
 				$newmenu->add("/compta/facture/stats/index.php?mode=supplier", $langs->trans("Statistics"),1,$user->rights->fournisseur->facture->lire);
@@ -957,29 +957,29 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 30);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 31);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 40);
-				if (! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled)) 
+				if (! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled))
 				{
 				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
 				}
-				if (! empty($conf->tax->enabled)) 
+				if (! empty($conf->tax->enabled))
 				{
 				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
 				}
-				if (! empty($conf->expensereport->enabled)) 
+				if (! empty($conf->expensereport->enabled))
 				{
 				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
 				}
 				/* not required yet, already supported by default account
-				if (! empty($conf->loan->enabled)) 
+				if (! empty($conf->loan->enabled))
 				{
 				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/admin/loan.php?mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuLoanAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_loan', 45);
 				}
-				if (! empty($conf->don->enabled)) 
+				if (! empty($conf->don->enabled))
 				{
 				    if (preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/don/admin/donation.php?from=accountancy&mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuDonationAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_donation', 47);
 				}*/
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 60);
-				
+
 				// Binding
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy",$langs->trans("CustomersVentilation"),1,$user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
 			    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/',$leftmenu)) $newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer",$langs->trans("ToBind"),2,$user->rights->accounting->bind->write);
@@ -1023,19 +1023,19 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
     							$objp = $db->fetch_object($resql);
 
     							$nature='';
-    							// Must match array $sourceList defined into journals_list.php 
+    							// Must match array $sourceList defined into journals_list.php
     							if ($objp->nature == 2) $nature="sells";
     							if ($objp->nature == 3) $nature="purchases";
     							if ($objp->nature == 4) $nature="bank";
     							if ($objp->nature == 1) $nature="various";
     							if ($objp->nature == 9) $nature="hasnew";
-    							
+
     							// To enable when page exists
     							if (empty($conf->global->MAIN_FEATURES_LEVEL))
     							{
-    							    if ($nature == 'various' || $nature == 'hasnew') $nature='';	
+    							    if ($nature == 'various' || $nature == 'hasnew') $nature='';
     							}
-    								
+
     							if ($nature)
     							{
                                     if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
@@ -1275,7 +1275,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
     				$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
     			}
 			}
-			
+
 			// Expeditions
 			if (! empty($conf->expedition->enabled))
 			{
@@ -1299,9 +1299,9 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->projet->enabled))
 			{
 				$langs->load("projects");
-				
+
 				$search_project_user = GETPOST('search_project_user','int');
-				
+
 				// Project affected to user
 				$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("Projects"), 0, $user->rights->projet->lire, '', $mainmenu, 'projects');
 				$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewProject"), 1, $user->rights->projet->creer);
@@ -1314,7 +1314,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/projet/list.php?leftmenu=projects&search_status=99", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire);
                 */
 				$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
-				
+
 				if (empty($conf->global->PROJECT_HIDE_TASKS))
 				{
 					// Project affected to user
@@ -1322,6 +1322,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
 					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("List"), 1, $user->rights->projet->lire);
 					$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewTimeSpent"), 1, $user->rights->projet->lire);
+				    $newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
 
 					// All project i have permission on
 					/*$newmenu->add("/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire && $user->rights->projet->lire);
@@ -1445,7 +1446,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/adherents/stats/index.php?leftmenu=members",$langs->trans("MenuMembersStats"),1,$user->rights->adherent->lire);
 				if (! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && ($usemenuhider || empty($leftmenu) || $leftmenu=="export")) $newmenu->add("/adherents/htpasswd.php?leftmenu=export",$langs->trans("Filehtpasswd"),1,$user->rights->adherent->export);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu=="export") $newmenu->add("/adherents/cartes/carte.php?leftmenu=export",$langs->trans("MembersCards"),1,$user->rights->adherent->export);
-				
+
 				$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members",$langs->trans("Subscriptions"),0,$user->rights->adherent->cotisation->lire);
 				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1,1&amp;mainmenu=members",$langs->trans("NewSubscription"),1,$user->rights->adherent->cotisation->creer);
 				$newmenu->add("/adherents/subscription/list.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->cotisation->lire);
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 3b4e4f4d14f..b3317df9c8e 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -41,6 +41,7 @@ ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
+NbOfTasks=Nb of tasks
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -181,10 +182,12 @@ ProjectOverview=Overview
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbTaskByMonth=Nb of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
 ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
+TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
new file mode 100644
index 00000000000..c0a0530bc75
--- /dev/null
+++ b/htdocs/projet/class/taskstats.class.php
@@ -0,0 +1,471 @@
+<?php
+/* Lead
+ * Copyright (C) 2014-2015 Florian HENRY <florian.henry@open-concept.pro>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php';
+include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+
+
+/**
+ * Class to manage statistics on project tasks
+ */
+class TaskStats extends Stats
+{
+	private $project;
+	public $userid;
+	public $socid;
+	public $year;
+
+	function __construct($db)
+	{
+		global $conf, $user;
+
+		$this->db = $db;
+
+		require_once 'task.class.php';
+		$this->task = new Task($this->db);
+	}
+
+
+	/**
+	 * Return all tasks grouped by status.
+	 *
+	 * @param  int             $limit Limit results
+	 * @return array|int       Array with value or -1 if error
+	 * @throws Exception
+	 */
+	function getAllTaskByStatus($limit = 5)
+	{
+		global $conf, $user, $langs;
+
+		$datay = array ();
+
+		$sql = "SELECT";
+		$sql .= " COUNT(t.rowid), t.priority";
+		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
+		$sql .= $this->buildWhere();
+		//$sql .= " AND t.fk_statut <> 0";     // We want historic also, so all task not draft
+		$sql .= " GROUP BY t.priority";
+
+		$result = array ();
+		$res = array ();
+
+		dol_syslog(get_class($this) . '::' . __METHOD__ . "", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			$other = 0;
+			while ( $i < $num ) {
+				$row = $this->db->fetch_row($resql);
+				if ($i < $limit || $num == $limit)
+				{
+					$result[$i] = array(
+						$row[1],
+						$row[0]
+					);
+				}
+				else
+					$other += $row[1];
+				$i++;
+			}
+			if ($num > $limit)
+				$result[$i] = array (
+						$langs->transnoentitiesnoconv("Other"),
+						$other
+				);
+			$this->db->free($resql);
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . '::' . __METHOD__ . ' ' . $this->error, LOG_ERR);
+			return -1;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Return count, and sum of products
+	 *
+	 * @return array of values
+	 */
+	function getAllByYear()
+	{
+		global $conf, $user, $langs;
+
+		$datay = array ();
+
+		$wonlostfilter=0; // No filter on status WON/LOST
+
+		$sql = "SELECT date_format(t.datec,'%Y') as year, COUNT(t.rowid) as nb";
+		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql.= $this->buildWhere();
+		$sql.= " GROUP BY year";
+		$sql.= $this->db->order('year', 'DESC');
+
+		return $this->_getAllByYear($sql);
+	}
+
+
+	/**
+	 * Build the where part
+	 *
+	 * @return string
+	 */
+	public function buildWhere()
+	{
+		$sqlwhere_str = '';
+		$sqlwhere = array();
+
+		$sqlwhere[] = ' t.entity IN (' . getEntity('project') . ')';
+
+		if (! empty($this->userid))
+			$sqlwhere[] = ' t.fk_user_resp=' . $this->userid;
+		if (! empty($this->socid))
+			$sqlwhere[] = ' t.fk_soc=' . $this->socid;
+		if (! empty($this->year) && empty($this->yearmonth))
+			$sqlwhere[] = " date_format(t.datec,'%Y')='" . $this->db->escape($this->year) . "'";
+		if (! empty($this->yearmonth))
+			$sqlwhere[] = " t.datec BETWEEN '" . $this->db->idate(dol_get_first_day($this->yearmonth)) . "' AND '" . $this->db->idate(dol_get_last_day($this->yearmonth)) . "'";
+
+		if (! empty($this->status))
+			$sqlwhere[] = " t.priority IN (" . $this->priority . ")";
+
+		if (count($sqlwhere) > 0) {
+			$sqlwhere_str = ' WHERE ' . implode(' AND ', $sqlwhere);
+		}
+
+		return $sqlwhere_str;
+	}
+
+	/**
+	 * Return Task number by month for a year
+	 *
+	 * @param int $year scan
+	 * @return array of values
+	 */
+	function getNbByMonth($year)
+	{
+		global $user;
+
+		$this->yearmonth = $year;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(t.rowid) as nb";
+		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+
+		$this->yearmonth=0;
+
+		$res = $this->_getNbByMonth($year, $sql);
+		// var_dump($res);print '<br>';
+		return $res;
+	}
+
+	/**
+	 * Return the Task amount by month for a year
+	 *
+	 * @param int $year scan
+	 * @return array with amount by month
+	 */
+	/*
+	function getAmountByMonth($year)
+	{
+		global $user;
+
+		$this->yearmonth = $year;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(t.rowid)";
+		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+		$this->yearmonth=0;
+
+		$res = $this->_getAmountByMonth($year, $sql);
+		// var_dump($res);print '<br>';
+		return $res;
+	}*/
+
+
+	/**
+	 * Return amount of elements by month for several years
+	 *
+	 * @param	int		$endyear		Start year
+	 * @param	int		$startyear		End year
+	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
+	 * @param   int     $wonlostfilter  Add a filter on status won/lost
+	 * @return 	array					Array of values
+	 */
+    /*
+	function getWeightedAmountByMonthWithPrevYear($endyear,$startyear,$cachedelay=0,$wonlostfilter=1)
+	{
+		global $conf,$user,$langs;
+
+        if ($startyear > $endyear) return -1;
+
+        $datay=array();
+
+        // Search into cache
+        if (! empty($cachedelay))
+        {
+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+        }
+
+        $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_user'.$user->id.'.cache';
+        $newmask='0644';
+
+        $nowgmt = dol_now();
+
+        $foundintocache=0;
+        if ($cachedelay > 0)
+        {
+        	$filedate=dol_filemtime($newpathofdestfile);
+        	if ($filedate >= ($nowgmt - $cachedelay))
+        	{
+        		$foundintocache=1;
+
+        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+        	}
+        	else
+        	{
+        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
+        	}
+        }
+
+        // Load file into $data
+        if ($foundintocache)    // Cache file found and is not too old
+        {
+        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+        	$data = json_decode(file_get_contents($newpathofdestfile), true);
+        }
+        else
+		{
+			$year=$startyear;
+			while($year <= $endyear)
+			{
+				$datay[$year] = $this->getWeightedAmountByMonth($year,$wonlostfilter);
+				$year++;
+			}
+
+			$data = array();
+			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
+			for ($i = 0 ; $i < 12 ; $i++)
+			{
+				$data[$i][]=$datay[$endyear][$i][0];	// set label
+				$year=$startyear;
+				while($year <= $endyear)
+				{
+					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
+					$year++;
+				}
+			}
+		}
+
+		// Save cache file
+		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
+		{
+			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
+			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			$fp = fopen($newpathofdestfile, 'w');
+			if ($fp)
+			{
+				fwrite($fp, json_encode($data));
+				fclose($fp);
+				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				@chmod($newpathofdestfile, octdec($newmask));
+			}
+			else dol_syslog("Failed to write cache file", LOG_ERR);
+			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+		}
+
+		return $data;
+	}
+	*/
+
+
+	/**
+	 * Return the Task weighted opp amount by month for a year.
+	 *
+	 * @param  int $year               Year to scan
+	 * @param  int $wonlostfilter      Add a filter on status won/lost
+	 * @return array                   Array with amount by month
+	 */
+    /*
+	function getWeightedAmountByMonth($year, $wonlostfilter=1)
+	{
+		global $user;
+
+		$this->yearmonth = $year;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm";
+		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+		$this->yearmonth=0;
+
+		$res = $this->_getAmountByMonth($year, $sql);
+		// var_dump($res);print '<br>';
+		return $res;
+	}*/
+
+	/**
+	 * Return amount of elements by month for several years
+	 *
+	 * @param int $endyear		End year
+	 * @param int $startyear	Start year
+	 * @param int $cachedelay accept for cache file (0=No read, no save of cache, -1=No read but save)
+	 * @return array of values
+	 */
+    /*
+	function getTransformRateByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0)
+	{
+		global $conf, $user, $langs;
+
+		if ($startyear > $endyear) return - 1;
+
+		$datay = array();
+
+		// Search into cache
+		if (! empty($cachedelay))
+		{
+			include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+			include_once DOL_DOCUMENT_ROOT . '/core/lib/json.lib.php';
+		}
+
+		$newpathofdestfile = $conf->user->dir_temp . '/' . get_class($this) . '_' . __FUNCTION__ . '_' . (empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix . '_') . $langs->defaultlang . '_user' . $user->id . '.cache';
+		$newmask = '0644';
+
+		$nowgmt = dol_now();
+
+		$foundintocache = 0;
+		if ($cachedelay > 0) {
+			$filedate = dol_filemtime($newpathofdestfile);
+			if ($filedate >= ($nowgmt - $cachedelay)) {
+				$foundintocache = 1;
+
+				$this->_lastfetchdate[get_class($this) . '_' . __FUNCTION__] = $filedate;
+			} else {
+				dol_syslog(get_class($this) . '::' . __FUNCTION__ . " cache file " . $newpathofdestfile . " is not found or older than now - cachedelay (" . $nowgmt . " - " . $cachedelay . ") so we can't use it.");
+			}
+		}
+
+		// Load file into $data
+		if ($foundintocache) // Cache file found and is not too old
+		{
+			dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . ".");
+			$data = json_decode(file_get_contents($newpathofdestfile), true);
+		} else {
+			$year = $startyear;
+			while ( $year <= $endyear ) {
+				$datay[$year] = $this->getTransformRateByMonth($year);
+				$year ++;
+			}
+
+			$data = array ();
+			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
+			for($i = 0; $i < 12; $i ++) {
+				$data[$i][] = $datay[$endyear][$i][0]; // set label
+				$year = $startyear;
+				while ( $year <= $endyear ) {
+					$data[$i][] = $datay[$year][$i][1]; // set yval for x=i
+					$year ++;
+				}
+			}
+		}
+
+		// Save cache file
+		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == - 1)) {
+			dol_syslog(get_class($this) . '::' . __FUNCTION__ . " save cache file " . $newpathofdestfile . " onto disk.");
+			if (! dol_is_dir($conf->user->dir_temp))
+				dol_mkdir($conf->user->dir_temp);
+			$fp = fopen($newpathofdestfile, 'w');
+			fwrite($fp, json_encode($data));
+			fclose($fp);
+			if (! empty($conf->global->MAIN_UMASK))
+				$newmask = $conf->global->MAIN_UMASK;
+			@chmod($newpathofdestfile, octdec($newmask));
+
+			$this->_lastfetchdate[get_class($this) . '_' . __FUNCTION__] = $nowgmt;
+		}
+
+		return $data;
+	}*/
+
+	/**
+	 * Return the Task transformation rate by month for a year
+	 *
+	 * @param int $year scan
+	 * @return array with amount by month
+	 */
+	/*
+	function getTransformRateByMonth($year)
+	{
+		global $user;
+
+		$this->yearmonth = $year;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.rowid)";
+		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+
+		$res_total = $this->_getNbByMonth($year, $sql);
+
+		$this->status=6;
+
+		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.rowid)";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "projet_task as t";
+		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= $this->buildWhere();
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+
+		$this->status=0;
+		$this->yearmonth=0;
+
+		$res_only_wined = $this->_getNbByMonth($year, $sql);
+
+		$res=array();
+
+		foreach($res_total as $key=>$total_row) {
+			//var_dump($total_row);
+			if (!empty($total_row[1])) {
+				$res[$key]=array($total_row[0],(100*$res_only_wined[$key][1])/$total_row[1]);
+			} else {
+				$res[$key]=array($total_row[0],0);
+			}
+
+		}
+		// var_dump($res);print '<br>';
+		return $res;
+	}*/
+}
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
new file mode 100644
index 00000000000..b03d01a8006
--- /dev/null
+++ b/htdocs/projet/tasks/stats/index.php
@@ -0,0 +1,218 @@
+<?php
+/* Copyright (C) 2014-2015 Florian HENRY       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015      Laurent Destailleur <ldestailleur@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/projet/tasks/stats/index.php
+ *       \ingroup    project
+ *       \brief      Page for tasks statistics
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/taskstats.class.php';
+
+// Security check
+if (! $user->rights->projet->lire)
+	accessforbidden();
+
+
+$WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
+$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
+
+$userid=GETPOST('userid','int');
+$socid=GETPOST('socid','int');
+// Security check
+if ($user->societe_id > 0)
+{
+	$action = '';
+	$socid = $user->societe_id;
+}
+$nowyear=strftime("%Y", dol_now());
+$year = GETPOST('year')>0?GETPOST('year'):$nowyear;
+//$startyear=$year-2;
+$startyear=$year-1;
+$endyear=$year;
+
+$langs->load('companies');
+$langs->load('projects');
+
+
+/*
+ * View
+ */
+
+$form=new Form($db);
+
+$includeuserlist=array();
+
+
+llxHeader('', $langs->trans('Tasks'));
+
+$title=$langs->trans("TasksStatistics");
+$dir=$conf->projet->dir_output.'/temp';
+
+print load_fiche_titre($title,'','title_project.png');
+
+dol_mkdir($dir);
+
+
+$stats_tasks= new TaskStats($db);
+if (!empty($userid) && $userid!=-1) $stats_tasks->userid=$userid;
+if (!empty($socid)  && $socid!=-1) $stats_tasks->socid=$socid;
+if (!empty($year)) $stats_tasks->year=$year;
+
+
+
+// Build graphic number of object
+// $data = array(array('Lib',val1,val2,val3),...)
+$data = $stats_tasks->getNbByMonthWithPrevYear($endyear,$startyear);
+//var_dump($data);
+
+$filenamenb = $conf->project->dir_output . "/stats/tasknbprevyear-".$year.".png";
+$fileurlnb = DOL_URL_ROOT . '/viewimage.php?modulepart=taskstats&amp;file=tasknbprevyear-'.$year.'.png';
+
+$px1 = new DolGraph();
+$mesg = $px1->isGraphKo();
+if (! $mesg)
+{
+	$px1->SetData($data);
+	$px1->SetPrecisionY(0);
+	$i=$startyear;$legend=array();
+	while ($i <= $endyear)
+	{
+		$legend[]=$i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("ProjectNbTask"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->SetPrecisionY(0);
+	$px1->mode='depth';
+	$px1->SetTitle($langs->trans("ProjectNbTaskByMonth"));
+
+	$px1->draw($filenamenb,$fileurlnb);
+}
+
+
+// Show array
+$stats_tasks->year=0;
+$data_all_year = $stats_tasks->getAllByYear();
+
+if (!empty($year)) $stats_tasks->year=$year;
+$arrayyears=array();
+foreach($data_all_year as $val) {
+	$arrayyears[$val['year']]=$val['year'];
+}
+if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
+
+
+$h=0;
+$head = array();
+$head[$h][0] = DOL_URL_ROOT . '/projet/tasks/stats/index.php?mode='.$mode;
+$head[$h][1] = $langs->trans("ByMonthYear");
+$head[$h][2] = 'byyear';
+$h++;
+
+complete_head_from_modules($conf,$langs,null,$head,$h,$type);
+
+dol_fiche_head($head,'byyear',$langs->trans("Statistics"), -1, '');
+
+
+print '<div class="fichecenter"><div class="fichethirdleft">';
+
+print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+// Company
+/*print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
+if ($mode == 'customer') $filter='s.client in (1,2,3)';
+if ($mode == 'supplier') $filter='s.fournisseur = 1';
+print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
+print '</td></tr>';
+*/
+// User
+/*print '<tr><td>'.$langs->trans("ProjectCommercial").'</td><td>';
+print $form->select_dolusers($userid, 'userid', 1, array(),0,$includeuserlist);
+print '</td></tr>';*/
+// Year
+print '<tr><td>'.$langs->trans("Year").'</td><td>';
+if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
+if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+arsort($arrayyears);
+print $form->selectarray('year',$arrayyears,$year,0);
+print '</td></tr>';
+print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '</table>';
+print '</form>';
+print '<br><br>';
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre" height="24">';
+print '<td align="center">'.$langs->trans("Year").'</td>';
+print '<td align="right">'.$langs->trans("NbOfTasks").'</td>';
+print '</tr>';
+
+$oldyear=0;
+$var=true;
+foreach ($data_all_year as $val)
+{
+	$year = $val['year'];
+	while ($year && $oldyear > $year+1)
+	{	// If we have empty year
+		$oldyear--;
+
+		print '<tr '.$bc[$var].' height="24">';
+		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
+		print '<td align="right">0</td>';
+		print '</tr>';
+	}
+
+	print '<tr '.$bc[$var].' height="24">';
+	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
+	print '<td align="right">'.$val['nb'].'</td>';
+	print '</tr>';
+	$oldyear=$year;
+}
+
+print '</table>';
+
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+$stringtoshow.= '<table class="border" width="100%"><tr valign="top"><td align="center">';
+if ($mesg) { print $mesg; }
+else {
+	$stringtoshow.= $px1->show();
+	$stringtoshow.= "<br>\n";
+}
+$stringtoshow.= '</td></tr></table>';
+
+print $stringtoshow;
+
+
+print '</div></div></div>';
+print '<div style="clear:both"></div>';
+
+
+llxFooter();
+$db->close();

From bfa50b8d1d8574151d9bdac304d487f84f39da0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 19:36:03 +0200
Subject: [PATCH 1008/1163] Fix some security issues

---
 htdocs/projet/class/projectstats.class.php |  41 +--
 htdocs/projet/class/taskstats.class.php    | 297 +--------------------
 2 files changed, 27 insertions(+), 311 deletions(-)

diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 4485117fb0f..a47d28d1b43 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -28,8 +28,8 @@ class ProjectStats extends Stats
 	public $userid;
 	public $socid;
 	public $year;
-	
-	function __construct($db) 
+
+	function __construct($db)
 	{
 		global $conf, $user;
 
@@ -41,7 +41,7 @@ class ProjectStats extends Stats
 
 
 	/**
-	 * Return all leads grouped by status.
+	 * Return all leads grouped by opportunity status.
 	 * Warning: There is no filter on WON/LOST because we want this for statistics.
 	 *
 	 * @param  int             $limit Limit results
@@ -56,7 +56,10 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT";
 		$sql .= " SUM(t.opp_amount), t.fk_opp_status, cls.code, cls.label";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t, ".MAIN_DB_PREFIX."c_lead_status as cls";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
+		if (! $user->rights->societe->client->voir && ! $user->socid)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
+		$sql .= ", ".MAIN_DB_PREFIX."c_lead_status as cls";
 		$sql .= $this->buildWhere();
 		$sql .= " AND t.fk_opp_status = cls.rowid";
 		$sql .= " AND t.fk_statut <> 0";     // We want historic also, so all projects not draft
@@ -112,11 +115,11 @@ class ProjectStats extends Stats
 		$datay = array ();
 
 		$wonlostfilter=0; // No filter on status WON/LOST
-		
+
 		$sql = "SELECT date_format(t.datec,'%Y') as year, COUNT(t.rowid) as nb, SUM(t.opp_amount) as total, AVG(t.opp_amount) as avg,";
 		$sql.= " SUM(t.opp_amount * ".$this->db->ifsql("t.opp_percent IS NULL".($wonlostfilter?" OR cls.code IN ('WON','LOST')":""), '0', 't.opp_percent')." / 100) as weighted";
 		$sql.= " FROM " . MAIN_DB_PREFIX . "projet as t LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls ON cls.rowid = t.fk_opp_status";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql.= $this->buildWhere();
 		$sql.= " GROUP BY year";
@@ -124,14 +127,14 @@ class ProjectStats extends Stats
 
 		return $this->_getAllByYear($sql);
 	}
-	
-	
+
+
 	/**
 	 * Build the where part
-	 * 
+	 *
 	 * @return string
 	 */
-	public function buildWhere() 
+	public function buildWhere()
 	{
 		$sqlwhere_str = '';
 		$sqlwhere = array();
@@ -163,7 +166,7 @@ class ProjectStats extends Stats
 	 * @param int $year scan
 	 * @return array of values
 	 */
-	function getNbByMonth($year) 
+	function getNbByMonth($year)
 	{
 		global $user;
 
@@ -171,7 +174,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
@@ -190,7 +193,7 @@ class ProjectStats extends Stats
 	 * @param int $year scan
 	 * @return array with amount by month
 	 */
-	function getAmountByMonth($year) 
+	function getAmountByMonth($year)
 	{
 		global $user;
 
@@ -198,7 +201,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, SUM(t.opp_amount)";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
@@ -313,7 +316,7 @@ class ProjectStats extends Stats
 	 * @param  int $wonlostfilter      Add a filter on status won/lost
 	 * @return array                   Array with amount by month
 	 */
-	function getWeightedAmountByMonth($year, $wonlostfilter=1) 
+	function getWeightedAmountByMonth($year, $wonlostfilter=1)
 	{
 		global $user;
 
@@ -321,7 +324,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, SUM(t.opp_amount * ".$this->db->ifsql("t.opp_percent IS NULL".($wonlostfilter?" OR cls.code IN ('WON','LOST')":""), '0', 't.opp_percent')." / 100)";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t LEFT JOIN ".MAIN_DB_PREFIX.'c_lead_status as cls ON t.fk_opp_status = cls.rowid';
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
@@ -421,7 +424,7 @@ class ProjectStats extends Stats
 	 * @param int $year scan
 	 * @return array with amount by month
 	 */
-	function getTransformRateByMonth($year) 
+	function getTransformRateByMonth($year)
 	{
 		global $user;
 
@@ -429,7 +432,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.opp_amount)";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
@@ -441,7 +444,7 @@ class ProjectStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.opp_amount)";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index c0a0530bc75..b71c88f3d6b 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -51,11 +51,13 @@ class TaskStats extends Stats
 	{
 		global $conf, $user, $langs;
 
-		$datay = array ();
+		$datay = array();
 
 		$sql = "SELECT";
 		$sql .= " COUNT(t.rowid), t.priority";
 		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
+			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		//$sql .= " AND t.fk_statut <> 0";     // We want historic also, so all task not draft
 		$sql .= " GROUP BY t.priority";
@@ -112,7 +114,7 @@ class TaskStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%Y') as year, COUNT(t.rowid) as nb";
 		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql.= $this->buildWhere();
 		$sql.= " GROUP BY year";
@@ -167,7 +169,7 @@ class TaskStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(t.rowid) as nb";
 		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
+		if (! $user->rights->societe->client->voir && ! $user->soc_id)
 			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
@@ -179,293 +181,4 @@ class TaskStats extends Stats
 		// var_dump($res);print '<br>';
 		return $res;
 	}
-
-	/**
-	 * Return the Task amount by month for a year
-	 *
-	 * @param int $year scan
-	 * @return array with amount by month
-	 */
-	/*
-	function getAmountByMonth($year)
-	{
-		global $user;
-
-		$this->yearmonth = $year;
-
-		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(t.rowid)";
-		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
-			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
-		$sql .= $this->buildWhere();
-		$sql .= " GROUP BY dm";
-		$sql .= $this->db->order('dm', 'DESC');
-		$this->yearmonth=0;
-
-		$res = $this->_getAmountByMonth($year, $sql);
-		// var_dump($res);print '<br>';
-		return $res;
-	}*/
-
-
-	/**
-	 * Return amount of elements by month for several years
-	 *
-	 * @param	int		$endyear		Start year
-	 * @param	int		$startyear		End year
-	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
-	 * @param   int     $wonlostfilter  Add a filter on status won/lost
-	 * @return 	array					Array of values
-	 */
-    /*
-	function getWeightedAmountByMonthWithPrevYear($endyear,$startyear,$cachedelay=0,$wonlostfilter=1)
-	{
-		global $conf,$user,$langs;
-
-        if ($startyear > $endyear) return -1;
-
-        $datay=array();
-
-        // Search into cache
-        if (! empty($cachedelay))
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-        }
-
-        $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_user'.$user->id.'.cache';
-        $newmask='0644';
-
-        $nowgmt = dol_now();
-
-        $foundintocache=0;
-        if ($cachedelay > 0)
-        {
-        	$filedate=dol_filemtime($newpathofdestfile);
-        	if ($filedate >= ($nowgmt - $cachedelay))
-        	{
-        		$foundintocache=1;
-
-        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-        	}
-        	else
-        	{
-        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
-        	}
-        }
-
-        // Load file into $data
-        if ($foundintocache)    // Cache file found and is not too old
-        {
-        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
-        }
-        else
-		{
-			$year=$startyear;
-			while($year <= $endyear)
-			{
-				$datay[$year] = $this->getWeightedAmountByMonth($year,$wonlostfilter);
-				$year++;
-			}
-
-			$data = array();
-			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
-			for ($i = 0 ; $i < 12 ; $i++)
-			{
-				$data[$i][]=$datay[$endyear][$i][0];	// set label
-				$year=$startyear;
-				while($year <= $endyear)
-				{
-					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
-					$year++;
-				}
-			}
-		}
-
-		// Save cache file
-		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
-		{
-			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
-			$fp = fopen($newpathofdestfile, 'w');
-			if ($fp)
-			{
-				fwrite($fp, json_encode($data));
-				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-				@chmod($newpathofdestfile, octdec($newmask));
-			}
-			else dol_syslog("Failed to write cache file", LOG_ERR);
-			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
-		}
-
-		return $data;
-	}
-	*/
-
-
-	/**
-	 * Return the Task weighted opp amount by month for a year.
-	 *
-	 * @param  int $year               Year to scan
-	 * @param  int $wonlostfilter      Add a filter on status won/lost
-	 * @return array                   Array with amount by month
-	 */
-    /*
-	function getWeightedAmountByMonth($year, $wonlostfilter=1)
-	{
-		global $user;
-
-		$this->yearmonth = $year;
-
-		$sql = "SELECT date_format(t.datec,'%m') as dm";
-		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
-			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
-		$sql .= $this->buildWhere();
-		$sql .= " GROUP BY dm";
-		$sql .= $this->db->order('dm', 'DESC');
-		$this->yearmonth=0;
-
-		$res = $this->_getAmountByMonth($year, $sql);
-		// var_dump($res);print '<br>';
-		return $res;
-	}*/
-
-	/**
-	 * Return amount of elements by month for several years
-	 *
-	 * @param int $endyear		End year
-	 * @param int $startyear	Start year
-	 * @param int $cachedelay accept for cache file (0=No read, no save of cache, -1=No read but save)
-	 * @return array of values
-	 */
-    /*
-	function getTransformRateByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0)
-	{
-		global $conf, $user, $langs;
-
-		if ($startyear > $endyear) return - 1;
-
-		$datay = array();
-
-		// Search into cache
-		if (! empty($cachedelay))
-		{
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/json.lib.php';
-		}
-
-		$newpathofdestfile = $conf->user->dir_temp . '/' . get_class($this) . '_' . __FUNCTION__ . '_' . (empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix . '_') . $langs->defaultlang . '_user' . $user->id . '.cache';
-		$newmask = '0644';
-
-		$nowgmt = dol_now();
-
-		$foundintocache = 0;
-		if ($cachedelay > 0) {
-			$filedate = dol_filemtime($newpathofdestfile);
-			if ($filedate >= ($nowgmt - $cachedelay)) {
-				$foundintocache = 1;
-
-				$this->_lastfetchdate[get_class($this) . '_' . __FUNCTION__] = $filedate;
-			} else {
-				dol_syslog(get_class($this) . '::' . __FUNCTION__ . " cache file " . $newpathofdestfile . " is not found or older than now - cachedelay (" . $nowgmt . " - " . $cachedelay . ") so we can't use it.");
-			}
-		}
-
-		// Load file into $data
-		if ($foundintocache) // Cache file found and is not too old
-		{
-			dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . ".");
-			$data = json_decode(file_get_contents($newpathofdestfile), true);
-		} else {
-			$year = $startyear;
-			while ( $year <= $endyear ) {
-				$datay[$year] = $this->getTransformRateByMonth($year);
-				$year ++;
-			}
-
-			$data = array ();
-			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
-			for($i = 0; $i < 12; $i ++) {
-				$data[$i][] = $datay[$endyear][$i][0]; // set label
-				$year = $startyear;
-				while ( $year <= $endyear ) {
-					$data[$i][] = $datay[$year][$i][1]; // set yval for x=i
-					$year ++;
-				}
-			}
-		}
-
-		// Save cache file
-		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == - 1)) {
-			dol_syslog(get_class($this) . '::' . __FUNCTION__ . " save cache file " . $newpathofdestfile . " onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp))
-				dol_mkdir($conf->user->dir_temp);
-			$fp = fopen($newpathofdestfile, 'w');
-			fwrite($fp, json_encode($data));
-			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
-				$newmask = $conf->global->MAIN_UMASK;
-			@chmod($newpathofdestfile, octdec($newmask));
-
-			$this->_lastfetchdate[get_class($this) . '_' . __FUNCTION__] = $nowgmt;
-		}
-
-		return $data;
-	}*/
-
-	/**
-	 * Return the Task transformation rate by month for a year
-	 *
-	 * @param int $year scan
-	 * @return array with amount by month
-	 */
-	/*
-	function getTransformRateByMonth($year)
-	{
-		global $user;
-
-		$this->yearmonth = $year;
-
-		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.rowid)";
-		$sql.= " FROM ". MAIN_DB_PREFIX . "projet_task as t INNER JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = t.fk_projet";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
-			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
-		$sql .= $this->buildWhere();
-		$sql .= " GROUP BY dm";
-		$sql .= $this->db->order('dm', 'DESC');
-
-		$res_total = $this->_getNbByMonth($year, $sql);
-
-		$this->status=6;
-
-		$sql = "SELECT date_format(t.datec,'%m') as dm, count(t.rowid)";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "projet_task as t";
-		if (! $user->rights->societe->client->voir && ! $user->societe_id)
-			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=" . $user->id;
-		$sql .= $this->buildWhere();
-		$sql .= " GROUP BY dm";
-		$sql .= $this->db->order('dm', 'DESC');
-
-		$this->status=0;
-		$this->yearmonth=0;
-
-		$res_only_wined = $this->_getNbByMonth($year, $sql);
-
-		$res=array();
-
-		foreach($res_total as $key=>$total_row) {
-			//var_dump($total_row);
-			if (!empty($total_row[1])) {
-				$res[$key]=array($total_row[0],(100*$res_only_wined[$key][1])/$total_row[1]);
-			} else {
-				$res[$key]=array($total_row[0],0);
-			}
-
-		}
-		// var_dump($res);print '<br>';
-		return $res;
-	}*/
 }

From 9e629bdb0290561813a1ebe22d40828132301c6a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 20:01:25 +0200
Subject: [PATCH 1009/1163] Work on modulebuilder

---
 htdocs/core/class/interfaces.class.php            |  14 +++++++-------
 htdocs/core/lib/functions.lib.php                 |   1 +
 .../modulebuilder/template/img/object_mytest.png  | Bin 0 -> 360 bytes
 htdocs/theme/eldy/style.css.php                   |   2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 htdocs/modulebuilder/template/img/object_mytest.png

diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index cd4a56f4174..625b30e3ac2 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -76,14 +76,14 @@ class Interfaces
             global $db;
             $user = new User($db);
         }
-        
+
         $nbfile = $nbtotal = $nbok = $nbko = 0;
 
         $files = array();
         $modules = array();
         $orders = array();
 		$i=0;
-		
+
 		$dirtriggers=array_merge(array('/core/triggers'),$conf->modules_parts['triggers']);
         foreach($dirtriggers as $reldir)
         {
@@ -106,7 +106,7 @@ class Interfaces
 						$part3=$reg[3];
 
                         $nbfile++;
-                        
+
                         // Check if trigger file is disabled by name
                         if (preg_match('/NORUN$/i',$file)) continue;
                         // Check if trigger file is for a particular module
@@ -132,7 +132,7 @@ class Interfaces
                             dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);
                             continue;
                         }
-                        
+
                         try {
                             //print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";
                             include_once $newdir.'/'.$file;
@@ -142,7 +142,7 @@ class Interfaces
                         {
                             dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);
                         }
-                        
+
                         $modules[$i] = $modName;
                         $files[$i] = $file;
                         $fullpathfiles[$modName] = $newdir.'/'.$file;
@@ -155,7 +155,7 @@ class Interfaces
         }
 
         asort($orders);
-        
+
         // Loop on each trigger
         foreach ($orders as $key => $value)
         {
@@ -246,7 +246,7 @@ class Interfaces
         {
         	$dirtriggers=$forcedirtriggers;
         }
-        	
+
         foreach($dirtriggers as $reldir)
         {
             $dir=dol_buildpath($reldir,0);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ef03b0c00cc..3569cdd006d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2556,6 +2556,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			$picto = $regs[1];
 			$path = $regs[2];	// $path is $mymodule
 		}
+
 		// Clean parameters
 		if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto .= '.png';
 		// If alt path are defined, define url where img file is, according to physical path
diff --git a/htdocs/modulebuilder/template/img/object_mytest.png b/htdocs/modulebuilder/template/img/object_mytest.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a307bfc62f85df909a3cf024f27ee87d44be275
GIT binary patch
literal 360
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xamSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt)eIT^vI+
zChono-m4{0gyqBiz=Ju)w^;&N<{#X1a0!1><Y%Q{d~D5Uw;i2s5YZwkcu^%vjOU;9
z;kxeEpK=W=9!xuY=FUv(?UR0-KJ&M;m376cVx6Rpy(;rBA6R8|OzYm{5|xWL-acNe
zILqe75o^6;yQR|Ctg@T8v309Tyzut9rW>bC%GsW3bBL=<%|p84;9-@5SwA|2OIEL%
zb=QtBT0T9C&(LA{syqXqqW_DHn`b;(x5}@uA-g2{Ncy)Mhpp~Sy0eY()*3IP6|4C4
z(mDEHWvtPCEP7WZe7{4e?P9&>AE%^j|Mz!&9rL?{G_w^d>;^y&GkCiCxvX<aXaWE|
CJd*hU

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 1240f091cc0..3912a9b80ff 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2850,7 +2850,7 @@ span.dashboardlineko {
     padding: 1px 2px 1px 2px;
     border-radius: .25em;
 
-    background-color: #af4705;
+    background-color: #9f4705;
     padding: 0px 5px 0px 5px;
     top: -26px;
 }

From 5e298179103c2c76b680788353d71c3fad79b4b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 20:17:08 +0200
Subject: [PATCH 1010/1163] Init of the onlinesign

---
 htdocs/public/onlinesign/newonlinesign.php | 640 +++++++++++++++++++++
 1 file changed, 640 insertions(+)
 create mode 100644 htdocs/public/onlinesign/newonlinesign.php

diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
new file mode 100644
index 00000000000..73d9f41eab0
--- /dev/null
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -0,0 +1,640 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For paypal test: https://developer.paypal.com/
+ * For paybox test: ???
+ */
+
+/**
+ *     	\file       htdocs/public/onlinesign/newsign.php
+ *		\ingroup    core
+ *		\brief      File to offer a way to make an online signature for a particular Dolibarr entity
+ */
+
+define("NOLOGIN",1);		// This means this output page does not require to be logged.
+define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+// Security check
+// No check on module enabled. Done later according to $validpaymentmethod
+
+$langs->load("main");
+$langs->load("other");
+$langs->load("dict");
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("errors");
+$langs->load("paybox");     // File with generic data
+
+$action=GETPOST('action','alpha');
+
+// Input are:
+// type ('invoice','order','contractline'),
+// id (object id),
+// amount (required if id is empty),
+// tag (a free text, required if type is empty)
+// currency (iso code)
+
+$suffix=GETPOST("suffix",'alpha');
+$SOURCE=GETPOST("source",'alpha');
+$ref=$REF=GETPOST("ref",'alpha');
+
+if (! $action)
+{
+    if ($source && ! $ref)
+    {
+    	dol_print_error('',$langs->trans('ErrorBadParameters')." - ref");
+    	exit;
+    }
+}
+
+
+$paymentmethod='';
+$validpaymentmethod=array();
+
+
+
+
+// Define $urlwithroot
+//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
+
+
+// Complete urls for post treatment
+$SECUREKEY=GETPOST("securekey");	        // Secure key
+
+if (! empty($SOURCE))
+{
+    $urlok.='source='.urlencode($SOURCE).'&';
+    $urlko.='source='.urlencode($SOURCE).'&';
+}
+if (! empty($REF))
+{
+    $urlok.='ref='.urlencode($REF).'&';
+    $urlko.='ref='.urlencode($REF).'&';
+}
+if (! empty($SECUREKEY))
+{
+    $urlok.='securekey='.urlencode($SECUREKEY).'&';
+    $urlko.='securekey='.urlencode($SECUREKEY).'&';
+}
+if (! empty($entity))
+{
+	$urlok.='entity='.urlencode($entity).'&';
+	$urlko.='entity='.urlencode($entity).'&';
+}
+$urlok=preg_replace('/&$/','',$urlok);  // Remove last &
+$urlko=preg_replace('/&$/','',$urlko);  // Remove last &
+
+
+
+
+/*
+ * Actions
+ */
+
+
+if ($action == 'dosign')
+{
+    // TODO
+
+}
+
+
+/*
+ * View
+ */
+
+$head='';
+if (! empty($conf->global->MAIN_SIGN_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->MAIN_SIGN_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu=1;
+$conf->dol_hide_leftmenu=1;
+
+llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
+
+// Check link validity
+if (! empty($SOURCE) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
+{
+    $langs->load("errors");
+    dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $SOURCE, $ref));
+    llxFooter();
+    $db->close();
+    exit;
+}
+
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+print '<input type="hidden" name="action" value="dosign">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
+print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print "\n";
+print '<!-- Form to sign -->'."\n";
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
+// Show logo (search order: logo defined by PAYBOX_LOGO_suffix, then PAYBOX_LOGO, then small company logo, large company logo, theme logo, common logo)
+$width=0;
+// Define logo and logosmall
+$logosmall=$mysoc->logo_small;
+$logo=$mysoc->logo;
+$paramlogo='ONLINE_SIGN_LOGO_'.$suffix;
+if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
+else if (! empty($conf->global->ONLINE_SIGN_LOGO)) $logosmall=$conf->global->ONLINE_SIGN_LOGO;
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo='';
+if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
+{
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
+}
+elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+{
+	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
+	$width=96;
+}
+// Output html code for logo
+if ($urllogo)
+{
+	print '<tr>';
+	print '<td align="center"><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
+	if ($width) print ' width="'.$width.'"';
+	print '></td>';
+	print '</tr>'."\n";
+}
+
+// Output introduction text
+$text='';
+if (! empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT))
+{
+    $langs->load("members");
+    if (preg_match('/^\((.*)\)$/',$conf->global->ONLINE_SIGN_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+}
+if (empty($text))
+{
+    $text.='<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnOnlineSignaturePage").'</strong><br></td></tr>'."\n";
+    $text.='<tr><td class="textpublicpayment"><br>'.$langs->trans("ThisScreenAllowsYouToSignDocFrom",$creditor).'<br><br></td></tr>'."\n";
+}
+print $text;
+
+// Output payment summary form
+print '<tr><td align="center">';
+print '<table with="100%" id="tablepublicpayment">';
+print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnDocumentToSign").' :</td></tr>'."\n";
+
+$found=false;
+$error=0;
+$var=false;
+
+// Free payment
+if (! GETPOST("source"))
+{
+	$found=true;
+	$tag=GETPOST("tag");
+	$fulltag=$tag;
+
+	// Creditor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+
+
+    // We do not add fields shipToName, shipToStreet, shipToCity, shipToState, shipToCountryCode, shipToZip, shipToStreet2, phoneNum
+    // as they don't exists (buyer is unknown, tag is free).
+}
+
+
+// Payment on customer order
+if (GETPOST("source") == 'order')
+{
+	$found=true;
+	$langs->load("orders");
+
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
+	$order=new Commande($db);
+	$result=$order->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$order->error;
+		$error++;
+	}
+	else
+	{
+		$result=$order->fetch_thirdparty($order->socid);
+	}
+
+	// Creditor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
+
+	// Object
+
+	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$order->ref.'">';
+	print '</td></tr>'."\n";
+
+
+}
+
+
+// Payment on customer invoice
+if (GETPOST("source") == 'invoice')
+{
+	$found=true;
+	$langs->load("bills");
+
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+	$invoice=new Facture($db);
+	$result=$invoice->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$invoice->error;
+		$error++;
+	}
+	else
+	{
+		$result=$invoice->fetch_thirdparty($invoice->socid);
+	}
+
+    if ($action != 'dosign') // Do not change amount if we just click on first dosign
+    {
+    	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+
+	// Creditor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
+
+	// Object
+
+	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$invoice->ref.'">';
+	print '</td></tr>'."\n";
+
+}
+
+// Payment on contract line
+if (GETPOST("source") == 'contractline')
+{
+	$found=true;
+	$langs->load("contracts");
+
+	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+
+	$contractline=new ContratLigne($db);
+	$result=$contractline->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$contractline->error;
+		$error++;
+	}
+	else
+	{
+		if ($contractline->fk_contrat > 0)
+		{
+			$contract=new Contrat($db);
+			$result=$contract->fetch($contractline->fk_contrat);
+			if ($result > 0)
+			{
+				$result=$contract->fetch_thirdparty($contract->socid);
+			}
+			else
+			{
+				$mesg=$contract->error;
+				$error++;
+			}
+		}
+		else
+		{
+			$mesg='ErrorRecordNotFound';
+			$error++;
+		}
+	}
+
+    if ($action != 'dosign') // Do not change amount if we just click on first dosign
+    {
+    	$amount=$contractline->total_ttc;
+    	if ($contractline->fk_product)
+    	{
+    		$product=new Product($db);
+    		$result=$product->fetch($contractline->fk_product);
+
+    		// We define price for product (TODO Put this in a method in product class)
+    		if (! empty($conf->global->PRODUIT_MULTIPRICES))
+    		{
+    			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
+    			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
+    			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
+    		}
+    		else
+    		{
+    			$pu_ht = $product->price;
+    			$pu_ttc = $product->price_ttc;
+    			$price_base_type = $product->price_base_type;
+    		}
+
+    		$amount=$pu_ttc;
+    		if (empty($amount))
+    		{
+    			dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+    			exit;
+    		}
+    	}
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+
+	$qty=1;
+	if (GETPOST('qty')) $qty=GETPOST('qty');
+
+	// Creditor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
+
+	// Debitor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
+
+	// Object
+
+	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
+	if ($contractline->fk_product)
+	{
+		$text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
+	}
+	if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
+	//if ($contractline->date_fin_validite) {
+	//	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
+	//	$text.=dol_print_date($contractline->date_fin_validite);
+	//}
+	if ($contractline->date_fin_validite)
+	{
+		$text.='<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
+	}
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$contractline->ref.'">';
+	print '</td></tr>'."\n";
+
+	// Quantity
+
+	$label=$langs->trans("Quantity");
+	$qty=1;
+	$duration='';
+	if ($contractline->fk_product)
+	{
+		if ($product->isService() && $product->duration_value > 0)
+		{
+			$label=$langs->trans("Duration");
+
+			// TODO Put this in a global method
+			if ($product->duration_value > 1)
+			{
+				$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
+			}
+			else
+			{
+				$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
+			}
+			$duration=$product->duration_value.' '.$dur[$product->duration_unit];
+		}
+	}
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$label.'</td>';
+	print '<td class="CTableRow'.($var?'1':'2').'"><b>'.($duration?$duration:$qty).'</b>';
+	print '<input type="hidden" name="newqty" value="'.dol_escape_htmltag($qty).'">';
+	print '</b></td></tr>'."\n";
+
+	// Amount
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
+	}
+	else {
+		print '<b>'.price($amount).'</b>';
+        print '<input type="hidden" name="amount" value="'.$amount.'">';
+		print '<input type="hidden" name="newamount" value="'.$amount.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+}
+
+// Payment on member subscription
+if (GETPOST("source") == 'membersubscription')
+{
+	$found=true;
+	$langs->load("members");
+
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
+
+	$member=new Adherent($db);
+	$result=$member->fetch('',$ref);
+	if ($result < 0)
+	{
+		$mesg=$member->error;
+		$error++;
+	}
+	else
+	{
+		$subscription=new Subscription($db);
+	}
+
+    if ($action != 'dosign') // Do not change amount if we just click on first dosign
+    {
+    	$amount=$subscription->total_ttc;
+        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        $amount=price2num($amount);
+    }
+
+	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
+	$fulltag=dol_string_unaccent($fulltag);
+
+	// Creditor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
+    print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+    print '</td></tr>'."\n";
+
+	// Debitor
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
+	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
+	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
+	else print $member->getFullName($langs);
+	print '</b>';
+
+	// Object
+
+	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.GETPOST("source",'alpha').'">';
+	print '<input type="hidden" name="ref" value="'.$member->ref.'">';
+	print '</td></tr>'."\n";
+
+	if ($member->last_subscription_date || $member->last_subscription_amount)
+	{
+		// Last subscription date
+
+		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
+		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
+		print '</td></tr>'."\n";
+
+		// Last subscription amount
+
+		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
+		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
+		print '</td></tr>'."\n";
+
+		if (empty($amount) && ! GETPOST('newamount')) $_GET['newamount']=$member->last_subscription_amount;
+	}
+
+	// Amount
+
+	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	if (empty($amount))
+	{
+		print ' ('.$langs->trans("ToComplete");
+		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		print ')';
+	}
+	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	if (empty($amount) || ! is_numeric($amount))
+	{
+	    $valtoshow=GETPOST("newamount",'int');
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+        print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+	    print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
+	}
+	else {
+	    $valtoshow=$amount;
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    print '<b>'.price($valtoshow).'</b>';
+        print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
+		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
+	}
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+}
+
+
+
+
+if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
+
+if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
+
+print '</table>'."\n";
+print "\n";
+
+if ($action != 'dosign')
+{
+    if ($found && ! $error)	// We are in a management option and no error
+    {
+
+
+    }
+    else
+    {
+    	dol_print_error_email('ERRORNEWONLINESIGNPAYPAL');
+    }
+}
+else
+{
+    // Print
+}
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
+
+
+htmlPrintOnlinePaymentFooter($mysoc,$langs);
+
+llxFooter('', 'public');
+
+$db->close();

From 70a188c0421045c87a07d6df39f15e5fc9727c1b Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Fri, 2 Jun 2017 21:45:02 +0200
Subject: [PATCH 1011/1163] Fix missing column entity on llx_accounting_journal
 after init demo with the bash

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 11a86724cf0..4680d451e39 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -159,6 +159,9 @@ CREATE TABLE llx_product_attribute_combination
 
 ALTER TABLE llx_bank_account drop foreign key bank_fk_accountancy_journal;
 
+-- Fix missing entity column after init demo
+ALTER TABLE llx_accounting_journal ADD COLUMN entity integer DEFAULT 1;
+
 -- Add journal entries
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (1,'VT', 'Sale journal', 2, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (2,'AC', 'Purchase journal', 3, 1);
@@ -355,4 +358,4 @@ delete from llx_categorie_member where fk_categorie not in (select rowid from ll
 delete from llx_categorie_contact where fk_categorie not in (select rowid from llx_categorie where type = 4);
 delete from llx_categorie_project where fk_categorie not in (select rowid from llx_categorie where type = 5);
 
-ALTER TABLE llx_inventory ADD COLUMN ref varchar(48);
\ No newline at end of file
+ALTER TABLE llx_inventory ADD COLUMN ref varchar(48);

From 66420d0e80d8fb3e43ffa4c96373154d2f7c779c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 23:02:48 +0200
Subject: [PATCH 1012/1163] Restore lost file and better generation of modules

---
 htdocs/core/actions_setmoduleoptions.inc.php  |  86 +++++++++++++++
 htdocs/core/class/hookmanager.class.php       |  17 +--
 htdocs/core/class/html.form.class.php         |  19 +++-
 htdocs/core/modules/DolibarrModules.class.php | 102 ++++++++++--------
 .../template/langs/en_US/mymodule.lang        |  10 +-
 .../template/langs/fr_FR/mymodule.lang        |  10 +-
 6 files changed, 173 insertions(+), 71 deletions(-)
 create mode 100644 htdocs/core/actions_setmoduleoptions.inc.php

diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
new file mode 100644
index 00000000000..03b33b19eb1
--- /dev/null
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -0,0 +1,86 @@
+<?php
+/* Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *	\file			htdocs/core/actions_setnotes.inc.php
+ *  \brief			Code for actions on setting notes of object page
+ */
+
+
+// $action must be defined
+// $_FILES may be defined
+// $nomessageinsetmoduleoptions can be set to 1
+
+// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
+if ($action == 'setModuleOptions')
+{
+    $db->begin();
+
+    // Process common param fields
+    foreach($_POST as $key => $val)
+    {
+        if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
+        {
+            $param=GETPOST("param".$reg[1],'alpha');
+            $value=GETPOST("value".$reg[1],'alpha');
+            if ($param)
+            {
+                $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+                if (! $res > 0) $error++;
+            }
+        }
+    }
+
+    // Process upload fields
+    if (GETPOST('upload','alpha') && GETPOST('keyforuploaddir','aZ09'))
+    {
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        $keyforuploaddir=GETPOST('keyforuploaddir','aZ09');
+        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->$keyforuploaddir)));
+        foreach($listofdir as $key=>$tmpdir)
+        {
+            $tmpdir=trim($tmpdir);
+            $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+            if (! $tmpdir) {
+                unset($listofdir[$key]); continue;
+            }
+            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+            else
+            {
+                $upload_dir=$tmpdir;
+            }
+        }
+        if ($upload_dir)
+        {
+            $result = dol_add_file_process($upload_dir, 0, 1, 'uploadfile', '');
+            if ($result <= 0) $error++;
+        }
+    }
+
+    if (! $error)
+    {
+        $db->commit();
+        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        $db->rollback();
+        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+    }
+}
+
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 590f8060296..1e20ee6ce31 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -133,10 +133,12 @@ class HookManager
 		if (in_array(
 			$method,
 			array(
-				'addMoreActionsButtons',
+                'addCalendarChoice',
+			    'addMoreActionsButtons',
+			    'addMoreMassActions',
 			    'addSearchEntry',
 				'addStatisticLine',
-				'deleteFile',
+			    'deleteFile',
 				'doActions',
 				'formCreateThirdpartyOptions',
 				'formObjectOptions',
@@ -169,7 +171,6 @@ class HookManager
 				'printSearchForm',
 				'printTabsHead',
 				'formatEvent',
-                'addCalendarChoice',
                 'printObjectLine',
                 'printObjectSubLine',
 				'createDictionaryFieldList',
@@ -181,14 +182,16 @@ class HookManager
 
         if ($method == 'insertExtraFields')
         {
-        	$hooktype='returnvalue';	// deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
+        	$hooktype='returnvalue';	// @deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
         	dol_syslog("Warning: The hook 'insertExtraFields' is deprecated and must not be used. Use instead trigger on CRUD event (ask it to dev team if not implemented)", LOG_WARNING);
         }
 
+        // Init return properties
+        $this->resPrint=''; $this->resArray=array();
+
         // Loop on each hook to qualify modules that have declared context
         $modulealreadyexecuted=array();
         $resaction=0; $error=0; $result='';
-		$this->resPrint=''; $this->resArray=array();
         foreach($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
         {
             if (! empty($modules))
@@ -202,9 +205,9 @@ class HookManager
 
                     // test to avoid running twice a hook, when a module implements several active contexts
                     if (in_array($module,$modulealreadyexecuted)) continue;
-                    
+
                     dol_syslog(get_class($this).'::executeHooks a qualified hook was found for method='.$method.' module='.$module." action=".$action." context=".$context);
-                    
+
                     $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method to avoid running twice
 
                     // Clean class (an error may have been set from a previous call of another method for same module/hook)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 34693cba67a..997bc94cc42 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -545,11 +545,20 @@ class Form
     	$disabled=0;
     	$ret='<div class="centpercent center">';
     	$ret.='<select data-role="none" class="flat'.(empty($conf->use_javascript_ajax)?'':' hideobject').' massaction massactionselect" name="massaction"'.($disabled?' disabled="disabled"':'').'>';
-    	$ret.='<option value="0"'.($disabled?' disabled="disabled"':'').'>-- '.$langs->trans("SelectAction").' --</option>';
-    	foreach($arrayofaction as $code => $label)
-    	{
-    		$ret.='<option value="'.$code.'"'.($disabled?' disabled="disabled"':'').'>'.$label.'</option>';
-    	}
+
+        // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['context'] completed by executeHooks.
+    	$parameters=array();
+    	$reshook=$hookmanager->executeHooks('addMoreMassActions',$parameters);    // Note that $action and $object may have been modified by hook
+        if (empty($reshook))
+        {
+        	$ret.='<option value="0"'.($disabled?' disabled="disabled"':'').'>-- '.$langs->trans("SelectAction").' --</option>';
+        	foreach($arrayofaction as $code => $label)
+        	{
+        		$ret.='<option value="'.$code.'"'.($disabled?' disabled="disabled"':'').'>'.$label.'</option>';
+        	}
+        }
+        $ret.=$hookmanager->resPrint;
+
     	$ret.='</select>';
     	// Warning: if you set submit button to disabled, post using 'Enter' will no more work.
     	$ret.='<input type="submit" data-role="none" name="confirmmassaction" class="button'.(empty($conf->use_javascript_ajax)?'':' hideobject').' massaction massactionconfirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 71de341a769..a79f17b1fdc 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -50,13 +50,13 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      * @since 4.0.0
      */
     public $editor_name;
-    
+
     /**
      * @var string URL of module at publisher site
      * @since 4.0.0
      */
     public $editor_url;
-    
+
     /**
      * @var string Family
      * @see familyinfo
@@ -80,13 +80,13 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      *
      */
     public $familyinfo;
-    
+
     /**
      * @var int Module position
      * @since 3.9.0
      */
     public $module_position=500;
-    
+
     /**
      * @var string Module name
      *
@@ -214,7 +214,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      * HTML content supported.
      */
     public $descriptionlong;
-    
+
     /**
      * @var string Module export code
      */
@@ -249,7 +249,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      * @var bool Module is enabled globally (Multicompany support)
      */
     public $core_enabled;
-    
+
     /**
      * @var string Relative path to module style sheet
      * @deprecated
@@ -286,7 +286,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 	 */
 	public $config_page_url;
 
-	
+
 	/**
 	 * @var string[] List of module class names that must be enabled if this module is enabled.
 	 *
@@ -309,22 +309,22 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      * @var string[] Module language files
      */
     public $langfiles;
-    
+
     /**
      * @var string[] Array of warnings to show when we activate the module
-     * 
+     *
      * array('always'='text') or array('FR'='text')
      */
     public $warnings_activation;
-    
+
     /**
      * @var string[] Array of warnings to show when we activate an external module
-     * 
+     *
      * array('always'='text') or array('FR'='text')
      */
     public $warnings_activation_ext;
-    
-	
+
+
 	/**
 	 * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.3 = array(5, 3)
@@ -342,7 +342,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 	 */
 	public $hidden = false;
 
-	
+
 	/**
 	 * Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -538,8 +538,8 @@ class DolibarrModules           // Can not be abstract, because we need to insta
             return $langs->trans("Module".$this->numero."Name");
         }
         else
-       {
-            // If module name translation using it's unique id does not exists, we take use its name to find translation
+        {
+            // If module name translation using it's unique id does not exists, we try to use its name to find translation
             if (is_array($this->langfiles))
             {
                 foreach($this->langfiles as $val)
@@ -547,6 +547,14 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                     if ($val) $langs->load($val);
                 }
             }
+
+            if ($langs->trans("Module".$this->name."Name") != ("Module".$this->name."Name"))
+            {
+                // If module name translation exists
+                return $langs->trans("Module".$this->name."Name");
+            }
+
+            // Last change with simple product label
             return $langs->trans($this->name);
         }
     }
@@ -591,13 +599,13 @@ class DolibarrModules           // Can not be abstract, because we need to insta
     {
         global $langs;
         $langs->load("admin");
-        
+
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
         $filefound= false;
-        
-        // Define path to file README.md. 
+
+        // Define path to file README.md.
         // First check README-la_LA.md then README.md
         $pathoffile = dol_buildpath(strtolower($this->name).'/README-'.$langs->defaultlang.'.md', 0);
         if (dol_is_file($pathoffile))
@@ -612,11 +620,11 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                 $filefound = true;
             }
         }
-        
+
         if ($filefound)     // Mostly for external modules
         {
             $content = file_get_contents($pathoffile);
-    
+
             if ((float) DOL_VERSION >= 6.0)
             {
                 @include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
@@ -638,14 +646,14 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                         if ($val) $langs->load($val);
                     }
                 }
-            
+
                 $content = $langs->trans($this->descriptionlong);
             }
         }
-    
+
         return $content;
     }
-    
+
     /**
      * Gives the publisher name
      *
@@ -655,7 +663,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
     {
         return $this->editor_name;
     }
-    
+
     /**
      * Gives the publisher url
      *
@@ -665,7 +673,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
     {
         return $this->editor_url;
     }
-    
+
     /**
      * Gives module version (translated if param $translated is on)
      * For 'experimental' modules, gives 'experimental' translation
@@ -768,7 +776,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         }
     }
 
-    
+
     /**
      * Gives the last date of activation
      *
@@ -777,11 +785,11 @@ class DolibarrModules           // Can not be abstract, because we need to insta
     function getLastActivationDate()
     {
         global $conf;
-        
+
         $sql = "SELECT tms FROM ".MAIN_DB_PREFIX."const";
         $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql.= " AND entity IN (0, ".$conf->entity.")";
-        
+
         dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if (! $resql) $err++;
@@ -790,11 +798,11 @@ class DolibarrModules           // Can not be abstract, because we need to insta
             $obj=$this->db->fetch_object($resql);
             if ($obj) return $this->db->jdate($obj->tms);
         }
-        
+
         return '';
     }
-    
-    
+
+
     /**
      * Gives the last author of activation
      *
@@ -803,11 +811,11 @@ class DolibarrModules           // Can not be abstract, because we need to insta
     function getLastActivationInfo()
     {
         global $conf;
-        
+
         $sql = "SELECT tms, note FROM ".MAIN_DB_PREFIX."const";
         $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql.= " AND entity IN (0, ".$conf->entity.")";
-        
+
         dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if (! $resql) $err++;
@@ -821,11 +829,11 @@ class DolibarrModules           // Can not be abstract, because we need to insta
             }
             if ($obj) return array('authorid'=>$tmp['authorid'], 'ip'=>$tmp['ip'], 'lastactivationdate'=>$this->db->jdate($obj->tms));
         }
-        
+
         return array();
     }
-    
-    
+
+
     /**
      * Insert constants for module activation
      *
@@ -929,7 +937,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                         $files[] = $file;
                     }
                     sort($files);
-                    foreach ($files as $file) 
+                    foreach ($files as $file)
                     {
                         if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
                         {
@@ -947,7 +955,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                         $files[] = $file;
                     }
                     sort($files);
-                    foreach ($files as $file) 
+                    foreach ($files as $file)
                     {
                         if (preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
                         {
@@ -965,7 +973,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                         $files[] = $file;
                     }
                     sort($files);
-                    foreach ($files as $file) 
+                    foreach ($files as $file)
                     {
                         if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'data')
                         {
@@ -983,7 +991,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                         $files[] = $file;
                     }
                     sort($files);
-                    foreach ($files as $file) 
+                    foreach ($files as $file)
                     {
                         if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,6) == 'update')
                         {
@@ -1123,19 +1131,19 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                 //$titre = $this->boxes[$key][0];
                 $file  = $this->boxes[$key]['file'];
                 //$note  = $this->boxes[$key][2];
-                
+
                 // TODO If the box is also included by another module and the other module is still on, we should not remove it.
                 // For the moment, we manage this with hard coded exception
                 //print "Remove box ".$file.'<br>';
                 if ($file == 'box_graph_product_distribution.php')
                 {
-                    if (! empty($conf->produit->enabled) || ! empty($conf->service->enabled)) 
+                    if (! empty($conf->produit->enabled) || ! empty($conf->service->enabled))
                     {
                         dol_syslog("We discard disabling of module ".$file." because another module still active require it.");
                         continue;
                     }
                 }
-                
+
                 if (empty($file)) $file  = isset($this->boxes[$key][1])?$this->boxes[$key][1]:'';	// For backward compatibility
 
                 if ($this->db->type == 'sqlite3') {
@@ -1210,7 +1218,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
                 $status = isset($this->cronjobs[$key]['status'])?$this->cronjobs[$key]['status']:'';
                 $priority = isset($this->cronjobs[$key]['priority'])?$this->cronjobs[$key]['priority']:'';
                 $test = isset($this->cronjobs[$key]['test'])?$this->cronjobs[$key]['test']:'';                              // Line must be visible
-                
+
                 // Search if boxes def already present
                 $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."cronjob";
                 $sql.= " WHERE module_name = '".$this->db->escape($this->rights_class)."'";
@@ -1645,7 +1653,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 
     /**
      * Removes access rights
-     * 
+     *
      * @return  int                     Error count (0 if OK)
      */
     function delete_permissions()
@@ -1678,7 +1686,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
         global $user;
 
         if (! is_array($this->menu) || empty($this->menu)) return 0;
-        
+
         require_once DOL_DOCUMENT_ROOT . '/core/class/menubase.class.php';
 
         $err=0;
diff --git a/htdocs/modulebuilder/template/langs/en_US/mymodule.lang b/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
index 53c6205386c..c33f2453fc4 100644
--- a/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
+++ b/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
@@ -18,12 +18,10 @@
 # Generic
 #
 
-# Module label 'ModuleXXXName'
-# (where XXX is value of numeric property 'numero' of module)
-Module500000Name = My module
-# Module description 'ModuleXXXDesc'
-# (where XXX is value of numeric property 'numero' of module)
-Module500000Desc = My module description
+# Module label 'ModuleMyModuleName'
+ModuleMyModuleName = My module
+# Module description 'ModuleMyModuleDesc'
+ModuleMyModuleDesc = My module description
 
 #
 # Admin page
diff --git a/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang b/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
index d15d37f0ebf..06e7ba33885 100644
--- a/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
+++ b/htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
@@ -18,12 +18,10 @@
 # Générique
 #
 
-# Module label 'ModuleXXXName'
-# (where XXX is value of numeric property 'numero' of module)
-Module500000Name = Mon module
-# Module description 'ModuleXXXDesc'
-# (where XXX is value of numeric property 'numero' of module)
-Module500000Desc = Description de mon module
+# Module label 'ModuleMyModuleName'
+ModuleMyModuleName = Mon module
+# Module description 'ModuleMyModuleDesc'
+ModuleMyModuleDesc = Description de mon module
 
 #
 # Page d'administration

From 111087dfdc5b32330ab6b3d45fe1b5ca2586abf7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 23:41:18 +0200
Subject: [PATCH 1013/1163] Work on module template

---
 htdocs/core/actions_massactions.inc.php       | 49 +++++-----
 htdocs/core/class/hookmanager.class.php       |  1 +
 htdocs/core/class/html.form.class.php         |  2 +-
 .../template/class/actions_mymodule.class.php | 89 +++++++++++++++++--
 4 files changed, 113 insertions(+), 28 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 92d1011b923..fde828fd6d4 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -24,20 +24,22 @@
 
 // $massaction must be defined
 // $objectclass and $$objectlabel must be defined
-// $uploaddir (example $conf->projet->dir_output . "/";)
+// $parameters, $object, $action must be defined for the hook.
+
+// $uploaddir may be defined (example to $conf->projet->dir_output."/";)
 // $toselect may be defined
 
 
 // Protection
-if (empty($objectclass) || empty($uploaddir)) 
+if (empty($objectclass) || empty($uploaddir))
 {
     dol_print_error(null, 'include of actions_massactions.inc.php is done but var $massaction or $objectclass or $uploaddir was not defined');
     exit;
 }
 
 
-// Mass actions. Controls on number of lines checked
-$maxformassaction=1000;
+// Mass actions. Controls on number of lines checked.
+$maxformassaction=(empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS)?1000:$conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
 if (! empty($massaction) && count($toselect) < 1)
 {
     $error++;
@@ -87,7 +89,7 @@ if (! $error && $massaction == 'confirm_presend')
             }
         }
         //var_dump($listofobjectthirdparties);exit;
-        	
+
         foreach ($listofobjectthirdparties as $thirdpartyid)
         {
             $result = $thirdparty->fetch($thirdpartyid);
@@ -144,7 +146,7 @@ if (! $error && $massaction == 'confirm_presend')
             {
                 //var_dump($object);
                 //var_dump($thirdpartyid.' - '.$objectid.' - '.$object->statut);
-                	
+
                 if ($objectclass == 'Facture' && $object->statut != Facture::STATUS_VALIDATED)
                 {
                     $nbignored++;
@@ -157,7 +159,7 @@ if (! $error && $massaction == 'confirm_presend')
                     $resaction.='<div class="error">'.$langs->trans('ErrorOnlyOrderNotDraftCanBeSentInMassAction',$object->ref).'</div><br>';
                     continue;
                 }
-                
+
                 // Read document
                 // TODO Use future field $object->fullpathdoc to know where is stored default file
                 // TODO If not defined, use $object->modelpdf (or defaut invoice config) to know what is template to use to regenerate doc.
@@ -202,7 +204,7 @@ if (! $error && $massaction == 'confirm_presend')
                     dol_syslog('Failed to read file: '.$file, LOG_WARNING);
                     continue;
                 }
-                	
+
                 //var_dump($listofqualifiedref);
             }
 
@@ -252,9 +254,9 @@ if (! $error && $massaction == 'confirm_presend')
                 $filepath = $attachedfiles['paths'];
                 $filename = $attachedfiles['names'];
                 $mimetype = $attachedfiles['mimes'];
-                	
+
                 //var_dump($filepath);
-                	
+
                 // Send mail
                 require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php');
                 $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1);
@@ -280,7 +282,7 @@ if (! $error && $massaction == 'confirm_presend')
                             if ($objectclass == 'Supplier_Proposal') $actiontypecode='AC_SUP_PRO';
                             if ($objectclass == 'CommandeFournisseur') $actiontypecode='AC_SUP_ORD';
                             if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';*/
-                            
+
                             $actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
                             if ($message)
                             {
@@ -290,7 +292,7 @@ if (! $error && $massaction == 'confirm_presend')
                                 $actionmsg = dol_concatdesc($actionmsg, $message);
                             }
                             $actionmsg2='';
-                            
+
                             // Initialisation donnees
                             $object->sendtoid		= 0;
                             $object->actionmsg		= $actionmsg;  // Long text
@@ -335,7 +337,7 @@ if (! $error && $massaction == 'confirm_presend')
         $resaction.=$langs->trans("NbSelected").': '.count($toselect)."\n<br>";
         $resaction.=$langs->trans("NbIgnored").': '.($nbignored?$nbignored:0)."\n<br>";
         $resaction.=$langs->trans("NbSent").': '.($nbsent?$nbsent:0)."\n<br>";
-        	
+
         if ($nbsent)
         {
             $action='';	// Do not show form post if there was at least one successfull sent
@@ -359,7 +361,7 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-     
+
     $objecttmp=new $objectclass($db);
     $listofobjectid=array();
     $listofobjectthirdparties=array();
@@ -425,21 +427,21 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
 
     	if (count($files)>0)
     	{
-    	
+
     		$now=dol_now();
     		$file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
-    		
+
     		$input_files = '';
     		foreach($files as $f) {
     			$input_files.=' '.escapeshellarg($f);
     		}
-    		
+
     		$cmd = 'pdftk '.$input_files.' cat output '.escapeshellarg($file);
     		exec($cmd);
-    		
+
     		if (! empty($conf->global->MAIN_UMASK))
     			@chmod($file, octdec($conf->global->MAIN_UMASK));
-    			
+
     			$langs->load("exports");
     			setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
     	}
@@ -447,7 +449,7 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
     	{
     		setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
     	}
-    	
+
     }
     else {
 	    // Create empty PDF
@@ -481,7 +483,7 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
 	    // Defined name of merged file
 	    $filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
 	    $filename=preg_replace('/\s/','_',$filename);
-	    
+
 	    // Save merged file
 	    if ($filter=='paye:0')
 	    {
@@ -565,6 +567,11 @@ if (! $error && $massaction == 'delete' && $permtodelete)
     //var_dump($listofobjectthirdparties);exit;
 }
 
+$parameters['toselect']=$toselect;
+$parameters['uploaddir']=$uploaddir;
+
+$reshook=$hookmanager->executeHooks('doMassActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 
 
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 1e20ee6ce31..40ed4153060 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -140,6 +140,7 @@ class HookManager
 				'addStatisticLine',
 			    'deleteFile',
 				'doActions',
+			    'doMassActions',
 				'formCreateThirdpartyOptions',
 				'formObjectOptions',
 				'formattachOptions',
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 997bc94cc42..b14f72a1b7b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -546,7 +546,7 @@ class Form
     	$ret='<div class="centpercent center">';
     	$ret.='<select data-role="none" class="flat'.(empty($conf->use_javascript_ajax)?'':' hideobject').' massaction massactionselect" name="massaction"'.($disabled?' disabled="disabled"':'').'>';
 
-        // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['context'] completed by executeHooks.
+        // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.
     	$parameters=array();
     	$reshook=$hookmanager->executeHooks('addMoreMassActions',$parameters);    // Note that $action and $object may have been modified by hook
         if (empty($reshook))
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index f3ce5963aa6..7f1897c80ae 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -62,24 +62,101 @@ class ActionsMyModule
 	 */
 	public function doActions($parameters, &$object, &$action, $hookmanager)
 	{
+		global $conf, $user, $langs;
+
 		$error = 0; // Error counter
-		$myvalue = 'test'; // A result value
 
+        /*
 		print_r($parameters);
-		echo "action: " . $action;
 		print_r($object);
+		echo "action: " . $action;
+        */
+
+	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2'))) {    // do something only for the context 'somecontext1' or 'somecontext2'
+
 
-		if (in_array('somecontext', explode(':', $parameters['context']))) {
-		  // do something only for the context 'somecontext'
 		}
 
 		if (! $error) {
-			$this->results = array('myreturn' => $myvalue);
+			$this->results = array('myreturn' => 999);
 			$this->resprints = 'A text to show';
-			return 0; // or return 1 to replace standard code
+			return 0;                                    // or return 1 to replace standard code
 		} else {
 			$this->errors[] = 'Error message';
 			return -1;
 		}
 	}
+
+
+	/**
+	 * Overloading the doActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array()         $parameters     Hook metadatas (context, etc...)
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function doMassActions($parameters, &$object, &$action, $hookmanager)
+	{
+	    global $conf, $user, $langs;
+
+	    $error = 0; // Error counter
+
+        /*
+	    print_r($parameters);
+	    print_r($object);
+	    echo "action: " . $action;
+        */
+
+	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2'))) {  // do something only for the context 'somecontext1' or 'somecontext2'
+
+	        foreach($parameters['toselect'] as $objectid)
+	        {
+	            // Do action on each object id
+
+	        }
+	    }
+
+	    if (! $error) {
+	        $this->results = array('myreturn' => 999);
+	        $this->resprints = 'A text to show';
+	        return 0;                                    // or return 1 to replace standard code
+	    } else {
+	        $this->errors[] = 'Error message';
+	        return -1;
+	    }
+	}
+
+
+	/**
+	 * Overloading the addMoreMassActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array()         $parameters     Hook metadatas (context, etc...)
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function addMoreMassActions($parameters, &$object, &$action, $hookmanager)
+	{
+	    global $conf, $user, $langs;
+
+	    $error = 0; // Error counter
+
+	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))  // do something only for the context 'somecontext'
+	    {
+	        $this->resprints = '<option value="0"'.($disabled?' disabled="disabled"':'').'>'.$langs->trans("MyModuleMassAction").'</option>';
+	    }
+
+	    if (! $error) {
+	        return 0;                                    // or return 1 to replace standard code
+	    } else {
+	        $this->errors[] = 'Error message';
+	        return -1;
+	    }
+	}
+
+
+
 }

From e1b19b831ae8770887c5b51c04679af3c6b103de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Jun 2017 23:41:18 +0200
Subject: [PATCH 1014/1163] NEW An external module can hook and add mass
 actions

---
 htdocs/core/actions_massactions.inc.php       | 49 +++++-----
 htdocs/core/class/hookmanager.class.php       |  1 +
 htdocs/core/class/html.form.class.php         |  2 +-
 .../template/class/actions_mymodule.class.php | 89 +++++++++++++++++--
 4 files changed, 113 insertions(+), 28 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 92d1011b923..fde828fd6d4 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -24,20 +24,22 @@
 
 // $massaction must be defined
 // $objectclass and $$objectlabel must be defined
-// $uploaddir (example $conf->projet->dir_output . "/";)
+// $parameters, $object, $action must be defined for the hook.
+
+// $uploaddir may be defined (example to $conf->projet->dir_output."/";)
 // $toselect may be defined
 
 
 // Protection
-if (empty($objectclass) || empty($uploaddir)) 
+if (empty($objectclass) || empty($uploaddir))
 {
     dol_print_error(null, 'include of actions_massactions.inc.php is done but var $massaction or $objectclass or $uploaddir was not defined');
     exit;
 }
 
 
-// Mass actions. Controls on number of lines checked
-$maxformassaction=1000;
+// Mass actions. Controls on number of lines checked.
+$maxformassaction=(empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS)?1000:$conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
 if (! empty($massaction) && count($toselect) < 1)
 {
     $error++;
@@ -87,7 +89,7 @@ if (! $error && $massaction == 'confirm_presend')
             }
         }
         //var_dump($listofobjectthirdparties);exit;
-        	
+
         foreach ($listofobjectthirdparties as $thirdpartyid)
         {
             $result = $thirdparty->fetch($thirdpartyid);
@@ -144,7 +146,7 @@ if (! $error && $massaction == 'confirm_presend')
             {
                 //var_dump($object);
                 //var_dump($thirdpartyid.' - '.$objectid.' - '.$object->statut);
-                	
+
                 if ($objectclass == 'Facture' && $object->statut != Facture::STATUS_VALIDATED)
                 {
                     $nbignored++;
@@ -157,7 +159,7 @@ if (! $error && $massaction == 'confirm_presend')
                     $resaction.='<div class="error">'.$langs->trans('ErrorOnlyOrderNotDraftCanBeSentInMassAction',$object->ref).'</div><br>';
                     continue;
                 }
-                
+
                 // Read document
                 // TODO Use future field $object->fullpathdoc to know where is stored default file
                 // TODO If not defined, use $object->modelpdf (or defaut invoice config) to know what is template to use to regenerate doc.
@@ -202,7 +204,7 @@ if (! $error && $massaction == 'confirm_presend')
                     dol_syslog('Failed to read file: '.$file, LOG_WARNING);
                     continue;
                 }
-                	
+
                 //var_dump($listofqualifiedref);
             }
 
@@ -252,9 +254,9 @@ if (! $error && $massaction == 'confirm_presend')
                 $filepath = $attachedfiles['paths'];
                 $filename = $attachedfiles['names'];
                 $mimetype = $attachedfiles['mimes'];
-                	
+
                 //var_dump($filepath);
-                	
+
                 // Send mail
                 require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php');
                 $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1);
@@ -280,7 +282,7 @@ if (! $error && $massaction == 'confirm_presend')
                             if ($objectclass == 'Supplier_Proposal') $actiontypecode='AC_SUP_PRO';
                             if ($objectclass == 'CommandeFournisseur') $actiontypecode='AC_SUP_ORD';
                             if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';*/
-                            
+
                             $actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
                             if ($message)
                             {
@@ -290,7 +292,7 @@ if (! $error && $massaction == 'confirm_presend')
                                 $actionmsg = dol_concatdesc($actionmsg, $message);
                             }
                             $actionmsg2='';
-                            
+
                             // Initialisation donnees
                             $object->sendtoid		= 0;
                             $object->actionmsg		= $actionmsg;  // Long text
@@ -335,7 +337,7 @@ if (! $error && $massaction == 'confirm_presend')
         $resaction.=$langs->trans("NbSelected").': '.count($toselect)."\n<br>";
         $resaction.=$langs->trans("NbIgnored").': '.($nbignored?$nbignored:0)."\n<br>";
         $resaction.=$langs->trans("NbSent").': '.($nbsent?$nbsent:0)."\n<br>";
-        	
+
         if ($nbsent)
         {
             $action='';	// Do not show form post if there was at least one successfull sent
@@ -359,7 +361,7 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-     
+
     $objecttmp=new $objectclass($db);
     $listofobjectid=array();
     $listofobjectthirdparties=array();
@@ -425,21 +427,21 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
 
     	if (count($files)>0)
     	{
-    	
+
     		$now=dol_now();
     		$file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
-    		
+
     		$input_files = '';
     		foreach($files as $f) {
     			$input_files.=' '.escapeshellarg($f);
     		}
-    		
+
     		$cmd = 'pdftk '.$input_files.' cat output '.escapeshellarg($file);
     		exec($cmd);
-    		
+
     		if (! empty($conf->global->MAIN_UMASK))
     			@chmod($file, octdec($conf->global->MAIN_UMASK));
-    			
+
     			$langs->load("exports");
     			setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
     	}
@@ -447,7 +449,7 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
     	{
     		setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
     	}
-    	
+
     }
     else {
 	    // Create empty PDF
@@ -481,7 +483,7 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
 	    // Defined name of merged file
 	    $filename=strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
 	    $filename=preg_replace('/\s/','_',$filename);
-	    
+
 	    // Save merged file
 	    if ($filter=='paye:0')
 	    {
@@ -565,6 +567,11 @@ if (! $error && $massaction == 'delete' && $permtodelete)
     //var_dump($listofobjectthirdparties);exit;
 }
 
+$parameters['toselect']=$toselect;
+$parameters['uploaddir']=$uploaddir;
+
+$reshook=$hookmanager->executeHooks('doMassActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 
 
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 1e20ee6ce31..40ed4153060 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -140,6 +140,7 @@ class HookManager
 				'addStatisticLine',
 			    'deleteFile',
 				'doActions',
+			    'doMassActions',
 				'formCreateThirdpartyOptions',
 				'formObjectOptions',
 				'formattachOptions',
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 997bc94cc42..b14f72a1b7b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -546,7 +546,7 @@ class Form
     	$ret='<div class="centpercent center">';
     	$ret.='<select data-role="none" class="flat'.(empty($conf->use_javascript_ajax)?'':' hideobject').' massaction massactionselect" name="massaction"'.($disabled?' disabled="disabled"':'').'>';
 
-        // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['context'] completed by executeHooks.
+        // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.
     	$parameters=array();
     	$reshook=$hookmanager->executeHooks('addMoreMassActions',$parameters);    // Note that $action and $object may have been modified by hook
         if (empty($reshook))
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index f3ce5963aa6..7f1897c80ae 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -62,24 +62,101 @@ class ActionsMyModule
 	 */
 	public function doActions($parameters, &$object, &$action, $hookmanager)
 	{
+		global $conf, $user, $langs;
+
 		$error = 0; // Error counter
-		$myvalue = 'test'; // A result value
 
+        /*
 		print_r($parameters);
-		echo "action: " . $action;
 		print_r($object);
+		echo "action: " . $action;
+        */
+
+	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2'))) {    // do something only for the context 'somecontext1' or 'somecontext2'
+
 
-		if (in_array('somecontext', explode(':', $parameters['context']))) {
-		  // do something only for the context 'somecontext'
 		}
 
 		if (! $error) {
-			$this->results = array('myreturn' => $myvalue);
+			$this->results = array('myreturn' => 999);
 			$this->resprints = 'A text to show';
-			return 0; // or return 1 to replace standard code
+			return 0;                                    // or return 1 to replace standard code
 		} else {
 			$this->errors[] = 'Error message';
 			return -1;
 		}
 	}
+
+
+	/**
+	 * Overloading the doActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array()         $parameters     Hook metadatas (context, etc...)
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function doMassActions($parameters, &$object, &$action, $hookmanager)
+	{
+	    global $conf, $user, $langs;
+
+	    $error = 0; // Error counter
+
+        /*
+	    print_r($parameters);
+	    print_r($object);
+	    echo "action: " . $action;
+        */
+
+	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2'))) {  // do something only for the context 'somecontext1' or 'somecontext2'
+
+	        foreach($parameters['toselect'] as $objectid)
+	        {
+	            // Do action on each object id
+
+	        }
+	    }
+
+	    if (! $error) {
+	        $this->results = array('myreturn' => 999);
+	        $this->resprints = 'A text to show';
+	        return 0;                                    // or return 1 to replace standard code
+	    } else {
+	        $this->errors[] = 'Error message';
+	        return -1;
+	    }
+	}
+
+
+	/**
+	 * Overloading the addMoreMassActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array()         $parameters     Hook metadatas (context, etc...)
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function addMoreMassActions($parameters, &$object, &$action, $hookmanager)
+	{
+	    global $conf, $user, $langs;
+
+	    $error = 0; // Error counter
+
+	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))  // do something only for the context 'somecontext'
+	    {
+	        $this->resprints = '<option value="0"'.($disabled?' disabled="disabled"':'').'>'.$langs->trans("MyModuleMassAction").'</option>';
+	    }
+
+	    if (! $error) {
+	        return 0;                                    // or return 1 to replace standard code
+	    } else {
+	        $this->errors[] = 'Error message';
+	        return -1;
+	    }
+	}
+
+
+
 }

From 344263f53cbd50aed4f4090be6924865b1c4f27b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Jun 2017 02:22:21 +0200
Subject: [PATCH 1015/1163] Fix travis

---
 htdocs/loan/calcmens.php                 |  4 +--
 htdocs/loan/class/loanschedule.class.php | 40 +++++++++++++++++-------
 htdocs/loan/createschedule.php           |  2 +-
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/htdocs/loan/calcmens.php b/htdocs/loan/calcmens.php
index 3778f455b04..96c8b5204b8 100644
--- a/htdocs/loan/calcmens.php
+++ b/htdocs/loan/calcmens.php
@@ -48,7 +48,7 @@ $output=array();
 $object = new LoanSchedule($db);
 
 $int = ($capital*($rate/12));
-$int = round($int ,2,PHP_ROUND_HALF_UP);
+$int = round($int,2,PHP_ROUND_HALF_UP);
 $cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
 $output[$echance]=array('cap_rest'=>$cap_rest,'cap_rest_str'=>price($cap_rest),'interet'=>$int,'interet_str'=>price($int,0,'',1),'mens'=>$mens);
 
@@ -59,7 +59,7 @@ while ($echance<=$nbterm) {
 	$mens = round($object->calc_mens($capital,$rate,$nbterm-$echance+1),2,PHP_ROUND_HALF_UP);
 
 	$int = ($capital*($rate/12));
-	$int = round($int ,2,PHP_ROUND_HALF_UP);
+	$int = round($int,2,PHP_ROUND_HALF_UP);
 	$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
 
 	$output[$echance]=array('cap_rest'=>$cap_rest,'cap_rest_str'=>price($cap_rest),'interet'=>$int,'interet_str'=>price($int,0,'',1),'mens'=>$mens);
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index 1e519e6a2af..fb6df8fcb6c 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -24,8 +24,8 @@
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
-/**     \class      LoanSchedule
- *		\brief      Class to manage Schedule of loans
+/**
+ *		Class to manage Schedule of loans
  */
 class LoanSchedule extends CommonObject
 {
@@ -382,10 +382,10 @@ class LoanSchedule extends CommonObject
 	/**
 	 *  Load all object in memory from database
 	 *
-	 *  @param	int		$id         Id object
+	 *  @param	int		$loanid     Id object
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-	function fetchall($loan)
+	function fetchall($loanid)
 	{
 		global $langs;
 
@@ -406,7 +406,7 @@ class LoanSchedule extends CommonObject
 		$sql.= " t.fk_user_creat,";
 		$sql.= " t.fk_user_modif";
 		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
-		$sql.= " WHERE t.fk_loan = ".$loan;
+		$sql.= " WHERE t.fk_loan = ".$loanid;
 
 		dol_syslog(get_class($this)."::fetchall", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -446,6 +446,11 @@ class LoanSchedule extends CommonObject
 		}
 	}
 
+	/**
+	 *  trans_paiment
+	 *
+	 *  @return void
+	 */
 	function trans_paiment()
 	{
 		require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
@@ -482,11 +487,17 @@ class LoanSchedule extends CommonObject
 	}
 
 
-	function lastpaiment($loan)
+	/**
+	 *  trans_paiment
+	 *
+	 *  @param  int    $loanid     Loan id
+	 *  @return int                < 0 if KO, Date > 0 if OK
+	 */
+	function lastpaiment($loanid)
 	{
 		$sql = "SELECT p.datep";
 		$sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as p ";
-		$sql.= " WHERE p.fk_loan = " . $loan;
+		$sql.= " WHERE p.fk_loan = " . $loanid;
 		$sql.= " ORDER BY p.datep DESC ";
 		$sql.= " LIMIT 1 ";
 
@@ -500,22 +511,27 @@ class LoanSchedule extends CommonObject
 		}
 	}
 
-	function paimenttorecord($loan,$datemax)
+	/**
+	 *  paimenttorecord
+	 *
+	 *  @param  int        $loanid     Loan id
+	 *  @param  int        $datemax    Date max
+	 *  @return array                  Array of id
+	 */
+	function paimenttorecord($loanid, $datemax)
 	{
 		$sql = "SELECT p.rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p ";
-		$sql.= " WHERE p.fk_loan = " . $loan;
-		if(!empty($datemax)){ $sql.= " AND p.datep > '" . $this->db->idate($datemax) ."'";}
+		$sql.= " WHERE p.fk_loan = " . $loanid;
+		if (!empty($datemax)) { $sql.= " AND p.datep > '" . $this->db->idate($datemax) ."'";}
 		$sql.= " AND p.datep <= '" . $this->db->idate(dol_now()). "'";
 
-
 		$resql=$this->db->query($sql);
 
 		if($resql){
 			while($obj = $this->db->fetch_object($resql))
 			{
 				$result[] = $obj->rowid;
-
 			}
 
 		}
diff --git a/htdocs/loan/createschedule.php b/htdocs/loan/createschedule.php
index 0d15d1b2de6..596cc9fd536 100644
--- a/htdocs/loan/createschedule.php
+++ b/htdocs/loan/createschedule.php
@@ -160,7 +160,7 @@ if ($object->nbterm > 0 && count($echeance->lines)==0)
 	while($i <$object->nbterm+1){
 		$mens = round($echeance->calc_mens($capital, $object->rate/100, $object->nbterm-$i+1),2,PHP_ROUND_HALF_UP);
 		$int = ($capital*($object->rate/12))/100;
-		$int = round($int ,2,PHP_ROUND_HALF_UP);
+		$int = round($int,2,PHP_ROUND_HALF_UP);
 		$cap_rest = round($capital - ($mens-$int),2,PHP_ROUND_HALF_UP);
 		print '<tr>';
 		print '<td align="center" id="n'.$i.'">' . $i .'</td>';

From 90c1a3848698c6bec7203d7e6e4905fb81ef747a Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sat, 3 Jun 2017 07:23:14 +0200
Subject: [PATCH 1016/1163] Accountancy - Activate multijournal on bank_journal

---
 htdocs/accountancy/journal/bankjournal.php    | 46 +++++++-----------
 htdocs/core/menus/standard/eldy.lib.php       | 48 +++++++++----------
 .../mysql/tables/llx_accounting_journal.sql   |  6 +--
 3 files changed, 43 insertions(+), 57 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index b42ef34d663..3fa7d7a1110 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -65,10 +65,8 @@ $langs->load("accountancy");
 $langs->load("trips");
 $langs->load("hrm");
 
-// Old system menu
-$id_bank_account = GETPOST('id_account', 'int');
 // Multi journal
-$code_journal = GETPOST('code_journal', 'alpha');
+$id_journal = GETPOST('id_journal', 'int');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -81,7 +79,7 @@ $action = GETPOST('action','aZ09');
 $now = dol_now();
 
 // Security check
-if ($user->societe_id > 0 && empty($id_bank_account))
+if ($user->societe_id > 0 && empty($id_journal))
 	accessforbidden();
 
 
@@ -112,7 +110,7 @@ $p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 $idpays = $p[0];
 
 $sql  = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
-$sql .= " ba.courant, ba.ref as baref, ba.account_number,";
+$sql .= " ba.courant, ba.ref as baref, ba.account_number, ba.fk_accountancy_journal,";
 $sql .= " soc.code_compta, soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, bu1.type as typeop,";
 $sql .= " u.accountancy_code, u.rowid as userid, u.lastname as name, u.firstname as firstname, bu2.type as typeop";
 $sql .= " FROM " . MAIN_DB_PREFIX . "bank as b";
@@ -121,7 +119,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu1 ON bu1.fk_bank = b.row
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu2 ON bu2.fk_bank = b.rowid AND bu2.type='user'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as soc on bu1.url_id=soc.rowid";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u on bu2.url_id=u.rowid";
-$sql .= " WHERE ba.rowid=" . $id_bank_account;
+$sql .= " WHERE ba.fk_accountancy_journal=" . $id_journal;
 $sql .= ' AND ba.entity IN ('.getEntity('bank_account', 0).')';        // We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND b.dateo >= '" . $db->idate($date_start) . "' AND b.dateo <= '" . $db->idate($date_end) . "'";
@@ -139,20 +137,8 @@ $paymentsalstatic = new PaymentSalary($db);
 $paymentexpensereportstatic = new PaymentExpenseReport($db);
 
 // Get code of finance journal
-$journal = '';
-$bankstatic = new Account($db);
-$bankstatic->fetch($id_bank_account);
-$bankstatic->rowid;
-$bankstatic->number;
-$bankstatic->label;
-$bankstatic->fk_accountancy_journal;
-
 $accountingjournalstatic = new AccountingJournal($db);
-if(! empty($id_bank_account)) {
-	$accountingjournalstatic->fetch($bankstatic->fk_accountancy_journal);
-} else {
-	$accountingjournalstatic->fetch('',$code_journal);
-}
+$accountingjournalstatic->fetch($id_journal);
 $journal = $accountingjournalstatic->code;
 
 dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG);
@@ -194,7 +180,7 @@ if ($result) {
 		$tabcompany[$obj->rowid] = array (
 				'id' => $obj->socid,
 				'name' => $obj->name,
-		        'code_compta' => $compta_soc,
+				'code_compta' => $compta_soc,
 		);
 
 		$compta_user = (! empty($obj->accountancy_code) ? $obj->accountancy_code : $account_employee);
@@ -203,7 +189,7 @@ if ($result) {
 				'id' => $obj->userid,
 				'lastname' => $obj->lastname,
 				'firstname' => $obj->firstname,
-		        'accountancy_code' => $compta_user,
+				'accountancy_code' => $compta_user,
 		);
 
 		// Variable bookkeeping
@@ -220,14 +206,14 @@ if ($result) {
 
 		// get_url may return -1 which is not traversable
 		if (is_array($links)) {
-		    // Now loop on each link of record in bank.
+			// Now loop on each link of record in bank.
 			foreach ( $links as $key => $val ) {
 
-			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation')))     // So we excluded 'company' here
-			    {
-			        // We save tabtype for a future use, to remember what kind of payment it is 
-			        $tabtype[$obj->rowid] = $links[$key]['type'];
-			    }
+				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation')))     // So we excluded 'company' here
+				{
+					// We save tabtype for a future use, to remember what kind of payment it is 
+					$tabtype[$obj->rowid] = $links[$key]['type'];
+				}
 
 				if ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
@@ -740,18 +726,18 @@ if (empty($action) || $action == 'view') {
 	$invoicestatic = new Facture($db);
 	$invoicesupplierstatic = new FactureFournisseur($db);
 	$expensereportstatic = new ExpenseReport($db);
-  $vatstatic = new Tva($db);
+	$vatstatic = new Tva($db);
 	$donationstatic = new Don($db);
 
 	llxHeader('', $langs->trans("FinanceJournal"));
 
-	$nom = $langs->trans("FinanceJournal") . ' - ' . $bankstatic->getNomUrl(1);
+	$nom = $langs->trans("FinanceJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
 	$builddate = time();
 	//$description = $langs->trans("DescFinanceJournal") . '<br>';
 	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
 
-	$varlink = 'id_account=' . $id_bank_account;
+	$varlink = 'id_journal=' . $id_journal;
 
 	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 6248f294476..9245a481aff 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1008,7 +1008,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$sql = "SELECT rowid, code, label, nature";
 					$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 					$sql.= " WHERE entity = ".$conf->entity;
-					$sql.= " ORDER BY nature";
+					$sql.= " ORDER BY label";
 
 					$resql = $db->query($sql);
 					if ($resql)
@@ -1018,30 +1018,30 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 						if ($numr > 0)
 						{
-    						while ($i < $numr)
-    						{
-    							$objp = $db->fetch_object($resql);
+							while ($i < $numr)
+							{
+								$objp = $db->fetch_object($resql);
 
-    							$nature='';
-    							// Must match array $sourceList defined into journals_list.php 
-    							if ($objp->nature == 2) $nature="sells";
-    							if ($objp->nature == 3) $nature="purchases";
-    							if ($objp->nature == 4) $nature="bank";
-    							if ($objp->nature == 1) $nature="various";
-    							if ($objp->nature == 9) $nature="hasnew";
-    							
-    							// To enable when page exists
-    							if (empty($conf->global->MAIN_FEATURES_LEVEL))
-    							{
-    							    if ($nature == 'various' || $nature == 'hasnew') $nature='';	
-    							}
-    								
-    							if ($nature)
-    							{
-                                    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&code_journal='.$objp->code,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
-    							}
-    							$i++;
-    						}
+								$nature='';
+								// Must match array $sourceList defined into journals_list.php 
+								if ($objp->nature == 2) $nature="sells";
+								if ($objp->nature == 3) $nature="purchases";
+								if ($objp->nature == 4) $nature="bank";
+								if ($objp->nature == 1) $nature="various";
+								if ($objp->nature == 9) $nature="hasnew";
+
+								// To enable when page exists
+								if (empty($conf->global->MAIN_FEATURES_LEVEL))
+								{
+									if ($nature == 'various' || $nature == 'hasnew') $nature='';
+								}
+
+								if ($nature)
+								{
+									if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
+								}
+								$i++;
+							}
 						}
 						else
 						{
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.sql b/htdocs/install/mysql/tables/llx_accounting_journal.sql
index 348654b56dc..dbd9e4d311b 100644
--- a/htdocs/install/mysql/tables/llx_accounting_journal.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_journal.sql
@@ -20,9 +20,9 @@
 create table llx_accounting_journal
 (
   rowid             integer AUTO_INCREMENT PRIMARY KEY,
-  entity            integer DEFAULT 1,
-  code       		varchar(32) NOT NULL,
+  entity            integer DEFAULT 1 NOT NULL,
+  code              varchar(32) NOT NULL,
   label             varchar(128) NOT NULL,
-  nature			smallint DEFAULT 1 NOT NULL,			-- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
+  nature            smallint DEFAULT 1 NOT NULL,        -- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
   active            smallint DEFAULT 0
 )ENGINE=innodb;

From 0eadef9a7ad540e81bc03edaf1e81795043d7b0e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sat, 3 Jun 2017 11:46:18 +0200
Subject: [PATCH 1017/1163] Fix: merge correction

---
 htdocs/modulebuilder/oldskeletons/.gitignore  |   2 -
 htdocs/modulebuilder/oldskeletons/README      |  34 -
 .../oldskeletons/build_api_class.php          | 123 ----
 .../oldskeletons/build_class_from_table.php   | 677 ------------------
 .../build_webservice_from_class.php           | 179 -----
 .../oldskeletons/modMyModule.class.php        | 291 --------
 .../oldskeletons/skeleton_api_class.class.php | 289 --------
 .../oldskeletons/skeleton_card.php            | 604 ----------------
 .../oldskeletons/skeleton_class.class.php     | 606 ----------------
 .../oldskeletons/skeleton_list.php            | 570 ---------------
 .../oldskeletons/skeleton_script.php          | 166 -----
 .../skeleton_webservice_server.php            | 272 -------
 12 files changed, 3813 deletions(-)
 delete mode 100644 htdocs/modulebuilder/oldskeletons/.gitignore
 delete mode 100644 htdocs/modulebuilder/oldskeletons/README
 delete mode 100755 htdocs/modulebuilder/oldskeletons/build_api_class.php
 delete mode 100755 htdocs/modulebuilder/oldskeletons/build_class_from_table.php
 delete mode 100755 htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/modMyModule.class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_card.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_list.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_script.php
 delete mode 100644 htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php

diff --git a/htdocs/modulebuilder/oldskeletons/.gitignore b/htdocs/modulebuilder/oldskeletons/.gitignore
deleted file mode 100644
index 2dda6229d24..00000000000
--- a/htdocs/modulebuilder/oldskeletons/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-out.*
-socpeople*
diff --git a/htdocs/modulebuilder/oldskeletons/README b/htdocs/modulebuilder/oldskeletons/README
deleted file mode 100644
index 5b5b992d91e..00000000000
--- a/htdocs/modulebuilder/oldskeletons/README
+++ /dev/null
@@ -1,34 +0,0 @@
-README (English)
---------------------------------
-This directory contains PHP script samples that can be used to start a development on Dolibarr.
-
-
-*** build_class_from_table.php:
-
-This is the script to use to generate PHP code of a PHP POJO class
-object, a PHP script that use this POJO. This script use the files
-skeleton_*.php to build its generated code. 
-
-
-*** modMyModule.class.php:
-
-Is a sample of module descriptor that you can use if you want to build a new module/plugin for
-Dolibarr.
-
-
-*** skeleton_script.php:
-
-Is a sample you can use as an example if you need to build a script to run on command line
-
-
-*** skeleton_page.php:
-
-Is a sample you can use as an example if you need to build an HTML page to include in Dolibarr GUI.
-
-
-*** skeleton_class.class.php:
-
-Is a sample you can use as an example if you need to build a class file to access a new table required by a Dolibarr development.
-However it is better to run the build_class_from_table.php script that accepts a table name as a parameter and will uses the description table within database and the skeleton_class.class.php file to generate full code for your class file.
-After running this script, the class to access your table (insert a record, update, delete and select) is directly finished and can be used by your module's code. 
-No more coding is needed to get access to table with this script because the file is completely generated once.
diff --git a/htdocs/modulebuilder/oldskeletons/build_api_class.php b/htdocs/modulebuilder/oldskeletons/build_api_class.php
deleted file mode 100755
index 6263eabcd6e..00000000000
--- a/htdocs/modulebuilder/oldskeletons/build_api_class.php
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2015   Jean-François Ferry <jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_api_class.php
- *  \ingroup    core
- *  \brief      Create a complete API class file from existant class file
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='1';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_API_FROM_CLASS --------------------
-
-// Check parameters
-if (! isset($argv[1]) && ! isset($argv[2]))
-{
-    print "Usage: $script_file phpClassFile phpClassName\n";
-    exit;
-}
-// Show parameters
-print 'Classfile='.$argv[1]."\n";
-print 'Classname='.$argv[2]."\n";
-
-$classfile=$argv[1];
-$classname=$argv[2];
-$classmin=strtolower($classname);
-$classnameApi = $classname.'Api';
-$property=array();
-$targetcontent='';
-
-// Load the class and read properties
-require_once($classfile);
-
-$property=array();
-$class = new $classname($db);
-$values=get_class_vars($classname);
-
-unset($values['db']);
-unset($values['error']);
-unset($values['errors']);
-unset($values['element']);
-unset($values['table_element']);
-unset($values['table_element_line']);
-unset($values['fk_element']);
-unset($values['ismultientitymanaged']);
-
-// Read skeleton_api_class.class.php file
-$skeletonfile=$path.'skeleton_api_class.class.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile='out.api_'.$classmin.'.class.php';
-$targetcontent=$sourcecontent;
-
-// Substitute class name
-$targetcontent=preg_replace('/skeleton_api_class\.class\.php/', 'api_'.$classmin.'.class.php', $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-//$targetcontent=preg_replace('/\$table_element=\'skeleton\'/', '\$table_element=\''.$tablenoprefix.'\'', $targetcontent);
-$targetcontent=preg_replace('/SkeletonApi/', $classnameApi, $targetcontent);
-$targetcontent=preg_replace('/Skeleton/', $classname, $targetcontent);
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "\n";
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You can now rename generated files by removing the 'out.' prefix in their name and store them into directory /module/class.\n";
-return $error;
diff --git a/htdocs/modulebuilder/oldskeletons/build_class_from_table.php b/htdocs/modulebuilder/oldskeletons/build_class_from_table.php
deleted file mode 100755
index 0e5a6d82a82..00000000000
--- a/htdocs/modulebuilder/oldskeletons/build_class_from_table.php
+++ /dev/null
@@ -1,677 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2008-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_class_from_table.php
- *  \ingroup    core
- *  \brief      Create a complete class file from a table in database
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='3.2';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-// Check parameters
-if (! isset($argv[1]) || ! isset($argv[2]) || (isset($argv[3]) && ! isset($argv[7])))
-{
-    print "Usage: $script_file tablename modulename [server port databasename user pass]\n";
-    exit;
-}
-
-if (isset($argv[3]) && isset($argv[4]) && isset($argv[5]) && isset($argv[6]) && isset($argv[7]))
-{
-	print 'Use specific database ids'."\n";
-	$db=getDoliDBInstance('mysqli',$argv[3],$argv[6],$argv[7],$argv[5],$argv[4]);
-}
-
-if ($db->type != 'mysql' && $db->type != 'mysqli')
-{
-	print "Error: This script works with mysql or mysqli driver only\n";
-	exit;
-}
-
-$table=$argv[1];
-$module=$argv[2];
-
-// Show parameters
-print 'Tablename: '.$table."\n";
-print 'Modulename: '.$module."\n";
-print "Current dir: ".getcwd()."\n";
-print "Database name: ".$db->database_name."\n";
-
-
-// Define array with list of properties
-$property=array();
-$foundprimary=0;
-$resql=$db->DDLDescTable($table);
-if ($resql)
-{
-	$i=0;
-	while($obj=$db->fetch_object($resql))
-	{
-		//var_dump($obj);
-		$i++;
-		$property[$i]['field']=$obj->Field;
-		if ($obj->Key == 'PRI')
-		{
-			$property[$i]['primary']=1;
-			$foundprimary=1;
-		}
-		else
-		{
-			$property[$i]['primary']=1;
-		}
-		$property[$i]['type'] =$obj->Type;
-		$property[$i]['null'] =$obj->Null;
-		$property[$i]['extra']=$obj->Extra;
-		if ($property[$i]['type'] == 'date'
-			|| $property[$i]['type'] == 'datetime'
-			|| $property[$i]['type'] == 'timestamp')
-		{
-			$property[$i]['istime']=true;
-		}
-		else
-		{
-			$property[$i]['istime']=false;
-		}
-		if (preg_match('/varchar/i',$property[$i]['type'])
-			|| preg_match('/text/i',$property[$i]['type']))
-		{
-			$property[$i]['ischar']=true;
-		}
-		else
-		{
-			$property[$i]['ischar']=false;
-		}
-		if (preg_match('/int/i',$property[$i]['type']))
-		{
-			$property[$i]['isint']=true;
-		}
-		else
-		{
-			$property[$i]['isint']=false;
-		}
-	}
-}
-else
-{
-	print "Error: Failed to get description for table '".$table."'.\n";
-	return false;
-}
-//var_dump($property);
-
-// Define substitute fetch/select parameters
-$varpropselect="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-    $i++;
-    if ($prop['field'] != 'rowid')
-    {
-        $varpropselect.="\t\t\$sql .= \" ";
-        $varpropselect.="t.".$prop['field'];
-        if ($i < count($property)) $varpropselect.=",";
-        $varpropselect.="\";";
-        $varpropselect.="\n";
-    }
-}
-
-
-
-//--------------------------------
-// Build skeleton_class.class.php
-//--------------------------------
-
-// Define working variables
-$table=strtolower($table);
-$tablenoprefix=preg_replace('/'.preg_quote(MAIN_DB_PREFIX,'/').'/i','',$table);
-$classname=preg_replace('/_/','',ucfirst($tablenoprefix));
-$classmin=preg_replace('/_/','',strtolower($classname));
-
-
-// Read skeleton_class.class.php file
-$skeletonfile=$path.'skeleton_class.class.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile=$classmin.'.class.php';
-$targetcontent=$sourcecontent;
-
-// Substitute module name
-$targetcontent=preg_replace('/dev\/skeletons/', $module, $targetcontent);
-$targetcontent=preg_replace('/mymodule othermodule1 othermodule2/', $module, $targetcontent);
-$targetcontent=preg_replace('/mymodule/', $module, $targetcontent);
-
-// Substitute class name
-$targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
-$targetcontent=preg_replace('/\$element = \'skeleton\'/', '\$element = \''.$classmin.'\'', $targetcontent);
-$targetcontent=preg_replace('/\$table_element = \'skeleton\'/', '\$table_element = \''.$tablenoprefix.'\'', $targetcontent);
-$targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
-$targetcontent=preg_replace('/skeletons/', $classmin, $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-
-// Substitute comments
-$targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
-$targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
-$targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
-
-// Substitute table name
-$targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
-
-// Substitute declaration parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\tpublic \$".$prop['field'];
-		if ($prop['istime']) $varprop.=" = ''";
-		$varprop.=";";
-		if ($prop['comment']) $varprop.="\t// ".$prop['extra'];
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/'.preg_quote('public $prop1;','/').'/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/'.preg_quote('public $prop2;','/').'/', '', $targetcontent);
-
-$targetcontent=preg_replace('/\*((\s|\n|\r|\t)*)\@var mixed Sample property 1((\s|\n|\r|\t)*)/', '', $targetcontent);
-$targetcontent=preg_replace('/\*((\s|\n|\r|\t)*)\@var mixed Sample property 2((\s|\n|\r|\t)*)/', '', $targetcontent);
-
-// Substitute clean parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-	{
-		$varprop.="\t\tif (isset(\$this->".$prop['field'].")) {\n\t\t\t \$this->".$prop['field']." = trim(\$this->".$prop['field'].");\n\t\t}";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/if \(isset\(\$this->prop1\)\) {((\n|\r|\t)*)\$this->prop1 = trim\(\$this->prop1\);((\n|\r|\t)*)}/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/if \(isset\(\$this->prop2\)\) {((\n|\r|\t)*)\$this->prop2 = trim\(\$this->prop2\);((\n|\r|\t)*)}/', '', $targetcontent);
-
-
-$no_output_field=0;
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] == 'tms') $no_output_field++;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $no_output_field++;
-}
-// Substitute insert into parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	$i++;
-	$addfield=1;
-	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-
-	if ($addfield)
-	{
-		$varprop.="\t\t\$sql.= '".$prop['field'];
-		if ($i < (count($property)-$no_output_field)) $varprop.=",";
-		$varprop.="';";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$sql \.= \' field1,\';/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= \' field2\';/', '', $targetcontent);
-
-// Substitute insert values parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-//Count nb field to output to manage commat at end SQL instruction
-
-
-foreach($property as $key => $prop)
-{
-	
-	$addfield=1;
-	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-	
-	if ($addfield)
-	{
-		$i++;
-		
-		$varprop.="\t\t\$sql .= ' ";
-		if ($prop['field']=='datec')
-		{
-			$varprop.='\'."\'".$this->db->idate(dol_now())."\'"';
-		}
-		elseif ($prop['istime'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].')==0?\'NULL\':"\'".$this->db->idate(';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.=").\"'\")";
-		}
-		elseif ($prop['ischar'])
-		{
-			$varprop.="'.(! isset(\$this->".$prop['field'].")?'NULL':\"'\".";
-			$varprop.="\$this->db->escape(\$this->".$prop['field'].")";
-			$varprop.=".\"'\")";
-		}
-		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_m' ||  $prop['field']=='fk_user_author')
-		{
-			$varprop.="'.\$user->id";
-		}
-		elseif ($prop['isint'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.=')';
-		}
-		else
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':"\'".';
-			$varprop.="\$this->".$prop['field'];
-			$varprop.='."\'")';
-		}
-		
-		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
-		$varprop.=';';
-		$varprop.="\n";
-	}
-}
-
-$patern1='/\$sql \.= \' (.*)\' \. \$this->prop1 \. \'(.*),\';/';
-$patern2='/\$sql \.= \' (.*)\' \. \$this->prop2 \. \'(.*)\';/';
-$targetcontent=preg_replace($patern1, $varprop, $targetcontent);
-$targetcontent=preg_replace($patern2, '', $targetcontent);
-
-// Substitute update values parameters
-
-//Count nb field to output to manage commat at end SQL instruction
-$no_output_field=0;
-foreach($property as $key => $prop)
-{
-	if ($prop['extra'] == 'auto_increment') $no_output_field++;
-}
-
-$varprop="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	
-	$addfield=1;
-	if ($prop['extra'] == 'auto_increment') $addfield=0;
-	
-	if ($addfield)
-	{
-		$i++;
-		
-		$varprop.="\t\t\$sql .= ' ";
-		$varprop.=$prop['field'].' = ';
-		if ($prop['field']=='tms') {
-			$varprop.='\'.(dol_strlen($this->'.$prop['field'].') != 0 ? "\'".$this->db->idate(';
-			$varprop.='$this->'.$prop['field'];
-			$varprop.=')."\'" : "\'".$this->db->idate(dol_now())."\'")';
-		}
-		elseif ($prop['istime'])
-		{
-			$varprop.='\'.(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].') != 0 ? "\'".$this->db->idate(';
-			$varprop.='$this->'.$prop['field'];
-			$varprop.=')."\'" : \'null\')';
-		}
-		
-		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_m') {
-			$varprop.="'.\$user->id";
-		}
-		else
-		{
-			$varprop.="'.";
-			if ($prop['ischar']) $varprop.='(isset($this->'.$prop['field'].')?"\'".$this->db->escape($this->'.$prop['field'].')."\'":"null")';
-			elseif ($prop['isint']) $varprop.='(isset($this->'.$prop['field'].')?$this->'.$prop['field'].':"null")';
-			else $varprop.='(isset($this->'.$prop['field'].')?$this->'.$prop['field'].':"null")';
-		}
-
-		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
-		$varprop.=';';
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$sql \.= " field1=".\(isset\(\$this->field1\)\?"\'".\$this->db->escape\(\$this->field1\)."\'":"null"\).",";/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= " field2=".\(isset\(\$this->field2\)\?"\'".\$this->db->escape\(\$this->field2\)."\'":"null"\)."";/', '', $targetcontent);
-
-// Substitute fetch/select parameters
-$targetcontent=preg_replace('/\$sql \.= \' t\.field1,\';/', $varpropselect, $targetcontent);
-$targetcontent=preg_replace('/\$sql \.= \' t\.field2\';/', '', $targetcontent);
-
-// Substitute select set parameters
-$varprop="\n";
-$varpropline="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	$i++;
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\t\t\t\t\$this->".$prop['field']." = ";
-		if ($prop['istime']) $varprop.='$this->db->jdate(';
-		$varprop.='$obj->'.$prop['field'];
-		if ($prop['istime']) $varprop.=')';
-		$varprop.=";";
-		$varprop.="\n";
-		
-		$varpropline.="\t\t\t\t\$line->".$prop['field']." = ";
-		if ($prop['istime']) $varpropline.='$this->db->jdate(';
-		$varpropline.='$obj->'.$prop['field'];
-		if ($prop['istime']) $varpropline.=')';
-		$varpropline.=";";
-		$varpropline.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$this->prop1 = \$obj->field1;/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$this->prop2 = \$obj->field2;/', '', $targetcontent);
-
-//Substirute fetchAll
-$targetcontent=preg_replace('/\$line->prop1 = \$obj->field1;/', $varpropline, $targetcontent);
-$targetcontent=preg_replace('/\$line->prop2 = \$obj->field2;/', '', $targetcontent);
-
-
-// Substitute initasspecimen parameters
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
-	{
-		$varprop.="\t\t\$this->".$prop['field']." = '';";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$this->prop1 = \'prop1\';/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$this->prop2 = \'prop2\';/', '', $targetcontent);
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "\n";
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-
-
-//--------------------------------------------------------------------
-// Build skeleton_script.php, skeleton_list.php and skeleton_card.php
-//--------------------------------------------------------------------
-
-$skeletonfiles=array(
-    $path.'skeleton_script.php' => $classmin.'_script.php', 
-    $path.'skeleton_list.php' => $classmin.'_list.php', 
-    $path.'skeleton_card.php' => $classmin.'_card.php'
-    );
-    
-foreach ($skeletonfiles as $skeletonfile => $outfile)
-{
-    $sourcecontent=file_get_contents($skeletonfile);
-    if (! $sourcecontent)
-    {
-    	print "\n";
-    	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-    	print "Try to run script from skeletons directory.\n";
-    	exit;
-    }
-    
-    // Define output variables
-    $targetcontent=$sourcecontent;
-    
-    // Substitute module name
-    $targetcontent=preg_replace('/dev\/skeletons/', $module, $targetcontent);
-    $targetcontent=preg_replace('/mymodule othermodule1 othermodule2/', $module, $targetcontent);
-    $targetcontent=preg_replace('/mymodule/', $module, $targetcontent);
-    
-    // Substitute class name
-    $targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
-    $targetcontent=preg_replace('/skeleton_script\.php/', $classmin.'_script.php', $targetcontent);
-    $targetcontent=preg_replace('/\$element = \'skeleton\'/', '\$element=\''.$classmin.'\'', $targetcontent);
-    $targetcontent=preg_replace('/\$table_element = \'skeleton\'/', '\$table_element=\''.$classmin.'\'', $targetcontent);
-    $targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
-    $targetcontent=preg_replace('/skeletons/', $classmin, $targetcontent);
-    $targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-    
-    // Substitute comments
-    $targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
-    $targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
-    $targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
-    
-    // Substitute table name
-    $targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
-        
-    // Substitute GETPOST search_fieldx
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    if ($prop['isint']) $varprop.='$search_'.$prop['field']."=GETPOST('search_".$prop['field']."','int');\n";
-    	    else $varprop.='$search_'.$prop['field']."=GETPOST('search_".$prop['field']."','alpha');\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$search_field1=GETPOST("search_field1");','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$search_field2=GETPOST("search_field2");','/').'/', '', $targetcontent);
-    
-    // Substitute GETPOST fieldx
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    if ($prop['isint']) $varprop.="\t\$object->".$prop['field']."=GETPOST('".$prop['field']."','int');\n";
-    	    else $varprop.="\t\$object->".$prop['field']."=GETPOST('".$prop['field']."','alpha');\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$object->prop1=GETPOST("field1");','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$object->prop2=GETPOST("field2");','/').'/', '', $targetcontent);
-    
-    // Substitute reset search_field = '';
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.='$search_'.$prop['field']."='';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('$search_field1=\'\';','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('$search_field2=\'\';','/').'/', '', $targetcontent);
-    
-    // Substitute fetch/select parameters
-    $targetcontent=preg_replace('/\$sql\s*\.= " t\.field1,";/', $varpropselect, $targetcontent);
-    $targetcontent=preg_replace('/\$sql\s*\.= " t\.field2";/', '', $targetcontent);
-    
-    // Substitute where for search
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.='if ($search_'.$prop['field'].') $sql.= natural_search("'.$prop['field'].'",$search_'.$prop['field'].');'."\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote('if ($search_field1) $sql.= natural_search("field1",$search_field1);','/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote('if ($search_field2) $sql.= natural_search("field2",$search_field2);','/').'/', '', $targetcontent);
-    
-    // substitute $params.=
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (\$search_".$prop['field']." != '') \$params.= '&amp;search_".$prop['field']."='.urlencode(\$search_".$prop['field'].");\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("if (\$search_field1 != '') \$params.= '&amp;search_field1='.urlencode(\$search_field1);",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("if (\$search_field2 != '') \$params.= '&amp;search_field2='.urlencode(\$search_field2);",'/').'/', '', $targetcontent);
-    
-    // Substitute arrayfields
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="'t.".$prop['field']."'=>array('label'=>\$langs->trans(\"Field".$prop['field']."\"), 'checked'=>1),\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("'t.field1'=>array('label'=>\$langs->trans(\"Field1\"), 'checked'=>1),",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("'t.field2'=>array('label'=>\$langs->trans(\"Field2\"), 'checked'=>1),",'/').'/', '', $targetcontent);
-    
-    // Substitute print_liste_field_titre
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print_liste_field_titre(\$arrayfields['t.".$prop['field']."']['label'],\$_SERVER['PHP_SELF'],'t.".$prop['field']."','',\$params,'',\$sortfield,\$sortorder);\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_TITLE_FIELDS/', $varprop, $targetcontent);
-    
-    // Substitute fields title search
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td class=\"liste_titre\"><input type=\"text\" class=\"flat\" name=\"search_".$prop['field']."\" value=\"'.\$search_".$prop['field'].".'\" size=\"10\"></td>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_TITLE_SEARCH/', $varprop, $targetcontent);
-    
-    // Substitute where for <td>.fieldx.</td>
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td>'.\$obj->".$prop['field'].".'</td>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field1']['checked'])) print '<td>'.\$obj->field1.'</td>';",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field2']['checked'])) print '<td>'.\$obj->field2.'</td>';",'/').'/', '', $targetcontent);
-
-    // LIST_OF_TD_LABEL_FIELDS_CREATE - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td><input class=\"flat\" type=\"text\" name=\"".$prop['field']."\" value=\"'.GETPOST('".$prop['field']."').'\"></td></tr>';\n";
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_CREATE/', $varprop, $targetcontent);
-
-    // LIST_OF_TD_LABEL_FIELDS_EDIT - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-            $baseString = 'print "<tr><td class=\"fieldrequired\">".\$langs->trans("Field%s")."</td><td><input class=\"flat\" type=\"text\" name=\"%s\" value=\"".$object->%s."\"></td></tr>";';
-            $varprop.= sprintf("\t ".$baseString." \n", $prop['field'], $prop['field'], $prop['field']);
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_EDIT/', $varprop, $targetcontent);
-    
-    // LIST_OF_TD_LABEL_FIELDS_VIEW - List of td for card view 
-    $varprop="\n";
-    $cleanparam='';
-    foreach($property as $key => $prop)
-    {
-    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-    	{
-    	    $varprop.=sprintf("\t print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field%s\").'</td><td>'.\$object->%s.'</td></tr>';\n",$prop['field'],$prop['field']);
-    	}
-    }
-    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_VIEW/', $varprop, $targetcontent);
-    
-    
-    // LIST_OF_TD_FIELDS_LIST
-    
-    
-    
-    // Build file
-    $fp=fopen($outfile,"w");
-    if ($fp)
-    {
-    	fputs($fp, $targetcontent);
-    	fclose($fp);
-    	print "File '".$outfile."' has been built in current directory.\n";
-    }
-    else $error++;
-}
-
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You can now move generated files to store them into directory /yourmodule/class (for .class.php file) or /yourmodule.\n";
-return $error;
diff --git a/htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php b/htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
deleted file mode 100755
index c91347a424d..00000000000
--- a/htdocs/modulebuilder/oldskeletons/build_webservice_from_class.php
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       dev/skeletons/build_webservice_from_class.php
- *  \ingroup    core
- *  \brief      Create a complete webservice file from CRUD functions of a PHP class
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-// Include Dolibarr environment
-require_once($path."../../htdocs/master.inc.php");
-// After this $db is a defined handler to database.
-
-// Main
-$version='1.8';
-@set_time_limit(0);
-$error=0;
-
-$langs->load("main");
-
-
-print "***** $script_file ($version) *****\n";
-
-
-// -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-// Check parameters
-if (! isset($argv[1]) && ! isset($argv[2]))
-{
-    print "Usage: $script_file phpClassFile phpClassName\n";
-    exit;
-}
-
-// Show parameters
-print 'Classfile='.$argv[1]."\n";
-print 'Classname='.$argv[2]."\n";
-
-$classfile=$argv[1];
-$classname=$argv[2];
-$classmin=strtolower($classname);
-$property=array();
-$targetcontent='';
-
-// Load the class and read properties
-require_once($classfile);
-
-$property=array();
-$class = new $classname($db);
-$values=get_class_vars($classname);
-
-unset($values['db']);
-unset($values['error']);
-unset($values['errors']);
-unset($values['element']);
-unset($values['table_element']);
-unset($values['table_element_line']);
-unset($values['fk_element']);
-unset($values['ismultientitymanaged']);
-
-$properties=array_keys($values);
-
-// Read skeleton_class.class.php file
-$skeletonfile='skeleton_webservice_server.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
-{
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
-}
-
-// Define output variables
-$outfile='out.server_'.$classmin.'.php';
-$targetcontent=$sourcecontent;
-
-
-
-// Substitute class name
-$targetcontent=preg_replace('/Skeleton/', $classname, $targetcontent);
-$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
-
-// Substitute declaration parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-		$varprop.="'".$properties[$i]."' => array('name'=>'".$properties[$i]."','type'=>'xsd:string')";
-		$i++;
-
-		if ($i == count($properties))
-			$varprop.="\n";
-		else
-			$varprop.=",\n";
-}
-
-$targetcontent=preg_replace('/\'prop1\'=>\'xxx\',/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\'prop2\'=>\'xxx\',/', '', $targetcontent);
-// Substitute get method parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-		$varprop.="'".$properties[$i]."' => $".$classmin."->".$properties[$i];
-
-		$i++;
-		if ($i == count($properties))
-			$varprop.="\n";
-		else
-			$varprop.=",\n";
-}
-
-$targetcontent=preg_replace('/\'prop1\'=>\$'.$classmin.'->prop1,/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\'prop2\'=>\$'.$classmin.'->prop2,/', '', $targetcontent);
-
-// Substitute get method parameters
-$varprop="\n\t\t";
-$cleanparam='';
-$i=0;
-
-while($i<count($properties))
-{
-
-	$varprop.='$newobject->'.$properties[$i].'=$'.$classmin.'->'.$properties[$i].';';
-
-	$i++;
-	if ($i == count($properties))
-		$varprop.="\n";
-	else
-		$varprop.="\n\t\t";
-}
-$targetcontent=preg_replace('/\$newobject->prop1=\$'.$classmin.'->prop1;/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/\$newobject->prop2=\$'.$classmin.'->prop2;/', '', $targetcontent);
-
-
-
-// Build file
-$fp=fopen($outfile,"w");
-if ($fp)
-{
-	fputs($fp, $targetcontent);
-	fclose($fp);
-	print "File '".$outfile."' has been built in current directory.\n";
-}
-else $error++;
-
-// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
-
-print "You must rename files by removing the 'out.' prefix in their name.\n";
-return $error;
diff --git a/htdocs/modulebuilder/oldskeletons/modMyModule.class.php b/htdocs/modulebuilder/oldskeletons/modMyModule.class.php
deleted file mode 100644
index 4f994c7c654..00000000000
--- a/htdocs/modulebuilder/oldskeletons/modMyModule.class.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * 	\defgroup   mymodule     Module MyModule
- *  \brief      Example of a module descriptor.
- *				Such a file must be copied into htdocs/mymodule/core/modules directory.
- *  \file       htdocs/mymodule/core/modules/modMyModule.class.php
- *  \ingroup    mymodule
- *  \brief      Description and activation file for module MyModule
- */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
-
-
-/**
- *  Description and activation class for module MyModule
- */
-class modMyModule extends DolibarrModules
-{
-	/**
-	 * Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 * @param DoliDB $db Database handler
-	 */
-	public function __construct($db)
-	{
-        global $langs,$conf;
-
-        $this->db = $db;
-
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 500000;		// TODO Go on page http://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'mymodule';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','interface','other'
-		// It is used to group modules by family in module setup page
-		$this->family = "other";
-		// Module position in the family
-		$this->module_position = 500;
-		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
-		//$this->familyinfo = array('myownfamily' => array('position' => '001', 'label' => $langs->trans("MyOwnFamily")));
-
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Description of module MyModule";
-		$this->descriptionlong = "A very long description. Can be a full HTML content";
-		$this->editor_name = 'Editor name';
-		$this->editor_url = 'https://www.dolibarr.org';
-		
-		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = '1.0';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Name of image file used for this module.
-		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='generic';
-
-		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-		// for default path (eg: /mymodule/core/xxxxx) (0=disable, 1=enable)
-		// for specific path of parts (eg: /mymodule/core/modules/barcode)
-		// for specific css file (eg: /mymodule/css/mymodule.css.php)
-		//$this->module_parts = array(
-		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
-		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
-		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
-		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
-		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
-		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
-		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
-		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
-		//							'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
-	 	//							'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
-		//							'hooks' => array('hookcontext1','hookcontext2',...) // Set here all hooks context managed by module. You can also set hook context 'all'
-		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
-		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@mymodule')) // Set here all workflow context managed by module
-		//                        );
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/mymodule/temp");
-		$this->dirs = array();
-
-		// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
-		$this->config_page_url = array("mysetuppage.php@mymodule");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("mylangfile@mymodule");
-
-		// Constants
-		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array();
-
-		// Array to add new pages in new tabs
-		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-		// where objecttype can be
-		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-		// 'contact'          to add a tab in contact view
-		// 'contract'         to add a tab in contract view
-		// 'group'            to add a tab in group view
-		// 'intervention'     to add a tab in intervention view
-		// 'invoice'          to add a tab in customer invoice view
-		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
-		// 'opensurveypoll'	  to add a tab in opensurvey poll view
-		// 'order'            to add a tab in customer order view
-		// 'order_supplier'   to add a tab in supplier order view
-		// 'payment'		  to add a tab in payment view
-		// 'payment_supplier' to add a tab in supplier payment view
-		// 'product'          to add a tab in product view
-		// 'propal'           to add a tab in propal view
-		// 'project'          to add a tab in project view
-		// 'stock'            to add a tab in stock view
-		// 'thirdparty'       to add a tab in third party view
-		// 'user'             to add a tab in user view
-        $this->tabs = array();
-
-		if (! isset($conf->mymodule) || ! isset($conf->mymodule->enabled))
-        {
-        	$conf->mymodule=new stdClass();
-        	$conf->mymodule->enabled=0;
-        }
-        
-        // Dictionaries
-		$this->dictionaries=array();
-        /* Example:
-        $this->dictionaries=array(
-            'langs'=>'mylangfile@mymodule',
-            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->mymodule->enabled,$conf->mymodule->enabled,$conf->mymodule->enabled)												// Condition to show each dictionary
-        );
-        */
-
-        // Boxes
-		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array();			// List of boxes
-		// Example:
-		//$this->boxes=array(
-		//    0=>array('file'=>'myboxa.php@mymodule','note'=>'','enabledbydefaulton'=>'Home'),
-		//    1=>array('file'=>'myboxb.php@mymodule','note'=>''),
-		//    2=>array('file'=>'myboxc.php@mymodule','note'=>'')
-		//);
-
-		// Cronjobs
-		$this->cronjobs = array();			// List of cron jobs entries to add
-		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true),
-		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true)
-		// );
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		// $this->rights[$r][1] = 'Permision label';	// Permission label
-		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $r++;
-
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
-
-		// Add here entries to declare new menus
-		//
-		// Example to declare a new Top Menu entry and its Left menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'top',			                // This is a Top menu entry
-		//							'titre'=>'MyModule top menu',
-		//							'mainmenu'=>'mymodule',
-		//							'leftmenu'=>'mymodule',
-		//							'url'=>'/mymodule/pagetop.php',
-		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->mymodule->enabled',	// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-		//
-		// Example to declare a Left Menu entry into an existing Top menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'left',			                // This is a Left menu entry
-		//							'titre'=>'MyModule left menu',
-		//							'mainmenu'=>'xxx',
-		//							'leftmenu'=>'mymodule',
-		//							'url'=>'/mymodule/pagelevel2.php',
-		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->mymodule->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-
-
-		// Exports
-		$r=1;
-
-		// Example:
-		// $this->export_code[$r]=$this->rights_class.'_'.$r;
-		// $this->export_label[$r]='MyModule';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
-        // $this->export_icon[$r]='generic:MyModule';					// Put here code of icon then string for translation key of module name
-		// $this->export_permission[$r]=array(array("mymodule","level1","level2"));
-		// $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef');
-		// $this->export_TypeFields_array[$r]=array('t.date'=>'Date', 't.qte'=>'Numeric', 't.poids'=>'Numeric', 't.fad'=>'Numeric', 't.paq'=>'Numeric', 't.stockage'=>'Numeric', 't.fadparliv'=>'Numeric', 't.livau100'=>'Numeric', 't.forfait'=>'Numeric', 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text');
-		// $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product');
-		// $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		// $this->export_sql_start[$r]='SELECT DISTINCT ';
-		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
-		// $r++;
-	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	public function init($options='')
-	{
-		$sql = array();
-
-		//$this->_load_tables('/mymodule/sql/');
-
-		return $this->_init($sql, $options);
-	}
-
-	/**
-	 * Function called when module is disabled.
-	 * Remove from database constants, boxes and permissions from Dolibarr database.
-	 * Data directories are not deleted
-	 *
-	 * @param      string	$options    Options when enabling module ('', 'noboxes')
-	 * @return     int             	1 if OK, 0 if KO
-	 */
-	public function remove($options = '')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
-
-}
-
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
deleted file mode 100644
index 97224b64da9..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_api_class.class.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
- use Luracast\Restler\RestException;
-
-
-/**
- * API class for skeleton object
- *
- * @smart-auto-routing false
- * @access protected 
- * @class  DolibarrApiAccess {@requires user,external}
- * 
- *
- */
-class SkeletonApi extends DolibarrApi
-{
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
-     */
-    static $FIELDS = array(
-        'name'
-    );
-
-    /**
-     * @var Skeleton $skeleton {@type Skeleton}
-     */
-    public $skeleton;
-
-    /**
-     * Constructor
-     *
-     * @url     GET skeleton/
-     * 
-     */
-    function __construct()
-    {
-		global $db, $conf;
-		$this->db = $db;
-        $this->skeleton = new Skeleton($this->db);
-    }
-
-    /**
-     * Get properties of a skeleton object
-     *
-     * Return an array with skeleton informations
-     *
-     * @param 	int 	$id ID of skeleton
-     * @return 	array|mixed data without useless information
-	 * 
-     * @url	GET skeleton/{id}
-     * @throws 	RestException
-     */
-    function get($id)
-    {		
-		if(! DolibarrApiAccess::$user->rights->skeleton->read) {
-			throw new RestException(401);
-		}
-			
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		return $this->_cleanObjectDatas($this->skeleton);
-    }
-
-    /**
-     * List skeletons
-     * 
-     * Get a list of skeletons
-     * 
-     * @param int		$mode		Use this param to filter list
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') or (t.import_key:=:'20160101')"
-     * @return array Array of skeleton objects
-     *
-     * @url	GET /skeletons/
-     */
-    function index($mode, $sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '') {
-        global $db, $conf;
-        
-        $obj_ret = array();
-        
-        $socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
-            
-        // If the internal user must only see his customers, force searching by him
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-
-        $sql = "SELECT s.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."skeleton as s";
-        
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-        $sql.= " WHERE s.fk_stcomm = st.id";
-        
-		// Example of use $mode
-        //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
-        //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
-
-        $sql.= ' AND s.entity IN ('.getEntity('skeleton').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
-        if ($socid) $sql.= " AND s.fk_soc = ".$socid;
-        if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        if ($sqlfilters)
-        {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql.= $db->plimit($limit + 1, $offset);
-        }
-
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($result);
-                $skeleton_static = new Skeleton($db);
-                if($skeleton_static->fetch($obj->rowid)) {
-                    $obj_ret[] = parent::_cleanObjectDatas($skeleton_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve skeleton list');
-        }
-        if( ! count($obj_ret)) {
-            throw new RestException(404, 'No skeleton found');
-        }
-		return $obj_ret;
-    }
-    
-    /**
-     * Create skeleton object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of skeleton
-     * 
-     * @url	POST skeleton/
-     */
-    function post($request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->create) {
-			throw new RestException(401);
-		}
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-        
-        foreach($request_data as $field => $value) {
-            $this->skeleton->$field = $value;
-        }
-        if( ! $this->skeleton->create(DolibarrApiAccess::$user)) {
-            throw new RestException(500);
-        }
-        return $this->skeleton->id;
-    }
-
-    /**
-     * Update skeleton
-     *
-     * @param int   $id             Id of skeleton to update
-     * @param array $request_data   Datas   
-     * @return int 
-     * 
-     * @url	PUT skeleton/{id}
-     */
-    function put($id, $request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->create) {
-			throw new RestException(401);
-		}
-        
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-        foreach($request_data as $field => $value) {
-            $this->skeleton->$field = $value;
-        }
-        
-        if($this->skeleton->update($id, DolibarrApiAccess::$user))
-            return $this->get ($id);
-        
-        return false;
-    }
-    
-    /**
-     * Delete skeleton
-     *
-     * @param   int     $id   Skeleton ID
-     * @return  array
-     * 
-     * @url	DELETE skeleton/{id}
-     */
-    function delete($id)
-    {
-        if(! DolibarrApiAccess::$user->rights->skeleton->supprimer) {
-			throw new RestException(401);
-		}
-        $result = $this->skeleton->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Skeleton not found');
-        }
-		
-		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-        
-        if( !$this->skeleton->delete($id))
-        {
-            throw new RestException(500);
-        }
-        
-         return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Skeleton deleted'
-            )
-        );
-        
-    }
-    
-    /**
-     * Validate fields before create or update object
-     * 
-     * @param array $data   Data to validate
-     * @return array
-     * 
-     * @throws RestException
-     */
-    function _validate($data)
-    {
-        $skeleton = array();
-        foreach (SkeletonApi::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $skeleton[$field] = $data[$field];
-        }
-        return $skeleton;
-    }
-}
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_card.php b/htdocs/modulebuilder/oldskeletons/skeleton_card.php
deleted file mode 100644
index 49683af79c8..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_card.php
+++ /dev/null
@@ -1,604 +0,0 @@
-<?php
-/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *   	\file       dev/skeletons/skeleton_card.php
- *		\ingroup    mymodule othermodule1 othermodule2
- *		\brief      This file is an example of a php page
- *					Put here some comments
- */
-
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-
-// Change this following line to use the correct relative path (../, ../../, etc)
-$res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
-if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
-if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
-if (! $res) die("Include of main fails");
-// Change this following line to use the correct relative path from htdocs
-include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
-dol_include_once('/mymodule/class/skeleton_class.class.php');
-
-// Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
-
-// Get parameters
-$id			= GETPOST('id','int');
-$action		= GETPOST('action','alpha');
-$cancel     = GETPOST('cancel');
-$backtopage = GETPOST('backtopage');
-$myparam	= GETPOST('myparam','alpha');
-
-$search_field1=GETPOST("search_field1");
-$search_field2=GETPOST("search_field2");
-
-if (empty($action) && empty($id) && empty($ref)) $action='view';
-
-// Protection if external user
-if ($user->societe_id > 0)
-{
-	//accessforbidden();
-}
-//$result = restrictedArea($user, 'mymodule', $id);
-
-
-$object = new Skeleton_Class($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-
-// Load object
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-
-// Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('skeleton'));
-
-
-
-/*
- * ACTIONS
- *
- * Put here all code to do according to value of "action" parameter
- */
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
-	if ($cancel) 
-	{
-		if ($action != 'addlink')
-		{
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-			header("Location: ".$urltogo);
-			exit;
-		}		
-		if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
-		$action='';
-	}
-	
-	// Action to add record
-	if ($action == 'add' && ! empty($user->rights->mymodule->create))
-	{
-		if ($cancel)
-		{
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-			header("Location: ".$urltogo);
-			exit;
-		}
-
-		$error=0;
-
-		/* object_prop_getpost_prop */
-		$object->prop1=GETPOST("field1");
-		$object->prop2=GETPOST("field2");
-
-		if (empty($object->ref))
-		{
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
-		}
-
-		if (! $error)
-		{
-			$result=$object->create($user);
-			if ($result > 0)
-			{
-				// Creation OK
-				$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
-				header("Location: ".$urltogo);
-				exit;
-			}
-			{
-				// Creation KO
-				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-				else  setEventMessages($object->error, null, 'errors');
-				$action='create';
-			}
-		}
-		else
-		{
-			$action='create';
-		}
-	}
-
-	// Action to update record
-	if ($action == 'update' && ! empty($user->rights->mymodule->create))
-	{
-		$error=0;
-
-		$object->prop1=GETPOST("field1");
-		$object->prop2=GETPOST("field2");
-
-		if (empty($object->ref))
-		{
-			$error++;
-			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
-		}
-
-		if (! $error)
-		{
-			$result=$object->update($user);
-			if ($result > 0)
-			{
-				$action='view';
-			}
-			else
-			{
-				// Creation KO
-				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-				else setEventMessages($object->error, null, 'errors');
-				$action='edit';
-			}
-		}
-		else
-		{
-			$action='edit';
-		}
-	}
-
-	// Action to delete
-	if ($action == 'confirm_delete' && ! empty($user->rights->mymodule->delete))
-	{
-		$result=$object->delete($user);
-		if ($result > 0)
-		{
-			// Delete OK
-			setEventMessages("RecordDeleted", null, 'mesgs');
-			header("Location: ".dol_buildpath('/mymodule/list.php',1));
-			exit;
-		}
-		else
-		{
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else setEventMessages($object->error, null, 'errors');
-		}
-	}
-}
-
-
-
-
-/*
- * VIEW
- *
- * Put here all code to build page
- */
-
-$form=new Form($db);
-
-llxHeader('','MyPageName','');
-
-
-// Put here content of your page
-
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
-
-// Part to create
-if ($action == 'create')
-{
-	print load_fiche_titre($langs->trans("NewMyModule"));
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-
-	dol_fiche_head();
-
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_CREATE
-	print '</table>'."\n";
-
-	dol_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
-
-	print '</form>';
-}
-
-
-
-// Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
-	print load_fiche_titre($langs->trans("MyModule"));
-    
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	
-	dol_fiche_head();
-
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_EDIT
-	print '</table>';
-	
-	dol_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
-
-	print '</form>';
-}
-
-
-
-// Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
-    $res = $object->fetch_optionals($object->id, $extralabels);
-
-	$head = mymodule_prepare_head($object);
-	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
-		
-	$formconfirm = '';
-	
-	// Confirmation to delete
-	if ($action == 'delete') {
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
-	}
-	
-	// Confirmation of action xxxx
-	if ($action == 'xxx')
-	{
-	    $formquestion=array();
-	    /*
-	        $formquestion = array(
-	            // 'text' => $langs->trans("ConfirmClone"),
-	            // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
-	            // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
-	            // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
-	    }*/	
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
-	}
-	
-	if (! $formconfirm) {
-	    $parameters = array('lineid' => $lineid);
-	    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-	    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
-	}
-	
-	// Print form confirm
-	print $formconfirm;
-	
-	
-	
-	// Object card
-	// ------------------------------------------------------------
-	
-	$linkback = '<a href="' . DOL_URL_ROOT . '/mymodule/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
-	
-	$morehtmlref='<div class="refidno">';
-	/*
-	// Ref bis
-	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	    if ($user->rights->mymodule->creer)
-	    {
-	        if ($action != 'classify')
-	        {
-	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
-	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	        }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
-	}
-	*/
-	$morehtmlref.='</div>';
-	
-	
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	
-	
-	print '<div class="fichecenter">';
-	print '<div class="fichehalfleft">';
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
-	// LIST_OF_TD_LABEL_FIELDS_VIEW
-
-
-	// Other attributes
-	$cols = 2;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-
-	print '</table>';
-	print '</div>';
-	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
-	
-	
-
-	print '</table>';
-	print '</div>';
-	print '</div>';
-	print '</div>';
-	
-	print '<div class="clearboth"></div><br>';
-	
-	dol_fiche_end();
-
-
-	// Buttons for actions
-	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters=array();
-    	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-    
-    	if (empty($reshook))
-    	{
-    		if ($user->rights->mymodule->write)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-    		}
-    
-    		if ($user->rights->mymodule->delete)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
-	}
-
-	
-	// Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-	    $action = 'presend';
-	}
-	
-	if ($action != 'presend')
-	{
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
-	    // Documents
-	    $comref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $comref . '/' . $comref . '.pdf';
-	    $filedir = $conf->mymodule->dir_output . '/' . $comref;
-	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-	    $genallowed = $user->rights->mymodule->creer;
-	    $delallowed = $user->rights->mymodule->supprimer;
-	    print $formfile->showdocuments('mymodule', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
-	
-	
-	    // Show links to link elements
-	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
-	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-	
-	
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-	
-	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-	    $formactions = new FormActions($db);
-	    $somethingshown = $formactions->showactions($object, 'order', $socid);
-	
-	    print '</div></div></div>';
-	}
-	
-
-	/*
-	 * Action presend
-	 */
-    /*
-	if ($action == 'presend')
-	{
-		$object->fetch_projet();
-
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file = $fileparams['fullname'];
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('commercial');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file)) {
-			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0) {
-				dol_print_error($db, $object->error, $object->errors);
-				exit();
-			}
-			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendOrderByMail'));
-
-		dol_fiche_head('');
-
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='ord'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
-		}
-		$formmail->withfrom = 1;
-		$liste = array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
-			$liste [$key] = $value;
-		$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
-		$formmail->withtocc = $liste;
-		$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-		if (empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
-		} else if (! empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
-		}
-		$formmail->withfile = 2;
-		$formmail->withbody = 1;
-		$formmail->withdeliveryreceipt = 1;
-		$formmail->withcancel = 1;
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object);
-		$formmail->substit ['__ORDERREF__'] = $object->ref;
-
-		$custcontact = '';
-		$contactarr = array();
-		$contactarr = $object->liste_contact(- 1, 'external');
-
-		if (is_array($contactarr) && count($contactarr) > 0)
-		{
-			foreach ($contactarr as $contact)
-			{
-				if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
-					$contactstatic = new Contact($db);
-					$contactstatic->fetch($contact ['id']);
-					$custcontact = $contactstatic->getFullName($langs, 1);
-				}
-			}
-
-			if (! empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action'] = 'send';
-		$formmail->param['models'] = 'order_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['orderid'] = $object->id;
-		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-
-		// Init list of files
-		if (GETPOST("mode") == 'init') {
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-		}
-
-		// Show form
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}*/
-}
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php b/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
deleted file mode 100644
index ea552ad85f9..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_class.class.php
+++ /dev/null
@@ -1,606 +0,0 @@
-<?php
-/* Copyright (C) 2007-2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
- * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file        modulebuilder/skeletons/skeleton_class.class.php
- * \ingroup     mymodule othermodule1 othermodule2
- * \brief       This file is an example for a CRUD class file (Create/Read/Update/Delete)
- */
-
-// Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-
-/**
- * Class Skeleton_Class
- *
- * Put here description of your class.
- */
-class Skeleton_Class extends CommonObject
-{
-	/**
-	 * @var string Id to identify managed object
-	 */
-	public $element = 'skeleton';
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'skeleton';
-    /**
-     * @var array Array with all fields and their property
-     */
-	public $picto = 'generic';
-    /**
-     * @var array Array with all fields and their property
-     */
-	public $fields;
-	
-	/**
-	 * @var mixed Sample property 1
-	 */
-	public $prop1;
-	/**
-	 * @var mixed Sample property 2
-	 */
-	public $prop2;
-	
-	//...
-	
-	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	
-	public $table_element_line = 'skeletondet';
-    public $class_element_line = 'SkeletonLine';
-    public $fk_element = 'fk_skeleton';
-    /**
-	 * @var Skeleton_ClassLine[] Lines
-	 */
-	public $lines = array();
-	
-	
-	
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		// Clean parameters
-		if (isset($this->prop1)) {
-			$this->prop1 = trim($this->prop1);
-		}
-		if (isset($this->prop2)) {
-			$this->prop2 = trim($this->prop2);
-		}
-		//...
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
-		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
-		$sql .= ' field1,';
-		$sql .= ' field2';
-		//...
-		$sql .= ') VALUES (';
-		$sql .= ' \'' . $this->prop1 . '\',';
-		$sql .= ' \'' . $this->prop2 . '\'';
-		//...
-		$sql .= ')';
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action to call a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-				//if ($result < 0) $error++;
-				//// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return $this->id;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id  Id object
-	 * @param string $ref Ref
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id, $ref = null)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-		$sql .= ' t.field1,';
-		$sql .= ' t.field2';
-		//...
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		$sql.= ' WHERE 1 = 1';
-		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity('skeleton') . ")";
-		}
-		if (null !== $ref) {
-			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
-		} else {
-			$sql .= ' AND t.rowid = ' . $id;
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$numrows = $this->db->num_rows($resql);
-			if ($numrows) {
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id = $obj->rowid;
-				$this->prop1 = $obj->field1;
-				$this->prop2 = $obj->field2;
-				//...
-			}
-			
-			// Retrieve all extrafields for invoice
-			// fetch optionals attributes and labels
-			/*
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields=new ExtraFields($this->db);
-			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-			$this->fetch_optionals($this->id,$extralabels);
-            */
-			
-			// $this->fetch_lines();
-			
-			$this->db->free($resql);
-
-			if ($numrows) {
-				return 1;
-			} else {
-				return 0;
-			}
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-		$sql .= ' t.field1,';
-		$sql .= ' t.field2';
-		//...
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
-			}
-		}
-		$sql.= ' WHERE 1 = 1';
-		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity('skeleton') . ")";
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
-		}
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
-		}
-		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new self($this->db);
-
-				$line->id = $obj->rowid;
-				$line->prop1 = $obj->field1;
-				$line->prop2 = $obj->field2;
-				//...
-			}
-			$this->db->free($resql);
-
-			return $num;
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-		
-		// Clean parameters
-		if (isset($this->prop1)) {
-			$this->prop1 = trim($this->prop1);
-		}
-		if (isset($this->prop2)) {
-			$this->prop2 = trim($this->prop2);
-		}
-		//...
-
-		// Check parameters
-		// Put here code to add a control on parameters values
-
-		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-		$sql .= " field1=".(isset($this->field1)?"'".$this->db->escape($this->field1)."'":"null").",";
-        $sql .= " field2=".(isset($this->field2)?"'".$this->db->escape($this->field2)."'":"null")."";
-		//...
-		$sql .= ' WHERE rowid=' . $this->id;
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error && !$notrigger) {
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action calls a trigger.
-
-			//// Call triggers
-			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-			//// End call triggers
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		$this->db->begin();
-
-		if (!$error) {
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action calls a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-				//// End call triggers
-			}
-		}
-
-		// If you need to delete child tables to, you can insert them here
-		
-		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE rowid=' . $this->id;
-
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Load an object from its id and create a new one in database
-	 *
-	 * @param int $fromid Id of object to clone
-	 *
-	 * @return int New id of clone
-	 */
-	public function createFromClone($fromid)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		global $user;
-		$error = 0;
-		$object = new Skeleton_Class($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetch($fromid);
-		// Reset object
-		$object->id = 0;
-
-		// Clear fields
-		// ...
-
-		// Create clone
-		$result = $object->create($user);
-
-		// Other options
-		if ($result < 0) {
-			$error ++;
-			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		// End
-		if (!$error) {
-			$this->db->commit();
-
-			return $object->id;
-		} else {
-			$this->db->rollback();
-
-			return - 1;
-		}
-	}
-
-	/**
-	 *  Return a link to the object card (with optionaly the picto)
-	 *
-	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *	@param	string	$option				On what the link point to
-     *  @param	int  	$notooltip			1=Disable tooltip
-     *  @param	int		$maxlen				Max length of visible user name
-     *  @param  string  $morecss            Add more css on link
-	 *	@return	string						String with URL
-	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
-	{
-		global $db, $conf, $langs;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
-
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
-        $result = '';
-        $companylink = '';
-
-        $label = '<u>' . $langs->trans("MyModule") . '</u>';
-        $label.= '<br>';
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-
-        $url = DOL_URL_ROOT.'/mymodule/'.$this->table_name.'_card.php?id='.$this->id;
-        
-        $linkclose='';
-        if (empty($notooltip))
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label=$langs->trans("ShowProject");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
-        }
-        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
-        
-		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
-
-        if ($withpicto)
-        {
-            $result.=($linkstart.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result.=' ';
-		}
-		$result.= $linkstart . $this->ref . $linkend;
-		return $result;
-	}
-
-	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
-	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return	string 			       Label of status
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
-
-	/**
-	 *  Return the status
-	 *
-	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
-	 *  @return string 			       	Label of status
-	 */
-	static function LibStatut($status,$mode=0)
-	{
-		global $langs;
-
-		if ($mode == 0)
-		{
-			$prefix='';
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		if ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-		if ($mode == 6)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-	}
-
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->id = 0;
-		$this->prop1 = 'prop1';
-		$this->prop2 = 'prop2';
-	}
-
-}
-
-/**
- * Class Skeleton_ClassLine
- */
-class Skeleton_ClassLine
-{
-	/**
-	 * @var int ID
-	 */
-	public $id;
-	/**
-	 * @var mixed Sample line property 1
-	 */
-	public $prop1;
-	/**
-	 * @var mixed Sample line property 2
-	 */
-	public $prop2;
-}
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_list.php b/htdocs/modulebuilder/oldskeletons/skeleton_list.php
deleted file mode 100644
index 842fdf32457..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_list.php
+++ /dev/null
@@ -1,570 +0,0 @@
-<?php
-/* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2016 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2016      Jean-François Ferry	<jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *   	\file       dev/skeletons/skeleton_list.php
- *		\ingroup    mymodule othermodule1 othermodule2
- *		\brief      This file is an example of a php page
- *					Put here some comments
- */
-
-//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
-//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
-
-// Change this following line to use the correct relative path (../, ../../, etc)
-$res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
-if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
-if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
-if (! $res) die("Include of main fails");
-// Change this following line to use the correct relative path from htdocs
-require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-dol_include_once('/mymodule/class/skeleton_class.class.php');
-
-// Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
-
-$action=GETPOST('action','alpha');
-$massaction=GETPOST('massaction','alpha');
-$show_files=GETPOST('show_files','int');
-$confirm=GETPOST('confirm','alpha');
-$toselect = GETPOST('toselect', 'array');
-
-$id			= GETPOST('id','int');
-$backtopage = GETPOST('backtopage');
-$myparam	= GETPOST('myparam','alpha');
-
-$search_all=trim(GETPOST("sall"));
-$search_field1=GETPOST("search_field1");
-$search_field2=GETPOST("search_field2");
-$search_myfield=GETPOST('search_myfield');
-$optioncss = GETPOST('optioncss','alpha');
-
-// Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortfield) $sortfield="t.rowid"; // Set here default search field
-if (! $sortorder) $sortorder="ASC";
-
-// Protection if external user
-$socid=0;
-if ($user->societe_id > 0)
-{
-    $socid = $user->societe_id;
-	//accessforbidden();
-}
-
-// Initialize technical object to manage context to save list fields
-$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'mymodulelist';
-
-// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
-$hookmanager->initHooks(array('mymodulelist'));
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('mymodule');
-$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
-
-// List of fields to search into when doing a "search in all"
-$fieldstosearchall = array(
-    't.ref'=>'Ref',
-    't.note_public'=>'NotePublic',
-);
-if (empty($user->socid)) $fieldstosearchall["t.note_private"]="NotePrivate";
-
-// Definition of fields for list
-$arrayfields=array(
-    't.field1'=>array('label'=>"Field1", 'checked'=>1),
-    't.field2'=>array('label'=>"Field2", 'checked'=>1),
-    //'t.entity'=>array('label'=>"Entity", 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
-    't.datec'=>array('label'=>"DateCreationShort", 'checked'=>0, 'position'=>500),
-    't.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-    //'t.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
-);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-    foreach($extrafields->attribute_label as $key => $val)
-    {
-        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
-    }
-}
-
-
-$object=new Skeleton_Class($db);
-
-
-
-
-/*
- * ACTIONS
- *
- * Put here all code to do according to value of "action" parameter
- */
-
-if (GETPOST('cancel')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-    // Purge search criteria
-    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
-    {
-    	$search_field1='';
-    	$search_field2='';
-    	$search_date_creation='';
-    	$search_date_update='';
-        $toselect='';
-        $search_array_options=array();
-    }
-
-    // Mass actions
-    $objectclass='Skeleton';
-    $objectlabel='Skeleton';
-    $permtoread = $user->rights->skeleton->read;
-    $permtodelete = $user->rights->skeleton->delete;
-    $uploaddir = $conf->skeleton->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-}
-
-
-
-/*
- * VIEW
- *
- * Put here all code to build page
- */
-
-$now=dol_now();
-
-$form=new Form($db);
-
-//$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
-$help_url='';
-$title = $langs->trans('MyModuleListTitle');
-
-// Put here content of your page
-
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
-
-
-$sql = "SELECT";
-$sql.= " t.rowid,";
-$sql.= " t.field1,";
-$sql.= " t.field2";
-// Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
-// Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mytable_extrafields as ef on (t.rowid = ef.fk_object)";
-$sql.= " WHERE 1 = 1";
-//$sql.= " WHERE u.entity IN (".getEntity('mytable').")";
-if ($search_field1) $sql.= natural_search("field1",$search_field1);
-if ($search_field2) $sql.= natural_search("field2",$search_field2);
-if ($sall)          $sql.= natural_search(array_keys($fieldstosearchall), $sall);
-// Add where from extra fields
-foreach ($search_array_options as $key => $val)
-{
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    $typ=$extrafields->attribute_type[$tmpkey];
-    $mode=0;
-    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
-    {
-        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
-    }
-}
-// Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.=$db->order($sortfield,$sortorder);
-
-// Count total nb of records
-$nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-}	
-
-$sql.= $db->plimit($limit+1, $offset);
-
-dol_syslog($script_file, LOG_DEBUG);
-$resql=$db->query($sql);
-if (! $resql)
-{
-    dol_print_error($db);
-    exit;
-}
-
-$num = $db->num_rows($resql);
-
-// Direct jump if only one record found
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
-{
-    $obj = $db->fetch_object($resql);
-    $id = $obj->rowid;
-    header("Location: ".DOL_URL_ROOT.'/skeleton/card.php?id='.$id);
-    exit;
-}
-
-llxHeader('', $title, $help_url);
-
-$arrayofselected=is_array($toselect)?$toselect:array();
-
-$param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($search_field1 != '') $param.= '&amp;search_field1='.urlencode($search_field1);
-if ($search_field2 != '') $param.= '&amp;search_field2='.urlencode($search_field2);
-if ($optioncss != '') $param.='&optioncss='.$optioncss;
-// Add $param from extra fields
-foreach ($search_array_options as $key => $val)
-{
-    $crit=$val;
-    $tmpkey=preg_replace('/search_options_/','',$key);
-    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-} 
-
-$arrayofmassactions =  array(
-    'presend'=>$langs->trans("SendByMail"),
-    'builddoc'=>$langs->trans("PDFMerge"),
-);
-if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-if ($massaction == 'presend') $arrayofmassactions=array();
-$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-print '<input type="hidden" name="action" value="list">';
-print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
-print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
-
-if ($sall)
-{
-    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-    print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
-}
-
-$moreforfilter = '';
-$moreforfilter.='<div class="divsearchfield">';
-$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
-$moreforfilter.= '</div>';
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
-
-if (! empty($moreforfilter))
-{
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-    print '</div>';
-}
-
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-
-print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-
-// Fields title
-print '<tr class="liste_titre">';
-// LIST_OF_TD_TITLE_FIELDS
-//if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($arrayfields['t.field1']['label'],$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($arrayfields['t.field2']['label'],$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val) 
-   {
-       if (! empty($arrayfields["ef.".$key]['checked'])) 
-       {
-			$align=$extrafields->getAlignFlag($key);
-			$sortonfield = "ef.".$key;
-			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
-			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-print '</tr>'."\n";
-
-// Fields title search
-print '<tr class="liste_titre">';
-// LIST_OF_TD_TITLE_SEARCH
-//if (! empty($arrayfields['t.field1']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field1" value="'.$search_field1.'" size="10"></td>';
-//if (! empty($arrayfields['t.field2']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_field2" value="'.$search_field2.'" size="10"></td>';
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-    foreach($extrafields->attribute_label as $key => $val) 
-    {
-        if (! empty($arrayfields["ef.".$key]['checked']))
-        {
-            $align=$extrafields->getAlignFlag($key);
-            $typeofextrafield=$extrafields->attribute_type[$key];
-            print '<td class="liste_titre'.($align?' '.$align:'').'">';
-        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
-			{
-			    $crit=$val;
-				$tmpkey=preg_replace('/search_options_/','',$key);
-				$searchclass='';
-				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
-			}
-            print '</td>';
-        }
-    }
-}
-// Fields from hook
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))
-{
-    // Date creation
-    print '<td class="liste_titre">';
-    print '</td>';
-}
-if (! empty($arrayfields['t.tms']['checked']))
-{
-    // Date modification
-    print '<td class="liste_titre">';
-    print '</td>';
-}
-/*if (! empty($arrayfields['u.statut']['checked']))
-{
-    // Status
-    print '<td class="liste_titre" align="center">';
-    print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
-    print '</td>';
-}*/
-// Action column
-print '<td class="liste_titre" align="right">';
-$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-print $searchpicto;
-print '</td>';
-print '</tr>'."\n";
-    
-
-// Detect if we need a fetch on each output line
-$needToFetchEachLine=0;
-foreach ($extrafields->attribute_computed as $key => $val)
-{
-    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
-}
-
-
-$i=0;
-$totalarray=array();
-while ($i < min($num, $limit))
-{
-    $obj = $db->fetch_object($resql);
-    if ($obj)
-    {
-        // Show here line of result
-        print '<tr class="oddeven">';
-        // LIST_OF_TD_FIELDS_LIST
-        /*
-        if (! empty($arrayfields['t.field1']['checked'])) 
-        {
-            print '<td>'.$obj->field1.'</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        if (! empty($arrayfields['t.field2']['checked'])) 
-        {
-            print '<td>'.$obj->field2.'</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }*/
-    	// Extra fields
-		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-		{
-		   foreach($extrafields->attribute_label as $key => $val) 
-		   {
-				if (! empty($arrayfields["ef.".$key]['checked'])) 
-				{
-					print '<td';
-					$align=$extrafields->getAlignFlag($key);
-					if ($align) print ' align="'.$align.'"';
-					print '>';
-					$tmpkey='options_'.$key;
-					print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
-					print '</td>';
-		            if (! $i) $totalarray['nbfield']++;
-				}
-		   }
-		}
-        // Fields from hook
-	    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-    	// Date creation
-        if (! empty($arrayfields['t.datec']['checked']))
-        {
-            print '<td align="center">';
-            print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
-            print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        // Date modification
-        if (! empty($arrayfields['t.tms']['checked']))
-        {
-            print '<td align="center">';
-            print dol_print_date($db->jdate($obj->date_update), 'dayhour');
-            print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }
-        // Status
-        /*
-        if (! empty($arrayfields['u.statut']['checked']))
-        {
-		  $userstatic->statut=$obj->statut;
-          print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
-        }*/
-
-        // Action column
-        print '<td class="nowrap" align="center">';
-	    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-        {
-	        $selected=0;
-			if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-        }
-	    print '</td>';
-        if (! $i) $totalarray['nbfield']++;
-
-        print '</tr>';
-    }
-    $i++;
-}
-
-// Show total line
-if (isset($totalarray['totalhtfield']))
-{
-    print '<tr class="liste_total">';
-    $i=0;
-    while ($i < $totalarray['nbfield'])
-    {
-        $i++;
-        if ($i == 1)
-        {
-            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-        }
-        elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
-        elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
-        elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
-        else print '<td></td>';
-    }
-    print '</tr>';
-}
-
-$db->free($resql);
-
-$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-
-print '</table>'."\n";
-print '</div>'."\n";
-
-print '</form>'."\n";
-
-
-if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-{
-    // Show list of available documents
-    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-    $urlsource.=str_replace('&amp;','&',$param);
-
-    $filedir=$diroutputmassaction;
-    $genallowed=$user->rights->facture->lire;
-    $delallowed=$user->rights->facture->lire;
-
-    print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-}
-else
-{
-    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-}
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_script.php b/htdocs/modulebuilder/oldskeletons/skeleton_script.php
deleted file mode 100644
index 5eb1565d4a3..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_script.php
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2007-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       dev/skeletons/skeleton_script.php
- *		\ingroup    mymodule
- *      \brief      This file is an example for a command line script
- *					Put here some comments
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
-}
-
-// Global variables
-$version='1.0';
-$error=0;
-
-
-// -------------------- START OF YOUR CODE HERE --------------------
-@set_time_limit(0);							// No timeout for this script
-define('EVEN_IF_ONLY_LOGIN_ALLOWED',1);		// Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
-
-// Include and load Dolibarr environment variables
-require_once($path."../../htdocs/master.inc.php");
-// After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file).
-// $user is created but empty.
-
-//$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
-
-// Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
-$user->getrights();
-
-
-print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-if (! isset($argv[1])) {	// Check parameters
-    print "Usage: ".$script_file." param1 param2 ...\n";
-	exit(-1);
-}
-print '--- start'."\n";
-print 'Argument 1='.$argv[1]."\n";
-print 'Argument 2='.$argv[2]."\n";
-
-
-// Start of transaction
-$db->begin();
-
-
-// Examples for manipulating class skeleton_class
-require_once(DOL_DOCUMENT_ROOT."/../dev/skeletons/skeleton_class.class.php");
-$myobject=new Skeleton_Class($db);
-
-// Example for inserting creating object in database
-/*
-dol_syslog($script_file." CREATE", LOG_DEBUG);
-$myobject->prop1='value_prop1';
-$myobject->prop2='value_prop2';
-$id=$myobject->create($user);
-if ($id < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object created with id=".$id."\n";
-*/
-
-// Example for reading object from database
-/*
-dol_syslog($script_file." FETCH", LOG_DEBUG);
-$result=$myobject->fetch($id);
-if ($result < 0) { $error; dol_print_error($db,$myobject->error); }
-else print "Object with id=".$id." loaded\n";
-*/
-
-// Example for updating object in database ($myobject must have been loaded by a fetch before)
-/*
-dol_syslog($script_file." UPDATE", LOG_DEBUG);
-$myobject->prop1='newvalue_prop1';
-$myobject->prop2='newvalue_prop2';
-$result=$myobject->update($user);
-if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object with id ".$myobject->id." updated\n";
-*/
-
-// Example for deleting object in database ($myobject must have been loaded by a fetch before)
-/*
-dol_syslog($script_file." DELETE", LOG_DEBUG);
-$result=$myobject->delete($user);
-if ($result < 0) { $error++; dol_print_error($db,$myobject->error); }
-else print "Object with id ".$myobject->id." deleted\n";
-*/
-
-
-// An example of a direct SQL read without using the fetch method
-/*
-$sql = "SELECT field1, field2";
-$sql.= " FROM ".MAIN_DB_PREFIX."skeleton";
-$sql.= " WHERE field3 = 'xxx'";
-$sql.= " ORDER BY field1 ASC";
-
-dol_syslog($script_file, LOG_DEBUG);
-$resql=$db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	$i = 0;
-	if ($num)
-	{
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
-				// You can use here results
-				print $obj->field1;
-				print $obj->field2;
-			}
-			$i++;
-		}
-	}
-}
-else
-{
-	$error++;
-	dol_print_error($db);
-}
-*/
-
-
-// -------------------- END OF YOUR CODE --------------------
-
-if (! $error)
-{
-	$db->commit();
-	print '--- end ok'."\n";
-}
-else
-{
-	print '--- end error code='.$error."\n";
-	$db->rollback();
-}
-
-$db->close();	// Close $db database opened handler
-
-exit($error);
diff --git a/htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php b/htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php
deleted file mode 100644
index 54a050ff9da..00000000000
--- a/htdocs/modulebuilder/oldskeletons/skeleton_webservice_server.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/* Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/webservices/server_skeleton.php
- *       \brief      File that is entry point to call Dolibarr WebServices
- *       \version    $Id: server_skeleton.php,v 1.7 2010/12/19 11:49:37 eldy Exp $
- */
-
-// This is to make Dolibarr working with Plesk
-set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
-
-require_once("../master.inc.php");
-require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
-require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/skeleton/class/skeleton.class.php");
-
-
-dol_syslog("Call Skeleton webservices interfaces");
-
-// Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
-{
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
-}
-
-// Create the soap Object
-$server = new nusoap_server();
-$server->soap_defencoding='UTF-8';
-$server->decode_utf8=false;
-$ns='http://www.dolibarr.org/ns/';
-$server->configureWSDL('WebServicesDolibarrSkeleton',$ns);
-$server->wsdl->schemaTargetNamespace=$ns;
-
-
-// Define WSDL Authentication object
-$server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-    	'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
-    )
-);
-
-// Define WSDL Return object
-$server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
-    )
-);
-
-// Define other specific objects
-$server->wsdl->addComplexType(
-    'skeleton',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-	    'prop1'=>'xxx',
-		'prop2'=>'xxx',
-    //...
-    )
-);
-
-
-
-// 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
-// Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
-// http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
-$styledoc='rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
-$styleuse='encoded';   // encoded/literal/literal wrapped
-// Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
-
-
-// Register WSDL
-$server->register(
-    'getSkeleton',
-    // Entry values
-    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result','skeleton'=>'tns:skeleton'),
-    $ns,
-    $ns.'#getSkeleton',
-    $styledoc,
-    $styleuse,
-    'WS to get skeleton'
-);
-
-// Register WSDL
-$server->register(
-	'createSkeleton',
-	// Entry values
-	array('authentication'=>'tns:authentication','skeleton'=>'tns:skeleton'),
-	// Exit values
-	array('result'=>'tns:result','id'=>'xsd:string'),
-	$ns,
-	$ns.'#createSkeleton',
-	$styledoc,
-	$styleuse,
-	'WS to create a skeleton'
-);
-
-
-
-
-/**
- * Get Skeleton
- *
- * @param	array		$authentication		Array of authentication information
- * @param	int			$id					Id of object
- * @param	string		$ref				Ref of object
- * @param	string		$ref_ext			Ref external of object
- * @return	mixed
- */
-function getSkeleton($authentication,$id,$ref='',$ref_ext='')
-{
-    global $db,$conf,$langs;
-
-    dol_syslog("Function: getSkeleton login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
-
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    // Check parameters
-    if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
-    {
-        $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
-
-    if (! $error)
-    {
-        $fuser->getrights();
-
-        if ($fuser->rights->skeleton->read)
-        {
-            $skeleton=new Skeleton($db);
-            $result=$skeleton->fetch($id,$ref,$ref_ext);
-            if ($result > 0)
-            {
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'skeleton'=>array(
-				    'prop1'=>$skeleton->prop1,
-				    'prop2'=>$skeleton->prop2,
-                    //...
-                    )
-                );
-            }
-            else
-            {
-                $error++;
-                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
-            }
-        }
-        else
-        {
-            $error++;
-            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
-        }
-    }
-
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
-
-    return $objectresp;
-}
-
-
-/**
- * Create Skeleton
- *
- * @param	array		$authentication		Array of authentication information
- * @param	Skeleton	$skeleton		    $skeleton
- * @return	array							Array result
- */
-function createSkeleton($authentication,$skeleton)
-{
-	global $db,$conf,$langs;
-
-	$now=dol_now();
-
-	dol_syslog("Function: createSkeleton login=".$authentication['login']);
-
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
-
-	// Init and check authentication
-	$objectresp=array();
-	$errorcode='';$errorlabel='';
-	$error=0;
-	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-	// Check parameters
-
-
-	if (! $error)
-	{
-		$newobject=new Skeleton($db);
-		$newobject->prop1=$skeleton->prop1;
-		$newobject->prop2=$skeleton->prop2;
-		//...
-
-		$db->begin();
-
-		$result=$newobject->create($fuser);
-		if ($result <= 0)
-		{
-			$error++;
-		}
-
-		if (! $error)
-		{
-			$db->commit();
-			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-		}
-		else
-		{
-			$db->rollback();
-			$error++;
-			$errorcode='KO';
-			$errorlabel=$newobject->error;
-		}
-	}
-
-	if ($error)
-	{
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-	}
-
-	return $objectresp;
-}
-
-// Return the results.
-$server->service(file_get_contents("php://input"));

From a25facef7ce7c6aeae7f1116439a278bd60494da Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sat, 3 Jun 2017 11:49:59 +0200
Subject: [PATCH 1018/1163] Fix: use 0 instead false

---
 ChangeLog                                          |  2 +-
 htdocs/accountancy/customer/card.php               |  2 +-
 htdocs/accountancy/customer/index.php              | 10 +++++-----
 htdocs/accountancy/customer/lines.php              |  4 ++--
 htdocs/accountancy/customer/list.php               |  2 +-
 htdocs/accountancy/expensereport/card.php          |  2 +-
 htdocs/accountancy/expensereport/index.php         |  6 +++---
 htdocs/accountancy/expensereport/lines.php         |  2 +-
 htdocs/accountancy/expensereport/list.php          |  2 +-
 .../accountancy/journal/expensereportsjournal.php  |  2 +-
 htdocs/accountancy/journal/purchasesjournal.php    |  2 +-
 htdocs/accountancy/supplier/card.php               |  2 +-
 htdocs/accountancy/supplier/index.php              |  6 +++---
 htdocs/accountancy/supplier/lines.php              |  2 +-
 htdocs/accountancy/supplier/list.php               |  2 +-
 .../compta/deplacement/class/deplacement.class.php |  2 +-
 htdocs/compta/facture/class/facture.class.php      |  2 +-
 htdocs/contrat/class/contrat.class.php             |  2 +-
 htdocs/contrat/index.php                           | 14 +++++++-------
 htdocs/core/class/html.form.class.php              |  2 +-
 htdocs/core/class/html.formmail.class.php          |  6 +++---
 htdocs/projet/class/project.class.php              |  2 +-
 htdocs/projet/class/task.class.php                 |  2 +-
 23 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 06650828623..fd431b407d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,7 +22,7 @@ Following changes may create regression for some external modules, but were nece
 * Removed Societe::set_commnucation_level (was deprecated in 4.0). Was not used.
 * Removed the trigger file of PAYPAL module that stored data that was not used by Dolibarr. The trigger event still
   exists, but if an external module need action on it, it must provides itself its trigger file.
-* Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', false) instead getEntity('xxx') or getEntity('xxx', 0)
+* Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', 0) instead getEntity('xxx')
 
 ***** ChangeLog for 5.0.3 compared to 5.0.2 *****
 FIX: #6677 Expired contracts dashboard box does not show the name of the thirdparty
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index b32486038af..c436fdfd088 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -93,7 +93,7 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON l.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = l.fk_facture";
 	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id;
-	$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")"; // We don't share object for accountancy
+	$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")"; // We don't share object for accountancy
 
 	dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index ab10efde376..deca83b6f12 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -187,7 +187,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 } else {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
-$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";    // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";    // We don't share object for accountancy
 
 dol_syslog("htdocs/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
 $result = $db->query($sql);
@@ -228,7 +228,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
@@ -284,7 +284,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
@@ -341,7 +341,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
     $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-    $sql .= " AND f.entity IN (" . getEntity('facture', false) . ")"; // We don't share object for accountancy
+    $sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")"; // We don't share object for accountancy
     if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
         $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
     } else {
@@ -387,7 +387,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     	$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
     	$sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     	$sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-    	$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
+    	$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
     	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
     	    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
     	} else {
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index f5e8881e51b..9c88a417bac 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -164,7 +164,7 @@ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " WHERE fd.fk_code_ventilation > 0 ";
-$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";   // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
 $sql .= " AND f.fk_statut > 0";
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
@@ -201,7 +201,7 @@ if (strlen(trim($search_country))) {
 if (strlen(trim($search_tvaintra))) {
 	$sql .= natural_search("s.tva_intra", $search_tva_intra);
 }
-$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";    // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";    // We don't share object for accountancy
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index cc2495a0f9e..9e534d55af7 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -220,7 +220,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 } else {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
-$sql .= " AND f.entity IN (" . getEntity('facture', false) . ")";    // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";    // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index 201e61e97ab..1c94b0b649a 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -96,7 +96,7 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON erd.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
 	$sql .= " WHERE er.fk_statut > 0 AND erd.rowid = " . $id;
-	$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
+	$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";     // We don't share object for accountancy
 
 	dol_syslog("/accounting/expensereport/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 933cd6c3303..e9ce1b2e729 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -206,7 +206,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid =
 $sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= " AND er.fk_statut > 0 ";
-$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -259,7 +259,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid =
 $sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= " AND er.fk_statut > 0 ";
-$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -313,7 +313,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     $sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
     $sql .= " AND er.fk_statut > 0 ";
-    $sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";     // We don't share object for accountancy
+    $sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";     // We don't share object for accountancy
     
     dol_syslog('/accountancy/expensereport/index.php:: sql=' . $sql);
     $resql = $db->query($sql);
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index c678795bf2d..ca2369a11e4 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -173,7 +173,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= " AND (erd.tva_tx like '" . $search_vat . "%')";
 }
-$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 4b0a379faf3..01acf759260 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -203,7 +203,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
     $sql .= natural_search("erd.tva_tx",$search_vat,1);
 }
-$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index f1f0ac4b0de..9ed0435f298 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -97,7 +97,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_ex
 $sql .= " JOIN " . MAIN_DB_PREFIX . "user as u ON u.rowid = er.fk_user_author";
 $sql .= " WHERE er.fk_statut > 0 ";
 $sql .= " AND erd.fk_code_ventilation > 0 ";
-$sql .= " AND er.entity IN (" . getEntity('expensereport', false) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND er.date_debut >= '" . $db->idate($date_start) . "' AND er.date_debut <= '" . $db->idate($date_end) . "'";
 $sql .= " ORDER BY er.date_debut";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index e7f887547d3..a8dd976ba9e 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -96,7 +96,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = fd.fk_factu
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " WHERE f.fk_statut > 0 ";
 $sql .= " AND fd.fk_code_ventilation > 0 ";
-$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 	$sql .= " AND f.type IN (0,1,2)";
 else
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 863c68c5746..69a7855dfd2 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -96,7 +96,7 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON l.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = l.fk_facture_fourn ";
 	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id;
-	$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
+	$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
 	
 	dol_syslog("/accounting/supplier/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index fdaa70e22ca..805c5e40420 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -204,7 +204,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid
 $sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= "  AND ff.fk_statut > 0 ";
-$sql .= " AND ff.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
+$sql .= " AND ff.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -258,7 +258,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid
 $sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
 $sql .= "  AND ff.fk_statut > 0 ";
-$sql .= " AND ff.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
+$sql .= " AND ff.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
 
@@ -312,7 +312,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     $sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
     $sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
     $sql .= "  AND ff.fk_statut > 0 ";
-    $sql .= " AND ff.entity IN (" . getEntity('facture_fourn', false) . ")";     // We don't share object for accountancy
+    $sql .= " AND ff.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
     
     dol_syslog('/accountancy/supplier/index.php:: sql=' . $sql);
     $resql = $db->query($sql);
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 22982a6f087..06308a67fa1 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -182,7 +182,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("l.tva_tx", $search_vat, 1);
 }
-$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 30a42410d8b..7ed1453982e 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -217,7 +217,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
     $sql .= natural_search("l.tva_tx",$search_vat,1);
 }
-$sql .= " AND f.entity IN (" . getEntity('facture_fourn', false) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 6fb146c205b..ea8b85c55af 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -223,7 +223,7 @@ class Deplacement extends CommonObject
 	{
 		$sql = "SELECT rowid, fk_user, type, fk_statut, km, fk_soc, dated, note_private, note_public, fk_projet, extraparams";
 		$sql.= " FROM ".MAIN_DB_PREFIX."deplacement";
-		$sql.= " WHERE entity IN (".getEntity('deplacement', false).")";
+		$sql.= " WHERE entity IN (".getEntity('deplacement', 0).")";
 		if ($ref) $sql.= " AND ref ='".$this->db->escape($ref)."'";
 		else $sql.= " AND rowid = ".$id;
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 86e8dd893f5..880832f80e1 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3965,7 +3965,7 @@ class Facture extends CommonInvoice
 	function newCycle()
 	{
 		$sql = 'SELECT max(situation_cycle_ref) FROM ' . MAIN_DB_PREFIX . 'facture as f';
-		$sql.= " WHERE f.entity in (".getEntity('facture', false).")";
+		$sql.= " WHERE f.entity in (".getEntity('facture', 0).")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($resql->num_rows > 0)
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index d40e41013dd..2b0dd2f2924 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -504,7 +504,7 @@ class Contrat extends CommonObject
 		if ($ref)
 		{
 			$sql.= " WHERE ref='".$this->db->escape($ref)."'";
-			$sql.= " AND entity IN (".getEntity('contract', false).")";
+			$sql.= " AND entity IN (".getEntity('contract', 0).")";
 		}
 		else $sql.= " WHERE rowid=".$id;
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 608a1167fba..509467cc822 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -107,7 +107,7 @@ $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql.= " AND (cd.statut != 4 OR (cd.statut = 4 AND (cd.date_fin_validite is null or cd.date_fin_validite >= '".$db->idate($now)."')))";
-$sql.= " AND c.entity IN (".getEntity('contract', false).")";
+$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
 if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY cd.statut";
@@ -144,7 +144,7 @@ $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql.= " AND (cd.statut = 4 AND cd.date_fin_validite < '".$db->idate($now)."')";
-$sql.= " AND c.entity IN (".getEntity('contract', false).")";
+$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
 if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 $sql.= " GROUP BY cd.statut";
@@ -230,7 +230,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE s.rowid = c.fk_soc";
-	$sql.= " AND c.entity IN (".getEntity('contract', false).")";
+	$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
 	$sql.= " AND c.statut = 0";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
@@ -302,7 +302,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= " ".MAIN_DB_PREFIX.
 $sql.= " ".MAIN_DB_PREFIX."contrat as c";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
 $sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity IN (".getEntity('contract', false).")";
+$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
 $sql.= " AND c.statut > 0";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND s.rowid = ".$socid;
@@ -372,7 +372,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= ") LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', false).")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', 0).")";
 $sql.= " AND cd.fk_contrat = c.rowid";
 $sql.= " AND c.fk_soc = s.rowid";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -450,7 +450,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', false).")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', 0).")";
 $sql.= " AND c.statut = 1";
 $sql.= " AND cd.statut = 0";
 $sql.= " AND cd.fk_contrat = c.rowid";
@@ -529,7 +529,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', false).")";
+$sql.= " WHERE c.entity IN (".getEntity('contract', 0).")";
 $sql.= " AND c.statut = 1";
 $sql.= " AND cd.statut = 4";
 $sql.= " AND cd.date_fin_validite < '".$db->idate($now)."'";
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b2f831a1cbb..7b112a2d333 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4361,7 +4361,7 @@ class Form
 		$TCurrency = array();
 
 		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
-		$sql.= " WHERE entity IN ('".getEntity('mutlicurrency', false)."')";
+		$sql.= " WHERE entity IN ('".getEntity('mutlicurrency', 0)."')";
 		$resql = $db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 0d953a22be6..860d3fcfb1c 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -843,7 +843,7 @@ class FormMail extends Form
 		$sql = "SELECT label, topic, content, content_lines, lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity('c_email_templates', false).")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', 0).")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
@@ -910,7 +910,7 @@ class FormMail extends Form
 		$sql = "SELECT label, topic, content, lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity('c_email_templates', false).")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', 0).")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
 		$sql.= $this->db->order("lang,label","ASC");
@@ -947,7 +947,7 @@ class FormMail extends Form
 		$sql = "SELECT rowid, label, topic, content, content_lines, lang, position";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity('c_email_templates', false).")";
+		$sql.= " AND entity IN (".getEntity('c_email_templates', 0).")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index ba394f1b8e6..ca3a1157e74 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1681,7 +1681,7 @@ class Project extends CommonObject
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
         $sql.= " WHERE p.fk_statut = 1";
-        $sql.= " AND p.entity IN (".getEntity('project', false).')';
+        $sql.= " AND p.entity IN (".getEntity('project', 0).')';
         if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index b751f8f0478..227ea68d41b 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1704,7 +1704,7 @@ class Task extends CommonObject
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
         if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
         $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-        $sql.= " WHERE p.entity IN (".getEntity('project', false).')';
+        $sql.= " WHERE p.entity IN (".getEntity('project', 0).')';
         $sql.= " AND p.fk_statut = 1";
         $sql.= " AND t.fk_projet = p.rowid";
         $sql.= " AND t.progress < 100";         // tasks to do

From 74710827b25622c354fa21516a57ef505e3c06e1 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sat, 3 Jun 2017 14:15:34 +0200
Subject: [PATCH 1019/1163] Fix: avoid warning "Undefined property:
 stdClass::$AGENDA_DEFAULT_FILTER_TYPE"

---
 htdocs/core/class/conf.class.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 578ed17049e..edac78e9b30 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Xavier Dutoit        <doli@sydesy.com>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin      	<regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017 Regis Houssin      	<regis.houssin@capnetworks.com>
  * Copyright (C) 2006 	   Jean Heimburger    	<jean@tiaris.info>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -320,7 +320,7 @@ class Conf
 		// For backward compatibility
 		$this->user->dir_output=$rootforuser."/users";
 		$this->user->dir_temp=$rootforuser."/users/temp";
-		
+
 		// UserGroup
 		$this->usergroup->dir_output=$rootforuser."/usergroups";
 		$this->usergroup->dir_temp=$rootforuser."/usergroups/temp";
@@ -386,13 +386,13 @@ class Conf
 
 		$this->global->MAIN_ACTIVATE_HTML5=1;
         $this->global->MAIN_MAIL_USE_MULTI_PART=1;
-        
+
 		// societe
 		if (empty($this->global->SOCIETE_CODECLIENT_ADDON))       $this->global->SOCIETE_CODECLIENT_ADDON="mod_codeclient_leopard";
 		if (empty($this->global->SOCIETE_CODECOMPTA_ADDON))       $this->global->SOCIETE_CODECOMPTA_ADDON="mod_codecompta_panicum";
 
 		if (empty($this->global->CHEQUERECEIPTS_ADDON))           $this->global->CHEQUERECEIPTS_ADDON='mod_chequereceipt_mint';
-		
+
         // Security
 		if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED='standard'; // Default password generator
         if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK='0664';         // Default mask
@@ -425,7 +425,7 @@ class Conf
 		$this->currency=$this->global->MAIN_MONNAIE;
 
 		if (empty($conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30;   // Less than 1 minutes to be sure
-		
+
 		// conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)
         if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE='RECETTES-DEPENSES';  // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
 
@@ -434,7 +434,7 @@ class Conf
 
         // MAIN_HTML_TITLE
         if (! isset($this->global->MAIN_HTML_TITLE)) $this->global->MAIN_HTML_TITLE='noapp,thirdpartynameonly,contactnameonly,projectnameonly';
-        
+
 		// conf->liste_limit = constante de taille maximale des listes
 		if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT=25;
 		$this->liste_limit=$this->global->MAIN_SIZE_LISTE_LIMIT;
@@ -461,7 +461,7 @@ class Conf
 		$this->mailing->email_from=$this->email_from;
 		if (! empty($this->global->MAILING_EMAIL_FROM))	$this->mailing->email_from=$this->global->MAILING_EMAIL_FROM;
 		if (! isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) $this->global->MAIN_EMAIL_ADD_TRACK_ID=1;
-		
+
         // Format for date (used by default when not found or not searched in lang)
         $this->format_date_short="%d/%m/%Y";            // Format of day with PHP/C tags (strftime functions)
         $this->format_date_short_java="dd/MM/yyyy";     // Format of day with Java tags
@@ -485,7 +485,7 @@ class Conf
 		// Default pdf option
 		if (! isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) $this->global->MAIN_PDF_DASH_BETWEEN_LINES=1;    // use dash between lines
         if (! isset($this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) $this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT=1;  // allow html content into free footer text
-		
+
 		// Set default value to MAIN_SHOW_LOGO
 		if (! isset($this->global->MAIN_SHOW_LOGO)) $this->global->MAIN_SHOW_LOGO=1;
 
@@ -500,7 +500,7 @@ class Conf
 
 		// By default, we open card if one found
 		if (! isset($this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) $this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE=1;
-		
+
 		// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"
 		if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent';	// '' means 'all'. Note that contact is added here as it should be a module later.
 
@@ -568,12 +568,12 @@ class Conf
 		    $this->expensereport->payment		= new stdClass();
 		    $this->expensereport->payment->warning_delay=(isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY)?$this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY:0)*24*60*60;
 		}
-		
+
 		if (! empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT))
 		{
 		    $this->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 		}
-		
+
 		// For modules that want to disable top or left menu
 		if (! empty($this->global->MAIN_HIDE_TOP_MENU)) $this->dol_hide_topmenu=$this->global->MAIN_HIDE_TOP_MENU;
 		if (! empty($this->global->MAIN_HIDE_LEFT_MENU)) $this->dol_hide_leftmenu=$this->global->MAIN_HIDE_LEFT_MENU;
@@ -581,11 +581,11 @@ class Conf
 		if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) $this->global->MAIN_SIZE_SHORTLIST_LIMIT=3;
 
 		// Save inconsistent option
-		if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && $conf->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')
+		if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && (! isset($conf->global->AGENDA_DEFAULT_FILTER_TYPE) || $conf->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO'))
 		{
 		    $conf->global->AGENDA_DEFAULT_FILTER_TYPE='0';    // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
 		}
-		    
+
 		// For backward compatibility
 		if (isset($this->product))   $this->produit=$this->product;
 		if (isset($this->facture))   $this->invoice=$this->facture;
@@ -633,7 +633,7 @@ class Conf
 				$this->loghandlers[$handler] = $loghandlerinstance;
 			}
 		}
-		
+
 	}
 }
 

From a0b4f8b004f99065b0451b36ddb09036333e9f1e Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Sun, 4 Jun 2017 12:09:54 +0200
Subject: [PATCH 1020/1163] FIX : bug #6943

---
 htdocs/societe/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 346f4ea38dc..ba4383e6f8e 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2417,7 +2417,7 @@ else
 
 	        if ($user->rights->societe->supprimer)
 	        {
-	        	print '<div class="inline-block divButAction"><a class="butActionDelete" href="soc.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a></div>';
+	        	print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a></div>';
 	        }
 
 	        if ($user->rights->societe->supprimer)

From 806d25ae4116f5141a0c2f8f6404ed4b738d4979 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 5 Jun 2017 06:44:53 +0200
Subject: [PATCH 1021/1163] Activate multi-journal on expensereport journal

---
 .../journal/expensereportsjournal.php         | 311 +++++++++---------
 htdocs/core/menus/standard/eldy.lib.php       |   1 +
 htdocs/install/mysql/data/llx_accounting.sql  |   1 +
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   1 +
 .../mysql/tables/llx_accounting_journal.sql   |   2 +-
 5 files changed, 163 insertions(+), 153 deletions(-)

diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index f67224e3996..9bd9f8b7f42 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2007-2010	Jean Heimburger		<jean@tiaris.info>
  * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2012		Regis Houssin		<regis@dolibarr.fr>
- * Copyright (C) 2013-2016	Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2013-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2013-2016	Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2016	Florian Henry		<florian.henry@open-concept.pro>
  *
@@ -32,10 +32,11 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
 // Langs
 $langs->load("compta");
@@ -45,6 +46,9 @@ $langs->load("main");
 $langs->load("accountancy");
 $langs->load("trips");
 
+// Multi journal
+$id_journal = GETPOST('id_journal', 'int');
+
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
 $date_startyear = GETPOST('date_startyear');
@@ -64,6 +68,10 @@ $action = GETPOST('action','aZ09');
 /*
  * Actions
  */
+// Get code of finance journal
+$accountingjournalstatic = new AccountingJournal($db);
+$accountingjournalstatic->fetch($id_journal);
+$journal = $accountingjournalstatic->code;
 
 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
@@ -157,161 +165,159 @@ if ($action == 'writebookkeeping') {
 	{
 		$errorforline = 0;
 
-	    $db->begin();
-	     
-        if (! $errorforline)
-        {
-    	    foreach ( $tabttc[$key] as $k => $mt ) {
-    			if ($mt) {
-        	        // get compte id and label
-        
-        			$bookkeeping = new BookKeeping($db);
-        			$bookkeeping->doc_date = $val["date"];
-        			$bookkeeping->doc_ref = $val["ref"];
-        			$bookkeeping->date_create = $now;
-        			$bookkeeping->doc_type = 'expense_report';
-        			$bookkeeping->fk_doc = $key;
-        			$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-        			$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
-        			$bookkeeping->label_compte = $tabuser[$key]['name'];
-        			$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
-        			$bookkeeping->montant = $mt;
-        			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
-        			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
-        			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
-        			$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-        			$bookkeeping->fk_user_author = $user->id;
-        
-        			$result = $bookkeeping->create($user);
-        			if ($result < 0) {
-        			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-        			    {
-        			        $error++;
-        			        $errorforline++;
-        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-        			    }
-        			    else
-        			    {
-        			        $error++;
-        			        $errorforline++;
-        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-        			    }
-        			}
-    			}
-    		}
-        }
-        
-        if (! $errorforline)
-        {
-            // Fees
-    		foreach ( $tabht[$key] as $k => $mt ) {
-    			$accountingaccount = new AccountingAccount($db);
-    			$accountingaccount->fetch(null, $k, true);
-    			if ($mt) {
-    				// get compte id and label
-    				$accountingaccount = new AccountingAccount($db);
-    				if ($accountingaccount->fetch(null, $k, true)) {
-    					$bookkeeping = new BookKeeping($db);
-    					$bookkeeping->doc_date = $val["date"];
-    					$bookkeeping->doc_ref = $val["ref"];
-    					$bookkeeping->date_create = $now;
-    					$bookkeeping->doc_type = 'expense_report';
-    					$bookkeeping->fk_doc = $key;
-    					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-    					$bookkeeping->code_tiers = '';
-    					$bookkeeping->label_compte = $accountingaccount->label;
-    					$bookkeeping->numero_compte = $k;
-    					$bookkeeping->montant = $mt;
-    					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-    					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-    					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-    					$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-    					$bookkeeping->fk_user_author = $user->id;
-    
-    					$result = $bookkeeping->create($user);
-	        			if ($result < 0) {
-            			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-            			    {
-            			        $error++;
-            			        $errorforline++;
-            			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-            			    }
-            			    else
-            			    {
-            			        $error++;
-            			        $errorforline++;
-            			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-            			    }
-	        			}
-    				}
-    			}
-    		}
-        }
-        
-        if (! $errorforline)
-        {
-            // VAT
-    		// var_dump($tabtva);
-    		foreach ( $tabtva[$key] as $k => $mt ) {
-    			if ($mt) {
-    				// get compte id and label
-    				$bookkeeping = new BookKeeping($db);
-    				$bookkeeping->doc_date = $val["date"];
-    				$bookkeeping->doc_ref = $val["ref"];
-    				$bookkeeping->date_create = $now;
-    				$bookkeeping->doc_type = 'expense_report';
-    				$bookkeeping->fk_doc = $key;
-    				$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-    				$bookkeeping->code_tiers = '';
-    				$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
-    				$bookkeeping->numero_compte = $k;
-    				$bookkeeping->montant = $mt;
-    				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-    				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-    				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-    				$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
-    				$bookkeeping->fk_user_author = $user->id;
-    
-    				$result = $bookkeeping->create($user);
-    				if ($result < 0) {
-           			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-        			    {
-        			        $error++;
-        			        $errorforline++;
-        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-        			    }
-        			    else
-        			    {
-        			        $error++;
-        			        $errorforline++;
-        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-        			    }
-    				}
-    			}
-    		}
-        }
-        
+		$db->begin();
+
 		if (! $errorforline)
 		{
-		    $db->commit();
+			foreach ( $tabttc[$key] as $k => $mt ) {
+				if ($mt) {
+					// get compte id and label
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_create = $now;
+					$bookkeeping->doc_type = 'expense_report';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+					$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
+					$bookkeeping->label_compte = $tabuser[$key]['name'];
+					$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+					$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt > 0) ? $mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->fk_user_author = $user->id;
+
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
+		}
+
+		if (! $errorforline)
+		{
+			// Fees
+			foreach ( $tabht[$key] as $k => $mt ) {
+				$accountingaccount = new AccountingAccount($db);
+				$accountingaccount->fetch(null, $k, true);
+				if ($mt) {
+					// get compte id and label
+					$accountingaccount = new AccountingAccount($db);
+					if ($accountingaccount->fetch(null, $k, true)) {
+						$bookkeeping = new BookKeeping($db);
+						$bookkeeping->doc_date = $val["date"];
+						$bookkeeping->doc_ref = $val["ref"];
+						$bookkeeping->date_create = $now;
+						$bookkeeping->doc_type = 'expense_report';
+						$bookkeeping->fk_doc = $key;
+						$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->label_compte = $accountingaccount->label;
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->montant = $mt;
+						$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+						$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+						$bookkeeping->code_journal = $journal;
+						$bookkeeping->fk_user_author = $user->id;
+
+						$result = $bookkeeping->create($user);
+						if ($result < 0) {
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+							{
+								$error++;
+								$errorforline++;
+								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+							}
+							else
+							{
+								$error++;
+								$errorforline++;
+								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (! $errorforline)
+		{
+			// VAT
+			// var_dump($tabtva);
+			foreach ( $tabtva[$key] as $k => $mt ) {
+				if ($mt) {
+					// get compte id and label
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_create = $now;
+					$bookkeeping->doc_type = 'expense_report';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+					$bookkeeping->code_tiers = '';
+					$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
+					$bookkeeping->numero_compte = $k;
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->fk_user_author = $user->id;
+
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
+		}
+
+		if (! $errorforline)
+		{
+			$db->commit();
 		}
 		else
 		{
-		    $db->rollback();
+			$db->rollback();
 		}
-		
 	}
 
 	if (empty($error) && count($tabpay)) {
-	    setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
+		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 	elseif (count($tabpay) == $error)
 	{
-	    setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
+		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	}
 	else
 	{
-	    setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
+		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
 	$action='';
@@ -328,7 +334,6 @@ $userstatic = new User($db);
 // Export
 /*if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
-	$journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
 
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 
@@ -448,7 +453,9 @@ if (empty($action) || $action == 'view') {
 
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
 
-	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+	$varlink = 'id_journal=' . $id_journal;
+
+	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
 	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
@@ -456,10 +463,10 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-    print '</div>';
-    
+	print '</div>';
+
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -556,9 +563,9 @@ if (empty($action) || $action == 'view') {
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-		    print '<tr class="oddeven">';
-		    print "<td><!-- Thirdparty --></td>";
-		    print "<td>" . $date . "</td>";
+			print '<tr class="oddeven">';
+			print "<td><!-- Thirdparty --></td>";
+			print "<td>" . $date . "</td>";
 			print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
 			$userstatic->id = $tabuser[$key]['id'];
 			$userstatic->name = $tabuser[$key]['name'];
@@ -566,14 +573,14 @@ if (empty($action) || $action == 'view') {
 			$accountoshow = length_accounta($k);
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
 			{
-			    print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 			}
 			else print $accountoshow;
 			print "</td>";
 			print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("Code_tiers") . "</td>";
 			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-		    print "</tr>";
+			print "</tr>";
 		}
 	}
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 8b167e3a6f6..8b6b26d772c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1027,6 +1027,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 								if ($objp->nature == 2) $nature="sells";
 								if ($objp->nature == 3) $nature="purchases";
 								if ($objp->nature == 4) $nature="bank";
+								if ($objp->nature == 5) $nature="expensereports";
 								if ($objp->nature == 1) $nature="various";
 								if ($objp->nature == 9) $nature="hasnew";
 
diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql
index e81d13dd2b8..ea1fe7a7dd7 100644
--- a/htdocs/install/mysql/data/llx_accounting.sql
+++ b/htdocs/install/mysql/data/llx_accounting.sql
@@ -32,6 +32,7 @@ INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('AC', '
 INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('BQ', 'Journal de banque', 4, 1);
 INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('OD', 'Journal des opérations diverses', 1, 1);
 INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('AN', 'Journal des à-nouveaux', 9, 1);
+INSERT INTO llx_accounting_journal (code, label, nature, active) VALUES ('ER', 'Journal des notes de frais', 5, 1);
 --
 -- Descriptif des plans comptables FR PCG99-ABREGE
 --
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index d7e68346511..594568307a6 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -168,6 +168,7 @@ INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (3,'BQ', 'Bank journal', 4, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (4,'OD', 'Other journal', 1, 1);
 INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (5,'AN', 'Has new journal', 9, 1);
+INSERT INTO llx_accounting_journal (rowid, code, label, nature, active) VALUES (6,'ER', 'Expense report journal', 5, 1);
 -- Fix old entries
 UPDATE llx_accounting_journal SET nature = 1 where code = 'OD' and nature = 0;
 UPDATE llx_accounting_journal SET nature = 2 where code = 'VT' and nature = 1;
diff --git a/htdocs/install/mysql/tables/llx_accounting_journal.sql b/htdocs/install/mysql/tables/llx_accounting_journal.sql
index dbd9e4d311b..51f1f972859 100644
--- a/htdocs/install/mysql/tables/llx_accounting_journal.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_journal.sql
@@ -23,6 +23,6 @@ create table llx_accounting_journal
   entity            integer DEFAULT 1 NOT NULL,
   code              varchar(32) NOT NULL,
   label             varchar(128) NOT NULL,
-  nature            smallint DEFAULT 1 NOT NULL,        -- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
+  nature            smallint DEFAULT 1 NOT NULL,        -- type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 5:expense report / 9:has-new)
   active            smallint DEFAULT 0
 )ENGINE=innodb;

From 2281850abfb912282aa9e6b7763fabed2ee31e5f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 5 Jun 2017 14:56:14 +0200
Subject: [PATCH 1022/1163] Fix label and name

---
 htdocs/accountancy/journal/bankjournal.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 35d4112ebc9..306fa4d2cab 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -63,7 +63,7 @@ $langs->load('bills');
 $langs->load('donations');
 $langs->load("accountancy");
 $langs->load("trips");
-$langs->load("hrm");
+$langs->load("salaries");
 
 // Old system menu
 $id_bank_account = GETPOST('id_account', 'int');
@@ -114,7 +114,7 @@ $idpays = $p[0];
 $sql  = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
 $sql .= " ba.courant, ba.ref as baref, ba.account_number,";
 $sql .= " soc.code_compta, soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, bu1.type as typeop,";
-$sql .= " u.accountancy_code, u.rowid as userid, u.lastname as name, u.firstname as firstname, bu2.type as typeop";
+$sql .= " u.accountancy_code, u.rowid as userid, u.lastname as lastname, u.firstname as firstname, bu2.type as typeop";
 $sql .= " FROM " . MAIN_DB_PREFIX . "bank as b";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "bank_account as ba on b.fk_account=ba.rowid";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu1 ON bu1.fk_bank = b.rowid AND bu1.type='company'";
@@ -201,9 +201,8 @@ if ($result) {
 
 		$tabuser[$obj->rowid] = array (
 				'id' => $obj->userid,
-				'lastname' => $obj->lastname,
-				'firstname' => $obj->firstname,
-		        'accountancy_code' => $compta_user,
+				'name' => $obj->firstname.' '.$obj->lastname,
+				'accountancy_code' => $compta_user,
 		);
 
 		// Variable bookkeeping
@@ -426,7 +425,8 @@ if (! $error && $action == 'writebookkeeping') {
 						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
 					} else if ($tabtype[$key] == 'payment_salary') {
 						$bookkeeping->code_tiers = '';
-						$bookkeeping->doc_ref = $langs->trans("PaymentSalary") . ' (' . $val["paymentsalid"] . ')'; // Ref of salary payment
+						$bookkeeping->label_compte = $tabuser[$key]['name'];
+						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Ref of salary payment
 					}
 
         			$result = $bookkeeping->create($user);
@@ -510,8 +510,9 @@ if (! $error && $action == 'writebookkeeping') {
 						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
 					} else if ($tabtype[$key] == 'payment_salary') {
 						$bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
-						$bookkeeping->numero_compte = $k;
-						$bookkeeping->doc_ref = $langs->trans("PaymentSalary") . ' (' . $val["paymentsalid"] . ')'; // Rowid of salary payment
+						$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+						$bookkeeping->label_compte = $tabuser[$key]['name'];
+						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Rowid of salary payment
 					} else if ($tabtype[$key] == 'banktransfert') {
 						$bookkeeping->code_tiers = '';
 						$bookkeeping->numero_compte = $k;

From e547aa8aeea8b02c271fa0efc8794e529747db2c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Mon, 5 Jun 2017 15:41:33 +0200
Subject: [PATCH 1023/1163] NEW : VAT payment v6 look and feel

---
 htdocs/compta/tva/card.php                    |  33 +++---
 htdocs/compta/tva/class/tva.class.php         | 100 +++++++++++-------
 htdocs/compta/tva/info.php                    |  11 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   1 +
 htdocs/install/mysql/tables/llx_tva.sql       |   1 +
 5 files changed, 93 insertions(+), 53 deletions(-)

diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index cb80f49e790..e33ec6b3d55 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2015	   Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -305,16 +305,17 @@ if ($id)
 
 	dol_fiche_head($head, 'card', $langs->trans("VATPayment"), 0, 'payment');
 
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/tva/reglement.php">'.$langs->trans("BackToList").'</a>';
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border" width="100%">';
 
-	print "<tr>";
-	print '<td class="titlefield">'.$langs->trans("Ref").'</td><td colspan="3">';
-	print $object->ref;
-	print '</td></tr>';
-
 	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
 
 	print "<tr>";
 	print '<td>'.$langs->trans("DatePayment").'</td><td>';
@@ -335,23 +336,25 @@ if ($id)
 	{
 		if ($object->fk_account > 0)
 		{
- 		   	$bankline=new AccountLine($db);
-    		$bankline->fetch($object->fk_bank);
+			$bankline=new AccountLine($db);
+			$bankline->fetch($object->fk_bank);
 
-	    	print '<tr>';
-	    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+			print '<tr>';
+			print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 			print '<td>';
 			print $bankline->getNomUrl(1,0,'showall');
-	    	print '</td>';
-	    	print '</tr>';
+			print '</td>';
+			print '</tr>';
 		}
 	}
 
-        // Other attributes
-        $reshook=$hookmanager->executeHooks('formObjectOptions','',$object,$action);    // Note that $action and $object may have been modified by hook
+	// Other attributes
+	$reshook=$hookmanager->executeHooks('formObjectOptions','',$object,$action);    // Note that $action and $object may have been modified by hook
 
 	print '</table>';
 
+	print '</div>';
+
 	dol_fiche_end();
 
 	/*
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 5cf8b6566bd..045284bd47c 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2011-2015 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2011-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@ class Tva extends CommonObject
 {
 	//public $element='tva';			//!< Id that identify managed objects
 	//public $table_element='tva';	//!< Name of table without prefix where object is stored
+	public $picto='payment';
 
 	var $tms;
 	var $datep;
@@ -73,6 +74,7 @@ class Tva extends CommonObject
     	global $conf, $langs;
 
 		$error=0;
+		$now=dol_now();
 
 		// Clean parameters
 		$this->amount=trim($this->amount);
@@ -89,7 +91,7 @@ class Tva extends CommonObject
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."tva(";
-		$sql.= "tms,";
+		$sql.= "datec,";
 		$sql.= "datep,";
 		$sql.= "datev,";
 		$sql.= "amount,";
@@ -101,7 +103,7 @@ class Tva extends CommonObject
 
         $sql.= ") VALUES (";
 
-		$sql.= " '".$this->db->idate($this->tms)."',";
+		$sql.= " '".$this->db->idate($now)."',";
 		$sql.= " '".$this->db->idate($this->datep)."',";
 		$sql.= " '".$this->db->idate($this->datev)."',";
 		$sql.= " '".$this->amount."',";
@@ -677,46 +679,70 @@ class Tva extends CommonObject
 	 *	@param	int		$id     Id of vat payment
 	 *	@return	int				<0 if KO, >0 if OK
 	 */
-    function info($id)
-    {
-        $sql = "SELECT t.rowid, t.tms as datec, t.fk_user_creat";
-        $sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
-        $sql.= " WHERE t.rowid = ".$id;
+	function info($id)
+	{
+		$sql = "SELECT t.rowid, t.tms, t.datec, t.fk_user_creat";
+		$sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
+		$sql.= " WHERE t.rowid = ".$id;
 
-        dol_syslog(get_class($this)."::info", LOG_DEBUG);
-        $result=$this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
+		dol_syslog(get_class($this)."::info", LOG_DEBUG);
+		$result=$this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 
-                if ($obj->fk_user_creat) {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_creat);
-                    $this->user_creation = $cuser;
-                }
+				if ($obj->fk_user_creat) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_creat);
+					$this->user_creation = $cuser;
+				}
 
-                if ($obj->fk_user_modif) {
-                    $muser = new User($this->db);
-                    $muser->fetch($obj->fk_user_modif);
-                    $this->user_modification = $muser;
-                }
+				if ($obj->fk_user_modif) {
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
 
-                $this->date_creation     = $this->db->jdate($obj->datec);
-                $this->date_modification = $this->db->jdate($obj->datec);
-                $this->import_key        = $obj->import_key;
-            }
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->tms);
+				$this->import_key        = $obj->import_key;
+			}
 
-            $this->db->free($result);
+			$this->db->free($result);
 
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
 
+	/**
+	 * Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
+	 *
+	 * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return  string				Libelle
+	 */
+	function getLibStatut($mode=0)
+	{
+	    return $this->LibStatut($this->statut,$mode);
+	}
+	
+	/**
+	 * Renvoi le libelle d'un statut donne
+	 *
+	 * @param   int		$status     Statut
+	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return	string  		    Libelle du statut
+	 */
+	function LibStatut($status,$mode=0)
+	{
+	    global $langs;	// TODO Renvoyer le libelle anglais et faire traduction a affichage
+
+	    return '';
+	}
 }
diff --git a/htdocs/compta/tva/info.php b/htdocs/compta/tva/info.php
index 0c6ce29475a..fb932f0f983 100644
--- a/htdocs/compta/tva/info.php
+++ b/htdocs/compta/tva/info.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2016	Alexandre Spangaro	<aspangaro@zendsi.com>
+/* Copyright (C) 2016-2017  Alexandre Spangaro	<aspangaro@zendsi.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,12 +53,21 @@ $head = vat_prepare_head($object);
 
 dol_fiche_head($head, 'info', $langs->trans("VATPayment"), 0, 'payment');
 
+$linkback = '<a href="'.DOL_URL_ROOT.'/compta/tva/reglement.php">'.$langs->trans("BackToList").'</a>';
+
+dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
+
 print '<table width="100%"><tr><td>';
 dol_print_object_info($object);
 print '</td></tr></table>';
 
 print '</div>';
 
+dol_fiche_end();
+
 llxFooter();
 
 $db->close();
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index d7e68346511..8fd64aa596e 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -379,3 +379,4 @@ create table llx_loan_schedule
   fk_user_modif		integer           
 )ENGINE=innodb;
 
+ALTER TABLE llx_tva ADD COLUMN datec date AFTER tms;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql
index f33280ff511..9abf63d6ad9 100644
--- a/htdocs/install/mysql/tables/llx_tva.sql
+++ b/htdocs/install/mysql/tables/llx_tva.sql
@@ -21,6 +21,7 @@ create table llx_tva
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   tms             timestamp,
+  datec           datetime,                   -- Create date
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur
   amount          real NOT NULL DEFAULT 0,

From 22efbabfa68020ac9b0428dc0d2152a3c923d9ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jun 2017 01:34:25 +0200
Subject: [PATCH 1024/1163] NEW Add hook doUpgrade2

---
 htdocs/core/class/hookmanager.class.php |  10 +-
 htdocs/install/upgrade.php              |  80 -----------
 htdocs/install/upgrade2.php             | 183 ++++++++++++++++++++----
 htdocs/langs/en_US/install.lang         |   1 +
 4 files changed, 162 insertions(+), 112 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 40ed4153060..65495cb0100 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -43,6 +43,8 @@ class HookManager
 	var $resArray=array();
 	// Printable result
 	var $resPrint='';
+	// Nb of qualified hook ran
+	var $resNbOfHooks=0;
 
 	/**
 	 * Constructor
@@ -188,7 +190,7 @@ class HookManager
         }
 
         // Init return properties
-        $this->resPrint=''; $this->resArray=array();
+        $this->resPrint=''; $this->resArray=array(); $this->$resNbOfHooks=0;
 
         // Loop on each hook to qualify modules that have declared context
         $modulealreadyexecuted=array();
@@ -201,11 +203,13 @@ class HookManager
                 {
                 	//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
 
+                    // test to avoid running twice a hook, when a module implements several active contexts
+                    if (in_array($module,$modulealreadyexecuted)) continue;
+
                 	// jump to next module/class if method does not exist
                     if (! method_exists($actionclassinstance,$method)) continue;
 
-                    // test to avoid running twice a hook, when a module implements several active contexts
-                    if (in_array($module,$modulealreadyexecuted)) continue;
+                    $this->$resNbOfHooks++;
 
                     dol_syslog(get_class($this).'::executeHooks a qualified hook was found for method='.$method.' module='.$module." action=".$action." context=".$context);
 
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 96853887f81..772d578a841 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -234,86 +234,6 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
 	    flush();
     }
 
-    /*
-     * Delete duplicates in table categorie_association
-     */
-    if ($ok)
-    {
-	    $result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
-	    if ($result)	// result defined for version 3.2 or -
-	    {
-		    $obj = $db->fetch_object($result);
-		    if ($obj)	// It table categorie_association exists
-		    {
-		    	$couples=array();
-			    $filles=array();
-			    $sql = "SELECT fk_categorie_mere, fk_categorie_fille";
-			    $sql.= " FROM ".MAIN_DB_PREFIX."categorie_association";
-			    dolibarr_install_syslog("upgrade: search duplicate");
-			    $resql = $db->query($sql);
-			    if ($resql)
-			    {
-			        $num=$db->num_rows($resql);
-			        while ($obj=$db->fetch_object($resql))
-			        {
-			            if (! isset($filles[$obj->fk_categorie_fille]))	// Only one record as child (a child has only on parent).
-			            {
-			                if ($obj->fk_categorie_mere != $obj->fk_categorie_fille)
-			                {
-			                    $filles[$obj->fk_categorie_fille]=1;	// Set record for this child
-			                    $couples[$obj->fk_categorie_mere.'_'.$obj->fk_categorie_fille]=array('mere'=>$obj->fk_categorie_mere, 'fille'=>$obj->fk_categorie_fille);
-			                }
-			            }
-			        }
-
-			        dolibarr_install_syslog("upgrade: result is num=" . $num . " count(couples)=" . count($couples));
-
-			        // If there is duplicates couples or child with two parents
-			        if (count($couples) > 0 && $num > count($couples))
-			        {
-			            $error=0;
-
-			            $db->begin();
-
-			            // We delete all
-			            $sql="DELETE FROM ".MAIN_DB_PREFIX."categorie_association";
-			            dolibarr_install_syslog("upgrade: delete association");
-			            $resqld=$db->query($sql);
-			            if ($resqld)
-			            {
-			            	// And we insert only each record once
-			                foreach($couples as $key => $val)
-			                {
-			                    $sql ="INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)";
-			                    $sql.=" VALUES(".$val['mere'].", ".$val['fille'].")";
-			                    dolibarr_install_syslog("upgrade: insert association");
-			                    $resqli=$db->query($sql);
-			                    if (! $resqli) $error++;
-			                }
-			            }
-
-			            if (! $error)
-			            {
-			                print '<tr><td>'.$langs->trans("RemoveDuplicates").'</td>';
-			                print '<td align="right">'.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>';
-			                $db->commit();
-			            }
-			            else
-			            {
-			                print '<tr><td>'.$langs->trans("RemoveDuplicates").'</td>';
-			                print '<td align="right">'.$langs->trans("Failed").'</td></tr>';
-			                $db->rollback();
-			            }
-			        }
-			    }
-			    else
-			    {
-			        print '<div class="error">'.$langs->trans("Error").' '.$db->lasterror().'</div>';
-			    }
-		    }
-	    }
-    }
-
 
 	/*
 	 * Remove deprecated indexes and constraints for Mysql
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 19195e17000..36bbeb966d4 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -170,14 +170,14 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
      * Migration des donnees
      *
      ***************************************************************************************/
+    $db->begin();
+
     if (! $error)
     {
         // Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE
         // Version to install is DOL_VERSION
         $dolibarrlastupgradeversionarray=preg_split('/[\.-]/',isset($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_UPGRADE:$conf->global->MAIN_VERSION_LAST_INSTALL);
 
-        $db->begin();
-
         // Chaque action de migration doit renvoyer une ligne sur 4 colonnes avec
         // dans la 1ere colonne, la description de l'action a faire
         // dans la 4eme colonne, le texte 'OK' si fait ou 'AlreadyDone' si rien n'est fait ou 'Error'
@@ -342,6 +342,8 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
 
         	migrate_mode_reglement($db,$langs,$conf);
 
+        	migrate_clean_association($db,$langs,$conf);
+
             // Reload modules
             migrate_reload_modules($db,$langs,$conf);
 
@@ -426,11 +428,11 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
                 'MAIN_MODULE_PRINTING'=>'newboxdefonly',
             );
             migrate_reload_modules($db,$langs,$conf,$listofmodule);
-        
+
             // Reload menus (this must be always and only into last targeted version)
             migrate_reload_menu($db,$langs,$conf,$versionto);
         }
-        
+
         // Scripts for last version
         $afterversionarray=explode('.','5.0.9');
         $beforeversionarray=explode('.','6.0.9');
@@ -445,39 +447,72 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
             // Reload menus (this must be always and only into last targeted version)
             migrate_reload_menu($db,$langs,$conf,$versionto);
         }
+    }
 
-        // Can force activation of some module during migration with third paramater = MAIN_MODULE_XXX,MAIN_MODULE_YYY,...
-        if ($enablemodules)
+
+    // Can force activation of some module during migration with paramater 'enablemodules=MAIN_MODULE_XXX,MAIN_MODULE_YYY,...'
+    if (! $error && $enablemodules)
+    {
+        // Reload modules (this must be always and only into last targeted version)
+        $listofmodules=array();
+        $tmplistofmodules=explode(',', $enablemodules);
+        foreach($tmplistofmodules as $value)
         {
-            // Reload modules (this must be always and only into last targeted version)
-            $listofmodules=array();
-            $tmplistofmodules=explode(',', $enablemodules);
-            foreach($tmplistofmodules as $value)
-            {
-                $listofmodules[$value]='newboxdefonly';
-            }
-            migrate_reload_modules($db,$langs,$conf,$listofmodules,1);
+            $listofmodules[$value]='newboxdefonly';
         }
+        migrate_reload_modules($db,$langs,$conf,$listofmodules,1);
+    }
 
 
-        print '<tr><td colspan="4"><br>'.$langs->trans("MigrationFinished").'</td></tr>';
-
-        // On commit dans tous les cas.
-        // La procedure etant concue pour pouvoir passer plusieurs fois quelquesoit la situation.
-        $db->commit();
-        $db->close();
-
-
-        // Actions for all versions (not in database)
-        migrate_delete_old_files($db, $langs, $conf);
-        migrate_delete_old_dir($db, $langs, $conf);
-
-
-        dol_mkdir(DOL_DATA_ROOT.'/bank');
-        migrate_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
+    // Can call a dedicated external upgrade process
+    if (! $error)
+    {
+        $parameters=array('versionfrom'=>$versionfrom, 'versionto='.$versionto);
+        $object=new stdClass();
+        $action="upgrade";
+        $reshook=$hookmanager->executeHooks('doUpgrade2',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+        if ($hookmanager->resNbOfHooks > 0)
+        {
+            if ($reshook < 0)
+            {
+                print '<tr><td colspan="4">';
+                print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: ';
+                print $hookmanager->error;
+                print "<!-- (".$reshook.") -->";
+                print '</td></tr>';
+            }
+            else
+            {
+                print '<tr><td colspan="4">';
+                print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: OK';
+                print "<!-- (".$reshook.") -->";
+                print '</td></tr>';
+            }
+        }
+        else
+        {
+            print '<tr><td colspan="4">';
+            print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("None");
+            print '</td></tr>';
+        }
     }
 
     print '</table>';
+
+    // We always commit.
+    // Process is designed so we can run it several times whatever is situation.
+    $db->commit();
+    $db->close();
+
+    // Actions for all versions (no database change, delete files and directories)
+    migrate_delete_old_files($db, $langs, $conf);
+    migrate_delete_old_dir($db, $langs, $conf);
+    // Actions for all versions (no database change, create directories)
+    dol_mkdir(DOL_DATA_ROOT.'/bank');
+    // Actions for all versions (no database change, rename directories)
+    migrate_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
+
+    print '<div><br>'.$langs->trans("MigrationFinished").'</div>';
 }
 else
 {
@@ -3519,6 +3554,95 @@ function migrate_mode_reglement($db,$langs,$conf)
 	print '</td></tr>';
 }
 
+
+/**
+ * Delete duplicates in table categorie_association
+ *
+ * @param	DoliDB		$db			Database handler
+ * @param	Translate	$langs		Object langs
+ * @param	Conf		$conf		Object conf
+ * @param	string		$versionto	Version target
+ * @return	void
+ */
+function migrate_clean_association($db,$langs,$conf,$versionto)
+{
+    $result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
+    if ($result)	// result defined for version 3.2 or -
+    {
+        $obj = $db->fetch_object($result);
+        if ($obj)	// It table categorie_association exists
+        {
+            $couples=array();
+            $filles=array();
+            $sql = "SELECT fk_categorie_mere, fk_categorie_fille";
+            $sql.= " FROM ".MAIN_DB_PREFIX."categorie_association";
+            dolibarr_install_syslog("upgrade: search duplicate");
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $num=$db->num_rows($resql);
+                while ($obj=$db->fetch_object($resql))
+                {
+                    if (! isset($filles[$obj->fk_categorie_fille]))	// Only one record as child (a child has only on parent).
+                    {
+                        if ($obj->fk_categorie_mere != $obj->fk_categorie_fille)
+                        {
+                            $filles[$obj->fk_categorie_fille]=1;	// Set record for this child
+                            $couples[$obj->fk_categorie_mere.'_'.$obj->fk_categorie_fille]=array('mere'=>$obj->fk_categorie_mere, 'fille'=>$obj->fk_categorie_fille);
+                        }
+                    }
+                }
+
+                dolibarr_install_syslog("upgrade: result is num=" . $num . " count(couples)=" . count($couples));
+
+                // If there is duplicates couples or child with two parents
+                if (count($couples) > 0 && $num > count($couples))
+                {
+                    $error=0;
+
+                    $db->begin();
+
+                    // We delete all
+                    $sql="DELETE FROM ".MAIN_DB_PREFIX."categorie_association";
+                    dolibarr_install_syslog("upgrade: delete association");
+                    $resqld=$db->query($sql);
+                    if ($resqld)
+                    {
+                        // And we insert only each record once
+                        foreach($couples as $key => $val)
+                        {
+                            $sql ="INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)";
+                            $sql.=" VALUES(".$val['mere'].", ".$val['fille'].")";
+                            dolibarr_install_syslog("upgrade: insert association");
+                            $resqli=$db->query($sql);
+                            if (! $resqli) $error++;
+                        }
+                    }
+
+                    if (! $error)
+                    {
+                        print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
+                        print '<td align="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>';
+                        $db->commit();
+                    }
+                    else
+                    {
+                        print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
+                        print '<td align="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Failed").'</td></tr>';
+                        $db->rollback();
+                    }
+                }
+            }
+            else
+            {
+                print '<tr><td>'.$langs->trans("Error").'</td>';
+                print '<td align="right"><div class="error">'.$db->lasterror().'</div></td></tr>';
+            }
+        }
+    }
+}
+
+
 /**
  * Migrate categorie association
  *
@@ -4304,6 +4428,7 @@ function migrate_reload_menu($db,$langs,$conf,$versionto)
 
 
 
+
 /* A faire egalement: Modif statut paye et fk_facture des factures payes completement
 
 On recherche facture incorrecte:
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 336b20bff16..2b10dea91ec 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -138,6 +138,7 @@ KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values
 KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
 KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
 KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
+UpgradeExternalModule=Run dedicated upgrade process of external modules
 
 #########
 # upgrade

From 6e83e899e20d2a3728b713fd6eac5a29d610602c Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Tue, 6 Jun 2017 08:29:41 +0200
Subject: [PATCH 1025/1163] Additionnal filter on getProjectsAuthorizedForUser

with great list of projects, have more filter is a good thing
---
 htdocs/projet/class/project.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 6a7b130ac0d..c434fa65381 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1095,9 +1095,10 @@ class Project extends CommonObject
      * @param 	int		$mode			0=All project I have permission on (assigned to me and public), 1=Projects assigned to me only, 2=Will return list of all projects with no test on contacts
      * @param 	int		$list			0=Return array,1=Return string list
      * @param	int		$socid			0=No filter on third party, id of third party
+     * @param	string		$filter			additionnal filter on project (statut, ref, ...)
      * @return 	array or string			Array of projects id, or string with projects id separated with ","
      */
-    function getProjectsAuthorizedForUser($user, $mode=0, $list=0, $socid=0)
+    function getProjectsAuthorizedForUser($user, $mode=0, $list=0, $socid=0, $filter='')
     {
         $projects = array();
         $temp = array();
@@ -1149,6 +1150,8 @@ class Project extends CommonObject
         {
             // No filter. Use this if user has permission to see all project
         }
+	    
+	$sql.= $filter;
         //print $sql;
 
         $resql = $this->db->query($sql);

From b66da3d1480b93f71a67f821dedd78c14b58c3b0 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 6 Jun 2017 07:57:03 +0200
Subject: [PATCH 1026/1163] New: big refactorization of multicompany transverse
 mode

---
 ChangeLog                                     |   2 +
 htdocs/admin/boxes.php                        |   6 +-
 htdocs/admin/perms.php                        |   4 +-
 htdocs/conf/conf.php.example                  |  10 -
 htdocs/core/class/conf.class.php              |  35 +-
 htdocs/core/class/html.form.class.php         |   6 +-
 htdocs/core/class/infobox.class.php           |   6 +-
 htdocs/core/class/menubase.class.php          |   2 +-
 htdocs/core/lib/functions2.lib.php            |  26 +-
 htdocs/core/lib/usergroups.lib.php            |  83 ++---
 htdocs/core/login/functions_dolibarr.php      |   2 +-
 htdocs/core/login/functions_ldap.php          |   2 +-
 htdocs/core/menus/init_menu_auguria.sql       |   8 +-
 htdocs/core/menus/standard/eldy.lib.php       |   8 +-
 htdocs/filefunc.inc.php                       |   3 -
 htdocs/holiday/class/holiday.class.php        |   4 +-
 htdocs/index.php                              |  12 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  16 +
 .../mysql/tables/llx_user_rights.key.sql      |   8 +-
 .../install/mysql/tables/llx_user_rights.sql  |  10 +-
 .../mysql/tables/llx_usergroup_rights.key.sql |   4 +-
 .../mysql/tables/llx_usergroup_rights.sql     |  11 +-
 htdocs/master.inc.php                         |  29 +-
 .../modulebuilder/template/myobject_list.php  |   2 +-
 htdocs/product/stock/productlot_list.php      |   2 +-
 htdocs/societe/class/societe.class.php        |   2 +-
 htdocs/societe/commerciaux.php                |   6 +-
 htdocs/user/card.php                          | 325 +++++++++---------
 htdocs/user/class/user.class.php              |  40 +--
 htdocs/user/class/usergroup.class.php         |  50 +--
 htdocs/user/group/card.php                    |  49 +--
 htdocs/user/group/index.php                   |  14 +-
 htdocs/user/group/ldap.php                    |  10 +-
 htdocs/user/group/perms.php                   | 194 ++++++-----
 htdocs/user/hierarchy.php                     |  25 +-
 htdocs/user/home.php                          |   4 +-
 htdocs/user/index.php                         |  16 +-
 htdocs/user/perms.php                         |  89 ++---
 htdocs/webservices/server_user.php            |   2 +-
 39 files changed, 539 insertions(+), 588 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 15c1dc404f5..74b35ce985a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ English Dolibarr ChangeLog
 
 For developers:
 NEW: Add a lot of API REST: dictionaryevents, memberstypes, ...
+NEW: Big refactorization of multicompany transverse mode
 
 WARNING: 
 
@@ -21,6 +22,7 @@ Following changes may create regression for some external modules, but were nece
 * Removed Societe::set_commnucation_level (was deprecated in 4.0). Was not used.
 * Removed the trigger file of PAYPAL module that stored data that was not used by Dolibarr. The trigger event still
   exists, but if an external module need action on it, it must provides itself its trigger file.
+* Use $conf->global->MULTICOMPANY_TRANSVERSE_MODE instead $conf->multicompany->transverse_mode
 
 ***** ChangeLog for 5.0.3 compared to 5.0.2 *****
 FIX: #6677 Expired contracts dashboard box does not show the name of the thirdparty
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index c76c35dfdeb..03e4a0ec9f3 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -235,7 +235,7 @@ $sql = "SELECT b.rowid, b.box_id, b.position, b.box_order,";
 $sql.= " bd.rowid as boxid";
 $sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as bd";
 $sql.= " WHERE b.box_id = bd.rowid";
-$sql.= " AND b.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+$sql.= " AND b.entity IN (0,".$conf->entity.")";
 $sql.= " AND b.fk_user=0";
 $sql.= " ORDER by b.position, b.box_order";
 
@@ -342,7 +342,7 @@ print "</tr>\n";
 $var=true;
 foreach($boxtoadd as $box)
 {
-    
+
 
     if (preg_match('/^([^@]+)@([^@]+)$/i',$box->boximg))
     {
@@ -479,7 +479,7 @@ print '</tr>';
 
 // Activate FileCache - Developement
 if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-    
+
     print '<tr class="oddeven"><td width="35%">'.$langs->trans("EnableFileCache").'</td><td>';
     print $form->selectyesno('MAIN_ACTIVATE_FILECACHE',$conf->global->MAIN_ACTIVATE_FILECACHE,1);
     print '</td>';
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 0c7ed656d9f..7528fb09115 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -131,7 +131,7 @@ print '<table class="noborder" width="100%">';
 $sql = "SELECT r.id, r.libelle, r.module, r.perms, r.subperms, r.bydefault";
 $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r";
 $sql.= " WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
-$sql.= " AND entity IN (".(! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+$sql.= " AND entity = ".$conf->entity;
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql.= " AND r.perms NOT LIKE '%_advance'";  // Hide advanced perms if option is not enabled
 $sql.= " ORDER BY r.module, r.id";
 
@@ -185,7 +185,7 @@ if ($result)
             print "</tr>\n";
         }
 
-        
+
         print '<tr class="oddeven">';
         print '<td>'.img_object('',$picto).' '.$objMod->getName();
         print '<a name="'.$objMod->getName().'">&nbsp;</a>';
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 89e1458d4fd..356e76ba374 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -324,14 +324,4 @@ $dolibarr_nocsrfcheck='0';
 // External module
 //##############################
 
-// multicompany_transverse_mode
-// Prerequisite: Need external module "multicompany"
-// Pyramidal   (0): The rights and groups are managed in each entity. Each user belongs to the entity he was created into.
-// Transversal (1): The user is created and managed only into master entity but can login to all entities if he is admmin
-//                  of entity or belongs to at least one user group created into entity.
-
-// Default value: 0 (pyramidal)
-// Examples:
-// $multicompany_transverse_mode='1';
-
 
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 578ed17049e..7a70549a2d1 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Xavier Dutoit        <doli@sydesy.com>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin      	<regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017 Regis Houssin      	<regis.houssin@capnetworks.com>
  * Copyright (C) 2006 	   Jean Heimburger    	<jean@tiaris.info>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -132,14 +132,7 @@ class Conf
 		$sql = "SELECT ".$db->decrypt('name')." as name,";
 		$sql.= " ".$db->decrypt('value')." as value, entity";
 		$sql.= " FROM ".MAIN_DB_PREFIX."const";
-		if (! empty($this->multicompany->transverse_mode))
-		{
-			$sql.= " WHERE entity IN (0,1,".$this->entity.")";
-		}
-		else
-		{
-			$sql.= " WHERE entity IN (0,".$this->entity.")";
-		}
+		$sql.= " WHERE entity IN (0,".$this->entity.")";
 		$sql.= " ORDER BY entity";	// This is to have entity 0 first, then entity 1 that overwrite.
 
 		$resql = $db->query($sql);
@@ -320,7 +313,7 @@ class Conf
 		// For backward compatibility
 		$this->user->dir_output=$rootforuser."/users";
 		$this->user->dir_temp=$rootforuser."/users/temp";
-		
+
 		// UserGroup
 		$this->usergroup->dir_output=$rootforuser."/usergroups";
 		$this->usergroup->dir_temp=$rootforuser."/usergroups/temp";
@@ -386,13 +379,13 @@ class Conf
 
 		$this->global->MAIN_ACTIVATE_HTML5=1;
         $this->global->MAIN_MAIL_USE_MULTI_PART=1;
-        
+
 		// societe
 		if (empty($this->global->SOCIETE_CODECLIENT_ADDON))       $this->global->SOCIETE_CODECLIENT_ADDON="mod_codeclient_leopard";
 		if (empty($this->global->SOCIETE_CODECOMPTA_ADDON))       $this->global->SOCIETE_CODECOMPTA_ADDON="mod_codecompta_panicum";
 
 		if (empty($this->global->CHEQUERECEIPTS_ADDON))           $this->global->CHEQUERECEIPTS_ADDON='mod_chequereceipt_mint';
-		
+
         // Security
 		if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED='standard'; // Default password generator
         if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK='0664';         // Default mask
@@ -425,7 +418,7 @@ class Conf
 		$this->currency=$this->global->MAIN_MONNAIE;
 
 		if (empty($conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30;   // Less than 1 minutes to be sure
-		
+
 		// conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)
         if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE='RECETTES-DEPENSES';  // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
 
@@ -434,7 +427,7 @@ class Conf
 
         // MAIN_HTML_TITLE
         if (! isset($this->global->MAIN_HTML_TITLE)) $this->global->MAIN_HTML_TITLE='noapp,thirdpartynameonly,contactnameonly,projectnameonly';
-        
+
 		// conf->liste_limit = constante de taille maximale des listes
 		if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT=25;
 		$this->liste_limit=$this->global->MAIN_SIZE_LISTE_LIMIT;
@@ -461,7 +454,7 @@ class Conf
 		$this->mailing->email_from=$this->email_from;
 		if (! empty($this->global->MAILING_EMAIL_FROM))	$this->mailing->email_from=$this->global->MAILING_EMAIL_FROM;
 		if (! isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) $this->global->MAIN_EMAIL_ADD_TRACK_ID=1;
-		
+
         // Format for date (used by default when not found or not searched in lang)
         $this->format_date_short="%d/%m/%Y";            // Format of day with PHP/C tags (strftime functions)
         $this->format_date_short_java="dd/MM/yyyy";     // Format of day with Java tags
@@ -485,7 +478,7 @@ class Conf
 		// Default pdf option
 		if (! isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) $this->global->MAIN_PDF_DASH_BETWEEN_LINES=1;    // use dash between lines
         if (! isset($this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) $this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT=1;  // allow html content into free footer text
-		
+
 		// Set default value to MAIN_SHOW_LOGO
 		if (! isset($this->global->MAIN_SHOW_LOGO)) $this->global->MAIN_SHOW_LOGO=1;
 
@@ -500,7 +493,7 @@ class Conf
 
 		// By default, we open card if one found
 		if (! isset($this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) $this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE=1;
-		
+
 		// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"
 		if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent';	// '' means 'all'. Note that contact is added here as it should be a module later.
 
@@ -568,12 +561,12 @@ class Conf
 		    $this->expensereport->payment		= new stdClass();
 		    $this->expensereport->payment->warning_delay=(isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY)?$this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY:0)*24*60*60;
 		}
-		
+
 		if (! empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT))
 		{
 		    $this->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 		}
-		
+
 		// For modules that want to disable top or left menu
 		if (! empty($this->global->MAIN_HIDE_TOP_MENU)) $this->dol_hide_topmenu=$this->global->MAIN_HIDE_TOP_MENU;
 		if (! empty($this->global->MAIN_HIDE_LEFT_MENU)) $this->dol_hide_leftmenu=$this->global->MAIN_HIDE_LEFT_MENU;
@@ -585,7 +578,7 @@ class Conf
 		{
 		    $conf->global->AGENDA_DEFAULT_FILTER_TYPE='0';    // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
 		}
-		    
+
 		// For backward compatibility
 		if (isset($this->product))   $this->produit=$this->product;
 		if (isset($this->facture))   $this->invoice=$this->facture;
@@ -633,7 +626,7 @@ class Conf
 				$this->loghandlers[$handler] = $loghandlerinstance;
 			}
 		}
-		
+
 	}
 }
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b14f72a1b7b..52f46ba6863 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1468,7 +1468,7 @@ class Form
         }
         else
        {
-        	if (! empty($conf->multicompany->transverse_mode))
+        	if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
         	{
         		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
         		$sql.= " ON ug.fk_user = u.rowid";
@@ -1565,7 +1565,7 @@ class Form
 							$moreinfo++;
 						}
 					}
-                    if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                    if (! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
                     {
                         if ($obj->admin && ! $obj->entity)
                         {
@@ -6196,7 +6196,7 @@ class Form
                     $out.= '>';
 
                     $out.= $obj->name;
-                    if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1)
+                    if (! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
                     {
                         $out.= " (".$obj->label.")";
                     }
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index 419f31dca4d..e77a1196530 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -60,7 +60,7 @@ class InfoBox
             $sql.= " d.rowid as box_id, d.file, d.note, d.tms";
             $sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
             $sql.= " WHERE b.box_id = d.rowid";
-            $sql.= " AND b.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+            $sql.= " AND b.entity IN (0,".$conf->entity.")";
             if ($zone >= 0) $sql.= " AND b.position = ".$zone;
             if (is_object($user)) $sql.= " AND b.fk_user IN (0,".$user->id.")";
             else $sql.= " AND b.fk_user = 0";
@@ -70,9 +70,9 @@ class InfoBox
 		{
             $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
             $sql.= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
-           	$sql.= " WHERE d.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+           	$sql.= " WHERE d.entity IN (0,".$conf->entity.")";
         }
-        
+
         dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user)?$user->id:'')."", LOG_DEBUG);
         $resql = $db->query($sql);
         if ($resql)
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index ed6b9929a32..a6770b57c37 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -508,7 +508,7 @@ class Menubase
 
         $sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";
         $sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
-        $sql.= " WHERE m.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+        $sql.= " WHERE m.entity IN (0,".$conf->entity.")";
         $sql.= " AND m.menu_handler IN ('".$menu_handler."','all')";
         if ($type_user == 0) $sql.= " AND m.usertype IN (0,2)";
         if ($type_user == 1) $sql.= " AND m.usertype IN (1,2)";
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index c3d8714ab89..b68d7706e43 100755
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -98,7 +98,7 @@ function dolGetModulesDirs($subdir='')
             while (($file = readdir($handle))!==false)
             {
                 if (preg_match('/disabled/',$file)) continue;   // We discard module if it contains disabled into name.
-                
+
                 if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
                 {
                     if (is_dir($dirroot . '/' . $file . '/core/modules'.$subdir.'/'))
@@ -207,7 +207,7 @@ function dol_print_object_info($object, $usetable=0)
     //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
 
     if ($usetable) print '<table class="border centpercent">';
-    
+
     // Import key
     if (! empty($object->import_key))
     {
@@ -378,7 +378,7 @@ function dol_print_object_info($object, $usetable=0)
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
-    
+
     // Date approve
     if (! empty($object->date_approve2))
     {
@@ -391,7 +391,7 @@ function dol_print_object_info($object, $usetable=0)
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
-    
+
     // User close
     if (! empty($object->user_cloture))
     {
@@ -476,7 +476,7 @@ function dol_print_object_info($object, $usetable=0)
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
-    
+
     if ($usetable) print '</table>';
 }
 
@@ -799,7 +799,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
 			if(!empty($user->array_options['options_'.$extra])){
 				$mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
 			}
-    } 
+    }
     $maskwithonlyymcode=$mask;
     $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
     $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);
@@ -928,11 +928,11 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
 
     // Define $sqlstring
-    if (function_exists('mb_strrpos')) 
+    if (function_exists('mb_strrpos'))
     	{
     	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');
-	} 
-	else 
+	}
+	else
 	{
     	$posnumstart=strrpos($maskwithnocode,$maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
@@ -1123,7 +1123,7 @@ function get_string_between($string, $start, $end){
     $string = " ".$string;
      $ini = strpos($string,$start);
      if ($ini == 0) return "";
-     $ini += strlen($start);     
+     $ini += strlen($start);
      $len = strpos($string,$end,$ini) - $ini;
      return substr($string,$ini,$len);
 }
@@ -1539,9 +1539,9 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
     $sql = "SELECT nom as id, nom as lib, libelle as label, description as description";
     $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
     $sql.= " WHERE type = '".$type."'";
-    $sql.= " AND entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+    $sql.= " AND entity IN (0,".$conf->entity.")";
     $sql.= " ORDER BY description DESC";
-		
+
     dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG);
     $resql = $db->query($sql);
     if ($resql)
@@ -1625,7 +1625,7 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
 /**
  * This function evaluates a string that should be a valid IPv4
  * Note: For ip 169.254.0.0, it returns 0 with some PHP (5.6.24) and 2 with some minor patchs of PHP (5.6.25). See https://github.com/php/php-src/pull/1954.
- *   
+ *
  * @param	string $ip IP Address
  * @return	int 0 if not valid or reserved range, 1 if valid and public IP, 2 if valid and private range IP
  */
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 1c919237f44..f39e6ecd628 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2017	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2015	    Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -76,7 +76,7 @@ function user_prepare_head($object)
     {
         if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
         $MAXAGENDA=$conf->global->AGENDA_EXT_NB;
-        
+
         $i=1;
         $nbagenda = 0;
         while ($i <= $MAXAGENDA)
@@ -87,10 +87,10 @@ function user_prepare_head($object)
             $offsettz='AGENDA_EXT_OFFSETTZ_'.$object->id.'_'.$key;
             $color='AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
             $i++;
-        
+
             if (! empty($object->conf->$name)) $nbagenda++;
         }
-        
+
 	    $head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id;
 	    $head[$h][1] = $langs->trans("ExtSites").($nbagenda ? ' <span class="badge">'.$nbagenda.'</span>' : '');
 	    $head[$h][2] = 'extsites';
@@ -238,8 +238,6 @@ function group_prepare_head($object)
     return $head;
 }
 
-
-
 /**
  * Prepare array with list of tabs
  *
@@ -283,32 +281,6 @@ function user_admin_prepare_head()
 	return $head;
 }
 
-
-
-/**
- * Prepare array with list of tabs
- *
- * @param   Object	$object		Object related to tabs
- * @param	array	$aEntities	Entities array
- * @return  array				Array of tabs
- */
-function entity_prepare_head($object, $aEntities)
-{
-	global $mc;
-
-	$head = array();
-
-	foreach($aEntities as $entity)
-	{
-		$mc->getInfo($entity);
-		$head[$entity][0] = $_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;entity='.$entity;
-		$head[$entity][1] = $mc->label;
-		$head[$entity][2] = $entity;
-	}
-
-	return $head;
-}
-
 /**
  * 	Show list of themes. Show all thumbs of themes
  *
@@ -485,7 +457,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
         print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
         print '</td>';
     }
-    
+
 	// Background color THEME_ELDY_BACKBODY
     if ($foruserprofile)
 	{
@@ -508,7 +480,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 			else print '';
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-	    print '</td>';*/	    
+	    print '</td>';*/
 	}
 	else
 	{
@@ -530,7 +502,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    print '</td>';
 	}
-	
+
 	// TopMenuBackgroundColor
     if ($foruserprofile)
 	{
@@ -553,13 +525,13 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 			else print '';
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-	    print '</td>';*/	    
+	    print '</td>';*/
 	}
 	else
 	{
 	    $default='5a6482';
 	    if ($conf->theme == 'md') $default='5a3278';
-	    
+
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
@@ -577,15 +549,15 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    print '</td>';
 	}
-	
+
 	// BackgroundTableTitleColor
 	if ($foruserprofile)
 	{
-	    
-	    
+
+
 	}
 	else
-	{	
+	{
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
@@ -613,7 +585,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	{
 	    $default='ffffff';
 	    if ($conf->theme == 'md') $default='ffffff';
-	
+
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
@@ -631,17 +603,17 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    print '</td>';
 	}
-	
+
 	// BackgroundTableLineEvenColor
 	if ($foruserprofile)
 	{
-	
+
 	}
 	else
 	{
 	    $default='f8f8f8';
 	    if ($conf->theme == 'md') $default='f8f8f8';
-	
+
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
 	    print '<td colspan="'.($colspan-1).'">';
@@ -659,12 +631,12 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    print '</td>';
 	}
-	
+
 	// TextTitleColor
 	if ($foruserprofile)
 	{
-	     
-	     
+
+
 	}
 	else
 	{
@@ -681,12 +653,12 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    }
 	    print ' &nbsp; ('.$langs->trans("Default").': <strong><span style="color: #3c3c14">3c3c14</span></strong>) ';
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-	    
+
 	    print '</td>';
-	
+
 	    print '</tr>';
 	}
-	
+
 	// Text LinkColor
 	if ($foruserprofile)
 	{
@@ -724,7 +696,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    {
 	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
 	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	        else 
+	        else
 	        {
 	            //print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
 	            //print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
@@ -735,7 +707,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    print '</td>';
 	}
-		
+
 	// Use Hover
 	if ($foruserprofile)
 	{
@@ -767,7 +739,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    {
 	        if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb';
 	        else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
-	        if ($color) 
+	        if ($color)
 	        {
 	            if ($color != 'edf4fb') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 	            else print $langs->trans("Default");
@@ -779,7 +751,6 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
 	    print '</td>';
 	    print '</tr>';
 	}
-	
+
     print '</table>';
 }
-
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index daf82b2f995..190d779d90b 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -39,7 +39,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
 
 	// Force master entity in transversal mode
 	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $entity=1;
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
 
 	$login='';
 
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index c94312c8aa2..129bbcedf38 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -45,7 +45,7 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
 
 	// Force master entity in transversal mode
 	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $entity=1;
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
 
 	$login='';
 	$resultFetchUser='';
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 7a60f330727..a32d3ef6886 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -63,9 +63,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 -- Home - Menu users and groups
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '1', __HANDLER__, 'left', 400__+MAX_llx_menu__, 'home', 'users', 1__+MAX_llx_menu__, '/user/home.php?leftmenu=users', 'MenuUsersAndGroups', 0, 'users', '', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 401__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/index.php?leftmenu=users', 'Users', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 402__+MAX_llx_menu__, 'home', '', 401__+MAX_llx_menu__, '/user/card.php?leftmenu=users&amp;action=create', 'NewUser', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 403__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/group/index.php?leftmenu=users', 'Groups', 1, 'users', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 404__+MAX_llx_menu__, 'home', '', 403__+MAX_llx_menu__, '/user/group/card.php?leftmenu=users&amp;action=create', 'NewGroup', 2, 'users', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 402__+MAX_llx_menu__, 'home', '', 401__+MAX_llx_menu__, '/user/card.php?leftmenu=users&amp;action=create', 'NewUser', 2, 'users', '($user->rights->user->user->creer || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 403__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/group/index.php?leftmenu=users', 'Groups', 1, 'users', '(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="users"', __HANDLER__, 'left', 404__+MAX_llx_menu__, 'home', '', 403__+MAX_llx_menu__, '/user/group/card.php?leftmenu=users&amp;action=create', 'NewGroup', 2, 'users', '(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)', '', 2, 0, __ENTITY__);
 -- Third parties
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 500__+MAX_llx_menu__, 'companies', 'thirdparties', 2__+MAX_llx_menu__, '/societe/index.php?leftmenu=thirdparties', 'ThirdParty', 0, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 501__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/card.php?action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
@@ -211,7 +211,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'accounting', 6__+MAX_llx_menu__, '/accountancy/index.php?leftmenu=accountancy', 'MenuAccountancy', 0, 'accountancy', '! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire', '', 0, 7, __ENTITY__);
 	-- Setup
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2451__+MAX_llx_menu__, 'accountancy', 'accountancy_admin',            2400__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Setup', 1, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 1, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_journal',       2451__+MAX_llx_menu__, '/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingJournals', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2454__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_journal',       2451__+MAX_llx_menu__, '/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingJournals', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2455__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartmodel',    2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Pcg_version', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 20, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2456__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart',         2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Chartofaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 30, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group',   2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 40, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 38a9a66a137..af8bfff5f2c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -597,12 +597,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if ($usemenuhider || empty($leftmenu) || $leftmenu=="users")
 				{
 					$newmenu->add("", $langs->trans("Users"), 1, $user->rights->user->user->lire || $user->admin);
-					$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"),2, $user->rights->user->user->creer || $user->admin, '', 'home');
+					$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"),2, ($user->rights->user->user->creer || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE), '', 'home');
 					$newmenu->add("/user/index.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->rights->user->user->lire || $user->admin);
 					$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, $user->rights->user->user->lire || $user->admin);
-					$newmenu->add("", $langs->trans("Groups"), 1, $user->rights->user->user->lire || $user->admin);
-					$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin);
-					$newmenu->add("/user/group/index.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin);
+					$newmenu->add("", $langs->trans("Groups"), 1, ($user->rights->user->user->lire || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
+					$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
+					$newmenu->add("/user/group/index.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
 				}
 			}
 
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 2bb2121411f..6d14f47af10 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -156,9 +156,6 @@ if (empty($dolibarr_main_limit_users)) $dolibarr_main_limit_users=0;
 if (empty($dolibarr_mailing_limit_sendbyweb)) $dolibarr_mailing_limit_sendbyweb=0;
 if (empty($dolibarr_mailing_limit_sendbycli)) $dolibarr_mailing_limit_sendbycli=0;
 if (empty($dolibarr_strict_mode)) $dolibarr_strict_mode=0; // For debug in php strict mode
-// TODO Multicompany Remove this. Useless.
-if (empty($multicompany_transverse_mode)) $multicompany_transverse_mode=0;
-if (empty($multicompany_force_entity)) $multicompany_force_entity=0; // To force entity in login page
 
 // Security: CSRF protection
 // This test check if referrer ($_SERVER['HTTP_REFERER']) is same web site than Dolibarr ($_SERVER['HTTP_HOST'])
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index ba36d911971..c99ea6899a2 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1209,7 +1209,7 @@ class Holiday extends CommonObject
                 $sql = "SELECT u.rowid";
                 $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 
-                if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+                if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
                 {
                 	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
                 	$sql.= " WHERE (ug.fk_user = u.rowid";
@@ -1305,7 +1305,7 @@ class Holiday extends CommonObject
                 $sql = "SELECT u.rowid, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut";
                 $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 
-                if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+                if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
                 {
                 	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
                 	$sql.= " WHERE (ug.fk_user = u.rowid";
diff --git a/htdocs/index.php b/htdocs/index.php
index 5303587150e..90c014b0e99 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2001-2004 Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2015 Regis Houssin	<regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2012 Juanjo Menent	<jmenent@2byte.es>
- * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
+/* Copyright (C) 2001-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2011-2012	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -165,7 +165,7 @@ if (empty($user->societe_id))
     	    DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",
     	    DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
     	    DOL_DOCUMENT_ROOT."/product/class/product.class.php",
-    	    DOL_DOCUMENT_ROOT."/product/class/service.class.php",
+    	    DOL_DOCUMENT_ROOT."/product/class/product.class.php",
     	    DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
     	    DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
     	    DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index d7e68346511..e807c446830 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -379,3 +379,19 @@ create table llx_loan_schedule
   fk_user_modif		integer           
 )ENGINE=innodb;
 
+ALTER TABLE llx_user_rights ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
+ALTER TABLE llx_user_rights DROP FOREIGN KEY fk_user_rights_fk_user_user;
+ALTER TABLE llx_user_rights DROP INDEX uk_user_rights;
+ALTER TABLE llx_user_rights DROP INDEX fk_user;
+ALTER TABLE llx_user_rights ADD UNIQUE INDEX uk_user_rights (entity, fk_user, fk_id);
+ALTER TABLE llx_user_rights ADD CONSTRAINT fk_user_rights_fk_user_user FOREIGN KEY (fk_user) REFERENCES llx_user (rowid);
+
+ALTER TABLE llx_usergroup_rights ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
+ALTER TABLE llx_usergroup_rights DROP FOREIGN KEY fk_usergroup_rights_fk_usergroup;
+ALTER TABLE llx_usergroup_rights DROP INDEX fk_usergroup;
+ALTER TABLE llx_usergroup_rights ADD UNIQUE INDEX uk_usergroup_rights (entity, fk_usergroup, fk_id);
+ALTER TABLE llx_usergroup_rights ADD CONSTRAINT fk_usergroup_rights_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid);
+
+
+
+
diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql
index 6e87568e247..8fae1c1a160 100644
--- a/htdocs/install/mysql/tables/llx_user_rights.key.sql
+++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql
@@ -1,6 +1,7 @@
 -- ============================================================================
--- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+-- Copyright (C) 2005	Laurent Destailleur		<eldy@users.sourceforge.net>
+-- Copyright (C) 2017	Regis Houssin			<regis.houssin@capnetworks.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,6 @@
 -- Delete orphans
 -- V4 DELETE llx_user_rights FROM llx_user_rights LEFT JOIN llx_user ON llx_user_rights.fk_user = llx_user.rowid WHERE llx_user.rowid IS NULL;
 
+ALTER TABLE llx_user_rights ADD UNIQUE INDEX uk_user_rights (entity, fk_user, fk_id);
 
 ALTER TABLE llx_user_rights ADD CONSTRAINT fk_user_rights_fk_user_user FOREIGN KEY (fk_user)    REFERENCES llx_user (rowid);
-
-ALTER TABLE llx_user_rights ADD UNIQUE INDEX uk_user_rights (fk_user, fk_id);
diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql
index bd4c0afc242..cedfa8a00c9 100644
--- a/htdocs/install/mysql/tables/llx_user_rights.sql
+++ b/htdocs/install/mysql/tables/llx_user_rights.sql
@@ -1,5 +1,6 @@
 -- ============================================================================
--- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+-- Copyright (C) 2017	Regis Houssin			<regis.houssin@capnetworks.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -18,8 +19,9 @@
 
 create table llx_user_rights
 (
-  rowid         integer AUTO_INCREMENT PRIMARY KEY,
-  fk_user       integer NOT NULL,
-  fk_id         integer NOT NULL
+  rowid			integer AUTO_INCREMENT PRIMARY KEY,
+  entity		integer DEFAULT 1 NOT NULL, -- multi company id
+  fk_user		integer NOT NULL,
+  fk_id			integer NOT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql
index 119ce8982b5..f08a6f62637 100644
--- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql
@@ -1,5 +1,6 @@
 -- ============================================================================
--- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2005	Laurent Destailleur	<eldy@users.sourceforge.net>
+-- Copyright (C) 2017	Regis Houssin		<regis.houssin@capnetworks.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,5 +21,6 @@
 -- Supprime orhpelins pour permettre montee de la cle
 -- V4 DELETE llx_usergroup_rights FROM llx_usergroup_rights LEFT JOIN llx_usergroup ON llx_usergroup_rights.fk_usergroup = llx_usergroup.rowid WHERE llx_usergroup.rowid IS NULL;
 
+ALTER TABLE llx_usergroup_rights ADD UNIQUE INDEX uk_usergroup_rights (entity, fk_usergroup, fk_id);
 
 ALTER TABLE llx_usergroup_rights ADD CONSTRAINT fk_usergroup_rights_fk_usergroup FOREIGN KEY (fk_usergroup)    REFERENCES llx_usergroup (rowid);
diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql
index 850648edea4..e8a3af37e7c 100644
--- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup_rights.sql
@@ -1,5 +1,6 @@
 -- ============================================================================
--- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2005	Laurent Destailleur	<eldy@users.sourceforge.net>
+-- Copyright (C) 2017	Regis Houssin		<regis.houssin@capnetworks.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -18,10 +19,10 @@
 
 create table llx_usergroup_rights
 (
-  rowid         integer AUTO_INCREMENT PRIMARY KEY,
-  fk_usergroup  integer NOT NULL,
-  fk_id         integer NOT NULL,
+  rowid			integer AUTO_INCREMENT PRIMARY KEY,
+  entity		integer DEFAULT 1 NOT NULL, -- multi company id
+  fk_usergroup	integer NOT NULL,
+  fk_id			integer NOT NULL
 
-  UNIQUE(fk_usergroup,fk_id)
 )ENGINE=innodb;
 
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 90a4cb70611..ecb1c46478f 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -1,14 +1,14 @@
 <?php
-/* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003      Xavier Dutoit        <doli@sydesy.com>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2005 	   Simon Tosser         <simon@kornog-computing.com>
- * Copyright (C) 2006 	   Andre Cianfarani     <andre.cianfarani@acdeveloppement.net>
- * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
+/* Copyright (C) 2002-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Xavier Dutoit			<doli@sydesy.com>
+ * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Sebastien Di Cintio		<sdicintio@ressource-toi.org>
+ * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2005		Simon Tosser			<simon@kornog-computing.com>
+ * Copyright (C) 2006		Andre Cianfarani		<andre.cianfarani@acdeveloppement.net>
+ * Copyright (C) 2010		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -98,11 +98,6 @@ if (! empty($dolibarr_main_document_root_alt))
 	}
 }
 
-// Set properties specific to multicompany
-// TODO Multicompany Remove this. Useless. Var should be read when required.
-$conf->multicompany->transverse_mode = empty($multicompany_transverse_mode)?'':$multicompany_transverse_mode;		// Force Multi-Company transverse mode
-$conf->multicompany->force_entity = empty($multicompany_force_entity)?'':(int) $multicompany_force_entity;			// Force entity in login page
-
 // Chargement des includes principaux de librairies communes
 if (! defined('NOREQUIREUSER')) require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';		// Need 500ko memory
 if (! defined('NOREQUIRETRAN')) require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';
@@ -170,10 +165,6 @@ if (! defined('NOREQUIREDB'))
 	{
 		$conf->entity = $_COOKIE['DOLENTITY'];
 	}
-	else if (! empty($conf->multicompany->force_entity) && is_numeric($conf->multicompany->force_entity)) // To force entity in login page
-	{
-		$conf->entity = $conf->multicompany->force_entity;
-	}
 
 	// Sanitize entity
 	if (! is_numeric($conf->entity)) $conf->entity=1;
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index a935b87bd58..c3a11ac7cab 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -110,7 +110,7 @@ if (empty($user->socid)) $fieldstosearchall["t.note_private"]="NotePrivate";
 $arrayfields=array(
     't.field1'=>array('label'=>"Field1", 'checked'=>1),
     't.field2'=>array('label'=>"Field2", 'checked'=>1),
-    //'t.entity'=>array('label'=>"Entity", 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+    //'t.entity'=>array('label'=>"Entity", 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
     't.datec'=>array('label'=>"DateCreationShort", 'checked'=>0, 'position'=>500),
     't.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
     //'t.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 78d3c470cb1..162bd6d04b6 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -102,7 +102,7 @@ $arrayfields=array(
 	't.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>1),
 	't.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>1),
 	//'t.import_key'=>array('label'=>$langs->trans("ImportKey"), 'checked'=>1),
-    //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+    //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
     //'t.fk_user_creat'=>array('label'=>$langs->trans("UserCreationShort"), 'checked'=>0, 'position'=>500),
 	//'t.fk_user_modif'=>array('label'=>$langs->trans("UserModificationShort"), 'checked'=>0, 'position'=>500),
     't.datec'=>array('label'=>$langs->trans("DateCreationShort"), 'checked'=>0, 'position'=>500),
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ebd06dbd5c4..5b300f39b33 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1695,7 +1695,7 @@ class Societe extends CommonObject
 
         $sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
-        if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+        if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
         {
         	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
         	$sql.= " WHERE ((ug.fk_user = sc.fk_user";
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 89bb836d119..7046310fa6f 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -142,13 +142,13 @@ if (! empty($socid))
 	$sql = "SELECT DISTINCT u.rowid, u.login, u.fk_soc, u.lastname, u.firstname, u.statut, u.entity, u.photo";
 	$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 	$sql .= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 	{
 	    $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
 	}
 	$sql .= " WHERE sc.fk_soc =".$object->id;
 	$sql .= " AND sc.fk_user = u.rowid";
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 	{
 		$sql.= " AND ((ug.fk_user = sc.fk_user";
 		$sql.= " AND ug.entity = ".$conf->entity.")";
@@ -232,7 +232,7 @@ if (! empty($socid))
 
 		$sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.login, u.email, u.statut, u.fk_soc, u.photo";
 		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+		if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 		{
 			$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
 			$sql.= " WHERE ((ug.fk_user = u.rowid";
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 92951de98e8..86bb168c54f 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2005      Lionel Cousteix      <etm_ltd@tiscali.co.uk>
  * Copyright (C) 2011      Herve Prot           <herve.prot@symeos.com>
  * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
@@ -57,6 +57,12 @@ $subaction	= GETPOST('subaction','alpha');
 $group		= GETPOST("group","int",3);
 $cancel     = GETPOST('cancel');
 
+// Users/Groups management only in master entity if transverse mode
+if (($action == 'create' || $action == 'adduserldap') && ! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
+{
+	accessforbidden();
+}
+
 // Define value to know what current user can do on users
 $canadduser=(! empty($user->admin) || $user->rights->user->user->creer);
 $canreaduser=(! empty($user->admin) || $user->rights->user->user->lire);
@@ -228,11 +234,11 @@ if (empty($reshook)) {
 
 			// Set entity property
 			$entity = GETPOST('entity', 'int');
-			if (!empty($conf->multicompany->enabled)) {
-				if (!empty($_POST["superadmin"])) {
+			if (! empty($conf->multicompany->enabled)) {
+				if (GETPOST('superadmin', 'int')) {
 					$object->entity = 0;
 				} else {
-					if ($conf->multicompany->transverse_mode) {
+					if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 						$object->entity = 1; // all users are forced into master entity
 					} else {
 						$object->entity = ($entity == '' ? 1 : $entity);
@@ -249,8 +255,8 @@ if (empty($reshook)) {
 
 			$id = $object->create($user);
 			if ($id > 0) {
-				if (isset($_POST['password']) && trim($_POST['password'])) {
-					$object->setPassword($user, trim($_POST['password']));
+				if (GETPOST('password')) {
+					$object->setPassword($user, GETPOST('password'));
 				}
             			if (! empty($conf->categorie->enabled)) {
 					// Categories association
@@ -283,10 +289,10 @@ if (empty($reshook)) {
 
 			$object->fetch($id);
 			if ($action == 'addgroup') {
-				$object->SetInGroup($group, ($conf->multicompany->transverse_mode ? GETPOST("entity") : $editgroup->entity));
+				$object->SetInGroup($group, (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? GETPOST('entity', 'int') : $editgroup->entity));
 			}
 			if ($action == 'removegroup') {
-				$object->RemoveFromGroup($group, ($conf->multicompany->transverse_mode ? GETPOST("entity") : $editgroup->entity));
+				$object->RemoveFromGroup($group, (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? GETPOST('entity', 'int') : $editgroup->entity));
 			}
 
 			if ($result > 0) {
@@ -300,7 +306,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'update' && ! $cancel) 
+	if ($action == 'update' && ! $cancel)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -319,7 +325,7 @@ if (empty($reshook)) {
 				$error ++;
 			}
 
-			if (!$error) 
+			if (!$error)
 			{
 				$object->fetch($id);
 
@@ -367,7 +373,7 @@ if (empty($reshook)) {
 					{
 						$object->entity = 0;
 					}
-					else if ($conf->multicompany->transverse_mode)
+					else if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 					{
 						$object->entity = 1; // all users in master entity
 					}
@@ -409,7 +415,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				if (!$error && isset($_POST['contactid'])) {
+				if (!$error && GETPOST('contactid', 'int')) {
 					$contactid = GETPOST('contactid', 'int');
 
 					if ($contactid > 0) {
@@ -456,7 +462,7 @@ if (empty($reshook)) {
 								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 							} else {
         					    // Create thumbs
-        					    $object->addThumbs($newfile);					    
+        					    $object->addThumbs($newfile);
 							}
 						} else {
 							$error ++;
@@ -465,7 +471,7 @@ if (empty($reshook)) {
 						}
 					}
 				}
-				
+
             	if (! $error && ! count($object->errors))
             	{
             		// Then we add the associated categories
@@ -476,7 +482,7 @@ if (empty($reshook)) {
 				if (!$error && !count($object->errors)) {
 					setEventMessages($langs->trans("UserModified"), null, 'mesgs');
 					$db->commit();
-					
+
 					$login = $_SESSION["dol_login"];
 					if ($login && $login == $object->oldcopy->login && $object->oldcopy->login != $object->login)    // Current user has changed its login
 					{
@@ -495,11 +501,11 @@ if (empty($reshook)) {
 		    if ($caneditpassword)    // Case we can edit only password
 		    {
 		        dol_syslog("Not allowed to change fields, only password");
-		        
+
 		        $object->fetch($id);
-		    
+
 		        $object->oldcopy = clone $object;
-		    
+
 		        $ret = $object->setPassword($user, GETPOST("password"));
 		        if ($ret < 0)
 		        {
@@ -591,14 +597,14 @@ if (empty($reshook)) {
             setEventMessages($ldap->error, $ldap->errors, 'errors');
         }
     }
-		
+
     // Actions to send emails
     $trigger_name='USER_SENTBYMAIL';
     $paramname='id';    // Name of param key to open the card
     $mode='emailfromuser';
     $trackid='use'.$object->id;
     include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
-    
+
     // Actions to build doc
     $upload_dir = $conf->user->dir_output;
     $permissioncreate=$user->rights->user->user->creer;
@@ -617,7 +623,7 @@ $formfile = new FormFile($db);
 
 llxHeader('',$langs->trans("UserCard"));
 
-if (($action == 'create') || ($action == 'adduserldap'))
+if ($action == 'create' || $action == 'adduserldap')
 {
     /* ************************************************************************** */
     /*                                                                            */
@@ -858,7 +864,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
         print '<td>';
         print $form->selectyesno('admin',GETPOST('admin'),1);
 
-        if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
+        if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
         {
             if (! empty($conf->use_javascript_ajax))
             {
@@ -888,8 +894,8 @@ if (($action == 'create') || ($action == 'adduserldap'))
                             });
                     </script>';
             }
-            $checked=($_POST["superadmin"]?' checked':'');
-            $disabled=($_POST["superadmin"]?'':' disabled');
+            $checked=(GETPOST('superadmin', 'int')?' checked':'');
+            $disabled=(GETPOST('superadmin', 'int')?'':' disabled');
             print '<input type="checkbox" name="superadmin" value="1"'.$checked.$disabled.' /> '.$langs->trans("SuperAdministrator");
         }
         print "</td></tr>\n";
@@ -1005,9 +1011,9 @@ if (($action == 'create') || ($action == 'adduserldap'))
     print '</td></tr>';
 
     // Multicompany
-    if (! empty($conf->multicompany->enabled))
+    if (! empty($conf->multicompany->enabled) && is_object($mc))
     {
-        if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity && is_object($mc))
+    	if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
         {
             print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
             print "<td>".$mc->select_entities($conf->entity);
@@ -1027,9 +1033,9 @@ if (($action == 'create') || ($action == 'adduserldap'))
         print '<input size="30" type="text" name="accountancy_code" value="'.GETPOST('accountancy_code').'">';
         print '</td></tr>';
     }
-    
+
     // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
-    
+
     // Hierarchy
     print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
     print '<td>';
@@ -1076,7 +1082,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     print '<input size="8" type="text" name="weeklyhours" value="'.GETPOST('weeklyhours').'">';
     print '</td>';
     print "</tr>\n";
-	
+
     // Date employment
     print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
     print '<td>';
@@ -1092,9 +1098,9 @@ if (($action == 'create') || ($action == 'adduserldap'))
 		print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
 		print '</td></tr>';
 	}
-	
+
 	// Categories
-	if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) 
+	if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
 	{
 		print '<tr><td>' . fieldLabel('Categories', 'usercats') . '</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1);
@@ -1110,7 +1116,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     {
     	print $object->showOptionals($extrafields,'edit');
     }
-	
+
     // Note
     print '<tr><td class="tdtop">';
     print $langs->trans("Note");
@@ -1127,7 +1133,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     $doleditor=new DolEditor('signature',GETPOST('signature'),'',138,'dolibarr_mailings','In',true,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
     print $doleditor->Create(1);
     print '</td></tr>';
-    
+
     print "</table>\n";
 
  	dol_fiche_end();
@@ -1153,7 +1159,7 @@ else
         $object->fetch($id, '', '', 1);
         if ($res < 0) { dol_print_error($db,$object->error); exit; }
         $res=$object->fetch_optionals($object->id,$extralabels);
-		
+
 		// Check if user has rights
 		$object->getrights();
 		if(empty($object->nb_rights)) setEventMessages($langs->trans('UserHasNoPermissions'), null, 'warnings');
@@ -1226,7 +1232,7 @@ else
          */
         if ($action == 'password')
         {
-            print $form->formconfirm("card.php?id=$object->id",$langs->trans("ReinitPassword"),$langs->trans("ConfirmReinitPassword",$object->login),"confirm_password", '', 0, 1);
+        	print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("ReinitPassword"),$langs->trans("ConfirmReinitPassword",$object->login),"confirm_password", '', 0, 1);
         }
 
         /*
@@ -1234,7 +1240,7 @@ else
          */
         if ($action == 'passwordsend')
         {
-            print $form->formconfirm("card.php?id=$object->id",$langs->trans("SendNewPassword"),$langs->trans("ConfirmSendNewPassword",$object->login),"confirm_passwordsend", '', 0, 1);
+        	print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("SendNewPassword"),$langs->trans("ConfirmSendNewPassword",$object->login),"confirm_passwordsend", '', 0, 1);
         }
 
         /*
@@ -1242,7 +1248,7 @@ else
          */
         if ($action == 'disable')
         {
-            print $form->formconfirm("card.php?id=$object->id",$langs->trans("DisableAUser"),$langs->trans("ConfirmDisableUser",$object->login),"confirm_disable", '', 0, 1);
+        	print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("DisableAUser"),$langs->trans("ConfirmDisableUser",$object->login),"confirm_disable", '', 0, 1);
         }
 
         /*
@@ -1250,7 +1256,7 @@ else
          */
         if ($action == 'enable')
         {
-            print $form->formconfirm("card.php?id=$object->id",$langs->trans("EnableAUser"),$langs->trans("ConfirmEnableUser",$object->login),"confirm_enable", '', 0, 1);
+        	print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("EnableAUser"),$langs->trans("ConfirmEnableUser",$object->login),"confirm_enable", '', 0, 1);
         }
 
         /*
@@ -1258,7 +1264,7 @@ else
          */
         if ($action == 'delete')
         {
-            print $form->formconfirm("card.php?id=$object->id",$langs->trans("DeleteAUser"),$langs->trans("ConfirmDeleteUser",$object->login),"confirm_delete", '', 0, 1);
+        	print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("DeleteAUser"),$langs->trans("ConfirmDeleteUser",$object->login),"confirm_delete", '', 0, 1);
         }
 
         /*
@@ -1387,7 +1393,7 @@ else
                 print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
                 print '<td>'.$object->accountancy_code.'</td></tr>';
             }
-            
+
             // TODO Move this into tab RH, visible when salarie or RH is visible (HierarchicalResponsible must be on both tab)
 
             // Hierarchy
@@ -1468,7 +1474,7 @@ else
             }
 
             // Categories
-		    if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) 
+		    if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
 	    	{
 				print '<tr><td>' . $langs->trans( "Categories" ) . '</td>';
 				print '<td colspan="3">';
@@ -1476,71 +1482,52 @@ else
 				print '</td></tr>';
 		    }
 
-		    // Multicompany
-		    // TODO This should be done with hook formObjectOption
-		    if (is_object($mc))
-		    {
-		        if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-		        {
-		            print '<tr><td>'.$langs->trans("Entity").'</td><td>';
-		            if (empty($object->entity))
-		            {
-		                print $langs->trans("AllEntities");
-		            }
-		            else
-		            {
-		                $mc->getInfo($object->entity);
-		                print $mc->label;
-		            }
-		            print "</td></tr>\n";
-		        }
-		    }
-		    
 		    if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
 		    {
 		        print '<tr><td>'.$langs->trans("OpenIDURL").'</td>';
 		        print '<td>'.$object->openid.'</td>';
 		        print "</tr>\n";
 		    }
-		    
+
 		    print '<tr><td class="titlefield">'.$langs->trans("LastConnexion").'</td>';
 		    print '<td>'.dol_print_date($object->datelastlogin,"dayhour").'</td>';
 		    print "</tr>\n";
-		    
+
 		    print '<tr><td>'.$langs->trans("PreviousConnexion").'</td>';
 		    print '<td>'.dol_print_date($object->datepreviouslogin,"dayhour").'</td>';
 		    print "</tr>\n";
-		    
+
 		    // Other attributes
 		    $parameters=array();
 		    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		    print $hookmanager->resPrint;
 		    if (empty($reshook) && ! empty($extrafields->attribute_label))
 		    {
 		        print $object->showOptionals($extrafields);
 		    }
-		    
+
             // Company / Contact
             if (! empty($conf->societe->enabled))
             {
                 print '<tr><td>'.$langs->trans("LinkToCompanyContact").'</td>';
                 print '<td>';
-                if (isset($object->societe_id) && $object->societe_id > 0)
+                if (isset($object->socid) && $object->socid > 0)
                 {
                     $societe = new Societe($db);
-                    $societe->fetch($object->societe_id);
+                    $societe->fetch($object->socid);
                     print $societe->getNomUrl(1,'');
                 }
                 else
                 {
                     print $langs->trans("ThisUserIsNot");
                 }
-                if (! empty($object->contact_id))
+                if (! empty($object->contactid))
                 {
                     $contact = new Contact($db);
-                    $contact->fetch($object->contact_id);
-                    if ($object->societe_id > 0) print ' / ';
+                    $contact->fetch($object->contactid);
+                    if ($object->socid > 0) print ' / ';
                     else print '<br>';
-                    print '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contact_id.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
+                    print '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contactid.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
                 }
                 print '</td>';
                 print '</tr>'."\n";
@@ -1598,8 +1585,8 @@ else
                 $langs->load("mails");
                 print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
             }
-            
-            if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+
+            if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
             {
                 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
                 {
@@ -1611,7 +1598,7 @@ else
                 }
             }
             elseif ($caneditpassword && ! $object->ldap_sid &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
             {
                 print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a></div>';
             }
@@ -1624,7 +1611,7 @@ else
 	                print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a></div>';
 				}
                 elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
                 {
                     print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a></div>';
                 }
@@ -1634,7 +1621,7 @@ else
 	                print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a></div>';
 				}
                 else if (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
                 {
                     if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a></div>';
                     else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a></div>';
@@ -1643,19 +1630,19 @@ else
 
             // Activer
             if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
             {
                 print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a></div>';
             }
             // Desactiver
             if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
             {
                 print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a></div>';
             }
             // Delete
             if ($user->id <> $id && $candisableuser &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
             {
             	if ($user->admin || ! $object->admin) // If user edited is admin, delete is possible on for an admin
             	{
@@ -1680,36 +1667,36 @@ else
                 /*
                  * Affiche formulaire mail
                  */
-            
+
                 // By default if $action=='presend'
                 $titreform='SendMail';
                 $topicmail='';
                 $action='send';
                 $modelmail='user';
-            
+
                 print '<div id="presend"></div>';
                 print load_fiche_titre($langs->trans($titreform));
-            
+
                 dol_fiche_head();
-            
+
                 // Define output language
                 $outputlangs = $langs;
                 $newlang = '';
                 if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
                     $newlang = $_REQUEST['lang_id'];
-                
+
                 if ($conf->global->MAIN_MULTILANGS && empty($newlang))
                     $newlang = $object->default_lang;
-            
+
                 // Cree l'objet formulaire mail
                 include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
                 $formmail = new FormMail($db);
                 $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
                 $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-    
+
                 if($formmail->fromtype === 'user'){
                     $formmail->fromid = $user->id;
-    
+
                 }
                 $formmail->trackid='thi'.$object->id;
                 if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
@@ -1733,40 +1720,40 @@ else
                 $formmail->substit['__FIRSTNAME__']=$object->firstname;
                 $formmail->substit['__SIGNATURE__']=$user->signature;
                 $formmail->substit['__PERSONALIZED__']='';
-    
+
                 //Find the good contact adress
                 /*
                 $custcontact='';
                 $contactarr=array();
                 $contactarr=$object->liste_contact(-1,'external');
-    
+
                 if (is_array($contactarr) && count($contactarr)>0)
                 {
                 foreach($contactarr as $contact)
                 {
                 if ($contact['libelle']==$langs->trans('TypeContact_facture_external_BILLING')) {
-    
+
                 require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-    
+
                 $contactstatic=new Contact($db);
                 $contactstatic->fetch($contact['id']);
                 $custcontact=$contactstatic->getFullName($langs,1);
                 }
                 }
-    
+
                 if (!empty($custcontact)) {
                 $formmail->substit['__CONTACTCIVNAME__']=$custcontact;
                 }
                 }*/
-    
-    
+
+
                 // Tableau des parametres complementaires du post
                 $formmail->param['action']=$action;
                 $formmail->param['models']=$modelmail;
                 $formmail->param['models_id']=GETPOST('modelmailselected','int');
                 $formmail->param['socid']=$object->id;
                 $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-    
+
                 // Init list of files
                 if (GETPOST("mode")=='init')
                 {
@@ -1774,7 +1761,7 @@ else
                     $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
                 }
                 print $formmail->get_form();
-    
+
                 dol_fiche_end();
             }
 
@@ -1783,20 +1770,20 @@ else
                 /*
                  * List of groups of user
                  */
-    
+
                 if ($canreadgroup)
                 {
                     print load_fiche_titre($langs->trans("ListOfGroupsForUser"),'','');
-    
+
                     // On selectionne les groupes auquel fait parti le user
                     $exclude = array();
-    
+
                     $usergroup=new UserGroup($db);
                     $groupslist = $usergroup->listGroupsForUser($object->id);
-    
+
                     if (! empty($groupslist))
                     {
-                        if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
+                        if (! (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)))
                         {
                             foreach($groupslist as $groupforuser)
                             {
@@ -1804,46 +1791,54 @@ else
                             }
                         }
                     }
-    
+
                     if ($caneditgroup)
                     {
                         print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
                         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
                         print '<input type="hidden" name="action" value="addgroup" />';
                     }
-                    
+
                     print '<table class="noborder" width="100%">'."\n";
                     print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("Groups").'</th>'."\n";
-                    if(! empty($conf->multicompany->enabled) && !empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                    if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
                     {
                         print '<td class="liste_titre" width="25%">'.$langs->trans("Entity").'</td>';
                     }
                     print '<th align="right">';
                     if ($caneditgroup)
                     {
-                        print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
-                        print ' &nbsp; ';
-                        // Multicompany
-                        if (! empty($conf->multicompany->enabled))
-                        {
-                            if ($conf->entity == 1 && $conf->multicompany->transverse_mode)
-                            {
-                                print '</td><td>'.$langs->trans("Entity").'</td>';
-                                print "<td>".$mc->select_entities($conf->entity);
-                            }
-                            else
-                            {
-                                print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-                            }
-                        }
-                        else
-                        {
-                        	print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-                        }
-                        print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
+                    	// Users/Groups management only in master entity if transverse mode
+                    	if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
+                    	{
+                    		// nothing
+                    	}
+                    	else
+                    	{
+                    		print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
+                    		print ' &nbsp; ';
+                    		// Multicompany
+                    		if (! empty($conf->multicompany->enabled))
+                    		{
+                    			if ($conf->entity == 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
+                    			{
+                    				print '</td><td>'.$langs->trans("Entity").'</td>';
+                    				print "<td>".$mc->select_entities($conf->entity);
+                    			}
+                    			else
+                    			{
+                    				print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+                    			}
+                    		}
+                    		else
+                    		{
+                    			print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+                    		}
+                    		print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
+                    	}
                     }
                     print '</th></tr>'."\n";
-    
+
                     /*
                      * Groups assigned to user
                      */
@@ -1851,8 +1846,8 @@ else
                     {
                         foreach($groupslist as $group)
                         {
-                            
-    
+
+
                             print '<tr class="oddeven">';
                             print '<td>';
                             if ($caneditgroup)
@@ -1864,7 +1859,7 @@ else
                                 print img_object($langs->trans("ShowGroup"),"group").' '.$group->name;
                             }
                             print '</td>';
-                            if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                            if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
                             {
                             	print '<td class="valeur">';
                             	if (! empty($group->usergroup_entity))
@@ -1882,7 +1877,7 @@ else
                             	}
                             }
                             print '<td align="right">';
-                            if ($caneditgroup && empty($conf->multicompany->transverse_mode))
+                            if ($caneditgroup && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
                             {
                                 print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
                                 print img_delete($langs->trans("RemoveFromGroup"));
@@ -1899,9 +1894,9 @@ else
                     {
                         print '<tr '.$bc[false].'><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
                     }
-    
+
                     print "</table>";
-                    
+
                     if ($caneditgroup)
                     {
                         print '</form>';
@@ -1910,7 +1905,7 @@ else
                 }
             }
         }
-        
+
         /*
          * Fiche en mode edition
          */
@@ -2030,7 +2025,7 @@ else
             print "</td></tr>\n";
 
             // API key
-            if(! empty($conf->api->enabled) && $user->admin) 
+            if(! empty($conf->api->enabled) && $user->admin)
             {
                 print '<tr><td>'.$langs->trans("ApiKey").'</td>';
                 print '<td>';
@@ -2042,7 +2037,7 @@ else
 
             // Administrator
             print '<tr><td>'.$langs->trans("Administrator").'</td>';
-            if ($object->societe_id > 0)
+            if ($object->socid > 0)
             {
             	$langs->load("admin");
                 print '<td>';
@@ -2067,7 +2062,7 @@ else
                 {
                     print $form->selectyesno('admin',$object->admin,1);
 
-                    if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
+                    if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
                     {
                         if ($conf->use_javascript_ajax)
                         {
@@ -2129,7 +2124,7 @@ else
            	if ($user->id == $object->id || ! $user->admin)
            	{
 	           	$type=$langs->trans("Internal");
-    	       	if ($object->societe_id) $type=$langs->trans("External");
+    	       	if ($object->socid) $type=$langs->trans("External");
         	   	print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
 	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
            	}
@@ -2280,9 +2275,9 @@ else
                 print '</td>';
                 print "</tr>";
             }
-            
+
             // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
-            
+
             // Hierarchy
             print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
             print '<td>';
@@ -2355,7 +2350,7 @@ else
     			print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
     			print '</td></tr>';
     		}
-    
+
     		// Photo
     		print '<tr>';
     		print '<td>'.$langs->trans("Photo").'</td>';
@@ -2363,9 +2358,9 @@ else
     		print $form->showphoto('userphoto',$object,60,0,$caneditfield,'photowithmargin','small');
     		print '</td>';
     		print '</tr>';
-    		
+
     		// Categories
-    		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire )) 
+    		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire ))
     		{
     			print '<tr><td>' . fieldLabel( 'Categories', 'usercats' ) . '</td>';
     			print '<td>';
@@ -2390,16 +2385,16 @@ else
             {
                 print '<tr><td width="25%">'.$langs->trans("LinkToCompanyContact").'</td>';
                 print '<td>';
-                if ($object->societe_id > 0)
+                if ($object->socid > 0)
                 {
                     $societe = new Societe($db);
-                    $societe->fetch($object->societe_id);
+                    $societe->fetch($object->socid);
                     print $societe->getNomUrl(1,'');
-                    if ($object->contact_id)
+                    if ($object->contactid)
                     {
                         $contact = new Contact($db);
-                        $contact->fetch($object->contact_id);
-                        print ' / <a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contact_id.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
+                        $contact->fetch($object->contactid);
+                        print ' / <a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contactid.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
                     }
                 }
                 else
@@ -2432,25 +2427,10 @@ else
                 print "</tr>\n";
             }
 
-            // Multicompany
-            // TODO check if user not linked with the current entity before change entity (thirdparty, invoice, etc.) !!
-            if (! empty($conf->multicompany->enabled) && is_object($mc))
-            {
-            	if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-            	{
-            		print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
-            		print "<td>".$mc->select_entities($object->entity, 'entity', '', 0, 1);		// last parameter 1 means, show also a choice 0=>'all entities'
-            		print "</td></tr>\n";
-            	}
-            	else
-            	{
-            		print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-            	}
-            }
-
             // Other attributes
             $parameters=array('colspan' => ' colspan="2"');
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
             	print $object->showOptionals($extrafields,'edit');
@@ -2470,7 +2450,7 @@ else
                 print dol_htmlentitiesbr($object->signature);
             }
             print '</td></tr>';
-            
+
             print '</table>';
 
             dol_fiche_end();
@@ -2495,27 +2475,28 @@ else
             $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
             $genallowed = $user->rights->user->user->creer;
             $delallowed = $user->rights->user->user->supprimer;
-    
-            $somethingshown = $formfile->show_documents('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
-    
+
+            print $formfile->showdocuments('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+            $somethingshown = $formfile->numoffiles;
+
     		// Show links to link elements
     		$linktoelem = $form->showLinkToObjectBlock($object, null, null);
     		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-    
+
             print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-    
+
     		// List of actions on element
     		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
     		$formactions = new FormActions($db);
     		$somethingshown = $formactions->showactions($object, 'user', $socid);
-            
-            
+
+
             print '</div></div></div>';
         }
-        
+
 		if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close();
     }
-    
+
 }
 
 if (! empty($conf->api->enabled) && ! empty($conf->use_javascript_ajax))
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index e09e52c1882..5ec9d54300d 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -107,16 +107,16 @@ class User extends CommonObject
 	public $all_permissions_are_loaded;	   // All permission are loaded
 	public $nb_rights;			           // Number of rights granted to the user
 	private $_tab_loaded=array();		   // Cache array of already loaded permissions
-	
+
 	public $conf;           		// To store personal config
 	public $default_values;         // To store default values for user
 	public $lastsearch_values_tmp;  // To store current search criterias for user
 	public $lastsearch_values;      // To store last saved search criterias for user
-	
+
 	public $users;					// To store all tree of users hierarchy
 	public $parentof;				// To store an array of all parents for all ids.
 	private $cache_childids;
-	
+
 	public $accountancy_code;			// Accountancy code in prevision of the complete accountancy module
 
 	public $thm;					// Average cost of employee - Used for valuation of time spent
@@ -207,7 +207,7 @@ class User extends CommonObject
 
 		if ($entity < 0)
 		{
-    		if ((empty($conf->multicompany->enabled) || empty($conf->multicompany->transverse_mode)) && (! empty($user->entity)))
+    		if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (! empty($user->entity)))
     		{
     			$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
     		}
@@ -218,7 +218,7 @@ class User extends CommonObject
 		}
 		else  // The fetch was forced on an entity
 		{
-			if (!empty($conf->multicompany->enabled) && !empty($conf->multicompany->transverse_mode))
+			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 				$sql.= " WHERE u.entity IS NOT NULL";    // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			else
 				$sql.= " WHERE u.entity IN (0, ".$conf->entity.")";
@@ -365,7 +365,7 @@ class User extends CommonObject
 				$this->error=$this->db->lasterror();
 				return -2;
 			}
-			
+
 			// Load user->default_values for user. TODO Save this in memcached ?
 			$sql = "SELECT rowid, entity, type, page, param, value";
 			$sql.= " FROM ".MAIN_DB_PREFIX."default_values";
@@ -376,7 +376,7 @@ class User extends CommonObject
 			{
 			    while ($obj = $this->db->fetch_object($resql))
 			    {
-			        if (! empty($obj->page) && ! empty($obj->type) && ! empty($obj->param)) 
+			        if (! empty($obj->page) && ! empty($obj->type) && ! empty($obj->param))
 			        {
 			            $this->default_values[$obj->page][$obj->type][$obj->param]=$obj->value;
 			        }
@@ -389,7 +389,7 @@ class User extends CommonObject
 				return -3;
 			}
 		}
-		
+
 		return 1;
 	}
 
@@ -469,9 +469,9 @@ class User extends CommonObject
 					$obj = $this->db->fetch_object($result);
 					$nid = $obj->id;
 
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id." AND fk_id=".$nid;
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id." AND fk_id=".$nid." AND entity = ".$entity;
 					if (! $this->db->query($sql)) $error++;
-					$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (fk_user, fk_id) VALUES (".$this->id.", ".$nid.")";
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (entity, fk_user, fk_id) VALUES (".$entity.", ".$this->id.", ".$nid.")";
 					if (! $this->db->query($sql)) $error++;
 
 					$i++;
@@ -581,6 +581,7 @@ class User extends CommonObject
 
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights";
 					$sql.= " WHERE fk_user = ".$this->id." AND fk_id=".$nid;
+					$sql.= " AND entity = ".$entity;
 					if (! $this->db->query($sql)) $error++;
 
 					$i++;
@@ -660,7 +661,7 @@ class User extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur";
 		$sql.= ", ".MAIN_DB_PREFIX."rights_def as r";
 		$sql.= " WHERE r.id = ur.fk_id";
-		$sql.= " AND r.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+		$sql.= " AND ur.entity = ".$conf->entity;
 		$sql.= " AND ur.fk_user= ".$this->id;
 		$sql.= " AND r.perms IS NOT NULL";
 		if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'";
@@ -706,11 +707,8 @@ class User extends CommonObject
 		$sql.= " ".MAIN_DB_PREFIX."usergroup_user as gu,";
 		$sql.= " ".MAIN_DB_PREFIX."rights_def as r";
 		$sql.= " WHERE r.id = gr.fk_id";
-		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) {
-			$sql.= " AND gu.entity IN (0,".$conf->entity.")";
-		} else {
-			$sql.= " AND r.entity = ".$conf->entity;
-		}
+		$sql.= " AND gr.entity = ".$conf->entity;
+		$sql.= " AND r.entity = ".$conf->entity;
 		$sql.= " AND gr.fk_usergroup = gu.fk_usergroup";
 		$sql.= " AND gu.fk_user = ".$this->id;
 		$sql.= " AND r.perms IS NOT NULL";
@@ -2014,14 +2012,14 @@ class User extends CommonObject
 
         $result=''; $label='';
         $link=''; $linkstart=''; $linkend='';
-		
+
 		if (! empty($this->photo))
 		{
 		    $label.= '<div class="photointooltip">';
 		    $label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
 		    $label.= '</div><div style="clear: both;"></div>';
 		}
-		
+
 		$label.= '<div class="centpercent">';
 		$label.= '<u>' . $langs->trans("User") . '</u><br>';
 		$label.= '<b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs,'','');
@@ -2112,9 +2110,9 @@ class User extends CommonObject
 		}
 		$result.=$linkend;
 		//if ($withpictoimg == -1) $result.='</div>';
-		
+
 		$result.=$companylink;
-		
+
 		return $result;
 	}
 
@@ -2573,7 +2571,7 @@ class User extends CommonObject
 		// Init $this->users array
 		$sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.fk_soc, u.login, u.email, u.gender, u.admin, u.statut, u.photo, u.entity";	// Distinct reduce pb with old tables with duplicates
 		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-		if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf->multicompany->transverse_mode) || (! empty($user->admin) && empty($user->entity))))
+		if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) || (! empty($user->admin) && empty($user->entity))))
 		{
 			$sql.= " WHERE u.entity IS NOT NULL";
 		}
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index af73e1305bb..be9bb0e1f4c 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -39,7 +39,7 @@ class UserGroup extends CommonObject
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto='group';
 	public $entity;		// Entity of group
-	
+
 	/**
 	 * @deprecated
 	 * @see name
@@ -252,16 +252,19 @@ class UserGroup extends CommonObject
 	/**
 	 *    Add a permission to a group
 	 *
-	 *    @param      int		$rid         id du droit a ajouter
-	 *    @param      string	$allmodule   Ajouter tous les droits du module allmodule
-	 *    @param      string	$allperms    Ajouter tous les droits du module allmodule, perms allperms
-	 *    @return     int         			 > 0 if OK, < 0 if KO
+	 *    @param	int		$rid		id du droit a ajouter
+	 *    @param	string	$allmodule	Ajouter tous les droits du module allmodule
+	 *    @param	string	$allperms	Ajouter tous les droits du module allmodule, perms allperms
+	 *    @param	int		$entity		Entity to use
+	 *    @return	int					> 0 if OK, < 0 if KO
 	 */
-	function addrights($rid,$allmodule='',$allperms='')
+	function addrights($rid, $allmodule='', $allperms='', $entity=0)
 	{
 		global $conf, $user, $langs;
 
-		dol_syslog(get_class($this)."::addrights $rid, $allmodule, $allperms");
+		$entity = (! empty($entity)?$entity:$conf->entity);
+
+		dol_syslog(get_class($this)."::addrights $rid, $allmodule, $allperms, $entity");
 		$error=0;
 		$whereforadd='';
 
@@ -274,7 +277,7 @@ class UserGroup extends CommonObject
 			$sql = "SELECT module, perms, subperms";
 			$sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
 			$sql.= " WHERE id = '".$this->db->escape($rid)."'";
-			$sql.= " AND entity = ".$conf->entity;
+			$sql.= " AND entity = ".$entity;
 
 			$result=$this->db->query($sql);
 			if ($result) {
@@ -311,7 +314,7 @@ class UserGroup extends CommonObject
 			$sql = "SELECT id";
 			$sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
 			$sql.= " WHERE $whereforadd";
-			$sql.= " AND entity = ".$conf->entity;
+			$sql.= " AND entity = ".$entity;
 
 			$result=$this->db->query($sql);
 			if ($result)
@@ -323,9 +326,9 @@ class UserGroup extends CommonObject
 					$obj = $this->db->fetch_object($result);
 					$nid = $obj->id;
 
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights WHERE fk_usergroup = $this->id AND fk_id=".$nid;
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights WHERE fk_usergroup = $this->id AND fk_id=".$nid." AND entity = ".$entity;
 					if (! $this->db->query($sql)) $error++;
-					$sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup_rights (fk_usergroup, fk_id) VALUES ($this->id, $nid)";
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup_rights (entity, fk_usergroup, fk_id) VALUES (".$entity.", ".$this->id.", ".$nid.")";
 					if (! $this->db->query($sql)) $error++;
 
 					$i++;
@@ -363,18 +366,21 @@ class UserGroup extends CommonObject
 	/**
 	 *    Remove a permission from group
 	 *
-	 *    @param      int		$rid         id du droit a retirer
-	 *    @param      string	$allmodule   Retirer tous les droits du module allmodule
-	 *    @param      string	$allperms    Retirer tous les droits du module allmodule, perms allperms
-	 *    @return     int         			 > 0 if OK, < 0 if OK
+	 *    @param	int		$rid		id du droit a retirer
+	 *    @param	string	$allmodule	Retirer tous les droits du module allmodule
+	 *    @param	string	$allperms	Retirer tous les droits du module allmodule, perms allperms
+	 *    @param	int		$entity		Entity to use
+	 *    @return	int					> 0 if OK, < 0 if OK
 	 */
-	function delrights($rid,$allmodule='',$allperms='')
+	function delrights($rid, $allmodule='', $allperms='', $entity=0)
 	{
 		global $conf, $user, $langs;
 
 		$error=0;
 		$wherefordel='';
 
+		$entity = (! empty($entity)?$entity:$conf->entity);
+
 		$this->db->begin();
 
 		if (! empty($rid))
@@ -384,7 +390,7 @@ class UserGroup extends CommonObject
 			$sql = "SELECT module, perms, subperms";
 			$sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
 			$sql.= " WHERE id = '".$this->db->escape($rid)."'";
-			$sql.= " AND entity = ".$conf->entity;
+			$sql.= " AND entity = ".$entity;
 
 			$result=$this->db->query($sql);
 			if ($result) {
@@ -421,7 +427,7 @@ class UserGroup extends CommonObject
 			$sql = "SELECT id";
 			$sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
 			$sql.= " WHERE $wherefordel";
-			$sql.= " AND entity = ".$conf->entity;
+			$sql.= " AND entity = ".$entity;
 
 			$result=$this->db->query($sql);
 			if ($result)
@@ -435,6 +441,7 @@ class UserGroup extends CommonObject
 
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights";
 					$sql.= " WHERE fk_usergroup = $this->id AND fk_id=".$nid;
+					$sql.= " AND entity = ".$entity;
 					if (! $this->db->query($sql)) $error++;
 
 					$i++;
@@ -498,6 +505,7 @@ class UserGroup extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."usergroup_rights as u, ".MAIN_DB_PREFIX."rights_def as r";
 		$sql.= " WHERE r.id = u.fk_id";
 		$sql.= " AND r.entity = ".$conf->entity;
+		$sql.= " AND u.entity = ".$conf->entity;
 		$sql.= " AND u.fk_usergroup = ".$this->id;
 		$sql.= " AND r.perms IS NOT NULL";
 		if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'";
@@ -755,7 +763,7 @@ class UserGroup extends CommonObject
 	{
 	    return $this->LibStatut(0,$mode);
 	}
-	
+
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -769,7 +777,7 @@ class UserGroup extends CommonObject
 	    $langs->load('users');
 	    return '';
 	}
-	    
+
 	/**
 	 *	Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
 	 *
@@ -849,7 +857,7 @@ class UserGroup extends CommonObject
 				$user->id => $user
 		);
 	}
-	
+
 	/**
 	 *  Create a document onto disk according to template module.
 	 *
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index bbcbd38c168..0b23fc10932 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011      Herve Prot           <herve.prot@symeos.com>
  * Copyright (C) 2012	   Florian Henry		<florian.henry@open-concept.pro>
  *
@@ -54,7 +54,8 @@ $userid=GETPOST('user', 'int');
 // Security check
 $result = restrictedArea($user, 'user', $id, 'usergroup&usergroup', 'user');
 
-if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->multicompany->transverse_mode)
+// Users/Groups management only in master entity if transverse mode
+if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
 {
     accessforbidden();
 }
@@ -105,7 +106,7 @@ if ($action == 'add')
       		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 			if ($ret < 0) $error++;
 
-      		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0;
+      		if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $object->entity = 0;
 			else $object->entity = $_POST["entity"];
 
             $db->begin();
@@ -148,8 +149,8 @@ if ($action == 'adduser' || $action =='removeuser')
 
 			$edituser = new User($db);
 			$edituser->fetch($userid);
-			if ($action == 'adduser')    $result=$edituser->SetInGroup($object->id,(! empty($conf->multicompany->transverse_mode)?GETPOST('entity','int'):$object->entity));
-			if ($action == 'removeuser') $result=$edituser->RemoveFromGroup($object->id,(! empty($conf->multicompany->transverse_mode)?GETPOST('entity','int'):$object->entity));
+			if ($action == 'adduser')    $result=$edituser->SetInGroup($object->id,(! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)?GETPOST('entity','int'):$object->entity));
+			if ($action == 'removeuser') $result=$edituser->RemoveFromGroup($object->id,(! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)?GETPOST('entity','int'):$object->entity));
 
             if ($result > 0)
             {
@@ -188,7 +189,7 @@ if ($action == 'update')
       	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 		if ($ret < 0) $error++;
 
-		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0;
+		if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $object->entity = 0;
 		else $object->entity = $_POST["entity"];
 
         $ret=$object->update();
@@ -210,7 +211,7 @@ if ($action == 'update')
         setEventMessages($langs->trans('ErrorForbidden'), null, 'mesgs');
     }
 }
-					
+
 // Actions to build doc
 $upload_dir = $conf->usergroup->dir_output;
 $permissioncreate=$user->rights->user->user->creer;
@@ -250,7 +251,7 @@ if ($action == 'create')
 	// Multicompany
 	if (! empty($conf->multicompany->enabled) && is_object($mc))
 	{
-		if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+		if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
 		{
 			print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
 			print "<td>".$mc->select_entities($conf->entity);
@@ -317,10 +318,10 @@ else
         	dol_fiche_head($head, 'group', $title, -1, 'group');
 
 			dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
-			
+
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
-			
+
         	print '<table class="border" width="100%">';
 
 			// Name
@@ -333,7 +334,7 @@ else
 			print "</td></tr>\n";
 
 			// Multicompany
-			if (! empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+			if (! empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
 			{
 				$mc->getInfo($object->entity);
 				print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
@@ -356,7 +357,7 @@ else
 
 			print "</table>\n";
             print '</div>';
-            
+
 			dol_fiche_end();
 
 
@@ -386,7 +387,7 @@ else
 
             if (! empty($object->members))
             {
-                if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
+                if (! (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)))
                 {
                     foreach($object->members as $useringroup)
                     {
@@ -408,7 +409,7 @@ else
                 // Multicompany
                 if (! empty($conf->multicompany->enabled) && is_object($mc))
                 {
-                    if ($conf->entity == 1 && $conf->multicompany->transverse_mode)
+                    if ($conf->entity == 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
                     {
                         print '</td><td class="tdtop">'.$langs->trans("Entity").'</td>';
                         print "<td>".$mc->select_entities($conf->entity);
@@ -448,7 +449,7 @@ else
             {
             	foreach($object->members as $useringroup)
             	{
-            		
+
 
             		print '<tr class="oddeven">';
             		print '<td>';
@@ -458,7 +459,7 @@ else
             		print '</td>';
             		print '<td>'.$useringroup->lastname.'</td>';
             		print '<td>'.$useringroup->firstname.'</td>';
-            		if (! empty($conf->multicompany->enabled)  && is_object($mc) && ! empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+            		if (! empty($conf->multicompany->enabled)  && is_object($mc) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
             		{
             			print '<td class="valeur">';
             			if (! empty($useringroup->usergroup_entity))
@@ -497,7 +498,7 @@ else
             }
             print "</table>";
             print "<br>";
-			
+
 			/*
 	         * Documents generes
 	         */
@@ -506,21 +507,21 @@ else
 	        $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
 	        $genallowed = $user->rights->user->user->creer;
 	        $delallowed = $user->rights->user->user->supprimer;
-	
+
 	        $somethingshown = $formfile->show_documents('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
-	
+
 	        // Show links to link elements
 	        $linktoelem = $form->showLinkToObjectBlock($object, null, null);
 	        $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-	
+
 	        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-	
+
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'usergroup', $socid);
-	        
-	        
+
+
 	        print '</div></div></div>';
         }
 
@@ -543,7 +544,7 @@ else
             // Multicompany
             if (! empty($conf->multicompany->enabled) && is_object($mc))
             {
-                if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)
                 {
                     print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
                     print "<td>".$mc->select_entities($object->entity);
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 38fdf68b2ba..16091381e8d 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -32,6 +32,12 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 		accessforbidden();
 }
 
+// Users/Groups management only in master entity if transverse mode
+if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
+{
+	accessforbidden();
+}
+
 $langs->load("users");
 
 $sall=GETPOST('sall', 'alphanohtml');
@@ -95,7 +101,7 @@ llxHeader();
 $sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
 $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
-if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity)))
+if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity)))
 {
 	$sql.= " WHERE g.entity IS NOT NULL";
 }
@@ -160,7 +166,7 @@ if ($resql)
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("Group"),$_SERVER["PHP_SELF"],"g.nom",$param,"","",$sortfield,$sortorder);
     //multicompany
-    if(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1)
+    if(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
     {
     	print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],"g.entity",$param,"",'align="center"',$sortfield,$sortorder);
     }
@@ -172,7 +178,7 @@ if ($resql)
     while ($i < $num)
     {
         $obj = $db->fetch_object($resql);
-        
+
 
         print '<tr class="oddeven">';
         print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->name.'</a>';
@@ -182,7 +188,7 @@ if ($resql)
         }
         print "</td>";
         //multicompany
-        if (! empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1)
+        if (! empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
         {
             $mc->getInfo($obj->entity);
             print '<td align="center">'.$mc->label.'</td>';
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 2ced8e11d4b..6d987be85cb 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2006-2017 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +33,12 @@ $langs->load("companies");
 $langs->load("ldap");
 $langs->load("users");
 
+// Users/Groups management only in master entity if transverse mode
+if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
+{
+	accessforbidden();
+}
+
 $canreadperms=true;
 if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
@@ -98,7 +104,7 @@ $head = group_prepare_head($object);
 dol_fiche_head($head, 'ldap', $langs->trans("Group"), -1, 'group');
 
 dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
- 
+
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 5262857afb2..77532de7c3e 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,6 +38,12 @@ $confirm=GETPOST('confirm', 'alpha');
 $module=GETPOST('module', 'alpha');
 $rights=GETPOST('rights', 'int');
 
+// Users/Groups management only in master entity if transverse mode
+if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
+{
+	accessforbidden();
+}
+
 // Defini si peux lire les permissions
 $canreadperms=($user->admin || $user->rights->user->user->lire);
 // Defini si peux modifier les permissions
@@ -53,22 +59,44 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 
 if (! $canreadperms) accessforbidden();
 
+$object = new Usergroup($db);
+$object->fetch($id);
+$object->getrights();
+
+$entity=$conf->entity;
+if (! empty($conf->multicompany->enabled))
+{
+	if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+		$entity=(GETPOST('entity','int') ? GETPOST('entity','int') : $conf->entity);
+	else
+		$entity=(! empty($object->entity) ? $object->entity : $conf->entity);
+}
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('groupcard','globalcard'));
+
 
 /**
  * Actions
  */
-if ($action == 'addrights' && $caneditperms)
-{
-    $editgroup = new Usergroup($db);
-    $result=$editgroup->fetch($id);
-    if ($result > 0) $editgroup->addrights($rights, $module);
-}
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if ($action == 'delrights' && $caneditperms)
-{
-    $editgroup = new Usergroup($db);
-    $result=$editgroup->fetch($id);
-    if ($result > 0) $editgroup->delrights($rights, $module);
+if (empty($reshook)) {
+	if ($action == 'addrights' && $caneditperms)
+	{
+		$editgroup = new Usergroup($db);
+		$result=$editgroup->fetch($id);
+		if ($result > 0) $editgroup->addrights($rights, $module, '', $entity);
+	}
+
+	if ($action == 'delrights' && $caneditperms)
+	{
+		$editgroup = new Usergroup($db);
+		$result=$editgroup->fetch($id);
+		if ($result > 0) $editgroup->delrights($rights, $module, '', $entity);
+	}
 }
 
 
@@ -80,12 +108,8 @@ $form = new Form($db);
 
 llxHeader('',$langs->trans("Permissions"));
 
-if ($id)
+if ($object->id)
 {
-    $object = new Usergroup($db);
-    $object->fetch($id);
-    $object->getrights();
-
     /*
      * Affichage onglets
      */
@@ -127,7 +151,6 @@ if ($id)
                         // Load all permissions
                         if ($objMod->rights_class)
                         {
-                        	$entity=((! empty($conf->multicompany->enabled) && ! empty($object->entity)) ? $object->entity : null);
                             $ret=$objMod->insert_permissions(0, $entity);
                             $modules[$objMod->rights_class]=$objMod;
                         }
@@ -140,56 +163,42 @@ if ($id)
     $db->commit();
 
     // Lecture des droits groupes
-    $permsgroup = array();
+    $permsgroupbyentity = array();
 
-    $sql = "SELECT r.id, r.libelle, r.module ";
-    $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r";
-    $sql.= ", ".MAIN_DB_PREFIX."usergroup_rights as ugr";
-    $sql.= " WHERE ugr.fk_id = r.id";
-    if(! empty($conf->multicompany->enabled))
-    {
-        if (empty($conf->multicompany->transverse_mode))
-        {
-        	$sql.= " AND r.entity = ".$object->entity;
-        }
-        else
-        {
-        	$sql.= " AND r.entity IN (0,1)";
-        }
-    }
-    else
-    {
-    	$sql.= " AND r.entity IN (0,".$conf->entity.")";
-    }
-
-    $sql.= " AND ugr.fk_usergroup = ".$object->id;
+    $sql = "SELECT DISTINCT r.id, r.libelle, r.module, gr.entity";
+    $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
+    $sql.= " ".MAIN_DB_PREFIX."usergroup_rights as gr";
+    $sql.= " WHERE gr.fk_id = r.id";
+    $sql.= " AND gr.entity = ".$entity;
+    $sql.= " AND gr.fk_usergroup = ".$object->id;
 
+    dol_syslog("get user perms", LOG_DEBUG);
     $result=$db->query($sql);
-
     if ($result)
     {
-        $num = $db->num_rows($result);
-        $i = 0;
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($result);
-            array_push($permsgroup,$obj->id);
-            $i++;
-        }
-        $db->free($result);
+    	$num = $db->num_rows($result);
+    	$i = 0;
+    	while ($i < $num)
+    	{
+    		$obj = $db->fetch_object($result);
+    		if (! isset($permsgroupbyentity[$obj->entity]))
+    			$permsgroupbyentity[$obj->entity] = array();
+    			array_push($permsgroupbyentity[$obj->entity], $obj->id);
+    			$i++;
+    	}
+    	$db->free($result);
     }
     else
     {
-        dol_print_error($db);
+    	dol_print_error($db);
     }
 
-    
-    
+
     dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
-     
+
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
-     
+
     /*
      * Ecran ajout/suppression permission
      */
@@ -214,6 +223,10 @@ if ($id)
 
     if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"));
 
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('insertExtraHeader',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
     print '<td>'.$langs->trans("Module").'</td>';
@@ -225,22 +238,7 @@ if ($id)
     $sql = "SELECT r.id, r.libelle, r.module";
     $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r";
     $sql.= " WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
-    if(! empty($conf->multicompany->enabled))
-    {
-        if (empty($conf->multicompany->transverse_mode))
-        {
-        	$sql.= " AND r.entity = ".$object->entity;
-        }
-        else
-        {
-        	$sql.= " AND r.entity IN (0,1)";
-        }
-    }
-    else
-    {
-    	$sql.= " AND r.entity = ".$conf->entity;
-    }
-
+    $sql.= " AND r.entity = " . $entity;
     if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql.= " AND r.perms NOT LIKE '%_advance'";  // Hide advanced perms if option is disable
     $sql.= " ORDER BY r.module, r.id";
 
@@ -279,9 +277,9 @@ if ($id)
                     print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName();
                     print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';
                     print '<td align="center" class="nowrap">';
-                    print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="perms.php?id='.$object->id.'&amp;action=addrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
+                    print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
                     print '/';
-                    print '<a title='.$langs->trans("None").' alt='.$langs->trans("None").' href="perms.php?id='.$object->id.'&amp;action=delrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
+                    print '<a title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
                     print '</td>';
                     print '<td colspan="2">&nbsp;</td>';
                     print '</tr>';
@@ -293,25 +291,37 @@ if ($id)
             // Module
             print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName().'</td>';
 
-            if (in_array($obj->id, $permsgroup))
+            if (is_array($permsgroupbyentity[$entity]))
             {
-                // Own permission by group
-                if ($caneditperms)
-                {
-                    print '<td align="center"><a class="reposition" href="perms.php?id='.$object->id.'&amp;action=delrights&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
-                }
-                print '<td align="center">';
-                print img_picto($langs->trans("Active"),'tick');
-                print '</td>';
+            	if (in_array($obj->id, $permsgroupbyentity[$entity]))
+            	{
+            		// Own permission by group
+            		if ($caneditperms)
+            		{
+            			print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
+            		}
+            		print '<td align="center">';
+            		print img_picto($langs->trans("Active"),'tick');
+            		print '</td>';
+            	}
+            	else
+            	{
+            		// Do not own permission
+            		if ($caneditperms)
+            		{
+            			print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+            		}
+            		print '<td>&nbsp</td>';
+            	}
             }
             else
             {
-                // Do not own permission
-                if ($caneditperms)
-                {
-                    print '<td align="center"><a class="reposition" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
-                }
-                print '<td>&nbsp</td>';
+            	// Do not own permission
+            	if ($caneditperms)
+            	{
+            		print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+            	}
+            	print '<td>&nbsp</td>';
             }
 
             $perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$langs->trans($obj->libelle)));
@@ -323,9 +333,13 @@ if ($id)
         }
     }
     print '</table>';
-    
+
     print '</div>';
-    
+
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('insertExtraFooter',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
     dol_fiche_end();
 }
 
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 9e7f6583f6e..3e82e2b6357 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -73,7 +73,7 @@ $user_arbo = $userstatic->get_full_tree(0, ($search_statut != '' && $search_stat
 
 if (! is_array($user_arbo) && $user_arbo < 0)
 {
-    setEventMessages($userstatic->error, $userstatic->errors, 'warnings');    
+    setEventMessages($userstatic->error, $userstatic->errors, 'warnings');
 }
 else
 {
@@ -97,24 +97,21 @@ foreach($fulltree as $key => $val)
 	$userstatic->admin=$val['admin'];
 	$userstatic->entity=$val['entity'];
 	$userstatic->photo=$val['photo'];
-	
+
 	$entity=$val['entity'];
 	$entitystring='';
 
 	// TODO Set of entitystring should be done with a hook
-	if (is_object($mc))
+	if (! empty($conf->multicompany->enabled) && is_object($mc))
 	{
-		if (! empty($conf->multicompany->enabled))
+		if (empty($entity))
 		{
-			if (empty($entity))
-			{
-				$entitystring=$langs->trans("AllEntities");
-			}
-			else
-			{
-				$mc->getInfo($entity);
-				$entitystring=$mc->label;
-			}
+			$entitystring=$langs->trans("AllEntities");
+		}
+		else
+		{
+			$mc->getInfo($entity);
+			$entitystring=$mc->label;
 		}
 	}
 
@@ -128,7 +125,7 @@ foreach($fulltree as $key => $val)
 		$li.=img_picto($langs->trans("Administrator"),'star');
 	}
 	$li.=' ('.$val['login'].($entitystring?' - '.$entitystring:'').')';
-	
+
 	$data[] = array(
 		'rowid'=>$val['rowid'],
 		'fk_menu'=>$val['fk_user'],
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 66a4448491e..7c464ce2e45 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -100,7 +100,7 @@ $sql.= ", s.code_client";
 $sql.= ", s.canvas";
 $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_soc = s.rowid";
-if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity)))
+if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity)))
 {
 	$sql.= " WHERE u.entity IS NOT NULL";
 }
@@ -212,7 +212,7 @@ if ($canreadperms)
 
 	$sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec";
 	$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
-	if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity)))
+	if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity)))
 	{
 		$sql.= " WHERE g.entity IS NOT NULL";
 	}
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 8333acbbb79..984479465ff 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -92,7 +92,7 @@ $arrayfields=array(
     'u.accountancy_code'=>array('label'=>$langs->trans("AccountancyCode"), 'checked'=>0),
     'u.email'=>array('label'=>$langs->trans("EMail"), 'checked'=>1),
     'u.fk_soc'=>array('label'=>$langs->trans("Company"), 'checked'=>1),
-    'u.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+    'u.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
     'u.fk_user'=>array('label'=>$langs->trans("HierarchicalResponsible"), 'checked'=>1),
     'u.datelastlogin'=>array('label'=>$langs->trans("LastConnexion"), 'checked'=>1, 'position'=>100),
     'u.datepreviouslogin'=>array('label'=>$langs->trans("PreviousConnexion"), 'checked'=>0, 'position'=>110),
@@ -194,7 +194,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user_extrafields as ef on (u.rowid = ef.fk_object)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_soc = s.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u2 ON u.fk_user = u2.rowid";
-if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf->multicompany->transverse_mode) || (! empty($user->admin) && empty($user->entity))))
+if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) || (! empty($user->admin) && empty($user->entity))))
 {
 	$sql.= " WHERE u.entity IS NOT NULL";
 }
@@ -545,7 +545,7 @@ while ($i < min($num,$limit))
         print '</td>';
 	}
     // Multicompany enabled
-    if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))
+	if (! empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
     {
         if (! empty($arrayfields['u.entity']['checked']))
 		{
@@ -556,12 +556,8 @@ while ($i < min($num,$limit))
         	}
         	else
         	{
-        		// $mc is defined in conf.class.php if multicompany enabled.
-        		if (is_object($mc))
-        		{
-        			$mc->getInfo($obj->entity);
-        			print $mc->label;
-        		}
+        		$mc->getInfo($obj->entity);
+        		print $mc->label;
         	}
         	print '</td>';
 		}
@@ -581,7 +577,7 @@ while ($i < min($num,$limit))
 	        $user2->photo=$obj->photo2;
 	        $user2->admin=$obj->admin2;
 	        $user2->email=$obj->email2;
-	        $user2->societe_id=$obj->fk_soc2;
+	        $user2->socid=$obj->fk_soc2;
 	        print $user2->getNomUrl(-1,'',0,0,24,0,'');
             if (! empty($conf->multicompany->enabled) && $obj->admin2 && ! $obj->entity2)
             {
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index b40c79f783e..5de1a3b80ac 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,6 @@ $action=GETPOST('action', 'alpha');
 $confirm=GETPOST('confirm', 'alpha');
 $module=GETPOST('module', 'alpha');
 $rights=GETPOST('rights', 'int');
-$entity=(GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity);
 
 if (! isset($id) || empty($id)) accessforbidden();
 
@@ -71,6 +70,15 @@ $object = new User($db);
 $object->fetch($id, '', '', 1);
 $object->getrights();
 
+$entity=$conf->entity;
+if (! empty($conf->multicompany->enabled))
+{
+	if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+		$entity=(GETPOST('entity','int') ? GETPOST('entity','int') : $conf->entity);
+	else
+		$entity=(! empty($object->entity) ? $object->entity : $conf->entity);
+}
+
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('usercard','globalcard'));
 
@@ -86,12 +94,11 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook)) {
 	if ($action == 'addrights' && $caneditperms) {
 		$edituser = new User($db);
-		$edituser->fetch($id);
-		//$edituser->addrights($rights, $module, '', $entity); // TODO unused for the moment
-		$edituser->addrights($rights, $module);
+		$edituser->fetch($object->id);
+		$edituser->addrights($rights, $module, '', $entity);
 
 		// Si on a touche a ses propres droits, on recharge
-		if ($id == $user->id) {
+		if ($object->id == $user->id) {
 			$user->clearrights();
 			$user->getrights();
 			$menumanager->loadMenu();
@@ -100,12 +107,11 @@ if (empty($reshook)) {
 
 	if ($action == 'delrights' && $caneditperms) {
 		$edituser = new User($db);
-		$edituser->fetch($id);
-		//$edituser->delrights($rights, $module, '', $entity); // TODO unused for the moment
-		$edituser->delrights($rights, $module);
+		$edituser->fetch($object->id);
+		$edituser->delrights($rights, $module, '', $entity);
 
 		// Si on a touche a ses propres droits, on recharge
-		if ($id == $user->id) {
+		if ($object->id == $user->id) {
 			$user->clearrights();
 			$user->getrights();
 			$menumanager->loadMenu();
@@ -161,8 +167,7 @@ foreach($modulesdir as $dir)
     	            // Load all permissions
     	            if ($objMod->rights_class)
     	            {
-    	            	$forceEntity=((! empty($conf->multicompany->enabled) && ! empty($object->entity)) ? $object->entity : null);
-    	                $ret=$objMod->insert_permissions(0, $forceEntity);
+    	                $ret=$objMod->insert_permissions(0, $entity);
     	                $modules[$objMod->rights_class]=$objMod;
     	                //print "modules[".$objMod->rights_class."]=$objMod;";
     	            }
@@ -177,22 +182,11 @@ $db->commit();
 // Lecture des droits utilisateurs
 $permsuser = array();
 
-$sql = "SELECT r.id, r.libelle, r.module";
+$sql = "SELECT DISTINCT r.id, r.libelle, r.module";
 $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
 $sql.= " ".MAIN_DB_PREFIX."user_rights as ur";
 $sql.= " WHERE ur.fk_id = r.id";
-if (! empty($conf->multicompany->enabled))
-{
-	if (1==2 && ! empty($conf->multicompany->transverse_mode)) {
-		$sql.= " AND r.entity = ".(GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity); // TODO unused for the moment
-	} else {
-		$sql.= " AND r.entity = ".(! empty($object->entity) ? $object->entity : $conf->entity);
-	}
-}
-else
-{
-	$sql.= " AND r.entity = ".$conf->entity;
-}
+$sql.= " AND ur.entity = ".$entity;
 $sql.= " AND ur.fk_user = ".$object->id;
 
 dol_syslog("get user perms", LOG_DEBUG);
@@ -216,18 +210,13 @@ else
 
 // Lecture des droits groupes
 $permsgroupbyentity = array();
-$aEntities = array();
 
-$sql = "SELECT r.id, r.libelle, r.module, gu.entity";
+$sql = "SELECT DISTINCT r.id, r.libelle, r.module, gu.entity";
 $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
 $sql.= " ".MAIN_DB_PREFIX."usergroup_rights as gr,";
 $sql.= " ".MAIN_DB_PREFIX."usergroup_user as gu";
 $sql.= " WHERE gr.fk_id = r.id";
-if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) {
-	$sql.= " AND gu.entity IS NOT NULL";
-} else {
-	$sql.= " AND r.entity = ".((! empty($conf->multicompany->enabled) && ! empty($object->entity)) ? $object->entity : $conf->entity);
-}
+$sql.= " AND gr.entity = ".$entity;
 $sql.= " AND gr.fk_usergroup = gu.fk_usergroup";
 $sql.= " AND gu.fk_user = ".$object->id;
 
@@ -272,17 +261,10 @@ if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivat
 // Show warning about external users
 if (empty($user->societe_id)) print info_admin(showModulesExludedForExternal($modules))."\n";
 
-// For multicompany transversal mode
-// TODO Place a hook here
-if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
-{
-	$aEntities=array_keys($permsgroupbyentity);
-	sort($aEntities);
-	$entity = (GETPOST('entity', 'int')?GETPOST('entity', 'int'):$aEntities[0]);
-	$head = entity_prepare_head($object, $aEntities);
-	$title = $langs->trans("Entities");
-	dol_fiche_head($head, $entity, $title, 1, 'multicompany@multicompany');
-}
+$parameters=array('permsgroupbyentity'=>$permsgroupbyentity);
+$reshook=$hookmanager->executeHooks('insertExtraHeader',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
 
 print "\n";
 print '<table width="100%" class="noborder">';
@@ -297,7 +279,7 @@ print '</tr>'."\n";
 $sql = "SELECT r.id, r.libelle, r.module";
 $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r";
 $sql.= " WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
-$sql.= " AND r.entity = ".((! empty($conf->multicompany->enabled) && ! empty($object->entity)) ? $object->entity : $conf->entity);
+$sql.= " AND r.entity = " . $entity;
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql.= " AND r.perms NOT LIKE '%_advance'";  // Hide advanced perms if option is disable
 $sql.= " ORDER BY r.module, r.id";
 
@@ -336,9 +318,9 @@ if ($result)
         		print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">'.img_object('',$picto).' '.$objMod->getName();
         		print '<a name="'.$objMod->getName().'"></a></td>';
         		print '<td align="center" class="nowrap">';
-        		print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>";
+        		print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>";
         		print '/';
-        		print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="perms.php?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("None")."</a>";
+        		print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("None")."</a>";
         		print '</td>';
         		print '<td colspan="2">&nbsp;</td>';
         		print '</tr>'."\n";
@@ -365,7 +347,7 @@ if ($result)
         {
         	if ($caneditperms)
         	{
-        		print '<td align="center"><a class="reposition" href="perms.php?id='.$object->id.'&amp;action=delrights&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
+        		print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
         	}
         	print '<td align="center" class="nowrap">';
         	print img_picto($langs->trans("Active"),'tick');
@@ -391,7 +373,7 @@ if ($result)
 	        	// Do not own permission
 	        	if ($caneditperms)
 	        	{
-	        		print '<td align="center"><a class="reposition" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+	        		print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
 	        	}
 	        	print '<td>&nbsp</td>';
 	        }
@@ -401,7 +383,7 @@ if ($result)
         	// Do not own permission
         	if ($caneditperms)
         	{
-        		print '<td align="center"><a class="reposition" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+        		print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
         	}
         	print '<td>&nbsp</td>';
         }
@@ -417,13 +399,10 @@ if ($result)
 else dol_print_error($db);
 print '</table>';
 
+$parameters=array();
+$reshook=$hookmanager->executeHooks('insertExtraFooter',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-// For multicompany transversal mode
-// TODO Place a hook here
-if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
-{
-	dol_fiche_end();
-}
 
 dol_fiche_end();
 
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index c4d8ce08724..3de5ef815c9 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -416,7 +416,7 @@ function getListOfGroups($authentication)
 		$sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
-		if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity)))
+		if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity)))
 		{
 			$sql.= " WHERE g.entity IS NOT NULL";
 		}

From 2510ec70153ea20f0eb551e12d31b5f0a7d97749 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jun 2017 10:29:34 +0200
Subject: [PATCH 1027/1163] Fix php error

---
 htdocs/core/class/hookmanager.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 65495cb0100..afb670dc267 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -190,7 +190,7 @@ class HookManager
         }
 
         // Init return properties
-        $this->resPrint=''; $this->resArray=array(); $this->$resNbOfHooks=0;
+        $this->resPrint=''; $this->resArray=array(); $this->resNbOfHooks=0;
 
         // Loop on each hook to qualify modules that have declared context
         $modulealreadyexecuted=array();
@@ -209,7 +209,7 @@ class HookManager
                 	// jump to next module/class if method does not exist
                     if (! method_exists($actionclassinstance,$method)) continue;
 
-                    $this->$resNbOfHooks++;
+                    $this->resNbOfHooks++;
 
                     dol_syslog(get_class($this).'::executeHooks a qualified hook was found for method='.$method.' module='.$module." action=".$action." context=".$context);
 

From 02b5d9e6f7574be222e74be648d44e209d06113a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jun 2017 10:53:53 +0200
Subject: [PATCH 1028/1163] FIX #6945

---
 htdocs/accountancy/admin/fiscalyear.php         | 2 +-
 htdocs/accountancy/admin/importaccounts.php     | 2 +-
 htdocs/accountancy/admin/productaccount.php     | 2 +-
 htdocs/adherents/list.php                       | 2 +-
 htdocs/adherents/type.php                       | 2 +-
 htdocs/admin/defaultvalues.php                  | 2 +-
 htdocs/admin/translation.php                    | 2 +-
 htdocs/bookmarks/list.php                       | 2 +-
 htdocs/comm/action/document.php                 | 2 +-
 htdocs/comm/action/index.php                    | 2 +-
 htdocs/comm/action/pertype.php                  | 2 +-
 htdocs/comm/action/peruser.php                  | 2 +-
 htdocs/comm/card.php                            | 2 +-
 htdocs/comm/mailing/cibles.php                  | 2 +-
 htdocs/comm/mailing/list.php                    | 2 +-
 htdocs/comm/propal/document.php                 | 2 +-
 htdocs/comm/propal/list.php                     | 2 +-
 htdocs/commande/customer.php                    | 2 +-
 htdocs/commande/document.php                    | 2 +-
 htdocs/commande/list.php                        | 2 +-
 htdocs/compta/bank/bankentries.php              | 2 +-
 htdocs/compta/bank/index.php                    | 2 +-
 htdocs/compta/bank/releve.php                   | 2 +-
 htdocs/compta/bank/various_payment/document.php | 2 +-
 htdocs/compta/bank/various_payment/index.php    | 2 +-
 htdocs/compta/charges/index.php                 | 2 +-
 htdocs/compta/clients.php                       | 2 +-
 htdocs/compta/deplacement/document.php          | 2 +-
 htdocs/compta/deplacement/index.php             | 2 +-
 htdocs/compta/deplacement/list.php              | 2 +-
 htdocs/compta/facture/document.php              | 2 +-
 htdocs/compta/facture/fiche-rec.php             | 2 +-
 htdocs/compta/facture/list.php                  | 2 +-
 htdocs/compta/paiement/avalider.php             | 2 +-
 htdocs/compta/paiement/cheque/list.php          | 2 +-
 htdocs/compta/paiement/list.php                 | 2 +-
 htdocs/compta/prelevement/bons.php              | 2 +-
 htdocs/compta/prelevement/card.php              | 2 +-
 htdocs/compta/prelevement/demandes.php          | 2 +-
 htdocs/compta/prelevement/factures.php          | 2 +-
 htdocs/compta/prelevement/list.php              | 2 +-
 htdocs/compta/recap-compta.php                  | 2 +-
 htdocs/compta/resultat/clientfourn.php          | 2 +-
 htdocs/compta/salaries/document.php             | 2 +-
 htdocs/compta/salaries/index.php                | 2 +-
 htdocs/compta/sociales/index.php                | 2 +-
 htdocs/compta/sociales/payments.php             | 2 +-
 htdocs/compta/tva/reglement.php                 | 2 +-
 htdocs/contact/agenda.php                       | 2 +-
 htdocs/contrat/document.php                     | 2 +-
 htdocs/contrat/list.php                         | 2 +-
 htdocs/contrat/services.php                     | 2 +-
 htdocs/core/ajax/ajaxdirpreview.php             | 2 +-
 htdocs/cron/list.php                            | 2 +-
 htdocs/don/document.php                         | 2 +-
 htdocs/don/list.php                             | 2 +-
 htdocs/ecm/docdir.php                           | 2 +-
 htdocs/ecm/docfile.php                          | 2 +-
 htdocs/ecm/docmine.php                          | 2 +-
 htdocs/ecm/index.php                            | 2 +-
 htdocs/ecm/index_auto.php                       | 2 +-
 htdocs/ecm/search.php                           | 2 +-
 htdocs/expedition/list.php                      | 2 +-
 htdocs/expensereport/document.php               | 2 +-
 htdocs/expensereport/index.php                  | 2 +-
 htdocs/expensereport/list.php                   | 2 +-
 htdocs/fichinter/document.php                   | 2 +-
 htdocs/fichinter/list.php                       | 2 +-
 htdocs/fourn/commande/document.php              | 2 +-
 htdocs/fourn/commande/list.php                  | 2 +-
 htdocs/fourn/contact.php                        | 2 +-
 htdocs/fourn/facture/impayees.php               | 2 +-
 htdocs/fourn/facture/paiement.php               | 2 +-
 htdocs/ftp/index.php                            | 2 +-
 htdocs/holiday/document.php                     | 2 +-
 htdocs/loan/index.php                           | 2 +-
 htdocs/margin/agentMargins.php                  | 2 +-
 htdocs/margin/customerMargins.php               | 2 +-
 htdocs/margin/productMargins.php                | 2 +-
 htdocs/margin/tabs/productMargins.php           | 2 +-
 htdocs/margin/tabs/thirdpartyMargins.php        | 2 +-
 htdocs/modulebuilder/template/myobject_list.php | 2 +-
 htdocs/opensurvey/list.php                      | 2 +-
 htdocs/product/document.php                     | 2 +-
 htdocs/product/inventory/list.php               | 2 +-
 htdocs/product/list-with-listview.php           | 2 +-
 htdocs/product/list.php                         | 2 +-
 htdocs/product/popuprop.php                     | 2 +-
 htdocs/product/stats/commande.php               | 2 +-
 htdocs/product/stats/contrat.php                | 2 +-
 htdocs/product/stats/facture.php                | 2 +-
 htdocs/product/stats/facture_fournisseur.php    | 2 +-
 htdocs/product/stock/productlot_list.php        | 2 +-
 htdocs/product/stock/replenish.php              | 2 +-
 htdocs/projet/document.php                      | 2 +-
 htdocs/projet/tasks/document.php                | 2 +-
 htdocs/projet/tasks/list.php                    | 2 +-
 htdocs/projet/tasks/time.php                    | 2 +-
 htdocs/public/members/public_list.php           | 2 +-
 htdocs/resource/document.php                    | 2 +-
 htdocs/societe/agenda.php                       | 2 +-
 htdocs/societe/consumption.php                  | 2 +-
 htdocs/societe/document.php                     | 2 +-
 htdocs/supplier_proposal/document.php           | 2 +-
 htdocs/supplier_proposal/list.php               | 2 +-
 105 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 16e11225d49..47759792d71 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -32,7 +32,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 1bb1bf178b3..d1083c50d10 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -43,7 +43,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):(empty($conf->global->ACCOUNTIN
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index fcb44c6f858..4552a478d6a 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -74,7 +74,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):(empty($conf->global->ACCOUNTIN
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 1b059d8616d..af8530e6567 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -66,7 +66,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 31a40e96669..20adc36dec5 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -48,7 +48,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 10d9ec5c282..7409ef1b973 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -43,7 +43,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 72aaa7fe355..67433eca35d 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -49,7 +49,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 40a316d881b..57bb6a71cec 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -43,7 +43,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 2caa55bcd59..30eeb2ffe8e 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -67,7 +67,7 @@ if ($id > 0)
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 307d6417285..486f31331eb 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -58,7 +58,7 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page","int");
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page;
 if (! $sortorder) $sortorder="ASC";
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 544da904cdc..577f18dea87 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -54,7 +54,7 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page","int");
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page;
 if (! $sortorder) $sortorder="ASC";
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 2a707cd2d8f..b893ada83b3 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -54,7 +54,7 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page","int");
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page;
 if (! $sortorder) $sortorder="ASC";
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 7599cce4cfd..5b08519b9b8 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -66,7 +66,7 @@ $mode		= GETPOST("mode");
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 719dba1a622..8ee163e8e6f 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -43,7 +43,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index e7775a6485e..65e82b8f939 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -34,7 +34,7 @@ $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 82244886763..6cc40873060 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -54,7 +54,7 @@ $result = restrictedArea($user, 'propal', $id);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index d2a6c6e926f..31f0a433d59 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -88,7 +88,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 431a54b9f76..4f9666e71a8 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -49,7 +49,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 0b6cb908ef3..0996907b245 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -53,7 +53,7 @@ $result=restrictedArea($user,'commande',$id,'');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index b9102e78ddc..f241053ec92 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -86,7 +86,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index f98c48b1aba..35b229c17ec 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -103,7 +103,7 @@ $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 $pageplusone = GETPOST("pageplusone",'int');
 if ($pageplusone) $page = $pageplusone - 1;
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 8ff5f1964fc..db5f5e5d85b 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -59,7 +59,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 4e5fc5dea81..61a88aa9c2f 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -77,7 +77,7 @@ $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 $pageplusone = GETPOST("pageplusone",'int');
 if ($pageplusone) $page = $pageplusone - 1;
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 5311aca0618..8ae83f9c550 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -46,7 +46,7 @@ $result = restrictedArea($user, 'salaries', $id, '');
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index f189eeef306..39c6d27be4f 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -44,7 +44,7 @@ $search_account = GETPOST('search_account','int');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index a690478a53e..78656682c6f 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -52,7 +52,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 59fb3af2f00..9ffed35f1df 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -47,7 +47,7 @@ $mode=GETPOST("mode");
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 6fa539ba297..1f3974ce041 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -53,7 +53,7 @@ $result = restrictedArea($user, 'deplacement', $id, '');
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index bb6d58293b6..fdb7e46900c 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -39,7 +39,7 @@ $result = restrictedArea($user, 'deplacement','','');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 1cf976325ec..de5e00045e7 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -47,7 +47,7 @@ $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 2d2ff5cc073..b6c77207952 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -58,7 +58,7 @@ $result=restrictedArea($user,'facture',$id,'');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index cb43c05680b..aa5c6103638 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -76,7 +76,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 if (! $sortorder) $sortorder='DESC';
 if (! $sortfield) $sortfield='f.titre';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 1ab17765d8f..8f1ea2338d0 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -102,7 +102,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 if (! $sortorder && ! empty($conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER) && $search_status == 1) $sortorder=$conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER;
 if (! $sortorder) $sortorder='DESC';
diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php
index 1f00da90a8c..0fe627cf7ac 100644
--- a/htdocs/compta/paiement/avalider.php
+++ b/htdocs/compta/paiement/avalider.php
@@ -42,7 +42,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index a4fac965e7a..63a2884e5bf 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -47,7 +47,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index daf70556213..efc9d5e10d2 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -61,7 +61,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 302e1e9e59c..41f6abb25c5 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -41,7 +41,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 62e57813886..443f93eb52c 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -52,7 +52,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index e619b28e994..8b5e024f3b6 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -49,7 +49,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 6136ee48499..9987d41e802 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -48,7 +48,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 9b1f1ff461e..e9e46b6afff 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -44,7 +44,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index a383f841a47..5ec219a48ee 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -44,7 +44,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 1b5a232b812..2b4b86aeb9d 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -56,7 +56,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php
index 03a69a764cf..678442453c6 100644
--- a/htdocs/compta/salaries/document.php
+++ b/htdocs/compta/salaries/document.php
@@ -55,7 +55,7 @@ $result = restrictedArea($user, 'salaries', $id, '');
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index dc95b06bc52..e87fc932c50 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -48,7 +48,7 @@ $search_account = GETPOST('search_account','int');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 194c3f38d99..2ab2cb1c172 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -46,7 +46,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index ae7240c204a..cd7e93455e6 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -49,7 +49,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 8b4d3299f9c..44c45a65dc7 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -50,7 +50,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index f57e088e00e..ba0ec3f8ef0 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -93,7 +93,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 7c0263f8376..132ab187777 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -55,7 +55,7 @@ $result = restrictedArea($user, 'contrat', $id);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 43cce90bd1c..1568999cae6 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -69,7 +69,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index adac837f3e0..8d4fa7e69d4 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -37,7 +37,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 8d8f48ec141..a21f0d107cd 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -49,7 +49,7 @@ if (! isset($mode) || $mode != 'noajax')    // For ajax call
     $sortfield = GETPOST("sortfield",'alpha');
     $sortorder = GETPOST("sortorder",'alpha');
     $page = GETPOST("page",'int');
-    if ($page == -1) { $page = 0; }
+    if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
     $offset = $conf->liste_limit * $page;
     $pageprev = $page - 1;
     $pagenext = $page + 1;
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 95338247eca..636770ef567 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -43,7 +43,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 0f4166a4cde..115f58e5cc1 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -59,7 +59,7 @@ $result = restrictedArea($user, 'don', $id, '');
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index daa6f7aa1f2..a4f5f07679f 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -35,7 +35,7 @@ $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php
index cf135e5ecb1..b3b9fa528e0 100644
--- a/htdocs/ecm/docdir.php
+++ b/htdocs/ecm/docdir.php
@@ -60,7 +60,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$urlsection;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index 5f40d1bb6f3..31f9b6b11c2 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -54,7 +54,7 @@ if ($user->societe_id > 0)
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php
index 1e7613991e4..48f39cb12f2 100644
--- a/htdocs/ecm/docmine.php
+++ b/htdocs/ecm/docmine.php
@@ -41,7 +41,7 @@ $confirm=GETPOST('confirm','alpha');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index edbe7538dfa..28913f9aa11 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -58,7 +58,7 @@ $section_dir=GETPOST('section_dir');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index a605440ff61..b613d336fc4 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -58,7 +58,7 @@ $section_dir=GETPOST('section_dir');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 15266395026..070acf2d4e1 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -58,7 +58,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$section;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index c838c002cc9..6f5e9e742b1 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -59,7 +59,7 @@ $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
 if (! $sortfield) $sortfield="e.ref";
 if (! $sortorder) $sortorder="DESC";
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 227bdec8bc9..2b8dd3ee0c6 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -53,7 +53,7 @@ $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 724fb234798..1568246f194 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -42,7 +42,7 @@ $result = restrictedArea($user, 'expensereport','','');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index f95952db482..555fbd19802 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -55,7 +55,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 03c7f83a827..3d5a3c544e8 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -53,7 +53,7 @@ $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 9271a348558..68d4e2bef34 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -61,7 +61,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 0f99d747b51..68976e9b7c7 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -56,7 +56,7 @@ $result = restrictedArea($user, 'fournisseur', $id, '', 'commande');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 544d882cda3..1e8ac06d475 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -105,7 +105,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index b1db17f3754..c43b4c9c797 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -44,7 +44,7 @@ if ($user->societe_id > 0)
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 4ade0a6dbb0..7cfe9697891 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -57,7 +57,7 @@ $search_amount_no_tax = GETPOST('search_amount_no_tax','alpha');
 $search_amount_all_tax = GETPOST('search_amount_all_tax','alpha');
 
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 10851e629e3..f51246d8eea 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -56,7 +56,7 @@ $search_payment_num=GETPOST('search_payment_num','alpha');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 5b9dc94172b..c9172bfd0c8 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -51,7 +51,7 @@ $download_dir = $conf->ftp->dir_temp;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 57ab947c8e7..38f68e58937 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -54,7 +54,7 @@ $langs->load("holiday");
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index b04d3bd90b3..3ce2c048057 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -41,7 +41,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 846daad7806..1c99d6e7082 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -55,7 +55,7 @@ if (! $sortfield)
 	    $sortfield="u.lastname";
 }
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index bcb3cc65699..5e3e8d9342e 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -42,7 +42,7 @@ $result = restrictedArea($user, 'societe','','');
 $mesg = '';
 
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index f5e84dd5c04..2862d3ff862 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -64,7 +64,7 @@ if (! $sortfield)
 }
 
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index b1023839eca..907e927c5fd 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -49,7 +49,7 @@ $mesg = '';
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 45ce972bbc3..3c9e721b3f6 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -42,7 +42,7 @@ $mesg = '';
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index a935b87bd58..b1768785f4c 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -73,7 +73,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 510a0545372..0d51664f5db 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -42,7 +42,7 @@ $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index e9ae9073835..d0b58c9909c 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -57,7 +57,7 @@ $hookmanager->initHooks(array('productdocuments'));
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 57545b07948..41c03756a44 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -40,7 +40,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index 1ebbf256c9c..512ae6d08a1 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -81,7 +81,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 74f9c59cff3..7db6e876cf1 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -81,7 +81,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 5320e637316..79b347019d3 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -42,7 +42,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 if (! $sortfield) $sortfield="c";
 if (! $sortorder) $sortorder="DESC";
 $offset = $limit * $page ;
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 1c72d5f6615..0e6056b91da 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -52,7 +52,7 @@ $mesg = '';
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index e2f5bccc430..1df5e9fa02f 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -49,7 +49,7 @@ $mesg = '';
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 506689a6001..06fd9d64916 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -53,7 +53,7 @@ $showmessage=GETPOST('showmessage');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index ac2849fefcf..03979f3e9d3 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -54,7 +54,7 @@ $mesg = '';
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOST("page", 'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 78d3c470cb1..7ea0800625f 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -65,7 +65,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 1a3d7c9edb2..006f882b820 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -64,7 +64,7 @@ $texte = '';
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $offset = $limit * $page ;
 
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 21dd30f560c..8777d83e419 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -57,7 +57,7 @@ if ($id > 0 || ! empty($ref)) {
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 241ba0162e5..661776b9b4d 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -55,7 +55,7 @@ if (!$user->rights->projet->lire) accessforbidden();
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 4af874ce21e..fab7805fa41 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -89,7 +89,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index b35cc4d707d..b4ed0ab2928 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -62,7 +62,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index ed1c8139e2f..232c6ef5aa3 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -83,7 +83,7 @@ $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 2d8e260d85a..f3c48f754ec 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -53,7 +53,7 @@ $result = restrictedArea($user, 'resource', $id, 'resource');
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 32d13356654..d0eb936fcbb 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -54,7 +54,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 17018091951..056a67e5587 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -43,7 +43,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 3802397509b..78af32c652a 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -53,7 +53,7 @@ $result = restrictedArea($user, 'societe', $id, '&societe');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 62ff5e0c71a..cec276a6064 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -53,7 +53,7 @@ $result = restrictedArea($user, 'supplier_proposal', $id);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 2c10e2451a6..10aa98fee3f 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -84,7 +84,7 @@ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;

From 0486a18972e42e3b3b4a8d5fa9cdf69d87d8e606 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jun 2017 11:07:35 +0200
Subject: [PATCH 1029/1163] Fix: use dolGetFirstLastname

---
 htdocs/accountancy/journal/bankjournal.php | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 244331b76dc..cb3afb95f5a 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -166,7 +166,7 @@ if ($result) {
 	// one line for bank jounral = tabbq
 	// one line for thirdparty journal = tabtp
 	$i = 0;
-	while ( $i < $num ) 
+	while ( $i < $num )
 	{
 		$obj = $db->fetch_object($result);
 
@@ -187,7 +187,7 @@ if ($result) {
 
 		$tabuser[$obj->rowid] = array (
 				'id' => $obj->userid,
-				'name' => $obj->firstname.' '.$obj->lastname,
+				'name' => dolGetFirstLastname($obj->firstname, $obj->lastname),
 				'lastname' => $obj->lastname,
 				'firstname' => $obj->firstname,
 				'accountancy_code' => $compta_user,
@@ -212,7 +212,7 @@ if ($result) {
 
 			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'payment_salary')))     // So we excluded 'company' here
 			    {
-			        // We save tabtype for a future use, to remember what kind of payment it is 
+			        // We save tabtype for a future use, to remember what kind of payment it is
 			        $tabtype[$obj->rowid] = $links[$key]['type'];
 			    }
 
@@ -296,7 +296,7 @@ if ($result) {
 
 		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
 
-		
+
 		// Check account number is ok
 		/*if ($action == 'writebookkeeping')        // Make test now in such a case
 		{
@@ -315,7 +315,7 @@ if ($result) {
     	        setEventMessages($langs->trans('ErrorAccountancyCodeOnThirdPartyNotDefined'), null, 'errors');
     		}
 		}*/
-		
+
 		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
 
 		$i ++;
@@ -345,7 +345,7 @@ if (! $error && $action == 'writebookkeeping') {
 		if (! $errorforline)
 		{
 		    // Line into bank account
-    		foreach ( $tabbq[$key] as $k => $mt ) 
+    		foreach ( $tabbq[$key] as $k => $mt )
     		{
     			if ($mt) {
         		    $bookkeeping = new BookKeeping($db);
@@ -363,10 +363,10 @@ if (! $error && $action == 'writebookkeeping') {
         			$bookkeeping->code_journal = $journal;
         			$bookkeeping->fk_user_author = $user->id;
         			$bookkeeping->date_create = $now;
-        
+
         			if ($tabtype[$key] == 'payment') {
         			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-    
+
         				$sqlmid = 'SELECT fac.facnumber';
         				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
         				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON payfac.fk_facture=fac.rowid";
@@ -380,7 +380,7 @@ if (! $error && $action == 'writebookkeeping') {
         				}
         			} else if ($tabtype[$key] == 'payment_supplier') {
         			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-    
+
         				$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
         				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
         				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON payfacf.fk_facturefourn=facf.rowid";
@@ -394,7 +394,7 @@ if (! $error && $action == 'writebookkeeping') {
         				}
         			} else if ($tabtype[$key] == 'payment_expensereport') {
         			    $bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
-    
+
         				$sqlmid = 'SELECT e.ref';
         				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
         				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
@@ -456,7 +456,7 @@ if (! $error && $action == 'writebookkeeping') {
         			$bookkeeping->code_journal = $journal;
         			$bookkeeping->fk_user_author = $user->id;
         			$bookkeeping->date_create = $now;
-        
+
         			if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
         				$bookkeeping->code_tiers = '';
         				$bookkeeping->numero_compte = $k;
@@ -510,7 +510,7 @@ if (! $error && $action == 'writebookkeeping') {
         				//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
         				$bookkeeping->numero_compte = 'CodeNotDef';
         			}
-        
+
         			$result = $bookkeeping->create($user);
         			if ($result < 0) {
         				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
@@ -529,7 +529,7 @@ if (! $error && $action == 'writebookkeeping') {
     			}
     		}
 		}
-		
+
 		if (! $errorforline)
 		{
             $db->commit();
@@ -551,7 +551,7 @@ if (! $error && $action == 'writebookkeeping') {
 	{
 	    setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
-	
+
 	$action = '';
 }
 
@@ -592,7 +592,7 @@ if ($action == 'export_csv') {
 			if ($reflabel == '(ExpenseReportPayment)') {
 				$reflabel = $langs->trans('Employee');
 			}
-			
+
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 
@@ -761,7 +761,7 @@ if (empty($action) || $action == 'view') {
     print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
     print '</div>';
-    
+
 	// TODO Avoid using js. We can use a direct link with $param
 	print '
 	<script type="text/javascript">
@@ -913,7 +913,7 @@ if (empty($action) || $action == 'view') {
 		$invoicestatic->ref = $val["ref"];
 		$invoicestatic->type = $val["type"];*/
 		// Bank
-		foreach ( $tabbq[$key] as $k => $mt ) 
+		foreach ( $tabbq[$key] as $k => $mt )
 		{
 		    print '<tr class="oddeven">';
 		    print "<td><!-- Bank bank.rowid=".$key."--></td>";
@@ -972,7 +972,7 @@ if (empty($action) || $action == 'view') {
         		{
         		    print '<span class="error">'.$langs->trans("WaitAccountNotDefined").'</span>';
         		}
-				else print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE); 
+				else print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE);
 				print "</td>";
 				print "<td>" . $reflabel . "</td>";
 				print "<td>&nbsp;</td>";

From 707a9e40c0e28ab48a9d48c362d40ce76894d0bb Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 6 Jun 2017 12:00:47 +0200
Subject: [PATCH 1030/1163] Fix can't use search on all extrafields on list

---
 htdocs/product/inventory/listview.class.php | 8 ++++++++
 htdocs/product/list-with-listview.php       | 2 +-
 htdocs/societe/list.php                     | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/inventory/listview.class.php b/htdocs/product/inventory/listview.class.php
index 1c03d0b524f..ac5ec68f51a 100644
--- a/htdocs/product/inventory/listview.class.php
+++ b/htdocs/product/inventory/listview.class.php
@@ -41,6 +41,11 @@ class Listview
 		$this->totalRow=0;
 		
 		$this->TField=array();
+		
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		$this->extrafields = new ExtraFields($this->db);
+		$this->extralabels = $this->extrafields->fetch_name_optionals_label('product');
+		$this->search_array_options=$this->extrafields->getOptionalsFromPost($this->extralabels,'','search_');
 	}
 
     /**
@@ -808,6 +813,9 @@ class Listview
 				  	}
 					else
 					{
+						// Overrive search from extrafields
+						// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
+						if (isset($this->extralabels[$field])) $TParam['search'][$field] = $this->extrafields->showInputField($field, $this->search_array_options['search_options_'.$field], '', '', 'search_');
 						$visible = 1;
 					}
 		            
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index 1ebbf256c9c..6cd8533778e 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -611,7 +611,7 @@ else
     }
     
     //var_dump($arraytitle,$arrayhide);
-    $list=new Listview($db, 'products');
+    $list=new Listview($db, 'product');
     $listHTML = $list->render($sql,array(
     		'list'=>array(
     				'title'=>$texte
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 51d4b41e6bb..29c1ab3bd4c 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -840,6 +840,11 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
 				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
 			}
+			else
+			{
+				// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
+				echo $extrafields->showInputField($key, $search_array_options['search_options_'.$key], '', '', 'search_');
+			}
 			print '</td>';
 		}
    }

From c041fe21650458783bcee40b7f04ef7a95468df1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 7 Jun 2017 06:03:52 +0200
Subject: [PATCH 1031/1163] Fix : Missing ref of getNomUrl in AccountLine
 (Bank)

---
 htdocs/compta/bank/class/account.class.php |  3 ++-
 htdocs/compta/salaries/card.php            | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index b77ed4db1a5..f4067a63a9c 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2010	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2015-2016	Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2015		Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015		Alexandre Spangaro		<aspangaro@zendsi.com>
  * Copyright (C) 2016		Ferran Marcet   		<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -2028,6 +2028,7 @@ class AccountLine extends CommonObject
             $result.=$langs->trans("BankAccount").': ';
             $accountstatic=new Account($this->db);
             $accountstatic->id=$this->fk_account;
+			$accountstatic->ref=$this->bank_account_ref;
             $accountstatic->label=$this->bank_account_label;
             $result.=$accountstatic->getNomUrl(0).', ';
         }
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 68f59d03cfa..b7cc64927a9 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2011-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2011-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2014      Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2015      Charlie BENKE		<charlie@patas-monkey.com> 
@@ -19,9 +19,9 @@
  */
 
 /**
- *	    \file       htdocs/compta/salaries/card.php
- *      \ingroup    salaries
- *		\brief      Page of salaries payments
+ *	\file       htdocs/compta/salaries/card.php
+ *	\ingroup    salaries
+ *	\brief      Page of salaries payments
  */
 
 require '../../main.inc.php';
@@ -72,7 +72,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	$datesp=dol_mktime(12,0,0, $_POST["datespmonth"], $_POST["datespday"], $_POST["datespyear"]);
 	$dateep=dol_mktime(12,0,0, $_POST["dateepmonth"], $_POST["dateepday"], $_POST["dateepyear"]);
 	if (empty($datev)) $datev=$datep;
-	
+
 	$object->accountid=GETPOST("accountid") > 0 ? GETPOST("accountid","int") : 0;
 	$object->fk_user=GETPOST("fk_user") > 0 ? GETPOST("fk_user","int") : 0;
 	$object->datev=$datev;
@@ -228,8 +228,8 @@ if ($action == 'create')
 
 	print load_fiche_titre($langs->trans("NewSalaryPayment"),'', 'title_accountancy.png');
 
-	dol_fiche_head('', '');
-	
+	dol_fiche_head('');
+
 	print '<table class="border" width="100%">';
 
 	// Date payment
@@ -340,12 +340,12 @@ if ($id)
 	$morehtmlref.=$langs->trans('Employee') . ' : ' . $userstatic->getNomUrl(1);
 	$morehtmlref.='</div>';
 
-    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border" width="100%">';
+	print '<table class="border" width="100%">';
 
 	// Label
 	print '<tr><td class="titlefield">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
@@ -405,7 +405,7 @@ if ($id)
 	{
 		if (! empty($user->rights->salaries->delete))
 		{
-			print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
+			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
 		}
 		else
 		{

From a96049d0e6dd74697f8407158a45e24ab6cc41f1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 7 Jun 2017 06:06:53 +0200
Subject: [PATCH 1032/1163] Spaces!!!

---
 htdocs/compta/bank/class/account.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index f4067a63a9c..92f2cfc584c 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2010	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2015-2016	Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2015		Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2015-2017	Alexandre Spangaro		<aspangaro@zendsi.com>
  * Copyright (C) 2016		Ferran Marcet   		<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -2028,7 +2028,7 @@ class AccountLine extends CommonObject
             $result.=$langs->trans("BankAccount").': ';
             $accountstatic=new Account($this->db);
             $accountstatic->id=$this->fk_account;
-			$accountstatic->ref=$this->bank_account_ref;
+            $accountstatic->ref=$this->bank_account_ref;
             $accountstatic->label=$this->bank_account_label;
             $result.=$accountstatic->getNomUrl(0).', ';
         }

From 0805c693aeea312e7e3a11aece83a592541aa10c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jun 2017 10:55:39 +0200
Subject: [PATCH 1033/1163] Fix restore of last_search_value ko

---
 htdocs/projet/class/task.class.php |  69 ++++++------
 htdocs/projet/tasks/contact.php    |  54 +++++-----
 htdocs/projet/tasks/document.php   |  56 +++++-----
 htdocs/projet/tasks/note.php       |  58 +++++-----
 htdocs/projet/tasks/task.php       |  74 ++++++-------
 htdocs/projet/tasks/time.php       | 168 ++++++++++++++---------------
 6 files changed, 242 insertions(+), 237 deletions(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index e1025241115..8124f500bd6 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -36,7 +36,7 @@ class Task extends CommonObject
     public $fk_element='fk_task';
     public $picto = 'task';
     protected $childtables=array('projet_task_time');    // To test if we can delete object
-    
+
     var $fk_task_parent;
     var $label;
     var $description;
@@ -59,7 +59,7 @@ class Task extends CommonObject
 	var $timespent_nblinesnull;
 	var $timespent_nblines;
 	// For detail of lines of timespent record, there is the property ->lines in common
-	
+
 	// Var used to call method addTimeSpent(). Bad practice.
     var $timespent_id;
     var $timespent_duration;
@@ -100,7 +100,7 @@ class Task extends CommonObject
         // Clean parameters
         $this->label = trim($this->label);
         $this->description = trim($this->description);
-        
+
         // Check parameters
         // Put here code to add control on parameters values
 
@@ -226,7 +226,7 @@ class Task extends CommonObject
         if ($resql)
         {
             $num_rows = $this->db->num_rows($resql);
-            
+
             if ($num_rows)
             {
                 $obj = $this->db->fetch_object($resql);
@@ -409,7 +409,7 @@ class Task extends CommonObject
             $this->db->rollback();
             return 0;
         }
-        
+
         if (! $error)
         {
             // Delete linked contacts
@@ -534,7 +534,7 @@ class Task extends CommonObject
             return -1;
         }
     }
-    
+
 	/**
      *	Return nb of time spent
      *
@@ -579,14 +579,15 @@ class Task extends CommonObject
      * 	@param	int		$addlabel		0=Default, 1=Add label into string, >1=Add first chars into string
      *  @param	string	$sep			Separator between ref and label if option addlabel is set
      *  @param	int   	$notooltip		1=Disable tooltip
+     *  @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
      *	@return	string					Chaine avec URL
      */
-    function getNomUrl($withpicto=0,$option='',$mode='task', $addlabel=0, $sep=' - ', $notooltip=0)
+    function getNomUrl($withpicto=0,$option='',$mode='task', $addlabel=0, $sep=' - ', $notooltip=0, $save_lastsearch_value=-1)
     {
         global $conf, $langs, $user;
 
         if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
+
         $result='';
         $label = '<u>' . $langs->trans("ShowTask") . '</u>';
         if (! empty($this->ref))
@@ -597,8 +598,12 @@ class Task extends CommonObject
         {
         	$label .= "<br>".get_date_range($this->date_start,$this->date_end,'',$langs,0);
         }
-        
+
         $url = DOL_URL_ROOT.'/projet/tasks/'.$mode.'.php?id='.$this->id.($option=='withproject'?'&withproject=1':'');
+        // Add param to save lastsearch_values or not
+        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+        if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
 
         $linkclose = '';
         if (empty($notooltip))
@@ -611,11 +616,11 @@ class Task extends CommonObject
             $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose.=' class="classfortooltip"';
         }
-        
+
         $linkstart = '<a href="'.$url.'"';
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
-        
+
         $picto='projecttask';
 
         if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
@@ -706,7 +711,7 @@ class Task extends CommonObject
                 $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2";
                 $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
             }
-            else 
+            else
             {
                 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
             }
@@ -790,7 +795,7 @@ class Task extends CommonObject
                     $tasks[$i]->date_start		= $this->db->jdate($obj->date_start);
                     $tasks[$i]->date_end		= $this->db->jdate($obj->date_end);
                     $tasks[$i]->rang	   		= $obj->rang;
-                    
+
                     $tasks[$i]->thirdparty_id	= $obj->thirdparty_id;
                     $tasks[$i]->thirdparty_name	= $obj->thirdparty_name;
                 }
@@ -963,7 +968,7 @@ class Task extends CommonObject
             $tasktime_id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_time");
             $ret = $tasktime_id;
 			$this->timespent_id = $ret;
-			
+
             if (! $notrigger)
             {
                 // Call trigger
@@ -1027,10 +1032,10 @@ class Task extends CommonObject
         global $langs;
 
         $id=$this->id;
-        if (empty($id)) 
+        if (empty($id))
         {
             dol_syslog("getSummaryOfTimeSpent called on a not loaded task", LOG_ERR);
-            return -1; 
+            return -1;
         }
 
         $result=array();
@@ -1045,7 +1050,7 @@ class Task extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
         $sql.= " WHERE t.fk_task = ".$id;
         if ($userid > 0) $sql.=" AND t.fk_user = ".$userid;
-        
+
         dol_syslog(get_class($this)."::getSummaryOfTimeSpent", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
@@ -1055,14 +1060,14 @@ class Task extends CommonObject
             $result['min_date'] = $obj->min_date;               // deprecated. use the ->timespent_xxx instead
             $result['max_date'] = $obj->max_date;               // deprecated. use the ->timespent_xxx instead
             $result['total_duration'] = $obj->total_duration;   // deprecated. use the ->timespent_xxx instead
-            
+
             $this->timespent_min_date=$this->db->jdate($obj->min_date);
             $this->timespent_max_date=$this->db->jdate($obj->max_date);
             $this->timespent_total_duration=$obj->total_duration;
             $this->timespent_total_amount=$obj->total_amount;
             $this->timespent_nblinesnull=($obj->nblinesnull?$obj->nblinesnull:0);
             $this->timespent_nblines=($obj->nblines?$obj->nblines:0);
-            
+
             $this->db->free($resql);
         }
         else
@@ -1357,7 +1362,7 @@ class Task extends CommonObject
 		$clone_task->fetch($fromid);
 		$clone_task->fetch_optionals();
 		//var_dump($clone_task->array_options);exit;
-		
+
 		$origin_task->fetch($fromid);
 
 		$defaultref='';
@@ -1680,7 +1685,7 @@ class Task extends CommonObject
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
-	
+
 	/**
 	 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
@@ -1690,12 +1695,12 @@ class Task extends CommonObject
 	function load_board($user)
 	{
 	    global $conf, $langs;
-	
+
 	    $mine=0; $socid=$user->societe_id;
-	    
+
 	    $projectstatic = new Project($this->db);
 	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1,$socid);
-	    
+
 	    // List of tasks (does not care about permissions. Filtering will be done later)
 	    $sql = "SELECT p.rowid as projectid, p.fk_statut as projectstatus,";
 	    $sql.= " t.rowid as taskid, t.progress as progress, t.fk_statut as status,";
@@ -1718,29 +1723,29 @@ class Task extends CommonObject
 	    if ($resql)
 	    {
 	        $task_static = new Task($this->db);
-	
+
 	        $response = new WorkboardResponse();
 	        $response->warning_delay = $conf->projet->task->warning_delay/60/60/24;
 	        $response->label = $langs->trans("OpenedTasks");
 	        if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mainmenu=project';
 	        else $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mode=mine&amp;mainmenu=project';
 	        $response->img = img_object('',"task");
-	
+
 	        // This assignment in condition is not a bug. It allows walking the results.
 	        while ($obj=$this->db->fetch_object($resql))
 	        {
 	            $response->nbtodo++;
-	
+
 	            $task_static->projectstatus = $obj->projectstatus;
 	            $task_static->progress = $obj->progress;
 	            $task_static->fk_statut = $obj->status;
 	            $task_static->date_end = $this->db->jdate($obj->datee);
-	
+
 	            if ($task_static->hasDelay()) {
 	                $response->nbtodolate++;
 	            }
 	        }
-	
+
 	        return $response;
 	    }
 	    else
@@ -1749,7 +1754,7 @@ class Task extends CommonObject
 	        return -1;
 	    }
 	}
-	
+
 	/**
 	 * Is the task delayed?
 	 *
@@ -1758,7 +1763,7 @@ class Task extends CommonObject
 	public function hasDelay()
 	{
 	    global $conf;
-	
+
         if (! ($this->progress >= 0 && $this->progress < 100)) {
             return false;
         }
@@ -1768,5 +1773,5 @@ class Task extends CommonObject
         $datetouse = ($this->date_end > 0) ? $this->date_end : ($this->datee > 0 ? $this->datee : 0);
 
         return ($datetouse > 0 && ($datetouse < ($now - $conf->projet->task->warning_delay)));
-	}	
+	}
 }
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 9160f2b3795..d4029847534 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -174,7 +174,7 @@ if ($id > 0 || ! empty($ref))
 	if ($object->fetch($id, $ref) > 0)
 	{
 	    $id = $object->id;     // So when doing a search from ref, id is also set correctly.
-	    
+
 		$result=$projectstatic->fetch($object->fk_project);
 		if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 
@@ -192,83 +192,83 @@ if ($id > 0 || ! empty($ref))
     		$param=($mode=='mine'?'&mode=mine':'');
 
 			// Project card
-    
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
-            
+
+            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
             $morehtmlref='<div class="refidno">';
             // Title
             $morehtmlref.=$projectstatic->title;
             // Thirdparty
-            if ($projectstatic->thirdparty->id > 0) 
+            if ($projectstatic->thirdparty->id > 0)
             {
                 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $projectstatic->thirdparty->getNomUrl(1, 'project');
             }
             $morehtmlref.='</div>';
-            
+
             // Define a complementary filter for search of next/prev ref.
             if (! $user->rights->projet->all->lire)
             {
                 $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0);
                 $projectstatic->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
             }
-            
+
             dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-        
+
             print '<div class="fichecenter">';
             print '<div class="fichehalfleft">';
             print '<div class="underbanner clearboth"></div>';
-        
+
             print '<table class="border" width="100%">';
-        
+
             // Visibility
             print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
             if ($projectstatic->public) print $langs->trans('SharedProject');
             else print $langs->trans('PrivateProject');
             print '</td></tr>';
-        
+
             // Date start - end
             print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
             print dol_print_date($projectstatic->date_start,'day');
             $end=dol_print_date($projectstatic->date_end,'day');
             if ($end) print ' - '.$end;
             print '</td></tr>';
-            
+
             // Budget
             print '<tr><td>'.$langs->trans("Budget").'</td><td>';
             if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount,'',$langs,1,0,0,$conf->currency);
             print '</td></tr>';
-        
+
             // Other attributes
             $cols = 2;
             //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-            
+
             print '</table>';
-            
+
             print '</div>';
             print '<div class="fichehalfright">';
             print '<div class="ficheaddleft">';
             print '<div class="underbanner clearboth"></div>';
-            
+
             print '<table class="border" width="100%">';
-            
+
             // Description
             print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
             print nl2br($projectstatic->description);
             print '</td></tr>';
-        
+
             // Categories
             if($conf->categorie->enabled) {
                 print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
                 print $form->showCategories($projectstatic->id,'project',1);
                 print "</td></tr>";
             }
-            
+
             print '</table>';
-            
+
             print '</div>';
             print '</div>';
             print '</div>';
-            
+
             print '<div class="clearboth"></div>';
 
     		dol_fiche_end();
@@ -284,16 +284,16 @@ if ($id > 0 || ! empty($ref))
 
 		$param=(GETPOST('withproject')?'&withproject=1':'');
 		$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
-		
+
 		if (! GETPOST('withproject') || empty($projectstatic->id))
 		{
 		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
 		    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 		}
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-		
+
 		$morehtmlref='';
-		
+
 		// Project
 		if (empty($withproject))
 		{
@@ -301,13 +301,13 @@ if ($id > 0 || ! empty($ref))
 		    $morehtmlref.=$langs->trans("Project").': ';
 		    $morehtmlref.=$projectstatic->getNomUrl(1);
 		    $morehtmlref.='<br>';
-		
+
 		    // Third party
 		    $morehtmlref.=$langs->trans("ThirdParty").': ';
 		    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
 		    $morehtmlref.='</div>';
 		}
-		
+
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param, 0, '', '', 1);
 
 		dol_fiche_end();
@@ -385,7 +385,7 @@ if ($id > 0 || ! empty($ref))
 				print '<input type="hidden" name="id" value="'.$object->id.'">';
 				if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 
-				
+
 				print '<tr class="oddeven">';
 
 				print '<td class="nowrap">';
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 661776b9b4d..649e1efd575 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -136,84 +136,84 @@ if ($object->id > 0)
 
 		// Project card
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
-        
+        $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
         $morehtmlref='<div class="refidno">';
         // Title
         $morehtmlref.=$projectstatic->title;
         // Thirdparty
-        if ($projectstatic->thirdparty->id > 0) 
+        if ($projectstatic->thirdparty->id > 0)
         {
             $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $projectstatic->thirdparty->getNomUrl(1, 'project');
         }
         $morehtmlref.='</div>';
-        
+
         // Define a complementary filter for search of next/prev ref.
         if (! $user->rights->projet->all->lire)
         {
             $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0);
             $projectstatic->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
         }
-        
+
         dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-    
+
         print '<div class="fichecenter">';
         print '<div class="fichehalfleft">';
         print '<div class="underbanner clearboth"></div>';
-    
+
         print '<table class="border" width="100%">';
-    
+
         // Visibility
         print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
         if ($projectstatic->public) print $langs->trans('SharedProject');
         else print $langs->trans('PrivateProject');
         print '</td></tr>';
-    
+
         // Date start - end
         print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
         print dol_print_date($projectstatic->date_start,'day');
         $end=dol_print_date($projectstatic->date_end,'day');
         if ($end) print ' - '.$end;
         print '</td></tr>';
-        
+
         // Budget
         print '<tr><td>'.$langs->trans("Budget").'</td><td>';
         if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount,'',$langs,1,0,0,$conf->currency);
         print '</td></tr>';
-    
+
         // Other attributes
         $cols = 2;
         //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-        
+
         print '</table>';
-        
+
         print '</div>';
         print '<div class="fichehalfright">';
         print '<div class="ficheaddleft">';
         print '<div class="underbanner clearboth"></div>';
-        
+
         print '<table class="border" width="100%">';
-        
+
         // Description
         print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
         print nl2br($projectstatic->description);
         print '</td></tr>';
-    
+
         // Categories
         if($conf->categorie->enabled) {
             print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
             print $form->showCategories($projectstatic->id,'project',1);
             print "</td></tr>";
         }
-        
+
         print '</table>';
-        
+
         print '</div>';
         print '</div>';
         print '</div>';
-        
+
         print '<div class="clearboth"></div>';
-        
+
 		dol_fiche_end();
 	}
 
@@ -227,7 +227,7 @@ if ($object->id > 0)
 	{
 		$totalsize+=$file['size'];
 	}
-	
+
 	$param=(GETPOST('withproject')?'&withproject=1':'');
 	$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
 
@@ -237,9 +237,9 @@ if ($object->id > 0)
 	    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 	}
 	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	
+
 	$morehtmlref='';
-	
+
 	// Project
 	if (empty($withproject))
 	{
@@ -247,17 +247,17 @@ if ($object->id > 0)
 	    $morehtmlref.=$langs->trans("Project").': ';
 	    $morehtmlref.=$projectstatic->getNomUrl(1);
 	    $morehtmlref.='<br>';
-	
+
 	    // Third party
 	    $morehtmlref.=$langs->trans("ThirdParty").': ';
 	    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
 	    $morehtmlref.='</div>';
 	}
-	
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
-	
+
 	print '<div class="fichecenter">';
-	
+
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 
@@ -268,7 +268,7 @@ if ($object->id > 0)
 	print "</table>\n";
 
 	print '</div>';
-	
+
 	dol_fiche_end();
 
 	print '<br>';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 0d6df7d85fd..13a8979ae91 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -114,9 +114,9 @@ if ($object->id > 0)
 
 		$param=($mode=='mine'?'&mode=mine':'');
 		// Project card
-		
-		$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
-		
+
+		$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
 		$morehtmlref='<div class="refidno">';
 		// Title
 		$morehtmlref.=$projectstatic->title;
@@ -126,92 +126,92 @@ if ($object->id > 0)
 		    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $projectstatic->thirdparty->getNomUrl(1, 'project');
 		}
 		$morehtmlref.='</div>';
-		
+
 		// Define a complementary filter for search of next/prev ref.
 		if (! $user->rights->projet->all->lire)
 		{
 		    $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0);
 		    $projectstatic->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
 		}
-		
+
 		dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-		
+
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border" width="100%">';
-		
+
 		// Visibility
 		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 		if ($projectstatic->public) print $langs->trans('SharedProject');
 		else print $langs->trans('PrivateProject');
 		print '</td></tr>';
-		
+
 		// Date start - end
 		print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
 		print dol_print_date($projectstatic->date_start,'day');
 		$end=dol_print_date($projectstatic->date_end,'day');
 		if ($end) print ' - '.$end;
 		print '</td></tr>';
-		
+
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 		if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount,'',$langs,1,0,0,$conf->currency);
 		print '</td></tr>';
-		
+
 		// Other attributes
 		$cols = 2;
 		//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-		
+
 		print '</table>';
-		
+
 		print '</div>';
 		print '<div class="fichehalfright">';
 		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border" width="100%">';
-		
+
 		// Description
 		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
 		print nl2br($projectstatic->description);
 		print '</td></tr>';
-		
+
 		// Categories
 		if($conf->categorie->enabled) {
 		    print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
 		    print $form->showCategories($projectstatic->id,'project',1);
 		    print "</td></tr>";
 		}
-		
+
 		print '</table>';
-		
+
 		print '</div>';
 		print '</div>';
 		print '</div>';
-		
+
 		print '<div class="clearboth"></div>';
-		
+
 		dol_fiche_end();
 	}
 
 	$head = task_prepare_head($object);
 	dol_fiche_head($head, 'task_notes', $langs->trans('Task'), -1, 'projecttask');
 
-	
+
 	$param=(GETPOST('withproject')?'&withproject=1':'');
 	$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
-	
+
 	if (! GETPOST('withproject') || empty($projectstatic->id))
 	{
 	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
 	    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 	}
 	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	
+
 	$morehtmlref='';
-	
+
 	// Project
 	if (empty($withproject))
 	{
@@ -219,17 +219,17 @@ if ($object->id > 0)
 	    $morehtmlref.=$langs->trans("Project").': ';
 	    $morehtmlref.=$projectstatic->getNomUrl(1);
 	    $morehtmlref.='<br>';
-	
+
 	    // Third party
 	    $morehtmlref.=$langs->trans("ThirdParty").': ';
 	    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
 	    $morehtmlref.='</div>';
 	}
-	
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
-	
+
 	print '<div class="fichecenter">';
-	
+
     print '<div class="underbanner clearboth"></div>';
 
 	$cssclass='titlefield';
@@ -237,7 +237,7 @@ if ($object->id > 0)
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 	print '</div>';
-	
+
 	dol_fiche_end();
 }
 
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 5f493167fd8..9211d75f499 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -226,85 +226,85 @@ if ($id > 0 || ! empty($ref))
 			$param=($mode=='mine'?'&mode=mine':'');
 
 			// Project card
-    
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
-            
+
+            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
             $morehtmlref='<div class="refidno">';
             // Title
             $morehtmlref.=$projectstatic->title;
             // Thirdparty
-            if ($projectstatic->thirdparty->id > 0) 
+            if ($projectstatic->thirdparty->id > 0)
             {
                 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $projectstatic->thirdparty->getNomUrl(1, 'project');
             }
             $morehtmlref.='</div>';
-            
+
             // Define a complementary filter for search of next/prev ref.
             if (! $user->rights->projet->all->lire)
             {
                 $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0);
                 $projectstatic->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
             }
-            
+
             dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-        
+
             print '<div class="fichecenter">';
             print '<div class="fichehalfleft">';
             print '<div class="underbanner clearboth"></div>';
-        
+
             print '<table class="border" width="100%">';
-        
+
             // Visibility
             print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
             if ($projectstatic->public) print $langs->trans('SharedProject');
             else print $langs->trans('PrivateProject');
             print '</td></tr>';
-        
+
             // Date start - end
             print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
             print dol_print_date($projectstatic->date_start,'day');
             $end=dol_print_date($projectstatic->date_end,'day');
             if ($end) print ' - '.$end;
             print '</td></tr>';
-            
+
             // Budget
             print '<tr><td>'.$langs->trans("Budget").'</td><td>';
             if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount,'',$langs,1,0,0,$conf->currency);
             print '</td></tr>';
-        
+
             // Other attributes
             $cols = 2;
             //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-            
+
             print '</table>';
-            
+
             print '</div>';
             print '<div class="fichehalfright">';
             print '<div class="ficheaddleft">';
             print '<div class="underbanner clearboth"></div>';
-            
+
             print '<table class="border" width="100%">';
-            
+
             // Description
             print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
             print nl2br($projectstatic->description);
             print '</td></tr>';
-        
+
             // Categories
             if($conf->categorie->enabled) {
                 print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
                 print $form->showCategories($projectstatic->id,'project',1);
                 print "</td></tr>";
             }
-            
+
             print '</table>';
-            
+
             print '</div>';
             print '</div>';
             print '</div>';
-            
+
             print '<div class="clearboth"></div>';
-        
+
 			dol_fiche_end();
 
 			print '<br>';
@@ -430,7 +430,7 @@ if ($id > 0 || ! empty($ref))
 			 * Fiche tache en mode visu
 			 */
 			$param=($withproject?'&withproject=1':'');
-			$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
+			$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>':'';
 
 			dol_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask');
 
@@ -445,9 +445,9 @@ if ($id > 0 || ! empty($ref))
 			    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 			}
 			else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-			
+
 			$morehtmlref='';
-			
+
 			// Project
 			if (empty($withproject))
 			{
@@ -455,18 +455,18 @@ if ($id > 0 || ! empty($ref))
 			    $morehtmlref.=$langs->trans("Project").': ';
 			    $morehtmlref.=$projectstatic->getNomUrl(1);
 			    $morehtmlref.='<br>';
-			
+
 			    // Third party
 			    $morehtmlref.=$langs->trans("ThirdParty").': ';
 			    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
 			    $morehtmlref.='</div>';
 			}
-			
+
 			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
-			
+
 			print '<div class="fichecenter">';
-			
-			print '<div class="underbanner clearboth"></div>';			
+
+			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border" width="100%">';
 
 			// Date start - Date end
@@ -520,9 +520,9 @@ if ($id > 0 || ! empty($ref))
 			}
 
 			print '</table>';
-            
+
 			print '</div>';
-            
+
 			dol_fiche_end();
 		}
 
@@ -532,7 +532,7 @@ if ($id > 0 || ! empty($ref))
 			/*
 			 * Actions
  			 */
-			
+
 		    print '<div class="tabsAction">';
 
 		    $parameters = array();
@@ -549,7 +549,7 @@ if ($id > 0 || ! empty($ref))
 				{
 					print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Modify').'</a>';
 				}
-	
+
 				// Delete
 				if ($user->rights->projet->supprimer)
 				{
@@ -566,13 +566,13 @@ if ($id > 0 || ! empty($ref))
 				{
 					print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 				}
-	
+
 				print '</div>';
 		    }
-		    
+
     		print '<div class="fichecenter"><div class="fichehalfleft">';
     		print '<a name="builddoc"></a>'; // ancre
-    		
+
 			/*
 			 * Documents generes
 			 */
@@ -587,7 +587,7 @@ if ($id > 0 || ! empty($ref))
 			print $formfile->showdocuments('project_task',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
 
 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-				
+
 			print '</div></div></div>';
 		}
 	}
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index b4ed0ab2928..ecd15a8aa3b 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -190,7 +190,7 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->lire
 	{
 		$object->fetch($id, $ref);
 		// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
-		
+
 		$object->timespent_id = $_POST["lineid"];
 		$object->timespent_note = $_POST["timespent_note_line"];
 		$object->timespent_old_duration = $_POST["old_duration"];
@@ -262,10 +262,10 @@ $projectidforalltimes=0;
 if (GETPOST('projectid'))
 {
     $projectidforalltimes=GETPOST('projectid','int');
-    
+
 }
 
-    
+
 /*
  * View
  */
@@ -292,10 +292,10 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		$result=$projectstatic->fetch($object->fk_project);
 		if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 		$res=$projectstatic->fetch_optionals($object->id,$extralabels_projet);
-		
+
 		$object->project = clone $projectstatic;
     }
-	
+
     $userWrite = $projectstatic->restrictedProjectArea($user,'write');
 
 	if ($projectstatic->id > 0)
@@ -310,88 +310,88 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			$param=($mode=='mine'?'&mode=mine':'');
 
 			// Project card
-    
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
-            
+
+            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
             $morehtmlref='<div class="refidno">';
             // Title
             $morehtmlref.=$projectstatic->title;
             // Thirdparty
-            if ($projectstatic->thirdparty->id > 0) 
+            if ($projectstatic->thirdparty->id > 0)
             {
                 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $projectstatic->thirdparty->getNomUrl(1, 'project');
             }
             $morehtmlref.='</div>';
-            
+
             // Define a complementary filter for search of next/prev ref.
             if (! $user->rights->projet->all->lire)
             {
                 $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0);
                 $projectstatic->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
             }
-            
+
             dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-        
+
             print '<div class="fichecenter">';
             print '<div class="fichehalfleft">';
             print '<div class="underbanner clearboth"></div>';
-        
+
             print '<table class="border" width="100%">';
-        
+
             // Visibility
             print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
             if ($projectstatic->public) print $langs->trans('SharedProject');
             else print $langs->trans('PrivateProject');
             print '</td></tr>';
-        
+
             // Date start - end
             print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
             print dol_print_date($projectstatic->date_start,'day');
             $end=dol_print_date($projectstatic->date_end,'day');
             if ($end) print ' - '.$end;
             print '</td></tr>';
-            
+
             // Budget
             print '<tr><td>'.$langs->trans("Budget").'</td><td>';
             if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount,'',$langs,1,0,0,$conf->currency);
             print '</td></tr>';
-        
+
             // Other attributes
             $cols = 2;
             //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-            
+
             print '</table>';
-            
+
             print '</div>';
             print '<div class="fichehalfright">';
             print '<div class="ficheaddleft">';
             print '<div class="underbanner clearboth"></div>';
-            
+
             print '<table class="border" width="100%">';
-            
+
             // Description
             print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
             print nl2br($projectstatic->description);
             print '</td></tr>';
-        
+
             // Categories
             if($conf->categorie->enabled) {
                 print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
                 print $form->showCategories($projectstatic->id,'project',1);
                 print "</td></tr>";
             }
-            
+
             print '</table>';
-            
+
             print '</div>';
             print '</div>';
             print '</div>';
-            
+
             print '<div class="clearboth"></div>';
 
 			dol_fiche_end();
-			
-			
+
+
 			/*
 			 * Actions
 			 */
@@ -399,7 +399,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))
 			{
     			print '<div class="tabsAction">';
-    			
+
     			if ($user->rights->projet->all->creer || $user->rights->projet->creer)
     			{
     			    if ($object->public || $userWrite > 0)
@@ -415,12 +415,12 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     			{
     			    print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTask').'</a>';
     			}
-    			
+
     			print '</div>';
 			}
 		}
 	}
-	
+
 	if (empty($projectidforalltimes))
 	{
 		$head=task_prepare_head($object);
@@ -440,9 +440,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			$object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 		}
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-		
+
 		$morehtmlref='';
-		
+
 		// Project
 		if (empty($withproject))
 		{
@@ -450,18 +450,18 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		    $morehtmlref.=$langs->trans("Project").': ';
 		    $morehtmlref.=$projectstatic->getNomUrl(1);
 		    $morehtmlref.='<br>';
-		
+
 		    // Third party
 		    $morehtmlref.=$langs->trans("ThirdParty").': ';
 		    $morehtmlref.=$projectstatic->thirdparty->getNomUrl(1);
 		    $morehtmlref.='</div>';
 		}
-		
+
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
-		
+
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
-		
+
         print '<div class="underbanner clearboth"></div>';
 		print '<table class="border" width="100%">';
 
@@ -482,12 +482,12 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 
 		print '</table>';
 		print '</div>';
-		
+
 		print '<div class="fichehalfright"><div class="ficheaddleft">';
-		
+
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border" width="100%">';
-		
+
 		// Progress declared
 		print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td>';
 		print $object->progress.' %';
@@ -508,10 +508,10 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 
 		print '</div>';
 		print '</div>';
-        
+
 		print '</div>';
 		print '<div class="clearboth"></div>';
-		    
+
 		dol_fiche_end();
 
 
@@ -583,18 +583,18 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			print '</td></tr>';
 
 			print '</table></form>';
-			
+
 			print '<br>';
 		}
 	}
-	
+
 	if ($projectstatic->id > 0)
-	{	
+	{
 		if ($action == 'deleteline')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.'&lineid='.$_GET["lineid"].($withproject?'&withproject=1':''),$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
 		}
-	    
+
 	    // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 	    $hookmanager->initHooks(array('tasktimelist'));
 	    $extrafields = new ExtraFields($db);
@@ -619,12 +619,12 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 	            $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
 	        }
 	    }
-	    
+
 		/*
 		 *  List of time spent
 		 */
 		$tasks = array();
-		
+
 		$sql = "SELECT t.rowid, t.fk_task, t.task_date, t.task_datehour, t.task_date_withhour, t.task_duration, t.fk_user, t.note, t.thm,";
 		$sql .= " pt.ref, pt.label,";
 		$sql .= " u.lastname, u.firstname, u.login, u.photo";
@@ -638,7 +638,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		if ($search_task_label) $sql .= natural_search('pt.label', $search_task_label);
 		if ($search_user > 0) $sql .= natural_search('t.fk_user', $search_user);
 		$sql .= $db->order($sortfield, $sortorder);
-        
+
 		$var=true;
 		$resql = $db->query($sql);
 		if ($resql)
@@ -668,9 +668,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			dol_print_error($db);
 		}
 
-		
+
 		$arrayofselected=is_array($toselect)?$toselect:array();
-		
+
 		$params='';
 		if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 		if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -687,8 +687,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		if ($id) $params.='&amp;id='.$id;
 		if ($projectid) $params.='&amp;projectid='.$projectid;
 		if ($withproject) $params.='&amp;withproject='.$withproject;
-		
-		
+
+
 		$arrayofmassactions =  array(
 		    //'presend'=>$langs->trans("SendByMail"),
 		    //'builddoc'=>$langs->trans("PDFMerge"),
@@ -696,9 +696,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		//if ($user->rights->projet->creer) $arrayofmassactions['delete']=$langs->trans("Delete");
 		if ($massaction == 'presend') $arrayofmassactions=array();
 		$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-		
-		
-		
+
+
+
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'">';
         if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -708,31 +708,31 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 	    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	    print '<input type="hidden" name="page" value="'.$page.'">';
-	     
+
 		print '<input type="hidden" name="id" value="'.$id.'">';
 		print '<input type="hidden" name="projectid" value="'.$projectidforalltimes.'">';
 		print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 
 		$moreforfilter = '';
-		
+
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 		else $moreforfilter = $hookmanager->resPrint;
-		
+
 		if (! empty($moreforfilter))
 		{
 		    print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		    print $moreforfilter;
 		    print '</div>';
 		}
-		
+
 		$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 		$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-		
+
         print '<div class="div-table-responsive">';
 		print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-		
+
 		// Fields title search
 		print '<tr class="liste_titre_filter">';
 		// Date
@@ -783,14 +783,14 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
 		print $searchpicto;
 		print '</td>';
-		print '</tr>'."\n";	
-		
+		print '</tr>'."\n";
+
 		print '<tr class="liste_titre">';
 		if (! empty($arrayfields['t.task_date']['checked'])) print_liste_field_titre($arrayfields['t.task_date']['label'],$_SERVER['PHP_SELF'],'t.task_date,t.task_datehour,t.rowid','',$params,'',$sortfield,$sortorder);
 		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
         {
-            if (! empty($arrayfields['t.task_ref']['checked']))   print_liste_field_titre($arrayfields['t.task_ref']['label'],$_SERVER['PHP_SELF'],'pt.ref','',$params,'',$sortfield,$sortorder);            
-            if (! empty($arrayfields['t.task_label']['checked'])) print_liste_field_titre($arrayfields['t.task_label']['label'],$_SERVER['PHP_SELF'],'pt.label','',$params,'',$sortfield,$sortorder);            
+            if (! empty($arrayfields['t.task_ref']['checked']))   print_liste_field_titre($arrayfields['t.task_ref']['label'],$_SERVER['PHP_SELF'],'pt.ref','',$params,'',$sortfield,$sortorder);
+            if (! empty($arrayfields['t.task_label']['checked'])) print_liste_field_titre($arrayfields['t.task_label']['label'],$_SERVER['PHP_SELF'],'pt.label','',$params,'',$sortfield,$sortorder);
         }
         if (! empty($arrayfields['author']['checked'])) print_liste_field_titre($arrayfields['author']['label'],$_SERVER['PHP_SELF'],'','',$params,'',$sortfield,$sortorder);
 		if (! empty($arrayfields['t.note']['checked'])) print_liste_field_titre($arrayfields['t.note']['label'],$_SERVER['PHP_SELF'],'t.note','',$params,'',$sortfield,$sortorder);
@@ -800,9 +800,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		/*
     	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
     	{
-    	   foreach($extrafields->attribute_label as $key => $val) 
+    	   foreach($extrafields->attribute_label as $key => $val)
     	   {
-               if (! empty($arrayfields["ef.".$key]['checked'])) 
+               if (! empty($arrayfields["ef.".$key]['checked']))
                {
     				$align=$extrafields->getAlignFlag($key);
     				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -817,17 +817,17 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		print "</tr>\n";
 
 		$tasktmp = new Task($db);
-		
+
 		$i = 0;
 
 		$childids = $user->getAllChildIds();
-		
+
 		$total = 0;
 		$totalvalue = 0;
 		$totalarray=array();
 		foreach ($tasks as $task_time)
 		{
-			
+
 			print '<tr class="oddeven">';
 
 			$date1=$db->jdate($task_time->task_date);
@@ -858,26 +858,26 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
         			$tasktmp->id = $task_time->fk_task;
         			$tasktmp->ref = $task_time->ref;
         			$tasktmp->label = $task_time->label;
-        			print $tasktmp->getNomUrl(1, 'withproject', 'time');	
+        			print $tasktmp->getNomUrl(1, 'withproject', 'time');
         			print '</td>';
         			if (! $i) $totalarray['nbfield']++;
     			}
             }
-            
+
 			// Task label
             if (! empty($arrayfields['t.task_label']['checked']))
             {
         		if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes))   // Not a dedicated task
     			{
         			print '<td class="nowrap">';
-        			print $task_time->label;	
+        			print $task_time->label;
         			print '</td>';
         			if (! $i) $totalarray['nbfield']++;
     			}
             }
-            
+
             // User
-            if (! empty($arrayfields['author']['checked'])) 
+            if (! empty($arrayfields['author']['checked']))
             {
                 print '<td>';
     			if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
@@ -907,7 +907,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
             }
 
 			// Note
-            if (! empty($arrayfields['t.note']['checked'])) 
+            if (! empty($arrayfields['t.note']['checked']))
             {
                 print '<td align="left">';
     			if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
@@ -921,7 +921,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     			print '</td>';
     			if (! $i) $totalarray['nbfield']++;
             }
-            
+
 			// Time spent
             if (! empty($arrayfields['t.task_duration']['checked']))
             {
@@ -940,9 +940,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     			if (! $i) $totalarray['totaldurationfield']=$totalarray['nbfield'];
     			$totalarray['totalduration'] += $task_time->task_duration;
             }
-            
+
 			// Value spent
-            if (! empty($arrayfields['value']['checked'])) 
+            if (! empty($arrayfields['value']['checked']))
             {
 				print '<td align="right">';
 				$value = price2num($task_time->thm * $task_time->task_duration / 3600);
@@ -957,7 +957,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
 			$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
-		
+
             // Action column
 			print '<td class="center"">';
 			if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
@@ -975,7 +975,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     				print '<a href="'.$_SERVER["PHP_SELF"].'?'.($projectidforalltimes?'projectid='.$projectidforalltimes.'&amp;':'').'id='.$task_time->fk_task.'&amp;action=editline&amp;lineid='.$task_time->rowid.($withproject?'&amp;withproject=1':'').'">';
     				print img_edit();
     				print '</a>';
-    
+
     				print '&nbsp;';
     				print '<a href="'.$_SERVER["PHP_SELF"].'?'.($projectidforalltimes?'projectid='.$projectidforalltimes.'&amp;':'').'id='.$task_time->fk_task.'&amp;action=deleteline&amp;lineid='.$task_time->rowid.($withproject?'&amp;withproject=1':'').'">';
     				print img_delete();
@@ -984,12 +984,12 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			}
         	print '</td>';
         	if (! $i) $totalarray['nbfield']++;
-        	
+
 			print "</tr>\n";
-			
+
 			$i++;
 		}
-		
+
 		// Show total line
 		if (isset($totalarray['totaldurationfield']) || isset($totalarray['totalvaluefield']))
 		{

From a0295821baf2f8d32132fbc4e1c4699a6cf5a45a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jun 2017 11:38:42 +0200
Subject: [PATCH 1034/1163] Fix errors in extra computed field

---
 htdocs/core/class/extrafields.class.php | 44 ++++++++++++-------------
 htdocs/langs/en_US/admin.lang           |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index bd1daca8886..16214e10bf1 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -39,7 +39,7 @@ class ExtraFields
 
 	// type of element (for what object is the extrafield)
 	var $attribute_elementtype;
-	
+
 	// Array with type of the extra field
 	var $attribute_type;
 	// Array with label of extra field
@@ -68,7 +68,7 @@ class ExtraFields
 	var $attribute_list;
 	// Array to store if extra field is hidden
 	var $attribute_hidden;		// warning, do not rely on this. If your module need a hidden data, it must use its own table.
-	
+
 	var $error;
 	var $errno;
 
@@ -95,7 +95,7 @@ class ExtraFields
 	'separate' => 'ExtrafieldSeparator',
 	);
 
-	
+
 	/**
 	 *	Constructor
 	 *
@@ -149,7 +149,7 @@ class ExtraFields
 		// Create field into database except for separator type which is not stored in database
 		if ($type != 'separate')
 		{
-			$result=$this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $copmputed);
+			$result=$this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed);
 		}
 		$err1=$this->errno;
 		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
@@ -349,7 +349,7 @@ class ExtraFields
 		$table=$elementtype.'_extrafields';
 
 		$error=0;
-		
+
 		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
 		{
 			$result=$this->delete_label($attrname,$elementtype);
@@ -381,7 +381,7 @@ class ExtraFields
                     }
                 }
 			}
-			
+
 			return $result;
 		}
 		else
@@ -736,7 +736,7 @@ class ExtraFields
 		$hidden=$this->attribute_hidden[$key];
 
 		if ($computed) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-		
+
 		if (empty($showsize))
 		{
     		if ($type == 'date')
@@ -772,14 +772,14 @@ class ExtraFields
     			{
     			    $showsize = 'minwidth200imp';
     			}
-    			else 
+    			else
     			{
     			    //$showsize=48;
     			    $showsize = 'minwidth400imp';
     			}
     		}
 		}
-        
+
 		if (in_array($type,array('date','datetime')))
 		{
 			$tmp=explode(',',$size);
@@ -1029,7 +1029,7 @@ class ExtraFields
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 			$form = new Form($db);
-			
+
 			$value_arr=explode(',',$value);
 			$out=$form->multiselectarray($keysuffix.'options_'.$key.$keyprefix, $param['options'], $value_arr, '', 0, '', 0, '100%');
 
@@ -1124,9 +1124,9 @@ class ExtraFields
 				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
-					
+
 					$data=array();
-					
+
 					while ( $i < $num ) {
 						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
@@ -1152,9 +1152,9 @@ class ExtraFields
 									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
 								}
 							}
-							
+
 							$data[$obj->rowid]=$labeltoshow;
-							
+
 						} else {
 							if (! $notrans) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
@@ -1177,16 +1177,16 @@ class ExtraFields
 
 							$data[$obj->rowid]=$labeltoshow;
 						}
-						
+
 						$i ++;
 					}
 					$this->db->free($resql);
-					
+
 					require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 					$form = new Form($db);
-					
+
 					$out=$form->multiselectarray($keysuffix.'options_'.$key.$keyprefix, $data, $value_arr, '', 0, '', 0, '100%');
-					
+
 				} else {
 					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
 				}
@@ -1205,11 +1205,11 @@ class ExtraFields
 			if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
 			{
 			    $valuetoshow=$value;
-                if (!empty($value)) 
+                if (!empty($value))
                 {
                     $object = new $InfoFieldList[0]($this->db);
                     $resfetch=$object->fetch($value);
-                    if ($resfetch > 0) 
+                    if ($resfetch > 0)
                     {
                         $valuetoshow=$object->ref;
                         if ($object->element == 'societe') $valuetoshow=$object->name;  // Special case for thirdparty because ->ref is not name but id (because name is not unique)
@@ -1269,7 +1269,7 @@ class ExtraFields
 		    //var_dump($computed);
 		    $value = dol_eval($computed, 1, 0);
 		}
-		
+
 		$showsize=0;
 		if ($type == 'date')
 		{
@@ -1477,7 +1477,7 @@ class ExtraFields
 					}
 				}
 				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-				
+
 			} else {
 				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
 			}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index fe292db145d..b04aaf40a31 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -390,7 +390,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 5 ? round($object->id / 2, 2) : ($object->id + 2*$user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'<br><br>Other example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? round($reloadedobj->capital / 5) : '-1'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->array_options['options_extrafieldkey'] + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? round($reloadedobj->capital / 5) : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...

From 1820649175451d34a84f29ad1ea6c5e29aed161f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jun 2017 16:44:04 +0200
Subject: [PATCH 1035/1163] Maxi debug of v6

---
 htdocs/accountancy/index.php                  |  24 +-
 htdocs/adherents/card.php                     | 111 ++++----
 htdocs/adherents/subscription.php             |  28 +-
 htdocs/adherents/type.php                     |  14 +-
 htdocs/admin/dict.php                         |  54 ++--
 htdocs/categories/edit.php                    |   1 +
 htdocs/categories/viewcat.php                 |  23 +-
 htdocs/comm/action/card.php                   |  82 ++----
 htdocs/comm/card.php                          |  75 +++--
 htdocs/comm/mailing/advtargetemailing.php     |  11 +-
 htdocs/comm/mailing/card.php                  |  69 +++--
 htdocs/comm/propal/card.php                   | 127 +++------
 htdocs/commande/card.php                      |  86 +++---
 htdocs/commande/orderstoinvoice.php           |  31 +--
 htdocs/compta/bank/card.php                   | 101 +++----
 htdocs/compta/bank/various_payment/card.php   |  16 +-
 htdocs/compta/deplacement/card.php            |  24 +-
 htdocs/compta/facture/card.php                | 133 +++++----
 htdocs/compta/localtax/card.php               |  22 +-
 htdocs/compta/prelevement/bons.php            |  31 +--
 htdocs/compta/prelevement/create.php          |  10 +-
 htdocs/compta/prelevement/index.php           |   6 +-
 htdocs/compta/prelevement/list.php            |  36 +--
 htdocs/compta/salaries/card.php               |  26 +-
 htdocs/compta/tva/card.php                    |  15 +-
 htdocs/contact/card.php                       |  56 ++--
 htdocs/contrat/card.php                       | 258 +++++++++---------
 htdocs/core/class/commonobject.class.php      | 234 ++++++++--------
 htdocs/core/class/extrafields.class.php       |  38 ++-
 htdocs/core/tpl/extrafields_view.tpl.php      |  90 ++++--
 htdocs/don/card.php                           |  38 +--
 htdocs/expedition/card.php                    | 224 +++++++--------
 htdocs/fourn/card.php                         |  71 +++--
 htdocs/fourn/commande/card.php                |  43 ++-
 htdocs/fourn/commande/orderstoinvoice.php     |  27 +-
 htdocs/fourn/facture/card.php                 |  38 +--
 htdocs/fourn/product/list.php                 | 132 ++++++---
 htdocs/langs/en_US/admin.lang                 |   2 +-
 htdocs/langs/en_US/main.lang                  |   2 +-
 htdocs/langs/en_US/withdrawals.lang           |   2 +-
 .../template/class/myobject.class.php         |  49 ++--
 .../core/modules/modMyModule.class.php        |  39 ++-
 .../modulebuilder/template/myobject_card.php  |  75 +++--
 .../modulebuilder/template/myobject_list.php  | 123 ++++-----
 htdocs/product/card.php                       |  82 +++---
 htdocs/product/document.php                   |  23 +-
 htdocs/product/stock/product.php              |  92 +++----
 htdocs/projet/class/project.class.php         |  52 ++--
 htdocs/projet/class/task.class.php            |   3 +
 htdocs/projet/tasks/task.php                  |  11 +-
 htdocs/resource/add.php                       |   2 +-
 htdocs/resource/card.php                      |  35 +--
 htdocs/societe/card.php                       |  80 +++---
 htdocs/societe/class/societe.class.php        |  49 ++--
 htdocs/societe/commerciaux.php                |  19 +-
 htdocs/societe/consumption.php                |  27 +-
 htdocs/supplier_proposal/card.php             |  96 +++----
 htdocs/theme/eldy/style.css.php               |   4 +-
 htdocs/theme/md/style.css.php                 |   2 +-
 htdocs/user/card.php                          | 147 +++++-----
 htdocs/user/group/card.php                    |  30 +-
 61 files changed, 1705 insertions(+), 1746 deletions(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index c7caa5daac3..02549be2a94 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -45,10 +45,13 @@ $langs->load("compta");
 $langs->load("banks");
 $langs->load("loans");
 
+
 /*
  * Actions
  */
 
+// None
+
 
 /*
  * View
@@ -73,35 +76,31 @@ print "<br>\n";
 $step++;
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("AccountingJournals").'</strong>');
 print "<br>\n";
-print "<br>\n";
 $step++;
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Pcg_version").'</strong>');
 print "<br>\n";
-print "<br>\n";
 $step++;
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Chartofaccounts").'</strong>');
 print "<br>\n";
-print "<br>\n";
 
+print "<br>\n";
 print $langs->trans("AccountancyAreaDescActionOnceBis");
 print "<br>\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescMisc", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>')."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescMisc", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>')."\n";
 print "<br>\n";
 $step++;
 $textlink = '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuVatAccounts").'</strong>';
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, $textlink);
 print "<br>\n";
-print "<br>\n";
 if (! empty($conf->tax->enabled))
 {
     $textlink = '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong>';
     $step++;
     print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);
     print "<br>\n";
-    print "<br>\n";
 }
 /*if (! empty($conf->salaries->enabled))
 {
@@ -116,7 +115,6 @@ if (! empty($conf->expensereport->enabled))  // TODO Move this in the default ac
     $step++;
     print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong>');
     print "<br>\n";
-    print "<br>\n";
 }
 /*
 if (! empty($conf->loan->enabled))
@@ -124,26 +122,22 @@ if (! empty($conf->loan->enabled))
     $step++;
     print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescLoan", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuSpecialExpenses").'-'.$langs->transnoentitiesnoconv("Loans").'</strong> '.$langs->transnoentitiesnoconv("or").' <strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
     print "<br>\n";
-    print "<br>\n";
 }
 if (! empty($conf->don->enabled))
 {
     $step++;
     print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDonation", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDonationAccounts").'</strong>');
     print "<br>\n";
-    print "<br>\n";
 }*/
 
 $step++;
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("ProductsBinding").'</strong>');
 print "<br>\n";
-print "<br>\n";
 
 $step++;
 $textlink='<strong>'.$langs->transnoentitiesnoconv("MenuBankCash").'</strong>';
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, $textlink);
 print "<br>\n";
-print "<br>\n";
 
 
 print "<br>\n";
@@ -155,19 +149,19 @@ $step = 0;
 $langs->loadLangs(array('bills', 'trips'));
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsCustomers"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'</strong>')."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsCustomers"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'</strong>')."\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong>')."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong>')."\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("ExpenseReports"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>')."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("ExpenseReports"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>')."\n";
 print "<br>\n";
 
 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64+$step), $langs->transnoentitiesnoconv("Journalization"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64+$step), $langs->transnoentitiesnoconv("Journalization"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";
 print "<br>\n";
 
 $step++;
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 1234f75e059..81aa2c7c6ad 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -96,7 +96,7 @@ if ($id > 0)
 	// Define variables to know what current user can do on properties of user linked to edited member
 	if ($object->user_id)
 	{
-		// $ User is the user who edits, $ object->user_id is the id of the related user in the edited member  
+		// $ User is the user who edits, $ object->user_id is the id of the related user in the edited member
 		$caneditfielduser=((($user->id == $object->user_id) && $user->rights->user->self->creer)
 				|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
 		$caneditpassworduser=((($user->id == $object->user_id) && $user->rights->user->self->password)
@@ -213,7 +213,7 @@ if (empty($reshook))
 	{
 		if ($result > 0)
 		{
-			// User creation 
+			// User creation
 			$company = new Societe($db);
 			$result=$company->create_from_member($object,GETPOST('companyname'));
 
@@ -714,7 +714,7 @@ if (empty($reshook))
 			}
 		}
 	}
-	
+
 	// Actions to build doc
 	$upload_dir = $conf->adherent->dir_output;
 	$permissioncreate=$user->rights->adherent->creer;
@@ -834,7 +834,7 @@ else
 			print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">';
 			print '</td></tr>';
 		}
-		
+
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("MemberType").'</td><td>';
 		$listetype=$adht->liste_array();
@@ -948,20 +948,6 @@ else
 			print $object->showOptionals($extrafields,'edit');
 		}
 
-		/*
-		 // Third party Dolibarr
-		if (! empty($conf->societe->enabled))
-		{
-		print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td class="valeur">';
-		print $form->select_company($object->fk_soc,'socid','',1);
-		print '</td></tr>';
-		}
-
-		// Login Dolibarr
-		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td class="valeur">';
-		print $form->select_dolusers($object->user_id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-		print '</td></tr>';
-		*/
         print '<tbody>';
 		print "</table>\n";
 
@@ -1061,12 +1047,12 @@ else
 		print '<table class="border" width="100%">';
 
 		// Ref
-		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur" colspan="2">'.$object->id.'</td></tr>';
+		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur">'.$object->id.'</td></tr>';
 
 		// Login
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 		{
-			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td colspan="2"><input type="text" name="login" class="maxwidth200" value="'.(isset($_POST["login"])?GETPOST("login",'alpha',2):$object->login).'"></td></tr>';
+			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="login" class="maxwidth200" value="'.(isset($_POST["login"])?GETPOST("login",'alpha',2):$object->login).'"></td></tr>';
 		}
 
 	// Password
@@ -1095,7 +1081,7 @@ else
 		print "</td></tr>";
 
 		// Company
-		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(isset($_POST["societe"])?GETPOST("societe",'',2):$object->societe).'"></td></tr>';
+		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="minwidth100" value="'.(isset($_POST["societe"])?GETPOST("societe",'',2):$object->societe).'"></td></tr>';
 
 		// Civility
 		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
@@ -1104,11 +1090,11 @@ else
 		print '</tr>';
 
 		// Lastname
-		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" size="40" value="'.(isset($_POST["lastname"])?GETPOST("lastname",'',2):$object->lastname).'"></td>';
+		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" class="minwidth100" value="'.(isset($_POST["lastname"])?GETPOST("lastname",'',2):$object->lastname).'"></td>';
 		print '</tr>';
 
 		// Firstname
-		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(isset($_POST["firstname"])?GETPOST("firstname",'',3):$object->firstname).'"></td>';
+		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" class="minwidth100" value="'.(isset($_POST["firstname"])?GETPOST("firstname",'',3):$object->firstname).'"></td>';
 		print '</tr>';
 
 		// Photo
@@ -1131,7 +1117,7 @@ else
 
 		// Address
 		print '<tr><td>'.$langs->trans("Address").'</td><td>';
-		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(isset($_POST["address"])?GETPOST("address",'',2):$object->address).'</textarea>';
+		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_2.'">'.(isset($_POST["address"])?GETPOST("address",'',2):$object->address).'</textarea>';
 		print '</td></tr>';
 
 		// Zip / Town
@@ -1143,7 +1129,7 @@ else
 
 		// Country
 		//$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;    // In edit mode we don't force to company country if not defined
-		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
+		print '<tr><td>'.$langs->trans('Country').'</td><td>';
 		print $form->select_country(isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'country_id');
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 		print '</td></tr>';
@@ -1168,7 +1154,7 @@ else
 	    // Skype
 	    if (! empty($conf->skype->enabled))
 	    {
-			    print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="skype" size="40" value="'.(isset($_POST["skype"])?GETPOST("skype"):$object->skype).'"></td></tr>';
+			    print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="skype" class="minwidth100" value="'.(isset($_POST["skype"])?GETPOST("skype"):$object->skype).'"></td></tr>';
 	    }
 
 		// Birthday
@@ -1185,7 +1171,7 @@ else
 		if (! empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire ))
 		{
 			print '<tr><td>' . fieldLabel('Categories', 'memcats') . '</td>';
-			print '<td colspan="2">';
+			print '<td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
 			$c = new Categorie($db);
 			$cats = $c->containing($object->id, Categorie::TYPE_MEMBER);
@@ -1197,7 +1183,7 @@ else
 		}
 
 		// Other attributes
-		$parameters=array("colspan"=>2);
+		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
@@ -1416,12 +1402,12 @@ else
 		if (! empty($conf->societe->enabled)) $rowspan++;
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
-		
+
 		dol_banner_tab($object, 'rowid', $linkback);
-        
+
         print '<div class="fichecenter">';
         print '<div class="fichehalfleft">';
-        
+
         print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent">';
 
@@ -1463,15 +1449,15 @@ else
 			}
 			print '</td></tr>';
 		}
-		
+
         print '</table>';
-        
+
         print '</div>';
         print '<div class="fichehalfright"><div class="ficheaddleft">';
-       
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
-		
+
 		// Birthday
 		print '<tr><td class="titlefield">'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';
 
@@ -1487,13 +1473,8 @@ else
 			print '</td></tr>';
 		}
 
-		// Other attributes
-		$parameters=array('colspan'=>2);
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields, 'view', $parameters);
-		}
+    	// Other attributes
+    	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
         // Date end subscription
         print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
@@ -1518,7 +1499,7 @@ else
 	        }
         }
         print '</td></tr>';
-		
+
 		// Third party Dolibarr
 		if (! empty($conf->societe->enabled))
 		{
@@ -1595,12 +1576,12 @@ else
         print '<div style="clear:both"></div>';
 
         dol_fiche_end();
-        
-        
+
+
 		/*
 		 * Hotbar
 		 */
-        
+
 		print '<div class="tabsAction">';
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
@@ -1616,7 +1597,7 @@ else
 				{
 					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>';
 				}
-	
+
 				// Validate
 				if ($object->statut == -1)
 				{
@@ -1629,7 +1610,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>';
 					}
 				}
-	
+
 				// Reactivate
 				if ($object->statut == 0)
 				{
@@ -1642,7 +1623,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable")."</font></div>";
 					}
 				}
-	
+
 				// Send card by email
 				if ($user->rights->adherent->creer)
 				{
@@ -1660,7 +1641,7 @@ else
 				{
 					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</font></div>";
 				}
-	
+
 				// Terminate
 				if ($object->statut >= 1)
 				{
@@ -1673,7 +1654,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate")."</font></div>";
 					}
 				}
-	
+
 				// Create third party
 				if (! empty($conf->societe->enabled) && ! $object->fk_soc)
 				{
@@ -1687,7 +1668,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrThirdParty")."</font></div>";
 					}
 				}
-	
+
 				// Create user
 				if (! $user->societe_id && ! $object->user_id)
 				{
@@ -1701,7 +1682,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
 					}
 				}
-	
+
 				// Delete
 				if ($user->rights->adherent->supprimer)
 				{
@@ -1711,12 +1692,12 @@ else
 				{
 					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
 				}
-	
+
 				// Action SPIP
 				if (! empty($conf->mailmanspip->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))
 				{
 					$isinspip = $mailmanspip->is_in_spip($object);
-	
+
 					if ($isinspip == 1)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip")."</a></div>\n";
@@ -1726,7 +1707,7 @@ else
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
 					}
 				}
-	
+
 			}
 		}
 		print '</div>';
@@ -1736,11 +1717,11 @@ else
 			print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
 		}
 
-		
-		
+
+
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
-		
+
 		// Documents generes
 		$filename = dol_sanitizeFileName($object->ref);
 		//$filename =  'tmp_cards.php';
@@ -1752,15 +1733,15 @@ else
 
 		print $formfile->showdocuments('member', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $object->default_lang, '', $object);
 		$somethingshown = $formfile->numoffiles;
-		
+
 		// Show links to link elements
 		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription'));
 		//$somethingshown = $form->showLinkedObjectBlock($object, '');
-		
+
 		// Show links to link elements
 		/*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
 		 if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
-		
+
 		 // Link for paypal payment
 		 /*
 		 if (! empty($conf->paypal->enabled) && $object->statut != 0) {
@@ -1769,15 +1750,15 @@ else
 		 }
 		 */
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-		
+
 		// List of actions on element
         /* Already in tab Agenda/Events
         include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
 		$somethingshown = $formactions->showactions($object, 'member', $socid);
 		*/
-		print '</div></div></div>';		
-		
+		print '</div></div></div>';
+
 	}
 }
 
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 1874a0b37a7..21de6e305b5 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -389,7 +389,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 	                {
 	                    $invoice->linked_objects = array_merge($invoice->linked_objects, $_POST['other_linked_objects']);
 	                }
-	                 
+
 	                $result=$invoice->create($user);
 	                if ($result <= 0)
 	                {
@@ -581,12 +581,12 @@ if ($rowid > 0)
     dol_fiche_head($head, 'subscription', $langs->trans("Member"), -1, 'user');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
-    
+
     dol_banner_tab($object, 'rowid', $linkback);
-    
+
     print '<div class="fichecenter">';
     print '<div class="fichehalfleft">';
-    
+
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border" width="100%">';
 
@@ -624,13 +624,13 @@ if ($rowid > 0)
 	}
 
     print '</table>';
-    
+
     print '</div>';
     print '<div class="fichehalfright"><div class="ficheaddleft">';
-   
+
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border tableforfield" width="100%">';
-	
+
 	// Birthday
 	print '<tr><td class="titlefield">'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';
 
@@ -646,13 +646,9 @@ if ($rowid > 0)
 		print '</td></tr>';
 	}
 
-	// Other attributes
-	$parameters=array('colspan'=>2);
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
-	{
-		print $object->showOptionals($extrafields, 'view', $parameters);
-	}
+    // Other attributes
+    $cols=2;
+    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	// Date end subscription
 	print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
@@ -677,7 +673,7 @@ if ($rowid > 0)
 	    }
 	}
 	print '</td></tr>';
-	
+
 	// Third party Dolibarr
 	if (! empty($conf->societe->enabled))
 	{
@@ -752,7 +748,7 @@ if ($rowid > 0)
 
 	print "</div></div></div>\n";
     print '<div style="clear:both"></div>';
-    
+
     dol_fiche_end();
 
     print '</form>';
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 20adc36dec5..4935b6c4c6d 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -336,14 +336,8 @@ if ($rowid > 0)
 		print '<tr><td class="tdtop">'.$langs->trans("WelcomeEMail").'</td><td>';
 		print nl2br($object->mail_valid)."</td></tr>";
 
-		// Other attributes
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			// View extrafields
-			print $object->showOptionals($extrafields);
-		}
+    	// Other attributes
+    	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
         print '</div>';
@@ -674,6 +668,10 @@ if ($rowid > 0)
 		// Other attributes
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+		    print $object->showOptionals($extrafields,'edit');
+		}
 
 		print '</table>';
 
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 913fcf75de6..22e7bf7087f 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -569,8 +569,8 @@ if ($id == 10)
 
 if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
 {
-    $search_country_id = '';    
-    $search_code = '';    
+    $search_country_id = '';
+    $search_code = '';
 }
 
 // Actions add or modify an entry into a dictionary
@@ -660,11 +660,11 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"]='';	// If empty, we force to null
 	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"]='';	// If empty, we force to null
 	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"]='';	// If empty, we force to null
-    if ($id == 10 && isset($_POST["code"]))  // Spaces are not allowed into code 
+    if ($id == 10 && isset($_POST["code"]))  // Spaces are not allowed into code
     {
         $_POST["code"]=preg_replace('/\s/','',$_POST["code"]);
     }
-    
+
     // Si verif ok et action add, on ajoute la ligne
     if ($ok && GETPOST('actionadd'))
     {
@@ -945,7 +945,7 @@ if ($id)
     if (! preg_match('/ WHERE /',$sql)) $sql.= " WHERE 1 = 1";
     if ($search_country_id > 0) $sql.= " AND c.rowid = ".$search_country_id;
     if ($search_code != '')     $sql.= natural_search("code", $search_code);
-    
+
     if ($sortfield)
     {
         // If sort order is "country", we use country_code instead
@@ -972,16 +972,16 @@ if ($id)
     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
-    
+
     // Form to add a new line
     if ($tabname[$id])
     {
         $alabelisused=0;
-        
+
         $fieldlist=explode(',',$tabfield[$id]);
 
         print '<table class="noborder" width="100%">';
-        
+
         // Line for title
         print '<tr class="liste_titre">';
         foreach ($fieldlist as $field => $value)
@@ -1012,9 +1012,9 @@ if ($id)
             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
             {
             	if ($id != 25) $valuetoshow=$form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
-            	else $valuetoshow=$langs->trans("Label"); 
+            	else $valuetoshow=$langs->trans("Label");
             }
-            if ($fieldlist[$field]=='libelle_facture') { 
+            if ($fieldlist[$field]=='libelle_facture') {
                 $valuetoshow=$form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
             }
             if ($fieldlist[$field]=='country')         {
@@ -1055,7 +1055,7 @@ if ($id)
 			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("WithCounter"); }
 			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
 			if ($fieldlist[$field]=='newbymonth')      { $valuetoshow=$langs->trans("NewByMonth"); }
-				
+
             if ($id == 2)	// Special cas for state page
             {
             	if ($fieldlist[$field]=='region_id') { $valuetoshow='&nbsp;'; $showfield=1; }
@@ -1120,7 +1120,7 @@ if ($id)
         if ($id == 4) $colspan++;
 
         print '</table>';
-        
+
         /*if (! empty($alabelisused) && $id != 25)  // If there is one label among fields, we show legend of *
         {
         	print '* '.$langs->trans("LabelUsedByDefault").'.<br>';
@@ -1130,11 +1130,11 @@ if ($id)
     print '</form>';
 
     print '<br>';
-    
+
     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
-    
+
     // List of available record in database
     dol_syslog("htdocs/admin/dict", LOG_DEBUG);
     $resql=$db->query($sql);
@@ -1150,29 +1150,29 @@ if ($id)
         }
 
         print '<table class="noborder" width="100%">';
-        
+
         // Title line with search boxes
         print '<tr class="liste_titre_filter">';
         $filterfound=0;
         foreach ($fieldlist as $field => $value)
         {
             $showfield=1;							  	// By defaut
-            
+
             if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
-            
+
             if ($showfield)
             {
                 if ($value == 'country')
                 {
                     print '<td class="liste_titre">';
-                    print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
+                    print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth150 maxwidthonsmartphone');
                     print '</td>';
                     $filterfound++;
                 }
                 elseif ($value == 'code')
                 {
                     print '<td class="liste_titre">';
-                    print '<input type="text" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
+                    print '<input type="text" class="maxwidth100" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
                     print '</td>';
                     $filterfound++;
                 }
@@ -1193,7 +1193,7 @@ if ($id)
     	}
     	print '</td>';
         print '</tr>';
-            
+
         // Title of lines
         print '<tr class="liste_titre">';
         foreach ($fieldlist as $field => $value)
@@ -1235,7 +1235,7 @@ if ($id)
                 //else $valuetoshow=$langs->trans("Label");
                 $valuetoshow=$langs->trans("Label");
             }
-            if ($fieldlist[$field]=='libelle_facture') { 
+            if ($fieldlist[$field]=='libelle_facture') {
                 //$valuetoshow=$form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"),2,1,img_help(1,''));
                 $valuetoshow=$langs->trans("LabelOnDocuments");
             }
@@ -1368,7 +1368,7 @@ if ($id)
                             if ($value == 'private')
                             {
                                 $valuetoshow = yn($elementList[$valuetoshow]);
-                            }				
+                            }
                             else if ($fieldlist[$field]=='libelle_facture') {
                                 $langs->load("bills");
                                 $key=$langs->trans("PaymentCondition".strtoupper($obj->code));
@@ -1516,7 +1516,7 @@ if ($id)
                     if ($obj->code == 'RECEP') $canbemodified=1;
                     if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm") $canbemodified=1;
 
-                    // Url 
+                    // Url
                     $rowidcol=$tabrowid[$id];
                     // If rowidcol not defined
                     if (empty($rowidcol) || in_array($id, array(6,7,8,13,17,19,27))) $rowidcol='rowid';
@@ -1565,7 +1565,7 @@ if ($id)
                 $i++;
             }
         }
-    
+
         print '</table>';
     }
     else {
@@ -1598,12 +1598,12 @@ else
         {
         	if ($showemptyline)
         	{
-        		
+
         		print '<tr class="oddeven"><td width="30%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
         		$showemptyline=0;
         	}
 
-            
+
             $value=$tabname[$i];
             print '<tr class="oddeven"><td width="50%">';
             if (! empty($tabcond[$i]))
@@ -1764,7 +1764,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 		    print '<td>';
 		    $transfound=0;
 	        // Special case for labels
-	        if ($tabname == MAIN_DB_PREFIX.'c_payment_term') 
+	        if ($tabname == MAIN_DB_PREFIX.'c_payment_term')
 	        {
 	            $langs->load("bills");
 	            $transkey="PaymentCondition".strtoupper($obj->code);
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 9981d09cda0..c2f93c17ccd 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -173,6 +173,7 @@ print '<tr><td>'.$langs->trans("In").'</td><td>';
 print $form->select_all_categories($type,$object->fk_parent,'parent',64,$object->id);
 print '</td></tr>';
 
+$parameters=array();
 $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 if (empty($reshook) && ! empty($extrafields->attribute_label))
 {
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 665b033936e..11aff01dc99 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -235,11 +235,8 @@ print $langs->trans("Color").'</td><td>';
 print $formother->showColor($object->color);
 print '</td></tr>';
 
-$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-if (empty($reshook) && ! empty($extrafields->attribute_label))
-{
-	print $object->showOptionals($extrafields);
-}
+// Other attributes
+include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 print '</table>';
 print '</div>';
@@ -290,7 +287,7 @@ else
 	if (count($cats) > 0)
 	{
 		foreach ($cats as $cat)
-		{			
+		{
 			print "\t".'<tr class="oddeven">'."\n";
 			print "\t\t".'<td class="nowrap">';
 			print "<a href='viewcat.php?id=".$cat->id."&amp;type=".$type."'>".$cat->label."</a>";
@@ -359,7 +356,7 @@ if ($object->type == Categorie::TYPE_PRODUCT)
 		if (count($prods) > 0)
 		{
 			foreach ($prods as $prod)
-			{				
+			{
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $prod->getNomUrl(1);
@@ -408,7 +405,7 @@ if ($object->type == Categorie::TYPE_SUPPLIER)
 		if (count($socs) > 0)
 		{
 			foreach ($socs as $soc)
-			{				
+			{
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $soc->getNomUrl(1);
@@ -462,7 +459,7 @@ if($object->type == Categorie::TYPE_CUSTOMER)
 				if ($user->societe_id > 0 && $soc->id != $user->societe_id)	continue; 	// External user always see only themself
 
 				$i++;
-				
+
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $soc->getNomUrl(1);
@@ -513,7 +510,7 @@ if ($object->type == Categorie::TYPE_MEMBER)
 		if (count($prods) > 0)
 		{
 			foreach ($prods as $key => $member)
-			{				
+			{
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				$member->ref=$member->login;
@@ -567,7 +564,7 @@ if($object->type == Categorie::TYPE_CONTACT)
 			foreach ($contacts as $key => $contact)
 			{
 				$i++;
-				
+
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $contact->getNomUrl(1,'category');
@@ -619,7 +616,7 @@ if ($object->type == Categorie::TYPE_ACCOUNT)
         if (count($accounts) > 0)
         {
             foreach ($accounts as $key => $account)
-            {              
+            {
                 print "\t".'<tr class="oddeven">'."\n";
                 print '<td class="nowrap" valign="top">';
                 print $account->getNomUrl(1,0);
@@ -672,7 +669,7 @@ if ($object->type == Categorie::TYPE_PROJECT)
 		if (count($projects) > 0)
 		{
 			foreach ($projects as $key => $project)
-			{				
+			{
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $project->getNomUrl(1,0);
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index eb2eddb3197..3a634cc21cd 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -121,7 +121,7 @@ if (GETPOST('removedassigned') || GETPOST('removedassigned') == '0')
 	$donotclearsession=1;
 	if ($action == 'add') $action = 'create';
 	if ($action == 'update') $action = 'edit';
-	
+
 	$listUserAssignedUpdated = true;
 }
 
@@ -734,7 +734,7 @@ if ($action == 'create')
 	print '<div class="assignedtouser">';
 	print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0');
 	print '</div>';
-	if (in_array($user->id,array_keys($listofuserid))) 
+	if (in_array($user->id,array_keys($listofuserid)))
 	{
 		print '<div class="myavailability">';
 		print $langs->trans("MyAvailability").': <input id="transparency" type="checkbox" name="transparency"'.(((! isset($_GET['transparency']) && ! isset($_POST['transparency'])) || GETPOST('transparency'))?' checked':'').'> '.$langs->trans("Busy");
@@ -752,8 +752,8 @@ if ($action == 'create')
 
 	print '</table>';
 	print '<br><br>';
-	
-	
+
+
 	print '<table class="border" width="100%">';
 
 	// Related company
@@ -830,12 +830,9 @@ if ($action == 'create')
     $doleditor->Create();
     print '</td></tr>';
 
-
     // Other attributes
-    $parameters=array('id'=>$object->id);
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		print $object->showOptionals($extrafields,'edit');
@@ -863,11 +860,11 @@ if ($id > 0)
 	$result3=$object->fetch_contact();
 	$result4=$object->fetch_userassigned();
 	$result5=$object->fetch_optionals($id,$extralabels);
-	
-	if ($listUserAssignedUpdated || $donotclearsession) 
+
+	if ($listUserAssignedUpdated || $donotclearsession)
 	{
         $percentage=in_array(GETPOST('status'),array(-1,100))?GETPOST('status'):(in_array(GETPOST('complete'),array(-1,100))?GETPOST('complete'):GETPOST("percentage"));	// If status is -1 or 100, percentage is not defined and we must use status
-	
+
 		$datep=dol_mktime($fulldayevent?'00':$aphour, $fulldayevent?'00':$apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
 		$datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
 
@@ -884,7 +881,7 @@ if ($id > 0)
 		//$object->societe->id = $_POST["socid"];			// deprecated
 		//$object->contact->id = $_POST["contactid"];		// deprecated
 		$object->fk_project  = GETPOST("projectid",'int');
-		
+
 		$object->note = GETPOST("note");
 	}
 
@@ -1076,11 +1073,11 @@ if ($id > 0)
 				$listofuserid=json_decode($_SESSION['assignedtouser'], true);
 			}
 		}
-		
+
 		print '<div class="assignedtouser">';
 		print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0');
 		print '</div>';
-		if (in_array($user->id,array_keys($listofuserid))) 
+		if (in_array($user->id,array_keys($listofuserid)))
 		{
 			print '<div class="myavailability">';
 			print $langs->trans("MyAvailability").':  <input id="transparency" type="checkbox" name="transparency"'.($listofuserid[$user->id]['transparency']?' checked':'').'>'.$langs->trans("Busy");
@@ -1098,10 +1095,10 @@ if ($id > 0)
 
 		print '</table>';
 
-		
+
 		print '<br><br>';
 
-		
+
 		print '<table class="border" width="100%">';
 
 		if ($conf->societe->enabled)
@@ -1165,7 +1162,7 @@ if ($id > 0)
         print '</td></tr>';
 
         // Other attributes
-        $parameters=array('id'=>$object->id);
+        $parameters=array();
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
@@ -1212,8 +1209,8 @@ if ($id > 0)
 		$out.=img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"');
 		$out.='<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep,'%Y').'&month='.dol_print_date($object->datep,'%m').'&day='.dol_print_date($object->datep,'%d').'">'.$langs->trans("ViewDay").'</a>';
 		$linkback.=$out;
-		
-		
+
+
 		$morehtmlref='<div class="refidno">';
 		// Thirdparty
 		//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
@@ -1253,14 +1250,14 @@ if ($id > 0)
 		    }
 		}
 		$morehtmlref.='</div>';
-		
-		
+
+
 		dol_banner_tab($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', $morehtmlref);
-		
+
 	    print '<div class="fichecenter">';
-	
+
 		print '<div class="underbanner clearboth"></div>';
-		
+
 		// Affichage fiche action en mode visu
 		print '<table class="border" width="100%">';
 
@@ -1324,7 +1321,7 @@ if ($id > 0)
 		print '<div class="assignedtouser">';
 		print $form->select_dolusers_forevent('view', 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 		print '</div>';
-		if ($object->datep != $object->datef && in_array($user->id,array_keys($listofuserid))) 
+		if ($object->datep != $object->datef && in_array($user->id,array_keys($listofuserid)))
 		{
 			print '<div class="myavailability">';
 			print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available"));	// We show nothing if event is assigned to nobody
@@ -1364,7 +1361,7 @@ if ($id > 0)
 				}
 			}
 			print '</td></tr>';
-			
+
 			// Related contact
 			print '<tr><td>'.$langs->trans("ActionOnContact").'</td>';
 			print '<td colspan="3">';
@@ -1385,7 +1382,7 @@ if ($id > 0)
 			}
 			print '</td></tr>';
 		}
-		
+
 		// Priority
 		print '<tr><td class="nowrap" class="titlefield">'.$langs->trans("Priority").'</td><td colspan="3">';
 		print ($object->priority?$object->priority:'');
@@ -1409,38 +1406,13 @@ if ($id > 0)
 		print '</td></tr>';
 
         // Other attributes
-		$parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$object->id);
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        $cols=3;
+        include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
 
-		//Extra field
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print '<br><br>';
-		    print '<div class="underbanner clearboth"></div>';
-			print '<table class="border" width="100%">';
-			foreach($extrafields->attribute_label as $key=>$label)
-			{
-				if (isset($_POST["options_" . $key])) {
-					if (is_array($_POST["options_" . $key])) {
-						// $_POST["options"] is an array but following code expects a comma separated string
-						$value = implode(",", $_POST["options_" . $key]);
-					} else {
-						$value = $_POST["options_" . $key];
-					}
-				} else {
-					$value = $object->array_options["options_" . $key];
-				}
-				print '<tr><td class="titlefield">'.$label.'</td><td>';
-				print $extrafields->showOutputField($key,$value);
-				print "</td></tr>\n";
-			}
-			print '</table>';
-		}
-
 		print '</div>';
-		
+
 		dol_fiche_end();
 	}
 
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 5b08519b9b8..bee23ad4ded 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -131,7 +131,7 @@ if (empty($reshook))
 		$result=$object->setBankAccount(GETPOST('fk_account','int'));
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
-	
+
 	// customer preferred shipping method
     if ($action == 'setshippingmethod' && $user->rights->societe->creer)
     {
@@ -207,9 +207,9 @@ if ($id > 0)
 	dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), -1, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-	
+
     dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-        
+
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
     print '<div class="underbanner clearboth"></div>';
@@ -376,11 +376,11 @@ if ($id > 0)
 	    $limit_field_type = (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
 	    print $form->editfieldval("OutstandingBill",'outstanding_limit',$object->outstanding_limit,$object,$user->rights->societe->creer,$limit_field_type,($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
 	    //if (empty($object->outstanding_limit)) print $langs->trans("NoLimit");
-	
+
 	    print '</td>';
 	    print '</tr>';
 	}
-	
+
 	// Multiprice level
 	if (! empty($conf->global->PRODUIT_MULTIPRICES))
 	{
@@ -432,13 +432,8 @@ if ($id > 0)
 	}
 
 	// Other attributes
-	$parameters=array('socid'=>$object->id, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
-	{
-		print $object->showOptionals($extrafields);
-	}
+	$parameters=array('socid'=>$object->id);
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
     // Sales representative
 	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
@@ -471,10 +466,10 @@ if ($id > 0)
 	if ($object->client == 2 || $object->client == 3)
 	{
     	print '<br>';
-    
+
     	print '<div class="underbanner clearboth"></div>';
     	print '<table class="border" width="100%">';
-	
+
 	    // Level of prospect
 	    print '<tr><td class="titlefield nowrap">';
 	    print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
@@ -508,12 +503,12 @@ if ($id > 0)
         print '</div></td></tr>';
 	   print "</table>";
 	}
-	
+
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 
 	$boxstat = '';
-	
+
 	// Nbre max d'elements des petites listes
 	$MAXLIST=$conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
@@ -521,7 +516,7 @@ if ($id > 0)
 	$boxstat.='<div class="box">';
 	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom" width="100%">';
 	$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
-	
+
 	if ($conf->propal->enabled)
 	{
     	// Box proposals
@@ -557,14 +552,14 @@ if ($id > 0)
 	    $boxstat.='</div>';
 	    if ($link) $boxstat.='</a>';
 	}
-	
+
 	if ($conf->facture->enabled)
 	{
     	$tmp = $object->getOutstandingBills();
     	$outstandingOpened=$tmp['opened'];
     	$outstandingTotal=$tmp['total_ht'];
     	$outstandingTotalIncTax=$tmp['total_ttc'];
-	    
+
     	$text=$langs->trans("OverAllInvoices");
     	$link='';
     	$icon='bill';
@@ -574,7 +569,7 @@ if ($id > 0)
     	$boxstat.='<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
     	$boxstat.='</div>';
     	if ($link) $boxstat.='</a>';
-    	
+
     	// Box outstanding bill
     	$warn = '';
     	if ($object->outstanding_limit != '' && $object->outstanding_limit < $outstandingOpened)
@@ -591,13 +586,13 @@ if ($id > 0)
     	$boxstat.='</div>';
     	if ($link) $boxstat.='</a>';
 	}
-	
+
 	$boxstat.='</td></tr>';
 	$boxstat.='</table>';
 	$boxstat.='</div>';
-	
+
     print $boxstat;
-    
+
 	$now=dol_now();
 
 	/*
@@ -639,7 +634,7 @@ if ($id > 0)
 			while ($i < $num && $i < $MAXLIST)
 			{
 				$objp = $db->fetch_object($resql);
-				
+
 				print '<tr class="oddeven">';
                 print '<td class="nowrap">';
                 $propal_static->id = $objp->propalid;
@@ -723,7 +718,7 @@ if ($id > 0)
 			while ($i < $num && $i < $MAXLIST)
 			{
 				$objp = $db->fetch_object($resql);
-				
+
 				print '<tr class="oddeven">';
                 print '<td class="nowrap">';
                 $commande_static->id = $objp->cid;
@@ -849,7 +844,7 @@ if ($id > 0)
 				$contrat=new Contrat($db);
 
 				$objp = $db->fetch_object($resql);
-				
+
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 				$contrat->id=$objp->id;
@@ -905,7 +900,7 @@ if ($id > 0)
 				print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/fichinter/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
 				print '</tr></table></td>';
 				print '</tr>';
-				
+
 			}
 			$i = 0;
 			while ($i < $num && $i < $MAXLIST)
@@ -921,7 +916,7 @@ if ($id > 0)
 				print '<td align="right" style="min-width: 60px">'.convertSecondToTime($objp->duration).'</td>'."\n";
 				print '<td align="right" class="nowrap" style="min-width: 60px">'.$fichinter_static->getLibStatut(5).'</td>'."\n";
 				print '</tr>';
-				
+
 				$i++;
 			}
 			$db->free($resql);
@@ -977,7 +972,7 @@ if ($id > 0)
 			while ($i < $num && $i < $MAXLIST)
 			{
 				$objp = $db->fetch_object($resql);
-				
+
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 				$facturestatic->id = $objp->facid;
@@ -1006,7 +1001,7 @@ if ($id > 0)
     				print price($objp->total_ttc);
     				print '</td>';
 				}
-				
+
 				print '<td align="right" class="nowrap" style="min-width: 60px">'.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).'</td>';
 				print "</tr>\n";
 				$i++;
@@ -1042,31 +1037,31 @@ if ($id > 0)
         {
             print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
         }
-        
+
     	if (! empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status==1)
     	{
     		$langs->load("propal");
     		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a></div>';
     	}
-    
+
     	if (! empty($conf->commande->enabled) && $user->rights->commande->creer && $object->status==1)
     	{
     		$langs->load("orders");
     		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddOrder").'</a></div>';
     	}
-    
+
     	if ($user->rights->contrat->creer && $object->status==1)
     	{
     		$langs->load("contracts");
     		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddContract").'</a></div>';
     	}
-    
+
     	if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer && $object->status==1)
     	{
     		$langs->load("fichinter");
     		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddIntervention").'</a></div>';
     	}
-    
+
     	// Add invoice
     	if ($user->societe_id == 0)
     	{
@@ -1075,7 +1070,7 @@ if ($id > 0)
     			$langs->load("trips");
     			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddTrip").'</a></div>';
     		}
-    
+
     		if (! empty($conf->facture->enabled) && $object->status==1)
     		{
     			if (empty($user->rights->facture->creer))
@@ -1086,7 +1081,7 @@ if ($id > 0)
     			{
     				$langs->load("bills");
     				$langs->load("orders");
-    
+
     				if (! empty($conf->commande->enabled))
     				{
     				    if ($object->client != 0 && $object->client != 2)
@@ -1099,11 +1094,11 @@ if ($id > 0)
 
     				if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
     				else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-    
+
     			}
     		}
     	}
-    
+
     	// Add action
     	if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status==1)
     	{
@@ -1117,7 +1112,7 @@ if ($id > 0)
     		}
     	}
     }
-    
+
 	print '</div>';
 
 	if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 0a9cdca7abc..0262a50d65c 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -767,16 +767,15 @@ if ($object->fetch($id) >= 0) {
 		} else {
 			$std_soc = new Societe($db);
 			$action_search = 'query';
+
 			// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 			include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($db);
-			$hookmanager->initHooks(array (
-					'thirdpartycard'
-			));
+			$hookmanager->initHooks(array ('thirdpartycard'));
+
+			$parameters=array();
 			if (! empty($advTarget->id)) {
-				$parameters = array (
-						'array_query' => $advTarget->filtervalue
-				);
+				$parameters = array('array_query' => $advTarget->filtervalue);
 			}
 			// Module extrafield feature
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $std_soc, $action_search);
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 0b4c3c239f9..956710e2abc 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -231,10 +231,10 @@ if (empty($reshook))
 
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
-							
+
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
-							
+
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
 						}
@@ -700,11 +700,11 @@ if ($action == 'create')
 	}
 	$htmltext.='</i>';
 
-	
+
 	$availablelink=$form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'availvar');
 	//print '<a href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$objMod->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'</a>';
-	
-	
+
+
 	// Print mail form
 	print load_fiche_titre($langs->trans("NewMailing"), $availablelink, 'title_generic');
 
@@ -733,14 +733,14 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	print '</table>';
-	
+
 	print '<div style="padding-top: 10px">';
 	// Editeur wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor=new DolEditor('body',$_POST['body'],'',600,'dolibarr_mailings','',true,true,$conf->global->FCKEDITOR_ENABLE_MAILING,20,'90%');
 	$doleditor->Create();
 	print '</div>';
-	
+
 	dol_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("CreateMailing").'"></div>';
@@ -809,7 +809,7 @@ else
 				{
 				    if (! empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
 				    if (! empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
-				    
+
 					// The feature is forbidden from GUI, we show just message to use from command line.
 				    setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
 					setEventMessages('<textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
@@ -823,7 +823,7 @@ else
 				{
 				    if (! empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
 				    if (! empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
-				    
+
 				    $text='';
 				    if ($conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
                     {
@@ -841,12 +841,12 @@ else
 
 			$morehtmlright='';
 			if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
-			
+
 			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
 
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
-			
+
 			print '<table class="border" width="100%">';
 
 			// Description
@@ -863,7 +863,7 @@ else
 			print '<tr><td>'.$form->editfieldkey("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
 			print $form->editfieldval("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
 			print '</td></tr>';
-			
+
 			// Nb of distinct emails
 			print '<tr><td>';
 			print $langs->trans("TotalNbOfDistinctRecipients");
@@ -895,20 +895,15 @@ else
 			print '</td></tr>';
 
 			// Other attributes
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-			if (empty($reshook) && ! empty($extrafields->attribute_label))
-			{
-				print $object->showOptionals($extrafields);
-			}
+			include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 			print '</table>';
 
 			print "</div>";
-			
+
 			dol_fiche_end();
 
-			
+
 			// Clone confirmation
 			if ($action == 'clone')
 			{
@@ -1053,12 +1048,12 @@ else
 				$htmltext.=$key.' = '.$langs->trans($val).'<br>';
 			}
 			$htmltext.='</i>';
-			
+
 			// Print mail content
 			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
-			
+
 			dol_fiche_head('', '', '', -1);
-			
+
 			print '<table class="border" width="100%">';
 
 			// Subject
@@ -1086,9 +1081,9 @@ else
             /*print '<tr><td width="15%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
             print $htmlother->selectColor($object->bgcolor,'bgcolor','edit_mailing',0);
             print '</td></tr>';*/
-			
+
 			print '</table>';
-			
+
 		    // Message
 			print '<div style="padding-top: 10px" bgcolor="'.($object->bgcolor?(preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor:'white').'">';
 			if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff')
@@ -1103,23 +1098,23 @@ else
 			print '</div>';
 
 			dol_fiche_end();
-			
+
 		}
 		else
 		{
 			/*
 			 * Mailing en mode edition
 			 */
-			
+
 			dol_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
-			
+
 			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
 			$morehtmlright='';
 			if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
-			
+
 			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
-			
+
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 
@@ -1131,7 +1126,7 @@ else
 			print $form->showrefnav($object,'id', $linkback);
 			print '</td></tr>';
 			*/
-			
+
 			// Topic
 			print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
 			// From
@@ -1171,24 +1166,24 @@ else
 
 
 			print "<br>\n";
-			
+
 			print '<form name="edit_mailing" action="card.php" method="post" enctype="multipart/form-data">'."\n";
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="update">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
-			
+
 			$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
 			foreach($object->substitutionarray as $key => $val)
 			{
 				$htmltext.=$key.' = '.$langs->trans($val).'<br>';
 			}
 			$htmltext.='</i>';
-			
+
 			// Print mail content
 			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
 
 			dol_fiche_head();
-			
+
 			print '<table class="border" width="100%">';
 
 			// Subject
@@ -1237,9 +1232,9 @@ else
 			print '<tr><td>'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
 			print $htmlother->selectColor($object->bgcolor,'bgcolor','edit_mailing',0);
 			print '</td></tr>';
-			
+
 			print '</table>';
-			
+
 			// Message
 			print '<div style="padding-top: 10px">';
 			// Editeur wysiwyg
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index df86464281a..2dee7425e8c 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -499,7 +499,7 @@ if (empty($reshook))
 
 										$tva_tx = $lines[$i]->tva_tx;
 										if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
-										
+
 										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options, $lines[$i]->fk_unit);
 
 										if ($result > 0) {
@@ -755,7 +755,7 @@ if (empty($reshook))
 			$db->begin();
 
             // $tva_tx can be 'x.x (XXX)'
-            
+
 			// Ecrase $pu par celui du produit
 			// Ecrase $desc par celui du produit
 			// Ecrase $tva_tx par celui du produit
@@ -770,7 +770,7 @@ if (empty($reshook))
 				$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
 				if (empty($tva_tx)) $tva_npr=0;
-				
+
 				$pu_ht = $prod->price;
 				$pu_ttc = $prod->price_ttc;
 				$price_min = $prod->price_min;
@@ -811,7 +811,7 @@ if (empty($reshook))
 
 				$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-				
+
 				// if price ht is forced (ie: calculated by margin rate and cost price). TODO Why this ?
 				if (! empty($price_ht)) {
 					$pu_ht = price2num($price_ht, 'MU');
@@ -1170,27 +1170,12 @@ if (empty($reshook))
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
 		if ($ret < 0) $error++;
-
 		if (! $error)
 		{
-			// Actions on extra fields (by external module or standard code)
-			// TODO le hook fait double emploi avec le trigger !!
-			$hookmanager->initHooks(array('propaldao'));
-			$parameters = array('id' => $object->id);
-			$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been
-			                                                                                           // modified by
-			                                                                                           // some hooks
-			if (empty($reshook)) {
-				$result = $object->insertExtraFields();
-				if ($result < 0) {
-					$error ++;
-				}
-			} else if ($reshook < 0)
-				$error ++;
+			$result = $object->insertExtraFields();
+			if ($result < 0) $error++;
 		}
-
-		if ($error)
-			$action = 'edit_extras';
+		if ($error) $action = 'edit_extras';
 	}
 
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->propal->creer)
@@ -1325,7 +1310,7 @@ if ($action == 'create')
 			// Replicate extrafields
 			$objectsrc->fetch_optionals($originid);
 			$object->array_options = $objectsrc->array_options;
-			
+
 			if (!empty($conf->multicurrency->enabled))
 			{
 			    if (!empty($objectsrc->multicurrency_code)) $currency_code = $objectsrc->multicurrency_code;
@@ -1355,10 +1340,10 @@ if ($action == 'create')
 	print '<table class="border" width="100%">';
 
 	// Reference
-	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans("Draft") . '</td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td>' . $langs->trans("Draft") . '</td></tr>';
 
 	// Ref customer
-	print '<tr><td>' . $langs->trans('RefCustomer') . '</td><td colspan="2">';
+	print '<tr><td>' . $langs->trans('RefCustomer') . '</td><td>';
 	print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
 	print '</tr>';
 
@@ -1366,7 +1351,7 @@ if ($action == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">' . $langs->trans('Customer') . '</td>';
 	if ($socid > 0) {
-		print '<td colspan="2">';
+		print '<td>';
 		print $soc->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="' . $soc->id . '">';
 		print '</td>';
@@ -1374,7 +1359,7 @@ if ($action == 'create')
             $shipping_method_id = $soc->shipping_method_id;
         }
 	} else {
-		print '<td colspan="2">';
+		print '<td>';
 		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
@@ -1396,7 +1381,7 @@ if ($action == 'create')
 	// Contacts (ask contact only if thirdparty already defined). TODO do this also into order and invoice.
 	if ($socid > 0)
 	{
-		print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td colspan="2">';
+		print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td>';
 		$form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist);
 		print '</td></tr>';
 	}
@@ -1404,7 +1389,7 @@ if ($action == 'create')
 	if ($socid > 0)
 	{
 		// Ligne info remises tiers
-		print '<tr><td>' . $langs->trans('Discounts') . '</td><td colspan="2">';
+		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
 		if ($soc->remise_percent)
 			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
 		else
@@ -1420,26 +1405,26 @@ if ($action == 'create')
 	}
 
 	// Date
-	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
+	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td>';
 	$form->select_date('', '', '', '', '', "addprop", 1, 1);
 	print '</td></tr>';
 
 	// Validaty duration
-	print '<tr><td class="fieldrequired">' . $langs->trans("ValidityDuration") . '</td><td colspan="2"><input name="duree_validite" size="5" value="' . $conf->global->PROPALE_VALIDITY_DURATION . '"> ' . $langs->trans("days") . '</td></tr>';
+	print '<tr><td class="fieldrequired">' . $langs->trans("ValidityDuration") . '</td><td><input name="duree_validite" size="5" value="' . $conf->global->PROPALE_VALIDITY_DURATION . '"> ' . $langs->trans("days") . '</td></tr>';
 
 	// Terms of payment
-	print '<tr><td class="nowrap fieldrequired">' . $langs->trans('PaymentConditionsShort') . '</td><td colspan="2">';
+	print '<tr><td class="nowrap fieldrequired">' . $langs->trans('PaymentConditionsShort') . '</td><td>';
 	$form->select_conditions_paiements($soc->cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 
 	// Mode of payment
-	print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
+	print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td>';
 	$form->select_types_paiements($soc->mode_reglement_id, 'mode_reglement_id');
 	print '</td></tr>';
 
     // Bank Account
     if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && ! empty($conf->banque->enabled)) {
-        print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
+        print '<tr><td>' . $langs->trans('BankAccount') . '</td><td>';
         $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
         print '</td></tr>';
     }
@@ -1450,20 +1435,20 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Delivery delay
-	print '<tr class="fielddeliverydelay"><td>' . $langs->trans('AvailabilityPeriod') . '</td><td colspan="2">';
+	print '<tr class="fielddeliverydelay"><td>' . $langs->trans('AvailabilityPeriod') . '</td><td>';
 	$form->selectAvailabilityDelay('', 'availability_id', '', 1);
 	print '</td></tr>';
 
     // Shipping Method
     if (! empty($conf->expedition->enabled)) {
-        print '<tr><td>' . $langs->trans('SendingMethod') . '</td><td colspan="2">';
+        print '<tr><td>' . $langs->trans('SendingMethod') . '</td><td>';
         print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1);
         print '</td></tr>';
     }
 
 	// Delivery date (or manufacturing)
 	print '<tr><td>' . $langs->trans("DeliveryDate") . '</td>';
-	print '<td colspan="2">';
+	print '<td>';
 	if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "") {
 		$tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
 		$syear = date("Y", $tmpdte);
@@ -1483,7 +1468,7 @@ if ($action == 'create')
 
 		$langs->load("projects");
 		print '<tr>';
-		print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';
+		print '<td>' . $langs->trans("Project") . '</td><td>';
 		$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
 		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
 		print '</td>';
@@ -1495,7 +1480,7 @@ if ($action == 'create')
 	{
 		print '<tr>';
 		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $soc->libelle_incoterms, 1).'</label></td>';
-        print '<td colspan="3" class="maxwidthonsmartphone">';
+        print '<td class="maxwidthonsmartphone">';
         print $form->select_incoterms((!empty($soc->fk_incoterms) ? $soc->fk_incoterms : ''), (!empty($soc->location_incoterms)?$soc->location_incoterms:''));
 		print '</td></tr>';
 	}
@@ -1503,7 +1488,7 @@ if ($action == 'create')
 	// Template to use by default
 	print '<tr>';
 	print '<td>' . $langs->trans("DefaultModel") . '</td>';
-	print '<td colspan="2">';
+	print '<td>';
 	$liste = ModelePDFPropales::liste_modeles($db);
 	print $form->selectarray('model', $liste, ($conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : $conf->global->PROPALE_ADDON_PDF));
 	print "</td></tr>";
@@ -1513,7 +1498,7 @@ if ($action == 'create')
 	{
 		print '<tr>';
 		print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
-        print '<td colspan="3" class="maxwidthonsmartphone">';
+        print '<td class="maxwidthonsmartphone">';
 	    print $form->selectMultiCurrency($currency_code, 'multicurrency_code', 0);
 		print '</td></tr>';
 	}
@@ -1521,7 +1506,7 @@ if ($action == 'create')
 	// Public note
 	print '<tr>';
 	print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
-	print '<td valign="top" colspan="2">';
+	print '<td valign="top">';
 	$note_public = $object->getDefaultCreateValueFor('note_public', (is_object($objectsrc)?$objectsrc->note_public:null));
 	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
@@ -1531,7 +1516,7 @@ if ($action == 'create')
 	{
 		print '<tr>';
 		print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
-		print '<td valign="top" colspan="2">';
+		print '<td valign="top">';
         $note_private = $object->getDefaultCreateValueFor('note_private', ((! empty($origin) && ! empty($originid) && is_object($objectsrc))?$objectsrc->note_private:null));
 		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 		print $doleditor->Create(1);
@@ -1540,10 +1525,8 @@ if ($action == 'create')
 	}
 
 	// Other attributes
-	$parameters = array('colspan' => ' colspan="3"');
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified
-	                                                                                           // by
-	                                                                                           // hook
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
@@ -1578,19 +1561,19 @@ if ($action == 'create')
 		elseif ($newclassname == 'Fichinter')
 			$newclassname = 'Intervention';
 
-		print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2">' . $objectsrc->getNomUrl(1) . '</td></tr>';
-		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td colspan="2">' . price($objectsrc->total_ht, 0, $langs, 1, -1, -1, $conf->currency) . '</td></tr>';
-		print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td colspan="2">' . price($objectsrc->total_tva, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
+		print '<tr><td>' . $langs->trans($newclassname) . '</td><td>' . $objectsrc->getNomUrl(1) . '</td></tr>';
+		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td>' . price($objectsrc->total_ht, 0, $langs, 1, -1, -1, $conf->currency) . '</td></tr>';
+		print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td>' . price($objectsrc->total_tva, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
 		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0 ) 		// Localtax1
 		{
-			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax1, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
+			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax1, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
 		}
 
 		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2
 		{
-			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax2, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
+			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax2, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
 		}
-		print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td colspan="2">' . price($objectsrc->total_ttc, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
+		print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td>' . price($objectsrc->total_ttc, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
 	}
 
 	print "</table>\n";
@@ -2036,43 +2019,6 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
-	// Project
-	/*
-	if (! empty($conf->projet->enabled))
-	{
-		$langs->load("projects");
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Project') . '</td>';
-		if ($user->rights->propal->creer)
-		{
-			if ($action != 'classify')
-				print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a></td>';
-			print '</tr></table>';
-			print '</td><td colspan="5">';
-			if ($action == 'classify') {
-				$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1);
-			} else {
-				$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0);
-			}
-			print '</td></tr>';
-		} else {
-			print '</td></tr></table>';
-			if (! empty($object->fk_project)) {
-				print '<td colspan="3">';
-				$proj = new Project($db);
-				$proj->fetch($object->fk_project);
-				print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-				print $proj->ref;
-				print '</a>';
-				print '</td>';
-			} else {
-				print '<td colspan="3">&nbsp;</td>';
-			}
-		}
-		print '</tr>';
-	}*/
-
 	if ($soc->outstanding_limit)
 	{
 		// Outstanding Bill
@@ -2129,7 +2075,6 @@ if ($action == 'create')
 	}
 
 	// Other attributes
-	$cols = 2;
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index ebd8864568a..189d13c3ced 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -49,7 +49,7 @@ if (! empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 }
-    
+
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 
 if (!empty($conf->variants->enabled)) {
@@ -116,7 +116,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	if ($cancel) 
+	if ($cancel)
 	{
 		if ($action != 'addlink' && $action != 'updateline')
 		{
@@ -130,7 +130,7 @@ if (empty($reshook))
         }
 		$action='';
 	}
-	
+
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; 	// Must be include, not include_once
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
@@ -379,7 +379,7 @@ if (empty($reshook))
 
 								$tva_tx = $lines[$i]->tva_tx;
 								if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
-								
+
 								$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->fk_unit, $object->origin, $lines[$i]->rowid);
 
 								if ($result < 0) {
@@ -779,7 +779,7 @@ if (empty($reshook))
 
 				$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-				
+
 				// if price ht is forced (ie: calculated by margin rate and cost price). TODO Why this ?
 				if (! empty($price_ht)) {
 					$pu_ht = price2num($price_ht, 'MU');
@@ -1457,10 +1457,10 @@ if ($action == 'create' && $user->rights->commande->creer)
 	print '<table class="border" width="100%">';
 
 	// Reference
-	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans("Draft") . '</td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td>' . $langs->trans("Draft") . '</td></tr>';
 
 	// Reference client
-	print '<tr><td>' . $langs->trans('RefCustomer') . '</td><td colspan="2">';
+	print '<tr><td>' . $langs->trans('RefCustomer') . '</td><td>';
 	if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER) && ! empty($origin) && ! empty($originid))
 		print '<input type="text" name="ref_client" value="'.$ref_client.'"></td>';
 	else
@@ -1471,12 +1471,12 @@ if ($action == 'create' && $user->rights->commande->creer)
 	print '<tr>';
 	print '<td class="fieldrequired">' . $langs->trans('Customer') . '</td>';
 	if ($socid > 0) {
-		print '<td colspan="2">';
+		print '<td>';
 		print $soc->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="' . $soc->id . '">';
 		print '</td>';
 	} else {
-		print '<td colspan="2">';
+		print '<td>';
 		print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 'SelectThirdParty');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
@@ -1497,12 +1497,12 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 	// Contact of order
 	if ($socid > 0) {
-		print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td colspan="2">';
+		print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td>';
 		$form->select_contacts($soc->id, $setcontact, 'contactid', 1, $srccontactslist);
 		print '</td></tr>';
 
 		// Ligne info remises tiers
-		print '<tr><td>' . $langs->trans('Discounts') . '</td><td colspan="2">';
+		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
 		if ($soc->remise_percent)
 			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
 		else
@@ -1517,12 +1517,12 @@ if ($action == 'create' && $user->rights->commande->creer)
 		print '</td></tr>';
 	}
 	// Date
-	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
+	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td>';
 	$form->select_date('', 're', '', '', '', "crea_commande", 1, 1);			// Always autofill date with current date
 	print '</td></tr>';
 
 	// Delivery date planed
-	print "<tr><td>".$langs->trans("DateDeliveryPlanned").'</td><td colspan="2">';
+	print "<tr><td>".$langs->trans("DateDeliveryPlanned").'</td><td>';
 	if (empty($datedelivery))
 	{
 		if (! empty($conf->global->DATE_LIVRAISON_WEEK_DELAY)) $datedelivery = time() + ((7*$conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
@@ -1532,31 +1532,31 @@ if ($action == 'create' && $user->rights->commande->creer)
 	print "</td></tr>";
 
 	// Conditions de reglement
-	print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td colspan="2">';
+	print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td>';
 	$form->select_conditions_paiements($cond_reglement_id, 'cond_reglement_id', - 1, 1);
 	print '</td></tr>';
 
 	// Mode de reglement
-	print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
+	print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td>';
 	$form->select_types_paiements($mode_reglement_id, 'mode_reglement_id');
 	print '</td></tr>';
 
     // Bank Account
 	if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled))
 	{
-		print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
+		print '<tr><td>' . $langs->trans('BankAccount') . '</td><td>';
     	$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
     	print '</td></tr>';
 	}
 
 	// Delivery delay
-	print '<tr class="fielddeliverydelay"><td>' . $langs->trans('AvailabilityPeriod') . '</td><td colspan="2">';
+	print '<tr class="fielddeliverydelay"><td>' . $langs->trans('AvailabilityPeriod') . '</td><td>';
 	$form->selectAvailabilityDelay($availability_id, 'availability_id', '', 1);
 	print '</td></tr>';
 
     // Shipping Method
     if (! empty($conf->expedition->enabled)) {
-        print '<tr><td>' . $langs->trans('SendingMethod') . '</td><td colspan="2">';
+        print '<tr><td>' . $langs->trans('SendingMethod') . '</td><td>';
         print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1);
         print '</td></tr>';
     }
@@ -1565,13 +1565,13 @@ if ($action == 'create' && $user->rights->commande->creer)
     if (! empty($conf->expedition->enabled) && ! empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
         require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
         $formproduct=new FormProduct($db);
-        print '<tr><td>' . $langs->trans('Warehouse') . '</td><td colspan="2">';
+        print '<tr><td>' . $langs->trans('Warehouse') . '</td><td>';
         print $formproduct->selectWarehouses($warehouse_id, 'warehouse_id', '', 1);
         print '</td></tr>';
     }
 
 	// What trigger creation
-	print '<tr><td>' . $langs->trans('Source') . '</td><td colspan="2">';
+	print '<tr><td>' . $langs->trans('Source') . '</td><td>';
 	$form->selectInputReason($demand_reason_id, 'demand_reason_id', '', 1);
 	print '</td></tr>';
 
@@ -1582,7 +1582,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	{
 		$langs->load("projects");
 		print '<tr>';
-		print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';
+		print '<td>' . $langs->trans("Project") . '</td><td>';
 		$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
 		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
 		print '</td>';
@@ -1594,7 +1594,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	{
 		print '<tr>';
 		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->libelle_incoterms, 1).'</label></td>';
-        print '<td colspan="3" class="maxwidthonsmartphone">';
+        print '<td class="maxwidthonsmartphone">';
         $incoterm_id = GETPOST('incoterm_id');
         $incoterm_location = GETPOST('location_incoterms');
         if (empty($incoterm_id))
@@ -1607,16 +1607,15 @@ if ($action == 'create' && $user->rights->commande->creer)
 	}
 
 	// Other attributes
-	$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'socid'=>$socid);
+	$parameters = array('objectsrc' => $objectsrc, 'socid'=>$socid);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
-	                                                                                      // hook
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
 
 	// Template to use by default
 	print '<tr><td>' . $langs->trans('DefaultModel') . '</td>';
-	print '<td colspan="2">';
+	print '<td>';
 	include_once DOL_DOCUMENT_ROOT . '/core/modules/commande/modules_commande.php';
 	$liste = ModelePDFCommandes::liste_modeles($db);
 	print $form->selectarray('model', $liste, $conf->global->COMMANDE_ADDON_PDF);
@@ -1627,7 +1626,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	{
 		print '<tr>';
 		print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
-        print '<td colspan="3" class="maxwidthonsmartphone">';
+        print '<td class="maxwidthonsmartphone">';
 	    print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
 		print '</td></tr>';
 	}
@@ -1635,7 +1634,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	// Note public
 	print '<tr>';
 	print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
-	print '<td colspan="2">';
+	print '<td>';
 
 	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
@@ -1646,7 +1645,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	if (empty($user->societe_id)) {
 		print '<tr>';
 		print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
-		print '<td colspan="2">';
+		print '<td>';
 
 		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 		print $doleditor->Create(1);
@@ -1689,26 +1688,26 @@ if ($action == 'create' && $user->rights->commande->creer)
 				$newclassname = $classname;
 		}
 
-		print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2">' . $objectsrc->getNomUrl(1) . '</td></tr>';
-		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td colspan="2">' . price($objectsrc->total_ht) . '</td></tr>';
-		print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td colspan="2">' . price($objectsrc->total_tva) . "</td></tr>";
+		print '<tr><td>' . $langs->trans($newclassname) . '</td><td>' . $objectsrc->getNomUrl(1) . '</td></tr>';
+		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td>' . price($objectsrc->total_ht) . '</td></tr>';
+		print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td>' . price($objectsrc->total_tva) . "</td></tr>";
 		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1 RE
 		{
-			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax1) . "</td></tr>";
+			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax1) . "</td></tr>";
 		}
 
 		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2 IRPF
 		{
-			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax2) . "</td></tr>";
+			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax2) . "</td></tr>";
 		}
 
-		print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td colspan="2">' . price($objectsrc->total_ttc) . "</td></tr>";
+		print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td>' . price($objectsrc->total_ttc) . "</td></tr>";
 
 		if (!empty($conf->multicurrency->enabled))
 		{
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td>' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td>' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td>' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
 		}
 	}
 
@@ -2240,7 +2239,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		}
 		print '</td></tr>';
 		*/
-		
+
 		$tmparray=$object->getTotalWeightVolume();
 		$totalWeight=$tmparray['weight'];
 		$totalVolume=$tmparray['volume'];
@@ -2269,7 +2268,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	        else print '&nbsp;';
 	        print '</td></tr></table>';
 	        print '</td>';
-	        print '<td colspan="3">';
+	        print '<td>';
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
@@ -2291,7 +2290,7 @@ if ($action == 'create' && $user->rights->commande->creer)
         	if ($action != 'editbankaccount' && $user->rights->commande->creer)
         	    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
         	print '</tr></table>';
-        	print '</td><td colspan="3">';
+        	print '</td><td>';
         	if ($action == 'editbankaccount') {
         	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
         	} else {
@@ -2302,7 +2301,6 @@ if ($action == 'create' && $user->rights->commande->creer)
 		}
 
 		// Other attributes
-		$cols = 2;
 		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
@@ -2320,18 +2318,18 @@ if ($action == 'create' && $user->rights->commande->creer)
 		    print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
 		    print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 		    print '</tr>';
-		
+
 		    // Multicurrency Amount VAT
 		    print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
 		    print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 		    print '</tr>';
-		
+
 		    // Multicurrency Amount TTC
 		    print '<tr><td>' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
 		    print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 		    print '</tr>';
 		}
-		
+
 		// Total HT
 		print '<tr><td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
 		print '<td>' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . '</td>';
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index b05b6658ca7..8db18cea304 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -411,17 +411,17 @@ if ($action == 'create' && !$error)
 	print '<table class="border" width="100%">';
 
 	// Ref
-	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans('Draft').'</td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
 
 	// Third party
-	print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td><td colspan="2">';
+	print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td><td>';
 	print $soc->getNomUrl(1);
 	print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 	print '</td>';
 	print '</tr>'."\n";
 
 	// Type
-	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Type').'</td><td colspan="2">';
+	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Type').'</td><td>';
 	print '<table class="nobordernopadding">'."\n";
 
 	// Standard invoice
@@ -434,15 +434,15 @@ if ($action == 'create' && !$error)
 	print '</table>';
 
 	// Date invoice
-	print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td colspan="2">';
+	print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
 	$html->select_date('','','','','',"add",1,1);
 	print '</td></tr>';
 	// Payment term
-	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
+	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 	$html->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id,'cond_reglement_id');
 	print '</td></tr>';
 	// Payment mode
-	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
+	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
 	$html->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id,'mode_reglement_id');
 	print '</td></tr>';
 	// Project
@@ -451,7 +451,7 @@ if ($action == 'create' && !$error)
 		$formproject=new FormProjets($db);
 
 		$langs->load('projects');
-		print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
+		print '<tr><td>'.$langs->trans('Project').'</td><td>';
 		$formproject->select_projects($soc->id, $projectid, 'projectid');
 		print '</td></tr>';
 	}
@@ -469,9 +469,8 @@ if ($action == 'create' && !$error)
 	}
 
 	// Other attributes
-	$parameters=array('objectsrc' => $objectsrc, 'idsrc' => $listoforders, 'colspan' => ' colspan="3"');
+	$parameters=array('objectsrc' => $objectsrc, 'idsrc' => $listoforders);
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		$object=new Facture($db);
@@ -489,8 +488,8 @@ if ($action == 'create' && !$error)
 	// Public note
 	print '<tr>';
 	print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
-	print '<td valign="top" colspan="2">';
-	print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">';
+	print '<td valign="top">';
+	print '<textarea name="note_public" class="quatrevingtpercent" rows="'.ROWS_3.'">';
 
 	print $langs->trans("Orders").": ".implode(', ', $listoforders);
 
@@ -500,8 +499,8 @@ if ($action == 'create' && !$error)
 	{
 		print '<tr>';
 		print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
-		print '<td valign="top" colspan="2">';
-		print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">';
+		print '<td valign="top">';
+		print '<textarea name="note" class="quatrevingtpercent" rows="'.ROWS_3.'">';
 
 		print '</textarea></td></tr>';
 	}
@@ -622,7 +621,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="10" name="sref_client" value="'.$sref_client.'">';
         print '</td>';
-        
+
 		//DATE ORDER
 		print '<td class="liste_titre" align="center">';
 		print $period;
@@ -637,7 +636,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 		print '<td align="right" class="liste_titre">';
 		print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
         print '</td>';
-        
+
 		//ALL/NONE
 		print '<td align="center" class="liste_titre">';
 		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
@@ -653,7 +652,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
-			
+
 			print '<tr class="oddeven">';
 			print '<td class="nowrap">';
 
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 2cb90b6a44a..7267769379e 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -75,7 +75,7 @@ if ($action == 'add')
     $error=0;
 
     $db->begin();
-    
+
     // Create account
     $object = new Account($db);
 
@@ -116,7 +116,7 @@ if ($action == 'add')
     $object->comment         = trim(GETPOST("account_comment"));
 
     $object->fk_user_author  = $user->id;
-    
+
     if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
     {
         setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
@@ -149,7 +149,7 @@ if ($action == 'add')
             $object->setCategories($categories);
 
             $_GET["id"]=$id;            // Force chargement page en mode visu
-            
+
             $action='';
         }
         else {
@@ -159,7 +159,7 @@ if ($action == 'add')
             $action='create';   // Force chargement page en mode creation
         }
     }
-    
+
     if (! $error)
     {
         $db->commit();
@@ -324,21 +324,21 @@ if ($action == 'create')
 
 	// Ref
 	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Ref").'</td>';
-	print '<td colspan="3"><input size="8" type="text" class="flat" name="ref" value="'.(GETPOST("ref")?GETPOST("ref",'alpha'):$object->ref).'" maxlength="12"></td></tr>';
+	print '<td><input size="8" type="text" class="flat" name="ref" value="'.(GETPOST("ref")?GETPOST("ref",'alpha'):$object->ref).'" maxlength="12"></td></tr>';
 
 	// Label
 	print '<tr><td class="fieldrequired">'.$langs->trans("LabelBankCashAccount").'</td>';
-	print '<td colspan="3"><input size="30" type="text" class="flat" name="label" value="'.GETPOST("label", 'alpha').'"></td></tr>';
+	print '<td><input size="30" type="text" class="flat" name="label" value="'.GETPOST("label", 'alpha').'"></td></tr>';
 
 	// Type
 	print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
-	print '<td colspan="3">';
+	print '<td>';
 	$formbank->selectTypeOfBankAccount(isset($_POST["type"])?$_POST["type"]: Account::TYPE_CURRENT,"type");
 	print '</td></tr>';
 
 	// Currency
 	print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
-	print '<td colspan="3">';
+	print '<td>';
 	$selectedcode=$object->currency_code;
 	if (! $selectedcode) $selectedcode=$conf->currency;
 	print $form->selectCurrency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code');
@@ -348,7 +348,7 @@ if ($action == 'create')
 
 	// Status
     print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
-    print '<td colspan="3">';
+    print '<td>';
     print $form->selectarray("clos", $object->status,(isset($_POST["clos"])?$_POST["clos"]:$object->clos));
     print '</td></tr>';
 
@@ -362,13 +362,13 @@ if ($action == 'create')
 	$object->country_code = getCountry($selectedcode, 2);	// Force country code on account to have following field on bank fields matching country rules
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("BankAccountCountry").'</td>';
-	print '<td colspan="3">';
+	print '<td>';
 	print $form->select_country($selectedcode,'account_country_id');
 	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 	print '</td></tr>';
 
 	// State
-	print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
+	print '<tr><td>'.$langs->trans('State').'</td><td>';
 	if ($selectedcode)
 	{
 		$formcompany->select_departement(isset($_POST["account_state_id"])?$_POST["account_state_id"]:'',$selectedcode,'account_state_id');
@@ -381,12 +381,12 @@ if ($action == 'create')
 
 	// Web
 	print '<tr><td>'.$langs->trans("Web").'</td>';
-	print '<td colspan="3"><input class="minwidth300" type="text" class="flat" name="url" value="'.GETPOST("url").'"></td></tr>';
+	print '<td><input class="minwidth300" type="text" class="flat" name="url" value="'.GETPOST("url").'"></td></tr>';
 
     // Tags-Categories
-    if ($conf->categorie->enabled) 
+    if ($conf->categorie->enabled)
     {
-        print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td colspan="3">';
+        print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td>';
         $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
         $c = new Categorie($db);
         $cats = $c->containing($object->id,Categorie::TYPE_ACCOUNT);
@@ -399,7 +399,7 @@ if ($action == 'create')
 
 	// Comment
 	print '<tr><td class="tdtop">'.$langs->trans("Comment").'</td>';
-	print '<td colspan="3">';
+	print '<td>';
     // Editor wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor=new DolEditor('account_comment',(GETPOST("account_comment")?GETPOST("account_comment"):$object->comment),'',90,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_4,'90%');
@@ -407,7 +407,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
  	// Other attributes
-	$parameters=array('colspan' => 3);
+	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
@@ -422,18 +422,18 @@ if ($action == 'create')
 
 	// Sold
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("InitialBankBalance").'</td>';
-	print '<td colspan="3"><input size="12" type="text" class="flat" name="solde" value="'.(GETPOST("solde")?GETPOST("solde"):price2num($object->solde)).'"></td></tr>';
+	print '<td><input size="12" type="text" class="flat" name="solde" value="'.(GETPOST("solde")?GETPOST("solde"):price2num($object->solde)).'"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("Date").'</td>';
-	print '<td colspan="3">';
+	print '<td>';
 	$form->select_date('', 're', 0, 0, 0, 'formsoc');
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("BalanceMinimalAllowed").'</td>';
-	print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(GETPOST("account_min_allowed")?GETPOST("account_min_allowed"):$object->min_allowed).'"></td></tr>';
+	print '<td><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(GETPOST("account_min_allowed")?GETPOST("account_min_allowed"):$object->min_allowed).'"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("BalanceMinimalDesired").'</td>';
-	print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_desired" value="'.(GETPOST("account_min_desired")?GETPOST("account_min_desired"):$object->min_desired).'"></td></tr>';
+	print '<td><input size="12" type="text" class="flat" name="account_min_desired" value="'.(GETPOST("account_min_desired")?GETPOST("account_min_desired"):$object->min_desired).'"></td></tr>';
 
 	print '</table>';
 	print '<br>';
@@ -444,7 +444,7 @@ if ($action == 'create')
 
 		// If bank account
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("BankName").'</td>';
-		print '<td colspan="3"><input size="30" type="text" class="flat" name="bank" value="'.(GETPOST('bank')?GETPOST('bank','alpha'):$object->bank).'"></td>';
+		print '<td><input size="30" type="text" class="flat" name="bank" value="'.(GETPOST('bank')?GETPOST('bank','alpha'):$object->bank).'"></td>';
 		print '</tr>';
 
 		// Show fields of bank account
@@ -477,21 +477,21 @@ if ($action == 'create')
 
 		// IBAN
 		print '<tr><td>'.$langs->trans($ibankey).'</td>';
-		print '<td colspan="3"><input size="34" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOST('iban')?GETPOST('iban','alpha'):$object->iban).'"></td></tr>';
+		print '<td><input size="34" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOST('iban')?GETPOST('iban','alpha'):$object->iban).'"></td></tr>';
 
 		print '<tr><td>'.$langs->trans($bickey).'</td>';
-		print '<td colspan="3"><input size="11" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOST('bic')?GETPOST('bic','alpha'):$object->bic).'"></td></tr>';
+		print '<td><input size="11" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOST('bic')?GETPOST('bic','alpha'):$object->bic).'"></td></tr>';
 
-		print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 		print "<textarea class=\"flat\" name=\"domiciliation\" rows=\"2\" cols=\"40\">";
 		print (GETPOST('domiciliation')?GETPOST('domiciliation'):$object->domiciliation);
 		print "</textarea></td></tr>";
 
 		print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-		print '<td colspan="3"><input size="30" type="text" class="flat" name="proprio" value="'.(GETPOST('proprio')?GETPOST('proprio','alpha'):$object->proprio).'">';
+		print '<td><input size="30" type="text" class="flat" name="proprio" value="'.(GETPOST('proprio')?GETPOST('proprio','alpha'):$object->proprio).'">';
 		print '</td></tr>';
 
-		print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">';
+		print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
 		print "<textarea class=\"flat\" name=\"owner_address\" rows=\"2\" cols=\"40\">";
 		print (GETPOST('owner_address')?GETPOST('owner_address','alpha'):$object->owner_address);
 		print "</textarea></td></tr>";
@@ -503,8 +503,8 @@ if ($action == 'create')
 	print '<table class="border" width="100%">';
 	// Accountancy code
 	$fieldrequired='';
-    if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired='fieldrequired '; 
-    
+    if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired='fieldrequired ';
+
 	if (! empty($conf->accounting->enabled))
 	{
 		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
@@ -515,7 +515,7 @@ if ($action == 'create')
 	else
 	{
 		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
-		print '<td colspan="3"><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number', 'alpha'):$object->account_number).'"></td></tr>';
+		print '<td><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number', 'alpha'):$object->account_number).'"></td></tr>';
 	}
 
 	// Accountancy journal
@@ -565,10 +565,10 @@ else
 
 		// Onglets
 		$head=bank_prepare_head($object);
-		dol_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"),0,'account');
+		dol_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"), -1, 'account');
 
 		$formconfirm = '';
-		
+
 		// Confirmation to delete
 		if ($action == 'delete')
 		{
@@ -578,24 +578,24 @@ else
 
 		// Print form confirm
 		print $formconfirm;
-		
+
 		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
-		
+
 		$morehtmlref='';
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-		
-		
+
+
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border" width="100%">';
 
 
 		// Ref
 		/*
 		print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td>';
-		print '<td colspan="3">';
+		print '<td>';
 		print $form->showrefnav($object, 'ref', $linkback, 1, 'ref');
 		print '</td></tr>';*/
 
@@ -662,25 +662,25 @@ else
 		    print $object->account_number;
 		}
 		print '</td></tr>';
-		
+
 		// Accountancy journal
 		if (! empty($conf->accounting->enabled))
 		{
 		    print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 		    print '<td>';
-			
+
 			$accountingjournal = new AccountingJournal($db);
 			$accountingjournal->fetch($object->fk_accountancy_journal);
 
 			print $accountingjournal->getNomUrl(0,1,1,'',1);
-			
+
 			print '</td></tr>';
 		}
-		
+
 		// Other attributes
 		$cols = 2;
 		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-		
+
 		print '</table>';
 
 		print '</div>';
@@ -689,7 +689,7 @@ else
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border centpercent">';
-		
+
         // Categories
         if ($conf->categorie->enabled) {
             print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
@@ -705,9 +705,9 @@ else
 		if ($object->type == Account::TYPE_SAVINGS || $object->type == Account::TYPE_CURRENT)
 		{
 		    print '<br>';
-		
+
 		    print '<div class="underbanner clearboth"></div>';
-		    
+
 		    print '<table class="border centpercent">';
 
 			print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("BankName").'</td>';
@@ -726,7 +726,7 @@ else
 				}
 
 				print '<tr><td>'.$langs->trans($val).'</td>';
-				print '<td colspan="3">'.$content.'</td>';
+				print '<td>'.$content.'</td>';
 				print '</tr>';
 			}
 
@@ -776,7 +776,7 @@ else
 		print '</div>';
 
 		print '<div class="clearboth"></div>';
-		
+
 		dol_fiche_end();
 
 		/*
@@ -839,7 +839,7 @@ else
         dol_fiche_head('');
 
         print '<div class="underbanner clearboth"></div>';
-        
+
         print '<table class="border" width="100%">';
 
 		// Ref
@@ -921,7 +921,7 @@ else
         print '</td></tr>';
 
         // Tags-Categories
-        if ($conf->categorie->enabled) 
+        if ($conf->categorie->enabled)
         {
             print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td>';
             $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
@@ -944,12 +944,13 @@ else
 		print '</td></tr>';
 
 		// Other attributes
-		$parameters=array('colspan' => 3);
+		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
+
 		print '</table>';
 		print '<br>';
 
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 20c49c71468..c0481829425 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -74,7 +74,7 @@ if ($action == 'add' && empty($cancel))
 	$datep=dol_mktime(12,0,0, GETPOST("datepmonth"), GETPOST("datepday"), GETPOST("datepyear"));
 	$datev=dol_mktime(12,0,0, GETPOST("datevmonth"), GETPOST("datevday"), GETPOST("datevyear"));
 	if (empty($datev)) $datev=$datep;
-	
+
 	$object->accountid=GETPOST("accountid") > 0 ? GETPOST("accountid","int") : 0;
 	$object->datev=$datev;
 	$object->datep=$datep;
@@ -207,7 +207,7 @@ if ($action == 'create')
 	print load_fiche_titre($langs->trans("NewVariousPayment"),'', 'title_accountancy.png');
 
 	dol_fiche_head('', '');
-	
+
 	print '<table class="border" width="100%">';
 
 	// Date payment
@@ -274,7 +274,7 @@ if ($action == 'create')
 		print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1, '');
         print '</td></tr>';
 	}
-	else // For external software 
+	else // For external software
 	{
 		print '<tr><td>'.$langs->trans("AccountAccounting").'</td>';
 		print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code" value="'.$accountancy_code.'">';
@@ -282,7 +282,7 @@ if ($action == 'create')
 	}
 
 	// Other attributes
-	$parameters=array('colspan' => ' colspan="1"');
+	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
 	print '</table>';
@@ -315,7 +315,7 @@ if ($id)
 	print '<table class="border" width="100%">';
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
+
     print "<tr>";
 	print '<td class="titlefield">'.$langs->trans("Ref").'</td><td>';
 	print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
@@ -372,14 +372,14 @@ if ($id)
 	}
 
 	// Other attributes
-	$parameters=array('colspan' => ' colspan="1"');
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	$parameters=array('socid'=>$object->id);
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
 
 	dol_fiche_end();
 
-	
+
 	/*
 	 * Action buttons
 	 */
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index aa315e5c854..949a7701698 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -251,7 +251,7 @@ if ($action == 'create')
     print '<table class="border" width="100%">';
 
     print "<tr>";
-    print '<td width="25%" class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+    print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
     $form->select_type_fees(GETPOST('type','int'),'type',1);
     print '</td></tr>';
 
@@ -277,7 +277,7 @@ if ($action == 'create')
     // Public note
     print '<tr>';
     print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
-    print '<td valign="top" colspan="2">';
+    print '<td>';
 
     $doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8,'90%');
     print $doleditor->Create(1);
@@ -289,7 +289,7 @@ if ($action == 'create')
     {
         print '<tr>';
         print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-        print '<td valign="top" colspan="2">';
+        print '<td>';
 
         $doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
         print $doleditor->Create(1);
@@ -298,7 +298,7 @@ if ($action == 'create')
     }
 
     // Other attributes
-    $parameters=array('colspan' => ' colspan="2"');
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
     print '</table>';
@@ -340,7 +340,7 @@ else if ($id)
 
             // Ref
             print "<tr>";
-            print '<td width="20%">'.$langs->trans("Ref").'</td><td>';
+            print '<td class="titlefield">'.$langs->trans("Ref").'</td><td>';
             print $object->ref;
             print '</td></tr>';
 
@@ -374,7 +374,7 @@ else if ($id)
 
             // Public note
             print '<tr><td class="tdtop">'.$langs->trans("NotePublic").'</td>';
-            print '<td valign="top" colspan="3">';
+            print '<td>';
 
             $doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
             print $doleditor->Create(1);
@@ -385,7 +385,7 @@ else if ($id)
             if (empty($user->societe_id))
             {
                 print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
-                print '<td valign="top" colspan="3">';
+                print '<td>';
 
                 $doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
                 print $doleditor->Create(1);
@@ -394,7 +394,7 @@ else if ($id)
             }
 
             // Other attributes
-            $parameters=array('colspan' => ' colspan="3"');
+            $parameters=array();
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
             print '</table>';
@@ -412,7 +412,7 @@ else if ($id)
         else
         {
            /*
-            * Confirm delete trip 
+            * Confirm delete trip
             */
             if ($action == 'delete')
             {
@@ -501,9 +501,9 @@ else if ($id)
             // Statut
             print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
-            // Other attributes
-            $parameters=array('colspan' => ' colspan="3"', 'showblocbydefault' => 1);
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        	// Other attributes
+        	$parameters=array('socid'=>$object->id);
+        	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
             print "</table><br>";
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index b739e551b9d..e9be0a0b962 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -615,7 +615,7 @@ if (empty($reshook))
 			$db->begin();
 
 			$amount_ht = $amount_tva = $amount_ttc = array();
-			
+
 			// Loop on each vat rate
 			$i = 0;
 			foreach ($object->lines as $line)
@@ -644,19 +644,19 @@ if (empty($reshook))
 			$discount->fk_facture_source = $object->id;
 
 			$error = 0;
-			
-			if ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_SITUATION) 
+
+			if ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_SITUATION)
 			{
 				// If we're on a standard invoice, we have to get excess received to create a discount in TTC without VAT
-				
+
 				$sql = 'SELECT SUM(pf.amount) as total_paiements
 						FROM llx_c_paiement as c, llx_paiement_facture as pf, llx_paiement as p
 						WHERE pf.fk_facture = '.$object->id.' AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid ORDER BY p.datep, p.tms';
-				
+
 				$resql = $db->query($sql);
 				$res = $db->fetch_object($resql);
 				$total_paiements = $res->total_paiements;
-				
+
 				$discount->amount_ht = $discount->amount_ttc = $total_paiements - $object->total_ttc;
 				$discount->amount_tva = 0;
 				$discount->tva_tx = 0;
@@ -666,7 +666,7 @@ if (empty($reshook))
 				{
 					$error++;
 				}
-				
+
 			}
 			if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
 			{
@@ -676,7 +676,7 @@ if (empty($reshook))
 					$discount->amount_tva = abs($amount_tva[$tva_tx]);
 					$discount->amount_ttc = abs($amount_ttc[$tva_tx]);
 					$discount->tva_tx = abs($tva_tx);
-	
+
 					$result = $discount->create($user);
 					if ($result < 0)
 					{
@@ -684,7 +684,7 @@ if (empty($reshook))
 						break;
 					}
 				}
-			
+
 			}
 
 			if (empty($error))
@@ -1027,7 +1027,7 @@ if (empty($reshook))
 					}
 
 					$id = $object->create($user);      // This include class to add_object_linked() and add add_contact()
-					
+
 					if ($id > 0)
 					{
 						dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
@@ -1049,13 +1049,13 @@ if (empty($reshook))
 							{
 								if ($typeamount == 'amount') $amount = $valuedeposit;
 								else $amount = $srcobject->total_ttc * ($valuedeposit / 100);
-								
+
 								$TTotalByTva = array();
 								foreach ($srcobject->lines as &$line)
 								{
 									$TTotalByTva[$line->tva_tx] += $line->total_ttc ;
 								}
-								
+
 								$amount_to_diff = 0;
 								foreach ($TTotalByTva as $tva => &$total)
 								{
@@ -1099,10 +1099,10 @@ if (empty($reshook))
 										$error ++;
 									}
 								}
-								
+
 								$amount_ttc_diff = $amountdeposit[0];
 							}
-							
+
 							foreach ($amountdeposit as $tva => $amount)
 							{
 								$result = $object->addline(
@@ -1116,7 +1116,7 @@ if (empty($reshook))
 										0, 						// remise_percent
 										0, 						// date_start
 										0, 						// date_end
-										0, 
+										0,
 								        $lines[$i]->info_bits,  // info_bits
 										0,
 										'HT',
@@ -1132,16 +1132,16 @@ if (empty($reshook))
 										$langs->trans('Deposit')
 									);
 							}
-							
+
 							$diff = $object->total_ttc - $amount_ttc_diff;
-							
+
 							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0)
 							{
 								$object->fetch_lines();
 								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx / 100);
 								$object->updateline($object->lines[0]->id, $object->lines[0]->desc, $subprice_diff, $object->lines[0]->qty, $object->lines[0]->remise_percent, $object->lines[0]->date_start, $object->lines[0]->date_end, $object->lines[0]->tva_tx, 0, 0, 'HT', $object->lines[0]->info_bits, $object->lines[0]->product_type, 0, 0, 0, $object->lines[0]->pa_ht, $object->lines[0]->label, 0, array(), 100);
 							}
-							
+
 						}
 						else
 						{
@@ -1219,7 +1219,7 @@ if (empty($reshook))
 
 										$tva_tx = $lines[$i]->tva_tx;
 										if (! empty($lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
-										
+
 										// View third's localtaxes for NOW and do not use value from origin.
 										// TODO Is this really what we want ? Yes if source if template invoice but what if proposal or order ?
 										$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
@@ -1556,7 +1556,7 @@ if (empty($reshook))
 
 				$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-			    
+
 				// if price ht was forced (ie: from gui when calculated by margin rate and cost price). TODO Why this ?
 				if (! empty($price_ht))
 				{
@@ -2123,11 +2123,11 @@ if ($action == 'create')
 
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 	}
-    
+
 	if (!empty($soc->id)) $absolute_discount = $soc->getAvailableDiscounts();
 	$note_public = $object->getDefaultCreateValueFor('note_public', (is_object($objectsrc)?$objectsrc->note_public:null));
 	$note_private = $object->getDefaultCreateValueFor('note_private', ((! empty($origin) && ! empty($originid) && is_object($objectsrc))?$objectsrc->note_private:null));
-	
+
 	if (! empty($conf->use_javascript_ajax))
 	{
 		require_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
@@ -2331,7 +2331,7 @@ if ($action == 'create')
 	if ((empty($origin)) || ((($origin == 'propal') || ($origin == 'commande')) && (! empty($originid))))
 	{
 		// Deposit
-		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT)) 
+		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT))
    		{
     	    print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
     		$tmp='<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOST('type') == 3 ? ' checked' : '') . '> ';
@@ -2342,7 +2342,7 @@ if ($action == 'create')
     			});
     		});
     		</script>';
-    
+
     		$desc = $form->textwithpicto($tmp.$langs->trans("InvoiceDeposit"), $langs->transnoentities("InvoiceDepositDesc"), 1, 'help', '', 0, 3);
     		print '<table class="nobordernopadding"><tr><td>';
     		print $desc;
@@ -2356,7 +2356,7 @@ if ($action == 'create')
     			print '<td class="nowrap" style="padding-left: 5px">' . $langs->trans('Value') . ':<input type="text" id="valuedeposit" name="valuedeposit" size="3" value="' . GETPOST('valuedeposit', 'int') . '"/>';
     		}
     		print '</td></tr></table>';
-    
+
     		print '</div></div>';
    		}
 	}
@@ -2388,7 +2388,7 @@ if ($action == 'create')
 		}
 
 		// Replacement
-		if (empty($conf->global->INVOICE_DISABLE_REPLACEMENT)) 
+		if (empty($conf->global->INVOICE_DISABLE_REPLACEMENT))
 		{
     		print '<!-- replacement line -->';
     		print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
@@ -2435,7 +2435,7 @@ if ($action == 'create')
 		if ($socid > 0)
 		{
     		// Credit note
-		    if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE)) 
+		    if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE))
     		{
     			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
     			$tmp='<input type="radio" id="radio_creditnote" name="type" value="2"' . (GETPOST('type') == 2 ? ' checked' : '');
@@ -2471,12 +2471,12 @@ if ($action == 'create')
     			$text .= '</select>';
     			$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc"), 1, 'help', '', 0, 3);
     			print $desc;
-    
+
     			print '<div id="credit_note_options" class="clearboth">';
     	        print '&nbsp;&nbsp;&nbsp; <input data-role="none" type="checkbox" name="invoiceAvoirWithLines" id="invoiceAvoirWithLines" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true); $(\'#invoiceAvoirWithPaymentRestAmount\').removeAttr(\'checked\');   }" '.(GETPOST('invoiceAvoirWithLines','int')>0 ? 'checked':'').' /> <label for="invoiceAvoirWithLines">'.$langs->trans('invoiceAvoirWithLines')."</label>";
     	        print '<br>&nbsp;&nbsp;&nbsp; <input data-role="none" type="checkbox" name="invoiceAvoirWithPaymentRestAmount" id="invoiceAvoirWithPaymentRestAmount" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true);  $(\'#invoiceAvoirWithLines\').removeAttr(\'checked\');   }" '.(GETPOST('invoiceAvoirWithPaymentRestAmount','int')>0 ? 'checked':'').' /> <label for="invoiceAvoirWithPaymentRestAmount">'.$langs->trans('invoiceAvoirWithPaymentRestAmount')."</label>";
     			print '</div>';
-    
+
     			print '</div></div>';
     		}
 		}
@@ -2492,7 +2492,7 @@ if ($action == 'create')
 			print '</div></div>' . "\n";
 		}
 	}
-	
+
 	// Template invoice
 	print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 	$tmp='<input type="radio" name="type" id="radio_template" value="0" disabled> ';
@@ -2589,9 +2589,8 @@ if ($action == 'create')
 	}
 
 	// Other attributes
-	$parameters = array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"');
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
-	                                                                                      // hook
+	$parameters = array('objectsrc' => $objectsrc,'colspan' => ' colspan="2"', 'cols'=>2);
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
@@ -2731,7 +2730,7 @@ if ($action == 'create')
 		{
 			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
 			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";	
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
 		}
 	}
 
@@ -3488,21 +3487,21 @@ else if ($id > 0 || ! empty($ref))
 	print '<div class="fichehalfright">';
 	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border centpercent">';
-	
+
 	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
 	{
 	    // Multicurrency Amount HT
 	    print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
 	    print '<td class="nowrap amountcard">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
-	
+
 	    // Multicurrency Amount VAT
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
 	    print '<td class="nowrap amountcard">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
-	
+
 	    // Multicurrency Amount TTC
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
 	    print '<td class="nowrap amountcard">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
@@ -3584,12 +3583,12 @@ else if ($id > 0 || ! empty($ref))
         $nbrows += 5;
     if (! empty($conf->incoterm->enabled))
         $nbrows += 1;
-    
-    if ($object->type == Facture::TYPE_SITUATION && ! empty($conf->global->INVOICE_USE_SITUATION)) 
+
+    if ($object->type == Facture::TYPE_SITUATION && ! empty($conf->global->INVOICE_USE_SITUATION))
     {
         if (count($object->tab_previous_situation_invoice) > 0 || count($object->tab_next_situation_invoice) > 0)
             print '<table class="nobordernopadding paymenttable" width="100%">';
-        
+
         if (count($object->tab_previous_situation_invoice) > 0) {
             // List of previous invoices
             print '<tr class="liste_titre">';
@@ -3601,7 +3600,7 @@ else if ($id > 0 || ! empty($ref))
             print '<td align="right">' . $langs->trans('AmountTTC') . '</td>';
             print '<td width="18">&nbsp;</td>';
             print '</tr>';
-            
+
             $total_prev_ht = $total_prev_ttc = 0;
             foreach ($object->tab_previous_situation_invoice as $prev_invoice) {
                 $totalpaye = $prev_invoice->getSommePaiement();
@@ -3616,9 +3615,9 @@ else if ($id > 0 || ! empty($ref))
                 print '<td align="right">' . price($prev_invoice->total_ttc) . '</td>';
                 print '<td align="right">' . $prev_invoice->getLibStatut(3, $totalpaye) . '</td>';
                 print '</tr>';
-                
+
             }
-            
+
             print '<tr class="oddeven">';
             print '<td colspan="2" align="right"></td>';
             print '<td align="right"><b>' . price($total_prev_ht) . '</b></td>';
@@ -3626,7 +3625,7 @@ else if ($id > 0 || ! empty($ref))
             print '<td width="18">&nbsp;</td>';
             print '</tr>';
         }
-        
+
         if (count($object->tab_next_situation_invoice) > 0) {
             // List of next invoices
             print '<tr class="liste_titre">';
@@ -3637,9 +3636,9 @@ else if ($id > 0 || ! empty($ref))
             print '<td align="right">' . $langs->trans('AmountTTC') . '</td>';
             print '<td width="18">&nbsp;</td>';
             print '</tr>';
-            
+
             $total_next_ht = $total_next_ttc = 0;
-            
+
             foreach ($object->tab_next_situation_invoice as $next_invoice) {
                 $totalpaye = $next_invoice->getSommePaiement();
                 $total_next_ht += $next_invoice->total_ht;
@@ -3652,9 +3651,9 @@ else if ($id > 0 || ! empty($ref))
                 print '<td align="right">' . price($next_invoice->total_ttc) . '</td>';
                 print '<td align="right">' . $next_invoice->getLibStatut(3, $totalpaye) . '</td>';
                 print '</tr>';
-                
+
             }
-            
+
             print '<tr class="oddeven">';
             print '<td colspan="2" align="right"></td>';
 		    if (! empty($conf->banque->enabled)) print '<td align="right"></td>';
@@ -3664,7 +3663,7 @@ else if ($id > 0 || ! empty($ref))
             print '<td width="18">&nbsp;</td>';
             print '</tr>';
         }
-        
+
         if (count($object->tab_previous_situation_invoice) > 0 || count($object->tab_next_situation_invoice) > 0)
             print '</table>';
     }
@@ -3741,7 +3740,7 @@ else if ($id > 0 || ! empty($ref))
                 print '</tr>';
                 $i ++;
             }
-        } 
+        }
         /*else {
             print '<tr class="oddeven"><td colspan="' . $nbcols . '" class="opacitymedium">' . $langs->trans("None") . '</td><td></td><td></td></tr>';
         }*/
@@ -3837,7 +3836,7 @@ else if ($id > 0 || ! empty($ref))
 
         // Billed
         print '<tr><td colspan="' . $nbcols . '" align="right">' . $langs->trans("Billed") . ' :</td><td align="right">' . price($object->total_ttc) . '</td><td>&nbsp;</td></tr>';
-        
+
         // Remainder to pay
         print '<tr><td colspan="' . $nbcols . '" align="right">';
         if ($resteapayeraffiche >= 0)
@@ -3847,11 +3846,11 @@ else if ($id > 0 || ! empty($ref))
         print ' :</td>';
         print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':(' class="'.$cssforamountpaymentcomplete.'"')).'>' . price($resteapayeraffiche) . '</td>';
         print '<td class="nowrap">&nbsp;</td></tr>';
-    } 
+    }
     else // Credit note
     {
         $cssforamountpaymentcomplete='';
-        
+
         // Total already paid back
         print '<tr><td colspan="' . $nbcols . '" align="right">';
         print $langs->trans('AlreadyPaidBack');
@@ -3909,14 +3908,14 @@ else if ($id > 0 || ! empty($ref))
 	{
 		if ($object->situation_cycle_ref && $object->statut == 0) {
 			print '<div class="div-table-responsive">';
-			
+
 			print '<form name="updatealllines" id="updatealllines" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '#updatealllines" method="POST">';
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '" />';
 			print '<input type="hidden" name="action" value="updatealllines" />';
 			print '<input type="hidden" name="id" value="' . $object->id . '" />';
-			
+
 			print '<table id="tablelines_all_progress" class="noborder noshadow" width="100%">';
-		    
+
 			print '<tr class="liste_titre nodrag nodrop">';
 
 			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
@@ -3954,11 +3953,11 @@ else if ($id > 0 || ! empty($ref))
 			print '<td align="right" class="nowrap"><input type="text" size="1" value="" name="all_progress">%</td>';
 			print '<td colspan="4" align="right"><input class="button" type="submit" name="all_percent" value="Modifier" /></td>';
 			print '</tr>';
-			
+
 			print '</table>';
-			
+
 			print '</form>';
-			
+
 			print '</div>';
 		}
 	}
@@ -3969,14 +3968,14 @@ else if ($id > 0 || ! empty($ref))
 	<input type="hidden" name="mode" value="">
 	<input type="hidden" name="id" value="' . $object->id . '">
 	';
-	
+
 	if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
 	    include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 	}
-	
+
 	print '<div class="div-table-responsive">';
 	print '<table id="tablelines" class="noborder noshadow" width="100%">';
-	
+
 	// Show object lines
 	if (! empty($object->lines))
 		$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
@@ -4037,10 +4036,10 @@ else if ($id > 0 || ! empty($ref))
 					}
 				}
 			}
-			
+
 			$discount = new DiscountAbsolute($db);
 			$result = $discount->fetch(0, $object->id);
-			
+
 			// Reopen a standard paid invoice
 			if ((($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT)
 				|| ($object->type == Facture::TYPE_CREDIT_NOTE && empty($discount->id))
@@ -4097,7 +4096,7 @@ else if ($id > 0 || ! empty($ref))
 			        //print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 			    }
 			}
-			
+
 			// Create payment
 			if ($object->type != Facture::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $user->rights->facture->paiement) {
 				if ($objectidnext) {
@@ -4253,7 +4252,7 @@ else if ($id > 0 || ! empty($ref))
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice'));
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-		
+
 		// Link for paypal payment
 		if (! empty($conf->paypal->enabled) && $object->statut != 0) {
 			include_once DOL_DOCUMENT_ROOT . '/paypal/lib/paypal.lib.php';
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 1772b6861dd..315b89637af 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -158,7 +158,7 @@ if ($id)
 if ($action == 'create')
 {
     print load_fiche_titre($langs->transcountry($lttype==2?"newLT2Payment":"newLT1Payment",$mysoc->country_code));
-    
+
     print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formlocaltax" method="post">'."\n";
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="localTaxType" value="'.$lttype.'">';
@@ -193,14 +193,14 @@ if ($action == 'create')
 	    $form->select_types_paiements(GETPOST("paiementtype"), "paiementtype");
 	    print "</td>\n";
 	    print "</tr>";
-	
+
 		// Number
 		print '<tr><td>'.$langs->trans('Numero');
 		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 		print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
     }
     // Other attributes
-    $parameters=array('colspan' => ' colspan="1"');
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
     print '</table>';
@@ -237,20 +237,20 @@ if ($id)
 	print '<table class="border" width="100%">';
 
 	print "<tr>";
-	print '<td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
+	print '<td width="25%">'.$langs->trans("Ref").'</td><td>';
 	print $vatpayment->ref;
 	print '</td></tr>';
 
 	print "<tr>";
-	print '<td>'.$langs->trans("DatePayment").'</td><td colspan="3">';
+	print '<td>'.$langs->trans("DatePayment").'</td><td>';
 	print dol_print_date($vatpayment->datep,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("DateValue").'</td><td colspan="3">';
+	print '<tr><td>'.$langs->trans("DateValue").'</td><td>';
 	print dol_print_date($vatpayment->datev,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="3">'.price($vatpayment->amount).'</td></tr>';
+	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($vatpayment->amount).'</td></tr>';
 
 	if (! empty($conf->banque->enabled))
 	{
@@ -261,7 +261,7 @@ if ($id)
 
 	    	print '<tr>';
 	    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
-			print '<td colspan="3">';
+			print '<td>';
 			print $bankline->getNomUrl(1,0,'showall');
 	    	print '</td>';
 	    	print '</tr>';
@@ -269,13 +269,13 @@ if ($id)
 	}
 
     // Other attributes
-    $parameters=array('colspan' => ' colspan="3"');
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$vatpayment,$action);    // Note that $action and $object may have been modified by hook
-	
+
     print '</table>';
 
 	dol_fiche_end();
-	
+
 
 	/*
 	* Boutons d'actions
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 41f6abb25c5..9a5585c2513 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2012 Juanjo Menent        <jmenent@2byte.es>
  *
@@ -107,33 +107,32 @@ if ($result)
   print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
   print '<input type="hidden" name="page" value="'.$page.'">';
   print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-  
+
   print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit);
 
   $moreforfilter='';
-    
+
   print '<div class="div-table-responsive">';
   print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
+  print '<tr class="liste_titre">';
+  print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_ref" value="'. $db->escape($search_ref).'"></td>';
+  print '<td class="liste_titre">&nbsp;</td>';
+  print '<td class="liste_titre" align="right">';
+  $searchpicto=$form->showFilterButtons();
+  print $searchpicto;
+  print '</td>';
+  print '</tr>';
+
   print '<tr class="liste_titre">';
   print_liste_field_titre($langs->trans("WithdrawalsReceipts"),$_SERVER["PHP_SELF"],"p.ref",'','','class="liste_titre"');
   print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"p.datec","","",'class="liste_titre" align="center"');
   print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"","","",'align="center"');
   print "</tr>\n";
 
-  print '<tr class="liste_titre">';
-  print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_ref" value="'. $db->escape($search_ref).'"></td>';
-  print '<td class="liste_titre">&nbsp;</td>';
-  print '<td class="liste_titre" align="right">';
-  $searchpicto=$form->showFilterAndCheckAddButtons(0);
-  print $searchpicto;
-  print '</td>';
-  print '</tr>';
-
-
   while ($i < min($num,$limit))
   {
-      $obj = $db->fetch_object($result);     
+      $obj = $db->fetch_object($result);
 
       print '<tr class="oddeven"><td>';
 
@@ -151,9 +150,9 @@ if ($result)
     }
   print "</table>";
   print '</div>';
-  
+
   print '</form>';
-  
+
   $db->free($result);
 }
 else
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 5d77a9b9771..0834b3500a7 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -94,9 +94,7 @@ llxHeader('', $langs->trans("NewStandingOrder"));
 if (prelevement_check_config() < 0)
 {
 	$langs->load("errors");
-	print '<div class="error">';
-	print $langs->trans("ErrorModuleSetupNotComplete");
-	print '</div>';
+	setEventMessages($langs->trans("ErrorModuleSetupNotComplete"), null, 'errors');
 }
 
 /*$h=0;
@@ -148,7 +146,7 @@ if ($nb)
 }
 else
 {
-    print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw")).'">'.$langs->trans("CreateAll")."</a>\n";
+    print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders"))).'">'.$langs->trans("CreateAll")."</a>\n";
 }
 
 print "</div>\n";
@@ -194,7 +192,7 @@ if ($resql)
         while ($i < $num && $i < 20)
         {
             $obj = $db->fetch_object($resql);
-            
+
             print '<tr class="oddeven">';
             print '<td>';
             $invoicestatic->id=$obj->rowid;
@@ -268,7 +266,7 @@ if ($result)
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($result);
-        
+
 
         print '<tr class="oddeven">';
 
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 32257a71a0f..271ce4da7fe 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -129,7 +129,7 @@ if ($resql)
             $invoicestatic->type=$obj->type;
             $alreadypayed=$invoicestatic->getSommePaiement();
 
-            
+
             print '<tr class="oddeven"><td>';
             print $invoicestatic->getNomUrl(1,'withdraw');
             print '</td>';
@@ -157,7 +157,7 @@ if ($resql)
     }
     else
     {
-        print '<tr '.$bc[false].'><td colspan="2" class="opacitymedium">'.$langs->trans("NoInvoiceToWithdraw").'</td></tr>';
+        print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders")).'</td></tr>';
     }
     print "</table><br>";
 }
@@ -197,7 +197,7 @@ if ($result)
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($result);
-        
+
 
         print '<tr class="oddeven">';
 
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index e9e46b6afff..208be88aeae 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -130,10 +130,24 @@ if ($result)
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
 
     $moreforfilter='';
-    
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
+    print '<tr class="liste_titre">';
+    print '<td class="liste_titre"><input type="text" class="flat" name="search_line" value="'. dol_escape_htmltag($search_line).'" size="6"></td>';
+    print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'. dol_escape_htmltag($search_bon).'" size="6"></td>';
+    print '<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre"><input type="text" class="flat" name="search_company" value="'. dol_escape_htmltag($search_company).'" size="6"></td>';
+    print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_code" value="'. dol_escape_htmltag($search_code).'" size="6"></td>';
+    print '<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpicto=$form->showFilterButtons();
+    print $searchpicto;
+    print '</td>';
+    print '</tr>';
+
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("Line"),$_SERVER["PHP_SELF"]);
     print_liste_field_titre($langs->trans("WithdrawalsReceipts"),$_SERVER["PHP_SELF"],"p.ref");
@@ -144,24 +158,10 @@ if ($result)
     print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"pl.amount","","",'align="right"');
     print_liste_field_titre('');
 	print "</tr>\n";
-	
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_line" value="'. dol_escape_htmltag($search_line).'" size="6"></td>';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'. dol_escape_htmltag($search_bon).'" size="6"></td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_company" value="'. dol_escape_htmltag($search_company).'" size="6"></td>';
-    print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_code" value="'. dol_escape_htmltag($search_code).'" size="6"></td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre" align="right">';
-    $searchpicto=$form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
 
     while ($i < min($num,$limit))
     {
-        $obj = $db->fetch_object($result);    
+        $obj = $db->fetch_object($result);
 
         print '<tr class="oddeven"><td>';
 
@@ -199,9 +199,9 @@ if ($result)
     }
     print "</table>";
     print '</div>';
-    
+
     print '</form>';
-    
+
     $db->free($result);
 }
 else
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 68f59d03cfa..599f54d97be 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2011-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014      Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2015      Charlie BENKE		<charlie@patas-monkey.com> 
+ * Copyright (C) 2015      Charlie BENKE		<charlie@patas-monkey.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	$datesp=dol_mktime(12,0,0, $_POST["datespmonth"], $_POST["datespday"], $_POST["datespyear"]);
 	$dateep=dol_mktime(12,0,0, $_POST["dateepmonth"], $_POST["dateepday"], $_POST["dateepyear"]);
 	if (empty($datev)) $datev=$datep;
-	
+
 	$object->accountid=GETPOST("accountid") > 0 ? GETPOST("accountid","int") : 0;
 	$object->fk_user=GETPOST("fk_user") > 0 ? GETPOST("fk_user","int") : 0;
 	$object->datev=$datev;
@@ -116,7 +116,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
 		$error++;
 	}
-	
+
 	if (! $error)
 	{
 		$db->begin();
@@ -229,7 +229,7 @@ if ($action == 'create')
 	print load_fiche_titre($langs->trans("NewSalaryPayment"),'', 'title_accountancy.png');
 
 	dol_fiche_head('', '');
-	
+
 	print '<table class="border" width="100%">';
 
 	// Date payment
@@ -300,7 +300,7 @@ if ($action == 'create')
 	}
 
 	// Other attributes
-	$parameters=array('colspan' => ' colspan="1"');
+	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
 	print '</table>';
@@ -351,24 +351,24 @@ if ($id)
 	print '<tr><td class="titlefield">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
 
 	print "<tr>";
-	print '<td>'.$langs->trans("DateStartPeriod").'</td><td colspan="3">';
+	print '<td>'.$langs->trans("DateStartPeriod").'</td><td>';
 	print dol_print_date($object->datesp,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("DateEndPeriod").'</td><td colspan="3">';
+	print '<tr><td>'.$langs->trans("DateEndPeriod").'</td><td>';
 	print dol_print_date($object->dateep,'day');
 	print '</td></tr>';
 
 	print "<tr>";
-	print '<td>'.$langs->trans("DatePayment").'</td><td colspan="3">';
+	print '<td>'.$langs->trans("DatePayment").'</td><td>';
 	print dol_print_date($object->datep,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("DateValue").'</td><td colspan="3">';
+	print '<tr><td>'.$langs->trans("DateValue").'</td><td>';
 	print dol_print_date($object->datev,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="3">'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
 
 	if (! empty($conf->banque->enabled))
 	{
@@ -379,7 +379,7 @@ if ($id)
 
 			print '<tr>';
 			print '<td>'.$langs->trans('BankTransactionLine').'</td>';
-			print '<td colspan="3">';
+			print '<td>';
 			print $bankline->getNomUrl(1,0,'showall');
 			print '</td>';
 			print '</tr>';
@@ -387,7 +387,7 @@ if ($id)
 	}
 
 	// Other attributes
-	$parameters=array('colspan' => ' colspan="3"');
+	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
 	print '</table>';
@@ -396,7 +396,7 @@ if ($id)
 
 	dol_fiche_end();
 
-	
+
 	/*
 	 * Action buttons
 	 */
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index e33ec6b3d55..4a3ea9ee516 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -65,7 +65,7 @@ if ($action == 'setdatev' && $user->rights->tax->charges->creer)
     $object->datev=dol_mktime(12,0,0,$_POST['datevmonth'],$_POST['datevday'],$_POST['datevyear']);
     $result=$object->update($user);
     if ($result < 0) dol_print_error($db,$object->error);
-    
+
     $action='';
 }
 
@@ -81,7 +81,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	$object->num_payment=GETPOST("num_payment");
     $object->datev=$datev;
     $object->datep=$datep;
-	
+
 	$amount = price2num(GETPOST("amount"));
 	if ($refund == 1) {
 		$amount= -$amount;
@@ -89,7 +89,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
     $object->amount= $amount;
 	$object->label=GETPOST("label");
 	$object->note=GETPOST("note");
-	
+
 	if (empty($object->datev))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateValue")), null, 'errors');
@@ -207,11 +207,11 @@ if ($action == 'create')
         print '$(document).ready(function () {
                 $("#radiopayment").click(function() {
                     $("#label").val($(this).data("label"));
-                    
+
                 });
                 $("#radiorefund").click(function() {
                     $("#label").val($(this).data("label"));
-                    
+
                 });
         });';
 		print '</script>'."\n";
@@ -282,7 +282,7 @@ if ($action == 'create')
 	print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
 
     // Other attributes
-    $parameters=array('colspan' => ' colspan="1"');
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
     print '</table>';
@@ -349,7 +349,8 @@ if ($id)
 	}
 
 	// Other attributes
-	$reshook=$hookmanager->executeHooks('formObjectOptions','',$object,$action);    // Note that $action and $object may have been modified by hook
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
 	print '</table>';
 
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index fde2e428169..67a7d9b31e4 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -316,7 +316,7 @@ if (empty($reshook))
                             $object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
 
     					    // Create thumbs
-    					    $object->addThumbs($newfile);					    
+    					    $object->addThumbs($newfile);
                         }
                     }
                 }
@@ -664,7 +664,7 @@ else
 			}
 
             // Other attributes
-            $parameters=array('colspan' => ' colspan="3"');
+            $parameters=array('colspan' => ' colspan="3"','cols'=>3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
@@ -674,7 +674,7 @@ else
             print "</table><br>";
 
 			print '<hr style="margin-bottom: 20px">';
-			
+
             // Add personnal information
             print load_fiche_titre('<div class="comboperso">'.$langs->trans("PersonalInformations").'</div>','','');
 
@@ -787,7 +787,7 @@ else
 	            print $object->ref;
 	            print '</td></tr>';
            	}
-           	
+
             // Lastname
             print '<tr><td class="titlefieldcreate fieldrequired"><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</label></td>';
             print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="minwidth200" maxlength="80" value="'.(isset($_POST["lastname"])?GETPOST("lastname"):$object->lastname).'" autofocus="autofocus"></td>';
@@ -932,7 +932,7 @@ else
 			}
 
             // Other attributes
-            $parameters=array('colspan' => ' colspan="3"');
+            $parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
@@ -1054,7 +1054,7 @@ else
         }
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
-        
+
         $morehtmlref='<div class="refidno">';
         if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
         {
@@ -1064,14 +1064,14 @@ else
             if ($objsoc->id > 0) $morehtmlref.=$objsoc->getNomUrl(1);
             else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany");
         }
-        $morehtmlref.='</div>';        
-        
+        $morehtmlref.='</div>';
+
         dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
-        
-        
+
+
         print '<div class="fichecenter">';
         print '<div class="fichehalfleft">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -1102,26 +1102,14 @@ else
         print $object->LibPubPriv($object->priv);
         print '</td></tr>';
 
-        // Note Public
-        /*
-        print '<tr><td class="tdtop">'.$langs->trans("NotePublic").'</td><td>';
-        print nl2br($object->note_public);
-        print '</td></tr>';
-
-        // Note Private
-        print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td>';
-        print nl2br($object->note_private);
-        print '</td></tr>';
-        */
-        
         print '</table>';
-        
+
         print '</div>';
         print '<div class="fichehalfright"><div class="ficheaddleft">';
-       
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
-        
+
 		// Categories
 		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) {
 			print '<tr><td class="titlefield">' . $langs->trans("Categories") . '</td>';
@@ -1130,14 +1118,10 @@ else
 			print '</td></tr>';
 		}
 
-        // Other attributes
-        $parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"');
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
-        {
-        	print $object->showOptionals($extrafields);
-        }
+    	// Other attributes
+    	$cols = 3;
+    	$parameyers=array('socid'=>$socid);
+    	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
         $object->load_ref_elements();
 
@@ -1193,10 +1177,10 @@ else
         print '</td></tr>';
 
         print "</table>";
-        
+
         print '</div></div></div>';
         print '<div style="clear:both"></div>';
-                
+
         print dol_fiche_end();
 
         // Barre d'actions
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 31e5d6f3094..3c644e4260c 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -104,13 +104,13 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook))
 {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
-	
+
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
-	
+
 	if ($action == 'confirm_active' && $confirm == 'yes' && $user->rights->contrat->activer)
 	{
 	    $result = $object->active_line($user, GETPOST('ligne'), GETPOST('date'), GETPOST('dateend'), GETPOST('comment'));
-	
+
 	    if ($result > 0)
 	    {
 	        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -136,13 +136,13 @@ if (empty($reshook))
 		        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		        exit;
 		    }
-		    else 
+		    else
 		    {
 		        setEventMessages($object->error, $object->errors, 'errors');
 		    }
 		}
 	}
-	
+
 	// Si ajout champ produit predefini
 	if (GETPOST('mode')=='predefined')
 	{
@@ -157,7 +157,7 @@ if (empty($reshook))
 	        $date_end=dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
 	    }
 	}
-	
+
 	// Si ajout champ produit libre
 	if (GETPOST('mode')=='libre')
 	{
@@ -172,7 +172,7 @@ if (empty($reshook))
 	        $date_end_sl=dol_mktime(GETPOST('date_end_slhour'), GETPOST('date_end_slmin'), 0, GETPOST('date_end_slmonth'), GETPOST('date_end_slday'), GETPOST('date_end_slyear'));
 	    }
 	}
-	
+
 	// Param dates
 	$date_contrat='';
 	$date_start_update='';
@@ -199,7 +199,7 @@ if (empty($reshook))
 	{
 	    $datecontrat = dol_mktime(GETPOST('rehour'), GETPOST('remin'), 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 	}
-	
+
 	// Add contract
 	if ($action == 'add' && $user->rights->contrat->creer)
 	{
@@ -210,29 +210,29 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 			$action='create';
 		}
-	
+
 		if ($socid<1)
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
 			$action='create';
 			$error++;
 		}
-	
+
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 		if ($ret < 0) {
 			$error ++;
 			$action = 'create';
 		}
-	
+
 		if (! $error)
 		{
 			$object->socid						= $socid;
 	    	$object->date_contrat				= $datecontrat;
-	
+
 	    	$object->commercial_suivi_id		= GETPOST('commercial_suivi_id','int');
 	    	$object->commercial_signature_id	= GETPOST('commercial_signature_id','int');
-	
+
 	    	$object->note_private				= GETPOST('note_private','alpha');
 	    	$object->note_public				= GETPOST('note_public','alpha');
 	    	$object->fk_project					= GETPOST('projectid','int');
@@ -251,33 +251,33 @@ if (empty($reshook))
 		            $element = $regs[1];
 		            $subelement = $regs[2];
 		        }
-	
+
 		        // For compatibility
 		        if ($element == 'order')    { $element = $subelement = 'commande'; }
 		        if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
-	
+
 		        $object->origin    = $origin;
 		        $object->origin_id = $originid;
-	
+
 		        // Possibility to add external linked objects with hooks
 		        $object->linked_objects[$object->origin] = $object->origin_id;
 		        if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
 		        {
 		        	$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
 		        }
-	
+
 		        $id = $object->create($user);
 		        if ($id < 0) {
 		        	setEventMessages($object->error, $object->errors, 'errors');
 		        }
-	
+
 		        if ($id > 0)
 		        {
 		            dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
-	
+
 		            $classname = ucfirst($subelement);
 		            $srcobject = new $classname($db);
-	
+
 		            dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
 		            $result=$srcobject->fetch($object->origin_id);
 		            if ($result > 0)
@@ -289,27 +289,27 @@ if (empty($reshook))
 		                	$srcobject->fetch_lines();
 		                	$lines = $srcobject->lines;
 		                }
-	
+
 		                $fk_parent_line=0;
 		                $num=count($lines);
-	
+
 		                for ($i=0;$i<$num;$i++)
 		                {
 		                    $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
-	
+
 							if ($product_type == 1 || (! empty($conf->global->CONTRACT_SUPPORT_PRODUCTS) && in_array($product_type, array(0,1)))) { 	// TODO Exclude also deee
 								// service prédéfini
 								if ($lines[$i]->fk_product > 0)
 								{
 									$product_static = new Product($db);
-	
+
 									// Define output language
 									if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
 									{
 										$prod = new Product($db);
 										$prod->id=$lines[$i]->fk_product;
 										$prod->getMultiLangs();
-	
+
 										$outputlangs = $langs;
 										$newlang='';
 										if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
@@ -319,14 +319,14 @@ if (empty($reshook))
 											$outputlangs = new Translate("",$conf);
 											$outputlangs->setDefaultLang($newlang);
 										}
-	
+
 										$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
 									}
 									else
 									{
 										$label = $lines[$i]->product_label;
 									}
-	
+
 									$desc .= ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?dol_htmlentitiesbr($lines[$i]->desc):'';
 								}
 								else {
@@ -338,7 +338,7 @@ if (empty($reshook))
 								// View third's localtaxes for now
 								$localtax1_tx = get_localtax($txtva, 1, $object->thirdparty);
 								$localtax2_tx = get_localtax($txtva, 2, $object->thirdparty);
-	
+
 			                    $result = $object->addline(
 					                $desc,
 					                $lines[$i]->subprice,
@@ -358,7 +358,7 @@ if (empty($reshook))
 			                        array(),
 				                    $lines[$i]->fk_unit
 			                    );
-	
+
 			                    if ($result < 0)
 			                    {
 			                        $error++;
@@ -372,13 +372,13 @@ if (empty($reshook))
 		                setEventMessages($srcobject->error, $srcobject->errors, 'errors');
 		                $error++;
 		            }
-		            
+
 		            // Hooks
 		            $parameters = array('objFrom' => $srcobject);
 		            $reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 		            // modified by hook
 		            if ($reshook < 0)
-		                $error++;		            
+		                $error++;
 		        }
 		        else
 		        {
@@ -401,12 +401,12 @@ if (empty($reshook))
 			}
 	    }
 	}
-	
+
 	else if ($action == 'classin' && $user->rights->contrat->creer)
 	{
 	    $object->setProject(GETPOST('projectid'));
 	}
-	
+
 	// Add a new line
 	else if ($action == 'addline' && $user->rights->contrat->creer)
 	{
@@ -425,10 +425,10 @@ if (empty($reshook))
 			$idprod=GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
-	
+
 		$qty = GETPOST('qty'.$predef);
 		$remise_percent = GETPOST('remise_percent'.$predef);
-	
+
 	    if ($qty == '')
 	    {
 	    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")), null, 'errors');
@@ -439,7 +439,7 @@ if (empty($reshook))
 	    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")), null, 'errors');
 	    	$error++;
 	    }
-	
+
 	    // Extrafields
 	    $extrafieldsline = new ExtraFields($db);
 	    $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
@@ -458,7 +458,7 @@ if (empty($reshook))
 			$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 			$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 			$price_base_type = (GETPOST('price_base_type', 'alpha')?GETPOST('price_base_type', 'alpha'):'HT');
-	
+
 	        // Ecrase $pu par celui du produit
 	        // Ecrase $desc par celui du produit
 	        // Ecrase $tva_tx par celui du produit
@@ -467,17 +467,17 @@ if (empty($reshook))
 	        {
 	            $prod = new Product($db);
 	            $prod->fetch($idprod);
-	
+
 	            // Update if prices fields are defined
 	            $tva_tx = get_default_tva($mysoc,$object->thirdparty,$prod->id);
 	            $tva_npr = get_default_npr($mysoc,$object->thirdparty,$prod->id);
 	            if (empty($tva_tx)) $tva_npr=0;
-	            
+
 	            $pu_ht = $prod->price;
 	            $pu_ttc = $prod->price_ttc;
 	            $price_min = $prod->price_min;
 	            $price_base_type = $prod->price_base_type;
-	
+
 	            // On defini prix unitaire
 	            if ($conf->global->PRODUIT_MULTIPRICES && $object->thirdparty->price_level)
 	            {
@@ -489,11 +489,11 @@ if (empty($reshook))
 	        	elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
-	
+
 					$prodcustprice = new Productcustomerprice($db);
-	
+
 					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
-	
+
 					$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
 					if ($result) {
 						if (count($prodcustprice->lines) > 0) {
@@ -504,10 +504,10 @@ if (empty($reshook))
 						}
 					}
 				}
-	
+
 				$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-				
+
 				// On reevalue prix selon taux tva car taux tva transaction peut etre different
 	            // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
 	            if ($tmpvat != $tmpprodvat)
@@ -521,7 +521,7 @@ if (empty($reshook))
 	                    $pu_ttc = price2num($pu_ht * (1 + ($tmpvat/100)), 'MU');
 	                }
 	            }
-	
+
 	           	$desc=$prod->description;
 	           	$desc=dol_concatdesc($desc,$product_desc);
 		        $fk_unit = $prod->fk_unit;
@@ -535,20 +535,20 @@ if (empty($reshook))
 	            $desc=$product_desc;
 				$fk_unit= GETPOST('units', 'alpha');
 	        }
-	
+
 	        $localtax1_tx=get_localtax($tva_tx,1,$object->thirdparty,$mysoc,$tva_npr);
 	        $localtax2_tx=get_localtax($tva_tx,2,$object->thirdparty,$mysoc,$tva_npr);
-	
+
 			// ajout prix achat
 			$fk_fournprice = $_POST['fournprice'];
 			if ( ! empty($_POST['buying_price']) )
 			  $pa_ht = $_POST['buying_price'];
 			else
 			  $pa_ht = null;
-	
+
 	        $info_bits=0;
 	        if ($tva_npr) $info_bits |= 0x01;
-	
+
 	        if($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min)))
 	        {
 	            $object->error = $langs->trans("CantBeLessThanMinPrice",price(price2num($price_min,'MU'),0,$langs,0,0,-1,$conf->currency));
@@ -577,7 +577,7 @@ if (empty($reshook))
 		            $fk_unit
 	            );
 	        }
-	
+
 	        if ($result > 0)
 	        {
 	        	// Define output language
@@ -591,14 +591,14 @@ if (empty($reshook))
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
-	
+
 					$ret = $object->fetch($id); // Reload to get new records
-	
+
 					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
-	
+
 				unset($_POST ['prod_entry_mode']);
-	
+
 				unset($_POST['qty']);
 				unset($_POST['type']);
 				unset($_POST['remise_percent']);
@@ -615,7 +615,7 @@ if (empty($reshook))
 				unset($_POST ['np_markRate']);
 				unset($_POST['dp_desc']);
 				unset($_POST['idprod']);
-	
+
 		    	unset($_POST['date_starthour']);
 		    	unset($_POST['date_startmin']);
 		    	unset($_POST['date_startsec']);
@@ -635,30 +635,30 @@ if (empty($reshook))
 	        }
 	    }
 	}
-	
+
 	else if ($action == 'updateline' && $user->rights->contrat->creer && ! GETPOST('cancel'))
 	{
 	    $objectline = new ContratLigne($db);
 	    if ($objectline->fetch(GETPOST('elrowid')))
 	    {
 	        $db->begin();
-	
+
 	        if ($date_start_real_update == '') $date_start_real_update=$objectline->date_ouverture;
 	        if ($date_end_real_update == '')   $date_end_real_update=$objectline->date_cloture;
-	
+
 	        $vat_rate = GETPOST('eltva_tx');
 	        // Define info_bits
 	        $info_bits = 0;
 	        if (preg_match('/\*/', $vat_rate))
 	            $info_bits |= 0x01;
-	             
+
     		// Define vat_rate
     		$vat_rate = str_replace('*', '', $vat_rate);
 	        $localtax1_tx=get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
 	        $localtax2_tx=get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
-		
+
 	        $txtva = $vat_rate;
-	        
+
 		    // Clean vat code
 	        $vat_src_code='';
 	        if (preg_match('/\((.*)\)/', $txtva, $reg))
@@ -666,16 +666,16 @@ if (empty($reshook))
 	            $vat_src_code = $reg[1];
 	            $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
 	        }
-	        
+
 		  	// ajout prix d'achat
 		  	$fk_fournprice = $_POST['fournprice'];
 		  	if ( ! empty($_POST['buying_price']) )
 		  	  $pa_ht = $_POST['buying_price'];
 		  	else
 		  	  $pa_ht = null;
-	
+
 		    $fk_unit = GETPOST('unit', 'alpha');
-	
+
 	        $objectline->description=GETPOST('product_desc');
 	        $objectline->price_ht=GETPOST('elprice');
 	        $objectline->subprice=GETPOST('elprice');
@@ -692,21 +692,21 @@ if (empty($reshook))
 	        $objectline->fk_user_cloture=$user->id;
 	        $objectline->fk_fournprice=$fk_fournprice;
 	        $objectline->pa_ht=$pa_ht;
-	
+
 		    if ($fk_unit > 0) {
 			    $objectline->fk_unit = GETPOST('unit');
 		    } else {
 			    $objectline->fk_unit = null;
 		    }
-	
+
 	        // Extrafields
 	        $extrafieldsline = new ExtraFields($db);
 	        $extralabelsline = $extrafieldsline->fetch_name_optionals_label($objectline->table_element);
 	        $array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
 	        $objectline->array_options=$array_options;
-	
+
 	        // TODO verifier price_min si fk_product et multiprix
-	
+
 	        $result=$objectline->update($user);
 	        if ($result > 0)
 	        {
@@ -723,11 +723,11 @@ if (empty($reshook))
 	    	setEventMessages($objectline->error, $objectline->errors, 'errors');
 	    }
 	}
-	
+
 	else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 	    $result = $object->deleteline(GETPOST('lineid'),$user);
-	
+
 	    if ($result >= 0)
 	    {
 	        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -738,23 +738,23 @@ if (empty($reshook))
 	    	setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
-	
+
 	else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 	    $result = $object->validate($user);
 	}
-	
+
 	else if ($action == 'reopen' && $user->rights->contrat->creer)
 	{
 	    $result = $object->reopen($user);
 	}
-	
+
 	// Close all lines
 	else if ($action == 'confirm_close' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 	    $object->cloture($user);
 	}
-	
+
 	else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
 	{
 		$result=$object->delete($user);
@@ -768,7 +768,7 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-	
+
 	else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		if (GETPOST('newcid') > 0)
@@ -791,39 +791,39 @@ if (empty($reshook))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("RefNewContract")), null, 'errors');
 		}
-	} 
-	else if ($action == 'update_extras') 
+	}
+	else if ($action == 'update_extras')
 	{
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
 		if ($ret < 0)
 			$error ++;
-	
+
 		if (! $error) {
-	
+
 				$result = $object->insertExtraFields();
 				if ($result < 0) {
 					$error ++;
 				}
 			} else if ($reshook < 0)
 				$error ++;
-	
+
 		if ($error) {
 			$action = 'edit_extras';
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	} 
-	elseif ($action=='setref_supplier') 
+	}
+	elseif ($action=='setref_supplier')
 	{
 		$cancelbutton = GETPOST('cancel');
 		if (!$cancelbutton) {
-	
+
 			$result = $object->fetch($id);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-	
+
 	        $result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -838,17 +838,17 @@ if (empty($reshook))
 	        exit;
 	    }
 	}
-	elseif ($action=='setref_customer') 
+	elseif ($action=='setref_customer')
 	{
 		$cancelbutton = GETPOST('cancel');
-		
+
 		if (!$cancelbutton)
 		{
 			$result = $object->fetch($id);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		
+
 	        $result = $object->setValueFrom('ref_customer', GETPOST('ref_customer','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
 	        if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -863,16 +863,16 @@ if (empty($reshook))
 	        exit;
 	    }
 	}
-	elseif ($action=='setref') 
+	elseif ($action=='setref')
 	{
 	    $cancelbutton = GETPOST('cancel');
-	
+
 	    if (!$cancelbutton) {
 	        $result = $object->fetch($id);
 	        if ($result < 0) {
 	            setEventMessages($object->error, $object->errors, 'errors');
 	        }
-	
+
 	        $result = $object->setValueFrom('ref', GETPOST('ref','alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
 	        if ($result < 0) {
 	            setEventMessages($object->error, $object->errors, 'errors');
@@ -886,11 +886,11 @@ if (empty($reshook))
 	        header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
 	        exit;
 	    }
-	} 
-	elseif ($action=='setdate_contrat') 
+	}
+	elseif ($action=='setdate_contrat')
 	{
 	    $cancelbutton = GETPOST('cancel');
-	
+
 	    if (!$cancelbutton) {
 	        $result = $object->fetch($id);
 	        if ($result < 0) {
@@ -911,13 +911,13 @@ if (empty($reshook))
 	        exit;
 	    }
 	}
-	
+
 	// Generation doc (depuis lien ou depuis cartouche doc)
 	else if ($action == 'builddoc' && $user->rights->contrat->creer) {
 		if (GETPOST('model')) {
 			$object->setDocModel($user, GETPOST('model'));
 		}
-	
+
 		// Define output language
 		$outputlangs = $langs;
 		if (! empty($conf->global->MAIN_MULTILANGS)) {
@@ -933,12 +933,12 @@ if (empty($reshook))
 	        $action='';
 		}
 	}
-	
+
 	// Remove file in doc form
 	else if ($action == 'remove_file' && $user->rights->contrat->creer) {
 		if ($object->id > 0) {
 			require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-	
+
 			$langs->load("other");
 			$upload_dir = $conf->contrat->dir_output;
 			$file = $upload_dir . '/' . GETPOST('file');
@@ -965,7 +965,7 @@ if (empty($reshook))
 		{
 			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
 			$result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
-	
+
 			if ($result >= 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -984,18 +984,18 @@ if (empty($reshook))
 				}
 			}
 		}
-	
+
 		// bascule du statut d'un contact
 		else if ($action == 'swapstatut')
 		{
 			$result=$object->swapContactStatus(GETPOST('ligne'));
 		}
-	
+
 		// Efface un contact
 		else if ($action == 'deletecontact')
 		{
 			$result = $object->delete_contact(GETPOST('lineid'));
-	
+
 			if ($result >= 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -1040,7 +1040,7 @@ llxHeader('',$langs->trans("Contract"),"");
 $form = new Form($db);
 $formfile = new FormFile($db);
 if (! empty($conf->projet->enabled)) $formproject = new FormProjets($db);
-    
+
 $objectlignestatic=new ContratLigne($db);
 
 // Load object modContract
@@ -1209,7 +1209,7 @@ if ($action == 'create')
     }
 
     // Other attributes
-    $parameters=array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"');
+    $parameters=array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"', 'cols'=>3);
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
     // Other attributes
@@ -1333,7 +1333,7 @@ else
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
-        
+
         $morehtmlref='';
         if (! empty($modCodeContract->code_auto)) {
             $morehtmlref.=$object->ref;
@@ -1341,7 +1341,7 @@ else
             $morehtmlref.=$form->editfieldkey("",'ref',$object->ref,$object,$user->rights->contrat->creer,'string','',0,3);
             $morehtmlref.=$form->editfieldval("",'ref',$object->ref,$object,$user->rights->contrat->creer,'string','',0,2);
         }
-        
+
 		$morehtmlref.='<div class="refidno">';
 		// Ref customer
 		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
@@ -1392,10 +1392,10 @@ else
 
 	    print '<div class="fichecenter">';
 	    print '<div class="underbanner clearboth"></div>';
-        
-	    
+
+
         print '<table class="border" width="100%">';
-	    
+
         // Ligne info remises tiers
         print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
         if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
@@ -1423,7 +1423,7 @@ else
         print "</table>";
 
         print '</div>';
-        
+
         if (! empty($object->brouillon) && $user->rights->contrat->creer)
         {
             print '</form>';
@@ -1615,7 +1615,7 @@ else
                         {
                             print dol_print_date($db->jdate($objp->date_debut));
                             // Warning si date prevu passee et pas en service
-                            if ($objp->statut == 0 && $db->jdate($objp->date_debut) < ($now - $conf->contrat->services->inactifs->warning_delay)) { 
+                            if ($objp->statut == 0 && $db->jdate($objp->date_debut) < ($now - $conf->contrat->services->inactifs->warning_delay)) {
                     		    $warning_delay=$conf->contrat->services->inactifs->warning_delay / 3600 / 24;
                                 $textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
                     		    print " ".img_warning($textlate);
@@ -1627,7 +1627,7 @@ else
                         if ($objp->date_fin)
                         {
                             print dol_print_date($db->jdate($objp->date_fin));
-                            if ($objp->statut == 4 && $db->jdate($objp->date_fin) < ($now - $conf->contrat->services->expires->warning_delay)) { 
+                            if ($objp->statut == 4 && $db->jdate($objp->date_fin) < ($now - $conf->contrat->services->expires->warning_delay)) {
                     		    $warning_delay=$conf->contrat->services->expires->warning_delay / 3600 / 24;
                                 $textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
                     		    print " ".img_warning($textlate);
@@ -1814,13 +1814,13 @@ else
                         $tmpaction='activateline';
                         $tmpactionpicto='play';
                         $tmpactiontext=$langs->trans("Activate");
-                        if ($objp->statut == 4) 
+                        if ($objp->statut == 4)
                         {
                             $tmpaction='unactivateline';
                             $tmpactionpicto='playstop';
                             $tmpactiontext=$langs->trans("Unactivate");
                         }
-						if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver)) 
+						if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver))
 						{
 							print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;ligne=' . $object->lines[$cursorline - 1]->id . '&amp;action=' . $tmpaction . '">';
 							print img_picto($tmpactiontext, $tmpactionpicto);
@@ -1962,7 +1962,7 @@ else
                 print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
                 print '</td>';
                 print '</tr>';
-                
+
                 print '</table>';
 
                 print '</form>';
@@ -1997,7 +1997,7 @@ else
 				$var = true;
 
 				$forcetoshowtitlelines=1;
-				
+
 				// Add free products/services
 				$object->formAddObjectLine(1, $mysoc, $soc);
 
@@ -2037,7 +2037,7 @@ else
                 if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a></div>';
                 else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Modify").'</a></div>';
             }
-            
+
             if (! empty($conf->facture->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
             {
                 $langs->load("bills");
@@ -2051,7 +2051,7 @@ else
             	if ($user->rights->commande->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateOrder").'</a></div>';
             	else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateOrder").'</a></div>';
             }
-            
+
             // Clone
             if ($user->rights->contrat->creer) {
             	print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=' . $object->element . '">' . $langs->trans("ToClone") . '</a></div>';
@@ -2083,16 +2083,16 @@ else
 
             print "</div>";
         }
-        
+
     	// Select mail models is same action as presend
     	if (GETPOST('modelselected')) {
     		$action = 'presend';
     	}
-    
+
     	if ($action != 'presend')
     	{
     		print '<div class="fichecenter"><div class="fichehalfleft">';
-    
+
     		/*
     		 * Documents generes
     		*/
@@ -2101,25 +2101,25 @@ else
     		$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
     		$genallowed = $user->rights->contrat->creer;
     		$delallowed = $user->rights->contrat->supprimer;
-    
+
     		$var = true;
-    
+
     		print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
-    
-    
+
+
     			// Show links to link elements
     			$linktoelem = $form->showLinkToObjectBlock($object, null, array('contrat'));
     			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-    
-    
+
+
     		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-    
+
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'contract', $socid);
 
-    
+
     		print '</div></div></div>';
     	}
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index fe93387cadb..7656d8bcc06 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -89,13 +89,13 @@ abstract class CommonObject
      * @var Object      To store a cloned copy of object before to edit it and keep track of old properties
      */
     public $oldcopy;
-   
+
     /**
      * @var string		Column name of the ref field.
      */
     protected $table_ref_field = '';
 
-    
+
 
     // Following vars are used by some objects only. We keep this property here in CommonObject to be able to provide common method using them.
 
@@ -330,10 +330,10 @@ abstract class CommonObject
     public $firstname;
     public $civility_id;
 
-    
+
     // No constructor as it is an abstract class
 
-    
+
     /**
      * Check an object id/ref exists
      * If you don't need/want to instantiate object and just need to know if object exists, use this method instead of fetch
@@ -398,7 +398,7 @@ abstract class CommonObject
         $lastname=$this->lastname;
         $firstname=$this->firstname;
         if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
-        
+
         $ret='';
         if ($option && $this->civility_id)
         {
@@ -597,11 +597,11 @@ abstract class CommonObject
             dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT");
             return -3;
         }
-            
+
         $datecreate = dol_now();
 
         $this->db->begin();
-        
+
         // Insertion dans la base
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
         $sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
@@ -1238,19 +1238,19 @@ abstract class CommonObject
     function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $fuser=null, $trigkey='')
     {
         global $user,$langs,$conf;
-        
+
         if (empty($table)) 	  $table=$this->table_element;
         if (empty($id))    	  $id=$this->id;
 		if (empty($format))   $format='text';
 		if (empty($id_field)) $id_field='rowid';
 
 		$error=0;
-		
+
         $this->db->begin();
 
         // Special case
         if ($table == 'product' && $field == 'note_private') $field='note';
-        
+
         $sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
         if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
         else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);
@@ -1396,13 +1396,13 @@ abstract class CommonObject
         }
 
         $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        if ($this->table_element == 'actioncomm') 
+        if ($this->table_element == 'actioncomm')
         {
             if ($projectid) $sql.= ' SET fk_project = '.$projectid;
             else $sql.= ' SET fk_project = NULL';
-            $sql.= ' WHERE id = '.$this->id; 
+            $sql.= ' WHERE id = '.$this->id;
         }
-        else 
+        else
         {
             if ($projectid) $sql.= ' SET fk_projet = '.$projectid;
             else $sql.= ' SET fk_projet = NULL';
@@ -1535,7 +1535,7 @@ abstract class CommonObject
 						if($mode == 1) {
 							$line->subprice = 0;
 						}
-						
+
 						switch ($this->element) {
 							case 'propal':
 								$this->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
@@ -1626,7 +1626,7 @@ abstract class CommonObject
     /**
      *	Define delivery address
      *  @deprecated
-     *  
+     *
      *	@param      int		$id		Address id
      *	@return     int				<0 si ko, >0 si ok
      */
@@ -1950,7 +1950,7 @@ abstract class CommonObject
 	{
 	    $fieldposition = 'rang';
 	    if ($this->table_element_line == 'ecm_files') $fieldposition = 'position';
-	    
+
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 		$sql.= ' WHERE rowid = '.$rowid;
 
@@ -2163,7 +2163,7 @@ abstract class CommonObject
     function update_note($note,$suffix='')
     {
         global $user;
-        
+
     	if (! $this->table_element)
     	{
     		dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);
@@ -2177,7 +2177,7 @@ abstract class CommonObject
         // Special cas
         //var_dump($this->table_element);exit;
 		if ($this->table_element == 'product') $suffix='';
-            
+
     	$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
     	$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
     	$sql.= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))?"fk_user_mod":"fk_user_modif")." = ".$user->id;
@@ -2188,7 +2188,7 @@ abstract class CommonObject
     	{
     		if ($suffix == '_public') $this->note_public = $note;
     		else if ($suffix == '_private') $this->note_private = $note;
-    		else 
+    		else
     		{
     		    $this->note = $note;      // deprecated
     		    $this->note_private = $note;
@@ -2437,7 +2437,7 @@ abstract class CommonObject
     	// Special case
     	if ($origin == 'order') $origin='commande';
     	if ($origin == 'invoice') $origin='facture';
-    	
+
         $this->db->begin();
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
@@ -2470,10 +2470,10 @@ abstract class CommonObject
      *	Fetch array of objects linked to current object. Links are loaded into this->linkedObjects array and this->linkedObjectsIds
      *  Possible usage for parameters:
      *  - all parameters empty -> we look all link to current object (current object can be source or target)
-     *  - source id+type -> will get target list linked to source 
-     *  - target id+type -> will get source list linked to target 
-     *  - source id+type + target type -> will get target list of the type 
-     *  - target id+type + target source -> will get source list of the type 
+     *  - source id+type -> will get target list linked to source
+     *  - target id+type -> will get source list linked to target
+     *  - source id+type + target type -> will get target list of the type
+     *  - target id+type + target source -> will get source list of the type
      *
      *	@param	int		$sourceid		Object source id (if not defined, id of object)
      *	@param  string	$sourcetype		Object source type (if not defined, element name of object)
@@ -2791,7 +2791,7 @@ abstract class CommonObject
     	global $user,$langs,$conf;
 
     	$savElementId=$elementId;  // To be used later to know if we were using the method using the id of this or not.
-    	
+
         $elementId = (!empty($elementId)?$elementId:$this->id);
         $elementTable = (!empty($elementType)?$elementType:$this->table_element);
 
@@ -2821,7 +2821,7 @@ abstract class CommonObject
             if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';
             if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
             if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
-            
+
             if ($trigkey)
             {
                 // Appel des triggers
@@ -2837,7 +2837,7 @@ abstract class CommonObject
 			if (! $error)
 			{
 				$this->db->commit();
-				
+
         		if (empty($savElementId))    // If the element we update was $this (so $elementId is null)
         		{
         		    $this->statut = $status;
@@ -2932,7 +2932,7 @@ abstract class CommonObject
     function isObjectUsed($id=0)
     {
         if (empty($id)) $id=$this->id;
-        
+
         // Check parameters
         if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)
         {
@@ -3049,12 +3049,12 @@ abstract class CommonObject
 
         foreach ($this->lines as $line)
         {
-            if (isset($line->qty_asked))   
+            if (isset($line->qty_asked))
             {
                 if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''
                 $totalOrdered+=$line->qty_asked;    // defined for shipment only
             }
-            if (isset($line->qty_shipped)) 
+            if (isset($line->qty_shipped))
             {
                 if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''
                 $totalToShip+=$line->qty_shipped;   // defined for shipment only
@@ -3082,7 +3082,7 @@ abstract class CommonObject
 
             if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''
             if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''
-            
+
             //var_dump($line->volume_units);
             if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
             {
@@ -3318,54 +3318,54 @@ abstract class CommonObject
 		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) $usemargins=1;
 
 		$num = count($this->lines);
-		
+
 		//Line extrafield
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafieldsline = new ExtraFields($this->db);
 		$extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);
-		
+
 		$parameters = array('num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
 		$reshook = $hookmanager->executeHooks('printObjectLineTitle', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook))
 		{
     		print '<tr class="liste_titre nodrag nodrop">';
-    
+
     		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
-    
+
     		// Description
     		print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
-    
+
     		if ($this->element == 'supplier_proposal')
     		{
     			print '<td class="linerefsupplier" align="right"><span id="title_fourn_ref">'.$langs->trans("SupplierProposalRefFourn").'</span></td>';
     		}
-    
+
     		// VAT
     		print '<td class="linecolvat" align="right" width="80">'.$langs->trans('VAT').'</td>';
-    
+
     		// Price HT
     		print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
-    
+
     		// Multicurrency
     		if (!empty($conf->multicurrency->enabled)) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
-    
+
     		if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
-    
+
     		// Qty
     		print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';
-    
+
     		if($conf->global->PRODUCT_USE_UNITS)
     		{
     			print '<td class="linecoluseunit" align="left">'.$langs->trans('Unit').'</td>';
     		}
-    
+
     		// Reduction short
     		print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';
-    
+
     		if ($this->situation_cycle_ref) {
     			print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';
     		}
-    
+
     		if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
     		{
     			if (!empty($user->rights->margins->creer))
@@ -3373,32 +3373,32 @@ abstract class CommonObject
     				if ($conf->global->MARGIN_TYPE == "1")
     					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
     				else
-    					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';	
+    					print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';
     			}
-    			
+
     			if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
     				print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
     			if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
     				print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';
     		}
-    
+
     		// Total HT
     		print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';
-    
+
     		// Multicurrency
     		if (!empty($conf->multicurrency->enabled)) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
-    
+
             if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
-    
+
     		print '<td class="linecoledit"></td>';  // No width to allow autodim
-    
+
     		print '<td class="linecoldelete" width="10"></td>';
-    
+
     		print '<td class="linecolmove" width="10"></td>';
-    
+
     		print "</tr>\n";
 		}
-		
+
 		$var = true;
 		$i	 = 0;
 
@@ -3407,7 +3407,7 @@ abstract class CommonObject
 			//Line extrafield
 			$line->fetch_optionals($line->id,$extralabelslines);
 
-			
+
 
 			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
             if (is_object($hookmanager))   // Old code is commented on preceding line.
@@ -3588,7 +3588,7 @@ abstract class CommonObject
 
         foreach ($this->lines as $line)
         {
-            
+
 
             if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
             {
@@ -3868,7 +3868,7 @@ abstract class CommonObject
 			$modele=$tmp[0];
 			$srctemplatepath=$tmp[1];
 		}
-		
+
 
 		// Search template files
 		$file=''; $classname=''; $filefound=0;
@@ -3897,7 +3897,7 @@ abstract class CommonObject
 		if ($filefound)
 		{
 			global $db;  // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db
-		    
+
 			require_once $file;
 
 			$obj = new $classname($this->db);
@@ -3956,7 +3956,7 @@ abstract class CommonObject
 			// output format that does not support UTF8.
 			$sav_charset_output=$outputlangs->charset_output;
 
-			if (in_array(get_class($this), array('Adherent'))) 
+			if (in_array(get_class($this), array('Adherent')))
 			{
 			    $arrayofrecords = array();   // The write_file of templates of adherent class need this
 			    $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
@@ -4104,25 +4104,36 @@ abstract class CommonObject
      *  Function to get extra fields of a member into $this->array_options
      *  This method is in most cases called by method fetch of objects but you can call it separately.
      *
-     *  @param	int		$rowid			Id of line
-     *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label()
+     *  @param	int		$rowid			Id of line. Use the id of object if not defined. Deprecated. Function must be called without parameters.
+     *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label(). Deprecated. Function must be called without parameters.
      *  @return	int						<0 if error, 0 if no optionals to find nor found, 1 if a line is found and optional loaded
      */
     function fetch_optionals($rowid=null,$optionsArray=null)
     {
     	if (empty($rowid)) $rowid=$this->id;
 
-        //To avoid SQL errors. Probably not the better solution though
+        // To avoid SQL errors. Probably not the better solution though
         if (!$this->table_element) {
             return 0;
         }
 
         if (! is_array($optionsArray))
         {
-            // optionsArray not already loaded, so we load it
-            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-            $extrafields = new ExtraFields($this->db);
-            $optionsArray = $extrafields->fetch_name_optionals_label($this->table_element);
+            // $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.
+            // TODO Use of existing extrafield is not yet ready (must mutualize code that use extrafields in form first)
+            // global $extrafields;
+            //if (! is_object($extrafields))
+            //{
+                require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+                $extrafields = new ExtraFields($this->db);
+            //}
+
+            // Load array of extrafields for elementype = $this->table_element
+            if (empty($extrafields->attributes[$this->table_element]['loaded']))
+            {
+                $extrafields->fetch_name_optionals_label($this->table_element);
+            }
+            $optionsArray = $extrafields->attributes[$this->table_element]['label'];
         }
 
         // Request to get complementary values
@@ -4131,12 +4142,15 @@ abstract class CommonObject
             $sql = "SELECT rowid";
             foreach ($optionsArray as $name => $label)
             {
-                $sql.= ", ".$name;
+                if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')
+                {
+                    $sql.= ", ".$name;
+                }
             }
             $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields";
             $sql.= " WHERE fk_object = ".$rowid;
 
-            dol_syslog(get_class($this)."::fetch_optionals", LOG_DEBUG);
+            dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -4217,7 +4231,7 @@ abstract class CommonObject
             require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
             $extrafields = new ExtraFields($this->db);
             $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
-            
+
             //Eliminate copied source object extra_fields that do not exist in target object
             $new_array_options=array();
             foreach ($this->array_options as $key => $value) {
@@ -4266,7 +4280,7 @@ abstract class CommonObject
     						{
     							if (is_numeric($value)) $res=$object->fetch($value);
 								else $res=$object->fetch('',$value);
-								
+
     							if ($res > 0) $this->array_options[$key]=$object->id;
     							else
     							{
@@ -4678,7 +4692,7 @@ abstract class CommonObject
 		}
 		return $buyPrice;
 	}
-	
+
 	/**
 	 * Function test if type is date
 	 *
@@ -4690,7 +4704,7 @@ abstract class CommonObject
 		if(isset($info['type']) && $info['type']=='date') return true;
 		else return false;
 	}
-	
+
 	/**
 	 * Function test if type is array
 	 *
@@ -4706,7 +4720,7 @@ abstract class CommonObject
 		}
 		else return false;
 	}
-	
+
 	/**
 	 * Function test if type is null
 	 *
@@ -4722,7 +4736,7 @@ abstract class CommonObject
 		}
 		else return false;
 	}
-	
+
 	/**
 	 * Function test if type is integer
 	 *
@@ -4738,7 +4752,7 @@ abstract class CommonObject
 		}
 		else return false;
 	}
-	
+
 	/**
 	 * Function test if type is float
 	 *
@@ -4754,7 +4768,7 @@ abstract class CommonObject
 		}
 		else return false;
 	}
-	
+
 	/**
 	 * Function test if type is text
 	 *
@@ -4770,7 +4784,7 @@ abstract class CommonObject
 		}
 		else return false;
 	}
-	
+
 	/**
 	 * Function test if is indexed
 	 *
@@ -4786,7 +4800,7 @@ abstract class CommonObject
 		}
 		else return false;
 	}
-	
+
 	/**
 	 * Function to prepare the values to insert
 	 *
@@ -4829,7 +4843,7 @@ abstract class CommonObject
 				$query[$field] = $this->{$field};
 			}
 		}
-		
+
 		return $query;
 	}
 
@@ -4843,30 +4857,30 @@ abstract class CommonObject
 	 */
 	public function createCommon(User $user, $notrigger = false)
 	{
-	    
+
 	    $fields = array_merge(array('datec'=>$this->db->idate(dol_now())), $this->set_save_query());
-	    
+
 	    foreach ($fields as $k => $v) {
-	    	
+
 	    	$keys[] = $k;
 	    	$values[] = $this->quote($v);
-	    	
+
 	    }
 	    $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'
 					( '.implode( ",", $keys ).' )
 					VALUES ( '.implode( ",", $values ).' ) ';
 	    $res = $this->db->query( $sql );
 	    if($res===false) {
-	    	
+
 	    	return false;
 	    }
-	    
+
 	    // TODO Add triggers
-	    
+
 	    return true;
-	    
+
 	}
-	
+
 	/**
 	 * Function to load data into current object this
 	 *
@@ -4905,10 +4919,10 @@ abstract class CommonObject
 			{
 				$this->{$field} = $obj->{$field};
 			}
-			
+
 		}
 	}
-	
+
 	/**
 	 * Function to concat keys of fields
 	 *
@@ -4919,7 +4933,7 @@ abstract class CommonObject
 		$keys = array_keys($this->fields);
 		return implode(',', $keys);
 	}
-	
+
 	/**
 	 * Load object in memory from the database
 	 *
@@ -4930,12 +4944,12 @@ abstract class CommonObject
 	 */
 	public function fetchCommon($id, $ref = null)
 	{
-	    
+
 		if (empty($id) && empty($ref)) return false;
-		
+
 		$sql = 'SELECT '.$this->get_field_list().', datec, tms';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		
+
 		if(!empty($id)) $sql.= ' WHERE rowid = '.$id;
 		else  $sql.= ' WHERE ref = \''.$this->quote($ref).'\'';
 
@@ -4946,10 +4960,10 @@ abstract class CommonObject
     		{
     			$this->id = $id;
     			$this->set_vars_by_db($obj);
-    			
+
     			$this->datec = $this->db->idate($obj->datec);
     			$this->tms = $this->db->idate($obj->tms);
-    			
+
     			return $this->id;
     		}
     		else
@@ -4978,9 +4992,9 @@ abstract class CommonObject
 	public function updateCommon(User $user, $notrigger = false)
 	{
 		$fields = $this->set_save_query();
-		
+
 		foreach ($fields as $k => $v) {
-			
+
 			if (is_array($key)){
 				$i=array_search($k, $key);
 				if ( $i !== false) {
@@ -4993,22 +5007,22 @@ abstract class CommonObject
 					continue;
 				}
 			}
-			
+
 			$tmp[] = $k.'='.$this->quote($v);
 		}
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode( ',', $tmp ).' WHERE rowid='.$this->id ;
 		$res = $this->db->query( $sql );
-		
+
 		if($res===false) {
 			//error
 			return false;
 		}
-		
+
 		// TODO Add triggers
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * Delete object in database
 	 *
@@ -5020,14 +5034,14 @@ abstract class CommonObject
 	public function deleteCommon(User $user, $notrigger = false)
 	{
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
-		
+
 		$res = $this->db->query( $sql );
 		if($res===false) {
 			return false;
 		}
-		
+
 		// TODO Add triggers
-		
+
 		return true;
 	}
 
@@ -5038,12 +5052,12 @@ abstract class CommonObject
 	 * @return string|int
 	 */
 	protected function quote($value) {
-	
+
 	    if(is_null($value)) return 'NULL';
 	    else if(is_numeric($value)) return $value;
 	    else return "'".$this->db->escape( $value )."'";
-	
+
 	}
-	
+
 }
 
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 16214e10bf1..754a8300366 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -69,6 +69,9 @@ class ExtraFields
 	// Array to store if extra field is hidden
 	var $attribute_hidden;		// warning, do not rely on this. If your module need a hidden data, it must use its own table.
 
+	// New array to store extrafields definition
+	var $attributes;
+
 	var $error;
 	var $errno;
 
@@ -640,26 +643,29 @@ class ExtraFields
 
 
 	/**
-	 * 	Load array this->attribute_xxx like attribute_label, attribute_type, ...
+	 * 	Load array this->attributes, or old this->attribute_xxx like attribute_label, attribute_type, ...
 	 *
-	 * 	@param	string		$elementtype		Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...)
-	 * 	@param	boolean		$forceload			Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED
-	 * 	@return	array							Array of attributes for all extra fields
+	 * 	@param	string		$elementtype		Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...).
+	 * 	@param	boolean		$forceload			Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED. Deprecated. Should not be required.
+	 * 	@return	array							Array of attributes keys+label for all extra fields.
 	 */
 	function fetch_name_optionals_label($elementtype,$forceload=false)
 	{
 		global $conf;
 
-		if ( empty($elementtype) ) return array();
+		if (empty($elementtype) ) return array();
 
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 		if ($elementtype == 'contact') $elementtype='socpeople';
 
 		$array_name_label=array();
 
-		// For avoid conflicts with external modules
+		// To avoid conflicts with external modules. TODO Remove this.
 		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
 
+		// We should not have several time this log. If we have, there is some optimization to do by calling a simple $object->fetch_optionals() that include cache management.
+		dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);
+
 		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,list,ishidden,fielddefault,fieldcomputed";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity IN (0,".$conf->entity.")";
@@ -673,12 +679,13 @@ class ExtraFields
 			{
 				while ($tab = $this->db->fetch_object($resql))
 				{
-					// we can add this attribute to adherent object
+					// We can add this attribute to object. TODO Remove this and return $this->attributes[$elementtype]['label']
 					if ($tab->type != 'separate')
 					{
 						$array_name_label[$tab->name]=$tab->label;
 					}
 
+					// Old usage
 					$this->attribute_type[$tab->name]=$tab->type;
 					$this->attribute_label[$tab->name]=$tab->label;
 					$this->attribute_size[$tab->name]=$tab->size;
@@ -693,8 +700,25 @@ class ExtraFields
 					$this->attribute_perms[$tab->name]=$tab->perms;
 					$this->attribute_list[$tab->name]=$tab->list;
 					$this->attribute_hidden[$tab->name]=$tab->ishidden;
+
+					// New usage
+					$this->attributes[$tab->elementtype]['type'][$tab->name]=$tab->type;
+					$this->attributes[$tab->elementtype]['label'][$tab->name]=$tab->label;
+					$this->attributes[$tab->elementtype]['size'][$tab->name]=$tab->size;
+					$this->attributes[$tab->elementtype]['elementtype'][$tab->name]=$tab->elementtype;
+					$this->attributes[$tab->elementtype]['default'][$tab->name]=$tab->fielddefault;
+					$this->attributes[$tab->elementtype]['computed'][$tab->name]=$tab->fieldcomputed;
+					$this->attributes[$tab->elementtype]['unique'][$tab->name]=$tab->fieldunique;
+					$this->attributes[$tab->elementtype]['required'][$tab->name]=$tab->fieldrequired;
+					$this->attributes[$tab->elementtype]['param'][$tab->name]=($tab->param ? unserialize($tab->param) : '');
+					$this->attributes[$tab->elementtype]['pos'][$tab->name]=$tab->pos;
+					$this->attributes[$tab->elementtype]['alwayseditable'][$tab->name]=$tab->alwayseditable;
+					$this->attributes[$tab->elementtype]['perms'][$tab->name]=$tab->perms;
+					$this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list;
+					$this->attributes[$tab->elementtype]['ishidden'][$tab->name]=$tab->ishidden;
 				}
 			}
+			if ($elementtype) $this->attributes[$elementtype]['loaded']=1;
 		}
 		else
 		{
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index fcb92f1b525..9c9813e18ca 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -17,22 +17,28 @@
  *
  * Need to have following variables defined:
  * $object (invoice, order, ...)
+ * $action
  * $conf
  * $langs
  *
+ * $parameters
  * $cols
  */
 ?>
-<!-- BEGIN PHP TEMPLATE admin_extrafields_view.tpl.php -->
+<!-- BEGIN PHP TEMPLATE extrafields_view.tpl.php -->
 <?php
 
-//$res = $object->fetch_optionals($object->id, $extralabels);
-$parameters = array('colspan' => ' colspan="'.$cols.'"', 'cols' => $cols, 'socid' => $object->fk_soc);
-$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
+if (! is_array($parameters)) $parameters = array();
+if (! empty($cols)) $parameters['colspan'] = ' colspan="'.$cols.'"';
+if (! empty($cols)) $parameters['cols'] = $cols;
+if (! empty($object->fk_soc)) $parameters['socid'] = $object->fk_soc;
 
-if (empty($reshook) && ! empty($extrafields->attribute_label))
+$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element]['label']))
 {
-	foreach ($extrafields->attribute_label as $key => $label)
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
 	{
 		if ($action == 'edit_extras')
 		{
@@ -42,54 +48,63 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			$value = $object->array_options["options_" . $key];
 		}
-		if ($extrafields->attribute_type[$key] == 'separate')
+		if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
 		{
 			print $extrafields->showSeparator($key);
 		}
 		else
 		{
-			if (!empty($extrafields->attribute_hidden[$key])) print '<tr class="hideobject"><td>';
+			if (! empty($extrafields->attributes[$object->table_element]['ishidden'][$key])) print '<tr class="hideobject"><td>';
 			else print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding">';
 			print '<tr>';
 			print '<td';
 			//var_dump($action);exit;
-			if ((! empty($action) && ($action == 'create' || $action == 'edit')) && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+			if ((! empty($action) && ($action == 'create' || $action == 'edit')) && ! empty($extrafields->attributes[$object->table_element]['required'][$key])) print ' class="fieldrequired"';
 			print '>' . $langs->trans($label) . '</td>';
 
 			//TODO Improve element and rights detection
 			//var_dump($user->rights);
 			$permok=false;
+
 			$keyforperm=$object->element;
 			if ($object->element == 'fichinter') $keyforperm='ficheinter';
 			if (isset($user->rights->$keyforperm)) $permok=$user->rights->$keyforperm->creer||$user->rights->$keyforperm->create||$user->rights->$keyforperm->write;
-			if ($object->element=='order_supplier') $permok=$user->rights->fournisseur->commande->creer;
+
+			if ($object->element=='order_supplier')   $permok=$user->rights->fournisseur->commande->creer;
 			if ($object->element=='invoice_supplier') $permok=$user->rights->fournisseur->facture->creer;
-			if ($object->element=='shipping') $permok=$user->rights->expedition->creer;
-			if ($object->element=='delivery') $permok=$user->rights->expedition->livraison->creer;
-			if ($object->element=='productlot') $permok=$user->rights->stock->creer;
-
-			if (($object->statut == 0 || $extrafields->attribute_alwayseditable[$key])
-				&& $permok && ($action != 'edit_extras' || GETPOST('attribute') != $key))
-				print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
+			if ($object->element=='shipping')         $permok=$user->rights->expedition->creer;
+			if ($object->element=='delivery')         $permok=$user->rights->expedition->livraison->creer;
+			if ($object->element=='productlot')       $permok=$user->rights->stock->creer;
 
+			if (($object->statut == 0 || ! empty($extrafields->attributes[$object->table_element]['alwayseditable'][$key]))
+				&& $permok && ($action != 'edit_extras' || GETPOST('attribute') != $key)
+			    && empty($extrafields->attributes[$object->table_element]['computed'][$key]))
+			{
+			    $fieldid='id';
+			    if ($object->table_element == 'societe') $fieldid='socid';
+				print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
+			}
 			print '</tr></table>';
 			$html_id = !empty($object->id) ? $object->element.'_extras_'.$key.'_'.$object->id : '';
 			print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$key.'" colspan="'.$cols.'">';
 
 			// Convert date into timestamp format
-			if (in_array($extrafields->attribute_type[$key], array('date','datetime'))) {
+			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('date','datetime'))) {
 				$value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $db->jdate($object->array_options['options_' . $key]);
 			}
 
 			//TODO Improve element and rights detection
 			if ($action == 'edit_extras' && $permok && GETPOST('attribute') == $key)
 			{
-				print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formextra">';
+			    $fieldid='id';
+			    if ($object->table_element == 'societe') $fieldid='socid';
+
+			    print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formextra">';
 				print '<input type="hidden" name="action" value="update_extras">';
 				print '<input type="hidden" name="attribute" value="' . $key . '">';
 				print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-				print '<input type="hidden" name="id" value="' . $object->id . '">';
+				print '<input type="hidden" name="'.$fieldid.'" value="' . $object->id . '">';
 
 				print $extrafields->showInputField($key, $value,'','','',0,$object->id);
 
@@ -102,8 +117,41 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 				print $extrafields->showOutputField($key, $value);
 			}
 			print '</td></tr>' . "\n";
+
+			print "\n";
+			// Add code to manage list depending on others
+			if (! empty($conf->use_javascript_ajax))
+			    print '
+				<script type="text/javascript">
+				    jQuery(document).ready(function() {
+				    	function showOptions(child_list, parent_list)
+				    	{
+				    		var val = $("select[name=\"options_"+parent_list+"\"]").val();
+				    		var parentVal = parent_list + ":" + val;
+							if(val > 0) {
+					    		$("select[name=\""+child_list+"\"] option[parent]").hide();
+					    		$("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show();
+							} else {
+								$("select[name=\""+child_list+"\"] option").show();
+							}
+				    	}
+						function setListDependencies() {
+					    	jQuery("select option[parent]").parent().each(function() {
+					    		var child_list = $(this).attr("name");
+								var parent = $(this).find("option[parent]:first").attr("parent");
+								var infos = parent.split(":");
+								var parent_list = infos[0];
+								$("select[name=\""+parent_list+"\"]").change(function() {
+									showOptions(child_list, parent_list);
+								});
+					    	});
+						}
+
+						setListDependencies();
+				    });
+				</script>'."\n";
 		}
 	}
 }
 ?>
-<!-- END PHP TEMPLATE admin_extrafields_view.tpl.php -->
\ No newline at end of file
+<!-- END PHP TEMPLATE extrafields_view.tpl.php -->
\ No newline at end of file
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 882b80ec339..8e1bd00d893 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -50,7 +50,7 @@ $cancel=GETPOST('cancel');
 $amount=GETPOST('amount');
 $donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
-    
+
 $object = new Don($db);
 $extrafields = new ExtraFields($db);
 
@@ -336,7 +336,7 @@ if ($action == 'create')
     print '</tr>';
 
 	// Country
-    print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
+    print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td class="maxwidthonsmartphone">';
     print $form->select_country(GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id);
     if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
     print '</td></tr>';
@@ -346,7 +346,7 @@ if ($action == 'create')
 	// Public note
 	print '<tr>';
 	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
-	print '<td valign="top" colspan="2">';
+	print '<td>';
 
     $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
@@ -356,7 +356,7 @@ if ($action == 'create')
 	if (empty($user->societe_id)) {
 		print '<tr>';
 		print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
-		print '<td valign="top" colspan="2">';
+		print '<td>';
 
 		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 		print $doleditor->Create(1);
@@ -371,7 +371,7 @@ if ($action == 'create')
     }
 
     // Other attributes
-    $parameters=array('colspan' => 3);
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
@@ -442,7 +442,7 @@ if (! empty($id) && $action == 'edit')
 	}
 	else
 	{
-		print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="2">';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
 		print price($object->amount,0,$langs,0,0,-1,$conf->currency);
 		print '</td></tr>';
 	}
@@ -467,7 +467,7 @@ if (! empty($id) && $action == 'edit')
 	print '</tr>';
 
 	// Country
-	print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td colspan="3">';
+	print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
 	print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id');
 	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 	print '</td></tr>';
@@ -496,7 +496,7 @@ if (! empty($id) && $action == 'edit')
     }
 
     // Other attributes
-    $parameters=array('colspan' => ' colspan="2"');
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
@@ -544,9 +544,9 @@ if (! empty($id) && $action != 'edit')
 
 	// Print form confirm
 	print $formconfirm;
-	
+
 	$linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
+
 	$morehtmlref='<div class="refidno">';
 	// Project
 	if (! empty($conf->projet->enabled))
@@ -581,8 +581,8 @@ if (! empty($id) && $action != 'edit')
 	    }
 	}
 	$morehtmlref.='</div>';
-	
-	
+
+
     dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
 
@@ -620,7 +620,7 @@ if (! empty($id) && $action != 'edit')
 	// Zip / Town
 	print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
 	print $object->zip.($object->zip && $object->town?' / ':'').$object->town.'</td></tr>';
-	
+
 	// Country
 	print '<tr><td>'.$langs->trans('Country').'</td><td>';
 	if (! empty($object->country_code))
@@ -634,18 +634,18 @@ if (! empty($id) && $action != 'edit')
 	    print $object->country_olddata;
 	}
 	print '</td></tr>';
-	
+
 	// EMail
 	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td>'.dol_print_email($object->email).'</td></tr>';
 	*/
-	
+
 	// Payment mode
 	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
 	$form->form_modes_reglement(null, $object->modepaymentid,'none');
 	print "</td></tr>\n";
-	
+
 	//print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
-	
+
 	// Project
 	/*
 	if (! empty($conf->projet->enabled))
@@ -660,7 +660,7 @@ if (! empty($id) && $action != 'edit')
 	    print '</td>';
 	    print '</tr>';
 	}*/
-	
+
 	// Other attributes
 	$cols = 2;
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
@@ -702,7 +702,7 @@ if (! empty($id) && $action != 'edit')
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
-			
+
 			print '<tr class="oddeven"><td>';
 			print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
 			print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 8a5811a790a..2c34f5eddcd 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -115,12 +115,12 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel) 
-	{ 
-		$action = ''; 
+    if ($cancel)
+	{
+		$action = '';
 		$object->fetch($id); // show shipment also after canceling modification
 	}
-    
+
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
 
 	// Set incoterm
@@ -129,13 +129,13 @@ if (empty($reshook))
 	    $object->fetch($id);
 	    $result = $object->reOpen();
 	}
-	
+
 	// Set incoterm
 	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
 	{
 	    $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 	}
-	
+
 	if ($action == 'setref_customer')
 	{
         $result = $object->fetch($id);
@@ -152,14 +152,14 @@ if (empty($reshook))
             exit;
         }
 	}
-	
+
 	if ($action == 'update_extras')
 	{
 	    // Fill array 'array_options' with data from update form
 	    $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 	    $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
 	    if ($ret < 0) $error++;
-	
+
 	    if (! $error)
 	    {
 	        // Actions on extra fields (by external module or standard code)
@@ -175,11 +175,11 @@ if (empty($reshook))
 	        } else if ($reshook < 0)
 	            $error++;
 	    }
-	
+
 	    if ($error)
 	        $action = 'edit_extras';
 	}
-	
+
 	// Create shipment
 	if ($action == 'add' && $user->rights->expedition->creer)
 	{
@@ -251,18 +251,18 @@ if (empty($reshook))
     				    $sub_qty[$j]['q']=GETPOST($qty,'int');				// the qty we want to move for this stock record
     				    $sub_qty[$j]['id_batch']=GETPOST($batch,'int');		// the id into llx_product_batch of stock record to move
     					$subtotalqty+=$sub_qty[$j]['q'];
-    				
+
     					//var_dump($qty);var_dump($batch);var_dump($sub_qty[$j]['q']);var_dump($sub_qty[$j]['id_batch']);
-    					
+
     					$j++;
     					$batch="batchl".$i."_".$j;
     					$qty = "qtyl".$i.'_'.$j;
     				}
-    
+
     				$batch_line[$i]['detail']=$sub_qty;		// array of details
     				$batch_line[$i]['qty']=$subtotalqty;
     				$batch_line[$i]['ix_l']=GETPOST($idl,'int');
-    
+
     				$totalqty+=$subtotalqty;
 			    }
 			    else
@@ -289,11 +289,11 @@ if (empty($reshook))
 			        $stockLine[$i][$j]['ix_l']=GETPOST($idl,'int');
 
 			        $totalqty+=GETPOST($qty,'int');
-			        
+
 			        $j++;
 			        $stockLocation="ent1".$i."_".$j;
 			        $qty = "qtyl".$i.'_'.$j;
-			    }			    
+			    }
 			}
 			else
 			{
@@ -301,7 +301,7 @@ if (empty($reshook))
 				//shipment line for product with no batch management and no multiple stock location
 				if (GETPOST($qty,'int') > 0) $totalqty+=GETPOST($qty,'int');
 			}
-				
+
 			// Extrafields
 			$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
             $array_options[$i] = $extrafieldsline->getOptionalsFromPost($extralabelsline, $i);
@@ -312,9 +312,9 @@ if (empty($reshook))
 					unset($_POST["options_" . $key]);
 				}
 			}
-			
+
 	    }
-	
+
 	    //var_dump($batch_line[2]);
 
 	    if ($totalqty > 0)		// There is at least one thing to ship
@@ -324,7 +324,7 @@ if (empty($reshook))
 	        {
 	            $qty = "qtyl".$i;
 				if (! isset($batch_line[$i]))
-				{	
+				{
 					// not batch mode
 					if (isset($stockLine[$i]))
 					{
@@ -352,7 +352,7 @@ if (empty($reshook))
 							$entrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):GETPOST('entrepot_id','int');
 							if ($entrepot_id < 0) $entrepot_id='';
 							if (! ($objectsrc->lines[$i]->fk_product > 0)) $entrepot_id = 0;
-						
+
 							$ret=$object->addline($entrepot_id, GETPOST($idl,'int'), GETPOST($qty,'int'), $array_options[$i]);
 							if ($ret < 0)
 							{
@@ -363,7 +363,7 @@ if (empty($reshook))
 					}
 				}
 				else
-				{	
+				{
 					// batch mode
 					if ($batch_line[$i]['qty']>0)
 					{
@@ -375,11 +375,11 @@ if (empty($reshook))
 						}
 					}
 				}
-	        }	        
+	        }
 	        // Fill array 'array_options' with data from add form
 	        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 	        if ($ret < 0) $error++;
-	        
+
 	        if (! $error)
 	        {
 	            $ret=$object->create($user);		// This create shipment (like Odoo picking) and line of shipments. Stock movement will when validating shipment.
@@ -433,9 +433,9 @@ if (empty($reshook))
 	)
 	{
 	    $object->fetch_thirdparty();
-	    
+
 	    $result = $object->valid($user);
-	    
+
 	    if ($result < 0)
 	    {
 			$langs->load("errors");
@@ -627,7 +627,7 @@ if ($action == 'create2')
     $action=''; $id=''; $ref='';
 }
 
-// Mode creation. 
+// Mode creation.
 if ($action == 'create')
 {
     $expe = new Expedition($db);
@@ -740,7 +740,7 @@ if ($action == 'create')
             // Weight
             print '<tr><td>';
             print $langs->trans("Weight");
-            print '</td><td><input name="weight" size="4" value="'.GETPOST('weight','int').'"> ';
+            print '</td><td colspan="3"><input name="weight" size="4" value="'.GETPOST('weight','int').'"> ';
             $text=$formproduct->select_measuring_units("weight_units","weight",GETPOST('weight_units','int'));
             $htmltext=$langs->trans("KeepEmptyForAutoCalculation");
             print $form->textwithpicto($text, $htmltext);
@@ -770,15 +770,15 @@ if ($action == 'create')
             print '<td colspan="3">';
             print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number','alpha').'">';
             print "</td></tr>\n";
-            
+
             // Other attributes
             $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'socid'=>$socid);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action);    // Note that $action and $object may have been modified by hook
-            
+
             if (empty($reshook) && ! empty($extrafields->attribute_label)) {
             	print $expe->showOptionals($extrafields, 'edit');
             }
-            
+
 
             // Incoterms
 			if (!empty($conf->incoterm->enabled))
@@ -800,12 +800,12 @@ if ($action == 'create')
     			print $form->selectarray('model', $liste, $conf->global->EXPEDITION_ADDON_PDF);
                 print "</td></tr>\n";
 			}
-			
+
             print "</table>";
 
             dol_fiche_end();
 
-            
+
             // Shipment lines
 
             $numAsked = count($object->lines);
@@ -833,14 +833,14 @@ if ($action == 'create')
 
 
             print '<br>';
-            
-            
+
+
             print '<table class="noborder" width="100%">';
 
 
             // Load shipments already done for same order
             $object->loadExpeditions();
-            
+
             if ($numAsked)
             {
                 print '<tr class="liste_titre">';
@@ -848,7 +848,7 @@ if ($action == 'create')
                 print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
                 print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
                 print '<td align="center">'.$langs->trans("QtyToShip");
-				if (empty($conf->productbatch->enabled)) 
+				if (empty($conf->productbatch->enabled))
 				{
 	                print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
 	                print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
@@ -875,7 +875,7 @@ if ($action == 'create')
                 $product = new Product($db);
 
                 $line = $object->lines[$indiceAsked];
-                
+
 
                 // Show product and description
                 $type=$line->product_type?$line->product_type:$line->fk_product_type;
@@ -885,7 +885,7 @@ if ($action == 'create')
                 if (! empty($line->date_end)) $type=1;
 
                 print '<tr class="oddeven">'."\n";
-                
+
                 // Product label
                 if ($line->fk_product > 0)  // If predefined product
                 {
@@ -913,7 +913,7 @@ if ($action == 'create')
                     {
                         print ($line->desc && $line->desc!=$line->product_label)?'<br>'.dol_htmlentitiesbr($line->desc):'';
                     }
-                    
+
                     print '</td>';
                 }
                 else
@@ -958,7 +958,7 @@ if ($action == 'create')
 					$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
 				}
                 $warehouse_id = GETPOST('entrepot_id','int');
-			
+
 				$warehouseObject = null;
 				if ($warehouse_id > 0 || ! ($line->fk_product > 0) || empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
 				{
@@ -1040,10 +1040,10 @@ if ($action == 'create')
 					{
 					    // Product need lot
 						print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
-						
+
 						$staticwarehouse=new Entrepot($db);
 						if ($warehouse_id > 0) $staticwarehouse->fetch($warehouse_id);
-						
+
 						$subj=0;
 						// Define nb of lines suggested for this order line
 						$nbofsuggested=0;
@@ -1066,11 +1066,11 @@ if ($action == 'create')
 								print '<td colspan="3" ></td><td align="center">';
 								print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
 								print '</td>';
-		
+
 								print '<td align="left">';
-		
+
 								print $staticwarehouse->getNomUrl(0).' / ';
-		
+
 								print '<!-- Show details of lot -->';
 								print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
 								print $langs->trans("DetailBatchFormat", $dbatch->batch, dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->qty);
@@ -1089,28 +1089,28 @@ if ($action == 'create')
 						    print '<tr class="oddeven"><td colspan="3"></td><td align="center">';
 							print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
 							print '</td>';
-							
+
 							print '<td align="left">';
 							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->libelle);
 							print '</td></tr>';
 						}
 					}
 				}
-				else 
+				else
 				{
 					// ship from multiple locations
 					if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
 					{
 					    print '<td></td><td></td></tr>';	// end line and start a new one for each warehouse
 					    print '<!-- Case warehouse not already known and product does not need lot -->';
-					    	
+
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 						$subj=0;
     					// Define nb of lines suggested for this order line
 						$nbofsuggested=0;
 						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
 						{
-							if ($stock_warehouse->real > 0) 
+							if ($stock_warehouse->real > 0)
 							{
                                 $nbofsuggested++;
 						    }
@@ -1119,7 +1119,7 @@ if ($action == 'create')
 						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)    // $stock_warehouse is product_stock
 						{
 							$tmpwarehouseObject->fetch($warehouse_id);
-							if ($stock_warehouse->real > 0) 
+							if ($stock_warehouse->real > 0)
 							{
 								$stock = + $stock_warehouse->real; // Convert it to number
 								$deliverableQty = min($quantityToBeDelivered,$stock);
@@ -1134,7 +1134,7 @@ if ($action == 'create')
 								}
 								else print $langs->trans("NA");
 								print '</td>';
-								
+
 								// Stock
 								if (! empty($conf->stock->enabled))
 								{
@@ -1142,10 +1142,10 @@ if ($action == 'create')
 									if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 									{
 										print $tmpwarehouseObject->getNomUrl(0).' ';
-										 
+
 										print '<!-- Show details of stock -->';
 										print '('.$stock.')';
-									   
+
 									}
 									else
 									{
@@ -1193,7 +1193,7 @@ if ($action == 'create')
 
 						$subj=0;
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-						
+
 						$tmpwarehouseObject=new Entrepot($db);
 						$productlotObject=new Productlot($db);
 						// Define nb of lines suggested for this order line
@@ -1207,7 +1207,7 @@ if ($action == 'create')
 								}
 						    }
 						}
-						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse) 
+						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
 						{
 							$tmpwarehouseObject->fetch($warehouse_id);
 							if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
@@ -1219,11 +1219,11 @@ if ($action == 'create')
 									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'><td colspan="3"></td><td align="center">';
 									print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
 									print '</td>';
-									 
+
 									print '<td align="left">';
-									 
+
 									print $tmpwarehouseObject->getNomUrl(0).' / ';
-									 
+
 									print '<!-- Show details of lot -->';
 									print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
 									//print $langs->trans("DetailBatchFormat", $dbatch->batch, dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->qty);
@@ -1242,7 +1242,7 @@ if ($action == 'create')
 								}
 							}
 						}
-						
+
 					}
 					if ($subj == 0) // Line not shown yet, we show it
 					{
@@ -1262,12 +1262,12 @@ if ($action == 'create')
 						    print $langs->trans("NA");
 						}
 						print '</td>';
-						
+
 						print '<td align="left">';
 						if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
-							$warehouse_selected_id = GETPOST('entrepot_id','int');							
-    						if ($warehouse_selected_id > 0) 
+							$warehouse_selected_id = GETPOST('entrepot_id','int');
+    						if ($warehouse_selected_id > 0)
     						{
     							$warehouseObject=new Entrepot($db);
     							$warehouseObject->fetch($warehouse_selected_id);
@@ -1287,10 +1287,10 @@ if ($action == 'create')
 						print '</tr>';
 					}
 				}
-				
-				
+
+
 				//Display lines extrafields
-				if (is_array($extralabelslines) && count($extralabelslines)>0) 
+				if (is_array($extralabelslines) && count($extralabelslines)>0)
 				{
 					$colspan=5;
 					$line = new ExpeditionLigne($db);
@@ -1340,14 +1340,14 @@ else if ($id || $ref)
 
 		$soc = new Societe($db);
 		$soc->fetch($object->socid);
-		
+
 		$res = $object->fetch_optionals($object->id, $extralabels);
 
 		$head=shipping_prepare_head($object);
 		dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), 0, 'sending');
 
 		$formconfirm='';
-		
+
 		// Confirm deleteion
 		if ($action == 'delete')
 		{
@@ -1393,18 +1393,18 @@ else if ($id || $ref)
 		    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
 		    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
 		}
-		
+
 		// Print form confirm
 		print $formconfirm;
-		
-		
+
+
 		// Calculate totalWeight and totalVolume for all products
 		// by adding weight and volume of each product line.
 		$tmparray=$object->getTotalWeightVolume();
 		$totalWeight=$tmparray['weight'];
 		$totalVolume=$tmparray['volume'];
-		
-		
+
+
 		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
 		{
 		    $objectsrc=new Commande($db);
@@ -1459,15 +1459,15 @@ else if ($id || $ref)
             }
         }
 		$morehtmlref.='</div>';
-		
+
 
     	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-    	
-    	
+
+
     	print '<div class="fichecenter">';
     	print '<div class="fichehalfleft">';
     	print '<div class="underbanner clearboth"></div>';
-    	
+
         print '<table class="border" width="100%">';
 
 		// Linked documents
@@ -1550,7 +1550,7 @@ else if ($id || $ref)
 			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
 			//print $totalWeight.' '.measuring_units_string(0,"weight");
 			print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no');
-			//if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')'; 
+			//if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')';
 			if (!empty($object->trueWeight)) print ')';
 		}
 		print '</td></tr>';
@@ -1597,7 +1597,7 @@ else if ($id || $ref)
 		print '<td colspan="3">';
 		$calculatedVolume=0;
 		$volumeUnit=0;
-		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) 
+		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
 		{
 		    $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
 		    $volumeUnit=$object->size_units * 3;
@@ -1605,7 +1605,7 @@ else if ($id || $ref)
 		// If sending volume not defined we use sum of products
 		if ($calculatedVolume > 0)
 		{
-			if ($volumeUnit < 50) 
+			if ($volumeUnit < 50)
 			{
 			    //print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
 			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
@@ -1626,14 +1626,14 @@ else if ($id || $ref)
 		// Other attributes
 		$cols = 2;
 		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-		
+
 		print '</table>';
-		
+
 		print '</div>';
 		print '<div class="fichehalfright">';
 		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
-		
+
 		print '<table class="border centpercent">';
 
 		// Sending method
@@ -1667,7 +1667,7 @@ else if ($id || $ref)
 		}
 		print '</td>';
 		print '</tr>';
-		
+
 		// Tracking Number
 		print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber",'trackingnumber',$object->tracking_number,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
 		print $form->editfieldval("TrackingNumber",'trackingnumber',$object->tracking_url,$object,$user->rights->expedition->creer,'string',$object->tracking_number);
@@ -1697,19 +1697,19 @@ else if ($id || $ref)
 		}
 
 		print "</table>";
-		
+
 		print '</div>';
 		print '</div>';
 		print '</div>';
-			
+
 		print '<div class="clearboth"></div>';
-			
+
 
 		/*
 		 * Lines of products
 		 */
 		print '<br>';
-		
+
         print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
@@ -1732,7 +1732,7 @@ else if ($id || $ref)
 		{
             print '<td align="center">'.$langs->trans("QtyInOtherShipments").'</td>';
 		}
-		
+
 		print '<td align="center">'.$langs->trans("CalculatedWeight").'</td>';
 		print '<td align="center">'.$langs->trans("CalculatedVolume").'</td>';
 		//print '<td align="center">'.$langs->trans("Size").'</td>';
@@ -1793,7 +1793,7 @@ else if ($id || $ref)
     		{
     		    $num = $db->num_rows($resql);
     		    $i = 0;
-    		
+
     		    while($i < $num)
     		    {
         		    $obj = $db->fetch_object($resql);
@@ -1900,7 +1900,7 @@ else if ($id || $ref)
     			        }
     			    }
     			}
-    		}			
+    		}
 			print '</td>';
 
 			// Weight
@@ -1960,7 +1960,7 @@ else if ($id || $ref)
 						}
 						print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
 					}
-					else 
+					else
 					{
 						print $langs->trans("NA");
 					}
@@ -1970,7 +1970,7 @@ else if ($id || $ref)
 				}
 			}
 			print "</tr>";
-			
+
 			// Display lines extrafields
 			if (is_array($extralabelslines) && count($extralabelslines)>0) {
 				$colspan= empty($conf->productbatch->enabled) ? 5 : 6;
@@ -1981,11 +1981,11 @@ else if ($id || $ref)
 				print '</tr>';
 			}
 
-			
+
 		}
-		
+
 		// TODO Show also lines ordered but not delivered
-		
+
 		print "</table>\n";
 		print '</div>';
 	}
@@ -1996,7 +1996,7 @@ else if ($id || $ref)
 
 	$object->fetchObjectLinked($object->id,$object->element);
 
-	
+
 	/*
 	 *    Boutons actions
 	 */
@@ -2023,14 +2023,14 @@ else if ($id || $ref)
 					print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
 				}
 			}
-	
+
 			// TODO add alternative status
 			// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
 			if ($object->statut == 2 && $object->billed && $user->rights->expedition->creer)
 			{
 			    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 			}
-			
+
 			// Send
 			if ($object->statut > 0)
 			{
@@ -2040,7 +2040,7 @@ else if ($id || $ref)
 				}
 				else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
 			}
-	
+
 			// Create bill and Close shipment
 			if (! empty($conf->facture->enabled) && $object->statut > 0)
 			{
@@ -2049,7 +2049,7 @@ else if ($id || $ref)
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
 				}
 			}
-	
+
 			// This is just to generate a delivery receipt
 			//var_dump($object->linkedObjectsIds['delivery']);
 			if ($conf->livraison_bon->enabled && ($object->statut == 1 || $object->statut == 2) && $user->rights->expedition->livraison->creer && count($object->linkedObjectsIds['delivery']) == 0)
@@ -2071,14 +2071,14 @@ else if ($id || $ref)
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$paramaction.'">'.$langs->trans($label).'</a>';
 				}
 			}
-	
+
 			if ($user->rights->expedition->supprimer)
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
 			}
-			
+
 		}
-		
+
 		print '</div>';
 	}
 
@@ -2086,11 +2086,11 @@ else if ($id || $ref)
 	/*
 	 * Documents generated
 	 */
-	
+
 	if ($action != 'presend')
 	{
         print '<div class="fichecenter"><div class="fichehalfleft">';
-	    
+
         $objectref = dol_sanitizeFileName($object->ref);
 		$filedir = $conf->expedition->dir_output . "/sending/" .$objectref;
 
@@ -2101,12 +2101,12 @@ else if ($id || $ref)
 
 		print $formfile->showdocuments('expedition',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
 
-		
+
 		// Show links to link elements
 		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
 		$somethingshown = $form->showLinkedObjectBlock($object, '');
 
-		
+
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 		// List of actions on element
@@ -2117,11 +2117,11 @@ else if ($id || $ref)
 		print '</div></div></div>';
 	}
 
-	
+
 	/*
 	 * Action presend
 	 */
-	
+
 	//Select mail models is same action as presend
 	if (GETPOST('modelselected')) {
 		$action = 'presend';
@@ -2182,7 +2182,7 @@ else if ($id || $ref)
 		{
 			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'shi'.$object->id);
-		}		
+		}
 		$formmail->withfrom=1;
 		$liste=array();
 		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
@@ -2215,7 +2215,7 @@ else if ($id || $ref)
 		{
     		$contactarr=$objectsrc->liste_contact(-1,'external');
 		}
-		
+
 		if (is_array($contactarr) && count($contactarr)>0) {
 			foreach($contactarr as $contact) {
 
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index cfa88b187f0..2e6fed839eb 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -133,9 +133,9 @@ if ($object->id > 0)
 	dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), -1, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-	
+
 	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-        
+
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
     print '<div class="underbanner clearboth"></div>';
@@ -243,12 +243,7 @@ if ($object->id > 0)
 
 	// Other attributes
 	$parameters=array('socid'=>$object->id, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
-	{
-		print $object->showOptionals($extrafields);
-	}
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	// Module Adherent
     if (! empty($conf->adherent->enabled))
@@ -278,15 +273,15 @@ if ($object->id > 0)
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 	$boxstat = '';
-	
+
 	// Nbre max d'elements des petites listes
 	$MAXLIST=$conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
-	
+
 	// Lien recap
 	$boxstat.='<div class="box">';
 	$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom" width="100%">';
 	$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
-	
+
 	if ($conf->supplier_proposal->enabled)
 	{
 	    // Box proposals
@@ -304,7 +299,7 @@ if ($object->id > 0)
 	    $boxstat.='</div>';
 	    if ($link) $boxstat.='</a>';
 	}
-	
+
 	if ($conf->fournisseur->enabled)
 	{
 	    // Box proposals
@@ -322,14 +317,14 @@ if ($object->id > 0)
 	    $boxstat.='</div>';
 	    if ($link) $boxstat.='</a>';
 	}
-	
+
 	if ($conf->fournisseur->enabled)
 	{
 	    $tmp = $object->getOutstandingBills('supplier');
 	    $outstandingOpened=$tmp['opened'];
 	    $outstandingTotal=$tmp['total_ht'];
 	    $outstandingTotalIncTax=$tmp['total_ttc'];
-	     
+
 	    $text=$langs->trans("OverAllInvoices");
 	    $link='';
 	    $icon='bill';
@@ -339,7 +334,7 @@ if ($object->id > 0)
 	    $boxstat.='<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
 	    $boxstat.='</div>';
 	    if ($link) $boxstat.='</a>';
-	     
+
 	    // Box outstanding bill
 	    $text=$langs->trans("CurrentOutstandingBill");
 	    $link=DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$object->id;
@@ -351,14 +346,14 @@ if ($object->id > 0)
 	    $boxstat.='</div>';
 	    if ($link) $boxstat.='</a>';
 	}
-	
+
 	$boxstat.='</td></tr>';
 	$boxstat.='</table>';
 	$boxstat.='</div>';
-	
+
 	print $boxstat;
-	
-	
+
+
 	$var=true;
 
 	$MAXLIST=$conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
@@ -395,10 +390,10 @@ if ($object->id > 0)
 		$sql.= ' AND pfp.fk_soc = '.$object->id;
 		$sql .= $db->order('pfp.tms', 'desc');
 		$sql.= $db->plimit($MAXLIST);
-		
+
 		$query = $db->query($sql);
         if (! $query) dol_print_error($db);
-        
+
 		$return = array();
 
 		if ($db->num_rows($query)) {
@@ -407,7 +402,7 @@ if ($object->id > 0)
 
 			while ($objp = $db->fetch_object($query)) {
 
-				
+
 
 				$productstatic->id = $objp->rowid;
 				$productstatic->ref = $objp->ref;
@@ -445,12 +440,12 @@ if ($object->id > 0)
 		print '</table>';
 	}
 
-	
+
 	/*
 	 * Last supplier proposal
 	 */
 	$proposalstatic = new SupplierProposal($db);
-	
+
 	if ($user->rights->supplier_proposal->lire)
 	{
 	    $sql  = "SELECT p.rowid, p.ref, p.date_valid as dc, p.fk_statut, p.total_ht, p.tva as total_tva, p.total as total_ttc";
@@ -459,17 +454,17 @@ if ($object->id > 0)
 	    $sql.= " AND p.entity =".$conf->entity;
 	    $sql.= " ORDER BY p.date_valid DESC";
 	    $sql.= " ".$db->plimit($MAXLIST);
-	    
+
 	    $resql=$db->query($sql);
 	    if ($resql)
 	    {
 	        $i = 0 ;
 	        $num = $db->num_rows($resql);
-	
+
 	        if ($num > 0)
 	        {
 	            print '<table class="noborder" width="100%">';
-	
+
 	            print '<tr class="liste_titre">';
 	            print '<td colspan="3">';
 	            print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans("LastSupplierProposals",($num<$MAXLIST?"":$MAXLIST)).'</td>';
@@ -478,13 +473,13 @@ if ($object->id > 0)
 	            print '</tr></table>';
 	            print '</td></tr>';
 	        }
-	
+
 	        $var = True;
 	        while ($i < $num && $i <= $MAXLIST)
 	        {
 	            $obj = $db->fetch_object($resql);
-	            
-	
+
+
 	            print '<tr class="oddeven">';
 	            print '<td class="nowrap">';
 	            $proposalstatic->id = $obj->rowid;
@@ -509,14 +504,14 @@ if ($object->id > 0)
 	            $i++;
 	        }
 	        $db->free($resql);
-	
+
 	        if ($num >0) print "</table>";
 	    }
 	    else
 	    {
 	        dol_print_error($db);
 	    }
-	}	
+	}
 
 	/*
 	 * Last supplier orders
@@ -558,7 +553,7 @@ if ($object->id > 0)
 			$object_count = $db->fetch_object($resql);
 			$num = $object_count->total;
 		}
-		
+
 		$sql  = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut, p.total_ht, p.tva as total_tva, p.total_ttc";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p ";
 		$sql.= " WHERE p.fk_soc =".$object->id;
@@ -587,7 +582,7 @@ if ($object->id > 0)
 			while ($i < $num && $i < $MAXLIST)
 			{
 				$obj = $db->fetch_object($resql);
-				
+
 
 				print '<tr class="oddeven">';
                 print '<td class="nowrap">';
@@ -660,7 +655,7 @@ if ($object->id > 0)
 			while ($i < min($num,$MAXLIST))
 			{
 				$obj = $db->fetch_object($resql);
-				
+
 				print '<tr class="oddeven">';
 				print '<td>';
 				print '<a href="facture/card.php?facid='.$obj->rowid.'">';
@@ -712,7 +707,7 @@ if ($object->id > 0)
         {
             print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
         }
-	    
+
 		if ($conf->supplier_proposal->enabled && $user->rights->supplier_proposal->creer && $object->status==1)
 		{
 			$langs->load("supplier_proposal");
@@ -750,9 +745,9 @@ if ($object->id > 0)
         	}
     	}
 	}
-	
+
 	print '</div>';
-	
+
 
 	if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
 	{
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index a6f0cc248f1..f77eb949c9a 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -279,7 +279,7 @@ if (empty($reshook))
 	if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
 	{
 	    $db->begin();
-	    
+
 	    $langs->load('errors');
 	    $error = 0;
 
@@ -469,7 +469,7 @@ if (empty($reshook))
 	    if (! $error && $result > 0)
 	    {
 	        $db->commit();
-	        
+
 	    	$ret=$object->fetch($object->id);    // Reload to get new records
 
 	        // Define output language
@@ -526,7 +526,7 @@ if (empty($reshook))
 		    $db->rollback();
             setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	    
+
 	    $action = '';
 	}
 
@@ -1617,7 +1617,7 @@ elseif (! empty($object->id))
 
 	$res=$object->fetch_optionals($object->id,$extralabels);
 
-	
+
 	$head = ordersupplier_prepare_head($object);
 
 	$title=$langs->trans("SupplierOrder");
@@ -1754,11 +1754,11 @@ elseif (! empty($object->id))
 	// Print form confirm
 	print $formconfirm;
 
-	
+
 	// Supplier order card
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
+
 	$morehtmlref='<div class="refidno">';
 	// Ref supplier
 	$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
@@ -1798,15 +1798,15 @@ elseif (! empty($object->id))
 	    }
 	}
 	$morehtmlref.='</div>';
-	
-	
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);	
-	
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
 
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
-	 	
+
 	print '<table class="border" width="100%">';
 
 	// Date
@@ -1995,16 +1995,15 @@ elseif (! empty($object->id))
 	}
 
 	// Other attributes
-	$cols = 2;
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
-	
+
 	print '</div>';
 	print '<div class="fichehalfright">';
 	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border centpercent">';
 
 	if (!empty($conf->multicurrency->enabled))
@@ -2013,18 +2012,18 @@ elseif (! empty($object->id))
 	    print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
-	
+
 	    // Multicurrency Amount VAT
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
-	
+
 	    // Multicurrency Amount TTC
 	    print '<tr><td>' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
 	    print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 	    print '</tr>';
 	}
-	
+
 	// Total
 	print '<tr><td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
 	print '<td>'.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'</td>';
@@ -2053,19 +2052,19 @@ elseif (! empty($object->id))
 	print '</tr>';
 
 	print '</table>';
-	
+
 	// Margin Infos
 	/*if (! empty($conf->margin->enabled)) {
 	    $formmargin->displayMarginInfos($object);
 	}*/
-	
-	
+
+
 	print '</div>';
 	print '</div>';
 	print '</div>';
-	
+
 	print '<div class="clearboth"></div><br>';
-	
+
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
 		$blocname = 'contacts';
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 32f1a5538b5..9fb9a63828d 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -76,9 +76,9 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label('facture_fourn');
 
-if ($action == 'create') 
+if ($action == 'create')
 {
-	if (! is_array($selected)) 
+	if (! is_array($selected))
 	{
 		$error++;
 		setEventMessages($langs->trans('Error_OrderNotChecked'), null, 'errors');
@@ -246,10 +246,10 @@ if (($action == 'create' || $action == 'add') && ! $error) {
 
 		// End of object creation, we show it
 		if ($id > 0 && ! $error) {
-			
+
 			foreach($orders_id as $fk_supplier_order) {
 				$supplier_order = new CommandeFournisseur($db);
-				if ($supplier_order->fetch($fk_supplier_order)>0 && $supplier_order->statut == 5) 
+				if ($supplier_order->fetch($fk_supplier_order)>0 && $supplier_order->statut == 5)
 				{
 					if ($supplier_order->classifyBilled($user) < 0)
 					{
@@ -258,20 +258,20 @@ if (($action == 'create' || $action == 'add') && ! $error) {
 						$_GET["origin"] = $_POST["origin"];
 						$_GET["originid"] = $_POST["originid"];
 						$mesgs[] = '<div class="error">' . $object->error . '</div>';
-						
+
 						$error++;
 						break;
 					}
-					
+
 				}
 			}
-			
+
 			if(!$error) {
 				$db->commit();
 				header('Location: ' . DOL_URL_ROOT . '/fourn/facture/card.php?facid=' . $id);
 				exit();
 			}
-			
+
 		} else {
 			$db->rollback();
 			$action = 'create';
@@ -366,7 +366,8 @@ if ($action == 'create' && !$error) {
 	$parameters = array (
 			'objectsrc' => $objectsrc,
 			'idsrc' => $listoforders,
-			'colspan' => ' colspan="3"'
+			'colspan' => ' colspan="2"',
+	        'cols'=>2
 	);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
@@ -494,7 +495,7 @@ if (($action != 'create' && $action != 'add') && !$error) {
 			$companystatic->nom = $soc->nom;
 			print '<h3>' . $companystatic->getNomUrl(1, 'customer') . '</h3>';
 		}
-		
+
 		print '<form name="orders2invoice" method="GET" action="orderstoinvoice.php">';
 		print '<input type="hidden" name="socid" value="' . $socid . '">';
 		print '<table class="noborder" width="100%">';
@@ -517,7 +518,7 @@ if (($action != 'create' && $action != 'add') && !$error) {
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="10" name="sref_client" value="' . $sref_client . '">';
         print '</td>';
-        
+
 		// DATE ORDER
 		print '<td class="liste_titre" align="center">';
 		print $period;
@@ -606,9 +607,9 @@ if (($action != 'create' && $action != 'add') && !$error) {
 		print '<input type="submit" class="butAction" value="' . $langs->trans("GenerateBill") . '">';
 		print '</div>';
 		print '</div>';
-		
+
 		print '</form>';
-		
+
 		$db->free($resql);
 	} else {
 		print dol_print_error($db);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 04e6ea98481..0ec657ccdfe 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -206,7 +206,7 @@ if (empty($reshook))
                     }
                     $model=$object->modelpdf;
                     $ret = $object->fetch($id); // Reload to get new records
-    
+
                     $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
                     if ($result < 0) dol_print_error($db,$result);
 	            }
@@ -1198,7 +1198,7 @@ if (empty($reshook))
 	$upload_dir = $conf->fournisseur->facture->dir_output;
 	$permissioncreate = $user->rights->fournisseur->facture->creer;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-	
+
 	// Make calculation according to calculationrule
 	if ($action == 'calculate')
 	{
@@ -1674,7 +1674,7 @@ if ($action == 'create')
 	if ($socid > 0)
 	{
 		// Discounts for third party
-		print '<tr><td>' . $langs->trans('Discounts') . '</td><td colspan="2">';
+		print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
 		if ($soc->remise_percent)
 			print $langs->trans("CompanyHasRelativeDiscount", '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid')) . '">' . $soc->remise_percent . '</a>');
 		else
@@ -1705,17 +1705,17 @@ if ($action == 'create')
     print '</td></tr>';
 
 	// Payment term
-	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
+	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 	$form->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 
 	// Payment mode
-	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
+	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
 	$form->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id, 'mode_reglement_id', 'DBIT');
 	print '</td></tr>';
 
     // Bank Account
-    print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
+    print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
     $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
     print '</td></tr>';
 
@@ -1724,7 +1724,7 @@ if ($action == 'create')
 	{
 		print '<tr>';
 		print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
-        print '<td colspan="2" class="maxwidthonsmartphone">';
+        print '<td class="maxwidthonsmartphone">';
 	    print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
 		print '</td></tr>';
 	}
@@ -1735,7 +1735,7 @@ if ($action == 'create')
 		$formproject = new FormProjets($db);
 
 		$langs->load('projects');
-		print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
+		print '<tr><td>' . $langs->trans('Project') . '</td><td>';
 		$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$societe->id:-1), $projectid, 'projectid', 0, 0, 1, 1);
 		print '</td></tr>';
 	}
@@ -1790,7 +1790,7 @@ if ($action == 'create')
 	        $langs->load('orders');
 	        $txt=$langs->trans("SupplierOrder");
         }
-        print '<tr><td>'.$txt.'</td><td colspan="2">'.$objectsrc->getNomUrl(1);
+        print '<tr><td>'.$txt.'</td><td>'.$objectsrc->getNomUrl(1);
         // We check if Origin document (id and type is known) has already at least one invoice attached to it
         $objectsrc->fetchObjectLinked($originid,$origin,'','invoice_supplier');
         $cntinvoice=count($objectsrc->linkedObjects['invoice_supplier']);
@@ -1800,29 +1800,29 @@ if ($action == 'create')
         	echo ' ('.$langs->trans('LatestRelatedBill').end($objectsrc->linkedObjects['invoice_supplier'])->getNomUrl(1).')';
         }
         echo '</td></tr>';
-        print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($objectsrc->total_ht).'</td></tr>';
-        print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($objectsrc->total_tva)."</td></tr>";
+        print '<tr><td>'.$langs->trans('TotalHT').'</td><td>'.price($objectsrc->total_ht).'</td></tr>';
+        print '<tr><td>'.$langs->trans('TotalVAT').'</td><td>'.price($objectsrc->total_tva)."</td></tr>";
         if ($mysoc->localtax1_assuj=="1" || $object->total_localtax1 != 0) //Localtax1
         {
-            print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";
+            print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax1)."</td></tr>";
         }
 
         if ($mysoc->localtax2_assuj=="1" || $object->total_localtax2 != 0) //Localtax2
         {
-            print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";
+            print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax2)."</td></tr>";
         }
-        print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";
+        print '<tr><td>'.$langs->trans('TotalTTC').'</td><td>'.price($objectsrc->total_ttc)."</td></tr>";
 
 		if (!empty($conf->multicurrency->enabled))
 		{
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
-			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td colspan="2">' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalHT') . '</td><td>' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalVAT') . '</td><td>' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('MulticurrencyTotalTTC') . '</td><td>' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
 		}
     }
 
     // Other options
-    $parameters=array('colspan' => ' colspan="6"');
+    $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
 
     // Bouton "Create Draft"
@@ -2347,7 +2347,7 @@ else
     	        while ($i < $num)
     	        {
     	            $objp = $db->fetch_object($result);
-    	            
+
     	            print '<tr class="oddeven"><td>';
     	            $paymentstatic->id=$objp->rowid;
     	            $paymentstatic->datepaye=$db->jdate($objp->dp);
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index ca874511c94..14682f7928b 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -31,8 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 
-$langs->load("products");
-$langs->load("suppliers");
+$langs->loadLangs(array("products","suppliers"));
 
 if (!$user->rights->produit->lire && !$user->rights->service->lire) accessforbidden();
 
@@ -42,40 +41,66 @@ $snom = GETPOST('snom');
 $type = GETPOST('type');
 $optioncss = GETPOST('optioncss','alpha');
 
-$sortfield = GETPOST('sortfield');
-$sortorder = GETPOST('sortorder');
-$page = GETPOST('page');
-if ($page < 0) {
-    $page = 0 ;
-}
+// Load variable for pagination
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="p.ref"; // Set here default search field
+if (! $sortorder) $sortorder="ASC";
 
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-$offset = $limit * $page ;
+$fourn_id = GETPOST('fourn_id', 'intcomma');
+$catid = GETPOST('catid', 'intcomma');
 
-if (! $sortfield) $sortfield = 'p.ref';
-if (! $sortorder) $sortorder = 'DESC';
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('supplierpricelist'));
+$extrafields = new ExtraFields($db);
 
-if (GETPOST('button_removefilter'))
-{
-	$sref = '';
-	$sRefSupplier = '';
-	$snom = '';
-}
-
-$fourn_id = GETPOST('fourn_id', 'int');
-
-if (isset($_REQUEST['catid']))
-{
-	$catid = $_REQUEST['catid'];
-}
 
 
 
 /*
-* Mode Liste
-*
-*/
+ * ACTIONS
+ *
+ * Put here all code to do according to value of "action" parameter
+ */
 
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Purge search criteria
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+    {
+    	$sref = '';
+    	$sRefSupplier = '';
+    	$snom = '';
+        $search_field1='';
+        $search_field2='';
+        $search_date_creation='';
+        $search_date_update='';
+        $toselect='';
+        $search_array_options=array();
+    }
+}
+
+/*
+ * View
+ */
+
+$form = new Form($db);
 $productstatic = new Product($db);
 $companystatic = new Societe($db);
 
@@ -87,6 +112,17 @@ if ($fourn_id)
 	$supplier->fetch($fourn_id);
 }
 
+
+
+$arrayofmassactions =  array(
+    'presend'=>$langs->trans("SendByMail"),
+    'builddoc'=>$langs->trans("PDFMerge"),
+);
+if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+if ($massaction == 'presend') $arrayofmassactions=array();
+$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+
+
 $sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type, p.entity,";
 $sql.= " ppf.fk_soc, ppf.ref_fourn, ppf.price as price, ppf.quantity as qty, ppf.unitprice,";
 $sql.= " s.rowid as socid, s.nom as name";
@@ -155,7 +191,7 @@ if ($resql)
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
 
 
-	if (isset($catid))
+	if (! empty($catid))
 	{
 		print "<div id='ways'>";
 		$c = new Categorie($db);
@@ -175,17 +211,6 @@ if ($resql)
 
 	print '<table class="liste" width="100%">';
 
-	// Lignes des titres
-	print "<tr class=\"liste_titre\">";
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("RefSupplierShort"),$_SERVER["PHP_SELF"], "ppf.ref_fourn",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Supplier"),$_SERVER["PHP_SELF"], "ppf.fk_soc",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("BuyingPrice"),$_SERVER["PHP_SELF"], "ppf.price",$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("QtyMin"),$_SERVER["PHP_SELF"], "ppf.quantity",$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("UnitPrice"),$_SERVER["PHP_SELF"], "ppf.unitprice",$param,"",'align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-
 	// Lignes des champs de filtre
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre">';
@@ -197,19 +222,34 @@ if ($resql)
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="snom" value="'.$snom.'">';
 	print '</td>';
-	print '<td class="liste_titre" colspan="4" align="right">';
-	print '<input type="image" class="liste_titre" value="button_search" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '&nbsp; ';
-	print '<input type="image" class="liste_titre" value="button_removefilter" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td class="liste_titre" align="right">';
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
 	print '</td>';
 	print '</tr>';
 
+	// Lignes des titres
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("RefSupplierShort"),$_SERVER["PHP_SELF"], "ppf.ref_fourn",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Supplier"),$_SERVER["PHP_SELF"], "ppf.fk_soc",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("BuyingPrice"),$_SERVER["PHP_SELF"], "ppf.price",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("QtyMin"),$_SERVER["PHP_SELF"], "ppf.quantity",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("UnitPrice"),$_SERVER["PHP_SELF"], "ppf.unitprice",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('',$_SERVER["PHP_SELF"]);
+	print "</tr>\n";
+
 	$oldid = '';
 	$var=True;
 	while ($i < min($num,$limit))
 	{
 		$objp = $db->fetch_object($resql);
-		
+
 		print '<tr class="oddeven">';
 
 		print '<td>';
@@ -236,6 +276,8 @@ if ($resql)
 
 		print '<td align="right">'.(isset($objp->unitprice) ? price($objp->unitprice) : '').'</td>';
 
+		print '<td align="right"></td>';
+
 		print "</tr>\n";
 		$i++;
 	}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b04aaf40a31..03af3ddfe88 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -390,7 +390,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->array_options['options_extrafieldkey'] + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? round($reloadedobj->capital / 5) : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 91e00c274ff..8ea14fdb305 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -726,7 +726,7 @@ ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClick=Select an element and click %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index 1eb906f1acc..8e80a111516 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -17,7 +17,7 @@ NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
-NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
+NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
 ResponsibleUser=Responsible user
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 292c6a139a4..fe9105d0d9f 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -53,7 +53,7 @@ class MyModuleObject extends CommonObject
      * @var array Array with all fields and their property
      */
 	public $fields;
-	
+
 	/**
 	 * @var mixed Sample property 1
 	 */
@@ -62,11 +62,11 @@ class MyModuleObject extends CommonObject
 	 * @var mixed Sample property 2
 	 */
 	public $prop2;
-	
+
 	//...
-	
+
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	
+
 	public $table_element_line = 'mymoduleobjectdet';
     public $class_element_line = 'MyModuleObjectline';
     public $fk_element = 'fk_mymoduleobject';
@@ -75,9 +75,9 @@ class MyModuleObject extends CommonObject
 	 * @var MyModuleObjectLine[] Lines
 	 */
 	public $lines = array();
-	
-	
-	
+
+
+
 	/**
 	 * Constructor
 	 *
@@ -163,10 +163,9 @@ class MyModuleObject extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param int    $id  Id object
-	 * @param string $ref Ref
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 * @param  int     $id      Id object
+	 * @param  string  $ref     Ref
+	 * @return int              <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -199,20 +198,13 @@ class MyModuleObject extends CommonObject
 				$this->prop2 = $obj->field2;
 				//...
 			}
-			
-			// Retrieve all extrafields for invoice
-			// fetch optionals attributes and labels
-			/*
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields=new ExtraFields($this->db);
-			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-			$this->fetch_optionals($this->id,$extralabels);
-            */
-			
-			// $this->fetch_lines();
-			
+
 			$this->db->free($resql);
 
+			$this->fetch_optionals();
+
+			// $this->fetch_lines();
+
 			if ($numrows) {
 				return 1;
 			} else {
@@ -221,7 +213,6 @@ class MyModuleObject extends CommonObject
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
 			return - 1;
 		}
 	}
@@ -306,7 +297,7 @@ class MyModuleObject extends CommonObject
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
-		
+
 		// Clean parameters
 		if (isset($this->prop1)) {
 			$this->prop1 = trim($this->prop1);
@@ -386,7 +377,7 @@ class MyModuleObject extends CommonObject
 		}
 
 		// If you need to delete child tables to, you can insert them here
-		
+
 		if (!$error) {
 			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
 			$sql .= ' WHERE rowid=' . $this->id;
@@ -475,7 +466,7 @@ class MyModuleObject extends CommonObject
         global $menumanager;
 
         if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
+
         $result = '';
         $companylink = '';
 
@@ -484,7 +475,7 @@ class MyModuleObject extends CommonObject
         $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
 
         $url = DOL_URL_ROOT.'/mymodule/'.$this->table_name.'_card.php?id='.$this->id;
-        
+
         $linkclose='';
         if (empty($notooltip))
         {
@@ -497,7 +488,7 @@ class MyModuleObject extends CommonObject
             $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
         }
         else $linkclose = ($morecss?' class="'.$morecss.'"':'');
-        
+
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 5799d5bbab7..9e8f5ca9975 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -69,7 +69,7 @@ class modMyModule extends DolibarrModules
 		$this->descriptionlong = "MyModuleDescription (Long)";
 		$this->editor_name = 'Editor name';
 		$this->editor_url = 'https://www.example.com';
-		
+
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
 		$this->version = '1.0';
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
@@ -151,7 +151,7 @@ class modMyModule extends DolibarrModules
         	$conf->mymodule=new stdClass();
         	$conf->mymodule->enabled=0;
         }
-        
+
         // Dictionaries
 		$this->dictionaries=array();
         /* Example:
@@ -169,8 +169,9 @@ class modMyModule extends DolibarrModules
         );
         */
 
+
         // Boxes
-		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+		// Add here list of php file(s) stored in core/boxes that contains class to show a widget.
         $this->boxes = array();			// List of boxes
 		// Example:
 		//$this->boxes=array(
@@ -179,24 +180,38 @@ class modMyModule extends DolibarrModules
 		//    2=>array('file'=>'myboxc.php@mymodule','note'=>'')
 		//);
 
+
 		// Cronjobs
 		$this->cronjobs = array();			// List of cron jobs entries to add
 		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true),
 		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true)
 		// );
 
+
 		// Permissions
 		$this->rights = array();		// Permission array used by this module
-		$r=0;
 
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		// $this->rights[$r][1] = 'Permision label';	// Permission label
-		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $r++;
+		$r=0;
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read objects of My Module';	// Permission label
+		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/Update objects of My Module';	// Permission label
+		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'create';				// In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete objects of My Module';	// Permission label
+		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'delete';				// In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+
 
 		// Main menu entries
 		$this->menu = array();			// List of menus to add
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 1d22c464212..56e0ea1d3ed 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -96,18 +96,18 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	if ($cancel) 
+	if ($cancel)
 	{
 		if ($action != 'addlink')
 		{
 			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
 			header("Location: ".$urltogo);
 			exit;
-		}		
+		}
 		if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
 		$action='';
 	}
-	
+
 	// Action to add record
 	if ($action == 'add' && ! empty($user->rights->mymodule->create))
 	{
@@ -268,19 +268,19 @@ if ($action == 'create')
 if (($id || $ref) && $action == 'edit')
 {
 	print load_fiche_titre($langs->trans("MyModule"));
-    
+
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	
+
 	dol_fiche_head();
 
 	print '<table class="border centpercent">'."\n";
 	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
 	// LIST_OF_TD_LABEL_FIELDS_EDIT
 	print '</table>';
-	
+
 	dol_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
@@ -299,14 +299,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	$head = mymodule_prepare_head($object);
 	dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');
-		
+
 	$formconfirm = '';
-	
+
 	// Confirmation to delete
 	if ($action == 'delete') {
 	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
 	}
-	
+
 	// Confirmation of action xxxx
 	if ($action == 'xxx')
 	{
@@ -317,28 +317,28 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	            // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
 	            // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
 	            // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
-	    }*/	
+	    }*/
 	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
 	}
-	
+
 	if (! $formconfirm) {
 	    $parameters = array('lineid' => $lineid);
 	    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
 	    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
 	}
-	
+
 	// Print form confirm
 	print $formconfirm;
-	
-	
-	
+
+
+
 	// Object card
 	// ------------------------------------------------------------
-	
+
 	$linkback = '<a href="' . DOL_URL_ROOT . '/mymodule/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
-	
+
+
 	$morehtmlref='<div class="refidno">';
 	/*
 	// Ref bis
@@ -382,11 +382,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 	*/
 	$morehtmlref.='</div>';
-	
-	
+
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	
-	
+
+
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
@@ -396,7 +396,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 
 	// Other attributes
-	$cols = 2;
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
@@ -405,16 +404,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
-	
-	
+
+
 
 	print '</table>';
 	print '</div>';
 	print '</div>';
 	print '</div>';
-	
+
 	print '<div class="clearboth"></div><br>';
-	
+
 	dol_fiche_end();
 
 
@@ -424,14 +423,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	$parameters=array();
     	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-    
+
     	if (empty($reshook))
     	{
     		if ($user->rights->mymodule->write)
     		{
     			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
     		}
-    
+
     		if ($user->rights->mymodule->delete)
     		{
     			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
@@ -440,12 +439,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	print '</div>'."\n";
 	}
 
-	
+
 	// Select mail models is same action as presend
 	if (GETPOST('modelselected')) {
 	    $action = 'presend';
 	}
-	
+
 	if ($action != 'presend')
 	{
 	    print '<div class="fichecenter"><div class="fichehalfleft">';
@@ -458,23 +457,23 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    $genallowed = $user->rights->mymodule->creer;
 	    $delallowed = $user->rights->mymodule->supprimer;
 	    print $formfile->showdocuments('mymodule', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
-	
-	
+
+
 	    // Show links to link elements
 	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
 	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-	
-	
+
+
 	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-	
+
 	    // List of actions on element
 	    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 	    $formactions = new FormActions($db);
 	    $somethingshown = $formactions->showactions($object, 'order', $socid);
-	
+
 	    print '</div></div></div>';
 	}
-	
+
 
 	/*
 	 * Action presend
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index b1768785f4c..2d8525dfffa 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -35,7 +35,7 @@
 //if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 //if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
 
-// Change this following line to use the correct relative path (../, ../../, etc)
+// Change this following lines to use the correct relative path (../, ../../, etc)
 $res=0;
 if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
 if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
@@ -49,8 +49,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 dol_include_once('/mymodule/class/myobject.class.php');
 
 // Load traductions files requiredby by page
-$langs->load("mymodule");
-$langs->load("other");
+$langs->loadLangs(array("mymodule","other"));
 
 $action=GETPOST('action','alpha');
 $massaction=GETPOST('massaction','alpha');
@@ -89,14 +88,14 @@ if ($user->societe_id > 0)
 }
 
 // Initialize technical object to manage context to save list fields
-$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'mymodulelist';
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'myobjectlist';
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
-$hookmanager->initHooks(array('mymodulelist'));
+$hookmanager->initHooks(array('myobjectlist'));
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('mymodule');
+$extralabels = $extrafields->fetch_name_optionals_label('myobject');
 $search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
 
 // List of fields to search into when doing a "search in all"
@@ -227,7 +226,7 @@ foreach ($search_array_options as $key => $val)
     $typ=$extrafields->attribute_type[$tmpkey];
     $mode=0;
     if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
     {
         $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
     }
@@ -244,7 +243,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-}	
+}
 
 $sql.= $db->plimit($limit+1, $offset);
 
@@ -263,7 +262,7 @@ if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) &&
 {
     $obj = $db->fetch_object($resql);
     $id = $obj->rowid;
-    header("Location: ".DOL_URL_ROOT.'/skeleton/card.php?id='.$id);
+    header("Location: ".DOL_URL_ROOT.'/mymodule/myobject_card.php?id='.$id);
     exit;
 }
 
@@ -283,13 +282,13 @@ foreach ($search_array_options as $key => $val)
     $crit=$val;
     $tmpkey=preg_replace('/search_options_/','',$key);
     if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-} 
+}
 
 $arrayofmassactions =  array(
     'presend'=>$langs->trans("SendByMail"),
     'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+if ($user->rights->mymodule->delete) $arrayofmassactions['delete']=$langs->trans("Delete");
 if ($massaction == 'presend') $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
@@ -330,38 +329,11 @@ if (! empty($moreforfilter))
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-// Fields title
-print '<tr class="liste_titre">';
-// LIST_OF_TD_TITLE_FIELDS
-//if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($arrayfields['t.field1']['label'],$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($arrayfields['t.field2']['label'],$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val) 
-   {
-       if (! empty($arrayfields["ef.".$key]['checked'])) 
-       {
-			$align=$extrafields->getAlignFlag($key);
-			$sortonfield = "ef.".$key;
-			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
-			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-print '</tr>'."\n";
 
 // Fields title search
 print '<tr class="liste_titre">';
@@ -371,22 +343,22 @@ print '<tr class="liste_titre">';
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-    foreach($extrafields->attribute_label as $key => $val) 
+    foreach($extrafields->attribute_label as $key => $val)
     {
         if (! empty($arrayfields["ef.".$key]['checked']))
         {
             $align=$extrafields->getAlignFlag($key);
             $typeofextrafield=$extrafields->attribute_type[$key];
             print '<td class="liste_titre'.($align?' '.$align:'').'">';
-        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
-			{
-			    $crit=$val;
-				$tmpkey=preg_replace('/search_options_/','',$key);
-				$searchclass='';
-				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
-			}
+            if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
+            {
+                $crit=$val;
+                $tmpkey=preg_replace('/search_options_/','',$key);
+                $searchclass='';
+                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+                print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+            }
             print '</td>';
         }
     }
@@ -408,19 +380,48 @@ if (! empty($arrayfields['t.tms']['checked']))
     print '</td>';
 }
 /*if (! empty($arrayfields['u.statut']['checked']))
-{
-    // Status
-    print '<td class="liste_titre" align="center">';
-    print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
-    print '</td>';
-}*/
+ {
+ // Status
+ print '<td class="liste_titre" align="center">';
+ print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
+ print '</td>';
+ }*/
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+$searchpicto=$form->showFilterButtons();
 print $searchpicto;
 print '</td>';
 print '</tr>'."\n";
-    
+
+// Fields title
+print '<tr class="liste_titre">';
+// LIST_OF_TD_TITLE_FIELDS
+//if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($arrayfields['t.field1']['label'],$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
+//if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($arrayfields['t.field2']['label'],$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+   foreach($extrafields->attribute_label as $key => $val)
+   {
+       if (! empty($arrayfields["ef.".$key]['checked']))
+       {
+			$align=$extrafields->getAlignFlag($key);
+			$sortonfield = "ef.".$key;
+			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+       }
+   }
+}
+// Hook fields
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+print '</tr>'."\n";
+
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine=0;
@@ -441,12 +442,12 @@ while ($i < min($num, $limit))
         print '<tr class="oddeven">';
         // LIST_OF_TD_FIELDS_LIST
         /*
-        if (! empty($arrayfields['t.field1']['checked'])) 
+        if (! empty($arrayfields['t.field1']['checked']))
         {
             print '<td>'.$obj->field1.'</td>';
 		    if (! $i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.field2']['checked'])) 
+        if (! empty($arrayfields['t.field2']['checked']))
         {
             print '<td>'.$obj->field2.'</td>';
 		    if (! $i) $totalarray['nbfield']++;
@@ -454,9 +455,9 @@ while ($i < min($num, $limit))
     	// Extra fields
 		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 		{
-		   foreach($extrafields->attribute_label as $key => $val) 
+		   foreach($extrafields->attribute_label as $key => $val)
 		   {
-				if (! empty($arrayfields["ef.".$key]['checked'])) 
+				if (! empty($arrayfields["ef.".$key]['checked']))
 				{
 					print '<td';
 					$align=$extrafields->getAlignFlag($key);
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 5c6690b44f2..02ad2f5172c 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -145,9 +145,9 @@ if (empty($reshook))
     $upload_dir = $conf->produit->dir_output;
     $permissioncreate = $user->rights->produit->creer;
     include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-    
+
     include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
-    
+
     // Barcode type
     if ($action ==	'setfk_barcode_type' && $createbarcode)
     {
@@ -203,7 +203,7 @@ if (empty($reshook))
             $action = "create";
             $error++;
         }
-        
+
         if (! $error)
         {
 	        $units = GETPOST('units', 'int');
@@ -630,7 +630,7 @@ if (empty($reshook))
 
 			$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 			$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-            
+
             // On reevalue prix selon taux tva car taux tva transaction peut etre different
             // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
             if ($tmpvat != $tmpprodvat) {
@@ -640,7 +640,7 @@ if (empty($reshook))
                     $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
                 }
             }
-            
+
             if (GETPOST('propalid') > 0) {
                 // Define cost price for margin calculation
                 $buyprice=0;
@@ -653,7 +653,7 @@ if (empty($reshook))
                 {
                     $buyprice = $result;
                 }
-                
+
                 $result = $propal->addline(
                     $desc,
                     $pu_ht,
@@ -696,7 +696,7 @@ if (empty($reshook))
                 {
                     $buyprice = $result;
                 }
-                
+
                 $result = $commande->addline(
                     $desc,
                     $pu_ht,
@@ -882,7 +882,7 @@ else
         dol_fiche_head('');
 
         print '<table class="border centpercent">';
-        
+
         print '<tr>';
         $tmpcode='';
 		if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type);
@@ -1045,7 +1045,7 @@ else
         }
 
         // Other attributes
-        $parameters=array('colspan' => 3);
+        $parameters=array('cols' => 3);
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
         if (empty($reshook) && ! empty($extrafields->attribute_label))
         {
@@ -1056,14 +1056,14 @@ else
         //if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))       available in create mode
         //{
             print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
-    
+
             // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
             $doleditor = new DolEditor('note_private', GETPOST('note_private'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_8, '90%');
     	    $doleditor->Create();
-    
+
             print "</td></tr>";
         //}
-        
+
 		if($conf->categorie->enabled) {
 			// Categories
 			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
@@ -1123,7 +1123,7 @@ else
 			print $formaccounting->select_account(GETPOST('accountancy_code_buy'), 'accountancy_code_buy', 1, null, 1, 1, '');
             print '</td></tr>';
 		}
-		else // For external software 
+		else // For external software
 		{
             // Accountancy_code_sell
             print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -1364,7 +1364,7 @@ else
         	}
 
             // Other attributes
-            $parameters=array('colspan' => ' colspan="2"');
+            $parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
@@ -1372,7 +1372,7 @@ else
             }
 
 			// Tags-Categories
-            if ($conf->categorie->enabled) 
+            if ($conf->categorie->enabled)
 			{
 				print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
@@ -1389,13 +1389,13 @@ else
 			if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 			{
                 print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
-        
+
                 $doleditor = new DolEditor('note_private', $object->note_private, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
                 $doleditor->Create();
-    
+
                 print "</td></tr>";
 			}
-			
+
             print '</table>';
 
             print '<br>';
@@ -1416,7 +1416,7 @@ else
 				print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
                 print '</td></tr>';
 			}
-			else // For external software 
+			else // For external software
 			{
                 // Accountancy_code_sell
                 print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -1449,21 +1449,21 @@ else
 		    $head=product_prepare_head($object);
             $titre=$langs->trans("CardProduct".$object->type);
             $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-            
+
             dol_fiche_head($head, 'card', $titre, -1, $picto);
 
             $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
             $object->next_prev_filter=" fk_product_type = ".$object->type;
 
             dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-            
-            
+
+
             print '<div class="fichecenter">';
             print '<div class="fichehalfleft">';
-            
+
             print '<div class="underbanner clearboth"></div>';
             print '<table class="border tableforfield" width="100%">';
-            
+
             // Type
             if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled))
             {
@@ -1577,7 +1577,7 @@ else
             }
             print '</td></tr>';
             */
-            
+
             // Batch number management (to batch)
             if (! empty($conf->productbatch->enabled)) {
                 print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
@@ -1616,10 +1616,10 @@ else
             print '</table>';
             print '</div>';
             print '<div class="fichehalfright"><div class="ficheaddleft">';
-       
+
             print '<div class="underbanner clearboth"></div>';
             print '<table class="border tableforfield" width="100%">';
-            
+
             // Nature
             if($object->type!= Product::TYPE_SERVICE)
             {
@@ -1727,11 +1727,7 @@ else
 
             // Other attributes
             $parameters=array('colspan' => ' colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'"');
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
-            {
-            	print $object->showOptionals($extrafields);
-            }
+            include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 			// Categories
 			if($conf->categorie->enabled) {
@@ -1747,13 +1743,13 @@ else
                 print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note_private)?$object->note_private:dol_nl2br($object->note_private,1,true)).'</td></tr>'."\n";
                 print '<!-- End show Note --> '."\n";
 			}
-			
+
             print "</table>\n";
     		print '</div>';
-    		
+
             print '</div></div>';
             print '<div style="clear:both"></div>';
-        
+
             dol_fiche_end();
         }
 
@@ -1814,16 +1810,16 @@ if (($action == 'clone' && (empty($conf->use_javascript_ajax) || ! empty($conf->
 if ($action != 'create' && $action != 'edit')
 {
     print "\n".'<div class="tabsAction">'."\n";
-    
+
     $parameters=array();
     $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     if (empty($reshook))
     {
-        if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) || 
+        if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) ||
            ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer))
         {
             if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
-    
+
             if (! isset($object->no_button_copy) || $object->no_button_copy <> 1)
             {
                 if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
@@ -1837,7 +1833,7 @@ if ($action != 'create' && $action != 'edit')
             }
         }
         $object_is_used = $object->isObjectUsed($object->id);
-    
+
         if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer)
         || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer))
         {
@@ -1862,7 +1858,7 @@ if ($action != 'create' && $action != 'edit')
             print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a></div>';
         }
     }
-    
+
     print "\n</div>\n";
 }
 
@@ -1957,7 +1953,7 @@ if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action =
     	print '<input type="hidden" name="action" value="addin">';
 
 	    print load_fiche_titre($langs->trans("AddToDraft"),'','');
-		
+
 		dol_fiche_head('');
 
     	$html .= '<tr><td class="nowrap">'.$langs->trans("Quantity").' ';
@@ -1969,7 +1965,7 @@ if (! empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action =
     	print '<table width="100%" class="border">';
         print $html;
         print '</table>';
-		
+
         print '<div class="center">';
         print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
         print '</div>';
@@ -2000,7 +1996,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete')
 
     print $formfile->showdocuments($modulepart,$object->ref,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang, '', $object);
     $somethingshown=$formfile->numoffiles;
-    
+
     print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
     print '</div></div></div>';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index d0b58c9909c..2cf2f36b419 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -72,7 +72,7 @@ if ($id > 0 || ! empty($ref))
 
     if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
     elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
-    
+
 	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
 	{
 	    if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
@@ -188,12 +188,13 @@ if ($object->id)
 	$head=product_prepare_head($object);
 	$titre=$langs->trans("CardProduct".$object->type);
 	$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-	
+
 	dol_fiche_head($head, 'documents', $titre, -1, $picto);
 
+	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	
+
 	// Construit liste des fichiers
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 
@@ -213,9 +214,9 @@ if ($object->id)
     $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
     $object->next_prev_filter=" fk_product_type = ".$object->type;
     dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-    
+
     print '<div class="fichecenter">';
-    
+
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border tableforfield" width="100%">';
 
@@ -225,14 +226,14 @@ if ($object->id)
 
     print '</div>';
     print '<div style="clear:both"></div>';
-    
+
     dol_fiche_end();
 
     $permission = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
     $param = '&id=' . $object->id;
     include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 
-    
+
     // Merge propal PDF document PDF files
     if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
     {
@@ -308,17 +309,17 @@ if ($object->id)
     				$checked = '';
     				$filename = $filetoadd['name'];
 
-    				if ($conf->global->MAIN_MULTILANGS) 
+    				if ($conf->global->MAIN_MULTILANGS)
     				{
-    					if (array_key_exists($filetoadd['name'] . '_' . $delauft_lang, $filetomerge->lines)) 
+    					if (array_key_exists($filetoadd['name'] . '_' . $delauft_lang, $filetomerge->lines))
     					{
     						$filename = $filetoadd['name'] . ' - ' . $langs->trans('Language_' . $delauft_lang);
     						$checked = ' checked ';
     					}
     				}
-    				else 
+    				else
     				{
-    					if (array_key_exists($filetoadd['name'], $filetomerge->lines)) 
+    					if (array_key_exists($filetoadd['name'], $filetomerge->lines))
     					{
     						$checked = ' checked ';
     					}
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index e894368beaf..4911026be47 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -111,10 +111,10 @@ $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if ($action == 'addlimitstockwarehouse') {
-	
+
 	$seuil_stock_alerte = GETPOST('seuil_stock_alerte');
 	$desiredstock = GETPOST('desiredstock');
-	
+
 	$maj_ok = true;
 	if($seuil_stock_alerte == '') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("StockLimit")), null, 'errors');
@@ -124,44 +124,44 @@ if ($action == 'addlimitstockwarehouse') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DesiredStock")), null, 'errors');
 		$maj_ok = false;
 	}
-	
+
 	if($maj_ok) {
-		
+
 		$pse = new ProductStockEntrepot($db);
 		if($pse->fetch('', GETPOST('id'), GETPOST('fk_entrepot')) > 0) {
-			
+
 			// Update
 			$pse->seuil_stock_alerte = $seuil_stock_alerte;
 			$pse->desiredstock  	 = $desiredstock;
 			if($pse->update($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseUpdated'));
-			
+
 		} else {
-			
+
 			// Create
 			$pse->fk_entrepot 		 = GETPOST('fk_entrepot');
 			$pse->fk_product  	 	 = GETPOST('id');
 			$pse->seuil_stock_alerte = GETPOST('seuil_stock_alerte');
 			$pse->desiredstock  	 = GETPOST('desiredstock');
 			if($pse->create($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseCreated'));
-			
+
 		}
-		
+
 	}
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id'));
 	exit;
-	
+
 }
 
 if($action == 'delete_productstockwarehouse')
 {
-	
+
 	$pse = new ProductStockEntrepot($db);
 	$pse->fetch(GETPOST('fk_productstockwarehouse'));
 	if($pse->delete($user) > 0) setEventMessage($langs->trans('ProductStockWarehouseDeleted'));
-	
+
 	$action = '';
-	
+
 }
 
 // Set stock limit
@@ -233,7 +233,7 @@ if ($action == "correct_stock" && ! $cancel)
 				$origin_element = 'project';
 				$origin_id = GETPOST('projectid', 'int');
 			}
-		
+
 			if (empty($object)) {
 				$object = new Product($db);
 				$result=$object->fetch($id);
@@ -317,7 +317,7 @@ if ($action == "transfert_stock" && ! $cancel)
 	{
 	    $object = new Product($db);
 	    $result=$object->fetch($id);
-	
+
 	    if ($object->hasbatch() && ! $batchnumber)
 	    {
 	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
@@ -325,7 +325,7 @@ if ($action == "transfert_stock" && ! $cancel)
 	        $action='transfert';
 	    }
 	}
-	
+
 	if (! $error)
 	{
 		if ($id)
@@ -341,7 +341,7 @@ if ($action == "transfert_stock" && ! $cancel)
 			$pricesrc=0;
 			if (isset($object->pmp)) $pricesrc=$object->pmp;
 			$pricedest=$pricesrc;
-			
+
 			if ($object->hasbatch())
 			{
 				$pdluo = new Productbatch($db);
@@ -514,7 +514,7 @@ if ($id > 0 || $ref)
 {
 	$object = new Product($db);
 	$result = $object->fetch($id,$ref);
-	
+
 	$object->load_stock();
 
 	$title = $langs->trans('ProductServiceCard');
@@ -538,21 +538,21 @@ if ($id > 0 || $ref)
 		$head=product_prepare_head($object);
 		$titre=$langs->trans("CardProduct".$object->type);
 		$picto=($object->type==Product::TYPE_SERVICE?'service':'product');
-		
+
 		dol_fiche_head($head, 'stock', $titre, -1, $picto);
 
 		dol_htmloutput_events();
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		
+
         dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
-		
-		if ($conf->productbatch->enabled) 
+
+		if ($conf->productbatch->enabled)
 		{
 			print '<tr><td class="titlefield">'.$langs->trans("ManageLotSerial").'</td><td>';
 			print $object->getLibStatut(0,2);
@@ -614,11 +614,11 @@ if ($id > 0 || $ref)
         print '<tr><td>'.$form->editfieldkey("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer).'</td><td colspan="2">';
         print $form->editfieldval("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer,'string');
         print '</td></tr>';
-		
+
 		// Hook formObject
-		$parameters=array('colspan' => 3);
+		$parameters=array('cols'=>2);
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-     
+
         // Desired stock
         print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1),'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer);
         print '</td><td colspan="2">';
@@ -643,7 +643,7 @@ if ($id > 0 || $ref)
 		print '</tr>';
 
 		$stocktheo = price2num($object->stock_theorique, 'MS');
-		
+
 		$found=0;
 		$helpondiff='<strong>'.$langs->trans("StockDiffPhysicTeoric").':</strong><br>';
 		// Number of customer orders running
@@ -655,7 +655,7 @@ if ($id > 0 || $ref)
 		    if ($result < 0) dol_print_error($db,$object->error);
 		    $helpondiff.=' ('.$langs->trans("ProductQtyInDraft").': '.$object->stats_commande['qty'].')';
 		}
-		
+
 		// Number of product from customer order already sent (partial shipping)
 		if (! empty($conf->expedition->enabled))
 		{
@@ -663,7 +663,7 @@ if ($id > 0 || $ref)
 		    $result=$object->load_stats_sending(0,'2');
 		    $helpondiff.=$langs->trans("ProductQtyInShipmentAlreadySent").': '.$object->stats_expedition['qty'];
 		}
-		
+
 		// Number of supplier order running
 		if (! empty($conf->fournisseur->enabled))
 		{
@@ -674,14 +674,14 @@ if ($id > 0 || $ref)
 		    if ($result < 0) dol_print_error($db,$object->error);
 		    $helpondiff.=' ('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$object->stats_commande_fournisseur['qty'].')';
 		}
-		
+
 		// Number of product from supplier order already received (partial receipt)
 		if (! empty($conf->fournisseur->enabled))
 		{
 		    if ($found) $helpondiff.='<br>'; else $found=1;
 		    $helpondiff.=$langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied").': '.$object->stats_reception['qty'];
 		}
-		
+
         // Calculating a theorical value
         print '<tr><td>';
         print $form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc"));
@@ -723,7 +723,7 @@ if ($id > 0 || $ref)
 
         print '</div>';
         print '<div style="clear:both"></div>';
-    		
+
 		dol_fiche_end();
 	}
 
@@ -762,18 +762,18 @@ if (empty($reshook))
 	if (empty($action) && $object->id)
 	{
 	    print "<div class=\"tabsAction\">\n";
-	
+
 	    if ($user->rights->stock->mouvement->creer)
 	    {
 	        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=correction">'.$langs->trans("StockCorrection").'</a>';
 	    }
-	
+
 	    //if (($user->rights->stock->mouvement->creer) && ! $object->hasbatch())
 	    if ($user->rights->stock->mouvement->creer)
 		{
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=transfert">'.$langs->trans("StockTransfer").'</a>';
 		}
-	
+
 		print '</div>';
 	}
 
@@ -897,7 +897,7 @@ if ($resql)
 			}
 		}
 		$i++;
-		
+
 	}
 }
 else dol_print_error($db);
@@ -929,25 +929,25 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
 	print '<br><br>';
 	print_titre($langs->trans('AddNewProductStockWarehouse'));
 	//print '<br />';
-	
+
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="action" value="addlimitstockwarehouse">';
 	print '<input type="hidden" name="id" value="'.GETPOST('id').'">';
 	print '<table class="noborder" width="100%">';
-	
+
 	print '<tr class="liste_titre"><td width="40%" colspan="4">'.$formproduct->selectWarehouses('', 'fk_entrepot').'</td>';
 	print '<td align="right"><input name="seuil_stock_alerte" type="text" placeholder="'.$langs->trans("StockLimit").'" /></td>';
 	print '<td align="right"><input name="desiredstock" type="text" placeholder="'.$langs->trans("DesiredStock").'" /></td>';
 	print '<td align="right"><input type="submit" value="'.$langs->trans('Save').'" class="button" /></td>';
 	print '</tr>';
-	
+
 	$pse = new ProductStockEntrepot($db);
 	$lines = $pse->fetchAll(GETPOST('id'));
-	
-	if (!empty($lines)) 
+
+	if (!empty($lines))
 	{
 		$var=false;
-		foreach($lines as $line) 
+		foreach($lines as $line)
 		{
 			$ent = new Entrepot($db);
 			$ent->fetch($line['fk_entrepot']);
@@ -956,12 +956,12 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
 			print '<td align="right">'.$line['desiredstock'].'</td>';
 			print '<td align="right"><a href="?id='.GETPOST('id').'&fk_productstockwarehouse='.$line['id'].'&action=delete_productstockwarehouse">'.img_delete().'</a></td>';
 			print '</tr>';
-			
+
 		}
 	}
-	
+
 	print "</table>";
-	
+
 	print '</form>';
 }
 
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index c434fa65381..ae5e5dbaa68 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -39,7 +39,7 @@ class Project extends CommonObject
     public $fk_element = 'fk_projet';
     protected $ismultientitymanaged = 1;  // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto = 'projectpub';
-    
+
     /**
      * {@inheritdoc}
      */
@@ -102,7 +102,7 @@ class Project extends CommonObject
 	 * @var Task[]
 	 */
 	public $lines;
-	
+
 
     /**
      *  Constructor
@@ -146,7 +146,7 @@ class Project extends CommonObject
             dol_syslog(get_class($this)."::create error -1 ref null", LOG_ERR);
             return -1;
         }
-        
+
         $this->db->begin();
 
         $sql = "INSERT INTO " . MAIN_DB_PREFIX . "projet (";
@@ -261,7 +261,7 @@ class Project extends CommonObject
             dol_syslog(get_class($this)."::update error -3 " . $this->error, LOG_ERR);
             return -3;
         }
-        
+
         if (dol_strlen(trim($this->ref)) > 0)
         {
             $this->db->begin();
@@ -392,7 +392,9 @@ class Project extends CommonObject
         $resql = $this->db->query($sql);
         if ($resql)
         {
-            if ($this->db->num_rows($resql))
+            $num_rows = $this->db->num_rows($resql);
+
+            if ($num_rows)
             {
                 $obj = $this->db->fetch_object($resql);
 
@@ -423,12 +425,16 @@ class Project extends CommonObject
 
                 $this->db->free($resql);
 
+                // Retreive all extrafield for thirdparty
+                $this->fetch_optionals();
+
                 return 1;
             }
-            else
-            {
-                return 0;
-            }
+
+            $this->db->free($resql);
+
+            if ($num_rows) return 1;
+            else return 0;
         }
         else
         {
@@ -745,7 +751,7 @@ class Project extends CommonObject
                 $this->error=$langs->trans("ErrorFieldFormat",$langs->transnoentities("Label")).'. '.$langs->trans('RemoveString',$langs->transnoentitiesnoconv("CopyOf"));
                 return -1;
             }
-            
+
             $this->db->begin();
 
             $sql = "UPDATE " . MAIN_DB_PREFIX . "projet";
@@ -764,7 +770,7 @@ class Project extends CommonObject
                     if ($result < 0) { $error++; }
                     // End call triggers
                 }
-                
+
                 if (!$error)
                 {
                 	$this->statut=1;
@@ -847,7 +853,7 @@ class Project extends CommonObject
                 return -1;
             }
         }
-        
+
         return 0;
     }
 
@@ -936,9 +942,9 @@ class Project extends CommonObject
         global $conf, $langs, $user;
 
         if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
+
         $result = '';
-        
+
         $label='';
         if ($option != 'nolink') $label = '<u>' . $langs->trans("ShowProject") . '</u>';
         $label .= ($label?'<br>':'').'<b>' . $langs->trans('Ref') . ': </b>' . $this->ref;	// The space must be after the : to not being explode when showing the title in img_picto
@@ -965,11 +971,11 @@ class Project extends CommonObject
                 $url = DOL_URL_ROOT . '/projet/card.php?id=' . $this->id;
             }
             // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0); 
+            $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
             if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
             if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
         }
-        
+
         $linkclose='';
         if (empty($notooltip) && $user->rights->propal->lire)
         {
@@ -988,7 +994,7 @@ class Project extends CommonObject
         $linkstart = '<a href="'.$url.'"';
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
-        
+
         if ($withpicto) $result.=($linkstart . img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1) . $linkend);
         if ($withpicto && $withpicto != 2) $result.=' ';
         if ($withpicto != 2) $result.=$linkstart . $this->ref . $linkend . (($addlabel && $this->title) ? $sep . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
@@ -1150,7 +1156,7 @@ class Project extends CommonObject
         {
             // No filter. Use this if user has permission to see all project
         }
-	    
+
 	$sql.= $filter;
         //print $sql;
 
@@ -1760,7 +1766,7 @@ class Project extends CommonObject
 	    $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 	    $sql.= " WHERE";
 	    $sql.= " p.entity IN (".getEntity('projet', 1).")";
-		if (! $user->rights->projet->all->lire) 
+		if (! $user->rights->projet->all->lire)
 		{
 			$projectsListId = $this->getProjectsAuthorizedForUser($user,0,1);
 			$sql .= "AND p.rowid IN (".$projectsListId.")";
@@ -1800,7 +1806,7 @@ class Project extends CommonObject
         $now = dol_now();
 
         return ($this->datee ? $this->datee : $this->date_end) < ($now - $conf->projet->warning_delay);
-	}	
+	}
 
 
 	/**
@@ -1911,10 +1917,10 @@ class Project extends CommonObject
 		return 1;
 	}
 
-	
+
 	/**
 	 * 	Create an array of tasks of current project
-	 * 
+	 *
 	 *  @param  User   $user       Object user we want project allowed to
 	 * 	@return int		           >0 if OK, <0 if KO
 	 */
@@ -1925,6 +1931,6 @@ class Project extends CommonObject
 
 	    $this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0);
 	}
-	
+
 }
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 8124f500bd6..84c0ec30471 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -250,6 +250,9 @@ class Task extends CommonObject
                 $this->note_private			= $obj->note_private;
                 $this->note_public			= $obj->note_public;
 				$this->rang					= $obj->rang;
+
+                // Retreive all extrafield for thirdparty
+               	$this->fetch_optionals();
             }
 
             $this->db->free($resql);
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 9211d75f499..6018b8bef69 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -511,13 +511,10 @@ if ($id > 0 || ! empty($ref))
 			print nl2br($object->description);
 			print '</td></tr>';
 
-			// Other options
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
-			if (empty($reshook) && ! empty($extrafields->attribute_label))
-			{
-				print $object->showOptionals($extrafields);
-			}
+			// Other attributes
+			$cols = 3;
+			$parameyers=array('socid'=>$socid);
+			include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 			print '</table>';
 
diff --git a/htdocs/resource/add.php b/htdocs/resource/add.php
index c8b4d124fed..2e988d16025 100644
--- a/htdocs/resource/add.php
+++ b/htdocs/resource/add.php
@@ -175,7 +175,7 @@ if (! $action)
         print '</tr>';
 
         // Other attributes
-        $parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
+        $parameters=array('objectsrc' => $objectsrc);
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
         if (empty($reshook) && ! empty($extrafields->attribute_label))
         {
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 7f0a96a7ab4..a286eb60097 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -201,7 +201,7 @@ if ( $object->fetch($id) > 0 )
 		print '</td></tr>';
 
 		// Other attributes
-		$parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
+		$parameters=array('objectsrc' => $objectsrc);
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
@@ -224,7 +224,7 @@ if ( $object->fetch($id) > 0 )
 		dol_fiche_head($head, 'resource', $langs->trans("ResourceSingular"), -1, 'resource');
 
 		$formconfirm = '';
-		
+
 		// Confirm deleting resource line
 	    if ($action == 'delete')
 	    {
@@ -233,21 +233,21 @@ if ( $object->fetch($id) > 0 )
 
 	    // Print form confirm
 	    print $formconfirm;
-	    
-	    
+
+
 	    $linkback = '<a href="' . DOL_URL_ROOT . '/resource/list.php' . (! empty($socid) ? '?id=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	    
-	    
+
+
 	    $morehtmlref='<div class="refidno">';
 	    $morehtmlref.='</div>';
-	    
-	    
+
+
 	    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
-	    
-	    
+
+
 	    print '<div class="fichecenter">';
 	    print '<div class="underbanner clearboth"></div>';
-	    
+
 		/*---------------------------------------
 		 * View object
 		 */
@@ -269,21 +269,16 @@ if ( $object->fetch($id) > 0 )
 		print '</td>';
 
 		// Other attributes
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields);
-		}
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 		print '</tr>';
 
 		print '</table>';
-		
+
 		print '</div>';
-		
+
 		print '<div class="clearboth"></div><br>';
-		
+
 		dol_fiche_end();
 	}
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index ba4383e6f8e..cb99949407b 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -140,7 +140,7 @@ if (empty($reshook))
 			if (!$errors)
 			{
 			    // TODO Move the merge function into class of object.
-			    
+
 				$db->begin();
 
 				// Recopy some data
@@ -157,16 +157,16 @@ if (empty($reshook))
 				{
 				    if (empty($object->$property)) $object->$property = $soc_origin->$property;
 				}
-				
+
 				// Concat some data
 				$listofproperties=array(
-				    'note_public', 'note_private' 
+				    'note_public', 'note_private'
 				);
 				foreach ($listofproperties as $property)
 				{
 				    $object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
 				}
-				
+
 				// Merge extrafields
 				foreach ($soc_origin->array_options as $key => $val)
 				{
@@ -175,8 +175,8 @@ if (empty($reshook))
 
 				// TODO Merge categories
 				$object->update($object->id, $user);
-				
-				// Move links 
+
+				// Move links
 				$objects = array(
 					'Adherent' => '/adherents/class/adherent.class.php',
 					'Societe' => '/societe/class/societe.class.php',
@@ -280,6 +280,21 @@ if (empty($reshook))
     	$res=$object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
     }
 
+    if ($action == 'update_extras') {
+        $object->fetch($socid);
+
+        // Fill array 'array_options' with data from update form
+        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+        if ($ret < 0) $error++;
+        if (! $error)
+        {
+            $result = $object->insertExtraFields();
+            if ($result < 0) $error++;
+        }
+        if ($error) $action = 'edit_extras';
+    }
+
     // Add new or update third party
     if ((! GETPOST('getcustomercode') && ! GETPOST('getsuppliercode'))
     && ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
@@ -487,7 +502,7 @@ if (empty($reshook))
                 if (empty($object->fournisseur)) $object->code_fournisseur='';
 
                 $result = $object->create($user);
-                
+
 				if ($result >= 0)
                 {
                     if ($object->particulier)
@@ -557,7 +572,7 @@ if (empty($reshook))
 						$object->code_fournisseur = null;
 						$object->code_client = null;
 					}
-					
+
                     $error=$object->error; $errors=$object->errors;
                 }
 
@@ -851,7 +866,7 @@ else
         $object->particulier		= $private;
         $object->prefix_comm		= GETPOST('prefix_comm');
         $object->client				= GETPOST('client')?GETPOST('client'):$object->client;
-        
+
         if(empty($duplicate_code_error)) {
 	        $object->code_client		= GETPOST('code_client', 'alpha');
 	        $object->fournisseur		= GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
@@ -859,7 +874,7 @@ else
 		else {
 			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'),'', 'warnings');
 		}
-		
+
         $object->code_fournisseur	= GETPOST('code_fournisseur', 'alpha');
         $object->address			= GETPOST('address', 'alpha');
         $object->zip				= GETPOST('zipcode', 'alpha');
@@ -1135,7 +1150,7 @@ else
 	    print '<td colspan="3"><input type="text" name="email" id="email" value="'.$object->email.'"></td></tr>';
         print '<tr><td>'.fieldLabel('Web','url').'</td>';
 	    print '<td colspan="3"><input type="text" name="url" id="url" value="'.$object->url.'"></td></tr>';
-	    
+
         // Skype
         if (! empty($conf->skype->enabled))
         {
@@ -1215,7 +1230,7 @@ else
             print '</td><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
             print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
             print '</td></tr>';
-        
+
         }
         elseif($mysoc->localtax1_assuj=="1")
         {
@@ -1229,7 +1244,7 @@ else
             print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
             print '</td></tr>';
         }
-        
+
         // Type - Size
         print '<tr><td>'.fieldLabel('ThirdPartyType','typent_id').'</td><td class="maxwidthonsmartphone">'."\n";
         $sortparam=(empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
@@ -1544,7 +1559,7 @@ else
 
             dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
-            print '<div class="fichecenter2">'; 
+            print '<div class="fichecenter2">';
             print '<table class="border" width="100%">';
 
             // Ref/ID
@@ -1750,7 +1765,7 @@ else
                     $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
                     print '</span>';
                 }
-            
+
                 print '</td><td>'.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').'</td><td>';
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
                 if  (! isOnlyOneLocalTax(2))
@@ -1760,7 +1775,7 @@ else
                     print '</span>';
                 }
                 print '</td></tr>';
-            
+
             }
             elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
             {
@@ -1773,7 +1788,7 @@ else
                     print '</span>';
                 }
                 print '</td></tr>';
-            
+
             }
             elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
             {
@@ -1787,7 +1802,7 @@ else
                 }
                 print '</td></tr>';
             }
-            
+
             // VAT Code
             print '<tr><td>'.fieldLabel('VATIntra','intra_vat').'</td>';
             print '<td colspan="3">';
@@ -1935,7 +1950,7 @@ else
 
             print '</table>';
             print '</div>';
-            
+
 	        dol_fiche_end();
 
             print '<div align="center">';
@@ -1952,7 +1967,7 @@ else
         /*
          * View
          */
-        
+
         if (!empty($object->id)) $res=$object->fetch_optionals($object->id,$extralabels);
         //if ($res < 0) { dol_print_error($db); exit; }
 
@@ -2091,7 +2106,7 @@ else
 		    print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
 		    print yn($object->localtax2_assuj);
 		    print '</td></tr>';
-		
+
 		    if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
 		    {
 		        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
@@ -2145,7 +2160,7 @@ else
 		            print '<td>'.$object->localtax1_value.'</td>';
 		        }
 		        print '</tr></form>';
-		
+
 		    }
 		}
 		elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
@@ -2155,7 +2170,7 @@ else
 		    print '</td></tr>';
 		    if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
 		    {
-		
+
 		        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 		        print '<input type="hidden" name="action" value="set_localtax2">';
 		        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -2168,7 +2183,7 @@ else
 		            print '<td>'.$object->localtax2_value.'</td>';
 		        }
 		        print '</tr></form>';
-		
+
 		    }
 		}
 		/*
@@ -2179,7 +2194,7 @@ else
 		 print '</td><tr>';
 		 }
 		 */
-		
+
         // VAT Code
         print '<tr>';
 		print '<td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
@@ -2308,14 +2323,9 @@ else
 			print '</td></tr>';
 		}
 
-        // Other attributes
-        $parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
-        {
-        	print $object->showOptionals($extrafields);
-        }
+		// Other attributes
+		$parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
         // Parent company
         if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
@@ -2574,10 +2584,10 @@ else
 
 	        // Subsidiaries list
 	        if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
-	        {	        
+	        {
 	           $result=show_subsidiaries($conf,$langs,$db,$object);
 	        }
-	        
+
 	        // Contacts list
 	        if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
 	        {
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ebd06dbd5c4..724c0f66523 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1062,7 +1062,6 @@ class Societe extends CommonObject
         else if ($idprof6) $sql .= " WHERE s.idprof6 = '".$this->db->escape($idprof6)."' AND s.entity IN (".getEntity($this->element, 1).")";
 
         $resql=$this->db->query($sql);
-        dol_syslog(get_class($this)."::fetch ".$sql);
         if ($resql)
         {
             $num=$this->db->num_rows($resql);
@@ -1196,11 +1195,7 @@ class Societe extends CommonObject
                 $result = 1;
 
                 // Retreive all extrafield for thirdparty
-                // fetch optionals attributes and labels
-                require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-               	$this->fetch_optionals($this->id,$extralabels);
+               	$this->fetch_optionals();
             }
             else
 			{
@@ -1843,16 +1838,16 @@ class Societe extends CommonObject
     			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
     			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
     			)
-    		) 
+    		)
     		$code = $this->code_client . ' - ';
 
     		if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
     			&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
     			|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
     			)
-    		) 
+    		)
     		$code .= $this->code_fournisseur . ' - ';
-    
+
     		if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
     			$name =$code.' '.$name;
     		else
@@ -1870,7 +1865,7 @@ class Societe extends CommonObject
             $label.= Form::showphoto('societe', $this, 80, 0, 0, 'photowithmargin', 'mini');
             $label.= '</div><div style="clear: both;"></div>';
         }
-        
+
         $label.= '<div class="centpercent">';
 
         if ($option == 'customer' || $option == 'compta' || $option == 'category' || $option == 'category_supplier')
@@ -1903,7 +1898,7 @@ class Societe extends CommonObject
             $label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
             $linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
         }
-        
+
         // By default
         if (empty($linkstart))
         {
@@ -1924,13 +1919,13 @@ class Societe extends CommonObject
             $label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. $this->code_compta_client;
         if (! empty($conf->accounting->enabled) && $this->fournisseur)
             $label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
-            
+
         $label.= '</div>';
 
         // Add type of canvas
         $linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
         // Add param to save lastsearch_values or not
-        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0); 
+        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
         if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
         if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
         $linkstart.='"';
@@ -1965,7 +1960,7 @@ class Societe extends CommonObject
             $linkstart='';
             $linkend='';
         }
-        
+
         if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1).$linkend);
         if ($withpicto && $withpicto != 2) $result.=' ';
         if ($withpicto != 2) $result.=$linkstart.($maxlen?dol_trunc($name,$maxlen):$name).$linkend;
@@ -3352,7 +3347,7 @@ class Societe extends CommonObject
 	{
 	    $table='propal';
 	    if ($mode == 'supplier') $table = 'supplier_proposal';
-	    
+
 	    $sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 	    $sql .= " WHERE fk_soc = ". $this->id;
 
@@ -3376,7 +3371,7 @@ class Societe extends CommonObject
 	    else
 	        return array();
 	}
-	
+
 	/**
 	 *  Return amount of order not paid and total
 	 *
@@ -3387,7 +3382,7 @@ class Societe extends CommonObject
 	{
 	    $table='commande';
 	    if ($mode == 'supplier') $table = 'commande_fournisseur';
-	     
+
 	    $sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 	    $sql .= " WHERE fk_soc = ". $this->id;
 
@@ -3411,7 +3406,7 @@ class Societe extends CommonObject
 	    else
 	        return array();
 	}
-	
+
 	/**
 	 *  Return amount of bill not paid and total
 	 *
@@ -3422,7 +3417,7 @@ class Societe extends CommonObject
 	{
 	    $table='facture';
 	    if ($mode == 'supplier') $table = 'facture_fourn';
-	     
+
 	    /* Accurate value of remain to pay is to sum remaintopay for each invoice
 	     $paiement = $invoice->getSommePaiement();
 	     $creditnotes=$invoice->getSumCreditNotesUsed();
@@ -3455,7 +3450,7 @@ class Societe extends CommonObject
 	            $tmpobject->id=$obj->rowid;
 	            if ($obj->fk_statut != 0                                           // Not a draft
 	                && ! ($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
-	                )                                                      
+	                )
 	            {
 	                $outstandingTotal+= $obj->total_ht;
 	                $outstandingTotalIncTax+= $obj->total_ttc;
@@ -3474,12 +3469,12 @@ class Societe extends CommonObject
 	        }
 	        return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);
 	    }
-	    else 
+	    else
 	    {
 	        return array();
 	    }
 	}
-	
+
 	/**
 	 *  Return amount of bill not paid
 	 *
@@ -3502,7 +3497,7 @@ class Societe extends CommonObject
 	    //$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
 	    $sql .= " AND fk_statut <> 3";		// Not abandonned
 	    $sql .= " AND fk_statut <> 2";		// Not clasified as paid
-	
+
 	    dol_syslog("get_OutstandingBill", LOG_DEBUG);
 	    $resql=$this->db->query($sql);
 	    if ($resql)
@@ -3522,7 +3517,7 @@ class Societe extends CommonObject
 	    else
 	        return 0;
 	}
-	
+
 	/**
 	 * Return label of status customer is prospect/customer
 	 *
@@ -3592,9 +3587,9 @@ class Societe extends CommonObject
                     return 0;
     			}
     		}
-    
+
     		$modelpath = "core/modules/societe/doc/";
-		
+
     		$result=$this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 
@@ -3615,7 +3610,7 @@ class Societe extends CommonObject
 	public function setCategories($categories, $type)
 	{
 		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-	    
+
 	    // Decode type
 		if ($type == 'customer') {
 			$type_id = Categorie::TYPE_CUSTOMER;
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 89bb836d119..83bc3d6e99f 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -115,9 +115,9 @@ if (! empty($socid))
 	dol_fiche_head($head, 'salesrepresentative', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
-	
+
     dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-        
+
 	print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
@@ -167,17 +167,14 @@ if (! empty($socid))
 		$i = 0;
 
 		$tmpuser = new User($db);
-		
+
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
 
  			$parameters=array('socid'=>$object->id);
         	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$obj,$action);    // Note that $action and $object may have been modified by hook
-      		if (empty($reshook)) {
-
-				null; // actions in normal case
-      		}
+      		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
       		$tmpuser->id = $obj->rowid;
       		$tmpuser->firstname = $obj->firstname;
@@ -188,7 +185,7 @@ if (! empty($socid))
       		$tmpuser->societe_id = $obj->fk_soc;
       		$tmpuser->photo = $obj->photo;
       		print $tmpuser->getNomUrl(-1);
-      		
+
 			/*print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->rowid.'">';
 			print img_object($langs->trans("ShowUser"),"user").' ';
 			print dolGetFirstLastname($obj->firstname, $obj->lastname)."\n";
@@ -216,7 +213,7 @@ if (! empty($socid))
 
 	print '</table>';
 	print "</div>\n";
-	
+
 	dol_fiche_end();
 
 
@@ -263,11 +260,11 @@ if (! empty($socid))
 
 			$var=True;
 			$tmpuser=new User($db);
-				
+
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				
+
 				print "<tr ".$bc[$var]."><td>";
 				$tmpuser->id=$obj->rowid;
 				$tmpuser->firstname=$obj->firstname;
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 056a67e5587..29bc06ff760 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -359,16 +359,7 @@ if ($sql_select)
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, $totalnboflines, '', 0, '', '', $limit);
 
     print '<table class="liste" width="100%">'."\n";
-    // Titles with sort buttons
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'doc_number','',$param,'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'dateprint','',$param,'align="center" width="150"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'fk_statut','',$param,'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans('Product'),$_SERVER['PHP_SELF'],'','',$param,'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans('Quantity'),$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans('TotalHT'),$_SERVER['PHP_SELF'],'total_ht','',$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans('UnitPrice'),$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
-    print "</tr>\n";
+
     // Filters
     print '<tr class="liste_titre">';
     print '<td class="liste_titre" align="left">';
@@ -393,6 +384,18 @@ if ($sql_select)
     print '</td>';
     print '</tr>';
 
+    // Titles with sort buttons
+    print '<tr class="liste_titre">';
+    print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'doc_number','',$param,'align="left"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'dateprint','',$param,'align="center" width="150"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'fk_statut','',$param,'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Product'),$_SERVER['PHP_SELF'],'','',$param,'align="left"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Quantity'),$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('TotalHT'),$_SERVER['PHP_SELF'],'total_ht','',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('UnitPrice'),$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+    print "</tr>\n";
+
+
 	$i = 0;
 	while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit))
 	{
@@ -407,7 +410,7 @@ if ($sql_select)
 
 		if (is_object($documentstaticline)) $documentstaticline->statut=$objp->status;
 
-		
+
 		print '<tr class="oddeven">';
 		print '<td class="nobordernopadding nowrap" width="100">';
 		print $documentstatic->getNomUrl(1);
@@ -609,7 +612,7 @@ else if (empty($type_element) || $type_element == -1)
     print_liste_field_titre($langs->trans('Quantity'),$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
     print "</tr>\n";
 
-	print '<tr '.$bc[0].'><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClickRefresh").'</td></tr>';
+	print '<tr '.$bc[0].'><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
 
 	print "</table>";
 }
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 86c350ecc22..020473fee59 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -505,7 +505,7 @@ if (empty($reshook))
 	}
 
 	// Add a product line
-	if ($action == 'addline' && $user->rights->supplier_proposal->creer) 
+	if ($action == 'addline' && $user->rights->supplier_proposal->creer)
 	{
 	    $langs->load('errors');
 	    $error = 0;
@@ -515,7 +515,7 @@ if (empty($reshook))
 		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
 		$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-		
+
 		if (GETPOST('prod_entry_mode') == 'free')
 		{
 			$idprod=0;
@@ -572,7 +572,7 @@ if (empty($reshook))
 			if ((GETPOST('prod_entry_mode') != 'free') && empty($error))	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
 			{
 			    $productsupplier = new ProductFournisseur($db);
-			    
+
 			    if (empty($conf->global->SUPPLIER_PROPOSAL_WITH_NOPRICEDEFINED))
 			    {
 			        $idprod=0;
@@ -592,7 +592,7 @@ if (empty($reshook))
 			        $idprod=$productsupplier->get_buyprice(GETPOST('idprodfournprice'), -1);        // We force qty to -1 to be sure to find if a supplier price exist
                     $res=$productsupplier->fetch($idprod);
 			    }
-                
+
 			    if ($idprod > 0)
 			    {
 			        $pu_ht = $productsupplier->fourn_pu;
@@ -601,7 +601,7 @@ if (empty($reshook))
 			        $label = $productsupplier->label;
 			        $desc = $productsupplier->description;
 			        if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
-			
+
 			        $tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
 			        $tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
 			        if (empty($tva_tx)) $tva_npr=0;
@@ -659,13 +659,13 @@ if (empty($reshook))
 			    $type = GETPOST('type');
 
 			    $fk_unit= GETPOST('units', 'alpha');
-			
+
 			    $tva_tx = price2num($tva_tx);	// When vat is text input field
-			
+
 			    // Local Taxes
 			    $localtax1_tx= get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
 			    $localtax2_tx= get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
-			
+
 			    if (GETPOST('price_ht')!=='')
 			    {
 			        $price_base_type = 'HT';
@@ -678,13 +678,13 @@ if (empty($reshook))
 			        $ht = $ttc / (1 + ($tva_tx / 100));
 			        $price_base_type = 'HT';
 			    }
-			
+
 				$result = $object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $ref_fourn, $fk_unit);
 			    //$result = $object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, $ttc, $type,'','', $date_start, $date_end, $array_options, $fk_unit);
 			}
 
 
-			if (! $error && $result > 0) 
+			if (! $error && $result > 0)
 			{
 					$db->commit();
 
@@ -701,7 +701,7 @@ if (empty($reshook))
 						}
 						$model=$object->modelpdf;
 						$ret = $object->fetch($id); // Reload to get new records
-						
+
 						$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			    		if ($result < 0) dol_print_error($db,$result);
 					}
@@ -711,7 +711,7 @@ if (empty($reshook))
 					unset($_POST['qty']);
 					unset($_POST['type']);
 					unset($_POST['remise_percent']);
-					unset($_POST['pu']);					
+					unset($_POST['pu']);
 					unset($_POST['price_ht']);
 					unset($_POST['multicurrency_price_ht']);
 					unset($_POST['price_ttc']);
@@ -742,8 +742,8 @@ if (empty($reshook))
 					unset($_POST['date_endday']);
 					unset($_POST['date_endmonth']);
 					unset($_POST['date_endyear']);
-			} 
-			else 
+			}
+			else
 			{
 				$db->rollback();
 
@@ -959,27 +959,13 @@ if (empty($reshook))
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
-		if ($ret < 0)
-			$error ++;
-
-		if (! $error) {
-			// Actions on extra fields (by external module or standard code)
-			$hookmanager->initHooks(array('supplier_proposaldao'));
-			$parameters = array('id' => $object->id);
-			$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been
-			                                                                                           // modified by
-			                                                                                           // some hooks
-			if (empty($reshook)) {
-				$result = $object->insertExtraFields();
-				if ($result < 0) {
-					$error ++;
-				}
-			} else if ($reshook < 0)
-				$error ++;
+		if ($ret < 0) $error++;
+		if (! $error)
+		{
+			$result = $object->insertExtraFields();
+			if ($result < 0) $error++;
 		}
-
-		if ($error)
-			$action = 'edit_extras';
+		if ($error) $action = 'edit_extras';
 	}
 }
 
@@ -1163,9 +1149,7 @@ if ($action == 'create')
 
 	// Other attributes
 	$parameters = array('colspan' => ' colspan="3"');
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified
-	                                                                                           // by
-	                                                                                           // hook
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
@@ -1367,11 +1351,11 @@ if ($action == 'create')
 	// Print form confirm
 	print $formconfirm;
 
-	
+
 	// Supplier proposal card
 	$linkback = '<a href="' . DOL_URL_ROOT . '/supplier_proposal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-	
-	
+
+
 	$morehtmlref='<div class="refidno">';
 	// Ref supplier
 	//$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
@@ -1411,15 +1395,15 @@ if ($action == 'create')
 	    }
 	}
 	$morehtmlref.='</div>';
-	
-	
+
+
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	
-	
+
+
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border" width="100%">';
 
 	// Payment term
@@ -1563,14 +1547,14 @@ if ($action == 'create')
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
-	
+
 	print '</div>';
 	print '<div class="fichehalfright">';
 	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
-	
+
 	print '<table class="border centpercent">';
-	
+
 	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
 	{
 		// Multicurrency Amount HT
@@ -1588,7 +1572,7 @@ if ($action == 'create')
 		print '<td>' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
 		print '</tr>';
 	}
-	
+
 	// Amount HT
 	print '<tr><td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
 	print '<td>' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
@@ -1619,18 +1603,18 @@ if ($action == 'create')
 	print '</tr>';
 
 	print '</table>';
-	
+
 	// Margin Infos
 	/*if (! empty($conf->margin->enabled)) {
 	   $formmargin->displayMarginInfos($object);
-	}*/	
+	}*/
 
 	print '</div>';
 	print '</div>';
 	print '</div>';
-	
+
 	print '<div class="clearboth"></div><br>';
-	
+
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$blocname = 'contacts';
 		$title = $langs->trans('ContactsAddresses');
@@ -1667,7 +1651,7 @@ if ($action == 'create')
 	// Add free products/services form
 	global $forceall, $senderissupplier, $dateSelector;
 	$forceall=1; $senderissupplier=2; $dateSelector=0;     // $senderissupplier=2 is same than 1 but disable test on minimum qty.
-	
+
 	if (! empty($object->lines))
 		$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1);
 
@@ -1810,12 +1794,12 @@ if ($action == 'create')
 
 		print $formfile->showdocuments('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 
-		
+
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('supplier_proposal'));
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
-		
+
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 		// List of actions on element
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3912a9b80ff..c0738f004bc 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -265,7 +265,7 @@ input.select2-input {
 	border-bottom:  solid 1px rgba(0,0,0,.2) !important;	/* required to avoid to lose bottom line when focus is lost on select2. */
 }
 
-.liste_titre input[name=monthvalid], .liste_titre input[name=search_smonth], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre input[name=month_lim] {
+.liste_titre input[name=monthvalid], .liste_titre input[name=search_smonth], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre select[name=month], .liste_titre input[name=month_lim] {
 	margin-right: 4px;
 }
 input[type=submit] {
@@ -691,7 +691,7 @@ div.fiche>form>div.div-table-responsive, div.fiche>form>div.div-table-responsive
     overflow-x: auto;
 }
 div.fiche>form>div.div-table-responsive {
-    min-height: 390px;
+    min-height: 392px;
 }
 
 .flexcontainer {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index d3f822bcca2..4557c6856fb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -692,7 +692,7 @@ div.fiche>form>div.div-table-responsive, div.fiche>form>div.div-table-responsive
     overflow-x: auto;
 }
 div.fiche>form>div.div-table-responsive {
-    min-height: 390px;
+    min-height: 392px;
 }
 
 .flexcontainer {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 92951de98e8..88315f82763 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -300,7 +300,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'update' && ! $cancel) 
+	if ($action == 'update' && ! $cancel)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -319,7 +319,7 @@ if (empty($reshook)) {
 				$error ++;
 			}
 
-			if (!$error) 
+			if (!$error)
 			{
 				$object->fetch($id);
 
@@ -456,7 +456,7 @@ if (empty($reshook)) {
 								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 							} else {
         					    // Create thumbs
-        					    $object->addThumbs($newfile);					    
+        					    $object->addThumbs($newfile);
 							}
 						} else {
 							$error ++;
@@ -465,7 +465,7 @@ if (empty($reshook)) {
 						}
 					}
 				}
-				
+
             	if (! $error && ! count($object->errors))
             	{
             		// Then we add the associated categories
@@ -476,7 +476,7 @@ if (empty($reshook)) {
 				if (!$error && !count($object->errors)) {
 					setEventMessages($langs->trans("UserModified"), null, 'mesgs');
 					$db->commit();
-					
+
 					$login = $_SESSION["dol_login"];
 					if ($login && $login == $object->oldcopy->login && $object->oldcopy->login != $object->login)    // Current user has changed its login
 					{
@@ -495,11 +495,11 @@ if (empty($reshook)) {
 		    if ($caneditpassword)    // Case we can edit only password
 		    {
 		        dol_syslog("Not allowed to change fields, only password");
-		        
+
 		        $object->fetch($id);
-		    
+
 		        $object->oldcopy = clone $object;
-		    
+
 		        $ret = $object->setPassword($user, GETPOST("password"));
 		        if ($ret < 0)
 		        {
@@ -591,14 +591,14 @@ if (empty($reshook)) {
             setEventMessages($ldap->error, $ldap->errors, 'errors');
         }
     }
-		
+
     // Actions to send emails
     $trigger_name='USER_SENTBYMAIL';
     $paramname='id';    // Name of param key to open the card
     $mode='emailfromuser';
     $trackid='use'.$object->id;
     include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
-    
+
     // Actions to build doc
     $upload_dir = $conf->user->dir_output;
     $permissioncreate=$user->rights->user->user->creer;
@@ -1027,9 +1027,9 @@ if (($action == 'create') || ($action == 'adduserldap'))
         print '<input size="30" type="text" name="accountancy_code" value="'.GETPOST('accountancy_code').'">';
         print '</td></tr>';
     }
-    
+
     // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
-    
+
     // Hierarchy
     print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
     print '<td>';
@@ -1076,7 +1076,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     print '<input size="8" type="text" name="weeklyhours" value="'.GETPOST('weeklyhours').'">';
     print '</td>';
     print "</tr>\n";
-	
+
     // Date employment
     print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
     print '<td>';
@@ -1092,9 +1092,9 @@ if (($action == 'create') || ($action == 'adduserldap'))
 		print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
 		print '</td></tr>';
 	}
-	
+
 	// Categories
-	if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) 
+	if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
 	{
 		print '<tr><td>' . fieldLabel('Categories', 'usercats') . '</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1);
@@ -1110,7 +1110,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     {
     	print $object->showOptionals($extrafields,'edit');
     }
-	
+
     // Note
     print '<tr><td class="tdtop">';
     print $langs->trans("Note");
@@ -1127,7 +1127,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     $doleditor=new DolEditor('signature',GETPOST('signature'),'',138,'dolibarr_mailings','In',true,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,'90%');
     print $doleditor->Create(1);
     print '</td></tr>';
-    
+
     print "</table>\n";
 
  	dol_fiche_end();
@@ -1153,7 +1153,7 @@ else
         $object->fetch($id, '', '', 1);
         if ($res < 0) { dol_print_error($db,$object->error); exit; }
         $res=$object->fetch_optionals($object->id,$extralabels);
-		
+
 		// Check if user has rights
 		$object->getrights();
 		if(empty($object->nb_rights)) setEventMessages($langs->trans('UserHasNoPermissions'), null, 'warnings');
@@ -1387,7 +1387,7 @@ else
                 print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
                 print '<td>'.$object->accountancy_code.'</td></tr>';
             }
-            
+
             // TODO Move this into tab RH, visible when salarie or RH is visible (HierarchicalResponsible must be on both tab)
 
             // Hierarchy
@@ -1468,7 +1468,7 @@ else
             }
 
             // Categories
-		    if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire)) 
+		    if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
 	    	{
 				print '<tr><td>' . $langs->trans( "Categories" ) . '</td>';
 				print '<td colspan="3">';
@@ -1495,30 +1495,25 @@ else
 		            print "</td></tr>\n";
 		        }
 		    }
-		    
+
 		    if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
 		    {
 		        print '<tr><td>'.$langs->trans("OpenIDURL").'</td>';
 		        print '<td>'.$object->openid.'</td>';
 		        print "</tr>\n";
 		    }
-		    
+
 		    print '<tr><td class="titlefield">'.$langs->trans("LastConnexion").'</td>';
 		    print '<td>'.dol_print_date($object->datelastlogin,"dayhour").'</td>';
 		    print "</tr>\n";
-		    
+
 		    print '<tr><td>'.$langs->trans("PreviousConnexion").'</td>';
 		    print '<td>'.dol_print_date($object->datepreviouslogin,"dayhour").'</td>';
 		    print "</tr>\n";
-		    
+
 		    // Other attributes
-		    $parameters=array();
-		    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		    if (empty($reshook) && ! empty($extrafields->attribute_label))
-		    {
-		        print $object->showOptionals($extrafields);
-		    }
-		    
+    		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
             // Company / Contact
             if (! empty($conf->societe->enabled))
             {
@@ -1598,7 +1593,7 @@ else
                 $langs->load("mails");
                 print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
             }
-            
+
             if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
@@ -1680,36 +1675,36 @@ else
                 /*
                  * Affiche formulaire mail
                  */
-            
+
                 // By default if $action=='presend'
                 $titreform='SendMail';
                 $topicmail='';
                 $action='send';
                 $modelmail='user';
-            
+
                 print '<div id="presend"></div>';
                 print load_fiche_titre($langs->trans($titreform));
-            
+
                 dol_fiche_head();
-            
+
                 // Define output language
                 $outputlangs = $langs;
                 $newlang = '';
                 if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
                     $newlang = $_REQUEST['lang_id'];
-                
+
                 if ($conf->global->MAIN_MULTILANGS && empty($newlang))
                     $newlang = $object->default_lang;
-            
+
                 // Cree l'objet formulaire mail
                 include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
                 $formmail = new FormMail($db);
                 $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
                 $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-    
+
                 if($formmail->fromtype === 'user'){
                     $formmail->fromid = $user->id;
-    
+
                 }
                 $formmail->trackid='thi'.$object->id;
                 if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
@@ -1733,40 +1728,40 @@ else
                 $formmail->substit['__FIRSTNAME__']=$object->firstname;
                 $formmail->substit['__SIGNATURE__']=$user->signature;
                 $formmail->substit['__PERSONALIZED__']='';
-    
+
                 //Find the good contact adress
                 /*
                 $custcontact='';
                 $contactarr=array();
                 $contactarr=$object->liste_contact(-1,'external');
-    
+
                 if (is_array($contactarr) && count($contactarr)>0)
                 {
                 foreach($contactarr as $contact)
                 {
                 if ($contact['libelle']==$langs->trans('TypeContact_facture_external_BILLING')) {
-    
+
                 require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-    
+
                 $contactstatic=new Contact($db);
                 $contactstatic->fetch($contact['id']);
                 $custcontact=$contactstatic->getFullName($langs,1);
                 }
                 }
-    
+
                 if (!empty($custcontact)) {
                 $formmail->substit['__CONTACTCIVNAME__']=$custcontact;
                 }
                 }*/
-    
-    
+
+
                 // Tableau des parametres complementaires du post
                 $formmail->param['action']=$action;
                 $formmail->param['models']=$modelmail;
                 $formmail->param['models_id']=GETPOST('modelmailselected','int');
                 $formmail->param['socid']=$object->id;
                 $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-    
+
                 // Init list of files
                 if (GETPOST("mode")=='init')
                 {
@@ -1774,7 +1769,7 @@ else
                     $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
                 }
                 print $formmail->get_form();
-    
+
                 dol_fiche_end();
             }
 
@@ -1783,17 +1778,17 @@ else
                 /*
                  * List of groups of user
                  */
-    
+
                 if ($canreadgroup)
                 {
                     print load_fiche_titre($langs->trans("ListOfGroupsForUser"),'','');
-    
+
                     // On selectionne les groupes auquel fait parti le user
                     $exclude = array();
-    
+
                     $usergroup=new UserGroup($db);
                     $groupslist = $usergroup->listGroupsForUser($object->id);
-    
+
                     if (! empty($groupslist))
                     {
                         if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
@@ -1804,14 +1799,14 @@ else
                             }
                         }
                     }
-    
+
                     if ($caneditgroup)
                     {
                         print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
                         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
                         print '<input type="hidden" name="action" value="addgroup" />';
                     }
-                    
+
                     print '<table class="noborder" width="100%">'."\n";
                     print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("Groups").'</th>'."\n";
                     if(! empty($conf->multicompany->enabled) && !empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
@@ -1843,7 +1838,7 @@ else
                         print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
                     }
                     print '</th></tr>'."\n";
-    
+
                     /*
                      * Groups assigned to user
                      */
@@ -1851,8 +1846,8 @@ else
                     {
                         foreach($groupslist as $group)
                         {
-                            
-    
+
+
                             print '<tr class="oddeven">';
                             print '<td>';
                             if ($caneditgroup)
@@ -1899,9 +1894,9 @@ else
                     {
                         print '<tr '.$bc[false].'><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
                     }
-    
+
                     print "</table>";
-                    
+
                     if ($caneditgroup)
                     {
                         print '</form>';
@@ -1910,7 +1905,7 @@ else
                 }
             }
         }
-        
+
         /*
          * Fiche en mode edition
          */
@@ -2030,7 +2025,7 @@ else
             print "</td></tr>\n";
 
             // API key
-            if(! empty($conf->api->enabled) && $user->admin) 
+            if(! empty($conf->api->enabled) && $user->admin)
             {
                 print '<tr><td>'.$langs->trans("ApiKey").'</td>';
                 print '<td>';
@@ -2280,9 +2275,9 @@ else
                 print '</td>';
                 print "</tr>";
             }
-            
+
             // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
-            
+
             // Hierarchy
             print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
             print '<td>';
@@ -2355,7 +2350,7 @@ else
     			print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset');
     			print '</td></tr>';
     		}
-    
+
     		// Photo
     		print '<tr>';
     		print '<td>'.$langs->trans("Photo").'</td>';
@@ -2363,9 +2358,9 @@ else
     		print $form->showphoto('userphoto',$object,60,0,$caneditfield,'photowithmargin','small');
     		print '</td>';
     		print '</tr>';
-    		
+
     		// Categories
-    		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire )) 
+    		if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire ))
     		{
     			print '<tr><td>' . fieldLabel( 'Categories', 'usercats' ) . '</td>';
     			print '<td>';
@@ -2470,7 +2465,7 @@ else
                 print dol_htmlentitiesbr($object->signature);
             }
             print '</td></tr>';
-            
+
             print '</table>';
 
             dol_fiche_end();
@@ -2495,27 +2490,27 @@ else
             $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
             $genallowed = $user->rights->user->user->creer;
             $delallowed = $user->rights->user->user->supprimer;
-    
+
             $somethingshown = $formfile->show_documents('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
-    
+
     		// Show links to link elements
     		$linktoelem = $form->showLinkToObjectBlock($object, null, null);
     		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-    
+
             print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-    
+
     		// List of actions on element
     		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
     		$formactions = new FormActions($db);
     		$somethingshown = $formactions->showactions($object, 'user', $socid);
-            
-            
+
+
             print '</div></div></div>';
         }
-        
+
 		if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close();
     }
-    
+
 }
 
 if (! empty($conf->api->enabled) && ! empty($conf->use_javascript_ajax))
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index bbcbd38c168..6cb04c8eab5 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -210,7 +210,7 @@ if ($action == 'update')
         setEventMessages($langs->trans('ErrorForbidden'), null, 'mesgs');
     }
 }
-					
+
 // Actions to build doc
 $upload_dir = $conf->usergroup->dir_output;
 $permissioncreate=$user->rights->user->user->creer;
@@ -317,10 +317,10 @@ else
         	dol_fiche_head($head, 'group', $title, -1, 'group');
 
 			dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
-			
+
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
-			
+
         	print '<table class="border" width="100%">';
 
 			// Name
@@ -348,15 +348,11 @@ else
 
 			// Other attributes
             $parameters=array('colspan' => ' colspan="2"');
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
-            {
-            	print $object->showOptionals($extrafields);
-            }
+    		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 			print "</table>\n";
             print '</div>';
-            
+
 			dol_fiche_end();
 
 
@@ -448,7 +444,7 @@ else
             {
             	foreach($object->members as $useringroup)
             	{
-            		
+
 
             		print '<tr class="oddeven">';
             		print '<td>';
@@ -497,7 +493,7 @@ else
             }
             print "</table>";
             print "<br>";
-			
+
 			/*
 	         * Documents generes
 	         */
@@ -506,21 +502,21 @@ else
 	        $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
 	        $genallowed = $user->rights->user->user->creer;
 	        $delallowed = $user->rights->user->user->supprimer;
-	
+
 	        $somethingshown = $formfile->show_documents('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
-	
+
 	        // Show links to link elements
 	        $linktoelem = $form->showLinkToObjectBlock($object, null, null);
 	        $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-	
+
 	        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-	
+
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'usergroup', $socid);
-	        
-	        
+
+
 	        print '</div></div></div>';
         }
 

From 5e3a2e06d46613ce45fcd4e0639da148cfb20636 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Thu, 8 Jun 2017 06:35:09 +0200
Subject: [PATCH 1036/1163] NEW : Accountancy - Activate multi-journal & Add
 journal_label to database (FEC)

---
 htdocs/accountancy/bookkeeping/list.php       |   6 +-
 .../accountancy/class/bookkeeping.class.php   |  35 +-
 htdocs/accountancy/journal/bankjournal.php    | 486 +++++------
 .../journal/expensereportsjournal.php         |  23 +-
 .../accountancy/journal/purchasesjournal.php  | 381 ++++-----
 htdocs/accountancy/journal/sellsjournal.php   | 760 +++++++++---------
 6 files changed, 866 insertions(+), 825 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 369dd7afcec..60e283eea2c 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2013-2016	Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2016	Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2013-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2016	  	Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2016		Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -463,10 +463,10 @@ print '</td>';
 print '<td  align="right">';
 print price($total_debit);
 print '</td>';
-print '<td  align="right">';
+print '<td align="right">';
 print price($total_credit);
 print '</td>';
-print '<td></td>';
+print '<td colspan="2"></td>';
 print '</tr>';
 
 print "</table>";
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 5d9e7a9910a..6cc0e54a8dd 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -85,6 +85,7 @@ class BookKeeping extends CommonObject
 	public $fk_user_author;
 	public $import_key;
 	public $code_journal;
+	public $journal_label;
 	public $piece_num;
 
 	/**
@@ -156,6 +157,9 @@ class BookKeeping extends CommonObject
 		if (isset($this->code_journal)) {
 			$this->code_journal = trim($this->code_journal);
 		}
+		if (isset($this->journal_label)) {
+			$this->journal_label = trim($this->journal_label);
+		}
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
@@ -250,6 +254,7 @@ class BookKeeping extends CommonObject
 				$sql .= ", fk_user_author";
 				$sql .= ", import_key";
 				$sql .= ", code_journal";
+				$sql .= ", journal_label";
 				$sql .= ", piece_num";
 				$sql .= ', entity';				
 				$sql .= ") VALUES (";
@@ -268,6 +273,7 @@ class BookKeeping extends CommonObject
 				$sql .= ",'" . $this->fk_user_author . "'";
 				$sql .= ",'" . $this->db->idate($this->date_create). "'";
 				$sql .= ",'" . $this->code_journal . "'";
+				$sql .= ",'" . $this->journal_label . "'";
 				$sql .= "," . $this->piece_num;
 				$sql .= ", " . (! isset($this->entity) ? '1' : $this->entity);
 				$sql .= ")";
@@ -384,6 +390,9 @@ class BookKeeping extends CommonObject
 		if (isset($this->code_journal)) {
 			$this->code_journal = trim($this->code_journal);
 		}
+		if (isset($this->journal_label)) {
+			$this->journal_label = trim($this->journal_label);
+		}
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
@@ -410,6 +419,7 @@ class BookKeeping extends CommonObject
 		$sql .= 'fk_user_author,';
 		$sql .= 'import_key,';
 		$sql .= 'code_journal,';
+		$sql .= 'journal_label,';
 		$sql .= 'piece_num,';
 		$sql .= 'entity';
 		$sql .= ') VALUES (';
@@ -428,6 +438,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . $user->id . ',';
 		$sql .= ' ' . (! isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'") . ',';
 		$sql .= ' ' . (empty($this->code_journal) ? 'NULL' : "'" . $this->db->escape($this->code_journal) . "'") . ',';
+		$sql .= ' ' . (empty($this->journal_label) ? 'NULL' : "'" . $this->db->escape($this->journal_label) . "'") . ',';
 		$sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->piece_num).',';
 		$sql .= ' ' . (! isset($this->entity) ? '1' : $this->entity);
 		$sql .= ')';
@@ -458,11 +469,11 @@ class BookKeeping extends CommonObject
 		// Commit or rollback
 		if ($error) {
 			$this->db->rollback();
-			
+
 			return - 1 * $error;
 		} else {
 			$this->db->commit();
-			
+
 			return $this->id;
 		}
 	}
@@ -478,7 +489,7 @@ class BookKeeping extends CommonObject
 	public function fetch($id, $ref = null) {
 		global $conf;
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
@@ -497,6 +508,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
+		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql .= ' WHERE 1 = 1';
@@ -530,6 +542,7 @@ class BookKeeping extends CommonObject
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->import_key = $obj->import_key;
 				$this->code_journal = $obj->code_journal;
+				$this->journal_label = $obj->journal_label;
 				$this->piece_num = $obj->piece_num;
 			}
 			$this->db->free($resql);
@@ -581,6 +594,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
+		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num";
 		// Manage filter
 		$sqlwhere = array ();
@@ -643,6 +657,7 @@ class BookKeeping extends CommonObject
 				$line->fk_user_author = $obj->fk_user_author;
 				$line->import_key = $obj->import_key;
 				$line->code_journal = $obj->code_journal;
+				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
 
 				$this->lines[] = $line;
@@ -693,6 +708,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
+		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		// Manage filter
@@ -752,6 +768,7 @@ class BookKeeping extends CommonObject
 				$line->fk_user_author = $obj->fk_user_author;
 				$line->import_key = $obj->import_key;
 				$line->code_journal = $obj->code_journal;
+				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
 
 				$this->lines[] = $line;
@@ -903,6 +920,9 @@ class BookKeeping extends CommonObject
 		if (isset($this->code_journal)) {
 			$this->code_journal = trim($this->code_journal);
 		}
+		if (isset($this->journal_label)) {
+			$this->journal_label = trim($this->journal_label);
+		}
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
@@ -927,6 +947,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' fk_user_author = ' . (isset($this->fk_user_author) ? $this->fk_user_author : "null") . ',';
 		$sql .= ' import_key = ' . (isset($this->import_key) ? "'" . $this->db->escape($this->import_key) . "'" : "null") . ',';
 		$sql .= ' code_journal = ' . (isset($this->code_journal) ? "'" . $this->db->escape($this->code_journal) . "'" : "null") . ',';
+		$sql .= ' journal_label = ' . (isset($this->journal_label) ? "'" . $this->db->escape($this->journal_label) . "'" : "null") . ',';
 		$sql .= ' piece_num = ' . (isset($this->piece_num) ? $this->piece_num : "null");
 		$sql .= ' WHERE rowid=' . $this->id;
 
@@ -1185,6 +1206,7 @@ class BookKeeping extends CommonObject
 		$this->fk_user_author = $user->id;
 		$this->import_key = '';
 		$this->code_journal = '';
+		$this->journal_label = '';
 		$this->piece_num = '';
 	}
 
@@ -1197,7 +1219,7 @@ class BookKeeping extends CommonObject
 	public function fetchPerMvt($piecenum) {
 		global $conf;
 
-		$sql = "SELECT piece_num,doc_date,code_journal,doc_ref,doc_type";
+		$sql = "SELECT piece_num,doc_date,code_journal,journal_label,doc_ref,doc_type";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
 		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
@@ -1209,6 +1231,7 @@ class BookKeeping extends CommonObject
 
 			$this->piece_num = $obj->piece_num;
 			$this->code_journal = $obj->code_journal;
+			$this->journal_label = $obj->journal_label;
 			$this->doc_date = $this->db->jdate($obj->doc_date);
 			$this->doc_ref = $obj->doc_ref;
 			$this->doc_type = $obj->doc_type;
@@ -1260,7 +1283,7 @@ class BookKeeping extends CommonObject
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
-		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
+		$sql .= " montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
 		$sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
@@ -1288,6 +1311,7 @@ class BookKeeping extends CommonObject
 				$line->montant = $obj->montant;
 				$line->sens = $obj->sens;
 				$line->code_journal = $obj->code_journal;
+				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
 
 				$this->linesmvt[] = $line;
@@ -1533,5 +1557,6 @@ class BookKeepingLine
 	public $fk_user_author;
 	public $import_key;
 	public $code_journal;
+	public $journal_label;
 	public $piece_num;
 }
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index cb3afb95f5a..9eae2072243 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -28,8 +28,6 @@
  * \brief 		Page with bank journal
  */
 require '../../main.inc.php';
-
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
@@ -53,8 +51,6 @@ require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/paymentexpensereport.class.php';
 
-
-// Langs
 $langs->load("companies");
 $langs->load("other");
 $langs->load("compta");
@@ -77,6 +73,7 @@ $date_endyear = GETPOST('date_endyear');
 $action = GETPOST('action','aZ09');
 
 $now = dol_now();
+$action = GETPOST('action','aZ09');
 
 // Security check
 if ($user->societe_id > 0 && empty($id_journal))
@@ -120,7 +117,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu2 ON bu2.fk_bank = b.row
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as soc on bu1.url_id=soc.rowid";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u on bu2.url_id=u.rowid";
 $sql .= " WHERE ba.fk_accountancy_journal=" . $id_journal;
-$sql .= ' AND ba.entity IN ('.getEntity('bank_account', 0).')';        // We don't share object for accountancy
+$sql .= ' AND ba.entity IN ('.getEntity('bank_account', 0).')';		// We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND b.dateo >= '" . $db->idate($date_start) . "' AND b.dateo <= '" . $db->idate($date_end) . "'";
 $sql .= " ORDER BY b.datev";
@@ -140,6 +137,7 @@ $paymentexpensereportstatic = new PaymentExpenseReport($db);
 $accountingjournalstatic = new AccountingJournal($db);
 $accountingjournalstatic->fetch($id_journal);
 $journal = $accountingjournalstatic->code;
+$journal_label = $accountingjournalstatic->label;
 
 dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG);
 $result = $db->query($sql);
@@ -210,11 +208,11 @@ if ($result) {
 			// Now loop on each link of record in bank.
 			foreach ( $links as $key => $val ) {
 
-			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'payment_salary')))     // So we excluded 'company' here
-			    {
-			        // We save tabtype for a future use, to remember what kind of payment it is
-			        $tabtype[$obj->rowid] = $links[$key]['type'];
-			    }
+				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'payment_salary')))	 // So we excluded 'company' here
+				{
+					// We save tabtype for a future use, to remember what kind of payment it is
+					$tabtype[$obj->rowid] = $links[$key]['type'];
+				}
 
 				if ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
@@ -298,22 +296,22 @@ if ($result) {
 
 
 		// Check account number is ok
-		/*if ($action == 'writebookkeeping')        // Make test now in such a case
+		/*if ($action == 'writebookkeeping')		// Make test now in such a case
 		{
-    		reset($tabbq[$obj->rowid]);
-    		$first_key_tabbq = key($tabbq[$obj->rowid]);
-    		if (empty($first_key_tabbq))
-    		{
-    		    $error++;
-    		    setEventMessages($langs->trans('ErrorAccountancyCodeOnBankAccountNotDefined', $obj->baref), null, 'errors');
-    		}
-    		reset($tabtp[$obj->rowid]);
-    		$first_key_tabtp = key($tabtp[$obj->rowid]);
-    		if (empty($first_key_tabtp))
-    		{
-    	        $error++;
-    	        setEventMessages($langs->trans('ErrorAccountancyCodeOnThirdPartyNotDefined'), null, 'errors');
-    		}
+			reset($tabbq[$obj->rowid]);
+			$first_key_tabbq = key($tabbq[$obj->rowid]);
+			if (empty($first_key_tabbq))
+			{
+				$error++;
+				setEventMessages($langs->trans('ErrorAccountancyCodeOnBankAccountNotDefined', $obj->baref), null, 'errors');
+			}
+			reset($tabtp[$obj->rowid]);
+			$first_key_tabtp = key($tabtp[$obj->rowid]);
+			if (empty($first_key_tabtp))
+			{
+				$error++;
+				setEventMessages($langs->trans('ErrorAccountancyCodeOnThirdPartyNotDefined'), null, 'errors');
+			}
 		}*/
 
 		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
@@ -335,76 +333,77 @@ if (! $error && $action == 'writebookkeeping') {
 	$now = dol_now();
 
 	$error = 0;
-	foreach ( $tabpay as $key => $val ) {      // $key is rowid into llx_bank
+	foreach ( $tabpay as $key => $val ) {	  // $key is rowid into llx_bank
 
-	    $errorforline = 0;
+		$errorforline = 0;
 
-	    $db->begin();
+		$db->begin();
 
 		// Bank
 		if (! $errorforline)
 		{
-		    // Line into bank account
-    		foreach ( $tabbq[$key] as $k => $mt )
-    		{
-    			if ($mt) {
-        		    $bookkeeping = new BookKeeping($db);
-        			$bookkeeping->doc_date = $val["date"];
-        			$bookkeeping->doc_ref = $val["ref"];
-        			$bookkeeping->doc_type = 'bank';
-        			$bookkeeping->fk_doc = $key;
-        			$bookkeeping->fk_docdet = $val["fk_bank"];
-        			$bookkeeping->numero_compte = $k;
-        			$bookkeeping->label_compte = $compte->label;
-        			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-        			$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-        			$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
-        			$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
-        			$bookkeeping->code_journal = $journal;
-        			$bookkeeping->fk_user_author = $user->id;
-        			$bookkeeping->date_create = $now;
+			// Line into bank account
+			foreach ( $tabbq[$key] as $k => $mt )
+			{
+				if ($mt) {
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->doc_type = 'bank';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = $val["fk_bank"];
+					$bookkeeping->numero_compte = $k;
+					$bookkeeping->label_compte = $compte->label;
+					$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+					$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
+					$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->fk_user_author = $user->id;
+					$bookkeeping->date_create = $now;
 
-        			if ($tabtype[$key] == 'payment') {
-        			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+					if ($tabtype[$key] == 'payment') {
+						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
 
-        				$sqlmid = 'SELECT fac.facnumber';
-        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON payfac.fk_facture=fac.rowid";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-        				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-        				$resultmid = $db->query($sqlmid);
-        				if ($resultmid) {
-        					$objmid = $db->fetch_object($resultmid);
-        					$bookkeeping->doc_ref = $objmid->facnumber;    // Ref of invoice
-        				}
-        			} else if ($tabtype[$key] == 'payment_supplier') {
-        			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$sqlmid = 'SELECT fac.facnumber';
+						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON payfac.fk_facture=fac.rowid";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+						$sqlmid .= " WHERE pay.fk_bank=" . $key;
+						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+						$resultmid = $db->query($sqlmid);
+						if ($resultmid) {
+							$objmid = $db->fetch_object($resultmid);
+							$bookkeeping->doc_ref = $objmid->facnumber;	// Ref of invoice
+						}
+					} else if ($tabtype[$key] == 'payment_supplier') {
+						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
 
-        				$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
-        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON payfacf.fk_facturefourn=facf.rowid";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-        				$sqlmid .= " WHERE payf.fk_bank=" . $key;
-        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-        				$resultmid = $db->query($sqlmid);
-        				if ($resultmid) {
-        					$objmid = $db->fetch_object($resultmid);
-        					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
-        				}
-        			} else if ($tabtype[$key] == 'payment_expensereport') {
-        			    $bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
+						$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
+						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON payfacf.fk_facturefourn=facf.rowid";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+						$sqlmid .= " WHERE payf.fk_bank=" . $key;
+						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+						$resultmid = $db->query($sqlmid);
+						if ($resultmid) {
+							$objmid = $db->fetch_object($resultmid);
+							$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
+						}
+					} else if ($tabtype[$key] == 'payment_expensereport') {
+						$bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
 
-        				$sqlmid = 'SELECT e.ref';
-        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
-        				$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
-        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-        				$resultmid = $db->query($sqlmid);
-        				if ($resultmid) {
-        					$objmid = $db->fetch_object($resultmid);
-        					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
-        				}
+						$sqlmid = 'SELECT e.ref';
+						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
+						$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
+						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+						$resultmid = $db->query($sqlmid);
+						if ($resultmid) {
+							$objmid = $db->fetch_object($resultmid);
+							$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
+						}
 					} else if ($tabtype[$key] == 'payment_vat') {
 						$bookkeeping->code_tiers = '';
 						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat payment
@@ -417,75 +416,76 @@ if (! $error && $action == 'writebookkeeping') {
 						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Ref of salary payment
 					}
 
-        			$result = $bookkeeping->create($user);
-        			if ($result < 0) {
-        				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-        				{
-        					$error++;
-        					$errorforline++;
-        					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-        				}
-        				else
-        				{
-    	    				$error++;
-    	    				$errorforline++;
-    	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-        				}
-        			}
-    			}
-    		}
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
 		}
 
 		// Third party
 		if (! $errorforline)
 		{
-		    // Line into thirdparty account
-    		foreach ( $tabtp[$key] as $k => $mt ) {
-    			if ($mt) {
-        		    $bookkeeping = new BookKeeping($db);
-        			$bookkeeping->doc_date = $val["date"];
-        			$bookkeeping->doc_ref = $val["ref"];
-        			$bookkeeping->doc_type = 'bank';
-        			$bookkeeping->fk_doc = $key;
-        			$bookkeeping->fk_docdet = $val["fk_bank"];
-        			$bookkeeping->label_compte = $tabcompany[$key]['name'];
-        			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-        			$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-        			$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
-        			$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-        			$bookkeeping->code_journal = $journal;
-        			$bookkeeping->fk_user_author = $user->id;
-        			$bookkeeping->date_create = $now;
+			// Line into thirdparty account
+			foreach ( $tabtp[$key] as $k => $mt ) {
+				if ($mt) {
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->doc_type = 'bank';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = $val["fk_bank"];
+					$bookkeeping->label_compte = $tabcompany[$key]['name'];
+					$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+					$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
+					$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->fk_user_author = $user->id;
+					$bookkeeping->date_create = $now;
 
-        			if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
-        				$bookkeeping->code_tiers = '';
-        				$bookkeeping->numero_compte = $k;
-        			} else if ($tabtype[$key] == 'payment') {    // If payment is payment of customer invoice, we get ref of invoice
-        				$sqlmid = 'SELECT fac.facnumber';
-        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-        				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-        				$resultmid = $db->query($sqlmid);
-        				if ($resultmid) {
-        					$objmid = $db->fetch_object($resultmid);
-        					$bookkeeping->doc_ref = $objmid->facnumber;
-        				}
-        				$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-        				$bookkeeping->numero_compte = $k;
-        			} else if ($tabtype[$key] == 'payment_supplier') {           // If payment is payment of supplier invoice, we get ref of invoice
-        				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
-        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
-        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-        				$sqlmid .= " WHERE payf.fk_bank=" . $key;
-        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-        				$resultmid = $db->query($sqlmid);
-        				if ($resultmid) {
-        					$objmid = $db->fetch_object($resultmid);
-        					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
-        				}
+					if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->numero_compte = $k;
+					} else if ($tabtype[$key] == 'payment') {	// If payment is payment of customer invoice, we get ref of invoice
+						$sqlmid = 'SELECT fac.facnumber';
+						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+						$sqlmid .= " WHERE pay.fk_bank=" . $key;
+						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+						$resultmid = $db->query($sqlmid);
+						if ($resultmid) {
+							$objmid = $db->fetch_object($resultmid);
+							$bookkeeping->doc_ref = $objmid->facnumber;
+						}
+						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->numero_compte = $k;
+					} else if ($tabtype[$key] == 'payment_supplier') {		   // If payment is payment of supplier invoice, we get ref of invoice
+						$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
+						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
+						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+						$sqlmid .= " WHERE payf.fk_bank=" . $key;
+						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+						$resultmid = $db->query($sqlmid);
+						if ($resultmid) {
+							$objmid = $db->fetch_object($resultmid);
+							$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
+						}
 						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
 						$bookkeeping->numero_compte = $k;
 					} else if ($tabtype[$key] == 'payment_vat') {
@@ -504,52 +504,52 @@ if (! $error && $action == 'writebookkeeping') {
 					} else if ($tabtype[$key] == 'banktransfert') {
 						$bookkeeping->code_tiers = '';
 						$bookkeeping->numero_compte = $k;
-        			} else {
-        			    // FIXME Should be a temporary account ???
-        				$bookkeeping->doc_ref = $k;
-        				//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-        				$bookkeeping->numero_compte = 'CodeNotDef';
-        			}
+					} else {
+						// FIXME Should be a temporary account ???
+						$bookkeeping->doc_ref = $k;
+						//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+						$bookkeeping->numero_compte = 'CodeNotDef';
+					}
 
-        			$result = $bookkeeping->create($user);
-        			if ($result < 0) {
-        				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-        				{
-        					$error++;
-        					$errorforline++;
-        					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-        				}
-        				else
-        				{
-    	    				$error++;
-    	    				$errorforline++;
-    	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-        				}
-        			}
-    			}
-    		}
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
 		}
 
 		if (! $errorforline)
 		{
-            $db->commit();
+			$db->commit();
 		}
 		else
 		{
-		    $db->rollback();
+			$db->rollback();
 		}
 	}
 
 	if (empty($error)) {
-	    setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
+		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 	elseif (count($tabpay) == $error)
 	{
-	    setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
+		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	}
 	else
 	{
-	    setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
+		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
 	$action = '';
@@ -758,24 +758,24 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-    print '</div>';
+	print '</div>';
 
 	// TODO Avoid using js. We can use a direct link with $param
 	print '
 	<script type="text/javascript">
 		function launch_export() {
-	        console.log("Set value into form and submit");
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			console.log("Set value into form and submit");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 		function writebookkeeping() {
-	        console.log("Set value into form and submit");
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
+			console.log("Set value into form and submit");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 	</script>';
 
@@ -799,7 +799,7 @@ if (empty($action) || $action == 'view') {
 
 	$r = '';
 
-	foreach ( $tabpay as $key => $val ) {      // $key is rowid in llx_bank
+	foreach ( $tabpay as $key => $val ) {	  // $key is rowid in llx_bank
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
 
 		$reflabel = $val["ref"];
@@ -825,45 +825,45 @@ if (empty($action) || $action == 'view') {
 		$ref=$reflabel;
 		if ($tabtype[$key] == 'payment')
 		{
-		    $sqlmid = 'SELECT payfac.fk_facture as id';
-		    $sqlmid .= " FROM ".MAIN_DB_PREFIX."paiement_facture as payfac";
-		    $sqlmid .= " WHERE payfac.fk_paiement=" . $val["paymentid"];
-		    dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-		    $resultmid = $db->query($sqlmid);
-		    if ($resultmid) {
-		        $objmid = $db->fetch_object($resultmid);
-		        $invoicestatic->fetch($objmid->id);
-		        $ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
-		    }
-		    else dol_print_error($db);
+			$sqlmid = 'SELECT payfac.fk_facture as id';
+			$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiement_facture as payfac";
+			$sqlmid .= " WHERE payfac.fk_paiement=" . $val["paymentid"];
+			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$invoicestatic->fetch($objmid->id);
+				$ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
 		}
 		elseif ($tabtype[$key] == 'payment_supplier')
 		{
-		    $sqlmid = 'SELECT payfac.fk_facturefourn as id';
-		    $sqlmid .= " FROM " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfac";
-		    $sqlmid .= " WHERE payfac.fk_paiementfourn=" . $val["paymentsupplierid"];
-		    dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-		    $resultmid = $db->query($sqlmid);
-		    if ($resultmid) {
-		        $objmid = $db->fetch_object($resultmid);
-		        $invoicesupplierstatic->fetch($objmid->id);
-		        $ref=$langs->trans("SupplierInvoice").' '.$invoicesupplierstatic->getNomUrl(1);
-		    }
-		    else dol_print_error($db);
+			$sqlmid = 'SELECT payfac.fk_facturefourn as id';
+			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfac";
+			$sqlmid .= " WHERE payfac.fk_paiementfourn=" . $val["paymentsupplierid"];
+			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$invoicesupplierstatic->fetch($objmid->id);
+				$ref=$langs->trans("SupplierInvoice").' '.$invoicesupplierstatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
 		}
 		elseif ($tabtype[$key] == 'payment_expensereport')
 		{
-		    $sqlmid = 'SELECT payer.fk_expensereport as id';
-		    $sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_expensereport as payer";
-		    $sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
-		    dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-		    $resultmid = $db->query($sqlmid);
-		    if ($resultmid) {
-		        $objmid = $db->fetch_object($resultmid);
-		        $expensereportstatic->fetch($objmid->id);
-		        $ref=$langs->trans("ExpenseReport").' '.$expensereportstatic->getNomUrl(1);
-		    }
-		    else dol_print_error($db);
+			$sqlmid = 'SELECT payer.fk_expensereport as id';
+			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_expensereport as payer";
+			$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
+			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$expensereportstatic->fetch($objmid->id);
+				$ref=$langs->trans("ExpenseReport").' '.$expensereportstatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
 		}
 		elseif ($tabtype[$key] == 'payment_vat')
 		{
@@ -881,17 +881,17 @@ if (empty($action) || $action == 'view') {
 		}
 		elseif ($tabtype[$key] == 'payment_donation')
 		{
-		    $sqlmid = 'SELECT payd.fk_donation as id';
-		    $sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_donation as payd";
-		    $sqlmid .= " WHERE payd.fk_donation=" . $val["paymentdonationid"];
-		    dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-		    $resultmid = $db->query($sqlmid);
-		    if ($resultmid) {
-		        $objmid = $db->fetch_object($resultmid);
-		        $donationstatic->fetch($objmid->id);
-		        $ref=$langs->trans("Donation").' '.$donationstatic->getNomUrl(1);
-		    }
-		    else dol_print_error($db);
+			$sqlmid = 'SELECT payd.fk_donation as id';
+			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_donation as payd";
+			$sqlmid .= " WHERE payd.fk_donation=" . $val["paymentdonationid"];
+			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$donationstatic->fetch($objmid->id);
+				$ref=$langs->trans("Donation").' '.$donationstatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
 		}
 		elseif ($tabtype[$key] == 'payment_salary')
 		{
@@ -915,15 +915,15 @@ if (empty($action) || $action == 'view') {
 		// Bank
 		foreach ( $tabbq[$key] as $k => $mt )
 		{
-		    print '<tr class="oddeven">';
-		    print "<td><!-- Bank bank.rowid=".$key."--></td>";
-		    print "<td>" . $date . "</td>";
+			print '<tr class="oddeven">';
+			print "<td><!-- Bank bank.rowid=".$key."--></td>";
+			print "<td>" . $date . "</td>";
 			print "<td>" . $ref . "</td>";
 			print "<td>";
 			$accountoshow = length_accountg($k);
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
 			{
-			    print '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
+				print '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
 			}
 			else print $accountoshow;
 			print "</td>";
@@ -947,12 +947,12 @@ if (empty($action) || $action == 'view') {
 					print "<td>" . $date . "</td>";
 					print "<td>" . $ref . "</td>";
 					print "<td>";
-        			$accountoshow = length_accounta($k);
-        			if (empty($accountoshow) || $accountoshow == 'NotDefined')
-        			{
-        			    print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-        			}
-        			else print $accountoshow;
+					$accountoshow = length_accounta($k);
+					if (empty($accountoshow) || $accountoshow == 'NotDefined')
+					{
+						print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+					}
+					else print $accountoshow;
 					print "</td>";
 					print "<td>" . $reflabel . ' ' . $val['soclib'] . "</td>";
 					print "<td>" . $val["type_payment"] . "</td>";
@@ -968,10 +968,10 @@ if (empty($action) || $action == 'view') {
 				print "<td>" . $date . "</td>";
 				print "<td>" . $ref . "</td>";
 				print "<td>";
-			    if (empty($accountoshow) || $accountoshow == 'NotDefined')
-        		{
-        		    print '<span class="error">'.$langs->trans("WaitAccountNotDefined").'</span>';
-        		}
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("WaitAccountNotDefined").'</span>';
+				}
 				else print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE);
 				print "</td>";
 				print "<td>" . $reflabel . "</td>";
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 9bd9f8b7f42..934fb6e51ce 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -22,13 +22,11 @@
  */
 
 /**
- * \file	htdocs/accountancy/journal/expensereportsjournal.php
- * \ingroup	Advanced accountancy
- * \brief	Page with expense reports journal
+ * \file		htdocs/accountancy/journal/expensereportsjournal.php
+ * \ingroup		Advanced accountancy
+ * \brief		Page with expense reports journal
  */
 require '../../main.inc.php';
-
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
@@ -38,7 +36,6 @@ require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
 
-// Langs
 $langs->load("compta");
 $langs->load("bills");
 $langs->load("other");
@@ -46,8 +43,8 @@ $langs->load("main");
 $langs->load("accountancy");
 $langs->load("trips");
 
-// Multi journal
 $id_journal = GETPOST('id_journal', 'int');
+$action = GETPOST('action','aZ09');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -62,16 +59,15 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();
 
-$action = GETPOST('action','aZ09');
-
-
 /*
  * Actions
  */
-// Get code of finance journal
+ 
+// Get informations of journal
 $accountingjournalstatic = new AccountingJournal($db);
 $accountingjournalstatic->fetch($id_journal);
 $journal = $accountingjournalstatic->code;
+$journal_label = $accountingjournalstatic->label;
 
 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
@@ -187,6 +183,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
 					$bookkeeping->credit = ($mt > 0) ? $mt : 0;
 					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
 					$bookkeeping->fk_user_author = $user->id;
 
 					$result = $bookkeeping->create($user);
@@ -233,6 +230,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
 						$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
 						$bookkeeping->code_journal = $journal;
+						$bookkeeping->journal_label = $journal_label;
 						$bookkeeping->fk_user_author = $user->id;
 
 						$result = $bookkeeping->create($user);
@@ -277,6 +275,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
 					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
 					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
 					$bookkeeping->fk_user_author = $user->id;
 
 					$result = $bookkeeping->create($user);
@@ -444,7 +443,7 @@ if (empty($action) || $action == 'view') {
 
 	llxHeader('', $langs->trans("ExpenseReportsJournal"));
 
-	$nom = $langs->trans("ExpenseReportsJournal");
+	$nom = $langs->trans("ExpenseReportsJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index f9cd162b6a0..e0237285b2e 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -1,11 +1,11 @@
 <?php
-/* Copyright (C) 2007-2010	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2007-2010	Jean Heimburger		<jean@tiaris.info>
- * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2012		Regis Houssin		<regis@dolibarr.fr>
- * Copyright (C) 2013-2015  Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2007-2010  Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2010  Jean Heimburger		<jean@tiaris.info>
+ * Copyright (C) 2011       Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2012       Regis Houssin		<regis@dolibarr.fr>
+ * Copyright (C) 2013-2015  Alexandre Spangaro	<aspangaro@zendsi.com>
  * Copyright (C) 2013-2016  Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016  Florian Henry	    <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2016  Florian Henry		<florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,28 +22,29 @@
  */
 
 /**
- * \file htdocs/accountancy/journal/purchasesjournal.php
- * \ingroup Advanced accountancy
- * \brief Page with purchases journal
+ * \file		htdocs/accountancy/journal/purchasesjournal.php
+ * \ingroup		Advanced accountancy
+ * \brief		Page with purchases journal
  */
 require '../../main.inc.php';
-
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
-// Langs
 $langs->load("compta");
 $langs->load("bills");
 $langs->load("other");
 $langs->load("main");
 $langs->load("accountancy");
 
+$id_journal = GETPOST('id_journal', 'int');
+$action = GETPOST('action','aZ09');
+
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
 $date_startyear = GETPOST('date_startyear');
@@ -57,13 +58,16 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();
 
-$action = GETPOST('action','aZ09');
-
-
 /*
  * Actions
  */
 
+// Get informations of journal
+$accountingjournalstatic = new AccountingJournal($db);
+$accountingjournalstatic->fetch($id_journal);
+$journal = $accountingjournalstatic->code;
+$journal_label = $accountingjournalstatic->label;
+
 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
 $pastmonthyear = $year_current;
@@ -148,11 +152,11 @@ if ($result) {
 		$tabfac[$obj->rowid]["type"] = $obj->type;
 		$tabfac[$obj->rowid]["description"] = $obj->description;
 		//$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
-		
-        // Avoid warnings
-        if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
-        if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
-        if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
+
+		// Avoid warnings
+		if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
+		if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
+		if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
 
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
@@ -177,10 +181,10 @@ if ($action == 'writebookkeeping') {
 
 	foreach ($tabfac as $key => $val)  // Loop on each invoice
 	{
-	    $errorforline = 0;
-	     
-	    $db->begin();
-	     
+		$errorforline = 0;
+
+		$db->begin();
+
 		$companystatic = new Societe($db);
 		$invoicestatic = new FactureFournisseur($db);
 
@@ -198,160 +202,161 @@ if ($action == 'writebookkeeping') {
 		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
 		$companystatic->client = $tabcompany[$key]['code_client'];
 
-        if (! $errorforline)
-        {
-    		foreach ( $tabttc[$key] as $k => $mt ) {
-    			// get compte id and label
-    		    if ($mt) {
-        			$bookkeeping = new BookKeeping($db);
-        			$bookkeeping->doc_date = $val["date"];
-        			$bookkeeping->doc_ref = $val["ref"];
-        			$bookkeeping->date_create = $now;
-        			$bookkeeping->doc_type = 'supplier_invoice';
-        			$bookkeeping->fk_doc = $key;
-        			$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-        			$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
-        			$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
-        			$bookkeeping->numero_compte = $tabcompany[$key]['code_compta_fournisseur'];
-        			$bookkeeping->montant = $mt;
-        			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
-        			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
-        			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
-        			$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-        			$bookkeeping->fk_user_author = $user->id;
-        
-        			$result = $bookkeeping->create($user);
-           			if ($result < 0) {
-                        if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-                        {
-                            $error++;
-                            $errorforline++;
-                            //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-                        }
-                        else
-                        {
-                            $error++;
-                            $errorforline++;
-                            setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-                        }
-        			}
-    		    }
-    		}
-        }
-        
+		if (! $errorforline)
+		{
+			foreach ( $tabttc[$key] as $k => $mt ) {
+				// get compte id and label
+				if ($mt) {
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_create = $now;
+					$bookkeeping->doc_type = 'supplier_invoice';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+					$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
+					$bookkeeping->numero_compte = $tabcompany[$key]['code_compta_fournisseur'];
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+					$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt > 0) ? $mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->fk_user_author = $user->id;
+
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
+		}
+
 		// Product / Service
-        if (! $errorforline)
-        {
-            foreach ( $tabht[$key] as $k => $mt ) {
-    			$accountingaccount = new AccountingAccount($db);
-    			$accountingaccount->fetch(null, $k, true);
-    			if ($mt) {
-    				// get compte id and label
-    				$accountingaccount = new AccountingAccount($db);
-    				if ($accountingaccount->fetch(null, $k, true)) {
-    					$bookkeeping = new BookKeeping($db);
-    					$bookkeeping->doc_date = $val["date"];
-    					$bookkeeping->doc_ref = $val["ref"];
-    					$bookkeeping->date_create = $now;
-    					$bookkeeping->doc_type = 'supplier_invoice';
-    					$bookkeeping->fk_doc = $key;
-    					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-    					$bookkeeping->code_tiers = '';
-    					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
-    					$bookkeeping->numero_compte = $k;
-    					$bookkeeping->montant = $mt;
-    					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-    					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-    					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-    					$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-    					$bookkeeping->fk_user_author = $user->id;
-    
-    					$result = $bookkeeping->create($user);
-    					if ($result < 0) {
-    					    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-            			    {
-            			        $error++;
-            			        $errorforline++;
-            			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-            			    }
-            			    else
-            			    {
-            			        $error++;
-            			        $errorforline++;
-            			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-            			    }
-    					}
-    				}
-    			}
-    		}
-        }
-        
+		if (! $errorforline)
+		{
+			foreach ( $tabht[$key] as $k => $mt ) {
+				$accountingaccount = new AccountingAccount($db);
+				$accountingaccount->fetch(null, $k, true);
+				if ($mt) {
+					// get compte id and label
+					$accountingaccount = new AccountingAccount($db);
+					if ($accountingaccount->fetch(null, $k, true)) {
+						$bookkeeping = new BookKeeping($db);
+						$bookkeeping->doc_date = $val["date"];
+						$bookkeeping->doc_ref = $val["ref"];
+						$bookkeeping->date_create = $now;
+						$bookkeeping->doc_type = 'supplier_invoice';
+						$bookkeeping->fk_doc = $key;
+						$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->montant = $mt;
+						$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+						$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+						$bookkeeping->code_journal = $journal;
+						$bookkeeping->journal_label = $journal_label;
+						$bookkeeping->fk_user_author = $user->id;
+
+						$result = $bookkeeping->create($user);
+						if ($result < 0) {
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+							{
+								$error++;
+								$errorforline++;
+								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+							}
+							else
+							{
+								$error++;
+								$errorforline++;
+								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+							}
+						}
+					}
+				}
+			}
+		}
+
 		// VAT
 		// var_dump($tabtva);
-        if (! $errorforline)
-        {
-            foreach ( $tabtva[$key] as $k => $mt ) {
-    			if ($mt) {
-    				// get compte id and label
-    				$bookkeeping = new BookKeeping($db);
-    				$bookkeeping->doc_date = $val["date"];
-    				$bookkeeping->doc_ref = $val["ref"];
-    				$bookkeeping->date_create = $now;
-    				$bookkeeping->doc_type = 'supplier_invoice';
-    				$bookkeeping->fk_doc = $key;
-    				$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-    				$bookkeeping->code_tiers = '';
-    				$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
-    				$bookkeeping->numero_compte = $k;
-    				$bookkeeping->montant = $mt;
-    				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-    				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-    				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-    				$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-    				$bookkeeping->fk_user_author = $user->id;
-    
-    				$result = $bookkeeping->create($user);
-    				if ($result < 0) {
-    				    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-    				    {
-    				        $error++;
-    				        $errorforline++;
-    				        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-    				    }
-    				    else
-    				    {
-    				        $error++;
-    				        $errorforline++;
-    				        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-    				    }
-    				}
-    			}
-    		}
-        }
+		if (! $errorforline)
+		{
+			foreach ( $tabtva[$key] as $k => $mt ) {
+				if ($mt) {
+					// get compte id and label
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_create = $now;
+					$bookkeeping->doc_type = 'supplier_invoice';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+					$bookkeeping->code_tiers = '';
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
+					$bookkeeping->numero_compte = $k;
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->fk_user_author = $user->id;
+
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
+		}
 
 		if (! $errorforline)
 		{
-		    $db->commit();
+			$db->commit();
 		}
 		else
 		{
-		    $db->rollback();
+			$db->rollback();
 		}
-		
 	}
 
 	if (empty($error) && count($tabpay)) {
-	    setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
+		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 	elseif (count($tabpay) == $error)
 	{
-	    setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
+		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	}
 	else
 	{
-	    setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
+		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
-	
 	$action='';
 }
 
@@ -488,7 +493,7 @@ if (empty($action) || $action == 'view') {
 
 	llxHeader('', $langs->trans("PurchasesJournal"));
 
-	$nom = $langs->trans("PurchasesJournal");
+	$nom = $langs->trans("PurchasesJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
@@ -502,8 +507,10 @@ if (empty($action) || $action == 'view') {
 	}
 
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	
-	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+
+	$varlink = 'id_journal=' . $id_journal;
+
+	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
 	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
@@ -511,21 +518,21 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-    print '</div>';
-    
+	print '</div>';
+
 	print '
 	<script type="text/javascript">
 		function launch_export() {
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 		function writebookkeeping() {
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 	</script>';
 
@@ -537,7 +544,6 @@ if (empty($action) || $action == 'view') {
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
-	// /print "<td>".$langs->trans("JournalNum")."</td>";
 	print "<td></td>";
 	print "<td>" . $langs->trans("Date") . "</td>";
 	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
@@ -574,12 +580,12 @@ if (empty($action) || $action == 'view') {
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>";
-    			$accountoshow = length_accountg($k);
-    			if (empty($accountoshow) || $accountoshow == 'NotDefined')
-    			{
-    			    print '<span class="error">'.$langs->trans("ProductAccountNotDefined").'</span>';
-    			}
-    			else print $accountoshow;
+				$accountoshow = length_accountg($k);
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("ProductAccountNotDefined").'</span>';
+				}
+				else print $accountoshow;
 				print "</td>";
 				$companystatic->id = $tabcompany[$key]['id'];
 				$companystatic->name = $tabcompany[$key]['name'];
@@ -590,6 +596,7 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
+
 		// VAT
 		foreach ( $tabtva[$key] as $k => $mt ) {
 			if ($mt) {
@@ -598,12 +605,12 @@ if (empty($action) || $action == 'view') {
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>";
-    			$accountoshow = length_accountg($k);
-    			if (empty($accountoshow) || $accountoshow == 'NotDefined')
-    			{
-    			    print '<span class="error">'.$langs->trans("VatAccountNotDefined").'</span>';
-    			}
-    			else print $accountoshow;
+				$accountoshow = length_accountg($k);
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("VatAccountNotDefined").'</span>';
+				}
+				else print $accountoshow;
 				print "</td>";
 				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key]. "</td>";
 				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
@@ -614,9 +621,9 @@ if (empty($action) || $action == 'view') {
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-		    print '<tr class="oddeven">';
-		    print "<td><!-- Thirdparty --></td>";
-		    print "<td>" . $date . "</td>";
+			print '<tr class="oddeven">';
+			print "<td><!-- Thirdparty --></td>";
+			print "<td>" . $date . "</td>";
 			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
@@ -624,10 +631,10 @@ if (empty($action) || $action == 'view') {
 			$accountoshow = length_accounta($k);
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
 			{
-			    print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 			}
 			else print $accountoshow;
-            print "</td>";
+			print "</td>";
 			print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers") . "</td>";
 			// print "</td><td>" . $langs->trans("ThirdParty");
 			// print ' (' . $companystatic->getNomUrl(0, 'supplier', 16) . ')';
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 85ce7361394..0d2e7ac19cc 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -1,13 +1,13 @@
 <?php
-/* Copyright (C) 2007-2010	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2007-2010	Jean Heimburger			<jean@tiaris.info>
- * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2012		Regis Houssin			<regis@dolibarr.fr>
- * Copyright (C) 2013		Christophe Battarel		<christophe.battarel@altairis.fr>
- * Copyright (C) 2013-2016	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2013-2016	Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2016	Olivier Geffroy			<jeff@jeffinfo.com>
- * Copyright (C) 2014		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
+/* Copyright (C) 2007-2010  Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2010  Jean Heimburger			<jean@tiaris.info>
+ * Copyright (C) 2011	   Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2012	   Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2013	   Christophe Battarel		<christophe.battarel@altairis.fr>
+ * Copyright (C) 2013-2017  Alexandre Spangaro		<aspangaro@zendsi.com>
+ * Copyright (C) 2013-2016  Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2016  Olivier Geffroy			<jeff@jeffinfo.com>
+ * Copyright (C) 2014	   Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,17 +29,15 @@
  * \brief		Page with sells journal
  */
 require '../../main.inc.php';
-
-// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
-// Langs
 $langs->load("commercial");
 $langs->load("compta");
 $langs->load("bills");
@@ -47,6 +45,9 @@ $langs->load("other");
 $langs->load("main");
 $langs->load("accountancy");
 
+$id_journal = GETPOST('id_journal', 'int');
+$action = GETPOST('action','aZ09');
+
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
 $date_startyear = GETPOST('date_startyear');
@@ -60,19 +61,23 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();
 
-$action = GETPOST('action','aZ09');
-
 
 /*
  * Actions
  */
 
+// Get informations of journal
+$accountingjournalstatic = new AccountingJournal($db);
+$accountingjournalstatic->fetch($id_journal);
+$journal = $accountingjournalstatic->code;
+$journal_label = $accountingjournalstatic->label;
+
 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
 $pastmonthyear = $year_current;
 if ($pastmonth == 0) {
-    $pastmonth = 12;
-    $pastmonthyear --;
+	$pastmonth = 12;
+	$pastmonthyear --;
 }
 
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
@@ -80,8 +85,8 @@ $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-    $date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
-    $date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
+	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
 $p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
@@ -99,274 +104,277 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " WHERE fd.fk_code_ventilation > 0";
-$sql .= " AND f.entity IN (".getEntity('facture', 0).')';    // We don't share object for accountancy
+$sql .= " AND f.entity IN (".getEntity('facture', 0).')';	// We don't share object for accountancy
 $sql .= " AND f.fk_statut > 0"; // TODO Facture annulée ?
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
-    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
 $sql .= " AND fd.product_type IN (0,1)";
 if ($date_start && $date_end)
-    $sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
+	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
 $sql .= " ORDER BY f.datef";
 
 dol_syslog('accountancy/journal/sellsjournal.php', LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
-    $tabfac = array ();
-    $tabht = array ();
-    $tabtva = array ();
-    $def_tva = array ();
-    $tabttc = array ();
-    $tabcompany = array ();
+	$tabfac = array ();
+	$tabht = array ();
+	$tabtva = array ();
+	$def_tva = array ();
+	$tabttc = array ();
+	$tabcompany = array ();
 
-    $num = $db->num_rows($result);
-    $i = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
 
-    $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
-    
-    while ( $i < $num ) {
-        $obj = $db->fetch_object($result);
-        
-        // les variables
-        $compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
+	$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
 
-        $compta_prod = $obj->compte;
-        if (empty($compta_prod)) {
-            if ($obj->product_type == 0)
-                $compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-                else
-                    $compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-        }
-        $cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-        $compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
+	while ( $i < $num ) {
+		$obj = $db->fetch_object($result);
+
+		// les variables
+		$compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
+
+		$compta_prod = $obj->compte;
+		if (empty($compta_prod)) {
+			if ($obj->product_type == 0)
+				$compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
+				else
+					$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
+		}
+		$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
+		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
 
 
-        //Define array for display vat tx
-        $def_tva[$obj->rowid]=price($obj->tva_tx);
+		//Define array for display vat tx
+		$def_tva[$obj->rowid]=price($obj->tva_tx);
 
-        // Situation invoices handling
-        $line = new FactureLigne($db);
-        $line->fetch($obj->fdid);
-        $prev_progress = $line->get_prev_progress($obj->fdid);
-        if ($obj->type == Facture::TYPE_SITUATION) {
-            // Avoid divide by 0
-            if ($obj->situation_percent == 0) {
-                $situation_ratio = 0;
-            } else {
-                $situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
-            }
-        } else {
-            $situation_ratio = 1;
-        }
+		// Situation invoices handling
+		$line = new FactureLigne($db);
+		$line->fetch($obj->fdid);
+		$prev_progress = $line->get_prev_progress($obj->fdid);
+		if ($obj->type == Facture::TYPE_SITUATION) {
+			// Avoid divide by 0
+			if ($obj->situation_percent == 0) {
+				$situation_ratio = 0;
+			} else {
+				$situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
+			}
+		} else {
+			$situation_ratio = 1;
+		}
 
-        // Invoice lines
-        $tabfac[$obj->rowid]["date"] = $db->jdate($obj->df);
-        $tabfac[$obj->rowid]["ref"] = $obj->facnumber;
-        $tabfac[$obj->rowid]["type"] = $obj->type;
-        $tabfac[$obj->rowid]["description"] = $obj->label_compte;
-        //$tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
-       
-        // Avoid warnings
-        if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
-        if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
-        if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
+		// Invoice lines
+		$tabfac[$obj->rowid]["date"] = $db->jdate($obj->df);
+		$tabfac[$obj->rowid]["ref"] = $obj->facnumber;
+		$tabfac[$obj->rowid]["type"] = $obj->type;
+		$tabfac[$obj->rowid]["description"] = $obj->label_compte;
+		//$tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
 
-        $tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
-        $tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
-        $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
-        $tabcompany[$obj->rowid] = array (
-            'id' => $obj->socid,
-            'name' => $obj->name,
-            'code_client' => $obj->code_client,
-            'code_compta' => $compta_soc
-        );
+		// Avoid warnings
+		if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
+		if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
+		if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
 
-        $i ++;
-    }
+		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
+		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
+		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
+		$tabcompany[$obj->rowid] = array (
+			'id' => $obj->socid,
+			'name' => $obj->name,
+			'code_client' => $obj->code_client,
+			'code_compta' => $compta_soc
+		);
+
+		$i ++;
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // Bookkeeping Write
 if ($action == 'writebookkeeping') {
-    $now = dol_now();
-    $error = 0;
+	$now = dol_now();
+	$error = 0;
 
-    foreach ( $tabfac as $key => $val ) {   // Loop on each invoice
-         
-        $errorforline = 0;
+	foreach ( $tabfac as $key => $val ) {   // Loop on each invoice
 
-        $db->begin();
+		$errorforline = 0;
 
-        $companystatic = new Societe($db);
-        $invoicestatic = new Facture($db);
+		$db->begin();
 
-        $companystatic->id = $tabcompany[$key]['id'];
-        $companystatic->name = $tabcompany[$key]['name'];
+		$companystatic = new Societe($db);
+		$invoicestatic = new Facture($db);
+
+		$companystatic->id = $tabcompany[$key]['id'];
+		$companystatic->name = $tabcompany[$key]['name'];
 		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
 		$companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur'];
 		$companystatic->code_client = $tabcompany[$key]['code_client'];
 		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
-        $companystatic->client = $tabcompany[$key]['code_client'];
+		$companystatic->client = $tabcompany[$key]['code_client'];
 
-        $invoicestatic->id = $key;
-        $invoicestatic->ref = (string) $val["ref"];
+		$invoicestatic->id = $key;
+		$invoicestatic->ref = (string) $val["ref"];
 
-        // Thirdparty
-        if (! $errorforline)
-        {
-            foreach ( $tabttc[$key] as $k => $mt ) {
-                if ($mt) {
-                    $bookkeeping = new BookKeeping($db);
-                    $bookkeeping->doc_date = $val["date"];
-                    $bookkeeping->doc_ref = $val["ref"];
-                    $bookkeeping->date_create = $now;
-                    $bookkeeping->doc_type = 'customer_invoice';
-                    $bookkeeping->fk_doc = $key;
-                    $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-                    $bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
-                    $bookkeeping->numero_compte = $tabcompany[$key]['code_compta'];
-                    // $bookkeeping->label_compte = $tabcompany[$key]['name'];
-                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
-                    $bookkeeping->montant = $mt;
-                    $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-                    $bookkeeping->debit = ($mt >= 0) ? $mt : 0;
-                    $bookkeeping->credit = ($mt < 0) ? $mt : 0;
-                    $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-                    $bookkeeping->fk_user_author = $user->id;
-    
-                    $result = $bookkeeping->create($user);
-           			if ($result < 0) {
-                        if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-                        {
-                            $error++;
-                            $errorforline++;
-                            //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-                        }
-                        else
-                        {
-                            $error++;
-                            $errorforline++;
-                            setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-                        }
-        			}
-                }
-            }
-        }
-        
-        // Product / Service
-        if (! $errorforline)
-        {
-            foreach ( $tabht[$key] as $k => $mt ) {
-                if ($mt) {
-                    // get compte id and label
-                    $accountingaccount = new AccountingAccount($db);
-                    if ($accountingaccount->fetch(null, $k, true)) {
-                        $bookkeeping = new BookKeeping($db);
-                        $bookkeeping->doc_date = $val["date"];
-                        $bookkeeping->doc_ref = $val["ref"];
-                        $bookkeeping->date_create = $now;
-                        $bookkeeping->doc_type = 'customer_invoice';
-                        $bookkeeping->fk_doc = $key;
-                        $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add;
-                        $bookkeeping->code_tiers = '';
-                        $bookkeeping->numero_compte = $k;
-                        $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
-                        $bookkeeping->montant = $mt;
-                        $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-                        $bookkeeping->debit = ($mt < 0) ? $mt : 0;
-                        $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-                        $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-                        $bookkeeping->fk_user_author = $user->id;
-    
-                        $result = $bookkeeping->create($user);
-            			if ($result < 0) {
-                            if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-                            {
-                                $error++;
-                                $errorforline++;
-                                //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-                            }
-                            else
-                            {
-                                $error++;
-                                $errorforline++;
-                                setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-                            }
-            			}                        
-                    }
-                }
-            }
-        }
-        
-        // VAT
-        // var_dump($tabtva);
-        if (! $errorforline)
-        {
-            foreach ( $tabtva[$key] as $k => $mt ) {
-                if ($mt) {
-                    $bookkeeping = new BookKeeping($db);
-                    $bookkeeping->doc_date = $val["date"];
-                    $bookkeeping->doc_ref = $val["ref"];
-                    $bookkeeping->date_create = $now;
-                    $bookkeeping->doc_type = 'customer_invoice';
-                    $bookkeeping->fk_doc = $key;
-                    $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-                    $bookkeeping->code_tiers = '';
-                    $bookkeeping->numero_compte = $k;
-                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
-                    $bookkeeping->montant = $mt;
-                    $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-                    $bookkeeping->debit = ($mt < 0) ? $mt : 0;
-                    $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-                    $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-                    $bookkeeping->fk_user_author = $user->id;
-    
-                    $result = $bookkeeping->create($user);
-                    if ($result < 0) {
-           			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-        			    {
-        			        $error++;
-        			        $errorforline++;
-        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-        			    }
-        			    else
-        			    {
-        			        $error++;
-        			        $errorforline++;
-        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-        			    }
-                    }
-                }
-            }
-        }
+		// Thirdparty
+		if (! $errorforline)
+		{
+			foreach ( $tabttc[$key] as $k => $mt ) {
+				if ($mt) {
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_create = $now;
+					$bookkeeping->doc_type = 'customer_invoice';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
+					$bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
+					$bookkeeping->numero_compte = $tabcompany[$key]['code_compta'];
+					// $bookkeeping->label_compte = $tabcompany[$key]['name'];
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+					$bookkeeping->debit = ($mt >= 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt < 0) ? $mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->fk_user_author = $user->id;
 
-        if (! $errorforline)
-        {
-            $db->commit();
-        }
-        else
-        {
-            $db->rollback();
-        }
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
+		}
 
-    }
+		// Product / Service
+		if (! $errorforline)
+		{
+			foreach ( $tabht[$key] as $k => $mt ) {
+				if ($mt) {
+					// get compte id and label
+					$accountingaccount = new AccountingAccount($db);
+					if ($accountingaccount->fetch(null, $k, true)) {
+						$bookkeeping = new BookKeeping($db);
+						$bookkeeping->doc_date = $val["date"];
+						$bookkeeping->doc_ref = $val["ref"];
+						$bookkeeping->date_create = $now;
+						$bookkeeping->doc_type = 'customer_invoice';
+						$bookkeeping->fk_doc = $key;
+						$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add;
+						$bookkeeping->code_tiers = '';
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
+						$bookkeeping->montant = $mt;
+						$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+						$bookkeeping->debit = ($mt < 0) ? $mt : 0;
+						$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+						$bookkeeping->code_journal = $journal;
+						$bookkeeping->journal_label = $journal_label;
+						$bookkeeping->fk_user_author = $user->id;
 
-    if (empty($error) && count($tabpay) > 0) {
-        setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-    }
-    elseif (count($tabpay) == $error)
-    {
-        setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-    }
-    else
-    {
-        setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
-    }
-    
-    $action='';
+						$result = $bookkeeping->create($user);
+						if ($result < 0) {
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+							{
+								$error++;
+								$errorforline++;
+								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+							}
+							else
+							{
+								$error++;
+								$errorforline++;
+								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// VAT
+		// var_dump($tabtva);
+		if (! $errorforline)
+		{
+			foreach ( $tabtva[$key] as $k => $mt ) {
+				if ($mt) {
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_create = $now;
+					$bookkeeping->doc_type = 'customer_invoice';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
+					$bookkeeping->code_tiers = '';
+					$bookkeeping->numero_compte = $k;
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+					$bookkeeping->debit = ($mt < 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->fk_user_author = $user->id;
+
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+		   				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						{
+							$error++;
+							$errorforline++;
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						}
+						else
+						{
+							$error++;
+							$errorforline++;
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
+		}
+
+		if (! $errorforline)
+		{
+			$db->commit();
+		}
+		else
+		{
+			$db->rollback();
+		}
+
+	}
+
+	if (empty($error) && count($tabpay) > 0) {
+		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
+	}
+	elseif (count($tabpay) == $error)
+	{
+		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
+	}
+	else
+	{
+		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
+	}
+	
+	$action='';
 }
 
 
@@ -380,123 +388,123 @@ $form = new Form($db);
 // Export
 /*if ($action == 'export_csv') {
 
-    $sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
-    $sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
+	$sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
 
-    include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
+	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 
-    $companystatic = new Client($db);
+	$companystatic = new Client($db);
 
-    // Model Cegid Expert Export
-    if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
-        $sep = ";";
+	// Model Cegid Expert Export
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
+		$sep = ";";
 
-        foreach ( $tabfac as $key => $val ) {
-            $companystatic->id = $tabcompany[$key]['id'];
-            $companystatic->name = $tabcompany[$key]['name'];
-            $companystatic->client = $tabcompany[$key]['code_client'];
+		foreach ( $tabfac as $key => $val ) {
+			$companystatic->id = $tabcompany[$key]['id'];
+			$companystatic->name = $tabcompany[$key]['name'];
+			$companystatic->client = $tabcompany[$key]['code_client'];
 
-            $invoicestatic->id = $key;
-            $invoicestatic->ref = $val["ref"];
+			$invoicestatic->id = $key;
+			$invoicestatic->ref = $val["ref"];
 
-            $date = dol_print_date($val["date"], '%d%m%Y');
+			$date = dol_print_date($val["date"], '%d%m%Y');
 
-            foreach ( $tabttc[$key] as $k => $mt ) {
-                print $date . $sep;
-                print $sell_journal . $sep;
-                print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
-                print length_accounta(html_entity_decode($k)) . $sep;
-                print ($mt < 0 ? 'C' : 'D') . $sep;
-                print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-                print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . $sep;
-                print $val["ref"];
-                print "\n";
-            }
+			foreach ( $tabttc[$key] as $k => $mt ) {
+				print $date . $sep;
+				print $sell_journal . $sep;
+				print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
+				print length_accounta(html_entity_decode($k)) . $sep;
+				print ($mt < 0 ? 'C' : 'D') . $sep;
+				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+				print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . $sep;
+				print $val["ref"];
+				print "\n";
+			}
 
-            // Product / Service
-            foreach ( $tabht[$key] as $k => $mt ) {
-                $accountingaccount_static = new AccountingAccount($db);
-                if ($accountingaccount_static->fetch(null, $k, true)) {
-                    print $date . $sep;
-                    print $sell_journal . $sep;
-                    print length_accountg(html_entity_decode($k)) . $sep;
-                    print $sep;
-                    print ($mt < 0 ? 'D' : 'C') . $sep;
-                    print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-                    print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount_static->label . $sep;
-                    print $val["ref"];
-                    print "\n";
-                }
-            }
+			// Product / Service
+			foreach ( $tabht[$key] as $k => $mt ) {
+				$accountingaccount_static = new AccountingAccount($db);
+				if ($accountingaccount_static->fetch(null, $k, true)) {
+					print $date . $sep;
+					print $sell_journal . $sep;
+					print length_accountg(html_entity_decode($k)) . $sep;
+					print $sep;
+					print ($mt < 0 ? 'D' : 'C') . $sep;
+					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+					print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount_static->label . $sep;
+					print $val["ref"];
+					print "\n";
+				}
+			}
 
-            // TVA
-            foreach ( $tabtva[$key] as $k => $mt ) {
-                if ($mt) {
-                    print $date . $sep;
-                    print $sell_journal . $sep;
-                    print length_accountg(html_entity_decode($k)) . $sep;
-                    print $sep;
-                    print ($mt < 0 ? 'D' : 'C') . $sep;
-                    print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-                    print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . $sep;
-                    // print $langs->trans("VAT") . $sep;
-                    print $val["ref"];
-                    print "\n";
-                }
-            }
-        }
-    } elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
-        // Model Classic Export
-        foreach ( $tabfac as $key => $val ) {
-            $companystatic->id = $tabcompany[$key]['id'];
-            $companystatic->name = $tabcompany[$key]['name'];
-            $companystatic->client = $tabcompany[$key]['code_client'];
+			// TVA
+			foreach ( $tabtva[$key] as $k => $mt ) {
+				if ($mt) {
+					print $date . $sep;
+					print $sell_journal . $sep;
+					print length_accountg(html_entity_decode($k)) . $sep;
+					print $sep;
+					print ($mt < 0 ? 'D' : 'C') . $sep;
+					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+					print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . $sep;
+					// print $langs->trans("VAT") . $sep;
+					print $val["ref"];
+					print "\n";
+				}
+			}
+		}
+	} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
+		// Model Classic Export
+		foreach ( $tabfac as $key => $val ) {
+			$companystatic->id = $tabcompany[$key]['id'];
+			$companystatic->name = $tabcompany[$key]['name'];
+			$companystatic->client = $tabcompany[$key]['code_client'];
 
-            $invoicestatic->id = $key;
-            $invoicestatic->ref = $val["ref"];
+			$invoicestatic->id = $key;
+			$invoicestatic->ref = $val["ref"];
 
-            $date = dol_print_date($val["date"], 'day');
+			$date = dol_print_date($val["date"], 'day');
 
-            foreach ( $tabttc[$key] as $k => $mt ) {
-                print '"' . $date . '"' . $sep;
-                print '"' . $val["ref"] . '"' . $sep;
-                print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-                print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
-                print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-                print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
-                print "\n";
-            }
+			foreach ( $tabttc[$key] as $k => $mt ) {
+				print '"' . $date . '"' . $sep;
+				print '"' . $val["ref"] . '"' . $sep;
+				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
+				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
+				print "\n";
+			}
 
-            // Product / Service
-            foreach ( $tabht[$key] as $k => $mt ) {
-                $accountingaccount = new AccountingAccount($db);
-                $accountingaccount->fetch(null, $k, true);
+			// Product / Service
+			foreach ( $tabht[$key] as $k => $mt ) {
+				$accountingaccount = new AccountingAccount($db);
+				$accountingaccount->fetch(null, $k, true);
 
-                if ($mt) {
-                    print '"' . $date . '"' . $sep;
-                    print '"' . $val["ref"] . '"' . $sep;
-                    print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-                    print '"' . dol_trunc($companystatic->name, 16) . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
-                    print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-                    print '"' . ($mt >= 0 ? price($mt) : '') . '"';
-                    print "\n";
-                }
-            }
+				if ($mt) {
+					print '"' . $date . '"' . $sep;
+					print '"' . $val["ref"] . '"' . $sep;
+					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+					print '"' . dol_trunc($companystatic->name, 16) . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
+					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+					print "\n";
+				}
+			}
 
-            // VAT
-            foreach ( $tabtva[$key] as $k => $mt ) {
-                if ($mt) {
-                    print '"' . $date . '"' . $sep;
-                    print '"' . $val["ref"] . '"' . $sep;
-                    print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-                    print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . '"' . $sep;
-                    print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-                    print '"' . ($mt >= 0 ? price($mt) : '') . '"';
-                    print "\n";
-                }
-            }
-        }
-    }
+			// VAT
+			foreach ( $tabtva[$key] as $k => $mt ) {
+				if ($mt) {
+					print '"' . $date . '"' . $sep;
+					print '"' . $val["ref"] . '"' . $sep;
+					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+					print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . '"' . $sep;
+					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+					print "\n";
+				}
+			}
+		}
+	}
 }
 */
 
@@ -505,7 +513,7 @@ if (empty($action) || $action == 'view') {
 
 	llxHeader('', $langs->trans("SellsJournal"));
 
-	$nom = $langs->trans("SellsJournal");
+	$nom = $langs->trans("SellsJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
@@ -517,29 +525,31 @@ if (empty($action) || $action == 'view') {
 	else
 		$description .= $langs->trans("DepositsAreIncluded");
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	
-	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+
+	$varlink = 'id_journal=' . $id_journal;
+
+	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
 	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-    print '</div>';
-    
+	print '</div>';
+
 	print '
 	<script type="text/javascript">
 		function launch_export() {
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 		function writebookkeeping() {
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 	</script>';
 
@@ -586,7 +596,7 @@ if (empty($action) || $action == 'view') {
 			$accountoshow = length_accounta($k);
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
 			{
-			    print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 			}
 			else print $accountoshow;
 			// print "</td><td>" . $langs->trans("ThirdParty");
@@ -595,7 +605,7 @@ if (empty($action) || $action == 'view') {
 			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . "</td>";
 			print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
-		    print "</tr>";
+			print "</tr>";
 		}
 
 		// Product / Service
@@ -609,12 +619,12 @@ if (empty($action) || $action == 'view') {
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>";
-    			$accountoshow = length_accountg($k);
-    			if (empty($accountoshow) || $accountoshow == 'NotDefined')
-    			{
-    			    print '<span class="error">'.$langs->trans("ProductNotDefined").'</span>';
-    			}
-    			else print $accountoshow;
+				$accountoshow = length_accountg($k);
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("ProductNotDefined").'</span>';
+				}
+				else print $accountoshow;
 				print "</td>";
 				// print "<td>" . $accountingaccount->label . "</td>";
 				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label . "</td>";
@@ -632,12 +642,12 @@ if (empty($action) || $action == 'view') {
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>";
-    			$accountoshow = length_accountg($k);
-    			if (empty($accountoshow) || $accountoshow == 'NotDefined')
-    			{
-    			    print '<span class="error">'.$langs->trans("VATAccountNotDefined").'</span>';
-    			}
-    			else print $accountoshow;
+				$accountoshow = length_accountg($k);
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("VATAccountNotDefined").'</span>';
+				}
+				else print $accountoshow;
 				print "</td>";
 				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . ' '.$def_tva[$key]. "</td>";
 				// print "<td>" . $langs->trans("VAT") . "</td>";

From 832e2888141dfcd4cc008cfe79bd67e559c1b334 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jun 2017 10:47:22 +0200
Subject: [PATCH 1037/1163] FIX #6955

---
 htdocs/core/class/html.form.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b14f72a1b7b..c5397eb40eb 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -984,6 +984,7 @@ class Form
 
     	if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && ! $forcecombo)
     	{
+    	    // No immediate load of all database
     		$placeholder='';
     		if ($selected && empty($selected_input_value))
     		{
@@ -1016,6 +1017,7 @@ class Form
     	}
     	else
     	{
+    	    // Immediate load of all database
     		$out.=$this->select_thirdparty_list($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, '', 0, $limit, $morecss, $moreparam);
     	}
 
@@ -1023,7 +1025,8 @@ class Form
     }
 
     /**
-     *  Output html form to select a third party
+     *  Output html form to select a third party.
+     *  Note, you must use the select_company to get the component to select a third party. This function must only be called by select_company.
      *
      *	@param	string	$selected       Preselected type
      *	@param  string	$htmlname       Name of field in form
@@ -1085,8 +1088,6 @@ class Form
         $resql=$this->db->query($sql);
         if ($resql)
         {
-			$events = null;
-
            	if ($conf->use_javascript_ajax && ! $forcecombo)
             {
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

From a1144e1f66fdc0208f35d4097020b5582a71cbb4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jun 2017 11:18:41 +0200
Subject: [PATCH 1038/1163] Fix missing init of hookmanager

---
 htdocs/core/class/hookmanager.class.php |  5 ++---
 htdocs/install/upgrade2.php             | 11 ++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index afb670dc267..8faea875ab5 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -59,15 +59,14 @@ class HookManager
 
 	/**
 	 *	Init array $this->hooks with instantiated action controlers.
-	 *  First, a hook is declared by a module by adding a constant MAIN_MODULE_MYMODULENAME_HOOKS
-	 *  with value 'nameofcontext1:nameofcontext2:...' into $this->const of module descriptor file.
+	 *  First, a hook is declared by a module by adding a constant MAIN_MODULE_MYMODULENAME_HOOKS with value 'nameofcontext1:nameofcontext2:...' into $this->const of module descriptor file.
 	 *  This makes $conf->hooks_modules loaded with an entry ('modulename'=>array(nameofcontext1,nameofcontext2,...))
 	 *  When initHooks function is called, with initHooks(list_of_contexts), an array $this->hooks is defined with instance of controler
 	 *  class found into file /mymodule/class/actions_mymodule.class.php (if module has declared the context as a managed context).
 	 *  Then when a hook executeHooks('aMethod'...) is called, the method aMethod found into class will be executed.
 	 *
 	 *	@param	string[]	$arraycontext	    Array list of searched hooks tab/features. For example: 'thirdpartycard' (for hook methods into page card thirdparty), 'thirdpartydao' (for hook methods into Societe), ...
-	 *	@return	int							Always 1
+	 *	@return	int							    Always 1
 	 */
 	function initHooks($arraycontext)
 	{
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 36bbeb966d4..6beeb7ca7b2 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -136,6 +136,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
     // Create the global $hookmanager object
     include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
     $hookmanager=new HookManager($db);
+    $hookmanager->initHooks(array('upgrade'));
 
     if (!$db->connected)
     {
@@ -491,9 +492,13 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         }
         else
         {
-            print '<tr><td colspan="4">';
-            print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("None");
-            print '</td></tr>';
+            //if (! empty($conf->modules))
+            if (! empty($conf->modules_parts['hooks']))     // If there is at least one module with one hook, we show message to say nothing was done
+            {
+                print '<tr><td colspan="4">';
+                print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("None");
+                print '</td></tr>';
+            }
         }
     }
 

From 3e51d2f537b6b052b939fd973f382edc8b8d1a03 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jun 2017 11:51:22 +0200
Subject: [PATCH 1039/1163] Fix backto link after creating a third party

---
 htdocs/core/class/html.form.class.php | 2 +-
 htdocs/societe/card.php               | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e4f6ec7bbcb..7a69172889e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5760,7 +5760,7 @@ class Form
         $disabled = ($disabled ? ' disabled' : '');
 
         $resultyesno = '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";
-        if ($useempty) $resultyesno .= '<option value="-1"'.(($value < 0)?' selected':'').'></option>'."\n";
+        if ($useempty) $resultyesno .= '<option value="-1"'.(($value < 0)?' selected':'').'>&nbsp;</option>'."\n";
         if (("$value" == 'yes') || ($value == 1))
         {
             $resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index cb99949407b..d6710f68c92 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -582,6 +582,7 @@ if (empty($reshook))
 
                 	if (! empty($backtopage))
                 	{
+                	    if (preg_match('/\?/', $backtopage)) $backtopage.='&socid='.$object->id;
                		    header("Location: ".$backtopage);
                     	exit;
                 	}
@@ -1065,7 +1066,7 @@ else
 	    print '<td class="maxwidthonsmartphone">';
 	    $selected=isset($_POST['client'])?GETPOST('client'):$object->client;
         print '<select class="flat" name="client" id="customerprospect">';
-        if (GETPOST("type") == '') print '<option value="-1"></option>';
+        if (GETPOST("type") == '') print '<option value="-1">&nbsp;</option>';
         if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($selected==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
         if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) print '<option value="3"'.($selected==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
         if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($selected==1?' selected':'').'>'.$langs->trans('Customer').'</option>';

From 543630e4876e835122a081dd5f522134e0c6a0fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jun 2017 12:21:41 +0200
Subject: [PATCH 1040/1163] Fix missing count of nb of columns into lists

---
 htdocs/contact/list.php               | 20 +++++-
 htdocs/core/lib/functions.lib.php     |  2 +-
 htdocs/product/list.php               | 82 ++++++++++++++--------
 htdocs/projet/card.php                | 33 ++++++---
 htdocs/projet/class/project.class.php | 14 ++++
 htdocs/projet/list.php                | 75 +++++++++++----------
 htdocs/resource/list.php              | 97 +++++++++++++--------------
 htdocs/societe/list.php               | 32 ++++++++-
 htdocs/theme/eldy/style.css.php       |  2 +-
 htdocs/theme/md/style.css.php         |  2 +-
 htdocs/user/index.php                 | 22 +++++-
 11 files changed, 248 insertions(+), 133 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 2d46b91f922..ad71eb3786f 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -682,6 +682,7 @@ print "</tr>\n";
 
 
 $i = 0;
+$totalarray=array();
 while ($i < min($num,$limit))
 {
     $obj = $db->fetch_object($result);
@@ -706,56 +707,67 @@ while ($i < min($num,$limit))
         print '<td valign="middle">';
         print $contactstatic->getNomUrl(1,'',0);
         print '</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
 	// Firstname
     if (! empty($arrayfields['p.firstname']['checked']))
     {
         print '<td>'.$obj->firstname.'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
 	// Zip
     if (! empty($arrayfields['p.zip']['checked']))
     {
         print '<td>'.$obj->zip.'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
 	// Town
     if (! empty($arrayfields['p.town']['checked']))
     {
         print '<td>'.$obj->town.'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Function
     if (! empty($arrayfields['p.poste']['checked']))
     {
         print '<td>'.dol_trunc($obj->poste,20).'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Phone
     if (! empty($arrayfields['p.phone']['checked']))
     {
         print '<td>'.dol_print_phone($obj->phone_pro,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Phone perso
     if (! empty($arrayfields['p.phone_perso']['checked']))
     {
         print '<td>'.dol_print_phone($obj->phone_perso,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Phone mobile
     if (! empty($arrayfields['p.phone_mobile']['checked']))
     {
         print '<td>'.dol_print_phone($obj->phone_mobile,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Fax
     if (! empty($arrayfields['p.fax']['checked']))
     {
         print '<td>'.dol_print_phone($obj->fax,$obj->country_code,$obj->rowid,$obj->socid,'AC_TEL').'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // EMail
     if (! empty($arrayfields['p.email']['checked']))
     {
         print '<td>'.dol_print_email($obj->email,$obj->rowid,$obj->socid,'AC_EMAIL',18).'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Skype
     if (! empty($arrayfields['p.skype']['checked']))
     {
         if (! empty($conf->skype->enabled)) { print '<td>'.dol_print_skype($obj->skype,$obj->rowid,$obj->socid,'AC_SKYPE',18).'</td>'; }
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Company
     if (! empty($arrayfields['p.thirdparty']['checked']))
@@ -770,12 +782,14 @@ while ($i < min($num,$limit))
         else
             print '&nbsp;';
         print '</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
 
     // Private/Public
     if (! empty($arrayfields['p.priv']['checked']))
     {
 	    print '<td align="center">'.$contactstatic->LibPubPriv($obj->priv).'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
 
 	// Extra fields
@@ -792,6 +806,7 @@ while ($i < min($num,$limit))
 				$tmpkey='options_'.$key;
 				print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 				print '</td>';
+	            if (! $i) $totalarray['nbfield']++;
 			}
 	   }
 	}
@@ -805,6 +820,7 @@ while ($i < min($num,$limit))
         print '<td align="center">';
         print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
         print '</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Date modification
     if (! empty($arrayfields['p.tms']['checked']))
@@ -812,11 +828,13 @@ while ($i < min($num,$limit))
         print '<td align="center">';
         print dol_print_date($db->jdate($obj->date_update), 'dayhour');
         print '</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
     // Status
     if (! empty($arrayfields['p.statut']['checked']))
     {
         print '<td align="center">'.$contactstatic->getLibStatut(3).'</td>';
+	    if (! $i) $totalarray['nbfield']++;
     }
 
    // Action column
@@ -829,7 +847,7 @@ while ($i < min($num,$limit))
     }
     print '</td>';
     if (! $i) $totalarray['nbfield']++;
-    
+
     print "</tr>\n";
     $i++;
 }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5113c9f1d96..92cb35e02f5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3692,7 +3692,7 @@ function vatrate($rate, $addpercent=false, $info_bits=0, $usestarfornpr=0)
  *		@param	float		$amount			Amount to format
  *		@param	integer		$form			Type of format, HTML or not (not by default)
  *		@param	Translate	$outlangs		Object langs for output
- *		@param	int			$trunc			1=Truncate if there is too much decimals (default), 0=Does not truncate. Deprecated because amount are rounded (to unit or total amount accurancy) before inserted into database or after a computation, so this parameter should be useless.
+ *		@param	int			$trunc			1=Truncate if there is more decimals than MAIN_MAX_DECIMALS_SHOWN (default), 0=Does not truncate. Deprecated because amount are rounded (to unit or total amount accurancy) before inserted into database or after a computation, so this parameter should be useless.
  *		@param	int			$rounding		Minimum number of decimal to show. If 0, no change, if -1, we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOTAL)
  *		@param	int			$forcerounding	Force the number of decimal to forcerounding decimal (-1=do not force)
  *		@param	string		$currency_code	To add currency symbol (''=add nothing, 'auto'=Use default currency, 'XXX'=add currency symbols for XXX currency)
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 2b3657070e4..2afa8438e73 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -179,7 +179,7 @@ $arrayfields=array(
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val) 
+   foreach($extrafields->attribute_label as $key => $val)
    {
        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key]);
    }
@@ -219,16 +219,16 @@ if (empty($reshook))
     	$search_accountancy_code_buy='';
     	$search_array_options=array();
     }
-    
+
     // Mass actions
     $objectclass='Product';
     if ((string) $search_type == '1') { $objectlabel='Services'; }
     if ((string) $search_type == '0') { $objectlabel='Products'; }
-    
+
     $permtoread = $user->rights->produit->lire;
     $permtodelete = $user->rights->produit->supprimer;
     $uploaddir = $conf->product->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';    
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -324,7 +324,7 @@ else
 	    $typ=$extrafields->attribute_type[$tmpkey];
 	    $mode=0;
 	    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-	    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+	    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
 	    {
 	        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
 	    }
@@ -361,7 +361,7 @@ else
     	$num = $db->num_rows($resql);
 
     	$arrayofselected=is_array($toselect)?$toselect:array();
-    	 
+
     	if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
     	{
     	    $obj = $db->fetch_object($resql);
@@ -415,8 +415,8 @@ else
 	        $crit=$val;
 	        $tmpkey=preg_replace('/search_options_/','',$key);
 	        if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-	    } 	
-		
+	    }
+
 	    // List of mass actions available
 	    $arrayofmassactions =  array(
 	        //'presend'=>$langs->trans("SendByMail"),
@@ -425,7 +425,7 @@ else
 	    if ($user->rights->produit->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	    if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
 	    $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-	     
+
 		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
         if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -473,7 +473,7 @@ else
                 foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
                 print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
             }
-            
+
     		// Filter on categories
     	 	$moreforfilter='';
     		if (! empty($conf->categorie->enabled))
@@ -505,10 +505,10 @@ else
 			$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
             $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
             if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-            
+
             print '<div class="div-table-responsive">';
             print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-    		
+
     		// Lines with input filters
     		print '<tr class="liste_titre_filter">';
     		if (! empty($arrayfields['p.ref']['checked']))
@@ -591,7 +591,7 @@ else
     		// Extra fields
 			if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 			{
-			   foreach($extrafields->attribute_label as $key => $val) 
+			   foreach($extrafields->attribute_label as $key => $val)
 			   {
 					if (! empty($arrayfields["ef.".$key]['checked'])) print '<td class="liste_titre"></td>';
 			   }
@@ -668,12 +668,13 @@ else
     		if (! empty($arrayfields['p.tobuy']['checked']))  print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Buy").')',$_SERVER["PHP_SELF"],"p.tobuy","",$param,'align="right"',$sortfield,$sortorder);
     		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
     		print "</tr>\n";
-    		
-    		
+
+
     		$product_static=new Product($db);
     		$product_fourn =new ProductFournisseur($db);
 
     	    $i = 0;
+    	    $totalarray=array();
     		while ($i < min($num,$limit))
     		{
     			$obj = $db->fetch_object($resql);
@@ -721,6 +722,7 @@ else
 	    			print '<td class="nowrap">';
 	    			print $product_static->getNomUrl(1,'',24);
 	    			print "</td>\n";
+		            if (! $i) $totalarray['nbfield']++;
 			    }
        			// Ref supplier
 			    if (! empty($arrayfields['pfp.ref_fourn']['checked']))
@@ -728,24 +730,28 @@ else
 	    			print '<td class="nowrap">';
 	    			print $product_static->getNomUrl(1,'',24);
 	    			print "</td>\n";
+		            if (! $i) $totalarray['nbfield']++;
 			    }
     			// Label
 			    if (! empty($arrayfields['p.label']['checked']))
 			    {
 			    	print '<td>'.dol_trunc($obj->label,40).'</td>';
+		            if (! $i) $totalarray['nbfield']++;
 			    }
-			    
+
     		    // Type
 			    if (! empty($arrayfields['p.fk_product_type']['checked']))
 			    {
 			    	print '<td>'.$obj->fk_product_type.'</td>';
+		            if (! $i) $totalarray['nbfield']++;
 			    }
-			    
+
 			    // Barcode
 			    if (! empty($arrayfields['p.barcode']['checked']))
 			    {
     				print '<td>'.$obj->barcode.'</td>';
-    			}
+		            if (! $i) $totalarray['nbfield']++;
+			    }
 
     			// Duration
  			    if (! empty($arrayfields['p.duration']['checked']))
@@ -761,6 +767,7 @@ else
 	    				else print $obj->duration;
     				}
     				print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
     			}
 
     			// Sell price
@@ -773,6 +780,7 @@ else
         				else print price($obj->price).' '.$langs->trans("HT");
     			    }
         			print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
     			}
 
     			// Better buy price
@@ -796,6 +804,7 @@ else
     					}
         			}
         			print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
     			}
 
     		    // Limit alert
@@ -807,6 +816,7 @@ else
                         print $obj->seuil_stock_alerte;
     				}
     				print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
         		}
     			// Desired stock
 		        if (! empty($arrayfields['p.desiredstock']['checked']))
@@ -817,6 +827,7 @@ else
                         print $obj->desiredstock;
     				}
     				print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
         		}
 				// Stock
 		        if (! empty($arrayfields['p.stock']['checked']))
@@ -828,7 +839,8 @@ else
       					print $product_static->stock_reel;
     				}
     				print '</td>';
-    			}
+		            if (! $i) $totalarray['nbfield']++;
+        		}
     			// Stock
 		        if (! empty($arrayfields['stock_virtual']['checked']))
         		{
@@ -839,24 +851,34 @@ else
       					print $product_static->stock_theorique;
     				}
     				print '</td>';
-    			}
+		            if (! $i) $totalarray['nbfield']++;
+        		}
     			// Lot/Serial
 		        if (! empty($arrayfields['p.tobatch']['checked']))
         		{
                     print '<td align="center">';
     				print yn($obj->tobatch);
     				print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
         		}
     			// Accountancy code sell
-		        if (! empty($arrayfields['p.accountancy_code_sell']['checked'])) print '<td>'.$obj->accountancy_code_sell.'</td>';
+		        if (! empty($arrayfields['p.accountancy_code_sell']['checked']))
+		        {
+		            print '<td>'.$obj->accountancy_code_sell.'</td>';
+		            if (! $i) $totalarray['nbfield']++;
+		        }
     			// Accountancy code sell
-		        if (! empty($arrayfields['p.accountancy_code_buy']['checked'])) print '<td>'.$obj->accountancy_code_buy.'</td>';
+		        if (! empty($arrayfields['p.accountancy_code_buy']['checked']))
+		        {
+		            print '<td>'.$obj->accountancy_code_buy.'</td>';
+		            if (! $i) $totalarray['nbfield']++;
+		        }
 		        // Extra fields
 				if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 				{
-				   foreach($extrafields->attribute_label as $key => $val) 
+				   foreach($extrafields->attribute_label as $key => $val)
 				   {
-						if (! empty($arrayfields["ef.".$key]['checked'])) 
+						if (! empty($arrayfields["ef.".$key]['checked']))
 						{
 							print '<td';
 							$align=$extrafields->getAlignFlag($key);
@@ -865,6 +887,7 @@ else
 							$tmpkey='options_'.$key;
 							print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 							print '</td>';
+		                    if (! $i) $totalarray['nbfield']++;
 						}
 				   }
 				}
@@ -878,6 +901,7 @@ else
 		            print '<td align="center">';
 		            print dol_print_date($obj->date_creation, 'dayhour');
 		            print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
 		        }
 		        // Date modification
 		        if (! empty($arrayfields['p.tms']['checked']))
@@ -885,8 +909,9 @@ else
 		            print '<td align="center">';
 		            print dol_print_date($obj->date_update, 'dayhour');
 		            print '</td>';
-		        }    			
-    			
+		            if (! $i) $totalarray['nbfield']++;
+		        }
+
                 // Status (to sell)
 		        if (! empty($arrayfields['p.tosell']['checked']))
         		{
@@ -897,6 +922,7 @@ else
 	                    print $product_static->LibStatut($obj->tosell,5,0);
 	                }
 	                print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
         		}
                 // Status (to buy)
 		        if (! empty($arrayfields['p.tobuy']['checked']))
@@ -908,6 +934,7 @@ else
 	                    print $product_static->LibStatut($obj->tobuy,5,1);
 	                }
 	                print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
         		}
         		// Action
         		print '<td class="nowrap" align="center">';
@@ -918,11 +945,12 @@ else
         		    print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
         		}
         		print '</td>';
+        		if (! $i) $totalarray['nbfield']++;
 
                 print "</tr>\n";
     			$i++;
     		}
-    		
+
     		$db->free($resql);
 
     		print "</table>";
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 0b45a0d0696..174d93f4aef 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -41,6 +41,7 @@ $ref=GETPOST('ref','alpha');
 $action=GETPOST('action','alpha');
 $backtopage=GETPOST('backtopage','alpha');
 $cancel=GETPOST('cancel','alpha');
+$confirm=GETPOST('confirm','aZ09');
 $status=GETPOST('status','int');
 $opp_status=GETPOST('opp_status','int');
 $opp_percent=price2num(GETPOST('opp_percent','alpha'));
@@ -68,7 +69,7 @@ if ($id > 0 || ! empty($ref))
 }
 
 // Security check
-$socid=GETPOST('socid');
+$socid=GETPOST('socid','int');
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 $result = restrictedArea($user, 'projet', $object->id,'projet&project');
 
@@ -135,6 +136,12 @@ if (empty($reshook))
 	        setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
 	    }
 
+	    // Create with status validated immediatly
+	    if (! empty($conf->global->PROJECT_CREATE_NO_DRAFT))
+	    {
+	        $status=Project::STATUS_VALIDATED;
+	    }
+
 	    if (! $error)
 	    {
 	        $error=0;
@@ -148,10 +155,10 @@ if (empty($reshook))
 	        $object->public          = GETPOST('public','alpha');
 	        $object->opp_amount      = price2num(GETPOST('opp_amount'));
 	        $object->budget_amount   = price2num(GETPOST('budget_amount'));
-	        $object->datec=dol_now();
-	        $object->date_start=$date_start;
-	        $object->date_end=$date_end;
-	        $object->statuts         = $status;
+	        $object->datec           = dol_now();
+	        $object->date_start      = $date_start;
+	        $object->date_end        = $date_end;
+	        $object->statut          = $status;
 	        $object->opp_status      = $opp_status;
 	        $object->opp_percent     = $opp_percent;
 
@@ -365,7 +372,7 @@ if (empty($reshook))
 	}
 
 
-	if ($action == 'confirm_validate' && GETPOST('confirm') == 'yes')
+	if ($action == 'confirm_validate' && $confirm == 'yes')
 	{
 	    $result = $object->setValid($user);
 	    if ($result <= 0)
@@ -374,7 +381,7 @@ if (empty($reshook))
 	    }
 	}
 
-	if ($action == 'confirm_close' && GETPOST('confirm') == 'yes')
+	if ($action == 'confirm_close' && $confirm == 'yes')
 	{
 	    $result = $object->setClose($user);
 	    if ($result <= 0)
@@ -383,7 +390,7 @@ if (empty($reshook))
 	    }
 	}
 
-	if ($action == 'confirm_reopen' && GETPOST('confirm') == 'yes')
+	if ($action == 'confirm_reopen' && $confirm == 'yes')
 	{
 	    $result = $object->setValid($user);
 	    if ($result <= 0)
@@ -409,7 +416,7 @@ if (empty($reshook))
 	    }
 	}
 
-	if ($action == 'confirm_clone' && $user->rights->projet->creer && GETPOST('confirm') == 'yes')
+	if ($action == 'confirm_clone' && $user->rights->projet->creer && $confirm == 'yes')
 	{
 	    $clone_contacts=GETPOST('clone_contacts')?1:0;
 	    $clone_tasks=GETPOST('clone_tasks')?1:0;
@@ -885,12 +892,16 @@ elseif ($object->id > 0)
 
 	        // Opportunity percent
 	        print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-	        if (strcmp($object->opp_percent,'')) print price($object->opp_percent,0,$langs,1,0).' %';
+	        if (strcmp($object->opp_percent,'')) print price($object->opp_percent, 0, $langs, 1, 0).' %';
 	        print '</td></tr>';
 
 	        // Opportunity Amount
 	        print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
-	        if (strcmp($object->opp_amount,'')) print price($object->opp_amount,0,$langs,1,0,0,$conf->currency);
+	        /*if ($object->opp_status)
+	        {
+	           print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
+	        }*/
+	        if (strcmp($object->opp_amount,'')) print price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
 	        print '</td></tr>';
 	    }
 
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 6a53be25c54..b22ea32f646 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -103,6 +103,20 @@ class Project extends CommonObject
 	 */
 	public $lines;
 
+	/**
+	 * Draft status
+	 */
+	const STATUS_DRAFT = 0;
+	/**
+	 * Open/Validated status
+	 */
+	const STATUS_VALIDATED = 1;
+	/**
+	 * Closed status
+	 */
+	const STATUS_CLOSED = 2;
+
+
 
     /**
      *  Constructor
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 851956f816b..b9da5379655 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -135,7 +135,7 @@ $arrayfields=array(
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val) 
+   foreach($extrafields->attribute_label as $key => $val)
    {
        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
    }
@@ -186,7 +186,7 @@ if (empty($reshook))
     	$toselect='';
     	$search_array_options=array();
     }
-    
+
 
     // Mass actions
     $objectclass='Project';
@@ -297,12 +297,12 @@ else if ($search_eyear > 0)
     $sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($search_eyear,1,false))."' AND '".$db->idate(dol_get_last_day($search_eyear,12,false))."'";
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
-if ($search_status >= 0) 
+if ($search_status >= 0)
 {
     if ($search_status == 99) $sql .= " AND p.fk_statut <> 2";
     else $sql .= " AND p.fk_statut = ".$db->escape($search_status);
 }
-if ($search_opp_status) 
+if ($search_opp_status)
 {
     if (is_numeric($search_opp_status) && $search_opp_status > 0) $sql .= " AND p.fk_opp_status = ".$db->escape($search_opp_status);
     if ($search_opp_status == 'all') $sql .= " AND p.fk_opp_status IS NOT NULL";
@@ -313,7 +313,7 @@ if ($search_public!='') $sql .= " AND p.public = ".$db->escape($search_public);
 if ($search_sale > 0) $sql.= " AND sc.fk_user = " .$search_sale;
 // For external user, no check is done on company permission because readability is managed by public status of project and assignement.
 //if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
-if ($search_project_user > 0) $sql.= " AND ecp.fk_c_type_contact IN (".join(',',array_keys($listofprojectcontacttype)).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".$search_project_user; 
+if ($search_project_user > 0) $sql.= " AND ecp.fk_c_type_contact IN (".join(',',array_keys($listofprojectcontacttype)).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".$search_project_user;
 if ($search_opp_amount != '') $sql .= natural_search('p.opp_amount', $search_opp_amount, 1);
 if ($search_budget_amount != '') $sql .= natural_search('p.budget_amount', $search_budget_amount, 1);
 // Add where from extra fields
@@ -324,7 +324,7 @@ foreach ($search_array_options as $key => $val)
     $typ=$extrafields->attribute_type[$tmpkey];
     $mode=0;
     if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
     {
         $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
     }
@@ -383,8 +383,8 @@ if ($search_ref != '') 			$param.='&search_ref='.$search_ref;
 if ($search_label != '') 		$param.='&search_label='.$search_label;
 if ($search_societe != '') 		$param.='&search_societe='.$search_societe;
 if ($search_status >= 0) 		$param.='&search_status='.$search_status;
-if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all','openedopp','none'))) 	$param.='&search_opp_status='.urlencode($search_opp_status);
-if ((is_numeric($search_opp_percent) && $search_opp_percent >= 0) || in_array($search_opp_percent, array('all','openedopp','none'))) 	$param.='&search_opp_percent='.urlencode($search_opp_percent);
+if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all','openedopp','none'))) 	    $param.='&search_opp_status='.urlencode($search_opp_status);
+if ($search_opp_percent != '') 	$param.='&search_opp_percent='.urlencode($search_opp_percent);
 if ($search_public != '') 		$param.='&search_public='.$search_public;
 if ($search_project_user != '')   $param.='&search_project_user='.$search_project_user;
 if ($search_sale > 0)    		$param.='&search_sale='.$search_sale;
@@ -532,18 +532,18 @@ if (! empty($arrayfields['p.public']['checked']))
     print $form->selectarray('search_public',$array,$search_public);
     print '</td>';
 }
-if (! empty($arrayfields['p.opp_amount']['checked']))
-{
-	print '<td class="liste_titre nowrap right">';
-	print '<input type="text" class="flat" name="search_opp_amount" size="3" value="'.$search_opp_amount.'">';
-	print '</td>';
-}
 if (! empty($arrayfields['p.fk_opp_status']['checked']))
 {
 	print '<td class="liste_titre nowrap center">';
 	print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 1, 1, 0, 'maxwidth100');
     print '</td>';
 }
+if (! empty($arrayfields['p.opp_amount']['checked']))
+{
+	print '<td class="liste_titre nowrap right">';
+	print '<input type="text" class="flat" name="search_opp_amount" size="3" value="'.$search_opp_amount.'">';
+	print '</td>';
+}
 if (! empty($arrayfields['p.opp_percent']['checked']))
 {
 	print '<td class="liste_titre nowrap right">';
@@ -620,8 +620,8 @@ if (! empty($arrayfields['commercial']['checked']))      print_liste_field_titre
 if (! empty($arrayfields['p.dateo']['checked']))         print_liste_field_titre($arrayfields['p.dateo']['label'],$_SERVER["PHP_SELF"],"p.dateo","",$param,'align="center"',$sortfield,$sortorder);
 if (! empty($arrayfields['p.datee']['checked']))         print_liste_field_titre($arrayfields['p.datee']['label'],$_SERVER["PHP_SELF"],"p.datee","",$param,'align="center"',$sortfield,$sortorder);
 if (! empty($arrayfields['p.public']['checked']))        print_liste_field_titre($arrayfields['p.public']['label'],$_SERVER["PHP_SELF"],"p.public","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'],$_SERVER["PHP_SELF"],'p.opp_amount',"",$param,'align="right"',$sortfield,$sortorder);
 if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'],$_SERVER["PHP_SELF"],'p.fk_opp_status',"",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'],$_SERVER["PHP_SELF"],'p.opp_amount',"",$param,'align="right"',$sortfield,$sortorder);
 if (! empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'],$_SERVER["PHP_SELF"],'p.opp_percent',"",$param,'align="right"',$sortfield,$sortorder);
 if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'],$_SERVER["PHP_SELF"],'p.budget_amount',"",$param,'align="right"',$sortfield,$sortorder);
 // Extra fields
@@ -661,7 +661,7 @@ while ($i < min($num,$limit))
 	$object->datee = $db->jdate($obj->date_end);
 	$object->statut = $obj->fk_statut;
 	$object->opp_status = $obj->fk_opp_status;
-	
+
 	$userAccess = $object->restrictedProjectArea($user);    // why this ?
 	if ($userAccess >= 0)
 	{
@@ -770,20 +770,7 @@ while ($i < min($num,$limit))
     		print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}
-    	// Opp Amount
-    	if (! empty($arrayfields['p.opp_amount']['checked']))
-    	{
-			print '<td align="right">';
-			if ($obj->opp_status_code) 
-			{
-			    print price($obj->opp_amount, 1, '', 1, -1, -1, '');
-			    $totalarray['totalopp'] += $obj->opp_amount;
-			}
-			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-			if (! $i) $totalarray['totaloppfield']=$totalarray['nbfield'];
-    	}
-    	// Opp Status
+	    // Opp Status
     	if (! empty($arrayfields['p.fk_opp_status']['checked']))
     	{
             print '<td class="center">';
@@ -791,11 +778,25 @@ while ($i < min($num,$limit))
 			print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}
+    	// Opp Amount
+    	if (! empty($arrayfields['p.opp_amount']['checked']))
+    	{
+			print '<td align="right">';
+			//if ($obj->opp_status_code)
+			if (strcmp($obj->opp_amount,''))
+			{
+			    print price($obj->opp_amount, 1, $langs, 1, -1, -1, '');
+			    $totalarray['totalopp'] += $obj->opp_amount;
+			}
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+			if (! $i) $totalarray['totaloppfield']=$totalarray['nbfield'];
+    	}
     	// Opp percent
 	    if (! empty($arrayfields['p.opp_percent']['checked']))
     	{
 			print '<td align="right">';
-			if ($obj->opp_percent) print price($obj->opp_percent, 1, '', 1, 0).'%';
+			if ($obj->opp_percent) print price($obj->opp_percent, 1, $langs, 1, 0).'%';
 			print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
     	}
@@ -803,9 +804,9 @@ while ($i < min($num,$limit))
 	    if (! empty($arrayfields['p.budget_amount']['checked']))
     	{
 			print '<td align="right">';
-			if ($obj->budget_amount != '') 
+			if ($obj->budget_amount != '')
 			{
-			    print price($obj->budget_amount, 1, '', 1, -1, -1);
+			    print price($obj->budget_amount, 1, $langs, 1, -1, -1);
 			    $totalarray['totalbudget'] += $obj->budget_amount;
 			}
 			print '</td>';
@@ -826,9 +827,9 @@ while ($i < min($num,$limit))
 		            $tmpkey='options_'.$key;
 		            print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 		            print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
 		        }
 		    }
-		    if (! $i) $totalarray['nbfield']++;
 		}
 		// Fields from hook
 		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
@@ -866,7 +867,7 @@ while ($i < min($num,$limit))
         }
         print '</td>';
 		if (! $i) $totalarray['nbfield']++;
-		
+
 		print "</tr>\n";
 
 	}
@@ -887,8 +888,8 @@ if (isset($totalarray['totaloppfield']) || isset($totalarray['totalbudgetfield']
             if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
             else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
         }
-        elseif ($totalarray['totaloppfield'] == $i) print '<td align="right">'.price($totalarray['totalopp']).'</td>';
-        elseif ($totalarray['totalbudgetfield'] == $i) print '<td align="right">'.price($totalarray['totalbudget']).'</td>';
+        elseif ($totalarray['totaloppfield'] == $i) print '<td align="right">'.price($totalarray['totalopp'], 1, $langs, 1, -1, -1).'</td>';
+        elseif ($totalarray['totalbudgetfield'] == $i) print '<td align="right">'.price($totalarray['totalbudget'], 1, $langs, 1, -1, -1).'</td>';
         else print '<td></td>';
     }
     print '</tr>';
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 44524cd7acd..d157cfc99d2 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -257,66 +257,63 @@ if ($ret)
 {
     foreach ($object->lines as $resource)
     {
-            
+        print '<tr class="oddeven">';
 
-            $style='';
-            if ($resource->id == GETPOST('lineid')) $style='style="background: orange;"';
+        if (! empty($arrayfields['t.ref']['checked']))
+        {
+        	print '<td>';
+        	print $resource->getNomUrl(5);
+        	print '</td>';
+	        if (! $i) $totalarray['nbfield']++;
+        }
 
-            print '<tr '.$bc[$var].' '.$style.'>';
+        if (! empty($arrayfields['ty.label']['checked']))
+        {
+        	print '<td>';
+        	print $resource->type_label;
+        	print '</td>';
+	        if (! $i) $totalarray['nbfield']++;
+        }
+        // Extra fields
+        if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+        {
+        	foreach($extrafields->attribute_label as $key => $val)
+        	{
+        		if (! empty($arrayfields["ef.".$key]['checked']))
+        		{
+        			print '<td';
+        			$align=$extrafields->getAlignFlag($key);
+        			if ($align) print ' align="'.$align.'"';
+        			print '>';
+        			$tmpkey='options_'.$key;
+        			print $extrafields->showOutputField($key, $resource->array_options[$tmpkey], '', 1);
+        			print '</td>';
+	                if (! $i) $totalarray['nbfield']++;
+        		}
+        	}
+        }
 
-            if (! empty($arrayfields['t.ref']['checked']))
-            {
-            	print '<td>';
-            	print $resource->getNomUrl(5);
-            	print '</td>';
-            }
+        print '<td align="center">';
+        print '<a href="./card.php?action=edit&id='.$resource->id.'">';
+        print img_edit();
+        print '</a>';
+        print '&nbsp;';
+        print '<a href="./card.php?action=delete&id='.$resource->id.'">';
+        print img_delete();
+        print '</a>';
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 
-            if (! empty($arrayfields['ty.label']['checked']))
-            {
-            	print '<td>';
-            	print $resource->type_label;
-            	print '</td>';
-            }
-            // Extra fields
-            if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-            {
-            	foreach($extrafields->attribute_label as $key => $val)
-            	{
-            		if (! empty($arrayfields["ef.".$key]['checked']))
-            		{
-            			print '<td';
-            			$align=$extrafields->getAlignFlag($key);
-            			if ($align) print ' align="'.$align.'"';
-            			print '>';
-            			$tmpkey='options_'.$key;
-            			print $extrafields->showOutputField($key, $resource->array_options[$tmpkey], '', 1);
-            			print '</td>';
-            		}
-            	}
-            	if (! $i) $totalarray['nbfield']++;
-            }
-
-            print '<td align="center">';
-            print '<a href="./card.php?action=edit&id='.$resource->id.'">';
-            print img_edit();
-            print '</a>';
-            print '&nbsp;';
-            print '<a href="./card.php?action=delete&id='.$resource->id.'">';
-            print img_delete();
-            print '</a>';
-            print '</td>';
-
-            print '</tr>';
+        print '</tr>';
     }
-
-    print '</table>';
-    print "</form>\n";
 }
 else
 {
     print '<tr><td class="opacitymedium">'.$langs->trans('NoResourceInDatabase').'</td></tr>';
 }
 
-llxFooter();
+print '</table>';
+print "</form>\n";
 
+llxFooter();
 $db->close();
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 28d6ec27368..3cbd8768e92 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -247,7 +247,7 @@ if (empty($reshook))
     $permtodelete = $user->rights->societe->supprimer;
     $uploaddir = $conf->societe->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-    
+
     if ($action == 'setstcomm')
     {
         $object = new Client($db);
@@ -930,6 +930,7 @@ print "</tr>\n";
 
 
 $i = 0;
+$totalarray=array();
 while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
@@ -955,46 +956,55 @@ while ($i < min($num, $limit))
 		print '<td class="tdoverflowmax200">';
 		print $companystatic->getNomUrl(1,'',100);
 		print "</td>\n";
+        if (! $i) $totalarray['nbfield']++;
 	}
 	// Barcode
     if (! empty($arrayfields['s.barcode']['checked']))
 	{
 		print '<td>'.$obj->barcode.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	// Customer code
     if (! empty($arrayfields['s.code_client']['checked']))
 	{
 		print '<td>'.$obj->code_client.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     // Supplier code
     if (! empty($arrayfields['s.code_fournisseur']['checked']))
 	{
 		print '<td>'.$obj->code_fournisseur.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	// Account customer code
     if (! empty($arrayfields['s.code_compta']['checked']))
 	{
 		print '<td>'.$obj->code_compta.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     // Account supplier code
     if (! empty($arrayfields['s.code_compta_fournisseur']['checked']))
 	{
 		print '<td>'.$obj->code_compta_fournisseur.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	// Town
     if (! empty($arrayfields['s.town']['checked']))
     {
         print "<td>".$obj->town."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     // Zip
     if (! empty($arrayfields['s.zip']['checked']))
     {
         print "<td>".$obj->zip."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     // State
     if (! empty($arrayfields['state.nom']['checked']))
     {
         print "<td>".$obj->state_name."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     // Country
     if (! empty($arrayfields['country.code_iso']['checked']))
@@ -1003,6 +1013,7 @@ while ($i < min($num, $limit))
 		$tmparray=getCountry($obj->fk_pays,'all');
 		print $tmparray['label'];
 		print '</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
 	// Type ent
     if (! empty($arrayfields['typent.code']['checked']))
@@ -1011,42 +1022,52 @@ while ($i < min($num, $limit))
 		if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
 		print $typenArray[$obj->typent_code];
 		print '</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.email']['checked']))
     {
         print "<td>".$obj->email."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.phone']['checked']))
     {
         print "<td>".$obj->phone."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.url']['checked']))
     {
         print "<td>".$obj->url."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.siren']['checked']))
     {
         print "<td>".$obj->idprof1."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.siret']['checked']))
     {
         print "<td>".$obj->idprof2."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.ape']['checked']))
     {
         print "<td>".$obj->idprof3."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.idprof4']['checked']))
     {
         print "<td>".$obj->idprof4."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.idprof5']['checked']))
     {
         print "<td>".$obj->idprof5."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     if (! empty($arrayfields['s.idprof6']['checked']))
     {
         print "<td>".$obj->idprof6."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
     }
     // Type
     if (! empty($arrayfields['customerorsupplier']['checked']))
@@ -1075,6 +1096,7 @@ while ($i < min($num, $limit))
     	}
     	print $s;
     	print '</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
 
     if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
@@ -1083,6 +1105,7 @@ while ($i < min($num, $limit))
 		print '<td align="center">';
 		print $companystatic->getLibProspLevel();
 		print "</td>";
+        if (! $i) $totalarray['nbfield']++;
     }
 
     if (! empty($arrayfields['s.fk_stcomm']['checked']))
@@ -1098,6 +1121,7 @@ while ($i < min($num, $limit))
 			if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm'.$param.($page?'&page='.urlencode($page):'').'">'.img_action($titlealt,$val['code']).'</a>';
 		}
 		print '</div></div></td>';
+        if (! $i) $totalarray['nbfield']++;
     }
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
@@ -1113,6 +1137,7 @@ while ($i < min($num, $limit))
 				$tmpkey='options_'.$key;
 				print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 				print '</td>';
+                if (! $i) $totalarray['nbfield']++;
 			}
 	   }
 	}
@@ -1126,6 +1151,7 @@ while ($i < min($num, $limit))
         print '<td align="center" class="nowrap">';
         print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
         print '</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
     // Date modification
     if (! empty($arrayfields['s.tms']['checked']))
@@ -1133,11 +1159,13 @@ while ($i < min($num, $limit))
         print '<td align="center" class="nowrap">';
         print dol_print_date($db->jdate($obj->date_update), 'dayhour');
         print '</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
     // Status
     if (! empty($arrayfields['s.status']['checked']))
     {
         print '<td align="center" class="nowrap">'.$companystatic->getLibStatut(3).'</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
 
     // Action column
@@ -1150,7 +1178,7 @@ while ($i < min($num, $limit))
     }
     print '</td>';
     if (! $i) $totalarray['nbfield']++;
-    
+
 	print '</tr>'."\n";
 	$i++;
 }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c0738f004bc..f3e7df31609 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -4179,7 +4179,7 @@ dl.dropdown {
     position:absolute;
     top:2px;
     list-style:none;
-    max-height: 300px;
+    max-height: 280px;
     overflow: auto;
 }
 .dropdown span.value {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 4557c6856fb..49a8745f61e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4266,7 +4266,7 @@ dl.dropdown {
     position:absolute;
     top:2px;
     list-style:none;
-    max-height: 300px;
+    max-height: 280px;
     overflow: auto;
 }
 .dropdown span.value {
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 415665bc5fc..6aaa3274b9d 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -465,6 +465,7 @@ print "</tr>\n";
 
 
 $i = 0;
+$totalarray=array();
 while ($i < min($num,$limit))
 {
     $obj = $db->fetch_object($result);
@@ -497,32 +498,39 @@ while ($i < min($num,$limit))
         	print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
         }
         print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     if (! empty($arrayfields['u.lastname']['checked']))
 	{
 	      print '<td>'.$obj->lastname.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     if (! empty($arrayfields['u.firstname']['checked']))
 	{
 	  print '<td>'.$obj->firstname.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     if (! empty($arrayfields['u.gender']['checked']))
 	{
 	  print '<td>';
 	  if ($obj->gender) print $langs->trans("Gender".$obj->gender);
 	  print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     if (! empty($arrayfields['u.employee']['checked']))
 	{
 	  print '<td>'.yn($obj->employee).'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	if (! empty($arrayfields['u.accountancy_code']['checked']))
 	{
 	  print '<td>'.$obj->accountancy_code.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     if (! empty($arrayfields['u.email']['checked']))
 	{
 	  print '<td>'.$obj->email.'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 	if (! empty($arrayfields['u.fk_soc']['checked']))
 	{
@@ -543,6 +551,7 @@ while ($i < min($num,$limit))
         	print $langs->trans("InternalUser");
         }
         print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     // Multicompany enabled
 	if (! empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
@@ -560,6 +569,7 @@ while ($i < min($num,$limit))
         		print $mc->label;
         	}
         	print '</td>';
+            if (! $i) $totalarray['nbfield']++;
 		}
     }
     // Supervisor
@@ -589,17 +599,20 @@ while ($i < min($num,$limit))
             }
         }
         print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 
     // Date last login
     if (! empty($arrayfields['u.datelastlogin']['checked']))
 	{
         print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datelastlogin),"dayhour").'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
     // Date previous login
     if (! empty($arrayfields['u.datepreviouslogin']['checked']))
 	{
         print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datepreviouslogin),"dayhour").'</td>';
+        if (! $i) $totalarray['nbfield']++;
 	}
 
 	// Extra fields
@@ -616,6 +629,7 @@ while ($i < min($num,$limit))
 				$tmpkey='options_'.$key;
 				print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 				print '</td>';
+                if (! $i) $totalarray['nbfield']++;
 			}
 	   }
 	}
@@ -629,6 +643,7 @@ while ($i < min($num,$limit))
         print '<td align="center">';
         print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
         print '</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
     // Date modification
     if (! empty($arrayfields['u.tms']['checked']))
@@ -636,15 +651,18 @@ while ($i < min($num,$limit))
         print '<td align="center">';
         print dol_print_date($db->jdate($obj->date_update), 'dayhour');
         print '</td>';
+        if (! $i) $totalarray['nbfield']++;
     }
     // Status
     if (! empty($arrayfields['u.statut']['checked']))
     {
-	  $userstatic->statut=$obj->statut;
-      print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
+	   $userstatic->statut=$obj->statut;
+       print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
+       if (! $i) $totalarray['nbfield']++;
     }
     // Action column
     print '<td></td>';
+    if (! $i) $totalarray['nbfield']++;
 
     print "</tr>\n";
     $i++;

From e0275285454bcb2090816e42c6298aa44a7ee768 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jun 2017 14:24:12 +0200
Subject: [PATCH 1041/1163] Clean module builder

---
 .../template/core/modules/modMyModule.class.php           | 8 +++++---
 htdocs/modulebuilder/template/css/mycss.css.php           | 6 ++----
 htdocs/modulebuilder/template/js/mymodule.js.php          | 4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 9e8f5ca9975..dc98c327cb3 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -50,7 +50,7 @@ class modMyModule extends DolibarrModules
 
 		// Id for module (must be unique).
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 500000;		// TODO Go on page http://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
+		$this->numero = 500000;		// TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
 		// Key text used to identify module (for permissions, menus, etc...)
 		$this->rights_class = 'mymodule';
 
@@ -62,11 +62,13 @@ class modMyModule extends DolibarrModules
 		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
 		//$this->familyinfo = array('myownfamily' => array('position' => '001', 'label' => $langs->trans("MyOwnFamily")));
 
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		// Module label (no space allowed), used if translation string 'ModuleMyModuleName' not found (MyModue is name of module).
 		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		// Module description, used if translation string 'ModuleMyModuleDesc' not found (MyModue is name of module).
 		$this->description = "MyModuleDescription";
+		// Used only if file README.md and README-LL.md not found.
 		$this->descriptionlong = "MyModuleDescription (Long)";
+
 		$this->editor_name = 'Editor name';
 		$this->editor_url = 'https://www.example.com';
 
diff --git a/htdocs/modulebuilder/template/css/mycss.css.php b/htdocs/modulebuilder/template/css/mycss.css.php
index eaa248288e8..60d49d7c0bc 100644
--- a/htdocs/modulebuilder/template/css/mycss.css.php
+++ b/htdocs/modulebuilder/template/css/mycss.css.php
@@ -17,11 +17,9 @@
  */
 
 /**
- * \file    css/mycss.css.php
+ * \file    htdocs/modulebuilder/template/css/mycss.css.php
  * \ingroup mymodule
- * \brief   Example CSS.
- *
- * Put detailed description here.
+ * \brief   CSS file for module MyModule.
  */
 
 header('Content-Type: text/css');
diff --git a/htdocs/modulebuilder/template/js/mymodule.js.php b/htdocs/modulebuilder/template/js/mymodule.js.php
index a08ae02c2fc..32915dbe34e 100644
--- a/htdocs/modulebuilder/template/js/mymodule.js.php
+++ b/htdocs/modulebuilder/template/js/mymodule.js.php
@@ -19,9 +19,7 @@
 /**
  * \file    htdocs/modulebuilder/template/js/mymodule.js.php
  * \ingroup mymodule
- * \brief   Example JavaScript.
- *
- * Put detailed description here.
+ * \brief   JavaScript file for module MyModule.
  */
 
 header('Content-Type: application/javascript');

From b1f93ccb0c72301ffc186ebf96669774f2d2971e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jun 2017 14:33:46 +0200
Subject: [PATCH 1042/1163] Fix security

---
 htdocs/accountancy/admin/account.php             | 2 +-
 htdocs/accountancy/admin/fiscalyear.php          | 2 +-
 htdocs/accountancy/admin/importaccounts.php      | 2 +-
 htdocs/accountancy/admin/productaccount.php      | 2 +-
 htdocs/accountancy/bookkeeping/balance.php       | 2 +-
 htdocs/accountancy/bookkeeping/list.php          | 2 +-
 htdocs/accountancy/bookkeeping/listbyaccount.php | 2 +-
 htdocs/accountancy/bookkeeping/listbyyear.php    | 2 +-
 htdocs/accountancy/customer/lines.php            | 2 +-
 htdocs/accountancy/customer/list.php             | 2 +-
 htdocs/accountancy/expensereport/lines.php       | 2 +-
 htdocs/accountancy/expensereport/list.php        | 2 +-
 htdocs/accountancy/supplier/lines.php            | 2 +-
 htdocs/accountancy/supplier/list.php             | 2 +-
 htdocs/adherents/list.php                        | 2 +-
 htdocs/adherents/subscription/list.php           | 2 +-
 htdocs/adherents/type.php                        | 2 +-
 htdocs/admin/defaultvalues.php                   | 2 +-
 htdocs/admin/translation.php                     | 2 +-
 htdocs/bookmarks/list.php                        | 2 +-
 htdocs/comm/action/listactions.php               | 2 +-
 htdocs/comm/mailing/cibles.php                   | 2 +-
 htdocs/commande/customer.php                     | 2 +-
 htdocs/commande/list.php                         | 2 +-
 htdocs/compta/bank/index.php                     | 2 +-
 htdocs/compta/prelevement/card.php               | 2 +-
 htdocs/compta/prelevement/demandes.php           | 2 +-
 htdocs/compta/prelevement/factures.php           | 2 +-
 htdocs/compta/recap-compta.php                   | 2 +-
 htdocs/compta/resultat/clientfourn.php           | 2 +-
 htdocs/contact/agenda.php                        | 2 +-
 htdocs/contact/list.php                          | 2 +-
 htdocs/contrat/list.php                          | 2 +-
 htdocs/contrat/services.php                      | 2 +-
 htdocs/cron/list.php                             | 2 +-
 htdocs/expedition/list.php                       | 2 +-
 htdocs/expensereport/list.php                    | 2 +-
 htdocs/fourn/commande/list.php                   | 2 +-
 htdocs/fourn/product/list.php                    | 2 +-
 htdocs/modulebuilder/template/myobject_list.php  | 2 +-
 htdocs/product/inventory/list.php                | 2 +-
 htdocs/product/list-with-listview.php            | 2 +-
 htdocs/product/list.php                          | 2 +-
 htdocs/product/popuprop.php                      | 2 +-
 htdocs/product/stock/productlot_list.php         | 2 +-
 htdocs/projet/info.php                           | 2 +-
 htdocs/projet/list.php                           | 2 +-
 htdocs/projet/tasks/list.php                     | 2 +-
 htdocs/projet/tasks/time.php                     | 2 +-
 htdocs/resource/list.php                         | 2 +-
 htdocs/societe/agenda.php                        | 2 +-
 htdocs/societe/list.php                          | 2 +-
 htdocs/societe/notify/card.php                   | 2 +-
 htdocs/user/group/index.php                      | 2 +-
 htdocs/user/index.php                            | 2 +-
 htdocs/user/notify/card.php                      | 2 +-
 56 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index c2b6997d96e..83c844123be 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -52,7 +52,7 @@ if ($user->societe_id > 0) accessforbidden();
 if (! $user->rights->accounting->chartofaccount) accessforbidden();
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'sortorder');
 $page = GETPOST("page", 'int');
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 47759792d71..5eabf9eda25 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
 $action = GETPOST('action','aZ09');
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index d1083c50d10..6b462928736 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -39,7 +39,7 @@ $langs->load("accountancy");
 if (! $user->admin)
 	accessforbidden();
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 069076e3d88..b6af74ec96d 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -70,7 +70,7 @@ $accounting_product_mode = GETPOST('accounting_product_mode', 'alpha');
 $btn_changeaccount = GETPOST('changeaccount');
 $btn_changetype = GETPOST('changetype');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 34db60f7a0f..3f2c472cc58 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -55,7 +55,7 @@ if (GETPOST("button_export_csv_x") || GETPOST("button_export_csv")) {
 	$action = 'export_csv';
 }
 
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):$conf->liste_limit;
 
 $offset = $limit * $page;
 
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 60e283eea2c..26ab0fa4c4d 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -80,7 +80,7 @@ $search_direction = GETPOST('search_direction', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 6b329e421ad..b9a5526a7ab 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -59,7 +59,7 @@ $search_direction = GETPOST('search_direction', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index 5fba55f2eba..f4134a2e028 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -37,7 +37,7 @@ $langs->load("accountancy");
 $page = GETPOST("page");
 $sortorder = GETPOST("sortorder");
 $sortfield = GETPOST("sortfield");
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):$conf->liste_limit;
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
 $search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 $search_doc_type = GETPOST('search_doc_type', 'alpha');
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 9c88a417bac..a5dfa3941d1 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -55,7 +55,7 @@ $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 9e534d55af7..56765e1ba4f 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -63,7 +63,7 @@ $search_vat = GETPOST('search_vat', 'alpha');
 $btn_ventil = GETPOST('ventil', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index ca2369a11e4..5a386c82522 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -52,7 +52,7 @@ $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 01acf759260..7fb5f26b28b 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -61,7 +61,7 @@ $search_vat = GETPOST('search_vat', 'alpha');
 $btn_ventil = GETPOST('ventil', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 06308a67fa1..164525d5214 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -54,7 +54,7 @@ $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 7ed1453982e..26000c3fb66 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -63,7 +63,7 @@ $search_vat = GETPOST('search_vat', 'alpha');
 $btn_ventil = GETPOST('ventil', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 82ab87961f3..3dd60ad7478 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -62,7 +62,7 @@ $optioncss = GETPOST('optioncss','alpha');
 
 if ($statut < -1) $statut = '';
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 633c872e607..a5066f98f0c 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -42,7 +42,7 @@ $optioncss = GETPOST('optioncss','alpha');
 
 $date_select=isset($_GET["date_select"])?$_GET["date_select"]:$_POST["date_select"];
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 4935b6c4c6d..1461098034e 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -44,7 +44,7 @@ $search_email		= GETPOST('search_email','alpha');
 $type				= GETPOST('type','alpha');
 $status				= GETPOST('status','alpha');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 7409ef1b973..04a9320f4c1 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -39,7 +39,7 @@ $action=GETPOST('action','alpha');
 
 $mode = GETPOST('mode')?GETPOST('mode'):'createform';   // 'createform', 'filters', 'sortorder', 'focus'
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 67433eca35d..f48ef749b8a 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -45,7 +45,7 @@ $transvalue=GETPOST('transvalue','alpha');
 
 $mode = GETPOST('mode')?GETPOST('mode'):'overwrite';
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 57bb6a71cec..71c8174f1cd 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -39,7 +39,7 @@ if (! $user->rights->bookmark->lire) {
 }
 $optioncss = GETPOST('optioncss','alpha');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 400b882d143..186165b2f9a 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -76,7 +76,7 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 	$filtert=$user->id;
 }
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 8ee163e8e6f..73aaab22248 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -39,7 +39,7 @@ if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden();
 
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 1fa05a07832..cdf26b6a36d 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -45,7 +45,7 @@ accessforbidden();
 $langs->load("companies");
 $langs->load("orders");
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index c879a2da7d8..2f8dfc28ae7 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -82,7 +82,7 @@ $result = restrictedArea($user, 'commande', $id,'');
 
 $diroutputmassaction=$conf->commande->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 6315b8e1d50..f5e9d347e8c 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -55,7 +55,7 @@ $result=restrictedArea($user,'banque');
 
 $diroutputmassaction=$conf->bank->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 443f93eb52c..915cf43fb79 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -48,7 +48,7 @@ $id = GETPOST('id','int');
 $socid = GETPOST('socid','int');
 
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 8b5e024f3b6..6e63b74a408 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -45,7 +45,7 @@ $page =  GETPOST('page','int');
 $sortorder = GETPOST('sortorder','alpha');
 $sortfield = GETPOST('sortfield','alpha');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 9987d41e802..28836abe667 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -44,7 +44,7 @@ if ($user->societe_id > 0) accessforbidden();
 $prev_id = GETPOST('id','int');
 $socid = GETPOST('socid','int');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 5ec219a48ee..3ddb99a4369 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -40,7 +40,7 @@ $object = new Societe($db);
 if ($id > 0) $object->fetch($id);
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 8a69af99cf5..61d18cd85cc 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -52,7 +52,7 @@ if ($user->societe_id > 0) $socid = $user->societe_id;
 if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user,'compta','','','resultat');
 if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accounting','','','comptarapport');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index ba0ec3f8ef0..96876ed561d 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -89,7 +89,7 @@ $search_agenda_label=GETPOST('search_agenda_label');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index ad71eb3786f..fd48794afad 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -74,7 +74,7 @@ $optioncss = GETPOST('optioncss','alpha');
 $type=GETPOST("type");
 $view=GETPOST("view");
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index bbe30fe26dd..0003bdec348 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -65,7 +65,7 @@ $month=GETPOST("month","int");
 
 $optioncss = GETPOST('optioncss','alpha');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 8d4fa7e69d4..6902927a8b7 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -33,7 +33,7 @@ $langs->load("products");
 $langs->load("contracts");
 $langs->load("companies");
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 636770ef567..12c92e9bdd3 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -39,7 +39,7 @@ $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
 $id=GETPOST('id','int');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 68938afef6a..517a231fdb9 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -53,7 +53,7 @@ $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
 $sall = GETPOST('sall', 'alphanohtml');
 $optioncss = GETPOST('optioncss','alpha');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index e41666cdd92..8fcacda5d44 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -51,7 +51,7 @@ $diroutputmassaction=$conf->expensereport->dir_output . '/temp/massgeneration/'.
 
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 9650aa5328b..4b117cc4a2c 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -101,7 +101,7 @@ $result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
 
 $diroutputmassaction=$conf->fournisseur->commande->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index d6af4d3b1ac..d6d0ac734a2 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -42,7 +42,7 @@ $type = GETPOST('type');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index baca7249a51..8fac1c8a388 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -68,7 +68,7 @@ $search_myfield=GETPOST('search_myfield');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 41c03756a44..93a18788f95 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
 $langs->load("stock");
 $langs->load("inventory");
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index 61f6233f32e..f3119af83c9 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -77,7 +77,7 @@ if (!$_POST) {
 
 $diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 2afa8438e73..841156ebb0d 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -77,7 +77,7 @@ if (!$_POST) {
 
 $diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 5670b62e6bd..8aa5191b176 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -38,7 +38,7 @@ $type=GETPOST("type","int");
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index de245b9b04a..1d74cf85fad 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -61,7 +61,7 @@ $search_myfield=GETPOST('search_myfield');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 74015626b9e..135517f26db 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -35,7 +35,7 @@ $ref    = GETPOST('ref','alpha');
 $socid  = GETPOST('socid','int');
 $action = GETPOST('action','alpha');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield","alpha");
 $sortorder = GETPOST("sortorder");
 $page = GETPOST("page");
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index b9da5379655..c85b96ffcf4 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -55,7 +55,7 @@ if (!$user->rights->projet->lire) accessforbidden();
 
 $diroutputmassaction=$conf->projet->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield","alpha");
 $sortorder = GETPOST("sortorder");
 $page = GETPOST("page");
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 67f745c0b57..7e809fe966f 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -85,7 +85,7 @@ if (!$user->rights->projet->lire) accessforbidden();
 
 $diroutputmassaction=$conf->projet->dir_output . '/tasks/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index ecd15a8aa3b..8aa496eaa5a 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -58,7 +58,7 @@ $socid=0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 if (!$user->rights->projet->lire) accessforbidden();
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index d157cfc99d2..f16d1ef122c 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -91,7 +91,7 @@ if (empty($sortorder)) $sortorder="ASC";
 if (empty($sortfield)) $sortfield="t.rowid";
 if (empty($arch)) $arch = 0;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $page = GETPOST("page");
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index d0eb936fcbb..dbb9e831fe9 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -50,7 +50,7 @@ $socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 3cbd8768e92..9842e913dae 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -84,7 +84,7 @@ $mode=GETPOST("mode");
 
 $diroutputmassaction=$conf->societe->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 7e7648db712..9a5405de7fd 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -44,7 +44,7 @@ $actionid=GETPOST('actionid');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 16091381e8d..d88d591a152 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -45,7 +45,7 @@ $search_group=GETPOST('search_group');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 6aaa3274b9d..1aedee87908 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -46,7 +46,7 @@ if ($user->societe_id > 0)
 $mode = GETPOST("mode", 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index e39d8153cac..5fc0af8fa14 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -44,7 +44,7 @@ $actionid=GETPOST('actionid');
 if ($user->societe_id) $id=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
-$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');

From b441c62e1d595aaa472ef8fef58a8ecb56c2c6d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Jun 2017 14:55:12 +0200
Subject: [PATCH 1043/1163] Fix syntax error

---
 htdocs/accountancy/admin/account.php          |  2 +-
 htdocs/accountancy/admin/fiscalyear.php       |  2 +-
 htdocs/accountancy/admin/importaccounts.php   |  2 +-
 htdocs/accountancy/admin/productaccount.php   |  2 +-
 htdocs/adherents/list.php                     |  2 +-
 htdocs/adherents/subscription/list.php        |  2 +-
 htdocs/adherents/type.php                     |  2 +-
 htdocs/admin/defaultvalues.php                |  2 +-
 htdocs/admin/translation.php                  |  2 +-
 htdocs/bookmarks/list.php                     |  2 +-
 htdocs/comm/action/listactions.php            |  2 +-
 htdocs/comm/mailing/cibles.php                |  2 +-
 htdocs/commande/customer.php                  |  2 +-
 htdocs/commande/list.php                      |  2 +-
 htdocs/compta/bank/index.php                  |  2 +-
 htdocs/compta/prelevement/card.php            |  2 +-
 htdocs/compta/prelevement/demandes.php        |  2 +-
 htdocs/compta/prelevement/factures.php        |  2 +-
 htdocs/compta/recap-compta.php                |  2 +-
 htdocs/compta/resultat/clientfourn.php        |  2 +-
 htdocs/contact/agenda.php                     |  2 +-
 htdocs/contact/list.php                       |  2 +-
 htdocs/contrat/list.php                       |  2 +-
 htdocs/contrat/services.php                   |  2 +-
 htdocs/cron/class/cronjob.class.php           | 72 +++++++++----------
 htdocs/cron/info.php                          |  2 +-
 htdocs/cron/list.php                          |  2 +-
 htdocs/expedition/list.php                    |  2 +-
 htdocs/expensereport/list.php                 |  2 +-
 htdocs/fourn/commande/list.php                |  2 +-
 htdocs/fourn/product/list.php                 |  2 +-
 .../modulebuilder/template/myobject_list.php  |  2 +-
 htdocs/product/inventory/list.php             |  2 +-
 htdocs/product/list-with-listview.php         |  2 +-
 htdocs/product/list.php                       |  2 +-
 htdocs/product/popuprop.php                   |  2 +-
 htdocs/product/stock/productlot_list.php      |  2 +-
 htdocs/projet/info.php                        |  2 +-
 htdocs/projet/list.php                        |  2 +-
 htdocs/projet/tasks/list.php                  |  2 +-
 htdocs/projet/tasks/time.php                  |  2 +-
 htdocs/resource/list.php                      |  2 +-
 htdocs/societe/agenda.php                     |  2 +-
 htdocs/societe/list.php                       |  2 +-
 htdocs/societe/notify/card.php                |  2 +-
 htdocs/user/group/index.php                   |  2 +-
 htdocs/user/index.php                         |  2 +-
 htdocs/user/notify/card.php                   |  2 +-
 48 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 83c844123be..e369081f7e1 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -52,7 +52,7 @@ if ($user->societe_id > 0) accessforbidden();
 if (! $user->rights->accounting->chartofaccount) accessforbidden();
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'sortorder');
 $page = GETPOST("page", 'int');
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 5eabf9eda25..bf26348b50a 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
 $action = GETPOST('action','aZ09');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 6b462928736..6ae94dc8ce2 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -39,7 +39,7 @@ $langs->load("accountancy");
 if (! $user->admin)
 	accessforbidden();
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index b6af74ec96d..33bf067fa9e 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -70,7 +70,7 @@ $accounting_product_mode = GETPOST('accounting_product_mode', 'alpha');
 $btn_changeaccount = GETPOST('changeaccount');
 $btn_changetype = GETPOST('changetype');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 3dd60ad7478..06de3e09f95 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -62,7 +62,7 @@ $optioncss = GETPOST('optioncss','alpha');
 
 if ($statut < -1) $statut = '';
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index a5066f98f0c..af3174c0b60 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -42,7 +42,7 @@ $optioncss = GETPOST('optioncss','alpha');
 
 $date_select=isset($_GET["date_select"])?$_GET["date_select"]:$_POST["date_select"];
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 1461098034e..f2fa12446b3 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -44,7 +44,7 @@ $search_email		= GETPOST('search_email','alpha');
 $type				= GETPOST('type','alpha');
 $status				= GETPOST('status','alpha');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 04a9320f4c1..bd539becb86 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -39,7 +39,7 @@ $action=GETPOST('action','alpha');
 
 $mode = GETPOST('mode')?GETPOST('mode'):'createform';   // 'createform', 'filters', 'sortorder', 'focus'
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index f48ef749b8a..0c4e40948ed 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -45,7 +45,7 @@ $transvalue=GETPOST('transvalue','alpha');
 
 $mode = GETPOST('mode')?GETPOST('mode'):'overwrite';
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 71c8174f1cd..a192076e88a 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -39,7 +39,7 @@ if (! $user->rights->bookmark->lire) {
 }
 $optioncss = GETPOST('optioncss','alpha');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 186165b2f9a..0e6fbb196a1 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -76,7 +76,7 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 	$filtert=$user->id;
 }
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 73aaab22248..6c580cc93d6 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -39,7 +39,7 @@ if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden();
 
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index cdf26b6a36d..8aa699fed71 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -45,7 +45,7 @@ accessforbidden();
 $langs->load("companies");
 $langs->load("orders");
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 2f8dfc28ae7..dbfeafc8f94 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -82,7 +82,7 @@ $result = restrictedArea($user, 'commande', $id,'');
 
 $diroutputmassaction=$conf->commande->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index f5e9d347e8c..44ecbe6eb6f 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -55,7 +55,7 @@ $result=restrictedArea($user,'banque');
 
 $diroutputmassaction=$conf->bank->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 915cf43fb79..1a0435862ea 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -48,7 +48,7 @@ $id = GETPOST('id','int');
 $socid = GETPOST('socid','int');
 
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 6e63b74a408..dd453bd7f4e 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -45,7 +45,7 @@ $page =  GETPOST('page','int');
 $sortorder = GETPOST('sortorder','alpha');
 $sortfield = GETPOST('sortfield','alpha');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 28836abe667..996a1aabe88 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -44,7 +44,7 @@ if ($user->societe_id > 0) accessforbidden();
 $prev_id = GETPOST('id','int');
 $socid = GETPOST('socid','int');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 3ddb99a4369..c3231ecccdd 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -40,7 +40,7 @@ $object = new Societe($db);
 if ($id > 0) $object->fetch($id);
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 61d18cd85cc..62ee285d70b 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -52,7 +52,7 @@ if ($user->societe_id > 0) $socid = $user->societe_id;
 if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user,'compta','','','resultat');
 if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accounting','','','comptarapport');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 96876ed561d..6c412c146d1 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -89,7 +89,7 @@ $search_agenda_label=GETPOST('search_agenda_label');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index fd48794afad..b2f8066367c 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -74,7 +74,7 @@ $optioncss = GETPOST('optioncss','alpha');
 $type=GETPOST("type");
 $view=GETPOST("view");
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 0003bdec348..11a259abce7 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -65,7 +65,7 @@ $month=GETPOST("month","int");
 
 $optioncss = GETPOST('optioncss','alpha');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 6902927a8b7..0af99eeed33 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -33,7 +33,7 @@ $langs->load("products");
 $langs->load("contracts");
 $langs->load("companies");
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 789e3bafcec..9d01ec888f0 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -109,7 +109,7 @@ class Cronjob extends CommonObject
 		if (isset($this->nbrun)) $this->nbrun=trim($this->nbrun);
 		if (isset($this->libname)) $this->libname = trim($this->libname);
 		if (isset($this->test)) $this->test = trim($this->test);
-		
+
 		// Check parameters
 		// Put here code to add a control on parameters values
 		if (dol_strlen($this->datestart)==0) {
@@ -361,15 +361,15 @@ class Cronjob extends CommonObject
 	 *  @param	int			$offset    	    page
 	 *  @param	int			$status    	    display active or not
 	 *  @param	array		$filter    	    filter output
-	 *  @param  int         $processing     Processing or not 
+	 *  @param  int         $processing     Processing or not
      *  @return int          			    <0 if KO, >0 if OK
      */
     function fetch_all($sortorder='DESC', $sortfield='t.rowid', $limit=0, $offset=0, $status=1, $filter='', $processing=-1)
     {
     	global $langs;
-    	
+
     	$this->lines=array();
-    	
+
     	$sql = "SELECT";
     	$sql.= " t.rowid,";
     	$sql.= " t.entity,";
@@ -409,7 +409,7 @@ class Cronjob extends CommonObject
     	if ($status == 2) $sql.= " AND t.status = 2";
     	//Manage filter
     	if (is_array($filter) && count($filter)>0) {
-    		foreach($filter as $key => $value) 
+    		foreach($filter as $key => $value)
     		{
     		    if ($key == 't.rowid') $sql.= ' AND '.$key.' = '.$this->db->escape($value);
    				else $sql.= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
@@ -532,7 +532,7 @@ class Cronjob extends CommonObject
 
 		if (empty($this->maxrun)) $this->maxrun=0;
         if (empty($this->processing)) $this->processing=0;
-        
+
 		// Check parameters
 		// Put here code to add a control on parameters values
 		if (dol_strlen($this->datestart)==0) {
@@ -845,8 +845,8 @@ class Cronjob extends CommonObject
 
 	/**
 	 * Run a job.
-	 * Once job is finished, status and nb of run is updated. 
-	 * This function does not plan the next run. This is done by function ->reprogram_jobs 
+	 * Once job is finished, status and nb of run is updated.
+	 * This function does not plan the next run. This is done by function ->reprogram_jobs
 	 *
 	 * @param   string		$userlogin    	User login
 	 * @return	int					 		<0 if KO, >0 if OK
@@ -861,7 +861,7 @@ class Cronjob extends CommonObject
 
 		$langs->load('cron');
 
-		if (empty($userlogin)) 
+		if (empty($userlogin))
 		{
 			$this->error="User login is mandatory";
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
@@ -948,7 +948,7 @@ class Cronjob extends CommonObject
     				$error++;
 			    }
 			}
-			
+
 			// Load langs
 			if (! $error)
 			{
@@ -963,14 +963,14 @@ class Cronjob extends CommonObject
 	                $error++;
 				}
 			}
-			
+
 			if (! $error)
 			{
 				dol_syslog(get_class($this)."::run_jobs START ".$this->objectname."->".$this->methodename."(".$this->params.");", LOG_DEBUG);
-	
+
 				// Create Object for the call module
 				$object = new $this->objectname($this->db);
-	
+
 				$params_arr = array_map('trim', explode(",",$this->params));
 				if (!is_array($params_arr))
 				{
@@ -980,7 +980,7 @@ class Cronjob extends CommonObject
 				{
 					$result = call_user_func_array(array($object, $this->methodename), $params_arr);
 				}
-			
+
 				if ($result===false || $result != 0)
 				{
 				    $langs->load("errors");
@@ -998,7 +998,7 @@ class Cronjob extends CommonObject
 					$this->lastresult=var_export($result,true);
 					$retval = $this->lastresult;
 				}
-			}		
+			}
 		}
 
 		if($this->jobtype == 'function')
@@ -1071,7 +1071,7 @@ class Cronjob extends CommonObject
 				    $this->lastoutput = '';     // Will be filled later
 				    $this->lastresult = $retval;
 				    $retval = $this->lastresult;
-				    $error++;				    
+				    $error++;
 				}
 			}
 			if ($execmethod == 2)
@@ -1102,14 +1102,14 @@ class Cronjob extends CommonObject
     				$this->lastoutput.=$val."\n";
     			}
     		}
-    		
+
     		$this->lastresult=$retval;
-		
+
     		dol_syslog(get_class($this)."::run_jobs output_arr:".var_export($output_arr,true)." lastoutput=".$this->lastoutput." lastresult=".$this->lastresult, LOG_DEBUG);
 		}
-		
+
 		dol_syslog(get_class($this)."::run_jobs now we update job to track it is finished (with success or error)");
-		
+
 		$this->datelastresult=dol_now();
 		$this->processing=0;
 		$result = $this->update($user);       // This include begin/commit
@@ -1135,19 +1135,19 @@ class Cronjob extends CommonObject
 	function reprogram_jobs($userlogin, $now)
 	{
 		dol_syslog(get_class($this)."::reprogram_jobs userlogin:$userlogin", LOG_DEBUG);
-        
+
 		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 		$user=new User($this->db);
 		$result=$user->fetch('',$userlogin);
-		if ($result<0) 
+		if ($result<0)
 		{
 			$this->error="User Error:".$user->error;
 			dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
 			return -1;
 		}
-		else 
+		else
 		{
-			if (empty($user->id)) 
+			if (empty($user->id))
 			{
 				$this->error=" User user login:".$userlogin." do not exists";
 				dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
@@ -1155,28 +1155,28 @@ class Cronjob extends CommonObject
 			}
 		}
 
-		dol_syslog(get_class($this)."::reprogram_jobs  ", LOG_DEBUG);
+		dol_syslog(get_class($this)."::reprogram_jobs datenextrun=".$this->datenextrun." ".dol_print_date($this->datenextrun, 'dayhourrfc')." frequency=".$this->frequency." unitfrequency=".$this->unitfrequency, LOG_DEBUG);
 
-		
-		if (empty($this->datenextrun)) 
+		if (empty($this->datenextrun))
 		{
 			if (empty($this->datestart)) $this->datenextrun = $now + ($this->frequency * $this->unitfrequency);
 			else $this->datenextrun = $this->datestart + ($this->frequency * $this->unitfrequency);
 		}
 
-		if ($this->datenextrun < $now && $this->frequency > 0 && $this->unitfrequency > 0) 
+		if ($this->datenextrun < $now && $this->frequency > 0 && $this->unitfrequency > 0)
 		{
 		    // Loop until date is after future
 		    while ($this->datenextrun < $now)
 		    {
 		        $this->datenextrun += ($this->frequency * $this->unitfrequency);
-		        
+
 		        // TODO For exact frequency (every month, every year, ...), use instead a dol_time_plus_duree($time, $duration_value, $duration_unit)
 		    }
 		}
-		else 
+		else
 		{
 			//$this->datenextrun=$this->datenextrun + ($this->frequency * $this->unitfrequency);
+		    dol_syslog(get_class($this)."::reprogram_jobs datenextrun is already in future, we do not change it");
 		}
 
 
@@ -1190,9 +1190,9 @@ class Cronjob extends CommonObject
 		        dol_syslog(get_class($this)."::reprogram_jobs Job will be set to archived", LOG_ERR);
 		    }
 		}
-		
+
 		$result = $this->update($user);
-		if ($result<0) 
+		if ($result<0)
 		{
 			dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
 			return -1;
@@ -1200,7 +1200,7 @@ class Cronjob extends CommonObject
 
 		return 1;
 	}
-	
+
 	/**
 	 *  Return label of status of user (active, inactive)
 	 *
@@ -1211,7 +1211,7 @@ class Cronjob extends CommonObject
 	{
 	    return $this->LibStatut($this->status,$mode);
 	}
-	
+
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -1223,7 +1223,7 @@ class Cronjob extends CommonObject
 	{
 	    global $langs;
 	    $langs->load('users');
-	
+
 	    if ($mode == 0)
 	    {
 	        $prefix='';
@@ -1255,7 +1255,7 @@ class Cronjob extends CommonObject
 	        if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4','class="pictostatus"');
 	        if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5','class="pictostatus"');
 	    }
-	}	
+	}
 }
 
 
diff --git a/htdocs/cron/info.php b/htdocs/cron/info.php
index 334a5da6890..18ab50adeaa 100644
--- a/htdocs/cron/info.php
+++ b/htdocs/cron/info.php
@@ -48,7 +48,7 @@ $object->info($id);
 
 $head = cron_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("CronTask"), 0, 'cron');
+dol_fiche_head($head, 'info', $langs->trans("CronTask"), -1, 'cron');
 
 print '<table width="100%"><tr><td>';
 dol_print_object_info($object);
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 12c92e9bdd3..3b830e4801f 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -39,7 +39,7 @@ $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
 $id=GETPOST('id','int');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 517a231fdb9..091b5e44bb8 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -53,7 +53,7 @@ $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
 $sall = GETPOST('sall', 'alphanohtml');
 $optioncss = GETPOST('optioncss','alpha');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 8fcacda5d44..9cf47ddea94 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -51,7 +51,7 @@ $diroutputmassaction=$conf->expensereport->dir_output . '/temp/massgeneration/'.
 
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 4b117cc4a2c..86fb7e5c4f5 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -101,7 +101,7 @@ $result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
 
 $diroutputmassaction=$conf->fournisseur->commande->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index d6d0ac734a2..00e2dbf939d 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -42,7 +42,7 @@ $type = GETPOST('type');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 8fac1c8a388..ef3cb110224 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -68,7 +68,7 @@ $search_myfield=GETPOST('search_myfield');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 93a18788f95..c8d570a6fd7 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
 $langs->load("stock");
 $langs->load("inventory");
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index f3119af83c9..947cfaecbc2 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -77,7 +77,7 @@ if (!$_POST) {
 
 $diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 841156ebb0d..4cd986de291 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -77,7 +77,7 @@ if (!$_POST) {
 
 $diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 8aa5191b176..21491eab512 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -38,7 +38,7 @@ $type=GETPOST("type","int");
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 1d74cf85fad..61e9438c929 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -61,7 +61,7 @@ $search_myfield=GETPOST('search_myfield');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 135517f26db..05c31287745 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -35,7 +35,7 @@ $ref    = GETPOST('ref','alpha');
 $socid  = GETPOST('socid','int');
 $action = GETPOST('action','alpha');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield","alpha");
 $sortorder = GETPOST("sortorder");
 $page = GETPOST("page");
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index c85b96ffcf4..827719148fe 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -55,7 +55,7 @@ if (!$user->rights->projet->lire) accessforbidden();
 
 $diroutputmassaction=$conf->projet->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield","alpha");
 $sortorder = GETPOST("sortorder");
 $page = GETPOST("page");
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 7e809fe966f..18f133513b1 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -85,7 +85,7 @@ if (!$user->rights->projet->lire) accessforbidden();
 
 $diroutputmassaction=$conf->projet->dir_output . '/tasks/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 8aa496eaa5a..08eb429f664 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -58,7 +58,7 @@ $socid=0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 if (!$user->rights->projet->lire) accessforbidden();
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index f16d1ef122c..5ec9eabbfb1 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -91,7 +91,7 @@ if (empty($sortorder)) $sortorder="ASC";
 if (empty($sortfield)) $sortfield="t.rowid";
 if (empty($arch)) $arch = 0;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $page = GETPOST("page");
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index dbb9e831fe9..15ea29e9954 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -50,7 +50,7 @@ $socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 9842e913dae..422768bce31 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -84,7 +84,7 @@ $mode=GETPOST("mode");
 
 $diroutputmassaction=$conf->societe->dir_output . '/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 9a5405de7fd..eacd047d93a 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -44,7 +44,7 @@ $actionid=GETPOST('actionid');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index d88d591a152..06e11caced9 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -45,7 +45,7 @@ $search_group=GETPOST('search_group');
 $optioncss = GETPOST('optioncss','alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 1aedee87908..da5ddd99339 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -46,7 +46,7 @@ if ($user->societe_id > 0)
 $mode = GETPOST("mode", 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 5fc0af8fa14..b803fd93f7b 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -44,7 +44,7 @@ $actionid=GETPOST('actionid');
 if ($user->societe_id) $id=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');

From 9b3b2e600f80823e222ce6e60f4952f5ea1dd848 Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 8 Jun 2017 17:52:02 +0200
Subject: [PATCH 1044/1163] init blockedlog trigger and hash store

---
 htdocs/core/class/blockedlog.class.php        | 235 ++++++++++++++++++
 ..._modBlockedlog_ActionsBlockedLog.class.php |  78 ++++++
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  18 ++
 3 files changed, 331 insertions(+)
 create mode 100644 htdocs/core/class/blockedlog.class.php
 create mode 100644 htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

diff --git a/htdocs/core/class/blockedlog.class.php b/htdocs/core/class/blockedlog.class.php
new file mode 100644
index 00000000000..3e622c42dc4
--- /dev/null
+++ b/htdocs/core/class/blockedlog.class.php
@@ -0,0 +1,235 @@
+<?php 
+
+class BlockedLog {
+	
+	public $signature = '';
+	
+	public $key_value1 = null;
+	
+	public $action = '';
+	
+	public $element = '';
+	
+	public $fk_object = 0;
+	
+	public $certified = false;
+	
+	public $fk_user = 0;
+	
+	function __construct(&$db) {
+		
+		$this->db =&$db;
+		
+	}
+	
+	public function create($user) {
+		
+		global $conf,$langs,$hookmanager;
+		
+		$langs->load('blockedlog');
+		
+		$error=0;
+		
+		dol_syslog(get_class($this).'::create', LOG_DEBUG);
+		
+		// Clean parameters
+		$this->signature = $this->getSignatureRecursive();
+		
+		
+		if (is_null($this->key_value1))
+		{
+			$this->error=$langs->trans("BlockLogNeedKey1Value");
+			dol_syslog($this->error, LOG_WARNING);
+			return -1;
+		}
+		
+		if(empty($this->element)) {
+			$this->error=$langs->trans("BlockLogNeedElement");
+			dol_syslog($this->error, LOG_WARNING);
+			return -2;
+		}
+		
+		if(empty($this->action)) {
+			$this->error=$langs->trans("BlockLogNeedAction");
+			dol_syslog($this->error, LOG_WARNING);
+			return -3;
+		}
+
+		$this->fk_user = $user->id;
+		
+		$this->db->begin();
+		
+		//TODO add fk_user;
+		
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."blockedlog (";
+		$sql.= "action,";
+		$sql.= " key_value1,";
+		$sql.= " signature,";
+		$sql.= " element,";
+		$sql.= " fk_object,";
+		$sql.= " certified,";
+		$sql.= " entity";
+		$sql.= ") VALUES (";
+		$sql.= "'".$this->db->escape($this->action)."',";
+		$sql.= "".$this->key_value1.",";
+		$sql.= "'".$this->db->escape($this->signature)."',";
+		$sql.= "'".$this->db->escape($this->element)."',";
+		$sql.= "".$this->fk_object.",";
+		$sql.= "'".($this->certified ? 1 : 0)."',";
+		$sql.= $conf->entity;
+		$sql.= ")";
+		
+		$res = $this->db->query($sql);
+		if ($res)
+		{
+			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."blockedlog");
+			
+			if ($id > 0)
+			{
+				$this->id = $id;
+			
+			}
+			else
+			{
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+		
+	}
+	
+	private function crypt($value) {
+		
+		return md5($value);
+		
+	}
+	
+	public function checkSignature() {
+		
+		$signature = $this->getSignatureRecursive();
+		
+		return ($signature === $this->signature);
+		
+	}
+	
+	private function getSignatureRecursive(){
+		
+		$signature = $this->crypt( $this->action . $this->getSignature() . $this->key_value1  );
+		
+		$logs = $this->getLog('payment', 0, 0, 'ASC') ;
+		if($logs!==false) {
+			foreach($logs as &$b) {
+			
+				if($this->id>0 && $b->id == $this->id) break; // on arrête sur un enregistrement précis pour recalculer une signature
+				
+				$b->updateValue(); // on récupère la valeur actuelle en base de l'élément enregistré
+				
+				$signature = $this->crypt($signature. $this->action . $b->signature . $b->key_value1);
+			}
+		}
+		return $signature;
+	
+	}
+	
+	public function getLog($element, $fk_object, $limit = 0, $order = 'DESC') {
+		global $conf,$cachedlogs ; 
+		
+		if(empty($cachedlogs)) $cachedlogs=array();
+	
+		
+		if($element=='payment') {
+		
+	 		$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE entity=".$conf->entity." AND  action LIKE '%PAYMENT%'
+	         ORDER BY tms ".$order;
+			
+		}
+		else if($element=='payments_not_certified') {
+			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE entity=".$conf->entity." AND action LIKE '%PAYMENT%' AND certified = 0
+	         ORDER BY tms ".$order;
+			
+		}
+		else if($element=='payments_just_certified') {
+			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE entity=".$conf->entity." AND action LIKE '%PAYMENT%' AND certified = 1
+	         ORDER BY tms ".$order;
+			
+		}
+		else{
+			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE element='".$element."' AND fk_object=".(int)$fk_object."
+	         ORDER BY tms ".$order;
+			
+		}
+		
+		
+		if($limit > 0 )$sql.=' LIMIT '.$limit;
+		
+		$res = $this->db->query($sql);
+		
+		if($res) {
+		
+			$results=array();
+			
+			while($obj = $this->db->fetch_object($res)) {
+				
+				if(!isset($cachedlogs[$obj->rowid])) {
+					$b=new BlockedLog($this->db);
+					$b->fetch($obj->rowid);
+					
+					$cachedlogs[$obj->rowid] = $b;
+				}
+				
+				$results[] = $cachedlogs[$obj->rowid];
+				
+			}
+			
+			return $results;
+		}
+		else{
+			return false;
+		}
+	}
+	
+	private function updateValue() {
+		
+		if($this->action === 'PAYMENT_CUSTOMER_CREATE'
+		|| $this->action === 'PAYMENT_ADD_TO_BANK') {
+			$sql="SELECT amount FROM ".MAIN_DB_PREFIX."paiement WHERE rowid=".$this->fk_object;
+					
+			$res = $this->db->query($sql);
+			
+			if($res && $obj = $db->fetch_object($res)) {
+				$this->key_value1 = (double)$obj->amount;
+			}
+		}
+				
+	}
+	
+	
+	public function getSignature() {
+		global $db,$conf,$mysoc;
+		
+		if(empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint
+			
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+			
+			$fingerprint = $this->crypt(print_r($mysoc,true).time().rand(0,1000));
+			
+			dolibarr_set_const($db, 'BLOCKEDLOG_ENTITY_FINGERPRINT', $fingerprint, '',0,'Numeric Unique Fingerprint', $conf->entity);
+			
+			$conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT= $fingerprint;
+		}
+		
+		return $conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT;
+	}
+	
+}
+
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
new file mode 100644
index 00000000000..3307e4216ea
--- /dev/null
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -0,0 +1,78 @@
+<?php
+/* Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2011 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2011-2014 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2013	   Cedric GROSS         <c.gross@kreiz-it.fr>
+ * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2015       Bahfir Abbes        <bafbes@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+ *  \ingroup    agenda
+ *  \brief      Trigger file for agenda module
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/blockedlog.class.php';
+
+/**
+ *  Class of triggered functions for agenda module
+ */
+class InterfaceActionsBlockedLog extends DolibarrTriggers
+{
+	public $family = 'system';
+	public $description = "Triggers of this module add blocklog.";
+	public $version = self::VERSION_DOLIBARR;
+	public $picto = 'system';
+
+	/**
+	 * Function called on Dolibarrr payment or invoice event.
+	 *
+	 * @param string		$action		Event action code
+	 * @param Object		$object     Object
+	 * @param User		    $user       Object user
+	 * @param Translate 	$langs      Object langs
+	 * @param conf		    $conf       Object conf
+	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+	{
+		// Do not log events not enabled for this action
+		if (empty($conf->blockedlog->enabled)) {
+			return 0;
+		}
+		
+		$b=new BlockedLog($this->db);
+		$b->element = $object->element;
+		$b->action = $action;
+		$b->fk_object = $object->id;
+		$b->key_value1 = 0;
+		
+		$res = $b->create($user);
+		if($res<0) {
+			setEventMessage($b->error,'errors');
+			
+			return -1;
+		}
+		else {
+			return 1;
+		}
+		
+		
+    }
+
+}
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 85b9d3106cf..786becac0ba 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -395,3 +395,21 @@ ALTER TABLE llx_usergroup_rights DROP INDEX fk_usergroup;
 ALTER TABLE llx_usergroup_rights ADD UNIQUE INDEX uk_usergroup_rights (entity, fk_usergroup, fk_id);
 ALTER TABLE llx_usergroup_rights ADD CONSTRAINT fk_usergroup_rights_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid);
 
+CREATE TABLE llx_blockedlog 
+( 
+	rowid integer AUTO_INCREMENT, 
+	tms	timestamp,
+	action varchar(50), 
+	key_value1 real NOT NULL, 
+	signature varchar(32) NOT NULL, 
+	element varchar(50), 
+	fk_object integer, 
+	entity integer, 
+	certified integer, 
+	PRIMARY KEY (rowid), 
+	KEY signature (signature), 
+	KEY fk_object_element (fk_object,element), 
+	KEY entity (entity), 
+	KEY entity_action (entity,action), 
+	KEY entity_action_certified (entity,action,certified) 
+) 

From 75624376a525a4e819c62e2adb42da9726fd7bc3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 00:27:19 +0200
Subject: [PATCH 1045/1163] FIX Warnings

---
 htdocs/core/lib/files.lib.php  | 10 +++++-----
 htdocs/core/lib/images.lib.php |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 3fa17aa8bcf..06df150d983 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -72,11 +72,11 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 	$reshook = 0;
 	$file_list = array();
 
-	$hookmanager->resArray=array();
-
-	if (! $nohook)
+	if (is_object($hookmanager) && ! $nohook)
 	{
-		$hookmanager->initHooks(array('fileslib'));
+	    $hookmanager->resArray=array();
+
+	    $hookmanager->initHooks(array('fileslib'));
 
 		$parameters=array(
 				'path' => $newpath,
@@ -197,7 +197,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 		}
 	}
 
-	$file_list = array_merge($file_list, $hookmanager->resArray);
+	if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);
 
 	return $file_list;
 }
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index acfa917720e..d9d7d0d9730 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -38,7 +38,7 @@ $quality = 80;
 function image_format_supported($file)
 {
     $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm';   // See also into product.class.php
-    
+
     // Case filename is not a format image
     if (! preg_match('/('.$regeximgext.')$/i',$file,$reg)) return -1;
 
@@ -90,7 +90,7 @@ function dol_getImageSize($file, $url = false)
     	$ret['width']=$infoImg[0]; // Largeur de l'image
     	$ret['height']=$infoImg[1]; // Hauteur de l'image
 	}
-	
+
 	return $ret;
 }
 
@@ -438,6 +438,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
 	dol_mkdir($dirthumb);
 
 	// Initialisation des variables selon l'extension de l'image
+	$img=null;
 	switch($infoImg[2])
 	{
 		case IMAGETYPE_GIF:	    // 1

From 811b0d9af44158f0aac7aaeacfa0c7183c425d4f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 00:27:44 +0200
Subject: [PATCH 1046/1163] Fix missing thumbs images for products

---
 htdocs/install/repair.php | 121 ++++++++++++++++++++++++++++----------
 1 file changed, 90 insertions(+), 31 deletions(-)

diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index a70553cbfb0..bab7b5e5da4 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -26,6 +26,7 @@
 include_once 'inc.php';
 if (file_exists($conffile)) include_once $conffile;
 require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
+include_once $dolibarr_main_document_root.'/core/lib/images.lib.php';
 require_once $dolibarr_main_document_root.'/core/class/extrafields.class.php';
 require_once 'lib/repair.lib.php';
 
@@ -72,11 +73,12 @@ $actiondone=1;
 
 print '<h3>'.$langs->trans("Repair").'</h3>';
 
-print 'Option restore_thirdparties_logos is '.(GETPOST('restore_thirdparties_logos')?GETPOST('restore_thirdparties_logos'):'0').'<br>'."\n";
-print 'Option clean_linked_elements is '.(GETPOST('clean_linked_elements')?GETPOST('clean_linked_elements'):'0').'<br>'."\n";
-print 'Option clean_orphelin_dir (0 or \'test\' or \'confirmed\') is '.(GETPOST('clean_orphelin_dir')?GETPOST('clean_orphelin_dir'):'0').'<br>'."\n";
-print 'Option clean_product_stock_batch (0 or \'test\' or \'confirmed\') is '.(GETPOST('clean_product_stock_batch')?GETPOST('clean_product_stock_batch'):'0').'<br>'."\n";
-print 'Option set_empty_time_spent_amount (0 or \'test\' or \'confirmed\') is '.(GETPOST('set_empty_time_spent_amount')?GETPOST('set_empty_time_spent_amount'):'0').'<br>'."\n";
+print 'Option restore_thirdparties_logos is '.(GETPOST('restore_thirdparties_logos','alpha')?GETPOST('restore_thirdparties_logos','alpha'):'0').'<br>'."\n";
+print 'Option clean_linked_elements is '.(GETPOST('clean_linked_elements','alpha')?GETPOST('clean_linked_elements','alpha'):'0').'<br>'."\n";
+print 'Option clean_orphelin_dir (0 or \'test\' or \'confirmed\') is '.(GETPOST('clean_orphelin_dir','alpha')?GETPOST('clean_orphelin_dir','alpha'):'0').'<br>'."\n";
+print 'Option clean_product_stock_batch (0 or \'test\' or \'confirmed\') is '.(GETPOST('clean_product_stock_batch','alpha')?GETPOST('clean_product_stock_batch','alpha'):'0').'<br>'."\n";
+print 'Option set_empty_time_spent_amount (0 or \'test\' or \'confirmed\') is '.(GETPOST('set_empty_time_spent_amount','alpha')?GETPOST('set_empty_time_spent_amount','alpha'):'0').'<br>'."\n";
+print 'Option rebuild_product_thumbs (0 or \'test\' or \'confirmed\') is '.(GETPOST('rebuild_product_thumbs','alpha')?GETPOST('rebuild_product_thumbs','alpha'):'0').'<br>'."\n";
 print '<br>';
 
 print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
@@ -253,7 +255,7 @@ if ($ok)
 	            {
 	                print 'Found field '.$code.' declared into '.MAIN_DB_PREFIX.'extrafields table but not found into desc of table '.$tableextra." -> ";
 	                $type=$extrafields->attribute_type[$code]; $length=$extrafields->attribute_size[$code]; $attribute=''; $default=''; $extra=''; $null='null';
-	                
+
            			if ($type=='boolean') {
         				$typedb='int';
         				$lengthdb='1';
@@ -276,7 +278,7 @@ if ($ok)
         				$typedb=$type;
         				$lengthdb=$length;
         			}
-	                
+
 	                $field_desc=array(
 	                	'type'=>$typedb,
 	                	'value'=>$lengthdb,
@@ -318,13 +320,13 @@ if ($ok)
 
 
 
-// clean_linked_elements: Check and clean linked elements
+// restore_thirdparties_logos: Move logos to correct new directory.
 if ($ok && GETPOST('restore_thirdparties_logos'))
 {
 	//$exts=array('gif','png','jpg');
 
 	$ext='';
-	
+
 	print '<tr><td colspan="2"><br>*** Restore thirdparties logo<br>';
 	//foreach($exts as $ext)
 	//{
@@ -393,8 +395,66 @@ if ($ok && GETPOST('restore_thirdparties_logos'))
 }
 
 
+// rebuild_product_thumbs: Rebuild thumbs for product files
+if ($ok && GETPOST('rebuild_product_thumbs','alpha'))
+{
+    $ext='';
+    global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
+
+    print '<tr><td colspan="2"><br>*** Rebuild product thumbs<br>';
+
+    $sql="SELECT s.rowid, s.ref FROM ".MAIN_DB_PREFIX."product as s ORDER BY s.ref";
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num=$db->num_rows($resql);
+        $i=0;
+
+        while($i < $num)
+        {
+            $obj=$db->fetch_object($resql);
+
+            if (! empty($obj->ref))
+            {
+                $files=dol_dir_list($dolibarr_main_data_root.'/produit/'.$obj->ref, 'files', 0);
+                foreach($files as $file)
+                {
+					// Generate thumbs.
+					if (image_format_supported($file['fullname']) == 1)
+					{
+					    $imgThumbSmall='notbuild';
+                        if (GETPOST('rebuild_product_thumbs','alpha') == 'confirmed')
+                        {
+                            // Used on logon for example
+                            $imgThumbSmall = vignette($file['fullname'], $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
+                        }
+					    print 'Check product '.$obj->rowid.", file ".$file['fullname']." -> ".$imgThumbSmall." maxwidthsmall=".$maxwidthsmall." maxheightsmall=".$maxheightsmall."<br>\n";
+					    $imgThumbMini='notbuild';
+                        if (GETPOST('rebuild_product_thumbs','alpha') == 'confirmed')
+                        {
+                            // Create mini thumbs for image (Ratio is near 16/9)
+                            // Used on menu or for setup page for example
+                            $imgThumbMini = vignette($file['fullname'], $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
+                        }
+					    print 'Check product '.$obj->rowid.", file ".$file['fullname']." -> ".$imgThumbMini." maxwidthmini=".$maxwidthmini." maxheightmini=".$maxheightmini."<br>\n";
+					}
+                }
+            }
+
+            $i++;
+        }
+    }
+    else
+    {
+        $ok=0;
+        dol_print_error($db);
+    }
+
+    print '</td></tr>';
+}
+
 // clean_linked_elements: Check and clean linked elements
-if ($ok && GETPOST('clean_linked_elements'))
+if ($ok && GETPOST('clean_linked_elements','alpha'))
 {
     print '<tr><td colspan="2"><br>*** Check table of linked elements and delete orphelins links</td></tr>';
 	// propal => order
@@ -418,7 +478,7 @@ if ($ok && GETPOST('clean_linked_elements'))
 
 
 // clean_orphelin_dir: Run purge of directory
-if ($ok && GETPOST('clean_orphelin_dir'))
+if ($ok && GETPOST('clean_orphelin_dir','alpha'))
 {
     $conf->setValues($db);
 
@@ -530,7 +590,7 @@ if ($ok && GETPOST('clean_orphelin_dir'))
                         // Clean of orphelins directories are done into repair.php
                         print '<tr><td colspan="2">';
                         print 'Delete orphelins file '.$file['fullname'].'<br>';
-                        if (GETPOST('clean_orphelin_dir') == 'confirmed')
+                        if (GETPOST('clean_orphelin_dir','alpha') == 'confirmed')
                         {
                             dol_delete_file($file['fullname'],1,1,1);
                             dol_delete_dir(dirname($file['fullname']),1);
@@ -545,12 +605,12 @@ if ($ok && GETPOST('clean_orphelin_dir'))
 }
 
 // clean_linked_elements: Check and clean linked elements
-if ($ok && GETPOST('clean_product_stock_batch'))
+if ($ok && GETPOST('clean_product_stock_batch','alpha'))
 {
-    $methodtofix=GETPOST('methodtofix')?GETPOST('methodtofix'):'updatestock';
-    
+    $methodtofix=GETPOST('methodtofix','alpha')?GETPOST('methodtofix','alpha'):'updatestock';
+
     print '<tr><td colspan="2"><br>*** Clean table product_batch, methodtofix='.$methodtofix.' (possible values: updatestock or updatebatch)</td></tr>';
-    
+
     $sql ="SELECT p.rowid, p.ref, p.tobatch, ps.rowid as psrowid, ps.fk_entrepot, ps.reel, SUM(pb.qty) as reelbatch";
     $sql.=" FROM ".MAIN_DB_PREFIX."product as p, ".MAIN_DB_PREFIX."product_stock as ps LEFT JOIN ".MAIN_DB_PREFIX."product_batch as pb ON ps.rowid = pb.fk_product_stock";
     $sql.=" WHERE p.rowid = ps.fk_product";
@@ -562,7 +622,7 @@ if ($ok && GETPOST('clean_product_stock_batch'))
     if ($resql)
     {
         $num = $db->num_rows($resql);
-        
+
         if ($num)
         {
             $i = 0;
@@ -570,7 +630,7 @@ if ($ok && GETPOST('clean_product_stock_batch'))
             {
                 $obj=$db->fetch_object($resql);
                 print '<tr><td>Product '.$obj->rowid.'-'.$obj->ref.' in warehose '.$obj->fk_entrepot.' -> '.$obj->psrowid.': '.$obj->reel.' (product_stock.reel) != '.($obj->reelbatch?$obj->reelbatch:'0').' (sum product_batch)';
-                
+
                 // Fix
                 if ($obj->reel != $obj->reelbatch)
                 {
@@ -599,9 +659,9 @@ if ($ok && GETPOST('clean_product_stock_batch'))
                         if (GETPOST('clean_product_stock_batch') == 'confirmed')
                         {
                             $error=0;
-                            
+
                             $db->begin();
-                            
+
                             $sql2 ="UPDATE ".MAIN_DB_PREFIX."product_stock";
                             $sql2.=" SET reel = ".($obj->reelbatch?$obj->reelbatch:'0')." WHERE rowid = ".$obj->psrowid;
                             $resql2=$db->query($sql2);
@@ -610,26 +670,26 @@ if ($ok && GETPOST('clean_product_stock_batch'))
                                 // We update product_stock, so we must field stock into product too.
                                 $sql3='UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps WHERE ps.fk_product = p.rowid)';
                                 $resql3=$db->query($sql3);
-                                if (! $resql3) 
+                                if (! $resql3)
                                 {
                                     $error++;
                                     dol_print_error($db);
                                 }
                             }
-                            else 
+                            else
                             {
                                 $error++;
                                 dol_print_error($db);
                             }
-                            
+
                             if (!$error) $db->commit();
                             else $db->rollback();
                         }
                     }
                 }
-                
+
                 print'</td></tr>';
-            
+
                 $i++;
             }
         }
@@ -646,7 +706,7 @@ if ($ok && GETPOST('clean_product_stock_batch'))
 
 
 // clean_linked_elements: Check and clean linked elements
-if ($ok && GETPOST('clean_product_stock_negative_if_batch'))
+if ($ok && GETPOST('clean_product_stock_negative_if_batch','alpha'))
 {
     print '<tr><td colspan="2"><br>Clean table product_batch, methodtofix='.$methodtofix.' (possible values: updatestock or updatebatch)</td></tr>';
 
@@ -675,7 +735,7 @@ if ($ok && GETPOST('clean_product_stock_negative_if_batch'))
 }
 
 // clean_linked_elements: Check and clean linked elements
-if ($ok && GETPOST('set_empty_time_spent_amount'))
+if ($ok && GETPOST('set_empty_time_spent_amount','alpha'))
 {
     print '<tr><td colspan="2"><br>*** Set value of time spent without amount</td></tr>';
 
@@ -684,7 +744,7 @@ if ($ok && GETPOST('set_empty_time_spent_amount'))
     $sql.=" WHERE ptt.fk_user = u.rowid";
     $sql.=" AND ptt.thm IS NULL and u.thm > 0";
     $sql.=" GROUP BY u.rowid, u.login, u.thm";
-    
+
     $resql = $db->query($sql);
     if ($resql)
     {
@@ -711,14 +771,14 @@ if ($ok && GETPOST('set_empty_time_spent_amount'))
                         dol_print_error($db);
                     }
                 }
-                
+
                 if (!$error) $db->commit();
                 else $db->rollback();
 
                 print'</td></tr>';
 
                 if ($error) break;
-                
+
                 $i++;
             }
         }
@@ -732,7 +792,6 @@ if ($ok && GETPOST('set_empty_time_spent_amount'))
         dol_print_error($db);
     }
 
-
 }
 
 

From b92980c6ff71c83252a65a16a5b13e75b982435b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 10:38:06 +0200
Subject: [PATCH 1047/1163] Fix statistics on products

---
 htdocs/langs/en_US/products.lang |  8 ++++---
 htdocs/product/index.php         | 38 +++++++++++++++++++-------------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 0ab21cae322..ae9cd743c8f 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -25,11 +25,13 @@ ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
-ProductsOnSell=Product for sale or for purchase
+ProductsOnSaleOnly=Products for sale only
+ProductsOnPurchaseOnly=Product for purchase only
 ProductsNotOnSell=Product not for sale and not for purchase
 ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services not for sale
+ServicesOnSaleOnly=Services for sale only
+ServicesOnPurchaseOnly=Services for purchase only
+ServicesNotOnSell=Services not for sale and not for purchase
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 LastModifiedProductsAndServices=Latest %s modified products/services
 LastRecordedProducts=Latest %s recorded products
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 49a80859bd9..a09a8069b9e 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -84,7 +84,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     {
     	$listofsearchfields['search_product']=array('text'=>'ProductOrService');
     }
-    
+
     if (count($listofsearchfields))
     {
     	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
@@ -100,7 +100,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     		print '</tr>';
     		$i++;
     	}
-    	print '</table>';	
+    	print '</table>';
     	print '</form>';
     	print '<br>';
     }
@@ -111,7 +111,8 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
  * Number of products and/or services
  */
 $prodser = array();
-$prodser[0][0]=$prodser[0][1]=$prodser[1][0]=$prodser[1][1]=0;
+$prodser[0][0]=$prodser[0][1]=$prodser[0][2]=$prodser[0][3]=0;
+$prodser[1][0]=$prodser[1][1]=$prodser[1][2]=$prodser[1][3]=0;
 
 $sql = "SELECT COUNT(p.rowid) as total, p.fk_product_type, p.tosell, p.tobuy";
 $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
@@ -120,9 +121,10 @@ $sql.= " GROUP BY p.fk_product_type, p.tosell, p.tobuy";
 $result = $db->query($sql);
 while ($objp = $db->fetch_object($result))
 {
-	$status=2;
-	if (! $objp->tosell && ! $objp->tobuy) $status=0;	// To sell OR to buy
-	if ((! $objp->tosell && $objp->tobuy) || ($objp->tosell && ! $objp->tobuy)) $status=1;
+	$status=3;
+	if (! $objp->tosell && ! $objp->tobuy) $status=0;	// Not on sale, not on purchase
+	if ($objp->tosell && ! $objp->tobuy) $status=1;     // On sale only
+	if (! $objp->tosell && $objp->tobuy) $status=2;     // On purchase only
 	$prodser[$objp->fk_product_type][$status]=$objp->total;
 }
 
@@ -134,10 +136,13 @@ if (! empty($conf->product->enabled))
 	$statProducts.= '<td><a href="list.php?type=0&amp;tosell=0&amp;tobuy=0">'.$langs->trans("ProductsNotOnSell").'</a></td><td align="right">'.round($prodser[0][0]).'</td>';
 	$statProducts.= "</tr>";
 	$statProducts.= '<tr class="oddeven">';
-	$statProducts.= '<td><a href="list.php?type=0">'.$langs->trans("ProductsOnSell").'</a></td><td align="right">'.round($prodser[0][1]).'</td>';
+	$statProducts.= '<td><a href="list.php?type=0">'.$langs->trans("ProductsOnSaleOnly").'</a></td><td align="right">'.round($prodser[0][1]).'</td>';
 	$statProducts.= "</tr>";
 	$statProducts.= '<tr class="oddeven">';
-	$statProducts.= '<td><a href="list.php?type=0&amp;tosell=1&amp;tobuy=1">'.$langs->trans("ProductsOnSellAndOnBuy").'</a></td><td align="right">'.round($prodser[0][2]).'</td>';
+	$statProducts.= '<td><a href="list.php?type=0">'.$langs->trans("ProductsOnPurchaseOnly").'</a></td><td align="right">'.round($prodser[0][2]).'</td>';
+	$statProducts.= "</tr>";
+	$statProducts.= '<tr class="oddeven">';
+	$statProducts.= '<td><a href="list.php?type=0&amp;tosell=1&amp;tobuy=1">'.$langs->trans("ProductsOnSellAndOnBuy").'</a></td><td align="right">'.round($prodser[0][3]).'</td>';
 	$statProducts.= "</tr>";
 
 }
@@ -147,10 +152,13 @@ if (! empty($conf->service->enabled))
 	$statServices.= '<td><a href="list.php?type=1&amp;tosell=0&amp;tobuy=0">'.$langs->trans("ServicesNotOnSell").'</a></td><td align="right">'.round($prodser[1][0]).'</td>';
 	$statServices.= "</tr>";
 	$statServices.= '<tr class="oddeven">';
-	$statServices.= '<td><a href="list.php?type=1">'.$langs->trans("ServicesOnSell").'</a></td><td align="right">'.round($prodser[1][1]).'</td>';
+	$statServices.= '<td><a href="list.php?type=1">'.$langs->trans("ServicesOnSaleOnly").'</a></td><td align="right">'.round($prodser[1][1]).'</td>';
 	$statServices.= "</tr>";
 	$statServices.= '<tr class="oddeven">';
-	$statServices.= '<td><a href="list.php?type=1&amp;tosell=1&amp;tobuy=1">'.$langs->trans("ServicesOnSellAndOnBuy").'</a></td><td align="right">'.round($prodser[1][2]).'</td>';
+	$statServices.= '<td><a href="list.php?type=1">'.$langs->trans("ServicesOnPurchaseOnly").'</a></td><td align="right">'.round($prodser[1][2]).'</td>';
+	$statServices.= "</tr>";
+	$statServices.= '<tr class="oddeven">';
+	$statServices.= '<td><a href="list.php?type=1&amp;tosell=1&amp;tobuy=1">'.$langs->trans("ServicesOnSellAndOnBuy").'</a></td><td align="right">'.round($prodser[1][3]).'</td>';
 	$statServices.= "</tr>";
 
 }
@@ -220,7 +228,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($result);
-				
+
 				print '<tr $bc[$var]><td>'.$obj->label.'</td><td>'.$obj->nb.'</td></tr>';
 				$total+=$obj->nb;
 				$i++;
@@ -292,7 +300,7 @@ if ($result)
 				}
 			}
 
-			
+
 			print '<tr class="oddeven">';
 			print '<td class="nowrap">';
 			$product_static->id=$objp->rowid;
@@ -419,7 +427,7 @@ function activitytrim($product_type)
 		$i = 0;
 
 		$var=true;
-		
+
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($result);
@@ -427,7 +435,7 @@ function activitytrim($product_type)
 			{
 				if ($trim1+$trim2+$trim3+$trim4 > 0)
 				{
-				    
+
 					print '<tr class="oddeven"><td align=left>'.$tmpyear.'</td>';
 					print '<td align=right>'.price($trim1).'</td>';
 					print '<td align=right>'.price($trim2).'</td>';
@@ -461,7 +469,7 @@ function activitytrim($product_type)
 		}
 		if ($trim1+$trim2+$trim3+$trim4 > 0)
 		{
-		    
+
 			print '<tr class="oddeven"><td align=left>'.$tmpyear.'</td>';
 			print '<td align=right>'.price($trim1).'</td>';
 			print '<td align=right>'.price($trim2).'</td>';

From 0f80ee757f6c6dfec4de05febc7d23809801376c Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 9 Jun 2017 16:37:05 +0200
Subject: [PATCH 1048/1163] Fix can not update extrafields values

---
 htdocs/comm/card.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index f9d9309a755..61fcc4dc502 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -175,6 +175,21 @@ if (empty($reshook))
 		$result=$object->update($object->id, $user);
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
+	
+	if ($action == 'update_extras') {
+        $object->fetch($id);
+
+        // Fill array 'array_options' with data from update form
+        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+        if ($ret < 0) $error++;
+        if (! $error)
+        {
+            $result = $object->insertExtraFields();
+            if ($result < 0) $error++;
+        }
+        if ($error) $action = 'edit_extras';
+    }
 }
 
 

From c1f3a168cd62d7e9b3bbb5f8a1f37343e3e5ecd0 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 9 Jun 2017 16:57:20 +0200
Subject: [PATCH 1049/1163] Fix wrong attribute name for loop

---
 htdocs/core/lib/admin.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 6a0336aab38..ba5f099365c 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -825,7 +825,7 @@ function activateModule($value,$withdeps=1)
             {
                 // Activation of modules this module depends on
                 // this->depends may be array('modModule1', 'mmodModule2') or array('always'=>"modModule1", 'FR'=>'modModule2')
-                foreach ($objMod->depend as $key => $modulestring)
+                foreach ($objMod->depends as $key => $modulestring)
                 {
                     if ((! is_numeric($key)) && $key != 'always' && $key != $mysoc->country_code)
                     {

From 3347316d3c00a6bb89f124711ab20ba91b3ceb71 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 17:02:05 +0200
Subject: [PATCH 1050/1163] Fix delete of member

---
 .../actions_adherentcard_common.class.php     |   4 +-
 htdocs/adherents/card.php                     |   2 +-
 htdocs/adherents/class/adherent.class.php     |  40 ++--
 htdocs/adherents/class/api_members.class.php  |   6 +-
 htdocs/adherents/list.php                     | 119 ++++++------
 htdocs/commande/list.php                      | 180 +++++++++---------
 htdocs/core/actions_massactions.inc.php       |   2 +-
 7 files changed, 177 insertions(+), 176 deletions(-)

diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index a749ff269e5..c768b019d69 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -182,7 +182,7 @@ abstract class ActionsAdherentCardCommon
             $this->object->old_name = $_POST["old_name"];
             $this->object->old_firstname = $_POST["old_firstname"];
 
-            $result = $this->object->delete();
+            $result = $this->object->delete(0, $user, 0);
             if ($result > 0)
             {
                 header("Location: list.php");
@@ -424,7 +424,7 @@ abstract class ActionsAdherentCardCommon
             if ($resql)
             {
                 $obj = $this->db->fetch_object($resql);
-            
+
                 $this->object->country_code	=	$obj->code;
                 $this->object->country		=	$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->libelle;
             }
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 81aa2c7c6ad..fe3bd4f4cfd 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -585,7 +585,7 @@ if (empty($reshook))
 
 	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
 	{
-		$result=$object->delete($id);
+		$result=$object->delete($id, $user);
 		if ($result > 0)
 		{
 			if (! empty($backtopage))
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 20f5fa671c9..18e144c363c 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -705,11 +705,13 @@ class Adherent extends CommonObject
      *  Fonction qui supprime l'adherent et les donnees associees
      *
      *  @param	int		$rowid		Id of member to delete
+     *	@param	User	$user		User object
+     *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *  @return	int					<0 if KO, 0=nothing to do, >0 if OK
      */
-    function delete($rowid)
+    function delete($rowid, $user, $notrigger=0)
     {
-        global $conf, $langs, $user;
+        global $conf, $langs;
 
         $result = 0;
 		$error=0;
@@ -720,6 +722,14 @@ class Adherent extends CommonObject
 
         $this->db->begin();
 
+        if (! $error && ! $notrigger)
+        {
+            // Call trigger
+            $result=$this->call_trigger('MEMBER_DELETE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
+        }
+
         // Remove category
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_member WHERE fk_member = ".$rowid;
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
@@ -787,16 +797,6 @@ class Adherent extends CommonObject
         	}
         }
 
-        if (! $error)
-        {
-            // Call trigger
-            $result=$this->call_trigger('MEMBER_DELETE',$user);
-            if ($result < 0) { $error++; }
-            // End call triggers
-        }
-
-
-
         if (! $error)
         {
         	$this->db->commit();
@@ -1592,7 +1592,7 @@ class Adherent extends CommonObject
         global $conf, $langs;
 
         if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg=0;
-        
+
         $result=''; $label='';
         $link=''; $linkstart=''; $linkend='';
 
@@ -1602,7 +1602,7 @@ class Adherent extends CommonObject
             $label.= Form::showphoto('memberphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
             $label.= '</div><div style="clear: both;"></div>';
         }
-        
+
         $label.= '<div class="centpercent">';
         $label.= '<u>' . $langs->trans("Member") . '</u>';
         if (! empty($this->ref))
@@ -1610,7 +1610,7 @@ class Adherent extends CommonObject
         if (! empty($this->firstname) || ! empty($this->lastname))
             $label.= '<br><b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs);
         $label.='</div>';
-        
+
         if ($option == 'card' || $option == 'category')
         {
             $link = '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id.'"';
@@ -1619,7 +1619,7 @@ class Adherent extends CommonObject
         {
             $link = '<a href="'.DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$this->id.'"';
         }
-        
+
         $linkclose="";
         if (empty($notooltip))
         {
@@ -1632,10 +1632,10 @@ class Adherent extends CommonObject
             $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose.= ' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
         }
-        
+
         $link.=$linkclose.'>';
         $linkend='</a>';
-        
+
         //if ($withpictoimg == -1) $result.='<div class="nowrap">';
         $result.=$link;
         if ($withpictoimg)
@@ -1658,7 +1658,7 @@ class Adherent extends CommonObject
         }
         $result.=$linkend;
         //if ($withpictoimg == -1) $result.='</div>';
-        
+
         return $result;
     }
 
@@ -1883,7 +1883,7 @@ class Adherent extends CommonObject
 			    $modele = $conf->global->ADHERENT_ADDON_PDF;
 		    }
 	    }
-    
+
         $modelpath = "core/modules/member/doc/";
 
         return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 3defcabd059..4d13b6347ec 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -250,11 +250,7 @@ class Members extends DolibarrApi
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
-        // The Adherent::delete() method uses the global variable $user.
-        global $user;
-        $user = DolibarrApiAccess::$user;
-
-        if (! $member->delete($member->id)) {
+        if (! $member->delete($member->id, DolibarrApiAccess::$user)) {
             throw new RestException(401,'error when deleting member');
         }
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 06de3e09f95..949d55020c8 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -31,13 +31,17 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-$langs->load("members");
-$langs->load("companies");
+$langs->loadLangs(array("members","companies"));
+
+$action=GETPOST('action','aZ09');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
 
 // Security check
 $result=restrictedArea($user,'adherent');
 
-$action=GETPOST('action','aZ09');
 $filter=GETPOST("filter");
 $statut=GETPOST("statut");
 $search=GETPOST("search");
@@ -53,7 +57,7 @@ $search_country=GETPOST("search_country");
 $search_phone=GETPOST("search_phone");
 $search_phone_perso=GETPOST("search_phone_perso");
 $search_phone_mobile=GETPOST("search_phone_mobile");
-$type=GETPOST("type");
+$search_type=GETPOST("search_type");
 $search_email=GETPOST("search_email");
 $search_categ = GETPOST("search_categ",'int');
 $catid        = GETPOST("catid",'int');
@@ -155,7 +159,7 @@ if (empty($reshook))
     	$search_firstname="";
     	$search_login="";
     	$search_company="";
-    	$type="";
+    	$search_type="";
     	$search_email="";
     	$search_address="";
     	$search_zip="";
@@ -173,6 +177,14 @@ if (empty($reshook))
     	$toselect='';
     	$search_array_options=array();
     }
+
+    // Mass actions
+    $objectclass='Adherent';
+    $objectlabel='Members';
+    $permtoread = $user->rights->adherent->lire;
+    $permtodelete = $user->rights->adherent->supprimer;
+    $uploaddir = $conf->adherent->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -193,8 +205,8 @@ $sql.= " d.email, d.phone, d.phone_perso, d.phone_mobile, d.skype, d.birth, d.pu
 $sql.= " d.fk_adherent_type as type_id, d.morphy, d.statut, d.datec as date_creation, d.tms as date_update,";
 $sql.= " t.libelle as type, t.subscription,";
 $sql.= " state.code_departement as state_code, state.nom as state_name";
-// Add fields for extrafields
-foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
+// Add fields from extrafields
+foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
@@ -212,7 +224,7 @@ if ($search_categ > 0)   $sql.= " AND cm.fk_categorie = ".$db->escape($search_ca
 if ($search_categ == -2) $sql.= " AND cm.fk_categorie IS NULL";
 $sql.= " AND d.entity IN (".getEntity('adherent').")";
 if ($sall) $sql.=natural_search(array_keys($fieldstosearchall), $sall);
-if ($type > 0) $sql.=" AND t.rowid=".$db->escape($type);
+if ($search_type > 0) $sql.=" AND t.rowid=".$db->escape($search_type);
 if ($statut != '') $sql.=" AND d.statut in (".$db->escape($statut).")";     // Peut valoir un nombre ou liste de nombre separes par virgules
 if ($search_ref)
 {
@@ -298,10 +310,10 @@ elseif ($action == 'search')
 	$titre=$langs->trans("MembersListQualified");
 }
 
-if ($type > 0)
+if ($search_type > 0)
 {
 	$membertype=new AdherentType($db);
-	$result=$membertype->fetch(GETPOST("type"));
+	$result=$membertype->fetch(GETPOST("type",'int'));
 	$titre.=" (".$membertype->libelle.")";
 }
 
@@ -326,7 +338,7 @@ if ($search_phone != '') $param.= "&search_phone=".urlencode($search_phone);
 if ($search_phone_perso != '') $param.= "&search_phone_perso=".urlencode($search_phone_perso);
 if ($search_phone_mobile != '') $param.= "&search_phone_mobile=".urlencode($search_phone_mobile);
 if ($filter)         $param.="&filter=".urlencode($filter);
-if ($type > 0)       $param.="&type=".urlencode($type);
+if ($search_type > 0)       $param.="&search_type=".urlencode($search_type);
 if ($optioncss != '')       $param.='&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 foreach ($search_array_options as $key => $val)
@@ -346,7 +358,7 @@ if ($user->rights->adherent->supprimer) $arrayofmassactions['delete']=$langs->tr
 //if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
-print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
@@ -403,32 +415,32 @@ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 }
 
 // Ref
-if (! empty($arrayfields['d.ref']['checked'])) 
+if (! empty($arrayfields['d.ref']['checked']))
 {
     print '<td class="liste_titre">';
 	print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
     print '</td>';
 }
 
-if (! empty($arrayfields['d.firstname']['checked'])) 
+if (! empty($arrayfields['d.firstname']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_firstname" value="'.dol_escape_htmltag($search_firstname).'"></td>';
 }
 
-if (! empty($arrayfields['d.lastname']['checked'])) 
+if (! empty($arrayfields['d.lastname']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'"></td>';
 }
 
-if (! empty($arrayfields['d.company']['checked'])) 
+if (! empty($arrayfields['d.company']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'"></td>';
 }
 
-if (! empty($arrayfields['d.login']['checked'])) 
+if (! empty($arrayfields['d.login']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'"></td>';
@@ -440,26 +452,26 @@ if (! empty($arrayfields['d.morphy']['checked']))
     print '</td>';
 }
 
-if (! empty($arrayfields['t.libelle']['checked'])) 
+if (! empty($arrayfields['t.libelle']['checked']))
 {
 	print '<td class="liste_titre">';
 	$listetype=$membertypestatic->liste_array();
-	print $form->selectarray("type", $listetype, $type, 1, 0, 0, '', 0, 32);
+	print $form->selectarray("search_type", $listetype, $type, 1, 0, 0, '', 0, 32);
 	print '</td>';
 }
 
-if (! empty($arrayfields['d.address']['checked'])) 
+if (! empty($arrayfields['d.address']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_address" value="'.$search_address.'"></td>';
 }
 
-if (! empty($arrayfields['d.zip']['checked'])) 
+if (! empty($arrayfields['d.zip']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_zip" value="'.$search_zip.'"></td>';
 }
-if (! empty($arrayfields['d.town']['checked'])) 
+if (! empty($arrayfields['d.town']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
@@ -479,31 +491,31 @@ if (! empty($arrayfields['country.code_iso']['checked']))
     print '</td>';
 }
 // Phone pro
-if (! empty($arrayfields['d.phone']['checked'])) 
+if (! empty($arrayfields['d.phone']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_phone" value="'.$search_phone.'"></td>';
 }
 // Phone perso
-if (! empty($arrayfields['d.phone_perso']['checked'])) 
+if (! empty($arrayfields['d.phone_perso']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_phone_perso" value="'.$search_phone_perso.'"></td>';
 }
 // Phone mobile
-if (! empty($arrayfields['d.phone_mobile']['checked'])) 
+if (! empty($arrayfields['d.phone_mobile']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_phone_mobile" value="'.$search_phone_mobile.'"></td>';
 }
 // Email
-if (! empty($arrayfields['d.email']['checked'])) 
+if (! empty($arrayfields['d.email']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth50" type="text" name="search_email" value="'.$search_email.'"></td>';
 }
 
-if (! empty($arrayfields['d.datefin']['checked'])) 
+if (! empty($arrayfields['d.datefin']['checked']))
 {
 	print '<td class="liste_titre" align="left">';
 	print '</td>';
@@ -626,7 +638,7 @@ while ($i < min($num, $limit))
 	$memberstatic->datefin= $datefin;
 	$memberstatic->socid = $obj->fk_soc;
 	$memberstatic->photo = $obj->photo;
-	
+
 	if (! empty($obj->fk_soc)) {
 	    $memberstatic->fetch_thirdparty();
 		$companyname=$memberstatic->thirdparty->name;
@@ -635,52 +647,52 @@ while ($i < min($num, $limit))
 	}
 
 	print '<tr class="oddeven">';
-	
+
 	if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 	{
 		print '<td align="center">'.($i+1).'</td>';
 	}
 
 	// Ref
-	if (! empty($arrayfields['d.ref']['checked'])) 
+	if (! empty($arrayfields['d.ref']['checked']))
 	{
    		print "<td>";
 		print $memberstatic->getNomUrl(-1, 0, 'card', 'ref');
 		print "</td>\n";
-	}		
+	}
 	// Firstname
-	if (! empty($arrayfields['d.firstname']['checked'])) 
+	if (! empty($arrayfields['d.firstname']['checked']))
 	{
     	print "<td>";
 		print $obj->firstname;
 		print "</td>\n";
 	}
 	// Lastname
-	if (! empty($arrayfields['d.lastname']['checked'])) 
+	if (! empty($arrayfields['d.lastname']['checked']))
 	{
     	print "<td>";
 		print $obj->lastname;
 		print "</td>\n";
 	}
 	// Company
-	if (! empty($arrayfields['d.company']['checked'])) 
+	if (! empty($arrayfields['d.company']['checked']))
 	{
     	print "<td>";
     	print $companyname;
 		print "</td>\n";
 	}
 	// Login
-	if (! empty($arrayfields['d.login']['checked'])) 
+	if (! empty($arrayfields['d.login']['checked']))
 	{
 	   print "<td>".$obj->login."</td>\n";
 	}
 	// Moral/Physique
-	if (! empty($arrayfields['d.morphy']['checked'])) 
+	if (! empty($arrayfields['d.morphy']['checked']))
 	{
 	   print "<td>".$memberstatic->getmorphylib($obj->morphy)."</td>\n";
 	}
 	// Type label
-	if (! empty($arrayfields['t.libelle']['checked'])) 
+	if (! empty($arrayfields['t.libelle']['checked']))
 	{
     	$membertypestatic->id=$obj->type_id;
 		$membertypestatic->libelle=$obj->type;
@@ -727,7 +739,7 @@ while ($i < min($num, $limit))
 	    if (! $i) $totalarray['nbfield']++;
 	}
 	// Phone pro
-	if (! empty($arrayfields['d.phone']['checked'])) 
+	if (! empty($arrayfields['d.phone']['checked']))
 	{
 		print '<td class="nocellnopadd">';
 	    print $obj->phone;
@@ -735,7 +747,7 @@ while ($i < min($num, $limit))
 	    if (! $i) $totalarray['nbfield']++;
 	}
 	// Phone perso
-	if (! empty($arrayfields['d.phone_perso']['checked'])) 
+	if (! empty($arrayfields['d.phone_perso']['checked']))
 	{
 		print '<td class="nocellnopadd">';
 	    print $obj->phone_perso;
@@ -743,7 +755,7 @@ while ($i < min($num, $limit))
 	    if (! $i) $totalarray['nbfield']++;
 	}
 	// Phone mobile
-	if (! empty($arrayfields['d.phone_mobile']['checked'])) 
+	if (! empty($arrayfields['d.phone_mobile']['checked']))
 	{
 		print '<td class="nocellnopadd">';
 	    print $obj->phone_mobile;
@@ -756,7 +768,7 @@ while ($i < min($num, $limit))
         print "<td>".dol_print_email($obj->email,0,0,1)."</td>\n";
 	}
 	// End of subscription date
-	$datefin=$db->jdate($obj->datefin);		
+	$datefin=$db->jdate($obj->datefin);
 	if (! empty($arrayfields['d.datefin']['checked']))
 	{
 		if ($datefin)
@@ -832,22 +844,15 @@ while ($i < min($num, $limit))
 	}
 	// Action column
 	print '<td align="center">';
-	if ($user->rights->adherent->creer)
-	{
-		print "<a href=\"card.php?rowid=".$obj->rowid."&action=edit&backtopage=1\">".img_edit()."</a>";
-	}
-	print '&nbsp;';
-	if ($user->rights->adherent->supprimer && $obj->statut == -1)
-	{
-		print "<a href=\"card.php?rowid=".$obj->rowid."&action=delete&backtopage=1\">".img_picto($langs->trans("Delete"),'disable.png')."</a>";
-	}
-	if ($user->rights->adherent->supprimer && $obj->statut == 1)
-	{
-		print "<a href=\"card.php?rowid=".$obj->rowid."&action=resign&backtopage=1\">".img_picto($langs->trans("Resiliate"),'disable.png')."</a>";
-	}
-	print "</td>";
-	if (! $i) $totalarray['nbfield']++;
-	
+    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+    {
+        $selected=0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    }
+    print '</td>';
+    if (! $i) $totalarray['nbfield']++;
+
 	print "</tr>\n";
 	$i++;
 }
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index dbfeafc8f94..2f8810333f0 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -45,7 +45,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 $langs->loadLangs(array("orders",'sendings','deliveries','companies','compta','bills'));
 
-$action=GETPOST('action','alpha');
+$action=GETPOST('action','aZ09');
 $massaction=GETPOST('massaction','alpha');
 $show_files=GETPOST('show_files','int');
 $confirm=GETPOST('confirm','alpha');
@@ -160,7 +160,7 @@ if (empty($reshook))
 {
     // Selection of new fields
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-    
+
     // Purge search criteria
     if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
@@ -202,51 +202,51 @@ if (empty($reshook))
 
 	// TODO Move this into mass action include
     if ($massaction == 'confirm_createbills') {
-    	
+
     	$orders = GETPOST('toselect');
     	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
     	$validate_invoices = GETPOST('valdate_invoices', 'int');
-    	
+
     	$TFact = array();
     	$TFactThird = array();
-    	
+
     	$nb_bills_created = 0;
-    	
+
     	$db->begin();
-    	
+
     	foreach($orders as $id_order) {
-    		
+
     		$cmd = new Commande($db);
     		if($cmd->fetch($id_order) <= 0) continue;
-    		
+
     		$object = new Facture($db);
     		if(!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $object = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
     		else {
-    			
+
     			$object->socid = $cmd->socid;
     			$object->type = Facture::TYPE_STANDARD;
     			$object->cond_reglement_id	= $cmd->cond_reglement_id;
     			$object->mode_reglement_id	= $cmd->mode_reglement_id;
     			$object->fk_project			= $cmd->fk_project;
-    			
+
     			$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
     			if (empty($datefacture))
     			{
     				$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
     			}
-    			
+
     			$object->date = $datefacture;
     			$object->origin    = 'commande';
     			$object->origin_id = $id_order;
-    			
+
     			$res = $object->create($user);
-    			
+
     			if($res > 0) $nb_bills_created++;
-    			
+
     		}
-    		
+
     		if($object->id > 0) {
-    			
+
     			$db->begin();
     			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
     			$sql.= "fk_source";
@@ -259,7 +259,7 @@ if (empty($reshook))
     			$sql.= ", ".$object->id;
     			$sql.= ", '".$object->element."'";
     			$sql.= ")";
-    
+
     			if ($db->query($sql))
     			{
     				$db->commit();
@@ -268,17 +268,17 @@ if (empty($reshook))
     			{
     				$db->rollback();
     			}
-    			
+
     			$lines = $cmd->lines;
     			if (empty($lines) && method_exists($cmd, 'fetch_lines'))
     			{
     				$cmd->fetch_lines();
     				$lines = $cmd->lines;
     			}
-    			
+
     			$fk_parent_line=0;
     			$num=count($lines);
-    			
+
     			for ($i=0;$i<$num;$i++)
     			{
     				$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
@@ -367,43 +367,43 @@ if (empty($reshook))
     						$fk_parent_line = $result;
     					}
     				}
-    			}			
-    			
+    			}
+
     		}
-    		 
+
     		$cmd->classifyBilled($user);
-    
+
     		if(!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $object;
     		else $TFact[$object->id] = $object;
     	}
-    	
+
     	// Build doc with all invoices
     	$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
     	$toselect = array();
-    	
+
     	if(!empty($validate_invoices)) {
-    		
+
     		$massaction = $action = 'builddoc';
-    		
+
     		foreach($TAllFact as &$object) {
     			$object->validate($user);
     			$toselect[] = $object->id; // For builddoc action
-    			
+
     			// Fac builddoc
     			$upload_dir = $conf->facture->dir_output;
     		    $permissioncreate=$user->rights->facture->creer;
     		    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
     		}
-    		
+
     		$objectclass='Facture';
     	    $objectlabel='Invoice';
     	    $permtoread = $user->rights->facture->lire;
     	    $permtodelete = $user->rights->facture->supprimer;
     	    $uploaddir = $conf->facture->dir_output;
     		include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-    		
+
     	}
-    	
+
     	if (! $error)
     	{
     		$db->commit();
@@ -418,7 +418,7 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     		$error++;
     	}
-    }	
+    }
 }
 
 
@@ -596,9 +596,9 @@ if ($resql)
 	$title.=' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled)?'':$langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
 
 	$num = $db->num_rows($resql);
-	
+
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	$param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -629,7 +629,7 @@ if ($resql)
 	    $tmpkey=preg_replace('/search_options_/','',$key);
 	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 	}
-	
+
 	// List of mass actions available
 	$arrayofmassactions =  array(
 	    'presend'=>$langs->trans("SendByMail"),
@@ -653,12 +653,12 @@ if ($resql)
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
-	
+
 	// TODO Move this into an invluce
 	if ($massaction == 'presend')
 	{
 	    $langs->load("mails");
-	
+
 	    if (! GETPOST('cancel'))
 	    {
 	        $objecttmp=new Commande($db);
@@ -677,14 +677,14 @@ if ($resql)
 	            }
 	        }
 	    }
-	
+
 	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-	
+
 	    dol_fiche_head(null, '', '');
-	
+
 	    $topicmail="SendOrderRef";
 	    $modelmail="order_send";
-	
+
 	    // Cree l'objet formulaire mail
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
@@ -737,23 +737,23 @@ if ($resql)
 	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
 	    $formmail->substit['__PERSONALIZED__']='';
 	    $formmail->substit['__CONTACTCIVNAME__']='';
-	
+
 	    // Tableau des parametres complementaires du post
 	    $formmail->param['action']=$action;
 	    $formmail->param['models']=$modelmail;
 	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
 	    $formmail->param['id']=join(',',$arrayofselected);
 	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	
+
 	    print $formmail->get_form();
-	
+
 	    dol_fiche_end();
 	}
 	elseif ($massaction == 'createbills')
 	{
 		//var_dump($_REQUEST);
 		print '<input type="hidden" name="massaction" value="confirm_createbills">';
-		
+
 		print '<table class="border" width="100%" >';
 		print '<tr>';
 		print '<td class="titlefieldmiddle">';
@@ -780,7 +780,7 @@ if ($resql)
 		print '</td>';
 		print '</tr>';
 		print '</table>';
-		
+
 		print '<br>';
 		print '<div class="center">';
 		print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
@@ -788,13 +788,13 @@ if ($resql)
 		print '</div>';
 		print '<br>';
 	}
-	
+
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
-	
+
 	$moreforfilter='';
 
  	// If the user can view prospects other than his'
@@ -828,7 +828,7 @@ if ($resql)
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
-	
+
 	if (! empty($moreforfilter))
 	{
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -839,27 +839,27 @@ if ($resql)
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
     if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-    
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
 	// Ref
-	if (! empty($arrayfields['c.ref']['checked'])) 
+	if (! empty($arrayfields['c.ref']['checked']))
 	{
 	    print '<td class="liste_titre">';
     	print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
 	    print '</td>';
 	}
 	// Ref customer
-	if (! empty($arrayfields['c.ref_client']['checked'])) 
+	if (! empty($arrayfields['c.ref_client']['checked']))
 	{
     	print '<td class="liste_titre" align="left">';
     	print '<input class="flat" type="text" size="6" name="search_ref_customer" value="'.$search_ref_customer.'">';
     	print '</td>';
 	}
 	// Thirpdarty
-	if (! empty($arrayfields['s.nom']['checked'])) 
+	if (! empty($arrayfields['s.nom']['checked']))
 	{
     	print '<td class="liste_titre" align="left">';
     	print '<input class="flat" type="text" name="search_company" value="'.$search_company.'">';
@@ -899,7 +899,7 @@ if ($resql)
         $formother->select_year($orderyear?$orderyear:-1,'orderyear',1, 20, 5);
     	print '</td>';
 	}
-	if (! empty($arrayfields['c.date_delivery']['checked'])) 
+	if (! empty($arrayfields['c.date_delivery']['checked']))
 	{
     	print '<td class="liste_titre" align="center">';
         if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="deliveryday" value="'.$deliveryday.'">';
@@ -972,10 +972,10 @@ if ($resql)
 	{
 	    print '<td class="liste_titre maxwidthonsmartphone" align="right">';
     	$liststatus=array(
-    	    Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"), 
-    	    Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"), 
-    	    Commande::STATUS_ACCEPTED=>$langs->trans("StatusOrderSentShort"), 
-    	    Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"), 
+    	    Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
+    	    Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
+    	    Commande::STATUS_ACCEPTED=>$langs->trans("StatusOrderSentShort"),
+    	    Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
     	    Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")
     	);
     	print $form->selectarray('viewstatut', $liststatus, $viewstatut, -4);
@@ -993,7 +993,7 @@ if ($resql)
 	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
-	
+
     print "</tr>\n";
 
 	// Fields title
@@ -1014,9 +1014,9 @@ if ($resql)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
 				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -1033,20 +1033,20 @@ if ($resql)
 	if (! empty($arrayfields['c.facture']['checked']))   print_liste_field_titre($arrayfields['c.facture']['label'],$_SERVER["PHP_SELF"],'c.facture','',$param,'align="center"',$sortfield,$sortorder,'');
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print '</tr>'."\n";
-    
+
 	$total=0;
 	$subtotal=0;
     $productstat_cache=array();
-    
+
     $generic_commande = new Commande($db);
     $generic_product = new Product($db);
-	
+
     $i=0;
 	$totalarray=array();
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($resql);
-        
+
         print '<tr class="oddeven">';
 
         $notshippable=0;
@@ -1054,7 +1054,7 @@ if ($resql)
         $text_info='';
         $text_warning='';
         $nbprod=0;
-        
+
         // Ref
         if (! empty($arrayfields['c.ref']['checked']))
         {
@@ -1070,12 +1070,12 @@ if ($resql)
             $generic_commande->total_ttc = $obj->total_ttc;
             $generic_commande->lines=array();
             $generic_commande->getLinesArray();
-    
+
             print '<table class="nobordernopadding"><tr class="nocellnopadd">';
             print '<td class="nobordernopadding nowrap">';
             print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$obj->fk_statut));
             print '</td>';
-    		
+
             // Show shippable Icon (create subloop, so may be slow)
             if ($conf->stock->enabled)
             {
@@ -1083,7 +1083,7 @@ if ($resql)
 	            if (($obj->fk_statut > 0) && ($obj->fk_statut < 3))
     	        {
                     $numlines = count($generic_commande->lines); // Loop on each line of order
-                    for ($lig=0; $lig < $numlines; $lig++) 
+                    for ($lig=0; $lig < $numlines; $lig++)
                     {
                         if ($generic_commande->lines[$lig]->product_type == 0 && $generic_commande->lines[$lig]->fk_product > 0)  // If line is a product and not a service
                         {
@@ -1107,8 +1107,8 @@ if ($resql)
                                 $text_info .= ' - '.$langs->trans("Stock").': '.$generic_product->stock_reel;
                                 $text_info .= ' - '.$langs->trans("VirtualStock").': '.$generic_product->stock_theorique;
                                 $text_info .= '<br>';
-                                
-                                if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel) 
+
+                                if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel)
                                 {
                                     $notshippable++;
                                 }
@@ -1168,7 +1168,7 @@ if ($resql)
                         $text_info = $langs->trans('NonShippable').'<br>'.$text_info;
                     }
                 }
-                
+
                 print '<td>';
                 if ($nbprod)
                 {
@@ -1179,7 +1179,7 @@ if ($resql)
                 }
                 print '</td>';
             }
-    
+
             // Warning late icon and note
     		print '<td class="nobordernopadding nowrap">';
     		if ($generic_commande->hasDelay()) {
@@ -1192,7 +1192,7 @@ if ($resql)
     			print '</span>';
     		}
     		print '</td>';
-    
+
     		print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
     		$filename=dol_sanitizeFileName($obj->ref);
     		$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
@@ -1200,11 +1200,11 @@ if ($resql)
     		print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
     		print '</td>';
     		print '</tr></table>';
-    
+
     		print '</td>';
     		if (! $i) $totalarray['nbfield']++;
         }
-        
+
 		// Ref customer
 		if (! empty($arrayfields['c.ref_client']['checked']))
 		{
@@ -1222,7 +1222,7 @@ if ($resql)
 		{
     		print '<td class="tdoverflowmax200">';
     		print $companystatic->getNomUrl(1,'customer');
-    
+
     		// If module invoices enabled and user with invoice creation permissions
     		if (! empty($conf->facture->enabled) && ! empty($conf->global->ORDER_BILLING_ALL_CUSTOMER))
     		{
@@ -1278,7 +1278,7 @@ if ($resql)
 		    print '</td>';
 		    if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		// Order date
 		if (! empty($arrayfields['c.date_commande']['checked']))
 		{
@@ -1319,7 +1319,7 @@ if ($resql)
 		    if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
 		    $totalarray['totalttc'] += $obj->total_ttc;
         }
-		
+
         // Extra fields
         if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
         {
@@ -1370,7 +1370,7 @@ if ($resql)
             print '<td align="center">'.yn($obj->billed).'</td>';
             if (! $i) $totalarray['nbfield']++;
         }
-        
+
         // Action column
         print '<td class="nowrap" align="center">';
         if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
@@ -1381,9 +1381,9 @@ if ($resql)
         }
         print '</td>';
         if (! $i) $totalarray['nbfield']++;
-		
+
 		print "</tr>\n";
-        
+
 		$total+=$obj->total_ht;
 		$subtotal+=$obj->total_ht;
 		$i++;
@@ -1416,14 +1416,14 @@ if ($resql)
 	}
 
 	$db->free($resql);
-	
+
 	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
 	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-				
+
 	print '</table>'."\n";
 	print '</div>';
-	
+
 	print '</form>'."\n";
 
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
@@ -1433,18 +1433,18 @@ if ($resql)
 	     */
 	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	    $urlsource.=str_replace('&amp;','&',$param);
-	
+
 	    $filedir=$diroutputmassaction;
 	    $genallowed=$user->rights->commande->lire;
 	    $delallowed=$user->rights->commande->supprimer;
-	
+
 	    print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
 	}
 	else
 	{
 	    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
 	}
-	
+
 }
 else
 {
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index fde828fd6d4..20b3d155a27 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -536,7 +536,7 @@ if (! $error && $massaction == 'delete' && $permtodelete)
         $result=$objecttmp->fetch($toselectid);
         if ($result > 0)
         {
-            if ($objecttmp->element == 'societe') $result = $objecttmp->delete($objecttmp->id, $user, 1);
+            if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
             else $result = $objecttmp->delete($user);
             if ($result <= 0)
             {

From 0458b7d38f9610bd3e3ef2fae83722b39d48c55f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 17:29:34 +0200
Subject: [PATCH 1051/1163] Fix css subscription form

---
 htdocs/adherents/admin/public.php | 13 ++++---------
 htdocs/public/members/new.php     | 29 +++++++++++++++--------------
 htdocs/theme/eldy/style.css.php   |  5 ++++-
 htdocs/theme/md/style.css.php     |  5 ++++-
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 141c39d7e9e..940c6c6e457 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -115,16 +115,11 @@ if ($conf->use_javascript_ajax)
                 {
 					if (jQuery("#MEMBER_ENABLE_PUBLIC").val()==\'0\')
                     {
-                        jQuery("#tramount").hide();
-                        jQuery("#tredit").hide();
-                        jQuery("#trpayment").hide();
-                        jQuery("#tremail").hide();
+                        jQuery("#trforcetype, #tramount, #tredit, #trpayment, #tremail").hide();
                     }
                     if (jQuery("#MEMBER_ENABLE_PUBLIC").val()==\'1\')
                     {
-                        jQuery("#tramount").show();
-                        jQuery("#tredit").show();
-                        jQuery("#trpayment").show();
+                        jQuery("#trforcetype, #tramount, #tredit, #trpayment").show();
                         if (jQuery("#MEMBER_NEWFORM_PAYONLINE").val()==\'-1\') jQuery("#tremail").hide();
                         else jQuery("#tremail").show();
 					}
@@ -156,9 +151,9 @@ print "</td></tr>\n";
 
 // Force Type
 $adht = new AdherentType($db);
-print '<tr class="oddeven drag"><td>';
+print '<tr class="oddeven drag" id="trforcetype"><td>';
 print $langs->trans("ForceMemberType");
-print '</td><td width="60" align="center">';
+print '</td><td width="60" align="right">';
 $listofval = array(-1 => $langs->trans("Undefined"));
 $listofval += $adht->liste_array();
 $forcetype = $conf->global->MEMBER_NEWFORM_FORCETYPE ?: -1;
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index a2cab708281..f174c51cc74 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -115,7 +115,7 @@ function llxHeaderVierge($title, $head="", $disablejs=0, $disablehead=0, $arrayo
     print '<img alt="Logo" id="logosubscribe" title="" src="'.$urllogo.'" />';
     print '</div><br>';
 
-    print '<div style="margin-left: 50px; margin-right: 50px;">';
+    print '<div class="divmainbodylarge">';
 }
 
 /**
@@ -407,8 +407,9 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" / >';
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print '<input type="hidden" name="action" value="add" />';
 
+print '<br>';
 
-print '<br>'.$langs->trans("FieldsWithAreMandatory",'*').'<br>';
+print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory",'*').'</span><br>';
 //print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
 
 dol_fiche_head('');
@@ -448,7 +449,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE))
     $defaulttype='';
     $isempty=1;
     if (count($listoftype)==1) { $defaulttype=$tmp[0]; $isempty=0; }
-    print '<tr><td width="15%">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td width="35%">';
+    print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
     print $form->selectarray("type",  $adht->liste_array(), GETPOST('type')?GETPOST('type'):$defaulttype, $isempty);
     print '</td></tr>'."\n";
 }
@@ -463,7 +464,7 @@ $morphys["phy"] = $langs->trans("Physical");
 $morphys["mor"] = $langs->trans("Moral");
 if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY))
 {
-    print '<tr class="morphy"><td>'.$langs->trans('Nature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
+    print '<tr class="morphy"><td class="titlefield">'.$langs->trans('Nature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
     print $form->selectarray("morphy",  $morphys, GETPOST('morphy'), 1);
     print '</td></tr>'."\n";
 }
@@ -473,14 +474,14 @@ else
     print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
 }
 // Civility
-print '<tr><td>'.$langs->trans('UserTitle').'</td><td>';
+print '<tr><td class="titlefield">'.$langs->trans('UserTitle').'</td><td>';
 print $formcompany->select_civility(GETPOST('civility_id'),'civility_id').'</td></tr>'."\n";
 // Lastname
-print '<tr><td>'.$langs->trans("Lastname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="lastname" size="40" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Lastname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
 // Firstname
-print '<tr><td>'.$langs->trans("Firstname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="firstname" size="40" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Firstname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
 // Company
-print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
+print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address
 print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
 print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address')).'</textarea></td></tr>'."\n";
@@ -491,7 +492,7 @@ print ' / ';
 print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode','selectcountry_id','state_id'), 0, 1);
 print '</td></tr>';
 // Country
-print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
+print '<tr><td>'.$langs->trans('Country').'</td><td>';
 $country_id=GETPOST('country_id');
 if (! $country_id && ! empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) $country_id=getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE,2,$db,$langs);
 if (! $country_id && ! empty($conf->geoipmaxmind->enabled))
@@ -517,20 +518,20 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE))
     print '</td></tr>';
 }
 // EMail
-print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" size="40" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Login
 if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 {
-    print '<tr><td>'.$langs->trans("Login").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" size="20" value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
-    print '<tr><td>'.$langs->trans("Password").' <FONT COLOR="red">*</FONT></td><td><input type="password" name="pass1" size="20" value="'.GETPOST("pass1").'"></td></tr>'."\n";
-    print '<tr><td>'.$langs->trans("PasswordAgain").' <FONT COLOR="red">*</FONT></td><td><input type="password" name="pass2" size="20" value="'.GETPOST("pass2").'"></td></tr>'."\n";
+    print '<tr><td>'.$langs->trans("Login").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
+    print '<tr><td>'.$langs->trans("Password").' <FONT COLOR="red">*</FONT></td><td><input type="password" name="pass1" class="minwidth100" value="'.GETPOST("pass1").'"></td></tr>'."\n";
+    print '<tr><td>'.$langs->trans("PasswordAgain").' <FONT COLOR="red">*</FONT></td><td><input type="password" name="pass2" class="minwidth100" value="'.GETPOST("pass2").'"></td></tr>'."\n";
 }
 // Birthday
 print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateToBirth").'</td><td>';
 print $form->select_date($birthday,'birth',0,0,1,"newmember",1,0,1);
 print '</td></tr>'."\n";
 // Photo
-print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" size="40" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
 // Public
 print '<tr><td>'.$langs->trans("Public").'</td><td><input type="checkbox" name="public"></td></tr>'."\n";
 // Extrafields
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9ba91c33475..320d4f1859b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -792,6 +792,8 @@ div.fiche>form>div.div-table-responsive {
 /* Force values for small screen 570 */
 @media only screen and (max-width: 570px)
 {
+	.divmainbodylarge { margin-left: 20px !important; margin-right: 20px !important; }
+
     .tdoverflowonsmartphone {
         max-width: 0;
         overflow: hidden;
@@ -3077,7 +3079,8 @@ div.titre {
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }
 #tablepublicpayment tr.liste_total td { border-top: none; }
 
-#divsubscribe { width: 700px; }
+.divmainbodylarge { margin-left: 40px; margin-right: 40px; }
+#divsubscribe { max-width: 900px; }
 #tablesubscribe { width: 100%; }
 
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index a1d26705d46..c21aafd407f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -794,6 +794,8 @@ div.fiche>form>div.div-table-responsive {
 /* Force values for small screen 570 */
 @media only screen and (max-width: 570px)
 {
+	.divmainbodylarge { margin-left: 20px; margin-right: 20px; }
+
     .tdoverflowonsmartphone {
         max-width: 0;
         overflow: hidden;
@@ -3156,7 +3158,8 @@ div.titre {
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }
 #tablepublicpayment tr.liste_total td { border-top: none; }
 
-#divsubscribe { width: 700px; }
+.divmainbodylarge { margin-left: 40px; margin-right: 40px; }
+#divsubscribe { max-width: 900px; }
 #tablesubscribe { width: 100%; }
 
 

From 884c6c674ddfd7717adea8cc18f16477e1ce7547 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jun 2017 20:08:23 +0200
Subject: [PATCH 1052/1163] Fix css

---
 htdocs/core/class/html.form.class.php | 7 ++-----
 htdocs/theme/eldy/style.css.php       | 2 +-
 htdocs/theme/md/style.css.php         | 2 +-
 htdocs/user/class/user.class.php      | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ac17e1d9e17..7c8efcc8328 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6083,7 +6083,7 @@ class Form
             }
             else
 			{
-				$nophoto='/public/theme/common/nophoto.png';
+                $nophoto='/public/theme/common/nophoto.png';
 				if (in_array($modulepart,array('userphoto','contact')))	// For module that are "physical" users
 				{
 					$nophoto='/public/theme/common/user_anonymous.png';
@@ -6102,10 +6102,7 @@ class Form
                 }
                 else
 				{
-				    if ($conf->browser->layout != 'phone')
-				    {
-                        $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'">';
-				    }
+                    $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'">';
                 }
             }
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 320d4f1859b..3b2ba307bbd 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -4188,7 +4188,7 @@ dl.dropdown {
     position:absolute;
     top:2px;
     list-style:none;
-    max-height: 280px;
+    max-height: 270px;
     overflow: auto;
 }
 .dropdown span.value {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c21aafd407f..927830da51d 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4275,7 +4275,7 @@ dl.dropdown {
     position:absolute;
     top:2px;
     list-style:none;
-    max-height: 280px;
+    max-height: 270px;
     overflow: auto;
 }
 .dropdown span.value {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a69ed968dfb..6b39158a87b 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2096,9 +2096,9 @@ class User extends CommonObject
 	      	$paddafterimage='';
 			if (abs($withpictoimg) == 1) $paddafterimage='style="margin-right: 3px;"';
         	// Only picto
-			if ($withpictoimg > 0) $picto='<div class="inline-block nopadding '.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
+			if ($withpictoimg > 0) $picto='<!-- picto user --><div class="inline-block nopadding '.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
         	// Picto must be a photo
-			else $picto='<div class="inline-block nopadding '.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg==-3?'small':''), 'mini', 0, 1).'</div>';
+			else $picto='<!-- picto photo user --><div class="inline-block nopadding '.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg==-3?'small':''), 'mini', 0, 1).'</div>';
             $result.=$picto;
 		}
 		if ($withpictoimg > -2 && $withpictoimg != 2)

From 58a407d9f1681f3b60449d9460dd33002afc9e09 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 00:05:47 +0200
Subject: [PATCH 1053/1163] Fix style and align when no permission on widget

---
 htdocs/admin/defaultvalues.php                |  26 ++---
 htdocs/admin/ldap.php                         |   6 +-
 htdocs/admin/ldap_contacts.php                |   8 +-
 htdocs/admin/ldap_groups.php                  |  10 +-
 htdocs/admin/ldap_members.php                 |   6 +-
 htdocs/admin/ldap_users.php                   |   2 +-
 htdocs/admin/perms.php                        |   4 +-
 htdocs/admin/translation.php                  | 103 +++++++++---------
 htdocs/core/boxes/box_actions.php             |   6 +-
 htdocs/core/boxes/box_bookmarks.php           |   4 +-
 htdocs/core/boxes/box_clients.php             |   6 +-
 htdocs/core/boxes/box_commandes.php           |   4 +-
 htdocs/core/boxes/box_comptes.php             |   4 +-
 htdocs/core/boxes/box_contacts.php            |   4 +-
 htdocs/core/boxes/box_contracts.php           |   6 +-
 htdocs/core/boxes/box_factures.php            |   4 +-
 htdocs/core/boxes/box_factures_fourn.php      |   4 +-
 htdocs/core/boxes/box_factures_fourn_imp.php  |   4 +-
 htdocs/core/boxes/box_factures_imp.php        |   4 +-
 htdocs/core/boxes/box_ficheinter.php          |   6 +-
 htdocs/core/boxes/box_fournisseurs.php        |   4 +-
 htdocs/core/boxes/box_goodcustomers.php       |   8 +-
 .../boxes/box_graph_invoices_permonth.php     |   8 +-
 .../box_graph_invoices_supplier_permonth.php  |   8 +-
 .../core/boxes/box_graph_orders_permonth.php  |   6 +-
 .../box_graph_orders_supplier_permonth.php    |   6 +-
 .../boxes/box_graph_product_distribution.php  |  24 ++--
 .../boxes/box_graph_propales_permonth.php     |   6 +-
 htdocs/core/boxes/box_members.php             |   4 +-
 htdocs/core/boxes/box_produits.php            |   4 +-
 .../core/boxes/box_produits_alerte_stock.php  |   4 +-
 htdocs/core/boxes/box_propales.php            |   4 +-
 htdocs/core/boxes/box_prospect.php            |   4 +-
 htdocs/core/boxes/box_services_contracts.php  |   6 +-
 htdocs/core/boxes/box_services_expired.php    |   8 +-
 htdocs/core/boxes/box_supplier_orders.php     |   4 +-
 htdocs/langs/en_US/admin.lang                 |   4 +-
 htdocs/theme/eldy/style.css.php               |   3 +-
 htdocs/theme/md/style.css.php                 |   2 +-
 39 files changed, 182 insertions(+), 156 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index bd539becb86..94682cd502f 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -182,29 +182,29 @@ $formadmin = new FormAdmin($db);
 $wikihelp='EN:Setup|FR:Paramétrage|ES:Configuración';
 llxHeader('',$langs->trans("Setup"),$wikihelp);
 
-print load_fiche_titre($langs->trans("DefaultValues"),'','title_setup');
+$param='&mode='.$mode;
 
-print $langs->trans("DefaultValuesDesc")."<br>\n";
-print "<br>\n";
-
-print $langs->trans("EnableDefaultValues").' ';
+$enabledisablehtml.= $langs->trans("EnableDefaultValues").' ';
 if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
 {
     // Button off, click to enable
-    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;value=1">';
-    print img_picto($langs->trans("Disabled"),'switch_off');
-    print '</a>';
+    $enabledisablehtml.= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=1'.$param.'">';
+    $enabledisablehtml.= img_picto($langs->trans("Disabled"),'switch_off');
+    $enabledisablehtml.= '</a>';
 }
 else
 {
     // Button on, click to disable
-    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;value=0">';
-    print img_picto($langs->trans("Activated"),'switch_on');
-    print '</a>';
+    $enabledisablehtml.= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=0'.$param.'">';
+    $enabledisablehtml.= img_picto($langs->trans("Activated"),'switch_on');
+    $enabledisablehtml.= '</a>';
 }
-print "<br><br>\n";
 
-$param='&mode='.$mode;
+print load_fiche_titre($langs->trans("DefaultValues"), $enabledisablehtml, 'title_setup');
+
+print $langs->trans("DefaultValuesDesc")."<br>\n";
+print "<br>\n";
+
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 if ($optioncss != '')  $param.='&optioncss='.$optioncss;
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 4d8dab035ca..dd084894b3d 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -100,7 +100,7 @@ $form=new Form($db);
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-dol_fiche_head($head, 'ldap', $langs->trans("LDAPSetup"));
+dol_fiche_head($head, 'ldap', $langs->trans("LDAPSetup"), -1);
 
 print '<table class="noborder" width="100%">';
 
@@ -127,7 +127,7 @@ print '</td></tr>';
 // Synchro contact active
 if (! empty($conf->societe->enabled))
 {
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnContactActive").'</td><td>';
 	$arraylist=array();
 	$arraylist['0']=$langs->trans("No");
@@ -139,7 +139,7 @@ if (! empty($conf->societe->enabled))
 // Synchro member active
 if (! empty($conf->adherent->enabled))
 {
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnMemberActive").'</td><td>';
 	$arraylist=array();
 	$arraylist['0']=$langs->trans("No");
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index d5ca994c258..f183c29b5ef 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -39,7 +39,7 @@ if (!$user->admin)
   accessforbidden();
 
 $action = GETPOST('action','aZ09');
-  
+
 /*
  * Actions
  */
@@ -49,7 +49,7 @@ if ($action == 'setvalue' && $user->admin)
 	$error=0;
 
 	$db->begin();
-	
+
 	if (! dolibarr_set_const($db, 'LDAP_CONTACT_DN',GETPOST("contactdn"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_CONTACT_OBJECT_CLASS',GETPOST("objectclass"),'chaine',0,'',$conf->entity)) $error++;
 
@@ -73,7 +73,7 @@ if ($action == 'setvalue' && $user->admin)
     $key=GETPOST("key");
     if ($key) $valkey=$conf->global->$key;
     if (! dolibarr_set_const($db, 'LDAP_KEY_CONTACTS',$valkey,'chaine',0,'',$conf->entity)) $error++;
-    
+
     if (! $error)
     {
     	$db->commit();
@@ -107,7 +107,7 @@ if (! function_exists("ldap_connect"))
 	setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors');
 }
 
-dol_fiche_head($head, 'contacts', $langs->trans("LDAPSetup"));
+dol_fiche_head($head, 'contacts', $langs->trans("LDAPSetup"), -1);
 
 
 print $langs->trans("LDAPDescContact").'<br>';
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 3f8869de70f..fc68d815439 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005      Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011-2013 Juanjo Menent		<jmenent@2byte.es>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -38,7 +38,7 @@ $langs->load("errors");
 
 if (!$user->admin)
   accessforbidden();
-  
+
 $action = GETPOST('action','aZ09');
 
 
@@ -50,7 +50,7 @@ if ($action == 'setvalue' && $user->admin)
 {
 	$error=0;
 	$db->begin();
-	
+
 	if (! dolibarr_set_const($db, 'LDAP_GROUP_DN',GETPOST("group"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_GROUP_OBJECT_CLASS',GETPOST("objectclass"),'chaine',0,'',$conf->entity)) $error++;
 
@@ -64,7 +64,7 @@ if ($action == 'setvalue' && $user->admin)
     $key=GETPOST("key");
     if ($key) $valkey=$conf->global->$key;
     if (! dolibarr_set_const($db, 'LDAP_KEY_GROUPS',$valkey,'chaine',0,'',$conf->entity)) $error++;
-    
+
     if (! $error)
     {
     	$db->commit();
@@ -96,7 +96,7 @@ if (! function_exists("ldap_connect"))
 	setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors');
 }
 
-dol_fiche_head($head, 'groups', $langs->trans("LDAPSetup"));
+dol_fiche_head($head, 'groups', $langs->trans("LDAPSetup"), -1);
 
 
 print $langs->trans("LDAPDescGroups").'<br>';
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index afbf8da375a..cad37cc4ccc 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005      Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011-2013 Juanjo Menent		<jmenent@2byte.es>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -50,7 +50,7 @@ if ($action == 'setvalue' && $user->admin)
 	$error=0;
 
 	$db->begin();
-	
+
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_DN',GETPOST("user"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_OBJECT_CLASS',GETPOST("objectclass"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FILTER',GETPOST("filterconnection"),'chaine',0,'',$conf->entity)) $error++;
@@ -126,7 +126,7 @@ if (! function_exists("ldap_connect"))
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-dol_fiche_head($head, 'members', $langs->trans("LDAPSetup"));
+dol_fiche_head($head, 'members', $langs->trans("LDAPSetup"), -1);
 
 
 print $langs->trans("LDAPDescMembers").'<br>';
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 43a6720a448..a0866c1305a 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -113,7 +113,7 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
 
-dol_fiche_head($head, 'users', $langs->trans("LDAPSetup"));
+dol_fiche_head($head, 'users', $langs->trans("LDAPSetup"), -1);
 
 print $langs->trans("LDAPDescUsers").'<br>';
 print '<br>';
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 03b29abc109..eb348869b34 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -187,11 +187,11 @@ if ($result)
 
 
         print '<tr class="oddeven">';
-        print '<td>'
+        print '<td>';
         print img_object('',$picto,'class="pictoobjectwidth"').' '.$objMod->getName();
         print '<a name="'.$objMod->getName().'">&nbsp;</a>';
 		print '</td>';
-		
+
         $perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle));
         print '<td>'.$perm_libelle. '</td>';
 
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 0c4e40948ed..8a6c38ffe46 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -107,7 +107,7 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 	if (! $error)
 	{
 	    $db->begin();
-	    
+
 	    $sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue, entity) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."', ".$db->escape($conf->entity).")";
 		$result = $db->query($sql);
 		if ($result > 0)
@@ -126,7 +126,7 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 		    {
 		        setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
 		    }
-		    else 
+		    else
 		    {
 		        setEventMessages($db->lasterror(), null, 'errors');
 		    }
@@ -164,7 +164,25 @@ $formadmin = new FormAdmin($db);
 $wikihelp='EN:Setup|FR:Paramétrage|ES:Configuración';
 llxHeader('',$langs->trans("Setup"),$wikihelp);
 
-print load_fiche_titre($langs->trans("Translation"),'','title_setup');
+$param='&mode='.$mode;
+
+$enabledisablehtml = $langs->trans("EnableOverwriteTranslation").' ';
+if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
+{
+    // Button off, click to enable
+    $enabledisablehtml.='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=1'.$param.'">';
+    $enabledisablehtml.=img_picto($langs->trans("Disabled"),'switch_off');
+    $enabledisablehtml.='</a>';
+}
+else
+{
+    // Button on, click to disable
+    $enabledisablehtml.='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=0'.$param.'">';
+    $enabledisablehtml.=img_picto($langs->trans("Activated"),'switch_on');
+    $enabledisablehtml.='</a>';
+}
+
+print load_fiche_titre($langs->trans("Translation"), $enabledisablehtml, 'title_setup');
 
 print $langs->trans("TranslationDesc")."<br>\n";
 print "<br>\n";
@@ -175,25 +193,6 @@ print $langs->trans("CurrentUserLanguage").': <strong>'.$s.' '.$current_language
 
 print '<br>';
 
-print $langs->trans("EnableOverwriteTranslation").' ';
-if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
-{
-    // Button off, click to enable
-    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&amp;value=1">';
-    print img_picto($langs->trans("Disabled"),'switch_off');
-    print '</a>';
-}
-else
-{
-    // Button on, click to disable
-    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&amp;value=0">';
-    print img_picto($langs->trans("Activated"),'switch_on');
-    print '</a>';
-}
-
-print '<br><br>';
-
-$param='&mode='.$mode;
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 if ($optioncss != '') $param.='&optioncss='.$optioncss;
@@ -225,12 +224,12 @@ if ($mode == 'overwrite')
     print $langs->trans("TranslationOverwriteDesc",$langs->transnoentitiesnoconv("Language"),$langs->transnoentitiesnoconv("Key"),$langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n";
     print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."<br>\n";
     print '<br>';
-    
-    
+
+
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" id="action" name="action" value="">';
     print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
-    
+
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("Language").' (en_US, es_MX, ...)',$_SERVER["PHP_SELF"],'lang,transkey','',$param,'',$sortfield,$sortorder);
@@ -239,11 +238,11 @@ if ($mode == 'overwrite')
     //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],'entity,transkey','',$param,'',$sortfield,$sortorder);
     print '<td align="center"></td>';
     print "</tr>\n";
-    
-    
+
+
     // Line to add new record
     print "\n";
-    
+
     print '<tr class="oddeven"><td>';
     print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, 0, 'maxwidthonsmartphone', 1);
     print '</td>'."\n";
@@ -270,33 +269,33 @@ if ($mode == 'overwrite')
     print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add">';
     print "</td>\n";
     print '</tr>';
-    
-    
+
+
     // Show constants
     $sql = "SELECT rowid, entity, lang, transkey, transvalue";
     $sql.= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
     $sql.= " WHERE 1 = 1";
     //$sql.= " AND entity IN (".$user->entity.",".$conf->entity.")";
     $sql.= $db->order($sortfield, $sortorder);
-    
+
     dol_syslog("translation::select from table", LOG_DEBUG);
     $result = $db->query($sql);
     if ($result)
     {
     	$num = $db->num_rows($result);
     	$i = 0;
-    
+
     	while ($i < $num)
     	{
     		$obj = $db->fetch_object($result);
-    
+
     		print "\n";
-    
+
     		print '<tr class="oddeven">';
-    		
+
     		print '<td>'.$obj->lang.'</td>'."\n";
     		print '<td>'.$obj->transkey.'</td>'."\n";
-    
+
     		// Value
     		print '<td>';
     		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
@@ -306,18 +305,18 @@ if ($mode == 'overwrite')
     		*/
     		print $obj->transvalue;
     		print '</td>';
-    
+
     		print '<td align="center">';
     		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_delete().'</a>';
     		print '</td>';
-    		
+
     		print "</tr>\n";
     		print "\n";
     		$i++;
     	}
     }
-    
-    
+
+
     print '</table>';
 
 }
@@ -325,15 +324,15 @@ if ($mode == 'overwrite')
 if ($mode == 'searchkey')
 {
     $langcode=GETPOST('langcode')?GETPOST('langcode'):$langs->defaultlang;
-    
+
     $newlang=new Translate('',$conf);
     $newlang->setDefaultLang($langcode);
 
     $newlangfileonly=new Translate('',$conf);
     $newlangfileonly->setDefaultLang($langcode);
-    
+
     $recordtoshow=array();
-    
+
     $nbempty=0;
     /*var_dump($langcode);
      var_dump($transkey);
@@ -353,9 +352,9 @@ if ($mode == 'searchkey')
             // Directory of translation files
             $dir_lang = $searchdir."/langs/".$langcode;
             $dir_lang_osencoded=dol_osencode($dir_lang);
-    
+
             $filearray=dol_dir_list($dir_lang_osencoded,'files',0,'','',$sortfield,(strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC),1);
-    
+
             foreach($filearray as $file)
             {
                 $tmpfile=preg_replace('/.lang/i', '', basename($file['name']));
@@ -364,7 +363,7 @@ if ($mode == 'searchkey')
                 //print 'After loading lang '.$tmpfile.', newlang has '.count($newlang->tab_translate).' records<br>'."\n";
             }
         }
-    
+
         // Now search into translation array
         foreach($newlang->tab_translate as $key => $val)
         {
@@ -373,13 +372,13 @@ if ($mode == 'searchkey')
             $recordtoshow[$key]=$val;
         }
     }
-    
+
     //print '<br>';
     $nbtotalofrecordswithoutfilters = count($newlang->tab_translate);
     $nbtotalofrecords = count($recordtoshow);
     $num = $limit + 1;
     if (($offset + $num) > $nbtotalofrecords) $num = $limit;
-    
+
     //print 'param='.$param.' $_SERVER["PHP_SELF"]='.$_SERVER["PHP_SELF"].' num='.$num.' page='.$page.' nbtotalofrecords='.$nbtotalofrecords." sortfield=".$sortfield." sortorder=".$sortorder;
     $title = $langs->trans("TranslationKeySearch");
     if ($nbtotalofrecords > 0) $title.=' ('.$nbtotalofrecords.' / '.$nbtotalofrecordswithoutfilters.')';
@@ -419,19 +418,19 @@ if ($mode == 'searchkey')
     {*/
         print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">';
     //}
-    print '</td>';    
+    print '</td>';
     // Action column
     print '<td class="liste_titre nowrap" align="right">';
     $searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
     print $searchpicto;
     print '</td>';
     print '</tr>';
-    
+
     if ($sortfield == 'transkey' && strtolower($sortorder) == 'asc') ksort($recordtoshow);
     if ($sortfield == 'transkey' && strtolower($sortorder) == 'desc') krsort($recordtoshow);
     if ($sortfield == 'transvalue' && strtolower($sortorder) == 'asc') asort($recordtoshow);
     if ($sortfield == 'transvalue' && strtolower($sortorder) == 'desc') arsort($recordtoshow);
-    
+
     // Show result
     $i=0;
     foreach($recordtoshow as $key => $val)
@@ -444,7 +443,7 @@ if ($mode == 'searchkey')
         print '</td><td align="right">';
         if (! empty($newlangfileonly->tab_translate[$key]))
         {
-            if ($val != $newlangfileonly->tab_translate[$key]) 
+            if ($val != $newlangfileonly->tab_translate[$key])
             {
                 $htmltext = $langs->trans("OriginalValueWas", $newlangfileonly->tab_translate[$key]);
                 print $form->textwithpicto('', $htmltext, 1, 'info');
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index e856d52c2b6..0ce87a92c61 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -156,8 +156,8 @@ class box_actions extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'align' => 'left',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
 		}
 	}
@@ -191,7 +191,7 @@ class box_actions extends ModeleBoxes
 						// on affiche que les évènement du jours ou passé
 						// qui ne sont pas à 100%
 						$actioncejour=true;
-						
+
 						// TR
 						$logo=$contents[$line][0]['logo'];
 						$label=$contents[$line][1]['text'];
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index b6df56f52a2..653922c4cd2 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -124,8 +124,8 @@ class box_bookmarks extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'align' => 'left',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 51e4a22d756..5e6f50f5b88 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -146,8 +146,10 @@ class box_clients extends ModeleBoxes
 			}
 		}
 		else {
-			$this->info_box_contents[0][0] = array('align' => 'left',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 
 	}
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index be9a868109d..c7c6bbb92d3 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -165,8 +165,8 @@ class box_commandes extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'align' => 'left',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index 2372a31f035..7d08a643f87 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -158,8 +158,8 @@ class box_comptes extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
 
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index c6aaf1ec24a..63b617ffe62 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -151,8 +151,8 @@ class box_contacts extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'align' => 'left',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
 
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 7585c5d931c..197425b9a51 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -134,7 +134,7 @@ class box_contracts extends ModeleBoxes
 
                 if ($num==0)
                     $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center"',
+                        'td' => 'align="center opacitymedium"',
                         'text'=>$langs->trans("NoRecordedContracts"),
                     );
 
@@ -148,8 +148,8 @@ class box_contracts extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index b7c9dfa0e91..cf1d70531b3 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -169,8 +169,8 @@ class box_factures extends ModeleBoxes
 
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 4f88d99bb09..9869901c7ab 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -178,8 +178,8 @@ class box_factures_fourn extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->transnoentities("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->transnoentities("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 3313b4cbd50..11361b0aa44 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -168,8 +168,8 @@ class box_factures_fourn_imp extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
 
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 14a21d9712d..bba23671c47 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -172,8 +172,8 @@ class box_factures_imp extends ModeleBoxes
 		}
 		else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
 		}
 	}
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 9fcd8ec6cd7..a76715c9474 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -134,8 +134,10 @@ class box_ficheinter extends ModeleBoxes
 		}
 		else
 		{
-			$this->info_box_contents[0][0] = array('td' => '',
-			'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+			    'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 530a99c8224..6e11c67c51f 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -127,8 +127,8 @@ class box_fournisseurs extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
 
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 6c19b46e468..8a7681fb2b2 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -59,7 +59,7 @@ class box_goodcustomers extends ModeleBoxes
 
 		// disable box for such cases
 		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
-		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled=0; // not enabled by default. Very slow on large database 
+		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled=0; // not enabled by default. Very slow on large database
 	}
 
 	/**
@@ -148,8 +148,10 @@ class box_goodcustomers extends ModeleBoxes
 			}
 		}
 		else {
-			$this->info_box_contents[0][0] = array('align' => 'left',
-				'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 
 	}
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 8d8fea71411..1b90aae701a 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -133,7 +133,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				if (! $mesg)
 				{
 				    $langs->load("bills");
-				    
+
 				    $px1->SetData($data1);
 					unset($data1);
 					$px1->SetPrecisionY(0);
@@ -255,8 +255,10 @@ class box_graph_invoices_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => '',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index e7ece7a2a53..55866288ef2 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -132,7 +132,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				if (! $mesg)
 				{
 				    $langs->load("bills");
-				    
+
 				    $px1->SetData($data1);
 					unset($data1);
 					$px1->SetPrecisionY(0);
@@ -254,8 +254,10 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => '',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index ec45cc3dde7..fcc98d368f5 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -253,8 +253,10 @@ class box_graph_orders_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => '',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 28335c79b62..b259cf48604 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -252,8 +252,10 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => '',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 44d5d0b0c15..6c178e0c989 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -99,6 +99,10 @@ class box_graph_product_distribution extends ModeleBoxes
 		$nowarray=dol_getdate(dol_now(),true);
 		if (empty($year)) $year=$nowarray['year'];
 
+		$nbofgraph=0;
+		if ($showinvoicenb) $nbofgraph++;
+		if ($showpropalnb)  $nbofgraph++;
+		if ($showordernb)   $nbofgraph++;
 
 		$text = $langs->trans("BoxProductDistribution",$max).' - '.$langs->trans("Year").': '.$year;
 		$this->info_box_head = array(
@@ -113,11 +117,6 @@ class box_graph_product_distribution extends ModeleBoxes
 		);
 
 
-		$nbofgraph=0;
-		if ($showinvoicenb) $nbofgraph++;
-		if ($showpropalnb)  $nbofgraph++;
-		if ($showordernb)   $nbofgraph++;
-
 		$paramtitle=$langs->transnoentitiesnoconv("Products").'/'.$langs->transnoentitiesnoconv("Services");
 		if (empty($conf->produit->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Services");
 		if (empty($conf->service->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Products");
@@ -250,7 +249,7 @@ class box_graph_product_distribution extends ModeleBoxes
 		if (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
 		{
 			$langs->load("orders");
-			
+
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showordernb)
 			{
@@ -309,6 +308,11 @@ class box_graph_product_distribution extends ModeleBoxes
 			}
 		}
 
+		if (empty($nbofgraph))
+		{
+		    $langs->load("errors");
+		    $mesg=$langs->trans("ReadPermissionNotAllowed");
+		}
 		if (empty($conf->use_javascript_ajax))
 		{
 			$langs->load("errors");
@@ -380,9 +384,11 @@ class box_graph_product_distribution extends ModeleBoxes
 		}
 		else
 		{
-			$this->info_box_contents[0][0] = array(	'td' => 'align="left" class="nohover"',
-					'maxlength'=>500,
-					'text' => $mesg);
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+				'maxlength'=>500,
+				'text' => $mesg
+			);
 		}
 
 	}
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index ccce8372d1f..0ad485a115d 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -254,8 +254,10 @@ class box_graph_propales_permonth extends ModeleBoxes
 
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => '',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index 1bbcec45881..03780eb366d 100644
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -157,8 +157,8 @@ class box_members extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'align' => 'left',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
 
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 761fb6013b8..b0c47422806 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -188,8 +188,8 @@ class box_produits extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 69652fde11e..2f323fc5c4b 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -195,8 +195,8 @@ class box_produits_alerte_stock extends ModeleBoxes
 		}
 		else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
 		}
 	}
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 3f7b37f186a..60bc627005a 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -155,8 +155,8 @@ class box_propales extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index abc99246c4a..7d735136326 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -156,8 +156,8 @@ class box_prospect extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
 		}
 	}
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 0151ba24966..b1793a6ca41 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -161,8 +161,10 @@ class box_services_contracts extends ModeleBoxes
 			}
 		}
 		else {
-			$this->info_box_contents[0][0] = array('td' => '',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array(
+			    'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 
 	}
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 2754a4cece6..da1d42af408 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -84,7 +84,7 @@ class box_services_expired extends ModeleBoxes
     			$i = 0;
 
     			$thirdpartytmp = new Societe($this->db);
-    			
+
     			while ($i < $num)
     			{
     			    $late='';
@@ -140,8 +140,10 @@ class box_services_expired extends ModeleBoxes
     	}
     	else
     	{
-    		$this->info_box_contents[0][0] = array('td' => '',
-    		'text' => $langs->trans("ReadPermissionNotAllowed"));
+    		$this->info_box_contents[0][0] = array(
+    		    'td' => 'align="left" class="nohover opacitymedium"',
+    		    'text' => $langs->trans("ReadPermissionNotAllowed")
+    		);
     	}
     }
 
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 29b6009b367..83a34c2c0e5 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -160,8 +160,8 @@ class box_supplier_orders extends ModeleBoxes
         else
         {
             $this->info_box_contents[0][0] = array(
-                'td' => '',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
     }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 03af3ddfe88..421b3fae132 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -191,7 +191,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after enabling module. Click on button on/off to enable an application/module.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -1107,7 +1107,7 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
-TotalNumberOfActivatedModules=Activated feature/modules: <b>%s</b> / <b>%s</b>
+TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3b2ba307bbd..777121e2acb 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2245,7 +2245,8 @@ div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border
 }
 div .tdtop {
     vertical-align: top !important;
-	padding-top: 5px !important;
+	padding-top: 8px !important;
+	padding-bottom: 2px !important;
 	padding-bottom: 0px;
 }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 927830da51d..e1a286d5d7a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2820,7 +2820,7 @@ div.tabBar .noborder {
 div .tdtop {
     vertical-align: top !important;
 	padding-top: 5px !important;
-	padding-bottom: 0px;
+	padding-bottom: 0px !important;
 }
 
 #tablelines tr.liste_titre td, .paymenttable tr.liste_titre td, .margintable tr.liste_titre td, .tableforservicepart1 tr.liste_titre td {

From 605dbd61f265aa78f5f055a090d973f0cf16943c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 00:21:04 +0200
Subject: [PATCH 1054/1163] Fix phpunit

---
 test/phpunit/AdherentTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index 5db9808c9ab..34ec0a80917 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -79,13 +79,13 @@ class AdherentTest extends PHPUnit_Framework_TestCase
         global $conf,$user,$langs,$db;
         $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { 
+        if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
             print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
             die();
         }
         if (! empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
         if (! empty($conf->global->MAIN_MODULE_MAILMANSPIP)) { print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die(); }
-        
+
         print __METHOD__."\n";
     }
 
@@ -532,7 +532,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-        $result=$localobject->delete($localobject->id);
+        $result=$localobject->delete($localobject->id, $user);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 

From 9a30e8edc6d6ac718d4c08b0b228b0f06fe6ca09 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 00:22:12 +0200
Subject: [PATCH 1055/1163] Update changelog

---
 ChangeLog | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7bbaf440ae..5b4f986fbb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,8 +6,8 @@ English Dolibarr ChangeLog
 
 For developers:
 NEW: Add a lot of API REST: dictionaryevents, memberstypes, ...
-NEW: Big refactorization of multicompany transverse mode
-NEW: getEntity function use true $shared value by default
+NEW: Big refactorization of multicompany transverse mode.
+NEW: getEntity function use true $shared value by default.
 
 WARNING: 
 
@@ -17,7 +17,9 @@ Following changes may create regression for some external modules, but were nece
 * The page societe/soc.php was renamed into societe/card.php to match page naming conventions.
 * The page compta/facture.php was renamed into compta/facture/card.php to match page naming conventions.
 * The signature of method ->delete() of class Product and PriceExpression was changed from 
-  ->delete($id, notrigger) to ->delete(User, notrigger) to match standard dev rules.
+  ->delete(id, notrigger) to ->delete(User, notrigger) to match standard dev rules.
+* The signature of method ->delete() of class Adherent was changed from 
+  ->delete(id) to ->delete(id, User, notrigger) to match standard dev rules.
 * Removed CommonObject::displayMarginInfos (was deprecated in 3.8). Use same method into
   html.formmargin.class.php
 * Removed Societe::set_commnucation_level (was deprecated in 4.0). Was not used.

From 87c8659e72a0ae22e083b1170414b443f71a8561 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 00:45:18 +0200
Subject: [PATCH 1056/1163] Fix responsive

---
 htdocs/core/lib/functions.lib.php | 6 ++++--
 htdocs/theme/eldy/style.css.php   | 1 +
 htdocs/theme/md/style.css.php     | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7d3cfac1c41..6f73d504d11 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1226,11 +1226,13 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                             if ($ret < 0) $error++;
                         }
 
+                        $heightforphotref=70;
+                        if (! empty($conf->dol_optimize_smallscreen)) $heightforphotref=60;
                         // Si fichier png PDF d'1 page trouve
                         if (file_exists($fileimage))
                         {
                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
-                            $phototoshow.= '<img height="70" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
+                            $phototoshow.= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
                             $phototoshow.= '</div></div>';
                         }
                         // Si fichier png PDF de plus d'1 page trouve
@@ -1238,7 +1240,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
                         {
                             $preview = preg_replace('/\.png/','',$relativepathimage) . "-0.png";
                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
-                            $phototoshow.= '<img height="70" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';
+                            $phototoshow.= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';
                             $phototoshow.= '</div></div>';
                         }
                     }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 777121e2acb..4fd7120a771 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -857,6 +857,7 @@ div.fiche>form>div.div-table-responsive {
 
 	div.divphotoref {
 		padding-right: 5px;
+	    padding-bottom: 5px;
 	}
     img.photoref, div.photoref {
     	border: none;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e1a286d5d7a..dc61977cf5f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -858,6 +858,7 @@ div.fiche>form>div.div-table-responsive {
 
 	div.divphotoref {
 		padding-right: 5px;
+	    padding-bottom: 5px;
 	}
     img.photoref, div.photoref {
     	border: none;

From 9e33baf0d62dc249b801074e81b051e06a1ccfca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 01:09:11 +0200
Subject: [PATCH 1057/1163] Prepare package for 6.0beta

---
 .tx/config                       | 4 ++--
 build/makepack-dolibarr.pl       | 2 +-
 build/rpm/dolibarr_fedora.spec   | 2 ++
 build/rpm/dolibarr_generic.spec  | 2 ++
 build/rpm/dolibarr_mandriva.spec | 2 ++
 build/rpm/dolibarr_opensuse.spec | 2 ++
 6 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.tx/config b/.tx/config
index 1839523f114..89d123b0362 100644
--- a/.tx/config
+++ b/.tx/config
@@ -224,13 +224,13 @@ source_file = htdocs/langs/en_US/members.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.members]
+[dolibarr.modulebuilder]
 file_filter = htdocs/langs/<lang>/modulebuilder.lang
 source_file = htdocs/langs/en_US/modulebuilder.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.members]
+[dolibarr.multicurrency]
 file_filter = htdocs/langs/<lang>/multicurrency.lang
 source_file = htdocs/langs/en_US/multicurrency.lang
 source_lang = en_US
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index b47ae023129..e908fb20d0a 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -591,7 +591,7 @@ if ($nboftargetok) {
         
         print "Remove subdir of custom dir\n";
    	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\;\n";
-   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to keep dir
+   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to remove all subdirs but not files
 	}
 
 	# Build package for each target
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index a0f981b8c11..33dc951309d 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -194,6 +194,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/modulebuilder
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -209,6 +210,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
+%_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 446e0e0d5f7..42a89675abf 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -274,6 +274,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/modulebuilder
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -289,6 +290,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
+%_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 1fb1b7fcc75..9dd2100b02c 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -190,6 +190,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/modulebuilder
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -205,6 +206,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
+%_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 1bb7ef061e6..d780c47da99 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -202,6 +202,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/modulebuilder
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -217,6 +218,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
+%_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico

From 2a6c21bd038e6c95e2b1ff4c39f7281210f54ea7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 01:13:26 +0200
Subject: [PATCH 1058/1163] Fix permissions on script file

---
 htdocs/modulebuilder/template/scripts/myobject.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 htdocs/modulebuilder/template/scripts/myobject.php

diff --git a/htdocs/modulebuilder/template/scripts/myobject.php b/htdocs/modulebuilder/template/scripts/myobject.php
old mode 100644
new mode 100755

From 660faac0f3a6c5a9e330be76374299a0851cab97 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 01:17:48 +0200
Subject: [PATCH 1059/1163] Prepare package 6.0

---
 build/generate_filelist_xml.php | 10 +++++-----
 build/makepack-dolibarr.pl      | 13 ++++++-------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index c1a56beacd7..94df2206579 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -43,7 +43,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 $includecustom=0;
 $includeconstants=array();
 
-if (empty($argv[1])) 
+if (empty($argv[1]))
 {
     print "Usage:   ".$script_file." release=x.y.z[-...] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
     print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=FR:INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n";
@@ -56,7 +56,7 @@ while ($i < $argc)
     if (preg_match('/includeconstant=/',$argv[$i]))
     {
         $tmp=explode(':', $includeconstant, 3);
-        if (count($tmp) != 3) 
+        if (count($tmp) != 3)
         {
             print "Error: Bad parameter includeconstant ".$includeconstant."\n";
             exit -1;
@@ -85,9 +85,9 @@ else
     }
 }
 
-print "Release          : ".$release."\n";
-print "Include custom   : ".$includecustom."\n";
-print "Include constants: ";
+print "Release                        : ".$release."\n";
+print "Include custom in signature    : ".$includecustom."\n";
+print "Include constants in signature : ";
 foreach ($includeconstants as $countrycode => $tmp)
 {
     foreach($tmp as $constname => $constvalue)
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index e908fb20d0a..9ded8399ccc 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -972,13 +972,12 @@ if ($nboftargetok) {
 			$ret=`$cmd`;
 			$ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_api_class.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_card.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_list.php`;
-			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_script.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject_class.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject_api_class.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/core/modules/modMyModule.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/myobject_card.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/myobject_list.php`;
+			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/scripts/myobject.php`;
 			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
 			$ret=`$cmd`;
 			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";

From 4cf862f03375a4b10ddb39f36088ffc4552e0984 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 01:19:20 +0200
Subject: [PATCH 1060/1163] Prepare package 6.0

---
 build/makepack-dolibarr.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 9ded8399ccc..c2d983653cb 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -972,7 +972,7 @@ if ($nboftargetok) {
 			$ret=`$cmd`;
 			$ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject_class.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject_api_class.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/core/modules/modMyModule.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/myobject_card.php`;

From 3d5899edf385c3951981327c8ec39cac558c45d0 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Sat, 10 Jun 2017 09:25:32 +0200
Subject: [PATCH 1061/1163] final blockedlog init

---
 htdocs/blockedlog/admin/blockedlog.php        | 126 +++++
 htdocs/blockedlog/admin/fingerprints.php      | 126 +++++
 htdocs/blockedlog/admin/index.html            |   0
 htdocs/blockedlog/ajax/authority.php          |  45 ++
 htdocs/blockedlog/ajax/check_signature.php    |  30 +
 htdocs/blockedlog/class/authority.class.php   | 308 +++++++++++
 htdocs/blockedlog/class/blockedlog.class.php  | 512 ++++++++++++++++++
 htdocs/blockedlog/lib/blockedlog.lib.php      |  57 ++
 htdocs/blockedlog/lib/index.html              |   0
 .../compta/paiement/class/paiement.class.php  |   4 +-
 htdocs/core/class/blockedlog.class.php        | 235 --------
 htdocs/core/modules/modBlockedLog.class.php   |   2 +-
 ..._modBlockedlog_ActionsBlockedLog.class.php |  42 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  31 +-
 .../mysql/tables/llx_blockedlog.key.sql       |   6 +
 .../install/mysql/tables/llx_blockedlog.sql   |  19 +
 .../tables/llx_blockedlog_authority.key.sql   |   1 +
 .../mysql/tables/llx_blockedlog_authority.sql |   7 +
 18 files changed, 1291 insertions(+), 260 deletions(-)
 create mode 100644 htdocs/blockedlog/admin/blockedlog.php
 create mode 100644 htdocs/blockedlog/admin/fingerprints.php
 create mode 100644 htdocs/blockedlog/admin/index.html
 create mode 100644 htdocs/blockedlog/ajax/authority.php
 create mode 100644 htdocs/blockedlog/ajax/check_signature.php
 create mode 100644 htdocs/blockedlog/class/authority.class.php
 create mode 100644 htdocs/blockedlog/class/blockedlog.class.php
 create mode 100644 htdocs/blockedlog/lib/blockedlog.lib.php
 create mode 100644 htdocs/blockedlog/lib/index.html
 delete mode 100644 htdocs/core/class/blockedlog.class.php
 create mode 100644 htdocs/install/mysql/tables/llx_blockedlog.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_blockedlog.sql
 create mode 100644 htdocs/install/mysql/tables/llx_blockedlog_authority.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_blockedlog_authority.sql

diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
new file mode 100644
index 00000000000..3c143b70b83
--- /dev/null
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -0,0 +1,126 @@
+<?php
+/* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/blockedlog/admin/blockedlog.php
+ *  \ingroup    system
+ *  \brief      Page setup for blockedlog module
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/blockedlog.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+$langs->load("admin");
+$langs->load("other");
+$langs->load("blockedlog");
+
+if (! $user->admin) accessforbidden();
+  
+$action = GETPOST('action','alpha');
+
+/*
+ * Actions
+ */
+if (preg_match('/set_(.*)/',$action,$reg))
+{
+	$code=$reg[1];
+	if (dolibarr_set_const($db, $code, GETPOST($code), 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+if (preg_match('/del_(.*)/',$action,$reg))
+{
+	$code=$reg[1];
+	if (dolibarr_del_const($db, $code, 0) > 0)
+	{
+		Header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+
+/*
+ *	View
+ */
+
+$block_static = new BlockedLog($db);
+
+$form=new Form($db);
+
+llxHeader('',$langs->trans("BlockedLogSetup"));
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ModuleSetup").' BlockedLog',$linkback);
+
+$head=blockedlogadmin_prepare_head();
+
+dol_fiche_head($head, 'blockedlog', '', -1);
+
+print $langs->trans("BlockedLogDesc")."<br>\n";
+
+print '<br>';
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Key").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
+print '<tr class="oddeven">';
+print '<td class="titlefield">';
+print $langs->trans("EntityKey").'</td><td align="center">';
+
+print $block_static->getSignature();
+
+print '</td></tr>';
+
+
+// Example with a yes / no select
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("BlockedLogAuthorityUrl").img_info($langs->trans('BlockedLogAuthorityNeededToStoreYouFingerprintsInNonAlterableRemote')).'</td>';
+print '<td align="right" width="300">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_BLOCKEDLOG_AUTHORITY_URL">';
+print '<input type="text" name="BLOCKEDLOG_AUTHORITY_URL" value="'.$conf->global->BLOCKEDLOG_AUTHORITY_URL.'" size="40" />';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+
+print '</table>';
+
+dol_fiche_end();
+
+print '<br><br>';
+
+llxFooter();
+$db->close();
diff --git a/htdocs/blockedlog/admin/fingerprints.php b/htdocs/blockedlog/admin/fingerprints.php
new file mode 100644
index 00000000000..bdd569d31bc
--- /dev/null
+++ b/htdocs/blockedlog/admin/fingerprints.php
@@ -0,0 +1,126 @@
+<?php
+/* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/blockedlog/admin/blockedlog.php
+ *  \ingroup    system
+ *  \brief      Page setup for blockedlog module
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/blockedlog.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+$langs->load("admin");
+$langs->load("other");
+$langs->load("blockedlog");
+
+if (! $user->admin) accessforbidden();
+  
+$action = GETPOST('action','alpha');
+
+
+/*
+ *	View
+ */
+
+$block_static = new BlockedLog($db);
+
+$blocks = $block_static->getLog('all', 0, GETPOST('all') ? 0 : 50);
+
+$form=new Form($db);
+
+llxHeader('',$langs->trans("BlockedLogSetup"));
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ModuleSetup").' BlockedLog',$linkback);
+
+$head=blockedlogadmin_prepare_head();
+
+dol_fiche_head($head, 'fingerprints', '', -1);
+
+print $langs->trans("FingerprintsDesc")."<br>\n";
+
+print '<br>';
+
+echo '<div align="right"><a href="?all=1">'.$langs->trans('ShowAllFingerPrintsMightBeTooLong').'</a></div>';
+		
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+
+print '<td>'.$langs->trans('Date').'</td>';
+print '<td>'.$langs->trans('Ref').'</td>';
+print '<td>'.$langs->trans('Action').'</td>';
+print '<td>'.$langs->trans('Element').'</td>';
+print '<td>'.$langs->trans('Amount').'</td>';
+print '<td>'.$langs->trans('Author').'</td>';
+print '<td>'.$langs->trans('Fingerprint').'</td>';
+print '<td><span id="blockchainstatus"></span></td>';
+				
+print '</tr>';
+
+foreach($blocks as &$block) {
+	
+   	print '<tr class="oddeven">';
+   	print '<td>'.dol_print_date($block->tms,'dayhour').'</td>';
+   	print '<td>'.$block->ref_object.'</td>';
+   	print '<td>'.$langs->trans('log'.$block->action).'</td>';
+   	print '<td>'.$block->getObject().'</td>';
+   	print '<td align="right">'.price($block->amounts).'</td>';
+   	print '<td>'.$block->getUser().'</td>';
+   	print '<td>'.$block->signature.'</td>';
+   	print '<td>';
+   	
+   	print $block->checkSignature() ? img_picto('OkCheckPaymentValidity', 'on') : img_picto($langs->trans('KoCheckPaymentValidity'), 'off');
+   	print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') :  img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black') );
+
+	print '</td>';
+	print '</tr>';
+					
+}
+
+print '</table>';
+
+?>
+				<script type="text/javascript">
+					
+					$.ajax({
+						url : "<?php echo dol_buildpath('/blockedlog/ajax/check_signature.php',1) ?>"
+						,dataType:"html"
+					}).done(function(data) {
+						
+						if(data == 'hashisok') {
+							$('#blockchainstatus').html('<?php echo $langs->trans('AuthorityReconizeFingerprintConformity'). ' '. img_picto($langs->trans('SignatureOK'), 'on') ?>');
+						}
+						else{
+							$('#blockchainstatus').html('<?php echo $langs->trans('AuthorityDidntReconizeFingerprintConformity'). ' '.img_picto($langs->trans('SignatureKO'), 'off') ?>');
+						}
+						
+					});
+					
+				</script>
+				
+<?php
+
+dol_fiche_end();
+
+print '<br><br>';
+
+llxFooter();
+$db->close();
diff --git a/htdocs/blockedlog/admin/index.html b/htdocs/blockedlog/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/blockedlog/ajax/authority.php b/htdocs/blockedlog/ajax/authority.php
new file mode 100644
index 00000000000..12584b2bace
--- /dev/null
+++ b/htdocs/blockedlog/ajax/authority.php
@@ -0,0 +1,45 @@
+<?php
+	
+	require '../../master.inc.php';
+	
+	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
+
+	$user=new User($db);
+	$user->fetch(1); //TODO conf user authority
+	
+	$auth = new BlockedLogAuthority($db);
+	
+	$signature = GETPOST('s');
+	$newblock = GETPOST('b');
+	$hash = GETPOST('h');
+	
+	if($auth->fetch(0, $signature)<=0) {
+		$auth->signature = $signature;
+		$auth->create($user);
+	}
+	
+	
+	if(!empty($hash)) {
+		
+		echo $auth->checkBlockchain($hash) ? 'hashisok' : 'hashisjunk';
+			
+	}
+	elseif(!empty($newblock)){
+		if($auth->checkBlock($newblock)) {
+			$auth->addBlock($newblock);
+			$auth->update($user);
+			
+			echo 'blockadded';
+		}
+		else{
+				
+			echo 'blockalreadyadded';
+				
+		}
+	}
+	else{
+		echo 'idontunderstandwhatihavetodo';
+	}
+	
+	
diff --git a/htdocs/blockedlog/ajax/check_signature.php b/htdocs/blockedlog/ajax/check_signature.php
new file mode 100644
index 00000000000..bb018508a31
--- /dev/null
+++ b/htdocs/blockedlog/ajax/check_signature.php
@@ -0,0 +1,30 @@
+<?php
+
+	require '../../main.inc.php';
+
+	if(empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) exit('BLOCKEDLOG_AUTHORITY_URL not set');
+	
+	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
+	
+	$auth=new BlockedLogAuthority($db);
+	$auth->syncSignatureWithAuthority();
+	
+	$block_static = new BlockedLog($db);
+	
+	$blocks = $block_static->getLog('just_certified', 0, 0, 1) ;
+
+	$auth->signature = $block_static->getSignature();
+	
+	foreach($blocks as &$b) {
+		$auth->blockchain.=$b->signature;	
+			
+	}
+	
+	$hash = $auth->getBlockchainHash();
+	
+	$url = $conf->global->BLOCKEDLOG_AUTHORITY_URL.'/blockedlog/ajax/authority.php?s='.$auth->signature.'&h='.$hash;
+
+	$res = file_get_contents($url);
+	//echo $url;
+	echo $res;
\ No newline at end of file
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
new file mode 100644
index 00000000000..b7128b28e09
--- /dev/null
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -0,0 +1,308 @@
+<?php 
+/* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	Class to manage certif authority
+ */
+class BlockedLogAuthority {
+	
+	/**
+	 * Id of the log
+	 * @var int
+	 */
+	public $id;
+	
+	/**
+	 * Unique fingerprint of the blockchain to store
+	 * @var string
+	 */
+	public $signature = '';
+	
+	/**
+	 * Entire fingerprints blockchain
+	 * @var string
+	 */
+	public $blockchain = '';
+	
+	/**
+	 * timestamp
+	 * @var int
+	 */
+	public $tms = 0;
+	
+	/**
+	 *      Constructor
+	 *
+	 *      @param		DoliDB		$db      Database handler
+	 */
+    public function __construct($db) {
+    	
+    	$this->db = $db;
+    	
+	}
+	
+	/**
+	 *	Get hash of the block chain to check
+	 *
+	 *	@return     string         			hash md5 of blockchain
+	 */
+	public function getBlockchainHash() {
+		
+		return md5($this->signature.$this->blockchain);
+		
+	}
+	
+	/**
+	 *	Get hash of the block chain to check
+	 *
+	 *	@param      string		$hash		hash md5 of blockchain to test
+	 *	@return     boolean
+	 */
+	public function checkBlockchain($hash) {
+		
+		return ($hash === $this->getBlockchainHash() );
+		
+	}
+	
+	/**
+	 *	Add a new block to the chain
+	 *
+	 *	@param      string		$block		new block to chain
+	 */
+	public function addBlock($block) {
+		
+		$this->blockchain.=$block;
+		
+	}
+	
+	/**
+	 *	hash already exist into chain ?
+	 *
+	 *	@param      string		$block		new block to chain
+	 *	@return     boolean
+	 */
+	public function checkBlock($block) {
+		
+		if(strlen($block)!=64) return false;
+		
+		$blocks = str_split($this->blockchain,64);
+		
+		if(!in_array($block,$blocks)) {
+			return true;
+		}			
+		else{
+			return false;
+		}
+	}
+	
+	
+	/**
+	 *	Get object from database
+	 *
+	 *	@param      int		$rowid       	Id of object to load
+	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
+	 */
+	public function fetch($id, $signature='') {
+		
+		global $langs;
+		
+		dol_syslog(get_class($this)."::fetch id=".$id, LOG_DEBUG);
+		
+		if (empty($id) && empty($signature))
+		{
+			$this->error='BadParameter';
+			return -1;
+		}
+		
+		$langs->load("blockedlog");
+		
+		$sql = "SELECT b.rowid, b.signature, b.blockchain, b.tms";
+		$sql.= " FROM ".MAIN_DB_PREFIX."blockedlog_authority as b";
+		
+		if ($id) $sql.= " WHERE b.rowid = ". $id;
+		else if($signature)$sql.= " WHERE b.signature = '". $this->db->escape( $signature ) ."'" ;
+	
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+				
+				$this->id				= $obj->rowid;
+				$this->ref				= $obj->rowid;
+				
+				$this->signature		= $obj->signature;
+				$this->blockchain		= $obj->blockchain;
+				
+				$this->tms				= $this->db->jdate($obj->tms);
+				
+				return 1;
+			}
+			else
+			{
+				$this->error=$langs->trans("RecordNotFound");
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+		
+	}
+	
+	/**
+	 *	Create authority in database.
+	 *
+	 *	@param	User	$user      		Object user that create
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function create($user) {
+		
+		global $conf,$langs,$hookmanager;
+		
+		$langs->load('blockedlog');
+		
+		$error=0;
+		
+		dol_syslog(get_class($this).'::create', LOG_DEBUG);
+		
+		$this->db->begin();
+		
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."blockedlog_authority (";
+		$sql.= " signature,";
+		$sql.= " blockchain";
+		$sql.= ") VALUES (";
+		$sql.= "'".$this->db->escape($this->signature)."',";
+		$sql.= "'".$this->db->escape($this->blockchain)."'";
+		$sql.= ")";
+		
+		$res = $this->db->query($sql);
+		if ($res)
+		{
+			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."blockedlog_authority");
+			
+			if ($id > 0)
+			{
+				$this->id = $id;
+				
+				$this->db->commit();
+				
+				return $this->id;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+		
+	}
+	
+	/**
+	 *	Create authority in database.
+	 *
+	 *	@param	User	$user      		Object user that create
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function update($user) {
+		
+		global $conf,$langs,$hookmanager;
+		
+		$langs->load('blockedlog');
+		
+		$error=0;
+		
+		dol_syslog(get_class($this).'::create', LOG_DEBUG);
+		
+		$this->db->begin();
+		
+		$sql = "UPDATE ".MAIN_DB_PREFIX."blockedlog_authority SET ";
+		$sql.= " blockchain='".$this->db->escape($this->blockchain)."'";
+		$sql.= " WHERE rowid=".$this->id;
+		
+		$res = $this->db->query($sql);
+		if ($res)
+		{
+			$this->db->commit();
+				
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+		
+	}
+	
+	/**
+	 *	For cron to sync to authority.
+	 *
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function syncSignatureWithAuthority() {
+		global $conf, $langs;
+		
+		//TODO create cron task on activation
+		
+		if(empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
+			$this->error = $langs->trans('NoAuthorityURLDefined');
+			return -2;
+		}
+
+		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+		
+		$block_static = new BlockedLog($this->db);
+		
+		$blocks = $block_static->getLog('not_certified', 0, 0, 1);
+	
+		$signature=$block_static->getSignature();
+		
+		foreach($blocks as &$block) {
+			
+			$url = $conf->global->BLOCKEDLOG_AUTHORITY_URL.'/blockedlog/ajax/authority.php?s='.$signature.'&b='.$block->signature;
+			
+			$res = file_get_contents($url);
+			echo $block->signature.' '.$url. ' '.$res.'<br>';
+			if($res === 'blockalreadyadded' || $res === 'blockadded') {
+				
+				$block->setCertified();
+				
+			}
+			else {
+				
+				$this->error = $langs->trans('ImpossibleToContactAuthority ',$url);
+				return -1;
+			}
+			
+			
+		}
+		
+		return 1;
+	}
+	
+}
\ No newline at end of file
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
new file mode 100644
index 00000000000..d41790c63b5
--- /dev/null
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -0,0 +1,512 @@
+<?php
+/* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	Class to manage Blocked Log
+ */
+
+class BlockedLog {
+	
+	/**
+	 * Id of the log
+	 * @var int
+	 */
+	public $id;
+	
+	/**
+	 * Unique fingerprint of the log
+	 * @var string
+	 */
+	public $signature = '';
+	
+	/**
+	 * Unique fingerprint of the line log content
+	 * @var string
+	 */
+	public $signature_line = '';
+	
+	public $amounts = null;
+	
+	public $action = '';
+	
+	public $element = '';
+	
+	public $fk_object = 0;
+	
+	public $certified = false;
+	
+	public $fk_user = 0;
+	
+	public $date_object = 0;
+	
+	public $ref_object = '';
+	
+	public $object_data = null;
+	
+	
+	/**
+	 *      Constructor
+	 *
+	 *      @param		DoliDB		$db      Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+		
+	}
+
+	/**
+	 *      try to retrieve logged object
+	 *
+	 *      @param		object|string		$object      object logged
+	 */
+	public function getObject() {
+		global $langs;
+		
+		if($this->element === 'facture') {
+			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			
+			$object = new Facture($this->db);
+			if($object->fetch($this->fk_object)>0) {
+				return $object->getNomUrl(1);
+			}
+		}
+		else if($this->element === 'payment') {
+			require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+			
+			$object = new Paiement($this->db);
+			if($object->fetch($this->fk_object)>0) {
+				return $object->getNomUrl(1);
+			}
+		}
+	
+		return $langs->trans('ImpossibleToReloadObject', $this->element, $this->fk_object);
+		
+	}
+	
+	/**
+	 *      try to retrieve user author
+	 *
+	 *      @param		object|string		$object      object logged
+	 */
+	public function getUser() {
+		global $langs, $cachedUser;
+		
+		if(empty($cachedUser))$cachedUser=array();
+		
+		if(empty($cachedUser[$this->fk_user])) {
+			$u=new User($this->db);
+			if($u->fetch($this->fk_user)>0) {
+				$cachedUser[$this->fk_user] = $u;
+			}
+		}
+		
+		if(!empty($cachedUser[$this->fk_user])) {
+			return $cachedUser[$this->fk_user]->getNomUrl(1);
+		}
+		
+		return $langs->trans('ImpossibleToRetrieveUser', $this->fk_user);
+	}
+	
+	/**
+	 *      populate log by object
+	 *
+	 *      @param		payment|facture		$object      object to store
+	 */
+	public function setObjectData(&$object) {
+		
+		if($object->element=='payment') {
+			$this->date_object = $object->datepaye;
+		}
+		else{
+			$this->date_object = $object->date;
+		}
+		
+		$this->ref_object = $object->ref;
+		$this->element = $object->element;
+		$this->fk_object = $object->id;
+		
+		$this->object_data=new stdClass();
+		
+		if($this->element === 'facture') {
+			if(empty($object->thirdparty))$object->fetch_thirdparty();
+			$this->object_data->thirdparty=new stdClass();
+			
+			foreach($object->thirdparty as $key=>$value) {
+				if(!is_object($value)) $this->object_data->thirdparty->{$key} = $value;
+			}
+			
+			$this->object_data->total_ht 	= (double)$object->total_ht;
+			$this->object_data->total_tva	= (double)$object->total_tva;
+			$this->object_data->total_ttc	= (double)$object->total_ttc;
+			$this->object_data->total_localtax1= (double)$object->total_localtax1;
+			$this->object_data->total_localtax2= (double)$object->total_localtax2;
+			$this->object_data->note_public	= (double)$object->note_public;
+			$this->object_data->note_private= (double)$object->note_private;
+						
+		}
+		elseif($this->element==='payment'){
+			
+			$this->object_data->amounts = $object->amounts;
+			
+		}
+		
+		
+	}
+	
+	/**
+	 *	Get object from database
+	 *
+	 *	@param      int		$rowid       	Id of object to load
+	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
+	 */
+	public function fetch($id) {
+		
+		global $langs;
+		
+		dol_syslog(get_class($this)."::fetch id=".$id, LOG_DEBUG);
+		
+		if (empty($id))
+		{
+			$this->error='BadParameter';
+			return -1;
+		}
+		
+		$langs->load("blockedlog");
+		
+		$sql = "SELECT b.rowid, b.signature, b.amounts, b.action, b.element, b.fk_object, b.certified, b.tms, b.fk_user, b.date_object, b.ref_object, b.object_data";
+		$sql.= " FROM ".MAIN_DB_PREFIX."blockedlog as b";
+		if ($id) $sql.= " WHERE b.rowid = ". $id;
+		
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+				
+				$this->id				= $obj->rowid;
+				$this->ref				= $obj->rowid;
+				
+				$this->signature		= $obj->signature;
+				$this->amounts			= (double)$obj->amounts;
+				$this->action			= $obj->action;
+				$this->element			= $obj->element;
+				
+				$this->fk_object		= trim($obj->fk_object);
+				$this->date_object		= $this->db->jdate($obj->date_object);
+				$this->ref_object		= $obj->ref_object;
+				
+				$this->certified		= ($obj->certified == 1);
+				
+				$this->fk_user 			= $obj->fk_user;
+				
+				$this->tms				= $this->db->jdate($obj->tms);
+				
+				$this->object_data		= unserialize($obj->object_data);
+				
+				return 1;
+			}
+			else
+			{
+				$this->error=$langs->trans("RecordNotFound");
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+		
+	}
+	
+	/**
+	 *	Set block certified by authority
+	 *
+	 *	@return	boolean
+	 */
+	public function setCertified() {
+		
+		$res = $this->db->query("UPDATE ".MAIN_DB_PREFIX."blockedlog SET certified=1 WHERE rowid=".$this->id);
+		if($res===false) return false;
+		
+		return true;
+		
+		
+	}
+	
+	/**
+	 *	Create blocked log in database.
+	 *
+	 *	@param	User	$user      		Object user that create
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function create($user) {
+		
+		global $conf,$langs,$hookmanager;
+		
+		$langs->load('blockedlog');
+		
+		$error=0;
+		
+		dol_syslog(get_class($this).'::create', LOG_DEBUG);
+		
+		$this->getSignatureRecursive();
+		
+		
+		if (is_null($this->amounts))
+		{
+			$this->error=$langs->trans("BlockLogNeedAmountsValue");
+			dol_syslog($this->error, LOG_WARNING);
+			return -1;
+		}
+		
+		if(empty($this->element)) {
+			$this->error=$langs->trans("BlockLogNeedElement");
+			dol_syslog($this->error, LOG_WARNING);
+			return -2;
+		}
+		
+		if(empty($this->action)) {
+			$this->error=$langs->trans("BlockLogNeedAction");
+			dol_syslog($this->error, LOG_WARNING);
+			return -3;
+		}
+
+		$this->fk_user = $user->id;
+		
+		$this->db->begin();
+		
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."blockedlog (";
+		$sql.= "action,";
+		$sql.= " amounts,";
+		$sql.= " signature,";
+		$sql.= " signature_line,";
+		$sql.= " element,";
+		$sql.= " fk_object,";
+		$sql.= " date_object,";
+		$sql.= " ref_object,";
+		$sql.= " object_data,";
+		$sql.= " certified,";
+		$sql.= " fk_user,";
+		$sql.= " entity";
+		$sql.= ") VALUES (";
+		$sql.= "'".$this->db->escape($this->action)."',";
+		$sql.= "".$this->amounts.",";
+		$sql.= "'".$this->db->escape($this->signature)."',";
+		$sql.= "'".$this->db->escape($this->signature_line)."',";
+		$sql.= "'".$this->db->escape($this->element)."',";
+		$sql.= "".$this->fk_object.",";
+		$sql.= "'".$this->db->idate($this->date_object)."',";
+		$sql.= "'".$this->db->escape($this->ref_object)."',";
+		$sql.= "'".$this->db->escape(serialize($this->object_data))."',";
+		$sql.= "0,";
+		$sql.= "".$user->id.",";
+		$sql.= $conf->entity;
+		$sql.= ")";
+		
+		$res = $this->db->query($sql);
+		if ($res)
+		{
+			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."blockedlog");
+			
+			if ($id > 0)
+			{
+				$this->id = $id;
+				
+				$this->db->commit();
+				
+				return $this->id;
+			}
+			else
+			{
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+		
+	}
+	
+	/**
+	 *	return crypted value.
+	 *
+	 *	@param	string $value      		string to crypt
+	 *	@return	string					crypted string
+	 */
+	private function crypt($value) {
+		
+		return hash('sha256',$value);
+		
+	}
+	
+	/**
+	 *	check if current signature still correct compare to the chain
+	 *
+	 *	@return	boolean					
+	 */
+	public function checkSignature() {
+		
+		$signature_to_test = $this->signature;
+		
+		$this->getSignatureRecursive();
+	
+		return ($signature_to_test=== $this->signature);
+		
+	}
+	
+	/**
+	 *	set current signatures 
+	 */
+	 private function getSignatureRecursive(){
+		
+		$this->signature_line = $this->crypt( $this->action . $this->getSignature() . $this->amounts . print_r($this->object_data, true) );
+		/*if($this->signature=='d6320580a02c1ab67fcc0a6d49d453c7d96dda0148901736f7f55725bfe1b900' || $this->signature=='ea65d435ff12ca929936a406aa9d707d99fb334c127878d256b602a5541bbbc9') {
+			var_dump($this->signature_line,$this->action ,$this->getSignature() , $this->amounts , $this->object_data);
+		}*/
+		$this->signature = $this->signature_line;
+		
+		$logs = $this->getLog('all', 0, 0, 1) ;
+		if($logs!==false) {
+			foreach($logs as &$b) {
+			
+				if($this->id>0 && $b->id == $this->id) break; // on arrête sur un enregistrement précis pour recalculer une signature
+				
+				$b->getCurrentValue(); // on récupère la valeur actuelle en base de l'élément enregistré
+				
+				$this->signature = $this->crypt($this->signature. $this->action . $b->signature . $b->amounts);
+			}
+		}
+		
+	}
+	
+	/**
+	 *	return log object for a element.
+	 *
+	 *	@param	string $element      	element to search
+	 *	@param	int $fk_object			id of object to search
+	 *	@param	int $limit      		max number of element, 0 for all
+	 *	@param	string $order      		sort of query
+	 *	@return	array					array of object log
+	 */
+	public function getLog($element, $fk_object, $limit = 0, $order = -1) {
+		global $conf,$cachedlogs ; 
+		
+		/* $cachedlogs allow fastest search */
+		if(empty($cachedlogs)) $cachedlogs=array();
+	
+		
+		if($element=='all') {
+		
+	 		$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE entity=".$conf->entity;
+	    	
+		}
+		else if($element=='not_certified') {
+			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE entity=".$conf->entity." AND certified = 0";
+			
+		}
+		else if($element=='just_certified') {
+			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE entity=".$conf->entity." AND certified = 1";
+			
+		}
+		else{
+			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
+	         WHERE element='".$element."' AND fk_object=".(int)$fk_object;
+			
+		}
+		
+		$sql.=($order<0 ? ' ORDER BY rowid DESC ' : ' ORDER BY rowid ASC ');
+		
+		if($limit > 0 )$sql.=' LIMIT '.$limit;
+		
+		$res = $this->db->query($sql);
+		
+		if($res) {
+		
+			$results=array();
+			
+			while($obj = $this->db->fetch_object($res)) {
+				
+				if(!isset($cachedlogs[$obj->rowid])) {
+					$b=new BlockedLog($this->db);
+					$b->fetch($obj->rowid);
+					
+					$cachedlogs[$obj->rowid] = $b;
+				}
+				
+				$results[] = $cachedlogs[$obj->rowid];
+				
+			}
+			
+			return $results;
+		}
+		else{
+			return false;
+		}
+	}
+	
+	/**
+	 *	set amounts of log from current element value in order to compare signature.
+	 */
+	private function getCurrentValue() {
+		
+		if($this->action === 'PAYMENT_CUSTOMER_CREATE'
+		|| $this->action === 'PAYMENT_ADD_TO_BANK') {
+			$sql="SELECT amount FROM ".MAIN_DB_PREFIX."paiement WHERE rowid=".$this->fk_object;
+					
+			$res = $this->db->query($sql);
+			
+			if($res && $obj = $this->db->fetch_object($res)) {
+				$this->amounts = (double)$obj->amount;
+			}
+		}
+				
+	}
+	
+	/**
+	 *	return and set the entity signature included into line signature
+	 *
+	 *	@return	string					current entity signature
+	 */
+	public function getSignature() {
+		global $db,$conf,$mysoc;
+		
+		if(empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint
+			
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+			
+			$fingerprint = $this->crypt(print_r($mysoc,true).time().rand(0,1000));
+			
+			dolibarr_set_const($db, 'BLOCKEDLOG_ENTITY_FINGERPRINT', $fingerprint, 'chaine',0,'Numeric Unique Fingerprint', $conf->entity);
+			
+			$conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT= $fingerprint;
+		}
+		
+		return $conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT;
+	}
+	
+}
+
diff --git a/htdocs/blockedlog/lib/blockedlog.lib.php b/htdocs/blockedlog/lib/blockedlog.lib.php
new file mode 100644
index 00000000000..a7fca40d116
--- /dev/null
+++ b/htdocs/blockedlog/lib/blockedlog.lib.php
@@ -0,0 +1,57 @@
+<?php
+/* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file			htdocs/blockedlog/lib/blockedlog.lib.php
+ *	\ingroup		system
+ *  \brief			Library for common blockedlog functions
+ */
+
+/**
+ *  Define head array for tabs of blockedlog tools setup pages
+ *
+ *  @return			Array of head
+ */
+function blockedlogadmin_prepare_head()
+{
+	global $langs, $conf;
+
+	$h = 0;
+	$head = array();
+	
+	$head[$h][0] = DOL_URL_ROOT."/blockedlog/admin/blockedlog.php";
+	$head[$h][1] = $langs->trans("BlockedLog");
+	$head[$h][2] = 'blockedlog';
+	$h++;
+	
+	$head[$h][0] = DOL_URL_ROOT."/blockedlog/admin/fingerprints.php";
+	$head[$h][1] = $langs->trans("Fingerprints");
+	$head[$h][2] = 'fingerprints';
+	$h++;
+	
+	$object=new stdClass();
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'blockedlog');
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'blockedlog','remove');
+
+    return $head;
+}
diff --git a/htdocs/blockedlog/lib/index.html b/htdocs/blockedlog/lib/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 03a7759e52c..c8d7f4d3759 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -196,7 +196,7 @@ class Paiement extends CommonObject
 
 		$this->db->begin();
 
-		$ref = $this->getNextNumRef('');
+		$this->ref = $this->getNextNumRef('');
 
 		if ($way == 'dolibarr')
 		{
@@ -210,7 +210,7 @@ class Paiement extends CommonObject
 		}
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, fk_user_creat)";
-		$sql.= " VALUES (".$conf->entity.", '".$ref."', '". $this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', '".$total."', '".$mtotal."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.")";
+		$sql.= " VALUES (".$conf->entity.", '".$this->ref."', '". $this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', '".$total."', '".$mtotal."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.")";
 		
 		dol_syslog(get_class($this)."::Create insert paiement", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/core/class/blockedlog.class.php b/htdocs/core/class/blockedlog.class.php
deleted file mode 100644
index 3e622c42dc4..00000000000
--- a/htdocs/core/class/blockedlog.class.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php 
-
-class BlockedLog {
-	
-	public $signature = '';
-	
-	public $key_value1 = null;
-	
-	public $action = '';
-	
-	public $element = '';
-	
-	public $fk_object = 0;
-	
-	public $certified = false;
-	
-	public $fk_user = 0;
-	
-	function __construct(&$db) {
-		
-		$this->db =&$db;
-		
-	}
-	
-	public function create($user) {
-		
-		global $conf,$langs,$hookmanager;
-		
-		$langs->load('blockedlog');
-		
-		$error=0;
-		
-		dol_syslog(get_class($this).'::create', LOG_DEBUG);
-		
-		// Clean parameters
-		$this->signature = $this->getSignatureRecursive();
-		
-		
-		if (is_null($this->key_value1))
-		{
-			$this->error=$langs->trans("BlockLogNeedKey1Value");
-			dol_syslog($this->error, LOG_WARNING);
-			return -1;
-		}
-		
-		if(empty($this->element)) {
-			$this->error=$langs->trans("BlockLogNeedElement");
-			dol_syslog($this->error, LOG_WARNING);
-			return -2;
-		}
-		
-		if(empty($this->action)) {
-			$this->error=$langs->trans("BlockLogNeedAction");
-			dol_syslog($this->error, LOG_WARNING);
-			return -3;
-		}
-
-		$this->fk_user = $user->id;
-		
-		$this->db->begin();
-		
-		//TODO add fk_user;
-		
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."blockedlog (";
-		$sql.= "action,";
-		$sql.= " key_value1,";
-		$sql.= " signature,";
-		$sql.= " element,";
-		$sql.= " fk_object,";
-		$sql.= " certified,";
-		$sql.= " entity";
-		$sql.= ") VALUES (";
-		$sql.= "'".$this->db->escape($this->action)."',";
-		$sql.= "".$this->key_value1.",";
-		$sql.= "'".$this->db->escape($this->signature)."',";
-		$sql.= "'".$this->db->escape($this->element)."',";
-		$sql.= "".$this->fk_object.",";
-		$sql.= "'".($this->certified ? 1 : 0)."',";
-		$sql.= $conf->entity;
-		$sql.= ")";
-		
-		$res = $this->db->query($sql);
-		if ($res)
-		{
-			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."blockedlog");
-			
-			if ($id > 0)
-			{
-				$this->id = $id;
-			
-			}
-			else
-			{
-				$this->db->rollback();
-				return -2;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->error();
-			$this->db->rollback();
-			return -1;
-		}
-		
-	}
-	
-	private function crypt($value) {
-		
-		return md5($value);
-		
-	}
-	
-	public function checkSignature() {
-		
-		$signature = $this->getSignatureRecursive();
-		
-		return ($signature === $this->signature);
-		
-	}
-	
-	private function getSignatureRecursive(){
-		
-		$signature = $this->crypt( $this->action . $this->getSignature() . $this->key_value1  );
-		
-		$logs = $this->getLog('payment', 0, 0, 'ASC') ;
-		if($logs!==false) {
-			foreach($logs as &$b) {
-			
-				if($this->id>0 && $b->id == $this->id) break; // on arrête sur un enregistrement précis pour recalculer une signature
-				
-				$b->updateValue(); // on récupère la valeur actuelle en base de l'élément enregistré
-				
-				$signature = $this->crypt($signature. $this->action . $b->signature . $b->key_value1);
-			}
-		}
-		return $signature;
-	
-	}
-	
-	public function getLog($element, $fk_object, $limit = 0, $order = 'DESC') {
-		global $conf,$cachedlogs ; 
-		
-		if(empty($cachedlogs)) $cachedlogs=array();
-	
-		
-		if($element=='payment') {
-		
-	 		$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
-	         WHERE entity=".$conf->entity." AND  action LIKE '%PAYMENT%'
-	         ORDER BY tms ".$order;
-			
-		}
-		else if($element=='payments_not_certified') {
-			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
-	         WHERE entity=".$conf->entity." AND action LIKE '%PAYMENT%' AND certified = 0
-	         ORDER BY tms ".$order;
-			
-		}
-		else if($element=='payments_just_certified') {
-			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
-	         WHERE entity=".$conf->entity." AND action LIKE '%PAYMENT%' AND certified = 1
-	         ORDER BY tms ".$order;
-			
-		}
-		else{
-			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
-	         WHERE element='".$element."' AND fk_object=".(int)$fk_object."
-	         ORDER BY tms ".$order;
-			
-		}
-		
-		
-		if($limit > 0 )$sql.=' LIMIT '.$limit;
-		
-		$res = $this->db->query($sql);
-		
-		if($res) {
-		
-			$results=array();
-			
-			while($obj = $this->db->fetch_object($res)) {
-				
-				if(!isset($cachedlogs[$obj->rowid])) {
-					$b=new BlockedLog($this->db);
-					$b->fetch($obj->rowid);
-					
-					$cachedlogs[$obj->rowid] = $b;
-				}
-				
-				$results[] = $cachedlogs[$obj->rowid];
-				
-			}
-			
-			return $results;
-		}
-		else{
-			return false;
-		}
-	}
-	
-	private function updateValue() {
-		
-		if($this->action === 'PAYMENT_CUSTOMER_CREATE'
-		|| $this->action === 'PAYMENT_ADD_TO_BANK') {
-			$sql="SELECT amount FROM ".MAIN_DB_PREFIX."paiement WHERE rowid=".$this->fk_object;
-					
-			$res = $this->db->query($sql);
-			
-			if($res && $obj = $db->fetch_object($res)) {
-				$this->key_value1 = (double)$obj->amount;
-			}
-		}
-				
-	}
-	
-	
-	public function getSignature() {
-		global $db,$conf,$mysoc;
-		
-		if(empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint
-			
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-			
-			$fingerprint = $this->crypt(print_r($mysoc,true).time().rand(0,1000));
-			
-			dolibarr_set_const($db, 'BLOCKEDLOG_ENTITY_FINGERPRINT', $fingerprint, '',0,'Numeric Unique Fingerprint', $conf->entity);
-			
-			$conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT= $fingerprint;
-		}
-		
-		return $conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT;
-	}
-	
-}
-
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index c3e2cb6345a..b149471cd20 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -60,7 +60,7 @@ class modBlockedLog extends DolibarrModules
 
         // Config pages
         //-------------
-        $this->config_page_url = array();
+        $this->config_page_url = array('blockedlog.php@blockedlog');
 
         // Dependancies
         //-------------
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 3307e4216ea..dde792a27d0 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -1,10 +1,5 @@
 <?php
-/* Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2009-2011 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2014 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2013	   Cedric GROSS         <c.gross@kreiz-it.fr>
- * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
- * Copyright (C) 2015       Bahfir Abbes        <bafbes@gmail.com>
+/* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,13 +16,13 @@
  */
 
 /**
- *	\file       htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
- *  \ingroup    agenda
- *  \brief      Trigger file for agenda module
+ *	\file       htdocs/core/triggers/interface_50_modAgenda_ActionsBlockedLog.class.php
+ *  \ingroup    system
+ *  \brief      Trigger file for blockedlog module
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/blockedlog.class.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 
 /**
  *  Class of triggered functions for agenda module
@@ -56,19 +51,40 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			return 0;
 		}
 		
+		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED') {
+			$amounts=  (double)$object->total_ttc;
+		}
+		else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
+			$amounts = 0;
+			if(!empty($object->amounts)) {
+				foreach($object->amounts as $amount) {
+					$amounts+= price2num($amount);
+				}
+			}
+			
+			
+		}
+		else if(strpos($action,'PAYMENT')!==false) {
+			$amounts= (double)$object->amount;
+		}
+		else {
+			return 0; // not implemented action log
+		}
+		
 		$b=new BlockedLog($this->db);
-		$b->element = $object->element;
 		$b->action = $action;
-		$b->fk_object = $object->id;
-		$b->key_value1 = 0;
+		$b->amounts= $amounts;
+		$b->setObjectData($object);
 		
 		$res = $b->create($user);
+		
 		if($res<0) {
 			setEventMessage($b->error,'errors');
 			
 			return -1;
 		}
 		else {
+			
 			return 1;
 		}
 		
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 786becac0ba..d5e758eb566 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -397,19 +397,32 @@ ALTER TABLE llx_usergroup_rights ADD CONSTRAINT fk_usergroup_rights_fk_usergroup
 
 CREATE TABLE llx_blockedlog 
 ( 
-	rowid integer AUTO_INCREMENT, 
-	tms	timestamp,
+	rowid integer AUTO_INCREMENT PRIMARY KEY, 
+	tms	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	action varchar(50), 
-	key_value1 real NOT NULL, 
-	signature varchar(32) NOT NULL, 
+	amounts real NOT NULL, 
+	signature varchar(100) NOT NULL, 
+	signature_line varchar(100) NOT NULL, 
 	element varchar(50), 
-	fk_object integer, 
+	fk_object integer,
+	ref_object varchar(100), 
+	date_object	datetime,
+	object_data	text,
+	fk_user	integer,
 	entity integer, 
-	certified integer, 
-	PRIMARY KEY (rowid), 
+	certified integer,
 	KEY signature (signature), 
 	KEY fk_object_element (fk_object,element), 
-	KEY entity (entity), 
+	KEY entity (entity),
+	KEY fk_user (fk_user), 
 	KEY entity_action (entity,action), 
 	KEY entity_action_certified (entity,action,certified) 
-) 
+) ENGINE=innodb;
+
+CREATE TABLE llx_blockedlog_authority 
+( 
+	rowid integer AUTO_INCREMENT PRIMARY KEY, 
+	blockchain longtext NOT NULL,
+	signature varchar(100) NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.key.sql b/htdocs/install/mysql/tables/llx_blockedlog.key.sql
new file mode 100644
index 00000000000..4312a056894
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_blockedlog.key.sql
@@ -0,0 +1,6 @@
+ALTER TABLE llx_blockedlog ADD INDEX signature (signature);
+ALTER TABLE llx_blockedlog ADD INDEX fk_object_element (fk_object,element);
+ALTER TABLE llx_blockedlog ADD INDEX entity (entity);
+ALTER TABLE llx_blockedlog ADD INDEX fk_user (fk_user); 
+ALTER TABLE llx_blockedlog ADD INDEX entity_action (entity,action);
+ALTER TABLE llx_blockedlog ADD INDEX entity_action_certified (entity,action,certified);
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
new file mode 100644
index 00000000000..769eb34e092
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -0,0 +1,19 @@
+
+CREATE TABLE llx_blockedlog 
+( 
+	rowid integer AUTO_INCREMENT PRIMARY KEY, 
+	tms	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	action varchar(50), 
+	amounts real NOT NULL, 
+	signature varchar(100) NOT NULL, 
+	signature_line varchar(100) NOT NULL, 
+	element varchar(50), 
+	fk_object integer,
+	ref_object varchar(100), 
+	date_object	datetime,
+	object_data	text,
+	fk_user	integer,
+	entity integer, 
+	certified integer
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_blockedlog_authority.key.sql b/htdocs/install/mysql/tables/llx_blockedlog_authority.key.sql
new file mode 100644
index 00000000000..289b6dbde56
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_blockedlog_authority.key.sql
@@ -0,0 +1 @@
+ALTER TABLE llx_blockedlog_authority ADD INDEX signature (signature);
diff --git a/htdocs/install/mysql/tables/llx_blockedlog_authority.sql b/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
new file mode 100644
index 00000000000..eb491f93af4
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
@@ -0,0 +1,7 @@
+CREATE TABLE llx_blockedlog_authority 
+( 
+	rowid integer AUTO_INCREMENT PRIMARY KEY, 
+	blockchain longtext NOT NULL,
+	signature varchar(100) NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=innodb;

From 63b3010c2e33f631b8e515e8c37e60ebf8d3a8f0 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Sat, 10 Jun 2017 09:28:07 +0200
Subject: [PATCH 1062/1163] fix sql

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index d5e758eb566..f4757e2475f 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -410,15 +410,16 @@ CREATE TABLE llx_blockedlog
 	object_data	text,
 	fk_user	integer,
 	entity integer, 
-	certified integer,
-	KEY signature (signature), 
-	KEY fk_object_element (fk_object,element), 
-	KEY entity (entity),
-	KEY fk_user (fk_user), 
-	KEY entity_action (entity,action), 
-	KEY entity_action_certified (entity,action,certified) 
+	certified integer
 ) ENGINE=innodb;
 
+ALTER TABLE llx_blockedlog ADD INDEX signature (signature);
+ALTER TABLE llx_blockedlog ADD INDEX fk_object_element (fk_object,element);
+ALTER TABLE llx_blockedlog ADD INDEX entity (entity);
+ALTER TABLE llx_blockedlog ADD INDEX fk_user (fk_user); 
+ALTER TABLE llx_blockedlog ADD INDEX entity_action (entity,action);
+ALTER TABLE llx_blockedlog ADD INDEX entity_action_certified (entity,action,certified);
+
 CREATE TABLE llx_blockedlog_authority 
 ( 
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
@@ -426,3 +427,5 @@ CREATE TABLE llx_blockedlog_authority
 	signature varchar(100) NOT NULL,
 	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
+
+ALTER TABLE llx_blockedlog_authority ADD INDEX signature (signature);

From 4fd24f6d8c9c2e5c5f154530e052827e8ccf3edb Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Sat, 10 Jun 2017 09:58:07 +0200
Subject: [PATCH 1063/1163] fix travis

---
 .../interface_50_modBlockedlog_ActionsBlockedLog.class.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index dde792a27d0..5a52777cbb9 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -52,7 +52,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		}
 		
 		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED') {
-			$amounts=  (double)$object->total_ttc;
+			$amounts=  (double) $object->total_ttc;
 		}
 		else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
 			$amounts = 0;
@@ -65,7 +65,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			
 		}
 		else if(strpos($action,'PAYMENT')!==false) {
-			$amounts= (double)$object->amount;
+			$amounts= (double) $object->amount;
 		}
 		else {
 			return 0; // not implemented action log

From 3cae54c29606bd892dffae11e4eb25201acd9c7f Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Sat, 10 Jun 2017 10:10:34 +0200
Subject: [PATCH 1064/1163] fix travis

---
 htdocs/blockedlog/class/authority.class.php  |  8 +--
 htdocs/blockedlog/class/blockedlog.class.php | 53 +++++++++++++-------
 2 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index b7128b28e09..8d241694b70 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -18,7 +18,8 @@
 /**
  *	Class to manage certif authority
  */
-class BlockedLogAuthority {
+class BlockedLogAuthority 
+{
 	
 	/**
 	 * Id of the log
@@ -113,8 +114,9 @@ class BlockedLogAuthority {
 	/**
 	 *	Get object from database
 	 *
-	 *	@param      int		$rowid       	Id of object to load
-	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
+	 *	@param      int			$id		       	Id of object to load
+	 *	@param      string		$signature		Signature of object to load
+	 *	@return     int         				>0 if OK, <0 if KO, 0 if not found
 	 */
 	public function fetch($id, $signature='') {
 		
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index d41790c63b5..26283d6b08a 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -19,7 +19,8 @@
  *	Class to manage Blocked Log
  */
 
-class BlockedLog {
+class BlockedLog 
+{
 	
 	/**
 	 * Id of the log
@@ -41,14 +42,34 @@ class BlockedLog {
 	
 	public $amounts = null;
 	
+	/**
+	 * trigger action
+	 * @var string
+	 */
 	public $action = '';
 	
+	/**
+	 * Object element
+	 * @var string
+	 */
 	public $element = '';
 	
+	/**
+	 * Object id
+	 * @var int
+	 */
 	public $fk_object = 0;
 	
+	/**
+	 * Log certified by remote authority or not
+	 * @var boolean
+	 */
 	public $certified = false;
 	
+	/**
+	 * Author
+	 * @var int
+	 */
 	public $fk_user = 0;
 	
 	public $date_object = 0;
@@ -71,8 +92,6 @@ class BlockedLog {
 
 	/**
 	 *      try to retrieve logged object
-	 *
-	 *      @param		object|string		$object      object logged
 	 */
 	public function getObject() {
 		global $langs;
@@ -100,9 +119,7 @@ class BlockedLog {
 	
 	/**
 	 *      try to retrieve user author
-	 *
-	 *      @param		object|string		$object      object logged
-	 */
+	*/
 	public function getUser() {
 		global $langs, $cachedUser;
 		
@@ -144,19 +161,19 @@ class BlockedLog {
 		
 		if($this->element === 'facture') {
 			if(empty($object->thirdparty))$object->fetch_thirdparty();
-			$this->object_data->thirdparty=new stdClass();
+			$this->object_data->thirdparty = new stdClass();
 			
 			foreach($object->thirdparty as $key=>$value) {
 				if(!is_object($value)) $this->object_data->thirdparty->{$key} = $value;
 			}
 			
-			$this->object_data->total_ht 	= (double)$object->total_ht;
-			$this->object_data->total_tva	= (double)$object->total_tva;
-			$this->object_data->total_ttc	= (double)$object->total_ttc;
-			$this->object_data->total_localtax1= (double)$object->total_localtax1;
-			$this->object_data->total_localtax2= (double)$object->total_localtax2;
-			$this->object_data->note_public	= (double)$object->note_public;
-			$this->object_data->note_private= (double)$object->note_private;
+			$this->object_data->total_ht 	= (double) $object->total_ht;
+			$this->object_data->total_tva	= (double) $object->total_tva;
+			$this->object_data->total_ttc	= (double) $object->total_ttc;
+			$this->object_data->total_localtax1= (double) $object->total_localtax1;
+			$this->object_data->total_localtax2= (double) $object->total_localtax2;
+			$this->object_data->note_public	= (double) $object->note_public;
+			$this->object_data->note_private= (double) $object->note_private;
 						
 		}
 		elseif($this->element==='payment'){
@@ -171,7 +188,7 @@ class BlockedLog {
 	/**
 	 *	Get object from database
 	 *
-	 *	@param      int		$rowid       	Id of object to load
+	 *	@param      int		$id       	Id of object to load
 	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
 	 */
 	public function fetch($id) {
@@ -203,7 +220,7 @@ class BlockedLog {
 				$this->ref				= $obj->rowid;
 				
 				$this->signature		= $obj->signature;
-				$this->amounts			= (double)$obj->amounts;
+				$this->amounts			= (double) $obj->amounts;
 				$this->action			= $obj->action;
 				$this->element			= $obj->element;
 				
@@ -434,7 +451,7 @@ class BlockedLog {
 		}
 		else{
 			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
-	         WHERE element='".$element."' AND fk_object=".(int)$fk_object;
+	         WHERE element='".$element."' AND fk_object=".(int) $fk_object;
 			
 		}
 		
@@ -480,7 +497,7 @@ class BlockedLog {
 			$res = $this->db->query($sql);
 			
 			if($res && $obj = $this->db->fetch_object($res)) {
-				$this->amounts = (double)$obj->amount;
+				$this->amounts = (double) $obj->amount;
 			}
 		}
 				

From 7c0de18ac18b2c2e8ae78c8f38f7c915e4a1c486 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 12:56:28 +0200
Subject: [PATCH 1065/1163] Fix code comment

---
 htdocs/accountancy/admin/accountmodel.php     | 2 +-
 htdocs/accountancy/admin/categories_list.php  | 2 +-
 htdocs/accountancy/admin/journals_list.php    | 2 +-
 htdocs/adherents/card.php                     | 2 +-
 htdocs/adherents/list.php                     | 2 +-
 htdocs/adherents/subscription.php             | 2 +-
 htdocs/adherents/subscription/list.php        | 2 +-
 htdocs/adherents/type.php                     | 2 +-
 htdocs/admin/dict.php                         | 2 +-
 htdocs/admin/index.php                        | 2 +-
 htdocs/admin/mails_templates.php              | 2 +-
 htdocs/admin/websites.php                     | 2 +-
 htdocs/comm/action/card.php                   | 2 +-
 htdocs/comm/action/index.php                  | 2 +-
 htdocs/comm/action/listactions.php            | 2 +-
 htdocs/comm/action/pertype.php                | 2 +-
 htdocs/comm/action/peruser.php                | 2 +-
 htdocs/comm/card.php                          | 2 +-
 htdocs/comm/mailing/advtargetemailing.php     | 2 +-
 htdocs/comm/mailing/card.php                  | 2 +-
 htdocs/comm/mailing/list.php                  | 2 +-
 htdocs/comm/propal/card.php                   | 2 +-
 htdocs/comm/propal/list.php                   | 4 ++--
 htdocs/commande/card.php                      | 2 +-
 htdocs/commande/list.php                      | 2 +-
 htdocs/commande/orderstoinvoice.php           | 2 +-
 htdocs/compta/bank/bankentries.php            | 2 +-
 htdocs/compta/bank/index.php                  | 2 +-
 htdocs/compta/bank/various_payment/card.php   | 2 +-
 htdocs/compta/deplacement/card.php            | 2 +-
 htdocs/compta/facture/card.php                | 2 +-
 htdocs/compta/facture/fiche-rec.php           | 2 +-
 htdocs/compta/facture/list.php                | 4 ++--
 htdocs/compta/localtax/card.php               | 2 +-
 htdocs/compta/paiement/list.php               | 2 +-
 htdocs/compta/salaries/card.php               | 2 +-
 htdocs/compta/tva/card.php                    | 2 +-
 htdocs/contact/agenda.php                     | 2 +-
 htdocs/contact/card.php                       | 2 +-
 htdocs/contact/list.php                       | 2 +-
 htdocs/contrat/card.php                       | 2 +-
 htdocs/contrat/list.php                       | 4 ++--
 htdocs/contrat/services.php                   | 2 +-
 htdocs/cron/list.php                          | 4 ++--
 htdocs/don/card.php                           | 2 +-
 htdocs/don/list.php                           | 2 +-
 htdocs/expedition/card.php                    | 2 +-
 htdocs/expedition/list.php                    | 4 ++--
 htdocs/expensereport/card.php                 | 2 +-
 htdocs/expensereport/list.php                 | 4 ++--
 htdocs/fichinter/card.php                     | 2 +-
 htdocs/fichinter/list.php                     | 2 +-
 htdocs/fourn/card.php                         | 2 +-
 htdocs/fourn/commande/card.php                | 2 +-
 htdocs/fourn/commande/list.php                | 4 ++--
 htdocs/fourn/commande/orderstoinvoice.php     | 2 +-
 htdocs/fourn/facture/card.php                 | 2 +-
 htdocs/fourn/facture/list.php                 | 4 ++--
 htdocs/fourn/facture/paiement.php             | 2 +-
 htdocs/livraison/card.php                     | 2 +-
 htdocs/main.inc.php                           | 2 +-
 htdocs/margin/tabs/thirdpartyMargins.php      | 2 +-
 htdocs/product/card.php                       | 2 +-
 htdocs/product/document.php                   | 2 +-
 htdocs/product/fournisseurs.php               | 2 +-
 htdocs/product/info.php                       | 2 +-
 htdocs/product/list-with-listview.php         | 2 +-
 htdocs/product/price.php                      | 2 +-
 htdocs/product/stats/commande.php             | 2 +-
 htdocs/product/stats/commande_fournisseur.php | 2 +-
 htdocs/product/stats/contrat.php              | 2 +-
 htdocs/product/stats/facture.php              | 2 +-
 htdocs/product/stats/facture_fournisseur.php  | 2 +-
 htdocs/product/stats/propal.php               | 2 +-
 htdocs/product/stock/card.php                 | 2 +-
 htdocs/product/stock/mouvement.php            | 2 +-
 htdocs/product/stock/product.php              | 2 +-
 htdocs/projet/card.php                        | 2 +-
 htdocs/projet/list.php                        | 2 +-
 htdocs/projet/tasks.php                       | 2 +-
 htdocs/projet/tasks/list.php                  | 2 +-
 htdocs/projet/tasks/task.php                  | 2 +-
 htdocs/projet/tasks/time.php                  | 2 +-
 htdocs/public/demo/index.php                  | 2 +-
 htdocs/societe/agenda.php                     | 2 +-
 htdocs/societe/card.php                       | 2 +-
 htdocs/societe/consumption.php                | 2 +-
 htdocs/societe/list.php                       | 4 ++--
 htdocs/societe/notify/card.php                | 2 +-
 htdocs/societe/price.php                      | 2 +-
 htdocs/societe/project.php                    | 2 +-
 htdocs/societe/rib.php                        | 4 ++--
 htdocs/supplier_proposal/card.php             | 2 +-
 htdocs/supplier_proposal/list.php             | 4 ++--
 htdocs/user/agenda_extsites.php               | 2 +-
 htdocs/user/clicktodial.php                   | 2 +-
 htdocs/user/document.php                      | 2 +-
 htdocs/user/group/perms.php                   | 2 +-
 htdocs/user/index.php                         | 2 +-
 htdocs/user/ldap.php                          | 2 +-
 htdocs/user/note.php                          | 2 +-
 htdocs/user/param_ihm.php                     | 2 +-
 htdocs/user/perms.php                         | 2 +-
 103 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index e63e44b4f80..e22e993796f 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -80,7 +80,7 @@ if ($user->societe_id > 0) accessforbidden();
 if (! $user->rights->accounting->chartofaccount) accessforbidden();
 
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admin'));
 
 // This page is a generic page to edit dictionaries
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index e78737c3fb9..1bf9a693efd 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -80,7 +80,7 @@ $pagenext = $page + 1;
 
 $search_country_id = GETPOST('search_country_id','int');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admin'));
 
 // This page is a generic page to edit dictionaries
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 1421d71be97..68d5e5af5c0 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -66,7 +66,7 @@ if (empty($sortorder)) $sortorder='ASC';
 
 $error = 0;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admin'));
 
 // This page is a generic page to edit dictionaries
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index fe3bd4f4cfd..147040fbf67 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -112,7 +112,7 @@ if ($id)
 	$caneditfieldmember=$user->rights->adherent->creer;
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('membercard','globalcard'));
 
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 949d55020c8..ec6bb85710c 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -77,7 +77,7 @@ $pagenext = $page + 1;
 if (! $sortorder) { $sortorder=($filter=='outofdate'?"DESC":"ASC"); }
 if (! $sortfield) { $sortfield=($filter=='outofdate'?"d.datefin":"d.lastname"); }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('memberlist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 21de6e305b5..d1cbcea4864 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -89,7 +89,7 @@ if ($rowid)
     $caneditfieldmember=$user->rights->adherent->creer;
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('subscription'));
 
 // PDF
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index af3174c0b60..628ceb390e3 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -53,7 +53,7 @@ $pagenext = $page + 1;
 if (! $sortorder) {  $sortorder="DESC"; }
 if (! $sortfield) {  $sortfield="c.dateadh"; }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('subscriptionlist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index f2fa12446b3..f0be2ee9fae 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -79,7 +79,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter_x") || GETP
 }
 
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('membertypecard','globalcard'));
 
 
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 880c9a9ba1a..f903ce3e8fc 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -80,7 +80,7 @@ $pagenext = $page + 1;
 $search_country_id = GETPOST('search_country_id','int');
 $search_code = GETPOST('search_code','alpha');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admin'));
 
 // This page is a generic page to edit dictionaries
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index e9d38ad3776..a1ac45244e1 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -29,7 +29,7 @@ $langs->load("companies");
 
 if (!$user->admin) accessforbidden();
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('homesetup'));
 
 
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 9ff909862a3..b25e3a6a2ee 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -71,7 +71,7 @@ $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('emailtemplates'));
 
 // Name of SQL tables of dictionaries
diff --git a/htdocs/admin/websites.php b/htdocs/admin/websites.php
index 9aecc4dfb0a..1dc91786ada 100644
--- a/htdocs/admin/websites.php
+++ b/htdocs/admin/websites.php
@@ -59,7 +59,7 @@ $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admin'));
 
 // This page is a generic page to edit dictionaries
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 3a634cc21cd..1bb35fe7fe8 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -95,7 +95,7 @@ $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
 //var_dump($_POST);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('actioncard','globalcard'));
 
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 9a1d4db92ae..7d150efe140 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -118,7 +118,7 @@ $langs->load("agenda");
 $langs->load("other");
 $langs->load("commercial");
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agenda'));
 
 
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 0e6fbb196a1..7bedc4d8356 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -109,7 +109,7 @@ if (! $user->rights->agenda->allactions->read || $filter=='mine')	// If no permi
 	$filtert=$user->id;
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agendalist'));
 
 
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index c6fe302cf63..23d434742a0 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -140,7 +140,7 @@ $langs->load("agenda");
 $langs->load("other");
 $langs->load("commercial");
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agenda'));
 
 
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index ecb30881433..2f1e3735cd2 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -139,7 +139,7 @@ $langs->load("agenda");
 $langs->load("other");
 $langs->load("commercial");
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agenda'));
 
 
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 61fcc4dc502..b8906bd1038 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -80,7 +80,7 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('commcard','globalcard'));
 
 
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 0262a50d65c..832cefa5774 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -768,7 +768,7 @@ if ($object->fetch($id) >= 0) {
 			$std_soc = new Societe($db);
 			$action_search = 'query';
 
-			// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+			// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 			include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($db);
 			$hookmanager->initHooks(array ('thirdpartycard'));
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 956710e2abc..353117f5fa3 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -52,7 +52,7 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('mailingcard','globalcard'));
 
 // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 65e82b8f939..fb513c99b9b 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -45,7 +45,7 @@ $sall=GETPOST('sall', 'alphanohtml');
 $sref=GETPOST("sref", "alpha");
 $filteremail=GETPOST('filteremail','alpha');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('mailinglist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 4e26437fd19..d58f2223adb 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -107,7 +107,7 @@ if ($id > 0 || ! empty($ref)) {
 		dol_print_error('', $object->error);
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('propalcard','globalcard'));
 
 $permissionnote = $user->rights->propale->creer; // Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index cb4aa123f12..220422a6404 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -95,7 +95,7 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='p.ref';
 if (! $sortorder) $sortorder='DESC';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='proposallist';
 
 // Security check
@@ -113,7 +113,7 @@ $result = restrictedArea($user, $module, $objectid, $dbtable);
 
 $diroutputmassaction=$conf->propal->dir_output . '/temp/massgeneration/'.$user->id;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('propallist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 189d13c3ced..eeea825c1e5 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -98,7 +98,7 @@ $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('ordercard','globalcard'));
 
 $permissionnote = $user->rights->commande->creer; 		// Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 2f8810333f0..c49c1b18a4a 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -96,7 +96,7 @@ if (! $sortorder) $sortorder='DESC';
 // Initialize technical object to manage context to save list fields
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'orderlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 95e896160ce..e76adb2a67c 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -89,7 +89,7 @@ if ($action == 'create')
 	}
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 $hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('orderstoinvoice'));
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index 5f6d5156b72..5f50bf74c1b 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -131,7 +131,7 @@ if ($id > 0 || ! empty($ref))
 $contextpage='banktransactionlist'.(empty($object->ref)?'':'-'.$object->id);
 //var_dump($contextpage);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('banktransactionlist', $contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 44ecbe6eb6f..0c24d25e064 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -69,7 +69,7 @@ if (! $sortorder) $sortorder='ASC';
 // Initialize technical object to manage context to save list fields
 $contextpage='bankaccountlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index c0481829425..9444c0585f7 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -52,7 +52,7 @@ $result = restrictedArea($user, 'banque', '', '', '');
 
 $object = new PaymentVarious($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('variouscard','globalcard'));
 
 
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 949a7701698..555ea52b4e0 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -46,7 +46,7 @@ $confirm = GETPOST('confirm','alpha');
 
 $object = new Deplacement($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('tripsandexpensescard','globalcard'));
 
 $permissionnote=$user->rights->deplacement->creer;	// Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index e9be0a0b962..c79beaac4f3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -114,7 +114,7 @@ if ($id > 0 || ! empty($ref)) {
 	$ret = $object->fetch($id, $ref, '', '', $conf->global->INVOICE_USE_SITUATION);
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('invoicecard','globalcard'));
 
 $permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index aa5c6103638..221167a485a 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -93,7 +93,7 @@ if (($id > 0 || $ref) && $action != 'create' && $action != 'add')
 	}
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('invoicereccard','globalcard'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 746106b2307..00b18c00759 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -110,7 +110,7 @@ if (! $sortfield) $sortfield='f.datef';
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='invoicelist';
 
 // Security check
@@ -124,7 +124,7 @@ $object=new Facture($db);
 
 $now=dol_now();
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('invoicelist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 315b89637af..bd1f83d7f43 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -44,7 +44,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 $localtax = new Localtax($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('localtaxvatcard','globalcard'));
 
 
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index efc9d5e10d2..ec2bbc78fc6 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -68,7 +68,7 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="p.rowid";
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('paymentlist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 9abbecd35fc..20079ad18ee 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -48,7 +48,7 @@ $result = restrictedArea($user, 'salaries', '', '', '');
 
 $object = new PaymentSalary($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('salarycard','globalcard'));
 
 
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 4a3ea9ee516..ea26d2c55a8 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -45,7 +45,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 $object = new Tva($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('taxvatcard','globalcard'));
 
 
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 6c412c146d1..74ec89bf5d1 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -100,7 +100,7 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='a.datep, a.id';
 if (! $sortorder) $sortorder='DESC';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('contactcard','globalcard'));
 
 
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 67a7d9b31e4..ae13bb44a3a 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -76,7 +76,7 @@ if (! empty($canvas))
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('contactcard','globalcard'));
 
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index b2f8066367c..1293a258fab 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -114,7 +114,7 @@ else if ($type == "o")
 	$urlfiche="";
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 3c644e4260c..4e19d6109b8 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -68,7 +68,7 @@ $usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MA
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'contrat',$id);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('contractcard','globalcard'));
 
 $object = new Contrat($db);
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 11a259abce7..29e13412892 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -86,10 +86,10 @@ $staticcontratligne=new ContratLigne($db);
 
 if ($search_status == '') $search_status=1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='contractlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 0af99eeed33..3d5db42495a 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -77,7 +77,7 @@ $filter_opcloture=GETPOST('filter_opcloture');
 // Initialize context for list
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'servicelist'.$mode;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 3b830e4801f..620efae0437 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -50,7 +50,7 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='t.status';
 if (! $sortorder) $sortorder='ASC';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='cronjoblist';
 
 $status=GETPOST('status','int');
@@ -62,7 +62,7 @@ $securitykey = GETPOST('securitykey','alpha');
 
 $diroutputmassaction=$conf->cronjob->dir_output . '/temp/massgeneration/'.$user->id;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('cronjoblist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 8e1bd00d893..33f2375a1bf 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -60,7 +60,7 @@ $result = restrictedArea($user, 'don', $id);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('doncard','globalcard'));
 
 /*
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index a4f5f07679f..24ee68eb0f7 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -61,7 +61,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 	$search_amount="";
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('orderlist'));
 
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 966f1f95972..e3a1b0bc3fa 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -98,7 +98,7 @@ $extralabelslines=$extrafieldsline->fetch_name_optionals_label($object->table_el
 // Load object. Make an object->fetch
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('expeditioncard','globalcard'));
 
 $permissiondellink=$user->rights->expedition->livraison->creer;	// Used by the include of actions_dellink.inc.php
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 091b5e44bb8..c4a07580a9a 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -64,12 +64,12 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='shipmentlist';
 
 $viewstatut=GETPOST('viewstatut');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('shipmentlist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index dff27139581..d9c195f4ca9 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -105,7 +105,7 @@ $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('expensereportcard','globalcard'));
 
 $permissionnote = $user->rights->expensereport->creer; 		// Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 9cf47ddea94..8a8014edcb6 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -79,10 +79,10 @@ $optioncss = GETPOST('optioncss','alpha');
 if ($search_status == '') $search_status=-1;
 if ($search_user == '') $search_user=-1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='expensereportlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('expensereportlist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 51cd5a62d3f..9e463eb8ac4 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -76,7 +76,7 @@ $hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($co
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('interventioncard','globalcard'));
 
 $object = new Fichinter($db);
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 68d4e2bef34..0404f976328 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -82,7 +82,7 @@ $search_desc=GETPOST('search_desc','alpha');
 $search_status=GETPOST('search_status');
 $optioncss = GETPOST('optioncss','alpha');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 7b24ee4f082..e5e42042015 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -58,7 +58,7 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('suppliercard','globalcard'));
 
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index f77eb949c9a..2137e7ca747 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -92,7 +92,7 @@ $datelivraison=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), G
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'fournisseur', $id, '', 'commande');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('ordersuppliercard','globalcard'));
 
 $object = new CommandeFournisseur($db);
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 86fb7e5c4f5..9e8d841e976 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -114,10 +114,10 @@ if (! $sortorder) $sortorder='DESC';
 
 if ($search_status == '') $search_status=-1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='supplierorderlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('orderlist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 9fb9a63828d..a503776b653 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -88,7 +88,7 @@ if ($action == 'create')
 	}
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
 $hookmanager = new HookManager($db);
 $hookmanager->initHooks(array('orderstoinvoicesupplier'));
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 0ec657ccdfe..306ad62d69b 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -81,7 +81,7 @@ $socid='';
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('invoicesuppliercard','globalcard'));
 
 $object=new FactureFournisseur($db);
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 782a78981ed..0e19c73615b 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -116,7 +116,7 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="f.datef,f.rowid";
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='supplierinvoicelist';
 
 $diroutputmassaction=$conf->fournisseur->facture->dir_output . '/temp/massgeneration/'.$user->id;
@@ -125,7 +125,7 @@ $object=new FactureFournisseur($db);
 
 $now=dol_now();
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('supplierinvoicelist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index f51246d8eea..59b6e2a27e9 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -79,7 +79,7 @@ if ($user->societe_id > 0)
 }
 
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('paymentsupplier'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 4bfcc4611e6..bf8dc3e9bed 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -74,7 +74,7 @@ $extralabelslines=$extrafieldsline->fetch_name_optionals_label($object->table_el
 // Load object. Make an object->fetch
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('deliverycard','globalcard'));
 
 /*
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 26f455131cd..67458a66445 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -643,7 +643,7 @@ if (! defined('NOLOGIN'))
         }
         else
 		{
-	       // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+	       // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 	       $hookmanager->initHooks(array('main'));
 
 	       // Code for search criteria persistence.
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 3c9e721b3f6..d7257a3cb1d 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -52,7 +52,7 @@ if (! $sortfield) $sortfield="f.datef";
 $object = new Societe($db);
 if ($socid > 0) $object->fetch($socid);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartymargins','globalcard'));
 
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 02ad2f5172c..d42dc87b4b9 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -113,7 +113,7 @@ $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
 $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype,$objcanvas);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productcard','globalcard'));
 
 
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 2cf2f36b419..2b76fb0a111 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -50,7 +50,7 @@ $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productdocuments'));
 
 // Get parameters
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index a12499e4eac..84532ad219e 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -65,7 +65,7 @@ $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service&fournisseur',$fieldvalue,'product&product','','',$fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('pricesuppliercard','globalcard'));
 
 $object = new ProductFournisseur($db);
diff --git a/htdocs/product/info.php b/htdocs/product/info.php
index e6011c7945c..b73883a9aa0 100644
--- a/htdocs/product/info.php
+++ b/htdocs/product/info.php
@@ -36,7 +36,7 @@ $ref = GETPOST('ref','alpha');
 
 $result=restrictedArea($user,'produit|service',$id,'product&product');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('infoproduct'));
 
 $object = new Product($db);
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index 947cfaecbc2..8e4218db227 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -93,7 +93,7 @@ $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'productser
 if ((string) $type == '1') { $contextpage='servicelist'; if ($search_type=='') $search_type='1'; }
 if ((string) $type == '0') { $contextpage='productlist'; if ($search_type=='') $search_type='0'; }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 $form=new Form($db);
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 41f5cda1eb7..c1a6568f82b 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -72,7 +72,7 @@ if ($id > 0 || ! empty($ref))
 // Clean param
 if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_MULTIPRICES_LIMIT)) $conf->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productpricecard','globalcard'));
 
 
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 94eeb756385..f4c0c66cdec 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -44,7 +44,7 @@ $socid='';
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatsorder'));
 
 $mesg = '';
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 3201e7ed2e8..dafb2b5aafd 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -44,7 +44,7 @@ if (! empty($user->societe_id))
 	$socid = $user->societe_id;
 $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array (
 		'productstatssupplyorder'
 ));
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index cae9c86104f..b5a8ec2b039 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -41,7 +41,7 @@ $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatscontract'));
 
 $mesg = '';
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 92a80cf018e..d4f447128a1 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -45,7 +45,7 @@ $socid='';
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatsinvoice'));
 
 $showmessage=GETPOST('showmessage');
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 8da1a68d9c2..5701b8960e5 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -46,7 +46,7 @@ $socid = '';
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productstatssupplyinvoice'));
 
 $mesg = '';
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index ec796422f0b..c9aa8fd85bc 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -43,7 +43,7 @@ $socid='';
 if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array ('productstatspropal'));
 
 $mesg = '';
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 665d340f6f9..28e3f187f13 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -53,7 +53,7 @@ $backtopage=GETPOST("backtopage");
 // Security check
 $result=restrictedArea($user,'stock');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('warehousecard','globalcard'));
 
 $object = new Entrepot($db);
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 7a8010117a2..a227d62c5d9 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -79,7 +79,7 @@ $pdluoid=GETPOST('pdluoid','int');
 // Initialize context for list
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'movementlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 81942468ab3..69421aa5624 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -96,7 +96,7 @@ if (! empty($canvas))
     $objcanvas->getCanvas('stockproduct','card',$canvas);
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('stockproductcard','globalcard'));
 
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 174d93f4aef..e8c48352120 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -51,7 +51,7 @@ if ($id == '' && $ref == '' && ($action != "create" && $action != "add" && $acti
 $mine = GETPOST('mode')=='mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projectcard','globalcard'));
 
 $object = new Project($db);
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 827719148fe..0c638f8dd6b 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -99,7 +99,7 @@ if ($search_status == '') $search_status=-1;	// -1 or 1
 // Initialize context for list
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'projectlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 064281633c8..a9e50f96f91 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -64,7 +64,7 @@ $socid=0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskcard','globalcard'));
 
 $progress=GETPOST('progress', 'int');
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 18f133513b1..47387ec625a 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -70,7 +70,7 @@ $search_eyear	= GETPOST('search_eyear','int');
 // Initialize context for list
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'tasklist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 6018b8bef69..2d35be97f4a 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -50,7 +50,7 @@ $socid=0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 if (! $user->rights->projet->lire) accessforbidden();
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskcard','globalcard'));
 
 $object = new Task($db);
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 08eb429f664..2ace6736889 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -69,7 +69,7 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='t.task_date,t.task_datehour,t.rowid';
 if (! $sortorder) $sortorder='DESC';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskcard','globalcard'));
 
 $object = new Task($db);
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index d5db9866c1f..a24b43b806a 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -45,7 +45,7 @@ $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int');
 global $dolibarr_main_demo;
 if (empty($dolibarr_main_demo)) accessforbidden('Parameter dolibarr_main_demo must be defined in conf file with value "default login,default pass" to enable the demo entry page',0,0,1);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $res=$hookmanager->initHooks(array('demo'));
 
 $demoprofiles=array();
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 15ea29e9954..4d1ce4da9c7 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -61,7 +61,7 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='a.datep,a.id';
 if (! $sortorder) $sortorder='DESC';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agendathirdparty'));
 
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index d6710f68c92..e26b4733c84 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -69,7 +69,7 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartycard','globalcard'));
 
 if ($action == 'view' && $object->fetch($socid)<=0)
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 29bc06ff760..1fcd73f0ddc 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -78,7 +78,7 @@ $langs->load("interventions");
 $langs->load("contracts");
 $langs->load("products");
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('consumptionthirdparty'));
 
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 422768bce31..3bde7f09967 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -95,7 +95,7 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='thirdpartylist';
 /*if ($search_type == '1,3') { $contextpage='customerlist'; $type='c'; }
 if ($search_type == '2,3') { $contextpage='prospectlist'; $type='p'; }
@@ -105,7 +105,7 @@ if ($type == 'c') { $contextpage='customerlist'; if ($search_type=='') $search_t
 if ($type == 'p') { $contextpage='prospectlist'; if ($search_type=='') $search_type='2,3'; }
 if ($type == 'f') { $contextpage='supplierlist'; if ($search_type=='') $search_type='4'; }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index eacd047d93a..8487185ecd5 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -59,7 +59,7 @@ $now=dol_now();
 
 $object = new Societe($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartynotification','globalcard'));
 
 
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 952a34a9a59..05e39ffc576 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -52,7 +52,7 @@ $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 $object = new Societe($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartycustomerprice','globalcard'));
 
 
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index 72c371ce934..df2deb9da0c 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -39,7 +39,7 @@ $socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projectthirdparty'));
 
 
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 36914d74585..cb5dffc3399 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -59,11 +59,11 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartybancard','globalcard'));
 
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartybancard'));
 
 
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 020473fee59..c7807d8c4e5 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -97,7 +97,7 @@ if ($id > 0 || ! empty($ref)) {
 		dol_print_error('', $object->error);
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('supplier_proposalcard','globalcard'));
 
 $permissionnote = $user->rights->supplier_proposal->creer; // Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 7eb5d1323ed..e401fdbe710 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -96,7 +96,7 @@ if ($object_statut != '') $search_status=$object_statut;
 // Nombre de ligne pour choix de produit/service predefinis
 $NBLINES=4;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage='supplierproposallist';
 
 // Security check
@@ -114,7 +114,7 @@ $result = restrictedArea($user, $module, $objectid, $dbtable);
 
 $diroutputmassaction=$conf->supplier_proposal->dir_output . '/temp/massgeneration/'.$user->id;
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('supplier_proposallist'));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index e789a8277f3..255b476eb61 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -67,7 +67,7 @@ $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 if (($object->id != $user->id) && (! $user->rights->user->user->lire))
   accessforbidden();
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 /*
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 1500a3be55c..2ba3c67d0b4 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -41,7 +41,7 @@ if ($user->id == $id)	// A user can always read its own card
 }
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 /*
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index b15af46bcd8..bc4727feaa8 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -93,7 +93,7 @@ if ($id > 0 || ! empty($ref))
 	$upload_dir = $conf->user->multidir_output[$entitytouseforuserdir] . "/" . $object->id ;
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 77532de7c3e..94a9c9c1883 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -72,7 +72,7 @@ if (! empty($conf->multicompany->enabled))
 		$entity=(! empty($object->entity) ? $object->entity : $conf->entity);
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('groupcard','globalcard'));
 
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index da5ddd99339..f5434f822d5 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -60,7 +60,7 @@ if (! $sortorder) $sortorder="ASC";
 // Initialize context for list
 $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'userlist';
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 252ed9f82b4..96c0ac881be 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -45,7 +45,7 @@ $object = new User($db);
 $object->fetch($id, '', '', 1);
 $object->getrights();
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 /*
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index b9e8cb69869..1734e7286d4 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -49,7 +49,7 @@ $feature2 = (($socid && $user->rights->user->self->creer)?'':'user');
 if ($user->id == $id) $feature2=''; // A user can always read its own card
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 9ffeb05f280..8831b56f09a 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -78,7 +78,7 @@ $searchformtitle=array($langs->trans("Companies"),$langs->trans("Contacts"),$lan
 $form = new Form($db);
 $formadmin=new FormAdmin($db);
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 041213fbe64..5d87232c928 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -79,7 +79,7 @@ if (! empty($conf->multicompany->enabled))
 		$entity=(! empty($object->entity) ? $object->entity : $conf->entity);
 }
 
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 

From 5dfb988cb17042971ef9f0cc0b3b6ecab78fd9ba Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 10 Jun 2017 13:34:28 +0200
Subject: [PATCH 1066/1163] Fix 6944 compatibility PHP7 and missing parameter
 to call delete function

---
 htdocs/fourn/class/paiementfourn.class.php | 2 +-
 htdocs/fourn/facture/card.php              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 12fccab91d8..03f3ecb0e21 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -533,7 +533,7 @@ class PaiementFourn extends Paiement
 	 *	@param		string	$option			Sur quoi pointe le lien
 	 *	@return		string					Chaine avec URL
 	 */
-	function getNomUrl($withpicto=0,$option='')
+	function getNomUrl($withpicto=0,$option='',$mode='withlistofinvoices')
 	{
 		global $langs;
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 0ec657ccdfe..813f23cdc88 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -218,7 +218,7 @@ if (empty($reshook))
 	{
 	    $object->fetch($id);
 	    $object->fetch_thirdparty();
-	    $result=$object->delete($id);
+	    $result=$object->delete($user, $id);
 	    if ($result > 0)
 	    {
 	        header('Location: list.php');

From a8e16910c0f22413d78651dde5d8b1e9495026d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 13:44:20 +0200
Subject: [PATCH 1067/1163] Fix look and feel v6

---
 htdocs/comm/action/rapport/index.php      |  46 +++++++--
 htdocs/core/class/html.formfile.class.php | 116 +++++++++++-----------
 2 files changed, 95 insertions(+), 67 deletions(-)

diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index f6d01b18ca1..e83506d8206 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -26,6 +26,7 @@
 
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/action/rapport.pdf.php';
@@ -71,6 +72,8 @@ if ($action == 'builddoc')
  * View
  */
 
+$formfile=new FormFile($db);
+
 llxHeader();
 
 $sql = "SELECT count(*) as cc,";
@@ -103,7 +106,7 @@ if ($resql)
 
 	$param='';
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	
+
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -112,23 +115,24 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($langs->trans("Actions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_agenda', 0, '', '', $limit);
 
 	$moreforfilter='';
-	
+
 	$i = 0;
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
     print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Date").'</td>';
+	print '<td>'.$langs->trans("Period").'</td>';
 	print '<td align="center">'.$langs->trans("EventsNb").'</td>';
 	print '<td align="center">'.$langs->trans("Action").'</td>';
-	print '<td align="center">'.$langs->trans("PDF").'</td>';
+	print '<td>'.$langs->trans("PDF").'</td>';
 	print '<td align="center">'.$langs->trans("Date").'</td>';
 	print '<td align="center">'.$langs->trans("Size").'</td>';
 	print "</tr>\n";
+
 	$var=true;
 	while ($i < min($num,$limit))
 	{
@@ -136,23 +140,47 @@ if ($resql)
 
 		if ($obj)
 		{
-			
+
 			print '<tr class="oddeven">';
 
+			// Date
 			print "<td>".$obj->df."</td>\n";
+
+			// Nb of events
 			print '<td align="center">'.$obj->cc.'</td>';
 
+			// Button to build doc
 			print '<td align="center">';
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=builddoc&amp;page='.$page.'&amp;month='.$obj->month.'&amp;year='.$obj->year.'">'.img_picto($langs->trans('GenerateReport'),'filenew').'</a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=builddoc&amp;page='.$page.'&amp;month='.$obj->month.'&amp;year='.$obj->year.'">'.img_picto($langs->trans('BuildDoc'),'filenew').'</a>';
 			print '</td>';
 
 			$name = "actions-".$obj->month."-".$obj->year.".pdf";
 			$relativepath= $name;
 			$file = $conf->agenda->dir_temp."/".$name;
+			$modulepart = 'actionsreport';
+			$documenturl= DOL_URL_ROOT.'/document.php';
+			if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
 
 			if (file_exists($file))
 			{
-				print '<td align="center"><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?page='.$page.'&amp;file='.urlencode($relativepath).'&amp;modulepart=actionsreport">'.img_pdf().'</a></td>';
+				print '<td class="tdoverflowmax300">';
+				//print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?page='.$page.'&amp;file='.urlencode($relativepath).'&amp;modulepart=actionsreport">'.img_pdf().'</a>';
+
+				$filearray=array('name'=>basename($file),'fullname'=>$file,'type'=>'file');
+				$out='';
+
+				// Show file name with link to download
+				$tmp = $formfile->showPreview($filearray,$modulepart,$relativepath,0,$param);
+				$out.= ($tmp?$tmp.' ':'');
+				$out.= '<a href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
+				$mime=dol_mimetype($relativepath,'',0);
+				if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
+				$out.= ' target="_blank">';
+				$out.= img_mime($filearray["name"],$langs->trans("File").': '.$filearray["name"]).' '.$filearray["name"];
+				$out.= '</a>'."\n";
+                print $out;
+
+				print '</td>';
 				print '<td align="center">'.dol_print_date(dol_filemtime($file),'dayhour').'</td>';
 				print '<td align="center">'.dol_print_size(dol_filesize($file)).'</td>';
 			}
@@ -169,7 +197,7 @@ if ($resql)
 	print "</table>";
 	print '</div>';
 	print '</form>';
-	
+
 	$db->free($resql);
 }
 else
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index e263efeaa57..89cf70951ad 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -35,7 +35,7 @@
 class FormFile
 {
     private $db;
-    
+
     public $error;
     public $numoffiles;
     public $infofiles;			// Used to return informations by function getDocumentsLink
@@ -332,11 +332,11 @@ class FormFile
 							jQuery(\'#togglemassfilesarea\').text("('.dol_escape_js($langs->trans("Hide")).')");
 						}
 						return false;
-					});		
+					});
 				});
 				</script>';
-        }        
-        
+        }
+
         $titletoshow=$langs->trans("Documents");
         if (! empty($title)) $titletoshow=$title;
 
@@ -593,7 +593,7 @@ class FormFile
             if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
             $out.= '<input type="hidden" name="action" value="builddoc">';
             $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            
+
             $out.= load_fiche_titre($titletoshow, '', '');
             $out.= '<div class="div-table-responsive-no-min">';
             $out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
@@ -682,9 +682,9 @@ class FormFile
                 $sortfield = $sortorder = null;
                 $res = $link->fetchAll($link_list, $object->element, $object->id, $sortfield, $sortorder);
             }
-            
+
             $out.= '<!-- html.formfile::showdocuments -->'."\n";
-            
+
             // Show title of array if not already shown
             if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart)) && ! $headershown)
             {
@@ -706,8 +706,8 @@ class FormFile
 					$out.= '<tr class="oddeven">';
 
 					$documenturl = DOL_URL_ROOT.'/document.php';
-					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;
-					
+					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
+
 					// Show file name with link to download
 					$out.= '<td class="tdoverflowmax300">';
                     $tmp = $this->showPreview($file,$modulepart,$relativepath,0,$param);
@@ -774,7 +774,7 @@ class FormFile
             if (is_array($link_list))
             {
                 $colspan=2;
-                    
+
                 foreach($link_list as $file)
                 {
                     $out.='<tr class="oddeven">';
@@ -791,7 +791,7 @@ class FormFile
                 }
                 $this->numoffiles++;
             }
-            
+
 		 	if (count($file_list) == 0 && count($link_list) == 0 && $headershown)
             {
 	        	$out.='<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -835,7 +835,7 @@ class FormFile
     	$this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
 
     	//if (! empty($conf->dol_use_jmobile)) return '';
-  	 
+
 		$file_list=dol_dir_list($filedir, 'files', 0, preg_quote(basename($modulesubdir),'/').'[^\-]+', '\.meta$|\.png$');	// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files)
 
     	// For ajax treatment
@@ -876,7 +876,7 @@ class FormFile
                     $tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1, '&entity='.$entity);
                     if ($tmparray && $tmparray['url']) $tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
     			}
-    			
+
     			// Download
     		    $tmpout.= '<li><a class="pictopreview" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
     			$mime=dol_mimetype($relativepath,'',0);
@@ -946,7 +946,7 @@ class FormFile
 		if ($upload_dir)
 		{
     		$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
-    		$relativedir = preg_replace('/^[\\/]/','',$relativedir); 
+    		$relativedir = preg_replace('/^[\\/]/','',$relativedir);
 		}
 
 		$hookmanager->initHooks(array('formfile'));
@@ -983,7 +983,7 @@ class FormFile
 			        if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1;
 			    }
 			}
-			if (empty($conf->global->MAIN_UPLOAD_DOC)) 
+			if (empty($conf->global->MAIN_UPLOAD_DOC))
 			{
 			    $permtoeditline=0;
 			    $permonobject=0;
@@ -992,7 +992,7 @@ class FormFile
 			// Show list of existing files
 			if (empty($useinecm)) print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
 			if (empty($url)) $url=$_SERVER["PHP_SELF"];
-			
+
 			print '<!-- html.formfile::list_of_documents -->'."\n";
 			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
 			{
@@ -1003,7 +1003,7 @@ class FormFile
 			}
 			print '<div class="div-table-responsive-no-min">';
 			print '<table width="100%" id="tablelines" class="'.($useinecm?'liste noborder':'liste').'">'."\n";
-			
+
 			print '<tr class="liste_titre nodrag nodrop">';
 			print_liste_field_titre($langs->trans("Documents2"),$url,"name","",$param,'align="left"',$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("Size"),$url,"size","",$param,'align="right"',$sortfield,$sortorder);
@@ -1017,10 +1017,10 @@ class FormFile
 			if ($relativedir)
 			{
                 $filearrayindatabase = dol_dir_list_in_database($relativedir, '', null, 'name', SORT_ASC);
-    
+
                 //var_dump($filearray);
                 //var_dump($filearrayindatabase);
-                
+
                 // Complete filearray with properties found into $filearrayindatabase
     			foreach($filearray as $key => $val)
     			{
@@ -1040,7 +1040,7 @@ class FormFile
     			            break;
     			        }
     			    }
-    			    
+
     			    if (! $found)    // This happen in transition towerd version 6, or if files were added manually into os dir.
     			    {
     			        $filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
@@ -1053,13 +1053,13 @@ class FormFile
         			        dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
         			        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
         			        $ecmfile=new EcmFiles($this->db);
-        			        	
+
         			        // Add entry into database
         			        $filename = basename($rel_filename);
         			        $rel_dir = dirname($rel_filename);
         			        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
         			        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-        			         
+
         			        $ecmfile->filepath = $rel_dir;
         			        $ecmfile->filename = $filename;
         			        $ecmfile->label = md5_file(dol_osencode($filearray[$key]['fullname']));        // $destfile is a full path to file
@@ -1083,21 +1083,21 @@ class FormFile
     			        }
     			    }
     			}
-    
+
     			/*var_dump($filearray);
     			var_dump($sortfield);
     			var_dump($sortorder);*/
-    			 
+
     			if ($sortfield && $sortorder)
     			{
         			$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
     			}
     			//var_dump($filearray);
 			}
-			
+
 			$nboffiles=count($filearray);
 			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-				
+
 			$var=true; $i=0; $nboflines = 0; $lastrowid=0;
 			foreach($filearray as $key => $file)      // filearray must be only files here
 			{
@@ -1105,10 +1105,10 @@ class FormFile
 						&& $file['name'] != '..'
 						&& ! preg_match('/\.meta$/i',$file['name']))
 				{
-					
-					
+
+
 					if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
-					
+
 					$editline=0;
 					$nboflines++;
 			        print '<!-- Line list_of_documents '.$key.' relativepath = '.$relativepath.' -->'."\n";
@@ -1116,11 +1116,11 @@ class FormFile
 			        print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";
 					print '<tr id="row-'.($filearray[$key]['rowid']>0?$filearray[$key]['rowid']:'-AFTER'.$lastrowid.'POS'.($i+1)).'" '.$bcdd[$var].'>';
 					print '<td class="tdoverflowmax300">';
-					
+
 					$filepath=$relativepath.$file['name'];
-					
+
 					if (! $editline) print $this->showPreview($file,$modulepart,$filepath);
-					
+
 					//print "XX".$file['name'];	//$file['name'] must be utf8
 					print '<a class="paddingleft" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 					if ($forcedownload) print '&attachment=1';
@@ -1143,13 +1143,13 @@ class FormFile
 					    print $file['name'];
 					    print '</a>';
 					}
-					
+
 					print "</td>\n";
-					
+
 					print '<td align="right" width="80px">'.dol_print_size($file['size'],1,1).'</td>';
-					
+
 					print '<td align="center" width="130px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';
-				
+
 					// Preview
 					if (empty($useinecm))
 					{
@@ -1175,7 +1175,7 @@ class FormFile
     					// Delete or view link
     					// ($param must start with &)
     					print '<td class="valignmiddle right"><!-- action on files -->';
-    					if ($useinecm)     
+    					if ($useinecm)
     					{
     					    print '<a href="'.DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_view('default', 0, 'class="paddingrightonly"').'</a>';
     					}
@@ -1183,10 +1183,10 @@ class FormFile
     					{
         					$newmodulepart=$modulepart;
         					if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
-    						
-        					$disablecrop=1; 
+
+        					$disablecrop=1;
         					if (in_array($modulepart, array('product','produit','service','expensereport','holiday','project','user'))) $disablecrop=0;
-        					
+
     					    if (! $disablecrop && image_format_supported($file['name']) > 0)
     						{
     							if ($permtoeditline)
@@ -1195,7 +1195,7 @@ class FormFile
        			               		print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','class="paddingrightonly"',1).'</a>';
     							}
     						}
-    						
+
     						if ($permtoeditline)
     						{
     						    print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=editfile&urlfile='.urlencode($filepath).$param).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>';
@@ -1213,15 +1213,15 @@ class FormFile
     						if (! empty($conf->dol_use_jmobile)) $useajax=0;
     						if (empty($conf->use_javascript_ajax)) $useajax=0;
     						if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
-    
+
     						print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=delete&urlfile='.urlencode($filepath).$param).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
     					}
 					    print "</td>";
 
 					    if (empty($disablemove))
 					    {
-    					    if ($nboffiles > 1 && empty($conf->browser->phone)) { 
-    					    	print '<td align="center" class="linecolmove tdlineupdown">'; 
+    					    if ($nboffiles > 1 && empty($conf->browser->phone)) {
+    					    	print '<td align="center" class="linecolmove tdlineupdown">';
     					    	if ($i > 0) {
     					    		print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default',0,'imgupforline').'</a>';
     					    	}
@@ -1245,7 +1245,7 @@ class FormFile
 					    if (empty($disablemove)) print '<td class="right"></td>';
 					}
 					print "</tr>\n";
-					
+
 					$i++;
 				}
 			}
@@ -1260,19 +1260,19 @@ class FormFile
 			}
 			print "</table>";
 			print '</div>';
-			
-			if (! $editline && $nboflines > 1) { 
+
+			if (! $editline && $nboflines > 1) {
 				if (! empty($conf->use_javascript_ajax) && $permtoeditline) {
 				    $table_element_line = 'ecm_files';
 				    include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 				}
-			}				
-			
+			}
+
 			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
 			{
 			    print '</form>';
 			}
-			    	
+
 			return $nboffiles;
 		}
 	}
@@ -1449,19 +1449,19 @@ class FormFile
 
                 if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue;    // We do not show orphelins files
 
-                
+
                 print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
                 print '<tr class="oddeven">';
                 print '<td>';
                 if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
                 else print $langs->trans("ObjectDeleted",($id?$id:$ref));
-                
+
                 $filename=dol_sanitizeFileName($ref);
                 //$filedir=$conf->$modulepart->dir_output . '/' . dol_sanitizeFileName($obj->ref);
                 $filedir=$file['path'];
                 //$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
                 //print $formfile->getDocumentsLink($modulepart, $filename, $filedir);
-                
+
                 print '</td>';
                 print '<td>';
                 //print "XX".$file['name']; //$file['name'] must be utf8
@@ -1471,9 +1471,9 @@ class FormFile
                 print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
                 print dol_trunc($file['name'],$maxlength,'middle');
                 print '</a>';
-                
+
                 print $this->getDocumentsLink($modulepart, $filename, $filedir);
-                
+
                 print "</td>\n";
                 print '<td align="right">'.dol_print_size($file['size'],1,1).'</td>';
                 print '<td align="center">'.dol_print_date($file['date'],"dayhour").'</td>';
@@ -1668,11 +1668,11 @@ class FormFile
 
         return $nboflinks;
     }
-    
-    
+
+
     /**
      * Show detail icon with link for preview
-     * 
+     *
      * @param   array     $file           File
      * @param   string    $modulepart     propal, facture, facture_fourn, ...
      * @param   string    $relativepath   Relative path of docs

From 6ab47a845e9c1bcb8df1c792d6cb36121ca2ef07 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 13:54:43 +0200
Subject: [PATCH 1068/1163] Fix look and feel v6

---
 htdocs/comm/action/listactions.php           | 22 ++++++------
 htdocs/core/class/html.formactions.class.php | 37 +++++++++++++-------
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 7bedc4d8356..01094a78164 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -47,12 +47,12 @@ $status=GETPOST("status",'alpha');
 $type=GETPOST('type');
 $optioncss = GETPOST('optioncss','alpha');
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
-if (GETPOST('actioncode','array')) 
+if (GETPOST('actioncode','array'))
 {
     $actioncode=GETPOST('actioncode','array',3);
     if (! count($actioncode)) $actioncode='0';
 }
-else 
+else
 {
     $actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
@@ -337,11 +337,11 @@ if ($resql)
     if ($pid)    $nav.='<input type="hidden" name="projectid" value="'.$pid.'">';
     if ($usergroup) $nav.='<input type="hidden" name="usergroup" value="'.$usergroup.'">';
     print $nav;
-    
+
     print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $link, $num, -1 * $nbtotalofrecords, '', 0, $nav, '', $limit);
 
     $moreforfilter='';
-    
+
     $i = 0;
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -369,11 +369,11 @@ if ($resql)
 	print $searchpicto;
 	print '</td>';
 	print "</tr>\n";
-	
+
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"a.id",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder);
-	//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) 
+	//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"c.libelle",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"a.datep",$param,'','align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder);
@@ -392,7 +392,7 @@ if ($resql)
 	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 	$caction=new CActionComm($db);
 	$arraylist=$caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0));
-	
+
 	$var=true;
 	while ($i < min($num,$limit))
 	{
@@ -405,15 +405,13 @@ if ($resql)
         	continue;
         }
 
-		
-
 		$actionstatic->id=$obj->id;
 		$actionstatic->ref=$obj->id;
 		$actionstatic->type_code=$obj->type_code;
 		$actionstatic->type_label=$obj->type_label;
 		$actionstatic->type_picto=$obj->type_picto;
 		$actionstatic->label=$obj->label;
-		
+
 		print '<tr class="oddeven">';
 
 		// Action (type)
@@ -443,7 +441,7 @@ if ($resql)
 		if (! empty($arraylist[$labeltype])) $labeltype=$arraylist[$labeltype];
 		print dol_trunc($labeltype,28);
 		print '</td>';
-		
+
 		// Start date
 		print '<td align="center" class="nowrap">';
 		print dol_print_date($db->jdate($obj->dp),"dayhour");
@@ -514,7 +512,7 @@ if ($resql)
 		print '<td align="center" class="nowrap">'.$actionstatic->LibStatut($obj->percent,3,1,$datep).'</td>';
 
 		print '<td></td>';
-		
+
 		print "</tr>\n";
 		$i++;
 	}
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 456faa7931e..a6ec8db928a 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -188,9 +188,9 @@ class FormActions
         	print load_fiche_titre($title, $buttontoaddnewevent, '');
 
         	$page=0; $param=''; $sortfield='a.datep';
-        	
-        	$total = 0; 
-        	
+
+        	$total = 0;
+
         	print '<div class="div-table-responsive">';
         	print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
         	print '<tr class="liste_titre">';
@@ -209,12 +209,23 @@ class FormActions
         	{
         		$ref=$action->getNomUrl(1,-1);
         		$label=$action->getNomUrl(0,38);
-                
-        		
+
         		print '<tr class="oddeven">';
 				print '<td>'.$ref.'</td>';
         		print '<td>'.$label.'</td>';
-        		print '<td>'.$action->type.'</td>';
+        		print '<td>';
+        		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+        		{
+        		    if ($action->type_picto) print img_picto('', $action->type_picto);
+        		    else {
+        		        if ($action->type_code == 'AC_RDV')   print img_picto('', 'object_group').' ';
+        		        if ($action->type_code == 'AC_TEL')   print img_picto('', 'object_phoning').' ';
+        		        if ($action->type_code == 'AC_FAX')   print img_picto('', 'object_phoning_fax').' ';
+        		        if ($action->type_code == 'AC_EMAIL') print img_picto('', 'object_email').' ';
+        		    }
+        		}
+        		print $action->type;
+        		print '</td>';
         		print '<td>'.dol_print_date($action->datep,'dayhour');
         		if ($action->datef)
         		{
@@ -233,7 +244,7 @@ class FormActions
         			$userstatic->id = $action->author->id;
         			$userstatic->firstname = $action->author->firstname;
         			$userstatic->lastname = $action->author->lastname;
-        			print $userstatic->getNomUrl(1);
+        			print $userstatic->getNomUrl(1, '', 0, 0, 16, 0, '', '');
         		}
         		print '</td>';
         		print '<td align="right">';
@@ -285,22 +296,22 @@ class FormActions
        	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
 
        	$out='';
-       	
-		if (! empty($multiselect)) 
+
+		if (! empty($multiselect))
 		{
 	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
 			$out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
 		}
-		else 
+		else
 		{
 			$out.=$form->selectarray($htmlname, $arraylist, $selected);
 		}
-		
-        if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0) 
+
+        if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
         {
             $out.=info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''),1);
         }
-        
+
         if ($nooutput) return $out;
         else print $out;
         return '';

From b6af1f7e6effed2bad4d06b15cb0ba7b8787ee90 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 15:21:49 +0200
Subject: [PATCH 1069/1163] Fix responsive design

---
 htdocs/public/demo/demo.css  |  5 +++++
 htdocs/public/demo/index.php | 31 ++++++++++++++++---------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/htdocs/public/demo/demo.css b/htdocs/public/demo/demo.css
index dd1f7aad7b7..daf4f20e585 100644
--- a/htdocs/public/demo/demo.css
+++ b/htdocs/public/demo/demo.css
@@ -65,6 +65,11 @@ a:hover {
 }
 @media only screen and (max-width: 420px)
 {
+	.demomaxoveflow {
+	    max-width: none !important;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	}
 	.csscolumns {
 		-webkit-column-count: 1; /* Chrome, Safari, Opera */
 	    -moz-column-count: 1; /* Firefox */
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index a24b43b806a..fe8da7ee072 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -316,7 +316,7 @@ foreach ($demoprofiles as $profilearray)
 		{
 		    print '<div class="clearboth"></div>';
 		}
-		
+
 		print '<form method="POST" class="valigntop inline-block" name="form'.$profilearray['key'].'" action="'.$_SERVER["PHP_SELF"].'#a1'.$profilearray['key'].'">'."\n";
 		print '<input type="hidden" name="action" value="gotodemo">'."\n";
         print '<input type="hidden" name="urlfrom" value="'.dol_escape_htmltag($urlfrom).'">'."\n";
@@ -328,34 +328,35 @@ foreach ($demoprofiles as $profilearray)
         print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
         print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
 
-        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 400px;">'."\n";
+        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 340px;">'."\n";
+
 
-        
         print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
 
         print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">';
 		print '<div style="padding: 10px;">';
-        
+
 		print '<img class="demothumb" src="'.$profilearray['icon'].'" alt="Demo '.$profilearray['label'].'">';
-		
+
 		print '<div class="clearboth"></div>';
-	
+
 		print '<div class="demothumbtext">';
     	print $langs->trans($profilearray['label']);
     	print '</div>';
-    	
+
     	print '</div>';
     	print '</a>';
-    	 
-    	
+
+
         // Modules
         if (empty($profilearray['url']))
         {
-    		print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="font-size:14px; line-height: 110%; padding-bottom: 8px">';
-    		
-    		print $langs->trans("ThisIsListOfModules").'<br>';
+    		print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:14px; line-height: 130%; padding-bottom: 8px">';
+
+    		print $langs->trans("ThisIsListOfModules").'<br><br>';
+
     		print '<div class="csscolumns">';
-    		
+
     		$listofdisabledmodules=explode(',',$profilearray['disablemodules']);
     		$j=0;
     		$nbcolsmod=empty($conf->dol_optimize_smallscreen)?4:3;
@@ -395,10 +396,10 @@ foreach ($demoprofiles as $profilearray)
 
     		print '</div>';
 
-		    print '<div class="center">';
+		    print '<br><div class="center">';
 		    print '<input type="submit" value=" &nbsp; &nbsp; '.$langs->trans("Start").' &nbsp; &nbsp; " class="button">';
 		    print '</div>';
-    	
+
 		    print '</div>';
         }
 

From 6b4e22ec3cf1f75eef5c0923fafd9f942e2e9fcf Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 10 Jun 2017 16:07:56 +0200
Subject: [PATCH 1070/1163] Fix 6910 if conf PROJECT_USE_SEARCH_TO_SELECT is
 used we got BadFirstParameterForGETPOST

---
 htdocs/expedition/class/expedition.class.php | 1 +
 htdocs/projet/ajax/projects.php              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 06cddeace91..1a36f68a81a 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -195,6 +195,7 @@ class Expedition extends CommonObject
 		// Clean parameters
 		$this->brouillon = 1;
 		$this->tracking_number = dol_sanitizeFileName($this->tracking_number);
+		if (empty($this->fk_project)) $this->fk_project = 0;
 
 		$this->user = $user;
 
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index 3140352bf60..ae4c412f6e3 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -61,7 +61,7 @@ $idprod = (! empty($match[0]) ? $match[0] : '');
 if (! GETPOST($htmlname) && ! GETPOST($idprod)) return;
 
 // When used from jQuery, the search term is added as GET param "term".
-$searchkey=(GETPOST($idprod)?GETPOST($idprod):(GETPOST($htmlname)?GETPOST($htmlname):''));
+$searchkey=(!empty($idprod) && GETPOST($idprod)?GETPOST($idprod):(GETPOST($htmlname)?GETPOST($htmlname):''));
 
 $form = new FormProjets($db);
 $arrayresult=$form->select_projects_list($socid, '', $htmlname, 0, 0, 1, $discard_closed, 0, 0, 1, $searchkey);

From 20f1bb76cba15bf2fc7abdab24a5c1a01f78089d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 16:13:37 +0200
Subject: [PATCH 1071/1163] Fix memu under disabled entries, when using
 smartphone

---
 htdocs/core/boxes/box_produits.php         |  2 +-
 htdocs/core/menus/standard/auguria.lib.php | 37 ++++++++++++++--------
 htdocs/core/menus/standard/eldy.lib.php    | 37 ++++++++++++++--------
 htdocs/core/menus/standard/eldy_menu.php   | 20 ++++++------
 htdocs/public/demo/demo.css                |  9 +++---
 htdocs/public/demo/index.php               |  2 +-
 6 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index b0c47422806..f1fa5a84d5d 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -113,7 +113,7 @@ class box_produits extends ModeleBoxes
 					$productstatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => '',
+                        'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
                         'text' => $productstatic->getNomUrl(1),
                         'asis' => 1,
                     );
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 3cc9c569120..cc5c0710fb9 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -393,14 +393,14 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 	// Show menu
 	if (empty($noout))
 	{
-		$alt=0; $altok=0; $blockvmenuopened=false;
+		$altok=0; $blockvmenuopened=false; $lastlevel0='';
 		$num=count($menu_array);
-		for ($i = 0; $i < $num; $i++)
+		for ($i = 0; $i < $num; $i++)     // Loop on each menu entry
 		{
 			$showmenu=true;
 			if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu=false;
 
-			$alt++;
+			// Begin of new left menu block
 			if (empty($menu_array[$i]['level']) && $showmenu)
 			{
 				$altok++;
@@ -420,14 +420,14 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 				}
 			}
 
-			// Place tabulation
+			// Add tabulation
 			$tabstring='';
 			$tabul=($menu_array[$i]['level'] - 1);
 			if ($tabul > 0)
 			{
 				for ($j=0; $j < $tabul; $j++)
 				{
-					$tabstring.='&nbsp; &nbsp;';
+					$tabstring.='&nbsp;&nbsp;&nbsp;';
 				}
 			}
 
@@ -445,26 +445,35 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 
 			print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].' -->'."\n";
 
-			// Menu niveau 0
+			// Menu level 0
 			if ($menu_array[$i]['level'] == 0)
 			{
-				if ($menu_array[$i]['enabled'])
+				if ($menu_array[$i]['enabled'])     // Enabled so visible
 				{
 					print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.$menu_array[$i]['titre'].'</a></div>';
+					$lastlevel0='enabled';
 				}
-				else if ($showmenu)
+				else if ($showmenu)                 // Not enabled but visible (so greyed)
 				{
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
+					$lastlevel0='greyed';
+				}
+				else
+				{
+				    $lastlevel0='hidden';
 				}
 				if ($showmenu)
+				{
 					print '<div class="menu_top"></div>'."\n";
+				}
 			}
-			// Menu niveau > 0
+			// Menu level > 0
 			if ($menu_array[$i]['level'] > 0)
 			{
-				if ($menu_array[$i]['enabled'])
+				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled')     // Enabled so visible, except if parent was not enabled.
 				{
 					print '<div class="menu_contenu">'.$tabstring;
+					//print $lastlevel0;
 					if ($menu_array[$i]['url']) print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>';
 					else print '<span class="vsmenu">';
 					print $menu_array[$i]['titre'];
@@ -474,22 +483,22 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 					if (! strstr($menu_array[$i]['titre'],'<table')) print '<br>';
 					print '</div>'."\n";
 				}
-				else if ($showmenu)
+				else if ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
 				{
 					print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
 			}
 
 			// If next is a new block or if there is nothing after
-			if (empty($menu_array[$i+1]['level']))
+			if (empty($menu_array[$i+1]['level']))               // End menu block
 			{
 				if ($showmenu)
 					print '<div class="menu_end"></div>'."\n";
-				if ($blockvmenuopened) { print "</div>\n"; $blockvmenuopened=false; }
+				if ($blockvmenuopened) { print '</div>'."\n"; $blockvmenuopened=false; }
 			}
 		}
 		
-		if ($altok) print '<div class="blockvmenuend"></div>';
+		if ($altok) print '<div class="blockvmenuend"></div>';    // End menu block
 	}
 
 	if (is_array($moredata) && ! empty($moredata['bookmarks']))
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 7a1dfcd4ecf..8c83435914b 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -445,7 +445,7 @@ function print_end_menu_array()
  * @param	Menu		$menu				Object Menu to return back list of menu entries
  * @param	int			$noout				Disable output (Initialise &$menu only).
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
- * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not efined in session.
+ * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not defined in session.
  * @param	array		$moredata			An array with more data to output
  * @return	int								nb of menu entries
  */
@@ -1023,7 +1023,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 								$objp = $db->fetch_object($resql);
 
 								$nature='';
-								// Must match array $sourceList defined into journals_list.php 
+								// Must match array $sourceList defined into journals_list.php
 								if ($objp->nature == 2) $nature="sells";
 								if ($objp->nature == 3) $nature="purchases";
 								if ($objp->nature == 4) $nature="bank";
@@ -1558,14 +1558,14 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 	$invert=empty($conf->global->MAIN_MENU_INVERT)?"":"invert";
 	if (empty($noout))
 	{
-		$alt=0; $altok=0; $blockvmenuopened=false;
+		$altok=0; $blockvmenuopened=false; $lastlevel0='';
 		$num=count($menu_array);
-		for ($i = 0; $i < $num; $i++)
+		for ($i = 0; $i < $num; $i++)     // Loop on each menu entry
 		{
 			$showmenu=true;
 			if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu=false;
 
-			$alt++;
+			// Begin of new left menu block
 			if (empty($menu_array[$i]['level']) && $showmenu)
 			{
 			    $altok++;
@@ -1585,7 +1585,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				}
 			}
 
-			// Place tabulation
+			// Add tabulation
 			$tabstring='';
 			$tabul=($menu_array[$i]['level'] - 1);
 			if ($tabul > 0)
@@ -1625,26 +1625,35 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 			print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].', position='.$menu_array[$i]['position'].' -->'."\n";
 
-			// Menu niveau 0
+			// Menu level 0
 			if ($menu_array[$i]['level'] == 0)
 			{
-				if ($menu_array[$i]['enabled'])
+				if ($menu_array[$i]['enabled'])     // Enabled so visible
 				{
 					print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.$menu_array[$i]['titre'].'</a></div>'."\n";
+					$lastlevel0='enabled';
 				}
-				else if ($showmenu)
+				else if ($showmenu)                 // Not enabled but visible (so greyed)
 				{
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
+					$lastlevel0='greyed';
+				}
+				else
+				{
+				    $lastlevel0='hidden';
 				}
 				if ($showmenu)
+				{
 					print '<div class="menu_top"></div>'."\n";
+				}
 			}
-			// Menu niveau > 0
+			// Menu level > 0
 			if ($menu_array[$i]['level'] > 0)
 			{
-				if ($menu_array[$i]['enabled'])
+				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled')     // Enabled so visible, except if parent was not enabled.
 				{
 					print '<div class="menu_contenu">'.$tabstring;
+					//print $lastlevel0;
 					if ($menu_array[$i]['url']) print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>';
 					else print '<span class="vsmenu">';
 					print $menu_array[$i]['titre'];
@@ -1654,14 +1663,14 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					if (! strstr($menu_array[$i]['titre'],'<table')) print '<br>';
 					print '</div>'."\n";
 				}
-				else if ($showmenu)
+				else if ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
 				{
 					print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
 			}
 
 			// If next is a new block or if there is nothing after
-			if (empty($menu_array[$i+1]['level']))
+			if (empty($menu_array[$i+1]['level']))               // End menu block
 			{
 				if ($showmenu)
 					print '<div class="menu_end"></div>'."\n";
@@ -1669,7 +1678,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			}
 		}
 
-		if ($altok) print '<div class="blockvmenuend"></div>';
+		if ($altok) print '<div class="blockvmenuend"></div>';    // End menu block
 	}
 
 	return count($menu_array);
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 9750811ffa5..b0b7f95c27b 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -105,7 +105,7 @@ class MenuManager
         $menuArbo = new Menubase($this->db,'eldy');
         $menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);
         $this->tabMenu=$tabMenu;
-        
+
         //if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
     }
 
@@ -149,13 +149,13 @@ class MenuManager
 		    print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);  // no output
 		    return $this->menu->getNbOfVisibleMenuEntries();
 		}
-		    
+
         if ($mode == 'jmobile')
         {
             print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);      // Fill this->menu that is empty with top menu
 
             // $this->menu->liste is top menu
-            //var_dump($this->menu->liste);exit;            
+            //var_dump($this->menu->liste);exit;
         	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
         	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         	{
@@ -168,12 +168,12 @@ class MenuManager
 					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
 					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
 
-					
+
         			print '<a class="alilevel0" href="#">';
-					
+
 					// Add font-awesome
 					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
-        			
+
 					print $val['titre'];
         			print '</a>'."\n";
         			// Search submenu fot this mainmenu entry
@@ -184,7 +184,7 @@ class MenuManager
         		    //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
                     //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
 	        		$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
-                    
+
         			$canonrelurl=preg_replace('/\?.*$/','',$relurl);
         			$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
         			//var_dump($canonrelurl);
@@ -198,16 +198,16 @@ class MenuManager
         				print '<a href="'.$relurl.'"';
         				//print ' data-ajax="false"';
         				print '>';
-        				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation 
+        				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
         				{
         				    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
-        				    else print $langs->trans("Dashboard");	
+        				    else print $langs->trans("Dashboard");
         				}
         				else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
         				print '</a>';
         				print '</li>'."\n";
         			}
-        			
+
        				foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu']
        				{
 						$showmenu=true;
diff --git a/htdocs/public/demo/demo.css b/htdocs/public/demo/demo.css
index daf4f20e585..c4624f2d943 100644
--- a/htdocs/public/demo/demo.css
+++ b/htdocs/public/demo/demo.css
@@ -32,16 +32,15 @@ a:hover {
 	background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,255) 100%);
 }
 .csscolumns {
-    margin-left: 8px;
     margin-top: 6px;
     margin-bottom: 5px;
-    -webkit-column-count: 4; /* Chrome, Safari, Opera */
-    -moz-column-count: 4; /* Firefox */
-    column-count: 3;
+    -webkit-column-count: 2; /* Chrome, Safari, Opera */
+    -moz-column-count: 2; /* Firefox */
+    column-count: 2;
     text-align: left;
 }
 .demomaxoveflow {
-    max-width: 100px;
+    max-width: 120px;
     overflow: hidden;
     text-overflow: ellipsis;
 }
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index fe8da7ee072..be844c8a2da 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -328,7 +328,7 @@ foreach ($demoprofiles as $profilearray)
         print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
         print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
 
-        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 340px;">'."\n";
+        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 346px;">'."\n";
 
 
         print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';

From 039130c6943f4ba3f47d74ca09481a262f9a7c58 Mon Sep 17 00:00:00 2001
From: atm-ph <phf@atm-consulting.fr>
Date: Sat, 10 Jun 2017 16:19:33 +0200
Subject: [PATCH 1072/1163] Fix travis

---
 htdocs/fourn/class/paiementfourn.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 03f3ecb0e21..25639bfd3f9 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -531,6 +531,7 @@ class PaiementFourn extends Paiement
 	 *
 	 *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param		string	$option			Sur quoi pointe le lien
+	 *  @param		string  $mode           'withlistofinvoices'=Include list of invoices into tooltip
 	 *	@return		string					Chaine avec URL
 	 */
 	function getNomUrl($withpicto=0,$option='',$mode='withlistofinvoices')

From ce470b8dd5aee2bc6ffdccb003bbe51d1046c004 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 16:23:24 +0200
Subject: [PATCH 1073/1163] Fix css fot liste_total lines

---
 htdocs/theme/eldy/style.css.php | 2 +-
 htdocs/theme/md/style.css.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4fd7120a771..bee5aac9d36 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2692,7 +2692,7 @@ input.liste_titre {
 }
 
 .noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total {
-	height: 32px;
+	/* height: 32px; */
 }
 .noborder tr.liste_total td, tr.liste_total td, form.liste_total div {
     color: #552266;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index dc61977cf5f..9ec18cca050 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2775,7 +2775,7 @@ input.liste_titre {
 }
 
 .noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total {
-	height: 32px;
+	/* height: 32px; */
 }
 .noborder tr.liste_total td, tr.liste_total td, form.liste_total div {
     /* border-top: 1px solid #f4f4f4; */

From 75452e6d19ee04dcfa802752dbc414bfd90e9db7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 16:29:25 +0200
Subject: [PATCH 1074/1163] Fix compatibility php 5.5-

---
 htdocs/main.inc.php | 52 ++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 67458a66445..15934a32f86 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -300,7 +300,7 @@ if (! defined('NOTOKENRENEWAL'))
 {
     // roulement des jetons car cree a chaque appel
     if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
-    
+
     // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
     $token = dol_hash(uniqid(mt_rand(),TRUE)); // Generates a hash of a random number
     $_SESSION['newtoken'] = $token;
@@ -659,7 +659,7 @@ if (! defined('NOLOGIN'))
                    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
                }
 	       }
-	       
+
 	       $action = '';
 	       $reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);
 	       if ($reshook < 0) {
@@ -667,7 +667,7 @@ if (! defined('NOLOGIN'))
 	       }
         }
     }
-    
+
     // Is it a new session that has started ?
     // If we are here, this means authentication was successfull.
     if (! isset($_SESSION["dol_login"]))
@@ -981,7 +981,7 @@ if (! function_exists("llxHeader"))
 		{
 			top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
 		}
-		
+
 		if (empty($conf->dol_hide_leftmenu))
 		{
 			left_menu('', $help_url, '', '', 1, $title, 1);
@@ -1011,13 +1011,13 @@ function top_httphead($contenttype='text/html')
     if (! empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
     {
         // For example, to restrict script, object, frames or img to some domains
-        // script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; child-src https://youtube.com; img-src: https://static.example.com  
+        // script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; child-src https://youtube.com; img-src: https://static.example.com
         // For example, to restrict everything to one domain, except object, ...
         // default-src https://cdn.example.net; object-src 'none'
         header("Content-Security-Policy: ".$conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY);
     }
-      
-    
+
+
     // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
     /*if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) {
         ob_start("ob_gzhandler");
@@ -1085,7 +1085,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         $ext='version='.urlencode(DOL_VERSION);
         if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
         if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
-        
+
         $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
         $themeparam.=($ext?'&amp;'.$ext:'');
         if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
@@ -1094,7 +1094,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
         if (GETPOST('dol_no_mouse_hover','int'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
         if (GETPOST('dol_use_jmobile','int'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
-        
+
         if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
         {
             print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
@@ -1122,13 +1122,13 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css'.($ext?'?'.$ext:'').'">'."\n";
             }
         }
-        
+
         if (! defined('DISABLE_FONT_AWSOME'))
         {
             print '<!-- Includes CSS for font awesome -->'."\n";
             print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext?'?'.$ext:'').'">'."\n";
         }
-            
+
         print '<!-- Includes CSS for Dolibarr theme -->'."\n";
         // Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
         $themepath=dol_buildpath($conf->css,1);
@@ -1293,7 +1293,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 print '</script>'."\n";
                 print '<script type="text/javascript" src="'.$pathckeditor.$jsckeditor.($ext?'?'.$ext:'').'"></script>'."\n";
             }
-            
+
             // Browser notifications
             if (! defined('DISABLE_BROWSER_NOTIF'))
             {
@@ -1306,7 +1306,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                     print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
                 }
             }
-            
+
             // Global js function
             print '<!-- Includes JS of Dolibarr -->'."\n";
             print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
@@ -1316,7 +1316,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             {
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
-            
+
             // JS forced by modules (relative url starting with /)
             if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
         	{
@@ -1391,7 +1391,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
     $toprightmenu='';
 
     // For backward compatibility with old modules
-    if (empty($conf->headerdone)) 
+    if (empty($conf->headerdone))
     {
         top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
         print '<body id="mainbody">';
@@ -1403,7 +1403,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
     if (empty($conf->dol_hide_topmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
     {
         print "\n".'<!-- Start top horizontal -->'."\n";
-        
+
         print '<div class="side-nav-vert"><div id="id-top">';
 
 	    // Show menu entries
@@ -1461,7 +1461,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 		$toprightmenu.='</div>';
 
 	    $toprightmenu.='<div class="login_block_other">';
-		
+
 		// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
 	    $parameters=array();
 	    $result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
@@ -1548,7 +1548,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 		print '</div></div>';
 
 	    //unset($form);
-	
+
 		print '<div style="clear: both;"></div>';
         print "<!-- End top horizontal menu -->\n\n";
     }
@@ -1693,7 +1693,7 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
     		if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
     		if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
     		if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
-    
+
             $appli=constant('DOL_APPLICATION_TITLE');
     	    if (! empty($conf->global->MAIN_APPLICATION_TITLE))
     	    {
@@ -1778,7 +1778,7 @@ function main_area($title='')
     print "\n";
 
     print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
-    
+
     if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
 }
 
@@ -1908,7 +1908,7 @@ if (! function_exists("llxFooter"))
                 {
                     if (empty($val['sortfield'])) unset($val['sortfield']);
                     if (empty($val['sortorder'])) unset($val['sortorder']);
-                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0, 1)." (systematic recording of last search criteria)");
+                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criteria)");
                     $_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
                     unset($_SESSION['lastsearch_values_'.$key]);
                 }
@@ -1935,7 +1935,7 @@ if (! function_exists("llxFooter"))
         }
 
         print "\n\n";
-        
+
         print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
 		if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'; // End div id-right
@@ -1970,7 +1970,7 @@ if (! function_exists("llxFooter"))
                 });
             </script>' . "\n";
         }
-        
+
         // Wrapper to manage document_preview
         if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
         {
@@ -1985,7 +1985,7 @@ if (! function_exists("llxFooter"))
         		});
             </script>' . "\n";
         }
-        
+
         // Wrapper to manage dropdown
         if ($conf->use_javascript_ajax)
         {
@@ -2016,7 +2016,7 @@ if (! function_exists("llxFooter"))
                      console.log("Link has class dropdowncloseonclick, so we close/hide the popup ul");
                      $(this).parent().parent().hide();
                   });
-            
+
                   $(document).bind(\'click\', function (e) {
                       var $clicked = $(e.target);
                       if (!$clicked.parents().hasClass("dropdown")) $(".dropdown dd ul").hide();
@@ -2024,7 +2024,7 @@ if (! function_exists("llxFooter"))
                 });
                 </script>';
         }
-                
+
 		// A div for the address popup
 		print "\n<!-- A div to allow dialog popup -->\n";
 		print '<div id="dialogforpopup" style="display: none;"></div>'."\n";

From 890ac81e4de89f1080e7a3d5e445f421f1a0136a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 19:16:42 +0200
Subject: [PATCH 1075/1163] Fix menu entried must be greyed, sub menus not
 visible fi not allowed on parent.

---
 htdocs/core/lib/functions.lib.php           |  5 +-
 htdocs/core/menus/standard/auguria_menu.php | 88 ++++++++++++++++++---
 htdocs/core/menus/standard/eldy_menu.php    | 76 +++++++++++++++---
 htdocs/theme/eldy/style.css.php             |  1 +
 htdocs/theme/md/style.css.php               |  2 +-
 5 files changed, 145 insertions(+), 27 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6f73d504d11..3157348062a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5949,8 +5949,9 @@ function printCommonFooter($zone='private')
         	print '<!-- Set handler to switch left menu page (menuhider) -->'."\n";
         	print 'jQuery(".menuhider").click(function() {';
         	print '  console.log("We click on .menuhider");'."\n";
-        	print "  $('.side-nav').toggle();";
-        	print "  $('.login_block').toggle();";
+        	//print "  $('.side-nav').animate({width:'toggle'},200);\n";     // OK with eldy theme but not with md
+        	print "  $('.side-nav').toggle()\n";
+        	print "  $('.login_block').toggle()\n";
         	print '});'."\n";
     	}
 
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 4b19ffd5f3b..bd762083d2f 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -115,7 +115,7 @@ class MenuManager
     /**
      *  Show menu
      *
-     *	@param	string	$mode		    'top', 'left', 'jmobile'
+     *	@param	string	$mode		    'top', 'left', 'jmobile' (used to get full xml ul/li menu)
      *  @param	array	$moredata		An array with more data to output
      *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
 	 */
@@ -136,17 +136,20 @@ class MenuManager
 
         if ($mode == 'top')  print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
         if ($mode == 'left') print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0,'','',$moredata);
-		
+
 		if ($mode == 'topnb')
 		{
 		    print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);
 		    return $this->menu->getNbOfVisibleMenuEntries();
 		}
-		    
-        if ($mode == 'jmobile')
+
+        if ($mode == 'jmobile')     // Used to get menu in xml ul/li
         {
         	print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);
 
+            // $this->menu->liste is top menu
+            //var_dump($this->menu->liste);exit;
+        	$lastlevel = array();
         	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
         	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         	{
@@ -157,9 +160,17 @@ class MenuManager
         			$relurl=dol_buildpath($val['url'],1);
         			$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
         			$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
+        			$canonurl=preg_replace('/\?.*$/','',$val['url']);
 
-        			print '<a class="alilevel0" href="#">'.$val['titre'].'</a>'."\n";
-        			// Search submenu fot this entry
+        			print '<a class="alilevel0" href="#">';
+        			
+					// Add font-awesome
+					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+        			
+					print $val['titre'];
+        			print '</a>'."\n";
+        			
+        			// Search submenu fot this mainmenu entry
         			$tmpmainmenu=$val['mainmenu'];
         			$tmpleftmenu='all';
         			$submenu=new Menu();
@@ -177,21 +188,50 @@ class MenuManager
 						// We add sub entry
 						print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
 						print '<a href="'.$relurl.'">';
-					    if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation 
+					    if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
         				{
-        				    if ($val['mainmenu'] == 'cashdesk') print $langs->trans("Access");
-        				    else print $langs->trans("Dashboard");	
+        				    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
+        				    else print $langs->trans("Dashboard");
         				}
 						else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
 						print '</a>';
 						print '</li>'."\n";
         			}
-        			foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+
+    				if ($val['level']==0)
+					{
+					    if ($val['enabled'])
+					    {
+					        $lastlevel[0]='enabled';
+					    }
+					    else if ($showmenu)                 // Not enabled but visible (so greyed)
+					    {
+					        $lastlevel[0]='greyed';
+					    }
+					    else
+					    {
+					        $lastlevel[0]='hidden';
+					    }
+					}
+
+					$lastlevel2 = array();
+					foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         			{
 						$showmenu=true;
 						if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu=false;
 
-       					if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
+        				// If at least one parent is not enabled, we do not show any menu of all children
+						if ($val2['level'] > 0)
+						{
+						    $levelcursor = $val2['level']-1;
+						    while ($levelcursor >= 0)
+						    {
+                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
+                                $levelcursor--;
+						    }
+						}
+
+						if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
        					{
 	        				$relurl2=dol_buildpath($val2['url'],1);
 		        			$relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2);
@@ -199,8 +239,17 @@ class MenuManager
 	        				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
 	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
 	        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
-	        				if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
-	        				else print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).'">';	 // ui-btn to highlight on clic
+
+	        				$disabled='';
+	        				if (! $val2['enabled'])
+	        				{
+	        				    $disabled=" vsmenudisabled";
+	        				}
+
+	        				print str_pad('',$val2['level']+1);
+	        				print '<li class="lilevel'.($val2['level']+1);
+	        				if ($val2['level']==0) print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic
+	        				print $disabled.'">';	 // ui-btn to highlight on clic
 	        				if ($relurl2)
 	        				{
 	        					if ($val2['enabled'])	// Allowed
@@ -208,12 +257,25 @@ class MenuManager
 	        						print '<a href="'.$relurl2.'"';
 		        					//print ' data-ajax="false"';
 		        					print '>';
+		        					$lastlevel2[$val2['level']]='enabled';
 	        					}
 	        					else					// Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
+				        			$lastlevel2[$val2['level']]='greyed';
 	        					}
 	        				}
+	        				else
+	        				{
+	        				    if ($val2['enabled'])	// Allowed
+	        				    {
+	        				        $lastlevel2[$val2['level']]='enabled';
+	        				    }
+	        				    else
+	        				    {
+	        				        $lastlevel2[$val2['level']]='greyed';
+	        				    }
+	        				}
 	        				print $val2['titre'];
 	        				if ($relurl2)
 	        				{
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index b0b7f95c27b..d8f90cb912f 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -113,7 +113,7 @@ class MenuManager
     /**
      *  Show menu
      *
-     *	@param	string	$mode			'top', 'topnb', 'left', 'jmobile'
+     *	@param	string	$mode			'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
      *  @param	array	$moredata		An array with more data to output
      *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
      */
@@ -125,7 +125,7 @@ class MenuManager
 
         if ($this->type_user == 1)
         {
-        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=0;
+        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=1;
         	$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED=1;
         }
 
@@ -150,12 +150,13 @@ class MenuManager
 		    return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
-        if ($mode == 'jmobile')
+        if ($mode == 'jmobile')     // Used to get menu in xml ul/li
         {
             print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);      // Fill this->menu that is empty with top menu
 
             // $this->menu->liste is top menu
             //var_dump($this->menu->liste);exit;
+            $lastlevel = array();
         	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
         	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         	{
@@ -167,7 +168,7 @@ class MenuManager
 					$relurl=dol_buildpath($val['url'],1);
 					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
 					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
-
+					$canonurl=preg_replace('/\?.*$/','',$val['url']);
 
         			print '<a class="alilevel0" href="#">';
 
@@ -176,6 +177,7 @@ class MenuManager
 
 					print $val['titre'];
         			print '</a>'."\n";
+        			
         			// Search submenu fot this mainmenu entry
         			$tmpmainmenu=$val['mainmenu'];
         			$tmpleftmenu='all';
@@ -195,9 +197,7 @@ class MenuManager
 					{
         				// We add sub entry
         				print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
-        				print '<a href="'.$relurl.'"';
-        				//print ' data-ajax="false"';
-        				print '>';
+        				print '<a href="'.$relurl.'">';
         				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
         				{
         				    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
@@ -208,11 +208,39 @@ class MenuManager
         				print '</li>'."\n";
         			}
 
-       				foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu']
+        			if ($val['level']==0)
+        			{
+        			    if ($val['enabled'])
+        			    {
+        			        $lastlevel[0]='enabled';
+        			    }
+        			    else if ($showmenu)                 // Not enabled but visible (so greyed)
+        			    {
+        			        $lastlevel[0]='greyed';
+        			    }
+        			    else
+        			    {
+        			        $lastlevel[0]='hidden';
+        			    }
+        			}
+
+        			$lastlevel2 = array();
+       				foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
        				{
 						$showmenu=true;
 						if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu=false;
 
+						// If at least one parent is not enabled, we do not show any menu of all children
+						if ($val2['level'] > 0)
+						{
+						    $levelcursor = $val2['level']-1;
+						    while ($levelcursor >= 0)
+						    {
+                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
+                                $levelcursor--;
+						    }
+						}
+
        					if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
        					{
 	        				$relurl2=dol_buildpath($val2['url'],1);
@@ -221,8 +249,17 @@ class MenuManager
 	        				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
 	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
 	        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
-	        				if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
-	        				else print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).'">';	 // ui-btn to highlight on clic
+
+	        				$disabled='';
+	        				if (! $val2['enabled'])
+	        				{
+	        				    $disabled=" vsmenudisabled";
+	        				}
+
+	        				print str_pad('',$val2['level']+1);
+	        				print '<li class="lilevel'.($val2['level']+1);
+	        				if ($val2['level']==0) print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic
+	        				print $disabled.'">';	 // ui-btn to highlight on clic
 	        				if ($relurl2)
 	        				{
 	        					if ($val2['enabled'])	// Allowed
@@ -230,13 +267,28 @@ class MenuManager
 	        						print '<a href="'.$relurl2.'"';
 		        					//print ' data-ajax="false"';
 		        					print '>';
+		        					$lastlevel2[$val2['level']]='enabled';
 	        					}
 	        					else					// Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
+				        			$lastlevel2[$val2['level']]='greyed';
 	        					}
 	        				}
-	        				print $val2['titre'];
+	        				else
+	        				{
+	        				    if ($val2['enabled'])	// Allowed
+	        				    {
+	        				        $lastlevel2[$val2['level']]='enabled';
+	        				    }
+	        				    else
+	        				    {
+	        				        $lastlevel2[$val2['level']]='greyed';
+	        				    }
+	        				}
+                            //var_dump($val2['level']);
+	        				//var_dump($lastlevel2);
+                            print $val2['titre'];
 	        				if ($relurl2)
 	        				{
 	        					if ($val2['enabled'])	// Allowed
@@ -246,6 +298,8 @@ class MenuManager
 	        				}
 	        				print '</li>'."\n";
        					}
+
+
        				}
         			//var_dump($submenu);
         			print '</ul>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index bee5aac9d36..8e0a9b856ea 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1790,6 +1790,7 @@ a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu {
 font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; }
 a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
 font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
+li a.vsmenudisabled, li.vsmenudisabled { color: #aaa !important; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; text-decoration: none; }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9ec18cca050..e98c631c758 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1678,7 +1678,7 @@ div.login_block {
 	vertical-align: middle;
 	background: #FFF;
 	width: 228px;
-	height: 42px;
+	height: 43px;
 	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
 	display: none;
 	<?php } ?>

From b62da4bb7aa669409f84aadfea3eb2116b99e5f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 20:04:24 +0200
Subject: [PATCH 1076/1163] Fix a parameter is required to know what we share.

---
 htdocs/adherents/class/adherent.class.php |  2 +-
 htdocs/adherents/index.php                | 16 ++++++++--------
 htdocs/adherents/stats/byproperties.php   |  2 +-
 htdocs/adherents/stats/geo.php            |  8 ++++----
 htdocs/adherents/type.php                 |  4 ++--
 htdocs/core/lib/functions.lib.php         |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 18e144c363c..65f9de24496 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1097,7 +1097,7 @@ class Adherent extends CommonObject
         $sql.= " WHERE d.fk_adherent_type = t.rowid";
         if ($rowid) $sql.= " AND d.rowid=".$rowid;
         elseif ($ref || $fk_soc) {
-        	$sql.= " AND d.entity IN (".getEntity().")";
+        	$sql.= " AND d.entity IN (".getEntity('adherent').")";
         	if ($ref) $sql.= " AND d.rowid='".$this->db->escape($ref)."'";
         	elseif ($fk_soc > 0) $sql.= " AND d.fk_soc=".$fk_soc;
         }
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 76368fc5673..2614a27d509 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -64,8 +64,8 @@ $sql.= " d.statut, count(d.rowid) as somme";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d";
 $sql.= " ON t.rowid = d.fk_adherent_type";
-$sql.= " AND d.entity IN (".getEntity().")";
-$sql.= " WHERE t.entity IN (".getEntity().")";
+$sql.= " AND d.entity IN (".getEntity('adherent').")";
+$sql.= " WHERE t.entity IN (".getEntity('adherent').")";
 $sql.= " GROUP BY t.rowid, t.libelle, t.subscription, d.statut";
 
 dol_syslog("index.php::select nb of members by type", LOG_DEBUG);
@@ -100,7 +100,7 @@ $now=dol_now();
 // old rule: uptodate = if type does not need payment, that end date is null, if type need payment that end date is in future)
 $sql = "SELECT count(*) as somme , d.fk_adherent_type";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t";
-$sql.= " WHERE d.entity IN (".getEntity().")";
+$sql.= " WHERE d.entity IN (".getEntity('adherent').")";
 //$sql.= " AND d.statut = 1 AND ((t.subscription = 0 AND d.datefin IS NULL) OR d.datefin >= '".$db->idate($now)."')";
 $sql.= " AND d.statut = 1 AND d.datefin >= '".$db->idate($now)."'";
 $sql.= " AND t.rowid = d.fk_adherent_type";
@@ -133,7 +133,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     {
     	$listofsearchfields['search_member']=array('text'=>'Member');
     }
-    
+
     if (count($listofsearchfields))
     {
     	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
@@ -149,7 +149,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     		print '</tr>';
     		$i++;
     	}
-    	print '</table>';	
+    	print '</table>';
     	print '</form>';
     	print '<br>';
     }
@@ -211,7 +211,7 @@ $numb=0;
 
 $sql = "SELECT c.subscription, c.dateadh as dateh";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
-$sql.= " WHERE d.entity IN (".getEntity().")";
+$sql.= " WHERE d.entity IN (".getEntity('adherent').")";
 $sql.= " AND d.rowid = c.fk_adherent";
 if(isset($date_select) && $date_select != '')
 {
@@ -275,7 +275,7 @@ $sql = "SELECT a.rowid, a.statut, a.lastname, a.firstname, a.societe as company,
 $sql.= " a.tms as datem, datefin as date_end_subscription,";
 $sql.= " ta.rowid as typeid, ta.libelle, ta.subscription";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as ta";
-$sql.= " WHERE a.entity IN (".getEntity().")";
+$sql.= " WHERE a.entity IN (".getEntity('adherent').")";
 $sql.= " AND a.fk_adherent_type = ta.rowid";
 $sql.= $db->order("a.tms","DESC");
 $sql.= $db->plimit($max, 0);
@@ -336,7 +336,7 @@ $sql = "SELECT a.rowid, a.statut, a.lastname, a.firstname, a.societe as company,
 $sql.= " datefin as date_end_subscription,";
 $sql.= " c.rowid as cid, c.tms as datem, c.datec as datec, c.dateadh as date_start, c.datef as date_end, c.subscription";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."subscription as c";
-$sql.= " WHERE a.entity IN (".getEntity().")";
+$sql.= " WHERE a.entity IN (".getEntity('adherent').")";
 $sql.= " AND c.fk_adherent = a.rowid";
 $sql.= $db->order("c.tms","DESC");
 $sql.= $db->plimit($max, 0);
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 6f896e186bb..f067b27b3d4 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -67,7 +67,7 @@ $tab='byproperties';
 $data = array();
 $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, d.morphy as code";
 $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d";
-$sql.=" WHERE d.entity IN (".getEntity().")";
+$sql.=" WHERE d.entity IN (".getEntity('adherent').")";
 $sql.=" AND d.statut = 1";
 $sql.=" GROUP BY d.morphy";
 
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 8e3d0862490..1f9ff189068 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -79,7 +79,7 @@ if ($mode)
         $data = array();
         $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, c.code, c.label";
         $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
-        $sql.=" WHERE d.entity IN (".getEntity().")";
+        $sql.=" WHERE d.entity IN (".getEntity('adherent').")";
         $sql.=" AND d.statut = 1";
         $sql.=" GROUP BY c.label, c.code";
         //print $sql;
@@ -96,7 +96,7 @@ if ($mode)
         $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
         $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
         $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
-        $sql.=" WHERE d.entity IN (".getEntity().")";
+        $sql.=" WHERE d.entity IN (".getEntity('adherent').")";
         $sql.=" AND d.statut = 1";
         $sql.=" GROUP BY co.label, co.code, c.nom";
         //print $sql;
@@ -112,7 +112,7 @@ if ($mode)
         $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
         $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
         $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
-        $sql.=" WHERE d.entity IN (".getEntity().")";
+        $sql.=" WHERE d.entity IN (".getEntity('adherent').")";
         $sql.=" AND d.statut = 1";
         $sql.=" GROUP BY co.label, co.code, r.nom"; //+
         //print $sql;
@@ -127,7 +127,7 @@ if ($mode)
         $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, c.code, c.label, d.town as label2";
         $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d";
         $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
-        $sql.=" WHERE d.entity IN (".getEntity().")";
+        $sql.=" WHERE d.entity IN (".getEntity('adherent').")";
         $sql.=" AND d.statut = 1";
         $sql.=" GROUP BY c.label, c.code, d.town";
         //print $sql;
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index f0be2ee9fae..50c464596fd 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -173,7 +173,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 
 	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.vote";
 	$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
-	$sql.= " WHERE d.entity IN (".getEntity().")";
+	$sql.= " WHERE d.entity IN (".getEntity('adherent').")";
 
 	$result = $db->query($sql);
 	if ($result)
@@ -380,7 +380,7 @@ if ($rowid > 0)
 		$sql.= " t.libelle as type, t.subscription";
 		$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t";
 		$sql.= " WHERE d.fk_adherent_type = t.rowid ";
-		$sql.= " AND d.entity IN (".getEntity().")";
+		$sql.= " AND d.entity IN (".getEntity('adherent').")";
 		$sql.= " AND t.rowid = ".$object->id;
 		if ($sall)
 		{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3157348062a..8a9bd1e88b6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -113,7 +113,7 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
  * 	@param	int	     $shared	1=Return id of current entity + shared entities (default), 0=Return id of current entity only
  * 	@return	mixed				Entity id(s) to use
  */
-function getEntity($element=false, $shared=1)
+function getEntity($element, $shared=1)
 {
 	global $conf, $mc;
 

From 36b18f030095053f122e1a13e6f35bd590d2a40c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 22:11:12 +0200
Subject: [PATCH 1077/1163] Save MAIN_VERSION_FIRST_INSTALL that is not erased.

---
 htdocs/core/lib/functions.lib.php              |  2 +-
 htdocs/core/modules/syslog/mod_syslog_file.php |  9 +++++----
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql |  2 ++
 htdocs/install/mysql/tables/llx_c_typent.sql   |  2 +-
 htdocs/install/step1.php                       |  8 ++++----
 htdocs/install/step2.php                       |  2 +-
 htdocs/install/step5.php                       | 13 +++++++++----
 7 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8a9bd1e88b6..a09ebd6fe7d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -846,7 +846,7 @@ function dol_strtoupper($utf8_string)
  *	SYSLOG_HANDLERS = ["mod_syslog_syslog"]  	facility is then defined by SYSLOG_FACILITY
  *  Warning, syslog functions are bugged on Windows, generating memory protection faults. To solve
  *  this, use logging to files instead of syslog (see setup of module).
- *  Note: If SYSLOG_FILE_NO_ERROR defined, we never output any error message when writing to log fails.
+ *  Note: If constant 'SYSLOG_FILE_NO_ERROR' defined, we never output any error message when writing to log fails.
  *  Note: You can get log message into html sources by adding parameter &logtohtml=1 (constant MAIN_LOGTOHTML must be set)
  *  This function works only if syslog module is enabled.
  * 	This must not use any call to other function calling dol_syslog (avoid infinite loop).
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 68493fd4eb4..b059c63e003 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -127,12 +127,13 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 
 		$logfile = $this->getFilename($suffixinfilename);
 
-		if (! empty($conf->global->SYSLOG_FILE_NO_ERROR)) $filefd = @fopen($logfile, 'a+');
+		// Test constant SYSLOG_FILE_NO_ERROR (should stay a constant defined with define('SYSLOG_FILE_NO_ERROR',1);
+		if (defined('SYSLOG_FILE_NO_ERROR')) $filefd = @fopen($logfile, 'a+');
 		else $filefd = fopen($logfile, 'a+');
 
 		if (! $filefd)
 		{
-			if (empty($conf->global->SYSLOG_FILE_NO_ERROR))
+			if (! defined('SYSLOG_FILE_NO_ERROR') || ! constant('SYSLOG_FILE_NO_ERROR'))
 			{
 				// Do not break dolibarr usage if log fails
 				//throw new Exception('Failed to open log file '.basename($logfile));
@@ -151,7 +152,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				LOG_INFO => 'INFO',
 				LOG_DEBUG => 'DEBUG'
 			);
-			
+
 			$delay = "";
 			if (!empty($conf->global->MAIN_SYSLOG_SHOW_DELAY))
 			{
@@ -159,7 +160,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				$delay = " ".sprintf("%05.3f", $this->lastTime != 0 ? $now - $this->lastTime : 0);
 				$this->lastTime = $now;
 			}
-			
+
 			$message = dol_print_date(time(),"%Y-%m-%d %H:%M:%S").$delay." ".sprintf("%-7s", $logLevels[$content['level']])." ".sprintf("%-15s", $content['ip'])." ".($this->ident>0?str_pad('',$this->ident,' '):'').$content['message'];
 			fwrite($filefd, $message."\n");
 			fclose($filefd);
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 85b9d3106cf..09d6c4de475 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -38,6 +38,8 @@
 ALTER TABLE llx_extrafields ADD COLUMN fieldcomputed text;
 ALTER TABLE llx_extrafields ADD COLUMN fielddefault varchar(255);
 
+ALTER TABLE llx_c_typent MODIFY COLUMN libelle varchar(64); 
+
 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEFAULT 0;
diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql
index ae89faf5c74..5b78abf1a75 100644
--- a/htdocs/install/mysql/tables/llx_c_typent.sql
+++ b/htdocs/install/mysql/tables/llx_c_typent.sql
@@ -21,7 +21,7 @@ create table llx_c_typent
 (
   id         integer      PRIMARY KEY,
   code       varchar(12)  NOT NULL,
-  libelle    varchar(48),
+  libelle    varchar(64),
   fk_country integer NULL,		-- Defined only to have specific list for countries that can't use generic list (like argentina that need type A or B)
   active     tinyint DEFAULT 1   NOT NULL,
   module     varchar(32) NULL,
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index b1a9fabb20d..a57ffd0c674 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -33,7 +33,7 @@ include 'inc.php';
 global $langs;
 
 $action=GETPOST('action','alpha');
-$setuplang=(GETPOST('selectlang','',3)?GETPOST('selectlang','',3):'auto');
+$setuplang=(GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):'auto');
 $langs->setDefaultLang($setuplang);
 
 $langs->load("admin");
@@ -341,7 +341,7 @@ if (! $error && $db->connected && $action == "set")
     }
 
     // Show title of step
-    print '<h3>'.$langs->trans("ConfigurationFile").'</h3>';
+    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/gear.svg" width="20" alt="Configuration"> '.$langs->trans("ConfigurationFile").'</h3>';
     print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';
 
     // Check parameter main_dir
@@ -552,7 +552,7 @@ if (! $error && $db->connected && $action == "set")
                 if ($db->connected)
                 {
                     $resultbis = 1;
-                    
+
                     // Create user
                     $result=$db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
                     // Create user bis
@@ -563,7 +563,7 @@ if (! $error && $db->connected && $action == "set")
                             $resultbis=$db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
                         }
                     }
-                    
+
                     if ($result > 0 && $resultbis > 0)
                     {
 
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index baceee5f7eb..ae5adc4e471 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -86,7 +86,7 @@ if (! is_writable($conffile))
 
 if ($action == "set")
 {
-    print '<h3>'.$langs->trans("Database").'</h3>';
+    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/database.svg" width="20" alt="Database"> '.$langs->trans("Database").'</h3>';
 
     print '<table cellspacing="0" style="padding: 4px 4px 4px 0px" border="0" width="100%">';
     $error=0;
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 875fd9378f2..b4bf7987547 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -174,13 +174,13 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
 		    {
 		        $numrows=$db->num_rows($resql);
     			if ($numrows == 0) dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1",'chaine',0,'',$conf->entity);
-		    }            
-            
+		    }
+
 		    // Create user used to create the admin user
             $createuser=new User($db);
             $createuser->id=0;
             $createuser->admin=1;
-            
+
             // Set admin user
             $newuser = new User($db);
             $newuser->lastname='SuperAdmin';
@@ -216,10 +216,15 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
             {
                 $db->begin();
 
+                dolibarr_install_syslog('step5: set MAIN_VERSION_FIRST_INSTALL const to ' . $targetversion, LOG_DEBUG);
+                $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_FIRST_INSTALL',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version when first install',0)");
+                //if (! $resql) dol_print_error($db,'Error in setup program');      // We ignore errors. Key may already exists
+                $conf->global->MAIN_VERSION_FIRST_INSTALL=$targetversion;
+
                 dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to ' . $targetversion, LOG_DEBUG);
                 $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_INSTALL'");
                 if (! $resql) dol_print_error($db,'Error in setup program');
-                $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version when install',0)");
+                $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version when last install',0)");
                 if (! $resql) dol_print_error($db,'Error in setup program');
                 $conf->global->MAIN_VERSION_LAST_INSTALL=$targetversion;
 

From acfaec684d71bcd85635ce8efecc43d8afd9b5b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 22:31:22 +0200
Subject: [PATCH 1078/1163] FIX CVE-2017-7888

---
 htdocs/core/login/functions_dolibarr.php |  3 ++-
 htdocs/install/step5.php                 | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 190d779d90b..d8cf78747b8 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -60,7 +60,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
 		$sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")";
 		$sql.=' AND statut = 1';
 		// Required to first found the user into entity, then the superadmin.
-		// For the case (TODO and that we must avoid) a user has renamed its login with same value than a user in entity 0. 
+		// For the case (TODO and that we must avoid) a user has renamed its login with same value than a user in entity 0.
 		$sql.=' ORDER BY entity DESC';
 
 		$resql=$db->query($sql);
@@ -78,6 +78,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
 				// Check crypted password
 				$cryptType='';
 				if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
+
 				// By default, we used MD5
 				if (! in_array($cryptType,array('md5'))) $cryptType='md5';
 				// Check crypted password according to crypt algorithm
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index b4bf7987547..78d29584a30 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -162,18 +162,23 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
         {
             $conf->setValues($db);
 
-            // Create user
+            // Create admin user
             include_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';
 
-            // Set default encryption to yes if there is no user yet into database
+            // Set default encryption to yes, generate a salt and set default encryption algorythm (but only if there is no user yet into database)
 		    $sql = "SELECT u.rowid, u.pass, u.pass_crypted";
 		    $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-		    //$sql.= " WHERE u.pass IS NOT NULL AND LENGTH(u.pass) < 32"; // Not a MD5 value
 		    $resql=$db->query($sql);
 		    if ($resql)
 		    {
 		        $numrows=$db->num_rows($resql);
-    			if ($numrows == 0) dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1",'chaine',0,'',$conf->entity);
+    			if ($numrows == 0)
+    			{
+    			    // Define default setup for password encryption
+    			    dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
+    			    dolibarr_set_const($db, "MAIN_SECURITY_SALT", dol_print_date(dol_now(), 'dayhourlog'), 'chaine', 0, '', 0);      // All entities
+    			    dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0);                               // All entities
+    			}
 		    }
 
 		    // Create user used to create the admin user

From 4683ef41be54012bfd3d06ea2fc59b3be97d89a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 22:49:16 +0200
Subject: [PATCH 1079/1163] Fix hide search label on computed field into lists

---
 htdocs/core/class/extrafields.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 754a8300366..4b5f151ec72 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -759,7 +759,11 @@ class ExtraFields
 		$list=$this->attribute_list[$key];
 		$hidden=$this->attribute_hidden[$key];
 
-		if ($computed) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+		if ($computed)
+		{
+		    if ($keysuffix != 'search_') return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+		    else return '';
+		}
 
 		if (empty($showsize))
 		{

From a74d008ff25d497f7a68a8c8356e5ccfb94bcbf4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 22:57:25 +0200
Subject: [PATCH 1080/1163] Fix missing translation

---
 htdocs/holiday/class/holiday.class.php | 34 ++++++++++++++------------
 htdocs/holiday/view_log.php            | 30 +++++++++++------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index e6a3d3d2f0e..15a565b04f9 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -37,7 +37,7 @@ class Holiday extends CommonObject
 	protected $isnolinkedbythird = 1;     // No field fk_soc
 	protected $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto = 'holiday';
-    
+
 	/**
 	 * @deprecated
 	 * @see id
@@ -128,7 +128,7 @@ class Holiday extends CommonObject
         if (empty($this->fk_user) || ! is_numeric($this->fk_user) || $this->fk_user < 0) { $this->error="ErrorBadParameter"; return -1; }
         if (empty($this->fk_validator) || ! is_numeric($this->fk_validator) || $this->fk_validator < 0)  { $this->error="ErrorBadParameter"; return -1; }
         if (empty($this->fk_type) || ! is_numeric($this->fk_type) || $this->fk_type < 0) { $this->error="ErrorBadParameter"; return -1; }
-        
+
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday(";
         $sql.= "fk_user,";
@@ -290,7 +290,7 @@ class Holiday extends CommonObject
 
         $sql = "SELECT";
         $sql.= " cp.rowid,";
-        
+
         $sql.= " cp.fk_user,";
         $sql.= " cp.date_create,";
         $sql.= " cp.description,";
@@ -312,13 +312,13 @@ class Holiday extends CommonObject
 		$sql.= " uu.login as user_login,";
 		$sql.= " uu.statut as user_statut,";
 		$sql.= " uu.photo as user_photo,";
-		
+
         $sql.= " ua.lastname as validator_lastname,";
         $sql.= " ua.firstname as validator_firstname,";
         $sql.= " ua.login as validator_login,";
         $sql.= " ua.statut as validator_statut,";
         $sql.= " ua.photo as validator_photo";
-        
+
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
         $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
 		$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
@@ -379,13 +379,13 @@ class Holiday extends CommonObject
                 $tab_result[$i]['user_login'] = $obj->user_login;
                 $tab_result[$i]['user_statut'] = $obj->user_statut;
                 $tab_result[$i]['user_photo'] = $obj->user_photo;
-                
+
                 $tab_result[$i]['validator_firstname'] = $obj->validator_firstname;
                 $tab_result[$i]['validator_lastname'] = $obj->validator_lastname;
                 $tab_result[$i]['validator_login'] = $obj->validator_login;
                 $tab_result[$i]['validator_statut'] = $obj->validator_statut;
                 $tab_result[$i]['validator_photo'] = $obj->validator_photo;
-                
+
                 $i++;
             }
 
@@ -437,13 +437,13 @@ class Holiday extends CommonObject
         $sql.= " uu.login as user_login,";
         $sql.= " uu.statut as user_statut,";
         $sql.= " uu.photo as user_photo,";
-        
+
         $sql.= " ua.lastname as validator_lastname,";
         $sql.= " ua.firstname as validator_firstname,";
         $sql.= " ua.login as validator_login,";
         $sql.= " ua.statut as validator_statut,";
         $sql.= " ua.photo as validator_photo";
-        
+
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
         $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
         $sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
@@ -504,13 +504,13 @@ class Holiday extends CommonObject
                 $tab_result[$i]['user_login'] = $obj->user_login;
                 $tab_result[$i]['user_statut'] = $obj->user_statut;
                 $tab_result[$i]['user_photo'] = $obj->user_photo;
-                
+
                 $tab_result[$i]['validator_firstname'] = $obj->validator_firstname;
                 $tab_result[$i]['validator_lastname'] = $obj->validator_lastname;
                 $tab_result[$i]['validator_login'] = $obj->validator_login;
                 $tab_result[$i]['validator_statut'] = $obj->validator_statut;
                 $tab_result[$i]['validator_photo'] = $obj->validator_photo;
-                
+
                 $i++;
             }
             // Retourne 1 et ajoute le tableau à la variable
@@ -817,7 +817,7 @@ class Holiday extends CommonObject
 		    if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
 		    if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
 		}
-		
+
 		return $statut;
     }
 
@@ -905,11 +905,11 @@ class Holiday extends CommonObject
                     $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_config(name, value)";
                     $sql.= " VALUES('".$this->db->escape($name)."', '".$this->db->escape($createifnotfound)."')";
                     $result = $this->db->query($sql);
-                    if ($result) 
+                    if ($result)
                     {
                         return $createifnotfound;
                     }
-                    else 
+                    else
                     {
                         $this->error=$this->db->lasterror();
                         return -2;
@@ -920,7 +920,7 @@ class Holiday extends CommonObject
                     return '';
                 }
             }
-            else 
+            else
             {
                 return $obj->value;
             }
@@ -948,12 +948,14 @@ class Holiday extends CommonObject
 
         if (empty($userID) && empty($nbHoliday) && empty($fk_type))
         {
+            $langs->load("holiday");
+
             // Si mise à jour pour tout le monde en début de mois
 			$now=dol_now();
 
             $month = date('m',$now);
             $newdateforlastupdate = dol_print_date($now, '%Y%m%d%H%M%S');
-            
+
             // Get month of last update
             $lastUpdate = $this->getConfCP('lastUpdate', $newdateforlastupdate);
             $monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 7fcf6a48a97..17b374e5f4a 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -57,7 +57,8 @@ llxHeader('', $langs->trans('CPTitreMenu').' ('.$langs->trans("Year").' '.$year.
 // Recent changes are more important than old changes
 $log_holiday = $cp->fetchLog('ORDER BY cpl.rowid DESC', " AND date_action BETWEEN '".$db->idate(dol_get_first_day($year,1,1))."' AND '".$db->idate(dol_get_last_day($year,12,1))."'");	// Load $cp->logs
 
-print load_fiche_titre($langs->trans('LogCP'), '<div class="pagination"><ul><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'">&lt;</a><li class="pagination"><a href="">'.$langs->trans("Year").' '.$year.'</a></li><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'">&gt;</a></li></lu></div>', 'title_hrm.png');
+$pagination='<div class="pagination"><ul><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'"><i class="fa fa-chevron-left" title="Previous"></i></a><li class="pagination"><span class="active">'.$langs->trans("Year").' '.$year.'</span></li><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'"><i class="fa fa-chevron-right" title="Next"></i></a></li></lu></div>';
+print load_fiche_titre($langs->trans('LogCP'), $pagination, 'title_hrm.png');
 
 print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
 $lastUpdate = $cp->getConfCP('lastUpdate');
@@ -77,6 +78,18 @@ print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
 
 print '<tbody>';
+
+print '<tr class="liste_titre">';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '</tr>';
+
 print '<tr class="liste_titre">';
 print_liste_field_titre($langs->trans('ID'));
 print_liste_field_titre($langs->trans('Date'), $_SERVER["PHP_SELF"], '', '', '', 'align="center"');
@@ -88,24 +101,9 @@ print_liste_field_titre($langs->trans('PrevSoldeCP'), $_SERVER["PHP_SELF"], '',
 print_liste_field_titre($langs->trans('NewSoldeCP'), $_SERVER["PHP_SELF"], '', '', '', 'align="right"');
 print '</tr>';
 
-print '<tr class="liste_titre">';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '</tr>';
-
-
-$var=true;
 
 foreach($cp->logs as $logs_CP)
 {
-   	
-
    	$user_action = new User($db);
    	$user_action->fetch($logs_CP['fk_user_action']);
 

From 542a72c684c989137788efba087edc8698e61bbb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 23:50:02 +0200
Subject: [PATCH 1081/1163] NEW custom dir is enabled dy default on first
 install. Fix modulebuilder when custom dir not defined.

---
 htdocs/admin/modules.php       |  70 +++++++-------
 htdocs/install/step1.php       |  10 +-
 htdocs/langs/en_US/admin.lang  |   2 +-
 htdocs/modulebuilder/README.md |  16 +---
 htdocs/modulebuilder/index.php | 168 ++++++++++++++++++++-------------
 5 files changed, 150 insertions(+), 116 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index fe735cb2499..57ed97c9b20 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -278,7 +278,7 @@ foreach ($modulesdir as $dir)
 
 		            try
 		            {
-		                $res=include_once $dir.$file;     // A class already exists in a different file will send a non catchable fatal error. 
+		                $res=include_once $dir.$file;     // A class already exists in a different file will send a non catchable fatal error.
 		                if (class_exists($modName))
 						{
 							try {
@@ -352,7 +352,7 @@ foreach ($modulesdir as $dir)
 		    			            {
 		    			                $arrayofwarningsext[$modName]=$objMod->warnings_activation_ext;
 		    			            }
-		    			             
+
 		    			            $orders[$i]  = $familyinfo[$familykey]['position']."_".$familykey."_".$moduleposition."_".$j;   // Sort by family, then by module position then number
 		    						$dirmod[$i]  = $dir;
 		    						//print $i.'-'.$dirmod[$i].'<br>';
@@ -436,7 +436,7 @@ if ($mode == 'common')
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="page" value="'.$page.'">';
-    
+
     dol_fiche_head($head, $mode, '', -1);
 
     $moreforfilter = '';
@@ -473,12 +473,12 @@ if ($mode == 'common')
         $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
     }
-    
-    
+
+
     print '<div class="clearboth"></div><br>';
 
     $moreforfilter='';
-    
+
     // Show list of modules
 
     $oldfamily='';
@@ -564,13 +564,13 @@ if ($mode == 'common')
         if ($familykey!=$oldfamily)
         {
         	if ($oldfamily) print '</table></div><br>';
-        	
+
             $familytext=empty($familyinfo[$familykey]['label'])?$familykey:$familyinfo[$familykey]['label'];
             print_fiche_titre($familytext, '', '');
-    		
+
             print '<div class="div-table-responsive">';
         	print '<table class="tagtable liste" summary="list_of_modules">'."\n";
-            
+
         	$atleastoneforfamily=0;
         }
 
@@ -582,9 +582,9 @@ if ($mode == 'common')
         	$oldfamily=$familykey;
         }
 
-        
 
-        
+
+
         // Version (with picto warning or not)
         $version=$objMod->getVersion(0);
         $versiontrans='';
@@ -592,14 +592,14 @@ if ($mode == 'common')
         if (preg_match('/experimental/i', $version)) $versiontrans.=img_warning($langs->trans("Experimental"), 'style="float: left"');
         if (preg_match('/deprecated/i', $version))   $versiontrans.=img_warning($langs->trans("Deprecated"), 'style="float: left"');
         $versiontrans.=$objMod->getVersion(1);
-        
+
         // Define imginfo
         $imginfo="info";
         if ($objMod->isCoreOrExternalModule() == 'external')
         {
             $imginfo="info_black";
         }
-        
+
         print '<tr>'."\n";
 
         // Picto + Name of module
@@ -756,32 +756,32 @@ if ($mode == 'common')
 	        	print "</a>\n";
         	}
         	print "</td>\n";
-        	
+
         	// Link config
         	print '<td class="tdsetuppicto right valignmiddle" width="60px">'.img_picto($langs->trans("NothingToSetup"),"setup",'class="opacitytransp" style="padding-right: 6px"').'</td>';
         }
 
         print "</tr>\n";
     }
-    
+
     if ($oldfamily)
     {
         print "</table>\n";
         print '</div>';
     }
-    
+
     dol_fiche_end();
-    
+
     // Show warning about external users
     print info_admin(showModulesExludedForExternal($modules))."\n";
-    
+
     print '</form>';
 }
 
 if ($mode == 'marketplace')
 {
     dol_fiche_head($head, $mode, '', -1);
-    
+
     // Marketplace
     print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
     print "<tr class=\"liste_titre\">\n";
@@ -790,7 +790,7 @@ if ($mode == 'marketplace')
     print '<td>'.$langs->trans("URL").'</td>';
     print '</tr>';
 
-    
+
     print "<tr class=\"oddeven\">\n";
     $url='https://www.dolistore.com';
     print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
@@ -798,7 +798,7 @@ if ($mode == 'marketplace')
     print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
     print '</tr>';
 
-    
+
     print "<tr class=\"oddeven\">\n";
     $url='https://partners.dolibarr.org';
     print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png"></a></td>';
@@ -813,23 +813,23 @@ if ($mode == 'marketplace')
 
 
 // Install external module
-   
+
 if ($mode == 'deploy')
 {
     dol_fiche_head($head, $mode, '', -1);
 
-    
+
     $allowonlineinstall=true;
     $allowfromweb=1;
     if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) $allowonlineinstall=false;
-    
+
     $fullurl='<a href="'.$urldolibarrmodules.'" target="_blank">'.$urldolibarrmodules.'</a>';
     $message='';
     if (! empty($allowonlineinstall))
     {
         if (! in_array('/custom',explode(',',$dolibarr_main_url_root_alt)))
         {
-            $message=info_admin($langs->trans("ConfFileMuseContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
+            $message=info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
             $allowfromweb=-1;
         }
         else
@@ -845,7 +845,7 @@ if ($mode == 'deploy')
             }
             else
             {
-    
+
                 $message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
                 $allowfromweb=0;
             }
@@ -856,7 +856,7 @@ if ($mode == 'deploy')
         $message=info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile",$dolibarrdataroot.'/installmodules.lock'));
         $allowfromweb=0;
     }
-    
+
     if ($allowfromweb < 1)
     {
     	print $langs->trans("SomethingMakeInstallFromWebNotPossible");
@@ -864,15 +864,15 @@ if ($mode == 'deploy')
     	//print $langs->trans("SomethingMakeInstallFromWebNotPossible2");
     	print '<br>';
     }
-    
-    
+
+
     if ($allowfromweb >= 0)
     {
-    	if ($allowfromweb == 1) 
+    	if ($allowfromweb == 1)
     	{
     	    //print $langs->trans("ThisIsProcessToFollow").'<br>';
     	}
-    	else 
+    	else
     	{
     	    print $langs->trans("ThisIsAlternativeProcessToFollow").'<br>';
         	print '<b>'.$langs->trans("StepNb",1).'</b>: ';
@@ -881,7 +881,7 @@ if ($mode == 'deploy')
         	print $langs->trans("DownloadPackageFromWebSite",$fullurl).'<br>';
         	print '<b>'.$langs->trans("StepNb",3).'</b>: ';
     	}
-    
+
     	if ($allowfromweb == 1)
     	{
     		print $langs->trans("UnpackPackageInModulesRoot",$dirins).'<br>';
@@ -899,12 +899,12 @@ if ($mode == 'deploy')
     		print $langs->trans("SetupIsReadyForUse").'<br>';
     	}
     }
-    
-    
+
+
     if (! empty($result['return']))
     {
     	print '<br>';
-    
+
     	foreach($result['return'] as $value)
     	{
     		echo $value.'<br>';
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index a57ffd0c674..631ac79752f 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -57,14 +57,14 @@ $db_user=GETPOST('db_user','alpha');
 $db_pass=GETPOST('db_pass');
 $db_port=GETPOST('db_port','int');
 $db_prefix=GETPOST('db_prefix','alpha');
-$db_create_database = GETPOST('db_create_database');
-$db_create_user = GETPOST('db_create_user');
+$db_create_database = GETPOST('db_create_database','none');
+$db_create_user = GETPOST('db_create_user','none');
 // Force https
-$main_force_https = ((GETPOST("main_force_https") && (GETPOST("main_force_https") == "on" || GETPOST("main_force_https") == 1)) ? '1' : '0');
+$main_force_https = ((GETPOST("main_force_https",'alpha') && (GETPOST("main_force_https",'alpha') == "on" || GETPOST("main_force_https",'alpha') == 1)) ? '1' : '0');
 // Use alternative directory
-$main_use_alt_dir = ((GETPOST("main_use_alt_dir") && (GETPOST("main_use_alt_dir") == "on" || GETPOST("main_use_alt_dir") == 1)) ? '' : '//');
+$main_use_alt_dir = ((GETPOST("main_use_alt_dir",'alpha') == '' || (GETPOST("main_use_alt_dir",'alpha') == "on" || GETPOST("main_use_alt_dir",'alpha') == 1)) ? '' : '//');
 // Alternative root directory name
-$main_alt_dir_name = ((GETPOST("main_alt_dir_name") && GETPOST("main_alt_dir_name") != '') ? GETPOST("main_alt_dir_name") : 'custom');
+$main_alt_dir_name = ((GETPOST("main_alt_dir_name",'alpha') && GETPOST("main_alt_dir_name",'alpha') != '') ? GETPOST("main_alt_dir_name",'alpha') : 'custom');
 
 session_start();    // To be able to keep info into session (used for not losing password during navigation. The password must not transit through parameters)
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 421b3fae132..695373e22b5 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1619,7 +1619,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do. 
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong> 
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong> 
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
diff --git a/htdocs/modulebuilder/README.md b/htdocs/modulebuilder/README.md
index 5e2af06a430..548e87b7912 100644
--- a/htdocs/modulebuilder/README.md
+++ b/htdocs/modulebuilder/README.md
@@ -9,26 +9,26 @@ If you're not a module developer you have no use for this.
 Documentation
 -------------
 
-[Module tutorial](http://wiki.dolibarr.org/index.php/Module_development)
+[Module tutorial](https://wiki.dolibarr.org/index.php/Module_development)
 
-[Dolibarr development](http://wiki.dolibarr.org/index.php/Developer_documentation)
+[Dolibarr development](https://wiki.dolibarr.org/index.php/Developer_documentation)
 
 ### Translations
 
-Dolibarr uses [Transifex](http://transifex.com) to manage it's translations.
+Dolibarr uses [Transifex](https://transifex.com) to manage it's translations.
 
 This template also contains a sample configuration for Transifex managed translations under the hidden [.tx](.tx) directory.
 
 For more informations, see the [translator's documentation](http://wiki.dolibarr.org/index.php/Translator_documentation).
 
-There is a [Transifex project](http://transifex.com/projects/p/dolibarr-module-template) for this module.
+There is a [Transifex project](https://transifex.com/projects/p/dolibarr-module-template) for this module.
 
 Install
 -------
 
 ### Manually
 
-- Make sure Dolibarr (>= 3.3.x) is already installed and configured on your workstation or development server.
+- Make sure Dolibarr is already installed and configured on your workstation or development server.
 
 - In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file
 
@@ -60,8 +60,6 @@ Install
 
     For more information about the ```conf.php``` file take a look at the conf.php.example file.
 
-*Note that for Dolibarr versions before 3.5, the ```$dolibarr_main_url_root_alt``` has to be an absolute path*
-
 - Clone the repository in ```$dolibarr_main_document_root_alt/mymodule```
 
 *(You may have to create the ```htdocs/custom``` directory first if it doesn't exist yet.)*
@@ -187,10 +185,6 @@ The de-facto standard for publishing and marketing modules for Dolibarr is the [
 Templates for required images and texts are [provided](dev/dolistore).  
 Check the dedicated [README](dev/dolistore/README.md) for more informations.
 
-Contributions
--------------
-
-Feel free to contribute and report defects on our [issue tracker](http://github.com/Dolibarr/dolibarr-module-template/issues).
 
 Licenses
 --------
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index b3b2c8dac77..17599e922aa 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -45,7 +45,7 @@ if (! $user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessfor
 
 // Dir for custom dirs
 $tmp=explode(',', $dolibarr_main_document_root_alt);
-$dircustom = $tmp[0];
+$dirins = $tmp[0];
 
 $FILEFLAG='modulebuilder.txt';
 
@@ -54,16 +54,16 @@ $FILEFLAG='modulebuilder.txt';
  * Actions
  */
 
-if ($dircustom && $action == 'initmodule' && $modulename)
+if ($dirins && $action == 'initmodule' && $modulename)
 {
     $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
-    $destdir = $dircustom.'/'.strtolower($modulename);
+    $destdir = $dirins.'/'.strtolower($modulename);
 
     $arrayreplacement=array(
         'mymodule'=>strtolower($modulename),
      	'MyModule'=>$modulename
     );
-    
+
     $result = dolCopyDir($srcdir, $destdir, 0, 0, $arrayreplacement);
     //dol_mkdir($destfile);
     if ($result <= 0)
@@ -94,17 +94,17 @@ if ($dircustom && $action == 'initmodule' && $modulename)
 	        	'My module'=>$modulename,
 	        	'htdocs/modulebuilder/template/'=>'',
 	        );
-	        
-	        
+
+
 	        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
 	        //var_dump($result);
 	        if ($result < 0)
 	        {
 	        	setEventMessages($langs->trans("ErrorFailToMakeReplacementInto", $phpfileval['fullname']), null, 'errors');
 	        }
-	    }    
+	    }
     }
-        
+
     if (! $error)
     {
         setEventMessages('ModuleInitialized', null);
@@ -113,15 +113,15 @@ if ($dircustom && $action == 'initmodule' && $modulename)
     }
 }
 
-if ($dircustom && $action == 'generatepackage')
+if ($dirins && $action == 'generatepackage')
 {
     $modulelowercase=strtolower($module);
-	
+
     // Dir for module
-    $dir = $dircustom.'/'.$modulelowercase;
+    $dir = $dirins.'/'.$modulelowercase;
     // Zip file to build
     $FILENAMEZIP='';
-    
+
     // Load module
     dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
     $class='mod'.$module;
@@ -144,13 +144,13 @@ if ($dircustom && $action == 'generatepackage')
         dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
         exit;
     }
-    
+
     $arrayversion=explode('.',$moduleobj->version,3);
     if (count($arrayversion))
     {
         $FILENAMEZIP="module_".$modulelowercase.'-'.$arrayversion[0].'.'.$arrayversion[1].($arrayversion[2]?".".$arrayversion[2]:"").".zip";
         $outputfile = $conf->admin->dir_temp.'/'.$FILENAMEZIP;
-    
+
         $result = dol_compress_dir($dir, $outputfile, 'zip');
         if ($result > 0)
         {
@@ -176,6 +176,14 @@ if ($dircustom && $action == 'generatepackage')
  * View
  */
 
+// Set dir where external modules are installed
+if (! dol_is_dir($dirins))
+{
+    dol_mkdir($dirins);
+}
+$dirins_ok=(dol_is_dir($dirins));
+
+
 llxHeader("",$langs->trans("ModuleBuilder"),"");
 
 
@@ -193,8 +201,8 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
     {
         foreach ($dolibarr_main_document_root_alt as $diralt)
         {*/
-            $dirsincustom=dol_dir_list($dircustom, 'directories');
-            
+            $dirsincustom=dol_dir_list($dirins, 'directories');
+
             if (is_array($dirsincustom) && count($dirsincustom) > 0)
             {
                 foreach ($dirsincustom as $dircustomcursor)
@@ -224,8 +232,40 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
 
 
 // Show description of content
+$newdircustom=$dirins;
+if (empty($newdircustom)) $newdircustom=img_warning();
 print $langs->trans("ModuleBuilderDesc").'<br>';
-print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $dircustom).'<br>';
+print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $newdircustom).'<br>';
+
+$message='';
+if (! $dirins)
+{
+    $message=info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
+    $allowfromweb=-1;
+}
+else
+{
+    if ($dirins_ok)
+    {
+        if (! is_writable(dol_osencode($dirins)))
+        {
+            $langs->load("errors");
+            $message=info_admin($langs->trans("ErrorFailedToWriteInDir",$dirins));
+            $allowfromweb=0;
+        }
+    }
+    else
+    {
+
+        $message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
+        $allowfromweb=0;
+    }
+}
+if ($message)
+{
+    print $message;
+}
+
 print $langs->trans("ModuleBuilderDesc3", count($listofmodules), $FILEFLAG).'<br>';
 //print '<br>';
 
@@ -237,7 +277,7 @@ $moduleobj = null;
 if (! empty($module) && $module != 'initmodule')
 {
 	$modulelowercase=strtolower($module);
-	
+
     // Load module
     dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
     $class='mod'.$module;
@@ -261,7 +301,7 @@ if (! empty($module) && $module != 'initmodule')
     }
 }
 
-print '<br>';            
+print '<br>';
 
 
 // Tabs for all modules
@@ -272,7 +312,7 @@ $head[$h][0] = $_SERVER["PHP_SELF"].'?module=initmodule';
 $head[$h][1] = $langs->trans("NewModule");
 $head[$h][2] = 'initmodule';
 $h++;
-    
+
 foreach($listofmodules as $tmpmodule => $tmpmodulewithcase)
 {
     $head[$h][0] = $_SERVER["PHP_SELF"].'?module='.$tmpmodulewithcase;
@@ -292,11 +332,11 @@ if ($module == 'initmodule')
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="initmodule">';
     print '<input type="hidden" name="module" value="initmodule">';
-    
+
     print $langs->trans("EnterNameOfModuleDesc").'<br><br>';
-    
+
     print '<input type="text" name="modulename" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'">';
-    print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
+    print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
     print '</form>';
 }
 elseif (! empty($module))
@@ -310,53 +350,53 @@ elseif (! empty($module))
        	$modulestatusinfo=img_info('').' '.$langs->trans("ModuleIsNotActive");
         if (! empty($conf->$module->enabled))
         {
-        	$modulestatusinfo=img_warning().' '.$langs->trans("ModuleIsLive");	
+        	$modulestatusinfo=img_warning().' '.$langs->trans("ModuleIsLive");
         }
-        
+
         foreach($listofmodules as $tmpmodule => $tmpmodulewithcase)
         {
             $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Description");
             $head2[$h][2] = 'description';
             $h++;
-            
+
             $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Objects");
             $head2[$h][2] = 'objects';
-            $h++;        
-        
+            $h++;
+
             $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=menus&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Menus");
             $head2[$h][2] = 'menus';
             $h++;
-            
+
             $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=permissions&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Permissions");
             $head2[$h][2] = 'permissions';
-            $h++;        
-    
+            $h++;
+
             $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=triggers&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("Triggers");
             $head2[$h][2] = 'triggers';
-            $h++;        
+            $h++;
 
             $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=buildpackage&module='.$tmpmodulewithcase;
             $head2[$h][1] = $langs->trans("BuildPackage");
             $head2[$h][2] = 'buildpackage';
-            $h++;        
+            $h++;
         }
 
         print $modulestatusinfo.'<br><br>';
-       
+
         dol_fiche_head($head2, $tab, '', -1, '');
 
         print $langs->trans("ModuleBuilderDesc".$tab).'<br><br>';
-        
+
         if ($tab == 'description')
         {
         	print '<div class="underbanner clearboth"></div>';
         	print '<div class="fichecenter">';
-        	
+
         	print '<table class="border centpercent">';
         	print '<tr class="liste_titre"><td class="titlefield">';
         	print $langs->trans("Parameter");
@@ -369,90 +409,90 @@ elseif (! empty($module))
         	print '</td><td>';
         	print $moduleobj->numero;
         	print '</td></tr>';
-        	
+
         	print '<tr><td>';
         	print $langs->trans("Name");
         	print '</td><td>';
         	print $moduleobj->getName();
         	print '</td></tr>';
-        	
+
         	print '<tr><td>';
         	print $langs->trans("Version");
         	print '</td><td>';
         	print $moduleobj->getVersion();
         	print '</td></tr>';
-        	
+
         	print '<tr><td>';
         	print $langs->trans("Family");
         	print "<br>'crm','financial','hr','projects','products','ecm','technic','interface','other'";
         	print '</td><td>';
         	print $moduleobj->family;
         	print '</td></tr>';
-        	
+
         	print '<tr><td>';
         	print $langs->trans("EditorName");
         	print '</td><td>';
         	print $moduleobj->editor_name;
         	print '</td></tr>';
-        	
+
         	print '<tr><td>';
         	print $langs->trans("EditorUrl");
         	print '</td><td>';
         	print $moduleobj->editor_url;
         	print '</td></tr>';
-        	
+
         	print '<tr><td>';
         	print $langs->trans("Description");
         	print '</td><td>';
         	print $moduleobj->getDesc();
         	print '</td></tr>';
-        	
+
         	print '<tr><td>';
         	print $langs->trans("LongDescription");
         	print '</td><td>';
         	print $moduleobj->getDescLong();
         	print '</td></tr>';
-        	
+
         	print '</table>';
-    		
+
         	print '</div>';
-    		
+
         	print '<br><br>';
         	print '<form name="delete">';
         	print '<input type="hidden" name="action" value="confirm_delete">';
         	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
         	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
-        	print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'">';		
+        	print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins?'':' disabled="disabled"').'>';
         	print '</form>';
         }
-        
+
         if ($tab == 'objects')
         {
     		print $langs->trans("FeatureNotYetAvailable");
-        	
-        
+
+
         }
-        
+
         if ($tab == 'menus')
         {
     		print $langs->trans("FeatureNotYetAvailable");
-        	
-        
+
+
         }
-        
+
         if ($tab == 'permissions')
         {
     		print $langs->trans("FeatureNotYetAvailable");
-        
+
         }
-        
+
         if ($tab == 'triggers')
         {
         	require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-        	
+
 			$interfaces = new Interfaces($db);
 			$triggers = $interfaces->getTriggersList(array('/'.strtolower($module).'/core/triggers'));
-			
+
 			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder">
 			<tr class="liste_titre">
@@ -461,11 +501,11 @@ elseif (! empty($module))
 			<td align="center">&nbsp;</td>
 			</tr>
 			';
-			
+
 			$var=True;
 			foreach ($triggers as $trigger)
 			{
-				
+
 				print '<tr class="oddeven">';
 				print '<td valign="top" width="14" align="center">'.$trigger['picto'].'</td>';
 				print '<td class="tdtop">'.$trigger['file'].'</td>';
@@ -478,7 +518,7 @@ elseif (! empty($module))
 				print '</td>';
 				print '</tr>';
 			}
-			
+
 			print '</table>';
 			print '</div>';
         }
@@ -490,15 +530,15 @@ elseif (! empty($module))
                 print img_warning().' '.$langs->trans("ErrNoZipEngine");
                 print '<br>';
             }
-            
+
         	print '<form name="generatepackage">';
         	print '<input type="hidden" name="action" value="generatepackage">';
         	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
         	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
-        	print '<input type="submit" class="button" value="'.$langs->trans("Generate").'">';		
+        	print '<input type="submit" class="button" value="'.$langs->trans("Generate").'">';
         	print '</form>';
         }
-        
+
         dol_fiche_end();
     }
 }

From 3f9c7db4c1ac9413bfdb1701a8efc52ccb08dc6b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jun 2017 23:56:43 +0200
Subject: [PATCH 1082/1163] Fix duplicate tabs

---
 htdocs/modulebuilder/index.php | 51 ++++++++++++++++------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 17599e922aa..5b3a33c9d41 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -353,38 +353,35 @@ elseif (! empty($module))
         	$modulestatusinfo=img_warning().' '.$langs->trans("ModuleIsLive");
         }
 
-        foreach($listofmodules as $tmpmodule => $tmpmodulewithcase)
-        {
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description&module='.$tmpmodulewithcase;
-            $head2[$h][1] = $langs->trans("Description");
-            $head2[$h][2] = 'description';
-            $h++;
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description&module='.$module;
+        $head2[$h][1] = $langs->trans("Description");
+        $head2[$h][2] = 'description';
+        $h++;
 
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$tmpmodulewithcase;
-            $head2[$h][1] = $langs->trans("Objects");
-            $head2[$h][2] = 'objects';
-            $h++;
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module;
+        $head2[$h][1] = $langs->trans("Objects");
+        $head2[$h][2] = 'objects';
+        $h++;
 
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=menus&module='.$tmpmodulewithcase;
-            $head2[$h][1] = $langs->trans("Menus");
-            $head2[$h][2] = 'menus';
-            $h++;
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=menus&module='.$module;
+        $head2[$h][1] = $langs->trans("Menus");
+        $head2[$h][2] = 'menus';
+        $h++;
 
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=permissions&module='.$tmpmodulewithcase;
-            $head2[$h][1] = $langs->trans("Permissions");
-            $head2[$h][2] = 'permissions';
-            $h++;
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=permissions&module='.$module;
+        $head2[$h][1] = $langs->trans("Permissions");
+        $head2[$h][2] = 'permissions';
+        $h++;
 
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=triggers&module='.$tmpmodulewithcase;
-            $head2[$h][1] = $langs->trans("Triggers");
-            $head2[$h][2] = 'triggers';
-            $h++;
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=triggers&module='.$module;
+        $head2[$h][1] = $langs->trans("Triggers");
+        $head2[$h][2] = 'triggers';
+        $h++;
 
-            $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=buildpackage&module='.$tmpmodulewithcase;
-            $head2[$h][1] = $langs->trans("BuildPackage");
-            $head2[$h][2] = 'buildpackage';
-            $h++;
-        }
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=buildpackage&module='.$module;
+        $head2[$h][1] = $langs->trans("BuildPackage");
+        $head2[$h][2] = 'buildpackage';
+        $h++;
 
         print $modulestatusinfo.'<br><br>';
 

From 11d2a5538bb233bf419bdf053559c27ecfafabc4 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Sun, 11 Jun 2017 00:03:01 +0200
Subject: [PATCH 1083/1163] fix entity default value and add link to download
 blockchain

---
 htdocs/blockedlog/admin/fingerprints.php      | 18 ++++++++++++-
 htdocs/blockedlog/class/authority.class.php   | 25 ++++++++++++++++++-
 htdocs/blockedlog/class/blockedlog.class.php  |  2 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 +-
 .../install/mysql/tables/llx_blockedlog.sql   |  2 +-
 5 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/htdocs/blockedlog/admin/fingerprints.php b/htdocs/blockedlog/admin/fingerprints.php
index bdd569d31bc..29cd2a3f73b 100644
--- a/htdocs/blockedlog/admin/fingerprints.php
+++ b/htdocs/blockedlog/admin/fingerprints.php
@@ -24,6 +24,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/blockedlog.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 $langs->load("admin");
@@ -34,6 +35,21 @@ if (! $user->admin) accessforbidden();
   
 $action = GETPOST('action','alpha');
 
+if($action === 'downloadblockchain') {
+	
+	$auth = new BlockedLogAuthority($db);
+	
+	$bc = $auth->getLocalBlockChain();
+	
+	header('Content-Type: application/octet-stream');
+	header("Content-Transfer-Encoding: Binary");
+	header("Content-disposition: attachment; filename=\"" .$auth->signature. ".certif\""); 
+	
+	echo $bc;
+	
+	exit;
+}
+
 
 /*
  *	View
@@ -58,7 +74,7 @@ print $langs->trans("FingerprintsDesc")."<br>\n";
 
 print '<br>';
 
-echo '<div align="right"><a href="?all=1">'.$langs->trans('ShowAllFingerPrintsMightBeTooLong').'</a></div>';
+echo '<div align="right"><a href="?all=1">'.$langs->trans('ShowAllFingerPrintsMightBeTooLong').'</a> <a href="?action=downloadblockchain">'.$langs->trans('DownloadBlockChain').'</a></div>';
 		
 
 print '<table class="noborder" width="100%">';
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 8d241694b70..b422fb130d7 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -18,7 +18,7 @@
 /**
  *	Class to manage certif authority
  */
-class BlockedLogAuthority 
+class BlockedLogAuthority
 {
 	
 	/**
@@ -56,6 +56,29 @@ class BlockedLogAuthority
     	
 	}
 	
+	/**
+	 *	Get the blockchain 
+	 *
+	 *	@return     string         			blockchain
+	 */
+	public function getLocalBlockChain() {
+		
+		$block_static = new BlockedLog($this->db);
+		
+		$this->signature = $block_static->getSignature();
+		
+		$blocks = $block_static->getLog('all', 0, 0, 1) ;
+		
+		$this->blockchain = '';
+		
+		foreach($blocks as &$b) {
+			$this->blockchain.=$b->signature;
+			
+		}
+		
+		return $this->blockchain;
+	}
+	
 	/**
 	 *	Get hash of the block chain to check
 	 *
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 26283d6b08a..1f93eb3cc26 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -19,7 +19,7 @@
  *	Class to manage Blocked Log
  */
 
-class BlockedLog 
+class BlockedLog
 {
 	
 	/**
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index f4757e2475f..0f9ef8ee3ca 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -409,7 +409,7 @@ CREATE TABLE llx_blockedlog
 	date_object	datetime,
 	object_data	text,
 	fk_user	integer,
-	entity integer, 
+	entity integer DEFAULT 1, 
 	certified integer
 ) ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
index 769eb34e092..afc0f0d4375 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -13,7 +13,7 @@ CREATE TABLE llx_blockedlog
 	date_object	datetime,
 	object_data	text,
 	fk_user	integer,
-	entity integer, 
+	entity integer DEFAULT 1, 
 	certified integer
 ) ENGINE=innodb;
 

From b19e0e3cae12cac65c5b9e06ee61e3c19796bcbd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 00:31:58 +0200
Subject: [PATCH 1084/1163] Create card.php

---
 htdocs/fourn/facture/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 813f23cdc88..5471b3111f7 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -218,7 +218,7 @@ if (empty($reshook))
 	{
 	    $object->fetch($id);
 	    $object->fetch_thirdparty();
-	    $result=$object->delete($user, $id);
+	    $result=$object->delete($user);
 	    if ($result > 0)
 	    {
 	        header('Location: list.php');

From 074c43920ad168c66931fcd08cc9b4fee1540440 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 00:35:03 +0200
Subject: [PATCH 1085/1163] Create projects.php

---
 htdocs/projet/ajax/projects.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index ae4c412f6e3..991cae22aa3 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -61,7 +61,7 @@ $idprod = (! empty($match[0]) ? $match[0] : '');
 if (! GETPOST($htmlname) && ! GETPOST($idprod)) return;
 
 // When used from jQuery, the search term is added as GET param "term".
-$searchkey=(!empty($idprod) && GETPOST($idprod)?GETPOST($idprod):(GETPOST($htmlname)?GETPOST($htmlname):''));
+$searchkey=((!empty($idprod) && GETPOST($idprod))?GETPOST($idprod):(GETPOST($htmlname)?GETPOST($htmlname):''));
 
 $form = new FormProjets($db);
 $arrayresult=$form->select_projects_list($socid, '', $htmlname, 0, 0, 1, $discard_closed, 0, 0, 1, $searchkey);

From e93cefbbf01aa5ad992605123cd05ece1b17bd02 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 10:37:58 +0200
Subject: [PATCH 1086/1163] FIX #6985

---
 htdocs/adherents/card.php                     |   2 +
 htdocs/adherents/type.php                     |   2 +
 htdocs/categories/card.php                    |   3 +-
 htdocs/categories/edit.php                    |   1 +
 htdocs/comm/action/card.php                   |   6 +-
 htdocs/comm/mailing/advtargetemailing.php     |   3 +-
 htdocs/comm/mailing/card.php                  |   2 +
 htdocs/comm/propal/card.php                   |   1 +
 htdocs/commande/card.php                      |   1 +
 htdocs/commande/orderstoinvoice.php           |   1 +
 htdocs/compta/bank/card.php                   |   2 +
 htdocs/compta/bank/various_payment/card.php   |   1 +
 htdocs/compta/deplacement/card.php            |   2 +
 htdocs/compta/facture/card.php                |   1 +
 htdocs/compta/localtax/card.php               |   2 +
 htdocs/compta/salaries/card.php               |   2 +
 htdocs/compta/tva/card.php                    |   2 +
 htdocs/contact/card.php                       |   2 +
 htdocs/contrat/card.php                       |   1 +
 htdocs/core/tpl/extrafields_view.tpl.php      |   1 +
 htdocs/don/card.php                           |   2 +
 htdocs/expedition/card.php                    |   1 +
 htdocs/expensereport/card.php                 | 198 +++++++++---------
 htdocs/fichinter/card.php                     |  45 ++--
 htdocs/fourn/commande/card.php                |   1 +
 htdocs/fourn/commande/orderstoinvoice.php     |   1 +
 htdocs/fourn/facture/card.php                 |   1 +
 htdocs/product/card.php                       |   2 +
 htdocs/product/document.php                   |   1 +
 htdocs/product/fournisseurs.php               |  43 ++--
 htdocs/product/stats/commande.php             |  15 +-
 htdocs/product/stats/commande_fournisseur.php |  18 +-
 htdocs/product/stats/contrat.php              |  21 +-
 htdocs/product/stats/facture.php              |  23 +-
 htdocs/product/stats/facture_fournisseur.php  |  13 +-
 htdocs/product/stats/propal.php               |  19 +-
 htdocs/product/stock/product.php              |  17 +-
 htdocs/projet/card.php                        |   2 +
 htdocs/projet/tasks.php                       |  53 ++---
 htdocs/projet/tasks/task.php                  |   1 +
 htdocs/resource/add.php                       |   1 +
 htdocs/resource/card.php                      |   1 +
 htdocs/societe/commerciaux.php                |   3 +-
 htdocs/supplier_proposal/card.php             |   1 +
 htdocs/user/card.php                          |   1 +
 htdocs/user/group/card.php                    |   2 +
 46 files changed, 293 insertions(+), 231 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 147040fbf67..78969a8df14 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -943,6 +943,7 @@ else
 		// Other attributes
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
@@ -1185,6 +1186,7 @@ else
 		// Other attributes
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit',$parameters);
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 50c464596fd..f54c89ffeba 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -278,6 +278,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		print $object->showOptionals($extrafields,'edit');
@@ -668,6 +669,7 @@ if ($rowid > 0)
 		// Other attributes
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 		    print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index ed497cbbb7f..55bf400ea3a 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -268,7 +268,8 @@ if ($user->rights->categorie->creer)
 
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook))
+        print $hookmanager->resPrint;
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index c2f93c17ccd..59bee88b75b 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -175,6 +175,7 @@ print '</td></tr>';
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
 if (empty($reshook) && ! empty($extrafields->attribute_label))
 {
 	print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 1bb35fe7fe8..60486ac6f01 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -833,7 +833,8 @@ if ($action == 'create')
     // Other attributes
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
+    print $hookmanager->resPrint;
+    if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		print $object->showOptionals($extrafields,'edit');
 	}
@@ -1164,7 +1165,8 @@ if ($id > 0)
         // Other attributes
         $parameters=array();
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
+        print $hookmanager->resPrint;
+        if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 832cefa5774..81c29f687ce 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -777,8 +777,9 @@ if ($object->fetch($id) >= 0) {
 			if (! empty($advTarget->id)) {
 				$parameters = array('array_query' => $advTarget->filtervalue);
 			}
-			// Module extrafield feature
+			// Other attributes
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $std_soc, $action_search);
+            print $hookmanager->resPrint;
 		}
 
 		// State Contact
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 353117f5fa3..17d4d066569 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -718,6 +718,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		print $object->showOptionals($extrafields,'edit');
@@ -1153,6 +1154,7 @@ else
 			// Other attributes
 			$parameters=array();
 			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
 			if (empty($reshook) && ! empty($extrafields->attribute_label))
 			{
 				print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index d58f2223adb..3e8580d5350 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1527,6 +1527,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index eeea825c1e5..e2db47a6c9d 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1609,6 +1609,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	// Other attributes
 	$parameters = array('objectsrc' => $objectsrc, 'socid'=>$socid);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index e76adb2a67c..fa9f810b036 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -471,6 +471,7 @@ if ($action == 'create' && !$error)
 	// Other attributes
 	$parameters=array('objectsrc' => $objectsrc, 'idsrc' => $listoforders);
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		$object=new Facture($db);
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 7267769379e..06918ff2846 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -409,6 +409,7 @@ if ($action == 'create')
  	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		print $object->showOptionals($extrafields,'edit',$parameters);
@@ -946,6 +947,7 @@ else
 		// Other attributes
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 9444c0585f7..e19deca91c9 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -284,6 +284,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
 	print '</table>';
 
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 555ea52b4e0..979ef5960e0 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -300,6 +300,7 @@ if ($action == 'create')
     // Other attributes
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
     print '</table>';
 
@@ -396,6 +397,7 @@ else if ($id)
             // Other attributes
             $parameters=array();
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
 
             print '</table>';
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index c79beaac4f3..fa9bdf60dc5 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2591,6 +2591,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters = array('objectsrc' => $objectsrc,'colspan' => ' colspan="2"', 'cols'=>2);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index bd1f83d7f43..317d3ae813d 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -202,6 +202,7 @@ if ($action == 'create')
     // Other attributes
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
     print '</table>';
 
@@ -271,6 +272,7 @@ if ($id)
     // Other attributes
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$vatpayment,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
     print '</table>';
 
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 20079ad18ee..45bde4bcd32 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -302,6 +302,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
 	print '</table>';
 
@@ -389,6 +390,7 @@ if ($id)
 	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
 	print '</table>';
 
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index ea26d2c55a8..6f7e250f4f5 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -284,6 +284,7 @@ if ($action == 'create')
     // Other attributes
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
     print '</table>';
 
@@ -351,6 +352,7 @@ if ($id)
 	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
 	print '</table>';
 
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index ae13bb44a3a..fbd27b0d841 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -666,6 +666,7 @@ else
             // Other attributes
             $parameters=array('colspan' => ' colspan="3"','cols'=>3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
             	print $object->showOptionals($extrafields,'edit');
@@ -934,6 +935,7 @@ else
             // Other attributes
             $parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
             	print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 4e19d6109b8..58b1608f44b 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1211,6 +1211,7 @@ if ($action == 'create')
     // Other attributes
     $parameters=array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"', 'cols'=>3);
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
     // Other attributes
     if (empty($reshook) && ! empty($extrafields->attribute_label)) {
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 9c9813e18ca..0f1d581c99f 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -34,6 +34,7 @@ if (! empty($cols)) $parameters['cols'] = $cols;
 if (! empty($object->fk_soc)) $parameters['socid'] = $object->fk_soc;
 
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
+print $hookmanager->resPrint;
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element]['label']))
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 33f2375a1bf..3f58982624d 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -373,6 +373,7 @@ if ($action == 'create')
     // Other attributes
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
     if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
 		print $object->showOptionals($extrafields,'edit',$parameters);
@@ -498,6 +499,7 @@ if (! empty($id) && $action == 'edit')
     // Other attributes
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
     if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
       	print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index e3a1b0bc3fa..72044d68fcf 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -774,6 +774,7 @@ if ($action == 'create')
             // Other attributes
             $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'socid'=>$socid);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
 
             if (empty($reshook) && ! empty($extrafields->attribute_label)) {
             	print $expe->showOptionals($extrafields, 'edit');
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index d9c195f4ca9..c4aa6caccd8 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -125,7 +125,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel) 
+    if ($cancel)
     {
         $action='';
     	$fk_projet='';
@@ -158,7 +158,7 @@ if (empty($reshook))
             {
                 // Because createFromClone modifies the object, we must clone it so that we can restore it later if it fails
                 $orig = clone $object;
-    
+
                 $result=$object->createFromClone(GETPOST('fk_user_author','int'));
                 if ($result > 0)
                 {
@@ -174,7 +174,7 @@ if (empty($reshook))
             }
         }
     }
-    
+
     if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $id > 0 && $user->rights->expensereport->supprimer)
     {
     	$object = new ExpenseReport($db);
@@ -190,20 +190,20 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
-    
+
     if ($action == 'add' && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
-    
+
     	$object->date_debut = $date_start;
     	$object->date_fin = $date_end;
-    
+
     	$object->fk_user_author             = GETPOST('fk_user_author','int');
     	if (! ($object->fk_user_author > 0)) $object->fk_user_author = $user->id;
-    	
+
     	$fuser=new User($db);
     	$fuser->fetch($object->fk_user_author);
-    	
+
     	$object->fk_statut = 1;
     	$object->fk_c_paiement				= GETPOST('fk_c_paiement','int');
     	$object->fk_user_validator			= GETPOST('fk_user_validator','int');
@@ -215,20 +215,20 @@ if (empty($reshook))
     	    $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
     	    if ($ret < 0) $error++;
     	}
-    	 
+
     	if ($object->periode_existe($fuser,$object->date_debut,$object->date_fin))
     	{
     		$error++;
     		setEventMessages($langs->trans("ErrorDoubleDeclaration"), null, 'errors');
     		$action='create';
     	}
-    
+
     	if (! $error)
     	{
     		$db->begin();
-    
+
     		$id = $object->create($user);
-    
+
     		if ($id > 0)
     		{
     			$db->commit();
@@ -243,25 +243,25 @@ if (empty($reshook))
     		}
     	}
     }
-    
+
     if ($action == 'update' && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
-    
+
     	$object->date_debut = $date_start;
     	$object->date_fin = $date_end;
-    
+
     	if($object->fk_statut < 3)
     	{
     		$object->fk_user_validator = GETPOST('fk_user_validator','int');
     	}
-    
+
     	$object->fk_c_paiement = GETPOST('fk_c_paiement','int');
     	$object->note_public = GETPOST('note_public');
     	$object->note_private = GETPOST('note_private');
     	$object->fk_user_modif = $user->id;
-    	
+
     	$result = $object->update($user);
     	if ($result > 0)
     	{
@@ -273,14 +273,14 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
-    
+
     if ($action == 'update_extras')
     {
         // Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
         $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
         if ($ret < 0) $error++;
-    
+
         if (! $error)
         {
             // Actions on extra fields (by external module or standard code)
@@ -296,17 +296,17 @@ if (empty($reshook))
             } else if ($reshook < 0)
                 $error++;
         }
-    
+
         if ($error)
             $action = 'edit_extras';
     }
-    
+
     if ($action == "confirm_validate" && GETPOST("confirm") == "yes" && $id > 0 && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
     	$result = $object->setValidate($user);
-    
+
     	if ($result > 0)
     	{
     		// Define output language
@@ -322,51 +322,51 @@ if (empty($reshook))
     			}
     			$model=$object->modelpdf;
     			$ret = $object->fetch($id); // Reload to get new records
-    
+
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
-    
+
     	if ($result > 0 && $object->fk_user_validator > 0)
     	{
     		$langs->load("mails");
-    
+
     		// TO
     		$destinataire = new User($db);
     		$destinataire->fetch($object->fk_user_validator);
     		$emailTo = $destinataire->email;
-    
+
     		// FROM
     		$expediteur = new User($db);
     		$expediteur->fetch($object->fk_user_author);
     		$emailFrom = $expediteur->email;
-    
+
     		if ($emailTo && $emailFrom)
     		{
     			$filename=array(); $filedir=array(); $mimetype=array();
-    
+
     			// SUBJECT
     			$subject = $langs->transnoentities("ExpenseReportWaitingForApproval");
-    
+
     			// CONTENT
     			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
     			$message = $langs->transnoentities("ExpenseReportWaitingForApprovalMessage", $expediteur->getFullName($langs), get_date_range($object->date_debut,$object->date_fin,'',$langs), $link);
-    
+
     			// Rebuild pdf
     			/*
     			$object->setDocModel($user,"");
     			$resultPDF = expensereport_pdf_create($db,$id,'',"",$langs);
-    
+
     			if($resultPDF):
     			// ATTACHMENT
     			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
     			array_push($filedir,$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref) . "/" . dol_sanitizeFileName($object->ref).".pdf");
     			array_push($mimetype,"application/pdf");
     			*/
-    
+
     			// PREPARE SEND
     			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-    
+
     			if ($mailfile)
     			{
     				// SEND
@@ -411,13 +411,13 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
-    
+
     if ($action == "confirm_save_from_refuse" && GETPOST("confirm") == "yes" && $id > 0 && $user->rights->expensereport->creer)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
     	$result = $object->set_save_from_refuse($user);
-    
+
     	if ($result > 0)
     	{
     		// Define output language
@@ -433,11 +433,11 @@ if (empty($reshook))
     			}
     			$model=$object->modelpdf;
     			$ret = $object->fetch($id); // Reload to get new records
-    
+
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
-    
+
     	if ($result > 0)
     	{
     		// Send mail
@@ -446,7 +446,7 @@ if (empty($reshook))
    			$destinataire = new User($db);
    			$destinataire->fetch($object->fk_user_validator);
    			$emailTo = $destinataire->email;
-    
+
 			// FROM
 			$expediteur = new User($db);
 			$expediteur->fetch($object->fk_user_author);
@@ -455,10 +455,10 @@ if (empty($reshook))
    			if ($emailFrom && $emailTo)
    			{
     			$filename=array(); $filedir=array(); $mimetype=array();
-   			    
+
    			    // SUBJECT
     			$subject = $langs->transnoentities("ExpenseReportWaitingForReApproval");
-    
+
     			// CONTENT
     			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
 				$dateRefusEx = explode(" ",$object->date_refuse);
@@ -481,7 +481,7 @@ if (empty($reshook))
 
     			// PREPARE SEND
     			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-    
+
     			if ($mailfile)
     			{
     				// SEND
@@ -526,15 +526,15 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
-    
+
     // Approve
     if ($action == "confirm_approve" && GETPOST("confirm") == "yes" && $id > 0 && $user->rights->expensereport->approve)
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
-    
+
     	$result = $object->setApproved($user);
-    
+
     	if ($result > 0)
     	{
     		// Define output language
@@ -550,11 +550,11 @@ if (empty($reshook))
     			}
     			$model=$object->modelpdf;
     			$ret = $object->fetch($id); // Reload to get new records
-    
+
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
-    
+
     	if ($result > 0)
     	{
     		// Send mail
@@ -576,19 +576,19 @@ if (empty($reshook))
    			if ($emailFrom && $emailTo)
    			{
     			$filename=array(); $filedir=array(); $mimetype=array();
-   			    
+
    			    // SUBJECT
        			$subject = $langs->transnoentities("ExpenseReportApproved");
-    
+
        			// CONTENT
        			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
        			$message = $langs->transnoentities("ExpenseReportApprovedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
-    
+
        			// Rebuilt pdf
     			/*
         		$object->setDocModel($user,"");
         		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-        
+
         		if($resultPDF
     			{
         			// ATTACHMENT
@@ -600,7 +600,7 @@ if (empty($reshook))
     			*/
 
         		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-    
+
        			if ($mailfile)
        			{
        				// SEND
@@ -673,7 +673,7 @@ if (empty($reshook))
     			}
     			$model=$object->modelpdf;
     			$ret = $object->fetch($id); // Reload to get new records
-    
+
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
@@ -686,28 +686,28 @@ if (empty($reshook))
     		$destinataire = new User($db);
     		$destinataire->fetch($object->fk_user_author);
     		$emailTo = $destinataire->email;
-    
+
     		// FROM
     		$expediteur = new User($db);
     		$expediteur->fetch($object->fk_user_refuse);
     		$emailFrom = $expediteur->email;
-    
+
     		if ($emailFrom && $emailTo)
     		{
     			$filename=array(); $filedir=array(); $mimetype=array();
-    		    
+
     		    // SUBJECT
        			$subject = $langs->transnoentities("ExpenseReportRefused");
-    
+
        			// CONTENT
        			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
     			$message = $langs->transnoentities("ExpenseReportRefusedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_refuse'], $link);
-    
+
        			// Rebuilt pdf
     			/*
         		$object->setDocModel($user,"");
         		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-        
+
         		if($resultPDF
     			{
         			// ATTACHMENT
@@ -796,7 +796,7 @@ if (empty($reshook))
     				}
     				$model=$object->modelpdf;
     				$ret = $object->fetch($id); // Reload to get new records
-    
+
     				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			}
     		}
@@ -814,23 +814,23 @@ if (empty($reshook))
     			$expediteur = new User($db);
     			$expediteur->fetch($object->fk_user_cancel);
     			$emailFrom = $expediteur->email;
-    
+
     			if ($emailFrom && $emailTo)
     			{
     			    $filename=array(); $filedir=array(); $mimetype=array();
-    			    
+
     			    // SUBJECT
     				$subject = $langs->transnoentities("ExpenseReportCanceled");
-    
+
     				// CONTENT
     				$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
     				$message = $langs->transnoentities("ExpenseReportCanceledMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_cancel'], $link);
-    
+
     				// Rebuilt pdf
     				/*
     				$object->setDocModel($user,"");
     				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-    		
+
     				if($resultPDF
     				{
     					// ATTACHMENT
@@ -840,10 +840,10 @@ if (empty($reshook))
     					array_push($mimetype,"application/pdf");
     				}
     				*/
-    
+
         			// PREPARE SEND
         			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-        
+
         			if ($mailfile)
         			{
         				// SEND
@@ -881,7 +881,7 @@ if (empty($reshook))
     			{
     			    setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
     			    $action='';
-    			}        			
+    			}
     		}
     		else
     		{
@@ -918,7 +918,7 @@ if (empty($reshook))
     				}
     				$model=$object->modelpdf;
     				$ret = $object->fetch($id); // Reload to get new records
-    
+
     				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			}
     		}
@@ -961,7 +961,7 @@ if (empty($reshook))
     			}
     			$model=$object->modelpdf;
     			$ret = $object->fetch($id); // Reload to get new records
-    
+
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
     	}
@@ -983,7 +983,7 @@ if (empty($reshook))
     		if ($emailFrom && $emailTo)
     		{
     			$filename=array(); $filedir=array(); $mimetype=array();
-    		    
+
     		    // SUBJECT
     			$subject = $langs->transnoentities("ExpenseReportPaid");
 
@@ -1154,7 +1154,7 @@ if (empty($reshook))
     {
     	$object = new ExpenseReport($db);
     	$object->fetch($id);
-    
+
     	$object_ligne = new ExpenseReportLine($db);
     	$object_ligne->fetch(GETPOST("rowid"));
     	$total_ht = $object_ligne->total_ht;
@@ -1178,11 +1178,11 @@ if (empty($reshook))
     				}
     				$model=$object->modelpdf;
     				$ret = $object->fetch($id); // Reload to get new records
-    
+
     				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			}
     		}
-    
+
     		$object->update_totaux_del($object_ligne->total_ht,$object_ligne->total_tva);
     		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_GET['id']);
     		exit;
@@ -1244,13 +1244,13 @@ if (empty($reshook))
     					}
     					$model=$object->modelpdf;
     					$ret = $object->fetch($id); // Reload to get new records
-    
+
     					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     				}
     			}
-    
+
     			$result = $object->recalculer($id);
-    
+
     			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     			exit;
     		}
@@ -1296,7 +1296,7 @@ if ($action == 'create')
 
 	print '<table class="border" width="100%">';
 	print '<tbody>';
-	
+
 	// Date start
 	print '<tr>';
 	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("DateStart").'</td>';
@@ -1304,7 +1304,7 @@ if ($action == 'create')
 	$form->select_date($date_start?$date_start:-1,'date_debut',0,0,0,'',1,1);
 	print '</td>';
 	print '</tr>';
-	
+
 	// Date end
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans("DateEnd").'</td>';
@@ -1312,7 +1312,7 @@ if ($action == 'create')
 	$form->select_date($date_end?$date_end:-1,'date_fin',0,0,0,'',1,1);
 	print '</td>';
 	print '</tr>';
-	
+
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans("User").'</td>';
 	print '<td>';
@@ -1341,7 +1341,7 @@ if ($action == 'create')
 	}
 	print '</td>';
 	print '</tr>';
-	
+
 	// Payment mode
 	if (! empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION))
 	{
@@ -1376,7 +1376,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters = array('colspan' => ' colspan="3"');
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
-	// hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 	    print $object->showOptionals($extrafields, 'edit');
 	}
@@ -1400,7 +1400,7 @@ else
 		$result = $object->fetch($id, $ref);
 
 		$res = $object->fetch_optionals($object->id, $extralabels);
-		
+
 		if ($result > 0)
 		{
 			if (! in_array($object->fk_user_author, $user->getAllChildIds(1)))
@@ -1698,7 +1698,7 @@ else
 						$userfee=new User($db);
 						$result = $userfee->fetch($object->fk_user_validator);
 						if ($result > 0) print $userfee->getNomUrl(-1);
-						if (empty($userfee->email) || ! isValidEmail($userfee->email)) 
+						if (empty($userfee->email) || ! isValidEmail($userfee->email))
 						{
 						    $langs->load("errors");
 						    print img_warning($langs->trans("ErrorBadEMail", $userfee->email));
@@ -1902,9 +1902,9 @@ else
 				    {
 				        print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("AlreadyPaid").':</td><td align="right">'.price($totalpaid).'</td></tr>';
 				        print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("AmountExpected").':</td><td align="right">'.price($object->total_ttc).'</td></tr>';
-				
+
 				        $remaintopay = $object->total_ttc - $totalpaid;
-				
+
 				        print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("RemainderToPay").':</td>';
 				        print '<td align="right"'.($remaintopay?' class="amountremaintopay"':'').'>'.price($remaintopay).'</td></tr>';
 				    }
@@ -1984,7 +1984,7 @@ else
 							if ($action != 'editline' || $objp->rowid != GETPOST('rowid'))
 							{
 								print '<tr class="oddeven">';
-								
+
 								print '<td style="text-align:center;">';
 								print img_picto($langs->trans("Document"), "object_generic");
 								print ' <span>'.$piece_comptable.'</span></td>';
@@ -2006,7 +2006,7 @@ else
 								print '<td style="text-align:right;">'.vatrate($objp->vatrate,true).'</td>';
 								print '<td style="text-align:right;">'.price($objp->value_unit).'</td>';
 								print '<td style="text-align:right;">'.$objp->qty.'</td>';
-								
+
 								if ($action != 'editline')
 								{
 									print '<td style="text-align:right;">'.price($objp->total_ht).'</td>';
@@ -2034,7 +2034,7 @@ else
 							if ($action == 'editline' && $objp->rowid == GETPOST('rowid'))
 							{
 									print '<tr class="oddeven">';
-									
+
 									print '<td></td>';
 
 									// Select date
@@ -2049,7 +2049,7 @@ else
     									$formproject->select_projects(-1, $objp->fk_projet,'fk_projet', 0, 0, 1, 1);
     									print '</td>';
 									}
-									
+
 									// Select type
 									print '<td class="center">';
 									select_type_fees_id($objp->type_fees_code,'fk_c_type_fees');
@@ -2168,13 +2168,13 @@ else
 						}
 
 						print '<td align="center"><input type="submit" value="'.$langs->trans("Add").'" name="bouton" class="button"></td>';
-						
+
 						print '</tr>';
 					} // Fin si c'est payé/validé
 
 					print '</table>';
 					print '</div>';
-					
+
 					print '</form>';
 				}
 				else
@@ -2290,7 +2290,7 @@ if ($action != 'create' && $action != 'edit')
 
 	// If status is Appoved
 	// --------------------
-	
+
 	if ($user->rights->expensereport->approve && $object->fk_statut == 5)
 	{
 	    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=refuse&id='.$object->id.'">'.$langs->trans('Deny').'</a></div>';
@@ -2309,7 +2309,7 @@ if ($action != 'create' && $action != 'edit')
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/expensereport/payment/payment.php?id=' . $object->id . '&amp;action=create">' . $langs->trans('DoPayment') . '</a></div>';
 		}
 	}
-	
+
 	// If bank module is not used
 	if (($user->rights->expensereport->to_paid || empty($conf->banque->enabled)) && $object->fk_statut == 5)
 	{
@@ -2319,26 +2319,26 @@ if ($action != 'create' && $action != 'edit')
 			print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
 		}
 	}
-	
+
 	if ($user->rights->expensereport->creer && ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) && $object->fk_statut == 5)
 	{
     	// Cancel
    		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&id='.$object->id.'">'.$langs->trans('Cancel').'</a></div>';
 	}
-	
+
     // TODO Replace this. It should be SetUnpaid and should go back to status unpaid not canceled.
 	if (($user->rights->expensereport->approve || $user->rights->expensereport->to_paid) && $object->fk_statut == 6)
 	{
 	    // Cancel
 	    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&id='.$object->id.'">'.$langs->trans('Cancel').'</a></div>';
 	}
-	
+
 	// Clone
 	if ($user->rights->expensereport->creer) {
 	    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=clone">' . $langs->trans("ToClone") . '</a></div>';
 	}
-	
-	/* If draft, validated, cancel, and user can create, he can always delete its card before it is approved */ 
+
+	/* If draft, validated, cancel, and user can create, he can always delete its card before it is approved */
 	if ($user->rights->expensereport->creer && $user->id == $object->fk_user_author && $object->fk_statut <= 4)
 	{
 	    // Delete
@@ -2389,7 +2389,7 @@ if ($action != 'create' && $action != 'edit' && ($id || $ref))
         $object->fetch_thirdparty();
         $result = $object->add_object_linked('fichinter', GETPOST('LinkedFichinter'));
     }
-    
+
     // Show links to link elements
     $linktoelements=array();
     if (! empty($conf->global->EXPENSES_LINK_TO_INTERVENTION))
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 9e463eb8ac4..c084806c4a6 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -581,7 +581,7 @@ if (empty($reshook))
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
-	
+
 	/*
 	 *  Mise a jour d'une ligne d'intervention
 	 */
@@ -997,7 +997,8 @@ if ($action == 'create')
         // Other attributes
         $parameters=array('colspan' => ' colspan="2"');
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
+        print $hookmanager->resPrint;
+        if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
 		}
@@ -1147,11 +1148,11 @@ else if ($id > 0 || ! empty($ref))
 	// Print form confirm
 	print $formconfirm;
 
-	
+
 	// Intervention card
 	$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
-	
+
+
 	$morehtmlref='<div class="refidno">';
 	// Ref customer
 	//$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->fichinter->creer, 'string', '', 0, 1);
@@ -1191,16 +1192,16 @@ else if ($id > 0 || ! empty($ref))
 	    }
 	}
 	$morehtmlref.='</div>';
-	
+
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-	    
-	
+
+
     print '<div class="fichecenter">';
     print '<div class="fichehalfleft">';
     print '<div class="underbanner clearboth"></div>';
-    
+
     print '<table class="border" width="100%">';
-    
+
 	if (! empty($conf->global->FICHINTER_USE_PLANNED_AND_DONE_DATES))
 	{
 		// Date Start
@@ -1279,14 +1280,14 @@ else if ($id > 0 || ! empty($ref))
     include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
     print '</table>';
-    
+
     print '</div>';
     print '<div class="fichehalfright">';
     print '<div class="ficheaddleft">';
     print '<div class="underbanner clearboth"></div>';
-    
+
     print '<table class="border centpercent">';
-    
+
     if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
     {
         // Duration
@@ -1294,15 +1295,15 @@ else if ($id > 0 || ! empty($ref))
         print '<td>'.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
         print '</tr>';
     }
-    
+
 	print "</table>";
-    
+
 	print '</div>';
     print '</div>';
     print '</div>';
-    
+
     print '<div class="clearboth"></div><br>';
-    
+
 
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
@@ -1367,7 +1368,7 @@ else if ($id > 0 || ! empty($ref))
 			while ($i < $num)
 			{
 				$objp = $db->fetch_object($resql);
-				
+
 
 				// Ligne en mode visu
 				if ($action != 'editline' || GETPOST('line_id','int') != $objp->rowid)
@@ -1488,7 +1489,7 @@ else if ($id > 0 || ! empty($ref))
 			// Add new line
 			if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline' && empty($conf->global->FICHINTER_DISABLE_DETAILS))
 			{
-				if (! $num) 
+				if (! $num)
 				{
 				    print '<br><table class="noborder" width="100%">';
 
@@ -1501,7 +1502,7 @@ else if ($id > 0 || ! empty($ref))
       				print '<td colspan="3">&nbsp;</td>';
     				print "</tr>\n";
 				}
-				
+
 				print '<tr class="oddeven">'."\n";
                 print '<td>';
                 // editeur wysiwyg
@@ -1655,7 +1656,7 @@ else if ($id > 0 || ! empty($ref))
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifydone">'.$langs->trans("InterventionClassifyDone").'</a></div>';
 				}
-				
+
 				// Clone
 				if ($user->rights->ficheinter->creer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=ficheinter">' . $langs->trans("ToClone") . '</a></div>';
@@ -1698,7 +1699,7 @@ else if ($id > 0 || ! empty($ref))
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('fichinter'));
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-		
+
 
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 2137e7ca747..dda4a0d7254 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1572,6 +1572,7 @@ if ($action=='create')
 	// Other options
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index a503776b653..86c177c4313 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -370,6 +370,7 @@ if ($action == 'create' && !$error) {
 	        'cols'=>2
 	);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 306ad62d69b..e67cb74d1ea 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1824,6 +1824,7 @@ if ($action == 'create')
     // Other options
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 
     // Bouton "Create Draft"
     print "</table>\n";
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index d42dc87b4b9..dc75ee54bb5 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1047,6 +1047,7 @@ else
         // Other attributes
         $parameters=array('cols' => 3);
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
         if (empty($reshook) && ! empty($extrafields->attribute_label))
         {
         	print $object->showOptionals($extrafields,'edit',$parameters);
@@ -1366,6 +1367,7 @@ else
             // Other attributes
             $parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
             	print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 2b76fb0a111..a7c7b4f22be 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -193,6 +193,7 @@ if ($object->id)
 
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 	// Construit liste des fichiers
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 84532ad219e..46db7f69b91 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -98,7 +98,7 @@ if (empty($reshook))
 		if ($id)
 		{
 			$result=$object->fetch($id);
-			$object->cost_price = price2num($cost_price); 
+			$object->cost_price = price2num($cost_price);
 			$result=$object->update($object->id, $user);
 			if ($result > 0)
 			{
@@ -112,7 +112,7 @@ if (empty($reshook))
 			}
 		}
 	}
-	
+
 	if ($action == 'confirm_remove_pf')
 	{
 		if ($rowid)	// id of product supplier price to remove
@@ -299,21 +299,21 @@ if ($id > 0 || $ref)
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id . '&rowid=' . $rowid, $langs->trans('DeleteProductBuyPrice'), $langs->trans('ConfirmDeleteProductBuyPrice'), 'confirm_remove_pf', '', 0, 1);
 			echo $formconfirm;
 		}
-		
+
 		if ($action <> 'edit' && $action <> 're-edit')
 		{
 			$head=product_prepare_head($object);
 			$titre=$langs->trans("CardProduct".$object->type);
 			$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-			
+
 			dol_fiche_head($head, 'suppliers', $titre, -1, $picto);
-			
+
 			$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		    $object->next_prev_filter=" fk_product_type = ".$object->type;		
+		    $object->next_prev_filter=" fk_product_type = ".$object->type;
             dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-            
+
             print '<div class="fichecenter">';
-            
+
             print '<div class="underbanner clearboth"></div>';
             print '<table class="border tableforfield" width="100%">';
 
@@ -338,14 +338,14 @@ if ($id > 0 || $ref)
             print '</td><td colspan="2">';
             print $form->editfieldval($text,'cost_price',$object->cost_price,$object,$user->rights->produit->creer||$user->rights->service->creer,'amount:6');
             print '</td></tr>';
-            
+
 			print '</table>';
 
             print '</div>';
             print '<div style="clear:both"></div>';
-			
+
 			dol_fiche_end();
-			
+
 
 			// Form to add or update a price
 			if (($action == 'add_price' || $action == 'updateprice' ) && ($user->rights->produit->creer || $user->rights->service->creer))
@@ -365,7 +365,7 @@ if ($id > 0 || $ref)
 				print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">';
 				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 				print '<input type="hidden" name="action" value="updateprice">';
-				
+
 				dol_fiche_head();
 
 				print '<table class="border" width="100%">';
@@ -450,11 +450,11 @@ if ($id > 0 || $ref)
 				$default_vat=get_default_tva($mysoc2, $mysoc, $object->id, 0);
 				$default_npr=get_default_npr($mysoc2, $mysoc, $object->id, 0);
 				if (empty($default_vat)) $default_npr=$default_vat;
-				
+
 				print '<tr><td class="fieldrequired">'.$langs->trans("VATRateForSupplierProduct").'</td>';
 				print '<td>';
 				//print $form->load_tva('tva_tx',$object->tva_tx,$supplier,$mysoc);    // Do not use list here as it may be any vat rates for any country
-				if (! empty($rowid))	// If we have a supplier, it is an update, we must show the vat of current supplier price 
+				if (! empty($rowid))	// If we have a supplier, it is an update, we must show the vat of current supplier price
 				{
 				    $tmpproductsupplier=new ProductFournisseur($db);
 				    $tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
@@ -463,7 +463,7 @@ if ($id > 0 || $ref)
 				}
 				else
 				{
-                    if (empty($default_vat)) 
+                    if (empty($default_vat))
                     {
                         $default_vat=$object->tva_tx;
                     }
@@ -546,6 +546,7 @@ if ($id > 0 || $ref)
 				{
 					$parameters=array('id_fourn'=>$id_fourn,'prod_id'=>$object->id);
 				    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);
+                    print $hookmanager->resPrint;
 				}
 
 				print '</table>';
@@ -589,7 +590,7 @@ if ($id > 0 || $ref)
 				$product_fourn_list = $product_fourn->list_product_fournisseur_price($object->id, $sortfield, $sortorder);
 				$nbtotalofrecords = count($product_fourn_list);
 			    print_barre_liste($langs->trans('SupplierPrices'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($product_fourn_list), $nbtotalofrecords, 'title_accountancy.png');
-			     
+
 				// Suppliers list title
 			    print '<div class="div-table-responsive">';
 			    print '<table class="noborder" width="100%">';
@@ -608,7 +609,7 @@ if ($id > 0 || $ref)
 				print_liste_field_titre($langs->trans("DiscountQtyMin"),$_SERVER["PHP_SELF"],'','',$param,'align="right"',$sortfield,$sortorder);
 				print_liste_field_titre($langs->trans("NbDaysToDelivery"),$_SERVER["PHP_SELF"],"pfp.delivery_time_days","",$param,'align="right"',$sortfield,$sortorder);
 				print_liste_field_titre($langs->trans("ReputationForThisProduct"),$_SERVER["PHP_SELF"],"pfp.supplier_reputation","",$param,'align="center"',$sortfield,$sortorder);
-				
+
 				// Charges ????
 				if ($conf->global->PRODUCT_CHARGES)
 				{
@@ -623,13 +624,13 @@ if ($id > 0 || $ref)
 
 					foreach($product_fourn_list as $productfourn)
 					{
-						
+
 
 						print '<tr class="oddeven">';
 
 						// Supplier
 						print '<td>'.$productfourn->getSocNomUrl(1,'supplier').'</td>';
-						
+
 						// Supplier
 						print '<td align="left">'.$productfourn->fourn_ref.'</td>';
 
@@ -675,8 +676,8 @@ if ($id > 0 || $ref)
 						// Reputation
 						print '<td align="center">';
 						if (!empty($productfourn->supplier_reputation) && !empty($object->reputations[$productfourn->supplier_reputation])) {
-							print $object->reputations[$productfourn->supplier_reputation];	
-						}  
+							print $object->reputations[$productfourn->supplier_reputation];
+						}
 						print'</td>';
 
 						// Charges ????
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index f4c0c66cdec..fe6f92bffec 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -82,7 +82,7 @@ if ($id > 0 || ! empty($ref))
 	$result = $product->fetch($id, $ref);
 
 	$object = $product;
-	
+
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -97,14 +97,15 @@ if ($id > 0 || ! empty($ref))
 		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		
+
         dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -114,9 +115,9 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
-		
+
 
 		if ($user->rights->commande->lire)
 		{
@@ -211,7 +212,7 @@ if ($id > 0 || ! empty($ref))
 					while ($i < $num && $i < $conf->liste_limit)
 					{
 						$objp = $db->fetch_object($result);
-						
+
 
 						print '<tr class="oddeven">';
 	 					print '<td>';
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index dafb2b5aafd..2d9bccbcca4 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -88,7 +88,7 @@ if ($id > 0 || ! empty($ref)) {
 	$result = $product->fetch($id, $ref);
 
 	$object = $product;
-	
+
 	$parameters = array ('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0)
@@ -96,7 +96,7 @@ if ($id > 0 || ! empty($ref)) {
 
 	llxHeader("", "", $langs->trans("CardProduct" . $product->type));
 
-	if ($result > 0) 
+	if ($result > 0)
 	{
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct" . $product->type);
@@ -104,15 +104,15 @@ if ($id > 0 || ! empty($ref)) {
 		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-		if ($reshook < 0)
-			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+        print $hookmanager->resPrint;
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-				
+
         dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -122,9 +122,9 @@ if ($id > 0 || ! empty($ref)) {
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
-		
+
 
 		if ($user->rights->fournisseur->commande->lire)
 		{
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index b5a8ec2b039..c4421aa21f3 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -72,7 +72,7 @@ if ($id > 0 || ! empty($ref))
 	$result = $product->fetch($id, $ref);
 
 	$object = $product;
-	
+
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -87,14 +87,15 @@ if ($id > 0 || ! empty($ref))
 		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		
+
         dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -104,9 +105,9 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
-		
+
 
 		$now=dol_now();
 
@@ -141,7 +142,7 @@ if ($id > 0 || ! empty($ref))
                 $option .= '&amp;search_month=' . $search_month;
             if (! empty($search_year))
                 $option .= '&amp;search_year=' . $search_year;
-            
+
             print '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $product->id . '" name="search_form">' . "\n";
             if (! empty($sortfield))
                 print '<input type="hidden" name="sortfield" value="' . $sortfield . '"/>';
@@ -151,7 +152,7 @@ if ($id > 0 || ! empty($ref))
                 print '<input type="hidden" name="page" value="' . $page . '"/>';
                 $option .= '&amp;page=' . $page;
             }
-			                    
+
 			print_barre_liste($langs->trans("Contrats"),$page,$_SERVER["PHP_SELF"],"&amp;id=$product->id",$sortfield,$sortorder,'',$num,0,'');
 
 			$i = 0;
@@ -177,7 +178,7 @@ if ($id > 0 || ! empty($ref))
 				while ($i < $num && $i < $conf->liste_limit)
 				{
 					$objp = $db->fetch_object($result);
-					
+
 
 					print '<tr class="oddeven">';
 					print '<td><a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowContract"),"contract").' ';
@@ -197,7 +198,7 @@ if ($id > 0 || ! empty($ref))
 					$i++;
 				}
 			}
-			
+
 			print '</table>';
 			print '</div>';
 			print '</form>';
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index d4f447128a1..3b3cfb37b1d 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -83,9 +83,9 @@ if ($id > 0 || ! empty($ref))
 {
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
-    
+
 	$object = $product;
-    
+
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -114,14 +114,15 @@ if ($id > 0 || ! empty($ref))
 		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-        
+
 		dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -131,14 +132,14 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
 
 		if ($showmessage && $nboflines > 1)
 		{
 			print $langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers"));
 		}
-        elseif ($user->rights->facture->lire) 
+        elseif ($user->rights->facture->lire)
         {
             $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
             $sql.= " f.facnumber, f.datef, f.paye, f.fk_statut as statut, f.rowid as facid,";
@@ -164,13 +165,13 @@ if ($id > 0 || ! empty($ref))
             $total_ht=0;
             $total_qty=0;
 			$totalrecords=0;
-            if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) 
+            if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
             {
             	$result = $db->query($sql);
-            	if ($result) 
+            	if ($result)
             	{
             		$totalrecords = $db->num_rows($result);
-            		while ($objp = $db->fetch_object($result)) 
+            		while ($objp = $db->fetch_object($result))
             		{
             			$total_ht+=$objp->total_ht;
             			$total_qty+=$objp->qty;
@@ -234,7 +235,7 @@ if ($id > 0 || ! empty($ref))
                     while ($i < min($num,$conf->liste_limit))
 					{
                         $objp = $db->fetch_object($result);
-                        
+
 
                         print '<tr class="oddeven">';
                         print '<td>';
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 5701b8960e5..ba17b1b3265 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -84,7 +84,7 @@ if ($id > 0 || ! empty($ref))
 	$result = $product->fetch($id, $ref);
 
 	$object = $product;
-	
+
 	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -99,14 +99,15 @@ if ($id > 0 || ! empty($ref))
 		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-		
+
         dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -116,9 +117,9 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
+
 		dol_fiche_end();
-		
+
 
 		if ($user->rights->fournisseur->facture->lire)
 		{
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index c9aa8fd85bc..616a54f67ff 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -82,7 +82,7 @@ if ($id > 0 || ! empty($ref))
 	$result = $product->fetch($id, $ref);
 
     $object = $product;
-    
+
 	$parameters = array ('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -97,14 +97,15 @@ if ($id > 0 || ! empty($ref))
 		dol_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php">'.$langs->trans("BackToList").'</a>';
-        
+
 		dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-        
+
         print '<div class="fichecenter">';
-        
+
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
@@ -114,11 +115,11 @@ if ($id > 0 || ! empty($ref))
 
         print '</div>';
         print '<div style="clear:both"></div>';
-		
-		dol_fiche_end();
-		
 
-		if ($user->rights->propale->lire) 
+		dol_fiche_end();
+
+
+		if ($user->rights->propale->lire)
 		{
 			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, d.total_ht as amount,";
 			$sql .= " p.ref_client,";
@@ -239,7 +240,7 @@ if ($id > 0 || ! empty($ref))
 						}
 					}
 				}
-				
+
         		print '<tr class="liste_total">';
         		print '<td>' . $langs->trans('Total') . '</td>';
         		print '<td colspan="2"></td>';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 69421aa5624..b7b2b98baa8 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -568,7 +568,7 @@ if ($id > 0 || $ref)
 
 		// Minimum Price
 		print '<tr><td>'.$langs->trans("BuyingPriceMin").'</td>';
-		print '<td colspan="2">';
+		print '<td>';
 		$product_fourn = new ProductFournisseur($db);
 		if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0)
 		{
@@ -611,17 +611,18 @@ if ($id > 0 || $ref)
 		}
 
         // Stock alert threshold
-        print '<tr><td>'.$form->editfieldkey("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer).'</td><td colspan="2">';
+        print '<tr><td>'.$form->editfieldkey("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer).'</td><td>';
         print $form->editfieldval("StockLimit",'seuil_stock_alerte',$object->seuil_stock_alerte,$object,$user->rights->produit->creer,'string');
         print '</td></tr>';
 
 		// Hook formObject
-		$parameters=array('cols'=>2);
+		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
 
         // Desired stock
         print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1),'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer);
-        print '</td><td colspan="2">';
+        print '</td><td>';
         print $form->editfieldval("DesiredStock",'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer,'string');
         print '</td></tr>';
 
@@ -707,7 +708,7 @@ if ($id > 0 || $ref)
 		{
 			dol_print_error($db);
 		}
-		print '<tr><td class="tdtop">'.$langs->trans("LastMovement").'</td><td colspan="3">';
+		print '<tr><td class="tdtop">'.$langs->trans("LastMovement").'</td><td>';
 		if ($lastmovementdate)
 		{
 		    print dol_print_date($lastmovementdate,'dayhour').' ';
@@ -800,7 +801,11 @@ if ((! empty($conf->productbatch->enabled)) && $object->hasbatch())
 	print '<td align="right" width="10%">'.$langs->trans("batch_number").'</td>';
 	print '<td align="center" width="10%">'.$langs->trans("EatByDate").'</td>';
 	print '<td align="center" width="10%">'.$langs->trans("SellByDate").'</td>';
-	print '<td align="right" colspan="5"></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
 	print '</tr>';
 }
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index e8c48352120..7b0b448ef59 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -610,6 +610,7 @@ if ($action == 'create' && $user->rights->projet->creer)
     // Other options
     $parameters=array();
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
     if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
     	print $object->showOptionals($extrafields,'edit');
@@ -834,6 +835,7 @@ elseif ($object->id > 0)
         // Other options
         $parameters=array();
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
         if (empty($reshook) && ! empty($extrafields->attribute_label))
         {
         	print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index a9e50f96f91..41ae6d28364 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -42,7 +42,7 @@ $backtopage=GETPOST('backtopage','alpha');
 $cancel=GETPOST('cancel');
 
 $search_user_id = GETPOST('search_user_id', 'int');
-    
+
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
 $object = new Project($db);
@@ -97,7 +97,7 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 	//$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user');
 	$date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']);
 	$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']);
-	
+
 	if (! $cancel)
 	{
 		if (empty($taskref))
@@ -139,7 +139,7 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			$task->date_start = $date_start;
 			$task->date_end = $date_end;
 			$task->progress = $progress;
-			
+
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields_task->setOptionalsFromPost($extralabels_task,$task);
 
@@ -224,26 +224,26 @@ if ($id > 0 || ! empty($ref))
     if ($search_user_id > 0) $param.='&search_user_id='.dol_escape_htmltag($search_user_id);
 
     // Project card
-    
+
     $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-    
+
     $morehtmlref='<div class="refidno">';
     // Title
     $morehtmlref.=$object->title;
     // Thirdparty
-    if ($object->thirdparty->id > 0) 
+    if ($object->thirdparty->id > 0)
     {
         $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'project');
     }
     $morehtmlref.='</div>';
-    
+
     // Define a complementary filter for search of next/prev ref.
     if (! $user->rights->projet->all->lire)
     {
         $objectsListId = $object->getProjectsAuthorizedForUser($user,0,0);
         $object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
     }
-    
+
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
     print '<div class="fichecenter">';
@@ -286,7 +286,7 @@ if ($id > 0 || ! empty($ref))
     print ($end?$end:'?');
     if ($object->hasDelay()) print img_warning("Late");
     print '</td></tr>';
-    
+
     // Budget
     print '<tr><td>'.$langs->trans("Budget").'</td><td>';
     if (strcmp($object->budget_amount, '')) print price($object->budget_amount,'',$langs,1,0,0,$conf->currency);
@@ -295,16 +295,16 @@ if ($id > 0 || ! empty($ref))
     // Other attributes
     $cols = 2;
     include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-    
+
     print '</table>';
-    
+
     print '</div>';
     print '<div class="fichehalfright">';
     print '<div class="ficheaddleft">';
     print '<div class="underbanner clearboth"></div>';
-    
+
     print '<table class="border" width="100%">';
-    
+
     // Description
     print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
     print nl2br($object->description);
@@ -316,13 +316,13 @@ if ($id > 0 || ! empty($ref))
         print $form->showCategories($object->id,'project',1);
         print "</td></tr>";
     }
-    
+
     print '</table>';
-    
+
     print '</div>';
     print '</div>';
     print '</div>';
-    
+
     print '<div class="clearboth"></div>';
 
 
@@ -341,7 +341,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print '<input type="hidden" name="action" value="createtask">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if (! empty($object->id)) print '<input type="hidden" name="id" value="'.$object->id.'">';
-	
+
 	dol_fiche_head('');
 
 	print '<table class="border" width="100%">';
@@ -413,6 +413,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	// Other options
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields_task->attribute_label))
 	{
 		print $object->showOptionals($extrafields_task,'edit');
@@ -460,7 +461,7 @@ else if ($id > 0 || ! empty($ref))
 
 	print '</div>';
 
-	
+
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -470,12 +471,12 @@ else if ($id > 0 || ! empty($ref))
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-	
+
 	$title=$langs->trans("ListOfTasks");
 	$linktotasks='<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$object->id.'&withproject=1">'.$langs->trans("GoToListOfTimeConsumed").'</a>';
 	//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'title_generic.png', 0, '', '', 0, 1);
 	print load_fiche_titre($title,$linktotasks,'title_generic.png');
-	
+
 	// Get list of tasks in tasksarray and taskarrayfiltered
 	// We need all tasks (even not limited to a user because a task to user can have a parent that is not affected to him).
 	$filteronthirdpartyid = $socid;
@@ -483,7 +484,7 @@ else if ($id > 0 || ! empty($ref))
 	// We load also tasks limited to a particular user
 	$tmpuser=new User($db);
 	if ($search_user_id > 0) $tmpuser->fetch($search_user_id);
-	
+
 	$tasksrole=($tmpuser->id > 0 ? $taskstatic->getUserRolesForProjectsOrTasks(0, $tmpuser, $object->id, 0) : '');
 	//var_dump($tasksarray);
 	//var_dump($tasksrole);
@@ -494,7 +495,7 @@ else if ($id > 0 || ! empty($ref))
 	}
 
 	print '<table id="tablelines" class="noborder" width="100%">';
-	
+
 	if (count($tasksarray) > 0)
 	{
     	// Link to switch in "my task" / "all task"
@@ -509,7 +510,7 @@ else if ($id > 0 || ! empty($ref))
         print $searchpicto;
         print '</td>';
 	}
-	
+
 	print '<tr class="liste_titre nodrag nodrop">';
 	// print '<td>'.$langs->trans("Project").'</td>';
 	print '<td width="100">'.$langs->trans("RefTask").'</td>';
@@ -522,7 +523,7 @@ else if ($id > 0 || ! empty($ref))
 	print '<td align="right">'.$langs->trans("ProgressDeclared").'</td>';
 	print '<td>&nbsp;</td>';
 	print "</tr>\n";
-	
+
 	if (count($tasksarray) > 0)
 	{
 	    // Show all lines in taskarray (recursive function to go down on tree)
@@ -533,11 +534,11 @@ else if ($id > 0 || ! empty($ref))
 	{
 		print '<tr class="oddeven"><td colspan="9" class="opacitymedium">'.$langs->trans("NoTasks").'</td></tr>';
 	}
-	
+
 	print "</table>";
 
 	print '</form>';
-	
+
 
 	// Test if database is clean. If not we clean it.
 	//print 'mode='.$_REQUEST["mode"].' $nboftaskshown='.$nboftaskshown.' count($tasksarray)='.count($tasksarray).' count($tasksrole)='.count($tasksrole).'<br>';
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 2d35be97f4a..df89cac3e83 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -408,6 +408,7 @@ if ($id > 0 || ! empty($ref))
 			// Other options
 			$parameters=array();
 			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
 			if (empty($reshook) && ! empty($extrafields->attribute_label))
 			{
 				print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/resource/add.php b/htdocs/resource/add.php
index 2e988d16025..a294dfb94db 100644
--- a/htdocs/resource/add.php
+++ b/htdocs/resource/add.php
@@ -177,6 +177,7 @@ if (! $action)
         // Other attributes
         $parameters=array('objectsrc' => $objectsrc);
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
         if (empty($reshook) && ! empty($extrafields->attribute_label))
         {
         	print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index a286eb60097..02d38c2b924 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -203,6 +203,7 @@ if ( $object->fetch($id) > 0 )
 		// Other attributes
 		$parameters=array('objectsrc' => $objectsrc);
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index da9b7c4a8f3..e972aaa1091 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -174,7 +174,8 @@ if (! empty($socid))
 
  			$parameters=array('socid'=>$object->id);
         	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$obj,$action);    // Note that $action and $object may have been modified by hook
-      		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+            print $hookmanager->resPrint;
+        	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
       		$tmpuser->id = $obj->rowid;
       		$tmpuser->firstname = $obj->firstname;
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index c7807d8c4e5..72c9793b40b 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1150,6 +1150,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters = array('colspan' => ' colspan="3"');
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 9e9e2b09e28..8400a95d370 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1112,6 +1112,7 @@ if ($action == 'create' || $action == 'adduserldap')
     // Other attributes
     $parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
     if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
     	print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 8be0276e6ee..e53080cea73 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -272,6 +272,7 @@ if ($action == 'create')
 	// Other attributes
     $parameters=array('object' => $object, 'colspan' => ' colspan="2"');
     $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
     if (empty($reshook) && ! empty($extrafields->attribute_label))
     {
     	print $object->showOptionals($extrafields,'edit');
@@ -562,6 +563,7 @@ else
         	// Other attributes
             $parameters=array();
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            print $hookmanager->resPrint;
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
             	print $object->showOptionals($extrafields,'edit');

From bb091c3b8bc7fd21ebc0efcae271e8c0c10d8521 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 10:45:45 +0200
Subject: [PATCH 1087/1163] FIX The hook formObjectOptions was not implemented
 correctly in previous version. Sometimes, you had to return output content by
 doing a print into function, sometimes by returning content into "resprint".
 This has been fixed to follow hook specifications so you must return output
 into "resprint".

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5b4f986fbb1..766efb9c02a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@ Following changes may create regression for some external modules, but were nece
   exists, but if an external module need action on it, it must provides itself its trigger file.
 * Use $conf->global->MULTICOMPANY_TRANSVERSE_MODE instead $conf->multicompany->transverse_mode
 * Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', 0) instead getEntity('xxx')
+* The hook formObjectOptions was not implemented correctly in previous version. Sometimes, you had to return output 
+content by doing a print into function, sometimes by returning content into "resprint". This has been fixed to follow
+hook specifications so you must return output into "resprint".
 
 ***** ChangeLog for 5.0.3 compared to 5.0.2 *****
 FIX: #6677 Expired contracts dashboard box does not show the name of the thirdparty

From 57f99ba7a1e69371d3996bbcc2e084b25cd641ce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 11:09:05 +0200
Subject: [PATCH 1088/1163] Update README

---
 README-FR.md | 19 +++++++++----------
 README.md    | 21 +++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/README-FR.md b/README-FR.md
index 1c097e7914e..4129e2b7452 100644
--- a/README-FR.md
+++ b/README-FR.md
@@ -103,25 +103,24 @@ Voir fichier ChangeLog.
 
 ### Divers:
 
-- Application multi-utilisateurs avec différents niveaux de permissions par module.
+- Multi-langue.
+- Multi-utilisateurs avec différents niveaux de permissions par module.
+- Multi-devise.
 - Peux être multi-société par ajout du module externe multi-société.
-- Peux-être multi-devise par ajout du module externe multi-devise.
-- Plusieurs gestionnaires de menus (possibilité de différencier les menus pour les utilisateurs internes ou externes comme les clients ou fournisseurs).
-- Application simple à utiliser.
 - Plusieurs thèmes visuels.
-- Code simple et facilement personnalisable.
-- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur http://wiki.dolibarr.org/index.php/Prérequis). 
+- Application simple à utiliser.
+- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur https://wiki.dolibarr.org/index.php/Prérequis). 
 - Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
-- Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
+- Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
+- APIs.
+- Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
 
 
 ## CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
 
 Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
-- Pas encore de compta analytique double-partie (uniquement gestion de trésorerie).
-- Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
 - Dolibarr ne contient pas de module de Gestion de la paie.
-- Les tâches du module de gestion de projets n'ont pas de dépendance entre elle.
+- Les tâches du module de gestion de projets n'ont pas de dépendances entre elle.
 - Dolibarr ne contient pas de Webmail.
 - Dolibarr ne fait pas le café (pas encore). 
 
diff --git a/README.md b/README.md
index eda6b8b642e..f091bb6c952 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 ## FEATURES
 
-### Main modules (all optional)
+### Main application/modules (all optional)
 
 - Customers, Prospects and/or Suppliers directory
 - Products and/or Services catalog
@@ -107,7 +107,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Point of Sale
 - …
 
-### Other modules
+### Other application/modules
 
 - Bookmarks management
 - Donations management
@@ -124,15 +124,17 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - …
 
 ### Other general features
-- Multi-Users and groups with finely grained rights
-- Localization in most major languages
-- Can manage several companies by adding external module multi-company.
-- Can manage several currencies by adding external module multi-currency.
-- Very user friendly and easy to use
+
+- Localization in most major languages.
+- Multi-Users and groups with finely grained rights.
+- Multi-currency.
+- Multi-company by adding of an external module.
+- Very user friendly and easy to use.
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
-- Works with PHP 5.3+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](http://wiki.dolibarr.org/index.php/Prerequisite))
+- Works with PHP 5.3+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
 - Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
-- An easy to understand, maintain and code interfaces with your own information system (PHP with no heavy framework; trigger and hook architecture)
+- APIs
+- An easy to understand, maintain and develop code (PHP with no heavy framework; trigger and hook architecture)
 - Support for country specific features:
     - Spanish Tax RE and ISPF
     - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
@@ -150,7 +152,6 @@ Dolibarr can be extended with a lot of other external modules from third party d
 
 These are features that Dolibarr does **not** yet fully support:
 
-- Double-entry bookkeeping yet (only bank and treasury management)
 - Tasks dependencies in projects
 - Payroll module
 - Webmail

From 965e3e514047c438a9b346a658e4d81596da4e4a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 11:21:17 +0200
Subject: [PATCH 1089/1163] Update doc

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f091bb6c952..29a7d4f9545 100644
--- a/README.md
+++ b/README.md
@@ -133,20 +133,21 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
 - Works with PHP 5.3+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
 - Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
-- APIs
+- APIs.
 - An easy to understand, maintain and develop code (PHP with no heavy framework; trigger and hook architecture)
 - Support for country specific features:
     - Spanish Tax RE and ISPF
     - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
     - Canadian double taxes (federal/province) and other countries using cumulative VAT
     - Tunisian tax stamp
+    - Argentina invoice numbering using A,B,C... 
     - Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
 - PDF or ODT generation for invoice, proposals, orders...
 - …
 
 ### Extending
 
-Dolibarr can be extended with a lot of other external modules from third party developers available at the [DoliStore](https://www.dolistore.com).
+Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
 
 ## FUTURE
 

From a96362e2f94808304165e6ea6b9c29dd139a4405 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 11:40:01 +0200
Subject: [PATCH 1090/1163] Fix #formmailbeforetitle not supported everywhere

---
 htdocs/admin/mails.php                        | 89 ++++++++++---------
 htdocs/comm/mailing/card.php                  |  3 +-
 htdocs/comm/propal/card.php                   |  3 +-
 htdocs/commande/card.php                      |  2 +-
 htdocs/compta/facture/card.php                |  3 +-
 htdocs/contrat/card.php                       |  1 +
 htdocs/expedition/card.php                    |  3 +-
 htdocs/fichinter/card.php                     |  3 +-
 htdocs/fourn/commande/card.php                |  3 +-
 htdocs/fourn/facture/card.php                 |  5 +-
 .../modulebuilder/template/myobject_card.php  |  3 +
 htdocs/societe/card.php                       |  4 +-
 htdocs/supplier_proposal/card.php             |  3 +-
 htdocs/user/card.php                          |  1 +
 14 files changed, 71 insertions(+), 55 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 03cce1dff09..6b8126bd977 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -229,11 +229,11 @@ if ($action == 'edit')
 	print '<input type="hidden" name="action" value="update">';
 
 	dol_fiche_head($head, 'common', '', -1);
-	
+
 	print $langs->trans("EMailsDesc")."<br>\n";
 	print "<br>\n";
-	
-	
+
+
 	clearstatcache();
 	$var=true;
 
@@ -241,17 +241,17 @@ if ($action == 'edit')
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	// Disable
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>';
 	print $form->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1);
 	print '</td></tr>';
 
 	// Separator
-	
+
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// Method
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 
 	// SuperAdministrator access only
@@ -270,7 +270,7 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	// Host server
-	
+
 	print '<tr class="oddeven"><td>';
 	if (! $conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
 	{
@@ -303,7 +303,7 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	// Port
-	
+
 	print '<tr class="oddeven"><td>';
 	if (! $conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
 	{
@@ -338,7 +338,7 @@ if ($action == 'edit')
 	// ID
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
-		
+
 		$mainstmpid=(! empty($conf->global->MAIN_MAIL_SMTPS_ID)?$conf->global->MAIN_MAIL_SMTPS_ID:'');
 		print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>';
 		// SuperAdministrator access only
@@ -358,7 +358,7 @@ if ($action == 'edit')
 	// PW
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
-		
+
 		$mainsmtppw=(! empty($conf->global->MAIN_MAIL_SMTPS_PW)?$conf->global->MAIN_MAIL_SMTPS_PW:'');
 		print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
 		// SuperAdministrator access only
@@ -376,7 +376,7 @@ if ($action == 'edit')
 	}
 
 	// TLS
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
@@ -390,7 +390,7 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	// STARTTLS
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
@@ -404,17 +404,17 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	// Separator
-	
+
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
-	
+
 	// From
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_EMAIL_FROM" size="32" value="' . (! empty($conf->global->MAIN_MAIL_EMAIL_FROM)?$conf->global->MAIN_MAIL_EMAIL_FROM:'');
 	print '"></td></tr>';
 
     // Default from type
-    
+
     $liste = array();
     $liste['user'] = $langs->trans('UserEmail');
     $liste['company'] = $langs->trans('CompanyEmail').' ('.(empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?$langs->trans("NotDefined"):$conf->global->MAIN_INFO_SOCIETE_MAIL).')';
@@ -424,17 +424,17 @@ if ($action == 'edit')
     print '</td></tr>';
 
     // Separator
-    
+
     print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
-    
+
 	// From
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_ERRORS_TO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_ERRORS_TO)?$conf->global->MAIN_MAIL_ERRORS_TO:'');
 	print '"></td></tr>';
 
 	// Autocopy to
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_AUTOCOPY_TO" size="32" value="' . (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)?$conf->global->MAIN_MAIL_AUTOCOPY_TO:'');
 	print '"></td></tr>';
@@ -442,7 +442,7 @@ if ($action == 'edit')
     print '</table>';
 
     dol_fiche_end();
-    
+
     print '<br><div class="center">';
     print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
     print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
@@ -454,26 +454,26 @@ if ($action == 'edit')
 else
 {
     dol_fiche_head($head, 'common', '', -1);
-    
+
     print $langs->trans("EMailsDesc")."<br>\n";
     print "<br>\n";
-    
-    
+
+
 	$var=true;
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	// Disable
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_MAILS).'</td></tr>';
 
 	// Separator
-	
+
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// Method
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 	$text=$listofmethods[$conf->global->MAIN_MAIL_SENDMODE];
 	if (empty($text)) $text=$langs->trans("Undefined").img_warning();
@@ -481,7 +481,7 @@ else
 	print '</td></tr>';
 
 	// Host server
-	
+
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
@@ -492,7 +492,7 @@ else
 	}
 
 	// Port
-	
+
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
@@ -503,21 +503,21 @@ else
 	}
 
 	// SMTPS ID
-	
+
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>';
 	}
 
 	// SMTPS PW
-	
+
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./','*',$conf->global->MAIN_MAIL_SMTPS_PW).'</td></tr>';
 	}
 
 	// TLS
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
@@ -531,7 +531,7 @@ else
 	print '</td></tr>';
 
 	// STARTTLS
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
 	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
 	{
@@ -545,18 +545,18 @@ else
 	print '</td></tr>';
 
 	// Separator
-	
+
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
 	// From
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_EMAIL_FROM;
 	if (! empty($conf->global->MAIN_MAIL_EMAIL_FROM) && ! isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail"));
 	print '</td></tr>';
 
 	// Default from type
-    
+
     print '<tr '.$bc[$var?1:0].'><td>'.$langs->trans('MAIN_MAIL_DEFAULT_FROMTYPE').'</td>';
     print '<td>';
     if($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'user'){
@@ -567,18 +567,18 @@ else
     print '</td></tr>';
 
 	// Separator
-	
+
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
     // Errors To
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_ERRORS_TO;
 	if (! empty($conf->global->MAIN_MAIL_ERRORS_TO) && ! isValidEmail($conf->global->MAIN_MAIL_ERRORS_TO)) print img_warning($langs->trans("ErrorBadEMail"));
 	print '</td></tr>';
 
 	// Autocopy to
-	
+
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 	print '<td>';
 	if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO))
@@ -591,12 +591,12 @@ else
 		print '&nbsp;';
 	}
 	print '</td></tr>';
-    
+
 	print '</table>';
 
 	dol_fiche_end();
-	
-	
+
+
     if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
     {
         print '<br>';
@@ -614,7 +614,7 @@ else
    	    print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
     }
 
-    
+
 	// Boutons actions
 	print '<div class="tabsAction">';
 
@@ -647,7 +647,7 @@ else
         $text = $langs->trans("WarningPHPMail");
 	    print info_admin($text);
 	}
-	    
+
 	// Run the test to connect
 	if ($action == 'testconnect')
 	{
@@ -673,6 +673,7 @@ else
 	// Show email send test form
 	if ($action == 'test' || $action == 'testhtml')
 	{
+	    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print load_fiche_titre($action == 'testhtml'?$langs->trans("DoTestSendHTML"):$langs->trans("DoTestSend"));
 
 		// Cree l'objet formulaire mail
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 17d4d066569..8f4deb53edf 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1010,7 +1010,8 @@ else
 			// Affichage formulaire de TEST
 			if ($action == 'test')
 			{
-				print load_fiche_titre($langs->trans("TestMailing"));
+			    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+			    print load_fiche_titre($langs->trans("TestMailing"));
 
 				// Create l'objet formulaire mail
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 3e8580d5350..67dbca101f8 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2281,7 +2281,7 @@ if ($action == 'create')
 				// Send
 				if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED) {
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->propal->propal_advance->send) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=presend&amp;mode=init">' . $langs->trans('SendByMail') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>';
 					} else
 						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
 				}
@@ -2412,6 +2412,7 @@ if ($action == 'create')
 			$file = $fileparams['fullname'];
 		}
 
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print '<div class="clearboth"></div>';
 		print '<br>';
 		print load_fiche_titre($langs->trans('SendPropalByMail'));
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index e2db47a6c9d..83135a8c0f5 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2443,7 +2443,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 				// Send
 				if ($object->statut > Commande::STATUS_DRAFT) {
 					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=presend&amp;mode=init">' . $langs->trans('SendByMail') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>';
 					} else
 						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
 				}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index fa9bdf60dc5..c4bf83293de 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4071,7 +4071,7 @@ else if ($id > 0 || ! empty($ref))
 					print '<div class="inline-block divButAction"><span class="butActionRefused" title="' . $langs->trans("DisabledBecauseReplacedInvoice") . '">' . $langs->trans('SendByMail') . '</span></div>';
 				} else {
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->send) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?facid=' . $object->id . '&amp;action=presend&amp;mode=init">' . $langs->trans('SendByMail') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?facid=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>';
 					} else
 						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
 				}
@@ -4328,6 +4328,7 @@ else if ($id > 0 || ! empty($ref))
 			$file = $fileparams['fullname'];
 		}
 
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print '<div class="clearboth"></div>';
 		print '<br>';
 		print load_fiche_titre($langs->trans($titreform));
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 58b1608f44b..b2ab3bf3cb8 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2162,6 +2162,7 @@ else
 				$file = $fileparams['fullname'];
 			}
 
+			print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 			print '<div class="clearboth"></div>';
 			print '<br>';
 			print load_fiche_titre($langs->trans('SendContractByMail'));
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 72044d68fcf..efc64d84396 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2037,7 +2037,7 @@ else if ($id || $ref)
 			{
 				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send)
 				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a>';
 				}
 				else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
 			}
@@ -2162,6 +2162,7 @@ else if ($id || $ref)
 			$file=$fileparams['fullname'];
 		}
 
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print '<div class="clearboth"></div>';
 		print '<br>';
 		print load_fiche_titre($langs->trans('SendShippingByEMail'));
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index c084806c4a6..108aaf7a23a 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1598,7 +1598,7 @@ else if ($id > 0 || ! empty($ref))
 				{
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send)
 					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a></div>';
 					}
 					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a></div>';
 				}
@@ -1753,6 +1753,7 @@ else if ($id > 0 || ! empty($ref))
 			$file=$fileparams['fullname'];
 		}
 
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print '<div class="clearboth"></div>';
 		print '<br>';
 		print load_fiche_titre($langs->trans('SendInterventionByMail'));
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index dda4a0d7254..4deca7ea836 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2174,6 +2174,7 @@ elseif (! empty($object->id))
 			$file=$fileparams['fullname'];
 		}
 
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print '<div class="clearboth"></div>';
 		print '<br>';
 		print load_fiche_titre($langs->trans('SendOrderByMail'));
@@ -2572,7 +2573,7 @@ elseif (! empty($object->id))
 				{
 					if ($user->rights->fournisseur->commande->commander)
 					{
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a>';
 					}
 				}
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 1078999b89e..db017cc004a 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2660,7 +2660,7 @@ else
 	            {
 	                if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send)
 	                {
-	                    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a></div>';
+	                    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a></div>';
 	                }
 	                else print '<div class="inline-block divButAction"><span class="butActionRefused">'.$langs->trans('SendByMail').'</a></div>';
 	            }
@@ -2836,7 +2836,8 @@ else
                 $file=$fileparams['fullname'];
             }
 
-			print '<div class="clearboth"></div>';
+			print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+            print '<div class="clearboth"></div>';
             print '<br>';
             print load_fiche_titre($langs->trans('SendBillByMail'));
 
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 56e0ea1d3ed..03dfd62f5d3 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -426,6 +426,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
     	if (empty($reshook))
     	{
+    	    // Send
+            print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>'."\n";
+
     		if ($user->rights->mymodule->write)
     		{
     			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index e26b4733c84..b5afba996b8 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2462,7 +2462,9 @@ else
 			$action='send';
 			$modelmail='thirdparty';
 
-			//print '<br>';
+    		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+    		print '<div class="clearboth"></div>';
+    		print '<br>';
 			print load_fiche_titre($langs->trans($titreform));
 
 			dol_fiche_head();
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 72c9793b40b..d7d967d24b8 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1740,7 +1740,7 @@ if ($action == 'create')
 				// Send
 				if ($object->statut == SupplierProposal::STATUS_VALIDATED || $object->statut == SupplierProposal::STATUS_SIGNED) {
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=presend&amp;mode=init">' . $langs->trans('SendByMail') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>';
 					} else
 						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
 				}
@@ -1854,6 +1854,7 @@ if ($action == 'create')
 			$file = $fileparams['fullname'];
 		}
 
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print '<div class="clearboth"></div>';
 		print '<br>';
 		print load_fiche_titre($langs->trans('SendAskByMail'));
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 8400a95d370..9d9684371a9 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1669,6 +1669,7 @@ else
                 $action='send';
                 $modelmail='user';
 
+    		    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
                 print '<div id="presend"></div>';
                 print load_fiche_titre($langs->trans($titreform));
 

From 248c5acff29a1662e9ac54dcbee9fc1e480883ea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 16:18:21 +0200
Subject: [PATCH 1091/1163] Fix remove a FIXME tag.

---
 htdocs/compta/paiement/cheque/list.php        | 44 ++++++-------
 .../compta/paiement/class/paiement.class.php  | 66 ++++++++++---------
 2 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 63a2884e5bf..aeed72d93d1 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -139,24 +139,14 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_bank.png', '', '', $limit);
-	
+
 	$moreforfilter='';
-	
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-    print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bc.ref","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"dp","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("NbOfCheques"),$_SERVER["PHP_SELF"],"bc.nbcheque","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"bc.amount","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"bc.statut","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
-	print "</tr>\n";
-
 	// Lignes des champs de filtre
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre" align="left">';
@@ -181,15 +171,25 @@ if ($resql)
     print '</td>';
     print "</tr>\n";
 
+    print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bc.ref","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"dp","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("NbOfCheques"),$_SERVER["PHP_SELF"],"bc.nbcheque","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"bc.amount","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"bc.statut","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
+
     if ($num > 0)
     {
     	$var=true;
     	while ($i < min($num,$limit))
     	{
     		$objp = $db->fetch_object($resql);
-    		
+
     		print '<tr class="oddeven">';
-    
+
     		// Num ref cheque
     		print '<td>';
     		$checkdepositstatic->id=$objp->rowid;
@@ -197,29 +197,29 @@ if ($resql)
     		$checkdepositstatic->statut=$objp->statut;
     		print $checkdepositstatic->getNomUrl(1);
     		print '</td>';
-    
+
     		// Date
     		print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'day').'</td>';  // TODO Use date hour
-    
+
     		// Bank
     		print '<td>';
     		if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.'</a>';
     		else print '&nbsp;';
     		print '</td>';
-    
+
     		// Number of cheques
     		print '<td align="right">'.$objp->nbcheque.'</td>';
-    
+
     		// Amount
     		print '<td align="right">'.price($objp->amount).'</td>';
-    
+
     		// Statut
     		print '<td align="right">';
     		print $checkdepositstatic->LibStatut($objp->statut,5);
     		print '</td>';
-    		
+
     		print '<td></td>';
-    		
+
             print "</tr>\n";
     		$i++;
     	}
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index c8d7f4d3759..f4e61380a9c 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -38,7 +38,7 @@ class Paiement extends CommonObject
     public $element='payment';
     public $table_element='paiement';
     public $picto = 'payment';
-    
+
 	var $facid;
 	var $datepaye;
 	/**
@@ -65,7 +65,7 @@ class Paiement extends CommonObject
 	// fk_paiement dans llx_paiement_facture est le rowid du paiement
     var $fk_paiement;    // Type of paiment
 
-    
+
 	/**
 	 *	Constructor
 	 *
@@ -153,14 +153,14 @@ class Paiement extends CommonObject
 
 		$error = 0;
 		$way = $this->getWay();
-		
+
 		$now=dol_now();
-		
+
         // Clean parameters
         $totalamount = 0;
 		$totalamount_converted = 0;
         $atleastonepaymentnotnull = 0;
-		
+
 		if ($way == 'dolibarr')
 		{
 			$amounts = &$this->amounts;
@@ -171,22 +171,22 @@ class Paiement extends CommonObject
 			$amounts = &$this->multicurrency_amounts;
 			$amounts_to_update = &$this->amounts;
 		}
-		
+
 		foreach ($amounts as $key => $value)	// How payment is dispatch
 		{
 			$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value, $way);
 			$totalamount_converted += $value_converted;
 			$amounts_to_update[$key] = price2num($value_converted, 'MT');
-			
+
 			$newvalue = price2num($value,'MT');
 			$amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
 			if (! empty($newvalue)) $atleastonepaymentnotnull++;
 		}
-		
+
 		$totalamount = price2num($totalamount);
 		$totalamount_converted = price2num($totalamount_converted);
-		
+
 		// Check parameters
         if (empty($totalamount) && empty($atleastonepaymentnotnull))	 // We accept negative amounts for withdraw reject but not empty arrays
         {
@@ -211,7 +211,7 @@ class Paiement extends CommonObject
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, fk_user_creat)";
 		$sql.= " VALUES (".$conf->entity.", '".$this->ref."', '". $this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', '".$total."', '".$mtotal."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.")";
-		
+
 		dol_syslog(get_class($this)."::Create insert paiement", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -227,7 +227,7 @@ class Paiement extends CommonObject
 					$amount = price2num($amount);
 					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiement_facture (fk_facture, fk_paiement, amount, multicurrency_amount)';
 					$sql .= ' VALUES ('.$facid.', '. $this->id.', \''.$amount.'\', \''.$this->multicurrency_amounts[$key].'\')';
-		
+
 					dol_syslog(get_class($this).'::Create Amount line '.$key.' insert paiement_facture', LOG_DEBUG);
 					$resql=$this->db->query($sql);
 					if ($resql)
@@ -245,21 +245,27 @@ class Paiement extends CommonObject
 
 							//var_dump($invoice->total_ttc.' - '.$paiement.' -'.$creditnotes.' - '.$deposits.' - '.$remaintopay);exit;
 
-                            // If there is withdrawals request to do and not done yet, we wait before closing.
+                            /* Why this ? We can remove i think.
+                            // If there is withdrawals request to do and not done yet on the invoice the payment is on, we wait before closing.
                             $mustwait=0;
+                            $sqlrequest ="SELECT COUNT(rowid) FROM ".MAIN_DB_PREFIX."prelevement_facture_demande";
+                            $sqlrequest.="WHERE fk_facture = ".$invoice->id." AND traite = 0";
+                            ...
+
                             $listofpayments=$invoice->getListOfPayments();
                             foreach($listofpayments as $paym)
                             {
-                                // This payment might be this one or a previous one
+                                // This payment on invoice $invoice might be the one we record or another one
                                 if ($paym['type']=='PRE')
                                 {
                                     if (! empty($conf->prelevement->enabled))
                                     {
-                                        // FIXME Check if this invoice has a withdraw request
                                         // if not, $mustwait++;      // This will disable automatic close on invoice to allow to process
+
                                     }
                                 }
                             }
+                            */
 
                             //Invoice types that are eligible for changing status to paid
 							$affected_types = array(
@@ -272,14 +278,14 @@ class Paiement extends CommonObject
 
                             if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
                             else if ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
-                            else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
+                            //else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
                             else
                             {
                                 // If invoice is a down payment, we also convert down payment to discount
                                 if ($invoice->type == Facture::TYPE_DEPOSIT)
                                 {
 			                        $amount_ht = $amount_tva = $amount_ttc = array();
-			                         
+
                                     // Loop on each vat rate
                                     $i = 0;
                                     foreach ($invoice->lines as $line)
@@ -292,20 +298,20 @@ class Paiement extends CommonObject
                                             $i ++;
                                         }
                                     }
-                                    
+
                                     // Insert one discount by VAT rate category
                                     $discount = new DiscountAbsolute($this->db);
                                     $discount->description = '(DEPOSIT)';
                                     $discount->fk_soc = $invoice->socid;
                                     $discount->fk_facture_source = $invoice->id;
-                                
+
                                     foreach ($amount_ht as $tva_tx => $xxx)
                                     {
                                         $discount->amount_ht = abs($amount_ht[$tva_tx]);
                                         $discount->amount_tva = abs($amount_tva[$tva_tx]);
                                         $discount->amount_ttc = abs($amount_ttc[$tva_tx]);
                                         $discount->tva_tx = abs($tva_tx);
-                            
+
                                         $result = $discount->create($user);
                                         if ($result < 0)
                                         {
@@ -313,14 +319,14 @@ class Paiement extends CommonObject
                                             break;
                                         }
                                     }
-                                    
+
                                     if ($error)
                                     {
                                         setEventMessages($discount->error, $discount->errors, 'errors');
                                         $error++;
-                                    }                                   
+                                    }
                                 }
-                                
+
                                 // Set invoice to paid
                                 if (! $error)
                                 {
@@ -520,13 +526,13 @@ class Paiement extends CommonObject
 
             $acc = new Account($this->db);
             $result=$acc->fetch($this->fk_account);
-			
+
 			$totalamount=$this->amount;
             if (empty($totalamount)) $totalamount=$this->total; // For backward compatibility
-            
+
             // if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
             if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) $totalamount=$this->multicurrency_amount;
-			
+
             if ($mode == 'payment_supplier') $totalamount=-$totalamount;
 
             // Insert payment into llx_bank
@@ -796,7 +802,7 @@ class Paiement extends CommonObject
 
 	/**
 	 *    Information sur l'objet
-	 *    
+	 *
 	 *    @param   int     $id      id du paiement dont il faut afficher les infos
 	 *    @return  void
 	 */
@@ -962,13 +968,13 @@ class Paiement extends CommonObject
 
 	/**
 	 * 	get the right way of payment
-	 * 
+	 *
 	 * 	@return 	string 	'dolibarr' if standard comportment or paid in dolibarr currency, 'customer' if payment received from multicurrency inputs
 	 */
 	function getWay()
 	{
 		global $conf;
-		
+
 		$way = 'dolibarr';
 		if (!empty($conf->multicurrency->enabled))
 		{
@@ -981,10 +987,10 @@ class Paiement extends CommonObject
 				}
 			}
 		}
-		
+
 		return $way;
 	}
-	
+
 	/**
 	 *  Initialise an instance with random values.
 	 *  Used to build previews or test instances.

From ca324346e41e4939d885fc9331611018d5453c5f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 19:08:40 +0200
Subject: [PATCH 1092/1163] Update doc

---
 htdocs/install/mysql/migration/repair.sql | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index c748f38acb3..991212c7d22 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -13,11 +13,12 @@
 -- flush privileges;
 
 
--- Requests to change character set and collation of a column
+-- Requests to change character set and collation of a varchar column.
+-- utf8 and utf8_unicode_ci is recommended (or even better utf8mb4 and utf8mb4_unicode_ci with mysql 5.5.3+)
 
 -- ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) CHARACTER SET utf8;
 -- ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) COLLATE utf8_unicode_ci;
--- You can check with "show full columns from llx_accountingaccount";
+-- You can check with "show full columns from llx_accounting_account";
 
 
 

From 58c4144123d6b472fcebb01e79bc7f2bfd067abd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 19:27:07 +0200
Subject: [PATCH 1093/1163] Fix sort of dictionnary

---
 htdocs/admin/dict.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index f903ce3e8fc..c83a3aa39be 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -502,6 +502,14 @@ $tabfieldcheck[34] = array();
 complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp,$tabfieldcheck);
 
 
+// Defaut sortorder
+if (empty($sortfield))
+{
+    $tmp1 = explode(',',$tabsqlsort[$id]);
+    $tmp2 = explode(' ',$tmp1[0]);
+    $sortfield=preg_replace('/^.*\./', '', $tmp2[0]);
+}
+
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
 $sourceList=array();
@@ -944,7 +952,8 @@ if ($id)
 
     if (! preg_match('/ WHERE /',$sql)) $sql.= " WHERE 1 = 1";
     if ($search_country_id > 0) $sql.= " AND c.rowid = ".$search_country_id;
-    if ($search_code != '')     $sql.= natural_search("code", $search_code);
+    if ($search_code != '' && $id != 9)     $sql.= natural_search("code", $search_code);
+    if ($search_code != '' && $id == 9)     $sql.= natural_search("code_iso", $search_code);
 
     if ($sortfield)
     {

From b80ee49032ec1c4a097b37515c237ec977d2d838 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jun 2017 19:27:21 +0200
Subject: [PATCH 1094/1163] Add missing currency for bengladesh

---
 htdocs/install/mysql/data/llx_c_currencies.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql
index 1c9d4b5f8a7..d9b1390bb32 100644
--- a/htdocs/install/mysql/data/llx_c_currencies.sql
+++ b/htdocs/install/mysql/data/llx_c_currencies.sql
@@ -41,6 +41,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AZN'
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BHD', NULL, 1,					'Bahrain');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BSD', '[36]', 1,				'Bahamas Dollar');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BBD', '[36]', 1,				'Barbados Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BDT', '[2547]', 1,			    'Bangladeshi Taka');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BYR', '[112,46]', 1,			'Belarus Ruble');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BZD', '[66,90,36]', 1,			'Belize Dollar');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BMD', '[36]', 1,				'Bermuda Dollar');

From 277dde5d618cae0d661ac69c51040224e36b3cda Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 10:25:28 +0200
Subject: [PATCH 1095/1163] Fix dol_banner

---
 htdocs/cron/card.php                |  85 ++++++++++----------
 htdocs/cron/class/cronjob.class.php | 115 ++++++++++++++--------------
 htdocs/cron/info.php                |  11 +++
 htdocs/langs/en_US/cron.lang        |   4 +-
 4 files changed, 110 insertions(+), 105 deletions(-)

diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index fc89f6eb3cf..a371069d7cf 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -109,9 +109,9 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
     else
     {
         $now = dol_now();   // Date we start
-        
+
     	$result=$object->run_jobs($user->login);
-    
+
     	if ($result < 0)
     	{
     		setEventMessages($object->error, $object->errors, 'errors');
@@ -155,7 +155,7 @@ if ($action=='add')
 	$object->unitfrequency=GETPOST('unitfrequency','int');
 	$object->frequency=GETPOST('nbfrequency','int');
 	$object->maxrun=GETPOST('maxrun','int');
-	
+
 	// Add cron task
 	$result = $object->create($user);
 
@@ -191,7 +191,7 @@ if ($action=='update')
 	$object->unitfrequency=GETPOST('unitfrequency','int');
 	$object->frequency=GETPOST('nbfrequency','int');
 	$object->maxrun=GETPOST('maxrun','int');
-	
+
 	// Add cron task
 	$result = $object->update($user);
 
@@ -353,7 +353,7 @@ if (($action=="create") || ($action=="edit"))
 
 	print '<tr class="blockmethod"><td>';
 	print $langs->trans('CronClassFile')."</td><td>";
-	print "<input type=\"text\" size=\"20\" name=\"classesname\" value=\"".$object->classesname."\" /> ";
+	print '<input type="text" class="minwidth300" name="classesname" value="'.$object->classesname.'" /> ';
 	print "</td>";
 	print "<td>";
 	print $form->textwithpicto('',$langs->trans("CronClassFileHelp"),1,'help');
@@ -371,7 +371,7 @@ if (($action=="create") || ($action=="edit"))
 
 	print '<tr class="blockmethod"><td>';
 	print $langs->trans('CronMethod')."</td><td>";
-	print "<input type=\"text\" size=\"20\" name=\"methodename\" value=\"".$object->methodename."\" /> ";
+	print '<input type="text" class="minwidth300" name="methodename" value="'.$object->methodename.'" /> ';
 	print "</td>";
 	print "<td>";
 	print $form->textwithpicto('',$langs->trans("CronMethodHelp"),1,'help');
@@ -431,7 +431,7 @@ if (($action=="create") || ($action=="edit"))
 	}
 	$input .= "<label for=\"frequency_minute\">".$langs->trans('Minutes')."</label>";
 	print $input;
-	
+
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"3600\" id=\"frequency_heures\" ";
 	if($object->unitfrequency=="3600"){
 	    $input .= ' checked />';
@@ -441,7 +441,7 @@ if (($action=="create") || ($action=="edit"))
 	}
 	$input .= "<label for=\"frequency_heures\">".$langs->trans('Hours')."</label>";
 	print $input;
-	
+
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"86400\" id=\"frequency_jours\" ";
 	if($object->unitfrequency=="86400"){
 	    $input .= ' checked />';
@@ -451,7 +451,7 @@ if (($action=="create") || ($action=="edit"))
 	}
 	$input .= "<label for=\"frequency_jours\">".$langs->trans('Days')."</label>";
 	print $input;
-	
+
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"604800\" id=\"frequency_semaine\" ";
 	if($object->unitfrequency=="604800"){
 	    $input .= ' checked />';
@@ -465,7 +465,7 @@ if (($action=="create") || ($action=="edit"))
 	print "<td>";
 	print "</td>";
 	print "</tr>\n";
-	
+
 	print "<tr><td>";
 	print $langs->trans('CronDtStart')."</td><td>";
 	if(!empty($object->datestart))
@@ -480,7 +480,7 @@ if (($action=="create") || ($action=="edit"))
 	print "<td>";
 	print "</td>";
 	print "</tr>\n";
-	
+
 	print "<tr><td>";
 	print $langs->trans('CronDtEnd')."</td><td>";
 	if(!empty($object->dateend)){
@@ -493,7 +493,7 @@ if (($action=="create") || ($action=="edit"))
 	print "<td>";
 	print "</td>";
 	print "</tr>\n";
-	
+
 	print "<tr><td>";
 	print $langs->trans('CronPriority')."</td>";
 	$priority=0;
@@ -505,7 +505,7 @@ if (($action=="create") || ($action=="edit"))
 	print "<td>";
 	print "</td>";
 	print "</tr>\n";
-	
+
 	print '<tr><td>';
 	$maxrun='';
 	if (!empty($object->maxrun)) {
@@ -517,7 +517,7 @@ if (($action=="create") || ($action=="edit"))
 	print "<td>";
 	print "</td>";
 	print "</tr>\n";
-	
+
 	print '<tr><td>';
 	print $langs->trans('CronDtNextLaunch');
 	print ' ('.$langs->trans('CronFrom').')';
@@ -529,14 +529,14 @@ if (($action=="create") || ($action=="edit"))
 	else
 	{
 	    $form->select_date(-1,'datenextrun',1,1,'',"cronform");
-	}	
+	}
 	print "</td>";
     print "<td>";
 	print "</td>";
 	print "</tr>";
-	
+
 	print '</table>';
-    
+
 	dol_fiche_end();
 
 	print '<div align="center">';
@@ -554,24 +554,22 @@ else
 	 * view card
 	 */
     $now = dol_now();
-    
+
 	dol_fiche_head($head, 'card', $langs->trans("CronTask"), -1, 'cron');
 
 	$linkback = '<a href="' . DOL_URL_ROOT . '/cron/list.php?status=-2">' . $langs->trans("BackToList") . '</a>';
 
-	// TODO Use dol_banner
-	
+	$morehtmlref='<div class="refidno">';
+	$morehtmlref.='</div>';
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+
 	// box add_jobs_box
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 
 	print '<tr><td class="titlefield">';
-	print $langs->trans('CronId')."</td>";
-	print "<td>".$form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'id', '', '', 0);
-	print "</td></tr>\n";
-
-	print '<tr><td>';
 	print $langs->trans('CronLabel')."</td>";
 	print "<td>".$langs->trans($object->label);
 	print "</td></tr>";
@@ -616,21 +614,16 @@ else
 	print $langs->trans($object->note);
 	print "</td></tr>";
 
-	print '<tr><td>';
-	print $langs->trans('Active')."</td><td>";
-	print $object->getLibStatut(4);
-	print "</td></tr>";
-
 	print '</table>';
     print '</div>';
-    
+
 	print '<br>';
 
-	
+
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
-	
+
 	print '<tr><td class="titlefield">';
 	print $langs->trans('CronEvery')."</td>";
 	print "<td>";
@@ -639,33 +632,33 @@ else
 	if($object->unitfrequency == "86400") print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Days');
 	if($object->unitfrequency == "604800") print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Weeks');
 	print "</td></tr>";
-	
+
 	print '<tr><td>';
 	print $langs->trans('CronDtStart')."</td><td>";
 	if(!empty($object->datestart)) {print dol_print_date($object->datestart,'dayhoursec');}
 	print "</td></tr>";
-	
+
 	print "<tr><td>";
 	print $langs->trans('CronDtEnd')."</td><td>";
 	if(!empty($object->dateend)) {print dol_print_date($object->dateend,'dayhoursec');}
 	print "</td></tr>";
-	
+
 	print "<tr><td>";
 	print $langs->trans('CronPriority')."</td>";
 	print "<td>".$object->priority;
 	print "</td></tr>";
-	
+
 	print "<tr><td>";
 	print $langs->trans('CronMaxRun')."</td>";
 	print "<td>";
 	print $object->maxrun>0?$object->maxrun:'';
 	print "</td></tr>";
-	
+
 	print "<tr><td>";
 	print $langs->trans('CronNbRun')."</td>";
 	print "<td>".$object->nbrun;
 	print "</td></tr>";
-	
+
 	// Date next run (from)
 	print '<tr><td>';
 	print $langs->trans('CronDtNextLaunch');
@@ -673,18 +666,18 @@ else
 	print "</td><td>";
 	//print '<strong>';
 	if (! $object->status) print $langs->trans("Disabled");
-	elseif (!empty($object->datenextrun)) { print img_picto('','object_calendarday').' '.dol_print_date($object->datenextrun,'dayhoursec');} 
+	elseif (!empty($object->datenextrun)) { print img_picto('','object_calendarday').' '.dol_print_date($object->datenextrun,'dayhoursec');}
 	else {print $langs->trans('CronNone');}
 	//print '</strong>';
 	if ($object->maxnbrun && $object->nbrun >= $object->maxrun) print img_warning($langs->trans("Finished"));
 	if ($object->datenextrun && $object->datenextrun < $now) print img_warning($langs->trans("Late"));
 	print "</td></tr>";
-	
+
 	print '</table>';
 	print '</div>';
-	
+
 	print '<br>';
-	
+
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
@@ -711,7 +704,7 @@ else
 
 	print '</table>';
     print '</div>';
-    
+
 	dol_fiche_end();
 
 
@@ -733,7 +726,7 @@ else
 	else {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=execute&id='.$object->id.(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).'">'.$langs->trans("CronExecute").'</a>';
 	}
-	
+
 	if (! $user->rights->cron->create) {
 	    print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronStatusActiveBtn").'/'.$langs->trans("CronStatusInactiveBtn").'</a>';
 	} else {
@@ -743,7 +736,7 @@ else
 	        print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=inactive&id='.$object->id.'">'.$langs->trans("CronStatusInactiveBtn").'</a>';
 	    }
 	}
-	
+
 	if (! $user->rights->cron->delete) {
 		print '<a class="butActionDeleteRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("Delete").'</a>';
 	} else {
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 9d01ec888f0..f9b4ac67f03 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -30,36 +30,37 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
  */
 class Cronjob extends CommonObject
 {
-	var $element='cronjob';			//!< Id that identify managed objects
-	var $table_element='cronjob';		//!< Name of table without prefix where object is stored
+	public $element='cronjob';			//!< Id that identify managed objects
+	public $table_element='cronjob';		//!< Name of table without prefix where object is stored
+    public $picto = 'cron';
 
-    var $jobtype;
-	var $tms='';
-	var $datec='';
-	var $label;
-	var $command;
-	var $classesname;
-	var $objectname;
-	var $methodename;
-	var $params;
-	var $md5params;
-	var $module_name;
-	var $priority;
-	var $datelastrun='';
-	var $datenextrun='';
-	var $dateend='';
-	var $datestart='';
-	var $datelastresult='';
-	var $lastresult;
-	var $lastoutput;
-	var $unitfrequency;
-	var $frequency;
-	var $status;
-	var $processing;
-	var $fk_user_author;
-	var $fk_user_mod;
-	var $nbrun;
-	var $libname;
+    public $jobtype;
+	public $tms='';
+	public $datec='';
+	public $label;
+	public $command;
+	public $classesname;
+	public $objectname;
+	public $methodename;
+	public $params;
+	public $md5params;
+	public $module_name;
+	public $priority;
+	public $datelastrun='';
+	public $datenextrun='';
+	public $dateend='';
+	public $datestart='';
+	public $datelastresult='';
+	public $lastresult;
+	public $lastoutput;
+	public $unitfrequency;
+	public $frequency;
+	public $status;
+	public $processing;
+	public $fk_user_author;
+	public $fk_user_mod;
+	public $nbrun;
+	public $libname;
 
 
     /**
@@ -1265,35 +1266,35 @@ class Cronjob extends CommonObject
 class Cronjobline
 {
 
-	var $id;
-	var $ref;
+	public $id;
+	public $ref;
 
-	var $tms='';
-	var $datec='';
-	var $label;
-	var $jobtype;
-	var $command;
-	var $classesname;
-	var $objectname;
-	var $methodename;
-	var $params;
-	var $md5params;
-	var $module_name;
-	var $priority;
-	var $datelastrun='';
-	var $datenextrun='';
-	var $dateend='';
-	var $datestart='';
-	var $lastresult='';
-	var $lastoutput;
-	var $unitfrequency;
-	var $frequency;
-	var $status;
-	var $fk_user_author;
-	var $fk_user_mod;
-	var $note;
-	var $nbrun;
-	var $libname;
+	public $tms='';
+	public $datec='';
+	public $label;
+	public $jobtype;
+	public $command;
+	public $classesname;
+	public $objectname;
+	public $methodename;
+	public $params;
+	public $md5params;
+	public $module_name;
+	public $priority;
+	public $datelastrun='';
+	public $datenextrun='';
+	public $dateend='';
+	public $datestart='';
+	public $lastresult='';
+	public $lastoutput;
+	public $unitfrequency;
+	public $frequency;
+	public $status;
+	public $fk_user_author;
+	public $fk_user_mod;
+	public $note;
+	public $nbrun;
+	public $libname;
 
 	/**
 	 *  Constructor
diff --git a/htdocs/cron/info.php b/htdocs/cron/info.php
index 18ab50adeaa..d3365abb90b 100644
--- a/htdocs/cron/info.php
+++ b/htdocs/cron/info.php
@@ -50,6 +50,17 @@ $head = cron_prepare_head($object);
 
 dol_fiche_head($head, 'info', $langs->trans("CronTask"), -1, 'cron');
 
+$linkback = '<a href="' . DOL_URL_ROOT . '/cron/list.php?status=-2">' . $langs->trans("BackToList") . '</a>';
+
+$morehtmlref='<div class="refidno">';
+$morehtmlref.='</div>';
+
+dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+
+print '<div class="underbanner clearboth"></div>';
+
+print '<br>';
+
 print '<table width="100%"><tr><td>';
 dol_print_object_info($object);
 print '</td></tr></table>';
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index a1d3c6a9986..8eb03114c64 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -57,9 +57,9 @@ CronStatusActiveBtn=Enable
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
-CronClassFile=Classes (filename.class.php)
+CronClassFile=Filename with class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product.class.php</i>
+CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is <i>product/class/product.class.php</i>
 CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is <i>Product</i>
 CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is <i>fecth</i>
 CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be <i>0, ProductRef</i>

From 0312d2479d58124e4942ce1c29ce027b1904e5c0 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Mon, 12 Jun 2017 10:26:24 +0200
Subject: [PATCH 1096/1163] add block info popin, translation, hidden authority
 feature

---
 htdocs/blockedlog/admin/blockedlog.php        | 28 ++++-----
 htdocs/blockedlog/admin/fingerprints.php      | 61 +++++++++++++++++--
 htdocs/blockedlog/ajax/block-info.php         | 15 +++++
 htdocs/blockedlog/class/authority.class.php   |  2 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |  2 +-
 .../install/mysql/tables/llx_blockedlog.sql   |  2 +-
 htdocs/langs/en_US/blockedlog.lang            | 16 +++++
 7 files changed, 104 insertions(+), 22 deletions(-)
 create mode 100644 htdocs/blockedlog/ajax/block-info.php
 create mode 100644 htdocs/langs/en_US/blockedlog.lang

diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index 3c143b70b83..f77c6e9edd8 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -101,20 +101,20 @@ print $block_static->getSignature();
 
 print '</td></tr>';
 
-
-// Example with a yes / no select
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("BlockedLogAuthorityUrl").img_info($langs->trans('BlockedLogAuthorityNeededToStoreYouFingerprintsInNonAlterableRemote')).'</td>';
-print '<td align="right" width="300">';
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_BLOCKEDLOG_AUTHORITY_URL">';
-print '<input type="text" name="BLOCKEDLOG_AUTHORITY_URL" value="'.$conf->global->BLOCKEDLOG_AUTHORITY_URL.'" size="40" />';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print '</form>';
-print '</td></tr>';
-
+if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) {
+	// Example with a yes / no select
+	$var=!$var;
+	print '<tr '.$bc[$var].'>';
+	print '<td>'.$langs->trans("BlockedLogAuthorityUrl").img_info($langs->trans('BlockedLogAuthorityNeededToStoreYouFingerprintsInNonAlterableRemote')).'</td>';
+	print '<td align="right" width="300">';
+	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="set_BLOCKEDLOG_AUTHORITY_URL">';
+	print '<input type="text" name="BLOCKEDLOG_AUTHORITY_URL" value="'.$conf->global->BLOCKEDLOG_AUTHORITY_URL.'" size="40" />';
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '</form>';
+	print '</td></tr>';
+}
 
 print '</table>';
 
diff --git a/htdocs/blockedlog/admin/fingerprints.php b/htdocs/blockedlog/admin/fingerprints.php
index 29cd2a3f73b..95117bf2c28 100644
--- a/htdocs/blockedlog/admin/fingerprints.php
+++ b/htdocs/blockedlog/admin/fingerprints.php
@@ -74,7 +74,7 @@ print $langs->trans("FingerprintsDesc")."<br>\n";
 
 print '<br>';
 
-echo '<div align="right"><a href="?all=1">'.$langs->trans('ShowAllFingerPrintsMightBeTooLong').'</a> <a href="?action=downloadblockchain">'.$langs->trans('DownloadBlockChain').'</a></div>';
+echo '<div align="right"><a href="?all=1">'.$langs->trans('ShowAllFingerPrintsMightBeTooLong').'</a> | <a href="?action=downloadblockchain">'.$langs->trans('DownloadBlockChain').'</a></div>';
 		
 
 print '<table class="noborder" width="100%">';
@@ -97,15 +97,16 @@ foreach($blocks as &$block) {
    	print '<td>'.dol_print_date($block->tms,'dayhour').'</td>';
    	print '<td>'.$block->ref_object.'</td>';
    	print '<td>'.$langs->trans('log'.$block->action).'</td>';
-   	print '<td>'.$block->getObject().'</td>';
+   	print '<td>'.$block->getObject().'<a href="#" blockid="'.$block->id.'" rel="show-info">'.img_info($langs->trans('ShowDetails')).'</a></td>';
    	print '<td align="right">'.price($block->amounts).'</td>';
    	print '<td>'.$block->getUser().'</td>';
    	print '<td>'.$block->signature.'</td>';
    	print '<td>';
    	
-   	print $block->checkSignature() ? img_picto('OkCheckPaymentValidity', 'on') : img_picto($langs->trans('KoCheckPaymentValidity'), 'off');
-   	print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') :  img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black') );
-
+   	print $block->checkSignature() ? img_picto($langs->trans('OkCheckFingerprintValidity'), 'on') : img_picto($langs->trans('KoCheckFingerprintValidity'), 'off');
+   	if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
+   		print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') :  img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black') );
+   	}
 	print '</td>';
 	print '</tr>';
 					
@@ -113,6 +114,54 @@ foreach($blocks as &$block) {
 
 print '</table>';
 
+?>
+<script type="text/javascript">
+$('a[rel=show-info]').click(function() {
+
+	$pop = $('<div id="pop-info"><table width="100%" class="border"><thead><th width="25%"><?php echo $langs->trans('Field') ?></th><th><?php echo $langs->trans('Value') ?></th></thead><tbody></tbody></table></div>');
+	
+	$pop.dialog({
+		title:"<?php echo $langs->trans('BlockedlogInfoDialog'); ?>"
+		,modal:true
+		,width:'80%'
+	});
+
+	var fk_block = $(this).attr("blockid");
+	
+	$.ajax({
+		url:"../ajax/block-info.php?id="+fk_block
+		,dataType:'json'
+	}).done(function(data) {
+
+		drawData(data,'');
+		
+	});
+	
+});
+
+function drawData(data, prefix) {
+
+	for(x in data) {
+
+		value = data[x];
+
+		$('#pop-info table tbody').append('<tr><td>'+prefix+x+'</td><td>'+value+'</td></tr>');
+		
+		if( (typeof value === "object") && (value !== null) ) {
+			drawData(value, prefix+x+' &gt;&gt; ');
+		}
+
+	}
+	
+}
+
+</script>
+
+<?php 
+
+
+if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
+
 ?>
 				<script type="text/javascript">
 					
@@ -134,6 +183,8 @@ print '</table>';
 				
 <?php
 
+}
+
 dol_fiche_end();
 
 print '<br><br>';
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
new file mode 100644
index 00000000000..7a5f531e8f1
--- /dev/null
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -0,0 +1,15 @@
+<?php
+
+	require '../../main.inc.php';
+	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+	
+	$id = GETPOST('id');
+	
+	$block = new BlockedLog($db);
+	if($block->fetch($id)>0) {
+		echo json_encode($block->object_data);
+	}
+	else {
+		echo json_encode(false);
+	}
+	
\ No newline at end of file
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index b422fb130d7..707e3b1b172 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -294,7 +294,7 @@ class BlockedLogAuthority
 		
 		//TODO create cron task on activation
 		
-		if(empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
+		if(empty($conf->global->BLOCKEDLOG_AUTHORITY_URL) || empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) {
 			$this->error = $langs->trans('NoAuthorityURLDefined');
 			return -2;
 		}
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 0f9ef8ee3ca..07fb37597c3 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -409,7 +409,7 @@ CREATE TABLE llx_blockedlog
 	date_object	datetime,
 	object_data	text,
 	fk_user	integer,
-	entity integer DEFAULT 1, 
+	entity integer DEFAULT 1 NOT NULL, 
 	certified integer
 ) ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
index afc0f0d4375..ae696a0d6d1 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -13,7 +13,7 @@ CREATE TABLE llx_blockedlog
 	date_object	datetime,
 	object_data	text,
 	fk_user	integer,
-	entity integer DEFAULT 1, 
+	entity integer DEFAULT 1 NOT NULL, 
 	certified integer
 ) ENGINE=innodb;
 
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
new file mode 100644
index 00000000000..995801292a3
--- /dev/null
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -0,0 +1,16 @@
+Field=Field
+BlockedLogDesc=This module store event for invoice and payments as block chain
+FingerprintsDesc=All fingerprints stored
+EntityKey=Entity Key
+ShowAllFingerPrintsMightBeTooLong=Show all fingerprints (might be long)
+DownloadBlockChain=Download fingerprints
+KoCheckFingerprintValidity=Fingerprint is not valid
+OkCheckFingerprintValidity=Fingerprint is valid
+AddedByAuthority=Stored into remote authority
+NotAddedByAuthorityYet=Not yet stored into remote authority
+ShowDetails=Show stored details
+logPAYMENT_ADD_TO_BANK=Payment added to bank
+logPAYMENT_CUSTOMER_CREATE=Payment of customer created
+logBILL_PAYED=Customer bill payed
+logBILL_UNPAYED=Customer bill set unpayed
+logBILL_VALIDATE=Customer bill set valid from draft

From 98708acf576cdf9245b412456fe6b541614f199e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 11:41:16 +0200
Subject: [PATCH 1097/1163] Fix bad name of css file

---
 .../modulebuilder/template/css/mycss.css.php  | 25 -------
 .../template/css/mymodule.css.php             | 66 +++++++++++++++++++
 2 files changed, 66 insertions(+), 25 deletions(-)
 delete mode 100644 htdocs/modulebuilder/template/css/mycss.css.php
 create mode 100644 htdocs/modulebuilder/template/css/mymodule.css.php

diff --git a/htdocs/modulebuilder/template/css/mycss.css.php b/htdocs/modulebuilder/template/css/mycss.css.php
deleted file mode 100644
index 60d49d7c0bc..00000000000
--- a/htdocs/modulebuilder/template/css/mycss.css.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) <year>  <name of author>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    htdocs/modulebuilder/template/css/mycss.css.php
- * \ingroup mymodule
- * \brief   CSS file for module MyModule.
- */
-
-header('Content-Type: text/css');
diff --git a/htdocs/modulebuilder/template/css/mymodule.css.php b/htdocs/modulebuilder/template/css/mymodule.css.php
new file mode 100644
index 00000000000..0dbfae5b9ef
--- /dev/null
+++ b/htdocs/modulebuilder/template/css/mymodule.css.php
@@ -0,0 +1,66 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    htdocs/modulebuilder/template/css/mymodule.css.php
+ * \ingroup mymodule
+ * \brief   CSS file for module MyModule.
+ */
+
+//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
+//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled to increase speed. Language code is found on url.
+if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
+if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
+if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (! defined('NOLOGIN'))         define('NOLOGIN',1);          // File must be accessed by logon page so without login
+//if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);  // We need top menu content
+if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
+if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
+
+
+session_cache_limiter(FALSE);
+
+$res=0;
+if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php");
+if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
+if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+// Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined) and load permission if we need to use them in CSS
+/*if (empty($user->id) && ! empty($_SESSION['dol_login']))
+{
+    $user->fetch('',$_SESSION['dol_login']);
+	$user->getrights();
+}*/
+
+
+// Define css type
+header('Content-type: text/css');
+// Important: Following code is to cache this file to avoid page request by browser at each Dolibarr page access.
+// You can use CTRL+F5 to refresh your browser cache.
+if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
+else header('Cache-Control: no-cache');
+
+?>
+
+.myclasscss {
+	/* ... */
+}
+
+

From 8f383e3fa1011d42df7ff1621a647ae49e043e53 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 14:12:40 +0200
Subject: [PATCH 1098/1163] Fix template

---
 htdocs/modulebuilder/template/core/boxes/mybox.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/core/boxes/mybox.php b/htdocs/modulebuilder/template/core/boxes/mybox.php
index 4fcdd69ae26..7200d07559a 100644
--- a/htdocs/modulebuilder/template/core/boxes/mybox.php
+++ b/htdocs/modulebuilder/template/core/boxes/mybox.php
@@ -84,7 +84,7 @@ class MyBox extends ModeleBoxes
 	 */
 	public function __construct(DoliDB $db, $param = '')
 	{
-		global $langs;
+		global $user, $conf, $langs;
 		$langs->load("boxes");
 		$langs->load('mymodule@mymodule');
 
@@ -93,6 +93,9 @@ class MyBox extends ModeleBoxes
 		$this->boxlabel = $langs->transnoentitiesnoconv("MyBox");
 
 		$this->param = $param;
+
+		//$this->enabled = $conf->global->FEATURES_LEVEL > 0;         // Condition when module is enabled or not
+		//$this->hidden = ! ($user->rights->mymodule->myobject->read);   // Condition when module is visible by user (test on permission)
 	}
 
 	/**

From b52971d0a224c6de4f13d520ad1c548f246c0829 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jun 2017 16:00:38 +0200
Subject: [PATCH 1099/1163] Fix template

---
 .../template/class/actions_mymodule.class.php | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index 7f1897c80ae..a3ba3baeaad 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -29,6 +29,20 @@
  */
 class ActionsMyModule
 {
+    /**
+     * @var DoliDB Database handler.
+     */
+    public $db;
+    /**
+     * @var string Error
+     */
+    public $error = '';
+    /**
+     * @var array Errors
+     */
+    public $errors = array();
+
+
 	/**
 	 * @var array Hook results. Propagated to $hookmanager->resArray for later reuse
 	 */
@@ -39,16 +53,13 @@ class ActionsMyModule
 	 */
 	public $resprints;
 
-	/**
-	 * @var array Errors
-	 */
-	public $errors = array();
 
 	/**
 	 * Constructor
 	 */
-	public function __construct()
+	public function __construct($db)
 	{
+	    $this->db = $db;
 	}
 
 	/**

From f780af305aff5298a6f34ee022de25ce432b828f Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 13 Jun 2017 10:04:05 +0200
Subject: [PATCH 1100/1163] NEW blocklog other things

fix minor
add view only for error
add download log as csv
add record event on bill send by mail event
---
 htdocs/blockedlog/admin/fingerprints.php      | 103 ++++++++++++++----
 htdocs/blockedlog/class/blockedlog.class.php  |  18 ++-
 ..._modBlockedlog_ActionsBlockedLog.class.php |   2 +-
 htdocs/langs/en_US/blockedlog.lang            |   5 +
 4 files changed, 101 insertions(+), 27 deletions(-)

diff --git a/htdocs/blockedlog/admin/fingerprints.php b/htdocs/blockedlog/admin/fingerprints.php
index 95117bf2c28..f585b883c65 100644
--- a/htdocs/blockedlog/admin/fingerprints.php
+++ b/htdocs/blockedlog/admin/fingerprints.php
@@ -34,6 +34,9 @@ $langs->load("blockedlog");
 if (! $user->admin) accessforbidden();
   
 $action = GETPOST('action','alpha');
+$showonlyerrors = GETPOST('showonlyerrors','int');
+
+$block_static = new BlockedLog($db);
 
 if($action === 'downloadblockchain') {
 	
@@ -49,14 +52,57 @@ if($action === 'downloadblockchain') {
 	
 	exit;
 }
-
+else if($action === 'downloadcsv') {
+	
+	$res = $db->query("SELECT rowid,tms,action,amounts,element,fk_object,date_object,ref_object,signature,fk_user
+					FROM ".MAIN_DB_PREFIX."blockedlog ORDER BY rowid ASC");
+	
+	if($res) {
+		
+		$signature = $block_static->getSignature();
+		
+		header('Content-Type: application/octet-stream');
+		header("Content-Transfer-Encoding: Binary");
+		header("Content-disposition: attachment; filename=\"" .$signature. ".csv\"");
+		
+		print $langs->transnoentities('Id')
+			.';'.$langs->transnoentities('Timestamp')
+			.';'.$langs->transnoentities('Action')
+			.';'.$langs->transnoentities('Amounts')
+			.';'.$langs->transnoentities('Element')
+			.';'.$langs->transnoentities('ObjectId')
+			.';'.$langs->transnoentities('Date')
+			.';'.$langs->transnoentities('Ref')
+			.';'.$langs->transnoentities('Fingerprint')
+			.';'.$langs->transnoentities('User')."\n";
+		
+		while($obj = $db->fetch_object($res)) {
+			
+			print $obj->rowid
+				.';'.$obj->tms
+				.';'.$obj->action
+				.';'.$obj->amounts
+				.';'.$obj->element
+				.';'.$obj->fk_object
+				.';'.$obj->date_object
+				.';'.$obj->ref_object
+				.';'.$obj->signature
+				.';'.$obj->fk_user."\n";
+			
+		}
+		
+		exit;
+	}
+	else{
+		setEventMessage($db->lasterror, 'errors');
+	}
+	
+}
 
 /*
  *	View
  */
 
-$block_static = new BlockedLog($db);
-
 $blocks = $block_static->getLog('all', 0, GETPOST('all') ? 0 : 50);
 
 $form=new Form($db);
@@ -74,8 +120,13 @@ print $langs->trans("FingerprintsDesc")."<br>\n";
 
 print '<br>';
 
-echo '<div align="right"><a href="?all=1">'.$langs->trans('ShowAllFingerPrintsMightBeTooLong').'</a> | <a href="?action=downloadblockchain">'.$langs->trans('DownloadBlockChain').'</a></div>';
-		
+print '<div align="right">';
+print ' <a href="?all=1">'.$langs->trans('ShowAllFingerPrintsMightBeTooLong').'</a>';
+print ' | <a href="?all=1&showonlyerrors=1">'.$langs->trans('ShowAllFingerPrintsErrorsMightBeTooLong').'</a>';
+print ' | <a href="?action=downloadblockchain">'.$langs->trans('DownloadBlockChain').'</a>';
+print ' | <a href="?action=downloadcsv">'.$langs->trans('DownloadLogCSV').'</a>';
+print ' </div>';
+
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -92,24 +143,30 @@ print '<td><span id="blockchainstatus"></span></td>';
 print '</tr>';
 
 foreach($blocks as &$block) {
+
+	$checksignature = $block->checkSignature();
+	$object_link = $block->getObjectLink();
 	
-   	print '<tr class="oddeven">';
-   	print '<td>'.dol_print_date($block->tms,'dayhour').'</td>';
-   	print '<td>'.$block->ref_object.'</td>';
-   	print '<td>'.$langs->trans('log'.$block->action).'</td>';
-   	print '<td>'.$block->getObject().'<a href="#" blockid="'.$block->id.'" rel="show-info">'.img_info($langs->trans('ShowDetails')).'</a></td>';
-   	print '<td align="right">'.price($block->amounts).'</td>';
-   	print '<td>'.$block->getUser().'</td>';
-   	print '<td>'.$block->signature.'</td>';
-   	print '<td>';
-   	
-   	print $block->checkSignature() ? img_picto($langs->trans('OkCheckFingerprintValidity'), 'on') : img_picto($langs->trans('KoCheckFingerprintValidity'), 'off');
-   	if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
-   		print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') :  img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black') );
-   	}
-	print '</td>';
-	print '</tr>';
-					
+	if(!$showonlyerrors || $block->error>0) {
+		
+	   	print '<tr class="oddeven">';
+	   	print '<td>'.dol_print_date($block->tms,'dayhour').'</td>';
+	   	print '<td>'.$block->ref_object.'</td>';
+	   	print '<td>'.$langs->trans('log'.$block->action).'</td>';
+	   	print '<td>'.$object_link.'<a href="#" blockid="'.$block->id.'" rel="show-info">'.img_info($langs->trans('ShowDetails')).'</a></td>';
+	   	print '<td align="right">'.price($block->amounts).'</td>';
+	   	print '<td>'.$block->getUser().'</td>';
+	   	print '<td>'.$block->signature.'</td>';
+	   	print '<td>';
+	   	
+	   	print $block->error == 0 ? img_picto($langs->trans('OkCheckFingerprintValidity'), 'on') : img_picto($langs->trans('KoCheckFingerprintValidity'), 'off');
+	   	if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
+	   		print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') :  img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black') );
+	   	}
+		print '</td>';
+		print '</tr>';
+						
+	}
 }
 
 print '</table>';
@@ -121,7 +178,7 @@ $('a[rel=show-info]').click(function() {
 	$pop = $('<div id="pop-info"><table width="100%" class="border"><thead><th width="25%"><?php echo $langs->trans('Field') ?></th><th><?php echo $langs->trans('Value') ?></th></thead><tbody></tbody></table></div>');
 	
 	$pop.dialog({
-		title:"<?php echo $langs->trans('BlockedlogInfoDialog'); ?>"
+		title:"<?php echo $langs->transnoentities('BlockedlogInfoDialog'); ?>"
 		,modal:true
 		,width:'80%'
 	});
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 1f93eb3cc26..4f2a37e0116 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -78,6 +78,7 @@ class BlockedLog
 	
 	public $object_data = null;
 	
+	public $error = 0;
 	
 	/**
 	 *      Constructor
@@ -91,9 +92,9 @@ class BlockedLog
 	}
 
 	/**
-	 *      try to retrieve logged object
+	 *      try to retrieve logged object link
 	 */
-	public function getObject() {
+	public function getObjectLink() {
 		global $langs;
 		
 		if($this->element === 'facture') {
@@ -103,6 +104,9 @@ class BlockedLog
 			if($object->fetch($this->fk_object)>0) {
 				return $object->getNomUrl(1);
 			}
+			else{
+				$this->error++;
+			}
 		}
 		else if($this->element === 'payment') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
@@ -111,6 +115,9 @@ class BlockedLog
 			if($object->fetch($this->fk_object)>0) {
 				return $object->getNomUrl(1);
 			}
+			else{
+				$this->error++;
+			}
 		}
 	
 		return $langs->trans('ImpossibleToReloadObject', $this->element, $this->fk_object);
@@ -388,8 +395,13 @@ class BlockedLog
 		
 		$this->getSignatureRecursive();
 	
-		return ($signature_to_test=== $this->signature);
+		$res = ($signature_to_test === $this->signature);
 		
+		if(!$res) {
+			$this->error++;
+		}
+		
+		return $res;
 	}
 	
 	/**
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 5a52777cbb9..461a277dfd4 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -51,7 +51,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			return 0;
 		}
 		
-		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED') {
+		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED' || $action === 'BILL_SENTBYMAIL') {
 			$amounts=  (double) $object->total_ttc;
 		}
 		else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index 995801292a3..7e64bfad17f 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -3,6 +3,7 @@ BlockedLogDesc=This module store event for invoice and payments as block chain
 FingerprintsDesc=All fingerprints stored
 EntityKey=Entity Key
 ShowAllFingerPrintsMightBeTooLong=Show all fingerprints (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all fingerprints with error (might be long)
 DownloadBlockChain=Download fingerprints
 KoCheckFingerprintValidity=Fingerprint is not valid
 OkCheckFingerprintValidity=Fingerprint is valid
@@ -14,3 +15,7 @@ logPAYMENT_CUSTOMER_CREATE=Payment of customer created
 logBILL_PAYED=Customer bill payed
 logBILL_UNPAYED=Customer bill set unpayed
 logBILL_VALIDATE=Customer bill set valid from draft
+logBILL_SENTBYMAIL=Customer bill send by mail
+BlockedlogInfoDialog=Log Details
+Fingerprint=Fingerprint
+DownloadLogCSV=Download fingerprints CSV
\ No newline at end of file

From 4c424bb760c43e1d938fac74e0bddcc49b10a1fa Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 13 Jun 2017 10:09:53 +0200
Subject: [PATCH 1101/1163] fix current element compare amount

---
 htdocs/blockedlog/class/blockedlog.class.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 4f2a37e0116..b0cddd66f75 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -502,8 +502,7 @@ class BlockedLog
 	 */
 	private function getCurrentValue() {
 		
-		if($this->action === 'PAYMENT_CUSTOMER_CREATE'
-		|| $this->action === 'PAYMENT_ADD_TO_BANK') {
+		if($this->element === 'payment') {
 			$sql="SELECT amount FROM ".MAIN_DB_PREFIX."paiement WHERE rowid=".$this->fk_object;
 					
 			$res = $this->db->query($sql);
@@ -512,7 +511,15 @@ class BlockedLog
 				$this->amounts = (double) $obj->amount;
 			}
 		}
-				
+		elseif($this->element === 'facture') {
+			$sql="SELECT total_ttc FROM ".MAIN_DB_PREFIX."facture WHERE rowid=".$this->fk_object;
+			
+			$res = $this->db->query($sql);
+			if($res && $obj = $this->db->fetch_object($res)) {
+				$this->amounts = (double) $obj->total_ttc;
+			}
+		}
+		
 	}
 	
 	/**

From b67a14c7d66ea68cc1b9f261e3fc9a47348516de Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 13 Jun 2017 10:20:26 +0200
Subject: [PATCH 1102/1163] Fix ajax search product is broken

---
 htdocs/product/ajax/products.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 159ee6c272e..c8b81caa9fc 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -182,8 +182,10 @@ else
 	$idprod = (! empty($match[0]) ? $match[0] : '');
 
 	if (GETPOST($htmlname,'alpha') == '' && (! $idprod || ! GETPOST($idprod,'alpha')))
+	{
 		print json_encode(array());
 	    return;
+	}
 
 	// When used from jQuery, the search term is added as GET param "term".
 	$searchkey = (($idprod && GETPOST($idprod,'alpha')) ? GETPOST($idprod,'alpha') :  (GETPOST($htmlname, 'alpha') ? GETPOST($htmlname, 'alpha') : ''));

From 225c17d04792fb5f9487546d7f576e455bc5207c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 11:02:30 +0200
Subject: [PATCH 1103/1163] Fix permission on menu entry

---
 htdocs/core/menus/init_menu_auguria.sql | 5 +++--
 htdocs/core/menus/standard/eldy.lib.php | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index a32d3ef6886..6115b6cff0d 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -287,8 +287,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3700__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/index.php?leftmenu=projects', 'Activities', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3701__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&amp;action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3702__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3703__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/activity/perweek.php?leftmenu=projects', 'NewTimeSpent', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3704__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/tasks/stats/index.php?leftmenu=projects', 'Statistics', 1, 'projects', '$user->rights->projet->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3704__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/stats/index.php?leftmenu=projects', 'Statistics', 1, 'projects', '$user->rights->projet->lire', '', 2, 4, __ENTITY__);
+
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3400__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/perweek.php?leftmenu=projects', 'NewTimeSpent', 0, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__);
 
 -- Project - Categories
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3804__+MAX_llx_menu__, 'project', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=6', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 8c83435914b..7b25dbe35fb 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1322,9 +1322,10 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("Activities"), 0, $user->rights->projet->lire);
 					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
 					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("List"), 1, $user->rights->projet->lire);
-					$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewTimeSpent"), 1, $user->rights->projet->lire);
 				    $newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
 
+				    $newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user?'&search_project_user='.$search_project_user:''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire);
+
 					// All project i have permission on
 					/*$newmenu->add("/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire && $user->rights->projet->lire);
 					$newmenu->add("/projet/tasks.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer && $user->rights->projet->creer);

From c0f46834cb50a39620ec6d0dcb1cdedab7486717 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 13:22:05 +0200
Subject: [PATCH 1104/1163] Fix demo links

---
 htdocs/langs/en_US/projects.lang |  1 +
 htdocs/main.inc.php              |  4 +-
 htdocs/public/demo/index.php     | 67 +++++++++++++++++++-------------
 3 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index b3317df9c8e..d940555f206 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -64,6 +64,7 @@ TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
 AddTimeSpent=Create time spent
+AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 74f3698e728..6b75b957590 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -396,8 +396,8 @@ if (! defined('NOLOGIN'))
         {
             if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/',$_SERVER['HTTP_REFERER']))
             {
-                dol_syslog("Call index page from another url than demo page");
-				$url='';
+                dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
+                $url='';
                 $url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
                 $url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
                 $url.=($url?'&':'').($dol_optimize_smallscreen?'dol_optimize_smallscreen='.$dol_optimize_smallscreen:'');
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index be844c8a2da..f9bb4db7ecf 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -54,12 +54,13 @@ $alwaysuncheckedmodules=array();
 $alwayshiddencheckedmodules=array();
 $alwayshiddenuncheckedmodules=array();
 
-$url=DOL_URL_ROOT.'/index.php?';
+$url='';
 $url.=($url?'&':'').($conf->dol_hide_topmenu?'dol_hide_topmenu='.$conf->dol_hide_topmenu:'');
 $url.=($url?'&':'').($conf->dol_hide_leftmenu?'dol_hide_leftmenu='.$conf->dol_hide_leftmenu:'');
 $url.=($url?'&':'').($conf->dol_optimize_smallscreen?'dol_optimize_smallscreen='.$conf->dol_optimize_smallscreen:'');
 $url.=($url?'&':'').($conf->dol_no_mouse_hover?'dol_no_mouse_hover='.$conf->dol_no_mouse_hover:'');
 $url.=($url?'&':'').($conf->dol_use_jmobile?'dol_use_jmobile='.$conf->dol_use_jmobile:'');
+$url=DOL_URL_ROOT.'/index.php'.($url?'?'.$url:'');
 
 $tmpaction = 'view';
 $parameters=array();
@@ -105,6 +106,7 @@ if (empty($reshook))
 	    )
 	);
 
+
 	// Visible
 	$alwayscheckedmodules=array('barcode','bookmark','categorie','externalrss','fckeditor','geoipmaxmind','gravatar','memcached','syslog','user','webservices');  // Technical module we always want
 	$alwaysuncheckedmodules=array('dynamicprices','loan','multicurrency','paybox','paypal','stripe','google','printing','scanner','workflow');  // Module we never want
@@ -202,7 +204,7 @@ asort($orders);
  * Actions
  */
 
-if (GETPOST('action','aZ09') == 'gotodemo')
+if (GETPOST('action','aZ09') == 'gotodemo')     // Action run when we click on "Start" after selection modules
 {
 	//print 'ee'.GETPOST("demochoice");
 	$disablestring='';
@@ -232,8 +234,9 @@ if (GETPOST('action','aZ09') == 'gotodemo')
     // Do redirect to login page
 	if ($disablestring)
 	{
-		if (GETPOST('urlfrom')) $url.=($url?'&':'').'urlfrom='.urlencode(GETPOST('urlfrom','alpha'));
-		$url.=($url?'&':'').'disablemodules='.$disablestring;
+		if (GETPOST('urlfrom')) $url.=(preg_match('/\?/',$url)?'&amp;':'?').'urlfrom='.urlencode(GETPOST('urlfrom','alpha'));
+		$url.=(preg_match('/\?/',$url)?'&amp;':'?').'disablemodules='.$disablestring;
+        //var_dump($url);exit;
 		header("Location: ".$url);
 		exit;
 	}
@@ -252,25 +255,25 @@ $head.='
 <script type="text/javascript">
 var openedId="";
 jQuery(document).ready(function () {
-jQuery("tr.moduleline").hide();
-// Enable this to allow personalized setup
-jQuery(".modulelineshow").attr("href","#a1profdemoall");
-jQuery(".cursorpointer").css("cursor","pointer");
-jQuery(".modulelineshow").click(function() {
-var idstring=$(this).attr("id");
-if (typeof idstring != "undefined")
-{
-var currentId = idstring.substring(2);
-jQuery("tr.moduleline").hide();
-if (currentId != openedId)
-{
-openedId=currentId;
-jQuery("#tr1"+currentId).show();
-jQuery("#tr2"+currentId).show();
-}
-else openedId = "";
-}
-});
+    jQuery("tr.moduleline").hide();
+    // Enable this to allow personalized setup
+    jQuery(".modulelineshow").attr("href","#a1profdemoall");
+    jQuery(".cursorpointer").css("cursor","pointer");
+    jQuery(".modulelineshow").click(function() {
+    var idstring=$(this).attr("id");
+    if (typeof idstring != "undefined")
+    {
+        var currentId = idstring.substring(2);
+        jQuery("tr.moduleline").hide();
+        if (currentId != openedId)
+        {
+            openedId=currentId;
+            jQuery("#tr1"+currentId).show();
+            jQuery("#tr2"+currentId).show();
+        }
+            else openedId = "";
+        }
+    });
 });
 </script>';
 
@@ -304,13 +307,23 @@ foreach ($demoprofiles as $profilearray)
 	    //print $profilearray['lang'];
 	    if (! empty($profilearray['lang'])) $langs->load($profilearray['lang']);
 
-		$url=$_SERVER["PHP_SELF"].'?action=gotodemo&amp;urlfrom='.urlencode($_SERVER["PHP_SELF"]);
+		$url=$_SERVER["PHP_SELF"].'?action=gotodemo';
 		$urlwithmod=$url.'&amp;demochoice='.$profilearray['key'];
 		// Should work with DOL_URL_ROOT='' or DOL_URL_ROOT='/dolibarr'
 		//print "xx".$_SERVER["PHP_SELF"].' '.DOL_URL_ROOT.'<br>';
-		$urlfrom=preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/i','',$_SERVER["PHP_SELF"]);
+
+        $urlfrom=preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/i','',$_SERVER["PHP_SELF"]);
 		//print $urlfrom;
-		if (! empty($profilearray['url'])) $urlwithmod=$profilearray['url'];
+
+		if (! empty($profilearray['url']))
+		{
+		    $urlwithmod=$profilearray['url'];
+		    $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&amp;':'?').'urlfrom='.urlencode($urlfrom);
+		    if (! empty($profilearray['disablemodules']))
+		    {
+		          $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&amp;':'?').'disablemodules='.$profilearray['disablemodules'];
+		    }
+		}
 
 		if (empty($profilearray['url']))
 		{
@@ -348,7 +361,7 @@ foreach ($demoprofiles as $profilearray)
     	print '</a>';
 
 
-        // Modules
+        // Modules (a profile you must choose modules)
         if (empty($profilearray['url']))
         {
     		print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:14px; line-height: 130%; padding-bottom: 8px">';

From c8856182a6fa51a8c34e728e522ea0a735b968fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 15:34:18 +0200
Subject: [PATCH 1105/1163] Fix look and feel v6

---
 htdocs/core/lib/files.lib.php          |   6 +
 htdocs/core/lib/functions.lib.php      |  13 +-
 htdocs/holiday/card.php                |  34 ++--
 htdocs/holiday/class/holiday.class.php |  24 ++-
 htdocs/holiday/define_holiday.php      | 247 ++++++++++++++++---------
 5 files changed, 204 insertions(+), 120 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 60b970fffce..21fb1be7c0d 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1891,6 +1891,12 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	    if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
 	    $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
 	}
+	// Wrapping pour les apercu supplier invoice
+	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
+	{
+	    if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
+	    $original_file=$conf->expensereport->dir_output.'/'.$original_file;
+	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->dir_temp))
 	{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bc18f0984de..54f02c5feea 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1155,14 +1155,15 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 
 	if (class_exists("Imagick"))
 	{
-		if ($object->element == 'propal')    $modulepart='propal';
-		if ($object->element == 'commande')  $modulepart='commande';
-		if ($object->element == 'facture')   $modulepart='facture';
-		if ($object->element == 'fichinter') $modulepart='ficheinter';
-		if ($object->element == 'contrat')   $modulepart='contract';
+	    if ($object->element == 'propal')            $modulepart='propal';
+		if ($object->element == 'commande')          $modulepart='commande';
+		if ($object->element == 'facture')           $modulepart='facture';
+		if ($object->element == 'fichinter')         $modulepart='ficheinter';
+		if ($object->element == 'contrat')           $modulepart='contract';
 	    if ($object->element == 'supplier_proposal') $modulepart='supplier_proposal';
 		if ($object->element == 'order_supplier')    $modulepart='supplier_order';
 	    if ($object->element == 'invoice_supplier')  $modulepart='supplier_invoice';
+		if ($object->element == 'expensereport')     $modulepart='expensereport';
 	}
 
 	if ($object->element == 'product')
@@ -1192,7 +1193,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
             {
                 $phototoshow='';
                 // Check if a preview file is available
-                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice')) && class_exists("Imagick"))
+                if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice', 'expensereport')) && class_exists("Imagick"))
                 {
                     $objectref = dol_sanitizeFileName($object->ref);
                     $dir_output = $conf->$modulepart->dir_output . "/";
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 6e31f1868c7..531f42fd47f 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -576,27 +576,27 @@ if ($action == 'confirm_draft' && GETPOST('confirm') == 'yes')
 {
     $object = new Holiday($db);
     $object->fetch($id);
-    
+
     $oldstatus = $object->statut;
     $object->statut = 1;
-    
+
     $result = $object->update($user);
     if ($result < 0)
     {
         $error = $langs->trans('ErrorBackToDraft');
     }
-    
+
     if (! $error)
     {
         $db->commit();
-        
+
         header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
         exit;
     }
     else
     {
         $db->rollback();
-    }    
+    }
 }
 
 // Si Validation de la demande
@@ -1029,7 +1029,7 @@ else
                 {
                     print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleSetToDraft"),$langs->trans("ConfirmSetToDraft"),"confirm_draft", '', 1, 1);
                 }
-                
+
                 $head=holiday_prepare_head($object);
 
 
@@ -1041,17 +1041,17 @@ else
                     print '<input type="hidden" name="id" value="'.$object->id.'" />'."\n";
                 }
 
-                dol_fiche_head($head,'card',$langs->trans("CPTitreMenu"),0,'holiday');
+                dol_fiche_head($head, 'card', $langs->trans("CPTitreMenu"), -1, 'holiday');
 
                 $linkback='<a href="'.DOL_URL_ROOT.'/holiday/list.php">'.$langs->trans("BackToList").'</a>';
-                
+
                 dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref');
-                
-                
+
+
                 print '<div class="fichecenter">';
                 print '<div class="fichehalfleft">';
                 print '<div class="underbanner clearboth"></div>';
-                
+
                 print '<table class="border centpercent">';
                 print '<tbody>';
 
@@ -1153,9 +1153,9 @@ else
                 print '</div>';
                 print '<div class="fichehalfright">';
                 print '<div class="ficheaddleft">';
-                
+
                 print '<div class="underbanner clearboth"></div>';
-                
+
 				// Info workflow
                 print '<table class="border centpercent">'."\n";
                 print '<tbody>';
@@ -1212,12 +1212,12 @@ else
                 print '</div>';
                 print '</div>';
                 print '</div>';
-                
+
                 print '<div class="clearboth"></div>';
-                
+
                 dol_fiche_end();
 
-                
+
                 if ($action == 'edit' && $object->statut == 1)
                 {
                     print '<div align="center">';
@@ -1273,7 +1273,7 @@ else
                     {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=backtodraft" class="butAction">'.$langs->trans("SetToDraft").'</a>';
                     }
-                    
+
                     print '</div>';
                 }
 
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 15a565b04f9..9973223ba0f 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1195,12 +1195,15 @@ class Holiday extends CommonObject
      *
      *    @param      boolean			$stringlist	    If true return a string list of id. If false, return an array
      *    @param      boolean   		$type			If true, read Dolibarr user list, if false, return vacation balance list.
+     *    @param      string            $filters        Filters
      *    @return     array|string|int      			Return an array
      */
-    function fetchUsers($stringlist=true,$type=true)
+    function fetchUsers($stringlist=true, $type=true, $filters='')
     {
     	global $conf;
 
+    	dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
+
         // Si vrai donc pour user Dolibarr
         if ($stringlist)
         {
@@ -1219,11 +1222,12 @@ class Holiday extends CommonObject
                 	$sql.= " OR u.admin = 1";
                 }
                 else
+                {
                 	$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
-
+                }
                 $sql.= " AND u.statut > 0";
+                if ($filters) $sql.=$filters;
 
-                dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
 
                 // Si pas d'erreur SQL
@@ -1261,9 +1265,10 @@ class Holiday extends CommonObject
             {
            		// We want only list of user id
                 $sql = "SELECT DISTINCT cpu.fk_user";
-                $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu";
+                $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
+                $sql.= " WHERE cpu.fk_user = u.user";
+                if ($filters) $sql.=$filters;
 
-                dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
 
                 // Si pas d'erreur SQL
@@ -1318,8 +1323,8 @@ class Holiday extends CommonObject
                 	$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
 
                 $sql.= " AND u.statut > 0";
+                if ($filters) $sql.=$filters;
 
-                dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
 
                 // Si pas d'erreur SQL
@@ -1358,14 +1363,13 @@ class Holiday extends CommonObject
                 }
             }
             else
-           {
+            {
 				// List of vacation balance users
                 $sql = "SELECT cpu.fk_user, cpu.fk_type, cpu.nb_holiday, u.lastname, u.firstname";
-                $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu,";
-                $sql.= " ".MAIN_DB_PREFIX."user as u";
+                $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
                 $sql.= " WHERE cpu.fk_user = u.rowid";
+                if ($filters) $sql.=$filters;
 
-                dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
 
                 // Si pas d'erreur SQL
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index e1b8b21a7bd..88f3438dcaf 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -30,81 +30,135 @@ require('../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
 
+$langs->load('users');
+$langs->load('hrm');
+
+$action=GETPOST('action','aZ09');
+
+$search_name=GETPOST('search_name', 'alpha');
+
+// Load variable for pagination
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="t.rowid"; // Set here default search field
+if (! $sortorder) $sortorder="ASC";
+
+
 // Protection if external user
 if ($user->societe_id > 0) accessforbidden();
 
 // If the user does not have perm to read the page
 if(!$user->rights->holiday->read) accessforbidden();
 
-$action=GETPOST('action','aZ09');
+
+// Initialize technical object to manage context to save list fields
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'defineholidaylist';
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('defineholidaylist'));
+$extrafields = new ExtraFields($db);
 
 $holiday = new Holiday($db);
 
-$langs->load('users');
-$langs->load('hrm');
-
 
 /*
  * Actions
  */
 
-// Si il y a une action de mise à jour
-if ($action == 'update' && isset($_POST['update_cp']))
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
 {
-	$error = 0;
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	$typeleaves=$holiday->getTypes(1,1);
-
-    $userID = array_keys($_POST['update_cp']);
-    $userID = $userID[0];
-
-    foreach($typeleaves as $key => $val)
+    // Purge search criteria
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
     {
-	    $userValue = $_POST['nb_holiday_'.$val['rowid']];
-	    $userValue = $userValue[$userID];
-
-	    if (!empty($userValue))
-	    {
-	        $userValue = price2num($userValue,5);
-	    } else {
-	        $userValue = '';
-	    }
-
-	    //If the user set a comment, we add it to the log comment
-	    $comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
-
-	    //print 'eee'.$val['rowid'].'-'.$userValue;
-		if ($userValue != '')
-		{
-			// We add the modification to the log (must be before update of sold because we read current value of sold)
-		    $result=$holiday->addLogCP($user->id, $userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment, $userValue, $val['rowid']);
-			if ($result < 0)
-			{
-				setEventMessages($holiday->error, $holiday->errors, 'errors');
-				$error++;
-			}
-
-			// Update of the days of the employee
-		    $result = $holiday->updateSoldeCP($userID, $userValue, $val['rowid']);
-			if ($result < 0)
-			{
-				setEventMessages($holiday->error, $holiday->errors, 'errors');
-				$error++;
-			}
-
-		    // If it first update of balance, we set date to avoid to have sold incremented by new month
-		    /*
-			$now=dol_now();
-		    $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
-		    $sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'";
-		    $sql.= " WHERE name = 'lastUpdate' and value IS NULL";	// Add value IS NULL to be sure to update only at init.
-		    dol_syslog('define_holiday update lastUpdate entry', LOG_DEBUG);
-		    $result = $db->query($sql);
-		    */
-		}
+        $search_name='';
+        $toselect='';
+        $search_array_options=array();
     }
 
-    if (! $error) setEventMessages('UpdateConfCPOK', '', 'mesgs');
+    // Mass actions
+    /*
+    $objectclass='Skeleton';
+    $objectlabel='Skeleton';
+    $permtoread = $user->rights->skeleton->read;
+    $permtodelete = $user->rights->skeleton->delete;
+    $uploaddir = $conf->skeleton->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+    */
+
+    // Si il y a une action de mise à jour
+    if ($action == 'update' && isset($_POST['update_cp']))
+    {
+    	$error = 0;
+
+    	$typeleaves=$holiday->getTypes(1,1);
+
+        $userID = array_keys($_POST['update_cp']);
+        $userID = $userID[0];
+
+        foreach($typeleaves as $key => $val)
+        {
+    	    $userValue = $_POST['nb_holiday_'.$val['rowid']];
+    	    $userValue = $userValue[$userID];
+
+    	    if (!empty($userValue))
+    	    {
+    	        $userValue = price2num($userValue,5);
+    	    } else {
+    	        $userValue = '';
+    	    }
+
+    	    //If the user set a comment, we add it to the log comment
+    	    $comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
+
+    	    //print 'eee'.$val['rowid'].'-'.$userValue;
+    		if ($userValue != '')
+    		{
+    			// We add the modification to the log (must be before update of sold because we read current value of sold)
+    		    $result=$holiday->addLogCP($user->id, $userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment, $userValue, $val['rowid']);
+    			if ($result < 0)
+    			{
+    				setEventMessages($holiday->error, $holiday->errors, 'errors');
+    				$error++;
+    			}
+
+    			// Update of the days of the employee
+    		    $result = $holiday->updateSoldeCP($userID, $userValue, $val['rowid']);
+    			if ($result < 0)
+    			{
+    				setEventMessages($holiday->error, $holiday->errors, 'errors');
+    				$error++;
+    			}
+
+    		    // If it first update of balance, we set date to avoid to have sold incremented by new month
+    		    /*
+    			$now=dol_now();
+    		    $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
+    		    $sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'";
+    		    $sql.= " WHERE name = 'lastUpdate' and value IS NULL";	// Add value IS NULL to be sure to update only at init.
+    		    dol_syslog('define_holiday update lastUpdate entry', LOG_DEBUG);
+    		    $result = $db->query($sql);
+    		    */
+    		}
+        }
+
+        if (! $error) setEventMessages('UpdateConfCPOK', '', 'mesgs');
+    }
 }
 
 
@@ -117,6 +171,17 @@ $userstatic=new User($db);
 
 llxHeader('', $langs->trans('CPTitreMenu'));
 
+
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
 print load_fiche_titre($langs->trans('MenuConfCP'), '', 'title_hrm.png');
 
 print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
@@ -137,10 +202,12 @@ if ($result < 0)
 	setEventMessages($holiday->error, $holiday->errors, 'errors');
 }
 
-$listUsers = $holiday->fetchUsers(false,true);
+$filters=natural_search(array('u.firstname','u.lastname'), $search_name);
+
+$listUsers = $holiday->fetchUsers(false,true,$filters);
 if (is_numeric($listUsers) && $listUsers < 0)
 {
-    setEventMessages($holiday->error, $holiday->errors, 'errors');    
+    setEventMessages($holiday->error, $holiday->errors, 'errors');
 }
 
 $var=true;
@@ -159,22 +226,44 @@ else
 {
     $canedit=0;
     if (! empty($user->rights->holiday->define_holiday)) $canedit=1;
-    
+
     // Get array of ids of all childs
     $userchilds=array();
     if (empty($user->rights->holiday->read_all))
     {
         $userchilds=$user->getAllChildIds();
     }
-    
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+
     print '<input type="hidden" name="action" value="update" />';
 
     $moreforfilter='';
-    
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
-    
+
+    print '<tr class="liste_titre_filter">';
+    print '<td class="liste_titre"><input type="text" name="search_name" value="'.dol_escape_htmltag($search_name).'"></td>';
+    if (count($typeleaves))
+    {
+        foreach($typeleaves as $key => $val)
+        {
+            print '<td class="liste_titre" style="text-align:center"></td>';
+        }
+    }
+    else
+    {
+        print '<td class="liste_titre"></td>';
+    }
+    print '<td class="liste_titre"></td>';
+
+    // Action column
+    print '<td class="liste_titre" align="right">';
+    $searchpicto=$form->showFilterButtons();
+    print $searchpicto;
+    print '</td>';
+
+    print '</tr>';
+
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans('Employee'), $_SERVER["PHP_SELF"]);
     if (count($typeleaves))
@@ -193,35 +282,18 @@ else
     print '</th>';
     print_liste_field_titre('');
     print '</tr>';
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre"></td>';
-    if (count($typeleaves))
-    {
-        foreach($typeleaves as $key => $val)
-        {
-            print '<td class="liste_titre" style="text-align:center"></td>';
-        }
-    }
-    else
-    {
-        print '<td class="liste_titre"></td>';
-    }
-    print '<td class="liste_titre"></td>';
-    print '<td class="liste_titre"></td>';
-    print '</tr>';
-    
+
+
     foreach($listUsers as $users)
     {
-        
-
         // If user has not permission to edit/read all, we must see only subordinates
-        if (empty($user->rights->holiday->read_all))  
+        if (empty($user->rights->holiday->read_all))
         {
             if (($users['rowid'] != $user->id) && (! in_array($users['rowid'], $userchilds))) continue;     // This user is not into hierarchy of current user, we hide it.
         }
-        
+
         print '<tr class="oddeven">';
-        
+
         // User
         print '<td>';
         $userstatic->id=$users['rowid'];
@@ -252,7 +324,7 @@ else
         {
             print '<td></td>';
         }
-        
+
         // Note
         print '<td style="text-align:center">';
         if ($canedit) print '<input type="text"'.($canedit?'':' disabled="disabled"').' class="maxwidthonsmartphone" value="" name="note_holiday['.$users['rowid'].']" size="30"/>';
@@ -270,9 +342,10 @@ else
 
     print '</table>';
     print '</div>';
-    print '</form>';
 }
 
+print '</form>';
+
 llxFooter();
 
 $db->close();

From ef0907d89e6d44daa701fc4cea194451867ad368 Mon Sep 17 00:00:00 2001
From: alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 13 Jun 2017 15:55:22 +0200
Subject: [PATCH 1106/1163] NEW log download or preview event on a validate
 bill

---
 htdocs/blockedlog/ajax/block-add.php          | 19 ++++++++++++
 htdocs/compta/facture/card.php                | 31 +++++++++++++++++++
 htdocs/core/class/html.formfile.class.php     |  2 +-
 ..._modBlockedlog_ActionsBlockedLog.class.php |  3 +-
 htdocs/langs/en_US/blockedlog.lang            |  4 ++-
 5 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 htdocs/blockedlog/ajax/block-add.php

diff --git a/htdocs/blockedlog/ajax/block-add.php b/htdocs/blockedlog/ajax/block-add.php
new file mode 100644
index 00000000000..247b01186fe
--- /dev/null
+++ b/htdocs/blockedlog/ajax/block-add.php
@@ -0,0 +1,19 @@
+<?php 
+
+	require '../../main.inc.php';
+	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+	
+	$id = GETPOST('id','int');
+	$element = GETPOST('element','alpha');
+	$action = GETPOST('action','alpha');
+	
+	if($element === 'facture') {
+		dol_include_once('/compta/facture/class/facture.class.php');
+		
+		$facture = new Facture($db);
+		if($facture->fetch($id)>0) {
+			$facture->call_trigger($action, $user);
+		}
+		
+	}
+	
\ No newline at end of file
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index c4bf83293de..ffab33275a7 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4248,6 +4248,37 @@ else if ($id > 0 || ! empty($ref))
 		$delallowed = $user->rights->facture->supprimer;
 
 		print $formfile->showdocuments('facture', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+		
+		if(!empty($conf->blockedlog->enabled) && $object->statut>0) {
+			?>
+			<script type="text/javascript">
+
+			$(document).ready(function() {
+				$('a.documentpreview').click(function() {
+					$.post("<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>"
+							, { 
+								id:<?php echo $object->id; ?> 
+								, element:"<?php echo $object->element ?>"
+								, action:"PREVIEW_BILL" 
+							}
+					);
+				});
+				$('a.documentdownload').click(function() {
+					$.post("<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>"
+							, { 
+								id:<?php echo $object->id; ?> 
+								, element:"<?php echo $object->element ?>"
+								, action:"DOWNLOAD_BILL" 
+							}
+					);
+				});
+			});
+			
+			</script>
+			<?php
+		}
+		
+		
 		$somethingshown = $formfile->numoffiles;
 
 		// Show links to link elements
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 89cf70951ad..44a90794790 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -712,7 +712,7 @@ class FormFile
 					$out.= '<td class="tdoverflowmax300">';
                     $tmp = $this->showPreview($file,$modulepart,$relativepath,0,$param);
                     $out.= ($tmp?$tmp.' ':'');
-					$out.= '<a href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
+					$out.= '<a class="documentdownload" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
 					$mime=dol_mimetype($relativepath,'',0);
 					if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
 					$out.= ' target="_blank">';
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 461a277dfd4..004c4eecd78 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -51,7 +51,8 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			return 0;
 		}
 		
-		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED' || $action === 'BILL_SENTBYMAIL') {
+		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED' 
+				|| $action === 'BILL_SENTBYMAIL' || $action === 'DOWNLOAD_BILL' || $action === 'PREVIEW_BILL') {
 			$amounts=  (double) $object->total_ttc;
 		}
 		else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index 7e64bfad17f..fcad52508bd 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -18,4 +18,6 @@ logBILL_VALIDATE=Customer bill set valid from draft
 logBILL_SENTBYMAIL=Customer bill send by mail
 BlockedlogInfoDialog=Log Details
 Fingerprint=Fingerprint
-DownloadLogCSV=Download fingerprints CSV
\ No newline at end of file
+DownloadLogCSV=Download fingerprints CSV
+logPREVIEW_BILL=Preview of a validated customer bill in order to print or download
+logDOWNLOAD_BILL=Download of a validated customer bill in order to print or send
\ No newline at end of file

From c088ccea32f98ebcdec91c11f575aea60af03e21 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 18:50:31 +0200
Subject: [PATCH 1107/1163] Fix better management of export of extrafield
 computed.

---
 htdocs/compta/facture/list.php                |  96 ++++++++--------
 htdocs/core/extrafieldsinexport.inc.php       |  23 +++-
 htdocs/core/modules/DolibarrModules.class.php |  24 ++++
 htdocs/core/modules/modProjet.class.php       |  19 ++--
 htdocs/exports/class/export.class.php         |  50 +++++----
 htdocs/exports/export.php                     | 106 ++++++++++++------
 6 files changed, 198 insertions(+), 120 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 00b18c00759..cf037942324 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -213,7 +213,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter") || GETPOS
     $search_state="";
     $search_type='';
     $search_country='';
-    $search_type_thirdparty='';    
+    $search_type_thirdparty='';
     $day='';
     $year='';
     $month='';
@@ -239,17 +239,17 @@ if (empty($reshook))
 if ($massaction == 'withdrawrequest')
 {
     $langs->load("withdrawals");
-    
+
     if (!$user->rights->prelevement->bons->creer)
     {
         $error++;
         setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
     }
-    else 
+    else
     {
         //Checking error
         $error = 0;
-        	
+
 	    $arrayofselected=is_array($toselect)?$toselect:array();
         $listofbills=array();
         foreach($arrayofselected as $toselectid)
@@ -274,7 +274,7 @@ if ($massaction == 'withdrawrequest')
                     $error++;
                     setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
                 }
-                	
+
                 $rsql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
                 $rsql .= " , pfd.date_traite as date_traite";
                 $rsql .= " , pfd.amount";
@@ -291,7 +291,7 @@ if ($massaction == 'withdrawrequest')
                 {
                     $numprlv = $db->num_rows($result_sql);
                 }
-                	
+
                 if($numprlv>0){
                     $error++;
                     setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'errors');
@@ -300,7 +300,7 @@ if ($massaction == 'withdrawrequest')
                     $error++;
                     setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
                 }
-                	
+
             }
         }
 
@@ -327,13 +327,13 @@ if ($massaction == 'withdrawrequest')
             if ($nbwithdrawrequestok > 0)
             {
                 setEventMessages($langs->trans("WithdrawRequestsDone", $nbwithdrawrequestok), null, 'mesgs');
-            }   
+            }
         }
     }
 
 }
 
-    
+
 
 /*
  * View
@@ -350,7 +350,7 @@ llxHeader('',$langs->trans('CustomersInvoices'),'EN:Customers_Invoices|FR:Factur
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql.= ' f.rowid as facid, f.facnumber, f.ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.total as total_ht, f.tva as total_vat, f.total_ttc,';
+$sql.= ' f.rowid as id, f.facnumber as ref, f.ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.total as total_ht, f.tva as total_vat, f.total_ttc,';
 $sql.= ' f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,';
 $sql.= ' f.datef as df, f.date_lim_reglement as datelimite,';
 $sql.= ' f.paye as paye, f.fk_statut,';
@@ -360,7 +360,7 @@ $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name";
 // We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
 // TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
-if (! $sall) $sql.= ', SUM(pf.amount) as dynamount_payed';   
+if (! $sall) $sql.= ', SUM(pf.amount) as dynamount_payed';
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -424,7 +424,7 @@ if ($search_company) $sql .= natural_search('s.nom', $search_company);
 if ($search_montant_ht != '') $sql.= natural_search('f.total', $search_montant_ht, 1);
 if ($search_montant_vat != '') $sql.= natural_search('f.tva', $search_montant_vat, 1);
 if ($search_montant_localtax1 != '') $sql.= natural_search('f.localtax1', $search_montant_localtax1, 1);
-if ($search_montant_localtax2 != '') $sql.= natural_search('f.localtax2', $search_montant_localtax2, 1); 
+if ($search_montant_localtax2 != '') $sql.= natural_search('f.localtax2', $search_montant_localtax2, 1);
 if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
 if ($search_status != '' && $search_status >= 0)
 {
@@ -577,7 +577,7 @@ if ($resql)
 	   $langs->load("withdrawals");
 	   $arrayofmassactions['withdrawrequest']=$langs->trans("MakeWithdrawRequest");
 	}
-	if ($user->rights->facture->supprimer) 
+	if ($user->rights->facture->supprimer)
 	{
 	    //if (! empty($conf->global->STOCK_CALCULATE_ON_BILL) || empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED))
 	    if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED))
@@ -608,8 +608,8 @@ if ($resql)
 	if ($massaction == 'presend')
 	{
 		$langs->load("mails");
-		
-		if (! GETPOST('cancel')) 
+
+		if (! GETPOST('cancel'))
 		{
 			$objecttmp=new Facture($db);
 			$listofselectedid=array();
@@ -618,7 +618,7 @@ if ($resql)
 			foreach($arrayofselected as $toselectid)
 			{
 				$result=$objecttmp->fetch($toselectid);
-				if ($result > 0) 
+				if ($result > 0)
 				{
 					$listofselectedid[$toselectid]=$toselectid;
 					$thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
@@ -629,10 +629,10 @@ if ($resql)
 		}
 
 		print '<input type="hidden" name="massaction" value="confirm_presend">';
-		
+
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
-		
+
 		dol_fiche_head(null, '', '');
 
 		$topicmail="SendBillRef";
@@ -700,7 +700,7 @@ if ($resql)
 		//$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
 
 		print $formmail->get_form();
-        
+
         dol_fiche_end();
 	}
 
@@ -709,7 +709,7 @@ if ($resql)
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
-    
+
  	// If the user can view prospects other than his'
     $moreforfilter='';
  	if ($user->rights->societe->client->voir || $socid)
@@ -753,7 +753,7 @@ if ($resql)
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
     if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-    
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -788,7 +788,7 @@ if ($resql)
 		print '</td>';
 	}
 	// Date invoice
-	if (! empty($arrayfields['f.date']['checked'])) 
+	if (! empty($arrayfields['f.date']['checked']))
 	{
     	print '<td class="liste_titre" align="center">';
         if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
@@ -797,7 +797,7 @@ if ($resql)
         print '</td>';
 	}
 	// Date due
-	if (! empty($arrayfields['f.date_lim_reglement']['checked'])) 
+	if (! empty($arrayfields['f.date_lim_reglement']['checked']))
 	{
     	print '<td class="liste_titre" align="center">';
         if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
@@ -812,7 +812,7 @@ if ($resql)
 	    print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_project" value="'.$search_project.'"></td>';
 	}
 	// Thirpdarty
-	if (! empty($arrayfields['s.nom']['checked'])) 
+	if (! empty($arrayfields['s.nom']['checked']))
 	{
 	   print '<td class="liste_titre" align="left"><input class="flat" type="text" size="6" name="search_societe" value="'.$search_societe.'"></td>';
 	}
@@ -842,7 +842,7 @@ if ($resql)
 	    print '</td>';
 	}
 	// Payment mode
-	if (! empty($arrayfields['f.fk_mode_reglement']['checked'])) 
+	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
 	{
     	print '<td class="liste_titre" align="left">';
     	$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 0, 1, 10);
@@ -987,8 +987,8 @@ if ($resql)
     if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
     if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'],$_SERVER["PHP_SELF"],"fk_statut,paye,type,dynamount_payed","",$param,'align="right"',$sortfield,$sortorder);
     print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-    print "</tr>\n";    
-    
+    print "</tr>\n";
+
     if ($num > 0)
     {
         $i=0;
@@ -998,8 +998,8 @@ if ($resql)
             $obj = $db->fetch_object($resql);
 
             $datelimit=$db->jdate($obj->datelimite);
-            $facturestatic->id=$obj->facid;
-            $facturestatic->ref=$obj->facnumber;
+            $facturestatic->id=$obj->id;
+            $facturestatic->ref=$obj->ref;
             $facturestatic->type=$obj->type;
             $facturestatic->statut=$obj->fk_statut;
             $facturestatic->date_lim_reglement=$db->jdate($obj->datelimite);
@@ -1011,28 +1011,28 @@ if ($resql)
             $totaldeposits = $facturestatic->getSumDepositsUsed();
             $totalpay = $paiement + $totalcreditnotes + $totaldeposits;
             $remaintopay = $obj->total_ttc - $totalpay;
-            
+
             print '<tr class="oddeven">';
     		if (! empty($arrayfields['f.facnumber']['checked']))
     		{
                 print '<td class="nowrap">';
 
                 print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-    
+
                 print '<td class="nobordernopadding nowrap">';
                 print $facturestatic->getNomUrl(1,'',200,0,'',0,1);
                 print empty($obj->increment)?'':' ('.$obj->increment.')';
                 print '</td>';
-    
+
                 print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
-                $filename=dol_sanitizeFileName($obj->facnumber);
-                $filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($obj->facnumber);
-                $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->facid;
+                $filename=dol_sanitizeFileName($obj->ref);
+                $filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+                $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->id;
                 print $formfile->getDocumentsLink($facturestatic->element, $filename, $filedir);
     			print '</td>';
                 print '</tr>';
                 print '</table>';
-    
+
                 print "</td>\n";
     		    if (! $i) $totalarray['nbfield']++;
     		}
@@ -1089,7 +1089,7 @@ if ($resql)
     		    print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
     		// Third party
     		if (! empty($arrayfields['s.nom']['checked']))
     		{
@@ -1256,18 +1256,18 @@ if ($resql)
                 print "</td>";
                 if (! $i) $totalarray['nbfield']++;
             }
-            
+
     		// Action column
             print '<td class="nowrap" align="center">';
             if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
             {
                 $selected=0;
-        		if (in_array($obj->facid, $arrayofselected)) $selected=1;
-        		print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected?' checked="checked"':'').'>';
+        		if (in_array($obj->id, $arrayofselected)) $selected=1;
+        		print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected?' checked="checked"':'').'>';
             }
     		print '</td>' ;
     		if (! $i) $totalarray['nbfield']++;
-				
+
             print "</tr>\n";
 
             $i++;
@@ -1303,31 +1303,31 @@ if ($resql)
     		   else print '<td></td>';
     		}
     		print '</tr>';
-    		
+
     	}
     }
 
     $db->free($resql);
-	
+
 	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
 	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-    
+
 	print "</table>\n";
     print '</div>';
-    
+
     print "</form>\n";
-    
+
     if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
     {
         // Show list of available documents
         $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
         $urlsource.=str_replace('&amp;','&',$param);
-        
+
         $filedir=$diroutputmassaction;
         $genallowed=$user->rights->facture->lire;
         $delallowed=$user->rights->facture->lire;
-    
+
         print $formfile->showdocuments('massfilesarea_invoices','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
     }
     else
diff --git a/htdocs/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
index ac22841ad20..7f9cf523105 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -8,7 +8,7 @@ if (empty($keyforselect) || empty($keyforelement) || empty($keyforaliasextra))
 }
 
 // Add extra fields
-$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = '".$keyforselect."' AND type != 'separate' AND entity IN (0, ".$conf->entity.')';
+$sql="SELECT name, label, type, param, fieldcomputed, fielddefault FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = '".$keyforselect."' AND type != 'separate' AND entity IN (0, ".$conf->entity.')';
 //print $sql;
 $resql=$this->db->query($sql);
 if ($resql)    // This can fail when class is used on old database (during migration for example)
@@ -42,10 +42,23 @@ if ($resql)    // This can fail when class is used on old database (during migra
 				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
 				break;
 		}
-		if ($obj->type!='separate') {
-			$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-			$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-			$this->export_entities_array[$r][$fieldname]=$keyforelement;
+		if ($obj->type!='separate')
+		{
+		    // If not a computed field
+		    if (empty($obj->fieldcomputed))
+		    {
+    			$this->export_fields_array[$r][$fieldname]=$fieldlabel;
+    			$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
+    			$this->export_entities_array[$r][$fieldname]=$keyforelement;
+		    }
+			// If this is a computed field
+			else
+			{
+			    $this->export_fields_array[$r][$fieldname]=$fieldlabel;
+			    $this->export_TypeFields_array[$r][$fieldname]=$typeFilter.'Compute';
+			    $this->export_special_array[$r][$fieldname]=$obj->fieldcomputed;
+			    $this->export_entities_array[$r][$fieldname]=$keyforelement;
+			}
 		}
 	}
 }
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index a79f17b1fdc..37e72024e2a 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -215,6 +215,9 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      */
     public $descriptionlong;
 
+
+    // For exports
+
     /**
      * @var string Module export code
      */
@@ -225,6 +228,19 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      */
     public $export_label;
 
+    public $export_permission;
+    public $export_fields_array;
+    public $export_TypeFields_array;
+    public $export_entities_array;
+    public $export_special_array;           // special or computed field
+    public $export_dependencies_array;
+    public $export_sql_start;
+    public $export_sql_end;
+    public $export_sql_order;
+
+
+    // For import
+
     /**
      * @var string Module import code
      */
@@ -235,6 +251,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
      */
     public $import_label;
 
+
     /**
      * @var string Module constant name
      */
@@ -343,6 +360,13 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 	public $hidden = false;
 
 
+
+
+
+
+
+
+
 	/**
 	 * Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 071912e1c00..af71ccc4360 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -116,14 +116,14 @@ class modProjet extends DolibarrModules
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
-		                       
+
 		$this->const[$r][0] = "PROJECT_USE_OPPORTUNITIES";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "1";
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
-		
+
 		$this->const[$r][0] = "MAIN_DELAY_PROJECT_TO_CLOSE";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "7";
@@ -136,7 +136,7 @@ class modProjet extends DolibarrModules
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
-		
+
 		// Boxes
 		$this->boxes = array();
 		$r=0;
@@ -207,7 +207,7 @@ class modProjet extends DolibarrModules
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
 
-		
+
 		//Exports
 		//--------
 		$r=1;
@@ -240,15 +240,16 @@ class modProjet extends DolibarrModules
 		    unset($this->export_fields_array[$r]['p.opp_amount']);
 		    unset($this->export_fields_array[$r]['cls.code']);
 		}
-		
+
 		// Add fields for project
 		$this->export_fields_array[$r]=array_merge($this->export_fields_array[$r], array());
+		// Add extra fields for project
 		$keyforselect='projet'; $keyforelement='project'; $keyforaliasextra='extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		// Add fields for tasks
         $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r], array('pt.rowid'=>'RefTask','pt.label'=>'LabelTask','pt.dateo'=>"TaskDateStart",'pt.datee'=>"TaskDateEnd",'pt.duration_effective'=>"DurationEffective",'pt.planned_workload'=>"PlannedWorkload",'pt.progress'=>"Progress",'pt.description'=>"TaskDescription"));
 		$this->export_entities_array[$r]=array_merge($this->export_entities_array[$r], array('pt.rowid'=>'projecttask','pt.label'=>'projecttask','pt.dateo'=>"projecttask",'pt.datee'=>"projecttask",'pt.duration_effective'=>"projecttask",'pt.planned_workload'=>"projecttask",'pt.progress'=>"projecttask",'pt.description'=>"projecttask"));
-        // Add extra fields
+        // Add extra fields for task
 		$keyforselect='projet_task'; $keyforelement='projecttask'; $keyforaliasextra='extra2';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
         // End add extra fields
@@ -264,8 +265,8 @@ class modProjet extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task_time as ptt ON pt.rowid = ptt.fk_task";
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON p.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' WHERE p.entity = '.$conf->entity;
-		
-		
+
+
 		// Import list of tasks
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
@@ -297,7 +298,7 @@ class modProjet extends DolibarrModules
     		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
     		$this->import_regex_array[$r]=array('t.dateo'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','t.datee'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','t.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
     		$this->import_examplevalues_array[$r]=array('t.fk_projet'=>'MyProjectRef','t.ref'=>"auto or TK2010-1234",'t.label'=>"My task",'t.progress'=>"0 (not started) to 100 (finished)",'t.datec'=>'1972-10-10','t.note_private'=>"My private note",'t.note_public'=>"My public note");
-		}		
+		}
 	}
 
 
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 298950abe8e..4c9d6eaabb4 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -38,6 +38,7 @@ class Export
 	var $array_export_sql_start=array();        // Tableau des "requetes sql"
 	var $array_export_sql_end=array();          // Tableau des "requetes sql"
 	var $array_export_sql_order=array();        // Tableau des "requetes sql"
+
 	var $array_export_fields=array();           // Tableau des listes de champ+libelle a exporter
 	var $array_export_TypeFields=array();		// Tableau des listes de champ+Type de filtre
 	var $array_export_FilterValue=array();		// Tableau des listes de champ+Valeur a filtrer
@@ -45,7 +46,7 @@ class Export
 	var $array_export_dependencies=array();     // array of list of entities that must take care of the DISTINCT if a field is added into export
 	var $array_export_special=array();          // Tableau des operations speciales sur champ
     var $array_export_examplevalues=array();    // array with examples
-    
+
 	// To store export modules
 	var $hexa;
 	var $hexafiltervalue;
@@ -178,7 +179,7 @@ class Export
 									$this->array_export_special[$i]=(! empty($module->export_special_array[$r])?$module->export_special_array[$r]:'');
             						// Array of examples
             						$this->array_export_examplevalues[$i]=$module->export_examplevalues_array[$r];
-									
+
 									// Requete sql du dataset
 									$this->array_export_sql_start[$i]=$module->export_sql_start[$r];
 									$this->array_export_sql_end[$i]=$module->export_sql_end[$r];
@@ -246,7 +247,7 @@ class Export
 			}
 			$sql.=$sqlWhere;
 		}
-		
+
 		// Add the order
 		$sql.=$this->array_export_sql_order[$indice];
 
@@ -259,7 +260,7 @@ class Export
 		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql.=" HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
 		    }
 		}
-		
+
 		return $sql;
 	}
 
@@ -281,7 +282,7 @@ class Export
 				if (! (strpos($ValueField, '%') === false))
 					$szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
 				else
-					$szFilterQuery.=" ".$NameField."='".$ValueField."'";
+					$szFilterQuery.=" ".$NameField." = '".$ValueField."'";
 				break;
 			case 'Date':
 				if (strpos($ValueField, "+") > 0)
@@ -325,8 +326,12 @@ class Export
 			case 'List':
 				if (is_numeric($ValueField))
 					$szFilterQuery=" ".$NameField."=".$ValueField;
-				else
-					$szFilterQuery=" ".$NameField."='".$ValueField."'";
+				else {
+                    if (! (strpos($ValueField, '%') === false))
+                        $szFilterQuery=" ".$NameField." LIKE '".$ValueField."'";
+                    else
+                        $szFilterQuery=" ".$NameField." = '".$ValueField."'";
+				}
 				break;
 			default:
 			    dol_syslog("Error we try to forge an sql export request with a condition on a field with type '".$InfoFieldList[0]."' (defined into module descriptor) but this type is unknown/not supported. It looks like a bug into module descriptor.", LOG_ERR);
@@ -589,10 +594,8 @@ class Export
 
 				$var=true;
 
-				while ($objp = $this->db->fetch_object($resql))
+				while ($obj = $this->db->fetch_object($resql))
 				{
-					
-
 					// Process special operations
 					if (! empty($this->array_export_special[$indice]))
 					{
@@ -604,14 +607,14 @@ class Export
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($objp->$alias < 0) $objp->$alias='';
+								if ($obj->$alias < 0) $obj->$alias='';
 							}
 							// Operation ZEROIFNEG
 							elseif ($this->array_export_special[$indice][$key]=='ZEROIFNEG')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($objp->$alias < 0) $objp->$alias='0';
+								if ($obj->$alias < 0) $obj->$alias='0';
 							}
 							// Operation INVOICEREMAINTOPAY
 							elseif ($this->array_export_special[$indice][$key]=='getRemainToPay')
@@ -619,29 +622,34 @@ class Export
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias=str_replace(array('.', '-','(',')'),'_',$key);
 								$remaintopay='';
-								if ($objp->f_rowid > 0)
+								if ($obj->f_rowid > 0)
 								{
 								    global $tmpobjforcomputecall;
-								    if (! is_object($tmpobjforcomputecall)) 
+								    if (! is_object($tmpobjforcomputecall))
 								    {
 								        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 								        $tmpobjforcomputecall=new Facture($this->db);
 								    }
-								    $tmpobjforcomputecall->id = $objp->f_rowid;
-								    $tmpobjforcomputecall->total_ttc = $objp->f_total_ttc;
+								    $tmpobjforcomputecall->id = $obj->f_rowid;
+								    $tmpobjforcomputecall->total_ttc = $obj->f_total_ttc;
 								    $remaintopay=$tmpobjforcomputecall->getRemainToPay();
-								}								
-								$objp->$alias=$remaintopay;
+								}
+								$obj->$alias=$remaintopay;
 							}
 							else
 							{
-							    $this->error='Operation '.$this->array_export_special[$indice][$key].' not supported.';
+							    // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
+							    $computestring=$this->array_export_special[$indice][$key];
+							    $tmp=dol_eval($computestring, 1, 0);
+							    $obj->$alias=$tmp;
+
+							    $this->error="ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
 							    return -1;
 							}
 						}
 					}
 					// end of special operation processing
-					$objmodel->write_record($array_selected,$objp,$outputlangs,$this->array_export_TypeFields[$indice]);
+					$objmodel->write_record($array_selected,$obj,$outputlangs,$this->array_export_TypeFields[$indice]);
 				}
 
 				// Genere en-tete
@@ -732,7 +740,7 @@ class Export
 				$this->id				= $obj->rowid;
 				$this->model_name		= $obj->label;
 				$this->datatoexport		= $obj->type;
-				
+
 				$this->hexa				= $obj->field;
 				$this->hexafiltervalue	= $obj->filter;
 
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 43453041dfd..909db84fcb4 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -168,7 +168,7 @@ if ($action=='selectfield')     // Selection of field at step 2
         $warnings=array();
 
         $array_selected[$field]=count($array_selected)+1;    // We tag the key $field as "selected"
-        // We check if there is a dependency to activate 
+        // We check if there is a dependency to activate
         /*var_dump($field);
         var_dump($fieldsentitiesarray[$field]);
         var_dump($fieldsdependenciesarray);*/
@@ -187,7 +187,7 @@ if ($action=='selectfield')     // Selection of field at step 2
             if (is_array($tmp)) $listofdependencies=$tmp;
             else $listofdependencies=array($tmp);
         }
-        
+
         if (count($listofdependencies))
         {
             foreach($listofdependencies as $fieldid)
@@ -270,7 +270,7 @@ if ($action == 'builddoc')
     {
         @ini_set("max_execution_time", $max_execution_time_for_export); // This work only if safe mode is off. also web servers has timeout of 300
     }
-    
+
     // Build export file
 	$result=$objexport->build_file($user, GETPOST('model','alpha'), $datatoexport, $array_selected, $array_filtervalue);
 	if ($result < 0)
@@ -535,9 +535,9 @@ if ($step == 2 && $datatoexport)
 
     print '</table>';
     print '</div>';
-    
+
     dol_fiche_end();
-    
+
     print '<br>';
 
     // Combo list of export models
@@ -561,7 +561,7 @@ if ($step == 2 && $datatoexport)
     print '<td>'.$langs->trans("ExportableFields").'</td>';
     print '<td width="100" align="center">';
     print '<a class="liste_titre" title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field=all">'.$langs->trans("All")."</a>";
-    print '/';
+    print ' / ';
     print '<a class="liste_titre" title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field=all">'.$langs->trans("None")."</a>";
     print '</td>';
     print '<td width="44%">'.$langs->trans("ExportedFields").'</td>';
@@ -585,7 +585,7 @@ if ($step == 2 && $datatoexport)
 
     foreach($fieldsarray as $code=>$label)
     {
-        
+
         print '<tr class="oddeven">';
 
         $i++;
@@ -597,7 +597,7 @@ if ($step == 2 && $datatoexport)
         print '<td class="nowrap">';
         // If value of entityicon=entitylang='icon:Label'
         //print $code.'-'.$label.'-'.$entity;
-        
+
         $tmparray=explode(':',$entityicon);
         if (count($tmparray) >=2)
         {
@@ -606,7 +606,9 @@ if ($step == 2 && $datatoexport)
         }
         print img_object('',$entityicon).' '.$langs->trans($entitylang);
         print '</td>';
-        $text=$langs->trans($label);
+
+        $text=(empty($objexport->array_export_special[0][$code])?'':'<i>').$langs->trans($label).(empty($objexport->array_export_special[0][$code])?'':'</i>');
+
         $tablename=getablenamefromfield($code,$sqlmaxforexport);
         $htmltext ='<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
         if (! empty($objexport->array_export_special[0][$code]))
@@ -617,11 +619,16 @@ if ($step == 2 && $datatoexport)
         {
             $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
         }
-		if (! empty($objexport->array_export_examplevalues[0][$code]))
+   		if (! empty($objexport->array_export_examplevalues[0][$code]))
 		{
 		    $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
 		}
-        if (isset($array_selected[$code]) && $array_selected[$code])
+    	if (! empty($objexport->array_export_TypeFields[0][$code]))
+		{
+		    $htmltext.=$langs->trans("Type").': <b>'.$objexport->array_export_TypeFields[0][$code].'</b><br>';
+		}
+
+		if (isset($array_selected[$code]) && $array_selected[$code])
         {
             // Selected fields
             print '<td>&nbsp;</td>';
@@ -649,7 +656,7 @@ if ($step == 2 && $datatoexport)
 
     print '</table>';
 
-    
+
     /*
      * Barre d'action
      */
@@ -740,7 +747,7 @@ if ($step == 3 && $datatoexport)
 
 	print '</table>';
 	print '</div>';
-	
+
 	print '<br>';
 
 	// Combo list of export models
@@ -772,7 +779,6 @@ if ($step == 3 && $datatoexport)
 	// on boucle sur les champs
 	foreach($fieldsarray as $code => $label)
 	{
-		
 		print '<tr class="oddeven">';
 
 		$i++;
@@ -794,15 +800,27 @@ if ($step == 3 && $datatoexport)
 		// Field name
 		$labelName=(! empty($fieldsarray[$code])?$fieldsarray[$code]:'');
 		$ValueFilter=(! empty($array_filtervalue[$code])?$array_filtervalue[$code]:'');
-		$text=$langs->trans($labelName);
+		$text=(empty($objexport->array_export_special[0][$code])?'':'<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code])?'':'</i>');
 
 		$tablename=getablenamefromfield($code,$sqlmaxforexport);
 		$htmltext ='<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
-		$htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
+			if (! empty($objexport->array_export_special[0][$code]))
+		{
+		    $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+		}
+		else
+		{
+		    $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
+		}
 		if (! empty($objexport->array_export_examplevalues[0][$code]))
 		{
 		    $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
 		}
+		if (! empty($objexport->array_export_TypeFields[0][$code]))
+		{
+		    $htmltext.=$langs->trans("Type").': <b>'.$objexport->array_export_TypeFields[0][$code].'</b><br>';
+		}
+
 		print '<td>';
 		print $form->textwithpicto($text,$htmltext);
 		print '</td>';
@@ -849,7 +867,7 @@ if ($step == 4 && $datatoexport)
         header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
         exit;
     }
-    
+
     asort($array_selected);
 
     llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
@@ -937,7 +955,7 @@ if ($step == 4 && $datatoexport)
 
     print '</table>';
     print '</div>';
-    
+
     print '<br>';
 
     // Select request if all fields are selected
@@ -957,7 +975,6 @@ if ($step == 4 && $datatoexport)
     $var=true;
     foreach($array_selected as $code=>$value)
     {
-        
         print '<tr class="oddeven">';
 
         $entity=(! empty($objexport->array_export_entities[0][$code])?$objexport->array_export_entities[0][$code]:$objexport->array_export_icon[0]);
@@ -975,15 +992,30 @@ if ($step == 4 && $datatoexport)
         print img_object('',$entityicon).' '.$langs->trans($entitylang);
         print '</td>';
 
-        print '<td>';
-        $text=$langs->trans($objexport->array_export_fields[0][$code]);
+        $labelName=$objexport->array_export_fields[0][$code];
+
+		$text=(empty($objexport->array_export_special[0][$code])?'':'<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code])?'':'</i>');
+
         $tablename=getablenamefromfield($code,$sqlmaxforexport);
-        $htmltext ='<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
-        $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
-    	if (! empty($objexport->array_export_examplevalues[0][$code]))
-		{
-		    $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
-		}
+        $htmltext ='<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
+        if (! empty($objexport->array_export_special[0][$code]))
+        {
+            $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+        }
+        else
+        {
+            $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
+        }
+        if (! empty($objexport->array_export_examplevalues[0][$code]))
+        {
+            $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
+        }
+        if (! empty($objexport->array_export_TypeFields[0][$code]))
+        {
+            $htmltext.=$langs->trans("Type").': <b>'.$objexport->array_export_TypeFields[0][$code].'</b><br>';
+        }
+
+        print '<td>';
         print $form->textwithpicto($text,$htmltext);
 		//print ' ('.$code.')';
         print '</td>';
@@ -1056,7 +1088,7 @@ if ($step == 4 && $datatoexport)
 			$var=false;
 			while ($i < $num)
 			{
-				
+
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven"><td>';
 				print $obj->label;
@@ -1085,7 +1117,7 @@ if ($step == 5 && $datatoexport)
         header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
         exit;
     }
-    
+
 	asort($array_selected);
 
     llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
@@ -1135,7 +1167,7 @@ if ($step == 5 && $datatoexport)
 
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
-    
+
     print '<table width="100%" class="border">';
 
     // Module
@@ -1186,7 +1218,7 @@ if ($step == 5 && $datatoexport)
 
     print '</table>';
     print '</div>';
-    
+
     print '<br>';
 
     print $langs->trans("NowClickToGenerateToBuildExportFile").'<br>';
@@ -1210,7 +1242,7 @@ if ($step == 5 && $datatoexport)
     		unset($liste[$key]);
     	}
 
-        
+
         print '<tr class="oddeven">';
         print '<td width="16">'.img_picto_common($key,$objmodelexport->getPictoForKey($key)).'</td>';
 	    $text=$objmodelexport->getDriverDescForKey($key);
@@ -1222,7 +1254,7 @@ if ($step == 5 && $datatoexport)
 
     print '</div>';
 
-    
+
     print '<table width="100%">';
 
     if ($sqlusedforexport && $user->admin)
@@ -1233,7 +1265,7 @@ if ($step == 5 && $datatoexport)
     }
 	print '</table>';
 
-	
+
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
     if (! is_dir($conf->export->dir_temp)) dol_mkdir($conf->export->dir_temp);
@@ -1243,7 +1275,7 @@ if ($step == 5 && $datatoexport)
     print $formfile->showdocuments('export','',$upload_dir,$_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport,$liste,1,(! empty($_POST['model'])?$_POST['model']:'csv'),1,1);
 
     print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-    
+
     print '</div></div></div>';
 }
 
@@ -1265,11 +1297,11 @@ function getablenamefromfield($code,$sqlmaxforexport)
 {
 	$alias=preg_replace('/\.(.*)$/i','',$code);         // Keep only 'Alias' and remove '.Fieldname'
 	$regexstring='/([a-zA-Z_]+) as '.preg_quote($alias).'[, \)]/i';
-    
+
 	$newsql=$sqlmaxforexport;
 	$newsql=preg_replace('/^(.*) FROM /i','',$newsql);  // Remove part before the FROM
 	$newsql=preg_replace('/WHERE (.*)$/i','',$newsql);	// Remove part after the WHERE so we have now only list of table aliases in a string. We must keep the ' ' before WHERE
-	
+
 	if (preg_match($regexstring,$newsql,$reg))
 	{
 		return $reg[1];   // The tablename

From fc5dfcda6512c267575196b11ef6a1a9199f3ab3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 19:46:27 +0200
Subject: [PATCH 1108/1163] Fix error management in POS.

---
 htdocs/cashdesk/affIndex.php         |  6 +++---
 htdocs/cashdesk/css/style.css        |  8 +++++++
 htdocs/cashdesk/tpl/menu.tpl.php     |  3 ++-
 htdocs/cashdesk/validation_verif.php | 31 +++++++++++++++-------------
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php
index b5432b94eec..a2e467a35e3 100644
--- a/htdocs/cashdesk/affIndex.php
+++ b/htdocs/cashdesk/affIndex.php
@@ -27,6 +27,8 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
 require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/keypad.php';
 
+$error=GETPOST('error');
+
 // Test if already logged
 if ( $_SESSION['uid'] <= 0 )
 {
@@ -54,9 +56,7 @@ print '<body>'."\n";
 
 if (!empty($error))
 {
-	print $error;
-	print '</body></html>';
-	exit;
+	dol_htmloutput_events();
 }
 
 print '<div class="conteneur">'."\n";
diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css
index ab8d660fcf1..216f53e946b 100644
--- a/htdocs/cashdesk/css/style.css
+++ b/htdocs/cashdesk/css/style.css
@@ -106,6 +106,14 @@ p {
 	padding-right: 5px;
 }
 
+/* Force values for small screen 570 */
+@media only screen and (max-width: 570px)
+{
+	.menu_choix0 {
+		max-width: 180px;
+	}
+}
+
 .menu_choix0 a {
 	font-weight: normal;
 	text-decoration: none;
diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php
index 85de5ad9ab5..fd9bcbca77c 100644
--- a/htdocs/cashdesk/tpl/menu.tpl.php
+++ b/htdocs/cashdesk/tpl/menu.tpl.php
@@ -79,10 +79,11 @@ print '</form>';
 /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'<br>';
 print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'<br>';
 print $langs->trans("CashDeskBankCheque").': '.$bankchequeLink.'<br>';*/
+print '<div class="clearboth">';
 if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && ! empty($conf->stock->enabled) && empty($conf->global->CASHDESK_NO_DECREASE_STOCK))
 {
 	print $langs->trans("CashDeskWarehouse").': '.$warehouseLink;
 }
-print '</li></ul>';
+print '</div></li></ul>';
 print '</div>';
 print "\n".'<!-- menu.tpl.php end -->'."\n";
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index ae5d7185f40..1b870d30f73 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -32,7 +32,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 $obj_facturation = unserialize($_SESSION['serObjFacturation']);
-unset ($_SESSION['serObjFacturation']);
 
 $action =GETPOST('action','aZ09');
 $bankaccountid=GETPOST('cashdeskbank');
@@ -45,14 +44,14 @@ switch ($action)
 
 	case 'valide_achat':
 	    $thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
-	    
+
 		$company=new Societe($db);
 		$company->fetch($thirdpartyid);
 
 		$invoice=new Facture($db);
 		$invoice->date=dol_now();
 		$invoice->type= Facture::TYPE_STANDARD;
-		
+
 		// To use a specific numbering module for POS, reset $conf->global->FACTURE_ADDON and other vars here
 		// and restore values just after
 		$sav_FACTURE_ADDON='';
@@ -68,7 +67,7 @@ switch ($action)
 			// To force rule only for POS with mercure
 			//...
 		}
-		
+
 		$num=$invoice->getNextNumRef($company);
 
 		// Restore save values
@@ -76,7 +75,7 @@ switch ($action)
 		{
 			$conf->global->FACTURE_ADDON = $sav_FACTURE_ADDON;
 		}
-		
+
 		$obj_facturation->numInvoice($num);
 
 		$obj_facturation->getSetPaymentMode($_POST['hdnChoix']);
@@ -129,7 +128,7 @@ switch ($action)
 			exit;
 		}
 
-		switch ( $obj_facturation->getSetPaymentMode() )
+		switch ($obj_facturation->getSetPaymentMode() )
 		{
 			case 'DIF':
 				$mode_reglement_id = 0;
@@ -159,7 +158,6 @@ switch ($action)
 		$note .= $_POST['txtaNotes'];
 		dol_syslog("obj_facturation->getSetPaymentMode()=".$obj_facturation->getSetPaymentMode()." mode_reglement_id=".$mode_reglement_id." cond_reglement_id=".$cond_reglement_id);
 
-
 		$error=0;
 
 
@@ -255,14 +253,15 @@ switch ($action)
 			}
 			else
 			{
-				$error++;
+				setEventMessage($invoice->error, $invoice->errors, 'errors');
+			    $error++;
 			}
 
 			$id = $invoice->id;
 		}
 		else
 		{
-			$resultcreate=$invoice->create($user,0,0);
+		    $resultcreate=$invoice->create($user,0,0);
 			if ($resultcreate > 0)
 			{
 				$warehouseidtodecrease=(isset($_SESSION["CASHDESK_ID_WAREHOUSE"])?$_SESSION["CASHDESK_ID_WAREHOUSE"]:0);
@@ -287,7 +286,8 @@ switch ($action)
 							if ($invoice->type == $invoice::TYPE_CREDIT_NOTE) $result=$mouvP->reception($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos",$invoice->newref));
 							else $result=$mouvP->livraison($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos",$invoice->newref));
 							if ($result < 0) {
-								$error++;
+							    setEventMessages($mouvP->error, $mouvP->errors, 'errors');
+							    $error++;
 							}
 						}
 					}
@@ -331,15 +331,18 @@ switch ($action)
 				}
 				else
 				{
-					$error++;
+				    setEventMessages($invoice->error, $invoice->errors, 'errors');
+				    $error++;
 				}
 			}
 			else
 			{
-				$error++;
+				setEventMessages($invoice->error, $invoice->errors, 'errors');
+			    $error++;
 			}
 		}
 
+
 		if (! $error)
 		{
 			$db->commit();
@@ -348,14 +351,14 @@ switch ($action)
 		else
 		{
 			$db->rollback();
-			$redirection = 'affIndex.php?facid='.$id.'&mesg=ErrorFailedToCreateInvoice';	// Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
+			$redirection = 'affIndex.php?facid='.$id.'&error=1&mesg=ErrorFailedToCreateInvoice';	// Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
 		}
 		break;
 
 		// End of case: valide_facture
 }
 
-
+unset ($_SESSION['serObjFacturation']);
 
 $_SESSION['serObjFacturation'] = serialize($obj_facturation);
 

From a88bafe1986a5a0f5239cfdcc1e30862c2ec0c86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2017 20:07:28 +0200
Subject: [PATCH 1109/1163] Fix responsive

---
 htdocs/cashdesk/css/style.css            |  1 -
 htdocs/cashdesk/tpl/facturation1.tpl.php | 41 +++++++++++++-----------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css
index 216f53e946b..c34e8596f01 100644
--- a/htdocs/cashdesk/css/style.css
+++ b/htdocs/cashdesk/css/style.css
@@ -267,7 +267,6 @@ p.titre {
 
 /* --------------------- Combo lists ------------------- */
 .select_design {
-	width: 370px;
 	overflow: auto;
 }
 
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index fce4df22c7a..580012847f5 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -38,7 +38,7 @@ $langs->load("cashdesk");
 
 		<input type="hidden" name="hdnSource" value="NULL" />
 
-		<table>
+		<table class="center">
 			<tr><th class="label1"><?php echo $langs->trans("FilterRefOrLabelOrBC"); ?></th><th class="label1"><?php echo $langs->trans("Designation"); ?></th></tr>
 			<tr>
 			<!-- Affichage de la reference et de la designation -->
@@ -89,42 +89,32 @@ $langs->load("cashdesk");
 				</select>
 			</td>
 			</tr>
-			  <tr><td><div id="resultats_dhtml"></div></td></tr>
 		</table>
 	</form>
 
 	<form id="frmQte" class="formulaire1" method="post" action="facturation_verif.php?action=ajout_article" onsubmit ="javascript: return verifSaisie();">
 		<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
-		<table>
-			<tr><th><?php echo $langs->trans("Qty"); ?></th>
-			<th><?php echo $langs->trans("Stock"); ?></th>
+		<table class="center">
+			<tr>
+			<th><?php echo $langs->trans("Qty"); ?></th>
 			<th><?php echo $langs->trans("PriceUHT"); ?></th>
-			<th></th>
 			<th><?php echo $langs->trans("Discount"); ?> (%)</th>
-			<th><?php echo $langs->trans("TotalHT"); ?></th>
-            <th>&nbsp;</th>
             <th><?php echo $langs->trans("VATRate"); ?></th>
+			<th></th>
             </tr>
 			<tr>
 				<td><input class="texte1 maxwidth50onsmartphone" type="text" id="txtQte" name="txtQte" value="1" onkeyup="javascript: modif();" onfocus="javascript: this.select();" />
 <?php print genkeypad("txtQte", "frmQte");?>
-				</td>
-				<!-- Affichage du stock pour l'article courant -->
-				<td>
-				<input class="texte1_off maxwidth50onsmartphone" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled />
 				</td>
 				<!-- Show unit price -->
 				<?php // TODO Remove the disabled and use this value when adding product into cart ?>
 				<td><input class="texte1_off maxwidth50onsmartphone" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" onchange="javascript: modif();" disabled /></td>
-				<td></td>
     			<!-- Choix de la remise -->
     			<td><input class="texte1 maxwidth50onsmartphone" type="text" id="txtRemise" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/>
 					<?php print genkeypad("txtRemise", "frmQte");?>
     			</td>
-    			<!-- Affichage du total HT -->
-    			<td><input class="texte1_off maxwidth50onsmartphone" type="text" name="txtTotal" value="" disabled /></td><td></td>
                 <!-- Choix du taux de TVA -->
-                <td class="select_tva">
+                <td class="select_tva center">
                 <?php
 					$vatrate = $obj_facturation->vatrate;      // To get vat rate we just have selected
 
@@ -133,7 +123,20 @@ $langs->load("cashdesk");
 					echo $form->load_tva('selTva', (isset($_POST["selTva"])?GETPOST("selTva",'alpha',2):$vatrate), $mysoc, $buyer, 0, 0, '', false, -1);
 			    ?>
                 </td>
+				<td></td>
 			</tr>
+			<tr>
+				<!-- Affichage du stock pour l'article courant -->
+			<tr>
+				<td><?php echo $langs->trans("Stock"); ?></td>
+				<td>
+				<input class="texte1_off maxwidth50onsmartphone" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled />
+				</td>
+				<td><?php echo $langs->trans("TotalHT"); ?></td>
+    			<!-- Affichage du total HT -->
+    			<td colspan="2"><input class="texte1_off maxwidth50onsmartphone" type="text" name="txtTotal" value="" disabled /></td><td></td>
+			</tr>
+
 		</table>
 
 		<input class="button bouton_ajout_article" type="submit" id="sbmtEnvoyer" value="<?php echo $langs->trans("AddThisArticle"); ?>" />
@@ -149,13 +152,13 @@ $langs->load("cashdesk");
 			<tr><th class="label1"><?php echo $langs->trans("TotalTicket"); ?></th><th class="label1"><?php echo $langs->trans("Received"); ?></th><th class="label1"><?php echo $langs->trans("Change"); ?></th></tr>
 			<tr>
 			<!-- Affichage du montant du -->
-			<td><input class="texte2_off maxwidthonsmartphone" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prixTotalTtc(), 'MT'); ?>" disabled /></td>
+			<td><input class="texte2_off maxwidth100onsmartphone" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prixTotalTtc(), 'MT'); ?>" disabled /></td>
 			<!-- Choix du montant encaisse -->
-			<td><input class="texte2 maxwidthonsmartphone" type="text" id="txtEncaisse" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" />
+			<td><input class="texte2 maxwidth100onsmartphone" type="text" id="txtEncaisse" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" />
 <?php print genkeypad("txtEncaisse", "frmDifference");?>
 			</td>
 			<!-- Affichage du montant rendu -->
-			<td><input class="texte2_off maxwidthonsmartphone" type="text" name="txtRendu" value="0" disabled /></td>
+			<td><input class="texte2_off maxwidth100onsmartphone" type="text" name="txtRendu" value="0" disabled /></td>
 			</tr>
 			<tr>
 		</table>

From 50aa40da3b67077476fefb70d5fdcb23d7be7714 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 14 Jun 2017 07:40:11 +0200
Subject: [PATCH 1110/1163] Fix: error when the project module not enabled

---
 htdocs/comm/action/card.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 60486ac6f01..5e38a85898e 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
@@ -585,8 +585,6 @@ if ($action == 'mupdate')
  * View
  */
 
-$formproject=new FormProjets($db);
-
 $help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
 llxHeader('',$langs->trans("Agenda"),$help_url);
 

From 2d571bf097188e258f59725bc0b057c8ed256822 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 10:50:43 +0200
Subject: [PATCH 1111/1163] Fix bad merge

---
 htdocs/theme/md/style.css.php | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 28119a00aff..5fbd8455919 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2362,15 +2362,6 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	border-bottom-style: solid;
 
 	margin: 0px 0px 8px 0px;
-<<<<<<< HEAD
-=======
-    /*
-	-moz-box-shadow: 2px 2px 4px #CCC;
-	-webkit-box-shadow: 2px 2px 4px #CCC;
-	box-shadow: 2px 2px 4px #CCC;
-    */
-	/* box-shadow: 0 0 3px rgba(0,0,0,0.16); */
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
 
 	-moz-border-radius: 0.1em;
 	-webkit-border-radius: 0.1em;
@@ -4641,11 +4632,7 @@ border-top-right-radius: 6px;
 }
 @media only screen and (max-width: 767px)
 {
-<<<<<<< HEAD
 	.imgopensurveywizard, .imgautosize { width:95%; height: auto; }
-=======
-	.imgopensurveywizard { width:95%; height: auto; }
->>>>>>> branch '4.0' of git@github.com:Dolibarr/dolibarr.git
 
 	#tooltip {
 		position: absolute;

From b8dd7fb9588b55052a30fe8bb285d61d54fc6bf9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 10:53:04 +0200
Subject: [PATCH 1112/1163] Fix phpcs

---
 htdocs/modulebuilder/template/class/actions_mymodule.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index a3ba3baeaad..c6ebcae40e8 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -56,6 +56,8 @@ class ActionsMyModule
 
 	/**
 	 * Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{

From 1b56e4a01c244505fa4ee9881c8ce5eba3ab84dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 11:28:42 +0200
Subject: [PATCH 1113/1163] Fix look and feel v6

---
 htdocs/comm/propal/list.php                | 104 ++++++++--------
 htdocs/commande/list.php                   |   6 +-
 htdocs/compta/facture/list.php             |   8 +-
 htdocs/contrat/list.php                    |  48 ++++----
 htdocs/core/class/html.formother.class.php |  13 +-
 htdocs/core/menus/init_menu_auguria.sql    |   9 +-
 htdocs/core/menus/standard/auguria.lib.php |   2 +
 htdocs/expensereport/list.php              |  26 ++--
 htdocs/fourn/commande/list.php             | 131 ++++++++++-----------
 htdocs/fourn/facture/list.php              | 112 +++++++++---------
 htdocs/holiday/list.php                    |  12 +-
 htdocs/projet/list.php                     |   6 +-
 htdocs/projet/tasks/list.php               |   6 +-
 13 files changed, 241 insertions(+), 242 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 220422a6404..47a35ff47a1 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -161,7 +161,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
     }
 }
 
-$object = new Propal($db);	// To be passed as parameter of executeHooks that need 
+$object = new Propal($db);	// To be passed as parameter of executeHooks that need
 
 
 /*
@@ -359,12 +359,12 @@ if ($resql)
 	else
 	{
 	    $title = $langs->trans('ListOfProposals');
-	}	
+	}
 
 	$num = $db->num_rows($resql);
-	
+
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	$param='&viewstatut='.$viewstatut;
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -389,7 +389,7 @@ if ($resql)
 	    $tmpkey=preg_replace('/search_options_/','',$key);
 	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 	}
-	
+
 	// List of mass actions available
 	$arrayofmassactions =  array(
 	    'presend'=>$langs->trans("SendByMail"),
@@ -398,7 +398,7 @@ if ($resql)
 	if ($user->rights->propal->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-	
+
 	// Lignes des champs de filtre
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -408,13 +408,13 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
-	
+
 	if ($massaction == 'presend')
 	{
 	    $langs->load("mails");
-	
+
 	    if (! GETPOST('cancel'))
 	    {
 	        $objecttmp=new Propal($db);
@@ -433,17 +433,17 @@ if ($resql)
 	            }
 	        }
 	    }
-	
+
 	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-	
+
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
-	
+
 	    dol_fiche_head(null, '', '');
-	
+
 	    $topicmail="SendSupplierProposalRef";
 	    $modelmail="supplier_proposal_send";
-	
+
 	    // Cree l'objet formulaire mail
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
@@ -496,25 +496,25 @@ if ($resql)
 	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
 	    $formmail->substit['__PERSONALIZED__']='';
 	    $formmail->substit['__CONTACTCIVNAME__']='';
-	
+
 	    // Tableau des parametres complementaires du post
 	    $formmail->param['action']=$action;
 	    $formmail->param['models']=$modelmail;
 	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
 	    $formmail->param['id']=join(',',$arrayofselected);
 	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	
+
 	    print $formmail->get_form();
-	
+
 	    dol_fiche_end();
 	}
-	
+
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
-	
+
 	$i = 0;
 
 	$moreforfilter='';
@@ -525,7 +525,7 @@ if ($resql)
  		$langs->load("commercial");
 	 	$moreforfilter.='<div class="divsearchfield">';
  		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
 	 	$moreforfilter.='</div>';
  	}
 	// If the user can view prospects other than his'
@@ -533,7 +533,7 @@ if ($resql)
 	{
 	 	$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 	    $moreforfilter.='</div>';
 	}
 	// If the user can view products
@@ -550,7 +550,7 @@ if ($resql)
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
-	
+
 	if (! empty($moreforfilter))
 	{
         print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -561,12 +561,12 @@ if ($resql)
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
     if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-    
+
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
-	if (! empty($arrayfields['p.ref']['checked']))            
+	if (! empty($arrayfields['p.ref']['checked']))
 	{
 	    print '<td class="liste_titre">';
     	print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
@@ -608,7 +608,7 @@ if ($resql)
     	print '</td>';
     }
 	// Date
-	if (! empty($arrayfields['p.date']['checked'])) 
+	if (! empty($arrayfields['p.date']['checked']))
 	{
 	    print '<td class="liste_titre" colspan="1" align="center">';
     	//print $langs->trans('Month').': ';
@@ -620,7 +620,7 @@ if ($resql)
     	print '</td>';
 	}
 	// Date end
-	if (! empty($arrayfields['p.fin_validite']['checked'])) 
+	if (! empty($arrayfields['p.fin_validite']['checked']))
 	{
 	   print '<td class="liste_titre" colspan="1">&nbsp;</td>';
 	}
@@ -703,10 +703,10 @@ if ($resql)
 	$searchpicto=$form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
-	
+
 	print "</tr>\n";
 
-	
+
 	// Fields title
 	print '<tr class="liste_titre">';
 	if (! empty($arrayfields['p.ref']['checked']))            print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder);
@@ -726,9 +726,9 @@ if ($resql)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
 				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -744,24 +744,24 @@ if ($resql)
 	if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print '</tr>'."\n";
-	
+
 	$now = dol_now();
 	$i=0;
 	$totalarray=array();
 	while ($i < min($num,$limit))
 	{
 		$obj = $db->fetch_object($resql);
-		
-		
+
+
     	$objectstatic->id=$obj->rowid;
     	$objectstatic->ref=$obj->ref;
-    		
+
 		print '<tr class="oddeven">';
-		
+
 		if (! empty($arrayfields['p.ref']['checked']))
 		{
     		print '<td class="nowrap">';
-    
+
     		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
             // Picto + Ref
     		print '<td class="nobordernopadding nowrap">';
@@ -790,11 +790,11 @@ if ($resql)
     		$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
     		print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
     		print '</td></tr></table>';
-    
+
     		print "</td>\n";
     		if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		if (! empty($arrayfields['p.ref_client']['checked']))
 		{
     		// Customer ref
@@ -803,12 +803,12 @@ if ($resql)
     		print '</td>';
     		if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		$companystatic->id=$obj->socid;
 		$companystatic->name=$obj->name;
 		$companystatic->client=$obj->client;
 		$companystatic->code_client=$obj->code_client;
-		
+
 		// Thirdparty
 		if (! empty($arrayfields['s.nom']['checked']))
 		{
@@ -817,7 +817,7 @@ if ($resql)
     		print '</td>';
     		if (! $i) $totalarray['nbfield']++;
 		}
-		
+
 		// Town
         if (! empty($arrayfields['s.town']['checked']))
         {
@@ -858,7 +858,7 @@ if ($resql)
             print '</td>';
             if (! $i) $totalarray['nbfield']++;
         }
-        
+
 		// Date proposal
         if (! empty($arrayfields['p.date']['checked']))
         {
@@ -867,7 +867,7 @@ if ($resql)
     		print "</td>\n";
     		if (! $i) $totalarray['nbfield']++;
         }
-        
+
 		// Date end validity
         if (! empty($arrayfields['p.fin_validite']['checked']))
         {
@@ -882,7 +882,7 @@ if ($resql)
     		}
     		if (! $i) $totalarray['nbfield']++;
         }
-        
+
         // Amount HT
         if (! empty($arrayfields['p.total_ht']['checked']))
         {
@@ -907,7 +907,7 @@ if ($resql)
 		    if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
 		    $totalarray['totalttc'] += $obj->total_ttc;
         }
-        
+
         $userstatic->id=$obj->fk_user_author;
 		$userstatic->login=$obj->login;
 
@@ -920,7 +920,7 @@ if ($resql)
     		print "</td>\n";
     		if (! $i) $totalarray['nbfield']++;
         }
-        
+
         // Extra fields
         if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
         {
@@ -1008,16 +1008,16 @@ if ($resql)
 	}
 
 	$db->free($resql);
-	
+
 	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
 	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-				
+
 	print '</table>'."\n";
     print '</div>'."\n";
 
 	print '</form>'."\n";
-	
+
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
 	{
 	    /*
@@ -1025,18 +1025,18 @@ if ($resql)
 	     */
 	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	    $urlsource.=str_replace('&amp;','&',$param);
-	
+
 	    $filedir=$diroutputmassaction;
 	    $genallowed=$user->rights->propal->lire;
 	    $delallowed=$user->rights->propal->lire;
-	
+
 	    print $formfile->showdocuments('massfilesarea_proposals','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,'','');
 	}
 	else
 	{
 	    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
 	}
-	
+
 }
 else
 {
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index c49c1b18a4a..daefc3c4cce 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -803,7 +803,7 @@ if ($resql)
  		$langs->load("commercial");
 		$moreforfilter.='<div class="divsearchfield">';
  		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
 	 	$moreforfilter.='</div>';
  	}
 	// If the user can view other users
@@ -811,7 +811,7 @@ if ($resql)
 	{
 		$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 	 	$moreforfilter.='</div>';
 	}
 	// If the user can view prospects other than his'
@@ -821,7 +821,7 @@ if ($resql)
 		$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, '', 1);
+		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter.='</div>';
 	}
 	$parameters=array();
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index cf037942324..2716e3a87b1 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -191,7 +191,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Do we click on purge search criteria ?
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter") || GETPOST("button_removefilter.x")) // Both test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter") || GETPOST("button_removefilter.x")) // All tests are required to be compatible with all browsers
 {
     $search_user='';
     $search_sale='';
@@ -717,7 +717,7 @@ if ($resql)
  		$langs->load("commercial");
  		$moreforfilter.='<div class="divsearchfield">';
  		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
 	 	$moreforfilter.='</div>';
  	}
     // If the user can view prospects other than his'
@@ -725,7 +725,7 @@ if ($resql)
     {
 		$moreforfilter.='<div class="divsearchfield">';
     	$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 	 	$moreforfilter.='</div>';
     }
 	// If the user can view prospects other than his'
@@ -735,7 +735,7 @@ if ($resql)
 		$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, '', 1);
+		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter.='</div>';
 	}
     $parameters=array();
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 29e13412892..a82535bfbb7 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -305,7 +305,7 @@ if ($resql)
     $i = 0;
 
     $arrayofselected=is_array($toselect)?$toselect:array();
-    
+
     $param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
     if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -323,7 +323,7 @@ if ($resql)
         $tmpkey=preg_replace('/search_options_/','',$key);
         if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
     }
-    
+
     // List of mass actions available
     $arrayofmassactions =  array(
         //'presend'=>$langs->trans("SendByMail"),
@@ -332,7 +332,7 @@ if ($resql)
     if ($user->rights->contrat->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
     if ($massaction == 'presend') $arrayofmassactions=array();
     $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-    
+
     print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -341,7 +341,7 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	
+
     print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'title_commercial.png', 0, '', '', $limit);
 
 	if ($sall)
@@ -349,16 +349,16 @@ if ($resql)
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
-    
+
     $moreforfilter='';
-    
+
     // If the user can view prospects other than his'
     if ($user->rights->societe->client->voir || $socid)
     {
     	$langs->load("commercial");
     	$moreforfilter.='<div class="divsearchfield">';
     	$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-    	$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user,0,1,'maxwidth300');
+    	$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user,0,1,'maxwidth200');
     	$moreforfilter.='</div>';
     }
 	// If the user can view other users
@@ -366,7 +366,7 @@ if ($resql)
 	{
 		$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 	 	$moreforfilter.='</div>';
 	}
 	// If the user can view categories of products
@@ -376,15 +376,15 @@ if ($resql)
 		$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, '', 1);
+		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter.='</div>';
 	}
-    
+
     $parameters=array();
     $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
-    
+
     if (! empty($moreforfilter))
     {
         print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -395,7 +395,7 @@ if ($resql)
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
 	if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-    
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -514,7 +514,7 @@ if ($resql)
     print $searchpicto;
     print '</td>';
     print "</tr>\n";
-    
+
     print '<tr class="liste_titre">';
     if (! empty($arrayfields['c.ref']['checked']))               print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref","","$param",'',$sortfield,$sortorder);
     if (! empty($arrayfields['c.ref_customer']['checked']))      print_liste_field_titre($arrayfields['c.ref_customer']['label'], $_SERVER["PHP_SELF"], "c.ref_customer","","$param",'',$sortfield,$sortorder);
@@ -530,9 +530,9 @@ if ($resql)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-           if (! empty($arrayfields["ef.".$key]['checked'])) 
+           if (! empty($arrayfields["ef.".$key]['checked']))
            {
 				$align=$extrafields->getAlignFlag($key);
 				print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -558,12 +558,12 @@ if ($resql)
     while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($resql);
-        
+
         $contracttmp->ref=$obj->ref;
         $contracttmp->id=$obj->rowid;
         $contracttmp->ref_customer=$obj->ref_customer;
         $contracttmp->ref_supplier=$obj->ref_supplier;
-        
+
         print '<tr class="oddeven">';
         if (! empty($arrayfields['c.ref']['checked']))
         {
@@ -578,15 +578,15 @@ if ($resql)
             }
             print '</td>';
         }
-        if (! empty($arrayfields['c.ref_customer']['checked'])) 
+        if (! empty($arrayfields['c.ref_customer']['checked']))
         {
             print '<td>'.$obj->ref_customer.'</td>';
         }
-        if (! empty($arrayfields['c.ref_supplier']['checked'])) 
+        if (! empty($arrayfields['c.ref_supplier']['checked']))
         {
             print '<td>'.$obj->ref_supplier.'</td>';
         }
-        if (! empty($arrayfields['s.nom']['checked'])) 
+        if (! empty($arrayfields['s.nom']['checked']))
         {
             print '<td><a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
         }
@@ -629,7 +629,7 @@ if ($resql)
             print $typenArray[$obj->typent_code];
             print '</td>';
             if (! $i) $totalarray['nbfield']++;
-        }        
+        }
         if (! empty($arrayfields['sale_representative']['checked']))
         {
             // Sales representatives
@@ -713,7 +713,7 @@ if ($resql)
             if (! $i) $totalarray['nbfield']++;
         }
         // Status
-        if (! empty($arrayfields['status']['checked'])) 
+        if (! empty($arrayfields['status']['checked']))
         {
             print '<td align="center">'.($obj->nb_initial>0?$obj->nb_initial:'').'</td>';
             print '<td align="center">'.($obj->nb_running>0?$obj->nb_running:'').'</td>';
@@ -730,7 +730,7 @@ if ($resql)
         }
         print '</td>';
         if (! $i) $totalarray['nbfield']++;
-        
+
         print "</tr>\n";
         $i++;
     }
@@ -738,7 +738,7 @@ if ($resql)
 
     print '</table>';
     print '</div>';
-    
+
     print '</form>';
 }
 else
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index c5344ab467a..5af4024f9c2 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -309,10 +309,11 @@ class FormOther
      * @param   string	$htmlname      	Name of combo list
      * @param	int		$nocateg		Show also an entry "Not categorized"
      * @param   int     $showempty      Add also an empty line
-     * @return string		        	Html combo list code
+     * @param   string  $morecss        More CSS
+     * @return  string		        	Html combo list code
      * @see	select_all_categories
      */
-    function select_categories($type,$selected=0,$htmlname='search_categ',$nocateg=0,$showempty=1)
+    function select_categories($type, $selected=0, $htmlname='search_categ', $nocateg=0, $showempty=1, $morecss='')
     {
         global $conf, $langs;
         require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
@@ -328,18 +329,16 @@ class FormOther
         $tab_categs = $static_categs->get_full_arbo($type);
 
         $moreforfilter = '';
-        $nodatarole = '';
         // Enhance with select2
         if ($conf->use_javascript_ajax)
         {
             include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
             $comboenhancement = ajax_combobox('select_categ_'.$htmlname);
             $moreforfilter.=$comboenhancement;
-            $nodatarole=($comboenhancement?' data-role="none"':'');
         }
 
         // Print a select with each of them
-        $moreforfilter.='<select class="flat minwidth100" id="select_categ_'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
+        $moreforfilter.='<select class="flat minwidth100'.($morecss?' '.$morecss:'').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
         if ($showempty) $moreforfilter.='<option value="0">&nbsp;</option>';	// Should use -1 to say nothing
 
         if (is_array($tab_categs))
@@ -379,7 +378,6 @@ class FormOther
         $langs->load('users');
 
         $out = '';
-        $nodatarole = '';
         // Enhance with select2
         if ($conf->use_javascript_ajax)
         {
@@ -389,11 +387,10 @@ class FormOther
             if ($comboenhancement)
             {
             	$out.=$comboenhancement;
-            	$nodatarole=($comboenhancement?' data-role="none"':'');
             }
         }
         // Select each sales and print them in a select input
-        $out.='<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
+        $out.='<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
         if ($showempty) $out.='<option value="0">&nbsp;</option>';
 
         // Get list of users allowed to be viewed
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 6115b6cff0d..c1de978d2df 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -166,8 +166,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 -- Accountancy - Supplier invoice
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1600__+MAX_llx_menu__, 'accountancy', 'supplier_bills', 6__+MAX_llx_menu__, '/fourn/facture/list.php?leftmenu=suppliers_bills', 'BillsSuppliers', 0, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1601__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills', 'NewBill', 1, 'bills', '$user->rights->fournisseur->facture->creer', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1602__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/impayees.php?leftmenu=suppliers_bills', 'Unpaid', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1602__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/list.php?leftmenu=suppliers_bills', 'List', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1603__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/paiement.php?leftmenu=suppliers_bills', 'Payments', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1605__+MAX_llx_menu__, 'accountancy', '', 1603__+MAX_llx_menu__, '/fourn/facture/rapport.php?leftmenu=suppliers_bills', 'Reporting', 2, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1604__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier', 'Statistics', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 8, __ENTITY__);
 -- Accountancy - Customer invoice
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1700__+MAX_llx_menu__, 'accountancy', 'customer_bills', 6__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills', 'BillsCustomers', 0, 'bills', '$user->rights->facture->lire', '', 2, 3, __ENTITY__);
@@ -275,9 +276,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2603__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/bankentries.php?leftmenu=bank', 'ListTransactions', 1, 'banks', '$user->rights->banque->lire', '', 0, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2604__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/budget.php?leftmenu=bank', 'ListTransactionsByCategory', 1, 'banks', '$user->rights->banque->lire', '', 0, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2606__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/transfer.php?leftmenu=bank', 'BankTransfers', 1, 'banks', '$user->rights->banque->transfer', '', 0, 5, __ENTITY__);
--- Account - Categories
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 2650__+MAX_llx_menu__, 'accountancy', 'cat', 14__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=5', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 2651__+MAX_llx_menu__, 'accountancy', '', 2650__+MAX_llx_menu__, '/categories/card.php?action=create&amp;type=5', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
+-- Bank - Categories
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 2650__+MAX_llx_menu__, 'accountancy', 'cat', 14__+MAX_llx_menu__, '/categories/index.php?leftmenu=bank&amp;type=5', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 2651__+MAX_llx_menu__, 'accountancy', '', 2650__+MAX_llx_menu__, '/categories/card.php?leftmenu=bank&amp;action=create&amp;type=5', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
 -- Project
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3600__+MAX_llx_menu__, 'project', 'projects', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects', 'Projects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/card.php?leftmenu=projects&amp;action=create', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 21761216f65..bbe41dbab10 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -300,6 +300,8 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 	// We update newmenu for special dynamic menus
 	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank')	// Entry for each bank account
 	{
+	    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';     // Required for to get Account::TYPE_CASH for example
+
 		$sql = "SELECT rowid, label, courant, rappro, courant";
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
 		$sql.= " WHERE entity = ".$conf->entity;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 8a8014edcb6..bbf2266ab13 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -127,7 +127,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 
 
 /*
- * Actions 
+ * Actions
  */
 
 if (GETPOST('cancel')) { $action='list'; $massaction=''; }
@@ -320,7 +320,7 @@ if ($resql)
 
 	$title = $langs->trans("ListTripsAndExpenses");
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
-	
+
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
@@ -333,7 +333,7 @@ if ($resql)
 	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 	else $moreforfilter = $hookmanager->resPrint;
-	
+
 	if (! empty($moreforfilter))
 	{
 	    print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -344,10 +344,10 @@ if ($resql)
 	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
 	if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-	
+
     print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-	
+
 	// Filters
 	print '<tr class="liste_titre_filter">';
 	if (! empty($arrayfields['d.ref']['checked']))
@@ -362,7 +362,7 @@ if ($resql)
         if ($user->rights->expensereport->readall || $user->rights->expensereport->lire_tous)
     	{
     		print '<td class="liste_titre maxwidthonspartphone" align="left">';
-    		print $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+    		print $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
     		print '</td>';
     	} else {
     		print '<td class="liste_titre">&nbsp;</td>';
@@ -452,7 +452,7 @@ if ($resql)
 	{
 	    print '<td class="liste_titre">';
 	    print '</td>';
-	}	
+	}
 	// Status
 	if (! empty($arrayfields['d.fk_statut']['checked']))
 	{
@@ -498,7 +498,7 @@ if ($resql)
 	if (! empty($arrayfields['d.tms']['checked']))       print_liste_field_titre($arrayfields['d.tms']['label'],$_SERVER["PHP_SELF"],"d.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['d.fk_statut']['checked'])) print_liste_field_titre($arrayfields['d.fk_statut']['label'],$_SERVER["PHP_SELF"],"d.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";	
+	print "</tr>\n";
 
 	$total_total_ht = 0;
 	$total_total_ttc = 0;
@@ -527,8 +527,8 @@ if ($resql)
 			$expensereportstatic->date_approve=$db->jdate($obj->date_approve);
 			$expensereportstatic->note_private=$obj->note_private;
 			$expensereportstatic->note_public=$obj->note_public;
-				
-			
+
+
 			print '<tr class="oddeven">';
 			// Ref
 			if (! empty($arrayfields['d.ref']['checked'])) {
@@ -615,7 +615,7 @@ if ($resql)
     		    if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
     		    $totalarray['totalttc'] += $obj->total_ttc;
             }
-    		
+
             // Extra fields
             if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
             {
@@ -723,11 +723,11 @@ if ($resql)
 	    // Show list of available documents
 	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	    $urlsource.=str_replace('&amp;','&',$param);
-	
+
 	    $filedir=$diroutputmassaction;
 	    $genallowed=$user->rights->expensereport->lire;
 	    $delallowed=$user->rights->expensereport->lire;
-	
+
 	    print $formfile->showdocuments('massfilesarea_expensereport','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
 	}
 	else
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 9e8d841e976..bafdeeab4db 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -218,7 +218,7 @@ if (empty($reshook))
         $toselect='';
     	$search_project_ref='';
         $search_array_options=array();
-    
+
         // Mass actions
         $objectclass='Commande';
         $objectlabel='Orders';
@@ -235,54 +235,54 @@ if (empty($reshook))
     $permtodelete = $user->rights->fournisseur->commande->supprimer;
     $uploaddir = $conf->fournisseur->commande->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-    
+
     // TODO Move this into mass action include
-    if ($massaction == 'confirm_createbills') 
+    if ($massaction == 'confirm_createbills')
     {
         $orders = GETPOST('toselect');
         $createbills_onebythird = GETPOST('createbills_onebythird', 'int');
         $validate_invoices = GETPOST('valdate_invoices', 'int');
-         
+
         $TFact = array();
         $TFactThird = array();
-         
+
         $nb_bills_created = 0;
-         
+
         $db->begin();
-         
+
         foreach($orders as $id_order) {
-    
+
             $cmd = new Commande($db);
             if($cmd->fetch($id_order) <= 0) continue;
-    
+
             $object = new Facture($db);
             if(!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $object = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
             else {
-                 
+
                 $object->socid = $cmd->socid;
                 $object->type = Facture::TYPE_STANDARD;
                 $object->cond_reglement_id	= $cmd->cond_reglement_id;
                 $object->mode_reglement_id	= $cmd->mode_reglement_id;
                 $object->fk_project			= $cmd->fk_project;
-                 
+
                 $datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
                 if (empty($datefacture))
                 {
                     $datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
                 }
-                 
+
                 $object->date = $datefacture;
                 $object->origin    = 'commande';
                 $object->origin_id = $id_order;
-                 
+
                 $res = $object->create($user);
-                 
+
                 if($res > 0) $nb_bills_created++;
-                 
+
             }
-    
+
             if($object->id > 0) {
-                 
+
                 $db->begin();
                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
                 $sql.= "fk_source";
@@ -295,7 +295,7 @@ if (empty($reshook))
                 $sql.= ", ".$object->id;
                 $sql.= ", '".$object->element."'";
                 $sql.= ")";
-    
+
                 if ($db->query($sql))
                 {
                     $db->commit();
@@ -304,17 +304,17 @@ if (empty($reshook))
                 {
                     $db->rollback();
                 }
-                 
+
                 $lines = $cmd->lines;
                 if (empty($lines) && method_exists($cmd, 'fetch_lines'))
                 {
                     $cmd->fetch_lines();
                     $lines = $cmd->lines;
                 }
-                 
+
                 $fk_parent_line=0;
                 $num=count($lines);
-                 
+
                 for ($i=0;$i<$num;$i++)
                 {
                     $desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
@@ -404,42 +404,42 @@ if (empty($reshook))
                         }
                     }
                 }
-                 
+
             }
-             
+
             $cmd->classifyBilled($user);
-    
+
             if(!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $object;
             else $TFact[$object->id] = $object;
         }
-         
+
         // Build doc with all invoices
         $TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
         $toselect = array();
-         
+
         if(!empty($validate_invoices)) {
-    
+
             $massaction = $action = 'builddoc';
-    
+
             foreach($TAllFact as &$object) {
                 $object->validate($user);
                 $toselect[] = $object->id; // For builddoc action
-                 
+
                 // Fac builddoc
                 $upload_dir = $conf->facture->dir_output;
                 $permissioncreate=$user->rights->facture->creer;
                 include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
             }
-    
+
             $objectclass='Facture';
             $objectlabel='Invoice';
             $permtoread = $user->rights->facture->lire;
             $permtodelete = $user->rights->facture->supprimer;
             $uploaddir = $conf->facture->dir_output;
             include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-    
+
         }
-         
+
         if (! $error)
         {
             $db->commit();
@@ -537,12 +537,11 @@ if ($billed != '' && $billed >= 0) $sql .= " AND cf.billed = ".$billed;
 //Required triple check because statut=0 means draft filter
 if (GETPOST('statut', 'alpha') !== '')
 {
-	$sql .= " AND cf.fk_statut IN (".GETPOST('statut', 'alpha').")";
+	$sql .= " AND cf.fk_statut IN (".$db->escape(GETPOST('statut', 'alpha')).")";
 }
 if ($search_status != '' && $search_status >= 0)
 {
-	if (strstr($search_status, ',')) $sql.=" AND cf.fk_statut IN (".$db->escape($search_status).")";
-	else $sql.=" AND cf.fk_statut = ".$search_status;
+	$sql.=" AND cf.fk_statut IN (".$db->escape($search_status).")";
 }
 if ($ordermonth > 0)
 {
@@ -573,11 +572,11 @@ else if ($deliveryyear > 0)
 if ($search_town)  $sql.= natural_search('s.town', $search_town);
 if ($search_zip)   $sql.= natural_search("s.zip",$search_zip);
 if ($search_state) $sql.= natural_search("state.nom",$search_state);
-if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+if ($search_country) $sql .= " AND s.fk_pays IN (".$db->escape($search_country).')';
+if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->escape($search_type_thirdparty).')';
 if ($search_company) $sql .= natural_search('s.nom', $search_company);
-if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
-if ($search_user > 0) $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='supplier_order' AND tc.source='internal' AND ec.element_id = cf.rowid AND ec.fk_socpeople = ".$search_user;
+if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$db->escape($search_sale);
+if ($search_user > 0) $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='supplier_order' AND tc.source='internal' AND ec.element_id = cf.rowid AND ec.fk_socpeople = ".$db->escape($search_user);
 if ($search_total_ht != '') $sql.= natural_search('cf.total_ht', $search_total_ht, 1);
 if ($search_total_vat != '') $sql.= natural_search('cf.tva', $search_total_vat, 1);
 if ($search_total_ttc != '') $sql.= natural_search('cf.total_ttc', $search_total_ttc, 1);
@@ -629,7 +628,7 @@ if ($resql)
 	$num = $db->num_rows($resql);
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	$param='';
 	if ($socid > 0)             $param.='&socid='.$socid;
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
@@ -670,7 +669,7 @@ if ($resql)
 	if ($user->rights->fournisseur->commande->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-	
+
 	// Lignes des champs de filtre
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -688,7 +687,7 @@ if ($resql)
 	if ($massaction == 'presend')
 	{
 	    $langs->load("mails");
-	
+
 	    if (! GETPOST('cancel'))
 	    {
 	        $objecttmp=new CommandeFournisseur($db);
@@ -707,23 +706,23 @@ if ($resql)
 	            }
 	        }
 	    }
-	
+
 	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-	
+
 	    dol_fiche_head(null, '', '');
-	
+
 	    $topicmail="SendOrderRef";
 	    $modelmail="order_send";
-	
+
 	    // Cree l'objet formulaire mail
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
 	    $formmail->withform=-1;
 	    $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-	
+
 	    if($formmail->fromtype === 'user'){
 	        $formmail->fromid = $user->id;
-	
+
 	    }
 	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
 	    {
@@ -767,23 +766,23 @@ if ($resql)
 	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
 	    $formmail->substit['__PERSONALIZED__']='';
 	    $formmail->substit['__CONTACTCIVNAME__']='';
-	
+
 	    // Tableau des parametres complementaires du post
 	    $formmail->param['action']=$action;
 	    $formmail->param['models']=$modelmail;
 	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
 	    $formmail->param['id']=join(',',$arrayofselected);
 	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	
+
 	    print $formmail->get_form();
-	
+
 	    dol_fiche_end();
 	}
 	elseif ($massaction == 'createbills')
 	{
 	    //var_dump($_REQUEST);
 	    print '<input type="hidden" name="massaction" value="confirm_createbills">';
-	
+
 	    print '<table class="border" width="100%" >';
 	    print '<tr>';
 	    print '<td class="titlefieldmiddle">';
@@ -810,7 +809,7 @@ if ($resql)
 	    print '</td>';
 	    print '</tr>';
 	    print '</table>';
-	
+
 	    print '<br>';
 	    print '<div class="center">';
 	    print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
@@ -818,7 +817,7 @@ if ($resql)
 	    print '</div>';
 	    print '<br>';
 	}
-	
+
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
@@ -833,7 +832,7 @@ if ($resql)
         $langs->load("commercial");
         $moreforfilter.='<div class="divsearchfield">';
         $moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-        $moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+        $moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
         $moreforfilter.='</div>';
     }
     // If the user can view other users
@@ -841,7 +840,7 @@ if ($resql)
     {
         $moreforfilter.='<div class="divsearchfield">';
         $moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
         $moreforfilter.='</div>';
     }
     // If the user can view prospects other than his'
@@ -851,14 +850,14 @@ if ($resql)
         $moreforfilter.='<div class="divsearchfield">';
         $moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
         $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-        $moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, '', 1);
+        $moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
         $moreforfilter.='</div>';
     }
     $parameters=array();
     $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
     if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
     else $moreforfilter = $hookmanager->resPrint;
-    
+
     if (! empty($moreforfilter))
     {
         print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -1065,8 +1064,8 @@ if ($resql)
 	if (! empty($arrayfields['cf.billed']['checked']))    print_liste_field_titre($arrayfields['cf.billed']['label'],$_SERVER["PHP_SELF"],'cf.billed','',$param,'align="center"',$sortfield,$sortorder,'');
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
-	
-	
+
+
 	$total=0;
 	$subtotal=0;
     $productstat_cache=array();
@@ -1081,7 +1080,7 @@ if ($resql)
 	while ($i < min($num,$limit))
 	{
 		$obj = $db->fetch_object($resql);
-		
+
 
         $objectstatic->id=$obj->rowid;
         $objectstatic->ref=$obj->ref;
@@ -1098,7 +1097,7 @@ if ($resql)
         if (! empty($arrayfields['cf.ref']['checked']))
         {
             print '<td class="nowrap">';
-            
+
             print '<table class="nobordernopadding"><tr class="nocellnopadd">';
             // Picto + Ref
             print '<td class="nobordernopadding nowrap">';
@@ -1113,7 +1112,7 @@ if ($resql)
 			$filedir=$conf->fournisseur->dir_output.'/commande' . '/' . dol_sanitizeFileName($obj->ref);
 			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
 			print '</td></tr></table>';
-			
+
 			print '</td>'."\n";
             if (! $i) $totalarray['nbfield']++;
         }
@@ -1319,18 +1318,18 @@ if ($resql)
 	     */
 	    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	    $urlsource.=str_replace('&amp;','&',$param);
-	
+
 	    $filedir=$diroutputmassaction;
 	    $genallowed=$user->rights->fournisseur->commande->lire;
 	    $delallowed=$user->rights->fournisseur->commande->lire;
-	
+
 	    print $formfile->showdocuments('massfilesarea_supplier_order','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
 	}
 	else
 	{
 	    print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
 	}
-	
+
 	$db->free($resql);
 }
 else
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 0e19c73615b..30d31c0ea02 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -193,7 +193,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook))
 {
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-    
+
     if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter") || GETPOST("button_removefilter.x"))		// All test must be present to be compatible with all browsers
     {
         $search_all="";
@@ -232,7 +232,7 @@ if (empty($reshook))
         $filter='';
         $option='';
     }
-    
+
     // Mass actions
     $objectclass='FactureFournisseur';
     $objectlabel='SupplierInvoices';
@@ -242,7 +242,7 @@ if (empty($reshook))
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
-    
+
 /*
  * View
  */
@@ -267,7 +267,7 @@ $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= " p.rowid as project_id, p.ref as project_ref";
 // We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
 // TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
-if (! $search_all) $sql.= ', SUM(pf.amount) as dynamount_payed';   
+if (! $search_all) $sql.= ', SUM(pf.amount) as dynamount_payed';
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -396,7 +396,7 @@ if (! $search_all)
     foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by
     {
         $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
-    }   
+    }
 }
 else
 {
@@ -421,7 +421,7 @@ if ($resql)
 	$num = $db->num_rows($resql);
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
-	
+
 	if ($socid)
 	{
 		$soc = new Societe($db);
@@ -460,7 +460,7 @@ if ($resql)
 	    $tmpkey=preg_replace('/search_options_/','',$key);
 	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
 	}
-	
+
 	// List of mass actions available
 	$arrayofmassactions =  array(
 	    //'presend'=>$langs->trans("SendByMail"),
@@ -470,7 +470,7 @@ if ($resql)
 	if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	//if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-	
+
 	$i = 0;
 	print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -484,11 +484,11 @@ if ($resql)
 	print '<input type="hidden" name="socid" value="'.$socid.'">';
 
 	print_barre_liste($langs->trans("BillsSuppliers").($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
-	
+
 	if ($massaction == 'presend')
 	{
 	    $langs->load("mails");
-	
+
 	    if (! GETPOST('cancel'))
 	    {
 	        $objecttmp=new FactureFourn($db);
@@ -507,26 +507,26 @@ if ($resql)
 	            }
 	        }
 	    }
-	
+
 	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-	
+
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
-	
+
 	    dol_fiche_head(null, '', '');
-	
+
 	    $topicmail="SendBillRef";
 	    $modelmail="supplier_invoice_send";
-	
+
 	    // Cree l'objet formulaire mail
 	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	    $formmail = new FormMail($db);
 	    $formmail->withform=-1;
 	    $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-	
+
 	    if($formmail->fromtype === 'user'){
 	        $formmail->fromid = $user->id;
-	
+
 	    }
 	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
 	    {
@@ -570,23 +570,23 @@ if ($resql)
 	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
 	    $formmail->substit['__PERSONALIZED__']='';
 	    $formmail->substit['__CONTACTCIVNAME__']='';
-	
+
 	    // Tableau des parametres complementaires du post
 	    $formmail->param['action']=$action;
 	    $formmail->param['models']=$modelmail;
 	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
 	    $formmail->param['id']=join(',',$arrayofselected);
 	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	
+
 	    print $formmail->get_form();
-	
+
 	    dol_fiche_end();
 	}
 	elseif ($massaction == 'createbills')
 	{
 	    //var_dump($_REQUEST);
 	    print '<input type="hidden" name="massaction" value="confirm_createbills">';
-	
+
 	    print '<table class="border" width="100%" >';
 	    print '<tr>';
 	    print '<td class="titlefieldmiddle">';
@@ -613,7 +613,7 @@ if ($resql)
 	    print '</td>';
 	    print '</tr>';
 	    print '</table>';
-	
+
 	    print '<br>';
 	    print '<div class="center">';
 	    print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
@@ -621,13 +621,13 @@ if ($resql)
 	    print '</div>';
 	    print '<br>';
 	}
-	
+
 	if ($search_all)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
     }
-    
+
  	// If the user can view prospects other than his'
     $moreforfilter='';
  	if ($user->rights->societe->client->voir || $socid)
@@ -635,7 +635,7 @@ if ($resql)
  		$langs->load("commercial");
  		$moreforfilter.='<div class="divsearchfield">';
  		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
 	 	$moreforfilter.='</div>';
  	}
     // If the user can view prospects other than his'
@@ -643,7 +643,7 @@ if ($resql)
     {
 		$moreforfilter.='<div class="divsearchfield">';
     	$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 	 	$moreforfilter.='</div>';
     }
 	// If the user can view prospects other than his'
@@ -653,7 +653,7 @@ if ($resql)
 		$moreforfilter.='<div class="divsearchfield">';
 		$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, '', 1);
+		$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter.='</div>';
 	}
     $parameters=array();
@@ -671,7 +671,7 @@ if ($resql)
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
     if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-    
+
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
@@ -900,12 +900,12 @@ if ($resql)
 	if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER["PHP_SELF"],"f.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'],$_SERVER["PHP_SELF"],"fk_statut,paye","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";	
-	
+	print "</tr>\n";
+
     $facturestatic=new FactureFournisseur($db);
 	$supplierstatic=new Fournisseur($db);
 	$projectstatic=new Project($db);
-	
+
 	if ($num > 0)
     {
 		$i=0;
@@ -915,7 +915,7 @@ if ($resql)
 		while ($i < min($num,$limit))
 		{
 			$obj = $db->fetch_object($resql);
-			
+
 			$datelimit=$db->jdate($obj->datelimite);
 			$facturestatic->id=$obj->facid;
 			$facturestatic->ref=$obj->ref;
@@ -929,7 +929,7 @@ if ($resql)
 			$totaldeposits = $facturestatic->getSumDepositsUsed();
 			$totalpay = $paiement + $totalcreditnotes + $totaldeposits;
 			$remaintopay = $obj->total_ttc - $totalpay;
-				
+
             print '<tr class="oddeven">';
     		if (! empty($arrayfields['f.ref']['checked']))
     		{
@@ -950,11 +950,11 @@ if ($resql)
 				$subdir = get_exdir($obj->facid,2,0,0,$facturestatic,'invoice_supplier').dol_sanitizeFileName($obj->ref);
 				print $formfile->getDocumentsLink('facture_fournisseur', $subdir, $filedir);
 				print '</td></tr></table>';
-				
+
                 print "</td>\n";
 				if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
 			// Customer ref
     		if (! empty($arrayfields['f.ref_supplier']['checked']))
     		{
@@ -963,7 +963,7 @@ if ($resql)
     			print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
 			// Label
     		if (! empty($arrayfields['f.label']['checked']))
     		{
@@ -972,7 +972,7 @@ if ($resql)
     			print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
 			// Date
     		if (! empty($arrayfields['f.datef']['checked']))
     		{
@@ -981,7 +981,7 @@ if ($resql)
                 print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
             // Date limit
     		if (! empty($arrayfields['f.date_lim_reglement']['checked']))
     		{
@@ -993,7 +993,7 @@ if ($resql)
                 print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
     		// Project
     		if (! empty($arrayfields['p.ref']['checked']))
     		{
@@ -1007,7 +1007,7 @@ if ($resql)
     		    print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
     		// Third party
     		if (! empty($arrayfields['s.nom']['checked']))
     		{
@@ -1061,7 +1061,7 @@ if ($resql)
     		    print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
             // Payment mode
     		if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
     		{
@@ -1070,7 +1070,7 @@ if ($resql)
                 print '</td>';
     		    if (! $i) $totalarray['nbfield']++;
     		}
-    		
+
             // Amount HT
             if (! empty($arrayfields['f.total_ht']['checked']))
             {
@@ -1127,8 +1127,8 @@ if ($resql)
     		    if (! $i) $totalarray['totalrtpfield']=$totalarray['nbfield'];
     		    $totalarray['totalrtp'] += $remaintopay;
             }
-            
-            
+
+
             // Extra fields
             if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
             {
@@ -1176,7 +1176,7 @@ if ($resql)
                 print "</td>";
                 if (! $i) $totalarray['nbfield']++;
             }
-            
+
     		// Action column
             print '<td class="nowrap" align="center">';
             if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
@@ -1187,12 +1187,12 @@ if ($resql)
             }
             print '</td>';
     		if (! $i) $totalarray['nbfield']++;
-    		
+
 			print "</tr>\n";
-			
+
 			$i++;
 		}
-		
+
 	    // Show total line
     	if (isset($totalarray['totalhtfield'])
  	   || isset($totalarray['totalvatfield'])
@@ -1215,7 +1215,7 @@ if ($resql)
     	       }
     		   elseif ($totalarray['totalhtfield'] == $i)  print '<td align="right">'.price($totalarray['totalht']).'</td>';
     		   elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
-    		   elseif ($totalarray['totallocaltax1field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax1']).'</td>'; 
+    		   elseif ($totalarray['totallocaltax1field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax1']).'</td>';
     		   elseif ($totalarray['totallocaltax2field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax2']).'</td>';
     		   elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
     		   elseif ($totalarray['totalamfield'] == $i)  print '<td align="right">'.price($totalarray['totalam']).'</td>';
@@ -1223,32 +1223,32 @@ if ($resql)
     		   else print '<td></td>';
     		}
     		print '</tr>';
-    		
+
     	}
 	}
 
 	$db->free($resql);
-	
+
 	$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
 	$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	
+
 	print "</table>\n";
     print '</div>';
-    
+
 	print "</form>\n";
-    
+
     /*
     if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
     {
         // Show list of available documents
         $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
         $urlsource.=str_replace('&amp;','&',$param);
-        
+
         $filedir=$diroutputmassaction;
         $genallowed=$user->rights->facture->lire;
         $delallowed=$user->rights->facture->lire;
-    
+
         print $formfile->showdocuments('massfilesarea_invoices','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
     }
     else
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 30d3dc14f69..fa77287cbf4 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -66,7 +66,7 @@ $year_end        = GETPOST('year_end');
 $search_employe  = GETPOST('search_employe');
 $search_valideur = GETPOST('search_valideur');
 $search_statut   = GETPOST('select_statut');
-$type            = GETPOST('type','int'); 
+$type            = GETPOST('type','int');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
@@ -310,14 +310,14 @@ print '</td>';
 if ($user->rights->holiday->write_all)
 {
     print '<td class="liste_titre maxwidthonsmartphone" align="left">';
-    print $form->select_dolusers($search_employe,"search_employe",1,"",0,'','',0,32,0,'',0,'','maxwidth200');
+    print $form->select_dolusers($search_employe,"search_employe",1,"",0,'','',0,0,0,'',0,'','maxwidth200');
     print '</td>';
 }
 else
 {
     //print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre maxwidthonsmartphone" align="left">';
-    print $form->select_dolusers($user->id,"search_employe",1,"",1,'','',0,32,0,'',0,'','maxwidth200');
+    print $form->select_dolusers($user->id,"search_employe",1,"",1,'','',0,0,0,'',0,'','maxwidth200');
     print '</td>';
 }
 
@@ -331,7 +331,7 @@ if($user->rights->holiday->write_all)
     $valideurobjects = $validator->listUsersForGroup($excludefilter);
     $valideurarray = array();
     foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
-    print $form->select_dolusers($search_valideur,"search_valideur",1,"",0,$valideurarray,'', 0, 32,0,'',0,'','maxwidth200');
+    print $form->select_dolusers($search_valideur,"search_valideur",1,"",0,$valideurarray,'', 0, 0, 0, '', 0, '', 'maxwidth200');
     print '</td>';
 }
 else
@@ -408,7 +408,7 @@ if (! empty($holiday->holiday))
 		$userstatic->login=$infos_CP['user_login'];
 		$userstatic->statut=$infos_CP['user_statut'];
 		$userstatic->photo=$infos_CP['user_photo'];
-		
+
 		// Valideur
 		$approbatorstatic->id=$infos_CP['fk_validator'];
 		$approbatorstatic->lastname=$infos_CP['validator_lastname'];
@@ -416,7 +416,7 @@ if (! empty($holiday->holiday))
 		$approbatorstatic->login=$infos_CP['validator_login'];
 		$approbatorstatic->statut=$infos_CP['validator_statut'];
 		$approbatorstatic->photo=$infos_CP['validator_photo'];
-		
+
 		$date = $infos_CP['date_create'];
 
 		print '<tr class="oddeven">';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 0c638f8dd6b..9c78387f95b 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -444,7 +444,7 @@ if (! empty($conf->categorie->enabled))
     require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
     $moreforfilter.='<div class="divsearchfield">';
     $moreforfilter.=$langs->trans('ProjectCategories'). ': ';
-    $moreforfilter.=$formother->select_categories('project',$search_categ,'search_categ',1);
+    $moreforfilter.=$formother->select_categories('project', $search_categ, 'search_categ', 1, 1, 'maxwidth300');
     $moreforfilter.='</div>';
 }
 
@@ -453,7 +453,7 @@ $moreforfilter.='<div class="divsearchfield">';
 $moreforfilter.=$langs->trans('ProjectsWithThisUserAsContact'). ': ';
 $includeonly='';
 if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
-$moreforfilter.=$form->select_dolusers($search_project_user?$search_project_user:'', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth300');
+$moreforfilter.=$form->select_dolusers($search_project_user?$search_project_user:'', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter.='</div>';
 
 // If the user can view thirdparties other than his'
@@ -462,7 +462,7 @@ if ($user->rights->societe->client->voir || $socid)
 	$langs->load("commercial");
 	$moreforfilter.='<div class="divsearchfield">';
 	$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-	$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+	$moreforfilter.=$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
 	$moreforfilter.='</div>';
 }
 
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 47387ec625a..7bff02fa864 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -442,7 +442,7 @@ if (! empty($conf->categorie->enabled))
     require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
     $moreforfilter.='<div class="divsearchfield">';
     $moreforfilter.=$langs->trans('ProjectCategories'). ': ';
-    $moreforfilter.=$formother->select_categories('project',$search_categ,'search_categ',1);
+    $moreforfilter.=$formother->select_categories('project', $search_categ, 'search_categ', 1, 'maxwidth300');
     $moreforfilter.='</div>';
 }
 
@@ -451,7 +451,7 @@ $moreforfilter.='<div class="divsearchfield">';
 $moreforfilter.=$langs->trans('ProjectsWithThisUserAsContact'). ' ';
 $includeonly='';
 if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
-$moreforfilter.=$form->select_dolusers($search_project_user?$search_project_user:'', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth300');
+$moreforfilter.=$form->select_dolusers($search_project_user?$search_project_user:'', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter.='</div>';
 
 // If the user can view users
@@ -459,7 +459,7 @@ $moreforfilter.='<div class="divsearchfield">';
 $moreforfilter.=$langs->trans('TasksWithThisUserAsContact'). ': ';
 $includeonly='';
 if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
-$moreforfilter.=$form->select_dolusers($search_task_user, 'search_task_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth300');
+$moreforfilter.=$form->select_dolusers($search_task_user, 'search_task_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter.='</div>';
 
 if (! empty($moreforfilter))

From faabdd3f99fb923661485364c3a6c9dd0852c48c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 11:34:35 +0200
Subject: [PATCH 1114/1163] Missing filter field

---
 htdocs/user/index.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 76d3385dd65..9c82216d5be 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2015      Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
@@ -204,7 +204,7 @@ else
 }
 if ($socid > 0) $sql.= " AND u.fk_soc = ".$socid;
 //if ($search_user != '')       $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user);
-if ($search_supervisor > 0)   $sql.= " AND u.fk_user = ".$db->escape($search_supervisor);
+if ($search_supervisor > 0)   $sql.= " AND u.fk_user IN (".$db->escape($search_supervisor).")";
 if ($search_thirdparty != '') $sql.= natural_search(array('s.nom'), $search_thirdparty);
 if ($search_login != '')      $sql.= natural_search("u.login", $search_login);
 if ($search_lastname != '')   $sql.= natural_search("u.lastname", $search_lastname);
@@ -360,9 +360,12 @@ if (! empty($arrayfields['u.entity']['checked']))
 {
     print '<td class="liste_titre"></td>';
 }
+// Supervisor
 if (! empty($arrayfields['u.fk_user']['checked']))
 {
-    print '<td class="liste_titre"></td>';
+    print '<td class="liste_titre">';
+    print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, array(), 0, '', 0, 0, 0, 0, '', 0, '', 'maxwidth200');
+    print '</td>';
 }
 if (! empty($arrayfields['u.datelastlogin']['checked']))
 {

From ce9e1dfb98701836af7006c37eb4aa85276024b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 11:37:04 +0200
Subject: [PATCH 1115/1163] Fix tag non closed

---
 htdocs/modulebuilder/template/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/README.md b/htdocs/modulebuilder/template/README.md
index ba723bf5195..3d2d8f6102b 100644
--- a/htdocs/modulebuilder/template/README.md
+++ b/htdocs/modulebuilder/template/README.md
@@ -3,4 +3,4 @@
 ## Features
 MyModuleDescription
 
-Other modules are available on <a href="https://www.dolistore.com target="_new">Dolistore.com</a>.
+Other modules are available on <a href="https://www.dolistore.com" target="_new">Dolistore.com</a>.

From 0b6d7a5b575f2ddb74607659d85adff363c2d6da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 11:44:12 +0200
Subject: [PATCH 1116/1163] Modulebuilder

---
 htdocs/admin/modules.php                      |  11 +++-
 htdocs/langs/en_US/modulebuilder.lang         |   9 ++-
 htdocs/modulebuilder/index.php                |  62 +++++++++++++++---
 htdocs/modulebuilder/template/admin/about.php |   6 +-
 htdocs/modulebuilder/template/admin/setup.php |   4 +-
 ...{object_mytest.png => object_mymodule.png} | Bin
 6 files changed, 73 insertions(+), 19 deletions(-)
 rename htdocs/modulebuilder/template/img/{object_mytest.png => object_mymodule.png} (100%)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 57ed97c9b20..8bea1c6dcb7 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -865,6 +865,7 @@ if ($mode == 'deploy')
     	print '<br>';
     }
 
+    print '<br>';
 
     if ($allowfromweb >= 0)
     {
@@ -885,12 +886,20 @@ if ($mode == 'deploy')
     	if ($allowfromweb == 1)
     	{
     		print $langs->trans("UnpackPackageInModulesRoot",$dirins).'<br>';
-    		print '<form enctype="multipart/form-data" method="POST" class="noborder" action="'.$_SERVER["PHP_SELF"].'" name="forminstall">';
+
+    		print '<br>';
+
+            print '<form enctype="multipart/form-data" method="POST" class="noborder" action="'.$_SERVER["PHP_SELF"].'" name="forminstall">';
     		print '<input type="hidden" name="action" value="install">';
     		print '<input type="hidden" name="mode" value="deploy">';
     		print $langs->trans("YouCanSubmitFile").' <input type="file" name="fileinstall"> ';
     		print '<input type="submit" name="send" value="'.dol_escape_htmltag($langs->trans("Send")).'" class="button">';
     		print '</form>';
+
+            print '<br>';
+            print '<br>';
+
+            print '<div class="center"><div class="logo_setup"></div></div>';
     	}
     	else
     	{
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index b717bafc57c..adce0950b88 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -11,7 +11,14 @@ ModuleBuilderDescobjects=Define here the new objects you want to manage with you
 ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
 ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
 ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file with your IDE.
+ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to get your module package file.
+ModuleBuilderDescdangerzone=You can delete your module. WARNING: All files of module will be definetly lost !
+DangerZone=Danger zone
 BuildPackage=Build package
 ModuleIsNotActive=This module was not activated yet (go into Home-Setup-Module to make it live)
-ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
\ No newline at end of file
+ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
+DescriptionLong=Long description
+EditorName=Name of editor
+EditorUrl=URL of editor
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 5b3a33c9d41..8cabec1bdfb 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -113,6 +113,19 @@ if ($dirins && $action == 'initmodule' && $modulename)
     }
 }
 
+if ($dirins && $action == 'confirm_delete')
+{
+    $modulelowercase=strtolower($module);
+
+    // Dir for module
+    $dir = $dirins.'/'.$modulelowercase;
+
+    dol_delete_dir_recursive($dir);
+
+    header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?module=initmodule');
+    exit;
+}
+
 if ($dirins && $action == 'generatepackage')
 {
     $modulelowercase=strtolower($module);
@@ -373,16 +386,31 @@ elseif (! empty($module))
         $head2[$h][2] = 'permissions';
         $h++;
 
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=hooks&module='.$module;
+        $head2[$h][1] = $langs->trans("Hooks");
+        $head2[$h][2] = 'hooks';
+        $h++;
+
         $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=triggers&module='.$module;
         $head2[$h][1] = $langs->trans("Triggers");
         $head2[$h][2] = 'triggers';
         $h++;
 
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=widgets&module='.$module;
+        $head2[$h][1] = $langs->trans("Widgets");
+        $head2[$h][2] = 'widgets';
+        $h++;
+
         $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=buildpackage&module='.$module;
         $head2[$h][1] = $langs->trans("BuildPackage");
         $head2[$h][2] = 'buildpackage';
         $h++;
 
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=dangerzone&module='.$module;
+        $head2[$h][1] = $langs->trans("DangerZone");
+        $head2[$h][2] = 'dangerzone';
+        $h++;
+
         print $modulestatusinfo.'<br><br>';
 
         dol_fiche_head($head2, $tab, '', -1, '');
@@ -421,7 +449,7 @@ elseif (! empty($module))
 
         	print '<tr><td>';
         	print $langs->trans("Family");
-        	print "<br>'crm','financial','hr','projects','products','ecm','technic','interface','other'";
+        	//print "<br>'crm','financial','hr','projects','products','ecm','technic','interface','other'";
         	print '</td><td>';
         	print $moduleobj->family;
         	print '</td></tr>';
@@ -445,7 +473,7 @@ elseif (! empty($module))
         	print '</td></tr>';
 
         	print '<tr><td>';
-        	print $langs->trans("LongDescription");
+        	print $langs->trans("DescriptionLong");
         	print '</td><td>';
         	print $moduleobj->getDescLong();
         	print '</td></tr>';
@@ -453,14 +481,6 @@ elseif (! empty($module))
         	print '</table>';
 
         	print '</div>';
-
-        	print '<br><br>';
-        	print '<form name="delete">';
-        	print '<input type="hidden" name="action" value="confirm_delete">';
-        	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
-        	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
-        	print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins?'':' disabled="disabled"').'>';
-        	print '</form>';
         }
 
         if ($tab == 'objects')
@@ -483,6 +503,12 @@ elseif (! empty($module))
 
         }
 
+        if ($tab == 'hooks')
+        {
+            print $langs->trans("FeatureNotYetAvailable");
+
+        }
+
         if ($tab == 'triggers')
         {
         	require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
@@ -520,6 +546,12 @@ elseif (! empty($module))
 			print '</div>';
         }
 
+        if ($tab == 'widget')
+        {
+    		print $langs->trans("FeatureNotYetAvailable");
+
+        }
+
         if ($tab == 'buildpackage')
         {
             if (! class_exists('ZipArchive') && ! defined('ODTPHP_PATHTOPCLZIP'))
@@ -536,6 +568,16 @@ elseif (! empty($module))
         	print '</form>';
         }
 
+        if ($tab == 'dangerzone')
+        {
+            print '<form name="delete">';
+            print '<input type="hidden" name="action" value="confirm_delete">';
+            print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
+            print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+            print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins?'':' disabled="disabled"').'>';
+            print '</form>';
+        }
+
         dol_fiche_end();
     }
 }
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index 844c444bad2..1306b0aef6a 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -20,8 +20,6 @@
  * \file    htdocs/modulebuilder/template/admin/about.php
  * \ingroup mymodule
  * \brief   About page of module MyModule.
- *
- * MyModuleDescription.
  */
 
 // Load Dolibarr environment
@@ -84,8 +82,8 @@ echo $langs->trans("MyModuleAboutPage");
 
 echo '<br>';
 
-require_once '../core/modulebuilder/mymodule/core/modules/modMyModule.class.php';
-$tmpmodule = new MyModule($db);
+dol_include_once('/mymodule/core/modules/modMyModule.class.php');
+$tmpmodule = new modMyModule($db);
 print $tmpmodule->getDescLong();
 
 // Page end
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index b3f2cc87d73..421452f06e8 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -19,9 +19,7 @@
 /**
  * \file    htdocs/modulebuilder/template/admin/setup.php
  * \ingroup mymodule
- * \brief   Example module setup page.
- *
- * Put detailed description here.
+ * \brief   MyModule setup page.
  */
 
 // Load Dolibarr environment
diff --git a/htdocs/modulebuilder/template/img/object_mytest.png b/htdocs/modulebuilder/template/img/object_mymodule.png
similarity index 100%
rename from htdocs/modulebuilder/template/img/object_mytest.png
rename to htdocs/modulebuilder/template/img/object_mymodule.png

From 73977639ac44215c6680110fc3d5f4babdf761fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jun 2017 18:34:39 +0200
Subject: [PATCH 1117/1163] Update doc

---
 README-FR.md | 31 ++++++++++++++++++++++++++++---
 README.md    | 14 ++++++++++++--
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/README-FR.md b/README-FR.md
index 4129e2b7452..8e6a2c5aac0 100644
--- a/README-FR.md
+++ b/README-FR.md
@@ -98,7 +98,10 @@ Voir fichier ChangeLog.
 - Rapports
 - Imports/Exports des données
 - Connectivité LDAP
-- De nombreuses autres fonctionnalités issues de modules officiels ou non (AWStats, Bittorrent, Gravatar, Google, Webcalendar...) 
+- Intégratn de ClickToDial
+- Intégration RSS
+- Intégation Skype
+- Intégration de système de paiements (Paypal, Strip, Paybox...)
 - …
 
 ### Divers:
@@ -114,17 +117,39 @@ Voir fichier ChangeLog.
 - Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
 - APIs.
 - Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
+- …
+
+### Extension
+
+Dolibarr peut aussi être étendu à volonté avec l'ajout de module/applications externes développées par des développeus tiers, disponible sur [DoliStore](https://www.dolistore.com).
 
 
-## CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
+## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
 
 Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
 - Dolibarr ne contient pas de module de Gestion de la paie.
 - Les tâches du module de gestion de projets n'ont pas de dépendances entre elle.
-- Dolibarr ne contient pas de Webmail.
+- Dolibarr n'embarque pas de Webmail intégré nativement.
 - Dolibarr ne fait pas le café (pas encore). 
 
 
+## DOCUMENTATION
+
+Les documentations utilisateur, développeur et traducteur sont disponible sous forme de ressources de la communautés via la site [Wiki](https://wiki.dolibarr.org).
+
+
+## CONTRIBUTING
+
+Voir le fichier [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)
+
+
+## CREDITS
+
+Dolibarr est le résultat du travail de nombreux contributeurs depuis des années et utilise des librairies d'autres contributeurs.
+
+Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT)
+
+
 ## ACTUALITES ET RESEAUX SOCIAUX
 
 Suivez le projet Dolibarr project sur les réseaux francophones
diff --git a/README.md b/README.md
index 29a7d4f9545..fbbbdddf665 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ You can use it as a standalone application or as a web application to be able to
 
 ![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_640x400.png)
 
+
 ## LICENSE
 
 Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version (GPL-3+).
@@ -20,6 +21,7 @@ See the [COPYING](https://github.com/Dolibarr/dolibarr/blob/develop/COPYING) fil
 
 Other licenses apply for some included dependencies. See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) for a full list.
 
+
 ## INSTALLING
 
 ### Download
@@ -67,6 +69,7 @@ You can use a Web server and a supported database (MariaDb, MySql or Postgresql)
    
 - Follow the installer instructions
 
+
 ## UPGRADING
 
 - Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
@@ -75,10 +78,12 @@ You can use a Web server and a supported database (MariaDb, MySql or Postgresql)
 
 *Note: migration process can safely be done multiple times by calling the page /install/index.php*
 
+
 ## WHAT'S NEW
 
 See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
 
+
 ## FEATURES
 
 ### Main application/modules (all optional)
@@ -120,7 +125,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - ClickToDial integration
 - RSS integration
 - Skype integration
-- Payment platforms integration (PayBox, PayPal)
+- Payment platforms integration (PayPal, Stripe, Paybox...)
 - …
 
 ### Other general features
@@ -149,29 +154,34 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
 
+
 ## FUTURE
 
 These are features that Dolibarr does **not** yet fully support:
 
 - Tasks dependencies in projects
 - Payroll module
-- Webmail
+- No native embedded Webmail
 - Dolibarr can't do coffee (yet)
 
+
 ## DOCUMENTATION
 
 Administrator, user, developer and translator's documentations are available along with other community resources on the [Wiki](https://wiki.dolibarr.org).
 
+
 ## CONTRIBUTING
 
 See file [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)
 
+
 ## CREDITS
 
 Dolibarr is the work of many contributors over the years and uses some fine libraries.
 
 See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
 
+
 ## NEWS AND SOCIAL NETWORKS
 
 Follow Dolibarr project on:

From 71c0be20b972d0fd3efac0da60a2980d92bb83a5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2017 10:30:32 +0200
Subject: [PATCH 1118/1163] Change data structure for bookkeeping v6

---
 dev/translation/erp_comparison_translation.txt        |  4 ++--
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql        | 11 ++++++++++-
 .../mysql/tables/llx_accounting_bookkeeping.sql       |  5 +++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/dev/translation/erp_comparison_translation.txt b/dev/translation/erp_comparison_translation.txt
index daa1bc79e92..fb96c17e3f9 100644
--- a/dev/translation/erp_comparison_translation.txt
+++ b/dev/translation/erp_comparison_translation.txt
@@ -8,7 +8,7 @@ Contact/address		Contact person		Partner/Contact (individual)
 Financial			??					Invoicing
 
 Income / Expense	??					Profit / Loss
-Balance									Net profit
-
+Balance				??					Net profit
+Subledger account	Subledger account	??
 
 
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index bc09bf25ca3..46e3b698100 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -188,9 +188,18 @@ ALTER TABLE llx_bank_account ADD CONSTRAINT fk_bank_account_accountancy_journal
 
 --Update general ledger for FEC format & harmonization
 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN code_tiers varchar(32);
+ALTER TABLE llx_accounting_bookkeeping CHANGE COLUMN code_tiers thirdparty_code varchar(32);
+
+--Subledger account
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN subledger_account varchar(32);
+ALTER TABLE llx_accounting_bookkeeping CHANGE COLUMN thirdparty_label subledger_label varchar(255);    	-- If field was already created, rename it	
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN subledger_label varchar(255) AFTER subledger_account;	-- If field dod not exists yet
+
+update llx_accounting_bookkeeping set subledger_account = numero_compte where subledger_account IS NULL;
+
 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN label_compte varchar(255);
 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN code_journal varchar(32);
-ALTER TABLE llx_accounting_bookkeeping ADD COLUMN thirdparty_label varchar(255) AFTER code_tiers;
+
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN label_operation varchar(255) AFTER label_compte;
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN multicurrency_amount double AFTER sens;
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN multicurrency_code varchar(255) AFTER multicurrency_amount;
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index 651fee6c339..ad1160c356d 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -26,8 +26,9 @@ CREATE TABLE llx_accounting_bookkeeping
   doc_ref               varchar(300) NOT NULL,		-- 					| facture_client/reglement_client/... reference number
   fk_doc                integer NOT NULL,			-- 					| facture_client/reglement_client/... rowid
   fk_docdet             integer NOT NULL,			-- 					| facture_client/reglement_client/... line rowid
-  code_tiers            varchar(32),				-- FEC:CompAuxNum	| account number of auxiliary account
-  thirdparty_label      varchar(255),				-- FEC:CompAuxLib	| label of auxiliary account
+  thirdparty_code       varchar(32),                -- Third party code (customer or supplier) when record is saved (may help debug) 
+  subledger_account     varchar(32),				-- FEC:CompAuxNum	| account number of subledger account
+  subledger_label       varchar(255),				-- FEC:CompAuxLib	| label of subledger account
   numero_compte         varchar(32) NOT NULL,		-- FEC:CompteNum	| account number
   label_compte          varchar(255) NOT NULL,		-- FEC:CompteLib	| label of account
   label_operation       varchar(255),				-- FEC:EcritureLib	| label of the operation

From 4009b1837cf1db251c8c5bab6fe185a1960be279 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2017 11:17:02 +0200
Subject: [PATCH 1119/1163] Fix permissions

---
 htdocs/societe/class/api_contacts.class.php | 55 ++++++++++++---------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index ad82db3e008..58fe15cf282 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -22,14 +22,14 @@ use Luracast\Restler\RestException;
 /**
  * API class for contacts
  *
- * @access protected 
+ * @access protected
  * @class  DolibarrApiAccess {@requires user,external}
  */
 class Contacts extends DolibarrApi
 {
 	/**
 	 *
-	 * @var array   $FIELDS     Mandatory fields, checked when create and update object 
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
 	static $FIELDS = array(
 		'lastname'
@@ -56,13 +56,13 @@ class Contacts extends DolibarrApi
 	 *
 	 * @param 	int 	$id ID of contact
 	 * @return 	array|mixed data without useless information
-	 * 
+	 *
 	 * @throws 	RestException
 	 */
 	function get($id) {
 		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
 		{
-			throw new RestException(401);
+			throw new RestException(401, 'No permission to read contacts');
 		}
 
 		$result = $this->contact->fetch($id);
@@ -81,9 +81,9 @@ class Contacts extends DolibarrApi
 
 	/**
 	 * List contacts
-	 * 
+	 *
 	 * Get a list of contacts
-	 * 
+	 *
 	 * @param string	$sortfield	        Sort field
 	 * @param string	$sortorder	        Sort order
 	 * @param int		$limit		        Limit for list
@@ -91,7 +91,7 @@ class Contacts extends DolibarrApi
      * @param string   	$thirdparty_ids	    Thirdparty ids to filter projects of. {@example '1' or '1,2,3'} {@pattern /^[0-9,]*$/i}
      * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 	 * @return array                        Array of contact objects
-     * 
+     *
 	 * @throws RestException
 	 */
 	function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $thirdparty_ids = '', $sqlfilters = '') {
@@ -99,6 +99,11 @@ class Contacts extends DolibarrApi
 
 		$obj_ret = array();
 
+		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
+		{
+		    throw new RestException(401, 'No permission to read contacts');
+		}
+
         // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
 		$socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $thirdparty_ids;
 
@@ -111,7 +116,7 @@ class Contacts extends DolibarrApi
 		$sql.= " FROM " . MAIN_DB_PREFIX . "socpeople as t";
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
 			// We need this table joined to the select in order to filter by sale
-			$sql.= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc"; 
+			$sql.= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
 		}
 		$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON t.fk_soc = s.rowid";
 		$sql.= ' WHERE t.entity IN (' . getEntity('socpeople') . ')';
@@ -127,7 +132,7 @@ class Contacts extends DolibarrApi
 			$sql .= " AND sc.fk_user = " . $search_sale;
 		}
 	    // Add sql filters
-        if ($sqlfilters) 
+        if ($sqlfilters)
         {
             if (! DolibarrApi::_checkFilters($sqlfilters))
             {
@@ -136,7 +141,7 @@ class Contacts extends DolibarrApi
 	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
-		
+
 		$sql.= $db->order($sortfield, $sortorder);
 
 		if ($limit)
@@ -164,7 +169,7 @@ class Contacts extends DolibarrApi
 				}
 				$i++;
 			}
-		} 
+		}
 		else {
 			throw new RestException(503, 'Error when retreive contacts : ' . $sql);
 		}
@@ -184,7 +189,7 @@ class Contacts extends DolibarrApi
 	function post($request_data = NULL) {
 		if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
 		{
-			throw new RestException(401);
+			throw new RestException(401, 'No permission to create/update contacts');
 		}
 		// Check mandatory fields
 		$result = $this->_validate($request_data);
@@ -203,13 +208,13 @@ class Contacts extends DolibarrApi
 	 * Update contact
 	 *
 	 * @param int   $id             Id of contact to update
-	 * @param array $request_data   Datas   
-	 * @return int 
+	 * @param array $request_data   Datas
+	 * @return int
 	 */
 	function put($id, $request_data = NULL) {
 		if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
 		{
-			throw new RestException(401);
+			throw new RestException(401, 'No permission to create/update contacts');
 		}
 
 		$result = $this->contact->fetch($id);
@@ -244,7 +249,7 @@ class Contacts extends DolibarrApi
 	function delete($id) {
 		if (!DolibarrApiAccess::$user->rights->societe->contact->supprimer)
 		{
-			throw new RestException(401);
+			throw new RestException(401, 'No permission to delete contacts');
 		}
 		$result = $this->contact->fetch($id);
 		if (!$result)
@@ -273,23 +278,29 @@ class Contacts extends DolibarrApi
 	    //if (!DolibarrApiAccess::$user->rights->user->user->creer) {
 	    //throw new RestException(401);
 	    //}
-	
+
 	    if (!isset($request_data["login"]))
 	    				throw new RestException(400, "login field missing");
 	    if (!isset($request_data["password"]))
 	    				throw new RestException(400, "password field missing");
+
 	    if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
-	        throw new RestException(401);
+	        throw new RestException(401, 'No permission to read contacts');
 	    }
+	    if (!DolibarrApiAccess::$user->rights->user->user->creer) {
+	        throw new RestException(401, 'No permission to create user');
+	    }
+
 	    $contact = new Contact($this->db);
 	    $contact->fetch($id);
 	    if ($contact->id <= 0) {
 	        throw new RestException(404, 'Contact not found');
 	    }
-	
+
 	    if (!DolibarrApi::_checkAccessToResource('contact', $contact->id, 'socpeople&societe')) {
 	        throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
 	    }
+
 	    // Check mandatory fields
 	    $login = $request_data["login"];
 	    $password = $request_data["password"];
@@ -300,10 +311,10 @@ class Contacts extends DolibarrApi
 	    }
 	    // password parameter not used in create_from_contact
 	    $useraccount->setPassword($useraccount,$password);
-	
+
 	    return $result;
 	}
-	
+
     /**
      * Get categories for a contact
      *
@@ -324,7 +335,7 @@ class Contacts extends DolibarrApi
 
 	/**
 	 * Validate fields before create or update object
-     * 
+     *
 	 * @param   array|null     $data   Data to validate
 	 * @return  array
 	 * @throws RestException

From 097be322a60c9365f12dd364ac1bd878f15d6e55 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2017 19:29:00 +0200
Subject: [PATCH 1120/1163] Modify code to match new v6 structure.

---
 htdocs/accountancy/admin/categories_list.php  |  22 +-
 htdocs/accountancy/admin/defaultaccounts.php  |  94 +++++--
 htdocs/accountancy/admin/journals_list.php    |  27 +-
 htdocs/accountancy/bookkeeping/card.php       |  46 ++--
 htdocs/accountancy/bookkeeping/list.php       |  38 +--
 .../accountancy/bookkeeping/listbyaccount.php |  37 ++-
 htdocs/accountancy/bookkeeping/listbyyear.php |  58 +++--
 .../class/accountancycategory.class.php       |  20 +-
 .../class/accountancyexport.class.php         |  34 +--
 .../class/accountingjournal.class.php         |  16 +-
 .../accountancy/class/bookkeeping.class.php   | 234 +++++++++++-------
 htdocs/accountancy/index.php                  |   2 -
 htdocs/accountancy/journal/bankjournal.php    |  28 +--
 .../journal/expensereportsjournal.php         |  15 +-
 .../accountancy/journal/purchasesjournal.php  |  21 +-
 htdocs/accountancy/journal/sellsjournal.php   |  24 +-
 htdocs/core/modules/modAccounting.class.php   |  12 +-
 .../install/mysql/migration/5.0.0-6.0.0.sql   |   1 +
 htdocs/langs/en_US/accountancy.lang           |  24 +-
 htdocs/langs/en_US/compta.lang                |   6 +-
 20 files changed, 433 insertions(+), 326 deletions(-)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 1bf9a693efd..b10015baa6c 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -151,7 +151,7 @@ $sourceList=array();
 
 if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
 {
-    $search_country_id = '';    
+    $search_country_id = '';
 }
 
 // Actions add or modify an entry into a dictionary
@@ -479,7 +479,7 @@ if ($id)
         else $sql.=" WHERE ";
         $sql.= " c.rowid = ".$search_country_id;
     }
-    
+
     if ($sortfield)
     {
         // If sort order is "country", we use country_code instead
@@ -506,7 +506,7 @@ if ($id)
     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
-    
+
     print '<table class="noborder" width="100%">';
 
     // Form to add a new line
@@ -546,9 +546,9 @@ if ($id)
             if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); }
             if ($fieldlist[$field]=='pcg_version' || $fieldlist[$field]=='fk_pcg_version') { $valuetoshow=$langs->trans("Pcg_version"); }
             if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
-			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
+			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Direction"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
-				
+
             if ($valuetoshow != '')
             {
                 print '<td align="'.$align.'">';
@@ -617,7 +617,7 @@ if ($id)
         if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
         if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
         if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
-        
+
         // There is several pages
         if ($num > $listlimit)
         {
@@ -632,9 +632,9 @@ if ($id)
         foreach ($fieldlist as $field => $value)
         {
             $showfield=1;							  	// By defaut
-            
+
             if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
-            
+
             if ($showfield)
             {
                 if ($value == 'country')
@@ -661,7 +661,7 @@ if ($id)
     	}
     	print '</td>';
     	print '</tr>';
-    	
+
     	// Title of lines
         print '<tr class="liste_titre">';
         foreach ($fieldlist as $field => $value)
@@ -700,7 +700,7 @@ if ($id)
             if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
         	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
 			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
-			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
+			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Direction"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
             // Affiche nom du champ
             if ($showfield)
@@ -754,7 +754,7 @@ if ($id)
                     {
                         foreach ($fieldlist as $field => $value)
                         {
-                            
+
                             $showfield=1;
                         	$align="left";
                             $valuetoshow=$obj->{$fieldlist[$field]};
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index aaf98a0fa8b..ef39252ff87 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -50,23 +50,26 @@ if (! empty($user->rights->accountancy->chartofaccount))
 $action = GETPOST('action', 'alpha');
 
 
+$list_account_main = array (
+    'ACCOUNTING_ACCOUNT_SUPPLIER',
+    'ACCOUNTING_ACCOUNT_CUSTOMER',
+);
+
 $list_account = array (
-		'ACCOUNTING_ACCOUNT_SUPPLIER',
-		'ACCOUNTING_ACCOUNT_CUSTOMER',
-		'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
-		'ACCOUNTING_PRODUCT_BUY_ACCOUNT',
-		'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
-		'ACCOUNTING_SERVICE_BUY_ACCOUNT',
-		'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
-		'ACCOUNTING_VAT_BUY_ACCOUNT',
-		'ACCOUNTING_VAT_SOLD_ACCOUNT',
-		'ACCOUNTING_VAT_PAY_ACCOUNT',
-		'ACCOUNTING_ACCOUNT_SUSPENSE',
-		'ACCOUNTING_ACCOUNT_TRANSFER_CASH',
-		'DONATION_ACCOUNTINGACCOUNT',
-		'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',
-		'LOAN_ACCOUNTING_ACCOUNT_INTEREST',
-		'LOAN_ACCOUNTING_ACCOUNT_INSURANCE'
+    'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
+    'ACCOUNTING_PRODUCT_BUY_ACCOUNT',
+    'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
+    'ACCOUNTING_SERVICE_BUY_ACCOUNT',
+    'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
+    'ACCOUNTING_VAT_BUY_ACCOUNT',
+    'ACCOUNTING_VAT_SOLD_ACCOUNT',
+    'ACCOUNTING_VAT_PAY_ACCOUNT',
+    'ACCOUNTING_ACCOUNT_SUSPENSE',
+    'ACCOUNTING_ACCOUNT_TRANSFER_CASH',
+    'DONATION_ACCOUNTINGACCOUNT',
+    'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',
+    'LOAN_ACCOUNTING_ACCOUNT_INTEREST',
+    'LOAN_ACCOUNTING_ACCOUNT_INSURANCE'
 );
 
 
@@ -93,15 +96,23 @@ if (GETPOST('change_chart'))
 
 if ($action == 'update') {
 	$error = 0;
-	
-	foreach ( $list_account as $constname ) {
+
+	foreach ( $list_account_main as $constname ) {
 		$constvalue = GETPOST($constname, 'alpha');
-		
+
 		if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
 			$error ++;
 		}
 	}
-	
+
+	foreach ( $list_account as $constname ) {
+	    $constvalue = GETPOST($constname, 'alpha');
+
+	    if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+	        $error ++;
+	    }
+	}
+
 	if (! $error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -114,11 +125,11 @@ if ($action == 'update') {
  * View
  */
 
-llxHeader();
-
 $form = new Form($db);
 $formaccounting = new FormAccounting($db);
 
+llxHeader();
+
 $linkback = '';
 print load_fiche_titre($langs->trans('MenuDefaultAccounts'), $linkback, 'title_accountancy');
 
@@ -129,18 +140,47 @@ print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="update">';
 
-// Define Chart of accounts
+
+// Define main accounts for thirdparty
 
 print '<table class="noborder" width="100%">';
 
-foreach ( $list_account as $key ) {
-	
+foreach ($list_account_main as $key) {
+
+    print '<tr class="oddeven value">';
+    // Param
+    $label = $langs->trans($key);
+    $keydesc=$key.'_Desc';
+
+    $htmltext = $langs->trans($keydesc);
+    print '<td class="fieldrequired" width="50%">';
+    print $form->textwithpicto($label, $htmltext);
+    print '</td>';
+    // Value
+    print '<td>';  // Do not force align=right, or it align also the content of the select box
+    print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
+    print '</td>';
+    print '</tr>';
+}
+
+
+print "</table>\n";
+
+
+print '<br>';
+
+// Define default accounts
+
+print '<table class="noborder" width="100%">';
+
+foreach ($list_account as $key) {
+
 	print '<tr class="oddeven value">';
 	// Param
 	$label = $langs->trans($key);
-	print '<td>' . $label . '</td>';
+	print '<td width="50%">' . $label . '</td>';
 	// Value
-	print '<td>';  // Do not force align=right, or it align also the content of the select box 
+	print '<td>';  // Do not force align=right, or it align also the content of the select box
 	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
 	print '</td>';
 	print '</tr>';
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 68d5e5af5c0..dd1982d057c 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -127,7 +127,7 @@ complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,
 
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
-    // Must match ids defined into eldy.lib.php 
+    // Must match ids defined into eldy.lib.php
     $sourceList = array(
 			'1' => $langs->trans('AccountingJournalType1'),
 			'2' => $langs->trans('AccountingJournalType2'),
@@ -142,7 +142,7 @@ $elementList = array();
 
 if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
 {
-    $search_country_id = '';    
+    $search_country_id = '';
 }
 
 // Actions add or modify an entry into a dictionary
@@ -371,13 +371,6 @@ if ($id)
 
 print load_fiche_titre($titre,$linkback,$titlepicto);
 
-if (empty($id))
-{
-    print $langs->trans("DictionaryDesc");
-    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
-}
-print "<br>\n";
-
 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
@@ -400,7 +393,7 @@ if ($id)
         else $sql.=" WHERE ";
         $sql.= " c.rowid = ".$search_country_id;
     }
-    
+
     if ($sortfield)
     {
         // If sort order is "country", we use country_code instead
@@ -427,7 +420,7 @@ if ($id)
     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
-    
+
     print '<table class="noborder" width="100%">';
 
     // Form to add a new line
@@ -453,7 +446,7 @@ if ($id)
             	$valuetoshow=$langs->trans("Label");
             }
             if ($fieldlist[$field]=='nature')          { $valuetoshow=$langs->trans("Nature"); }
-				
+
             if ($valuetoshow != '')
             {
                 print '<td align="'.$align.'">';
@@ -522,7 +515,7 @@ if ($id)
         if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
         if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
         if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
-        
+
         // There is several pages
         if ($num > $listlimit)
         {
@@ -582,7 +575,7 @@ if ($id)
     	}
     	print '</td>';
     	print '</tr>';
-            
+
         if ($num)
         {
             // Lines with values
@@ -621,7 +614,7 @@ if ($id)
                     {
                         foreach ($fieldlist as $field => $value)
                         {
-                            
+
                             $showfield=1;
                         	$align="left";
                             $valuetoshow=$obj->{$fieldlist[$field]};
@@ -682,10 +675,10 @@ if ($id)
                     else print '<td>&nbsp;</td>';
 
                     print '<td></td>';
-                                         
+
                     print '</td>';
                 }
-                
+
                 print "</tr>\n";
                 $i++;
             }
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 4443fb959b2..3ef418e2e20 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -48,9 +48,9 @@ $piece_num = GETPOST("piece_num");
 $mesg = '';
 
 $account_number = GETPOST('account_number');
-$code_tiers = GETPOST('code_tiers');
-if ($code_tiers == - 1) {
-	$code_tiers = null;
+$subledger_account = GETPOST('subledger_account');
+if ($subledger_account == - 1) {
+	$subledger_account = null;
 }
 $label_compte = GETPOST('label_compte');
 $debit = price2num(GETPOST('debit'));
@@ -82,7 +82,7 @@ if ($action == "confirm_update") {
 			setEventMessages($book->error, $book->errors, 'errors');
 		} else {
 			$book->numero_compte = $account_number;
-			$book->code_tiers = $code_tiers;
+			$book->subledger_account = $subledger_account;
 			$book->label_compte = $label_compte;
 			$book->debit = $debit;
 			$book->credit = $credit;
@@ -119,7 +119,7 @@ else if ($action == "add") {
 		$book = new BookKeeping($db);
 
 		$book->numero_compte = $account_number;
-		$book->code_tiers = $code_tiers;
+		$book->subledger_account = $subledger_account;
 		$book->label_compte = $label_compte;
 		$book->debit = $debit;
 		$book->credit = $credit;
@@ -171,7 +171,7 @@ else if ($action == "confirm_delete") {
 
 else if ($action == "confirm_create") {
     $error = 0;
-    
+
     $book = new BookKeeping($db);
 
 	if (! GETPOST('next_num_mvt'))
@@ -179,7 +179,7 @@ else if ($action == "confirm_create") {
 	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumPiece")), null, 'errors');
 	    $error++;
 	}
-	
+
 	if (! $error)
 	{
     	$book->label_compte = '';
@@ -192,9 +192,9 @@ else if ($action == "confirm_create") {
     	$book->code_journal = GETPOST('code_journal');
     	$book->fk_doc = 0;
     	$book->fk_docdet = 0;
-    
+
     	$book->montant = 0;
-    
+
     	$result = $book->createStd($user);
     	if ($result < 0) {
     		setEventMessages($book->error, $book->errors, 'errors');
@@ -289,9 +289,9 @@ if ($action == 'create') {
 		print load_fiche_titre($langs->trans("UpdateMvts"), '<a href="list.php">' . $langs->trans('BackToList') . '</a>');
 
 		dol_fiche_head();
-		
+
 		print '<div class="fichecenter">';
-		
+
 		print '<table class="border" width="100%">';
 
 		print '<tr class="pair">';
@@ -306,12 +306,12 @@ if ($action == 'create') {
 
 		print '<tr class="pair">';
 		print '<td>' . $langs->trans("Codejournal") . '</td>';
-		print '<td>';	
+		print '<td>';
 		$accountingjournal = new AccountingJournal($db);
 		$accountingjournal->fetch('',$book->code_journal);
-		print $accountingjournal->getNomUrl(0,1,1,'',1);	
+		print $accountingjournal->getNomUrl(0,1,1,'',1);
 		print '</td></tr>';
-		
+
 		print '<tr class="impair">';
 		print '<td>' . $langs->trans("Docref") . '</td>';
 		print '<td>' . $book->doc_ref . '</td>';
@@ -335,13 +335,13 @@ if ($action == 'create') {
 		print '<td>' . $typelabel . '</td>';
 		print '</tr>';
 		print '</table>';
-		
+
 		print '</div>';
-		
+
 		dol_fiche_end();
 
 		print '<br>';
-		
+
 		$result = $book->fetch_all_per_mvt($piece_num);
 		if ($result < 0) {
 			setEventMessages($book->error, $book->errors, 'errors');
@@ -358,7 +358,7 @@ if ($action == 'create') {
 			print '<input type="hidden" name="fk_docdet" value="' . $book->fk_docdet . '">' . "\n";
 
 			$var=False;
-			
+
 			print "<table class=\"noborder\" width=\"100%\">";
 			if (count($book->linesmvt) > 0) {
 
@@ -368,7 +368,7 @@ if ($action == 'create') {
 				print '<tr class="liste_titre">';
 
 				print_liste_field_titre($langs->trans("AccountAccountingShort"));
-				print_liste_field_titre($langs->trans("Code_tiers"));
+				print_liste_field_titre($langs->trans("subledger_account"));
 				print_liste_field_titre($langs->trans("Labelcompte"));
 				print_liste_field_titre($langs->trans("Debit"), "", "", "", "", 'align="right"');
 				print_liste_field_titre($langs->trans("Credit"), "", "", "", "", 'align="right"');
@@ -390,7 +390,7 @@ if ($action == 'create') {
 						print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
 						print '</td>';
 						print '<td>';
-						print $formaccounting->select_auxaccount($line->code_tiers, 'code_tiers', 1);
+						print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1);
 						print '</td>';
 						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
 						print '<td align="right"><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
@@ -403,7 +403,7 @@ if ($action == 'create') {
 						print '</td>';
 					} else {
 						print '<td>' . length_accountg($line->numero_compte) . '</td>';
-						print '<td>' . length_accounta($line->code_tiers) . '</td>';
+						print '<td>' . length_accounta($line->subledger_account) . '</td>';
 						print '<td>' . $line->label_compte . '</td>';
 						print '<td align="right">' . price($line->debit) . '</td>';
 						print '<td align="right">' . price($line->credit) . '</td>';
@@ -423,7 +423,7 @@ if ($action == 'create') {
 					print "</tr>\n";
 				}
 
-				if ($total_debit != $total_credit) 
+				if ($total_debit != $total_credit)
 				{
 					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_credit, $total_debit)), 'warnings');
 				}
@@ -434,7 +434,7 @@ if ($action == 'create') {
 					print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
 					print '</td>';
 					print '<td>';
-					print $formaccounting->select_auxaccount($code_tiers, 'code_tiers', 1);
+					print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1);
 					print '</td>';
 					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
 					print '<td align="right"><input type="text" class="right maxwidth50" name="debit" value="' . price($debit) . '"/></td>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 26ab0fa4c4d..b6685248ca7 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -171,15 +171,15 @@ if (! empty($search_accountancy_code_end)) {
     $param .= '&search_accountancy_code_end=' . $search_accountancy_code_end;
 }
 if (! empty($search_accountancy_aux_code)) {
-    $filter['t.code_tiers'] = $search_accountancy_aux_code;
+    $filter['t.subledger_account'] = $search_accountancy_aux_code;
     $param .= '&search_accountancy_aux_code=' . $search_accountancy_aux_code;
 }
 if (! empty($search_accountancy_aux_code_start)) {
-    $filter['t.code_tiers>='] = $search_accountancy_aux_code_start;
+    $filter['t.subledger_account>='] = $search_accountancy_aux_code_start;
     $param .= '&search_accountancy_aux_code_start=' . $search_accountancy_aux_code_start;
 }
 if (! empty($search_accountancy_aux_code_end)) {
-    $filter['t.code_tiers<='] = $search_accountancy_aux_code_end;
+    $filter['t.subledger_account<='] = $search_accountancy_aux_code_end;
     $param .= '&search_accountancy_aux_code_end=' . $search_accountancy_aux_code_end;
 }
 if (! empty($search_mvt_label)) {
@@ -223,7 +223,7 @@ if ($action == 'delbookkeepingyearconfirm') {
 		$deljournal=0;
 	}
 
-	if (! empty($delyear) || ! empty($deljournal)) 
+	if (! empty($delyear) || ! empty($deljournal))
 	{
 		$result = $object->deleteByYearAndJournal($delyear,$deljournal);
 		if ($result < 0) {
@@ -365,7 +365,7 @@ $groupby = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/l
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, $groupby, '', $limit);
 
-print '<div class="tabsAction">' . "\n";
+print '<div class="tabsAction tabsActionNoBottom">' . "\n";
 print '<div class="inline-block divButAction"><a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a></div>';
 print '<div class="inline-block divButAction"><a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param?'&'.$param:'').'">' . $langs->trans("DelBookKeeping") . '</a></div>';
 
@@ -376,26 +376,35 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre_filter">';
 print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="' . dol_escape_htmltag($search_mvt_num) . '"></td>';
 print '<td class="liste_titre center">';
+print '<div class="nowrap">';
 print $langs->trans('From') . ': ';
 print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
-print '<br>';
+print '</div>';
+print '<div class="nowrap">';
 print $langs->trans('to') . ': ';
 print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
+print '</div>';
 print '</td>';
 print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8" value="' . dol_escape_htmltag($search_doc_ref) . '"></td>';
 print '<td class="liste_titre">';
+print '<div class="nowrap">';
 print $langs->trans('From');
 print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
-print '<br>';
+print '</div>';
+print '<div class="nowrap">';
 print $langs->trans('to');
 print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
+print '</div>';
 print '</td>';
 print '<td class="liste_titre">';
+print '<div class="nowrap">';
 print $langs->trans('From');
 print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
-print '<br>';
+print '</div>';
+print '<div class="nowrap">';
 print $langs->trans('to');
 print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+print '</div>';
 print '</td>';
 print '<td class="liste_titre">';
 print '<input type="text" size="7" class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
@@ -414,7 +423,7 @@ print_liste_field_titre($langs->trans("TransactionNumShort"), $_SERVER['PHP_SELF
 print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $param, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("AccountAccountingShort"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Code_tiers"), $_SERVER['PHP_SELF'], "t.code_tiers", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("SubledgerAccount"), $_SERVER['PHP_SELF'], "t.subledger_account", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
@@ -440,14 +449,15 @@ foreach ($object->lines as $line ) {
 	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
 	print '<td class="nowrap">' . $line->doc_ref . '</td>';
 	print '<td>' . length_accountg($line->numero_compte) . '</td>';
-	print '<td>' . length_accounta($line->code_tiers) . '</td>';
+	print '<td>' . length_accounta($line->subledger_account) . '</td>';
 	print '<td>' . $line->label_compte . '</td>';
-	print '<td align="right">' . price($line->debit) . '</td>';
-	print '<td align="right">' . price($line->credit) . '</td>';
+	print '<td align="right">' . ($line->debit ? price($line->debit) : ''). '</td>';
+	print '<td align="right">' . ($line->credit ? price($line->credit) : '') . '</td>';
 
 	$accountingjournal = new AccountingJournal($db);
-	$accountingjournal->fetch('',$line->code_journal);
-	print '<td align="center">' . $accountingjournal->getNomUrl(0,0,0,'',0) . '</td>';
+	$result = $accountingjournal->fetch('',$line->code_journal);
+	$journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0,0,0,'',0) : $line->code_journal);
+	print '<td align="center">' . $journaltoshow . '</td>';
 
 	print '<td align="center">';
 	print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index b9a5526a7ab..7d0ba2280ea 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -75,10 +75,6 @@ if (empty($search_date_end)) $search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_
 
 $object = new BookKeeping($db);
 
-$formaccounting = new FormAccounting($db);
-$formother = new FormOther($db);
-$form = new Form($db);
-
 
 $options = '';
 $filter = array ();
@@ -126,7 +122,7 @@ if (!GETPOST("button_removefilter_x") && !GETPOST("button_removefilter")) // Bot
  * Action
  */
 
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
 	$search_doc_date = '';
 	$search_accountancy_code = '';
@@ -156,6 +152,10 @@ if ($action == 'delmouvconfirm') {
  * View
  */
 
+$formaccounting = new FormAccounting($db);
+$formother = new FormOther($db);
+$form = new Form($db);
+
 $title_page = $langs->trans("Bookkeeping") . ' ' . strtolower($langs->trans("By")) . ' ' . $langs->trans("AccountAccounting");
 
 llxHeader('', $title_page);
@@ -217,7 +217,7 @@ if ( preg_match('/^asc/i', $sortorder) )
 else
   $sortorder = "desc";
 
-print '<div class="tabsAction">' . "\n";
+print '<div class="tabsAction tabsActionNoBottom">' . "\n";
 print '<div class="inline-block divButAction"><a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a></div>';
 print '</div>';
 
@@ -257,13 +257,12 @@ print "</tr>\n";
 
 print '</tr>';
 
-$var = True;
 
 $total_debit = 0;
 $total_credit = 0;
 $sous_total_debit = 0;
 $sous_total_credit = 0;
-$displayed_account_number = null;       // Start with undefined to be able to distinguish with empty 
+$displayed_account_number = null;       // Start with undefined to be able to distinguish with empty
 
 foreach ( $object->lines as $line ) {
 
@@ -272,10 +271,10 @@ foreach ( $object->lines as $line ) {
 
     $accountg = length_accountg($line->numero_compte);
 	//if (empty($accountg)) $accountg = '-';
-	
+
 	// Is it a break ?
     if ($accountg != $displayed_account_number || ! isset($displayed_account_number)) {
-        
+
         // Affiche un Sous-Total par compte comptable
         if (isset($displayed_account_number)) {
             print '<tr class="liste_total"><td align="right" colspan="5">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
@@ -283,7 +282,7 @@ foreach ( $object->lines as $line ) {
             print "<td>&nbsp;</td>\n";
             print '</tr>';
         }
-        
+
         // Show the break account
         $colspan = 9;
         print "<tr>";
@@ -292,7 +291,7 @@ foreach ( $object->lines as $line ) {
         else print '<span class="error">'.$langs->trans("Unknown").'</span>';
         print '</td>';
         print '</tr>';
-        
+
         $displayed_account_number = $accountg;
         //if (empty($displayed_account_number)) $displayed_account_number='-';
         $sous_total_debit = 0;
@@ -303,24 +302,24 @@ foreach ( $object->lines as $line ) {
 	print '<td>&nbsp;</td>';
 	print '<td align="right"><a href="./card.php?piece_num=' . $line->piece_num . '">'.$line->piece_num.'</a></td>';
 	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
-	
+
 	// TODO Add a link according to doc_type and fk_doc
 	print '<td class="nowrap">';
     //if ($line->doc_type == 'supplier_invoice')
     //if ($line->doc_type == 'customer_invoice')
 	print $line->doc_ref;
     print '</td>';
-    
+
     // Affiche un lien vers la facture client/fournisseur
     $doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-    print strlen(length_accounta($line->code_tiers)) == 0 ? '<td>' . $line->label_compte . '</td>' : '<td>' . $line->label_compte . '<br /><span style="font-size:0.8em">(' . length_accounta($line->code_tiers) . ')</span></td>';
+    print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_compte . '</td>' : '<td>' . $line->label_compte . '<br /><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';
 
 
-	print '<td align="right">' . price($line->debit) . '</td>';
-	print '<td align="right">' . price($line->credit) . '</td>';
+	print '<td align="right">' . ($line->debit ? price($line->debit) :''). '</td>';
+	print '<td align="right">' . ($line->credit ? price($line->credit) : '') . '</td>';
 	print '<td align="center">' . $line->code_journal . '</td>';
 	print '<td align="center">';
-	print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
+	print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
 	print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $options . '&page=' . $page . '">' . img_delete() . '</a>';
 	print '</td>';
 	print "</tr>\n";
@@ -355,6 +354,4 @@ print "</table>";
 print '</form>';
 
 llxFooter();
-
-
 $db->close();
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index f4134a2e028..e7e51ae67e0 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -52,14 +52,14 @@ $search_numero_compte_end = GETPOST('search_numero_compte_end', 'alpha');
 if ($search_numero_compte_end == - 1) {
 	$search_numero_compte_end = '';
 }
-$search_code_tiers = GETPOST('search_code_tiers', 'alpha');
-$search_code_tiers_start = GETPOST('search_code_tiers_start', 'alpha');
-if ($search_code_tiers_start == - 1) {
-	$search_code_tiers_start = '';
+$search_subledger_account = GETPOST('search_subledger_account', 'alpha');
+$search_subledger_account_start = GETPOST('search_subledger_account_start', 'alpha');
+if ($search_subledger_account_start == - 1) {
+	$search_subledger_account_start = '';
 }
-$search_code_tiers_end = GETPOST('search_code_tiers_end', 'alpha');
-if ($search_code_tiers_end == - 1) {
-	$search_code_tiers_end = '';
+$search_subledger_account_end = GETPOST('search_subledger_account_end', 'alpha');
+if ($search_subledger_account_end == - 1) {
+	$search_subledger_account_end = '';
 }
 $search_label_compte = GETPOST('search_label_compte', 'alpha');
 $search_sens = GETPOST('search_sens', 'alpha');
@@ -81,15 +81,18 @@ if ($sortfield == "")
 
 $offset = $limit * $page;
 
-llxHeader('', $langs->trans("Bookkeeping"));
 
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+/*
+ * Actions
+ */
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
 	$search_doc_type = "";
 	$search_doc_date = "";
 	$search_doc_ref = "";
 	$search_numero_compte = "";
-	$search_code_tiers = "";
+	$search_subledger_account = "";
 	$search_label_compte = "";
 	$search_sens = "";
 	$search_code_journal = "";
@@ -129,17 +132,17 @@ if (! empty($search_numero_compte_end)) {
 	$filter['t.numero_compte<='] = $search_numero_compte_end;
 	$options .= '&amp;search_numero_compte_end=' . $search_numero_compte_end;
 }
-if (! empty($search_code_tiers)) {
-	$filter['t.code_tiers'] = $search_code_tiers;
-	$options .= '&amp;search_code_tiers=' . $search_code_tiers;
+if (! empty($search_subledger_account)) {
+	$filter['t.subledger_account'] = $search_subledger_account;
+	$options .= '&amp;search_subledger_account=' . $search_subledger_account;
 }
-if (! empty($search_code_tiers_start)) {
-	$filter['t.code_tiers>='] = $search_code_tiers_start;
-	$options .= '&amp;search_code_tiers_start=' . $search_code_tiers_start;
+if (! empty($search_subledger_account_start)) {
+	$filter['t.subledger_account>='] = $search_subledger_account_start;
+	$options .= '&amp;search_subledger_account_start=' . $search_subledger_account_start;
 }
-if (! empty($search_code_tiers_end)) {
-	$filter['t.code_tiers<='] = $search_code_tiers_end;
-	$options .= '&amp;search_code_tiers_end=' . $search_code_tiers_end;
+if (! empty($search_subledger_account_end)) {
+	$filter['t.subledger_account<='] = $search_subledger_account_end;
+	$options .= '&amp;search_subledger_account_end=' . $search_subledger_account_end;
 }
 if (! empty($search_label_compte)) {
 	$filter['t.label_compte'] = $search_label_compte;
@@ -154,10 +157,13 @@ if (! empty($search_code_journal)) {
 	$options .= '&amp;search_code_journal=' . $search_code_journal;
 }
 
+
 /*
- * Mode List
+ * Actions
  */
 
+llxHeader('', $langs->trans("Bookkeeping"));
+
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$nbtotalofrecords = $object->fetchAll($sortorder, $sortfield, 0, 0);
@@ -188,9 +194,9 @@ print $formaccounting->select_account($search_numero_compte_end, 'search_numero_
 print '</div>';
 print '<div class="liste_titre">';
 print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-print $formaccounting->select_auxaccount($search_code_tiers_start, 'search_code_tiers_start', 1);
+print $formaccounting->select_auxaccount($search_subledger_account_start, 'search_subledger_account_start', 1);
 print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-print $formaccounting->select_auxaccount($search_code_tiers_end, 'searchcode_tiers_end', 1);
+print $formaccounting->select_auxaccount($search_subledger_account_end, 'search_subledger_account_end', 1);
 print '</div>';
 print "<table class=\"noborder\" width=\"100%\">";
 
@@ -200,7 +206,7 @@ print_liste_field_titre($langs->trans("Doctype"), $_SERVER['PHP_SELF'], "t.doc_t
 print_liste_field_titre($langs->trans("Date"), $_SERVER['PHP_SELF'], "t.doc_date", "", $options, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("AccountAccounting"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("ThirdPartyAccount"), $_SERVER['PHP_SELF'], "t.code_tiers", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("ThirdPartyAccount"), $_SERVER['PHP_SELF'], "t.subledger_account", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="center"', $sortfield, $sortorder);
@@ -232,7 +238,7 @@ print '<input type="text" size=6 class="flat" name="search_numero_compte" value=
 print '</td>';
 
 print '<td class="liste_titre">';
-print '<input type="text" size=6 class="flat" name="search_code_tiers" value="' . $search_code_tiers . '"/>';
+print '<input type="text" size=6 class="flat" name="search_subledger_account" value="' . $search_subledger_account . '"/>';
 print '</td>';
 
 print '<td class="liste_titre">';
@@ -264,8 +270,6 @@ print '</td>';
 
 print "</tr>\n";
 
-$var = True;
-
 foreach ( $object->lines as $line ) {
 
 	print '<tr class="oddeven">';
@@ -274,7 +278,7 @@ foreach ( $object->lines as $line ) {
 	print '<td align="center">' . dol_print_date($line->doc_date) . '</td>';
 	print '<td>' . $line->doc_ref . '</td>';
 	print '<td>' . length_accountg($line->numero_compte) . '</td>';
-	print '<td>' . length_accounta($line->code_tiers) . '</td>';
+	print '<td>' . length_accounta($line->subledger_account) . '</td>';
 	print '<td>' . $line->label_compte . '</td>';
 	print '<td align="right">' . price($line->debit) . '</td>';
 	print '<td align="right">' . price($line->credit) . '</td>';
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 139498bd0b2..e4e3017ab15 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -138,7 +138,7 @@ class AccountancyCategory
 	 */
 	public function getAccountsWithNoCategory($id) {
 	    global $conf;
-	
+
 	    $sql = "SELECT aa.account_number as numero_compte, aa.label as label_compte";
 	    $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
 	    $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
@@ -147,9 +147,9 @@ class AccountancyCategory
 	    $sql .= " AND aa.active = 1";
 	    $sql .= " GROUP BY aa.account_number, aa.label";
 	    $sql .= " ORDER BY aa.account_number, aa.label";
-	
+
 	    $this->lines_CptBk = array ();
-	
+
 	    dol_syslog(__METHOD__, LOG_DEBUG);
 	    $resql = $this->db->query($sql);
 	    if ($resql) {
@@ -159,17 +159,17 @@ class AccountancyCategory
 	                $this->lines_cptbk[] = $obj;
 	            }
 	        }
-	
+
 	        return $num;
 	    } else {
 	        $this->error = "Error " . $this->db->lasterror();
 	        $this->errors[] = $this->error;
 	        dol_syslog(__METHOD__ . " " . implode(',' . $this->errors), LOG_ERR);
-	
+
 	        return - 1;
 	    }
 	}
-	
+
 	/**
 	 * Function to add an accounting account in an accounting category
 	 *
@@ -191,7 +191,7 @@ class AccountancyCategory
 		$sql .= " AND aa.active = 1";
 
 		$this->db->begin();
-		
+
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql) {
@@ -201,9 +201,9 @@ class AccountancyCategory
 			return -1;
 		}
 
-		while ( $obj = $this->db->fetch_object($resql)) 
+		while ( $obj = $this->db->fetch_object($resql))
 		{
-			if (array_key_exists(length_accountg($obj->account_number), $cpts)) 
+			if (array_key_exists(length_accountg($obj->account_number), $cpts))
 			{
 				$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account";
 				$sql .= " SET fk_accounting_category=" . $id_cat;
@@ -332,7 +332,7 @@ class AccountancyCategory
 	}
 
 	/**
-	 * Function to show result of an accounting account from the general ledger with a sens and a period
+	 * Function to show result of an accounting account from the ledger with a direction and a period
 	 *
 	 * @param int $cpt Id accounting account
 	 * @param string $month Specifig month - Can be empty
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 1af9e5d1a6b..dc2b3195ee3 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -172,7 +172,7 @@ class AccountancyExport
 			print $date . $this->separator;
 			print $line->doc_ref . $this->separator;
 			print length_accountg($line->numero_compte) . $this->separator;
-			print length_accounta($line->code_tiers) . $this->separator;
+			print length_accounta($line->subledger_account) . $this->separator;
 			print price($line->debit) . $this->separator;
 			print price($line->credit) . $this->separator;
 			print $line->code_journal . $this->separator;
@@ -195,7 +195,7 @@ class AccountancyExport
 			print $date . $separator;
 			print $line->code_journal . $separator;
 			print length_accountg($line->numero_compte) . $separator;
-			print length_accounta($line->code_tiers) . $separator;
+			print length_accounta($line->subledger_account) . $separator;
 			print $line->sens . $separator;
 			print price($line->montant) . $separator;
 			print $line->label_compte . $separator;
@@ -254,7 +254,7 @@ class AccountancyExport
 			print price($line->debit) . $this->separator;
 			print price($line->credit) . $this->separator;
 			print 'E' . $this->separator;
-			print length_accountg($line->code_tiers) . $this->separator;
+			print length_accountg($line->subledger_account) . $this->separator;
 			print $this->end_line;
 		}
 	}
@@ -274,7 +274,7 @@ class AccountancyExport
 			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
 			print $date . $this->separator;
 
-			if (empty($line->code_tiers)) {
+			if (empty($line->subledger_account)) {
 				print 'G' . $this->separator;
 				print length_accounta($line->numero_compte) . $this->separator;
 			} else {
@@ -284,7 +284,7 @@ class AccountancyExport
 				if (substr($line->numero_compte, 0, 3) == '401') {
 					print 'F' . $this->separator;
 				}
-				print length_accountg($line->code_tiers) . $this->separator;
+				print length_accountg($line->subledger_account) . $this->separator;
 			}
 
 			print price($line->debit) . $this->separator;
@@ -307,11 +307,11 @@ class AccountancyExport
 		$this->end_line ="\r\n";
 
 		$i = 1;
-		$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be yyyymmdd
+		$date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be yyyymmdd
 		foreach ( $TData as $data ) {
 			$code_compta = $data->numero_compte;
-			if (! empty($data->code_tiers))
-				$code_compta = $data->code_tiers;
+			if (! empty($data->subledger_account))
+				$code_compta = $data->subledger_account;
 
 			$Tab = array ();
 			$Tab['num_ecriture'] = str_pad($i, 5);
@@ -349,8 +349,8 @@ class AccountancyExport
 		$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
 		foreach ( $TData as $data ) {
 			$code_compta = $data->numero_compte;
-			if (! empty($data->code_tiers))
-				$code_compta = $data->code_tiers;
+			if (! empty($data->subledger_account))
+				$code_compta = $data->subledger_account;
 
 			$Tab = array ();
 			$Tab['type_ligne'] = 'M';
@@ -436,19 +436,21 @@ class AccountancyExport
 			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
 			print $date . $this->separator;
 			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
-			
-			if (empty($line->code_tiers)) {
+
+			if (empty($line->subledger_account)) {
 				print length_accountg($line->numero_compte) . $this->separator;
 			} else {
+			    // FIXME Because the subledger_account is already an accounting account, does we really need
+			    // to concat 4011 or 401 to it ?
 				if (substr($line->numero_compte, 0, 1) == 'C' || substr($line->numero_compte, 0, 1) == '9') {
-					print '411' . substr(str_replace(" ", "", $line->code_tiers), 0, 5) . $this->separator;
+					print '411' . substr(str_replace(" ", "", $line->subledger_account), 0, 5) . $this->separator;
 				}
 				if (substr($line->numero_compte, 0, 1) == 'F' || substr($line->numero_compte, 0, 1) == '0') {
-					print '401' . substr(str_replace(" ", "", $line->code_tiers), 0, 5) . $this->separator;
+					print '401' . substr(str_replace(" ", "", $line->subledger_account), 0, 5) . $this->separator;
 				}
 			}
-			
-			print length_accounta($line->code_tiers) . $this->separator;
+
+			print length_accounta($line->subledger_account) . $this->separator;
 			print price($line->debit) . $this->separator;
 			print price($line->credit) . $this->separator;
 			print price($line->montant).$this->separator;
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 168934ee5a5..f47715ace58 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -46,7 +46,7 @@ class AccountingJournal extends CommonObject
 	function __construct($db) {
 		$this->db = $db;
 	}
-	
+
 	/**
 	 * Load an object from database
 	 *
@@ -62,9 +62,9 @@ class AccountingJournal extends CommonObject
 			$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 			$sql .= " WHERE";
 			if ($rowid) {
-				$sql .= " rowid = '" . $rowid . "'";
+				$sql .= " rowid = " . (int) $rowid;
 			} elseif ($journal_code) {
-				$sql .= " code = '" . $journal_code . "'";
+				$sql .= " code = '" . $this->db->escape($journal_code) . "'";
 			}
 
 			dol_syslog(get_class($this)."::fetch sql=" . $sql, LOG_DEBUG);
@@ -96,7 +96,7 @@ class AccountingJournal extends CommonObject
 		}
 		return -1;
 	}
-	
+
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
@@ -147,7 +147,7 @@ class AccountingJournal extends CommonObject
 		{
 			$linkstart = '';
 			$linkclose = '';
-			$linkend = '';			
+			$linkend = '';
 		}
 
 		$label_link = $this->code;
@@ -158,7 +158,7 @@ class AccountingJournal extends CommonObject
 		if ($withpicto != 2) $result.=$linkstart . $label_link . $linkend;
 		return $result;
 	}
-	
+
 	/**
 	 *  Retourne le libelle du statut d'un user (actif, inactif)
 	 *
@@ -169,7 +169,7 @@ class AccountingJournal extends CommonObject
 	{
 	    return $this->LibType($this->nature,$mode);
 	}
-	
+
 	/**
 	 *  Return type of an accounting journal
 	 *
@@ -182,7 +182,7 @@ class AccountingJournal extends CommonObject
 	    global $langs;
 
 		$langs->load("accountancy");
-	
+
 	    if ($mode == 0)
 	    {
 	        $prefix='';
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 0fc4a936117..f7c1b4d8b89 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -20,14 +20,14 @@
 /**
  *	\file       htdocs/accountancy/class/bookkeeping.class.php
  *	\ingroup    Advanced accountancy
- *	\brief      File of class to manage general ledger
+ *	\brief      File of class to manage Ledger (General Ledger and Subledger)
  */
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 
 /**
- * Class to manage general ledger
+ * Class to manage Ledger (General Ledger and Subledger)
  */
 class BookKeeping extends CommonObject
 {
@@ -53,7 +53,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = 'accounting_bookkeeping';  
+	public $table_element = 'accounting_bookkeeping';
 
 	public $entity = 1;
 
@@ -75,7 +75,9 @@ class BookKeeping extends CommonObject
 	public $doc_ref;
 	public $fk_doc;
 	public $fk_docdet;
-	public $code_tiers;
+	public $thirdparty_code;
+	public $subledger_account;
+	public $subledger_label;
 	public $numero_compte;
 	public $label_compte;
 	public $debit;
@@ -127,8 +129,14 @@ class BookKeeping extends CommonObject
 		if (isset($this->fk_docdet)) {
 			$this->fk_docdet = trim($this->fk_docdet);
 		}
-		if (isset($this->code_tiers)) {
-			$this->code_tiers = trim($this->code_tiers);
+		if (isset($this->thirdparty_code)) {
+			$this->thirdparty_code = trim($this->thirdparty_code);
+		}
+		if (isset($this->subledger_account)) {
+			$this->subledger_account = trim($this->subledger_account);
+		}
+		if (isset($this->subledger_label)) {
+			$this->subledger_label = trim($this->subledger_label);
 		}
 		if (isset($this->numero_compte)) {
 			$this->numero_compte = trim($this->numero_compte);
@@ -165,7 +173,7 @@ class BookKeeping extends CommonObject
 		}
 		if (empty($this->debit)) $this->debit = 0;
 		if (empty($this->credit)) $this->credit = 0;
-		
+
 		// Check parameters
 		if (empty($this->numero_compte) || $this->numero_compte == '-1')
 		{
@@ -176,7 +184,7 @@ class BookKeeping extends CommonObject
             }
             else
             {
-                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->fk_doc,  $this->doc_type);		    
+                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->fk_doc,  $this->doc_type);
             }
 
 		    return -1;
@@ -191,7 +199,7 @@ class BookKeeping extends CommonObject
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";
 		$sql .= " AND fk_doc = " . $this->fk_doc;
-		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines 
+		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines
 		$sql .= " AND numero_compte = '" . $this->db->escape($this->numero_compte) . "'";
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 
@@ -199,12 +207,12 @@ class BookKeeping extends CommonObject
 
 		if ($resql) {
 			$row = $this->db->fetch_object($resql);
-			if ($row->nb == 0) 
+			if ($row->nb == 0)
 			{
 				// Determine piece_num
 				$sqlnum = "SELECT piece_num";
 				$sqlnum .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-				$sqlnum .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";		// For example doc_type = 'bank' 
+				$sqlnum .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";		// For example doc_type = 'bank'
 				$sqlnum .= " AND fk_docdet = " . $this->db->escape($this->fk_docdet);       		// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
 				$sqlnum .= " AND doc_ref = '" . $this->db->escape($this->doc_ref) . "'";			// ref of source object
 				$sqlnum .= " AND entity IN (" . getEntity('accountancy') . ")";
@@ -244,7 +252,9 @@ class BookKeeping extends CommonObject
 				$sql .= ", doc_ref";
 				$sql .= ", fk_doc";
 				$sql .= ", fk_docdet";
-				$sql .= ", code_tiers";
+				$sql .= ", thirdparty_code";
+				$sql .= ", subledger_account";
+				$sql .= ", subledger_label";
 				$sql .= ", numero_compte";
 				$sql .= ", label_compte";
 				$sql .= ", debit";
@@ -256,25 +266,27 @@ class BookKeeping extends CommonObject
 				$sql .= ", code_journal";
 				$sql .= ", journal_label";
 				$sql .= ", piece_num";
-				$sql .= ', entity';				
+				$sql .= ', entity';
 				$sql .= ") VALUES (";
 				$sql .= "'" . $this->db->idate($this->doc_date) . "'";
-				$sql .= ",'" . $this->doc_type . "'";
-				$sql .= ",'" . $this->doc_ref . "'";
+				$sql .= ",'" . $this->db->escape($this->doc_type) . "'";
+				$sql .= ",'" . $this->db->escape($this->doc_ref) . "'";
 				$sql .= "," . $this->fk_doc;
 				$sql .= "," . $this->fk_docdet;
-				$sql .= ",'" . $this->code_tiers . "'";
-				$sql .= ",'" . $this->numero_compte . "'";
+				$sql .= ",'" . $this->db->escape($this->thirdparty_code) . "'";
+				$sql .= ",'" . $this->db->escape($this->subledger_account) . "'";
+				$sql .= ",'" . $this->db->escape($this->subledger_label) . "'";
+				$sql .= ",'" . $this->db->escape($this->numero_compte) . "'";
 				$sql .= ",'" . $this->db->escape($this->label_compte) . "'";
 				$sql .= "," . $this->debit;
 				$sql .= "," . $this->credit;
 				$sql .= "," . $this->montant;
-				$sql .= ",'" . $this->sens . "'";
-				$sql .= ",'" . $this->fk_user_author . "'";
+				$sql .= ",'" . $this->db->escape($this->sens) . "'";
+				$sql .= ",'" . $this->db->escape($this->fk_user_author) . "'";
 				$sql .= ",'" . $this->db->idate($this->date_create). "'";
-				$sql .= ",'" . $this->code_journal . "'";
-				$sql .= ",'" . $this->journal_label . "'";
-				$sql .= "," . $this->piece_num;
+				$sql .= ",'" . $this->db->escape($this->code_journal) . "'";
+				$sql .= ",'" . $this->db->escape($this->journal_label) . "'";
+				$sql .= "," . $this->db->escape($this->piece_num);
 				$sql .= ", " . (! isset($this->entity) ? '1' : $this->entity);
 				$sql .= ")";
 
@@ -282,7 +294,7 @@ class BookKeeping extends CommonObject
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-					
+
 					if ($id > 0) {
 						$this->id = $id;
 						$result = 0;
@@ -312,11 +324,11 @@ class BookKeeping extends CommonObject
 		}
 
 		if (! $error) {
-			
+
 			if (! $notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.
-				
+
 				// // Call triggers
 				// $result=$this->call_trigger('MYOBJECT_CREATE',$user);
 				// if ($result < 0) $error++;
@@ -360,8 +372,14 @@ class BookKeeping extends CommonObject
 		if (isset($this->fk_docdet)) {
 			$this->fk_docdet = trim($this->fk_docdet);
 		}
-		if (isset($this->code_tiers)) {
-			$this->code_tiers = trim($this->code_tiers);
+		if (isset($this->thirdparty_code)) {
+			$this->thirdparty_code = trim($this->thirdparty_code);
+		}
+		if (isset($this->subledger_account)) {
+			$this->subledger_account = trim($this->subledger_account);
+		}
+		if (isset($this->subledger_label)) {
+			$this->subledger_label = trim($this->subledger_label);
 		}
 		if (isset($this->numero_compte)) {
 			$this->numero_compte = trim($this->numero_compte);
@@ -409,7 +427,9 @@ class BookKeeping extends CommonObject
 		$sql .= 'doc_ref,';
 		$sql .= 'fk_doc,';
 		$sql .= 'fk_docdet,';
-		$sql .= 'code_tiers,';
+		$sql .= 'thirdparty,';
+		$sql .= 'subledger_account,';
+		$sql .= 'subledger_label,';
 		$sql .= 'numero_compte,';
 		$sql .= 'label_compte,';
 		$sql .= 'debit,';
@@ -428,7 +448,9 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . (! isset($this->doc_ref) ? 'NULL' : "'" . $this->db->escape($this->doc_ref) . "'") . ',';
 		$sql .= ' ' . (empty($this->fk_doc) ? '0' : $this->fk_doc) . ',';
 		$sql .= ' ' . (empty($this->fk_docdet) ? '0' : $this->fk_docdet) . ',';
-		$sql .= ' ' . (! isset($this->code_tiers) ? 'NULL' : "'" . $this->db->escape($this->code_tiers) . "'") . ',';
+		$sql .= ' ' . (! isset($this->thirdparty_code) ? 'NULL' : "'" . $this->db->escape($this->thirdparty_code) . "'") . ',';
+		$sql .= ' ' . (! isset($this->subledger_account) ? 'NULL' : "'" . $this->db->escape($this->subledger_account) . "'") . ',';
+		$sql .= ' ' . (! isset($this->subledger_label) ? 'NULL' : "'" . $this->db->escape($this->subledger_label) . "'") . ',';
 		$sql .= ' ' . (! isset($this->numero_compte) ? "'NotDefined'" : "'" . $this->db->escape($this->numero_compte) . "'") . ',';
 		$sql .= ' ' . (! isset($this->label_compte) ? 'NULL' : "'" . $this->db->escape($this->label_compte) . "'") . ',';
 		$sql .= ' ' . (! isset($this->debit) ? 'NULL' : $this->debit ). ',';
@@ -458,7 +480,7 @@ class BookKeeping extends CommonObject
 			if (! $notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.
-				
+
 				// // Call triggers
 				// $result=$this->call_trigger('MYOBJECT_CREATE',$user);
 				// if ($result < 0) $error++;
@@ -483,7 +505,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param int $id Id object
 	 * @param string $ref Ref
-	 * 
+	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null) {
@@ -498,7 +520,9 @@ class BookKeeping extends CommonObject
 		$sql .= " t.doc_ref,";
 		$sql .= " t.fk_doc,";
 		$sql .= " t.fk_docdet,";
-		$sql .= " t.code_tiers,";
+		$sql .= " t.thirdparty_code,";
+		$sql .= " t.subledger_account,";
+		$sql .= " t.subledger_label,";
 		$sql .= " t.numero_compte,";
 		$sql .= " t.label_compte,";
 		$sql .= " t.debit,";
@@ -532,7 +556,9 @@ class BookKeeping extends CommonObject
 				$this->doc_ref = $obj->doc_ref;
 				$this->fk_doc = $obj->fk_doc;
 				$this->fk_docdet = $obj->fk_docdet;
-				$this->code_tiers = $obj->code_tiers;
+				$this->thirdparty_code = $obj->thirdparty_code;
+				$this->subledger_account = $obj->subledger_account;
+				$this->subledger_label = $obj->subledger_label;
 				$this->numero_compte = $obj->numero_compte;
 				$this->label_compte = $obj->label_compte;
 				$this->debit = $obj->debit;
@@ -555,11 +581,11 @@ class BookKeeping extends CommonObject
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-			
+
 			return - 1;
 		}
 	}
-  
+
   /**
 	 * Load object in memory from the database
 	 *
@@ -569,7 +595,7 @@ class BookKeeping extends CommonObject
 	 * @param int $offset offset limit
 	 * @param array $filter filter array
 	 * @param string $filtermode filter mode (AND or OR)
-	 *       
+	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
 	public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
@@ -584,7 +610,9 @@ class BookKeeping extends CommonObject
 		$sql .= " t.doc_ref,";
 		$sql .= " t.fk_doc,";
 		$sql .= " t.fk_docdet,";
-		$sql .= " t.code_tiers,";
+		$sql .= " t.thirdparty_code,";
+		$sql .= " t.subledger_account,";
+		$sql .= " t.subledger_label,";
 		$sql .= " t.numero_compte,";
 		$sql .= " t.label_compte,";
 		$sql .= " t.debit,";
@@ -604,11 +632,11 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
-				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.code_tiers>=' || $key == 't.code_tiers<=') {
+				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
 					$sqlwhere[] = $key . '=' . $value;
-				} elseif ($key == 't.code_tiers' || $key == 't.numero_compte') {
+				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
 				} elseif ($key == 't.label_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
@@ -630,7 +658,7 @@ class BookKeeping extends CommonObject
 		}
 		if (! empty($limit)) {
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
-		} 
+		}
 		$this->lines = array ();
 
 		$resql = $this->db->query($sql);
@@ -647,7 +675,9 @@ class BookKeeping extends CommonObject
 				$line->doc_ref = $obj->doc_ref;
 				$line->fk_doc = $obj->fk_doc;
 				$line->fk_docdet = $obj->fk_docdet;
-				$line->code_tiers = $obj->code_tiers;
+				$line->thirdparty_code = $obj->thirdparty_code;
+				$line->subledger_account = $obj->subledger_account;
+				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
 				$line->debit = $obj->debit;
@@ -672,8 +702,8 @@ class BookKeeping extends CommonObject
 			return - 1;
 		}
 	}
-  
-	
+
+
 	/**
 	 * Load object in memory from the database
 	 *
@@ -683,7 +713,7 @@ class BookKeeping extends CommonObject
 	 * @param int $offset offset limit
 	 * @param array $filter filter array
 	 * @param string $filtermode filter mode (AND or OR)
-	 *       
+	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
@@ -698,7 +728,9 @@ class BookKeeping extends CommonObject
 		$sql .= " t.doc_ref,";
 		$sql .= " t.fk_doc,";
 		$sql .= " t.fk_docdet,";
-		$sql .= " t.code_tiers,";
+		$sql .= " t.thirdparty_code,";
+		$sql .= " t.subledger_account,";
+		$sql .= " t.subledger_label,";
 		$sql .= " t.numero_compte,";
 		$sql .= " t.label_compte,";
 		$sql .= " t.debit,";
@@ -719,11 +751,11 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
-				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.code_tiers>=' || $key == 't.code_tiers<=') {
+				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
 					$sqlwhere[] = $key . '=' . $value;
-				} elseif ($key == 't.code_tiers' || $key == 't.numero_compte') {
+				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
 				} else {
 					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
@@ -758,7 +790,9 @@ class BookKeeping extends CommonObject
 				$line->doc_ref = $obj->doc_ref;
 				$line->fk_doc = $obj->fk_doc;
 				$line->fk_docdet = $obj->fk_docdet;
-				$line->code_tiers = $obj->code_tiers;
+				$line->thirdparty_code = $obj->thirdparty_code;
+				$line->subledger_account = $obj->subledger_account;
+				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
 				$line->debit = $obj->debit;
@@ -814,11 +848,11 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
-				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.code_tiers>=' || $key == 't.code_tiers<=') {
+				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
 					$sqlwhere[] = $key . '=' . $value;
-				} elseif ($key == 't.code_tiers' || $key == 't.numero_compte') {
+				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
 				} else {
 					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
@@ -834,7 +868,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' GROUP BY t.numero_compte';
 
 		if (! empty($sortfield)) {
-			$sql .= $this->db->order($sortfield, $sortorder); 
+			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (! empty($limit)) {
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
@@ -869,7 +903,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param User $user User that modifies
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *       
+	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false) {
@@ -890,8 +924,14 @@ class BookKeeping extends CommonObject
 		if (isset($this->fk_docdet)) {
 			$this->fk_docdet = trim($this->fk_docdet);
 		}
-		if (isset($this->code_tiers)) {
-			$this->code_tiers = trim($this->code_tiers);
+		if (isset($this->thirdparty_code)) {
+			$this->thirdparty_code = trim($this->thirdparty_code);
+		}
+		if (isset($this->subledger_account)) {
+			$this->subledger_account = trim($this->subledger_account);
+		}
+		if (isset($this->subledger_label)) {
+			$this->subledger_label = trim($this->subledger_label);
 		}
 		if (isset($this->numero_compte)) {
 			$this->numero_compte = trim($this->numero_compte);
@@ -937,7 +977,9 @@ class BookKeeping extends CommonObject
 		$sql .= ' doc_ref = ' . (isset($this->doc_ref) ? "'" . $this->db->escape($this->doc_ref) . "'" : "null") . ',';
 		$sql .= ' fk_doc = ' . (isset($this->fk_doc) ? $this->fk_doc : "null") . ',';
 		$sql .= ' fk_docdet = ' . (isset($this->fk_docdet) ? $this->fk_docdet : "null") . ',';
-		$sql .= ' code_tiers = ' . (isset($this->code_tiers) ? "'" . $this->db->escape($this->code_tiers) . "'" : "null") . ',';
+		$sql .= ' thirdparty_code = ' . (isset($this->thirdparty_code) ? "'" . $this->db->escape($this->thirdparty_code) . "'" : "null") . ',';
+		$sql .= ' subledger_account = ' . (isset($this->subledger_account) ? "'" . $this->db->escape($this->subledger_account) . "'" : "null") . ',';
+		$sql .= ' subledger_label = ' . (isset($this->subledger_label) ? "'" . $this->db->escape($this->subledger_label) . "'" : "null") . ',';
 		$sql .= ' numero_compte = ' . (isset($this->numero_compte) ? "'" . $this->db->escape($this->numero_compte) . "'" : "null") . ',';
 		$sql .= ' label_compte = ' . (isset($this->label_compte) ? "'" . $this->db->escape($this->label_compte) . "'" : "null") . ',';
 		$sql .= ' debit = ' . (isset($this->debit) ? $this->debit : "null") . ',';
@@ -963,7 +1005,7 @@ class BookKeeping extends CommonObject
 		if (! $error && ! $notrigger) {
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action calls a trigger.
-			
+
 			// // Call triggers
 			// $result=$this->call_trigger('MYOBJECT_MODIFY',$user);
 			// if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
@@ -987,7 +1029,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param User $user User that deletes
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *       
+	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false) {
@@ -1070,7 +1112,7 @@ class BookKeeping extends CommonObject
 	function deleteByYearAndJournal($delyear='', $journal='') {
 	    global $conf;
 
-	    if (empty($delyear) && empty($journal)) 
+	    if (empty($delyear) && empty($journal))
 	    {
 	        return -1;
 	    }
@@ -1137,7 +1179,7 @@ class BookKeeping extends CommonObject
 	 * Load an object from its id and create a new one in database
 	 *
 	 * @param int $fromid Id of object to clone
-	 *       
+	 *
 	 * @return int New id of clone
 	 */
 	public function createFromClone($fromid) {
@@ -1196,8 +1238,10 @@ class BookKeeping extends CommonObject
 		$this->doc_ref = '';
 		$this->fk_doc = '';
 		$this->fk_docdet = '';
-		$this->code_tiers = '';
-		$this->numero_compte = '';
+		$this->thirdparty_code = 'CU001';
+		$this->subledger_account = '410CU001';
+		$this->subledger_label = 'My customer company';
+		$this->numero_compte = '410';
 		$this->label_compte = '';
 		$this->debit = 99.9;
 		$this->credit = '';
@@ -1205,8 +1249,8 @@ class BookKeeping extends CommonObject
 		$this->sens = '';
 		$this->fk_user_author = $user->id;
 		$this->import_key = '';
-		$this->code_journal = '';
-		$this->journal_label = '';
+		$this->code_journal = 'VT';
+		$this->journal_label = 'Journal de vente';
 		$this->piece_num = '';
 	}
 
@@ -1249,7 +1293,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @return string      Next numero to use
 	 */
-	public function getNextNumMvt() 
+	public function getNextNumMvt()
 	{
 		global $conf;
 
@@ -1281,7 +1325,7 @@ class BookKeeping extends CommonObject
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
-		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
+		$sql .= " doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
@@ -1303,7 +1347,9 @@ class BookKeeping extends CommonObject
 				$line->doc_ref = $obj->doc_ref;
 				$line->fk_doc = $obj->fk_doc;
 				$line->fk_docdet = $obj->fk_docdet;
-				$line->code_tiers = $obj->code_tiers;
+				$line->thirdparty_code = $obj->thirdparty_code;
+				$line->subledger_account = $obj->subledger_account;
+				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
 				$line->debit = $obj->debit;
@@ -1335,7 +1381,7 @@ class BookKeeping extends CommonObject
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
-		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
+		$sql .= " doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
@@ -1359,7 +1405,9 @@ class BookKeeping extends CommonObject
 				$line->doc_ref = $obj->doc_ref;
 				$line->fk_doc = $obj->fk_doc;
 				$line->fk_docdet = $obj->fk_docdet;
-				$line->code_tiers = $obj->code_tiers;
+				$line->thirdparty_code = $obj->thirdparty_code;
+				$line->subledger_account = $obj->subledger_account;
+				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
 				$line->debit = $obj->debit;
@@ -1380,9 +1428,9 @@ class BookKeeping extends CommonObject
 			return - 1;
 		}
 	}
-  
-  
-  
+
+
+
     /**
     * Return list of accounts with label by chart of accounts
     *
@@ -1397,11 +1445,11 @@ class BookKeeping extends CommonObject
     */
     function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '') {
         global $conf;
-        
+
         require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-        
+
         $pcgver = $conf->global->CHARTOFACCOUNTS;
-        
+
         $sql = "SELECT DISTINCT ab.numero_compte as account_number, aa.label as label, aa.rowid as rowid, aa.fk_pcg_version";
         $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = ab.numero_compte";
@@ -1410,43 +1458,43 @@ class BookKeeping extends CommonObject
         $sql .= " AND asy.rowid = " . $pcgver;
 	    $sql .= " AND ab.entity IN (" . getEntity('accountancy') . ")";
         $sql .= " ORDER BY account_number ASC";
-        
+
         dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        
+
         if (! $resql) {
             $this->error = "Error " . $this->db->lasterror();
             dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
             return - 1;
         }
-        
+
         $out = ajax_combobox($htmlname, $event);
-        
+
         $options = array();
         $selected = null;
-        
+
         while ($obj = $this->db->fetch_object($resql)) {
             $label = length_accountg($obj->account_number) . ' - ' . $obj->label;
-            
+
             $select_value_in = $obj->rowid;
             $select_value_out = $obj->rowid;
-            
+
             if ($select_in == 1) {
                 $select_value_in = $obj->account_number;
             }
             if ($select_out == 1) {
                 $select_value_out = $obj->account_number;
             }
-            
+
             // Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
             // Because same account_number can be share between different accounting_system and do have the same meaning
             if (($selectid != '') && $selectid == $select_value_in) {
                 $selected = $select_value_out;
             }
-            
+
             $options[$select_value_out] = $label;
         }
-        
+
         $out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
         $this->db->free($resql);
         return $out;
@@ -1454,7 +1502,7 @@ class BookKeeping extends CommonObject
 
 
 	/**
-	* Description of a root accounting account 
+	* Description of a root accounting account
 	*
 	* @param 	string 	$account	Accounting account
 	* @return 	string 	            Root account
@@ -1470,7 +1518,7 @@ class BookKeeping extends CommonObject
         $sql .= " AND asy.rowid = " . $pcgver;
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as parent ON aa.account_parent = parent.rowid";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as root ON parent.account_parent = root.rowid";
-        $sql .= " WHERE aa.account_number = '" . $account . "'";  
+        $sql .= " WHERE aa.account_number = '" . $account . "'";
         $sql .= " AND parent.active = 1";
         $sql .= " AND root.active = 1";
         $sql .= " AND aa.entity IN (" . getEntity('accountancy') . ")";
@@ -1480,7 +1528,7 @@ class BookKeeping extends CommonObject
 		if ($resql) {
 			$obj = '';
 			if ($this->db->num_rows($resql)) {
-				$obj = $this->db->fetch_object($resql);	
+				$obj = $this->db->fetch_object($resql);
 			}
 
 			return $obj->label;
@@ -1492,8 +1540,8 @@ class BookKeeping extends CommonObject
 			return -1;
 		}
 	}
-  
-  
+
+
   /**
 	* Description of accounting account
 	*
@@ -1519,7 +1567,7 @@ class BookKeeping extends CommonObject
 		if ($resql) {
 			$obj = '';
 			if ($this->db->num_rows($resql)) {
-				$obj = $this->db->fetch_object($resql);	
+				$obj = $this->db->fetch_object($resql);
 			}
 			if(empty($obj->category)){
 				return $obj->label;
@@ -1532,7 +1580,7 @@ class BookKeeping extends CommonObject
 			return -1;
 		}
 	}
-	
+
 }
 
 
@@ -1547,7 +1595,9 @@ class BookKeepingLine
 	public $doc_ref;
 	public $fk_doc;
 	public $fk_docdet;
-	public $code_tiers;
+	public $thirdparty_code;
+	public $subledger_account;
+	public $subledger_label;
 	public $numero_compte;
 	public $label_compte;
 	public $debit;
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 02549be2a94..bf3e80fe866 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -63,8 +63,6 @@ print load_fiche_titre($langs->trans("AccountancyArea"), '', 'title_accountancy'
 
 $step = 0;
 
-print "<br>\n";
-
 print $langs->trans("AccountancyAreaDescIntro")."<br>\n";
 print "<br>\n";print "<br>\n";
 
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 9eae2072243..6c391531662 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -364,7 +364,7 @@ if (! $error && $action == 'writebookkeeping') {
 					$bookkeeping->date_create = $now;
 
 					if ($tabtype[$key] == 'payment') {
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 
 						$sqlmid = 'SELECT fac.facnumber';
 						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
@@ -378,7 +378,7 @@ if (! $error && $action == 'writebookkeeping') {
 							$bookkeeping->doc_ref = $objmid->facnumber;	// Ref of invoice
 						}
 					} else if ($tabtype[$key] == 'payment_supplier') {
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 
 						$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
 						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
@@ -392,7 +392,7 @@ if (! $error && $action == 'writebookkeeping') {
 							$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
 						}
 					} else if ($tabtype[$key] == 'payment_expensereport') {
-						$bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
+						$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
 
 						$sqlmid = 'SELECT e.ref';
 						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
@@ -405,13 +405,13 @@ if (! $error && $action == 'writebookkeeping') {
 							$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
 						}
 					} else if ($tabtype[$key] == 'payment_vat') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat payment
 					} else if ($tabtype[$key] == 'payment_donation') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
 					} else if ($tabtype[$key] == 'payment_salary') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->label_compte = $tabuser[$key]['name'];
 						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Ref of salary payment
 					}
@@ -458,7 +458,7 @@ if (! $error && $action == 'writebookkeeping') {
 					$bookkeeping->date_create = $now;
 
 					if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 					} else if ($tabtype[$key] == 'payment') {	// If payment is payment of customer invoice, we get ref of invoice
 						$sqlmid = 'SELECT fac.facnumber';
@@ -472,7 +472,7 @@ if (! $error && $action == 'writebookkeeping') {
 							$objmid = $db->fetch_object($resultmid);
 							$bookkeeping->doc_ref = $objmid->facnumber;
 						}
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 						$bookkeeping->numero_compte = $k;
 					} else if ($tabtype[$key] == 'payment_supplier') {		   // If payment is payment of supplier invoice, we get ref of invoice
 						$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
@@ -486,23 +486,23 @@ if (! $error && $action == 'writebookkeeping') {
 							$objmid = $db->fetch_object($resultmid);
 							$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
 						}
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 						$bookkeeping->numero_compte = $k;
 					} else if ($tabtype[$key] == 'payment_vat') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat
 					} else if ($tabtype[$key] == 'payment_donation') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
 					} else if ($tabtype[$key] == 'payment_salary') {
-						$bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
+						$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
 						$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
 						$bookkeeping->label_compte = $tabuser[$key]['name'];
 						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Rowid of salary payment
 					} else if ($tabtype[$key] == 'banktransfert') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 					} else {
 						// FIXME Should be a temporary account ???
@@ -758,7 +758,7 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-	print '<div class="tabsAction">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	print '</div>';
 
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 557218a0ee6..759dca8dae9 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -62,7 +62,7 @@ if ($user->societe_id > 0)
 /*
  * Actions
  */
- 
+
 // Get informations of journal
 $accountingjournalstatic = new AccountingJournal($db);
 $accountingjournalstatic->fetch($id_journal);
@@ -175,7 +175,8 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'expense_report';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-					$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
+					$bookkeeping->subledger_account = $tabuser[$key]['user_accountancy_code'];
+					$bookkeeping->subledger_label = $tabuser[$key]['user_accountancy_code'];
 					$bookkeeping->label_compte = $tabuser[$key]['name'];
 					$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
 					$bookkeeping->montant = $mt;
@@ -222,7 +223,8 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'expense_report';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->subledger_label = '';
 						$bookkeeping->label_compte = $accountingaccount->label;
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->montant = $mt;
@@ -267,7 +269,8 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'expense_report';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-					$bookkeeping->code_tiers = '';
+					$bookkeeping->subledger_account = '';
+					$bookkeeping->subledger_label = '';
 					$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->montant = $mt;
@@ -462,7 +465,7 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-	print '<div class="tabsAction">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	print '</div>';
 
@@ -576,7 +579,7 @@ if (empty($action) || $action == 'view') {
 			}
 			else print $accountoshow;
 			print "</td>";
-			print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("Code_tiers") . "</td>";
+			print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("subledger_account") . "</td>";
 			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "</tr>";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 3729860d29d..506c5517821 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -131,7 +131,7 @@ if ($result) {
 
 		// contrôles
 		$compta_soc = (! empty($obj->code_compta_fournisseur)) ? $obj->code_compta_fournisseur : $cptfour;
-		
+
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
@@ -214,9 +214,10 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'supplier_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
-					$bookkeeping->numero_compte = $tabcompany[$key]['code_compta_fournisseur'];
+					$bookkeeping->thirdparty_code = $tabcompany[$key]['code_fournisseur'];
+					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta_fournisseur'];
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("subledger_account");
+					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
 					$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
@@ -261,7 +262,8 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'supplier_invoice';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->subledger_label = '';
 						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->montant = $mt;
@@ -306,7 +308,8 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'supplier_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = '';
+					$bookkeeping->subledger_account = '';
+					$bookkeeping->subledger_label = '';
 					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->montant = $mt;
@@ -479,7 +482,7 @@ $companystatic = new Fournisseur($db);
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["ref"] . '"' . $sep;
 				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
+				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("subledger_account") . '"' . $sep;
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
 				print '"' . ($mt >= 0 ? price($mt) : '') . '"';
 			}
@@ -518,7 +521,7 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-	print '<div class="tabsAction">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	print '</div>';
 
@@ -635,7 +638,7 @@ if (empty($action) || $action == 'view') {
 			}
 			else print $accountoshow;
 			print "</td>";
-			print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers") . "</td>";
+			print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("subledger_account") . "</td>";
 			// print "</td><td>" . $langs->trans("ThirdParty");
 			// print ' (' . $companystatic->getNomUrl(0, 'supplier', 16) . ')';
 			// print "</td>";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 0d2e7ac19cc..8506b2a480b 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -231,10 +231,10 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'customer_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
-					$bookkeeping->numero_compte = $tabcompany[$key]['code_compta'];
-					// $bookkeeping->label_compte = $tabcompany[$key]['name'];
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
+					$bookkeeping->thirdparty_code = $tabcompany[$key]['code_client'];
+					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
+					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account");
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
 					$bookkeeping->debit = ($mt >= 0) ? $mt : 0;
@@ -277,7 +277,8 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'customer_invoice';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add;
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->subledger_label = '';
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
 						$bookkeeping->montant = $mt;
@@ -321,7 +322,8 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'customer_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = '';
+					$bookkeeping->subledger_account = '';
+					$bookkeeping->subledger_label = '';
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
 					$bookkeeping->montant = $mt;
@@ -373,7 +375,7 @@ if ($action == 'writebookkeeping') {
 	{
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
-	
+
 	$action='';
 }
 
@@ -416,7 +418,7 @@ $form = new Form($db);
 				print length_accounta(html_entity_decode($k)) . $sep;
 				print ($mt < 0 ? 'C' : 'D') . $sep;
 				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-				print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . $sep;
+				print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account") . $sep;
 				print $val["ref"];
 				print "\n";
 			}
@@ -469,7 +471,7 @@ $form = new Form($db);
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["ref"] . '"' . $sep;
 				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
+				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account") . '"' . $sep;
 				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
 				print "\n";
@@ -535,7 +537,7 @@ if (empty($action) || $action == 'view') {
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
-	print '<div class="tabsAction">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	print '</div>';
 
@@ -602,7 +604,7 @@ if (empty($action) || $action == 'view') {
 			// print "</td><td>" . $langs->trans("ThirdParty");
 			// print ' (' . $companystatic->getNomUrl(0, 'customer', 16) . ')';
 			print '</td>';
-			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . "</td>";
+			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account") . "</td>";
 			print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 			print "</tr>";
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 1780da06456..af0874b8c30 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -224,7 +224,7 @@ class modAccounting extends DolibarrModules
 		$this->rights[$r][4] = 'chartofaccount';
 		$this->rights[$r][5] = '';
 		$r++;
-		
+
 		$this->rights[$r][0] = 50401;
 		$this->rights[$r][1] = 'Bind products and invoices with accounting accounts';
 		$this->rights[$r][2] = 'r';
@@ -242,9 +242,9 @@ class modAccounting extends DolibarrModules
 		$this->rights[$r][5] = 'dispatch_advanced';
 		$r++;
         */
-		
+
 		$this->rights[$r][0] = 50411;
-		$this->rights[$r][1] = 'Read operations in General Ledger';
+		$this->rights[$r][1] = 'Read operations in Ledger';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'mouvements';
@@ -252,7 +252,7 @@ class modAccounting extends DolibarrModules
 		$r++;
 
 		$this->rights[$r][0] = 50412;
-		$this->rights[$r][1] = 'Write/Edit operations in General Ledger';
+		$this->rights[$r][1] = 'Write/Edit operations in Ledger';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'mouvements';
@@ -260,7 +260,7 @@ class modAccounting extends DolibarrModules
 		$r++;
 
 		$this->rights[$r][0] = 50420;
-		$this->rights[$r][1] = 'Report and export reports (turnover, balance, journals, general ledger)';
+		$this->rights[$r][1] = 'Report and export reports (turnover, balance, journals, ledger)';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'comptarapport';
@@ -279,7 +279,7 @@ class modAccounting extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
+
 		// Exports
         //--------
         $r=0;
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 46e3b698100..e5ee1866567 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -187,6 +187,7 @@ UPDATE llx_bank_account as ba set fk_accountancy_journal = (SELECT rowid FROM ll
 ALTER TABLE llx_bank_account ADD CONSTRAINT fk_bank_account_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
 
 --Update general ledger for FEC format & harmonization
+
 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN code_tiers varchar(32);
 ALTER TABLE llx_accounting_bookkeeping CHANGE COLUMN code_tiers thirdparty_code varchar(32);
 
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 5f3d4eef2da..8ff65371fa5 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -49,8 +49,8 @@ AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. F
 AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
 AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
 
-AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>. 
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>. 
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -61,6 +61,8 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
@@ -77,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
-Bookkeeping=General ledger
+WriteBookKeeping=Journalize transactions in Ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -141,16 +143,16 @@ TransactionNumShort=Num. transaction
 AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
-DelBookKeeping=Delete record of the general ledger
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -192,7 +194,7 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
+GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
 NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
@@ -261,4 +263,4 @@ NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so does not contains transaction modified manualy in the General ledger. It will be replaced by a more complete report in a next version. 
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version. 
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index c85a2671c21..6f8a1b5e301 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -190,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month

From f39fb5187a4f490378d672a88794f254af27c055 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2017 20:27:40 +0200
Subject: [PATCH 1121/1163] Fix component to select journal

---
 htdocs/accountancy/bookkeeping/card.php         |  2 +-
 htdocs/accountancy/bookkeeping/list.php         |  6 +++---
 htdocs/compta/bank/card.php                     |  4 ++--
 htdocs/core/class/html.formaccounting.class.php | 17 +++++++----------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 3ef418e2e20..f40bfda856f 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -256,7 +256,7 @@ if ($action == 'create') {
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans("AccountancyJournal").'</td>';
 	print '<td>';
-	print $formaccountancy->select_journal('', 'code_journal', '', 0, '', 1, 1, 1, 1);
+	print $formaccountancy->select_journal('', 'code_journal', '', 0, 1, 1, 1, 1);
 	print '</td></tr>';
 
 	print '<tr>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index b6685248ca7..cd93b1142f8 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -322,7 +322,7 @@ if ($action == 'delbookkeepingyear') {
 		$delyear = dol_print_date(dol_now(), '%Y');
 	}
 	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
-	$journal_array = $formaccounting->selectjournal($deljournal, 'deljournal', '', 1, 'array', 1, 1);
+	$journal_array = $formaccounting->select_journal($deljournal, 'deljournal', '', 1, 1, 1, '', 0, 1);
 
 	$form_question['delyear'] = array (
 			'name' => 'delyear',
@@ -333,9 +333,9 @@ if ($action == 'delbookkeepingyear') {
 	);
 	$form_question['deljournal'] = array (
 			'name' => 'deljournal',
-			'type' => 'select',
+			'type' => 'other',       // We don't use select here, the journal_array is already a select html component
 			'label' => $langs->trans('DelJournal'),
-			'values' => $journal_array,
+			'value' => $journal_array,
 			'default' => $deljournal
 	);
 
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 06918ff2846..1f55698d13f 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -524,7 +524,7 @@ if ($action == 'create')
 	{
 		print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 	    print '<td>';
-		print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
+		print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, 0, 0);
 		print '</td></tr>';
 	}
 
@@ -982,7 +982,7 @@ else
 		{
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
-			print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, '', 0, 0);
+			print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, 0, 0);
 			print '</td></tr>';
 		}
 
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 2d444c1aefe..e37e1690ca2 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -54,15 +54,14 @@ class FormAccounting extends Form
 	 * @param	string	$htmlname	Name of field in html form
 	 * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
 	 * @param	int		$showempty	Add an empty field
-	 * @param	array	$event		Event options
 	 * @param	int		$select_in	0=selectid value is the journal rowid (default) or 1=selectid is journal code
 	 * @param	int		$select_out	Set value returned by select. 0=rowid (default), 1=code
 	 * @param	string	$morecss	More css non HTML object
 	 * @param	string	$usecache	Key to use to store result into a cache. Next call with same key will reuse the cache.
-	 *
+	 * @param   int     $disabledajaxcombo Disable ajax combo box.
 	 * @return	string				String with HTML select
 	 */
-	function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
+	function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='', $disabledajaxcombo=0)
 	{
 		global $conf;
 
@@ -92,8 +91,6 @@ class FormAccounting extends Form
 				return -1;
 			}
 
-			$out = ajax_combobox($htmlname, $event);
-
     		$selected = 0;
 			while ($obj = $this->db->fetch_object($resql))
 			{
@@ -125,7 +122,7 @@ class FormAccounting extends Form
 			}
 		}
 
-		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, ($disabledajaxcombo?0:1));
 
 		return $out;
 	}
@@ -204,9 +201,9 @@ class FormAccounting extends Form
         {
             dol_print_error($db,$db->lasterror());
         }
-        
-        $out .= ajax_combobox($htmlname, $event);
-        
+
+        $out .= ajax_combobox($htmlname, array());
+
         print $out;
     }
 
@@ -260,7 +257,7 @@ class FormAccounting extends Form
 		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
 		$out = '';
-		
+
     	$options = array();
 		if ($usecache && ! empty($this->options_cache[$usecache]))
 		{

From 78d5520741746af4874f0a628d48996a83e95094 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 15 Jun 2017 21:23:35 +0200
Subject: [PATCH 1122/1163] Fix: missing _cleanObjectDatas function

---
 htdocs/admin/agenda.php                       |  3 +-
 htdocs/admin/agenda_other.php                 |  1 +
 .../action/class/api_agendaevents.class.php   | 58 +++++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 22679ca697b..a30ebad4703 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -33,6 +33,7 @@ if (!$user->admin)
 
 $langs->load("admin");
 $langs->load("other");
+$langs->load("agenda");
 
 $action = GETPOST('action','alpha');
 $cancel = GETPOST('cancel','alpha');
@@ -172,7 +173,7 @@ if (! empty($triggers))
 			if ($trigger['code'] == 'FICHINTER_CLASSIFY_BILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;
 			if ($trigger['code'] == 'FICHINTER_CLASSIFY_UNBILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;
 
-			
+
 			print '<tr class="oddeven">';
 			print '<td>'.$trigger['code'].'</td>';
 			print '<td>'.$trigger['label'].'</td>';
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 44ec3ade889..31bcf1077e6 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -36,6 +36,7 @@ if (!$user->admin)
 
 $langs->load("admin");
 $langs->load("other");
+$langs->load("agenda");
 
 $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index f32c721a826..40737a83799 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -111,8 +111,11 @@ class AgendaEvents extends DolibarrApi
         if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
 
         $sql = "SELECT t.id as rowid";
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
         $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
         $sql.= ' WHERE t.entity IN ('.getEntity('agenda').')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($user_ids) $sql.=" AND t.fk_user_action IN (".$user_ids.")";
         if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
         // Insert sale filter
@@ -298,4 +301,59 @@ class AgendaEvents extends DolibarrApi
         }
         return $event;
     }
+
+    /**
+     * Clean sensible object datas
+     *
+     * @param	object	$object		Object to clean
+     * @return	array				Array of cleaned object properties
+     */
+    function _cleanObjectDatas($object) {
+
+    	$object = parent::_cleanObjectDatas($object);
+
+    	unset($object->import_key);
+    	unset($object->array_options);
+    	unset($object->linkedObjectsIds);
+    	unset($object->context);
+    	unset($object->canvas);
+    	unset($object->fk_project);
+    	unset($object->contact);
+    	unset($object->contact_id);
+    	unset($object->thirdparty);
+    	unset($object->user);
+    	unset($object->origin);
+    	unset($object->origin_id);
+    	unset($object->ref_ext);
+    	unset($object->statut);
+    	unset($object->country);
+    	unset($object->country_id);
+    	unset($object->country_code);
+    	unset($object->barcode_type);
+    	unset($object->barcode_type_code);
+    	unset($object->barcode_type_label);
+    	unset($object->barcode_type_coder);
+    	unset($object->mode_reglement_id);
+    	unset($object->cond_reglement_id);
+    	unset($object->cond_reglement);
+    	unset($object->fk_delivery_address);
+    	unset($object->shipping_method_id);
+    	unset($object->fk_account);
+    	unset($object->total_ht);
+    	unset($object->total_tva);
+    	unset($object->total_localtax1);
+    	unset($object->total_localtax2);
+    	unset($object->total_ttc);
+    	unset($object->fk_incoterms);
+    	unset($object->libelle_incoterms);
+    	unset($object->location_incoterms);
+    	unset($object->name);
+    	unset($object->lastname);
+    	unset($object->firstname);
+    	unset($object->civility_id);
+    	unset($object->contact);
+    	unset($object->societe);
+
+    	return $object;
+    }
 }

From 8b7ca1f280e5b6f1465caddd1cd4d9c12adf920f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2017 21:27:20 +0200
Subject: [PATCH 1123/1163] Fix missing vat_src_code into table of expense
 report

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql        | 3 +++
 htdocs/install/mysql/tables/llx_expensereport_det.sql | 1 +
 2 files changed, 4 insertions(+)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index e5ee1866567..a66ef47fba6 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -90,6 +90,8 @@ ALTER TABLE llx_expedition ADD COLUMN fk_projet integer DEFAULT NULL after fk_so
 ALTER TABLE llx_expensereport ADD COLUMN import_key			varchar(14);
 ALTER TABLE llx_expensereport ADD COLUMN extraparams		varchar(255);	
 
+
+
 ALTER TABLE llx_bank_account ADD COLUMN extraparams		varchar(255);	
 
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30);
@@ -230,6 +232,7 @@ ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoic
 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_invoice_supplier_source FOREIGN KEY (fk_invoice_supplier)      REFERENCES llx_facture_fourn (rowid);
 
 ALTER TABLE llx_facture_rec ADD COLUMN vat_src_code	varchar(10) DEFAULT '';
+ALTER TABLE llx_expensereport_det ADD COLUMN vat_src_code varchar(10)  DEFAULT '';
 
 DELETE FROM llx_const WHERE name = __ENCRYPT('ADHERENT_BANK_USE_AUTO')__;
 
diff --git a/htdocs/install/mysql/tables/llx_expensereport_det.sql b/htdocs/install/mysql/tables/llx_expensereport_det.sql
index 069cd534e4f..8d01f29de68 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_det.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_det.sql
@@ -27,6 +27,7 @@ CREATE TABLE llx_expensereport_det
    qty real NOT NULL,
    value_unit real NOT NULL,
    remise_percent real,
+   vat_src_code					varchar(10)  DEFAULT '',		-- Vat code used as source of vat fields. Not strict foreign key here.
    tva_tx						double(6,3),					-- Vat rate
    localtax1_tx               	double(6,3)  DEFAULT 0,    		-- localtax1 rate
    localtax1_type			 	varchar(10)	  	 NULL, 			-- localtax1 type

From 9410466d727f94f6e2b99c390f43a2e4a4bc8e00 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 15 Jun 2017 21:51:31 +0200
Subject: [PATCH 1124/1163] Fix: better check and security

---
 .../action/class/api_agendaevents.class.php   | 31 ++++++++++---------
 htdocs/core/lib/security.lib.php              |  4 +--
 htdocs/societe/class/api_contacts.class.php   | 10 +++---
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 40737a83799..40fce1fd640 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -63,20 +63,20 @@ class AgendaEvents extends DolibarrApi
      */
     function get($id)
     {
-        if(! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+        if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
             throw new RestException(401, "Insuffisant rights to read an event");
         }
 
         $result = $this->actioncomm->fetch($id);
-        if( ! $result ) {
+        if ( ! $result ) {
             throw new RestException(404, 'Agenda Events not found');
         }
 
-        if(! DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
+        if (! DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
             throw new RestException(401, "Insuffisant rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id)) {
+		if ( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -102,6 +102,10 @@ class AgendaEvents extends DolibarrApi
 
         $obj_ret = array();
 
+        if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+        	throw new RestException(401, "Insuffisant rights to read events");
+        }
+
         // case of external user
         $socid = 0;
         if (! empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
@@ -155,7 +159,7 @@ class AgendaEvents extends DolibarrApi
             {
                 $obj = $db->fetch_object($result);
                 $actioncomm_static = new ActionComm($db);
-                if($actioncomm_static->fetch($obj->rowid)) {
+                if ($actioncomm_static->fetch($obj->rowid)) {
                     $obj_ret[] = $this->_cleanObjectDatas($actioncomm_static);
                 }
                 $i++;
@@ -164,7 +168,7 @@ class AgendaEvents extends DolibarrApi
         else {
             throw new RestException(503, 'Error when retrieve Agenda Event list : '.$db->lasterror());
         }
-        if( ! count($obj_ret)) {
+        if ( ! count($obj_ret)) {
             throw new RestException(404, 'No Agenda Event found');
         }
 		return $obj_ret;
@@ -178,10 +182,10 @@ class AgendaEvents extends DolibarrApi
      */
     function post($request_data = NULL)
     {
-      if(! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
+      if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
 			  throw new RestException(401, "Insuffisant rights to create your Agenda Event");
 		  }
-      if(! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
+      if (! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
 		      throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		  }
 
@@ -216,19 +220,19 @@ class AgendaEvents extends DolibarrApi
      */
     /*
     function put($id, $request_data = NULL) {
-      if(! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
+      if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
 			  throw new RestException(401, "Insuffisant rights to create your Agenda Event");
 		  }
-      if(! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
+      if (! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
 		      throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		  }
 
         $result = $this->expensereport->fetch($id);
-        if( ! $result ) {
+        if ( ! $result ) {
             throw new RestException(404, 'expensereport not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+		if ( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         foreach($request_data as $field => $value) {
@@ -236,7 +240,7 @@ class AgendaEvents extends DolibarrApi
             $this->expensereport->$field = $value;
         }
 
-        if($this->expensereport->update($id, DolibarrApiAccess::$user,1,'','','update'))
+        if ($this->expensereport->update($id, DolibarrApiAccess::$user,1,'','','update'))
             return $this->get($id);
 
         return false;
@@ -314,7 +318,6 @@ class AgendaEvents extends DolibarrApi
 
     	unset($object->import_key);
     	unset($object->array_options);
-    	unset($object->linkedObjectsIds);
     	unset($object->context);
     	unset($object->canvas);
     	unset($object->fk_project);
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 9a9e78513c3..d3250263a6f 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -403,9 +403,9 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
 		else if (in_array($feature,$checksoc))	// We check feature = checksoc
 		{
 			// If external user: Check permission for external users
-			if ($user->societe_id > 0)
+			if ($user->socid > 0)
 			{
-				if ($user->societe_id <> $objectid) return false;
+				if ($user->socid <> $objectid) return false;
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
 			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 58fe15cf282..f136d6895b2 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -43,7 +43,8 @@ class Contacts extends DolibarrApi
 	/**
 	 * Constructor
 	 */
-	function __construct() {
+	function __construct()
+	{
 		global $db, $conf;
 		$this->db = $db;
 		$this->contact = new Contact($this->db);
@@ -59,7 +60,8 @@ class Contacts extends DolibarrApi
 	 *
 	 * @throws 	RestException
 	 */
-	function get($id) {
+	function get($id)
+	{
 		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
 		{
 			throw new RestException(401, 'No permission to read contacts');
@@ -105,7 +107,7 @@ class Contacts extends DolibarrApi
 		}
 
         // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-		$socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $thirdparty_ids;
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
@@ -171,7 +173,7 @@ class Contacts extends DolibarrApi
 			}
 		}
 		else {
-			throw new RestException(503, 'Error when retreive contacts : ' . $sql);
+			throw new RestException(503, 'Error when retrieve contacts : ' . $sql);
 		}
 		if (!count($obj_ret))
 		{

From 8149bf62a89ca60b0dfd44ec88bff6b600121ea1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2017 23:47:19 +0200
Subject: [PATCH 1125/1163] Fix ajaxcombo broken on accouting account edition
 on vat dictionary.

---
 htdocs/admin/dict.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index c83a3aa39be..f920b04bf62 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1502,9 +1502,12 @@ if ($id)
                             }
 
                             $class='tddict';
+                            if ($fieldlist[$field] == 'note' && $id == 10) $class.=' tdoverflowmax200';
                             if ($fieldlist[$field] == 'tracking') $class.=' tdoverflowauto';
                             if ($fieldlist[$field] == 'code') $class.=' width100';
                             if ($fieldlist[$field] == 'position') $class.=' right';
+                            if ($fieldlist[$field] == 'localtax1_type') $class.=' nowrap';
+                            if ($fieldlist[$field] == 'localtax2_type') $class.=' nowrap';
                             // Show value for field
 							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
                         }
@@ -1694,7 +1697,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			}	// For state page, we do not show the country input (we link to region, not country)
 			print '<td>';
 			$fieldname='country';
-			print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
+			print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), $fieldname, '', 28, 'maxwidth150 maxwidthonsmartphone');
 			print '</td>';
 		}
 		elseif ($fieldlist[$field] == 'country_id')
@@ -1820,7 +1823,7 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			{
 			    $fieldname = $fieldlist[$field];
 				$accountancy_account = (! empty($obj->$fieldname) ? $obj->$fieldname : 0);
-				print $formaccounting->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+				print $formaccounting->select_account($accountancy_account, '.'.$fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			}
 			else
 			{

From ac708a8ee993457e43da17b7ddbcb1a06cd1e296 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2017 23:58:56 +0200
Subject: [PATCH 1126/1163] Debug accounting module with new structure v6 Make
 accounting module compatible with the new vat code to identify 2 vat code
 with same rate.

---
 .../accountancy/class/bookkeeping.class.php   |  7 +-
 htdocs/accountancy/journal/bankjournal.php    | 10 ++-
 .../journal/expensereportsjournal.php         | 28 ++++---
 .../accountancy/journal/purchasesjournal.php  | 47 ++++++++----
 htdocs/accountancy/journal/sellsjournal.php   | 48 +++++++-----
 .../core/class/html.formaccounting.class.php  |  4 +-
 htdocs/core/lib/functions.lib.php             | 73 ++++++++++++-------
 htdocs/langs/en_US/errors.lang                |  2 +
 8 files changed, 142 insertions(+), 77 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index f7c1b4d8b89..9ed4ef29ac1 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -184,7 +184,8 @@ class BookKeeping extends CommonObject
             }
             else
             {
-                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->fk_doc,  $this->doc_type);
+                //$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->doc_ref,  $this->label_compte);
+                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForLine', $this->label_compte);
             }
 
 		    return -1;
@@ -451,7 +452,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . (! isset($this->thirdparty_code) ? 'NULL' : "'" . $this->db->escape($this->thirdparty_code) . "'") . ',';
 		$sql .= ' ' . (! isset($this->subledger_account) ? 'NULL' : "'" . $this->db->escape($this->subledger_account) . "'") . ',';
 		$sql .= ' ' . (! isset($this->subledger_label) ? 'NULL' : "'" . $this->db->escape($this->subledger_label) . "'") . ',';
-		$sql .= ' ' . (! isset($this->numero_compte) ? "'NotDefined'" : "'" . $this->db->escape($this->numero_compte) . "'") . ',';
+		$sql .= ' ' . (! isset($this->numero_compte) ? "NULL" : "'" . $this->db->escape($this->numero_compte) . "'") . ',';
 		$sql .= ' ' . (! isset($this->label_compte) ? 'NULL' : "'" . $this->db->escape($this->label_compte) . "'") . ',';
 		$sql .= ' ' . (! isset($this->debit) ? 'NULL' : $this->debit ). ',';
 		$sql .= ' ' . (! isset($this->credit) ? 'NULL' : $this->credit ). ',';
@@ -461,7 +462,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . (! isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'") . ',';
 		$sql .= ' ' . (empty($this->code_journal) ? 'NULL' : "'" . $this->db->escape($this->code_journal) . "'") . ',';
 		$sql .= ' ' . (empty($this->journal_label) ? 'NULL' : "'" . $this->db->escape($this->journal_label) . "'") . ',';
-		$sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->piece_num).',';
+		$sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->db->escape($this->piece_num)).',';
 		$sql .= ' ' . (! isset($this->entity) ? '1' : $this->entity);
 		$sql .= ')';
 
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 6c391531662..568edf051ff 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -103,8 +103,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-$idpays = $p[0];
+$idpays = $mysoc->country_id;
 
 $sql  = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
 $sql .= " ba.courant, ba.ref as baref, ba.account_number, ba.fk_accountancy_journal,";
@@ -144,6 +143,7 @@ $result = $db->query($sql);
 if ($result) {
 
 	$num = $db->num_rows($result);
+
 	// Variables
 	$account_supplier = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"));
 	$account_customer = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
@@ -537,6 +537,12 @@ if (! $error && $action == 'writebookkeeping') {
 		else
 		{
 			$db->rollback();
+
+			if ($error >= 10)
+			{
+			    setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
+			    break;  // Break in the foreach
+			}
 		}
 	}
 
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 759dca8dae9..ca9d05e7e93 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -86,13 +86,13 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-$idpays = $p[0];
+$idpays = $mysoc->country_id;
 
 $sql = "SELECT er.rowid, er.ref, er.date_debut as de,";
-$sql .= " erd.rowid as erdid, erd.comments, erd.total_ttc, erd.tva_tx, erd.total_ht, erd.total_tva, erd.fk_code_ventilation,";
+$sql .= " erd.rowid as erdid, erd.comments, erd.total_ttc, erd.tva_tx, erd.total_ht, erd.total_tva, erd.fk_code_ventilation, erd.vat_src_code, ";
 $sql .= " u.rowid as uid, u.firstname, u.lastname, u.accountancy_code as user_accountancy_account,";
-$sql .= " f.accountancy_code, ct.accountancy_code_buy as account_tva, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
+$sql .= " f.accountancy_code, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
+$sql .= " ct.accountancy_code_buy as account_tva";
 $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport_det as erd";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON erd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_type_fees as f ON f.id = erd.fk_c_type_fees";
@@ -110,7 +110,8 @@ dol_syslog('accountancy/journal/expensereportsjournal.php:: $sql=' . $sql);
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
-	// les variables
+
+	// Variables
 	$account_salary = (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT)) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : $langs->trans("CodeNotDef");
 	$account_vat = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : $langs->trans("CodeNotDef");
 
@@ -130,8 +131,11 @@ if ($result) {
 		$compta_fees = $obj->compte;
 		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $account_vat);
 
-		// Define array for display vat tx
-		$def_tva[$obj->rowid]=price($obj->tva_tx);
+		// Define array to display all VAT rates that use this accounting account $compta_tva
+		if (! empty(price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		{
+            $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
+		}
 
 		$taber[$obj->rowid]["date"] = $db->jdate($obj->de);
 		$taber[$obj->rowid]["ref"] = $obj->ref;
@@ -271,7 +275,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
 					$bookkeeping->subledger_account = '';
 					$bookkeeping->subledger_label = '';
-					$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
+					$bookkeeping->label_compte = $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]);
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
@@ -307,6 +311,12 @@ if ($action == 'writebookkeeping') {
 		else
 		{
 			$db->rollback();
+
+			if ($error >= 10)
+			{
+			    setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
+			    break;  // Break in the foreach
+			}
 		}
 	}
 
@@ -556,7 +566,7 @@ if (empty($action) || $action == 'view') {
 				}
 				else print $accountoshow;
 				print "</td>";
-				print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key]. "</td>";
+				print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]). "</td>";
 				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "</tr>";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 506c5517821..b5f763fe2b1 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -85,26 +85,27 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-$idpays = $p[0];
+$idpays = $mysoc->country_id;
 
 $sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.libelle,f.ref_supplier,";
-$sql .= " fd.rowid as fdid, fd.description, fd.total_ttc, fd.tva_tx, fd.total_ht, fd.tva as total_tva, fd.product_type,";
+$sql .= " fd.rowid as fdid, fd.description, fd.total_ttc, fd.tva_tx, fd.total_ht, fd.tva as total_tva, fd.product_type, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
-$sql .= " p.accountancy_code_buy , ct.accountancy_code_buy as account_tva, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
+$sql .= " p.accountancy_code_buy , aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
+$sql .= " ct.accountancy_code_buy as account_tva";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = fd.fk_facture_fourn";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
-$sql .= " WHERE f.fk_statut > 0 ";
+$sql .= " WHERE f.fk_statut > 0"; // TODO Facture annulée ?
 $sql .= " AND fd.fk_code_ventilation > 0 ";
 $sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
-if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-	$sql .= " AND f.type IN (0,1,2)";
-else
-	$sql .= " AND f.type IN (0,1,2,3)";
+if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+} else {
+    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+}
 if ($date_start && $date_end)
 	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
 $sql .= " ORDER BY f.datef";
@@ -114,7 +115,7 @@ $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
 
-	// les variables
+	// Variables
 	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef");
 	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : $langs->trans("CodeNotDef");
 
@@ -139,10 +140,15 @@ if ($result) {
 			else
 				$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef");
 		}
-		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
 
-		//Define array for display vat tx
-		$def_tva[$obj->rowid]=price($obj->tva_tx);
+		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code?' ('.$obj->vat_src_code.')':''), $mysoc, $mysoc, 0);
+		$compta_tva = (! empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
+
+		// Define array to display all VAT rates that use this accounting account $compta_tva
+		if (! empty(price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		{
+            $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
+		}
 
 		$tabfac[$obj->rowid]["date"] = $db->jdate($obj->df);
 		$tabfac[$obj->rowid]["ref"] = $obj->ref_supplier . ' (' . $obj->ref . ')';
@@ -214,8 +220,9 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'supplier_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-					$bookkeeping->thirdparty_code = $tabcompany[$key]['code_fournisseur'];
+					$bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta_fournisseur'];
+					$bookkeeping->subledger_label = '';    // TODO To complete
 					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("subledger_account");
 					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
 					$bookkeeping->montant = $mt;
@@ -262,6 +269,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'supplier_invoice';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+					    $bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
 						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
@@ -308,9 +316,10 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'supplier_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+					$bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 					$bookkeeping->subledger_account = '';
 					$bookkeeping->subledger_label = '';
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]);
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
@@ -346,6 +355,12 @@ if ($action == 'writebookkeeping') {
 		else
 		{
 			$db->rollback();
+
+			if ($error >= 10)
+			{
+			    setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
+			    break;  // Break in the foreach
+			}
 		}
 	}
 
@@ -615,7 +630,7 @@ if (empty($action) || $action == 'view') {
 				}
 				else print $accountoshow;
 				print "</td>";
-				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key]. "</td>";
+				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]). "</td>";
 				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "</tr>";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 8506b2a480b..24f5ae6e7aa 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -89,27 +89,26 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-$idpays = $p[0];
+$idpays = $mysoc->country_id;
 
 $sql = "SELECT f.rowid, f.facnumber, f.type, f.datef as df, f.ref_client,";
-$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc,";
+$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
-$sql .= " p.rowid as pid, p.ref as pref, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
-$sql .= " fd.situation_percent,ct.accountancy_code_sell as account_tva";
+$sql .= " p.rowid as pid, p.ref as pref, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
+//$sql .= " ct.accountancy_code_sell as account_tva";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
+//$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON ((fd.vat_src_code <> '' AND fd.vat_src_code = ct.code) OR (fd.vat_src_code = '' AND fd.tva_tx = ct.taux)) AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " WHERE fd.fk_code_ventilation > 0";
 $sql .= " AND f.entity IN (".getEntity('facture', 0).')';	// We don't share object for accountancy
 $sql .= " AND f.fk_statut > 0"; // TODO Facture annulée ?
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
-	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
 $sql .= " AND fd.product_type IN (0,1)";
 if ($date_start && $date_end)
@@ -127,29 +126,33 @@ if ($result) {
 	$tabcompany = array ();
 
 	$num = $db->num_rows($result);
-	$i = 0;
 
+	// Variables
 	$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
+	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
 
+	$i = 0;
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
 
-		// les variables
 		$compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
 
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
 				$compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-				else
-					$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
+			else
+				$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
 		}
-		$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
 
+		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code?' ('.$obj->vat_src_code.')':''), $mysoc, $mysoc, 0);
+		$compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
 
-		//Define array for display vat tx
-		$def_tva[$obj->rowid]=price($obj->tva_tx);
+		// Define array to display all VAT rates that use this accounting account $compta_tva
+		if (! empty(price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		{
+            $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
+		}
 
 		// Situation invoices handling
 		$line = new FactureLigne($db);
@@ -231,8 +234,9 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'customer_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
-					$bookkeeping->thirdparty_code = $tabcompany[$key]['code_client'];
+					$bookkeeping->thirdparty_code = $companystatic->code_client;
 					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
+					$bookkeeping->subledger_label = '';    // TODO To complete
 					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
 					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account");
 					$bookkeeping->montant = $mt;
@@ -277,6 +281,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'customer_invoice';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add;
+					    $bookkeeping->thirdparty_code = $companystatic->code_client;
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
 						$bookkeeping->numero_compte = $k;
@@ -322,10 +327,11 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'customer_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
+					$bookkeeping->thirdparty_code = $companystatic->code_client;
 					$bookkeeping->subledger_account = '';
 					$bookkeeping->subledger_label = '';
 					$bookkeeping->numero_compte = $k;
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.join(', ',$def_tva[$key][$k]);
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
 					$bookkeeping->debit = ($mt < 0) ? $mt : 0;
@@ -360,6 +366,12 @@ if ($action == 'writebookkeeping') {
 		else
 		{
 			$db->rollback();
+
+			if ($error >= 10)
+			{
+                setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
+                break;  // Break in the foreach
+			}
 		}
 
 	}
@@ -651,7 +663,7 @@ if (empty($action) || $action == 'view') {
 				}
 				else print $accountoshow;
 				print "</td>";
-				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . ' '.$def_tva[$key]. "</td>";
+				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . ' '.join(', ',$def_tva[$key][$k]). "</td>";
 				// print "<td>" . $langs->trans("VAT") . "</td>";
 				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index e37e1690ca2..7248c4bda3a 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -241,7 +241,7 @@ class FormAccounting extends Form
 	 * Return list of accounts with label by chart of accounts
 	 *
 	 * @param string   $selectid           Preselected id or code of accounting accounts (depends on $select_in)
-	 * @param string   $htmlname           Name of field in html form
+	 * @param string   $htmlname           Name of HTML field id. If name start with '.', it is name of HTML css class, so several component with same name in different forms can be used.
 	 * @param int      $showempty          Add an empty field
 	 * @param array    $event              Event options
 	 * @param int      $select_in          0=selectid value is a aa.rowid (default) or 1=selectid is aa.account_number
@@ -284,8 +284,6 @@ class FormAccounting extends Form
     			return -1;
     		}
 
-    		$out .= ajax_combobox($htmlname, $event);
-
     		$selected = 0;
     		while ($obj = $this->db->fetch_object($resql))
     		{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 49bcc265050..a582263185b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4099,29 +4099,49 @@ function get_localtax_by_third($local)
 
 
 /**
- *  Get vat rate and npr from id.
- *  You can call getLocalTaxesFromRate after to get other fields
+ *  Get vat main information from Id.
+ *  You can call getLocalTaxesFromRate after to get other fields.
  *
- *  @param	int      $vatrowid			Line ID into vat rate table.
- *  @return	array    	  				array(localtax_type1(1-6 / 0 if not found), rate of localtax1, ...)
+ *  @param	int|string  $vatrate		    VAT ID or Rate. Value can be value or the string with code into parenthesis or rowid if $firstparamisid is 1. Example: '8.5' or '8.5 (8.5NPR)' or 123.
+ *  @param	Societe	    $buyer         		Company object
+ *  @param	Societe	    $seller        		Company object
+ *  @param  int         $firstparamisid     1 if first param is id into table (use this if you can)
+ *  @return	array       	  				array('rowid'=> , 'code'=> ...)
+ *  @see getLocalTaxesFromRate
  */
-function getTaxesFromId($vatrowid)
+function getTaxesFromId($vatrate, $buyer=null, $seller=null, $firstparamisid=1)
 {
     global $db, $mysoc;
 
-    dol_syslog("getTaxesFromId vatrowid=".$vatrowid);
+    dol_syslog("getTaxesFromId vatrowid=".$vatrate);
 
     // Search local taxes
-    $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr";
+    $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";
     $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-    $sql.= " WHERE t.rowid ='".$vatrowid."'";
+    if ($firstparamisid) $sql.= " WHERE t.rowid = ".(int) $vatrate;
+    else
+    {
+        $vatratecleaned = $vatrate;
+        $vatratecode = '';
+        if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
+        {
+            $vatratecleaned = $reg[1];
+            $vatratecode = $reg[2];
+        }
+
+        $sql.=", ".MAIN_DB_PREFIX."c_country as c";
+        if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // local tax in spain use the buyer country ??
+        else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
+        $sql.= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
+        if ($vatratecode) $sql.= " AND t.code = '".$vatratecode."'";
+    }
 
     $resql=$db->query($sql);
     if ($resql)
     {
         $obj = $db->fetch_object($resql);
-
-        return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr);
+        if ($obj) return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr, 'accountancy_code_sell'=>$obj->accountancy_code_sell, 'accountancy_code_buy'=>$obj->accountancy_code_buy);
+        else return array();
     }
     else dol_print_error($db);
 
@@ -4135,12 +4155,13 @@ function getTaxesFromId($vatrowid)
  *  Instead this function must be called when adding a line to get the array of localtax and type, and then
  *  provide it to the function calcul_price_total.
  *
- *  @param	string  $vatrate			VAT Rate. Value can be value or the string with code into parenthesis or rowid if $firstparamisid is 1. Example: '8.5' or '8.5 (8.5NPR)' or 123.
- *  @param	int		$local              Number of localtax (1 or 2, or 0 to return 1 & 2)
- *  @param	Societe	$buyer         		Company object
- *  @param	Societe	$seller        		Company object
- *  @param  int     $firstparamisid     1 if first param is id into table (use this if you can)
- *  @return	array    	  				array(localtax_type1(1-6 / 0 if not found), rate of localtax1, ...)
+ *  @param	int|string  $vatrate			VAT ID or Rate. Value can be value or the string with code into parenthesis or rowid if $firstparamisid is 1. Example: '8.5' or '8.5 (8.5NPR)' or 123.
+ *  @param	int		    $local              Number of localtax (1 or 2, or 0 to return 1 & 2)
+ *  @param	Societe	    $buyer         		Company object
+ *  @param	Societe	    $seller        		Company object
+ *  @param  int         $firstparamisid     1 if first param is id into table (use this if you can)
+ *  @return	array    	    				array(localtax_type1(1-6 / 0 if not found), rate of localtax1, ...)
+ *  @see getTaxesFromId
  */
 function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisid=0)
 {
@@ -4148,25 +4169,25 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 
 	dol_syslog("getLocalTaxesFromRate vatrate=".$vatrate." local=".$local);
 
-	$vatratecleaned = $vatrate;
-	$vatratecode = '';
-	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
-	{
-	    $vatratecleaned = $reg[1];
-	    $vatratecode = $reg[2];
-	}
-
 	// Search local taxes
 	$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-	if ($firstparamisid) $sql.= " WHERE t.rowid ='".$vatrate."'";
+	if ($firstparamisid) $sql.= " WHERE t.rowid = ".(int) $vatrate;
 	else
 	{
+	    $vatratecleaned = $vatrate;
+	    $vatratecode = '';
+	    if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
+	    {
+	        $vatratecleaned = $reg[1];
+	        $vatratecode = $reg[2];
+	    }
+
 	    $sql.=", ".MAIN_DB_PREFIX."c_country as c";
     	if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // local tax in spain use the buyer country ??
     	else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
     	$sql.= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-    	if ($vatratecode) $sql.= " AND t.code ='".$vatratecode."'";
+    	if ($vatratecode) $sql.= " AND t.code = '".$vatratecode."'";
 	}
 
 	$resql=$db->query($sql);
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 0f49bd832d6..0f57a23d23c 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -182,6 +182,7 @@ ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
 ErrorModuleNotFound=File of module was not found.
 ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
 ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
 ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
 ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
 ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
@@ -191,6 +192,7 @@ ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<st
 ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
 ErrorNoWarehouseDefined=Error, no warehouses defined.
 ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid. 
+ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.  

From 343e8d8498bf38837f90c8a483efa6aba9f991b5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 00:49:52 +0200
Subject: [PATCH 1127/1163] Debug accounting module with new structure v6 Make
 accounting module compatible with the new vat code to identify 2 vat code
 with same rate.

---
 htdocs/accountancy/admin/defaultaccounts.php  |  2 +-
 htdocs/accountancy/bookkeeping/card.php       |  8 +++---
 htdocs/accountancy/bookkeeping/list.php       |  4 +--
 .../accountancy/class/bookkeeping.class.php   |  7 ++++-
 .../journal/expensereportsjournal.php         | 12 +++++----
 .../accountancy/journal/purchasesjournal.php  | 26 +++++++++++++------
 htdocs/accountancy/journal/sellsjournal.php   | 14 +++++++++-
 .../core/class/html.formaccounting.class.php  | 16 +++++-------
 htdocs/langs/en_US/accountancy.lang           |  1 +
 9 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index ef39252ff87..227949a3c1c 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -51,8 +51,8 @@ $action = GETPOST('action', 'alpha');
 
 
 $list_account_main = array (
-    'ACCOUNTING_ACCOUNT_SUPPLIER',
     'ACCOUNTING_ACCOUNT_CUSTOMER',
+    'ACCOUNTING_ACCOUNT_SUPPLIER',
 );
 
 $list_account = array (
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index f40bfda856f..5c558ca0a90 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -387,10 +387,10 @@ if ($action == 'create') {
 					if ($action == 'update' && $line->id == $id) {
 
 						print '<td>';
-						print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
+						print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, 'maxwidth300');
 						print '</td>';
 						print '<td>';
-						print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1);
+						print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1, 'maxwidth300');
 						print '</td>';
 						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
 						print '<td align="right"><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
@@ -431,10 +431,10 @@ if ($action == 'create') {
 				if ($action == "" || $action == 'add') {
 					print '<tr class="oddeven">';
 					print '<td>';
-					print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
+					print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, 'maxwidth300');
 					print '</td>';
 					print '<td>';
-					print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1);
+					print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, 'maxwidth300');
 					print '</td>';
 					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
 					print '<td align="right"><input type="text" class="right maxwidth50" name="debit" value="' . price($debit) . '"/></td>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index cd93b1142f8..4a7bca5e1b7 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -389,11 +389,11 @@ print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8"
 print '<td class="liste_titre">';
 print '<div class="nowrap">';
 print $langs->trans('From');
-print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
+print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, 'maxwidth200');
 print '</div>';
 print '<div class="nowrap">';
 print $langs->trans('to');
-print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
+print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, 'maxwidth200');
 print '</div>';
 print '</td>';
 print '<td class="liste_titre">';
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 9ed4ef29ac1..d607c1dc287 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -185,7 +185,12 @@ class BookKeeping extends CommonObject
             else
             {
                 //$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->doc_ref,  $this->label_compte);
-                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForLine', $this->label_compte);
+                $mesg=$this->doc_ref.', '.$langs->trans("AccountAccounting").': '.$this->numero_compte;
+                if ($this->subledger_account && $this->subledger_account != $this->numero_compte)
+                {
+                    $mesg.=', '.$langs->trans("SubledgerAccount").': '.$this->subledger_account;
+                }
+                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForLine', $mesg);
             }
 
 		    return -1;
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index ca9d05e7e93..f73596c5aa4 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -92,15 +92,15 @@ $sql = "SELECT er.rowid, er.ref, er.date_debut as de,";
 $sql .= " erd.rowid as erdid, erd.comments, erd.total_ttc, erd.tva_tx, erd.total_ht, erd.total_tva, erd.fk_code_ventilation, erd.vat_src_code, ";
 $sql .= " u.rowid as uid, u.firstname, u.lastname, u.accountancy_code as user_accountancy_account,";
 $sql .= " f.accountancy_code, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
-$sql .= " ct.accountancy_code_buy as account_tva";
+//$sql .= " ct.accountancy_code_buy as account_tva";
 $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport_det as erd";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON erd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
+//$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON erd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_type_fees as f ON f.id = erd.fk_c_type_fees";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = erd.fk_code_ventilation";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "user as u ON u.rowid = er.fk_user_author";
-$sql .= " WHERE er.fk_statut > 0 ";
-$sql .= " AND erd.fk_code_ventilation > 0 ";
+$sql .= " WHERE er.fk_statut > 0";
+$sql .= " AND erd.fk_code_ventilation > 0";
 $sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND er.date_debut >= '" . $db->idate($date_start) . "' AND er.date_debut <= '" . $db->idate($date_end) . "'";
@@ -129,7 +129,9 @@ if ($result) {
 		// Controls
 		$compta_user = (! empty($obj->user_accountancy_account)) ? $obj->user_accountancy_account : $account_salary;
 		$compta_fees = $obj->compte;
-		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $account_vat);
+
+		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code?' ('.$obj->vat_src_code.')':''), $mysoc, $mysoc, 0);
+		$compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $account_vat);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
 		if (! empty(price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index b5f763fe2b1..27dfd532981 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -90,21 +90,21 @@ $idpays = $mysoc->country_id;
 $sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.libelle,f.ref_supplier,";
 $sql .= " fd.rowid as fdid, fd.description, fd.total_ttc, fd.tva_tx, fd.total_ht, fd.tva as total_tva, fd.product_type, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
-$sql .= " p.accountancy_code_buy , aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
-$sql .= " ct.accountancy_code_buy as account_tva";
+$sql .= " p.accountancy_code_buy , aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
+//$sql .= " ct.accountancy_code_buy as account_tva";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
+//$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = fd.fk_facture_fourn";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " WHERE f.fk_statut > 0"; // TODO Facture annulée ?
-$sql .= " AND fd.fk_code_ventilation > 0 ";
+$sql .= " AND fd.fk_code_ventilation > 0";
 $sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+    $sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_SITUATION . ")";
 } else {
-    $sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+    $sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_DEPOSIT . "," . FactureFournisseur::TYPE_SITUATION . ")";
 }
 if ($date_start && $date_end)
 	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
@@ -130,7 +130,7 @@ if ($result) {
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
 
-		// contrôles
+		// Controls
 		$compta_soc = (! empty($obj->code_compta_fournisseur)) ? $obj->code_compta_fournisseur : $cptfour;
 
 		$compta_prod = $obj->compte;
@@ -536,8 +536,18 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
+	// Button to write into Ledger
+	if (empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
+	    print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+	    print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+	}
 	print '<div class="tabsAction tabsActionNoBottom">';
-	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
+	    print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
+	}
+	else {
+	    print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+	}
 	print '</div>';
 
 	print '
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 24f5ae6e7aa..3150b74e9bd 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -135,6 +135,7 @@ if ($result) {
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
 
+		// Controls
 		$compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
 
 		$compta_prod = $obj->compte;
@@ -549,8 +550,19 @@ if (empty($action) || $action == 'view') {
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
+
+	// Button to write into Ledger
+	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
+	    print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+	    print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+	}
 	print '<div class="tabsAction tabsActionNoBottom">';
-	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
+	    print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
+	}
+	else {
+	   print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+	}
 	print '</div>';
 
 	print '
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 7248c4bda3a..8a348dba57a 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -325,14 +325,13 @@ class FormAccounting extends Form
 	/**
 	 * Return list of auxilary thirdparty accounts
 	 *
-	 * @param string $selectid Preselected pcg_type
-	 * @param string $htmlname Name of field in html form
-	 * @param int $showempty Add an empty field
-	 * @param array $event Event options
-	 *
-	 * @return string String with HTML select
+	 * @param string   $selectid       Preselected pcg_type
+	 * @param string   $htmlname       Name of field in html form
+	 * @param int      $showempty      Add an empty field
+	 * @param string   $morecss        More css
+	 * @return string                  String with HTML select
 	 */
-	function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $event = array()) {
+	function select_auxaccount($selectid, $htmlname='account_num_aux', $showempty=0, $morecss='maxwidth200') {
 
 		$aux_account = array();
 
@@ -377,8 +376,7 @@ class FormAccounting extends Form
 		$this->db->free($resql);
 
 		// Build select
-		$out = ajax_combobox($htmlname, $event);
-		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
+		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		return $out;
 	}
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 8ff65371fa5..64744eedf4a 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -256,6 +256,7 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping

From 07b676792a26886170eb657e23410686c0f2236a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 01:02:53 +0200
Subject: [PATCH 1128/1163] Fix do not show localtax info if not used.

---
 htdocs/comm/card.php    | 12 +++++++-----
 htdocs/societe/card.php |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index b8906bd1038..a51ef902eb6 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -175,7 +175,7 @@ if (empty($reshook))
 		$result=$object->update($object->id, $user);
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
-	
+
 	if ($action == 'update_extras') {
         $object->fetch($id);
 
@@ -262,21 +262,23 @@ if ($id > 0)
 		print '</tr>';
 	}
 
-	// Assujeti a TVA ou pas
+	// VAT is used
 	print '<tr>';
-	print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td>';
+	print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td>';
+	print '<td>';
 	print yn($object->tva_assuj);
 	print '</td>';
 	print '</tr>';
 
 	// Local Taxes
-	if ($mysoc->useLocalTax(1))
+	// TODO Move this on same record than VATIsUsed
+	if ($mysoc->localtax1_assuj=="1")
 	{
 		print '<tr><td class="nowrap">'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
 		print yn($object->localtax1_assuj);
 		print '</td></tr>';
 	}
-	if ($mysoc->useLocalTax(2))
+	if ($mysoc->localtax1_assuj=="1")
 	{
 		print '<tr><td class="nowrap">'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
 		print yn($object->localtax2_assuj);
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index b5afba996b8..46e6366bba1 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1766,8 +1766,9 @@ else
                     $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
                     print '</span>';
                 }
+                print '</td>';
 
-                print '</td><td>'.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').'</td><td>';
+                print '<td>'.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').'</td><td>';
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
                 if  (! isOnlyOneLocalTax(2))
                 {

From b1945daf6c7eaa1d57d5bd1bf52f2c973d7b4d57 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 01:07:44 +0200
Subject: [PATCH 1129/1163] Fix alignement

---
 htdocs/societe/consumption.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 1fcd73f0ddc..834131a86a8 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -365,7 +365,7 @@ if ($sql_select)
     print '<td class="liste_titre" align="left">';
     print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
     print '</td>';
-    print '<td class="liste_titre nowrap">'; // date
+    print '<td class="liste_titre nowrap center">'; // date
     print $formother->select_month($month?$month:-1,'month',1);
     $formother->select_year($year?$year:-1,'year',1, 20, 1);
     print '</td>';

From b416b22bcc00d198ff3ddfdc9e90ebd7187eaf69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 01:27:28 +0200
Subject: [PATCH 1130/1163] Fix phpcs

---
 htdocs/accountancy/journal/expensereportsjournal.php | 2 +-
 htdocs/accountancy/journal/purchasesjournal.php      | 2 +-
 htdocs/accountancy/journal/sellsjournal.php          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index f73596c5aa4..3da9e09aeda 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -134,7 +134,7 @@ if ($result) {
 		$compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $account_vat);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if (! empty(price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
 		{
             $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 27dfd532981..9ef1afdac38 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -145,7 +145,7 @@ if ($result) {
 		$compta_tva = (! empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if (! empty(price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
 		{
             $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 3150b74e9bd..4eb4dc72171 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -150,7 +150,7 @@ if ($result) {
 		$compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if (! empty(price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
+		if ((! price2num($obj->tva_tx)) || ! empty($obj->vat_src_code))
 		{
             $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}

From f424f96589b6d43d2a0abb4631470717c9a464b3 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Fri, 16 Jun 2017 05:15:00 +0200
Subject: [PATCH 1131/1163] Fix SPEC #7013 : use database type "numeric" to
 store monetary values

---
 .../install/mysql/migration/6.0.0-7.0.0.sql   | 64 +++++++++++++++++++
 .../tables/llx_accounting_bookkeeping.sql     | 10 +--
 .../install/mysql/tables/llx_blockedlog.sql   |  2 +-
 .../mysql/tables/llx_chargesociales.sql       |  2 +-
 htdocs/install/mysql/tables/llx_commande.sql  |  2 +-
 .../mysql/tables/llx_commande_fournisseur.sql |  2 +-
 htdocs/install/mysql/tables/llx_don.sql       |  2 +-
 .../mysql/tables/llx_loan_schedule.sql        |  6 +-
 .../mysql/tables/llx_paiementcharge.sql       |  2 +-
 .../mysql/tables/llx_paiementfourn.sql        |  2 +-
 .../mysql/tables/llx_payment_donation.sql     |  2 +-
 .../tables/llx_payment_expensereport.sql      |  2 +-
 .../install/mysql/tables/llx_payment_loan.sql |  6 +-
 .../mysql/tables/llx_payment_salary.sql       |  4 +-
 .../mysql/tables/llx_prelevement_bons.sql     |  2 +-
 .../llx_prelevement_facture_demande.sql       |  2 +-
 .../mysql/tables/llx_prelevement_lignes.sql   |  2 +-
 htdocs/install/mysql/tables/llx_societe.sql   |  2 +-
 htdocs/install/mysql/tables/llx_tva.sql       |  4 +-
 19 files changed, 92 insertions(+), 28 deletions(-)
 create mode 100644 htdocs/install/mysql/migration/6.0.0-7.0.0.sql

diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
new file mode 100644
index 00000000000..545b52ea4a7
--- /dev/null
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -0,0 +1,64 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 6.0.0 or higher.
+--
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To drop an index:        -- VMYSQL4.0 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.0 DROP INDEX nomindex
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres): -- VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
+-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
+
+
+-- Clean corrupted values for tms
+-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
+-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
+-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- Remove default not null on date_fin
+-- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
+
+-- Move real to numeric for more precision for storing monetary amounts (no rouding)
+-- https://wiki.dolibarr.org/index.php/Langages_et_normes#Structure_des_tables_et_champs
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN debit numeric(24,8);
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN credit numeric(24,8);
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN montant numeric(24,8);
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN multicurrency_amount numeric(24,8);
+ALTER TABLE llx_blockedlog MODIFY COLUMN amounts numeric(24,8);
+ALTER TABLE llx_chargessociales MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_commande MODIFY COLUMN amount_ht numeric(24,8);
+ALTER TABLE llx_commande_fournisseur MODIFY COLUMN amount_ht numeric(24,8);
+ALTER TABLE llx_don MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_capital numeric(24,8);
+ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_insurance numeric(24,8);
+ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_interest numeric(24,8);
+ALTER TABLE llx_paiementcharge MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_paiementfourn MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_payment_donation MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_payment_expensereport MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_payment_loan MODIFY COLUMN amount_capital numeric(24,8);
+ALTER TABLE llx_payment_loan MODIFY COLUMN amount_insurance numeric(24,8);
+ALTER TABLE llx_payment_loan MODIFY COLUMN amount_interest numeric(24,8);
+ALTER TABLE llx_payment_salary MODIFY COLUMN salary numeric(24,8);
+ALTER TABLE llx_payment_salary MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_prelevement_bons MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_prelevement_facture_demande MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_prelevement_lignes MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_societe MODIFY COLUMN capital numeric(24,8);
+ALTER TABLE llx_tva MODIFY COLUMN amount numeric(24,8);
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index ad1160c356d..01ced5b07f4 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -26,17 +26,17 @@ CREATE TABLE llx_accounting_bookkeeping
   doc_ref               varchar(300) NOT NULL,		-- 					| facture_client/reglement_client/... reference number
   fk_doc                integer NOT NULL,			-- 					| facture_client/reglement_client/... rowid
   fk_docdet             integer NOT NULL,			-- 					| facture_client/reglement_client/... line rowid
-  thirdparty_code       varchar(32),                -- Third party code (customer or supplier) when record is saved (may help debug) 
+  thirdparty_code       varchar(32),				-- Third party code (customer or supplier) when record is saved (may help debug) 
   subledger_account     varchar(32),				-- FEC:CompAuxNum	| account number of subledger account
   subledger_label       varchar(255),				-- FEC:CompAuxLib	| label of subledger account
   numero_compte         varchar(32) NOT NULL,		-- FEC:CompteNum	| account number
   label_compte          varchar(255) NOT NULL,		-- FEC:CompteLib	| label of account
   label_operation       varchar(255),				-- FEC:EcritureLib	| label of the operation
-  debit                 double NOT NULL,			-- FEC:Debit
-  credit                double NOT NULL,			-- FEC:Credit
-  montant               double NOT NULL,			-- FEC:Montant (Not necessary)
+  debit                 numeric(24,8) NOT NULL,		-- FEC:Debit
+  credit                numeric(24,8) NOT NULL,		-- FEC:Credit
+  montant               numeric(24,8) NOT NULL,		-- FEC:Montant (Not necessary)
   sens                  varchar(1) DEFAULT NULL,	-- FEC:Sens (Not necessary)
-  multicurrency_amount  double,						-- FEC:Montantdevise
+  multicurrency_amount  numeric(24,8),				-- FEC:Montantdevise
   multicurrency_code    varchar(255),				-- FEC:Idevise
   lettering_code        varchar(255),				-- FEC:EcritureLet
   date_lettering        datetime,					-- FEC:DateLet
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
index ae696a0d6d1..59c8e262817 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -4,7 +4,7 @@ CREATE TABLE llx_blockedlog
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	tms	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	action varchar(50), 
-	amounts real NOT NULL, 
+	amounts numeric(24,8) NOT NULL, 
 	signature varchar(100) NOT NULL, 
 	signature_line varchar(100) NOT NULL, 
 	element varchar(50), 
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index 519ceacc9e5..093b635a964 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -34,7 +34,7 @@ create table llx_chargesociales
   fk_type			integer NOT NULL,
   fk_account		integer,                       -- bank account
   fk_mode_reglement	integer,                -- mode de reglement
-  amount			real     default 0 NOT NULL,
+  amount			numeric(24,8) default 0 NOT NULL,
   paye				smallint default 0 NOT NULL,
   periode			date,
   fk_projet			integer DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index 98740c232ac..6964abdcd57 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -42,7 +42,7 @@ create table llx_commande
   fk_user_cloture		integer,						-- user closing
   source				smallint,						-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
   fk_statut				smallint  default 0,
-  amount_ht				real      default 0,
+  amount_ht				numeric(24,8)  default 0,
   remise_percent		real      default 0,
   remise_absolue		real      default 0,
   remise				real      default 0,
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index 6d291dcfa00..24158903eb1 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -46,7 +46,7 @@ create table llx_commande_fournisseur
   source				smallint NOT NULL,			-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
   fk_statut				smallint  default 0,
   billed				smallint  default 0,
-  amount_ht				real      default 0,
+  amount_ht				numeric(24,8)  default 0,
   remise_percent		real      default 0,
   remise				real      default 0,
   tva					double(24,8)      default 0,
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql
index b7b7c89f9cd..63b2cd111ea 100644
--- a/htdocs/install/mysql/tables/llx_don.sql
+++ b/htdocs/install/mysql/tables/llx_don.sql
@@ -28,7 +28,7 @@ create table llx_don
   tms             timestamp,
   fk_statut       smallint NOT NULL DEFAULT 0,  -- Status of donation promise or validate
   datedon         datetime,                     -- Date of the donation/promise
-  amount          real DEFAULT 0,
+  amount          numeric(24,8) DEFAULT 0,
   fk_payment      integer,
   paid            smallint default 0 NOT NULL,
   firstname       varchar(50),
diff --git a/htdocs/install/mysql/tables/llx_loan_schedule.sql b/htdocs/install/mysql/tables/llx_loan_schedule.sql
index c682b22f276..eb43238255a 100644
--- a/htdocs/install/mysql/tables/llx_loan_schedule.sql
+++ b/htdocs/install/mysql/tables/llx_loan_schedule.sql
@@ -24,9 +24,9 @@ create table llx_loan_schedule
   datec				datetime,         -- creation date
   tms				timestamp,
   datep				datetime,         -- payment date
-  amount_capital	real DEFAULT 0,
-  amount_insurance	real DEFAULT 0,
-  amount_interest	real DEFAULT 0,
+  amount_capital	numeric(24,8) DEFAULT 0,
+  amount_insurance	numeric(24,8) DEFAULT 0,
+  amount_interest	numeric(24,8) DEFAULT 0,
   fk_typepayment	integer NOT NULL,
   num_payment		varchar(50),
   note_private      text,
diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql
index 2efca933dba..086bafae0fa 100644
--- a/htdocs/install/mysql/tables/llx_paiementcharge.sql
+++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql
@@ -23,7 +23,7 @@ create table llx_paiementcharge
   datec           datetime,           -- date de creation
   tms             timestamp,
   datep           datetime,           -- payment date
-  amount          real DEFAULT 0,
+  amount          numeric(24,8) DEFAULT 0,
   fk_typepaiement integer NOT NULL,
   num_paiement    varchar(50),
   note            text,
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql
index 0e9b1885c97..16d63a32076 100644
--- a/htdocs/install/mysql/tables/llx_paiementfourn.sql
+++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql
@@ -25,7 +25,7 @@ create table llx_paiementfourn
   tms               timestamp,
   datec             datetime,          -- date de creation de l'enregistrement
   datep             datetime,          -- date de paiement
-  amount            real DEFAULT 0,    -- montant
+  amount            numeric(24,8) DEFAULT 0,      -- montant
   multicurrency_amount double(24,8) DEFAULT 0,    -- multicurrency amount
   fk_user_author    integer,           -- auteur
   fk_paiement       integer NOT NULL,  -- moyen de paiement
diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql
index afa5075cd4e..1859c7aa796 100644
--- a/htdocs/install/mysql/tables/llx_payment_donation.sql
+++ b/htdocs/install/mysql/tables/llx_payment_donation.sql
@@ -23,7 +23,7 @@ create table llx_payment_donation
   datec           datetime,           -- date de creation
   tms             timestamp,
   datep           datetime,           -- payment date
-  amount          real DEFAULT 0,
+  amount          numeric(24,8) DEFAULT 0,
   fk_typepayment  integer NOT NULL,
   num_payment     varchar(50),
   note            text,
diff --git a/htdocs/install/mysql/tables/llx_payment_expensereport.sql b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
index 40e39771978..1857246e22e 100644
--- a/htdocs/install/mysql/tables/llx_payment_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
@@ -23,7 +23,7 @@ create table llx_payment_expensereport
   datec                   datetime,           -- date de creation
   tms                     timestamp,
   datep                   datetime,           -- payment date
-  amount                  real DEFAULT 0,
+  amount                  numeric(24,8) DEFAULT 0,
   fk_typepayment          integer NOT NULL,
   num_payment             varchar(50),
   note                    text,
diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql
index d023c039391..3b6111a7b2f 100644
--- a/htdocs/install/mysql/tables/llx_payment_loan.sql
+++ b/htdocs/install/mysql/tables/llx_payment_loan.sql
@@ -24,9 +24,9 @@ create table llx_payment_loan
   datec				datetime,         -- creation date
   tms				timestamp,
   datep				datetime,         -- payment date
-  amount_capital	real DEFAULT 0,
-  amount_insurance	real DEFAULT 0,
-  amount_interest	real DEFAULT 0,
+  amount_capital	numeric(24,8) DEFAULT 0,
+  amount_insurance	numeric(24,8) DEFAULT 0,
+  amount_interest	numeric(24,8) DEFAULT 0,
   fk_typepayment	integer NOT NULL,
   num_payment		varchar(50),
   note_private      text,
diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql
index 38364c6812e..3b6da16b9cb 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary.sql
@@ -24,8 +24,8 @@ create table llx_payment_salary
   fk_user         integer NOT NULL,
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur (this field should not be here, only into bank tables)
-  salary          real,						  -- salary of user when payment was done
-  amount          real NOT NULL DEFAULT 0,
+  salary          numeric(24,8),              -- salary of user when payment was done
+  amount          numeric(24,8) NOT NULL DEFAULT 0,
   fk_typepayment  integer NOT NULL,
   num_payment     varchar(50),				  -- ref
   label           varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
index e92342eb001..40fff2e842d 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
@@ -29,7 +29,7 @@ create table llx_prelevement_bons
   ref            varchar(12),        -- reference
   entity         integer DEFAULT 1 NOT NULL, -- multi company id
   datec          datetime,           -- date de creation
-  amount         real DEFAULT 0,     -- montant total du prelevement
+  amount         numeric(24,8) DEFAULT 0,    -- montant total du prelevement
   statut         smallint DEFAULT 0, -- statut
   credite        smallint DEFAULT 0, -- indique si le prelevement a ete credite
   note           text,
diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
index 3bdc0e2ed81..1d1b59bf3f5 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
@@ -21,7 +21,7 @@ create table llx_prelevement_facture_demande
 (
   rowid               integer AUTO_INCREMENT PRIMARY KEY,
   fk_facture          integer NOT NULL,
-  amount              real NOT NULL,
+  amount              numeric(24,8) NOT NULL,
   date_demande        datetime NOT NULL,
   traite              smallint DEFAULT 0,
   date_traite         datetime,
diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
index 04b6e1ebf5e..448b3846d71 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
@@ -24,7 +24,7 @@ create table llx_prelevement_lignes
   statut              smallint DEFAULT 0,
 
   client_nom          varchar(255),
-  amount              real DEFAULT 0,
+  amount              numeric(24,8) DEFAULT 0,
   code_banque         varchar(128),
   code_guichet        varchar(6),
   number              varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index 20440b692d7..7c88a74de07 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -64,7 +64,7 @@ create table llx_societe
   idprof5                  varchar(128),                         		-- IDProf5: nu for france
   idprof6                  varchar(128),                         		-- IDProf6: nu for france
   tva_intra                varchar(20),                         		-- tva
-  capital                  real,                                		-- capital de la societe
+  capital                  numeric(24,8),                       		-- capital de la societe
   fk_stcomm                integer        DEFAULT 0 NOT NULL,      	-- commercial statut
   note_private             text,                                		--
   note_public              text,                                        --
diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql
index 9abf63d6ad9..d2a7b67c835 100644
--- a/htdocs/install/mysql/tables/llx_tva.sql
+++ b/htdocs/install/mysql/tables/llx_tva.sql
@@ -24,11 +24,11 @@ create table llx_tva
   datec           datetime,                   -- Create date
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur
-  amount          real NOT NULL DEFAULT 0,
+  amount          numeric(24,8) NOT NULL DEFAULT 0,
   fk_typepayment  integer NULL,
   num_payment     varchar(50),
   label           varchar(255),
-  entity          integer DEFAULT 1 NOT NULL,	-- multi company id
+  entity          integer DEFAULT 1 NOT NULL, -- multi company id
   note            text,
   fk_bank         integer,  
   fk_user_creat   integer,                    -- utilisateur who create record

From c2901ae8cda0ec59b5ff61327e60112077eb1558 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 16 Jun 2017 11:01:58 +0200
Subject: [PATCH 1132/1163] Fix: add/remove unset unsused fields

---
 htdocs/comm/action/class/api_agendaevents.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 40fce1fd640..a607998cfa8 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -316,11 +316,12 @@ class AgendaEvents extends DolibarrApi
 
     	$object = parent::_cleanObjectDatas($object);
 
+    	unset($object->usermod);
+    	unset($object->libelle);
     	unset($object->import_key);
     	unset($object->array_options);
     	unset($object->context);
     	unset($object->canvas);
-    	unset($object->fk_project);
     	unset($object->contact);
     	unset($object->contact_id);
     	unset($object->thirdparty);

From 1c8daf9700676064bd7adaac2dcee8e30cec2f65 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 11:51:33 +0200
Subject: [PATCH 1133/1163] Standardize and debug code of module BlockedLog

---
 htdocs/blockedlog/admin/blockedlog.php        |  13 +-
 htdocs/blockedlog/admin/fingerprints.php      | 103 ++++---
 htdocs/blockedlog/ajax/authority.php          | 112 +++++---
 htdocs/blockedlog/ajax/block-add.php          |  64 +++--
 htdocs/blockedlog/ajax/block-info.php         |  58 +++-
 htdocs/blockedlog/ajax/check_signature.php    |  83 ++++--
 htdocs/blockedlog/class/blockedlog.class.php  | 262 +++++++++---------
 htdocs/blockedlog/lib/blockedlog.lib.php      |   8 +-
 htdocs/compta/facture/card.php                |  31 ---
 htdocs/core/modules/modBlockedLog.class.php   |   6 +-
 ..._modBlockedlog_ActionsBlockedLog.class.php |  24 +-
 htdocs/langs/en_US/admin.lang                 |   4 +-
 htdocs/langs/en_US/blockedlog.lang            |  23 +-
 htdocs/main.inc.php                           |  36 ++-
 14 files changed, 486 insertions(+), 341 deletions(-)

diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index f77c6e9edd8..b3822a9acb7 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -17,7 +17,7 @@
 
 /**
  *	\file       htdocs/blockedlog/admin/blockedlog.php
- *  \ingroup    system
+ *  \ingroup    blockedlog
  *  \brief      Page setup for blockedlog module
  */
 
@@ -31,12 +31,13 @@ $langs->load("other");
 $langs->load("blockedlog");
 
 if (! $user->admin) accessforbidden();
-  
+
 $action = GETPOST('action','alpha');
 
 /*
  * Actions
  */
+
 if (preg_match('/set_(.*)/',$action,$reg))
 {
 	$code=$reg[1];
@@ -77,7 +78,7 @@ $form=new Form($db);
 llxHeader('',$langs->trans("BlockedLogSetup"));
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("ModuleSetup").' BlockedLog',$linkback);
+print load_fiche_titre($langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog'),$linkback);
 
 $head=blockedlogadmin_prepare_head();
 
@@ -95,13 +96,11 @@ print "</tr>\n";
 
 print '<tr class="oddeven">';
 print '<td class="titlefield">';
-print $langs->trans("EntityKey").'</td><td align="center">';
-
+print $langs->trans("CompanyInitialKey").'</td><td>';
 print $block_static->getSignature();
-
 print '</td></tr>';
 
-if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) {
+if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) {
 	// Example with a yes / no select
 	$var=!$var;
 	print '<tr '.$bc[$var].'>';
diff --git a/htdocs/blockedlog/admin/fingerprints.php b/htdocs/blockedlog/admin/fingerprints.php
index f585b883c65..da149d4340d 100644
--- a/htdocs/blockedlog/admin/fingerprints.php
+++ b/htdocs/blockedlog/admin/fingerprints.php
@@ -16,8 +16,8 @@
  */
 
 /**
- *	\file       htdocs/blockedlog/admin/blockedlog.php
- *  \ingroup    system
+ *	\file       htdocs/blockedlog/admin/fingerprints.php
+ *  \ingroup    blockedlog
  *  \brief      Page setup for blockedlog module
  */
 
@@ -32,39 +32,39 @@ $langs->load("other");
 $langs->load("blockedlog");
 
 if (! $user->admin) accessforbidden();
-  
+
 $action = GETPOST('action','alpha');
 $showonlyerrors = GETPOST('showonlyerrors','int');
 
 $block_static = new BlockedLog($db);
 
 if($action === 'downloadblockchain') {
-	
+
 	$auth = new BlockedLogAuthority($db);
-	
+
 	$bc = $auth->getLocalBlockChain();
-	
+
 	header('Content-Type: application/octet-stream');
 	header("Content-Transfer-Encoding: Binary");
-	header("Content-disposition: attachment; filename=\"" .$auth->signature. ".certif\""); 
-	
+	header("Content-disposition: attachment; filename=\"" .$auth->signature. ".certif\"");
+
 	echo $bc;
-	
+
 	exit;
 }
 else if($action === 'downloadcsv') {
-	
+
 	$res = $db->query("SELECT rowid,tms,action,amounts,element,fk_object,date_object,ref_object,signature,fk_user
 					FROM ".MAIN_DB_PREFIX."blockedlog ORDER BY rowid ASC");
-	
+
 	if($res) {
-		
+
 		$signature = $block_static->getSignature();
-		
+
 		header('Content-Type: application/octet-stream');
 		header("Content-Transfer-Encoding: Binary");
 		header("Content-disposition: attachment; filename=\"" .$signature. ".csv\"");
-		
+
 		print $langs->transnoentities('Id')
 			.';'.$langs->transnoentities('Timestamp')
 			.';'.$langs->transnoentities('Action')
@@ -75,9 +75,9 @@ else if($action === 'downloadcsv') {
 			.';'.$langs->transnoentities('Ref')
 			.';'.$langs->transnoentities('Fingerprint')
 			.';'.$langs->transnoentities('User')."\n";
-		
+
 		while($obj = $db->fetch_object($res)) {
-			
+
 			print $obj->rowid
 				.';'.$obj->tms
 				.';'.$obj->action
@@ -88,15 +88,15 @@ else if($action === 'downloadcsv') {
 				.';'.$obj->ref_object
 				.';'.$obj->signature
 				.';'.$obj->fk_user."\n";
-			
+
 		}
-		
+
 		exit;
 	}
 	else{
 		setEventMessage($db->lasterror, 'errors');
 	}
-	
+
 }
 
 /*
@@ -110,7 +110,7 @@ $form=new Form($db);
 llxHeader('',$langs->trans("BlockedLogSetup"));
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("ModuleSetup").' BlockedLog',$linkback);
+print load_fiche_titre($langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog'),$linkback);
 
 $head=blockedlogadmin_prepare_head();
 
@@ -131,52 +131,63 @@ print ' </div>';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 
-print '<td>'.$langs->trans('Date').'</td>';
-print '<td>'.$langs->trans('Ref').'</td>';
+print '<td class="minwidth50">'.$langs->trans('#').'</td>';
+print '<td class="center">'.$langs->trans('Date').'</td>';
+print '<td>'.$langs->trans('Author').'</td>';
 print '<td>'.$langs->trans('Action').'</td>';
+print '<td>'.$langs->trans('Ref').'</td>';
 print '<td>'.$langs->trans('Element').'</td>';
 print '<td>'.$langs->trans('Amount').'</td>';
-print '<td>'.$langs->trans('Author').'</td>';
+print '<td class="center">'.$langs->trans('DataOfArchivedEvent').'</td>';
 print '<td>'.$langs->trans('Fingerprint').'</td>';
 print '<td><span id="blockchainstatus"></span></td>';
-				
+
 print '</tr>';
 
 foreach($blocks as &$block) {
 
 	$checksignature = $block->checkSignature();
 	$object_link = $block->getObjectLink();
-	
+
 	if(!$showonlyerrors || $block->error>0) {
-		
+
 	   	print '<tr class="oddeven">';
+	   	print '<td>'.$block->id.'</td>';
 	   	print '<td>'.dol_print_date($block->tms,'dayhour').'</td>';
-	   	print '<td>'.$block->ref_object.'</td>';
-	   	print '<td>'.$langs->trans('log'.$block->action).'</td>';
-	   	print '<td>'.$object_link.'<a href="#" blockid="'.$block->id.'" rel="show-info">'.img_info($langs->trans('ShowDetails')).'</a></td>';
-	   	print '<td align="right">'.price($block->amounts).'</td>';
 	   	print '<td>'.$block->getUser().'</td>';
-	   	print '<td>'.$block->signature.'</td>';
+	   	print '<td>'.$langs->trans('log'.$block->action).'</td>';
+	   	print '<td>'.$block->ref_object.'</td>';
+	   	print '<td>'.$object_link.'</td>';
+	   	print '<td align="right">'.price($block->amounts).'</td>';
+	   	print '<td align="center"><a href="#" blockid="'.$block->id.'" rel="show-info">'.img_info($langs->trans('ShowDetails')).'</a></td>';
+
 	   	print '<td>';
-	   	
-	   	print $block->error == 0 ? img_picto($langs->trans('OkCheckFingerprintValidity'), 'on') : img_picto($langs->trans('KoCheckFingerprintValidity'), 'off');
+	   	print $form->textwithpicto(dol_trunc($block->signature, '12'), $block->signature);
+	   	print '</td>';
+
+	   	print '<td>';
+	   	print $block->error == 0 ? img_picto($langs->trans('OkCheckFingerprintValidity'), 'tick') : img_picto($langs->trans('KoCheckFingerprintValidity'), 'statut8');
+
 	   	if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
 	   		print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') :  img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black') );
 	   	}
 		print '</td>';
+
 		print '</tr>';
-						
+
 	}
 }
 
 print '</table>';
 
+
+
 ?>
 <script type="text/javascript">
 $('a[rel=show-info]').click(function() {
 
 	$pop = $('<div id="pop-info"><table width="100%" class="border"><thead><th width="25%"><?php echo $langs->trans('Field') ?></th><th><?php echo $langs->trans('Value') ?></th></thead><tbody></tbody></table></div>');
-	
+
 	$pop.dialog({
 		title:"<?php echo $langs->transnoentities('BlockedlogInfoDialog'); ?>"
 		,modal:true
@@ -184,16 +195,16 @@ $('a[rel=show-info]').click(function() {
 	});
 
 	var fk_block = $(this).attr("blockid");
-	
+
 	$.ajax({
 		url:"../ajax/block-info.php?id="+fk_block
 		,dataType:'json'
 	}).done(function(data) {
 
 		drawData(data,'');
-		
+
 	});
-	
+
 });
 
 function drawData(data, prefix) {
@@ -203,41 +214,41 @@ function drawData(data, prefix) {
 		value = data[x];
 
 		$('#pop-info table tbody').append('<tr><td>'+prefix+x+'</td><td>'+value+'</td></tr>');
-		
+
 		if( (typeof value === "object") && (value !== null) ) {
 			drawData(value, prefix+x+' &gt;&gt; ');
 		}
 
 	}
-	
+
 }
 
 </script>
 
-<?php 
+<?php
 
 
 if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
 
 ?>
 				<script type="text/javascript">
-					
+
 					$.ajax({
 						url : "<?php echo dol_buildpath('/blockedlog/ajax/check_signature.php',1) ?>"
 						,dataType:"html"
 					}).done(function(data) {
-						
+
 						if(data == 'hashisok') {
 							$('#blockchainstatus').html('<?php echo $langs->trans('AuthorityReconizeFingerprintConformity'). ' '. img_picto($langs->trans('SignatureOK'), 'on') ?>');
 						}
 						else{
 							$('#blockchainstatus').html('<?php echo $langs->trans('AuthorityDidntReconizeFingerprintConformity'). ' '.img_picto($langs->trans('SignatureKO'), 'off') ?>');
 						}
-						
+
 					});
-					
+
 				</script>
-				
+
 <?php
 
 }
diff --git a/htdocs/blockedlog/ajax/authority.php b/htdocs/blockedlog/ajax/authority.php
index 12584b2bace..929fd8401d5 100644
--- a/htdocs/blockedlog/ajax/authority.php
+++ b/htdocs/blockedlog/ajax/authority.php
@@ -1,45 +1,77 @@
 <?php
-	
-	require '../../master.inc.php';
-	
-	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2017 ATM Consulting       <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-	$user=new User($db);
-	$user->fetch(1); //TODO conf user authority
-	
-	$auth = new BlockedLogAuthority($db);
-	
-	$signature = GETPOST('s');
-	$newblock = GETPOST('b');
-	$hash = GETPOST('h');
-	
-	if($auth->fetch(0, $signature)<=0) {
-		$auth->signature = $signature;
-		$auth->create($user);
-	}
-	
-	
-	if(!empty($hash)) {
-		
-		echo $auth->checkBlockchain($hash) ? 'hashisok' : 'hashisjunk';
-			
-	}
-	elseif(!empty($newblock)){
-		if($auth->checkBlock($newblock)) {
-			$auth->addBlock($newblock);
-			$auth->update($user);
-			
-			echo 'blockadded';
-		}
-		else{
-				
-			echo 'blockalreadyadded';
-				
-		}
+/**
+ *      \file       htdocs/blockedlog/ajax/authority.php
+ *      \ingroup    blockedlog
+ *      \brief      authority
+ */
+
+
+// This script is called with a POST method.
+// Directory to scan (full path) is inside POST['dir'].
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
+//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+
+$res=require '../../master.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
+
+$user=new User($db);
+$user->fetch(1); //TODO conf user authority
+
+$auth = new BlockedLogAuthority($db);
+
+$signature = GETPOST('s');
+$newblock = GETPOST('b');
+$hash = GETPOST('h');
+
+if($auth->fetch(0, $signature)<=0) {
+	$auth->signature = $signature;
+	$auth->create($user);
+}
+
+
+if(!empty($hash)) {
+
+	echo $auth->checkBlockchain($hash) ? 'hashisok' : 'hashisjunk';
+
+}
+elseif(!empty($newblock)){
+	if($auth->checkBlock($newblock)) {
+		$auth->addBlock($newblock);
+		$auth->update($user);
+
+		echo 'blockadded';
 	}
 	else{
-		echo 'idontunderstandwhatihavetodo';
+
+		echo 'blockalreadyadded';
+
 	}
-	
-	
+}
+else{
+	echo 'idontunderstandwhatihavetodo';
+}
+
+
diff --git a/htdocs/blockedlog/ajax/block-add.php b/htdocs/blockedlog/ajax/block-add.php
index 247b01186fe..c82eac81e7b 100644
--- a/htdocs/blockedlog/ajax/block-add.php
+++ b/htdocs/blockedlog/ajax/block-add.php
@@ -1,19 +1,49 @@
-<?php 
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2017 ATM Consulting       <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-	require '../../main.inc.php';
-	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-	
-	$id = GETPOST('id','int');
-	$element = GETPOST('element','alpha');
-	$action = GETPOST('action','alpha');
-	
-	if($element === 'facture') {
-		dol_include_once('/compta/facture/class/facture.class.php');
-		
-		$facture = new Facture($db);
-		if($facture->fetch($id)>0) {
-			$facture->call_trigger($action, $user);
-		}
-		
+/**
+ *      \file       htdocs/blockedlog/ajax/block-add.php
+ *      \ingroup    blockedlog
+ *      \brief      Block-add
+ */
+
+
+// This script is called with a POST method.
+// Directory to scan (full path) is inside POST['dir'].
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
+//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+
+$res=require '../../main.inc.php';
+
+$id = GETPOST('id','int');
+$element = GETPOST('element','alpha');
+$action = GETPOST('action','alpha');
+
+if ($element === 'facture') {
+    require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+	$facture = new Facture($db);
+	if($facture->fetch($id)>0) {
+		$facture->call_trigger($action, $user);
 	}
-	
\ No newline at end of file
+}
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index 7a5f531e8f1..83317f33d57 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -1,15 +1,47 @@
 <?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2017 ATM Consulting       <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-	require '../../main.inc.php';
-	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-	
-	$id = GETPOST('id');
-	
-	$block = new BlockedLog($db);
-	if($block->fetch($id)>0) {
-		echo json_encode($block->object_data);
-	}
-	else {
-		echo json_encode(false);
-	}
-	
\ No newline at end of file
+/**
+ *      \file       htdocs/blockedlog/ajax/block-info.php
+ *      \ingroup    blockedlog
+ *      \brief      block-info
+ */
+
+
+// This script is called with a POST method.
+// Directory to scan (full path) is inside POST['dir'].
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
+//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+
+$id = GETPOST('id');
+
+$block = new BlockedLog($db);
+if($block->fetch($id)>0) {
+	echo json_encode($block->object_data);
+}
+else {
+	echo json_encode(false);
+}
diff --git a/htdocs/blockedlog/ajax/check_signature.php b/htdocs/blockedlog/ajax/check_signature.php
index bb018508a31..170693a2ece 100644
--- a/htdocs/blockedlog/ajax/check_signature.php
+++ b/htdocs/blockedlog/ajax/check_signature.php
@@ -1,30 +1,63 @@
 <?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2017 ATM Consulting       <contact@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-	require '../../main.inc.php';
+/**
+ *      \file       htdocs/blockedlog/ajax/block-info.php
+ *      \ingroup    blockedlog
+ *      \brief      block-info
+ */
 
-	if(empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) exit('BLOCKEDLOG_AUTHORITY_URL not set');
-	
-	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
-	
-	$auth=new BlockedLogAuthority($db);
-	$auth->syncSignatureWithAuthority();
-	
-	$block_static = new BlockedLog($db);
-	
-	$blocks = $block_static->getLog('just_certified', 0, 0, 1) ;
 
-	$auth->signature = $block_static->getSignature();
-	
-	foreach($blocks as &$b) {
-		$auth->blockchain.=$b->signature;	
-			
-	}
-	
-	$hash = $auth->getBlockchainHash();
-	
-	$url = $conf->global->BLOCKEDLOG_AUTHORITY_URL.'/blockedlog/ajax/authority.php?s='.$auth->signature.'&h='.$hash;
+// This script is called with a POST method.
+// Directory to scan (full path) is inside POST['dir'].
 
-	$res = file_get_contents($url);
-	//echo $url;
-	echo $res;
\ No newline at end of file
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
+//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+
+
+require '../../main.inc.php';
+
+if(empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) exit('BLOCKEDLOG_AUTHORITY_URL not set');
+
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
+
+$auth=new BlockedLogAuthority($db);
+$auth->syncSignatureWithAuthority();
+
+$block_static = new BlockedLog($db);
+
+$blocks = $block_static->getLog('just_certified', 0, 0, 1) ;
+
+$auth->signature = $block_static->getSignature();
+
+foreach($blocks as &$b) {
+	$auth->blockchain.=$b->signature;
+
+}
+
+$hash = $auth->getBlockchainHash();
+
+$url = $conf->global->BLOCKEDLOG_AUTHORITY_URL.'/blockedlog/ajax/authority.php?s='.$auth->signature.'&h='.$hash;
+
+$res = file_get_contents($url);
+//echo $url;
+echo $res;
\ No newline at end of file
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index b0cddd66f75..8a1508b7a04 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -21,65 +21,65 @@
 
 class BlockedLog
 {
-	
+
 	/**
 	 * Id of the log
 	 * @var int
 	 */
 	public $id;
-	
+
 	/**
 	 * Unique fingerprint of the log
 	 * @var string
 	 */
 	public $signature = '';
-	
+
 	/**
 	 * Unique fingerprint of the line log content
 	 * @var string
 	 */
 	public $signature_line = '';
-	
+
 	public $amounts = null;
-	
+
 	/**
 	 * trigger action
 	 * @var string
 	 */
 	public $action = '';
-	
+
 	/**
 	 * Object element
 	 * @var string
 	 */
 	public $element = '';
-	
+
 	/**
 	 * Object id
 	 * @var int
 	 */
 	public $fk_object = 0;
-	
+
 	/**
 	 * Log certified by remote authority or not
 	 * @var boolean
 	 */
 	public $certified = false;
-	
+
 	/**
 	 * Author
 	 * @var int
 	 */
 	public $fk_user = 0;
-	
+
 	public $date_object = 0;
-	
+
 	public $ref_object = '';
-	
+
 	public $object_data = null;
-	
+
 	public $error = 0;
-	
+
 	/**
 	 *      Constructor
 	 *
@@ -88,7 +88,7 @@ class BlockedLog
 	public function __construct(DoliDB $db)
 	{
 		$this->db = $db;
-		
+
 	}
 
 	/**
@@ -96,10 +96,10 @@ class BlockedLog
 	 */
 	public function getObjectLink() {
 		global $langs;
-		
+
 		if($this->element === 'facture') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			
+
 			$object = new Facture($this->db);
 			if($object->fetch($this->fk_object)>0) {
 				return $object->getNomUrl(1);
@@ -110,7 +110,7 @@ class BlockedLog
 		}
 		else if($this->element === 'payment') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-			
+
 			$object = new Paiement($this->db);
 			if($object->fetch($this->fk_object)>0) {
 				return $object->getNomUrl(1);
@@ -119,61 +119,61 @@ class BlockedLog
 				$this->error++;
 			}
 		}
-	
+
 		return $langs->trans('ImpossibleToReloadObject', $this->element, $this->fk_object);
-		
+
 	}
-	
+
 	/**
 	 *      try to retrieve user author
 	*/
 	public function getUser() {
 		global $langs, $cachedUser;
-		
+
 		if(empty($cachedUser))$cachedUser=array();
-		
+
 		if(empty($cachedUser[$this->fk_user])) {
 			$u=new User($this->db);
 			if($u->fetch($this->fk_user)>0) {
 				$cachedUser[$this->fk_user] = $u;
 			}
 		}
-		
+
 		if(!empty($cachedUser[$this->fk_user])) {
 			return $cachedUser[$this->fk_user]->getNomUrl(1);
 		}
-		
+
 		return $langs->trans('ImpossibleToRetrieveUser', $this->fk_user);
 	}
-	
+
 	/**
 	 *      populate log by object
 	 *
 	 *      @param		payment|facture		$object      object to store
 	 */
 	public function setObjectData(&$object) {
-		
+
 		if($object->element=='payment') {
 			$this->date_object = $object->datepaye;
 		}
 		else{
 			$this->date_object = $object->date;
 		}
-		
+
 		$this->ref_object = $object->ref;
 		$this->element = $object->element;
 		$this->fk_object = $object->id;
-		
+
 		$this->object_data=new stdClass();
-		
+
 		if($this->element === 'facture') {
 			if(empty($object->thirdparty))$object->fetch_thirdparty();
 			$this->object_data->thirdparty = new stdClass();
-			
+
 			foreach($object->thirdparty as $key=>$value) {
 				if(!is_object($value)) $this->object_data->thirdparty->{$key} = $value;
 			}
-			
+
 			$this->object_data->total_ht 	= (double) $object->total_ht;
 			$this->object_data->total_tva	= (double) $object->total_tva;
 			$this->object_data->total_ttc	= (double) $object->total_ttc;
@@ -181,17 +181,17 @@ class BlockedLog
 			$this->object_data->total_localtax2= (double) $object->total_localtax2;
 			$this->object_data->note_public	= (double) $object->note_public;
 			$this->object_data->note_private= (double) $object->note_private;
-						
+
 		}
 		elseif($this->element==='payment'){
-			
+
 			$this->object_data->amounts = $object->amounts;
-			
+
 		}
-		
-		
+
+
 	}
-	
+
 	/**
 	 *	Get object from database
 	 *
@@ -199,50 +199,50 @@ class BlockedLog
 	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
 	 */
 	public function fetch($id) {
-		
+
 		global $langs;
-		
+
 		dol_syslog(get_class($this)."::fetch id=".$id, LOG_DEBUG);
-		
+
 		if (empty($id))
 		{
 			$this->error='BadParameter';
 			return -1;
 		}
-		
+
 		$langs->load("blockedlog");
-		
+
 		$sql = "SELECT b.rowid, b.signature, b.amounts, b.action, b.element, b.fk_object, b.certified, b.tms, b.fk_user, b.date_object, b.ref_object, b.object_data";
 		$sql.= " FROM ".MAIN_DB_PREFIX."blockedlog as b";
 		if ($id) $sql.= " WHERE b.rowid = ". $id;
-		
+
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
 			{
 				$obj = $this->db->fetch_object($resql);
-				
+
 				$this->id				= $obj->rowid;
 				$this->ref				= $obj->rowid;
-				
+
 				$this->signature		= $obj->signature;
 				$this->amounts			= (double) $obj->amounts;
 				$this->action			= $obj->action;
 				$this->element			= $obj->element;
-				
+
 				$this->fk_object		= trim($obj->fk_object);
 				$this->date_object		= $this->db->jdate($obj->date_object);
 				$this->ref_object		= $obj->ref_object;
-				
+
 				$this->certified		= ($obj->certified == 1);
-				
+
 				$this->fk_user 			= $obj->fk_user;
-				
+
 				$this->tms				= $this->db->jdate($obj->tms);
-				
+
 				$this->object_data		= unserialize($obj->object_data);
-				
+
 				return 1;
 			}
 			else
@@ -256,24 +256,24 @@ class BlockedLog
 			$this->error=$this->db->error();
 			return -1;
 		}
-		
+
 	}
-	
+
 	/**
 	 *	Set block certified by authority
 	 *
 	 *	@return	boolean
 	 */
 	public function setCertified() {
-		
+
 		$res = $this->db->query("UPDATE ".MAIN_DB_PREFIX."blockedlog SET certified=1 WHERE rowid=".$this->id);
 		if($res===false) return false;
-		
+
 		return true;
-		
-		
+
+
 	}
-	
+
 	/**
 	 *	Create blocked log in database.
 	 *
@@ -281,31 +281,31 @@ class BlockedLog
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
 	public function create($user) {
-		
+
 		global $conf,$langs,$hookmanager;
-		
+
 		$langs->load('blockedlog');
-		
+
 		$error=0;
-		
+
 		dol_syslog(get_class($this).'::create', LOG_DEBUG);
-		
+
 		$this->getSignatureRecursive();
-		
-		
+
+
 		if (is_null($this->amounts))
 		{
 			$this->error=$langs->trans("BlockLogNeedAmountsValue");
 			dol_syslog($this->error, LOG_WARNING);
 			return -1;
 		}
-		
+
 		if(empty($this->element)) {
 			$this->error=$langs->trans("BlockLogNeedElement");
 			dol_syslog($this->error, LOG_WARNING);
 			return -2;
 		}
-		
+
 		if(empty($this->action)) {
 			$this->error=$langs->trans("BlockLogNeedAction");
 			dol_syslog($this->error, LOG_WARNING);
@@ -313,9 +313,9 @@ class BlockedLog
 		}
 
 		$this->fk_user = $user->id;
-		
+
 		$this->db->begin();
-		
+
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."blockedlog (";
 		$sql.= "action,";
 		$sql.= " amounts,";
@@ -343,18 +343,18 @@ class BlockedLog
 		$sql.= "".$user->id.",";
 		$sql.= $conf->entity;
 		$sql.= ")";
-		
+
 		$res = $this->db->query($sql);
 		if ($res)
 		{
 			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."blockedlog");
-			
+
 			if ($id > 0)
 			{
 				$this->id = $id;
-				
+
 				$this->db->commit();
-				
+
 				return $this->id;
 			}
 			else
@@ -369,9 +369,9 @@ class BlockedLog
 			$this->db->rollback();
 			return -1;
 		}
-		
+
 	}
-	
+
 	/**
 	 *	return crypted value.
 	 *
@@ -379,56 +379,56 @@ class BlockedLog
 	 *	@return	string					crypted string
 	 */
 	private function crypt($value) {
-		
+
 		return hash('sha256',$value);
-		
+
 	}
-	
+
 	/**
 	 *	check if current signature still correct compare to the chain
 	 *
-	 *	@return	boolean					
+	 *	@return	boolean
 	 */
 	public function checkSignature() {
-		
+
 		$signature_to_test = $this->signature;
-		
+
 		$this->getSignatureRecursive();
-	
+
 		$res = ($signature_to_test === $this->signature);
-		
+
 		if(!$res) {
 			$this->error++;
 		}
-		
+
 		return $res;
 	}
-	
+
 	/**
-	 *	set current signatures 
+	 *	set current signatures
 	 */
 	 private function getSignatureRecursive(){
-		
+
 		$this->signature_line = $this->crypt( $this->action . $this->getSignature() . $this->amounts . print_r($this->object_data, true) );
 		/*if($this->signature=='d6320580a02c1ab67fcc0a6d49d453c7d96dda0148901736f7f55725bfe1b900' || $this->signature=='ea65d435ff12ca929936a406aa9d707d99fb334c127878d256b602a5541bbbc9') {
 			var_dump($this->signature_line,$this->action ,$this->getSignature() , $this->amounts , $this->object_data);
 		}*/
 		$this->signature = $this->signature_line;
-		
+
 		$logs = $this->getLog('all', 0, 0, 1) ;
 		if($logs!==false) {
 			foreach($logs as &$b) {
-			
+
 				if($this->id>0 && $b->id == $this->id) break; // on arrête sur un enregistrement précis pour recalculer une signature
-				
+
 				$b->getCurrentValue(); // on récupère la valeur actuelle en base de l'élément enregistré
-				
+
 				$this->signature = $this->crypt($this->signature. $this->action . $b->signature . $b->amounts);
 			}
 		}
-		
+
 	}
-	
+
 	/**
 	 *	return log object for a element.
 	 *
@@ -439,110 +439,110 @@ class BlockedLog
 	 *	@return	array					array of object log
 	 */
 	public function getLog($element, $fk_object, $limit = 0, $order = -1) {
-		global $conf,$cachedlogs ; 
-		
+		global $conf,$cachedlogs ;
+
 		/* $cachedlogs allow fastest search */
 		if(empty($cachedlogs)) $cachedlogs=array();
-	
-		
+
+
 		if($element=='all') {
-		
+
 	 		$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity;
-	    	
+
 		}
 		else if($element=='not_certified') {
 			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND certified = 0";
-			
+
 		}
 		else if($element=='just_certified') {
 			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND certified = 1";
-			
+
 		}
 		else{
 			$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE element='".$element."' AND fk_object=".(int) $fk_object;
-			
+
 		}
-		
+
 		$sql.=($order<0 ? ' ORDER BY rowid DESC ' : ' ORDER BY rowid ASC ');
-		
+
 		if($limit > 0 )$sql.=' LIMIT '.$limit;
-		
+
 		$res = $this->db->query($sql);
-		
+
 		if($res) {
-		
+
 			$results=array();
-			
+
 			while($obj = $this->db->fetch_object($res)) {
-				
+
 				if(!isset($cachedlogs[$obj->rowid])) {
 					$b=new BlockedLog($this->db);
 					$b->fetch($obj->rowid);
-					
+
 					$cachedlogs[$obj->rowid] = $b;
 				}
-				
+
 				$results[] = $cachedlogs[$obj->rowid];
-				
+
 			}
-			
+
 			return $results;
 		}
 		else{
 			return false;
 		}
 	}
-	
+
 	/**
 	 *	set amounts of log from current element value in order to compare signature.
 	 */
 	private function getCurrentValue() {
-		
+
 		if($this->element === 'payment') {
 			$sql="SELECT amount FROM ".MAIN_DB_PREFIX."paiement WHERE rowid=".$this->fk_object;
-					
+
 			$res = $this->db->query($sql);
-			
+
 			if($res && $obj = $this->db->fetch_object($res)) {
 				$this->amounts = (double) $obj->amount;
 			}
 		}
 		elseif($this->element === 'facture') {
 			$sql="SELECT total_ttc FROM ".MAIN_DB_PREFIX."facture WHERE rowid=".$this->fk_object;
-			
+
 			$res = $this->db->query($sql);
 			if($res && $obj = $this->db->fetch_object($res)) {
 				$this->amounts = (double) $obj->total_ttc;
 			}
 		}
-		
+
 	}
-	
+
 	/**
-	 *	return and set the entity signature included into line signature
+	 *	Return and set the entity signature included into line signature
 	 *
 	 *	@return	string					current entity signature
 	 */
 	public function getSignature() {
 		global $db,$conf,$mysoc;
-		
-		if(empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint
-			
+
+		if (empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint
+
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-			
+
 			$fingerprint = $this->crypt(print_r($mysoc,true).time().rand(0,1000));
-			
+
 			dolibarr_set_const($db, 'BLOCKEDLOG_ENTITY_FINGERPRINT', $fingerprint, 'chaine',0,'Numeric Unique Fingerprint', $conf->entity);
-			
-			$conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT= $fingerprint;
+
+			$conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT=$fingerprint;
 		}
-		
+
 		return $conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT;
 	}
-	
+
 }
 
diff --git a/htdocs/blockedlog/lib/blockedlog.lib.php b/htdocs/blockedlog/lib/blockedlog.lib.php
index a7fca40d116..cffac7cbff9 100644
--- a/htdocs/blockedlog/lib/blockedlog.lib.php
+++ b/htdocs/blockedlog/lib/blockedlog.lib.php
@@ -32,17 +32,17 @@ function blockedlogadmin_prepare_head()
 
 	$h = 0;
 	$head = array();
-	
+
 	$head[$h][0] = DOL_URL_ROOT."/blockedlog/admin/blockedlog.php";
-	$head[$h][1] = $langs->trans("BlockedLog");
+	$head[$h][1] = $langs->trans("Setup");
 	$head[$h][2] = 'blockedlog';
 	$h++;
-	
+
 	$head[$h][0] = DOL_URL_ROOT."/blockedlog/admin/fingerprints.php";
 	$head[$h][1] = $langs->trans("Fingerprints");
 	$head[$h][2] = 'fingerprints';
 	$h++;
-	
+
 	$object=new stdClass();
 
     // Show more tabs from modules
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index ce16d6b9931..223acb91fb3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4247,37 +4247,6 @@ else if ($id > 0 || ! empty($ref))
 		$delallowed = $user->rights->facture->supprimer;
 
 		print $formfile->showdocuments('facture', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
-		
-		if(!empty($conf->blockedlog->enabled) && $object->statut>0) {
-			?>
-			<script type="text/javascript">
-
-			$(document).ready(function() {
-				$('a.documentpreview').click(function() {
-					$.post("<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>"
-							, { 
-								id:<?php echo $object->id; ?> 
-								, element:"<?php echo $object->element ?>"
-								, action:"PREVIEW_BILL" 
-							}
-					);
-				});
-				$('a.documentdownload').click(function() {
-					$.post("<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>"
-							, { 
-								id:<?php echo $object->id; ?> 
-								, element:"<?php echo $object->element ?>"
-								, action:"DOWNLOAD_BILL" 
-							}
-					);
-				});
-			});
-			
-			</script>
-			<?php
-		}
-		
-		
 		$somethingshown = $formfile->numoffiles;
 
 		// Show links to link elements
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index b149471cd20..f3f3be971b5 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -43,15 +43,15 @@ class modBlockedLog extends DolibarrModules
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
-        $this->family = "technic";
+        $this->family = "base";
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
         $this->name = preg_replace('/^mod/i','',get_class($this));
-        $this->description = "Enable a log on some business events into a reserved log. This module may be mandatory for some countries.";
+        $this->description = "Enable a log on some business events into a non reversible log. This module may be mandatory for some countries.";
         $this->version = 'development';                        // 'development', 'experimental' or 'dolibarr' or version
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 1;
+        $this->special = 2;
         // Name of image file used for this module.
         $this->picto='technic';
 
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 004c4eecd78..6759d18ba5d 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -50,9 +50,9 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		if (empty($conf->blockedlog->enabled)) {
 			return 0;
 		}
-		
-		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED' 
-				|| $action === 'BILL_SENTBYMAIL' || $action === 'DOWNLOAD_BILL' || $action === 'PREVIEW_BILL') {
+
+		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
+				|| $action === 'BILL_SENTBYMAIL' || $action === 'DOC_DOWNLOAD' || $action === 'DOC_PREVIEW') {
 			$amounts=  (double) $object->total_ttc;
 		}
 		else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
@@ -62,8 +62,8 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 					$amounts+= price2num($amount);
 				}
 			}
-			
-			
+
+
 		}
 		else if(strpos($action,'PAYMENT')!==false) {
 			$amounts= (double) $object->amount;
@@ -71,25 +71,25 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		else {
 			return 0; // not implemented action log
 		}
-		
+
 		$b=new BlockedLog($this->db);
 		$b->action = $action;
 		$b->amounts= $amounts;
 		$b->setObjectData($object);
-		
+
 		$res = $b->create($user);
-		
+
 		if($res<0) {
 			setEventMessage($b->error,'errors');
-			
+
 			return -1;
 		}
 		else {
-			
+
 			return 1;
 		}
-		
-		
+
+
     }
 
 }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 695373e22b5..1aa79c2dced 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -467,7 +467,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes. For legal purpose, see instead module 'Non Reversible Logs'.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -565,6 +565,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3200Name=Non Reversible Logs
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table that can be then exported. This module may be mandatory for some countries.
 Module4000Name=HRM
 Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index fcad52508bd..7129b65257d 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -1,12 +1,14 @@
+BlockedLog=Non Reversible Logs
 Field=Field
-BlockedLogDesc=This module store event for invoice and payments as block chain
-FingerprintsDesc=All fingerprints stored
-EntityKey=Entity Key
-ShowAllFingerPrintsMightBeTooLong=Show all fingerprints (might be long)
-ShowAllFingerPrintsErrorsMightBeTooLong=Show all fingerprints with error (might be long)
+BlockedLogDesc=This module store event for invoice and payments into a block chain
+Fingerprints=Archived events and fingerprints
+FingerprintsDesc=Archived business events and fingerprints
+CompanyInitialKey=Company initial key
+ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
+ShowAllFingerPrintsErrorsMightBeTooLong=Show all archive logs with error (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Fingerprint is not valid
-OkCheckFingerprintValidity=Fingerprint is valid
+KoCheckFingerprintValidity=Archived log is not valid. It means someone (a hacker ?) has modified some datas of this archived log after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+OkCheckFingerprintValidity=Archived log is valid. It means all data on this line were not modified and record follow the previous one.
 AddedByAuthority=Stored into remote authority
 NotAddedByAuthorityYet=Not yet stored into remote authority
 ShowDetails=Show stored details
@@ -18,6 +20,7 @@ logBILL_VALIDATE=Customer bill set valid from draft
 logBILL_SENTBYMAIL=Customer bill send by mail
 BlockedlogInfoDialog=Log Details
 Fingerprint=Fingerprint
-DownloadLogCSV=Download fingerprints CSV
-logPREVIEW_BILL=Preview of a validated customer bill in order to print or download
-logDOWNLOAD_BILL=Download of a validated customer bill in order to print or send
\ No newline at end of file
+DownloadLogCSV=Download archive logs (CSV)
+logDOC_PREVIEW=Preview of a validated document in order to print or download
+logDOC_DOWNLOAD=Download of a validated document in order to print or send
+DataOfArchivedEvent=Full datas of archived event
\ No newline at end of file
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6b75b957590..33b155bb64c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1891,7 +1891,7 @@ if (! function_exists("llxFooter"))
      */
     function llxFooter($comment='',$zone='private')
     {
-        global $conf, $langs, $user;
+        global $conf, $langs, $user, $object;
         global $delayedhtmlcontent;
 
         // Global html output events ($mesgs, $errors, $warnings)
@@ -2026,6 +2026,40 @@ if (! function_exists("llxFooter"))
                 </script>';
         }
 
+        // Wrapper to add log when clicking on download or preview
+        if (! empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
+        {
+            if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
+            {
+                print "\n<!-- JS CODE TO ENABLE log when making a download or a preview of a document -->\n";
+                ?>
+    			<script type="text/javascript">
+    			jQuery(document).ready(function () {
+    				$('a.documentpreview').click(function() {
+    					$.post('<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>'
+    							, {
+    								id:<?php echo $object->id; ?>
+    								, element:'<?php echo $object->element ?>'
+    								, action:'DOC_PREVIEW'
+    							}
+    					);
+    				});
+    				$('a.documentdownload').click(function() {
+    					$.post('<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>'
+    							, {
+    								id:<?php echo $object->id; ?>
+    								, element:'<?php echo $object->element ?>'
+    								, action:'DOC_DOWNLOAD'
+    							}
+    					);
+    				});
+    			});
+    			</script>
+				<?php
+    		}
+       	}
+
+
 		// A div for the address popup
 		print "\n<!-- A div to allow dialog popup -->\n";
 		print '<div id="dialogforpopup" style="display: none;"></div>'."\n";

From e813fd2dfa69d3ce67ab5aec2af6df34970e3c16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 12:57:30 +0200
Subject: [PATCH 1134/1163] Fix missing key import_key and extraparams

---
 htdocs/adherents/class/api_memberstypes.class.php   | 1 -
 htdocs/comm/action/class/api_agendaevents.class.php | 1 -
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql      | 7 +++++--
 htdocs/install/mysql/tables/llx_actioncomm.sql      | 4 +++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 9457b910c5d..ff8064d80fb 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -274,7 +274,6 @@ class MembersTypes extends DolibarrApi
         unset($object->cotisation);
         unset($object->libelle);
 
-        unset($object->import_key);
         unset($object->array_options);
         unset($object->linkedObjectsIds);
         unset($object->context);
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index a607998cfa8..4edd656da53 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -318,7 +318,6 @@ class AgendaEvents extends DolibarrApi
 
     	unset($object->usermod);
     	unset($object->libelle);
-    	unset($object->import_key);
     	unset($object->array_options);
     	unset($object->context);
     	unset($object->canvas);
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index a66ef47fba6..5e46393768a 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -82,14 +82,17 @@ ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (filepath, filename, ent
 ALTER TABLE llx_ecm_files ADD INDEX idx_ecm_files_label (label);
 
 
+ALTER TABLE llx_expedition ADD COLUMN fk_projet integer DEFAULT NULL after fk_soc;
+
+
 ALTER TABLE llx_holiday ADD COLUMN import_key				varchar(14);
 ALTER TABLE llx_holiday ADD COLUMN extraparams				varchar(255);	
 
-ALTER TABLE llx_expedition ADD COLUMN fk_projet integer DEFAULT NULL after fk_soc;
-
 ALTER TABLE llx_expensereport ADD COLUMN import_key			varchar(14);
 ALTER TABLE llx_expensereport ADD COLUMN extraparams		varchar(255);	
 
+ALTER TABLE llx_actioncomm ADD COLUMN import_key			varchar(14);
+ALTER TABLE llx_actioncomm ADD COLUMN extraparams			varchar(255);	
 
 
 ALTER TABLE llx_bank_account ADD COLUMN extraparams		varchar(255);	
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index 4849aacb690..48b73bcaa65 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -69,8 +69,10 @@ create table llx_actioncomm
   recurdateend      datetime,						-- no more recurring event after this date
      
   fk_element		integer DEFAULT NULL,			-- For link to an element (proposal, invoice, order, ...)
-  elementtype		varchar(255) DEFAULT NULL		-- For link to an element (proposal, invoice, order, ...)
+  elementtype		varchar(255) DEFAULT NULL,		-- For link to an element (proposal, invoice, order, ...)
 
+  import_key		varchar(14),
+  extraparams		varchar(255)					-- for other parameters with json format
 )ENGINE=innodb;
 
 

From 81f1a341120a85e97c718571ca5bf447a74c08c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 13:06:35 +0200
Subject: [PATCH 1135/1163] Revert "Fix SPEC #7013 : use database type
 "numeric" to store monetary values"

---
 .../install/mysql/migration/6.0.0-7.0.0.sql   | 64 -------------------
 .../tables/llx_accounting_bookkeeping.sql     | 10 +--
 .../install/mysql/tables/llx_blockedlog.sql   |  2 +-
 .../mysql/tables/llx_chargesociales.sql       |  2 +-
 htdocs/install/mysql/tables/llx_commande.sql  |  2 +-
 .../mysql/tables/llx_commande_fournisseur.sql |  2 +-
 htdocs/install/mysql/tables/llx_don.sql       |  2 +-
 .../mysql/tables/llx_loan_schedule.sql        |  6 +-
 .../mysql/tables/llx_paiementcharge.sql       |  2 +-
 .../mysql/tables/llx_paiementfourn.sql        |  2 +-
 .../mysql/tables/llx_payment_donation.sql     |  2 +-
 .../tables/llx_payment_expensereport.sql      |  2 +-
 .../install/mysql/tables/llx_payment_loan.sql |  6 +-
 .../mysql/tables/llx_payment_salary.sql       |  4 +-
 .../mysql/tables/llx_prelevement_bons.sql     |  2 +-
 .../llx_prelevement_facture_demande.sql       |  2 +-
 .../mysql/tables/llx_prelevement_lignes.sql   |  2 +-
 htdocs/install/mysql/tables/llx_societe.sql   |  2 +-
 htdocs/install/mysql/tables/llx_tva.sql       |  4 +-
 19 files changed, 28 insertions(+), 92 deletions(-)
 delete mode 100644 htdocs/install/mysql/migration/6.0.0-7.0.0.sql

diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
deleted file mode 100644
index 545b52ea4a7..00000000000
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ /dev/null
@@ -1,64 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 6.0.0 or higher.
---
--- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
--- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
--- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
--- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
--- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
--- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
--- To drop an index:        -- VMYSQL4.0 DROP INDEX nomindex on llx_table
--- To drop an index:        -- VPGSQL8.0 DROP INDEX nomindex
--- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
--- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
--- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
--- To make pk to be auto increment (postgres): -- VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
--- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
--- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
--- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
--- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
--- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
--- Note: fields with type BLOB/TEXT can't have default value.
--- -- VPGSQL8.2 DELETE FROM llx_usergroup_user      WHERE fk_user      NOT IN (SELECT rowid from llx_user);
--- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
-
-
--- Clean corrupted values for tms
--- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
--- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
--- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
--- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
--- Remove default not null on date_fin
--- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
--- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
-
--- Move real to numeric for more precision for storing monetary amounts (no rouding)
--- https://wiki.dolibarr.org/index.php/Langages_et_normes#Structure_des_tables_et_champs
-ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN debit numeric(24,8);
-ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN credit numeric(24,8);
-ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN montant numeric(24,8);
-ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN multicurrency_amount numeric(24,8);
-ALTER TABLE llx_blockedlog MODIFY COLUMN amounts numeric(24,8);
-ALTER TABLE llx_chargessociales MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_commande MODIFY COLUMN amount_ht numeric(24,8);
-ALTER TABLE llx_commande_fournisseur MODIFY COLUMN amount_ht numeric(24,8);
-ALTER TABLE llx_don MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_capital numeric(24,8);
-ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_insurance numeric(24,8);
-ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_interest numeric(24,8);
-ALTER TABLE llx_paiementcharge MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_paiementfourn MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_payment_donation MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_payment_expensereport MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_payment_loan MODIFY COLUMN amount_capital numeric(24,8);
-ALTER TABLE llx_payment_loan MODIFY COLUMN amount_insurance numeric(24,8);
-ALTER TABLE llx_payment_loan MODIFY COLUMN amount_interest numeric(24,8);
-ALTER TABLE llx_payment_salary MODIFY COLUMN salary numeric(24,8);
-ALTER TABLE llx_payment_salary MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_prelevement_bons MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_prelevement_facture_demande MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_prelevement_lignes MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_societe MODIFY COLUMN capital numeric(24,8);
-ALTER TABLE llx_tva MODIFY COLUMN amount numeric(24,8);
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index 01ced5b07f4..ad1160c356d 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -26,17 +26,17 @@ CREATE TABLE llx_accounting_bookkeeping
   doc_ref               varchar(300) NOT NULL,		-- 					| facture_client/reglement_client/... reference number
   fk_doc                integer NOT NULL,			-- 					| facture_client/reglement_client/... rowid
   fk_docdet             integer NOT NULL,			-- 					| facture_client/reglement_client/... line rowid
-  thirdparty_code       varchar(32),				-- Third party code (customer or supplier) when record is saved (may help debug) 
+  thirdparty_code       varchar(32),                -- Third party code (customer or supplier) when record is saved (may help debug) 
   subledger_account     varchar(32),				-- FEC:CompAuxNum	| account number of subledger account
   subledger_label       varchar(255),				-- FEC:CompAuxLib	| label of subledger account
   numero_compte         varchar(32) NOT NULL,		-- FEC:CompteNum	| account number
   label_compte          varchar(255) NOT NULL,		-- FEC:CompteLib	| label of account
   label_operation       varchar(255),				-- FEC:EcritureLib	| label of the operation
-  debit                 numeric(24,8) NOT NULL,		-- FEC:Debit
-  credit                numeric(24,8) NOT NULL,		-- FEC:Credit
-  montant               numeric(24,8) NOT NULL,		-- FEC:Montant (Not necessary)
+  debit                 double NOT NULL,			-- FEC:Debit
+  credit                double NOT NULL,			-- FEC:Credit
+  montant               double NOT NULL,			-- FEC:Montant (Not necessary)
   sens                  varchar(1) DEFAULT NULL,	-- FEC:Sens (Not necessary)
-  multicurrency_amount  numeric(24,8),				-- FEC:Montantdevise
+  multicurrency_amount  double,						-- FEC:Montantdevise
   multicurrency_code    varchar(255),				-- FEC:Idevise
   lettering_code        varchar(255),				-- FEC:EcritureLet
   date_lettering        datetime,					-- FEC:DateLet
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
index 59c8e262817..ae696a0d6d1 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -4,7 +4,7 @@ CREATE TABLE llx_blockedlog
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	tms	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	action varchar(50), 
-	amounts numeric(24,8) NOT NULL, 
+	amounts real NOT NULL, 
 	signature varchar(100) NOT NULL, 
 	signature_line varchar(100) NOT NULL, 
 	element varchar(50), 
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index 093b635a964..519ceacc9e5 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -34,7 +34,7 @@ create table llx_chargesociales
   fk_type			integer NOT NULL,
   fk_account		integer,                       -- bank account
   fk_mode_reglement	integer,                -- mode de reglement
-  amount			numeric(24,8) default 0 NOT NULL,
+  amount			real     default 0 NOT NULL,
   paye				smallint default 0 NOT NULL,
   periode			date,
   fk_projet			integer DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index 6964abdcd57..98740c232ac 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -42,7 +42,7 @@ create table llx_commande
   fk_user_cloture		integer,						-- user closing
   source				smallint,						-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
   fk_statut				smallint  default 0,
-  amount_ht				numeric(24,8)  default 0,
+  amount_ht				real      default 0,
   remise_percent		real      default 0,
   remise_absolue		real      default 0,
   remise				real      default 0,
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index 24158903eb1..6d291dcfa00 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -46,7 +46,7 @@ create table llx_commande_fournisseur
   source				smallint NOT NULL,			-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
   fk_statut				smallint  default 0,
   billed				smallint  default 0,
-  amount_ht				numeric(24,8)  default 0,
+  amount_ht				real      default 0,
   remise_percent		real      default 0,
   remise				real      default 0,
   tva					double(24,8)      default 0,
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql
index 63b2cd111ea..b7b7c89f9cd 100644
--- a/htdocs/install/mysql/tables/llx_don.sql
+++ b/htdocs/install/mysql/tables/llx_don.sql
@@ -28,7 +28,7 @@ create table llx_don
   tms             timestamp,
   fk_statut       smallint NOT NULL DEFAULT 0,  -- Status of donation promise or validate
   datedon         datetime,                     -- Date of the donation/promise
-  amount          numeric(24,8) DEFAULT 0,
+  amount          real DEFAULT 0,
   fk_payment      integer,
   paid            smallint default 0 NOT NULL,
   firstname       varchar(50),
diff --git a/htdocs/install/mysql/tables/llx_loan_schedule.sql b/htdocs/install/mysql/tables/llx_loan_schedule.sql
index eb43238255a..c682b22f276 100644
--- a/htdocs/install/mysql/tables/llx_loan_schedule.sql
+++ b/htdocs/install/mysql/tables/llx_loan_schedule.sql
@@ -24,9 +24,9 @@ create table llx_loan_schedule
   datec				datetime,         -- creation date
   tms				timestamp,
   datep				datetime,         -- payment date
-  amount_capital	numeric(24,8) DEFAULT 0,
-  amount_insurance	numeric(24,8) DEFAULT 0,
-  amount_interest	numeric(24,8) DEFAULT 0,
+  amount_capital	real DEFAULT 0,
+  amount_insurance	real DEFAULT 0,
+  amount_interest	real DEFAULT 0,
   fk_typepayment	integer NOT NULL,
   num_payment		varchar(50),
   note_private      text,
diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql
index 086bafae0fa..2efca933dba 100644
--- a/htdocs/install/mysql/tables/llx_paiementcharge.sql
+++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql
@@ -23,7 +23,7 @@ create table llx_paiementcharge
   datec           datetime,           -- date de creation
   tms             timestamp,
   datep           datetime,           -- payment date
-  amount          numeric(24,8) DEFAULT 0,
+  amount          real DEFAULT 0,
   fk_typepaiement integer NOT NULL,
   num_paiement    varchar(50),
   note            text,
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql
index 16d63a32076..0e9b1885c97 100644
--- a/htdocs/install/mysql/tables/llx_paiementfourn.sql
+++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql
@@ -25,7 +25,7 @@ create table llx_paiementfourn
   tms               timestamp,
   datec             datetime,          -- date de creation de l'enregistrement
   datep             datetime,          -- date de paiement
-  amount            numeric(24,8) DEFAULT 0,      -- montant
+  amount            real DEFAULT 0,    -- montant
   multicurrency_amount double(24,8) DEFAULT 0,    -- multicurrency amount
   fk_user_author    integer,           -- auteur
   fk_paiement       integer NOT NULL,  -- moyen de paiement
diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql
index 1859c7aa796..afa5075cd4e 100644
--- a/htdocs/install/mysql/tables/llx_payment_donation.sql
+++ b/htdocs/install/mysql/tables/llx_payment_donation.sql
@@ -23,7 +23,7 @@ create table llx_payment_donation
   datec           datetime,           -- date de creation
   tms             timestamp,
   datep           datetime,           -- payment date
-  amount          numeric(24,8) DEFAULT 0,
+  amount          real DEFAULT 0,
   fk_typepayment  integer NOT NULL,
   num_payment     varchar(50),
   note            text,
diff --git a/htdocs/install/mysql/tables/llx_payment_expensereport.sql b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
index 1857246e22e..40e39771978 100644
--- a/htdocs/install/mysql/tables/llx_payment_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
@@ -23,7 +23,7 @@ create table llx_payment_expensereport
   datec                   datetime,           -- date de creation
   tms                     timestamp,
   datep                   datetime,           -- payment date
-  amount                  numeric(24,8) DEFAULT 0,
+  amount                  real DEFAULT 0,
   fk_typepayment          integer NOT NULL,
   num_payment             varchar(50),
   note                    text,
diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql
index 3b6111a7b2f..d023c039391 100644
--- a/htdocs/install/mysql/tables/llx_payment_loan.sql
+++ b/htdocs/install/mysql/tables/llx_payment_loan.sql
@@ -24,9 +24,9 @@ create table llx_payment_loan
   datec				datetime,         -- creation date
   tms				timestamp,
   datep				datetime,         -- payment date
-  amount_capital	numeric(24,8) DEFAULT 0,
-  amount_insurance	numeric(24,8) DEFAULT 0,
-  amount_interest	numeric(24,8) DEFAULT 0,
+  amount_capital	real DEFAULT 0,
+  amount_insurance	real DEFAULT 0,
+  amount_interest	real DEFAULT 0,
   fk_typepayment	integer NOT NULL,
   num_payment		varchar(50),
   note_private      text,
diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql
index 3b6da16b9cb..38364c6812e 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary.sql
@@ -24,8 +24,8 @@ create table llx_payment_salary
   fk_user         integer NOT NULL,
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur (this field should not be here, only into bank tables)
-  salary          numeric(24,8),              -- salary of user when payment was done
-  amount          numeric(24,8) NOT NULL DEFAULT 0,
+  salary          real,						  -- salary of user when payment was done
+  amount          real NOT NULL DEFAULT 0,
   fk_typepayment  integer NOT NULL,
   num_payment     varchar(50),				  -- ref
   label           varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
index 40fff2e842d..e92342eb001 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
@@ -29,7 +29,7 @@ create table llx_prelevement_bons
   ref            varchar(12),        -- reference
   entity         integer DEFAULT 1 NOT NULL, -- multi company id
   datec          datetime,           -- date de creation
-  amount         numeric(24,8) DEFAULT 0,    -- montant total du prelevement
+  amount         real DEFAULT 0,     -- montant total du prelevement
   statut         smallint DEFAULT 0, -- statut
   credite        smallint DEFAULT 0, -- indique si le prelevement a ete credite
   note           text,
diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
index 1d1b59bf3f5..3bdc0e2ed81 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
@@ -21,7 +21,7 @@ create table llx_prelevement_facture_demande
 (
   rowid               integer AUTO_INCREMENT PRIMARY KEY,
   fk_facture          integer NOT NULL,
-  amount              numeric(24,8) NOT NULL,
+  amount              real NOT NULL,
   date_demande        datetime NOT NULL,
   traite              smallint DEFAULT 0,
   date_traite         datetime,
diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
index 448b3846d71..04b6e1ebf5e 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
@@ -24,7 +24,7 @@ create table llx_prelevement_lignes
   statut              smallint DEFAULT 0,
 
   client_nom          varchar(255),
-  amount              numeric(24,8) DEFAULT 0,
+  amount              real DEFAULT 0,
   code_banque         varchar(128),
   code_guichet        varchar(6),
   number              varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index 7c88a74de07..20440b692d7 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -64,7 +64,7 @@ create table llx_societe
   idprof5                  varchar(128),                         		-- IDProf5: nu for france
   idprof6                  varchar(128),                         		-- IDProf6: nu for france
   tva_intra                varchar(20),                         		-- tva
-  capital                  numeric(24,8),                       		-- capital de la societe
+  capital                  real,                                		-- capital de la societe
   fk_stcomm                integer        DEFAULT 0 NOT NULL,      	-- commercial statut
   note_private             text,                                		--
   note_public              text,                                        --
diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql
index d2a7b67c835..9abf63d6ad9 100644
--- a/htdocs/install/mysql/tables/llx_tva.sql
+++ b/htdocs/install/mysql/tables/llx_tva.sql
@@ -24,11 +24,11 @@ create table llx_tva
   datec           datetime,                   -- Create date
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur
-  amount          numeric(24,8) NOT NULL DEFAULT 0,
+  amount          real NOT NULL DEFAULT 0,
   fk_typepayment  integer NULL,
   num_payment     varchar(50),
   label           varchar(255),
-  entity          integer DEFAULT 1 NOT NULL, -- multi company id
+  entity          integer DEFAULT 1 NOT NULL,	-- multi company id
   note            text,
   fk_bank         integer,  
   fk_user_creat   integer,                    -- utilisateur who create record

From b228fe6a2ae6aa5ac265fcb1aca90c5247c2d4d4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2017 16:06:20 +0200
Subject: [PATCH 1136/1163] Fix auto focus on module page

---
 htdocs/admin/modules.php          | 4 +++-
 htdocs/core/lib/functions.lib.php | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 8bea1c6dcb7..5d5886b5415 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -430,6 +430,8 @@ print "<br>\n";
 
 if ($mode == 'common')
 {
+    dol_set_focus('#search_keyword');
+
     print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -441,7 +443,7 @@ if ($mode == 'common')
 
     $moreforfilter = '';
     $moreforfilter.='<div class="divsearchfield">';
-    $moreforfilter.= $langs->trans('Keyword') . ': <input type="text" name="search_keyword" value="'.dol_escape_htmltag($search_keyword).'">';
+    $moreforfilter.= $langs->trans('Keyword') . ': <input type="text" id="search_keyword" name="search_keyword" value="'.dol_escape_htmltag($search_keyword).'">';
     $moreforfilter.= '</div>';
     $moreforfilter.='<div class="divsearchfield">';
     $moreforfilter.= $langs->trans('Origin') . ': '.$form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), 1);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a582263185b..fd3b0012165 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6089,12 +6089,12 @@ function dolExplodeIntoArray($string, $delimiter = ';', $kv = '=')
 /**
  * Set focus onto field with selector
  *
- * @param 	string	$selector	Selector ('#id')
+ * @param 	string	$selector	Selector ('#id') to use to find the HTML input field that must get the autofocus. You must use a CSS selector, so unique id preceding with the '#' char.
  * @return	string				HTML code to set focus
  */
 function dol_set_focus($selector)
 {
-	print '<!-- Set focus onto a specific field -->'."\n";
+	print "\n".'<!-- Set focus onto a specific field -->'."\n";
 	print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("'.$selector.'").focus(); });</script>'."\n";
 }
 

From f0e234eef2e2fbc9c2425bdc7311d64f0768a1f0 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 16 Jun 2017 17:01:43 +0200
Subject: [PATCH 1137/1163] Fix: missing hookmanager init

---
 htdocs/admin/defaultvalues.php |  6 +++++-
 htdocs/admin/modules.php       | 36 ++++++++++++++++++++++------------
 htdocs/admin/translation.php   |  7 +++++--
 htdocs/user/group/index.php    |  2 +-
 htdocs/user/perms.php          | 12 ++++++------
 5 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 94682cd502f..53c22353b92 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2017	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2017	Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,6 +61,9 @@ $urlpage = GETPOST('urlpage');
 $key = GETPOST('key');
 $value = GETPOST('value');
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('admindefaultvalues','globaladmin'));
+
 
 /*
  * Actions
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 8bea1c6dcb7..1aebae10947 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1,12 +1,12 @@
 <?php
-/* Copyright (C) 2003-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2003       Jean-Louis Bergamo      <jlb@j1b.org>
- * Copyright (C) 2004-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
- * Copyright (C) 2011       Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+/* Copyright (C) 2003-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -75,11 +75,18 @@ if ($search_version) $param.='&search_version='.urlencode($search_version);
 $dirins=DOL_DOCUMENT_ROOT.'/custom';
 $urldolibarrmodules='https://www.dolistore.com/';
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('adminmodules','globaladmin'));
+
 
 /*
  * Actions
  */
 
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
 if (GETPOST('buttonreset'))
 {
     $search_keyword='';
@@ -204,7 +211,7 @@ if ($action == 'set' && $user->admin)
     		setEventMessages($msg, null, 'warnings');
 	    }
 	}
-    header("Location: modules.php?mode=".$mode.$param.($page_y?'&page_y='.$page_y:''));
+    header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y?'&page_y='.$page_y:''));
 	exit;
 }
 
@@ -212,7 +219,7 @@ if ($action == 'reset' && $user->admin)
 {
     $result=unActivateModule($value);
     if ($result) setEventMessages($result, null, 'errors');
-    header("Location: modules.php?mode=".$mode.$param.($page_y?'&page_y='.$page_y:''));
+    header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y?'&page_y='.$page_y:''));
 	exit;
 }
 
@@ -474,10 +481,13 @@ if ($mode == 'common')
         print $hookmanager->resPrint;
     }
 
+    $moreforfilter='';
 
     print '<div class="clearboth"></div><br>';
 
-    $moreforfilter='';
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('insertExtraHeader',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
     // Show list of modules
 
@@ -657,7 +667,7 @@ if ($mode == 'common')
         	}
         	else
         	{
-        		print '<a class="reposition" href="modules.php?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '">';
+        		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '">';
         		print img_picto($langs->trans("Activated"),'switch_on');
         		print '</a>';
         	}
@@ -749,7 +759,7 @@ if ($mode == 'common')
 	        	    }
 	        	}
         	    print '<!-- Message to show: '.$warningmessage.' -->'."\n";
-	        	print '<a class="reposition" href="modules.php?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '"';
+	        	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '"';
 	        	if ($warningmessage) print ' onclick="return confirm(\''.dol_escape_js($warningmessage).'\');"';
 	        	print '>';
 	        	print img_picto($langs->trans("Disabled"),'switch_off');
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 8a6c38ffe46..be48bd0c8f4 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2009      Regis Houssin        <regis.houssin@capnetworks.com>
+/* Copyright (C) 2007-2016	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2017	Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,6 +56,9 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='lang,transkey';
 if (! $sortorder) $sortorder='ASC';
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('admintranslation','globaladmin'));
+
 
 /*
  * Actions
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 06e11caced9..e8d37801998 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -203,7 +203,7 @@ if ($resql)
     print '</div>';
     print "</form>\n";
 
-    $db->free();
+    $db->free($resql);
 }
 else
 {
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 5d87232c928..6f89e49af5e 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
+/* Copyright (C) 2002-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2002-2003	Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 1d91ce90d33b3909c6a5e968ad0152c2b6b05735 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 00:13:09 +0200
Subject: [PATCH 1138/1163] FIX image from medias directory into PDF free text

---
 htdocs/admin/chequereceipts.php    | 2 +-
 htdocs/admin/commande.php          | 2 +-
 htdocs/admin/contract.php          | 2 +-
 htdocs/admin/expedition.php        | 2 +-
 htdocs/admin/expensereport.php     | 2 +-
 htdocs/admin/facture.php           | 2 +-
 htdocs/admin/fichinter.php         | 2 +-
 htdocs/admin/livraison.php         | 2 +-
 htdocs/admin/propal.php            | 2 +-
 htdocs/admin/supplier_invoice.php  | 2 +-
 htdocs/admin/supplier_order.php    | 2 +-
 htdocs/admin/supplier_proposal.php | 2 +-
 htdocs/core/lib/pdf.lib.php        | 7 +++++++
 13 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index f88dfc6f5a6..3d3db2451d2 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -274,7 +274,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index f4104e2007f..e9ad5ab6ed6 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -559,7 +559,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index e2f865f61f6..427b3a531c4 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -493,7 +493,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td></tr>'."\n";
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 12d0b7951d5..af932b94b45 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -493,7 +493,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print "</td></tr>\n";
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 24aaeede5b4..cd14d472057 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -497,7 +497,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td></tr>'."\n";
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 57ff2321a12..85ee8c09934 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -731,7 +731,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 68d2d87800a..926a3651362 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -525,7 +525,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 0136f6cc9d9..fe41afabfb8 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -474,7 +474,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 8acbf19f939..2f90145f3cc 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -564,7 +564,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 17501cdb4f9..6d65af336b9 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -487,7 +487,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 13499af551a..21b3de68835 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -553,7 +553,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 8c52ee83dda..4e7efa4d922 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -520,7 +520,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 else
 {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_details');
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
     print $doleditor->Create();
 }
 print '</td><td align="right">';
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 9220725dc8e..a9fb8e52734 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -861,6 +861,13 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 		$substitutionarray['__FROM_EMAIL__']=$fromcompany->email;
 		complete_substitutions_array($substitutionarray, $outputlangs, $object);
 		$newfreetext=make_substitutions($conf->global->$paramfreetext, $substitutionarray, $outputlangs);
+
+		// Make a change into HTML code to allow to include images from medias directory.
+		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+		// become
+		// <img src="'.DOL_DATA_ROOT.'/media/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+		$newfreetext=preg_replace('/(<img.*src=")[^\"]*viewimage\.php[^\"]*modulepart=medias[^\"]*file=([^\"]*)("[^\/]*\/>)/', '\1'.DOL_DATA_ROOT.'/medias/\2\3', $newfreetext);
+
 		$line.=$outputlangs->convToOutputCharset($newfreetext);
 	}
 

From 5320ebc0515e865553004f2febe718b3a46b9620 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 17 Jun 2017 10:16:52 +0200
Subject: [PATCH 1139/1163] getTotalWeightVolume : add conversion Lb & oz to KG

New conversion value : Oz once
Little az a wizzard...
---
 htdocs/core/class/commonobject.class.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3ac7cb6ffb3..bd5d8a6b831 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3097,9 +3097,18 @@ abstract class CommonObject
                 $trueWeightUnit=pow(10, $weightUnit);
                 $totalWeight += $weight * $qty * $trueWeightUnit;
             }
-            else
-            {
-                $totalWeight += $weight * $qty;   // This may be wrong if we mix different units
+            else {
+		if ($weight_units == 99) {
+			// conversion 1 Livre = 0.45359237 KG
+			$trueWeightUnit = 0.45359237;
+			$totalWeight += $weight * $qty * $trueWeightUnit;
+		} elseif ($weight_units == 98) {
+			// conversion 1 once = 0.0283495 KG
+			$trueWeightUnit = 0.0283495;
+			$totalWeight += $weight * $qty * $trueWeightUnit;
+		}
+		else
+                	$totalWeight += $weight * $qty;   // This may be wrong if we mix different units
             }
             if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
             {

From 5b7a8e9c90f82b4abe7c0a4dff84603b16f5884f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 10:17:36 +0200
Subject: [PATCH 1140/1163] Fix missing signature when sending email from user
 card

---
 htdocs/commande/card.php                  | 25 ++++++++-----
 htdocs/core/class/html.formmail.class.php |  6 ++--
 htdocs/langs/en_US/other.lang             |  1 +
 htdocs/user/card.php                      | 43 ++++-------------------
 4 files changed, 28 insertions(+), 47 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 83135a8c0f5..f837119730c 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2621,6 +2621,19 @@ if ($action == 'create' && $user->rights->commande->creer)
 				$outputlangs->load('commercial');
 			}
 
+			// Show email form
+
+			// By default if $action=='presend'
+			$titreform='SendOrderByMail';
+			$topicmail='';
+			if (empty($object->ref_client)) {
+			    $topicmail = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
+			} else if (! empty($object->ref_client)) {
+			    $topicmail = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
+			}
+			$action='send';
+			$modelmail='order_send';
+
 			// Build document if it not exists
 			if (! $file || ! is_readable($file)) {
 				$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -2635,7 +2648,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 			print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 			print '<div class="clearboth"></div>';
 			print '<br>';
-			print load_fiche_titre($langs->trans('SendOrderByMail'));
+			print load_fiche_titre($langs->trans($titreform));
 
 			dol_fiche_head('');
 
@@ -2662,11 +2675,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 			$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
 			$formmail->withtocc = $liste;
 			$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-			if (empty($object->ref_client)) {
-				$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
-			} else if (! empty($object->ref_client)) {
-				$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
-			}
+			$formmail->withtopic = $topicmail;
 			$formmail->withfile = 2;
 			$formmail->withbody = 1;
 			$formmail->withdeliveryreceipt = 1;
@@ -2696,8 +2705,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 			}
 
 			// Tableau des parametres complementaires
-			$formmail->param['action'] = 'send';
-			$formmail->param['models'] = 'order_send';
+			$formmail->param['action'] = $action;
+			$formmail->param['models'] = $modelmail;
 			$formmail->param['models_id']=GETPOST('modelmailselected','int');
 			$formmail->param['orderid'] = $object->id;
 			$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 860d3fcfb1c..d59ac6c25af 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -288,14 +288,15 @@ class FormMail extends Form
 				$outputlangs->load('other');
 			}
 
-        	// Get message template
+        	// Get message template for $this->param["models"] into c_email_templates
 			$model_id=0;
         	if (array_key_exists('models_id',$this->param))
         	{
         		$model_id=$this->param["models_id"];
         	}
         	$arraydefaultmessage=$this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id);
-			//var_dump($arraydefaultmessage);
+			//var_dump($this->param["models"]);
+        	//var_dump($arraydefaultmessage);
 
         	$out.= "\n".'<!-- Begin form mail --><div id="mailformdiv"></div>'."\n";
         	if ($this->withform == 1)
@@ -876,6 +877,7 @@ class FormMail extends Form
 	        	elseif ($type_template=='shipping_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendShipping"); }
 	        	elseif ($type_template=='fichinter_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }
 	        	elseif ($type_template=='thirdparty')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); }
+	        	elseif ($type_template=='user')				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentUser"); }
 
 	        	$ret['label']='default';
 	        	$ret['topic']='';
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index a14bfffffb6..b151614ce3c 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -81,6 +81,7 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentUser=aa__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 089820da442..a2938a89712 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1659,13 +1659,11 @@ else
             }
             if ($action == 'presend')
             {
-                /*
-                 * Affiche formulaire mail
-                 */
+                // Show email form
 
                 // By default if $action=='presend'
                 $titreform='SendMail';
-                $topicmail='';
+                $topicmail=1;
                 $action='send';
                 $modelmail='user';
 
@@ -1680,9 +1678,8 @@ else
                 $newlang = '';
                 if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
                     $newlang = $_REQUEST['lang_id'];
-
-                if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-                    $newlang = $object->default_lang;
+                //if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+                //    $newlang = $object->thirdparty->default_lang;
 
                 // Cree l'objet formulaire mail
                 include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -1701,7 +1698,7 @@ else
                     $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'thi'.$object->id);
                 }
                 $formmail->withfrom=1;
-                $formmail->withtopic=1;
+                $formmail->withtopic=$topicmail;
                 $formmail->withto=GETPOST('sendto')?GETPOST('sendto'):$object->email;
                 $formmail->withtofree=1;
                 $formmail->withtocc=1;
@@ -1711,37 +1708,9 @@ else
                 $formmail->withdeliveryreceipt=1;
                 $formmail->withcancel=1;
                 // Tableau des substitutions
-                //$formmail->setSubstitFromObject($object);
+                $formmail->setSubstitFromObject($object);
                 $formmail->substit['__LASTNAME__']=$object->lastname;
                 $formmail->substit['__FIRSTNAME__']=$object->firstname;
-                $formmail->substit['__SIGNATURE__']=$user->signature;
-                $formmail->substit['__PERSONALIZED__']='';
-
-                //Find the good contact adress
-                /*
-                $custcontact='';
-                $contactarr=array();
-                $contactarr=$object->liste_contact(-1,'external');
-
-                if (is_array($contactarr) && count($contactarr)>0)
-                {
-                foreach($contactarr as $contact)
-                {
-                if ($contact['libelle']==$langs->trans('TypeContact_facture_external_BILLING')) {
-
-                require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-
-                $contactstatic=new Contact($db);
-                $contactstatic->fetch($contact['id']);
-                $custcontact=$contactstatic->getFullName($langs,1);
-                }
-                }
-
-                if (!empty($custcontact)) {
-                $formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-                }
-                }*/
-
 
                 // Tableau des parametres complementaires du post
                 $formmail->param['action']=$action;

From e98bc90489b8c9085904ffc7762cd0b63e48ada8 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 17 Jun 2017 10:18:59 +0200
Subject: [PATCH 1141/1163] introduce OZ : once weight

---
 htdocs/product/class/html.formproduct.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 01064c8ffa3..1dbfbc7662f 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -307,7 +307,7 @@ class FormProduct
 		$return='';
 
 		$measuring_units=array();
-		if ($measuring_style == 'weight') $measuring_units=array(-6=>1,-3=>1,0=>1,3=>1,99=>1);
+		if ($measuring_style == 'weight') $measuring_units=array(-6=>1,-3=>1,0=>1,3=>1,98=>1,99=>1);
 		else if ($measuring_style == 'size') $measuring_units=array(-3=>1,-2=>1,-1=>1,0=>1,98=>1,99=>1);
         else if ($measuring_style == 'surface') $measuring_units=array(-6=>1,-4=>1,-2=>1,0=>1,98=>1,99=>1);
 		else if ($measuring_style == 'volume') $measuring_units=array(-9=>1,-6=>1,-3=>1,0=>1,88=>1,89=>1,97=>1,99=>1,/* 98=>1 */);  // Liter is not used as already available with dm3

From 17247c64f0fbe50c0720e5c13c70965892ae18e9 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 17 Jun 2017 10:26:01 +0200
Subject: [PATCH 1142/1163] add WeightUnitonce

---
 htdocs/core/lib/product.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 5aec64f3ce0..16bedc4d346 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -441,7 +441,8 @@ function measuring_units_string($unit,$measuring_style='')
 		$measuring_units[0] = $langs->transnoentitiesnoconv("WeightUnitkg");
 		$measuring_units[-3] = $langs->transnoentitiesnoconv("WeightUnitg");
 		$measuring_units[-6] = $langs->transnoentitiesnoconv("WeightUnitmg");
-        $measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
+		$measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitonce");
+		$measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
 	}
 	else if ($measuring_style == 'size')
 	{

From f0bc72cda4aa3864dcfaba252537a3005027bad8 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 17 Jun 2017 10:27:00 +0200
Subject: [PATCH 1143/1163] WeightUnitonce translation

---
 htdocs/langs/en_US/other.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index a14bfffffb6..120b1dcd790 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -123,6 +123,7 @@ WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
 WeightUnitpound=pound
+WeightUnitonce=once
 Length=Length
 LengthUnitm=m
 LengthUnitdm=dm

From bebe7baa80990fa25f37b25c5ac8620cbf90ea6c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 10:44:08 +0200
Subject: [PATCH 1144/1163] Fix images into medias not reabable into send
 emails

---
 htdocs/core/actions_sendmails.inc.php | 31 ++++++++++++++++++---------
 htdocs/core/lib/pdf.lib.php           |  2 +-
 htdocs/langs/en_US/errors.lang        |  1 +
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index dded23e6cbf..7bb3e8aec49 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -31,7 +31,7 @@
 
 /*
  * Add file in email form
-*/
+ */
 if (GETPOST('addfile'))
 {
 	$trackid = GETPOST('trackid','aZ09');
@@ -137,7 +137,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				{
 					$sendtosocid=$possibleaccounts[1]['id'];
 					$result=$object->fetch($sendtosocid);
-						
+
 					setEventMessages($langs->trans('ErrorFoundMoreThanOneRecordWithEmail',$_POST['sendto'],$object->name), null, 'mesgs');
 				}
 				else
@@ -229,7 +229,12 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 
 		if (dol_strlen($sendto))
 		{
-			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+            // Define $urlwithroot
+            $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+            $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+            //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+		    require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 
 			$langs->load("commercial");
 
@@ -254,11 +259,17 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 
 			$replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
 			$message = $_POST['message'];
-				
+
+			// Make a change into HTML code to allow to include images from medias directory with an external reabable URL.
+			// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+			// become
+			// <img alt="" src="'.$urlwithroot.'viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+			$message=preg_replace('/(<img.*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $message);
+
 			$sendtobcc= GETPOST('sendtoccc');
-			if ($mode == 'emailfromproposal') $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
-			if ($mode == 'emailfromorder')    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
-			if ($mode == 'emailfrominvoice')  $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO));
+			if ($mode == 'emailfromproposal')         $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
+			if ($mode == 'emailfromorder')            $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
+			if ($mode == 'emailfrominvoice')          $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO));
 			if ($mode == 'emailfromsupplierproposal') $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO));
 			if ($mode == 'emailfromsupplierorder')    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO));
 			if ($mode == 'emailfromsupplierinvoice')  $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO));
@@ -371,7 +382,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					if (is_object($object))
 					{
 					    if (empty($actiontypecode)) $actiontypecode='AC_OTH_AUTO'; // Event insert into agenda automatically
-					    
+
 						$object->socid			= $sendtosocid;	   // To link to a company
 						$object->sendtoid		= $sendtoid;	   // To link to contacts/addresses. This is an array.
 						$object->actiontypecode	= $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
@@ -392,7 +403,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
     						}
 						}
 					}
-						
+
 					if ($error)
 					{
 						dol_print_error($db);
@@ -403,7 +414,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 						// This avoid sending mail twice if going out and then back to page
 						$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
 						setEventMessages($mesg, null, 'mesgs');
-						if ($conf->dolimail->enabled) 
+						if ($conf->dolimail->enabled)
 						{
 						    header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').'&'.($paramname2?$paramname2:'mid').'='.$parm2val);
 						    exit;
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index a9fb8e52734..3c771220c70 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -865,7 +865,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 		// Make a change into HTML code to allow to include images from medias directory.
 		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
 		// become
-		// <img src="'.DOL_DATA_ROOT.'/media/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+		// <img alt="" src="'.DOL_DATA_ROOT.'/media/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
 		$newfreetext=preg_replace('/(<img.*src=")[^\"]*viewimage\.php[^\"]*modulepart=medias[^\"]*file=([^\"]*)("[^\/]*\/>)/', '\1'.DOL_DATA_ROOT.'/medias/\2\3', $newfreetext);
 
 		$line.=$outputlangs->convToOutputCharset($newfreetext);
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 0f57a23d23c..ac982973ef3 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -44,6 +44,7 @@ ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
 ErrorFieldsRequired=Some required fields were not filled.
+ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.

From 7c41c9a3e4aedb97742ab505afe957281e9527e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 11:43:00 +0200
Subject: [PATCH 1145/1163] Fix activation of dependency for a dedicated
 country. BlockedLog depends now on CashDesk only.

---
 htdocs/admin/modules.php                      |  8 +++--
 htdocs/core/lib/admin.lib.php                 | 20 ++++++------
 htdocs/core/modules/modBlockedLog.class.php   |  6 ++--
 htdocs/core/modules/modCashDesk.class.php     |  6 ++--
 htdocs/core/modules/modFacture.class.php      | 31 +++++++++----------
 htdocs/langs/en_US/admin.lang                 |  6 ++--
 htdocs/langs/en_US/main.lang                  |  3 +-
 .../core/modules/modMyModule.class.php        |  2 ++
 htdocs/theme/md/style.css.php                 |  1 -
 9 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 5d5886b5415..d3221f40505 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -80,7 +80,7 @@ $urldolibarrmodules='https://www.dolistore.com/';
  * Actions
  */
 
-if (GETPOST('buttonreset'))
+if (GETPOST('buttonreset','alpha'))
 {
     $search_keyword='';
     $search_status='';
@@ -738,13 +738,17 @@ if ($mode == 'common')
 	        	    print '<!-- This module is an external module and it may have a warning to show (note: your country is '.$mysoc->country_code.') -->'."\n";
 	        	    foreach ($arrayofwarningsext as $keymodule => $arrayofwarningsextbycountry)
 	        	    {
-	        	        if (! empty($modules[$keymodule]->const_name))    // If module that request warning is on
+                        $keymodulelowercase=strtolower(preg_replace('/^mod/','',$keymodule));
+                        if (in_array($keymodulelowercase, $conf->modules))    // If module that request warning is on
 	        	        {
         	        	    foreach ($arrayofwarningsextbycountry as $keycountry => $cursorwarningmessage)
         	        	    {
         	        	        if ($keycountry == 'always' || $keycountry == $mysoc->country_code)
         	        	        {
         	        	            $warningmessage .= ($warningmessage?"\n":"").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code, $modules[$keymodule]->getName());
+        	        	            $warningmessage .= ($warningmessage?"\n":"").($warningmessage?"\n":"").$langs->trans("Module").' : '.$objMod->getName();
+        	        	            if (! empty($objMod->editor_name)) $warningmessage .= ($warningmessage?"\n":"").$langs->trans("Publisher").' : '.$objMod->editor_name;
+        	        	            if (! empty($objMod->editor_name)) $warningmessage .= ($warningmessage?"\n":"").$langs->trans("ModuleTriggeringThisWarning").' : '.$modules[$keymodule]->getName();
         	        	        }
         	        	    }
 	        	        }
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index ba5f099365c..e90f006ac7e 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -756,7 +756,7 @@ function purgeSessions($mysessionid)
  */
 function activateModule($value,$withdeps=1)
 {
-    global $db, $modules, $langs, $conf;
+    global $db, $modules, $langs, $conf, $mysoc;
 
 	// Check parameters
 	if (empty($value)) {
@@ -813,7 +813,7 @@ function activateModule($value,$withdeps=1)
     }
 
     $result=$objMod->init();    // Enable module
-    if ($result <= 0) 
+    if ($result <= 0)
     {
         $ret['errors'][]=$objMod->error;
     }
@@ -848,19 +848,19 @@ function activateModule($value,$withdeps=1)
     						break;
                 		}
                 	}
-    				
+
     				if ($activate)
     				{
     				    $ret['nbmodules']+=$resarray['nbmodules'];
     				    $ret['nbperms']+=$resarray['nbperms'];
     				}
-    				else 
+    				else
     				{
     				    $ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring);
     				}
                 }
             }
-    
+
             if (isset($objMod->conflictwith) && is_array($objMod->conflictwith) && ! empty($objMod->conflictwith))
             {
                 // Desactivation des modules qui entrent en conflit
@@ -879,12 +879,12 @@ function activateModule($value,$withdeps=1)
         }
     }
 
-    if (! count($ret['errors'])) 
+    if (! count($ret['errors']))
     {
         $ret['nbmodules']++;
         $ret['nbperms']+=count($objMod->rights);
     }
-    
+
     return $ret;
 }
 
@@ -1221,7 +1221,7 @@ function form_constantes($tableau, $strictw3c=0, $helptext='')
         if ($result)
         {
             $obj = $db->fetch_object($result);	// Take first result of select
-            
+
 
             // For avoid warning in strict mode
             if (empty($obj)) {
@@ -1360,7 +1360,7 @@ function showModulesExludedForExternal($modules)
 			//if (empty($conf->global->$moduleconst)) continue;
 			if (! in_array($modulename,$listofmodules)) continue;
 			//var_dump($modulename.'eee'.$langs->trans('Module'.$module->numero.'Name'));
-				
+
 			if ($i > 0) $text.=', ';
 			else $text.=' ';
 			$i++;
@@ -1391,7 +1391,7 @@ function addDocumentModel($name, $type, $label='', $description='')
     $sql.= ($label?"'".$db->escape($label)."'":'null').", ";
     $sql.= (! empty($description)?"'".$db->escape($description)."'":"null");
     $sql.= ")";
-	
+
     dol_syslog("admin.lib::addDocumentModel", LOG_DEBUG);
 	$resql=$db->query($sql);
 	if ($resql)
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index f3f3be971b5..3125627c007 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -65,9 +65,9 @@ class modBlockedLog extends DolibarrModules
         // Dependancies
         //-------------
 	    $this->hidden = false;	// A condition to disable module
-	    $this->depends = array('modFacture');		// List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array();	// List of modules id to disable if this one is disabled
-	    $this->conflictwith = array();	// List of modules id this module is in conflict with
+	    $this->depends = array('always'=>'modFacture');	   // List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array();	                   // List of modules id to disable if this one is disabled
+	    $this->conflictwith = array();	                   // List of modules id this module is in conflict with
         $this->langfiles = array();
 
         // Constants
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index ec8764c9017..e5ba473c1c7 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -65,11 +65,13 @@ class modCashDesk extends DolibarrModules
 		$this->config_page_url = array("cashdesk.php@cashdesk");
 
 		// Dependencies
-		$this->depends = array("modBanque","modFacture","modProduct");	// List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array();			// List of modules id to disable if this one is disabled
+		$this->depends = array('always'=>"modBanque", 'always'=>"modFacture", 'always'=>"modProduct", 'FR'=>'modBlockedLog');	// List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array();			    // List of modules id to disable if this one is disabled
 		$this->phpmin = array(4,1);					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(2,4);	// Minimum version of Dolibarr required by module
 		$this->langfiles = array("cashdesk");
+		$this->warnings_activation = array('FR'=>'WarningNoteModulePOSForFrenchLaw');                     // Warning to show when we activate module. array('always'='text') or array('FR'='text')
+		$this->warnings_activation_ext = array('FR'=>'WarningInstallationMayBecomeNotCompliantWithLaw');  // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
 
 		// Constants
 		$this->const = array();
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 3af85a1944d..40e2a03d161 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -64,14 +64,13 @@ class modFacture extends DolibarrModules
 		$this->dirs = array("/facture/temp");
 
 		// Dependencies
-		$this->depends = array('always'=>"modSociete", 'FR'=>'modBlockedLog');
+		$this->depends = array('always'=>"modSociete");
 		$this->requiredby = array("modComptabilite","modAccounting");
 		$this->conflictwith = array();
 		$this->langfiles = array("bills","companies","compta","products");
-		$this->warnings_activation = array('FR'=>'WarningNoteModuleInvoiceForFrenchLaw');                              // Warning to show when we activate module. array('always'='text') or array('FR'='text')
-		$this->warnings_activation = array();
-		$this->warnings_activation_ext = array('FR'=>'WarningInstallationMayBecomeNotCompliantWithLaw');  // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
-		
+		$this->warnings_activation = array();                              // Warning to show when we activate module. array('always'='text') or array('FR'='text')
+		$this->warnings_activation_ext = array();                          // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
+
 		// Config pages
 		$this->config_page_url = array("facture.php");
 
@@ -99,7 +98,7 @@ class modFacture extends DolibarrModules
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
-		
+
 		/*$this->const[$r][0] = "FACTURE_DRAFT_WATERMARK";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "__(Draft)__";
@@ -107,7 +106,7 @@ class modFacture extends DolibarrModules
 		$this->const[$r][4] = 0;
 		$r++;*/
 
-		
+
 		// Boxes
 		//$this->boxes = array(0=>array(1=>'box_factures_imp.php'),1=>array(1=>'box_factures.php'));
 		$this->boxes = array(
@@ -116,16 +115,16 @@ class modFacture extends DolibarrModules
 				2=>array('file'=>'box_graph_invoices_permonth.php','enabledbydefaulton'=>'Home')
 		);
 
-        // Cronjobs 
+        // Cronjobs
         $this->cronjobs = array(
-            0=>array('label'=>'RecurringInvoices', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture-rec.class.php', 'objectname'=>'FactureRec', 'method'=>'createRecurringInvoices', 'parameters'=>'', 'comment'=>'Generate recurring invoices', 'frequency'=>1, 'unitfrequency'=>3600*24), 
+            0=>array('label'=>'RecurringInvoices', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture-rec.class.php', 'objectname'=>'FactureRec', 'method'=>'createRecurringInvoices', 'parameters'=>'', 'comment'=>'Generate recurring invoices', 'frequency'=>1, 'unitfrequency'=>3600*24),
             // 1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>3600, 'unitfrequency'=>3600)
-        ); 
-        // List of cron jobs entries to add 
-        // Example: 
+        );
+        // List of cron jobs entries to add
+        // Example:
         // $this->cronjobs=array(
-        //              0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600), 
-        //              1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600) 
+        //              0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600),
+        //              1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600)
         // );
 
         // Permissions
@@ -206,8 +205,8 @@ class modFacture extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-		
-		
+
+
 		// Exports
 		//--------
 		$r=1;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1aa79c2dced..0ba5ab270bc 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -104,7 +104,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=All
-NotConfigured=Module not configured
+NotConfigured=Module/Application not configured
 Active=Active
 SetupShort=Setup
 OtherOptions=Other options
@@ -114,7 +114,6 @@ CurrentValueSeparatorThousand=Thousand separator
 Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
-Modules=Modules
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
@@ -1700,7 +1699,8 @@ UserHasNoPermissions=This user has no permission defined
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
 BaseCurrency=Reference currency of the company (go into setup of company to change this)
 WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016). 
-WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the editor of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.   
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated. 
+WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.   
 ##### Resource ####
 ResourceSetup=Configuration du module Resource 
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 8ea14fdb305..a35342f2af9 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -366,7 +366,8 @@ VATRate=Tax Rate
 Average=Average
 Sum=Sum
 Delta=Delta
-Module=Module
+Module=Module/Application
+Modules=Modules/Applications
 Option=Option
 List=List
 FullList=Full list
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index dc98c327cb3..60889bdf279 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -114,6 +114,8 @@ class modMyModule extends DolibarrModules
 		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
 		$this->langfiles = array("mymodule@mymodule");
+		$this->warnings_activation = array();                     // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array();                 // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
 
 		// Constants
 		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5fbd8455919..e96fa032538 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2528,7 +2528,6 @@ div.pagination li.noborder a:hover {
 div.pagination li a,
 div.pagination li span {
   background-color: #fff;
-  border: 1px solid #ddd;
 }
 div.pagination li:first-child a,
 div.pagination li:first-child span {

From a4f34539ea92cf634c49a98904c6aa92eb0015b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 11:46:45 +0200
Subject: [PATCH 1146/1163] Fix translation

---
 htdocs/langs/en_US/admin.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0ba5ab270bc..e2b5825f14f 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -466,7 +466,7 @@ Module30Desc=Invoice and credit note management for customers. Invoice managemen
 Module40Name=Suppliers
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes. For legal purpose, see instead module 'Non Reversible Logs'.
+Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -565,7 +565,7 @@ Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
 Module3200Name=Non Reversible Logs
-Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table that can be then exported. This module may be mandatory for some countries.
+Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=HRM
 Module4000Desc=Human resources management (mangement of department, employee contracts and feelings)
 Module5000Name=Multi-company

From 8a1de52f3c5b80c10c290c6028e0cc61cdf003f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 12:00:33 +0200
Subject: [PATCH 1147/1163] Fix translation

---
 htdocs/admin/index.php        |  6 +++---
 htdocs/langs/en_US/admin.lang | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index a1ac45244e1..9ac33f1cc3d 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -70,13 +70,13 @@ if (! empty($conf->global->MAIN_MOTD_SETUPPAGE))
 
 print $langs->trans("SetupDescription1").' ';
 print $langs->trans("AreaForAdminOnly").' ';
-print $langs->trans("SetupDescription2")."<br><br>";
+print $langs->trans("SetupDescription2", $langs->trans("MenuCompanySetup"), $langs->trans("Modules"))."<br><br>";
 
 print '<br>';
 
 // Show info setup company
 if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) $setupcompanynotcomplete=1;
-print img_picto('','puce').' '.$langs->trans("SetupDescription3",DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete)?'':'&action=edit'));
+print img_picto('','puce').' '.$langs->trans("SetupDescription3", DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete)?'':'&action=edit'), $langs->trans("Setup"), $langs->trans("MenuCompanySetup"));
 if (! empty($setupcompanynotcomplete))
 {
 	$langs->load("errors");
@@ -88,7 +88,7 @@ print '<br>';
 print '<br>';
 
 // Show info setup module
-print img_picto('','puce').' '.$langs->trans("SetupDescription4",DOL_URL_ROOT.'/admin/modules.php?mainmenu=home');
+print img_picto('','puce').' '.$langs->trans("SetupDescription4", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->trans("Setup"), $langs->trans("Modules"));
 if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)?1:$conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled
 {
 	$langs->load("errors");
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e2b5825f14f..23b207b4fea 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -190,7 +190,7 @@ FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after enabling module. Click on button on/off to enable an application/module.
+ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Find external modules...
@@ -270,7 +270,7 @@ FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your
 SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
 ModuleSetup=Module setup
-ModulesSetup=Modules setup
+ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
@@ -997,9 +997,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/Organisation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/Organisation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
+SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
+SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1015,7 +1015,7 @@ BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
 CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)

From 12cab2dfe08695f75199afb84779c84b897101e9 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 17 Jun 2017 16:30:03 +0200
Subject: [PATCH 1148/1163] Once to Ounce

---
 htdocs/core/lib/product.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 16bedc4d346..7048b8570c6 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -441,7 +441,7 @@ function measuring_units_string($unit,$measuring_style='')
 		$measuring_units[0] = $langs->transnoentitiesnoconv("WeightUnitkg");
 		$measuring_units[-3] = $langs->transnoentitiesnoconv("WeightUnitg");
 		$measuring_units[-6] = $langs->transnoentitiesnoconv("WeightUnitmg");
-		$measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitonce");
+		$measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitounce");
 		$measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
 	}
 	else if ($measuring_style == 'size')

From db173632674e7fd6ae22c0965ae8e9361b607502 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 17 Jun 2017 16:30:37 +0200
Subject: [PATCH 1149/1163] Update other.lang

---
 htdocs/langs/en_US/other.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 120b1dcd790..bf01ba734f3 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -123,7 +123,7 @@ WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
 WeightUnitpound=pound
-WeightUnitonce=once
+WeightUnitounce=ounce
 Length=Length
 LengthUnitm=m
 LengthUnitdm=dm

From fcdf68db6a1175f2faa5e9a95afef05398c29fb5 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 17 Jun 2017 16:31:54 +0200
Subject: [PATCH 1150/1163] Update commonobject.class.php

---
 htdocs/core/class/commonobject.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index bd5d8a6b831..b87b3d28ea8 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3099,11 +3099,11 @@ abstract class CommonObject
             }
             else {
 		if ($weight_units == 99) {
-			// conversion 1 Livre = 0.45359237 KG
+			// conversion 1 Pound = 0.45359237 KG
 			$trueWeightUnit = 0.45359237;
 			$totalWeight += $weight * $qty * $trueWeightUnit;
 		} elseif ($weight_units == 98) {
-			// conversion 1 once = 0.0283495 KG
+			// conversion 1 Ounce = 0.0283495 KG
 			$trueWeightUnit = 0.0283495;
 			$totalWeight += $weight * $qty * $trueWeightUnit;
 		}

From 04821376200381ef232947147b8063bf189c2f9b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 18:03:53 +0200
Subject: [PATCH 1151/1163] Fix warning

---
 htdocs/install/inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index dc7e29b19f5..b9efc4eb8a4 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -385,12 +385,12 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='',$css
     // We force the content charset
     header("Content-type: text/html; charset=".$conf->file->character_set_client);
     header("X-Content-Type-Options: nosniff");
-    
+
     print '<!DOCTYPE HTML>'."\n";
     print '<html>'."\n";
     print '<head>'."\n";
     print '<meta charset='.$conf->file->character_set_client.'">'."\n";
-    print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";  
+    print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
     print '<link rel="stylesheet" type="text/css" href="default.css">'."\n";
 
     print '<!-- Includes CSS for JQuery -->'."\n";
@@ -453,7 +453,7 @@ function pFooter($nonext=0,$setuplang='',$jscheckfunction='', $withpleasewait=0)
         print '<div class="nextbutton" id="nextbutton">';
         if ($nonext == '2')
 		{
-			print $langs->trans("ErrorFoundDuringMigration", $_SERVER["REQUEST_URI"].'&ignoreerrors=1').'<br><br>';
+			print $langs->trans("ErrorFoundDuringMigration", isset($_SERVER["REQUEST_URI"])?$_SERVER["REQUEST_URI"].'&ignoreerrors=1':'').'<br><br>';
 		}
 
         print '<input type="submit" '.($nonext == '2' ? 'disabled="disabled" ':'').'value="'.$langs->trans("NextStep").' ->"';

From a6b4b15e07a29934b483c93b8487eb6b7dee0218 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 19:40:48 +0200
Subject: [PATCH 1152/1163] Work on modulebuilder

---
 htdocs/langs/en_US/modulebuilder.lang         |   6 +-
 htdocs/modulebuilder/index.php                | 142 +++++++++++++++++-
 .../modulebuilder/template/class/MyObject.txt |   1 +
 ...class.class.php => api_myobject.class.php} |   0
 .../template/class/myobject.class.php         |   4 +-
 ...bject_mymodule.png => object_myobject.png} | Bin
 6 files changed, 148 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/modulebuilder/template/class/MyObject.txt
 rename htdocs/modulebuilder/template/class/{myobject_api_class.class.php => api_myobject.class.php} (100%)
 rename htdocs/modulebuilder/template/img/{myobject_mymodule.png => object_myobject.png} (100%)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index adce0950b88..b8300182b05 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,11 +1,15 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=This tools give you utilites to build or edit your own module.
-EnterNameOfModuleDesc=Enter name of the module to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...)
 ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
 NewModule=New module
+NewObject=New object
 ModuleKey=Key for new module
+ObjectKey=Key for new object
 ModuleInitialized=Module initialized
+FilesForObjectInitialized=Files for new object initialized
 ModuleBuilderDescdescription=Enter here all general information that describe your module
 ModuleBuilderDescobjects=Define here the new objects you want to manage with your module. A page to list them and a page to create/edit/view a card will be generated.
 ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 8cabec1bdfb..0f60d76ca4f 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -33,11 +33,13 @@ $action=GETPOST('action','aZ09');
 $confirm=GETPOST('confirm','alpha');
 $module=GETPOST('module','alpha');
 $tab=GETPOST('tab','aZ09');
+$tabobj=GETPOST('tabobj','alpha');
 if (empty($module)) $module='initmodule';
 if (empty($tab)) $tab='description';
+if (empty($tabobj)) $tabobj='newobject';
 
 $modulename=dol_sanitizeFileName(GETPOST('modulename','alpha'));
-
+$objectname=dol_sanitizeFileName(GETPOST('objectname','alpha'));
 
 // Security check
 if (! $user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessforbidden('ModuleBuilderNotAllowed');
@@ -80,6 +82,18 @@ if ($dirins && $action == 'initmodule' && $modulename)
     	}
     }
 
+    // Delete some files
+    dol_delete_file($destdir.'/myobject_card.php');
+    dol_delete_file($destdir.'/myobject_list.php');
+    dol_delete_file($destdir.'/test/phpunit/MyObjectTest.php');
+    dol_delete_file($destdir.'/sql/llx_myobject.key.sql');
+    dol_delete_file($destdir.'/sql/llx_myobject.sql');
+    dol_delete_file($destdir.'/scripts/myobject.php');
+    dol_delete_file($destdir.'/img/object_myobject.png');
+    dol_delete_file($destdir.'/class/myobject.class.php');
+    dol_delete_file($destdir.'/class/api_myobject.class.php');
+    dol_delete_file($destdir.'/class/MyObject.txt');
+
     // Edit PHP files
     if (! $error)
     {
@@ -113,6 +127,86 @@ if ($dirins && $action == 'initmodule' && $modulename)
     }
 }
 
+if ($dirins && $action == 'initobject' && $module && $objectname)
+{
+    $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+    $destdir = $dirins.'/'.strtolower($module);
+
+    $arrayreplacement=array(
+        'mymodule'=>strtolower($module),
+        'MyModule'=>$module,
+        'myobject'=>strtolower($objectname),
+        'MyObject'=>$objectname
+    );
+
+
+    // Delete some files
+    $filetogenerate = array(
+        'myobject_card.php'=>strtolower($objectname).'_card.php',
+        'myobject_list.php'=>strtolower($objectname).'_list.php',
+        'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.$objectname.'Test.php',
+        'sql/llx_myobject.key.sql'=>'sql/llx_'.strtolower($objectname).'.key.sql',
+        'sql/llx_myobject.sql'=>'sql/llx_'.strtolower($objectname).'.sql',
+        'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
+        'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
+        'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
+        'class/api_myobject.class.php'=>'class/api_'.strtolower($objectname).'.class.php',
+        'class/MyObject.txt'=>'class/'.$objectname.'.txt'
+    );
+
+    foreach($filetogenerate as $srcfile => $destfile)
+    {
+        $result = dol_copy($srcdir.'/'.$srcfile, $destdir.'/'.$destfile);
+        if ($result <= 0)
+        {
+            if ($result < 0)
+            {
+                $error++;
+                $langs->load("errors");
+                setEventMessages($langs->trans("ErrorFailToCopyFile", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'errors');
+            }
+            else	// $result == 0
+            {
+                setEventMessages($langs->trans("FileAlreadyExists", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'warnings');
+            }
+        }
+        else
+        {
+            // Copy is ok
+        }
+    }
+
+    // Edit PHP files
+    foreach($filetogenerate as $destfile)
+    {
+        $phpfileval['fullname'] = $destdir.'/'.$destfile;
+
+        //var_dump($phpfileval['fullname']);
+        $arrayreplacement=array(
+            'mymodule'=>strtolower($modulename),
+            'MyModule'=>$modulename,
+            'MYMODULE'=>strtoupper($modulename),
+            'My module'=>$modulename,
+            'htdocs/modulebuilder/template/'=>'',
+            'myobject'=>strtolower($objectname),
+            'MyObject'=>$objectname
+        );
+
+        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
+        //var_dump($result);
+        if ($result < 0)
+        {
+            setEventMessages($langs->trans("ErrorFailToMakeReplacementInto", $phpfileval['fullname']), null, 'errors');
+        }
+    }
+
+    if (! $error)
+    {
+        setEventMessages('FilesForObjectInitialized', null);
+    }
+}
+
+
 if ($dirins && $action == 'confirm_delete')
 {
     $modulelowercase=strtolower($module);
@@ -485,9 +579,53 @@ elseif (! empty($module))
 
         if ($tab == 'objects')
         {
-    		print $langs->trans("FeatureNotYetAvailable");
 
+            $head3 = array();
+            $h=0;
 
+            $modulelowercase=strtolower($module);
+
+            // Dir for module
+            $dir = $dirins.'/'.$modulelowercase.'/class';
+
+            $head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.'&tabobj=newobject';
+            $head3[$h][1] = $langs->trans("NewObject");
+            $head3[$h][2] = 'newobject';
+            $h++;
+
+            $listofobject = dol_dir_list($dir , 'files', 0, '\.txt$');
+            foreach($listofobject as $fileobj)
+            {
+                $objectname = preg_replace('/\.txt$/', '', $fileobj['name']);
+
+                $head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.'&tabobj='.$objectname;
+                $head3[$h][1] = $objectname;
+                $head3[$h][2] = $objectname;
+                $h++;
+            }
+
+            dol_fiche_head($head3, $tabobj, '', -1, '');
+
+            if ($tabobj == 'newobject')
+            {
+                // New module
+                print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                print '<input type="hidden" name="action" value="initobject">';
+                print '<input type="hidden" name="tab" value="objects">';
+                print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+
+                print $langs->trans("EnterNameOfObjectDesc").'<br><br>';
+
+                print '<input type="text" name="objectname" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'">';
+                print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
+                print '</form>';
+            }
+
+            if ($tabobj == 'fields')
+            {
+                print $langs->trans("FeatureNotYetAvailable").'<br><br>';
+            }
         }
 
         if ($tab == 'menus')
diff --git a/htdocs/modulebuilder/template/class/MyObject.txt b/htdocs/modulebuilder/template/class/MyObject.txt
new file mode 100644
index 00000000000..37ccaca81ed
--- /dev/null
+++ b/htdocs/modulebuilder/template/class/MyObject.txt
@@ -0,0 +1 @@
+# If this file exists, it means the class and file for object MyOjbect was generated by ModuleBuilder.
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/class/myobject_api_class.class.php b/htdocs/modulebuilder/template/class/api_myobject.class.php
similarity index 100%
rename from htdocs/modulebuilder/template/class/myobject_api_class.class.php
rename to htdocs/modulebuilder/template/class/api_myobject.class.php
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index f2d4daee8d4..9e66b9410f6 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -31,11 +31,11 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
 /**
- * Class MyModuleObject
+ * Class MyObject
  *
  * Put here description of your class.
  */
-class MyModuleObject extends CommonObject
+class MyObject extends CommonObject
 {
 	/**
 	 * @var string Id to identify managed object
diff --git a/htdocs/modulebuilder/template/img/myobject_mymodule.png b/htdocs/modulebuilder/template/img/object_myobject.png
similarity index 100%
rename from htdocs/modulebuilder/template/img/myobject_mymodule.png
rename to htdocs/modulebuilder/template/img/object_myobject.png

From 69b26dcb4ebea5a36cd6dcfb9fbf4ced48a910de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 21:23:52 +0200
Subject: [PATCH 1153/1163] Work on modulebuilder

---
 htdocs/langs/en_US/modulebuilder.lang         |  10 +-
 htdocs/modulebuilder/index.php                | 152 ++++++++++++++++--
 .../template/class/myobject.class.php         |  22 ++-
 3 files changed, 159 insertions(+), 25 deletions(-)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index b8300182b05..8d9a31cfdf7 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -17,7 +17,7 @@ ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions
 ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file with your IDE.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
-ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to get your module package file.
+ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to build the module package file.
 ModuleBuilderDescdangerzone=You can delete your module. WARNING: All files of module will be definetly lost !
 DangerZone=Danger zone
 BuildPackage=Build package
@@ -25,4 +25,10 @@ ModuleIsNotActive=This module was not activated yet (go into Home-Setup-Module t
 ModuleIsLive=This module has been activated. Any change on it may break a current active feature.
 DescriptionLong=Long description
 EditorName=Name of editor
-EditorUrl=URL of editor
\ No newline at end of file
+EditorUrl=URL of editor
+DescriptorFile=Descriptor file of module
+ClassFile=File for PHP class
+ApiClassFile=File for PHP API class
+PageForList=PHP page for list of record
+PageForCreateEditView=PHP page to create/edit/view a record
+PathToModulePackage=Path to zip of module/application package
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 0f60d76ca4f..d9ae491b654 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -454,7 +454,9 @@ elseif (! empty($module))
         $head2 = array();
         $h=0;
 
-       	$modulestatusinfo=img_info('').' '.$langs->trans("ModuleIsNotActive");
+        $modulelowercase=strtolower($module);
+
+        $modulestatusinfo=img_info('').' '.$langs->trans("ModuleIsNotActive");
         if (! empty($conf->$module->enabled))
         {
         	$modulestatusinfo=img_warning().' '.$langs->trans("ModuleIsLive");
@@ -513,7 +515,12 @@ elseif (! empty($module))
 
         if ($tab == 'description')
         {
-        	print '<div class="underbanner clearboth"></div>';
+            $pathtofile = $modulelowercase.'/core/modules/mod'.$module.'.class.php';
+
+            print '<span class="fa fa-file"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong><br>';
+            print '<br>';
+
+            print '<div class="underbanner clearboth"></div>';
         	print '<div class="fichecenter">';
 
         	print '<table class="border centpercent">';
@@ -579,12 +586,9 @@ elseif (! empty($module))
 
         if ($tab == 'objects')
         {
-
             $head3 = array();
             $h=0;
 
-            $modulelowercase=strtolower($module);
-
             // Dir for module
             $dir = $dirins.'/'.$modulelowercase.'/class';
 
@@ -621,10 +625,92 @@ elseif (! empty($module))
                 print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
                 print '</form>';
             }
-
-            if ($tabobj == 'fields')
+            else
             {
-                print $langs->trans("FeatureNotYetAvailable").'<br><br>';
+                try {
+                    $pathtoclass = strtolower($module).'/class/'.strtolower($tabobj).'.class.php';
+                    $pathtoapi = strtolower($module).'/class/api_'.strtolower($tabobj).'.class.php';
+                    $pathtolist = strtolower($module).'/'.strtolower($tabobj).'_list.class.php';
+                    $pathtocard = strtolower($module).'/'.strtolower($tabobj).'_card.class.php';
+                    print '<span class="fa fa-file"></span> '.$langs->trans("ClassFile").' : <strong>'.$pathtoclass.'</strong><br>';
+                    print '<span class="fa fa-file"></span> '.$langs->trans("ApiClassFile").' : <strong>'.$pathtoapi.'</strong><br>';
+                    print '<span class="fa fa-file"></span> '.$langs->trans("PageForList").' : <strong>'.$pathtolist.'</strong><br>';
+                    print '<span class="fa fa-file"></span> '.$langs->trans("PageForCreateEditView").' : <strong>'.$pathtocard.'</strong><br>';
+
+                    $result = dol_include_once($pathtoclass);
+                    $tmpobjet = new $tabobj($db);
+
+                    $reflector = new ReflectionClass($tabobj);
+                    $properties = $reflector->getProperties();
+                    $propdefault = $reflector->getDefaultProperties();
+
+                    print load_fiche_titre($langs->trans("Properties"), '', '');
+
+                    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    print '<input type="hidden" name="action" value="initobject">';
+                    print '<input type="hidden" name="tab" value="objects">';
+                    print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+                    print '<input type="hidden" name="tabobj" value="'.dol_escape_htmltag($tabobj).'">';
+
+                    print '<table class="noborder">';
+                    print '<tr class="liste_titre">';
+                    print '<td>'.$langs->trans("Property").'</td>';
+                    print '<td>'.$langs->trans("Description").'</td>';
+                    print '<td>'.$langs->trans("Type").'</td>';
+                    print '<td>'.$langs->trans("DefaultValue").'</td>';
+                    print '<td></td>';
+                    print '</tr>';
+                    print '<tr>';
+                    print '<td><input class="text" name="propname" value=""></td>';
+                    print '<td><input class="text" name="propname" value=""></td>';
+                    print '<td><input class="text" name="propname" value=""></td>';
+                    print '<td><input class="text" name="propname" value=""></td>';
+                    print '<td align="center">';
+                    print '<input class="button" type="submit" name="add" value="'.$langs->trans("Add").'">';
+                    print '</td></tr>';
+                    foreach($properties as $propkey => $propval)
+                    {
+                        if ($propval->class == $tabobj)
+                        {
+                            $propname=$propval->getName();
+
+                            // Discard generic properties
+                            if (in_array($propname, array('element', 'table_element', 'table_element_line', 'class_element_line', 'ismultientitymanaged'))) continue;
+
+                            // Keep or not lines
+                            if (in_array($propname, array('fk_element', 'lines'))) continue;
+
+
+                            print '<tr class="oddeven"><td>';
+                            print $propname;
+                            print '</td>';
+                            print '<td>';
+
+                            print '</td>';
+
+                            print '<td>';
+
+                            print '</td>';
+
+                            print '<td>';
+                            print $propdefault[$propname];
+                            print '</td>';
+
+                            print '<td>';
+
+                            print '</td>';
+                            print '</tr>';
+                        }
+                    }
+                    print '</table>';
+
+                    print '</form>';
+                }
+                catch(Exception $e)
+                {
+                    print $e->getMessage();
+                }
             }
         }
 
@@ -666,10 +752,9 @@ elseif (! empty($module))
 			$var=True;
 			foreach ($triggers as $trigger)
 			{
-
 				print '<tr class="oddeven">';
 				print '<td valign="top" width="14" align="center">'.$trigger['picto'].'</td>';
-				print '<td class="tdtop">'.$trigger['file'].'</td>';
+				print '<td class="tdtop">'.$trigger['relpath'].'</td>';
 				print '<td valign="top" align="center">'.$trigger['status'].'</td>';
 				print '<td class="tdtop">';
 				$text=$trigger['info'];
@@ -698,11 +783,56 @@ elseif (! empty($module))
                 print '<br>';
             }
 
+            $modulelowercase=strtolower($module);
+
+            // Zip file to build
+            $FILENAMEZIP='';
+
+            // Load module
+            dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
+            $class='mod'.$module;
+
+            if (class_exists($class))
+            {
+                try {
+                    $moduleobj = new $class($db);
+                }
+                catch(Exception $e)
+                {
+                    $error++;
+                    dol_print_error($e->getMessage());
+                }
+            }
+            else
+            {
+                $error++;
+                $langs->load("errors");
+                dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
+                exit;
+            }
+
+            $arrayversion=explode('.',$moduleobj->version,3);
+            if (count($arrayversion))
+            {
+                $FILENAMEZIP="module_".$modulelowercase.'-'.$arrayversion[0].'.'.$arrayversion[1].($arrayversion[2]?".".$arrayversion[2]:"").".zip";
+                $outputfile = $conf->admin->dir_temp.'/'.$FILENAMEZIP;
+            }
+
+            print '<span class="fa fa-file"></span> '. $langs->trans("PathToModulePackage") . ' : ';
+            if (! dol_is_file($outputfile)) print '<strong>'.$langs->trans("PackageFileNotYetGenerated").'</strong>';
+            else {
+                print '<strong>'.$outputfile.'</strong>';
+                print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfile), 'dayhour').')';
+            }
+            print '</strong><br>';
+
+            print '<br><br>';
+
         	print '<form name="generatepackage">';
         	print '<input type="hidden" name="action" value="generatepackage">';
         	print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
         	print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
-        	print '<input type="submit" class="button" value="'.$langs->trans("Generate").'">';
+        	print '<input type="submit" class="button" value="'.$langs->trans("BuildPackage").'">';
         	print '</form>';
         }
 
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 9e66b9410f6..4993f60f83c 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -21,8 +21,8 @@
 
 /**
  * \file        htdocs/modulebuilder/template/class/myobject.class.php
- * \ingroup     mymodule othermodule1 othermodule2
- * \brief       This file is an example for a CRUD class file (Create/Read/Update/Delete)
+ * \ingroup     mymodule
+ * \brief       This file is a CRUD class file for MyObject (Create/Read/Update/Delete)
  */
 
 // Put here all includes required by your class file
@@ -31,24 +31,22 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
 /**
- * Class MyObject
- *
- * Put here description of your class.
+ * Class for MyObject
  */
 class MyObject extends CommonObject
 {
 	/**
 	 * @var string Id to identify managed object
 	 */
-	public $element = 'mymoduleobject';
+	public $element = 'myobject';
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = 'mymoduleobject';
+	public $table_element = 'myobject';
     /**
      * @var array Array with all fields and their property
      */
-	public $picto = 'generic';
+	public $picto = 'myobject';
     /**
      * @var array Array with all fields and their property
      */
@@ -67,12 +65,12 @@ class MyObject extends CommonObject
 
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
-	public $table_element_line = 'mymoduleobjectdet';
-    public $class_element_line = 'MyModuleObjectline';
-    public $fk_element = 'fk_mymoduleobject';
+	public $table_element_line = 'myobjectdet';
+    public $class_element_line = 'MyObjectline';
+    public $fk_element = 'fk_myobject';
 
     /**
-	 * @var MyModuleObjectLine[] Lines
+	 * @var MyObjectLine[] Lines
 	 */
 	public $lines = array();
 

From 862b12abfd4bef2915abf492dd6fb7790657d234 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jun 2017 21:28:29 +0200
Subject: [PATCH 1154/1163] Fix responsive

---
 htdocs/opensurvey/card.php | 42 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 18326321a4b..c634ca1ceaa 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -67,48 +67,48 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook))
 {
     if ($cancel) $action='';
-    
+
     // Delete
     if ($action == 'delete_confirm')
     {
     	// Security check
     	if (!$user->rights->opensurvey->write) accessforbidden();
-    
+
     	$result=$object->delete($user,'',$numsondage);
-    
+
     	header('Location: '.dol_buildpath('/opensurvey/list.php',1));
     	exit();
     }
-    
+
     // Close
     if ($action == 'close')
     {
         $object->status = Opensurveysondage::STATUS_CLOSED;
         $object->update($user);
     }
-    
+
     // Reopend
     if ($action == 'reopen')
     {
         $object->status = Opensurveysondage::STATUS_VALIDATED;
         $object->update($user);
     }
-    
+
     // Update
     if ($action == 'update')
     {
     	// Security check
     	if (!$user->rights->opensurvey->write) accessforbidden();
-    
+
     	$error=0;
-    
+
     	if (! GETPOST('nouveautitre'))
     	{
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Title")), null, 'errors');
     		$error++;
     		$action = 'edit';
     	}
-    
+
     	if (! $error)
     	{
     		$object->titre = GETPOST('nouveautitre');
@@ -118,7 +118,7 @@ if (empty($reshook))
     		$object->allow_comments = GETPOST('cancomment') == 'on' ? true : false;
     		$object->allow_spy = GETPOST('canseeothersvote') == 'on' ? true : false;
     		$object->mailsonde = GETPOST('mailsonde') == 'on' ? true : false;
-    
+
     		$res=$object->update($user);
     		if ($res < 0)
     		{
@@ -132,7 +132,7 @@ if (empty($reshook))
     if (GETPOST('ajoutcomment'))
     {
     	$error=0;
-    
+
     	if (! GETPOST('comment'))
     	{
     		$error++;
@@ -143,33 +143,33 @@ if (empty($reshook))
     		$error++;
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("User")), null, 'errors');
     	}
-    
+
     	if (! $error)
     	{
     		$comment = GETPOST("comment");
     		$comment_user = GETPOST('commentuser');
-    
+
     		$resql = $object->addComment($comment, $comment_user);
-    
+
     		if (! $resql)
     		{
     			setEventMessages($langs->trans('ErrorInsertingComment'), null, 'errors');
     		}
     	}
     }
-    
+
     // Delete comment
     $idcomment=GETPOST('deletecomment','int');
     if ($idcomment)
     {
     	// Security check
     	if (!$user->rights->opensurvey->write) accessforbidden();
-    
+
     	$resql = $object->deleteComment($idcomment);
     }
-    
+
     if ($action == 'edit') {
-    
+
     	// Security check
     	if (!$user->rights->opensurvey->write) accessforbidden();
     }
@@ -307,7 +307,7 @@ print '</td></tr>';
 // Expire date
 print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
 if ($action == 'edit') print $form->select_date($expiredate?$expiredate:$object->date_fin,'expire',0,0,0,'',1,0,1);
-else 
+else
 {
     print dol_print_date($object->date_fin,'day');
     if ($object->date_fin && $object->date_fin < dol_now()) print img_warning($langs->trans("Expired"));
@@ -377,7 +377,7 @@ if ($action != 'edit' && $user->rights->opensurvey->write) {
         //Opened button
         print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=reopen&id=' . $numsondage . '">'.$langs->trans("ReOpen") . '</a>';
     }
-    
+
 	//Delete button
 	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?suppressionsondage=1&id='.$numsondage.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
 }
@@ -420,7 +420,7 @@ print '<br>';
 // Add comment
 if ($object->allow_comments) {
 	print $langs->trans("AddACommentForPoll") . '<br>';
-	print '<textarea name="comment" rows="2" cols="80"></textarea><br>'."\n";
+	print '<textarea name="comment" rows="2" class="quatrevingtpercent"></textarea><br>'."\n";
 	print $langs->trans("Name") .': <input type="text" size="50" name="commentuser" value="'.$user->getFullName($langs).'"><br>'."\n";
 	print '<input type="submit" class="button" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
 	if (isset($erreur_commentaire_vide) && $erreur_commentaire_vide=="yes") {

From 787d6946b220453e6337d56e1b6859ac266dcee9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jun 2017 12:30:18 +0200
Subject: [PATCH 1155/1163] Continue work started on module builder

---
 htdocs/langs/en_US/modulebuilder.lang         |  14 +-
 htdocs/modulebuilder/index.php                | 361 ++++++++++++------
 .../modulebuilder/template/class/MyObject.txt |   3 +-
 .../template/class/myobject.class.php         |  62 ++-
 .../modulebuilder/template/modulebuilder.txt  |   5 +-
 5 files changed, 294 insertions(+), 151 deletions(-)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 8d9a31cfdf7..fe636fd4f2d 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,24 +1,25 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tools give you utilites to build or edit your own module.
+ModuleBuilderDesc=This tools give you utilites to build or edit your own module (<a href="%s" target="_blank">More information here</a>).
 EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...)
 ModuleBuilderDesc2=Path were modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory). 
 NewModule=New module
 NewObject=New object
-ModuleKey=Key for new module
-ObjectKey=Key for new object
+ModuleKey=Module key
+ObjectKey=Object key
 ModuleInitialized=Module initialized
 FilesForObjectInitialized=Files for new object initialized
 ModuleBuilderDescdescription=Enter here all general information that describe your module
-ModuleBuilderDescobjects=Define here the new objects you want to manage with your module. A page to list them and a page to create/edit/view a card will be generated.
+ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A sql file, a page to list them, to create/edit/view a card and an API will be generated.
 ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
 ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
 ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file with your IDE.
 ModuleBuilderDeschooks=This tab is dedicated to hooks.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to build the module package file.
-ModuleBuilderDescdangerzone=You can delete your module. WARNING: All files of module will be definetly lost !
+EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All files of module will be definitly lost !
+EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be definitly lost !
 DangerZone=Danger zone
 BuildPackage=Build package
 ModuleIsNotActive=This module was not activated yet (go into Home-Setup-Module to make it live)
@@ -31,4 +32,5 @@ ClassFile=File for PHP class
 ApiClassFile=File for PHP API class
 PageForList=PHP page for list of record
 PageForCreateEditView=PHP page to create/edit/view a record
-PathToModulePackage=Path to zip of module/application package
\ No newline at end of file
+PathToModulePackage=Path to zip of module/application package
+SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index d9ae491b654..7aa3440b8a8 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -58,41 +58,50 @@ $FILEFLAG='modulebuilder.txt';
 
 if ($dirins && $action == 'initmodule' && $modulename)
 {
-    $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
-    $destdir = $dirins.'/'.strtolower($modulename);
-
-    $arrayreplacement=array(
-        'mymodule'=>strtolower($modulename),
-     	'MyModule'=>$modulename
-    );
-
-    $result = dolCopyDir($srcdir, $destdir, 0, 0, $arrayreplacement);
-    //dol_mkdir($destfile);
-    if ($result <= 0)
+    if (preg_match('/\s/', $modulename))
     {
-    	if ($result < 0)
-    	{
-        	$error++;
-        	$langs->load("errors");
-        	setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors');
-    	}
-    	else	// $result == 0
-    	{
-        	setEventMessages($langs->trans("AllFilesDidAlreadyExist", $srcdir, $destdir), null, 'warnings');
-    	}
+        $error++;
+        setEventMessages($langs->trans("SpaceOrSpecialCharAreNotAllowed"), null, 'errors');
     }
 
-    // Delete some files
-    dol_delete_file($destdir.'/myobject_card.php');
-    dol_delete_file($destdir.'/myobject_list.php');
-    dol_delete_file($destdir.'/test/phpunit/MyObjectTest.php');
-    dol_delete_file($destdir.'/sql/llx_myobject.key.sql');
-    dol_delete_file($destdir.'/sql/llx_myobject.sql');
-    dol_delete_file($destdir.'/scripts/myobject.php');
-    dol_delete_file($destdir.'/img/object_myobject.png');
-    dol_delete_file($destdir.'/class/myobject.class.php');
-    dol_delete_file($destdir.'/class/api_myobject.class.php');
-    dol_delete_file($destdir.'/class/MyObject.txt');
+    if (! $error)
+    {
+        $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+        $destdir = $dirins.'/'.strtolower($modulename);
+
+        $arrayreplacement=array(
+            'mymodule'=>strtolower($modulename),
+         	'MyModule'=>$modulename
+        );
+
+        $result = dolCopyDir($srcdir, $destdir, 0, 0, $arrayreplacement);
+        //dol_mkdir($destfile);
+        if ($result <= 0)
+        {
+        	if ($result < 0)
+        	{
+            	$error++;
+            	$langs->load("errors");
+            	setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors');
+        	}
+        	else	// $result == 0
+        	{
+            	setEventMessages($langs->trans("AllFilesDidAlreadyExist", $srcdir, $destdir), null, 'warnings');
+        	}
+        }
+
+        // Delete some files
+        dol_delete_file($destdir.'/myobject_card.php');
+        dol_delete_file($destdir.'/myobject_list.php');
+        dol_delete_file($destdir.'/test/phpunit/MyObjectTest.php');
+        dol_delete_file($destdir.'/sql/llx_myobject.key.sql');
+        dol_delete_file($destdir.'/sql/llx_myobject.sql');
+        dol_delete_file($destdir.'/scripts/myobject.php');
+        dol_delete_file($destdir.'/img/object_myobject.png');
+        dol_delete_file($destdir.'/class/myobject.class.php');
+        dol_delete_file($destdir.'/class/api_myobject.class.php');
+        dol_delete_file($destdir.'/class/MyObject.txt');
+    }
 
     // Edit PHP files
     if (! $error)
@@ -129,74 +138,86 @@ if ($dirins && $action == 'initmodule' && $modulename)
 
 if ($dirins && $action == 'initobject' && $module && $objectname)
 {
-    $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
-    $destdir = $dirins.'/'.strtolower($module);
-
-    $arrayreplacement=array(
-        'mymodule'=>strtolower($module),
-        'MyModule'=>$module,
-        'myobject'=>strtolower($objectname),
-        'MyObject'=>$objectname
-    );
-
-
-    // Delete some files
-    $filetogenerate = array(
-        'myobject_card.php'=>strtolower($objectname).'_card.php',
-        'myobject_list.php'=>strtolower($objectname).'_list.php',
-        'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.$objectname.'Test.php',
-        'sql/llx_myobject.key.sql'=>'sql/llx_'.strtolower($objectname).'.key.sql',
-        'sql/llx_myobject.sql'=>'sql/llx_'.strtolower($objectname).'.sql',
-        'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
-        'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
-        'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
-        'class/api_myobject.class.php'=>'class/api_'.strtolower($objectname).'.class.php',
-        'class/MyObject.txt'=>'class/'.$objectname.'.txt'
-    );
-
-    foreach($filetogenerate as $srcfile => $destfile)
+    if (preg_match('/\s/', $objectname))
     {
-        $result = dol_copy($srcdir.'/'.$srcfile, $destdir.'/'.$destfile);
-        if ($result <= 0)
-        {
-            if ($result < 0)
-            {
-                $error++;
-                $langs->load("errors");
-                setEventMessages($langs->trans("ErrorFailToCopyFile", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'errors');
-            }
-            else	// $result == 0
-            {
-                setEventMessages($langs->trans("FileAlreadyExists", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'warnings');
-            }
-        }
-        else
-        {
-            // Copy is ok
-        }
+        $error++;
+        setEventMessages($langs->trans("SpaceOrSpecialCharAreNotAllowed"), null, 'errors');
     }
 
-    // Edit PHP files
-    foreach($filetogenerate as $destfile)
+    if (! $error)
     {
-        $phpfileval['fullname'] = $destdir.'/'.$destfile;
+        $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+        $destdir = $dirins.'/'.strtolower($module);
 
-        //var_dump($phpfileval['fullname']);
         $arrayreplacement=array(
-            'mymodule'=>strtolower($modulename),
-            'MyModule'=>$modulename,
-            'MYMODULE'=>strtoupper($modulename),
-            'My module'=>$modulename,
-            'htdocs/modulebuilder/template/'=>'',
+            'mymodule'=>strtolower($module),
+            'MyModule'=>$module,
             'myobject'=>strtolower($objectname),
             'MyObject'=>$objectname
         );
 
-        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
-        //var_dump($result);
-        if ($result < 0)
+
+        // Delete some files
+        $filetogenerate = array(
+            'myobject_card.php'=>strtolower($objectname).'_card.php',
+            'myobject_list.php'=>strtolower($objectname).'_list.php',
+            'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.$objectname.'Test.php',
+            'sql/llx_myobject.key.sql'=>'sql/llx_'.strtolower($objectname).'.key.sql',
+            'sql/llx_myobject.sql'=>'sql/llx_'.strtolower($objectname).'.sql',
+            'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
+            'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
+            'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
+            'class/api_myobject.class.php'=>'class/api_'.strtolower($objectname).'.class.php',
+            'class/MyObject.txt'=>'class/'.$objectname.'.txt'
+        );
+
+        foreach($filetogenerate as $srcfile => $destfile)
         {
-            setEventMessages($langs->trans("ErrorFailToMakeReplacementInto", $phpfileval['fullname']), null, 'errors');
+            $result = dol_copy($srcdir.'/'.$srcfile, $destdir.'/'.$destfile);
+            if ($result <= 0)
+            {
+                if ($result < 0)
+                {
+                    $error++;
+                    $langs->load("errors");
+                    setEventMessages($langs->trans("ErrorFailToCopyFile", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'errors');
+                }
+                else	// $result == 0
+                {
+                    setEventMessages($langs->trans("FileAlreadyExists", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'warnings');
+                }
+            }
+            else
+            {
+                // Copy is ok
+            }
+        }
+    }
+
+    if (! $error)
+    {
+        // Edit PHP files
+        foreach($filetogenerate as $destfile)
+        {
+            $phpfileval['fullname'] = $destdir.'/'.$destfile;
+
+            //var_dump($phpfileval['fullname']);
+            $arrayreplacement=array(
+                'mymodule'=>strtolower($modulename),
+                'MyModule'=>$modulename,
+                'MYMODULE'=>strtoupper($modulename),
+                'My module'=>$modulename,
+                'htdocs/modulebuilder/template/'=>'',
+                'myobject'=>strtolower($objectname),
+                'MyObject'=>$objectname
+            );
+
+            $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
+            //var_dump($result);
+            if ($result < 0)
+            {
+                setEventMessages($langs->trans("ErrorFailToMakeReplacementInto", $phpfileval['fullname']), null, 'errors');
+            }
         }
     }
 
@@ -206,18 +227,90 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
     }
 }
 
-
 if ($dirins && $action == 'confirm_delete')
 {
-    $modulelowercase=strtolower($module);
+    if (preg_match('/\s/', $module))
+    {
+        $error++;
+        setEventMessages($langs->trans("SpaceOrSpecialCharAreNotAllowed"), null, 'errors');
+    }
 
-    // Dir for module
-    $dir = $dirins.'/'.$modulelowercase;
+    if (! $error)
+    {
+        $modulelowercase=strtolower($module);
 
-    dol_delete_dir_recursive($dir);
+        // Dir for module
+        $dir = $dirins.'/'.$modulelowercase;
 
-    header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?module=initmodule');
-    exit;
+        $result = dol_delete_dir_recursive($dir);
+
+        if ($result > 0)
+        {
+            setEventMessages($langs->trans("DirDeleted"), null);
+        }
+        else
+        {
+            setEventMessages($langs->trans("NothingDeleted"), null, 'warnings');
+        }
+    }
+
+    //header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?module=initmodule');
+    //exit;
+    $action = '';
+    $module = 'deletemodule';
+}
+
+if ($dirins && $action == 'confirm_deleteobject' && $objectname)
+{
+    if (preg_match('/\s/', $objectname))
+    {
+        $error++;
+        setEventMessages($langs->trans("SpaceOrSpecialCharAreNotAllowed"), null, 'errors');
+    }
+
+    if (! $error)
+    {
+        $modulelowercase=strtolower($module);
+        $objectlowercase=strtolower($objectname);
+
+        // Dir for module
+        $dir = $dirins.'/'.$modulelowercase;
+
+        // Delete some files
+        $filetogenerate = array(
+            'myobject_card.php'=>strtolower($objectname).'_card.php',
+            'myobject_list.php'=>strtolower($objectname).'_list.php',
+            'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.$objectname.'Test.php',
+            'sql/llx_myobject.key.sql'=>'sql/llx_'.strtolower($objectname).'.key.sql',
+            'sql/llx_myobject.sql'=>'sql/llx_'.strtolower($objectname).'.sql',
+            'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
+            'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
+            'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
+            'class/api_myobject.class.php'=>'class/api_'.strtolower($objectname).'.class.php',
+            'class/MyObject.txt'=>'class/'.$objectname.'.txt'
+        );
+
+        $resultko = 0;
+        foreach($filetogenerate as $filetodelete)
+        {
+            $resulttmp = dol_delete_file($dir.'/'.$filetodelete, 0, 0, 1);
+            if (! $resulttmp) $resultko++;
+        }
+
+        if ($resultko == 0)
+        {
+            setEventMessages($langs->trans("FilesDeleted"), null);
+        }
+        else
+        {
+            setEventMessages($langs->trans("ErrorSomeFilesCouldNotBeDeleted"), null, 'warnings');
+        }
+    }
+
+    //header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?module=initmodule');
+    //exit;
+    $action = '';
+    $tabobj = 'deleteobject';
 }
 
 if ($dirins && $action == 'generatepackage')
@@ -341,7 +434,7 @@ if (!empty($conf->modulebuilder->enabled) && $mainmenu == 'modulebuilder')	// En
 // Show description of content
 $newdircustom=$dirins;
 if (empty($newdircustom)) $newdircustom=img_warning();
-print $langs->trans("ModuleBuilderDesc").'<br>';
+print $langs->trans("ModuleBuilderDesc", 'https://wiki.dolibarr.org/index.php/Module_development#Create_your_module').'<br>';
 print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $newdircustom).'<br>';
 
 $message='';
@@ -381,7 +474,7 @@ print $langs->trans("ModuleBuilderDesc3", count($listofmodules), $FILEFLAG).'<br
 $error=0;
 $moduleobj = null;
 
-if (! empty($module) && $module != 'initmodule')
+if (! empty($module) && $module != 'initmodule' && $module != 'deletemodule')
 {
 	$modulelowercase=strtolower($module);
 
@@ -428,6 +521,10 @@ foreach($listofmodules as $tmpmodule => $tmpmodulewithcase)
     $h++;
 }
 
+$head[$h][0] = $_SERVER["PHP_SELF"].'?module=deletemodule';
+$head[$h][1] = $langs->trans("DangerZone");
+$head[$h][2] = 'deletemodule';
+$h++;
 
 
 dol_fiche_head($head, $module, $langs->trans("Modules"), -1, 'generic');
@@ -446,6 +543,19 @@ if ($module == 'initmodule')
     print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
     print '</form>';
 }
+elseif ($module == 'deletemodule')
+{
+    print '<form name="delete">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="confirm_delete">';
+    print '<input type="hidden" name="module" value="deletemodule">';
+
+    print $langs->trans("EnterNameOfModuleToDeleteDesc").'<br><br>';
+
+    print '<input type="text" name="module" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'" value="">';
+    print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins?'':' disabled="disabled"').'>';
+    print '</form>';
+}
 elseif (! empty($module))
 {
     // Tabs for module
@@ -502,11 +612,6 @@ elseif (! empty($module))
         $head2[$h][2] = 'buildpackage';
         $h++;
 
-        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=dangerzone&module='.$module;
-        $head2[$h][1] = $langs->trans("DangerZone");
-        $head2[$h][2] = 'dangerzone';
-        $h++;
-
         print $modulestatusinfo.'<br><br>';
 
         dol_fiche_head($head2, $tab, '', -1, '');
@@ -532,6 +637,7 @@ elseif (! empty($module))
 
         	print '<tr><td>';
         	print $langs->trans("Numero");
+        	print ' (<a href="https://wiki.dolibarr.org/index.php/List_of_modules_id" target="_blank">'.$langs->trans("SeeHere").'</a>)';
         	print '</td><td>';
         	print $moduleobj->numero;
         	print '</td></tr>';
@@ -608,6 +714,12 @@ elseif (! empty($module))
                 $h++;
             }
 
+            $head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.'&tabobj=deleteobject';
+            $head3[$h][1] = $langs->trans("DangerZone");
+            $head3[$h][2] = 'deleteobject';
+            $h++;
+
+
             dol_fiche_head($head3, $tabobj, '', -1, '');
 
             if ($tabobj == 'newobject')
@@ -625,6 +737,21 @@ elseif (! empty($module))
                 print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
                 print '</form>';
             }
+            elseif ($tabobj == 'deleteobject')
+            {
+                // New module
+                print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                print '<input type="hidden" name="action" value="confirm_deleteobject">';
+                print '<input type="hidden" name="tab" value="objects">';
+                print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+
+                print $langs->trans("EnterNameOfObjectToDeleteDesc").'<br><br>';
+
+                print '<input type="text" name="objectname" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'">';
+                print '<input type="submit" class="buttonDelete" name="delete" value="'.dol_escape_htmltag($langs->trans("Delete")).'"'.($dirins?'':' disabled="disabled"').'>';
+                print '</form>';
+            }
             else
             {
                 try {
@@ -641,8 +768,9 @@ elseif (! empty($module))
                     $tmpobjet = new $tabobj($db);
 
                     $reflector = new ReflectionClass($tabobj);
-                    $properties = $reflector->getProperties();
-                    $propdefault = $reflector->getDefaultProperties();
+                    $properties = $reflector->getProperties();          // Can also use get_object_vars
+                    $propdefault = $reflector->getDefaultProperties();  // Can also use get_object_vars
+                    //$propstat = $reflector->getStaticProperties();
 
                     print load_fiche_titre($langs->trans("Properties"), '', '');
 
@@ -655,8 +783,10 @@ elseif (! empty($module))
 
                     print '<table class="noborder">';
                     print '<tr class="liste_titre">';
-                    print '<td>'.$langs->trans("Property").'</td>';
-                    print '<td>'.$langs->trans("Description").'</td>';
+                    print '<td>'.$langs->trans("Property");
+                    print ' (<a href="https://wiki.dolibarr.org/index.php/Language_and_development_rules#Table_and_fields_structures" target="_blank">'.$langs->trans("Example").'</a>)';
+                    print '</td>';
+                    print '<td>'.$langs->trans("Comment").'</td>';
                     print '<td>'.$langs->trans("Type").'</td>';
                     print '<td>'.$langs->trans("DefaultValue").'</td>';
                     print '<td></td>';
@@ -676,7 +806,7 @@ elseif (! empty($module))
                             $propname=$propval->getName();
 
                             // Discard generic properties
-                            if (in_array($propname, array('element', 'table_element', 'table_element_line', 'class_element_line', 'ismultientitymanaged'))) continue;
+                            if (in_array($propname, array('element', 'childtables', 'table_element', 'table_element_line', 'class_element_line', 'isnolinkedbythird', 'ismultientitymanaged'))) continue;
 
                             // Keep or not lines
                             if (in_array($propname, array('fk_element', 'lines'))) continue;
@@ -686,11 +816,10 @@ elseif (! empty($module))
                             print $propname;
                             print '</td>';
                             print '<td>';
-
+                            print $propval->getDocComment();
                             print '</td>';
-
                             print '<td>';
-
+                            print gettype($tmpobjet->$propname);
                             print '</td>';
 
                             print '<td>';
@@ -836,16 +965,6 @@ elseif (! empty($module))
         	print '</form>';
         }
 
-        if ($tab == 'dangerzone')
-        {
-            print '<form name="delete">';
-            print '<input type="hidden" name="action" value="confirm_delete">';
-            print '<input type="hidden" name="tab" value="'.dol_escape_htmltag($tab).'">';
-            print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
-            print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins?'':' disabled="disabled"').'>';
-            print '</form>';
-        }
-
         dol_fiche_end();
     }
 }
diff --git a/htdocs/modulebuilder/template/class/MyObject.txt b/htdocs/modulebuilder/template/class/MyObject.txt
index 37ccaca81ed..e86e7cdf5c6 100644
--- a/htdocs/modulebuilder/template/class/MyObject.txt
+++ b/htdocs/modulebuilder/template/class/MyObject.txt
@@ -1 +1,2 @@
-# If this file exists, it means the class and file for object MyOjbect was generated by ModuleBuilder.
\ No newline at end of file
+# DO NOT DELETE THIS FILE MANUALLY
+# If this file exists, it means the class and file for object MyOjbect was generated by ModuleBuilder. Use ModuleBuilder if you want to delete object. 
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 4993f60f83c..c66110fddf6 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -36,43 +36,63 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 class MyObject extends CommonObject
 {
 	/**
-	 * @var string Id to identify managed object
+	 * @var string ID to identify managed object
 	 */
 	public $element = 'myobject';
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'myobject';
-    /**
-     * @var array Array with all fields and their property
+
+	/**
+	 * @var array  Does this field is linked to a thirdparty ?
+	 */
+	protected $isnolinkedbythird=1;
+	/**
+	 * @var array  Does myobject support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 */
+	protected $ismultientitymanaged = 1;
+
+
+	/**
+     * @var string String with name of icon for myobject
      */
 	public $picto = 'myobject';
-    /**
-     * @var array Array with all fields and their property
+
+	/**
+	 * @var int    Entity Id
+	 */
+	public $entity;
+
+	/**
+     * @var array  Array with all fields and their property
      */
 	public $fields;
 
+
+
+	// If this object has a subtable with lines
+
 	/**
-	 * @var mixed Sample property 1
+	 * @var int    Name of subtable line
 	 */
-	public $prop1;
+	//public $table_element_line = 'myobjectdet';
 	/**
-	 * @var mixed Sample property 2
+	 * @var int    Field with ID of parent key if this field has a parent
 	 */
-	public $prop2;
-
-	//...
-
-	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-
-	public $table_element_line = 'myobjectdet';
-    public $class_element_line = 'MyObjectline';
-    public $fk_element = 'fk_myobject';
-
-    /**
-	 * @var MyObjectLine[] Lines
+	//public $fk_element = 'fk_myobject';
+	/**
+	 * @var int    Name of subtable class that manage subtable lines
 	 */
-	public $lines = array();
+	//public $class_element_line = 'MyObjectline';
+	/**
+	 * @var array  Array of child tables (child tables to delete before deleting a record)
+	 */
+	//protected $childtables=array('myobjectdet');
+	/**
+	 * @var MyObjectLine[]     Array of subtable lines
+	 */
+	//public $lines = array();
 
 
 
diff --git a/htdocs/modulebuilder/template/modulebuilder.txt b/htdocs/modulebuilder/template/modulebuilder.txt
index 5cdb6c6e6e8..24ea0d6eac5 100644
--- a/htdocs/modulebuilder/template/modulebuilder.txt
+++ b/htdocs/modulebuilder/template/modulebuilder.txt
@@ -1,2 +1,3 @@
-File to flag module built using official module template.
-When this file is present into a module directory, you can edit it with the module builder tool.
\ No newline at end of file
+# DO NOT DELETE THIS FILE MANUALLY
+# File to flag module built using official module template.
+# When this file is present into a module directory, you can edit it with the module builder tool. Use ModuleBuilder if you want to delete module. 
\ No newline at end of file

From cde0da6e1286febe81523590c3cbb693187ee1af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jun 2017 12:48:58 +0200
Subject: [PATCH 1156/1163] Fix responsive

---
 htdocs/public/demo/index.php       | 2 +-
 htdocs/public/opensurvey/studs.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index f9bb4db7ecf..60559eb7aed 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -291,7 +291,7 @@ print '</div>';
 print '<div class="demobantext" style="max-width: 1024px;">';
 print '<div style="font-size: 20px; padding: 40px;">';
 print '<div style="text-align: justify;">'.$langs->trans("DemoDesc").'</div><br>';
-print '<font color="#555577"><b>'.$langs->trans("ChooseYourDemoProfil").'</b></font>';
+print '<div class="titre"><font style="font-size: 20px">'.$langs->trans("ChooseYourDemoProfil").'</font></div>';
 print '</div>';
 print '</div>';
 
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 8e769452ec1..5f4c7a1fb03 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -113,14 +113,14 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 		}
 
 		$nom=substr(GETPOST("nom"),0,64);
-		
+
 		// Check if vote already exists
 		$sql = 'SELECT id_users, nom as name';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'opensurvey_user_studs';
 		$sql.= " WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."' ORDER BY id_users";
 		$resql = $db->query($sql);
 		if (! $resql) dol_print_error($db);
-		
+
 		$num_rows = $db->num_rows($resql);
 		if ($num_rows > 0)
 		{
@@ -739,7 +739,7 @@ if ($comments)
 if ($object->allow_comments) {
 	print '<div class="addcomment">' .$langs->trans("AddACommentForPoll") . "<br>\n";
 
-	print '<textarea name="comment" rows="2" cols="60"></textarea><br>'."\n";
+	print '<textarea name="comment" rows="'.ROWS_2.'" class="quatrevingtpercent"></textarea><br>'."\n";
 	print $langs->trans("Name") .': ';
 	print '<input type="text" name="commentuser" maxlength="64" /> &nbsp; '."\n";
 	print '<input type="submit" class="button" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";

From 819656bd89726bd7974748f88b113dc1d5b4b905 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jun 2017 21:27:49 +0200
Subject: [PATCH 1157/1163] Fix security: Check _SERVER["QUERY_STRING"] is
 escaped.

---
 htdocs/accountancy/admin/accountmodel.php |  2 +-
 htdocs/main.inc.php                       |  2 +-
 test/phpunit/CodingPhpTest.php            | 19 ++++++++++++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 80dcd2b1807..736338d1b88 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -599,7 +599,7 @@ if ($id)
 
     $fieldlist=explode(',',$tabfield[$id]);
 
-    print '<form action="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?id='.$id.'" method="POST">';
+    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
     print '<table class="noborder" width="100%">';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 407a0dbb1d0..022aa4d5e44 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -99,7 +99,7 @@ function test_sql_and_script_inject($val, $type)
     $sql_inj += preg_match('/base[\s]+href/si', $val);
     $sql_inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
     $sql_inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-//    $sql_inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
+    $sql_inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
     if ($type == 1)
     {
         $sql_inj += preg_match('/javascript:/i', $val);
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 581d5cdda89..5df31da812c 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -172,9 +172,25 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
             $this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['fullname'].' ('.$val[0].'). Bad.');
             //exit;
 
+            // Test that output of $_SERVER\[\'QUERY_STRING\'\] is escaped.
             $ok=true;
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
+            preg_match_all('/(...................)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
+            foreach($matches as $key => $val)
+            {
+                if ($val[1] != 'dol_escape_htmltag(')
+                {
+                    $ok=false;
+                    break;
+                }
+            }
+            $this->assertTrue($ok, 'Found a $_SERVER[\'QUERY_STRING\'] without dol_escape_htmltag around in file '.$file['fullname'].' ('.$val[1].'$_SERVER[\'QUERY_STRING\']). Bad.');
+
+            // Test that output of $_SERVER\[\'PHP_SELF\'\] is escaped (not done for the moment, did not found a way to forge value of $_SERVER['PHP_SELF'] by extern access).
+            /*$ok=true;
+            $matches=array();
+            // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/(...................)\$_SERVER\[\'PHP_SELF\'\]/', $filecontent, $matches, PREG_SET_ORDER);
             foreach($matches as $key => $val)
             {
@@ -184,7 +200,8 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
                     break;
                 }
             }
-            $this->assertTrue($ok, 'Found a $_SERVER[\'QUERY_STRING\'] without dol_escape_htmltag around in file '.$file['fullname'].' ('.$val[1].'$_SERVER[\'QUERY_STRING\']). Bad.');
+            $this->assertTrue($ok, 'Found a $_SERVER[\'PHP_SELF\'] without dol_escape_htmltag around in file '.$file['fullname'].' ('.$val[1].'$_SERVER[\'PHP_SELF\']). Bad.');
+            */
         }
 
         return;

From a1f08be4791c48462933f31c0d60a2a59553c300 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jun 2017 22:21:42 +0200
Subject: [PATCH 1158/1163] Fix phpcs

---
 htdocs/modulebuilder/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 7aa3440b8a8..4e8f1c323ee 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -703,7 +703,7 @@ elseif (! empty($module))
             $head3[$h][2] = 'newobject';
             $h++;
 
-            $listofobject = dol_dir_list($dir , 'files', 0, '\.txt$');
+            $listofobject = dol_dir_list($dir, 'files', 0, '\.txt$');
             foreach($listofobject as $fileobj)
             {
                 $objectname = preg_replace('/\.txt$/', '', $fileobj['name']);

From 8d84277e8c4b31a65e35f0da093cdfc6ee342183 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 02:18:04 +0200
Subject: [PATCH 1159/1163] Complete repair script

---
 htdocs/install/mysql/migration/repair.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 991212c7d22..fe8915fbf09 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -339,6 +339,11 @@ drop table tmp_c_shipment_mode;
 -- VMYSQL4.1 update llx_expensereport_det as ed set date = (select date_debut from llx_expensereport as e where ed.fk_expensereport = e.rowid) where DATE(STR_TO_DATE(date, '%Y-%m-%d')) < '1000-00-00';
 -- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
 
+-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
+-- VMYSQL4.1 update llx_bank set tms = datec where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
+-- VMYSQL4.1 update llx_bank set tms = datec where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+
 
 -- Backport a change of value into the hourly rate. 
 -- update llx_projet_task_time as ptt set ptt.thm = (SELECT thm from llx_user as u where ptt.fk_user = u.rowid) where (ptt.thm is null)

From 52eeeebac9b1f804d5707fac543b727f9fbd3a6d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 02:31:55 +0200
Subject: [PATCH 1160/1163] Fix bad data in sql dump

---
 dev/initdemo/initdemo.sh                       |  2 +-
 dev/initdemo/mysqldump_dolibarr_3.5.0.sql      |  2 +-
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 14 ++++++++------
 htdocs/install/mysql/migration/repair.sql      |  5 +++++
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/dev/initdemo/initdemo.sh b/dev/initdemo/initdemo.sh
index 940f0b59467..ddba2ea6fd9 100755
--- a/dev/initdemo/initdemo.sh
+++ b/dev/initdemo/initdemo.sh
@@ -155,7 +155,7 @@ fi
 #echo "mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile"
 #mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
 #echo "drop old table"
-echo "drop table llx_accounting_account;" | mysql -P$port -u$admin $passwd $base
+echo "drop table if exists llx_accounting_account;" | mysql -P$port -u$admin $passwd $base
 echo "mysql -P$port -u$admin -p***** $base < $mydir/$dumpfile"
 mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
 export res=$?
diff --git a/dev/initdemo/mysqldump_dolibarr_3.5.0.sql b/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
index dba6263dde3..ab03e6054c1 100644
--- a/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
@@ -528,7 +528,7 @@ CREATE TABLE `llx_bank` (
 
 LOCK TABLES `llx_bank` WRITE;
 /*!40000 ALTER TABLE `llx_bank` DISABLE KEYS */;
-INSERT INTO `llx_bank` VALUES (1,'2010-07-08 23:56:14','2013-03-07 21:28:51','2010-07-08','2010-07-08',2000.00000000,'(Initial balance)',1,NULL,1,'SOLD','201210',NULL,1,NULL,0,NULL,NULL,NULL),(2,'2010-07-09 00:00:24','0000-00-00 00:00:00','2010-07-09','2010-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(3,'2010-07-10 13:33:42','0000-00-00 00:00:00','2010-07-10','2010-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(4,'2010-07-10 14:59:41','0000-00-00 00:00:00','2010-07-10','2010-07-10',0.02000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,'Client salon invidivdu',NULL),(5,'2011-07-18 20:50:24','0000-00-00 00:00:00','2011-07-08','2011-07-08',20.00000000,'(CustomerInvoicePayment)',1,1,NULL,'CB','201107',NULL,1,NULL,0,NULL,NULL,NULL),(6,'2011-07-18 20:50:47','0000-00-00 00:00:00','2011-07-08','2011-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(8,'2011-08-01 03:34:11','2013-03-07 21:28:51','2011-08-01','2011-08-01',5.63000000,'(CustomerInvoicePayment)',1,1,1,'CB','201210',NULL,1,NULL,0,NULL,NULL,NULL),(12,'2011-08-05 23:11:37','2013-03-07 21:33:57','2011-08-05','2011-08-05',-10.00000000,'(SocialContributionPayment)',1,1,1,'VIR','201210',NULL,1,NULL,0,NULL,NULL,NULL),(13,'2011-08-06 20:33:54','0000-00-00 00:00:00','2011-08-06','2011-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(14,'2011-08-08 02:53:40','0000-00-00 00:00:00','2011-08-08','2011-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(15,'2011-08-08 02:55:58','2013-03-07 21:39:20','2011-08-08','2011-08-08',26.96000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201211',NULL,1,NULL,0,NULL,NULL,NULL),(16,'2012-12-09 15:28:44','2012-12-09 14:28:44','2012-12-09','2012-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(17,'2012-12-09 15:28:53','2012-12-09 14:33:07','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(18,'2012-12-09 17:35:55','2012-12-09 16:35:55','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(19,'2012-12-09 17:37:02','2012-12-09 16:37:02','2012-12-09','2012-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(20,'2012-12-09 18:35:07','2012-12-09 17:35:07','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(21,'2012-12-12 18:54:33','2013-03-07 21:28:51','2012-12-12','2012-12-12',1.00000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201210',NULL,1,NULL,0,NULL,NULL,NULL),(22,'2013-03-06 16:48:16','2013-03-06 15:48:16','2013-03-06','2013-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(23,'2013-03-20 14:30:11','2013-03-20 13:30:11','2013-03-20','2013-03-20',10.00000000,'(SubscriptionPayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL);
+INSERT INTO `llx_bank` VALUES (1,'2010-07-08 23:56:14','2013-03-07 21:28:51','2010-07-08','2010-07-08',2000.00000000,'(Initial balance)',1,NULL,1,'SOLD','201210',NULL,1,NULL,0,NULL,NULL,NULL),(2,'2010-07-09 00:00:24','2010-07-09 00:00:24','2010-07-09','2010-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(3,'2010-07-10 13:33:42','2010-07-10 13:33:42','2010-07-10','2010-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(4,'2010-07-10 14:59:41','2010-07-10 14:59:41','2010-07-10','2010-07-10',0.02000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,'Client salon invidivdu',NULL),(5,'2011-07-18 20:50:24','2011-07-18 20:50:24','2011-07-08','2011-07-08',20.00000000,'(CustomerInvoicePayment)',1,1,NULL,'CB','201107',NULL,1,NULL,0,NULL,NULL,NULL),(6,'2011-07-18 20:50:47','2011-07-18 20:50:47','2011-07-08','2011-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(8,'2011-08-01 03:34:11','2013-03-07 21:28:51','2011-08-01','2011-08-01',5.63000000,'(CustomerInvoicePayment)',1,1,1,'CB','201210',NULL,1,NULL,0,NULL,NULL,NULL),(12,'2011-08-05 23:11:37','2013-03-07 21:33:57','2011-08-05','2011-08-05',-10.00000000,'(SocialContributionPayment)',1,1,1,'VIR','201210',NULL,1,NULL,0,NULL,NULL,NULL),(13,'2011-08-06 20:33:54','2011-08-06 20:33:54','2011-08-06','2011-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(14,'2011-08-08 02:53:40','2011-08-08 02:53:40','2011-08-08','2011-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(15,'2011-08-08 02:55:58','2013-03-07 21:39:20','2011-08-08','2011-08-08',26.96000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201211',NULL,1,NULL,0,NULL,NULL,NULL),(16,'2012-12-09 15:28:44','2012-12-09 14:28:44','2012-12-09','2012-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(17,'2012-12-09 15:28:53','2012-12-09 14:33:07','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(18,'2012-12-09 17:35:55','2012-12-09 16:35:55','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(19,'2012-12-09 17:37:02','2012-12-09 16:37:02','2012-12-09','2012-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(20,'2012-12-09 18:35:07','2012-12-09 17:35:07','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(21,'2012-12-12 18:54:33','2013-03-07 21:28:51','2012-12-12','2012-12-12',1.00000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201210',NULL,1,NULL,0,NULL,NULL,NULL),(22,'2013-03-06 16:48:16','2013-03-06 15:48:16','2013-03-06','2013-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(23,'2013-03-20 14:30:11','2013-03-20 13:30:11','2013-03-20','2013-03-20',10.00000000,'(SubscriptionPayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_bank` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 5e46393768a..18349872d72 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -25,6 +25,8 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
+ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT '2001-01-01 00:00:00';
+
 -- Clean corrupted values for tms
 -- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
 -- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
@@ -34,12 +36,6 @@
 -- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
 
-
-ALTER TABLE llx_extrafields ADD COLUMN fieldcomputed text;
-ALTER TABLE llx_extrafields ADD COLUMN fielddefault varchar(255);
-
-ALTER TABLE llx_c_typent MODIFY COLUMN libelle varchar(64); 
-
 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEFAULT 0;
@@ -50,6 +46,12 @@ ALTER TABLE llx_opensurvey_sondage ADD COLUMN allow_spy tinyint NOT NULL DEFAULT
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN sujet TEXT;
 
 
+ALTER TABLE llx_extrafields ADD COLUMN fieldcomputed text;
+ALTER TABLE llx_extrafields ADD COLUMN fielddefault varchar(255);
+
+ALTER TABLE llx_c_typent MODIFY COLUMN libelle varchar(64); 
+
+
 create table llx_notify_def_object
 (
   id				integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index fe8915fbf09..567bd3aef85 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -344,6 +344,11 @@ drop table tmp_c_shipment_mode;
 -- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
 -- VMYSQL4.1 update llx_bank set tms = datec where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
 
+-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
+-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
+-- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL;
+
 
 -- Backport a change of value into the hourly rate. 
 -- update llx_projet_task_time as ptt set ptt.thm = (SELECT thm from llx_user as u where ptt.fk_user = u.rowid) where (ptt.thm is null)

From b331176bf77ab8883c6bca2fff092eb533b41f64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 02:58:09 +0200
Subject: [PATCH 1161/1163] Fix bad data

---
 dev/initdemo/mysqldump_dolibarr_3.5.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/initdemo/mysqldump_dolibarr_3.5.0.sql b/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
index ab03e6054c1..28b05e920d8 100644
--- a/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_3.5.0.sql
@@ -4844,7 +4844,7 @@ CREATE TABLE `llx_opensurvey_sondage` (
 
 LOCK TABLES `llx_opensurvey_sondage` WRITE;
 /*!40000 ALTER TABLE `llx_opensurvey_sondage` DISABLE KEYS */;
-INSERT INTO `llx_opensurvey_sondage` VALUES ('m4467s2mtk6khmxc','m4467s2mtk6khmxci2ysw682','fdffdshfghfj jhgjgh','aaa@aaa.com','fdfds','fdffds','2013-03-06 23:00:00','D+','1',1,'dolibarr','0000-00-00 00:00:00');
+INSERT INTO `llx_opensurvey_sondage` VALUES ('m4467s2mtk6khmxc','m4467s2mtk6khmxci2ysw682','fdffdshfghfj jhgjgh','aaa@aaa.com','fdfds','fdffds','2013-03-06 23:00:00','D+','1',1,'dolibarr','2000-01-01 00:00:00');
 /*!40000 ALTER TABLE `llx_opensurvey_sondage` ENABLE KEYS */;
 UNLOCK TABLES;
 

From f0df9b8d23a00dbad77cbf244f7c86e4cc6af59d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 05:06:50 +0200
Subject: [PATCH 1162/1163] Update package file

---
 build/debian/source/lintian-overrides | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/debian/source/lintian-overrides b/build/debian/source/lintian-overrides
index c878035b482..e64eae84887 100644
--- a/build/debian/source/lintian-overrides
+++ b/build/debian/source/lintian-overrides
@@ -10,6 +10,8 @@ source-is-missing htdocs/includes/ckeditor/ckeditor/lang/*.js
 source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/*/dialogs/*.js
 source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/*/filter/*.js
 source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
-source-is-missing htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
 source-is-missing htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/*.js
+# Those are false positives, the files are their own sources since
+# they are data files
+source-is-missing htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
 

From 5f187f851f0bb2a01e86912fefa55b7ad175c088 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Jun 2017 10:34:22 +0200
Subject: [PATCH 1163/1163] Fix doc

---
 build/debian/README.howto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index 1632e954237..52239176c60 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -174,7 +174,7 @@ or
 Puis pour se connecter et préparer l'environnement 
 > schroot -c name_of_chroot  (exemple schroot -c unstable-amd64-sbuild)
 > cat /etc/debian_chroot       to check which debian branch we are into
-> apt-get install vi dialog
+> apt-get install vim dialog
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
 > apt-get update
 > apt-get upgrade